diff --git a/Android.mk b/Android.mk
index 4059ca0..eb6798c 100644
--- a/Android.mk
+++ b/Android.mk
@@ -37,6 +37,11 @@
 EXCLUDE_FILES += \
 	$(BASE_DIR)/contacts/common/format/testing/SpannedTestUtils.java
 
+# Exclude rootcomponentgenerator
+EXCLUDE_FILES += \
+	$(call all-java-files-under, $(BASE_DIR)/dialer/rootcomponentgenerator) \
+	$(call all-java-files-under, $(BASE_DIR)/dialer/inject/demo)
+
 # Exclude build variants for now
 EXCLUDE_FILES += \
 	$(BASE_DIR)/dialer/constants/googledialer/ConstantsImpl.java \
@@ -71,8 +76,11 @@
 
 LOCAL_SRC_FILES := $(call all-java-files-under, $(BASE_DIR))
 LOCAL_SRC_FILES += $(call all-proto-files-under, $(BASE_DIR))
+LOCAL_SRC_FILES += $(call all-Iaidl-files-under, $(BASE_DIR))
 LOCAL_SRC_FILES := $(filter-out $(EXCLUDE_FILES),$(LOCAL_SRC_FILES))
 
+LOCAL_AIDL_INCLUDES := $(call all-Iaidl-files-under, $(BASE_DIR))
+
 LOCAL_PROTOC_FLAGS := --proto_path=$(LOCAL_PATH)
 
 LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, $(RES_DIRS))
@@ -96,6 +104,7 @@
 	android-common \
 	android-support-dynamic-animation \
 	com.android.vcard \
+	dialer-animal-sniffer-annotations-target \
 	dialer-commons-io-target \
 	dialer-dagger2-target \
 	dialer-disklrucache-target \
@@ -107,11 +116,14 @@
 	dialer-grpc-okhttp-target \
 	dialer-grpc-protobuf-lite-target \
 	dialer-grpc-stub-target \
+	dialer-j2objc-annotations-target \
 	dialer-javax-annotation-api-target \
 	dialer-javax-inject-target \
 	dialer-libshortcutbadger-target \
 	dialer-mime4j-core-target \
 	dialer-mime4j-dom-target \
+	dialer-okhttp-target \
+	dialer-okio-target \
 	dialer-error-prone-target \
 	dialer-guava-target \
 	dialer-glide-target \
@@ -138,7 +150,7 @@
 
 LOCAL_ANNOTATION_PROCESSORS := \
 	dialer-auto-value \
-	dialer-javapoet \
+	javapoet-prebuilt-jar \
 	dialer-dagger2 \
 	dialer-dagger2-compiler \
 	dialer-dagger2-producers \
@@ -147,37 +159,25 @@
 	dialer-guava \
 	dialer-javax-annotation-api \
 	dialer-javax-inject \
+	dialer-rootcomponentprocessor
 
 LOCAL_ANNOTATION_PROCESSOR_CLASSES := \
-  com.google.auto.value.processor.AutoValueProcessor,dagger.internal.codegen.ComponentProcessor,com.bumptech.glide.annotation.compiler.GlideAnnotationProcessor
-
-
-# Begin Bug: 37077388
-LOCAL_DX_FLAGS := --multi-dex
-LOCAL_JACK_FLAGS := --multi-dex native
-
-LOCAL_PROGUARD_ENABLED := disabled
-ifdef LOCAL_JACK_ENABLED
-
+  com.google.auto.value.processor.AutoValueProcessor,dagger.internal.codegen.ComponentProcessor,com.bumptech.glide.annotation.compiler.GlideAnnotationProcessor,com.android.dialer.rootcomponentgenerator.RootComponentProcessor
 
 # Proguard includes
-LOCAL_PROGUARD_FLAG_FILES := $(call all-named-files-under,proguard.*flags,$(BASE_DIR))
+LOCAL_PROGUARD_FLAG_FILES := proguard.flags $(call all-named-files-under,proguard.*flags,$(BASE_DIR))
 LOCAL_PROGUARD_ENABLED := custom
 
 LOCAL_PROGUARD_ENABLED += optimization
-endif
-
-# End Bug: 37077388
 
 LOCAL_SDK_VERSION := system_current
 LOCAL_MODULE_TAGS := optional
 LOCAL_PACKAGE_NAME := Dialer
 LOCAL_CERTIFICATE := shared
 LOCAL_PRIVILEGED_MODULE := true
+LOCAL_PRODUCT_MODULE := true
 LOCAL_USE_AAPT2 := true
-
-# b/37483961 - Jack Not Compiling Dagger Class Properly
-LOCAL_JACK_ENABLED := javac_frontend
+LOCAL_REQUIRED_MODULES := privapp_whitelist_com.android.dialer
 
 include $(BUILD_PACKAGE)
 
@@ -207,7 +207,8 @@
     dialer-guava:../../../prebuilts/tools/common/m2/repository/com/google/guava/guava/23.0/guava-23.0.jar \
     dialer-javax-annotation-api:../../../prebuilts/tools/common/m2/repository/javax/annotation/javax.annotation-api/1.2/javax.annotation-api-1.2.jar \
     dialer-javax-inject:../../../prebuilts/tools/common/m2/repository/javax/inject/javax.inject/1/javax.inject-1.jar \
-    dialer-javapoet:../../../prebuilts/tools/common/m2/repository/com/squareup/javapoet/1.8.0/javapoet-1.8.0.jar \
+    dialer-auto-service:../../../prebuilts/tools/common/m2/repository/com/google/auto/service/auto-service/1.0-rc2/auto-service-1.0-rc2.jar \
+    dialer-auto-common:../../../prebuilts/tools/common/m2/repository/com/google/auto/auto-common/0.9/auto-common-0.9.jar \
 
 include $(BUILD_HOST_PREBUILT)
 
@@ -425,3 +426,71 @@
 
 include $(CLEAR_VARS)
 
+LOCAL_MODULE_CLASS := JAVA_LIBRARIES
+LOCAL_MODULE := dialer-okhttp-target
+LOCAL_SDK_VERSION := current
+LOCAL_SRC_FILES := ../../../prebuilts/tools/common/m2/repository/com/squareup/okhttp/okhttp/2.7.4/okhttp-2.7.4.jar
+LOCAL_UNINSTALLABLE_MODULE := true
+
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE_CLASS := JAVA_LIBRARIES
+LOCAL_MODULE := dialer-okio-target
+LOCAL_SDK_VERSION := current
+LOCAL_SRC_FILES := ../../../prebuilts/tools/common/m2/repository/com/squareup/okio/okio/1.9.0/okio-1.9.0.jar
+LOCAL_UNINSTALLABLE_MODULE := true
+
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE_CLASS := JAVA_LIBRARIES
+LOCAL_MODULE := dialer-j2objc-annotations-target
+LOCAL_SDK_VERSION := current
+LOCAL_SRC_FILES := ../../../prebuilts/tools/common/m2/repository/com/google/j2objc/j2objc-annotations/1.1/j2objc-annotations-1.1.jar
+LOCAL_UNINSTALLABLE_MODULE := true
+
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE_CLASS := JAVA_LIBRARIES
+LOCAL_MODULE := dialer-animal-sniffer-annotations-target
+LOCAL_SDK_VERSION := current
+LOCAL_SRC_FILES := ../../../prebuilts/tools/common/m2/repository/org/codehaus/mojo/animal-sniffer-annotations/1.14/animal-sniffer-annotations-1.14.jar
+LOCAL_UNINSTALLABLE_MODULE := true
+
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := dialer-rootcomponentprocessor
+LOCAL_MODULE_CLASS := JAVA_LIBRARIES
+LOCAL_IS_HOST_MODULE := true
+BASE_DIR := java/com/android
+
+LOCAL_SRC_FILES := \
+	$(call all-java-files-under, $(BASE_DIR)/dialer/rootcomponentgenerator) \
+        $(BASE_DIR)/dialer/inject/DialerRootComponent.java \
+        $(BASE_DIR)/dialer/inject/DialerVariant.java \
+        $(BASE_DIR)/dialer/inject/HasRootComponent.java \
+        $(BASE_DIR)/dialer/inject/IncludeInDialerRoot.java \
+        $(BASE_DIR)/dialer/inject/InstallIn.java \
+        $(BASE_DIR)/dialer/inject/RootComponentGeneratorMetadata.java
+
+LOCAL_STATIC_JAVA_LIBRARIES := \
+	dialer-guava \
+	dialer-dagger2 \
+	javapoet-prebuilt-jar \
+	dialer-auto-service \
+	dialer-auto-common \
+	dialer-javax-annotation-api \
+	dialer-javax-inject
+
+LOCAL_JAVA_LANGUAGE_VERSION := 1.8
+
+include $(BUILD_HOST_JAVA_LIBRARY)
+
+include $(CLEAR_VARS)
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 164dbc9..fe8147f 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -16,12 +16,12 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
   coreApp="true"
   package="com.android.dialer"
-  android:versionCode="250000"
-  android:versionName="19.0">
+  android:versionCode="2900000"
+  android:versionName="23.0">
 
   <uses-sdk
-    android:minSdkVersion="23"
-    android:targetSdkVersion="27"/>
+    android:minSdkVersion="24"
+    android:targetSdkVersion="28"/>
 
   <uses-permission android:name="android.permission.CALL_PHONE"/>
   <uses-permission android:name="android.permission.READ_CONTACTS"/>
@@ -45,6 +45,7 @@
   <uses-permission android:name="android.permission.WRITE_SETTINGS"/>
   <uses-permission android:name="android.permission.USE_CREDENTIALS"/>
   <uses-permission android:name="android.permission.VIBRATE"/>
+  <uses-permission android:name="android.permission.BLUETOOTH"/>
   <uses-permission android:name="android.permission.READ_SYNC_SETTINGS"/>
   <uses-permission android:name="com.android.voicemail.permission.ADD_VOICEMAIL"/>
   <uses-permission android:name="com.android.voicemail.permission.WRITE_VOICEMAIL"/>
@@ -56,6 +57,9 @@
   <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
   <uses-permission android:name="android.permission.SEND_SMS"/>
   <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
+  <uses-permission android:name="android.permission.CONNECTIVITY_USE_RESTRICTED_NETWORKS"/>
+  <uses-permission android:name="android.permission.USE_FULL_SCREEN_INTENT"/>
+  <uses-permission android:name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
 
   <uses-permission android:name="android.permission.CONTROL_INCALL_EXPERIENCE"/>
   <!-- We use this to disable the status bar buttons of home, back and recent
diff --git a/CleanSpec.mk b/CleanSpec.mk
index fecdf79..960bd75 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -39,3 +39,4 @@
 # ************************************************
 
 $(call add-clean-step, (cd packages/apps/Dialer; git clean -f java/com/android/voicemail/impl/com/google/internal/communications/voicemailtranscription/v1/VoicemailTranscriptionServiceGrpc.java >&2) || true)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/priv-app/Dialer)
diff --git a/OWNERS b/OWNERS
new file mode 100644
index 0000000..42a8443
--- /dev/null
+++ b/OWNERS
@@ -0,0 +1,9 @@
+# Default code reviewers picked from top 3 or more developers.
+# Please update this list if you find better candidates.
+twyen@google.com
+zachh@google.com
+linyuh@google.com
+tgunn@google.com
+hallliu@google.com
+breadley@google.com
+paulye@google.com
diff --git a/assets/quantum/AndroidManifest.xml b/assets/quantum/AndroidManifest.xml
index 6e49f61..f574665 100644
--- a/assets/quantum/AndroidManifest.xml
+++ b/assets/quantum/AndroidManifest.xml
@@ -16,6 +16,6 @@
   -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.google.android.assets.quantum">
-  <uses-sdk android:targetSdkVersion="4" />
+  <uses-sdk android:targetSdkVersion="28" />
   <application/>
 </manifest>
diff --git a/assets/quantum/res/drawable-hdpi/quantum_ic_bluetooth_audio_white_24.png b/assets/quantum/res/drawable-hdpi/quantum_ic_bluetooth_audio_white_24.png
deleted file mode 100644
index 046372d..0000000
--- a/assets/quantum/res/drawable-hdpi/quantum_ic_bluetooth_audio_white_24.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-hdpi/quantum_ic_bluetooth_audio_white_36.png b/assets/quantum/res/drawable-hdpi/quantum_ic_bluetooth_audio_white_36.png
deleted file mode 100644
index 398f0a9..0000000
--- a/assets/quantum/res/drawable-hdpi/quantum_ic_bluetooth_audio_white_36.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-hdpi/quantum_ic_call_merge_white_36.png b/assets/quantum/res/drawable-hdpi/quantum_ic_call_merge_white_36.png
deleted file mode 100644
index b7aba80..0000000
--- a/assets/quantum/res/drawable-hdpi/quantum_ic_call_merge_white_36.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-hdpi/quantum_ic_dialpad_white_36.png b/assets/quantum/res/drawable-hdpi/quantum_ic_dialpad_white_36.png
deleted file mode 100644
index 82710e7..0000000
--- a/assets/quantum/res/drawable-hdpi/quantum_ic_dialpad_white_36.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-hdpi/quantum_ic_group_white_36.png b/assets/quantum/res/drawable-hdpi/quantum_ic_group_white_36.png
deleted file mode 100644
index f98a074..0000000
--- a/assets/quantum/res/drawable-hdpi/quantum_ic_group_white_36.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-hdpi/quantum_ic_headset_white_24.png b/assets/quantum/res/drawable-hdpi/quantum_ic_headset_white_24.png
deleted file mode 100644
index d25d388..0000000
--- a/assets/quantum/res/drawable-hdpi/quantum_ic_headset_white_24.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-hdpi/quantum_ic_headset_white_36.png b/assets/quantum/res/drawable-hdpi/quantum_ic_headset_white_36.png
deleted file mode 100644
index f77f247..0000000
--- a/assets/quantum/res/drawable-hdpi/quantum_ic_headset_white_36.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-hdpi/quantum_ic_mic_off_black_24.png b/assets/quantum/res/drawable-hdpi/quantum_ic_mic_off_black_24.png
deleted file mode 100644
index 1755dbf..0000000
--- a/assets/quantum/res/drawable-hdpi/quantum_ic_mic_off_black_24.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-hdpi/quantum_ic_mic_off_white_24.png b/assets/quantum/res/drawable-hdpi/quantum_ic_mic_off_white_24.png
deleted file mode 100644
index 6fccf5d..0000000
--- a/assets/quantum/res/drawable-hdpi/quantum_ic_mic_off_white_24.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-hdpi/quantum_ic_mic_off_white_36.png b/assets/quantum/res/drawable-hdpi/quantum_ic_mic_off_white_36.png
deleted file mode 100644
index 203cb8a..0000000
--- a/assets/quantum/res/drawable-hdpi/quantum_ic_mic_off_white_36.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-hdpi/quantum_ic_pause_white_36.png b/assets/quantum/res/drawable-hdpi/quantum_ic_pause_white_36.png
deleted file mode 100644
index 1d02439..0000000
--- a/assets/quantum/res/drawable-hdpi/quantum_ic_pause_white_36.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-hdpi/quantum_ic_phone_in_talk_white_24.png b/assets/quantum/res/drawable-hdpi/quantum_ic_phone_in_talk_white_24.png
deleted file mode 100644
index f2c8942..0000000
--- a/assets/quantum/res/drawable-hdpi/quantum_ic_phone_in_talk_white_24.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-hdpi/quantum_ic_phone_in_talk_white_36.png b/assets/quantum/res/drawable-hdpi/quantum_ic_phone_in_talk_white_36.png
deleted file mode 100644
index ec67c6e..0000000
--- a/assets/quantum/res/drawable-hdpi/quantum_ic_phone_in_talk_white_36.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-hdpi/quantum_ic_swap_calls_white_36.png b/assets/quantum/res/drawable-hdpi/quantum_ic_swap_calls_white_36.png
deleted file mode 100644
index 8c3a0ed..0000000
--- a/assets/quantum/res/drawable-hdpi/quantum_ic_swap_calls_white_36.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-hdpi/quantum_ic_videocam_off_white_24.png b/assets/quantum/res/drawable-hdpi/quantum_ic_videocam_off_white_24.png
deleted file mode 100644
index aaf5ac2..0000000
--- a/assets/quantum/res/drawable-hdpi/quantum_ic_videocam_off_white_24.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-hdpi/quantum_ic_videocam_white_24.png b/assets/quantum/res/drawable-hdpi/quantum_ic_videocam_white_24.png
deleted file mode 100644
index d83e0d5..0000000
--- a/assets/quantum/res/drawable-hdpi/quantum_ic_videocam_white_24.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-hdpi/quantum_ic_videocam_white_36.png b/assets/quantum/res/drawable-hdpi/quantum_ic_videocam_white_36.png
deleted file mode 100644
index 49562a6..0000000
--- a/assets/quantum/res/drawable-hdpi/quantum_ic_videocam_white_36.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-hdpi/quantum_ic_volume_up_white_24.png b/assets/quantum/res/drawable-hdpi/quantum_ic_volume_up_white_24.png
deleted file mode 100644
index 57d7871..0000000
--- a/assets/quantum/res/drawable-hdpi/quantum_ic_volume_up_white_24.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-hdpi/quantum_ic_volume_up_white_36.png b/assets/quantum/res/drawable-hdpi/quantum_ic_volume_up_white_36.png
deleted file mode 100644
index 62d22be..0000000
--- a/assets/quantum/res/drawable-hdpi/quantum_ic_volume_up_white_36.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-mdpi/quantum_ic_bluetooth_audio_white_24.png b/assets/quantum/res/drawable-mdpi/quantum_ic_bluetooth_audio_white_24.png
deleted file mode 100644
index ddffcf1..0000000
--- a/assets/quantum/res/drawable-mdpi/quantum_ic_bluetooth_audio_white_24.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-mdpi/quantum_ic_bluetooth_audio_white_36.png b/assets/quantum/res/drawable-mdpi/quantum_ic_bluetooth_audio_white_36.png
deleted file mode 100644
index 046372d..0000000
--- a/assets/quantum/res/drawable-mdpi/quantum_ic_bluetooth_audio_white_36.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-mdpi/quantum_ic_call_merge_white_36.png b/assets/quantum/res/drawable-mdpi/quantum_ic_call_merge_white_36.png
deleted file mode 100644
index a2eb54b..0000000
--- a/assets/quantum/res/drawable-mdpi/quantum_ic_call_merge_white_36.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-mdpi/quantum_ic_dialpad_white_36.png b/assets/quantum/res/drawable-mdpi/quantum_ic_dialpad_white_36.png
deleted file mode 100644
index 9037f94..0000000
--- a/assets/quantum/res/drawable-mdpi/quantum_ic_dialpad_white_36.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-mdpi/quantum_ic_group_white_36.png b/assets/quantum/res/drawable-mdpi/quantum_ic_group_white_36.png
deleted file mode 100644
index 25e4434..0000000
--- a/assets/quantum/res/drawable-mdpi/quantum_ic_group_white_36.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-mdpi/quantum_ic_headset_white_24.png b/assets/quantum/res/drawable-mdpi/quantum_ic_headset_white_24.png
deleted file mode 100644
index df06379..0000000
--- a/assets/quantum/res/drawable-mdpi/quantum_ic_headset_white_24.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-mdpi/quantum_ic_headset_white_36.png b/assets/quantum/res/drawable-mdpi/quantum_ic_headset_white_36.png
deleted file mode 100644
index d25d388..0000000
--- a/assets/quantum/res/drawable-mdpi/quantum_ic_headset_white_36.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-mdpi/quantum_ic_mic_off_black_24.png b/assets/quantum/res/drawable-mdpi/quantum_ic_mic_off_black_24.png
deleted file mode 100644
index da605a5..0000000
--- a/assets/quantum/res/drawable-mdpi/quantum_ic_mic_off_black_24.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-mdpi/quantum_ic_mic_off_white_24.png b/assets/quantum/res/drawable-mdpi/quantum_ic_mic_off_white_24.png
deleted file mode 100644
index 15094d8..0000000
--- a/assets/quantum/res/drawable-mdpi/quantum_ic_mic_off_white_24.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-mdpi/quantum_ic_mic_off_white_36.png b/assets/quantum/res/drawable-mdpi/quantum_ic_mic_off_white_36.png
deleted file mode 100644
index 6fccf5d..0000000
--- a/assets/quantum/res/drawable-mdpi/quantum_ic_mic_off_white_36.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-mdpi/quantum_ic_pause_white_36.png b/assets/quantum/res/drawable-mdpi/quantum_ic_pause_white_36.png
deleted file mode 100644
index 4d2ea05..0000000
--- a/assets/quantum/res/drawable-mdpi/quantum_ic_pause_white_36.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-mdpi/quantum_ic_phone_in_talk_white_24.png b/assets/quantum/res/drawable-mdpi/quantum_ic_phone_in_talk_white_24.png
deleted file mode 100644
index e6f98af..0000000
--- a/assets/quantum/res/drawable-mdpi/quantum_ic_phone_in_talk_white_24.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-mdpi/quantum_ic_phone_in_talk_white_36.png b/assets/quantum/res/drawable-mdpi/quantum_ic_phone_in_talk_white_36.png
deleted file mode 100644
index f2c8942..0000000
--- a/assets/quantum/res/drawable-mdpi/quantum_ic_phone_in_talk_white_36.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-mdpi/quantum_ic_swap_calls_white_36.png b/assets/quantum/res/drawable-mdpi/quantum_ic_swap_calls_white_36.png
deleted file mode 100644
index 9491f2d..0000000
--- a/assets/quantum/res/drawable-mdpi/quantum_ic_swap_calls_white_36.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-mdpi/quantum_ic_videocam_off_white_24.png b/assets/quantum/res/drawable-mdpi/quantum_ic_videocam_off_white_24.png
deleted file mode 100644
index d1cca6f..0000000
--- a/assets/quantum/res/drawable-mdpi/quantum_ic_videocam_off_white_24.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-mdpi/quantum_ic_videocam_white_24.png b/assets/quantum/res/drawable-mdpi/quantum_ic_videocam_white_24.png
deleted file mode 100644
index d146209..0000000
--- a/assets/quantum/res/drawable-mdpi/quantum_ic_videocam_white_24.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-mdpi/quantum_ic_videocam_white_36.png b/assets/quantum/res/drawable-mdpi/quantum_ic_videocam_white_36.png
deleted file mode 100644
index d83e0d5..0000000
--- a/assets/quantum/res/drawable-mdpi/quantum_ic_videocam_white_36.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-mdpi/quantum_ic_volume_up_white_24.png b/assets/quantum/res/drawable-mdpi/quantum_ic_volume_up_white_24.png
deleted file mode 100644
index 7cfd4c7..0000000
--- a/assets/quantum/res/drawable-mdpi/quantum_ic_volume_up_white_24.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-mdpi/quantum_ic_volume_up_white_36.png b/assets/quantum/res/drawable-mdpi/quantum_ic_volume_up_white_36.png
deleted file mode 100644
index 57d7871..0000000
--- a/assets/quantum/res/drawable-mdpi/quantum_ic_volume_up_white_36.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-xhdpi/quantum_ic_bluetooth_audio_white_24.png b/assets/quantum/res/drawable-xhdpi/quantum_ic_bluetooth_audio_white_24.png
deleted file mode 100644
index b494eb3..0000000
--- a/assets/quantum/res/drawable-xhdpi/quantum_ic_bluetooth_audio_white_24.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-xhdpi/quantum_ic_bluetooth_audio_white_36.png b/assets/quantum/res/drawable-xhdpi/quantum_ic_bluetooth_audio_white_36.png
deleted file mode 100644
index d5022d0..0000000
--- a/assets/quantum/res/drawable-xhdpi/quantum_ic_bluetooth_audio_white_36.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-xhdpi/quantum_ic_call_merge_white_36.png b/assets/quantum/res/drawable-xhdpi/quantum_ic_call_merge_white_36.png
deleted file mode 100644
index 01daecf..0000000
--- a/assets/quantum/res/drawable-xhdpi/quantum_ic_call_merge_white_36.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-xhdpi/quantum_ic_dialpad_white_36.png b/assets/quantum/res/drawable-xhdpi/quantum_ic_dialpad_white_36.png
deleted file mode 100644
index 1750005..0000000
--- a/assets/quantum/res/drawable-xhdpi/quantum_ic_dialpad_white_36.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-xhdpi/quantum_ic_group_white_36.png b/assets/quantum/res/drawable-xhdpi/quantum_ic_group_white_36.png
deleted file mode 100644
index 7f0b7e9..0000000
--- a/assets/quantum/res/drawable-xhdpi/quantum_ic_group_white_36.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-xhdpi/quantum_ic_headset_white_24.png b/assets/quantum/res/drawable-xhdpi/quantum_ic_headset_white_24.png
deleted file mode 100644
index d7a741b..0000000
--- a/assets/quantum/res/drawable-xhdpi/quantum_ic_headset_white_24.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-xhdpi/quantum_ic_headset_white_36.png b/assets/quantum/res/drawable-xhdpi/quantum_ic_headset_white_36.png
deleted file mode 100644
index 82db542..0000000
--- a/assets/quantum/res/drawable-xhdpi/quantum_ic_headset_white_36.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-xhdpi/quantum_ic_mic_off_black_24.png b/assets/quantum/res/drawable-xhdpi/quantum_ic_mic_off_black_24.png
deleted file mode 100644
index fa741be..0000000
--- a/assets/quantum/res/drawable-xhdpi/quantum_ic_mic_off_black_24.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-xhdpi/quantum_ic_mic_off_white_24.png b/assets/quantum/res/drawable-xhdpi/quantum_ic_mic_off_white_24.png
deleted file mode 100644
index bb7915f..0000000
--- a/assets/quantum/res/drawable-xhdpi/quantum_ic_mic_off_white_24.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-xhdpi/quantum_ic_mic_off_white_36.png b/assets/quantum/res/drawable-xhdpi/quantum_ic_mic_off_white_36.png
deleted file mode 100644
index 7a15a9e..0000000
--- a/assets/quantum/res/drawable-xhdpi/quantum_ic_mic_off_white_36.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-xhdpi/quantum_ic_pause_white_36.png b/assets/quantum/res/drawable-xhdpi/quantum_ic_pause_white_36.png
deleted file mode 100644
index 7192ad4..0000000
--- a/assets/quantum/res/drawable-xhdpi/quantum_ic_pause_white_36.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-xhdpi/quantum_ic_phone_in_talk_white_24.png b/assets/quantum/res/drawable-xhdpi/quantum_ic_phone_in_talk_white_24.png
deleted file mode 100644
index a2d78b2..0000000
--- a/assets/quantum/res/drawable-xhdpi/quantum_ic_phone_in_talk_white_24.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-xhdpi/quantum_ic_phone_in_talk_white_36.png b/assets/quantum/res/drawable-xhdpi/quantum_ic_phone_in_talk_white_36.png
deleted file mode 100644
index 9c002da..0000000
--- a/assets/quantum/res/drawable-xhdpi/quantum_ic_phone_in_talk_white_36.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-xhdpi/quantum_ic_swap_calls_white_36.png b/assets/quantum/res/drawable-xhdpi/quantum_ic_swap_calls_white_36.png
deleted file mode 100644
index 698cd5d..0000000
--- a/assets/quantum/res/drawable-xhdpi/quantum_ic_swap_calls_white_36.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-xhdpi/quantum_ic_videocam_off_white_24.png b/assets/quantum/res/drawable-xhdpi/quantum_ic_videocam_off_white_24.png
deleted file mode 100644
index 5d54058..0000000
--- a/assets/quantum/res/drawable-xhdpi/quantum_ic_videocam_off_white_24.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-xhdpi/quantum_ic_videocam_white_24.png b/assets/quantum/res/drawable-xhdpi/quantum_ic_videocam_white_24.png
deleted file mode 100644
index 1b2583d..0000000
--- a/assets/quantum/res/drawable-xhdpi/quantum_ic_videocam_white_24.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-xhdpi/quantum_ic_videocam_white_36.png b/assets/quantum/res/drawable-xhdpi/quantum_ic_videocam_white_36.png
deleted file mode 100644
index 44c28e2..0000000
--- a/assets/quantum/res/drawable-xhdpi/quantum_ic_videocam_white_36.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-xhdpi/quantum_ic_volume_up_white_24.png b/assets/quantum/res/drawable-xhdpi/quantum_ic_volume_up_white_24.png
deleted file mode 100644
index 2ed0034..0000000
--- a/assets/quantum/res/drawable-xhdpi/quantum_ic_volume_up_white_24.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-xhdpi/quantum_ic_volume_up_white_36.png b/assets/quantum/res/drawable-xhdpi/quantum_ic_volume_up_white_36.png
deleted file mode 100644
index 2e751a4..0000000
--- a/assets/quantum/res/drawable-xhdpi/quantum_ic_volume_up_white_36.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-xxhdpi/quantum_ic_bluetooth_audio_white_24.png b/assets/quantum/res/drawable-xxhdpi/quantum_ic_bluetooth_audio_white_24.png
deleted file mode 100644
index d5022d0..0000000
--- a/assets/quantum/res/drawable-xxhdpi/quantum_ic_bluetooth_audio_white_24.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-xxhdpi/quantum_ic_bluetooth_audio_white_36.png b/assets/quantum/res/drawable-xxhdpi/quantum_ic_bluetooth_audio_white_36.png
deleted file mode 100644
index 6842da6..0000000
--- a/assets/quantum/res/drawable-xxhdpi/quantum_ic_bluetooth_audio_white_36.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-xxhdpi/quantum_ic_call_merge_white_36.png b/assets/quantum/res/drawable-xxhdpi/quantum_ic_call_merge_white_36.png
deleted file mode 100644
index cefef65..0000000
--- a/assets/quantum/res/drawable-xxhdpi/quantum_ic_call_merge_white_36.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-xxhdpi/quantum_ic_dialpad_white_36.png b/assets/quantum/res/drawable-xxhdpi/quantum_ic_dialpad_white_36.png
deleted file mode 100644
index 54ebbaf..0000000
--- a/assets/quantum/res/drawable-xxhdpi/quantum_ic_dialpad_white_36.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-xxhdpi/quantum_ic_group_white_36.png b/assets/quantum/res/drawable-xxhdpi/quantum_ic_group_white_36.png
deleted file mode 100644
index 952e15f..0000000
--- a/assets/quantum/res/drawable-xxhdpi/quantum_ic_group_white_36.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-xxhdpi/quantum_ic_headset_white_24.png b/assets/quantum/res/drawable-xxhdpi/quantum_ic_headset_white_24.png
deleted file mode 100644
index 82db542..0000000
--- a/assets/quantum/res/drawable-xxhdpi/quantum_ic_headset_white_24.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-xxhdpi/quantum_ic_headset_white_36.png b/assets/quantum/res/drawable-xxhdpi/quantum_ic_headset_white_36.png
deleted file mode 100644
index a0d8b14..0000000
--- a/assets/quantum/res/drawable-xxhdpi/quantum_ic_headset_white_36.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-xxhdpi/quantum_ic_mic_off_black_24.png b/assets/quantum/res/drawable-xxhdpi/quantum_ic_mic_off_black_24.png
deleted file mode 100644
index 084bf3c..0000000
--- a/assets/quantum/res/drawable-xxhdpi/quantum_ic_mic_off_black_24.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-xxhdpi/quantum_ic_mic_off_white_24.png b/assets/quantum/res/drawable-xxhdpi/quantum_ic_mic_off_white_24.png
deleted file mode 100644
index 7a15a9e..0000000
--- a/assets/quantum/res/drawable-xxhdpi/quantum_ic_mic_off_white_24.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-xxhdpi/quantum_ic_mic_off_white_36.png b/assets/quantum/res/drawable-xxhdpi/quantum_ic_mic_off_white_36.png
deleted file mode 100644
index 585d383..0000000
--- a/assets/quantum/res/drawable-xxhdpi/quantum_ic_mic_off_white_36.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-xxhdpi/quantum_ic_pause_white_36.png b/assets/quantum/res/drawable-xxhdpi/quantum_ic_pause_white_36.png
deleted file mode 100644
index a03bad2..0000000
--- a/assets/quantum/res/drawable-xxhdpi/quantum_ic_pause_white_36.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-xxhdpi/quantum_ic_phone_in_talk_white_24.png b/assets/quantum/res/drawable-xxhdpi/quantum_ic_phone_in_talk_white_24.png
deleted file mode 100644
index 9c002da..0000000
--- a/assets/quantum/res/drawable-xxhdpi/quantum_ic_phone_in_talk_white_24.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-xxhdpi/quantum_ic_phone_in_talk_white_36.png b/assets/quantum/res/drawable-xxhdpi/quantum_ic_phone_in_talk_white_36.png
deleted file mode 100644
index 5bb683f..0000000
--- a/assets/quantum/res/drawable-xxhdpi/quantum_ic_phone_in_talk_white_36.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-xxhdpi/quantum_ic_swap_calls_white_36.png b/assets/quantum/res/drawable-xxhdpi/quantum_ic_swap_calls_white_36.png
deleted file mode 100644
index 140da28..0000000
--- a/assets/quantum/res/drawable-xxhdpi/quantum_ic_swap_calls_white_36.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-xxhdpi/quantum_ic_videocam_off_white_24.png b/assets/quantum/res/drawable-xxhdpi/quantum_ic_videocam_off_white_24.png
deleted file mode 100644
index 69565f2..0000000
--- a/assets/quantum/res/drawable-xxhdpi/quantum_ic_videocam_off_white_24.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-xxhdpi/quantum_ic_videocam_white_24.png b/assets/quantum/res/drawable-xxhdpi/quantum_ic_videocam_white_24.png
deleted file mode 100644
index 44c28e2..0000000
--- a/assets/quantum/res/drawable-xxhdpi/quantum_ic_videocam_white_24.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-xxhdpi/quantum_ic_videocam_white_36.png b/assets/quantum/res/drawable-xxhdpi/quantum_ic_videocam_white_36.png
deleted file mode 100644
index 839af26..0000000
--- a/assets/quantum/res/drawable-xxhdpi/quantum_ic_videocam_white_36.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-xxhdpi/quantum_ic_volume_up_white_24.png b/assets/quantum/res/drawable-xxhdpi/quantum_ic_volume_up_white_24.png
deleted file mode 100644
index 2e751a4..0000000
--- a/assets/quantum/res/drawable-xxhdpi/quantum_ic_volume_up_white_24.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-xxhdpi/quantum_ic_volume_up_white_36.png b/assets/quantum/res/drawable-xxhdpi/quantum_ic_volume_up_white_36.png
deleted file mode 100644
index 96c1f98..0000000
--- a/assets/quantum/res/drawable-xxhdpi/quantum_ic_volume_up_white_36.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-xxxhdpi/quantum_ic_bluetooth_audio_white_24.png b/assets/quantum/res/drawable-xxxhdpi/quantum_ic_bluetooth_audio_white_24.png
deleted file mode 100644
index 8e1fa20..0000000
--- a/assets/quantum/res/drawable-xxxhdpi/quantum_ic_bluetooth_audio_white_24.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-xxxhdpi/quantum_ic_bluetooth_audio_white_36.png b/assets/quantum/res/drawable-xxxhdpi/quantum_ic_bluetooth_audio_white_36.png
deleted file mode 100644
index 3fe7c23..0000000
--- a/assets/quantum/res/drawable-xxxhdpi/quantum_ic_bluetooth_audio_white_36.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-xxxhdpi/quantum_ic_call_merge_white_36.png b/assets/quantum/res/drawable-xxxhdpi/quantum_ic_call_merge_white_36.png
deleted file mode 100644
index 9419ffb..0000000
--- a/assets/quantum/res/drawable-xxxhdpi/quantum_ic_call_merge_white_36.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-xxxhdpi/quantum_ic_dialpad_white_36.png b/assets/quantum/res/drawable-xxxhdpi/quantum_ic_dialpad_white_36.png
deleted file mode 100644
index a53aeb1..0000000
--- a/assets/quantum/res/drawable-xxxhdpi/quantum_ic_dialpad_white_36.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-xxxhdpi/quantum_ic_group_white_36.png b/assets/quantum/res/drawable-xxxhdpi/quantum_ic_group_white_36.png
deleted file mode 100644
index dacf299..0000000
--- a/assets/quantum/res/drawable-xxxhdpi/quantum_ic_group_white_36.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-xxxhdpi/quantum_ic_headset_white_24.png b/assets/quantum/res/drawable-xxxhdpi/quantum_ic_headset_white_24.png
deleted file mode 100644
index 0f0b2e1..0000000
--- a/assets/quantum/res/drawable-xxxhdpi/quantum_ic_headset_white_24.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-xxxhdpi/quantum_ic_headset_white_36.png b/assets/quantum/res/drawable-xxxhdpi/quantum_ic_headset_white_36.png
deleted file mode 100644
index 89b9910..0000000
--- a/assets/quantum/res/drawable-xxxhdpi/quantum_ic_headset_white_36.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-xxxhdpi/quantum_ic_mic_off_black_24.png b/assets/quantum/res/drawable-xxxhdpi/quantum_ic_mic_off_black_24.png
deleted file mode 100644
index 90d0606..0000000
--- a/assets/quantum/res/drawable-xxxhdpi/quantum_ic_mic_off_black_24.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-xxxhdpi/quantum_ic_mic_off_white_24.png b/assets/quantum/res/drawable-xxxhdpi/quantum_ic_mic_off_white_24.png
deleted file mode 100644
index 22ca19a..0000000
--- a/assets/quantum/res/drawable-xxxhdpi/quantum_ic_mic_off_white_24.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-xxxhdpi/quantum_ic_mic_off_white_36.png b/assets/quantum/res/drawable-xxxhdpi/quantum_ic_mic_off_white_36.png
deleted file mode 100644
index b0a10fb..0000000
--- a/assets/quantum/res/drawable-xxxhdpi/quantum_ic_mic_off_white_36.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-xxxhdpi/quantum_ic_pause_white_36.png b/assets/quantum/res/drawable-xxxhdpi/quantum_ic_pause_white_36.png
deleted file mode 100644
index 3ea7e03..0000000
--- a/assets/quantum/res/drawable-xxxhdpi/quantum_ic_pause_white_36.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-xxxhdpi/quantum_ic_phone_in_talk_white_24.png b/assets/quantum/res/drawable-xxxhdpi/quantum_ic_phone_in_talk_white_24.png
deleted file mode 100644
index 36be1da..0000000
--- a/assets/quantum/res/drawable-xxxhdpi/quantum_ic_phone_in_talk_white_24.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-xxxhdpi/quantum_ic_phone_in_talk_white_36.png b/assets/quantum/res/drawable-xxxhdpi/quantum_ic_phone_in_talk_white_36.png
deleted file mode 100644
index 1257e66..0000000
--- a/assets/quantum/res/drawable-xxxhdpi/quantum_ic_phone_in_talk_white_36.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-xxxhdpi/quantum_ic_swap_calls_white_36.png b/assets/quantum/res/drawable-xxxhdpi/quantum_ic_swap_calls_white_36.png
deleted file mode 100644
index f8470b5..0000000
--- a/assets/quantum/res/drawable-xxxhdpi/quantum_ic_swap_calls_white_36.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-xxxhdpi/quantum_ic_videocam_off_white_24.png b/assets/quantum/res/drawable-xxxhdpi/quantum_ic_videocam_off_white_24.png
deleted file mode 100644
index bf37b57..0000000
--- a/assets/quantum/res/drawable-xxxhdpi/quantum_ic_videocam_off_white_24.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-xxxhdpi/quantum_ic_videocam_white_24.png b/assets/quantum/res/drawable-xxxhdpi/quantum_ic_videocam_white_24.png
deleted file mode 100644
index ed20c07..0000000
--- a/assets/quantum/res/drawable-xxxhdpi/quantum_ic_videocam_white_24.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-xxxhdpi/quantum_ic_videocam_white_36.png b/assets/quantum/res/drawable-xxxhdpi/quantum_ic_videocam_white_36.png
deleted file mode 100644
index eff5923..0000000
--- a/assets/quantum/res/drawable-xxxhdpi/quantum_ic_videocam_white_36.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-xxxhdpi/quantum_ic_volume_up_white_24.png b/assets/quantum/res/drawable-xxxhdpi/quantum_ic_volume_up_white_24.png
deleted file mode 100644
index 82972b4..0000000
--- a/assets/quantum/res/drawable-xxxhdpi/quantum_ic_volume_up_white_24.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable-xxxhdpi/quantum_ic_volume_up_white_36.png b/assets/quantum/res/drawable-xxxhdpi/quantum_ic_volume_up_white_36.png
deleted file mode 100644
index fd633b6..0000000
--- a/assets/quantum/res/drawable-xxxhdpi/quantum_ic_volume_up_white_36.png
+++ /dev/null
Binary files differ
diff --git a/assets/quantum/res/drawable/quantum_ic_arrow_back_vd_theme_24.xml b/assets/quantum/res/drawable/quantum_ic_arrow_back_vd_theme_24.xml
index 3a85b7d..12db78d 100644
--- a/assets/quantum/res/drawable/quantum_ic_arrow_back_vd_theme_24.xml
+++ b/assets/quantum/res/drawable/quantum_ic_arrow_back_vd_theme_24.xml
@@ -18,7 +18,8 @@
         android:height="24dp"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0"
-        android:tint="?attr/colorControlNormal">
+        android:tint="?attr/colorControlNormal"
+        android:autoMirrored="true">
     <path
         android:fillColor="@android:color/white"
         android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z"/>
diff --git a/assets/quantum/res/drawable/quantum_ic_bluetooth_audio_vd_theme_24.xml b/assets/quantum/res/drawable/quantum_ic_bluetooth_audio_vd_theme_24.xml
new file mode 100644
index 0000000..f5a7e8b
--- /dev/null
+++ b/assets/quantum/res/drawable/quantum_ic_bluetooth_audio_vd_theme_24.xml
@@ -0,0 +1,25 @@
+<!--
+  ~ Copyright (C) 2018 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M14.24,12.01l2.32,2.32c0.28,-0.72 0.44,-1.51 0.44,-2.33 0,-0.82 -0.16,-1.59 -0.43,-2.31l-2.33,2.32zM19.53,6.71l-1.26,1.26c0.63,1.21 0.98,2.57 0.98,4.02s-0.36,2.82 -0.98,4.02l1.2,1.2c0.97,-1.54 1.54,-3.36 1.54,-5.31 -0.01,-1.89 -0.55,-3.67 -1.48,-5.19zM15.71,7.71L10,2L9,2v7.59L4.41,5 3,6.41 8.59,12 3,17.59 4.41,19 9,14.41L9,22h1l5.71,-5.71 -4.3,-4.29 4.3,-4.29zM11,5.83l1.88,1.88L11,9.59L11,5.83zM12.88,16.29L11,18.17v-3.76l1.88,1.88z"/>
+</vector>
diff --git a/assets/quantum/res/drawable/quantum_ic_call_merge_vd_theme_24.xml b/assets/quantum/res/drawable/quantum_ic_call_merge_vd_theme_24.xml
new file mode 100644
index 0000000..660faf4
--- /dev/null
+++ b/assets/quantum/res/drawable/quantum_ic_call_merge_vd_theme_24.xml
@@ -0,0 +1,25 @@
+<!--
+  ~ Copyright (C) 2018 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M17,20.41L18.41,19 15,15.59 13.59,17 17,20.41zM7.5,8H11v5.59L5.59,19 7,20.41l6,-6V8h3.5L12,3.5 7.5,8z"/>
+</vector>
diff --git a/assets/quantum/res/drawable/quantum_ic_error_outline_vd_theme_36.xml b/assets/quantum/res/drawable/quantum_ic_error_outline_vd_theme_36.xml
new file mode 100644
index 0000000..df4dc32
--- /dev/null
+++ b/assets/quantum/res/drawable/quantum_ic_error_outline_vd_theme_36.xml
@@ -0,0 +1,33 @@
+<!--
+  ~ Copyright (C) 2018 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="36dp"
+    android:height="36dp"
+    android:viewportWidth="36.0"
+    android:viewportHeight="36.0"
+    android:tint="?attr/colorControlNormal">
+  <group
+      android:pivotX="12"
+      android:pivotY="12"
+      android:scaleX="1.5"
+      android:scaleY="1.5"
+      android:translateX="6"
+      android:translateY="6">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M11,15h2v2h-2zM11,7h2v6h-2zM11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8z"/>
+  </group>
+</vector>
\ No newline at end of file
diff --git a/assets/quantum/res/drawable/quantum_ic_headset_vd_theme_24.xml b/assets/quantum/res/drawable/quantum_ic_headset_vd_theme_24.xml
new file mode 100644
index 0000000..4d65b4d
--- /dev/null
+++ b/assets/quantum/res/drawable/quantum_ic_headset_vd_theme_24.xml
@@ -0,0 +1,25 @@
+<!--
+  ~ Copyright (C) 2018 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M12,1c-4.97,0 -9,4.03 -9,9v7c0,1.66 1.34,3 3,3h3v-8H5v-2c0,-3.87 3.13,-7 7,-7s7,3.13 7,7v2h-4v8h3c1.66,0 3,-1.34 3,-3v-7c0,-4.97 -4.03,-9 -9,-9z"/>
+</vector>
diff --git a/assets/quantum/res/drawable/quantum_ic_perm_phone_msg_vd_theme_24.xml b/assets/quantum/res/drawable/quantum_ic_perm_phone_msg_vd_theme_24.xml
new file mode 100644
index 0000000..68735dd
--- /dev/null
+++ b/assets/quantum/res/drawable/quantum_ic_perm_phone_msg_vd_theme_24.xml
@@ -0,0 +1,25 @@
+<!--
+  ~ Copyright (C) 2017 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0"
+        android:tint="?attr/colorControlNormal">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M20,15.5c-1.25,0 -2.45,-0.2 -3.57,-0.57 -0.35,-0.11 -0.74,-0.03 -1.02,0.24l-2.2,2.2c-2.83,-1.44 -5.15,-3.75 -6.59,-6.58l2.2,-2.21c0.28,-0.27 0.36,-0.66 0.25,-1.01C8.7,6.45 8.5,5.25 8.5,4c0,-0.55 -0.45,-1 -1,-1H4c-0.55,0 -1,0.45 -1,1 0,9.39 7.61,17 17,17 0.55,0 1,-0.45 1,-1v-3.5c0,-0.55 -0.45,-1 -1,-1zM12,3v10l3,-3h6V3h-9z"/>
+</vector>
diff --git a/assets/quantum/res/drawable/quantum_ic_phone_in_talk_vd_theme_24.xml b/assets/quantum/res/drawable/quantum_ic_phone_in_talk_vd_theme_24.xml
new file mode 100644
index 0000000..d171551
--- /dev/null
+++ b/assets/quantum/res/drawable/quantum_ic_phone_in_talk_vd_theme_24.xml
@@ -0,0 +1,25 @@
+<!--
+  ~ Copyright (C) 2018 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M20,15.5c-1.25,0 -2.45,-0.2 -3.57,-0.57 -0.35,-0.11 -0.74,-0.03 -1.02,0.24l-2.2,2.2c-2.83,-1.44 -5.15,-3.75 -6.59,-6.59l2.2,-2.21c0.28,-0.26 0.36,-0.65 0.25,-1C8.7,6.45 8.5,5.25 8.5,4c0,-0.55 -0.45,-1 -1,-1L4,3c-0.55,0 -1,0.45 -1,1 0,9.39 7.61,17 17,17 0.55,0 1,-0.45 1,-1v-3.5c0,-0.55 -0.45,-1 -1,-1zM19,12h2c0,-4.97 -4.03,-9 -9,-9v2c3.87,0 7,3.13 7,7zM15,12h2c0,-2.76 -2.24,-5 -5,-5v2c1.66,0 3,1.34 3,3z"/>
+</vector>
diff --git a/assets/quantum/res/drawable/quantum_ic_query_builder_vd_theme_24.xml b/assets/quantum/res/drawable/quantum_ic_query_builder_vd_theme_24.xml
new file mode 100644
index 0000000..54fd545
--- /dev/null
+++ b/assets/quantum/res/drawable/quantum_ic_query_builder_vd_theme_24.xml
@@ -0,0 +1,25 @@
+<!--
+  ~ Copyright (C) 2018 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0"
+        android:tint="?attr/colorControlNormal">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8zM12.5,7L11,7v6l5.25,3.15 0.75,-1.23 -4.5,-2.67z"/>
+</vector>
diff --git a/assets/quantum/res/drawable/quantum_ic_question_answer_vd_theme_24.xml b/assets/quantum/res/drawable/quantum_ic_question_answer_vd_theme_24.xml
new file mode 100644
index 0000000..f607d53
--- /dev/null
+++ b/assets/quantum/res/drawable/quantum_ic_question_answer_vd_theme_24.xml
@@ -0,0 +1,25 @@
+<!--
+  ~ Copyright (C) 2018 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M21,6h-2v9L6,15v2c0,0.55 0.45,1 1,1h11l4,4L22,7c0,-0.55 -0.45,-1 -1,-1zM17,12L17,3c0,-0.55 -0.45,-1 -1,-1L3,2c-0.55,0 -1,0.45 -1,1v14l4,-4h10c0.55,0 1,-0.45 1,-1z"/>
+</vector>
diff --git a/assets/quantum/res/drawable/quantum_ic_security_vd_theme_24.xml b/assets/quantum/res/drawable/quantum_ic_security_vd_theme_24.xml
new file mode 100644
index 0000000..36ea6eb
--- /dev/null
+++ b/assets/quantum/res/drawable/quantum_ic_security_vd_theme_24.xml
@@ -0,0 +1,25 @@
+<!--
+  ~ Copyright (C) 2018 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M12,1L3,5v6c0,5.55 3.84,10.74 9,12 5.16,-1.26 9,-6.45 9,-12L21,5l-9,-4zM12,11.99h7c-0.53,4.12 -3.28,7.79 -7,8.94L12,12L5,12L5,6.3l7,-3.11v8.8z"/>
+</vector>
diff --git a/assets/quantum/res/drawable/quantum_ic_swap_calls_vd_theme_24.xml b/assets/quantum/res/drawable/quantum_ic_swap_calls_vd_theme_24.xml
new file mode 100644
index 0000000..e05fb1b
--- /dev/null
+++ b/assets/quantum/res/drawable/quantum_ic_swap_calls_vd_theme_24.xml
@@ -0,0 +1,25 @@
+<!--
+  ~ Copyright (C) 2018 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M18,4l-4,4h3v7c0,1.1 -0.9,2 -2,2s-2,-0.9 -2,-2V8c0,-2.21 -1.79,-4 -4,-4S5,5.79 5,8v7H2l4,4 4,-4H7V8c0,-1.1 0.9,-2 2,-2s2,0.9 2,2v7c0,2.21 1.79,4 4,4s4,-1.79 4,-4V8h3l-4,-4z"/>
+</vector>
diff --git a/assets/quantum/res/drawable/quantum_ic_unblock_vd_theme_24.xml b/assets/quantum/res/drawable/quantum_ic_unblock_vd_theme_24.xml
new file mode 100644
index 0000000..35e974d
--- /dev/null
+++ b/assets/quantum/res/drawable/quantum_ic_unblock_vd_theme_24.xml
@@ -0,0 +1,27 @@
+<!--
+  ~ Copyright (C) 2018 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+
+<!-- A custom-made "unblock" icon for Dialer -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M12,2C17.52,2 22,6.48 22,12C22,17.52 17.52,22 12,22C6.48,22 2,17.52 2,12C2,6.48 6.48,2 12,2ZM12,4C7.584,4 4,7.584 4,12C4,16.416 7.584,20 12,20C16.416,20 20,16.416 20,12C20,7.584 16.416,4 12,4ZM16.5,6.086L17.914,7.5L16.5,8.914L15.086,7.5L16.5,6.086ZM13.5,9.086L14.914,10.5L13.5,11.914L12.086,10.5L13.5,9.086ZM10.5,12.086L11.914,13.5L10.5,14.914L9.086,13.5L10.5,12.086ZM7.5,15.086L8.914,16.5L7.5,17.914L6.086,16.5L7.5,15.086Z"/>
+</vector>
diff --git a/assets/quantum/res/drawable/quantum_ic_videocam_off_vd_theme_24.xml b/assets/quantum/res/drawable/quantum_ic_videocam_off_vd_theme_24.xml
new file mode 100644
index 0000000..cce9eab
--- /dev/null
+++ b/assets/quantum/res/drawable/quantum_ic_videocam_off_vd_theme_24.xml
@@ -0,0 +1,26 @@
+<!--
+  ~ Copyright (C) 2018 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M21,6.5l-4,4V7c0,-0.55 -0.45,-1 -1,-1H9.82L21,17.18V6.5zM3.27,2L2,3.27 4.73,6H4c-0.55,0 -1,0.45 -1,1v10c0,0.55 0.45,1 1,1h12c0.21,0 0.39,-0.08 0.54,-0.18L19.73,21 21,19.73 3.27,2z"/>
+</vector>
+
diff --git a/assets/quantum/res/drawable/quantum_ic_videocam_vd_white_24.xml b/assets/quantum/res/drawable/quantum_ic_videocam_vd_white_24.xml
new file mode 100644
index 0000000..27420ca
--- /dev/null
+++ b/assets/quantum/res/drawable/quantum_ic_videocam_vd_white_24.xml
@@ -0,0 +1,24 @@
+<!--
+  ~ Copyright (C) 2017 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M17,10.5V7c0,-0.55 -0.45,-1 -1,-1H4c-0.55,0 -1,0.45 -1,1v10c0,0.55 0.45,1 1,1h12c0.55,0 1,-0.45 1,-1v-3.5l4,4v-11l-4,4z"/>
+</vector>
diff --git a/java/com/android/bubble/Bubble.java b/java/com/android/bubble/Bubble.java
new file mode 100644
index 0000000..1b853cf
--- /dev/null
+++ b/java/com/android/bubble/Bubble.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.bubble;
+
+import android.graphics.drawable.Drawable;
+import android.support.annotation.NonNull;
+import java.util.List;
+
+/**
+ * Creates and manages a bubble window from information in a {@link BubbleInfo}. Before creating, be
+ * sure to check whether bubbles may be shown using {@code Settings.canDrawOverlays(context)} and
+ * request permission if necessary
+ */
+public interface Bubble {
+
+  /**
+   * Make the bubble visible. Will show a short entrance animation as it enters. If the bubble is
+   * already showing this method does nothing.
+   */
+  void show();
+
+  /** Hide the bubble. */
+  void hide();
+
+  /** Returns whether the bubble is currently visible */
+  boolean isVisible();
+
+  /** Returns whether the bubble is currently dismissed */
+  boolean isDismissed();
+
+  /**
+   * Set the info for this Bubble to display
+   *
+   * @param bubbleInfo the BubbleInfo to display in this Bubble.
+   */
+  void setBubbleInfo(@NonNull BubbleInfo bubbleInfo);
+
+  /**
+   * Update the state and behavior of actions.
+   *
+   * @param actions the new state of the bubble's actions
+   */
+  void updateActions(@NonNull List<BubbleInfo.Action> actions);
+
+  /**
+   * Update the avatar from photo.
+   *
+   * @param avatar the new photo avatar in the bubble's primary button
+   */
+  void updatePhotoAvatar(@NonNull Drawable avatar);
+
+  /**
+   * Update the avatar.
+   *
+   * @param avatar the new avatar in the bubble's primary button
+   */
+  void updateAvatar(@NonNull Drawable avatar);
+
+  /**
+   * Display text. The bubble's drawer is not expandable while text is showing, and the drawer will
+   * be closed if already open.
+   *
+   * @param text the text to display to the user
+   */
+  void showText(@NonNull CharSequence text);
+}
diff --git a/java/com/android/bubble/BubbleComponent.java b/java/com/android/bubble/BubbleComponent.java
new file mode 100644
index 0000000..7a4665e
--- /dev/null
+++ b/java/com/android/bubble/BubbleComponent.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.bubble;
+
+import android.content.Context;
+import android.support.annotation.NonNull;
+import com.android.dialer.inject.HasRootComponent;
+import dagger.Subcomponent;
+
+@Subcomponent
+public abstract class BubbleComponent {
+
+  @NonNull
+  public abstract Bubble getBubble();
+
+  public static BubbleComponent get(Context context) {
+    return ((HasComponent) ((HasRootComponent) context.getApplicationContext()).component())
+        .bubbleComponent();
+  }
+
+  /** Used to refer to the root application component. */
+  public interface HasComponent {
+    BubbleComponent bubbleComponent();
+  }
+}
diff --git a/java/com/android/bubble/BubbleInfo.java b/java/com/android/bubble/BubbleInfo.java
new file mode 100644
index 0000000..28793a7
--- /dev/null
+++ b/java/com/android/bubble/BubbleInfo.java
@@ -0,0 +1,129 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.bubble;
+
+import android.app.PendingIntent;
+import android.graphics.drawable.Drawable;
+import android.graphics.drawable.Icon;
+import android.support.annotation.ColorInt;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.annotation.Px;
+import com.google.auto.value.AutoValue;
+import java.util.Collections;
+import java.util.List;
+
+/** Info for displaying a {@link Bubble} */
+@AutoValue
+public abstract class BubbleInfo {
+  @ColorInt
+  public abstract int getPrimaryColor();
+
+  public abstract Icon getPrimaryIcon();
+
+  @Nullable
+  public abstract Drawable getAvatar();
+
+  @Px
+  public abstract int getStartingYPosition();
+
+  @NonNull
+  public abstract List<Action> getActions();
+
+  public static Builder builder() {
+    return new AutoValue_BubbleInfo.Builder().setActions(Collections.emptyList());
+  }
+
+  public static Builder from(@NonNull BubbleInfo bubbleInfo) {
+    return builder()
+        .setPrimaryColor(bubbleInfo.getPrimaryColor())
+        .setPrimaryIcon(bubbleInfo.getPrimaryIcon())
+        .setStartingYPosition(bubbleInfo.getStartingYPosition())
+        .setActions(bubbleInfo.getActions())
+        .setAvatar(bubbleInfo.getAvatar());
+  }
+
+  /** Builder for {@link BubbleInfo} */
+  @AutoValue.Builder
+  public abstract static class Builder {
+
+    public abstract Builder setPrimaryColor(@ColorInt int primaryColor);
+
+    public abstract Builder setPrimaryIcon(@NonNull Icon primaryIcon);
+
+    public abstract Builder setAvatar(@Nullable Drawable avatar);
+
+    public abstract Builder setStartingYPosition(@Px int startingYPosition);
+
+    public abstract Builder setActions(List<Action> actions);
+
+    public abstract BubbleInfo build();
+  }
+
+  /** Represents actions to be shown in the bubble when expanded */
+  @AutoValue
+  public abstract static class Action {
+
+    public abstract Drawable getIconDrawable();
+
+    @Nullable
+    public abstract Drawable getSecondaryIconDrawable();
+
+    @NonNull
+    public abstract CharSequence getName();
+
+    @NonNull
+    public abstract PendingIntent getIntent();
+
+    public abstract boolean isCheckable();
+
+    public abstract boolean isChecked();
+
+    public static Builder builder() {
+      return new AutoValue_BubbleInfo_Action.Builder().setCheckable(true).setChecked(false);
+    }
+
+    public static Builder from(@NonNull Action action) {
+      return builder()
+          .setIntent(action.getIntent())
+          .setChecked(action.isChecked())
+          .setCheckable(action.isCheckable())
+          .setName(action.getName())
+          .setIconDrawable(action.getIconDrawable())
+          .setSecondaryIconDrawable(action.getSecondaryIconDrawable());
+    }
+
+    /** Builder for {@link Action} */
+    @AutoValue.Builder
+    public abstract static class Builder {
+
+      public abstract Builder setIconDrawable(Drawable iconDrawable);
+
+      public abstract Builder setSecondaryIconDrawable(@Nullable Drawable secondaryIconDrawable);
+
+      public abstract Builder setName(@NonNull CharSequence name);
+
+      public abstract Builder setIntent(@NonNull PendingIntent intent);
+
+      public abstract Builder setCheckable(boolean enabled);
+
+      public abstract Builder setChecked(boolean checked);
+
+      public abstract Action build();
+    }
+  }
+}
diff --git a/java/com/android/bubble/stub/BubbleStub.java b/java/com/android/bubble/stub/BubbleStub.java
new file mode 100644
index 0000000..2aa55a3
--- /dev/null
+++ b/java/com/android/bubble/stub/BubbleStub.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.bubble.stub;
+
+import android.graphics.drawable.Drawable;
+import android.support.annotation.NonNull;
+import com.android.bubble.Bubble;
+import com.android.bubble.BubbleInfo;
+import java.util.List;
+import javax.inject.Inject;
+
+public class BubbleStub implements Bubble {
+
+  @Inject
+  public BubbleStub() {}
+
+  @Override
+  public void show() {}
+
+  @Override
+  public void hide() {}
+
+  @Override
+  public boolean isVisible() {
+    return false;
+  }
+
+  @Override
+  public boolean isDismissed() {
+    return false;
+  }
+
+  @Override
+  public void setBubbleInfo(@NonNull BubbleInfo bubbleInfo) {}
+
+  @Override
+  public void updateActions(@NonNull List<BubbleInfo.Action> actions) {}
+
+  @Override
+  public void updatePhotoAvatar(@NonNull Drawable avatar) {}
+
+  @Override
+  public void updateAvatar(@NonNull Drawable avatar) {}
+
+  @Override
+  public void showText(@NonNull CharSequence text) {}
+}
diff --git a/java/com/android/bubble/stub/StubBubbleModule.java b/java/com/android/bubble/stub/StubBubbleModule.java
new file mode 100644
index 0000000..783983f
--- /dev/null
+++ b/java/com/android/bubble/stub/StubBubbleModule.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.bubble.stub;
+
+import com.android.bubble.Bubble;
+import dagger.Binds;
+import dagger.Module;
+import javax.inject.Singleton;
+
+@Module
+public abstract class StubBubbleModule {
+
+  @Binds
+  @Singleton
+  public abstract Bubble bindsBubble(BubbleStub bubbleStub);
+}
diff --git a/java/com/android/contacts/common/ContactsUtils.java b/java/com/android/contacts/common/ContactsUtils.java
index bca8b62..7e44a26 100644
--- a/java/com/android/contacts/common/ContactsUtils.java
+++ b/java/com/android/contacts/common/ContactsUtils.java
@@ -17,8 +17,8 @@
 package com.android.contacts.common;
 
 import android.provider.ContactsContract.Contacts;
+import android.provider.ContactsContract.Directory;
 import android.support.annotation.IntDef;
-import com.android.dialer.common.cp2.DirectoryCompat;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
@@ -60,9 +60,7 @@
   public static @UserType long determineUserType(Long directoryId, Long contactId) {
     // First check directory id
     if (directoryId != null) {
-      return DirectoryCompat.isEnterpriseDirectoryId(directoryId)
-          ? USER_TYPE_WORK
-          : USER_TYPE_CURRENT;
+      return Directory.isEnterpriseDirectoryId(directoryId) ? USER_TYPE_WORK : USER_TYPE_CURRENT;
     }
     // Only check contact id if directory id is null
     if (contactId != null && contactId != 0L && Contacts.isEnterpriseContactId(contactId)) {
diff --git a/java/com/android/contacts/common/compat/CallableCompat.java b/java/com/android/contacts/common/compat/CallableCompat.java
deleted file mode 100644
index 5e86f51..0000000
--- a/java/com/android/contacts/common/compat/CallableCompat.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.contacts.common.compat;
-
-import android.net.Uri;
-import android.os.Build.VERSION;
-import android.os.Build.VERSION_CODES;
-import android.provider.ContactsContract.CommonDataKinds.Callable;
-
-public class CallableCompat {
-
-  // TODO: Use N APIs
-  private static final Uri ENTERPRISE_CONTENT_FILTER_URI =
-      Uri.withAppendedPath(Callable.CONTENT_URI, "filter_enterprise");
-
-  public static Uri getContentFilterUri() {
-    if (VERSION.SDK_INT >= VERSION_CODES.N) {
-      return ENTERPRISE_CONTENT_FILTER_URI;
-    }
-    return Callable.CONTENT_FILTER_URI;
-  }
-}
diff --git a/java/com/android/contacts/common/compat/ContactsCompat.java b/java/com/android/contacts/common/compat/ContactsCompat.java
deleted file mode 100644
index e0c9b7e..0000000
--- a/java/com/android/contacts/common/compat/ContactsCompat.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.contacts.common.compat;
-
-import android.net.Uri;
-import android.os.Build.VERSION;
-import android.os.Build.VERSION_CODES;
-import android.provider.ContactsContract;
-import android.provider.ContactsContract.Contacts;
-
-/** Compatibility class for {@link ContactsContract.Contacts} */
-public class ContactsCompat {
-
-  // TODO: Use N APIs
-  private static final Uri ENTERPRISE_CONTENT_FILTER_URI =
-      Uri.withAppendedPath(Contacts.CONTENT_URI, "filter_enterprise");
-
-  /** Not instantiable. */
-  private ContactsCompat() {}
-
-  public static Uri getContentUri() {
-    if (VERSION.SDK_INT >= VERSION_CODES.N) {
-      return ENTERPRISE_CONTENT_FILTER_URI;
-    }
-    return Contacts.CONTENT_FILTER_URI;
-  }
-}
diff --git a/java/com/android/contacts/common/compat/PhoneCompat.java b/java/com/android/contacts/common/compat/PhoneCompat.java
deleted file mode 100644
index 31db7b5..0000000
--- a/java/com/android/contacts/common/compat/PhoneCompat.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.contacts.common.compat;
-
-import android.net.Uri;
-import android.os.Build.VERSION;
-import android.os.Build.VERSION_CODES;
-import android.provider.ContactsContract.CommonDataKinds.Phone;
-
-public class PhoneCompat {
-
-  // TODO: Use N APIs
-  private static final Uri ENTERPRISE_CONTENT_FILTER_URI =
-      Uri.withAppendedPath(Phone.CONTENT_URI, "filter_enterprise");
-
-  public static Uri getContentFilterUri() {
-    if (VERSION.SDK_INT >= VERSION_CODES.N) {
-      return ENTERPRISE_CONTENT_FILTER_URI;
-    }
-    return Phone.CONTENT_FILTER_URI;
-  }
-}
diff --git a/java/com/android/contacts/common/compat/telecom/TelecomManagerCompat.java b/java/com/android/contacts/common/compat/telecom/TelecomManagerCompat.java
index bb0d3c6..ca8ed29 100644
--- a/java/com/android/contacts/common/compat/telecom/TelecomManagerCompat.java
+++ b/java/com/android/contacts/common/compat/telecom/TelecomManagerCompat.java
@@ -23,11 +23,6 @@
 /** Compatibility class for {@link android.telecom.TelecomManager}. */
 public class TelecomManagerCompat {
 
-  // TODO(mdooley): remove once this is available in android.telecom.Call
-  // a bug
-  public static final String EXTRA_LAST_EMERGENCY_CALLBACK_TIME_MILLIS =
-      "android.telecom.extra.LAST_EMERGENCY_CALLBACK_TIME_MILLIS";
-
   // Constants from http://cs/android/frameworks/base/telecomm/java/android/telecom/Call.java.
   public static final String EVENT_REQUEST_HANDOVER = "android.telecom.event.REQUEST_HANDOVER";
   public static final String EXTRA_HANDOVER_PHONE_ACCOUNT_HANDLE =
diff --git a/java/com/android/contacts/common/dialog/CallSubjectDialog.java b/java/com/android/contacts/common/dialog/CallSubjectDialog.java
index 2ba2476..bf0ac14 100644
--- a/java/com/android/contacts/common/dialog/CallSubjectDialog.java
+++ b/java/com/android/contacts/common/dialog/CallSubjectDialog.java
@@ -23,8 +23,6 @@
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.net.Uri;
-import android.os.Build.VERSION;
-import android.os.Build.VERSION_CODES;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
 import android.telecom.PhoneAccount;
@@ -43,12 +41,12 @@
 import android.widget.ListView;
 import android.widget.QuickContactBadge;
 import android.widget.TextView;
-import com.android.contacts.common.R;
 import com.android.dialer.animation.AnimUtils;
 import com.android.dialer.callintent.CallInitiationType;
 import com.android.dialer.callintent.CallIntentBuilder;
 import com.android.dialer.common.LogUtil;
 import com.android.dialer.contactphoto.ContactPhotoManager;
+import com.android.dialer.contacts.resources.R;
 import com.android.dialer.lettertile.LetterTileDrawable;
 import com.android.dialer.precall.PreCall;
 import com.android.dialer.util.ViewUtil;
@@ -331,7 +329,7 @@
       mNumberView.setText(
           TextUtils.isEmpty(mNumberLabel)
               ? mDisplayNumber
-              : getString(R.string.call_subject_type_and_number, mNumberLabel, mDisplayNumber));
+              : getString(R.string.old_call_subject_type_and_number, mNumberLabel, mDisplayNumber));
     } else {
       mNumberView.setVisibility(View.GONE);
       mNumberView.setText(null);
@@ -519,18 +517,15 @@
    * current phone account.
    */
   private void loadConfiguration() {
-    // Only attempt to load configuration from the phone account extras if the SDK is N or
-    // later.  If we've got a prior SDK the default encoding and message length will suffice.
-    if (VERSION.SDK_INT < VERSION_CODES.N) {
-      return;
-    }
-
     if (mPhoneAccountHandle == null) {
       return;
     }
 
     TelecomManager telecomManager = (TelecomManager) getSystemService(Context.TELECOM_SERVICE);
     final PhoneAccount account = telecomManager.getPhoneAccount(mPhoneAccountHandle);
+    if (account == null) {
+      return;
+    }
 
     Bundle phoneAccountExtras = account.getExtras();
     if (phoneAccountExtras == null) {
diff --git a/java/com/android/contacts/common/dialog/ClearFrequentsDialog.java b/java/com/android/contacts/common/dialog/ClearFrequentsDialog.java
index 751490a..cd9511c 100644
--- a/java/com/android/contacts/common/dialog/ClearFrequentsDialog.java
+++ b/java/com/android/contacts/common/dialog/ClearFrequentsDialog.java
@@ -28,7 +28,7 @@
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.provider.ContactsContract;
-import com.android.contacts.common.R;
+import com.android.dialer.contacts.resources.R;
 import com.android.dialer.util.PermissionsUtil;
 
 /** Dialog that clears the frequently contacted list after confirming with the user. */
diff --git a/java/com/android/contacts/common/extensions/PhoneDirectoryExtender.java b/java/com/android/contacts/common/extensions/PhoneDirectoryExtender.java
index 6c932daf..5e9753f 100644
--- a/java/com/android/contacts/common/extensions/PhoneDirectoryExtender.java
+++ b/java/com/android/contacts/common/extensions/PhoneDirectoryExtender.java
@@ -17,18 +17,10 @@
 import android.content.Context;
 import android.net.Uri;
 import android.support.annotation.Nullable;
-import com.android.contacts.common.list.DirectoryPartition;
-import java.util.List;
 
 /** An interface for adding extended phone directories. */
 public interface PhoneDirectoryExtender {
 
-  /**
-   * Return a list of extended directories to add. May return null if no directories are to be
-   * added.
-   */
-  List<DirectoryPartition> getExtendedDirectories(Context context);
-
   /** returns true if the nearby places directory is enabled. */
   boolean isEnabled(Context context);
 
diff --git a/java/com/android/contacts/common/extensions/PhoneDirectoryExtenderStub.java b/java/com/android/contacts/common/extensions/PhoneDirectoryExtenderStub.java
index 4c3d3d1..5b3cb99 100644
--- a/java/com/android/contacts/common/extensions/PhoneDirectoryExtenderStub.java
+++ b/java/com/android/contacts/common/extensions/PhoneDirectoryExtenderStub.java
@@ -17,19 +17,11 @@
 import android.content.Context;
 import android.net.Uri;
 import android.support.annotation.Nullable;
-import com.android.contacts.common.list.DirectoryPartition;
-import java.util.Collections;
-import java.util.List;
 
 /** No-op implementation for phone directory extender. */
 class PhoneDirectoryExtenderStub implements PhoneDirectoryExtender {
 
   @Override
-  public List<DirectoryPartition> getExtendedDirectories(Context context) {
-    return Collections.emptyList();
-  }
-
-  @Override
   public boolean isEnabled(Context context) {
     return false;
   }
diff --git a/java/com/android/contacts/common/format/TextHighlighter.java b/java/com/android/contacts/common/format/TextHighlighter.java
deleted file mode 100644
index f397f04..0000000
--- a/java/com/android/contacts/common/format/TextHighlighter.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.contacts.common.format;
-
-import android.text.SpannableString;
-import android.text.style.CharacterStyle;
-import android.text.style.StyleSpan;
-import android.widget.TextView;
-
-/** Highlights the text in a text field. */
-public class TextHighlighter {
-
-  private int mTextStyle;
-
-  private CharacterStyle mTextStyleSpan;
-
-  public TextHighlighter(int textStyle) {
-    mTextStyle = textStyle;
-    mTextStyleSpan = getStyleSpan();
-  }
-
-  /**
-   * Sets the text on the given text view, highlighting the word that matches the given prefix.
-   *
-   * @param view the view on which to set the text
-   * @param text the string to use as the text
-   * @param prefix the prefix to look for
-   */
-  public void setPrefixText(TextView view, String text, String prefix) {
-    view.setText(applyPrefixHighlight(text, prefix));
-  }
-
-  private CharacterStyle getStyleSpan() {
-    return new StyleSpan(mTextStyle);
-  }
-
-  /**
-   * Applies highlight span to the text.
-   *
-   * @param text Text sequence to be highlighted.
-   * @param start Start position of the highlight sequence.
-   * @param end End position of the highlight sequence.
-   */
-  public void applyMaskingHighlight(SpannableString text, int start, int end) {
-    /** Sets text color of the masked locations to be highlighted. */
-    text.setSpan(getStyleSpan(), start, end, 0);
-  }
-
-  /**
-   * Returns a CharSequence which highlights the given prefix if found in the given text.
-   *
-   * @param text the text to which to apply the highlight
-   * @param prefix the prefix to look for
-   */
-  public CharSequence applyPrefixHighlight(CharSequence text, String prefix) {
-    if (prefix == null) {
-      return text;
-    }
-
-    // Skip non-word characters at the beginning of prefix.
-    int prefixStart = 0;
-    while (prefixStart < prefix.length()
-        && !Character.isLetterOrDigit(prefix.charAt(prefixStart))) {
-      prefixStart++;
-    }
-    final String trimmedPrefix = prefix.substring(prefixStart);
-
-    int index = indexOfWordPrefix(text, trimmedPrefix);
-    if (index != -1) {
-      final SpannableString result = new SpannableString(text);
-      result.setSpan(mTextStyleSpan, index, index + trimmedPrefix.length(), 0 /* flags */);
-      return result;
-    } else {
-      return text;
-    }
-  }
-
-  /**
-   * Finds the index of the first word that starts with the given prefix.
-   *
-   * <p>If not found, returns -1.
-   *
-   * @param text the text in which to search for the prefix
-   * @param prefix the text to find, in upper case letters
-   */
-  public static int indexOfWordPrefix(CharSequence text, String prefix) {
-    if (prefix == null || text == null) {
-      return -1;
-    }
-
-    int textLength = text.length();
-    int prefixLength = prefix.length();
-
-    if (prefixLength == 0 || textLength < prefixLength) {
-      return -1;
-    }
-
-    int i = 0;
-    while (i < textLength) {
-      // Skip non-word characters
-      while (i < textLength && !Character.isLetterOrDigit(text.charAt(i))) {
-        i++;
-      }
-
-      if (i + prefixLength > textLength) {
-        return -1;
-      }
-
-      // Compare the prefixes
-      int j;
-      for (j = 0; j < prefixLength; j++) {
-        if (Character.toUpperCase(text.charAt(i + j)) != prefix.charAt(j)) {
-          break;
-        }
-      }
-      if (j == prefixLength) {
-        return i;
-      }
-
-      // Skip this word
-      while (i < textLength && Character.isLetterOrDigit(text.charAt(i))) {
-        i++;
-      }
-    }
-
-    return -1;
-  }
-}
diff --git a/java/com/android/contacts/common/list/AutoScrollListView.java b/java/com/android/contacts/common/list/AutoScrollListView.java
deleted file mode 100644
index 8d6455f..0000000
--- a/java/com/android/contacts/common/list/AutoScrollListView.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.contacts.common.list;
-
-import android.content.Context;
-import android.os.Build;
-import android.util.AttributeSet;
-import android.widget.ListView;
-
-/**
- * A ListView that can be asked to scroll (smoothly or otherwise) to a specific position. This class
- * takes advantage of similar functionality that exists in {@link ListView} and enhances it.
- */
-public class AutoScrollListView extends ListView {
-
-  /** Position the element at about 1/3 of the list height */
-  private static final float PREFERRED_SELECTION_OFFSET_FROM_TOP = 0.33f;
-
-  private int mRequestedScrollPosition = -1;
-  private boolean mSmoothScrollRequested;
-
-  public AutoScrollListView(Context context) {
-    super(context);
-  }
-
-  public AutoScrollListView(Context context, AttributeSet attrs) {
-    super(context, attrs);
-  }
-
-  public AutoScrollListView(Context context, AttributeSet attrs, int defStyle) {
-    super(context, attrs, defStyle);
-  }
-
-  /**
-   * Brings the specified position to view by optionally performing a jump-scroll maneuver: first it
-   * jumps to some position near the one requested and then does a smooth scroll to the requested
-   * position. This creates an impression of full smooth scrolling without actually traversing the
-   * entire list. If smooth scrolling is not requested, instantly positions the requested item at a
-   * preferred offset.
-   */
-  public void requestPositionToScreen(int position, boolean smoothScroll) {
-    mRequestedScrollPosition = position;
-    mSmoothScrollRequested = smoothScroll;
-    requestLayout();
-  }
-
-  @Override
-  protected void layoutChildren() {
-    super.layoutChildren();
-    if (mRequestedScrollPosition == -1) {
-      return;
-    }
-
-    final int position = mRequestedScrollPosition;
-    mRequestedScrollPosition = -1;
-
-    int firstPosition = getFirstVisiblePosition() + 1;
-    int lastPosition = getLastVisiblePosition();
-    if (position >= firstPosition && position <= lastPosition) {
-      return; // Already on screen
-    }
-
-    final int offset = (int) (getHeight() * PREFERRED_SELECTION_OFFSET_FROM_TOP);
-    if (!mSmoothScrollRequested) {
-      setSelectionFromTop(position, offset);
-
-      // Since we have changed the scrolling position, we need to redo child layout
-      // Calling "requestLayout" in the middle of a layout pass has no effect,
-      // so we call layoutChildren explicitly
-      super.layoutChildren();
-
-    } else {
-      // We will first position the list a couple of screens before or after
-      // the new selection and then scroll smoothly to it.
-      int twoScreens = (lastPosition - firstPosition) * 2;
-      int preliminaryPosition;
-      if (position < firstPosition) {
-        preliminaryPosition = position + twoScreens;
-        if (preliminaryPosition >= getCount()) {
-          preliminaryPosition = getCount() - 1;
-        }
-        if (preliminaryPosition < firstPosition) {
-          setSelection(preliminaryPosition);
-          super.layoutChildren();
-        }
-      } else {
-        preliminaryPosition = position - twoScreens;
-        if (preliminaryPosition < 0) {
-          preliminaryPosition = 0;
-        }
-        if (preliminaryPosition > lastPosition) {
-          setSelection(preliminaryPosition);
-          super.layoutChildren();
-        }
-      }
-
-      smoothScrollToPositionFromTop(position, offset);
-    }
-  }
-
-  @Override
-  protected void onLayout(boolean changed, int l, int t, int r, int b) {
-    super.onLayout(changed, l, t, r, b);
-
-    // Workaround for a bug and a bug.
-    if (android.os.Build.VERSION.SDK_INT == Build.VERSION_CODES.N
-        || android.os.Build.VERSION.SDK_INT == Build.VERSION_CODES.N_MR1) {
-      layoutChildren();
-    }
-  }
-}
diff --git a/java/com/android/contacts/common/list/ContactEntry.java b/java/com/android/contacts/common/list/ContactEntry.java
index e33165e..90e6735 100644
--- a/java/com/android/contacts/common/list/ContactEntry.java
+++ b/java/com/android/contacts/common/list/ContactEntry.java
@@ -16,25 +16,19 @@
 
 package com.android.contacts.common.list;
 
+import android.content.Context;
 import android.net.Uri;
 import android.provider.ContactsContract.PinnedPositions;
-import android.text.TextUtils;
-import com.android.contacts.common.preference.ContactsPreferences;
+import com.android.dialer.contacts.ContactsComponent;
 
 /** Class to hold contact information */
 public class ContactEntry {
 
   public static final ContactEntry BLANK_ENTRY = new ContactEntry();
-  private static final int UNSET_DISPLAY_ORDER_PREFERENCE = -1;
   /** Primary name for a Contact */
   public String namePrimary;
   /** Alternative name for a Contact, e.g. last name first */
   public String nameAlternative;
-  /**
-   * The user's preference on name display order, last name first or first time first. {@see
-   * ContactsPreferences}
-   */
-  public int nameDisplayOrder = UNSET_DISPLAY_ORDER_PREFERENCE;
 
   public String phoneLabel;
   public String phoneNumber;
@@ -46,12 +40,9 @@
   public boolean isFavorite = false;
   public boolean isDefaultNumber = false;
 
-  public String getPreferredDisplayName() {
-    if (nameDisplayOrder == UNSET_DISPLAY_ORDER_PREFERENCE
-        || nameDisplayOrder == ContactsPreferences.DISPLAY_ORDER_PRIMARY
-        || TextUtils.isEmpty(nameAlternative)) {
-      return namePrimary;
-    }
-    return nameAlternative;
+  public String getPreferredDisplayName(Context context) {
+    return ContactsComponent.get(context)
+        .contactDisplayPreferences()
+        .getDisplayName(namePrimary, nameAlternative);
   }
 }
diff --git a/java/com/android/contacts/common/list/ContactEntryListAdapter.java b/java/com/android/contacts/common/list/ContactEntryListAdapter.java
deleted file mode 100644
index 413a1de..0000000
--- a/java/com/android/contacts/common/list/ContactEntryListAdapter.java
+++ /dev/null
@@ -1,772 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.contacts.common.list;
-
-import android.content.Context;
-import android.content.CursorLoader;
-import android.content.res.Resources;
-import android.database.Cursor;
-import android.net.Uri;
-import android.os.Bundle;
-import android.provider.ContactsContract;
-import android.provider.ContactsContract.CommonDataKinds.Phone;
-import android.provider.ContactsContract.Contacts;
-import android.provider.ContactsContract.Directory;
-import android.text.TextUtils;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.QuickContactBadge;
-import android.widget.SectionIndexer;
-import android.widget.TextView;
-import com.android.contacts.common.ContactsUtils;
-import com.android.contacts.common.R;
-import com.android.contacts.common.util.SearchUtil;
-import com.android.dialer.common.LogUtil;
-import com.android.dialer.common.cp2.DirectoryCompat;
-import com.android.dialer.compat.CompatUtils;
-import com.android.dialer.configprovider.ConfigProviderBindings;
-import com.android.dialer.contactphoto.ContactPhotoManager;
-import com.android.dialer.contactphoto.ContactPhotoManager.DefaultImageRequest;
-import com.android.dialer.logging.InteractionEvent;
-import com.android.dialer.logging.Logger;
-import java.util.HashSet;
-
-/**
- * Common base class for various contact-related lists, e.g. contact list, phone number list etc.
- */
-public abstract class ContactEntryListAdapter extends IndexerListAdapter {
-
-  /**
-   * Indicates whether the {@link Directory#LOCAL_INVISIBLE} directory should be included in the
-   * search.
-   */
-  public static final boolean LOCAL_INVISIBLE_DIRECTORY_ENABLED = false;
-
-  private int mDisplayOrder;
-  private int mSortOrder;
-
-  private boolean mDisplayPhotos;
-  private boolean mCircularPhotos = true;
-  private boolean mQuickContactEnabled;
-  private boolean mAdjustSelectionBoundsEnabled;
-
-  /** The root view of the fragment that this adapter is associated with. */
-  private View mFragmentRootView;
-
-  private ContactPhotoManager mPhotoLoader;
-
-  private String mQueryString;
-  private String mUpperCaseQueryString;
-  private boolean mSearchMode;
-  private int mDirectorySearchMode;
-  private int mDirectoryResultLimit = Integer.MAX_VALUE;
-
-  private boolean mEmptyListEnabled = true;
-
-  private boolean mSelectionVisible;
-
-  private ContactListFilter mFilter;
-  private boolean mDarkTheme = false;
-
-  public static final int SUGGESTIONS_LOADER_ID = 0;
-
-  /** Resource used to provide header-text for default filter. */
-  private CharSequence mDefaultFilterHeaderText;
-
-  public ContactEntryListAdapter(Context context) {
-    super(context);
-    setDefaultFilterHeaderText(R.string.local_search_label);
-    addPartitions();
-  }
-
-  /**
-   * @param fragmentRootView Root view of the fragment. This is used to restrict the scope of image
-   *     loading requests that get cancelled on cursor changes.
-   */
-  protected void setFragmentRootView(View fragmentRootView) {
-    mFragmentRootView = fragmentRootView;
-  }
-
-  protected void setDefaultFilterHeaderText(int resourceId) {
-    mDefaultFilterHeaderText = getContext().getResources().getText(resourceId);
-  }
-
-  @Override
-  protected ContactListItemView newView(
-      Context context, int partition, Cursor cursor, int position, ViewGroup parent) {
-    final ContactListItemView view = new ContactListItemView(context, null);
-    view.setIsSectionHeaderEnabled(isSectionHeaderDisplayEnabled());
-    view.setAdjustSelectionBoundsEnabled(isAdjustSelectionBoundsEnabled());
-    return view;
-  }
-
-  @Override
-  protected void bindView(View itemView, int partition, Cursor cursor, int position) {
-    final ContactListItemView view = (ContactListItemView) itemView;
-    view.setIsSectionHeaderEnabled(isSectionHeaderDisplayEnabled());
-    bindWorkProfileIcon(view, partition);
-  }
-
-  @Override
-  protected View createPinnedSectionHeaderView(Context context, ViewGroup parent) {
-    return new ContactListPinnedHeaderView(context, null, parent);
-  }
-
-  @Override
-  protected void setPinnedSectionTitle(View pinnedHeaderView, String title) {
-    ((ContactListPinnedHeaderView) pinnedHeaderView).setSectionHeaderTitle(title);
-  }
-
-  protected void addPartitions() {
-    if (ConfigProviderBindings.get(getContext()).getBoolean("p13n_ranker_should_enable", false)) {
-      addPartition(createSuggestionsDirectoryPartition());
-    }
-    addPartition(createDefaultDirectoryPartition());
-  }
-
-  protected DirectoryPartition createSuggestionsDirectoryPartition() {
-    DirectoryPartition partition = new DirectoryPartition(true, true);
-    partition.setDirectoryId(SUGGESTIONS_LOADER_ID);
-    partition.setDirectoryType(getContext().getString(R.string.contact_suggestions));
-    partition.setPriorityDirectory(true);
-    partition.setPhotoSupported(true);
-    partition.setLabel(getContext().getString(R.string.local_suggestions_search_label));
-    return partition;
-  }
-
-  protected DirectoryPartition createDefaultDirectoryPartition() {
-    DirectoryPartition partition = new DirectoryPartition(true, true);
-    partition.setDirectoryId(Directory.DEFAULT);
-    partition.setDirectoryType(getContext().getString(R.string.contactsList));
-    partition.setPriorityDirectory(true);
-    partition.setPhotoSupported(true);
-    partition.setLabel(mDefaultFilterHeaderText.toString());
-    return partition;
-  }
-
-  /**
-   * Remove all directories after the default directory. This is typically used when contacts list
-   * screens are asked to exit the search mode and thus need to remove all remote directory results
-   * for the search.
-   *
-   * <p>This code assumes that the default directory and directories before that should not be
-   * deleted (e.g. Join screen has "suggested contacts" directory before the default director, and
-   * we should not remove the directory).
-   */
-  public void removeDirectoriesAfterDefault() {
-    final int partitionCount = getPartitionCount();
-    for (int i = partitionCount - 1; i >= 0; i--) {
-      final Partition partition = getPartition(i);
-      if ((partition instanceof DirectoryPartition)
-          && ((DirectoryPartition) partition).getDirectoryId() == Directory.DEFAULT) {
-        break;
-      } else {
-        removePartition(i);
-      }
-    }
-  }
-
-  protected int getPartitionByDirectoryId(long id) {
-    int count = getPartitionCount();
-    for (int i = 0; i < count; i++) {
-      Partition partition = getPartition(i);
-      if (partition instanceof DirectoryPartition) {
-        if (((DirectoryPartition) partition).getDirectoryId() == id) {
-          return i;
-        }
-      }
-    }
-    return -1;
-  }
-
-  protected DirectoryPartition getDirectoryById(long id) {
-    int count = getPartitionCount();
-    for (int i = 0; i < count; i++) {
-      Partition partition = getPartition(i);
-      if (partition instanceof DirectoryPartition) {
-        final DirectoryPartition directoryPartition = (DirectoryPartition) partition;
-        if (directoryPartition.getDirectoryId() == id) {
-          return directoryPartition;
-        }
-      }
-    }
-    return null;
-  }
-
-  public abstract void configureLoader(CursorLoader loader, long directoryId);
-
-  /** Marks all partitions as "loading" */
-  public void onDataReload() {
-    boolean notify = false;
-    int count = getPartitionCount();
-    for (int i = 0; i < count; i++) {
-      Partition partition = getPartition(i);
-      if (partition instanceof DirectoryPartition) {
-        DirectoryPartition directoryPartition = (DirectoryPartition) partition;
-        if (!directoryPartition.isLoading()) {
-          notify = true;
-        }
-        directoryPartition.setStatus(DirectoryPartition.STATUS_NOT_LOADED);
-      }
-    }
-    if (notify) {
-      notifyDataSetChanged();
-    }
-  }
-
-  @Override
-  public void clearPartitions() {
-    int count = getPartitionCount();
-    for (int i = 0; i < count; i++) {
-      Partition partition = getPartition(i);
-      if (partition instanceof DirectoryPartition) {
-        DirectoryPartition directoryPartition = (DirectoryPartition) partition;
-        directoryPartition.setStatus(DirectoryPartition.STATUS_NOT_LOADED);
-      }
-    }
-    super.clearPartitions();
-  }
-
-  public boolean isSearchMode() {
-    return mSearchMode;
-  }
-
-  public void setSearchMode(boolean flag) {
-    mSearchMode = flag;
-  }
-
-  public String getQueryString() {
-    return mQueryString;
-  }
-
-  public void setQueryString(String queryString) {
-    mQueryString = queryString;
-    if (TextUtils.isEmpty(queryString)) {
-      mUpperCaseQueryString = null;
-    } else {
-      mUpperCaseQueryString = SearchUtil.cleanStartAndEndOfSearchQuery(queryString.toUpperCase());
-    }
-
-    // Enable default partition header if in search mode (including zero-suggest).
-    if (mQueryString != null) {
-      setDefaultPartitionHeader(true);
-    }
-  }
-
-  public String getUpperCaseQueryString() {
-    return mUpperCaseQueryString;
-  }
-
-  public int getDirectorySearchMode() {
-    return mDirectorySearchMode;
-  }
-
-  public void setDirectorySearchMode(int mode) {
-    mDirectorySearchMode = mode;
-  }
-
-  public int getDirectoryResultLimit() {
-    return mDirectoryResultLimit;
-  }
-
-  public void setDirectoryResultLimit(int limit) {
-    this.mDirectoryResultLimit = limit;
-  }
-
-  public int getDirectoryResultLimit(DirectoryPartition directoryPartition) {
-    final int limit = directoryPartition.getResultLimit();
-    return limit == DirectoryPartition.RESULT_LIMIT_DEFAULT ? mDirectoryResultLimit : limit;
-  }
-
-  public int getContactNameDisplayOrder() {
-    return mDisplayOrder;
-  }
-
-  public void setContactNameDisplayOrder(int displayOrder) {
-    mDisplayOrder = displayOrder;
-  }
-
-  public int getSortOrder() {
-    return mSortOrder;
-  }
-
-  public void setSortOrder(int sortOrder) {
-    mSortOrder = sortOrder;
-  }
-
-  protected ContactPhotoManager getPhotoLoader() {
-    return mPhotoLoader;
-  }
-
-  public void setPhotoLoader(ContactPhotoManager photoLoader) {
-    mPhotoLoader = photoLoader;
-  }
-
-  public boolean getDisplayPhotos() {
-    return mDisplayPhotos;
-  }
-
-  public void setDisplayPhotos(boolean displayPhotos) {
-    mDisplayPhotos = displayPhotos;
-  }
-
-  public boolean getCircularPhotos() {
-    return mCircularPhotos;
-  }
-
-  public boolean isSelectionVisible() {
-    return mSelectionVisible;
-  }
-
-  public void setSelectionVisible(boolean flag) {
-    this.mSelectionVisible = flag;
-  }
-
-  public boolean isQuickContactEnabled() {
-    return mQuickContactEnabled;
-  }
-
-  public void setQuickContactEnabled(boolean quickContactEnabled) {
-    mQuickContactEnabled = quickContactEnabled;
-  }
-
-  public boolean isAdjustSelectionBoundsEnabled() {
-    return mAdjustSelectionBoundsEnabled;
-  }
-
-  public void setAdjustSelectionBoundsEnabled(boolean enabled) {
-    mAdjustSelectionBoundsEnabled = enabled;
-  }
-
-  public void setProfileExists(boolean exists) {
-    // Stick the "ME" header for the profile
-    if (exists) {
-      setSectionHeader(R.string.user_profile_contacts_list_header, /* # of ME */ 1);
-    }
-  }
-
-  private void setSectionHeader(int resId, int numberOfItems) {
-    SectionIndexer indexer = getIndexer();
-    if (indexer != null) {
-      ((ContactsSectionIndexer) indexer)
-          .setProfileAndFavoritesHeader(getContext().getString(resId), numberOfItems);
-    }
-  }
-
-  public void setDarkTheme(boolean value) {
-    mDarkTheme = value;
-  }
-
-  /** Updates partitions according to the directory meta-data contained in the supplied cursor. */
-  public void changeDirectories(Cursor cursor) {
-    if (cursor.getCount() == 0) {
-      // Directory table must have at least local directory, without which this adapter will
-      // enter very weird state.
-      LogUtil.i(
-          "ContactEntryListAdapter.changeDirectories",
-          "directory search loader returned an empty cursor, which implies we have "
-              + "no directory entries.",
-          new RuntimeException());
-      return;
-    }
-    HashSet<Long> directoryIds = new HashSet<Long>();
-
-    int idColumnIndex = cursor.getColumnIndex(Directory._ID);
-    int directoryTypeColumnIndex = cursor.getColumnIndex(DirectoryListLoader.DIRECTORY_TYPE);
-    int displayNameColumnIndex = cursor.getColumnIndex(Directory.DISPLAY_NAME);
-    int photoSupportColumnIndex = cursor.getColumnIndex(Directory.PHOTO_SUPPORT);
-
-    // TODO preserve the order of partition to match those of the cursor
-    // Phase I: add new directories
-    cursor.moveToPosition(-1);
-    while (cursor.moveToNext()) {
-      long id = cursor.getLong(idColumnIndex);
-      directoryIds.add(id);
-      if (getPartitionByDirectoryId(id) == -1) {
-        DirectoryPartition partition = new DirectoryPartition(false, true);
-        partition.setDirectoryId(id);
-        if (DirectoryCompat.isRemoteDirectoryId(id)) {
-          if (DirectoryCompat.isEnterpriseDirectoryId(id)) {
-            partition.setLabel(mContext.getString(R.string.directory_search_label_work));
-          } else {
-            partition.setLabel(mContext.getString(R.string.directory_search_label));
-          }
-        } else {
-          if (DirectoryCompat.isEnterpriseDirectoryId(id)) {
-            partition.setLabel(mContext.getString(R.string.list_filter_phones_work));
-          } else {
-            partition.setLabel(mDefaultFilterHeaderText.toString());
-          }
-        }
-        partition.setDirectoryType(cursor.getString(directoryTypeColumnIndex));
-        partition.setDisplayName(cursor.getString(displayNameColumnIndex));
-        int photoSupport = cursor.getInt(photoSupportColumnIndex);
-        partition.setPhotoSupported(
-            photoSupport == Directory.PHOTO_SUPPORT_THUMBNAIL_ONLY
-                || photoSupport == Directory.PHOTO_SUPPORT_FULL);
-        addPartition(partition);
-      }
-    }
-
-    // Phase II: remove deleted directories
-    int count = getPartitionCount();
-    for (int i = count; --i >= 0; ) {
-      Partition partition = getPartition(i);
-      if (partition instanceof DirectoryPartition) {
-        long id = ((DirectoryPartition) partition).getDirectoryId();
-        if (!directoryIds.contains(id)) {
-          removePartition(i);
-        }
-      }
-    }
-
-    invalidate();
-    notifyDataSetChanged();
-  }
-
-  @Override
-  public void changeCursor(int partitionIndex, Cursor cursor) {
-    if (partitionIndex >= getPartitionCount()) {
-      // There is no partition for this data
-      return;
-    }
-
-    Partition partition = getPartition(partitionIndex);
-    if (partition instanceof DirectoryPartition) {
-      ((DirectoryPartition) partition).setStatus(DirectoryPartition.STATUS_LOADED);
-    }
-
-    if (mDisplayPhotos && mPhotoLoader != null && isPhotoSupported(partitionIndex)) {
-      mPhotoLoader.refreshCache();
-    }
-
-    super.changeCursor(partitionIndex, cursor);
-
-    if (isSectionHeaderDisplayEnabled() && partitionIndex == getIndexedPartition()) {
-      updateIndexer(cursor);
-    }
-
-    // When the cursor changes, cancel any pending asynchronous photo loads.
-    mPhotoLoader.cancelPendingRequests(mFragmentRootView);
-  }
-
-  public void changeCursor(Cursor cursor) {
-    changeCursor(0, cursor);
-  }
-
-  /** Updates the indexer, which is used to produce section headers. */
-  private void updateIndexer(Cursor cursor) {
-    if (cursor == null || cursor.isClosed()) {
-      setIndexer(null);
-      return;
-    }
-
-    Bundle bundle = cursor.getExtras();
-    if (bundle.containsKey(Contacts.EXTRA_ADDRESS_BOOK_INDEX_TITLES)
-        && bundle.containsKey(Contacts.EXTRA_ADDRESS_BOOK_INDEX_COUNTS)) {
-      String[] sections = bundle.getStringArray(Contacts.EXTRA_ADDRESS_BOOK_INDEX_TITLES);
-      int[] counts = bundle.getIntArray(Contacts.EXTRA_ADDRESS_BOOK_INDEX_COUNTS);
-
-      if (getExtraStartingSection()) {
-        // Insert an additional unnamed section at the top of the list.
-        String[] allSections = new String[sections.length + 1];
-        int[] allCounts = new int[counts.length + 1];
-        for (int i = 0; i < sections.length; i++) {
-          allSections[i + 1] = sections[i];
-          allCounts[i + 1] = counts[i];
-        }
-        allCounts[0] = 1;
-        allSections[0] = "";
-        setIndexer(new ContactsSectionIndexer(allSections, allCounts));
-      } else {
-        setIndexer(new ContactsSectionIndexer(sections, counts));
-      }
-    } else {
-      setIndexer(null);
-    }
-  }
-
-  protected boolean getExtraStartingSection() {
-    return false;
-  }
-
-  @Override
-  public int getViewTypeCount() {
-    // We need a separate view type for each item type, plus another one for
-    // each type with header, plus one for "other".
-    return getItemViewTypeCount() * 2 + 1;
-  }
-
-  @Override
-  public int getItemViewType(int partitionIndex, int position) {
-    int type = super.getItemViewType(partitionIndex, position);
-    if (!isUserProfile(position)
-        && isSectionHeaderDisplayEnabled()
-        && partitionIndex == getIndexedPartition()) {
-      Placement placement = getItemPlacementInSection(position);
-      return placement.firstInSection ? type : getItemViewTypeCount() + type;
-    } else {
-      return type;
-    }
-  }
-
-  @Override
-  public boolean isEmpty() {
-    // TODO
-    //        if (contactsListActivity.mProviderStatus != ProviderStatus.STATUS_NORMAL) {
-    //            return true;
-    //        }
-
-    if (!mEmptyListEnabled) {
-      return false;
-    } else if (isSearchMode()) {
-      return TextUtils.isEmpty(getQueryString());
-    } else {
-      return super.isEmpty();
-    }
-  }
-
-  public boolean isLoading() {
-    int count = getPartitionCount();
-    for (int i = 0; i < count; i++) {
-      Partition partition = getPartition(i);
-      if (partition instanceof DirectoryPartition && ((DirectoryPartition) partition).isLoading()) {
-        return true;
-      }
-    }
-    return false;
-  }
-
-  /** Configures visibility parameters for the directory partitions. */
-  public void configurePartitionsVisibility(boolean isInSearchMode) {
-    for (int i = 0; i < getPartitionCount(); i++) {
-      setShowIfEmpty(i, false);
-      setHasHeader(i, isInSearchMode);
-    }
-  }
-
-  // Sets header for the default partition.
-  private void setDefaultPartitionHeader(boolean setHeader) {
-    // Iterate in reverse here to ensure the first DEFAULT directory has header.
-    // Both "Suggestions" and "All Contacts" directories have DEFAULT id.
-    int defaultPartitionIndex = -1;
-    for (int i = getPartitionCount() - 1; i >= 0; i--) {
-      Partition partition = getPartition(i);
-      if (partition instanceof DirectoryPartition
-          && ((DirectoryPartition) partition).getDirectoryId() == Directory.DEFAULT) {
-        defaultPartitionIndex = i;
-      }
-    }
-    setHasHeader(defaultPartitionIndex, setHeader);
-  }
-
-  @Override
-  protected View newHeaderView(Context context, int partition, Cursor cursor, ViewGroup parent) {
-    LayoutInflater inflater = LayoutInflater.from(context);
-    View view = inflater.inflate(R.layout.directory_header, parent, false);
-    if (!getPinnedPartitionHeadersEnabled()) {
-      // If the headers are unpinned, there is no need for their background
-      // color to be non-transparent. Setting this transparent reduces maintenance for
-      // non-pinned headers. We don't need to bother synchronizing the activity's
-      // background color with the header background color.
-      view.setBackground(null);
-    }
-    return view;
-  }
-
-  protected void bindWorkProfileIcon(final ContactListItemView view, int partitionId) {
-    final Partition partition = getPartition(partitionId);
-    if (partition instanceof DirectoryPartition) {
-      final DirectoryPartition directoryPartition = (DirectoryPartition) partition;
-      final long directoryId = directoryPartition.getDirectoryId();
-      final long userType = ContactsUtils.determineUserType(directoryId, null);
-      view.setWorkProfileIconEnabled(userType == ContactsUtils.USER_TYPE_WORK);
-    }
-  }
-
-  @Override
-  protected void bindHeaderView(View view, int partitionIndex, Cursor cursor) {
-    Partition partition = getPartition(partitionIndex);
-    if (!(partition instanceof DirectoryPartition)) {
-      return;
-    }
-
-    DirectoryPartition directoryPartition = (DirectoryPartition) partition;
-    long directoryId = directoryPartition.getDirectoryId();
-    TextView labelTextView = (TextView) view.findViewById(R.id.label);
-    TextView displayNameTextView = (TextView) view.findViewById(R.id.display_name);
-    labelTextView.setText(directoryPartition.getLabel());
-    if (!DirectoryCompat.isRemoteDirectoryId(directoryId)) {
-      displayNameTextView.setText(null);
-    } else {
-      String directoryName = directoryPartition.getDisplayName();
-      String displayName =
-          !TextUtils.isEmpty(directoryName) ? directoryName : directoryPartition.getDirectoryType();
-      displayNameTextView.setText(displayName);
-    }
-
-    final Resources res = getContext().getResources();
-    final int headerPaddingTop =
-        partitionIndex == 1 && getPartition(0).isEmpty()
-            ? 0
-            : res.getDimensionPixelOffset(R.dimen.directory_header_extra_top_padding);
-    // There should be no extra padding at the top of the first directory header
-    view.setPaddingRelative(
-        view.getPaddingStart(), headerPaddingTop, view.getPaddingEnd(), view.getPaddingBottom());
-  }
-
-  /** Checks whether the contact entry at the given position represents the user's profile. */
-  protected boolean isUserProfile(int position) {
-    // The profile only ever appears in the first position if it is present.  So if the position
-    // is anything beyond 0, it can't be the profile.
-    boolean isUserProfile = false;
-    if (position == 0) {
-      int partition = getPartitionForPosition(position);
-      if (partition >= 0) {
-        // Save the old cursor position - the call to getItem() may modify the cursor
-        // position.
-        int offset = getCursor(partition).getPosition();
-        Cursor cursor = (Cursor) getItem(position);
-        if (cursor != null) {
-          int profileColumnIndex = cursor.getColumnIndex(Contacts.IS_USER_PROFILE);
-          if (profileColumnIndex != -1) {
-            isUserProfile = cursor.getInt(profileColumnIndex) == 1;
-          }
-          // Restore the old cursor position.
-          cursor.moveToPosition(offset);
-        }
-      }
-    }
-    return isUserProfile;
-  }
-
-  public boolean isPhotoSupported(int partitionIndex) {
-    Partition partition = getPartition(partitionIndex);
-    if (partition instanceof DirectoryPartition) {
-      return ((DirectoryPartition) partition).isPhotoSupported();
-    }
-    return true;
-  }
-
-  /** Returns the currently selected filter. */
-  public ContactListFilter getFilter() {
-    return mFilter;
-  }
-
-  public void setFilter(ContactListFilter filter) {
-    mFilter = filter;
-  }
-
-  // TODO: move sharable logic (bindXX() methods) to here with extra arguments
-
-  /**
-   * Loads the photo for the quick contact view and assigns the contact uri.
-   *
-   * @param photoIdColumn Index of the photo id column
-   * @param photoUriColumn Index of the photo uri column. Optional: Can be -1
-   * @param contactIdColumn Index of the contact id column
-   * @param lookUpKeyColumn Index of the lookup key column
-   * @param displayNameColumn Index of the display name column
-   */
-  protected void bindQuickContact(
-      final ContactListItemView view,
-      int partitionIndex,
-      Cursor cursor,
-      int photoIdColumn,
-      int photoUriColumn,
-      int contactIdColumn,
-      int lookUpKeyColumn,
-      int displayNameColumn) {
-    long photoId = 0;
-    if (!cursor.isNull(photoIdColumn)) {
-      photoId = cursor.getLong(photoIdColumn);
-    }
-
-    QuickContactBadge quickContact = view.getQuickContact();
-    quickContact.assignContactUri(
-        getContactUri(partitionIndex, cursor, contactIdColumn, lookUpKeyColumn));
-    if (CompatUtils.hasPrioritizedMimeType()) {
-      // The Contacts app never uses the QuickContactBadge. Therefore, it is safe to assume
-      // that only Dialer will use this QuickContact badge. This means prioritizing the phone
-      // mimetype here is reasonable.
-      quickContact.setPrioritizedMimeType(Phone.CONTENT_ITEM_TYPE);
-    }
-    Logger.get(mContext)
-        .logQuickContactOnTouch(
-            quickContact, InteractionEvent.Type.OPEN_QUICK_CONTACT_FROM_SEARCH, true);
-
-    if (photoId != 0 || photoUriColumn == -1) {
-      getPhotoLoader().loadThumbnail(quickContact, photoId, mDarkTheme, mCircularPhotos, null);
-    } else {
-      final String photoUriString = cursor.getString(photoUriColumn);
-      final Uri photoUri = photoUriString == null ? null : Uri.parse(photoUriString);
-      DefaultImageRequest request = null;
-      if (photoUri == null) {
-        request = getDefaultImageRequestFromCursor(cursor, displayNameColumn, lookUpKeyColumn);
-      }
-      getPhotoLoader().loadPhoto(quickContact, photoUri, -1, mDarkTheme, mCircularPhotos, request);
-    }
-  }
-
-  @Override
-  public boolean hasStableIds() {
-    // Whenever bindViewId() is called, the values passed into setId() are stable or
-    // stable-ish. For example, when one contact is modified we don't expect a second
-    // contact's Contact._ID values to change.
-    return true;
-  }
-
-  protected void bindViewId(final ContactListItemView view, Cursor cursor, int idColumn) {
-    // Set a semi-stable id, so that talkback won't get confused when the list gets
-    // refreshed. There is little harm in inserting the same ID twice.
-    long contactId = cursor.getLong(idColumn);
-    view.setId((int) (contactId % Integer.MAX_VALUE));
-  }
-
-  protected Uri getContactUri(
-      int partitionIndex, Cursor cursor, int contactIdColumn, int lookUpKeyColumn) {
-    long contactId = cursor.getLong(contactIdColumn);
-    String lookupKey = cursor.getString(lookUpKeyColumn);
-    long directoryId = ((DirectoryPartition) getPartition(partitionIndex)).getDirectoryId();
-    Uri uri = Contacts.getLookupUri(contactId, lookupKey);
-    if (uri != null && directoryId != Directory.DEFAULT) {
-      uri =
-          uri.buildUpon()
-              .appendQueryParameter(
-                  ContactsContract.DIRECTORY_PARAM_KEY, String.valueOf(directoryId))
-              .build();
-    }
-    return uri;
-  }
-
-  /**
-   * Retrieves the lookup key and display name from a cursor, and returns a {@link
-   * DefaultImageRequest} containing these contact details
-   *
-   * @param cursor Contacts cursor positioned at the current row to retrieve contact details for
-   * @param displayNameColumn Column index of the display name
-   * @param lookupKeyColumn Column index of the lookup key
-   * @return {@link DefaultImageRequest} with the displayName and identifier fields set to the
-   *     display name and lookup key of the contact.
-   */
-  public DefaultImageRequest getDefaultImageRequestFromCursor(
-      Cursor cursor, int displayNameColumn, int lookupKeyColumn) {
-    final String displayName = cursor.getString(displayNameColumn);
-    final String lookupKey = cursor.getString(lookupKeyColumn);
-    return new DefaultImageRequest(displayName, lookupKey, mCircularPhotos);
-  }
-}
diff --git a/java/com/android/contacts/common/list/ContactEntryListFragment.java b/java/com/android/contacts/common/list/ContactEntryListFragment.java
deleted file mode 100644
index c807ea8..0000000
--- a/java/com/android/contacts/common/list/ContactEntryListFragment.java
+++ /dev/null
@@ -1,860 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.contacts.common.list;
-
-import android.app.Fragment;
-import android.app.LoaderManager;
-import android.app.LoaderManager.LoaderCallbacks;
-import android.content.Context;
-import android.content.CursorLoader;
-import android.content.Loader;
-import android.database.Cursor;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.Message;
-import android.os.Parcelable;
-import android.provider.ContactsContract.Directory;
-import android.support.annotation.Nullable;
-import android.text.TextUtils;
-import android.view.LayoutInflater;
-import android.view.MotionEvent;
-import android.view.View;
-import android.view.View.OnFocusChangeListener;
-import android.view.View.OnTouchListener;
-import android.view.ViewGroup;
-import android.view.inputmethod.InputMethodManager;
-import android.widget.AbsListView;
-import android.widget.AbsListView.OnScrollListener;
-import android.widget.AdapterView;
-import android.widget.AdapterView.OnItemClickListener;
-import android.widget.ListView;
-import com.android.common.widget.CompositeCursorAdapter.Partition;
-import com.android.contacts.common.preference.ContactsPreferences;
-import com.android.contacts.common.util.ContactListViewUtils;
-import com.android.dialer.common.LogUtil;
-import com.android.dialer.contactphoto.ContactPhotoManager;
-import com.android.dialer.performancereport.PerformanceReport;
-import java.lang.ref.WeakReference;
-import java.util.Locale;
-
-/** Common base class for various contact-related list fragments. */
-public abstract class ContactEntryListFragment<T extends ContactEntryListAdapter> extends Fragment
-    implements OnItemClickListener,
-        OnScrollListener,
-        OnFocusChangeListener,
-        OnTouchListener,
-        LoaderCallbacks<Cursor> {
-  private static final String KEY_LIST_STATE = "liststate";
-  private static final String KEY_SECTION_HEADER_DISPLAY_ENABLED = "sectionHeaderDisplayEnabled";
-  private static final String KEY_PHOTO_LOADER_ENABLED = "photoLoaderEnabled";
-  private static final String KEY_QUICK_CONTACT_ENABLED = "quickContactEnabled";
-  private static final String KEY_ADJUST_SELECTION_BOUNDS_ENABLED = "adjustSelectionBoundsEnabled";
-  private static final String KEY_INCLUDE_PROFILE = "includeProfile";
-  private static final String KEY_SEARCH_MODE = "searchMode";
-  private static final String KEY_VISIBLE_SCROLLBAR_ENABLED = "visibleScrollbarEnabled";
-  private static final String KEY_SCROLLBAR_POSITION = "scrollbarPosition";
-  private static final String KEY_QUERY_STRING = "queryString";
-  private static final String KEY_DIRECTORY_SEARCH_MODE = "directorySearchMode";
-  private static final String KEY_SELECTION_VISIBLE = "selectionVisible";
-  private static final String KEY_DARK_THEME = "darkTheme";
-  private static final String KEY_LEGACY_COMPATIBILITY = "legacyCompatibility";
-  private static final String KEY_DIRECTORY_RESULT_LIMIT = "directoryResultLimit";
-
-  private static final String DIRECTORY_ID_ARG_KEY = "directoryId";
-
-  private static final int DIRECTORY_LOADER_ID = -1;
-
-  private static final int DIRECTORY_SEARCH_DELAY_MILLIS = 300;
-  private static final int DIRECTORY_SEARCH_MESSAGE = 1;
-
-  private static final int DEFAULT_DIRECTORY_RESULT_LIMIT = 20;
-  private static final int STATUS_NOT_LOADED = 0;
-  private static final int STATUS_LOADING = 1;
-  private static final int STATUS_LOADED = 2;
-  protected boolean mUserProfileExists;
-  private boolean mSectionHeaderDisplayEnabled;
-  private boolean mPhotoLoaderEnabled;
-  private boolean mQuickContactEnabled = true;
-  private boolean mAdjustSelectionBoundsEnabled = true;
-  private boolean mIncludeProfile;
-  private boolean mSearchMode;
-  private boolean mVisibleScrollbarEnabled;
-  private boolean mShowEmptyListForEmptyQuery;
-  private int mVerticalScrollbarPosition = getDefaultVerticalScrollbarPosition();
-  private String mQueryString;
-  private int mDirectorySearchMode = DirectoryListLoader.SEARCH_MODE_NONE;
-  private boolean mSelectionVisible;
-  private boolean mLegacyCompatibility;
-  private boolean mEnabled = true;
-  private T mAdapter;
-  private View mView;
-  private ListView mListView;
-  /** Used to save the scrolling state of the list when the fragment is not recreated. */
-  private int mListViewTopIndex;
-
-  private int mListViewTopOffset;
-  /** Used for keeping track of the scroll state of the list. */
-  private Parcelable mListState;
-
-  private int mDisplayOrder;
-  private int mSortOrder;
-  private int mDirectoryResultLimit = DEFAULT_DIRECTORY_RESULT_LIMIT;
-  private ContactPhotoManager mPhotoManager;
-  private ContactsPreferences mContactsPrefs;
-  private boolean mForceLoad;
-  private boolean mDarkTheme;
-  private int mDirectoryListStatus = STATUS_NOT_LOADED;
-
-  /**
-   * Indicates whether we are doing the initial complete load of data (false) or a refresh caused by
-   * a change notification (true)
-   */
-  private boolean mLoadPriorityDirectoriesOnly;
-
-  private Context mContext;
-
-  private LoaderManager mLoaderManager;
-
-  private Handler mDelayedDirectorySearchHandler;
-
-  private static class DelayedDirectorySearchHandler extends Handler {
-    private final WeakReference<ContactEntryListFragment<?>> contactEntryListFragmentRef;
-
-    private DelayedDirectorySearchHandler(ContactEntryListFragment<?> contactEntryListFragment) {
-      this.contactEntryListFragmentRef = new WeakReference<>(contactEntryListFragment);
-    }
-
-    @Override
-    public void handleMessage(Message msg) {
-      ContactEntryListFragment<?> contactEntryListFragment = contactEntryListFragmentRef.get();
-      if (contactEntryListFragment == null) {
-        return;
-      }
-      if (msg.what == DIRECTORY_SEARCH_MESSAGE) {
-        contactEntryListFragment.loadDirectoryPartition(msg.arg1, (DirectoryPartition) msg.obj);
-      }
-    }
-  }
-
-  private ContactsPreferences.ChangeListener mPreferencesChangeListener =
-      new ContactsPreferences.ChangeListener() {
-        @Override
-        public void onChange() {
-          loadPreferences();
-          reloadData();
-        }
-      };
-
-  protected ContactEntryListFragment() {
-    mDelayedDirectorySearchHandler = new DelayedDirectorySearchHandler(this);
-  }
-
-  protected abstract View inflateView(LayoutInflater inflater, ViewGroup container);
-
-  protected abstract T createListAdapter();
-
-  /**
-   * @param position Please note that the position is already adjusted for header views, so "0"
-   *     means the first list item below header views.
-   */
-  protected abstract void onItemClick(int position, long id);
-
-  @Override
-  public void onAttach(Context context) {
-    super.onAttach(context);
-    setContext(context);
-    setLoaderManager(super.getLoaderManager());
-  }
-
-  @Override
-  public Context getContext() {
-    return mContext;
-  }
-
-  /** Sets a context for the fragment in the unit test environment. */
-  public void setContext(Context context) {
-    mContext = context;
-    configurePhotoLoader();
-  }
-
-  public void setEnabled(boolean enabled) {
-    if (mEnabled != enabled) {
-      mEnabled = enabled;
-      if (mAdapter != null) {
-        if (mEnabled) {
-          reloadData();
-        } else {
-          mAdapter.clearPartitions();
-        }
-      }
-    }
-  }
-
-  @Override
-  public LoaderManager getLoaderManager() {
-    return mLoaderManager;
-  }
-
-  /** Overrides a loader manager for use in unit tests. */
-  public void setLoaderManager(LoaderManager loaderManager) {
-    mLoaderManager = loaderManager;
-  }
-
-  public T getAdapter() {
-    return mAdapter;
-  }
-
-  @Override
-  public View getView() {
-    return mView;
-  }
-
-  public ListView getListView() {
-    return mListView;
-  }
-
-  @Override
-  public void onSaveInstanceState(Bundle outState) {
-    super.onSaveInstanceState(outState);
-    outState.putBoolean(KEY_SECTION_HEADER_DISPLAY_ENABLED, mSectionHeaderDisplayEnabled);
-    outState.putBoolean(KEY_PHOTO_LOADER_ENABLED, mPhotoLoaderEnabled);
-    outState.putBoolean(KEY_QUICK_CONTACT_ENABLED, mQuickContactEnabled);
-    outState.putBoolean(KEY_ADJUST_SELECTION_BOUNDS_ENABLED, mAdjustSelectionBoundsEnabled);
-    outState.putBoolean(KEY_INCLUDE_PROFILE, mIncludeProfile);
-    outState.putBoolean(KEY_SEARCH_MODE, mSearchMode);
-    outState.putBoolean(KEY_VISIBLE_SCROLLBAR_ENABLED, mVisibleScrollbarEnabled);
-    outState.putInt(KEY_SCROLLBAR_POSITION, mVerticalScrollbarPosition);
-    outState.putInt(KEY_DIRECTORY_SEARCH_MODE, mDirectorySearchMode);
-    outState.putBoolean(KEY_SELECTION_VISIBLE, mSelectionVisible);
-    outState.putBoolean(KEY_LEGACY_COMPATIBILITY, mLegacyCompatibility);
-    outState.putString(KEY_QUERY_STRING, mQueryString);
-    outState.putInt(KEY_DIRECTORY_RESULT_LIMIT, mDirectoryResultLimit);
-    outState.putBoolean(KEY_DARK_THEME, mDarkTheme);
-
-    if (mListView != null) {
-      outState.putParcelable(KEY_LIST_STATE, mListView.onSaveInstanceState());
-    }
-  }
-
-  @Override
-  public void onCreate(Bundle savedState) {
-    super.onCreate(savedState);
-    restoreSavedState(savedState);
-    mAdapter = createListAdapter();
-    mContactsPrefs = new ContactsPreferences(mContext);
-  }
-
-  public void restoreSavedState(Bundle savedState) {
-    if (savedState == null) {
-      return;
-    }
-
-    mSectionHeaderDisplayEnabled = savedState.getBoolean(KEY_SECTION_HEADER_DISPLAY_ENABLED);
-    mPhotoLoaderEnabled = savedState.getBoolean(KEY_PHOTO_LOADER_ENABLED);
-    mQuickContactEnabled = savedState.getBoolean(KEY_QUICK_CONTACT_ENABLED);
-    mAdjustSelectionBoundsEnabled = savedState.getBoolean(KEY_ADJUST_SELECTION_BOUNDS_ENABLED);
-    mIncludeProfile = savedState.getBoolean(KEY_INCLUDE_PROFILE);
-    mSearchMode = savedState.getBoolean(KEY_SEARCH_MODE);
-    mVisibleScrollbarEnabled = savedState.getBoolean(KEY_VISIBLE_SCROLLBAR_ENABLED);
-    mVerticalScrollbarPosition = savedState.getInt(KEY_SCROLLBAR_POSITION);
-    mDirectorySearchMode = savedState.getInt(KEY_DIRECTORY_SEARCH_MODE);
-    mSelectionVisible = savedState.getBoolean(KEY_SELECTION_VISIBLE);
-    mLegacyCompatibility = savedState.getBoolean(KEY_LEGACY_COMPATIBILITY);
-    mQueryString = savedState.getString(KEY_QUERY_STRING);
-    mDirectoryResultLimit = savedState.getInt(KEY_DIRECTORY_RESULT_LIMIT);
-    mDarkTheme = savedState.getBoolean(KEY_DARK_THEME);
-
-    // Retrieve list state. This will be applied in onLoadFinished
-    mListState = savedState.getParcelable(KEY_LIST_STATE);
-  }
-
-  @Override
-  public void onStart() {
-    super.onStart();
-
-    mContactsPrefs.registerChangeListener(mPreferencesChangeListener);
-
-    mForceLoad = loadPreferences();
-
-    mDirectoryListStatus = STATUS_NOT_LOADED;
-    mLoadPriorityDirectoriesOnly = true;
-
-    startLoading();
-  }
-
-  protected void startLoading() {
-    if (mAdapter == null) {
-      // The method was called before the fragment was started
-      return;
-    }
-
-    configureAdapter();
-    int partitionCount = mAdapter.getPartitionCount();
-    for (int i = 0; i < partitionCount; i++) {
-      Partition partition = mAdapter.getPartition(i);
-      if (partition instanceof DirectoryPartition) {
-        DirectoryPartition directoryPartition = (DirectoryPartition) partition;
-        if (directoryPartition.getStatus() == DirectoryPartition.STATUS_NOT_LOADED) {
-          if (directoryPartition.isPriorityDirectory() || !mLoadPriorityDirectoriesOnly) {
-            startLoadingDirectoryPartition(i);
-          }
-        }
-      } else {
-        getLoaderManager().initLoader(i, null, this);
-      }
-    }
-
-    // Next time this method is called, we should start loading non-priority directories
-    mLoadPriorityDirectoriesOnly = false;
-  }
-
-  @Override
-  public Loader<Cursor> onCreateLoader(int id, Bundle args) {
-    if (id == DIRECTORY_LOADER_ID) {
-      DirectoryListLoader loader = new DirectoryListLoader(mContext);
-      loader.setDirectorySearchMode(mAdapter.getDirectorySearchMode());
-      loader.setLocalInvisibleDirectoryEnabled(
-          ContactEntryListAdapter.LOCAL_INVISIBLE_DIRECTORY_ENABLED);
-      return loader;
-    } else {
-      CursorLoader loader = createCursorLoader(mContext);
-      long directoryId =
-          args != null && args.containsKey(DIRECTORY_ID_ARG_KEY)
-              ? args.getLong(DIRECTORY_ID_ARG_KEY)
-              : Directory.DEFAULT;
-      mAdapter.configureLoader(loader, directoryId);
-      return loader;
-    }
-  }
-
-  public CursorLoader createCursorLoader(Context context) {
-    return new CursorLoader(context, null, null, null, null, null) {
-      @Override
-      protected Cursor onLoadInBackground() {
-        try {
-          return super.onLoadInBackground();
-        } catch (RuntimeException e) {
-          // We don't even know what the projection should be, so no point trying to
-          // return an empty MatrixCursor with the correct projection here.
-          LogUtil.w(
-              "ContactEntryListFragment.onLoadInBackground",
-              "RuntimeException while trying to query ContactsProvider.");
-          return null;
-        }
-      }
-    };
-  }
-
-  private void startLoadingDirectoryPartition(int partitionIndex) {
-    DirectoryPartition partition = (DirectoryPartition) mAdapter.getPartition(partitionIndex);
-    partition.setStatus(DirectoryPartition.STATUS_LOADING);
-    long directoryId = partition.getDirectoryId();
-    if (mForceLoad) {
-      if (directoryId == Directory.DEFAULT) {
-        loadDirectoryPartition(partitionIndex, partition);
-      } else {
-        loadDirectoryPartitionDelayed(partitionIndex, partition);
-      }
-    } else {
-      Bundle args = new Bundle();
-      args.putLong(DIRECTORY_ID_ARG_KEY, directoryId);
-      getLoaderManager().initLoader(partitionIndex, args, this);
-    }
-  }
-
-  /**
-   * Queues up a delayed request to search the specified directory. Since directory search will
-   * likely introduce a lot of network traffic, we want to wait for a pause in the user's typing
-   * before sending a directory request.
-   */
-  private void loadDirectoryPartitionDelayed(int partitionIndex, DirectoryPartition partition) {
-    mDelayedDirectorySearchHandler.removeMessages(DIRECTORY_SEARCH_MESSAGE, partition);
-    Message msg =
-        mDelayedDirectorySearchHandler.obtainMessage(
-            DIRECTORY_SEARCH_MESSAGE, partitionIndex, 0, partition);
-    mDelayedDirectorySearchHandler.sendMessageDelayed(msg, DIRECTORY_SEARCH_DELAY_MILLIS);
-  }
-
-  /** Loads the directory partition. */
-  protected void loadDirectoryPartition(int partitionIndex, DirectoryPartition partition) {
-    Bundle args = new Bundle();
-    args.putLong(DIRECTORY_ID_ARG_KEY, partition.getDirectoryId());
-    getLoaderManager().restartLoader(partitionIndex, args, this);
-  }
-
-  /** Cancels all queued directory loading requests. */
-  private void removePendingDirectorySearchRequests() {
-    mDelayedDirectorySearchHandler.removeMessages(DIRECTORY_SEARCH_MESSAGE);
-  }
-
-  @Override
-  public void onLoadFinished(Loader<Cursor> loader, Cursor data) {
-    if (!mEnabled) {
-      return;
-    }
-
-    int loaderId = loader.getId();
-    if (loaderId == DIRECTORY_LOADER_ID) {
-      mDirectoryListStatus = STATUS_LOADED;
-      mAdapter.changeDirectories(data);
-      startLoading();
-    } else {
-      onPartitionLoaded(loaderId, data);
-      if (isSearchMode()) {
-        int directorySearchMode = getDirectorySearchMode();
-        if (directorySearchMode != DirectoryListLoader.SEARCH_MODE_NONE) {
-          if (mDirectoryListStatus == STATUS_NOT_LOADED) {
-            mDirectoryListStatus = STATUS_LOADING;
-            getLoaderManager().initLoader(DIRECTORY_LOADER_ID, null, this);
-          } else {
-            startLoading();
-          }
-        }
-      } else {
-        mDirectoryListStatus = STATUS_NOT_LOADED;
-        getLoaderManager().destroyLoader(DIRECTORY_LOADER_ID);
-      }
-    }
-  }
-
-  @Override
-  public void onLoaderReset(Loader<Cursor> loader) {}
-
-  protected void onPartitionLoaded(int partitionIndex, Cursor data) {
-    if (partitionIndex >= mAdapter.getPartitionCount()) {
-      // When we get unsolicited data, ignore it.  This could happen
-      // when we are switching from search mode to the default mode.
-      return;
-    }
-
-    // Return for non-"Suggestions" if on the zero-suggest screen.
-    if (TextUtils.isEmpty(mQueryString) && partitionIndex > 0) {
-      return;
-    }
-
-    mAdapter.changeCursor(partitionIndex, data);
-    setProfileHeader();
-
-    if (!isLoading()) {
-      completeRestoreInstanceState();
-    }
-  }
-
-  public boolean isLoading() {
-    //noinspection SimplifiableIfStatement
-    if (mAdapter != null && mAdapter.isLoading()) {
-      return true;
-    }
-
-    return isLoadingDirectoryList();
-
-  }
-
-  public boolean isLoadingDirectoryList() {
-    return isSearchMode()
-        && getDirectorySearchMode() != DirectoryListLoader.SEARCH_MODE_NONE
-        && (mDirectoryListStatus == STATUS_NOT_LOADED || mDirectoryListStatus == STATUS_LOADING);
-  }
-
-  @Override
-  public void onStop() {
-    super.onStop();
-    mContactsPrefs.unregisterChangeListener();
-    mAdapter.clearPartitions();
-  }
-
-  protected void reloadData() {
-    removePendingDirectorySearchRequests();
-    mAdapter.onDataReload();
-    mLoadPriorityDirectoriesOnly = true;
-    mForceLoad = true;
-    startLoading();
-  }
-
-  /**
-   * Shows a view at the top of the list with a pseudo local profile prompting the user to add a
-   * local profile. Default implementation does nothing.
-   */
-  protected void setProfileHeader() {
-    mUserProfileExists = false;
-  }
-
-  /** Provides logic that dismisses this fragment. The default implementation does nothing. */
-  protected void finish() {}
-
-  public boolean isSectionHeaderDisplayEnabled() {
-    return mSectionHeaderDisplayEnabled;
-  }
-
-  public void setSectionHeaderDisplayEnabled(boolean flag) {
-    if (mSectionHeaderDisplayEnabled != flag) {
-      mSectionHeaderDisplayEnabled = flag;
-      if (mAdapter != null) {
-        mAdapter.setSectionHeaderDisplayEnabled(flag);
-      }
-      configureVerticalScrollbar();
-    }
-  }
-
-  public boolean isVisibleScrollbarEnabled() {
-    return mVisibleScrollbarEnabled;
-  }
-
-  public void setVisibleScrollbarEnabled(boolean flag) {
-    if (mVisibleScrollbarEnabled != flag) {
-      mVisibleScrollbarEnabled = flag;
-      configureVerticalScrollbar();
-    }
-  }
-
-  private void configureVerticalScrollbar() {
-    boolean hasScrollbar = isVisibleScrollbarEnabled() && isSectionHeaderDisplayEnabled();
-
-    if (mListView != null) {
-      mListView.setFastScrollEnabled(hasScrollbar);
-      mListView.setVerticalScrollbarPosition(mVerticalScrollbarPosition);
-      mListView.setScrollBarStyle(ListView.SCROLLBARS_OUTSIDE_OVERLAY);
-    }
-  }
-
-  public boolean isPhotoLoaderEnabled() {
-    return mPhotoLoaderEnabled;
-  }
-
-  public void setPhotoLoaderEnabled(boolean flag) {
-    mPhotoLoaderEnabled = flag;
-    configurePhotoLoader();
-  }
-
-  public void setQuickContactEnabled(boolean flag) {
-    this.mQuickContactEnabled = flag;
-  }
-
-  public void setAdjustSelectionBoundsEnabled(boolean flag) {
-    mAdjustSelectionBoundsEnabled = flag;
-  }
-
-  public final boolean isSearchMode() {
-    return mSearchMode;
-  }
-
-  /**
-   * Enter/exit search mode. This is method is tightly related to the current query, and should only
-   * be called by {@link #setQueryString}.
-   *
-   * <p>Also note this method doesn't call {@link #reloadData()}; {@link #setQueryString} does it.
-   */
-  protected void setSearchMode(boolean flag) {
-    if (mSearchMode != flag) {
-      mSearchMode = flag;
-
-      if (!flag) {
-        mDirectoryListStatus = STATUS_NOT_LOADED;
-        getLoaderManager().destroyLoader(DIRECTORY_LOADER_ID);
-      }
-
-      if (mAdapter != null) {
-        mAdapter.setSearchMode(flag);
-
-        mAdapter.clearPartitions();
-        if (!flag) {
-          // If we are switching from search to regular display, remove all directory
-          // partitions after default one, assuming they are remote directories which
-          // should be cleaned up on exiting the search mode.
-          mAdapter.removeDirectoriesAfterDefault();
-        }
-        mAdapter.configurePartitionsVisibility(flag);
-      }
-
-      if (mListView != null) {
-        mListView.setFastScrollEnabled(!flag);
-      }
-    }
-  }
-
-  @Nullable
-  public final String getQueryString() {
-    return mQueryString;
-  }
-
-  public void setQueryString(String queryString) {
-    if (!TextUtils.equals(mQueryString, queryString)) {
-      if (mShowEmptyListForEmptyQuery && mAdapter != null && mListView != null) {
-        if (TextUtils.isEmpty(mQueryString)) {
-          // Restore the adapter if the query used to be empty.
-          mListView.setAdapter(mAdapter);
-        } else if (TextUtils.isEmpty(queryString)) {
-          // Instantly clear the list view if the new query is empty.
-          mListView.setAdapter(null);
-        }
-      }
-
-      mQueryString = queryString;
-      setSearchMode(!TextUtils.isEmpty(mQueryString) || mShowEmptyListForEmptyQuery);
-
-      if (mAdapter != null) {
-        mAdapter.setQueryString(queryString);
-        reloadData();
-      }
-    }
-  }
-
-  public void setShowEmptyListForNullQuery(boolean show) {
-    mShowEmptyListForEmptyQuery = show;
-  }
-
-  public boolean getShowEmptyListForNullQuery() {
-    return mShowEmptyListForEmptyQuery;
-  }
-
-  public int getDirectoryLoaderId() {
-    return DIRECTORY_LOADER_ID;
-  }
-
-  public int getDirectorySearchMode() {
-    return mDirectorySearchMode;
-  }
-
-  public void setDirectorySearchMode(int mode) {
-    mDirectorySearchMode = mode;
-  }
-
-  protected int getContactNameDisplayOrder() {
-    return mDisplayOrder;
-  }
-
-  protected void setContactNameDisplayOrder(int displayOrder) {
-    mDisplayOrder = displayOrder;
-    if (mAdapter != null) {
-      mAdapter.setContactNameDisplayOrder(displayOrder);
-    }
-  }
-
-  public int getSortOrder() {
-    return mSortOrder;
-  }
-
-  public void setSortOrder(int sortOrder) {
-    mSortOrder = sortOrder;
-    if (mAdapter != null) {
-      mAdapter.setSortOrder(sortOrder);
-    }
-  }
-
-  public void setDirectoryResultLimit(int limit) {
-    mDirectoryResultLimit = limit;
-  }
-
-  protected boolean loadPreferences() {
-    boolean changed = false;
-    if (getContactNameDisplayOrder() != mContactsPrefs.getDisplayOrder()) {
-      setContactNameDisplayOrder(mContactsPrefs.getDisplayOrder());
-      changed = true;
-    }
-
-    if (getSortOrder() != mContactsPrefs.getSortOrder()) {
-      setSortOrder(mContactsPrefs.getSortOrder());
-      changed = true;
-    }
-
-    return changed;
-  }
-
-  @Override
-  public View onCreateView(
-      LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-    onCreateView(inflater, container);
-
-    boolean searchMode = isSearchMode();
-    mAdapter.setSearchMode(searchMode);
-    mAdapter.configurePartitionsVisibility(searchMode);
-    mAdapter.setPhotoLoader(mPhotoManager);
-    mListView.setAdapter(mAdapter);
-    return mView;
-  }
-
-  protected void onCreateView(LayoutInflater inflater, ViewGroup container) {
-    mView = inflateView(inflater, container);
-
-    mListView = mView.findViewById(android.R.id.list);
-    if (mListView == null) {
-      throw new RuntimeException(
-          "Your content must have a ListView whose id attribute is " + "'android.R.id.list'");
-    }
-
-    View emptyView = mView.findViewById(android.R.id.empty);
-    if (emptyView != null) {
-      mListView.setEmptyView(emptyView);
-    }
-
-    mListView.setOnItemClickListener(this);
-    mListView.setOnFocusChangeListener(this);
-    mListView.setOnTouchListener(this);
-    mListView.setFastScrollEnabled(!isSearchMode());
-
-    // Tell list view to not show dividers. We'll do it ourself so that we can *not* show
-    // them when an A-Z headers is visible.
-    mListView.setDividerHeight(0);
-
-    // We manually save/restore the listview state
-    mListView.setSaveEnabled(false);
-
-    configureVerticalScrollbar();
-    configurePhotoLoader();
-
-    getAdapter().setFragmentRootView(getView());
-
-    ContactListViewUtils.applyCardPaddingToView(getResources(), mListView, mView);
-  }
-
-  @Override
-  public void onHiddenChanged(boolean hidden) {
-    super.onHiddenChanged(hidden);
-    if (getActivity() != null && getView() != null && !hidden) {
-      // If the padding was last applied when in a hidden state, it may have been applied
-      // incorrectly. Therefore we need to reapply it.
-      ContactListViewUtils.applyCardPaddingToView(getResources(), mListView, getView());
-    }
-  }
-
-  protected void configurePhotoLoader() {
-    if (isPhotoLoaderEnabled() && mContext != null) {
-      if (mPhotoManager == null) {
-        mPhotoManager = ContactPhotoManager.getInstance(mContext);
-      }
-      if (mListView != null) {
-        mListView.setOnScrollListener(this);
-      }
-      if (mAdapter != null) {
-        mAdapter.setPhotoLoader(mPhotoManager);
-      }
-    }
-  }
-
-  protected void configureAdapter() {
-    if (mAdapter == null) {
-      return;
-    }
-
-    mAdapter.setQuickContactEnabled(mQuickContactEnabled);
-    mAdapter.setAdjustSelectionBoundsEnabled(mAdjustSelectionBoundsEnabled);
-    mAdapter.setQueryString(mQueryString);
-    mAdapter.setDirectorySearchMode(mDirectorySearchMode);
-    mAdapter.setPinnedPartitionHeadersEnabled(false);
-    mAdapter.setContactNameDisplayOrder(mDisplayOrder);
-    mAdapter.setSortOrder(mSortOrder);
-    mAdapter.setSectionHeaderDisplayEnabled(mSectionHeaderDisplayEnabled);
-    mAdapter.setSelectionVisible(mSelectionVisible);
-    mAdapter.setDirectoryResultLimit(mDirectoryResultLimit);
-    mAdapter.setDarkTheme(mDarkTheme);
-  }
-
-  @Override
-  public void onScroll(
-      AbsListView view, int firstVisibleItem, int visibleItemCount, int totalItemCount) {}
-
-  @Override
-  public void onScrollStateChanged(AbsListView view, int scrollState) {
-    PerformanceReport.recordScrollStateChange(scrollState);
-    if (scrollState == OnScrollListener.SCROLL_STATE_FLING) {
-      mPhotoManager.pause();
-    } else if (isPhotoLoaderEnabled()) {
-      mPhotoManager.resume();
-    }
-  }
-
-  @Override
-  public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-    hideSoftKeyboard();
-
-    int adjPosition = position - mListView.getHeaderViewsCount();
-    if (adjPosition >= 0) {
-      onItemClick(adjPosition, id);
-    }
-  }
-
-  private void hideSoftKeyboard() {
-    // Hide soft keyboard, if visible
-    InputMethodManager inputMethodManager =
-        (InputMethodManager) mContext.getSystemService(Context.INPUT_METHOD_SERVICE);
-    inputMethodManager.hideSoftInputFromWindow(mListView.getWindowToken(), 0);
-  }
-
-  /** Dismisses the soft keyboard when the list takes focus. */
-  @Override
-  public void onFocusChange(View view, boolean hasFocus) {
-    if (view == mListView && hasFocus) {
-      hideSoftKeyboard();
-    }
-  }
-
-  /** Dismisses the soft keyboard when the list is touched. */
-  @Override
-  public boolean onTouch(View view, MotionEvent event) {
-    if (view == mListView) {
-      hideSoftKeyboard();
-    }
-    return false;
-  }
-
-  @Override
-  public void onPause() {
-    // Save the scrolling state of the list view
-    mListViewTopIndex = mListView.getFirstVisiblePosition();
-    View v = mListView.getChildAt(0);
-    mListViewTopOffset = (v == null) ? 0 : (v.getTop() - mListView.getPaddingTop());
-
-    super.onPause();
-    removePendingDirectorySearchRequests();
-  }
-
-  @Override
-  public void onResume() {
-    super.onResume();
-    // Restore the selection of the list view. See a bug.
-    // This has to be done manually because if the list view has its emptyView set,
-    // the scrolling state will be reset when clearPartitions() is called on the adapter.
-    mListView.setSelectionFromTop(mListViewTopIndex, mListViewTopOffset);
-  }
-
-  /** Restore the list state after the adapter is populated. */
-  protected void completeRestoreInstanceState() {
-    if (mListState != null) {
-      mListView.onRestoreInstanceState(mListState);
-      mListState = null;
-    }
-  }
-
-  public void setDarkTheme(boolean value) {
-    mDarkTheme = value;
-    if (mAdapter != null) {
-      mAdapter.setDarkTheme(value);
-    }
-  }
-
-  private int getDefaultVerticalScrollbarPosition() {
-    final Locale locale = Locale.getDefault();
-    final int layoutDirection = TextUtils.getLayoutDirectionFromLocale(locale);
-    switch (layoutDirection) {
-      case View.LAYOUT_DIRECTION_RTL:
-        return View.SCROLLBAR_POSITION_LEFT;
-      case View.LAYOUT_DIRECTION_LTR:
-      default:
-        return View.SCROLLBAR_POSITION_RIGHT;
-    }
-  }
-}
diff --git a/java/com/android/contacts/common/list/ContactListAdapter.java b/java/com/android/contacts/common/list/ContactListAdapter.java
deleted file mode 100644
index 721609d..0000000
--- a/java/com/android/contacts/common/list/ContactListAdapter.java
+++ /dev/null
@@ -1,232 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.contacts.common.list;
-
-import android.content.Context;
-import android.database.Cursor;
-import android.net.Uri;
-import android.provider.ContactsContract;
-import android.provider.ContactsContract.Contacts;
-import android.provider.ContactsContract.Directory;
-import android.provider.ContactsContract.SearchSnippets;
-import android.view.ViewGroup;
-import com.android.contacts.common.R;
-import com.android.contacts.common.preference.ContactsPreferences;
-import com.android.dialer.contactphoto.ContactPhotoManager.DefaultImageRequest;
-
-/**
- * A cursor adapter for the {@link ContactsContract.Contacts#CONTENT_TYPE} content type. Also
- * includes support for including the {@link ContactsContract.Profile} record in the list.
- */
-public abstract class ContactListAdapter extends ContactEntryListAdapter {
-
-  private CharSequence mUnknownNameText;
-
-  public ContactListAdapter(Context context) {
-    super(context);
-
-    mUnknownNameText = context.getText(R.string.missing_name);
-  }
-
-  protected static Uri buildSectionIndexerUri(Uri uri) {
-    return uri.buildUpon().appendQueryParameter(Contacts.EXTRA_ADDRESS_BOOK_INDEX, "true").build();
-  }
-
-  public Uri getContactUri(int partitionIndex, Cursor cursor) {
-    long contactId = cursor.getLong(ContactQuery.CONTACT_ID);
-    String lookupKey = cursor.getString(ContactQuery.CONTACT_LOOKUP_KEY);
-    Uri uri = Contacts.getLookupUri(contactId, lookupKey);
-    long directoryId = ((DirectoryPartition) getPartition(partitionIndex)).getDirectoryId();
-    if (uri != null && directoryId != Directory.DEFAULT) {
-      uri =
-          uri.buildUpon()
-              .appendQueryParameter(
-                  ContactsContract.DIRECTORY_PARAM_KEY, String.valueOf(directoryId))
-              .build();
-    }
-    return uri;
-  }
-
-  @Override
-  protected ContactListItemView newView(
-      Context context, int partition, Cursor cursor, int position, ViewGroup parent) {
-    ContactListItemView view = super.newView(context, partition, cursor, position, parent);
-    view.setUnknownNameText(mUnknownNameText);
-    view.setQuickContactEnabled(isQuickContactEnabled());
-    view.setAdjustSelectionBoundsEnabled(isAdjustSelectionBoundsEnabled());
-    view.setActivatedStateSupported(isSelectionVisible());
-    return view;
-  }
-
-  protected void bindSectionHeaderAndDivider(
-      ContactListItemView view, int position, Cursor cursor) {
-    view.setIsSectionHeaderEnabled(isSectionHeaderDisplayEnabled());
-    if (isSectionHeaderDisplayEnabled()) {
-      Placement placement = getItemPlacementInSection(position);
-      view.setSectionHeader(placement.sectionHeader);
-    } else {
-      view.setSectionHeader(null);
-    }
-  }
-
-  protected void bindPhoto(final ContactListItemView view, int partitionIndex, Cursor cursor) {
-    if (!isPhotoSupported(partitionIndex)) {
-      view.removePhotoView();
-      return;
-    }
-
-    // Set the photo, if available
-    long photoId = 0;
-    if (!cursor.isNull(ContactQuery.CONTACT_PHOTO_ID)) {
-      photoId = cursor.getLong(ContactQuery.CONTACT_PHOTO_ID);
-    }
-
-    if (photoId != 0) {
-      getPhotoLoader()
-          .loadThumbnail(view.getPhotoView(), photoId, false, getCircularPhotos(), null);
-    } else {
-      final String photoUriString = cursor.getString(ContactQuery.CONTACT_PHOTO_URI);
-      final Uri photoUri = photoUriString == null ? null : Uri.parse(photoUriString);
-      DefaultImageRequest request = null;
-      if (photoUri == null) {
-        request =
-            getDefaultImageRequestFromCursor(
-                cursor, ContactQuery.CONTACT_DISPLAY_NAME, ContactQuery.CONTACT_LOOKUP_KEY);
-      }
-      getPhotoLoader()
-          .loadDirectoryPhoto(view.getPhotoView(), photoUri, false, getCircularPhotos(), request);
-    }
-  }
-
-  protected void bindNameAndViewId(final ContactListItemView view, Cursor cursor) {
-    view.showDisplayName(cursor, ContactQuery.CONTACT_DISPLAY_NAME);
-    // Note: we don't show phonetic any more (See issue 5265330)
-
-    bindViewId(view, cursor, ContactQuery.CONTACT_ID);
-  }
-
-  protected void bindPresenceAndStatusMessage(final ContactListItemView view, Cursor cursor) {
-    view.showPresenceAndStatusMessage(
-        cursor, ContactQuery.CONTACT_PRESENCE_STATUS, ContactQuery.CONTACT_CONTACT_STATUS);
-  }
-
-  protected void bindSearchSnippet(final ContactListItemView view, Cursor cursor) {
-    view.showSnippet(cursor, ContactQuery.CONTACT_SNIPPET);
-  }
-
-  @Override
-  public void changeCursor(int partitionIndex, Cursor cursor) {
-    super.changeCursor(partitionIndex, cursor);
-
-    if (cursor == null || !cursor.moveToFirst()) {
-      return;
-    }
-
-    // hasProfile tells whether the first row is a profile
-    final boolean hasProfile = cursor.getInt(ContactQuery.CONTACT_IS_USER_PROFILE) == 1;
-
-    // Add ME profile on top of favorites
-    cursor.moveToFirst();
-    setProfileExists(hasProfile);
-  }
-
-  /** @return Projection useful for children. */
-  protected final String[] getProjection(boolean forSearch) {
-    final int sortOrder = getContactNameDisplayOrder();
-    if (forSearch) {
-      if (sortOrder == ContactsPreferences.DISPLAY_ORDER_PRIMARY) {
-        return ContactQuery.FILTER_PROJECTION_PRIMARY;
-      } else {
-        return ContactQuery.FILTER_PROJECTION_ALTERNATIVE;
-      }
-    } else {
-      if (sortOrder == ContactsPreferences.DISPLAY_ORDER_PRIMARY) {
-        return ContactQuery.CONTACT_PROJECTION_PRIMARY;
-      } else {
-        return ContactQuery.CONTACT_PROJECTION_ALTERNATIVE;
-      }
-    }
-  }
-
-  protected static class ContactQuery {
-
-    public static final int CONTACT_ID = 0;
-    public static final int CONTACT_DISPLAY_NAME = 1;
-    public static final int CONTACT_PRESENCE_STATUS = 2;
-    public static final int CONTACT_CONTACT_STATUS = 3;
-    public static final int CONTACT_PHOTO_ID = 4;
-    public static final int CONTACT_PHOTO_URI = 5;
-    public static final int CONTACT_LOOKUP_KEY = 6;
-    public static final int CONTACT_IS_USER_PROFILE = 7;
-    public static final int CONTACT_PHONETIC_NAME = 8;
-    public static final int CONTACT_STARRED = 9;
-    public static final int CONTACT_SNIPPET = 10;
-    private static final String[] CONTACT_PROJECTION_PRIMARY =
-        new String[] {
-          Contacts._ID, // 0
-          Contacts.DISPLAY_NAME_PRIMARY, // 1
-          Contacts.CONTACT_PRESENCE, // 2
-          Contacts.CONTACT_STATUS, // 3
-          Contacts.PHOTO_ID, // 4
-          Contacts.PHOTO_THUMBNAIL_URI, // 5
-          Contacts.LOOKUP_KEY, // 6
-          Contacts.IS_USER_PROFILE, // 7
-          Contacts.PHONETIC_NAME, // 8
-          Contacts.STARRED, // 9
-        };
-    private static final String[] CONTACT_PROJECTION_ALTERNATIVE =
-        new String[] {
-          Contacts._ID, // 0
-          Contacts.DISPLAY_NAME_ALTERNATIVE, // 1
-          Contacts.CONTACT_PRESENCE, // 2
-          Contacts.CONTACT_STATUS, // 3
-          Contacts.PHOTO_ID, // 4
-          Contacts.PHOTO_THUMBNAIL_URI, // 5
-          Contacts.LOOKUP_KEY, // 6
-          Contacts.IS_USER_PROFILE, // 7
-          Contacts.PHONETIC_NAME, // 8
-          Contacts.STARRED, // 9
-        };
-    private static final String[] FILTER_PROJECTION_PRIMARY =
-        new String[] {
-          Contacts._ID, // 0
-          Contacts.DISPLAY_NAME_PRIMARY, // 1
-          Contacts.CONTACT_PRESENCE, // 2
-          Contacts.CONTACT_STATUS, // 3
-          Contacts.PHOTO_ID, // 4
-          Contacts.PHOTO_THUMBNAIL_URI, // 5
-          Contacts.LOOKUP_KEY, // 6
-          Contacts.IS_USER_PROFILE, // 7
-          Contacts.PHONETIC_NAME, // 8
-          Contacts.STARRED, // 9
-          SearchSnippets.SNIPPET, // 10
-        };
-    private static final String[] FILTER_PROJECTION_ALTERNATIVE =
-        new String[] {
-          Contacts._ID, // 0
-          Contacts.DISPLAY_NAME_ALTERNATIVE, // 1
-          Contacts.CONTACT_PRESENCE, // 2
-          Contacts.CONTACT_STATUS, // 3
-          Contacts.PHOTO_ID, // 4
-          Contacts.PHOTO_THUMBNAIL_URI, // 5
-          Contacts.LOOKUP_KEY, // 6
-          Contacts.IS_USER_PROFILE, // 7
-          Contacts.PHONETIC_NAME, // 8
-          Contacts.STARRED, // 9
-          SearchSnippets.SNIPPET, // 10
-        };
-  }
-}
diff --git a/java/com/android/contacts/common/list/ContactListItemView.java b/java/com/android/contacts/common/list/ContactListItemView.java
deleted file mode 100644
index 409aa1b..0000000
--- a/java/com/android/contacts/common/list/ContactListItemView.java
+++ /dev/null
@@ -1,1508 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.contacts.common.list;
-
-import android.content.Context;
-import android.content.res.ColorStateList;
-import android.content.res.TypedArray;
-import android.database.Cursor;
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.graphics.Rect;
-import android.graphics.Typeface;
-import android.graphics.drawable.Drawable;
-import android.os.Bundle;
-import android.provider.ContactsContract;
-import android.provider.ContactsContract.Contacts;
-import android.provider.ContactsContract.SearchSnippets;
-import android.support.annotation.IntDef;
-import android.support.annotation.NonNull;
-import android.support.v4.content.ContextCompat;
-import android.telephony.PhoneNumberUtils;
-import android.text.Spannable;
-import android.text.SpannableString;
-import android.text.TextUtils;
-import android.text.TextUtils.TruncateAt;
-import android.util.AttributeSet;
-import android.util.TypedValue;
-import android.view.Gravity;
-import android.view.MotionEvent;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.AbsListView.SelectionBoundsAdjuster;
-import android.widget.ImageView;
-import android.widget.ImageView.ScaleType;
-import android.widget.QuickContactBadge;
-import android.widget.TextView;
-import com.android.contacts.common.ContactPresenceIconUtil;
-import com.android.contacts.common.ContactStatusUtil;
-import com.android.contacts.common.R;
-import com.android.contacts.common.format.TextHighlighter;
-import com.android.contacts.common.list.PhoneNumberListAdapter.Listener;
-import com.android.contacts.common.util.ContactDisplayUtils;
-import com.android.contacts.common.util.SearchUtil;
-import com.android.dialer.callintent.CallIntentBuilder;
-import com.android.dialer.util.ViewUtil;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- * A custom view for an item in the contact list. The view contains the contact's photo, a set of
- * text views (for name, status, etc...) and icons for presence and call. The view uses no XML file
- * for layout and all the measurements and layouts are done in the onMeasure and onLayout methods.
- *
- * <p>The layout puts the contact's photo on the right side of the view, the call icon (if present)
- * to the left of the photo, the text lines are aligned to the left and the presence icon (if
- * present) is set to the left of the status line.
- *
- * <p>The layout also supports a header (used as a header of a group of contacts) that is above the
- * contact's data and a divider between contact view.
- */
-public class ContactListItemView extends ViewGroup implements SelectionBoundsAdjuster {
-
-  /** IntDef for indices of ViewPager tabs. */
-  @Retention(RetentionPolicy.SOURCE)
-  @IntDef({NONE, VIDEO, DUO, CALL_AND_SHARE})
-  public @interface CallToAction {}
-
-  public static final int NONE = 0;
-  public static final int VIDEO = 1;
-  public static final int DUO = 2;
-  public static final int CALL_AND_SHARE = 3;
-
-  private final PhotoPosition mPhotoPosition = getDefaultPhotoPosition();
-  private static final Pattern SPLIT_PATTERN =
-      Pattern.compile("([\\w-\\.]+)@((?:[\\w]+\\.)+)([a-zA-Z]{2,4})|[\\w]+");
-  static final char SNIPPET_START_MATCH = '[';
-  static final char SNIPPET_END_MATCH = ']';
-  /** A helper used to highlight a prefix in a text field. */
-  private final TextHighlighter mTextHighlighter;
-  // Style values for layout and appearance
-  // The initialized values are defaults if none is provided through xml.
-  private int mPreferredHeight = 0;
-  private int mGapBetweenImageAndText = 0;
-  private int mGapBetweenLabelAndData = 0;
-  private int mPresenceIconMargin = 4;
-  private int mPresenceIconSize = 16;
-  private int mTextIndent = 0;
-  private int mTextOffsetTop;
-  private int mNameTextViewTextSize;
-  private int mHeaderWidth;
-  private Drawable mActivatedBackgroundDrawable;
-  private int mCallToActionSize = 48;
-  private int mCallToActionMargin = 16;
-  // Set in onLayout. Represent left and right position of the View on the screen.
-  private int mLeftOffset;
-  private int mRightOffset;
-  /** Used with {@link #mLabelView}, specifying the width ratio between label and data. */
-  private int mLabelViewWidthWeight = 3;
-  /** Used with {@link #mDataView}, specifying the width ratio between label and data. */
-  private int mDataViewWidthWeight = 5;
-
-  private ArrayList<HighlightSequence> mNameHighlightSequence;
-  private ArrayList<HighlightSequence> mNumberHighlightSequence;
-  // Highlighting prefix for names.
-  private String mHighlightedPrefix;
-  /** Indicates whether the view should leave room for the "video call" icon. */
-  private boolean mSupportVideoCall;
-
-  // Header layout data
-  private TextView mHeaderTextView;
-  private boolean mIsSectionHeaderEnabled;
-  // The views inside the contact view
-  private boolean mQuickContactEnabled = true;
-  private QuickContactBadge mQuickContact;
-  private ImageView mPhotoView;
-  private TextView mNameTextView;
-  private TextView mLabelView;
-  private TextView mDataView;
-  private TextView mSnippetView;
-  private TextView mStatusView;
-  private ImageView mPresenceIcon;
-  @NonNull private final ImageView mCallToActionView;
-  private ImageView mWorkProfileIcon;
-  private ColorStateList mSecondaryTextColor;
-  private int mDefaultPhotoViewSize = 0;
-  /**
-   * Can be effective even when {@link #mPhotoView} is null, as we want to have horizontal padding
-   * to align other data in this View.
-   */
-  private int mPhotoViewWidth;
-  /**
-   * Can be effective even when {@link #mPhotoView} is null, as we want to have vertical padding.
-   */
-  private int mPhotoViewHeight;
-  /**
-   * Only effective when {@link #mPhotoView} is null. When true all the Views on the right side of
-   * the photo should have horizontal padding on those left assuming there is a photo.
-   */
-  private boolean mKeepHorizontalPaddingForPhotoView;
-  /** Only effective when {@link #mPhotoView} is null. */
-  private boolean mKeepVerticalPaddingForPhotoView;
-  /**
-   * True when {@link #mPhotoViewWidth} and {@link #mPhotoViewHeight} are ready for being used.
-   * False indicates those values should be updated before being used in position calculation.
-   */
-  private boolean mPhotoViewWidthAndHeightAreReady = false;
-
-  private int mNameTextViewHeight;
-  private int mNameTextViewTextColor = Color.BLACK;
-  private int mPhoneticNameTextViewHeight;
-  private int mLabelViewHeight;
-  private int mDataViewHeight;
-  private int mSnippetTextViewHeight;
-  private int mStatusTextViewHeight;
-  private int mCheckBoxWidth;
-  // Holds Math.max(mLabelTextViewHeight, mDataViewHeight), assuming Label and Data share the
-  // same row.
-  private int mLabelAndDataViewMaxHeight;
-  private boolean mActivatedStateSupported;
-  private boolean mAdjustSelectionBoundsEnabled = true;
-  private Rect mBoundsWithoutHeader = new Rect();
-  private CharSequence mUnknownNameText;
-
-  private String mPhoneNumber;
-  private int mPosition = -1;
-  private @CallToAction int mCallToAction = NONE;
-
-  public ContactListItemView(Context context, AttributeSet attrs, boolean supportVideoCallIcon) {
-    this(context, attrs);
-
-    mSupportVideoCall = supportVideoCallIcon;
-  }
-
-  public ContactListItemView(Context context, AttributeSet attrs) {
-    super(context, attrs);
-
-    TypedArray a;
-
-    if (R.styleable.ContactListItemView != null) {
-      // Read all style values
-      a = getContext().obtainStyledAttributes(attrs, R.styleable.ContactListItemView);
-      mPreferredHeight =
-          a.getDimensionPixelSize(
-              R.styleable.ContactListItemView_list_item_height, mPreferredHeight);
-      mActivatedBackgroundDrawable =
-          a.getDrawable(R.styleable.ContactListItemView_activated_background);
-      mGapBetweenImageAndText =
-          a.getDimensionPixelOffset(
-              R.styleable.ContactListItemView_list_item_gap_between_image_and_text,
-              mGapBetweenImageAndText);
-      mGapBetweenLabelAndData =
-          a.getDimensionPixelOffset(
-              R.styleable.ContactListItemView_list_item_gap_between_label_and_data,
-              mGapBetweenLabelAndData);
-      mPresenceIconMargin =
-          a.getDimensionPixelOffset(
-              R.styleable.ContactListItemView_list_item_presence_icon_margin, mPresenceIconMargin);
-      mPresenceIconSize =
-          a.getDimensionPixelOffset(
-              R.styleable.ContactListItemView_list_item_presence_icon_size, mPresenceIconSize);
-      mDefaultPhotoViewSize =
-          a.getDimensionPixelOffset(
-              R.styleable.ContactListItemView_list_item_photo_size, mDefaultPhotoViewSize);
-      mTextIndent =
-          a.getDimensionPixelOffset(
-              R.styleable.ContactListItemView_list_item_text_indent, mTextIndent);
-      mTextOffsetTop =
-          a.getDimensionPixelOffset(
-              R.styleable.ContactListItemView_list_item_text_offset_top, mTextOffsetTop);
-      mDataViewWidthWeight =
-          a.getInteger(
-              R.styleable.ContactListItemView_list_item_data_width_weight, mDataViewWidthWeight);
-      mLabelViewWidthWeight =
-          a.getInteger(
-              R.styleable.ContactListItemView_list_item_label_width_weight, mLabelViewWidthWeight);
-      mNameTextViewTextColor =
-          a.getColor(
-              R.styleable.ContactListItemView_list_item_name_text_color, mNameTextViewTextColor);
-      mNameTextViewTextSize =
-          (int)
-              a.getDimension(
-                  R.styleable.ContactListItemView_list_item_name_text_size,
-                  (int) getResources().getDimension(R.dimen.contact_browser_list_item_text_size));
-      mCallToActionSize =
-          a.getDimensionPixelOffset(
-              R.styleable.ContactListItemView_list_item_video_call_icon_size, mCallToActionSize);
-      mCallToActionMargin =
-          a.getDimensionPixelOffset(
-              R.styleable.ContactListItemView_list_item_video_call_icon_margin,
-              mCallToActionMargin);
-
-      setPaddingRelative(
-          a.getDimensionPixelOffset(R.styleable.ContactListItemView_list_item_padding_left, 0),
-          a.getDimensionPixelOffset(R.styleable.ContactListItemView_list_item_padding_top, 0),
-          a.getDimensionPixelOffset(R.styleable.ContactListItemView_list_item_padding_right, 0),
-          a.getDimensionPixelOffset(R.styleable.ContactListItemView_list_item_padding_bottom, 0));
-
-      a.recycle();
-    }
-
-    mTextHighlighter = new TextHighlighter(Typeface.BOLD);
-
-    if (R.styleable.Theme != null) {
-      a = getContext().obtainStyledAttributes(R.styleable.Theme);
-      mSecondaryTextColor = a.getColorStateList(R.styleable.Theme_android_textColorSecondary);
-      a.recycle();
-    }
-
-    mHeaderWidth = getResources().getDimensionPixelSize(R.dimen.contact_list_section_header_width);
-
-    if (mActivatedBackgroundDrawable != null) {
-      mActivatedBackgroundDrawable.setCallback(this);
-    }
-
-    mNameHighlightSequence = new ArrayList<>();
-    mNumberHighlightSequence = new ArrayList<>();
-
-    mCallToActionView = new ImageView(getContext());
-    mCallToActionView.setId(R.id.call_to_action);
-    mCallToActionView.setLayoutParams(new LayoutParams(mCallToActionSize, mCallToActionSize));
-    mCallToActionView.setScaleType(ScaleType.CENTER);
-    mCallToActionView.setImageTintList(
-        ContextCompat.getColorStateList(getContext(), R.color.search_video_call_icon_tint));
-    addView(mCallToActionView);
-
-    setLayoutDirection(View.LAYOUT_DIRECTION_LOCALE);
-  }
-
-  public static PhotoPosition getDefaultPhotoPosition() {
-    int layoutDirection = TextUtils.getLayoutDirectionFromLocale(Locale.getDefault());
-    return layoutDirection == View.LAYOUT_DIRECTION_RTL ? PhotoPosition.RIGHT : PhotoPosition.LEFT;
-  }
-
-  /**
-   * Helper method for splitting a string into tokens. The lists passed in are populated with the
-   * tokens and offsets into the content of each token. The tokenization function parses e-mail
-   * addresses as a single token; otherwise it splits on any non-alphanumeric character.
-   *
-   * @param content Content to split.
-   * @return List of token strings.
-   */
-  private static List<String> split(String content) {
-    final Matcher matcher = SPLIT_PATTERN.matcher(content);
-    final ArrayList<String> tokens = new ArrayList<>();
-    while (matcher.find()) {
-      tokens.add(matcher.group());
-    }
-    return tokens;
-  }
-
-  public void setUnknownNameText(CharSequence unknownNameText) {
-    mUnknownNameText = unknownNameText;
-  }
-
-  public void setQuickContactEnabled(boolean flag) {
-    mQuickContactEnabled = flag;
-  }
-
-  /**
-   * Sets whether the call to action is shown. For the {@link CallToAction} to be shown, it must be
-   * supported as well.
-   *
-   * @param action {@link CallToAction} you want to display (if it's supported).
-   * @param listener Listener to notify when the call to action is clicked.
-   * @param position The position in the adapter of the call to action.
-   */
-  public void setCallToAction(@CallToAction int action, Listener listener, int position) {
-    mCallToAction = action;
-    mPosition = position;
-
-    Drawable drawable;
-    int description;
-    OnClickListener onClickListener;
-    if (action == CALL_AND_SHARE) {
-      drawable = ContextCompat.getDrawable(getContext(), R.drawable.ic_phone_attach);
-      drawable.setAutoMirrored(true);
-      description = R.string.description_search_call_and_share;
-      onClickListener = v -> listener.onCallAndShareIconClicked(position);
-    } else if (action == VIDEO && mSupportVideoCall) {
-      drawable =
-          ContextCompat.getDrawable(getContext(), R.drawable.quantum_ic_videocam_vd_theme_24);
-      drawable.setAutoMirrored(true);
-      description = R.string.description_search_video_call;
-      onClickListener = v -> listener.onVideoCallIconClicked(position);
-    } else if (action == DUO) {
-      CallIntentBuilder.increaseLightbringerCallButtonAppearInSearchCount();
-      drawable =
-          ContextCompat.getDrawable(getContext(), R.drawable.quantum_ic_videocam_vd_theme_24);
-      drawable.setAutoMirrored(true);
-      description = R.string.description_search_video_call;
-      onClickListener = v -> listener.onDuoVideoIconClicked(position);
-    } else {
-      mCallToActionView.setVisibility(View.GONE);
-      mCallToActionView.setOnClickListener(null);
-      return;
-    }
-
-    mCallToActionView.setContentDescription(getContext().getString(description));
-    mCallToActionView.setOnClickListener(onClickListener);
-    mCallToActionView.setImageDrawable(drawable);
-    mCallToActionView.setVisibility(View.VISIBLE);
-  }
-
-  public @CallToAction int getCallToAction() {
-    return mCallToAction;
-  }
-
-  public int getPosition() {
-    return mPosition;
-  }
-
-  /**
-   * Sets whether the view supports a video calling icon. This is independent of whether the view is
-   * actually showing an icon. Support for the video calling icon ensures that the layout leaves
-   * space for the video icon, should it be shown.
-   *
-   * @param supportVideoCall {@code true} if the video call icon is supported, {@code false}
-   *     otherwise.
-   */
-  public void setSupportVideoCallIcon(boolean supportVideoCall) {
-    mSupportVideoCall = supportVideoCall;
-  }
-
-  @Override
-  protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
-    // We will match parent's width and wrap content vertically, but make sure
-    // height is no less than listPreferredItemHeight.
-    final int specWidth = resolveSize(0, widthMeasureSpec);
-    final int preferredHeight = mPreferredHeight;
-
-    mNameTextViewHeight = 0;
-    mPhoneticNameTextViewHeight = 0;
-    mLabelViewHeight = 0;
-    mDataViewHeight = 0;
-    mLabelAndDataViewMaxHeight = 0;
-    mSnippetTextViewHeight = 0;
-    mStatusTextViewHeight = 0;
-    mCheckBoxWidth = 0;
-
-    ensurePhotoViewSize();
-
-    // Width each TextView is able to use.
-    int effectiveWidth;
-    // All the other Views will honor the photo, so available width for them may be shrunk.
-    if (mPhotoViewWidth > 0 || mKeepHorizontalPaddingForPhotoView) {
-      effectiveWidth =
-          specWidth
-              - getPaddingLeft()
-              - getPaddingRight()
-              - (mPhotoViewWidth + mGapBetweenImageAndText);
-    } else {
-      effectiveWidth = specWidth - getPaddingLeft() - getPaddingRight();
-    }
-
-    if (mIsSectionHeaderEnabled) {
-      effectiveWidth -= mHeaderWidth + mGapBetweenImageAndText;
-    }
-
-    effectiveWidth -= (mCallToActionSize + mCallToActionMargin);
-
-    // Go over all visible text views and measure actual width of each of them.
-    // Also calculate their heights to get the total height for this entire view.
-
-    if (isVisible(mNameTextView)) {
-      // Calculate width for name text - this parallels similar measurement in onLayout.
-      int nameTextWidth = effectiveWidth;
-      if (mPhotoPosition != PhotoPosition.LEFT) {
-        nameTextWidth -= mTextIndent;
-      }
-      mNameTextView.measure(
-          MeasureSpec.makeMeasureSpec(nameTextWidth, MeasureSpec.EXACTLY),
-          MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED));
-      mNameTextViewHeight = mNameTextView.getMeasuredHeight();
-    }
-
-    // If both data (phone number/email address) and label (type like "MOBILE") are quite long,
-    // we should ellipsize both using appropriate ratio.
-    final int dataWidth;
-    final int labelWidth;
-    if (isVisible(mDataView)) {
-      if (isVisible(mLabelView)) {
-        final int totalWidth = effectiveWidth - mGapBetweenLabelAndData;
-        dataWidth =
-            ((totalWidth * mDataViewWidthWeight) / (mDataViewWidthWeight + mLabelViewWidthWeight));
-        labelWidth =
-            ((totalWidth * mLabelViewWidthWeight) / (mDataViewWidthWeight + mLabelViewWidthWeight));
-      } else {
-        dataWidth = effectiveWidth;
-        labelWidth = 0;
-      }
-    } else {
-      dataWidth = 0;
-      if (isVisible(mLabelView)) {
-        labelWidth = effectiveWidth;
-      } else {
-        labelWidth = 0;
-      }
-    }
-
-    if (isVisible(mDataView)) {
-      mDataView.measure(
-          MeasureSpec.makeMeasureSpec(dataWidth, MeasureSpec.EXACTLY),
-          MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED));
-      mDataViewHeight = mDataView.getMeasuredHeight();
-    }
-
-    if (isVisible(mLabelView)) {
-      mLabelView.measure(
-          MeasureSpec.makeMeasureSpec(labelWidth, MeasureSpec.AT_MOST),
-          MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED));
-      mLabelViewHeight = mLabelView.getMeasuredHeight();
-    }
-    mLabelAndDataViewMaxHeight = Math.max(mLabelViewHeight, mDataViewHeight);
-
-    if (isVisible(mSnippetView)) {
-      mSnippetView.measure(
-          MeasureSpec.makeMeasureSpec(effectiveWidth, MeasureSpec.EXACTLY),
-          MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED));
-      mSnippetTextViewHeight = mSnippetView.getMeasuredHeight();
-    }
-
-    // Status view height is the biggest of the text view and the presence icon
-    if (isVisible(mPresenceIcon)) {
-      mPresenceIcon.measure(
-          MeasureSpec.makeMeasureSpec(mPresenceIconSize, MeasureSpec.EXACTLY),
-          MeasureSpec.makeMeasureSpec(mPresenceIconSize, MeasureSpec.EXACTLY));
-      mStatusTextViewHeight = mPresenceIcon.getMeasuredHeight();
-    }
-
-    mCallToActionView.measure(
-        MeasureSpec.makeMeasureSpec(mCallToActionSize, MeasureSpec.EXACTLY),
-        MeasureSpec.makeMeasureSpec(mCallToActionSize, MeasureSpec.EXACTLY));
-
-    if (isVisible(mWorkProfileIcon)) {
-      mWorkProfileIcon.measure(
-          MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED),
-          MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED));
-      mNameTextViewHeight = Math.max(mNameTextViewHeight, mWorkProfileIcon.getMeasuredHeight());
-    }
-
-    if (isVisible(mStatusView)) {
-      // Presence and status are in a same row, so status will be affected by icon size.
-      final int statusWidth;
-      if (isVisible(mPresenceIcon)) {
-        statusWidth = (effectiveWidth - mPresenceIcon.getMeasuredWidth() - mPresenceIconMargin);
-      } else {
-        statusWidth = effectiveWidth;
-      }
-      mStatusView.measure(
-          MeasureSpec.makeMeasureSpec(statusWidth, MeasureSpec.EXACTLY),
-          MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED));
-      mStatusTextViewHeight = Math.max(mStatusTextViewHeight, mStatusView.getMeasuredHeight());
-    }
-
-    // Calculate height including padding.
-    int height =
-        (mNameTextViewHeight
-            + mPhoneticNameTextViewHeight
-            + mLabelAndDataViewMaxHeight
-            + mSnippetTextViewHeight
-            + mStatusTextViewHeight);
-
-    // Make sure the height is at least as high as the photo
-    height = Math.max(height, mPhotoViewHeight + getPaddingBottom() + getPaddingTop());
-
-    // Make sure height is at least the preferred height
-    height = Math.max(height, preferredHeight);
-
-    // Measure the header if it is visible.
-    if (mHeaderTextView != null && mHeaderTextView.getVisibility() == VISIBLE) {
-      mHeaderTextView.measure(
-          MeasureSpec.makeMeasureSpec(mHeaderWidth, MeasureSpec.EXACTLY),
-          MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED));
-    }
-
-    setMeasuredDimension(specWidth, height);
-  }
-
-  @Override
-  protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
-    final int height = bottom - top;
-    final int width = right - left;
-
-    // Determine the vertical bounds by laying out the header first.
-    int topBound = 0;
-    int leftBound = getPaddingLeft();
-    int rightBound = width - getPaddingRight();
-
-    final boolean isLayoutRtl = ViewUtil.isViewLayoutRtl(this);
-
-    // Put the section header on the left side of the contact view.
-    if (mIsSectionHeaderEnabled) {
-      // Align the text view all the way left, to be consistent with Contacts.
-      if (isLayoutRtl) {
-        rightBound = width;
-      } else {
-        leftBound = 0;
-      }
-      if (mHeaderTextView != null) {
-        int headerHeight = mHeaderTextView.getMeasuredHeight();
-        int headerTopBound = (height + topBound - headerHeight) / 2 + mTextOffsetTop;
-
-        mHeaderTextView.layout(
-            isLayoutRtl ? rightBound - mHeaderWidth : leftBound,
-            headerTopBound,
-            isLayoutRtl ? rightBound : leftBound + mHeaderWidth,
-            headerTopBound + headerHeight);
-      }
-      if (isLayoutRtl) {
-        rightBound -= mHeaderWidth;
-      } else {
-        leftBound += mHeaderWidth;
-      }
-    }
-
-    mBoundsWithoutHeader.set(left + leftBound, topBound, left + rightBound, height);
-    mLeftOffset = left + leftBound;
-    mRightOffset = left + rightBound;
-    if (mIsSectionHeaderEnabled) {
-      if (isLayoutRtl) {
-        rightBound -= mGapBetweenImageAndText;
-      } else {
-        leftBound += mGapBetweenImageAndText;
-      }
-    }
-
-    if (mActivatedStateSupported && isActivated()) {
-      mActivatedBackgroundDrawable.setBounds(mBoundsWithoutHeader);
-    }
-
-    final View photoView = mQuickContact != null ? mQuickContact : mPhotoView;
-    if (mPhotoPosition == PhotoPosition.LEFT) {
-      // Photo is the left most view. All the other Views should on the right of the photo.
-      if (photoView != null) {
-        // Center the photo vertically
-        final int photoTop = topBound + (height - topBound - mPhotoViewHeight) / 2;
-        photoView.layout(
-            leftBound, photoTop, leftBound + mPhotoViewWidth, photoTop + mPhotoViewHeight);
-        leftBound += mPhotoViewWidth + mGapBetweenImageAndText;
-      } else if (mKeepHorizontalPaddingForPhotoView) {
-        // Draw nothing but keep the padding.
-        leftBound += mPhotoViewWidth + mGapBetweenImageAndText;
-      }
-    } else {
-      // Photo is the right most view. Right bound should be adjusted that way.
-      if (photoView != null) {
-        // Center the photo vertically
-        final int photoTop = topBound + (height - topBound - mPhotoViewHeight) / 2;
-        photoView.layout(
-            rightBound - mPhotoViewWidth, photoTop, rightBound, photoTop + mPhotoViewHeight);
-        rightBound -= (mPhotoViewWidth + mGapBetweenImageAndText);
-      } else if (mKeepHorizontalPaddingForPhotoView) {
-        // Draw nothing but keep the padding.
-        rightBound -= (mPhotoViewWidth + mGapBetweenImageAndText);
-      }
-
-      // Add indent between left-most padding and texts.
-      leftBound += mTextIndent;
-    }
-
-    // Place the call to action at the end of the list (e.g. take into account RTL mode).
-    // Center the icon vertically
-    final int callToActionTop = topBound + (height - topBound - mCallToActionSize) / 2;
-
-    if (!isLayoutRtl) {
-      // When photo is on left, icon is placed on the right edge.
-      mCallToActionView.layout(
-          rightBound - mCallToActionSize,
-          callToActionTop,
-          rightBound,
-          callToActionTop + mCallToActionSize);
-    } else {
-      // When photo is on right, icon is placed on the left edge.
-      mCallToActionView.layout(
-          leftBound,
-          callToActionTop,
-          leftBound + mCallToActionSize,
-          callToActionTop + mCallToActionSize);
-    }
-
-    if (mPhotoPosition == PhotoPosition.LEFT) {
-      rightBound -= (mCallToActionSize + mCallToActionMargin);
-    } else {
-      leftBound += mCallToActionSize + mCallToActionMargin;
-    }
-
-    // Center text vertically, then apply the top offset.
-    final int totalTextHeight =
-        mNameTextViewHeight
-            + mPhoneticNameTextViewHeight
-            + mLabelAndDataViewMaxHeight
-            + mSnippetTextViewHeight
-            + mStatusTextViewHeight;
-    int textTopBound = (height + topBound - totalTextHeight) / 2 + mTextOffsetTop;
-
-    // Work Profile icon align top
-    int workProfileIconWidth = 0;
-    if (isVisible(mWorkProfileIcon)) {
-      workProfileIconWidth = mWorkProfileIcon.getMeasuredWidth();
-      final int distanceFromEnd = mCheckBoxWidth > 0 ? mCheckBoxWidth + mGapBetweenImageAndText : 0;
-      if (mPhotoPosition == PhotoPosition.LEFT) {
-        // When photo is on left, label is placed on the right edge of the list item.
-        mWorkProfileIcon.layout(
-            rightBound - workProfileIconWidth - distanceFromEnd,
-            textTopBound,
-            rightBound - distanceFromEnd,
-            textTopBound + mNameTextViewHeight);
-      } else {
-        // When photo is on right, label is placed on the left of data view.
-        mWorkProfileIcon.layout(
-            leftBound + distanceFromEnd,
-            textTopBound,
-            leftBound + workProfileIconWidth + distanceFromEnd,
-            textTopBound + mNameTextViewHeight);
-      }
-    }
-
-    // Layout all text view and presence icon
-    // Put name TextView first
-    if (isVisible(mNameTextView)) {
-      final int distanceFromEnd =
-          workProfileIconWidth
-              + (mCheckBoxWidth > 0 ? mCheckBoxWidth + mGapBetweenImageAndText : 0);
-      if (mPhotoPosition == PhotoPosition.LEFT) {
-        mNameTextView.layout(
-            leftBound,
-            textTopBound,
-            rightBound - distanceFromEnd,
-            textTopBound + mNameTextViewHeight);
-      } else {
-        mNameTextView.layout(
-            leftBound + distanceFromEnd,
-            textTopBound,
-            rightBound,
-            textTopBound + mNameTextViewHeight);
-      }
-    }
-
-    if (isVisible(mNameTextView) || isVisible(mWorkProfileIcon)) {
-      textTopBound += mNameTextViewHeight;
-    }
-
-    // Presence and status
-    if (isLayoutRtl) {
-      int statusRightBound = rightBound;
-      if (isVisible(mPresenceIcon)) {
-        int iconWidth = mPresenceIcon.getMeasuredWidth();
-        mPresenceIcon.layout(
-            rightBound - iconWidth, textTopBound, rightBound, textTopBound + mStatusTextViewHeight);
-        statusRightBound -= (iconWidth + mPresenceIconMargin);
-      }
-
-      if (isVisible(mStatusView)) {
-        mStatusView.layout(
-            leftBound, textTopBound, statusRightBound, textTopBound + mStatusTextViewHeight);
-      }
-    } else {
-      int statusLeftBound = leftBound;
-      if (isVisible(mPresenceIcon)) {
-        int iconWidth = mPresenceIcon.getMeasuredWidth();
-        mPresenceIcon.layout(
-            leftBound, textTopBound, leftBound + iconWidth, textTopBound + mStatusTextViewHeight);
-        statusLeftBound += (iconWidth + mPresenceIconMargin);
-      }
-
-      if (isVisible(mStatusView)) {
-        mStatusView.layout(
-            statusLeftBound, textTopBound, rightBound, textTopBound + mStatusTextViewHeight);
-      }
-    }
-
-    if (isVisible(mStatusView) || isVisible(mPresenceIcon)) {
-      textTopBound += mStatusTextViewHeight;
-    }
-
-    // Rest of text views
-    int dataLeftBound = leftBound;
-
-    // Label and Data align bottom.
-    if (isVisible(mLabelView)) {
-      if (!isLayoutRtl) {
-        mLabelView.layout(
-            dataLeftBound,
-            textTopBound + mLabelAndDataViewMaxHeight - mLabelViewHeight,
-            rightBound,
-            textTopBound + mLabelAndDataViewMaxHeight);
-        dataLeftBound += mLabelView.getMeasuredWidth() + mGapBetweenLabelAndData;
-      } else {
-        dataLeftBound = leftBound + mLabelView.getMeasuredWidth();
-        mLabelView.layout(
-            rightBound - mLabelView.getMeasuredWidth(),
-            textTopBound + mLabelAndDataViewMaxHeight - mLabelViewHeight,
-            rightBound,
-            textTopBound + mLabelAndDataViewMaxHeight);
-        rightBound -= (mLabelView.getMeasuredWidth() + mGapBetweenLabelAndData);
-      }
-    }
-
-    if (isVisible(mDataView)) {
-      if (!isLayoutRtl) {
-        mDataView.layout(
-            dataLeftBound,
-            textTopBound + mLabelAndDataViewMaxHeight - mDataViewHeight,
-            rightBound,
-            textTopBound + mLabelAndDataViewMaxHeight);
-      } else {
-        mDataView.layout(
-            rightBound - mDataView.getMeasuredWidth(),
-            textTopBound + mLabelAndDataViewMaxHeight - mDataViewHeight,
-            rightBound,
-            textTopBound + mLabelAndDataViewMaxHeight);
-      }
-    }
-    if (isVisible(mLabelView) || isVisible(mDataView)) {
-      textTopBound += mLabelAndDataViewMaxHeight;
-    }
-
-    if (isVisible(mSnippetView)) {
-      mSnippetView.layout(
-          leftBound, textTopBound, rightBound, textTopBound + mSnippetTextViewHeight);
-    }
-  }
-
-  @Override
-  public void adjustListItemSelectionBounds(Rect bounds) {
-    if (mAdjustSelectionBoundsEnabled) {
-      bounds.top += mBoundsWithoutHeader.top;
-      bounds.bottom = bounds.top + mBoundsWithoutHeader.height();
-      bounds.left = mBoundsWithoutHeader.left;
-      bounds.right = mBoundsWithoutHeader.right;
-    }
-  }
-
-  protected boolean isVisible(View view) {
-    return view != null && view.getVisibility() == View.VISIBLE;
-  }
-
-  /** Extracts width and height from the style */
-  private void ensurePhotoViewSize() {
-    if (!mPhotoViewWidthAndHeightAreReady) {
-      mPhotoViewWidth = mPhotoViewHeight = getDefaultPhotoViewSize();
-      if (!mQuickContactEnabled && mPhotoView == null) {
-        if (!mKeepHorizontalPaddingForPhotoView) {
-          mPhotoViewWidth = 0;
-        }
-        if (!mKeepVerticalPaddingForPhotoView) {
-          mPhotoViewHeight = 0;
-        }
-      }
-
-      mPhotoViewWidthAndHeightAreReady = true;
-    }
-  }
-
-  protected int getDefaultPhotoViewSize() {
-    return mDefaultPhotoViewSize;
-  }
-
-  /**
-   * Gets a LayoutParam that corresponds to the default photo size.
-   *
-   * @return A new LayoutParam.
-   */
-  private LayoutParams getDefaultPhotoLayoutParams() {
-    LayoutParams params = generateDefaultLayoutParams();
-    params.width = getDefaultPhotoViewSize();
-    params.height = params.width;
-    return params;
-  }
-
-  @Override
-  protected void drawableStateChanged() {
-    super.drawableStateChanged();
-    if (mActivatedStateSupported) {
-      mActivatedBackgroundDrawable.setState(getDrawableState());
-    }
-  }
-
-  @Override
-  protected boolean verifyDrawable(Drawable who) {
-    return who == mActivatedBackgroundDrawable || super.verifyDrawable(who);
-  }
-
-  @Override
-  public void jumpDrawablesToCurrentState() {
-    super.jumpDrawablesToCurrentState();
-    if (mActivatedStateSupported) {
-      mActivatedBackgroundDrawable.jumpToCurrentState();
-    }
-  }
-
-  @Override
-  public void dispatchDraw(Canvas canvas) {
-    if (mActivatedStateSupported && isActivated()) {
-      mActivatedBackgroundDrawable.draw(canvas);
-    }
-
-    super.dispatchDraw(canvas);
-  }
-
-  /** Sets section header or makes it invisible if the title is null. */
-  public void setSectionHeader(String title) {
-    if (!TextUtils.isEmpty(title)) {
-      if (mHeaderTextView == null) {
-        mHeaderTextView = new TextView(getContext());
-        mHeaderTextView.setTextAppearance(R.style.SectionHeaderStyle);
-        mHeaderTextView.setGravity(Gravity.CENTER_VERTICAL | Gravity.CENTER_HORIZONTAL);
-        addView(mHeaderTextView);
-      }
-      setMarqueeText(mHeaderTextView, title);
-      mHeaderTextView.setVisibility(View.VISIBLE);
-      mHeaderTextView.setAllCaps(true);
-    } else if (mHeaderTextView != null) {
-      mHeaderTextView.setVisibility(View.GONE);
-    }
-  }
-
-  public void setIsSectionHeaderEnabled(boolean isSectionHeaderEnabled) {
-    mIsSectionHeaderEnabled = isSectionHeaderEnabled;
-  }
-
-  /** Returns the quick contact badge, creating it if necessary. */
-  public QuickContactBadge getQuickContact() {
-    if (!mQuickContactEnabled) {
-      throw new IllegalStateException("QuickContact is disabled for this view");
-    }
-    if (mQuickContact == null) {
-      mQuickContact = new QuickContactBadge(getContext());
-      mQuickContact.setOverlay(null);
-      mQuickContact.setLayoutParams(getDefaultPhotoLayoutParams());
-      if (mNameTextView != null) {
-        mQuickContact.setContentDescription(
-            getContext()
-                .getString(R.string.description_quick_contact_for, mNameTextView.getText()));
-      }
-
-      addView(mQuickContact);
-      mPhotoViewWidthAndHeightAreReady = false;
-    }
-    return mQuickContact;
-  }
-
-  /** Returns the photo view, creating it if necessary. */
-  public ImageView getPhotoView() {
-    if (mPhotoView == null) {
-      mPhotoView = new ImageView(getContext());
-      mPhotoView.setLayoutParams(getDefaultPhotoLayoutParams());
-      // Quick contact style used above will set a background - remove it
-      mPhotoView.setBackground(null);
-      addView(mPhotoView);
-      mPhotoViewWidthAndHeightAreReady = false;
-    }
-    return mPhotoView;
-  }
-
-  /** Removes the photo view. */
-  public void removePhotoView() {
-    removePhotoView(false, true);
-  }
-
-  /**
-   * Removes the photo view.
-   *
-   * @param keepHorizontalPadding True means data on the right side will have padding on left,
-   *     pretending there is still a photo view.
-   * @param keepVerticalPadding True means the View will have some height enough for accommodating a
-   *     photo view.
-   */
-  public void removePhotoView(boolean keepHorizontalPadding, boolean keepVerticalPadding) {
-    mPhotoViewWidthAndHeightAreReady = false;
-    mKeepHorizontalPaddingForPhotoView = keepHorizontalPadding;
-    mKeepVerticalPaddingForPhotoView = keepVerticalPadding;
-    if (mPhotoView != null) {
-      removeView(mPhotoView);
-      mPhotoView = null;
-    }
-    if (mQuickContact != null) {
-      removeView(mQuickContact);
-      mQuickContact = null;
-    }
-  }
-
-  /**
-   * Sets a word prefix that will be highlighted if encountered in fields like name and search
-   * snippet. This will disable the mask highlighting for names.
-   *
-   * <p>NOTE: must be all upper-case
-   */
-  public void setHighlightedPrefix(String upperCasePrefix) {
-    mHighlightedPrefix = upperCasePrefix;
-  }
-
-  /** Clears previously set highlight sequences for the view. */
-  public void clearHighlightSequences() {
-    mNameHighlightSequence.clear();
-    mNumberHighlightSequence.clear();
-    mHighlightedPrefix = null;
-  }
-
-  /**
-   * Adds a highlight sequence to the name highlighter.
-   *
-   * @param start The start position of the highlight sequence.
-   * @param end The end position of the highlight sequence.
-   */
-  public void addNameHighlightSequence(int start, int end) {
-    mNameHighlightSequence.add(new HighlightSequence(start, end));
-  }
-
-  /**
-   * Adds a highlight sequence to the number highlighter.
-   *
-   * @param start The start position of the highlight sequence.
-   * @param end The end position of the highlight sequence.
-   */
-  public void addNumberHighlightSequence(int start, int end) {
-    mNumberHighlightSequence.add(new HighlightSequence(start, end));
-  }
-
-  /** Returns the text view for the contact name, creating it if necessary. */
-  public TextView getNameTextView() {
-    if (mNameTextView == null) {
-      mNameTextView = new TextView(getContext());
-      mNameTextView.setSingleLine(true);
-      mNameTextView.setEllipsize(getTextEllipsis());
-      mNameTextView.setTextColor(mNameTextViewTextColor);
-      mNameTextView.setTextSize(TypedValue.COMPLEX_UNIT_PX, mNameTextViewTextSize);
-      // Manually call setActivated() since this view may be added after the first
-      // setActivated() call toward this whole item view.
-      mNameTextView.setActivated(isActivated());
-      mNameTextView.setGravity(Gravity.CENTER_VERTICAL);
-      mNameTextView.setTextAlignment(View.TEXT_ALIGNMENT_VIEW_START);
-      mNameTextView.setId(R.id.cliv_name_textview);
-      mNameTextView.setElegantTextHeight(false);
-      addView(mNameTextView);
-    }
-    return mNameTextView;
-  }
-
-  /** Adds or updates a text view for the data label. */
-  public void setLabel(CharSequence text) {
-    if (TextUtils.isEmpty(text)) {
-      if (mLabelView != null) {
-        mLabelView.setVisibility(View.GONE);
-      }
-    } else {
-      getLabelView();
-      setMarqueeText(mLabelView, text);
-      mLabelView.setVisibility(VISIBLE);
-    }
-  }
-
-  /** Returns the text view for the data label, creating it if necessary. */
-  public TextView getLabelView() {
-    if (mLabelView == null) {
-      mLabelView = new TextView(getContext());
-      mLabelView.setLayoutParams(
-          new LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT));
-
-      mLabelView.setSingleLine(true);
-      mLabelView.setEllipsize(getTextEllipsis());
-      mLabelView.setTextAppearance(R.style.TextAppearanceSmall);
-      if (mPhotoPosition == PhotoPosition.LEFT) {
-        mLabelView.setAllCaps(true);
-      } else {
-        mLabelView.setTypeface(mLabelView.getTypeface(), Typeface.BOLD);
-      }
-      mLabelView.setActivated(isActivated());
-      mLabelView.setId(R.id.cliv_label_textview);
-      addView(mLabelView);
-    }
-    return mLabelView;
-  }
-
-  /**
-   * Sets phone number for a list item. This takes care of number highlighting if the highlight mask
-   * exists.
-   */
-  public void setPhoneNumber(String text) {
-    mPhoneNumber = text;
-    if (text == null) {
-      if (mDataView != null) {
-        mDataView.setVisibility(View.GONE);
-      }
-    } else {
-      getDataView();
-
-      // TODO: Format number using PhoneNumberUtils.formatNumber before assigning it to
-      // mDataView. Make sure that determination of the highlight sequences are done only
-      // after number formatting.
-
-      // Sets phone number texts for display after highlighting it, if applicable.
-      // CharSequence textToSet = text;
-      final SpannableString textToSet = new SpannableString(text);
-
-      if (mNumberHighlightSequence.size() != 0) {
-        final HighlightSequence highlightSequence = mNumberHighlightSequence.get(0);
-        mTextHighlighter.applyMaskingHighlight(
-            textToSet, highlightSequence.start, highlightSequence.end);
-      }
-
-      setMarqueeText(mDataView, textToSet);
-      mDataView.setVisibility(VISIBLE);
-
-      // We have a phone number as "mDataView" so make it always LTR and VIEW_START
-      mDataView.setTextDirection(View.TEXT_DIRECTION_LTR);
-      mDataView.setTextAlignment(View.TEXT_ALIGNMENT_VIEW_START);
-    }
-  }
-
-  public String getPhoneNumber() {
-    return mPhoneNumber;
-  }
-
-  private void setMarqueeText(TextView textView, CharSequence text) {
-    if (getTextEllipsis() == TruncateAt.MARQUEE) {
-      // To show MARQUEE correctly (with END effect during non-active state), we need
-      // to build Spanned with MARQUEE in addition to TextView's ellipsize setting.
-      final SpannableString spannable = new SpannableString(text);
-      spannable.setSpan(
-          TruncateAt.MARQUEE, 0, spannable.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
-      textView.setText(spannable);
-    } else {
-      textView.setText(text);
-    }
-  }
-
-  /** Returns the text view for the data text, creating it if necessary. */
-  public TextView getDataView() {
-    if (mDataView == null) {
-      mDataView = new TextView(getContext());
-      mDataView.setSingleLine(true);
-      mDataView.setEllipsize(getTextEllipsis());
-      mDataView.setTextAppearance(R.style.TextAppearanceSmall);
-      mDataView.setTextAlignment(View.TEXT_ALIGNMENT_VIEW_START);
-      mDataView.setActivated(isActivated());
-      mDataView.setId(R.id.cliv_data_view);
-      mDataView.setElegantTextHeight(false);
-      addView(mDataView);
-    }
-    return mDataView;
-  }
-
-  /** Adds or updates a text view for the search snippet. */
-  public void setSnippet(String text) {
-    if (TextUtils.isEmpty(text)) {
-      if (mSnippetView != null) {
-        mSnippetView.setVisibility(View.GONE);
-      }
-    } else {
-      mTextHighlighter.setPrefixText(getSnippetView(), text, mHighlightedPrefix);
-      mSnippetView.setVisibility(VISIBLE);
-      if (ContactDisplayUtils.isPossiblePhoneNumber(text)) {
-        // Give the text-to-speech engine a hint that it's a phone number
-        mSnippetView.setContentDescription(PhoneNumberUtils.createTtsSpannable(text));
-      } else {
-        mSnippetView.setContentDescription(null);
-      }
-    }
-  }
-
-  /** Returns the text view for the search snippet, creating it if necessary. */
-  public TextView getSnippetView() {
-    if (mSnippetView == null) {
-      mSnippetView = new TextView(getContext());
-      mSnippetView.setSingleLine(true);
-      mSnippetView.setEllipsize(getTextEllipsis());
-      mSnippetView.setTextAppearance(android.R.style.TextAppearance_Small);
-      mSnippetView.setTextAlignment(View.TEXT_ALIGNMENT_VIEW_START);
-      mSnippetView.setActivated(isActivated());
-      addView(mSnippetView);
-    }
-    return mSnippetView;
-  }
-
-  /** Returns the text view for the status, creating it if necessary. */
-  public TextView getStatusView() {
-    if (mStatusView == null) {
-      mStatusView = new TextView(getContext());
-      mStatusView.setSingleLine(true);
-      mStatusView.setEllipsize(getTextEllipsis());
-      mStatusView.setTextAppearance(android.R.style.TextAppearance_Small);
-      mStatusView.setTextColor(mSecondaryTextColor);
-      mStatusView.setActivated(isActivated());
-      mStatusView.setTextAlignment(View.TEXT_ALIGNMENT_VIEW_START);
-      addView(mStatusView);
-    }
-    return mStatusView;
-  }
-
-  /** Adds or updates a text view for the status. */
-  public void setStatus(CharSequence text) {
-    if (TextUtils.isEmpty(text)) {
-      if (mStatusView != null) {
-        mStatusView.setVisibility(View.GONE);
-      }
-    } else {
-      getStatusView();
-      setMarqueeText(mStatusView, text);
-      mStatusView.setVisibility(VISIBLE);
-    }
-  }
-
-  /** Adds or updates the presence icon view. */
-  public void setPresence(Drawable icon) {
-    if (icon != null) {
-      if (mPresenceIcon == null) {
-        mPresenceIcon = new ImageView(getContext());
-        addView(mPresenceIcon);
-      }
-      mPresenceIcon.setImageDrawable(icon);
-      mPresenceIcon.setScaleType(ScaleType.CENTER);
-      mPresenceIcon.setVisibility(View.VISIBLE);
-    } else {
-      if (mPresenceIcon != null) {
-        mPresenceIcon.setVisibility(View.GONE);
-      }
-    }
-  }
-
-  /**
-   * Set to display work profile icon or not
-   *
-   * @param enabled set to display work profile icon or not
-   */
-  public void setWorkProfileIconEnabled(boolean enabled) {
-    if (mWorkProfileIcon != null) {
-      mWorkProfileIcon.setVisibility(enabled ? View.VISIBLE : View.GONE);
-    } else if (enabled) {
-      mWorkProfileIcon = new ImageView(getContext());
-      addView(mWorkProfileIcon);
-      mWorkProfileIcon.setImageResource(R.drawable.ic_work_profile);
-      mWorkProfileIcon.setScaleType(ScaleType.CENTER_INSIDE);
-      mWorkProfileIcon.setVisibility(View.VISIBLE);
-    }
-  }
-
-  private TruncateAt getTextEllipsis() {
-    return TruncateAt.MARQUEE;
-  }
-
-  public void showDisplayName(Cursor cursor, int nameColumnIndex) {
-    CharSequence name = cursor.getString(nameColumnIndex);
-    setDisplayName(name);
-
-    // Since the quick contact content description is derived from the display name and there is
-    // no guarantee that when the quick contact is initialized the display name is already set,
-    // do it here too.
-    if (mQuickContact != null) {
-      mQuickContact.setContentDescription(
-          getContext().getString(R.string.description_quick_contact_for, mNameTextView.getText()));
-    }
-  }
-
-  public void setDisplayName(CharSequence name) {
-    if (!TextUtils.isEmpty(name)) {
-      // Chooses the available highlighting method for highlighting.
-      if (mHighlightedPrefix != null) {
-        name = mTextHighlighter.applyPrefixHighlight(name, mHighlightedPrefix);
-      } else if (mNameHighlightSequence.size() != 0) {
-        final SpannableString spannableName = new SpannableString(name);
-        for (HighlightSequence highlightSequence : mNameHighlightSequence) {
-          mTextHighlighter.applyMaskingHighlight(
-              spannableName, highlightSequence.start, highlightSequence.end);
-        }
-        name = spannableName;
-      }
-    } else {
-      name = mUnknownNameText;
-    }
-    setMarqueeText(getNameTextView(), name);
-
-    if (ContactDisplayUtils.isPossiblePhoneNumber(name)) {
-      // Give the text-to-speech engine a hint that it's a phone number
-      mNameTextView.setTextDirection(View.TEXT_DIRECTION_LTR);
-      mNameTextView.setContentDescription(PhoneNumberUtils.createTtsSpannable(name.toString()));
-    } else {
-      // Remove span tags of highlighting for talkback to avoid reading highlighting and rest
-      // of the name into two separate parts.
-      mNameTextView.setContentDescription(name.toString());
-    }
-  }
-
-  public void hideDisplayName() {
-    if (mNameTextView != null) {
-      removeView(mNameTextView);
-      mNameTextView = null;
-    }
-  }
-
-  /** Sets the proper icon (star or presence or nothing) and/or status message. */
-  public void showPresenceAndStatusMessage(
-      Cursor cursor, int presenceColumnIndex, int contactStatusColumnIndex) {
-    Drawable icon = null;
-    int presence = 0;
-    if (!cursor.isNull(presenceColumnIndex)) {
-      presence = cursor.getInt(presenceColumnIndex);
-      icon = ContactPresenceIconUtil.getPresenceIcon(getContext(), presence);
-    }
-    setPresence(icon);
-
-    String statusMessage = null;
-    if (contactStatusColumnIndex != 0 && !cursor.isNull(contactStatusColumnIndex)) {
-      statusMessage = cursor.getString(contactStatusColumnIndex);
-    }
-    // If there is no status message from the contact, but there was a presence value, then use
-    // the default status message string
-    if (statusMessage == null && presence != 0) {
-      statusMessage = ContactStatusUtil.getStatusString(getContext(), presence);
-    }
-    setStatus(statusMessage);
-  }
-
-  /** Shows search snippet. */
-  public void showSnippet(Cursor cursor, int summarySnippetColumnIndex) {
-    if (cursor.getColumnCount() <= summarySnippetColumnIndex
-        || !SearchSnippets.SNIPPET.equals(cursor.getColumnName(summarySnippetColumnIndex))) {
-      setSnippet(null);
-      return;
-    }
-
-    String snippet = cursor.getString(summarySnippetColumnIndex);
-
-    // Do client side snippeting if provider didn't do it
-    final Bundle extras = cursor.getExtras();
-    if (extras.getBoolean(ContactsContract.DEFERRED_SNIPPETING)) {
-
-      final String query = extras.getString(ContactsContract.DEFERRED_SNIPPETING_QUERY);
-
-      String displayName = null;
-      int displayNameIndex = cursor.getColumnIndex(Contacts.DISPLAY_NAME);
-      if (displayNameIndex >= 0) {
-        displayName = cursor.getString(displayNameIndex);
-      }
-
-      snippet = updateSnippet(snippet, query, displayName);
-
-    } else {
-      if (snippet != null) {
-        int from = 0;
-        int to = snippet.length();
-        int start = snippet.indexOf(SNIPPET_START_MATCH);
-        if (start == -1) {
-          snippet = null;
-        } else {
-          int firstNl = snippet.lastIndexOf('\n', start);
-          if (firstNl != -1) {
-            from = firstNl + 1;
-          }
-          int end = snippet.lastIndexOf(SNIPPET_END_MATCH);
-          if (end != -1) {
-            int lastNl = snippet.indexOf('\n', end);
-            if (lastNl != -1) {
-              to = lastNl;
-            }
-          }
-
-          StringBuilder sb = new StringBuilder();
-          for (int i = from; i < to; i++) {
-            char c = snippet.charAt(i);
-            if (c != SNIPPET_START_MATCH && c != SNIPPET_END_MATCH) {
-              sb.append(c);
-            }
-          }
-          snippet = sb.toString();
-        }
-      }
-    }
-
-    setSnippet(snippet);
-  }
-
-  /**
-   * Used for deferred snippets from the database. The contents come back as large strings which
-   * need to be extracted for display.
-   *
-   * @param snippet The snippet from the database.
-   * @param query The search query substring.
-   * @param displayName The contact display name.
-   * @return The proper snippet to display.
-   */
-  private String updateSnippet(String snippet, String query, String displayName) {
-
-    if (TextUtils.isEmpty(snippet) || TextUtils.isEmpty(query)) {
-      return null;
-    }
-    query = SearchUtil.cleanStartAndEndOfSearchQuery(query.toLowerCase());
-
-    // If the display name already contains the query term, return empty - snippets should
-    // not be needed in that case.
-    if (!TextUtils.isEmpty(displayName)) {
-      final String lowerDisplayName = displayName.toLowerCase();
-      final List<String> nameTokens = split(lowerDisplayName);
-      for (String nameToken : nameTokens) {
-        if (nameToken.startsWith(query)) {
-          return null;
-        }
-      }
-    }
-
-    // The snippet may contain multiple data lines.
-    // Show the first line that matches the query.
-    final SearchUtil.MatchedLine matched = SearchUtil.findMatchingLine(snippet, query);
-
-    if (matched != null && matched.line != null) {
-      // Tokenize for long strings since the match may be at the end of it.
-      // Skip this part for short strings since the whole string will be displayed.
-      // Most contact strings are short so the snippetize method will be called infrequently.
-      final int lengthThreshold =
-          getResources().getInteger(R.integer.snippet_length_before_tokenize);
-      if (matched.line.length() > lengthThreshold) {
-        return snippetize(matched.line, matched.startIndex, lengthThreshold);
-      } else {
-        return matched.line;
-      }
-    }
-
-    // No match found.
-    return null;
-  }
-
-  private String snippetize(String line, int matchIndex, int maxLength) {
-    // Show up to maxLength characters. But we only show full tokens so show the last full token
-    // up to maxLength characters. So as many starting tokens as possible before trying ending
-    // tokens.
-    int remainingLength = maxLength;
-    int tempRemainingLength = remainingLength;
-
-    // Start the end token after the matched query.
-    int index = matchIndex;
-    int endTokenIndex = index;
-
-    // Find the match token first.
-    while (index < line.length()) {
-      if (!Character.isLetterOrDigit(line.charAt(index))) {
-        endTokenIndex = index;
-        remainingLength = tempRemainingLength;
-        break;
-      }
-      tempRemainingLength--;
-      index++;
-    }
-
-    // Find as much content before the match.
-    index = matchIndex - 1;
-    tempRemainingLength = remainingLength;
-    int startTokenIndex = matchIndex;
-    while (index > -1 && tempRemainingLength > 0) {
-      if (!Character.isLetterOrDigit(line.charAt(index))) {
-        startTokenIndex = index;
-        remainingLength = tempRemainingLength;
-      }
-      tempRemainingLength--;
-      index--;
-    }
-
-    index = endTokenIndex;
-    tempRemainingLength = remainingLength;
-    // Find remaining content at after match.
-    while (index < line.length() && tempRemainingLength > 0) {
-      if (!Character.isLetterOrDigit(line.charAt(index))) {
-        endTokenIndex = index;
-      }
-      tempRemainingLength--;
-      index++;
-    }
-    // Append ellipse if there is content before or after.
-    final StringBuilder sb = new StringBuilder();
-    if (startTokenIndex > 0) {
-      sb.append("...");
-    }
-    sb.append(line.substring(startTokenIndex, endTokenIndex));
-    if (endTokenIndex < line.length()) {
-      sb.append("...");
-    }
-    return sb.toString();
-  }
-
-  public void setActivatedStateSupported(boolean flag) {
-    this.mActivatedStateSupported = flag;
-  }
-
-  public void setAdjustSelectionBoundsEnabled(boolean enabled) {
-    mAdjustSelectionBoundsEnabled = enabled;
-  }
-
-  @Override
-  public void requestLayout() {
-    // We will assume that once measured this will not need to resize
-    // itself, so there is no need to pass the layout request to the parent
-    // view (ListView).
-    forceLayout();
-  }
-
-  /**
-   * Set drawable resources directly for the drawable resource of the photo view.
-   *
-   * @param drawable A drawable resource.
-   */
-  public void setDrawable(Drawable drawable) {
-    ImageView photo = getPhotoView();
-    photo.setScaleType(ImageView.ScaleType.CENTER);
-    int iconColor = ContextCompat.getColor(getContext(), R.color.search_shortcut_icon_color);
-    photo.setImageDrawable(drawable);
-    photo.setImageTintList(ColorStateList.valueOf(iconColor));
-  }
-
-  @Override
-  public boolean onTouchEvent(MotionEvent event) {
-    final float x = event.getX();
-    final float y = event.getY();
-    // If the touch event's coordinates are not within the view's header, then delegate
-    // to super.onTouchEvent so that regular view behavior is preserved. Otherwise, consume
-    // and ignore the touch event.
-    if (mBoundsWithoutHeader.contains((int) x, (int) y) || !pointIsInView(x, y)) {
-      return super.onTouchEvent(event);
-    } else {
-      return true;
-    }
-  }
-
-  private boolean pointIsInView(float localX, float localY) {
-    return localX >= mLeftOffset
-        && localX < mRightOffset
-        && localY >= 0
-        && localY < (getBottom() - getTop());
-  }
-
-  /**
-   * Where to put contact photo. This affects the other Views' layout or look-and-feel.
-   *
-   * <p>TODO: replace enum with int constants
-   */
-  public enum PhotoPosition {
-    LEFT,
-    RIGHT
-  }
-
-  protected static class HighlightSequence {
-
-    private final int start;
-    private final int end;
-
-    HighlightSequence(int start, int end) {
-      this.start = start;
-      this.end = end;
-    }
-  }
-}
diff --git a/java/com/android/contacts/common/list/ContactListPinnedHeaderView.java b/java/com/android/contacts/common/list/ContactListPinnedHeaderView.java
deleted file mode 100644
index 1f3e2bf..0000000
--- a/java/com/android/contacts/common/list/ContactListPinnedHeaderView.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.contacts.common.list;
-
-import android.content.Context;
-import android.content.res.TypedArray;
-import android.graphics.Color;
-import android.text.TextUtils;
-import android.util.AttributeSet;
-import android.view.Gravity;
-import android.view.View;
-import android.widget.LinearLayout.LayoutParams;
-import android.widget.TextView;
-import com.android.contacts.common.R;
-
-/** A custom view for the pinned section header shown at the top of the contact list. */
-public class ContactListPinnedHeaderView extends TextView {
-
-  public ContactListPinnedHeaderView(Context context, AttributeSet attrs, View parent) {
-    super(context, attrs);
-
-    if (R.styleable.ContactListItemView == null) {
-      return;
-    }
-    TypedArray a = getContext().obtainStyledAttributes(attrs, R.styleable.ContactListItemView);
-    int backgroundColor =
-        a.getColor(R.styleable.ContactListItemView_list_item_background_color, Color.WHITE);
-    int textOffsetTop =
-        a.getDimensionPixelSize(R.styleable.ContactListItemView_list_item_text_offset_top, 0);
-    int paddingStartOffset =
-        a.getDimensionPixelSize(R.styleable.ContactListItemView_list_item_padding_left, 0);
-    int textWidth = getResources().getDimensionPixelSize(R.dimen.contact_list_section_header_width);
-    int widthIncludingPadding = paddingStartOffset + textWidth;
-    a.recycle();
-
-    setBackgroundColor(backgroundColor);
-    setTextAppearance(getContext(), R.style.SectionHeaderStyle);
-    setLayoutParams(new LayoutParams(textWidth, LayoutParams.WRAP_CONTENT));
-    setLayoutDirection(parent.getLayoutDirection());
-    setGravity(Gravity.CENTER_VERTICAL | Gravity.CENTER_HORIZONTAL);
-
-    // Apply text top offset. Multiply by two, because we are implementing this by padding for a
-    // vertically centered view, rather than adjusting the position directly via a layout.
-    setPaddingRelative(
-        0, getPaddingTop() + (textOffsetTop * 2), getPaddingEnd(), getPaddingBottom());
-  }
-
-  /** Sets section header or makes it invisible if the title is null. */
-  public void setSectionHeaderTitle(String title) {
-    if (!TextUtils.isEmpty(title)) {
-      setText(title);
-    } else {
-      setVisibility(View.GONE);
-    }
-  }
-}
diff --git a/java/com/android/contacts/common/list/ContactTileView.java b/java/com/android/contacts/common/list/ContactTileView.java
index cfd52f3..732cee7 100644
--- a/java/com/android/contacts/common/list/ContactTileView.java
+++ b/java/com/android/contacts/common/list/ContactTileView.java
@@ -22,14 +22,14 @@
 import android.view.View;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
-import android.widget.TextView;
 import com.android.contacts.common.MoreContactUtils;
-import com.android.contacts.common.R;
 import com.android.dialer.callintent.CallInitiationType;
 import com.android.dialer.callintent.CallSpecificAppData;
 import com.android.dialer.common.LogUtil;
 import com.android.dialer.contactphoto.ContactPhotoManager;
 import com.android.dialer.contactphoto.ContactPhotoManager.DefaultImageRequest;
+import com.android.dialer.contacts.resources.R;
+import com.android.dialer.widget.BidiTextView;
 
 /** A ContactTile displays a contact's picture and name */
 public abstract class ContactTileView extends FrameLayout {
@@ -38,7 +38,7 @@
   protected Listener mListener;
   private Uri mLookupUri;
   private ImageView mPhoto;
-  private TextView mName;
+  private BidiTextView mName;
   private ContactPhotoManager mPhotoManager = null;
 
   public ContactTileView(Context context, AttributeSet attrs) {
@@ -48,7 +48,7 @@
   @Override
   protected void onFinishInflate() {
     super.onFinishInflate();
-    mName = (TextView) findViewById(R.id.contact_tile_name);
+    mName = (BidiTextView) findViewById(R.id.contact_tile_name);
     mPhoto = (ImageView) findViewById(R.id.contact_tile_image);
 
     OnClickListener listener = createClickListener();
diff --git a/java/com/android/contacts/common/list/ContactsSectionIndexer.java b/java/com/android/contacts/common/list/ContactsSectionIndexer.java
deleted file mode 100644
index 3f0f2b7..0000000
--- a/java/com/android/contacts/common/list/ContactsSectionIndexer.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.contacts.common.list;
-
-import android.text.TextUtils;
-import android.widget.SectionIndexer;
-import java.util.Arrays;
-
-/**
- * A section indexer that is configured with precomputed section titles and their respective counts.
- */
-public class ContactsSectionIndexer implements SectionIndexer {
-
-  private static final String BLANK_HEADER_STRING = " ";
-  private String[] mSections;
-  private int[] mPositions;
-  private int mCount;
-
-  /**
-   * Constructor.
-   *
-   * @param sections a non-null array
-   * @param counts a non-null array of the same size as <code>sections</code>
-   */
-  public ContactsSectionIndexer(String[] sections, int[] counts) {
-    if (sections == null || counts == null) {
-      throw new NullPointerException();
-    }
-
-    if (sections.length != counts.length) {
-      throw new IllegalArgumentException(
-          "The sections and counts arrays must have the same length");
-    }
-
-    // TODO process sections/counts based on current locale and/or specific section titles
-
-    this.mSections = sections;
-    mPositions = new int[counts.length];
-    int position = 0;
-    for (int i = 0; i < counts.length; i++) {
-      if (TextUtils.isEmpty(mSections[i])) {
-        mSections[i] = BLANK_HEADER_STRING;
-      } else if (!mSections[i].equals(BLANK_HEADER_STRING)) {
-        mSections[i] = mSections[i].trim();
-      }
-
-      mPositions[i] = position;
-      position += counts[i];
-    }
-    mCount = position;
-  }
-
-  public Object[] getSections() {
-    return mSections;
-  }
-
-  public int getPositionForSection(int section) {
-    if (section < 0 || section >= mSections.length) {
-      return -1;
-    }
-
-    return mPositions[section];
-  }
-
-  public int getSectionForPosition(int position) {
-    if (position < 0 || position >= mCount) {
-      return -1;
-    }
-
-    int index = Arrays.binarySearch(mPositions, position);
-
-    /*
-     * Consider this example: section positions are 0, 3, 5; the supplied
-     * position is 4. The section corresponding to position 4 starts at
-     * position 3, so the expected return value is 1. Binary search will not
-     * find 4 in the array and thus will return -insertPosition-1, i.e. -3.
-     * To get from that number to the expected value of 1 we need to negate
-     * and subtract 2.
-     */
-    return index >= 0 ? index : -index - 2;
-  }
-
-  public void setProfileAndFavoritesHeader(String header, int numberOfItemsToAdd) {
-    if (mSections != null) {
-      // Don't do anything if the header is already set properly.
-      if (mSections.length > 0 && header.equals(mSections[0])) {
-        return;
-      }
-
-      // Since the section indexer isn't aware of the profile at the top, we need to add a
-      // special section at the top for it and shift everything else down.
-      String[] tempSections = new String[mSections.length + 1];
-      int[] tempPositions = new int[mPositions.length + 1];
-      tempSections[0] = header;
-      tempPositions[0] = 0;
-      for (int i = 1; i <= mPositions.length; i++) {
-        tempSections[i] = mSections[i - 1];
-        tempPositions[i] = mPositions[i - 1] + numberOfItemsToAdd;
-      }
-      mSections = tempSections;
-      mPositions = tempPositions;
-      mCount = mCount + numberOfItemsToAdd;
-    }
-  }
-}
diff --git a/java/com/android/contacts/common/list/DefaultContactListAdapter.java b/java/com/android/contacts/common/list/DefaultContactListAdapter.java
deleted file mode 100644
index 7bcae0e..0000000
--- a/java/com/android/contacts/common/list/DefaultContactListAdapter.java
+++ /dev/null
@@ -1,216 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.contacts.common.list;
-
-import android.content.Context;
-import android.content.CursorLoader;
-import android.content.SharedPreferences;
-import android.database.Cursor;
-import android.net.Uri;
-import android.net.Uri.Builder;
-import android.preference.PreferenceManager;
-import android.provider.ContactsContract;
-import android.provider.ContactsContract.Contacts;
-import android.provider.ContactsContract.Directory;
-import android.provider.ContactsContract.SearchSnippets;
-import android.text.TextUtils;
-import android.view.View;
-import com.android.contacts.common.compat.ContactsCompat;
-import com.android.contacts.common.preference.ContactsPreferences;
-import java.util.ArrayList;
-import java.util.List;
-
-/** A cursor adapter for the {@link ContactsContract.Contacts#CONTENT_TYPE} content type. */
-public class DefaultContactListAdapter extends ContactListAdapter {
-
-  public DefaultContactListAdapter(Context context) {
-    super(context);
-  }
-
-  @Override
-  public void configureLoader(CursorLoader loader, long directoryId) {
-    String sortOrder = null;
-    if (isSearchMode()) {
-      String query = getQueryString();
-      if (query == null) {
-        query = "";
-      }
-      query = query.trim();
-      if (TextUtils.isEmpty(query)) {
-        // Regardless of the directory, we don't want anything returned,
-        // so let's just send a "nothing" query to the local directory.
-        loader.setUri(Contacts.CONTENT_URI);
-        loader.setProjection(getProjection(false));
-        loader.setSelection("0");
-      } else {
-        final Builder builder = ContactsCompat.getContentUri().buildUpon();
-        appendSearchParameters(builder, query, directoryId);
-        loader.setUri(builder.build());
-        loader.setProjection(getProjection(true));
-      }
-    } else {
-      final ContactListFilter filter = getFilter();
-      configureUri(loader, directoryId, filter);
-      loader.setProjection(getProjection(false));
-      configureSelection(loader, directoryId, filter);
-    }
-
-    if (getSortOrder() == ContactsPreferences.SORT_ORDER_PRIMARY) {
-      if (sortOrder == null) {
-        sortOrder = Contacts.SORT_KEY_PRIMARY;
-      } else {
-        sortOrder += ", " + Contacts.SORT_KEY_PRIMARY;
-      }
-    } else {
-      if (sortOrder == null) {
-        sortOrder = Contacts.SORT_KEY_ALTERNATIVE;
-      } else {
-        sortOrder += ", " + Contacts.SORT_KEY_ALTERNATIVE;
-      }
-    }
-    loader.setSortOrder(sortOrder);
-  }
-
-  private void appendSearchParameters(Builder builder, String query, long directoryId) {
-    builder.appendPath(query); // Builder will encode the query
-    builder.appendQueryParameter(ContactsContract.DIRECTORY_PARAM_KEY, String.valueOf(directoryId));
-    if (directoryId != Directory.DEFAULT && directoryId != Directory.LOCAL_INVISIBLE) {
-      builder.appendQueryParameter(
-          ContactsContract.LIMIT_PARAM_KEY,
-          String.valueOf(getDirectoryResultLimit(getDirectoryById(directoryId))));
-    }
-    builder.appendQueryParameter(SearchSnippets.DEFERRED_SNIPPETING_KEY, "1");
-  }
-
-  protected void configureUri(CursorLoader loader, long directoryId, ContactListFilter filter) {
-    Uri uri = Contacts.CONTENT_URI;
-
-    if (directoryId == Directory.DEFAULT && isSectionHeaderDisplayEnabled()) {
-      uri = ContactListAdapter.buildSectionIndexerUri(uri);
-    }
-
-    // The "All accounts" filter is the same as the entire contents of Directory.DEFAULT
-    if (filter != null
-        && filter.filterType != ContactListFilter.FILTER_TYPE_CUSTOM
-        && filter.filterType != ContactListFilter.FILTER_TYPE_SINGLE_CONTACT) {
-      final Uri.Builder builder = uri.buildUpon();
-      builder.appendQueryParameter(
-          ContactsContract.DIRECTORY_PARAM_KEY, String.valueOf(Directory.DEFAULT));
-      if (filter.filterType == ContactListFilter.FILTER_TYPE_ACCOUNT) {
-        filter.addAccountQueryParameterToUrl(builder);
-      }
-      uri = builder.build();
-    }
-
-    loader.setUri(uri);
-  }
-
-  private void configureSelection(CursorLoader loader, long directoryId, ContactListFilter filter) {
-    if (filter == null) {
-      return;
-    }
-
-    if (directoryId != Directory.DEFAULT) {
-      return;
-    }
-
-    StringBuilder selection = new StringBuilder();
-    List<String> selectionArgs = new ArrayList<String>();
-
-    switch (filter.filterType) {
-      case ContactListFilter.FILTER_TYPE_ALL_ACCOUNTS:
-        {
-          // We have already added directory=0 to the URI, which takes care of this
-          // filter
-          break;
-        }
-      case ContactListFilter.FILTER_TYPE_SINGLE_CONTACT:
-        {
-          // We have already added the lookup key to the URI, which takes care of this
-          // filter
-          break;
-        }
-      case ContactListFilter.FILTER_TYPE_STARRED:
-        {
-          selection.append(Contacts.STARRED + "!=0");
-          break;
-        }
-      case ContactListFilter.FILTER_TYPE_WITH_PHONE_NUMBERS_ONLY:
-        {
-          selection.append(Contacts.HAS_PHONE_NUMBER + "=1");
-          break;
-        }
-      case ContactListFilter.FILTER_TYPE_CUSTOM:
-        {
-          selection.append(Contacts.IN_VISIBLE_GROUP + "=1");
-          if (isCustomFilterForPhoneNumbersOnly()) {
-            selection.append(" AND " + Contacts.HAS_PHONE_NUMBER + "=1");
-          }
-          break;
-        }
-      case ContactListFilter.FILTER_TYPE_ACCOUNT:
-        {
-          // We use query parameters for account filter, so no selection to add here.
-          break;
-        }
-    }
-    loader.setSelection(selection.toString());
-    loader.setSelectionArgs(selectionArgs.toArray(new String[0]));
-  }
-
-  @Override
-  protected void bindView(View itemView, int partition, Cursor cursor, int position) {
-    super.bindView(itemView, partition, cursor, position);
-    final ContactListItemView view = (ContactListItemView) itemView;
-
-    view.setHighlightedPrefix(isSearchMode() ? getUpperCaseQueryString() : null);
-
-    bindSectionHeaderAndDivider(view, position, cursor);
-
-    if (isQuickContactEnabled()) {
-      bindQuickContact(
-          view,
-          partition,
-          cursor,
-          ContactQuery.CONTACT_PHOTO_ID,
-          ContactQuery.CONTACT_PHOTO_URI,
-          ContactQuery.CONTACT_ID,
-          ContactQuery.CONTACT_LOOKUP_KEY,
-          ContactQuery.CONTACT_DISPLAY_NAME);
-    } else {
-      if (getDisplayPhotos()) {
-        bindPhoto(view, partition, cursor);
-      }
-    }
-
-    bindNameAndViewId(view, cursor);
-    bindPresenceAndStatusMessage(view, cursor);
-
-    if (isSearchMode()) {
-      bindSearchSnippet(view, cursor);
-    } else {
-      view.setSnippet(null);
-    }
-  }
-
-  private boolean isCustomFilterForPhoneNumbersOnly() {
-    // TODO: this flag should not be stored in shared prefs.  It needs to be in the db.
-    SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
-    return prefs.getBoolean(
-        ContactsPreferences.PREF_DISPLAY_ONLY_PHONES,
-        ContactsPreferences.PREF_DISPLAY_ONLY_PHONES_DEFAULT);
-  }
-}
diff --git a/java/com/android/contacts/common/list/DirectoryListLoader.java b/java/com/android/contacts/common/list/DirectoryListLoader.java
deleted file mode 100644
index ce78d2c..0000000
--- a/java/com/android/contacts/common/list/DirectoryListLoader.java
+++ /dev/null
@@ -1,210 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.contacts.common.list;
-
-import android.content.AsyncTaskLoader;
-import android.content.Context;
-import android.content.pm.PackageManager;
-import android.database.ContentObserver;
-import android.database.Cursor;
-import android.database.MatrixCursor;
-import android.net.Uri;
-import android.os.Handler;
-import android.provider.ContactsContract.Directory;
-import android.text.TextUtils;
-import com.android.contacts.common.R;
-import com.android.dialer.common.LogUtil;
-import com.android.dialer.common.cp2.DirectoryCompat;
-import com.android.dialer.util.PermissionsUtil;
-
-/** A specialized loader for the list of directories, see {@link Directory}. */
-public class DirectoryListLoader extends AsyncTaskLoader<Cursor> {
-
-  public static final int SEARCH_MODE_NONE = 0;
-  public static final int SEARCH_MODE_DEFAULT = 1;
-  public static final int SEARCH_MODE_CONTACT_SHORTCUT = 2;
-  public static final int SEARCH_MODE_DATA_SHORTCUT = 3;
-  // This is a virtual column created for a MatrixCursor.
-  public static final String DIRECTORY_TYPE = "directoryType";
-  private static final String[] RESULT_PROJECTION = {
-    Directory._ID, DIRECTORY_TYPE, Directory.DISPLAY_NAME, Directory.PHOTO_SUPPORT,
-  };
-  private final ContentObserver mObserver =
-      new ContentObserver(new Handler()) {
-        @Override
-        public void onChange(boolean selfChange) {
-          forceLoad();
-        }
-      };
-  private int mDirectorySearchMode;
-  private boolean mLocalInvisibleDirectoryEnabled;
-  private MatrixCursor mDefaultDirectoryList;
-
-  public DirectoryListLoader(Context context) {
-    super(context);
-  }
-
-  public void setDirectorySearchMode(int mode) {
-    mDirectorySearchMode = mode;
-  }
-
-  /**
-   * A flag that indicates whether the {@link Directory#LOCAL_INVISIBLE} directory should be
-   * included in the results.
-   */
-  public void setLocalInvisibleDirectoryEnabled(boolean flag) {
-    this.mLocalInvisibleDirectoryEnabled = flag;
-  }
-
-  @Override
-  protected void onStartLoading() {
-    if (PermissionsUtil.hasContactsReadPermissions(getContext())) {
-      getContext()
-          .getContentResolver()
-          .registerContentObserver(DirectoryQuery.URI, false, mObserver);
-    } else {
-      LogUtil.w("DirectoryListLoader.onStartLoading", "contacts permission not available.");
-    }
-    forceLoad();
-  }
-
-  @Override
-  protected void onStopLoading() {
-    getContext().getContentResolver().unregisterContentObserver(mObserver);
-  }
-
-  @Override
-  public Cursor loadInBackground() {
-    if (mDirectorySearchMode == SEARCH_MODE_NONE) {
-      return getDefaultDirectories();
-    }
-
-    MatrixCursor result = new MatrixCursor(RESULT_PROJECTION);
-    Context context = getContext();
-    PackageManager pm = context.getPackageManager();
-    String selection;
-    switch (mDirectorySearchMode) {
-      case SEARCH_MODE_DEFAULT:
-        selection = null;
-        break;
-
-      case SEARCH_MODE_CONTACT_SHORTCUT:
-        selection = Directory.SHORTCUT_SUPPORT + "=" + Directory.SHORTCUT_SUPPORT_FULL;
-        break;
-
-      case SEARCH_MODE_DATA_SHORTCUT:
-        selection =
-            Directory.SHORTCUT_SUPPORT
-                + " IN ("
-                + Directory.SHORTCUT_SUPPORT_FULL
-                + ", "
-                + Directory.SHORTCUT_SUPPORT_DATA_ITEMS_ONLY
-                + ")";
-        break;
-
-      default:
-        throw new RuntimeException("Unsupported directory search mode: " + mDirectorySearchMode);
-    }
-    Cursor cursor = null;
-    try {
-      cursor =
-          context
-              .getContentResolver()
-              .query(
-                  DirectoryQuery.URI,
-                  DirectoryQuery.PROJECTION,
-                  selection,
-                  null,
-                  DirectoryQuery.ORDER_BY);
-
-      if (cursor == null) {
-        return result;
-      }
-
-      while (cursor.moveToNext()) {
-        long directoryId = cursor.getLong(DirectoryQuery.ID);
-        if (!mLocalInvisibleDirectoryEnabled && DirectoryCompat.isInvisibleDirectory(directoryId)) {
-          continue;
-        }
-        String directoryType = null;
-
-        String packageName = cursor.getString(DirectoryQuery.PACKAGE_NAME);
-        int typeResourceId = cursor.getInt(DirectoryQuery.TYPE_RESOURCE_ID);
-        if (!TextUtils.isEmpty(packageName) && typeResourceId != 0) {
-          try {
-            directoryType = pm.getResourcesForApplication(packageName).getString(typeResourceId);
-          } catch (Exception e) {
-            LogUtil.e(
-                "ContactEntryListAdapter.loadInBackground",
-                "cannot obtain directory type from package: " + packageName);
-          }
-        }
-        String displayName = cursor.getString(DirectoryQuery.DISPLAY_NAME);
-        int photoSupport = cursor.getInt(DirectoryQuery.PHOTO_SUPPORT);
-        result.addRow(new Object[] {directoryId, directoryType, displayName, photoSupport});
-      }
-    } catch (RuntimeException e) {
-      LogUtil.w(
-          "ContactEntryListAdapter.loadInBackground", "runtime exception when querying directory");
-    } finally {
-      if (cursor != null) {
-        cursor.close();
-      }
-    }
-
-    return result;
-  }
-
-  private Cursor getDefaultDirectories() {
-    if (mDefaultDirectoryList == null) {
-      mDefaultDirectoryList = new MatrixCursor(RESULT_PROJECTION);
-      mDefaultDirectoryList.addRow(
-          new Object[] {Directory.DEFAULT, getContext().getString(R.string.contactsList), null});
-      mDefaultDirectoryList.addRow(
-          new Object[] {
-            Directory.LOCAL_INVISIBLE,
-            getContext().getString(R.string.local_invisible_directory),
-            null
-          });
-    }
-    return mDefaultDirectoryList;
-  }
-
-  @Override
-  protected void onReset() {
-    stopLoading();
-  }
-
-  private static final class DirectoryQuery {
-
-    public static final Uri URI = DirectoryCompat.getContentUri();
-    public static final String ORDER_BY = Directory._ID;
-
-    public static final String[] PROJECTION = {
-      Directory._ID,
-      Directory.PACKAGE_NAME,
-      Directory.TYPE_RESOURCE_ID,
-      Directory.DISPLAY_NAME,
-      Directory.PHOTO_SUPPORT,
-    };
-
-    public static final int ID = 0;
-    public static final int PACKAGE_NAME = 1;
-    public static final int TYPE_RESOURCE_ID = 2;
-    public static final int DISPLAY_NAME = 3;
-    public static final int PHOTO_SUPPORT = 4;
-  }
-}
diff --git a/java/com/android/contacts/common/list/DirectoryPartition.java b/java/com/android/contacts/common/list/DirectoryPartition.java
deleted file mode 100644
index 26b8510..0000000
--- a/java/com/android/contacts/common/list/DirectoryPartition.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.contacts.common.list;
-
-import android.provider.ContactsContract.Directory;
-import com.android.common.widget.CompositeCursorAdapter;
-
-/** Model object for a {@link Directory} row. */
-public final class DirectoryPartition extends CompositeCursorAdapter.Partition {
-
-  public static final int STATUS_NOT_LOADED = 0;
-  public static final int STATUS_LOADING = 1;
-  public static final int STATUS_LOADED = 2;
-
-  public static final int RESULT_LIMIT_DEFAULT = -1;
-
-  private long mDirectoryId;
-  private String mContentUri;
-  private String mDirectoryType;
-  private String mDisplayName;
-  private int mStatus;
-  private boolean mPriorityDirectory;
-  private boolean mPhotoSupported;
-  private int mResultLimit = RESULT_LIMIT_DEFAULT;
-  private boolean mDisplayNumber = true;
-
-  private String mLabel;
-
-  public DirectoryPartition(boolean showIfEmpty, boolean hasHeader) {
-    super(showIfEmpty, hasHeader);
-  }
-
-  /** Directory ID, see {@link Directory}. */
-  public long getDirectoryId() {
-    return mDirectoryId;
-  }
-
-  public void setDirectoryId(long directoryId) {
-    this.mDirectoryId = directoryId;
-  }
-
-  /**
-   * Directory type resolved from {@link Directory#PACKAGE_NAME} and {@link
-   * Directory#TYPE_RESOURCE_ID};
-   */
-  public String getDirectoryType() {
-    return mDirectoryType;
-  }
-
-  public void setDirectoryType(String directoryType) {
-    this.mDirectoryType = directoryType;
-  }
-
-  /** See {@link Directory#DISPLAY_NAME}. */
-  public String getDisplayName() {
-    return mDisplayName;
-  }
-
-  public void setDisplayName(String displayName) {
-    this.mDisplayName = displayName;
-  }
-
-  public int getStatus() {
-    return mStatus;
-  }
-
-  public void setStatus(int status) {
-    mStatus = status;
-  }
-
-  public boolean isLoading() {
-    return mStatus == STATUS_NOT_LOADED || mStatus == STATUS_LOADING;
-  }
-
-  /** Returns true if this directory should be loaded before non-priority directories. */
-  public boolean isPriorityDirectory() {
-    return mPriorityDirectory;
-  }
-
-  public void setPriorityDirectory(boolean priorityDirectory) {
-    mPriorityDirectory = priorityDirectory;
-  }
-
-  /** Returns true if this directory supports photos. */
-  public boolean isPhotoSupported() {
-    return mPhotoSupported;
-  }
-
-  public void setPhotoSupported(boolean flag) {
-    this.mPhotoSupported = flag;
-  }
-
-  /**
-   * Max number of results for this directory. Defaults to {@link #RESULT_LIMIT_DEFAULT} which
-   * implies using the adapter's {@link
-   * com.android.contacts.common.list.ContactListAdapter#getDirectoryResultLimit()}
-   */
-  public int getResultLimit() {
-    return mResultLimit;
-  }
-
-  public void setResultLimit(int resultLimit) {
-    mResultLimit = resultLimit;
-  }
-
-  /**
-   * Used by extended directories to specify a custom content URI. Extended directories MUST have a
-   * content URI
-   */
-  public String getContentUri() {
-    return mContentUri;
-  }
-
-  public void setContentUri(String contentUri) {
-    mContentUri = contentUri;
-  }
-
-  /** A label to display in the header next to the display name. */
-  public String getLabel() {
-    return mLabel;
-  }
-
-  public void setLabel(String label) {
-    mLabel = label;
-  }
-
-  @Override
-  public String toString() {
-    return "DirectoryPartition{"
-        + "mDirectoryId="
-        + mDirectoryId
-        + ", mContentUri='"
-        + mContentUri
-        + '\''
-        + ", mDirectoryType='"
-        + mDirectoryType
-        + '\''
-        + ", mDisplayName='"
-        + mDisplayName
-        + '\''
-        + ", mStatus="
-        + mStatus
-        + ", mPriorityDirectory="
-        + mPriorityDirectory
-        + ", mPhotoSupported="
-        + mPhotoSupported
-        + ", mResultLimit="
-        + mResultLimit
-        + ", mLabel='"
-        + mLabel
-        + '\''
-        + '}';
-  }
-
-  /**
-   * Whether or not to display the phone number in app that have that option - Dialer. If false,
-   * Phone Label should be used instead of Phone Number.
-   */
-  public boolean isDisplayNumber() {
-    return mDisplayNumber;
-  }
-
-  public void setDisplayNumber(boolean displayNumber) {
-    mDisplayNumber = displayNumber;
-  }
-}
diff --git a/java/com/android/contacts/common/list/IndexerListAdapter.java b/java/com/android/contacts/common/list/IndexerListAdapter.java
deleted file mode 100644
index 2289f6e..0000000
--- a/java/com/android/contacts/common/list/IndexerListAdapter.java
+++ /dev/null
@@ -1,214 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.contacts.common.list;
-
-import android.content.Context;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ListView;
-import android.widget.SectionIndexer;
-
-/** A list adapter that supports section indexer and a pinned header. */
-public abstract class IndexerListAdapter extends PinnedHeaderListAdapter implements SectionIndexer {
-
-  protected Context mContext;
-  private SectionIndexer mIndexer;
-  private int mIndexedPartition = 0;
-  private boolean mSectionHeaderDisplayEnabled;
-  private View mHeader;
-  private Placement mPlacementCache = new Placement();
-
-  /** Constructor. */
-  public IndexerListAdapter(Context context) {
-    super(context);
-    mContext = context;
-  }
-
-  /**
-   * Creates a section header view that will be pinned at the top of the list as the user scrolls.
-   */
-  protected abstract View createPinnedSectionHeaderView(Context context, ViewGroup parent);
-
-  /** Sets the title in the pinned header as the user scrolls. */
-  protected abstract void setPinnedSectionTitle(View pinnedHeaderView, String title);
-
-  public boolean isSectionHeaderDisplayEnabled() {
-    return mSectionHeaderDisplayEnabled;
-  }
-
-  public void setSectionHeaderDisplayEnabled(boolean flag) {
-    this.mSectionHeaderDisplayEnabled = flag;
-  }
-
-  public int getIndexedPartition() {
-    return mIndexedPartition;
-  }
-
-  public void setIndexedPartition(int partition) {
-    this.mIndexedPartition = partition;
-  }
-
-  public SectionIndexer getIndexer() {
-    return mIndexer;
-  }
-
-  public void setIndexer(SectionIndexer indexer) {
-    mIndexer = indexer;
-    mPlacementCache.invalidate();
-  }
-
-  public Object[] getSections() {
-    if (mIndexer == null) {
-      return new String[] {" "};
-    } else {
-      return mIndexer.getSections();
-    }
-  }
-
-  /** @return relative position of the section in the indexed partition */
-  public int getPositionForSection(int sectionIndex) {
-    if (mIndexer == null) {
-      return -1;
-    }
-
-    return mIndexer.getPositionForSection(sectionIndex);
-  }
-
-  /** @param position relative position in the indexed partition */
-  public int getSectionForPosition(int position) {
-    if (mIndexer == null) {
-      return -1;
-    }
-
-    return mIndexer.getSectionForPosition(position);
-  }
-
-  @Override
-  public int getPinnedHeaderCount() {
-    if (isSectionHeaderDisplayEnabled()) {
-      return super.getPinnedHeaderCount() + 1;
-    } else {
-      return super.getPinnedHeaderCount();
-    }
-  }
-
-  @Override
-  public View getPinnedHeaderView(int viewIndex, View convertView, ViewGroup parent) {
-    if (isSectionHeaderDisplayEnabled() && viewIndex == getPinnedHeaderCount() - 1) {
-      if (mHeader == null) {
-        mHeader = createPinnedSectionHeaderView(mContext, parent);
-      }
-      return mHeader;
-    } else {
-      return super.getPinnedHeaderView(viewIndex, convertView, parent);
-    }
-  }
-
-  @Override
-  public void configurePinnedHeaders(PinnedHeaderListView listView) {
-    super.configurePinnedHeaders(listView);
-
-    if (!isSectionHeaderDisplayEnabled()) {
-      return;
-    }
-
-    int index = getPinnedHeaderCount() - 1;
-    if (mIndexer == null || getCount() == 0) {
-      listView.setHeaderInvisible(index, false);
-    } else {
-      int listPosition = listView.getPositionAt(listView.getTotalTopPinnedHeaderHeight());
-      int position = listPosition - listView.getHeaderViewsCount();
-
-      int section = -1;
-      int partition = getPartitionForPosition(position);
-      if (partition == mIndexedPartition) {
-        int offset = getOffsetInPartition(position);
-        if (offset != -1) {
-          section = getSectionForPosition(offset);
-        }
-      }
-
-      if (section == -1) {
-        listView.setHeaderInvisible(index, false);
-      } else {
-        View topChild = listView.getChildAt(listPosition);
-        if (topChild != null) {
-          // Match the pinned header's height to the height of the list item.
-          mHeader.setMinimumHeight(topChild.getMeasuredHeight());
-        }
-        setPinnedSectionTitle(mHeader, (String) mIndexer.getSections()[section]);
-
-        // Compute the item position where the current partition begins
-        int partitionStart = getPositionForPartition(mIndexedPartition);
-        if (hasHeader(mIndexedPartition)) {
-          partitionStart++;
-        }
-
-        // Compute the item position where the next section begins
-        int nextSectionPosition = partitionStart + getPositionForSection(section + 1);
-        boolean isLastInSection = position == nextSectionPosition - 1;
-        listView.setFadingHeader(index, listPosition, isLastInSection);
-      }
-    }
-  }
-
-  /**
-   * Computes the item's placement within its section and populates the {@code placement} object
-   * accordingly. Please note that the returned object is volatile and should be copied if the
-   * result needs to be used later.
-   */
-  public Placement getItemPlacementInSection(int position) {
-    if (mPlacementCache.position == position) {
-      return mPlacementCache;
-    }
-
-    mPlacementCache.position = position;
-    if (isSectionHeaderDisplayEnabled()) {
-      int section = getSectionForPosition(position);
-      if (section != -1 && getPositionForSection(section) == position) {
-        mPlacementCache.firstInSection = true;
-        mPlacementCache.sectionHeader = (String) getSections()[section];
-      } else {
-        mPlacementCache.firstInSection = false;
-        mPlacementCache.sectionHeader = null;
-      }
-
-      mPlacementCache.lastInSection = (getPositionForSection(section + 1) - 1 == position);
-    } else {
-      mPlacementCache.firstInSection = false;
-      mPlacementCache.lastInSection = false;
-      mPlacementCache.sectionHeader = null;
-    }
-    return mPlacementCache;
-  }
-
-  /**
-   * An item view is displayed differently depending on whether it is placed at the beginning,
-   * middle or end of a section. It also needs to know the section header when it is at the
-   * beginning of a section. This object captures all this configuration.
-   */
-  public static final class Placement {
-
-    public boolean firstInSection;
-    public boolean lastInSection;
-    public String sectionHeader;
-    private int position = ListView.INVALID_POSITION;
-
-    public void invalidate() {
-      position = ListView.INVALID_POSITION;
-    }
-  }
-}
diff --git a/java/com/android/contacts/common/list/PhoneNumberListAdapter.java b/java/com/android/contacts/common/list/PhoneNumberListAdapter.java
deleted file mode 100644
index 3c45abf..0000000
--- a/java/com/android/contacts/common/list/PhoneNumberListAdapter.java
+++ /dev/null
@@ -1,656 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.contacts.common.list;
-
-import android.content.Context;
-import android.content.CursorLoader;
-import android.database.Cursor;
-import android.net.Uri;
-import android.net.Uri.Builder;
-import android.provider.ContactsContract;
-import android.provider.ContactsContract.CommonDataKinds.Callable;
-import android.provider.ContactsContract.CommonDataKinds.Phone;
-import android.provider.ContactsContract.CommonDataKinds.SipAddress;
-import android.provider.ContactsContract.Contacts;
-import android.provider.ContactsContract.Directory;
-import android.support.annotation.VisibleForTesting;
-import android.text.TextUtils;
-import android.view.View;
-import android.view.ViewGroup;
-import com.android.contacts.common.ContactsUtils;
-import com.android.contacts.common.R;
-import com.android.contacts.common.compat.CallableCompat;
-import com.android.contacts.common.compat.PhoneCompat;
-import com.android.contacts.common.extensions.PhoneDirectoryExtenderAccessor;
-import com.android.contacts.common.list.ContactListItemView.CallToAction;
-import com.android.contacts.common.preference.ContactsPreferences;
-import com.android.contacts.common.util.Constants;
-import com.android.dialer.common.LogUtil;
-import com.android.dialer.common.cp2.DirectoryCompat;
-import com.android.dialer.compat.CompatUtils;
-import com.android.dialer.configprovider.ConfigProviderBindings;
-import com.android.dialer.contactphoto.ContactPhotoManager.DefaultImageRequest;
-import com.android.dialer.dialercontact.DialerContact;
-import com.android.dialer.duo.DuoComponent;
-import com.android.dialer.enrichedcall.EnrichedCallCapabilities;
-import com.android.dialer.enrichedcall.EnrichedCallComponent;
-import com.android.dialer.enrichedcall.EnrichedCallManager;
-import com.android.dialer.lettertile.LetterTileDrawable;
-import com.android.dialer.phonenumberutil.PhoneNumberHelper;
-import com.android.dialer.util.CallUtil;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * A cursor adapter for the {@link Phone#CONTENT_ITEM_TYPE} and {@link
- * SipAddress#CONTENT_ITEM_TYPE}.
- *
- * <p>By default this adapter just handles phone numbers. When {@link #setUseCallableUri(boolean)}
- * is called with "true", this adapter starts handling SIP addresses too, by using {@link Callable}
- * API instead of {@link Phone}.
- */
-public class PhoneNumberListAdapter extends ContactEntryListAdapter {
-
-  private static final String TAG = PhoneNumberListAdapter.class.getSimpleName();
-  private static final String IGNORE_NUMBER_TOO_LONG_CLAUSE = "length(" + Phone.NUMBER + ") < 1000";
-  // A list of extended directories to add to the directories from the database
-  private final List<DirectoryPartition> mExtendedDirectories;
-  private final CharSequence mUnknownNameText;
-  protected final boolean mIsImsVideoEnabled;
-
-  // Extended directories will have ID's that are higher than any of the id's from the database,
-  // so that we can identify them and set them up properly. If no extended directories
-  // exist, this will be Long.MAX_VALUE
-  private long mFirstExtendedDirectoryId = Long.MAX_VALUE;
-  private boolean mUseCallableUri;
-  private Listener mListener;
-
-  public PhoneNumberListAdapter(Context context) {
-    super(context);
-    setDefaultFilterHeaderText(R.string.list_filter_phones);
-    mUnknownNameText = context.getText(android.R.string.unknownName);
-
-    mExtendedDirectories =
-        PhoneDirectoryExtenderAccessor.get(mContext).getExtendedDirectories(mContext);
-
-    int videoCapabilities = CallUtil.getVideoCallingAvailability(context);
-    mIsImsVideoEnabled =
-        CallUtil.isVideoEnabled(context)
-            && (videoCapabilities & CallUtil.VIDEO_CALLING_PRESENCE) != 0;
-  }
-
-  @Override
-  public void configureLoader(CursorLoader loader, long directoryId) {
-    String query = getQueryString();
-    if (query == null) {
-      query = "";
-    }
-    if (isExtendedDirectory(directoryId)) {
-      final DirectoryPartition directory = getExtendedDirectoryFromId(directoryId);
-      final String contentUri = directory.getContentUri();
-      if (contentUri == null) {
-        throw new IllegalStateException("Extended directory must have a content URL: " + directory);
-      }
-      final Builder builder = Uri.parse(contentUri).buildUpon();
-      builder.appendPath(query);
-      builder.appendQueryParameter(
-          ContactsContract.LIMIT_PARAM_KEY, String.valueOf(getDirectoryResultLimit(directory)));
-      loader.setUri(builder.build());
-      loader.setProjection(PhoneQuery.PROJECTION_PRIMARY);
-    } else {
-      final boolean isRemoteDirectoryQuery = DirectoryCompat.isRemoteDirectoryId(directoryId);
-      final Builder builder;
-      if (isSearchMode()) {
-        final Uri baseUri;
-        if (isRemoteDirectoryQuery) {
-          baseUri = PhoneCompat.getContentFilterUri();
-        } else if (mUseCallableUri) {
-          baseUri = CallableCompat.getContentFilterUri();
-        } else {
-          baseUri = PhoneCompat.getContentFilterUri();
-        }
-        builder = baseUri.buildUpon();
-        builder.appendPath(query); // Builder will encode the query
-        builder.appendQueryParameter(
-            ContactsContract.DIRECTORY_PARAM_KEY, String.valueOf(directoryId));
-        if (isRemoteDirectoryQuery) {
-          builder.appendQueryParameter(
-              ContactsContract.LIMIT_PARAM_KEY,
-              String.valueOf(getDirectoryResultLimit(getDirectoryById(directoryId))));
-        }
-      } else {
-        Uri baseUri = mUseCallableUri ? Callable.CONTENT_URI : Phone.CONTENT_URI;
-        builder =
-            baseUri
-                .buildUpon()
-                .appendQueryParameter(
-                    ContactsContract.DIRECTORY_PARAM_KEY, String.valueOf(Directory.DEFAULT));
-        if (isSectionHeaderDisplayEnabled()) {
-          builder.appendQueryParameter(Phone.EXTRA_ADDRESS_BOOK_INDEX, "true");
-        }
-        applyFilter(loader, builder, directoryId, getFilter());
-      }
-
-      // Ignore invalid phone numbers that are too long. These can potentially cause freezes
-      // in the UI and there is no reason to display them.
-      final String prevSelection = loader.getSelection();
-      final String newSelection;
-      if (!TextUtils.isEmpty(prevSelection)) {
-        newSelection = prevSelection + " AND " + IGNORE_NUMBER_TOO_LONG_CLAUSE;
-      } else {
-        newSelection = IGNORE_NUMBER_TOO_LONG_CLAUSE;
-      }
-      loader.setSelection(newSelection);
-
-      // Remove duplicates when it is possible.
-      builder.appendQueryParameter(ContactsContract.REMOVE_DUPLICATE_ENTRIES, "true");
-      loader.setUri(builder.build());
-
-      // TODO a projection that includes the search snippet
-      if (getContactNameDisplayOrder() == ContactsPreferences.DISPLAY_ORDER_PRIMARY) {
-        loader.setProjection(PhoneQuery.PROJECTION_PRIMARY);
-      } else {
-        loader.setProjection(PhoneQuery.PROJECTION_ALTERNATIVE);
-      }
-
-      if (getSortOrder() == ContactsPreferences.SORT_ORDER_PRIMARY) {
-        loader.setSortOrder(Phone.SORT_KEY_PRIMARY);
-      } else {
-        loader.setSortOrder(Phone.SORT_KEY_ALTERNATIVE);
-      }
-    }
-  }
-
-  protected boolean isExtendedDirectory(long directoryId) {
-    return directoryId >= mFirstExtendedDirectoryId;
-  }
-
-  private DirectoryPartition getExtendedDirectoryFromId(long directoryId) {
-    final int directoryIndex = (int) (directoryId - mFirstExtendedDirectoryId);
-    return mExtendedDirectories.get(directoryIndex);
-  }
-
-  /**
-   * Configure {@code loader} and {@code uriBuilder} according to {@code directoryId} and {@code
-   * filter}.
-   */
-  private void applyFilter(
-      CursorLoader loader, Uri.Builder uriBuilder, long directoryId, ContactListFilter filter) {
-    if (filter == null || directoryId != Directory.DEFAULT) {
-      return;
-    }
-
-    final StringBuilder selection = new StringBuilder();
-    final List<String> selectionArgs = new ArrayList<String>();
-
-    switch (filter.filterType) {
-      case ContactListFilter.FILTER_TYPE_CUSTOM:
-        {
-          selection.append(Contacts.IN_VISIBLE_GROUP + "=1");
-          selection.append(" AND " + Contacts.HAS_PHONE_NUMBER + "=1");
-          break;
-        }
-      case ContactListFilter.FILTER_TYPE_ACCOUNT:
-        {
-          filter.addAccountQueryParameterToUrl(uriBuilder);
-          break;
-        }
-      case ContactListFilter.FILTER_TYPE_ALL_ACCOUNTS:
-      case ContactListFilter.FILTER_TYPE_DEFAULT:
-        break; // No selection needed.
-      case ContactListFilter.FILTER_TYPE_WITH_PHONE_NUMBERS_ONLY:
-        break; // This adapter is always "phone only", so no selection needed either.
-      default:
-        LogUtil.w(
-            TAG,
-            "Unsupported filter type came "
-                + "(type: "
-                + filter.filterType
-                + ", toString: "
-                + filter
-                + ")"
-                + " showing all contacts.");
-        // No selection.
-        break;
-    }
-    loader.setSelection(selection.toString());
-    loader.setSelectionArgs(selectionArgs.toArray(new String[0]));
-  }
-
-  public String getPhoneNumber(int position) {
-    final Cursor item = (Cursor) getItem(position);
-    return item != null ? item.getString(PhoneQuery.PHONE_NUMBER) : null;
-  }
-
-  /**
-   * Retrieves the lookup key for the given cursor position.
-   *
-   * @param position The cursor position.
-   * @return The lookup key.
-   */
-  public String getLookupKey(int position) {
-    final Cursor item = (Cursor) getItem(position);
-    return item != null ? item.getString(PhoneQuery.LOOKUP_KEY) : null;
-  }
-
-  public DialerContact getDialerContact(int position) {
-    Cursor cursor = (Cursor) getItem(position);
-    if (cursor == null) {
-      LogUtil.e("PhoneNumberListAdapter.getDialerContact", "cursor was null.");
-      return null;
-    }
-
-    String displayName = cursor.getString(PhoneQuery.DISPLAY_NAME);
-    String number = cursor.getString(PhoneQuery.PHONE_NUMBER);
-    String photoUri = cursor.getString(PhoneQuery.PHOTO_URI);
-    Uri contactUri =
-        Contacts.getLookupUri(
-            cursor.getLong(PhoneQuery.CONTACT_ID), cursor.getString(PhoneQuery.LOOKUP_KEY));
-
-    DialerContact.Builder contact = DialerContact.newBuilder();
-    contact
-        .setNumber(number)
-        .setPhotoId(cursor.getLong(PhoneQuery.PHOTO_ID))
-        .setContactType(LetterTileDrawable.TYPE_DEFAULT)
-        .setNameOrNumber(displayName)
-        .setNumberLabel(
-            Phone.getTypeLabel(
-                    mContext.getResources(),
-                    cursor.getInt(PhoneQuery.PHONE_TYPE),
-                    cursor.getString(PhoneQuery.PHONE_LABEL))
-                .toString());
-
-    if (photoUri != null) {
-      contact.setPhotoUri(photoUri);
-    }
-
-    if (contactUri != null) {
-      contact.setContactUri(contactUri.toString());
-    }
-
-    if (!TextUtils.isEmpty(displayName)) {
-      contact.setDisplayNumber(number);
-    }
-
-    return contact.build();
-  }
-
-  @Override
-  protected ContactListItemView newView(
-      Context context, int partition, Cursor cursor, int position, ViewGroup parent) {
-    ContactListItemView view = super.newView(context, partition, cursor, position, parent);
-    view.setUnknownNameText(mUnknownNameText);
-    view.setQuickContactEnabled(isQuickContactEnabled());
-    return view;
-  }
-
-  protected void setHighlight(ContactListItemView view, Cursor cursor) {
-    view.setHighlightedPrefix(isSearchMode() ? getUpperCaseQueryString() : null);
-  }
-
-  @Override
-  protected void bindView(View itemView, int partition, Cursor cursor, int position) {
-    super.bindView(itemView, partition, cursor, position);
-    ContactListItemView view = (ContactListItemView) itemView;
-
-    setHighlight(view, cursor);
-
-    // Look at elements before and after this position, checking if contact IDs are same.
-    // If they have one same contact ID, it means they can be grouped.
-    //
-    // In one group, only the first entry will show its photo and its name, and the other
-    // entries in the group show just their data (e.g. phone number, email address).
-    cursor.moveToPosition(position);
-    boolean isFirstEntry = true;
-    final long currentContactId = cursor.getLong(PhoneQuery.CONTACT_ID);
-    if (cursor.moveToPrevious() && !cursor.isBeforeFirst()) {
-      final long previousContactId = cursor.getLong(PhoneQuery.CONTACT_ID);
-      if (currentContactId == previousContactId) {
-        isFirstEntry = false;
-      }
-    }
-    cursor.moveToPosition(position);
-
-    bindViewId(view, cursor, PhoneQuery.PHONE_ID);
-
-    bindSectionHeaderAndDivider(view, position);
-    if (isFirstEntry) {
-      bindName(view, cursor);
-      if (isQuickContactEnabled()) {
-        bindQuickContact(
-            view,
-            partition,
-            cursor,
-            PhoneQuery.PHOTO_ID,
-            PhoneQuery.PHOTO_URI,
-            PhoneQuery.CONTACT_ID,
-            PhoneQuery.LOOKUP_KEY,
-            PhoneQuery.DISPLAY_NAME);
-      } else {
-        if (getDisplayPhotos()) {
-          bindPhoto(view, partition, cursor);
-        }
-      }
-    } else {
-      unbindName(view);
-
-      view.removePhotoView(true, false);
-    }
-
-    final DirectoryPartition directory = (DirectoryPartition) getPartition(partition);
-    // All sections have headers, so scroll position is off by 1.
-    position += getPositionForPartition(partition) + 1;
-
-    bindPhoneNumber(view, cursor, directory.isDisplayNumber(), position);
-  }
-
-  @VisibleForTesting(otherwise = VisibleForTesting.PROTECTED)
-  public void bindPhoneNumber(
-      ContactListItemView view, Cursor cursor, boolean displayNumber, int position) {
-    CharSequence label = null;
-    if (displayNumber && !cursor.isNull(PhoneQuery.PHONE_TYPE)) {
-      final int type = cursor.getInt(PhoneQuery.PHONE_TYPE);
-      final String customLabel = cursor.getString(PhoneQuery.PHONE_LABEL);
-
-      // TODO cache
-      label = Phone.getTypeLabel(mContext.getResources(), type, customLabel);
-    }
-    view.setLabel(label);
-    final String text;
-    String number = cursor.getString(PhoneQuery.PHONE_NUMBER);
-    if (displayNumber) {
-      text = number;
-    } else {
-      // Display phone label. If that's null, display geocoded location for the number
-      final String phoneLabel = cursor.getString(PhoneQuery.PHONE_LABEL);
-      if (phoneLabel != null) {
-        text = phoneLabel;
-      } else {
-        final String phoneNumber = cursor.getString(PhoneQuery.PHONE_NUMBER);
-        text =
-            PhoneNumberHelper.getGeoDescription(
-                mContext,
-                phoneNumber,
-                PhoneNumberHelper.getCurrentCountryIso(mContext, null /* PhoneAccountHandle */));
-      }
-    }
-    view.setPhoneNumber(text);
-
-    @CallToAction int action = ContactListItemView.NONE;
-
-    if (CompatUtils.isVideoCompatible()) {
-      // Determine if carrier presence indicates the number supports video calling.
-      int carrierPresence = cursor.getInt(PhoneQuery.CARRIER_PRESENCE);
-      boolean isPresent = (carrierPresence & Phone.CARRIER_PRESENCE_VT_CAPABLE) != 0;
-
-      boolean showViewIcon = mIsImsVideoEnabled && isPresent;
-      if (showViewIcon) {
-        action = ContactListItemView.VIDEO;
-      }
-    }
-
-    if (action == ContactListItemView.NONE
-        && DuoComponent.get(mContext).getDuo().isReachable(mContext, number)) {
-      action = ContactListItemView.DUO;
-    }
-
-    if (action == ContactListItemView.NONE) {
-      EnrichedCallManager manager = EnrichedCallComponent.get(mContext).getEnrichedCallManager();
-      EnrichedCallCapabilities capabilities = manager.getCapabilities(number);
-      if (capabilities != null && capabilities.isCallComposerCapable()) {
-        action = ContactListItemView.CALL_AND_SHARE;
-      } else if (capabilities == null
-          && getQueryString() != null
-          && getQueryString().length() >= 3) {
-        manager.requestCapabilities(number);
-      }
-    }
-
-    view.setCallToAction(action, mListener, position);
-  }
-
-  protected void bindSectionHeaderAndDivider(final ContactListItemView view, int position) {
-    if (isSectionHeaderDisplayEnabled()) {
-      Placement placement = getItemPlacementInSection(position);
-      view.setSectionHeader(placement.firstInSection ? placement.sectionHeader : null);
-    } else {
-      view.setSectionHeader(null);
-    }
-  }
-
-  protected void bindName(final ContactListItemView view, Cursor cursor) {
-    view.showDisplayName(cursor, PhoneQuery.DISPLAY_NAME);
-    // Note: we don't show phonetic names any more (see issue 5265330)
-  }
-
-  protected void unbindName(final ContactListItemView view) {
-    view.hideDisplayName();
-  }
-
-  @Override
-  protected void bindWorkProfileIcon(final ContactListItemView view, int partition) {
-    final DirectoryPartition directory = (DirectoryPartition) getPartition(partition);
-    final long directoryId = directory.getDirectoryId();
-    final long userType = ContactsUtils.determineUserType(directoryId, null);
-    // Work directory must not be a extended directory. An extended directory is custom
-    // directory in the app, but not a directory provided by framework. So it can't be
-    // USER_TYPE_WORK.
-    view.setWorkProfileIconEnabled(
-        !isExtendedDirectory(directoryId) && userType == ContactsUtils.USER_TYPE_WORK);
-  }
-
-  protected void bindPhoto(final ContactListItemView view, int partitionIndex, Cursor cursor) {
-    if (!isPhotoSupported(partitionIndex)) {
-      view.removePhotoView();
-      return;
-    }
-
-    long photoId = 0;
-    if (!cursor.isNull(PhoneQuery.PHOTO_ID)) {
-      photoId = cursor.getLong(PhoneQuery.PHOTO_ID);
-    }
-
-    if (photoId != 0) {
-      getPhotoLoader()
-          .loadThumbnail(view.getPhotoView(), photoId, false, getCircularPhotos(), null);
-    } else {
-      final String photoUriString = cursor.getString(PhoneQuery.PHOTO_URI);
-      final Uri photoUri = photoUriString == null ? null : Uri.parse(photoUriString);
-
-      DefaultImageRequest request = null;
-      if (photoUri == null) {
-        final String displayName = cursor.getString(PhoneQuery.DISPLAY_NAME);
-        final String lookupKey = cursor.getString(PhoneQuery.LOOKUP_KEY);
-        request = new DefaultImageRequest(displayName, lookupKey, getCircularPhotos());
-      }
-      getPhotoLoader()
-          .loadDirectoryPhoto(view.getPhotoView(), photoUri, false, getCircularPhotos(), request);
-    }
-  }
-
-  public void setUseCallableUri(boolean useCallableUri) {
-    mUseCallableUri = useCallableUri;
-  }
-
-  /**
-   * Override base implementation to inject extended directories between local & remote directories.
-   * This is done in the following steps: 1. Call base implementation to add directories from the
-   * cursor. 2. Iterate all base directories and establish the following information: a. The highest
-   * directory id so that we can assign unused id's to the extended directories. b. The index of the
-   * last non-remote directory. This is where we will insert extended directories. 3. Iterate the
-   * extended directories and for each one, assign an ID and insert it in the proper location.
-   */
-  @Override
-  public void changeDirectories(Cursor cursor) {
-    super.changeDirectories(cursor);
-    if (getDirectorySearchMode() == DirectoryListLoader.SEARCH_MODE_NONE) {
-      return;
-    }
-    int numExtendedDirectories = mExtendedDirectories.size();
-
-    if (ConfigProviderBindings.get(getContext()).getBoolean("p13n_ranker_should_enable", false)) {
-      // Suggested results wasn't formulated as an extended directory, so manually
-      // increment the count here when the feature is enabled. Suggestions are
-      // only shown when the ranker is enabled.
-      numExtendedDirectories++;
-    }
-
-    if (getPartitionCount() == cursor.getCount() + numExtendedDirectories) {
-      // already added all directories;
-      return;
-    }
-
-    mFirstExtendedDirectoryId = Long.MAX_VALUE;
-    if (!mExtendedDirectories.isEmpty()) {
-      // The Directory.LOCAL_INVISIBLE is not in the cursor but we can't reuse it's
-      // "special" ID.
-      long maxId = Directory.LOCAL_INVISIBLE;
-      int insertIndex = 0;
-      for (int i = 0, n = getPartitionCount(); i < n; i++) {
-        final DirectoryPartition partition = (DirectoryPartition) getPartition(i);
-        final long id = partition.getDirectoryId();
-        if (id > maxId) {
-          maxId = id;
-        }
-        if (!DirectoryCompat.isRemoteDirectoryId(id)) {
-          // assuming remote directories come after local, we will end up with the index
-          // where we should insert extended directories. This also works if there are no
-          // remote directories at all.
-          insertIndex = i + 1;
-        }
-      }
-      // Extended directories ID's cannot collide with base directories
-      mFirstExtendedDirectoryId = maxId + 1;
-      for (int i = 0; i < mExtendedDirectories.size(); i++) {
-        final long id = mFirstExtendedDirectoryId + i;
-        final DirectoryPartition directory = mExtendedDirectories.get(i);
-        if (getPartitionByDirectoryId(id) == -1) {
-          addPartition(insertIndex, directory);
-          directory.setDirectoryId(id);
-        }
-      }
-    }
-  }
-
-  @Override
-  protected Uri getContactUri(
-      int partitionIndex, Cursor cursor, int contactIdColumn, int lookUpKeyColumn) {
-    final DirectoryPartition directory = (DirectoryPartition) getPartition(partitionIndex);
-    final long directoryId = directory.getDirectoryId();
-    if (!isExtendedDirectory(directoryId)) {
-      return super.getContactUri(partitionIndex, cursor, contactIdColumn, lookUpKeyColumn);
-    }
-    return Contacts.CONTENT_LOOKUP_URI
-        .buildUpon()
-        .appendPath(Constants.LOOKUP_URI_ENCODED)
-        .appendQueryParameter(Directory.DISPLAY_NAME, directory.getLabel())
-        .appendQueryParameter(ContactsContract.DIRECTORY_PARAM_KEY, String.valueOf(directoryId))
-        .encodedFragment(cursor.getString(lookUpKeyColumn))
-        .build();
-  }
-
-  public Listener getListener() {
-    return mListener;
-  }
-
-  public void setListener(Listener listener) {
-    mListener = listener;
-  }
-
-  public interface Listener {
-
-    void onVideoCallIconClicked(int position);
-
-    void onDuoVideoIconClicked(int position);
-
-    void onCallAndShareIconClicked(int position);
-  }
-
-  public static class PhoneQuery {
-
-    /**
-     * Optional key used as part of a JSON lookup key to specify an analytics category associated
-     * with the row.
-     */
-    public static final String ANALYTICS_CATEGORY = "analytics_category";
-
-    /**
-     * Optional key used as part of a JSON lookup key to specify an analytics action associated with
-     * the row.
-     */
-    public static final String ANALYTICS_ACTION = "analytics_action";
-
-    /**
-     * Optional key used as part of a JSON lookup key to specify an analytics value associated with
-     * the row.
-     */
-    public static final String ANALYTICS_VALUE = "analytics_value";
-
-    public static final String[] PROJECTION_PRIMARY_INTERNAL =
-        new String[] {
-          Phone._ID, // 0
-          Phone.TYPE, // 1
-          Phone.LABEL, // 2
-          Phone.NUMBER, // 3
-          Phone.CONTACT_ID, // 4
-          Phone.LOOKUP_KEY, // 5
-          Phone.PHOTO_ID, // 6
-          Phone.DISPLAY_NAME_PRIMARY, // 7
-          Phone.PHOTO_THUMBNAIL_URI, // 8
-        };
-
-    public static final String[] PROJECTION_PRIMARY;
-    public static final String[] PROJECTION_ALTERNATIVE_INTERNAL =
-        new String[] {
-          Phone._ID, // 0
-          Phone.TYPE, // 1
-          Phone.LABEL, // 2
-          Phone.NUMBER, // 3
-          Phone.CONTACT_ID, // 4
-          Phone.LOOKUP_KEY, // 5
-          Phone.PHOTO_ID, // 6
-          Phone.DISPLAY_NAME_ALTERNATIVE, // 7
-          Phone.PHOTO_THUMBNAIL_URI, // 8
-        };
-    public static final String[] PROJECTION_ALTERNATIVE;
-    public static final int PHONE_ID = 0;
-    public static final int PHONE_TYPE = 1;
-    public static final int PHONE_LABEL = 2;
-    public static final int PHONE_NUMBER = 3;
-    public static final int CONTACT_ID = 4;
-    public static final int LOOKUP_KEY = 5;
-    public static final int PHOTO_ID = 6;
-    public static final int DISPLAY_NAME = 7;
-    public static final int PHOTO_URI = 8;
-    public static final int CARRIER_PRESENCE = 9;
-
-    static {
-      final List<String> projectionList =
-          new ArrayList<>(Arrays.asList(PROJECTION_PRIMARY_INTERNAL));
-      projectionList.add(Phone.CARRIER_PRESENCE); // 9
-      PROJECTION_PRIMARY = projectionList.toArray(new String[projectionList.size()]);
-    }
-
-    static {
-      final List<String> projectionList =
-          new ArrayList<>(Arrays.asList(PROJECTION_ALTERNATIVE_INTERNAL));
-      projectionList.add(Phone.CARRIER_PRESENCE); // 9
-      PROJECTION_ALTERNATIVE = projectionList.toArray(new String[projectionList.size()]);
-    }
-  }
-}
diff --git a/java/com/android/contacts/common/list/PhoneNumberPickerFragment.java b/java/com/android/contacts/common/list/PhoneNumberPickerFragment.java
deleted file mode 100644
index 1a3b80f..0000000
--- a/java/com/android/contacts/common/list/PhoneNumberPickerFragment.java
+++ /dev/null
@@ -1,465 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.contacts.common.list;
-
-import android.content.ComponentName;
-import android.content.Intent;
-import android.content.Loader;
-import android.database.Cursor;
-import android.os.Bundle;
-import android.support.annotation.MainThread;
-import android.support.annotation.Nullable;
-import android.text.TextUtils;
-import android.util.ArraySet;
-import android.view.LayoutInflater;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.ViewGroup;
-import com.android.contacts.common.R;
-import com.android.contacts.common.list.PhoneNumberListAdapter.Listener;
-import com.android.contacts.common.util.AccountFilterUtil;
-import com.android.dialer.callintent.CallInitiationType;
-import com.android.dialer.callintent.CallInitiationType.Type;
-import com.android.dialer.callintent.CallSpecificAppData;
-import com.android.dialer.common.Assert;
-import com.android.dialer.common.LogUtil;
-import com.android.dialer.dialercontact.DialerContact;
-import com.android.dialer.duo.DuoComponent;
-import com.android.dialer.enrichedcall.EnrichedCallComponent;
-import com.android.dialer.enrichedcall.EnrichedCallManager;
-import com.android.dialer.logging.DialerImpression;
-import com.android.dialer.logging.Logger;
-import com.android.dialer.performancereport.PerformanceReport;
-import com.android.dialer.protos.ProtoParsers;
-import java.util.Set;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-/** Fragment containing a phone number list for picking. */
-public class PhoneNumberPickerFragment extends ContactEntryListFragment<ContactEntryListAdapter>
-    implements PhoneNumberListAdapter.Listener, EnrichedCallManager.CapabilitiesListener {
-
-  private static final String KEY_FILTER = "filter";
-  private OnPhoneNumberPickerActionListener mListener;
-  private ContactListFilter mFilter;
-  private View mAccountFilterHeader;
-  /**
-   * Lives as ListView's header and is shown when {@link #mAccountFilterHeader} is set to View.GONE.
-   */
-  private View mPaddingView;
-  /** true if the loader has started at least once. */
-  private boolean mLoaderStarted;
-
-  private boolean mUseCallableUri;
-
-  private final Set<OnLoadFinishedListener> mLoadFinishedListeners = new ArraySet<>();
-
-  private CursorReranker mCursorReranker;
-
-  public PhoneNumberPickerFragment() {
-    setQuickContactEnabled(false);
-    setPhotoLoaderEnabled(true);
-    setSectionHeaderDisplayEnabled(false);
-    setDirectorySearchMode(DirectoryListLoader.SEARCH_MODE_NONE);
-
-    // Show nothing instead of letting caller Activity show something.
-    setHasOptionsMenu(true);
-  }
-
-  /**
-   * Handles a click on the video call icon for a row in the list.
-   *
-   * @param position The position in the list where the click ocurred.
-   */
-  @Override
-  public void onVideoCallIconClicked(int position) {
-    Logger.get(getContext()).logImpression(DialerImpression.Type.IMS_VIDEO_REQUESTED_FROM_SEARCH);
-    callNumber(position, true /* isVideoCall */);
-  }
-
-  @Override
-  public void onDuoVideoIconClicked(int position) {
-    PerformanceReport.stopRecording();
-    String phoneNumber = getPhoneNumber(position);
-    Intent intent = DuoComponent.get(getContext()).getDuo().getIntent(getContext(), phoneNumber);
-    // DialtactsActivity.ACTIVITY_REQUEST_CODE_LIGHTBRINGER
-    // Cannot reference because of cyclic dependencies
-    Logger.get(getContext())
-        .logImpression(DialerImpression.Type.LIGHTBRINGER_VIDEO_REQUESTED_FROM_SEARCH);
-    int dialactsActivityRequestCode = 3;
-    getActivity().startActivityForResult(intent, dialactsActivityRequestCode);
-  }
-
-  @Override
-  public void onCallAndShareIconClicked(int position) {
-    // Required because of cyclic dependencies of everything depending on contacts/common.
-    String componentName = "com.android.dialer.callcomposer.CallComposerActivity";
-    Intent intent = new Intent();
-    intent.setComponent(new ComponentName(getContext(), componentName));
-    DialerContact contact = ((PhoneNumberListAdapter) getAdapter()).getDialerContact(position);
-    ProtoParsers.put(intent, "CALL_COMPOSER_CONTACT", contact);
-    startActivity(intent);
-  }
-
-  public void setDirectorySearchEnabled(boolean flag) {
-    setDirectorySearchMode(
-        flag ? DirectoryListLoader.SEARCH_MODE_DEFAULT : DirectoryListLoader.SEARCH_MODE_NONE);
-  }
-
-  public void setOnPhoneNumberPickerActionListener(OnPhoneNumberPickerActionListener listener) {
-    this.mListener = listener;
-  }
-
-  public OnPhoneNumberPickerActionListener getOnPhoneNumberPickerListener() {
-    return mListener;
-  }
-
-  @Override
-  protected void onCreateView(LayoutInflater inflater, ViewGroup container) {
-    super.onCreateView(inflater, container);
-
-    View paddingView = inflater.inflate(R.layout.contact_detail_list_padding, null, false);
-    mPaddingView = paddingView.findViewById(R.id.contact_detail_list_padding);
-    getListView().addHeaderView(paddingView);
-
-    mAccountFilterHeader = getView().findViewById(R.id.account_filter_header_container);
-    updateFilterHeaderView();
-
-    setVisibleScrollbarEnabled(getVisibleScrollbarEnabled());
-  }
-
-  @Override
-  public void onPause() {
-    super.onPause();
-    EnrichedCallComponent.get(getContext())
-        .getEnrichedCallManager()
-        .unregisterCapabilitiesListener(this);
-  }
-
-  @Override
-  public void onResume() {
-    super.onResume();
-    EnrichedCallComponent.get(getContext())
-        .getEnrichedCallManager()
-        .registerCapabilitiesListener(this);
-  }
-
-  protected boolean getVisibleScrollbarEnabled() {
-    return true;
-  }
-
-  @Override
-  protected void setSearchMode(boolean flag) {
-    super.setSearchMode(flag);
-    updateFilterHeaderView();
-  }
-
-  private void updateFilterHeaderView() {
-    final ContactListFilter filter = getFilter();
-    if (mAccountFilterHeader == null || filter == null) {
-      return;
-    }
-    final boolean shouldShowHeader =
-        !isSearchMode()
-            && AccountFilterUtil.updateAccountFilterTitleForPhone(
-                mAccountFilterHeader, filter, false);
-    if (shouldShowHeader) {
-      mPaddingView.setVisibility(View.GONE);
-      mAccountFilterHeader.setVisibility(View.VISIBLE);
-    } else {
-      mPaddingView.setVisibility(View.VISIBLE);
-      mAccountFilterHeader.setVisibility(View.GONE);
-    }
-  }
-
-  @Override
-  public void restoreSavedState(Bundle savedState) {
-    super.restoreSavedState(savedState);
-
-    if (savedState == null) {
-      return;
-    }
-
-    mFilter = savedState.getParcelable(KEY_FILTER);
-  }
-
-  @Override
-  public void onSaveInstanceState(Bundle outState) {
-    super.onSaveInstanceState(outState);
-    outState.putParcelable(KEY_FILTER, mFilter);
-  }
-
-  @Override
-  public boolean onOptionsItemSelected(MenuItem item) {
-    final int itemId = item.getItemId();
-    if (itemId == android.R.id.home) { // See ActionBar#setDisplayHomeAsUpEnabled()
-      if (mListener != null) {
-        mListener.onHomeInActionBarSelected();
-      }
-      return true;
-    }
-    return super.onOptionsItemSelected(item);
-  }
-
-  @Override
-  protected void onItemClick(int position, long id) {
-    callNumber(position, false /* isVideoCall */);
-  }
-
-  /**
-   * Initiates a call to the number at the specified position.
-   *
-   * @param position The position.
-   * @param isVideoCall {@code true} if the call should be initiated as a video call, {@code false}
-   *     otherwise.
-   */
-  private void callNumber(int position, boolean isVideoCall) {
-    final String number = getPhoneNumber(position);
-    if (!TextUtils.isEmpty(number)) {
-      cacheContactInfo(position);
-      CallSpecificAppData callSpecificAppData =
-          CallSpecificAppData.newBuilder()
-              .setAllowAssistedDialing(true)
-              .setCallInitiationType(getCallInitiationType(true /* isRemoteDirectory */))
-              .setPositionOfSelectedSearchResult(position)
-              .setCharactersInSearchString(getQueryString() == null ? 0 : getQueryString().length())
-              .build();
-      mListener.onPickPhoneNumber(number, isVideoCall, callSpecificAppData);
-    } else {
-      LogUtil.i(
-          "PhoneNumberPickerFragment.callNumber",
-          "item at %d was clicked before adapter is ready, ignoring",
-          position);
-    }
-
-    // Get the lookup key and track any analytics
-    final String lookupKey = getLookupKey(position);
-    if (!TextUtils.isEmpty(lookupKey)) {
-      maybeTrackAnalytics(lookupKey);
-    }
-  }
-
-  protected void cacheContactInfo(int position) {
-    // Not implemented. Hook for child classes
-  }
-
-  protected String getPhoneNumber(int position) {
-    final PhoneNumberListAdapter adapter = (PhoneNumberListAdapter) getAdapter();
-    return adapter.getPhoneNumber(position);
-  }
-
-  protected String getLookupKey(int position) {
-    final PhoneNumberListAdapter adapter = (PhoneNumberListAdapter) getAdapter();
-    return adapter.getLookupKey(position);
-  }
-
-  @Override
-  protected void startLoading() {
-    mLoaderStarted = true;
-    super.startLoading();
-  }
-
-  @Override
-  @MainThread
-  public void onLoadFinished(Loader<Cursor> loader, Cursor data) {
-    Assert.isMainThread();
-    // TODO(strongarm): define and verify behavior for "Nearby places", corp directories,
-    // and dividers listed in UI between these categories
-    if (mCursorReranker != null
-        && data != null
-        && !data.isClosed()
-        && data.getCount() > 0
-        && loader.getId() == 0) { // only re-rank if a suggestions loader with id of 0.
-      data = mCursorReranker.rerankCursor(data);
-    }
-    super.onLoadFinished(loader, data);
-
-    // disable scroll bar if there is no data
-    setVisibleScrollbarEnabled(data != null && !data.isClosed() && data.getCount() > 0);
-
-    if (data != null) {
-      notifyListeners();
-    }
-  }
-
-  /** Ranks cursor data rows and returns reference to new cursor object with reordered data. */
-  public interface CursorReranker {
-    @MainThread
-    Cursor rerankCursor(Cursor data);
-  }
-
-  @MainThread
-  public void setReranker(@Nullable CursorReranker reranker) {
-    Assert.isMainThread();
-    mCursorReranker = reranker;
-  }
-
-  /** Listener that is notified when cursor has finished loading data. */
-  public interface OnLoadFinishedListener {
-    void onLoadFinished();
-  }
-
-  @MainThread
-  public void addOnLoadFinishedListener(OnLoadFinishedListener listener) {
-    Assert.isMainThread();
-    mLoadFinishedListeners.add(listener);
-  }
-
-  @MainThread
-  public void removeOnLoadFinishedListener(OnLoadFinishedListener listener) {
-    Assert.isMainThread();
-    mLoadFinishedListeners.remove(listener);
-  }
-
-  @MainThread
-  protected void notifyListeners() {
-    Assert.isMainThread();
-    for (OnLoadFinishedListener listener : mLoadFinishedListeners) {
-      listener.onLoadFinished();
-    }
-  }
-
-  @Override
-  public void onCapabilitiesUpdated() {
-    if (getAdapter() != null) {
-      EnrichedCallManager manager =
-          EnrichedCallComponent.get(getContext()).getEnrichedCallManager();
-      Listener listener = ((PhoneNumberListAdapter) getAdapter()).getListener();
-
-      for (int i = 0; i < getListView().getChildCount(); i++) {
-        if (!(getListView().getChildAt(i) instanceof ContactListItemView)) {
-          continue;
-        }
-
-        // Since call and share is the lowest priority call to action, if any others are set,
-        // do not reset the call to action. Also do not set the call and share call to action if
-        // the number doesn't support call composer.
-        ContactListItemView view = (ContactListItemView) getListView().getChildAt(i);
-        if (view.getCallToAction() != ContactListItemView.NONE
-            || view.getPhoneNumber() == null
-            || manager.getCapabilities(view.getPhoneNumber()) == null
-            || !manager.getCapabilities(view.getPhoneNumber()).isCallComposerCapable()) {
-          continue;
-        }
-        view.setCallToAction(ContactListItemView.CALL_AND_SHARE, listener, view.getPosition());
-      }
-    }
-  }
-
-  @MainThread
-  @Override
-  public void onDetach() {
-    Assert.isMainThread();
-    mLoadFinishedListeners.clear();
-    super.onDetach();
-  }
-
-  public void setUseCallableUri(boolean useCallableUri) {
-    mUseCallableUri = useCallableUri;
-  }
-
-  public boolean usesCallableUri() {
-    return mUseCallableUri;
-  }
-
-  @Override
-  protected ContactEntryListAdapter createListAdapter() {
-    PhoneNumberListAdapter adapter = new PhoneNumberListAdapter(getActivity());
-    adapter.setDisplayPhotos(true);
-    adapter.setUseCallableUri(mUseCallableUri);
-    return adapter;
-  }
-
-  @Override
-  protected void configureAdapter() {
-    super.configureAdapter();
-
-    final ContactEntryListAdapter adapter = getAdapter();
-    if (adapter == null) {
-      return;
-    }
-
-    if (!isSearchMode() && mFilter != null) {
-      adapter.setFilter(mFilter);
-    }
-  }
-
-  @Override
-  protected View inflateView(LayoutInflater inflater, ViewGroup container) {
-    return inflater.inflate(R.layout.contact_list_content, null);
-  }
-
-  public ContactListFilter getFilter() {
-    return mFilter;
-  }
-
-  public void setFilter(ContactListFilter filter) {
-    if ((mFilter == null && filter == null) || (mFilter != null && mFilter.equals(filter))) {
-      return;
-    }
-
-    mFilter = filter;
-    if (mLoaderStarted) {
-      reloadData();
-    }
-    updateFilterHeaderView();
-  }
-
-  /**
-   * @param isRemoteDirectory {@code true} if the call was initiated using a contact/phone number
-   *     not in the local contacts database
-   */
-  protected CallInitiationType.Type getCallInitiationType(boolean isRemoteDirectory) {
-    return Type.UNKNOWN_INITIATION;
-  }
-
-  /**
-   * Where a lookup key contains analytic event information, logs the associated analytics event.
-   *
-   * @param lookupKey The lookup key JSON object.
-   */
-  private void maybeTrackAnalytics(String lookupKey) {
-    try {
-      JSONObject json = new JSONObject(lookupKey);
-
-      String analyticsCategory =
-          json.getString(PhoneNumberListAdapter.PhoneQuery.ANALYTICS_CATEGORY);
-      String analyticsAction = json.getString(PhoneNumberListAdapter.PhoneQuery.ANALYTICS_ACTION);
-      String analyticsValue = json.getString(PhoneNumberListAdapter.PhoneQuery.ANALYTICS_VALUE);
-
-      if (TextUtils.isEmpty(analyticsCategory)
-          || TextUtils.isEmpty(analyticsAction)
-          || TextUtils.isEmpty(analyticsValue)) {
-        return;
-      }
-
-      // Assume that the analytic value being tracked could be a float value, but just cast
-      // to a long so that the analytic server can handle it.
-      long value;
-      try {
-        float floatValue = Float.parseFloat(analyticsValue);
-        value = (long) floatValue;
-      } catch (NumberFormatException nfe) {
-        return;
-      }
-
-      Logger.get(getActivity())
-          .sendHitEventAnalytics(analyticsCategory, analyticsAction, "" /* label */, value);
-    } catch (JSONException e) {
-      // Not an error; just a lookup key that doesn't have the right information.
-    }
-  }
-}
diff --git a/java/com/android/contacts/common/list/PinnedHeaderListAdapter.java b/java/com/android/contacts/common/list/PinnedHeaderListAdapter.java
deleted file mode 100644
index 0bdcef0..0000000
--- a/java/com/android/contacts/common/list/PinnedHeaderListAdapter.java
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.contacts.common.list;
-
-import android.content.Context;
-import android.view.View;
-import android.view.ViewGroup;
-import com.android.common.widget.CompositeCursorAdapter;
-
-/** A subclass of {@link CompositeCursorAdapter} that manages pinned partition headers. */
-public abstract class PinnedHeaderListAdapter extends CompositeCursorAdapter
-    implements PinnedHeaderListView.PinnedHeaderAdapter {
-
-  public static final int PARTITION_HEADER_TYPE = 0;
-
-  private boolean mPinnedPartitionHeadersEnabled;
-  private boolean[] mHeaderVisibility;
-
-  public PinnedHeaderListAdapter(Context context) {
-    super(context);
-  }
-
-  public boolean getPinnedPartitionHeadersEnabled() {
-    return mPinnedPartitionHeadersEnabled;
-  }
-
-  public void setPinnedPartitionHeadersEnabled(boolean flag) {
-    this.mPinnedPartitionHeadersEnabled = flag;
-  }
-
-  @Override
-  public int getPinnedHeaderCount() {
-    if (mPinnedPartitionHeadersEnabled) {
-      return getPartitionCount();
-    } else {
-      return 0;
-    }
-  }
-
-  protected boolean isPinnedPartitionHeaderVisible(int partition) {
-    return getPinnedPartitionHeadersEnabled()
-        && hasHeader(partition)
-        && !isPartitionEmpty(partition);
-  }
-
-  /** The default implementation creates the same type of view as a normal partition header. */
-  @Override
-  public View getPinnedHeaderView(int partition, View convertView, ViewGroup parent) {
-    if (hasHeader(partition)) {
-      View view = null;
-      if (convertView != null) {
-        Integer headerType = (Integer) convertView.getTag();
-        if (headerType != null && headerType == PARTITION_HEADER_TYPE) {
-          view = convertView;
-        }
-      }
-      if (view == null) {
-        view = newHeaderView(getContext(), partition, null, parent);
-        view.setTag(PARTITION_HEADER_TYPE);
-        view.setFocusable(false);
-        view.setEnabled(false);
-      }
-      bindHeaderView(view, partition, getCursor(partition));
-      view.setLayoutDirection(parent.getLayoutDirection());
-      return view;
-    } else {
-      return null;
-    }
-  }
-
-  @Override
-  public void configurePinnedHeaders(PinnedHeaderListView listView) {
-    if (!getPinnedPartitionHeadersEnabled()) {
-      return;
-    }
-
-    int size = getPartitionCount();
-
-    // Cache visibility bits, because we will need them several times later on
-    if (mHeaderVisibility == null || mHeaderVisibility.length != size) {
-      mHeaderVisibility = new boolean[size];
-    }
-    for (int i = 0; i < size; i++) {
-      boolean visible = isPinnedPartitionHeaderVisible(i);
-      mHeaderVisibility[i] = visible;
-      if (!visible) {
-        listView.setHeaderInvisible(i, true);
-      }
-    }
-
-    int headerViewsCount = listView.getHeaderViewsCount();
-
-    // Starting at the top, find and pin headers for partitions preceding the visible one(s)
-    int maxTopHeader = -1;
-    int topHeaderHeight = 0;
-    for (int i = 0; i < size; i++) {
-      if (mHeaderVisibility[i]) {
-        int position = listView.getPositionAt(topHeaderHeight) - headerViewsCount;
-        int partition = getPartitionForPosition(position);
-        if (i > partition) {
-          break;
-        }
-
-        listView.setHeaderPinnedAtTop(i, topHeaderHeight, false);
-        topHeaderHeight += listView.getPinnedHeaderHeight(i);
-        maxTopHeader = i;
-      }
-    }
-
-    // Starting at the bottom, find and pin headers for partitions following the visible one(s)
-    int maxBottomHeader = size;
-    int bottomHeaderHeight = 0;
-    int listHeight = listView.getHeight();
-    for (int i = size; --i > maxTopHeader; ) {
-      if (mHeaderVisibility[i]) {
-        int position = listView.getPositionAt(listHeight - bottomHeaderHeight) - headerViewsCount;
-        if (position < 0) {
-          break;
-        }
-
-        int partition = getPartitionForPosition(position - 1);
-        if (partition == -1 || i <= partition) {
-          break;
-        }
-
-        int height = listView.getPinnedHeaderHeight(i);
-        bottomHeaderHeight += height;
-
-        listView.setHeaderPinnedAtBottom(i, listHeight - bottomHeaderHeight, false);
-        maxBottomHeader = i;
-      }
-    }
-
-    // Headers in between the top-pinned and bottom-pinned should be hidden
-    for (int i = maxTopHeader + 1; i < maxBottomHeader; i++) {
-      if (mHeaderVisibility[i]) {
-        listView.setHeaderInvisible(i, isPartitionEmpty(i));
-      }
-    }
-  }
-
-  @Override
-  public int getScrollPositionForHeader(int viewIndex) {
-    return getPositionForPartition(viewIndex);
-  }
-}
diff --git a/java/com/android/contacts/common/list/PinnedHeaderListView.java b/java/com/android/contacts/common/list/PinnedHeaderListView.java
deleted file mode 100644
index a801624..0000000
--- a/java/com/android/contacts/common/list/PinnedHeaderListView.java
+++ /dev/null
@@ -1,563 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.contacts.common.list;
-
-import android.content.Context;
-import android.graphics.Canvas;
-import android.graphics.RectF;
-import android.util.AttributeSet;
-import android.view.MotionEvent;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.AbsListView;
-import android.widget.AbsListView.OnScrollListener;
-import android.widget.AdapterView;
-import android.widget.AdapterView.OnItemSelectedListener;
-import android.widget.ListAdapter;
-import com.android.dialer.util.ViewUtil;
-
-/**
- * A ListView that maintains a header pinned at the top of the list. The pinned header can be pushed
- * up and dissolved as needed.
- */
-public class PinnedHeaderListView extends AutoScrollListView
-    implements OnScrollListener, OnItemSelectedListener {
-
-  private static final int MAX_ALPHA = 255;
-  private static final int TOP = 0;
-  private static final int BOTTOM = 1;
-  private static final int FADING = 2;
-  private static final int DEFAULT_ANIMATION_DURATION = 20;
-  private static final int DEFAULT_SMOOTH_SCROLL_DURATION = 100;
-  private PinnedHeaderAdapter mAdapter;
-  private int mSize;
-  private PinnedHeader[] mHeaders;
-  private RectF mBounds = new RectF();
-  private OnScrollListener mOnScrollListener;
-  private OnItemSelectedListener mOnItemSelectedListener;
-  private int mScrollState;
-  private boolean mScrollToSectionOnHeaderTouch = false;
-  private boolean mHeaderTouched = false;
-  private int mAnimationDuration = DEFAULT_ANIMATION_DURATION;
-  private boolean mAnimating;
-  private long mAnimationTargetTime;
-  private int mHeaderPaddingStart;
-  private int mHeaderWidth;
-
-  public PinnedHeaderListView(Context context) {
-    this(context, null, android.R.attr.listViewStyle);
-  }
-
-  public PinnedHeaderListView(Context context, AttributeSet attrs) {
-    this(context, attrs, android.R.attr.listViewStyle);
-  }
-
-  public PinnedHeaderListView(Context context, AttributeSet attrs, int defStyle) {
-    super(context, attrs, defStyle);
-    super.setOnScrollListener(this);
-    super.setOnItemSelectedListener(this);
-  }
-
-  @Override
-  protected void onLayout(boolean changed, int l, int t, int r, int b) {
-    super.onLayout(changed, l, t, r, b);
-    mHeaderPaddingStart = getPaddingStart();
-    mHeaderWidth = r - l - mHeaderPaddingStart - getPaddingEnd();
-  }
-
-  @Override
-  public void setAdapter(ListAdapter adapter) {
-    mAdapter = (PinnedHeaderAdapter) adapter;
-    super.setAdapter(adapter);
-  }
-
-  @Override
-  public void setOnScrollListener(OnScrollListener onScrollListener) {
-    mOnScrollListener = onScrollListener;
-    super.setOnScrollListener(this);
-  }
-
-  @Override
-  public void setOnItemSelectedListener(OnItemSelectedListener listener) {
-    mOnItemSelectedListener = listener;
-    super.setOnItemSelectedListener(this);
-  }
-
-  public void setScrollToSectionOnHeaderTouch(boolean value) {
-    mScrollToSectionOnHeaderTouch = value;
-  }
-
-  @Override
-  public void onScroll(
-      AbsListView view, int firstVisibleItem, int visibleItemCount, int totalItemCount) {
-    if (mAdapter != null) {
-      int count = mAdapter.getPinnedHeaderCount();
-      if (count != mSize) {
-        mSize = count;
-        if (mHeaders == null) {
-          mHeaders = new PinnedHeader[mSize];
-        } else if (mHeaders.length < mSize) {
-          PinnedHeader[] headers = mHeaders;
-          mHeaders = new PinnedHeader[mSize];
-          System.arraycopy(headers, 0, mHeaders, 0, headers.length);
-        }
-      }
-
-      for (int i = 0; i < mSize; i++) {
-        if (mHeaders[i] == null) {
-          mHeaders[i] = new PinnedHeader();
-        }
-        mHeaders[i].view = mAdapter.getPinnedHeaderView(i, mHeaders[i].view, this);
-      }
-
-      mAnimationTargetTime = System.currentTimeMillis() + mAnimationDuration;
-      mAdapter.configurePinnedHeaders(this);
-      invalidateIfAnimating();
-    }
-    if (mOnScrollListener != null) {
-      mOnScrollListener.onScroll(this, firstVisibleItem, visibleItemCount, totalItemCount);
-    }
-  }
-
-  @Override
-  protected float getTopFadingEdgeStrength() {
-    // Disable vertical fading at the top when the pinned header is present
-    return mSize > 0 ? 0 : super.getTopFadingEdgeStrength();
-  }
-
-  @Override
-  public void onScrollStateChanged(AbsListView view, int scrollState) {
-    mScrollState = scrollState;
-    if (mOnScrollListener != null) {
-      mOnScrollListener.onScrollStateChanged(this, scrollState);
-    }
-  }
-
-  /**
-   * Ensures that the selected item is positioned below the top-pinned headers and above the
-   * bottom-pinned ones.
-   */
-  @Override
-  public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
-    int height = getHeight();
-
-    int windowTop = 0;
-    int windowBottom = height;
-
-    for (int i = 0; i < mSize; i++) {
-      PinnedHeader header = mHeaders[i];
-      if (header.visible) {
-        if (header.state == TOP) {
-          windowTop = header.y + header.height;
-        } else if (header.state == BOTTOM) {
-          windowBottom = header.y;
-          break;
-        }
-      }
-    }
-
-    View selectedView = getSelectedView();
-    if (selectedView != null) {
-      if (selectedView.getTop() < windowTop) {
-        setSelectionFromTop(position, windowTop);
-      } else if (selectedView.getBottom() > windowBottom) {
-        setSelectionFromTop(position, windowBottom - selectedView.getHeight());
-      }
-    }
-
-    if (mOnItemSelectedListener != null) {
-      mOnItemSelectedListener.onItemSelected(parent, view, position, id);
-    }
-  }
-
-  @Override
-  public void onNothingSelected(AdapterView<?> parent) {
-    if (mOnItemSelectedListener != null) {
-      mOnItemSelectedListener.onNothingSelected(parent);
-    }
-  }
-
-  public int getPinnedHeaderHeight(int viewIndex) {
-    ensurePinnedHeaderLayout(viewIndex);
-    return mHeaders[viewIndex].view.getHeight();
-  }
-
-  /**
-   * Set header to be pinned at the top.
-   *
-   * @param viewIndex index of the header view
-   * @param y is position of the header in pixels.
-   * @param animate true if the transition to the new coordinate should be animated
-   */
-  public void setHeaderPinnedAtTop(int viewIndex, int y, boolean animate) {
-    ensurePinnedHeaderLayout(viewIndex);
-    PinnedHeader header = mHeaders[viewIndex];
-    header.visible = true;
-    header.y = y;
-    header.state = TOP;
-
-    // TODO perhaps we should animate at the top as well
-    header.animating = false;
-  }
-
-  /**
-   * Set header to be pinned at the bottom.
-   *
-   * @param viewIndex index of the header view
-   * @param y is position of the header in pixels.
-   * @param animate true if the transition to the new coordinate should be animated
-   */
-  public void setHeaderPinnedAtBottom(int viewIndex, int y, boolean animate) {
-    ensurePinnedHeaderLayout(viewIndex);
-    PinnedHeader header = mHeaders[viewIndex];
-    header.state = BOTTOM;
-    if (header.animating) {
-      header.targetTime = mAnimationTargetTime;
-      header.sourceY = header.y;
-      header.targetY = y;
-    } else if (animate && (header.y != y || !header.visible)) {
-      if (header.visible) {
-        header.sourceY = header.y;
-      } else {
-        header.visible = true;
-        header.sourceY = y + header.height;
-      }
-      header.animating = true;
-      header.targetVisible = true;
-      header.targetTime = mAnimationTargetTime;
-      header.targetY = y;
-    } else {
-      header.visible = true;
-      header.y = y;
-    }
-  }
-
-  /**
-   * Set header to be pinned at the top of the first visible item.
-   *
-   * @param viewIndex index of the header view
-   * @param position is position of the header in pixels.
-   */
-  public void setFadingHeader(int viewIndex, int position, boolean fade) {
-    ensurePinnedHeaderLayout(viewIndex);
-
-    View child = getChildAt(position - getFirstVisiblePosition());
-    if (child == null) {
-      return;
-    }
-
-    PinnedHeader header = mHeaders[viewIndex];
-    header.visible = true;
-    header.state = FADING;
-    header.alpha = MAX_ALPHA;
-    header.animating = false;
-
-    int top = getTotalTopPinnedHeaderHeight();
-    header.y = top;
-    if (fade) {
-      int bottom = child.getBottom() - top;
-      int headerHeight = header.height;
-      if (bottom < headerHeight) {
-        int portion = bottom - headerHeight;
-        header.alpha = MAX_ALPHA * (headerHeight + portion) / headerHeight;
-        header.y = top + portion;
-      }
-    }
-  }
-
-  /**
-   * Makes header invisible.
-   *
-   * @param viewIndex index of the header view
-   * @param animate true if the transition to the new coordinate should be animated
-   */
-  public void setHeaderInvisible(int viewIndex, boolean animate) {
-    PinnedHeader header = mHeaders[viewIndex];
-    if (header.visible && (animate || header.animating) && header.state == BOTTOM) {
-      header.sourceY = header.y;
-      if (!header.animating) {
-        header.visible = true;
-        header.targetY = getBottom() + header.height;
-      }
-      header.animating = true;
-      header.targetTime = mAnimationTargetTime;
-      header.targetVisible = false;
-    } else {
-      header.visible = false;
-    }
-  }
-
-  private void ensurePinnedHeaderLayout(int viewIndex) {
-    View view = mHeaders[viewIndex].view;
-    if (view.isLayoutRequested()) {
-      ViewGroup.LayoutParams layoutParams = view.getLayoutParams();
-      int widthSpec;
-      int heightSpec;
-
-      if (layoutParams != null && layoutParams.width > 0) {
-        widthSpec = View.MeasureSpec.makeMeasureSpec(layoutParams.width, View.MeasureSpec.EXACTLY);
-      } else {
-        widthSpec = View.MeasureSpec.makeMeasureSpec(mHeaderWidth, View.MeasureSpec.EXACTLY);
-      }
-
-      if (layoutParams != null && layoutParams.height > 0) {
-        heightSpec =
-            View.MeasureSpec.makeMeasureSpec(layoutParams.height, View.MeasureSpec.EXACTLY);
-      } else {
-        heightSpec = View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED);
-      }
-      view.measure(widthSpec, heightSpec);
-      int height = view.getMeasuredHeight();
-      mHeaders[viewIndex].height = height;
-      view.layout(0, 0, view.getMeasuredWidth(), height);
-    }
-  }
-
-  /** Returns the sum of heights of headers pinned to the top. */
-  public int getTotalTopPinnedHeaderHeight() {
-    for (int i = mSize; --i >= 0; ) {
-      PinnedHeader header = mHeaders[i];
-      if (header.visible && header.state == TOP) {
-        return header.y + header.height;
-      }
-    }
-    return 0;
-  }
-
-  /** Returns the list item position at the specified y coordinate. */
-  public int getPositionAt(int y) {
-    do {
-      int position = pointToPosition(getPaddingLeft() + 1, y);
-      if (position != -1) {
-        return position;
-      }
-      // If position == -1, we must have hit a separator. Let's examine
-      // a nearby pixel
-      y--;
-    } while (y > 0);
-    return 0;
-  }
-
-  @Override
-  public boolean onInterceptTouchEvent(MotionEvent ev) {
-    mHeaderTouched = false;
-    if (super.onInterceptTouchEvent(ev)) {
-      return true;
-    }
-
-    if (mScrollState == SCROLL_STATE_IDLE) {
-      final int y = (int) ev.getY();
-      final int x = (int) ev.getX();
-      for (int i = mSize; --i >= 0; ) {
-        PinnedHeader header = mHeaders[i];
-        // For RTL layouts, this also takes into account that the scrollbar is on the left
-        // side.
-        final int padding = getPaddingLeft();
-        if (header.visible
-            && header.y <= y
-            && header.y + header.height > y
-            && x >= padding
-            && padding + header.view.getWidth() >= x) {
-          mHeaderTouched = true;
-          if (mScrollToSectionOnHeaderTouch && ev.getAction() == MotionEvent.ACTION_DOWN) {
-            return smoothScrollToPartition(i);
-          } else {
-            return true;
-          }
-        }
-      }
-    }
-
-    return false;
-  }
-
-  @Override
-  public boolean onTouchEvent(MotionEvent ev) {
-    if (mHeaderTouched) {
-      if (ev.getAction() == MotionEvent.ACTION_UP) {
-        mHeaderTouched = false;
-      }
-      return true;
-    }
-    return super.onTouchEvent(ev);
-  }
-
-  private boolean smoothScrollToPartition(int partition) {
-    if (mAdapter == null) {
-      return false;
-    }
-    final int position = mAdapter.getScrollPositionForHeader(partition);
-    if (position == -1) {
-      return false;
-    }
-
-    int offset = 0;
-    for (int i = 0; i < partition; i++) {
-      PinnedHeader header = mHeaders[i];
-      if (header.visible) {
-        offset += header.height;
-      }
-    }
-    smoothScrollToPositionFromTop(
-        position + getHeaderViewsCount(), offset, DEFAULT_SMOOTH_SCROLL_DURATION);
-    return true;
-  }
-
-  private void invalidateIfAnimating() {
-    mAnimating = false;
-    for (int i = 0; i < mSize; i++) {
-      if (mHeaders[i].animating) {
-        mAnimating = true;
-        invalidate();
-        return;
-      }
-    }
-  }
-
-  @Override
-  protected void dispatchDraw(Canvas canvas) {
-    long currentTime = mAnimating ? System.currentTimeMillis() : 0;
-
-    int top = 0;
-    int bottom = getBottom();
-    boolean hasVisibleHeaders = false;
-    for (int i = 0; i < mSize; i++) {
-      PinnedHeader header = mHeaders[i];
-      if (header.visible) {
-        hasVisibleHeaders = true;
-        if (header.state == BOTTOM && header.y < bottom) {
-          bottom = header.y;
-        } else if (header.state == TOP || header.state == FADING) {
-          int newTop = header.y + header.height;
-          if (newTop > top) {
-            top = newTop;
-          }
-        }
-      }
-    }
-
-    if (hasVisibleHeaders) {
-      canvas.save();
-    }
-
-    super.dispatchDraw(canvas);
-
-    if (hasVisibleHeaders) {
-      canvas.restore();
-
-      // If the first item is visible and if it has a positive top that is greater than the
-      // first header's assigned y-value, use that for the first header's y value. This way,
-      // the header inherits any padding applied to the list view.
-      if (mSize > 0 && getFirstVisiblePosition() == 0) {
-        View firstChild = getChildAt(0);
-        PinnedHeader firstHeader = mHeaders[0];
-
-        if (firstHeader != null) {
-          int firstHeaderTop = firstChild != null ? firstChild.getTop() : 0;
-          firstHeader.y = Math.max(firstHeader.y, firstHeaderTop);
-        }
-      }
-
-      // First draw top headers, then the bottom ones to handle the Z axis correctly
-      for (int i = mSize; --i >= 0; ) {
-        PinnedHeader header = mHeaders[i];
-        if (header.visible && (header.state == TOP || header.state == FADING)) {
-          drawHeader(canvas, header, currentTime);
-        }
-      }
-
-      for (int i = 0; i < mSize; i++) {
-        PinnedHeader header = mHeaders[i];
-        if (header.visible && header.state == BOTTOM) {
-          drawHeader(canvas, header, currentTime);
-        }
-      }
-    }
-
-    invalidateIfAnimating();
-  }
-
-  private void drawHeader(Canvas canvas, PinnedHeader header, long currentTime) {
-    if (header.animating) {
-      int timeLeft = (int) (header.targetTime - currentTime);
-      if (timeLeft <= 0) {
-        header.y = header.targetY;
-        header.visible = header.targetVisible;
-        header.animating = false;
-      } else {
-        header.y =
-            header.targetY + (header.sourceY - header.targetY) * timeLeft / mAnimationDuration;
-      }
-    }
-    if (header.visible) {
-      View view = header.view;
-      int saveCount = canvas.save();
-      int translateX =
-          ViewUtil.isViewLayoutRtl(this)
-              ? getWidth() - mHeaderPaddingStart - view.getWidth()
-              : mHeaderPaddingStart;
-      canvas.translate(translateX, header.y);
-      if (header.state == FADING) {
-        mBounds.set(0, 0, view.getWidth(), view.getHeight());
-        canvas.saveLayerAlpha(mBounds, header.alpha);
-      }
-      view.draw(canvas);
-      canvas.restoreToCount(saveCount);
-    }
-  }
-
-  /** Adapter interface. The list adapter must implement this interface. */
-  public interface PinnedHeaderAdapter {
-
-    /** Returns the overall number of pinned headers, visible or not. */
-    int getPinnedHeaderCount();
-
-    /** Creates or updates the pinned header view. */
-    View getPinnedHeaderView(int viewIndex, View convertView, ViewGroup parent);
-
-    /**
-     * Configures the pinned headers to match the visible list items. The adapter should call {@link
-     * PinnedHeaderListView#setHeaderPinnedAtTop}, {@link
-     * PinnedHeaderListView#setHeaderPinnedAtBottom}, {@link PinnedHeaderListView#setFadingHeader}
-     * or {@link PinnedHeaderListView#setHeaderInvisible}, for each header that needs to change its
-     * position or visibility.
-     */
-    void configurePinnedHeaders(PinnedHeaderListView listView);
-
-    /**
-     * Returns the list position to scroll to if the pinned header is touched. Return -1 if the list
-     * does not need to be scrolled.
-     */
-    int getScrollPositionForHeader(int viewIndex);
-  }
-
-  private static final class PinnedHeader {
-
-    View view;
-    boolean visible;
-    int y;
-    int height;
-    int alpha;
-    int state;
-
-    boolean animating;
-    boolean targetVisible;
-    int sourceY;
-    int targetY;
-    long targetTime;
-  }
-}
diff --git a/java/com/android/contacts/common/list/ViewPagerTabStrip.java b/java/com/android/contacts/common/list/ViewPagerTabStrip.java
index 969a6d3..7a9e506 100644
--- a/java/com/android/contacts/common/list/ViewPagerTabStrip.java
+++ b/java/com/android/contacts/common/list/ViewPagerTabStrip.java
@@ -23,7 +23,8 @@
 import android.util.AttributeSet;
 import android.view.View;
 import android.widget.LinearLayout;
-import com.android.contacts.common.R;
+import com.android.dialer.contacts.resources.R;
+import com.android.dialer.theme.base.ThemeComponent;
 
 public class ViewPagerTabStrip extends LinearLayout {
 
@@ -42,8 +43,8 @@
     final Resources res = context.getResources();
 
     mSelectedUnderlineThickness = res.getDimensionPixelSize(R.dimen.tab_selected_underline_height);
-    int underlineColor = res.getColor(R.color.tab_selected_underline_color);
-    int backgroundColor = res.getColor(R.color.contactscommon_actionbar_background_color);
+    int underlineColor = ThemeComponent.get(context).theme().getColorAccent();
+    int backgroundColor = ThemeComponent.get(context).theme().getColorPrimary();
 
     mSelectedUnderlinePaint = new Paint();
     mSelectedUnderlinePaint.setColor(underlineColor);
diff --git a/java/com/android/contacts/common/list/ViewPagerTabs.java b/java/com/android/contacts/common/list/ViewPagerTabs.java
index 1e6cf13..b3242ee 100644
--- a/java/com/android/contacts/common/list/ViewPagerTabs.java
+++ b/java/com/android/contacts/common/list/ViewPagerTabs.java
@@ -32,7 +32,7 @@
 import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.widget.Toast;
-import com.android.contacts.common.R;
+import com.android.dialer.contacts.resources.R;
 
 /**
  * Lightweight implementation of ViewPager tabs. This looks similar to traditional actionBar tabs,
@@ -163,7 +163,7 @@
     } else {
       final TextView textView = new TextView(getContext());
       textView.setText(tabTitle);
-      textView.setBackgroundResource(R.drawable.view_pager_tab_background);
+      textView.setClickable(true);
 
       // Assign various text appearance related attributes to child views.
       if (mTextStyle > 0) {
diff --git a/java/com/android/contacts/common/model/account/AccountType.java b/java/com/android/contacts/common/model/account/AccountType.java
index ed0d421..499286a 100644
--- a/java/com/android/contacts/common/model/account/AccountType.java
+++ b/java/com/android/contacts/common/model/account/AccountType.java
@@ -29,8 +29,8 @@
 import android.util.ArrayMap;
 import android.view.inputmethod.EditorInfo;
 import android.widget.EditText;
-import com.android.contacts.common.R;
 import com.android.contacts.common.model.dataitem.DataKind;
+import com.android.dialer.contacts.resources.R;
 import java.text.Collator;
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/java/com/android/contacts/common/model/account/BaseAccountType.java b/java/com/android/contacts/common/model/account/BaseAccountType.java
index ccdad36..2911975 100644
--- a/java/com/android/contacts/common/model/account/BaseAccountType.java
+++ b/java/com/android/contacts/common/model/account/BaseAccountType.java
@@ -37,11 +37,11 @@
 import android.util.ArrayMap;
 import android.util.AttributeSet;
 import android.view.inputmethod.EditorInfo;
-import com.android.contacts.common.R;
 import com.android.contacts.common.model.dataitem.DataKind;
 import com.android.contacts.common.util.CommonDateUtils;
 import com.android.contacts.common.util.ContactDisplayUtils;
 import com.android.dialer.common.LogUtil;
+import com.android.dialer.contacts.resources.R;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
diff --git a/java/com/android/contacts/common/model/account/ExchangeAccountType.java b/java/com/android/contacts/common/model/account/ExchangeAccountType.java
index a27028e..0a95e7e 100644
--- a/java/com/android/contacts/common/model/account/ExchangeAccountType.java
+++ b/java/com/android/contacts/common/model/account/ExchangeAccountType.java
@@ -29,10 +29,10 @@
 import android.provider.ContactsContract.CommonDataKinds.StructuredName;
 import android.provider.ContactsContract.CommonDataKinds.StructuredPostal;
 import android.provider.ContactsContract.CommonDataKinds.Website;
-import android.util.Log;
-import com.android.contacts.common.R;
 import com.android.contacts.common.model.dataitem.DataKind;
 import com.android.contacts.common.util.CommonDateUtils;
+import com.android.dialer.common.LogUtil;
+import com.android.dialer.contacts.resources.R;
 import java.util.ArrayList;
 import java.util.Locale;
 
@@ -67,7 +67,7 @@
 
       mIsInitialized = true;
     } catch (DefinitionException e) {
-      Log.e(TAG, "Problem building account type", e);
+      LogUtil.e(TAG, "Problem building account type", e);
     }
   }
 
diff --git a/java/com/android/contacts/common/model/account/ExternalAccountType.java b/java/com/android/contacts/common/model/account/ExternalAccountType.java
index aca1f70..618def7 100644
--- a/java/com/android/contacts/common/model/account/ExternalAccountType.java
+++ b/java/com/android/contacts/common/model/account/ExternalAccountType.java
@@ -30,10 +30,10 @@
 import android.support.annotation.VisibleForTesting;
 import android.text.TextUtils;
 import android.util.AttributeSet;
-import android.util.Log;
 import android.util.Xml;
-import com.android.contacts.common.R;
 import com.android.contacts.common.model.dataitem.DataKind;
+import com.android.dialer.common.LogUtil;
+import com.android.dialer.contacts.resources.R;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
@@ -152,7 +152,7 @@
       error.append(" for external package ");
       error.append(packageName);
 
-      Log.e(TAG, error.toString(), e);
+      LogUtil.e(TAG, error.toString(), e);
       return;
     } finally {
       if (parser != null) {
@@ -210,13 +210,11 @@
         for (String metadataName : METADATA_CONTACTS_NAMES) {
           final XmlResourceParser parser = serviceInfo.loadXmlMetaData(pm, metadataName);
           if (parser != null) {
-            if (Log.isLoggable(TAG, Log.DEBUG)) {
-              Log.d(
-                  TAG,
-                  String.format(
-                      "Metadata loaded from: %s, %s, %s",
-                      serviceInfo.packageName, serviceInfo.name, metadataName));
-            }
+            LogUtil.d(
+                TAG,
+                String.format(
+                    "Metadata loaded from: %s, %s, %s",
+                    serviceInfo.packageName, serviceInfo.name, metadataName));
             return parser;
           }
         }
@@ -250,7 +248,7 @@
       return -1; // Empty text is okay.
     }
     if (resourceName.charAt(0) != '@') {
-      Log.e(TAG, xmlAttributeName + " must be a resource name beginnig with '@'");
+      LogUtil.e(TAG, xmlAttributeName + " must be a resource name beginnig with '@'");
       return -1;
     }
     final String name = resourceName.substring(1);
@@ -258,12 +256,12 @@
     try {
       res = context.getPackageManager().getResourcesForApplication(packageName);
     } catch (NameNotFoundException e) {
-      Log.e(TAG, "Unable to load package " + packageName);
+      LogUtil.e(TAG, "Unable to load package " + packageName);
       return -1;
     }
     final int resId = res.getIdentifier(name, null, packageName);
     if (resId == 0) {
-      Log.e(TAG, "Unable to load " + resourceName + " from package " + packageName);
+      LogUtil.e(TAG, "Unable to load " + resourceName + " from package " + packageName);
       return -1;
     }
     return resId;
@@ -366,9 +364,7 @@
       for (int i = 0; i < attributeCount; i++) {
         String attr = parser.getAttributeName(i);
         String value = parser.getAttributeValue(i);
-        if (Log.isLoggable(TAG, Log.DEBUG)) {
-          Log.d(TAG, attr + "=" + value);
-        }
+        LogUtil.d(TAG, attr + "=" + value);
         if (ATTR_EDIT_CONTACT_ACTIVITY.equals(attr)) {
           mEditContactActivityClassName = value;
         } else if (ATTR_CREATE_CONTACT_ACTIVITY.equals(attr)) {
@@ -394,7 +390,7 @@
         } else if (ATTR_ACCOUNT_ICON.equals(attr)) {
           mAccountTypeIconAttribute = value;
         } else {
-          Log.e(TAG, "Unsupported attribute " + attr);
+          LogUtil.e(TAG, "Unsupported attribute " + attr);
         }
       }
 
diff --git a/java/com/android/contacts/common/model/account/FallbackAccountType.java b/java/com/android/contacts/common/model/account/FallbackAccountType.java
index 976a7b8..ee3a757 100644
--- a/java/com/android/contacts/common/model/account/FallbackAccountType.java
+++ b/java/com/android/contacts/common/model/account/FallbackAccountType.java
@@ -17,9 +17,9 @@
 package com.android.contacts.common.model.account;
 
 import android.content.Context;
-import android.util.Log;
-import com.android.contacts.common.R;
 import com.android.contacts.common.model.dataitem.DataKind;
+import com.android.dialer.common.LogUtil;
+import com.android.dialer.contacts.resources.R;
 
 public class FallbackAccountType extends BaseAccountType {
 
@@ -53,7 +53,7 @@
 
       mIsInitialized = true;
     } catch (DefinitionException e) {
-      Log.e(TAG, "Problem building account type", e);
+      LogUtil.e(TAG, "Problem building account type", e);
     }
   }
 
diff --git a/java/com/android/contacts/common/model/account/GoogleAccountType.java b/java/com/android/contacts/common/model/account/GoogleAccountType.java
index 2f1fe0e..a25544b 100644
--- a/java/com/android/contacts/common/model/account/GoogleAccountType.java
+++ b/java/com/android/contacts/common/model/account/GoogleAccountType.java
@@ -22,10 +22,10 @@
 import android.provider.ContactsContract.CommonDataKinds.Event;
 import android.provider.ContactsContract.CommonDataKinds.Phone;
 import android.provider.ContactsContract.CommonDataKinds.Relation;
-import android.util.Log;
-import com.android.contacts.common.R;
 import com.android.contacts.common.model.dataitem.DataKind;
 import com.android.contacts.common.util.CommonDateUtils;
+import com.android.dialer.common.LogUtil;
+import com.android.dialer.contacts.resources.R;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -69,7 +69,7 @@
 
       mIsInitialized = true;
     } catch (DefinitionException e) {
-      Log.e(TAG, "Problem building account type", e);
+      LogUtil.e(TAG, "Problem building account type", e);
     }
   }
 
diff --git a/java/com/android/contacts/common/model/account/SamsungAccountType.java b/java/com/android/contacts/common/model/account/SamsungAccountType.java
index 45406bc..77c0575 100644
--- a/java/com/android/contacts/common/model/account/SamsungAccountType.java
+++ b/java/com/android/contacts/common/model/account/SamsungAccountType.java
@@ -23,10 +23,10 @@
 import android.provider.ContactsContract.CommonDataKinds.Phone;
 import android.provider.ContactsContract.CommonDataKinds.Relation;
 import android.provider.ContactsContract.CommonDataKinds.StructuredPostal;
-import android.util.Log;
-import com.android.contacts.common.R;
 import com.android.contacts.common.model.dataitem.DataKind;
 import com.android.contacts.common.util.CommonDateUtils;
+import com.android.dialer.common.LogUtil;
+import com.android.dialer.contacts.resources.R;
 import java.util.ArrayList;
 import java.util.Locale;
 
@@ -69,7 +69,7 @@
 
       mIsInitialized = true;
     } catch (DefinitionException e) {
-      Log.e(TAG, "Problem building account type", e);
+      LogUtil.e(TAG, "Problem building account type", e);
     }
   }
 
diff --git a/java/com/android/contacts/common/preference/ContactsPreferences.java b/java/com/android/contacts/common/preference/ContactsPreferences.java
deleted file mode 100644
index d0adb04..0000000
--- a/java/com/android/contacts/common/preference/ContactsPreferences.java
+++ /dev/null
@@ -1,273 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.contacts.common.preference;
-
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.content.SharedPreferences.Editor;
-import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
-import android.os.Handler;
-import android.preference.PreferenceManager;
-import android.provider.Settings;
-import android.provider.Settings.SettingNotFoundException;
-import android.text.TextUtils;
-import com.android.contacts.common.R;
-import com.android.contacts.common.model.account.AccountWithDataSet;
-import com.android.dialer.strictmode.StrictModeUtils;
-
-/** Manages user preferences for contacts. */
-public class ContactsPreferences implements OnSharedPreferenceChangeListener {
-
-  /** The value for the DISPLAY_ORDER key to show the given name first. */
-  public static final int DISPLAY_ORDER_PRIMARY = 1;
-
-  /** The value for the DISPLAY_ORDER key to show the family name first. */
-  public static final int DISPLAY_ORDER_ALTERNATIVE = 2;
-
-  public static final String DISPLAY_ORDER_KEY = "android.contacts.DISPLAY_ORDER";
-
-  /** The value for the SORT_ORDER key corresponding to sort by given name first. */
-  public static final int SORT_ORDER_PRIMARY = 1;
-
-  public static final String SORT_ORDER_KEY = "android.contacts.SORT_ORDER";
-
-  /** The value for the SORT_ORDER key corresponding to sort by family name first. */
-  public static final int SORT_ORDER_ALTERNATIVE = 2;
-
-  public static final String PREF_DISPLAY_ONLY_PHONES = "only_phones";
-
-  public static final boolean PREF_DISPLAY_ONLY_PHONES_DEFAULT = false;
-
-  /**
-   * Value to use when a preference is unassigned and needs to be read from the shared preferences
-   */
-  private static final int PREFERENCE_UNASSIGNED = -1;
-
-  private final Context mContext;
-  private final SharedPreferences mPreferences;
-  private int mSortOrder = PREFERENCE_UNASSIGNED;
-  private int mDisplayOrder = PREFERENCE_UNASSIGNED;
-  private String mDefaultAccount = null;
-  private ChangeListener mListener = null;
-  private Handler mHandler;
-  private String mDefaultAccountKey;
-  private String mDefaultAccountSavedKey;
-
-  public ContactsPreferences(Context context) {
-    mContext = context;
-    mHandler = new Handler();
-    mPreferences =
-        mContext
-            .getApplicationContext()
-            .getSharedPreferences(context.getPackageName(), Context.MODE_PRIVATE);
-    mDefaultAccountKey =
-        mContext.getResources().getString(R.string.contact_editor_default_account_key);
-    mDefaultAccountSavedKey =
-        mContext.getResources().getString(R.string.contact_editor_anything_saved_key);
-    maybeMigrateSystemSettings();
-  }
-
-  private boolean isSortOrderUserChangeable() {
-    return mContext.getResources().getBoolean(R.bool.config_sort_order_user_changeable);
-  }
-
-  private int getDefaultSortOrder() {
-    if (mContext.getResources().getBoolean(R.bool.config_default_sort_order_primary)) {
-      return SORT_ORDER_PRIMARY;
-    } else {
-      return SORT_ORDER_ALTERNATIVE;
-    }
-  }
-
-  public int getSortOrder() {
-    if (!isSortOrderUserChangeable()) {
-      return getDefaultSortOrder();
-    }
-    if (mSortOrder == PREFERENCE_UNASSIGNED) {
-      mSortOrder = mPreferences.getInt(SORT_ORDER_KEY, getDefaultSortOrder());
-    }
-    return mSortOrder;
-  }
-
-  public void setSortOrder(int sortOrder) {
-    mSortOrder = sortOrder;
-    final Editor editor = mPreferences.edit();
-    editor.putInt(SORT_ORDER_KEY, sortOrder);
-    StrictModeUtils.bypass(editor::commit);
-  }
-
-  private boolean isDisplayOrderUserChangeable() {
-    return mContext.getResources().getBoolean(R.bool.config_display_order_user_changeable);
-  }
-
-  private int getDefaultDisplayOrder() {
-    if (mContext.getResources().getBoolean(R.bool.config_default_display_order_primary)) {
-      return DISPLAY_ORDER_PRIMARY;
-    } else {
-      return DISPLAY_ORDER_ALTERNATIVE;
-    }
-  }
-
-  public int getDisplayOrder() {
-    if (!isDisplayOrderUserChangeable()) {
-      return getDefaultDisplayOrder();
-    }
-    if (mDisplayOrder == PREFERENCE_UNASSIGNED) {
-      mDisplayOrder = mPreferences.getInt(DISPLAY_ORDER_KEY, getDefaultDisplayOrder());
-    }
-    return mDisplayOrder;
-  }
-
-  public void setDisplayOrder(int displayOrder) {
-    mDisplayOrder = displayOrder;
-    final Editor editor = mPreferences.edit();
-    editor.putInt(DISPLAY_ORDER_KEY, displayOrder);
-    StrictModeUtils.bypass(editor::commit);
-  }
-
-  private boolean isDefaultAccountUserChangeable() {
-    return mContext.getResources().getBoolean(R.bool.config_default_account_user_changeable);
-  }
-
-  private String getDefaultAccount() {
-    if (!isDefaultAccountUserChangeable()) {
-      return mDefaultAccount;
-    }
-    if (TextUtils.isEmpty(mDefaultAccount)) {
-      final String accountString = mPreferences.getString(mDefaultAccountKey, mDefaultAccount);
-      if (!TextUtils.isEmpty(accountString)) {
-        final AccountWithDataSet accountWithDataSet = AccountWithDataSet.unstringify(accountString);
-        mDefaultAccount = accountWithDataSet.name;
-      }
-    }
-    return mDefaultAccount;
-  }
-
-  private void setDefaultAccount(AccountWithDataSet accountWithDataSet) {
-    mDefaultAccount = accountWithDataSet == null ? null : accountWithDataSet.name;
-    final Editor editor = mPreferences.edit();
-    if (TextUtils.isEmpty(mDefaultAccount)) {
-      editor.remove(mDefaultAccountKey);
-    } else {
-      editor.putString(mDefaultAccountKey, accountWithDataSet.stringify());
-    }
-    editor.putBoolean(mDefaultAccountSavedKey, true);
-    StrictModeUtils.bypass(editor::commit);
-  }
-
-  public void registerChangeListener(ChangeListener listener) {
-    if (mListener != null) {
-      unregisterChangeListener();
-    }
-
-    mListener = listener;
-
-    // Reset preferences to "unknown" because they may have changed while the
-    // listener was unregistered.
-    mDisplayOrder = PREFERENCE_UNASSIGNED;
-    mSortOrder = PREFERENCE_UNASSIGNED;
-    mDefaultAccount = null;
-
-    mPreferences.registerOnSharedPreferenceChangeListener(this);
-  }
-
-  public void unregisterChangeListener() {
-    if (mListener != null) {
-      mListener = null;
-    }
-
-    mPreferences.unregisterOnSharedPreferenceChangeListener(this);
-  }
-
-  @Override
-  public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, final String key) {
-    // This notification is not sent on the Ui thread. Use the previously created Handler
-    // to switch to the Ui thread
-    mHandler.post(
-        new Runnable() {
-          @Override
-          public void run() {
-            refreshValue(key);
-          }
-        });
-  }
-
-  /**
-   * Forces the value for the given key to be looked up from shared preferences and notifies the
-   * registered {@link ChangeListener}
-   *
-   * @param key the {@link SharedPreferences} key to look up
-   */
-  public void refreshValue(String key) {
-    if (DISPLAY_ORDER_KEY.equals(key)) {
-      mDisplayOrder = PREFERENCE_UNASSIGNED;
-      mDisplayOrder = getDisplayOrder();
-    } else if (SORT_ORDER_KEY.equals(key)) {
-      mSortOrder = PREFERENCE_UNASSIGNED;
-      mSortOrder = getSortOrder();
-    } else if (mDefaultAccountKey.equals(key)) {
-      mDefaultAccount = null;
-      mDefaultAccount = getDefaultAccount();
-    }
-    if (mListener != null) {
-      mListener.onChange();
-    }
-  }
-
-  /**
-   * If there are currently no preferences (which means this is the first time we are run), For sort
-   * order and display order, check to see if there are any preferences stored in system settings
-   * (pre-L) which can be copied into our own SharedPreferences. For default account setting, check
-   * to see if there are any preferences stored in the previous SharedPreferences which can be
-   * copied into current SharedPreferences.
-   */
-  private void maybeMigrateSystemSettings() {
-    if (!mPreferences.contains(SORT_ORDER_KEY)) {
-      int sortOrder = getDefaultSortOrder();
-      try {
-        sortOrder = Settings.System.getInt(mContext.getContentResolver(), SORT_ORDER_KEY);
-      } catch (SettingNotFoundException e) {
-      }
-      setSortOrder(sortOrder);
-    }
-
-    if (!mPreferences.contains(DISPLAY_ORDER_KEY)) {
-      int displayOrder = getDefaultDisplayOrder();
-      try {
-        displayOrder = Settings.System.getInt(mContext.getContentResolver(), DISPLAY_ORDER_KEY);
-      } catch (SettingNotFoundException e) {
-      }
-      setDisplayOrder(displayOrder);
-    }
-
-    if (!mPreferences.contains(mDefaultAccountKey)) {
-      final SharedPreferences previousPrefs =
-          PreferenceManager.getDefaultSharedPreferences(mContext.getApplicationContext());
-      final String defaultAccount = previousPrefs.getString(mDefaultAccountKey, null);
-      if (!TextUtils.isEmpty(defaultAccount)) {
-        final AccountWithDataSet accountWithDataSet =
-            AccountWithDataSet.unstringify(defaultAccount);
-        setDefaultAccount(accountWithDataSet);
-      }
-    }
-  }
-
-  public interface ChangeListener {
-
-    void onChange();
-  }
-}
diff --git a/java/com/android/contacts/common/preference/DisplayOrderPreference.java b/java/com/android/contacts/common/preference/DisplayOrderPreference.java
deleted file mode 100644
index 8dda57f..0000000
--- a/java/com/android/contacts/common/preference/DisplayOrderPreference.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.contacts.common.preference;
-
-import android.app.AlertDialog.Builder;
-import android.content.Context;
-import android.preference.ListPreference;
-import android.util.AttributeSet;
-import com.android.contacts.common.R;
-
-/** Custom preference: view-name-as (first name first or last name first). */
-public final class DisplayOrderPreference extends ListPreference {
-
-  private ContactsPreferences mPreferences;
-  private Context mContext;
-
-  public DisplayOrderPreference(Context context) {
-    super(context);
-    prepare();
-  }
-
-  public DisplayOrderPreference(Context context, AttributeSet attrs) {
-    super(context, attrs);
-    prepare();
-  }
-
-  private void prepare() {
-    mContext = getContext();
-    mPreferences = new ContactsPreferences(mContext);
-    setEntries(
-        new String[] {
-          mContext.getString(R.string.display_options_view_given_name_first),
-          mContext.getString(R.string.display_options_view_family_name_first),
-        });
-    setEntryValues(
-        new String[] {
-          String.valueOf(ContactsPreferences.DISPLAY_ORDER_PRIMARY),
-          String.valueOf(ContactsPreferences.DISPLAY_ORDER_ALTERNATIVE),
-        });
-    setValue(String.valueOf(mPreferences.getDisplayOrder()));
-  }
-
-  @Override
-  protected boolean shouldPersist() {
-    return false; // This preference takes care of its own storage
-  }
-
-  @Override
-  public CharSequence getSummary() {
-    switch (mPreferences.getDisplayOrder()) {
-      case ContactsPreferences.DISPLAY_ORDER_PRIMARY:
-        return mContext.getString(R.string.display_options_view_given_name_first);
-      case ContactsPreferences.DISPLAY_ORDER_ALTERNATIVE:
-        return mContext.getString(R.string.display_options_view_family_name_first);
-    }
-    return null;
-  }
-
-  @Override
-  protected boolean persistString(String value) {
-    int newValue = Integer.parseInt(value);
-    if (newValue != mPreferences.getDisplayOrder()) {
-      mPreferences.setDisplayOrder(newValue);
-      notifyChanged();
-    }
-    return true;
-  }
-
-  @Override
-  // UX recommendation is not to show cancel button on such lists.
-  protected void onPrepareDialogBuilder(Builder builder) {
-    super.onPrepareDialogBuilder(builder);
-    builder.setNegativeButton(null, null);
-  }
-}
diff --git a/java/com/android/contacts/common/preference/SortOrderPreference.java b/java/com/android/contacts/common/preference/SortOrderPreference.java
deleted file mode 100644
index 9b6f578..0000000
--- a/java/com/android/contacts/common/preference/SortOrderPreference.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.contacts.common.preference;
-
-import android.app.AlertDialog.Builder;
-import android.content.Context;
-import android.preference.ListPreference;
-import android.util.AttributeSet;
-import com.android.contacts.common.R;
-
-/** Custom preference: sort-by. */
-public final class SortOrderPreference extends ListPreference {
-
-  private ContactsPreferences mPreferences;
-  private Context mContext;
-
-  public SortOrderPreference(Context context) {
-    super(context);
-    prepare();
-  }
-
-  public SortOrderPreference(Context context, AttributeSet attrs) {
-    super(context, attrs);
-    prepare();
-  }
-
-  private void prepare() {
-    mContext = getContext();
-    mPreferences = new ContactsPreferences(mContext);
-    setEntries(
-        new String[] {
-          mContext.getString(R.string.display_options_sort_by_given_name),
-          mContext.getString(R.string.display_options_sort_by_family_name),
-        });
-    setEntryValues(
-        new String[] {
-          String.valueOf(ContactsPreferences.SORT_ORDER_PRIMARY),
-          String.valueOf(ContactsPreferences.SORT_ORDER_ALTERNATIVE),
-        });
-    setValue(String.valueOf(mPreferences.getSortOrder()));
-  }
-
-  @Override
-  protected boolean shouldPersist() {
-    return false; // This preference takes care of its own storage
-  }
-
-  @Override
-  public CharSequence getSummary() {
-    switch (mPreferences.getSortOrder()) {
-      case ContactsPreferences.SORT_ORDER_PRIMARY:
-        return mContext.getString(R.string.display_options_sort_by_given_name);
-      case ContactsPreferences.SORT_ORDER_ALTERNATIVE:
-        return mContext.getString(R.string.display_options_sort_by_family_name);
-    }
-    return null;
-  }
-
-  @Override
-  protected boolean persistString(String value) {
-    int newValue = Integer.parseInt(value);
-    if (newValue != mPreferences.getSortOrder()) {
-      mPreferences.setSortOrder(newValue);
-      notifyChanged();
-    }
-    return true;
-  }
-
-  @Override
-  // UX recommendation is not to show cancel button on such lists.
-  protected void onPrepareDialogBuilder(Builder builder) {
-    super.onPrepareDialogBuilder(builder);
-    builder.setNegativeButton(null, null);
-  }
-}
diff --git a/java/com/android/contacts/common/res/color/tab_text_color.xml b/java/com/android/contacts/common/res/color/tab_text_color.xml
deleted file mode 100644
index 71ef3e9..0000000
--- a/java/com/android/contacts/common/res/color/tab_text_color.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2014 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-  -->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-  <item android:color="@color/actionbar_text_color" android:state_selected="true"/>
-  <item android:color="@color/actionbar_unselected_text_color"/>
-</selector>
\ No newline at end of file
diff --git a/java/com/android/contacts/common/res/drawable-hdpi/ic_call_note_white_24dp.png b/java/com/android/contacts/common/res/drawable-hdpi/ic_call_note_white_24dp.png
deleted file mode 100644
index 503e58e..0000000
--- a/java/com/android/contacts/common/res/drawable-hdpi/ic_call_note_white_24dp.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/contacts/common/res/drawable-hdpi/ic_phone_attach.png b/java/com/android/contacts/common/res/drawable-hdpi/ic_phone_attach.png
deleted file mode 100644
index 84b1227..0000000
--- a/java/com/android/contacts/common/res/drawable-hdpi/ic_phone_attach.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/contacts/common/res/drawable-hdpi/ic_scroll_handle.png b/java/com/android/contacts/common/res/drawable-hdpi/ic_scroll_handle.png
deleted file mode 100644
index 3aa29b8..0000000
--- a/java/com/android/contacts/common/res/drawable-hdpi/ic_scroll_handle.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/contacts/common/res/drawable-mdpi/ic_call_note_white_24dp.png b/java/com/android/contacts/common/res/drawable-mdpi/ic_call_note_white_24dp.png
deleted file mode 100644
index 9d359db..0000000
--- a/java/com/android/contacts/common/res/drawable-mdpi/ic_call_note_white_24dp.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/contacts/common/res/drawable-mdpi/ic_phone_attach.png b/java/com/android/contacts/common/res/drawable-mdpi/ic_phone_attach.png
deleted file mode 100644
index fc4ddd3..0000000
--- a/java/com/android/contacts/common/res/drawable-mdpi/ic_phone_attach.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/contacts/common/res/drawable-mdpi/ic_scroll_handle.png b/java/com/android/contacts/common/res/drawable-mdpi/ic_scroll_handle.png
deleted file mode 100644
index af75db4..0000000
--- a/java/com/android/contacts/common/res/drawable-mdpi/ic_scroll_handle.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/contacts/common/res/drawable-xhdpi/ic_call_note_white_24dp.png b/java/com/android/contacts/common/res/drawable-xhdpi/ic_call_note_white_24dp.png
deleted file mode 100644
index 40eed1d..0000000
--- a/java/com/android/contacts/common/res/drawable-xhdpi/ic_call_note_white_24dp.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/contacts/common/res/drawable-xhdpi/ic_phone_attach.png b/java/com/android/contacts/common/res/drawable-xhdpi/ic_phone_attach.png
deleted file mode 100644
index fdfafed..0000000
--- a/java/com/android/contacts/common/res/drawable-xhdpi/ic_phone_attach.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/contacts/common/res/drawable-xhdpi/ic_scroll_handle.png b/java/com/android/contacts/common/res/drawable-xhdpi/ic_scroll_handle.png
deleted file mode 100644
index 2d43c4d..0000000
--- a/java/com/android/contacts/common/res/drawable-xhdpi/ic_scroll_handle.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/contacts/common/res/drawable-xxhdpi/ic_call_note_white_24dp.png b/java/com/android/contacts/common/res/drawable-xxhdpi/ic_call_note_white_24dp.png
deleted file mode 100644
index 2656cad..0000000
--- a/java/com/android/contacts/common/res/drawable-xxhdpi/ic_call_note_white_24dp.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/contacts/common/res/drawable-xxhdpi/ic_phone_attach.png b/java/com/android/contacts/common/res/drawable-xxhdpi/ic_phone_attach.png
deleted file mode 100644
index 6a6cdee..0000000
--- a/java/com/android/contacts/common/res/drawable-xxhdpi/ic_phone_attach.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/contacts/common/res/drawable-xxhdpi/ic_scroll_handle.png b/java/com/android/contacts/common/res/drawable-xxhdpi/ic_scroll_handle.png
deleted file mode 100644
index 55f1d13..0000000
--- a/java/com/android/contacts/common/res/drawable-xxhdpi/ic_scroll_handle.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/contacts/common/res/drawable-xxxhdpi/ic_call_note_white_24dp.png b/java/com/android/contacts/common/res/drawable-xxxhdpi/ic_call_note_white_24dp.png
deleted file mode 100644
index 903c162..0000000
--- a/java/com/android/contacts/common/res/drawable-xxxhdpi/ic_call_note_white_24dp.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/contacts/common/res/drawable-xxxhdpi/ic_phone_attach.png b/java/com/android/contacts/common/res/drawable-xxxhdpi/ic_phone_attach.png
deleted file mode 100644
index b072ad1..0000000
--- a/java/com/android/contacts/common/res/drawable-xxxhdpi/ic_phone_attach.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/contacts/common/res/drawable-xxxhdpi/ic_scroll_handle.png b/java/com/android/contacts/common/res/drawable-xxxhdpi/ic_scroll_handle.png
deleted file mode 100644
index d90782a..0000000
--- a/java/com/android/contacts/common/res/drawable-xxxhdpi/ic_scroll_handle.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/contacts/common/res/drawable/dialog_background_material.xml b/java/com/android/contacts/common/res/drawable/dialog_background_material.xml
deleted file mode 100644
index 1b71cd6..0000000
--- a/java/com/android/contacts/common/res/drawable/dialog_background_material.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2015 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<inset xmlns:android="http://schemas.android.com/apk/res/android"
-  android:inset="16dp">
-  <shape android:shape="rectangle">
-    <corners android:radius="2dp"/>
-    <solid android:color="@color/call_subject_history_background"/>
-  </shape>
-</inset>
diff --git a/java/com/android/contacts/common/res/drawable/ic_scroll_handle_default.xml b/java/com/android/contacts/common/res/drawable/ic_scroll_handle_default.xml
deleted file mode 100644
index ac932f8..0000000
--- a/java/com/android/contacts/common/res/drawable/ic_scroll_handle_default.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2014 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-  android:src="@drawable/ic_scroll_handle"
-  android:tint="@color/dialer_secondary_text_color"/>
diff --git a/java/com/android/contacts/common/res/drawable/ic_scroll_handle_pressed.xml b/java/com/android/contacts/common/res/drawable/ic_scroll_handle_pressed.xml
deleted file mode 100644
index 4838de5..0000000
--- a/java/com/android/contacts/common/res/drawable/ic_scroll_handle_pressed.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2014 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-  android:src="@drawable/ic_scroll_handle"
-  android:tint="@color/dialtacts_theme_color"/>
\ No newline at end of file
diff --git a/java/com/android/contacts/common/res/drawable/item_background_material_borderless_dark.xml b/java/com/android/contacts/common/res/drawable/item_background_material_borderless_dark.xml
deleted file mode 100644
index 94e3095..0000000
--- a/java/com/android/contacts/common/res/drawable/item_background_material_borderless_dark.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- Based on the Theme.Material's default selectableItemBackgroundBorderless -->
-<ripple xmlns:android="http://schemas.android.com/apk/res/android"
-  android:color="@color/dialer_ripple_material_dark"/>
\ No newline at end of file
diff --git a/java/com/android/contacts/common/res/drawable/item_background_material_dark.xml b/java/com/android/contacts/common/res/drawable/item_background_material_dark.xml
deleted file mode 100644
index 91ab763..0000000
--- a/java/com/android/contacts/common/res/drawable/item_background_material_dark.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- Based on the Theme.Material's default selectableItemBackground -->
-<ripple xmlns:android="http://schemas.android.com/apk/res/android"
-  android:color="@color/dialer_ripple_material_dark">
-  <item android:id="@android:id/mask">
-    <color android:color="@android:color/white"/>
-  </item>
-</ripple>
\ No newline at end of file
diff --git a/java/com/android/contacts/common/res/drawable/item_background_material_light.xml b/java/com/android/contacts/common/res/drawable/item_background_material_light.xml
deleted file mode 100644
index d41accb..0000000
--- a/java/com/android/contacts/common/res/drawable/item_background_material_light.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- Based on the Theme.Material's default selectableItemBackground -->
-<ripple xmlns:android="http://schemas.android.com/apk/res/android"
-  android:color="@color/dialer_ripple_material_light">
-  <item android:id="@android:id/mask">
-    <color android:color="@android:color/white"/>
-  </item>
-</ripple>
\ No newline at end of file
diff --git a/java/com/android/contacts/common/res/drawable/searchedittext_custom_cursor.xml b/java/com/android/contacts/common/res/drawable/searchedittext_custom_cursor.xml
deleted file mode 100644
index 27614a1..0000000
--- a/java/com/android/contacts/common/res/drawable/searchedittext_custom_cursor.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2014 Google Inc. All Rights Reserved. -->
-
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-  <size android:width="2dp"/>
-  <solid android:color="@color/dialtacts_theme_color"/>
-</shape>
\ No newline at end of file
diff --git a/java/com/android/contacts/common/res/drawable/unread_count_background.xml b/java/com/android/contacts/common/res/drawable/unread_count_background.xml
deleted file mode 100644
index 4fc6b9b..0000000
--- a/java/com/android/contacts/common/res/drawable/unread_count_background.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2015 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<shape
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  android:shape="rectangle">
-  <corners android:radius="@dimen/tab_unread_count_background_radius"/>
-  <solid android:color="@color/tab_unread_count_background_color"/>
-</shape>
diff --git a/java/com/android/contacts/common/res/drawable/view_pager_tab_background.xml b/java/com/android/contacts/common/res/drawable/view_pager_tab_background.xml
deleted file mode 100644
index bef30a4..0000000
--- a/java/com/android/contacts/common/res/drawable/view_pager_tab_background.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2014 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-  -->
-<ripple xmlns:android="http://schemas.android.com/apk/res/android"
-  android:color="@color/tab_ripple_color">
-  <item android:id="@android:id/mask">
-    <color android:color="@android:color/white"/>
-  </item>
-</ripple>
\ No newline at end of file
diff --git a/java/com/android/contacts/common/res/layout-ldrtl/unread_count_tab.xml b/java/com/android/contacts/common/res/layout-ldrtl/unread_count_tab.xml
deleted file mode 100644
index 9e9be95..0000000
--- a/java/com/android/contacts/common/res/layout-ldrtl/unread_count_tab.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2015 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<!-- layoutDirection set to ltr as a workaround to a framework bug (a bug) causing view with
-     layout_centerInParent inside a RelativeLayout to expand to screen width when RTL is active -->
-<RelativeLayout
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  android:layout_width="match_parent"
-  android:layout_height="match_parent"
-  android:background="@drawable/view_pager_tab_background"
-  android:layoutDirection="ltr">
-  <!-- The tab icon -->
-  <ImageView
-    android:id="@+id/icon"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_centerInParent="true"/>
-  <TextView
-    android:id="@+id/count"
-    android:layout_width="wrap_content"
-    android:layout_height="@dimen/tab_unread_count_background_size"
-    android:layout_marginTop="@dimen/tab_unread_count_margin_top"
-    android:layout_marginStart="@dimen/tab_unread_count_margin_left"
-    android:layout_toStartOf="@id/icon"
-    android:paddingLeft="@dimen/tab_unread_count_text_padding"
-    android:paddingRight="@dimen/tab_unread_count_text_padding"
-    android:background="@drawable/unread_count_background"
-    android:fontFamily="sans-serif-medium"
-    android:importantForAccessibility="no"
-    android:layoutDirection="locale"
-    android:minWidth="@dimen/tab_unread_count_background_size"
-    android:textAlignment="center"
-    android:textColor="@color/tab_accent_color"
-    android:textSize="@dimen/tab_unread_count_text_size"/>
-</RelativeLayout>
-
diff --git a/java/com/android/contacts/common/res/layout/account_filter_header.xml b/java/com/android/contacts/common/res/layout/account_filter_header.xml
deleted file mode 100644
index a12ab08..0000000
--- a/java/com/android/contacts/common/res/layout/account_filter_header.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- Layout showing the type of account filter
-     (e.g. All contacts filter, custom filter, etc.),
-     which is the header of all contact lists. -->
-
-<!-- Solely used to set a background color -->
-<FrameLayout
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  android:layout_width="match_parent"
-  android:layout_height="wrap_content"
-  android:background="@color/background_primary">
-  <!-- Used to show the touch feedback -->
-  <FrameLayout
-    android:id="@+id/account_filter_header_container"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_marginStart="@dimen/contact_browser_list_header_left_margin"
-    android:layout_marginEnd="@dimen/contact_browser_list_header_right_margin"
-    android:paddingTop="@dimen/list_header_extra_top_padding"
-    android:background="?android:attr/selectableItemBackground"
-    android:visibility="gone">
-    <!-- Shows the text and underlining -->
-    <TextView
-      android:id="@+id/account_filter_header"
-      style="@style/ContactListSeparatorTextViewStyle"
-      android:paddingStart="@dimen/contact_browser_list_item_text_indent"
-      android:paddingLeft="@dimen/contact_browser_list_item_text_indent"/>
-  </FrameLayout>
-</FrameLayout>
diff --git a/java/com/android/contacts/common/res/layout/call_subject_history_list_item.xml b/java/com/android/contacts/common/res/layout/call_subject_history_list_item.xml
deleted file mode 100644
index c378f24..0000000
--- a/java/com/android/contacts/common/res/layout/call_subject_history_list_item.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2015 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-  -->
-
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
-  android:id="@android:id/text1"
-  android:layout_width="match_parent"
-  android:layout_height="wrap_content"
-  android:paddingTop="@dimen/call_subject_history_item_padding"
-  android:paddingBottom="@dimen/call_subject_history_item_padding"
-  android:paddingStart="@dimen/call_subject_dialog_margin"
-  android:paddingEnd="@dimen/call_subject_dialog_margin"
-  android:gravity="center_vertical"
-  android:singleLine="true"
-  android:textColor="@color/dialer_primary_text_color"
-  android:textSize="@dimen/call_subject_dialog_primary_text_size"/>
diff --git a/java/com/android/contacts/common/res/layout/contact_list_card.xml b/java/com/android/contacts/common/res/layout/contact_list_card.xml
deleted file mode 100644
index a04f4ca..0000000
--- a/java/com/android/contacts/common/res/layout/contact_list_card.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<LinearLayout
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  android:id="@+id/list_card"
-  android:layout_width="match_parent"
-  android:layout_height="match_parent"
-  android:orientation="horizontal"
-  android:visibility="invisible">
-  <View
-    android:layout_width="0dp"
-    android:layout_height="match_parent"
-    android:layout_weight="@integer/contact_list_space_layout_weight"
-    android:background="@color/background_primary"/>
-  <View
-    android:layout_width="0dp"
-    android:layout_height="match_parent"
-    android:layout_weight="@integer/contact_list_card_layout_weight"
-    android:background="@color/contact_all_list_background_color"
-    android:elevation="@dimen/contact_list_card_elevation"/>
-  <View
-    android:layout_width="0dp"
-    android:layout_height="match_parent"
-    android:layout_weight="@integer/contact_list_space_layout_weight"
-    android:background="@color/background_primary"/>
-</LinearLayout>
diff --git a/java/com/android/contacts/common/res/layout/default_account_checkbox.xml b/java/com/android/contacts/common/res/layout/default_account_checkbox.xml
deleted file mode 100644
index 1e76b74..0000000
--- a/java/com/android/contacts/common/res/layout/default_account_checkbox.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/default_account_checkbox_layout"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:padding="4dp"
-    android:paddingStart="0dp"
-    android:paddingEnd="24dp"
-    android:gravity="center"
-    android:minHeight="56dp"
-    android:orientation="horizontal"
-    android:focusable="true">
-  <FrameLayout
-      android:layout_width="72dp"
-      android:layout_height="wrap_content">
-    <CheckBox
-        android:id="@+id/default_account_checkbox_view"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:checked="false"/>
-    />
-  </FrameLayout>
-  <TextView
-      android:id="@+id/default_account_checkbox_text"
-      android:layout_width="0dp"
-      android:layout_height="wrap_content"
-      android:layout_weight="1"
-      android:text="@string/set_default_account"
-      android:textAlignment="viewStart"
-      android:textAppearance="?android:attr/textAppearanceSmall"
-      android:textColor="@color/dialer_secondary_text_color"
-      />
-
-</LinearLayout>
diff --git a/java/com/android/contacts/common/res/layout/dialog_call_subject.xml b/java/com/android/contacts/common/res/layout/dialog_call_subject.xml
deleted file mode 100644
index df8e8d2..0000000
--- a/java/com/android/contacts/common/res/layout/dialog_call_subject.xml
+++ /dev/null
@@ -1,159 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2015 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-  -->
-
-<LinearLayout
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  android:id="@+id/call_subject_dialog"
-  android:layout_width="match_parent"
-  android:layout_height="match_parent"
-  android:background="@android:color/transparent"
-  android:orientation="vertical">
-
-  <RelativeLayout
-    android:layout_width="match_parent"
-    android:layout_height="0dp"
-    android:layout_weight="1">
-
-    <!-- The call subject dialog will be centered in the space above the subject list. -->
-    <LinearLayout
-      android:id="@+id/dialog_view"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:layout_centerInParent="true"
-      android:background="@drawable/dialog_background_material"
-      android:clickable="true"
-      android:elevation="16dp"
-      android:orientation="vertical"
-      android:theme="@android:style/Theme.Material.Light.Dialog">
-
-      <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/call_subject_dialog_margin"
-        android:layout_marginStart="@dimen/call_subject_dialog_margin"
-        android:layout_marginEnd="@dimen/call_subject_dialog_margin"
-        android:orientation="horizontal">
-
-        <QuickContactBadge
-          android:id="@+id/contact_photo"
-          android:layout_width="@dimen/call_subject_dialog_contact_photo_size"
-          android:layout_height="@dimen/call_subject_dialog_contact_photo_size"
-          android:layout_marginEnd="@dimen/call_subject_dialog_margin"
-          android:layout_gravity="top"
-          android:focusable="true"/>
-
-        <LinearLayout
-          android:layout_width="match_parent"
-          android:layout_height="wrap_content"
-          android:gravity="center_vertical"
-          android:orientation="vertical">
-
-          <TextView
-            android:id="@+id/name"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:singleLine="true"
-            android:textColor="@color/dialer_primary_text_color"
-            android:textSize="@dimen/call_subject_dialog_secondary_text_size"/>
-
-          <TextView
-            android:id="@+id/number"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/call_subject_dialog_between_line_margin"
-            android:layout_gravity="center_vertical"
-            android:singleLine="true"
-            android:textColor="@color/dialer_secondary_text_color"
-            android:textSize="@dimen/call_subject_dialog_secondary_text_size"/>
-        </LinearLayout>
-      </LinearLayout>
-
-      <EditText
-        android:id="@+id/call_subject"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1"
-        android:layout_marginTop="@dimen/call_subject_dialog_edit_spacing"
-        android:layout_marginStart="@dimen/call_subject_dialog_margin"
-        android:layout_marginEnd="@dimen/call_subject_dialog_margin"
-        android:layout_gravity="top"
-        android:background="@null"
-        android:gravity="top"
-        android:hint="@string/call_subject_hint"
-        android:textColor="@color/dialer_secondary_text_color"
-        android:textSize="@dimen/call_subject_dialog_secondary_text_size"
-        />
-
-      <TextView
-        android:id="@+id/character_limit"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/call_subject_dialog_margin"
-        android:layout_marginBottom="@dimen/call_subject_dialog_margin"
-        android:layout_marginStart="@dimen/call_subject_dialog_margin"
-        android:layout_marginEnd="@dimen/call_subject_dialog_margin"
-        android:singleLine="true"
-        android:textColor="@color/dialer_secondary_text_color"
-        android:textSize="@dimen/call_subject_dialog_secondary_text_size"/>
-
-      <View
-        android:layout_width="fill_parent"
-        android:layout_height="1dp"
-        android:background="@color/call_subject_divider"/>
-
-      <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/call_subject_dialog_margin"
-        android:layout_marginBottom="@dimen/call_subject_dialog_margin"
-        android:layout_marginStart="@dimen/call_subject_dialog_margin"
-        android:layout_marginEnd="@dimen/call_subject_dialog_margin">
-
-        <ImageView
-          android:id="@+id/history_button"
-          android:layout_width="25dp"
-          android:layout_height="25dp"
-          android:layout_alignParentStart="true"
-          android:layout_centerVertical="true"
-          android:src="@drawable/quantum_ic_history_vd_theme_24"
-          android:tint="@color/call_subject_history_icon"/>
-
-        <TextView
-          android:id="@+id/send_and_call_button"
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content"
-          android:layout_alignParentEnd="true"
-          android:layout_centerVertical="true"
-          android:singleLine="true"
-          android:text="@string/send_and_call_button"
-          android:textColor="@color/call_subject_button"
-          android:textSize="@dimen/call_subject_dialog_secondary_text_size"/>
-
-      </RelativeLayout>
-    </LinearLayout>
-  </RelativeLayout>
-  <!-- The subject list is pinned to the bottom of the screen. -->
-  <ListView
-    android:id="@+id/subject_list"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_below="@id/dialog_view"
-    android:background="@color/call_subject_history_background"
-    android:divider="@null"
-    android:elevation="8dp"/>
-
-</LinearLayout>
diff --git a/java/com/android/contacts/common/res/layout/search_bar_expanded.xml b/java/com/android/contacts/common/res/layout/search_bar_expanded.xml
deleted file mode 100644
index ccea3f7..0000000
--- a/java/com/android/contacts/common/res/layout/search_bar_expanded.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<RelativeLayout
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  android:id="@+id/search_box_expanded"
-  android:layout_width="match_parent"
-  android:layout_height="match_parent"
-  android:visibility="gone">
-
-  <ImageButton
-    android:id="@+id/search_back_button"
-    android:layout_width="@dimen/search_box_icon_size"
-    android:layout_height="@dimen/search_box_icon_size"
-    android:layout_marginStart="16dp"
-    android:layout_centerVertical="true"
-    android:background="?attr/selectableItemBackgroundBorderless"
-    android:contentDescription="@string/action_menu_back_from_search"
-    android:src="@drawable/back_arrow"
-    android:tint="@color/contactscommon_actionbar_background_color"/>
-
-  <EditText
-    android:id="@+id/search_view"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_toEndOf="@+id/search_back_button"
-    android:layout_toStartOf="@+id/search_close_button"
-    android:layout_centerVertical="true"
-    android:layout_marginStart="8dp"
-    android:background="@null"
-    android:fontFamily="@string/search_font_family"
-    android:imeOptions="flagNoExtractUi"
-    android:inputType="textFilter"
-    android:maxLines="1"
-    android:textColor="@color/searchbox_text_color"
-    android:textColorHint="@color/searchbox_hint_text_color"
-    android:textCursorDrawable="@drawable/searchedittext_custom_cursor"
-    android:textSize="@dimen/search_text_size"/>
-
-  <ImageView
-    android:id="@+id/search_close_button"
-    android:layout_width="@dimen/search_box_close_icon_size"
-    android:layout_height="@dimen/search_box_close_icon_size"
-    android:layout_alignParentEnd="true"
-    android:layout_centerVertical="true"
-    android:padding="@dimen/search_box_close_icon_padding"
-    android:background="?attr/selectableItemBackgroundBorderless"
-    android:clickable="true"
-    android:contentDescription="@string/description_clear_search"
-    android:src="@drawable/quantum_ic_close_vd_theme_24"
-    android:tint="@color/searchbox_icon_tint"/>
-</RelativeLayout>
diff --git a/java/com/android/contacts/common/res/layout/select_account_list_item.xml b/java/com/android/contacts/common/res/layout/select_account_list_item.xml
deleted file mode 100644
index 8f7cc70..0000000
--- a/java/com/android/contacts/common/res/layout/select_account_list_item.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- Layout of a single item in the InCallUI Account Chooser Dialog. -->
-<com.android.contacts.common.widget.ActivityTouchLinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:minHeight="64dp"
-    android:padding="8dp"
-    android:paddingStart="24dp"
-    android:paddingEnd="24dp"
-    android:orientation="horizontal"
-    android:gravity="center">
-
-  <ImageView
-      android:id="@+id/icon"
-      android:layout_width="24dp"
-      android:layout_height="24dp"
-      android:scaleType="center"/>
-
-  <LinearLayout
-      android:id="@+id/text"
-      android:layout_width="0dp"
-      android:layout_height="wrap_content"
-      android:layout_weight="1"
-      android:paddingStart="24dp"
-      android:gravity="start|center_vertical"
-      android:orientation="vertical">
-    <TextView
-        android:id="@+id/label"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:includeFontPadding="false"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:textColor="@color/dialer_primary_text_color"/>
-    <TextView
-        android:id="@+id/number"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:includeFontPadding="false"
-        android:maxLines="1"
-        android:textAppearance="?android:attr/textAppearanceSmall"
-        android:visibility="gone"/>
-    <TextView
-        android:id="@+id/hint"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:includeFontPadding="false"
-        android:maxLines="1"
-        android:textAppearance="?android:attr/textAppearanceSmall"
-        android:visibility="gone"/>
-  </LinearLayout>
-
-</com.android.contacts.common.widget.ActivityTouchLinearLayout>
diff --git a/java/com/android/contacts/common/res/layout/unread_count_tab.xml b/java/com/android/contacts/common/res/layout/unread_count_tab.xml
deleted file mode 100644
index 83481ee..0000000
--- a/java/com/android/contacts/common/res/layout/unread_count_tab.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2015 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  android:layout_width="match_parent"
-  android:layout_height="match_parent"
-  android:background="@drawable/view_pager_tab_background">
-  <!-- The tab icon -->
-  <ImageView
-    android:id="@+id/icon"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_centerInParent="true"/>
-  <TextView
-    android:id="@+id/count"
-    android:layout_width="wrap_content"
-    android:layout_height="@dimen/tab_unread_count_background_size"
-    android:layout_marginTop="@dimen/tab_unread_count_margin_top"
-    android:layout_marginStart="@dimen/tab_unread_count_margin_left"
-    android:layout_toEndOf="@id/icon"
-    android:paddingLeft="@dimen/tab_unread_count_text_padding"
-    android:paddingRight="@dimen/tab_unread_count_text_padding"
-    android:background="@drawable/unread_count_background"
-    android:fontFamily="sans-serif-medium"
-    android:gravity="center"
-    android:importantForAccessibility="no"
-    android:minWidth="@dimen/tab_unread_count_background_size"
-    android:textAlignment="center"
-    android:textColor="@color/tab_accent_color"
-    android:textSize="@dimen/tab_unread_count_text_size"/>
-</RelativeLayout>
diff --git a/java/com/android/contacts/common/res/mipmap-hdpi/ic_contacts_launcher.png b/java/com/android/contacts/common/res/mipmap-hdpi/ic_contacts_launcher.png
deleted file mode 100644
index 64eff00..0000000
--- a/java/com/android/contacts/common/res/mipmap-hdpi/ic_contacts_launcher.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/contacts/common/res/mipmap-mdpi/ic_contacts_launcher.png b/java/com/android/contacts/common/res/mipmap-mdpi/ic_contacts_launcher.png
deleted file mode 100644
index b4ee821..0000000
--- a/java/com/android/contacts/common/res/mipmap-mdpi/ic_contacts_launcher.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/contacts/common/res/mipmap-xhdpi/ic_contacts_launcher.png b/java/com/android/contacts/common/res/mipmap-xhdpi/ic_contacts_launcher.png
deleted file mode 100644
index 6feeadf..0000000
--- a/java/com/android/contacts/common/res/mipmap-xhdpi/ic_contacts_launcher.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/contacts/common/res/mipmap-xxhdpi/ic_contacts_launcher.png b/java/com/android/contacts/common/res/mipmap-xxhdpi/ic_contacts_launcher.png
deleted file mode 100644
index 01a3fde..0000000
--- a/java/com/android/contacts/common/res/mipmap-xxhdpi/ic_contacts_launcher.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/contacts/common/res/mipmap-xxxhdpi/ic_contacts_launcher.png b/java/com/android/contacts/common/res/mipmap-xxxhdpi/ic_contacts_launcher.png
deleted file mode 100644
index 328e067..0000000
--- a/java/com/android/contacts/common/res/mipmap-xxxhdpi/ic_contacts_launcher.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/contacts/common/res/values-af/strings.xml b/java/com/android/contacts/common/res/values-af/strings.xml
index 5d81218..a0fa006 100644
--- a/java/com/android/contacts/common/res/values-af/strings.xml
+++ b/java/com/android/contacts/common/res/values-af/strings.xml
@@ -1,162 +1,145 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="toast_text_copied" msgid="8979281391599667362">"Teks gekopieer"</string>
-    <string name="call_custom" msgid="3041673234638990874">"Bel <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="call_home" msgid="125893483593803791">"Bel huis"</string>
-    <string name="call_mobile" msgid="967589404494150813">"Bel selfoon"</string>
-    <string name="call_work" msgid="6040550697395300892">"Bel werk"</string>
-    <string name="call_fax_work" msgid="5260192771364592922">"Bel werkfaks"</string>
-    <string name="call_fax_home" msgid="5174311195081144124">"Bel huisfaks"</string>
-    <string name="call_pager" msgid="6814149227741274161">"Bel roeper"</string>
-    <string name="call_other" msgid="5536385588712587235">"Bel"</string>
-    <string name="call_callback" msgid="6314019862718112786">"Bel terugbel"</string>
-    <string name="call_car" msgid="3197417098027764954">"Bel motor"</string>
-    <string name="call_company_main" msgid="2557663310028446397">"Bel maatskappy, hoofnommer"</string>
-    <string name="call_isdn" msgid="4691270442763649522">"Bel ISDN"</string>
-    <string name="call_main" msgid="3293707608770407814">"Bel hoofnommer"</string>
-    <string name="call_other_fax" msgid="4724521984879021465">"Bel faks"</string>
-    <string name="call_radio" msgid="8942441419845057942">"Bel radio"</string>
-    <string name="call_telex" msgid="2031514461660668351">"Bel teleks"</string>
-    <string name="call_tty_tdd" msgid="7807210224965727701">"Bel TTY/TDD"</string>
-    <string name="call_work_mobile" msgid="2716342732938578495">"Bel werkselfoon"</string>
-    <string name="call_work_pager" msgid="3791778749827366574">"Bel werkroeper"</string>
-    <string name="call_assistant" msgid="4177478845473789294">"Bel <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
-    <string name="call_mms" msgid="4958811711741872901">"Bel MMS"</string>
-    <string name="sms_custom" msgid="8785368968605026317">"SMS <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="sms_home" msgid="3527719551060295243">"SMS huis"</string>
-    <string name="sms_mobile" msgid="8883045857887736518">"SMS selfoon"</string>
-    <string name="sms_work" msgid="4158595439553450966">"SMS werk"</string>
-    <string name="sms_fax_work" msgid="5483726627718055248">"SMS werkfaks"</string>
-    <string name="sms_fax_home" msgid="9219265155770746077">"SMS huisfaks"</string>
-    <string name="sms_pager" msgid="4901085068525193933">"SMS roeper"</string>
-    <string name="sms_other" msgid="1742702947993285933">"SMS"</string>
-    <string name="sms_callback" msgid="5833483630377538308">"SMS terugbel"</string>
-    <string name="sms_car" msgid="4314577266154395174">"SMS motor"</string>
-    <string name="sms_company_main" msgid="2308160928487360705">"SMS maatskappy, hoofnommer"</string>
-    <string name="sms_isdn" msgid="6394300346179302542">"SMS ISDN"</string>
-    <string name="sms_main" msgid="8908087742014140774">"SMS hoofnommer"</string>
-    <string name="sms_other_fax" msgid="8768455473295405427">"SMS faks"</string>
-    <string name="sms_radio" msgid="855555176531704682">"SMS radio"</string>
-    <string name="sms_telex" msgid="6269029276223252719">"SMS teleks"</string>
-    <string name="sms_tty_tdd" msgid="6229057354509192444">"SMS TTY/TDD"</string>
-    <string name="sms_work_mobile" msgid="2155975469329969840">"SMS werkselfoon"</string>
-    <string name="sms_work_pager" msgid="8500140274906830742">"SMS werkroeper"</string>
-    <string name="sms_assistant" msgid="8513548482745330818">"SMS <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
-    <string name="sms_mms" msgid="5187888900503248542">"SMS MMS"</string>
-    <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"Vee gereeld-gekontaktes uit?"</string>
-    <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"Jy gaan die gereeld gekontak-lys in die Kontakte- en Foon-program uitvee en e-posprogramme dwing om jou adresvoorkeure van nuuts af te leer."</string>
-    <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"Vee tans gereeld-gekontaktes uit..."</string>
-    <string name="status_available" msgid="2648156525685472626">"Beskikbaar"</string>
-    <string name="status_away" msgid="2298688367552893953">"Weg"</string>
-    <string name="status_busy" msgid="5990832098713248503">"Besig"</string>
-    <string name="contactsList" msgid="8806067891419291513">"Kontakte"</string>
-    <string name="contact_suggestions" msgid="3324166754807120006">"Topvoorgestel"</string>
-    <string name="local_invisible_directory" msgid="4723238462733650090">"Ander"</string>
-    <string name="directory_search_label" msgid="4621215895484025229">"Gids"</string>
-    <string name="directory_search_label_work" msgid="7679326282707414897">"Werkgids"</string>
-    <string name="local_search_label" msgid="907622822323119235">"Alle kontakte"</string>
-    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Voorstelle"</string>
-    <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Ek"</string>
-    <string name="missing_name" msgid="978606963362745020">"(Geen naam nie)"</string>
-    <string name="description_view_contact_detail" msgid="2428742401208561136">"Bekyk kontak"</string>
-    <string name="list_filter_phones" msgid="8763316061763437182">"Alle kontakte met foonnommers"</string>
-    <string name="list_filter_phones_work" msgid="7083575404573422965">"Werkprofielkontakte"</string>
-    <string name="view_updates_from_group" msgid="9011641093168385729">"Bekyk opdaterings"</string>
-    <string name="account_phone" msgid="7067809073194061035">"Slegs toestel, ongesinkroniseerd"</string>
-    <string name="nameLabelsGroup" msgid="7730465833159557471">"Naam"</string>
-    <string name="nicknameLabelsGroup" msgid="6310556912361840029">"Bynaam"</string>
-    <string name="full_name" msgid="648186563998465740">"Naam"</string>
-    <string name="name_given" msgid="5096576006314820536">"Voornaam"</string>
-    <string name="name_family" msgid="6646235805198547467">"Van"</string>
-    <string name="name_prefix" msgid="9215326539658838">"Naamvoorvoegsel"</string>
-    <string name="name_middle" msgid="703755205331582769">"Middelnaam"</string>
-    <string name="name_suffix" msgid="5777083390282548702">"Naamagtervoegsel"</string>
-    <string name="name_phonetic" msgid="1650870996361663089">"Fonetiese naam"</string>
-    <string name="name_phonetic_given" msgid="618812334274603170">"Fonetiese voornaam"</string>
-    <string name="name_phonetic_middle" msgid="4826820763384625538">"Fonetiese middelnaam"</string>
-    <string name="name_phonetic_family" msgid="379905191212930771">"Fonetiese van"</string>
-    <string name="phoneLabelsGroup" msgid="169661929021355548">"Foon"</string>
-    <string name="emailLabelsGroup" msgid="2249752810477488833">"E-pos"</string>
-    <string name="postalLabelsGroup" msgid="6772000590189142253">"Adres"</string>
-    <string name="imLabelsGroup" msgid="5718066254237364731">"IM"</string>
-    <string name="organizationLabelsGroup" msgid="1101996309241601435">"Organisasie"</string>
-    <string name="relationLabelsGroup" msgid="53866051664600053">"Verhouding"</string>
-    <string name="eventLabelsGroup" msgid="1236970042646618489">"Spesiale datum"</string>
-    <string name="sms" msgid="7574344928185328095">"Teksboodskap"</string>
-    <string name="postal_address" msgid="1804707930129674200">"Adres"</string>
-    <string name="ghostData_company" msgid="2554310786296833424">"Maatskappy"</string>
-    <string name="ghostData_title" msgid="4994968731830184837">"Titel"</string>
-    <string name="label_notes" msgid="2050255313694219786">"Notas"</string>
-    <string name="label_sip_address" msgid="8883266182575965926">"SIP"</string>
-    <string name="websiteLabelsGroup" msgid="1630734286462186790">"Webwerf"</string>
-    <string name="groupsLabel" msgid="2694002798416868728">"Groepe"</string>
-    <string name="email_home" msgid="889830029388962171">"E-postuis"</string>
-    <string name="email_mobile" msgid="4487686436743741150">"E-pos mobiel"</string>
-    <string name="email_work" msgid="4223487303344613528">"E-pos werk"</string>
-    <string name="email_other" msgid="4246411900126012062">"E-pos"</string>
-    <string name="email_custom" msgid="7246580894327511013">"E-pos <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="email" msgid="2807318537887091606">"E-pos"</string>
-    <string name="postal_street" msgid="6918171741240802474">"Straat"</string>
-    <string name="postal_city" msgid="8674569121430005628">"Stad"</string>
-    <string name="postal_region" msgid="1730369286225469192">"Staat"</string>
-    <string name="postal_postcode" msgid="4450700741261990439">"Poskode"</string>
-    <string name="postal_country" msgid="232670707458768148">"Land"</string>
-    <string name="map_home" msgid="4181131107392126938">"Bekyk huisadres"</string>
-    <string name="map_work" msgid="5723471185992684400">"Bekyk werkadres"</string>
-    <string name="map_other" msgid="2253764780863500516">"Bekyk adres"</string>
-    <string name="map_custom" msgid="5581743097882436157">"Bekyk <xliff:g id="CUSTOM">%s</xliff:g>-adres"</string>
-    <string name="chat_aim" msgid="2954364435497941659">"Klets met AIM"</string>
-    <string name="chat_msn" msgid="3130135239071228678">"Klets met Windows Live"</string>
-    <string name="chat_yahoo" msgid="3233552142326865347">"Klets met Yahoo"</string>
-    <string name="chat_skype" msgid="6486703981390592425">"Klets met Skype"</string>
-    <string name="chat_qq" msgid="786924280665740019">"Klets met QQ"</string>
-    <string name="chat_gtalk" msgid="7914674177243078035">"Klets met Google Talk"</string>
-    <string name="chat_icq" msgid="3292934726414765801">"Klets met ICQ"</string>
-    <string name="chat_jabber" msgid="6701542313597880204">"Klets met Jabber"</string>
-    <string name="chat" msgid="1020428260359370236">"Klets"</string>
-    <string name="list_filter_all_accounts" msgid="473782314881473992">"Alle kontakte"</string>
-    <string name="listAllContactsInAccount" msgid="3486378621592995630">"Kontakte in <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="listCustomView" msgid="5306282632413086731">"Kontakte in gepasmaakte aansig"</string>
-    <string name="listSingleContact" msgid="8620818791932382627">"Enkel kontak"</string>
-    <string name="display_options_sort_list_by" msgid="3541875948367831228">"Sorteer volgens"</string>
-    <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"Voornaam"</string>
-    <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"Van"</string>
-    <string name="display_options_view_names_as" msgid="4204204205736735618">"Naamformaat"</string>
-    <string name="display_options_view_given_name_first" msgid="2308026973021171020">"Voornaam eerste"</string>
-    <string name="display_options_view_family_name_first" msgid="987430497292428242">"Van eerste"</string>
-    <string name="menu_clear_frequents" msgid="5358271535047496120">"Vee dikwels-gebruiktes uit"</string>
-    <string name="action_menu_back_from_search" msgid="3550669942742167644">"hou op soek"</string>
-    <string name="description_clear_search" msgid="2347258825265600782">"Vee soektog uit"</string>
-    <string name="select_account_dialog_title" msgid="2673504582803359239">"Rekening"</string>
-    <string name="set_default_account" msgid="7966099951006467572">"Gebruik dit altyd vir oproepe"</string>
-    <string name="select_phone_account_for_calls" msgid="1784460686103423274">"Bel met"</string>
-    <string name="call_with_a_note" msgid="6242261320491851133">"Oproep met \'n nota"</string>
-    <string name="call_subject_hint" msgid="7233138753650420800">"Tik \'n nota om saam met oproep te stuur …"</string>
-    <string name="send_and_call_button" msgid="4735168294120154013">"STUUR EN BEL"</string>
-    <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="tab_title" msgid="3387876802026074288">"<xliff:g id="TITLE">%1$s</xliff:g>-oortjie"</string>
-    <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
-      <item quantity="other"> <xliff:g id="TITLE_2">%1$s</xliff:g>-oortjie <xliff:g id="COUNT_3">%2$d</xliff:g> ongelese items. </item>
-      <item quantity="one"> <xliff:g id="TITLE_0">%1$s</xliff:g>-oortjie <xliff:g id="COUNT_1">%2$d</xliff:g> ongelese item. </item>
-    </plurals>
-    <string name="description_search_video_call" msgid="4337369876888024909">"Video-oproep"</string>
-    <string name="description_search_call_and_share" msgid="4912772842755050467">"Deel en bel"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_custom">Bel %s</string>
+  <string name="call_home">Bel huis</string>
+  <string name="call_mobile">Bel selfoon</string>
+  <string name="call_work">Bel werk</string>
+  <string name="call_fax_work">Bel werkfaks</string>
+  <string name="call_fax_home">Bel huisfaks</string>
+  <string name="call_pager">Bel roeper</string>
+  <string name="call_other">Bel</string>
+  <string name="call_callback">Bel terugbel</string>
+  <string name="call_car">Bel motor</string>
+  <string name="call_company_main">Bel maatskappy, hoofnommer</string>
+  <string name="call_isdn">Bel ISDN</string>
+  <string name="call_main">Bel hoofnommer</string>
+  <string name="call_other_fax">Bel faks</string>
+  <string name="call_radio">Bel radio</string>
+  <string name="call_telex">Bel teleks</string>
+  <string name="call_tty_tdd">Bel TTY/TDD</string>
+  <string name="call_work_mobile">Bel werkselfoon</string>
+  <string name="call_work_pager">Bel werkroeper</string>
+  <string name="call_assistant">Bel %s</string>
+  <string name="call_mms">Bel MMS</string>
+  <string name="sms_custom">SMS %s</string>
+  <string name="sms_home">SMS huis</string>
+  <string name="sms_mobile">SMS selfoon</string>
+  <string name="sms_work">SMS werk</string>
+  <string name="sms_fax_work">SMS werkfaks</string>
+  <string name="sms_fax_home">SMS huisfaks</string>
+  <string name="sms_pager">SMS roeper</string>
+  <string name="sms_other">SMS</string>
+  <string name="sms_callback">SMS terugbel</string>
+  <string name="sms_car">SMS motor</string>
+  <string name="sms_company_main">SMS maatskappy, hoofnommer</string>
+  <string name="sms_isdn">SMS ISDN</string>
+  <string name="sms_main">SMS hoofnommer</string>
+  <string name="sms_other_fax">SMS faks</string>
+  <string name="sms_radio">SMS radio</string>
+  <string name="sms_telex">SMS teleks</string>
+  <string name="sms_tty_tdd">SMS TTY/TDD</string>
+  <string name="sms_work_mobile">SMS werkselfoon</string>
+  <string name="sms_work_pager">SMS werkroeper</string>
+  <string name="sms_assistant">SMS %s</string>
+  <string name="sms_mms">SMS MMS</string>
+  <string name="clearFrequentsConfirmation_title">Vee gereeld-gekontaktes uit?</string>
+  <string name="clearFrequentsConfirmation">Jy gaan die gereeld gekontak-lys in die Kontakte- en Foon-program uitvee en e-posprogramme dwing om jou adresvoorkeure van nuuts af te leer.</string>
+  <string name="clearFrequentsProgress_title">Vee tans gereeld-gekontaktes uit...</string>
+  <string name="status_available">Beskikbaar</string>
+  <string name="status_away">Weg</string>
+  <string name="status_busy">Besig</string>
+  <string name="contactsList">Kontakte</string>
+  <string name="contact_suggestions">Topvoorgestel</string>
+  <string name="local_invisible_directory">Ander</string>
+  <string name="directory_search_label">Gids</string>
+  <string name="directory_search_label_work">Werkgids</string>
+  <string name="local_search_label">Alle kontakte</string>
+  <string name="local_suggestions_search_label">Voorstelle</string>
+  <string msgid="9154761216179882405" name="user_profile_contacts_list_header">Ek</string>
+  <string name="missing_name">(Geen naam nie)</string>
+  <string msgid="2795575601596468581" name="description_view_contact_detail">Bekyk kontak</string>
+  <string name="list_filter_phones">Alle kontakte met foonnommers</string>
+  <string name="list_filter_phones_work">Werkprofielkontakte</string>
+  <string name="view_updates_from_group">Bekyk opdaterings</string>
+  <string name="account_phone">Slegs toestel, ongesinkroniseerd</string>
+  <string name="nameLabelsGroup">Naam</string>
+  <string name="nicknameLabelsGroup">Bynaam</string>
+  <string name="full_name">Naam</string>
+  <string name="name_given">Voornaam</string>
+  <string name="name_family">Van</string>
+  <string name="name_prefix">Naamvoorvoegsel</string>
+  <string name="name_middle">Middelnaam</string>
+  <string name="name_suffix">Naamagtervoegsel</string>
+  <string name="name_phonetic">Fonetiese naam</string>
+  <string name="name_phonetic_given">Fonetiese voornaam</string>
+  <string name="name_phonetic_middle">Fonetiese middelnaam</string>
+  <string name="name_phonetic_family">Fonetiese van</string>
+  <string name="phoneLabelsGroup">Foon</string>
+  <string name="emailLabelsGroup">E-pos</string>
+  <string name="postalLabelsGroup">Adres</string>
+  <string name="imLabelsGroup">IM</string>
+  <string name="organizationLabelsGroup">Organisasie</string>
+  <string name="relationLabelsGroup">Verhouding</string>
+  <string name="eventLabelsGroup">Spesiale datum</string>
+  <string name="sms">Teksboodskap</string>
+  <string name="postal_address">Adres</string>
+  <string name="ghostData_company">Maatskappy</string>
+  <string name="ghostData_title">Titel</string>
+  <string name="label_notes">Notas</string>
+  <string name="label_sip_address">SIP</string>
+  <string name="websiteLabelsGroup">Webwerf</string>
+  <string name="groupsLabel">Groepe</string>
+  <string name="email_home">E-postuis</string>
+  <string name="email_mobile">E-pos mobiel</string>
+  <string name="email_work">E-pos werk</string>
+  <string name="email_other">E-pos</string>
+  <string name="email_custom">E-pos %s</string>
+  <string name="email">E-pos</string>
+  <string name="postal_street">Straat</string>
+  <string name="postal_city">Stad</string>
+  <string name="postal_region">Staat</string>
+  <string name="postal_postcode">Poskode</string>
+  <string name="postal_country">Land</string>
+  <string name="map_home">Bekyk huisadres</string>
+  <string name="map_work">Bekyk werkadres</string>
+  <string name="map_other">Bekyk adres</string>
+  <string name="map_custom">Bekyk %s-adres</string>
+  <string name="chat_aim">Klets met AIM</string>
+  <string name="chat_msn">Klets met Windows Live</string>
+  <string name="chat_yahoo">Klets met Yahoo</string>
+  <string name="chat_skype">Klets met Skype</string>
+  <string name="chat_qq">Klets met QQ</string>
+  <string name="chat_gtalk">Klets met Google Talk</string>
+  <string name="chat_icq">Klets met ICQ</string>
+  <string name="chat_jabber">Klets met Jabber</string>
+  <string name="chat">Klets</string>
+  <string name="list_filter_all_accounts">Alle kontakte</string>
+  <string name="listAllContactsInAccount">Kontakte in %s</string>
+  <string name="listCustomView">Kontakte in gepasmaakte aansig</string>
+  <string name="listSingleContact">Enkel kontak</string>
+  <string name="display_options_sort_list_by">Sorteer volgens</string>
+  <string name="display_options_sort_by_given_name">Voornaam</string>
+  <string name="display_options_sort_by_family_name">Van</string>
+  <string name="display_options_view_names_as">Naamformaat</string>
+  <string name="display_options_view_given_name_first">Voornaam eerste</string>
+  <string name="display_options_view_family_name_first">Van eerste</string>
+  <string name="menu_clear_frequents">Vee dikwels-gebruiktes uit</string>
+  <string name="action_menu_back_from_search">hou op soek</string>
+  <string name="description_clear_search">Vee soektog uit</string>
+  <string name="select_account_dialog_title">Rekening</string>
+  <string name="set_default_account">Gebruik dit altyd vir oproepe</string>
+  <string name="select_phone_account_for_calls">Kies SIM vir hierdie oproep</string>
+  <string name="select_phone_account_for_calls_remember">Onthou hierdie keuse</string>
+  <string name="call_with_a_note">Oproep met \'n nota</string>
+  <string name="call_subject_hint">Tik \'n nota om saam met oproep te stuur …</string>
+  <string name="send_and_call_button">STUUR EN BEL</string>
+  <string name="call_subject_limit">%1$s / %2$s</string>
+  <string name="old_call_subject_type_and_number">%1$s %2$s</string>
+  <string name="tab_title">%1$s-oortjie</string>
+  <plurals name="tab_title_with_unread_items">
+    <item quantity="one"> %1$s-oortjie %2$d ongelese item. </item>
+    <item quantity="other"> %1$s-oortjie %2$d ongelese items. </item>
+  </plurals>
+  <string name="description_search_video_call">Video-oproep</string>
+  <string name="description_search_call_and_share">Deel en bel</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-am/strings.xml b/java/com/android/contacts/common/res/values-am/strings.xml
index 71399fa..aa7b19c 100644
--- a/java/com/android/contacts/common/res/values-am/strings.xml
+++ b/java/com/android/contacts/common/res/values-am/strings.xml
@@ -1,162 +1,145 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="toast_text_copied" msgid="8979281391599667362">"ፅሁፍ ገልብጧል"</string>
-    <string name="call_custom" msgid="3041673234638990874">"ለ<xliff:g id="CUSTOM">%s</xliff:g> ይደውሉ"</string>
-    <string name="call_home" msgid="125893483593803791">"ለቤት ይደውሉ"</string>
-    <string name="call_mobile" msgid="967589404494150813">"ለተንቀሳቃሽ ስልክ ይደውሉ"</string>
-    <string name="call_work" msgid="6040550697395300892">"ለሥራ ይደውሉ"</string>
-    <string name="call_fax_work" msgid="5260192771364592922">"ለስራ ፋክስ ይደውሉ"</string>
-    <string name="call_fax_home" msgid="5174311195081144124">"ለቤት ፋክስ ይደውሉ"</string>
-    <string name="call_pager" msgid="6814149227741274161">"ለምልክት ማድረጊያ ይደውሉ"</string>
-    <string name="call_other" msgid="5536385588712587235">"ይደውሉ"</string>
-    <string name="call_callback" msgid="6314019862718112786">"የጥሪ መልስ ይደውሉ"</string>
-    <string name="call_car" msgid="3197417098027764954">"ለመኪና ይደውሉ"</string>
-    <string name="call_company_main" msgid="2557663310028446397">"ለዋናው የኩባኒያ ይደውሉ"</string>
-    <string name="call_isdn" msgid="4691270442763649522">"ለISDN ይደውሉ"</string>
-    <string name="call_main" msgid="3293707608770407814">"ለዋናው ይደውሉ"</string>
-    <string name="call_other_fax" msgid="4724521984879021465">"ለፋክስ ይደውሉ"</string>
-    <string name="call_radio" msgid="8942441419845057942">"ለሬዲዮ ይደውሉ"</string>
-    <string name="call_telex" msgid="2031514461660668351">"ለቴሌክስ ይደውሉ"</string>
-    <string name="call_tty_tdd" msgid="7807210224965727701">"ለTTY/TDD ይደውሉ"</string>
-    <string name="call_work_mobile" msgid="2716342732938578495">"ለየስራ ተንቀሳቃሽ ስልክ ይደውሉ"</string>
-    <string name="call_work_pager" msgid="3791778749827366574">"ለየሥራ ጥሪ ምልክት ማድረጊያ ይደውሉ"</string>
-    <string name="call_assistant" msgid="4177478845473789294">"ለ<xliff:g id="ASSISTANT">%s</xliff:g> ይደውሉ"</string>
-    <string name="call_mms" msgid="4958811711741872901">"ለኤም ኤም ኤስ ይደውሉ"</string>
-    <string name="sms_custom" msgid="8785368968605026317">"ለ<xliff:g id="CUSTOM">%s</xliff:g> ጽሑፍ ይላኩ"</string>
-    <string name="sms_home" msgid="3527719551060295243">"ለቤት ጽሑፍ ይላኩ"</string>
-    <string name="sms_mobile" msgid="8883045857887736518">"ለተንቀሳቃሽ ስልክ ጽሑፍ ይላኩ"</string>
-    <string name="sms_work" msgid="4158595439553450966">"ለስራ ጽሑፍ ይላኩ"</string>
-    <string name="sms_fax_work" msgid="5483726627718055248">"ለስራ ፋክስ ጽሑፍ ይላኩ"</string>
-    <string name="sms_fax_home" msgid="9219265155770746077">"ለቤት ፋክስ ጽሑፍ ይላኩ"</string>
-    <string name="sms_pager" msgid="4901085068525193933">"ለምልክት ማድረጊያ ጽሑፍ ይላኩ"</string>
-    <string name="sms_other" msgid="1742702947993285933">"ጽሑፍ ይላኩ"</string>
-    <string name="sms_callback" msgid="5833483630377538308">"ለጥሪ መልስ ጽሑፍ ይላኩ"</string>
-    <string name="sms_car" msgid="4314577266154395174">"ለመኪና ጽሑፍ ይላኩ"</string>
-    <string name="sms_company_main" msgid="2308160928487360705">"ለዋናው ኩባኒያ ጽሑፍ ይላኩ"</string>
-    <string name="sms_isdn" msgid="6394300346179302542">"ለISDN ጽሑፍ ይላኩ"</string>
-    <string name="sms_main" msgid="8908087742014140774">"ለዋናው ጽሑፍ ይላኩ"</string>
-    <string name="sms_other_fax" msgid="8768455473295405427">"ለፋክስ ጽሑፍ ይላኩ"</string>
-    <string name="sms_radio" msgid="855555176531704682">"ለሬዲዮ ጽሑፍ ይላኩ"</string>
-    <string name="sms_telex" msgid="6269029276223252719">"ለቴለክስ ጽሑፍ ይላኩ"</string>
-    <string name="sms_tty_tdd" msgid="6229057354509192444">"ለTTY/TDD ጽሑፍ ይላኩ"</string>
-    <string name="sms_work_mobile" msgid="2155975469329969840">"ለስራ ተንቀሳቃሽ ስልክ ጽሑፍ ይላኩ"</string>
-    <string name="sms_work_pager" msgid="8500140274906830742">"ለሥራ ምልክት ማድረጊያ ጽሑፍ ይላኩ"</string>
-    <string name="sms_assistant" msgid="8513548482745330818">"ለ<xliff:g id="ASSISTANT">%s</xliff:g> ጽሑፍ ይላኩ"</string>
-    <string name="sms_mms" msgid="5187888900503248542">"ለኤም ኤም ኤስ ጽሑፍ ይላኩ"</string>
-    <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"በተደጋጋሚ የተገኙ ይጽዱ?"</string>
-    <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"በእውቂያዎች እና በስልክ መተግበሪያዎች ውስጥ በተደጋጋሚ ያገኟቸውን ዝርዝር አጽድተው የኢሜይል መተግበሪያዎች ምርጫዎችዎን ከባዶ ተነስተው እንዲያውቁ ያስገድዱዋቸዋል።"</string>
-    <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"በተደጋጋሚ የተገኙትን በማጽዳት ላይ…"</string>
-    <string name="status_available" msgid="2648156525685472626">"የሚገኝ"</string>
-    <string name="status_away" msgid="2298688367552893953">"ወጣ ብሏል"</string>
-    <string name="status_busy" msgid="5990832098713248503">"ተይዟል"</string>
-    <string name="contactsList" msgid="8806067891419291513">"እውቅያዎች"</string>
-    <string name="contact_suggestions" msgid="3324166754807120006">"በብዛት የተጠቆሙ"</string>
-    <string name="local_invisible_directory" msgid="4723238462733650090">"ሌላ"</string>
-    <string name="directory_search_label" msgid="4621215895484025229">"ማውጫ"</string>
-    <string name="directory_search_label_work" msgid="7679326282707414897">"የሥራ ስልክ ማውጫ"</string>
-    <string name="local_search_label" msgid="907622822323119235">"ሁሉም እውቅያዎች"</string>
-    <string name="local_suggestions_search_label" msgid="1178575146224386118">"ጥቆማዎች"</string>
-    <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"እኔ"</string>
-    <string name="missing_name" msgid="978606963362745020">"(ስም የለም)"</string>
-    <string name="description_view_contact_detail" msgid="2428742401208561136">"ዕውቂያ ተመልከት"</string>
-    <string name="list_filter_phones" msgid="8763316061763437182">"የስልክ ቁጥር ያላቸው ሁሉም ዕውቂያዎች"</string>
-    <string name="list_filter_phones_work" msgid="7083575404573422965">"የሥራ መገለጫ ዕውቂያዎች"</string>
-    <string name="view_updates_from_group" msgid="9011641093168385729">"ዝማኔዎችን ይመልከቱ"</string>
-    <string name="account_phone" msgid="7067809073194061035">"መሳሪያ-ብቻ፣ አልሰመረም"</string>
-    <string name="nameLabelsGroup" msgid="7730465833159557471">"ስም"</string>
-    <string name="nicknameLabelsGroup" msgid="6310556912361840029">"ቅጽል ስም"</string>
-    <string name="full_name" msgid="648186563998465740">"ስም"</string>
-    <string name="name_given" msgid="5096576006314820536">"የመጀመሪያ ስም"</string>
-    <string name="name_family" msgid="6646235805198547467">"የመጨረሻ ስም"</string>
-    <string name="name_prefix" msgid="9215326539658838">"ቅድመ-ስም"</string>
-    <string name="name_middle" msgid="703755205331582769">"የመካከለኛ ስም"</string>
-    <string name="name_suffix" msgid="5777083390282548702">"ድህረ-ስም"</string>
-    <string name="name_phonetic" msgid="1650870996361663089">"የድምፀ ልሳን ስም"</string>
-    <string name="name_phonetic_given" msgid="618812334274603170">"የመጀመሪያ ስም ፎነቲክ"</string>
-    <string name="name_phonetic_middle" msgid="4826820763384625538">"የድምፀ ልሳን መካከለኛ ስም"</string>
-    <string name="name_phonetic_family" msgid="379905191212930771">"የመጨረሻ ስም ፎነቲክ"</string>
-    <string name="phoneLabelsGroup" msgid="169661929021355548">"ስልክ"</string>
-    <string name="emailLabelsGroup" msgid="2249752810477488833">"ኢሜይል"</string>
-    <string name="postalLabelsGroup" msgid="6772000590189142253">"አድራሻ"</string>
-    <string name="imLabelsGroup" msgid="5718066254237364731">"IM"</string>
-    <string name="organizationLabelsGroup" msgid="1101996309241601435">"መስርያ ቤት"</string>
-    <string name="relationLabelsGroup" msgid="53866051664600053">"ግንኙነት"</string>
-    <string name="eventLabelsGroup" msgid="1236970042646618489">"ልዩ ቀን"</string>
-    <string name="sms" msgid="7574344928185328095">"የፅሁፍ መልዕክት"</string>
-    <string name="postal_address" msgid="1804707930129674200">"አድራሻ"</string>
-    <string name="ghostData_company" msgid="2554310786296833424">"ኩባንያ"</string>
-    <string name="ghostData_title" msgid="4994968731830184837">"ርዕስ"</string>
-    <string name="label_notes" msgid="2050255313694219786">"ማስታወሻዎች"</string>
-    <string name="label_sip_address" msgid="8883266182575965926">"SIP"</string>
-    <string name="websiteLabelsGroup" msgid="1630734286462186790">"ድረ-ገፅ"</string>
-    <string name="groupsLabel" msgid="2694002798416868728">"ቡድኖች"</string>
-    <string name="email_home" msgid="889830029388962171">"ለቤት ኢሜይል ይላኩ"</string>
-    <string name="email_mobile" msgid="4487686436743741150">"ለተንቀሳቃሽ ስልክ ኢሜይል ይላኩ"</string>
-    <string name="email_work" msgid="4223487303344613528">"ለሥራ ኢሜይል ይላኩ"</string>
-    <string name="email_other" msgid="4246411900126012062">"ኢሜይል"</string>
-    <string name="email_custom" msgid="7246580894327511013">"ለ<xliff:g id="CUSTOM">%s</xliff:g> ኢሜይል ይላኩ"</string>
-    <string name="email" msgid="2807318537887091606">"ኢሜይል"</string>
-    <string name="postal_street" msgid="6918171741240802474">"መንገድ"</string>
-    <string name="postal_city" msgid="8674569121430005628">"ከተማ"</string>
-    <string name="postal_region" msgid="1730369286225469192">"ግዛት"</string>
-    <string name="postal_postcode" msgid="4450700741261990439">"ዚፕ ኮድ"</string>
-    <string name="postal_country" msgid="232670707458768148">"አገር"</string>
-    <string name="map_home" msgid="4181131107392126938">"የቤት አድራሻ ይመልከቱ"</string>
-    <string name="map_work" msgid="5723471185992684400">"የሥራ አድራሻ ይመልከቱ"</string>
-    <string name="map_other" msgid="2253764780863500516">"አድራሻ ይመልከቱ"</string>
-    <string name="map_custom" msgid="5581743097882436157">"የ<xliff:g id="CUSTOM">%s</xliff:g> አድራሻ ይመልከቱ"</string>
-    <string name="chat_aim" msgid="2954364435497941659">"AIMን በመጠቀም ይወያዩ"</string>
-    <string name="chat_msn" msgid="3130135239071228678">"Windows Liveን በመጠቀም ይወያዩ"</string>
-    <string name="chat_yahoo" msgid="3233552142326865347">"Yahooን በመጠቀም ይወያዩ"</string>
-    <string name="chat_skype" msgid="6486703981390592425">"Skypeን በመጠቀም ይወያዩ"</string>
-    <string name="chat_qq" msgid="786924280665740019">"QQን በመጠቀም ይወያዩ"</string>
-    <string name="chat_gtalk" msgid="7914674177243078035">"Google Talkን በመጠቀም ይወያዩ"</string>
-    <string name="chat_icq" msgid="3292934726414765801">"ICQን በመጠቀም ይወያዩ"</string>
-    <string name="chat_jabber" msgid="6701542313597880204">"Jabberን በመጠቀም 271448"</string>
-    <string name="chat" msgid="1020428260359370236">"ውይይት"</string>
-    <string name="list_filter_all_accounts" msgid="473782314881473992">"ሁሉም ዕውቂያዎች"</string>
-    <string name="listAllContactsInAccount" msgid="3486378621592995630">"በ<xliff:g id="NAME">%s</xliff:g> ውስጥ ያሉ ዕውቂያዎች"</string>
-    <string name="listCustomView" msgid="5306282632413086731">"እውቂያዎች በብጁ እይታ"</string>
-    <string name="listSingleContact" msgid="8620818791932382627">"ነጠላ እውቂያ"</string>
-    <string name="display_options_sort_list_by" msgid="3541875948367831228">"ደርድር በ"</string>
-    <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"የመጀመሪያ ስም"</string>
-    <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"የመጨረሻ ስም"</string>
-    <string name="display_options_view_names_as" msgid="4204204205736735618">"የስም ቅርጸት"</string>
-    <string name="display_options_view_given_name_first" msgid="2308026973021171020">"የመጀመሪያ ስም መጀመሪያ"</string>
-    <string name="display_options_view_family_name_first" msgid="987430497292428242">"የመጨረሻ ስም መጀመሪያ"</string>
-    <string name="menu_clear_frequents" msgid="5358271535047496120">"ተደጋጋሚዎችን አጽዳ"</string>
-    <string name="action_menu_back_from_search" msgid="3550669942742167644">"መፈለግ አቁም"</string>
-    <string name="description_clear_search" msgid="2347258825265600782">"ፍለጋን አጽዳ"</string>
-    <string name="select_account_dialog_title" msgid="2673504582803359239">"መለያ"</string>
-    <string name="set_default_account" msgid="7966099951006467572">"ለጥሪዎች ሁልጊዜ ይህንን ተጠቀም"</string>
-    <string name="select_phone_account_for_calls" msgid="1784460686103423274">"ይደውሉ ከዚህ ጋር"</string>
-    <string name="call_with_a_note" msgid="6242261320491851133">"ከማስታወሻ ጋር ደውል"</string>
-    <string name="call_subject_hint" msgid="7233138753650420800">"ከጥሪ ጋር ለመላክ የማስታወሻ ጽሑፍ ይተይቡ ..."</string>
-    <string name="send_and_call_button" msgid="4735168294120154013">"ላክ እና ደውል"</string>
-    <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g><xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="tab_title" msgid="3387876802026074288">"የ<xliff:g id="TITLE">%1$s</xliff:g> ትር።"</string>
-    <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
-      <item quantity="one"> የ<xliff:g id="TITLE_2">%1$s</xliff:g> ትር። <xliff:g id="COUNT_3">%2$d</xliff:g> ያልተነበቡ ንጥሎች። </item>
-      <item quantity="other"> የ<xliff:g id="TITLE_2">%1$s</xliff:g> ትር። <xliff:g id="COUNT_3">%2$d</xliff:g> ያልተነበቡ ንጥሎች። </item>
-    </plurals>
-    <string name="description_search_video_call" msgid="4337369876888024909">"የቪዲዮ ጥሪ"</string>
-    <string name="description_search_call_and_share" msgid="4912772842755050467">"ያጋሩ እና ይደውሉ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_custom">ለ%s ይደውሉ</string>
+  <string name="call_home">ለቤት ይደውሉ</string>
+  <string name="call_mobile">ለተንቀሳቃሽ ስልክ ይደውሉ</string>
+  <string name="call_work">ለሥራ ይደውሉ</string>
+  <string name="call_fax_work">ለስራ ፋክስ ይደውሉ</string>
+  <string name="call_fax_home">ለቤት ፋክስ ይደውሉ</string>
+  <string name="call_pager">ለምልክት ማድረጊያ ይደውሉ</string>
+  <string name="call_other">ይደውሉ</string>
+  <string name="call_callback">የጥሪ መልስ ይደውሉ</string>
+  <string name="call_car">ለመኪና ይደውሉ</string>
+  <string name="call_company_main">ለዋናው የኩባኒያ ይደውሉ</string>
+  <string name="call_isdn">ለISDN ይደውሉ</string>
+  <string name="call_main">ለዋናው ይደውሉ</string>
+  <string name="call_other_fax">ለፋክስ ይደውሉ</string>
+  <string name="call_radio">ለሬዲዮ ይደውሉ</string>
+  <string name="call_telex">ለቴሌክስ ይደውሉ</string>
+  <string name="call_tty_tdd">ለTTY/TDD ይደውሉ</string>
+  <string name="call_work_mobile">ለየስራ ተንቀሳቃሽ ስልክ ይደውሉ</string>
+  <string name="call_work_pager">ለየሥራ ጥሪ ምልክት ማድረጊያ ይደውሉ</string>
+  <string name="call_assistant">ለ%s ይደውሉ</string>
+  <string name="call_mms">ለኤም ኤም ኤስ ይደውሉ</string>
+  <string name="sms_custom">ለ%s ጽሑፍ ይላኩ</string>
+  <string name="sms_home">ለቤት ጽሑፍ ይላኩ</string>
+  <string name="sms_mobile">ለተንቀሳቃሽ ስልክ ጽሑፍ ይላኩ</string>
+  <string name="sms_work">ለስራ ጽሑፍ ይላኩ</string>
+  <string name="sms_fax_work">ለስራ ፋክስ ጽሑፍ ይላኩ</string>
+  <string name="sms_fax_home">ለቤት ፋክስ ጽሑፍ ይላኩ</string>
+  <string name="sms_pager">ለምልክት ማድረጊያ ጽሑፍ ይላኩ</string>
+  <string name="sms_other">ጽሑፍ ይላኩ</string>
+  <string name="sms_callback">ለጥሪ መልስ ጽሑፍ ይላኩ</string>
+  <string name="sms_car">ለመኪና ጽሑፍ ይላኩ</string>
+  <string name="sms_company_main">ለዋናው ኩባኒያ ጽሑፍ ይላኩ</string>
+  <string name="sms_isdn">ለISDN ጽሑፍ ይላኩ</string>
+  <string name="sms_main">ለዋናው ጽሑፍ ይላኩ</string>
+  <string name="sms_other_fax">ለፋክስ ጽሑፍ ይላኩ</string>
+  <string name="sms_radio">ለሬዲዮ ጽሑፍ ይላኩ</string>
+  <string name="sms_telex">ለቴለክስ ጽሑፍ ይላኩ</string>
+  <string name="sms_tty_tdd">ለTTY/TDD ጽሑፍ ይላኩ</string>
+  <string name="sms_work_mobile">ለስራ ተንቀሳቃሽ ስልክ ጽሑፍ ይላኩ</string>
+  <string name="sms_work_pager">ለሥራ ምልክት ማድረጊያ ጽሑፍ ይላኩ</string>
+  <string name="sms_assistant">ለ%s ጽሑፍ ይላኩ</string>
+  <string name="sms_mms">ለኤም ኤም ኤስ ጽሑፍ ይላኩ</string>
+  <string name="clearFrequentsConfirmation_title">በተደጋጋሚ የተገኙ ይጽዱ?</string>
+  <string name="clearFrequentsConfirmation">በእውቂያዎች እና በስልክ መተግበሪያዎች ውስጥ በተደጋጋሚ ያገኟቸውን ዝርዝር አጽድተው የኢሜይል መተግበሪያዎች ምርጫዎችዎን ከባዶ ተነስተው እንዲያውቁ ያስገድዱዋቸዋል።</string>
+  <string name="clearFrequentsProgress_title">በተደጋጋሚ የተገኙትን በማጽዳት ላይ…</string>
+  <string name="status_available">የሚገኝ</string>
+  <string name="status_away">ወጣ ብሏል</string>
+  <string name="status_busy">ተይዟል</string>
+  <string name="contactsList">እውቅያዎች   </string>
+  <string name="contact_suggestions">በብዛት የተጠቆሙ</string>
+  <string name="local_invisible_directory">ሌላ  </string>
+  <string name="directory_search_label">ማውጫ</string>
+  <string name="directory_search_label_work">የሥራ ስልክ ማውጫ</string>
+  <string name="local_search_label">ሁሉም እውቅያዎች </string>
+  <string name="local_suggestions_search_label">ጥቆማዎች</string>
+  <string msgid="9154761216179882405" name="user_profile_contacts_list_header">እኔ</string>
+  <string name="missing_name">(ስም የለም)</string>
+  <string msgid="2795575601596468581" name="description_view_contact_detail">ዕውቂያ ተመልከት</string>
+  <string name="list_filter_phones">የስልክ ቁጥር ያላቸው ሁሉም ዕውቂያዎች</string>
+  <string name="list_filter_phones_work">የሥራ መገለጫ ዕውቂያዎች</string>
+  <string name="view_updates_from_group">ዝማኔዎችን ይመልከቱ</string>
+  <string name="account_phone">መሳሪያ-ብቻ፣ አልሰመረም</string>
+  <string name="nameLabelsGroup">ስም</string>
+  <string name="nicknameLabelsGroup">ቅጽል ስም</string>
+  <string name="full_name">ስም   </string>
+  <string name="name_given">የመጀመሪያ ስም</string>
+  <string name="name_family">የመጨረሻ ስም</string>
+  <string name="name_prefix">ቅድመ-ስም</string>
+  <string name="name_middle">የመካከለኛ ስም</string>
+  <string name="name_suffix">ድህረ-ስም</string>
+  <string name="name_phonetic">የድምፀ ልሳን ስም</string>
+  <string name="name_phonetic_given">የመጀመሪያ ስም ፎነቲክ</string>
+  <string name="name_phonetic_middle">የድምፀ ልሳን መካከለኛ ስም</string>
+  <string name="name_phonetic_family">የመጨረሻ ስም ፎነቲክ</string>
+  <string name="phoneLabelsGroup">ስልክ  </string>
+  <string name="emailLabelsGroup">ኢሜይል</string>
+  <string name="postalLabelsGroup">አድራሻ</string>
+  <string name="imLabelsGroup">IM</string>
+  <string name="organizationLabelsGroup">መስርያ ቤት </string>
+  <string name="relationLabelsGroup">ግንኙነት</string>
+  <string name="eventLabelsGroup">ልዩ ቀን</string>
+  <string name="sms">የፅሁፍ መልዕክት</string>
+  <string name="postal_address">አድራሻ</string>
+  <string name="ghostData_company">ኩባንያ</string>
+  <string name="ghostData_title">ርዕስ</string>
+  <string name="label_notes">ማስታወሻዎች</string>
+  <string name="label_sip_address">SIP</string>
+  <string name="websiteLabelsGroup">ድረ-ገፅ</string>
+  <string name="groupsLabel">ቡድኖች</string>
+  <string name="email_home">ለቤት ኢሜይል ይላኩ</string>
+  <string name="email_mobile">ለተንቀሳቃሽ ስልክ ኢሜይል ይላኩ</string>
+  <string name="email_work">ለሥራ ኢሜይል ይላኩ</string>
+  <string name="email_other">ኢሜይል</string>
+  <string name="email_custom">ለ%s ኢሜይል ይላኩ</string>
+  <string name="email">ኢሜይል</string>
+  <string name="postal_street">መንገድ</string>
+  <string name="postal_city">ከተማ</string>
+  <string name="postal_region">ግዛት</string>
+  <string name="postal_postcode">ዚፕ ኮድ</string>
+  <string name="postal_country">አገር</string>
+  <string name="map_home">የቤት አድራሻ ይመልከቱ</string>
+  <string name="map_work">የሥራ አድራሻ ይመልከቱ</string>
+  <string name="map_other">አድራሻ ይመልከቱ</string>
+  <string name="map_custom">የ%s አድራሻ ይመልከቱ</string>
+  <string name="chat_aim">AIMን በመጠቀም ይወያዩ</string>
+  <string name="chat_msn">Windows Liveን በመጠቀም ይወያዩ</string>
+  <string name="chat_yahoo">Yahooን በመጠቀም ይወያዩ</string>
+  <string name="chat_skype">Skypeን በመጠቀም ይወያዩ</string>
+  <string name="chat_qq">QQን በመጠቀም ይወያዩ</string>
+  <string name="chat_gtalk">Google Talkን በመጠቀም ይወያዩ</string>
+  <string name="chat_icq">ICQን በመጠቀም ይወያዩ</string>
+  <string name="chat_jabber">Jabberን በመጠቀም 271448</string>
+  <string name="chat">ውይይት</string>
+  <string name="list_filter_all_accounts">ሁሉም ዕውቂያዎች</string>
+  <string name="listAllContactsInAccount">በ%s ውስጥ ያሉ ዕውቂያዎች</string>
+  <string name="listCustomView">እውቂያዎች በብጁ እይታ</string>
+  <string name="listSingleContact">ነጠላ እውቂያ</string>
+  <string name="display_options_sort_list_by">ደርድር በ</string>
+  <string name="display_options_sort_by_given_name">የመጀመሪያ ስም</string>
+  <string name="display_options_sort_by_family_name">የመጨረሻ ስም</string>
+  <string name="display_options_view_names_as">የስም ቅርጸት</string>
+  <string name="display_options_view_given_name_first">የመጀመሪያ ስም መጀመሪያ</string>
+  <string name="display_options_view_family_name_first">የመጨረሻ ስም መጀመሪያ</string>
+  <string name="menu_clear_frequents">ተደጋጋሚዎችን አጽዳ</string>
+  <string name="action_menu_back_from_search">መፈለግ አቁም</string>
+  <string name="description_clear_search">ፍለጋን አጽዳ</string>
+  <string name="select_account_dialog_title">መለያ</string>
+  <string name="set_default_account">ለጥሪዎች ሁልጊዜ ይህንን ተጠቀም</string>
+  <string name="select_phone_account_for_calls">ለዚህ ጥሪ ሲም ይምረጡ</string>
+  <string name="select_phone_account_for_calls_remember">ይህን ምርጫ አስታውስ</string>
+  <string name="call_with_a_note">ከማስታወሻ ጋር ደውል</string>
+  <string name="call_subject_hint">ከጥሪ ጋር ለመላክ የማስታወሻ ጽሑፍ ይተይቡ ...</string>
+  <string name="send_and_call_button">ላክ እና ደውል</string>
+  <string name="call_subject_limit">%1$s / %2$s</string>
+  <string name="old_call_subject_type_and_number">%1$s %2$s</string>
+  <string name="tab_title">የ%1$s ትር።</string>
+  <plurals name="tab_title_with_unread_items">
+    <item quantity="one"> የ%1$s ትር። %2$d ያልተነበቡ ንጥሎች። </item>
+    <item quantity="other"> የ%1$s ትር። %2$d ያልተነበቡ ንጥሎች። </item>
+  </plurals>
+  <string name="description_search_video_call">የቪዲዮ ጥሪ</string>
+  <string name="description_search_call_and_share">ያጋሩ እና ይደውሉ</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-ar/strings.xml b/java/com/android/contacts/common/res/values-ar/strings.xml
index fba65e3..957a3e7 100644
--- a/java/com/android/contacts/common/res/values-ar/strings.xml
+++ b/java/com/android/contacts/common/res/values-ar/strings.xml
@@ -1,166 +1,149 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="toast_text_copied" msgid="8979281391599667362">"تم نسخ النص"</string>
-    <string name="call_custom" msgid="3041673234638990874">"الاتصال بـ <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="call_home" msgid="125893483593803791">"الاتصال بهاتف منزلي"</string>
-    <string name="call_mobile" msgid="967589404494150813">"الاتصال بالجوال"</string>
-    <string name="call_work" msgid="6040550697395300892">"الاتصال بهاتف العمل"</string>
-    <string name="call_fax_work" msgid="5260192771364592922">"الاتصال بفاكس العمل"</string>
-    <string name="call_fax_home" msgid="5174311195081144124">"الاتصال بفاكس المنزل"</string>
-    <string name="call_pager" msgid="6814149227741274161">"الاتصال بجهاز النداء"</string>
-    <string name="call_other" msgid="5536385588712587235">"اتصال"</string>
-    <string name="call_callback" msgid="6314019862718112786">"الاتصال برقم معادوة الاتصال"</string>
-    <string name="call_car" msgid="3197417098027764954">"الاتصال بهاتف السيارة"</string>
-    <string name="call_company_main" msgid="2557663310028446397">"الاتصال بهاتف الشركة الرئيسي"</string>
-    <string name="call_isdn" msgid="4691270442763649522">"‏اتصال بـ ISDN"</string>
-    <string name="call_main" msgid="3293707608770407814">"الاتصال بالهاتف الرئيسي"</string>
-    <string name="call_other_fax" msgid="4724521984879021465">"الاتصال برقم الفاكس"</string>
-    <string name="call_radio" msgid="8942441419845057942">"اتصال بهاتف لاسلكي"</string>
-    <string name="call_telex" msgid="2031514461660668351">"الاتصال بالتلكس"</string>
-    <string name="call_tty_tdd" msgid="7807210224965727701">"‏اتصال بـ TTY/TDD"</string>
-    <string name="call_work_mobile" msgid="2716342732938578495">"الاتصال بجوال العمل"</string>
-    <string name="call_work_pager" msgid="3791778749827366574">"الاتصال بجهاز نداء العمل"</string>
-    <string name="call_assistant" msgid="4177478845473789294">"الاتصال بـ <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
-    <string name="call_mms" msgid="4958811711741872901">"اتصال بهاتف رسائل الوسائط المتعددة"</string>
-    <string name="sms_custom" msgid="8785368968605026317">"إرسال رسالة نصية إلى <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="sms_home" msgid="3527719551060295243">"إرسال رسالة نصية إلى هاتف منزلي"</string>
-    <string name="sms_mobile" msgid="8883045857887736518">"إرسال رسالة نصية إلى جوال"</string>
-    <string name="sms_work" msgid="4158595439553450966">"إرسال رسالة نصية إلى هاتف العمل"</string>
-    <string name="sms_fax_work" msgid="5483726627718055248">"إرسال رسالة نصية إلى فاكس العمل"</string>
-    <string name="sms_fax_home" msgid="9219265155770746077">"إرسال رسالة نصية إلى فاكس المنزل"</string>
-    <string name="sms_pager" msgid="4901085068525193933">"إرسال رسالة نصية إلى جهاز النداء"</string>
-    <string name="sms_other" msgid="1742702947993285933">"إرسال رسالة نصية"</string>
-    <string name="sms_callback" msgid="5833483630377538308">"إرسال رسالة نصية إلى هاتف معاودة الاتصال"</string>
-    <string name="sms_car" msgid="4314577266154395174">"إرسال رسالة نصية إلى هاتف السيارة"</string>
-    <string name="sms_company_main" msgid="2308160928487360705">"إرسال رسالة نصية إلى الهاتف الرئيسي للشركة"</string>
-    <string name="sms_isdn" msgid="6394300346179302542">"‏إرسال رسالة نصية إلى ISDN"</string>
-    <string name="sms_main" msgid="8908087742014140774">"إرسال رسالة نصية إلى الهاتف الرئيسي"</string>
-    <string name="sms_other_fax" msgid="8768455473295405427">"إرسال رسالة نصية إلى فاكس"</string>
-    <string name="sms_radio" msgid="855555176531704682">"إرسال رسالة نصية إلى هاتف لاسلكي"</string>
-    <string name="sms_telex" msgid="6269029276223252719">"إرسال رسالة نصية إلى هاتف تلكس"</string>
-    <string name="sms_tty_tdd" msgid="6229057354509192444">"‏إرسال رسالة نصية إلى TTY/TDD"</string>
-    <string name="sms_work_mobile" msgid="2155975469329969840">"إرسال رسالة نصية إلى جوال العمل"</string>
-    <string name="sms_work_pager" msgid="8500140274906830742">"إرسال رسالة نصية إلى جهاز نداء العمل"</string>
-    <string name="sms_assistant" msgid="8513548482745330818">"إرسال رسالة نصية إلى <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
-    <string name="sms_mms" msgid="5187888900503248542">"إرسال رسالة نصية إلى هاتف رسائل الوسائط المتعددة"</string>
-    <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"محو قائمة من يتم الاتصال بهم كثيرًا؟"</string>
-    <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"ستمحو قائمة من يتم الاتصال بهم كثيرًا في تطبيقي جهات الاتصال والهاتف، وستفرض على تطبيقات البريد الإلكتروني التعرف على تفضيلات توجيه الرسائل من البداية."</string>
-    <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"جارٍ محو قائمة المُتصل بهم كثيرًا…"</string>
-    <string name="status_available" msgid="2648156525685472626">"متاح"</string>
-    <string name="status_away" msgid="2298688367552893953">"بالخارج"</string>
-    <string name="status_busy" msgid="5990832098713248503">"مشغول"</string>
-    <string name="contactsList" msgid="8806067891419291513">"جهات الاتصال"</string>
-    <string name="contact_suggestions" msgid="3324166754807120006">"أهم المقترحات"</string>
-    <string name="local_invisible_directory" msgid="4723238462733650090">"غير ذلك"</string>
-    <string name="directory_search_label" msgid="4621215895484025229">"الدليل"</string>
-    <string name="directory_search_label_work" msgid="7679326282707414897">"دليل العمل"</string>
-    <string name="local_search_label" msgid="907622822323119235">"جميع جهات الاتصال"</string>
-    <string name="local_suggestions_search_label" msgid="1178575146224386118">"الاقتراحات"</string>
-    <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"أنا"</string>
-    <string name="missing_name" msgid="978606963362745020">"(بلا اسم)"</string>
-    <string name="description_view_contact_detail" msgid="2428742401208561136">"عرض جهة الاتصال"</string>
-    <string name="list_filter_phones" msgid="8763316061763437182">"جميع جهات الاتصال التي لها أرقام هواتف"</string>
-    <string name="list_filter_phones_work" msgid="7083575404573422965">"جهات الاتصال للملف الشخصي للعمل"</string>
-    <string name="view_updates_from_group" msgid="9011641093168385729">"عرض التحديثات"</string>
-    <string name="account_phone" msgid="7067809073194061035">"الجهاز فقط، غير متزامنة"</string>
-    <string name="nameLabelsGroup" msgid="7730465833159557471">"الاسم"</string>
-    <string name="nicknameLabelsGroup" msgid="6310556912361840029">"اللقب"</string>
-    <string name="full_name" msgid="648186563998465740">"الاسم"</string>
-    <string name="name_given" msgid="5096576006314820536">"الاسم الأول"</string>
-    <string name="name_family" msgid="6646235805198547467">"اسم العائلة"</string>
-    <string name="name_prefix" msgid="9215326539658838">"بادئة الاسم"</string>
-    <string name="name_middle" msgid="703755205331582769">"الاسم الأوسط"</string>
-    <string name="name_suffix" msgid="5777083390282548702">"لاحقة الاسم"</string>
-    <string name="name_phonetic" msgid="1650870996361663089">"الاسم صوتيًا"</string>
-    <string name="name_phonetic_given" msgid="618812334274603170">"الاسم الأول صوتيًا"</string>
-    <string name="name_phonetic_middle" msgid="4826820763384625538">"الاسم الصوتي الأوسط"</string>
-    <string name="name_phonetic_family" msgid="379905191212930771">"اسم العائلة صوتيًا"</string>
-    <string name="phoneLabelsGroup" msgid="169661929021355548">"الهاتف"</string>
-    <string name="emailLabelsGroup" msgid="2249752810477488833">"إرسال رسالة إلكترونية"</string>
-    <string name="postalLabelsGroup" msgid="6772000590189142253">"العنوان"</string>
-    <string name="imLabelsGroup" msgid="5718066254237364731">"المراسلة الفورية"</string>
-    <string name="organizationLabelsGroup" msgid="1101996309241601435">"المؤسسة"</string>
-    <string name="relationLabelsGroup" msgid="53866051664600053">"العلاقة"</string>
-    <string name="eventLabelsGroup" msgid="1236970042646618489">"تاريخ مميز"</string>
-    <string name="sms" msgid="7574344928185328095">"رسالة نصية"</string>
-    <string name="postal_address" msgid="1804707930129674200">"العنوان"</string>
-    <string name="ghostData_company" msgid="2554310786296833424">"الشركة"</string>
-    <string name="ghostData_title" msgid="4994968731830184837">"العنوان"</string>
-    <string name="label_notes" msgid="2050255313694219786">"ملاحظات"</string>
-    <string name="label_sip_address" msgid="8883266182575965926">"SIP"</string>
-    <string name="websiteLabelsGroup" msgid="1630734286462186790">"موقع ويب"</string>
-    <string name="groupsLabel" msgid="2694002798416868728">"المجموعات"</string>
-    <string name="email_home" msgid="889830029388962171">"إرسال رسالة إلكترونية إلى عنوان البريد الإلكتروني للمنزل"</string>
-    <string name="email_mobile" msgid="4487686436743741150">"إرسال رسالة إلكترونية إلى عنوان بريد إلكتروني على الجوال"</string>
-    <string name="email_work" msgid="4223487303344613528">"إرسال رسالة إلكترونية إلى عنوان البريد الإلكتروني للعمل"</string>
-    <string name="email_other" msgid="4246411900126012062">"إرسال رسالة إلكترونية"</string>
-    <string name="email_custom" msgid="7246580894327511013">"البريد الإلكتروني <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="email" msgid="2807318537887091606">"إرسال رسالة إلكترونية"</string>
-    <string name="postal_street" msgid="6918171741240802474">"الشارع"</string>
-    <string name="postal_city" msgid="8674569121430005628">"المدينة"</string>
-    <string name="postal_region" msgid="1730369286225469192">"الولاية"</string>
-    <string name="postal_postcode" msgid="4450700741261990439">"الرمز البريدي"</string>
-    <string name="postal_country" msgid="232670707458768148">"البلد"</string>
-    <string name="map_home" msgid="4181131107392126938">"عرض عنوان المنزل"</string>
-    <string name="map_work" msgid="5723471185992684400">"عرض عنوان العمل"</string>
-    <string name="map_other" msgid="2253764780863500516">"عرض العنوان"</string>
-    <string name="map_custom" msgid="5581743097882436157">"عرض عنوان <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="chat_aim" msgid="2954364435497941659">"‏الدردشة باستخدام AIM"</string>
-    <string name="chat_msn" msgid="3130135239071228678">"‏الدردشة باستخدام Windows Live"</string>
-    <string name="chat_yahoo" msgid="3233552142326865347">"‏الدردشة باستخدام Yahoo"</string>
-    <string name="chat_skype" msgid="6486703981390592425">"‏الدردشة باستخدام Skype"</string>
-    <string name="chat_qq" msgid="786924280665740019">"‏الدردشة باستخدام QQ"</string>
-    <string name="chat_gtalk" msgid="7914674177243078035">"‏الدردشة باستخدام Google Talk"</string>
-    <string name="chat_icq" msgid="3292934726414765801">"‏الدردشة باستخدام ICQ"</string>
-    <string name="chat_jabber" msgid="6701542313597880204">"‏الدردشة باستخدام Jabber"</string>
-    <string name="chat" msgid="1020428260359370236">"دردشة"</string>
-    <string name="list_filter_all_accounts" msgid="473782314881473992">"كل جهات الاتصال"</string>
-    <string name="listAllContactsInAccount" msgid="3486378621592995630">"جهات الاتصال في <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="listCustomView" msgid="5306282632413086731">"جهات الاتصال في عرض مخصص"</string>
-    <string name="listSingleContact" msgid="8620818791932382627">"جهة اتصال واحدة"</string>
-    <string name="display_options_sort_list_by" msgid="3541875948367831228">"ترتيب بحسب"</string>
-    <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"الاسم الأول"</string>
-    <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"اسم العائلة"</string>
-    <string name="display_options_view_names_as" msgid="4204204205736735618">"تنسيق الاسم"</string>
-    <string name="display_options_view_given_name_first" msgid="2308026973021171020">"الاسم الأول أولاً"</string>
-    <string name="display_options_view_family_name_first" msgid="987430497292428242">"اسم العائلة أوّلًا"</string>
-    <string name="menu_clear_frequents" msgid="5358271535047496120">"محو قائمة من يتصل بهم كثيرًا"</string>
-    <string name="action_menu_back_from_search" msgid="3550669942742167644">"إيقاف البحث"</string>
-    <string name="description_clear_search" msgid="2347258825265600782">"محو البحث"</string>
-    <string name="select_account_dialog_title" msgid="2673504582803359239">"الحساب"</string>
-    <string name="set_default_account" msgid="7966099951006467572">"استخدام هذا للمكالمات دائمًا"</string>
-    <string name="select_phone_account_for_calls" msgid="1784460686103423274">"الاتصال باستخدام"</string>
-    <string name="call_with_a_note" msgid="6242261320491851133">"مكالمة مع ملاحظة"</string>
-    <string name="call_subject_hint" msgid="7233138753650420800">"اكتب ملاحظة لإرسالها مع المكالمة ..."</string>
-    <string name="send_and_call_button" msgid="4735168294120154013">"إرسال واتصال"</string>
-    <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="tab_title" msgid="3387876802026074288">"علامة تبويب <xliff:g id="TITLE">%1$s</xliff:g>."</string>
-    <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
-      <item quantity="zero"> <xliff:g id="TITLE_2">%1$s</xliff:g> علامة تبويب. <xliff:g id="COUNT_3">%2$d</xliff:g> عناصر غير مقروءة. </item>
-      <item quantity="two"> علامتا تبويب <xliff:g id="TITLE_2">%1$s</xliff:g>. <xliff:g id="COUNT_3">%2$d</xliff:g> عناصر غير مقروءة. </item>
-      <item quantity="few"> <xliff:g id="TITLE_2">%1$s</xliff:g> علامات تبويب. <xliff:g id="COUNT_3">%2$d</xliff:g> عناصر غير مقروءة. </item>
-      <item quantity="many"> <xliff:g id="TITLE_2">%1$s</xliff:g> علامة تبويب. <xliff:g id="COUNT_3">%2$d</xliff:g> عناصر غير مقروءة. </item>
-      <item quantity="other"> <xliff:g id="TITLE_2">%1$s</xliff:g> علامة تبويب. <xliff:g id="COUNT_3">%2$d</xliff:g> عناصر غير مقروءة. </item>
-      <item quantity="one"> <xliff:g id="TITLE_0">%1$s</xliff:g> علامة تبويب. عنصر واحد (<xliff:g id="COUNT_1">%2$d</xliff:g>) غير مقروء. </item>
-    </plurals>
-    <string name="description_search_video_call" msgid="4337369876888024909">"مكالمة فيديو"</string>
-    <string name="description_search_call_and_share" msgid="4912772842755050467">"المشاركة والاتصال"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_custom">الاتصال بـ %s</string>
+  <string name="call_home">الاتصال بهاتف منزلي</string>
+  <string name="call_mobile">الاتصال بالجوال</string>
+  <string name="call_work">الاتصال بهاتف العمل</string>
+  <string name="call_fax_work">الاتصال بفاكس العمل</string>
+  <string name="call_fax_home">الاتصال بفاكس المنزل</string>
+  <string name="call_pager">الاتصال بجهاز النداء</string>
+  <string name="call_other">اتصال</string>
+  <string name="call_callback">الاتصال برقم معادوة الاتصال</string>
+  <string name="call_car">الاتصال بهاتف السيارة</string>
+  <string name="call_company_main">الاتصال بهاتف الشركة الرئيسي</string>
+  <string name="call_isdn">‏اتصال بـ ISDN</string>
+  <string name="call_main">الاتصال بالهاتف الرئيسي</string>
+  <string name="call_other_fax">الاتصال برقم الفاكس</string>
+  <string name="call_radio">اتصال بهاتف لاسلكي</string>
+  <string name="call_telex">الاتصال بالتلكس</string>
+  <string name="call_tty_tdd">‏اتصال بـ TTY/TDD</string>
+  <string name="call_work_mobile">الاتصال بجوال العمل</string>
+  <string name="call_work_pager">الاتصال بجهاز نداء العمل</string>
+  <string name="call_assistant">الاتصال بـ %s</string>
+  <string name="call_mms">اتصال بهاتف رسائل الوسائط المتعددة</string>
+  <string name="sms_custom">إرسال رسالة نصية إلى %s</string>
+  <string name="sms_home">إرسال رسالة نصية إلى هاتف منزلي</string>
+  <string name="sms_mobile">إرسال رسالة نصية إلى جوال</string>
+  <string name="sms_work">إرسال رسالة نصية إلى هاتف العمل</string>
+  <string name="sms_fax_work">إرسال رسالة نصية إلى فاكس العمل</string>
+  <string name="sms_fax_home">إرسال رسالة نصية إلى فاكس المنزل</string>
+  <string name="sms_pager">إرسال رسالة نصية إلى جهاز النداء</string>
+  <string name="sms_other">إرسال رسالة نصية</string>
+  <string name="sms_callback">إرسال رسالة نصية إلى هاتف معاودة الاتصال</string>
+  <string name="sms_car">إرسال رسالة نصية إلى هاتف السيارة</string>
+  <string name="sms_company_main">إرسال رسالة نصية إلى الهاتف الرئيسي للشركة</string>
+  <string name="sms_isdn">‏إرسال رسالة نصية إلى ISDN</string>
+  <string name="sms_main">إرسال رسالة نصية إلى الهاتف الرئيسي</string>
+  <string name="sms_other_fax">إرسال رسالة نصية إلى فاكس</string>
+  <string name="sms_radio">إرسال رسالة نصية إلى هاتف لاسلكي</string>
+  <string name="sms_telex">إرسال رسالة نصية إلى هاتف تلكس</string>
+  <string name="sms_tty_tdd">‏إرسال رسالة نصية إلى TTY/TDD</string>
+  <string name="sms_work_mobile">إرسال رسالة نصية إلى جوال العمل</string>
+  <string name="sms_work_pager">إرسال رسالة نصية إلى جهاز نداء العمل</string>
+  <string name="sms_assistant">إرسال رسالة نصية إلى %s</string>
+  <string name="sms_mms">إرسال رسالة نصية إلى هاتف رسائل الوسائط المتعددة</string>
+  <string name="clearFrequentsConfirmation_title">محو قائمة من يتم الاتصال بهم كثيرًا؟</string>
+  <string name="clearFrequentsConfirmation">ستمحو قائمة من يتم الاتصال بهم كثيرًا في تطبيقي جهات الاتصال والهاتف، وستفرض على تطبيقات البريد الإلكتروني التعرف على تفضيلات توجيه الرسائل من البداية.</string>
+  <string name="clearFrequentsProgress_title">جارٍ محو قائمة المُتصل بهم كثيرًا…</string>
+  <string name="status_available">متاح</string>
+  <string name="status_away">بالخارج</string>
+  <string name="status_busy">مشغول</string>
+  <string name="contactsList">جهات الاتصال</string>
+  <string name="contact_suggestions">أهم المقترحات</string>
+  <string name="local_invisible_directory">غير ذلك</string>
+  <string name="directory_search_label">الدليل</string>
+  <string name="directory_search_label_work">دليل العمل</string>
+  <string name="local_search_label">جميع جهات الاتصال</string>
+  <string name="local_suggestions_search_label">الاقتراحات</string>
+  <string msgid="9154761216179882405" name="user_profile_contacts_list_header">أنا</string>
+  <string name="missing_name">(بلا اسم)</string>
+  <string msgid="2795575601596468581" name="description_view_contact_detail">عرض جهة الاتصال</string>
+  <string name="list_filter_phones">جميع جهات الاتصال التي لها أرقام هواتف</string>
+  <string name="list_filter_phones_work">جهات الاتصال للملف الشخصي للعمل</string>
+  <string name="view_updates_from_group">عرض التحديثات</string>
+  <string name="account_phone">الجهاز فقط، غير متزامنة</string>
+  <string name="nameLabelsGroup">الاسم</string>
+  <string name="nicknameLabelsGroup">اللقب</string>
+  <string name="full_name">الاسم</string>
+  <string name="name_given">الاسم الأول</string>
+  <string name="name_family">اسم العائلة</string>
+  <string name="name_prefix">بادئة الاسم</string>
+  <string name="name_middle">الاسم الأوسط</string>
+  <string name="name_suffix">لاحقة الاسم</string>
+  <string name="name_phonetic">الاسم صوتيًا</string>
+  <string name="name_phonetic_given">الاسم الأول صوتيًا</string>
+  <string name="name_phonetic_middle">الاسم الصوتي الأوسط</string>
+  <string name="name_phonetic_family">اسم العائلة صوتيًا</string>
+  <string name="phoneLabelsGroup">الهاتف</string>
+  <string name="emailLabelsGroup">إرسال رسالة إلكترونية</string>
+  <string name="postalLabelsGroup">العنوان</string>
+  <string name="imLabelsGroup">المراسلة الفورية</string>
+  <string name="organizationLabelsGroup">المؤسسة</string>
+  <string name="relationLabelsGroup">العلاقة</string>
+  <string name="eventLabelsGroup">تاريخ مميز</string>
+  <string name="sms">رسالة نصية</string>
+  <string name="postal_address">العنوان</string>
+  <string name="ghostData_company">الشركة</string>
+  <string name="ghostData_title">العنوان</string>
+  <string name="label_notes">ملاحظات</string>
+  <string name="label_sip_address">SIP</string>
+  <string name="websiteLabelsGroup">موقع ويب</string>
+  <string name="groupsLabel">المجموعات</string>
+  <string name="email_home">إرسال رسالة إلكترونية إلى عنوان البريد الإلكتروني للمنزل</string>
+  <string name="email_mobile">إرسال رسالة إلكترونية إلى عنوان بريد إلكتروني على الجوال</string>
+  <string name="email_work">إرسال رسالة إلكترونية إلى عنوان البريد الإلكتروني للعمل</string>
+  <string name="email_other">إرسال رسالة إلكترونية</string>
+  <string name="email_custom">البريد الإلكتروني %s</string>
+  <string name="email">إرسال رسالة إلكترونية</string>
+  <string name="postal_street">الشارع</string>
+  <string name="postal_city">المدينة</string>
+  <string name="postal_region">الولاية</string>
+  <string name="postal_postcode">الرمز البريدي</string>
+  <string name="postal_country">البلد</string>
+  <string name="map_home">عرض عنوان المنزل</string>
+  <string name="map_work">عرض عنوان العمل</string>
+  <string name="map_other">عرض العنوان</string>
+  <string name="map_custom">عرض عنوان %s</string>
+  <string name="chat_aim">‏المحادثة باستخدام AIM</string>
+  <string name="chat_msn">‏المحادثة باستخدام Windows Live</string>
+  <string name="chat_yahoo">‏المحادثة باستخدام Yahoo</string>
+  <string name="chat_skype">‏المحادثة باستخدام Skype</string>
+  <string name="chat_qq">‏المحادثة باستخدام QQ</string>
+  <string name="chat_gtalk">‏المحادثة باستخدام Google Talk</string>
+  <string name="chat_icq">‏المحادثة باستخدام ICQ</string>
+  <string name="chat_jabber">‏المحادثة باستخدام Jabber</string>
+  <string name="chat">محادثة</string>
+  <string name="list_filter_all_accounts">كل جهات الاتصال</string>
+  <string name="listAllContactsInAccount">جهات الاتصال في %s</string>
+  <string name="listCustomView">جهات الاتصال في عرض مخصص</string>
+  <string name="listSingleContact">جهة اتصال واحدة</string>
+  <string name="display_options_sort_list_by">الترتيب بحسب</string>
+  <string name="display_options_sort_by_given_name">الاسم الأول</string>
+  <string name="display_options_sort_by_family_name">اسم العائلة</string>
+  <string name="display_options_view_names_as">تنسيق الاسم</string>
+  <string name="display_options_view_given_name_first">الاسم الأول أولاً</string>
+  <string name="display_options_view_family_name_first">اسم العائلة أوّلًا</string>
+  <string name="menu_clear_frequents">محو قائمة من يتصل بهم كثيرًا</string>
+  <string name="action_menu_back_from_search">إيقاف البحث</string>
+  <string name="description_clear_search">محو البحث</string>
+  <string name="select_account_dialog_title">الحساب</string>
+  <string name="set_default_account">استخدام هذا للمكالمات دائمًا</string>
+  <string name="select_phone_account_for_calls">‏اختيار شريحة SIM لهذه المكالمة</string>
+  <string name="select_phone_account_for_calls_remember">تذكر هذا الاختيار</string>
+  <string name="call_with_a_note">مكالمة مع ملاحظة</string>
+  <string name="call_subject_hint">اكتب ملاحظة لإرسالها مع المكالمة ...</string>
+  <string name="send_and_call_button">إرسال واتصال</string>
+  <string name="call_subject_limit">%1$s / %2$s</string>
+  <string name="old_call_subject_type_and_number">%1$s %2$s</string>
+  <string name="tab_title">علامة تبويب %1$s.</string>
+  <plurals name="tab_title_with_unread_items">
+    <item quantity="zero"> %1$s علامة تبويب. %2$d عناصر غير مقروءة. </item>
+    <item quantity="one"> %1$s علامة تبويب. عنصر واحد (%2$d) غير مقروء. </item>
+    <item quantity="two"> علامتا تبويب %1$s. %2$d عناصر غير مقروءة. </item>
+    <item quantity="few"> %1$s علامات تبويب. %2$d عناصر غير مقروءة. </item>
+    <item quantity="many"> %1$s علامة تبويب. %2$d عناصر غير مقروءة. </item>
+    <item quantity="other"> %1$s علامة تبويب. %2$d عناصر غير مقروءة. </item>
+  </plurals>
+  <string name="description_search_video_call">مكالمة فيديو</string>
+  <string name="description_search_call_and_share">المشاركة والاتصال</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-az/strings.xml b/java/com/android/contacts/common/res/values-az/strings.xml
index ed0c6a4..762e9d3 100644
--- a/java/com/android/contacts/common/res/values-az/strings.xml
+++ b/java/com/android/contacts/common/res/values-az/strings.xml
@@ -1,162 +1,145 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="toast_text_copied" msgid="8979281391599667362">"Mətn kopyalandı"</string>
-    <string name="call_custom" msgid="3041673234638990874">"Zəng <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="call_home" msgid="125893483593803791">"Ev zəngi"</string>
-    <string name="call_mobile" msgid="967589404494150813">"Mobil zəng"</string>
-    <string name="call_work" msgid="6040550697395300892">"Iş zəngi"</string>
-    <string name="call_fax_work" msgid="5260192771364592922">"İş faksına zəng edin"</string>
-    <string name="call_fax_home" msgid="5174311195081144124">"Ev faksına zəng edin"</string>
-    <string name="call_pager" msgid="6814149227741274161">"Peycer zəngi"</string>
-    <string name="call_other" msgid="5536385588712587235">"Zəng"</string>
-    <string name="call_callback" msgid="6314019862718112786">"Geriyə zəng"</string>
-    <string name="call_car" msgid="3197417098027764954">"Avtomobil zəngi"</string>
-    <string name="call_company_main" msgid="2557663310028446397">"Əsas şirkət zəngi"</string>
-    <string name="call_isdn" msgid="4691270442763649522">"ISDN zəng"</string>
-    <string name="call_main" msgid="3293707608770407814">"Əsas zəng"</string>
-    <string name="call_other_fax" msgid="4724521984879021465">"Faks zəngi"</string>
-    <string name="call_radio" msgid="8942441419845057942">"Radio zəngi"</string>
-    <string name="call_telex" msgid="2031514461660668351">"Teleks zəngi"</string>
-    <string name="call_tty_tdd" msgid="7807210224965727701">"TTY/TDD zəngi"</string>
-    <string name="call_work_mobile" msgid="2716342732938578495">"İş mobil telefonuna zəng"</string>
-    <string name="call_work_pager" msgid="3791778749827366574">"İş peycerinə zəng"</string>
-    <string name="call_assistant" msgid="4177478845473789294">"Zəng <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
-    <string name="call_mms" msgid="4958811711741872901">"MMS zəngi"</string>
-    <string name="sms_custom" msgid="8785368968605026317">"Mətn <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="sms_home" msgid="3527719551060295243">"Ev mətni"</string>
-    <string name="sms_mobile" msgid="8883045857887736518">"Mobil mətn"</string>
-    <string name="sms_work" msgid="4158595439553450966">"İş nömrəsinə mesaj"</string>
-    <string name="sms_fax_work" msgid="5483726627718055248">"İş faksı mətni"</string>
-    <string name="sms_fax_home" msgid="9219265155770746077">"Ev faksı mətni"</string>
-    <string name="sms_pager" msgid="4901085068525193933">"Peycer nömrəsinə mesaj"</string>
-    <string name="sms_other" msgid="1742702947993285933">"Mətn"</string>
-    <string name="sms_callback" msgid="5833483630377538308">"Geri zəng nömrəsinə mesaj"</string>
-    <string name="sms_car" msgid="4314577266154395174">"Avtomobil nömrəsinə mesaj"</string>
-    <string name="sms_company_main" msgid="2308160928487360705">"Əsas şirkət nömrəsinə mesaj"</string>
-    <string name="sms_isdn" msgid="6394300346179302542">"ISDN nömrəsinə mesaj"</string>
-    <string name="sms_main" msgid="8908087742014140774">"Əsas mətn"</string>
-    <string name="sms_other_fax" msgid="8768455473295405427">"Faks nömrəsinə mesaj"</string>
-    <string name="sms_radio" msgid="855555176531704682">"Radio nömrəsinə mesaj"</string>
-    <string name="sms_telex" msgid="6269029276223252719">"Teleks nömrəsinə mesaj"</string>
-    <string name="sms_tty_tdd" msgid="6229057354509192444">"TTY/TDD nömrəsinə mesaj"</string>
-    <string name="sms_work_mobile" msgid="2155975469329969840">"İş mobil nömrəsinə mesaj"</string>
-    <string name="sms_work_pager" msgid="8500140274906830742">"İş peyceri nömrəsinə mesaj"</string>
-    <string name="sms_assistant" msgid="8513548482745330818">"Mətn <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
-    <string name="sms_mms" msgid="5187888900503248542">"MMS nömrəsinə mesaj"</string>
-    <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"Tez-tez ünsiyyət qurulanlar silinsin?"</string>
-    <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"Əlaqələr və Telefon proqramlarında tez-tez əlaqə saxlanılanların siyahısını siləcəksiniz və fraqmentdən ünvanlama seçimlərinizi öyrənmək üçün e-poçt proqramlarını məcbur edəcəksiniz."</string>
-    <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"Tez-tez ünsiyyət qurulanlar silinir..."</string>
-    <string name="status_available" msgid="2648156525685472626">"Əlçatımlı"</string>
-    <string name="status_away" msgid="2298688367552893953">"Kənar"</string>
-    <string name="status_busy" msgid="5990832098713248503">"Məşğul"</string>
-    <string name="contactsList" msgid="8806067891419291513">"Kontaktlar"</string>
-    <string name="contact_suggestions" msgid="3324166754807120006">"Ən yaxşı Təkliflər"</string>
-    <string name="local_invisible_directory" msgid="4723238462733650090">"Digər"</string>
-    <string name="directory_search_label" msgid="4621215895484025229">"Kataloq"</string>
-    <string name="directory_search_label_work" msgid="7679326282707414897">"İş kataloqu"</string>
-    <string name="local_search_label" msgid="907622822323119235">"Bütün kontaktlar"</string>
-    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Təkliflər"</string>
-    <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Mən"</string>
-    <string name="missing_name" msgid="978606963362745020">"(ad yoxdur)"</string>
-    <string name="description_view_contact_detail" msgid="2428742401208561136">"Kontakta baxın"</string>
-    <string name="list_filter_phones" msgid="8763316061763437182">"Telefon nömrələri olan bütün kontaktlar"</string>
-    <string name="list_filter_phones_work" msgid="7083575404573422965">"İş profili kontaktları"</string>
-    <string name="view_updates_from_group" msgid="9011641093168385729">"Güncəlləşmələri göstər"</string>
-    <string name="account_phone" msgid="7067809073194061035">"Yalnız cihaz, sinxronizasiya edilmir"</string>
-    <string name="nameLabelsGroup" msgid="7730465833159557471">"Ad"</string>
-    <string name="nicknameLabelsGroup" msgid="6310556912361840029">"Nik"</string>
-    <string name="full_name" msgid="648186563998465740">"Ad"</string>
-    <string name="name_given" msgid="5096576006314820536">"Ad"</string>
-    <string name="name_family" msgid="6646235805198547467">"Soyad"</string>
-    <string name="name_prefix" msgid="9215326539658838">"Ad prefiksi"</string>
-    <string name="name_middle" msgid="703755205331582769">"Atasının adı"</string>
-    <string name="name_suffix" msgid="5777083390282548702">"Ad suffiksi"</string>
-    <string name="name_phonetic" msgid="1650870996361663089">"Fonetik adı"</string>
-    <string name="name_phonetic_given" msgid="618812334274603170">"Fonetik ad"</string>
-    <string name="name_phonetic_middle" msgid="4826820763384625538">"Fonetik ata adı"</string>
-    <string name="name_phonetic_family" msgid="379905191212930771">"Fonetik soyad"</string>
-    <string name="phoneLabelsGroup" msgid="169661929021355548">"Telefon"</string>
-    <string name="emailLabelsGroup" msgid="2249752810477488833">"E-poçt"</string>
-    <string name="postalLabelsGroup" msgid="6772000590189142253">"Ünvan"</string>
-    <string name="imLabelsGroup" msgid="5718066254237364731">"IM"</string>
-    <string name="organizationLabelsGroup" msgid="1101996309241601435">"Təşkilat"</string>
-    <string name="relationLabelsGroup" msgid="53866051664600053">"Əlaqə"</string>
-    <string name="eventLabelsGroup" msgid="1236970042646618489">"Xüsusi tarix"</string>
-    <string name="sms" msgid="7574344928185328095">"Mətn mesajı"</string>
-    <string name="postal_address" msgid="1804707930129674200">"Ünvan"</string>
-    <string name="ghostData_company" msgid="2554310786296833424">"Şirkət"</string>
-    <string name="ghostData_title" msgid="4994968731830184837">"Başlıq"</string>
-    <string name="label_notes" msgid="2050255313694219786">"Qeydlər"</string>
-    <string name="label_sip_address" msgid="8883266182575965926">"SIP"</string>
-    <string name="websiteLabelsGroup" msgid="1630734286462186790">"Veb sayt"</string>
-    <string name="groupsLabel" msgid="2694002798416868728">"Qruplar"</string>
-    <string name="email_home" msgid="889830029388962171">"Evə e-məktub"</string>
-    <string name="email_mobile" msgid="4487686436743741150">"Mobil e-poçt"</string>
-    <string name="email_work" msgid="4223487303344613528">"İşə e-məktub"</string>
-    <string name="email_other" msgid="4246411900126012062">"E-poçt"</string>
-    <string name="email_custom" msgid="7246580894327511013">"E-poçt <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="email" msgid="2807318537887091606">"E-poçt"</string>
-    <string name="postal_street" msgid="6918171741240802474">"Küçə"</string>
-    <string name="postal_city" msgid="8674569121430005628">"Şəhər"</string>
-    <string name="postal_region" msgid="1730369286225469192">"Dövlət"</string>
-    <string name="postal_postcode" msgid="4450700741261990439">"Poçt indeksi"</string>
-    <string name="postal_country" msgid="232670707458768148">"Ölkə"</string>
-    <string name="map_home" msgid="4181131107392126938">"Ev ünvanına baxın"</string>
-    <string name="map_work" msgid="5723471185992684400">"İş ünvanına baxın"</string>
-    <string name="map_other" msgid="2253764780863500516">"Ünvana baxın"</string>
-    <string name="map_custom" msgid="5581743097882436157">"<xliff:g id="CUSTOM">%s</xliff:g> ünvanına baxın"</string>
-    <string name="chat_aim" msgid="2954364435497941659">"AIM üzərindən çat"</string>
-    <string name="chat_msn" msgid="3130135239071228678">"Windows Live üzərindən çat"</string>
-    <string name="chat_yahoo" msgid="3233552142326865347">"Yahoo üzərindən çat"</string>
-    <string name="chat_skype" msgid="6486703981390592425">"Skype üzərindən çat"</string>
-    <string name="chat_qq" msgid="786924280665740019">"QQ üzərindən çat"</string>
-    <string name="chat_gtalk" msgid="7914674177243078035">"Google Söhbət üzərindən çat"</string>
-    <string name="chat_icq" msgid="3292934726414765801">"ICQ üzərindən çat"</string>
-    <string name="chat_jabber" msgid="6701542313597880204">"Jabber üzərindən çat"</string>
-    <string name="chat" msgid="1020428260359370236">"Çat"</string>
-    <string name="list_filter_all_accounts" msgid="473782314881473992">"Bütün kontaktlar"</string>
-    <string name="listAllContactsInAccount" msgid="3486378621592995630">"<xliff:g id="NAME">%s</xliff:g> adındakı kontaktlar"</string>
-    <string name="listCustomView" msgid="5306282632413086731">"Fərdi baxışdan kontakt"</string>
-    <string name="listSingleContact" msgid="8620818791932382627">"Tək kontakt"</string>
-    <string name="display_options_sort_list_by" msgid="3541875948367831228">"Bunlardan biri üzrə sırala"</string>
-    <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"Ad"</string>
-    <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"Soyad"</string>
-    <string name="display_options_view_names_as" msgid="4204204205736735618">"Ad formatı"</string>
-    <string name="display_options_view_given_name_first" msgid="2308026973021171020">"Ad ilk yazılsın"</string>
-    <string name="display_options_view_family_name_first" msgid="987430497292428242">"Soyad ilk yazılsın"</string>
-    <string name="menu_clear_frequents" msgid="5358271535047496120">"Müntəzəmləri təmizləyin"</string>
-    <string name="action_menu_back_from_search" msgid="3550669942742167644">"axtarışı dayandırın"</string>
-    <string name="description_clear_search" msgid="2347258825265600782">"Axtarışı təmizləyin"</string>
-    <string name="select_account_dialog_title" msgid="2673504582803359239">"Hesab"</string>
-    <string name="set_default_account" msgid="7966099951006467572">"Həmişə bu zənglər üçün istifadə edin"</string>
-    <string name="select_phone_account_for_calls" msgid="1784460686103423274">"Çağrı üçün SIM:"</string>
-    <string name="call_with_a_note" msgid="6242261320491851133">"Qeyd ilə zəng edin"</string>
-    <string name="call_subject_hint" msgid="7233138753650420800">"Zəng ilə göndərmək üçün qeyd yazın..."</string>
-    <string name="send_and_call_button" msgid="4735168294120154013">"GÖNDƏRİN VƏ ZƏNG EDİN"</string>
-    <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="tab_title" msgid="3387876802026074288">"<xliff:g id="TITLE">%1$s</xliff:g> tabel."</string>
-    <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
-      <item quantity="other"> <xliff:g id="TITLE_2">%1$s</xliff:g> tabel. <xliff:g id="COUNT_3">%2$d</xliff:g> oxunmamış element. </item>
-      <item quantity="one"> <xliff:g id="TITLE_0">%1$s</xliff:g> tabel. <xliff:g id="COUNT_1">%2$d</xliff:g> oxunmamış element. </item>
-    </plurals>
-    <string name="description_search_video_call" msgid="4337369876888024909">"Video zəng"</string>
-    <string name="description_search_call_and_share" msgid="4912772842755050467">"Paylaşın və zəng edin"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_custom">Zəng %s</string>
+  <string name="call_home">Ev zəngi</string>
+  <string name="call_mobile">Mobil zəng</string>
+  <string name="call_work">Iş zəngi</string>
+  <string name="call_fax_work">İş faksına zəng edin</string>
+  <string name="call_fax_home">Ev faksına zəng edin</string>
+  <string name="call_pager">Peycer zəngi</string>
+  <string name="call_other">Zəng</string>
+  <string name="call_callback">Geriyə zəng</string>
+  <string name="call_car">Avtomobil zəngi</string>
+  <string name="call_company_main">Əsas şirkət zəngi</string>
+  <string name="call_isdn">ISDN zəng</string>
+  <string name="call_main">Əsas zəng</string>
+  <string name="call_other_fax">Faks zəngi</string>
+  <string name="call_radio">Radio zəngi</string>
+  <string name="call_telex">Teleks zəngi</string>
+  <string name="call_tty_tdd">TTY/TDD zəngi</string>
+  <string name="call_work_mobile">İş mobil telefonuna zəng</string>
+  <string name="call_work_pager">İş peycerinə zəng</string>
+  <string name="call_assistant">Zəng %s</string>
+  <string name="call_mms">MMS zəngi</string>
+  <string name="sms_custom">Mətn %s</string>
+  <string name="sms_home">Ev mətni</string>
+  <string name="sms_mobile">Mobil mətn</string>
+  <string name="sms_work">İş nömrəsinə mesaj</string>
+  <string name="sms_fax_work">İş faksı mətni</string>
+  <string name="sms_fax_home">Ev faksı mətni</string>
+  <string name="sms_pager">Peycer nömrəsinə mesaj</string>
+  <string name="sms_other">Mətn</string>
+  <string name="sms_callback">Geri zəng nömrəsinə mesaj</string>
+  <string name="sms_car">Avtomobil nömrəsinə mesaj</string>
+  <string name="sms_company_main">Əsas şirkət nömrəsinə mesaj</string>
+  <string name="sms_isdn">ISDN nömrəsinə mesaj</string>
+  <string name="sms_main">Əsas mətn</string>
+  <string name="sms_other_fax">Faks nömrəsinə mesaj</string>
+  <string name="sms_radio">Radio nömrəsinə mesaj</string>
+  <string name="sms_telex">Teleks nömrəsinə mesaj</string>
+  <string name="sms_tty_tdd">TTY/TDD nömrəsinə mesaj</string>
+  <string name="sms_work_mobile">İş mobil nömrəsinə mesaj</string>
+  <string name="sms_work_pager">İş peyceri nömrəsinə mesaj</string>
+  <string name="sms_assistant">Mətn %s</string>
+  <string name="sms_mms">MMS nömrəsinə mesaj</string>
+  <string name="clearFrequentsConfirmation_title">Tez-tez ünsiyyət qurulanlar silinsin?</string>
+  <string name="clearFrequentsConfirmation">Əlaqələr və Telefon proqramlarında tez-tez əlaqə saxlanılanların siyahısını siləcəksiniz və fraqmentdən ünvanlama seçimlərinizi öyrənmək üçün e-poçt proqramlarını məcbur edəcəksiniz.</string>
+  <string name="clearFrequentsProgress_title">Tez-tez ünsiyyət qurulanlar silinir...</string>
+  <string name="status_available">Əlçatımlı</string>
+  <string name="status_away">Kənar</string>
+  <string name="status_busy">Məşğul</string>
+  <string name="contactsList">Kontaktlar</string>
+  <string name="contact_suggestions">Ən yaxşı Təkliflər</string>
+  <string name="local_invisible_directory">Digər</string>
+  <string name="directory_search_label">Kataloq</string>
+  <string name="directory_search_label_work">İş kataloqu</string>
+  <string name="local_search_label">Bütün kontaktlar</string>
+  <string name="local_suggestions_search_label">Təkliflər</string>
+  <string msgid="9154761216179882405" name="user_profile_contacts_list_header">Mən</string>
+  <string name="missing_name">(ad yoxdur)</string>
+  <string msgid="2795575601596468581" name="description_view_contact_detail">Kontakta baxın</string>
+  <string name="list_filter_phones">Telefon nömrələri olan bütün kontaktlar</string>
+  <string name="list_filter_phones_work">İş profili kontaktları</string>
+  <string name="view_updates_from_group">Güncəlləşmələri göstər</string>
+  <string name="account_phone">Yalnız cihaz, sinxronizasiya edilmir</string>
+  <string name="nameLabelsGroup">Ad</string>
+  <string name="nicknameLabelsGroup">Nik</string>
+  <string name="full_name">Ad</string>
+  <string name="name_given">Ad</string>
+  <string name="name_family">Soyad</string>
+  <string name="name_prefix">Ad prefiksi</string>
+  <string name="name_middle">Atasının adı</string>
+  <string name="name_suffix">Ad suffiksi</string>
+  <string name="name_phonetic">Fonetik adı</string>
+  <string name="name_phonetic_given">Fonetik ad</string>
+  <string name="name_phonetic_middle">Fonetik ata adı</string>
+  <string name="name_phonetic_family">Fonetik soyad</string>
+  <string name="phoneLabelsGroup">Telefon</string>
+  <string name="emailLabelsGroup">E-poçt</string>
+  <string name="postalLabelsGroup">Ünvan</string>
+  <string name="imLabelsGroup">IM</string>
+  <string name="organizationLabelsGroup">Təşkilat</string>
+  <string name="relationLabelsGroup">Əlaqə</string>
+  <string name="eventLabelsGroup">Xüsusi tarix</string>
+  <string name="sms">Mətn mesajı</string>
+  <string name="postal_address">Ünvan</string>
+  <string name="ghostData_company">Şirkət</string>
+  <string name="ghostData_title">Başlıq</string>
+  <string name="label_notes">Qeydlər</string>
+  <string name="label_sip_address">SIP</string>
+  <string name="websiteLabelsGroup">Veb sayt</string>
+  <string name="groupsLabel">Qruplar</string>
+  <string name="email_home">Evə e-məktub</string>
+  <string name="email_mobile">Mobil e-poçt</string>
+  <string name="email_work">İşə e-məktub</string>
+  <string name="email_other">E-poçt</string>
+  <string name="email_custom">E-poçt %s</string>
+  <string name="email">E-poçt</string>
+  <string name="postal_street">Küçə</string>
+  <string name="postal_city">Şəhər</string>
+  <string name="postal_region">Dövlət</string>
+  <string name="postal_postcode">Poçt indeksi</string>
+  <string name="postal_country">Ölkə</string>
+  <string name="map_home">Ev ünvanına baxın</string>
+  <string name="map_work">İş ünvanına baxın</string>
+  <string name="map_other">Ünvana baxın</string>
+  <string name="map_custom">%s ünvanına baxın</string>
+  <string name="chat_aim">AIM üzərindən çat</string>
+  <string name="chat_msn">Windows Live üzərindən çat</string>
+  <string name="chat_yahoo">Yahoo üzərindən çat</string>
+  <string name="chat_skype">Skype üzərindən çat</string>
+  <string name="chat_qq">QQ üzərindən çat</string>
+  <string name="chat_gtalk">Google Söhbət üzərindən çat</string>
+  <string name="chat_icq">ICQ üzərindən çat</string>
+  <string name="chat_jabber">Jabber üzərindən çat</string>
+  <string name="chat">Çat</string>
+  <string name="list_filter_all_accounts">Bütün kontaktlar</string>
+  <string name="listAllContactsInAccount">%s adındakı kontaktlar</string>
+  <string name="listCustomView">Fərdi baxışdan kontakt</string>
+  <string name="listSingleContact">Tək kontakt</string>
+  <string name="display_options_sort_list_by">Bunlardan biri üzrə sırala</string>
+  <string name="display_options_sort_by_given_name">Ad</string>
+  <string name="display_options_sort_by_family_name">Soyad</string>
+  <string name="display_options_view_names_as">Ad formatı</string>
+  <string name="display_options_view_given_name_first">Ad ilk yazılsın</string>
+  <string name="display_options_view_family_name_first">Soyad ilk yazılsın</string>
+  <string name="menu_clear_frequents">Müntəzəmləri təmizləyin</string>
+  <string name="action_menu_back_from_search">axtarışı dayandırın</string>
+  <string name="description_clear_search">Axtarışı təmizləyin</string>
+  <string name="select_account_dialog_title">Hesab</string>
+  <string name="set_default_account">Həmişə bu zənglər üçün istifadə edin</string>
+  <string name="select_phone_account_for_calls">Bu zəng üçün SIM seçin</string>
+  <string name="select_phone_account_for_calls_remember">Bu seçimi yadda saxlayın</string>
+  <string name="call_with_a_note">Qeyd ilə zəng edin</string>
+  <string name="call_subject_hint">Zəng ilə göndərmək üçün qeyd yazın...</string>
+  <string name="send_and_call_button">GÖNDƏRİN VƏ ZƏNG EDİN</string>
+  <string name="call_subject_limit">%1$s / %2$s</string>
+  <string name="old_call_subject_type_and_number">%1$s %2$s</string>
+  <string name="tab_title">%1$s tabel.</string>
+  <plurals name="tab_title_with_unread_items">
+    <item quantity="one"> %1$s tabel. %2$d oxunmamış element. </item>
+    <item quantity="other"> %1$s tabel. %2$d oxunmamış element. </item>
+  </plurals>
+  <string name="description_search_video_call">Video zəng</string>
+  <string name="description_search_call_and_share">Paylaşın və zəng edin</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-b+sr+Latn/strings.xml b/java/com/android/contacts/common/res/values-b+sr+Latn/strings.xml
index ffc0425..b809e6e 100644
--- a/java/com/android/contacts/common/res/values-b+sr+Latn/strings.xml
+++ b/java/com/android/contacts/common/res/values-b+sr+Latn/strings.xml
@@ -1,163 +1,146 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="toast_text_copied" msgid="8979281391599667362">"Tekst je kopiran"</string>
-    <string name="call_custom" msgid="3041673234638990874">"Pozovi <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="call_home" msgid="125893483593803791">"Pozovi kućni telefon"</string>
-    <string name="call_mobile" msgid="967589404494150813">"Pozovi mobilni telefon"</string>
-    <string name="call_work" msgid="6040550697395300892">"Pozovi poslovni telefon"</string>
-    <string name="call_fax_work" msgid="5260192771364592922">"Pozovi poslovni faks"</string>
-    <string name="call_fax_home" msgid="5174311195081144124">"Pozovi kućni faks"</string>
-    <string name="call_pager" msgid="6814149227741274161">"Pozovi pejdžer"</string>
-    <string name="call_other" msgid="5536385588712587235">"Pozovi"</string>
-    <string name="call_callback" msgid="6314019862718112786">"Pozovi za povratni poziv"</string>
-    <string name="call_car" msgid="3197417098027764954">"Pozovi telefon u automobilu"</string>
-    <string name="call_company_main" msgid="2557663310028446397">"Pozovi glavni telefon preduzeća"</string>
-    <string name="call_isdn" msgid="4691270442763649522">"Pozovi ISDN"</string>
-    <string name="call_main" msgid="3293707608770407814">"Pozovi glavni telefon"</string>
-    <string name="call_other_fax" msgid="4724521984879021465">"Pozovi faks"</string>
-    <string name="call_radio" msgid="8942441419845057942">"Pozovi radio"</string>
-    <string name="call_telex" msgid="2031514461660668351">"Pozovi teleks"</string>
-    <string name="call_tty_tdd" msgid="7807210224965727701">"Pozovi TTY/TDD"</string>
-    <string name="call_work_mobile" msgid="2716342732938578495">"Pozovi poslovni mobilni telefon"</string>
-    <string name="call_work_pager" msgid="3791778749827366574">"Pozovi poslovni pejdžer"</string>
-    <string name="call_assistant" msgid="4177478845473789294">"Pozovi <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
-    <string name="call_mms" msgid="4958811711741872901">"Pozovi broj za MMS"</string>
-    <string name="sms_custom" msgid="8785368968605026317">"Pošalji SMS na <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="sms_home" msgid="3527719551060295243">"Pošalji SMS na kućni telefon"</string>
-    <string name="sms_mobile" msgid="8883045857887736518">"Pošalji SMS na mobilni telefon"</string>
-    <string name="sms_work" msgid="4158595439553450966">"Pošalji SMS na poslovni telefon"</string>
-    <string name="sms_fax_work" msgid="5483726627718055248">"Pošalji SMS na poslovni faks"</string>
-    <string name="sms_fax_home" msgid="9219265155770746077">"Pošalji SMS na kućni faks"</string>
-    <string name="sms_pager" msgid="4901085068525193933">"Pošalji SMS na pejdžer"</string>
-    <string name="sms_other" msgid="1742702947993285933">"Pošalji SMS"</string>
-    <string name="sms_callback" msgid="5833483630377538308">"Pošalji SMS za povratni poziv"</string>
-    <string name="sms_car" msgid="4314577266154395174">"Pošalji SMS na telefon u automobilu"</string>
-    <string name="sms_company_main" msgid="2308160928487360705">"Pošalji SMS na glavni broj telefona preduzeća"</string>
-    <string name="sms_isdn" msgid="6394300346179302542">"Pošalji SMS na ISDN"</string>
-    <string name="sms_main" msgid="8908087742014140774">"Pošalji SMS na glavni telefon"</string>
-    <string name="sms_other_fax" msgid="8768455473295405427">"Pošalji SMS na faks"</string>
-    <string name="sms_radio" msgid="855555176531704682">"Pošalji SMS na radio"</string>
-    <string name="sms_telex" msgid="6269029276223252719">"Pošalji SMS na teleks"</string>
-    <string name="sms_tty_tdd" msgid="6229057354509192444">"Pošalji SMS na TTY/TDD"</string>
-    <string name="sms_work_mobile" msgid="2155975469329969840">"Pošalji SMS na poslovni mobilni telefon"</string>
-    <string name="sms_work_pager" msgid="8500140274906830742">"Pošalji SMS na poslovni pejdžer"</string>
-    <string name="sms_assistant" msgid="8513548482745330818">"Pošalji SMS na <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
-    <string name="sms_mms" msgid="5187888900503248542">"Pošalji SMS na broj za MMS"</string>
-    <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"Brišete često kontaktirane?"</string>
-    <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"Obrisaćete listu često kontaktiranih u aplikacijama Kontakti i Telefon, pa će imejl aplikacije morati ponovo da prikupe informacije o adresiranju."</string>
-    <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"Brisanje često kontaktiranih..."</string>
-    <string name="status_available" msgid="2648156525685472626">"Dostupan/na"</string>
-    <string name="status_away" msgid="2298688367552893953">"Odsutan/na"</string>
-    <string name="status_busy" msgid="5990832098713248503">"Zauzet/a"</string>
-    <string name="contactsList" msgid="8806067891419291513">"Kontakti"</string>
-    <string name="contact_suggestions" msgid="3324166754807120006">"Najpopularniji predlozi"</string>
-    <string name="local_invisible_directory" msgid="4723238462733650090">"Drugo"</string>
-    <string name="directory_search_label" msgid="4621215895484025229">"Direktorijum"</string>
-    <string name="directory_search_label_work" msgid="7679326282707414897">"Direktorijum za Work"</string>
-    <string name="local_search_label" msgid="907622822323119235">"Svi kontakti"</string>
-    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Predlozi"</string>
-    <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Ja"</string>
-    <string name="missing_name" msgid="978606963362745020">"(Nema imena)"</string>
-    <string name="description_view_contact_detail" msgid="2428742401208561136">"Prikaži kontakt"</string>
-    <string name="list_filter_phones" msgid="8763316061763437182">"Svi kontakti sa brojevima telefona"</string>
-    <string name="list_filter_phones_work" msgid="7083575404573422965">"Kontakti sa profila za Work"</string>
-    <string name="view_updates_from_group" msgid="9011641093168385729">"Prikaži ažuriranja"</string>
-    <string name="account_phone" msgid="7067809073194061035">"Samo na uređaju, ne sinhronizuje se"</string>
-    <string name="nameLabelsGroup" msgid="7730465833159557471">"Ime"</string>
-    <string name="nicknameLabelsGroup" msgid="6310556912361840029">"Nadimak"</string>
-    <string name="full_name" msgid="648186563998465740">"Ime"</string>
-    <string name="name_given" msgid="5096576006314820536">"Imenu"</string>
-    <string name="name_family" msgid="6646235805198547467">"Prezimenu"</string>
-    <string name="name_prefix" msgid="9215326539658838">"Prefiks za ime"</string>
-    <string name="name_middle" msgid="703755205331582769">"Srednje ime"</string>
-    <string name="name_suffix" msgid="5777083390282548702">"Sufiks imena"</string>
-    <string name="name_phonetic" msgid="1650870996361663089">"Ime – fonetski"</string>
-    <string name="name_phonetic_given" msgid="618812334274603170">"Ime – fonetski"</string>
-    <string name="name_phonetic_middle" msgid="4826820763384625538">"Srednje ime – fonetski"</string>
-    <string name="name_phonetic_family" msgid="379905191212930771">"Prezime – fonetski"</string>
-    <string name="phoneLabelsGroup" msgid="169661929021355548">"Telefon"</string>
-    <string name="emailLabelsGroup" msgid="2249752810477488833">"Pošalji imejl"</string>
-    <string name="postalLabelsGroup" msgid="6772000590189142253">"Adresa"</string>
-    <string name="imLabelsGroup" msgid="5718066254237364731">"Trenutne poruke"</string>
-    <string name="organizationLabelsGroup" msgid="1101996309241601435">"Organizacija"</string>
-    <string name="relationLabelsGroup" msgid="53866051664600053">"Odnos"</string>
-    <string name="eventLabelsGroup" msgid="1236970042646618489">"Poseban dan"</string>
-    <string name="sms" msgid="7574344928185328095">"SMS"</string>
-    <string name="postal_address" msgid="1804707930129674200">"Adresa"</string>
-    <string name="ghostData_company" msgid="2554310786296833424">"Preduzeće"</string>
-    <string name="ghostData_title" msgid="4994968731830184837">"Naziv"</string>
-    <string name="label_notes" msgid="2050255313694219786">"Beleške"</string>
-    <string name="label_sip_address" msgid="8883266182575965926">"SIP"</string>
-    <string name="websiteLabelsGroup" msgid="1630734286462186790">"Veb-sajt"</string>
-    <string name="groupsLabel" msgid="2694002798416868728">"Grupe"</string>
-    <string name="email_home" msgid="889830029388962171">"Pošalji imejl na kućnu imejl adresu"</string>
-    <string name="email_mobile" msgid="4487686436743741150">"Pošalji imejl na mobilni telefon"</string>
-    <string name="email_work" msgid="4223487303344613528">"Pošalji imejl na poslovnu imejl adresu"</string>
-    <string name="email_other" msgid="4246411900126012062">"Pošalji imejl"</string>
-    <string name="email_custom" msgid="7246580894327511013">"Pošalji imejl na <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="email" msgid="2807318537887091606">"Pošalji imejl"</string>
-    <string name="postal_street" msgid="6918171741240802474">"Ulica"</string>
-    <string name="postal_city" msgid="8674569121430005628">"Grad"</string>
-    <string name="postal_region" msgid="1730369286225469192">"Država"</string>
-    <string name="postal_postcode" msgid="4450700741261990439">"Poštanski broj"</string>
-    <string name="postal_country" msgid="232670707458768148">"Zemlja"</string>
-    <string name="map_home" msgid="4181131107392126938">"Prikaži kućnu adresu"</string>
-    <string name="map_work" msgid="5723471185992684400">"Prikaži poslovnu adresu"</string>
-    <string name="map_other" msgid="2253764780863500516">"Prikaži adresu"</string>
-    <string name="map_custom" msgid="5581743097882436157">"Prikaži adresu <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="chat_aim" msgid="2954364435497941659">"Započni ćaskanje preko AIM-a"</string>
-    <string name="chat_msn" msgid="3130135239071228678">"Započni ćaskanje preko Windows Live-a"</string>
-    <string name="chat_yahoo" msgid="3233552142326865347">"Započni ćaskanje preko Yahoo-a"</string>
-    <string name="chat_skype" msgid="6486703981390592425">"Započni ćaskanje preko Skype-a"</string>
-    <string name="chat_qq" msgid="786924280665740019">"Započni ćaskanje preko QQ-a"</string>
-    <string name="chat_gtalk" msgid="7914674177243078035">"Započni ćaskanje preko Google Talk-a"</string>
-    <string name="chat_icq" msgid="3292934726414765801">"Započni ćaskanje preko ICQ-a"</string>
-    <string name="chat_jabber" msgid="6701542313597880204">"Započni ćaskanje preko Jabber-a"</string>
-    <string name="chat" msgid="1020428260359370236">"Ćaskanje"</string>
-    <string name="list_filter_all_accounts" msgid="473782314881473992">"Svi kontakti"</string>
-    <string name="listAllContactsInAccount" msgid="3486378621592995630">"Kontakti u grupi <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="listCustomView" msgid="5306282632413086731">"Kontakti u prilagođenom prikazu"</string>
-    <string name="listSingleContact" msgid="8620818791932382627">"Pojedinačni kontakt"</string>
-    <string name="display_options_sort_list_by" msgid="3541875948367831228">"Sortiraj prema"</string>
-    <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"Imenu"</string>
-    <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"Prezimenu"</string>
-    <string name="display_options_view_names_as" msgid="4204204205736735618">"Format imena i prezimena"</string>
-    <string name="display_options_view_given_name_first" msgid="2308026973021171020">"Prvo ime"</string>
-    <string name="display_options_view_family_name_first" msgid="987430497292428242">"Prvo prezime"</string>
-    <string name="menu_clear_frequents" msgid="5358271535047496120">"Obriši često kontaktirane"</string>
-    <string name="action_menu_back_from_search" msgid="3550669942742167644">"zaustavljanje pretraživanja"</string>
-    <string name="description_clear_search" msgid="2347258825265600782">"Brisanje pretrage"</string>
-    <string name="select_account_dialog_title" msgid="2673504582803359239">"Nalog"</string>
-    <string name="set_default_account" msgid="7966099951006467572">"Uvek koristi ovo za pozive"</string>
-    <string name="select_phone_account_for_calls" msgid="1784460686103423274">"Pozovi pomoću"</string>
-    <string name="call_with_a_note" msgid="6242261320491851133">"Poziv sa beleškom"</string>
-    <string name="call_subject_hint" msgid="7233138753650420800">"Unesite belešku koju ćete poslati uz poziv..."</string>
-    <string name="send_and_call_button" msgid="4735168294120154013">"POŠALJI I POZOVI"</string>
-    <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g>/<xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="tab_title" msgid="3387876802026074288">"Kartica <xliff:g id="TITLE">%1$s</xliff:g>."</string>
-    <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
-      <item quantity="one"> Kartica <xliff:g id="TITLE_2">%1$s</xliff:g>. <xliff:g id="COUNT_3">%2$d</xliff:g> nepročitana stavka. </item>
-      <item quantity="few"> Kartica <xliff:g id="TITLE_2">%1$s</xliff:g>. <xliff:g id="COUNT_3">%2$d</xliff:g> nepročitane stavke. </item>
-      <item quantity="other"> Kartica <xliff:g id="TITLE_2">%1$s</xliff:g>. <xliff:g id="COUNT_3">%2$d</xliff:g> nepročitanih stavki. </item>
-    </plurals>
-    <string name="description_search_video_call" msgid="4337369876888024909">"Video poziv"</string>
-    <string name="description_search_call_and_share" msgid="4912772842755050467">"Deli i pozovi"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_custom">Pozovi %s</string>
+  <string name="call_home">Pozovi kućni telefon</string>
+  <string name="call_mobile">Pozovi mobilni telefon</string>
+  <string name="call_work">Pozovi poslovni telefon</string>
+  <string name="call_fax_work">Pozovi poslovni faks</string>
+  <string name="call_fax_home">Pozovi kućni faks</string>
+  <string name="call_pager">Pozovi pejdžer</string>
+  <string name="call_other">Pozovi</string>
+  <string name="call_callback">Pozovi za povratni poziv</string>
+  <string name="call_car">Pozovi telefon u automobilu</string>
+  <string name="call_company_main">Pozovi glavni telefon preduzeća</string>
+  <string name="call_isdn">Pozovi ISDN</string>
+  <string name="call_main">Pozovi glavni telefon</string>
+  <string name="call_other_fax">Pozovi faks</string>
+  <string name="call_radio">Pozovi radio</string>
+  <string name="call_telex">Pozovi teleks</string>
+  <string name="call_tty_tdd">Pozovi TTY/TDD</string>
+  <string name="call_work_mobile">Pozovi poslovni mobilni telefon</string>
+  <string name="call_work_pager">Pozovi poslovni pejdžer</string>
+  <string name="call_assistant">Pozovi %s</string>
+  <string name="call_mms">Pozovi broj za MMS</string>
+  <string name="sms_custom">Pošalji SMS na %s</string>
+  <string name="sms_home">Pošalji SMS na kućni telefon</string>
+  <string name="sms_mobile">Pošalji SMS na mobilni telefon</string>
+  <string name="sms_work">Pošalji SMS na poslovni telefon</string>
+  <string name="sms_fax_work">Pošalji SMS na poslovni faks</string>
+  <string name="sms_fax_home">Pošalji SMS na kućni faks</string>
+  <string name="sms_pager">Pošalji SMS na pejdžer</string>
+  <string name="sms_other">Pošalji SMS</string>
+  <string name="sms_callback">Pošalji SMS za povratni poziv</string>
+  <string name="sms_car">Pošalji SMS na telefon u automobilu</string>
+  <string name="sms_company_main">Pošalji SMS na glavni broj telefona preduzeća</string>
+  <string name="sms_isdn">Pošalji SMS na ISDN</string>
+  <string name="sms_main">Pošalji SMS na glavni telefon</string>
+  <string name="sms_other_fax">Pošalji SMS na faks</string>
+  <string name="sms_radio">Pošalji SMS na radio</string>
+  <string name="sms_telex">Pošalji SMS na teleks</string>
+  <string name="sms_tty_tdd">Pošalji SMS na TTY/TDD</string>
+  <string name="sms_work_mobile">Pošalji SMS na poslovni mobilni telefon</string>
+  <string name="sms_work_pager">Pošalji SMS na poslovni pejdžer</string>
+  <string name="sms_assistant">Pošalji SMS na %s</string>
+  <string name="sms_mms">Pošalji SMS na broj za MMS</string>
+  <string name="clearFrequentsConfirmation_title">Brišete često kontaktirane?</string>
+  <string name="clearFrequentsConfirmation">Obrisaćete listu često kontaktiranih u aplikacijama Kontakti i Telefon, pa će imejl aplikacije morati ponovo da prikupe informacije o adresiranju.</string>
+  <string name="clearFrequentsProgress_title">Brisanje često kontaktiranih...</string>
+  <string name="status_available">Dostupan/na</string>
+  <string name="status_away">Odsutan/na</string>
+  <string name="status_busy">Zauzet/a</string>
+  <string name="contactsList">Kontakti</string>
+  <string name="contact_suggestions">Najpopularniji predlozi</string>
+  <string name="local_invisible_directory">Drugo</string>
+  <string name="directory_search_label">Direktorijum</string>
+  <string name="directory_search_label_work">Direktorijum za Work</string>
+  <string name="local_search_label">Svi kontakti</string>
+  <string name="local_suggestions_search_label">Predlozi</string>
+  <string msgid="9154761216179882405" name="user_profile_contacts_list_header">Ja</string>
+  <string name="missing_name">(Nema imena)</string>
+  <string msgid="2795575601596468581" name="description_view_contact_detail">Prikaži kontakt</string>
+  <string name="list_filter_phones">Svi kontakti sa brojevima telefona</string>
+  <string name="list_filter_phones_work">Kontakti sa profila za Work</string>
+  <string name="view_updates_from_group">Prikaži ažuriranja</string>
+  <string name="account_phone">Samo na uređaju, ne sinhronizuje se</string>
+  <string name="nameLabelsGroup">Ime</string>
+  <string name="nicknameLabelsGroup">Nadimak</string>
+  <string name="full_name">Ime</string>
+  <string name="name_given">Imenu</string>
+  <string name="name_family">Prezimenu</string>
+  <string name="name_prefix">Prefiks za ime</string>
+  <string name="name_middle">Srednje ime</string>
+  <string name="name_suffix">Sufiks imena</string>
+  <string name="name_phonetic">Ime – fonetski</string>
+  <string name="name_phonetic_given">Ime – fonetski</string>
+  <string name="name_phonetic_middle">Srednje ime – fonetski</string>
+  <string name="name_phonetic_family">Prezime – fonetski</string>
+  <string name="phoneLabelsGroup">Telefon</string>
+  <string name="emailLabelsGroup">Pošalji imejl</string>
+  <string name="postalLabelsGroup">Adresa</string>
+  <string name="imLabelsGroup">Trenutne poruke</string>
+  <string name="organizationLabelsGroup">Organizacija</string>
+  <string name="relationLabelsGroup">Odnos</string>
+  <string name="eventLabelsGroup">Poseban dan</string>
+  <string name="sms">SMS</string>
+  <string name="postal_address">Adresa</string>
+  <string name="ghostData_company">Preduzeće</string>
+  <string name="ghostData_title">Naziv</string>
+  <string name="label_notes">Beleške</string>
+  <string name="label_sip_address">SIP</string>
+  <string name="websiteLabelsGroup">Veb-sajt</string>
+  <string name="groupsLabel">Grupe</string>
+  <string name="email_home">Pošalji imejl na kućnu imejl adresu</string>
+  <string name="email_mobile">Pošalji imejl na mobilni telefon</string>
+  <string name="email_work">Pošalji imejl na poslovnu imejl adresu</string>
+  <string name="email_other">Pošalji imejl</string>
+  <string name="email_custom">Pošalji imejl na %s</string>
+  <string name="email">Pošalji imejl</string>
+  <string name="postal_street">Ulica</string>
+  <string name="postal_city">Grad</string>
+  <string name="postal_region">Država</string>
+  <string name="postal_postcode">Poštanski broj</string>
+  <string name="postal_country">Zemlja</string>
+  <string name="map_home">Prikaži kućnu adresu</string>
+  <string name="map_work">Prikaži poslovnu adresu</string>
+  <string name="map_other">Prikaži adresu</string>
+  <string name="map_custom">Prikaži adresu %s</string>
+  <string name="chat_aim">Započni ćaskanje preko AIM-a</string>
+  <string name="chat_msn">Započni ćaskanje preko Windows Live-a</string>
+  <string name="chat_yahoo">Započni ćaskanje preko Yahoo-a</string>
+  <string name="chat_skype">Započni ćaskanje preko Skype-a</string>
+  <string name="chat_qq">Započni ćaskanje preko QQ-a</string>
+  <string name="chat_gtalk">Započni ćaskanje preko Google Talk-a</string>
+  <string name="chat_icq">Započni ćaskanje preko ICQ-a</string>
+  <string name="chat_jabber">Započni ćaskanje preko Jabber-a</string>
+  <string name="chat">Ćaskanje</string>
+  <string name="list_filter_all_accounts">Svi kontakti</string>
+  <string name="listAllContactsInAccount">Kontakti u grupi %s</string>
+  <string name="listCustomView">Kontakti u prilagođenom prikazu</string>
+  <string name="listSingleContact">Pojedinačni kontakt</string>
+  <string name="display_options_sort_list_by">Sortiraj prema</string>
+  <string name="display_options_sort_by_given_name">Imenu</string>
+  <string name="display_options_sort_by_family_name">Prezimenu</string>
+  <string name="display_options_view_names_as">Format imena i prezimena</string>
+  <string name="display_options_view_given_name_first">Prvo ime</string>
+  <string name="display_options_view_family_name_first">Prvo prezime</string>
+  <string name="menu_clear_frequents">Obriši često kontaktirane</string>
+  <string name="action_menu_back_from_search">zaustavljanje pretraživanja</string>
+  <string name="description_clear_search">Brisanje pretrage</string>
+  <string name="select_account_dialog_title">Nalog</string>
+  <string name="set_default_account">Uvek koristi ovo za pozive</string>
+  <string name="select_phone_account_for_calls">Izaberite SIM za ovaj poziv</string>
+  <string name="select_phone_account_for_calls_remember">Zapamti ovaj izbor</string>
+  <string name="call_with_a_note">Poziv sa beleškom</string>
+  <string name="call_subject_hint">Unesite belešku koju ćete poslati uz poziv...</string>
+  <string name="send_and_call_button">POŠALJI I POZOVI</string>
+  <string name="call_subject_limit">%1$s/%2$s</string>
+  <string name="old_call_subject_type_and_number">%1$s %2$s</string>
+  <string name="tab_title">Kartica %1$s.</string>
+  <plurals name="tab_title_with_unread_items">
+    <item quantity="one"> Kartica %1$s. %2$d nepročitana stavka. </item>
+    <item quantity="few"> Kartica %1$s. %2$d nepročitane stavke. </item>
+    <item quantity="other"> Kartica %1$s. %2$d nepročitanih stavki. </item>
+  </plurals>
+  <string name="description_search_video_call">Video poziv</string>
+  <string name="description_search_call_and_share">Deli i pozovi</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-be/strings.xml b/java/com/android/contacts/common/res/values-be/strings.xml
index 2fab8a3..3e6c8f2 100644
--- a/java/com/android/contacts/common/res/values-be/strings.xml
+++ b/java/com/android/contacts/common/res/values-be/strings.xml
@@ -1,164 +1,147 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="toast_text_copied" msgid="8979281391599667362">"Тэкст скапіяваны"</string>
-    <string name="call_custom" msgid="3041673234638990874">"Выклікаць <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="call_home" msgid="125893483593803791">"Патэлефанаваць на хатні нумар"</string>
-    <string name="call_mobile" msgid="967589404494150813">"Патэлефанаваць на нумар мабільнага тэлефона"</string>
-    <string name="call_work" msgid="6040550697395300892">"Патэлефанаваць на працоўны нумар тэлефона"</string>
-    <string name="call_fax_work" msgid="5260192771364592922">"Патэлефанаваць на нумар працоўнага факса"</string>
-    <string name="call_fax_home" msgid="5174311195081144124">"Патэлефанаваць на нумар хатняга факса"</string>
-    <string name="call_pager" msgid="6814149227741274161">"Патэлефанаваць на пэйджар"</string>
-    <string name="call_other" msgid="5536385588712587235">"Выклікаць"</string>
-    <string name="call_callback" msgid="6314019862718112786">"Зрабіць зваротны выклік"</string>
-    <string name="call_car" msgid="3197417098027764954">"Патэлефанаваць на нумар у машыне"</string>
-    <string name="call_company_main" msgid="2557663310028446397">"Патэлефанаваць на асноўны нумар кампаніі"</string>
-    <string name="call_isdn" msgid="4691270442763649522">"Выклікаць ISDN"</string>
-    <string name="call_main" msgid="3293707608770407814">"Патэлефанаваць на асноўны нумар"</string>
-    <string name="call_other_fax" msgid="4724521984879021465">"Патэлефанаваць на нумар факса"</string>
-    <string name="call_radio" msgid="8942441419845057942">"Патэлефанаваць на радыётэлефон"</string>
-    <string name="call_telex" msgid="2031514461660668351">"Патэлефанаваць на нумар тэлекса"</string>
-    <string name="call_tty_tdd" msgid="7807210224965727701">"Выклікаць TTY/TDD"</string>
-    <string name="call_work_mobile" msgid="2716342732938578495">"Патэлефанаваць на працоўны нумар мабільнага тэлефона"</string>
-    <string name="call_work_pager" msgid="3791778749827366574">"Патэлефанаваць на працоўны пэйджар"</string>
-    <string name="call_assistant" msgid="4177478845473789294">"Выклікаць <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
-    <string name="call_mms" msgid="4958811711741872901">"Выклікаць MMS"</string>
-    <string name="sms_custom" msgid="8785368968605026317">"Напiсаць тэкставае паведамленне <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="sms_home" msgid="3527719551060295243">"Напiсаць тэкставае паведамленне на хатні тэлефон"</string>
-    <string name="sms_mobile" msgid="8883045857887736518">"Напiсаць тэкставае паведамленне на мабільны нумар тэлефона"</string>
-    <string name="sms_work" msgid="4158595439553450966">"Напiсаць тэкставае паведамленне на працоўны нумар тэлефона"</string>
-    <string name="sms_fax_work" msgid="5483726627718055248">"Напiсаць тэкставае паведамленне на працоўны факс"</string>
-    <string name="sms_fax_home" msgid="9219265155770746077">"Напiсаць тэкставае паведамленне на хатні факс"</string>
-    <string name="sms_pager" msgid="4901085068525193933">"Напiсаць тэкставае паведамленне на пэйджар"</string>
-    <string name="sms_other" msgid="1742702947993285933">"Тэкставае паведамленне"</string>
-    <string name="sms_callback" msgid="5833483630377538308">"Напiсаць тэкставае паведамленне на нумар зваротнага выкліку"</string>
-    <string name="sms_car" msgid="4314577266154395174">"Напiсаць тэкставае паведамленне на нумар у машыне"</string>
-    <string name="sms_company_main" msgid="2308160928487360705">"Напiсаць тэкставае паведамленне на асноўны нумар кампаніі"</string>
-    <string name="sms_isdn" msgid="6394300346179302542">"Тэкставае паведамленне ISDN"</string>
-    <string name="sms_main" msgid="8908087742014140774">"Напiсаць тэкставае паведамленне на асноўны нумар"</string>
-    <string name="sms_other_fax" msgid="8768455473295405427">"Напiсаць тэкставае паведамленне на факс"</string>
-    <string name="sms_radio" msgid="855555176531704682">"Напiсаць тэкставае паведамленне на радыётэлефон"</string>
-    <string name="sms_telex" msgid="6269029276223252719">"Напiсаць тэкставае паведамленне на тэлекс"</string>
-    <string name="sms_tty_tdd" msgid="6229057354509192444">"Напiсаць тэкставае паведамленне на TTY/TDD"</string>
-    <string name="sms_work_mobile" msgid="2155975469329969840">"Напiсаць тэкставае паведамленне на працоўны нумар мабільнага тэлефона"</string>
-    <string name="sms_work_pager" msgid="8500140274906830742">"Напiсаць тэкставае паведамленне на працоўны пэйджар"</string>
-    <string name="sms_assistant" msgid="8513548482745330818">"Напiсаць тэкставае паведамленне <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
-    <string name="sms_mms" msgid="5187888900503248542">"Тэкставае паведамленне MMS"</string>
-    <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"Выдалiць частыя кантакты?"</string>
-    <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"Вы выдалiце найчасцей ужываныя кантакты ў праграмах Кантакты i Тэлефон i прымусiце праграмы па працы з электроннай поштай вывучыць вашы налады адрасацыi з нуля."</string>
-    <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"Выдаленне частых кантактаў..."</string>
-    <string name="status_available" msgid="2648156525685472626">"Даступны"</string>
-    <string name="status_away" msgid="2298688367552893953">"Адсутнічае"</string>
-    <string name="status_busy" msgid="5990832098713248503">"Заняты"</string>
-    <string name="contactsList" msgid="8806067891419291513">"Кантакты"</string>
-    <string name="contact_suggestions" msgid="3324166754807120006">"Лепшыя прапановы"</string>
-    <string name="local_invisible_directory" msgid="4723238462733650090">"Іншае"</string>
-    <string name="directory_search_label" msgid="4621215895484025229">"Дырэкторыя"</string>
-    <string name="directory_search_label_work" msgid="7679326282707414897">"Працоўны каталог"</string>
-    <string name="local_search_label" msgid="907622822323119235">"Усе кантакты"</string>
-    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Прапановы"</string>
-    <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Я"</string>
-    <string name="missing_name" msgid="978606963362745020">"(Без назвы)"</string>
-    <string name="description_view_contact_detail" msgid="2428742401208561136">"Прагледзець кантакт"</string>
-    <string name="list_filter_phones" msgid="8763316061763437182">"Усе кантакты з нумарамі тэлефонаў"</string>
-    <string name="list_filter_phones_work" msgid="7083575404573422965">"Кантакты працоўнага профілю"</string>
-    <string name="view_updates_from_group" msgid="9011641093168385729">"Прагляд абнаўленняў"</string>
-    <string name="account_phone" msgid="7067809073194061035">"Толькі прылада, несінхранізаваная"</string>
-    <string name="nameLabelsGroup" msgid="7730465833159557471">"Імя"</string>
-    <string name="nicknameLabelsGroup" msgid="6310556912361840029">"Псеўданiм"</string>
-    <string name="full_name" msgid="648186563998465740">"Імя"</string>
-    <string name="name_given" msgid="5096576006314820536">"Імені"</string>
-    <string name="name_family" msgid="6646235805198547467">"Прозвішчы"</string>
-    <string name="name_prefix" msgid="9215326539658838">"Прэфікс імені"</string>
-    <string name="name_middle" msgid="703755205331582769">"Імя па бацьку"</string>
-    <string name="name_suffix" msgid="5777083390282548702">"Суфікс да імені"</string>
-    <string name="name_phonetic" msgid="1650870996361663089">"Вымаўленне імя"</string>
-    <string name="name_phonetic_given" msgid="618812334274603170">"Вымаўленне імя"</string>
-    <string name="name_phonetic_middle" msgid="4826820763384625538">"Вымаўленне імені па бацьку / 2-га імені"</string>
-    <string name="name_phonetic_family" msgid="379905191212930771">"Вымаўленне прозвішча"</string>
-    <string name="phoneLabelsGroup" msgid="169661929021355548">"Тэлефон"</string>
-    <string name="emailLabelsGroup" msgid="2249752810477488833">"Электронная пошта"</string>
-    <string name="postalLabelsGroup" msgid="6772000590189142253">"Адрас"</string>
-    <string name="imLabelsGroup" msgid="5718066254237364731">"Iмгненныя паведамленнi"</string>
-    <string name="organizationLabelsGroup" msgid="1101996309241601435">"Установа"</string>
-    <string name="relationLabelsGroup" msgid="53866051664600053">"Сувязі"</string>
-    <string name="eventLabelsGroup" msgid="1236970042646618489">"Асаблівая дата"</string>
-    <string name="sms" msgid="7574344928185328095">"Тэкставае паведамленне"</string>
-    <string name="postal_address" msgid="1804707930129674200">"Адрас"</string>
-    <string name="ghostData_company" msgid="2554310786296833424">"Кампанія"</string>
-    <string name="ghostData_title" msgid="4994968731830184837">"Назва"</string>
-    <string name="label_notes" msgid="2050255313694219786">"Нататкі"</string>
-    <string name="label_sip_address" msgid="8883266182575965926">"SIP"</string>
-    <string name="websiteLabelsGroup" msgid="1630734286462186790">"Вэб-сайт"</string>
-    <string name="groupsLabel" msgid="2694002798416868728">"Групы"</string>
-    <string name="email_home" msgid="889830029388962171">"Паведамленне на хатні адрас электроннай пошты"</string>
-    <string name="email_mobile" msgid="4487686436743741150">"Адправіць электронную пошту на мабільны адрас"</string>
-    <string name="email_work" msgid="4223487303344613528">"Паведамленне на працоўную электронную пошту"</string>
-    <string name="email_other" msgid="4246411900126012062">"Электронная пошта"</string>
-    <string name="email_custom" msgid="7246580894327511013">"Адправiць лiст на адрас: <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="email" msgid="2807318537887091606">"Электронная пошта"</string>
-    <string name="postal_street" msgid="6918171741240802474">"Вуліца"</string>
-    <string name="postal_city" msgid="8674569121430005628">"Горад"</string>
-    <string name="postal_region" msgid="1730369286225469192">"Шт"</string>
-    <string name="postal_postcode" msgid="4450700741261990439">"Паштовы індэкс"</string>
-    <string name="postal_country" msgid="232670707458768148">"Краіна"</string>
-    <string name="map_home" msgid="4181131107392126938">"Прагледзець хатні адрас"</string>
-    <string name="map_work" msgid="5723471185992684400">"Паглядзець працоўны адрас"</string>
-    <string name="map_other" msgid="2253764780863500516">"Прагледзець адрас"</string>
-    <string name="map_custom" msgid="5581743097882436157">"Паглядзець адрас \"<xliff:g id="CUSTOM">%s</xliff:g>\""</string>
-    <string name="chat_aim" msgid="2954364435497941659">"Чат у AIM"</string>
-    <string name="chat_msn" msgid="3130135239071228678">"Чат у Windows Live"</string>
-    <string name="chat_yahoo" msgid="3233552142326865347">"Чат у Yahoo"</string>
-    <string name="chat_skype" msgid="6486703981390592425">"Чат у Skype"</string>
-    <string name="chat_qq" msgid="786924280665740019">"Чат у QQ"</string>
-    <string name="chat_gtalk" msgid="7914674177243078035">"Чат у Google Talk"</string>
-    <string name="chat_icq" msgid="3292934726414765801">"Чат праз ICQ"</string>
-    <string name="chat_jabber" msgid="6701542313597880204">"Чат у Jabber"</string>
-    <string name="chat" msgid="1020428260359370236">"Гутарка"</string>
-    <string name="list_filter_all_accounts" msgid="473782314881473992">"Усе кантакты"</string>
-    <string name="listAllContactsInAccount" msgid="3486378621592995630">"Кантакты карыстальнiка <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="listCustomView" msgid="5306282632413086731">"Кантакты ў карыстальнiцкiм выглядзе"</string>
-    <string name="listSingleContact" msgid="8620818791932382627">"Адзіночны кантакт"</string>
-    <string name="display_options_sort_list_by" msgid="3541875948367831228">"Сартаваць па"</string>
-    <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"Імені"</string>
-    <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"Прозвішчы"</string>
-    <string name="display_options_view_names_as" msgid="4204204205736735618">"Фармат імя"</string>
-    <string name="display_options_view_given_name_first" msgid="2308026973021171020">"Спачатку імя"</string>
-    <string name="display_options_view_family_name_first" msgid="987430497292428242">"Спачатку прозвішча"</string>
-    <string name="menu_clear_frequents" msgid="5358271535047496120">"Выдалiць частыя кантакты"</string>
-    <string name="action_menu_back_from_search" msgid="3550669942742167644">"спыніць пошук"</string>
-    <string name="description_clear_search" msgid="2347258825265600782">"Ачысціць пошук"</string>
-    <string name="select_account_dialog_title" msgid="2673504582803359239">"Уліковы запіс"</string>
-    <string name="set_default_account" msgid="7966099951006467572">"Заўсёды выкарыст. гэта для выклікаў"</string>
-    <string name="select_phone_account_for_calls" msgid="1784460686103423274">"Выклікаць праз"</string>
-    <string name="call_with_a_note" msgid="6242261320491851133">"Выклік з нататкай"</string>
-    <string name="call_subject_hint" msgid="7233138753650420800">"Увесці нататку для адпраўкі з выклікам…"</string>
-    <string name="send_and_call_button" msgid="4735168294120154013">"АДПРАВІЦЬ І ВЫКЛІКАЦЬ"</string>
-    <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="tab_title" msgid="3387876802026074288">"Укладка <xliff:g id="TITLE">%1$s</xliff:g>."</string>
-    <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
-      <item quantity="one">Укладка <xliff:g id="TITLE_2">%1$s</xliff:g>. <xliff:g id="COUNT_3">%2$d</xliff:g> непрачытаны элемент. </item>
-      <item quantity="few">Укладка <xliff:g id="TITLE_2">%1$s</xliff:g>. <xliff:g id="COUNT_3">%2$d</xliff:g> непрачытаныя элементы. </item>
-      <item quantity="many">Укладка <xliff:g id="TITLE_2">%1$s</xliff:g>. <xliff:g id="COUNT_3">%2$d</xliff:g> непрачытаных элементаў. </item>
-      <item quantity="other">Укладка <xliff:g id="TITLE_2">%1$s</xliff:g>. <xliff:g id="COUNT_3">%2$d</xliff:g> непрачытанага элемента. </item>
-    </plurals>
-    <string name="description_search_video_call" msgid="4337369876888024909">"Відэавыклік"</string>
-    <string name="description_search_call_and_share" msgid="4912772842755050467">"Абагуліць і выклікаць"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_custom">Выклікаць %s</string>
+  <string name="call_home">Патэлефанаваць на хатні нумар</string>
+  <string name="call_mobile">Патэлефанаваць на нумар мабільнага тэлефона</string>
+  <string name="call_work">Патэлефанаваць на працоўны нумар тэлефона</string>
+  <string name="call_fax_work">Патэлефанаваць на нумар працоўнага факса</string>
+  <string name="call_fax_home">Патэлефанаваць на нумар хатняга факса</string>
+  <string name="call_pager">Патэлефанаваць на пэйджар</string>
+  <string name="call_other">Выклікаць</string>
+  <string name="call_callback">Зрабіць зваротны выклік</string>
+  <string name="call_car">Патэлефанаваць на нумар у машыне</string>
+  <string name="call_company_main">Патэлефанаваць на асноўны нумар кампаніі</string>
+  <string name="call_isdn">Выклікаць ISDN</string>
+  <string name="call_main">Патэлефанаваць на асноўны нумар</string>
+  <string name="call_other_fax">Патэлефанаваць на нумар факса</string>
+  <string name="call_radio">Патэлефанаваць на радыётэлефон</string>
+  <string name="call_telex">Патэлефанаваць на нумар тэлекса</string>
+  <string name="call_tty_tdd">Выклікаць TTY/TDD</string>
+  <string name="call_work_mobile">Патэлефанаваць на працоўны нумар мабільнага тэлефона</string>
+  <string name="call_work_pager">Патэлефанаваць на працоўны пэйджар</string>
+  <string name="call_assistant">Выклікаць %s</string>
+  <string name="call_mms">Выклікаць MMS</string>
+  <string name="sms_custom">Напiсаць тэкставае паведамленне %s</string>
+  <string name="sms_home">Напiсаць тэкставае паведамленне на хатні тэлефон</string>
+  <string name="sms_mobile">Напiсаць тэкставае паведамленне на мабільны нумар тэлефона</string>
+  <string name="sms_work">Напiсаць тэкставае паведамленне на працоўны нумар тэлефона</string>
+  <string name="sms_fax_work">Напiсаць тэкставае паведамленне на працоўны факс</string>
+  <string name="sms_fax_home">Напiсаць тэкставае паведамленне на хатні факс</string>
+  <string name="sms_pager">Напiсаць тэкставае паведамленне на пэйджар</string>
+  <string name="sms_other">Тэкставае паведамленне</string>
+  <string name="sms_callback">Напiсаць тэкставае паведамленне на нумар зваротнага выкліку</string>
+  <string name="sms_car">Напiсаць тэкставае паведамленне на нумар у машыне</string>
+  <string name="sms_company_main">Напiсаць тэкставае паведамленне на асноўны нумар кампаніі</string>
+  <string name="sms_isdn">Тэкставае паведамленне ISDN</string>
+  <string name="sms_main">Напiсаць тэкставае паведамленне на асноўны нумар</string>
+  <string name="sms_other_fax">Напiсаць тэкставае паведамленне на факс</string>
+  <string name="sms_radio">Напiсаць тэкставае паведамленне на радыётэлефон</string>
+  <string name="sms_telex">Напiсаць тэкставае паведамленне на тэлекс</string>
+  <string name="sms_tty_tdd">Напiсаць тэкставае паведамленне на TTY/TDD</string>
+  <string name="sms_work_mobile">Напiсаць тэкставае паведамленне на працоўны нумар мабільнага тэлефона</string>
+  <string name="sms_work_pager">Напiсаць тэкставае паведамленне на працоўны пэйджар</string>
+  <string name="sms_assistant">Напiсаць тэкставае паведамленне %s</string>
+  <string name="sms_mms">Тэкставае паведамленне MMS</string>
+  <string name="clearFrequentsConfirmation_title">Выдалiць частыя кантакты?</string>
+  <string name="clearFrequentsConfirmation">Вы выдалiце найчасцей ужываныя кантакты ў праграмах Кантакты i Тэлефон i прымусiце праграмы па працы з электроннай поштай вывучыць вашы налады адрасацыi з нуля.</string>
+  <string name="clearFrequentsProgress_title">Выдаленне частых кантактаў...</string>
+  <string name="status_available">Даступны</string>
+  <string name="status_away">Адсутнічае</string>
+  <string name="status_busy">Заняты</string>
+  <string name="contactsList">Кантакты</string>
+  <string name="contact_suggestions">Лепшыя прапановы</string>
+  <string name="local_invisible_directory">Іншае</string>
+  <string name="directory_search_label">Дырэкторыя</string>
+  <string name="directory_search_label_work">Працоўны каталог</string>
+  <string name="local_search_label">Усе кантакты</string>
+  <string name="local_suggestions_search_label">Прапановы</string>
+  <string msgid="9154761216179882405" name="user_profile_contacts_list_header">Я</string>
+  <string name="missing_name">(Без назвы)</string>
+  <string msgid="2795575601596468581" name="description_view_contact_detail">Прагледзець кантакт</string>
+  <string name="list_filter_phones">Усе кантакты з нумарамі тэлефонаў</string>
+  <string name="list_filter_phones_work">Кантакты працоўнага профілю</string>
+  <string name="view_updates_from_group">Прагляд абнаўленняў</string>
+  <string name="account_phone">Толькі прылада, несінхранізаваная</string>
+  <string name="nameLabelsGroup">Імя</string>
+  <string name="nicknameLabelsGroup">Псеўданiм</string>
+  <string name="full_name">Імя</string>
+  <string name="name_given">Імені</string>
+  <string name="name_family">Прозвішчы</string>
+  <string name="name_prefix">Прэфікс імені</string>
+  <string name="name_middle">Імя па бацьку</string>
+  <string name="name_suffix">Суфікс да імені</string>
+  <string name="name_phonetic">Вымаўленне імя</string>
+  <string name="name_phonetic_given">Вымаўленне імя</string>
+  <string name="name_phonetic_middle">Вымаўленне імені па бацьку / 2-га імені</string>
+  <string name="name_phonetic_family">Вымаўленне прозвішча</string>
+  <string name="phoneLabelsGroup">Тэлефон</string>
+  <string name="emailLabelsGroup">Электронная пошта</string>
+  <string name="postalLabelsGroup">Адрас</string>
+  <string name="imLabelsGroup">Iмгненныя паведамленнi</string>
+  <string name="organizationLabelsGroup">Установа</string>
+  <string name="relationLabelsGroup">Сувязі</string>
+  <string name="eventLabelsGroup">Асаблівая дата</string>
+  <string name="sms">Тэкставае паведамленне</string>
+  <string name="postal_address">Адрас</string>
+  <string name="ghostData_company">Кампанія</string>
+  <string name="ghostData_title">Назва</string>
+  <string name="label_notes">Нататкі</string>
+  <string name="label_sip_address">SIP</string>
+  <string name="websiteLabelsGroup">Вэб-сайт</string>
+  <string name="groupsLabel">Групы</string>
+  <string name="email_home">Паведамленне на хатні адрас электроннай пошты</string>
+  <string name="email_mobile">Адправіць электронную пошту на мабільны адрас</string>
+  <string name="email_work">Паведамленне на працоўную электронную пошту</string>
+  <string name="email_other">Электронная пошта</string>
+  <string name="email_custom">Адправiць лiст на адрас: %s</string>
+  <string name="email">Электронная пошта</string>
+  <string name="postal_street">Вуліца</string>
+  <string name="postal_city">Горад</string>
+  <string name="postal_region">Шт</string>
+  <string name="postal_postcode">Паштовы індэкс</string>
+  <string name="postal_country">Краіна</string>
+  <string name="map_home">Прагледзець хатні адрас</string>
+  <string name="map_work">Паглядзець працоўны адрас</string>
+  <string name="map_other">Прагледзець адрас</string>
+  <string name="map_custom">Паглядзець адрас \"%s\"</string>
+  <string name="chat_aim">Чат у AIM</string>
+  <string name="chat_msn">Чат у Windows Live</string>
+  <string name="chat_yahoo">Чат у Yahoo</string>
+  <string name="chat_skype">Чат у Skype</string>
+  <string name="chat_qq">Чат у QQ</string>
+  <string name="chat_gtalk">Чат у Google Talk</string>
+  <string name="chat_icq">Чат праз ICQ</string>
+  <string name="chat_jabber">Чат у Jabber</string>
+  <string name="chat">Гутарка</string>
+  <string name="list_filter_all_accounts">Усе кантакты</string>
+  <string name="listAllContactsInAccount">Кантакты карыстальнiка %s</string>
+  <string name="listCustomView">Кантакты ў карыстальнiцкiм выглядзе</string>
+  <string name="listSingleContact">Адзіночны кантакт</string>
+  <string name="display_options_sort_list_by">Сартаваць па</string>
+  <string name="display_options_sort_by_given_name">Імені</string>
+  <string name="display_options_sort_by_family_name">Прозвішчы</string>
+  <string name="display_options_view_names_as">Фармат імя</string>
+  <string name="display_options_view_given_name_first">Спачатку імя</string>
+  <string name="display_options_view_family_name_first">Спачатку прозвішча</string>
+  <string name="menu_clear_frequents">Выдалiць частыя кантакты</string>
+  <string name="action_menu_back_from_search">спыніць пошук</string>
+  <string name="description_clear_search">Ачысціць пошук</string>
+  <string name="select_account_dialog_title">Уліковы запіс</string>
+  <string name="set_default_account">Заўсёды выкарыст. гэта для выклікаў</string>
+  <string name="select_phone_account_for_calls">Выбраць SIM-карту для выкліку</string>
+  <string name="select_phone_account_for_calls_remember">Запомніць гэты выбар</string>
+  <string name="call_with_a_note">Выклік з нататкай</string>
+  <string name="call_subject_hint">Увесці нататку для адпраўкі з выклікам…</string>
+  <string name="send_and_call_button">АДПРАВІЦЬ І ВЫКЛІКАЦЬ</string>
+  <string name="call_subject_limit">%1$s / %2$s</string>
+  <string name="old_call_subject_type_and_number">%1$s %2$s</string>
+  <string name="tab_title">Укладка %1$s.</string>
+  <plurals name="tab_title_with_unread_items">
+    <item quantity="one">Укладка %1$s. %2$d непрачытаны элемент. </item>
+    <item quantity="few">Укладка %1$s. %2$d непрачытаныя элементы. </item>
+    <item quantity="many">Укладка %1$s. %2$d непрачытаных элементаў. </item>
+    <item quantity="other">Укладка %1$s. %2$d непрачытанага элемента. </item>
+  </plurals>
+  <string name="description_search_video_call">Відэавыклік</string>
+  <string name="description_search_call_and_share">Абагуліць і выклікаць</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-bg/strings.xml b/java/com/android/contacts/common/res/values-bg/strings.xml
index 2a1f2a6..ac3f79b 100644
--- a/java/com/android/contacts/common/res/values-bg/strings.xml
+++ b/java/com/android/contacts/common/res/values-bg/strings.xml
@@ -1,162 +1,145 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="toast_text_copied" msgid="8979281391599667362">"Текстът бе копиран"</string>
-    <string name="call_custom" msgid="3041673234638990874">"Обаждане на <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="call_home" msgid="125893483593803791">"Обаждане на домашен"</string>
-    <string name="call_mobile" msgid="967589404494150813">"Обаждане на мобилен"</string>
-    <string name="call_work" msgid="6040550697395300892">"Обаждане на служебен"</string>
-    <string name="call_fax_work" msgid="5260192771364592922">"Обаждане на служебен факс"</string>
-    <string name="call_fax_home" msgid="5174311195081144124">"Обаждане на домашен факс"</string>
-    <string name="call_pager" msgid="6814149227741274161">"Обаждане на пейджър"</string>
-    <string name="call_other" msgid="5536385588712587235">"Обаждане на"</string>
-    <string name="call_callback" msgid="6314019862718112786">"Обаждане на обратно обаждане"</string>
-    <string name="call_car" msgid="3197417098027764954">"Обаждане на номер в кола"</string>
-    <string name="call_company_main" msgid="2557663310028446397">"Обаждане на основен служебен"</string>
-    <string name="call_isdn" msgid="4691270442763649522">"Обаждане на ISDN"</string>
-    <string name="call_main" msgid="3293707608770407814">"Обаждане на основен"</string>
-    <string name="call_other_fax" msgid="4724521984879021465">"Обаждане на факс"</string>
-    <string name="call_radio" msgid="8942441419845057942">"Обаждане на радио"</string>
-    <string name="call_telex" msgid="2031514461660668351">"Обаждане на телекс"</string>
-    <string name="call_tty_tdd" msgid="7807210224965727701">"Обаждане на TTY/TDD"</string>
-    <string name="call_work_mobile" msgid="2716342732938578495">"Обаждане на служебен мобилен"</string>
-    <string name="call_work_pager" msgid="3791778749827366574">"Обаждане на служебен пейджър"</string>
-    <string name="call_assistant" msgid="4177478845473789294">"Обаждане на <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
-    <string name="call_mms" msgid="4958811711741872901">"Обаждане на MMS"</string>
-    <string name="sms_custom" msgid="8785368968605026317">"Изпращане на SMS на <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="sms_home" msgid="3527719551060295243">"Изпращaне на SMS на домашен"</string>
-    <string name="sms_mobile" msgid="8883045857887736518">"Изпращане на SMS на мобилен"</string>
-    <string name="sms_work" msgid="4158595439553450966">"Изпращане на SMS на служебен"</string>
-    <string name="sms_fax_work" msgid="5483726627718055248">"Изпращане на SMS на служебен факс"</string>
-    <string name="sms_fax_home" msgid="9219265155770746077">"Изпращане на SMS на домашен факс"</string>
-    <string name="sms_pager" msgid="4901085068525193933">"Изпращане на SMS на пейджър"</string>
-    <string name="sms_other" msgid="1742702947993285933">"Изпращане на SMS на"</string>
-    <string name="sms_callback" msgid="5833483630377538308">"Изпращане на SMS на отговорилия"</string>
-    <string name="sms_car" msgid="4314577266154395174">"Изпращане на SMS на номер в кола"</string>
-    <string name="sms_company_main" msgid="2308160928487360705">"Изпращaне на SMS на основен служебен"</string>
-    <string name="sms_isdn" msgid="6394300346179302542">"Изпращaне на SMS на ISDN"</string>
-    <string name="sms_main" msgid="8908087742014140774">"Изпращане на SMS на основен"</string>
-    <string name="sms_other_fax" msgid="8768455473295405427">"Изпращане на SMS на факс"</string>
-    <string name="sms_radio" msgid="855555176531704682">"Изпращане на SMS на радиотелефон"</string>
-    <string name="sms_telex" msgid="6269029276223252719">"Изпращане на SMS на телекс"</string>
-    <string name="sms_tty_tdd" msgid="6229057354509192444">"Изпращане на SMS на TTY/TDD"</string>
-    <string name="sms_work_mobile" msgid="2155975469329969840">"Изпращане на SMS на служебен мобилен"</string>
-    <string name="sms_work_pager" msgid="8500140274906830742">"Изпращане на SMS на служебен пейджър"</string>
-    <string name="sms_assistant" msgid="8513548482745330818">"Изпращане на SMS на <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
-    <string name="sms_mms" msgid="5187888900503248542">"Изпращане на SMS на MMS"</string>
-    <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"Да се изчистят ли често търсените?"</string>
-    <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"Ще изчистите списъка с често търсените в приложенията Контакти и Телефон и ще принудите приложенията за имейл да научат предпочитанията ви за адресите, започвайки отначало."</string>
-    <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"Често търсените се изчистват…"</string>
-    <string name="status_available" msgid="2648156525685472626">"Налице"</string>
-    <string name="status_away" msgid="2298688367552893953">"Отсъства"</string>
-    <string name="status_busy" msgid="5990832098713248503">"Зает/а"</string>
-    <string name="contactsList" msgid="8806067891419291513">"Контакти"</string>
-    <string name="contact_suggestions" msgid="3324166754807120006">"Водещи предложения"</string>
-    <string name="local_invisible_directory" msgid="4723238462733650090">"Други"</string>
-    <string name="directory_search_label" msgid="4621215895484025229">"Директория"</string>
-    <string name="directory_search_label_work" msgid="7679326282707414897">"Служебен указател"</string>
-    <string name="local_search_label" msgid="907622822323119235">"Всички контакти"</string>
-    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Предложения"</string>
-    <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Аз"</string>
-    <string name="missing_name" msgid="978606963362745020">"(Няма име)"</string>
-    <string name="description_view_contact_detail" msgid="2428742401208561136">"Преглед на контакта"</string>
-    <string name="list_filter_phones" msgid="8763316061763437182">"Всички контакти с телефонни номера"</string>
-    <string name="list_filter_phones_work" msgid="7083575404573422965">"Контакти в служебния потребителски профил"</string>
-    <string name="view_updates_from_group" msgid="9011641093168385729">"Преглед на актуализациите"</string>
-    <string name="account_phone" msgid="7067809073194061035">"Само на устройството, несинхронизиран"</string>
-    <string name="nameLabelsGroup" msgid="7730465833159557471">"Име"</string>
-    <string name="nicknameLabelsGroup" msgid="6310556912361840029">"Псевдоним"</string>
-    <string name="full_name" msgid="648186563998465740">"Име"</string>
-    <string name="name_given" msgid="5096576006314820536">"Собствено име"</string>
-    <string name="name_family" msgid="6646235805198547467">"Фамилно име"</string>
-    <string name="name_prefix" msgid="9215326539658838">"Обръщение"</string>
-    <string name="name_middle" msgid="703755205331582769">"Презиме"</string>
-    <string name="name_suffix" msgid="5777083390282548702">"Титла"</string>
-    <string name="name_phonetic" msgid="1650870996361663089">"Име (фонетично)"</string>
-    <string name="name_phonetic_given" msgid="618812334274603170">"Собствено име (фонетично)"</string>
-    <string name="name_phonetic_middle" msgid="4826820763384625538">"Презиме (фонетично)"</string>
-    <string name="name_phonetic_family" msgid="379905191212930771">"Фамилно име (фонетично)"</string>
-    <string name="phoneLabelsGroup" msgid="169661929021355548">"Телефон"</string>
-    <string name="emailLabelsGroup" msgid="2249752810477488833">"Изпращане на имейл"</string>
-    <string name="postalLabelsGroup" msgid="6772000590189142253">"Адрес"</string>
-    <string name="imLabelsGroup" msgid="5718066254237364731">"Незабавни съобщения"</string>
-    <string name="organizationLabelsGroup" msgid="1101996309241601435">"Организация"</string>
-    <string name="relationLabelsGroup" msgid="53866051664600053">"Връзки"</string>
-    <string name="eventLabelsGroup" msgid="1236970042646618489">"Специална дата"</string>
-    <string name="sms" msgid="7574344928185328095">"Текстово съобщение"</string>
-    <string name="postal_address" msgid="1804707930129674200">"Адрес"</string>
-    <string name="ghostData_company" msgid="2554310786296833424">"Фирма"</string>
-    <string name="ghostData_title" msgid="4994968731830184837">"Наименование"</string>
-    <string name="label_notes" msgid="2050255313694219786">"Бележки"</string>
-    <string name="label_sip_address" msgid="8883266182575965926">"SIP"</string>
-    <string name="websiteLabelsGroup" msgid="1630734286462186790">"Уебсайт"</string>
-    <string name="groupsLabel" msgid="2694002798416868728">"Групи"</string>
-    <string name="email_home" msgid="889830029388962171">"Изпращане на имейл до домашен"</string>
-    <string name="email_mobile" msgid="4487686436743741150">"Изпращане на имейл до мобилен"</string>
-    <string name="email_work" msgid="4223487303344613528">"Изпращане на имейл до служебен"</string>
-    <string name="email_other" msgid="4246411900126012062">"Изпращане на имейл"</string>
-    <string name="email_custom" msgid="7246580894327511013">"Изпращане на имейл до <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="email" msgid="2807318537887091606">"Изпращане на имейл"</string>
-    <string name="postal_street" msgid="6918171741240802474">"Улица"</string>
-    <string name="postal_city" msgid="8674569121430005628">"Град"</string>
-    <string name="postal_region" msgid="1730369286225469192">"Щат"</string>
-    <string name="postal_postcode" msgid="4450700741261990439">"Пощенски код"</string>
-    <string name="postal_country" msgid="232670707458768148">"Държава"</string>
-    <string name="map_home" msgid="4181131107392126938">"Преглед на домашния адрес"</string>
-    <string name="map_work" msgid="5723471185992684400">"Преглед на служебния адрес"</string>
-    <string name="map_other" msgid="2253764780863500516">"Преглед на адреса"</string>
-    <string name="map_custom" msgid="5581743097882436157">"Преглед на адреса: <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="chat_aim" msgid="2954364435497941659">"Чат по AIM"</string>
-    <string name="chat_msn" msgid="3130135239071228678">"Чат по Windows Live"</string>
-    <string name="chat_yahoo" msgid="3233552142326865347">"Чат по Yahoo"</string>
-    <string name="chat_skype" msgid="6486703981390592425">"Чат по Skype"</string>
-    <string name="chat_qq" msgid="786924280665740019">"Чат по QQ"</string>
-    <string name="chat_gtalk" msgid="7914674177243078035">"Чат по Google Talk"</string>
-    <string name="chat_icq" msgid="3292934726414765801">"Чат по ICQ"</string>
-    <string name="chat_jabber" msgid="6701542313597880204">"Чат по Jabber"</string>
-    <string name="chat" msgid="1020428260359370236">"Чат"</string>
-    <string name="list_filter_all_accounts" msgid="473782314881473992">"Всички контакти"</string>
-    <string name="listAllContactsInAccount" msgid="3486378621592995630">"Контакти във: <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="listCustomView" msgid="5306282632413086731">"Контакти в персонал. изглед"</string>
-    <string name="listSingleContact" msgid="8620818791932382627">"Един контакт"</string>
-    <string name="display_options_sort_list_by" msgid="3541875948367831228">"Сортиране по"</string>
-    <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"Собствено име"</string>
-    <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"Фамилно име"</string>
-    <string name="display_options_view_names_as" msgid="4204204205736735618">"Формат на името"</string>
-    <string name="display_options_view_given_name_first" msgid="2308026973021171020">"Първо собственото име"</string>
-    <string name="display_options_view_family_name_first" msgid="987430497292428242">"Първо фамилното име"</string>
-    <string name="menu_clear_frequents" msgid="5358271535047496120">"Изчистване на често търсените"</string>
-    <string name="action_menu_back_from_search" msgid="3550669942742167644">"спиране на търсенето"</string>
-    <string name="description_clear_search" msgid="2347258825265600782">"Изчистване на търсенето"</string>
-    <string name="select_account_dialog_title" msgid="2673504582803359239">"Профил"</string>
-    <string name="set_default_account" msgid="7966099951006467572">"Винаги да се използва за обаждания"</string>
-    <string name="select_phone_account_for_calls" msgid="1784460686103423274">"Обаждане чрез"</string>
-    <string name="call_with_a_note" msgid="6242261320491851133">"Обаждане, включващо бележка"</string>
-    <string name="call_subject_hint" msgid="7233138753650420800">"Напишете придружаваща бележка, която ще се изпрати при извършване на обаждането..."</string>
-    <string name="send_and_call_button" msgid="4735168294120154013">"ИЗПРАЩАНЕ И ОБАЖДАНЕ"</string>
-    <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g>/<xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="tab_title" msgid="3387876802026074288">"Раздел „<xliff:g id="TITLE">%1$s</xliff:g>“."</string>
-    <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
-      <item quantity="other">Раздел „<xliff:g id="TITLE_2">%1$s</xliff:g>“. <xliff:g id="COUNT_3">%2$d</xliff:g> непрочетени елемента. </item>
-      <item quantity="one">Раздел „<xliff:g id="TITLE_0">%1$s</xliff:g>“. <xliff:g id="COUNT_1">%2$d</xliff:g> непрочетен елемент. </item>
-    </plurals>
-    <string name="description_search_video_call" msgid="4337369876888024909">"Видеообаждане"</string>
-    <string name="description_search_call_and_share" msgid="4912772842755050467">"Споделяне и обаждане"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_custom">Обаждане на %s</string>
+  <string name="call_home">Обаждане на домашен</string>
+  <string name="call_mobile">Обаждане на мобилен</string>
+  <string name="call_work">Обаждане на служебен</string>
+  <string name="call_fax_work">Обаждане на служебен факс</string>
+  <string name="call_fax_home">Обаждане на домашен факс</string>
+  <string name="call_pager">Обаждане на пейджър</string>
+  <string name="call_other">Обаждане на</string>
+  <string name="call_callback">Обаждане на обратно обаждане</string>
+  <string name="call_car">Обаждане на номер в кола</string>
+  <string name="call_company_main">Обаждане на основен служебен</string>
+  <string name="call_isdn">Обаждане на ISDN</string>
+  <string name="call_main">Обаждане на основен</string>
+  <string name="call_other_fax">Обаждане на факс</string>
+  <string name="call_radio">Обаждане на радио</string>
+  <string name="call_telex">Обаждане на телекс</string>
+  <string name="call_tty_tdd">Обаждане на TTY/TDD</string>
+  <string name="call_work_mobile">Обаждане на служебен мобилен</string>
+  <string name="call_work_pager">Обаждане на служебен пейджър</string>
+  <string name="call_assistant">Обаждане на %s</string>
+  <string name="call_mms">Обаждане на MMS</string>
+  <string name="sms_custom">Изпращане на SMS на %s</string>
+  <string name="sms_home">Изпращaне на SMS на домашен</string>
+  <string name="sms_mobile">Изпращане на SMS на мобилен</string>
+  <string name="sms_work">Изпращане на SMS на служебен</string>
+  <string name="sms_fax_work">Изпращане на SMS на служебен факс</string>
+  <string name="sms_fax_home">Изпращане на SMS на домашен факс</string>
+  <string name="sms_pager">Изпращане на SMS на пейджър</string>
+  <string name="sms_other">Изпращане на SMS на</string>
+  <string name="sms_callback">Изпращане на SMS на отговорилия</string>
+  <string name="sms_car">Изпращане на SMS на номер в кола</string>
+  <string name="sms_company_main">Изпращaне на SMS на основен служебен</string>
+  <string name="sms_isdn">Изпращaне на SMS на ISDN</string>
+  <string name="sms_main">Изпращане на SMS на основен</string>
+  <string name="sms_other_fax">Изпращане на SMS на факс</string>
+  <string name="sms_radio">Изпращане на SMS на радиотелефон</string>
+  <string name="sms_telex">Изпращане на SMS на телекс</string>
+  <string name="sms_tty_tdd">Изпращане на SMS на TTY/TDD</string>
+  <string name="sms_work_mobile">Изпращане на SMS на служебен мобилен</string>
+  <string name="sms_work_pager">Изпращане на SMS на служебен пейджър</string>
+  <string name="sms_assistant">Изпращане на SMS на %s</string>
+  <string name="sms_mms">Изпращане на SMS на MMS</string>
+  <string name="clearFrequentsConfirmation_title">Да се изчистят ли често търсените?</string>
+  <string name="clearFrequentsConfirmation">Ще изчистите списъка с често търсените в приложенията Контакти и Телефон и ще принудите приложенията за имейл да научат предпочитанията ви за адресите, започвайки отначало.</string>
+  <string name="clearFrequentsProgress_title">Често търсените се изчистват…</string>
+  <string name="status_available">Налице</string>
+  <string name="status_away">Отсъства</string>
+  <string name="status_busy">Зает/а</string>
+  <string name="contactsList">Контакти</string>
+  <string name="contact_suggestions">Водещи предложения</string>
+  <string name="local_invisible_directory">Други</string>
+  <string name="directory_search_label">Директория</string>
+  <string name="directory_search_label_work">Служебен указател</string>
+  <string name="local_search_label">Всички контакти</string>
+  <string name="local_suggestions_search_label">Предложения</string>
+  <string msgid="9154761216179882405" name="user_profile_contacts_list_header">Аз</string>
+  <string name="missing_name">(Няма име)</string>
+  <string msgid="2795575601596468581" name="description_view_contact_detail">Преглед на контакта</string>
+  <string name="list_filter_phones">Всички контакти с телефонни номера</string>
+  <string name="list_filter_phones_work">Контакти в служебния потребителски профил</string>
+  <string name="view_updates_from_group">Преглед на актуализациите</string>
+  <string name="account_phone">Само на устройството, несинхронизиран</string>
+  <string name="nameLabelsGroup">Име</string>
+  <string name="nicknameLabelsGroup">Псевдоним</string>
+  <string name="full_name">Име</string>
+  <string name="name_given">Собствено име</string>
+  <string name="name_family">Фамилно име</string>
+  <string name="name_prefix">Обръщение</string>
+  <string name="name_middle">Презиме</string>
+  <string name="name_suffix">Титла</string>
+  <string name="name_phonetic">Име (фонетично)</string>
+  <string name="name_phonetic_given">Собствено име (фонетично)</string>
+  <string name="name_phonetic_middle">Презиме (фонетично)</string>
+  <string name="name_phonetic_family">Фамилно име (фонетично)</string>
+  <string name="phoneLabelsGroup">Телефон</string>
+  <string name="emailLabelsGroup">Изпращане на имейл</string>
+  <string name="postalLabelsGroup">Адрес</string>
+  <string name="imLabelsGroup">Незабавни съобщения</string>
+  <string name="organizationLabelsGroup">Организация</string>
+  <string name="relationLabelsGroup">Връзки</string>
+  <string name="eventLabelsGroup">Специална дата</string>
+  <string name="sms">Текстово съобщение</string>
+  <string name="postal_address">Адрес</string>
+  <string name="ghostData_company">Фирма</string>
+  <string name="ghostData_title">Наименование</string>
+  <string name="label_notes">Бележки</string>
+  <string name="label_sip_address">SIP</string>
+  <string name="websiteLabelsGroup">Уебсайт</string>
+  <string name="groupsLabel">Групи</string>
+  <string name="email_home">Изпращане на имейл до домашен</string>
+  <string name="email_mobile">Изпращане на имейл до мобилен</string>
+  <string name="email_work">Изпращане на имейл до служебен</string>
+  <string name="email_other">Изпращане на имейл</string>
+  <string name="email_custom">Изпращане на имейл до %s</string>
+  <string name="email">Изпращане на имейл</string>
+  <string name="postal_street">Улица</string>
+  <string name="postal_city">Град</string>
+  <string name="postal_region">Щат</string>
+  <string name="postal_postcode">Пощенски код</string>
+  <string name="postal_country">Държава</string>
+  <string name="map_home">Преглед на домашния адрес</string>
+  <string name="map_work">Преглед на служебния адрес</string>
+  <string name="map_other">Преглед на адреса</string>
+  <string name="map_custom">Преглед на адреса: %s</string>
+  <string name="chat_aim">Чат по AIM</string>
+  <string name="chat_msn">Чат по Windows Live</string>
+  <string name="chat_yahoo">Чат по Yahoo</string>
+  <string name="chat_skype">Чат по Skype</string>
+  <string name="chat_qq">Чат по QQ</string>
+  <string name="chat_gtalk">Чат по Google Talk</string>
+  <string name="chat_icq">Чат по ICQ</string>
+  <string name="chat_jabber">Чат по Jabber</string>
+  <string name="chat">Чат</string>
+  <string name="list_filter_all_accounts">Всички контакти</string>
+  <string name="listAllContactsInAccount">Контакти във: %s</string>
+  <string name="listCustomView">Контакти в персонал. изглед</string>
+  <string name="listSingleContact">Един контакт</string>
+  <string name="display_options_sort_list_by">Сортиране по</string>
+  <string name="display_options_sort_by_given_name">Собствено име</string>
+  <string name="display_options_sort_by_family_name">Фамилно име</string>
+  <string name="display_options_view_names_as">Формат на името</string>
+  <string name="display_options_view_given_name_first">Първо собственото име</string>
+  <string name="display_options_view_family_name_first">Първо фамилното име</string>
+  <string name="menu_clear_frequents">Изчистване на често търсените</string>
+  <string name="action_menu_back_from_search">спиране на търсенето</string>
+  <string name="description_clear_search">Изчистване на търсенето</string>
+  <string name="select_account_dialog_title">Профил</string>
+  <string name="set_default_account">Винаги да се използва за обаждания</string>
+  <string name="select_phone_account_for_calls">Изберете SIM карта за това обаждане</string>
+  <string name="select_phone_account_for_calls_remember">Запомняне на този избор</string>
+  <string name="call_with_a_note">Обаждане, включващо бележка</string>
+  <string name="call_subject_hint">Напишете придружаваща бележка, която ще се изпрати при извършване на обаждането...</string>
+  <string name="send_and_call_button">ИЗПРАЩАНЕ И ОБАЖДАНЕ</string>
+  <string name="call_subject_limit">%1$s/%2$s</string>
+  <string name="old_call_subject_type_and_number">%1$s %2$s</string>
+  <string name="tab_title">Раздел „%1$s“.</string>
+  <plurals name="tab_title_with_unread_items">
+    <item quantity="one">Раздел „%1$s“. %2$d непрочетен елемент. </item>
+    <item quantity="other">Раздел „%1$s“. %2$d непрочетени елемента. </item>
+  </plurals>
+  <string name="description_search_video_call">Видеообаждане</string>
+  <string name="description_search_call_and_share">Споделяне и обаждане</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-bn/strings.xml b/java/com/android/contacts/common/res/values-bn/strings.xml
index 49d6f5b..c6670a1 100644
--- a/java/com/android/contacts/common/res/values-bn/strings.xml
+++ b/java/com/android/contacts/common/res/values-bn/strings.xml
@@ -1,162 +1,145 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="toast_text_copied" msgid="8979281391599667362">"পাঠ্য অনুলিপি হয়েছে"</string>
-    <string name="call_custom" msgid="3041673234638990874">"<xliff:g id="CUSTOM">%s</xliff:g> এ কল করুন"</string>
-    <string name="call_home" msgid="125893483593803791">"বাড়ির নম্বরে কল করুন"</string>
-    <string name="call_mobile" msgid="967589404494150813">"মোবাইল নম্বরে কল করুন"</string>
-    <string name="call_work" msgid="6040550697395300892">"কর্মক্ষেত্রের নম্বরে কল করুন"</string>
-    <string name="call_fax_work" msgid="5260192771364592922">"কর্মক্ষেত্রের ফ্যাক্স নম্বরে কল করুন"</string>
-    <string name="call_fax_home" msgid="5174311195081144124">"বাড়ির ফ্যাক্স নম্বরে কল করুন"</string>
-    <string name="call_pager" msgid="6814149227741274161">"পেজার নম্বরে কল করুন"</string>
-    <string name="call_other" msgid="5536385588712587235">"কল করুন"</string>
-    <string name="call_callback" msgid="6314019862718112786">"কলব্যাক করার নম্বরে কল করুন"</string>
-    <string name="call_car" msgid="3197417098027764954">"গাড়ির ফোন নম্বরে কল করুন"</string>
-    <string name="call_company_main" msgid="2557663310028446397">"কোম্পানির প্রধান নম্বরে কল করুন"</string>
-    <string name="call_isdn" msgid="4691270442763649522">"ISDN নম্বরে কল করুন"</string>
-    <string name="call_main" msgid="3293707608770407814">"প্রধান নম্বরে কল করুন"</string>
-    <string name="call_other_fax" msgid="4724521984879021465">"ফ্যাক্স নম্বরে কল করুন"</string>
-    <string name="call_radio" msgid="8942441419845057942">"রেডিওর ফোন নম্বরে কল করুন"</string>
-    <string name="call_telex" msgid="2031514461660668351">"টেলেক্স নম্বরে কল করুন"</string>
-    <string name="call_tty_tdd" msgid="7807210224965727701">"TTY/TDD নম্বরে কল করুন"</string>
-    <string name="call_work_mobile" msgid="2716342732938578495">"অফিসের মোবাইল নম্বরে কল করুন"</string>
-    <string name="call_work_pager" msgid="3791778749827366574">"অফিসের পেজার নম্বরে কল করুন"</string>
-    <string name="call_assistant" msgid="4177478845473789294">"<xliff:g id="ASSISTANT">%s</xliff:g> এ কল করুন"</string>
-    <string name="call_mms" msgid="4958811711741872901">"MMS নম্বরে কল করুন"</string>
-    <string name="sms_custom" msgid="8785368968605026317">"<xliff:g id="CUSTOM">%s</xliff:g> নম্বরে পাঠ্য বার্তা পাঠান"</string>
-    <string name="sms_home" msgid="3527719551060295243">"ঘরের ফোন নম্বরে পাঠ্য বার্তা পাঠান"</string>
-    <string name="sms_mobile" msgid="8883045857887736518">"মোবাইল নম্বরে পাঠ্য বার্তা পাঠান"</string>
-    <string name="sms_work" msgid="4158595439553450966">"কর্মক্ষেত্রের নম্বরে পাঠ্য বার্তা পাঠান"</string>
-    <string name="sms_fax_work" msgid="5483726627718055248">"কার্মক্ষেত্রের ফ্যাক্স নম্বরে পাঠ্য বার্তা পাঠান"</string>
-    <string name="sms_fax_home" msgid="9219265155770746077">"বাড়ির ফ্যাক্স নম্বরে পাঠ্য বার্তা পাঠান"</string>
-    <string name="sms_pager" msgid="4901085068525193933">"পেজারের নম্বরে পাঠ্য বার্তা পাঠান"</string>
-    <string name="sms_other" msgid="1742702947993285933">"পাঠ্য বার্তা"</string>
-    <string name="sms_callback" msgid="5833483630377538308">"কলব্যাক করার নম্বরে পাঠ্য বার্তা পাঠান"</string>
-    <string name="sms_car" msgid="4314577266154395174">"গাড়ির ফোন নম্বরে পাঠ্য বার্তা পাঠান"</string>
-    <string name="sms_company_main" msgid="2308160928487360705">"কোম্পানির প্রধান ফোন নম্বরে পাঠ্য বার্তা পাঠান"</string>
-    <string name="sms_isdn" msgid="6394300346179302542">"ISDN ফোন নম্বরে পাঠ্য বার্তা পাঠান"</string>
-    <string name="sms_main" msgid="8908087742014140774">"প্রধান নম্বরে পাঠ্য বার্তা পাঠান"</string>
-    <string name="sms_other_fax" msgid="8768455473295405427">"ফ্যাক্স নম্বরে পাঠ্য বার্তা পাঠান"</string>
-    <string name="sms_radio" msgid="855555176531704682">"রেডিওর ফোন নম্বরে পাঠ্য বার্তা পাঠান"</string>
-    <string name="sms_telex" msgid="6269029276223252719">"টেলেক্স নম্বরে পাঠ্য বার্তা পাঠান"</string>
-    <string name="sms_tty_tdd" msgid="6229057354509192444">"TTY/TDD ফোন নম্বরে পাঠ্য বার্তা পাঠান"</string>
-    <string name="sms_work_mobile" msgid="2155975469329969840">"কর্মক্ষেত্রের মোবাইলে পাঠ্য বার্তা পাঠান"</string>
-    <string name="sms_work_pager" msgid="8500140274906830742">"কর্মক্ষেত্রের পেজারে পাঠ্য বার্তা পাঠান"</string>
-    <string name="sms_assistant" msgid="8513548482745330818">"<xliff:g id="ASSISTANT">%s</xliff:g> নম্বরে পাঠ্য বার্তা পাঠান"</string>
-    <string name="sms_mms" msgid="5187888900503248542">"MMS ফোন নম্বরে পাঠ্য বার্তা পাঠান"</string>
-    <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"ঘন ঘন যোগাযোগ করা হয়েছে এমন পরিচিতিগুলিকে সাফ করবেন?"</string>
-    <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"পরিচিতি এবং ফোন অ্যাপ্লিকেশানগুলি থেকে আপনি ঘন ঘন যোগাযোগ করা পরিচিতির তালিকা সাফ করবেন, এবং ইমেল অ্যাপ্লিকেশানগুলিকে আবার শুরু থেকে আপনার ঠিকানা অভিরুচি জানতে বাধ্য করবেন৷"</string>
-    <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"ঘন ঘন যোগাযোগ করা পরিচিতিগুলিকে সাফ করা হচ্ছে…"</string>
-    <string name="status_available" msgid="2648156525685472626">"উপলব্ধ"</string>
-    <string name="status_away" msgid="2298688367552893953">"অন্যত্র"</string>
-    <string name="status_busy" msgid="5990832098713248503">"ব্যস্ত"</string>
-    <string name="contactsList" msgid="8806067891419291513">"পরিচিতিগুলি"</string>
-    <string name="contact_suggestions" msgid="3324166754807120006">"শীর্ষস্থানীয় প্রস্তাবনা"</string>
-    <string name="local_invisible_directory" msgid="4723238462733650090">"অন্যান্য"</string>
-    <string name="directory_search_label" msgid="4621215895484025229">"ডিরেক্টরি"</string>
-    <string name="directory_search_label_work" msgid="7679326282707414897">"কাজের সংগ্রহ"</string>
-    <string name="local_search_label" msgid="907622822323119235">"সকল পরিচিতি"</string>
-    <string name="local_suggestions_search_label" msgid="1178575146224386118">"প্রস্তাবনাগুলি"</string>
-    <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"আমি"</string>
-    <string name="missing_name" msgid="978606963362745020">"(কোনও নাম নেই)"</string>
-    <string name="description_view_contact_detail" msgid="2428742401208561136">"পরিচিতি দেখুন"</string>
-    <string name="list_filter_phones" msgid="8763316061763437182">"ফোন নম্বর সহ সমস্ত পরিচিতি"</string>
-    <string name="list_filter_phones_work" msgid="7083575404573422965">"কর্মস্থলের প্রোফাইলের পরিচিতিগুলি"</string>
-    <string name="view_updates_from_group" msgid="9011641093168385729">"আপডেটগুলি দেখুন"</string>
-    <string name="account_phone" msgid="7067809073194061035">"শুধুমাত্র ডিভাইসে রয়েছে, সিঙ্ক করা হয়নি"</string>
-    <string name="nameLabelsGroup" msgid="7730465833159557471">"নাম"</string>
-    <string name="nicknameLabelsGroup" msgid="6310556912361840029">"ডাকনাম"</string>
-    <string name="full_name" msgid="648186563998465740">"নাম"</string>
-    <string name="name_given" msgid="5096576006314820536">"প্রথম নাম"</string>
-    <string name="name_family" msgid="6646235805198547467">"পদবি"</string>
-    <string name="name_prefix" msgid="9215326539658838">"নামের আগের অংশ"</string>
-    <string name="name_middle" msgid="703755205331582769">"মাঝের নাম"</string>
-    <string name="name_suffix" msgid="5777083390282548702">"নামের পরের অংশ"</string>
-    <string name="name_phonetic" msgid="1650870996361663089">"উচ্চারণগত নাম"</string>
-    <string name="name_phonetic_given" msgid="618812334274603170">"উচ্চারণগত প্রথম নাম"</string>
-    <string name="name_phonetic_middle" msgid="4826820763384625538">"উচ্চারণগত মাঝের নাম"</string>
-    <string name="name_phonetic_family" msgid="379905191212930771">"উচ্চারণগত পদবি"</string>
-    <string name="phoneLabelsGroup" msgid="169661929021355548">"ফোন"</string>
-    <string name="emailLabelsGroup" msgid="2249752810477488833">"ইমেল করুন"</string>
-    <string name="postalLabelsGroup" msgid="6772000590189142253">"ঠিকানা"</string>
-    <string name="imLabelsGroup" msgid="5718066254237364731">"IM"</string>
-    <string name="organizationLabelsGroup" msgid="1101996309241601435">"সংগঠন"</string>
-    <string name="relationLabelsGroup" msgid="53866051664600053">"সম্পর্ক"</string>
-    <string name="eventLabelsGroup" msgid="1236970042646618489">"বিশেষ তারিখ"</string>
-    <string name="sms" msgid="7574344928185328095">"পাঠ্য বার্তা"</string>
-    <string name="postal_address" msgid="1804707930129674200">"ঠিকানা"</string>
-    <string name="ghostData_company" msgid="2554310786296833424">"কোম্পানি"</string>
-    <string name="ghostData_title" msgid="4994968731830184837">"নাম"</string>
-    <string name="label_notes" msgid="2050255313694219786">"টীকাগুলি"</string>
-    <string name="label_sip_address" msgid="8883266182575965926">"SIP"</string>
-    <string name="websiteLabelsGroup" msgid="1630734286462186790">"ওয়েবসাইট"</string>
-    <string name="groupsLabel" msgid="2694002798416868728">"গোষ্ঠীগুলি"</string>
-    <string name="email_home" msgid="889830029388962171">"বাড়ির ইমেল ঠিকানায় ইমেল করুন"</string>
-    <string name="email_mobile" msgid="4487686436743741150">"মোবাইলের ইমেল ঠিকানায় ইমেল করুন"</string>
-    <string name="email_work" msgid="4223487303344613528">"কর্মক্ষেত্রের ইমেল ঠিকানায় ইমেল করুন"</string>
-    <string name="email_other" msgid="4246411900126012062">"ইমেল করুন"</string>
-    <string name="email_custom" msgid="7246580894327511013">"<xliff:g id="CUSTOM">%s</xliff:g> এ ইমেল করুন"</string>
-    <string name="email" msgid="2807318537887091606">"ইমেল করুন"</string>
-    <string name="postal_street" msgid="6918171741240802474">"রাস্তা"</string>
-    <string name="postal_city" msgid="8674569121430005628">"শহর"</string>
-    <string name="postal_region" msgid="1730369286225469192">"রাজ্য"</string>
-    <string name="postal_postcode" msgid="4450700741261990439">"পিন কোড"</string>
-    <string name="postal_country" msgid="232670707458768148">"দেশ"</string>
-    <string name="map_home" msgid="4181131107392126938">"বাড়ির ঠিকানা দেখুন"</string>
-    <string name="map_work" msgid="5723471185992684400">"কর্মক্ষেত্রের ঠিকানা দেখুন"</string>
-    <string name="map_other" msgid="2253764780863500516">"ঠিকানা দেখুন"</string>
-    <string name="map_custom" msgid="5581743097882436157">"<xliff:g id="CUSTOM">%s</xliff:g> ঠিকানা দেখুন"</string>
-    <string name="chat_aim" msgid="2954364435497941659">"AIM ব্যবহার করে চ্যাট করুন"</string>
-    <string name="chat_msn" msgid="3130135239071228678">"Windows Live ব্যবহার করে চ্যাট করুন"</string>
-    <string name="chat_yahoo" msgid="3233552142326865347">"Yahoo ব্যবহার করে চ্যাট করুন"</string>
-    <string name="chat_skype" msgid="6486703981390592425">"Skype ব্যবহার করে চ্যাট করুন"</string>
-    <string name="chat_qq" msgid="786924280665740019">"QQ ব্যবহার করে চ্যাট করুন"</string>
-    <string name="chat_gtalk" msgid="7914674177243078035">"Google Talk ব্যবহার করে চ্যাট করুন"</string>
-    <string name="chat_icq" msgid="3292934726414765801">"ICQ ব্যবহার করে চ্যাট করুন"</string>
-    <string name="chat_jabber" msgid="6701542313597880204">"Jabber ব্যবহার করে চ্যাট করুন"</string>
-    <string name="chat" msgid="1020428260359370236">"চ্যাট করুন"</string>
-    <string name="list_filter_all_accounts" msgid="473782314881473992">"সকল পরিচিতি"</string>
-    <string name="listAllContactsInAccount" msgid="3486378621592995630">"<xliff:g id="NAME">%s</xliff:g> এ পরিচিতিগুলি"</string>
-    <string name="listCustomView" msgid="5306282632413086731">"কাস্টম দৃশ্যে পরিচিতিগুলি"</string>
-    <string name="listSingleContact" msgid="8620818791932382627">"একক পরিচিতি"</string>
-    <string name="display_options_sort_list_by" msgid="3541875948367831228">"এই অনুসারে বাছুন"</string>
-    <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"প্রথম নাম"</string>
-    <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"পদবি"</string>
-    <string name="display_options_view_names_as" msgid="4204204205736735618">"নামের বিন্যাস"</string>
-    <string name="display_options_view_given_name_first" msgid="2308026973021171020">"প্রথমে প্রথম নামটি"</string>
-    <string name="display_options_view_family_name_first" msgid="987430497292428242">"প্রথমে উপাধি"</string>
-    <string name="menu_clear_frequents" msgid="5358271535047496120">"পুনরাবৃত্তি সাফ করুন"</string>
-    <string name="action_menu_back_from_search" msgid="3550669942742167644">"অনুসন্ধান বন্ধ করুন"</string>
-    <string name="description_clear_search" msgid="2347258825265600782">"অনুসন্ধান সাফ করুন"</string>
-    <string name="select_account_dialog_title" msgid="2673504582803359239">"অ্যাকাউন্ট"</string>
-    <string name="set_default_account" msgid="7966099951006467572">"কলের জন্য সবসময় এটি ব্যবহার করুন"</string>
-    <string name="select_phone_account_for_calls" msgid="1784460686103423274">"এর মাধ্যমে কল করুন"</string>
-    <string name="call_with_a_note" msgid="6242261320491851133">"একটি নোট সহ কল করুন"</string>
-    <string name="call_subject_hint" msgid="7233138753650420800">"কলের সাথে পাঠানোর জন্য একটি নোট লিখুন ..."</string>
-    <string name="send_and_call_button" msgid="4735168294120154013">"পাঠান এবং কল করুন"</string>
-    <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="tab_title" msgid="3387876802026074288">"<xliff:g id="TITLE">%1$s</xliff:g> ট্যাব৷"</string>
-    <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
-      <item quantity="one"> <xliff:g id="TITLE_2">%1$s</xliff:g> ট্যাব৷ <xliff:g id="COUNT_3">%2$d</xliff:g>টি অপঠিত আইটেম৷ </item>
-      <item quantity="other"> <xliff:g id="TITLE_2">%1$s</xliff:g> ট্যাব৷ <xliff:g id="COUNT_3">%2$d</xliff:g>টি অপঠিত আইটেম৷ </item>
-    </plurals>
-    <string name="description_search_video_call" msgid="4337369876888024909">"ভিডিও কল"</string>
-    <string name="description_search_call_and_share" msgid="4912772842755050467">"শেয়ার এবং কল করুন"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_custom">%s এ কল করুন</string>
+  <string name="call_home">বাড়ির নম্বরে কল করুন</string>
+  <string name="call_mobile">মোবাইল নম্বরে কল করুন</string>
+  <string name="call_work">কর্মক্ষেত্রের নম্বরে কল করুন</string>
+  <string name="call_fax_work">কর্মক্ষেত্রের ফ্যাক্স নম্বরে কল করুন</string>
+  <string name="call_fax_home">বাড়ির ফ্যাক্স নম্বরে কল করুন</string>
+  <string name="call_pager">পেজার নম্বরে কল করুন</string>
+  <string name="call_other">কল করুন</string>
+  <string name="call_callback">কলব্যাক করার নম্বরে কল করুন</string>
+  <string name="call_car">গাড়ির ফোন নম্বরে কল করুন</string>
+  <string name="call_company_main">কোম্পানির প্রধান নম্বরে কল করুন</string>
+  <string name="call_isdn">ISDN নম্বরে কল করুন</string>
+  <string name="call_main">প্রধান নম্বরে কল করুন</string>
+  <string name="call_other_fax">ফ্যাক্স নম্বরে কল করুন</string>
+  <string name="call_radio">রেডিওর ফোন নম্বরে কল করুন</string>
+  <string name="call_telex">টেলেক্স নম্বরে কল করুন</string>
+  <string name="call_tty_tdd">TTY/TDD নম্বরে কল করুন</string>
+  <string name="call_work_mobile">অফিসের মোবাইল নম্বরে কল করুন</string>
+  <string name="call_work_pager">অফিসের পেজার নম্বরে কল করুন</string>
+  <string name="call_assistant">%s এ কল করুন</string>
+  <string name="call_mms">MMS নম্বরে কল করুন</string>
+  <string name="sms_custom">%s নম্বরে পাঠ্য বার্তা পাঠান</string>
+  <string name="sms_home">ঘরের ফোন নম্বরে পাঠ্য বার্তা পাঠান</string>
+  <string name="sms_mobile">মোবাইল নম্বরে পাঠ্য বার্তা পাঠান</string>
+  <string name="sms_work">কর্মক্ষেত্রের নম্বরে পাঠ্য বার্তা পাঠান</string>
+  <string name="sms_fax_work">কার্মক্ষেত্রের ফ্যাক্স নম্বরে পাঠ্য বার্তা পাঠান</string>
+  <string name="sms_fax_home">বাড়ির ফ্যাক্স নম্বরে পাঠ্য বার্তা পাঠান</string>
+  <string name="sms_pager">পেজারের নম্বরে পাঠ্য বার্তা পাঠান</string>
+  <string name="sms_other">পাঠ্য বার্তা</string>
+  <string name="sms_callback">কলব্যাক করার নম্বরে পাঠ্য বার্তা পাঠান</string>
+  <string name="sms_car">গাড়ির ফোন নম্বরে পাঠ্য বার্তা পাঠান</string>
+  <string name="sms_company_main">কোম্পানির প্রধান ফোন নম্বরে পাঠ্য বার্তা পাঠান</string>
+  <string name="sms_isdn">ISDN ফোন নম্বরে পাঠ্য বার্তা পাঠান</string>
+  <string name="sms_main">প্রধান নম্বরে পাঠ্য বার্তা পাঠান</string>
+  <string name="sms_other_fax">ফ্যাক্স নম্বরে পাঠ্য বার্তা পাঠান</string>
+  <string name="sms_radio">রেডিওর ফোন নম্বরে পাঠ্য বার্তা পাঠান</string>
+  <string name="sms_telex">টেলেক্স নম্বরে পাঠ্য বার্তা পাঠান</string>
+  <string name="sms_tty_tdd">TTY/TDD ফোন নম্বরে পাঠ্য বার্তা পাঠান</string>
+  <string name="sms_work_mobile">কর্মক্ষেত্রের মোবাইলে পাঠ্য বার্তা পাঠান</string>
+  <string name="sms_work_pager">কর্মক্ষেত্রের পেজারে পাঠ্য বার্তা পাঠান</string>
+  <string name="sms_assistant">%s নম্বরে পাঠ্য বার্তা পাঠান</string>
+  <string name="sms_mms">MMS ফোন নম্বরে পাঠ্য বার্তা পাঠান</string>
+  <string name="clearFrequentsConfirmation_title">ঘন ঘন যোগাযোগ করা হয়েছে এমন পরিচিতিগুলিকে সাফ করবেন?</string>
+  <string name="clearFrequentsConfirmation">পরিচিতি এবং ফোন অ্যাপ্লিকেশানগুলি থেকে আপনি ঘন ঘন যোগাযোগ করা পরিচিতির তালিকা সাফ করবেন, এবং ইমেল অ্যাপ্লিকেশানগুলিকে আবার শুরু থেকে আপনার ঠিকানা অভিরুচি জানতে বাধ্য করবেন৷</string>
+  <string name="clearFrequentsProgress_title">ঘন ঘন যোগাযোগ করা পরিচিতিগুলিকে সাফ করা হচ্ছে…</string>
+  <string name="status_available">উপলব্ধ</string>
+  <string name="status_away">অন্যত্র</string>
+  <string name="status_busy">ব্যস্ত</string>
+  <string name="contactsList">পরিচিতিগুলি</string>
+  <string name="contact_suggestions">শীর্ষস্থানীয় প্রস্তাবনা</string>
+  <string name="local_invisible_directory">অন্যান্য</string>
+  <string name="directory_search_label">ডিরেক্টরি</string>
+  <string name="directory_search_label_work">কাজের সংগ্রহ</string>
+  <string name="local_search_label">সকল পরিচিতি</string>
+  <string name="local_suggestions_search_label">প্রস্তাবনাগুলি</string>
+  <string msgid="9154761216179882405" name="user_profile_contacts_list_header">আমি</string>
+  <string name="missing_name">(কোনও নাম নেই)</string>
+  <string msgid="2795575601596468581" name="description_view_contact_detail">পরিচিতি দেখুন</string>
+  <string name="list_filter_phones">ফোন নম্বর সহ সমস্ত পরিচিতি</string>
+  <string name="list_filter_phones_work">কর্মস্থলের প্রোফাইলের পরিচিতিগুলি</string>
+  <string name="view_updates_from_group">আপডেটগুলি দেখুন</string>
+  <string name="account_phone">শুধুমাত্র ডিভাইসে রয়েছে, সিঙ্ক করা হয়নি</string>
+  <string name="nameLabelsGroup">নাম</string>
+  <string name="nicknameLabelsGroup">ডাকনাম</string>
+  <string name="full_name">নাম</string>
+  <string name="name_given">প্রথম নাম</string>
+  <string name="name_family">পদবি</string>
+  <string name="name_prefix">নামের আগের অংশ</string>
+  <string name="name_middle">মাঝের নাম</string>
+  <string name="name_suffix">নামের পরের অংশ</string>
+  <string name="name_phonetic">উচ্চারণগত নাম</string>
+  <string name="name_phonetic_given">উচ্চারণগত প্রথম নাম</string>
+  <string name="name_phonetic_middle">উচ্চারণগত মাঝের নাম</string>
+  <string name="name_phonetic_family">উচ্চারণগত পদবি</string>
+  <string name="phoneLabelsGroup">ফোন</string>
+  <string name="emailLabelsGroup">ইমেল করুন</string>
+  <string name="postalLabelsGroup">ঠিকানা</string>
+  <string name="imLabelsGroup">IM</string>
+  <string name="organizationLabelsGroup">সংগঠন</string>
+  <string name="relationLabelsGroup">সম্পর্ক</string>
+  <string name="eventLabelsGroup">বিশেষ তারিখ</string>
+  <string name="sms">পাঠ্য বার্তা</string>
+  <string name="postal_address">ঠিকানা</string>
+  <string name="ghostData_company">কোম্পানি</string>
+  <string name="ghostData_title">নাম</string>
+  <string name="label_notes">টীকাগুলি</string>
+  <string name="label_sip_address">SIP</string>
+  <string name="websiteLabelsGroup">ওয়েবসাইট</string>
+  <string name="groupsLabel">গোষ্ঠীগুলি</string>
+  <string name="email_home">বাড়ির ইমেল ঠিকানায় ইমেল করুন</string>
+  <string name="email_mobile">মোবাইলের ইমেল ঠিকানায় ইমেল করুন</string>
+  <string name="email_work">কর্মক্ষেত্রের ইমেল ঠিকানায় ইমেল করুন</string>
+  <string name="email_other">ইমেল করুন</string>
+  <string name="email_custom">%s এ ইমেল করুন</string>
+  <string name="email">ইমেল করুন</string>
+  <string name="postal_street">রাস্তা</string>
+  <string name="postal_city">শহর</string>
+  <string name="postal_region">রাজ্য</string>
+  <string name="postal_postcode">পিন কোড</string>
+  <string name="postal_country">দেশ</string>
+  <string name="map_home">বাড়ির ঠিকানা দেখুন</string>
+  <string name="map_work">কর্মক্ষেত্রের ঠিকানা দেখুন</string>
+  <string name="map_other">ঠিকানা দেখুন</string>
+  <string name="map_custom">%s ঠিকানা দেখুন</string>
+  <string name="chat_aim">AIM ব্যবহার করে চ্যাট করুন</string>
+  <string name="chat_msn">Windows Live ব্যবহার করে চ্যাট করুন</string>
+  <string name="chat_yahoo">Yahoo ব্যবহার করে চ্যাট করুন</string>
+  <string name="chat_skype">Skype ব্যবহার করে চ্যাট করুন</string>
+  <string name="chat_qq">QQ ব্যবহার করে চ্যাট করুন</string>
+  <string name="chat_gtalk">Google Talk ব্যবহার করে চ্যাট করুন</string>
+  <string name="chat_icq">ICQ ব্যবহার করে চ্যাট করুন</string>
+  <string name="chat_jabber">Jabber ব্যবহার করে চ্যাট করুন</string>
+  <string name="chat">চ্যাট করুন</string>
+  <string name="list_filter_all_accounts">সকল পরিচিতি</string>
+  <string name="listAllContactsInAccount">%s এ পরিচিতিগুলি</string>
+  <string name="listCustomView">কাস্টম দৃশ্যে পরিচিতিগুলি</string>
+  <string name="listSingleContact">একক পরিচিতি</string>
+  <string name="display_options_sort_list_by">এই অনুসারে বাছুন</string>
+  <string name="display_options_sort_by_given_name">প্রথম নাম</string>
+  <string name="display_options_sort_by_family_name">পদবি</string>
+  <string name="display_options_view_names_as">নামের বিন্যাস</string>
+  <string name="display_options_view_given_name_first">প্রথমে প্রথম নামটি</string>
+  <string name="display_options_view_family_name_first">প্রথমে উপাধি</string>
+  <string name="menu_clear_frequents">পুনরাবৃত্তি সাফ করুন</string>
+  <string name="action_menu_back_from_search">সার্চ বন্ধ করুন</string>
+  <string name="description_clear_search">সার্চ সাফ করুন</string>
+  <string name="select_account_dialog_title">অ্যাকাউন্ট</string>
+  <string name="set_default_account">কলের জন্য সবসময় এটি ব্যবহার করুন</string>
+  <string name="select_phone_account_for_calls">এই কলের জন্য সিম বেছে নিন</string>
+  <string name="select_phone_account_for_calls_remember">এই পছন্দটি মনে রাখব</string>
+  <string name="call_with_a_note">একটি নোট সহ কল করুন</string>
+  <string name="call_subject_hint">কলের সাথে পাঠানোর জন্য একটি নোট লিখুন ...</string>
+  <string name="send_and_call_button">পাঠান এবং কল করুন</string>
+  <string name="call_subject_limit">%1$s / %2$s</string>
+  <string name="old_call_subject_type_and_number">%1$s %2$s</string>
+  <string name="tab_title">%1$s ট্যাব৷</string>
+  <plurals name="tab_title_with_unread_items">
+    <item quantity="one"> %1$s ট্যাব৷ %2$dটি অপঠিত আইটেম৷ </item>
+    <item quantity="other"> %1$s ট্যাব৷ %2$dটি অপঠিত আইটেম৷ </item>
+  </plurals>
+  <string name="description_search_video_call">ভিডিও কল</string>
+  <string name="description_search_call_and_share">শেয়ার এবং কল করুন</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-bs/strings.xml b/java/com/android/contacts/common/res/values-bs/strings.xml
index 3e053d0..6ef6bdd 100644
--- a/java/com/android/contacts/common/res/values-bs/strings.xml
+++ b/java/com/android/contacts/common/res/values-bs/strings.xml
@@ -1,163 +1,146 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="toast_text_copied" msgid="8979281391599667362">"Tekst je kopiran"</string>
-    <string name="call_custom" msgid="3041673234638990874">"Pozovi <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="call_home" msgid="125893483593803791">"Pozovi kuću"</string>
-    <string name="call_mobile" msgid="967589404494150813">"Pozovi mobitel"</string>
-    <string name="call_work" msgid="6040550697395300892">"Pozovi posao"</string>
-    <string name="call_fax_work" msgid="5260192771364592922">"Pozovi poslovni faks"</string>
-    <string name="call_fax_home" msgid="5174311195081144124">"Pozovi kućni faks"</string>
-    <string name="call_pager" msgid="6814149227741274161">"Pozovi pejdžer"</string>
-    <string name="call_other" msgid="5536385588712587235">"Pozovi"</string>
-    <string name="call_callback" msgid="6314019862718112786">"Pozovi broj za uzvraćanje poziva"</string>
-    <string name="call_car" msgid="3197417098027764954">"Pozovi automobil"</string>
-    <string name="call_company_main" msgid="2557663310028446397">"Pozovi glavni broj kompanije"</string>
-    <string name="call_isdn" msgid="4691270442763649522">"Pozovi ISDN"</string>
-    <string name="call_main" msgid="3293707608770407814">"Pozovi glavni broj"</string>
-    <string name="call_other_fax" msgid="4724521984879021465">"Pozovi faks"</string>
-    <string name="call_radio" msgid="8942441419845057942">"Pozovi radio"</string>
-    <string name="call_telex" msgid="2031514461660668351">"Pozovi teleks"</string>
-    <string name="call_tty_tdd" msgid="7807210224965727701">"Pozovi TTY/TDD"</string>
-    <string name="call_work_mobile" msgid="2716342732938578495">"Pozovi poslovni mobitel"</string>
-    <string name="call_work_pager" msgid="3791778749827366574">"Pozovi poslovni pejdžer"</string>
-    <string name="call_assistant" msgid="4177478845473789294">"Pozovi <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
-    <string name="call_mms" msgid="4958811711741872901">"Pozovi MMS"</string>
-    <string name="sms_custom" msgid="8785368968605026317">"Pošalji tekstualnu poruku na <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="sms_home" msgid="3527719551060295243">"Pošalji tekstualnu poruku na kućni broj"</string>
-    <string name="sms_mobile" msgid="8883045857887736518">"Pošalji tekstualnu poruku na mobilni"</string>
-    <string name="sms_work" msgid="4158595439553450966">"Pošalji tekstualnu poruku na poslovni broj"</string>
-    <string name="sms_fax_work" msgid="5483726627718055248">"Pošalji tekstualnu poruku na poslovni faks"</string>
-    <string name="sms_fax_home" msgid="9219265155770746077">"Pošalji tekstualnu poruku na kućni faks"</string>
-    <string name="sms_pager" msgid="4901085068525193933">"Pošalji tekstualnu poruku na pejdžer"</string>
-    <string name="sms_other" msgid="1742702947993285933">"Pošalji tekstualnu poruku"</string>
-    <string name="sms_callback" msgid="5833483630377538308">"Pošalji tekstualnu poruku na broj za povratni poziv"</string>
-    <string name="sms_car" msgid="4314577266154395174">"Pošalji tekstualnu poruku na automobil"</string>
-    <string name="sms_company_main" msgid="2308160928487360705">"Pošalji tekstualnu poruku na glavni broj kompanije"</string>
-    <string name="sms_isdn" msgid="6394300346179302542">"Pošalji tekstualnu poruku na ISDN"</string>
-    <string name="sms_main" msgid="8908087742014140774">"Pošalji tekstualnu poruku na glavni broj"</string>
-    <string name="sms_other_fax" msgid="8768455473295405427">"Pošalji tekstualnu poruku na faks"</string>
-    <string name="sms_radio" msgid="855555176531704682">"Pošalji tekstualnu poruku na radio"</string>
-    <string name="sms_telex" msgid="6269029276223252719">"Pošalji tekstualnu poruku na teleks"</string>
-    <string name="sms_tty_tdd" msgid="6229057354509192444">"Pošalji tekstualnu poruku na TTY/TDD"</string>
-    <string name="sms_work_mobile" msgid="2155975469329969840">"Pošalji tekstualnu poruku na poslovni mobitel"</string>
-    <string name="sms_work_pager" msgid="8500140274906830742">"Pošalji tekstualnu poruku na poslovni pejdžer"</string>
-    <string name="sms_assistant" msgid="8513548482745330818">"Pošalji tekstualnu poruku <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
-    <string name="sms_mms" msgid="5187888900503248542">"Pošalji tekstualnu poruku na MMS broj"</string>
-    <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"Obrisati često kontaktirane osobe?"</string>
-    <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"Obrisat ćete listu često kontaktiranih osoba u aplikaciji Kontakti i Aplikaciji za telefon, pa će aplikacije za e-poštu morati ispočetka učiti vaše postavke adresa."</string>
-    <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"Brisanje često kontaktiranih osoba…"</string>
-    <string name="status_available" msgid="2648156525685472626">"Dostupno"</string>
-    <string name="status_away" msgid="2298688367552893953">"Odsutan"</string>
-    <string name="status_busy" msgid="5990832098713248503">"Zauzeto"</string>
-    <string name="contactsList" msgid="8806067891419291513">"Kontakti"</string>
-    <string name="contact_suggestions" msgid="3324166754807120006">"Najbolji prijedlozi"</string>
-    <string name="local_invisible_directory" msgid="4723238462733650090">"Ostalo"</string>
-    <string name="directory_search_label" msgid="4621215895484025229">"Imenik"</string>
-    <string name="directory_search_label_work" msgid="7679326282707414897">"Poslovni imenik"</string>
-    <string name="local_search_label" msgid="907622822323119235">"Svi kontakti"</string>
-    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Prijedlozi"</string>
-    <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Ja"</string>
-    <string name="missing_name" msgid="978606963362745020">"(Bez imena)"</string>
-    <string name="description_view_contact_detail" msgid="2428742401208561136">"Prikaži kontakt"</string>
-    <string name="list_filter_phones" msgid="8763316061763437182">"Svi kontakti s brojevima telefona"</string>
-    <string name="list_filter_phones_work" msgid="7083575404573422965">"Kontakti radnog profila"</string>
-    <string name="view_updates_from_group" msgid="9011641093168385729">"Prikaži ažuriranja"</string>
-    <string name="account_phone" msgid="7067809073194061035">"Samo uređaj, nesinhroniziran"</string>
-    <string name="nameLabelsGroup" msgid="7730465833159557471">"Ime"</string>
-    <string name="nicknameLabelsGroup" msgid="6310556912361840029">"Nadimak"</string>
-    <string name="full_name" msgid="648186563998465740">"Ime"</string>
-    <string name="name_given" msgid="5096576006314820536">"Ime"</string>
-    <string name="name_family" msgid="6646235805198547467">"Prezime"</string>
-    <string name="name_prefix" msgid="9215326539658838">"Prefiks imena"</string>
-    <string name="name_middle" msgid="703755205331582769">"Srednje ime"</string>
-    <string name="name_suffix" msgid="5777083390282548702">"Sufiks imena"</string>
-    <string name="name_phonetic" msgid="1650870996361663089">"Fonetsko ime"</string>
-    <string name="name_phonetic_given" msgid="618812334274603170">"Fonetsko ime"</string>
-    <string name="name_phonetic_middle" msgid="4826820763384625538">"Fonetsko srednje ime"</string>
-    <string name="name_phonetic_family" msgid="379905191212930771">"Fonetsko prezime"</string>
-    <string name="phoneLabelsGroup" msgid="169661929021355548">"Telefon"</string>
-    <string name="emailLabelsGroup" msgid="2249752810477488833">"E-pošta"</string>
-    <string name="postalLabelsGroup" msgid="6772000590189142253">"Adresa"</string>
-    <string name="imLabelsGroup" msgid="5718066254237364731">"IM"</string>
-    <string name="organizationLabelsGroup" msgid="1101996309241601435">"Organizacija"</string>
-    <string name="relationLabelsGroup" msgid="53866051664600053">"Odnos"</string>
-    <string name="eventLabelsGroup" msgid="1236970042646618489">"Posebni datum"</string>
-    <string name="sms" msgid="7574344928185328095">"Tekstualna poruka"</string>
-    <string name="postal_address" msgid="1804707930129674200">"Adresa"</string>
-    <string name="ghostData_company" msgid="2554310786296833424">"Kompanija"</string>
-    <string name="ghostData_title" msgid="4994968731830184837">"Naziv"</string>
-    <string name="label_notes" msgid="2050255313694219786">"Bilješke"</string>
-    <string name="label_sip_address" msgid="8883266182575965926">"SIP"</string>
-    <string name="websiteLabelsGroup" msgid="1630734286462186790">"Web stranica"</string>
-    <string name="groupsLabel" msgid="2694002798416868728">"Grupe"</string>
-    <string name="email_home" msgid="889830029388962171">"Pošalji e-poruku na kućnu adresu e-pošte"</string>
-    <string name="email_mobile" msgid="4487686436743741150">"Mobilna e-pošta"</string>
-    <string name="email_work" msgid="4223487303344613528">"Pošalji e-poruku na poslovnu adresu e-pošte"</string>
-    <string name="email_other" msgid="4246411900126012062">"E-pošta"</string>
-    <string name="email_custom" msgid="7246580894327511013">"E-pošta <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="email" msgid="2807318537887091606">"E-pošta"</string>
-    <string name="postal_street" msgid="6918171741240802474">"Ulica"</string>
-    <string name="postal_city" msgid="8674569121430005628">"Grad"</string>
-    <string name="postal_region" msgid="1730369286225469192">"Država"</string>
-    <string name="postal_postcode" msgid="4450700741261990439">"Poštanski broj"</string>
-    <string name="postal_country" msgid="232670707458768148">"Država"</string>
-    <string name="map_home" msgid="4181131107392126938">"Prikaži kućnu adresu"</string>
-    <string name="map_work" msgid="5723471185992684400">"Prikaži poslovnu adresu"</string>
-    <string name="map_other" msgid="2253764780863500516">"Prikaži adresu"</string>
-    <string name="map_custom" msgid="5581743097882436157">"Prikaži adresu <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="chat_aim" msgid="2954364435497941659">"Chat putem aplikacije AIM"</string>
-    <string name="chat_msn" msgid="3130135239071228678">"Chat putem aplikacije Windows Live"</string>
-    <string name="chat_yahoo" msgid="3233552142326865347">"Chat putem aplikacije Yahoo"</string>
-    <string name="chat_skype" msgid="6486703981390592425">"Chat putem aplikacije Skype"</string>
-    <string name="chat_qq" msgid="786924280665740019">"Chat putem aplikacije QQ"</string>
-    <string name="chat_gtalk" msgid="7914674177243078035">"Chat putem aplikacije Google Talk"</string>
-    <string name="chat_icq" msgid="3292934726414765801">"Chat putem aplikacije ICQ"</string>
-    <string name="chat_jabber" msgid="6701542313597880204">"Chat putem aplikacije Jabber"</string>
-    <string name="chat" msgid="1020428260359370236">"Chat"</string>
-    <string name="list_filter_all_accounts" msgid="473782314881473992">"Svi kontakti"</string>
-    <string name="listAllContactsInAccount" msgid="3486378621592995630">"Kontakti na računu <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="listCustomView" msgid="5306282632413086731">"Kontakti u prilagođenom prikazu"</string>
-    <string name="listSingleContact" msgid="8620818791932382627">"Jedan kontakt"</string>
-    <string name="display_options_sort_list_by" msgid="3541875948367831228">"Poredaj po"</string>
-    <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"Ime"</string>
-    <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"Prezime"</string>
-    <string name="display_options_view_names_as" msgid="4204204205736735618">"Format imena"</string>
-    <string name="display_options_view_given_name_first" msgid="2308026973021171020">"Ime prvo"</string>
-    <string name="display_options_view_family_name_first" msgid="987430497292428242">"Prezime prvo"</string>
-    <string name="menu_clear_frequents" msgid="5358271535047496120">"Obriši često kontaktirane"</string>
-    <string name="action_menu_back_from_search" msgid="3550669942742167644">"zaustavi pretraživanje"</string>
-    <string name="description_clear_search" msgid="2347258825265600782">"Obriši pretragu"</string>
-    <string name="select_account_dialog_title" msgid="2673504582803359239">"Račun"</string>
-    <string name="set_default_account" msgid="7966099951006467572">"Uvijek koristi ovu karticu za pozive"</string>
-    <string name="select_phone_account_for_calls" msgid="1784460686103423274">"Poziv putem"</string>
-    <string name="call_with_a_note" msgid="6242261320491851133">"Poziv s bilješkom"</string>
-    <string name="call_subject_hint" msgid="7233138753650420800">"Upišite bilješku koja će se poslati uz poziv ..."</string>
-    <string name="send_and_call_button" msgid="4735168294120154013">"POŠALJI I POZOVI"</string>
-    <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="tab_title" msgid="3387876802026074288">"Kartica <xliff:g id="TITLE">%1$s</xliff:g>."</string>
-    <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
-      <item quantity="one"> Kartica <xliff:g id="TITLE_2">%1$s</xliff:g>. <xliff:g id="COUNT_3">%2$d</xliff:g> nepročitana stavka. </item>
-      <item quantity="few"> Kartica <xliff:g id="TITLE_2">%1$s</xliff:g>. <xliff:g id="COUNT_3">%2$d</xliff:g> nepročitane stavke. </item>
-      <item quantity="other"> Kartica <xliff:g id="TITLE_2">%1$s</xliff:g>. <xliff:g id="COUNT_3">%2$d</xliff:g> nepročitanih stavki. </item>
-    </plurals>
-    <string name="description_search_video_call" msgid="4337369876888024909">"Videopoziv"</string>
-    <string name="description_search_call_and_share" msgid="4912772842755050467">"Podijeli i pozovi"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_custom">Pozovi %s</string>
+  <string name="call_home">Pozovi kuću</string>
+  <string name="call_mobile">Pozovi mobitel</string>
+  <string name="call_work">Pozovi posao</string>
+  <string name="call_fax_work">Pozovi poslovni faks</string>
+  <string name="call_fax_home">Pozovi kućni faks</string>
+  <string name="call_pager">Pozovi pejdžer</string>
+  <string name="call_other">Pozovi</string>
+  <string name="call_callback">Pozovi broj za uzvraćanje poziva</string>
+  <string name="call_car">Pozovi automobil</string>
+  <string name="call_company_main">Pozovi glavni broj kompanije</string>
+  <string name="call_isdn">Pozovi ISDN</string>
+  <string name="call_main">Pozovi glavni broj</string>
+  <string name="call_other_fax">Pozovi faks</string>
+  <string name="call_radio">Pozovi radio</string>
+  <string name="call_telex">Pozovi teleks</string>
+  <string name="call_tty_tdd">Pozovi TTY/TDD</string>
+  <string name="call_work_mobile">Pozovi poslovni mobitel</string>
+  <string name="call_work_pager">Pozovi poslovni pejdžer</string>
+  <string name="call_assistant">Pozovi %s</string>
+  <string name="call_mms">Pozovi MMS</string>
+  <string name="sms_custom">Pošalji tekstualnu poruku na %s</string>
+  <string name="sms_home">Pošalji tekstualnu poruku na kućni broj</string>
+  <string name="sms_mobile">Pošalji tekstualnu poruku na mobilni</string>
+  <string name="sms_work">Pošalji tekstualnu poruku na poslovni broj</string>
+  <string name="sms_fax_work">Pošalji tekstualnu poruku na poslovni faks</string>
+  <string name="sms_fax_home">Pošalji tekstualnu poruku na kućni faks</string>
+  <string name="sms_pager">Pošalji tekstualnu poruku na pejdžer</string>
+  <string name="sms_other">Pošalji tekstualnu poruku</string>
+  <string name="sms_callback">Pošalji tekstualnu poruku na broj za povratni poziv</string>
+  <string name="sms_car">Pošalji tekstualnu poruku na automobil</string>
+  <string name="sms_company_main">Pošalji tekstualnu poruku na glavni broj kompanije</string>
+  <string name="sms_isdn">Pošalji tekstualnu poruku na ISDN</string>
+  <string name="sms_main">Pošalji tekstualnu poruku na glavni broj</string>
+  <string name="sms_other_fax">Pošalji tekstualnu poruku na faks</string>
+  <string name="sms_radio">Pošalji tekstualnu poruku na radio</string>
+  <string name="sms_telex">Pošalji tekstualnu poruku na teleks</string>
+  <string name="sms_tty_tdd">Pošalji tekstualnu poruku na TTY/TDD</string>
+  <string name="sms_work_mobile">Pošalji tekstualnu poruku na poslovni mobitel</string>
+  <string name="sms_work_pager">Pošalji tekstualnu poruku na poslovni pejdžer</string>
+  <string name="sms_assistant">Pošalji tekstualnu poruku %s</string>
+  <string name="sms_mms">Pošalji tekstualnu poruku na MMS broj</string>
+  <string name="clearFrequentsConfirmation_title">Obrisati često kontaktirane osobe?</string>
+  <string name="clearFrequentsConfirmation">Obrisat ćete listu često kontaktiranih osoba u aplikaciji Kontakti i Aplikaciji za telefon, pa će aplikacije za e-poštu morati ispočetka učiti vaše postavke adresa.</string>
+  <string name="clearFrequentsProgress_title">Brisanje često kontaktiranih osoba…</string>
+  <string name="status_available">Dostupno</string>
+  <string name="status_away">Odsutan</string>
+  <string name="status_busy">Zauzeto</string>
+  <string name="contactsList">Kontakti</string>
+  <string name="contact_suggestions">Najbolji prijedlozi</string>
+  <string name="local_invisible_directory">Ostalo</string>
+  <string name="directory_search_label">Imenik</string>
+  <string name="directory_search_label_work">Poslovni imenik</string>
+  <string name="local_search_label">Svi kontakti</string>
+  <string name="local_suggestions_search_label">Prijedlozi</string>
+  <string msgid="9154761216179882405" name="user_profile_contacts_list_header">Ja</string>
+  <string name="missing_name">(Bez imena)</string>
+  <string msgid="2795575601596468581" name="description_view_contact_detail">Prikaži kontakt</string>
+  <string name="list_filter_phones">Svi kontakti s brojevima telefona</string>
+  <string name="list_filter_phones_work">Kontakti radnog profila</string>
+  <string name="view_updates_from_group">Prikaži ažuriranja</string>
+  <string name="account_phone">Samo uređaj, nesinhroniziran</string>
+  <string name="nameLabelsGroup">Ime</string>
+  <string name="nicknameLabelsGroup">Nadimak</string>
+  <string name="full_name">Ime</string>
+  <string name="name_given">Ime</string>
+  <string name="name_family">Prezime</string>
+  <string name="name_prefix">Prefiks imena</string>
+  <string name="name_middle">Srednje ime</string>
+  <string name="name_suffix">Sufiks imena</string>
+  <string name="name_phonetic">Fonetsko ime</string>
+  <string name="name_phonetic_given">Fonetsko ime</string>
+  <string name="name_phonetic_middle">Fonetsko srednje ime</string>
+  <string name="name_phonetic_family">Fonetsko prezime</string>
+  <string name="phoneLabelsGroup">Telefon</string>
+  <string name="emailLabelsGroup">E-pošta</string>
+  <string name="postalLabelsGroup">Adresa</string>
+  <string name="imLabelsGroup">IM</string>
+  <string name="organizationLabelsGroup">Organizacija</string>
+  <string name="relationLabelsGroup">Odnos</string>
+  <string name="eventLabelsGroup">Posebni datum</string>
+  <string name="sms">SMS</string>
+  <string name="postal_address">Adresa</string>
+  <string name="ghostData_company">Kompanija</string>
+  <string name="ghostData_title">Naziv</string>
+  <string name="label_notes">Bilješke</string>
+  <string name="label_sip_address">SIP</string>
+  <string name="websiteLabelsGroup">Web lokacija</string>
+  <string name="groupsLabel">Grupe</string>
+  <string name="email_home">Pošalji e-poruku na kućnu adresu e-pošte</string>
+  <string name="email_mobile">Mobilna e-pošta</string>
+  <string name="email_work">Pošalji e-poruku na poslovnu adresu e-pošte</string>
+  <string name="email_other">E-pošta</string>
+  <string name="email_custom">E-pošta %s</string>
+  <string name="email">E-pošta</string>
+  <string name="postal_street">Ulica</string>
+  <string name="postal_city">Grad</string>
+  <string name="postal_region">Država</string>
+  <string name="postal_postcode">Poštanski broj</string>
+  <string name="postal_country">Država</string>
+  <string name="map_home">Prikaži kućnu adresu</string>
+  <string name="map_work">Prikaži poslovnu adresu</string>
+  <string name="map_other">Prikaži adresu</string>
+  <string name="map_custom">Prikaži adresu %s</string>
+  <string name="chat_aim">Chat putem aplikacije AIM</string>
+  <string name="chat_msn">Chat putem aplikacije Windows Live</string>
+  <string name="chat_yahoo">Chat putem aplikacije Yahoo</string>
+  <string name="chat_skype">Chat putem aplikacije Skype</string>
+  <string name="chat_qq">Chat putem aplikacije QQ</string>
+  <string name="chat_gtalk">Chat putem aplikacije Google Talk</string>
+  <string name="chat_icq">Chat putem aplikacije ICQ</string>
+  <string name="chat_jabber">Chat putem aplikacije Jabber</string>
+  <string name="chat">Chat</string>
+  <string name="list_filter_all_accounts">Svi kontakti</string>
+  <string name="listAllContactsInAccount">Kontakti na računu %s</string>
+  <string name="listCustomView">Kontakti u prilagođenom prikazu</string>
+  <string name="listSingleContact">Jedan kontakt</string>
+  <string name="display_options_sort_list_by">Poredaj po</string>
+  <string name="display_options_sort_by_given_name">Ime</string>
+  <string name="display_options_sort_by_family_name">Prezime</string>
+  <string name="display_options_view_names_as">Format imena</string>
+  <string name="display_options_view_given_name_first">Ime prvo</string>
+  <string name="display_options_view_family_name_first">Prezime prvo</string>
+  <string name="menu_clear_frequents">Obriši često kontaktirane</string>
+  <string name="action_menu_back_from_search">zaustavi pretraživanje</string>
+  <string name="description_clear_search">Obriši pretragu</string>
+  <string name="select_account_dialog_title">Račun</string>
+  <string name="set_default_account">Uvijek koristi ovu karticu za pozive</string>
+  <string name="select_phone_account_for_calls">Odaberite SIM za ovaj poziv</string>
+  <string name="select_phone_account_for_calls_remember">Zapamti ovaj odabir</string>
+  <string name="call_with_a_note">Poziv s bilješkom</string>
+  <string name="call_subject_hint">Upišite bilješku koja će se poslati uz poziv ...</string>
+  <string name="send_and_call_button">POŠALJI I POZOVI</string>
+  <string name="call_subject_limit">%1$s / %2$s</string>
+  <string name="old_call_subject_type_and_number">%1$s %2$s</string>
+  <string name="tab_title">Kartica %1$s.</string>
+  <plurals name="tab_title_with_unread_items">
+    <item quantity="one"> Kartica %1$s. %2$d nepročitana stavka. </item>
+    <item quantity="few"> Kartica %1$s. %2$d nepročitane stavke. </item>
+    <item quantity="other"> Kartica %1$s. %2$d nepročitanih stavki. </item>
+  </plurals>
+  <string name="description_search_video_call">Video poziv</string>
+  <string name="description_search_call_and_share">Dijeli i pozovi</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-ca/strings.xml b/java/com/android/contacts/common/res/values-ca/strings.xml
index f34bd1f..77bbaa8 100644
--- a/java/com/android/contacts/common/res/values-ca/strings.xml
+++ b/java/com/android/contacts/common/res/values-ca/strings.xml
@@ -1,162 +1,145 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="toast_text_copied" msgid="8979281391599667362">"Text copiat"</string>
-    <string name="call_custom" msgid="3041673234638990874">"Truca al <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="call_home" msgid="125893483593803791">"Truca a casa"</string>
-    <string name="call_mobile" msgid="967589404494150813">"Truca al mòbil"</string>
-    <string name="call_work" msgid="6040550697395300892">"Truca a la feina"</string>
-    <string name="call_fax_work" msgid="5260192771364592922">"Truca al fax de la feina"</string>
-    <string name="call_fax_home" msgid="5174311195081144124">"Truca al fax de casa"</string>
-    <string name="call_pager" msgid="6814149227741274161">"Truca al cercapersones"</string>
-    <string name="call_other" msgid="5536385588712587235">"Truca"</string>
-    <string name="call_callback" msgid="6314019862718112786">"Truca a un número de devolució de trucada"</string>
-    <string name="call_car" msgid="3197417098027764954">"Truca al cotxe"</string>
-    <string name="call_company_main" msgid="2557663310028446397">"Truca al telèfon principal de l\'empresa"</string>
-    <string name="call_isdn" msgid="4691270442763649522">"Truca a l\'XDSI"</string>
-    <string name="call_main" msgid="3293707608770407814">"Truca al telèfon principal"</string>
-    <string name="call_other_fax" msgid="4724521984879021465">"Truca al fax"</string>
-    <string name="call_radio" msgid="8942441419845057942">"Truca a la ràdio"</string>
-    <string name="call_telex" msgid="2031514461660668351">"Truca al tèlex"</string>
-    <string name="call_tty_tdd" msgid="7807210224965727701">"Truca a TTY/TDD"</string>
-    <string name="call_work_mobile" msgid="2716342732938578495">"Truca al mòbil de la feina"</string>
-    <string name="call_work_pager" msgid="3791778749827366574">"Truca al cercapersones de la feina"</string>
-    <string name="call_assistant" msgid="4177478845473789294">"Truca al <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
-    <string name="call_mms" msgid="4958811711741872901">"Truca al número MMS"</string>
-    <string name="sms_custom" msgid="8785368968605026317">"Envia SMS al <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="sms_home" msgid="3527719551060295243">"Envia un SMS a casa"</string>
-    <string name="sms_mobile" msgid="8883045857887736518">"Envia un SMS al mòbil"</string>
-    <string name="sms_work" msgid="4158595439553450966">"Envia un SMS a la feina"</string>
-    <string name="sms_fax_work" msgid="5483726627718055248">"Envia un SMS al fax de la feina"</string>
-    <string name="sms_fax_home" msgid="9219265155770746077">"Envia un SMS al fax de casa"</string>
-    <string name="sms_pager" msgid="4901085068525193933">"Envia un SMS al cercapersones"</string>
-    <string name="sms_other" msgid="1742702947993285933">"Envia un SMS"</string>
-    <string name="sms_callback" msgid="5833483630377538308">"Envia un SMS a un número de devolució de trucada"</string>
-    <string name="sms_car" msgid="4314577266154395174">"Envia un SMS al cotxe"</string>
-    <string name="sms_company_main" msgid="2308160928487360705">"Envia un SMS al telèfon principal de l\'empresa"</string>
-    <string name="sms_isdn" msgid="6394300346179302542">"Envia un SMS a l\'XDSI"</string>
-    <string name="sms_main" msgid="8908087742014140774">"Envia un SMS al telèfon principal"</string>
-    <string name="sms_other_fax" msgid="8768455473295405427">"Envia un SMS al fax"</string>
-    <string name="sms_radio" msgid="855555176531704682">"Envia un SMS a la ràdio"</string>
-    <string name="sms_telex" msgid="6269029276223252719">"Envia un SMS al tèlex"</string>
-    <string name="sms_tty_tdd" msgid="6229057354509192444">"Envia un SMS al TTY/TDD"</string>
-    <string name="sms_work_mobile" msgid="2155975469329969840">"Envia un SMS al telèfon mòbil de la feina"</string>
-    <string name="sms_work_pager" msgid="8500140274906830742">"Envia un SMS al cercapersones de la feina"</string>
-    <string name="sms_assistant" msgid="8513548482745330818">"Envia un SMS a <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
-    <string name="sms_mms" msgid="5187888900503248542">"Envia un MMS"</string>
-    <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"Vols esborrar els contactes freqüents?"</string>
-    <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"S\'esborrarà la llista de contactes més freqüents a les aplicacions Contactes i Telèfon i es forçarà les aplicacions de correu electrònic a obtenir informació nova sobre les teves preferències pel que fa a adreces."</string>
-    <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"S\'estan esborrant contactes freq..."</string>
-    <string name="status_available" msgid="2648156525685472626">"Disponible"</string>
-    <string name="status_away" msgid="2298688367552893953">"Absent"</string>
-    <string name="status_busy" msgid="5990832098713248503">"Ocupat"</string>
-    <string name="contactsList" msgid="8806067891419291513">"Contactes"</string>
-    <string name="contact_suggestions" msgid="3324166754807120006">"Suggeriments principals"</string>
-    <string name="local_invisible_directory" msgid="4723238462733650090">"Altres"</string>
-    <string name="directory_search_label" msgid="4621215895484025229">"Directori"</string>
-    <string name="directory_search_label_work" msgid="7679326282707414897">"Directori de la feina"</string>
-    <string name="local_search_label" msgid="907622822323119235">"Tots els contactes"</string>
-    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Suggeriments"</string>
-    <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Jo"</string>
-    <string name="missing_name" msgid="978606963362745020">"(Sense nom)"</string>
-    <string name="description_view_contact_detail" msgid="2428742401208561136">"Visualitza el contacte"</string>
-    <string name="list_filter_phones" msgid="8763316061763437182">"Tots els contactes que tenen números de telèfon"</string>
-    <string name="list_filter_phones_work" msgid="7083575404573422965">"Contactes del perfil professional"</string>
-    <string name="view_updates_from_group" msgid="9011641093168385729">"Mostra les actualitzacions"</string>
-    <string name="account_phone" msgid="7067809073194061035">"Només al dispositiu, no se sincronitza"</string>
-    <string name="nameLabelsGroup" msgid="7730465833159557471">"Nom"</string>
-    <string name="nicknameLabelsGroup" msgid="6310556912361840029">"Àlies"</string>
-    <string name="full_name" msgid="648186563998465740">"Nom"</string>
-    <string name="name_given" msgid="5096576006314820536">"Nom"</string>
-    <string name="name_family" msgid="6646235805198547467">"Cognoms"</string>
-    <string name="name_prefix" msgid="9215326539658838">"Prefix del nom"</string>
-    <string name="name_middle" msgid="703755205331582769">"Segon nom"</string>
-    <string name="name_suffix" msgid="5777083390282548702">"Sufix del nom"</string>
-    <string name="name_phonetic" msgid="1650870996361663089">"Nom fonètic"</string>
-    <string name="name_phonetic_given" msgid="618812334274603170">"Nom fonètic"</string>
-    <string name="name_phonetic_middle" msgid="4826820763384625538">"Segon nom fonètic"</string>
-    <string name="name_phonetic_family" msgid="379905191212930771">"Cognoms fonètics"</string>
-    <string name="phoneLabelsGroup" msgid="169661929021355548">"Telèfon"</string>
-    <string name="emailLabelsGroup" msgid="2249752810477488833">"Correu electrònic"</string>
-    <string name="postalLabelsGroup" msgid="6772000590189142253">"Adreça"</string>
-    <string name="imLabelsGroup" msgid="5718066254237364731">"Xat"</string>
-    <string name="organizationLabelsGroup" msgid="1101996309241601435">"Organització"</string>
-    <string name="relationLabelsGroup" msgid="53866051664600053">"Relació"</string>
-    <string name="eventLabelsGroup" msgid="1236970042646618489">"Data especial"</string>
-    <string name="sms" msgid="7574344928185328095">"Missatge de text"</string>
-    <string name="postal_address" msgid="1804707930129674200">"Adreça"</string>
-    <string name="ghostData_company" msgid="2554310786296833424">"Empresa"</string>
-    <string name="ghostData_title" msgid="4994968731830184837">"Càrrec"</string>
-    <string name="label_notes" msgid="2050255313694219786">"Notes"</string>
-    <string name="label_sip_address" msgid="8883266182575965926">"SIP"</string>
-    <string name="websiteLabelsGroup" msgid="1630734286462186790">"Lloc web"</string>
-    <string name="groupsLabel" msgid="2694002798416868728">"Grups"</string>
-    <string name="email_home" msgid="889830029388962171">"Envia un correu electrònic a l\'adreça particular"</string>
-    <string name="email_mobile" msgid="4487686436743741150">"Envia un correu electrònic al mòbil"</string>
-    <string name="email_work" msgid="4223487303344613528">"Envia un correu electrònic a la feina"</string>
-    <string name="email_other" msgid="4246411900126012062">"Correu electrònic"</string>
-    <string name="email_custom" msgid="7246580894327511013">"Envia un correu electrònic a <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="email" msgid="2807318537887091606">"Correu electrònic"</string>
-    <string name="postal_street" msgid="6918171741240802474">"Carrer"</string>
-    <string name="postal_city" msgid="8674569121430005628">"Ciutat"</string>
-    <string name="postal_region" msgid="1730369286225469192">"Estat"</string>
-    <string name="postal_postcode" msgid="4450700741261990439">"Codi postal"</string>
-    <string name="postal_country" msgid="232670707458768148">"País"</string>
-    <string name="map_home" msgid="4181131107392126938">"Visualitza l\'adreça particular"</string>
-    <string name="map_work" msgid="5723471185992684400">"Visualitza l\'adreça de la feina"</string>
-    <string name="map_other" msgid="2253764780863500516">"Visualitza l\'adreça"</string>
-    <string name="map_custom" msgid="5581743097882436157">"Visualitza l\'adreça <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="chat_aim" msgid="2954364435497941659">"Xateja amb AIM"</string>
-    <string name="chat_msn" msgid="3130135239071228678">"Xateja amb Windows Live"</string>
-    <string name="chat_yahoo" msgid="3233552142326865347">"Xateja amb Yahoo"</string>
-    <string name="chat_skype" msgid="6486703981390592425">"Xateja amb Skype"</string>
-    <string name="chat_qq" msgid="786924280665740019">"Xateja amb QQ"</string>
-    <string name="chat_gtalk" msgid="7914674177243078035">"Xateja amb Google Talk"</string>
-    <string name="chat_icq" msgid="3292934726414765801">"Xateja amb ICQ"</string>
-    <string name="chat_jabber" msgid="6701542313597880204">"Xateja amb Jabber"</string>
-    <string name="chat" msgid="1020428260359370236">"Xat"</string>
-    <string name="list_filter_all_accounts" msgid="473782314881473992">"Tots els contactes"</string>
-    <string name="listAllContactsInAccount" msgid="3486378621592995630">"Contactes a <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="listCustomView" msgid="5306282632413086731">"Contactes en visualització personalitzada"</string>
-    <string name="listSingleContact" msgid="8620818791932382627">"Un sol contacte"</string>
-    <string name="display_options_sort_list_by" msgid="3541875948367831228">"Ordena per"</string>
-    <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"Nom"</string>
-    <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"Cognoms"</string>
-    <string name="display_options_view_names_as" msgid="4204204205736735618">"Format del nom"</string>
-    <string name="display_options_view_given_name_first" msgid="2308026973021171020">"Primer el nom"</string>
-    <string name="display_options_view_family_name_first" msgid="987430497292428242">"Primer els cognoms"</string>
-    <string name="menu_clear_frequents" msgid="5358271535047496120">"Esborra contactes freqüents"</string>
-    <string name="action_menu_back_from_search" msgid="3550669942742167644">"Atura la cerca."</string>
-    <string name="description_clear_search" msgid="2347258825265600782">"Esborra la cerca"</string>
-    <string name="select_account_dialog_title" msgid="2673504582803359239">"Compte"</string>
-    <string name="set_default_account" msgid="7966099951006467572">"Utilitza sempre per a les trucades"</string>
-    <string name="select_phone_account_for_calls" msgid="1784460686103423274">"Truca mitjançant"</string>
-    <string name="call_with_a_note" msgid="6242261320491851133">"Trucada amb una nota"</string>
-    <string name="call_subject_hint" msgid="7233138753650420800">"Escriu una nota per enviar-la juntament amb la trucada..."</string>
-    <string name="send_and_call_button" msgid="4735168294120154013">"ENVIA I TRUCA"</string>
-    <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g>/<xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="tab_title" msgid="3387876802026074288">"Pestanya <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
-      <item quantity="other">Pestanya <xliff:g id="TITLE_2">%1$s</xliff:g>: <xliff:g id="COUNT_3">%2$d</xliff:g> elements no llegits </item>
-      <item quantity="one">Pestanya <xliff:g id="TITLE_0">%1$s</xliff:g>: <xliff:g id="COUNT_1">%2$d</xliff:g> element no llegit </item>
-    </plurals>
-    <string name="description_search_video_call" msgid="4337369876888024909">"Videotrucada"</string>
-    <string name="description_search_call_and_share" msgid="4912772842755050467">"Comparteix i truca"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_custom">Truca al %s</string>
+  <string name="call_home">Truca a casa</string>
+  <string name="call_mobile">Truca al mòbil</string>
+  <string name="call_work">Truca a la feina</string>
+  <string name="call_fax_work">Truca al fax de la feina</string>
+  <string name="call_fax_home">Truca al fax de casa</string>
+  <string name="call_pager">Truca al cercapersones</string>
+  <string name="call_other">Truca</string>
+  <string name="call_callback">Truca a un número de devolució de trucada</string>
+  <string name="call_car">Truca al cotxe</string>
+  <string name="call_company_main">Truca al telèfon principal de l\'empresa</string>
+  <string name="call_isdn">Truca a l\'XDSI</string>
+  <string name="call_main">Truca al telèfon principal</string>
+  <string name="call_other_fax">Truca al fax</string>
+  <string name="call_radio">Truca a la ràdio</string>
+  <string name="call_telex">Truca al tèlex</string>
+  <string name="call_tty_tdd">Truca a TTY/TDD</string>
+  <string name="call_work_mobile">Truca al mòbil de la feina</string>
+  <string name="call_work_pager">Truca al cercapersones de la feina</string>
+  <string name="call_assistant">Truca al %s</string>
+  <string name="call_mms">Truca al número MMS</string>
+  <string name="sms_custom">Envia SMS al %s</string>
+  <string name="sms_home">Envia un SMS a casa</string>
+  <string name="sms_mobile">Envia un SMS al mòbil</string>
+  <string name="sms_work">Envia un SMS a la feina</string>
+  <string name="sms_fax_work">Envia un SMS al fax de la feina</string>
+  <string name="sms_fax_home">Envia un SMS al fax de casa</string>
+  <string name="sms_pager">Envia un SMS al cercapersones</string>
+  <string name="sms_other">Envia un SMS</string>
+  <string name="sms_callback">Envia un SMS a un número de devolució de trucada</string>
+  <string name="sms_car">Envia un SMS al cotxe</string>
+  <string name="sms_company_main">Envia un SMS al telèfon principal de l\'empresa</string>
+  <string name="sms_isdn">Envia un SMS a l\'XDSI</string>
+  <string name="sms_main">Envia un SMS al telèfon principal</string>
+  <string name="sms_other_fax">Envia un SMS al fax</string>
+  <string name="sms_radio">Envia un SMS a la ràdio</string>
+  <string name="sms_telex">Envia un SMS al tèlex</string>
+  <string name="sms_tty_tdd">Envia un SMS al TTY/TDD</string>
+  <string name="sms_work_mobile">Envia un SMS al telèfon mòbil de la feina</string>
+  <string name="sms_work_pager">Envia un SMS al cercapersones de la feina</string>
+  <string name="sms_assistant">Envia un SMS a %s</string>
+  <string name="sms_mms">Envia un MMS</string>
+  <string name="clearFrequentsConfirmation_title">Vols esborrar els contactes freqüents?</string>
+  <string name="clearFrequentsConfirmation">S\'esborrarà la llista de contactes més freqüents a les aplicacions Contactes i Telèfon i es forçarà les aplicacions de correu electrònic a obtenir informació nova sobre les teves preferències pel que fa a adreces.</string>
+  <string name="clearFrequentsProgress_title">S\'estan esborrant contactes freq...</string>
+  <string name="status_available">Disponible</string>
+  <string name="status_away">Absent</string>
+  <string name="status_busy">Ocupat</string>
+  <string name="contactsList">Contactes</string>
+  <string name="contact_suggestions">Suggeriments principals</string>
+  <string name="local_invisible_directory">Altres</string>
+  <string name="directory_search_label">Directori</string>
+  <string name="directory_search_label_work">Directori de la feina</string>
+  <string name="local_search_label">Tots els contactes</string>
+  <string name="local_suggestions_search_label">Suggeriments</string>
+  <string msgid="9154761216179882405" name="user_profile_contacts_list_header">Jo</string>
+  <string name="missing_name">(Sense nom)</string>
+  <string msgid="2795575601596468581" name="description_view_contact_detail">Visualitza el contacte</string>
+  <string name="list_filter_phones">Tots els contactes que tenen números de telèfon</string>
+  <string name="list_filter_phones_work">Contactes del perfil professional</string>
+  <string name="view_updates_from_group">Mostra les actualitzacions</string>
+  <string name="account_phone">Només al dispositiu, no se sincronitza</string>
+  <string name="nameLabelsGroup">Nom</string>
+  <string name="nicknameLabelsGroup">Àlies</string>
+  <string name="full_name">Nom</string>
+  <string name="name_given">Nom</string>
+  <string name="name_family">Cognoms</string>
+  <string name="name_prefix">Prefix del nom</string>
+  <string name="name_middle">Segon nom</string>
+  <string name="name_suffix">Sufix del nom</string>
+  <string name="name_phonetic">Nom fonètic</string>
+  <string name="name_phonetic_given">Nom fonètic</string>
+  <string name="name_phonetic_middle">Segon nom fonètic</string>
+  <string name="name_phonetic_family">Cognoms fonètics</string>
+  <string name="phoneLabelsGroup">Telèfon</string>
+  <string name="emailLabelsGroup">Correu electrònic</string>
+  <string name="postalLabelsGroup">Adreça</string>
+  <string name="imLabelsGroup">Xat</string>
+  <string name="organizationLabelsGroup">Organització</string>
+  <string name="relationLabelsGroup">Relació</string>
+  <string name="eventLabelsGroup">Data especial</string>
+  <string name="sms">Missatge de text</string>
+  <string name="postal_address">Adreça</string>
+  <string name="ghostData_company">Empresa</string>
+  <string name="ghostData_title">Càrrec</string>
+  <string name="label_notes">Notes</string>
+  <string name="label_sip_address">SIP</string>
+  <string name="websiteLabelsGroup">Lloc web</string>
+  <string name="groupsLabel">Grups</string>
+  <string name="email_home">Envia un correu electrònic a l\'adreça particular</string>
+  <string name="email_mobile">Envia un correu electrònic al mòbil</string>
+  <string name="email_work">Envia un correu electrònic a la feina</string>
+  <string name="email_other">Correu electrònic</string>
+  <string name="email_custom">Envia un correu electrònic a %s</string>
+  <string name="email">Correu electrònic</string>
+  <string name="postal_street">Carrer</string>
+  <string name="postal_city">Ciutat</string>
+  <string name="postal_region">Estat</string>
+  <string name="postal_postcode">Codi postal</string>
+  <string name="postal_country">País</string>
+  <string name="map_home">Visualitza l\'adreça particular</string>
+  <string name="map_work">Visualitza l\'adreça de la feina</string>
+  <string name="map_other">Visualitza l\'adreça</string>
+  <string name="map_custom">Visualitza l\'adreça %s</string>
+  <string name="chat_aim">Xateja amb AIM</string>
+  <string name="chat_msn">Xateja amb Windows Live</string>
+  <string name="chat_yahoo">Xateja amb Yahoo</string>
+  <string name="chat_skype">Xateja amb Skype</string>
+  <string name="chat_qq">Xateja amb QQ</string>
+  <string name="chat_gtalk">Xateja amb Google Talk</string>
+  <string name="chat_icq">Xateja amb ICQ</string>
+  <string name="chat_jabber">Xateja amb Jabber</string>
+  <string name="chat">Xat</string>
+  <string name="list_filter_all_accounts">Tots els contactes</string>
+  <string name="listAllContactsInAccount">Contactes a %s</string>
+  <string name="listCustomView">Contactes en visualització personalitzada</string>
+  <string name="listSingleContact">Un sol contacte</string>
+  <string name="display_options_sort_list_by">Ordena per</string>
+  <string name="display_options_sort_by_given_name">Nom</string>
+  <string name="display_options_sort_by_family_name">Cognoms</string>
+  <string name="display_options_view_names_as">Format del nom</string>
+  <string name="display_options_view_given_name_first">Primer el nom</string>
+  <string name="display_options_view_family_name_first">Primer els cognoms</string>
+  <string name="menu_clear_frequents">Esborra contactes freqüents</string>
+  <string name="action_menu_back_from_search">Atura la cerca.</string>
+  <string name="description_clear_search">Esborra la cerca</string>
+  <string name="select_account_dialog_title">Compte</string>
+  <string name="set_default_account">Utilitza sempre per a les trucades</string>
+  <string name="select_phone_account_for_calls">Tria la SIM per a aquesta trucada</string>
+  <string name="select_phone_account_for_calls_remember">Recorda aquesta selecció</string>
+  <string name="call_with_a_note">Trucada amb una nota</string>
+  <string name="call_subject_hint">Escriu una nota per enviar-la juntament amb la trucada...</string>
+  <string name="send_and_call_button">ENVIA I TRUCA</string>
+  <string name="call_subject_limit">%1$s/%2$s</string>
+  <string name="old_call_subject_type_and_number">%1$s %2$s</string>
+  <string name="tab_title">Pestanya %1$s</string>
+  <plurals name="tab_title_with_unread_items">
+    <item quantity="one">Pestanya %1$s: %2$d element no llegit </item>
+    <item quantity="other">Pestanya %1$s: %2$d elements no llegits </item>
+  </plurals>
+  <string name="description_search_video_call">Videotrucada</string>
+  <string name="description_search_call_and_share">Comparteix i truca</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-cs/strings.xml b/java/com/android/contacts/common/res/values-cs/strings.xml
index dcad846..f8492e8 100644
--- a/java/com/android/contacts/common/res/values-cs/strings.xml
+++ b/java/com/android/contacts/common/res/values-cs/strings.xml
@@ -1,164 +1,147 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="toast_text_copied" msgid="8979281391599667362">"Text zkopírován"</string>
-    <string name="call_custom" msgid="3041673234638990874">"Volat číslo <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="call_home" msgid="125893483593803791">"Volat domů"</string>
-    <string name="call_mobile" msgid="967589404494150813">"Volat mobil"</string>
-    <string name="call_work" msgid="6040550697395300892">"Volat do práce"</string>
-    <string name="call_fax_work" msgid="5260192771364592922">"Volat pracovní fax"</string>
-    <string name="call_fax_home" msgid="5174311195081144124">"Volat domácí fax"</string>
-    <string name="call_pager" msgid="6814149227741274161">"Volat pager"</string>
-    <string name="call_other" msgid="5536385588712587235">"Volat"</string>
-    <string name="call_callback" msgid="6314019862718112786">"Volat na číslo zpětného volání"</string>
-    <string name="call_car" msgid="3197417098027764954">"Volat do auta"</string>
-    <string name="call_company_main" msgid="2557663310028446397">"Volat firmu (hlavní)"</string>
-    <string name="call_isdn" msgid="4691270442763649522">"Volat na číslo ISDN"</string>
-    <string name="call_main" msgid="3293707608770407814">"Volat na hlavní číslo"</string>
-    <string name="call_other_fax" msgid="4724521984879021465">"Volat fax"</string>
-    <string name="call_radio" msgid="8942441419845057942">"Volat radiotelefon"</string>
-    <string name="call_telex" msgid="2031514461660668351">"Volat na číslo Telex"</string>
-    <string name="call_tty_tdd" msgid="7807210224965727701">"Volat na číslo TTY/TDD"</string>
-    <string name="call_work_mobile" msgid="2716342732938578495">"Volat na pracovní mobil"</string>
-    <string name="call_work_pager" msgid="3791778749827366574">"Volat na pracovní pager"</string>
-    <string name="call_assistant" msgid="4177478845473789294">"Volat kontakt <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
-    <string name="call_mms" msgid="4958811711741872901">"Volat MMS"</string>
-    <string name="sms_custom" msgid="8785368968605026317">"Poslat SMS na číslo <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="sms_home" msgid="3527719551060295243">"Poslat SMS domů"</string>
-    <string name="sms_mobile" msgid="8883045857887736518">"Poslat SMS na mobil"</string>
-    <string name="sms_work" msgid="4158595439553450966">"Poslat SMS do práce"</string>
-    <string name="sms_fax_work" msgid="5483726627718055248">"Poslat SMS na pracovní fax"</string>
-    <string name="sms_fax_home" msgid="9219265155770746077">"Poslat SMS na domácí fax"</string>
-    <string name="sms_pager" msgid="4901085068525193933">"Poslat SMS na pager"</string>
-    <string name="sms_other" msgid="1742702947993285933">"Poslat SMS"</string>
-    <string name="sms_callback" msgid="5833483630377538308">"Poslat SMS na číslo zpětného volání"</string>
-    <string name="sms_car" msgid="4314577266154395174">"Poslat SMS do auta"</string>
-    <string name="sms_company_main" msgid="2308160928487360705">"Poslat SMS do firmy (hlavní)"</string>
-    <string name="sms_isdn" msgid="6394300346179302542">"Poslat SMS na číslo ISDN"</string>
-    <string name="sms_main" msgid="8908087742014140774">"Poslat SMS na hlavní číslo"</string>
-    <string name="sms_other_fax" msgid="8768455473295405427">"Poslat SMS na fax"</string>
-    <string name="sms_radio" msgid="855555176531704682">"Poslat SMS na radiotelefon"</string>
-    <string name="sms_telex" msgid="6269029276223252719">"Poslat SMS na číslo Telex"</string>
-    <string name="sms_tty_tdd" msgid="6229057354509192444">"Poslat SMS na číslo TTY/TDD"</string>
-    <string name="sms_work_mobile" msgid="2155975469329969840">"Poslat SMS na pracovní mobil"</string>
-    <string name="sms_work_pager" msgid="8500140274906830742">"Poslat SMS na pracovní pager"</string>
-    <string name="sms_assistant" msgid="8513548482745330818">"Poslat SMS na kontakt <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
-    <string name="sms_mms" msgid="5187888900503248542">"Poslat SMS na číslo MMS"</string>
-    <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"Vymazat často kontaktované osoby?"</string>
-    <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"Vymažete seznam často kontaktovaných osob v aplikacích Kontakty a Telefon a e-mailové aplikace budou muset nastavení adresátů vytvořit znovu."</string>
-    <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"Mazání často kontaktovaných osob..."</string>
-    <string name="status_available" msgid="2648156525685472626">"K dispozici"</string>
-    <string name="status_away" msgid="2298688367552893953">"Pryč"</string>
-    <string name="status_busy" msgid="5990832098713248503">"Nemám čas"</string>
-    <string name="contactsList" msgid="8806067891419291513">"Kontakty"</string>
-    <string name="contact_suggestions" msgid="3324166754807120006">"Hlavní návrhy"</string>
-    <string name="local_invisible_directory" msgid="4723238462733650090">"Ostatní"</string>
-    <string name="directory_search_label" msgid="4621215895484025229">"Adresář"</string>
-    <string name="directory_search_label_work" msgid="7679326282707414897">"Pracovní adresář"</string>
-    <string name="local_search_label" msgid="907622822323119235">"Všechny kontakty"</string>
-    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Návrhy"</string>
-    <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Já"</string>
-    <string name="missing_name" msgid="978606963362745020">"(Žádné jméno)"</string>
-    <string name="description_view_contact_detail" msgid="2428742401208561136">"Zobrazit kontakt"</string>
-    <string name="list_filter_phones" msgid="8763316061763437182">"Kontakty s telefonními čísly"</string>
-    <string name="list_filter_phones_work" msgid="7083575404573422965">"Kontakty z pracovního profilu"</string>
-    <string name="view_updates_from_group" msgid="9011641093168385729">"Zobrazit aktualizace"</string>
-    <string name="account_phone" msgid="7067809073194061035">"Pouze na zařízení, nesynchronizováno"</string>
-    <string name="nameLabelsGroup" msgid="7730465833159557471">"Jméno"</string>
-    <string name="nicknameLabelsGroup" msgid="6310556912361840029">"Přezdívka"</string>
-    <string name="full_name" msgid="648186563998465740">"Jméno"</string>
-    <string name="name_given" msgid="5096576006314820536">"Jméno"</string>
-    <string name="name_family" msgid="6646235805198547467">"Příjmení"</string>
-    <string name="name_prefix" msgid="9215326539658838">"Titul před jménem"</string>
-    <string name="name_middle" msgid="703755205331582769">"Druhé jméno"</string>
-    <string name="name_suffix" msgid="5777083390282548702">"Titul za jménem"</string>
-    <string name="name_phonetic" msgid="1650870996361663089">"Jméno (foneticky)"</string>
-    <string name="name_phonetic_given" msgid="618812334274603170">"Jméno (foneticky)"</string>
-    <string name="name_phonetic_middle" msgid="4826820763384625538">"Druhé jméno (foneticky)"</string>
-    <string name="name_phonetic_family" msgid="379905191212930771">"Příjmení (foneticky)"</string>
-    <string name="phoneLabelsGroup" msgid="169661929021355548">"Telefon"</string>
-    <string name="emailLabelsGroup" msgid="2249752810477488833">"E-mail"</string>
-    <string name="postalLabelsGroup" msgid="6772000590189142253">"Adresa"</string>
-    <string name="imLabelsGroup" msgid="5718066254237364731">"Chat"</string>
-    <string name="organizationLabelsGroup" msgid="1101996309241601435">"Organizace"</string>
-    <string name="relationLabelsGroup" msgid="53866051664600053">"Vztah"</string>
-    <string name="eventLabelsGroup" msgid="1236970042646618489">"Zvláštní datum"</string>
-    <string name="sms" msgid="7574344928185328095">"Textová zpráva"</string>
-    <string name="postal_address" msgid="1804707930129674200">"Adresa"</string>
-    <string name="ghostData_company" msgid="2554310786296833424">"Společnost"</string>
-    <string name="ghostData_title" msgid="4994968731830184837">"Pozice"</string>
-    <string name="label_notes" msgid="2050255313694219786">"Poznámky"</string>
-    <string name="label_sip_address" msgid="8883266182575965926">"SIP"</string>
-    <string name="websiteLabelsGroup" msgid="1630734286462186790">"Web"</string>
-    <string name="groupsLabel" msgid="2694002798416868728">"Skupiny"</string>
-    <string name="email_home" msgid="889830029388962171">"E-mail domů"</string>
-    <string name="email_mobile" msgid="4487686436743741150">"E-mail na mobil"</string>
-    <string name="email_work" msgid="4223487303344613528">"E-mail do práce"</string>
-    <string name="email_other" msgid="4246411900126012062">"E-mail"</string>
-    <string name="email_custom" msgid="7246580894327511013">"E-mail <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="email" msgid="2807318537887091606">"E-mail"</string>
-    <string name="postal_street" msgid="6918171741240802474">"Ulice"</string>
-    <string name="postal_city" msgid="8674569121430005628">"Město"</string>
-    <string name="postal_region" msgid="1730369286225469192">"Stát"</string>
-    <string name="postal_postcode" msgid="4450700741261990439">"PSČ"</string>
-    <string name="postal_country" msgid="232670707458768148">"Země"</string>
-    <string name="map_home" msgid="4181131107392126938">"Zobrazit adresu domů"</string>
-    <string name="map_work" msgid="5723471185992684400">"Zobrazit adresu do práce"</string>
-    <string name="map_other" msgid="2253764780863500516">"Zobrazit adresu"</string>
-    <string name="map_custom" msgid="5581743097882436157">"Zobrazit adresu <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="chat_aim" msgid="2954364435497941659">"Chatovat pomocí AIM"</string>
-    <string name="chat_msn" msgid="3130135239071228678">"Chatovat pomocí Windows Live"</string>
-    <string name="chat_yahoo" msgid="3233552142326865347">"Chatovat pomocí Yahoo"</string>
-    <string name="chat_skype" msgid="6486703981390592425">"Chatovat pomocí Skype"</string>
-    <string name="chat_qq" msgid="786924280665740019">"Chatovat pomocí QQ"</string>
-    <string name="chat_gtalk" msgid="7914674177243078035">"Chatovat pomocí Google Talk"</string>
-    <string name="chat_icq" msgid="3292934726414765801">"Chatovat pomocí ICQ"</string>
-    <string name="chat_jabber" msgid="6701542313597880204">"Chatovat pomocí Jabberu"</string>
-    <string name="chat" msgid="1020428260359370236">"Chat"</string>
-    <string name="list_filter_all_accounts" msgid="473782314881473992">"Všechny kontakty"</string>
-    <string name="listAllContactsInAccount" msgid="3486378621592995630">"Kontakty v účtu <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="listCustomView" msgid="5306282632413086731">"Kontakty ve vlastním zobrazení"</string>
-    <string name="listSingleContact" msgid="8620818791932382627">"Jeden kontakt"</string>
-    <string name="display_options_sort_list_by" msgid="3541875948367831228">"Seřadit podle"</string>
-    <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"Jméno"</string>
-    <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"Příjmení"</string>
-    <string name="display_options_view_names_as" msgid="4204204205736735618">"Formát jména"</string>
-    <string name="display_options_view_given_name_first" msgid="2308026973021171020">"Nejprve jméno"</string>
-    <string name="display_options_view_family_name_first" msgid="987430497292428242">"Nejprve příjmení"</string>
-    <string name="menu_clear_frequents" msgid="5358271535047496120">"Vymazat často kontaktované"</string>
-    <string name="action_menu_back_from_search" msgid="3550669942742167644">"zastavit vyhledávání"</string>
-    <string name="description_clear_search" msgid="2347258825265600782">"Vymazat vyhledávání"</string>
-    <string name="select_account_dialog_title" msgid="2673504582803359239">"Účet"</string>
-    <string name="set_default_account" msgid="7966099951006467572">"Vždy používat pro hovory"</string>
-    <string name="select_phone_account_for_calls" msgid="1784460686103423274">"Volat pomocí"</string>
-    <string name="call_with_a_note" msgid="6242261320491851133">"Volání s poznámkou"</string>
-    <string name="call_subject_hint" msgid="7233138753650420800">"Zadejte poznámku, která se odešle pomocí volání…"</string>
-    <string name="send_and_call_button" msgid="4735168294120154013">"ODESLAT A ZAVOLAT"</string>
-    <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g>/<xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="tab_title" msgid="3387876802026074288">"Karta <xliff:g id="TITLE">%1$s</xliff:g>."</string>
-    <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
-      <item quantity="few"> Karta <xliff:g id="TITLE_2">%1$s</xliff:g>. <xliff:g id="COUNT_3">%2$d</xliff:g> nepřečtené položky. </item>
-      <item quantity="many"> Karta <xliff:g id="TITLE_2">%1$s</xliff:g>. <xliff:g id="COUNT_3">%2$d</xliff:g> nepřečtené položky. </item>
-      <item quantity="other"> Karta <xliff:g id="TITLE_2">%1$s</xliff:g>. <xliff:g id="COUNT_3">%2$d</xliff:g> nepřečtených položek. </item>
-      <item quantity="one"> Karta <xliff:g id="TITLE_0">%1$s</xliff:g>. <xliff:g id="COUNT_1">%2$d</xliff:g> nepřečtená položka. </item>
-    </plurals>
-    <string name="description_search_video_call" msgid="4337369876888024909">"Videohovor"</string>
-    <string name="description_search_call_and_share" msgid="4912772842755050467">"Sdílet a zavolat"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_custom">Volat číslo %s</string>
+  <string name="call_home">Volat domů</string>
+  <string name="call_mobile">Volat mobil</string>
+  <string name="call_work">Volat do práce</string>
+  <string name="call_fax_work">Volat pracovní fax</string>
+  <string name="call_fax_home">Volat domácí fax</string>
+  <string name="call_pager">Volat pager</string>
+  <string name="call_other">Volat</string>
+  <string name="call_callback">Volat na číslo zpětného volání</string>
+  <string name="call_car">Volat do auta</string>
+  <string name="call_company_main">Volat firmu (hlavní)</string>
+  <string name="call_isdn">Volat na číslo ISDN</string>
+  <string name="call_main">Volat na hlavní číslo</string>
+  <string name="call_other_fax">Volat fax</string>
+  <string name="call_radio">Volat radiotelefon</string>
+  <string name="call_telex">Volat na číslo Telex</string>
+  <string name="call_tty_tdd">Volat na číslo TTY/TDD</string>
+  <string name="call_work_mobile">Volat na pracovní mobil</string>
+  <string name="call_work_pager">Volat na pracovní pager</string>
+  <string name="call_assistant">Volat kontakt %s</string>
+  <string name="call_mms">Volat MMS</string>
+  <string name="sms_custom">Poslat SMS na číslo %s</string>
+  <string name="sms_home">Poslat SMS domů</string>
+  <string name="sms_mobile">Poslat SMS na mobil</string>
+  <string name="sms_work">Poslat SMS do práce</string>
+  <string name="sms_fax_work">Poslat SMS na pracovní fax</string>
+  <string name="sms_fax_home">Poslat SMS na domácí fax</string>
+  <string name="sms_pager">Poslat SMS na pager</string>
+  <string name="sms_other">Poslat SMS</string>
+  <string name="sms_callback">Poslat SMS na číslo zpětného volání</string>
+  <string name="sms_car">Poslat SMS do auta</string>
+  <string name="sms_company_main">Poslat SMS do firmy (hlavní)</string>
+  <string name="sms_isdn">Poslat SMS na číslo ISDN</string>
+  <string name="sms_main">Poslat SMS na hlavní číslo</string>
+  <string name="sms_other_fax">Poslat SMS na fax</string>
+  <string name="sms_radio">Poslat SMS na radiotelefon</string>
+  <string name="sms_telex">Poslat SMS na číslo Telex</string>
+  <string name="sms_tty_tdd">Poslat SMS na číslo TTY/TDD</string>
+  <string name="sms_work_mobile">Poslat SMS na pracovní mobil</string>
+  <string name="sms_work_pager">Poslat SMS na pracovní pager</string>
+  <string name="sms_assistant">Poslat SMS na kontakt %s</string>
+  <string name="sms_mms">Poslat SMS na číslo MMS</string>
+  <string name="clearFrequentsConfirmation_title">Vymazat často kontaktované osoby?</string>
+  <string name="clearFrequentsConfirmation">Vymažete seznam často kontaktovaných osob v aplikacích Kontakty a Telefon a e-mailové aplikace budou muset nastavení adresátů vytvořit znovu.</string>
+  <string name="clearFrequentsProgress_title">Mazání často kontaktovaných osob...</string>
+  <string name="status_available">K dispozici</string>
+  <string name="status_away">Pryč</string>
+  <string name="status_busy">Nemám čas</string>
+  <string name="contactsList">Kontakty</string>
+  <string name="contact_suggestions">Hlavní návrhy</string>
+  <string name="local_invisible_directory">Ostatní</string>
+  <string name="directory_search_label">Adresář</string>
+  <string name="directory_search_label_work">Pracovní adresář</string>
+  <string name="local_search_label">Všechny kontakty</string>
+  <string name="local_suggestions_search_label">Návrhy</string>
+  <string msgid="9154761216179882405" name="user_profile_contacts_list_header">Já</string>
+  <string name="missing_name">(Žádné jméno)</string>
+  <string msgid="2795575601596468581" name="description_view_contact_detail">Zobrazit kontakt</string>
+  <string name="list_filter_phones">Kontakty s telefonními čísly</string>
+  <string name="list_filter_phones_work">Kontakty z pracovního profilu</string>
+  <string name="view_updates_from_group">Zobrazit aktualizace</string>
+  <string name="account_phone">Pouze na zařízení, nesynchronizováno</string>
+  <string name="nameLabelsGroup">Jméno</string>
+  <string name="nicknameLabelsGroup">Přezdívka</string>
+  <string name="full_name">Jméno</string>
+  <string name="name_given">Jméno</string>
+  <string name="name_family">Příjmení</string>
+  <string name="name_prefix">Titul před jménem</string>
+  <string name="name_middle">Druhé jméno</string>
+  <string name="name_suffix">Titul za jménem</string>
+  <string name="name_phonetic">Jméno (foneticky)</string>
+  <string name="name_phonetic_given">Jméno (foneticky)</string>
+  <string name="name_phonetic_middle">Druhé jméno (foneticky)</string>
+  <string name="name_phonetic_family">Příjmení (foneticky)</string>
+  <string name="phoneLabelsGroup">Telefon</string>
+  <string name="emailLabelsGroup">E-mail</string>
+  <string name="postalLabelsGroup">Adresa</string>
+  <string name="imLabelsGroup">Chat</string>
+  <string name="organizationLabelsGroup">Organizace</string>
+  <string name="relationLabelsGroup">Vztah</string>
+  <string name="eventLabelsGroup">Zvláštní datum</string>
+  <string name="sms">Textová zpráva</string>
+  <string name="postal_address">Adresa</string>
+  <string name="ghostData_company">Společnost</string>
+  <string name="ghostData_title">Pozice</string>
+  <string name="label_notes">Poznámky</string>
+  <string name="label_sip_address">SIP</string>
+  <string name="websiteLabelsGroup">Web</string>
+  <string name="groupsLabel">Skupiny</string>
+  <string name="email_home">E-mail domů</string>
+  <string name="email_mobile">E-mail na mobil</string>
+  <string name="email_work">E-mail do práce</string>
+  <string name="email_other">E-mail</string>
+  <string name="email_custom">E-mail %s</string>
+  <string name="email">E-mail</string>
+  <string name="postal_street">Ulice</string>
+  <string name="postal_city">Město</string>
+  <string name="postal_region">Stát</string>
+  <string name="postal_postcode">PSČ</string>
+  <string name="postal_country">Země</string>
+  <string name="map_home">Zobrazit adresu domů</string>
+  <string name="map_work">Zobrazit adresu do práce</string>
+  <string name="map_other">Zobrazit adresu</string>
+  <string name="map_custom">Zobrazit adresu %s</string>
+  <string name="chat_aim">Chatovat pomocí AIM</string>
+  <string name="chat_msn">Chatovat pomocí Windows Live</string>
+  <string name="chat_yahoo">Chatovat pomocí Yahoo</string>
+  <string name="chat_skype">Chatovat pomocí Skype</string>
+  <string name="chat_qq">Chatovat pomocí QQ</string>
+  <string name="chat_gtalk">Chatovat pomocí Google Talk</string>
+  <string name="chat_icq">Chatovat pomocí ICQ</string>
+  <string name="chat_jabber">Chatovat pomocí Jabberu</string>
+  <string name="chat">Chat</string>
+  <string name="list_filter_all_accounts">Všechny kontakty</string>
+  <string name="listAllContactsInAccount">Kontakty v účtu %s</string>
+  <string name="listCustomView">Kontakty ve vlastním zobrazení</string>
+  <string name="listSingleContact">Jeden kontakt</string>
+  <string name="display_options_sort_list_by">Seřadit podle</string>
+  <string name="display_options_sort_by_given_name">Jméno</string>
+  <string name="display_options_sort_by_family_name">Příjmení</string>
+  <string name="display_options_view_names_as">Formát jména</string>
+  <string name="display_options_view_given_name_first">Nejprve jméno</string>
+  <string name="display_options_view_family_name_first">Nejprve příjmení</string>
+  <string name="menu_clear_frequents">Vymazat často kontaktované</string>
+  <string name="action_menu_back_from_search">zastavit vyhledávání</string>
+  <string name="description_clear_search">Vymazat vyhledávání</string>
+  <string name="select_account_dialog_title">Účet</string>
+  <string name="set_default_account">Vždy používat pro hovory</string>
+  <string name="select_phone_account_for_calls">Vyberte SIM kartu na tento hovor</string>
+  <string name="select_phone_account_for_calls_remember">Zapamatovat tuto volbu</string>
+  <string name="call_with_a_note">Volání s poznámkou</string>
+  <string name="call_subject_hint">Zadejte poznámku, která se odešle pomocí volání…</string>
+  <string name="send_and_call_button">ODESLAT A ZAVOLAT</string>
+  <string name="call_subject_limit">%1$s/%2$s</string>
+  <string name="old_call_subject_type_and_number">%1$s %2$s</string>
+  <string name="tab_title">Karta %1$s.</string>
+  <plurals name="tab_title_with_unread_items">
+    <item quantity="one"> Karta %1$s. %2$d nepřečtená položka. </item>
+    <item quantity="few"> Karta %1$s. %2$d nepřečtené položky. </item>
+    <item quantity="many"> Karta %1$s. %2$d nepřečtené položky. </item>
+    <item quantity="other"> Karta %1$s. %2$d nepřečtených položek. </item>
+  </plurals>
+  <string name="description_search_video_call">Videohovor</string>
+  <string name="description_search_call_and_share">Sdílet a zavolat</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-da/strings.xml b/java/com/android/contacts/common/res/values-da/strings.xml
index fdc7219..66ed252 100644
--- a/java/com/android/contacts/common/res/values-da/strings.xml
+++ b/java/com/android/contacts/common/res/values-da/strings.xml
@@ -1,162 +1,145 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="toast_text_copied" msgid="8979281391599667362">"Kopieret tekst"</string>
-    <string name="call_custom" msgid="3041673234638990874">"Ring til <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="call_home" msgid="125893483593803791">"Ring hjem"</string>
-    <string name="call_mobile" msgid="967589404494150813">"Ring til mobil"</string>
-    <string name="call_work" msgid="6040550697395300892">"Ring til arbejde"</string>
-    <string name="call_fax_work" msgid="5260192771364592922">"Ring til arbejdsfax"</string>
-    <string name="call_fax_home" msgid="5174311195081144124">"Ring til hjemmefax"</string>
-    <string name="call_pager" msgid="6814149227741274161">"Ring til personsøger"</string>
-    <string name="call_other" msgid="5536385588712587235">"Ring til"</string>
-    <string name="call_callback" msgid="6314019862718112786">"Ring til tilbagekald"</string>
-    <string name="call_car" msgid="3197417098027764954">"Ring til bil"</string>
-    <string name="call_company_main" msgid="2557663310028446397">"Ring til virksomhedens hovednummer"</string>
-    <string name="call_isdn" msgid="4691270442763649522">"Ring til ISDN"</string>
-    <string name="call_main" msgid="3293707608770407814">"Ring til hovednummeret"</string>
-    <string name="call_other_fax" msgid="4724521984879021465">"Ring til fax"</string>
-    <string name="call_radio" msgid="8942441419845057942">"Ring til radio"</string>
-    <string name="call_telex" msgid="2031514461660668351">"Ring til telex"</string>
-    <string name="call_tty_tdd" msgid="7807210224965727701">"Ring til TTY/TDD"</string>
-    <string name="call_work_mobile" msgid="2716342732938578495">"Ring til arbejdsmobiltelefon"</string>
-    <string name="call_work_pager" msgid="3791778749827366574">"Ring til personsøger på arbejdet"</string>
-    <string name="call_assistant" msgid="4177478845473789294">"Ring til <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
-    <string name="call_mms" msgid="4958811711741872901">"Ring til mms"</string>
-    <string name="sms_custom" msgid="8785368968605026317">"Send sms til <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="sms_home" msgid="3527719551060295243">"Send sms til hjem"</string>
-    <string name="sms_mobile" msgid="8883045857887736518">"Send sms til mobil"</string>
-    <string name="sms_work" msgid="4158595439553450966">"Send sms til arbejde"</string>
-    <string name="sms_fax_work" msgid="5483726627718055248">"Send sms til arbejdsfax"</string>
-    <string name="sms_fax_home" msgid="9219265155770746077">"Send sms til hjemmefax"</string>
-    <string name="sms_pager" msgid="4901085068525193933">"Send sms til personsøger"</string>
-    <string name="sms_other" msgid="1742702947993285933">"Send sms"</string>
-    <string name="sms_callback" msgid="5833483630377538308">"Send sms til tilbagekald"</string>
-    <string name="sms_car" msgid="4314577266154395174">"Send sms til bil"</string>
-    <string name="sms_company_main" msgid="2308160928487360705">"Send sms til virksomhedens hovednummer"</string>
-    <string name="sms_isdn" msgid="6394300346179302542">"Send sms til ISDN"</string>
-    <string name="sms_main" msgid="8908087742014140774">"Send sms til hovednummeret"</string>
-    <string name="sms_other_fax" msgid="8768455473295405427">"Send sms til fax"</string>
-    <string name="sms_radio" msgid="855555176531704682">"Send sms til radio"</string>
-    <string name="sms_telex" msgid="6269029276223252719">"Send sms til telex"</string>
-    <string name="sms_tty_tdd" msgid="6229057354509192444">"Send sms til TTY/TDD"</string>
-    <string name="sms_work_mobile" msgid="2155975469329969840">"Send sms til arbejdsmobiltelefon"</string>
-    <string name="sms_work_pager" msgid="8500140274906830742">"Send sms til personsøger på arbejdet"</string>
-    <string name="sms_assistant" msgid="8513548482745330818">"Send sms til <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
-    <string name="sms_mms" msgid="5187888900503248542">"Send sms til mms"</string>
-    <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"Vil du rydde de ofte kontaktede?"</string>
-    <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"Hvis du gør dette, rydder du listen over personer, som du ofte kontakter, i appene Kontaktpersoner og Opkald. Du vil samtidig tvinge e-mailapps til at lære dine adressepræferencer fra bunden."</string>
-    <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"Ofte kontaktede personer ryddes…"</string>
-    <string name="status_available" msgid="2648156525685472626">"Tilgængelig"</string>
-    <string name="status_away" msgid="2298688367552893953">"Ikke til stede"</string>
-    <string name="status_busy" msgid="5990832098713248503">"Optaget"</string>
-    <string name="contactsList" msgid="8806067891419291513">"Kontakter"</string>
-    <string name="contact_suggestions" msgid="3324166754807120006">"Populære forslag"</string>
-    <string name="local_invisible_directory" msgid="4723238462733650090">"Andre"</string>
-    <string name="directory_search_label" msgid="4621215895484025229">"Indeks"</string>
-    <string name="directory_search_label_work" msgid="7679326282707414897">"Indeks for arbejde"</string>
-    <string name="local_search_label" msgid="907622822323119235">"Alle kontakter"</string>
-    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Forslag"</string>
-    <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Mig"</string>
-    <string name="missing_name" msgid="978606963362745020">"(Intet navn)"</string>
-    <string name="description_view_contact_detail" msgid="2428742401208561136">"Se kontaktperson"</string>
-    <string name="list_filter_phones" msgid="8763316061763437182">"Alle kontaktpersoner med telefonnumre"</string>
-    <string name="list_filter_phones_work" msgid="7083575404573422965">"Kontaktpersoner for arbejdsprofil"</string>
-    <string name="view_updates_from_group" msgid="9011641093168385729">"Se opdateringer"</string>
-    <string name="account_phone" msgid="7067809073194061035">"Kun enhed, ikke synkroniseret"</string>
-    <string name="nameLabelsGroup" msgid="7730465833159557471">"Navn"</string>
-    <string name="nicknameLabelsGroup" msgid="6310556912361840029">"Kaldenavn"</string>
-    <string name="full_name" msgid="648186563998465740">"Navn"</string>
-    <string name="name_given" msgid="5096576006314820536">"Fornavn"</string>
-    <string name="name_family" msgid="6646235805198547467">"Efternavn"</string>
-    <string name="name_prefix" msgid="9215326539658838">"Navnepræfiks"</string>
-    <string name="name_middle" msgid="703755205331582769">"Mellemnavn"</string>
-    <string name="name_suffix" msgid="5777083390282548702">"Navnesuffiks"</string>
-    <string name="name_phonetic" msgid="1650870996361663089">"Fonetisk navn"</string>
-    <string name="name_phonetic_given" msgid="618812334274603170">"Fonetisk fornavn"</string>
-    <string name="name_phonetic_middle" msgid="4826820763384625538">"Fonetisk mellemnavn"</string>
-    <string name="name_phonetic_family" msgid="379905191212930771">"Fonetisk efternavn"</string>
-    <string name="phoneLabelsGroup" msgid="169661929021355548">"Opkald"</string>
-    <string name="emailLabelsGroup" msgid="2249752810477488833">"Send e-mail"</string>
-    <string name="postalLabelsGroup" msgid="6772000590189142253">"Adresse"</string>
-    <string name="imLabelsGroup" msgid="5718066254237364731">"Chat"</string>
-    <string name="organizationLabelsGroup" msgid="1101996309241601435">"Organisation"</string>
-    <string name="relationLabelsGroup" msgid="53866051664600053">"Forhold"</string>
-    <string name="eventLabelsGroup" msgid="1236970042646618489">"Særlig dato"</string>
-    <string name="sms" msgid="7574344928185328095">"Sms"</string>
-    <string name="postal_address" msgid="1804707930129674200">"Adresse"</string>
-    <string name="ghostData_company" msgid="2554310786296833424">"Virksomhed"</string>
-    <string name="ghostData_title" msgid="4994968731830184837">"Titel"</string>
-    <string name="label_notes" msgid="2050255313694219786">"Noter"</string>
-    <string name="label_sip_address" msgid="8883266182575965926">"SIP"</string>
-    <string name="websiteLabelsGroup" msgid="1630734286462186790">"Website"</string>
-    <string name="groupsLabel" msgid="2694002798416868728">"Grupper"</string>
-    <string name="email_home" msgid="889830029388962171">"Send e-mail hjem"</string>
-    <string name="email_mobile" msgid="4487686436743741150">"Send e-mail til mobil"</string>
-    <string name="email_work" msgid="4223487303344613528">"Send e-mail til arbejde"</string>
-    <string name="email_other" msgid="4246411900126012062">"Send e-mail"</string>
-    <string name="email_custom" msgid="7246580894327511013">"Send e-mail til <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="email" msgid="2807318537887091606">"Send e-mail"</string>
-    <string name="postal_street" msgid="6918171741240802474">"Gade"</string>
-    <string name="postal_city" msgid="8674569121430005628">"By"</string>
-    <string name="postal_region" msgid="1730369286225469192">"Stat"</string>
-    <string name="postal_postcode" msgid="4450700741261990439">"Postnummer"</string>
-    <string name="postal_country" msgid="232670707458768148">"Land"</string>
-    <string name="map_home" msgid="4181131107392126938">"Vis hjemmeadresse"</string>
-    <string name="map_work" msgid="5723471185992684400">"Vis arbejdsadresse"</string>
-    <string name="map_other" msgid="2253764780863500516">"Vis adresse"</string>
-    <string name="map_custom" msgid="5581743097882436157">"Vis <xliff:g id="CUSTOM">%s</xliff:g>-adresse"</string>
-    <string name="chat_aim" msgid="2954364435497941659">"Chat ved hjælp af AIM"</string>
-    <string name="chat_msn" msgid="3130135239071228678">"Chat ved hjælp af Windows Live"</string>
-    <string name="chat_yahoo" msgid="3233552142326865347">"Chat ved hjælp af Yahoo"</string>
-    <string name="chat_skype" msgid="6486703981390592425">"Chat ved hjælp af Skype"</string>
-    <string name="chat_qq" msgid="786924280665740019">"Chat ved hjælp af QQ"</string>
-    <string name="chat_gtalk" msgid="7914674177243078035">"Chat ved hjælp af Google Talk"</string>
-    <string name="chat_icq" msgid="3292934726414765801">"Chat ved hjælp af ICQ"</string>
-    <string name="chat_jabber" msgid="6701542313597880204">"Chat ved hjælp af Jabber"</string>
-    <string name="chat" msgid="1020428260359370236">"Chat"</string>
-    <string name="list_filter_all_accounts" msgid="473782314881473992">"Alle kontaktpersoner"</string>
-    <string name="listAllContactsInAccount" msgid="3486378621592995630">"Kontaktpersoner i <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="listCustomView" msgid="5306282632413086731">"Kontakter i tilpasset visning"</string>
-    <string name="listSingleContact" msgid="8620818791932382627">"Enkelt kontaktperson"</string>
-    <string name="display_options_sort_list_by" msgid="3541875948367831228">"Sortér efter"</string>
-    <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"Fornavn"</string>
-    <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"Efternavn"</string>
-    <string name="display_options_view_names_as" msgid="4204204205736735618">"Navneformat"</string>
-    <string name="display_options_view_given_name_first" msgid="2308026973021171020">"Fornavn først"</string>
-    <string name="display_options_view_family_name_first" msgid="987430497292428242">"Efternavn først"</string>
-    <string name="menu_clear_frequents" msgid="5358271535047496120">"Ryd hyppige"</string>
-    <string name="action_menu_back_from_search" msgid="3550669942742167644">"stop søgning"</string>
-    <string name="description_clear_search" msgid="2347258825265600782">"Ryd søgning"</string>
-    <string name="select_account_dialog_title" msgid="2673504582803359239">"Konto"</string>
-    <string name="set_default_account" msgid="7966099951006467572">"Brug altid ved opkald"</string>
-    <string name="select_phone_account_for_calls" msgid="1784460686103423274">"Ring med"</string>
-    <string name="call_with_a_note" msgid="6242261320491851133">"Ring med en note"</string>
-    <string name="call_subject_hint" msgid="7233138753650420800">"Indtast en note, som skal sendes ved opkald..."</string>
-    <string name="send_and_call_button" msgid="4735168294120154013">"SEND OG RING"</string>
-    <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g>/<xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="tab_title" msgid="3387876802026074288">"Fanen <xliff:g id="TITLE">%1$s</xliff:g>."</string>
-    <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
-      <item quantity="one"> Fanen <xliff:g id="TITLE_2">%1$s</xliff:g>. <xliff:g id="COUNT_3">%2$d</xliff:g> ulæst element. </item>
-      <item quantity="other"> Fanen <xliff:g id="TITLE_2">%1$s</xliff:g>. <xliff:g id="COUNT_3">%2$d</xliff:g> ulæste elementer. </item>
-    </plurals>
-    <string name="description_search_video_call" msgid="4337369876888024909">"Videoopkald"</string>
-    <string name="description_search_call_and_share" msgid="4912772842755050467">"Del og ring"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_custom">Ring til %s</string>
+  <string name="call_home">Ring hjem</string>
+  <string name="call_mobile">Ring til mobil</string>
+  <string name="call_work">Ring til arbejde</string>
+  <string name="call_fax_work">Ring til arbejdsfax</string>
+  <string name="call_fax_home">Ring til hjemmefax</string>
+  <string name="call_pager">Ring til personsøger</string>
+  <string name="call_other">Ring til</string>
+  <string name="call_callback">Ring til tilbagekald</string>
+  <string name="call_car">Ring til bil</string>
+  <string name="call_company_main">Ring til virksomhedens hovednummer</string>
+  <string name="call_isdn">Ring til ISDN</string>
+  <string name="call_main">Ring til hovednummeret</string>
+  <string name="call_other_fax">Ring til fax</string>
+  <string name="call_radio">Ring til radio</string>
+  <string name="call_telex">Ring til telex</string>
+  <string name="call_tty_tdd">Ring til TTY/TDD</string>
+  <string name="call_work_mobile">Ring til arbejdsmobiltelefon</string>
+  <string name="call_work_pager">Ring til personsøger på arbejdet</string>
+  <string name="call_assistant">Ring til %s</string>
+  <string name="call_mms">Ring til mms</string>
+  <string name="sms_custom">Send sms til %s</string>
+  <string name="sms_home">Send sms til hjem</string>
+  <string name="sms_mobile">Send sms til mobil</string>
+  <string name="sms_work">Send sms til arbejde</string>
+  <string name="sms_fax_work">Send sms til arbejdsfax</string>
+  <string name="sms_fax_home">Send sms til hjemmefax</string>
+  <string name="sms_pager">Send sms til personsøger</string>
+  <string name="sms_other">Send sms</string>
+  <string name="sms_callback">Send sms til tilbagekald</string>
+  <string name="sms_car">Send sms til bil</string>
+  <string name="sms_company_main">Send sms til virksomhedens hovednummer</string>
+  <string name="sms_isdn">Send sms til ISDN</string>
+  <string name="sms_main">Send sms til hovednummeret</string>
+  <string name="sms_other_fax">Send sms til fax</string>
+  <string name="sms_radio">Send sms til radio</string>
+  <string name="sms_telex">Send sms til telex</string>
+  <string name="sms_tty_tdd">Send sms til TTY/TDD</string>
+  <string name="sms_work_mobile">Send sms til arbejdsmobiltelefon</string>
+  <string name="sms_work_pager">Send sms til personsøger på arbejdet</string>
+  <string name="sms_assistant">Send sms til %s</string>
+  <string name="sms_mms">Send sms til mms</string>
+  <string name="clearFrequentsConfirmation_title">Vil du rydde de ofte kontaktede?</string>
+  <string name="clearFrequentsConfirmation">Hvis du gør dette, rydder du listen over personer, som du ofte kontakter, i appene Kontaktpersoner og Opkald. Du vil samtidig tvinge e-mailapps til at lære dine adressepræferencer fra bunden.</string>
+  <string name="clearFrequentsProgress_title">Ofte kontaktede personer ryddes…</string>
+  <string name="status_available">Tilgængelig</string>
+  <string name="status_away">Ikke til stede</string>
+  <string name="status_busy">Optaget</string>
+  <string name="contactsList">Kontakter</string>
+  <string name="contact_suggestions">Populære forslag</string>
+  <string name="local_invisible_directory">Andre</string>
+  <string name="directory_search_label">Indeks</string>
+  <string name="directory_search_label_work">Indeks for arbejde</string>
+  <string name="local_search_label">Alle kontakter</string>
+  <string name="local_suggestions_search_label">Forslag</string>
+  <string msgid="9154761216179882405" name="user_profile_contacts_list_header">Mig</string>
+  <string name="missing_name">(Intet navn)</string>
+  <string msgid="2795575601596468581" name="description_view_contact_detail">Se kontaktperson</string>
+  <string name="list_filter_phones">Alle kontaktpersoner med telefonnumre</string>
+  <string name="list_filter_phones_work">Kontaktpersoner for arbejdsprofil</string>
+  <string name="view_updates_from_group">Se opdateringer</string>
+  <string name="account_phone">Kun enhed, ikke synkroniseret</string>
+  <string name="nameLabelsGroup">Navn</string>
+  <string name="nicknameLabelsGroup">Kaldenavn</string>
+  <string name="full_name">Navn</string>
+  <string name="name_given">Fornavn</string>
+  <string name="name_family">Efternavn</string>
+  <string name="name_prefix">Navnepræfiks</string>
+  <string name="name_middle">Mellemnavn</string>
+  <string name="name_suffix">Navnesuffiks</string>
+  <string name="name_phonetic">Fonetisk navn</string>
+  <string name="name_phonetic_given">Fonetisk fornavn</string>
+  <string name="name_phonetic_middle">Fonetisk mellemnavn</string>
+  <string name="name_phonetic_family">Fonetisk efternavn</string>
+  <string name="phoneLabelsGroup">Opkald</string>
+  <string name="emailLabelsGroup">Send mail</string>
+  <string name="postalLabelsGroup">Adresse</string>
+  <string name="imLabelsGroup">Chat</string>
+  <string name="organizationLabelsGroup">Organisation</string>
+  <string name="relationLabelsGroup">Forhold</string>
+  <string name="eventLabelsGroup">Særlig dato</string>
+  <string name="sms">Sms</string>
+  <string name="postal_address">Adresse</string>
+  <string name="ghostData_company">Virksomhed</string>
+  <string name="ghostData_title">Titel</string>
+  <string name="label_notes">Noter</string>
+  <string name="label_sip_address">SIP</string>
+  <string name="websiteLabelsGroup">Website</string>
+  <string name="groupsLabel">Grupper</string>
+  <string name="email_home">Send mail hjem</string>
+  <string name="email_mobile">Send mail til mobil</string>
+  <string name="email_work">Send mail til arbejde</string>
+  <string name="email_other">Send mail</string>
+  <string name="email_custom">Send mail til %s</string>
+  <string name="email">Send mail</string>
+  <string name="postal_street">Gade</string>
+  <string name="postal_city">By</string>
+  <string name="postal_region">Stat</string>
+  <string name="postal_postcode">Postnummer</string>
+  <string name="postal_country">Land</string>
+  <string name="map_home">Vis hjemmeadresse</string>
+  <string name="map_work">Vis arbejdsadresse</string>
+  <string name="map_other">Vis adresse</string>
+  <string name="map_custom">Vis %s-adresse</string>
+  <string name="chat_aim">Chat ved hjælp af AIM</string>
+  <string name="chat_msn">Chat ved hjælp af Windows Live</string>
+  <string name="chat_yahoo">Chat ved hjælp af Yahoo</string>
+  <string name="chat_skype">Chat ved hjælp af Skype</string>
+  <string name="chat_qq">Chat ved hjælp af QQ</string>
+  <string name="chat_gtalk">Chat ved hjælp af Google Talk</string>
+  <string name="chat_icq">Chat ved hjælp af ICQ</string>
+  <string name="chat_jabber">Chat ved hjælp af Jabber</string>
+  <string name="chat">Chat</string>
+  <string name="list_filter_all_accounts">Alle kontaktpersoner</string>
+  <string name="listAllContactsInAccount">Kontaktpersoner i %s</string>
+  <string name="listCustomView">Kontakter i tilpasset visning</string>
+  <string name="listSingleContact">Enkelt kontaktperson</string>
+  <string name="display_options_sort_list_by">Sortér efter</string>
+  <string name="display_options_sort_by_given_name">Fornavn</string>
+  <string name="display_options_sort_by_family_name">Efternavn</string>
+  <string name="display_options_view_names_as">Navneformat</string>
+  <string name="display_options_view_given_name_first">Fornavn først</string>
+  <string name="display_options_view_family_name_first">Efternavn først</string>
+  <string name="menu_clear_frequents">Ryd hyppige</string>
+  <string name="action_menu_back_from_search">stop søgning</string>
+  <string name="description_clear_search">Ryd søgning</string>
+  <string name="select_account_dialog_title">Konto</string>
+  <string name="set_default_account">Brug altid ved opkald</string>
+  <string name="select_phone_account_for_calls">Vælg SIM-kort til dette opkald</string>
+  <string name="select_phone_account_for_calls_remember">Husk dette valg</string>
+  <string name="call_with_a_note">Ring med en note</string>
+  <string name="call_subject_hint">Angiv en note, som skal sendes ved opkald...</string>
+  <string name="send_and_call_button">SEND OG RING</string>
+  <string name="call_subject_limit">%1$s/%2$s</string>
+  <string name="old_call_subject_type_and_number">%1$s %2$s</string>
+  <string name="tab_title">Fanen %1$s.</string>
+  <plurals name="tab_title_with_unread_items">
+    <item quantity="one"> Fanen %1$s. %2$d ulæst element. </item>
+    <item quantity="other"> Fanen %1$s. %2$d ulæste elementer. </item>
+  </plurals>
+  <string name="description_search_video_call">Videoopkald</string>
+  <string name="description_search_call_and_share">Del og ring</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-de/strings.xml b/java/com/android/contacts/common/res/values-de/strings.xml
index 65d4c55..9554c5d 100644
--- a/java/com/android/contacts/common/res/values-de/strings.xml
+++ b/java/com/android/contacts/common/res/values-de/strings.xml
@@ -1,162 +1,145 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="toast_text_copied" msgid="8979281391599667362">"Text kopiert"</string>
-    <string name="call_custom" msgid="3041673234638990874">"<xliff:g id="CUSTOM">%s</xliff:g> anrufen"</string>
-    <string name="call_home" msgid="125893483593803791">"Private Nummer anrufen"</string>
-    <string name="call_mobile" msgid="967589404494150813">"Mobilfunknummer anrufen"</string>
-    <string name="call_work" msgid="6040550697395300892">"Geschäftliche Nummer anrufen"</string>
-    <string name="call_fax_work" msgid="5260192771364592922">"Fax (geschäftlich) anrufen"</string>
-    <string name="call_fax_home" msgid="5174311195081144124">"Fax (privat) anrufen"</string>
-    <string name="call_pager" msgid="6814149227741274161">"Pager anrufen"</string>
-    <string name="call_other" msgid="5536385588712587235">"Anrufen"</string>
-    <string name="call_callback" msgid="6314019862718112786">"Rückrufnummer anrufen"</string>
-    <string name="call_car" msgid="3197417098027764954">"Auto anrufen"</string>
-    <string name="call_company_main" msgid="2557663310028446397">"Firma (Hauptnr.) anrufen"</string>
-    <string name="call_isdn" msgid="4691270442763649522">"ISDN anrufen"</string>
-    <string name="call_main" msgid="3293707608770407814">"Hauptnummer anrufen"</string>
-    <string name="call_other_fax" msgid="4724521984879021465">"Fax anrufen"</string>
-    <string name="call_radio" msgid="8942441419845057942">"Funktelefon anrufen"</string>
-    <string name="call_telex" msgid="2031514461660668351">"Telex anrufen"</string>
-    <string name="call_tty_tdd" msgid="7807210224965727701">"TTY-/TDD anrufen"</string>
-    <string name="call_work_mobile" msgid="2716342732938578495">"Mobilfunknummer (geschäftlich) anrufen"</string>
-    <string name="call_work_pager" msgid="3791778749827366574">"Pager (geschäftlich) anrufen"</string>
-    <string name="call_assistant" msgid="4177478845473789294">"<xliff:g id="ASSISTANT">%s</xliff:g> anrufen"</string>
-    <string name="call_mms" msgid="4958811711741872901">"MMS anrufen"</string>
-    <string name="sms_custom" msgid="8785368968605026317">"SMS an <xliff:g id="CUSTOM">%s</xliff:g> senden"</string>
-    <string name="sms_home" msgid="3527719551060295243">"SMS an private Nummer senden"</string>
-    <string name="sms_mobile" msgid="8883045857887736518">"SMS an Mobilfunknummer senden"</string>
-    <string name="sms_work" msgid="4158595439553450966">"SMS an geschäftliche Nummer senden"</string>
-    <string name="sms_fax_work" msgid="5483726627718055248">"SMS an Fax (geschäftlich) senden"</string>
-    <string name="sms_fax_home" msgid="9219265155770746077">"SMS an Fax (privat) senden"</string>
-    <string name="sms_pager" msgid="4901085068525193933">"SMS an Pager senden"</string>
-    <string name="sms_other" msgid="1742702947993285933">"SMS senden"</string>
-    <string name="sms_callback" msgid="5833483630377538308">"SMS an Rückrufnummer senden"</string>
-    <string name="sms_car" msgid="4314577266154395174">"SMS an Autotelefon senden"</string>
-    <string name="sms_company_main" msgid="2308160928487360705">"SMS an Firma (Hauptnr.) senden"</string>
-    <string name="sms_isdn" msgid="6394300346179302542">"SMS an ISDN senden"</string>
-    <string name="sms_main" msgid="8908087742014140774">"SMS an Hauptnummer senden"</string>
-    <string name="sms_other_fax" msgid="8768455473295405427">"SMS an Fax senden"</string>
-    <string name="sms_radio" msgid="855555176531704682">"SMS an Funktelefon senden"</string>
-    <string name="sms_telex" msgid="6269029276223252719">"SMS an Telex senden"</string>
-    <string name="sms_tty_tdd" msgid="6229057354509192444">"SMS an TTY-/TDD senden"</string>
-    <string name="sms_work_mobile" msgid="2155975469329969840">"SMS an Mobilfunknummer (geschäftlich) senden"</string>
-    <string name="sms_work_pager" msgid="8500140274906830742">"SMS an Pager (geschäftlich) senden"</string>
-    <string name="sms_assistant" msgid="8513548482745330818">"SMS an <xliff:g id="ASSISTANT">%s</xliff:g> senden"</string>
-    <string name="sms_mms" msgid="5187888900503248542">"SMS an MMS senden"</string>
-    <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"Liste \"Häufig kontaktiert\" löschen?"</string>
-    <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"Du löschst die Liste \"Häufig kontaktiert\" in den Apps \"Kontakte\" und \"Telefon\" und bewirkst so ein Zurücksetzen deiner Adresseinstellungen für E-Mail-Apps."</string>
-    <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"\"Häufig kontaktiert\" wird gelöscht…"</string>
-    <string name="status_available" msgid="2648156525685472626">"Verfügbar"</string>
-    <string name="status_away" msgid="2298688367552893953">"Abwesend"</string>
-    <string name="status_busy" msgid="5990832098713248503">"Beschäftigt"</string>
-    <string name="contactsList" msgid="8806067891419291513">"Kontakte"</string>
-    <string name="contact_suggestions" msgid="3324166754807120006">"Top-Vorschläge"</string>
-    <string name="local_invisible_directory" msgid="4723238462733650090">"Andere"</string>
-    <string name="directory_search_label" msgid="4621215895484025229">"Verzeichnis"</string>
-    <string name="directory_search_label_work" msgid="7679326282707414897">"Verzeichnis geschäftlicher Kontakte"</string>
-    <string name="local_search_label" msgid="907622822323119235">"Alle Kontakte"</string>
-    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Vorschläge"</string>
-    <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Ich"</string>
-    <string name="missing_name" msgid="978606963362745020">"(Kein Name)"</string>
-    <string name="description_view_contact_detail" msgid="2428742401208561136">"Kontakt ansehen"</string>
-    <string name="list_filter_phones" msgid="8763316061763437182">"Alle Kontakte mit Telefonnummern"</string>
-    <string name="list_filter_phones_work" msgid="7083575404573422965">"Arbeitsprofilkontakte"</string>
-    <string name="view_updates_from_group" msgid="9011641093168385729">"Updates ansehen"</string>
-    <string name="account_phone" msgid="7067809073194061035">"Nur auf dem Gerät, nicht synchronisiert"</string>
-    <string name="nameLabelsGroup" msgid="7730465833159557471">"Name"</string>
-    <string name="nicknameLabelsGroup" msgid="6310556912361840029">"Alias"</string>
-    <string name="full_name" msgid="648186563998465740">"Name"</string>
-    <string name="name_given" msgid="5096576006314820536">"Vorname"</string>
-    <string name="name_family" msgid="6646235805198547467">"Nachname"</string>
-    <string name="name_prefix" msgid="9215326539658838">"Namenspräfix"</string>
-    <string name="name_middle" msgid="703755205331582769">"Zweiter Vorname"</string>
-    <string name="name_suffix" msgid="5777083390282548702">"Namenssuffix"</string>
-    <string name="name_phonetic" msgid="1650870996361663089">"Phonetischer Name"</string>
-    <string name="name_phonetic_given" msgid="618812334274603170">"Vorname (phonetisch)"</string>
-    <string name="name_phonetic_middle" msgid="4826820763384625538">"Zweiter Vorname (phonetisch)"</string>
-    <string name="name_phonetic_family" msgid="379905191212930771">"Nachname (phonetisch)"</string>
-    <string name="phoneLabelsGroup" msgid="169661929021355548">"Telefon"</string>
-    <string name="emailLabelsGroup" msgid="2249752810477488833">"E-Mail"</string>
-    <string name="postalLabelsGroup" msgid="6772000590189142253">"Adresse"</string>
-    <string name="imLabelsGroup" msgid="5718066254237364731">"Chat"</string>
-    <string name="organizationLabelsGroup" msgid="1101996309241601435">"Firma/Organisation"</string>
-    <string name="relationLabelsGroup" msgid="53866051664600053">"Art der Beziehung"</string>
-    <string name="eventLabelsGroup" msgid="1236970042646618489">"Besonderes Datum"</string>
-    <string name="sms" msgid="7574344928185328095">"SMS"</string>
-    <string name="postal_address" msgid="1804707930129674200">"Adresse"</string>
-    <string name="ghostData_company" msgid="2554310786296833424">"Firma"</string>
-    <string name="ghostData_title" msgid="4994968731830184837">"Position"</string>
-    <string name="label_notes" msgid="2050255313694219786">"Notizen"</string>
-    <string name="label_sip_address" msgid="8883266182575965926">"SIP"</string>
-    <string name="websiteLabelsGroup" msgid="1630734286462186790">"Website"</string>
-    <string name="groupsLabel" msgid="2694002798416868728">"Gruppen"</string>
-    <string name="email_home" msgid="889830029388962171">"E-Mail (privat)"</string>
-    <string name="email_mobile" msgid="4487686436743741150">"E-Mail (mobil)"</string>
-    <string name="email_work" msgid="4223487303344613528">"E-Mail (geschäftlich)"</string>
-    <string name="email_other" msgid="4246411900126012062">"E-Mail"</string>
-    <string name="email_custom" msgid="7246580894327511013">"E-Mail an <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="email" msgid="2807318537887091606">"E-Mail"</string>
-    <string name="postal_street" msgid="6918171741240802474">"Straße"</string>
-    <string name="postal_city" msgid="8674569121430005628">"Stadt"</string>
-    <string name="postal_region" msgid="1730369286225469192">"Bundesland"</string>
-    <string name="postal_postcode" msgid="4450700741261990439">"Postleitzahl"</string>
-    <string name="postal_country" msgid="232670707458768148">"Land"</string>
-    <string name="map_home" msgid="4181131107392126938">"Privatadresse ansehen"</string>
-    <string name="map_work" msgid="5723471185992684400">"Arbeitsadresse ansehen"</string>
-    <string name="map_other" msgid="2253764780863500516">"Adresse ansehen"</string>
-    <string name="map_custom" msgid="5581743097882436157">"<xliff:g id="CUSTOM">%s</xliff:g>-Adresse ansehen"</string>
-    <string name="chat_aim" msgid="2954364435497941659">"Über AIM chatten"</string>
-    <string name="chat_msn" msgid="3130135239071228678">"Über Windows Live chatten"</string>
-    <string name="chat_yahoo" msgid="3233552142326865347">"Über Yahoo! chatten"</string>
-    <string name="chat_skype" msgid="6486703981390592425">"Über Skype chatten"</string>
-    <string name="chat_qq" msgid="786924280665740019">"Über QQ chatten"</string>
-    <string name="chat_gtalk" msgid="7914674177243078035">"Über Google Talk chatten"</string>
-    <string name="chat_icq" msgid="3292934726414765801">"Über ICQ chatten"</string>
-    <string name="chat_jabber" msgid="6701542313597880204">"Über Jabber chatten"</string>
-    <string name="chat" msgid="1020428260359370236">"Chat"</string>
-    <string name="list_filter_all_accounts" msgid="473782314881473992">"Alle Kontakte"</string>
-    <string name="listAllContactsInAccount" msgid="3486378621592995630">"Kontakte in <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="listCustomView" msgid="5306282632413086731">"Kontakte in benutzerdef. Ansicht"</string>
-    <string name="listSingleContact" msgid="8620818791932382627">"Einzelner Kontakt"</string>
-    <string name="display_options_sort_list_by" msgid="3541875948367831228">"Sortieren nach"</string>
-    <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"Vorname"</string>
-    <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"Nachname"</string>
-    <string name="display_options_view_names_as" msgid="4204204205736735618">"Namensformat"</string>
-    <string name="display_options_view_given_name_first" msgid="2308026973021171020">"Vorname zuerst"</string>
-    <string name="display_options_view_family_name_first" msgid="987430497292428242">"Nachname zuerst"</string>
-    <string name="menu_clear_frequents" msgid="5358271535047496120">"\"Häufig kontaktiert\" löschen"</string>
-    <string name="action_menu_back_from_search" msgid="3550669942742167644">"Suche beenden"</string>
-    <string name="description_clear_search" msgid="2347258825265600782">"Suche zurücksetzen"</string>
-    <string name="select_account_dialog_title" msgid="2673504582803359239">"Konto"</string>
-    <string name="set_default_account" msgid="7966099951006467572">"Diese SIM für alle Anrufe verwenden"</string>
-    <string name="select_phone_account_for_calls" msgid="1784460686103423274">"Anrufen mit"</string>
-    <string name="call_with_a_note" msgid="6242261320491851133">"Mit einer Notiz anrufen"</string>
-    <string name="call_subject_hint" msgid="7233138753650420800">"Notiz eingeben, die beim Anrufen gesendet wird..."</string>
-    <string name="send_and_call_button" msgid="4735168294120154013">"SENDEN UND ANRUFEN"</string>
-    <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g>/<xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="tab_title" msgid="3387876802026074288">"Tab \"<xliff:g id="TITLE">%1$s</xliff:g>\"."</string>
-    <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
-      <item quantity="other">Tab \"<xliff:g id="TITLE_2">%1$s</xliff:g>\". <xliff:g id="COUNT_3">%2$d</xliff:g> ungelesene Elemente. </item>
-      <item quantity="one">Tab \"<xliff:g id="TITLE_0">%1$s</xliff:g>\". <xliff:g id="COUNT_1">%2$d</xliff:g> ungelesenes Element. </item>
-    </plurals>
-    <string name="description_search_video_call" msgid="4337369876888024909">"Videoanruf"</string>
-    <string name="description_search_call_and_share" msgid="4912772842755050467">"Teilen und anrufen"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_custom">%s anrufen</string>
+  <string name="call_home">Private Nummer anrufen</string>
+  <string name="call_mobile">Mobilfunknummer anrufen</string>
+  <string name="call_work">Geschäftliche Nummer anrufen</string>
+  <string name="call_fax_work">Fax (geschäftlich) anrufen</string>
+  <string name="call_fax_home">Fax (privat) anrufen</string>
+  <string name="call_pager">Pager anrufen</string>
+  <string name="call_other">Anrufen</string>
+  <string name="call_callback">Rückrufnummer anrufen</string>
+  <string name="call_car">Auto anrufen</string>
+  <string name="call_company_main">Firma (Hauptnr.) anrufen</string>
+  <string name="call_isdn">ISDN anrufen</string>
+  <string name="call_main">Hauptnummer anrufen</string>
+  <string name="call_other_fax">Fax anrufen</string>
+  <string name="call_radio">Funktelefon anrufen</string>
+  <string name="call_telex">Telex anrufen</string>
+  <string name="call_tty_tdd">TTY-/TDD anrufen</string>
+  <string name="call_work_mobile">Mobilfunknummer (geschäftlich) anrufen</string>
+  <string name="call_work_pager">Pager (geschäftlich) anrufen</string>
+  <string name="call_assistant">%s anrufen</string>
+  <string name="call_mms">MMS anrufen</string>
+  <string name="sms_custom">SMS an %s senden</string>
+  <string name="sms_home">SMS an private Nummer senden</string>
+  <string name="sms_mobile">SMS an Mobilfunknummer senden</string>
+  <string name="sms_work">SMS an geschäftliche Nummer senden</string>
+  <string name="sms_fax_work">SMS an Fax (geschäftlich) senden</string>
+  <string name="sms_fax_home">SMS an Fax (privat) senden</string>
+  <string name="sms_pager">SMS an Pager senden</string>
+  <string name="sms_other">SMS senden</string>
+  <string name="sms_callback">SMS an Rückrufnummer senden</string>
+  <string name="sms_car">SMS an Autotelefon senden</string>
+  <string name="sms_company_main">SMS an Firma (Hauptnr.) senden</string>
+  <string name="sms_isdn">SMS an ISDN senden</string>
+  <string name="sms_main">SMS an Hauptnummer senden</string>
+  <string name="sms_other_fax">SMS an Fax senden</string>
+  <string name="sms_radio">SMS an Funktelefon senden</string>
+  <string name="sms_telex">SMS an Telex senden</string>
+  <string name="sms_tty_tdd">SMS an TTY-/TDD senden</string>
+  <string name="sms_work_mobile">SMS an Mobilfunknummer (geschäftlich) senden</string>
+  <string name="sms_work_pager">SMS an Pager (geschäftlich) senden</string>
+  <string name="sms_assistant">SMS an %s senden</string>
+  <string name="sms_mms">SMS an MMS senden</string>
+  <string name="clearFrequentsConfirmation_title">Liste \"Häufig kontaktiert\" löschen?</string>
+  <string name="clearFrequentsConfirmation">Du löschst die Liste \"Häufig kontaktiert\" in den Apps \"Kontakte\" und \"Telefon\" und bewirkst so ein Zurücksetzen deiner Adresseinstellungen für E-Mail-Apps.</string>
+  <string name="clearFrequentsProgress_title">\"Häufig kontaktiert\" wird gelöscht…</string>
+  <string name="status_available">Verfügbar</string>
+  <string name="status_away">Abwesend</string>
+  <string name="status_busy">Beschäftigt</string>
+  <string name="contactsList">Kontakte</string>
+  <string name="contact_suggestions">Top-Vorschläge</string>
+  <string name="local_invisible_directory">Andere</string>
+  <string name="directory_search_label">Verzeichnis</string>
+  <string name="directory_search_label_work">Verzeichnis geschäftlicher Kontakte</string>
+  <string name="local_search_label">Alle Kontakte</string>
+  <string name="local_suggestions_search_label">Vorschläge</string>
+  <string msgid="9154761216179882405" name="user_profile_contacts_list_header">Ich</string>
+  <string name="missing_name">(Kein Name)</string>
+  <string msgid="2795575601596468581" name="description_view_contact_detail">Kontakt ansehen</string>
+  <string name="list_filter_phones">Alle Kontakte mit Telefonnummern</string>
+  <string name="list_filter_phones_work">Arbeitsprofilkontakte</string>
+  <string name="view_updates_from_group">Updates ansehen</string>
+  <string name="account_phone">Nur auf dem Gerät, nicht synchronisiert</string>
+  <string name="nameLabelsGroup">Name</string>
+  <string name="nicknameLabelsGroup">Alias</string>
+  <string name="full_name">Name</string>
+  <string name="name_given">Vorname</string>
+  <string name="name_family">Nachname</string>
+  <string name="name_prefix">Namenspräfix</string>
+  <string name="name_middle">Zweiter Vorname</string>
+  <string name="name_suffix">Namenssuffix</string>
+  <string name="name_phonetic">Phonetischer Name</string>
+  <string name="name_phonetic_given">Vorname (phonetisch)</string>
+  <string name="name_phonetic_middle">Zweiter Vorname (phonetisch)</string>
+  <string name="name_phonetic_family">Nachname (phonetisch)</string>
+  <string name="phoneLabelsGroup">Telefon</string>
+  <string name="emailLabelsGroup">E-Mail</string>
+  <string name="postalLabelsGroup">Adresse</string>
+  <string name="imLabelsGroup">Chat</string>
+  <string name="organizationLabelsGroup">Firma/Organisation</string>
+  <string name="relationLabelsGroup">Art der Beziehung</string>
+  <string name="eventLabelsGroup">Besonderes Datum</string>
+  <string name="sms">SMS</string>
+  <string name="postal_address">Adresse</string>
+  <string name="ghostData_company">Firma</string>
+  <string name="ghostData_title">Position</string>
+  <string name="label_notes">Notizen</string>
+  <string name="label_sip_address">SIP</string>
+  <string name="websiteLabelsGroup">Website</string>
+  <string name="groupsLabel">Gruppen</string>
+  <string name="email_home">E-Mail (privat)</string>
+  <string name="email_mobile">E-Mail (mobil)</string>
+  <string name="email_work">E-Mail (geschäftlich)</string>
+  <string name="email_other">E-Mail</string>
+  <string name="email_custom">E-Mail an %s</string>
+  <string name="email">E-Mail</string>
+  <string name="postal_street">Straße</string>
+  <string name="postal_city">Stadt</string>
+  <string name="postal_region">Bundesland</string>
+  <string name="postal_postcode">Postleitzahl</string>
+  <string name="postal_country">Land</string>
+  <string name="map_home">Privatadresse ansehen</string>
+  <string name="map_work">Arbeitsadresse ansehen</string>
+  <string name="map_other">Adresse ansehen</string>
+  <string name="map_custom">%s-Adresse ansehen</string>
+  <string name="chat_aim">Über AIM chatten</string>
+  <string name="chat_msn">Über Windows Live chatten</string>
+  <string name="chat_yahoo">Über Yahoo! chatten</string>
+  <string name="chat_skype">Über Skype chatten</string>
+  <string name="chat_qq">Über QQ chatten</string>
+  <string name="chat_gtalk">Über Google Talk chatten</string>
+  <string name="chat_icq">Über ICQ chatten</string>
+  <string name="chat_jabber">Über Jabber chatten</string>
+  <string name="chat">Chat</string>
+  <string name="list_filter_all_accounts">Alle Kontakte</string>
+  <string name="listAllContactsInAccount">Kontakte in %s</string>
+  <string name="listCustomView">Kontakte in benutzerdef. Ansicht</string>
+  <string name="listSingleContact">Einzelner Kontakt</string>
+  <string name="display_options_sort_list_by">Sortieren nach</string>
+  <string name="display_options_sort_by_given_name">Vorname</string>
+  <string name="display_options_sort_by_family_name">Nachname</string>
+  <string name="display_options_view_names_as">Namensformat</string>
+  <string name="display_options_view_given_name_first">Vorname zuerst</string>
+  <string name="display_options_view_family_name_first">Nachname zuerst</string>
+  <string name="menu_clear_frequents">\"Häufig kontaktiert\" löschen</string>
+  <string name="action_menu_back_from_search">Suche beenden</string>
+  <string name="description_clear_search">Suche zurücksetzen</string>
+  <string name="select_account_dialog_title">Konto</string>
+  <string name="set_default_account">Diese SIM für alle Anrufe verwenden</string>
+  <string name="select_phone_account_for_calls">SIM für diesen Anruf auswählen</string>
+  <string name="select_phone_account_for_calls_remember">Auswahl speichern</string>
+  <string name="call_with_a_note">Mit einer Notiz anrufen</string>
+  <string name="call_subject_hint">Notiz eingeben, die beim Anrufen gesendet wird...</string>
+  <string name="send_and_call_button">SENDEN UND ANRUFEN</string>
+  <string name="call_subject_limit">%1$s/%2$s</string>
+  <string name="old_call_subject_type_and_number">%1$s %2$s</string>
+  <string name="tab_title">Tab \"%1$s\".</string>
+  <plurals name="tab_title_with_unread_items">
+    <item quantity="one">Tab \"%1$s\". %2$d ungelesenes Element. </item>
+    <item quantity="other">Tab \"%1$s\". %2$d ungelesene Elemente. </item>
+  </plurals>
+  <string name="description_search_video_call">Videoanruf</string>
+  <string name="description_search_call_and_share">Teilen und anrufen</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-el/strings.xml b/java/com/android/contacts/common/res/values-el/strings.xml
index 655bb3a..727b69d 100644
--- a/java/com/android/contacts/common/res/values-el/strings.xml
+++ b/java/com/android/contacts/common/res/values-el/strings.xml
@@ -1,162 +1,145 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="toast_text_copied" msgid="8979281391599667362">"Το κείμενο αντιγράφηκε"</string>
-    <string name="call_custom" msgid="3041673234638990874">"Κλήση <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="call_home" msgid="125893483593803791">"Κλήση οικίας"</string>
-    <string name="call_mobile" msgid="967589404494150813">"Κλήση κινητής συσκευής"</string>
-    <string name="call_work" msgid="6040550697395300892">"Κλήση εργασίας"</string>
-    <string name="call_fax_work" msgid="5260192771364592922">"Κλήση φαξ εργασίας"</string>
-    <string name="call_fax_home" msgid="5174311195081144124">"Κλήση φαξ οικίας"</string>
-    <string name="call_pager" msgid="6814149227741274161">"Κλήση βομβητή"</string>
-    <string name="call_other" msgid="5536385588712587235">"Κλήση"</string>
-    <string name="call_callback" msgid="6314019862718112786">"Κλήση αριθμού επανάκλησης"</string>
-    <string name="call_car" msgid="3197417098027764954">"Κλήση τηλεφώνου αυτοκινήτου"</string>
-    <string name="call_company_main" msgid="2557663310028446397">"Κλήση κύριας εταιρικής γραμμής"</string>
-    <string name="call_isdn" msgid="4691270442763649522">"Κλήση ISDN"</string>
-    <string name="call_main" msgid="3293707608770407814">"Κλήση κύριου αριθμού"</string>
-    <string name="call_other_fax" msgid="4724521984879021465">"Κλήση φαξ"</string>
-    <string name="call_radio" msgid="8942441419845057942">"Κλήση πομπού"</string>
-    <string name="call_telex" msgid="2031514461660668351">"Κλήση σε τηλέτυπο"</string>
-    <string name="call_tty_tdd" msgid="7807210224965727701">"Κλήση σε τηλέφωνο TTY/TDD"</string>
-    <string name="call_work_mobile" msgid="2716342732938578495">"Κλήση κινητού τηλεφώνου εργασίας"</string>
-    <string name="call_work_pager" msgid="3791778749827366574">"Κλήση βομβητή εργασίας"</string>
-    <string name="call_assistant" msgid="4177478845473789294">"Κλήση <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
-    <string name="call_mms" msgid="4958811711741872901">"Κλήση MMS"</string>
-    <string name="sms_custom" msgid="8785368968605026317">"Αποστολή μηνύματος κειμένου προς <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="sms_home" msgid="3527719551060295243">"Αποστολή μηνύματος κειμένου προς οικία"</string>
-    <string name="sms_mobile" msgid="8883045857887736518">"Αποστολή μηνύματος κειμένου προς κινητή συσκευή"</string>
-    <string name="sms_work" msgid="4158595439553450966">"Αποστολή μηνύματος κειμένου προς εργασία"</string>
-    <string name="sms_fax_work" msgid="5483726627718055248">"Αποστολή μηνύματος κειμένου προς φαξ εργασίας"</string>
-    <string name="sms_fax_home" msgid="9219265155770746077">"Αποστολή μηνύματος κειμένου προς φαξ οικίας"</string>
-    <string name="sms_pager" msgid="4901085068525193933">"Αποστολή μηνύματος κειμένου προς βομβητή"</string>
-    <string name="sms_other" msgid="1742702947993285933">"Κείμενο"</string>
-    <string name="sms_callback" msgid="5833483630377538308">"Αποστολή μηνύματος κειμένου σε αριθμό επανάκλησης"</string>
-    <string name="sms_car" msgid="4314577266154395174">"Αποστολή μηνύματος κειμένου προς τηλέφωνο αυτοκινήτου"</string>
-    <string name="sms_company_main" msgid="2308160928487360705">"Αποστολή μηνύματος κειμένου προς κύρια εταιρική γραμμή"</string>
-    <string name="sms_isdn" msgid="6394300346179302542">"Αποστολή κειμένου σε ISDN"</string>
-    <string name="sms_main" msgid="8908087742014140774">"Αποστολή μηνύματος κειμένου προς κύριο αριθμό"</string>
-    <string name="sms_other_fax" msgid="8768455473295405427">"Αποστολή μηνύματος κειμένου σε φαξ"</string>
-    <string name="sms_radio" msgid="855555176531704682">"Αποστολή μηνύματος κειμένου προς πομπό"</string>
-    <string name="sms_telex" msgid="6269029276223252719">"Αποστολή μηνύματος κειμένου σε τηλέτυπο"</string>
-    <string name="sms_tty_tdd" msgid="6229057354509192444">"Αποστολή μηνύματος κειμένου προς τηλέφωνο TTY/TDD"</string>
-    <string name="sms_work_mobile" msgid="2155975469329969840">"Αποστολή μηνύματος κειμένου προς κινητό τηλέφωνο εργασίας"</string>
-    <string name="sms_work_pager" msgid="8500140274906830742">"Αποστολή μηνύματος κειμένου προς βομβητή εργασίας"</string>
-    <string name="sms_assistant" msgid="8513548482745330818">"Αποστολή μηνύματος προς <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
-    <string name="sms_mms" msgid="5187888900503248542">"Αποστολή μηνύματος κειμένου ως MMS"</string>
-    <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"Διαγραφή ατόμων με συχνή επικοινωνία;"</string>
-    <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"Θα διαγράψετε τη λίστα συχνών επαφών στις εφαρμογές Επαφές και Τηλέφωνο και θα επιβάλλετε στις εφαρμογές ηλεκτρονικού ταχυδρομείου να μάθουν τις προτιμήσεις διευθύνσεών σας από την αρχή,"</string>
-    <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"Διαγρ. ατόμων με συχνή επικοινωνία…"</string>
-    <string name="status_available" msgid="2648156525685472626">"Διαθέσιμος"</string>
-    <string name="status_away" msgid="2298688367552893953">"Μη διαθέσιμος"</string>
-    <string name="status_busy" msgid="5990832098713248503">"Απασχολημένος"</string>
-    <string name="contactsList" msgid="8806067891419291513">"Επαφές"</string>
-    <string name="contact_suggestions" msgid="3324166754807120006">"Κορυφαίες προτάσεις"</string>
-    <string name="local_invisible_directory" msgid="4723238462733650090">"Άλλο"</string>
-    <string name="directory_search_label" msgid="4621215895484025229">"Κατάλογος"</string>
-    <string name="directory_search_label_work" msgid="7679326282707414897">"Κατάλογος εργασίας"</string>
-    <string name="local_search_label" msgid="907622822323119235">"Όλες οι επαφές"</string>
-    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Προτάσεις"</string>
-    <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Εγώ"</string>
-    <string name="missing_name" msgid="978606963362745020">"(Χωρίς όνομα)"</string>
-    <string name="description_view_contact_detail" msgid="2428742401208561136">"Προβολή επαφής"</string>
-    <string name="list_filter_phones" msgid="8763316061763437182">"Όλες οι επαφές με αριθμούς τηλεφώνου"</string>
-    <string name="list_filter_phones_work" msgid="7083575404573422965">"Επαφές προφίλ εργασίας"</string>
-    <string name="view_updates_from_group" msgid="9011641093168385729">"Προβολή ενημερώσεων"</string>
-    <string name="account_phone" msgid="7067809073194061035">"Μόνο στη συσκευή, χωρίς συγχρονισμό"</string>
-    <string name="nameLabelsGroup" msgid="7730465833159557471">"Όνομα"</string>
-    <string name="nicknameLabelsGroup" msgid="6310556912361840029">"Ψευδώνυμο"</string>
-    <string name="full_name" msgid="648186563998465740">"Όνομα"</string>
-    <string name="name_given" msgid="5096576006314820536">"Όνομα"</string>
-    <string name="name_family" msgid="6646235805198547467">"Επώνυμο"</string>
-    <string name="name_prefix" msgid="9215326539658838">"Πρόθεμα ονόματος"</string>
-    <string name="name_middle" msgid="703755205331582769">"Πατρώνυμο"</string>
-    <string name="name_suffix" msgid="5777083390282548702">"Επίθημα ονόματος"</string>
-    <string name="name_phonetic" msgid="1650870996361663089">"Φωνητικό όνομα"</string>
-    <string name="name_phonetic_given" msgid="618812334274603170">"Φωνητικό όνομα"</string>
-    <string name="name_phonetic_middle" msgid="4826820763384625538">"Φωνητικό πατρώνυμου"</string>
-    <string name="name_phonetic_family" msgid="379905191212930771">"Φωνητικό επώνυμο"</string>
-    <string name="phoneLabelsGroup" msgid="169661929021355548">"Τηλέφωνο"</string>
-    <string name="emailLabelsGroup" msgid="2249752810477488833">"Μήνυμα ηλεκτρονικού ταχυδρομείου"</string>
-    <string name="postalLabelsGroup" msgid="6772000590189142253">"Διεύθυνση"</string>
-    <string name="imLabelsGroup" msgid="5718066254237364731">"IM"</string>
-    <string name="organizationLabelsGroup" msgid="1101996309241601435">"Εταιρεία"</string>
-    <string name="relationLabelsGroup" msgid="53866051664600053">"Σχέση"</string>
-    <string name="eventLabelsGroup" msgid="1236970042646618489">"Ειδική ημερομηνία"</string>
-    <string name="sms" msgid="7574344928185328095">"Μήνυμα κειμένου"</string>
-    <string name="postal_address" msgid="1804707930129674200">"Διεύθυνση"</string>
-    <string name="ghostData_company" msgid="2554310786296833424">"Εταιρεία"</string>
-    <string name="ghostData_title" msgid="4994968731830184837">"Τίτλος"</string>
-    <string name="label_notes" msgid="2050255313694219786">"Σημειώσεις"</string>
-    <string name="label_sip_address" msgid="8883266182575965926">"SIP"</string>
-    <string name="websiteLabelsGroup" msgid="1630734286462186790">"Ιστότοπος"</string>
-    <string name="groupsLabel" msgid="2694002798416868728">"Ομάδες"</string>
-    <string name="email_home" msgid="889830029388962171">"Αποστολή μηνύματος ηλεκτρονικού ταχυδρομείου προς οικία"</string>
-    <string name="email_mobile" msgid="4487686436743741150">"Αποστολή μηνύματος ηλεκτρονικού ταχυδρομείου προς κινητό"</string>
-    <string name="email_work" msgid="4223487303344613528">"Αποστολή μηνύματος ηλεκτρονικού ταχυδρομείου προς εργασία"</string>
-    <string name="email_other" msgid="4246411900126012062">"Μήνυμα ηλεκτρονικού ταχυδρομείου"</string>
-    <string name="email_custom" msgid="7246580894327511013">"Αποστολή μηνύματος ηλεκτρονικού ταχυδρομείου προς <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="email" msgid="2807318537887091606">"Μήνυμα ηλεκτρονικού ταχυδρομείου"</string>
-    <string name="postal_street" msgid="6918171741240802474">"Οδός"</string>
-    <string name="postal_city" msgid="8674569121430005628">"Πόλη"</string>
-    <string name="postal_region" msgid="1730369286225469192">"Πολιτεία"</string>
-    <string name="postal_postcode" msgid="4450700741261990439">"Ταχυδρομικός κώδικας"</string>
-    <string name="postal_country" msgid="232670707458768148">"Χώρα"</string>
-    <string name="map_home" msgid="4181131107392126938">"Προβολή διεύθυνσης οικίας"</string>
-    <string name="map_work" msgid="5723471185992684400">"Προβολή διεύθυνσης εργασίας"</string>
-    <string name="map_other" msgid="2253764780863500516">"Προβολή διεύθυνσης"</string>
-    <string name="map_custom" msgid="5581743097882436157">"Προβολή διεύθυνσης <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="chat_aim" msgid="2954364435497941659">"Συζήτηση μέσω AIM"</string>
-    <string name="chat_msn" msgid="3130135239071228678">"Συζήτηση μέσω Windows Live"</string>
-    <string name="chat_yahoo" msgid="3233552142326865347">"Συζήτηση μέσω Yahoo"</string>
-    <string name="chat_skype" msgid="6486703981390592425">"Συζήτηση μέσω Skype"</string>
-    <string name="chat_qq" msgid="786924280665740019">"Συζήτηση μέσω QQ"</string>
-    <string name="chat_gtalk" msgid="7914674177243078035">"Συζήτηση μέσω Google Talk"</string>
-    <string name="chat_icq" msgid="3292934726414765801">"Συζήτηση μέσω ICQ"</string>
-    <string name="chat_jabber" msgid="6701542313597880204">"Συζήτηση μέσω Jabber"</string>
-    <string name="chat" msgid="1020428260359370236">"Συζήτηση"</string>
-    <string name="list_filter_all_accounts" msgid="473782314881473992">"Όλες οι επαφές"</string>
-    <string name="listAllContactsInAccount" msgid="3486378621592995630">"Επαφές στο <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="listCustomView" msgid="5306282632413086731">"Επαφές σε προσ/νη προβολή"</string>
-    <string name="listSingleContact" msgid="8620818791932382627">"Μία επαφή"</string>
-    <string name="display_options_sort_list_by" msgid="3541875948367831228">"Ταξινόμηση κατά"</string>
-    <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"Όνομα"</string>
-    <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"Επώνυμο"</string>
-    <string name="display_options_view_names_as" msgid="4204204205736735618">"Μορφή ονόματος"</string>
-    <string name="display_options_view_given_name_first" msgid="2308026973021171020">"Πρώτα το όνομα"</string>
-    <string name="display_options_view_family_name_first" msgid="987430497292428242">"Πρώτα το επώνυμο"</string>
-    <string name="menu_clear_frequents" msgid="5358271535047496120">"Διαγραφή ατόμ. με συχνή επικ."</string>
-    <string name="action_menu_back_from_search" msgid="3550669942742167644">"τέλος αναζήτησης"</string>
-    <string name="description_clear_search" msgid="2347258825265600782">"Διαγραφή αναζητήσεων"</string>
-    <string name="select_account_dialog_title" msgid="2673504582803359239">"Λογαριασμός"</string>
-    <string name="set_default_account" msgid="7966099951006467572">"Χρήση πάντα για κλήσεις"</string>
-    <string name="select_phone_account_for_calls" msgid="1784460686103423274">"Κλήση με"</string>
-    <string name="call_with_a_note" msgid="6242261320491851133">"Κλήση με σημείωση"</string>
-    <string name="call_subject_hint" msgid="7233138753650420800">"Πληκτρολογήστε μια σημείωση για αποστολή με την κλήση…"</string>
-    <string name="send_and_call_button" msgid="4735168294120154013">"ΑΠΟΣΤΟΛΗ ΚΑΙ ΚΛΗΣΗ"</string>
-    <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="tab_title" msgid="3387876802026074288">"Καρτέλα <xliff:g id="TITLE">%1$s</xliff:g>."</string>
-    <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
-      <item quantity="other"> Καρτέλα <xliff:g id="TITLE_2">%1$s</xliff:g>. <xliff:g id="COUNT_3">%2$d</xliff:g> μη αναγνωσμένα στοιχεία. </item>
-      <item quantity="one"> Καρτέλα <xliff:g id="TITLE_0">%1$s</xliff:g>. <xliff:g id="COUNT_1">%2$d</xliff:g> μη αναγνωσμένο στοιχείο. </item>
-    </plurals>
-    <string name="description_search_video_call" msgid="4337369876888024909">"Βιντεοκλήση"</string>
-    <string name="description_search_call_and_share" msgid="4912772842755050467">"Κοινοποίηση και κλήση"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_custom">Κλήση %s</string>
+  <string name="call_home">Κλήση οικίας</string>
+  <string name="call_mobile">Κλήση κινητής συσκευής</string>
+  <string name="call_work">Κλήση εργασίας</string>
+  <string name="call_fax_work">Κλήση φαξ εργασίας</string>
+  <string name="call_fax_home">Κλήση φαξ οικίας</string>
+  <string name="call_pager">Κλήση βομβητή</string>
+  <string name="call_other">Κλήση</string>
+  <string name="call_callback">Κλήση αριθμού επανάκλησης</string>
+  <string name="call_car">Κλήση τηλεφώνου αυτοκινήτου</string>
+  <string name="call_company_main">Κλήση κύριας εταιρικής γραμμής</string>
+  <string name="call_isdn">Κλήση ISDN</string>
+  <string name="call_main">Κλήση κύριου αριθμού</string>
+  <string name="call_other_fax">Κλήση φαξ</string>
+  <string name="call_radio">Κλήση πομπού</string>
+  <string name="call_telex">Κλήση σε τηλέτυπο</string>
+  <string name="call_tty_tdd">Κλήση σε τηλέφωνο TTY/TDD</string>
+  <string name="call_work_mobile">Κλήση κινητού τηλεφώνου εργασίας</string>
+  <string name="call_work_pager">Κλήση βομβητή εργασίας</string>
+  <string name="call_assistant">Κλήση %s</string>
+  <string name="call_mms">Κλήση MMS</string>
+  <string name="sms_custom">Αποστολή μηνύματος κειμένου προς %s</string>
+  <string name="sms_home">Αποστολή μηνύματος κειμένου προς οικία</string>
+  <string name="sms_mobile">Αποστολή μηνύματος κειμένου προς κινητή συσκευή</string>
+  <string name="sms_work">Αποστολή μηνύματος κειμένου προς εργασία</string>
+  <string name="sms_fax_work">Αποστολή μηνύματος κειμένου προς φαξ εργασίας</string>
+  <string name="sms_fax_home">Αποστολή μηνύματος κειμένου προς φαξ οικίας</string>
+  <string name="sms_pager">Αποστολή μηνύματος κειμένου προς βομβητή</string>
+  <string name="sms_other">Κείμενο</string>
+  <string name="sms_callback">Αποστολή μηνύματος κειμένου σε αριθμό επανάκλησης</string>
+  <string name="sms_car">Αποστολή μηνύματος κειμένου προς τηλέφωνο αυτοκινήτου</string>
+  <string name="sms_company_main">Αποστολή μηνύματος κειμένου προς κύρια εταιρική γραμμή</string>
+  <string name="sms_isdn">Αποστολή κειμένου σε ISDN</string>
+  <string name="sms_main">Αποστολή μηνύματος κειμένου προς κύριο αριθμό</string>
+  <string name="sms_other_fax">Αποστολή μηνύματος κειμένου σε φαξ</string>
+  <string name="sms_radio">Αποστολή μηνύματος κειμένου προς πομπό</string>
+  <string name="sms_telex">Αποστολή μηνύματος κειμένου σε τηλέτυπο</string>
+  <string name="sms_tty_tdd">Αποστολή μηνύματος κειμένου προς τηλέφωνο TTY/TDD</string>
+  <string name="sms_work_mobile">Αποστολή μηνύματος κειμένου προς κινητό τηλέφωνο εργασίας</string>
+  <string name="sms_work_pager">Αποστολή μηνύματος κειμένου προς βομβητή εργασίας</string>
+  <string name="sms_assistant">Αποστολή μηνύματος προς %s</string>
+  <string name="sms_mms">Αποστολή μηνύματος κειμένου ως MMS</string>
+  <string name="clearFrequentsConfirmation_title">Διαγραφή ατόμων με συχνή επικοινωνία;</string>
+  <string name="clearFrequentsConfirmation">Θα διαγράψετε τη λίστα συχνών επαφών στις εφαρμογές Επαφές και Τηλέφωνο και θα επιβάλλετε στις εφαρμογές ηλεκτρονικού ταχυδρομείου να μάθουν τις προτιμήσεις διευθύνσεών σας από την αρχή,</string>
+  <string name="clearFrequentsProgress_title">Διαγρ. ατόμων με συχνή επικοινωνία…</string>
+  <string name="status_available">Διαθέσιμος</string>
+  <string name="status_away">Μη διαθέσιμος</string>
+  <string name="status_busy">Απασχολημένος</string>
+  <string name="contactsList">Επαφές</string>
+  <string name="contact_suggestions">Κορυφαίες προτάσεις</string>
+  <string name="local_invisible_directory">Άλλο</string>
+  <string name="directory_search_label">Κατάλογος</string>
+  <string name="directory_search_label_work">Κατάλογος εργασίας</string>
+  <string name="local_search_label">Όλες οι επαφές</string>
+  <string name="local_suggestions_search_label">Προτάσεις</string>
+  <string msgid="9154761216179882405" name="user_profile_contacts_list_header">Εγώ</string>
+  <string name="missing_name">(Χωρίς όνομα)</string>
+  <string msgid="2795575601596468581" name="description_view_contact_detail">Προβολή επαφής</string>
+  <string name="list_filter_phones">Όλες οι επαφές με αριθμούς τηλεφώνου</string>
+  <string name="list_filter_phones_work">Επαφές προφίλ εργασίας</string>
+  <string name="view_updates_from_group">Προβολή ενημερώσεων</string>
+  <string name="account_phone">Μόνο στη συσκευή, χωρίς συγχρονισμό</string>
+  <string name="nameLabelsGroup">Όνομα</string>
+  <string name="nicknameLabelsGroup">Ψευδώνυμο</string>
+  <string name="full_name">Όνομα</string>
+  <string name="name_given">Όνομα</string>
+  <string name="name_family">Επώνυμο</string>
+  <string name="name_prefix">Πρόθεμα ονόματος</string>
+  <string name="name_middle">Πατρώνυμο</string>
+  <string name="name_suffix">Επίθημα ονόματος</string>
+  <string name="name_phonetic">Φωνητικό όνομα</string>
+  <string name="name_phonetic_given">Φωνητικό όνομα</string>
+  <string name="name_phonetic_middle">Φωνητικό πατρώνυμου</string>
+  <string name="name_phonetic_family">Φωνητικό επώνυμο</string>
+  <string name="phoneLabelsGroup">Τηλέφωνο</string>
+  <string name="emailLabelsGroup">Μήνυμα ηλεκτρονικού ταχυδρομείου</string>
+  <string name="postalLabelsGroup">Διεύθυνση</string>
+  <string name="imLabelsGroup">IM</string>
+  <string name="organizationLabelsGroup">Εταιρεία</string>
+  <string name="relationLabelsGroup">Σχέση</string>
+  <string name="eventLabelsGroup">Ειδική ημερομηνία</string>
+  <string name="sms">Μήνυμα κειμένου</string>
+  <string name="postal_address">Διεύθυνση</string>
+  <string name="ghostData_company">Εταιρεία</string>
+  <string name="ghostData_title">Τίτλος</string>
+  <string name="label_notes">Σημειώσεις</string>
+  <string name="label_sip_address">SIP</string>
+  <string name="websiteLabelsGroup">Ιστότοπος</string>
+  <string name="groupsLabel">Ομάδες</string>
+  <string name="email_home">Αποστολή μηνύματος ηλεκτρονικού ταχυδρομείου προς οικία</string>
+  <string name="email_mobile">Αποστολή μηνύματος ηλεκτρονικού ταχυδρομείου προς κινητό</string>
+  <string name="email_work">Αποστολή μηνύματος ηλεκτρονικού ταχυδρομείου προς εργασία</string>
+  <string name="email_other">Μήνυμα ηλεκτρονικού ταχυδρομείου</string>
+  <string name="email_custom">Αποστολή μηνύματος ηλεκτρονικού ταχυδρομείου προς %s</string>
+  <string name="email">Μήνυμα ηλεκτρονικού ταχυδρομείου</string>
+  <string name="postal_street">Οδός</string>
+  <string name="postal_city">Πόλη</string>
+  <string name="postal_region">Πολιτεία</string>
+  <string name="postal_postcode">Ταχυδρομικός κώδικας</string>
+  <string name="postal_country">Χώρα</string>
+  <string name="map_home">Προβολή διεύθυνσης οικίας</string>
+  <string name="map_work">Προβολή διεύθυνσης εργασίας</string>
+  <string name="map_other">Προβολή διεύθυνσης</string>
+  <string name="map_custom">Προβολή διεύθυνσης %s</string>
+  <string name="chat_aim">Συζήτηση μέσω AIM</string>
+  <string name="chat_msn">Συζήτηση μέσω Windows Live</string>
+  <string name="chat_yahoo">Συζήτηση μέσω Yahoo</string>
+  <string name="chat_skype">Συζήτηση μέσω Skype</string>
+  <string name="chat_qq">Συζήτηση μέσω QQ</string>
+  <string name="chat_gtalk">Συζήτηση μέσω Google Talk</string>
+  <string name="chat_icq">Συζήτηση μέσω ICQ</string>
+  <string name="chat_jabber">Συζήτηση μέσω Jabber</string>
+  <string name="chat">Συζήτηση</string>
+  <string name="list_filter_all_accounts">Όλες οι επαφές</string>
+  <string name="listAllContactsInAccount">Επαφές στο %s</string>
+  <string name="listCustomView">Επαφές σε προσ/νη προβολή</string>
+  <string name="listSingleContact">Μία επαφή</string>
+  <string name="display_options_sort_list_by">Ταξινόμηση κατά</string>
+  <string name="display_options_sort_by_given_name">Όνομα</string>
+  <string name="display_options_sort_by_family_name">Επώνυμο</string>
+  <string name="display_options_view_names_as">Μορφή ονόματος</string>
+  <string name="display_options_view_given_name_first">Πρώτα το όνομα</string>
+  <string name="display_options_view_family_name_first">Πρώτα το επώνυμο</string>
+  <string name="menu_clear_frequents">Διαγραφή ατόμ. με συχνή επικ.</string>
+  <string name="action_menu_back_from_search">τέλος αναζήτησης</string>
+  <string name="description_clear_search">Διαγραφή αναζητήσεων</string>
+  <string name="select_account_dialog_title">Λογαριασμός</string>
+  <string name="set_default_account">Χρήση πάντα για κλήσεις</string>
+  <string name="select_phone_account_for_calls">Επιλέξτε SIM για αυτήν την κλήση</string>
+  <string name="select_phone_account_for_calls_remember">Διατήρηση αυτής της ρύθμισης</string>
+  <string name="call_with_a_note">Κλήση με σημείωση</string>
+  <string name="call_subject_hint">Πληκτρολογήστε μια σημείωση για αποστολή με την κλήση…</string>
+  <string name="send_and_call_button">ΑΠΟΣΤΟΛΗ ΚΑΙ ΚΛΗΣΗ</string>
+  <string name="call_subject_limit">%1$s / %2$s</string>
+  <string name="old_call_subject_type_and_number">%1$s %2$s</string>
+  <string name="tab_title">Καρτέλα %1$s.</string>
+  <plurals name="tab_title_with_unread_items">
+    <item quantity="one"> Καρτέλα %1$s. %2$d μη αναγνωσμένο στοιχείο. </item>
+    <item quantity="other"> Καρτέλα %1$s. %2$d μη αναγνωσμένα στοιχεία. </item>
+  </plurals>
+  <string name="description_search_video_call">Βιντεοκλήση</string>
+  <string name="description_search_call_and_share">Κοινοποίηση και κλήση</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-en-rAU/strings.xml b/java/com/android/contacts/common/res/values-en-rAU/strings.xml
index b6b2a29..2729522 100644
--- a/java/com/android/contacts/common/res/values-en-rAU/strings.xml
+++ b/java/com/android/contacts/common/res/values-en-rAU/strings.xml
@@ -1,162 +1,145 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="toast_text_copied" msgid="8979281391599667362">"Text copied"</string>
-    <string name="call_custom" msgid="3041673234638990874">"Call <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="call_home" msgid="125893483593803791">"Call home"</string>
-    <string name="call_mobile" msgid="967589404494150813">"Call mobile"</string>
-    <string name="call_work" msgid="6040550697395300892">"Call work"</string>
-    <string name="call_fax_work" msgid="5260192771364592922">"Call work fax"</string>
-    <string name="call_fax_home" msgid="5174311195081144124">"Call home fax"</string>
-    <string name="call_pager" msgid="6814149227741274161">"Call pager"</string>
-    <string name="call_other" msgid="5536385588712587235">"Call"</string>
-    <string name="call_callback" msgid="6314019862718112786">"Call callback"</string>
-    <string name="call_car" msgid="3197417098027764954">"Call car"</string>
-    <string name="call_company_main" msgid="2557663310028446397">"Call company main"</string>
-    <string name="call_isdn" msgid="4691270442763649522">"Call ISDN"</string>
-    <string name="call_main" msgid="3293707608770407814">"Call main"</string>
-    <string name="call_other_fax" msgid="4724521984879021465">"Call fax"</string>
-    <string name="call_radio" msgid="8942441419845057942">"Call radio"</string>
-    <string name="call_telex" msgid="2031514461660668351">"Call telex"</string>
-    <string name="call_tty_tdd" msgid="7807210224965727701">"Call TTY/TDD"</string>
-    <string name="call_work_mobile" msgid="2716342732938578495">"Call work mobile"</string>
-    <string name="call_work_pager" msgid="3791778749827366574">"Call work pager"</string>
-    <string name="call_assistant" msgid="4177478845473789294">"Call <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
-    <string name="call_mms" msgid="4958811711741872901">"Call MMS"</string>
-    <string name="sms_custom" msgid="8785368968605026317">"Text <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="sms_home" msgid="3527719551060295243">"Text home"</string>
-    <string name="sms_mobile" msgid="8883045857887736518">"Text mobile"</string>
-    <string name="sms_work" msgid="4158595439553450966">"Text work"</string>
-    <string name="sms_fax_work" msgid="5483726627718055248">"Text work fax"</string>
-    <string name="sms_fax_home" msgid="9219265155770746077">"Text home fax"</string>
-    <string name="sms_pager" msgid="4901085068525193933">"Text pager"</string>
-    <string name="sms_other" msgid="1742702947993285933">"Text"</string>
-    <string name="sms_callback" msgid="5833483630377538308">"Text callback"</string>
-    <string name="sms_car" msgid="4314577266154395174">"Text car"</string>
-    <string name="sms_company_main" msgid="2308160928487360705">"Text company main"</string>
-    <string name="sms_isdn" msgid="6394300346179302542">"Text ISDN"</string>
-    <string name="sms_main" msgid="8908087742014140774">"Text main"</string>
-    <string name="sms_other_fax" msgid="8768455473295405427">"Text fax"</string>
-    <string name="sms_radio" msgid="855555176531704682">"Text radio"</string>
-    <string name="sms_telex" msgid="6269029276223252719">"Text telex"</string>
-    <string name="sms_tty_tdd" msgid="6229057354509192444">"Text TTY/TDD"</string>
-    <string name="sms_work_mobile" msgid="2155975469329969840">"Text work mobile"</string>
-    <string name="sms_work_pager" msgid="8500140274906830742">"Text work pager"</string>
-    <string name="sms_assistant" msgid="8513548482745330818">"Text <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
-    <string name="sms_mms" msgid="5187888900503248542">"Text MMS"</string>
-    <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"Clear frequently contacted?"</string>
-    <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"You\'ll clear the frequently contacted list in the Contacts and Phone apps, and force email apps to learn your addressing preferences from scratch."</string>
-    <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"Clearing frequently contacted…"</string>
-    <string name="status_available" msgid="2648156525685472626">"Available"</string>
-    <string name="status_away" msgid="2298688367552893953">"Away"</string>
-    <string name="status_busy" msgid="5990832098713248503">"Busy"</string>
-    <string name="contactsList" msgid="8806067891419291513">"Contacts"</string>
-    <string name="contact_suggestions" msgid="3324166754807120006">"Top suggested"</string>
-    <string name="local_invisible_directory" msgid="4723238462733650090">"Other"</string>
-    <string name="directory_search_label" msgid="4621215895484025229">"Directory"</string>
-    <string name="directory_search_label_work" msgid="7679326282707414897">"Work directory"</string>
-    <string name="local_search_label" msgid="907622822323119235">"All contacts"</string>
-    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Suggestions"</string>
-    <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Me"</string>
-    <string name="missing_name" msgid="978606963362745020">"(No name)"</string>
-    <string name="description_view_contact_detail" msgid="2428742401208561136">"View contact"</string>
-    <string name="list_filter_phones" msgid="8763316061763437182">"All contacts with phone numbers"</string>
-    <string name="list_filter_phones_work" msgid="7083575404573422965">"Work profile contacts"</string>
-    <string name="view_updates_from_group" msgid="9011641093168385729">"View updates"</string>
-    <string name="account_phone" msgid="7067809073194061035">"Device only, unsynced"</string>
-    <string name="nameLabelsGroup" msgid="7730465833159557471">"Name"</string>
-    <string name="nicknameLabelsGroup" msgid="6310556912361840029">"Nickname"</string>
-    <string name="full_name" msgid="648186563998465740">"Name"</string>
-    <string name="name_given" msgid="5096576006314820536">"First name"</string>
-    <string name="name_family" msgid="6646235805198547467">"Surname"</string>
-    <string name="name_prefix" msgid="9215326539658838">"Name prefix"</string>
-    <string name="name_middle" msgid="703755205331582769">"Middle name"</string>
-    <string name="name_suffix" msgid="5777083390282548702">"Name suffix"</string>
-    <string name="name_phonetic" msgid="1650870996361663089">"Phonetic name"</string>
-    <string name="name_phonetic_given" msgid="618812334274603170">"Phonetic first name"</string>
-    <string name="name_phonetic_middle" msgid="4826820763384625538">"Phonetic middle name"</string>
-    <string name="name_phonetic_family" msgid="379905191212930771">"Phonetic surname"</string>
-    <string name="phoneLabelsGroup" msgid="169661929021355548">"Phone"</string>
-    <string name="emailLabelsGroup" msgid="2249752810477488833">"Email"</string>
-    <string name="postalLabelsGroup" msgid="6772000590189142253">"Address"</string>
-    <string name="imLabelsGroup" msgid="5718066254237364731">"IM"</string>
-    <string name="organizationLabelsGroup" msgid="1101996309241601435">"Organisation"</string>
-    <string name="relationLabelsGroup" msgid="53866051664600053">"Relationship"</string>
-    <string name="eventLabelsGroup" msgid="1236970042646618489">"Special date"</string>
-    <string name="sms" msgid="7574344928185328095">"Text message"</string>
-    <string name="postal_address" msgid="1804707930129674200">"Address"</string>
-    <string name="ghostData_company" msgid="2554310786296833424">"Company"</string>
-    <string name="ghostData_title" msgid="4994968731830184837">"Title"</string>
-    <string name="label_notes" msgid="2050255313694219786">"Notes"</string>
-    <string name="label_sip_address" msgid="8883266182575965926">"SIP"</string>
-    <string name="websiteLabelsGroup" msgid="1630734286462186790">"Website"</string>
-    <string name="groupsLabel" msgid="2694002798416868728">"Groups"</string>
-    <string name="email_home" msgid="889830029388962171">"Email home"</string>
-    <string name="email_mobile" msgid="4487686436743741150">"Email mobile"</string>
-    <string name="email_work" msgid="4223487303344613528">"Email work"</string>
-    <string name="email_other" msgid="4246411900126012062">"Email"</string>
-    <string name="email_custom" msgid="7246580894327511013">"Email <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="email" msgid="2807318537887091606">"Email"</string>
-    <string name="postal_street" msgid="6918171741240802474">"Street"</string>
-    <string name="postal_city" msgid="8674569121430005628">"City"</string>
-    <string name="postal_region" msgid="1730369286225469192">"County"</string>
-    <string name="postal_postcode" msgid="4450700741261990439">"Postcode"</string>
-    <string name="postal_country" msgid="232670707458768148">"Country"</string>
-    <string name="map_home" msgid="4181131107392126938">"View home address"</string>
-    <string name="map_work" msgid="5723471185992684400">"View work address"</string>
-    <string name="map_other" msgid="2253764780863500516">"View address"</string>
-    <string name="map_custom" msgid="5581743097882436157">"View <xliff:g id="CUSTOM">%s</xliff:g> address"</string>
-    <string name="chat_aim" msgid="2954364435497941659">"Chat using AIM"</string>
-    <string name="chat_msn" msgid="3130135239071228678">"Chat using Windows Live"</string>
-    <string name="chat_yahoo" msgid="3233552142326865347">"Chat using Yahoo"</string>
-    <string name="chat_skype" msgid="6486703981390592425">"Chat using Skype"</string>
-    <string name="chat_qq" msgid="786924280665740019">"Chat using QQ"</string>
-    <string name="chat_gtalk" msgid="7914674177243078035">"Chat using Google Talk"</string>
-    <string name="chat_icq" msgid="3292934726414765801">"Chat using ICQ"</string>
-    <string name="chat_jabber" msgid="6701542313597880204">"Chat using Jabber"</string>
-    <string name="chat" msgid="1020428260359370236">"Chat"</string>
-    <string name="list_filter_all_accounts" msgid="473782314881473992">"All contacts"</string>
-    <string name="listAllContactsInAccount" msgid="3486378621592995630">"Contacts in <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="listCustomView" msgid="5306282632413086731">"Contacts in customised view"</string>
-    <string name="listSingleContact" msgid="8620818791932382627">"Single contact"</string>
-    <string name="display_options_sort_list_by" msgid="3541875948367831228">"Sort by"</string>
-    <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"First name"</string>
-    <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"Surname"</string>
-    <string name="display_options_view_names_as" msgid="4204204205736735618">"Name format"</string>
-    <string name="display_options_view_given_name_first" msgid="2308026973021171020">"First name first"</string>
-    <string name="display_options_view_family_name_first" msgid="987430497292428242">"Surname first"</string>
-    <string name="menu_clear_frequents" msgid="5358271535047496120">"Clear frequents"</string>
-    <string name="action_menu_back_from_search" msgid="3550669942742167644">"stop searching"</string>
-    <string name="description_clear_search" msgid="2347258825265600782">"Clear search"</string>
-    <string name="select_account_dialog_title" msgid="2673504582803359239">"Account"</string>
-    <string name="set_default_account" msgid="7966099951006467572">"Always use this for calls"</string>
-    <string name="select_phone_account_for_calls" msgid="1784460686103423274">"Call with"</string>
-    <string name="call_with_a_note" msgid="6242261320491851133">"Call with a note"</string>
-    <string name="call_subject_hint" msgid="7233138753650420800">"Type a note to send with call ..."</string>
-    <string name="send_and_call_button" msgid="4735168294120154013">"SEND &amp; CALL"</string>
-    <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="tab_title" msgid="3387876802026074288">"<xliff:g id="TITLE">%1$s</xliff:g> tab."</string>
-    <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
-      <item quantity="other"> <xliff:g id="TITLE_2">%1$s</xliff:g> tab. <xliff:g id="COUNT_3">%2$d</xliff:g> unread items. </item>
-      <item quantity="one"> <xliff:g id="TITLE_0">%1$s</xliff:g> tab. <xliff:g id="COUNT_1">%2$d</xliff:g> unread item. </item>
-    </plurals>
-    <string name="description_search_video_call" msgid="4337369876888024909">"Video call"</string>
-    <string name="description_search_call_and_share" msgid="4912772842755050467">"Share and call"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_custom">Call %s</string>
+  <string name="call_home">Call home</string>
+  <string name="call_mobile">Call mobile</string>
+  <string name="call_work">Call work</string>
+  <string name="call_fax_work">Call work fax</string>
+  <string name="call_fax_home">Call home fax</string>
+  <string name="call_pager">Call pager</string>
+  <string name="call_other">Call</string>
+  <string name="call_callback">Call callback</string>
+  <string name="call_car">Call car</string>
+  <string name="call_company_main">Call company main</string>
+  <string name="call_isdn">Call ISDN</string>
+  <string name="call_main">Call main</string>
+  <string name="call_other_fax">Call fax</string>
+  <string name="call_radio">Call radio</string>
+  <string name="call_telex">Call telex</string>
+  <string name="call_tty_tdd">Call TTY/TDD</string>
+  <string name="call_work_mobile">Call work mobile</string>
+  <string name="call_work_pager">Call work pager</string>
+  <string name="call_assistant">Call %s</string>
+  <string name="call_mms">Call MMS</string>
+  <string name="sms_custom">Text %s</string>
+  <string name="sms_home">Text home</string>
+  <string name="sms_mobile">Text mobile</string>
+  <string name="sms_work">Text work</string>
+  <string name="sms_fax_work">Text work fax</string>
+  <string name="sms_fax_home">Text home fax</string>
+  <string name="sms_pager">Text pager</string>
+  <string name="sms_other">Text</string>
+  <string name="sms_callback">Text callback</string>
+  <string name="sms_car">Text car</string>
+  <string name="sms_company_main">Text company main</string>
+  <string name="sms_isdn">Text ISDN</string>
+  <string name="sms_main">Text main</string>
+  <string name="sms_other_fax">Text fax</string>
+  <string name="sms_radio">Text radio</string>
+  <string name="sms_telex">Text telex</string>
+  <string name="sms_tty_tdd">Text TTY/TDD</string>
+  <string name="sms_work_mobile">Text work mobile</string>
+  <string name="sms_work_pager">Text work pager</string>
+  <string name="sms_assistant">Text %s</string>
+  <string name="sms_mms">Text MMS</string>
+  <string name="clearFrequentsConfirmation_title">Clear frequently contacted?</string>
+  <string name="clearFrequentsConfirmation">You\'ll clear the frequently contacted list in the Contacts and Phone apps, and force email apps to learn your addressing preferences from scratch.</string>
+  <string name="clearFrequentsProgress_title">Clearing frequently contacted…</string>
+  <string name="status_available">Available</string>
+  <string name="status_away">Away</string>
+  <string name="status_busy">Busy</string>
+  <string name="contactsList">Contacts</string>
+  <string name="contact_suggestions">Top suggested</string>
+  <string name="local_invisible_directory">Other</string>
+  <string name="directory_search_label">Directory</string>
+  <string name="directory_search_label_work">Work directory</string>
+  <string name="local_search_label">All contacts</string>
+  <string name="local_suggestions_search_label">Suggestions</string>
+  <string msgid="9154761216179882405" name="user_profile_contacts_list_header">Me</string>
+  <string name="missing_name">(No name)</string>
+  <string msgid="2795575601596468581" name="description_view_contact_detail">View contact</string>
+  <string name="list_filter_phones">All contacts with phone numbers</string>
+  <string name="list_filter_phones_work">Work profile contacts</string>
+  <string name="view_updates_from_group">View updates</string>
+  <string name="account_phone">Device only, unsynced</string>
+  <string name="nameLabelsGroup">Name</string>
+  <string name="nicknameLabelsGroup">Nickname</string>
+  <string name="full_name">Name</string>
+  <string name="name_given">First name</string>
+  <string name="name_family">Surname</string>
+  <string name="name_prefix">Name prefix</string>
+  <string name="name_middle">Middle name</string>
+  <string name="name_suffix">Name suffix</string>
+  <string name="name_phonetic">Phonetic name</string>
+  <string name="name_phonetic_given">Phonetic first name</string>
+  <string name="name_phonetic_middle">Phonetic middle name</string>
+  <string name="name_phonetic_family">Phonetic surname</string>
+  <string name="phoneLabelsGroup">Phone</string>
+  <string name="emailLabelsGroup">Email</string>
+  <string name="postalLabelsGroup">Address</string>
+  <string name="imLabelsGroup">IM</string>
+  <string name="organizationLabelsGroup">Organisation</string>
+  <string name="relationLabelsGroup">Relationship</string>
+  <string name="eventLabelsGroup">Special date</string>
+  <string name="sms">Text message</string>
+  <string name="postal_address">Address</string>
+  <string name="ghostData_company">Company</string>
+  <string name="ghostData_title">Title</string>
+  <string name="label_notes">Notes</string>
+  <string name="label_sip_address">SIP</string>
+  <string name="websiteLabelsGroup">Website</string>
+  <string name="groupsLabel">Groups</string>
+  <string name="email_home">Email home</string>
+  <string name="email_mobile">Email mobile</string>
+  <string name="email_work">Email work</string>
+  <string name="email_other">Email</string>
+  <string name="email_custom">Email %s</string>
+  <string name="email">Email</string>
+  <string name="postal_street">Street</string>
+  <string name="postal_city">City</string>
+  <string name="postal_region">County</string>
+  <string name="postal_postcode">Postcode</string>
+  <string name="postal_country">Country</string>
+  <string name="map_home">View home address</string>
+  <string name="map_work">View work address</string>
+  <string name="map_other">View address</string>
+  <string name="map_custom">View %s address</string>
+  <string name="chat_aim">Chat using AIM</string>
+  <string name="chat_msn">Chat using Windows Live</string>
+  <string name="chat_yahoo">Chat using Yahoo</string>
+  <string name="chat_skype">Chat using Skype</string>
+  <string name="chat_qq">Chat using QQ</string>
+  <string name="chat_gtalk">Chat using Google Talk</string>
+  <string name="chat_icq">Chat using ICQ</string>
+  <string name="chat_jabber">Chat using Jabber</string>
+  <string name="chat">Chat</string>
+  <string name="list_filter_all_accounts">All contacts</string>
+  <string name="listAllContactsInAccount">Contacts in %s</string>
+  <string name="listCustomView">Contacts in customised view</string>
+  <string name="listSingleContact">Single contact</string>
+  <string name="display_options_sort_list_by">Sort by</string>
+  <string name="display_options_sort_by_given_name">First name</string>
+  <string name="display_options_sort_by_family_name">Surname</string>
+  <string name="display_options_view_names_as">Name format</string>
+  <string name="display_options_view_given_name_first">First name first</string>
+  <string name="display_options_view_family_name_first">Surname first</string>
+  <string name="menu_clear_frequents">Clear frequents</string>
+  <string name="action_menu_back_from_search">stop searching</string>
+  <string name="description_clear_search">Clear search</string>
+  <string name="select_account_dialog_title">Account</string>
+  <string name="set_default_account">Always use this for calls</string>
+  <string name="select_phone_account_for_calls">Choose SIM for this call</string>
+  <string name="select_phone_account_for_calls_remember">Remember this choice</string>
+  <string name="call_with_a_note">Call with a note</string>
+  <string name="call_subject_hint">Type a note to send with call ...</string>
+  <string name="send_and_call_button">SEND &amp; CALL</string>
+  <string name="call_subject_limit">%1$s / %2$s</string>
+  <string name="old_call_subject_type_and_number">%1$s %2$s</string>
+  <string name="tab_title">%1$s tab.</string>
+  <plurals name="tab_title_with_unread_items">
+    <item quantity="one"> %1$s tab. %2$d unread item. </item>
+    <item quantity="other"> %1$s tab. %2$d unread items. </item>
+  </plurals>
+  <string name="description_search_video_call">Video call</string>
+  <string name="description_search_call_and_share">Share and call</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-en-rGB/strings.xml b/java/com/android/contacts/common/res/values-en-rGB/strings.xml
index b6b2a29..2729522 100644
--- a/java/com/android/contacts/common/res/values-en-rGB/strings.xml
+++ b/java/com/android/contacts/common/res/values-en-rGB/strings.xml
@@ -1,162 +1,145 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="toast_text_copied" msgid="8979281391599667362">"Text copied"</string>
-    <string name="call_custom" msgid="3041673234638990874">"Call <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="call_home" msgid="125893483593803791">"Call home"</string>
-    <string name="call_mobile" msgid="967589404494150813">"Call mobile"</string>
-    <string name="call_work" msgid="6040550697395300892">"Call work"</string>
-    <string name="call_fax_work" msgid="5260192771364592922">"Call work fax"</string>
-    <string name="call_fax_home" msgid="5174311195081144124">"Call home fax"</string>
-    <string name="call_pager" msgid="6814149227741274161">"Call pager"</string>
-    <string name="call_other" msgid="5536385588712587235">"Call"</string>
-    <string name="call_callback" msgid="6314019862718112786">"Call callback"</string>
-    <string name="call_car" msgid="3197417098027764954">"Call car"</string>
-    <string name="call_company_main" msgid="2557663310028446397">"Call company main"</string>
-    <string name="call_isdn" msgid="4691270442763649522">"Call ISDN"</string>
-    <string name="call_main" msgid="3293707608770407814">"Call main"</string>
-    <string name="call_other_fax" msgid="4724521984879021465">"Call fax"</string>
-    <string name="call_radio" msgid="8942441419845057942">"Call radio"</string>
-    <string name="call_telex" msgid="2031514461660668351">"Call telex"</string>
-    <string name="call_tty_tdd" msgid="7807210224965727701">"Call TTY/TDD"</string>
-    <string name="call_work_mobile" msgid="2716342732938578495">"Call work mobile"</string>
-    <string name="call_work_pager" msgid="3791778749827366574">"Call work pager"</string>
-    <string name="call_assistant" msgid="4177478845473789294">"Call <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
-    <string name="call_mms" msgid="4958811711741872901">"Call MMS"</string>
-    <string name="sms_custom" msgid="8785368968605026317">"Text <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="sms_home" msgid="3527719551060295243">"Text home"</string>
-    <string name="sms_mobile" msgid="8883045857887736518">"Text mobile"</string>
-    <string name="sms_work" msgid="4158595439553450966">"Text work"</string>
-    <string name="sms_fax_work" msgid="5483726627718055248">"Text work fax"</string>
-    <string name="sms_fax_home" msgid="9219265155770746077">"Text home fax"</string>
-    <string name="sms_pager" msgid="4901085068525193933">"Text pager"</string>
-    <string name="sms_other" msgid="1742702947993285933">"Text"</string>
-    <string name="sms_callback" msgid="5833483630377538308">"Text callback"</string>
-    <string name="sms_car" msgid="4314577266154395174">"Text car"</string>
-    <string name="sms_company_main" msgid="2308160928487360705">"Text company main"</string>
-    <string name="sms_isdn" msgid="6394300346179302542">"Text ISDN"</string>
-    <string name="sms_main" msgid="8908087742014140774">"Text main"</string>
-    <string name="sms_other_fax" msgid="8768455473295405427">"Text fax"</string>
-    <string name="sms_radio" msgid="855555176531704682">"Text radio"</string>
-    <string name="sms_telex" msgid="6269029276223252719">"Text telex"</string>
-    <string name="sms_tty_tdd" msgid="6229057354509192444">"Text TTY/TDD"</string>
-    <string name="sms_work_mobile" msgid="2155975469329969840">"Text work mobile"</string>
-    <string name="sms_work_pager" msgid="8500140274906830742">"Text work pager"</string>
-    <string name="sms_assistant" msgid="8513548482745330818">"Text <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
-    <string name="sms_mms" msgid="5187888900503248542">"Text MMS"</string>
-    <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"Clear frequently contacted?"</string>
-    <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"You\'ll clear the frequently contacted list in the Contacts and Phone apps, and force email apps to learn your addressing preferences from scratch."</string>
-    <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"Clearing frequently contacted…"</string>
-    <string name="status_available" msgid="2648156525685472626">"Available"</string>
-    <string name="status_away" msgid="2298688367552893953">"Away"</string>
-    <string name="status_busy" msgid="5990832098713248503">"Busy"</string>
-    <string name="contactsList" msgid="8806067891419291513">"Contacts"</string>
-    <string name="contact_suggestions" msgid="3324166754807120006">"Top suggested"</string>
-    <string name="local_invisible_directory" msgid="4723238462733650090">"Other"</string>
-    <string name="directory_search_label" msgid="4621215895484025229">"Directory"</string>
-    <string name="directory_search_label_work" msgid="7679326282707414897">"Work directory"</string>
-    <string name="local_search_label" msgid="907622822323119235">"All contacts"</string>
-    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Suggestions"</string>
-    <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Me"</string>
-    <string name="missing_name" msgid="978606963362745020">"(No name)"</string>
-    <string name="description_view_contact_detail" msgid="2428742401208561136">"View contact"</string>
-    <string name="list_filter_phones" msgid="8763316061763437182">"All contacts with phone numbers"</string>
-    <string name="list_filter_phones_work" msgid="7083575404573422965">"Work profile contacts"</string>
-    <string name="view_updates_from_group" msgid="9011641093168385729">"View updates"</string>
-    <string name="account_phone" msgid="7067809073194061035">"Device only, unsynced"</string>
-    <string name="nameLabelsGroup" msgid="7730465833159557471">"Name"</string>
-    <string name="nicknameLabelsGroup" msgid="6310556912361840029">"Nickname"</string>
-    <string name="full_name" msgid="648186563998465740">"Name"</string>
-    <string name="name_given" msgid="5096576006314820536">"First name"</string>
-    <string name="name_family" msgid="6646235805198547467">"Surname"</string>
-    <string name="name_prefix" msgid="9215326539658838">"Name prefix"</string>
-    <string name="name_middle" msgid="703755205331582769">"Middle name"</string>
-    <string name="name_suffix" msgid="5777083390282548702">"Name suffix"</string>
-    <string name="name_phonetic" msgid="1650870996361663089">"Phonetic name"</string>
-    <string name="name_phonetic_given" msgid="618812334274603170">"Phonetic first name"</string>
-    <string name="name_phonetic_middle" msgid="4826820763384625538">"Phonetic middle name"</string>
-    <string name="name_phonetic_family" msgid="379905191212930771">"Phonetic surname"</string>
-    <string name="phoneLabelsGroup" msgid="169661929021355548">"Phone"</string>
-    <string name="emailLabelsGroup" msgid="2249752810477488833">"Email"</string>
-    <string name="postalLabelsGroup" msgid="6772000590189142253">"Address"</string>
-    <string name="imLabelsGroup" msgid="5718066254237364731">"IM"</string>
-    <string name="organizationLabelsGroup" msgid="1101996309241601435">"Organisation"</string>
-    <string name="relationLabelsGroup" msgid="53866051664600053">"Relationship"</string>
-    <string name="eventLabelsGroup" msgid="1236970042646618489">"Special date"</string>
-    <string name="sms" msgid="7574344928185328095">"Text message"</string>
-    <string name="postal_address" msgid="1804707930129674200">"Address"</string>
-    <string name="ghostData_company" msgid="2554310786296833424">"Company"</string>
-    <string name="ghostData_title" msgid="4994968731830184837">"Title"</string>
-    <string name="label_notes" msgid="2050255313694219786">"Notes"</string>
-    <string name="label_sip_address" msgid="8883266182575965926">"SIP"</string>
-    <string name="websiteLabelsGroup" msgid="1630734286462186790">"Website"</string>
-    <string name="groupsLabel" msgid="2694002798416868728">"Groups"</string>
-    <string name="email_home" msgid="889830029388962171">"Email home"</string>
-    <string name="email_mobile" msgid="4487686436743741150">"Email mobile"</string>
-    <string name="email_work" msgid="4223487303344613528">"Email work"</string>
-    <string name="email_other" msgid="4246411900126012062">"Email"</string>
-    <string name="email_custom" msgid="7246580894327511013">"Email <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="email" msgid="2807318537887091606">"Email"</string>
-    <string name="postal_street" msgid="6918171741240802474">"Street"</string>
-    <string name="postal_city" msgid="8674569121430005628">"City"</string>
-    <string name="postal_region" msgid="1730369286225469192">"County"</string>
-    <string name="postal_postcode" msgid="4450700741261990439">"Postcode"</string>
-    <string name="postal_country" msgid="232670707458768148">"Country"</string>
-    <string name="map_home" msgid="4181131107392126938">"View home address"</string>
-    <string name="map_work" msgid="5723471185992684400">"View work address"</string>
-    <string name="map_other" msgid="2253764780863500516">"View address"</string>
-    <string name="map_custom" msgid="5581743097882436157">"View <xliff:g id="CUSTOM">%s</xliff:g> address"</string>
-    <string name="chat_aim" msgid="2954364435497941659">"Chat using AIM"</string>
-    <string name="chat_msn" msgid="3130135239071228678">"Chat using Windows Live"</string>
-    <string name="chat_yahoo" msgid="3233552142326865347">"Chat using Yahoo"</string>
-    <string name="chat_skype" msgid="6486703981390592425">"Chat using Skype"</string>
-    <string name="chat_qq" msgid="786924280665740019">"Chat using QQ"</string>
-    <string name="chat_gtalk" msgid="7914674177243078035">"Chat using Google Talk"</string>
-    <string name="chat_icq" msgid="3292934726414765801">"Chat using ICQ"</string>
-    <string name="chat_jabber" msgid="6701542313597880204">"Chat using Jabber"</string>
-    <string name="chat" msgid="1020428260359370236">"Chat"</string>
-    <string name="list_filter_all_accounts" msgid="473782314881473992">"All contacts"</string>
-    <string name="listAllContactsInAccount" msgid="3486378621592995630">"Contacts in <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="listCustomView" msgid="5306282632413086731">"Contacts in customised view"</string>
-    <string name="listSingleContact" msgid="8620818791932382627">"Single contact"</string>
-    <string name="display_options_sort_list_by" msgid="3541875948367831228">"Sort by"</string>
-    <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"First name"</string>
-    <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"Surname"</string>
-    <string name="display_options_view_names_as" msgid="4204204205736735618">"Name format"</string>
-    <string name="display_options_view_given_name_first" msgid="2308026973021171020">"First name first"</string>
-    <string name="display_options_view_family_name_first" msgid="987430497292428242">"Surname first"</string>
-    <string name="menu_clear_frequents" msgid="5358271535047496120">"Clear frequents"</string>
-    <string name="action_menu_back_from_search" msgid="3550669942742167644">"stop searching"</string>
-    <string name="description_clear_search" msgid="2347258825265600782">"Clear search"</string>
-    <string name="select_account_dialog_title" msgid="2673504582803359239">"Account"</string>
-    <string name="set_default_account" msgid="7966099951006467572">"Always use this for calls"</string>
-    <string name="select_phone_account_for_calls" msgid="1784460686103423274">"Call with"</string>
-    <string name="call_with_a_note" msgid="6242261320491851133">"Call with a note"</string>
-    <string name="call_subject_hint" msgid="7233138753650420800">"Type a note to send with call ..."</string>
-    <string name="send_and_call_button" msgid="4735168294120154013">"SEND &amp; CALL"</string>
-    <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="tab_title" msgid="3387876802026074288">"<xliff:g id="TITLE">%1$s</xliff:g> tab."</string>
-    <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
-      <item quantity="other"> <xliff:g id="TITLE_2">%1$s</xliff:g> tab. <xliff:g id="COUNT_3">%2$d</xliff:g> unread items. </item>
-      <item quantity="one"> <xliff:g id="TITLE_0">%1$s</xliff:g> tab. <xliff:g id="COUNT_1">%2$d</xliff:g> unread item. </item>
-    </plurals>
-    <string name="description_search_video_call" msgid="4337369876888024909">"Video call"</string>
-    <string name="description_search_call_and_share" msgid="4912772842755050467">"Share and call"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_custom">Call %s</string>
+  <string name="call_home">Call home</string>
+  <string name="call_mobile">Call mobile</string>
+  <string name="call_work">Call work</string>
+  <string name="call_fax_work">Call work fax</string>
+  <string name="call_fax_home">Call home fax</string>
+  <string name="call_pager">Call pager</string>
+  <string name="call_other">Call</string>
+  <string name="call_callback">Call callback</string>
+  <string name="call_car">Call car</string>
+  <string name="call_company_main">Call company main</string>
+  <string name="call_isdn">Call ISDN</string>
+  <string name="call_main">Call main</string>
+  <string name="call_other_fax">Call fax</string>
+  <string name="call_radio">Call radio</string>
+  <string name="call_telex">Call telex</string>
+  <string name="call_tty_tdd">Call TTY/TDD</string>
+  <string name="call_work_mobile">Call work mobile</string>
+  <string name="call_work_pager">Call work pager</string>
+  <string name="call_assistant">Call %s</string>
+  <string name="call_mms">Call MMS</string>
+  <string name="sms_custom">Text %s</string>
+  <string name="sms_home">Text home</string>
+  <string name="sms_mobile">Text mobile</string>
+  <string name="sms_work">Text work</string>
+  <string name="sms_fax_work">Text work fax</string>
+  <string name="sms_fax_home">Text home fax</string>
+  <string name="sms_pager">Text pager</string>
+  <string name="sms_other">Text</string>
+  <string name="sms_callback">Text callback</string>
+  <string name="sms_car">Text car</string>
+  <string name="sms_company_main">Text company main</string>
+  <string name="sms_isdn">Text ISDN</string>
+  <string name="sms_main">Text main</string>
+  <string name="sms_other_fax">Text fax</string>
+  <string name="sms_radio">Text radio</string>
+  <string name="sms_telex">Text telex</string>
+  <string name="sms_tty_tdd">Text TTY/TDD</string>
+  <string name="sms_work_mobile">Text work mobile</string>
+  <string name="sms_work_pager">Text work pager</string>
+  <string name="sms_assistant">Text %s</string>
+  <string name="sms_mms">Text MMS</string>
+  <string name="clearFrequentsConfirmation_title">Clear frequently contacted?</string>
+  <string name="clearFrequentsConfirmation">You\'ll clear the frequently contacted list in the Contacts and Phone apps, and force email apps to learn your addressing preferences from scratch.</string>
+  <string name="clearFrequentsProgress_title">Clearing frequently contacted…</string>
+  <string name="status_available">Available</string>
+  <string name="status_away">Away</string>
+  <string name="status_busy">Busy</string>
+  <string name="contactsList">Contacts</string>
+  <string name="contact_suggestions">Top suggested</string>
+  <string name="local_invisible_directory">Other</string>
+  <string name="directory_search_label">Directory</string>
+  <string name="directory_search_label_work">Work directory</string>
+  <string name="local_search_label">All contacts</string>
+  <string name="local_suggestions_search_label">Suggestions</string>
+  <string msgid="9154761216179882405" name="user_profile_contacts_list_header">Me</string>
+  <string name="missing_name">(No name)</string>
+  <string msgid="2795575601596468581" name="description_view_contact_detail">View contact</string>
+  <string name="list_filter_phones">All contacts with phone numbers</string>
+  <string name="list_filter_phones_work">Work profile contacts</string>
+  <string name="view_updates_from_group">View updates</string>
+  <string name="account_phone">Device only, unsynced</string>
+  <string name="nameLabelsGroup">Name</string>
+  <string name="nicknameLabelsGroup">Nickname</string>
+  <string name="full_name">Name</string>
+  <string name="name_given">First name</string>
+  <string name="name_family">Surname</string>
+  <string name="name_prefix">Name prefix</string>
+  <string name="name_middle">Middle name</string>
+  <string name="name_suffix">Name suffix</string>
+  <string name="name_phonetic">Phonetic name</string>
+  <string name="name_phonetic_given">Phonetic first name</string>
+  <string name="name_phonetic_middle">Phonetic middle name</string>
+  <string name="name_phonetic_family">Phonetic surname</string>
+  <string name="phoneLabelsGroup">Phone</string>
+  <string name="emailLabelsGroup">Email</string>
+  <string name="postalLabelsGroup">Address</string>
+  <string name="imLabelsGroup">IM</string>
+  <string name="organizationLabelsGroup">Organisation</string>
+  <string name="relationLabelsGroup">Relationship</string>
+  <string name="eventLabelsGroup">Special date</string>
+  <string name="sms">Text message</string>
+  <string name="postal_address">Address</string>
+  <string name="ghostData_company">Company</string>
+  <string name="ghostData_title">Title</string>
+  <string name="label_notes">Notes</string>
+  <string name="label_sip_address">SIP</string>
+  <string name="websiteLabelsGroup">Website</string>
+  <string name="groupsLabel">Groups</string>
+  <string name="email_home">Email home</string>
+  <string name="email_mobile">Email mobile</string>
+  <string name="email_work">Email work</string>
+  <string name="email_other">Email</string>
+  <string name="email_custom">Email %s</string>
+  <string name="email">Email</string>
+  <string name="postal_street">Street</string>
+  <string name="postal_city">City</string>
+  <string name="postal_region">County</string>
+  <string name="postal_postcode">Postcode</string>
+  <string name="postal_country">Country</string>
+  <string name="map_home">View home address</string>
+  <string name="map_work">View work address</string>
+  <string name="map_other">View address</string>
+  <string name="map_custom">View %s address</string>
+  <string name="chat_aim">Chat using AIM</string>
+  <string name="chat_msn">Chat using Windows Live</string>
+  <string name="chat_yahoo">Chat using Yahoo</string>
+  <string name="chat_skype">Chat using Skype</string>
+  <string name="chat_qq">Chat using QQ</string>
+  <string name="chat_gtalk">Chat using Google Talk</string>
+  <string name="chat_icq">Chat using ICQ</string>
+  <string name="chat_jabber">Chat using Jabber</string>
+  <string name="chat">Chat</string>
+  <string name="list_filter_all_accounts">All contacts</string>
+  <string name="listAllContactsInAccount">Contacts in %s</string>
+  <string name="listCustomView">Contacts in customised view</string>
+  <string name="listSingleContact">Single contact</string>
+  <string name="display_options_sort_list_by">Sort by</string>
+  <string name="display_options_sort_by_given_name">First name</string>
+  <string name="display_options_sort_by_family_name">Surname</string>
+  <string name="display_options_view_names_as">Name format</string>
+  <string name="display_options_view_given_name_first">First name first</string>
+  <string name="display_options_view_family_name_first">Surname first</string>
+  <string name="menu_clear_frequents">Clear frequents</string>
+  <string name="action_menu_back_from_search">stop searching</string>
+  <string name="description_clear_search">Clear search</string>
+  <string name="select_account_dialog_title">Account</string>
+  <string name="set_default_account">Always use this for calls</string>
+  <string name="select_phone_account_for_calls">Choose SIM for this call</string>
+  <string name="select_phone_account_for_calls_remember">Remember this choice</string>
+  <string name="call_with_a_note">Call with a note</string>
+  <string name="call_subject_hint">Type a note to send with call ...</string>
+  <string name="send_and_call_button">SEND &amp; CALL</string>
+  <string name="call_subject_limit">%1$s / %2$s</string>
+  <string name="old_call_subject_type_and_number">%1$s %2$s</string>
+  <string name="tab_title">%1$s tab.</string>
+  <plurals name="tab_title_with_unread_items">
+    <item quantity="one"> %1$s tab. %2$d unread item. </item>
+    <item quantity="other"> %1$s tab. %2$d unread items. </item>
+  </plurals>
+  <string name="description_search_video_call">Video call</string>
+  <string name="description_search_call_and_share">Share and call</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-en-rIN/strings.xml b/java/com/android/contacts/common/res/values-en-rIN/strings.xml
index b6b2a29..2729522 100644
--- a/java/com/android/contacts/common/res/values-en-rIN/strings.xml
+++ b/java/com/android/contacts/common/res/values-en-rIN/strings.xml
@@ -1,162 +1,145 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="toast_text_copied" msgid="8979281391599667362">"Text copied"</string>
-    <string name="call_custom" msgid="3041673234638990874">"Call <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="call_home" msgid="125893483593803791">"Call home"</string>
-    <string name="call_mobile" msgid="967589404494150813">"Call mobile"</string>
-    <string name="call_work" msgid="6040550697395300892">"Call work"</string>
-    <string name="call_fax_work" msgid="5260192771364592922">"Call work fax"</string>
-    <string name="call_fax_home" msgid="5174311195081144124">"Call home fax"</string>
-    <string name="call_pager" msgid="6814149227741274161">"Call pager"</string>
-    <string name="call_other" msgid="5536385588712587235">"Call"</string>
-    <string name="call_callback" msgid="6314019862718112786">"Call callback"</string>
-    <string name="call_car" msgid="3197417098027764954">"Call car"</string>
-    <string name="call_company_main" msgid="2557663310028446397">"Call company main"</string>
-    <string name="call_isdn" msgid="4691270442763649522">"Call ISDN"</string>
-    <string name="call_main" msgid="3293707608770407814">"Call main"</string>
-    <string name="call_other_fax" msgid="4724521984879021465">"Call fax"</string>
-    <string name="call_radio" msgid="8942441419845057942">"Call radio"</string>
-    <string name="call_telex" msgid="2031514461660668351">"Call telex"</string>
-    <string name="call_tty_tdd" msgid="7807210224965727701">"Call TTY/TDD"</string>
-    <string name="call_work_mobile" msgid="2716342732938578495">"Call work mobile"</string>
-    <string name="call_work_pager" msgid="3791778749827366574">"Call work pager"</string>
-    <string name="call_assistant" msgid="4177478845473789294">"Call <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
-    <string name="call_mms" msgid="4958811711741872901">"Call MMS"</string>
-    <string name="sms_custom" msgid="8785368968605026317">"Text <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="sms_home" msgid="3527719551060295243">"Text home"</string>
-    <string name="sms_mobile" msgid="8883045857887736518">"Text mobile"</string>
-    <string name="sms_work" msgid="4158595439553450966">"Text work"</string>
-    <string name="sms_fax_work" msgid="5483726627718055248">"Text work fax"</string>
-    <string name="sms_fax_home" msgid="9219265155770746077">"Text home fax"</string>
-    <string name="sms_pager" msgid="4901085068525193933">"Text pager"</string>
-    <string name="sms_other" msgid="1742702947993285933">"Text"</string>
-    <string name="sms_callback" msgid="5833483630377538308">"Text callback"</string>
-    <string name="sms_car" msgid="4314577266154395174">"Text car"</string>
-    <string name="sms_company_main" msgid="2308160928487360705">"Text company main"</string>
-    <string name="sms_isdn" msgid="6394300346179302542">"Text ISDN"</string>
-    <string name="sms_main" msgid="8908087742014140774">"Text main"</string>
-    <string name="sms_other_fax" msgid="8768455473295405427">"Text fax"</string>
-    <string name="sms_radio" msgid="855555176531704682">"Text radio"</string>
-    <string name="sms_telex" msgid="6269029276223252719">"Text telex"</string>
-    <string name="sms_tty_tdd" msgid="6229057354509192444">"Text TTY/TDD"</string>
-    <string name="sms_work_mobile" msgid="2155975469329969840">"Text work mobile"</string>
-    <string name="sms_work_pager" msgid="8500140274906830742">"Text work pager"</string>
-    <string name="sms_assistant" msgid="8513548482745330818">"Text <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
-    <string name="sms_mms" msgid="5187888900503248542">"Text MMS"</string>
-    <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"Clear frequently contacted?"</string>
-    <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"You\'ll clear the frequently contacted list in the Contacts and Phone apps, and force email apps to learn your addressing preferences from scratch."</string>
-    <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"Clearing frequently contacted…"</string>
-    <string name="status_available" msgid="2648156525685472626">"Available"</string>
-    <string name="status_away" msgid="2298688367552893953">"Away"</string>
-    <string name="status_busy" msgid="5990832098713248503">"Busy"</string>
-    <string name="contactsList" msgid="8806067891419291513">"Contacts"</string>
-    <string name="contact_suggestions" msgid="3324166754807120006">"Top suggested"</string>
-    <string name="local_invisible_directory" msgid="4723238462733650090">"Other"</string>
-    <string name="directory_search_label" msgid="4621215895484025229">"Directory"</string>
-    <string name="directory_search_label_work" msgid="7679326282707414897">"Work directory"</string>
-    <string name="local_search_label" msgid="907622822323119235">"All contacts"</string>
-    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Suggestions"</string>
-    <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Me"</string>
-    <string name="missing_name" msgid="978606963362745020">"(No name)"</string>
-    <string name="description_view_contact_detail" msgid="2428742401208561136">"View contact"</string>
-    <string name="list_filter_phones" msgid="8763316061763437182">"All contacts with phone numbers"</string>
-    <string name="list_filter_phones_work" msgid="7083575404573422965">"Work profile contacts"</string>
-    <string name="view_updates_from_group" msgid="9011641093168385729">"View updates"</string>
-    <string name="account_phone" msgid="7067809073194061035">"Device only, unsynced"</string>
-    <string name="nameLabelsGroup" msgid="7730465833159557471">"Name"</string>
-    <string name="nicknameLabelsGroup" msgid="6310556912361840029">"Nickname"</string>
-    <string name="full_name" msgid="648186563998465740">"Name"</string>
-    <string name="name_given" msgid="5096576006314820536">"First name"</string>
-    <string name="name_family" msgid="6646235805198547467">"Surname"</string>
-    <string name="name_prefix" msgid="9215326539658838">"Name prefix"</string>
-    <string name="name_middle" msgid="703755205331582769">"Middle name"</string>
-    <string name="name_suffix" msgid="5777083390282548702">"Name suffix"</string>
-    <string name="name_phonetic" msgid="1650870996361663089">"Phonetic name"</string>
-    <string name="name_phonetic_given" msgid="618812334274603170">"Phonetic first name"</string>
-    <string name="name_phonetic_middle" msgid="4826820763384625538">"Phonetic middle name"</string>
-    <string name="name_phonetic_family" msgid="379905191212930771">"Phonetic surname"</string>
-    <string name="phoneLabelsGroup" msgid="169661929021355548">"Phone"</string>
-    <string name="emailLabelsGroup" msgid="2249752810477488833">"Email"</string>
-    <string name="postalLabelsGroup" msgid="6772000590189142253">"Address"</string>
-    <string name="imLabelsGroup" msgid="5718066254237364731">"IM"</string>
-    <string name="organizationLabelsGroup" msgid="1101996309241601435">"Organisation"</string>
-    <string name="relationLabelsGroup" msgid="53866051664600053">"Relationship"</string>
-    <string name="eventLabelsGroup" msgid="1236970042646618489">"Special date"</string>
-    <string name="sms" msgid="7574344928185328095">"Text message"</string>
-    <string name="postal_address" msgid="1804707930129674200">"Address"</string>
-    <string name="ghostData_company" msgid="2554310786296833424">"Company"</string>
-    <string name="ghostData_title" msgid="4994968731830184837">"Title"</string>
-    <string name="label_notes" msgid="2050255313694219786">"Notes"</string>
-    <string name="label_sip_address" msgid="8883266182575965926">"SIP"</string>
-    <string name="websiteLabelsGroup" msgid="1630734286462186790">"Website"</string>
-    <string name="groupsLabel" msgid="2694002798416868728">"Groups"</string>
-    <string name="email_home" msgid="889830029388962171">"Email home"</string>
-    <string name="email_mobile" msgid="4487686436743741150">"Email mobile"</string>
-    <string name="email_work" msgid="4223487303344613528">"Email work"</string>
-    <string name="email_other" msgid="4246411900126012062">"Email"</string>
-    <string name="email_custom" msgid="7246580894327511013">"Email <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="email" msgid="2807318537887091606">"Email"</string>
-    <string name="postal_street" msgid="6918171741240802474">"Street"</string>
-    <string name="postal_city" msgid="8674569121430005628">"City"</string>
-    <string name="postal_region" msgid="1730369286225469192">"County"</string>
-    <string name="postal_postcode" msgid="4450700741261990439">"Postcode"</string>
-    <string name="postal_country" msgid="232670707458768148">"Country"</string>
-    <string name="map_home" msgid="4181131107392126938">"View home address"</string>
-    <string name="map_work" msgid="5723471185992684400">"View work address"</string>
-    <string name="map_other" msgid="2253764780863500516">"View address"</string>
-    <string name="map_custom" msgid="5581743097882436157">"View <xliff:g id="CUSTOM">%s</xliff:g> address"</string>
-    <string name="chat_aim" msgid="2954364435497941659">"Chat using AIM"</string>
-    <string name="chat_msn" msgid="3130135239071228678">"Chat using Windows Live"</string>
-    <string name="chat_yahoo" msgid="3233552142326865347">"Chat using Yahoo"</string>
-    <string name="chat_skype" msgid="6486703981390592425">"Chat using Skype"</string>
-    <string name="chat_qq" msgid="786924280665740019">"Chat using QQ"</string>
-    <string name="chat_gtalk" msgid="7914674177243078035">"Chat using Google Talk"</string>
-    <string name="chat_icq" msgid="3292934726414765801">"Chat using ICQ"</string>
-    <string name="chat_jabber" msgid="6701542313597880204">"Chat using Jabber"</string>
-    <string name="chat" msgid="1020428260359370236">"Chat"</string>
-    <string name="list_filter_all_accounts" msgid="473782314881473992">"All contacts"</string>
-    <string name="listAllContactsInAccount" msgid="3486378621592995630">"Contacts in <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="listCustomView" msgid="5306282632413086731">"Contacts in customised view"</string>
-    <string name="listSingleContact" msgid="8620818791932382627">"Single contact"</string>
-    <string name="display_options_sort_list_by" msgid="3541875948367831228">"Sort by"</string>
-    <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"First name"</string>
-    <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"Surname"</string>
-    <string name="display_options_view_names_as" msgid="4204204205736735618">"Name format"</string>
-    <string name="display_options_view_given_name_first" msgid="2308026973021171020">"First name first"</string>
-    <string name="display_options_view_family_name_first" msgid="987430497292428242">"Surname first"</string>
-    <string name="menu_clear_frequents" msgid="5358271535047496120">"Clear frequents"</string>
-    <string name="action_menu_back_from_search" msgid="3550669942742167644">"stop searching"</string>
-    <string name="description_clear_search" msgid="2347258825265600782">"Clear search"</string>
-    <string name="select_account_dialog_title" msgid="2673504582803359239">"Account"</string>
-    <string name="set_default_account" msgid="7966099951006467572">"Always use this for calls"</string>
-    <string name="select_phone_account_for_calls" msgid="1784460686103423274">"Call with"</string>
-    <string name="call_with_a_note" msgid="6242261320491851133">"Call with a note"</string>
-    <string name="call_subject_hint" msgid="7233138753650420800">"Type a note to send with call ..."</string>
-    <string name="send_and_call_button" msgid="4735168294120154013">"SEND &amp; CALL"</string>
-    <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="tab_title" msgid="3387876802026074288">"<xliff:g id="TITLE">%1$s</xliff:g> tab."</string>
-    <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
-      <item quantity="other"> <xliff:g id="TITLE_2">%1$s</xliff:g> tab. <xliff:g id="COUNT_3">%2$d</xliff:g> unread items. </item>
-      <item quantity="one"> <xliff:g id="TITLE_0">%1$s</xliff:g> tab. <xliff:g id="COUNT_1">%2$d</xliff:g> unread item. </item>
-    </plurals>
-    <string name="description_search_video_call" msgid="4337369876888024909">"Video call"</string>
-    <string name="description_search_call_and_share" msgid="4912772842755050467">"Share and call"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_custom">Call %s</string>
+  <string name="call_home">Call home</string>
+  <string name="call_mobile">Call mobile</string>
+  <string name="call_work">Call work</string>
+  <string name="call_fax_work">Call work fax</string>
+  <string name="call_fax_home">Call home fax</string>
+  <string name="call_pager">Call pager</string>
+  <string name="call_other">Call</string>
+  <string name="call_callback">Call callback</string>
+  <string name="call_car">Call car</string>
+  <string name="call_company_main">Call company main</string>
+  <string name="call_isdn">Call ISDN</string>
+  <string name="call_main">Call main</string>
+  <string name="call_other_fax">Call fax</string>
+  <string name="call_radio">Call radio</string>
+  <string name="call_telex">Call telex</string>
+  <string name="call_tty_tdd">Call TTY/TDD</string>
+  <string name="call_work_mobile">Call work mobile</string>
+  <string name="call_work_pager">Call work pager</string>
+  <string name="call_assistant">Call %s</string>
+  <string name="call_mms">Call MMS</string>
+  <string name="sms_custom">Text %s</string>
+  <string name="sms_home">Text home</string>
+  <string name="sms_mobile">Text mobile</string>
+  <string name="sms_work">Text work</string>
+  <string name="sms_fax_work">Text work fax</string>
+  <string name="sms_fax_home">Text home fax</string>
+  <string name="sms_pager">Text pager</string>
+  <string name="sms_other">Text</string>
+  <string name="sms_callback">Text callback</string>
+  <string name="sms_car">Text car</string>
+  <string name="sms_company_main">Text company main</string>
+  <string name="sms_isdn">Text ISDN</string>
+  <string name="sms_main">Text main</string>
+  <string name="sms_other_fax">Text fax</string>
+  <string name="sms_radio">Text radio</string>
+  <string name="sms_telex">Text telex</string>
+  <string name="sms_tty_tdd">Text TTY/TDD</string>
+  <string name="sms_work_mobile">Text work mobile</string>
+  <string name="sms_work_pager">Text work pager</string>
+  <string name="sms_assistant">Text %s</string>
+  <string name="sms_mms">Text MMS</string>
+  <string name="clearFrequentsConfirmation_title">Clear frequently contacted?</string>
+  <string name="clearFrequentsConfirmation">You\'ll clear the frequently contacted list in the Contacts and Phone apps, and force email apps to learn your addressing preferences from scratch.</string>
+  <string name="clearFrequentsProgress_title">Clearing frequently contacted…</string>
+  <string name="status_available">Available</string>
+  <string name="status_away">Away</string>
+  <string name="status_busy">Busy</string>
+  <string name="contactsList">Contacts</string>
+  <string name="contact_suggestions">Top suggested</string>
+  <string name="local_invisible_directory">Other</string>
+  <string name="directory_search_label">Directory</string>
+  <string name="directory_search_label_work">Work directory</string>
+  <string name="local_search_label">All contacts</string>
+  <string name="local_suggestions_search_label">Suggestions</string>
+  <string msgid="9154761216179882405" name="user_profile_contacts_list_header">Me</string>
+  <string name="missing_name">(No name)</string>
+  <string msgid="2795575601596468581" name="description_view_contact_detail">View contact</string>
+  <string name="list_filter_phones">All contacts with phone numbers</string>
+  <string name="list_filter_phones_work">Work profile contacts</string>
+  <string name="view_updates_from_group">View updates</string>
+  <string name="account_phone">Device only, unsynced</string>
+  <string name="nameLabelsGroup">Name</string>
+  <string name="nicknameLabelsGroup">Nickname</string>
+  <string name="full_name">Name</string>
+  <string name="name_given">First name</string>
+  <string name="name_family">Surname</string>
+  <string name="name_prefix">Name prefix</string>
+  <string name="name_middle">Middle name</string>
+  <string name="name_suffix">Name suffix</string>
+  <string name="name_phonetic">Phonetic name</string>
+  <string name="name_phonetic_given">Phonetic first name</string>
+  <string name="name_phonetic_middle">Phonetic middle name</string>
+  <string name="name_phonetic_family">Phonetic surname</string>
+  <string name="phoneLabelsGroup">Phone</string>
+  <string name="emailLabelsGroup">Email</string>
+  <string name="postalLabelsGroup">Address</string>
+  <string name="imLabelsGroup">IM</string>
+  <string name="organizationLabelsGroup">Organisation</string>
+  <string name="relationLabelsGroup">Relationship</string>
+  <string name="eventLabelsGroup">Special date</string>
+  <string name="sms">Text message</string>
+  <string name="postal_address">Address</string>
+  <string name="ghostData_company">Company</string>
+  <string name="ghostData_title">Title</string>
+  <string name="label_notes">Notes</string>
+  <string name="label_sip_address">SIP</string>
+  <string name="websiteLabelsGroup">Website</string>
+  <string name="groupsLabel">Groups</string>
+  <string name="email_home">Email home</string>
+  <string name="email_mobile">Email mobile</string>
+  <string name="email_work">Email work</string>
+  <string name="email_other">Email</string>
+  <string name="email_custom">Email %s</string>
+  <string name="email">Email</string>
+  <string name="postal_street">Street</string>
+  <string name="postal_city">City</string>
+  <string name="postal_region">County</string>
+  <string name="postal_postcode">Postcode</string>
+  <string name="postal_country">Country</string>
+  <string name="map_home">View home address</string>
+  <string name="map_work">View work address</string>
+  <string name="map_other">View address</string>
+  <string name="map_custom">View %s address</string>
+  <string name="chat_aim">Chat using AIM</string>
+  <string name="chat_msn">Chat using Windows Live</string>
+  <string name="chat_yahoo">Chat using Yahoo</string>
+  <string name="chat_skype">Chat using Skype</string>
+  <string name="chat_qq">Chat using QQ</string>
+  <string name="chat_gtalk">Chat using Google Talk</string>
+  <string name="chat_icq">Chat using ICQ</string>
+  <string name="chat_jabber">Chat using Jabber</string>
+  <string name="chat">Chat</string>
+  <string name="list_filter_all_accounts">All contacts</string>
+  <string name="listAllContactsInAccount">Contacts in %s</string>
+  <string name="listCustomView">Contacts in customised view</string>
+  <string name="listSingleContact">Single contact</string>
+  <string name="display_options_sort_list_by">Sort by</string>
+  <string name="display_options_sort_by_given_name">First name</string>
+  <string name="display_options_sort_by_family_name">Surname</string>
+  <string name="display_options_view_names_as">Name format</string>
+  <string name="display_options_view_given_name_first">First name first</string>
+  <string name="display_options_view_family_name_first">Surname first</string>
+  <string name="menu_clear_frequents">Clear frequents</string>
+  <string name="action_menu_back_from_search">stop searching</string>
+  <string name="description_clear_search">Clear search</string>
+  <string name="select_account_dialog_title">Account</string>
+  <string name="set_default_account">Always use this for calls</string>
+  <string name="select_phone_account_for_calls">Choose SIM for this call</string>
+  <string name="select_phone_account_for_calls_remember">Remember this choice</string>
+  <string name="call_with_a_note">Call with a note</string>
+  <string name="call_subject_hint">Type a note to send with call ...</string>
+  <string name="send_and_call_button">SEND &amp; CALL</string>
+  <string name="call_subject_limit">%1$s / %2$s</string>
+  <string name="old_call_subject_type_and_number">%1$s %2$s</string>
+  <string name="tab_title">%1$s tab.</string>
+  <plurals name="tab_title_with_unread_items">
+    <item quantity="one"> %1$s tab. %2$d unread item. </item>
+    <item quantity="other"> %1$s tab. %2$d unread items. </item>
+  </plurals>
+  <string name="description_search_video_call">Video call</string>
+  <string name="description_search_call_and_share">Share and call</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-es-rUS/strings.xml b/java/com/android/contacts/common/res/values-es-rUS/strings.xml
index 9474514..6e046cf 100644
--- a/java/com/android/contacts/common/res/values-es-rUS/strings.xml
+++ b/java/com/android/contacts/common/res/values-es-rUS/strings.xml
@@ -1,162 +1,145 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="toast_text_copied" msgid="8979281391599667362">"Texto copiado"</string>
-    <string name="call_custom" msgid="3041673234638990874">"Llamar a <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="call_home" msgid="125893483593803791">"Llamar a casa"</string>
-    <string name="call_mobile" msgid="967589404494150813">"Llamar al móvil"</string>
-    <string name="call_work" msgid="6040550697395300892">"Llamar al trabajo"</string>
-    <string name="call_fax_work" msgid="5260192771364592922">"Llamar al fax del trabajo"</string>
-    <string name="call_fax_home" msgid="5174311195081144124">"Llamar al fax de casa"</string>
-    <string name="call_pager" msgid="6814149227741274161">"Llamar a localizador"</string>
-    <string name="call_other" msgid="5536385588712587235">"Llamar"</string>
-    <string name="call_callback" msgid="6314019862718112786">"Llamar a un número de devolución de llamada"</string>
-    <string name="call_car" msgid="3197417098027764954">"Llamar al automóvil"</string>
-    <string name="call_company_main" msgid="2557663310028446397">"Llamar al teléfono principal de la empresa"</string>
-    <string name="call_isdn" msgid="4691270442763649522">"Llamar a ISDN"</string>
-    <string name="call_main" msgid="3293707608770407814">"Llamar al teléfono principal"</string>
-    <string name="call_other_fax" msgid="4724521984879021465">"Llamar a fax"</string>
-    <string name="call_radio" msgid="8942441419845057942">"Llamar a radio"</string>
-    <string name="call_telex" msgid="2031514461660668351">"Llamar a télex"</string>
-    <string name="call_tty_tdd" msgid="7807210224965727701">"Llamar a TTY/TDD"</string>
-    <string name="call_work_mobile" msgid="2716342732938578495">"Llamar al móvil del trabajo"</string>
-    <string name="call_work_pager" msgid="3791778749827366574">"Llamar al localizador del trabajo"</string>
-    <string name="call_assistant" msgid="4177478845473789294">"Llamar a <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
-    <string name="call_mms" msgid="4958811711741872901">"Llamar a MMS"</string>
-    <string name="sms_custom" msgid="8785368968605026317">"Enviar SMS a <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="sms_home" msgid="3527719551060295243">"Enviar SMS a casa"</string>
-    <string name="sms_mobile" msgid="8883045857887736518">"Enviar SMS al móvil"</string>
-    <string name="sms_work" msgid="4158595439553450966">"Enviar SMS al trabajo"</string>
-    <string name="sms_fax_work" msgid="5483726627718055248">"Enviar SMS al fax del trabajo"</string>
-    <string name="sms_fax_home" msgid="9219265155770746077">"Enviar SMS al fax de casa"</string>
-    <string name="sms_pager" msgid="4901085068525193933">"Enviar SMS a localizador"</string>
-    <string name="sms_other" msgid="1742702947993285933">"Enviar SMS"</string>
-    <string name="sms_callback" msgid="5833483630377538308">"Enviar SMS a un número de devolución de llamada"</string>
-    <string name="sms_car" msgid="4314577266154395174">"Enviar SMS al automóvil"</string>
-    <string name="sms_company_main" msgid="2308160928487360705">"Enviar SMS al teléfono principal de la empresa"</string>
-    <string name="sms_isdn" msgid="6394300346179302542">"Enviar SMS a ISDN"</string>
-    <string name="sms_main" msgid="8908087742014140774">"Enviar SMS al teléfono principal"</string>
-    <string name="sms_other_fax" msgid="8768455473295405427">"Enviar SMS a fax"</string>
-    <string name="sms_radio" msgid="855555176531704682">"Enviar SMS a radio"</string>
-    <string name="sms_telex" msgid="6269029276223252719">"Enviar SMS a télex"</string>
-    <string name="sms_tty_tdd" msgid="6229057354509192444">"Enviar SMS a TTY/TDD"</string>
-    <string name="sms_work_mobile" msgid="2155975469329969840">"Enviar SMS al móvil del trabajo"</string>
-    <string name="sms_work_pager" msgid="8500140274906830742">"Enviar SMS al localizador del trabajo"</string>
-    <string name="sms_assistant" msgid="8513548482745330818">"Enviar SMS a <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
-    <string name="sms_mms" msgid="5187888900503248542">"Enviar SMS a MMS"</string>
-    <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"¿Borrar contactos frecuentes?"</string>
-    <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"Borrarás la lista de personas con las que te pones en contacto frecuentemente de las aplicaciones Contactos y Teléfono. Además, tus aplicaciones de correo deberán establecer tus preferencias nuevamente."</string>
-    <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"Borrando contactos frecuentes…"</string>
-    <string name="status_available" msgid="2648156525685472626">"Disponible"</string>
-    <string name="status_away" msgid="2298688367552893953">"Ausente"</string>
-    <string name="status_busy" msgid="5990832098713248503">"Ocupado"</string>
-    <string name="contactsList" msgid="8806067891419291513">"Contactos"</string>
-    <string name="contact_suggestions" msgid="3324166754807120006">"Principales lugares sugeridos"</string>
-    <string name="local_invisible_directory" msgid="4723238462733650090">"Otros"</string>
-    <string name="directory_search_label" msgid="4621215895484025229">"Directorio"</string>
-    <string name="directory_search_label_work" msgid="7679326282707414897">"Directorio del trabajo"</string>
-    <string name="local_search_label" msgid="907622822323119235">"Todos los contactos"</string>
-    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Sugerencias"</string>
-    <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Yo"</string>
-    <string name="missing_name" msgid="978606963362745020">"(Sin nombre)"</string>
-    <string name="description_view_contact_detail" msgid="2428742401208561136">"Ver contacto"</string>
-    <string name="list_filter_phones" msgid="8763316061763437182">"Todos los contactos con número de teléfono"</string>
-    <string name="list_filter_phones_work" msgid="7083575404573422965">"Contactos del perfil de trabajo"</string>
-    <string name="view_updates_from_group" msgid="9011641093168385729">"Ver actualizaciones"</string>
-    <string name="account_phone" msgid="7067809073194061035">"Solo en el dispositivo, no sincronizado"</string>
-    <string name="nameLabelsGroup" msgid="7730465833159557471">"Nombre"</string>
-    <string name="nicknameLabelsGroup" msgid="6310556912361840029">"Apodo"</string>
-    <string name="full_name" msgid="648186563998465740">"Nombre"</string>
-    <string name="name_given" msgid="5096576006314820536">"Nombre"</string>
-    <string name="name_family" msgid="6646235805198547467">"Apellido"</string>
-    <string name="name_prefix" msgid="9215326539658838">"Tratamiento"</string>
-    <string name="name_middle" msgid="703755205331582769">"Segundo nombre"</string>
-    <string name="name_suffix" msgid="5777083390282548702">"Título académico o profesional"</string>
-    <string name="name_phonetic" msgid="1650870996361663089">"Nombre fonético"</string>
-    <string name="name_phonetic_given" msgid="618812334274603170">"Nombre fonético"</string>
-    <string name="name_phonetic_middle" msgid="4826820763384625538">"Segundo nombre fonético"</string>
-    <string name="name_phonetic_family" msgid="379905191212930771">"Apellido fonético"</string>
-    <string name="phoneLabelsGroup" msgid="169661929021355548">"Teléfono"</string>
-    <string name="emailLabelsGroup" msgid="2249752810477488833">"Enviar correo a"</string>
-    <string name="postalLabelsGroup" msgid="6772000590189142253">"Dirección"</string>
-    <string name="imLabelsGroup" msgid="5718066254237364731">"MI"</string>
-    <string name="organizationLabelsGroup" msgid="1101996309241601435">"Organización"</string>
-    <string name="relationLabelsGroup" msgid="53866051664600053">"Relación"</string>
-    <string name="eventLabelsGroup" msgid="1236970042646618489">"Fecha especial"</string>
-    <string name="sms" msgid="7574344928185328095">"Mensaje de texto"</string>
-    <string name="postal_address" msgid="1804707930129674200">"Dirección"</string>
-    <string name="ghostData_company" msgid="2554310786296833424">"Empresa"</string>
-    <string name="ghostData_title" msgid="4994968731830184837">"Título"</string>
-    <string name="label_notes" msgid="2050255313694219786">"Notas"</string>
-    <string name="label_sip_address" msgid="8883266182575965926">"SIP"</string>
-    <string name="websiteLabelsGroup" msgid="1630734286462186790">"Sitio web"</string>
-    <string name="groupsLabel" msgid="2694002798416868728">"Grupos"</string>
-    <string name="email_home" msgid="889830029388962171">"Correo personal"</string>
-    <string name="email_mobile" msgid="4487686436743741150">"Correo móvil"</string>
-    <string name="email_work" msgid="4223487303344613528">"Correo laboral"</string>
-    <string name="email_other" msgid="4246411900126012062">"Enviar correo a"</string>
-    <string name="email_custom" msgid="7246580894327511013">"Enviar correo a <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="email" msgid="2807318537887091606">"Enviar correo a"</string>
-    <string name="postal_street" msgid="6918171741240802474">"Calle"</string>
-    <string name="postal_city" msgid="8674569121430005628">"Ciudad"</string>
-    <string name="postal_region" msgid="1730369286225469192">"Estado"</string>
-    <string name="postal_postcode" msgid="4450700741261990439">"Código postal"</string>
-    <string name="postal_country" msgid="232670707458768148">"País"</string>
-    <string name="map_home" msgid="4181131107392126938">"Ver dirección personal"</string>
-    <string name="map_work" msgid="5723471185992684400">"Ver dirección laboral"</string>
-    <string name="map_other" msgid="2253764780863500516">"Ver dirección"</string>
-    <string name="map_custom" msgid="5581743097882436157">"Ver dirección <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="chat_aim" msgid="2954364435497941659">"Chat mediante AIM"</string>
-    <string name="chat_msn" msgid="3130135239071228678">"Chat mediante Windows Live"</string>
-    <string name="chat_yahoo" msgid="3233552142326865347">"Chat mediante Yahoo"</string>
-    <string name="chat_skype" msgid="6486703981390592425">"Chat mediante Skype"</string>
-    <string name="chat_qq" msgid="786924280665740019">"Chat mediante QQ"</string>
-    <string name="chat_gtalk" msgid="7914674177243078035">"Chat mediante Google Talk"</string>
-    <string name="chat_icq" msgid="3292934726414765801">"Chat mediante ICQ"</string>
-    <string name="chat_jabber" msgid="6701542313597880204">"Chat mediante Jabber"</string>
-    <string name="chat" msgid="1020428260359370236">"Chat"</string>
-    <string name="list_filter_all_accounts" msgid="473782314881473992">"Todos los contactos"</string>
-    <string name="listAllContactsInAccount" msgid="3486378621592995630">"Contactos en <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="listCustomView" msgid="5306282632413086731">"Contactos en vista personalizada"</string>
-    <string name="listSingleContact" msgid="8620818791932382627">"Contacto único"</string>
-    <string name="display_options_sort_list_by" msgid="3541875948367831228">"Ordenar por"</string>
-    <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"Nombre"</string>
-    <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"Apellido"</string>
-    <string name="display_options_view_names_as" msgid="4204204205736735618">"Formato del nombre"</string>
-    <string name="display_options_view_given_name_first" msgid="2308026973021171020">"Nombre primero"</string>
-    <string name="display_options_view_family_name_first" msgid="987430497292428242">"Apellido primero"</string>
-    <string name="menu_clear_frequents" msgid="5358271535047496120">"Borrar contactos frecuentes"</string>
-    <string name="action_menu_back_from_search" msgid="3550669942742167644">"detener la búsqueda"</string>
-    <string name="description_clear_search" msgid="2347258825265600782">"Borrar la búsqueda"</string>
-    <string name="select_account_dialog_title" msgid="2673504582803359239">"Cuenta"</string>
-    <string name="set_default_account" msgid="7966099951006467572">"Usar siempre para llamadas"</string>
-    <string name="select_phone_account_for_calls" msgid="1784460686103423274">"Llamar con"</string>
-    <string name="call_with_a_note" msgid="6242261320491851133">"Llamada con una nota"</string>
-    <string name="call_subject_hint" msgid="7233138753650420800">"Escribe una nota para enviar con la llamada…"</string>
-    <string name="send_and_call_button" msgid="4735168294120154013">"ENVIAR Y LLAMAR"</string>
-    <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g>/<xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="tab_title" msgid="3387876802026074288">"Pestaña <xliff:g id="TITLE">%1$s</xliff:g>."</string>
-    <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
-      <item quantity="other"> Pestaña <xliff:g id="TITLE_2">%1$s</xliff:g>. <xliff:g id="COUNT_3">%2$d</xliff:g> elementos no leídos. </item>
-      <item quantity="one"> Pestaña <xliff:g id="TITLE_0">%1$s</xliff:g>. <xliff:g id="COUNT_1">%2$d</xliff:g> elemento no leído. </item>
-    </plurals>
-    <string name="description_search_video_call" msgid="4337369876888024909">"Videollamada"</string>
-    <string name="description_search_call_and_share" msgid="4912772842755050467">"Compartir y llamar"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_custom">Llamar a %s</string>
+  <string name="call_home">Llamar a casa</string>
+  <string name="call_mobile">Llamar al móvil</string>
+  <string name="call_work">Llamar al trabajo</string>
+  <string name="call_fax_work">Llamar al fax del trabajo</string>
+  <string name="call_fax_home">Llamar al fax de casa</string>
+  <string name="call_pager">Llamar a localizador</string>
+  <string name="call_other">Llamar</string>
+  <string name="call_callback">Llamar a un número de devolución de llamada</string>
+  <string name="call_car">Llamar al automóvil</string>
+  <string name="call_company_main">Llamar al teléfono principal de la empresa</string>
+  <string name="call_isdn">Llamar a ISDN</string>
+  <string name="call_main">Llamar al teléfono principal</string>
+  <string name="call_other_fax">Llamar a fax</string>
+  <string name="call_radio">Llamar a radio</string>
+  <string name="call_telex">Llamar a télex</string>
+  <string name="call_tty_tdd">Llamar a TTY/TDD</string>
+  <string name="call_work_mobile">Llamar al móvil del trabajo</string>
+  <string name="call_work_pager">Llamar al localizador del trabajo</string>
+  <string name="call_assistant">Llamar a %s</string>
+  <string name="call_mms">Llamar a MMS</string>
+  <string name="sms_custom">Enviar SMS a %s</string>
+  <string name="sms_home">Enviar SMS a casa</string>
+  <string name="sms_mobile">Enviar SMS al móvil</string>
+  <string name="sms_work">Enviar SMS al trabajo</string>
+  <string name="sms_fax_work">Enviar SMS al fax del trabajo</string>
+  <string name="sms_fax_home">Enviar SMS al fax de casa</string>
+  <string name="sms_pager">Enviar SMS a localizador</string>
+  <string name="sms_other">Enviar SMS</string>
+  <string name="sms_callback">Enviar SMS a un número de devolución de llamada</string>
+  <string name="sms_car">Enviar SMS al automóvil</string>
+  <string name="sms_company_main">Enviar SMS al teléfono principal de la empresa</string>
+  <string name="sms_isdn">Enviar SMS a ISDN</string>
+  <string name="sms_main">Enviar SMS al teléfono principal</string>
+  <string name="sms_other_fax">Enviar SMS a fax</string>
+  <string name="sms_radio">Enviar SMS a radio</string>
+  <string name="sms_telex">Enviar SMS a télex</string>
+  <string name="sms_tty_tdd">Enviar SMS a TTY/TDD</string>
+  <string name="sms_work_mobile">Enviar SMS al móvil del trabajo</string>
+  <string name="sms_work_pager">Enviar SMS al localizador del trabajo</string>
+  <string name="sms_assistant">Enviar SMS a %s</string>
+  <string name="sms_mms">Enviar MMS</string>
+  <string name="clearFrequentsConfirmation_title">¿Borrar contactos frecuentes?</string>
+  <string name="clearFrequentsConfirmation">Borrarás la lista de personas con las que te pones en contacto frecuentemente de las aplicaciones Contactos y Teléfono. Además, tus aplicaciones de correo deberán establecer tus preferencias nuevamente.</string>
+  <string name="clearFrequentsProgress_title">Borrando contactos frecuentes…</string>
+  <string name="status_available">Disponible</string>
+  <string name="status_away">Ausente</string>
+  <string name="status_busy">Ocupado</string>
+  <string name="contactsList">Contactos</string>
+  <string name="contact_suggestions">Principales lugares sugeridos</string>
+  <string name="local_invisible_directory">Otros</string>
+  <string name="directory_search_label">Directorio</string>
+  <string name="directory_search_label_work">Directorio del trabajo</string>
+  <string name="local_search_label">Todos los contactos</string>
+  <string name="local_suggestions_search_label">Sugerencias</string>
+  <string msgid="9154761216179882405" name="user_profile_contacts_list_header">Yo</string>
+  <string name="missing_name">(Sin nombre)</string>
+  <string msgid="2795575601596468581" name="description_view_contact_detail">Ver contacto</string>
+  <string name="list_filter_phones">Todos los contactos con número de teléfono</string>
+  <string name="list_filter_phones_work">Contactos del perfil de trabajo</string>
+  <string name="view_updates_from_group">Ver actualizaciones</string>
+  <string name="account_phone">Solo en el dispositivo, no sincronizado</string>
+  <string name="nameLabelsGroup">Nombre</string>
+  <string name="nicknameLabelsGroup">Sobrenombre</string>
+  <string name="full_name">Nombre</string>
+  <string name="name_given">Nombre</string>
+  <string name="name_family">Apellido</string>
+  <string name="name_prefix">Tratamiento</string>
+  <string name="name_middle">Segundo nombre</string>
+  <string name="name_suffix">Sufijo del nombre</string>
+  <string name="name_phonetic">Nombre fonético</string>
+  <string name="name_phonetic_given">Nombre fonético</string>
+  <string name="name_phonetic_middle">Segundo nombre fonético</string>
+  <string name="name_phonetic_family">Apellido fonético</string>
+  <string name="phoneLabelsGroup">Teléfono</string>
+  <string name="emailLabelsGroup">Correo</string>
+  <string name="postalLabelsGroup">Dirección</string>
+  <string name="imLabelsGroup">MI</string>
+  <string name="organizationLabelsGroup">Organización</string>
+  <string name="relationLabelsGroup">Relación</string>
+  <string name="eventLabelsGroup">Fecha especial</string>
+  <string name="sms">Mensaje de texto</string>
+  <string name="postal_address">Dirección</string>
+  <string name="ghostData_company">Empresa</string>
+  <string name="ghostData_title">Cargo</string>
+  <string name="label_notes">Notas</string>
+  <string name="label_sip_address">SIP</string>
+  <string name="websiteLabelsGroup">Sitio web</string>
+  <string name="groupsLabel">Grupos</string>
+  <string name="email_home">Correo personal</string>
+  <string name="email_mobile">Enviar correo al móvil</string>
+  <string name="email_work">Correo laboral</string>
+  <string name="email_other">Enviar correo a</string>
+  <string name="email_custom">Enviar correo a %s</string>
+  <string name="email">Enviar correo a</string>
+  <string name="postal_street">Calle</string>
+  <string name="postal_city">Ciudad</string>
+  <string name="postal_region">Estado</string>
+  <string name="postal_postcode">Código postal</string>
+  <string name="postal_country">País</string>
+  <string name="map_home">Ver dirección personal</string>
+  <string name="map_work">Ver dirección laboral</string>
+  <string name="map_other">Ver dirección</string>
+  <string name="map_custom">Ver dirección %s</string>
+  <string name="chat_aim">Chat mediante AIM</string>
+  <string name="chat_msn">Chat mediante Windows Live</string>
+  <string name="chat_yahoo">Chat mediante Yahoo</string>
+  <string name="chat_skype">Chat mediante Skype</string>
+  <string name="chat_qq">Chat mediante QQ</string>
+  <string name="chat_gtalk">Chat mediante Google Talk</string>
+  <string name="chat_icq">Chat mediante ICQ</string>
+  <string name="chat_jabber">Chat mediante Jabber</string>
+  <string name="chat">Chat</string>
+  <string name="list_filter_all_accounts">Todos los contactos</string>
+  <string name="listAllContactsInAccount">Contactos en %s</string>
+  <string name="listCustomView">Contactos en vista personalizada</string>
+  <string name="listSingleContact">Contacto único</string>
+  <string name="display_options_sort_list_by">Ordenar por</string>
+  <string name="display_options_sort_by_given_name">Nombre</string>
+  <string name="display_options_sort_by_family_name">Apellido</string>
+  <string name="display_options_view_names_as">Formato del nombre</string>
+  <string name="display_options_view_given_name_first">Nombre primero</string>
+  <string name="display_options_view_family_name_first">Apellido primero</string>
+  <string name="menu_clear_frequents">Borrar contactos frecuentes</string>
+  <string name="action_menu_back_from_search">detener la búsqueda</string>
+  <string name="description_clear_search">Borrar la búsqueda</string>
+  <string name="select_account_dialog_title">Cuenta</string>
+  <string name="set_default_account">Usar siempre para llamadas</string>
+  <string name="select_phone_account_for_calls">Elige una SIM para realizar esta llamada</string>
+  <string name="select_phone_account_for_calls_remember">Recordar esta opción</string>
+  <string name="call_with_a_note">Llamada con una nota</string>
+  <string name="call_subject_hint">Escribe una nota para enviar con la llamada…</string>
+  <string name="send_and_call_button">ENVIAR Y LLAMAR</string>
+  <string name="call_subject_limit">%1$s/%2$s</string>
+  <string name="old_call_subject_type_and_number">%1$s %2$s</string>
+  <string name="tab_title">Pestaña %1$s.</string>
+  <plurals name="tab_title_with_unread_items">
+    <item quantity="one"> Pestaña %1$s. %2$d elemento no leído. </item>
+    <item quantity="other"> Pestaña %1$s. %2$d elementos no leídos. </item>
+  </plurals>
+  <string name="description_search_video_call">Videollamada</string>
+  <string name="description_search_call_and_share">Compartir y llamar</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-es/strings.xml b/java/com/android/contacts/common/res/values-es/strings.xml
index ec5dc5f..ce370d6 100644
--- a/java/com/android/contacts/common/res/values-es/strings.xml
+++ b/java/com/android/contacts/common/res/values-es/strings.xml
@@ -1,162 +1,145 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="toast_text_copied" msgid="8979281391599667362">"Texto copiado"</string>
-    <string name="call_custom" msgid="3041673234638990874">"Llamar a <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="call_home" msgid="125893483593803791">"Llamar a casa"</string>
-    <string name="call_mobile" msgid="967589404494150813">"Llamar al móvil"</string>
-    <string name="call_work" msgid="6040550697395300892">"Llamar al trabajo"</string>
-    <string name="call_fax_work" msgid="5260192771364592922">"Llamar al fax del trabajo"</string>
-    <string name="call_fax_home" msgid="5174311195081144124">"Llamar al fax de casa"</string>
-    <string name="call_pager" msgid="6814149227741274161">"Llamar al busca"</string>
-    <string name="call_other" msgid="5536385588712587235">"Llamar"</string>
-    <string name="call_callback" msgid="6314019862718112786">"Llamar a un número de devolución de llamada"</string>
-    <string name="call_car" msgid="3197417098027764954">"Llamar al coche"</string>
-    <string name="call_company_main" msgid="2557663310028446397">"Llamar al teléfono principal de la empresa"</string>
-    <string name="call_isdn" msgid="4691270442763649522">"Llamar a RDSI"</string>
-    <string name="call_main" msgid="3293707608770407814">"Llamar al teléfono principal"</string>
-    <string name="call_other_fax" msgid="4724521984879021465">"Llamar al fax"</string>
-    <string name="call_radio" msgid="8942441419845057942">"Llamar a la radio"</string>
-    <string name="call_telex" msgid="2031514461660668351">"Llamar al télex"</string>
-    <string name="call_tty_tdd" msgid="7807210224965727701">"Llamar a TTY/TDD"</string>
-    <string name="call_work_mobile" msgid="2716342732938578495">"Llamar al móvil del trabajo"</string>
-    <string name="call_work_pager" msgid="3791778749827366574">"Llamar al busca del trabajo"</string>
-    <string name="call_assistant" msgid="4177478845473789294">"Llamar al <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
-    <string name="call_mms" msgid="4958811711741872901">"Llamar a MMS"</string>
-    <string name="sms_custom" msgid="8785368968605026317">"Enviar SMS a <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="sms_home" msgid="3527719551060295243">"Enviar SMS a casa"</string>
-    <string name="sms_mobile" msgid="8883045857887736518">"Enviar SMS al móvil"</string>
-    <string name="sms_work" msgid="4158595439553450966">"Enviar SMS al trabajo"</string>
-    <string name="sms_fax_work" msgid="5483726627718055248">"Enviar SMS al fax del trabajo"</string>
-    <string name="sms_fax_home" msgid="9219265155770746077">"Enviar SMS al fax de casa"</string>
-    <string name="sms_pager" msgid="4901085068525193933">"Enviar SMS al busca"</string>
-    <string name="sms_other" msgid="1742702947993285933">"Enviar SMS"</string>
-    <string name="sms_callback" msgid="5833483630377538308">"Enviar SMS a un número de devolución de llamada"</string>
-    <string name="sms_car" msgid="4314577266154395174">"Enviar SMS al coche"</string>
-    <string name="sms_company_main" msgid="2308160928487360705">"Enviar SMS al teléfono principal de la empresa"</string>
-    <string name="sms_isdn" msgid="6394300346179302542">"Enviar SMS a RDSI"</string>
-    <string name="sms_main" msgid="8908087742014140774">"Enviar SMS al número de teléfono principal"</string>
-    <string name="sms_other_fax" msgid="8768455473295405427">"Enviar SMS al fax"</string>
-    <string name="sms_radio" msgid="855555176531704682">"Enviar SMS a la radio"</string>
-    <string name="sms_telex" msgid="6269029276223252719">"Enviar SMS al télex"</string>
-    <string name="sms_tty_tdd" msgid="6229057354509192444">"Enviar SMS a TTY/TDD"</string>
-    <string name="sms_work_mobile" msgid="2155975469329969840">"Enviar SMS al móvil del trabajo"</string>
-    <string name="sms_work_pager" msgid="8500140274906830742">"Enviar SMS al busca del trabajo"</string>
-    <string name="sms_assistant" msgid="8513548482745330818">"Enviar SMS al <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
-    <string name="sms_mms" msgid="5187888900503248542">"Enviar SMS a MMS"</string>
-    <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"¿Borrar contactos frecuentes?"</string>
-    <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"Vas a borrar la lista de contactos frecuentes de las aplicaciones Contactos y Teléfono y obligarás a las aplicaciones de correo electrónico a que memoricen tus preferencias de nuevo."</string>
-    <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"Borrando contactos frecuentes…"</string>
-    <string name="status_available" msgid="2648156525685472626">"Disponible"</string>
-    <string name="status_away" msgid="2298688367552893953">"Ausente"</string>
-    <string name="status_busy" msgid="5990832098713248503">"Ocupado"</string>
-    <string name="contactsList" msgid="8806067891419291513">"Contactos"</string>
-    <string name="contact_suggestions" msgid="3324166754807120006">"Sugerencias principales"</string>
-    <string name="local_invisible_directory" msgid="4723238462733650090">"Otro"</string>
-    <string name="directory_search_label" msgid="4621215895484025229">"Directorio"</string>
-    <string name="directory_search_label_work" msgid="7679326282707414897">"Directorio de trabajo"</string>
-    <string name="local_search_label" msgid="907622822323119235">"Todos los contactos"</string>
-    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Sugerencias"</string>
-    <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Yo"</string>
-    <string name="missing_name" msgid="978606963362745020">"(Sin nombre)"</string>
-    <string name="description_view_contact_detail" msgid="2428742401208561136">"Ver contacto"</string>
-    <string name="list_filter_phones" msgid="8763316061763437182">"Todos los contactos con número"</string>
-    <string name="list_filter_phones_work" msgid="7083575404573422965">"Contactos del perfil de trabajo"</string>
-    <string name="view_updates_from_group" msgid="9011641093168385729">"Ver actualizaciones"</string>
-    <string name="account_phone" msgid="7067809073194061035">"Solo está en el dispositivo, no se sincroniza"</string>
-    <string name="nameLabelsGroup" msgid="7730465833159557471">"Nombre"</string>
-    <string name="nicknameLabelsGroup" msgid="6310556912361840029">"Apodo"</string>
-    <string name="full_name" msgid="648186563998465740">"Nombre"</string>
-    <string name="name_given" msgid="5096576006314820536">"Nombre"</string>
-    <string name="name_family" msgid="6646235805198547467">"Apellido"</string>
-    <string name="name_prefix" msgid="9215326539658838">"Prefijo del nombre"</string>
-    <string name="name_middle" msgid="703755205331582769">"Segundo nombre"</string>
-    <string name="name_suffix" msgid="5777083390282548702">"Sufijo del nombre"</string>
-    <string name="name_phonetic" msgid="1650870996361663089">"Nombre fonético"</string>
-    <string name="name_phonetic_given" msgid="618812334274603170">"Nombre fonético"</string>
-    <string name="name_phonetic_middle" msgid="4826820763384625538">"Segundo nombre fonético"</string>
-    <string name="name_phonetic_family" msgid="379905191212930771">"Apellido fonético"</string>
-    <string name="phoneLabelsGroup" msgid="169661929021355548">"Teléfono"</string>
-    <string name="emailLabelsGroup" msgid="2249752810477488833">"Enviar correo"</string>
-    <string name="postalLabelsGroup" msgid="6772000590189142253">"Dirección"</string>
-    <string name="imLabelsGroup" msgid="5718066254237364731">"Chat"</string>
-    <string name="organizationLabelsGroup" msgid="1101996309241601435">"Organización"</string>
-    <string name="relationLabelsGroup" msgid="53866051664600053">"Relación"</string>
-    <string name="eventLabelsGroup" msgid="1236970042646618489">"Fecha especial"</string>
-    <string name="sms" msgid="7574344928185328095">"Mensaje de texto"</string>
-    <string name="postal_address" msgid="1804707930129674200">"Dirección"</string>
-    <string name="ghostData_company" msgid="2554310786296833424">"Empresa"</string>
-    <string name="ghostData_title" msgid="4994968731830184837">"Cargo"</string>
-    <string name="label_notes" msgid="2050255313694219786">"Notas"</string>
-    <string name="label_sip_address" msgid="8883266182575965926">"SIP"</string>
-    <string name="websiteLabelsGroup" msgid="1630734286462186790">"Sitio web"</string>
-    <string name="groupsLabel" msgid="2694002798416868728">"Grupos"</string>
-    <string name="email_home" msgid="889830029388962171">"Enviar correo a casa"</string>
-    <string name="email_mobile" msgid="4487686436743741150">"Enviar correo al móvil"</string>
-    <string name="email_work" msgid="4223487303344613528">"Enviar correo al trabajo"</string>
-    <string name="email_other" msgid="4246411900126012062">"Enviar correo"</string>
-    <string name="email_custom" msgid="7246580894327511013">"Enviar correo a <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="email" msgid="2807318537887091606">"Enviar correo"</string>
-    <string name="postal_street" msgid="6918171741240802474">"Calle"</string>
-    <string name="postal_city" msgid="8674569121430005628">"Ciudad"</string>
-    <string name="postal_region" msgid="1730369286225469192">"Estado"</string>
-    <string name="postal_postcode" msgid="4450700741261990439">"Código postal"</string>
-    <string name="postal_country" msgid="232670707458768148">"País"</string>
-    <string name="map_home" msgid="4181131107392126938">"Ver dirección de casa"</string>
-    <string name="map_work" msgid="5723471185992684400">"Ver dirección del trabajo"</string>
-    <string name="map_other" msgid="2253764780863500516">"Ver dirección"</string>
-    <string name="map_custom" msgid="5581743097882436157">"Ver dirección de <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="chat_aim" msgid="2954364435497941659">"Chatear con AIM"</string>
-    <string name="chat_msn" msgid="3130135239071228678">"Chatear con Windows Live"</string>
-    <string name="chat_yahoo" msgid="3233552142326865347">"Chatear con Yahoo!"</string>
-    <string name="chat_skype" msgid="6486703981390592425">"Chatear con Skype"</string>
-    <string name="chat_qq" msgid="786924280665740019">"Chatear con QQ"</string>
-    <string name="chat_gtalk" msgid="7914674177243078035">"Chatear con Google Talk"</string>
-    <string name="chat_icq" msgid="3292934726414765801">"Chatear con ICQ"</string>
-    <string name="chat_jabber" msgid="6701542313597880204">"Chatear con Jabber"</string>
-    <string name="chat" msgid="1020428260359370236">"Chat"</string>
-    <string name="list_filter_all_accounts" msgid="473782314881473992">"Todos los contactos"</string>
-    <string name="listAllContactsInAccount" msgid="3486378621592995630">"Contactos en <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="listCustomView" msgid="5306282632413086731">"Contactos en vista personalizada"</string>
-    <string name="listSingleContact" msgid="8620818791932382627">"Contacto único"</string>
-    <string name="display_options_sort_list_by" msgid="3541875948367831228">"Ordenar por"</string>
-    <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"Nombre"</string>
-    <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"Apellido"</string>
-    <string name="display_options_view_names_as" msgid="4204204205736735618">"Formato del nombre"</string>
-    <string name="display_options_view_given_name_first" msgid="2308026973021171020">"Nombre primero"</string>
-    <string name="display_options_view_family_name_first" msgid="987430497292428242">"Apellido primero"</string>
-    <string name="menu_clear_frequents" msgid="5358271535047496120">"Borrar frecuentes"</string>
-    <string name="action_menu_back_from_search" msgid="3550669942742167644">"dejar de buscar"</string>
-    <string name="description_clear_search" msgid="2347258825265600782">"Borrar la búsqueda"</string>
-    <string name="select_account_dialog_title" msgid="2673504582803359239">"Cuenta"</string>
-    <string name="set_default_account" msgid="7966099951006467572">"Usar siempre esta para llamadas"</string>
-    <string name="select_phone_account_for_calls" msgid="1784460686103423274">"Llamar con"</string>
-    <string name="call_with_a_note" msgid="6242261320491851133">"Llamada con una nota"</string>
-    <string name="call_subject_hint" msgid="7233138753650420800">"Escribe una nota para enviarla con la llamada..."</string>
-    <string name="send_and_call_button" msgid="4735168294120154013">"ENVIAR Y LLAMAR"</string>
-    <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g>/<xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="tab_title" msgid="3387876802026074288">"Pestaña <xliff:g id="TITLE">%1$s</xliff:g>."</string>
-    <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
-      <item quantity="other"> Pestaña <xliff:g id="TITLE_2">%1$s</xliff:g>. <xliff:g id="COUNT_3">%2$d</xliff:g> elementos no leídos. </item>
-      <item quantity="one"> Pestaña <xliff:g id="TITLE_0">%1$s</xliff:g>. <xliff:g id="COUNT_1">%2$d</xliff:g> elemento no leído. </item>
-    </plurals>
-    <string name="description_search_video_call" msgid="4337369876888024909">"Videollamada"</string>
-    <string name="description_search_call_and_share" msgid="4912772842755050467">"Compartir y llamar"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_custom">Llamar a %s</string>
+  <string name="call_home">Llamar a casa</string>
+  <string name="call_mobile">Llamar al móvil</string>
+  <string name="call_work">Llamar al trabajo</string>
+  <string name="call_fax_work">Llamar al fax del trabajo</string>
+  <string name="call_fax_home">Llamar al fax de casa</string>
+  <string name="call_pager">Llamar al busca</string>
+  <string name="call_other">Llamar</string>
+  <string name="call_callback">Llamar a un número de devolución de llamada</string>
+  <string name="call_car">Llamar al coche</string>
+  <string name="call_company_main">Llamar al teléfono principal de la empresa</string>
+  <string name="call_isdn">Llamar a RDSI</string>
+  <string name="call_main">Llamar al teléfono principal</string>
+  <string name="call_other_fax">Llamar al fax</string>
+  <string name="call_radio">Llamar a la radio</string>
+  <string name="call_telex">Llamar al télex</string>
+  <string name="call_tty_tdd">Llamar a TTY/TDD</string>
+  <string name="call_work_mobile">Llamar al móvil del trabajo</string>
+  <string name="call_work_pager">Llamar al busca del trabajo</string>
+  <string name="call_assistant">Llamar al %s</string>
+  <string name="call_mms">Llamar a MMS</string>
+  <string name="sms_custom">Enviar SMS a %s</string>
+  <string name="sms_home">Enviar SMS a casa</string>
+  <string name="sms_mobile">Enviar SMS al móvil</string>
+  <string name="sms_work">Enviar SMS al trabajo</string>
+  <string name="sms_fax_work">Enviar SMS al fax del trabajo</string>
+  <string name="sms_fax_home">Enviar SMS al fax de casa</string>
+  <string name="sms_pager">Enviar SMS al busca</string>
+  <string name="sms_other">Enviar SMS</string>
+  <string name="sms_callback">Enviar SMS a un número de devolución de llamada</string>
+  <string name="sms_car">Enviar SMS al coche</string>
+  <string name="sms_company_main">Enviar SMS al teléfono principal de la empresa</string>
+  <string name="sms_isdn">Enviar SMS a RDSI</string>
+  <string name="sms_main">Enviar SMS al número de teléfono principal</string>
+  <string name="sms_other_fax">Enviar SMS al fax</string>
+  <string name="sms_radio">Enviar SMS a la radio</string>
+  <string name="sms_telex">Enviar SMS al télex</string>
+  <string name="sms_tty_tdd">Enviar SMS a TTY/TDD</string>
+  <string name="sms_work_mobile">Enviar SMS al móvil del trabajo</string>
+  <string name="sms_work_pager">Enviar SMS al busca del trabajo</string>
+  <string name="sms_assistant">Enviar SMS al %s</string>
+  <string name="sms_mms">Enviar SMS a MMS</string>
+  <string name="clearFrequentsConfirmation_title">¿Borrar contactos frecuentes?</string>
+  <string name="clearFrequentsConfirmation">Vas a borrar la lista de contactos frecuentes de las aplicaciones Contactos y Teléfono y obligarás a las aplicaciones de correo electrónico a que memoricen tus preferencias de nuevo.</string>
+  <string name="clearFrequentsProgress_title">Borrando contactos frecuentes…</string>
+  <string name="status_available">Disponible</string>
+  <string name="status_away">Ausente</string>
+  <string name="status_busy">Ocupado</string>
+  <string name="contactsList">Contactos</string>
+  <string name="contact_suggestions">Sugerencias principales</string>
+  <string name="local_invisible_directory">Otro</string>
+  <string name="directory_search_label">Directorio</string>
+  <string name="directory_search_label_work">Directorio de trabajo</string>
+  <string name="local_search_label">Todos los contactos</string>
+  <string name="local_suggestions_search_label">Sugerencias</string>
+  <string msgid="9154761216179882405" name="user_profile_contacts_list_header">Yo</string>
+  <string name="missing_name">(Sin nombre)</string>
+  <string msgid="2795575601596468581" name="description_view_contact_detail">Ver contacto</string>
+  <string name="list_filter_phones">Todos los contactos con número</string>
+  <string name="list_filter_phones_work">Contactos del perfil de trabajo</string>
+  <string name="view_updates_from_group">Ver actualizaciones</string>
+  <string name="account_phone">Solo está en el dispositivo, no se sincroniza</string>
+  <string name="nameLabelsGroup">Nombre</string>
+  <string name="nicknameLabelsGroup">Apodo</string>
+  <string name="full_name">Nombre</string>
+  <string name="name_given">Nombre</string>
+  <string name="name_family">Apellido</string>
+  <string name="name_prefix">Prefijo del nombre</string>
+  <string name="name_middle">Segundo nombre</string>
+  <string name="name_suffix">Sufijo del nombre</string>
+  <string name="name_phonetic">Nombre fonético</string>
+  <string name="name_phonetic_given">Nombre fonético</string>
+  <string name="name_phonetic_middle">Segundo nombre fonético</string>
+  <string name="name_phonetic_family">Apellido fonético</string>
+  <string name="phoneLabelsGroup">Teléfono</string>
+  <string name="emailLabelsGroup">Enviar correo</string>
+  <string name="postalLabelsGroup">Dirección</string>
+  <string name="imLabelsGroup">Chat</string>
+  <string name="organizationLabelsGroup">Organización</string>
+  <string name="relationLabelsGroup">Relación</string>
+  <string name="eventLabelsGroup">Fecha especial</string>
+  <string name="sms">Mensaje de texto</string>
+  <string name="postal_address">Dirección</string>
+  <string name="ghostData_company">Empresa</string>
+  <string name="ghostData_title">Cargo</string>
+  <string name="label_notes">Notas</string>
+  <string name="label_sip_address">SIP</string>
+  <string name="websiteLabelsGroup">Sitio web</string>
+  <string name="groupsLabel">Grupos</string>
+  <string name="email_home">Enviar correo a casa</string>
+  <string name="email_mobile">Enviar correo al móvil</string>
+  <string name="email_work">Enviar correo al trabajo</string>
+  <string name="email_other">Enviar correo</string>
+  <string name="email_custom">Enviar correo a %s</string>
+  <string name="email">Enviar correo</string>
+  <string name="postal_street">Calle</string>
+  <string name="postal_city">Ciudad</string>
+  <string name="postal_region">Estado</string>
+  <string name="postal_postcode">Código postal</string>
+  <string name="postal_country">País</string>
+  <string name="map_home">Ver dirección de casa</string>
+  <string name="map_work">Ver dirección del trabajo</string>
+  <string name="map_other">Ver dirección</string>
+  <string name="map_custom">Ver dirección de %s</string>
+  <string name="chat_aim">Chatear con AIM</string>
+  <string name="chat_msn">Chatear con Windows Live</string>
+  <string name="chat_yahoo">Chatear con Yahoo!</string>
+  <string name="chat_skype">Chatear con Skype</string>
+  <string name="chat_qq">Chatear con QQ</string>
+  <string name="chat_gtalk">Chatear con Google Talk</string>
+  <string name="chat_icq">Chatear con ICQ</string>
+  <string name="chat_jabber">Chatear con Jabber</string>
+  <string name="chat">Chat</string>
+  <string name="list_filter_all_accounts">Todos los contactos</string>
+  <string name="listAllContactsInAccount">Contactos en %s</string>
+  <string name="listCustomView">Contactos en vista personalizada</string>
+  <string name="listSingleContact">Contacto único</string>
+  <string name="display_options_sort_list_by">Ordenar por</string>
+  <string name="display_options_sort_by_given_name">Nombre</string>
+  <string name="display_options_sort_by_family_name">Apellidos</string>
+  <string name="display_options_view_names_as">Formato del nombre</string>
+  <string name="display_options_view_given_name_first">Nombre primero</string>
+  <string name="display_options_view_family_name_first">Apellidos primero</string>
+  <string name="menu_clear_frequents">Borrar frecuentes</string>
+  <string name="action_menu_back_from_search">dejar de buscar</string>
+  <string name="description_clear_search">Borrar la búsqueda</string>
+  <string name="select_account_dialog_title">Cuenta</string>
+  <string name="set_default_account">Usar siempre esta para llamadas</string>
+  <string name="select_phone_account_for_calls">Elegir SIM para esta llamada</string>
+  <string name="select_phone_account_for_calls_remember">Recordar esta opción</string>
+  <string name="call_with_a_note">Llamada con una nota</string>
+  <string name="call_subject_hint">Escribe una nota para enviarla con la llamada...</string>
+  <string name="send_and_call_button">ENVIAR Y LLAMAR</string>
+  <string name="call_subject_limit">%1$s/%2$s</string>
+  <string name="old_call_subject_type_and_number">%1$s %2$s</string>
+  <string name="tab_title">Pestaña %1$s.</string>
+  <plurals name="tab_title_with_unread_items">
+    <item quantity="one"> Pestaña %1$s. %2$d elemento no leído. </item>
+    <item quantity="other"> Pestaña %1$s. %2$d elementos no leídos. </item>
+  </plurals>
+  <string name="description_search_video_call">Videollamada</string>
+  <string name="description_search_call_and_share">Compartir y llamar</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-et/strings.xml b/java/com/android/contacts/common/res/values-et/strings.xml
index 74c2d1a..9a905fc 100644
--- a/java/com/android/contacts/common/res/values-et/strings.xml
+++ b/java/com/android/contacts/common/res/values-et/strings.xml
@@ -1,162 +1,145 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="toast_text_copied" msgid="8979281391599667362">"Tekst on kopeeritud"</string>
-    <string name="call_custom" msgid="3041673234638990874">"Helista numbrile <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="call_home" msgid="125893483593803791">"Helista kodutelefoninumbrile"</string>
-    <string name="call_mobile" msgid="967589404494150813">"Helista mobiilinumbrile"</string>
-    <string name="call_work" msgid="6040550697395300892">"Helista töönumbrile"</string>
-    <string name="call_fax_work" msgid="5260192771364592922">"Helista tööfaksinumbrile"</string>
-    <string name="call_fax_home" msgid="5174311195081144124">"Helista kodufaksinumbrile"</string>
-    <string name="call_pager" msgid="6814149227741274161">"Helista piiparinumbrile"</string>
-    <string name="call_other" msgid="5536385588712587235">"Helista"</string>
-    <string name="call_callback" msgid="6314019862718112786">"Helista tagasihelistusnumbrile"</string>
-    <string name="call_car" msgid="3197417098027764954">"Helista autotelefoninumbrile"</string>
-    <string name="call_company_main" msgid="2557663310028446397">"Helista ettevõtte põhinumbrile"</string>
-    <string name="call_isdn" msgid="4691270442763649522">"Helista ISDN-telefoninumbrile"</string>
-    <string name="call_main" msgid="3293707608770407814">"Helista põhinumbrile"</string>
-    <string name="call_other_fax" msgid="4724521984879021465">"Helista faksinumbrile"</string>
-    <string name="call_radio" msgid="8942441419845057942">"Helista raadiotelefoninumbrile"</string>
-    <string name="call_telex" msgid="2031514461660668351">"Helista teleksinumbrile"</string>
-    <string name="call_tty_tdd" msgid="7807210224965727701">"Helista TTY-/TDD-numbrile"</string>
-    <string name="call_work_mobile" msgid="2716342732938578495">"Helista töömobiilinumbrile"</string>
-    <string name="call_work_pager" msgid="3791778749827366574">"Helista tööpiiparinumbrile"</string>
-    <string name="call_assistant" msgid="4177478845473789294">"Helista numbrile <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
-    <string name="call_mms" msgid="4958811711741872901">"Helista MMS-i numbrile"</string>
-    <string name="sms_custom" msgid="8785368968605026317">"Saada sõnum numbrile <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="sms_home" msgid="3527719551060295243">"Saada sõnum kodutelefoninumbrile"</string>
-    <string name="sms_mobile" msgid="8883045857887736518">"Saada sõnum mobiilinumbrile"</string>
-    <string name="sms_work" msgid="4158595439553450966">"Saada sõnum töönumbrile"</string>
-    <string name="sms_fax_work" msgid="5483726627718055248">"Saada sõnum tööfaksinumbrile"</string>
-    <string name="sms_fax_home" msgid="9219265155770746077">"Saada sõnum kodufaksinumbrile"</string>
-    <string name="sms_pager" msgid="4901085068525193933">"Saada sõnum piiparinumbrile"</string>
-    <string name="sms_other" msgid="1742702947993285933">"Saada sõnum"</string>
-    <string name="sms_callback" msgid="5833483630377538308">"Saada sõnum tagasihelistusnumbrile"</string>
-    <string name="sms_car" msgid="4314577266154395174">"Saada sõnum autotelefoninumbrile"</string>
-    <string name="sms_company_main" msgid="2308160928487360705">"Saada sõnum ettevõtte põhitelefoninumbrile"</string>
-    <string name="sms_isdn" msgid="6394300346179302542">"Saada sõnum ISDN-telefoninumbrile"</string>
-    <string name="sms_main" msgid="8908087742014140774">"Saada sõnum põhinumbrile"</string>
-    <string name="sms_other_fax" msgid="8768455473295405427">"Saada sõnum faksinumbrile"</string>
-    <string name="sms_radio" msgid="855555176531704682">"Saada sõnum raadiotelefoninumbrile"</string>
-    <string name="sms_telex" msgid="6269029276223252719">"Saada sõnum teleksinumbrile"</string>
-    <string name="sms_tty_tdd" msgid="6229057354509192444">"Saada sõnum TTY-/TDD-numbrile"</string>
-    <string name="sms_work_mobile" msgid="2155975469329969840">"Saada sõnum töömobiilinumbrile"</string>
-    <string name="sms_work_pager" msgid="8500140274906830742">"Saada sõnum tööpiiparinumbrile"</string>
-    <string name="sms_assistant" msgid="8513548482745330818">"Saada sõnum numbrile <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
-    <string name="sms_mms" msgid="5187888900503248542">"Saada sõnum MMS-i numbrile"</string>
-    <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"Kas kustutada sagedased kontaktid?"</string>
-    <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"Kustutate rakendustes Kontaktid ja Telefon sagedaste kontaktide loendi, mistõttu meilirakendused peavad teie adresseerimiseelistused uuesti omandama."</string>
-    <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"Saged. kontaktide kustutamine ..."</string>
-    <string name="status_available" msgid="2648156525685472626">"Saadaval"</string>
-    <string name="status_away" msgid="2298688367552893953">"Eemal"</string>
-    <string name="status_busy" msgid="5990832098713248503">"Hõivatud"</string>
-    <string name="contactsList" msgid="8806067891419291513">"Kontaktid"</string>
-    <string name="contact_suggestions" msgid="3324166754807120006">"Populaarsed soovitused"</string>
-    <string name="local_invisible_directory" msgid="4723238462733650090">"Muu"</string>
-    <string name="directory_search_label" msgid="4621215895484025229">"Kataloog"</string>
-    <string name="directory_search_label_work" msgid="7679326282707414897">"Töökontaktide kataloog"</string>
-    <string name="local_search_label" msgid="907622822323119235">"Kõik kontaktid"</string>
-    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Soovitused"</string>
-    <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Mina"</string>
-    <string name="missing_name" msgid="978606963362745020">"(Nimi puudub)"</string>
-    <string name="description_view_contact_detail" msgid="2428742401208561136">"Kuva kontakt"</string>
-    <string name="list_filter_phones" msgid="8763316061763437182">"Kõik telefoninumbritega kontaktid"</string>
-    <string name="list_filter_phones_work" msgid="7083575404573422965">"Tööprofiili kontaktid"</string>
-    <string name="view_updates_from_group" msgid="9011641093168385729">"Kuva värskendused"</string>
-    <string name="account_phone" msgid="7067809073194061035">"Ainult seadmes, sünkroonimata"</string>
-    <string name="nameLabelsGroup" msgid="7730465833159557471">"Nimi"</string>
-    <string name="nicknameLabelsGroup" msgid="6310556912361840029">"Hüüdnimi"</string>
-    <string name="full_name" msgid="648186563998465740">"Nimi"</string>
-    <string name="name_given" msgid="5096576006314820536">"Eesnimi"</string>
-    <string name="name_family" msgid="6646235805198547467">"Perekonnanimi"</string>
-    <string name="name_prefix" msgid="9215326539658838">"Nime eesliide"</string>
-    <string name="name_middle" msgid="703755205331582769">"Teine nimi"</string>
-    <string name="name_suffix" msgid="5777083390282548702">"Nime järelliide"</string>
-    <string name="name_phonetic" msgid="1650870996361663089">"Foneetiline nimi"</string>
-    <string name="name_phonetic_given" msgid="618812334274603170">"Foneetiline eesnimi"</string>
-    <string name="name_phonetic_middle" msgid="4826820763384625538">"Foneetiline keskmine nimi"</string>
-    <string name="name_phonetic_family" msgid="379905191212930771">"Foneetiline perekonnanimi"</string>
-    <string name="phoneLabelsGroup" msgid="169661929021355548">"Telefon"</string>
-    <string name="emailLabelsGroup" msgid="2249752810477488833">"Meilimine"</string>
-    <string name="postalLabelsGroup" msgid="6772000590189142253">"Aadress"</string>
-    <string name="imLabelsGroup" msgid="5718066254237364731">"Kiirsuhtlus"</string>
-    <string name="organizationLabelsGroup" msgid="1101996309241601435">"Organisatsioon"</string>
-    <string name="relationLabelsGroup" msgid="53866051664600053">"Suhe"</string>
-    <string name="eventLabelsGroup" msgid="1236970042646618489">"Erikuupäev"</string>
-    <string name="sms" msgid="7574344928185328095">"Tekstisõnum"</string>
-    <string name="postal_address" msgid="1804707930129674200">"Aadress"</string>
-    <string name="ghostData_company" msgid="2554310786296833424">"Ettevõte"</string>
-    <string name="ghostData_title" msgid="4994968731830184837">"Nimetus"</string>
-    <string name="label_notes" msgid="2050255313694219786">"Märkmed"</string>
-    <string name="label_sip_address" msgid="8883266182575965926">"SIP"</string>
-    <string name="websiteLabelsGroup" msgid="1630734286462186790">"Veebisait"</string>
-    <string name="groupsLabel" msgid="2694002798416868728">"Grupid"</string>
-    <string name="email_home" msgid="889830029388962171">"Saada meilisõnum kodusele aadressile"</string>
-    <string name="email_mobile" msgid="4487686436743741150">"Saada meilisõnum mobiilile"</string>
-    <string name="email_work" msgid="4223487303344613528">"Saada meiliaadress tööaadressile"</string>
-    <string name="email_other" msgid="4246411900126012062">"Meilimine"</string>
-    <string name="email_custom" msgid="7246580894327511013">"Saada meilisõnum aadressile <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="email" msgid="2807318537887091606">"Meilimine"</string>
-    <string name="postal_street" msgid="6918171741240802474">"Tänav"</string>
-    <string name="postal_city" msgid="8674569121430005628">"Linn"</string>
-    <string name="postal_region" msgid="1730369286225469192">"Osariik"</string>
-    <string name="postal_postcode" msgid="4450700741261990439">"Sihtnumber"</string>
-    <string name="postal_country" msgid="232670707458768148">"Riik"</string>
-    <string name="map_home" msgid="4181131107392126938">"Kuva kodune aadress"</string>
-    <string name="map_work" msgid="5723471185992684400">"Kuva tööaadress"</string>
-    <string name="map_other" msgid="2253764780863500516">"Kuva aadress"</string>
-    <string name="map_custom" msgid="5581743097882436157">"Kuva aadress (<xliff:g id="CUSTOM">%s</xliff:g>)"</string>
-    <string name="chat_aim" msgid="2954364435497941659">"Vestlus AIM-i kasutades"</string>
-    <string name="chat_msn" msgid="3130135239071228678">"Vestlus Windows Live\'i kasutades"</string>
-    <string name="chat_yahoo" msgid="3233552142326865347">"Vestlus Yahood kasutades"</string>
-    <string name="chat_skype" msgid="6486703981390592425">"Vestlus Skype\'i kasutades"</string>
-    <string name="chat_qq" msgid="786924280665740019">"Vestlus QQ kasutades"</string>
-    <string name="chat_gtalk" msgid="7914674177243078035">"Vestlus Google Talki kasutades"</string>
-    <string name="chat_icq" msgid="3292934726414765801">"Vestlus ICQ-d kasutades"</string>
-    <string name="chat_jabber" msgid="6701542313597880204">"Vestlus Jabberit kasutades"</string>
-    <string name="chat" msgid="1020428260359370236">"Vestlus"</string>
-    <string name="list_filter_all_accounts" msgid="473782314881473992">"Kõik kontaktid"</string>
-    <string name="listAllContactsInAccount" msgid="3486378621592995630">"Konto <xliff:g id="NAME">%s</xliff:g> kontaktid"</string>
-    <string name="listCustomView" msgid="5306282632413086731">"Kontaktid kohandatud vaates"</string>
-    <string name="listSingleContact" msgid="8620818791932382627">"Üks kontakt"</string>
-    <string name="display_options_sort_list_by" msgid="3541875948367831228">"Sortimisalus"</string>
-    <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"Eesnimi"</string>
-    <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"Perekonnanimi"</string>
-    <string name="display_options_view_names_as" msgid="4204204205736735618">"Nimevorming"</string>
-    <string name="display_options_view_given_name_first" msgid="2308026973021171020">"Eesnimi enne"</string>
-    <string name="display_options_view_family_name_first" msgid="987430497292428242">"Perekonnanimi enne"</string>
-    <string name="menu_clear_frequents" msgid="5358271535047496120">"Sagedaste kustutamine"</string>
-    <string name="action_menu_back_from_search" msgid="3550669942742167644">"otsimise peatamine"</string>
-    <string name="description_clear_search" msgid="2347258825265600782">"Otsingu kustutamine"</string>
-    <string name="select_account_dialog_title" msgid="2673504582803359239">"Konto"</string>
-    <string name="set_default_account" msgid="7966099951006467572">"Kasuta helistamiseks alati seda"</string>
-    <string name="select_phone_account_for_calls" msgid="1784460686103423274">"Helistamine kontoga"</string>
-    <string name="call_with_a_note" msgid="6242261320491851133">"Kõne koos märkusega"</string>
-    <string name="call_subject_hint" msgid="7233138753650420800">"Sisestage märkus, mis koos kõnega saata ..."</string>
-    <string name="send_and_call_button" msgid="4735168294120154013">"SAADA JA HELISTA"</string>
-    <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g>/<xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="tab_title" msgid="3387876802026074288">"Vahekaart <xliff:g id="TITLE">%1$s</xliff:g>."</string>
-    <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
-      <item quantity="other"> Vahekaart <xliff:g id="TITLE_2">%1$s</xliff:g>. <xliff:g id="COUNT_3">%2$d</xliff:g> lugemata üksust. </item>
-      <item quantity="one"> Vahekaart <xliff:g id="TITLE_0">%1$s</xliff:g>. <xliff:g id="COUNT_1">%2$d</xliff:g> lugemata üksus. </item>
-    </plurals>
-    <string name="description_search_video_call" msgid="4337369876888024909">"Videokõne"</string>
-    <string name="description_search_call_and_share" msgid="4912772842755050467">"Jagamine ja helistamine"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_custom">Helista numbrile %s</string>
+  <string name="call_home">Helista kodutelefoninumbrile</string>
+  <string name="call_mobile">Helista mobiilinumbrile</string>
+  <string name="call_work">Helista töönumbrile</string>
+  <string name="call_fax_work">Helista tööfaksinumbrile</string>
+  <string name="call_fax_home">Helista kodufaksinumbrile</string>
+  <string name="call_pager">Helista piiparinumbrile</string>
+  <string name="call_other">Helista</string>
+  <string name="call_callback">Helista tagasihelistusnumbrile</string>
+  <string name="call_car">Helista autotelefoninumbrile</string>
+  <string name="call_company_main">Helista ettevõtte põhinumbrile</string>
+  <string name="call_isdn">Helista ISDN-telefoninumbrile</string>
+  <string name="call_main">Helista põhinumbrile</string>
+  <string name="call_other_fax">Helista faksinumbrile</string>
+  <string name="call_radio">Helista raadiotelefoninumbrile</string>
+  <string name="call_telex">Helista teleksinumbrile</string>
+  <string name="call_tty_tdd">Helista TTY-/TDD-numbrile</string>
+  <string name="call_work_mobile">Helista töömobiilinumbrile</string>
+  <string name="call_work_pager">Helista tööpiiparinumbrile</string>
+  <string name="call_assistant">Helista numbrile %s</string>
+  <string name="call_mms">Helista MMS-i numbrile</string>
+  <string name="sms_custom">Saada sõnum numbrile %s</string>
+  <string name="sms_home">Saada sõnum kodutelefoninumbrile</string>
+  <string name="sms_mobile">Saada sõnum mobiilinumbrile</string>
+  <string name="sms_work">Saada sõnum töönumbrile</string>
+  <string name="sms_fax_work">Saada sõnum tööfaksinumbrile</string>
+  <string name="sms_fax_home">Saada sõnum kodufaksinumbrile</string>
+  <string name="sms_pager">Saada sõnum piiparinumbrile</string>
+  <string name="sms_other">Saada sõnum</string>
+  <string name="sms_callback">Saada sõnum tagasihelistusnumbrile</string>
+  <string name="sms_car">Saada sõnum autotelefoninumbrile</string>
+  <string name="sms_company_main">Saada sõnum ettevõtte põhitelefoninumbrile</string>
+  <string name="sms_isdn">Saada sõnum ISDN-telefoninumbrile</string>
+  <string name="sms_main">Saada sõnum põhinumbrile</string>
+  <string name="sms_other_fax">Saada sõnum faksinumbrile</string>
+  <string name="sms_radio">Saada sõnum raadiotelefoninumbrile</string>
+  <string name="sms_telex">Saada sõnum teleksinumbrile</string>
+  <string name="sms_tty_tdd">Saada sõnum TTY-/TDD-numbrile</string>
+  <string name="sms_work_mobile">Saada sõnum töömobiilinumbrile</string>
+  <string name="sms_work_pager">Saada sõnum tööpiiparinumbrile</string>
+  <string name="sms_assistant">Saada sõnum numbrile %s</string>
+  <string name="sms_mms">Saada sõnum MMS-i numbrile</string>
+  <string name="clearFrequentsConfirmation_title">Kas kustutada sagedased kontaktid?</string>
+  <string name="clearFrequentsConfirmation">Kustutate rakendustes Kontaktid ja Telefon sagedaste kontaktide loendi, mistõttu meilirakendused peavad teie adresseerimiseelistused uuesti omandama.</string>
+  <string name="clearFrequentsProgress_title">Saged. kontaktide kustutamine ...</string>
+  <string name="status_available">Saadaval</string>
+  <string name="status_away">Eemal</string>
+  <string name="status_busy">Hõivatud</string>
+  <string name="contactsList">Kontaktid</string>
+  <string name="contact_suggestions">Populaarsed soovitused</string>
+  <string name="local_invisible_directory">Muu</string>
+  <string name="directory_search_label">Kataloog</string>
+  <string name="directory_search_label_work">Töökontaktide kataloog</string>
+  <string name="local_search_label">Kõik kontaktid</string>
+  <string name="local_suggestions_search_label">Soovitused</string>
+  <string msgid="9154761216179882405" name="user_profile_contacts_list_header">Mina</string>
+  <string name="missing_name">(Nimi puudub)</string>
+  <string msgid="2795575601596468581" name="description_view_contact_detail">Kuva kontakt</string>
+  <string name="list_filter_phones">Kõik telefoninumbritega kontaktid</string>
+  <string name="list_filter_phones_work">Tööprofiili kontaktid</string>
+  <string name="view_updates_from_group">Kuva värskendused</string>
+  <string name="account_phone">Ainult seadmes, sünkroonimata</string>
+  <string name="nameLabelsGroup">Nimi</string>
+  <string name="nicknameLabelsGroup">Hüüdnimi</string>
+  <string name="full_name">Nimi</string>
+  <string name="name_given">Eesnimi</string>
+  <string name="name_family">Perekonnanimi</string>
+  <string name="name_prefix">Nime eesliide</string>
+  <string name="name_middle">Teine nimi</string>
+  <string name="name_suffix">Nime järelliide</string>
+  <string name="name_phonetic">Foneetiline nimi</string>
+  <string name="name_phonetic_given">Foneetiline eesnimi</string>
+  <string name="name_phonetic_middle">Foneetiline keskmine nimi</string>
+  <string name="name_phonetic_family">Foneetiline perekonnanimi</string>
+  <string name="phoneLabelsGroup">Telefon</string>
+  <string name="emailLabelsGroup">Meilimine</string>
+  <string name="postalLabelsGroup">Aadress</string>
+  <string name="imLabelsGroup">Kiirsuhtlus</string>
+  <string name="organizationLabelsGroup">Organisatsioon</string>
+  <string name="relationLabelsGroup">Suhe</string>
+  <string name="eventLabelsGroup">Erikuupäev</string>
+  <string name="sms">Tekstisõnum</string>
+  <string name="postal_address">Aadress</string>
+  <string name="ghostData_company">Ettevõte</string>
+  <string name="ghostData_title">Nimetus</string>
+  <string name="label_notes">Märkmed</string>
+  <string name="label_sip_address">SIP</string>
+  <string name="websiteLabelsGroup">Veebisait</string>
+  <string name="groupsLabel">Grupid</string>
+  <string name="email_home">Saada meilisõnum kodusele aadressile</string>
+  <string name="email_mobile">Saada meilisõnum mobiilile</string>
+  <string name="email_work">Saada meiliaadress tööaadressile</string>
+  <string name="email_other">Meilimine</string>
+  <string name="email_custom">Saada meilisõnum aadressile %s</string>
+  <string name="email">Meilimine</string>
+  <string name="postal_street">Tänav</string>
+  <string name="postal_city">Linn</string>
+  <string name="postal_region">Osariik</string>
+  <string name="postal_postcode">Sihtnumber</string>
+  <string name="postal_country">Riik</string>
+  <string name="map_home">Kuva kodune aadress</string>
+  <string name="map_work">Kuva tööaadress</string>
+  <string name="map_other">Kuva aadress</string>
+  <string name="map_custom">Kuva aadress (%s)</string>
+  <string name="chat_aim">Vestlus AIM-i kasutades</string>
+  <string name="chat_msn">Vestlus Windows Live\'i kasutades</string>
+  <string name="chat_yahoo">Vestlus Yahood kasutades</string>
+  <string name="chat_skype">Vestlus Skype\'i kasutades</string>
+  <string name="chat_qq">Vestlus QQ kasutades</string>
+  <string name="chat_gtalk">Vestlus Google Talki kasutades</string>
+  <string name="chat_icq">Vestlus ICQ-d kasutades</string>
+  <string name="chat_jabber">Vestlus Jabberit kasutades</string>
+  <string name="chat">Vestlus</string>
+  <string name="list_filter_all_accounts">Kõik kontaktid</string>
+  <string name="listAllContactsInAccount">Konto %s kontaktid</string>
+  <string name="listCustomView">Kontaktid kohandatud vaates</string>
+  <string name="listSingleContact">Üks kontakt</string>
+  <string name="display_options_sort_list_by">Sortimisalus</string>
+  <string name="display_options_sort_by_given_name">Eesnimi</string>
+  <string name="display_options_sort_by_family_name">Perekonnanimi</string>
+  <string name="display_options_view_names_as">Nimevorming</string>
+  <string name="display_options_view_given_name_first">Eesnimi enne</string>
+  <string name="display_options_view_family_name_first">Perekonnanimi enne</string>
+  <string name="menu_clear_frequents">Sagedaste kustutamine</string>
+  <string name="action_menu_back_from_search">otsimise peatamine</string>
+  <string name="description_clear_search">Otsingu kustutamine</string>
+  <string name="select_account_dialog_title">Konto</string>
+  <string name="set_default_account">Kasuta helistamiseks alati seda</string>
+  <string name="select_phone_account_for_calls">Valige selle kõne jaoks SIM-kaart</string>
+  <string name="select_phone_account_for_calls_remember">Jäta valik meelde</string>
+  <string name="call_with_a_note">Kõne koos märkusega</string>
+  <string name="call_subject_hint">Sisestage märkus, mis koos kõnega saata ...</string>
+  <string name="send_and_call_button">SAADA JA HELISTA</string>
+  <string name="call_subject_limit">%1$s/%2$s</string>
+  <string name="old_call_subject_type_and_number">%1$s %2$s</string>
+  <string name="tab_title">Vahekaart %1$s.</string>
+  <plurals name="tab_title_with_unread_items">
+    <item quantity="one"> Vahekaart %1$s. %2$d lugemata üksus. </item>
+    <item quantity="other"> Vahekaart %1$s. %2$d lugemata üksust. </item>
+  </plurals>
+  <string name="description_search_video_call">Videokõne</string>
+  <string name="description_search_call_and_share">Jagamine ja helistamine</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-eu/strings.xml b/java/com/android/contacts/common/res/values-eu/strings.xml
index 631aaff..138149f 100644
--- a/java/com/android/contacts/common/res/values-eu/strings.xml
+++ b/java/com/android/contacts/common/res/values-eu/strings.xml
@@ -1,162 +1,145 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="toast_text_copied" msgid="8979281391599667362">"Testua kopiatu da"</string>
-    <string name="call_custom" msgid="3041673234638990874">"Deitu <xliff:g id="CUSTOM">%s</xliff:g> zenbakira"</string>
-    <string name="call_home" msgid="125893483593803791">"Deitu etxera"</string>
-    <string name="call_mobile" msgid="967589404494150813">"Deitu mugikorrera"</string>
-    <string name="call_work" msgid="6040550697395300892">"Deitu lanera"</string>
-    <string name="call_fax_work" msgid="5260192771364592922">"Deitu laneko faxera"</string>
-    <string name="call_fax_home" msgid="5174311195081144124">"Deitu etxeko faxera"</string>
-    <string name="call_pager" msgid="6814149227741274161">"Deitu bilagailura"</string>
-    <string name="call_other" msgid="5536385588712587235">"Deitu"</string>
-    <string name="call_callback" msgid="6314019862718112786">"Dei bidezko erantzuna"</string>
-    <string name="call_car" msgid="3197417098027764954">"Deitu autoko telefonora"</string>
-    <string name="call_company_main" msgid="2557663310028446397">"Deitu enpresaren zenbaki nagusira"</string>
-    <string name="call_isdn" msgid="4691270442763649522">"Deitu ISDN zenbakira"</string>
-    <string name="call_main" msgid="3293707608770407814">"Deitu zenbaki nagusira"</string>
-    <string name="call_other_fax" msgid="4724521984879021465">"Deitu faxera"</string>
-    <string name="call_radio" msgid="8942441419845057942">"Deitu irratira"</string>
-    <string name="call_telex" msgid="2031514461660668351">"Deitu telexera"</string>
-    <string name="call_tty_tdd" msgid="7807210224965727701">"Deitu TTY/TDD zenbakira"</string>
-    <string name="call_work_mobile" msgid="2716342732938578495">"Deitu laneko mugikorrera"</string>
-    <string name="call_work_pager" msgid="3791778749827366574">"Deitu laneko bilagailura"</string>
-    <string name="call_assistant" msgid="4177478845473789294">"Deitu <xliff:g id="ASSISTANT">%s</xliff:g> zenbakira"</string>
-    <string name="call_mms" msgid="4958811711741872901">"Deitu MMS zenbakira"</string>
-    <string name="sms_custom" msgid="8785368968605026317">"Bidali testu-mezua honi: <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="sms_home" msgid="3527719551060295243">"Bidali testu-mezua etxera"</string>
-    <string name="sms_mobile" msgid="8883045857887736518">"Bidali testu-mezua mugikorrera"</string>
-    <string name="sms_work" msgid="4158595439553450966">"Bidali testu-mezua lanera"</string>
-    <string name="sms_fax_work" msgid="5483726627718055248">"Bidali testu-mezua laneko faxera"</string>
-    <string name="sms_fax_home" msgid="9219265155770746077">"Bidali testu-mezua etxeko faxera"</string>
-    <string name="sms_pager" msgid="4901085068525193933">"Bidali testu-mezua bilagailura"</string>
-    <string name="sms_other" msgid="1742702947993285933">"Bidali testu-mezua"</string>
-    <string name="sms_callback" msgid="5833483630377538308">"Testu bidezko erantzuna"</string>
-    <string name="sms_car" msgid="4314577266154395174">"Bidali testu-mezua autora"</string>
-    <string name="sms_company_main" msgid="2308160928487360705">"Bidali testu-mezua enpresako zenbaki nagusira"</string>
-    <string name="sms_isdn" msgid="6394300346179302542">"Bidali testu-mezua ISDN zenbakira"</string>
-    <string name="sms_main" msgid="8908087742014140774">"Bidali testu-mezua zenbaki nagusira"</string>
-    <string name="sms_other_fax" msgid="8768455473295405427">"Bidali testu-mezua faxera"</string>
-    <string name="sms_radio" msgid="855555176531704682">"Bidali testu-mezua irratira"</string>
-    <string name="sms_telex" msgid="6269029276223252719">"Bidali testu-mezua telexera"</string>
-    <string name="sms_tty_tdd" msgid="6229057354509192444">"Bidali testu-mezua TTY/TDD zenbakira"</string>
-    <string name="sms_work_mobile" msgid="2155975469329969840">"Bidali testu-mezua laneko mugikorrera"</string>
-    <string name="sms_work_pager" msgid="8500140274906830742">"Bidali testu-mezua laneko bilagailura"</string>
-    <string name="sms_assistant" msgid="8513548482745330818">"Bidali testu-mezua honi: <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
-    <string name="sms_mms" msgid="5187888900503248542">"Bidali testu-mezua MMS zenbakira"</string>
-    <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"Sarri erabilitako kontaktuak garbitu?"</string>
-    <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"Kontaktuak eta Telefonoa aplikazioetako sarri erabilitako kontaktuen zerrenda garbituko duzu; beraz, posta elektronikoaren aplikazioek helbideen hobespenak hutsetik ikasi beharko dituzte."</string>
-    <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"Sarri erabilitako kontaktuak garbitzen…"</string>
-    <string name="status_available" msgid="2648156525685472626">"Libre"</string>
-    <string name="status_away" msgid="2298688367552893953">"Kanpoan"</string>
-    <string name="status_busy" msgid="5990832098713248503">"Okupatuta"</string>
-    <string name="contactsList" msgid="8806067891419291513">"Kontaktuak"</string>
-    <string name="contact_suggestions" msgid="3324166754807120006">"Iradokizun garrantzitsuenak"</string>
-    <string name="local_invisible_directory" msgid="4723238462733650090">"Beste bat"</string>
-    <string name="directory_search_label" msgid="4621215895484025229">"Direktorioa"</string>
-    <string name="directory_search_label_work" msgid="7679326282707414897">"Laneko kontaktuak"</string>
-    <string name="local_search_label" msgid="907622822323119235">"Kontaktu guztiak"</string>
-    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Iradokizunak"</string>
-    <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Ni"</string>
-    <string name="missing_name" msgid="978606963362745020">"(Izenik ez)"</string>
-    <string name="description_view_contact_detail" msgid="2428742401208561136">"Ikusi kontaktua"</string>
-    <string name="list_filter_phones" msgid="8763316061763437182">"Telefono-zenbakiak dituzten kontaktu guztiak"</string>
-    <string name="list_filter_phones_work" msgid="7083575404573422965">"Laneko profileko kontaktuak"</string>
-    <string name="view_updates_from_group" msgid="9011641093168385729">"Ikusi berritasunak"</string>
-    <string name="account_phone" msgid="7067809073194061035">"Gailuan soilik egongo da; ez da sinkronizatuko"</string>
-    <string name="nameLabelsGroup" msgid="7730465833159557471">"Izena"</string>
-    <string name="nicknameLabelsGroup" msgid="6310556912361840029">"Goitizena"</string>
-    <string name="full_name" msgid="648186563998465740">"Izena"</string>
-    <string name="name_given" msgid="5096576006314820536">"Izena"</string>
-    <string name="name_family" msgid="6646235805198547467">"Abizena"</string>
-    <string name="name_prefix" msgid="9215326539658838">"Izenaren aurrizkia"</string>
-    <string name="name_middle" msgid="703755205331582769">"Bigarren izena"</string>
-    <string name="name_suffix" msgid="5777083390282548702">"Izenaren atzizkia"</string>
-    <string name="name_phonetic" msgid="1650870996361663089">"Izen fonetikoa"</string>
-    <string name="name_phonetic_given" msgid="618812334274603170">"Izen fonetikoa"</string>
-    <string name="name_phonetic_middle" msgid="4826820763384625538">"Bigarren izen fonetikoa"</string>
-    <string name="name_phonetic_family" msgid="379905191212930771">"Abizen fonetikoa"</string>
-    <string name="phoneLabelsGroup" msgid="169661929021355548">"Telefonoa"</string>
-    <string name="emailLabelsGroup" msgid="2249752810477488833">"Bidali mezu elektronikoa"</string>
-    <string name="postalLabelsGroup" msgid="6772000590189142253">"Helbidea"</string>
-    <string name="imLabelsGroup" msgid="5718066254237364731">"IM"</string>
-    <string name="organizationLabelsGroup" msgid="1101996309241601435">"Erakundea"</string>
-    <string name="relationLabelsGroup" msgid="53866051664600053">"Harremana"</string>
-    <string name="eventLabelsGroup" msgid="1236970042646618489">"Data berezia"</string>
-    <string name="sms" msgid="7574344928185328095">"Testu-mezua"</string>
-    <string name="postal_address" msgid="1804707930129674200">"Helbidea"</string>
-    <string name="ghostData_company" msgid="2554310786296833424">"Enpresa"</string>
-    <string name="ghostData_title" msgid="4994968731830184837">"Lanpostua"</string>
-    <string name="label_notes" msgid="2050255313694219786">"Oharrak"</string>
-    <string name="label_sip_address" msgid="8883266182575965926">"SIP"</string>
-    <string name="websiteLabelsGroup" msgid="1630734286462186790">"Webgunea"</string>
-    <string name="groupsLabel" msgid="2694002798416868728">"Taldeak"</string>
-    <string name="email_home" msgid="889830029388962171">"Bidali mezu elektronikoa etxera"</string>
-    <string name="email_mobile" msgid="4487686436743741150">"Bidali mezu elektronikoa mugikorrera"</string>
-    <string name="email_work" msgid="4223487303344613528">"Bidali mezu elektronikoa lanera"</string>
-    <string name="email_other" msgid="4246411900126012062">"Bidali mezu elektronikoa"</string>
-    <string name="email_custom" msgid="7246580894327511013">"Bidali mezu elektronikoa <xliff:g id="CUSTOM">%s</xliff:g> helbidera"</string>
-    <string name="email" msgid="2807318537887091606">"Bidali mezu elektronikoa"</string>
-    <string name="postal_street" msgid="6918171741240802474">"Kalea"</string>
-    <string name="postal_city" msgid="8674569121430005628">"Hiria"</string>
-    <string name="postal_region" msgid="1730369286225469192">"Estatua"</string>
-    <string name="postal_postcode" msgid="4450700741261990439">"Posta-kodea"</string>
-    <string name="postal_country" msgid="232670707458768148">"Herrialdea"</string>
-    <string name="map_home" msgid="4181131107392126938">"Ikusi etxeko helbidea"</string>
-    <string name="map_work" msgid="5723471185992684400">"Ikusi laneko helbidea"</string>
-    <string name="map_other" msgid="2253764780863500516">"Ikusi helbidea"</string>
-    <string name="map_custom" msgid="5581743097882436157">"Ikusi <xliff:g id="CUSTOM">%s</xliff:g> helbidea"</string>
-    <string name="chat_aim" msgid="2954364435497941659">"Txateatu AIM bidez"</string>
-    <string name="chat_msn" msgid="3130135239071228678">"Txateatu Windows Live bidez"</string>
-    <string name="chat_yahoo" msgid="3233552142326865347">"Txateatu Yahoo bidez"</string>
-    <string name="chat_skype" msgid="6486703981390592425">"Txateatu Skype bidez"</string>
-    <string name="chat_qq" msgid="786924280665740019">"Txateatu QQ bidez"</string>
-    <string name="chat_gtalk" msgid="7914674177243078035">"Txateatu Google Talk bidez"</string>
-    <string name="chat_icq" msgid="3292934726414765801">"Txateatu ICQ bidez"</string>
-    <string name="chat_jabber" msgid="6701542313597880204">"Txateatu Jabber bidez"</string>
-    <string name="chat" msgid="1020428260359370236">"Txateatu"</string>
-    <string name="list_filter_all_accounts" msgid="473782314881473992">"Kontaktu guztiak"</string>
-    <string name="listAllContactsInAccount" msgid="3486378621592995630">"Kontu honetako kontaktuak: <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="listCustomView" msgid="5306282632413086731">"Ikuspegi pertsonalizatuko kontaktuak"</string>
-    <string name="listSingleContact" msgid="8620818791932382627">"Kontaktu bakarra"</string>
-    <string name="display_options_sort_list_by" msgid="3541875948367831228">"Ordenatzeko irizpidea"</string>
-    <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"Izena"</string>
-    <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"Abizena"</string>
-    <string name="display_options_view_names_as" msgid="4204204205736735618">"Izenaren formatua"</string>
-    <string name="display_options_view_given_name_first" msgid="2308026973021171020">"Izena lehenengo"</string>
-    <string name="display_options_view_family_name_first" msgid="987430497292428242">"Abizena lehenengo"</string>
-    <string name="menu_clear_frequents" msgid="5358271535047496120">"Garbitu sarri erabilitakoak"</string>
-    <string name="action_menu_back_from_search" msgid="3550669942742167644">"gelditu bilaketa"</string>
-    <string name="description_clear_search" msgid="2347258825265600782">"Garbitu bilaketa"</string>
-    <string name="select_account_dialog_title" msgid="2673504582803359239">"Kontua"</string>
-    <string name="set_default_account" msgid="7966099951006467572">"Erabili beti hau deietarako"</string>
-    <string name="select_phone_account_for_calls" msgid="1784460686103423274">"Deitu kontu honekin:"</string>
-    <string name="call_with_a_note" msgid="6242261320491851133">"Egin deia oharrarekin"</string>
-    <string name="call_subject_hint" msgid="7233138753650420800">"Idatzi deiarekin batera bidali beharreko oharra…"</string>
-    <string name="send_and_call_button" msgid="4735168294120154013">"BIDALI ETA DEITU"</string>
-    <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g>/<xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g>: <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="tab_title" msgid="3387876802026074288">"<xliff:g id="TITLE">%1$s</xliff:g> fitxa."</string>
-    <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
-      <item quantity="other"> <xliff:g id="TITLE_2">%1$s</xliff:g> fitxa. Irakurri gabeko <xliff:g id="COUNT_3">%2$d</xliff:g> elementu. </item>
-      <item quantity="one"> <xliff:g id="TITLE_0">%1$s</xliff:g> fitxa. Irakurri gabeko <xliff:g id="COUNT_1">%2$d</xliff:g> elementu. </item>
-    </plurals>
-    <string name="description_search_video_call" msgid="4337369876888024909">"Bideo-deia"</string>
-    <string name="description_search_call_and_share" msgid="4912772842755050467">"Partekatu eta deitu"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_custom">Deitu %s zenbakira</string>
+  <string name="call_home">Deitu etxera</string>
+  <string name="call_mobile">Deitu mugikorrera</string>
+  <string name="call_work">Deitu lanera</string>
+  <string name="call_fax_work">Deitu laneko faxera</string>
+  <string name="call_fax_home">Deitu etxeko faxera</string>
+  <string name="call_pager">Deitu bilagailura</string>
+  <string name="call_other">Deitu</string>
+  <string name="call_callback">Dei bidezko erantzuna</string>
+  <string name="call_car">Deitu autoko telefonora</string>
+  <string name="call_company_main">Deitu enpresaren zenbaki nagusira</string>
+  <string name="call_isdn">Deitu ISDN zenbakira</string>
+  <string name="call_main">Deitu zenbaki nagusira</string>
+  <string name="call_other_fax">Deitu faxera</string>
+  <string name="call_radio">Deitu irratira</string>
+  <string name="call_telex">Deitu telexera</string>
+  <string name="call_tty_tdd">Deitu TTY/TDD zenbakira</string>
+  <string name="call_work_mobile">Deitu laneko mugikorrera</string>
+  <string name="call_work_pager">Deitu laneko bilagailura</string>
+  <string name="call_assistant">Deitu %s zenbakira</string>
+  <string name="call_mms">Deitu MMS zenbakira</string>
+  <string name="sms_custom">Bidali testu-mezua honi: %s</string>
+  <string name="sms_home">Bidali testu-mezua etxera</string>
+  <string name="sms_mobile">Bidali testu-mezua mugikorrera</string>
+  <string name="sms_work">Bidali testu-mezua lanera</string>
+  <string name="sms_fax_work">Bidali testu-mezua laneko faxera</string>
+  <string name="sms_fax_home">Bidali testu-mezua etxeko faxera</string>
+  <string name="sms_pager">Bidali testu-mezua bilagailura</string>
+  <string name="sms_other">Bidali testu-mezua</string>
+  <string name="sms_callback">Testu bidezko erantzuna</string>
+  <string name="sms_car">Bidali testu-mezua autora</string>
+  <string name="sms_company_main">Bidali testu-mezua enpresako zenbaki nagusira</string>
+  <string name="sms_isdn">Bidali testu-mezua ISDN zenbakira</string>
+  <string name="sms_main">Bidali testu-mezua zenbaki nagusira</string>
+  <string name="sms_other_fax">Bidali testu-mezua faxera</string>
+  <string name="sms_radio">Bidali testu-mezua irratira</string>
+  <string name="sms_telex">Bidali testu-mezua telexera</string>
+  <string name="sms_tty_tdd">Bidali testu-mezua TTY/TDD zenbakira</string>
+  <string name="sms_work_mobile">Bidali testu-mezua laneko mugikorrera</string>
+  <string name="sms_work_pager">Bidali testu-mezua laneko bilagailura</string>
+  <string name="sms_assistant">Bidali testu-mezua honi: %s</string>
+  <string name="sms_mms">Bidali testu-mezua MMS zenbakira</string>
+  <string name="clearFrequentsConfirmation_title">Sarri erabilitako kontaktuak garbitu?</string>
+  <string name="clearFrequentsConfirmation">Kontaktuak eta Telefonoa aplikazioetako sarri erabilitako kontaktuen zerrenda garbituko duzu; beraz, posta elektronikoaren aplikazioek helbideen hobespenak hutsetik ikasi beharko dituzte.</string>
+  <string name="clearFrequentsProgress_title">Sarri erabilitako kontaktuak garbitzen…</string>
+  <string name="status_available">Libre</string>
+  <string name="status_away">Kanpoan</string>
+  <string name="status_busy">Okupatuta</string>
+  <string name="contactsList">Kontaktuak</string>
+  <string name="contact_suggestions">Iradokizun garrantzitsuenak</string>
+  <string name="local_invisible_directory">Beste bat</string>
+  <string name="directory_search_label">Direktorioa</string>
+  <string name="directory_search_label_work">Laneko kontaktuak</string>
+  <string name="local_search_label">Kontaktu guztiak</string>
+  <string name="local_suggestions_search_label">Iradokizunak</string>
+  <string msgid="9154761216179882405" name="user_profile_contacts_list_header">Ni</string>
+  <string name="missing_name">(Izenik ez)</string>
+  <string msgid="2795575601596468581" name="description_view_contact_detail">Ikusi kontaktua</string>
+  <string name="list_filter_phones">Telefono-zenbakiak dituzten kontaktu guztiak</string>
+  <string name="list_filter_phones_work">Laneko profileko kontaktuak</string>
+  <string name="view_updates_from_group">Ikusi berritasunak</string>
+  <string name="account_phone">Gailuan soilik egongo da; ez da sinkronizatuko</string>
+  <string name="nameLabelsGroup">Izena</string>
+  <string name="nicknameLabelsGroup">Goitizena</string>
+  <string name="full_name">Izena</string>
+  <string name="name_given">Izena</string>
+  <string name="name_family">Abizena</string>
+  <string name="name_prefix">Izenaren aurrizkia</string>
+  <string name="name_middle">Bigarren izena</string>
+  <string name="name_suffix">Izenaren atzizkia</string>
+  <string name="name_phonetic">Izen fonetikoa</string>
+  <string name="name_phonetic_given">Izen fonetikoa</string>
+  <string name="name_phonetic_middle">Bigarren izen fonetikoa</string>
+  <string name="name_phonetic_family">Abizen fonetikoa</string>
+  <string name="phoneLabelsGroup">Telefonoa</string>
+  <string name="emailLabelsGroup">Bidali mezu elektronikoa</string>
+  <string name="postalLabelsGroup">Helbidea</string>
+  <string name="imLabelsGroup">IM</string>
+  <string name="organizationLabelsGroup">Erakundea</string>
+  <string name="relationLabelsGroup">Harremana</string>
+  <string name="eventLabelsGroup">Data berezia</string>
+  <string name="sms">Testu-mezua</string>
+  <string name="postal_address">Helbidea</string>
+  <string name="ghostData_company">Enpresa</string>
+  <string name="ghostData_title">Lanpostua</string>
+  <string name="label_notes">Oharrak</string>
+  <string name="label_sip_address">SIP</string>
+  <string name="websiteLabelsGroup">Webgunea</string>
+  <string name="groupsLabel">Taldeak</string>
+  <string name="email_home">Bidali mezu elektronikoa etxera</string>
+  <string name="email_mobile">Bidali mezu elektronikoa mugikorrera</string>
+  <string name="email_work">Bidali mezu elektronikoa lanera</string>
+  <string name="email_other">Bidali mezu elektronikoa</string>
+  <string name="email_custom">Bidali mezu elektronikoa %s helbidera</string>
+  <string name="email">Bidali mezu elektronikoa</string>
+  <string name="postal_street">Kalea</string>
+  <string name="postal_city">Hiria</string>
+  <string name="postal_region">Estatua</string>
+  <string name="postal_postcode">Posta-kodea</string>
+  <string name="postal_country">Herrialdea</string>
+  <string name="map_home">Ikusi etxeko helbidea</string>
+  <string name="map_work">Ikusi laneko helbidea</string>
+  <string name="map_other">Ikusi helbidea</string>
+  <string name="map_custom">Ikusi %s helbidea</string>
+  <string name="chat_aim">Txateatu AIM bidez</string>
+  <string name="chat_msn">Txateatu Windows Live bidez</string>
+  <string name="chat_yahoo">Txateatu Yahoo bidez</string>
+  <string name="chat_skype">Txateatu Skype bidez</string>
+  <string name="chat_qq">Txateatu QQ bidez</string>
+  <string name="chat_gtalk">Txateatu Google Talk bidez</string>
+  <string name="chat_icq">Txateatu ICQ bidez</string>
+  <string name="chat_jabber">Txateatu Jabber bidez</string>
+  <string name="chat">Txateatu</string>
+  <string name="list_filter_all_accounts">Kontaktu guztiak</string>
+  <string name="listAllContactsInAccount">Kontu honetako kontaktuak: %s</string>
+  <string name="listCustomView">Ikuspegi pertsonalizatuko kontaktuak</string>
+  <string name="listSingleContact">Kontaktu bakarra</string>
+  <string name="display_options_sort_list_by">Ordenatzeko irizpidea</string>
+  <string name="display_options_sort_by_given_name">Izena</string>
+  <string name="display_options_sort_by_family_name">Abizena</string>
+  <string name="display_options_view_names_as">Izenaren formatua</string>
+  <string name="display_options_view_given_name_first">Izena lehenengo</string>
+  <string name="display_options_view_family_name_first">Abizena lehenengo</string>
+  <string name="menu_clear_frequents">Garbitu sarri erabilitakoak</string>
+  <string name="action_menu_back_from_search">gelditu bilaketa</string>
+  <string name="description_clear_search">Garbitu bilaketa</string>
+  <string name="select_account_dialog_title">Kontua</string>
+  <string name="set_default_account">Erabili beti hau deietarako</string>
+  <string name="select_phone_account_for_calls">Aukeratu dei hau egiteko SIM txartela</string>
+  <string name="select_phone_account_for_calls_remember">Gogoratu aukera hau</string>
+  <string name="call_with_a_note">Egin deia oharrarekin</string>
+  <string name="call_subject_hint">Idatzi deiarekin batera bidali beharreko oharra…</string>
+  <string name="send_and_call_button">BIDALI ETA DEITU</string>
+  <string name="call_subject_limit">%1$s/%2$s</string>
+  <string name="old_call_subject_type_and_number">%1$s %2$s</string>
+  <string name="tab_title">%1$s fitxa.</string>
+  <plurals name="tab_title_with_unread_items">
+    <item quantity="one"> %1$s fitxa. Irakurri gabeko %2$d elementu. </item>
+    <item quantity="other"> %1$s fitxa. Irakurri gabeko %2$d elementu. </item>
+  </plurals>
+  <string name="description_search_video_call">Bideo-deia</string>
+  <string name="description_search_call_and_share">Partekatu eta deitu</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-fa/strings.xml b/java/com/android/contacts/common/res/values-fa/strings.xml
index b3dd170..531b1f1 100644
--- a/java/com/android/contacts/common/res/values-fa/strings.xml
+++ b/java/com/android/contacts/common/res/values-fa/strings.xml
@@ -1,162 +1,145 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="toast_text_copied" msgid="8979281391599667362">"متن کپی شده"</string>
-    <string name="call_custom" msgid="3041673234638990874">"تماس با <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="call_home" msgid="125893483593803791">"تماس با منزل"</string>
-    <string name="call_mobile" msgid="967589404494150813">"تماس با تلفن همراه"</string>
-    <string name="call_work" msgid="6040550697395300892">"تماس با محل کار"</string>
-    <string name="call_fax_work" msgid="5260192771364592922">"تماس با نمابر محل کار"</string>
-    <string name="call_fax_home" msgid="5174311195081144124">"تماس با نمابر منزل"</string>
-    <string name="call_pager" msgid="6814149227741274161">"تماس با پی‌جو"</string>
-    <string name="call_other" msgid="5536385588712587235">"تماس"</string>
-    <string name="call_callback" msgid="6314019862718112786">"تماس با شماره بازگرداندن تماس"</string>
-    <string name="call_car" msgid="3197417098027764954">"تماس با تلفن خودرو"</string>
-    <string name="call_company_main" msgid="2557663310028446397">"تماس با خط اصلی شرکت"</string>
-    <string name="call_isdn" msgid="4691270442763649522">"‏تماس با ISDN"</string>
-    <string name="call_main" msgid="3293707608770407814">"تماس با خط اصلی"</string>
-    <string name="call_other_fax" msgid="4724521984879021465">"تماس با نمابر"</string>
-    <string name="call_radio" msgid="8942441419845057942">"تماس با تلفن رادیویی"</string>
-    <string name="call_telex" msgid="2031514461660668351">"تماس با تلکس"</string>
-    <string name="call_tty_tdd" msgid="7807210224965727701">"‏تماس با TTY/TDD"</string>
-    <string name="call_work_mobile" msgid="2716342732938578495">"تماس با تلفن همراه محل کار"</string>
-    <string name="call_work_pager" msgid="3791778749827366574">"تماس با پی‌جوی محل کار"</string>
-    <string name="call_assistant" msgid="4177478845473789294">"تماس با <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
-    <string name="call_mms" msgid="4958811711741872901">"تماس با فراپیام"</string>
-    <string name="sms_custom" msgid="8785368968605026317">"ارسال پیامک به <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="sms_home" msgid="3527719551060295243">"ارسال پیامک به تلفن منزل"</string>
-    <string name="sms_mobile" msgid="8883045857887736518">"ارسال پیامک به تلفن همراه"</string>
-    <string name="sms_work" msgid="4158595439553450966">"ارسال پیامک به محل کار"</string>
-    <string name="sms_fax_work" msgid="5483726627718055248">"ارسال پیامک به نمابر محل کار"</string>
-    <string name="sms_fax_home" msgid="9219265155770746077">"ارسال پیامک به نمابر منزل"</string>
-    <string name="sms_pager" msgid="4901085068525193933">"ارسال پیامک به پی‌جو"</string>
-    <string name="sms_other" msgid="1742702947993285933">"ارسال پیامک"</string>
-    <string name="sms_callback" msgid="5833483630377538308">"ارسال پیامک به شماره برگرداندن تماس"</string>
-    <string name="sms_car" msgid="4314577266154395174">"ارسال پیامک به تلفن خودرو"</string>
-    <string name="sms_company_main" msgid="2308160928487360705">"ارسال پیامک به خط اصلی شرکت"</string>
-    <string name="sms_isdn" msgid="6394300346179302542">"‏ارسال پیامک به ISDN"</string>
-    <string name="sms_main" msgid="8908087742014140774">"ارسال پیامک به شماره اصلی"</string>
-    <string name="sms_other_fax" msgid="8768455473295405427">"ارسال پیامک به نمابر"</string>
-    <string name="sms_radio" msgid="855555176531704682">"ارسال پیامک به تلفن رادیویی"</string>
-    <string name="sms_telex" msgid="6269029276223252719">"ارسال پیامک به تلکس"</string>
-    <string name="sms_tty_tdd" msgid="6229057354509192444">"‏ارسال پیامک به TTY/TDD"</string>
-    <string name="sms_work_mobile" msgid="2155975469329969840">"ارسال پیامک به تلفن همراه محل کار"</string>
-    <string name="sms_work_pager" msgid="8500140274906830742">"ارسال پیامک به پی‌جوی محل کار"</string>
-    <string name="sms_assistant" msgid="8513548482745330818">"ارسال پیامک به <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
-    <string name="sms_mms" msgid="5187888900503248542">"ارسال پیامک به خدمات پیام چندرسانه‌ای"</string>
-    <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"مکرراً تماس‌گرفته‌ها پاک شود؟"</string>
-    <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"فهرست افرادی را که مکرر با آن‌ها تماس گرفته‌اید در برنامه‌های «مخاطبین» و «تلفن» پاک خواهید کرد و برنامه‌های رایانامه مجبور می‌شوند که تنظیمات برگزیده آدرس‌دهی شما را از اول یاد بگیرند."</string>
-    <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"درحال پاک کردن مکرراً تماس‌گرفته…"</string>
-    <string name="status_available" msgid="2648156525685472626">"در دسترس"</string>
-    <string name="status_away" msgid="2298688367552893953">"غایب"</string>
-    <string name="status_busy" msgid="5990832098713248503">"مشغول"</string>
-    <string name="contactsList" msgid="8806067891419291513">"مخاطبین"</string>
-    <string name="contact_suggestions" msgid="3324166754807120006">"پیشنهادهای برتر"</string>
-    <string name="local_invisible_directory" msgid="4723238462733650090">"سایر موارد"</string>
-    <string name="directory_search_label" msgid="4621215895484025229">"فهرست"</string>
-    <string name="directory_search_label_work" msgid="7679326282707414897">"فهرست کار"</string>
-    <string name="local_search_label" msgid="907622822323119235">"همه مخاطبین"</string>
-    <string name="local_suggestions_search_label" msgid="1178575146224386118">"پیشنهادها"</string>
-    <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"من"</string>
-    <string name="missing_name" msgid="978606963362745020">"(بدون نام)"</string>
-    <string name="description_view_contact_detail" msgid="2428742401208561136">"مشاهده مخاطب"</string>
-    <string name="list_filter_phones" msgid="8763316061763437182">"همه مخاطبین دارای شماره تلفن"</string>
-    <string name="list_filter_phones_work" msgid="7083575404573422965">"مخاطبین نمایه کاری"</string>
-    <string name="view_updates_from_group" msgid="9011641093168385729">"مشاهده به‌روزرسانی‌ها"</string>
-    <string name="account_phone" msgid="7067809073194061035">"فقط دستگاه، بدون همگام‌سازی"</string>
-    <string name="nameLabelsGroup" msgid="7730465833159557471">"نام"</string>
-    <string name="nicknameLabelsGroup" msgid="6310556912361840029">"نام مستعار"</string>
-    <string name="full_name" msgid="648186563998465740">"نام"</string>
-    <string name="name_given" msgid="5096576006314820536">"نام"</string>
-    <string name="name_family" msgid="6646235805198547467">"نام خانوادگی"</string>
-    <string name="name_prefix" msgid="9215326539658838">"پیشوند نام"</string>
-    <string name="name_middle" msgid="703755205331582769">"نام میانی"</string>
-    <string name="name_suffix" msgid="5777083390282548702">"پسوند نام"</string>
-    <string name="name_phonetic" msgid="1650870996361663089">"تلفظ نام"</string>
-    <string name="name_phonetic_given" msgid="618812334274603170">"تلفظ نام"</string>
-    <string name="name_phonetic_middle" msgid="4826820763384625538">"تلفظ نام میانی"</string>
-    <string name="name_phonetic_family" msgid="379905191212930771">"تلفظ نام خانوادگی"</string>
-    <string name="phoneLabelsGroup" msgid="169661929021355548">"تلفن"</string>
-    <string name="emailLabelsGroup" msgid="2249752810477488833">"رایانامه"</string>
-    <string name="postalLabelsGroup" msgid="6772000590189142253">"آدرس"</string>
-    <string name="imLabelsGroup" msgid="5718066254237364731">"پیام فوری"</string>
-    <string name="organizationLabelsGroup" msgid="1101996309241601435">"سازمان"</string>
-    <string name="relationLabelsGroup" msgid="53866051664600053">"نسبت"</string>
-    <string name="eventLabelsGroup" msgid="1236970042646618489">"تاریخ ویژه"</string>
-    <string name="sms" msgid="7574344928185328095">"پیامک"</string>
-    <string name="postal_address" msgid="1804707930129674200">"آدرس"</string>
-    <string name="ghostData_company" msgid="2554310786296833424">"شرکت"</string>
-    <string name="ghostData_title" msgid="4994968731830184837">"عنوان"</string>
-    <string name="label_notes" msgid="2050255313694219786">"یادداشت‌ها"</string>
-    <string name="label_sip_address" msgid="8883266182575965926">"SIP"</string>
-    <string name="websiteLabelsGroup" msgid="1630734286462186790">"وب سایت"</string>
-    <string name="groupsLabel" msgid="2694002798416868728">"گروه‌ها"</string>
-    <string name="email_home" msgid="889830029388962171">"رایانامه به منزل"</string>
-    <string name="email_mobile" msgid="4487686436743741150">"رایانامه به تلفن همراه"</string>
-    <string name="email_work" msgid="4223487303344613528">"رایانامه به محل کار"</string>
-    <string name="email_other" msgid="4246411900126012062">"رایانامه"</string>
-    <string name="email_custom" msgid="7246580894327511013">"رایانامه به <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="email" msgid="2807318537887091606">"رایانامه"</string>
-    <string name="postal_street" msgid="6918171741240802474">"خیابان"</string>
-    <string name="postal_city" msgid="8674569121430005628">"شهر"</string>
-    <string name="postal_region" msgid="1730369286225469192">"ایالت"</string>
-    <string name="postal_postcode" msgid="4450700741261990439">"کد پستی"</string>
-    <string name="postal_country" msgid="232670707458768148">"کشور"</string>
-    <string name="map_home" msgid="4181131107392126938">"مشاهده آدرس منزل"</string>
-    <string name="map_work" msgid="5723471185992684400">"مشاهده آدرس محل کار"</string>
-    <string name="map_other" msgid="2253764780863500516">"مشاهده آدرس"</string>
-    <string name="map_custom" msgid="5581743097882436157">"مشاهده آدرس <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="chat_aim" msgid="2954364435497941659">"‏گپ با استفاده از AIM"</string>
-    <string name="chat_msn" msgid="3130135239071228678">"‏گپ با استفاده از Windows Live"</string>
-    <string name="chat_yahoo" msgid="3233552142326865347">"‏گپ با استفاده از Yahoo"</string>
-    <string name="chat_skype" msgid="6486703981390592425">"‏گپ با استفاده از Skype"</string>
-    <string name="chat_qq" msgid="786924280665740019">"‏گپ با استفاده از QQ"</string>
-    <string name="chat_gtalk" msgid="7914674177243078035">"‏گپ با استفاده از Google Talk"</string>
-    <string name="chat_icq" msgid="3292934726414765801">"‏گپ با استفاده از ICQ"</string>
-    <string name="chat_jabber" msgid="6701542313597880204">"‏گپ با استفاده از Jabber"</string>
-    <string name="chat" msgid="1020428260359370236">"گپ"</string>
-    <string name="list_filter_all_accounts" msgid="473782314881473992">"همه مخاطبین"</string>
-    <string name="listAllContactsInAccount" msgid="3486378621592995630">"مخاطبین در <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="listCustomView" msgid="5306282632413086731">"مخاطبین در نمای سفارشی"</string>
-    <string name="listSingleContact" msgid="8620818791932382627">"مخاطب تکی"</string>
-    <string name="display_options_sort_list_by" msgid="3541875948367831228">"مرتب‌سازی براساس"</string>
-    <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"نام"</string>
-    <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"نام خانوادگی"</string>
-    <string name="display_options_view_names_as" msgid="4204204205736735618">"قالب نام"</string>
-    <string name="display_options_view_given_name_first" msgid="2308026973021171020">"ابتدا نام"</string>
-    <string name="display_options_view_family_name_first" msgid="987430497292428242">"ابتدا نام خانوادگی"</string>
-    <string name="menu_clear_frequents" msgid="5358271535047496120">"پاک کردن مکرراً تماس‌گرفته"</string>
-    <string name="action_menu_back_from_search" msgid="3550669942742167644">"توقف جستجو"</string>
-    <string name="description_clear_search" msgid="2347258825265600782">"پاک کردن جستجو"</string>
-    <string name="select_account_dialog_title" msgid="2673504582803359239">"حساب"</string>
-    <string name="set_default_account" msgid="7966099951006467572">"همیشه این سیم برای تماس‌ استفاده شود"</string>
-    <string name="select_phone_account_for_calls" msgid="1784460686103423274">"تماس با"</string>
-    <string name="call_with_a_note" msgid="6242261320491851133">"تماس به همراه یادداشت"</string>
-    <string name="call_subject_hint" msgid="7233138753650420800">"یادداشتی بنویسید که همراه تماس ارسال شود…"</string>
-    <string name="send_and_call_button" msgid="4735168294120154013">"ارسال و تماس"</string>
-    <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g> / ‏<xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="tab_title" msgid="3387876802026074288">"برگه «<xliff:g id="TITLE">%1$s</xliff:g>»."</string>
-    <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
-      <item quantity="one"> برگه «<xliff:g id="TITLE_2">%1$s</xliff:g>». <xliff:g id="COUNT_3">%2$d</xliff:g> مورد خوانده‌نشده. </item>
-      <item quantity="other"> برگه «<xliff:g id="TITLE_2">%1$s</xliff:g>». <xliff:g id="COUNT_3">%2$d</xliff:g> مورد خوانده‌نشده. </item>
-    </plurals>
-    <string name="description_search_video_call" msgid="4337369876888024909">"تماس ویدیویی"</string>
-    <string name="description_search_call_and_share" msgid="4912772842755050467">"اشتراک‌گذاری و تماس"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_custom">تماس با %s</string>
+  <string name="call_home">تماس با منزل</string>
+  <string name="call_mobile">تماس با تلفن همراه</string>
+  <string name="call_work">تماس با محل کار</string>
+  <string name="call_fax_work">تماس با نمابر محل کار</string>
+  <string name="call_fax_home">تماس با نمابر منزل</string>
+  <string name="call_pager">تماس با پی‌جو</string>
+  <string name="call_other">تماس</string>
+  <string name="call_callback">تماس با شماره بازگرداندن تماس</string>
+  <string name="call_car">تماس با تلفن خودرو</string>
+  <string name="call_company_main">تماس با خط اصلی شرکت</string>
+  <string name="call_isdn">‏تماس با ISDN</string>
+  <string name="call_main">تماس با خط اصلی</string>
+  <string name="call_other_fax">تماس با نمابر</string>
+  <string name="call_radio">تماس با تلفن رادیویی</string>
+  <string name="call_telex">تماس با تلکس</string>
+  <string name="call_tty_tdd">‏تماس با TTY/TDD</string>
+  <string name="call_work_mobile">تماس با تلفن همراه محل کار</string>
+  <string name="call_work_pager">تماس با پی‌جوی محل کار</string>
+  <string name="call_assistant">تماس با %s</string>
+  <string name="call_mms">تماس با فراپیام</string>
+  <string name="sms_custom">ارسال پیامک به %s</string>
+  <string name="sms_home">ارسال پیامک به تلفن منزل</string>
+  <string name="sms_mobile">ارسال پیامک به تلفن همراه</string>
+  <string name="sms_work">ارسال پیامک به محل کار</string>
+  <string name="sms_fax_work">ارسال پیامک به نمابر محل کار</string>
+  <string name="sms_fax_home">ارسال پیامک به نمابر منزل</string>
+  <string name="sms_pager">ارسال پیامک به پی‌جو</string>
+  <string name="sms_other">ارسال پیامک</string>
+  <string name="sms_callback">ارسال پیامک به شماره برگرداندن تماس</string>
+  <string name="sms_car">ارسال پیامک به تلفن خودرو</string>
+  <string name="sms_company_main">ارسال پیامک به خط اصلی شرکت</string>
+  <string name="sms_isdn">‏ارسال پیامک به ISDN</string>
+  <string name="sms_main">ارسال پیامک به شماره اصلی</string>
+  <string name="sms_other_fax">ارسال پیامک به نمابر</string>
+  <string name="sms_radio">ارسال پیامک به تلفن رادیویی</string>
+  <string name="sms_telex">ارسال پیامک به تلکس</string>
+  <string name="sms_tty_tdd">‏ارسال پیامک به TTY/TDD</string>
+  <string name="sms_work_mobile">ارسال پیامک به تلفن همراه محل کار</string>
+  <string name="sms_work_pager">ارسال پیامک به پی‌جوی محل کار</string>
+  <string name="sms_assistant">ارسال پیامک به %s</string>
+  <string name="sms_mms">ارسال پیامک به خدمات پیام چندرسانه‌ای</string>
+  <string name="clearFrequentsConfirmation_title">مکرراً تماس‌گرفته‌ها پاک شود؟</string>
+  <string name="clearFrequentsConfirmation">فهرست افرادی را که مکرر با آن‌ها تماس گرفته‌اید در برنامه‌های «مخاطبین» و «تلفن» پاک خواهید کرد و برنامه‌های رایانامه مجبور می‌شوند که تنظیمات برگزیده آدرس‌دهی شما را از اول یاد بگیرند.</string>
+  <string name="clearFrequentsProgress_title">درحال پاک کردن مکرراً تماس‌گرفته…</string>
+  <string name="status_available">در دسترس</string>
+  <string name="status_away">غایب</string>
+  <string name="status_busy">مشغول</string>
+  <string name="contactsList">مخاطبین</string>
+  <string name="contact_suggestions">پیشنهادهای برتر</string>
+  <string name="local_invisible_directory">سایر موارد</string>
+  <string name="directory_search_label">فهرست</string>
+  <string name="directory_search_label_work">فهرست کار</string>
+  <string name="local_search_label">همه مخاطبین</string>
+  <string name="local_suggestions_search_label">پیشنهادها</string>
+  <string msgid="9154761216179882405" name="user_profile_contacts_list_header">من</string>
+  <string name="missing_name">(بدون نام)</string>
+  <string msgid="2795575601596468581" name="description_view_contact_detail">مشاهده مخاطب</string>
+  <string name="list_filter_phones">همه مخاطبین دارای شماره تلفن</string>
+  <string name="list_filter_phones_work">مخاطبین نمایه کاری</string>
+  <string name="view_updates_from_group">مشاهده به‌روزرسانی‌ها</string>
+  <string name="account_phone">فقط دستگاه، بدون همگام‌سازی</string>
+  <string name="nameLabelsGroup">نام</string>
+  <string name="nicknameLabelsGroup">نام مستعار</string>
+  <string name="full_name">نام</string>
+  <string name="name_given">نام</string>
+  <string name="name_family">نام خانوادگی</string>
+  <string name="name_prefix">پیشوند نام</string>
+  <string name="name_middle">نام میانی</string>
+  <string name="name_suffix">پسوند نام</string>
+  <string name="name_phonetic">تلفظ نام</string>
+  <string name="name_phonetic_given">تلفظ نام</string>
+  <string name="name_phonetic_middle">تلفظ نام میانی</string>
+  <string name="name_phonetic_family">تلفظ نام خانوادگی</string>
+  <string name="phoneLabelsGroup">تلفن</string>
+  <string name="emailLabelsGroup">رایانامه</string>
+  <string name="postalLabelsGroup">آدرس</string>
+  <string name="imLabelsGroup">پیام فوری</string>
+  <string name="organizationLabelsGroup">سازمان</string>
+  <string name="relationLabelsGroup">نسبت</string>
+  <string name="eventLabelsGroup">تاریخ ویژه</string>
+  <string name="sms">پیامک</string>
+  <string name="postal_address">آدرس</string>
+  <string name="ghostData_company">شرکت</string>
+  <string name="ghostData_title">عنوان</string>
+  <string name="label_notes">یادداشت‌ها</string>
+  <string name="label_sip_address">SIP</string>
+  <string name="websiteLabelsGroup">وب سایت</string>
+  <string name="groupsLabel">گروه‌ها</string>
+  <string name="email_home">رایانامه به منزل</string>
+  <string name="email_mobile">رایانامه به تلفن همراه</string>
+  <string name="email_work">رایانامه به محل کار</string>
+  <string name="email_other">رایانامه</string>
+  <string name="email_custom">رایانامه به %s</string>
+  <string name="email">رایانامه</string>
+  <string name="postal_street">خیابان</string>
+  <string name="postal_city">شهر</string>
+  <string name="postal_region">ایالت</string>
+  <string name="postal_postcode">کد پستی</string>
+  <string name="postal_country">کشور</string>
+  <string name="map_home">مشاهده آدرس منزل</string>
+  <string name="map_work">مشاهده آدرس محل کار</string>
+  <string name="map_other">مشاهده آدرس</string>
+  <string name="map_custom">مشاهده آدرس %s</string>
+  <string name="chat_aim">‏گپ با استفاده از AIM</string>
+  <string name="chat_msn">‏گپ با استفاده از Windows Live</string>
+  <string name="chat_yahoo">‏گپ با استفاده از Yahoo</string>
+  <string name="chat_skype">‏گپ با استفاده از Skype</string>
+  <string name="chat_qq">‏گپ با استفاده از QQ</string>
+  <string name="chat_gtalk">‏گپ با استفاده از Google Talk</string>
+  <string name="chat_icq">‏گپ با استفاده از ICQ</string>
+  <string name="chat_jabber">‏گپ با استفاده از Jabber</string>
+  <string name="chat">گپ</string>
+  <string name="list_filter_all_accounts">همه مخاطبین</string>
+  <string name="listAllContactsInAccount">مخاطبین در %s</string>
+  <string name="listCustomView">مخاطبین در نمای سفارشی</string>
+  <string name="listSingleContact">مخاطب تکی</string>
+  <string name="display_options_sort_list_by">مرتب‌سازی براساس</string>
+  <string name="display_options_sort_by_given_name">نام</string>
+  <string name="display_options_sort_by_family_name">نام خانوادگی</string>
+  <string name="display_options_view_names_as">قالب نام</string>
+  <string name="display_options_view_given_name_first">ابتدا نام</string>
+  <string name="display_options_view_family_name_first">ابتدا نام خانوادگی</string>
+  <string name="menu_clear_frequents">پاک کردن مکرراً تماس‌گرفته</string>
+  <string name="action_menu_back_from_search">توقف جستجو</string>
+  <string name="description_clear_search">پاک کردن جستجو</string>
+  <string name="select_account_dialog_title">حساب</string>
+  <string name="set_default_account">همیشه این سیم برای تماس‌ استفاده شود</string>
+  <string name="select_phone_account_for_calls">سیم‌کارتی برای این تماس انتخاب کنید</string>
+  <string name="select_phone_account_for_calls_remember">این گزینه به خاطر سپرده شود</string>
+  <string name="call_with_a_note">تماس به همراه یادداشت</string>
+  <string name="call_subject_hint">یادداشتی بنویسید که همراه تماس ارسال شود…</string>
+  <string name="send_and_call_button">ارسال و تماس</string>
+  <string name="call_subject_limit">%1$s / ‏%2$s</string>
+  <string name="old_call_subject_type_and_number">%1$s %2$s</string>
+  <string name="tab_title">برگه «%1$s».</string>
+  <plurals name="tab_title_with_unread_items">
+    <item quantity="one"> برگه «%1$s». %2$d مورد خوانده‌نشده. </item>
+    <item quantity="other"> برگه «%1$s». %2$d مورد خوانده‌نشده. </item>
+  </plurals>
+  <string name="description_search_video_call">تماس ویدیویی</string>
+  <string name="description_search_call_and_share">اشتراک‌گذاری و تماس</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-fi/strings.xml b/java/com/android/contacts/common/res/values-fi/strings.xml
index 6a2a8bf..f62b848 100644
--- a/java/com/android/contacts/common/res/values-fi/strings.xml
+++ b/java/com/android/contacts/common/res/values-fi/strings.xml
@@ -1,162 +1,145 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="toast_text_copied" msgid="8979281391599667362">"Teksti kopioitu"</string>
-    <string name="call_custom" msgid="3041673234638990874">"Soita: <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="call_home" msgid="125893483593803791">"Soita kotinumeroon"</string>
-    <string name="call_mobile" msgid="967589404494150813">"Soita matkapuhelimeen"</string>
-    <string name="call_work" msgid="6040550697395300892">"Soita työnumeroon"</string>
-    <string name="call_fax_work" msgid="5260192771364592922">"Soita faksinumeroon (työ)"</string>
-    <string name="call_fax_home" msgid="5174311195081144124">"Soita faksinumeroon (koti)"</string>
-    <string name="call_pager" msgid="6814149227741274161">"Soita hakulaitteeseen"</string>
-    <string name="call_other" msgid="5536385588712587235">"Soita"</string>
-    <string name="call_callback" msgid="6314019862718112786">"Soita takaisinsoittonumeroon"</string>
-    <string name="call_car" msgid="3197417098027764954">"Soita autopuhelimeen"</string>
-    <string name="call_company_main" msgid="2557663310028446397">"Soita yrityksen ensisijaiseen numeroon"</string>
-    <string name="call_isdn" msgid="4691270442763649522">"Soita ISDN-numeroon"</string>
-    <string name="call_main" msgid="3293707608770407814">"Soita ensisijaiseen numeroon"</string>
-    <string name="call_other_fax" msgid="4724521984879021465">"Soita faksinumeroon"</string>
-    <string name="call_radio" msgid="8942441419845057942">"Soita radiopuhelimeen"</string>
-    <string name="call_telex" msgid="2031514461660668351">"Soita teleksinumeroon"</string>
-    <string name="call_tty_tdd" msgid="7807210224965727701">"Soita tekstipuhelimeen"</string>
-    <string name="call_work_mobile" msgid="2716342732938578495">"Soita matkapuhelimeen (työ)"</string>
-    <string name="call_work_pager" msgid="3791778749827366574">"Soita hakulaitteeseen (työ)"</string>
-    <string name="call_assistant" msgid="4177478845473789294">"Soita: <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
-    <string name="call_mms" msgid="4958811711741872901">"Soita MMS-numeroon"</string>
-    <string name="sms_custom" msgid="8785368968605026317">"Lähetä tekstiviesti: <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="sms_home" msgid="3527719551060295243">"Lähetä tekstiviesti kotinumeroon"</string>
-    <string name="sms_mobile" msgid="8883045857887736518">"Lähetä tekstiviesti matkapuhelimeen"</string>
-    <string name="sms_work" msgid="4158595439553450966">"Lähetä tekstiviesti työnumeroon"</string>
-    <string name="sms_fax_work" msgid="5483726627718055248">"Lähetä tekstiviesti faksinumeroon (työ)"</string>
-    <string name="sms_fax_home" msgid="9219265155770746077">"Lähetä tekstiviesti faksinumeroon (koti)"</string>
-    <string name="sms_pager" msgid="4901085068525193933">"Lähetä tekstiviesti hakulaitteeseen"</string>
-    <string name="sms_other" msgid="1742702947993285933">"Teksti"</string>
-    <string name="sms_callback" msgid="5833483630377538308">"Lähetä tekstiviesti takaisinsoittonumeroon"</string>
-    <string name="sms_car" msgid="4314577266154395174">"Lähetä tekstiviesti autopuhelimeen"</string>
-    <string name="sms_company_main" msgid="2308160928487360705">"Lähetä tekstiviesti yrityksen ensisijaiseen numeroon"</string>
-    <string name="sms_isdn" msgid="6394300346179302542">"Lähetä tekstiviesti ISDN-numeroon"</string>
-    <string name="sms_main" msgid="8908087742014140774">"Lähetä tekstiviesti ensisijaiseen numeroon"</string>
-    <string name="sms_other_fax" msgid="8768455473295405427">"Lähetä tekstiviesti faksinumeroon"</string>
-    <string name="sms_radio" msgid="855555176531704682">"Lähetä tekstiviesti radiopuhelimeen"</string>
-    <string name="sms_telex" msgid="6269029276223252719">"Lähetä tekstiviesti teleksinumeroon"</string>
-    <string name="sms_tty_tdd" msgid="6229057354509192444">"Lähetä tekstiviesti tekstipuhelimeen"</string>
-    <string name="sms_work_mobile" msgid="2155975469329969840">"Lähetä tekstiviesti matkapuhelimeen (työ)"</string>
-    <string name="sms_work_pager" msgid="8500140274906830742">"Lähetä tekstiviesti hakulaitteeseen (työ)"</string>
-    <string name="sms_assistant" msgid="8513548482745330818">"Lähetä tekstiviesti: <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
-    <string name="sms_mms" msgid="5187888900503248542">"Lähetä tekstiviesti MMS-numeroon"</string>
-    <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"Tyhjennetäänkö usein käytetyt?"</string>
-    <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"Toiminto tyhjentää Yhteystiedot- ja Puhelin-sovellusten usein käytettyjen kontaktien luettelon. Lisäksi sähköpostisovellukset pakotetaan opettelemaan osoiteasetuksesi uudestaan."</string>
-    <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"Tyhjennetään usein käytetyt..."</string>
-    <string name="status_available" msgid="2648156525685472626">"Saatavilla"</string>
-    <string name="status_away" msgid="2298688367552893953">"Poissa"</string>
-    <string name="status_busy" msgid="5990832098713248503">"Varattu"</string>
-    <string name="contactsList" msgid="8806067891419291513">"Yhteystiedot"</string>
-    <string name="contact_suggestions" msgid="3324166754807120006">"Kiinnostavimmat ehdotukset"</string>
-    <string name="local_invisible_directory" msgid="4723238462733650090">"Muu"</string>
-    <string name="directory_search_label" msgid="4621215895484025229">"Osoitekirja"</string>
-    <string name="directory_search_label_work" msgid="7679326282707414897">"Työhakemisto"</string>
-    <string name="local_search_label" msgid="907622822323119235">"Kaikki yhteystiedot"</string>
-    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Ehdotukset"</string>
-    <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Minä"</string>
-    <string name="missing_name" msgid="978606963362745020">"(Ei nimeä)"</string>
-    <string name="description_view_contact_detail" msgid="2428742401208561136">"Näytä yhteystieto"</string>
-    <string name="list_filter_phones" msgid="8763316061763437182">"Kaikki kontaktit, joilla on puhelinnumero"</string>
-    <string name="list_filter_phones_work" msgid="7083575404573422965">"Työprofiilin yhteystiedot"</string>
-    <string name="view_updates_from_group" msgid="9011641093168385729">"Näytä päivitykset"</string>
-    <string name="account_phone" msgid="7067809073194061035">"Vain laitteessa, ei synkronoida"</string>
-    <string name="nameLabelsGroup" msgid="7730465833159557471">"Nimi"</string>
-    <string name="nicknameLabelsGroup" msgid="6310556912361840029">"Lempinimi"</string>
-    <string name="full_name" msgid="648186563998465740">"Nimi"</string>
-    <string name="name_given" msgid="5096576006314820536">"Etunimi"</string>
-    <string name="name_family" msgid="6646235805198547467">"Sukunimi"</string>
-    <string name="name_prefix" msgid="9215326539658838">"Nimen etuliite"</string>
-    <string name="name_middle" msgid="703755205331582769">"Toinen nimi"</string>
-    <string name="name_suffix" msgid="5777083390282548702">"Nimen jälkiliite"</string>
-    <string name="name_phonetic" msgid="1650870996361663089">"Nimen ääntämistapa"</string>
-    <string name="name_phonetic_given" msgid="618812334274603170">"Etunimen ääntämistapa"</string>
-    <string name="name_phonetic_middle" msgid="4826820763384625538">"Toisen nimen ääntämistapa"</string>
-    <string name="name_phonetic_family" msgid="379905191212930771">"Sukunimen ääntämistapa"</string>
-    <string name="phoneLabelsGroup" msgid="169661929021355548">"Puhelin"</string>
-    <string name="emailLabelsGroup" msgid="2249752810477488833">"Lähetä sähköpostia"</string>
-    <string name="postalLabelsGroup" msgid="6772000590189142253">"Osoite"</string>
-    <string name="imLabelsGroup" msgid="5718066254237364731">"IM"</string>
-    <string name="organizationLabelsGroup" msgid="1101996309241601435">"Organisaatio"</string>
-    <string name="relationLabelsGroup" msgid="53866051664600053">"Suhde"</string>
-    <string name="eventLabelsGroup" msgid="1236970042646618489">"Erityispäivämäärä"</string>
-    <string name="sms" msgid="7574344928185328095">"Tekstiviesti"</string>
-    <string name="postal_address" msgid="1804707930129674200">"Osoite"</string>
-    <string name="ghostData_company" msgid="2554310786296833424">"Yritys"</string>
-    <string name="ghostData_title" msgid="4994968731830184837">"Nimi"</string>
-    <string name="label_notes" msgid="2050255313694219786">"Muistiinpanot"</string>
-    <string name="label_sip_address" msgid="8883266182575965926">"SIP"</string>
-    <string name="websiteLabelsGroup" msgid="1630734286462186790">"Sivusto"</string>
-    <string name="groupsLabel" msgid="2694002798416868728">"Ryhmät"</string>
-    <string name="email_home" msgid="889830029388962171">"Lähetä sähköpostia kotiosoitteeseen"</string>
-    <string name="email_mobile" msgid="4487686436743741150">"Lähetä sähköpostia mobiiliosoitteeseen"</string>
-    <string name="email_work" msgid="4223487303344613528">"Lähetä sähköpostia työosoitteeseen"</string>
-    <string name="email_other" msgid="4246411900126012062">"Lähetä sähköpostia"</string>
-    <string name="email_custom" msgid="7246580894327511013">"Lähetä sähköpostia osoitteeseen <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="email" msgid="2807318537887091606">"Lähetä sähköpostia"</string>
-    <string name="postal_street" msgid="6918171741240802474">"Katu"</string>
-    <string name="postal_city" msgid="8674569121430005628">"Kaupunki"</string>
-    <string name="postal_region" msgid="1730369286225469192">"Osavaltio/alue"</string>
-    <string name="postal_postcode" msgid="4450700741261990439">"Postinumero"</string>
-    <string name="postal_country" msgid="232670707458768148">"Maa"</string>
-    <string name="map_home" msgid="4181131107392126938">"Näytä kotiosoite"</string>
-    <string name="map_work" msgid="5723471185992684400">"Näytä työosoite"</string>
-    <string name="map_other" msgid="2253764780863500516">"Näytä osoite"</string>
-    <string name="map_custom" msgid="5581743097882436157">"Näytä osoite <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="chat_aim" msgid="2954364435497941659">"Keskustele AIM:n avulla"</string>
-    <string name="chat_msn" msgid="3130135239071228678">"Keskustele Windows Liven avulla"</string>
-    <string name="chat_yahoo" msgid="3233552142326865347">"Keskustele Yahoon avulla"</string>
-    <string name="chat_skype" msgid="6486703981390592425">"Keskustele Skypen avulla"</string>
-    <string name="chat_qq" msgid="786924280665740019">"Keskustele QQ:n avulla"</string>
-    <string name="chat_gtalk" msgid="7914674177243078035">"Keskustele Google Talkin avulla"</string>
-    <string name="chat_icq" msgid="3292934726414765801">"Keskustele ICQ:n avulla"</string>
-    <string name="chat_jabber" msgid="6701542313597880204">"Keskustele Jabberin avulla"</string>
-    <string name="chat" msgid="1020428260359370236">"Keskustelu"</string>
-    <string name="list_filter_all_accounts" msgid="473782314881473992">"Yhteystiedot"</string>
-    <string name="listAllContactsInAccount" msgid="3486378621592995630">"Yhteystiedot tilissä <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="listCustomView" msgid="5306282632413086731">"Muokatun näkymän yhteystiedot"</string>
-    <string name="listSingleContact" msgid="8620818791932382627">"Yksi yhteystieto"</string>
-    <string name="display_options_sort_list_by" msgid="3541875948367831228">"Lajitteluperuste"</string>
-    <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"Etunimi"</string>
-    <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"Sukunimi"</string>
-    <string name="display_options_view_names_as" msgid="4204204205736735618">"Nimen muoto"</string>
-    <string name="display_options_view_given_name_first" msgid="2308026973021171020">"Etunimi ensin"</string>
-    <string name="display_options_view_family_name_first" msgid="987430497292428242">"Sukunimi ensin"</string>
-    <string name="menu_clear_frequents" msgid="5358271535047496120">"Tyhjennä usein käytetyt"</string>
-    <string name="action_menu_back_from_search" msgid="3550669942742167644">"lopeta hakeminen"</string>
-    <string name="description_clear_search" msgid="2347258825265600782">"Tyhjennä haku"</string>
-    <string name="select_account_dialog_title" msgid="2673504582803359239">"Tili"</string>
-    <string name="set_default_account" msgid="7966099951006467572">"Käytä kaikille puheluille"</string>
-    <string name="select_phone_account_for_calls" msgid="1784460686103423274">"Valitse puhelinoperaattori:"</string>
-    <string name="call_with_a_note" msgid="6242261320491851133">"Soita ja lähetä muistiinpano"</string>
-    <string name="call_subject_hint" msgid="7233138753650420800">"Kirjoita muistiinpano lähetettäväksi puhelun kanssa…"</string>
-    <string name="send_and_call_button" msgid="4735168294120154013">"LÄHETÄ JA SOITA"</string>
-    <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g>/<xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="tab_title" msgid="3387876802026074288">"<xliff:g id="TITLE">%1$s</xliff:g>-välilehti."</string>
-    <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
-      <item quantity="other"> <xliff:g id="TITLE_2">%1$s</xliff:g>-välilehti. <xliff:g id="COUNT_3">%2$d</xliff:g> lukematonta kohdetta. </item>
-      <item quantity="one"> <xliff:g id="TITLE_0">%1$s</xliff:g>-välilehti. <xliff:g id="COUNT_1">%2$d</xliff:g> lukematon kohde. </item>
-    </plurals>
-    <string name="description_search_video_call" msgid="4337369876888024909">"Videopuhelu"</string>
-    <string name="description_search_call_and_share" msgid="4912772842755050467">"Jaa ja soita"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_custom">Soita: %s</string>
+  <string name="call_home">Soita kotinumeroon</string>
+  <string name="call_mobile">Soita matkapuhelimeen</string>
+  <string name="call_work">Soita työnumeroon</string>
+  <string name="call_fax_work">Soita faksinumeroon (työ)</string>
+  <string name="call_fax_home">Soita faksinumeroon (koti)</string>
+  <string name="call_pager">Soita hakulaitteeseen</string>
+  <string name="call_other">Soita</string>
+  <string name="call_callback">Soita takaisinsoittonumeroon</string>
+  <string name="call_car">Soita autopuhelimeen</string>
+  <string name="call_company_main">Soita yrityksen ensisijaiseen numeroon</string>
+  <string name="call_isdn">Soita ISDN-numeroon</string>
+  <string name="call_main">Soita ensisijaiseen numeroon</string>
+  <string name="call_other_fax">Soita faksinumeroon</string>
+  <string name="call_radio">Soita radiopuhelimeen</string>
+  <string name="call_telex">Soita teleksinumeroon</string>
+  <string name="call_tty_tdd">Soita tekstipuhelimeen</string>
+  <string name="call_work_mobile">Soita matkapuhelimeen (työ)</string>
+  <string name="call_work_pager">Soita hakulaitteeseen (työ)</string>
+  <string name="call_assistant">Soita: %s</string>
+  <string name="call_mms">Soita MMS-numeroon</string>
+  <string name="sms_custom">Lähetä tekstiviesti: %s</string>
+  <string name="sms_home">Lähetä tekstiviesti kotinumeroon</string>
+  <string name="sms_mobile">Lähetä tekstiviesti matkapuhelimeen</string>
+  <string name="sms_work">Lähetä tekstiviesti työnumeroon</string>
+  <string name="sms_fax_work">Lähetä tekstiviesti faksinumeroon (työ)</string>
+  <string name="sms_fax_home">Lähetä tekstiviesti faksinumeroon (koti)</string>
+  <string name="sms_pager">Lähetä tekstiviesti hakulaitteeseen</string>
+  <string name="sms_other">Teksti</string>
+  <string name="sms_callback">Lähetä tekstiviesti takaisinsoittonumeroon</string>
+  <string name="sms_car">Lähetä tekstiviesti autopuhelimeen</string>
+  <string name="sms_company_main">Lähetä tekstiviesti yrityksen ensisijaiseen numeroon</string>
+  <string name="sms_isdn">Lähetä tekstiviesti ISDN-numeroon</string>
+  <string name="sms_main">Lähetä tekstiviesti ensisijaiseen numeroon</string>
+  <string name="sms_other_fax">Lähetä tekstiviesti faksinumeroon</string>
+  <string name="sms_radio">Lähetä tekstiviesti radiopuhelimeen</string>
+  <string name="sms_telex">Lähetä tekstiviesti teleksinumeroon</string>
+  <string name="sms_tty_tdd">Lähetä tekstiviesti tekstipuhelimeen</string>
+  <string name="sms_work_mobile">Lähetä tekstiviesti matkapuhelimeen (työ)</string>
+  <string name="sms_work_pager">Lähetä tekstiviesti hakulaitteeseen (työ)</string>
+  <string name="sms_assistant">Lähetä tekstiviesti: %s</string>
+  <string name="sms_mms">Lähetä tekstiviesti MMS-numeroon</string>
+  <string name="clearFrequentsConfirmation_title">Tyhjennetäänkö usein käytetyt?</string>
+  <string name="clearFrequentsConfirmation">Toiminto tyhjentää Yhteystiedot- ja Puhelin-sovellusten usein käytettyjen kontaktien luettelon. Lisäksi sähköpostisovellukset pakotetaan opettelemaan osoiteasetuksesi uudestaan.</string>
+  <string name="clearFrequentsProgress_title">Tyhjennetään usein käytetyt...</string>
+  <string name="status_available">Saatavilla</string>
+  <string name="status_away">Poissa</string>
+  <string name="status_busy">Varattu</string>
+  <string name="contactsList">Yhteystiedot</string>
+  <string name="contact_suggestions">Kiinnostavimmat ehdotukset</string>
+  <string name="local_invisible_directory">Muu</string>
+  <string name="directory_search_label">Osoitekirja</string>
+  <string name="directory_search_label_work">Työhakemisto</string>
+  <string name="local_search_label">Kaikki yhteystiedot</string>
+  <string name="local_suggestions_search_label">Ehdotukset</string>
+  <string msgid="9154761216179882405" name="user_profile_contacts_list_header">Minä</string>
+  <string name="missing_name">(Ei nimeä)</string>
+  <string msgid="2795575601596468581" name="description_view_contact_detail">Näytä yhteystieto</string>
+  <string name="list_filter_phones">Kaikki kontaktit, joilla on puhelinnumero</string>
+  <string name="list_filter_phones_work">Työprofiilin yhteystiedot</string>
+  <string name="view_updates_from_group">Näytä päivitykset</string>
+  <string name="account_phone">Vain laitteessa, ei synkronoida</string>
+  <string name="nameLabelsGroup">Nimi</string>
+  <string name="nicknameLabelsGroup">Lempinimi</string>
+  <string name="full_name">Nimi</string>
+  <string name="name_given">Etunimi</string>
+  <string name="name_family">Sukunimi</string>
+  <string name="name_prefix">Nimen etuliite</string>
+  <string name="name_middle">Toinen nimi</string>
+  <string name="name_suffix">Nimen jälkiliite</string>
+  <string name="name_phonetic">Nimen ääntämistapa</string>
+  <string name="name_phonetic_given">Etunimen ääntämistapa</string>
+  <string name="name_phonetic_middle">Toisen nimen ääntämistapa</string>
+  <string name="name_phonetic_family">Sukunimen ääntämistapa</string>
+  <string name="phoneLabelsGroup">Puhelin</string>
+  <string name="emailLabelsGroup">Lähetä sähköpostia</string>
+  <string name="postalLabelsGroup">Osoite</string>
+  <string name="imLabelsGroup">IM</string>
+  <string name="organizationLabelsGroup">Organisaatio</string>
+  <string name="relationLabelsGroup">Suhde</string>
+  <string name="eventLabelsGroup">Erityispäivämäärä</string>
+  <string name="sms">Tekstiviesti</string>
+  <string name="postal_address">Osoite</string>
+  <string name="ghostData_company">Yritys</string>
+  <string name="ghostData_title">Nimi</string>
+  <string name="label_notes">Muistiinpanot</string>
+  <string name="label_sip_address">SIP</string>
+  <string name="websiteLabelsGroup">Sivusto</string>
+  <string name="groupsLabel">Ryhmät</string>
+  <string name="email_home">Lähetä sähköpostia kotiosoitteeseen</string>
+  <string name="email_mobile">Lähetä sähköpostia mobiiliosoitteeseen</string>
+  <string name="email_work">Lähetä sähköpostia työosoitteeseen</string>
+  <string name="email_other">Lähetä sähköpostia</string>
+  <string name="email_custom">Lähetä sähköpostia osoitteeseen %s</string>
+  <string name="email">Lähetä sähköpostia</string>
+  <string name="postal_street">Katu</string>
+  <string name="postal_city">Kaupunki</string>
+  <string name="postal_region">Osavaltio/alue</string>
+  <string name="postal_postcode">Postinumero</string>
+  <string name="postal_country">Maa</string>
+  <string name="map_home">Näytä kotiosoite</string>
+  <string name="map_work">Näytä työosoite</string>
+  <string name="map_other">Näytä osoite</string>
+  <string name="map_custom">Näytä osoite %s</string>
+  <string name="chat_aim">Keskustele AIM:n avulla</string>
+  <string name="chat_msn">Keskustele Windows Liven avulla</string>
+  <string name="chat_yahoo">Keskustele Yahoon avulla</string>
+  <string name="chat_skype">Keskustele Skypen avulla</string>
+  <string name="chat_qq">Keskustele QQ:n avulla</string>
+  <string name="chat_gtalk">Keskustele Google Talkin avulla</string>
+  <string name="chat_icq">Keskustele ICQ:n avulla</string>
+  <string name="chat_jabber">Keskustele Jabberin avulla</string>
+  <string name="chat">Keskustelu</string>
+  <string name="list_filter_all_accounts">Yhteystiedot</string>
+  <string name="listAllContactsInAccount">Yhteystiedot tilissä %s</string>
+  <string name="listCustomView">Muokatun näkymän yhteystiedot</string>
+  <string name="listSingleContact">Yksi yhteystieto</string>
+  <string name="display_options_sort_list_by">Lajitteluperuste</string>
+  <string name="display_options_sort_by_given_name">Etunimi</string>
+  <string name="display_options_sort_by_family_name">Sukunimi</string>
+  <string name="display_options_view_names_as">Nimen muoto</string>
+  <string name="display_options_view_given_name_first">Etunimi ensin</string>
+  <string name="display_options_view_family_name_first">Sukunimi ensin</string>
+  <string name="menu_clear_frequents">Tyhjennä usein käytetyt</string>
+  <string name="action_menu_back_from_search">lopeta hakeminen</string>
+  <string name="description_clear_search">Tyhjennä haku</string>
+  <string name="select_account_dialog_title">Tili</string>
+  <string name="set_default_account">Käytä kaikille puheluille</string>
+  <string name="select_phone_account_for_calls">Valitse SIM tätä puhelua varten</string>
+  <string name="select_phone_account_for_calls_remember">Muista valinta</string>
+  <string name="call_with_a_note">Soita ja lähetä muistiinpano</string>
+  <string name="call_subject_hint">Kirjoita muistiinpano lähetettäväksi puhelun kanssa…</string>
+  <string name="send_and_call_button">LÄHETÄ JA SOITA</string>
+  <string name="call_subject_limit">%1$s/%2$s</string>
+  <string name="old_call_subject_type_and_number">%1$s %2$s</string>
+  <string name="tab_title">%1$s-välilehti.</string>
+  <plurals name="tab_title_with_unread_items">
+    <item quantity="one"> %1$s-välilehti. %2$d lukematon kohde. </item>
+    <item quantity="other"> %1$s-välilehti. %2$d lukematonta kohdetta. </item>
+  </plurals>
+  <string name="description_search_video_call">Videopuhelu</string>
+  <string name="description_search_call_and_share">Jaa ja soita</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-fr-rCA/strings.xml b/java/com/android/contacts/common/res/values-fr-rCA/strings.xml
index 63a0917..8b29186 100644
--- a/java/com/android/contacts/common/res/values-fr-rCA/strings.xml
+++ b/java/com/android/contacts/common/res/values-fr-rCA/strings.xml
@@ -1,162 +1,145 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="toast_text_copied" msgid="8979281391599667362">"Texte copié."</string>
-    <string name="call_custom" msgid="3041673234638990874">"Appeler le <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="call_home" msgid="125893483593803791">"Appeler le numéro de téléphone du domicile"</string>
-    <string name="call_mobile" msgid="967589404494150813">"Appeler le numéro de téléphone mobile"</string>
-    <string name="call_work" msgid="6040550697395300892">"Appeler le numéro de téléphone professionnel"</string>
-    <string name="call_fax_work" msgid="5260192771364592922">"Appeler le numéro de télécopie professionnel"</string>
-    <string name="call_fax_home" msgid="5174311195081144124">"Appeler le numéro de télécopie du domicile"</string>
-    <string name="call_pager" msgid="6814149227741274161">"Appeler le téléavertisseur"</string>
-    <string name="call_other" msgid="5536385588712587235">"Appeler"</string>
-    <string name="call_callback" msgid="6314019862718112786">"Appeler le numéro de rappel"</string>
-    <string name="call_car" msgid="3197417098027764954">"Appeler le numéro de télphone de la voiture"</string>
-    <string name="call_company_main" msgid="2557663310028446397">"Appeler le numéro de téléphone principal de l\'entreprise"</string>
-    <string name="call_isdn" msgid="4691270442763649522">"Appeler le numéro de téléphone RNIS"</string>
-    <string name="call_main" msgid="3293707608770407814">"Appeler le numéro de téléphone principal"</string>
-    <string name="call_other_fax" msgid="4724521984879021465">"Appeler le numéro de télécopie"</string>
-    <string name="call_radio" msgid="8942441419845057942">"Appeler par signal radio"</string>
-    <string name="call_telex" msgid="2031514461660668351">"Appeler par télex"</string>
-    <string name="call_tty_tdd" msgid="7807210224965727701">"Appeler le numéro TTY/TDD (malentendants)"</string>
-    <string name="call_work_mobile" msgid="2716342732938578495">"Appeler le numéro de téléphone mobile professionnel"</string>
-    <string name="call_work_pager" msgid="3791778749827366574">"Appeler le téléavertisseur professionnel"</string>
-    <string name="call_assistant" msgid="4177478845473789294">"Appeler le <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
-    <string name="call_mms" msgid="4958811711741872901">"Appeler le numéro de téléphone MMS"</string>
-    <string name="sms_custom" msgid="8785368968605026317">"Envoyer un SMS au <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="sms_home" msgid="3527719551060295243">"Envoyer un SMS au numéro de téléphone du domicile"</string>
-    <string name="sms_mobile" msgid="8883045857887736518">"Envoyer un SMS au numéro de téléphone mobile"</string>
-    <string name="sms_work" msgid="4158595439553450966">"Envoyer un SMS au numéro de téléphone professionnel"</string>
-    <string name="sms_fax_work" msgid="5483726627718055248">"Envoyer un SMS au numéro de télécopie professionnel"</string>
-    <string name="sms_fax_home" msgid="9219265155770746077">"Envoyer un SMS au numéro de télécopie du domicile"</string>
-    <string name="sms_pager" msgid="4901085068525193933">"Envoyer un SMS au téléavertisseur"</string>
-    <string name="sms_other" msgid="1742702947993285933">"Envoyer un SMS"</string>
-    <string name="sms_callback" msgid="5833483630377538308">"Envoyer un SMS au numéro de rappel"</string>
-    <string name="sms_car" msgid="4314577266154395174">"Envoyer un SMS au numéro de téléphone de la voiture"</string>
-    <string name="sms_company_main" msgid="2308160928487360705">"Envoyer un SMS au numéro de téléphone principal de l\'entreprise"</string>
-    <string name="sms_isdn" msgid="6394300346179302542">"Envoyer un SMS au numéro de téléphone RNIS"</string>
-    <string name="sms_main" msgid="8908087742014140774">"Envoyer un SMS au numéro de téléphone principal"</string>
-    <string name="sms_other_fax" msgid="8768455473295405427">"Envoyer un SMS au numéro de télécopie"</string>
-    <string name="sms_radio" msgid="855555176531704682">"Envoyer un SMS par signal radio"</string>
-    <string name="sms_telex" msgid="6269029276223252719">"Envoyer un SMS par télex"</string>
-    <string name="sms_tty_tdd" msgid="6229057354509192444">"Envoyer un SMS au numéro TTY/TDD (malentendants)"</string>
-    <string name="sms_work_mobile" msgid="2155975469329969840">"Envoyer un SMS au numéro de téléphone mobile professionnel"</string>
-    <string name="sms_work_pager" msgid="8500140274906830742">"Envoyer un SMS au téléavertisseur professionnel"</string>
-    <string name="sms_assistant" msgid="8513548482745330818">"Envoyer un SMS au <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
-    <string name="sms_mms" msgid="5187888900503248542">"Envoyer un SMS au numéro de téléph MMS"</string>
-    <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"Effacer les contacts fréquents?"</string>
-    <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"Cette opération efface la liste des personnes avec qui vous communiquez le plus souvent dans les applications Contacts et Téléphone, et forcera les applications de courriel à mémoriser de nouveau les adresses que vous utilisez le plus."</string>
-    <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"Suppression des contacts fréquents…"</string>
-    <string name="status_available" msgid="2648156525685472626">"Disponible"</string>
-    <string name="status_away" msgid="2298688367552893953">"Absent"</string>
-    <string name="status_busy" msgid="5990832098713248503">"Occupé(e)"</string>
-    <string name="contactsList" msgid="8806067891419291513">"Contacts"</string>
-    <string name="contact_suggestions" msgid="3324166754807120006">"Meilleures suggestions"</string>
-    <string name="local_invisible_directory" msgid="4723238462733650090">"Autre"</string>
-    <string name="directory_search_label" msgid="4621215895484025229">"Répertoire"</string>
-    <string name="directory_search_label_work" msgid="7679326282707414897">"Annuaire professionnel"</string>
-    <string name="local_search_label" msgid="907622822323119235">"Tous les contacts"</string>
-    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Suggestions"</string>
-    <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Moi"</string>
-    <string name="missing_name" msgid="978606963362745020">"(Sans nom)"</string>
-    <string name="description_view_contact_detail" msgid="2428742401208561136">"Afficher le contact"</string>
-    <string name="list_filter_phones" msgid="8763316061763437182">"Tous les contacts disposant d\'un numéro de téléphone"</string>
-    <string name="list_filter_phones_work" msgid="7083575404573422965">"Contacts du profil professionnel"</string>
-    <string name="view_updates_from_group" msgid="9011641093168385729">"Afficher les mises à jour"</string>
-    <string name="account_phone" msgid="7067809073194061035">"Appareil uniquement, sans synchronisation"</string>
-    <string name="nameLabelsGroup" msgid="7730465833159557471">"Nom"</string>
-    <string name="nicknameLabelsGroup" msgid="6310556912361840029">"Pseudo"</string>
-    <string name="full_name" msgid="648186563998465740">"Nom"</string>
-    <string name="name_given" msgid="5096576006314820536">"Prénom"</string>
-    <string name="name_family" msgid="6646235805198547467">"Nom de famille"</string>
-    <string name="name_prefix" msgid="9215326539658838">"Préfixe du nom"</string>
-    <string name="name_middle" msgid="703755205331582769">"Deuxième prénom"</string>
-    <string name="name_suffix" msgid="5777083390282548702">"Suffixe du nom"</string>
-    <string name="name_phonetic" msgid="1650870996361663089">"Nom phonétique"</string>
-    <string name="name_phonetic_given" msgid="618812334274603170">"Prononciation du prénom"</string>
-    <string name="name_phonetic_middle" msgid="4826820763384625538">"Deuxième prénom phonétique"</string>
-    <string name="name_phonetic_family" msgid="379905191212930771">"Prononciation du nom de famille"</string>
-    <string name="phoneLabelsGroup" msgid="169661929021355548">"Téléphone"</string>
-    <string name="emailLabelsGroup" msgid="2249752810477488833">"Envoyer un courriel"</string>
-    <string name="postalLabelsGroup" msgid="6772000590189142253">"Adresse"</string>
-    <string name="imLabelsGroup" msgid="5718066254237364731">"MI"</string>
-    <string name="organizationLabelsGroup" msgid="1101996309241601435">"Organisation"</string>
-    <string name="relationLabelsGroup" msgid="53866051664600053">"Relation"</string>
-    <string name="eventLabelsGroup" msgid="1236970042646618489">"Date spéciale"</string>
-    <string name="sms" msgid="7574344928185328095">"Message texte"</string>
-    <string name="postal_address" msgid="1804707930129674200">"Adresse"</string>
-    <string name="ghostData_company" msgid="2554310786296833424">"Entreprise"</string>
-    <string name="ghostData_title" msgid="4994968731830184837">"Titre"</string>
-    <string name="label_notes" msgid="2050255313694219786">"Remarques"</string>
-    <string name="label_sip_address" msgid="8883266182575965926">"SIP"</string>
-    <string name="websiteLabelsGroup" msgid="1630734286462186790">"Site Web"</string>
-    <string name="groupsLabel" msgid="2694002798416868728">"Groupes"</string>
-    <string name="email_home" msgid="889830029388962171">"Envoyer un courriel au domicile"</string>
-    <string name="email_mobile" msgid="4487686436743741150">"Envoyer un courriel sur le mobile"</string>
-    <string name="email_work" msgid="4223487303344613528">"Envoyer un courriel au bureau"</string>
-    <string name="email_other" msgid="4246411900126012062">"Envoyer un courriel"</string>
-    <string name="email_custom" msgid="7246580894327511013">"Envoyer un courriel à <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="email" msgid="2807318537887091606">"Envoyer un courriel"</string>
-    <string name="postal_street" msgid="6918171741240802474">"Rue"</string>
-    <string name="postal_city" msgid="8674569121430005628">"Ville"</string>
-    <string name="postal_region" msgid="1730369286225469192">"État/province"</string>
-    <string name="postal_postcode" msgid="4450700741261990439">"Code postal"</string>
-    <string name="postal_country" msgid="232670707458768148">"Pays"</string>
-    <string name="map_home" msgid="4181131107392126938">"Afficher l\'adresse personnelle"</string>
-    <string name="map_work" msgid="5723471185992684400">"Afficher l\'adresse professionnelle"</string>
-    <string name="map_other" msgid="2253764780863500516">"Afficher l\'adresse"</string>
-    <string name="map_custom" msgid="5581743097882436157">"Afficher l\'adresse <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="chat_aim" msgid="2954364435497941659">"Clavarder via AIM"</string>
-    <string name="chat_msn" msgid="3130135239071228678">"Clavarder via Windows Live"</string>
-    <string name="chat_yahoo" msgid="3233552142326865347">"Clavarder via Yahoo!"</string>
-    <string name="chat_skype" msgid="6486703981390592425">"Clavarder via Skype"</string>
-    <string name="chat_qq" msgid="786924280665740019">"Clavarder via QQ"</string>
-    <string name="chat_gtalk" msgid="7914674177243078035">"Clavarder via Google Talk"</string>
-    <string name="chat_icq" msgid="3292934726414765801">"Clavarder via ICQ"</string>
-    <string name="chat_jabber" msgid="6701542313597880204">"Clavarder via Jabber"</string>
-    <string name="chat" msgid="1020428260359370236">"Clavarder"</string>
-    <string name="list_filter_all_accounts" msgid="473782314881473992">"Tous les contacts"</string>
-    <string name="listAllContactsInAccount" msgid="3486378621592995630">"Contacts du compte \"<xliff:g id="NAME">%s</xliff:g>\""</string>
-    <string name="listCustomView" msgid="5306282632413086731">"Contacts en affichage personnalisé"</string>
-    <string name="listSingleContact" msgid="8620818791932382627">"Contact"</string>
-    <string name="display_options_sort_list_by" msgid="3541875948367831228">"Trier par"</string>
-    <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"Prénom"</string>
-    <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"Nom de famille"</string>
-    <string name="display_options_view_names_as" msgid="4204204205736735618">"Format de nom"</string>
-    <string name="display_options_view_given_name_first" msgid="2308026973021171020">"Prénom en premier"</string>
-    <string name="display_options_view_family_name_first" msgid="987430497292428242">"Nom de famille en premier"</string>
-    <string name="menu_clear_frequents" msgid="5358271535047496120">"Effacer les contacts fréquents"</string>
-    <string name="action_menu_back_from_search" msgid="3550669942742167644">"arrêter la recherche"</string>
-    <string name="description_clear_search" msgid="2347258825265600782">"Effacer les termes de recherche"</string>
-    <string name="select_account_dialog_title" msgid="2673504582803359239">"Compte"</string>
-    <string name="set_default_account" msgid="7966099951006467572">"Toujours l\'utiliser pour les appels"</string>
-    <string name="select_phone_account_for_calls" msgid="1784460686103423274">"Appeler avec"</string>
-    <string name="call_with_a_note" msgid="6242261320491851133">"Appeler avec une note"</string>
-    <string name="call_subject_hint" msgid="7233138753650420800">"Tapez une note à envoyer avec l\'appel..."</string>
-    <string name="send_and_call_button" msgid="4735168294120154013">"ENVOYER ET APPELER"</string>
-    <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g>/<xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> : <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="tab_title" msgid="3387876802026074288">"Onglet <xliff:g id="TITLE">%1$s</xliff:g>."</string>
-    <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
-      <item quantity="one"> Onglet <xliff:g id="TITLE_2">%1$s</xliff:g>. <xliff:g id="COUNT_3">%2$d</xliff:g> élément non lu. </item>
-      <item quantity="other"> Onglet <xliff:g id="TITLE_2">%1$s</xliff:g>. <xliff:g id="COUNT_3">%2$d</xliff:g> éléments non lus. </item>
-    </plurals>
-    <string name="description_search_video_call" msgid="4337369876888024909">"Appel vidéo"</string>
-    <string name="description_search_call_and_share" msgid="4912772842755050467">"Partager et appeler"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_custom">Appeler le %s</string>
+  <string name="call_home">Appeler le numéro de téléphone du domicile</string>
+  <string name="call_mobile">Appeler le numéro de téléphone mobile</string>
+  <string name="call_work">Appeler le numéro de téléphone professionnel</string>
+  <string name="call_fax_work">Appeler le numéro de télécopie professionnel</string>
+  <string name="call_fax_home">Appeler le numéro de télécopie du domicile</string>
+  <string name="call_pager">Appeler le téléavertisseur</string>
+  <string name="call_other">Appeler</string>
+  <string name="call_callback">Appeler le numéro de rappel</string>
+  <string name="call_car">Appeler le numéro de télphone de la voiture</string>
+  <string name="call_company_main">Appeler le numéro de téléphone principal de l\'entreprise</string>
+  <string name="call_isdn">Appeler le numéro de téléphone RNIS</string>
+  <string name="call_main">Appeler le numéro de téléphone principal</string>
+  <string name="call_other_fax">Appeler le numéro de télécopie</string>
+  <string name="call_radio">Appeler par signal radio</string>
+  <string name="call_telex">Appeler par télex</string>
+  <string name="call_tty_tdd">Appeler le numéro TTY/TDD (malentendants)</string>
+  <string name="call_work_mobile">Appeler le numéro de téléphone mobile professionnel</string>
+  <string name="call_work_pager">Appeler le téléavertisseur professionnel</string>
+  <string name="call_assistant">Appeler le %s</string>
+  <string name="call_mms">Appeler le numéro de téléphone MMS</string>
+  <string name="sms_custom">Envoyer un SMS au %s</string>
+  <string name="sms_home">Envoyer un SMS au numéro de téléphone du domicile</string>
+  <string name="sms_mobile">Envoyer un SMS au numéro de téléphone mobile</string>
+  <string name="sms_work">Envoyer un SMS au numéro de téléphone professionnel</string>
+  <string name="sms_fax_work">Envoyer un SMS au numéro de télécopie professionnel</string>
+  <string name="sms_fax_home">Envoyer un SMS au numéro de télécopie du domicile</string>
+  <string name="sms_pager">Envoyer un SMS au téléavertisseur</string>
+  <string name="sms_other">Envoyer un SMS</string>
+  <string name="sms_callback">Envoyer un SMS au numéro de rappel</string>
+  <string name="sms_car">Envoyer un SMS au numéro de téléphone de la voiture</string>
+  <string name="sms_company_main">Envoyer un SMS au numéro de téléphone principal de l\'entreprise</string>
+  <string name="sms_isdn">Envoyer un SMS au numéro de téléphone RNIS</string>
+  <string name="sms_main">Envoyer un SMS au numéro de téléphone principal</string>
+  <string name="sms_other_fax">Envoyer un SMS au numéro de télécopie</string>
+  <string name="sms_radio">Envoyer un SMS par signal radio</string>
+  <string name="sms_telex">Envoyer un SMS par télex</string>
+  <string name="sms_tty_tdd">Envoyer un SMS au numéro TTY/TDD (malentendants)</string>
+  <string name="sms_work_mobile">Envoyer un SMS au numéro de téléphone mobile professionnel</string>
+  <string name="sms_work_pager">Envoyer un SMS au téléavertisseur professionnel</string>
+  <string name="sms_assistant">Envoyer un SMS au %s</string>
+  <string name="sms_mms">Envoyer un SMS au numéro de téléph MMS</string>
+  <string name="clearFrequentsConfirmation_title">Effacer les contacts fréquents?</string>
+  <string name="clearFrequentsConfirmation">Cette opération efface la liste des personnes avec qui vous communiquez le plus souvent dans les applications Contacts et Téléphone, et forcera les applications de courriel à mémoriser de nouveau les adresses que vous utilisez le plus.</string>
+  <string name="clearFrequentsProgress_title">Suppression des contacts fréquents…</string>
+  <string name="status_available">Disponible</string>
+  <string name="status_away">Absent</string>
+  <string name="status_busy">Occupé(e)</string>
+  <string name="contactsList">Contacts</string>
+  <string name="contact_suggestions">Meilleures suggestions</string>
+  <string name="local_invisible_directory">Autre</string>
+  <string name="directory_search_label">Répertoire</string>
+  <string name="directory_search_label_work">Annuaire professionnel</string>
+  <string name="local_search_label">Tous les contacts</string>
+  <string name="local_suggestions_search_label">Suggestions</string>
+  <string msgid="9154761216179882405" name="user_profile_contacts_list_header">Moi</string>
+  <string name="missing_name">(Sans nom)</string>
+  <string msgid="2795575601596468581" name="description_view_contact_detail">Afficher le contact</string>
+  <string name="list_filter_phones">Tous les contacts disposant d\'un numéro de téléphone</string>
+  <string name="list_filter_phones_work">Contacts du profil professionnel</string>
+  <string name="view_updates_from_group">Afficher les mises à jour</string>
+  <string name="account_phone">Appareil uniquement, sans synchronisation</string>
+  <string name="nameLabelsGroup">Nom</string>
+  <string name="nicknameLabelsGroup">Pseudo</string>
+  <string name="full_name">Nom</string>
+  <string name="name_given">Prénom</string>
+  <string name="name_family">Nom de famille</string>
+  <string name="name_prefix">Préfixe du nom</string>
+  <string name="name_middle">Deuxième prénom</string>
+  <string name="name_suffix">Suffixe du nom</string>
+  <string name="name_phonetic">Nom phonétique</string>
+  <string name="name_phonetic_given">Prononciation du prénom</string>
+  <string name="name_phonetic_middle">Deuxième prénom phonétique</string>
+  <string name="name_phonetic_family">Prononciation du nom de famille</string>
+  <string name="phoneLabelsGroup">Téléphone</string>
+  <string name="emailLabelsGroup">Envoyer un courriel</string>
+  <string name="postalLabelsGroup">Adresse</string>
+  <string name="imLabelsGroup">MI</string>
+  <string name="organizationLabelsGroup">Organisation</string>
+  <string name="relationLabelsGroup">Relation</string>
+  <string name="eventLabelsGroup">Date spéciale</string>
+  <string name="sms">Message texte</string>
+  <string name="postal_address">Adresse</string>
+  <string name="ghostData_company">Entreprise</string>
+  <string name="ghostData_title">Titre</string>
+  <string name="label_notes">Remarques</string>
+  <string name="label_sip_address">SIP</string>
+  <string name="websiteLabelsGroup">Site Web</string>
+  <string name="groupsLabel">Groupes</string>
+  <string name="email_home">Envoyer un courriel au domicile</string>
+  <string name="email_mobile">Envoyer un courriel sur le mobile</string>
+  <string name="email_work">Envoyer un courriel au bureau</string>
+  <string name="email_other">Envoyer un courriel</string>
+  <string name="email_custom">Envoyer un courriel à %s</string>
+  <string name="email">Envoyer un courriel</string>
+  <string name="postal_street">Rue</string>
+  <string name="postal_city">Ville</string>
+  <string name="postal_region">État/province</string>
+  <string name="postal_postcode">Code postal</string>
+  <string name="postal_country">Pays</string>
+  <string name="map_home">Afficher l\'adresse personnelle</string>
+  <string name="map_work">Afficher l\'adresse professionnelle</string>
+  <string name="map_other">Afficher l\'adresse</string>
+  <string name="map_custom">Afficher l\'adresse %s</string>
+  <string name="chat_aim">Clavarder via AIM</string>
+  <string name="chat_msn">Clavarder via Windows Live</string>
+  <string name="chat_yahoo">Clavarder via Yahoo!</string>
+  <string name="chat_skype">Clavarder via Skype</string>
+  <string name="chat_qq">Clavarder via QQ</string>
+  <string name="chat_gtalk">Clavarder via Google Talk</string>
+  <string name="chat_icq">Clavarder via ICQ</string>
+  <string name="chat_jabber">Clavarder via Jabber</string>
+  <string name="chat">Clavarder</string>
+  <string name="list_filter_all_accounts">Tous les contacts</string>
+  <string name="listAllContactsInAccount">Contacts du compte \"%s\"</string>
+  <string name="listCustomView">Contacts en affichage personnalisé</string>
+  <string name="listSingleContact">Contact</string>
+  <string name="display_options_sort_list_by">Trier par</string>
+  <string name="display_options_sort_by_given_name">Prénom</string>
+  <string name="display_options_sort_by_family_name">Nom de famille</string>
+  <string name="display_options_view_names_as">Format de nom</string>
+  <string name="display_options_view_given_name_first">Prénom en premier</string>
+  <string name="display_options_view_family_name_first">Nom de famille en premier</string>
+  <string name="menu_clear_frequents">Effacer les contacts fréquents</string>
+  <string name="action_menu_back_from_search">arrêter la recherche</string>
+  <string name="description_clear_search">Effacer les termes de recherche</string>
+  <string name="select_account_dialog_title">Compte</string>
+  <string name="set_default_account">Toujours l\'utiliser pour les appels</string>
+  <string name="select_phone_account_for_calls">Choisir une carte SIM pour cet appel</string>
+  <string name="select_phone_account_for_calls_remember">Mémoriser ce choix</string>
+  <string name="call_with_a_note">Appeler avec une note</string>
+  <string name="call_subject_hint">Tapez une note à envoyer avec l\'appel...</string>
+  <string name="send_and_call_button">ENVOYER ET APPELER</string>
+  <string name="call_subject_limit">%1$s/%2$s</string>
+  <string name="old_call_subject_type_and_number">%1$s %2$s</string>
+  <string name="tab_title">Onglet %1$s.</string>
+  <plurals name="tab_title_with_unread_items">
+    <item quantity="one"> Onglet %1$s. %2$d élément non lu. </item>
+    <item quantity="other"> Onglet %1$s. %2$d éléments non lus. </item>
+  </plurals>
+  <string name="description_search_video_call">Appel vidéo</string>
+  <string name="description_search_call_and_share">Partager et appeler</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-fr/strings.xml b/java/com/android/contacts/common/res/values-fr/strings.xml
index a3955bb..9ba9dd1 100644
--- a/java/com/android/contacts/common/res/values-fr/strings.xml
+++ b/java/com/android/contacts/common/res/values-fr/strings.xml
@@ -1,162 +1,145 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="toast_text_copied" msgid="8979281391599667362">"Texte copié"</string>
-    <string name="call_custom" msgid="3041673234638990874">"Appeler le <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="call_home" msgid="125893483593803791">"Appeler le numéro de téléphone du domicile"</string>
-    <string name="call_mobile" msgid="967589404494150813">"Appeler le numéro de téléphone mobile"</string>
-    <string name="call_work" msgid="6040550697395300892">"Appeler le numéro de téléphone professionnel"</string>
-    <string name="call_fax_work" msgid="5260192771364592922">"Appeler le numéro de télécopie professionnel"</string>
-    <string name="call_fax_home" msgid="5174311195081144124">"Appeler le numéro de télécopie du domicile"</string>
-    <string name="call_pager" msgid="6814149227741274161">"Appeler le téléavertisseur"</string>
-    <string name="call_other" msgid="5536385588712587235">"Appeler"</string>
-    <string name="call_callback" msgid="6314019862718112786">"Appeler le numéro de rappel"</string>
-    <string name="call_car" msgid="3197417098027764954">"Appeler le numéro de téléphone de la voiture"</string>
-    <string name="call_company_main" msgid="2557663310028446397">"Appeler le numéro de téléphone principal de l\'entreprise"</string>
-    <string name="call_isdn" msgid="4691270442763649522">"Appeler le numéro de téléphone RNIS"</string>
-    <string name="call_main" msgid="3293707608770407814">"Appeler le numéro de téléphone principal"</string>
-    <string name="call_other_fax" msgid="4724521984879021465">"Appeler le numéro de télécopie"</string>
-    <string name="call_radio" msgid="8942441419845057942">"Appeler par signal radio"</string>
-    <string name="call_telex" msgid="2031514461660668351">"Appeler par télex"</string>
-    <string name="call_tty_tdd" msgid="7807210224965727701">"Appeler le numéro TTY/TDD (malentendants)"</string>
-    <string name="call_work_mobile" msgid="2716342732938578495">"Appeler le numéro de téléphone mobile professionnel"</string>
-    <string name="call_work_pager" msgid="3791778749827366574">"Appeler le téléavertisseur professionnel"</string>
-    <string name="call_assistant" msgid="4177478845473789294">"Appeler le <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
-    <string name="call_mms" msgid="4958811711741872901">"Appeler le numéro de téléphone MMS"</string>
-    <string name="sms_custom" msgid="8785368968605026317">"Envoyer un SMS au <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="sms_home" msgid="3527719551060295243">"Envoyer un SMS au numéro de téléphone du domicile"</string>
-    <string name="sms_mobile" msgid="8883045857887736518">"Envoyer un SMS au numéro de téléphone mobile"</string>
-    <string name="sms_work" msgid="4158595439553450966">"Envoyer un SMS au numéro de téléphone professionnel"</string>
-    <string name="sms_fax_work" msgid="5483726627718055248">"Envoyer un SMS au numéro de télécopie professionnel"</string>
-    <string name="sms_fax_home" msgid="9219265155770746077">"Envoyer un SMS au numéro de télécopie du domicile"</string>
-    <string name="sms_pager" msgid="4901085068525193933">"Envoyer un SMS au téléavertisseur"</string>
-    <string name="sms_other" msgid="1742702947993285933">"Envoyer un SMS"</string>
-    <string name="sms_callback" msgid="5833483630377538308">"Envoyer un SMS au numéro de rappel"</string>
-    <string name="sms_car" msgid="4314577266154395174">"Envoyer un SMS au numéro de téléphone de la voiture"</string>
-    <string name="sms_company_main" msgid="2308160928487360705">"Envoyer un SMS au numéro de téléphone principal de l\'entreprise"</string>
-    <string name="sms_isdn" msgid="6394300346179302542">"Envoyer un SMS au numéro de téléphone RNIS"</string>
-    <string name="sms_main" msgid="8908087742014140774">"Envoyer un SMS au numéro de téléphone principal"</string>
-    <string name="sms_other_fax" msgid="8768455473295405427">"Envoyer un SMS au numéro de télécopie"</string>
-    <string name="sms_radio" msgid="855555176531704682">"Envoyer un SMS par signal radio"</string>
-    <string name="sms_telex" msgid="6269029276223252719">"Envoyer un SMS par télex"</string>
-    <string name="sms_tty_tdd" msgid="6229057354509192444">"Envoyer un SMS au numéro TTY/TDD (malentendants)"</string>
-    <string name="sms_work_mobile" msgid="2155975469329969840">"Envoyer un SMS au numéro de téléphone mobile professionnel"</string>
-    <string name="sms_work_pager" msgid="8500140274906830742">"Envoyer un SMS au téléavertisseur professionnel"</string>
-    <string name="sms_assistant" msgid="8513548482745330818">"Envoyer un SMS au <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
-    <string name="sms_mms" msgid="5187888900503248542">"Envoyer un SMS au numéro de téléphone MMS"</string>
-    <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"Effacer les contacts fréquents ?"</string>
-    <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"Cette opération efface la liste des personnes que vous contactez le plus souvent dans les applications Contacts et Téléphone, et entraîne une réinitialisation des adresses mémorisées comme celles que vous utilisez le plus fréquemment dans vos applications de messagerie électronique."</string>
-    <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"Suppression des contacts fréquents…"</string>
-    <string name="status_available" msgid="2648156525685472626">"Disponible"</string>
-    <string name="status_away" msgid="2298688367552893953">"Absent"</string>
-    <string name="status_busy" msgid="5990832098713248503">"Occupé"</string>
-    <string name="contactsList" msgid="8806067891419291513">"Contacts"</string>
-    <string name="contact_suggestions" msgid="3324166754807120006">"Principaux dossiers recommandés"</string>
-    <string name="local_invisible_directory" msgid="4723238462733650090">"Autre"</string>
-    <string name="directory_search_label" msgid="4621215895484025229">"Répertoire"</string>
-    <string name="directory_search_label_work" msgid="7679326282707414897">"Contacts professionnels"</string>
-    <string name="local_search_label" msgid="907622822323119235">"Tous les contacts"</string>
-    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Suggestions"</string>
-    <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Moi"</string>
-    <string name="missing_name" msgid="978606963362745020">"(Sans nom)"</string>
-    <string name="description_view_contact_detail" msgid="2428742401208561136">"Afficher le contact"</string>
-    <string name="list_filter_phones" msgid="8763316061763437182">"Tous les contacts disposant d\'un numéro de téléphone"</string>
-    <string name="list_filter_phones_work" msgid="7083575404573422965">"Contacts du profil professionnel"</string>
-    <string name="view_updates_from_group" msgid="9011641093168385729">"Afficher les mises à jour"</string>
-    <string name="account_phone" msgid="7067809073194061035">"Appareil uniquement, non synchronisé"</string>
-    <string name="nameLabelsGroup" msgid="7730465833159557471">"Nom"</string>
-    <string name="nicknameLabelsGroup" msgid="6310556912361840029">"Pseudo"</string>
-    <string name="full_name" msgid="648186563998465740">"Nom"</string>
-    <string name="name_given" msgid="5096576006314820536">"Prénom"</string>
-    <string name="name_family" msgid="6646235805198547467">"Nom"</string>
-    <string name="name_prefix" msgid="9215326539658838">"Préfixe du nom"</string>
-    <string name="name_middle" msgid="703755205331582769">"Deuxième prénom"</string>
-    <string name="name_suffix" msgid="5777083390282548702">"Suffixe du nom"</string>
-    <string name="name_phonetic" msgid="1650870996361663089">"Nom phonétique"</string>
-    <string name="name_phonetic_given" msgid="618812334274603170">"Prénom phonétique"</string>
-    <string name="name_phonetic_middle" msgid="4826820763384625538">"2e prénom phonétique"</string>
-    <string name="name_phonetic_family" msgid="379905191212930771">"Nom phonétique"</string>
-    <string name="phoneLabelsGroup" msgid="169661929021355548">"Téléphone"</string>
-    <string name="emailLabelsGroup" msgid="2249752810477488833">"Envoyer un e-mail"</string>
-    <string name="postalLabelsGroup" msgid="6772000590189142253">"Adresse"</string>
-    <string name="imLabelsGroup" msgid="5718066254237364731">"Chat"</string>
-    <string name="organizationLabelsGroup" msgid="1101996309241601435">"Organisation"</string>
-    <string name="relationLabelsGroup" msgid="53866051664600053">"Type de relation"</string>
-    <string name="eventLabelsGroup" msgid="1236970042646618489">"Occasion spéciale"</string>
-    <string name="sms" msgid="7574344928185328095">"SMS"</string>
-    <string name="postal_address" msgid="1804707930129674200">"Adresse"</string>
-    <string name="ghostData_company" msgid="2554310786296833424">"Entreprise"</string>
-    <string name="ghostData_title" msgid="4994968731830184837">"Titre"</string>
-    <string name="label_notes" msgid="2050255313694219786">"Remarques"</string>
-    <string name="label_sip_address" msgid="8883266182575965926">"Adresse SIP"</string>
-    <string name="websiteLabelsGroup" msgid="1630734286462186790">"Site Web"</string>
-    <string name="groupsLabel" msgid="2694002798416868728">"Groupes"</string>
-    <string name="email_home" msgid="889830029388962171">"Envoyer un e-mail au domicile"</string>
-    <string name="email_mobile" msgid="4487686436743741150">"Envoyer un e-mail sur le mobile"</string>
-    <string name="email_work" msgid="4223487303344613528">"Envoyer un e-mail au bureau"</string>
-    <string name="email_other" msgid="4246411900126012062">"Envoyer un e-mail"</string>
-    <string name="email_custom" msgid="7246580894327511013">"Envoyer un e-mail à <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="email" msgid="2807318537887091606">"Envoyer un e-mail"</string>
-    <string name="postal_street" msgid="6918171741240802474">"Rue"</string>
-    <string name="postal_city" msgid="8674569121430005628">"Ville"</string>
-    <string name="postal_region" msgid="1730369286225469192">"État"</string>
-    <string name="postal_postcode" msgid="4450700741261990439">"Code postal"</string>
-    <string name="postal_country" msgid="232670707458768148">"Pays"</string>
-    <string name="map_home" msgid="4181131107392126938">"Afficher l\'adresse personnelle"</string>
-    <string name="map_work" msgid="5723471185992684400">"Afficher l\'adresse professionnelle"</string>
-    <string name="map_other" msgid="2253764780863500516">"Afficher l\'adresse"</string>
-    <string name="map_custom" msgid="5581743097882436157">"Afficher l\'adresse <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="chat_aim" msgid="2954364435497941659">"Chatter via AIM"</string>
-    <string name="chat_msn" msgid="3130135239071228678">"Chatter via Windows Live"</string>
-    <string name="chat_yahoo" msgid="3233552142326865347">"Chatter via Yahoo!"</string>
-    <string name="chat_skype" msgid="6486703981390592425">"Chatter via Skype"</string>
-    <string name="chat_qq" msgid="786924280665740019">"Chatter via QQ"</string>
-    <string name="chat_gtalk" msgid="7914674177243078035">"Chatter via Google Talk"</string>
-    <string name="chat_icq" msgid="3292934726414765801">"Chatter via ICQ"</string>
-    <string name="chat_jabber" msgid="6701542313597880204">"Chatter via Jabber"</string>
-    <string name="chat" msgid="1020428260359370236">"Chat"</string>
-    <string name="list_filter_all_accounts" msgid="473782314881473992">"Tous les contacts"</string>
-    <string name="listAllContactsInAccount" msgid="3486378621592995630">"Contacts du compte \"<xliff:g id="NAME">%s</xliff:g>\""</string>
-    <string name="listCustomView" msgid="5306282632413086731">"Contacts avec affichage perso."</string>
-    <string name="listSingleContact" msgid="8620818791932382627">"Contact"</string>
-    <string name="display_options_sort_list_by" msgid="3541875948367831228">"Trier par"</string>
-    <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"Prénom"</string>
-    <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"Nom"</string>
-    <string name="display_options_view_names_as" msgid="4204204205736735618">"Format du nom"</string>
-    <string name="display_options_view_given_name_first" msgid="2308026973021171020">"Prénom en premier"</string>
-    <string name="display_options_view_family_name_first" msgid="987430497292428242">"Nom en premier"</string>
-    <string name="menu_clear_frequents" msgid="5358271535047496120">"Effacer les contacts fréquents"</string>
-    <string name="action_menu_back_from_search" msgid="3550669942742167644">"arrêter la recherche"</string>
-    <string name="description_clear_search" msgid="2347258825265600782">"Effacer la recherche"</string>
-    <string name="select_account_dialog_title" msgid="2673504582803359239">"Compte"</string>
-    <string name="set_default_account" msgid="7966099951006467572">"Toujours l\'utiliser pour les appels"</string>
-    <string name="select_phone_account_for_calls" msgid="1784460686103423274">"Appeler avec"</string>
-    <string name="call_with_a_note" msgid="6242261320491851133">"Appeler avec une note"</string>
-    <string name="call_subject_hint" msgid="7233138753650420800">"Saisissez une note pour accompagner l\'appel..."</string>
-    <string name="send_and_call_button" msgid="4735168294120154013">"ENVOYER ET APPELER"</string>
-    <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g>/<xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="tab_title" msgid="3387876802026074288">"Onglet <xliff:g id="TITLE">%1$s</xliff:g>."</string>
-    <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
-      <item quantity="one"> Onglet <xliff:g id="TITLE_2">%1$s</xliff:g>. <xliff:g id="COUNT_3">%2$d</xliff:g> élément non lu. </item>
-      <item quantity="other"> Onglet <xliff:g id="TITLE_2">%1$s</xliff:g>. <xliff:g id="COUNT_3">%2$d</xliff:g> éléments non lus. </item>
-    </plurals>
-    <string name="description_search_video_call" msgid="4337369876888024909">"Appel vidéo"</string>
-    <string name="description_search_call_and_share" msgid="4912772842755050467">"Partager et appeler"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_custom">Appeler le %s</string>
+  <string name="call_home">Appeler le numéro de téléphone du domicile</string>
+  <string name="call_mobile">Appeler le numéro de téléphone mobile</string>
+  <string name="call_work">Appeler le numéro de téléphone professionnel</string>
+  <string name="call_fax_work">Appeler le numéro de télécopie professionnel</string>
+  <string name="call_fax_home">Appeler le numéro de télécopie du domicile</string>
+  <string name="call_pager">Appeler le téléavertisseur</string>
+  <string name="call_other">Appeler</string>
+  <string name="call_callback">Appeler le numéro de rappel</string>
+  <string name="call_car">Appeler le numéro de téléphone de la voiture</string>
+  <string name="call_company_main">Appeler le numéro de téléphone principal de l\'entreprise</string>
+  <string name="call_isdn">Appeler le numéro de téléphone RNIS</string>
+  <string name="call_main">Appeler le numéro de téléphone principal</string>
+  <string name="call_other_fax">Appeler le numéro de télécopie</string>
+  <string name="call_radio">Appeler par signal radio</string>
+  <string name="call_telex">Appeler par télex</string>
+  <string name="call_tty_tdd">Appeler le numéro TTY/TDD (malentendants)</string>
+  <string name="call_work_mobile">Appeler le numéro de téléphone mobile professionnel</string>
+  <string name="call_work_pager">Appeler le téléavertisseur professionnel</string>
+  <string name="call_assistant">Appeler le %s</string>
+  <string name="call_mms">Appeler le numéro de téléphone MMS</string>
+  <string name="sms_custom">Envoyer un SMS au %s</string>
+  <string name="sms_home">Envoyer un SMS au numéro de téléphone du domicile</string>
+  <string name="sms_mobile">Envoyer un SMS au numéro de téléphone mobile</string>
+  <string name="sms_work">Envoyer un SMS au numéro de téléphone professionnel</string>
+  <string name="sms_fax_work">Envoyer un SMS au numéro de télécopie professionnel</string>
+  <string name="sms_fax_home">Envoyer un SMS au numéro de télécopie du domicile</string>
+  <string name="sms_pager">Envoyer un SMS au téléavertisseur</string>
+  <string name="sms_other">Envoyer un SMS</string>
+  <string name="sms_callback">Envoyer un SMS au numéro de rappel</string>
+  <string name="sms_car">Envoyer un SMS au numéro de téléphone de la voiture</string>
+  <string name="sms_company_main">Envoyer un SMS au numéro de téléphone principal de l\'entreprise</string>
+  <string name="sms_isdn">Envoyer un SMS au numéro de téléphone RNIS</string>
+  <string name="sms_main">Envoyer un SMS au numéro de téléphone principal</string>
+  <string name="sms_other_fax">Envoyer un SMS au numéro de télécopie</string>
+  <string name="sms_radio">Envoyer un SMS par signal radio</string>
+  <string name="sms_telex">Envoyer un SMS par télex</string>
+  <string name="sms_tty_tdd">Envoyer un SMS au numéro TTY/TDD (malentendants)</string>
+  <string name="sms_work_mobile">Envoyer un SMS au numéro de téléphone mobile professionnel</string>
+  <string name="sms_work_pager">Envoyer un SMS au téléavertisseur professionnel</string>
+  <string name="sms_assistant">Envoyer un SMS au %s</string>
+  <string name="sms_mms">Envoyer un SMS au numéro de téléphone MMS</string>
+  <string name="clearFrequentsConfirmation_title">Effacer les contacts fréquents ?</string>
+  <string name="clearFrequentsConfirmation">Cette opération efface la liste des personnes que vous contactez le plus souvent dans les applications Contacts et Téléphone, et entraîne une réinitialisation des adresses mémorisées comme celles que vous utilisez le plus fréquemment dans vos applications de messagerie électronique.</string>
+  <string name="clearFrequentsProgress_title">Suppression des contacts fréquents…</string>
+  <string name="status_available">Disponible</string>
+  <string name="status_away">Absent</string>
+  <string name="status_busy">Occupé</string>
+  <string name="contactsList">Contacts</string>
+  <string name="contact_suggestions">Principaux dossiers recommandés</string>
+  <string name="local_invisible_directory">Autre</string>
+  <string name="directory_search_label">Répertoire</string>
+  <string name="directory_search_label_work">Contacts professionnels</string>
+  <string name="local_search_label">Tous les contacts</string>
+  <string name="local_suggestions_search_label">Suggestions</string>
+  <string msgid="9154761216179882405" name="user_profile_contacts_list_header">Moi</string>
+  <string name="missing_name">(Sans nom)</string>
+  <string msgid="2795575601596468581" name="description_view_contact_detail">Afficher le contact</string>
+  <string name="list_filter_phones">Tous les contacts disposant d\'un numéro de téléphone</string>
+  <string name="list_filter_phones_work">Contacts du profil professionnel</string>
+  <string name="view_updates_from_group">Afficher les mises à jour</string>
+  <string name="account_phone">Appareil uniquement, non synchronisé</string>
+  <string name="nameLabelsGroup">Nom</string>
+  <string name="nicknameLabelsGroup">Pseudo</string>
+  <string name="full_name">Nom</string>
+  <string name="name_given">Prénom</string>
+  <string name="name_family">Nom</string>
+  <string name="name_prefix">Préfixe du nom</string>
+  <string name="name_middle">Deuxième prénom</string>
+  <string name="name_suffix">Suffixe du nom</string>
+  <string name="name_phonetic">Nom phonétique</string>
+  <string name="name_phonetic_given">Prénom phonétique</string>
+  <string name="name_phonetic_middle">2e prénom phonétique</string>
+  <string name="name_phonetic_family">Nom phonétique</string>
+  <string name="phoneLabelsGroup">Téléphone</string>
+  <string name="emailLabelsGroup">Envoyer un e-mail</string>
+  <string name="postalLabelsGroup">Adresse</string>
+  <string name="imLabelsGroup">Chat</string>
+  <string name="organizationLabelsGroup">Organisation</string>
+  <string name="relationLabelsGroup">Type de relation</string>
+  <string name="eventLabelsGroup">Occasion spéciale</string>
+  <string name="sms">SMS</string>
+  <string name="postal_address">Adresse</string>
+  <string name="ghostData_company">Entreprise</string>
+  <string name="ghostData_title">Titre</string>
+  <string name="label_notes">Remarques</string>
+  <string name="label_sip_address">Adresse SIP</string>
+  <string name="websiteLabelsGroup">Site Web</string>
+  <string name="groupsLabel">Groupes</string>
+  <string name="email_home">Envoyer un e-mail au domicile</string>
+  <string name="email_mobile">Envoyer un e-mail sur le mobile</string>
+  <string name="email_work">Envoyer un e-mail au bureau</string>
+  <string name="email_other">Envoyer un e-mail</string>
+  <string name="email_custom">Envoyer un e-mail à %s</string>
+  <string name="email">Envoyer un e-mail</string>
+  <string name="postal_street">Rue</string>
+  <string name="postal_city">Ville</string>
+  <string name="postal_region">État</string>
+  <string name="postal_postcode">Code postal</string>
+  <string name="postal_country">Pays</string>
+  <string name="map_home">Afficher l\'adresse personnelle</string>
+  <string name="map_work">Afficher l\'adresse professionnelle</string>
+  <string name="map_other">Afficher l\'adresse</string>
+  <string name="map_custom">Afficher l\'adresse %s</string>
+  <string name="chat_aim">Chatter via AIM</string>
+  <string name="chat_msn">Chatter via Windows Live</string>
+  <string name="chat_yahoo">Chatter via Yahoo!</string>
+  <string name="chat_skype">Chatter via Skype</string>
+  <string name="chat_qq">Chatter via QQ</string>
+  <string name="chat_gtalk">Chatter via Google Talk</string>
+  <string name="chat_icq">Chatter via ICQ</string>
+  <string name="chat_jabber">Chatter via Jabber</string>
+  <string name="chat">Chat</string>
+  <string name="list_filter_all_accounts">Tous les contacts</string>
+  <string name="listAllContactsInAccount">Contacts du compte \"%s\"</string>
+  <string name="listCustomView">Contacts avec affichage perso.</string>
+  <string name="listSingleContact">Contact</string>
+  <string name="display_options_sort_list_by">Trier par</string>
+  <string name="display_options_sort_by_given_name">Prénom</string>
+  <string name="display_options_sort_by_family_name">Nom</string>
+  <string name="display_options_view_names_as">Format du nom</string>
+  <string name="display_options_view_given_name_first">Prénom en premier</string>
+  <string name="display_options_view_family_name_first">Nom en premier</string>
+  <string name="menu_clear_frequents">Effacer les contacts fréquents</string>
+  <string name="action_menu_back_from_search">arrêter la recherche</string>
+  <string name="description_clear_search">Effacer la recherche</string>
+  <string name="select_account_dialog_title">Compte</string>
+  <string name="set_default_account">Toujours l\'utiliser pour les appels</string>
+  <string name="select_phone_account_for_calls">Choisir la carte SIM pour cet appel</string>
+  <string name="select_phone_account_for_calls_remember">Mémoriser ce choix</string>
+  <string name="call_with_a_note">Appeler avec une note</string>
+  <string name="call_subject_hint">Saisissez une note pour accompagner l\'appel...</string>
+  <string name="send_and_call_button">ENVOYER ET APPELER</string>
+  <string name="call_subject_limit">%1$s/%2$s</string>
+  <string name="old_call_subject_type_and_number">%1$s %2$s</string>
+  <string name="tab_title">Onglet %1$s.</string>
+  <plurals name="tab_title_with_unread_items">
+    <item quantity="one"> Onglet %1$s. %2$d élément non lu. </item>
+    <item quantity="other"> Onglet %1$s. %2$d éléments non lus. </item>
+  </plurals>
+  <string name="description_search_video_call">Appel vidéo</string>
+  <string name="description_search_call_and_share">Partager et appeler</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-gl/strings.xml b/java/com/android/contacts/common/res/values-gl/strings.xml
index a558558..9a4bda1 100644
--- a/java/com/android/contacts/common/res/values-gl/strings.xml
+++ b/java/com/android/contacts/common/res/values-gl/strings.xml
@@ -1,162 +1,145 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="toast_text_copied" msgid="8979281391599667362">"Texto copiado"</string>
-    <string name="call_custom" msgid="3041673234638990874">"Chamar ao <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="call_home" msgid="125893483593803791">"Chama á casa"</string>
-    <string name="call_mobile" msgid="967589404494150813">"Chamar ao móbil"</string>
-    <string name="call_work" msgid="6040550697395300892">"Chamar ao traballo"</string>
-    <string name="call_fax_work" msgid="5260192771364592922">"Chamar ao número de fax do traballo"</string>
-    <string name="call_fax_home" msgid="5174311195081144124">"Chamar ao número de fax da casa"</string>
-    <string name="call_pager" msgid="6814149227741274161">"Chamar ao buscapersoas"</string>
-    <string name="call_other" msgid="5536385588712587235">"Chamar"</string>
-    <string name="call_callback" msgid="6314019862718112786">"Chamar ao número de devolución de chamada"</string>
-    <string name="call_car" msgid="3197417098027764954">"Chamar ao coche"</string>
-    <string name="call_company_main" msgid="2557663310028446397">"Chamar ao número principal da empresa"</string>
-    <string name="call_isdn" msgid="4691270442763649522">"Chamar ao número de RDSI"</string>
-    <string name="call_main" msgid="3293707608770407814">"Chamar ao número principal"</string>
-    <string name="call_other_fax" msgid="4724521984879021465">"Chamar ao fax"</string>
-    <string name="call_radio" msgid="8942441419845057942">"Chamar á radio"</string>
-    <string name="call_telex" msgid="2031514461660668351">"Chamar ao télex"</string>
-    <string name="call_tty_tdd" msgid="7807210224965727701">"Chamar ao número de TTY/TDD"</string>
-    <string name="call_work_mobile" msgid="2716342732938578495">"Chamar ao móbil do traballo"</string>
-    <string name="call_work_pager" msgid="3791778749827366574">"Chamar ao buscapersoas do traballo"</string>
-    <string name="call_assistant" msgid="4177478845473789294">"Chamar a <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
-    <string name="call_mms" msgid="4958811711741872901">"Chamar ao número de teléfono de MMS"</string>
-    <string name="sms_custom" msgid="8785368968605026317">"Enviar unha mensaxe a <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="sms_home" msgid="3527719551060295243">"Enviar unha mensaxe á casa"</string>
-    <string name="sms_mobile" msgid="8883045857887736518">"Enviar unha mensaxe ao teléfono móbil"</string>
-    <string name="sms_work" msgid="4158595439553450966">"Enviar unha mensaxe ao traballo"</string>
-    <string name="sms_fax_work" msgid="5483726627718055248">"Enviar unha mensaxe ao fax do traballo"</string>
-    <string name="sms_fax_home" msgid="9219265155770746077">"Enviar unha mensaxe ao fax de casa"</string>
-    <string name="sms_pager" msgid="4901085068525193933">"Enviar unha mensaxe ao buscapersoas"</string>
-    <string name="sms_other" msgid="1742702947993285933">"Enviar unha mensaxe"</string>
-    <string name="sms_callback" msgid="5833483630377538308">"Enviar unha mensaxe ao número de devolución da chamada"</string>
-    <string name="sms_car" msgid="4314577266154395174">"Enviar unha mensaxe ao coche"</string>
-    <string name="sms_company_main" msgid="2308160928487360705">"Enviar unha mensaxe ao teléfono principal da empresa"</string>
-    <string name="sms_isdn" msgid="6394300346179302542">"Enviar unha mensaxe ao teléfono de RDSI"</string>
-    <string name="sms_main" msgid="8908087742014140774">"Enviar unha mensaxe ao teléfono principal"</string>
-    <string name="sms_other_fax" msgid="8768455473295405427">"Enviar unha mensaxe ao fax"</string>
-    <string name="sms_radio" msgid="855555176531704682">"Enviar unha mensaxe á radio"</string>
-    <string name="sms_telex" msgid="6269029276223252719">"Enviar unha mensaxe ao télex"</string>
-    <string name="sms_tty_tdd" msgid="6229057354509192444">"Enviar unha mensaxe ao TTY/TDD"</string>
-    <string name="sms_work_mobile" msgid="2155975469329969840">"Enviar unha mensaxe ao móbil do traballo"</string>
-    <string name="sms_work_pager" msgid="8500140274906830742">"Enviar unha mensaxe ao buscapersoas do traballo"</string>
-    <string name="sms_assistant" msgid="8513548482745330818">"Enviar unha mensaxe a <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
-    <string name="sms_mms" msgid="5187888900503248542">"Enviar unha mensaxe ao teléfono da MMS"</string>
-    <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"Borrar contactados con frecuencia?"</string>
-    <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"Borra a lista de persoas coas que contactaches frecuentemente das aplicacións Contactos e Teléfono, e obriga ás aplicacións de correo electrónico a que memoricen as túas preferencias de enderezos desde cero."</string>
-    <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"Borrando contactados frecuencia..."</string>
-    <string name="status_available" msgid="2648156525685472626">"Dispoñible"</string>
-    <string name="status_away" msgid="2298688367552893953">"Ausente"</string>
-    <string name="status_busy" msgid="5990832098713248503">"Ocupado"</string>
-    <string name="contactsList" msgid="8806067891419291513">"Contactos"</string>
-    <string name="contact_suggestions" msgid="3324166754807120006">"Suxestións destacadas"</string>
-    <string name="local_invisible_directory" msgid="4723238462733650090">"Outro"</string>
-    <string name="directory_search_label" msgid="4621215895484025229">"Directorio"</string>
-    <string name="directory_search_label_work" msgid="7679326282707414897">"Directorio de traballo"</string>
-    <string name="local_search_label" msgid="907622822323119235">"Todos os contactos"</string>
-    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Suxestións"</string>
-    <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Eu"</string>
-    <string name="missing_name" msgid="978606963362745020">"(Sen nome)"</string>
-    <string name="description_view_contact_detail" msgid="2428742401208561136">"Ver contacto"</string>
-    <string name="list_filter_phones" msgid="8763316061763437182">"Todos os contactos con números de teléfono"</string>
-    <string name="list_filter_phones_work" msgid="7083575404573422965">"Contactos do perfil de traballo"</string>
-    <string name="view_updates_from_group" msgid="9011641093168385729">"Ver actualizacións"</string>
-    <string name="account_phone" msgid="7067809073194061035">"Só no dispositivo, sen sincronizar"</string>
-    <string name="nameLabelsGroup" msgid="7730465833159557471">"Nome"</string>
-    <string name="nicknameLabelsGroup" msgid="6310556912361840029">"Alcume"</string>
-    <string name="full_name" msgid="648186563998465740">"Nome"</string>
-    <string name="name_given" msgid="5096576006314820536">"Nome"</string>
-    <string name="name_family" msgid="6646235805198547467">"Apelidos"</string>
-    <string name="name_prefix" msgid="9215326539658838">"Forma de tratamento"</string>
-    <string name="name_middle" msgid="703755205331582769">"Segundo nome"</string>
-    <string name="name_suffix" msgid="5777083390282548702">"Título académico ou profesional"</string>
-    <string name="name_phonetic" msgid="1650870996361663089">"Nome fonético"</string>
-    <string name="name_phonetic_given" msgid="618812334274603170">"Nome fonético"</string>
-    <string name="name_phonetic_middle" msgid="4826820763384625538">"Segundo nome fonético"</string>
-    <string name="name_phonetic_family" msgid="379905191212930771">"Apelido fonético"</string>
-    <string name="phoneLabelsGroup" msgid="169661929021355548">"Teléfono"</string>
-    <string name="emailLabelsGroup" msgid="2249752810477488833">"Enviar correo electrónico"</string>
-    <string name="postalLabelsGroup" msgid="6772000590189142253">"Enderezo"</string>
-    <string name="imLabelsGroup" msgid="5718066254237364731">"MI"</string>
-    <string name="organizationLabelsGroup" msgid="1101996309241601435">"Organización"</string>
-    <string name="relationLabelsGroup" msgid="53866051664600053">"Relación"</string>
-    <string name="eventLabelsGroup" msgid="1236970042646618489">"Data especial"</string>
-    <string name="sms" msgid="7574344928185328095">"Mensaxe de texto"</string>
-    <string name="postal_address" msgid="1804707930129674200">"Enderezo"</string>
-    <string name="ghostData_company" msgid="2554310786296833424">"Empresa"</string>
-    <string name="ghostData_title" msgid="4994968731830184837">"Título"</string>
-    <string name="label_notes" msgid="2050255313694219786">"Notas"</string>
-    <string name="label_sip_address" msgid="8883266182575965926">"SIP"</string>
-    <string name="websiteLabelsGroup" msgid="1630734286462186790">"Sitio web"</string>
-    <string name="groupsLabel" msgid="2694002798416868728">"Grupos"</string>
-    <string name="email_home" msgid="889830029388962171">"Enviar correo electrónico á casa"</string>
-    <string name="email_mobile" msgid="4487686436743741150">"Enviar correo electrónico ao móbil"</string>
-    <string name="email_work" msgid="4223487303344613528">"Enviar correo electrónico ao traballo"</string>
-    <string name="email_other" msgid="4246411900126012062">"Enviar correo electrónico"</string>
-    <string name="email_custom" msgid="7246580894327511013">"Enviar correo electrónico a <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="email" msgid="2807318537887091606">"Enviar correo electrónico"</string>
-    <string name="postal_street" msgid="6918171741240802474">"Rúa"</string>
-    <string name="postal_city" msgid="8674569121430005628">"Cidade"</string>
-    <string name="postal_region" msgid="1730369286225469192">"Estado"</string>
-    <string name="postal_postcode" msgid="4450700741261990439">"Código postal"</string>
-    <string name="postal_country" msgid="232670707458768148">"País"</string>
-    <string name="map_home" msgid="4181131107392126938">"Ver enderezo da casa"</string>
-    <string name="map_work" msgid="5723471185992684400">"Ver enderezo do traballo"</string>
-    <string name="map_other" msgid="2253764780863500516">"Ver enderezo"</string>
-    <string name="map_custom" msgid="5581743097882436157">"Ver enderezo <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="chat_aim" msgid="2954364435497941659">"Chatear con AIM"</string>
-    <string name="chat_msn" msgid="3130135239071228678">"Chatear con Windows Live"</string>
-    <string name="chat_yahoo" msgid="3233552142326865347">"Chatear con Yahoo"</string>
-    <string name="chat_skype" msgid="6486703981390592425">"Chatear con Skype"</string>
-    <string name="chat_qq" msgid="786924280665740019">"Chatear con QQ"</string>
-    <string name="chat_gtalk" msgid="7914674177243078035">"Chatear con Google Talk"</string>
-    <string name="chat_icq" msgid="3292934726414765801">"Chatear con ICQ"</string>
-    <string name="chat_jabber" msgid="6701542313597880204">"Chatear con Jabber"</string>
-    <string name="chat" msgid="1020428260359370236">"Chatear"</string>
-    <string name="list_filter_all_accounts" msgid="473782314881473992">"Todos os contactos"</string>
-    <string name="listAllContactsInAccount" msgid="3486378621592995630">"Contactos en <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="listCustomView" msgid="5306282632413086731">"Contactos na vista personalizada"</string>
-    <string name="listSingleContact" msgid="8620818791932382627">"Un só contacto"</string>
-    <string name="display_options_sort_list_by" msgid="3541875948367831228">"Ordenar por"</string>
-    <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"Nome"</string>
-    <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"Apelidos"</string>
-    <string name="display_options_view_names_as" msgid="4204204205736735618">"Formato do nome"</string>
-    <string name="display_options_view_given_name_first" msgid="2308026973021171020">"Primeiro o nome"</string>
-    <string name="display_options_view_family_name_first" msgid="987430497292428242">"Primeiro os apelidos"</string>
-    <string name="menu_clear_frequents" msgid="5358271535047496120">"Borrar frecuentes"</string>
-    <string name="action_menu_back_from_search" msgid="3550669942742167644">"detén a busca"</string>
-    <string name="description_clear_search" msgid="2347258825265600782">"Borrar busca"</string>
-    <string name="select_account_dialog_title" msgid="2673504582803359239">"Conta"</string>
-    <string name="set_default_account" msgid="7966099951006467572">"Usar sempre para as chamadas"</string>
-    <string name="select_phone_account_for_calls" msgid="1784460686103423274">"Chamar con"</string>
-    <string name="call_with_a_note" msgid="6242261320491851133">"Chamar cunha nota"</string>
-    <string name="call_subject_hint" msgid="7233138753650420800">"Escribe unha nota para enviala coa chamada…"</string>
-    <string name="send_and_call_button" msgid="4735168294120154013">"ENVIAR E CHAMAR"</string>
-    <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g>/<xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="tab_title" msgid="3387876802026074288">"Pestana <xliff:g id="TITLE">%1$s</xliff:g>."</string>
-    <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
-      <item quantity="other"> Pestana <xliff:g id="TITLE_2">%1$s</xliff:g>. <xliff:g id="COUNT_3">%2$d</xliff:g> elementos non lidos. </item>
-      <item quantity="one"> Pestana <xliff:g id="TITLE_0">%1$s</xliff:g>. <xliff:g id="COUNT_1">%2$d</xliff:g> elemento non lido. </item>
-    </plurals>
-    <string name="description_search_video_call" msgid="4337369876888024909">"Videochamada"</string>
-    <string name="description_search_call_and_share" msgid="4912772842755050467">"Comparte e chama"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_custom">Chamar ao %s</string>
+  <string name="call_home">Chama á casa</string>
+  <string name="call_mobile">Chamar ao móbil</string>
+  <string name="call_work">Chamar ao traballo</string>
+  <string name="call_fax_work">Chamar ao número de fax do traballo</string>
+  <string name="call_fax_home">Chamar ao número de fax da casa</string>
+  <string name="call_pager">Chamar ao buscapersoas</string>
+  <string name="call_other">Chamar</string>
+  <string name="call_callback">Chamar ao número de devolución de chamada</string>
+  <string name="call_car">Chamar ao coche</string>
+  <string name="call_company_main">Chamar ao número principal da empresa</string>
+  <string name="call_isdn">Chamar ao número de RDSI</string>
+  <string name="call_main">Chamar ao número principal</string>
+  <string name="call_other_fax">Chamar ao fax</string>
+  <string name="call_radio">Chamar á radio</string>
+  <string name="call_telex">Chamar ao télex</string>
+  <string name="call_tty_tdd">Chamar ao número de TTY/TDD</string>
+  <string name="call_work_mobile">Chamar ao móbil do traballo</string>
+  <string name="call_work_pager">Chamar ao buscapersoas do traballo</string>
+  <string name="call_assistant">Chamar a %s</string>
+  <string name="call_mms">Chamar ao número de teléfono de MMS</string>
+  <string name="sms_custom">Enviar unha mensaxe a %s</string>
+  <string name="sms_home">Enviar unha mensaxe á casa</string>
+  <string name="sms_mobile">Enviar unha mensaxe ao teléfono móbil</string>
+  <string name="sms_work">Enviar unha mensaxe ao traballo</string>
+  <string name="sms_fax_work">Enviar unha mensaxe ao fax do traballo</string>
+  <string name="sms_fax_home">Enviar unha mensaxe ao fax de casa</string>
+  <string name="sms_pager">Enviar unha mensaxe ao buscapersoas</string>
+  <string name="sms_other">Enviar unha mensaxe</string>
+  <string name="sms_callback">Enviar unha mensaxe ao número de devolución da chamada</string>
+  <string name="sms_car">Enviar unha mensaxe ao coche</string>
+  <string name="sms_company_main">Enviar unha mensaxe ao teléfono principal da empresa</string>
+  <string name="sms_isdn">Enviar unha mensaxe ao teléfono de RDSI</string>
+  <string name="sms_main">Enviar unha mensaxe ao teléfono principal</string>
+  <string name="sms_other_fax">Enviar unha mensaxe ao fax</string>
+  <string name="sms_radio">Enviar unha mensaxe á radio</string>
+  <string name="sms_telex">Enviar unha mensaxe ao télex</string>
+  <string name="sms_tty_tdd">Enviar unha mensaxe ao TTY/TDD</string>
+  <string name="sms_work_mobile">Enviar unha mensaxe ao móbil do traballo</string>
+  <string name="sms_work_pager">Enviar unha mensaxe ao buscapersoas do traballo</string>
+  <string name="sms_assistant">Enviar unha mensaxe a %s</string>
+  <string name="sms_mms">Enviar unha mensaxe ao teléfono da MMS</string>
+  <string name="clearFrequentsConfirmation_title">Borrar contactados con frecuencia?</string>
+  <string name="clearFrequentsConfirmation">Borra a lista de persoas coas que contactaches frecuentemente das aplicacións Contactos e Teléfono, e obriga ás aplicacións de correo electrónico a que memoricen as túas preferencias de enderezos desde cero.</string>
+  <string name="clearFrequentsProgress_title">Borrando contactados frecuencia...</string>
+  <string name="status_available">Dispoñible</string>
+  <string name="status_away">Ausente</string>
+  <string name="status_busy">Ocupado</string>
+  <string name="contactsList">Contactos</string>
+  <string name="contact_suggestions">Suxestións destacadas</string>
+  <string name="local_invisible_directory">Outro</string>
+  <string name="directory_search_label">Directorio</string>
+  <string name="directory_search_label_work">Directorio de traballo</string>
+  <string name="local_search_label">Todos os contactos</string>
+  <string name="local_suggestions_search_label">Suxestións</string>
+  <string msgid="9154761216179882405" name="user_profile_contacts_list_header">Eu</string>
+  <string name="missing_name">(Sen nome)</string>
+  <string msgid="2795575601596468581" name="description_view_contact_detail">Ver contacto</string>
+  <string name="list_filter_phones">Todos os contactos con números de teléfono</string>
+  <string name="list_filter_phones_work">Contactos do perfil de traballo</string>
+  <string name="view_updates_from_group">Ver actualizacións</string>
+  <string name="account_phone">Só no dispositivo, sen sincronizar</string>
+  <string name="nameLabelsGroup">Nome</string>
+  <string name="nicknameLabelsGroup">Alcume</string>
+  <string name="full_name">Nome</string>
+  <string name="name_given">Nome</string>
+  <string name="name_family">Apelidos</string>
+  <string name="name_prefix">Forma de tratamento</string>
+  <string name="name_middle">Segundo nome</string>
+  <string name="name_suffix">Título académico ou profesional</string>
+  <string name="name_phonetic">Nome fonético</string>
+  <string name="name_phonetic_given">Nome fonético</string>
+  <string name="name_phonetic_middle">Segundo nome fonético</string>
+  <string name="name_phonetic_family">Apelido fonético</string>
+  <string name="phoneLabelsGroup">Teléfono</string>
+  <string name="emailLabelsGroup">Enviar correo electrónico</string>
+  <string name="postalLabelsGroup">Enderezo</string>
+  <string name="imLabelsGroup">MI</string>
+  <string name="organizationLabelsGroup">Organización</string>
+  <string name="relationLabelsGroup">Relación</string>
+  <string name="eventLabelsGroup">Data especial</string>
+  <string name="sms">Mensaxe de texto</string>
+  <string name="postal_address">Enderezo</string>
+  <string name="ghostData_company">Empresa</string>
+  <string name="ghostData_title">Título</string>
+  <string name="label_notes">Notas</string>
+  <string name="label_sip_address">SIP</string>
+  <string name="websiteLabelsGroup">Sitio web</string>
+  <string name="groupsLabel">Grupos</string>
+  <string name="email_home">Enviar correo electrónico á casa</string>
+  <string name="email_mobile">Enviar correo electrónico ao móbil</string>
+  <string name="email_work">Enviar correo electrónico ao traballo</string>
+  <string name="email_other">Enviar correo electrónico</string>
+  <string name="email_custom">Enviar correo electrónico a %s</string>
+  <string name="email">Enviar correo electrónico</string>
+  <string name="postal_street">Rúa</string>
+  <string name="postal_city">Cidade</string>
+  <string name="postal_region">Estado</string>
+  <string name="postal_postcode">Código postal</string>
+  <string name="postal_country">País</string>
+  <string name="map_home">Ver enderezo da casa</string>
+  <string name="map_work">Ver enderezo do traballo</string>
+  <string name="map_other">Ver enderezo</string>
+  <string name="map_custom">Ver enderezo %s</string>
+  <string name="chat_aim">Chatear con AIM</string>
+  <string name="chat_msn">Chatear con Windows Live</string>
+  <string name="chat_yahoo">Chatear con Yahoo</string>
+  <string name="chat_skype">Chatear con Skype</string>
+  <string name="chat_qq">Chatear con QQ</string>
+  <string name="chat_gtalk">Chatear con Google Talk</string>
+  <string name="chat_icq">Chatear con ICQ</string>
+  <string name="chat_jabber">Chatear con Jabber</string>
+  <string name="chat">Chatear</string>
+  <string name="list_filter_all_accounts">Todos os contactos</string>
+  <string name="listAllContactsInAccount">Contactos en %s</string>
+  <string name="listCustomView">Contactos na vista personalizada</string>
+  <string name="listSingleContact">Un só contacto</string>
+  <string name="display_options_sort_list_by">Ordenar por</string>
+  <string name="display_options_sort_by_given_name">Nome</string>
+  <string name="display_options_sort_by_family_name">Apelidos</string>
+  <string name="display_options_view_names_as">Formato do nome</string>
+  <string name="display_options_view_given_name_first">Primeiro o nome</string>
+  <string name="display_options_view_family_name_first">Primeiro os apelidos</string>
+  <string name="menu_clear_frequents">Borrar frecuentes</string>
+  <string name="action_menu_back_from_search">detén a busca</string>
+  <string name="description_clear_search">Borrar busca</string>
+  <string name="select_account_dialog_title">Conta</string>
+  <string name="set_default_account">Usar sempre para as chamadas</string>
+  <string name="select_phone_account_for_calls">Escolle a SIM para esta chamada</string>
+  <string name="select_phone_account_for_calls_remember">Lembrar esta opción</string>
+  <string name="call_with_a_note">Chamar cunha nota</string>
+  <string name="call_subject_hint">Escribe unha nota para enviala coa chamada…</string>
+  <string name="send_and_call_button">ENVIAR E CHAMAR</string>
+  <string name="call_subject_limit">%1$s/%2$s</string>
+  <string name="old_call_subject_type_and_number">%1$s %2$s</string>
+  <string name="tab_title">Pestana %1$s.</string>
+  <plurals name="tab_title_with_unread_items">
+    <item quantity="one"> Pestana %1$s. %2$d elemento non lido. </item>
+    <item quantity="other"> Pestana %1$s. %2$d elementos non lidos. </item>
+  </plurals>
+  <string name="description_search_video_call">Videochamada</string>
+  <string name="description_search_call_and_share">Comparte e chama</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-gu/strings.xml b/java/com/android/contacts/common/res/values-gu/strings.xml
index a24c438..9e8c1aa 100644
--- a/java/com/android/contacts/common/res/values-gu/strings.xml
+++ b/java/com/android/contacts/common/res/values-gu/strings.xml
@@ -1,162 +1,145 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="toast_text_copied" msgid="8979281391599667362">"ટેક્સ્ટ કૉપિ કર્યો"</string>
-    <string name="call_custom" msgid="3041673234638990874">"<xliff:g id="CUSTOM">%s</xliff:g> ને કૉલ કરો"</string>
-    <string name="call_home" msgid="125893483593803791">"ઘરે કૉલ કરો"</string>
-    <string name="call_mobile" msgid="967589404494150813">"મોબાઇલ પર કૉલ કરો"</string>
-    <string name="call_work" msgid="6040550697395300892">"કાર્યાલય પર કૉલ કરો"</string>
-    <string name="call_fax_work" msgid="5260192771364592922">"કાર્યાલયના ફૅક્સ પર કૉલ કરો"</string>
-    <string name="call_fax_home" msgid="5174311195081144124">"ઘરના ફૅક્સ પર કૉલ કરો"</string>
-    <string name="call_pager" msgid="6814149227741274161">"પેજર પર કૉલ કરો"</string>
-    <string name="call_other" msgid="5536385588712587235">"કૉલ કરો"</string>
-    <string name="call_callback" msgid="6314019862718112786">"કૉલબેક પર કૉલ કરો"</string>
-    <string name="call_car" msgid="3197417098027764954">"કાર પર કૉલ કરો"</string>
-    <string name="call_company_main" msgid="2557663310028446397">"કંપની મુખ્ય પર કૉલ કરો"</string>
-    <string name="call_isdn" msgid="4691270442763649522">"ISDN પર કૉલ કરો"</string>
-    <string name="call_main" msgid="3293707608770407814">"મુખ્ય પર કૉલ કરો"</string>
-    <string name="call_other_fax" msgid="4724521984879021465">"ફૅક્સ પર કૉલ કરો"</string>
-    <string name="call_radio" msgid="8942441419845057942">"રેડિઓ પર કૉલ કરો"</string>
-    <string name="call_telex" msgid="2031514461660668351">"ટેલેક્સ પર કૉલ કરો"</string>
-    <string name="call_tty_tdd" msgid="7807210224965727701">"TTY/TDD પર કૉલ કરો"</string>
-    <string name="call_work_mobile" msgid="2716342732938578495">"કાર્યાલયના મોબાઇલ પર કૉલ કરો"</string>
-    <string name="call_work_pager" msgid="3791778749827366574">"કાર્યાલયના પેજર પર કૉલ કરો"</string>
-    <string name="call_assistant" msgid="4177478845473789294">"<xliff:g id="ASSISTANT">%s</xliff:g> ને કૉલ કરો"</string>
-    <string name="call_mms" msgid="4958811711741872901">"MMS પર કૉલ કરો"</string>
-    <string name="sms_custom" msgid="8785368968605026317">"<xliff:g id="CUSTOM">%s</xliff:g> ને ટેક્સ્ટ કરો"</string>
-    <string name="sms_home" msgid="3527719551060295243">"ઘરે ટેક્સ્ટ કરો"</string>
-    <string name="sms_mobile" msgid="8883045857887736518">"મોબાઇલ પર ટેક્સ્ટ કરો"</string>
-    <string name="sms_work" msgid="4158595439553450966">"કાર્યાલય પર ટેક્સ્ટ કરો"</string>
-    <string name="sms_fax_work" msgid="5483726627718055248">"કાર્યાલયના ફૅક્સ પર ટેક્સ્ટ કરો"</string>
-    <string name="sms_fax_home" msgid="9219265155770746077">"ઘરના ફૅક્સ પર ટેક્સ્ટ કરો"</string>
-    <string name="sms_pager" msgid="4901085068525193933">"પેજર પર ટેક્સ્ટ કરો"</string>
-    <string name="sms_other" msgid="1742702947993285933">"ટેક્સ્ટ કરો"</string>
-    <string name="sms_callback" msgid="5833483630377538308">"કૉલબેક પર ટેક્સ્ટ કરો"</string>
-    <string name="sms_car" msgid="4314577266154395174">"કાર પર ટેક્સ્ટ કરો"</string>
-    <string name="sms_company_main" msgid="2308160928487360705">"કંપની મુખ્ય પર ટેક્સ્ટ કરો"</string>
-    <string name="sms_isdn" msgid="6394300346179302542">"ISDN પર ટેક્સ્ટ કરો"</string>
-    <string name="sms_main" msgid="8908087742014140774">"મુખ્ય પર ટેક્સ્ટ કરો"</string>
-    <string name="sms_other_fax" msgid="8768455473295405427">"ફૅક્સ પર ટેક્સ્ટ કરો"</string>
-    <string name="sms_radio" msgid="855555176531704682">"રેડિઓ પર ટેક્સ્ટ કરો"</string>
-    <string name="sms_telex" msgid="6269029276223252719">"ટેલેક્સ પર ટેક્સ્ટ કરો"</string>
-    <string name="sms_tty_tdd" msgid="6229057354509192444">"TTY/TDD પર ટેક્સ્ટ કરો"</string>
-    <string name="sms_work_mobile" msgid="2155975469329969840">"કાર્યાલયના મોબાઇલ પર ટેક્સ્ટ કરો"</string>
-    <string name="sms_work_pager" msgid="8500140274906830742">"કાર્યાલયના પેજર પર ટેક્સ્ટ કરો"</string>
-    <string name="sms_assistant" msgid="8513548482745330818">"<xliff:g id="ASSISTANT">%s</xliff:g> ને ટેક્સ્ટ કરો"</string>
-    <string name="sms_mms" msgid="5187888900503248542">"MMS પર ટેક્સ્ટ કરો"</string>
-    <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"વારંવાર સંપર્ક કરેલા સાફ કરીએ?"</string>
-    <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"તમે સંપર્કો અને ફોન એપ્લિકેશન્સમાં વારંવાર સંપર્ક કરેલ સૂચિને સાફ કરશો અને ઇમેઇલ એપ્લિકેશન્સને તમારી સંબોધન પસંદગીઓને શરૂઆતથી જાણવા માટે ફરજ પાડશો."</string>
-    <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"વારંવાર સંપર્ક કરેલા સાફ કરે છે…"</string>
-    <string name="status_available" msgid="2648156525685472626">"ઉપલબ્ધ"</string>
-    <string name="status_away" msgid="2298688367552893953">"દૂર"</string>
-    <string name="status_busy" msgid="5990832098713248503">"વ્યસ્ત"</string>
-    <string name="contactsList" msgid="8806067891419291513">"સંપર્કો"</string>
-    <string name="contact_suggestions" msgid="3324166754807120006">"ટોચના સૂચવેલ"</string>
-    <string name="local_invisible_directory" msgid="4723238462733650090">"અન્ય"</string>
-    <string name="directory_search_label" msgid="4621215895484025229">"નિર્દેશિકા"</string>
-    <string name="directory_search_label_work" msgid="7679326282707414897">"કાર્ય નિર્દેશિકા"</string>
-    <string name="local_search_label" msgid="907622822323119235">"તમામ સંપર્કો"</string>
-    <string name="local_suggestions_search_label" msgid="1178575146224386118">"સૂચનો"</string>
-    <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"હું"</string>
-    <string name="missing_name" msgid="978606963362745020">"(નામ નથી)"</string>
-    <string name="description_view_contact_detail" msgid="2428742401208561136">"સંપર્ક જુઓ"</string>
-    <string name="list_filter_phones" msgid="8763316061763437182">"ફોન નંબર્સ સાથેના તમામ સંપર્કો"</string>
-    <string name="list_filter_phones_work" msgid="7083575404573422965">"કાર્ય પ્રોફાઇલના સંપર્કો"</string>
-    <string name="view_updates_from_group" msgid="9011641093168385729">"અપડેટ્સ જુઓ"</string>
-    <string name="account_phone" msgid="7067809073194061035">"ફક્ત-ઉપકરણ, સમન્વયિત ન કરેલ"</string>
-    <string name="nameLabelsGroup" msgid="7730465833159557471">"નામ"</string>
-    <string name="nicknameLabelsGroup" msgid="6310556912361840029">"ઉપનામ"</string>
-    <string name="full_name" msgid="648186563998465740">"નામ"</string>
-    <string name="name_given" msgid="5096576006314820536">"પ્રથમ નામ"</string>
-    <string name="name_family" msgid="6646235805198547467">"છેલ્લું નામ"</string>
-    <string name="name_prefix" msgid="9215326539658838">"નામ ઉપસર્ગ"</string>
-    <string name="name_middle" msgid="703755205331582769">"મધ્ય નામ"</string>
-    <string name="name_suffix" msgid="5777083390282548702">"નામ પ્રત્યય"</string>
-    <string name="name_phonetic" msgid="1650870996361663089">"ધ્વન્યાત્મક નામ"</string>
-    <string name="name_phonetic_given" msgid="618812334274603170">"ધ્વન્યાત્મક પ્રથમ નામ"</string>
-    <string name="name_phonetic_middle" msgid="4826820763384625538">"ધ્વન્યાત્મક મધ્ય નામ"</string>
-    <string name="name_phonetic_family" msgid="379905191212930771">"ધ્વન્યાત્મક છેલ્લું નામ"</string>
-    <string name="phoneLabelsGroup" msgid="169661929021355548">"ફોન"</string>
-    <string name="emailLabelsGroup" msgid="2249752810477488833">"ઇમેઇલ"</string>
-    <string name="postalLabelsGroup" msgid="6772000590189142253">"સરનામું"</string>
-    <string name="imLabelsGroup" msgid="5718066254237364731">"IM"</string>
-    <string name="organizationLabelsGroup" msgid="1101996309241601435">"સંગઠન"</string>
-    <string name="relationLabelsGroup" msgid="53866051664600053">"સંબંધ"</string>
-    <string name="eventLabelsGroup" msgid="1236970042646618489">"વિશિષ્ટ તારીખ"</string>
-    <string name="sms" msgid="7574344928185328095">"ટેક્સ્ટ સંદેશ"</string>
-    <string name="postal_address" msgid="1804707930129674200">"સરનામું"</string>
-    <string name="ghostData_company" msgid="2554310786296833424">"કંપની"</string>
-    <string name="ghostData_title" msgid="4994968731830184837">"શીર્ષક"</string>
-    <string name="label_notes" msgid="2050255313694219786">"નોંધો"</string>
-    <string name="label_sip_address" msgid="8883266182575965926">"SIP"</string>
-    <string name="websiteLabelsGroup" msgid="1630734286462186790">"વેબસાઇટ"</string>
-    <string name="groupsLabel" msgid="2694002798416868728">"જૂથો"</string>
-    <string name="email_home" msgid="889830029388962171">"ઘરે ઇમેઇલ કરો"</string>
-    <string name="email_mobile" msgid="4487686436743741150">"મોબાઇલ પર ઇમેઇલ કરો"</string>
-    <string name="email_work" msgid="4223487303344613528">"કાર્યાલય પર ઇમેઇલ કરો"</string>
-    <string name="email_other" msgid="4246411900126012062">"ઇમેઇલ"</string>
-    <string name="email_custom" msgid="7246580894327511013">"<xliff:g id="CUSTOM">%s</xliff:g> ને ઇમેઇલ કરો"</string>
-    <string name="email" msgid="2807318537887091606">"ઇમેઇલ"</string>
-    <string name="postal_street" msgid="6918171741240802474">"શેરી"</string>
-    <string name="postal_city" msgid="8674569121430005628">"શહેર"</string>
-    <string name="postal_region" msgid="1730369286225469192">"રાજ્ય"</string>
-    <string name="postal_postcode" msgid="4450700741261990439">"પિન કોડ"</string>
-    <string name="postal_country" msgid="232670707458768148">"દેશ"</string>
-    <string name="map_home" msgid="4181131107392126938">"ઘરનું સરનામું જુઓ"</string>
-    <string name="map_work" msgid="5723471185992684400">"કાર્યાલયનું સરનામું જુઓ"</string>
-    <string name="map_other" msgid="2253764780863500516">"સરનામું જુઓ"</string>
-    <string name="map_custom" msgid="5581743097882436157">"<xliff:g id="CUSTOM">%s</xliff:g> સરનામું જુઓ"</string>
-    <string name="chat_aim" msgid="2954364435497941659">"AIM નો ઉપયોગ કરીને ચેટ કરો"</string>
-    <string name="chat_msn" msgid="3130135239071228678">"Windows Live નો ઉપયોગ કરીને ચેટ કરો"</string>
-    <string name="chat_yahoo" msgid="3233552142326865347">"Yahoo નો ઉપયોગ કરીને ચેટ કરો"</string>
-    <string name="chat_skype" msgid="6486703981390592425">"Skype નો ઉપયોગ કરીને ચેટ કરો"</string>
-    <string name="chat_qq" msgid="786924280665740019">"QQ નો ઉપયોગ કરીને ચેટ કરો"</string>
-    <string name="chat_gtalk" msgid="7914674177243078035">"Google Talk નો ઉપયોગ કરીને ચેટ કરો"</string>
-    <string name="chat_icq" msgid="3292934726414765801">"ICQ નો ઉપયોગ કરીને ચેટ કરો"</string>
-    <string name="chat_jabber" msgid="6701542313597880204">"Jabber નો ઉપયોગ કરીને ચેટ કરો"</string>
-    <string name="chat" msgid="1020428260359370236">"ચેટ"</string>
-    <string name="list_filter_all_accounts" msgid="473782314881473992">"તમામ સંપર્કો"</string>
-    <string name="listAllContactsInAccount" msgid="3486378621592995630">"<xliff:g id="NAME">%s</xliff:g> માં સંપર્કો"</string>
-    <string name="listCustomView" msgid="5306282632413086731">"કસ્ટમ દૃશ્યમાં સંપર્કો"</string>
-    <string name="listSingleContact" msgid="8620818791932382627">"એકલ સંપર્ક"</string>
-    <string name="display_options_sort_list_by" msgid="3541875948367831228">"આ પ્રમાણે સૉર્ટ કરો"</string>
-    <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"પ્રથમ નામ"</string>
-    <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"છેલ્લું નામ"</string>
-    <string name="display_options_view_names_as" msgid="4204204205736735618">"નામ ફોર્મેટ"</string>
-    <string name="display_options_view_given_name_first" msgid="2308026973021171020">"પ્રથમ નામ પહેલા"</string>
-    <string name="display_options_view_family_name_first" msgid="987430497292428242">"છેલ્લું નામ પહેલા"</string>
-    <string name="menu_clear_frequents" msgid="5358271535047496120">"વારંવારના સાફ કરો"</string>
-    <string name="action_menu_back_from_search" msgid="3550669942742167644">"શોધવાનું રોકો"</string>
-    <string name="description_clear_search" msgid="2347258825265600782">"શોધ સાફ કરો"</string>
-    <string name="select_account_dialog_title" msgid="2673504582803359239">"એકાઉન્ટ"</string>
-    <string name="set_default_account" msgid="7966099951006467572">"કૉલ્સ માટે આનો ઉપયોગ હંમેશાં કરો"</string>
-    <string name="select_phone_account_for_calls" msgid="1784460686103423274">"આની સાથે કૉલ કરો"</string>
-    <string name="call_with_a_note" msgid="6242261320491851133">"નોંધ સાથે કૉલ કરો"</string>
-    <string name="call_subject_hint" msgid="7233138753650420800">"કૉલ સાથે મોકલવા માટે એક નોંધ લખો ..."</string>
-    <string name="send_and_call_button" msgid="4735168294120154013">"મોકલો અને કૉલ કરો"</string>
-    <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="tab_title" msgid="3387876802026074288">"<xliff:g id="TITLE">%1$s</xliff:g> ટૅબ."</string>
-    <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
-      <item quantity="one"> <xliff:g id="TITLE_2">%1$s</xliff:g> ટૅબ. <xliff:g id="COUNT_3">%2$d</xliff:g> વાંચ્યા વગરની આઇટમ. </item>
-      <item quantity="other"> <xliff:g id="TITLE_2">%1$s</xliff:g> ટૅબ. <xliff:g id="COUNT_3">%2$d</xliff:g> વાંચ્યા વગરની આઇટમ. </item>
-    </plurals>
-    <string name="description_search_video_call" msgid="4337369876888024909">"વિડિઓ કૉલ"</string>
-    <string name="description_search_call_and_share" msgid="4912772842755050467">"શેર કરો અને કૉલ કરો"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_custom">%s ને કૉલ કરો</string>
+  <string name="call_home">ઘરે કૉલ કરો</string>
+  <string name="call_mobile">મોબાઇલ પર કૉલ કરો</string>
+  <string name="call_work">કાર્યાલય પર કૉલ કરો</string>
+  <string name="call_fax_work">કાર્યાલયના ફૅક્સ પર કૉલ કરો</string>
+  <string name="call_fax_home">ઘરના ફૅક્સ પર કૉલ કરો</string>
+  <string name="call_pager">પેજર પર કૉલ કરો</string>
+  <string name="call_other">કૉલ કરો</string>
+  <string name="call_callback">કૉલબેક પર કૉલ કરો</string>
+  <string name="call_car">કાર પર કૉલ કરો</string>
+  <string name="call_company_main">કંપની મુખ્ય પર કૉલ કરો</string>
+  <string name="call_isdn">ISDN પર કૉલ કરો</string>
+  <string name="call_main">મુખ્ય પર કૉલ કરો</string>
+  <string name="call_other_fax">ફૅક્સ પર કૉલ કરો</string>
+  <string name="call_radio">રેડિઓ પર કૉલ કરો</string>
+  <string name="call_telex">ટેલેક્સ પર કૉલ કરો</string>
+  <string name="call_tty_tdd">TTY/TDD પર કૉલ કરો</string>
+  <string name="call_work_mobile">કાર્યાલયના મોબાઇલ પર કૉલ કરો</string>
+  <string name="call_work_pager">કાર્યાલયના પેજર પર કૉલ કરો</string>
+  <string name="call_assistant">%s ને કૉલ કરો</string>
+  <string name="call_mms">MMS પર કૉલ કરો</string>
+  <string name="sms_custom">%s ને ટેક્સ્ટ કરો</string>
+  <string name="sms_home">ઘરે ટેક્સ્ટ કરો</string>
+  <string name="sms_mobile">મોબાઇલ પર ટેક્સ્ટ કરો</string>
+  <string name="sms_work">કાર્યાલય પર ટેક્સ્ટ કરો</string>
+  <string name="sms_fax_work">કાર્યાલયના ફૅક્સ પર ટેક્સ્ટ કરો</string>
+  <string name="sms_fax_home">ઘરના ફૅક્સ પર ટેક્સ્ટ કરો</string>
+  <string name="sms_pager">પેજર પર ટેક્સ્ટ કરો</string>
+  <string name="sms_other">ટેક્સ્ટ કરો</string>
+  <string name="sms_callback">કૉલબેક પર ટેક્સ્ટ કરો</string>
+  <string name="sms_car">કાર પર ટેક્સ્ટ કરો</string>
+  <string name="sms_company_main">કંપની મુખ્ય પર ટેક્સ્ટ કરો</string>
+  <string name="sms_isdn">ISDN પર ટેક્સ્ટ કરો</string>
+  <string name="sms_main">મુખ્ય પર ટેક્સ્ટ કરો</string>
+  <string name="sms_other_fax">ફૅક્સ પર ટેક્સ્ટ કરો</string>
+  <string name="sms_radio">રેડિઓ પર ટેક્સ્ટ કરો</string>
+  <string name="sms_telex">ટેલેક્સ પર ટેક્સ્ટ કરો</string>
+  <string name="sms_tty_tdd">TTY/TDD પર ટેક્સ્ટ કરો</string>
+  <string name="sms_work_mobile">કાર્યાલયના મોબાઇલ પર ટેક્સ્ટ કરો</string>
+  <string name="sms_work_pager">કાર્યાલયના પેજર પર ટેક્સ્ટ કરો</string>
+  <string name="sms_assistant">%s ને ટેક્સ્ટ કરો</string>
+  <string name="sms_mms">MMS પર ટેક્સ્ટ કરો</string>
+  <string name="clearFrequentsConfirmation_title">વારંવાર સંપર્ક કરેલા સાફ કરીએ?</string>
+  <string name="clearFrequentsConfirmation">તમે સંપર્કો અને ફોન એપ્લિકેશન્સમાં વારંવાર સંપર્ક કરેલ સૂચિને સાફ કરશો અને ઇમેઇલ એપ્લિકેશન્સને તમારી સંબોધન પસંદગીઓને શરૂઆતથી જાણવા માટે ફરજ પાડશો.</string>
+  <string name="clearFrequentsProgress_title">વારંવાર સંપર્ક કરેલા સાફ કરે છે…</string>
+  <string name="status_available">ઉપલબ્ધ</string>
+  <string name="status_away">દૂર</string>
+  <string name="status_busy">વ્યસ્ત</string>
+  <string name="contactsList">સંપર્કો</string>
+  <string name="contact_suggestions">ટોચના સૂચવેલ</string>
+  <string name="local_invisible_directory">અન્ય</string>
+  <string name="directory_search_label">નિર્દેશિકા</string>
+  <string name="directory_search_label_work">કાર્ય નિર્દેશિકા</string>
+  <string name="local_search_label">તમામ સંપર્કો</string>
+  <string name="local_suggestions_search_label">સૂચનો</string>
+  <string msgid="9154761216179882405" name="user_profile_contacts_list_header">હું</string>
+  <string name="missing_name">(નામ નથી)</string>
+  <string msgid="2795575601596468581" name="description_view_contact_detail">સંપર્ક જુઓ</string>
+  <string name="list_filter_phones">ફોન નંબર્સ સાથેના તમામ સંપર્કો</string>
+  <string name="list_filter_phones_work">કાર્ય પ્રોફાઇલના સંપર્કો</string>
+  <string name="view_updates_from_group">અપડેટ્સ જુઓ</string>
+  <string name="account_phone">ફક્ત-ઉપકરણ, સમન્વયિત ન કરેલ</string>
+  <string name="nameLabelsGroup">નામ</string>
+  <string name="nicknameLabelsGroup">ઉપનામ</string>
+  <string name="full_name">નામ</string>
+  <string name="name_given">પ્રથમ નામ</string>
+  <string name="name_family">છેલ્લું નામ</string>
+  <string name="name_prefix">નામ ઉપસર્ગ</string>
+  <string name="name_middle">મધ્ય નામ</string>
+  <string name="name_suffix">નામ પ્રત્યય</string>
+  <string name="name_phonetic">ધ્વન્યાત્મક નામ</string>
+  <string name="name_phonetic_given">ધ્વન્યાત્મક પ્રથમ નામ</string>
+  <string name="name_phonetic_middle">ધ્વન્યાત્મક મધ્ય નામ</string>
+  <string name="name_phonetic_family">ધ્વન્યાત્મક છેલ્લું નામ</string>
+  <string name="phoneLabelsGroup">ફોન</string>
+  <string name="emailLabelsGroup">ઇમેઇલ</string>
+  <string name="postalLabelsGroup">સરનામું</string>
+  <string name="imLabelsGroup">IM</string>
+  <string name="organizationLabelsGroup">સંગઠન</string>
+  <string name="relationLabelsGroup">સંબંધ</string>
+  <string name="eventLabelsGroup">વિશિષ્ટ તારીખ</string>
+  <string name="sms">ટેક્સ્ટ સંદેશ</string>
+  <string name="postal_address">સરનામું</string>
+  <string name="ghostData_company">કંપની</string>
+  <string name="ghostData_title">શીર્ષક</string>
+  <string name="label_notes">નોંધો</string>
+  <string name="label_sip_address">SIP</string>
+  <string name="websiteLabelsGroup">વેબસાઇટ</string>
+  <string name="groupsLabel">જૂથો</string>
+  <string name="email_home">ઘરે ઇમેઇલ કરો</string>
+  <string name="email_mobile">મોબાઇલ પર ઇમેઇલ કરો</string>
+  <string name="email_work">કાર્યાલય પર ઇમેઇલ કરો</string>
+  <string name="email_other">ઇમેઇલ</string>
+  <string name="email_custom">%s ને ઇમેઇલ કરો</string>
+  <string name="email">ઇમેઇલ</string>
+  <string name="postal_street">શેરી</string>
+  <string name="postal_city">શહેર</string>
+  <string name="postal_region">રાજ્ય</string>
+  <string name="postal_postcode">પિન કોડ</string>
+  <string name="postal_country">દેશ</string>
+  <string name="map_home">ઘરનું સરનામું જુઓ</string>
+  <string name="map_work">કાર્યાલયનું સરનામું જુઓ</string>
+  <string name="map_other">સરનામું જુઓ</string>
+  <string name="map_custom">%s સરનામું જુઓ</string>
+  <string name="chat_aim">AIM નો ઉપયોગ કરીને ચેટ કરો</string>
+  <string name="chat_msn">Windows Live નો ઉપયોગ કરીને ચેટ કરો</string>
+  <string name="chat_yahoo">Yahoo નો ઉપયોગ કરીને ચેટ કરો</string>
+  <string name="chat_skype">Skype નો ઉપયોગ કરીને ચેટ કરો</string>
+  <string name="chat_qq">QQ નો ઉપયોગ કરીને ચેટ કરો</string>
+  <string name="chat_gtalk">Google Talk નો ઉપયોગ કરીને ચેટ કરો</string>
+  <string name="chat_icq">ICQ નો ઉપયોગ કરીને ચેટ કરો</string>
+  <string name="chat_jabber">Jabber નો ઉપયોગ કરીને ચેટ કરો</string>
+  <string name="chat">ચેટ</string>
+  <string name="list_filter_all_accounts">તમામ સંપર્કો</string>
+  <string name="listAllContactsInAccount">%s માં સંપર્કો</string>
+  <string name="listCustomView">કસ્ટમ દૃશ્યમાં સંપર્કો</string>
+  <string name="listSingleContact">એકલ સંપર્ક</string>
+  <string name="display_options_sort_list_by">આ પ્રમાણે સૉર્ટ કરો</string>
+  <string name="display_options_sort_by_given_name">પ્રથમ નામ</string>
+  <string name="display_options_sort_by_family_name">છેલ્લું નામ</string>
+  <string name="display_options_view_names_as">નામ ફોર્મેટ</string>
+  <string name="display_options_view_given_name_first">પ્રથમ નામ પહેલા</string>
+  <string name="display_options_view_family_name_first">છેલ્લું નામ પહેલા</string>
+  <string name="menu_clear_frequents">વારંવારના સાફ કરો</string>
+  <string name="action_menu_back_from_search">શોધવાનું રોકો</string>
+  <string name="description_clear_search">શોધ સાફ કરો</string>
+  <string name="select_account_dialog_title">એકાઉન્ટ</string>
+  <string name="set_default_account">કૉલ્સ માટે આનો ઉપયોગ હંમેશાં કરો</string>
+  <string name="select_phone_account_for_calls">આ કૉલ માટે સિમ પસંદ કરો</string>
+  <string name="select_phone_account_for_calls_remember">આ પસંદ યાદ રાખો</string>
+  <string name="call_with_a_note">નોંધ સાથે કૉલ કરો</string>
+  <string name="call_subject_hint">કૉલ સાથે મોકલવા માટે એક નોંધ લખો ...</string>
+  <string name="send_and_call_button">મોકલો અને કૉલ કરો</string>
+  <string name="call_subject_limit">%1$s / %2$s</string>
+  <string name="old_call_subject_type_and_number">%1$s %2$s</string>
+  <string name="tab_title">%1$s ટૅબ.</string>
+  <plurals name="tab_title_with_unread_items">
+    <item quantity="one"> %1$s ટૅબ. %2$d વાંચ્યા વગરની આઇટમ. </item>
+    <item quantity="other"> %1$s ટૅબ. %2$d વાંચ્યા વગરની આઇટમ. </item>
+  </plurals>
+  <string name="description_search_video_call">વિડિઓ કૉલ</string>
+  <string name="description_search_call_and_share">શેર કરો અને કૉલ કરો</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-hi/strings.xml b/java/com/android/contacts/common/res/values-hi/strings.xml
index 1d49d79..1cbee95 100644
--- a/java/com/android/contacts/common/res/values-hi/strings.xml
+++ b/java/com/android/contacts/common/res/values-hi/strings.xml
@@ -1,162 +1,145 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="toast_text_copied" msgid="8979281391599667362">"लेख को कॉपी किया गया"</string>
-    <string name="call_custom" msgid="3041673234638990874">"<xliff:g id="CUSTOM">%s</xliff:g> पर कॉल करें"</string>
-    <string name="call_home" msgid="125893483593803791">"घर के फ़ोन नंबर पर कॉल करें"</string>
-    <string name="call_mobile" msgid="967589404494150813">"मोबाइल पर कॉल करें"</string>
-    <string name="call_work" msgid="6040550697395300892">"कार्यालय के फ़ोन नंबर पर कॉल करें"</string>
-    <string name="call_fax_work" msgid="5260192771364592922">"कार्यालय के फ़ैक्स पर कॉल करें"</string>
-    <string name="call_fax_home" msgid="5174311195081144124">"घर के फ़ैक्स पर कॉल करें"</string>
-    <string name="call_pager" msgid="6814149227741274161">"पेजर पर कॉल करें"</string>
-    <string name="call_other" msgid="5536385588712587235">"कॉल करें"</string>
-    <string name="call_callback" msgid="6314019862718112786">"कॉलबैक नंबर पर कॉल करें"</string>
-    <string name="call_car" msgid="3197417098027764954">"कार फ़ोन पर कॉल करें"</string>
-    <string name="call_company_main" msgid="2557663310028446397">"कंपनी के मुख्य नंबर पर कॉल करें"</string>
-    <string name="call_isdn" msgid="4691270442763649522">"ISDN पर कॉल करें"</string>
-    <string name="call_main" msgid="3293707608770407814">"मुख्य फ़ोन नंबर पर कॉल करें"</string>
-    <string name="call_other_fax" msgid="4724521984879021465">"फ़ैक्स पर कॉल करें"</string>
-    <string name="call_radio" msgid="8942441419845057942">"रेडियो फ़ोन नंबर पर कॉल करें"</string>
-    <string name="call_telex" msgid="2031514461660668351">"टेलेक्स पर कॉल करें"</string>
-    <string name="call_tty_tdd" msgid="7807210224965727701">"TTY/TDD पर कॉल करें"</string>
-    <string name="call_work_mobile" msgid="2716342732938578495">"कार्यालय के मोबाइल पर कॉल करें"</string>
-    <string name="call_work_pager" msgid="3791778749827366574">"कार्यालय के पेजर पर कॉल करें"</string>
-    <string name="call_assistant" msgid="4177478845473789294">"<xliff:g id="ASSISTANT">%s</xliff:g> पर कॉल करें"</string>
-    <string name="call_mms" msgid="4958811711741872901">"MMS पर कॉल करें"</string>
-    <string name="sms_custom" msgid="8785368968605026317">"<xliff:g id="CUSTOM">%s</xliff:g> पर लेख संदेश भेजें"</string>
-    <string name="sms_home" msgid="3527719551060295243">"घर के फ़ोन नंबर पर लेख संदेश भेजें"</string>
-    <string name="sms_mobile" msgid="8883045857887736518">"मोबाइल पर लेख संदेश भेजें"</string>
-    <string name="sms_work" msgid="4158595439553450966">"कार्यालय के फ़ोन नंबर पर लेख संदेश भेजें"</string>
-    <string name="sms_fax_work" msgid="5483726627718055248">"कार्यालय के फ़ैक्स पर लेख संदेश भेजें"</string>
-    <string name="sms_fax_home" msgid="9219265155770746077">"घर के फ़ैक्स पर लेख संदेश भेजें"</string>
-    <string name="sms_pager" msgid="4901085068525193933">"पेजर पर लेख संदेश भेजें"</string>
-    <string name="sms_other" msgid="1742702947993285933">"लेख संदेश भेजें"</string>
-    <string name="sms_callback" msgid="5833483630377538308">"कॉलबैक फ़ोन नंबर पर लेख संदेश भेजें"</string>
-    <string name="sms_car" msgid="4314577266154395174">"कार फ़ोन नंबर पर लेख संदेश भेजें"</string>
-    <string name="sms_company_main" msgid="2308160928487360705">"कंपनी के मुख्य फ़ोन नंबर पर लेख संदेश भेजें"</string>
-    <string name="sms_isdn" msgid="6394300346179302542">"ISDN पर लेख संदेश भेजें"</string>
-    <string name="sms_main" msgid="8908087742014140774">"मुख्य फ़ोन नंबर पर लेख संदेश भेजें"</string>
-    <string name="sms_other_fax" msgid="8768455473295405427">"फ़ैक्स पर लेख संदेश भेजें"</string>
-    <string name="sms_radio" msgid="855555176531704682">"रेडियो फ़ोन नंबर पर लेख संदेश भेजें"</string>
-    <string name="sms_telex" msgid="6269029276223252719">"टेलेक्स पर लेख संदेश भेजें"</string>
-    <string name="sms_tty_tdd" msgid="6229057354509192444">"TTY/TDD पर लेख संदेश भेजें"</string>
-    <string name="sms_work_mobile" msgid="2155975469329969840">"कार्यालय के मोबाइल पर लेख संदेश भेजें"</string>
-    <string name="sms_work_pager" msgid="8500140274906830742">"कार्यालय के पेजर पर लेख संदेश भेजें"</string>
-    <string name="sms_assistant" msgid="8513548482745330818">"<xliff:g id="ASSISTANT">%s</xliff:g> पर लेख संदेश भेजें"</string>
-    <string name="sms_mms" msgid="5187888900503248542">"MMS पर लेख संदेश भेजें"</string>
-    <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"अक्‍सर किए जाने वाले संपर्क साफ करें?"</string>
-    <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"आपको संपर्क और फ़ोन ऐप्स से अक्सर संपर्क किए जाने वाली सूची साफ़ करनी होगी, और अपने ईमेल ऐप्स को आपकी पता प्राथमिकताओं को प्रारंभ से जानने के लिए बाध्य करना होगा."</string>
-    <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"अक्सर किए जाने वाले संपर्क साफ कर रहा है…"</string>
-    <string name="status_available" msgid="2648156525685472626">"उपलब्ध"</string>
-    <string name="status_away" msgid="2298688367552893953">"दूर"</string>
-    <string name="status_busy" msgid="5990832098713248503">"व्यस्त"</string>
-    <string name="contactsList" msgid="8806067891419291513">"संपर्क"</string>
-    <string name="contact_suggestions" msgid="3324166754807120006">"शीर्ष सुझाव"</string>
-    <string name="local_invisible_directory" msgid="4723238462733650090">"अन्य"</string>
-    <string name="directory_search_label" msgid="4621215895484025229">"निर्देशिका"</string>
-    <string name="directory_search_label_work" msgid="7679326282707414897">"कार्य निर्देशिका"</string>
-    <string name="local_search_label" msgid="907622822323119235">"सभी संपर्क"</string>
-    <string name="local_suggestions_search_label" msgid="1178575146224386118">"सुझाव"</string>
-    <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"मुझे"</string>
-    <string name="missing_name" msgid="978606963362745020">"(कोई नाम नहीं)"</string>
-    <string name="description_view_contact_detail" msgid="2428742401208561136">"संपर्क देखें"</string>
-    <string name="list_filter_phones" msgid="8763316061763437182">"फ़ोन नंबरों वाले सभी संपर्क"</string>
-    <string name="list_filter_phones_work" msgid="7083575404573422965">"कार्य प्रोफ़ाइल के संपर्क"</string>
-    <string name="view_updates_from_group" msgid="9011641093168385729">"नई जानकारी देखें"</string>
-    <string name="account_phone" msgid="7067809073194061035">"केवल-डिवाइस के लिए, असमन्वयित"</string>
-    <string name="nameLabelsGroup" msgid="7730465833159557471">"नाम"</string>
-    <string name="nicknameLabelsGroup" msgid="6310556912361840029">"प्रचलित नाम"</string>
-    <string name="full_name" msgid="648186563998465740">"नाम"</string>
-    <string name="name_given" msgid="5096576006314820536">"नाम"</string>
-    <string name="name_family" msgid="6646235805198547467">"उपनाम"</string>
-    <string name="name_prefix" msgid="9215326539658838">"नाम का प्रारंभिक भाग"</string>
-    <string name="name_middle" msgid="703755205331582769">"मध्य नाम"</string>
-    <string name="name_suffix" msgid="5777083390282548702">"नाम का अंतिम भाग"</string>
-    <string name="name_phonetic" msgid="1650870996361663089">"फ़ोनेटिक नाम"</string>
-    <string name="name_phonetic_given" msgid="618812334274603170">"फ़ोनेटिक नाम"</string>
-    <string name="name_phonetic_middle" msgid="4826820763384625538">"फ़ोनेटिक मध्य नाम"</string>
-    <string name="name_phonetic_family" msgid="379905191212930771">"फ़ोनेटिक उपनाम"</string>
-    <string name="phoneLabelsGroup" msgid="169661929021355548">"फ़ोन"</string>
-    <string name="emailLabelsGroup" msgid="2249752810477488833">"ईमेल करें"</string>
-    <string name="postalLabelsGroup" msgid="6772000590189142253">"पता"</string>
-    <string name="imLabelsGroup" msgid="5718066254237364731">"IM"</string>
-    <string name="organizationLabelsGroup" msgid="1101996309241601435">"संगठन"</string>
-    <string name="relationLabelsGroup" msgid="53866051664600053">"संबंध"</string>
-    <string name="eventLabelsGroup" msgid="1236970042646618489">"विशेष दिनांक"</string>
-    <string name="sms" msgid="7574344928185328095">"लेख संदेश"</string>
-    <string name="postal_address" msgid="1804707930129674200">"पता"</string>
-    <string name="ghostData_company" msgid="2554310786296833424">"कंपनी"</string>
-    <string name="ghostData_title" msgid="4994968731830184837">"शीर्षक"</string>
-    <string name="label_notes" msgid="2050255313694219786">"नोट"</string>
-    <string name="label_sip_address" msgid="8883266182575965926">"SIP"</string>
-    <string name="websiteLabelsGroup" msgid="1630734286462186790">"वेबसाइट"</string>
-    <string name="groupsLabel" msgid="2694002798416868728">"समूह"</string>
-    <string name="email_home" msgid="889830029388962171">"घर के ईमेल पते पर ईमेल करें"</string>
-    <string name="email_mobile" msgid="4487686436743741150">"मोबाइल ईमेल पते पर ईमेल करें"</string>
-    <string name="email_work" msgid="4223487303344613528">"कार्यालय के ईमेल पते पर ईमेल करें"</string>
-    <string name="email_other" msgid="4246411900126012062">"ईमेल करें"</string>
-    <string name="email_custom" msgid="7246580894327511013">"<xliff:g id="CUSTOM">%s</xliff:g> पर ईमेल करें"</string>
-    <string name="email" msgid="2807318537887091606">"ईमेल करें"</string>
-    <string name="postal_street" msgid="6918171741240802474">"मार्ग का नाम"</string>
-    <string name="postal_city" msgid="8674569121430005628">"शहर"</string>
-    <string name="postal_region" msgid="1730369286225469192">"राज्य"</string>
-    <string name="postal_postcode" msgid="4450700741261990439">"पिन कोड"</string>
-    <string name="postal_country" msgid="232670707458768148">"देश"</string>
-    <string name="map_home" msgid="4181131107392126938">"घर का पता देखें"</string>
-    <string name="map_work" msgid="5723471185992684400">"कार्यालय का पता देखें"</string>
-    <string name="map_other" msgid="2253764780863500516">"पता देखें"</string>
-    <string name="map_custom" msgid="5581743097882436157">"<xliff:g id="CUSTOM">%s</xliff:g> पता देखें"</string>
-    <string name="chat_aim" msgid="2954364435497941659">"AIM का उपयोग करके बातचीत करें"</string>
-    <string name="chat_msn" msgid="3130135239071228678">"Windows Live का उपयोग करके बातचीत करें"</string>
-    <string name="chat_yahoo" msgid="3233552142326865347">"Yahoo का उपयोग करके बातचीत करें"</string>
-    <string name="chat_skype" msgid="6486703981390592425">"Skype का उपयोग करके बातचीत करें"</string>
-    <string name="chat_qq" msgid="786924280665740019">"QQ का उपयोग करके बातचीत करें"</string>
-    <string name="chat_gtalk" msgid="7914674177243078035">"Google टॉक का उपयोग करके बातचीत करें"</string>
-    <string name="chat_icq" msgid="3292934726414765801">"ICQ का उपयोग करके बातचीत करें"</string>
-    <string name="chat_jabber" msgid="6701542313597880204">"Jabber का उपयोग करके बातचीत करें"</string>
-    <string name="chat" msgid="1020428260359370236">"बातचीत करें"</string>
-    <string name="list_filter_all_accounts" msgid="473782314881473992">"सभी संपर्क"</string>
-    <string name="listAllContactsInAccount" msgid="3486378621592995630">"<xliff:g id="NAME">%s</xliff:g> के संपर्क"</string>
-    <string name="listCustomView" msgid="5306282632413086731">"कस्टम दृश्य में संपर्क"</string>
-    <string name="listSingleContact" msgid="8620818791932382627">"एकल संपर्क"</string>
-    <string name="display_options_sort_list_by" msgid="3541875948367831228">"इससे क्रमित करें"</string>
-    <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"नाम"</string>
-    <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"उपनाम"</string>
-    <string name="display_options_view_names_as" msgid="4204204205736735618">"नाम प्रारूप"</string>
-    <string name="display_options_view_given_name_first" msgid="2308026973021171020">"नाम पहले"</string>
-    <string name="display_options_view_family_name_first" msgid="987430497292428242">"उपनाम पहले"</string>
-    <string name="menu_clear_frequents" msgid="5358271535047496120">"अक्सर किए जाने वाले साफ़ करें"</string>
-    <string name="action_menu_back_from_search" msgid="3550669942742167644">"खोजना बंद करें"</string>
-    <string name="description_clear_search" msgid="2347258825265600782">"खोज साफ़ करें"</string>
-    <string name="select_account_dialog_title" msgid="2673504582803359239">"खाता"</string>
-    <string name="set_default_account" msgid="7966099951006467572">"कॉल के लिए हमेशा इसका उपयोग करें"</string>
-    <string name="select_phone_account_for_calls" msgid="1784460686103423274">"इस सिम से कॉल करें"</string>
-    <string name="call_with_a_note" msgid="6242261320491851133">"नोट के साथ कॉल करें"</string>
-    <string name="call_subject_hint" msgid="7233138753650420800">"कॉल के साथ भेजने के लिए नोट लिखें ..."</string>
-    <string name="send_and_call_button" msgid="4735168294120154013">"भेजें और कॉल करें"</string>
-    <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="tab_title" msgid="3387876802026074288">"<xliff:g id="TITLE">%1$s</xliff:g> टैब."</string>
-    <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
-      <item quantity="one"> <xliff:g id="TITLE_2">%1$s</xliff:g> टैब. <xliff:g id="COUNT_3">%2$d</xliff:g> नहीं पढ़े गए आइटम. </item>
-      <item quantity="other"> <xliff:g id="TITLE_2">%1$s</xliff:g> टैब. <xliff:g id="COUNT_3">%2$d</xliff:g> नहीं पढ़े गए आइटम. </item>
-    </plurals>
-    <string name="description_search_video_call" msgid="4337369876888024909">"वीडियो कॉल"</string>
-    <string name="description_search_call_and_share" msgid="4912772842755050467">"साझा करें और कॉल करें"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_custom">%s पर कॉल करें</string>
+  <string name="call_home">घर के फ़ोन नंबर पर कॉल करें</string>
+  <string name="call_mobile">मोबाइल पर कॉल करें</string>
+  <string name="call_work">कार्यालय के फ़ोन नंबर पर कॉल करें</string>
+  <string name="call_fax_work">कार्यालय के फ़ैक्स पर कॉल करें</string>
+  <string name="call_fax_home">घर के फ़ैक्स पर कॉल करें</string>
+  <string name="call_pager">पेजर पर कॉल करें</string>
+  <string name="call_other">कॉल करें</string>
+  <string name="call_callback">कॉलबैक नंबर पर कॉल करें</string>
+  <string name="call_car">कार फ़ोन पर कॉल करें</string>
+  <string name="call_company_main">कंपनी के मुख्य नंबर पर कॉल करें</string>
+  <string name="call_isdn">ISDN पर कॉल करें</string>
+  <string name="call_main">मुख्य फ़ोन नंबर पर कॉल करें</string>
+  <string name="call_other_fax">फ़ैक्स पर कॉल करें</string>
+  <string name="call_radio">रेडियो फ़ोन नंबर पर कॉल करें</string>
+  <string name="call_telex">टेलेक्स पर कॉल करें</string>
+  <string name="call_tty_tdd">TTY/TDD पर कॉल करें</string>
+  <string name="call_work_mobile">कार्यालय के मोबाइल पर कॉल करें</string>
+  <string name="call_work_pager">कार्यालय के पेजर पर कॉल करें</string>
+  <string name="call_assistant">%s पर कॉल करें</string>
+  <string name="call_mms">MMS पर कॉल करें</string>
+  <string name="sms_custom">%s पर लेख संदेश भेजें</string>
+  <string name="sms_home">घर के फ़ोन नंबर पर लेख संदेश भेजें</string>
+  <string name="sms_mobile">मोबाइल पर लेख संदेश भेजें</string>
+  <string name="sms_work">कार्यालय के फ़ोन नंबर पर लेख संदेश भेजें</string>
+  <string name="sms_fax_work">कार्यालय के फ़ैक्स पर लेख संदेश भेजें</string>
+  <string name="sms_fax_home">घर के फ़ैक्स पर लेख संदेश भेजें</string>
+  <string name="sms_pager">पेजर पर लेख संदेश भेजें</string>
+  <string name="sms_other">लेख संदेश भेजें</string>
+  <string name="sms_callback">कॉलबैक फ़ोन नंबर पर लेख संदेश भेजें</string>
+  <string name="sms_car">कार फ़ोन नंबर पर लेख संदेश भेजें</string>
+  <string name="sms_company_main">कंपनी के मुख्य फ़ोन नंबर पर लेख संदेश भेजें</string>
+  <string name="sms_isdn">ISDN पर लेख संदेश भेजें</string>
+  <string name="sms_main">मुख्य फ़ोन नंबर पर लेख संदेश भेजें</string>
+  <string name="sms_other_fax">फ़ैक्स पर लेख संदेश भेजें</string>
+  <string name="sms_radio">रेडियो फ़ोन नंबर पर लेख संदेश भेजें</string>
+  <string name="sms_telex">टेलेक्स पर लेख संदेश भेजें</string>
+  <string name="sms_tty_tdd">TTY/TDD पर लेख संदेश भेजें</string>
+  <string name="sms_work_mobile">कार्यालय के मोबाइल पर लेख संदेश भेजें</string>
+  <string name="sms_work_pager">कार्यालय के पेजर पर लेख संदेश भेजें</string>
+  <string name="sms_assistant">%s पर लेख संदेश भेजें</string>
+  <string name="sms_mms">MMS पर लेख संदेश भेजें</string>
+  <string name="clearFrequentsConfirmation_title">अक्‍सर किए जाने वाले संपर्क साफ करें?</string>
+  <string name="clearFrequentsConfirmation">आपको संपर्क और फ़ोन ऐप्स से अक्सर संपर्क किए जाने वाली सूची साफ़ करनी होगी, और अपने ईमेल ऐप्स को आपकी पता प्राथमिकताओं को प्रारंभ से जानने के लिए बाध्य करना होगा.</string>
+  <string name="clearFrequentsProgress_title">अक्सर किए जाने वाले संपर्क साफ कर रहा है…</string>
+  <string name="status_available">उपलब्ध</string>
+  <string name="status_away">दूर</string>
+  <string name="status_busy">व्यस्त</string>
+  <string name="contactsList">संपर्क</string>
+  <string name="contact_suggestions">शीर्ष सुझाव</string>
+  <string name="local_invisible_directory">अन्य</string>
+  <string name="directory_search_label">निर्देशिका</string>
+  <string name="directory_search_label_work">कार्य निर्देशिका</string>
+  <string name="local_search_label">सभी संपर्क</string>
+  <string name="local_suggestions_search_label">सुझाव</string>
+  <string msgid="9154761216179882405" name="user_profile_contacts_list_header">मुझे</string>
+  <string name="missing_name">(कोई नाम नहीं)</string>
+  <string msgid="2795575601596468581" name="description_view_contact_detail">संपर्क देखें</string>
+  <string name="list_filter_phones">फ़ोन नंबरों वाले सभी संपर्क</string>
+  <string name="list_filter_phones_work">कार्य प्रोफ़ाइल के संपर्क</string>
+  <string name="view_updates_from_group">नई जानकारी देखें</string>
+  <string name="account_phone">केवल-डिवाइस के लिए, असमन्वयित</string>
+  <string name="nameLabelsGroup">नाम</string>
+  <string name="nicknameLabelsGroup">प्रचलित नाम</string>
+  <string name="full_name">नाम</string>
+  <string name="name_given">नाम</string>
+  <string name="name_family">उपनाम</string>
+  <string name="name_prefix">नाम का प्रारंभिक भाग</string>
+  <string name="name_middle">मध्य नाम</string>
+  <string name="name_suffix">नाम का अंतिम भाग</string>
+  <string name="name_phonetic">फ़ोनेटिक नाम</string>
+  <string name="name_phonetic_given">फ़ोनेटिक नाम</string>
+  <string name="name_phonetic_middle">फ़ोनेटिक मध्य नाम</string>
+  <string name="name_phonetic_family">फ़ोनेटिक उपनाम</string>
+  <string name="phoneLabelsGroup">फ़ोन</string>
+  <string name="emailLabelsGroup">ईमेल करें</string>
+  <string name="postalLabelsGroup">पता</string>
+  <string name="imLabelsGroup">IM</string>
+  <string name="organizationLabelsGroup">संगठन</string>
+  <string name="relationLabelsGroup">संबंध</string>
+  <string name="eventLabelsGroup">विशेष दिनांक</string>
+  <string name="sms">लेख संदेश</string>
+  <string name="postal_address">पता</string>
+  <string name="ghostData_company">कंपनी</string>
+  <string name="ghostData_title">शीर्षक</string>
+  <string name="label_notes">नोट</string>
+  <string name="label_sip_address">एसआईपी</string>
+  <string name="websiteLabelsGroup">वेबसाइट</string>
+  <string name="groupsLabel">समूह</string>
+  <string name="email_home">घर के ईमेल पते पर ईमेल करें</string>
+  <string name="email_mobile">मोबाइल ईमेल पते पर ईमेल करें</string>
+  <string name="email_work">कार्यालय के ईमेल पते पर ईमेल करें</string>
+  <string name="email_other">ईमेल करें</string>
+  <string name="email_custom">%s पर ईमेल करें</string>
+  <string name="email">ईमेल करें</string>
+  <string name="postal_street">मार्ग का नाम</string>
+  <string name="postal_city">शहर</string>
+  <string name="postal_region">राज्य</string>
+  <string name="postal_postcode">पिन कोड</string>
+  <string name="postal_country">देश</string>
+  <string name="map_home">घर का पता देखें</string>
+  <string name="map_work">कार्यालय का पता देखें</string>
+  <string name="map_other">पता देखें</string>
+  <string name="map_custom">%s पता देखें</string>
+  <string name="chat_aim">AIM का उपयोग करके बातचीत करें</string>
+  <string name="chat_msn">Windows Live का उपयोग करके बातचीत करें</string>
+  <string name="chat_yahoo">Yahoo का उपयोग करके बातचीत करें</string>
+  <string name="chat_skype">Skype का उपयोग करके बातचीत करें</string>
+  <string name="chat_qq">QQ का उपयोग करके बातचीत करें</string>
+  <string name="chat_gtalk">Google टॉक का उपयोग करके बातचीत करें</string>
+  <string name="chat_icq">ICQ का उपयोग करके बातचीत करें</string>
+  <string name="chat_jabber">Jabber का उपयोग करके बातचीत करें</string>
+  <string name="chat">बातचीत करें</string>
+  <string name="list_filter_all_accounts">सभी संपर्क</string>
+  <string name="listAllContactsInAccount">%s के संपर्क</string>
+  <string name="listCustomView">कस्टम दृश्य में संपर्क</string>
+  <string name="listSingleContact">एकल संपर्क</string>
+  <string name="display_options_sort_list_by">इससे क्रमित करें</string>
+  <string name="display_options_sort_by_given_name">नाम</string>
+  <string name="display_options_sort_by_family_name">उपनाम</string>
+  <string name="display_options_view_names_as">नाम प्रारूप</string>
+  <string name="display_options_view_given_name_first">नाम पहले</string>
+  <string name="display_options_view_family_name_first">उपनाम पहले</string>
+  <string name="menu_clear_frequents">अक्सर किए जाने वाले साफ़ करें</string>
+  <string name="action_menu_back_from_search">खोजना बंद करें</string>
+  <string name="description_clear_search">खोज साफ़ करें</string>
+  <string name="select_account_dialog_title">खाता</string>
+  <string name="set_default_account">कॉल के लिए हमेशा इसका उपयोग करें</string>
+  <string name="select_phone_account_for_calls">इस कॉल के लिए सिम चुनें</string>
+  <string name="select_phone_account_for_calls_remember">यह चयन याद रखें</string>
+  <string name="call_with_a_note">नोट के साथ कॉल करें</string>
+  <string name="call_subject_hint">कॉल के साथ भेजने के लिए नोट लिखें ...</string>
+  <string name="send_and_call_button">भेजें और कॉल करें</string>
+  <string name="call_subject_limit">%1$s / %2$s</string>
+  <string name="old_call_subject_type_and_number">%1$s %2$s</string>
+  <string name="tab_title">%1$s टैब.</string>
+  <plurals name="tab_title_with_unread_items">
+    <item quantity="one"> %1$s टैब. %2$d नहीं पढ़े गए आइटम. </item>
+    <item quantity="other"> %1$s टैब. %2$d नहीं पढ़े गए आइटम. </item>
+  </plurals>
+  <string name="description_search_video_call">वीडियो कॉल</string>
+  <string name="description_search_call_and_share">शेयर करें और कॉल करें</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-hr/strings.xml b/java/com/android/contacts/common/res/values-hr/strings.xml
index 2aa9272..e8d2b56 100644
--- a/java/com/android/contacts/common/res/values-hr/strings.xml
+++ b/java/com/android/contacts/common/res/values-hr/strings.xml
@@ -1,163 +1,146 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="toast_text_copied" msgid="8979281391599667362">"Tekst kopiran"</string>
-    <string name="call_custom" msgid="3041673234638990874">"Nazovi <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="call_home" msgid="125893483593803791">"Nazovi kućni broj"</string>
-    <string name="call_mobile" msgid="967589404494150813">"Nazovi mobitel"</string>
-    <string name="call_work" msgid="6040550697395300892">"Nazovi ured"</string>
-    <string name="call_fax_work" msgid="5260192771364592922">"Nazovi uredski faks"</string>
-    <string name="call_fax_home" msgid="5174311195081144124">"Nazovi kućni faks"</string>
-    <string name="call_pager" msgid="6814149227741274161">"Nazovi dojavljivač"</string>
-    <string name="call_other" msgid="5536385588712587235">"Nazovi"</string>
-    <string name="call_callback" msgid="6314019862718112786">"Uzvrati poziv"</string>
-    <string name="call_car" msgid="3197417098027764954">"Nazovi automobilski"</string>
-    <string name="call_company_main" msgid="2557663310028446397">"Nazovi glavni broj tvrtke"</string>
-    <string name="call_isdn" msgid="4691270442763649522">"Nazovi ISDN"</string>
-    <string name="call_main" msgid="3293707608770407814">"Nazovi glavni broj"</string>
-    <string name="call_other_fax" msgid="4724521984879021465">"Nazovi faks"</string>
-    <string name="call_radio" msgid="8942441419845057942">"Nazovi radio"</string>
-    <string name="call_telex" msgid="2031514461660668351">"Nazovi teleks"</string>
-    <string name="call_tty_tdd" msgid="7807210224965727701">"Nazovi TTY/TDD"</string>
-    <string name="call_work_mobile" msgid="2716342732938578495">"Nazovi poslovni mobitel"</string>
-    <string name="call_work_pager" msgid="3791778749827366574">"Nazovi poslovni dojavljivač"</string>
-    <string name="call_assistant" msgid="4177478845473789294">"Nazovi <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
-    <string name="call_mms" msgid="4958811711741872901">"Nazovi MMS"</string>
-    <string name="sms_custom" msgid="8785368968605026317">"Pošalji SMS na <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="sms_home" msgid="3527719551060295243">"Pošalji SMS na kućni"</string>
-    <string name="sms_mobile" msgid="8883045857887736518">"Pošalji SMS na mobitel"</string>
-    <string name="sms_work" msgid="4158595439553450966">"Pošalji SMS na uredski"</string>
-    <string name="sms_fax_work" msgid="5483726627718055248">"Pošalji SMS na uredski faks"</string>
-    <string name="sms_fax_home" msgid="9219265155770746077">"Pošalji SMS na kućni faks"</string>
-    <string name="sms_pager" msgid="4901085068525193933">"Pošalji SMS na dojavljivač"</string>
-    <string name="sms_other" msgid="1742702947993285933">"Pošalji SMS"</string>
-    <string name="sms_callback" msgid="5833483630377538308">"Pošalji SMS na povratni"</string>
-    <string name="sms_car" msgid="4314577266154395174">"Pošalji SMS na automobilski"</string>
-    <string name="sms_company_main" msgid="2308160928487360705">"Pošalji SMS na glavni u tvrtki"</string>
-    <string name="sms_isdn" msgid="6394300346179302542">"Pošalji SMS na ISDN"</string>
-    <string name="sms_main" msgid="8908087742014140774">"Pošalji SMS na glavni"</string>
-    <string name="sms_other_fax" msgid="8768455473295405427">"Pošalji SMS na faks"</string>
-    <string name="sms_radio" msgid="855555176531704682">"Pošalji SMS na radio"</string>
-    <string name="sms_telex" msgid="6269029276223252719">"Pošalji SMS na teleks"</string>
-    <string name="sms_tty_tdd" msgid="6229057354509192444">"Pošalji SMS na TTY/TDD"</string>
-    <string name="sms_work_mobile" msgid="2155975469329969840">"Pošalji SMS na poslovni mobitel"</string>
-    <string name="sms_work_pager" msgid="8500140274906830742">"Pošalji SMS na poslovni dojavljivač"</string>
-    <string name="sms_assistant" msgid="8513548482745330818">"Pošalji SMS na <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
-    <string name="sms_mms" msgid="5187888900503248542">"Pošalji SMS na MMS"</string>
-    <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"Brisati podatke o čestim kontaktima?"</string>
-    <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"Izbrisat ćete popis osoba s kojima često kontaktirate u aplikacijama Kontakti i Osobe, pa će aplikacije e-pošte morati ispočetka učiti vaše postavke adresiranja."</string>
-    <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"Brisanje često kontaktiranih..."</string>
-    <string name="status_available" msgid="2648156525685472626">"Dostupan"</string>
-    <string name="status_away" msgid="2298688367552893953">"Odsutan"</string>
-    <string name="status_busy" msgid="5990832098713248503">"Zauzet"</string>
-    <string name="contactsList" msgid="8806067891419291513">"Kontakti"</string>
-    <string name="contact_suggestions" msgid="3324166754807120006">"Najbolji prijedlozi"</string>
-    <string name="local_invisible_directory" msgid="4723238462733650090">"Drugo"</string>
-    <string name="directory_search_label" msgid="4621215895484025229">"Direktorij"</string>
-    <string name="directory_search_label_work" msgid="7679326282707414897">"Poslovni direktorij"</string>
-    <string name="local_search_label" msgid="907622822323119235">"Svi kontakti"</string>
-    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Prijedlozi"</string>
-    <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Ja"</string>
-    <string name="missing_name" msgid="978606963362745020">"(Bez imena)"</string>
-    <string name="description_view_contact_detail" msgid="2428742401208561136">"Prikaži kontakt"</string>
-    <string name="list_filter_phones" msgid="8763316061763437182">"Svi kontakti s telefonskim brojevima"</string>
-    <string name="list_filter_phones_work" msgid="7083575404573422965">"Poslovni kontakti"</string>
-    <string name="view_updates_from_group" msgid="9011641093168385729">"Prikaži ažuriranja"</string>
-    <string name="account_phone" msgid="7067809073194061035">"Samo uređaj, bez sinkronizacije"</string>
-    <string name="nameLabelsGroup" msgid="7730465833159557471">"Ime"</string>
-    <string name="nicknameLabelsGroup" msgid="6310556912361840029">"Nadimak"</string>
-    <string name="full_name" msgid="648186563998465740">"Ime"</string>
-    <string name="name_given" msgid="5096576006314820536">"Ime"</string>
-    <string name="name_family" msgid="6646235805198547467">"Prezime"</string>
-    <string name="name_prefix" msgid="9215326539658838">"Prefiks imena"</string>
-    <string name="name_middle" msgid="703755205331582769">"Srednje ime"</string>
-    <string name="name_suffix" msgid="5777083390282548702">"Sufiks imena"</string>
-    <string name="name_phonetic" msgid="1650870996361663089">"Ime fonetski"</string>
-    <string name="name_phonetic_given" msgid="618812334274603170">"Fonetski zapis imena"</string>
-    <string name="name_phonetic_middle" msgid="4826820763384625538">"Fonetski zapis srednjeg imena"</string>
-    <string name="name_phonetic_family" msgid="379905191212930771">"Fonetski zapis prezimena"</string>
-    <string name="phoneLabelsGroup" msgid="169661929021355548">"Telefon"</string>
-    <string name="emailLabelsGroup" msgid="2249752810477488833">"Pošalji e-poruku"</string>
-    <string name="postalLabelsGroup" msgid="6772000590189142253">"Adresa"</string>
-    <string name="imLabelsGroup" msgid="5718066254237364731">"IM"</string>
-    <string name="organizationLabelsGroup" msgid="1101996309241601435">"Organizacija"</string>
-    <string name="relationLabelsGroup" msgid="53866051664600053">"Odnos"</string>
-    <string name="eventLabelsGroup" msgid="1236970042646618489">"Poseban datum"</string>
-    <string name="sms" msgid="7574344928185328095">"SMS poruka"</string>
-    <string name="postal_address" msgid="1804707930129674200">"Adresa"</string>
-    <string name="ghostData_company" msgid="2554310786296833424">"Tvrtka"</string>
-    <string name="ghostData_title" msgid="4994968731830184837">"Naslov"</string>
-    <string name="label_notes" msgid="2050255313694219786">"Bilješke"</string>
-    <string name="label_sip_address" msgid="8883266182575965926">"SIP"</string>
-    <string name="websiteLabelsGroup" msgid="1630734286462186790">"Web-lokacija"</string>
-    <string name="groupsLabel" msgid="2694002798416868728">"Grupe"</string>
-    <string name="email_home" msgid="889830029388962171">"Pošalji e-poruku na kućnu e-adresu"</string>
-    <string name="email_mobile" msgid="4487686436743741150">"Pošalji e-poruku na mobilnu e-adresu"</string>
-    <string name="email_work" msgid="4223487303344613528">"Pošalji e-poruku na poslovnu e-adresu"</string>
-    <string name="email_other" msgid="4246411900126012062">"Pošalji e-poruku"</string>
-    <string name="email_custom" msgid="7246580894327511013">"Pošalji e-poruku kontaktu <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="email" msgid="2807318537887091606">"Pošalji e-poruku"</string>
-    <string name="postal_street" msgid="6918171741240802474">"Ulica"</string>
-    <string name="postal_city" msgid="8674569121430005628">"Grad"</string>
-    <string name="postal_region" msgid="1730369286225469192">"Država"</string>
-    <string name="postal_postcode" msgid="4450700741261990439">"Poštanski broj"</string>
-    <string name="postal_country" msgid="232670707458768148">"Zemlja"</string>
-    <string name="map_home" msgid="4181131107392126938">"Prikaz kućne adrese"</string>
-    <string name="map_work" msgid="5723471185992684400">"Prikaz adrese na poslu"</string>
-    <string name="map_other" msgid="2253764780863500516">"Prikaz adrese"</string>
-    <string name="map_custom" msgid="5581743097882436157">"Prikaz <xliff:g id="CUSTOM">%s</xliff:g> adrese"</string>
-    <string name="chat_aim" msgid="2954364435497941659">"Chatajte pomoću AIM-a"</string>
-    <string name="chat_msn" msgid="3130135239071228678">"Chatajte uz Windows Live"</string>
-    <string name="chat_yahoo" msgid="3233552142326865347">"Chatajte uz Yahoo"</string>
-    <string name="chat_skype" msgid="6486703981390592425">"Chatajte uz Skype"</string>
-    <string name="chat_qq" msgid="786924280665740019">"Chatajte uz QQ"</string>
-    <string name="chat_gtalk" msgid="7914674177243078035">"Chatajte uslugom Google Talk"</string>
-    <string name="chat_icq" msgid="3292934726414765801">"Chatajte pomoću ICQ-a"</string>
-    <string name="chat_jabber" msgid="6701542313597880204">"Chatajte uz Jabber"</string>
-    <string name="chat" msgid="1020428260359370236">"Chat"</string>
-    <string name="list_filter_all_accounts" msgid="473782314881473992">"Svi kontakti"</string>
-    <string name="listAllContactsInAccount" msgid="3486378621592995630">"Kontakti na računu <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="listCustomView" msgid="5306282632413086731">"Kontakti u prilagođenom prikazu"</string>
-    <string name="listSingleContact" msgid="8620818791932382627">"Jedan kontakt"</string>
-    <string name="display_options_sort_list_by" msgid="3541875948367831228">"Poredaj po"</string>
-    <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"Ime"</string>
-    <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"Prezime"</string>
-    <string name="display_options_view_names_as" msgid="4204204205736735618">"Oblik imena"</string>
-    <string name="display_options_view_given_name_first" msgid="2308026973021171020">"Najprije ime"</string>
-    <string name="display_options_view_family_name_first" msgid="987430497292428242">"Najprije prezime"</string>
-    <string name="menu_clear_frequents" msgid="5358271535047496120">"Briši često kontaktirane"</string>
-    <string name="action_menu_back_from_search" msgid="3550669942742167644">"zaustavi pretraživanje"</string>
-    <string name="description_clear_search" msgid="2347258825265600782">"Brisanje pretraživanja"</string>
-    <string name="select_account_dialog_title" msgid="2673504582803359239">"Račun"</string>
-    <string name="set_default_account" msgid="7966099951006467572">"Uvijek upotrebljavaj za pozive"</string>
-    <string name="select_phone_account_for_calls" msgid="1784460686103423274">"Poziv putem usluge"</string>
-    <string name="call_with_a_note" msgid="6242261320491851133">"Poziv uz bilješku"</string>
-    <string name="call_subject_hint" msgid="7233138753650420800">"Napišite bilješku koju ćete poslati uz poziv..."</string>
-    <string name="send_and_call_button" msgid="4735168294120154013">"POŠALJI I NAZOVI"</string>
-    <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g>/<xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="tab_title" msgid="3387876802026074288">"Kartica <xliff:g id="TITLE">%1$s</xliff:g>."</string>
-    <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
-      <item quantity="one"> Kartica <xliff:g id="TITLE_2">%1$s</xliff:g>. <xliff:g id="COUNT_3">%2$d</xliff:g> nepročitana stavka. </item>
-      <item quantity="few"> Kartica <xliff:g id="TITLE_2">%1$s</xliff:g>. <xliff:g id="COUNT_3">%2$d</xliff:g> nepročitane stavke. </item>
-      <item quantity="other"> Kartica <xliff:g id="TITLE_2">%1$s</xliff:g>. <xliff:g id="COUNT_3">%2$d</xliff:g> nepročitanih stavki. </item>
-    </plurals>
-    <string name="description_search_video_call" msgid="4337369876888024909">"Videopoziv"</string>
-    <string name="description_search_call_and_share" msgid="4912772842755050467">"Dijeli i pozovi"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_custom">Nazovi %s</string>
+  <string name="call_home">Nazovi kućni broj</string>
+  <string name="call_mobile">Nazovi mobitel</string>
+  <string name="call_work">Nazovi ured</string>
+  <string name="call_fax_work">Nazovi uredski faks</string>
+  <string name="call_fax_home">Nazovi kućni faks</string>
+  <string name="call_pager">Nazovi dojavljivač</string>
+  <string name="call_other">Nazovi</string>
+  <string name="call_callback">Uzvrati poziv</string>
+  <string name="call_car">Nazovi automobilski</string>
+  <string name="call_company_main">Nazovi glavni broj tvrtke</string>
+  <string name="call_isdn">Nazovi ISDN</string>
+  <string name="call_main">Nazovi glavni broj</string>
+  <string name="call_other_fax">Nazovi faks</string>
+  <string name="call_radio">Nazovi radio</string>
+  <string name="call_telex">Nazovi teleks</string>
+  <string name="call_tty_tdd">Nazovi TTY/TDD</string>
+  <string name="call_work_mobile">Nazovi poslovni mobitel</string>
+  <string name="call_work_pager">Nazovi poslovni dojavljivač</string>
+  <string name="call_assistant">Nazovi %s</string>
+  <string name="call_mms">Nazovi MMS</string>
+  <string name="sms_custom">Pošalji SMS na %s</string>
+  <string name="sms_home">Pošalji SMS na kućni</string>
+  <string name="sms_mobile">Pošalji SMS na mobitel</string>
+  <string name="sms_work">Pošalji SMS na uredski</string>
+  <string name="sms_fax_work">Pošalji SMS na uredski faks</string>
+  <string name="sms_fax_home">Pošalji SMS na kućni faks</string>
+  <string name="sms_pager">Pošalji SMS na dojavljivač</string>
+  <string name="sms_other">Pošalji SMS</string>
+  <string name="sms_callback">Pošalji SMS na povratni</string>
+  <string name="sms_car">Pošalji SMS na automobilski</string>
+  <string name="sms_company_main">Pošalji SMS na glavni u tvrtki</string>
+  <string name="sms_isdn">Pošalji SMS na ISDN</string>
+  <string name="sms_main">Pošalji SMS na glavni</string>
+  <string name="sms_other_fax">Pošalji SMS na faks</string>
+  <string name="sms_radio">Pošalji SMS na radio</string>
+  <string name="sms_telex">Pošalji SMS na teleks</string>
+  <string name="sms_tty_tdd">Pošalji SMS na TTY/TDD</string>
+  <string name="sms_work_mobile">Pošalji SMS na poslovni mobitel</string>
+  <string name="sms_work_pager">Pošalji SMS na poslovni dojavljivač</string>
+  <string name="sms_assistant">Pošalji SMS na %s</string>
+  <string name="sms_mms">Pošalji SMS na MMS</string>
+  <string name="clearFrequentsConfirmation_title">Brisati podatke o čestim kontaktima?</string>
+  <string name="clearFrequentsConfirmation">Izbrisat ćete popis osoba s kojima često kontaktirate u aplikacijama Kontakti i Osobe, pa će aplikacije e-pošte morati ispočetka učiti vaše postavke adresiranja.</string>
+  <string name="clearFrequentsProgress_title">Brisanje često kontaktiranih...</string>
+  <string name="status_available">Dostupan</string>
+  <string name="status_away">Odsutan</string>
+  <string name="status_busy">Zauzet</string>
+  <string name="contactsList">Kontakti</string>
+  <string name="contact_suggestions">Najbolji prijedlozi</string>
+  <string name="local_invisible_directory">Drugo</string>
+  <string name="directory_search_label">Direktorij</string>
+  <string name="directory_search_label_work">Poslovni direktorij</string>
+  <string name="local_search_label">Svi kontakti</string>
+  <string name="local_suggestions_search_label">Prijedlozi</string>
+  <string msgid="9154761216179882405" name="user_profile_contacts_list_header">Ja</string>
+  <string name="missing_name">(Bez imena)</string>
+  <string msgid="2795575601596468581" name="description_view_contact_detail">Prikaži kontakt</string>
+  <string name="list_filter_phones">Svi kontakti s telefonskim brojevima</string>
+  <string name="list_filter_phones_work">Poslovni kontakti</string>
+  <string name="view_updates_from_group">Prikaži ažuriranja</string>
+  <string name="account_phone">Samo uređaj, bez sinkronizacije</string>
+  <string name="nameLabelsGroup">Ime</string>
+  <string name="nicknameLabelsGroup">Nadimak</string>
+  <string name="full_name">Ime</string>
+  <string name="name_given">Ime</string>
+  <string name="name_family">Prezime</string>
+  <string name="name_prefix">Prefiks imena</string>
+  <string name="name_middle">Srednje ime</string>
+  <string name="name_suffix">Sufiks imena</string>
+  <string name="name_phonetic">Ime fonetski</string>
+  <string name="name_phonetic_given">Fonetski zapis imena</string>
+  <string name="name_phonetic_middle">Fonetski zapis srednjeg imena</string>
+  <string name="name_phonetic_family">Fonetski zapis prezimena</string>
+  <string name="phoneLabelsGroup">Telefon</string>
+  <string name="emailLabelsGroup">Pošalji e-poruku</string>
+  <string name="postalLabelsGroup">Adresa</string>
+  <string name="imLabelsGroup">IM</string>
+  <string name="organizationLabelsGroup">Organizacija</string>
+  <string name="relationLabelsGroup">Odnos</string>
+  <string name="eventLabelsGroup">Poseban datum</string>
+  <string name="sms">SMS poruka</string>
+  <string name="postal_address">Adresa</string>
+  <string name="ghostData_company">Tvrtka</string>
+  <string name="ghostData_title">Naslov</string>
+  <string name="label_notes">Bilješke</string>
+  <string name="label_sip_address">SIP</string>
+  <string name="websiteLabelsGroup">Web-lokacija</string>
+  <string name="groupsLabel">Grupe</string>
+  <string name="email_home">Pošalji e-poruku na kućnu e-adresu</string>
+  <string name="email_mobile">Pošalji e-poruku na mobilnu e-adresu</string>
+  <string name="email_work">Pošalji e-poruku na poslovnu e-adresu</string>
+  <string name="email_other">Pošalji e-poruku</string>
+  <string name="email_custom">Pošalji e-poruku kontaktu %s</string>
+  <string name="email">Pošalji e-poruku</string>
+  <string name="postal_street">Ulica</string>
+  <string name="postal_city">Grad</string>
+  <string name="postal_region">Država</string>
+  <string name="postal_postcode">Poštanski broj</string>
+  <string name="postal_country">Zemlja</string>
+  <string name="map_home">Prikaz kućne adrese</string>
+  <string name="map_work">Prikaz adrese na poslu</string>
+  <string name="map_other">Prikaz adrese</string>
+  <string name="map_custom">Prikaz %s adrese</string>
+  <string name="chat_aim">Chatajte pomoću AIM-a</string>
+  <string name="chat_msn">Chatajte uz Windows Live</string>
+  <string name="chat_yahoo">Chatajte uz Yahoo</string>
+  <string name="chat_skype">Chatajte uz Skype</string>
+  <string name="chat_qq">Chatajte uz QQ</string>
+  <string name="chat_gtalk">Chatajte uslugom Google Talk</string>
+  <string name="chat_icq">Chatajte pomoću ICQ-a</string>
+  <string name="chat_jabber">Chatajte uz Jabber</string>
+  <string name="chat">Chat</string>
+  <string name="list_filter_all_accounts">Svi kontakti</string>
+  <string name="listAllContactsInAccount">Kontakti na računu %s</string>
+  <string name="listCustomView">Kontakti u prilagođenom prikazu</string>
+  <string name="listSingleContact">Jedan kontakt</string>
+  <string name="display_options_sort_list_by">Poredaj po</string>
+  <string name="display_options_sort_by_given_name">Ime</string>
+  <string name="display_options_sort_by_family_name">Prezime</string>
+  <string name="display_options_view_names_as">Oblik imena</string>
+  <string name="display_options_view_given_name_first">Najprije ime</string>
+  <string name="display_options_view_family_name_first">Najprije prezime</string>
+  <string name="menu_clear_frequents">Briši često kontaktirane</string>
+  <string name="action_menu_back_from_search">zaustavi pretraživanje</string>
+  <string name="description_clear_search">Brisanje pretraživanja</string>
+  <string name="select_account_dialog_title">Račun</string>
+  <string name="set_default_account">Uvijek upotrebljavaj za pozive</string>
+  <string name="select_phone_account_for_calls">Odabir SIM-a za ovaj poziv</string>
+  <string name="select_phone_account_for_calls_remember">Zapamti ovaj odabir</string>
+  <string name="call_with_a_note">Poziv uz bilješku</string>
+  <string name="call_subject_hint">Napišite bilješku koju ćete poslati uz poziv...</string>
+  <string name="send_and_call_button">POŠALJI I NAZOVI</string>
+  <string name="call_subject_limit">%1$s/%2$s</string>
+  <string name="old_call_subject_type_and_number">%1$s %2$s</string>
+  <string name="tab_title">Kartica %1$s.</string>
+  <plurals name="tab_title_with_unread_items">
+    <item quantity="one"> Kartica %1$s. %2$d nepročitana stavka. </item>
+    <item quantity="few"> Kartica %1$s. %2$d nepročitane stavke. </item>
+    <item quantity="other"> Kartica %1$s. %2$d nepročitanih stavki. </item>
+  </plurals>
+  <string name="description_search_video_call">Videopoziv</string>
+  <string name="description_search_call_and_share">Dijeli i pozovi</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-hu/strings.xml b/java/com/android/contacts/common/res/values-hu/strings.xml
index 347609c..9f0d80a 100644
--- a/java/com/android/contacts/common/res/values-hu/strings.xml
+++ b/java/com/android/contacts/common/res/values-hu/strings.xml
@@ -1,162 +1,145 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="toast_text_copied" msgid="8979281391599667362">"Másolt szöveg"</string>
-    <string name="call_custom" msgid="3041673234638990874">"<xliff:g id="CUSTOM">%s</xliff:g> hívása"</string>
-    <string name="call_home" msgid="125893483593803791">"Otthoni szám hívása"</string>
-    <string name="call_mobile" msgid="967589404494150813">"Mobil hívása"</string>
-    <string name="call_work" msgid="6040550697395300892">"Munkahelyi telefon hívása"</string>
-    <string name="call_fax_work" msgid="5260192771364592922">"Munkahelyi fax hívása"</string>
-    <string name="call_fax_home" msgid="5174311195081144124">"Otthoni fax hívása"</string>
-    <string name="call_pager" msgid="6814149227741274161">"Csipogó hívása"</string>
-    <string name="call_other" msgid="5536385588712587235">"Hívás"</string>
-    <string name="call_callback" msgid="6314019862718112786">"Visszahívási szám hívása"</string>
-    <string name="call_car" msgid="3197417098027764954">"Gépkocsi hívása"</string>
-    <string name="call_company_main" msgid="2557663310028446397">"Céges fővonal hívása"</string>
-    <string name="call_isdn" msgid="4691270442763649522">"ISDN-telefon hívása"</string>
-    <string name="call_main" msgid="3293707608770407814">"Fő telefonszám hívása"</string>
-    <string name="call_other_fax" msgid="4724521984879021465">"Fax hívása"</string>
-    <string name="call_radio" msgid="8942441419845057942">"Rádiótelefon hívása"</string>
-    <string name="call_telex" msgid="2031514461660668351">"Telex hívása"</string>
-    <string name="call_tty_tdd" msgid="7807210224965727701">"TTY/TDD-szám hívása"</string>
-    <string name="call_work_mobile" msgid="2716342732938578495">"Munkahelyi mobil hívása"</string>
-    <string name="call_work_pager" msgid="3791778749827366574">"Munkahelyi csipogó hívása"</string>
-    <string name="call_assistant" msgid="4177478845473789294">"<xliff:g id="ASSISTANT">%s</xliff:g> hívása"</string>
-    <string name="call_mms" msgid="4958811711741872901">"MMS-ben szereplő telefonszám hívása"</string>
-    <string name="sms_custom" msgid="8785368968605026317">"SMS: <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="sms_home" msgid="3527719551060295243">"SMS küldése haza"</string>
-    <string name="sms_mobile" msgid="8883045857887736518">"SMS küldése mobiltelefonra"</string>
-    <string name="sms_work" msgid="4158595439553450966">"SMS küldése munkahelyi telefonra"</string>
-    <string name="sms_fax_work" msgid="5483726627718055248">"SMS küldése munkahelyi faxszámra"</string>
-    <string name="sms_fax_home" msgid="9219265155770746077">"SMS küldése otthoni faxszámra"</string>
-    <string name="sms_pager" msgid="4901085068525193933">"SMS küldése csipogóra"</string>
-    <string name="sms_other" msgid="1742702947993285933">"SMS küldése"</string>
-    <string name="sms_callback" msgid="5833483630377538308">"SMS küldése visszahívandó számra"</string>
-    <string name="sms_car" msgid="4314577266154395174">"SMS küldése gépkocsinak"</string>
-    <string name="sms_company_main" msgid="2308160928487360705">"SMS küldése a céges fővonalra"</string>
-    <string name="sms_isdn" msgid="6394300346179302542">"SMS küldése ISDN-telefonra"</string>
-    <string name="sms_main" msgid="8908087742014140774">"SMS küldése fő telefonszámra"</string>
-    <string name="sms_other_fax" msgid="8768455473295405427">"SMS küldése faxszámra"</string>
-    <string name="sms_radio" msgid="855555176531704682">"SMS küldése rádiótelefonra"</string>
-    <string name="sms_telex" msgid="6269029276223252719">"SMS küldése telexre"</string>
-    <string name="sms_tty_tdd" msgid="6229057354509192444">"SMS küldése szöveges telefonra (TTY/TDD)"</string>
-    <string name="sms_work_mobile" msgid="2155975469329969840">"SMS küldése munkahelyi mobilra"</string>
-    <string name="sms_work_pager" msgid="8500140274906830742">"SMS küldése munkahelyi csipogóra"</string>
-    <string name="sms_assistant" msgid="8513548482745330818">"SMS küldése ide: <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
-    <string name="sms_mms" msgid="5187888900503248542">"SMS küldése MMS-ben szereplő számra"</string>
-    <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"Törli a gyakran keresetteket?"</string>
-    <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"Törölni fogja a gyakran keresett személyek listáját a Névjegyek és a Telefon alkalmazásban, és arra kényszeríti az e-mail alkalmazásokat, hogy elölről kezdjék az Ön címzési szokásainak megtanulását."</string>
-    <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"Gyakran keresettek törlése..."</string>
-    <string name="status_available" msgid="2648156525685472626">"Elérhető"</string>
-    <string name="status_away" msgid="2298688367552893953">"Nincs a gépnél"</string>
-    <string name="status_busy" msgid="5990832098713248503">"Elfoglalt"</string>
-    <string name="contactsList" msgid="8806067891419291513">"Címtár"</string>
-    <string name="contact_suggestions" msgid="3324166754807120006">"Legjobb javaslatok"</string>
-    <string name="local_invisible_directory" msgid="4723238462733650090">"Egyéb"</string>
-    <string name="directory_search_label" msgid="4621215895484025229">"Címtár"</string>
-    <string name="directory_search_label_work" msgid="7679326282707414897">"Munkahelyi névjegyek címtára"</string>
-    <string name="local_search_label" msgid="907622822323119235">"Összes névjegy"</string>
-    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Javaslatok"</string>
-    <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Én"</string>
-    <string name="missing_name" msgid="978606963362745020">"(Nincs név)"</string>
-    <string name="description_view_contact_detail" msgid="2428742401208561136">"Névjegy megtekintése"</string>
-    <string name="list_filter_phones" msgid="8763316061763437182">"Minden névjegy telefonszámokkal"</string>
-    <string name="list_filter_phones_work" msgid="7083575404573422965">"Munkaprofilhoz tartozó névjegyek"</string>
-    <string name="view_updates_from_group" msgid="9011641093168385729">"Frissítések megtekintése"</string>
-    <string name="account_phone" msgid="7067809073194061035">"Csak az eszközön, nincs szinkronizálva"</string>
-    <string name="nameLabelsGroup" msgid="7730465833159557471">"Név"</string>
-    <string name="nicknameLabelsGroup" msgid="6310556912361840029">"Becenév"</string>
-    <string name="full_name" msgid="648186563998465740">"Név"</string>
-    <string name="name_given" msgid="5096576006314820536">"Utónév"</string>
-    <string name="name_family" msgid="6646235805198547467">"Vezetéknév"</string>
-    <string name="name_prefix" msgid="9215326539658838">"Név előtagja"</string>
-    <string name="name_middle" msgid="703755205331582769">"Második utónév"</string>
-    <string name="name_suffix" msgid="5777083390282548702">"Név utótagja"</string>
-    <string name="name_phonetic" msgid="1650870996361663089">"Név fonetikusan"</string>
-    <string name="name_phonetic_given" msgid="618812334274603170">"Utónév fonetikusan"</string>
-    <string name="name_phonetic_middle" msgid="4826820763384625538">"Második utónév fonetikusan"</string>
-    <string name="name_phonetic_family" msgid="379905191212930771">"Vezetéknév fonetikusan"</string>
-    <string name="phoneLabelsGroup" msgid="169661929021355548">"Telefon"</string>
-    <string name="emailLabelsGroup" msgid="2249752810477488833">"E-mail küldése"</string>
-    <string name="postalLabelsGroup" msgid="6772000590189142253">"Cím"</string>
-    <string name="imLabelsGroup" msgid="5718066254237364731">"IM"</string>
-    <string name="organizationLabelsGroup" msgid="1101996309241601435">"Szervezet"</string>
-    <string name="relationLabelsGroup" msgid="53866051664600053">"Kapcsolat"</string>
-    <string name="eventLabelsGroup" msgid="1236970042646618489">"Különleges dátum"</string>
-    <string name="sms" msgid="7574344928185328095">"Szöveges üzenet"</string>
-    <string name="postal_address" msgid="1804707930129674200">"Cím"</string>
-    <string name="ghostData_company" msgid="2554310786296833424">"Cég"</string>
-    <string name="ghostData_title" msgid="4994968731830184837">"Beosztás"</string>
-    <string name="label_notes" msgid="2050255313694219786">"Jegyzetek"</string>
-    <string name="label_sip_address" msgid="8883266182575965926">"SIP"</string>
-    <string name="websiteLabelsGroup" msgid="1630734286462186790">"Webhely"</string>
-    <string name="groupsLabel" msgid="2694002798416868728">"Csoportok"</string>
-    <string name="email_home" msgid="889830029388962171">"E-mail küldése haza"</string>
-    <string name="email_mobile" msgid="4487686436743741150">"E-mail küldése mobiltelefonra"</string>
-    <string name="email_work" msgid="4223487303344613528">"E-mail küldése munkahelyi címre"</string>
-    <string name="email_other" msgid="4246411900126012062">"E-mail küldése"</string>
-    <string name="email_custom" msgid="7246580894327511013">"E-mail küldése a(z) <xliff:g id="CUSTOM">%s</xliff:g> címre"</string>
-    <string name="email" msgid="2807318537887091606">"E-mail küldése"</string>
-    <string name="postal_street" msgid="6918171741240802474">"Utca, házszám"</string>
-    <string name="postal_city" msgid="8674569121430005628">"Település"</string>
-    <string name="postal_region" msgid="1730369286225469192">"Állam"</string>
-    <string name="postal_postcode" msgid="4450700741261990439">"Irányítószám"</string>
-    <string name="postal_country" msgid="232670707458768148">"Ország"</string>
-    <string name="map_home" msgid="4181131107392126938">"Otthoni cím megtekintése"</string>
-    <string name="map_work" msgid="5723471185992684400">"Munkahelyi cím megtekintése"</string>
-    <string name="map_other" msgid="2253764780863500516">"Cím megtekintése"</string>
-    <string name="map_custom" msgid="5581743097882436157">"<xliff:g id="CUSTOM">%s</xliff:g> cím megtekintése"</string>
-    <string name="chat_aim" msgid="2954364435497941659">"Csevegés AIM-on"</string>
-    <string name="chat_msn" msgid="3130135239071228678">"Csevegés a Windows Live-on"</string>
-    <string name="chat_yahoo" msgid="3233552142326865347">"Csevegés a Yahoon"</string>
-    <string name="chat_skype" msgid="6486703981390592425">"Csevegés Skype használatával"</string>
-    <string name="chat_qq" msgid="786924280665740019">"Csevegés a QQ-n"</string>
-    <string name="chat_gtalk" msgid="7914674177243078035">"Csevegés a Google Csevegő használatával"</string>
-    <string name="chat_icq" msgid="3292934726414765801">"Csevegés az ICQ-n"</string>
-    <string name="chat_jabber" msgid="6701542313597880204">"Csevegés Jabberen"</string>
-    <string name="chat" msgid="1020428260359370236">"Csevegés"</string>
-    <string name="list_filter_all_accounts" msgid="473782314881473992">"Az összes névjegy"</string>
-    <string name="listAllContactsInAccount" msgid="3486378621592995630">"Ismerősök itt: <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="listCustomView" msgid="5306282632413086731">"Egyéni nézet névjegyei"</string>
-    <string name="listSingleContact" msgid="8620818791932382627">"Egyetlen névjegy"</string>
-    <string name="display_options_sort_list_by" msgid="3541875948367831228">"Rendezés alapja"</string>
-    <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"Utónév"</string>
-    <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"Vezetéknév"</string>
-    <string name="display_options_view_names_as" msgid="4204204205736735618">"Névformátum"</string>
-    <string name="display_options_view_given_name_first" msgid="2308026973021171020">"Utónév elöl"</string>
-    <string name="display_options_view_family_name_first" msgid="987430497292428242">"Vezetéknév elöl"</string>
-    <string name="menu_clear_frequents" msgid="5358271535047496120">"Gyakran keresettek törlése"</string>
-    <string name="action_menu_back_from_search" msgid="3550669942742167644">"keresés leállítása"</string>
-    <string name="description_clear_search" msgid="2347258825265600782">"Keresés törlése"</string>
-    <string name="select_account_dialog_title" msgid="2673504582803359239">"Fiók"</string>
-    <string name="set_default_account" msgid="7966099951006467572">"Mindig ezt használja hívásokhoz"</string>
-    <string name="select_phone_account_for_calls" msgid="1784460686103423274">"Hívás a következővel:"</string>
-    <string name="call_with_a_note" msgid="6242261320491851133">"Hívás üzenettel"</string>
-    <string name="call_subject_hint" msgid="7233138753650420800">"Írjon üzenetet, amelyet elküldhetünk a hívással együtt…"</string>
-    <string name="send_and_call_button" msgid="4735168294120154013">"KÜLDÉS ÉS HÍVÁS"</string>
-    <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="LIMIT">%2$s</xliff:g>/<xliff:g id="COUNT">%1$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="tab_title" msgid="3387876802026074288">"<xliff:g id="TITLE">%1$s</xliff:g> lap."</string>
-    <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
-      <item quantity="other"> <xliff:g id="TITLE_2">%1$s</xliff:g> lap. <xliff:g id="COUNT_3">%2$d</xliff:g> olvasatlan elem. </item>
-      <item quantity="one"> <xliff:g id="TITLE_0">%1$s</xliff:g> lap. <xliff:g id="COUNT_1">%2$d</xliff:g> olvasatlan elem. </item>
-    </plurals>
-    <string name="description_search_video_call" msgid="4337369876888024909">"Videohívás"</string>
-    <string name="description_search_call_and_share" msgid="4912772842755050467">"Megosztás és hívás"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_custom">%s hívása</string>
+  <string name="call_home">Otthoni szám hívása</string>
+  <string name="call_mobile">Mobil hívása</string>
+  <string name="call_work">Munkahelyi telefon hívása</string>
+  <string name="call_fax_work">Munkahelyi fax hívása</string>
+  <string name="call_fax_home">Otthoni fax hívása</string>
+  <string name="call_pager">Csipogó hívása</string>
+  <string name="call_other">Hívás</string>
+  <string name="call_callback">Visszahívási szám hívása</string>
+  <string name="call_car">Gépkocsi hívása</string>
+  <string name="call_company_main">Céges fővonal hívása</string>
+  <string name="call_isdn">ISDN-telefon hívása</string>
+  <string name="call_main">Fő telefonszám hívása</string>
+  <string name="call_other_fax">Fax hívása</string>
+  <string name="call_radio">Rádiótelefon hívása</string>
+  <string name="call_telex">Telex hívása</string>
+  <string name="call_tty_tdd">TTY/TDD-szám hívása</string>
+  <string name="call_work_mobile">Munkahelyi mobil hívása</string>
+  <string name="call_work_pager">Munkahelyi csipogó hívása</string>
+  <string name="call_assistant">%s hívása</string>
+  <string name="call_mms">MMS-ben szereplő telefonszám hívása</string>
+  <string name="sms_custom">SMS: %s</string>
+  <string name="sms_home">SMS küldése haza</string>
+  <string name="sms_mobile">SMS küldése mobiltelefonra</string>
+  <string name="sms_work">SMS küldése munkahelyi telefonra</string>
+  <string name="sms_fax_work">SMS küldése munkahelyi faxszámra</string>
+  <string name="sms_fax_home">SMS küldése otthoni faxszámra</string>
+  <string name="sms_pager">SMS küldése csipogóra</string>
+  <string name="sms_other">SMS küldése</string>
+  <string name="sms_callback">SMS küldése visszahívandó számra</string>
+  <string name="sms_car">SMS küldése gépkocsinak</string>
+  <string name="sms_company_main">SMS küldése a céges fővonalra</string>
+  <string name="sms_isdn">SMS küldése ISDN-telefonra</string>
+  <string name="sms_main">SMS küldése fő telefonszámra</string>
+  <string name="sms_other_fax">SMS küldése faxszámra</string>
+  <string name="sms_radio">SMS küldése rádiótelefonra</string>
+  <string name="sms_telex">SMS küldése telexre</string>
+  <string name="sms_tty_tdd">SMS küldése szöveges telefonra (TTY/TDD)</string>
+  <string name="sms_work_mobile">SMS küldése munkahelyi mobilra</string>
+  <string name="sms_work_pager">SMS küldése munkahelyi csipogóra</string>
+  <string name="sms_assistant">SMS küldése ide: %s</string>
+  <string name="sms_mms">SMS küldése MMS-ben szereplő számra</string>
+  <string name="clearFrequentsConfirmation_title">Törli a gyakran keresetteket?</string>
+  <string name="clearFrequentsConfirmation">Törölni fogja a gyakran keresett személyek listáját a Névjegyek és a Telefon alkalmazásban, és arra kényszeríti az e-mail alkalmazásokat, hogy elölről kezdjék az Ön címzési szokásainak megtanulását.</string>
+  <string name="clearFrequentsProgress_title">Gyakran keresettek törlése...</string>
+  <string name="status_available">Elérhető</string>
+  <string name="status_away">Nincs a gépnél</string>
+  <string name="status_busy">Elfoglalt</string>
+  <string name="contactsList">Címtár</string>
+  <string name="contact_suggestions">Legjobb javaslatok</string>
+  <string name="local_invisible_directory">Egyéb</string>
+  <string name="directory_search_label">Címtár</string>
+  <string name="directory_search_label_work">Munkahelyi névjegyek címtára</string>
+  <string name="local_search_label">Összes névjegy</string>
+  <string name="local_suggestions_search_label">Javaslatok</string>
+  <string msgid="9154761216179882405" name="user_profile_contacts_list_header">Én</string>
+  <string name="missing_name">(Nincs név)</string>
+  <string msgid="2795575601596468581" name="description_view_contact_detail">Névjegy megtekintése</string>
+  <string name="list_filter_phones">Minden névjegy telefonszámokkal</string>
+  <string name="list_filter_phones_work">Munkaprofilhoz tartozó névjegyek</string>
+  <string name="view_updates_from_group">Frissítések megtekintése</string>
+  <string name="account_phone">Csak az eszközön, nincs szinkronizálva</string>
+  <string name="nameLabelsGroup">Név</string>
+  <string name="nicknameLabelsGroup">Becenév</string>
+  <string name="full_name">Név</string>
+  <string name="name_given">Utónév</string>
+  <string name="name_family">Vezetéknév</string>
+  <string name="name_prefix">Név előtagja</string>
+  <string name="name_middle">Második utónév</string>
+  <string name="name_suffix">Név utótagja</string>
+  <string name="name_phonetic">Név fonetikusan</string>
+  <string name="name_phonetic_given">Utónév fonetikusan</string>
+  <string name="name_phonetic_middle">Második utónév fonetikusan</string>
+  <string name="name_phonetic_family">Vezetéknév fonetikusan</string>
+  <string name="phoneLabelsGroup">Telefon</string>
+  <string name="emailLabelsGroup">E-mail küldése</string>
+  <string name="postalLabelsGroup">Cím</string>
+  <string name="imLabelsGroup">IM</string>
+  <string name="organizationLabelsGroup">Szervezet</string>
+  <string name="relationLabelsGroup">Kapcsolat</string>
+  <string name="eventLabelsGroup">Különleges dátum</string>
+  <string name="sms">Szöveges üzenet</string>
+  <string name="postal_address">Cím</string>
+  <string name="ghostData_company">Cég</string>
+  <string name="ghostData_title">Beosztás</string>
+  <string name="label_notes">Jegyzetek</string>
+  <string name="label_sip_address">SIP</string>
+  <string name="websiteLabelsGroup">Webhely</string>
+  <string name="groupsLabel">Csoportok</string>
+  <string name="email_home">E-mail küldése haza</string>
+  <string name="email_mobile">E-mail küldése mobiltelefonra</string>
+  <string name="email_work">E-mail küldése munkahelyi címre</string>
+  <string name="email_other">E-mail küldése</string>
+  <string name="email_custom">E-mail küldése a(z) %s címre</string>
+  <string name="email">E-mail küldése</string>
+  <string name="postal_street">Utca, házszám</string>
+  <string name="postal_city">Település</string>
+  <string name="postal_region">Állam</string>
+  <string name="postal_postcode">Irányítószám</string>
+  <string name="postal_country">Ország</string>
+  <string name="map_home">Otthoni cím megtekintése</string>
+  <string name="map_work">Munkahelyi cím megtekintése</string>
+  <string name="map_other">Cím megtekintése</string>
+  <string name="map_custom">%s cím megtekintése</string>
+  <string name="chat_aim">Csevegés AIM-on</string>
+  <string name="chat_msn">Csevegés a Windows Live-on</string>
+  <string name="chat_yahoo">Csevegés a Yahoon</string>
+  <string name="chat_skype">Csevegés Skype használatával</string>
+  <string name="chat_qq">Csevegés a QQ-n</string>
+  <string name="chat_gtalk">Csevegés a Google Csevegő használatával</string>
+  <string name="chat_icq">Csevegés az ICQ-n</string>
+  <string name="chat_jabber">Csevegés Jabberen</string>
+  <string name="chat">Csevegés</string>
+  <string name="list_filter_all_accounts">Az összes névjegy</string>
+  <string name="listAllContactsInAccount">Ismerősök itt: %s</string>
+  <string name="listCustomView">Egyéni nézet névjegyei</string>
+  <string name="listSingleContact">Egyetlen névjegy</string>
+  <string name="display_options_sort_list_by">Rendezés alapja</string>
+  <string name="display_options_sort_by_given_name">Utónév</string>
+  <string name="display_options_sort_by_family_name">Vezetéknév</string>
+  <string name="display_options_view_names_as">Névformátum</string>
+  <string name="display_options_view_given_name_first">Utónév elöl</string>
+  <string name="display_options_view_family_name_first">Vezetéknév elöl</string>
+  <string name="menu_clear_frequents">Gyakran keresettek törlése</string>
+  <string name="action_menu_back_from_search">keresés leállítása</string>
+  <string name="description_clear_search">Keresés törlése</string>
+  <string name="select_account_dialog_title">Fiók</string>
+  <string name="set_default_account">Mindig ezt használja hívásokhoz</string>
+  <string name="select_phone_account_for_calls">SIM-kártya kiválasztása a híváshoz</string>
+  <string name="select_phone_account_for_calls_remember">Választás megjegyzése</string>
+  <string name="call_with_a_note">Hívás üzenettel</string>
+  <string name="call_subject_hint">Írjon üzenetet, amelyet elküldhetünk a hívással együtt…</string>
+  <string name="send_and_call_button">KÜLDÉS ÉS HÍVÁS</string>
+  <string name="call_subject_limit">%2$s/%1$s</string>
+  <string name="old_call_subject_type_and_number">%1$s %2$s</string>
+  <string name="tab_title">%1$s lap.</string>
+  <plurals name="tab_title_with_unread_items">
+    <item quantity="one"> %1$s lap. %2$d olvasatlan elem. </item>
+    <item quantity="other"> %1$s lap. %2$d olvasatlan elem. </item>
+  </plurals>
+  <string name="description_search_video_call">Videohívás</string>
+  <string name="description_search_call_and_share">Megosztás és hívás</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-hy/strings.xml b/java/com/android/contacts/common/res/values-hy/strings.xml
index 0a6cfa2..7cbd770 100644
--- a/java/com/android/contacts/common/res/values-hy/strings.xml
+++ b/java/com/android/contacts/common/res/values-hy/strings.xml
@@ -1,162 +1,145 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="toast_text_copied" msgid="8979281391599667362">"Տեքսը պատճենված է"</string>
-    <string name="call_custom" msgid="3041673234638990874">"Զանգել <xliff:g id="CUSTOM">%s</xliff:g> համարին"</string>
-    <string name="call_home" msgid="125893483593803791">"Զանգել տուն"</string>
-    <string name="call_mobile" msgid="967589404494150813">"Զանգել շարժականին"</string>
-    <string name="call_work" msgid="6040550697395300892">"Զանգել աշխաատավայր"</string>
-    <string name="call_fax_work" msgid="5260192771364592922">"Զանգել աշխատավայրի ֆաքսին"</string>
-    <string name="call_fax_home" msgid="5174311195081144124">"Զանգել տան ֆաքսին"</string>
-    <string name="call_pager" msgid="6814149227741274161">"Զանգել փեյջերին"</string>
-    <string name="call_other" msgid="5536385588712587235">"Զանգել"</string>
-    <string name="call_callback" msgid="6314019862718112786">"Հետզանգել"</string>
-    <string name="call_car" msgid="3197417098027764954">"Զանգել մեքենայի հեռախոսահամարին"</string>
-    <string name="call_company_main" msgid="2557663310028446397">"Զանգել ընկերության հիմնական համարին"</string>
-    <string name="call_isdn" msgid="4691270442763649522">"Զանգել ISDN համարին"</string>
-    <string name="call_main" msgid="3293707608770407814">"Զանգել հիմնական համարին"</string>
-    <string name="call_other_fax" msgid="4724521984879021465">"Զանգել ֆաքսին"</string>
-    <string name="call_radio" msgid="8942441419845057942">"Զանգել ռադիո համարին"</string>
-    <string name="call_telex" msgid="2031514461660668351">"Զանգել տելեքս համարին"</string>
-    <string name="call_tty_tdd" msgid="7807210224965727701">"Զանգել TTY/TDD համարին"</string>
-    <string name="call_work_mobile" msgid="2716342732938578495">"Զանգել աշխատավայրի բջջայինին"</string>
-    <string name="call_work_pager" msgid="3791778749827366574">"Զանգել աշխատավայրի փեյջերին"</string>
-    <string name="call_assistant" msgid="4177478845473789294">"Զանգել <xliff:g id="ASSISTANT">%s</xliff:g>-ին"</string>
-    <string name="call_mms" msgid="4958811711741872901">"Զանգել MMS համարին"</string>
-    <string name="sms_custom" msgid="8785368968605026317">"Հաղորդագրել <xliff:g id="CUSTOM">%s</xliff:g>-ին"</string>
-    <string name="sms_home" msgid="3527719551060295243">"Հաղորդագրել տուն"</string>
-    <string name="sms_mobile" msgid="8883045857887736518">"Հաղորդագրել բջջայինին"</string>
-    <string name="sms_work" msgid="4158595439553450966">"Հաղորդագրել աշխատանքայինին"</string>
-    <string name="sms_fax_work" msgid="5483726627718055248">"Հաղորդագրել աշխատանքային ֆաքսի համարին"</string>
-    <string name="sms_fax_home" msgid="9219265155770746077">"Հաղորդագրել տան ֆաքսի համարին"</string>
-    <string name="sms_pager" msgid="4901085068525193933">"Հաղորդագրել փեյջերին"</string>
-    <string name="sms_other" msgid="1742702947993285933">"Հաղորդագրել"</string>
-    <string name="sms_callback" msgid="5833483630377538308">"Հաղորդագրել հետզանգման համարին"</string>
-    <string name="sms_car" msgid="4314577266154395174">"Հաղորդագրել մեքենայի հեռախոսահամարին"</string>
-    <string name="sms_company_main" msgid="2308160928487360705">"Հաղորդագրել ընկերության հիմնականին"</string>
-    <string name="sms_isdn" msgid="6394300346179302542">"Հաղորդագրել ISDN համարին"</string>
-    <string name="sms_main" msgid="8908087742014140774">"Հաղորդագրել հիմնական համարին"</string>
-    <string name="sms_other_fax" msgid="8768455473295405427">"Հաղորդագրել ֆաքսի համարին"</string>
-    <string name="sms_radio" msgid="855555176531704682">"Հաղորդագրել ռադիո համարին"</string>
-    <string name="sms_telex" msgid="6269029276223252719">"Հաղորդագրել տելեքս համարին"</string>
-    <string name="sms_tty_tdd" msgid="6229057354509192444">"Հաղորդագրել TTY/TDD համարին"</string>
-    <string name="sms_work_mobile" msgid="2155975469329969840">"Հաղորդագրել աշխատանքային բջջայինին"</string>
-    <string name="sms_work_pager" msgid="8500140274906830742">"Հաղորդագրել աշխատանքային փեյջերին"</string>
-    <string name="sms_assistant" msgid="8513548482745330818">"Հաղորդագրել <xliff:g id="ASSISTANT">%s</xliff:g>-ին"</string>
-    <string name="sms_mms" msgid="5187888900503248542">"Հաղորդագրել MMS համարին"</string>
-    <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"Մաքրե՞լ հաճախակի հաղորդակցվածները"</string>
-    <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"Դուք կմաքրեք հաճախակի հաղորդակցվողների ցանկը Կոնտակտներ և Հեռախոս հավելվածներում, և ձեր էլփոստի ծրագիրը զրոյից կսովորի ձեր հասցեագրումների նախընտրությունները:"</string>
-    <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"Հաճախակի հաղորդակցումների մաքրում..."</string>
-    <string name="status_available" msgid="2648156525685472626">"Հասանելի"</string>
-    <string name="status_away" msgid="2298688367552893953">"Տեղում չէ"</string>
-    <string name="status_busy" msgid="5990832098713248503">"Զբաղված"</string>
-    <string name="contactsList" msgid="8806067891419291513">"Կոնտակտներ"</string>
-    <string name="contact_suggestions" msgid="3324166754807120006">"Լավագույն առաջարկներ"</string>
-    <string name="local_invisible_directory" msgid="4723238462733650090">"Այլ"</string>
-    <string name="directory_search_label" msgid="4621215895484025229">"Գրացուցակ"</string>
-    <string name="directory_search_label_work" msgid="7679326282707414897">"Աշխատանքային գրացուցակ"</string>
-    <string name="local_search_label" msgid="907622822323119235">"Բոլոր կոնտակտները"</string>
-    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Առաջարկներ"</string>
-    <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Ես"</string>
-    <string name="missing_name" msgid="978606963362745020">"(Անանուն)"</string>
-    <string name="description_view_contact_detail" msgid="2428742401208561136">"Դիտել կոնտակտը"</string>
-    <string name="list_filter_phones" msgid="8763316061763437182">"Բոլոր հեռախոսահամարներով կոնտատկները"</string>
-    <string name="list_filter_phones_work" msgid="7083575404573422965">"Աշխատանքային պրոֆիլի կոնտակտներ"</string>
-    <string name="view_updates_from_group" msgid="9011641093168385729">"Դիտել թարմացումները"</string>
-    <string name="account_phone" msgid="7067809073194061035">"Միայն սարքում, չհամաժամեցված"</string>
-    <string name="nameLabelsGroup" msgid="7730465833159557471">"Անուն"</string>
-    <string name="nicknameLabelsGroup" msgid="6310556912361840029">"Մականուն"</string>
-    <string name="full_name" msgid="648186563998465740">"Անուն"</string>
-    <string name="name_given" msgid="5096576006314820536">"Անվան"</string>
-    <string name="name_family" msgid="6646235805198547467">"Ազգանվան"</string>
-    <string name="name_prefix" msgid="9215326539658838">"Անվան նախածանց"</string>
-    <string name="name_middle" msgid="703755205331582769">"Հայրանուն"</string>
-    <string name="name_suffix" msgid="5777083390282548702">"Անվան վերջնածանց"</string>
-    <string name="name_phonetic" msgid="1650870996361663089">"Անունը՝ տառադարձված"</string>
-    <string name="name_phonetic_given" msgid="618812334274603170">"Անունը՝ տառադարձված"</string>
-    <string name="name_phonetic_middle" msgid="4826820763384625538">"Հայրանունը՝ տառադարձված"</string>
-    <string name="name_phonetic_family" msgid="379905191212930771">"Ազգանունը՝ տառադարձված"</string>
-    <string name="phoneLabelsGroup" msgid="169661929021355548">"Հեռախոս"</string>
-    <string name="emailLabelsGroup" msgid="2249752810477488833">"Էլփոստ"</string>
-    <string name="postalLabelsGroup" msgid="6772000590189142253">"Հասցեն"</string>
-    <string name="imLabelsGroup" msgid="5718066254237364731">"IM"</string>
-    <string name="organizationLabelsGroup" msgid="1101996309241601435">"Կազմակերպություն"</string>
-    <string name="relationLabelsGroup" msgid="53866051664600053">"Հարաբերություն"</string>
-    <string name="eventLabelsGroup" msgid="1236970042646618489">"Հատուկ ամսաթիվ"</string>
-    <string name="sms" msgid="7574344928185328095">"Տեքստային հաղորդագրություն"</string>
-    <string name="postal_address" msgid="1804707930129674200">"Հասցեն"</string>
-    <string name="ghostData_company" msgid="2554310786296833424">"Ընկերությունը"</string>
-    <string name="ghostData_title" msgid="4994968731830184837">"Պաշտոն"</string>
-    <string name="label_notes" msgid="2050255313694219786">"Գրառումներ"</string>
-    <string name="label_sip_address" msgid="8883266182575965926">"SIP"</string>
-    <string name="websiteLabelsGroup" msgid="1630734286462186790">"Վեբ կայք"</string>
-    <string name="groupsLabel" msgid="2694002798416868728">"Խմբեր"</string>
-    <string name="email_home" msgid="889830029388962171">"Նամակագրել տուն"</string>
-    <string name="email_mobile" msgid="4487686436743741150">"Նամակագրել բջջայինին"</string>
-    <string name="email_work" msgid="4223487303344613528">"Նամակագրել աշխատավայր"</string>
-    <string name="email_other" msgid="4246411900126012062">"Էլփոստ"</string>
-    <string name="email_custom" msgid="7246580894327511013">"Նամակագրել <xliff:g id="CUSTOM">%s</xliff:g>-ին"</string>
-    <string name="email" msgid="2807318537887091606">"Էլփոստ"</string>
-    <string name="postal_street" msgid="6918171741240802474">"Փողոց"</string>
-    <string name="postal_city" msgid="8674569121430005628">"Քաղաքը"</string>
-    <string name="postal_region" msgid="1730369286225469192">"Նահանգը"</string>
-    <string name="postal_postcode" msgid="4450700741261990439">"Փոստային կոդը"</string>
-    <string name="postal_country" msgid="232670707458768148">"Երկիրը"</string>
-    <string name="map_home" msgid="4181131107392126938">"Դիտել տան հասցեն"</string>
-    <string name="map_work" msgid="5723471185992684400">"Դիտել աշխատավայրի հասցեն"</string>
-    <string name="map_other" msgid="2253764780863500516">"Դիտել հասցեն"</string>
-    <string name="map_custom" msgid="5581743097882436157">"Դիտել <xliff:g id="CUSTOM">%s</xliff:g> հասցեն"</string>
-    <string name="chat_aim" msgid="2954364435497941659">"Զրույց AIM-ով"</string>
-    <string name="chat_msn" msgid="3130135239071228678">"Զրույց Windows Live-ով"</string>
-    <string name="chat_yahoo" msgid="3233552142326865347">"Զրուցել Yahoo-ով"</string>
-    <string name="chat_skype" msgid="6486703981390592425">"Զրույց Skype-ով"</string>
-    <string name="chat_qq" msgid="786924280665740019">"Զրույց QQ-ով"</string>
-    <string name="chat_gtalk" msgid="7914674177243078035">"Զրույց Google Talk-ով"</string>
-    <string name="chat_icq" msgid="3292934726414765801">"Զրուցել ICQ-ով"</string>
-    <string name="chat_jabber" msgid="6701542313597880204">"Զրուցել Jabber-ով"</string>
-    <string name="chat" msgid="1020428260359370236">"Զրույց"</string>
-    <string name="list_filter_all_accounts" msgid="473782314881473992">"Բոլոր կոնտակտները"</string>
-    <string name="listAllContactsInAccount" msgid="3486378621592995630">"<xliff:g id="NAME">%s</xliff:g>-ի կոնտակտները"</string>
-    <string name="listCustomView" msgid="5306282632413086731">"Հատուկ տեսքով կոնտակտներ"</string>
-    <string name="listSingleContact" msgid="8620818791932382627">"Մեկ կոնտակտ"</string>
-    <string name="display_options_sort_list_by" msgid="3541875948367831228">"Դասավորել ըստ"</string>
-    <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"Անվան"</string>
-    <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"Ազգանվան"</string>
-    <string name="display_options_view_names_as" msgid="4204204205736735618">"Անվան ձևաչափ"</string>
-    <string name="display_options_view_given_name_first" msgid="2308026973021171020">"Սկզբում՝ անունը"</string>
-    <string name="display_options_view_family_name_first" msgid="987430497292428242">"Սկզբում՝ ազգանունը"</string>
-    <string name="menu_clear_frequents" msgid="5358271535047496120">"Մաքրել հաճախակիները"</string>
-    <string name="action_menu_back_from_search" msgid="3550669942742167644">"դադարեցնել որոնումը"</string>
-    <string name="description_clear_search" msgid="2347258825265600782">"Մաքրել որոնման դաշտը"</string>
-    <string name="select_account_dialog_title" msgid="2673504582803359239">"Հաշիվ"</string>
-    <string name="set_default_account" msgid="7966099951006467572">"Միշտ օգտագործել սա՝ զանգերի համար"</string>
-    <string name="select_phone_account_for_calls" msgid="1784460686103423274">"Զանգել հետևյալով"</string>
-    <string name="call_with_a_note" msgid="6242261320491851133">"Գրառումով զանգ"</string>
-    <string name="call_subject_hint" msgid="7233138753650420800">"Մուտքագրեք նշում՝ զանգի հետ ուղարկելու համար ..."</string>
-    <string name="send_and_call_button" msgid="4735168294120154013">"ՈՒՂԱՐԿԵԼ ԵՎ ԶԱՆԳԵԼ"</string>
-    <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="tab_title" msgid="3387876802026074288">"<xliff:g id="TITLE">%1$s</xliff:g> ներդիր:"</string>
-    <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
-      <item quantity="one"> <xliff:g id="TITLE_2">%1$s</xliff:g> tab. <xliff:g id="COUNT_3">%2$d</xliff:g> unread items. </item>
-      <item quantity="other"> <xliff:g id="TITLE_2">%1$s</xliff:g> ներդիր: <xliff:g id="COUNT_3">%2$d</xliff:g> չընթերցված տարր: </item>
-    </plurals>
-    <string name="description_search_video_call" msgid="4337369876888024909">"Տեսազանգ"</string>
-    <string name="description_search_call_and_share" msgid="4912772842755050467">"Կիսվել և զանգել"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_custom">Զանգել %s համարին</string>
+  <string name="call_home">Զանգել տուն</string>
+  <string name="call_mobile">Զանգել շարժականին</string>
+  <string name="call_work">Զանգել աշխաատավայր</string>
+  <string name="call_fax_work">Զանգել աշխատավայրի ֆաքսին</string>
+  <string name="call_fax_home">Զանգել տան ֆաքսին</string>
+  <string name="call_pager">Զանգել փեյջերին</string>
+  <string name="call_other">Զանգել</string>
+  <string name="call_callback">Հետզանգել</string>
+  <string name="call_car">Զանգել մեքենայի հեռախոսահամարին</string>
+  <string name="call_company_main">Զանգել ընկերության հիմնական համարին</string>
+  <string name="call_isdn">Զանգել ISDN համարին</string>
+  <string name="call_main">Զանգել հիմնական համարին</string>
+  <string name="call_other_fax">Զանգել ֆաքսին</string>
+  <string name="call_radio">Զանգել ռադիո համարին</string>
+  <string name="call_telex">Զանգել տելեքս համարին</string>
+  <string name="call_tty_tdd">Զանգել TTY/TDD համարին</string>
+  <string name="call_work_mobile">Զանգել աշխատավայրի բջջայինին</string>
+  <string name="call_work_pager">Զանգել աշխատավայրի փեյջերին</string>
+  <string name="call_assistant">Զանգել %s-ին</string>
+  <string name="call_mms">Զանգել MMS համարին</string>
+  <string name="sms_custom">Հաղորդագրել %s-ին</string>
+  <string name="sms_home">Հաղորդագրել տուն</string>
+  <string name="sms_mobile">Հաղորդագրել բջջայինին</string>
+  <string name="sms_work">Հաղորդագրել աշխատանքայինին</string>
+  <string name="sms_fax_work">Հաղորդագրել աշխատանքային ֆաքսի համարին</string>
+  <string name="sms_fax_home">Հաղորդագրել տան ֆաքսի համարին</string>
+  <string name="sms_pager">Հաղորդագրել փեյջերին</string>
+  <string name="sms_other">Հաղորդագրել</string>
+  <string name="sms_callback">Հաղորդագրել հետզանգման համարին</string>
+  <string name="sms_car">Հաղորդագրել մեքենայի հեռախոսահամարին</string>
+  <string name="sms_company_main">Հաղորդագրել ընկերության հիմնականին</string>
+  <string name="sms_isdn">Հաղորդագրել ISDN համարին</string>
+  <string name="sms_main">Հաղորդագրել հիմնական համարին</string>
+  <string name="sms_other_fax">Հաղորդագրել ֆաքսի համարին</string>
+  <string name="sms_radio">Հաղորդագրել ռադիո համարին</string>
+  <string name="sms_telex">Հաղորդագրել տելեքս համարին</string>
+  <string name="sms_tty_tdd">Հաղորդագրել TTY/TDD համարին</string>
+  <string name="sms_work_mobile">Հաղորդագրել աշխատանքային բջջայինին</string>
+  <string name="sms_work_pager">Հաղորդագրել աշխատանքային փեյջերին</string>
+  <string name="sms_assistant">Հաղորդագրել %s-ին</string>
+  <string name="sms_mms">Հաղորդագրել MMS համարին</string>
+  <string name="clearFrequentsConfirmation_title">Մաքրե՞լ հաճախակի հաղորդակցվածները</string>
+  <string name="clearFrequentsConfirmation">Դուք կմաքրեք հաճախակի հաղորդակցվողների ցանկը Կոնտակտներ և Հեռախոս հավելվածներում, և ձեր էլփոստի ծրագիրը զրոյից կսովորի ձեր հասցեագրումների նախընտրությունները:</string>
+  <string name="clearFrequentsProgress_title">Հաճախակի հաղորդակցումների մաքրում...</string>
+  <string name="status_available">Հասանելի</string>
+  <string name="status_away">Տեղում չէ</string>
+  <string name="status_busy">Զբաղված</string>
+  <string name="contactsList">Կոնտակտներ</string>
+  <string name="contact_suggestions">Լավագույն առաջարկներ</string>
+  <string name="local_invisible_directory">Այլ</string>
+  <string name="directory_search_label">Գրացուցակ</string>
+  <string name="directory_search_label_work">Աշխատանքային գրացուցակ</string>
+  <string name="local_search_label">Բոլոր կոնտակտները</string>
+  <string name="local_suggestions_search_label">Առաջարկներ</string>
+  <string msgid="9154761216179882405" name="user_profile_contacts_list_header">Ես</string>
+  <string name="missing_name">(Անանուն)</string>
+  <string msgid="2795575601596468581" name="description_view_contact_detail">Դիտել կոնտակտը</string>
+  <string name="list_filter_phones">Բոլոր հեռախոսահամարներով կոնտատկները</string>
+  <string name="list_filter_phones_work">Աշխատանքային պրոֆիլի կոնտակտներ</string>
+  <string name="view_updates_from_group">Դիտել թարմացումները</string>
+  <string name="account_phone">Միայն սարքում, չհամաժամեցված</string>
+  <string name="nameLabelsGroup">Անուն</string>
+  <string name="nicknameLabelsGroup">Մականուն</string>
+  <string name="full_name">Անուն</string>
+  <string name="name_given">Անվան</string>
+  <string name="name_family">Ազգանվան</string>
+  <string name="name_prefix">Անվան նախածանց</string>
+  <string name="name_middle">Հայրանուն</string>
+  <string name="name_suffix">Անվան վերջնածանց</string>
+  <string name="name_phonetic">Անունը՝ տառադարձված</string>
+  <string name="name_phonetic_given">Անունը՝ տառադարձված</string>
+  <string name="name_phonetic_middle">Հայրանունը՝ տառադարձված</string>
+  <string name="name_phonetic_family">Ազգանունը՝ տառադարձված</string>
+  <string name="phoneLabelsGroup">Հեռախոս</string>
+  <string name="emailLabelsGroup">Էլփոստ</string>
+  <string name="postalLabelsGroup">Հասցեն</string>
+  <string name="imLabelsGroup">IM</string>
+  <string name="organizationLabelsGroup">Կազմակերպություն</string>
+  <string name="relationLabelsGroup">Հարաբերություն</string>
+  <string name="eventLabelsGroup">Հատուկ ամսաթիվ</string>
+  <string name="sms">Տեքստային հաղորդագրություն</string>
+  <string name="postal_address">Հասցեն</string>
+  <string name="ghostData_company">Ընկերությունը</string>
+  <string name="ghostData_title">Պաշտոն</string>
+  <string name="label_notes">Գրառումներ</string>
+  <string name="label_sip_address">SIP</string>
+  <string name="websiteLabelsGroup">Վեբ կայք</string>
+  <string name="groupsLabel">Խմբեր</string>
+  <string name="email_home">Նամակագրել տուն</string>
+  <string name="email_mobile">Նամակագրել բջջայինին</string>
+  <string name="email_work">Նամակագրել աշխատավայր</string>
+  <string name="email_other">Էլփոստ</string>
+  <string name="email_custom">Նամակագրել %s-ին</string>
+  <string name="email">Էլփոստ</string>
+  <string name="postal_street">Փողոց</string>
+  <string name="postal_city">Քաղաքը</string>
+  <string name="postal_region">Նահանգը</string>
+  <string name="postal_postcode">Փոստային կոդը</string>
+  <string name="postal_country">Երկիրը</string>
+  <string name="map_home">Դիտել տան հասցեն</string>
+  <string name="map_work">Դիտել աշխատավայրի հասցեն</string>
+  <string name="map_other">Դիտել հասցեն</string>
+  <string name="map_custom">Դիտել %s հասցեն</string>
+  <string name="chat_aim">Զրույց AIM-ով</string>
+  <string name="chat_msn">Զրույց Windows Live-ով</string>
+  <string name="chat_yahoo">Զրուցել Yahoo-ով</string>
+  <string name="chat_skype">Զրույց Skype-ով</string>
+  <string name="chat_qq">Զրույց QQ-ով</string>
+  <string name="chat_gtalk">Զրույց Google Talk-ով</string>
+  <string name="chat_icq">Զրուցել ICQ-ով</string>
+  <string name="chat_jabber">Զրուցել Jabber-ով</string>
+  <string name="chat">Զրույց</string>
+  <string name="list_filter_all_accounts">Բոլոր կոնտակտները</string>
+  <string name="listAllContactsInAccount">%s-ի կոնտակտները</string>
+  <string name="listCustomView">Հատուկ տեսքով կոնտակտներ</string>
+  <string name="listSingleContact">Մեկ կոնտակտ</string>
+  <string name="display_options_sort_list_by">Դասավորել ըստ</string>
+  <string name="display_options_sort_by_given_name">Անվան</string>
+  <string name="display_options_sort_by_family_name">Ազգանվան</string>
+  <string name="display_options_view_names_as">Անվան ձևաչափ</string>
+  <string name="display_options_view_given_name_first">Սկզբում՝ անունը</string>
+  <string name="display_options_view_family_name_first">Սկզբում՝ ազգանունը</string>
+  <string name="menu_clear_frequents">Մաքրել հաճախակիները</string>
+  <string name="action_menu_back_from_search">դադարեցնել որոնումը</string>
+  <string name="description_clear_search">Մաքրել որոնման դաշտը</string>
+  <string name="select_account_dialog_title">Հաշիվ</string>
+  <string name="set_default_account">Միշտ օգտագործել սա՝ զանգերի համար</string>
+  <string name="select_phone_account_for_calls">Ընտրեք, թե որ SIM քարտով զանգել</string>
+  <string name="select_phone_account_for_calls_remember">Հիշել այս ընտրությունը</string>
+  <string name="call_with_a_note">Գրառումով զանգ</string>
+  <string name="call_subject_hint">Մուտքագրեք նշում՝ զանգի հետ ուղարկելու համար ...</string>
+  <string name="send_and_call_button">ՈՒՂԱՐԿԵԼ ԵՎ ԶԱՆԳԵԼ</string>
+  <string name="call_subject_limit">%1$s / %2$s</string>
+  <string name="old_call_subject_type_and_number">%1$s %2$s</string>
+  <string name="tab_title">%1$s ներդիր:</string>
+  <plurals name="tab_title_with_unread_items">
+    <item quantity="one"> %1$s tab. %2$d unread items. </item>
+    <item quantity="other"> %1$s ներդիր: %2$d չկարդացված տարր: </item>
+  </plurals>
+  <string name="description_search_video_call">Տեսազանգ</string>
+  <string name="description_search_call_and_share">Կիսվել և զանգել</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-in/strings.xml b/java/com/android/contacts/common/res/values-in/strings.xml
index a332790..aeb477a 100644
--- a/java/com/android/contacts/common/res/values-in/strings.xml
+++ b/java/com/android/contacts/common/res/values-in/strings.xml
@@ -1,162 +1,145 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="toast_text_copied" msgid="8979281391599667362">"Teks disalin"</string>
-    <string name="call_custom" msgid="3041673234638990874">"Hubungi <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="call_home" msgid="125893483593803791">"Telepon rumah"</string>
-    <string name="call_mobile" msgid="967589404494150813">"Hubungi nomor seluler"</string>
-    <string name="call_work" msgid="6040550697395300892">"Hubungi kantor"</string>
-    <string name="call_fax_work" msgid="5260192771364592922">"Hubungi faks kantor"</string>
-    <string name="call_fax_home" msgid="5174311195081144124">"Hubungi faks rumah"</string>
-    <string name="call_pager" msgid="6814149227741274161">"Hubungi pager"</string>
-    <string name="call_other" msgid="5536385588712587235">"Hubungi"</string>
-    <string name="call_callback" msgid="6314019862718112786">"Hubungi panggilan balik"</string>
-    <string name="call_car" msgid="3197417098027764954">"Hubungi nomor telepon mobil"</string>
-    <string name="call_company_main" msgid="2557663310028446397">"Hubungi nomor telepon utama perusahaan"</string>
-    <string name="call_isdn" msgid="4691270442763649522">"Hubungi ISDN"</string>
-    <string name="call_main" msgid="3293707608770407814">"Hubungi nomor utama"</string>
-    <string name="call_other_fax" msgid="4724521984879021465">"Hubungi faks"</string>
-    <string name="call_radio" msgid="8942441419845057942">"Hubungi radio"</string>
-    <string name="call_telex" msgid="2031514461660668351">"Hubungi teleks"</string>
-    <string name="call_tty_tdd" msgid="7807210224965727701">"Hubungi TTY/TDD"</string>
-    <string name="call_work_mobile" msgid="2716342732938578495">"Hubungi nomor seluler kantor"</string>
-    <string name="call_work_pager" msgid="3791778749827366574">"Hubungi pager kantor"</string>
-    <string name="call_assistant" msgid="4177478845473789294">"Hubungi <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
-    <string name="call_mms" msgid="4958811711741872901">"Hubungi MMS"</string>
-    <string name="sms_custom" msgid="8785368968605026317">"SMS <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="sms_home" msgid="3527719551060295243">"SMS rumah"</string>
-    <string name="sms_mobile" msgid="8883045857887736518">"SMS nomor seluler"</string>
-    <string name="sms_work" msgid="4158595439553450966">"SMS kantor"</string>
-    <string name="sms_fax_work" msgid="5483726627718055248">"SMS faks kantor"</string>
-    <string name="sms_fax_home" msgid="9219265155770746077">"SMS faks rumah"</string>
-    <string name="sms_pager" msgid="4901085068525193933">"SMS pager"</string>
-    <string name="sms_other" msgid="1742702947993285933">"Teks"</string>
-    <string name="sms_callback" msgid="5833483630377538308">"SMS panggilan balik"</string>
-    <string name="sms_car" msgid="4314577266154395174">"SMS mobil"</string>
-    <string name="sms_company_main" msgid="2308160928487360705">"SMS nomor utama perusahaan"</string>
-    <string name="sms_isdn" msgid="6394300346179302542">"SMS ISDN"</string>
-    <string name="sms_main" msgid="8908087742014140774">"SMS nomor utama"</string>
-    <string name="sms_other_fax" msgid="8768455473295405427">"SMS faks"</string>
-    <string name="sms_radio" msgid="855555176531704682">"SMS radio"</string>
-    <string name="sms_telex" msgid="6269029276223252719">"SMS teleks"</string>
-    <string name="sms_tty_tdd" msgid="6229057354509192444">"SMS TTY/TDD"</string>
-    <string name="sms_work_mobile" msgid="2155975469329969840">"SMS nomor seluler kantor"</string>
-    <string name="sms_work_pager" msgid="8500140274906830742">"SMS pager kantor"</string>
-    <string name="sms_assistant" msgid="8513548482745330818">"SMS <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
-    <string name="sms_mms" msgid="5187888900503248542">"SMS MMS"</string>
-    <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"Hapus yang sering dihubungi?"</string>
-    <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"Anda akan menghapus daftar yang sering dihubungi pada aplikasi Kontak dan Ponsel, serta memaksa aplikasi email untuk mempelajari preferensi penanganan dari awal."</string>
-    <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"Menghapus yang sering dihubungi..."</string>
-    <string name="status_available" msgid="2648156525685472626">"Ada"</string>
-    <string name="status_away" msgid="2298688367552893953">"Keluar"</string>
-    <string name="status_busy" msgid="5990832098713248503">"Sibuk"</string>
-    <string name="contactsList" msgid="8806067891419291513">"Kontak"</string>
-    <string name="contact_suggestions" msgid="3324166754807120006">"Paling Disarankan"</string>
-    <string name="local_invisible_directory" msgid="4723238462733650090">"Lainnya"</string>
-    <string name="directory_search_label" msgid="4621215895484025229">"Direktori"</string>
-    <string name="directory_search_label_work" msgid="7679326282707414897">"Direktori kerja"</string>
-    <string name="local_search_label" msgid="907622822323119235">"Semua kontak"</string>
-    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Saran"</string>
-    <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Saya"</string>
-    <string name="missing_name" msgid="978606963362745020">"(Tanpa nama)"</string>
-    <string name="description_view_contact_detail" msgid="2428742401208561136">"Lihat kontak"</string>
-    <string name="list_filter_phones" msgid="8763316061763437182">"Semua kontak dengan nomor telepon"</string>
-    <string name="list_filter_phones_work" msgid="7083575404573422965">"Kontak profil kerja"</string>
-    <string name="view_updates_from_group" msgid="9011641093168385729">"Lihat pembaruan"</string>
-    <string name="account_phone" msgid="7067809073194061035">"Hanya perangkat, tidak disinkronkan"</string>
-    <string name="nameLabelsGroup" msgid="7730465833159557471">"Nama"</string>
-    <string name="nicknameLabelsGroup" msgid="6310556912361840029">"Nama julukan"</string>
-    <string name="full_name" msgid="648186563998465740">"Nama"</string>
-    <string name="name_given" msgid="5096576006314820536">"Nama depan"</string>
-    <string name="name_family" msgid="6646235805198547467">"Nama belakang"</string>
-    <string name="name_prefix" msgid="9215326539658838">"Awalan nama"</string>
-    <string name="name_middle" msgid="703755205331582769">"Nama tengah"</string>
-    <string name="name_suffix" msgid="5777083390282548702">"Akhiran nama"</string>
-    <string name="name_phonetic" msgid="1650870996361663089">"Nama fonetik"</string>
-    <string name="name_phonetic_given" msgid="618812334274603170">"Nama depan fonetik"</string>
-    <string name="name_phonetic_middle" msgid="4826820763384625538">"Nama tengah fonetik"</string>
-    <string name="name_phonetic_family" msgid="379905191212930771">"Nama belakang fonetik"</string>
-    <string name="phoneLabelsGroup" msgid="169661929021355548">"Telepon"</string>
-    <string name="emailLabelsGroup" msgid="2249752810477488833">"Email"</string>
-    <string name="postalLabelsGroup" msgid="6772000590189142253">"Alamat"</string>
-    <string name="imLabelsGroup" msgid="5718066254237364731">"IM"</string>
-    <string name="organizationLabelsGroup" msgid="1101996309241601435">"Organisasi"</string>
-    <string name="relationLabelsGroup" msgid="53866051664600053">"Hubungan"</string>
-    <string name="eventLabelsGroup" msgid="1236970042646618489">"Tanggal khusus"</string>
-    <string name="sms" msgid="7574344928185328095">"Pesan teks"</string>
-    <string name="postal_address" msgid="1804707930129674200">"Alamat"</string>
-    <string name="ghostData_company" msgid="2554310786296833424">"Perusahaan"</string>
-    <string name="ghostData_title" msgid="4994968731830184837">"Jabatan"</string>
-    <string name="label_notes" msgid="2050255313694219786">"Catatan"</string>
-    <string name="label_sip_address" msgid="8883266182575965926">"SIP"</string>
-    <string name="websiteLabelsGroup" msgid="1630734286462186790">"Situs web"</string>
-    <string name="groupsLabel" msgid="2694002798416868728">"Grup"</string>
-    <string name="email_home" msgid="889830029388962171">"Email ke rumah"</string>
-    <string name="email_mobile" msgid="4487686436743741150">"Email ke seluler"</string>
-    <string name="email_work" msgid="4223487303344613528">"Email ke kantor"</string>
-    <string name="email_other" msgid="4246411900126012062">"Email"</string>
-    <string name="email_custom" msgid="7246580894327511013">"Email <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="email" msgid="2807318537887091606">"Email"</string>
-    <string name="postal_street" msgid="6918171741240802474">"Jalan"</string>
-    <string name="postal_city" msgid="8674569121430005628">"Kota"</string>
-    <string name="postal_region" msgid="1730369286225469192">"Negara Bagian"</string>
-    <string name="postal_postcode" msgid="4450700741261990439">"Kode pos"</string>
-    <string name="postal_country" msgid="232670707458768148">"Negara"</string>
-    <string name="map_home" msgid="4181131107392126938">"Tampilkan alamat rumah"</string>
-    <string name="map_work" msgid="5723471185992684400">"Tampilkan alamat kantor"</string>
-    <string name="map_other" msgid="2253764780863500516">"Lihat alamat"</string>
-    <string name="map_custom" msgid="5581743097882436157">"Tampilkan alamat <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="chat_aim" msgid="2954364435497941659">"Ngobrol menggunakan AIM"</string>
-    <string name="chat_msn" msgid="3130135239071228678">"Ngobrol menggunakan Windows Live"</string>
-    <string name="chat_yahoo" msgid="3233552142326865347">"Ngobrol menggunakan Yahoo"</string>
-    <string name="chat_skype" msgid="6486703981390592425">"Ngobrol menggunakan Skype"</string>
-    <string name="chat_qq" msgid="786924280665740019">"Ngobrol menggunakan QQ"</string>
-    <string name="chat_gtalk" msgid="7914674177243078035">"Ngobrol menggunakan Google Talk"</string>
-    <string name="chat_icq" msgid="3292934726414765801">"Ngobrol menggunakan ICQ"</string>
-    <string name="chat_jabber" msgid="6701542313597880204">"Ngobrol menggunakan Jabber"</string>
-    <string name="chat" msgid="1020428260359370236">"Ngobrol"</string>
-    <string name="list_filter_all_accounts" msgid="473782314881473992">"Semua kontak"</string>
-    <string name="listAllContactsInAccount" msgid="3486378621592995630">"Kontak di <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="listCustomView" msgid="5306282632413086731">"Kontak dalam tampilan khusus"</string>
-    <string name="listSingleContact" msgid="8620818791932382627">"Kontak tunggal"</string>
-    <string name="display_options_sort_list_by" msgid="3541875948367831228">"Urutkan menurut"</string>
-    <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"Nama depan"</string>
-    <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"Nama belakang"</string>
-    <string name="display_options_view_names_as" msgid="4204204205736735618">"Format nama"</string>
-    <string name="display_options_view_given_name_first" msgid="2308026973021171020">"Nama depan terlebih dulu"</string>
-    <string name="display_options_view_family_name_first" msgid="987430497292428242">"Nama belakang terlebih dulu"</string>
-    <string name="menu_clear_frequents" msgid="5358271535047496120">"Hapus yang sering"</string>
-    <string name="action_menu_back_from_search" msgid="3550669942742167644">"menghentikan penelusuran"</string>
-    <string name="description_clear_search" msgid="2347258825265600782">"Hapus penelusuran"</string>
-    <string name="select_account_dialog_title" msgid="2673504582803359239">"Akun"</string>
-    <string name="set_default_account" msgid="7966099951006467572">"Selalu gunakan ini untuk telepon"</string>
-    <string name="select_phone_account_for_calls" msgid="1784460686103423274">"Telepon dengan"</string>
-    <string name="call_with_a_note" msgid="6242261320491851133">"Telepon dengan catatan"</string>
-    <string name="call_subject_hint" msgid="7233138753650420800">"Ketik catatan untuk dikirim dengan panggilan telepon ..."</string>
-    <string name="send_and_call_button" msgid="4735168294120154013">"KIRIM &amp; TELEPON"</string>
-    <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="tab_title" msgid="3387876802026074288">"Tab <xliff:g id="TITLE">%1$s</xliff:g>."</string>
-    <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
-      <item quantity="other"> Tab <xliff:g id="TITLE_2">%1$s</xliff:g>. <xliff:g id="COUNT_3">%2$d</xliff:g> item belum dibaca. </item>
-      <item quantity="one"> Tab <xliff:g id="TITLE_0">%1$s</xliff:g>. <xliff:g id="COUNT_1">%2$d</xliff:g> item belum dibaca. </item>
-    </plurals>
-    <string name="description_search_video_call" msgid="4337369876888024909">"Video call"</string>
-    <string name="description_search_call_and_share" msgid="4912772842755050467">"Membagikan dan menelepon"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_custom">Hubungi %s</string>
+  <string name="call_home">Telepon rumah</string>
+  <string name="call_mobile">Hubungi nomor seluler</string>
+  <string name="call_work">Hubungi kantor</string>
+  <string name="call_fax_work">Hubungi faks kantor</string>
+  <string name="call_fax_home">Hubungi faks rumah</string>
+  <string name="call_pager">Hubungi pager</string>
+  <string name="call_other">Hubungi</string>
+  <string name="call_callback">Hubungi panggilan balik</string>
+  <string name="call_car">Hubungi nomor telepon mobil</string>
+  <string name="call_company_main">Hubungi nomor telepon utama perusahaan</string>
+  <string name="call_isdn">Hubungi ISDN</string>
+  <string name="call_main">Hubungi nomor utama</string>
+  <string name="call_other_fax">Hubungi faks</string>
+  <string name="call_radio">Hubungi radio</string>
+  <string name="call_telex">Hubungi teleks</string>
+  <string name="call_tty_tdd">Hubungi TTY/TDD</string>
+  <string name="call_work_mobile">Hubungi nomor seluler kantor</string>
+  <string name="call_work_pager">Hubungi pager kantor</string>
+  <string name="call_assistant">Hubungi %s</string>
+  <string name="call_mms">Hubungi MMS</string>
+  <string name="sms_custom">SMS %s</string>
+  <string name="sms_home">SMS rumah</string>
+  <string name="sms_mobile">SMS nomor seluler</string>
+  <string name="sms_work">SMS kantor</string>
+  <string name="sms_fax_work">SMS faks kantor</string>
+  <string name="sms_fax_home">SMS faks rumah</string>
+  <string name="sms_pager">SMS pager</string>
+  <string name="sms_other">Teks</string>
+  <string name="sms_callback">SMS panggilan balik</string>
+  <string name="sms_car">SMS mobil</string>
+  <string name="sms_company_main">SMS nomor utama perusahaan</string>
+  <string name="sms_isdn">SMS ISDN</string>
+  <string name="sms_main">SMS nomor utama</string>
+  <string name="sms_other_fax">SMS faks</string>
+  <string name="sms_radio">SMS radio</string>
+  <string name="sms_telex">SMS teleks</string>
+  <string name="sms_tty_tdd">SMS TTY/TDD</string>
+  <string name="sms_work_mobile">SMS nomor seluler kantor</string>
+  <string name="sms_work_pager">SMS pager kantor</string>
+  <string name="sms_assistant">SMS %s</string>
+  <string name="sms_mms">SMS MMS</string>
+  <string name="clearFrequentsConfirmation_title">Hapus yang sering dihubungi?</string>
+  <string name="clearFrequentsConfirmation">Anda akan menghapus daftar yang sering dihubungi pada aplikasi Kontak dan Ponsel, serta memaksa aplikasi email untuk mempelajari preferensi penanganan dari awal.</string>
+  <string name="clearFrequentsProgress_title">Menghapus yang sering dihubungi...</string>
+  <string name="status_available">Ada</string>
+  <string name="status_away">Keluar</string>
+  <string name="status_busy">Sibuk</string>
+  <string name="contactsList">Kontak</string>
+  <string name="contact_suggestions">Paling Disarankan</string>
+  <string name="local_invisible_directory">Lainnya</string>
+  <string name="directory_search_label">Direktori</string>
+  <string name="directory_search_label_work">Direktori kerja</string>
+  <string name="local_search_label">Semua kontak</string>
+  <string name="local_suggestions_search_label">Saran</string>
+  <string msgid="9154761216179882405" name="user_profile_contacts_list_header">Saya</string>
+  <string name="missing_name">(Tanpa nama)</string>
+  <string msgid="2795575601596468581" name="description_view_contact_detail">Lihat kontak</string>
+  <string name="list_filter_phones">Semua kontak dengan nomor telepon</string>
+  <string name="list_filter_phones_work">Kontak profil kerja</string>
+  <string name="view_updates_from_group">Lihat pembaruan</string>
+  <string name="account_phone">Hanya perangkat, tidak disinkronkan</string>
+  <string name="nameLabelsGroup">Nama</string>
+  <string name="nicknameLabelsGroup">Nama julukan</string>
+  <string name="full_name">Nama</string>
+  <string name="name_given">Nama depan</string>
+  <string name="name_family">Nama belakang</string>
+  <string name="name_prefix">Awalan nama</string>
+  <string name="name_middle">Nama tengah</string>
+  <string name="name_suffix">Akhiran nama</string>
+  <string name="name_phonetic">Nama fonetik</string>
+  <string name="name_phonetic_given">Nama depan fonetik</string>
+  <string name="name_phonetic_middle">Nama tengah fonetik</string>
+  <string name="name_phonetic_family">Nama belakang fonetik</string>
+  <string name="phoneLabelsGroup">Telepon</string>
+  <string name="emailLabelsGroup">Email</string>
+  <string name="postalLabelsGroup">Alamat</string>
+  <string name="imLabelsGroup">IM</string>
+  <string name="organizationLabelsGroup">Organisasi</string>
+  <string name="relationLabelsGroup">Hubungan</string>
+  <string name="eventLabelsGroup">Tanggal khusus</string>
+  <string name="sms">Pesan teks</string>
+  <string name="postal_address">Alamat</string>
+  <string name="ghostData_company">Perusahaan</string>
+  <string name="ghostData_title">Jabatan</string>
+  <string name="label_notes">Catatan</string>
+  <string name="label_sip_address">SIP</string>
+  <string name="websiteLabelsGroup">Situs web</string>
+  <string name="groupsLabel">Grup</string>
+  <string name="email_home">Email ke rumah</string>
+  <string name="email_mobile">Email ke seluler</string>
+  <string name="email_work">Email ke kantor</string>
+  <string name="email_other">Email</string>
+  <string name="email_custom">Email %s</string>
+  <string name="email">Email</string>
+  <string name="postal_street">Jalan</string>
+  <string name="postal_city">Kota</string>
+  <string name="postal_region">Negara Bagian</string>
+  <string name="postal_postcode">Kode pos</string>
+  <string name="postal_country">Negara</string>
+  <string name="map_home">Tampilkan alamat rumah</string>
+  <string name="map_work">Tampilkan alamat kantor</string>
+  <string name="map_other">Lihat alamat</string>
+  <string name="map_custom">Tampilkan alamat %s</string>
+  <string name="chat_aim">Ngobrol menggunakan AIM</string>
+  <string name="chat_msn">Ngobrol menggunakan Windows Live</string>
+  <string name="chat_yahoo">Ngobrol menggunakan Yahoo</string>
+  <string name="chat_skype">Ngobrol menggunakan Skype</string>
+  <string name="chat_qq">Ngobrol menggunakan QQ</string>
+  <string name="chat_gtalk">Ngobrol menggunakan Google Talk</string>
+  <string name="chat_icq">Ngobrol menggunakan ICQ</string>
+  <string name="chat_jabber">Ngobrol menggunakan Jabber</string>
+  <string name="chat">Ngobrol</string>
+  <string name="list_filter_all_accounts">Semua kontak</string>
+  <string name="listAllContactsInAccount">Kontak di %s</string>
+  <string name="listCustomView">Kontak dalam tampilan khusus</string>
+  <string name="listSingleContact">Kontak tunggal</string>
+  <string name="display_options_sort_list_by">Urutkan menurut</string>
+  <string name="display_options_sort_by_given_name">Nama depan</string>
+  <string name="display_options_sort_by_family_name">Nama belakang</string>
+  <string name="display_options_view_names_as">Format nama</string>
+  <string name="display_options_view_given_name_first">Nama depan terlebih dulu</string>
+  <string name="display_options_view_family_name_first">Nama belakang terlebih dulu</string>
+  <string name="menu_clear_frequents">Hapus yang sering</string>
+  <string name="action_menu_back_from_search">menghentikan penelusuran</string>
+  <string name="description_clear_search">Hapus penelusuran</string>
+  <string name="select_account_dialog_title">Akun</string>
+  <string name="set_default_account">Selalu gunakan ini untuk telepon</string>
+  <string name="select_phone_account_for_calls">Pilih SIM untuk panggilan ini</string>
+  <string name="select_phone_account_for_calls_remember">Ingat pilihan ini</string>
+  <string name="call_with_a_note">Telepon dengan catatan</string>
+  <string name="call_subject_hint">Ketik catatan untuk dikirim dengan panggilan telepon ...</string>
+  <string name="send_and_call_button">KIRIM &amp; TELEPON</string>
+  <string name="call_subject_limit">%1$s / %2$s</string>
+  <string name="old_call_subject_type_and_number">%1$s %2$s</string>
+  <string name="tab_title">Tab %1$s.</string>
+  <plurals name="tab_title_with_unread_items">
+    <item quantity="one"> Tab %1$s. %2$d item belum dibaca. </item>
+    <item quantity="other"> Tab %1$s. %2$d item belum dibaca. </item>
+  </plurals>
+  <string name="description_search_video_call">Video call</string>
+  <string name="description_search_call_and_share">Membagikan dan menelepon</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-is/strings.xml b/java/com/android/contacts/common/res/values-is/strings.xml
index 24d3d54..534e954 100644
--- a/java/com/android/contacts/common/res/values-is/strings.xml
+++ b/java/com/android/contacts/common/res/values-is/strings.xml
@@ -1,162 +1,145 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="toast_text_copied" msgid="8979281391599667362">"Texti afritaður"</string>
-    <string name="call_custom" msgid="3041673234638990874">"Hringja í <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="call_home" msgid="125893483593803791">"Hringja heim"</string>
-    <string name="call_mobile" msgid="967589404494150813">"Hringa í farsíma"</string>
-    <string name="call_work" msgid="6040550697395300892">"Hringja í vinnusíma"</string>
-    <string name="call_fax_work" msgid="5260192771364592922">"Hringja í faxnúmer vinnu"</string>
-    <string name="call_fax_home" msgid="5174311195081144124">"Hringja í faxnúmer heima"</string>
-    <string name="call_pager" msgid="6814149227741274161">"Hringja í símboða"</string>
-    <string name="call_other" msgid="5536385588712587235">"Hringja"</string>
-    <string name="call_callback" msgid="6314019862718112786">"Hringja svarhringingu"</string>
-    <string name="call_car" msgid="3197417098027764954">"Hringja í bílasíma"</string>
-    <string name="call_company_main" msgid="2557663310028446397">"Hringja í aðalsíma fyrirtækis"</string>
-    <string name="call_isdn" msgid="4691270442763649522">"Hringja í ISDN-númer"</string>
-    <string name="call_main" msgid="3293707608770407814">"Hringja í aðalnúmer"</string>
-    <string name="call_other_fax" msgid="4724521984879021465">"Hringja í faxnúmer"</string>
-    <string name="call_radio" msgid="8942441419845057942">"Hringja í talstöð"</string>
-    <string name="call_telex" msgid="2031514461660668351">"Hringja í telex"</string>
-    <string name="call_tty_tdd" msgid="7807210224965727701">"Hringja í fjarrita"</string>
-    <string name="call_work_mobile" msgid="2716342732938578495">"Hringja í vinnufarsíma"</string>
-    <string name="call_work_pager" msgid="3791778749827366574">"Hringja í vinnusímboða"</string>
-    <string name="call_assistant" msgid="4177478845473789294">"Hringja í <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
-    <string name="call_mms" msgid="4958811711741872901">"Hringja í MMS-númer"</string>
-    <string name="sms_custom" msgid="8785368968605026317">"Senda textaskilaboð í <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="sms_home" msgid="3527719551060295243">"Senda textaskilaboð heim"</string>
-    <string name="sms_mobile" msgid="8883045857887736518">"Senda textaskilaboð í farsíma"</string>
-    <string name="sms_work" msgid="4158595439553450966">"Senda textaskilaboð í vinnusíma"</string>
-    <string name="sms_fax_work" msgid="5483726627718055248">"Senda textaskilaboð í faxnúmer vinnu"</string>
-    <string name="sms_fax_home" msgid="9219265155770746077">"Senda textaskilaboð í faxnúmer heima"</string>
-    <string name="sms_pager" msgid="4901085068525193933">"Senda textaskilaboð í símboða"</string>
-    <string name="sms_other" msgid="1742702947993285933">"Senda textaskilaboð"</string>
-    <string name="sms_callback" msgid="5833483630377538308">"Senda textaskilaboð í svarhringingarnúmer"</string>
-    <string name="sms_car" msgid="4314577266154395174">"Senda textaskilaboð í bílasíma"</string>
-    <string name="sms_company_main" msgid="2308160928487360705">"Senda textaskilaboð í aðalnúmer fyrirtækis"</string>
-    <string name="sms_isdn" msgid="6394300346179302542">"Senda textaskilaboð í ISDN-númer"</string>
-    <string name="sms_main" msgid="8908087742014140774">"Senda textaskilaboð í aðalnúmer"</string>
-    <string name="sms_other_fax" msgid="8768455473295405427">"Senda textaskilaboð í faxnúmer"</string>
-    <string name="sms_radio" msgid="855555176531704682">"Senda textaskilaboð í talstöð"</string>
-    <string name="sms_telex" msgid="6269029276223252719">"Senda textaskilaboð í telex"</string>
-    <string name="sms_tty_tdd" msgid="6229057354509192444">"Senda textaskilaboð til fjarrita"</string>
-    <string name="sms_work_mobile" msgid="2155975469329969840">"Senda textaskilaboð í vinnufarsíma"</string>
-    <string name="sms_work_pager" msgid="8500140274906830742">"Senda textaskilaboð í vinnusímboða"</string>
-    <string name="sms_assistant" msgid="8513548482745330818">"Senda textaskilaboð til <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
-    <string name="sms_mms" msgid="5187888900503248542">"Senda textaskilaboð í MMS-númer"</string>
-    <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"Hreinsa mest notaða tengiliði?"</string>
-    <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"Þetta hreinsar tengiliðina sem þú hefur mest samskipti við úr forritunum Tengiliðir og Sími og þvingar tölvupóstforrit til að læra upp á nýtt hvernig þú notar netföng."</string>
-    <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"Hreinsar mest notaða tengiliði…"</string>
-    <string name="status_available" msgid="2648156525685472626">"Laus"</string>
-    <string name="status_away" msgid="2298688367552893953">"Í burtu"</string>
-    <string name="status_busy" msgid="5990832098713248503">"Upptekin(n)"</string>
-    <string name="contactsList" msgid="8806067891419291513">"Tengiliðir"</string>
-    <string name="contact_suggestions" msgid="3324166754807120006">"Helstu tillögur"</string>
-    <string name="local_invisible_directory" msgid="4723238462733650090">"Annað"</string>
-    <string name="directory_search_label" msgid="4621215895484025229">"Skrá"</string>
-    <string name="directory_search_label_work" msgid="7679326282707414897">"Vinnuskrá"</string>
-    <string name="local_search_label" msgid="907622822323119235">"Allir tengiliðir"</string>
-    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Tillögur"</string>
-    <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Ég"</string>
-    <string name="missing_name" msgid="978606963362745020">"(Nafn vantar)"</string>
-    <string name="description_view_contact_detail" msgid="2428742401208561136">"Skoða tengilið"</string>
-    <string name="list_filter_phones" msgid="8763316061763437182">"Allir tengiliðir með símanúmer"</string>
-    <string name="list_filter_phones_work" msgid="7083575404573422965">"Tengiliðir í vinnusniði"</string>
-    <string name="view_updates_from_group" msgid="9011641093168385729">"Skoða uppfærslur"</string>
-    <string name="account_phone" msgid="7067809073194061035">"Eingöngu á tæki, ósamstillt"</string>
-    <string name="nameLabelsGroup" msgid="7730465833159557471">"Nafn"</string>
-    <string name="nicknameLabelsGroup" msgid="6310556912361840029">"Gælunafn"</string>
-    <string name="full_name" msgid="648186563998465740">"Nafn"</string>
-    <string name="name_given" msgid="5096576006314820536">"Fornafn"</string>
-    <string name="name_family" msgid="6646235805198547467">"Eftirnafn"</string>
-    <string name="name_prefix" msgid="9215326539658838">"Forskeyti nafns"</string>
-    <string name="name_middle" msgid="703755205331582769">"Millinafn"</string>
-    <string name="name_suffix" msgid="5777083390282548702">"Viðskeyti nafns"</string>
-    <string name="name_phonetic" msgid="1650870996361663089">"Hljóðrétt nafn"</string>
-    <string name="name_phonetic_given" msgid="618812334274603170">"Hljóðritað fornafn"</string>
-    <string name="name_phonetic_middle" msgid="4826820763384625538">"Hljóðrétt millinafn"</string>
-    <string name="name_phonetic_family" msgid="379905191212930771">"Hljóðritað eftirnafn"</string>
-    <string name="phoneLabelsGroup" msgid="169661929021355548">"Sími"</string>
-    <string name="emailLabelsGroup" msgid="2249752810477488833">"Senda tölvupóst"</string>
-    <string name="postalLabelsGroup" msgid="6772000590189142253">"Heimilisfang"</string>
-    <string name="imLabelsGroup" msgid="5718066254237364731">"Spjall"</string>
-    <string name="organizationLabelsGroup" msgid="1101996309241601435">"Fyrirtæki"</string>
-    <string name="relationLabelsGroup" msgid="53866051664600053">"Tengsl"</string>
-    <string name="eventLabelsGroup" msgid="1236970042646618489">"Sérstök dagsetning"</string>
-    <string name="sms" msgid="7574344928185328095">"Textaskilaboð"</string>
-    <string name="postal_address" msgid="1804707930129674200">"Heimilisfang"</string>
-    <string name="ghostData_company" msgid="2554310786296833424">"Fyrirtæki"</string>
-    <string name="ghostData_title" msgid="4994968731830184837">"Titill"</string>
-    <string name="label_notes" msgid="2050255313694219786">"Athugasemdir"</string>
-    <string name="label_sip_address" msgid="8883266182575965926">"SIP"</string>
-    <string name="websiteLabelsGroup" msgid="1630734286462186790">"Vefsvæði"</string>
-    <string name="groupsLabel" msgid="2694002798416868728">"Hópar"</string>
-    <string name="email_home" msgid="889830029388962171">"Senda tölvupóst heim"</string>
-    <string name="email_mobile" msgid="4487686436743741150">"Senda tölvupóst í fartæki"</string>
-    <string name="email_work" msgid="4223487303344613528">"Senda tölvupóst í vinnu"</string>
-    <string name="email_other" msgid="4246411900126012062">"Senda tölvupóst"</string>
-    <string name="email_custom" msgid="7246580894327511013">"Senda tölvupóst til <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="email" msgid="2807318537887091606">"Senda tölvupóst"</string>
-    <string name="postal_street" msgid="6918171741240802474">"Gata"</string>
-    <string name="postal_city" msgid="8674569121430005628">"Borg/bær"</string>
-    <string name="postal_region" msgid="1730369286225469192">"Ríki"</string>
-    <string name="postal_postcode" msgid="4450700741261990439">"Póstnúmer"</string>
-    <string name="postal_country" msgid="232670707458768148">"Land"</string>
-    <string name="map_home" msgid="4181131107392126938">"Skoða heimilisfang"</string>
-    <string name="map_work" msgid="5723471185992684400">"Skoða póstfang vinnu"</string>
-    <string name="map_other" msgid="2253764780863500516">"Skoða póstfang"</string>
-    <string name="map_custom" msgid="5581743097882436157">"Skoða heimilisfang <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="chat_aim" msgid="2954364435497941659">"Spjalla með AIM"</string>
-    <string name="chat_msn" msgid="3130135239071228678">"Spjalla með Windows Live"</string>
-    <string name="chat_yahoo" msgid="3233552142326865347">"Spjalla með Yahoo"</string>
-    <string name="chat_skype" msgid="6486703981390592425">"Spjalla með Skype"</string>
-    <string name="chat_qq" msgid="786924280665740019">"Spjalla með QQ"</string>
-    <string name="chat_gtalk" msgid="7914674177243078035">"Spjalla með Google spjalli"</string>
-    <string name="chat_icq" msgid="3292934726414765801">"Spjalla með ICQ"</string>
-    <string name="chat_jabber" msgid="6701542313597880204">"Spjalla með Jabber"</string>
-    <string name="chat" msgid="1020428260359370236">"Spjalla"</string>
-    <string name="list_filter_all_accounts" msgid="473782314881473992">"Allir tengiliðir"</string>
-    <string name="listAllContactsInAccount" msgid="3486378621592995630">"Tengiliðir á <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="listCustomView" msgid="5306282632413086731">"Tengiliðir á sérsniðnu yfirliti"</string>
-    <string name="listSingleContact" msgid="8620818791932382627">"Einn tengiliður"</string>
-    <string name="display_options_sort_list_by" msgid="3541875948367831228">"Raða eftir"</string>
-    <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"Fornafn"</string>
-    <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"Eftirnafn"</string>
-    <string name="display_options_view_names_as" msgid="4204204205736735618">"Nafnasnið"</string>
-    <string name="display_options_view_given_name_first" msgid="2308026973021171020">"Fornafn fyrst"</string>
-    <string name="display_options_view_family_name_first" msgid="987430497292428242">"Eftirnafn fyrst"</string>
-    <string name="menu_clear_frequents" msgid="5358271535047496120">"Hreinsa algenga tengiliði"</string>
-    <string name="action_menu_back_from_search" msgid="3550669942742167644">"hætta leit"</string>
-    <string name="description_clear_search" msgid="2347258825265600782">"Hreinsa leit"</string>
-    <string name="select_account_dialog_title" msgid="2673504582803359239">"Reikningur"</string>
-    <string name="set_default_account" msgid="7966099951006467572">"Nota þetta alltaf fyrir símtöl"</string>
-    <string name="select_phone_account_for_calls" msgid="1784460686103423274">"Hringja með"</string>
-    <string name="call_with_a_note" msgid="6242261320491851133">"Símtal með texta"</string>
-    <string name="call_subject_hint" msgid="7233138753650420800">"Sláðu inn texta til að senda með símtalinu..."</string>
-    <string name="send_and_call_button" msgid="4735168294120154013">"SENDA OG HRINGJA"</string>
-    <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="tab_title" msgid="3387876802026074288">"Flipinn <xliff:g id="TITLE">%1$s</xliff:g>."</string>
-    <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
-      <item quantity="one"> Flipinn <xliff:g id="TITLE_2">%1$s</xliff:g>. <xliff:g id="COUNT_3">%2$d</xliff:g> ólesið atriði. </item>
-      <item quantity="other"> Flipinn <xliff:g id="TITLE_2">%1$s</xliff:g>. <xliff:g id="COUNT_3">%2$d</xliff:g> ólesin atriði. </item>
-    </plurals>
-    <string name="description_search_video_call" msgid="4337369876888024909">"Hringja myndsímtal"</string>
-    <string name="description_search_call_and_share" msgid="4912772842755050467">"Deila og hringja"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_custom">Hringja í %s</string>
+  <string name="call_home">Hringja heim</string>
+  <string name="call_mobile">Hringa í farsíma</string>
+  <string name="call_work">Hringja í vinnusíma</string>
+  <string name="call_fax_work">Hringja í faxnúmer vinnu</string>
+  <string name="call_fax_home">Hringja í faxnúmer heima</string>
+  <string name="call_pager">Hringja í símboða</string>
+  <string name="call_other">Hringja</string>
+  <string name="call_callback">Hringja svarhringingu</string>
+  <string name="call_car">Hringja í bílasíma</string>
+  <string name="call_company_main">Hringja í aðalsíma fyrirtækis</string>
+  <string name="call_isdn">Hringja í ISDN-númer</string>
+  <string name="call_main">Hringja í aðalnúmer</string>
+  <string name="call_other_fax">Hringja í faxnúmer</string>
+  <string name="call_radio">Hringja í talstöð</string>
+  <string name="call_telex">Hringja í telex</string>
+  <string name="call_tty_tdd">Hringja í fjarrita</string>
+  <string name="call_work_mobile">Hringja í vinnufarsíma</string>
+  <string name="call_work_pager">Hringja í vinnusímboða</string>
+  <string name="call_assistant">Hringja í %s</string>
+  <string name="call_mms">Hringja í MMS-númer</string>
+  <string name="sms_custom">Senda textaskilaboð í %s</string>
+  <string name="sms_home">Senda textaskilaboð heim</string>
+  <string name="sms_mobile">Senda textaskilaboð í farsíma</string>
+  <string name="sms_work">Senda textaskilaboð í vinnusíma</string>
+  <string name="sms_fax_work">Senda textaskilaboð í faxnúmer vinnu</string>
+  <string name="sms_fax_home">Senda textaskilaboð í faxnúmer heima</string>
+  <string name="sms_pager">Senda textaskilaboð í símboða</string>
+  <string name="sms_other">Senda textaskilaboð</string>
+  <string name="sms_callback">Senda textaskilaboð í svarhringingarnúmer</string>
+  <string name="sms_car">Senda textaskilaboð í bílasíma</string>
+  <string name="sms_company_main">Senda textaskilaboð í aðalnúmer fyrirtækis</string>
+  <string name="sms_isdn">Senda textaskilaboð í ISDN-númer</string>
+  <string name="sms_main">Senda textaskilaboð í aðalnúmer</string>
+  <string name="sms_other_fax">Senda textaskilaboð í faxnúmer</string>
+  <string name="sms_radio">Senda textaskilaboð í talstöð</string>
+  <string name="sms_telex">Senda textaskilaboð í telex</string>
+  <string name="sms_tty_tdd">Senda textaskilaboð til fjarrita</string>
+  <string name="sms_work_mobile">Senda textaskilaboð í vinnufarsíma</string>
+  <string name="sms_work_pager">Senda textaskilaboð í vinnusímboða</string>
+  <string name="sms_assistant">Senda textaskilaboð til %s</string>
+  <string name="sms_mms">Senda textaskilaboð í MMS-númer</string>
+  <string name="clearFrequentsConfirmation_title">Hreinsa mest notaða tengiliði?</string>
+  <string name="clearFrequentsConfirmation">Þetta hreinsar tengiliðina sem þú hefur mest samskipti við úr forritunum Tengiliðir og Sími og þvingar tölvupóstforrit til að læra upp á nýtt hvernig þú notar netföng.</string>
+  <string name="clearFrequentsProgress_title">Hreinsar mest notaða tengiliði…</string>
+  <string name="status_available">Laus</string>
+  <string name="status_away">Í burtu</string>
+  <string name="status_busy">Upptekin(n)</string>
+  <string name="contactsList">Tengiliðir</string>
+  <string name="contact_suggestions">Helstu tillögur</string>
+  <string name="local_invisible_directory">Annað</string>
+  <string name="directory_search_label">Skrá</string>
+  <string name="directory_search_label_work">Vinnuskrá</string>
+  <string name="local_search_label">Allir tengiliðir</string>
+  <string name="local_suggestions_search_label">Tillögur</string>
+  <string msgid="9154761216179882405" name="user_profile_contacts_list_header">Ég</string>
+  <string name="missing_name">(Nafn vantar)</string>
+  <string msgid="2795575601596468581" name="description_view_contact_detail">Skoða tengilið</string>
+  <string name="list_filter_phones">Allir tengiliðir með símanúmer</string>
+  <string name="list_filter_phones_work">Tengiliðir í vinnusniði</string>
+  <string name="view_updates_from_group">Skoða uppfærslur</string>
+  <string name="account_phone">Eingöngu á tæki, ósamstillt</string>
+  <string name="nameLabelsGroup">Nafn</string>
+  <string name="nicknameLabelsGroup">Gælunafn</string>
+  <string name="full_name">Nafn</string>
+  <string name="name_given">Fornafn</string>
+  <string name="name_family">Eftirnafn</string>
+  <string name="name_prefix">Forskeyti nafns</string>
+  <string name="name_middle">Millinafn</string>
+  <string name="name_suffix">Viðskeyti nafns</string>
+  <string name="name_phonetic">Hljóðrétt nafn</string>
+  <string name="name_phonetic_given">Hljóðritað fornafn</string>
+  <string name="name_phonetic_middle">Hljóðrétt millinafn</string>
+  <string name="name_phonetic_family">Hljóðritað eftirnafn</string>
+  <string name="phoneLabelsGroup">Sími</string>
+  <string name="emailLabelsGroup">Senda tölvupóst</string>
+  <string name="postalLabelsGroup">Heimilisfang</string>
+  <string name="imLabelsGroup">Spjall</string>
+  <string name="organizationLabelsGroup">Fyrirtæki</string>
+  <string name="relationLabelsGroup">Tengsl</string>
+  <string name="eventLabelsGroup">Sérstök dagsetning</string>
+  <string name="sms">Textaskilaboð</string>
+  <string name="postal_address">Heimilisfang</string>
+  <string name="ghostData_company">Fyrirtæki</string>
+  <string name="ghostData_title">Titill</string>
+  <string name="label_notes">Athugasemdir</string>
+  <string name="label_sip_address">SIP</string>
+  <string name="websiteLabelsGroup">Vefsvæði</string>
+  <string name="groupsLabel">Hópar</string>
+  <string name="email_home">Senda tölvupóst heim</string>
+  <string name="email_mobile">Senda tölvupóst í fartæki</string>
+  <string name="email_work">Senda tölvupóst í vinnu</string>
+  <string name="email_other">Senda tölvupóst</string>
+  <string name="email_custom">Senda tölvupóst til %s</string>
+  <string name="email">Senda tölvupóst</string>
+  <string name="postal_street">Gata</string>
+  <string name="postal_city">Borg/bær</string>
+  <string name="postal_region">Ríki</string>
+  <string name="postal_postcode">Póstnúmer</string>
+  <string name="postal_country">Land</string>
+  <string name="map_home">Skoða heimilisfang</string>
+  <string name="map_work">Skoða póstfang vinnu</string>
+  <string name="map_other">Skoða póstfang</string>
+  <string name="map_custom">Skoða heimilisfang %s</string>
+  <string name="chat_aim">Spjalla með AIM</string>
+  <string name="chat_msn">Spjalla með Windows Live</string>
+  <string name="chat_yahoo">Spjalla með Yahoo</string>
+  <string name="chat_skype">Spjalla með Skype</string>
+  <string name="chat_qq">Spjalla með QQ</string>
+  <string name="chat_gtalk">Spjalla með Google spjalli</string>
+  <string name="chat_icq">Spjalla með ICQ</string>
+  <string name="chat_jabber">Spjalla með Jabber</string>
+  <string name="chat">Spjalla</string>
+  <string name="list_filter_all_accounts">Allir tengiliðir</string>
+  <string name="listAllContactsInAccount">Tengiliðir á %s</string>
+  <string name="listCustomView">Tengiliðir á sérsniðnu yfirliti</string>
+  <string name="listSingleContact">Einn tengiliður</string>
+  <string name="display_options_sort_list_by">Raða eftir</string>
+  <string name="display_options_sort_by_given_name">Fornafn</string>
+  <string name="display_options_sort_by_family_name">Eftirnafn</string>
+  <string name="display_options_view_names_as">Nafnasnið</string>
+  <string name="display_options_view_given_name_first">Fornafn fyrst</string>
+  <string name="display_options_view_family_name_first">Eftirnafn fyrst</string>
+  <string name="menu_clear_frequents">Hreinsa algenga tengiliði</string>
+  <string name="action_menu_back_from_search">hætta leit</string>
+  <string name="description_clear_search">Hreinsa leit</string>
+  <string name="select_account_dialog_title">Reikningur</string>
+  <string name="set_default_account">Nota þetta alltaf fyrir símtöl</string>
+  <string name="select_phone_account_for_calls">Veldu SIM-kort fyrir þetta símtal</string>
+  <string name="select_phone_account_for_calls_remember">Muna þetta val</string>
+  <string name="call_with_a_note">Símtal með texta</string>
+  <string name="call_subject_hint">Sláðu inn texta til að senda með símtalinu...</string>
+  <string name="send_and_call_button">SENDA OG HRINGJA</string>
+  <string name="call_subject_limit">%1$s / %2$s</string>
+  <string name="old_call_subject_type_and_number">%1$s %2$s</string>
+  <string name="tab_title">Flipinn %1$s.</string>
+  <plurals name="tab_title_with_unread_items">
+    <item quantity="one"> Flipinn %1$s. %2$d ólesið atriði. </item>
+    <item quantity="other"> Flipinn %1$s. %2$d ólesin atriði. </item>
+  </plurals>
+  <string name="description_search_video_call">Hringja myndsímtal</string>
+  <string name="description_search_call_and_share">Deila og hringja</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-it/strings.xml b/java/com/android/contacts/common/res/values-it/strings.xml
index 3414bf8..1ec5019 100644
--- a/java/com/android/contacts/common/res/values-it/strings.xml
+++ b/java/com/android/contacts/common/res/values-it/strings.xml
@@ -1,162 +1,145 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="toast_text_copied" msgid="8979281391599667362">"Testo copiato"</string>
-    <string name="call_custom" msgid="3041673234638990874">"Chiama <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="call_home" msgid="125893483593803791">"Chiama casa"</string>
-    <string name="call_mobile" msgid="967589404494150813">"Chiama cellulare"</string>
-    <string name="call_work" msgid="6040550697395300892">"Chiama n. lavoro"</string>
-    <string name="call_fax_work" msgid="5260192771364592922">"Chiama fax lavoro"</string>
-    <string name="call_fax_home" msgid="5174311195081144124">"Chiama fax casa"</string>
-    <string name="call_pager" msgid="6814149227741274161">"Chiama cercapersone"</string>
-    <string name="call_other" msgid="5536385588712587235">"Chiama"</string>
-    <string name="call_callback" msgid="6314019862718112786">"Chiama n. di richiamata"</string>
-    <string name="call_car" msgid="3197417098027764954">"Chiama auto"</string>
-    <string name="call_company_main" msgid="2557663310028446397">"Chiama azienda (principale)"</string>
-    <string name="call_isdn" msgid="4691270442763649522">"Chiama ISDN"</string>
-    <string name="call_main" msgid="3293707608770407814">"Chiama principale"</string>
-    <string name="call_other_fax" msgid="4724521984879021465">"Chiama fax"</string>
-    <string name="call_radio" msgid="8942441419845057942">"Chiama radiotelefono"</string>
-    <string name="call_telex" msgid="2031514461660668351">"Chiama telex"</string>
-    <string name="call_tty_tdd" msgid="7807210224965727701">"Chiama TTY/TDD"</string>
-    <string name="call_work_mobile" msgid="2716342732938578495">"Chiama n. cellulare lavoro"</string>
-    <string name="call_work_pager" msgid="3791778749827366574">"Chiama cercapersone lavoro"</string>
-    <string name="call_assistant" msgid="4177478845473789294">"Chiama <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
-    <string name="call_mms" msgid="4958811711741872901">"Chiama MMS"</string>
-    <string name="sms_custom" msgid="8785368968605026317">"SMS a <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="sms_home" msgid="3527719551060295243">"SMS a casa"</string>
-    <string name="sms_mobile" msgid="8883045857887736518">"SMS a cellulare"</string>
-    <string name="sms_work" msgid="4158595439553450966">"SMS a lavoro"</string>
-    <string name="sms_fax_work" msgid="5483726627718055248">"SMS a fax lavoro"</string>
-    <string name="sms_fax_home" msgid="9219265155770746077">"SMS a fax casa"</string>
-    <string name="sms_pager" msgid="4901085068525193933">"SMS a cercapersone"</string>
-    <string name="sms_other" msgid="1742702947993285933">"Invia SMS"</string>
-    <string name="sms_callback" msgid="5833483630377538308">"SMS a n. di richiamata"</string>
-    <string name="sms_car" msgid="4314577266154395174">"SMS a auto"</string>
-    <string name="sms_company_main" msgid="2308160928487360705">"SMS a n. azienda principale"</string>
-    <string name="sms_isdn" msgid="6394300346179302542">"SMS a ISDN"</string>
-    <string name="sms_main" msgid="8908087742014140774">"SMS a principale"</string>
-    <string name="sms_other_fax" msgid="8768455473295405427">"SMS a fax"</string>
-    <string name="sms_radio" msgid="855555176531704682">"SMS a n. radiotelefono"</string>
-    <string name="sms_telex" msgid="6269029276223252719">"SMS a telex"</string>
-    <string name="sms_tty_tdd" msgid="6229057354509192444">"SMS a TTY/TDD"</string>
-    <string name="sms_work_mobile" msgid="2155975469329969840">"SMS a cellulare lavoro"</string>
-    <string name="sms_work_pager" msgid="8500140274906830742">"SMS a cercapersone lavoro"</string>
-    <string name="sms_assistant" msgid="8513548482745330818">"SMS a <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
-    <string name="sms_mms" msgid="5187888900503248542">"SMS a MMS"</string>
-    <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"Cancellare contattati di frequente?"</string>
-    <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"Verrà cancellato l\'elenco dei contatti frequenti nelle app Contatti e Telefono e le app email dovranno apprendere da zero le tue preferenze di comunicazione."</string>
-    <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"Cancellazione contattati di frequente…"</string>
-    <string name="status_available" msgid="2648156525685472626">"Disponibile"</string>
-    <string name="status_away" msgid="2298688367552893953">"Assente"</string>
-    <string name="status_busy" msgid="5990832098713248503">"Occupato"</string>
-    <string name="contactsList" msgid="8806067891419291513">"Contatti"</string>
-    <string name="contact_suggestions" msgid="3324166754807120006">"Suggerimenti più popolari"</string>
-    <string name="local_invisible_directory" msgid="4723238462733650090">"Altro"</string>
-    <string name="directory_search_label" msgid="4621215895484025229">"Directory"</string>
-    <string name="directory_search_label_work" msgid="7679326282707414897">"Directory di lavoro"</string>
-    <string name="local_search_label" msgid="907622822323119235">"Tutti i contatti"</string>
-    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Suggerimenti"</string>
-    <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Io"</string>
-    <string name="missing_name" msgid="978606963362745020">"(Nessun nome)"</string>
-    <string name="description_view_contact_detail" msgid="2428742401208561136">"Visualizza contatto"</string>
-    <string name="list_filter_phones" msgid="8763316061763437182">"Tutti i contatti con numeri di telefono"</string>
-    <string name="list_filter_phones_work" msgid="7083575404573422965">"Contatti del profilo di lavoro"</string>
-    <string name="view_updates_from_group" msgid="9011641093168385729">"Visualizza aggiornamenti"</string>
-    <string name="account_phone" msgid="7067809073194061035">"Solo dispositivo, non sincronizzato"</string>
-    <string name="nameLabelsGroup" msgid="7730465833159557471">"Nome"</string>
-    <string name="nicknameLabelsGroup" msgid="6310556912361840029">"Nickname"</string>
-    <string name="full_name" msgid="648186563998465740">"Nome"</string>
-    <string name="name_given" msgid="5096576006314820536">"Nome"</string>
-    <string name="name_family" msgid="6646235805198547467">"Cognome"</string>
-    <string name="name_prefix" msgid="9215326539658838">"Prefisso nome"</string>
-    <string name="name_middle" msgid="703755205331582769">"Secondo nome"</string>
-    <string name="name_suffix" msgid="5777083390282548702">"Suffisso nome"</string>
-    <string name="name_phonetic" msgid="1650870996361663089">"Nome fonetico"</string>
-    <string name="name_phonetic_given" msgid="618812334274603170">"Nome fonetico"</string>
-    <string name="name_phonetic_middle" msgid="4826820763384625538">"Secondo nome fonetico"</string>
-    <string name="name_phonetic_family" msgid="379905191212930771">"Cognome fonetico"</string>
-    <string name="phoneLabelsGroup" msgid="169661929021355548">"Telefono"</string>
-    <string name="emailLabelsGroup" msgid="2249752810477488833">"Invia email"</string>
-    <string name="postalLabelsGroup" msgid="6772000590189142253">"Indirizzo"</string>
-    <string name="imLabelsGroup" msgid="5718066254237364731">"Chat"</string>
-    <string name="organizationLabelsGroup" msgid="1101996309241601435">"Organizzazione"</string>
-    <string name="relationLabelsGroup" msgid="53866051664600053">"Relazione"</string>
-    <string name="eventLabelsGroup" msgid="1236970042646618489">"Data speciale"</string>
-    <string name="sms" msgid="7574344928185328095">"SMS"</string>
-    <string name="postal_address" msgid="1804707930129674200">"Indirizzo"</string>
-    <string name="ghostData_company" msgid="2554310786296833424">"Società"</string>
-    <string name="ghostData_title" msgid="4994968731830184837">"Ruolo"</string>
-    <string name="label_notes" msgid="2050255313694219786">"Note"</string>
-    <string name="label_sip_address" msgid="8883266182575965926">"SIP"</string>
-    <string name="websiteLabelsGroup" msgid="1630734286462186790">"Sito web"</string>
-    <string name="groupsLabel" msgid="2694002798416868728">"Gruppi"</string>
-    <string name="email_home" msgid="889830029388962171">"Invia email a indirizzo casa"</string>
-    <string name="email_mobile" msgid="4487686436743741150">"Invia email a indirizzo cellulare"</string>
-    <string name="email_work" msgid="4223487303344613528">"Invia email a indirizzo lavoro"</string>
-    <string name="email_other" msgid="4246411900126012062">"Invia email"</string>
-    <string name="email_custom" msgid="7246580894327511013">"Invia email a <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="email" msgid="2807318537887091606">"Invia email"</string>
-    <string name="postal_street" msgid="6918171741240802474">"Via"</string>
-    <string name="postal_city" msgid="8674569121430005628">"Città"</string>
-    <string name="postal_region" msgid="1730369286225469192">"Provincia"</string>
-    <string name="postal_postcode" msgid="4450700741261990439">"Codice postale"</string>
-    <string name="postal_country" msgid="232670707458768148">"Paese"</string>
-    <string name="map_home" msgid="4181131107392126938">"Visualizza indirizzo casa"</string>
-    <string name="map_work" msgid="5723471185992684400">"Visualizza indirizzo lavoro"</string>
-    <string name="map_other" msgid="2253764780863500516">"Visualizza indirizzo"</string>
-    <string name="map_custom" msgid="5581743097882436157">"Visualizza indirizzo <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="chat_aim" msgid="2954364435497941659">"Chatta su AIM"</string>
-    <string name="chat_msn" msgid="3130135239071228678">"Chatta su Windows Live"</string>
-    <string name="chat_yahoo" msgid="3233552142326865347">"Chatta su Yahoo"</string>
-    <string name="chat_skype" msgid="6486703981390592425">"Chatta su Skype"</string>
-    <string name="chat_qq" msgid="786924280665740019">"Chatta su QQ"</string>
-    <string name="chat_gtalk" msgid="7914674177243078035">"Chatta su Google Talk"</string>
-    <string name="chat_icq" msgid="3292934726414765801">"Chatta su ICQ"</string>
-    <string name="chat_jabber" msgid="6701542313597880204">"Chatta su Jabber"</string>
-    <string name="chat" msgid="1020428260359370236">"Chat"</string>
-    <string name="list_filter_all_accounts" msgid="473782314881473992">"Tutti i contatti"</string>
-    <string name="listAllContactsInAccount" msgid="3486378621592995630">"Contatti in <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="listCustomView" msgid="5306282632413086731">"Contatti in visualizzazione personalizzata"</string>
-    <string name="listSingleContact" msgid="8620818791932382627">"Contatto singolo"</string>
-    <string name="display_options_sort_list_by" msgid="3541875948367831228">"Ordina per"</string>
-    <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"Nome"</string>
-    <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"Cognome"</string>
-    <string name="display_options_view_names_as" msgid="4204204205736735618">"Formato nome"</string>
-    <string name="display_options_view_given_name_first" msgid="2308026973021171020">"Prima il nome"</string>
-    <string name="display_options_view_family_name_first" msgid="987430497292428242">"Prima il cognome"</string>
-    <string name="menu_clear_frequents" msgid="5358271535047496120">"Cancella frequenti"</string>
-    <string name="action_menu_back_from_search" msgid="3550669942742167644">"interrompi ricerca"</string>
-    <string name="description_clear_search" msgid="2347258825265600782">"Cancella ricerca"</string>
-    <string name="select_account_dialog_title" msgid="2673504582803359239">"Account"</string>
-    <string name="set_default_account" msgid="7966099951006467572">"Usa sempre questa per chiamare"</string>
-    <string name="select_phone_account_for_calls" msgid="1784460686103423274">"Chiama con"</string>
-    <string name="call_with_a_note" msgid="6242261320491851133">"Chiama e invia una nota"</string>
-    <string name="call_subject_hint" msgid="7233138753650420800">"Digita una nota da inviare con la chiamata..."</string>
-    <string name="send_and_call_button" msgid="4735168294120154013">"INVIA E CHIAMA"</string>
-    <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g>/<xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="tab_title" msgid="3387876802026074288">"Scheda <xliff:g id="TITLE">%1$s</xliff:g>."</string>
-    <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
-      <item quantity="other"> Scheda <xliff:g id="TITLE_2">%1$s</xliff:g>. <xliff:g id="COUNT_3">%2$d</xliff:g> elementi da leggere. </item>
-      <item quantity="one"> Scheda <xliff:g id="TITLE_0">%1$s</xliff:g>. <xliff:g id="COUNT_1">%2$d</xliff:g> elemento da leggere. </item>
-    </plurals>
-    <string name="description_search_video_call" msgid="4337369876888024909">"Videochiamata"</string>
-    <string name="description_search_call_and_share" msgid="4912772842755050467">"Condividi e chiama"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_custom">Chiama %s</string>
+  <string name="call_home">Chiama casa</string>
+  <string name="call_mobile">Chiama cellulare</string>
+  <string name="call_work">Chiama n. lavoro</string>
+  <string name="call_fax_work">Chiama fax lavoro</string>
+  <string name="call_fax_home">Chiama fax casa</string>
+  <string name="call_pager">Chiama cercapersone</string>
+  <string name="call_other">Chiama</string>
+  <string name="call_callback">Chiama n. di richiamata</string>
+  <string name="call_car">Chiama auto</string>
+  <string name="call_company_main">Chiama azienda (principale)</string>
+  <string name="call_isdn">Chiama ISDN</string>
+  <string name="call_main">Chiama principale</string>
+  <string name="call_other_fax">Chiama fax</string>
+  <string name="call_radio">Chiama radiotelefono</string>
+  <string name="call_telex">Chiama telex</string>
+  <string name="call_tty_tdd">Chiama TTY/TDD</string>
+  <string name="call_work_mobile">Chiama n. cellulare lavoro</string>
+  <string name="call_work_pager">Chiama cercapersone lavoro</string>
+  <string name="call_assistant">Chiama %s</string>
+  <string name="call_mms">Chiama MMS</string>
+  <string name="sms_custom">SMS a %s</string>
+  <string name="sms_home">SMS a casa</string>
+  <string name="sms_mobile">SMS a cellulare</string>
+  <string name="sms_work">SMS a lavoro</string>
+  <string name="sms_fax_work">SMS a fax lavoro</string>
+  <string name="sms_fax_home">SMS a fax casa</string>
+  <string name="sms_pager">SMS a cercapersone</string>
+  <string name="sms_other">Invia SMS</string>
+  <string name="sms_callback">SMS a n. di richiamata</string>
+  <string name="sms_car">SMS a auto</string>
+  <string name="sms_company_main">SMS a n. azienda principale</string>
+  <string name="sms_isdn">SMS a ISDN</string>
+  <string name="sms_main">SMS a principale</string>
+  <string name="sms_other_fax">SMS a fax</string>
+  <string name="sms_radio">SMS a n. radiotelefono</string>
+  <string name="sms_telex">SMS a telex</string>
+  <string name="sms_tty_tdd">SMS a TTY/TDD</string>
+  <string name="sms_work_mobile">SMS a cellulare lavoro</string>
+  <string name="sms_work_pager">SMS a cercapersone lavoro</string>
+  <string name="sms_assistant">SMS a %s</string>
+  <string name="sms_mms">SMS a MMS</string>
+  <string name="clearFrequentsConfirmation_title">Cancellare contattati di frequente?</string>
+  <string name="clearFrequentsConfirmation">Verrà cancellato l\'elenco dei contatti frequenti nelle app Contatti e Telefono e le app email dovranno apprendere da zero le tue preferenze di comunicazione.</string>
+  <string name="clearFrequentsProgress_title">Cancellazione contattati di frequente…</string>
+  <string name="status_available">Disponibile</string>
+  <string name="status_away">Assente</string>
+  <string name="status_busy">Occupato</string>
+  <string name="contactsList">Contatti</string>
+  <string name="contact_suggestions">Suggerimenti più popolari</string>
+  <string name="local_invisible_directory">Altro</string>
+  <string name="directory_search_label">Directory</string>
+  <string name="directory_search_label_work">Directory di lavoro</string>
+  <string name="local_search_label">Tutti i contatti</string>
+  <string name="local_suggestions_search_label">Suggerimenti</string>
+  <string msgid="9154761216179882405" name="user_profile_contacts_list_header">Io</string>
+  <string name="missing_name">(Nessun nome)</string>
+  <string msgid="2795575601596468581" name="description_view_contact_detail">Visualizza contatto</string>
+  <string name="list_filter_phones">Tutti i contatti con numeri di telefono</string>
+  <string name="list_filter_phones_work">Contatti del profilo di lavoro</string>
+  <string name="view_updates_from_group">Visualizza aggiornamenti</string>
+  <string name="account_phone">Solo dispositivo, non sincronizzato</string>
+  <string name="nameLabelsGroup">Nome</string>
+  <string name="nicknameLabelsGroup">Nickname</string>
+  <string name="full_name">Nome</string>
+  <string name="name_given">Nome</string>
+  <string name="name_family">Cognome</string>
+  <string name="name_prefix">Prefisso nome</string>
+  <string name="name_middle">Secondo nome</string>
+  <string name="name_suffix">Suffisso nome</string>
+  <string name="name_phonetic">Nome fonetico</string>
+  <string name="name_phonetic_given">Nome fonetico</string>
+  <string name="name_phonetic_middle">Secondo nome fonetico</string>
+  <string name="name_phonetic_family">Cognome fonetico</string>
+  <string name="phoneLabelsGroup">Telefono</string>
+  <string name="emailLabelsGroup">Invia email</string>
+  <string name="postalLabelsGroup">Indirizzo</string>
+  <string name="imLabelsGroup">Chat</string>
+  <string name="organizationLabelsGroup">Organizzazione</string>
+  <string name="relationLabelsGroup">Relazione</string>
+  <string name="eventLabelsGroup">Data speciale</string>
+  <string name="sms">SMS</string>
+  <string name="postal_address">Indirizzo</string>
+  <string name="ghostData_company">Società</string>
+  <string name="ghostData_title">Ruolo</string>
+  <string name="label_notes">Note</string>
+  <string name="label_sip_address">SIP</string>
+  <string name="websiteLabelsGroup">Sito web</string>
+  <string name="groupsLabel">Gruppi</string>
+  <string name="email_home">Invia email a indirizzo casa</string>
+  <string name="email_mobile">Invia email a indirizzo cellulare</string>
+  <string name="email_work">Invia email a indirizzo lavoro</string>
+  <string name="email_other">Invia email</string>
+  <string name="email_custom">Invia email a %s</string>
+  <string name="email">Invia email</string>
+  <string name="postal_street">Via</string>
+  <string name="postal_city">Città</string>
+  <string name="postal_region">Provincia</string>
+  <string name="postal_postcode">Codice postale</string>
+  <string name="postal_country">Paese</string>
+  <string name="map_home">Visualizza indirizzo casa</string>
+  <string name="map_work">Visualizza indirizzo lavoro</string>
+  <string name="map_other">Visualizza indirizzo</string>
+  <string name="map_custom">Visualizza indirizzo %s</string>
+  <string name="chat_aim">Chatta su AIM</string>
+  <string name="chat_msn">Chatta su Windows Live</string>
+  <string name="chat_yahoo">Chatta su Yahoo</string>
+  <string name="chat_skype">Chatta su Skype</string>
+  <string name="chat_qq">Chatta su QQ</string>
+  <string name="chat_gtalk">Chatta su Google Talk</string>
+  <string name="chat_icq">Chatta su ICQ</string>
+  <string name="chat_jabber">Chatta su Jabber</string>
+  <string name="chat">Chat</string>
+  <string name="list_filter_all_accounts">Tutti i contatti</string>
+  <string name="listAllContactsInAccount">Contatti in %s</string>
+  <string name="listCustomView">Contatti in visualizzazione personalizzata</string>
+  <string name="listSingleContact">Contatto singolo</string>
+  <string name="display_options_sort_list_by">Ordina per</string>
+  <string name="display_options_sort_by_given_name">Nome</string>
+  <string name="display_options_sort_by_family_name">Cognome</string>
+  <string name="display_options_view_names_as">Formato nome</string>
+  <string name="display_options_view_given_name_first">Prima il nome</string>
+  <string name="display_options_view_family_name_first">Prima il cognome</string>
+  <string name="menu_clear_frequents">Cancella frequenti</string>
+  <string name="action_menu_back_from_search">interrompi ricerca</string>
+  <string name="description_clear_search">Cancella ricerca</string>
+  <string name="select_account_dialog_title">Account</string>
+  <string name="set_default_account">Usa sempre questa per chiamare</string>
+  <string name="select_phone_account_for_calls">Scegli la SIM per questa chiamata</string>
+  <string name="select_phone_account_for_calls_remember">Memorizza questa scelta</string>
+  <string name="call_with_a_note">Chiama e invia una nota</string>
+  <string name="call_subject_hint">Digita una nota da inviare con la chiamata...</string>
+  <string name="send_and_call_button">INVIA E CHIAMA</string>
+  <string name="call_subject_limit">%1$s/%2$s</string>
+  <string name="old_call_subject_type_and_number">%1$s %2$s</string>
+  <string name="tab_title">Scheda %1$s.</string>
+  <plurals name="tab_title_with_unread_items">
+    <item quantity="one"> Scheda %1$s. %2$d elemento da leggere. </item>
+    <item quantity="other"> Scheda %1$s. %2$d elementi da leggere. </item>
+  </plurals>
+  <string name="description_search_video_call">Videochiamata</string>
+  <string name="description_search_call_and_share">Condividi e chiama</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-iw/strings.xml b/java/com/android/contacts/common/res/values-iw/strings.xml
index 381b5d1..f3d5e39 100644
--- a/java/com/android/contacts/common/res/values-iw/strings.xml
+++ b/java/com/android/contacts/common/res/values-iw/strings.xml
@@ -1,164 +1,147 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="toast_text_copied" msgid="8979281391599667362">"טקסט שהועתק"</string>
-    <string name="call_custom" msgid="3041673234638990874">"התקשר אל <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="call_home" msgid="125893483593803791">"התקשר לבית"</string>
-    <string name="call_mobile" msgid="967589404494150813">"התקשר לנייד"</string>
-    <string name="call_work" msgid="6040550697395300892">"התקשר לעבודה"</string>
-    <string name="call_fax_work" msgid="5260192771364592922">"התקשר לפקס בעבודה"</string>
-    <string name="call_fax_home" msgid="5174311195081144124">"התקשר לפקס בבית"</string>
-    <string name="call_pager" msgid="6814149227741274161">"התקשר לזימונית"</string>
-    <string name="call_other" msgid="5536385588712587235">"התקשר"</string>
-    <string name="call_callback" msgid="6314019862718112786">"התקשר למספר להתקשרות חזרה"</string>
-    <string name="call_car" msgid="3197417098027764954">"התקשר למספר במכונית"</string>
-    <string name="call_company_main" msgid="2557663310028446397">"התקשר למספר הראשי של החברה"</string>
-    <string name="call_isdn" msgid="4691270442763649522">"‏התקשר ל-ISDN"</string>
-    <string name="call_main" msgid="3293707608770407814">"התקשר למספר הראשי"</string>
-    <string name="call_other_fax" msgid="4724521984879021465">"התקשר לפקס"</string>
-    <string name="call_radio" msgid="8942441419845057942">"התקשר לרדיו"</string>
-    <string name="call_telex" msgid="2031514461660668351">"התקשר לטלקס"</string>
-    <string name="call_tty_tdd" msgid="7807210224965727701">"‏התקשר ל-TTY/TDD"</string>
-    <string name="call_work_mobile" msgid="2716342732938578495">"התקשר לנייד של העבודה"</string>
-    <string name="call_work_pager" msgid="3791778749827366574">"התקשר לזימונית של העבודה"</string>
-    <string name="call_assistant" msgid="4177478845473789294">"התקשר אל <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
-    <string name="call_mms" msgid="4958811711741872901">"‏התקשר ל-MMS"</string>
-    <string name="sms_custom" msgid="8785368968605026317">"שלח הודעת טקסט אל <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="sms_home" msgid="3527719551060295243">"שלח הודעת טקסט לבית"</string>
-    <string name="sms_mobile" msgid="8883045857887736518">"שלח הודעת טקסט לנייד"</string>
-    <string name="sms_work" msgid="4158595439553450966">"שלח הודעת טקסט לעבודה"</string>
-    <string name="sms_fax_work" msgid="5483726627718055248">"שלח הודעת טקסט לפקס בעבודה"</string>
-    <string name="sms_fax_home" msgid="9219265155770746077">"שלח הודעת טקסט לפקס בבית"</string>
-    <string name="sms_pager" msgid="4901085068525193933">"שלח הודעת טקסט לזימונית"</string>
-    <string name="sms_other" msgid="1742702947993285933">"שלח הודעת טקסט"</string>
-    <string name="sms_callback" msgid="5833483630377538308">"שלח הודעת טקסט למספר להתקשרות חזרה"</string>
-    <string name="sms_car" msgid="4314577266154395174">"שלח הודעת טקסט למספר במכונית"</string>
-    <string name="sms_company_main" msgid="2308160928487360705">"שלח הודעת טקסט למספר הראשי של החברה"</string>
-    <string name="sms_isdn" msgid="6394300346179302542">"‏שלח הודעת טקסט ל-ISDN"</string>
-    <string name="sms_main" msgid="8908087742014140774">"שלח הודעת טקסט למספר הראשי"</string>
-    <string name="sms_other_fax" msgid="8768455473295405427">"שלח הודעת טקסט לפקס"</string>
-    <string name="sms_radio" msgid="855555176531704682">"שלח הודעת טקסט לרדיו"</string>
-    <string name="sms_telex" msgid="6269029276223252719">"שלח הודעת טקסט לטלקס"</string>
-    <string name="sms_tty_tdd" msgid="6229057354509192444">"‏שלח הודעת טקסט ל-TTY/TDD"</string>
-    <string name="sms_work_mobile" msgid="2155975469329969840">"שלח הודעת טקסט לנייד של עבודה"</string>
-    <string name="sms_work_pager" msgid="8500140274906830742">"שלח הודעת טקסט לזימונית של עבודה"</string>
-    <string name="sms_assistant" msgid="8513548482745330818">"שלח הודעת טקסט אל <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
-    <string name="sms_mms" msgid="5187888900503248542">"‏שלח הודעת טקסט ל-MMS"</string>
-    <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"האם למחוק אנשי קשר קבועים?"</string>
-    <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"הפעולה הזו תמחק מהאפליקציות \'אנשים\' ו\'טלפון\' את רשימת אנשי הקשר שאיתם אתה יוצר קשר בתדירות גבוהה, ויהיה עליך ללמד מחדש את אפליקציות האימייל את הכתובות המועדפות עליך."</string>
-    <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"מוחק אנשי קשר קבועים…"</string>
-    <string name="status_available" msgid="2648156525685472626">"זמין"</string>
-    <string name="status_away" msgid="2298688367552893953">"לא נמצא"</string>
-    <string name="status_busy" msgid="5990832098713248503">"לא פנוי"</string>
-    <string name="contactsList" msgid="8806067891419291513">"אנשי קשר"</string>
-    <string name="contact_suggestions" msgid="3324166754807120006">"הצעות מובילות"</string>
-    <string name="local_invisible_directory" msgid="4723238462733650090">"אחר"</string>
-    <string name="directory_search_label" msgid="4621215895484025229">"ספריה"</string>
-    <string name="directory_search_label_work" msgid="7679326282707414897">"ספריית עבודה"</string>
-    <string name="local_search_label" msgid="907622822323119235">"כל אנשי הקשר"</string>
-    <string name="local_suggestions_search_label" msgid="1178575146224386118">"הצעות"</string>
-    <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"אני"</string>
-    <string name="missing_name" msgid="978606963362745020">"(ללא שם)"</string>
-    <string name="description_view_contact_detail" msgid="2428742401208561136">"הצג איש קשר"</string>
-    <string name="list_filter_phones" msgid="8763316061763437182">"כל אנשי הקשר עם מספרי טלפון"</string>
-    <string name="list_filter_phones_work" msgid="7083575404573422965">"אנשי הקשר של פרופיל העבודה"</string>
-    <string name="view_updates_from_group" msgid="9011641093168385729">"הצג עדכונים"</string>
-    <string name="account_phone" msgid="7067809073194061035">"במכשיר בלבד, ללא סנכרון"</string>
-    <string name="nameLabelsGroup" msgid="7730465833159557471">"שם"</string>
-    <string name="nicknameLabelsGroup" msgid="6310556912361840029">"כינוי"</string>
-    <string name="full_name" msgid="648186563998465740">"שם"</string>
-    <string name="name_given" msgid="5096576006314820536">"שם פרטי"</string>
-    <string name="name_family" msgid="6646235805198547467">"שם משפחה"</string>
-    <string name="name_prefix" msgid="9215326539658838">"תחילית שם"</string>
-    <string name="name_middle" msgid="703755205331582769">"שם אמצעי"</string>
-    <string name="name_suffix" msgid="5777083390282548702">"סיומת שם"</string>
-    <string name="name_phonetic" msgid="1650870996361663089">"שם פונטי"</string>
-    <string name="name_phonetic_given" msgid="618812334274603170">"שם פרטי פונטי"</string>
-    <string name="name_phonetic_middle" msgid="4826820763384625538">"שם אמצעי פונטי"</string>
-    <string name="name_phonetic_family" msgid="379905191212930771">"שם משפחה פונטי"</string>
-    <string name="phoneLabelsGroup" msgid="169661929021355548">"טלפון"</string>
-    <string name="emailLabelsGroup" msgid="2249752810477488833">"שלח אימייל"</string>
-    <string name="postalLabelsGroup" msgid="6772000590189142253">"כתובת"</string>
-    <string name="imLabelsGroup" msgid="5718066254237364731">"הודעות מיידיות"</string>
-    <string name="organizationLabelsGroup" msgid="1101996309241601435">"ארגון"</string>
-    <string name="relationLabelsGroup" msgid="53866051664600053">"קשר"</string>
-    <string name="eventLabelsGroup" msgid="1236970042646618489">"תאריך מיוחד"</string>
-    <string name="sms" msgid="7574344928185328095">"הודעת טקסט"</string>
-    <string name="postal_address" msgid="1804707930129674200">"כתובת"</string>
-    <string name="ghostData_company" msgid="2554310786296833424">"חברה"</string>
-    <string name="ghostData_title" msgid="4994968731830184837">"תפקיד"</string>
-    <string name="label_notes" msgid="2050255313694219786">"הערות"</string>
-    <string name="label_sip_address" msgid="8883266182575965926">"SIP"</string>
-    <string name="websiteLabelsGroup" msgid="1630734286462186790">"אתר"</string>
-    <string name="groupsLabel" msgid="2694002798416868728">"קבוצות"</string>
-    <string name="email_home" msgid="889830029388962171">"שלח אימייל לבית"</string>
-    <string name="email_mobile" msgid="4487686436743741150">"שלח אימייל לנייד"</string>
-    <string name="email_work" msgid="4223487303344613528">"שלח אימייל לעבודה"</string>
-    <string name="email_other" msgid="4246411900126012062">"שלח אימייל"</string>
-    <string name="email_custom" msgid="7246580894327511013">"שלח אימייל אל <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="email" msgid="2807318537887091606">"שלח אימייל"</string>
-    <string name="postal_street" msgid="6918171741240802474">"רחוב"</string>
-    <string name="postal_city" msgid="8674569121430005628">"עיר"</string>
-    <string name="postal_region" msgid="1730369286225469192">"מדינה"</string>
-    <string name="postal_postcode" msgid="4450700741261990439">"מיקוד"</string>
-    <string name="postal_country" msgid="232670707458768148">"מדינה"</string>
-    <string name="map_home" msgid="4181131107392126938">"הצג כתובת בית"</string>
-    <string name="map_work" msgid="5723471185992684400">"הצג כתובת עבודה"</string>
-    <string name="map_other" msgid="2253764780863500516">"הצג כתובת"</string>
-    <string name="map_custom" msgid="5581743097882436157">"הצג כתובת <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="chat_aim" msgid="2954364435497941659">"‏שוחח בצ\'אט באמצעות AIM"</string>
-    <string name="chat_msn" msgid="3130135239071228678">"‏שוחח בצ\'אט באמצעות Windows Live"</string>
-    <string name="chat_yahoo" msgid="3233552142326865347">"‏שוחח בצ\'אט באמצעות Yahoo"</string>
-    <string name="chat_skype" msgid="6486703981390592425">"‏שוחח בצ\'אט באמצעות Skype"</string>
-    <string name="chat_qq" msgid="786924280665740019">"‏שוחח בצ\'אט באמצעות QQ"</string>
-    <string name="chat_gtalk" msgid="7914674177243078035">"‏שוחח בצ\'אט באמצעות Google Talk"</string>
-    <string name="chat_icq" msgid="3292934726414765801">"‏שוחח בצ\'אט באמצעות ICQ"</string>
-    <string name="chat_jabber" msgid="6701542313597880204">"‏שוחח בצ\'אט באמצעות Jabber"</string>
-    <string name="chat" msgid="1020428260359370236">"צ\'אט"</string>
-    <string name="list_filter_all_accounts" msgid="473782314881473992">"כל אנשי הקשר"</string>
-    <string name="listAllContactsInAccount" msgid="3486378621592995630">"אנשי קשר ב-<xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="listCustomView" msgid="5306282632413086731">"אנשי קשר בתצוגה מותאמת אישית"</string>
-    <string name="listSingleContact" msgid="8620818791932382627">"איש קשר יחיד"</string>
-    <string name="display_options_sort_list_by" msgid="3541875948367831228">"מיון לפי"</string>
-    <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"שם פרטי"</string>
-    <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"שם משפחה"</string>
-    <string name="display_options_view_names_as" msgid="4204204205736735618">"פורמט השם"</string>
-    <string name="display_options_view_given_name_first" msgid="2308026973021171020">"שם פרטי יופיע ראשון"</string>
-    <string name="display_options_view_family_name_first" msgid="987430497292428242">"שם משפחה יופיע ראשון"</string>
-    <string name="menu_clear_frequents" msgid="5358271535047496120">"מחק אנשי קשר קבועים"</string>
-    <string name="action_menu_back_from_search" msgid="3550669942742167644">"הפסק לחפש"</string>
-    <string name="description_clear_search" msgid="2347258825265600782">"נקה חיפוש"</string>
-    <string name="select_account_dialog_title" msgid="2673504582803359239">"חשבון"</string>
-    <string name="set_default_account" msgid="7966099951006467572">"השתמש תמיד עבור שיחות"</string>
-    <string name="select_phone_account_for_calls" msgid="1784460686103423274">"התקשר באמצעות"</string>
-    <string name="call_with_a_note" msgid="6242261320491851133">"התקשר עם הערה"</string>
-    <string name="call_subject_hint" msgid="7233138753650420800">"הקלד הערה לשליחה עם השיחה..."</string>
-    <string name="send_and_call_button" msgid="4735168294120154013">"שלח והתקשר"</string>
-    <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="6338030032554019678">"‎<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>‎"</string>
-    <string name="tab_title" msgid="3387876802026074288">"הכרטיסייה <xliff:g id="TITLE">%1$s</xliff:g>."</string>
-    <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
-      <item quantity="two">הכרטיסייה <xliff:g id="TITLE_2">%1$s</xliff:g>. <xliff:g id="COUNT_3">%2$d</xliff:g> פריטים שלא נקראו. </item>
-      <item quantity="many">הכרטיסייה <xliff:g id="TITLE_2">%1$s</xliff:g>. <xliff:g id="COUNT_3">%2$d</xliff:g> פריטים שלא נקראו. </item>
-      <item quantity="other">הכרטיסייה <xliff:g id="TITLE_2">%1$s</xliff:g>. <xliff:g id="COUNT_3">%2$d</xliff:g> פריטים שלא נקראו. </item>
-      <item quantity="one">הכרטיסייה <xliff:g id="TITLE_0">%1$s</xliff:g>. <xliff:g id="COUNT_1">%2$d</xliff:g> פריט שלא נקרא. </item>
-    </plurals>
-    <string name="description_search_video_call" msgid="4337369876888024909">"שיחת וידאו"</string>
-    <string name="description_search_call_and_share" msgid="4912772842755050467">"שיתוף והתקשרות"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_custom">התקשר אל %s</string>
+  <string name="call_home">התקשר לבית</string>
+  <string name="call_mobile">התקשר לנייד</string>
+  <string name="call_work">התקשר לעבודה</string>
+  <string name="call_fax_work">התקשר לפקס בעבודה</string>
+  <string name="call_fax_home">התקשר לפקס בבית</string>
+  <string name="call_pager">התקשר לזימונית</string>
+  <string name="call_other">התקשר</string>
+  <string name="call_callback">התקשר למספר להתקשרות חזרה</string>
+  <string name="call_car">התקשר למספר במכונית</string>
+  <string name="call_company_main">התקשר למספר הראשי של החברה</string>
+  <string name="call_isdn">‏התקשר ל-ISDN</string>
+  <string name="call_main">התקשר למספר הראשי</string>
+  <string name="call_other_fax">התקשר לפקס</string>
+  <string name="call_radio">התקשר לרדיו</string>
+  <string name="call_telex">התקשר לטלקס</string>
+  <string name="call_tty_tdd">‏התקשר ל-TTY/TDD</string>
+  <string name="call_work_mobile">התקשר לנייד של העבודה</string>
+  <string name="call_work_pager">התקשר לזימונית של העבודה</string>
+  <string name="call_assistant">התקשר אל %s</string>
+  <string name="call_mms">‏התקשר ל-MMS</string>
+  <string name="sms_custom">שלח הודעת טקסט אל %s</string>
+  <string name="sms_home">שלח הודעת טקסט לבית</string>
+  <string name="sms_mobile">שלח הודעת טקסט לנייד</string>
+  <string name="sms_work">שלח הודעת טקסט לעבודה</string>
+  <string name="sms_fax_work">שלח הודעת טקסט לפקס בעבודה</string>
+  <string name="sms_fax_home">שלח הודעת טקסט לפקס בבית</string>
+  <string name="sms_pager">שלח הודעת טקסט לזימונית</string>
+  <string name="sms_other">שלח הודעת טקסט</string>
+  <string name="sms_callback">שלח הודעת טקסט למספר להתקשרות חזרה</string>
+  <string name="sms_car">שלח הודעת טקסט למספר במכונית</string>
+  <string name="sms_company_main">שלח הודעת טקסט למספר הראשי של החברה</string>
+  <string name="sms_isdn">‏שלח הודעת טקסט ל-ISDN</string>
+  <string name="sms_main">שלח הודעת טקסט למספר הראשי</string>
+  <string name="sms_other_fax">שלח הודעת טקסט לפקס</string>
+  <string name="sms_radio">שלח הודעת טקסט לרדיו</string>
+  <string name="sms_telex">שלח הודעת טקסט לטלקס</string>
+  <string name="sms_tty_tdd">‏שלח הודעת טקסט ל-TTY/TDD</string>
+  <string name="sms_work_mobile">שלח הודעת טקסט לנייד של עבודה</string>
+  <string name="sms_work_pager">שלח הודעת טקסט לזימונית של עבודה</string>
+  <string name="sms_assistant">שלח הודעת טקסט אל %s</string>
+  <string name="sms_mms">‏שלח הודעת טקסט ל-MMS</string>
+  <string name="clearFrequentsConfirmation_title">האם למחוק אנשי קשר קבועים?</string>
+  <string name="clearFrequentsConfirmation">הפעולה הזו תמחק מהאפליקציות \'אנשים\' ו\'טלפון\' את רשימת אנשי הקשר שאיתם אתה יוצר קשר בתדירות גבוהה, ויהיה עליך ללמד מחדש את אפליקציות האימייל את הכתובות המועדפות עליך.</string>
+  <string name="clearFrequentsProgress_title">מוחק אנשי קשר קבועים…</string>
+  <string name="status_available">זמין</string>
+  <string name="status_away">לא נמצא</string>
+  <string name="status_busy">לא פנוי</string>
+  <string name="contactsList">אנשי קשר</string>
+  <string name="contact_suggestions">הצעות מובילות</string>
+  <string name="local_invisible_directory">אחר</string>
+  <string name="directory_search_label">ספריה</string>
+  <string name="directory_search_label_work">ספריית עבודה</string>
+  <string name="local_search_label">כל אנשי הקשר</string>
+  <string name="local_suggestions_search_label">הצעות</string>
+  <string msgid="9154761216179882405" name="user_profile_contacts_list_header">אני</string>
+  <string name="missing_name">(ללא שם)</string>
+  <string msgid="2795575601596468581" name="description_view_contact_detail">הצג איש קשר</string>
+  <string name="list_filter_phones">כל אנשי הקשר עם מספרי טלפון</string>
+  <string name="list_filter_phones_work">אנשי הקשר של פרופיל העבודה</string>
+  <string name="view_updates_from_group">הצג עדכונים</string>
+  <string name="account_phone">במכשיר בלבד, ללא סנכרון</string>
+  <string name="nameLabelsGroup">שם</string>
+  <string name="nicknameLabelsGroup">כינוי</string>
+  <string name="full_name">שם</string>
+  <string name="name_given">שם פרטי</string>
+  <string name="name_family">שם משפחה</string>
+  <string name="name_prefix">תחילית שם</string>
+  <string name="name_middle">שם אמצעי</string>
+  <string name="name_suffix">סיומת שם</string>
+  <string name="name_phonetic">שם פונטי</string>
+  <string name="name_phonetic_given">שם פרטי פונטי</string>
+  <string name="name_phonetic_middle">שם אמצעי פונטי</string>
+  <string name="name_phonetic_family">שם משפחה פונטי</string>
+  <string name="phoneLabelsGroup">טלפון</string>
+  <string name="emailLabelsGroup">שלח אימייל</string>
+  <string name="postalLabelsGroup">כתובת</string>
+  <string name="imLabelsGroup">הודעות מיידיות</string>
+  <string name="organizationLabelsGroup">ארגון</string>
+  <string name="relationLabelsGroup">קשר</string>
+  <string name="eventLabelsGroup">תאריך מיוחד</string>
+  <string name="sms">הודעת טקסט</string>
+  <string name="postal_address">כתובת</string>
+  <string name="ghostData_company">חברה</string>
+  <string name="ghostData_title">תפקיד</string>
+  <string name="label_notes">הערות</string>
+  <string name="label_sip_address">SIP</string>
+  <string name="websiteLabelsGroup">אתר</string>
+  <string name="groupsLabel">קבוצות</string>
+  <string name="email_home">שלח אימייל לבית</string>
+  <string name="email_mobile">שלח אימייל לנייד</string>
+  <string name="email_work">שלח אימייל לעבודה</string>
+  <string name="email_other">שלח אימייל</string>
+  <string name="email_custom">שלח אימייל אל %s</string>
+  <string name="email">שלח אימייל</string>
+  <string name="postal_street">רחוב</string>
+  <string name="postal_city">עיר</string>
+  <string name="postal_region">מדינה</string>
+  <string name="postal_postcode">מיקוד</string>
+  <string name="postal_country">מדינה</string>
+  <string name="map_home">הצג כתובת בית</string>
+  <string name="map_work">הצג כתובת עבודה</string>
+  <string name="map_other">הצג כתובת</string>
+  <string name="map_custom">הצג כתובת %s</string>
+  <string name="chat_aim">‏שוחח בצ\'אט באמצעות AIM</string>
+  <string name="chat_msn">‏שוחח בצ\'אט באמצעות Windows Live</string>
+  <string name="chat_yahoo">‏שוחח בצ\'אט באמצעות Yahoo</string>
+  <string name="chat_skype">‏שוחח בצ\'אט באמצעות Skype</string>
+  <string name="chat_qq">‏שוחח בצ\'אט באמצעות QQ</string>
+  <string name="chat_gtalk">‏שוחח בצ\'אט באמצעות Google Talk</string>
+  <string name="chat_icq">‏שוחח בצ\'אט באמצעות ICQ</string>
+  <string name="chat_jabber">‏שוחח בצ\'אט באמצעות Jabber</string>
+  <string name="chat">צ\'אט</string>
+  <string name="list_filter_all_accounts">כל אנשי הקשר</string>
+  <string name="listAllContactsInAccount">אנשי קשר ב-%s</string>
+  <string name="listCustomView">אנשי קשר בתצוגה מותאמת אישית</string>
+  <string name="listSingleContact">איש קשר יחיד</string>
+  <string name="display_options_sort_list_by">מיון לפי</string>
+  <string name="display_options_sort_by_given_name">שם פרטי</string>
+  <string name="display_options_sort_by_family_name">שם משפחה</string>
+  <string name="display_options_view_names_as">פורמט השם</string>
+  <string name="display_options_view_given_name_first">שם פרטי יופיע ראשון</string>
+  <string name="display_options_view_family_name_first">שם משפחה יופיע ראשון</string>
+  <string name="menu_clear_frequents">מחק אנשי קשר קבועים</string>
+  <string name="action_menu_back_from_search">הפסק לחפש</string>
+  <string name="description_clear_search">נקה חיפוש</string>
+  <string name="select_account_dialog_title">חשבון</string>
+  <string name="set_default_account">השתמש תמיד עבור שיחות</string>
+  <string name="select_phone_account_for_calls">‏בחירת כרטיס SIM לשיחה הזו</string>
+  <string name="select_phone_account_for_calls_remember">אני רוצה להשתמש באפשרות הזו גם בעתיד</string>
+  <string name="call_with_a_note">התקשר עם הערה</string>
+  <string name="call_subject_hint">הקלד הערה לשליחה עם השיחה...</string>
+  <string name="send_and_call_button">שלח והתקשר</string>
+  <string name="call_subject_limit">%1$s / %2$s</string>
+  <string name="old_call_subject_type_and_number">%1$s %2$s</string>
+  <string name="tab_title">הכרטיסייה %1$s.</string>
+  <plurals name="tab_title_with_unread_items">
+    <item quantity="one">הכרטיסייה %1$s. %2$d פריט שלא נקרא. </item>
+    <item quantity="two">הכרטיסייה %1$s. %2$d פריטים שלא נקראו. </item>
+    <item quantity="many">הכרטיסייה %1$s. %2$d פריטים שלא נקראו. </item>
+    <item quantity="other">הכרטיסייה %1$s. %2$d פריטים שלא נקראו. </item>
+  </plurals>
+  <string name="description_search_video_call">שיחת וידאו</string>
+  <string name="description_search_call_and_share">שיתוף והתקשרות</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-ja/strings.xml b/java/com/android/contacts/common/res/values-ja/strings.xml
index f4af8fa..1a2e8d0 100644
--- a/java/com/android/contacts/common/res/values-ja/strings.xml
+++ b/java/com/android/contacts/common/res/values-ja/strings.xml
@@ -1,162 +1,145 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="toast_text_copied" msgid="8979281391599667362">"テキストをコピーしました"</string>
-    <string name="call_custom" msgid="3041673234638990874">"<xliff:g id="CUSTOM">%s</xliff:g>に発信"</string>
-    <string name="call_home" msgid="125893483593803791">"自宅に発信"</string>
-    <string name="call_mobile" msgid="967589404494150813">"モバイル端末に発信"</string>
-    <string name="call_work" msgid="6040550697395300892">"勤務先に発信"</string>
-    <string name="call_fax_work" msgid="5260192771364592922">"勤務先FAXに発信"</string>
-    <string name="call_fax_home" msgid="5174311195081144124">"自宅FAXに発信"</string>
-    <string name="call_pager" msgid="6814149227741274161">"ポケベルに発信"</string>
-    <string name="call_other" msgid="5536385588712587235">"発信"</string>
-    <string name="call_callback" msgid="6314019862718112786">"コールバック先に発信"</string>
-    <string name="call_car" msgid="3197417098027764954">"クルマに発信"</string>
-    <string name="call_company_main" msgid="2557663310028446397">"会社代表番号に発信"</string>
-    <string name="call_isdn" msgid="4691270442763649522">"ISDNに発信"</string>
-    <string name="call_main" msgid="3293707608770407814">"電話番号1に発信"</string>
-    <string name="call_other_fax" msgid="4724521984879021465">"FAXに発信"</string>
-    <string name="call_radio" msgid="8942441419845057942">"無線に発信"</string>
-    <string name="call_telex" msgid="2031514461660668351">"テレックスに発信"</string>
-    <string name="call_tty_tdd" msgid="7807210224965727701">"TTY/TDDに発信"</string>
-    <string name="call_work_mobile" msgid="2716342732938578495">"モバイル端末（勤務先）に発信"</string>
-    <string name="call_work_pager" msgid="3791778749827366574">"ポケベル（勤務先）に発信"</string>
-    <string name="call_assistant" msgid="4177478845473789294">"<xliff:g id="ASSISTANT">%s</xliff:g>に発信"</string>
-    <string name="call_mms" msgid="4958811711741872901">"MMSに発信"</string>
-    <string name="sms_custom" msgid="8785368968605026317">"<xliff:g id="CUSTOM">%s</xliff:g>にSMS"</string>
-    <string name="sms_home" msgid="3527719551060295243">"自宅にSMS"</string>
-    <string name="sms_mobile" msgid="8883045857887736518">"モバイル端末にSMS"</string>
-    <string name="sms_work" msgid="4158595439553450966">"勤務先にSMS"</string>
-    <string name="sms_fax_work" msgid="5483726627718055248">"勤務先FAXにSMS"</string>
-    <string name="sms_fax_home" msgid="9219265155770746077">"自宅FAXにSMS"</string>
-    <string name="sms_pager" msgid="4901085068525193933">"ポケベルにSMS"</string>
-    <string name="sms_other" msgid="1742702947993285933">"電話にSMS"</string>
-    <string name="sms_callback" msgid="5833483630377538308">"コールバック先にSMS"</string>
-    <string name="sms_car" msgid="4314577266154395174">"クルマにSMS"</string>
-    <string name="sms_company_main" msgid="2308160928487360705">"会社代表番号にSMS"</string>
-    <string name="sms_isdn" msgid="6394300346179302542">"ISDNにSMS"</string>
-    <string name="sms_main" msgid="8908087742014140774">"電話番号1にSMS"</string>
-    <string name="sms_other_fax" msgid="8768455473295405427">"FAXにSMS"</string>
-    <string name="sms_radio" msgid="855555176531704682">"無線にSMS"</string>
-    <string name="sms_telex" msgid="6269029276223252719">"テレックスにSMS"</string>
-    <string name="sms_tty_tdd" msgid="6229057354509192444">"TTY/TDDにSMS"</string>
-    <string name="sms_work_mobile" msgid="2155975469329969840">"モバイル端末（勤務先）にSMS"</string>
-    <string name="sms_work_pager" msgid="8500140274906830742">"ポケベル（勤務先）にSMS"</string>
-    <string name="sms_assistant" msgid="8513548482745330818">"<xliff:g id="ASSISTANT">%s</xliff:g>にSMS"</string>
-    <string name="sms_mms" msgid="5187888900503248542">"MMSにSMS"</string>
-    <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"よく使う連絡先を消去しますか？"</string>
-    <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"連絡帳アプリや電話アプリのよく使う連絡先リストを消去し、メールアプリがアドレス設定を初めから保存していくようにします。"</string>
-    <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"よく使う連絡先を消去しています…"</string>
-    <string name="status_available" msgid="2648156525685472626">"オンライン"</string>
-    <string name="status_away" msgid="2298688367552893953">"不在"</string>
-    <string name="status_busy" msgid="5990832098713248503">"取り込み中"</string>
-    <string name="contactsList" msgid="8806067891419291513">"連絡先"</string>
-    <string name="contact_suggestions" msgid="3324166754807120006">"おすすめ"</string>
-    <string name="local_invisible_directory" msgid="4723238462733650090">"その他"</string>
-    <string name="directory_search_label" msgid="4621215895484025229">"ディレクトリ"</string>
-    <string name="directory_search_label_work" msgid="7679326282707414897">"仕事用の連絡先リスト"</string>
-    <string name="local_search_label" msgid="907622822323119235">"すべての連絡先"</string>
-    <string name="local_suggestions_search_label" msgid="1178575146224386118">"候補"</string>
-    <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"自分"</string>
-    <string name="missing_name" msgid="978606963362745020">"（名前なし）"</string>
-    <string name="description_view_contact_detail" msgid="2428742401208561136">"連絡先を表示"</string>
-    <string name="list_filter_phones" msgid="8763316061763437182">"電話番号のあるすべての連絡先"</string>
-    <string name="list_filter_phones_work" msgid="7083575404573422965">"仕事用プロファイルの連絡先"</string>
-    <string name="view_updates_from_group" msgid="9011641093168385729">"更新情報を表示"</string>
-    <string name="account_phone" msgid="7067809073194061035">"端末のみ、未同期"</string>
-    <string name="nameLabelsGroup" msgid="7730465833159557471">"名前"</string>
-    <string name="nicknameLabelsGroup" msgid="6310556912361840029">"ニックネーム"</string>
-    <string name="full_name" msgid="648186563998465740">"名前"</string>
-    <string name="name_given" msgid="5096576006314820536">"名"</string>
-    <string name="name_family" msgid="6646235805198547467">"姓"</string>
-    <string name="name_prefix" msgid="9215326539658838">"敬称（名前の前）"</string>
-    <string name="name_middle" msgid="703755205331582769">"ミドルネーム"</string>
-    <string name="name_suffix" msgid="5777083390282548702">"敬称（名前の後）"</string>
-    <string name="name_phonetic" msgid="1650870996361663089">"フリガナ"</string>
-    <string name="name_phonetic_given" msgid="618812334274603170">"フリガナ（名）"</string>
-    <string name="name_phonetic_middle" msgid="4826820763384625538">"フリガナ（ミドルネーム）"</string>
-    <string name="name_phonetic_family" msgid="379905191212930771">"フリガナ（姓）"</string>
-    <string name="phoneLabelsGroup" msgid="169661929021355548">"電話"</string>
-    <string name="emailLabelsGroup" msgid="2249752810477488833">"メール"</string>
-    <string name="postalLabelsGroup" msgid="6772000590189142253">"住所"</string>
-    <string name="imLabelsGroup" msgid="5718066254237364731">"IM"</string>
-    <string name="organizationLabelsGroup" msgid="1101996309241601435">"所属"</string>
-    <string name="relationLabelsGroup" msgid="53866051664600053">"関係"</string>
-    <string name="eventLabelsGroup" msgid="1236970042646618489">"特別な日"</string>
-    <string name="sms" msgid="7574344928185328095">"テキストメッセージ"</string>
-    <string name="postal_address" msgid="1804707930129674200">"住所"</string>
-    <string name="ghostData_company" msgid="2554310786296833424">"会社"</string>
-    <string name="ghostData_title" msgid="4994968731830184837">"役職"</string>
-    <string name="label_notes" msgid="2050255313694219786">"メモ"</string>
-    <string name="label_sip_address" msgid="8883266182575965926">"SIP"</string>
-    <string name="websiteLabelsGroup" msgid="1630734286462186790">"ウェブサイト"</string>
-    <string name="groupsLabel" msgid="2694002798416868728">"グループ"</string>
-    <string name="email_home" msgid="889830029388962171">"自宅にメール"</string>
-    <string name="email_mobile" msgid="4487686436743741150">"モバイル端末にメール"</string>
-    <string name="email_work" msgid="4223487303344613528">"勤務先にメール"</string>
-    <string name="email_other" msgid="4246411900126012062">"メール"</string>
-    <string name="email_custom" msgid="7246580894327511013">"<xliff:g id="CUSTOM">%s</xliff:g>にメール"</string>
-    <string name="email" msgid="2807318537887091606">"メール"</string>
-    <string name="postal_street" msgid="6918171741240802474">"番地"</string>
-    <string name="postal_city" msgid="8674569121430005628">"市区町村"</string>
-    <string name="postal_region" msgid="1730369286225469192">"都道府県"</string>
-    <string name="postal_postcode" msgid="4450700741261990439">"郵便番号"</string>
-    <string name="postal_country" msgid="232670707458768148">"国"</string>
-    <string name="map_home" msgid="4181131107392126938">"自宅の住所を表示"</string>
-    <string name="map_work" msgid="5723471185992684400">"勤務先の住所を表示"</string>
-    <string name="map_other" msgid="2253764780863500516">"住所を表示"</string>
-    <string name="map_custom" msgid="5581743097882436157">"<xliff:g id="CUSTOM">%s</xliff:g>の住所を表示"</string>
-    <string name="chat_aim" msgid="2954364435497941659">"AIMでチャット"</string>
-    <string name="chat_msn" msgid="3130135239071228678">"Windows Liveでチャット"</string>
-    <string name="chat_yahoo" msgid="3233552142326865347">"Yahooでチャット"</string>
-    <string name="chat_skype" msgid="6486703981390592425">"Skypeでチャット"</string>
-    <string name="chat_qq" msgid="786924280665740019">"QQでチャット"</string>
-    <string name="chat_gtalk" msgid="7914674177243078035">"Googleトークでチャット"</string>
-    <string name="chat_icq" msgid="3292934726414765801">"ICQでチャット"</string>
-    <string name="chat_jabber" msgid="6701542313597880204">"Jabberでチャット"</string>
-    <string name="chat" msgid="1020428260359370236">"チャット"</string>
-    <string name="list_filter_all_accounts" msgid="473782314881473992">"すべての連絡先"</string>
-    <string name="listAllContactsInAccount" msgid="3486378621592995630">"<xliff:g id="NAME">%s</xliff:g>の連絡先"</string>
-    <string name="listCustomView" msgid="5306282632413086731">"連絡先のカスタム表示"</string>
-    <string name="listSingleContact" msgid="8620818791932382627">"単独の連絡先"</string>
-    <string name="display_options_sort_list_by" msgid="3541875948367831228">"並べ替え"</string>
-    <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"名"</string>
-    <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"姓"</string>
-    <string name="display_options_view_names_as" msgid="4204204205736735618">"名前の形式"</string>
-    <string name="display_options_view_given_name_first" msgid="2308026973021171020">"名が先"</string>
-    <string name="display_options_view_family_name_first" msgid="987430497292428242">"姓が先"</string>
-    <string name="menu_clear_frequents" msgid="5358271535047496120">"よく使う連絡先のクリア"</string>
-    <string name="action_menu_back_from_search" msgid="3550669942742167644">"検索を停止"</string>
-    <string name="description_clear_search" msgid="2347258825265600782">"検索をクリア"</string>
-    <string name="select_account_dialog_title" msgid="2673504582803359239">"アカウント"</string>
-    <string name="set_default_account" msgid="7966099951006467572">"このSIMを常に通話に使用する"</string>
-    <string name="select_phone_account_for_calls" msgid="1784460686103423274">"発信用の端末アカウントを選択してください"</string>
-    <string name="call_with_a_note" msgid="6242261320491851133">"メモを添付して発信"</string>
-    <string name="call_subject_hint" msgid="7233138753650420800">"発信時に送信するメモを入力..."</string>
-    <string name="send_and_call_button" msgid="4735168294120154013">"送信 / 通話"</string>
-    <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g>/<xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="tab_title" msgid="3387876802026074288">"<xliff:g id="TITLE">%1$s</xliff:g> タブ。"</string>
-    <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
-      <item quantity="other"> <xliff:g id="TITLE_2">%1$s</xliff:g> タブ。<xliff:g id="COUNT_3">%2$d</xliff:g> 件の未読項目。</item>
-      <item quantity="one"> <xliff:g id="TITLE_0">%1$s</xliff:g> タブ。<xliff:g id="COUNT_1">%2$d</xliff:g> 件の未読項目。</item>
-    </plurals>
-    <string name="description_search_video_call" msgid="4337369876888024909">"ビデオ通話"</string>
-    <string name="description_search_call_and_share" msgid="4912772842755050467">"共有して発信"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_custom">%sに発信</string>
+  <string name="call_home">自宅に発信</string>
+  <string name="call_mobile">モバイル端末に発信</string>
+  <string name="call_work">勤務先に発信</string>
+  <string name="call_fax_work">勤務先FAXに発信</string>
+  <string name="call_fax_home">自宅FAXに発信</string>
+  <string name="call_pager">ポケベルに発信</string>
+  <string name="call_other">発信</string>
+  <string name="call_callback">コールバック先に発信</string>
+  <string name="call_car">クルマに発信</string>
+  <string name="call_company_main">会社代表番号に発信</string>
+  <string name="call_isdn">ISDNに発信</string>
+  <string name="call_main">電話番号1に発信</string>
+  <string name="call_other_fax">FAXに発信</string>
+  <string name="call_radio">無線に発信</string>
+  <string name="call_telex">テレックスに発信</string>
+  <string name="call_tty_tdd">TTY/TDDに発信</string>
+  <string name="call_work_mobile">モバイル端末（勤務先）に発信</string>
+  <string name="call_work_pager">ポケベル（勤務先）に発信</string>
+  <string name="call_assistant">%sに発信</string>
+  <string name="call_mms">MMSに発信</string>
+  <string name="sms_custom">%sにSMS</string>
+  <string name="sms_home">自宅にSMS</string>
+  <string name="sms_mobile">モバイル端末にSMS</string>
+  <string name="sms_work">勤務先にSMS</string>
+  <string name="sms_fax_work">勤務先FAXにSMS</string>
+  <string name="sms_fax_home">自宅FAXにSMS</string>
+  <string name="sms_pager">ポケベルにSMS</string>
+  <string name="sms_other">電話にSMS</string>
+  <string name="sms_callback">コールバック先にSMS</string>
+  <string name="sms_car">クルマにSMS</string>
+  <string name="sms_company_main">会社代表番号にSMS</string>
+  <string name="sms_isdn">ISDNにSMS</string>
+  <string name="sms_main">電話番号1にSMS</string>
+  <string name="sms_other_fax">FAXにSMS</string>
+  <string name="sms_radio">無線にSMS</string>
+  <string name="sms_telex">テレックスにSMS</string>
+  <string name="sms_tty_tdd">TTY/TDDにSMS</string>
+  <string name="sms_work_mobile">モバイル端末（勤務先）にSMS</string>
+  <string name="sms_work_pager">ポケベル（勤務先）にSMS</string>
+  <string name="sms_assistant">%sにSMS</string>
+  <string name="sms_mms">MMSにSMS</string>
+  <string name="clearFrequentsConfirmation_title">よく使う連絡先を消去しますか？</string>
+  <string name="clearFrequentsConfirmation">連絡帳アプリや電話アプリのよく使う連絡先リストを消去し、メールアプリがアドレス設定を初めから保存していくようにします。</string>
+  <string name="clearFrequentsProgress_title">よく使う連絡先を消去しています…</string>
+  <string name="status_available">オンライン</string>
+  <string name="status_away">不在</string>
+  <string name="status_busy">取り込み中</string>
+  <string name="contactsList">連絡先</string>
+  <string name="contact_suggestions">おすすめ</string>
+  <string name="local_invisible_directory">その他</string>
+  <string name="directory_search_label">ディレクトリ</string>
+  <string name="directory_search_label_work">仕事用の連絡先リスト</string>
+  <string name="local_search_label">すべての連絡先</string>
+  <string name="local_suggestions_search_label">候補</string>
+  <string msgid="9154761216179882405" name="user_profile_contacts_list_header">自分</string>
+  <string name="missing_name">（名前なし）</string>
+  <string msgid="2795575601596468581" name="description_view_contact_detail">連絡先を表示</string>
+  <string name="list_filter_phones">電話番号のあるすべての連絡先</string>
+  <string name="list_filter_phones_work">仕事用プロファイルの連絡先</string>
+  <string name="view_updates_from_group">更新情報を表示</string>
+  <string name="account_phone">端末のみ、未同期</string>
+  <string name="nameLabelsGroup">名前</string>
+  <string name="nicknameLabelsGroup">ニックネーム</string>
+  <string name="full_name">名前</string>
+  <string name="name_given">名</string>
+  <string name="name_family">姓</string>
+  <string name="name_prefix">敬称（名前の前）</string>
+  <string name="name_middle">ミドルネーム</string>
+  <string name="name_suffix">敬称（名前の後）</string>
+  <string name="name_phonetic">フリガナ</string>
+  <string name="name_phonetic_given">フリガナ（名）</string>
+  <string name="name_phonetic_middle">フリガナ（ミドルネーム）</string>
+  <string name="name_phonetic_family">フリガナ（姓）</string>
+  <string name="phoneLabelsGroup">電話</string>
+  <string name="emailLabelsGroup">メール</string>
+  <string name="postalLabelsGroup">住所</string>
+  <string name="imLabelsGroup">IM</string>
+  <string name="organizationLabelsGroup">所属</string>
+  <string name="relationLabelsGroup">関係</string>
+  <string name="eventLabelsGroup">特別な日</string>
+  <string name="sms">テキストメッセージ</string>
+  <string name="postal_address">住所</string>
+  <string name="ghostData_company">会社</string>
+  <string name="ghostData_title">役職</string>
+  <string name="label_notes">メモ</string>
+  <string name="label_sip_address">SIP</string>
+  <string name="websiteLabelsGroup">ウェブサイト</string>
+  <string name="groupsLabel">グループ</string>
+  <string name="email_home">自宅にメール</string>
+  <string name="email_mobile">モバイル端末にメール</string>
+  <string name="email_work">勤務先にメール</string>
+  <string name="email_other">メール</string>
+  <string name="email_custom">%sにメール</string>
+  <string name="email">メール</string>
+  <string name="postal_street">番地</string>
+  <string name="postal_city">市区町村</string>
+  <string name="postal_region">都道府県</string>
+  <string name="postal_postcode">郵便番号</string>
+  <string name="postal_country">国</string>
+  <string name="map_home">自宅の住所を表示</string>
+  <string name="map_work">勤務先の住所を表示</string>
+  <string name="map_other">住所を表示</string>
+  <string name="map_custom">%sの住所を表示</string>
+  <string name="chat_aim">AIMでチャット</string>
+  <string name="chat_msn">Windows Liveでチャット</string>
+  <string name="chat_yahoo">Yahooでチャット</string>
+  <string name="chat_skype">Skypeでチャット</string>
+  <string name="chat_qq">QQでチャット</string>
+  <string name="chat_gtalk">Googleトークでチャット</string>
+  <string name="chat_icq">ICQでチャット</string>
+  <string name="chat_jabber">Jabberでチャット</string>
+  <string name="chat">チャット</string>
+  <string name="list_filter_all_accounts">すべての連絡先</string>
+  <string name="listAllContactsInAccount">%sの連絡先</string>
+  <string name="listCustomView">連絡先のカスタム表示</string>
+  <string name="listSingleContact">単独の連絡先</string>
+  <string name="display_options_sort_list_by">並べ替え順序</string>
+  <string name="display_options_sort_by_given_name">名</string>
+  <string name="display_options_sort_by_family_name">姓</string>
+  <string name="display_options_view_names_as">名前の形式</string>
+  <string name="display_options_view_given_name_first">名が先</string>
+  <string name="display_options_view_family_name_first">姓が先</string>
+  <string name="menu_clear_frequents">よく使う連絡先のクリア</string>
+  <string name="action_menu_back_from_search">検索を停止</string>
+  <string name="description_clear_search">検索をクリア</string>
+  <string name="select_account_dialog_title">アカウント</string>
+  <string name="set_default_account">このSIMを常に通話に使用する</string>
+  <string name="select_phone_account_for_calls">この通話で使用する SIM の選択</string>
+  <string name="select_phone_account_for_calls_remember">この設定を記憶する</string>
+  <string name="call_with_a_note">メモを添付して発信</string>
+  <string name="call_subject_hint">発信時に送信するメモを入力...</string>
+  <string name="send_and_call_button">送信 / 通話</string>
+  <string name="call_subject_limit">%1$s/%2$s</string>
+  <string name="old_call_subject_type_and_number">%1$s %2$s</string>
+  <string name="tab_title">%1$s タブ。</string>
+  <plurals name="tab_title_with_unread_items">
+    <item quantity="one"> %1$s タブ。%2$d 件の未読項目。</item>
+    <item quantity="other"> %1$s タブ。%2$d 件の未読項目。</item>
+  </plurals>
+  <string name="description_search_video_call">ビデオ通話</string>
+  <string name="description_search_call_and_share">共有して発信</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-ka/strings.xml b/java/com/android/contacts/common/res/values-ka/strings.xml
index 8ae8da9..07d67e4 100644
--- a/java/com/android/contacts/common/res/values-ka/strings.xml
+++ b/java/com/android/contacts/common/res/values-ka/strings.xml
@@ -1,162 +1,145 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="toast_text_copied" msgid="8979281391599667362">"კოპირებული ტექსტი"</string>
-    <string name="call_custom" msgid="3041673234638990874">"დარეკვა <xliff:g id="CUSTOM">%s</xliff:g> ნომერზე"</string>
-    <string name="call_home" msgid="125893483593803791">"დარეკვა სახლში"</string>
-    <string name="call_mobile" msgid="967589404494150813">"დარეკვა მობილურზე"</string>
-    <string name="call_work" msgid="6040550697395300892">"დარეკვა სამსახურში"</string>
-    <string name="call_fax_work" msgid="5260192771364592922">"დარეკვა სამსახურის ფაქსზე"</string>
-    <string name="call_fax_home" msgid="5174311195081144124">"დარეკვა სახლის ფაქსზე"</string>
-    <string name="call_pager" msgid="6814149227741274161">"დარეკვა პეიჯერზე"</string>
-    <string name="call_other" msgid="5536385588712587235">"დარეკვა"</string>
-    <string name="call_callback" msgid="6314019862718112786">"დარეკვა უკუგამოძახების ნომერზე"</string>
-    <string name="call_car" msgid="3197417098027764954">"დარეკვა მანქანის ტელეფონზე"</string>
-    <string name="call_company_main" msgid="2557663310028446397">"დარეკვა კომპანიის მთავარ ნომერზე"</string>
-    <string name="call_isdn" msgid="4691270442763649522">"დარეკვა ISDN-ის ნომერზე"</string>
-    <string name="call_main" msgid="3293707608770407814">"დარეკვა მთავარ ნომერზე"</string>
-    <string name="call_other_fax" msgid="4724521984879021465">"დარეკვა ფაქსზე"</string>
-    <string name="call_radio" msgid="8942441419845057942">"დარეკვა გადამცემზე"</string>
-    <string name="call_telex" msgid="2031514461660668351">"დარეკვა ტელექსზე"</string>
-    <string name="call_tty_tdd" msgid="7807210224965727701">"დარეკვა TTY/TDD-ზე"</string>
-    <string name="call_work_mobile" msgid="2716342732938578495">"დარეკვა სამსახურის მობილურზე"</string>
-    <string name="call_work_pager" msgid="3791778749827366574">"დარეკვა სამსახურის პეიჯერზე"</string>
-    <string name="call_assistant" msgid="4177478845473789294">"დარეკვა <xliff:g id="ASSISTANT">%s</xliff:g>-თან"</string>
-    <string name="call_mms" msgid="4958811711741872901">"დარეკვა MMS-ის ნომერზე"</string>
-    <string name="sms_custom" msgid="8785368968605026317">"ტექსტური შეტყობინების გაგზავნა <xliff:g id="CUSTOM">%s</xliff:g>-ზე"</string>
-    <string name="sms_home" msgid="3527719551060295243">"ტექსტური შეტყობინების გაგზავნა სახლში"</string>
-    <string name="sms_mobile" msgid="8883045857887736518">"ტექსტური შეტყობინების გაგზავნა მობილურზე"</string>
-    <string name="sms_work" msgid="4158595439553450966">"ტექსტური შეტყობინების გაგზავნა სამსახურში"</string>
-    <string name="sms_fax_work" msgid="5483726627718055248">"ტექსტური შეტყობინების გაგზავნა სამუშაო ფაქსზე"</string>
-    <string name="sms_fax_home" msgid="9219265155770746077">"ტექსტური შეტყობინების გაგზავნა სახლის ფაქსზე"</string>
-    <string name="sms_pager" msgid="4901085068525193933">"ტექსტური შეტყობინების გაგზავნა პეიჯერზე"</string>
-    <string name="sms_other" msgid="1742702947993285933">"ტექსტური შეტყობინება"</string>
-    <string name="sms_callback" msgid="5833483630377538308">"ტექსტური შეტყობინების გაგზავნა უკუგამოძახების ნომერზე"</string>
-    <string name="sms_car" msgid="4314577266154395174">"ტექსტური შეტყობინების გაგზავნა მანქანის ნომერზე"</string>
-    <string name="sms_company_main" msgid="2308160928487360705">"ტექსტური შეტყობინების გაგზავნა კომპანიის მთავარ ნომერზე"</string>
-    <string name="sms_isdn" msgid="6394300346179302542">"ტექსტური შეტყობინების გაგზავნა ISDN ნომერზე"</string>
-    <string name="sms_main" msgid="8908087742014140774">"ტექსტური შეტყობინების გაგზავნა მთავარ ნომერზე"</string>
-    <string name="sms_other_fax" msgid="8768455473295405427">"ტექსტური შეტყობინების გაგზავნა ფაქსზე"</string>
-    <string name="sms_radio" msgid="855555176531704682">"ტექსტური შეტყობინების გაგზავნა გადამცემზე"</string>
-    <string name="sms_telex" msgid="6269029276223252719">"ტექსტური შეტყობინების გაგზავნა ტელექსზე"</string>
-    <string name="sms_tty_tdd" msgid="6229057354509192444">"ტექსტური შეტყობინების გაგზავნა TTY/TDD-ზე"</string>
-    <string name="sms_work_mobile" msgid="2155975469329969840">"ტექსტური შეტყობინების გაგზავნა სამსახურის მობილურზე"</string>
-    <string name="sms_work_pager" msgid="8500140274906830742">"ტექსტური შეტყობინების გაგზავნა სამსახურის პეიჯერზე"</string>
-    <string name="sms_assistant" msgid="8513548482745330818">"ტექსტური შეტყობინების გაგზავნა <xliff:g id="ASSISTANT">%s</xliff:g>-ისთვის"</string>
-    <string name="sms_mms" msgid="5187888900503248542">"ტექსტური შეტყობინების გაგზავნა MMS ნომერზე"</string>
-    <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"გსურთ ხშირი კონტაქტების წაშლა?"</string>
-    <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"თქვენ წაშლით ხშირად დაკავშირებულთა სიას კონტაქტებიდან და ტელეფონის აპლიკაციიდან და აიძულებთ ელ-ფოსტის აპლიკაციებს შეისწავლონ თქვენი ადრესატების პრიორიტეტები ნულიდან."</string>
-    <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"ხშირი კონტაქტები იშლება…"</string>
-    <string name="status_available" msgid="2648156525685472626">"ხელმისაწვდომი"</string>
-    <string name="status_away" msgid="2298688367552893953">"გასული"</string>
-    <string name="status_busy" msgid="5990832098713248503">"დაკავებული"</string>
-    <string name="contactsList" msgid="8806067891419291513">"კონტაქტები"</string>
-    <string name="contact_suggestions" msgid="3324166754807120006">"საუკეთესო შეთავაზებები"</string>
-    <string name="local_invisible_directory" msgid="4723238462733650090">"სხვა"</string>
-    <string name="directory_search_label" msgid="4621215895484025229">"კატალოგი"</string>
-    <string name="directory_search_label_work" msgid="7679326282707414897">"სამსახურის კატალოგი"</string>
-    <string name="local_search_label" msgid="907622822323119235">"ყველა კონტაქტი"</string>
-    <string name="local_suggestions_search_label" msgid="1178575146224386118">"შეთავაზებები"</string>
-    <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"მე"</string>
-    <string name="missing_name" msgid="978606963362745020">"(სახელის გარეშე)"</string>
-    <string name="description_view_contact_detail" msgid="2428742401208561136">"კონტაქტის ნახვა"</string>
-    <string name="list_filter_phones" msgid="8763316061763437182">"ყველა ტელეფონის ნომრიანი კონტაქტი"</string>
-    <string name="list_filter_phones_work" msgid="7083575404573422965">"სამსახურის პროფილის კონტაქტები"</string>
-    <string name="view_updates_from_group" msgid="9011641093168385729">"განახლებების ნახვა"</string>
-    <string name="account_phone" msgid="7067809073194061035">"მხოლოდ მოწყობილობაზე, სინქრონიზაციის გარეშე"</string>
-    <string name="nameLabelsGroup" msgid="7730465833159557471">"სახელი"</string>
-    <string name="nicknameLabelsGroup" msgid="6310556912361840029">"მეტსახელი"</string>
-    <string name="full_name" msgid="648186563998465740">"სახელი"</string>
-    <string name="name_given" msgid="5096576006314820536">"სახელი"</string>
-    <string name="name_family" msgid="6646235805198547467">"გვარი"</string>
-    <string name="name_prefix" msgid="9215326539658838">"სახელის პრეფიქსი"</string>
-    <string name="name_middle" msgid="703755205331582769">"მეორე სახელი"</string>
-    <string name="name_suffix" msgid="5777083390282548702">"სახელის სუფიქსი"</string>
-    <string name="name_phonetic" msgid="1650870996361663089">"სახელის ტრანსკრიფცია"</string>
-    <string name="name_phonetic_given" msgid="618812334274603170">"ფონეტიკური სახელი"</string>
-    <string name="name_phonetic_middle" msgid="4826820763384625538">"მეორე სახელის ტრანსკრიფცია"</string>
-    <string name="name_phonetic_family" msgid="379905191212930771">"ფონეტიკური გვარი"</string>
-    <string name="phoneLabelsGroup" msgid="169661929021355548">"ტელეფონი"</string>
-    <string name="emailLabelsGroup" msgid="2249752810477488833">"ელფოსტის გაგზავნა"</string>
-    <string name="postalLabelsGroup" msgid="6772000590189142253">"მისამართი"</string>
-    <string name="imLabelsGroup" msgid="5718066254237364731">"IM"</string>
-    <string name="organizationLabelsGroup" msgid="1101996309241601435">"ორგანიზაცია"</string>
-    <string name="relationLabelsGroup" msgid="53866051664600053">"ურთიერთობა"</string>
-    <string name="eventLabelsGroup" msgid="1236970042646618489">"სპეციალური თარიღი"</string>
-    <string name="sms" msgid="7574344928185328095">"ტექსტური შეტყობინება"</string>
-    <string name="postal_address" msgid="1804707930129674200">"მისამართი"</string>
-    <string name="ghostData_company" msgid="2554310786296833424">"კომპანია"</string>
-    <string name="ghostData_title" msgid="4994968731830184837">"პოზიცია"</string>
-    <string name="label_notes" msgid="2050255313694219786">"ჩანიშვნები"</string>
-    <string name="label_sip_address" msgid="8883266182575965926">"SIP"</string>
-    <string name="websiteLabelsGroup" msgid="1630734286462186790">"ვებ-საიტი"</string>
-    <string name="groupsLabel" msgid="2694002798416868728">"ჯგუფები"</string>
-    <string name="email_home" msgid="889830029388962171">"ელფოსტის გაგზავნა სახლში"</string>
-    <string name="email_mobile" msgid="4487686436743741150">"ელფოსტის გაგზავნა მობილურზე"</string>
-    <string name="email_work" msgid="4223487303344613528">"ელფოსტის გაგზავნა სამსახურში"</string>
-    <string name="email_other" msgid="4246411900126012062">"ელფოსტის გაგზავნა"</string>
-    <string name="email_custom" msgid="7246580894327511013">"ელფოსტის გაგზავნა <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="email" msgid="2807318537887091606">"ელფოსტის გაგზავნა"</string>
-    <string name="postal_street" msgid="6918171741240802474">"ქუჩა"</string>
-    <string name="postal_city" msgid="8674569121430005628">"ქალაქი"</string>
-    <string name="postal_region" msgid="1730369286225469192">"შტატი"</string>
-    <string name="postal_postcode" msgid="4450700741261990439">"ZIP-კოდი"</string>
-    <string name="postal_country" msgid="232670707458768148">"ქვეყანა"</string>
-    <string name="map_home" msgid="4181131107392126938">"სახლის მისამართის ნახვა"</string>
-    <string name="map_work" msgid="5723471185992684400">"სამსახურის მისამართის ნახვა"</string>
-    <string name="map_other" msgid="2253764780863500516">"მისამართის ნახვა"</string>
-    <string name="map_custom" msgid="5581743097882436157">"<xliff:g id="CUSTOM">%s</xliff:g> მისამართის ნახვა"</string>
-    <string name="chat_aim" msgid="2954364435497941659">"ჩეთი AIM-ით"</string>
-    <string name="chat_msn" msgid="3130135239071228678">"ჩეთი Windows Live-ით"</string>
-    <string name="chat_yahoo" msgid="3233552142326865347">"ჩეთი Yahoo-ს საშუალებით"</string>
-    <string name="chat_skype" msgid="6486703981390592425">"ჩეთი Skype-ით"</string>
-    <string name="chat_qq" msgid="786924280665740019">"ჩეთი QQ-ით"</string>
-    <string name="chat_gtalk" msgid="7914674177243078035">"ჩეთი Google Talk-ით"</string>
-    <string name="chat_icq" msgid="3292934726414765801">"ჩეთი ICQ-ით"</string>
-    <string name="chat_jabber" msgid="6701542313597880204">"ჩეთი Jabber-ით"</string>
-    <string name="chat" msgid="1020428260359370236">"ჩეთი"</string>
-    <string name="list_filter_all_accounts" msgid="473782314881473992">"ყველა კონტაქტი"</string>
-    <string name="listAllContactsInAccount" msgid="3486378621592995630">"კონტაქტები <xliff:g id="NAME">%s</xliff:g>-ში"</string>
-    <string name="listCustomView" msgid="5306282632413086731">"კონტაქტები მორგებულ ხედში"</string>
-    <string name="listSingleContact" msgid="8620818791932382627">"ერთი კონტაქტი"</string>
-    <string name="display_options_sort_list_by" msgid="3541875948367831228">"სორტირება:"</string>
-    <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"სახელით"</string>
-    <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"გვარით"</string>
-    <string name="display_options_view_names_as" msgid="4204204205736735618">"სახელის ფორმატი"</string>
-    <string name="display_options_view_given_name_first" msgid="2308026973021171020">"ჯერ სახელი"</string>
-    <string name="display_options_view_family_name_first" msgid="987430497292428242">"ჯერ გვარი"</string>
-    <string name="menu_clear_frequents" msgid="5358271535047496120">"ხშირი კონტაქტების წაშლა"</string>
-    <string name="action_menu_back_from_search" msgid="3550669942742167644">"ძიების შეჩერება"</string>
-    <string name="description_clear_search" msgid="2347258825265600782">"ძიების გასუფთავება"</string>
-    <string name="select_account_dialog_title" msgid="2673504582803359239">"ანგარიში"</string>
-    <string name="set_default_account" msgid="7966099951006467572">"ზარებისთვის მუდამ ამის გამოყენება"</string>
-    <string name="select_phone_account_for_calls" msgid="1784460686103423274">"დარეკვა ანგარიშით:"</string>
-    <string name="call_with_a_note" msgid="6242261320491851133">"ზარი შენიშვნასთან ერთად"</string>
-    <string name="call_subject_hint" msgid="7233138753650420800">"აკრიფეთ შენიშვნა ზართან ერთად გასაგზავნად ..."</string>
-    <string name="send_and_call_button" msgid="4735168294120154013">"გაგზავნა და დარეკვა"</string>
-    <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="tab_title" msgid="3387876802026074288">"<xliff:g id="TITLE">%1$s</xliff:g> ცხრ."</string>
-    <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
-      <item quantity="other"> <xliff:g id="TITLE_2">%1$s</xliff:g> ცხრ. <xliff:g id="COUNT_3">%2$d</xliff:g> წაუკითხავი ერთეული. </item>
-      <item quantity="one"> <xliff:g id="TITLE_0">%1$s</xliff:g> ცხრ. <xliff:g id="COUNT_1">%2$d</xliff:g> წაუკითხავი ერთეული. </item>
-    </plurals>
-    <string name="description_search_video_call" msgid="4337369876888024909">"ვიდეოზარი"</string>
-    <string name="description_search_call_and_share" msgid="4912772842755050467">"გაზიარება და დარეკვა"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_custom">დარეკვა %s ნომერზე</string>
+  <string name="call_home">დარეკვა სახლში</string>
+  <string name="call_mobile">დარეკვა მობილურზე</string>
+  <string name="call_work">დარეკვა სამსახურში</string>
+  <string name="call_fax_work">დარეკვა სამსახურის ფაქსზე</string>
+  <string name="call_fax_home">დარეკვა სახლის ფაქსზე</string>
+  <string name="call_pager">დარეკვა პეიჯერზე</string>
+  <string name="call_other">დარეკვა</string>
+  <string name="call_callback">დარეკვა უკუგამოძახების ნომერზე</string>
+  <string name="call_car">დარეკვა მანქანის ტელეფონზე</string>
+  <string name="call_company_main">დარეკვა კომპანიის მთავარ ნომერზე</string>
+  <string name="call_isdn">დარეკვა ISDN-ის ნომერზე</string>
+  <string name="call_main">დარეკვა მთავარ ნომერზე</string>
+  <string name="call_other_fax">დარეკვა ფაქსზე</string>
+  <string name="call_radio">დარეკვა გადამცემზე</string>
+  <string name="call_telex">დარეკვა ტელექსზე</string>
+  <string name="call_tty_tdd">დარეკვა TTY/TDD-ზე</string>
+  <string name="call_work_mobile">დარეკვა სამსახურის მობილურზე</string>
+  <string name="call_work_pager">დარეკვა სამსახურის პეიჯერზე</string>
+  <string name="call_assistant">დარეკვა %s-თან</string>
+  <string name="call_mms">დარეკვა MMS-ის ნომერზე</string>
+  <string name="sms_custom">ტექსტური შეტყობინების გაგზავნა %s-ზე</string>
+  <string name="sms_home">ტექსტური შეტყობინების გაგზავნა სახლში</string>
+  <string name="sms_mobile">ტექსტური შეტყობინების გაგზავნა მობილურზე</string>
+  <string name="sms_work">ტექსტური შეტყობინების გაგზავნა სამსახურში</string>
+  <string name="sms_fax_work">ტექსტური შეტყობინების გაგზავნა სამუშაო ფაქსზე</string>
+  <string name="sms_fax_home">ტექსტური შეტყობინების გაგზავნა სახლის ფაქსზე</string>
+  <string name="sms_pager">ტექსტური შეტყობინების გაგზავნა პეიჯერზე</string>
+  <string name="sms_other">ტექსტური შეტყობინება</string>
+  <string name="sms_callback">ტექსტური შეტყობინების გაგზავნა უკუგამოძახების ნომერზე</string>
+  <string name="sms_car">ტექსტური შეტყობინების გაგზავნა მანქანის ნომერზე</string>
+  <string name="sms_company_main">ტექსტური შეტყობინების გაგზავნა კომპანიის მთავარ ნომერზე</string>
+  <string name="sms_isdn">ტექსტური შეტყობინების გაგზავნა ISDN ნომერზე</string>
+  <string name="sms_main">ტექსტური შეტყობინების გაგზავნა მთავარ ნომერზე</string>
+  <string name="sms_other_fax">ტექსტური შეტყობინების გაგზავნა ფაქსზე</string>
+  <string name="sms_radio">ტექსტური შეტყობინების გაგზავნა გადამცემზე</string>
+  <string name="sms_telex">ტექსტური შეტყობინების გაგზავნა ტელექსზე</string>
+  <string name="sms_tty_tdd">ტექსტური შეტყობინების გაგზავნა TTY/TDD-ზე</string>
+  <string name="sms_work_mobile">ტექსტური შეტყობინების გაგზავნა სამსახურის მობილურზე</string>
+  <string name="sms_work_pager">ტექსტური შეტყობინების გაგზავნა სამსახურის პეიჯერზე</string>
+  <string name="sms_assistant">ტექსტური შეტყობინების გაგზავნა %s-ისთვის</string>
+  <string name="sms_mms">ტექსტური შეტყობინების გაგზავნა MMS ნომერზე</string>
+  <string name="clearFrequentsConfirmation_title">გსურთ ხშირი კონტაქტების წაშლა?</string>
+  <string name="clearFrequentsConfirmation">თქვენ წაშლით ხშირად დაკავშირებულთა სიას კონტაქტებიდან და ტელეფონის აპლიკაციიდან და აიძულებთ ელ-ფოსტის აპლიკაციებს შეისწავლონ თქვენი ადრესატების პრიორიტეტები ნულიდან.</string>
+  <string name="clearFrequentsProgress_title">ხშირი კონტაქტები იშლება…</string>
+  <string name="status_available">ხელმისაწვდომი</string>
+  <string name="status_away">გასული</string>
+  <string name="status_busy">დაკავებული</string>
+  <string name="contactsList">კონტაქტები</string>
+  <string name="contact_suggestions">საუკეთესო შეთავაზებები</string>
+  <string name="local_invisible_directory">სხვა</string>
+  <string name="directory_search_label">კატალოგი</string>
+  <string name="directory_search_label_work">სამსახურის კატალოგი</string>
+  <string name="local_search_label">ყველა კონტაქტი</string>
+  <string name="local_suggestions_search_label">შეთავაზებები</string>
+  <string msgid="9154761216179882405" name="user_profile_contacts_list_header">მე</string>
+  <string name="missing_name">(სახელის გარეშე)</string>
+  <string msgid="2795575601596468581" name="description_view_contact_detail">კონტაქტის ნახვა</string>
+  <string name="list_filter_phones">ყველა ტელეფონის ნომრიანი კონტაქტი</string>
+  <string name="list_filter_phones_work">სამსახურის პროფილის კონტაქტები</string>
+  <string name="view_updates_from_group">განახლებების ნახვა</string>
+  <string name="account_phone">მხოლოდ მოწყობილობაზე, სინქრონიზაციის გარეშე</string>
+  <string name="nameLabelsGroup">სახელი</string>
+  <string name="nicknameLabelsGroup">მეტსახელი</string>
+  <string name="full_name">სახელი</string>
+  <string name="name_given">სახელი</string>
+  <string name="name_family">გვარი</string>
+  <string name="name_prefix">სახელის პრეფიქსი</string>
+  <string name="name_middle">მეორე სახელი</string>
+  <string name="name_suffix">სახელის სუფიქსი</string>
+  <string name="name_phonetic">სახელის ტრანსკრიფცია</string>
+  <string name="name_phonetic_given">ფონეტიკური სახელი</string>
+  <string name="name_phonetic_middle">მეორე სახელის ტრანსკრიფცია</string>
+  <string name="name_phonetic_family">ფონეტიკური გვარი</string>
+  <string name="phoneLabelsGroup">ტელეფონი</string>
+  <string name="emailLabelsGroup">ელფოსტის გაგზავნა</string>
+  <string name="postalLabelsGroup">მისამართი</string>
+  <string name="imLabelsGroup">IM</string>
+  <string name="organizationLabelsGroup">ორგანიზაცია</string>
+  <string name="relationLabelsGroup">ურთიერთობა</string>
+  <string name="eventLabelsGroup">სპეციალური თარიღი</string>
+  <string name="sms">ტექსტური შეტყობინება</string>
+  <string name="postal_address">მისამართი</string>
+  <string name="ghostData_company">კომპანია</string>
+  <string name="ghostData_title">პოზიცია</string>
+  <string name="label_notes">ჩანიშვნები</string>
+  <string name="label_sip_address">SIP</string>
+  <string name="websiteLabelsGroup">ვებ-საიტი</string>
+  <string name="groupsLabel">ჯგუფები</string>
+  <string name="email_home">ელფოსტის გაგზავნა სახლში</string>
+  <string name="email_mobile">ელფოსტის გაგზავნა მობილურზე</string>
+  <string name="email_work">ელფოსტის გაგზავნა სამსახურში</string>
+  <string name="email_other">ელფოსტის გაგზავნა</string>
+  <string name="email_custom">ელფოსტის გაგზავნა %s</string>
+  <string name="email">ელფოსტის გაგზავნა</string>
+  <string name="postal_street">ქუჩა</string>
+  <string name="postal_city">ქალაქი</string>
+  <string name="postal_region">შტატი</string>
+  <string name="postal_postcode">ZIP-კოდი</string>
+  <string name="postal_country">ქვეყანა</string>
+  <string name="map_home">სახლის მისამართის ნახვა</string>
+  <string name="map_work">სამსახურის მისამართის ნახვა</string>
+  <string name="map_other">მისამართის ნახვა</string>
+  <string name="map_custom">%s მისამართის ნახვა</string>
+  <string name="chat_aim">ჩეთი AIM-ით</string>
+  <string name="chat_msn">ჩეთი Windows Live-ით</string>
+  <string name="chat_yahoo">ჩეთი Yahoo-ს საშუალებით</string>
+  <string name="chat_skype">ჩეთი Skype-ით</string>
+  <string name="chat_qq">ჩეთი QQ-ით</string>
+  <string name="chat_gtalk">ჩეთი Google Talk-ით</string>
+  <string name="chat_icq">ჩეთი ICQ-ით</string>
+  <string name="chat_jabber">ჩეთი Jabber-ით</string>
+  <string name="chat">ჩეთი</string>
+  <string name="list_filter_all_accounts">ყველა კონტაქტი</string>
+  <string name="listAllContactsInAccount">კონტაქტები %s-ში</string>
+  <string name="listCustomView">კონტაქტები მორგებულ ხედში</string>
+  <string name="listSingleContact">ერთი კონტაქტი</string>
+  <string name="display_options_sort_list_by">სორტირება:</string>
+  <string name="display_options_sort_by_given_name">სახელით</string>
+  <string name="display_options_sort_by_family_name">გვარით</string>
+  <string name="display_options_view_names_as">სახელის ფორმატი</string>
+  <string name="display_options_view_given_name_first">ჯერ სახელი</string>
+  <string name="display_options_view_family_name_first">ჯერ გვარი</string>
+  <string name="menu_clear_frequents">ხშირი კონტაქტების წაშლა</string>
+  <string name="action_menu_back_from_search">ძიების შეჩერება</string>
+  <string name="description_clear_search">ძიების გასუფთავება</string>
+  <string name="select_account_dialog_title">ანგარიში</string>
+  <string name="set_default_account">ზარებისთვის მუდამ ამის გამოყენება</string>
+  <string name="select_phone_account_for_calls">აირჩიეთ SIM ამ ზარისთვის</string>
+  <string name="select_phone_account_for_calls_remember">ამ არჩევანის დამახსოვრება</string>
+  <string name="call_with_a_note">ზარი შენიშვნასთან ერთად</string>
+  <string name="call_subject_hint">აკრიფეთ შენიშვნა ზართან ერთად გასაგზავნად ...</string>
+  <string name="send_and_call_button">გაგზავნა და დარეკვა</string>
+  <string name="call_subject_limit">%1$s / %2$s</string>
+  <string name="old_call_subject_type_and_number">%1$s %2$s</string>
+  <string name="tab_title">%1$s ცხრ.</string>
+  <plurals name="tab_title_with_unread_items">
+    <item quantity="one"> %1$s ცხრ. %2$d წაუკითხავი ერთეული. </item>
+    <item quantity="other"> %1$s ცხრ. %2$d წაუკითხავი ერთეული. </item>
+  </plurals>
+  <string name="description_search_video_call">ვიდეოზარი</string>
+  <string name="description_search_call_and_share">გაზიარება და დარეკვა</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-kk/strings.xml b/java/com/android/contacts/common/res/values-kk/strings.xml
index 401a90f..4ac3150 100644
--- a/java/com/android/contacts/common/res/values-kk/strings.xml
+++ b/java/com/android/contacts/common/res/values-kk/strings.xml
@@ -1,162 +1,145 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="toast_text_copied" msgid="8979281391599667362">"Мәтін көшірмесі жасалды"</string>
-    <string name="call_custom" msgid="3041673234638990874">"<xliff:g id="CUSTOM">%s</xliff:g> нөміріне қоңырау шалу"</string>
-    <string name="call_home" msgid="125893483593803791">"Үйге қоңырау шалу"</string>
-    <string name="call_mobile" msgid="967589404494150813">"Ұялы телефонға қоңырау шалу"</string>
-    <string name="call_work" msgid="6040550697395300892">"Жұмысқа қоңырау шалу"</string>
-    <string name="call_fax_work" msgid="5260192771364592922">"Жұмыс факсіне қоңырау шалу"</string>
-    <string name="call_fax_home" msgid="5174311195081144124">"Үй факсіне қоңырау шалу"</string>
-    <string name="call_pager" msgid="6814149227741274161">"Пэйджерге қоңырау шалу"</string>
-    <string name="call_other" msgid="5536385588712587235">"Қоңырау шалу"</string>
-    <string name="call_callback" msgid="6314019862718112786">"Кері қоңырау шалу нөміріне қоңырау шалу"</string>
-    <string name="call_car" msgid="3197417098027764954">"Автокөлікке қоңырау шалу"</string>
-    <string name="call_company_main" msgid="2557663310028446397">"Компанияның негізгі нөміріне қоңырау шалу"</string>
-    <string name="call_isdn" msgid="4691270442763649522">"ISDN нөміріне қоңырау шалу"</string>
-    <string name="call_main" msgid="3293707608770407814">"Негізгі нөмірге қоңырау шалу"</string>
-    <string name="call_other_fax" msgid="4724521984879021465">"Факске қоңырау шалу"</string>
-    <string name="call_radio" msgid="8942441419845057942">"Радиоға қоңырау шалу"</string>
-    <string name="call_telex" msgid="2031514461660668351">"Телекске қоңырау шалу"</string>
-    <string name="call_tty_tdd" msgid="7807210224965727701">"Есту қабілеті төмен адамдарға арналған телетайпқа қоңырау шалу"</string>
-    <string name="call_work_mobile" msgid="2716342732938578495">"Жұмыс ұялы телефонына қоңырау шалу"</string>
-    <string name="call_work_pager" msgid="3791778749827366574">"Жұмыс пэйджеріне қоңырау шалу"</string>
-    <string name="call_assistant" msgid="4177478845473789294">"<xliff:g id="ASSISTANT">%s</xliff:g> нөміріне қоңырау соғу"</string>
-    <string name="call_mms" msgid="4958811711741872901">"MMS нөміріне қоңырау шалу"</string>
-    <string name="sms_custom" msgid="8785368968605026317">"<xliff:g id="CUSTOM">%s</xliff:g> мәтін-хабар жіберу"</string>
-    <string name="sms_home" msgid="3527719551060295243">"Үй телефонына мәтін-хабар жіберу"</string>
-    <string name="sms_mobile" msgid="8883045857887736518">"Ұялы телефонған мәтін-хабар жіберу"</string>
-    <string name="sms_work" msgid="4158595439553450966">"Жұмыс нөміріне мәтін-хабар жіберу"</string>
-    <string name="sms_fax_work" msgid="5483726627718055248">"Жұмыс факсіне мәтін-хабар жіберу"</string>
-    <string name="sms_fax_home" msgid="9219265155770746077">"Үй факсіне мәтін-хабар жіберу"</string>
-    <string name="sms_pager" msgid="4901085068525193933">"Пейджерге мәтін-хабар жіберу"</string>
-    <string name="sms_other" msgid="1742702947993285933">"Мәтін-хабар"</string>
-    <string name="sms_callback" msgid="5833483630377538308">"Кері қоңырау шалу нөміріне мәтін-хабар жіберу"</string>
-    <string name="sms_car" msgid="4314577266154395174">"Автокөлікке мәтін-хабар жіберу"</string>
-    <string name="sms_company_main" msgid="2308160928487360705">"Негізгі компанияға мәтін-хабар жіберу"</string>
-    <string name="sms_isdn" msgid="6394300346179302542">"ISDN нөміріне мәтін-хабар жіберу"</string>
-    <string name="sms_main" msgid="8908087742014140774">"Негізгі нөмірге мәтін-хабар жіберу"</string>
-    <string name="sms_other_fax" msgid="8768455473295405427">"Факске мәтін-хабар жіберу"</string>
-    <string name="sms_radio" msgid="855555176531704682">"Радиоға мәтін-хабр жіберу"</string>
-    <string name="sms_telex" msgid="6269029276223252719">"Tелетайпқа мәтін-хабар жіберу"</string>
-    <string name="sms_tty_tdd" msgid="6229057354509192444">"Есту қабілеті төмен адамдарға арналған телетайпқа мәтін-хабар жіберу"</string>
-    <string name="sms_work_mobile" msgid="2155975469329969840">"Жұмыс ұялы телефонына мәтін-хабар жіберу"</string>
-    <string name="sms_work_pager" msgid="8500140274906830742">"Жұмыс пейджеріне мәтін-хабар жіберу"</string>
-    <string name="sms_assistant" msgid="8513548482745330818">"<xliff:g id="ASSISTANT">%s</xliff:g> нөміріне мәтін-хабар жіберу"</string>
-    <string name="sms_mms" msgid="5187888900503248542">"MMS нөміріне мәтін-хабар жіберу"</string>
-    <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"Жиі қолданылғандар тазартылсын ба?"</string>
-    <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"Контактілер және Телефондар қолданбаларындағы жиі хабарласатындар тізімі тазаланады және электрондық пошта қолданбалары мекенжай параметрлерін басынан үйренуге мәжбүрленеді."</string>
-    <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"Жиі қолданылғандар тазартылуда…"</string>
-    <string name="status_available" msgid="2648156525685472626">"Қол жетімді"</string>
-    <string name="status_away" msgid="2298688367552893953">"Желіден тыс"</string>
-    <string name="status_busy" msgid="5990832098713248503">"Бос емес"</string>
-    <string name="contactsList" msgid="8806067891419291513">"Контактілер"</string>
-    <string name="contact_suggestions" msgid="3324166754807120006">"Үздік ұсыныстар"</string>
-    <string name="local_invisible_directory" msgid="4723238462733650090">"Басқа"</string>
-    <string name="directory_search_label" msgid="4621215895484025229">"Анықтама"</string>
-    <string name="directory_search_label_work" msgid="7679326282707414897">"Жұмыс каталогы"</string>
-    <string name="local_search_label" msgid="907622822323119235">"Барлық контактілер"</string>
-    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Ұсыныстар"</string>
-    <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Мен"</string>
-    <string name="missing_name" msgid="978606963362745020">"(Атаусыз)"</string>
-    <string name="description_view_contact_detail" msgid="2428742401208561136">"Контактіні көру"</string>
-    <string name="list_filter_phones" msgid="8763316061763437182">"Телефон нөмірі бар барлық контактілер"</string>
-    <string name="list_filter_phones_work" msgid="7083575404573422965">"Жұмыс профилінің контактілері"</string>
-    <string name="view_updates_from_group" msgid="9011641093168385729">"Жаңартуларды көру"</string>
-    <string name="account_phone" msgid="7067809073194061035">"Тек қана құрылғыда, синхрондалмаған"</string>
-    <string name="nameLabelsGroup" msgid="7730465833159557471">"Аты-жөні"</string>
-    <string name="nicknameLabelsGroup" msgid="6310556912361840029">"Қысқа аты"</string>
-    <string name="full_name" msgid="648186563998465740">"Атауы"</string>
-    <string name="name_given" msgid="5096576006314820536">"Аты"</string>
-    <string name="name_family" msgid="6646235805198547467">"Тегі"</string>
-    <string name="name_prefix" msgid="9215326539658838">"Аттың префиксі"</string>
-    <string name="name_middle" msgid="703755205331582769">"Әкесінің аты"</string>
-    <string name="name_suffix" msgid="5777083390282548702">"Аттың суффиксі"</string>
-    <string name="name_phonetic" msgid="1650870996361663089">"Фонетикалық есімі"</string>
-    <string name="name_phonetic_given" msgid="618812334274603170">"Фонетикалық аты"</string>
-    <string name="name_phonetic_middle" msgid="4826820763384625538">"Әкесінің фонетикалық аты"</string>
-    <string name="name_phonetic_family" msgid="379905191212930771">"Тегінің транскрипциясы"</string>
-    <string name="phoneLabelsGroup" msgid="169661929021355548">"Телефон"</string>
-    <string name="emailLabelsGroup" msgid="2249752810477488833">"Хат жіберу"</string>
-    <string name="postalLabelsGroup" msgid="6772000590189142253">"Мекенжай"</string>
-    <string name="imLabelsGroup" msgid="5718066254237364731">"IM"</string>
-    <string name="organizationLabelsGroup" msgid="1101996309241601435">"Ұйым"</string>
-    <string name="relationLabelsGroup" msgid="53866051664600053">"Қарым-қатынас"</string>
-    <string name="eventLabelsGroup" msgid="1236970042646618489">"Ерекше күн"</string>
-    <string name="sms" msgid="7574344928185328095">"Мәтіндік-хабар"</string>
-    <string name="postal_address" msgid="1804707930129674200">"Мекенжай"</string>
-    <string name="ghostData_company" msgid="2554310786296833424">"Компания"</string>
-    <string name="ghostData_title" msgid="4994968731830184837">"Лауазымы"</string>
-    <string name="label_notes" msgid="2050255313694219786">"Ескертпелер"</string>
-    <string name="label_sip_address" msgid="8883266182575965926">"SIP"</string>
-    <string name="websiteLabelsGroup" msgid="1630734286462186790">"Веб-сайт"</string>
-    <string name="groupsLabel" msgid="2694002798416868728">"Топтар"</string>
-    <string name="email_home" msgid="889830029388962171">"Үй э-поштасына хат жіберу"</string>
-    <string name="email_mobile" msgid="4487686436743741150">"Ұялы телефонға хат жіберу"</string>
-    <string name="email_work" msgid="4223487303344613528">"Жұмысқа хат жіберу"</string>
-    <string name="email_other" msgid="4246411900126012062">"Хат жіберу"</string>
-    <string name="email_custom" msgid="7246580894327511013">"<xliff:g id="CUSTOM">%s</xliff:g> мекенжайына хат жіберу"</string>
-    <string name="email" msgid="2807318537887091606">"Хат жіберу"</string>
-    <string name="postal_street" msgid="6918171741240802474">"Көше"</string>
-    <string name="postal_city" msgid="8674569121430005628">"Қала"</string>
-    <string name="postal_region" msgid="1730369286225469192">"Штат"</string>
-    <string name="postal_postcode" msgid="4450700741261990439">"Индекс"</string>
-    <string name="postal_country" msgid="232670707458768148">"Ел"</string>
-    <string name="map_home" msgid="4181131107392126938">"Үй мекенжайын көру"</string>
-    <string name="map_work" msgid="5723471185992684400">"Жұмыс мекенжайын көру"</string>
-    <string name="map_other" msgid="2253764780863500516">"Мекенжайын көру"</string>
-    <string name="map_custom" msgid="5581743097882436157">"<xliff:g id="CUSTOM">%s</xliff:g> мекенжайын көру"</string>
-    <string name="chat_aim" msgid="2954364435497941659">"AIM қолданып чаттасу"</string>
-    <string name="chat_msn" msgid="3130135239071228678">"Windows Live қолданып чаттасу"</string>
-    <string name="chat_yahoo" msgid="3233552142326865347">"Yahoo қолданып чаттасу"</string>
-    <string name="chat_skype" msgid="6486703981390592425">"Skype қолданып чаттасу"</string>
-    <string name="chat_qq" msgid="786924280665740019">"QQ қолданып чаттасу"</string>
-    <string name="chat_gtalk" msgid="7914674177243078035">"Google Talk функциясы арқылы чаттасу"</string>
-    <string name="chat_icq" msgid="3292934726414765801">"ICQ қолданып чаттасу"</string>
-    <string name="chat_jabber" msgid="6701542313597880204">"Jabber қолданып чаттасу"</string>
-    <string name="chat" msgid="1020428260359370236">"Чаттасу"</string>
-    <string name="list_filter_all_accounts" msgid="473782314881473992">"Барлық контактілер"</string>
-    <string name="listAllContactsInAccount" msgid="3486378621592995630">"<xliff:g id="NAME">%s</xliff:g> ішіндегі контактілер"</string>
-    <string name="listCustomView" msgid="5306282632413086731">"Контактілердің жеке көрінісі"</string>
-    <string name="listSingleContact" msgid="8620818791932382627">"Жалғыз контакт"</string>
-    <string name="display_options_sort_list_by" msgid="3541875948367831228">"Сұрыптау шарты"</string>
-    <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"Аты"</string>
-    <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"Тегі"</string>
-    <string name="display_options_view_names_as" msgid="4204204205736735618">"Ат пішімі"</string>
-    <string name="display_options_view_given_name_first" msgid="2308026973021171020">"Алдымен аты"</string>
-    <string name="display_options_view_family_name_first" msgid="987430497292428242">"Алдымен тегі"</string>
-    <string name="menu_clear_frequents" msgid="5358271535047496120">"Жиі қолданылғандары өшіру"</string>
-    <string name="action_menu_back_from_search" msgid="3550669942742167644">"іздеуді тоқтату"</string>
-    <string name="description_clear_search" msgid="2347258825265600782">"Іздеуді өшіру"</string>
-    <string name="select_account_dialog_title" msgid="2673504582803359239">"Есептік жазба"</string>
-    <string name="set_default_account" msgid="7966099951006467572">"Осыны қоңыраулар үшін әрқашан пайд."</string>
-    <string name="select_phone_account_for_calls" msgid="1784460686103423274">"Келесімен қоңырау шалу"</string>
-    <string name="call_with_a_note" msgid="6242261320491851133">"Ескертпе бар қоңырау"</string>
-    <string name="call_subject_hint" msgid="7233138753650420800">"Қоңыраумен жіберу үшін ескертпе теріңіз ..."</string>
-    <string name="send_and_call_button" msgid="4735168294120154013">"ЖІБЕРУ ЖӘНЕ ҚОҢЫРАУ ШАЛУ"</string>
-    <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="tab_title" msgid="3387876802026074288">"<xliff:g id="TITLE">%1$s</xliff:g> қойындысы."</string>
-    <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
-      <item quantity="other"> <xliff:g id="TITLE_2">%1$s</xliff:g> қойындысы. <xliff:g id="COUNT_3">%2$d</xliff:g> оқылмаған элемент. </item>
-      <item quantity="one"> <xliff:g id="TITLE_0">%1$s</xliff:g> қойындысы. <xliff:g id="COUNT_1">%2$d</xliff:g> оқылмаған элемент. </item>
-    </plurals>
-    <string name="description_search_video_call" msgid="4337369876888024909">"Бейне қоңырау"</string>
-    <string name="description_search_call_and_share" msgid="4912772842755050467">"Бөлісу және қоңырау шалу"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_custom">%s нөміріне қоңырау шалу</string>
+  <string name="call_home">Үйге қоңырау шалу</string>
+  <string name="call_mobile">Ұялы телефонға қоңырау шалу</string>
+  <string name="call_work">Жұмысқа қоңырау шалу</string>
+  <string name="call_fax_work">Жұмыс факсіне қоңырау шалу</string>
+  <string name="call_fax_home">Үй факсіне қоңырау шалу</string>
+  <string name="call_pager">Пэйджерге қоңырау шалу</string>
+  <string name="call_other">Қоңырау шалу</string>
+  <string name="call_callback">Кері қоңырау шалу нөміріне қоңырау шалу</string>
+  <string name="call_car">Автокөлікке қоңырау шалу</string>
+  <string name="call_company_main">Компанияның негізгі нөміріне қоңырау шалу</string>
+  <string name="call_isdn">ISDN нөміріне қоңырау шалу</string>
+  <string name="call_main">Негізгі нөмірге қоңырау шалу</string>
+  <string name="call_other_fax">Факске қоңырау шалу</string>
+  <string name="call_radio">Радиоға қоңырау шалу</string>
+  <string name="call_telex">Телекске қоңырау шалу</string>
+  <string name="call_tty_tdd">Есту қабілеті төмен адамдарға арналған телетайпқа қоңырау шалу</string>
+  <string name="call_work_mobile">Жұмыс ұялы телефонына қоңырау шалу</string>
+  <string name="call_work_pager">Жұмыс пэйджеріне қоңырау шалу</string>
+  <string name="call_assistant">%s нөміріне қоңырау соғу</string>
+  <string name="call_mms">MMS нөміріне қоңырау шалу</string>
+  <string name="sms_custom">%s мәтін-хабар жіберу</string>
+  <string name="sms_home">Үй телефонына мәтін-хабар жіберу</string>
+  <string name="sms_mobile">Ұялы телефонған мәтін-хабар жіберу</string>
+  <string name="sms_work">Жұмыс нөміріне мәтін-хабар жіберу</string>
+  <string name="sms_fax_work">Жұмыс факсіне мәтін-хабар жіберу</string>
+  <string name="sms_fax_home">Үй факсіне мәтін-хабар жіберу</string>
+  <string name="sms_pager">Пейджерге мәтін-хабар жіберу</string>
+  <string name="sms_other">Мәтін-хабар</string>
+  <string name="sms_callback">Кері қоңырау шалу нөміріне мәтін-хабар жіберу</string>
+  <string name="sms_car">Автокөлікке мәтін-хабар жіберу</string>
+  <string name="sms_company_main">Негізгі компанияға мәтін-хабар жіберу</string>
+  <string name="sms_isdn">ISDN нөміріне мәтін-хабар жіберу</string>
+  <string name="sms_main">Негізгі нөмірге мәтін-хабар жіберу</string>
+  <string name="sms_other_fax">Факске мәтін-хабар жіберу</string>
+  <string name="sms_radio">Радиоға мәтін-хабр жіберу</string>
+  <string name="sms_telex">Tелетайпқа мәтін-хабар жіберу</string>
+  <string name="sms_tty_tdd">Есту қабілеті төмен адамдарға арналған телетайпқа мәтін-хабар жіберу</string>
+  <string name="sms_work_mobile">Жұмыс ұялы телефонына мәтін-хабар жіберу</string>
+  <string name="sms_work_pager">Жұмыс пейджеріне мәтін-хабар жіберу</string>
+  <string name="sms_assistant">%s нөміріне мәтін-хабар жіберу</string>
+  <string name="sms_mms">MMS нөміріне мәтін-хабар жіберу</string>
+  <string name="clearFrequentsConfirmation_title">Жиі қолданылғандар тазартылсын ба?</string>
+  <string name="clearFrequentsConfirmation">Контактілер және Телефондар қолданбаларындағы жиі хабарласатындар тізімі тазаланады және электрондық пошта қолданбалары мекенжай параметрлерін басынан үйренуге мәжбүрленеді.</string>
+  <string name="clearFrequentsProgress_title">Жиі қолданылғандар тазартылуда…</string>
+  <string name="status_available">Қол жетімді</string>
+  <string name="status_away">Желіден тыс</string>
+  <string name="status_busy">Бос емес</string>
+  <string name="contactsList">Контактілер</string>
+  <string name="contact_suggestions">Үздік ұсыныстар</string>
+  <string name="local_invisible_directory">Басқа</string>
+  <string name="directory_search_label">Анықтама</string>
+  <string name="directory_search_label_work">Жұмыс каталогы</string>
+  <string name="local_search_label">Барлық контактілер</string>
+  <string name="local_suggestions_search_label">Ұсыныстар</string>
+  <string msgid="9154761216179882405" name="user_profile_contacts_list_header">Мен</string>
+  <string name="missing_name">(Атаусыз)</string>
+  <string msgid="2795575601596468581" name="description_view_contact_detail">Контактіні көру</string>
+  <string name="list_filter_phones">Телефон нөмірі бар барлық контактілер</string>
+  <string name="list_filter_phones_work">Жұмыс профилінің контактілері</string>
+  <string name="view_updates_from_group">Жаңартуларды көру</string>
+  <string name="account_phone">Тек қана құрылғыда, синхрондалмаған</string>
+  <string name="nameLabelsGroup">Аты-жөні</string>
+  <string name="nicknameLabelsGroup">Қысқа аты</string>
+  <string name="full_name">Атауы</string>
+  <string name="name_given">Аты</string>
+  <string name="name_family">Тегі</string>
+  <string name="name_prefix">Аттың префиксі</string>
+  <string name="name_middle">Әкесінің аты</string>
+  <string name="name_suffix">Аттың суффиксі</string>
+  <string name="name_phonetic">Фонетикалық есімі</string>
+  <string name="name_phonetic_given">Фонетикалық аты</string>
+  <string name="name_phonetic_middle">Әкесінің фонетикалық аты</string>
+  <string name="name_phonetic_family">Тегінің транскрипциясы</string>
+  <string name="phoneLabelsGroup">Телефон</string>
+  <string name="emailLabelsGroup">Хат жіберу</string>
+  <string name="postalLabelsGroup">Мекенжай</string>
+  <string name="imLabelsGroup">IM</string>
+  <string name="organizationLabelsGroup">Ұйым</string>
+  <string name="relationLabelsGroup">Қарым-қатынас</string>
+  <string name="eventLabelsGroup">Ерекше күн</string>
+  <string name="sms">Мәтіндік-хабар</string>
+  <string name="postal_address">Мекенжай</string>
+  <string name="ghostData_company">Компания</string>
+  <string name="ghostData_title">Лауазымы</string>
+  <string name="label_notes">Ескертпелер</string>
+  <string name="label_sip_address">SIP</string>
+  <string name="websiteLabelsGroup">Веб-сайт</string>
+  <string name="groupsLabel">Топтар</string>
+  <string name="email_home">Үй э-поштасына хат жіберу</string>
+  <string name="email_mobile">Ұялы телефонға хат жіберу</string>
+  <string name="email_work">Жұмысқа хат жіберу</string>
+  <string name="email_other">Хат жіберу</string>
+  <string name="email_custom">%s мекенжайына хат жіберу</string>
+  <string name="email">Хат жіберу</string>
+  <string name="postal_street">Көше</string>
+  <string name="postal_city">Қала</string>
+  <string name="postal_region">Штат</string>
+  <string name="postal_postcode">Индекс</string>
+  <string name="postal_country">Ел</string>
+  <string name="map_home">Үй мекенжайын көру</string>
+  <string name="map_work">Жұмыс мекенжайын көру</string>
+  <string name="map_other">Мекенжайын көру</string>
+  <string name="map_custom">%s мекенжайын көру</string>
+  <string name="chat_aim">AIM қолданып чаттасу</string>
+  <string name="chat_msn">Windows Live қолданып чаттасу</string>
+  <string name="chat_yahoo">Yahoo қолданып чаттасу</string>
+  <string name="chat_skype">Skype қолданып чаттасу</string>
+  <string name="chat_qq">QQ қолданып чаттасу</string>
+  <string name="chat_gtalk">Google Talk функциясы арқылы чаттасу</string>
+  <string name="chat_icq">ICQ қолданып чаттасу</string>
+  <string name="chat_jabber">Jabber қолданып чаттасу</string>
+  <string name="chat">Чаттасу</string>
+  <string name="list_filter_all_accounts">Барлық контактілер</string>
+  <string name="listAllContactsInAccount">%s ішіндегі контактілер</string>
+  <string name="listCustomView">Контактілердің жеке көрінісі</string>
+  <string name="listSingleContact">Жалғыз контакт</string>
+  <string name="display_options_sort_list_by">Сұрыптау шарты</string>
+  <string name="display_options_sort_by_given_name">Аты</string>
+  <string name="display_options_sort_by_family_name">Тегі</string>
+  <string name="display_options_view_names_as">Ат пішімі</string>
+  <string name="display_options_view_given_name_first">Алдымен аты</string>
+  <string name="display_options_view_family_name_first">Алдымен тегі</string>
+  <string name="menu_clear_frequents">Жиі қолданылғандары өшіру</string>
+  <string name="action_menu_back_from_search">іздеуді тоқтату</string>
+  <string name="description_clear_search">Іздеуді өшіру</string>
+  <string name="select_account_dialog_title">Есептік жазба</string>
+  <string name="set_default_account">Осыны қоңыраулар үшін әрқашан пайд.</string>
+  <string name="select_phone_account_for_calls">Қоңырау шалынатын SIM картасын таңдаңыз</string>
+  <string name="select_phone_account_for_calls_remember">Осы картаны еске сақтау</string>
+  <string name="call_with_a_note">Ескертпе бар қоңырау</string>
+  <string name="call_subject_hint">Қоңыраумен жіберу үшін ескертпе теріңіз ...</string>
+  <string name="send_and_call_button">ЖІБЕРУ ЖӘНЕ ҚОҢЫРАУ ШАЛУ</string>
+  <string name="call_subject_limit">%1$s / %2$s</string>
+  <string name="old_call_subject_type_and_number">%1$s %2$s</string>
+  <string name="tab_title">%1$s қойындысы.</string>
+  <plurals name="tab_title_with_unread_items">
+    <item quantity="one"> %1$s қойындысы. %2$d оқылмаған элемент. </item>
+    <item quantity="other"> %1$s қойындысы. %2$d оқылмаған элемент. </item>
+  </plurals>
+  <string name="description_search_video_call">Бейне қоңырау</string>
+  <string name="description_search_call_and_share">Бөлісу және қоңырау шалу</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-km/strings.xml b/java/com/android/contacts/common/res/values-km/strings.xml
index f602dec..15c7ed5 100644
--- a/java/com/android/contacts/common/res/values-km/strings.xml
+++ b/java/com/android/contacts/common/res/values-km/strings.xml
@@ -1,162 +1,145 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="toast_text_copied" msgid="8979281391599667362">"បាន​ចម្លង​អត្ថបទ"</string>
-    <string name="call_custom" msgid="3041673234638990874">"ហៅ <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="call_home" msgid="125893483593803791">"ហៅ​ទៅ​ផ្ទះ"</string>
-    <string name="call_mobile" msgid="967589404494150813">"ហៅ​ទៅ​ទូរស័ព្ទ​ចល័ត"</string>
-    <string name="call_work" msgid="6040550697395300892">"ហៅ​ទៅ​កន្លែង​ធ្វើការ"</string>
-    <string name="call_fax_work" msgid="5260192771364592922">"ហៅ​ទៅ​ទូរសារ​កន្លែង​ធ្វើការ"</string>
-    <string name="call_fax_home" msgid="5174311195081144124">"ហៅ​ទៅ​ទូរសារ​ផ្ទះ"</string>
-    <string name="call_pager" msgid="6814149227741274161">"ហៅ​ទៅ​លេខ​ភេយ័រ"</string>
-    <string name="call_other" msgid="5536385588712587235">"ហៅ"</string>
-    <string name="call_callback" msgid="6314019862718112786">"ហៅ​ទៅ​លេខ​ហៅ​ទៅវិញ"</string>
-    <string name="call_car" msgid="3197417098027764954">"ហៅ​ទៅ​ទូរស័ព្ទ​រថយន្ត"</string>
-    <string name="call_company_main" msgid="2557663310028446397">"ហៅ​ទៅ​លេខ​សំខាន់​របស់​ក្រុមហ៊ុន"</string>
-    <string name="call_isdn" msgid="4691270442763649522">"ហៅ​ទៅ ISDN"</string>
-    <string name="call_main" msgid="3293707608770407814">"ហៅ​ទៅ​លេខ​ចម្បង"</string>
-    <string name="call_other_fax" msgid="4724521984879021465">"ហៅ​ទៅ​ទូរសារ"</string>
-    <string name="call_radio" msgid="8942441419845057942">"ហៅ​ទៅ​លេខ​វិទ្យុ"</string>
-    <string name="call_telex" msgid="2031514461660668351">"ហៅ​ទៅ telex"</string>
-    <string name="call_tty_tdd" msgid="7807210224965727701">"ហៅ​ទៅ TTY/TDD"</string>
-    <string name="call_work_mobile" msgid="2716342732938578495">"ហៅ​ទៅ​ទូរស័ព្ទ​ចល័ត​កន្លែង​ធ្វើការ"</string>
-    <string name="call_work_pager" msgid="3791778749827366574">"ហៅ​ទៅ​ភេយ័រ​កន្លែង​ធ្វើការ"</string>
-    <string name="call_assistant" msgid="4177478845473789294">"ហៅ​ទៅ <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
-    <string name="call_mms" msgid="4958811711741872901">"ហៅ MMS"</string>
-    <string name="sms_custom" msgid="8785368968605026317">"អត្ថបទ <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="sms_home" msgid="3527719551060295243">"​សារ​ទៅ​​ផ្ទះ"</string>
-    <string name="sms_mobile" msgid="8883045857887736518">"អត្ថបទ​ទូរស័ព្ទ​ចល័ត"</string>
-    <string name="sms_work" msgid="4158595439553450966">"អត្ថបទ​ការងារ"</string>
-    <string name="sms_fax_work" msgid="5483726627718055248">"សារ​​ទូរសារ​កន្លែង​ធ្វើការ"</string>
-    <string name="sms_fax_home" msgid="9219265155770746077">"អត្ថបទ​ទូរសារ​ផ្ទះ"</string>
-    <string name="sms_pager" msgid="4901085068525193933">"អត្ថបទ​ភេយ័រ"</string>
-    <string name="sms_other" msgid="1742702947993285933">"អត្ថបទ"</string>
-    <string name="sms_callback" msgid="5833483630377538308">"អត្ថបទ​ហៅ​ទៅវិញ"</string>
-    <string name="sms_car" msgid="4314577266154395174">"អត្ថបទ​ទៅ​រថយន្ត"</string>
-    <string name="sms_company_main" msgid="2308160928487360705">"អត្ថបទ​ចម្បង​របស់​ក្រុមហ៊ុន"</string>
-    <string name="sms_isdn" msgid="6394300346179302542">"អត្ថបទ ISDN"</string>
-    <string name="sms_main" msgid="8908087742014140774">"សារ​ចម្បង"</string>
-    <string name="sms_other_fax" msgid="8768455473295405427">"អត្ថបទ​ទូរសារ"</string>
-    <string name="sms_radio" msgid="855555176531704682">"អត្ថបទ​វិទ្យុ"</string>
-    <string name="sms_telex" msgid="6269029276223252719">"អត្ថបទ telex"</string>
-    <string name="sms_tty_tdd" msgid="6229057354509192444">"អត្ថបទ TTY/TDD"</string>
-    <string name="sms_work_mobile" msgid="2155975469329969840">"អត្ថបទ​ទូរស័ព្ទ​ចល័ត​កន្លែង​ធ្វើការ"</string>
-    <string name="sms_work_pager" msgid="8500140274906830742">"អត្ថបទ​ភេ​យ័រ​កន្លែង​ធ្វើការ"</string>
-    <string name="sms_assistant" msgid="8513548482745330818">"អត្ថបទ <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
-    <string name="sms_mms" msgid="5187888900503248542">"អត្ថបទ MMS"</string>
-    <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"សម្អាត​ទំនាក់ទំនង​ញឹកញាប់?"</string>
-    <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"អ្នកនឹងជម្រះបញ្ជីដែលអ្នកទាក់ទងជាញឹកញាប់នៅក្នុងកម្មវិធីទូរស័ព្ទ និងទំនាក់ទំនង ហើយបង្ខំឲ្យកម្មវិធីអ៊ីមែលស្វែងយល់ពីចំណូលចិត្តទំនាក់ទំនងរបស់អ្នកតាំងពីដំបូង។"</string>
-    <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"សម្អាត​ទំនាក់ទំនង​ញឹកញាប់..."</string>
-    <string name="status_available" msgid="2648156525685472626">"ទំនេរ"</string>
-    <string name="status_away" msgid="2298688367552893953">"ចាក​ឆ្ងាយ"</string>
-    <string name="status_busy" msgid="5990832098713248503">"រវល់"</string>
-    <string name="contactsList" msgid="8806067891419291513">"ទំនាក់ទំនង"</string>
-    <string name="contact_suggestions" msgid="3324166754807120006">"បាន​ណែនាំ​​កម្រិត​ខ្ពស់"</string>
-    <string name="local_invisible_directory" msgid="4723238462733650090">"ផ្សេងៗ"</string>
-    <string name="directory_search_label" msgid="4621215895484025229">"ថត"</string>
-    <string name="directory_search_label_work" msgid="7679326282707414897">"ថតកន្លែងការងារ"</string>
-    <string name="local_search_label" msgid="907622822323119235">"ទំនាក់ទំនង​ទាំងអស់"</string>
-    <string name="local_suggestions_search_label" msgid="1178575146224386118">"ការ​ណែនាំ"</string>
-    <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"ខ្ញុំ"</string>
-    <string name="missing_name" msgid="978606963362745020">"(គ្មាន​ឈ្មោះ)"</string>
-    <string name="description_view_contact_detail" msgid="2428742401208561136">"មើល​ទំនាក់ទំនង"</string>
-    <string name="list_filter_phones" msgid="8763316061763437182">"ទំនាក់ទំនង​ទាំងអស់​ដែល​មាន​លេខ​ទូរស័ព្ទ"</string>
-    <string name="list_filter_phones_work" msgid="7083575404573422965">"ទំនាក់ទំនងប្រវត្តិរូបការងារ"</string>
-    <string name="view_updates_from_group" msgid="9011641093168385729">"មើល​បច្ចុប្បន្នភាព"</string>
-    <string name="account_phone" msgid="7067809073194061035">"សម្រាប់​តែ​ឧបករណ៍ មិន​បាន​ធ្វើ​សមកាលកម្ម"</string>
-    <string name="nameLabelsGroup" msgid="7730465833159557471">"ឈ្មោះ"</string>
-    <string name="nicknameLabelsGroup" msgid="6310556912361840029">"ឈ្មោះ​ហៅ​ក្រៅ"</string>
-    <string name="full_name" msgid="648186563998465740">"ឈ្មោះ"</string>
-    <string name="name_given" msgid="5096576006314820536">"នាម​ខ្លួន"</string>
-    <string name="name_family" msgid="6646235805198547467">"នាមត្រកូល"</string>
-    <string name="name_prefix" msgid="9215326539658838">"បុព្វបទ​ឈ្មោះ"</string>
-    <string name="name_middle" msgid="703755205331582769">"ឈ្មោះ​កណ្ដាល"</string>
-    <string name="name_suffix" msgid="5777083390282548702">"បច្ច័យ​ឈ្មោះ"</string>
-    <string name="name_phonetic" msgid="1650870996361663089">"​ឈ្មោះតាមសូរស័ព្ទ"</string>
-    <string name="name_phonetic_given" msgid="618812334274603170">"នាម​ខ្លួន​តាម​សូរស័ព្ទ"</string>
-    <string name="name_phonetic_middle" msgid="4826820763384625538">"​ឈ្មោះ​កណ្ដាលតាមសូរស័ព្ទ"</string>
-    <string name="name_phonetic_family" msgid="379905191212930771">"នាមត្រកូល​តាម​សូរស័ព្ទ"</string>
-    <string name="phoneLabelsGroup" msgid="169661929021355548">"ទូរស័ព្ទ"</string>
-    <string name="emailLabelsGroup" msgid="2249752810477488833">"អ៊ីមែល"</string>
-    <string name="postalLabelsGroup" msgid="6772000590189142253">"អាសយដ្ឋាន"</string>
-    <string name="imLabelsGroup" msgid="5718066254237364731">"IM"</string>
-    <string name="organizationLabelsGroup" msgid="1101996309241601435">"ស្ថាប័ន"</string>
-    <string name="relationLabelsGroup" msgid="53866051664600053">"ចំណង​ទាក់ទង"</string>
-    <string name="eventLabelsGroup" msgid="1236970042646618489">"កាលបរិច្ឆេទពិសេស"</string>
-    <string name="sms" msgid="7574344928185328095">"សារ​​អត្ថបទ"</string>
-    <string name="postal_address" msgid="1804707930129674200">"អាសយដ្ឋាន"</string>
-    <string name="ghostData_company" msgid="2554310786296833424">"ក្រុមហ៊ុន"</string>
-    <string name="ghostData_title" msgid="4994968731830184837">"មុខងារ"</string>
-    <string name="label_notes" msgid="2050255313694219786">"ចំណាំ"</string>
-    <string name="label_sip_address" msgid="8883266182575965926">"SIP"</string>
-    <string name="websiteLabelsGroup" msgid="1630734286462186790">"តំបន់បណ្ដាញ"</string>
-    <string name="groupsLabel" msgid="2694002798416868728">"ក្រុម"</string>
-    <string name="email_home" msgid="889830029388962171">"អ៊ីមែល​ទៅ​ផ្ទះ"</string>
-    <string name="email_mobile" msgid="4487686436743741150">"អ៊ីមែល​ទៅ​ទូរស័ព្ទ​ចល័ត"</string>
-    <string name="email_work" msgid="4223487303344613528">"អ៊ីមែល​ទៅ​កន្លែង​ធ្វើការ"</string>
-    <string name="email_other" msgid="4246411900126012062">"អ៊ីមែល"</string>
-    <string name="email_custom" msgid="7246580894327511013">"អ៊ីមែល <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="email" msgid="2807318537887091606">"អ៊ីមែល"</string>
-    <string name="postal_street" msgid="6918171741240802474">"ផ្លូវ"</string>
-    <string name="postal_city" msgid="8674569121430005628">"ទីក្រុង"</string>
-    <string name="postal_region" msgid="1730369286225469192">"រដ្ឋ"</string>
-    <string name="postal_postcode" msgid="4450700741261990439">"លេខ​កូដ​តំបន់"</string>
-    <string name="postal_country" msgid="232670707458768148">"ប្រទេស"</string>
-    <string name="map_home" msgid="4181131107392126938">"មើល​អាសយដ្ឋាន​ផ្ទះ"</string>
-    <string name="map_work" msgid="5723471185992684400">"មើល​អាសយដ្ឋាន​ការងារ"</string>
-    <string name="map_other" msgid="2253764780863500516">"មើល​អាសយដ្ឋាន"</string>
-    <string name="map_custom" msgid="5581743097882436157">"មើល​អាសយដ្ឋាន <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="chat_aim" msgid="2954364435497941659">"ជជែក​ដោយ​ប្រើ AIM"</string>
-    <string name="chat_msn" msgid="3130135239071228678">"ជជែក​ដោយ​ប្រើ Windows Live"</string>
-    <string name="chat_yahoo" msgid="3233552142326865347">"ជជែក​ដោយ​ប្រើ Yahoo"</string>
-    <string name="chat_skype" msgid="6486703981390592425">"ជជែក​ដោយ​ប្រើ Skype"</string>
-    <string name="chat_qq" msgid="786924280665740019">"ជជែក​ដោយ​ប្រើ QQ"</string>
-    <string name="chat_gtalk" msgid="7914674177243078035">"ជជែក​ដោយ​ប្រើ Google Talk"</string>
-    <string name="chat_icq" msgid="3292934726414765801">"ជជែក​ដោយ​ប្រើ ICQ"</string>
-    <string name="chat_jabber" msgid="6701542313597880204">"ជជែក​ដោយ​ប្រើ Jabber"</string>
-    <string name="chat" msgid="1020428260359370236">"ជជែក​​"</string>
-    <string name="list_filter_all_accounts" msgid="473782314881473992">"ទំនាក់ទំនងទាំងអស់"</string>
-    <string name="listAllContactsInAccount" msgid="3486378621592995630">"ទំនាក់ទំនង​នៅ​ក្នុង <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="listCustomView" msgid="5306282632413086731">"ទំនាក់ទំនង​ក្នុង​ទិដ្ឋភាព​ផ្ទាល់ខ្លួន"</string>
-    <string name="listSingleContact" msgid="8620818791932382627">"ទំនាក់ទំនង​ទោល"</string>
-    <string name="display_options_sort_list_by" msgid="3541875948367831228">"តម្រៀប​តាម"</string>
-    <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"នាម​ខ្លួន"</string>
-    <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"នាមត្រកូល"</string>
-    <string name="display_options_view_names_as" msgid="4204204205736735618">"ទម្រង់ឈ្មោះ"</string>
-    <string name="display_options_view_given_name_first" msgid="2308026973021171020">"នាម​ខ្លួន​មុន"</string>
-    <string name="display_options_view_family_name_first" msgid="987430497292428242">"នាមត្រកូល​មុន"</string>
-    <string name="menu_clear_frequents" msgid="5358271535047496120">"សម្អាត​ញឹកញាប់"</string>
-    <string name="action_menu_back_from_search" msgid="3550669942742167644">"បញ្ឈប់​ការ​ស្វែងរក"</string>
-    <string name="description_clear_search" msgid="2347258825265600782">"សម្អាត​ការ​ស្វែងរក"</string>
-    <string name="select_account_dialog_title" msgid="2673504582803359239">"គណនី"</string>
-    <string name="set_default_account" msgid="7966099951006467572">"ប្រើ​វា​សម្រាប់​ការ​ហៅ​ជា​និច្ច"</string>
-    <string name="select_phone_account_for_calls" msgid="1784460686103423274">"ហៅ​ជាមួយ"</string>
-    <string name="call_with_a_note" msgid="6242261320491851133">"ការហៅព្រមជាមួយចំណាំ"</string>
-    <string name="call_subject_hint" msgid="7233138753650420800">"វាយបញ្ចូលចំណាំដែលត្រូវផ្ញើជាមួយការហៅទូរស័ព្ទ ..."</string>
-    <string name="send_and_call_button" msgid="4735168294120154013">"ផ្ញើ &amp; ហៅ"</string>
-    <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="tab_title" msgid="3387876802026074288">"ផ្ទាំង <xliff:g id="TITLE">%1$s</xliff:g>។"</string>
-    <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
-      <item quantity="other">ផ្ទាំង <xliff:g id="TITLE_2">%1$s</xliff:g>។ ធាតុមិនទាន់​អាន <xliff:g id="COUNT_3">%2$d</xliff:g> </item>
-      <item quantity="one">ផ្ទាំង <xliff:g id="TITLE_0">%1$s</xliff:g>។ ធាតុមិនទាន់​អាន <xliff:g id="COUNT_1">%2$d</xliff:g> </item>
-    </plurals>
-    <string name="description_search_video_call" msgid="4337369876888024909">"ការ​ហៅវីដេអូ"</string>
-    <string name="description_search_call_and_share" msgid="4912772842755050467">"ចែករំលែក និង​ហៅ​ទូរសព្ទ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_custom">ហៅ %s</string>
+  <string name="call_home">ហៅ​ទៅ​ផ្ទះ</string>
+  <string name="call_mobile">ហៅ​ទៅ​ទូរស័ព្ទ​ចល័ត</string>
+  <string name="call_work">ហៅ​ទៅ​កន្លែង​ធ្វើការ</string>
+  <string name="call_fax_work">ហៅ​ទៅ​ទូរសារ​កន្លែង​ធ្វើការ</string>
+  <string name="call_fax_home">ហៅ​ទៅ​ទូរសារ​ផ្ទះ</string>
+  <string name="call_pager">ហៅ​ទៅ​លេខ​ភេយ័រ</string>
+  <string name="call_other">ហៅ</string>
+  <string name="call_callback">ហៅ​ទៅ​លេខ​ហៅ​ទៅវិញ</string>
+  <string name="call_car">ហៅ​ទៅ​ទូរស័ព្ទ​រថយន្ត</string>
+  <string name="call_company_main">ហៅ​ទៅ​លេខ​សំខាន់​របស់​ក្រុមហ៊ុន</string>
+  <string name="call_isdn">ហៅ​ទៅ ISDN</string>
+  <string name="call_main">ហៅ​ទៅ​លេខ​ចម្បង</string>
+  <string name="call_other_fax">ហៅ​ទៅ​ទូរសារ</string>
+  <string name="call_radio">ហៅ​ទៅ​លេខ​វិទ្យុ</string>
+  <string name="call_telex">ហៅ​ទៅ telex</string>
+  <string name="call_tty_tdd">ហៅ​ទៅ TTY/TDD</string>
+  <string name="call_work_mobile">ហៅ​ទៅ​ទូរស័ព្ទ​ចល័ត​កន្លែង​ធ្វើការ</string>
+  <string name="call_work_pager">ហៅ​ទៅ​ភេយ័រ​កន្លែង​ធ្វើការ</string>
+  <string name="call_assistant">ហៅ​ទៅ %s</string>
+  <string name="call_mms">ហៅ MMS</string>
+  <string name="sms_custom">អត្ថបទ %s</string>
+  <string name="sms_home">​សារ​ទៅ​​ផ្ទះ</string>
+  <string name="sms_mobile">អត្ថបទ​ទូរស័ព្ទ​ចល័ត</string>
+  <string name="sms_work">អត្ថបទ​ការងារ</string>
+  <string name="sms_fax_work">សារ​​ទូរសារ​កន្លែង​ធ្វើការ</string>
+  <string name="sms_fax_home">អត្ថបទ​ទូរសារ​ផ្ទះ</string>
+  <string name="sms_pager">អត្ថបទ​ភេយ័រ</string>
+  <string name="sms_other">អត្ថបទ</string>
+  <string name="sms_callback">អត្ថបទ​ហៅ​ទៅវិញ</string>
+  <string name="sms_car">អត្ថបទ​ទៅ​រថយន្ត</string>
+  <string name="sms_company_main">អត្ថបទ​ចម្បង​របស់​ក្រុមហ៊ុន</string>
+  <string name="sms_isdn">អត្ថបទ ISDN</string>
+  <string name="sms_main">សារ​ចម្បង</string>
+  <string name="sms_other_fax">អត្ថបទ​ទូរសារ</string>
+  <string name="sms_radio">អត្ថបទ​វិទ្យុ</string>
+  <string name="sms_telex">អត្ថបទ telex</string>
+  <string name="sms_tty_tdd">អត្ថបទ TTY/TDD</string>
+  <string name="sms_work_mobile">អត្ថបទ​ទូរស័ព្ទ​ចល័ត​កន្លែង​ធ្វើការ</string>
+  <string name="sms_work_pager">អត្ថបទ​ភេ​យ័រ​កន្លែង​ធ្វើការ</string>
+  <string name="sms_assistant">អត្ថបទ %s</string>
+  <string name="sms_mms">អត្ថបទ MMS</string>
+  <string name="clearFrequentsConfirmation_title">សម្អាត​ទំនាក់ទំនង​ញឹកញាប់?</string>
+  <string name="clearFrequentsConfirmation">អ្នកនឹងជម្រះបញ្ជីដែលអ្នកទាក់ទងជាញឹកញាប់នៅក្នុងកម្មវិធីទូរស័ព្ទ និងទំនាក់ទំនង ហើយបង្ខំឲ្យកម្មវិធីអ៊ីមែលស្វែងយល់ពីចំណូលចិត្តទំនាក់ទំនងរបស់អ្នកតាំងពីដំបូង។</string>
+  <string name="clearFrequentsProgress_title">សម្អាត​ទំនាក់ទំនង​ញឹកញាប់...</string>
+  <string name="status_available">ទំនេរ</string>
+  <string name="status_away">ចាក​ឆ្ងាយ</string>
+  <string name="status_busy">រវល់</string>
+  <string name="contactsList">ទំនាក់ទំនង</string>
+  <string name="contact_suggestions">បាន​ណែនាំ​​កម្រិត​ខ្ពស់</string>
+  <string name="local_invisible_directory">ផ្សេងៗ</string>
+  <string name="directory_search_label">ថត</string>
+  <string name="directory_search_label_work">ថតកន្លែងការងារ</string>
+  <string name="local_search_label">ទំនាក់ទំនង​ទាំងអស់</string>
+  <string name="local_suggestions_search_label">ការ​ណែនាំ</string>
+  <string msgid="9154761216179882405" name="user_profile_contacts_list_header">ខ្ញុំ</string>
+  <string name="missing_name">(គ្មាន​ឈ្មោះ)</string>
+  <string msgid="2795575601596468581" name="description_view_contact_detail">មើល​ទំនាក់ទំនង</string>
+  <string name="list_filter_phones">ទំនាក់ទំនង​ទាំងអស់​ដែល​មាន​លេខ​ទូរស័ព្ទ</string>
+  <string name="list_filter_phones_work">ទំនាក់ទំនងប្រវត្តិរូបការងារ</string>
+  <string name="view_updates_from_group">មើល​បច្ចុប្បន្នភាព</string>
+  <string name="account_phone">សម្រាប់​តែ​ឧបករណ៍ មិន​បាន​ធ្វើ​សមកាលកម្ម</string>
+  <string name="nameLabelsGroup">ឈ្មោះ</string>
+  <string name="nicknameLabelsGroup">ឈ្មោះ​ហៅ​ក្រៅ</string>
+  <string name="full_name">ឈ្មោះ</string>
+  <string name="name_given">នាម​ខ្លួន</string>
+  <string name="name_family">នាមត្រកូល</string>
+  <string name="name_prefix">បុព្វបទ​ឈ្មោះ</string>
+  <string name="name_middle">ឈ្មោះ​កណ្ដាល</string>
+  <string name="name_suffix">បច្ច័យ​ឈ្មោះ</string>
+  <string name="name_phonetic">​ឈ្មោះតាមសូរស័ព្ទ</string>
+  <string name="name_phonetic_given">នាម​ខ្លួន​តាម​សូរស័ព្ទ</string>
+  <string name="name_phonetic_middle">​ឈ្មោះ​កណ្ដាលតាមសូរស័ព្ទ</string>
+  <string name="name_phonetic_family">នាមត្រកូល​តាម​សូរស័ព្ទ</string>
+  <string name="phoneLabelsGroup">ទូរស័ព្ទ</string>
+  <string name="emailLabelsGroup">អ៊ីមែល</string>
+  <string name="postalLabelsGroup">អាសយដ្ឋាន</string>
+  <string name="imLabelsGroup">IM</string>
+  <string name="organizationLabelsGroup">ស្ថាប័ន</string>
+  <string name="relationLabelsGroup">ចំណង​ទាក់ទង</string>
+  <string name="eventLabelsGroup">កាលបរិច្ឆេទពិសេស</string>
+  <string name="sms">សារ​​អត្ថបទ</string>
+  <string name="postal_address">អាសយដ្ឋាន</string>
+  <string name="ghostData_company">ក្រុមហ៊ុន</string>
+  <string name="ghostData_title">មុខងារ</string>
+  <string name="label_notes">ចំណាំ</string>
+  <string name="label_sip_address">SIP</string>
+  <string name="websiteLabelsGroup">តំបន់បណ្ដាញ</string>
+  <string name="groupsLabel">ក្រុម</string>
+  <string name="email_home">អ៊ីមែល​ទៅ​ផ្ទះ</string>
+  <string name="email_mobile">អ៊ីមែល​ទៅ​ទូរស័ព្ទ​ចល័ត</string>
+  <string name="email_work">អ៊ីមែល​ទៅ​កន្លែង​ធ្វើការ</string>
+  <string name="email_other">អ៊ីមែល</string>
+  <string name="email_custom">អ៊ីមែល %s</string>
+  <string name="email">អ៊ីមែល</string>
+  <string name="postal_street">ផ្លូវ</string>
+  <string name="postal_city">ទីក្រុង</string>
+  <string name="postal_region">រដ្ឋ</string>
+  <string name="postal_postcode">លេខ​កូដ​តំបន់</string>
+  <string name="postal_country">ប្រទេស</string>
+  <string name="map_home">មើល​អាសយដ្ឋាន​ផ្ទះ</string>
+  <string name="map_work">មើល​អាសយដ្ឋាន​ការងារ</string>
+  <string name="map_other">មើល​អាសយដ្ឋាន</string>
+  <string name="map_custom">មើល​អាសយដ្ឋាន %s</string>
+  <string name="chat_aim">ជជែក​ដោយ​ប្រើ AIM</string>
+  <string name="chat_msn">ជជែក​ដោយ​ប្រើ Windows Live</string>
+  <string name="chat_yahoo">ជជែក​ដោយ​ប្រើ Yahoo</string>
+  <string name="chat_skype">ជជែក​ដោយ​ប្រើ Skype</string>
+  <string name="chat_qq">ជជែក​ដោយ​ប្រើ QQ</string>
+  <string name="chat_gtalk">ជជែក​ដោយ​ប្រើ Google Talk</string>
+  <string name="chat_icq">ជជែក​ដោយ​ប្រើ ICQ</string>
+  <string name="chat_jabber">ជជែក​ដោយ​ប្រើ Jabber</string>
+  <string name="chat">ជជែក​​</string>
+  <string name="list_filter_all_accounts">ទំនាក់ទំនងទាំងអស់</string>
+  <string name="listAllContactsInAccount">ទំនាក់ទំនង​នៅ​ក្នុង %s</string>
+  <string name="listCustomView">ទំនាក់ទំនង​ក្នុង​ទិដ្ឋភាព​ផ្ទាល់ខ្លួន</string>
+  <string name="listSingleContact">ទំនាក់ទំនង​ទោល</string>
+  <string name="display_options_sort_list_by">តម្រៀប​តាម</string>
+  <string name="display_options_sort_by_given_name">នាម​ខ្លួន</string>
+  <string name="display_options_sort_by_family_name">នាមត្រកូល</string>
+  <string name="display_options_view_names_as">ទម្រង់ឈ្មោះ</string>
+  <string name="display_options_view_given_name_first">នាម​ខ្លួន​មុន</string>
+  <string name="display_options_view_family_name_first">នាមត្រកូល​មុន</string>
+  <string name="menu_clear_frequents">សម្អាត​ញឹកញាប់</string>
+  <string name="action_menu_back_from_search">បញ្ឈប់​ការ​ស្វែងរក</string>
+  <string name="description_clear_search">សម្អាត​ការ​ស្វែងរក</string>
+  <string name="select_account_dialog_title">គណនី</string>
+  <string name="set_default_account">ប្រើ​វា​សម្រាប់​ការ​ហៅ​ជា​និច្ច</string>
+  <string name="select_phone_account_for_calls">ជ្រើសរើសស៊ីមសម្រាប់​ការហៅ​ទូរសព្ទ​នេះ</string>
+  <string name="select_phone_account_for_calls_remember">ចងចាំ​ជម្រើស​នេះ</string>
+  <string name="call_with_a_note">ការហៅព្រមជាមួយចំណាំ</string>
+  <string name="call_subject_hint">វាយបញ្ចូលចំណាំដែលត្រូវផ្ញើជាមួយការហៅទូរស័ព្ទ ...</string>
+  <string name="send_and_call_button">ផ្ញើ &amp; ហៅ</string>
+  <string name="call_subject_limit">%1$s / %2$s</string>
+  <string name="old_call_subject_type_and_number">%1$s %2$s</string>
+  <string name="tab_title">ផ្ទាំង %1$s។</string>
+  <plurals name="tab_title_with_unread_items">
+    <item quantity="one">ផ្ទាំង %1$s។ ធាតុមិនទាន់​អាន %2$d </item>
+    <item quantity="other">ផ្ទាំង %1$s។ ធាតុមិនទាន់​អាន %2$d </item>
+  </plurals>
+  <string name="description_search_video_call">ការ​ហៅវីដេអូ</string>
+  <string name="description_search_call_and_share">ចែករំលែក និង​ហៅ​ទូរសព្ទ</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-kn/strings.xml b/java/com/android/contacts/common/res/values-kn/strings.xml
index 08ac7db..61666c2 100644
--- a/java/com/android/contacts/common/res/values-kn/strings.xml
+++ b/java/com/android/contacts/common/res/values-kn/strings.xml
@@ -1,162 +1,145 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="toast_text_copied" msgid="8979281391599667362">"ಪಠ್ಯವನ್ನು ನಕಲಿಸಲಾಗಿದೆ"</string>
-    <string name="call_custom" msgid="3041673234638990874">"<xliff:g id="CUSTOM">%s</xliff:g> ಕರೆ ಮಾಡಿ"</string>
-    <string name="call_home" msgid="125893483593803791">"ಮನೆಗೆ ಕರೆ ಮಾಡಿ"</string>
-    <string name="call_mobile" msgid="967589404494150813">"ಮೊಬೈಲ್‌‌ಗೆ ಕರೆ ಮಾಡಿ"</string>
-    <string name="call_work" msgid="6040550697395300892">"ಕೆಲಸದ ಸಂಖ್ಯೆಗೆ ಕರೆ ಮಾಡಿ"</string>
-    <string name="call_fax_work" msgid="5260192771364592922">"ಕೆಲಸದ ಫ್ಯಾಕ್ಸ್‌‌‌ಗೆ ಕರೆ ಮಾಡಿ"</string>
-    <string name="call_fax_home" msgid="5174311195081144124">"ಮನೆಯ ಫ್ಯಾಕ್ಸ್‌ಗೆ ಕರೆ ಮಾಡಿ"</string>
-    <string name="call_pager" msgid="6814149227741274161">"ಪೇಜರ್‌‌ಗೆ ಕರೆ ಮಾಡಿ"</string>
-    <string name="call_other" msgid="5536385588712587235">"ಕರೆ ಮಾಡು"</string>
-    <string name="call_callback" msgid="6314019862718112786">"ಕಾಲ್‌ಬ್ಯಾಕ್‌ಗೆ ಕರೆ ಮಾಡಿ"</string>
-    <string name="call_car" msgid="3197417098027764954">"ಕಾರ್‌‌ಗೆ ಕರೆ ಮಾಡಿ"</string>
-    <string name="call_company_main" msgid="2557663310028446397">"ಕಂಪನಿಯ ಪ್ರಮುಖ ಸಂಖ್ಯೆಗೆ ಕರೆ ಮಾಡಿ"</string>
-    <string name="call_isdn" msgid="4691270442763649522">"ISDN ಕರೆ ಮಾಡಿ"</string>
-    <string name="call_main" msgid="3293707608770407814">"ಮುಖ್ಯ ಸಂಖ್ಯೆಗೆ ಕರೆ ಮಾಡಿ"</string>
-    <string name="call_other_fax" msgid="4724521984879021465">"ಫ್ಯಾಕ್ಸ್‌‌ಗೆ ಕರೆ ಮಾಡಿ"</string>
-    <string name="call_radio" msgid="8942441419845057942">"ರೇಡಿಯೋಗೆ ಕರೆ ಮಾಡಿ"</string>
-    <string name="call_telex" msgid="2031514461660668351">"ಟೆಲೆಕ್ಸ್‌‌‌ಗೆ ಕರೆ ಮಾಡಿ"</string>
-    <string name="call_tty_tdd" msgid="7807210224965727701">"TTY/TDD ಕರೆ ಮಾಡಿ"</string>
-    <string name="call_work_mobile" msgid="2716342732938578495">"ಕೆಲಸದ ಮೊಬೈಲ್‌‌ಗೆ ಕರೆ ಮಾಡಿ"</string>
-    <string name="call_work_pager" msgid="3791778749827366574">"ಕೆಲಸದ ಪೇಜರ್‌‌ಗೆ ಕರೆ ಮಾಡಿ"</string>
-    <string name="call_assistant" msgid="4177478845473789294">"<xliff:g id="ASSISTANT">%s</xliff:g> ಕರೆ ಮಾಡಿ"</string>
-    <string name="call_mms" msgid="4958811711741872901">"MMS ಕರೆ ಮಾಡಿ"</string>
-    <string name="sms_custom" msgid="8785368968605026317">"<xliff:g id="CUSTOM">%s</xliff:g> ಗೆ ಸಂದೇಶ ಮಾಡಿ"</string>
-    <string name="sms_home" msgid="3527719551060295243">"ನಿವಾಸಕ್ಕೆ ಸಂದೇಶ ಮಾಡಿ"</string>
-    <string name="sms_mobile" msgid="8883045857887736518">"ಮೊಬೈಲ್‌‌ಗೆ ಸಂದೇಶ ಮಾಡಿ"</string>
-    <string name="sms_work" msgid="4158595439553450966">"ಕೆಲಸದ ಸಂಖ್ಯೆಗೆ ಸಂದೇಶ ಮಾಡಿ"</string>
-    <string name="sms_fax_work" msgid="5483726627718055248">"ಕೆಲಸದ ಫ್ಯಾಕ್ಸ್‌‌ಗೆ ಸಂದೇಶ ಮಾಡಿ"</string>
-    <string name="sms_fax_home" msgid="9219265155770746077">"ಮನೆಯ ಫ್ಯಾಕ್ಸ್‌‌‌ಗೆ ಸಂದೇಶ ಮಾಡಿ"</string>
-    <string name="sms_pager" msgid="4901085068525193933">"ಪೇಜರ್‌‌ಗೆ ಸಂದೇಶ ಮಾಡಿ"</string>
-    <string name="sms_other" msgid="1742702947993285933">"ಪಠ್ಯ"</string>
-    <string name="sms_callback" msgid="5833483630377538308">"ಕಾಲ್‌ಬ್ಯಾಕ್‌ಗೆ ಸಂದೇಶ ಮಾಡಿ"</string>
-    <string name="sms_car" msgid="4314577266154395174">"ಕಾರ್‌ನ ಸಂಖ್ಯೆಗೆ ಸಂದೇಶ ಮಾಡಿ"</string>
-    <string name="sms_company_main" msgid="2308160928487360705">"ಕಂಪನಿಯ ಮುಖ್ಯ ಸಂಖ್ಯೆಗೆ ಸಂದೇಶ ಮಾಡಿ"</string>
-    <string name="sms_isdn" msgid="6394300346179302542">"ISDN ಗೆ ಸಂದೇಶ ಮಾಡಿ"</string>
-    <string name="sms_main" msgid="8908087742014140774">"ಮುಖ್ಯ ಸಂಖ್ಯೆಗೆ ಸಂದೇಶ ಮಾಡಿ"</string>
-    <string name="sms_other_fax" msgid="8768455473295405427">"ಫ್ಯಾಕ್ಸ್‌‌‌ಗೆ ಸಂದೇಶ ಮಾಡಿ"</string>
-    <string name="sms_radio" msgid="855555176531704682">"ರೇಡಿಯೋ ಸಂಖ್ಯೆಗೆ ಸಂದೇಶ ಮಾಡಿ"</string>
-    <string name="sms_telex" msgid="6269029276223252719">"ಟೆಲೆಕ್ಸ್‌‌‌ಗೆ ಸಂದೇಶ ಮಾಡಿ"</string>
-    <string name="sms_tty_tdd" msgid="6229057354509192444">"TTY/TDD ಗೆ ಸಂದೇಶ ಮಾಡಿ"</string>
-    <string name="sms_work_mobile" msgid="2155975469329969840">"ಕೆಲಸದದ ಮೊಬೈಲ್‌‌ಗೆ ಸಂದೇಶ ಮಾಡಿ"</string>
-    <string name="sms_work_pager" msgid="8500140274906830742">"ಕೆಲಸದ ಪೇಜರ್‌‌ಗೆ ಸಂದೇಶ ಮಾಡಿ"</string>
-    <string name="sms_assistant" msgid="8513548482745330818">"<xliff:g id="ASSISTANT">%s</xliff:g> ಗೆ ಸಂದೇಶ ಮಾಡಿ"</string>
-    <string name="sms_mms" msgid="5187888900503248542">"MMS ಸಂದೇಶ ಮಾಡಿ"</string>
-    <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"ಪದೇ ಪದೇ ಸಂಪರ್ಕಿಸಿರುವುದನ್ನು ತೆರುವುಗೊಳಿಸುವುದೇ?"</string>
-    <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"ಸಂಪರ್ಕಗಳು ಮತ್ತು ಫೋನ್‌ ಅಪ್ಲಿಕೇಶನ್‌ಗಳಲ್ಲಿ ಪದೇ ಪದೇ ಸಂಪರ್ಕಪಡಿಸಿರುವ ಪಟ್ಟಿಯನ್ನು ನೀವು ತೆರುವುಗೊಳಿಸುತ್ತೀರಿ ಮತ್ತು ಮೊದಲಿನಿಂದ ನಿಮ್ಮ ವಿಳಾಸ ಪ್ರಾಶಸ್ತ್ಯಗಳನ್ನು ತಿಳಿಯಲು ಇಮೇಲ್‌ ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ಒತ್ತಾಯಿಸಿ."</string>
-    <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"ಪದೇ ಪದೇ ಸಂಪರ್ಕಿಸಿರುವುದನ್ನು ತೆರುವುಗೊಳಿಸಲಾಗುತ್ತಿದೆ…"</string>
-    <string name="status_available" msgid="2648156525685472626">"ಲಭ್ಯವಿದೆ"</string>
-    <string name="status_away" msgid="2298688367552893953">"ದೂರ"</string>
-    <string name="status_busy" msgid="5990832098713248503">"ಕಾರ್ಯನಿರತ"</string>
-    <string name="contactsList" msgid="8806067891419291513">"ಸಂಪರ್ಕಗಳು"</string>
-    <string name="contact_suggestions" msgid="3324166754807120006">"ಉನ್ನತ ಸಲಹೆ"</string>
-    <string name="local_invisible_directory" msgid="4723238462733650090">"ಇತರೆ"</string>
-    <string name="directory_search_label" msgid="4621215895484025229">"ಡೈರೆಕ್ಟರಿ"</string>
-    <string name="directory_search_label_work" msgid="7679326282707414897">"ಕೆಲಸದ ಡೈರೆಕ್ಟರಿ"</string>
-    <string name="local_search_label" msgid="907622822323119235">"ಎಲ್ಲಾ ಸಂಪರ್ಕಗಳು"</string>
-    <string name="local_suggestions_search_label" msgid="1178575146224386118">"ಸಲಹೆಗಳು"</string>
-    <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"ನಾನು"</string>
-    <string name="missing_name" msgid="978606963362745020">"(ಯಾವುದೇ ಹೆಸರಿಲ್ಲ)"</string>
-    <string name="description_view_contact_detail" msgid="2428742401208561136">"ಸಂಪರ್ಕವನ್ನು ವೀಕ್ಷಿಸಿ"</string>
-    <string name="list_filter_phones" msgid="8763316061763437182">"ಫೋನ್‌ ಸಂಖ್ಯೆಗಳೊಂದಿಗೆ ಎಲ್ಲ ಸಂಪರ್ಕಗಳು"</string>
-    <string name="list_filter_phones_work" msgid="7083575404573422965">"ಕೆಲಸದ ಪ್ರೊಫೈಲ್ ಸಂಪರ್ಕಗಳು"</string>
-    <string name="view_updates_from_group" msgid="9011641093168385729">"ನವೀಕರಣಗಳನ್ನು ವೀಕ್ಷಿಸಿ"</string>
-    <string name="account_phone" msgid="7067809073194061035">"ಸಾಧನ-ಮಾತ್ರ, ಸಿಂಕ್ ಮಾಡಲಾಗದಿರುವುದು"</string>
-    <string name="nameLabelsGroup" msgid="7730465833159557471">"ಹೆಸರು"</string>
-    <string name="nicknameLabelsGroup" msgid="6310556912361840029">"ಅಡ್ಡಹೆಸರು"</string>
-    <string name="full_name" msgid="648186563998465740">"ಹೆಸರು"</string>
-    <string name="name_given" msgid="5096576006314820536">"ಮೊದಲ ಹೆಸರು"</string>
-    <string name="name_family" msgid="6646235805198547467">"ಕೊನೆಯ ಹೆಸರು"</string>
-    <string name="name_prefix" msgid="9215326539658838">"ಹೆಸರಿನ ಪೂರ್ವಪ್ರತ್ಯಯ"</string>
-    <string name="name_middle" msgid="703755205331582769">"ಮಧ್ಯದ ಹೆಸರು"</string>
-    <string name="name_suffix" msgid="5777083390282548702">"ಹೆಸರಿನ ಪ್ರತ್ಯಯ"</string>
-    <string name="name_phonetic" msgid="1650870996361663089">"ಫೋನೆಟಿಕ್‌‌ ಹೆಸರು"</string>
-    <string name="name_phonetic_given" msgid="618812334274603170">"ಫೋನೆಟಿಕ್‌ ಮೊದಲ ಹೆಸರು"</string>
-    <string name="name_phonetic_middle" msgid="4826820763384625538">"ಫೋನೆಟಿಕ್‌‌ ಮಧ್ಯ ಹೆಸರು"</string>
-    <string name="name_phonetic_family" msgid="379905191212930771">"ಫೋನೆಟಿಕ್‌‌ ಕೊನೆಯ ಹೆಸರು"</string>
-    <string name="phoneLabelsGroup" msgid="169661929021355548">"ಫೋನ್"</string>
-    <string name="emailLabelsGroup" msgid="2249752810477488833">"ಇಮೇಲ್"</string>
-    <string name="postalLabelsGroup" msgid="6772000590189142253">"ವಿಳಾಸ"</string>
-    <string name="imLabelsGroup" msgid="5718066254237364731">"IM"</string>
-    <string name="organizationLabelsGroup" msgid="1101996309241601435">"ಸಂಘಟನೆ"</string>
-    <string name="relationLabelsGroup" msgid="53866051664600053">"ಸಂಬಂಧ"</string>
-    <string name="eventLabelsGroup" msgid="1236970042646618489">"ವಿಶೇಷ ದಿನಾಂಕ"</string>
-    <string name="sms" msgid="7574344928185328095">"ಪಠ್ಯ ಸಂದೇಶ"</string>
-    <string name="postal_address" msgid="1804707930129674200">"ವಿಳಾಸ"</string>
-    <string name="ghostData_company" msgid="2554310786296833424">"ಕಂಪನಿ"</string>
-    <string name="ghostData_title" msgid="4994968731830184837">"ಶೀರ್ಷಿಕೆ"</string>
-    <string name="label_notes" msgid="2050255313694219786">"ಟಿಪ್ಪಣಿಗಳು"</string>
-    <string name="label_sip_address" msgid="8883266182575965926">"ಎಸ್‌ಐಪಿ"</string>
-    <string name="websiteLabelsGroup" msgid="1630734286462186790">"ವೆಬ್‌ಸೈಟ್"</string>
-    <string name="groupsLabel" msgid="2694002798416868728">"ಗುಂಪುಗಳು"</string>
-    <string name="email_home" msgid="889830029388962171">"ಮನೆಗೆ ಇಮೇಲ್‌ ಮಾಡಿ"</string>
-    <string name="email_mobile" msgid="4487686436743741150">"ಮೊಬೈಲ್‌‌ಗೆ ಇಮೇಲ್‌ ಮಾಡಿ"</string>
-    <string name="email_work" msgid="4223487303344613528">"ಕೆಲಸದ ವಿಳಾಸಕ್ಕೆ ಇಮೇಲ್‌ ಮಾಡಿ"</string>
-    <string name="email_other" msgid="4246411900126012062">"ಇಮೇಲ್"</string>
-    <string name="email_custom" msgid="7246580894327511013">"<xliff:g id="CUSTOM">%s</xliff:g> ಇಮೇಲ್‌ ಮಾಡಿ"</string>
-    <string name="email" msgid="2807318537887091606">"ಇಮೇಲ್"</string>
-    <string name="postal_street" msgid="6918171741240802474">"ಗಲ್ಲಿ"</string>
-    <string name="postal_city" msgid="8674569121430005628">"ನಗರ"</string>
-    <string name="postal_region" msgid="1730369286225469192">"ರಾಜ್ಯ"</string>
-    <string name="postal_postcode" msgid="4450700741261990439">"ಪಿನ್ ಕೋಡ್"</string>
-    <string name="postal_country" msgid="232670707458768148">"ದೇಶ"</string>
-    <string name="map_home" msgid="4181131107392126938">"ಮನೆಯ ವಿಳಾಸವನ್ನು ವೀಕ್ಷಿಸಿ"</string>
-    <string name="map_work" msgid="5723471185992684400">"ಕೆಲಸದ ವಿಳಾಸವನ್ನು ವೀಕ್ಷಿಸಿ"</string>
-    <string name="map_other" msgid="2253764780863500516">"ವಿಳಾಸವನ್ನು ವೀಕ್ಷಿಸಿ"</string>
-    <string name="map_custom" msgid="5581743097882436157">"<xliff:g id="CUSTOM">%s</xliff:g> ವಿಳಾಸವನ್ನು ವೀಕ್ಷಿಸಿ"</string>
-    <string name="chat_aim" msgid="2954364435497941659">"AIM ಬಳಸಿಕೊಂಡು ಚಾಟ್‌ ಮಾಡಿ"</string>
-    <string name="chat_msn" msgid="3130135239071228678">"Windows Live ಬಳಸಿಕೊಂಡು ಚಾಟ್‌ ಮಾಡಿ"</string>
-    <string name="chat_yahoo" msgid="3233552142326865347">"Yahoo ಬಳಸಿಕೊಂಡು ಚಾಟ್‌ ಮಾಡಿ"</string>
-    <string name="chat_skype" msgid="6486703981390592425">"Skype ಬಳಸಿಕೊಂಡು ಚಾಟ್‌ ಮಾಡಿ"</string>
-    <string name="chat_qq" msgid="786924280665740019">"QQ ಬಳಸಿಕೊಂಡು ಚಾಟ್‌ ಮಾಡಿ"</string>
-    <string name="chat_gtalk" msgid="7914674177243078035">"Google Talk ಬಳಸಿಕೊಂಡು ಚಾಟ್‌ ಮಾಡಿ"</string>
-    <string name="chat_icq" msgid="3292934726414765801">"ICQ ಬಳಸಿಕೊಂಡು ಚಾಟ್‌ ಮಾಡಿ"</string>
-    <string name="chat_jabber" msgid="6701542313597880204">"Jabber ಬಳಸಿಕೊಂಡು ಚಾಟ್‌ ಮಾಡಿ"</string>
-    <string name="chat" msgid="1020428260359370236">"ಚಾಟ್"</string>
-    <string name="list_filter_all_accounts" msgid="473782314881473992">"ಎಲ್ಲ ಸಂಪರ್ಕಗಳು"</string>
-    <string name="listAllContactsInAccount" msgid="3486378621592995630">"<xliff:g id="NAME">%s</xliff:g> ನಲ್ಲಿ ಸಂಪರ್ಕಗಳು"</string>
-    <string name="listCustomView" msgid="5306282632413086731">"ಕಸ್ಟಮ್‌ ವೀಕ್ಷಣೆಯಲ್ಲಿನ ಸಂಪರ್ಕಗಳು"</string>
-    <string name="listSingleContact" msgid="8620818791932382627">"ಏಕೈಕ ಸಂಪರ್ಕ"</string>
-    <string name="display_options_sort_list_by" msgid="3541875948367831228">"ಈ ಪ್ರಕಾರ ವಿಂಗಡಿಸು"</string>
-    <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"ಮೊದಲ ಹೆಸರು"</string>
-    <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"ಕೊನೆಯ ಹೆಸರು"</string>
-    <string name="display_options_view_names_as" msgid="4204204205736735618">"ಹೆಸರಿನ ಫಾರ್ಮ್ಯಾಟ್‌"</string>
-    <string name="display_options_view_given_name_first" msgid="2308026973021171020">"ಮೊದಲ ಹೆಸರು ಮೊದಲು"</string>
-    <string name="display_options_view_family_name_first" msgid="987430497292428242">"ಕೊನೆಯ ಹೆಸರು ಮೊದಲು"</string>
-    <string name="menu_clear_frequents" msgid="5358271535047496120">"ಪುನರಾವರ್ತನೆಗಳನ್ನು ತೆರುವುಗೊಳಿಸಿ"</string>
-    <string name="action_menu_back_from_search" msgid="3550669942742167644">"ಹುಡುಕಾಟವನ್ನು ನಿಲ್ಲಿಸಿ"</string>
-    <string name="description_clear_search" msgid="2347258825265600782">"ಹುಡುಕಾಟವನ್ನು ತೆರವುಗೊಳಿಸಿ"</string>
-    <string name="select_account_dialog_title" msgid="2673504582803359239">"ಖಾತೆ"</string>
-    <string name="set_default_account" msgid="7966099951006467572">"ಕರೆಗಳನ್ನು ಮಾಡಲು ಯಾವಾಗಲೂ ಇದನ್ನು ಬಳಸಿ"</string>
-    <string name="select_phone_account_for_calls" msgid="1784460686103423274">"ಇದರೊಂದಿಗೆ ಕರೆ ಮಾಡಿ"</string>
-    <string name="call_with_a_note" msgid="6242261320491851133">"ಟಿಪ್ಪಣಿಯೊಂದಿಗೆ ಕರೆ"</string>
-    <string name="call_subject_hint" msgid="7233138753650420800">"ಕರೆ ಕಳುಹಿಸಲು ಟಿಪ್ಪಣಿಯನ್ನು ಟೈಪ್ ಮಾಡಿ ..."</string>
-    <string name="send_and_call_button" msgid="4735168294120154013">"ಕಳುಹಿಸು ಮತ್ತು ಕರೆಮಾಡು"</string>
-    <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="tab_title" msgid="3387876802026074288">"<xliff:g id="TITLE">%1$s</xliff:g> ಟ್ಯಾಬ್."</string>
-    <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
-      <item quantity="one"> <xliff:g id="TITLE_2">%1$s</xliff:g> ಟ್ಯಾಬ್. <xliff:g id="COUNT_3">%2$d</xliff:g> ಓದದಿರುವ ಐಟಂಗಳು. </item>
-      <item quantity="other"> <xliff:g id="TITLE_2">%1$s</xliff:g> ಟ್ಯಾಬ್. <xliff:g id="COUNT_3">%2$d</xliff:g> ಓದದಿರುವ ಐಟಂಗಳು. </item>
-    </plurals>
-    <string name="description_search_video_call" msgid="4337369876888024909">"ವೀಡಿಯೊ ಕರೆ"</string>
-    <string name="description_search_call_and_share" msgid="4912772842755050467">"ಹಂಚಿಕೊಳ್ಳಿ ಮತ್ತು ಕರೆ ಮಾಡಿ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_custom">%s ಕರೆ ಮಾಡಿ</string>
+  <string name="call_home">ಮನೆಗೆ ಕರೆ ಮಾಡಿ</string>
+  <string name="call_mobile">ಮೊಬೈಲ್‌‌ಗೆ ಕರೆ ಮಾಡಿ</string>
+  <string name="call_work">ಕೆಲಸದ ಸಂಖ್ಯೆಗೆ ಕರೆ ಮಾಡಿ</string>
+  <string name="call_fax_work">ಕೆಲಸದ ಫ್ಯಾಕ್ಸ್‌‌‌ಗೆ ಕರೆ ಮಾಡಿ</string>
+  <string name="call_fax_home">ಮನೆಯ ಫ್ಯಾಕ್ಸ್‌ಗೆ ಕರೆ ಮಾಡಿ</string>
+  <string name="call_pager">ಪೇಜರ್‌‌ಗೆ ಕರೆ ಮಾಡಿ</string>
+  <string name="call_other">ಕರೆ ಮಾಡು</string>
+  <string name="call_callback">ಕಾಲ್‌ಬ್ಯಾಕ್‌ಗೆ ಕರೆ ಮಾಡಿ</string>
+  <string name="call_car">ಕಾರ್‌‌ಗೆ ಕರೆ ಮಾಡಿ</string>
+  <string name="call_company_main">ಕಂಪನಿಯ ಪ್ರಮುಖ ಸಂಖ್ಯೆಗೆ ಕರೆ ಮಾಡಿ</string>
+  <string name="call_isdn">ISDN ಕರೆ ಮಾಡಿ</string>
+  <string name="call_main">ಮುಖ್ಯ ಸಂಖ್ಯೆಗೆ ಕರೆ ಮಾಡಿ</string>
+  <string name="call_other_fax">ಫ್ಯಾಕ್ಸ್‌‌ಗೆ ಕರೆ ಮಾಡಿ</string>
+  <string name="call_radio">ರೇಡಿಯೋಗೆ ಕರೆ ಮಾಡಿ</string>
+  <string name="call_telex">ಟೆಲೆಕ್ಸ್‌‌‌ಗೆ ಕರೆ ಮಾಡಿ</string>
+  <string name="call_tty_tdd">TTY/TDD ಕರೆ ಮಾಡಿ</string>
+  <string name="call_work_mobile">ಕೆಲಸದ ಮೊಬೈಲ್‌‌ಗೆ ಕರೆ ಮಾಡಿ</string>
+  <string name="call_work_pager">ಕೆಲಸದ ಪೇಜರ್‌‌ಗೆ ಕರೆ ಮಾಡಿ</string>
+  <string name="call_assistant">%s ಕರೆ ಮಾಡಿ</string>
+  <string name="call_mms">MMS ಕರೆ ಮಾಡಿ</string>
+  <string name="sms_custom">%s ಗೆ ಸಂದೇಶ ಮಾಡಿ</string>
+  <string name="sms_home">ನಿವಾಸಕ್ಕೆ ಸಂದೇಶ ಮಾಡಿ</string>
+  <string name="sms_mobile">ಮೊಬೈಲ್‌‌ಗೆ ಸಂದೇಶ ಮಾಡಿ</string>
+  <string name="sms_work">ಕೆಲಸದ ಸಂಖ್ಯೆಗೆ ಸಂದೇಶ ಮಾಡಿ</string>
+  <string name="sms_fax_work">ಕೆಲಸದ ಫ್ಯಾಕ್ಸ್‌‌ಗೆ ಸಂದೇಶ ಮಾಡಿ</string>
+  <string name="sms_fax_home">ಮನೆಯ ಫ್ಯಾಕ್ಸ್‌‌‌ಗೆ ಸಂದೇಶ ಮಾಡಿ</string>
+  <string name="sms_pager">ಪೇಜರ್‌‌ಗೆ ಸಂದೇಶ ಮಾಡಿ</string>
+  <string name="sms_other">ಪಠ್ಯ</string>
+  <string name="sms_callback">ಕಾಲ್‌ಬ್ಯಾಕ್‌ಗೆ ಸಂದೇಶ ಮಾಡಿ</string>
+  <string name="sms_car">ಕಾರ್‌ನ ಸಂಖ್ಯೆಗೆ ಸಂದೇಶ ಮಾಡಿ</string>
+  <string name="sms_company_main">ಕಂಪನಿಯ ಮುಖ್ಯ ಸಂಖ್ಯೆಗೆ ಸಂದೇಶ ಮಾಡಿ</string>
+  <string name="sms_isdn">ISDN ಗೆ ಸಂದೇಶ ಮಾಡಿ</string>
+  <string name="sms_main">ಮುಖ್ಯ ಸಂಖ್ಯೆಗೆ ಸಂದೇಶ ಮಾಡಿ</string>
+  <string name="sms_other_fax">ಫ್ಯಾಕ್ಸ್‌‌‌ಗೆ ಸಂದೇಶ ಮಾಡಿ</string>
+  <string name="sms_radio">ರೇಡಿಯೋ ಸಂಖ್ಯೆಗೆ ಸಂದೇಶ ಮಾಡಿ</string>
+  <string name="sms_telex">ಟೆಲೆಕ್ಸ್‌‌‌ಗೆ ಸಂದೇಶ ಮಾಡಿ</string>
+  <string name="sms_tty_tdd">TTY/TDD ಗೆ ಸಂದೇಶ ಮಾಡಿ</string>
+  <string name="sms_work_mobile">ಕೆಲಸದದ ಮೊಬೈಲ್‌‌ಗೆ ಸಂದೇಶ ಮಾಡಿ</string>
+  <string name="sms_work_pager">ಕೆಲಸದ ಪೇಜರ್‌‌ಗೆ ಸಂದೇಶ ಮಾಡಿ</string>
+  <string name="sms_assistant">%s ಗೆ ಸಂದೇಶ ಮಾಡಿ</string>
+  <string name="sms_mms">MMS ಸಂದೇಶ ಮಾಡಿ</string>
+  <string name="clearFrequentsConfirmation_title">ಪದೇ ಪದೇ ಸಂಪರ್ಕಿಸಿರುವುದನ್ನು ತೆರುವುಗೊಳಿಸುವುದೇ?</string>
+  <string name="clearFrequentsConfirmation">ಸಂಪರ್ಕಗಳು ಮತ್ತು ಫೋನ್‌ ಅಪ್ಲಿಕೇಶನ್‌ಗಳಲ್ಲಿ ಪದೇ ಪದೇ ಸಂಪರ್ಕಪಡಿಸಿರುವ ಪಟ್ಟಿಯನ್ನು ನೀವು ತೆರುವುಗೊಳಿಸುತ್ತೀರಿ ಮತ್ತು ಮೊದಲಿನಿಂದ ನಿಮ್ಮ ವಿಳಾಸ ಪ್ರಾಶಸ್ತ್ಯಗಳನ್ನು ತಿಳಿಯಲು ಇಮೇಲ್‌ ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ಒತ್ತಾಯಿಸಿ.</string>
+  <string name="clearFrequentsProgress_title">ಪದೇ ಪದೇ ಸಂಪರ್ಕಿಸಿರುವುದನ್ನು ತೆರುವುಗೊಳಿಸಲಾಗುತ್ತಿದೆ…</string>
+  <string name="status_available">ಲಭ್ಯವಿದೆ</string>
+  <string name="status_away">ದೂರ</string>
+  <string name="status_busy">ಕಾರ್ಯನಿರತ</string>
+  <string name="contactsList">ಸಂಪರ್ಕಗಳು</string>
+  <string name="contact_suggestions">ಉನ್ನತ ಸಲಹೆ</string>
+  <string name="local_invisible_directory">ಇತರೆ</string>
+  <string name="directory_search_label">ಡೈರೆಕ್ಟರಿ</string>
+  <string name="directory_search_label_work">ಕೆಲಸದ ಡೈರೆಕ್ಟರಿ</string>
+  <string name="local_search_label">ಎಲ್ಲಾ ಸಂಪರ್ಕಗಳು</string>
+  <string name="local_suggestions_search_label">ಸಲಹೆಗಳು</string>
+  <string msgid="9154761216179882405" name="user_profile_contacts_list_header">ನಾನು</string>
+  <string name="missing_name">(ಯಾವುದೇ ಹೆಸರಿಲ್ಲ)</string>
+  <string msgid="2795575601596468581" name="description_view_contact_detail">ಸಂಪರ್ಕವನ್ನು ವೀಕ್ಷಿಸಿ</string>
+  <string name="list_filter_phones">ಫೋನ್‌ ಸಂಖ್ಯೆಗಳೊಂದಿಗೆ ಎಲ್ಲ ಸಂಪರ್ಕಗಳು</string>
+  <string name="list_filter_phones_work">ಕೆಲಸದ ಪ್ರೊಫೈಲ್ ಸಂಪರ್ಕಗಳು</string>
+  <string name="view_updates_from_group">ನವೀಕರಣಗಳನ್ನು ವೀಕ್ಷಿಸಿ</string>
+  <string name="account_phone">ಸಾಧನ-ಮಾತ್ರ, ಸಿಂಕ್ ಮಾಡಲಾಗದಿರುವುದು</string>
+  <string name="nameLabelsGroup">ಹೆಸರು</string>
+  <string name="nicknameLabelsGroup">ಅಡ್ಡಹೆಸರು</string>
+  <string name="full_name">ಹೆಸರು</string>
+  <string name="name_given">ಮೊದಲ ಹೆಸರು</string>
+  <string name="name_family">ಕೊನೆಯ ಹೆಸರು</string>
+  <string name="name_prefix">ಹೆಸರಿನ ಪೂರ್ವಪ್ರತ್ಯಯ</string>
+  <string name="name_middle">ಮಧ್ಯದ ಹೆಸರು</string>
+  <string name="name_suffix">ಹೆಸರಿನ ಪ್ರತ್ಯಯ</string>
+  <string name="name_phonetic">ಫೋನೆಟಿಕ್‌‌ ಹೆಸರು</string>
+  <string name="name_phonetic_given">ಫೋನೆಟಿಕ್‌ ಮೊದಲ ಹೆಸರು</string>
+  <string name="name_phonetic_middle">ಫೋನೆಟಿಕ್‌‌ ಮಧ್ಯ ಹೆಸರು</string>
+  <string name="name_phonetic_family">ಫೋನೆಟಿಕ್‌‌ ಕೊನೆಯ ಹೆಸರು</string>
+  <string name="phoneLabelsGroup">ಫೋನ್</string>
+  <string name="emailLabelsGroup">ಇಮೇಲ್</string>
+  <string name="postalLabelsGroup">ವಿಳಾಸ</string>
+  <string name="imLabelsGroup">IM</string>
+  <string name="organizationLabelsGroup">ಸಂಘಟನೆ</string>
+  <string name="relationLabelsGroup">ಸಂಬಂಧ</string>
+  <string name="eventLabelsGroup">ವಿಶೇಷ ದಿನಾಂಕ</string>
+  <string name="sms">ಪಠ್ಯ ಸಂದೇಶ</string>
+  <string name="postal_address">ವಿಳಾಸ</string>
+  <string name="ghostData_company">ಕಂಪನಿ</string>
+  <string name="ghostData_title">ಶೀರ್ಷಿಕೆ</string>
+  <string name="label_notes">ಟಿಪ್ಪಣಿಗಳು</string>
+  <string name="label_sip_address">ಎಸ್‌ಐಪಿ</string>
+  <string name="websiteLabelsGroup">ವೆಬ್‌ಸೈಟ್</string>
+  <string name="groupsLabel">ಗುಂಪುಗಳು</string>
+  <string name="email_home">ಮನೆಗೆ ಇಮೇಲ್‌ ಮಾಡಿ</string>
+  <string name="email_mobile">ಮೊಬೈಲ್‌‌ಗೆ ಇಮೇಲ್‌ ಮಾಡಿ</string>
+  <string name="email_work">ಕೆಲಸದ ವಿಳಾಸಕ್ಕೆ ಇಮೇಲ್‌ ಮಾಡಿ</string>
+  <string name="email_other">ಇಮೇಲ್</string>
+  <string name="email_custom">%s ಇಮೇಲ್‌ ಮಾಡಿ</string>
+  <string name="email">ಇಮೇಲ್</string>
+  <string name="postal_street">ಗಲ್ಲಿ</string>
+  <string name="postal_city">ನಗರ</string>
+  <string name="postal_region">ರಾಜ್ಯ</string>
+  <string name="postal_postcode">ಪಿನ್ ಕೋಡ್</string>
+  <string name="postal_country">ದೇಶ</string>
+  <string name="map_home">ಮನೆಯ ವಿಳಾಸವನ್ನು ವೀಕ್ಷಿಸಿ</string>
+  <string name="map_work">ಕೆಲಸದ ವಿಳಾಸವನ್ನು ವೀಕ್ಷಿಸಿ</string>
+  <string name="map_other">ವಿಳಾಸವನ್ನು ವೀಕ್ಷಿಸಿ</string>
+  <string name="map_custom">%s ವಿಳಾಸವನ್ನು ವೀಕ್ಷಿಸಿ</string>
+  <string name="chat_aim">AIM ಬಳಸಿಕೊಂಡು ಚಾಟ್‌ ಮಾಡಿ</string>
+  <string name="chat_msn">Windows Live ಬಳಸಿಕೊಂಡು ಚಾಟ್‌ ಮಾಡಿ</string>
+  <string name="chat_yahoo">Yahoo ಬಳಸಿಕೊಂಡು ಚಾಟ್‌ ಮಾಡಿ</string>
+  <string name="chat_skype">Skype ಬಳಸಿಕೊಂಡು ಚಾಟ್‌ ಮಾಡಿ</string>
+  <string name="chat_qq">QQ ಬಳಸಿಕೊಂಡು ಚಾಟ್‌ ಮಾಡಿ</string>
+  <string name="chat_gtalk">Google Talk ಬಳಸಿಕೊಂಡು ಚಾಟ್‌ ಮಾಡಿ</string>
+  <string name="chat_icq">ICQ ಬಳಸಿಕೊಂಡು ಚಾಟ್‌ ಮಾಡಿ</string>
+  <string name="chat_jabber">Jabber ಬಳಸಿಕೊಂಡು ಚಾಟ್‌ ಮಾಡಿ</string>
+  <string name="chat">ಚಾಟ್</string>
+  <string name="list_filter_all_accounts">ಎಲ್ಲ ಸಂಪರ್ಕಗಳು</string>
+  <string name="listAllContactsInAccount">%s ನಲ್ಲಿ ಸಂಪರ್ಕಗಳು</string>
+  <string name="listCustomView">ಕಸ್ಟಮ್‌ ವೀಕ್ಷಣೆಯಲ್ಲಿನ ಸಂಪರ್ಕಗಳು</string>
+  <string name="listSingleContact">ಏಕೈಕ ಸಂಪರ್ಕ</string>
+  <string name="display_options_sort_list_by">ಈ ಪ್ರಕಾರ ವಿಂಗಡಿಸು</string>
+  <string name="display_options_sort_by_given_name">ಮೊದಲ ಹೆಸರು</string>
+  <string name="display_options_sort_by_family_name">ಕೊನೆಯ ಹೆಸರು</string>
+  <string name="display_options_view_names_as">ಹೆಸರಿನ ಫಾರ್ಮ್ಯಾಟ್‌</string>
+  <string name="display_options_view_given_name_first">ಮೊದಲ ಹೆಸರು ಮೊದಲು</string>
+  <string name="display_options_view_family_name_first">ಕೊನೆಯ ಹೆಸರು ಮೊದಲು</string>
+  <string name="menu_clear_frequents">ಪುನರಾವರ್ತನೆಗಳನ್ನು ತೆರುವುಗೊಳಿಸಿ</string>
+  <string name="action_menu_back_from_search">ಹುಡುಕಾಟವನ್ನು ನಿಲ್ಲಿಸಿ</string>
+  <string name="description_clear_search">ಹುಡುಕಾಟವನ್ನು ತೆರವುಗೊಳಿಸಿ</string>
+  <string name="select_account_dialog_title">ಖಾತೆ</string>
+  <string name="set_default_account">ಕರೆಗಳನ್ನು ಮಾಡಲು ಯಾವಾಗಲೂ ಇದನ್ನು ಬಳಸಿ</string>
+  <string name="select_phone_account_for_calls">ಈ ಕರೆಗಾಗಿ ಸಿಮ್ ಆರಿಸಿ</string>
+  <string name="select_phone_account_for_calls_remember">ಈ ಆಯ್ಕೆಯನ್ನು ನೆನಪಿಡಿ</string>
+  <string name="call_with_a_note">ಟಿಪ್ಪಣಿಯೊಂದಿಗೆ ಕರೆ</string>
+  <string name="call_subject_hint">ಕರೆ ಕಳುಹಿಸಲು ಟಿಪ್ಪಣಿಯನ್ನು ಟೈಪ್ ಮಾಡಿ ...</string>
+  <string name="send_and_call_button">ಕಳುಹಿಸು ಮತ್ತು ಕರೆಮಾಡು</string>
+  <string name="call_subject_limit">%1$s / %2$s</string>
+  <string name="old_call_subject_type_and_number">%1$s %2$s</string>
+  <string name="tab_title">%1$s ಟ್ಯಾಬ್.</string>
+  <plurals name="tab_title_with_unread_items">
+    <item quantity="one"> %1$s ಟ್ಯಾಬ್. %2$d ಓದದಿರುವ ಐಟಂಗಳು. </item>
+    <item quantity="other"> %1$s ಟ್ಯಾಬ್. %2$d ಓದದಿರುವ ಐಟಂಗಳು. </item>
+  </plurals>
+  <string name="description_search_video_call">ವೀಡಿಯೊ ಕರೆ</string>
+  <string name="description_search_call_and_share">ಹಂಚಿಕೊಳ್ಳಿ ಮತ್ತು ಕರೆ ಮಾಡಿ</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-ko/donottranslate_config.xml b/java/com/android/contacts/common/res/values-ko/donottranslate_config.xml
deleted file mode 100644
index 8def554..0000000
--- a/java/com/android/contacts/common/res/values-ko/donottranslate_config.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  <!-- If true, an option is shown in Display Options UI to choose a sort order -->
-  <bool name="config_sort_order_user_changeable">false</bool>
-
-  <!-- If true, the default sort order is primary (i.e. by given name) -->
-  <bool name="config_default_sort_order_primary">false</bool>
-
-  <!-- If true, an option is shown in Display Options UI to choose a name display order -->
-  <bool name="config_display_order_user_changeable">false</bool>
-
-  <!-- If true, the default sort order is primary (i.e. by given name) -->
-  <bool name="config_default_display_order_primary">false</bool>
-
-  <!-- If true, the order of name fields in the editor is primary (i.e. given name first) -->
-  <bool name="config_editor_field_order_primary">false</bool>
-</resources>
\ No newline at end of file
diff --git a/java/com/android/contacts/common/res/values-ko/strings.xml b/java/com/android/contacts/common/res/values-ko/strings.xml
index 3f4eafc..1a5cd7d 100644
--- a/java/com/android/contacts/common/res/values-ko/strings.xml
+++ b/java/com/android/contacts/common/res/values-ko/strings.xml
@@ -1,162 +1,145 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="toast_text_copied" msgid="8979281391599667362">"텍스트 복사됨"</string>
-    <string name="call_custom" msgid="3041673234638990874">"<xliff:g id="CUSTOM">%s</xliff:g>(으)로 전화걸기"</string>
-    <string name="call_home" msgid="125893483593803791">"집으로 전화걸기"</string>
-    <string name="call_mobile" msgid="967589404494150813">"휴대전화로 전화걸기"</string>
-    <string name="call_work" msgid="6040550697395300892">"직장으로 전화걸기"</string>
-    <string name="call_fax_work" msgid="5260192771364592922">"직장 팩스로 전화걸기"</string>
-    <string name="call_fax_home" msgid="5174311195081144124">"집 팩스로 전화걸기"</string>
-    <string name="call_pager" msgid="6814149227741274161">"호출기로 전화걸기"</string>
-    <string name="call_other" msgid="5536385588712587235">"전화걸기"</string>
-    <string name="call_callback" msgid="6314019862718112786">"콜백 번호로 전화걸기"</string>
-    <string name="call_car" msgid="3197417098027764954">"카폰으로 전화걸기"</string>
-    <string name="call_company_main" msgid="2557663310028446397">"직장 기본전화로 전화걸기"</string>
-    <string name="call_isdn" msgid="4691270442763649522">"ISDN으로 전화걸기"</string>
-    <string name="call_main" msgid="3293707608770407814">"기본전화로 전화걸기"</string>
-    <string name="call_other_fax" msgid="4724521984879021465">"팩스로 전화걸기"</string>
-    <string name="call_radio" msgid="8942441419845057942">"무선통신으로 전화걸기"</string>
-    <string name="call_telex" msgid="2031514461660668351">"텔렉스로 전화걸기"</string>
-    <string name="call_tty_tdd" msgid="7807210224965727701">"TTY/TDD로 전화걸기"</string>
-    <string name="call_work_mobile" msgid="2716342732938578495">"직장 휴대전화로 전화걸기"</string>
-    <string name="call_work_pager" msgid="3791778749827366574">"직장 호출기로 전화 걸기"</string>
-    <string name="call_assistant" msgid="4177478845473789294">"<xliff:g id="ASSISTANT">%s</xliff:g>(으)로 전화걸기"</string>
-    <string name="call_mms" msgid="4958811711741872901">"MMS로 전화걸기"</string>
-    <string name="sms_custom" msgid="8785368968605026317">"<xliff:g id="CUSTOM">%s</xliff:g>에 문자 보내기"</string>
-    <string name="sms_home" msgid="3527719551060295243">"집으로 문자 보내기"</string>
-    <string name="sms_mobile" msgid="8883045857887736518">"휴대전화로 문자 보내기"</string>
-    <string name="sms_work" msgid="4158595439553450966">"직장으로 문자 보내기"</string>
-    <string name="sms_fax_work" msgid="5483726627718055248">"직장 팩스로 문자 보내기"</string>
-    <string name="sms_fax_home" msgid="9219265155770746077">"집 팩스로 문자 보내기"</string>
-    <string name="sms_pager" msgid="4901085068525193933">"호출기로 문자 보내기"</string>
-    <string name="sms_other" msgid="1742702947993285933">"문자 보내기"</string>
-    <string name="sms_callback" msgid="5833483630377538308">"콜백 번호로 문자 보내기"</string>
-    <string name="sms_car" msgid="4314577266154395174">"카폰으로 문자 보내기"</string>
-    <string name="sms_company_main" msgid="2308160928487360705">"직장 기본전화로 문자 보내기"</string>
-    <string name="sms_isdn" msgid="6394300346179302542">"ISDN에 문자 보내기"</string>
-    <string name="sms_main" msgid="8908087742014140774">"기본전화로 문자 보내기"</string>
-    <string name="sms_other_fax" msgid="8768455473295405427">"팩스로 문자 보내기"</string>
-    <string name="sms_radio" msgid="855555176531704682">"무선통신으로 문자 보내기"</string>
-    <string name="sms_telex" msgid="6269029276223252719">"텔렉스로 문자 보내기"</string>
-    <string name="sms_tty_tdd" msgid="6229057354509192444">"TTY/TDD에 문자 보내기"</string>
-    <string name="sms_work_mobile" msgid="2155975469329969840">"직장 휴대전화로 문자 보내기"</string>
-    <string name="sms_work_pager" msgid="8500140274906830742">"직장 호출기로 문자 보내기"</string>
-    <string name="sms_assistant" msgid="8513548482745330818">"<xliff:g id="ASSISTANT">%s</xliff:g>(으)로 문자 보내기"</string>
-    <string name="sms_mms" msgid="5187888900503248542">"MMS로 문자 보내기"</string>
-    <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"자주 연락하는 사람들 목록을 삭제하시겠습니까?"</string>
-    <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"주소록 및 휴대전화 앱에서 자주 연락하는 사람의 목록을 삭제하고 이메일 앱이 주소록 환경설정을 처음부터 다시 반영하도록 합니다."</string>
-    <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"자주 연락하는 사람들 목록을 삭제하는 중…"</string>
-    <string name="status_available" msgid="2648156525685472626">"온라인"</string>
-    <string name="status_away" msgid="2298688367552893953">"자리 비움"</string>
-    <string name="status_busy" msgid="5990832098713248503">"다른 용무 중"</string>
-    <string name="contactsList" msgid="8806067891419291513">"주소록"</string>
-    <string name="contact_suggestions" msgid="3324166754807120006">"인기 추천"</string>
-    <string name="local_invisible_directory" msgid="4723238462733650090">"기타"</string>
-    <string name="directory_search_label" msgid="4621215895484025229">"디렉토리"</string>
-    <string name="directory_search_label_work" msgid="7679326282707414897">"직장 디렉토리"</string>
-    <string name="local_search_label" msgid="907622822323119235">"모든 연락처"</string>
-    <string name="local_suggestions_search_label" msgid="1178575146224386118">"추천"</string>
-    <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"나"</string>
-    <string name="missing_name" msgid="978606963362745020">"(이름 없음)"</string>
-    <string name="description_view_contact_detail" msgid="2428742401208561136">"연락처 보기"</string>
-    <string name="list_filter_phones" msgid="8763316061763437182">"전화번호가 포함된 모든 연락처"</string>
-    <string name="list_filter_phones_work" msgid="7083575404573422965">"직장 프로필 연락처"</string>
-    <string name="view_updates_from_group" msgid="9011641093168385729">"업데이트 보기"</string>
-    <string name="account_phone" msgid="7067809073194061035">"기기 전용(동기화되지 않음)"</string>
-    <string name="nameLabelsGroup" msgid="7730465833159557471">"이름"</string>
-    <string name="nicknameLabelsGroup" msgid="6310556912361840029">"닉네임"</string>
-    <string name="full_name" msgid="648186563998465740">"이름"</string>
-    <string name="name_given" msgid="5096576006314820536">"이름"</string>
-    <string name="name_family" msgid="6646235805198547467">"성"</string>
-    <string name="name_prefix" msgid="9215326539658838">"경칭"</string>
-    <string name="name_middle" msgid="703755205331582769">"중간 이름"</string>
-    <string name="name_suffix" msgid="5777083390282548702">"이름 접미어"</string>
-    <string name="name_phonetic" msgid="1650870996361663089">"이름(소리나는 대로)"</string>
-    <string name="name_phonetic_given" msgid="618812334274603170">"이름(소리나는 대로)"</string>
-    <string name="name_phonetic_middle" msgid="4826820763384625538">"중간 이름(소리나는 대로)"</string>
-    <string name="name_phonetic_family" msgid="379905191212930771">"성(소리나는 대로)"</string>
-    <string name="phoneLabelsGroup" msgid="169661929021355548">"휴대전화"</string>
-    <string name="emailLabelsGroup" msgid="2249752810477488833">"이메일 보내기"</string>
-    <string name="postalLabelsGroup" msgid="6772000590189142253">"주소"</string>
-    <string name="imLabelsGroup" msgid="5718066254237364731">"메신저"</string>
-    <string name="organizationLabelsGroup" msgid="1101996309241601435">"조직"</string>
-    <string name="relationLabelsGroup" msgid="53866051664600053">"관계"</string>
-    <string name="eventLabelsGroup" msgid="1236970042646618489">"특별한 날짜"</string>
-    <string name="sms" msgid="7574344928185328095">"문자 메시지"</string>
-    <string name="postal_address" msgid="1804707930129674200">"주소"</string>
-    <string name="ghostData_company" msgid="2554310786296833424">"회사"</string>
-    <string name="ghostData_title" msgid="4994968731830184837">"직책"</string>
-    <string name="label_notes" msgid="2050255313694219786">"메모"</string>
-    <string name="label_sip_address" msgid="8883266182575965926">"SIP"</string>
-    <string name="websiteLabelsGroup" msgid="1630734286462186790">"웹사이트"</string>
-    <string name="groupsLabel" msgid="2694002798416868728">"그룹"</string>
-    <string name="email_home" msgid="889830029388962171">"개인 이메일 주소로 이메일 보내기"</string>
-    <string name="email_mobile" msgid="4487686436743741150">"모바일로 이메일 보내기"</string>
-    <string name="email_work" msgid="4223487303344613528">"직장으로 이메일 보내기"</string>
-    <string name="email_other" msgid="4246411900126012062">"이메일 보내기"</string>
-    <string name="email_custom" msgid="7246580894327511013">"<xliff:g id="CUSTOM">%s</xliff:g>에 이메일 보내기"</string>
-    <string name="email" msgid="2807318537887091606">"이메일 보내기"</string>
-    <string name="postal_street" msgid="6918171741240802474">"도로명"</string>
-    <string name="postal_city" msgid="8674569121430005628">"시"</string>
-    <string name="postal_region" msgid="1730369286225469192">"도"</string>
-    <string name="postal_postcode" msgid="4450700741261990439">"우편번호"</string>
-    <string name="postal_country" msgid="232670707458768148">"국가"</string>
-    <string name="map_home" msgid="4181131107392126938">"집 주소 보기"</string>
-    <string name="map_work" msgid="5723471185992684400">"직장 주소 보기"</string>
-    <string name="map_other" msgid="2253764780863500516">"주소 보기"</string>
-    <string name="map_custom" msgid="5581743097882436157">"<xliff:g id="CUSTOM">%s</xliff:g> 주소 보기"</string>
-    <string name="chat_aim" msgid="2954364435497941659">"AIM으로 채팅"</string>
-    <string name="chat_msn" msgid="3130135239071228678">"Windows Live로 채팅"</string>
-    <string name="chat_yahoo" msgid="3233552142326865347">"Yahoo로 채팅"</string>
-    <string name="chat_skype" msgid="6486703981390592425">"Skype로 채팅"</string>
-    <string name="chat_qq" msgid="786924280665740019">"QQ로 채팅"</string>
-    <string name="chat_gtalk" msgid="7914674177243078035">"Google 토크로 채팅"</string>
-    <string name="chat_icq" msgid="3292934726414765801">"ICQ로 채팅"</string>
-    <string name="chat_jabber" msgid="6701542313597880204">"Jabber로 채팅"</string>
-    <string name="chat" msgid="1020428260359370236">"채팅"</string>
-    <string name="list_filter_all_accounts" msgid="473782314881473992">"모든 연락처"</string>
-    <string name="listAllContactsInAccount" msgid="3486378621592995630">"<xliff:g id="NAME">%s</xliff:g>의 주소록"</string>
-    <string name="listCustomView" msgid="5306282632413086731">"주소록 맞춤 보기"</string>
-    <string name="listSingleContact" msgid="8620818791932382627">"단일 연락처"</string>
-    <string name="display_options_sort_list_by" msgid="3541875948367831228">"정렬 기준:"</string>
-    <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"이름"</string>
-    <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"성"</string>
-    <string name="display_options_view_names_as" msgid="4204204205736735618">"이름 형식"</string>
-    <string name="display_options_view_given_name_first" msgid="2308026973021171020">"이름 먼저"</string>
-    <string name="display_options_view_family_name_first" msgid="987430497292428242">"성 먼저"</string>
-    <string name="menu_clear_frequents" msgid="5358271535047496120">"자주 연락하는 사람 목록 삭제"</string>
-    <string name="action_menu_back_from_search" msgid="3550669942742167644">"검색 중지"</string>
-    <string name="description_clear_search" msgid="2347258825265600782">"검색창 지우기"</string>
-    <string name="select_account_dialog_title" msgid="2673504582803359239">"계정"</string>
-    <string name="set_default_account" msgid="7966099951006467572">"통화에 항상 사용"</string>
-    <string name="select_phone_account_for_calls" msgid="1784460686103423274">"통화에 사용할 SIM"</string>
-    <string name="call_with_a_note" msgid="6242261320491851133">"메모가 포함된 통화"</string>
-    <string name="call_subject_hint" msgid="7233138753650420800">"통화에 함께 전송할 메모를 입력하세요..."</string>
-    <string name="send_and_call_button" msgid="4735168294120154013">"보내기 및 전화 걸기"</string>
-    <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g>/<xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="tab_title" msgid="3387876802026074288">"<xliff:g id="TITLE">%1$s</xliff:g> 탭"</string>
-    <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
-      <item quantity="other"> <xliff:g id="TITLE_2">%1$s</xliff:g> 탭. 읽지 않은 항목 <xliff:g id="COUNT_3">%2$d</xliff:g>개 </item>
-      <item quantity="one"> <xliff:g id="TITLE_0">%1$s</xliff:g> 탭. 읽지 않은 항목 <xliff:g id="COUNT_1">%2$d</xliff:g>개 </item>
-    </plurals>
-    <string name="description_search_video_call" msgid="4337369876888024909">"화상 통화"</string>
-    <string name="description_search_call_and_share" msgid="4912772842755050467">"공유 및 전화 걸기"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_custom">%s(으)로 전화걸기</string>
+  <string name="call_home">집으로 전화걸기</string>
+  <string name="call_mobile">휴대전화로 전화걸기</string>
+  <string name="call_work">직장으로 전화걸기</string>
+  <string name="call_fax_work">직장 팩스로 전화걸기</string>
+  <string name="call_fax_home">집 팩스로 전화걸기</string>
+  <string name="call_pager">호출기로 전화걸기</string>
+  <string name="call_other">전화걸기</string>
+  <string name="call_callback">콜백 번호로 전화걸기</string>
+  <string name="call_car">카폰으로 전화걸기</string>
+  <string name="call_company_main">직장 기본전화로 전화걸기</string>
+  <string name="call_isdn">ISDN으로 전화걸기</string>
+  <string name="call_main">기본전화로 전화걸기</string>
+  <string name="call_other_fax">팩스로 전화걸기</string>
+  <string name="call_radio">무선통신으로 전화걸기</string>
+  <string name="call_telex">텔렉스로 전화걸기</string>
+  <string name="call_tty_tdd">TTY/TDD로 전화걸기</string>
+  <string name="call_work_mobile">직장 휴대전화로 전화걸기</string>
+  <string name="call_work_pager">직장 호출기로 전화 걸기</string>
+  <string name="call_assistant">%s(으)로 전화걸기</string>
+  <string name="call_mms">MMS로 전화걸기</string>
+  <string name="sms_custom">%s에 문자 보내기</string>
+  <string name="sms_home">집으로 문자 보내기</string>
+  <string name="sms_mobile">휴대전화로 문자 보내기</string>
+  <string name="sms_work">직장으로 문자 보내기</string>
+  <string name="sms_fax_work">직장 팩스로 문자 보내기</string>
+  <string name="sms_fax_home">집 팩스로 문자 보내기</string>
+  <string name="sms_pager">호출기로 문자 보내기</string>
+  <string name="sms_other">문자 보내기</string>
+  <string name="sms_callback">콜백 번호로 문자 보내기</string>
+  <string name="sms_car">카폰으로 문자 보내기</string>
+  <string name="sms_company_main">직장 기본전화로 문자 보내기</string>
+  <string name="sms_isdn">ISDN에 문자 보내기</string>
+  <string name="sms_main">기본전화로 문자 보내기</string>
+  <string name="sms_other_fax">팩스로 문자 보내기</string>
+  <string name="sms_radio">무선통신으로 문자 보내기</string>
+  <string name="sms_telex">텔렉스로 문자 보내기</string>
+  <string name="sms_tty_tdd">TTY/TDD에 문자 보내기</string>
+  <string name="sms_work_mobile">직장 휴대전화로 문자 보내기</string>
+  <string name="sms_work_pager">직장 호출기로 문자 보내기</string>
+  <string name="sms_assistant">%s(으)로 문자 보내기</string>
+  <string name="sms_mms">MMS로 문자 보내기</string>
+  <string name="clearFrequentsConfirmation_title">자주 연락하는 사람들 목록을 삭제하시겠습니까?</string>
+  <string name="clearFrequentsConfirmation">주소록 및 휴대전화 앱에서 자주 연락하는 사람의 목록을 삭제하고 이메일 앱이 주소록 환경설정을 처음부터 다시 반영하도록 합니다.</string>
+  <string name="clearFrequentsProgress_title">자주 연락하는 사람들 목록을 삭제하는 중…</string>
+  <string name="status_available">온라인</string>
+  <string name="status_away">자리 비움</string>
+  <string name="status_busy">다른 용무 중</string>
+  <string name="contactsList">주소록</string>
+  <string name="contact_suggestions">인기 추천</string>
+  <string name="local_invisible_directory">기타</string>
+  <string name="directory_search_label">디렉토리</string>
+  <string name="directory_search_label_work">직장 디렉토리</string>
+  <string name="local_search_label">모든 연락처</string>
+  <string name="local_suggestions_search_label">추천</string>
+  <string msgid="9154761216179882405" name="user_profile_contacts_list_header">나</string>
+  <string name="missing_name">(이름 없음)</string>
+  <string msgid="2795575601596468581" name="description_view_contact_detail">연락처 보기</string>
+  <string name="list_filter_phones">전화번호가 포함된 모든 연락처</string>
+  <string name="list_filter_phones_work">직장 프로필 연락처</string>
+  <string name="view_updates_from_group">업데이트 보기</string>
+  <string name="account_phone">기기 전용(동기화되지 않음)</string>
+  <string name="nameLabelsGroup">이름</string>
+  <string name="nicknameLabelsGroup">닉네임</string>
+  <string name="full_name">이름</string>
+  <string name="name_given">이름</string>
+  <string name="name_family">성</string>
+  <string name="name_prefix">경칭</string>
+  <string name="name_middle">중간 이름</string>
+  <string name="name_suffix">이름 접미어</string>
+  <string name="name_phonetic">이름(소리나는 대로)</string>
+  <string name="name_phonetic_given">이름(소리나는 대로)</string>
+  <string name="name_phonetic_middle">중간 이름(소리나는 대로)</string>
+  <string name="name_phonetic_family">성(소리나는 대로)</string>
+  <string name="phoneLabelsGroup">휴대전화</string>
+  <string name="emailLabelsGroup">이메일 보내기</string>
+  <string name="postalLabelsGroup">주소</string>
+  <string name="imLabelsGroup">메신저</string>
+  <string name="organizationLabelsGroup">조직</string>
+  <string name="relationLabelsGroup">관계</string>
+  <string name="eventLabelsGroup">특별한 날짜</string>
+  <string name="sms">문자 메시지</string>
+  <string name="postal_address">주소</string>
+  <string name="ghostData_company">회사</string>
+  <string name="ghostData_title">직책</string>
+  <string name="label_notes">메모</string>
+  <string name="label_sip_address">SIP</string>
+  <string name="websiteLabelsGroup">웹사이트</string>
+  <string name="groupsLabel">그룹</string>
+  <string name="email_home">개인 이메일 주소로 이메일 보내기</string>
+  <string name="email_mobile">모바일로 이메일 보내기</string>
+  <string name="email_work">직장으로 이메일 보내기</string>
+  <string name="email_other">이메일 보내기</string>
+  <string name="email_custom">%s에 이메일 보내기</string>
+  <string name="email">이메일 보내기</string>
+  <string name="postal_street">도로명</string>
+  <string name="postal_city">시</string>
+  <string name="postal_region">도</string>
+  <string name="postal_postcode">우편번호</string>
+  <string name="postal_country">국가</string>
+  <string name="map_home">집 주소 보기</string>
+  <string name="map_work">직장 주소 보기</string>
+  <string name="map_other">주소 보기</string>
+  <string name="map_custom">%s 주소 보기</string>
+  <string name="chat_aim">AIM으로 채팅</string>
+  <string name="chat_msn">Windows Live로 채팅</string>
+  <string name="chat_yahoo">Yahoo로 채팅</string>
+  <string name="chat_skype">Skype로 채팅</string>
+  <string name="chat_qq">QQ로 채팅</string>
+  <string name="chat_gtalk">Google 토크로 채팅</string>
+  <string name="chat_icq">ICQ로 채팅</string>
+  <string name="chat_jabber">Jabber로 채팅</string>
+  <string name="chat">채팅</string>
+  <string name="list_filter_all_accounts">모든 연락처</string>
+  <string name="listAllContactsInAccount">%s의 주소록</string>
+  <string name="listCustomView">주소록 맞춤 보기</string>
+  <string name="listSingleContact">단일 연락처</string>
+  <string name="display_options_sort_list_by">정렬 기준:</string>
+  <string name="display_options_sort_by_given_name">이름</string>
+  <string name="display_options_sort_by_family_name">성</string>
+  <string name="display_options_view_names_as">이름 형식</string>
+  <string name="display_options_view_given_name_first">이름 먼저</string>
+  <string name="display_options_view_family_name_first">성 먼저</string>
+  <string name="menu_clear_frequents">자주 연락하는 사람 목록 삭제</string>
+  <string name="action_menu_back_from_search">검색 중지</string>
+  <string name="description_clear_search">검색창 지우기</string>
+  <string name="select_account_dialog_title">계정</string>
+  <string name="set_default_account">통화에 항상 사용</string>
+  <string name="select_phone_account_for_calls">이 통화에 사용할 SIM 선택</string>
+  <string name="select_phone_account_for_calls_remember">이 선택사항 저장</string>
+  <string name="call_with_a_note">메모가 포함된 통화</string>
+  <string name="call_subject_hint">통화에 함께 전송할 메모를 입력하세요...</string>
+  <string name="send_and_call_button">보내기 및 전화 걸기</string>
+  <string name="call_subject_limit">%1$s/%2$s</string>
+  <string name="old_call_subject_type_and_number">%1$s %2$s</string>
+  <string name="tab_title">%1$s 탭</string>
+  <plurals name="tab_title_with_unread_items">
+    <item quantity="one"> %1$s 탭. 읽지 않은 항목 %2$d개 </item>
+    <item quantity="other"> %1$s 탭. 읽지 않은 항목 %2$d개 </item>
+  </plurals>
+  <string name="description_search_video_call">화상 통화</string>
+  <string name="description_search_call_and_share">공유 및 전화 걸기</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-ky/strings.xml b/java/com/android/contacts/common/res/values-ky/strings.xml
index 3a0f0c3..eb4ea1a 100644
--- a/java/com/android/contacts/common/res/values-ky/strings.xml
+++ b/java/com/android/contacts/common/res/values-ky/strings.xml
@@ -1,162 +1,145 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="toast_text_copied" msgid="8979281391599667362">"SMS көчүрүлдү"</string>
-    <string name="call_custom" msgid="3041673234638990874">"Чалуу <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="call_home" msgid="125893483593803791">"Үйгө чалуу"</string>
-    <string name="call_mobile" msgid="967589404494150813">"Мобилге чалуу"</string>
-    <string name="call_work" msgid="6040550697395300892">"Жумушка чалуу"</string>
-    <string name="call_fax_work" msgid="5260192771364592922">"Жумуш факсына чалуу"</string>
-    <string name="call_fax_home" msgid="5174311195081144124">"Үй факсына чалуу"</string>
-    <string name="call_pager" msgid="6814149227741274161">"Пейжерге чалуу"</string>
-    <string name="call_other" msgid="5536385588712587235">"Чалуу"</string>
-    <string name="call_callback" msgid="6314019862718112786">"Кайра чалуу номуруна чалуу"</string>
-    <string name="call_car" msgid="3197417098027764954">"Автомобилге чалуу"</string>
-    <string name="call_company_main" msgid="2557663310028446397">"Компаниянын негизгисине чалуу"</string>
-    <string name="call_isdn" msgid="4691270442763649522">"ISDN телефонго чалуу"</string>
-    <string name="call_main" msgid="3293707608770407814">"Негизгисине чалуу"</string>
-    <string name="call_other_fax" msgid="4724521984879021465">"Факска чалуу"</string>
-    <string name="call_radio" msgid="8942441419845057942">"Радио телефонго чалуу"</string>
-    <string name="call_telex" msgid="2031514461660668351">"Телекске чалуу"</string>
-    <string name="call_tty_tdd" msgid="7807210224965727701">"TTY/TDD чалуу"</string>
-    <string name="call_work_mobile" msgid="2716342732938578495">"Жумушчу мобилге чалуу"</string>
-    <string name="call_work_pager" msgid="3791778749827366574">"Жумушчу пейжерге чалуу"</string>
-    <string name="call_assistant" msgid="4177478845473789294">"Чалуу <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
-    <string name="call_mms" msgid="4958811711741872901">"MMS номурна чалуу"</string>
-    <string name="sms_custom" msgid="8785368968605026317">"SMS <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="sms_home" msgid="3527719551060295243">"Үйгө SMS жөнөтүү"</string>
-    <string name="sms_mobile" msgid="8883045857887736518">"Мобилге SMS жөнөтүү"</string>
-    <string name="sms_work" msgid="4158595439553450966">"Жумушка SMS жөнөтүү"</string>
-    <string name="sms_fax_work" msgid="5483726627718055248">"Жумуш факсына SMS жөнөтүү"</string>
-    <string name="sms_fax_home" msgid="9219265155770746077">"Үй факсына SMS жөнөтүү"</string>
-    <string name="sms_pager" msgid="4901085068525193933">"Пейжерге SMS жөнөтүү"</string>
-    <string name="sms_other" msgid="1742702947993285933">"SMS жөнөтүү"</string>
-    <string name="sms_callback" msgid="5833483630377538308">"Кайра чалууну номуруна SMS"</string>
-    <string name="sms_car" msgid="4314577266154395174">"Автомобилге текст жөнөтүү"</string>
-    <string name="sms_company_main" msgid="2308160928487360705">"Компаниянын негизгисине SMS жөнөтүү"</string>
-    <string name="sms_isdn" msgid="6394300346179302542">"ISDN телефонуна SMS жөнөтүү"</string>
-    <string name="sms_main" msgid="8908087742014140774">"Негизгиге SMS жөнөтүү"</string>
-    <string name="sms_other_fax" msgid="8768455473295405427">"Факска SMS жөнөтүү"</string>
-    <string name="sms_radio" msgid="855555176531704682">"Радио телефонго SMS жөнөтүү"</string>
-    <string name="sms_telex" msgid="6269029276223252719">"Телекске SMS жөнөтүү"</string>
-    <string name="sms_tty_tdd" msgid="6229057354509192444">"TTY/TDD телефонго SMS жөнөтүү"</string>
-    <string name="sms_work_mobile" msgid="2155975469329969840">"Жумушчу мобилге SMS жөнөтүү"</string>
-    <string name="sms_work_pager" msgid="8500140274906830742">"Жумушчу пейжерге SMS жөнөтүү"</string>
-    <string name="sms_assistant" msgid="8513548482745330818">"Текст жөнөтүү <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
-    <string name="sms_mms" msgid="5187888900503248542">"MMS телефонго SMS жөнөтүү"</string>
-    <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"Көп чалынгандар тизмеси тазалансынбы?"</string>
-    <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"Байланыштар жана Телефон колдонмолорунан көп байланышкан адамдар тизмесин тазалап, даректүү жеке жөндөөлөр тууралуу билүү үчүн электрондук почта колдонмолорун иштетиңиз."</string>
-    <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"Көп чалынгандар тизмеси тазаланууда…"</string>
-    <string name="status_available" msgid="2648156525685472626">"Жеткиликтүү"</string>
-    <string name="status_away" msgid="2298688367552893953">"Чыгып кетти"</string>
-    <string name="status_busy" msgid="5990832098713248503">"Бош эмес"</string>
-    <string name="contactsList" msgid="8806067891419291513">"Байланыштар"</string>
-    <string name="contact_suggestions" msgid="3324166754807120006">"Эң көп сунушталгандар"</string>
-    <string name="local_invisible_directory" msgid="4723238462733650090">"Башка"</string>
-    <string name="directory_search_label" msgid="4621215895484025229">"Директорий"</string>
-    <string name="directory_search_label_work" msgid="7679326282707414897">"Жумуш профилиндеги байланыштар китепчеси"</string>
-    <string name="local_search_label" msgid="907622822323119235">"Бардык байланыштар"</string>
-    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Сунуштар"</string>
-    <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Мен"</string>
-    <string name="missing_name" msgid="978606963362745020">"(Аты жок)"</string>
-    <string name="description_view_contact_detail" msgid="2428742401208561136">"Байланыштын чоо-жайын карап көрүү"</string>
-    <string name="list_filter_phones" msgid="8763316061763437182">"Телефон номерлери бар бардык байланыштар"</string>
-    <string name="list_filter_phones_work" msgid="7083575404573422965">"Жумуш профилиндеги байланыштар"</string>
-    <string name="view_updates_from_group" msgid="9011641093168385729">"Жаңыртууларды көрүү"</string>
-    <string name="account_phone" msgid="7067809073194061035">"Түзмөктө гана, шайкештирилбеген"</string>
-    <string name="nameLabelsGroup" msgid="7730465833159557471">"Аты"</string>
-    <string name="nicknameLabelsGroup" msgid="6310556912361840029">"Каймана аты"</string>
-    <string name="full_name" msgid="648186563998465740">"Аталышы"</string>
-    <string name="name_given" msgid="5096576006314820536">"Ысымы"</string>
-    <string name="name_family" msgid="6646235805198547467">"Фамилиясы"</string>
-    <string name="name_prefix" msgid="9215326539658838">"Атынын префикси"</string>
-    <string name="name_middle" msgid="703755205331582769">"Атасынын аты"</string>
-    <string name="name_suffix" msgid="5777083390282548702">"Атынын суффикси"</string>
-    <string name="name_phonetic" msgid="1650870996361663089">"Аттын транскрипциясы"</string>
-    <string name="name_phonetic_given" msgid="618812334274603170">"Ысымы (транскрипция)"</string>
-    <string name="name_phonetic_middle" msgid="4826820763384625538">"Атасынын аты (транскрипция)"</string>
-    <string name="name_phonetic_family" msgid="379905191212930771">"Фамилия (транскрипция)"</string>
-    <string name="phoneLabelsGroup" msgid="169661929021355548">"Телефон"</string>
-    <string name="emailLabelsGroup" msgid="2249752810477488833">"Электрондук кат жазуу"</string>
-    <string name="postalLabelsGroup" msgid="6772000590189142253">"Дареги"</string>
-    <string name="imLabelsGroup" msgid="5718066254237364731">"IM"</string>
-    <string name="organizationLabelsGroup" msgid="1101996309241601435">"Ишкана"</string>
-    <string name="relationLabelsGroup" msgid="53866051664600053">"Мага ким болот?"</string>
-    <string name="eventLabelsGroup" msgid="1236970042646618489">"Өзгөчө күн"</string>
-    <string name="sms" msgid="7574344928185328095">"SMS билдирүүсү"</string>
-    <string name="postal_address" msgid="1804707930129674200">"Дареги"</string>
-    <string name="ghostData_company" msgid="2554310786296833424">"Компания"</string>
-    <string name="ghostData_title" msgid="4994968731830184837">"Кызматы"</string>
-    <string name="label_notes" msgid="2050255313694219786">"Эскертүүлөр"</string>
-    <string name="label_sip_address" msgid="8883266182575965926">"SIP"</string>
-    <string name="websiteLabelsGroup" msgid="1630734286462186790">"Вебсайт"</string>
-    <string name="groupsLabel" msgid="2694002798416868728">"Топтор"</string>
-    <string name="email_home" msgid="889830029388962171">"Үй дарегине эмейлдөө"</string>
-    <string name="email_mobile" msgid="4487686436743741150">"Мобилге эмейлдөө"</string>
-    <string name="email_work" msgid="4223487303344613528">"Жумушка эмейлдөө"</string>
-    <string name="email_other" msgid="4246411900126012062">"Электрондук кат жазуу"</string>
-    <string name="email_custom" msgid="7246580894327511013">"Кат жазуу (<xliff:g id="CUSTOM">%s</xliff:g>)"</string>
-    <string name="email" msgid="2807318537887091606">"Электрондук кат жазуу"</string>
-    <string name="postal_street" msgid="6918171741240802474">"Көчөсү"</string>
-    <string name="postal_city" msgid="8674569121430005628">"Шаары"</string>
-    <string name="postal_region" msgid="1730369286225469192">"Облусу"</string>
-    <string name="postal_postcode" msgid="4450700741261990439">"Индекси"</string>
-    <string name="postal_country" msgid="232670707458768148">"Өлкө"</string>
-    <string name="map_home" msgid="4181131107392126938">"Үй дарегин көрүү"</string>
-    <string name="map_work" msgid="5723471185992684400">"Жумуш дарегин көрүү"</string>
-    <string name="map_other" msgid="2253764780863500516">"Дарегин көрүү"</string>
-    <string name="map_custom" msgid="5581743097882436157">"<xliff:g id="CUSTOM">%s</xliff:g> дарегин көрүү"</string>
-    <string name="chat_aim" msgid="2954364435497941659">"AIM аркылуу чатташуу"</string>
-    <string name="chat_msn" msgid="3130135239071228678">"Windows Live аркылуу чатташуу"</string>
-    <string name="chat_yahoo" msgid="3233552142326865347">"Yahoo аркылуу чатташуу"</string>
-    <string name="chat_skype" msgid="6486703981390592425">"Skype аркылуу чатташуу"</string>
-    <string name="chat_qq" msgid="786924280665740019">"QQ аркылуу чатташуу"</string>
-    <string name="chat_gtalk" msgid="7914674177243078035">"Google Talk аркылуу чатташуу"</string>
-    <string name="chat_icq" msgid="3292934726414765801">"ICQ аркылуу чатташуу"</string>
-    <string name="chat_jabber" msgid="6701542313597880204">"Jabber аркылуу чатташуу"</string>
-    <string name="chat" msgid="1020428260359370236">"Чат"</string>
-    <string name="list_filter_all_accounts" msgid="473782314881473992">"Бардык байланыштар"</string>
-    <string name="listAllContactsInAccount" msgid="3486378621592995630">"<xliff:g id="NAME">%s</xliff:g> байланыштары"</string>
-    <string name="listCustomView" msgid="5306282632413086731">"Байланыштардын ыңгайлаштырылган көрүнүшү"</string>
-    <string name="listSingleContact" msgid="8620818791932382627">"Жалгыз байланыш"</string>
-    <string name="display_options_sort_list_by" msgid="3541875948367831228">"Төмөнкү боюнча иреттештирүү"</string>
-    <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"Ысымы"</string>
-    <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"Фамилиясы"</string>
-    <string name="display_options_view_names_as" msgid="4204204205736735618">"Ысым форматы"</string>
-    <string name="display_options_view_given_name_first" msgid="2308026973021171020">"Биринчи ысымы"</string>
-    <string name="display_options_view_family_name_first" msgid="987430497292428242">"Биринчи фамилиясы"</string>
-    <string name="menu_clear_frequents" msgid="5358271535047496120">"Көп чалуулар тизмесин тазалоо"</string>
-    <string name="action_menu_back_from_search" msgid="3550669942742167644">"издөөнү токтотуу"</string>
-    <string name="description_clear_search" msgid="2347258825265600782">"Издөөнү тазалоо"</string>
-    <string name="select_account_dialog_title" msgid="2673504582803359239">"Каттоо эсеби"</string>
-    <string name="set_default_account" msgid="7966099951006467572">"Бул ар дайым чалуулр үчн колдонулсн"</string>
-    <string name="select_phone_account_for_calls" msgid="1784460686103423274">"Төмөнкү менен чалуу"</string>
-    <string name="call_with_a_note" msgid="6242261320491851133">"Кыска жазуу менен чалуу"</string>
-    <string name="call_subject_hint" msgid="7233138753650420800">"Чалуу менен жөнөтүлө турган кыска жазууну териңиз …"</string>
-    <string name="send_and_call_button" msgid="4735168294120154013">"ЖӨНӨТҮҮ ЖАНА ЧАЛУУ"</string>
-    <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="tab_title" msgid="3387876802026074288">"\"<xliff:g id="TITLE">%1$s</xliff:g>\" өтмөгү."</string>
-    <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
-      <item quantity="other"> \"<xliff:g id="TITLE_2">%1$s</xliff:g>\" өтмөгү. <xliff:g id="COUNT_3">%2$d</xliff:g> нерсе окула элек. </item>
-      <item quantity="one"> \"<xliff:g id="TITLE_0">%1$s</xliff:g>\" өтмөгү. <xliff:g id="COUNT_1">%2$d</xliff:g> нерсе окула элек. </item>
-    </plurals>
-    <string name="description_search_video_call" msgid="4337369876888024909">"Видео чалуу"</string>
-    <string name="description_search_call_and_share" msgid="4912772842755050467">"Бөлүшүү жана чалуу"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_custom">Чалуу %s</string>
+  <string name="call_home">Үйгө чалуу</string>
+  <string name="call_mobile">Мобилге чалуу</string>
+  <string name="call_work">Жумушка чалуу</string>
+  <string name="call_fax_work">Жумуш факсына чалуу</string>
+  <string name="call_fax_home">Үй факсына чалуу</string>
+  <string name="call_pager">Пейжерге чалуу</string>
+  <string name="call_other">Чалуу</string>
+  <string name="call_callback">Кайра чалуу номуруна чалуу</string>
+  <string name="call_car">Автомобилге чалуу</string>
+  <string name="call_company_main">Компаниянын негизгисине чалуу</string>
+  <string name="call_isdn">ISDN телефонго чалуу</string>
+  <string name="call_main">Негизгисине чалуу</string>
+  <string name="call_other_fax">Факска чалуу</string>
+  <string name="call_radio">Радио телефонго чалуу</string>
+  <string name="call_telex">Телекске чалуу</string>
+  <string name="call_tty_tdd">TTY/TDD чалуу</string>
+  <string name="call_work_mobile">Жумушчу мобилге чалуу</string>
+  <string name="call_work_pager">Жумушчу пейжерге чалуу</string>
+  <string name="call_assistant">Чалуу %s</string>
+  <string name="call_mms">MMS номурна чалуу</string>
+  <string name="sms_custom">SMS %s</string>
+  <string name="sms_home">Үйгө SMS жөнөтүү</string>
+  <string name="sms_mobile">Мобилге SMS жөнөтүү</string>
+  <string name="sms_work">Жумушка SMS жөнөтүү</string>
+  <string name="sms_fax_work">Жумуш факсына SMS жөнөтүү</string>
+  <string name="sms_fax_home">Үй факсына SMS жөнөтүү</string>
+  <string name="sms_pager">Пейжерге SMS жөнөтүү</string>
+  <string name="sms_other">SMS жөнөтүү</string>
+  <string name="sms_callback">Кайра чалууну номуруна SMS</string>
+  <string name="sms_car">Автомобилге текст жөнөтүү</string>
+  <string name="sms_company_main">Компаниянын негизгисине SMS жөнөтүү</string>
+  <string name="sms_isdn">ISDN телефонуна SMS жөнөтүү</string>
+  <string name="sms_main">Негизгиге SMS жөнөтүү</string>
+  <string name="sms_other_fax">Факска SMS жөнөтүү</string>
+  <string name="sms_radio">Радио телефонго SMS жөнөтүү</string>
+  <string name="sms_telex">Телекске SMS жөнөтүү</string>
+  <string name="sms_tty_tdd">TTY/TDD телефонго SMS жөнөтүү</string>
+  <string name="sms_work_mobile">Жумушчу мобилге SMS жөнөтүү</string>
+  <string name="sms_work_pager">Жумушчу пейжерге SMS жөнөтүү</string>
+  <string name="sms_assistant">Текст жөнөтүү %s</string>
+  <string name="sms_mms">MMS телефонго SMS жөнөтүү</string>
+  <string name="clearFrequentsConfirmation_title">Көп чалынгандар тизмеси тазалансынбы?</string>
+  <string name="clearFrequentsConfirmation">Байланыштар жана Телефон колдонмолорунан көп байланышкан адамдар тизмесин тазалап, даректүү жеке жөндөөлөр тууралуу билүү үчүн электрондук почта колдонмолорун иштетиңиз.</string>
+  <string name="clearFrequentsProgress_title">Көп чалынгандар тизмеси тазаланууда…</string>
+  <string name="status_available">Жеткиликтүү</string>
+  <string name="status_away">Чыгып кетти</string>
+  <string name="status_busy">Бош эмес</string>
+  <string name="contactsList">Байланыштар</string>
+  <string name="contact_suggestions">Эң көп сунушталгандар</string>
+  <string name="local_invisible_directory">Башка</string>
+  <string name="directory_search_label">Директорий</string>
+  <string name="directory_search_label_work">Жумуш профилиндеги байланыштар китепчеси</string>
+  <string name="local_search_label">Бардык байланыштар</string>
+  <string name="local_suggestions_search_label">Сунуштар</string>
+  <string msgid="9154761216179882405" name="user_profile_contacts_list_header">Мен</string>
+  <string name="missing_name">(Аты жок)</string>
+  <string msgid="2795575601596468581" name="description_view_contact_detail">Байланыштын чоо-жайын карап көрүү</string>
+  <string name="list_filter_phones">Телефон номерлери бар бардык байланыштар</string>
+  <string name="list_filter_phones_work">Жумуш профилиндеги байланыштар</string>
+  <string name="view_updates_from_group">Жаңыртууларды көрүү</string>
+  <string name="account_phone">Түзмөктө гана, шайкештирилбеген</string>
+  <string name="nameLabelsGroup">Аты</string>
+  <string name="nicknameLabelsGroup">Каймана аты</string>
+  <string name="full_name">Аталышы</string>
+  <string name="name_given">Ысымы</string>
+  <string name="name_family">Фамилиясы</string>
+  <string name="name_prefix">Атынын префикси</string>
+  <string name="name_middle">Атасынын аты</string>
+  <string name="name_suffix">Атынын суффикси</string>
+  <string name="name_phonetic">Аттын транскрипциясы</string>
+  <string name="name_phonetic_given">Ысымы (транскрипция)</string>
+  <string name="name_phonetic_middle">Атасынын аты (транскрипция)</string>
+  <string name="name_phonetic_family">Фамилия (транскрипция)</string>
+  <string name="phoneLabelsGroup">Телефон</string>
+  <string name="emailLabelsGroup">Электрондук кат жазуу</string>
+  <string name="postalLabelsGroup">Дареги</string>
+  <string name="imLabelsGroup">IM</string>
+  <string name="organizationLabelsGroup">Ишкана</string>
+  <string name="relationLabelsGroup">Мага ким болот?</string>
+  <string name="eventLabelsGroup">Өзгөчө күн</string>
+  <string name="sms">SMS билдирүүсү</string>
+  <string name="postal_address">Дареги</string>
+  <string name="ghostData_company">Компания</string>
+  <string name="ghostData_title">Кызматы</string>
+  <string name="label_notes">Эскертүүлөр</string>
+  <string name="label_sip_address">SIP</string>
+  <string name="websiteLabelsGroup">Вебсайт</string>
+  <string name="groupsLabel">Топтор</string>
+  <string name="email_home">Үй дарегине эмейлдөө</string>
+  <string name="email_mobile">Мобилге эмейлдөө</string>
+  <string name="email_work">Жумушка эмейлдөө</string>
+  <string name="email_other">Электрондук кат жазуу</string>
+  <string name="email_custom">Кат жазуу (%s)</string>
+  <string name="email">Электрондук кат жазуу</string>
+  <string name="postal_street">Көчөсү</string>
+  <string name="postal_city">Шаары</string>
+  <string name="postal_region">Облусу</string>
+  <string name="postal_postcode">Индекси</string>
+  <string name="postal_country">Өлкө</string>
+  <string name="map_home">Үй дарегин көрүү</string>
+  <string name="map_work">Жумуш дарегин көрүү</string>
+  <string name="map_other">Дарегин көрүү</string>
+  <string name="map_custom">%s дарегин көрүү</string>
+  <string name="chat_aim">AIM аркылуу чатташуу</string>
+  <string name="chat_msn">Windows Live аркылуу чатташуу</string>
+  <string name="chat_yahoo">Yahoo аркылуу чатташуу</string>
+  <string name="chat_skype">Skype аркылуу чатташуу</string>
+  <string name="chat_qq">QQ аркылуу чатташуу</string>
+  <string name="chat_gtalk">Google Talk аркылуу чатташуу</string>
+  <string name="chat_icq">ICQ аркылуу чатташуу</string>
+  <string name="chat_jabber">Jabber аркылуу чатташуу</string>
+  <string name="chat">Чат</string>
+  <string name="list_filter_all_accounts">Бардык байланыштар</string>
+  <string name="listAllContactsInAccount">%s байланыштары</string>
+  <string name="listCustomView">Байланыштардын ыңгайлаштырылган көрүнүшү</string>
+  <string name="listSingleContact">Жалгыз байланыш</string>
+  <string name="display_options_sort_list_by">Төмөнкү боюнча иреттештирүү</string>
+  <string name="display_options_sort_by_given_name">Ысымы</string>
+  <string name="display_options_sort_by_family_name">Фамилиясы</string>
+  <string name="display_options_view_names_as">Ысым форматы</string>
+  <string name="display_options_view_given_name_first">Биринчи ысымы</string>
+  <string name="display_options_view_family_name_first">Биринчи фамилиясы</string>
+  <string name="menu_clear_frequents">Көп чалуулар тизмесин тазалоо</string>
+  <string name="action_menu_back_from_search">издөөнү токтотуу</string>
+  <string name="description_clear_search">Издөөнү тазалоо</string>
+  <string name="select_account_dialog_title">Каттоо эсеби</string>
+  <string name="set_default_account">Бул ар дайым чалуулр үчн колдонулсн</string>
+  <string name="select_phone_account_for_calls">Бул чалуу үчүн SIM картаны тандоо</string>
+  <string name="select_phone_account_for_calls_remember">Бул тандоону эстеп калуу</string>
+  <string name="call_with_a_note">Кыска жазуу менен чалуу</string>
+  <string name="call_subject_hint">Чалуу менен жөнөтүлө турган кыска жазууну териңиз …</string>
+  <string name="send_and_call_button">ЖӨНӨТҮҮ ЖАНА ЧАЛУУ</string>
+  <string name="call_subject_limit">%1$s / %2$s</string>
+  <string name="old_call_subject_type_and_number">%1$s %2$s</string>
+  <string name="tab_title">\"%1$s\" өтмөгү.</string>
+  <plurals name="tab_title_with_unread_items">
+    <item quantity="one"> \"%1$s\" өтмөгү. %2$d нерсе окула элек. </item>
+    <item quantity="other"> \"%1$s\" өтмөгү. %2$d нерсе окула элек. </item>
+  </plurals>
+  <string name="description_search_video_call">Видео чалуу</string>
+  <string name="description_search_call_and_share">Бөлүшүү жана чалуу</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-lo/strings.xml b/java/com/android/contacts/common/res/values-lo/strings.xml
index 5e78002..d363fbd 100644
--- a/java/com/android/contacts/common/res/values-lo/strings.xml
+++ b/java/com/android/contacts/common/res/values-lo/strings.xml
@@ -1,162 +1,145 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="toast_text_copied" msgid="8979281391599667362">"ສຳເນົາຂໍ້ຄວາມແລ້ວ"</string>
-    <string name="call_custom" msgid="3041673234638990874">"ໂທຫາ <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="call_home" msgid="125893483593803791">"ໂທຫາເບີບ້ານ"</string>
-    <string name="call_mobile" msgid="967589404494150813">"ໂທຫາເບີມືຖື"</string>
-    <string name="call_work" msgid="6040550697395300892">"ໂທຫາເບີບ່ອນເຮັດວຽກ"</string>
-    <string name="call_fax_work" msgid="5260192771364592922">"ໂທຫາເບີແຟັກບ່ອນເຮັດວຽກ"</string>
-    <string name="call_fax_home" msgid="5174311195081144124">"ໂທຫາເບີແຟັກບ້ານ"</string>
-    <string name="call_pager" msgid="6814149227741274161">"ໂທຫາເບີ pager"</string>
-    <string name="call_other" msgid="5536385588712587235">"ໂທ"</string>
-    <string name="call_callback" msgid="6314019862718112786">"ໂທຫາເບີໂທກັບ"</string>
-    <string name="call_car" msgid="3197417098027764954">"ໂທຫາເບີລົດ"</string>
-    <string name="call_company_main" msgid="2557663310028446397">"ໂທຫາເບີຫຼັກຂອງບໍລິສັດ"</string>
-    <string name="call_isdn" msgid="4691270442763649522">"ໂທຫາເບີ ISDN"</string>
-    <string name="call_main" msgid="3293707608770407814">"ໂທຫາເບີຫຼັກ"</string>
-    <string name="call_other_fax" msgid="4724521984879021465">"ໂທຫາເບີແຟັກ"</string>
-    <string name="call_radio" msgid="8942441419845057942">"ໂທຫາເບີວິທະຍຸ"</string>
-    <string name="call_telex" msgid="2031514461660668351">"ໂທຫາເບີ telex"</string>
-    <string name="call_tty_tdd" msgid="7807210224965727701">"ໂທຫາເບີ TTY/TDD"</string>
-    <string name="call_work_mobile" msgid="2716342732938578495">"ໂທຫາເບີມືຖືບ່ອນເຮັດວຽກ"</string>
-    <string name="call_work_pager" msgid="3791778749827366574">"ໂທຫາ pager ບ່ອນເຮັດວຽກ"</string>
-    <string name="call_assistant" msgid="4177478845473789294">"ໂທ​ຫາ <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
-    <string name="call_mms" msgid="4958811711741872901">"ໂທຫາເບີ MMS"</string>
-    <string name="sms_custom" msgid="8785368968605026317">"ສົ່ງຂໍ້ຄວາມຫາ <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="sms_home" msgid="3527719551060295243">"ສົ່ງຂໍ້ຄວາມຫາເບີບ້ານ"</string>
-    <string name="sms_mobile" msgid="8883045857887736518">"ສົ່ງຂໍ້ຄວາມຫາເບີມືຖື"</string>
-    <string name="sms_work" msgid="4158595439553450966">"ສົ່ງຂໍ້ຄວາມຫາເບີບ່ອນເຮັດວຽກ"</string>
-    <string name="sms_fax_work" msgid="5483726627718055248">"ສົ່ງຂໍ້ຄວາມຫາເບີແຟັກບ່ອນເຮັດວຽກ"</string>
-    <string name="sms_fax_home" msgid="9219265155770746077">"ສົ່ງຂໍ້ຄວາມຫາເບີແຟັກບ້ານ"</string>
-    <string name="sms_pager" msgid="4901085068525193933">"ສົ່ງຂໍ້ຄວາມຫາເບີ pager"</string>
-    <string name="sms_other" msgid="1742702947993285933">"ສົ່ງຂໍ້ຄວາມ"</string>
-    <string name="sms_callback" msgid="5833483630377538308">"ສົ່ງຂໍ້ຄວາມຫາເບີໂທກັບ"</string>
-    <string name="sms_car" msgid="4314577266154395174">"ສົ່ງຂໍ້ຄວາມຫາເບີລົດ"</string>
-    <string name="sms_company_main" msgid="2308160928487360705">"ສົ່ງຂໍ້ຄວາມຫາເບີຫຼັກຂອງບໍລິສັດ"</string>
-    <string name="sms_isdn" msgid="6394300346179302542">"ສົ່ງຂໍ້ຄວາມຫາເບີ ISDN"</string>
-    <string name="sms_main" msgid="8908087742014140774">"ສົ່ງຂໍ້ຄວາມຫາເບີຫຼັກ"</string>
-    <string name="sms_other_fax" msgid="8768455473295405427">"ສົ່ງຂໍ້ຄວາມຫາເບີແຟັກ"</string>
-    <string name="sms_radio" msgid="855555176531704682">"ສົ່ງຂໍ້ຄວາມຫາເບີວິທະຍຸ"</string>
-    <string name="sms_telex" msgid="6269029276223252719">"ສົ່ງຂໍ້ຄວາມຫາເບີ telex"</string>
-    <string name="sms_tty_tdd" msgid="6229057354509192444">"ສົ່ງຂໍ້ຄວາມຫາເບີ TTY/TDD"</string>
-    <string name="sms_work_mobile" msgid="2155975469329969840">"ສົ່ງຂໍ້ຄວາມຫາເບີມືຖືບ່ອນເຮັດວຽກ"</string>
-    <string name="sms_work_pager" msgid="8500140274906830742">"ສົ່ງຂໍ້ຄວາມຫາເບີ pager ບ່ອນເຮັດວຽກ"</string>
-    <string name="sms_assistant" msgid="8513548482745330818">"ສົ່ງຂໍ້ຄວາມຫາ <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
-    <string name="sms_mms" msgid="5187888900503248542">"ສົ່ງຂໍ້ຄວາມຫາເບີ MMS"</string>
-    <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"ລຶບລາຍຊື່ທີ່ຕິດຕໍ່ເລື້ອຍໆອອກ?"</string>
-    <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"ທ່ານຈະລຶບຂໍ້ມູນລາຍຊື່ທີ່ຕິດຕໍ່ຫາເລື້ອຍໆຢູ່ໃນແອັບຯລາຍ​ຊື່ ແລະໂທ​ລະ​ສັບ ພ້ອມທັງບັງຄັບໃຫ້ແອັບຯອີເມວເລີ່ມຮຽນຮູ້ຄ່າກຳນົດທີ່ຢູ່ຂອງທ່ານໃໝ່ຕັ້ງແຕ່ຕົ້ນ."</string>
-    <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"ກຳລັງລຶບລ້າງລາຍຊື່ທີ່ຕິດຕໍ່ຫາເລື້ອຍໆ..."</string>
-    <string name="status_available" msgid="2648156525685472626">"ສາມາດໃຊ້ໄດ້"</string>
-    <string name="status_away" msgid="2298688367552893953">"ບໍ່ຢູ່"</string>
-    <string name="status_busy" msgid="5990832098713248503">"ບໍ່ຫວ່າງ"</string>
-    <string name="contactsList" msgid="8806067891419291513">"ລາຍຊື່ຜູ້ຕິດຕໍ່"</string>
-    <string name="contact_suggestions" msgid="3324166754807120006">"ແນະນຳຫຼາຍທີ່ສຸດ"</string>
-    <string name="local_invisible_directory" msgid="4723238462733650090">"ອື່ນໆ"</string>
-    <string name="directory_search_label" msgid="4621215895484025229">"ໄດເຣັກທໍຣີ"</string>
-    <string name="directory_search_label_work" msgid="7679326282707414897">"ໄດເຣັກທໍຣີບ່ອນເຮັດວຽກ"</string>
-    <string name="local_search_label" msgid="907622822323119235">"ລາຍຊື່ຜູ້ຕິດຕໍ່ທັງໝົດ"</string>
-    <string name="local_suggestions_search_label" msgid="1178575146224386118">"ຄຳແນະນຳ"</string>
-    <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"ຂ້ອຍ"</string>
-    <string name="missing_name" msgid="978606963362745020">"(ບໍ່ມີຊື່)"</string>
-    <string name="description_view_contact_detail" msgid="2428742401208561136">"ເບິ່ງລາຍຊື່ຜູ້ຕິດຕໍ່"</string>
-    <string name="list_filter_phones" msgid="8763316061763437182">"ລາຍຊື່ຜູ່ຕິດຕໍ່ທັງໝົດທີ່ມີເບີໂທລະສັບ"</string>
-    <string name="list_filter_phones_work" msgid="7083575404573422965">"ລາຍຊື່ຜູ້ຕິດຕໍ່ຂອງໂປຣໄຟລ໌ບ່ອນເຮັດວຽກ"</string>
-    <string name="view_updates_from_group" msgid="9011641093168385729">"ເບິ່ງອັບເດດ"</string>
-    <string name="account_phone" msgid="7067809073194061035">"ອຸປະກອນເທົ່ານັ້ນ, ບໍ່ຊິ້ງຂໍ້ມູນ"</string>
-    <string name="nameLabelsGroup" msgid="7730465833159557471">"ຊື່"</string>
-    <string name="nicknameLabelsGroup" msgid="6310556912361840029">"ຊື່ຫຼິ້ນ"</string>
-    <string name="full_name" msgid="648186563998465740">"ຊື່"</string>
-    <string name="name_given" msgid="5096576006314820536">"ຊື່"</string>
-    <string name="name_family" msgid="6646235805198547467">"ນາມສະກຸນ"</string>
-    <string name="name_prefix" msgid="9215326539658838">"ຄຳນຳໜ້າຊື່"</string>
-    <string name="name_middle" msgid="703755205331582769">"ຊື່ຮອງ"</string>
-    <string name="name_suffix" msgid="5777083390282548702">"ຄຳຕໍ່ທ້າຍຊື່"</string>
-    <string name="name_phonetic" msgid="1650870996361663089">"ການອອກສຽງຊື່"</string>
-    <string name="name_phonetic_given" msgid="618812334274603170">"ການ​ອອກ​ສຽງ​​ຊື່"</string>
-    <string name="name_phonetic_middle" msgid="4826820763384625538">"ການອອກສຽງຊື່ຮອງ"</string>
-    <string name="name_phonetic_family" msgid="379905191212930771">"ການ​ອອກ​ສຽງ​ນາມ​ສະ​ກຸນ​​​"</string>
-    <string name="phoneLabelsGroup" msgid="169661929021355548">"ໂທລະສັບ"</string>
-    <string name="emailLabelsGroup" msgid="2249752810477488833">"ສົ່ງອີເມວ"</string>
-    <string name="postalLabelsGroup" msgid="6772000590189142253">"ທີ່ຢູ່"</string>
-    <string name="imLabelsGroup" msgid="5718066254237364731">"IM"</string>
-    <string name="organizationLabelsGroup" msgid="1101996309241601435">"ອົງກອນ"</string>
-    <string name="relationLabelsGroup" msgid="53866051664600053">"ຄວາມສຳພັນ"</string>
-    <string name="eventLabelsGroup" msgid="1236970042646618489">"ວັນ​ທີ​ພິ​ເສດ"</string>
-    <string name="sms" msgid="7574344928185328095">"​ຂໍ້​ຄວາມ"</string>
-    <string name="postal_address" msgid="1804707930129674200">"ທີ່ຢູ່"</string>
-    <string name="ghostData_company" msgid="2554310786296833424">"ບໍລິສັດ"</string>
-    <string name="ghostData_title" msgid="4994968731830184837">"ຊື່"</string>
-    <string name="label_notes" msgid="2050255313694219786">"ບັນທຶກ"</string>
-    <string name="label_sip_address" msgid="8883266182575965926">"SIP"</string>
-    <string name="websiteLabelsGroup" msgid="1630734286462186790">"ເວັບໄຊ"</string>
-    <string name="groupsLabel" msgid="2694002798416868728">"ກຸ່ມ"</string>
-    <string name="email_home" msgid="889830029388962171">"ສົ່ງອີ​ເມວຫາອີເມວເຮືອນ"</string>
-    <string name="email_mobile" msgid="4487686436743741150">"ສົ່ງອີ​ເມວຫາອີເມວມືຖື"</string>
-    <string name="email_work" msgid="4223487303344613528">"ສົ່ງອີ​ເມວຫາບ່ອນເຮັດວຽກ"</string>
-    <string name="email_other" msgid="4246411900126012062">"ສົ່ງອີເມວ"</string>
-    <string name="email_custom" msgid="7246580894327511013">"ສົ່ງອີ​ເມວຫາ <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="email" msgid="2807318537887091606">"ສົ່ງອີເມວ"</string>
-    <string name="postal_street" msgid="6918171741240802474">"ຖະໜົນ"</string>
-    <string name="postal_city" msgid="8674569121430005628">"ເມືອງ"</string>
-    <string name="postal_region" msgid="1730369286225469192">"ລັດ"</string>
-    <string name="postal_postcode" msgid="4450700741261990439">"ລະຫັດ ZIP"</string>
-    <string name="postal_country" msgid="232670707458768148">"ປະເທດ"</string>
-    <string name="map_home" msgid="4181131107392126938">"ເບິ່ງ​ເຮືອນ​ທີ່​ຢູ່ເບິ່ງທີ່ຢູ່ເຮືອນ"</string>
-    <string name="map_work" msgid="5723471185992684400">"ເບິ່ງທີ່ຢູ່ບ່ອນເຮັດວຽກ"</string>
-    <string name="map_other" msgid="2253764780863500516">"ເບິ່ງທີ່ຢູ່"</string>
-    <string name="map_custom" msgid="5581743097882436157">"ເບິ່ງທີ່ຢູ່ <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="chat_aim" msgid="2954364435497941659">"ສົນທະນາໂດຍໃຊ້ AIM"</string>
-    <string name="chat_msn" msgid="3130135239071228678">"ສົນທະນາໂດຍໃຊ້ Windows Live"</string>
-    <string name="chat_yahoo" msgid="3233552142326865347">"ສົນທະນາໂດຍໃຊ້ Yahoo"</string>
-    <string name="chat_skype" msgid="6486703981390592425">"ສົນທະນາໂດຍໃຊ້ Skype"</string>
-    <string name="chat_qq" msgid="786924280665740019">"ສົນທະນາໂດຍໃຊ້ QQ"</string>
-    <string name="chat_gtalk" msgid="7914674177243078035">"ສົນທະນາໂດຍໃຊ້ Google Talk"</string>
-    <string name="chat_icq" msgid="3292934726414765801">"ສົນທະນາໂດຍໃຊ້ ICQ"</string>
-    <string name="chat_jabber" msgid="6701542313597880204">"ສົນທະນາໂດຍໃຊ້ Jabber"</string>
-    <string name="chat" msgid="1020428260359370236">"ສົນທະນາ"</string>
-    <string name="list_filter_all_accounts" msgid="473782314881473992">"ລາຍ​ຊື່​ຜູ້ຕິດ​ຕໍ່​ທັງ​ໝົດ"</string>
-    <string name="listAllContactsInAccount" msgid="3486378621592995630">"ລາຍຊື່ຜູ່ຕິດຕໍ່ໃນ <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="listCustomView" msgid="5306282632413086731">"ລາຍຊື່ຜູ່ຕິດຕໍ່ໃນມຸມມອງກຳນົດເອງ"</string>
-    <string name="listSingleContact" msgid="8620818791932382627">"ລາຍຊື່ຜູ່ຕິດຕໍ່ດ່ຽວ"</string>
-    <string name="display_options_sort_list_by" msgid="3541875948367831228">"ຮຽງຕາມ"</string>
-    <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"ຊື່"</string>
-    <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"ນາມສະກຸນ"</string>
-    <string name="display_options_view_names_as" msgid="4204204205736735618">"​ຮູບ​ແບບ​ຊື່"</string>
-    <string name="display_options_view_given_name_first" msgid="2308026973021171020">"​ຊື່​ກ່ອນ"</string>
-    <string name="display_options_view_family_name_first" msgid="987430497292428242">"​ນາມ​ສະ​ກຸນ​ກ່ອນ"</string>
-    <string name="menu_clear_frequents" msgid="5358271535047496120">"ລຶບລາຍຊື່ຄົນທີ່ຕິດຕໍ່ຫາເລື້ອຍໆ"</string>
-    <string name="action_menu_back_from_search" msgid="3550669942742167644">"ຢຸດ​ການ​ຊອກ​ຫາ"</string>
-    <string name="description_clear_search" msgid="2347258825265600782">"ລຶບ​ການ​ຊອກ​ຫາ"</string>
-    <string name="select_account_dialog_title" msgid="2673504582803359239">"ບັນຊີ"</string>
-    <string name="set_default_account" msgid="7966099951006467572">"ໃຊ້​ຊິມ​ນີ້​ເພື່ອ​ການໂທທຸກ​ເທື່ອ"</string>
-    <string name="select_phone_account_for_calls" msgid="1784460686103423274">"ໂທ​ດ້ວຍ"</string>
-    <string name="call_with_a_note" msgid="6242261320491851133">"ໂທ​ດ້ວຍ​ບັນ​ທຶກ"</string>
-    <string name="call_subject_hint" msgid="7233138753650420800">"ພິມ​ບັນ​ທຶກ ເພື່ອ​ສົ່ງ​ກັບ​ການ​ໂທ ..."</string>
-    <string name="send_and_call_button" msgid="4735168294120154013">"ສົ່ງ ແລະ ໂທ"</string>
-    <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="tab_title" msgid="3387876802026074288">"ແຖບ <xliff:g id="TITLE">%1$s</xliff:g>."</string>
-    <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
-      <item quantity="other">ແຖບ <xliff:g id="TITLE_2">%1$s</xliff:g>. <xliff:g id="COUNT_3">%2$d</xliff:g> ລາຍການບໍ່ທັນໄດ້ອ່ານ. </item>
-      <item quantity="one">ແຖບ <xliff:g id="TITLE_0">%1$s</xliff:g>. <xliff:g id="COUNT_1">%2$d</xliff:g> ລາຍການບໍ່ທັນໄດ້ອ່ານ. </item>
-    </plurals>
-    <string name="description_search_video_call" msgid="4337369876888024909">"ໂທວິດີໂອ"</string>
-    <string name="description_search_call_and_share" msgid="4912772842755050467">"ແບ່ງປັນ ແລະ ໂທ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_custom">ໂທຫາ %s</string>
+  <string name="call_home">ໂທຫາເບີບ້ານ</string>
+  <string name="call_mobile">ໂທຫາເບີມືຖື</string>
+  <string name="call_work">ໂທຫາເບີບ່ອນເຮັດວຽກ</string>
+  <string name="call_fax_work">ໂທຫາເບີແຟັກບ່ອນເຮັດວຽກ</string>
+  <string name="call_fax_home">ໂທຫາເບີແຟັກບ້ານ</string>
+  <string name="call_pager">ໂທຫາເບີ pager</string>
+  <string name="call_other">ໂທ</string>
+  <string name="call_callback">ໂທຫາເບີໂທກັບ</string>
+  <string name="call_car">ໂທຫາເບີລົດ</string>
+  <string name="call_company_main">ໂທຫາເບີຫຼັກຂອງບໍລິສັດ</string>
+  <string name="call_isdn">ໂທຫາເບີ ISDN</string>
+  <string name="call_main">ໂທຫາເບີຫຼັກ</string>
+  <string name="call_other_fax">ໂທຫາເບີແຟັກ</string>
+  <string name="call_radio">ໂທຫາເບີວິທະຍຸ</string>
+  <string name="call_telex">ໂທຫາເບີ telex</string>
+  <string name="call_tty_tdd">ໂທຫາເບີ TTY/TDD</string>
+  <string name="call_work_mobile">ໂທຫາເບີມືຖືບ່ອນເຮັດວຽກ</string>
+  <string name="call_work_pager">ໂທຫາ pager ບ່ອນເຮັດວຽກ</string>
+  <string name="call_assistant">ໂທ​ຫາ %s</string>
+  <string name="call_mms">ໂທຫາເບີ MMS</string>
+  <string name="sms_custom">ສົ່ງຂໍ້ຄວາມຫາ %s</string>
+  <string name="sms_home">ສົ່ງຂໍ້ຄວາມຫາເບີບ້ານ</string>
+  <string name="sms_mobile">ສົ່ງຂໍ້ຄວາມຫາເບີມືຖື</string>
+  <string name="sms_work">ສົ່ງຂໍ້ຄວາມຫາເບີບ່ອນເຮັດວຽກ</string>
+  <string name="sms_fax_work">ສົ່ງຂໍ້ຄວາມຫາເບີແຟັກບ່ອນເຮັດວຽກ</string>
+  <string name="sms_fax_home">ສົ່ງຂໍ້ຄວາມຫາເບີແຟັກບ້ານ</string>
+  <string name="sms_pager">ສົ່ງຂໍ້ຄວາມຫາເບີ pager</string>
+  <string name="sms_other">ສົ່ງຂໍ້ຄວາມ</string>
+  <string name="sms_callback">ສົ່ງຂໍ້ຄວາມຫາເບີໂທກັບ</string>
+  <string name="sms_car">ສົ່ງຂໍ້ຄວາມຫາເບີລົດ</string>
+  <string name="sms_company_main">ສົ່ງຂໍ້ຄວາມຫາເບີຫຼັກຂອງບໍລິສັດ</string>
+  <string name="sms_isdn">ສົ່ງຂໍ້ຄວາມຫາເບີ ISDN</string>
+  <string name="sms_main">ສົ່ງຂໍ້ຄວາມຫາເບີຫຼັກ</string>
+  <string name="sms_other_fax">ສົ່ງຂໍ້ຄວາມຫາເບີແຟັກ</string>
+  <string name="sms_radio">ສົ່ງຂໍ້ຄວາມຫາເບີວິທະຍຸ</string>
+  <string name="sms_telex">ສົ່ງຂໍ້ຄວາມຫາເບີ telex</string>
+  <string name="sms_tty_tdd">ສົ່ງຂໍ້ຄວາມຫາເບີ TTY/TDD</string>
+  <string name="sms_work_mobile">ສົ່ງຂໍ້ຄວາມຫາເບີມືຖືບ່ອນເຮັດວຽກ</string>
+  <string name="sms_work_pager">ສົ່ງຂໍ້ຄວາມຫາເບີ pager ບ່ອນເຮັດວຽກ</string>
+  <string name="sms_assistant">ສົ່ງຂໍ້ຄວາມຫາ %s</string>
+  <string name="sms_mms">ສົ່ງຂໍ້ຄວາມຫາເບີ MMS</string>
+  <string name="clearFrequentsConfirmation_title">ລຶບລາຍຊື່ທີ່ຕິດຕໍ່ເລື້ອຍໆອອກ?</string>
+  <string name="clearFrequentsConfirmation">ທ່ານຈະລຶບຂໍ້ມູນລາຍຊື່ທີ່ຕິດຕໍ່ຫາເລື້ອຍໆຢູ່ໃນແອັບຯລາຍ​ຊື່ ແລະໂທ​ລະ​ສັບ ພ້ອມທັງບັງຄັບໃຫ້ແອັບຯອີເມວເລີ່ມຮຽນຮູ້ຄ່າກຳນົດທີ່ຢູ່ຂອງທ່ານໃໝ່ຕັ້ງແຕ່ຕົ້ນ.</string>
+  <string name="clearFrequentsProgress_title">ກຳລັງລຶບລ້າງລາຍຊື່ທີ່ຕິດຕໍ່ຫາເລື້ອຍໆ...</string>
+  <string name="status_available">ສາມາດໃຊ້ໄດ້</string>
+  <string name="status_away">ບໍ່ຢູ່</string>
+  <string name="status_busy">ບໍ່ຫວ່າງ</string>
+  <string name="contactsList">ລາຍຊື່ຜູ້ຕິດຕໍ່</string>
+  <string name="contact_suggestions">ແນະນຳຫຼາຍທີ່ສຸດ</string>
+  <string name="local_invisible_directory">ອື່ນໆ</string>
+  <string name="directory_search_label">ໄດເຣັກທໍຣີ</string>
+  <string name="directory_search_label_work">ໄດເຣັກທໍຣີບ່ອນເຮັດວຽກ</string>
+  <string name="local_search_label">ລາຍຊື່ຜູ້ຕິດຕໍ່ທັງໝົດ</string>
+  <string name="local_suggestions_search_label">ຄຳແນະນຳ</string>
+  <string msgid="9154761216179882405" name="user_profile_contacts_list_header">ຂ້ອຍ</string>
+  <string name="missing_name">(ບໍ່ມີຊື່)</string>
+  <string msgid="2795575601596468581" name="description_view_contact_detail">ເບິ່ງລາຍຊື່ຜູ້ຕິດຕໍ່</string>
+  <string name="list_filter_phones">ລາຍຊື່ຜູ່ຕິດຕໍ່ທັງໝົດທີ່ມີເບີໂທລະສັບ</string>
+  <string name="list_filter_phones_work">ລາຍຊື່ຜູ້ຕິດຕໍ່ຂອງໂປຣໄຟລ໌ບ່ອນເຮັດວຽກ</string>
+  <string name="view_updates_from_group">ເບິ່ງອັບເດດ</string>
+  <string name="account_phone">ອຸປະກອນເທົ່ານັ້ນ, ບໍ່ຊິ້ງຂໍ້ມູນ</string>
+  <string name="nameLabelsGroup">ຊື່</string>
+  <string name="nicknameLabelsGroup">ຊື່ຫຼິ້ນ</string>
+  <string name="full_name">ຊື່</string>
+  <string name="name_given">ຊື່</string>
+  <string name="name_family">ນາມສະກຸນ</string>
+  <string name="name_prefix">ຄຳນຳໜ້າຊື່</string>
+  <string name="name_middle">ຊື່ຮອງ</string>
+  <string name="name_suffix">ຄຳຕໍ່ທ້າຍຊື່</string>
+  <string name="name_phonetic">ການອອກສຽງຊື່</string>
+  <string name="name_phonetic_given">ການ​ອອກ​ສຽງ​​ຊື່</string>
+  <string name="name_phonetic_middle">ການອອກສຽງຊື່ຮອງ</string>
+  <string name="name_phonetic_family">ການ​ອອກ​ສຽງ​ນາມ​ສະ​ກຸນ​​​</string>
+  <string name="phoneLabelsGroup">ໂທລະສັບ</string>
+  <string name="emailLabelsGroup">ສົ່ງອີເມວ</string>
+  <string name="postalLabelsGroup">ທີ່ຢູ່</string>
+  <string name="imLabelsGroup">IM</string>
+  <string name="organizationLabelsGroup">ອົງກອນ</string>
+  <string name="relationLabelsGroup">ຄວາມສຳພັນ</string>
+  <string name="eventLabelsGroup">ວັນ​ທີ​ພິ​ເສດ</string>
+  <string name="sms">​ຂໍ້​ຄວາມ</string>
+  <string name="postal_address">ທີ່ຢູ່</string>
+  <string name="ghostData_company">ບໍລິສັດ</string>
+  <string name="ghostData_title">ຊື່</string>
+  <string name="label_notes">ບັນທຶກ</string>
+  <string name="label_sip_address">SIP</string>
+  <string name="websiteLabelsGroup">ເວັບໄຊ</string>
+  <string name="groupsLabel">ກຸ່ມ</string>
+  <string name="email_home">ສົ່ງອີ​ເມວຫາອີເມວເຮືອນ</string>
+  <string name="email_mobile">ສົ່ງອີ​ເມວຫາອີເມວມືຖື</string>
+  <string name="email_work">ສົ່ງອີ​ເມວຫາບ່ອນເຮັດວຽກ</string>
+  <string name="email_other">ສົ່ງອີເມວ</string>
+  <string name="email_custom">ສົ່ງອີ​ເມວຫາ %s</string>
+  <string name="email">ສົ່ງອີເມວ</string>
+  <string name="postal_street">ຖະໜົນ</string>
+  <string name="postal_city">ເມືອງ</string>
+  <string name="postal_region">ລັດ</string>
+  <string name="postal_postcode">ລະຫັດ ZIP</string>
+  <string name="postal_country">ປະເທດ</string>
+  <string name="map_home">ເບິ່ງ​ເຮືອນ​ທີ່​ຢູ່ເບິ່ງທີ່ຢູ່ເຮືອນ</string>
+  <string name="map_work">ເບິ່ງທີ່ຢູ່ບ່ອນເຮັດວຽກ</string>
+  <string name="map_other">ເບິ່ງທີ່ຢູ່</string>
+  <string name="map_custom">ເບິ່ງທີ່ຢູ່ %s</string>
+  <string name="chat_aim">ສົນທະນາໂດຍໃຊ້ AIM</string>
+  <string name="chat_msn">ສົນທະນາໂດຍໃຊ້ Windows Live</string>
+  <string name="chat_yahoo">ສົນທະນາໂດຍໃຊ້ Yahoo</string>
+  <string name="chat_skype">ສົນທະນາໂດຍໃຊ້ Skype</string>
+  <string name="chat_qq">ສົນທະນາໂດຍໃຊ້ QQ</string>
+  <string name="chat_gtalk">ສົນທະນາໂດຍໃຊ້ Google Talk</string>
+  <string name="chat_icq">ສົນທະນາໂດຍໃຊ້ ICQ</string>
+  <string name="chat_jabber">ສົນທະນາໂດຍໃຊ້ Jabber</string>
+  <string name="chat">ສົນທະນາ</string>
+  <string name="list_filter_all_accounts">ລາຍ​ຊື່​ຜູ້ຕິດ​ຕໍ່​ທັງ​ໝົດ</string>
+  <string name="listAllContactsInAccount">ລາຍຊື່ຜູ່ຕິດຕໍ່ໃນ %s</string>
+  <string name="listCustomView">ລາຍຊື່ຜູ່ຕິດຕໍ່ໃນມຸມມອງກຳນົດເອງ</string>
+  <string name="listSingleContact">ລາຍຊື່ຜູ່ຕິດຕໍ່ດ່ຽວ</string>
+  <string name="display_options_sort_list_by">ຮຽງຕາມ</string>
+  <string name="display_options_sort_by_given_name">ຊື່</string>
+  <string name="display_options_sort_by_family_name">ນາມສະກຸນ</string>
+  <string name="display_options_view_names_as">​ຮູບ​ແບບ​ຊື່</string>
+  <string name="display_options_view_given_name_first">​ຊື່​ກ່ອນ</string>
+  <string name="display_options_view_family_name_first">​ນາມ​ສະ​ກຸນ​ກ່ອນ</string>
+  <string name="menu_clear_frequents">ລຶບລາຍຊື່ຄົນທີ່ຕິດຕໍ່ຫາເລື້ອຍໆ</string>
+  <string name="action_menu_back_from_search">ຢຸດ​ການ​ຊອກ​ຫາ</string>
+  <string name="description_clear_search">ລຶບ​ການ​ຊອກ​ຫາ</string>
+  <string name="select_account_dialog_title">ບັນຊີ</string>
+  <string name="set_default_account">ໃຊ້​ຊິມ​ນີ້​ເພື່ອ​ການໂທທຸກ​ເທື່ອ</string>
+  <string name="select_phone_account_for_calls">ເລືອກ SIM ສຳລັບສາຍນີ້</string>
+  <string name="select_phone_account_for_calls_remember">ຈື່ການເລືອກນີ້ໄວ້</string>
+  <string name="call_with_a_note">ໂທ​ດ້ວຍ​ບັນ​ທຶກ</string>
+  <string name="call_subject_hint">ພິມ​ບັນ​ທຶກ ເພື່ອ​ສົ່ງ​ກັບ​ການ​ໂທ ...</string>
+  <string name="send_and_call_button">ສົ່ງ ແລະ ໂທ</string>
+  <string name="call_subject_limit">%1$s / %2$s</string>
+  <string name="old_call_subject_type_and_number">%1$s %2$s</string>
+  <string name="tab_title">ແຖບ %1$s.</string>
+  <plurals name="tab_title_with_unread_items">
+    <item quantity="one">ແຖບ %1$s. %2$d ລາຍການບໍ່ທັນໄດ້ອ່ານ. </item>
+    <item quantity="other">ແຖບ %1$s. %2$d ລາຍການບໍ່ທັນໄດ້ອ່ານ. </item>
+  </plurals>
+  <string name="description_search_video_call">ໂທວິດີໂອ</string>
+  <string name="description_search_call_and_share">ແບ່ງປັນ ແລະ ໂທ</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-lt/strings.xml b/java/com/android/contacts/common/res/values-lt/strings.xml
index ed6cc7f..6bb47d8 100644
--- a/java/com/android/contacts/common/res/values-lt/strings.xml
+++ b/java/com/android/contacts/common/res/values-lt/strings.xml
@@ -1,164 +1,147 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="toast_text_copied" msgid="8979281391599667362">"Tekstas nukopijuotas"</string>
-    <string name="call_custom" msgid="3041673234638990874">"Skambinti <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="call_home" msgid="125893483593803791">"Skambinti namų telefono numeriu"</string>
-    <string name="call_mobile" msgid="967589404494150813">"Skambinti mobiliojo telefono numeriu"</string>
-    <string name="call_work" msgid="6040550697395300892">"Skambinti darbo telefono numeriu"</string>
-    <string name="call_fax_work" msgid="5260192771364592922">"Skambinti darbo fakso numeriu"</string>
-    <string name="call_fax_home" msgid="5174311195081144124">"Skambinti namų fakso numeriu"</string>
-    <string name="call_pager" msgid="6814149227741274161">"Skambinti pranešimų gaviklio numeriu"</string>
-    <string name="call_other" msgid="5536385588712587235">"Skambinti"</string>
-    <string name="call_callback" msgid="6314019862718112786">"Skambinti atgalinio skambinimo numeriu"</string>
-    <string name="call_car" msgid="3197417098027764954">"Skambinti automobilio telefono numeriu"</string>
-    <string name="call_company_main" msgid="2557663310028446397">"Skambinti pagrindinio įmonės telefono numeriu"</string>
-    <string name="call_isdn" msgid="4691270442763649522">"Skambinti ISDN telefono numeriu"</string>
-    <string name="call_main" msgid="3293707608770407814">"Skambinti pagrindinio telefono numeriu"</string>
-    <string name="call_other_fax" msgid="4724521984879021465">"Skambinti fakso numeriu"</string>
-    <string name="call_radio" msgid="8942441419845057942">"Skambinti radijo telefono numeriu"</string>
-    <string name="call_telex" msgid="2031514461660668351">"Skambinti telekso numeriu"</string>
-    <string name="call_tty_tdd" msgid="7807210224965727701">"Skambinti TTY / TDD numeriu"</string>
-    <string name="call_work_mobile" msgid="2716342732938578495">"Skambinti darbo mobiliojo telefono numeriu"</string>
-    <string name="call_work_pager" msgid="3791778749827366574">"Skambinti darbo pranešimų gaviklio numeriu"</string>
-    <string name="call_assistant" msgid="4177478845473789294">"Skambinti <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
-    <string name="call_mms" msgid="4958811711741872901">"Skambinti MMS telefono numeriu"</string>
-    <string name="sms_custom" msgid="8785368968605026317">"Siųsti teksto pranešimą <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="sms_home" msgid="3527719551060295243">"Siųsti teksto pranešimą namų telefono numeriu"</string>
-    <string name="sms_mobile" msgid="8883045857887736518">"Siųsti teksto pranešimą mobiliojo telefono numeriu"</string>
-    <string name="sms_work" msgid="4158595439553450966">"Siųsti teksto pranešimą darbo telefono numeriu"</string>
-    <string name="sms_fax_work" msgid="5483726627718055248">"Siųsti teksto pranešimą darbo fakso numeriu"</string>
-    <string name="sms_fax_home" msgid="9219265155770746077">"Siųsti teksto pranešimą namų fakso numeriu"</string>
-    <string name="sms_pager" msgid="4901085068525193933">"Siųsti teksto pranešimą pranešimų gaviklio numeriu"</string>
-    <string name="sms_other" msgid="1742702947993285933">"Siųsti teksto pranešimą"</string>
-    <string name="sms_callback" msgid="5833483630377538308">"Siųsti teksto pranešimą atgalinio skambinimo numeriu"</string>
-    <string name="sms_car" msgid="4314577266154395174">"Siųsti teksto pranešimą automobilio telefono numeriu"</string>
-    <string name="sms_company_main" msgid="2308160928487360705">"Siųsti teksto pranešimą pagrindinio įmonės telefono numeriu"</string>
-    <string name="sms_isdn" msgid="6394300346179302542">"Siųsti teksto pranešimą ISDN telefono numeriu"</string>
-    <string name="sms_main" msgid="8908087742014140774">"Siųsti teksto pranešimą pagrindinio telefono numeriu"</string>
-    <string name="sms_other_fax" msgid="8768455473295405427">"Siųsti teksto pranešimą fakso numeriu"</string>
-    <string name="sms_radio" msgid="855555176531704682">"Siųsti teksto pranešimą radijo telefono numeriu"</string>
-    <string name="sms_telex" msgid="6269029276223252719">"Siųsti teksto pranešimą telekso numeriu"</string>
-    <string name="sms_tty_tdd" msgid="6229057354509192444">"Siųsti teksto pranešimą TTY / TDD numeriu"</string>
-    <string name="sms_work_mobile" msgid="2155975469329969840">"Siųsti teksto pranešimą darbo mobiliojo telefono numeriu"</string>
-    <string name="sms_work_pager" msgid="8500140274906830742">"Siųsti teksto pranešimą darbo pranešimų gaviklio numeriu"</string>
-    <string name="sms_assistant" msgid="8513548482745330818">"Siųsti teksto pranešimą <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
-    <string name="sms_mms" msgid="5187888900503248542">"Siųsti MMS telefono numeriu"</string>
-    <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"Išvalyti dažniausius kontaktus?"</string>
-    <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"Išvalysite dažniausių kontaktų sąrašą Kontaktų ir Telefono programose, o el. pašto programoms reikės iš naujo gauti adresavimo nuostatas."</string>
-    <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"Valomi dažniausi kontaktai…"</string>
-    <string name="status_available" msgid="2648156525685472626">"Galima"</string>
-    <string name="status_away" msgid="2298688367552893953">"Pasišalinęs"</string>
-    <string name="status_busy" msgid="5990832098713248503">"Užsiėmęs"</string>
-    <string name="contactsList" msgid="8806067891419291513">"Adresinė"</string>
-    <string name="contact_suggestions" msgid="3324166754807120006">"Populiariausi siūlomi"</string>
-    <string name="local_invisible_directory" msgid="4723238462733650090">"Kita"</string>
-    <string name="directory_search_label" msgid="4621215895484025229">"Katalogas"</string>
-    <string name="directory_search_label_work" msgid="7679326282707414897">"Darbo katalogas"</string>
-    <string name="local_search_label" msgid="907622822323119235">"Visi kontaktai"</string>
-    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Pasiūlymai"</string>
-    <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Aš"</string>
-    <string name="missing_name" msgid="978606963362745020">"(Nėra pavadinimo)"</string>
-    <string name="description_view_contact_detail" msgid="2428742401208561136">"Žr. išsamią kontaktinę informaciją"</string>
-    <string name="list_filter_phones" msgid="8763316061763437182">"Visi kontaktai su telefonų numeriais"</string>
-    <string name="list_filter_phones_work" msgid="7083575404573422965">"Darbo profilio kontaktai"</string>
-    <string name="view_updates_from_group" msgid="9011641093168385729">"Peržiūrėti naujinius"</string>
-    <string name="account_phone" msgid="7067809073194061035">"Tik įrenginys, nesinchronizuojama"</string>
-    <string name="nameLabelsGroup" msgid="7730465833159557471">"Pavadinimas"</string>
-    <string name="nicknameLabelsGroup" msgid="6310556912361840029">"Slapyvardis"</string>
-    <string name="full_name" msgid="648186563998465740">"Pavadinimas"</string>
-    <string name="name_given" msgid="5096576006314820536">"Vardas"</string>
-    <string name="name_family" msgid="6646235805198547467">"Pavardė"</string>
-    <string name="name_prefix" msgid="9215326539658838">"Priešvardis"</string>
-    <string name="name_middle" msgid="703755205331582769">"Antrasis vardas"</string>
-    <string name="name_suffix" msgid="5777083390282548702">"Povardis"</string>
-    <string name="name_phonetic" msgid="1650870996361663089">"Fonetinis vardas"</string>
-    <string name="name_phonetic_given" msgid="618812334274603170">"Vardo fonetinė forma"</string>
-    <string name="name_phonetic_middle" msgid="4826820763384625538">"Fonetinis antrasis vardas"</string>
-    <string name="name_phonetic_family" msgid="379905191212930771">"Pavardės fonetinė forma"</string>
-    <string name="phoneLabelsGroup" msgid="169661929021355548">"Telefonas"</string>
-    <string name="emailLabelsGroup" msgid="2249752810477488833">"El. paštas"</string>
-    <string name="postalLabelsGroup" msgid="6772000590189142253">"Adresas"</string>
-    <string name="imLabelsGroup" msgid="5718066254237364731">"TP"</string>
-    <string name="organizationLabelsGroup" msgid="1101996309241601435">"Organizacija"</string>
-    <string name="relationLabelsGroup" msgid="53866051664600053">"Ryšys"</string>
-    <string name="eventLabelsGroup" msgid="1236970042646618489">"Speciali data"</string>
-    <string name="sms" msgid="7574344928185328095">"teksto pranešimas"</string>
-    <string name="postal_address" msgid="1804707930129674200">"Adresas"</string>
-    <string name="ghostData_company" msgid="2554310786296833424">"Įmonė"</string>
-    <string name="ghostData_title" msgid="4994968731830184837">"Pavadinimas"</string>
-    <string name="label_notes" msgid="2050255313694219786">"Užrašai"</string>
-    <string name="label_sip_address" msgid="8883266182575965926">"SIP"</string>
-    <string name="websiteLabelsGroup" msgid="1630734286462186790">"Svetainė"</string>
-    <string name="groupsLabel" msgid="2694002798416868728">"Grupės"</string>
-    <string name="email_home" msgid="889830029388962171">"Siųsti el. laišką namų el. pašto adresu"</string>
-    <string name="email_mobile" msgid="4487686436743741150">"Siųsti el. laišką el. pašto adresu mobiliesiems"</string>
-    <string name="email_work" msgid="4223487303344613528">"Siųsti el. laišką darbo el. pašto adresu"</string>
-    <string name="email_other" msgid="4246411900126012062">"El. paštas"</string>
-    <string name="email_custom" msgid="7246580894327511013">"El. paštas <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="email" msgid="2807318537887091606">"El. paštas"</string>
-    <string name="postal_street" msgid="6918171741240802474">"Gatvė"</string>
-    <string name="postal_city" msgid="8674569121430005628">"Miestas"</string>
-    <string name="postal_region" msgid="1730369286225469192">"Valstija"</string>
-    <string name="postal_postcode" msgid="4450700741261990439">"Pašto kodas"</string>
-    <string name="postal_country" msgid="232670707458768148">"Šalis"</string>
-    <string name="map_home" msgid="4181131107392126938">"Peržiūrėti namų adresą"</string>
-    <string name="map_work" msgid="5723471185992684400">"Peržiūrėti darbo adresą"</string>
-    <string name="map_other" msgid="2253764780863500516">"Peržiūrėti adresą"</string>
-    <string name="map_custom" msgid="5581743097882436157">"Peržiūrėti <xliff:g id="CUSTOM">%s</xliff:g> adresą"</string>
-    <string name="chat_aim" msgid="2954364435497941659">"Kalbėti naudojant AIM"</string>
-    <string name="chat_msn" msgid="3130135239071228678">"Kalbėti naudojant „Windows Live“"</string>
-    <string name="chat_yahoo" msgid="3233552142326865347">"Kalbėti naudojant „Yahoo“"</string>
-    <string name="chat_skype" msgid="6486703981390592425">"Kalbėti naudojant „Skype“"</string>
-    <string name="chat_qq" msgid="786924280665740019">"Kalbėti naudojant QQ"</string>
-    <string name="chat_gtalk" msgid="7914674177243078035">"Kalbėti naudojant „Google“ pokalbius"</string>
-    <string name="chat_icq" msgid="3292934726414765801">"Kalbėti naudojant ICQ"</string>
-    <string name="chat_jabber" msgid="6701542313597880204">"Kalbėti naudojant „Jabber“"</string>
-    <string name="chat" msgid="1020428260359370236">"Pokalbis"</string>
-    <string name="list_filter_all_accounts" msgid="473782314881473992">"Visi kontaktai"</string>
-    <string name="listAllContactsInAccount" msgid="3486378621592995630">"<xliff:g id="NAME">%s</xliff:g> kontaktai"</string>
-    <string name="listCustomView" msgid="5306282632413086731">"Kontaktai tinkintame rodinyje"</string>
-    <string name="listSingleContact" msgid="8620818791932382627">"Vienas kontaktas"</string>
-    <string name="display_options_sort_list_by" msgid="3541875948367831228">"Rūšiuoti pagal"</string>
-    <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"Vardas"</string>
-    <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"Pavardė"</string>
-    <string name="display_options_view_names_as" msgid="4204204205736735618">"Vardo formatas"</string>
-    <string name="display_options_view_given_name_first" msgid="2308026973021171020">"Pirmiausia vardas"</string>
-    <string name="display_options_view_family_name_first" msgid="987430497292428242">"Pirmiausia pavardė"</string>
-    <string name="menu_clear_frequents" msgid="5358271535047496120">"Valyti dažniausiai naudojamus"</string>
-    <string name="action_menu_back_from_search" msgid="3550669942742167644">"sustabdyti paiešką"</string>
-    <string name="description_clear_search" msgid="2347258825265600782">"Išvalyti paiešką"</string>
-    <string name="select_account_dialog_title" msgid="2673504582803359239">"Paskyra"</string>
-    <string name="set_default_account" msgid="7966099951006467572">"Visada naudoti tai skambučiams"</string>
-    <string name="select_phone_account_for_calls" msgid="1784460686103423274">"Skambinkite naudodami"</string>
-    <string name="call_with_a_note" msgid="6242261320491851133">"Skambutis su užrašu"</string>
-    <string name="call_subject_hint" msgid="7233138753650420800">"Įveskite užrašą, kurį galima išsiųsti skambinant..."</string>
-    <string name="send_and_call_button" msgid="4735168294120154013">"SIŲSTI IR SKAMBINTI"</string>
-    <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="tab_title" msgid="3387876802026074288">"Skirtukas „<xliff:g id="TITLE">%1$s</xliff:g>“."</string>
-    <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
-      <item quantity="one"> Skirtukas „<xliff:g id="TITLE_2">%1$s</xliff:g>“. <xliff:g id="COUNT_3">%2$d</xliff:g> neskaitytas elementas. </item>
-      <item quantity="few"> Skirtukas „<xliff:g id="TITLE_2">%1$s</xliff:g>“. <xliff:g id="COUNT_3">%2$d</xliff:g> neskaityti elementai. </item>
-      <item quantity="many"> Skirtukas „<xliff:g id="TITLE_2">%1$s</xliff:g>“. <xliff:g id="COUNT_3">%2$d</xliff:g> neskaityto elemento. </item>
-      <item quantity="other"> Skirtukas „<xliff:g id="TITLE_2">%1$s</xliff:g>“. <xliff:g id="COUNT_3">%2$d</xliff:g> neskaitytų elementų. </item>
-    </plurals>
-    <string name="description_search_video_call" msgid="4337369876888024909">"Vaizdo skambutis"</string>
-    <string name="description_search_call_and_share" msgid="4912772842755050467">"Bendrinti ir skambinti"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_custom">Skambinti %s</string>
+  <string name="call_home">Skambinti namų telefono numeriu</string>
+  <string name="call_mobile">Skambinti mobiliojo telefono numeriu</string>
+  <string name="call_work">Skambinti darbo telefono numeriu</string>
+  <string name="call_fax_work">Skambinti darbo fakso numeriu</string>
+  <string name="call_fax_home">Skambinti namų fakso numeriu</string>
+  <string name="call_pager">Skambinti pranešimų gaviklio numeriu</string>
+  <string name="call_other">Skambinti</string>
+  <string name="call_callback">Skambinti atgalinio skambinimo numeriu</string>
+  <string name="call_car">Skambinti automobilio telefono numeriu</string>
+  <string name="call_company_main">Skambinti pagrindinio įmonės telefono numeriu</string>
+  <string name="call_isdn">Skambinti ISDN telefono numeriu</string>
+  <string name="call_main">Skambinti pagrindinio telefono numeriu</string>
+  <string name="call_other_fax">Skambinti fakso numeriu</string>
+  <string name="call_radio">Skambinti radijo telefono numeriu</string>
+  <string name="call_telex">Skambinti telekso numeriu</string>
+  <string name="call_tty_tdd">Skambinti TTY / TDD numeriu</string>
+  <string name="call_work_mobile">Skambinti darbo mobiliojo telefono numeriu</string>
+  <string name="call_work_pager">Skambinti darbo pranešimų gaviklio numeriu</string>
+  <string name="call_assistant">Skambinti %s</string>
+  <string name="call_mms">Skambinti MMS telefono numeriu</string>
+  <string name="sms_custom">Siųsti teksto pranešimą %s</string>
+  <string name="sms_home">Siųsti teksto pranešimą namų telefono numeriu</string>
+  <string name="sms_mobile">Siųsti teksto pranešimą mobiliojo telefono numeriu</string>
+  <string name="sms_work">Siųsti teksto pranešimą darbo telefono numeriu</string>
+  <string name="sms_fax_work">Siųsti teksto pranešimą darbo fakso numeriu</string>
+  <string name="sms_fax_home">Siųsti teksto pranešimą namų fakso numeriu</string>
+  <string name="sms_pager">Siųsti teksto pranešimą pranešimų gaviklio numeriu</string>
+  <string name="sms_other">Siųsti teksto pranešimą</string>
+  <string name="sms_callback">Siųsti teksto pranešimą atgalinio skambinimo numeriu</string>
+  <string name="sms_car">Siųsti teksto pranešimą automobilio telefono numeriu</string>
+  <string name="sms_company_main">Siųsti teksto pranešimą pagrindinio įmonės telefono numeriu</string>
+  <string name="sms_isdn">Siųsti teksto pranešimą ISDN telefono numeriu</string>
+  <string name="sms_main">Siųsti teksto pranešimą pagrindinio telefono numeriu</string>
+  <string name="sms_other_fax">Siųsti teksto pranešimą fakso numeriu</string>
+  <string name="sms_radio">Siųsti teksto pranešimą radijo telefono numeriu</string>
+  <string name="sms_telex">Siųsti teksto pranešimą telekso numeriu</string>
+  <string name="sms_tty_tdd">Siųsti teksto pranešimą TTY / TDD numeriu</string>
+  <string name="sms_work_mobile">Siųsti teksto pranešimą darbo mobiliojo telefono numeriu</string>
+  <string name="sms_work_pager">Siųsti teksto pranešimą darbo pranešimų gaviklio numeriu</string>
+  <string name="sms_assistant">Siųsti teksto pranešimą %s</string>
+  <string name="sms_mms">Siųsti MMS telefono numeriu</string>
+  <string name="clearFrequentsConfirmation_title">Išvalyti dažniausius kontaktus?</string>
+  <string name="clearFrequentsConfirmation">Išvalysite dažniausių kontaktų sąrašą Kontaktų ir Telefono programose, o el. pašto programoms reikės iš naujo gauti adresavimo nuostatas.</string>
+  <string name="clearFrequentsProgress_title">Valomi dažniausi kontaktai…</string>
+  <string name="status_available">Galima</string>
+  <string name="status_away">Pasišalinęs</string>
+  <string name="status_busy">Užsiėmęs</string>
+  <string name="contactsList">Adresinė</string>
+  <string name="contact_suggestions">Populiariausi siūlomi</string>
+  <string name="local_invisible_directory">Kita</string>
+  <string name="directory_search_label">Katalogas</string>
+  <string name="directory_search_label_work">Darbo katalogas</string>
+  <string name="local_search_label">Visi kontaktai</string>
+  <string name="local_suggestions_search_label">Pasiūlymai</string>
+  <string msgid="9154761216179882405" name="user_profile_contacts_list_header">Aš</string>
+  <string name="missing_name">(Nėra pavadinimo)</string>
+  <string msgid="2795575601596468581" name="description_view_contact_detail">Žr. išsamią kontaktinę informaciją</string>
+  <string name="list_filter_phones">Visi kontaktai su telefonų numeriais</string>
+  <string name="list_filter_phones_work">Darbo profilio kontaktai</string>
+  <string name="view_updates_from_group">Peržiūrėti naujinius</string>
+  <string name="account_phone">Tik įrenginys, nesinchronizuojama</string>
+  <string name="nameLabelsGroup">Pavadinimas</string>
+  <string name="nicknameLabelsGroup">Slapyvardis</string>
+  <string name="full_name">Pavadinimas</string>
+  <string name="name_given">Vardas</string>
+  <string name="name_family">Pavardė</string>
+  <string name="name_prefix">Priešvardis</string>
+  <string name="name_middle">Antrasis vardas</string>
+  <string name="name_suffix">Povardis</string>
+  <string name="name_phonetic">Fonetinis vardas</string>
+  <string name="name_phonetic_given">Vardo fonetinė forma</string>
+  <string name="name_phonetic_middle">Fonetinis antrasis vardas</string>
+  <string name="name_phonetic_family">Pavardės fonetinė forma</string>
+  <string name="phoneLabelsGroup">Telefonas</string>
+  <string name="emailLabelsGroup">El. paštas</string>
+  <string name="postalLabelsGroup">Adresas</string>
+  <string name="imLabelsGroup">TP</string>
+  <string name="organizationLabelsGroup">Organizacija</string>
+  <string name="relationLabelsGroup">Ryšys</string>
+  <string name="eventLabelsGroup">Speciali data</string>
+  <string name="sms">teksto pranešimas</string>
+  <string name="postal_address">Adresas</string>
+  <string name="ghostData_company">Įmonė</string>
+  <string name="ghostData_title">Pavadinimas</string>
+  <string name="label_notes">Užrašai</string>
+  <string name="label_sip_address">SIP</string>
+  <string name="websiteLabelsGroup">Svetainė</string>
+  <string name="groupsLabel">Grupės</string>
+  <string name="email_home">Siųsti el. laišką namų el. pašto adresu</string>
+  <string name="email_mobile">Siųsti el. laišką el. pašto adresu mobiliesiems</string>
+  <string name="email_work">Siųsti el. laišką darbo el. pašto adresu</string>
+  <string name="email_other">El. paštas</string>
+  <string name="email_custom">El. paštas %s</string>
+  <string name="email">El. paštas</string>
+  <string name="postal_street">Gatvė</string>
+  <string name="postal_city">Miestas</string>
+  <string name="postal_region">Valstija</string>
+  <string name="postal_postcode">Pašto kodas</string>
+  <string name="postal_country">Šalis</string>
+  <string name="map_home">Peržiūrėti namų adresą</string>
+  <string name="map_work">Peržiūrėti darbo adresą</string>
+  <string name="map_other">Peržiūrėti adresą</string>
+  <string name="map_custom">Peržiūrėti %s adresą</string>
+  <string name="chat_aim">Kalbėti naudojant AIM</string>
+  <string name="chat_msn">Kalbėti naudojant „Windows Live“</string>
+  <string name="chat_yahoo">Kalbėti naudojant „Yahoo“</string>
+  <string name="chat_skype">Kalbėti naudojant „Skype“</string>
+  <string name="chat_qq">Kalbėti naudojant QQ</string>
+  <string name="chat_gtalk">Kalbėti naudojant „Google“ pokalbius</string>
+  <string name="chat_icq">Kalbėti naudojant ICQ</string>
+  <string name="chat_jabber">Kalbėti naudojant „Jabber“</string>
+  <string name="chat">Pokalbis</string>
+  <string name="list_filter_all_accounts">Visi kontaktai</string>
+  <string name="listAllContactsInAccount">%s kontaktai</string>
+  <string name="listCustomView">Kontaktai tinkintame rodinyje</string>
+  <string name="listSingleContact">Vienas kontaktas</string>
+  <string name="display_options_sort_list_by">Rūšiuoti pagal</string>
+  <string name="display_options_sort_by_given_name">Vardas</string>
+  <string name="display_options_sort_by_family_name">Pavardė</string>
+  <string name="display_options_view_names_as">Vardo formatas</string>
+  <string name="display_options_view_given_name_first">Pirmiausia vardas</string>
+  <string name="display_options_view_family_name_first">Pirmiausia pavardė</string>
+  <string name="menu_clear_frequents">Valyti dažniausiai naudojamus</string>
+  <string name="action_menu_back_from_search">sustabdyti paiešką</string>
+  <string name="description_clear_search">Išvalyti paiešką</string>
+  <string name="select_account_dialog_title">Paskyra</string>
+  <string name="set_default_account">Visada naudoti tai skambučiams</string>
+  <string name="select_phone_account_for_calls">Pasir. SIM k., kad gal. atl. šį skamb.</string>
+  <string name="select_phone_account_for_calls_remember">Atsiminti šį pasirinkimą</string>
+  <string name="call_with_a_note">Skambutis su užrašu</string>
+  <string name="call_subject_hint">Įveskite užrašą, kurį galima išsiųsti skambinant...</string>
+  <string name="send_and_call_button">SIŲSTI IR SKAMBINTI</string>
+  <string name="call_subject_limit">%1$s / %2$s</string>
+  <string name="old_call_subject_type_and_number">%1$s %2$s</string>
+  <string name="tab_title">Skirtukas „%1$s“.</string>
+  <plurals name="tab_title_with_unread_items">
+    <item quantity="one"> Skirtukas „%1$s“. %2$d neskaitytas elementas. </item>
+    <item quantity="few"> Skirtukas „%1$s“. %2$d neskaityti elementai. </item>
+    <item quantity="many"> Skirtukas „%1$s“. %2$d neskaityto elemento. </item>
+    <item quantity="other"> Skirtukas „%1$s“. %2$d neskaitytų elementų. </item>
+  </plurals>
+  <string name="description_search_video_call">Vaizdo skambutis</string>
+  <string name="description_search_call_and_share">Bendrinti ir skambinti</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-lv/strings.xml b/java/com/android/contacts/common/res/values-lv/strings.xml
index 494919e..95976ab 100644
--- a/java/com/android/contacts/common/res/values-lv/strings.xml
+++ b/java/com/android/contacts/common/res/values-lv/strings.xml
@@ -1,163 +1,146 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="toast_text_copied" msgid="8979281391599667362">"Teksts ir nokopēts"</string>
-    <string name="call_custom" msgid="3041673234638990874">"Zvanīt: <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="call_home" msgid="125893483593803791">"Zvanīt uz mājas tālruni"</string>
-    <string name="call_mobile" msgid="967589404494150813">"Zvanīt uz mobilo tālruni"</string>
-    <string name="call_work" msgid="6040550697395300892">"Zvanīt uz darba tālruni"</string>
-    <string name="call_fax_work" msgid="5260192771364592922">"Zvanīt uz darba faksa numuru"</string>
-    <string name="call_fax_home" msgid="5174311195081144124">"Zvanīt uz mājas faksa numuru"</string>
-    <string name="call_pager" msgid="6814149227741274161">"Zvanīt uz peidžeri"</string>
-    <string name="call_other" msgid="5536385588712587235">"Zvanīt"</string>
-    <string name="call_callback" msgid="6314019862718112786">"Zvanīt uz atzvana numuru"</string>
-    <string name="call_car" msgid="3197417098027764954">"Zvanīt uz automobiļa tālruņa numuru"</string>
-    <string name="call_company_main" msgid="2557663310028446397">"Zvanīt uz uzņēmuma galveno tālruņa numuru"</string>
-    <string name="call_isdn" msgid="4691270442763649522">"Zvanīt uz ISDN"</string>
-    <string name="call_main" msgid="3293707608770407814">"Zvanīt uz galveno tālruņa numuru"</string>
-    <string name="call_other_fax" msgid="4724521984879021465">"Zvanīt uz faksu"</string>
-    <string name="call_radio" msgid="8942441419845057942">"Zvanīt uz radioierīci"</string>
-    <string name="call_telex" msgid="2031514461660668351">"Zvanīt uz teleksu"</string>
-    <string name="call_tty_tdd" msgid="7807210224965727701">"Zvanīt uz teksta tālruni/surdotālruni"</string>
-    <string name="call_work_mobile" msgid="2716342732938578495">"Zvanīt uz darba mobilo tālruni"</string>
-    <string name="call_work_pager" msgid="3791778749827366574">"Zvanīt uz darba peidžeri"</string>
-    <string name="call_assistant" msgid="4177478845473789294">"Zvanīt: <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
-    <string name="call_mms" msgid="4958811711741872901">"Zvanīt uz multiziņas numuru"</string>
-    <string name="sms_custom" msgid="8785368968605026317">"Sūtīt īsziņu: <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="sms_home" msgid="3527719551060295243">"Sūtīt īsziņu uz mājas tālruņa numuru"</string>
-    <string name="sms_mobile" msgid="8883045857887736518">"Sūtīt īsziņu uz mobilo tālruni"</string>
-    <string name="sms_work" msgid="4158595439553450966">"Sūtīt īsziņu uz darba tālruni"</string>
-    <string name="sms_fax_work" msgid="5483726627718055248">"Sūtīt īsziņu uz darba faksa numuru"</string>
-    <string name="sms_fax_home" msgid="9219265155770746077">"Sūtīt īsziņu uz mājas faksa numuru"</string>
-    <string name="sms_pager" msgid="4901085068525193933">"Sūtīt īsziņu uz peidžeri"</string>
-    <string name="sms_other" msgid="1742702947993285933">"Sūtīt īsziņu"</string>
-    <string name="sms_callback" msgid="5833483630377538308">"Sūtīt īsziņu uz atzvana numuru"</string>
-    <string name="sms_car" msgid="4314577266154395174">"Sūtīt īsziņu uz automobiļa tālruņa numuru"</string>
-    <string name="sms_company_main" msgid="2308160928487360705">"Sūtīt īsziņu uz uzņēmuma galveno tālruņa numuru"</string>
-    <string name="sms_isdn" msgid="6394300346179302542">"Sūtīt īsziņu uz ISDN"</string>
-    <string name="sms_main" msgid="8908087742014140774">"Sūtīt īsziņu uz galveno tālruņa numuru"</string>
-    <string name="sms_other_fax" msgid="8768455473295405427">"Sūtīt īsziņu uz faksu"</string>
-    <string name="sms_radio" msgid="855555176531704682">"Sūtīt īsziņu uz radioierīci"</string>
-    <string name="sms_telex" msgid="6269029276223252719">"Sūtīt īsziņu uz teleksu"</string>
-    <string name="sms_tty_tdd" msgid="6229057354509192444">"Sūtīt īsziņu uz teksta tālruni/surdotālruni"</string>
-    <string name="sms_work_mobile" msgid="2155975469329969840">"Sūtīt īsziņu uz darba mobilo tālruni"</string>
-    <string name="sms_work_pager" msgid="8500140274906830742">"Sūtīt īsziņu uz darba peidžeri"</string>
-    <string name="sms_assistant" msgid="8513548482745330818">"Sūtīt īsziņu: <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
-    <string name="sms_mms" msgid="5187888900503248542">"Sūtīt multiziņu"</string>
-    <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"Vai dzēst bieži lietotos kontaktus?"</string>
-    <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"Tiks dzēsts bieži lietoto kontaktpersonu saraksts lietotnēs Kontaktpersonas un Tālrunis, un e-pasta lietotnēs no jauna tiks sākta adrešu preferenču saglabāšana."</string>
-    <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"Bieži lietoto kontaktu dzēšana..."</string>
-    <string name="status_available" msgid="2648156525685472626">"Pieejams"</string>
-    <string name="status_away" msgid="2298688367552893953">"Prombūtnē"</string>
-    <string name="status_busy" msgid="5990832098713248503">"Aizņemts"</string>
-    <string name="contactsList" msgid="8806067891419291513">"Kontaktpersonas"</string>
-    <string name="contact_suggestions" msgid="3324166754807120006">"Populārākie ieteikumi"</string>
-    <string name="local_invisible_directory" msgid="4723238462733650090">"Cits"</string>
-    <string name="directory_search_label" msgid="4621215895484025229">"Katalogs"</string>
-    <string name="directory_search_label_work" msgid="7679326282707414897">"Darba katalogs"</string>
-    <string name="local_search_label" msgid="907622822323119235">"Visas kontaktpersonas"</string>
-    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Ieteikumi"</string>
-    <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Es"</string>
-    <string name="missing_name" msgid="978606963362745020">"(Nav vārda)"</string>
-    <string name="description_view_contact_detail" msgid="2428742401208561136">"Skatīt kontaktpersonu"</string>
-    <string name="list_filter_phones" msgid="8763316061763437182">"Visas kontaktpersonas ar tālruņa numuriem"</string>
-    <string name="list_filter_phones_work" msgid="7083575404573422965">"Kontaktpersonas darba profilā"</string>
-    <string name="view_updates_from_group" msgid="9011641093168385729">"Skatīt atjauninājumus"</string>
-    <string name="account_phone" msgid="7067809073194061035">"Tikai ierīcē, netiek sinhronizēta"</string>
-    <string name="nameLabelsGroup" msgid="7730465833159557471">"Vārds un uzvārds"</string>
-    <string name="nicknameLabelsGroup" msgid="6310556912361840029">"Segvārds"</string>
-    <string name="full_name" msgid="648186563998465740">"Vārds"</string>
-    <string name="name_given" msgid="5096576006314820536">"Vārds"</string>
-    <string name="name_family" msgid="6646235805198547467">"Uzvārds"</string>
-    <string name="name_prefix" msgid="9215326539658838">"Uzruna"</string>
-    <string name="name_middle" msgid="703755205331582769">"Otrais vārds"</string>
-    <string name="name_suffix" msgid="5777083390282548702">"Uzruna"</string>
-    <string name="name_phonetic" msgid="1650870996361663089">"Vārda un uzvārda izruna"</string>
-    <string name="name_phonetic_given" msgid="618812334274603170">"Vārda izruna"</string>
-    <string name="name_phonetic_middle" msgid="4826820763384625538">"Otrā vārda izruna"</string>
-    <string name="name_phonetic_family" msgid="379905191212930771">"Uzvārda izruna"</string>
-    <string name="phoneLabelsGroup" msgid="169661929021355548">"Tālrunis"</string>
-    <string name="emailLabelsGroup" msgid="2249752810477488833">"Sūtīt e-pasta ziņojumu"</string>
-    <string name="postalLabelsGroup" msgid="6772000590189142253">"Adrese"</string>
-    <string name="imLabelsGroup" msgid="5718066254237364731">"Tūlītēja ziņapmaiņa"</string>
-    <string name="organizationLabelsGroup" msgid="1101996309241601435">"Organizācija"</string>
-    <string name="relationLabelsGroup" msgid="53866051664600053">"Saistība"</string>
-    <string name="eventLabelsGroup" msgid="1236970042646618489">"Īpašs datums"</string>
-    <string name="sms" msgid="7574344928185328095">"Īsziņa"</string>
-    <string name="postal_address" msgid="1804707930129674200">"Adrese"</string>
-    <string name="ghostData_company" msgid="2554310786296833424">"Uzņēmums"</string>
-    <string name="ghostData_title" msgid="4994968731830184837">"Nosaukums"</string>
-    <string name="label_notes" msgid="2050255313694219786">"Piezīmes"</string>
-    <string name="label_sip_address" msgid="8883266182575965926">"SIP"</string>
-    <string name="websiteLabelsGroup" msgid="1630734286462186790">"Vietne"</string>
-    <string name="groupsLabel" msgid="2694002798416868728">"Grupas"</string>
-    <string name="email_home" msgid="889830029388962171">"Sūtīt e-pasta ziņojumu uz privāto adresi"</string>
-    <string name="email_mobile" msgid="4487686436743741150">"Sūtīt e-pasta ziņojumu uz mobilo tālruni"</string>
-    <string name="email_work" msgid="4223487303344613528">"Sūtīt e-pasta ziņojumu uz darba adresi"</string>
-    <string name="email_other" msgid="4246411900126012062">"Sūtīt e-pasta ziņojumu"</string>
-    <string name="email_custom" msgid="7246580894327511013">"Sūtīt e-pasta ziņojumu uz: <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="email" msgid="2807318537887091606">"Sūtīt e-pasta ziņojumu"</string>
-    <string name="postal_street" msgid="6918171741240802474">"Iela"</string>
-    <string name="postal_city" msgid="8674569121430005628">"Pilsēta"</string>
-    <string name="postal_region" msgid="1730369286225469192">"Štats"</string>
-    <string name="postal_postcode" msgid="4450700741261990439">"Pasta indekss"</string>
-    <string name="postal_country" msgid="232670707458768148">"Valsts"</string>
-    <string name="map_home" msgid="4181131107392126938">"Skatīt mājas adresi"</string>
-    <string name="map_work" msgid="5723471185992684400">"Skatīt darba adresi"</string>
-    <string name="map_other" msgid="2253764780863500516">"Skatīt adresi"</string>
-    <string name="map_custom" msgid="5581743097882436157">"Skatīt lietotāja <xliff:g id="CUSTOM">%s</xliff:g> adresi"</string>
-    <string name="chat_aim" msgid="2954364435497941659">"Tērzēt, izmantojot AIM"</string>
-    <string name="chat_msn" msgid="3130135239071228678">"Tērzēt, izmantojot Windows Live"</string>
-    <string name="chat_yahoo" msgid="3233552142326865347">"Tērzēt, izmantojot Yahoo"</string>
-    <string name="chat_skype" msgid="6486703981390592425">"Tērzēt, izmantojot Skype"</string>
-    <string name="chat_qq" msgid="786924280665740019">"Tērzēt, izmantojot QQ"</string>
-    <string name="chat_gtalk" msgid="7914674177243078035">"Tērzēt, izmantojot Google Talk"</string>
-    <string name="chat_icq" msgid="3292934726414765801">"Tērzēt, izmantojot ICQ"</string>
-    <string name="chat_jabber" msgid="6701542313597880204">"Tērzēt, izmantojot Jabber"</string>
-    <string name="chat" msgid="1020428260359370236">"Tērzēt"</string>
-    <string name="list_filter_all_accounts" msgid="473782314881473992">"Visas kontaktpersonas"</string>
-    <string name="listAllContactsInAccount" msgid="3486378621592995630">"Kontaktpersonas sarakstā <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="listCustomView" msgid="5306282632413086731">"Lietotāju filtrs"</string>
-    <string name="listSingleContact" msgid="8620818791932382627">"Viena kontaktpersona"</string>
-    <string name="display_options_sort_list_by" msgid="3541875948367831228">"Kārtot pēc"</string>
-    <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"Vārds"</string>
-    <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"Uzvārds"</string>
-    <string name="display_options_view_names_as" msgid="4204204205736735618">"Vārda formāts"</string>
-    <string name="display_options_view_given_name_first" msgid="2308026973021171020">"Vispirms rādīt vārdu"</string>
-    <string name="display_options_view_family_name_first" msgid="987430497292428242">"Vispirms rādīt uzvārdu"</string>
-    <string name="menu_clear_frequents" msgid="5358271535047496120">"Dzēst bieži lietotos kontaktus"</string>
-    <string name="action_menu_back_from_search" msgid="3550669942742167644">"pārtraukt meklēšanu"</string>
-    <string name="description_clear_search" msgid="2347258825265600782">"Notīrīt meklēšanas lauku"</string>
-    <string name="select_account_dialog_title" msgid="2673504582803359239">"Konts"</string>
-    <string name="set_default_account" msgid="7966099951006467572">"Vienmēr izmantot zvaniem"</string>
-    <string name="select_phone_account_for_calls" msgid="1784460686103423274">"Zvanīt, izmantojot"</string>
-    <string name="call_with_a_note" msgid="6242261320491851133">"Zvanīt ar piezīmi"</string>
-    <string name="call_subject_hint" msgid="7233138753650420800">"Ierakstiet piezīmi, ko nosūtīt ar zvanu..."</string>
-    <string name="send_and_call_button" msgid="4735168294120154013">"SŪTĪT UN ZVANĪT"</string>
-    <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g> no <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g>: <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="tab_title" msgid="3387876802026074288">"Cilne “<xliff:g id="TITLE">%1$s</xliff:g>”"</string>
-    <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
-      <item quantity="zero"> Cilne “<xliff:g id="TITLE_2">%1$s</xliff:g>”. <xliff:g id="COUNT_3">%2$d</xliff:g> nelasīti vienumi. </item>
-      <item quantity="one"> Cilne “<xliff:g id="TITLE_2">%1$s</xliff:g>”. <xliff:g id="COUNT_3">%2$d</xliff:g> nelasīts vienums. </item>
-      <item quantity="other"> Cilne “<xliff:g id="TITLE_2">%1$s</xliff:g>”. <xliff:g id="COUNT_3">%2$d</xliff:g> nelasīti vienumi. </item>
-    </plurals>
-    <string name="description_search_video_call" msgid="4337369876888024909">"Videozvans"</string>
-    <string name="description_search_call_and_share" msgid="4912772842755050467">"Kopīgot un zvanīt"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_custom">Zvanīt: %s</string>
+  <string name="call_home">Zvanīt uz mājas tālruni</string>
+  <string name="call_mobile">Zvanīt uz mobilo tālruni</string>
+  <string name="call_work">Zvanīt uz darba tālruni</string>
+  <string name="call_fax_work">Zvanīt uz darba faksa numuru</string>
+  <string name="call_fax_home">Zvanīt uz mājas faksa numuru</string>
+  <string name="call_pager">Zvanīt uz peidžeri</string>
+  <string name="call_other">Zvanīt</string>
+  <string name="call_callback">Zvanīt uz atzvana numuru</string>
+  <string name="call_car">Zvanīt uz automobiļa tālruņa numuru</string>
+  <string name="call_company_main">Zvanīt uz uzņēmuma galveno tālruņa numuru</string>
+  <string name="call_isdn">Zvanīt uz ISDN</string>
+  <string name="call_main">Zvanīt uz galveno tālruņa numuru</string>
+  <string name="call_other_fax">Zvanīt uz faksu</string>
+  <string name="call_radio">Zvanīt uz radioierīci</string>
+  <string name="call_telex">Zvanīt uz teleksu</string>
+  <string name="call_tty_tdd">Zvanīt uz teksta tālruni/surdotālruni</string>
+  <string name="call_work_mobile">Zvanīt uz darba mobilo tālruni</string>
+  <string name="call_work_pager">Zvanīt uz darba peidžeri</string>
+  <string name="call_assistant">Zvanīt: %s</string>
+  <string name="call_mms">Zvanīt uz multiziņas numuru</string>
+  <string name="sms_custom">Sūtīt īsziņu: %s</string>
+  <string name="sms_home">Sūtīt īsziņu uz mājas tālruņa numuru</string>
+  <string name="sms_mobile">Sūtīt īsziņu uz mobilo tālruni</string>
+  <string name="sms_work">Sūtīt īsziņu uz darba tālruni</string>
+  <string name="sms_fax_work">Sūtīt īsziņu uz darba faksa numuru</string>
+  <string name="sms_fax_home">Sūtīt īsziņu uz mājas faksa numuru</string>
+  <string name="sms_pager">Sūtīt īsziņu uz peidžeri</string>
+  <string name="sms_other">Sūtīt īsziņu</string>
+  <string name="sms_callback">Sūtīt īsziņu uz atzvana numuru</string>
+  <string name="sms_car">Sūtīt īsziņu uz automobiļa tālruņa numuru</string>
+  <string name="sms_company_main">Sūtīt īsziņu uz uzņēmuma galveno tālruņa numuru</string>
+  <string name="sms_isdn">Sūtīt īsziņu uz ISDN</string>
+  <string name="sms_main">Sūtīt īsziņu uz galveno tālruņa numuru</string>
+  <string name="sms_other_fax">Sūtīt īsziņu uz faksu</string>
+  <string name="sms_radio">Sūtīt īsziņu uz radioierīci</string>
+  <string name="sms_telex">Sūtīt īsziņu uz teleksu</string>
+  <string name="sms_tty_tdd">Sūtīt īsziņu uz teksta tālruni/surdotālruni</string>
+  <string name="sms_work_mobile">Sūtīt īsziņu uz darba mobilo tālruni</string>
+  <string name="sms_work_pager">Sūtīt īsziņu uz darba peidžeri</string>
+  <string name="sms_assistant">Sūtīt īsziņu: %s</string>
+  <string name="sms_mms">Sūtīt multiziņu</string>
+  <string name="clearFrequentsConfirmation_title">Vai dzēst bieži lietotos kontaktus?</string>
+  <string name="clearFrequentsConfirmation">Tiks dzēsts bieži lietoto kontaktpersonu saraksts lietotnēs Kontaktpersonas un Tālrunis, un e-pasta lietotnēs no jauna tiks sākta adrešu preferenču saglabāšana.</string>
+  <string name="clearFrequentsProgress_title">Bieži lietoto kontaktu dzēšana...</string>
+  <string name="status_available">Pieejams</string>
+  <string name="status_away">Prombūtnē</string>
+  <string name="status_busy">Aizņemts</string>
+  <string name="contactsList">Kontaktpersonas</string>
+  <string name="contact_suggestions">Populārākie ieteikumi</string>
+  <string name="local_invisible_directory">Cits</string>
+  <string name="directory_search_label">Katalogs</string>
+  <string name="directory_search_label_work">Darba katalogs</string>
+  <string name="local_search_label">Visas kontaktpersonas</string>
+  <string name="local_suggestions_search_label">Ieteikumi</string>
+  <string msgid="9154761216179882405" name="user_profile_contacts_list_header">Es</string>
+  <string name="missing_name">(Nav vārda)</string>
+  <string msgid="2795575601596468581" name="description_view_contact_detail">Skatīt kontaktpersonu</string>
+  <string name="list_filter_phones">Visas kontaktpersonas ar tālruņa numuriem</string>
+  <string name="list_filter_phones_work">Kontaktpersonas darba profilā</string>
+  <string name="view_updates_from_group">Skatīt atjauninājumus</string>
+  <string name="account_phone">Tikai ierīcē, netiek sinhronizēta</string>
+  <string name="nameLabelsGroup">Vārds un uzvārds</string>
+  <string name="nicknameLabelsGroup">Segvārds</string>
+  <string name="full_name">Vārds</string>
+  <string name="name_given">Vārds</string>
+  <string name="name_family">Uzvārds</string>
+  <string name="name_prefix">Uzruna</string>
+  <string name="name_middle">Otrais vārds</string>
+  <string name="name_suffix">Uzruna</string>
+  <string name="name_phonetic">Vārda un uzvārda izruna</string>
+  <string name="name_phonetic_given">Vārda izruna</string>
+  <string name="name_phonetic_middle">Otrā vārda izruna</string>
+  <string name="name_phonetic_family">Uzvārda izruna</string>
+  <string name="phoneLabelsGroup">Tālrunis</string>
+  <string name="emailLabelsGroup">Sūtīt e-pasta ziņojumu</string>
+  <string name="postalLabelsGroup">Adrese</string>
+  <string name="imLabelsGroup">Tūlītēja ziņapmaiņa</string>
+  <string name="organizationLabelsGroup">Organizācija</string>
+  <string name="relationLabelsGroup">Saistība</string>
+  <string name="eventLabelsGroup">Īpašs datums</string>
+  <string name="sms">Īsziņa</string>
+  <string name="postal_address">Adrese</string>
+  <string name="ghostData_company">Uzņēmums</string>
+  <string name="ghostData_title">Nosaukums</string>
+  <string name="label_notes">Piezīmes</string>
+  <string name="label_sip_address">SIP</string>
+  <string name="websiteLabelsGroup">Vietne</string>
+  <string name="groupsLabel">Grupas</string>
+  <string name="email_home">Sūtīt e-pasta ziņojumu uz privāto adresi</string>
+  <string name="email_mobile">Sūtīt e-pasta ziņojumu uz mobilo tālruni</string>
+  <string name="email_work">Sūtīt e-pasta ziņojumu uz darba adresi</string>
+  <string name="email_other">Sūtīt e-pasta ziņojumu</string>
+  <string name="email_custom">Sūtīt e-pasta ziņojumu uz: %s</string>
+  <string name="email">Sūtīt e-pasta ziņojumu</string>
+  <string name="postal_street">Iela</string>
+  <string name="postal_city">Pilsēta</string>
+  <string name="postal_region">Štats</string>
+  <string name="postal_postcode">Pasta indekss</string>
+  <string name="postal_country">Valsts</string>
+  <string name="map_home">Skatīt mājas adresi</string>
+  <string name="map_work">Skatīt darba adresi</string>
+  <string name="map_other">Skatīt adresi</string>
+  <string name="map_custom">Skatīt lietotāja %s adresi</string>
+  <string name="chat_aim">Tērzēt, izmantojot AIM</string>
+  <string name="chat_msn">Tērzēt, izmantojot Windows Live</string>
+  <string name="chat_yahoo">Tērzēt, izmantojot Yahoo</string>
+  <string name="chat_skype">Tērzēt, izmantojot Skype</string>
+  <string name="chat_qq">Tērzēt, izmantojot QQ</string>
+  <string name="chat_gtalk">Tērzēt, izmantojot Google Talk</string>
+  <string name="chat_icq">Tērzēt, izmantojot ICQ</string>
+  <string name="chat_jabber">Tērzēt, izmantojot Jabber</string>
+  <string name="chat">Tērzēt</string>
+  <string name="list_filter_all_accounts">Visas kontaktpersonas</string>
+  <string name="listAllContactsInAccount">Kontaktpersonas sarakstā %s</string>
+  <string name="listCustomView">Lietotāju filtrs</string>
+  <string name="listSingleContact">Viena kontaktpersona</string>
+  <string name="display_options_sort_list_by">Kārtot pēc</string>
+  <string name="display_options_sort_by_given_name">Vārds</string>
+  <string name="display_options_sort_by_family_name">Uzvārds</string>
+  <string name="display_options_view_names_as">Vārda formāts</string>
+  <string name="display_options_view_given_name_first">Vispirms rādīt vārdu</string>
+  <string name="display_options_view_family_name_first">Vispirms rādīt uzvārdu</string>
+  <string name="menu_clear_frequents">Dzēst bieži lietotos kontaktus</string>
+  <string name="action_menu_back_from_search">pārtraukt meklēšanu</string>
+  <string name="description_clear_search">Notīrīt meklēšanas lauku</string>
+  <string name="select_account_dialog_title">Konts</string>
+  <string name="set_default_account">Vienmēr izmantot zvaniem</string>
+  <string name="select_phone_account_for_calls">SIM kartes izvēle šim zvanam</string>
+  <string name="select_phone_account_for_calls_remember">Atcerēties šo izvēli</string>
+  <string name="call_with_a_note">Zvanīt ar piezīmi</string>
+  <string name="call_subject_hint">Ierakstiet piezīmi, ko nosūtīt ar zvanu...</string>
+  <string name="send_and_call_button">SŪTĪT UN ZVANĪT</string>
+  <string name="call_subject_limit">%1$s no %2$s</string>
+  <string name="old_call_subject_type_and_number">%1$s %2$s</string>
+  <string name="tab_title">Cilne “%1$s”</string>
+  <plurals name="tab_title_with_unread_items">
+    <item quantity="zero"> Cilne “%1$s”. %2$d nelasīti vienumi. </item>
+    <item quantity="one"> Cilne “%1$s”. %2$d nelasīts vienums. </item>
+    <item quantity="other"> Cilne “%1$s”. %2$d nelasīti vienumi. </item>
+  </plurals>
+  <string name="description_search_video_call">Videozvans</string>
+  <string name="description_search_call_and_share">Kopīgot un zvanīt</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-mk/strings.xml b/java/com/android/contacts/common/res/values-mk/strings.xml
index a7283da..bfcb8d2 100644
--- a/java/com/android/contacts/common/res/values-mk/strings.xml
+++ b/java/com/android/contacts/common/res/values-mk/strings.xml
@@ -1,162 +1,145 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="toast_text_copied" msgid="8979281391599667362">"Текстот е копиран"</string>
-    <string name="call_custom" msgid="3041673234638990874">"Повикај <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="call_home" msgid="125893483593803791">"Јави се дома"</string>
-    <string name="call_mobile" msgid="967589404494150813">"Повикај мобилен"</string>
-    <string name="call_work" msgid="6040550697395300892">"Јави се на работа"</string>
-    <string name="call_fax_work" msgid="5260192771364592922">"Повикај факс на работа"</string>
-    <string name="call_fax_home" msgid="5174311195081144124">"Повикај факс дома"</string>
-    <string name="call_pager" msgid="6814149227741274161">"Повикај пејџер"</string>
-    <string name="call_other" msgid="5536385588712587235">"Повикај"</string>
-    <string name="call_callback" msgid="6314019862718112786">"Направи повратен повик"</string>
-    <string name="call_car" msgid="3197417098027764954">"Повикај автомобил"</string>
-    <string name="call_company_main" msgid="2557663310028446397">"Повикај главен број во компанија"</string>
-    <string name="call_isdn" msgid="4691270442763649522">"Повикај ISDN"</string>
-    <string name="call_main" msgid="3293707608770407814">"Повикај главен број"</string>
-    <string name="call_other_fax" msgid="4724521984879021465">"Повикај факс"</string>
-    <string name="call_radio" msgid="8942441419845057942">"Повикај радио"</string>
-    <string name="call_telex" msgid="2031514461660668351">"Повикај телекс"</string>
-    <string name="call_tty_tdd" msgid="7807210224965727701">"Повикај TTY/TDD"</string>
-    <string name="call_work_mobile" msgid="2716342732938578495">"Повикај мобилен на работа"</string>
-    <string name="call_work_pager" msgid="3791778749827366574">"Повикај пејџер на работа"</string>
-    <string name="call_assistant" msgid="4177478845473789294">"Повикај <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
-    <string name="call_mms" msgid="4958811711741872901">"Повикај MMS"</string>
-    <string name="sms_custom" msgid="8785368968605026317">"Испрати текстуална порака на <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="sms_home" msgid="3527719551060295243">"Испрати текстуална порака дома"</string>
-    <string name="sms_mobile" msgid="8883045857887736518">"Испрати текстуална порака на мобилен"</string>
-    <string name="sms_work" msgid="4158595439553450966">"Испрати текстуална порака на работа"</string>
-    <string name="sms_fax_work" msgid="5483726627718055248">"Испрати текстуална порака на факс на работа"</string>
-    <string name="sms_fax_home" msgid="9219265155770746077">"Испрати текстуална порака на факс дома"</string>
-    <string name="sms_pager" msgid="4901085068525193933">"Испрати текстуална порака на пејџер"</string>
-    <string name="sms_other" msgid="1742702947993285933">"Испрати текстуална порака"</string>
-    <string name="sms_callback" msgid="5833483630377538308">"Испрати текстуална порака за повратен повик"</string>
-    <string name="sms_car" msgid="4314577266154395174">"Испрати текстуална порака за автомобил"</string>
-    <string name="sms_company_main" msgid="2308160928487360705">"Испрати текстуална порака на главен број во компанија"</string>
-    <string name="sms_isdn" msgid="6394300346179302542">"Испрати текстуална порака на ISDN"</string>
-    <string name="sms_main" msgid="8908087742014140774">"Испрати текстуална порака на главен број"</string>
-    <string name="sms_other_fax" msgid="8768455473295405427">"Испрати текстуална порака на факс"</string>
-    <string name="sms_radio" msgid="855555176531704682">"Испрати текстуална порака на радио"</string>
-    <string name="sms_telex" msgid="6269029276223252719">"Испрати текстуална порака на телекс"</string>
-    <string name="sms_tty_tdd" msgid="6229057354509192444">"Испрати текстуална порака на TTY/TDD"</string>
-    <string name="sms_work_mobile" msgid="2155975469329969840">"Испрати текстуална порака на мобилен на работа"</string>
-    <string name="sms_work_pager" msgid="8500140274906830742">"Испрати текстуална порака на пејџер на работа"</string>
-    <string name="sms_assistant" msgid="8513548482745330818">"Испрати текстуална порака на <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
-    <string name="sms_mms" msgid="5187888900503248542">"Испрати текстуална порака на MMS"</string>
-    <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"Исчисти често контактирани?"</string>
-    <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"Ќе го исчистите списокот на често контактирани лица во апликациите „Контакти“ и „Телефон“ и ќе ги принудите апликациите на е-пошта одново да ги дознаат вашите параметри на обраќање."</string>
-    <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"Чистење често контактирани..."</string>
-    <string name="status_available" msgid="2648156525685472626">"Достапен"</string>
-    <string name="status_away" msgid="2298688367552893953">"Отсутен"</string>
-    <string name="status_busy" msgid="5990832098713248503">"Зафатен"</string>
-    <string name="contactsList" msgid="8806067891419291513">"Контакти"</string>
-    <string name="contact_suggestions" msgid="3324166754807120006">"Нејдобри предложени"</string>
-    <string name="local_invisible_directory" msgid="4723238462733650090">"Друг"</string>
-    <string name="directory_search_label" msgid="4621215895484025229">"Адресар"</string>
-    <string name="directory_search_label_work" msgid="7679326282707414897">"Работен директориум"</string>
-    <string name="local_search_label" msgid="907622822323119235">"Сите контакти"</string>
-    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Предлози"</string>
-    <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Јас"</string>
-    <string name="missing_name" msgid="978606963362745020">"(Без име)"</string>
-    <string name="description_view_contact_detail" msgid="2428742401208561136">"Прегледајте контакт"</string>
-    <string name="list_filter_phones" msgid="8763316061763437182">"Сите контакти со телефонски броеви"</string>
-    <string name="list_filter_phones_work" msgid="7083575404573422965">"Контакти на Работниот профил"</string>
-    <string name="view_updates_from_group" msgid="9011641093168385729">"Прикажи ажурирања"</string>
-    <string name="account_phone" msgid="7067809073194061035">"Само на уредот, нема да се синхронизира"</string>
-    <string name="nameLabelsGroup" msgid="7730465833159557471">"Име"</string>
-    <string name="nicknameLabelsGroup" msgid="6310556912361840029">"Прекар"</string>
-    <string name="full_name" msgid="648186563998465740">"Име"</string>
-    <string name="name_given" msgid="5096576006314820536">"Име"</string>
-    <string name="name_family" msgid="6646235805198547467">"Презиме"</string>
-    <string name="name_prefix" msgid="9215326539658838">"Претставка на име"</string>
-    <string name="name_middle" msgid="703755205331582769">"Татково име"</string>
-    <string name="name_suffix" msgid="5777083390282548702">"Наставка на име"</string>
-    <string name="name_phonetic" msgid="1650870996361663089">"Фонетско име"</string>
-    <string name="name_phonetic_given" msgid="618812334274603170">"Фонетско име"</string>
-    <string name="name_phonetic_middle" msgid="4826820763384625538">"Фонетско татково име"</string>
-    <string name="name_phonetic_family" msgid="379905191212930771">"Фонетско презиме"</string>
-    <string name="phoneLabelsGroup" msgid="169661929021355548">"Телефон"</string>
-    <string name="emailLabelsGroup" msgid="2249752810477488833">"E-пошта"</string>
-    <string name="postalLabelsGroup" msgid="6772000590189142253">"Адреса"</string>
-    <string name="imLabelsGroup" msgid="5718066254237364731">"IM"</string>
-    <string name="organizationLabelsGroup" msgid="1101996309241601435">"Организација"</string>
-    <string name="relationLabelsGroup" msgid="53866051664600053">"Врска"</string>
-    <string name="eventLabelsGroup" msgid="1236970042646618489">"Посебен датум"</string>
-    <string name="sms" msgid="7574344928185328095">"Текстуална порака"</string>
-    <string name="postal_address" msgid="1804707930129674200">"Адреса"</string>
-    <string name="ghostData_company" msgid="2554310786296833424">"Компанија"</string>
-    <string name="ghostData_title" msgid="4994968731830184837">"Име"</string>
-    <string name="label_notes" msgid="2050255313694219786">"Белешки"</string>
-    <string name="label_sip_address" msgid="8883266182575965926">"SIP"</string>
-    <string name="websiteLabelsGroup" msgid="1630734286462186790">"Веб-сајт"</string>
-    <string name="groupsLabel" msgid="2694002798416868728">"Групи"</string>
-    <string name="email_home" msgid="889830029388962171">"Домашна е-пошта"</string>
-    <string name="email_mobile" msgid="4487686436743741150">"Мобилна е-пошта"</string>
-    <string name="email_work" msgid="4223487303344613528">"Работна е-пошта"</string>
-    <string name="email_other" msgid="4246411900126012062">"E-пошта"</string>
-    <string name="email_custom" msgid="7246580894327511013">"<xliff:g id="CUSTOM">%s</xliff:g> е-пошта"</string>
-    <string name="email" msgid="2807318537887091606">"E-пошта"</string>
-    <string name="postal_street" msgid="6918171741240802474">"Улица"</string>
-    <string name="postal_city" msgid="8674569121430005628">"Град"</string>
-    <string name="postal_region" msgid="1730369286225469192">"Држава"</string>
-    <string name="postal_postcode" msgid="4450700741261990439">"Поштенски број"</string>
-    <string name="postal_country" msgid="232670707458768148">"Земја"</string>
-    <string name="map_home" msgid="4181131107392126938">"Прикажи домашна адреса"</string>
-    <string name="map_work" msgid="5723471185992684400">"Прикажи адреса на работа"</string>
-    <string name="map_other" msgid="2253764780863500516">"Прикажи адреса"</string>
-    <string name="map_custom" msgid="5581743097882436157">"Прикажи <xliff:g id="CUSTOM">%s</xliff:g> адреса"</string>
-    <string name="chat_aim" msgid="2954364435497941659">"Разговор на AIM"</string>
-    <string name="chat_msn" msgid="3130135239071228678">"Разговор на Windows Live"</string>
-    <string name="chat_yahoo" msgid="3233552142326865347">"Разговор на Yahoo"</string>
-    <string name="chat_skype" msgid="6486703981390592425">"Разговор на Skype"</string>
-    <string name="chat_qq" msgid="786924280665740019">"Разговор на QQ"</string>
-    <string name="chat_gtalk" msgid="7914674177243078035">"Разговор на Google Talk"</string>
-    <string name="chat_icq" msgid="3292934726414765801">"Разговор на ICQ"</string>
-    <string name="chat_jabber" msgid="6701542313597880204">"Разговор на Jabber"</string>
-    <string name="chat" msgid="1020428260359370236">"Разговор"</string>
-    <string name="list_filter_all_accounts" msgid="473782314881473992">"Сите контакти"</string>
-    <string name="listAllContactsInAccount" msgid="3486378621592995630">"Контакти во <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="listCustomView" msgid="5306282632413086731">"Контакти во прилагоден приказ"</string>
-    <string name="listSingleContact" msgid="8620818791932382627">"Еден контакт"</string>
-    <string name="display_options_sort_list_by" msgid="3541875948367831228">"Подреди по"</string>
-    <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"Име"</string>
-    <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"Презиме"</string>
-    <string name="display_options_view_names_as" msgid="4204204205736735618">"Формат на име"</string>
-    <string name="display_options_view_given_name_first" msgid="2308026973021171020">"Прво името"</string>
-    <string name="display_options_view_family_name_first" msgid="987430497292428242">"Прво презимето"</string>
-    <string name="menu_clear_frequents" msgid="5358271535047496120">"Исчисти чести"</string>
-    <string name="action_menu_back_from_search" msgid="3550669942742167644">"запри пребарување"</string>
-    <string name="description_clear_search" msgid="2347258825265600782">"Исчисти го полето за пребарување"</string>
-    <string name="select_account_dialog_title" msgid="2673504582803359239">"Сметка"</string>
-    <string name="set_default_account" msgid="7966099951006467572">"Секогаш користи го ова за повици"</string>
-    <string name="select_phone_account_for_calls" msgid="1784460686103423274">"Повикајте со"</string>
-    <string name="call_with_a_note" msgid="6242261320491851133">"Повик со белешка"</string>
-    <string name="call_subject_hint" msgid="7233138753650420800">"Напишете белешка да се испрати со повикот..."</string>
-    <string name="send_and_call_button" msgid="4735168294120154013">"ИСПРАТИ И ПОВИКАЈ"</string>
-    <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g>/<xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="tab_title" msgid="3387876802026074288">"Картичка <xliff:g id="TITLE">%1$s</xliff:g>."</string>
-    <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
-      <item quantity="one"> Картичка <xliff:g id="TITLE_2">%1$s</xliff:g>. <xliff:g id="COUNT_3">%2$d</xliff:g> непрочитана ставка. </item>
-      <item quantity="other"> Картичка <xliff:g id="TITLE_2">%1$s</xliff:g>. <xliff:g id="COUNT_3">%2$d</xliff:g> непрочитани ставки. </item>
-    </plurals>
-    <string name="description_search_video_call" msgid="4337369876888024909">"Видеоповик"</string>
-    <string name="description_search_call_and_share" msgid="4912772842755050467">"Сподели и повикај"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_custom">Повикај %s</string>
+  <string name="call_home">Јави се дома</string>
+  <string name="call_mobile">Повикај мобилен</string>
+  <string name="call_work">Јави се на работа</string>
+  <string name="call_fax_work">Повикај факс на работа</string>
+  <string name="call_fax_home">Повикај факс дома</string>
+  <string name="call_pager">Повикај пејџер</string>
+  <string name="call_other">Повикај</string>
+  <string name="call_callback">Направи повратен повик</string>
+  <string name="call_car">Повикај автомобил</string>
+  <string name="call_company_main">Повикај главен број во компанија</string>
+  <string name="call_isdn">Повикај ISDN</string>
+  <string name="call_main">Повикај главен број</string>
+  <string name="call_other_fax">Повикај факс</string>
+  <string name="call_radio">Повикај радио</string>
+  <string name="call_telex">Повикај телекс</string>
+  <string name="call_tty_tdd">Повикај TTY/TDD</string>
+  <string name="call_work_mobile">Повикај мобилен на работа</string>
+  <string name="call_work_pager">Повикај пејџер на работа</string>
+  <string name="call_assistant">Повикај %s</string>
+  <string name="call_mms">Повикај MMS</string>
+  <string name="sms_custom">Испрати текстуална порака на %s</string>
+  <string name="sms_home">Испрати текстуална порака дома</string>
+  <string name="sms_mobile">Испрати текстуална порака на мобилен</string>
+  <string name="sms_work">Испрати текстуална порака на работа</string>
+  <string name="sms_fax_work">Испрати текстуална порака на факс на работа</string>
+  <string name="sms_fax_home">Испрати текстуална порака на факс дома</string>
+  <string name="sms_pager">Испрати текстуална порака на пејџер</string>
+  <string name="sms_other">Испрати текстуална порака</string>
+  <string name="sms_callback">Испрати текстуална порака за повратен повик</string>
+  <string name="sms_car">Испрати текстуална порака за автомобил</string>
+  <string name="sms_company_main">Испрати текстуална порака на главен број во компанија</string>
+  <string name="sms_isdn">Испрати текстуална порака на ISDN</string>
+  <string name="sms_main">Испрати текстуална порака на главен број</string>
+  <string name="sms_other_fax">Испрати текстуална порака на факс</string>
+  <string name="sms_radio">Испрати текстуална порака на радио</string>
+  <string name="sms_telex">Испрати текстуална порака на телекс</string>
+  <string name="sms_tty_tdd">Испрати текстуална порака на TTY/TDD</string>
+  <string name="sms_work_mobile">Испрати текстуална порака на мобилен на работа</string>
+  <string name="sms_work_pager">Испрати текстуална порака на пејџер на работа</string>
+  <string name="sms_assistant">Испрати текстуална порака на %s</string>
+  <string name="sms_mms">Испрати текстуална порака на MMS</string>
+  <string name="clearFrequentsConfirmation_title">Исчисти често контактирани?</string>
+  <string name="clearFrequentsConfirmation">Ќе го исчистите списокот на често контактирани лица во апликациите „Контакти“ и „Телефон“ и ќе ги принудите апликациите на е-пошта одново да ги дознаат вашите параметри на обраќање.</string>
+  <string name="clearFrequentsProgress_title">Чистење често контактирани...</string>
+  <string name="status_available">Достапен</string>
+  <string name="status_away">Отсутен</string>
+  <string name="status_busy">Зафатен</string>
+  <string name="contactsList">Контакти</string>
+  <string name="contact_suggestions">Нејдобри предложени</string>
+  <string name="local_invisible_directory">Друг</string>
+  <string name="directory_search_label">Адресар</string>
+  <string name="directory_search_label_work">Работен директориум</string>
+  <string name="local_search_label">Сите контакти</string>
+  <string name="local_suggestions_search_label">Предлози</string>
+  <string msgid="9154761216179882405" name="user_profile_contacts_list_header">Јас</string>
+  <string name="missing_name">(Без име)</string>
+  <string msgid="2795575601596468581" name="description_view_contact_detail">Прегледајте контакт</string>
+  <string name="list_filter_phones">Сите контакти со телефонски броеви</string>
+  <string name="list_filter_phones_work">Контакти на Работниот профил</string>
+  <string name="view_updates_from_group">Прикажи ажурирања</string>
+  <string name="account_phone">Само на уредот, нема да се синхронизира</string>
+  <string name="nameLabelsGroup">Име</string>
+  <string name="nicknameLabelsGroup">Прекар</string>
+  <string name="full_name">Име</string>
+  <string name="name_given">Име</string>
+  <string name="name_family">Презиме</string>
+  <string name="name_prefix">Претставка на име</string>
+  <string name="name_middle">Татково име</string>
+  <string name="name_suffix">Наставка на име</string>
+  <string name="name_phonetic">Фонетско име</string>
+  <string name="name_phonetic_given">Фонетско име</string>
+  <string name="name_phonetic_middle">Фонетско татково име</string>
+  <string name="name_phonetic_family">Фонетско презиме</string>
+  <string name="phoneLabelsGroup">Телефон</string>
+  <string name="emailLabelsGroup">E-пошта</string>
+  <string name="postalLabelsGroup">Адреса</string>
+  <string name="imLabelsGroup">IM</string>
+  <string name="organizationLabelsGroup">Организација</string>
+  <string name="relationLabelsGroup">Врска</string>
+  <string name="eventLabelsGroup">Посебен датум</string>
+  <string name="sms">SMS</string>
+  <string name="postal_address">Адреса</string>
+  <string name="ghostData_company">Компанија</string>
+  <string name="ghostData_title">Име</string>
+  <string name="label_notes">Белешки</string>
+  <string name="label_sip_address">SIP</string>
+  <string name="websiteLabelsGroup">Веб-сајт</string>
+  <string name="groupsLabel">Групи</string>
+  <string name="email_home">Домашна е-пошта</string>
+  <string name="email_mobile">Мобилна е-пошта</string>
+  <string name="email_work">Работна е-пошта</string>
+  <string name="email_other">E-пошта</string>
+  <string name="email_custom">%s е-пошта</string>
+  <string name="email">E-пошта</string>
+  <string name="postal_street">Улица</string>
+  <string name="postal_city">Град</string>
+  <string name="postal_region">Држава</string>
+  <string name="postal_postcode">Поштенски број</string>
+  <string name="postal_country">Земја</string>
+  <string name="map_home">Прикажи домашна адреса</string>
+  <string name="map_work">Прикажи адреса на работа</string>
+  <string name="map_other">Прикажи адреса</string>
+  <string name="map_custom">Прикажи %s адреса</string>
+  <string name="chat_aim">Разговор на AIM</string>
+  <string name="chat_msn">Разговор на Windows Live</string>
+  <string name="chat_yahoo">Разговор на Yahoo</string>
+  <string name="chat_skype">Разговор на Skype</string>
+  <string name="chat_qq">Разговор на QQ</string>
+  <string name="chat_gtalk">Разговор на Google Talk</string>
+  <string name="chat_icq">Разговор на ICQ</string>
+  <string name="chat_jabber">Разговор на Jabber</string>
+  <string name="chat">Разговор</string>
+  <string name="list_filter_all_accounts">Сите контакти</string>
+  <string name="listAllContactsInAccount">Контакти во %s</string>
+  <string name="listCustomView">Контакти во прилагоден приказ</string>
+  <string name="listSingleContact">Еден контакт</string>
+  <string name="display_options_sort_list_by">Подреди по</string>
+  <string name="display_options_sort_by_given_name">Име</string>
+  <string name="display_options_sort_by_family_name">Презиме</string>
+  <string name="display_options_view_names_as">Формат на име</string>
+  <string name="display_options_view_given_name_first">Прво името</string>
+  <string name="display_options_view_family_name_first">Прво презимето</string>
+  <string name="menu_clear_frequents">Исчисти чести</string>
+  <string name="action_menu_back_from_search">запри пребарување</string>
+  <string name="description_clear_search">Исчисти го полето за пребарување</string>
+  <string name="select_account_dialog_title">Сметка</string>
+  <string name="set_default_account">Секогаш користи го ова за повици</string>
+  <string name="select_phone_account_for_calls">Изберете SIM за повиков</string>
+  <string name="select_phone_account_for_calls_remember">Запомни го изборов</string>
+  <string name="call_with_a_note">Повик со белешка</string>
+  <string name="call_subject_hint">Напишете белешка да се испрати со повикот...</string>
+  <string name="send_and_call_button">ИСПРАТИ И ПОВИКАЈ</string>
+  <string name="call_subject_limit">%1$s/%2$s</string>
+  <string name="old_call_subject_type_and_number">%1$s %2$s</string>
+  <string name="tab_title">Картичка %1$s.</string>
+  <plurals name="tab_title_with_unread_items">
+    <item quantity="one"> Картичка %1$s. %2$d непрочитана ставка. </item>
+    <item quantity="other"> Картичка %1$s. %2$d непрочитани ставки. </item>
+  </plurals>
+  <string name="description_search_video_call">Видеоповик</string>
+  <string name="description_search_call_and_share">Сподели и повикај</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-ml/strings.xml b/java/com/android/contacts/common/res/values-ml/strings.xml
index c36226d..34e4f8c 100644
--- a/java/com/android/contacts/common/res/values-ml/strings.xml
+++ b/java/com/android/contacts/common/res/values-ml/strings.xml
@@ -1,162 +1,145 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="toast_text_copied" msgid="8979281391599667362">"വാചകം പകർത്തി"</string>
-    <string name="call_custom" msgid="3041673234638990874">"വിളിക്കുക <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="call_home" msgid="125893483593803791">"വീട്ടിലെ ഫോണിലേക്ക് വിളിക്കുക"</string>
-    <string name="call_mobile" msgid="967589404494150813">"മൊബൈലിലേക്ക് വിളിക്കുക"</string>
-    <string name="call_work" msgid="6040550697395300892">"ഔദ്യോഗിക ഫോണിലേക്ക് വിളിക്കുക"</string>
-    <string name="call_fax_work" msgid="5260192771364592922">"ഔദ്യോഗിക ഫാക്‌സിലേക്ക് വിളിക്കുക"</string>
-    <string name="call_fax_home" msgid="5174311195081144124">"വീട്ടിലെ ഫാക്‌സിലേക്ക് വിളിക്കുക"</string>
-    <string name="call_pager" msgid="6814149227741274161">"പേജറിലേക്ക് വിളിക്കുക"</string>
-    <string name="call_other" msgid="5536385588712587235">"വിളിക്കുക"</string>
-    <string name="call_callback" msgid="6314019862718112786">"കോൾബാക്ക് നമ്പറിലേക്ക് വിളിക്കുക"</string>
-    <string name="call_car" msgid="3197417098027764954">"കാർ നമ്പറിലേക്ക് വിളിക്കുക"</string>
-    <string name="call_company_main" msgid="2557663310028446397">"കമ്പനിയിലെ പ്രധാന ഫോണിലേക്ക് വിളിക്കുക"</string>
-    <string name="call_isdn" msgid="4691270442763649522">"ISDN-ലേക്ക് വിളിക്കുക"</string>
-    <string name="call_main" msgid="3293707608770407814">"പ്രധാന ഫോണിലേക്ക് വിളിക്കുക"</string>
-    <string name="call_other_fax" msgid="4724521984879021465">"ഫാക്‌സിലേക്ക് വിളിക്കുക"</string>
-    <string name="call_radio" msgid="8942441419845057942">"റേഡിയോയിലേക്ക് വിളിക്കുക"</string>
-    <string name="call_telex" msgid="2031514461660668351">"ടെലക്‌സിലേക്ക് വിളിക്കുക"</string>
-    <string name="call_tty_tdd" msgid="7807210224965727701">"TTY/TDD-യിലേക്ക് വിളിക്കുക"</string>
-    <string name="call_work_mobile" msgid="2716342732938578495">"ഔദ്യോഗിക മൊബൈലിലേക്ക് വിളിക്കുക"</string>
-    <string name="call_work_pager" msgid="3791778749827366574">"ഔദ്യോഗിക പേജറിലേക്ക് വിളിക്കുക"</string>
-    <string name="call_assistant" msgid="4177478845473789294">"വിളിക്കുക <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
-    <string name="call_mms" msgid="4958811711741872901">"MMS ഫോണിലേക്ക് വിളിക്കുക"</string>
-    <string name="sms_custom" msgid="8785368968605026317">"<xliff:g id="CUSTOM">%s</xliff:g> എന്നതിലേക്ക് വാചക സന്ദേശമയയ്‌ക്കുക"</string>
-    <string name="sms_home" msgid="3527719551060295243">"വീട്ടിലെ ഫോണിലേക്ക് വാചകസന്ദേശമയയ്‌ക്കുക"</string>
-    <string name="sms_mobile" msgid="8883045857887736518">"മൊബൈലിലേക്ക് വാചകസന്ദേശമയയ്‌ക്കുക"</string>
-    <string name="sms_work" msgid="4158595439553450966">"ഔദ്യോഗിക ഫോണിലേക്ക് വാചകസന്ദേശമയയ്‌ക്കുക"</string>
-    <string name="sms_fax_work" msgid="5483726627718055248">"ഔദ്യോഗിക ഫാക്‌സിലേക്ക് വാചകസന്ദേശമയയ്‌ക്കുക"</string>
-    <string name="sms_fax_home" msgid="9219265155770746077">"വീട്ടിലെ ഫാക്‌സിലേക്ക് വാചകസന്ദേശമയയ്‌ക്കുക"</string>
-    <string name="sms_pager" msgid="4901085068525193933">"പേജറിലേക്ക് വാചകസന്ദേശമയയ്‌ക്കുക"</string>
-    <string name="sms_other" msgid="1742702947993285933">"വാചകസന്ദേശമയയ്‌ക്കുക"</string>
-    <string name="sms_callback" msgid="5833483630377538308">"കോൾബാക്ക് ഫോണിലേക്ക് വാചകസന്ദേശമയയ്‌ക്കുക"</string>
-    <string name="sms_car" msgid="4314577266154395174">"കാർ ഫോണിലേക്ക് വാചകസന്ദേശമയയ്‌ക്കുക"</string>
-    <string name="sms_company_main" msgid="2308160928487360705">"കമ്പനി പ്രധാന ഫോണിലേക്ക് വാചകസന്ദേശമയയ്‌ക്കുക"</string>
-    <string name="sms_isdn" msgid="6394300346179302542">"ISDN-ലേക്ക് വാചകസന്ദേശമയയ്‌ക്കുക"</string>
-    <string name="sms_main" msgid="8908087742014140774">"പ്രധാന ഫോണിലേക്ക് വാചകസന്ദേശമയയ്‌ക്കുക"</string>
-    <string name="sms_other_fax" msgid="8768455473295405427">"ഫാക്‌സിലേക്ക് വാചകസന്ദേശമയയ്‌ക്കുക"</string>
-    <string name="sms_radio" msgid="855555176531704682">"റേഡിയോയിലേക്ക് വാചകസന്ദേശമയയ്‌ക്കുക"</string>
-    <string name="sms_telex" msgid="6269029276223252719">"ടെലക്‌സിലേക്ക് വാചകസന്ദേശമയയ്‌ക്കുക"</string>
-    <string name="sms_tty_tdd" msgid="6229057354509192444">"TTY/TDD എന്നതിലേക്ക് വാചകസന്ദേശമയയ്‌ക്കുക"</string>
-    <string name="sms_work_mobile" msgid="2155975469329969840">"ഔദ്യോഗിക മൊബൈലിലേക്ക് വാചകസന്ദേശമയയ്‌ക്കുക"</string>
-    <string name="sms_work_pager" msgid="8500140274906830742">"ഔദ്യോഗിക പേജറിലേക്ക് വാചകസന്ദേശമയയ്‌ക്കുക"</string>
-    <string name="sms_assistant" msgid="8513548482745330818">"<xliff:g id="ASSISTANT">%s</xliff:g> എന്നതിലേക്ക് വാചക സന്ദേശമയയ്‌ക്കുക"</string>
-    <string name="sms_mms" msgid="5187888900503248542">"MMS നമ്പറിലേക്ക് വാചകസന്ദേശമയയ്‌ക്കുക"</string>
-    <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"സ്ഥിരംവിളിക്കുന്നവരെ മായ്‌ക്കണോ?"</string>
-    <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"നിങ്ങൾ കോൺടാക്‌റ്റുകളുടെയും ഫോണിന്റെയും അപ്ലിക്കേഷനുകളിലെ പതിവായി കോൺടാക്റ്റുചെയ്യുന്നവരുടെ ലിസ്റ്റ് മായ്‌ക്കുകയും സ്‌ക്രാച്ചിൽ നിന്നും ബന്ധപ്പെടൽ മുൻഗണനകൾ അറിയാൻ ഇമെയിൽ അപ്ലിക്കേഷനുകളെ പ്രേരിപ്പിക്കുകയും ചെയ്യും."</string>
-    <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"സ്ഥിരംവിളിക്കുന്നവരെ മായ്‌ക്കുന്നു…"</string>
-    <string name="status_available" msgid="2648156525685472626">"ലഭ്യം"</string>
-    <string name="status_away" msgid="2298688367552893953">"ലഭ്യമല്ല"</string>
-    <string name="status_busy" msgid="5990832098713248503">"തിരക്കിലാണ്"</string>
-    <string name="contactsList" msgid="8806067891419291513">"കോണ്ടാക്റ്റ്"</string>
-    <string name="contact_suggestions" msgid="3324166754807120006">"കൂടുതൽ നിർദ്ദേശിച്ചിരിക്കുന്നവ"</string>
-    <string name="local_invisible_directory" msgid="4723238462733650090">"മറ്റുള്ളവ"</string>
-    <string name="directory_search_label" msgid="4621215895484025229">"ഡയറക്‌ടറി"</string>
-    <string name="directory_search_label_work" msgid="7679326282707414897">"ഔദ്യോഗിക ഡയറക്‌ടറി"</string>
-    <string name="local_search_label" msgid="907622822323119235">"എല്ലാ കോൺടാക്റ്റുകളും"</string>
-    <string name="local_suggestions_search_label" msgid="1178575146224386118">"നിര്‍ദ്ദേശങ്ങള്‍"</string>
-    <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"ഞാന്‍"</string>
-    <string name="missing_name" msgid="978606963362745020">"(പേരില്ല)"</string>
-    <string name="description_view_contact_detail" msgid="2428742401208561136">"കോൺടാക്റ്റ് കാണുക"</string>
-    <string name="list_filter_phones" msgid="8763316061763437182">"ഫോൺ നമ്പറുകളുള്ള എല്ലാ കോൺടാക്റ്റുകളും"</string>
-    <string name="list_filter_phones_work" msgid="7083575404573422965">"ഔദ്യോഗിക പ്രൊഫൈൽ കോൺടാക്റ്റുകൾ"</string>
-    <string name="view_updates_from_group" msgid="9011641093168385729">"അപ്‌ഡേറ്റുകള്‍ കാണുക"</string>
-    <string name="account_phone" msgid="7067809073194061035">"ഉപകരണത്തിൽ മാത്രം, സമന്വയിപ്പിക്കില്ല"</string>
-    <string name="nameLabelsGroup" msgid="7730465833159557471">"പേര്"</string>
-    <string name="nicknameLabelsGroup" msgid="6310556912361840029">"വിളിപ്പേര്"</string>
-    <string name="full_name" msgid="648186563998465740">"പേര്"</string>
-    <string name="name_given" msgid="5096576006314820536">"ഫസ്റ്റ് നെയിം"</string>
-    <string name="name_family" msgid="6646235805198547467">"ലാസ്റ്റ് നെയിം"</string>
-    <string name="name_prefix" msgid="9215326539658838">"പേര് പ്രിഫിക്‌സ്"</string>
-    <string name="name_middle" msgid="703755205331582769">"പേരിന്റെ മധ്യഭാഗം"</string>
-    <string name="name_suffix" msgid="5777083390282548702">"പേര് സഫിക്‌സ്"</string>
-    <string name="name_phonetic" msgid="1650870996361663089">"ഉച്ചാരണപ്രകാരമുള്ള പേര്"</string>
-    <string name="name_phonetic_given" msgid="618812334274603170">"ഫസ്റ്റ് നെയിം"</string>
-    <string name="name_phonetic_middle" msgid="4826820763384625538">"പേരിന്റെ മധ്യഭാഗം"</string>
-    <string name="name_phonetic_family" msgid="379905191212930771">"പേരിന്റെ അവസാന ഭാഗം"</string>
-    <string name="phoneLabelsGroup" msgid="169661929021355548">"ഫോണ്‍"</string>
-    <string name="emailLabelsGroup" msgid="2249752810477488833">"ഇമെയിൽ"</string>
-    <string name="postalLabelsGroup" msgid="6772000590189142253">"വിലാസം"</string>
-    <string name="imLabelsGroup" msgid="5718066254237364731">"IM"</string>
-    <string name="organizationLabelsGroup" msgid="1101996309241601435">"ഓര്‍ഗനൈസേഷന്‍"</string>
-    <string name="relationLabelsGroup" msgid="53866051664600053">"ബന്ധം"</string>
-    <string name="eventLabelsGroup" msgid="1236970042646618489">"പ്രത്യേക തീയതി"</string>
-    <string name="sms" msgid="7574344928185328095">"ടെക്‌സ്റ്റ് സന്ദേശം"</string>
-    <string name="postal_address" msgid="1804707930129674200">"വിലാസം"</string>
-    <string name="ghostData_company" msgid="2554310786296833424">"കമ്പനി"</string>
-    <string name="ghostData_title" msgid="4994968731830184837">"ജോലി"</string>
-    <string name="label_notes" msgid="2050255313694219786">"കുറിപ്പുകള്‍"</string>
-    <string name="label_sip_address" msgid="8883266182575965926">"SIP"</string>
-    <string name="websiteLabelsGroup" msgid="1630734286462186790">"വെബ്‌സൈറ്റ്"</string>
-    <string name="groupsLabel" msgid="2694002798416868728">"ഗ്രൂപ്പുകള്‍‌"</string>
-    <string name="email_home" msgid="889830029388962171">"വീട്ടിലെ ഇമെയിൽ"</string>
-    <string name="email_mobile" msgid="4487686436743741150">"മൊബൈൽ ഇമെയിൽ"</string>
-    <string name="email_work" msgid="4223487303344613528">"ഔദ്യോഗിക ഇമെയിൽ"</string>
-    <string name="email_other" msgid="4246411900126012062">"ഇമെയിൽ"</string>
-    <string name="email_custom" msgid="7246580894327511013">"<xliff:g id="CUSTOM">%s</xliff:g> എന്നതിലേക്ക് ഇമെയിൽ ചെയ്യുക"</string>
-    <string name="email" msgid="2807318537887091606">"ഇമെയിൽ"</string>
-    <string name="postal_street" msgid="6918171741240802474">"സ്‌ട്രീറ്റ്"</string>
-    <string name="postal_city" msgid="8674569121430005628">"നഗരം"</string>
-    <string name="postal_region" msgid="1730369286225469192">"സംസ്ഥാനം"</string>
-    <string name="postal_postcode" msgid="4450700741261990439">"തപാൽ കോഡ്"</string>
-    <string name="postal_country" msgid="232670707458768148">"രാജ്യം"</string>
-    <string name="map_home" msgid="4181131107392126938">"വീട്ടുവിലാസം കാണുക"</string>
-    <string name="map_work" msgid="5723471185992684400">"ഔദ്യോഗിക വിലാസം കാണുക"</string>
-    <string name="map_other" msgid="2253764780863500516">"വിലാസം കാണുക"</string>
-    <string name="map_custom" msgid="5581743097882436157">"<xliff:g id="CUSTOM">%s</xliff:g> വിലാസം കാണുക"</string>
-    <string name="chat_aim" msgid="2954364435497941659">"AIM ഉപയോഗിച്ച് ചാറ്റുചെയ്യുക"</string>
-    <string name="chat_msn" msgid="3130135239071228678">"Windows Live ഉപയോഗിച്ച് ചാറ്റുചെയ്യുക"</string>
-    <string name="chat_yahoo" msgid="3233552142326865347">"Yahoo ഉപയോഗിച്ച് ചാറ്റുചെയ്യുക"</string>
-    <string name="chat_skype" msgid="6486703981390592425">"Skype ഉപയോഗിച്ച് ചാറ്റുചെയ്യുക"</string>
-    <string name="chat_qq" msgid="786924280665740019">"QQ ഉപയോഗിച്ച് ചാറ്റുചെയ്യുക"</string>
-    <string name="chat_gtalk" msgid="7914674177243078035">"Google Talk ഉപയോഗിച്ച് ചാറ്റുചെയ്യുക"</string>
-    <string name="chat_icq" msgid="3292934726414765801">"ICQ ഉപയോഗിച്ച് ചാറ്റുചെയ്യുക"</string>
-    <string name="chat_jabber" msgid="6701542313597880204">"Jabber ഉപയോഗിച്ച് ചാറ്റുചെയ്യുക"</string>
-    <string name="chat" msgid="1020428260359370236">"ചാറ്റുചെയ്യുക"</string>
-    <string name="list_filter_all_accounts" msgid="473782314881473992">"എല്ലാ കോൺടാക്റ്റുകളും"</string>
-    <string name="listAllContactsInAccount" msgid="3486378621592995630">"<xliff:g id="NAME">%s</xliff:g> എന്നതിലെ കോൺടാക്റ്റുകൾ"</string>
-    <string name="listCustomView" msgid="5306282632413086731">"ഇഷ്‌ടാനുസൃതകാഴ്‌ചയിലെ കോൺടാക്റ്റ്"</string>
-    <string name="listSingleContact" msgid="8620818791932382627">"സിംഗിൾ കോൺടാക്റ്റ്"</string>
-    <string name="display_options_sort_list_by" msgid="3541875948367831228">"ഇതുപ്രകാരം അടുക്കുക"</string>
-    <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"ഫസ്റ്റ് നെയിം"</string>
-    <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"ലാസ്റ്റ് നെയിം"</string>
-    <string name="display_options_view_names_as" msgid="4204204205736735618">"പേരിന്റെ ഫോർമാറ്റ്"</string>
-    <string name="display_options_view_given_name_first" msgid="2308026973021171020">"ഫസ്റ്റ് നെയിം ആദ്യം"</string>
-    <string name="display_options_view_family_name_first" msgid="987430497292428242">"ലാസ്റ്റ് നെയിം ആദ്യം"</string>
-    <string name="menu_clear_frequents" msgid="5358271535047496120">"സ്ഥിരംവിളിക്കുന്നവരെ മായ്‌ക്കൂ"</string>
-    <string name="action_menu_back_from_search" msgid="3550669942742167644">"തിരയൽ നിർത്തുക"</string>
-    <string name="description_clear_search" msgid="2347258825265600782">"തിരയൽ മായ്ക്കുക"</string>
-    <string name="select_account_dialog_title" msgid="2673504582803359239">"അക്കൗണ്ട്"</string>
-    <string name="set_default_account" msgid="7966099951006467572">"ഇത് എല്ലായ്‌പ്പോഴും കോളുകൾക്കായി ഉപയോഗിക്കുക"</string>
-    <string name="select_phone_account_for_calls" msgid="1784460686103423274">"ഇത് ഉപയോഗിച്ച് വിളിക്കുക"</string>
-    <string name="call_with_a_note" msgid="6242261320491851133">"കുറിപ്പിനൊപ്പം വിളിക്കുക"</string>
-    <string name="call_subject_hint" msgid="7233138753650420800">"കോളിനൊപ്പം അയയ്ക്കുന്നതിന് ഒരു കുറിപ്പ് ടൈപ്പുചെയ്യുക ..."</string>
-    <string name="send_and_call_button" msgid="4735168294120154013">"അയയ്‌ക്കുകയും വിളിക്കുകയും ചെയ്യുക"</string>
-    <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="tab_title" msgid="3387876802026074288">"<xliff:g id="TITLE">%1$s</xliff:g> ടാബ്."</string>
-    <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
-      <item quantity="other"> <xliff:g id="TITLE_2">%1$s</xliff:g> ടാബ്. <xliff:g id="COUNT_3">%2$d</xliff:g> വായിക്കാത്ത ഇനങ്ങൾ. </item>
-      <item quantity="one"> <xliff:g id="TITLE_0">%1$s</xliff:g> ടാബ്. <xliff:g id="COUNT_1">%2$d</xliff:g> വായിക്കാത്ത ഇനം. </item>
-    </plurals>
-    <string name="description_search_video_call" msgid="4337369876888024909">"വീഡിയോ കോള്‍"</string>
-    <string name="description_search_call_and_share" msgid="4912772842755050467">"പങ്കിടുക, കോൾ ചെയ്യുക"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_custom">വിളിക്കുക %s</string>
+  <string name="call_home">വീട്ടിലെ ഫോണിലേക്ക് വിളിക്കുക</string>
+  <string name="call_mobile">മൊബൈലിലേക്ക് വിളിക്കുക</string>
+  <string name="call_work">ഔദ്യോഗിക ഫോണിലേക്ക് വിളിക്കുക</string>
+  <string name="call_fax_work">ഔദ്യോഗിക ഫാക്‌സിലേക്ക് വിളിക്കുക</string>
+  <string name="call_fax_home">വീട്ടിലെ ഫാക്‌സിലേക്ക് വിളിക്കുക</string>
+  <string name="call_pager">പേജറിലേക്ക് വിളിക്കുക</string>
+  <string name="call_other">വിളിക്കുക</string>
+  <string name="call_callback">കോൾബാക്ക് നമ്പറിലേക്ക് വിളിക്കുക</string>
+  <string name="call_car">കാർ നമ്പറിലേക്ക് വിളിക്കുക</string>
+  <string name="call_company_main">കമ്പനിയിലെ പ്രധാന ഫോണിലേക്ക് വിളിക്കുക</string>
+  <string name="call_isdn">ISDN-ലേക്ക് വിളിക്കുക</string>
+  <string name="call_main">പ്രധാന ഫോണിലേക്ക് വിളിക്കുക</string>
+  <string name="call_other_fax">ഫാക്‌സിലേക്ക് വിളിക്കുക</string>
+  <string name="call_radio">റേഡിയോയിലേക്ക് വിളിക്കുക</string>
+  <string name="call_telex">ടെലക്‌സിലേക്ക് വിളിക്കുക</string>
+  <string name="call_tty_tdd">TTY/TDD-യിലേക്ക് വിളിക്കുക</string>
+  <string name="call_work_mobile">ഔദ്യോഗിക മൊബൈലിലേക്ക് വിളിക്കുക</string>
+  <string name="call_work_pager">ഔദ്യോഗിക പേജറിലേക്ക് വിളിക്കുക</string>
+  <string name="call_assistant">വിളിക്കുക %s</string>
+  <string name="call_mms">MMS ഫോണിലേക്ക് വിളിക്കുക</string>
+  <string name="sms_custom">%s എന്നതിലേക്ക് വാചക സന്ദേശമയയ്‌ക്കുക</string>
+  <string name="sms_home">വീട്ടിലെ ഫോണിലേക്ക് വാചകസന്ദേശമയയ്‌ക്കുക</string>
+  <string name="sms_mobile">മൊബൈലിലേക്ക് വാചകസന്ദേശമയയ്‌ക്കുക</string>
+  <string name="sms_work">ഔദ്യോഗിക ഫോണിലേക്ക് വാചകസന്ദേശമയയ്‌ക്കുക</string>
+  <string name="sms_fax_work">ഔദ്യോഗിക ഫാക്‌സിലേക്ക് വാചകസന്ദേശമയയ്‌ക്കുക</string>
+  <string name="sms_fax_home">വീട്ടിലെ ഫാക്‌സിലേക്ക് വാചകസന്ദേശമയയ്‌ക്കുക</string>
+  <string name="sms_pager">പേജറിലേക്ക് വാചകസന്ദേശമയയ്‌ക്കുക</string>
+  <string name="sms_other">വാചകസന്ദേശമയയ്‌ക്കുക</string>
+  <string name="sms_callback">കോൾബാക്ക് ഫോണിലേക്ക് വാചകസന്ദേശമയയ്‌ക്കുക</string>
+  <string name="sms_car">കാർ ഫോണിലേക്ക് വാചകസന്ദേശമയയ്‌ക്കുക</string>
+  <string name="sms_company_main">കമ്പനി പ്രധാന ഫോണിലേക്ക് വാചകസന്ദേശമയയ്‌ക്കുക</string>
+  <string name="sms_isdn">ISDN-ലേക്ക് വാചകസന്ദേശമയയ്‌ക്കുക</string>
+  <string name="sms_main">പ്രധാന ഫോണിലേക്ക് വാചകസന്ദേശമയയ്‌ക്കുക</string>
+  <string name="sms_other_fax">ഫാക്‌സിലേക്ക് വാചകസന്ദേശമയയ്‌ക്കുക</string>
+  <string name="sms_radio">റേഡിയോയിലേക്ക് വാചകസന്ദേശമയയ്‌ക്കുക</string>
+  <string name="sms_telex">ടെലക്‌സിലേക്ക് വാചകസന്ദേശമയയ്‌ക്കുക</string>
+  <string name="sms_tty_tdd">TTY/TDD എന്നതിലേക്ക് വാചകസന്ദേശമയയ്‌ക്കുക</string>
+  <string name="sms_work_mobile">ഔദ്യോഗിക മൊബൈലിലേക്ക് വാചകസന്ദേശമയയ്‌ക്കുക</string>
+  <string name="sms_work_pager">ഔദ്യോഗിക പേജറിലേക്ക് വാചകസന്ദേശമയയ്‌ക്കുക</string>
+  <string name="sms_assistant">%s എന്നതിലേക്ക് വാചക സന്ദേശമയയ്‌ക്കുക</string>
+  <string name="sms_mms">MMS നമ്പറിലേക്ക് വാചകസന്ദേശമയയ്‌ക്കുക</string>
+  <string name="clearFrequentsConfirmation_title">സ്ഥിരംവിളിക്കുന്നവരെ മായ്‌ക്കണോ?</string>
+  <string name="clearFrequentsConfirmation">നിങ്ങൾ കോൺടാക്‌റ്റുകളുടെയും ഫോണിന്റെയും അപ്ലിക്കേഷനുകളിലെ പതിവായി കോൺടാക്റ്റുചെയ്യുന്നവരുടെ ലിസ്റ്റ് മായ്‌ക്കുകയും സ്‌ക്രാച്ചിൽ നിന്നും ബന്ധപ്പെടൽ മുൻഗണനകൾ അറിയാൻ ഇമെയിൽ അപ്ലിക്കേഷനുകളെ പ്രേരിപ്പിക്കുകയും ചെയ്യും.</string>
+  <string name="clearFrequentsProgress_title">സ്ഥിരംവിളിക്കുന്നവരെ മായ്‌ക്കുന്നു…</string>
+  <string name="status_available">ലഭ്യം</string>
+  <string name="status_away">ലഭ്യമല്ല</string>
+  <string name="status_busy">തിരക്കിലാണ്</string>
+  <string name="contactsList">കോണ്ടാക്റ്റ്</string>
+  <string name="contact_suggestions">കൂടുതൽ നിർദ്ദേശിച്ചിരിക്കുന്നവ</string>
+  <string name="local_invisible_directory">മറ്റുള്ളവ</string>
+  <string name="directory_search_label">ഡയറക്‌ടറി</string>
+  <string name="directory_search_label_work">ഔദ്യോഗിക ഡയറക്‌ടറി</string>
+  <string name="local_search_label">എല്ലാ കോൺടാക്റ്റുകളും</string>
+  <string name="local_suggestions_search_label">നിര്‍ദ്ദേശങ്ങള്‍</string>
+  <string msgid="9154761216179882405" name="user_profile_contacts_list_header">ഞാന്‍</string>
+  <string name="missing_name">(പേരില്ല)</string>
+  <string msgid="2795575601596468581" name="description_view_contact_detail">കോൺടാക്റ്റ് കാണുക</string>
+  <string name="list_filter_phones">ഫോൺ നമ്പറുകളുള്ള എല്ലാ കോൺടാക്റ്റുകളും</string>
+  <string name="list_filter_phones_work">ഔദ്യോഗിക പ്രൊഫൈൽ കോൺടാക്റ്റുകൾ</string>
+  <string name="view_updates_from_group">അപ്‌ഡേറ്റുകള്‍ കാണുക</string>
+  <string name="account_phone">ഉപകരണത്തിൽ മാത്രം, സമന്വയിപ്പിക്കില്ല</string>
+  <string name="nameLabelsGroup">പേര്</string>
+  <string name="nicknameLabelsGroup">വിളിപ്പേര്</string>
+  <string name="full_name">പേര്</string>
+  <string name="name_given">ഫസ്റ്റ് നെയിം</string>
+  <string name="name_family">ലാസ്റ്റ് നെയിം</string>
+  <string name="name_prefix">പേര് പ്രിഫിക്‌സ്</string>
+  <string name="name_middle">പേരിന്റെ മധ്യഭാഗം</string>
+  <string name="name_suffix">പേര് സഫിക്‌സ്</string>
+  <string name="name_phonetic">ഉച്ചാരണപ്രകാരമുള്ള പേര്</string>
+  <string name="name_phonetic_given">ഫസ്റ്റ് നെയിം</string>
+  <string name="name_phonetic_middle">പേരിന്റെ മധ്യഭാഗം</string>
+  <string name="name_phonetic_family">പേരിന്റെ അവസാന ഭാഗം</string>
+  <string name="phoneLabelsGroup">ഫോണ്‍</string>
+  <string name="emailLabelsGroup">ഇമെയിൽ</string>
+  <string name="postalLabelsGroup">വിലാസം</string>
+  <string name="imLabelsGroup">IM</string>
+  <string name="organizationLabelsGroup">ഓര്‍ഗനൈസേഷന്‍</string>
+  <string name="relationLabelsGroup">ബന്ധം</string>
+  <string name="eventLabelsGroup">പ്രത്യേക തീയതി</string>
+  <string name="sms">ടെക്‌സ്റ്റ് സന്ദേശം</string>
+  <string name="postal_address">വിലാസം</string>
+  <string name="ghostData_company">കമ്പനി</string>
+  <string name="ghostData_title">ജോലി</string>
+  <string name="label_notes">കുറിപ്പുകള്‍</string>
+  <string name="label_sip_address">SIP</string>
+  <string name="websiteLabelsGroup">വെബ്‌സൈറ്റ്</string>
+  <string name="groupsLabel">ഗ്രൂപ്പുകള്‍‌</string>
+  <string name="email_home">വീട്ടിലെ ഇമെയിൽ</string>
+  <string name="email_mobile">മൊബൈൽ ഇമെയിൽ</string>
+  <string name="email_work">ഔദ്യോഗിക ഇമെയിൽ</string>
+  <string name="email_other">ഇമെയിൽ</string>
+  <string name="email_custom">%s എന്നതിലേക്ക് ഇമെയിൽ ചെയ്യുക</string>
+  <string name="email">ഇമെയിൽ</string>
+  <string name="postal_street">സ്‌ട്രീറ്റ്</string>
+  <string name="postal_city">നഗരം</string>
+  <string name="postal_region">സംസ്ഥാനം</string>
+  <string name="postal_postcode">തപാൽ കോഡ്</string>
+  <string name="postal_country">രാജ്യം</string>
+  <string name="map_home">വീട്ടുവിലാസം കാണുക</string>
+  <string name="map_work">ഔദ്യോഗിക വിലാസം കാണുക</string>
+  <string name="map_other">വിലാസം കാണുക</string>
+  <string name="map_custom">%s വിലാസം കാണുക</string>
+  <string name="chat_aim">AIM ഉപയോഗിച്ച് ചാറ്റുചെയ്യുക</string>
+  <string name="chat_msn">Windows Live ഉപയോഗിച്ച് ചാറ്റുചെയ്യുക</string>
+  <string name="chat_yahoo">Yahoo ഉപയോഗിച്ച് ചാറ്റുചെയ്യുക</string>
+  <string name="chat_skype">Skype ഉപയോഗിച്ച് ചാറ്റുചെയ്യുക</string>
+  <string name="chat_qq">QQ ഉപയോഗിച്ച് ചാറ്റുചെയ്യുക</string>
+  <string name="chat_gtalk">Google Talk ഉപയോഗിച്ച് ചാറ്റുചെയ്യുക</string>
+  <string name="chat_icq">ICQ ഉപയോഗിച്ച് ചാറ്റുചെയ്യുക</string>
+  <string name="chat_jabber">Jabber ഉപയോഗിച്ച് ചാറ്റുചെയ്യുക</string>
+  <string name="chat">ചാറ്റുചെയ്യുക</string>
+  <string name="list_filter_all_accounts">എല്ലാ കോൺടാക്റ്റുകളും</string>
+  <string name="listAllContactsInAccount">%s എന്നതിലെ കോൺടാക്റ്റുകൾ</string>
+  <string name="listCustomView">ഇഷ്‌ടാനുസൃതകാഴ്‌ചയിലെ കോൺടാക്റ്റ്</string>
+  <string name="listSingleContact">സിംഗിൾ കോൺടാക്റ്റ്</string>
+  <string name="display_options_sort_list_by">ഇതുപ്രകാരം അടുക്കുക</string>
+  <string name="display_options_sort_by_given_name">ഫസ്റ്റ് നെയിം</string>
+  <string name="display_options_sort_by_family_name">ലാസ്റ്റ് നെയിം</string>
+  <string name="display_options_view_names_as">പേരിന്റെ ഫോർമാറ്റ്</string>
+  <string name="display_options_view_given_name_first">ഫസ്റ്റ് നെയിം ആദ്യം</string>
+  <string name="display_options_view_family_name_first">ലാസ്റ്റ് നെയിം ആദ്യം</string>
+  <string name="menu_clear_frequents">സ്ഥിരംവിളിക്കുന്നവരെ മായ്‌ക്കൂ</string>
+  <string name="action_menu_back_from_search">തിരയൽ നിർത്തുക</string>
+  <string name="description_clear_search">തിരയൽ മായ്ക്കുക</string>
+  <string name="select_account_dialog_title">അക്കൗണ്ട്</string>
+  <string name="set_default_account">ഇത് എല്ലായ്‌പ്പോഴും കോളുകൾക്കായി ഉപയോഗിക്കുക</string>
+  <string name="select_phone_account_for_calls">ഈ കോളിനായി സിം തിരഞ്ഞെടുക്കുക</string>
+  <string name="select_phone_account_for_calls_remember">ഈ തിരഞ്ഞെടുക്കൽ ഓർക്കുക</string>
+  <string name="call_with_a_note">കുറിപ്പിനൊപ്പം വിളിക്കുക</string>
+  <string name="call_subject_hint">കോളിനൊപ്പം അയയ്ക്കുന്നതിന് ഒരു കുറിപ്പ് ടൈപ്പുചെയ്യുക ...</string>
+  <string name="send_and_call_button">അയയ്‌ക്കുകയും വിളിക്കുകയും ചെയ്യുക</string>
+  <string name="call_subject_limit">%1$s / %2$s</string>
+  <string name="old_call_subject_type_and_number">%1$s %2$s</string>
+  <string name="tab_title">%1$s ടാബ്.</string>
+  <plurals name="tab_title_with_unread_items">
+    <item quantity="one"> %1$s ടാബ്. %2$d വായിക്കാത്ത ഇനം. </item>
+    <item quantity="other"> %1$s ടാബ്. %2$d വായിക്കാത്ത ഇനങ്ങൾ. </item>
+  </plurals>
+  <string name="description_search_video_call">വീഡിയോ കോള്‍</string>
+  <string name="description_search_call_and_share">പങ്കിടുക, കോൾ ചെയ്യുക</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-mn/strings.xml b/java/com/android/contacts/common/res/values-mn/strings.xml
index b91b9a9..0236eef 100644
--- a/java/com/android/contacts/common/res/values-mn/strings.xml
+++ b/java/com/android/contacts/common/res/values-mn/strings.xml
@@ -1,162 +1,145 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="toast_text_copied" msgid="8979281391599667362">"Текст хуулагдав"</string>
-    <string name="call_custom" msgid="3041673234638990874">"<xliff:g id="CUSTOM">%s</xliff:g> руу залгах"</string>
-    <string name="call_home" msgid="125893483593803791">"Гэрийн утас руу залгах"</string>
-    <string name="call_mobile" msgid="967589404494150813">"Гар утас руу залгах"</string>
-    <string name="call_work" msgid="6040550697395300892">"Ажил руу залгах"</string>
-    <string name="call_fax_work" msgid="5260192771364592922">"Ажлын факс руу залгах"</string>
-    <string name="call_fax_home" msgid="5174311195081144124">"Гэрийн факс руу залгах"</string>
-    <string name="call_pager" msgid="6814149227741274161">"Пейжер рүү залгах"</string>
-    <string name="call_other" msgid="5536385588712587235">"Залгах"</string>
-    <string name="call_callback" msgid="6314019862718112786">"Дуудлага хүлээж авахаар залгах"</string>
-    <string name="call_car" msgid="3197417098027764954">"Машин руу залгах"</string>
-    <string name="call_company_main" msgid="2557663310028446397">"Компаний үндсэн дугаар руу залгах"</string>
-    <string name="call_isdn" msgid="4691270442763649522">"ISDN руу залгах"</string>
-    <string name="call_main" msgid="3293707608770407814">"Үндсэн дугаар руу залгах"</string>
-    <string name="call_other_fax" msgid="4724521984879021465">"Факс руу залгах"</string>
-    <string name="call_radio" msgid="8942441419845057942">"Радио руу залгах"</string>
-    <string name="call_telex" msgid="2031514461660668351">"Телекс рүү залгах"</string>
-    <string name="call_tty_tdd" msgid="7807210224965727701">"TTY/TDD рүү залгах"</string>
-    <string name="call_work_mobile" msgid="2716342732938578495">"Ажлын гар утас руу залгах"</string>
-    <string name="call_work_pager" msgid="3791778749827366574">"Ажлын пейжер рүү залгах"</string>
-    <string name="call_assistant" msgid="4177478845473789294">"<xliff:g id="ASSISTANT">%s</xliff:g> руу залгах"</string>
-    <string name="call_mms" msgid="4958811711741872901">"MMS рүү залгах"</string>
-    <string name="sms_custom" msgid="8785368968605026317">"<xliff:g id="CUSTOM">%s</xliff:g> руу зурвас илгээх"</string>
-    <string name="sms_home" msgid="3527719551060295243">"Гэрийн утас руу зурвас илгээх"</string>
-    <string name="sms_mobile" msgid="8883045857887736518">"Гар утас руу зурвас илгээх"</string>
-    <string name="sms_work" msgid="4158595439553450966">"Ажил руу зурвас илгээх"</string>
-    <string name="sms_fax_work" msgid="5483726627718055248">"Ажлын факс руу зурвас илгээх"</string>
-    <string name="sms_fax_home" msgid="9219265155770746077">"Гэрийн факс руу зурвас илгээх"</string>
-    <string name="sms_pager" msgid="4901085068525193933">"Пейжер рүү зурвас илгээх"</string>
-    <string name="sms_other" msgid="1742702947993285933">"Зурвас илгээх"</string>
-    <string name="sms_callback" msgid="5833483630377538308">"Дуудлага авах зурвас илгээх"</string>
-    <string name="sms_car" msgid="4314577266154395174">"Машин руу зурвас илгээх"</string>
-    <string name="sms_company_main" msgid="2308160928487360705">"Компаний үндсэн дугаар руу зурвас илгээх"</string>
-    <string name="sms_isdn" msgid="6394300346179302542">"ISDN рүү зурвас илгээх"</string>
-    <string name="sms_main" msgid="8908087742014140774">"Үндсэн дугаар руу зурвас илгээх"</string>
-    <string name="sms_other_fax" msgid="8768455473295405427">"Факс руу зурвас илгээх"</string>
-    <string name="sms_radio" msgid="855555176531704682">"Радио руу зурвас илгээх"</string>
-    <string name="sms_telex" msgid="6269029276223252719">"Телекс рүү зурвас илгээх"</string>
-    <string name="sms_tty_tdd" msgid="6229057354509192444">"TTY/TDD рүү зурвас илгээх"</string>
-    <string name="sms_work_mobile" msgid="2155975469329969840">"Ажлын гар утас руу зурвас илгээх"</string>
-    <string name="sms_work_pager" msgid="8500140274906830742">"Ажлын пейжэр рүү зурвас илгээх"</string>
-    <string name="sms_assistant" msgid="8513548482745330818">"<xliff:g id="ASSISTANT">%s</xliff:g> руу зурвас бичих"</string>
-    <string name="sms_mms" msgid="5187888900503248542">"MMS руу зурвас илгээх"</string>
-    <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"Байнга холбоо барьдаг харилцагчдын жагсаалтыг устгах уу?"</string>
-    <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"Та холбоо барих хэсэг болон утасны програмд байгаа тогтмол холбоо баридаг хаягуудыг устгах ба имэйл програмуудыг таны холбоо барих хаягуудыг эрэмбэлэх үйлдлийг идэвхжүүлэх болно."</string>
-    <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"Байнга холбоо барьдаг харилцагчдын жагсаалтыг устгаж байна…"</string>
-    <string name="status_available" msgid="2648156525685472626">"Холбогдсон"</string>
-    <string name="status_away" msgid="2298688367552893953">"Холдсон"</string>
-    <string name="status_busy" msgid="5990832098713248503">"Завгүй"</string>
-    <string name="contactsList" msgid="8806067891419291513">"Харилцагчид"</string>
-    <string name="contact_suggestions" msgid="3324166754807120006">"Санал болгосон шилдэг"</string>
-    <string name="local_invisible_directory" msgid="4723238462733650090">"Бусад"</string>
-    <string name="directory_search_label" msgid="4621215895484025229">"Директор"</string>
-    <string name="directory_search_label_work" msgid="7679326282707414897">"Ажлын лавлагаа"</string>
-    <string name="local_search_label" msgid="907622822323119235">"Бүх харилцагчид"</string>
-    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Санал болголт"</string>
-    <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Би"</string>
-    <string name="missing_name" msgid="978606963362745020">"(нэр байхгүй)"</string>
-    <string name="description_view_contact_detail" msgid="2428742401208561136">"Харилцагчийг харах"</string>
-    <string name="list_filter_phones" msgid="8763316061763437182">"Утасны дугаартай бүх харилцагчид"</string>
-    <string name="list_filter_phones_work" msgid="7083575404573422965">"Ажлын профайлын харилцагч"</string>
-    <string name="view_updates_from_group" msgid="9011641093168385729">"Шинэчлэлтүүдийг харах"</string>
-    <string name="account_phone" msgid="7067809073194061035">"Зөвхөн төхөөрөмжид, синк хийгээгүй"</string>
-    <string name="nameLabelsGroup" msgid="7730465833159557471">"Нэр"</string>
-    <string name="nicknameLabelsGroup" msgid="6310556912361840029">"Хоч"</string>
-    <string name="full_name" msgid="648186563998465740">"Нэр"</string>
-    <string name="name_given" msgid="5096576006314820536">"Өөрийн нэр"</string>
-    <string name="name_family" msgid="6646235805198547467">"Овог"</string>
-    <string name="name_prefix" msgid="9215326539658838">"Нэрийн урьдитгал"</string>
-    <string name="name_middle" msgid="703755205331582769">"Дундах нэр"</string>
-    <string name="name_suffix" msgid="5777083390282548702">"Нэрийн дагавар"</string>
-    <string name="name_phonetic" msgid="1650870996361663089">"Авианы нэр"</string>
-    <string name="name_phonetic_given" msgid="618812334274603170">"Өөрийн нэрийн дуудлага"</string>
-    <string name="name_phonetic_middle" msgid="4826820763384625538">"Дундах авианы нэр"</string>
-    <string name="name_phonetic_family" msgid="379905191212930771">"Овгийн дуудлага"</string>
-    <string name="phoneLabelsGroup" msgid="169661929021355548">"Утас"</string>
-    <string name="emailLabelsGroup" msgid="2249752810477488833">"Имэйлдэх"</string>
-    <string name="postalLabelsGroup" msgid="6772000590189142253">"Хаяг"</string>
-    <string name="imLabelsGroup" msgid="5718066254237364731">"IM"</string>
-    <string name="organizationLabelsGroup" msgid="1101996309241601435">"Байгууллага"</string>
-    <string name="relationLabelsGroup" msgid="53866051664600053">"Хамаарал"</string>
-    <string name="eventLabelsGroup" msgid="1236970042646618489">"Баярт өдөр"</string>
-    <string name="sms" msgid="7574344928185328095">"Текст зурвас"</string>
-    <string name="postal_address" msgid="1804707930129674200">"Хаяг"</string>
-    <string name="ghostData_company" msgid="2554310786296833424">"Компани"</string>
-    <string name="ghostData_title" msgid="4994968731830184837">"Гарчиг"</string>
-    <string name="label_notes" msgid="2050255313694219786">"Тэмдэглэл"</string>
-    <string name="label_sip_address" msgid="8883266182575965926">"SIP"</string>
-    <string name="websiteLabelsGroup" msgid="1630734286462186790">"Вэбсайт"</string>
-    <string name="groupsLabel" msgid="2694002798416868728">"Группүүд"</string>
-    <string name="email_home" msgid="889830029388962171">"Гэр рүү имэйлдэх"</string>
-    <string name="email_mobile" msgid="4487686436743741150">"Гар утас руу имэйлдэх"</string>
-    <string name="email_work" msgid="4223487303344613528">"Ажил руу имэйлдэх"</string>
-    <string name="email_other" msgid="4246411900126012062">"Имэйлдэх"</string>
-    <string name="email_custom" msgid="7246580894327511013">"<xliff:g id="CUSTOM">%s</xliff:g> рүү имэйлдэх"</string>
-    <string name="email" msgid="2807318537887091606">"Имэйлдэх"</string>
-    <string name="postal_street" msgid="6918171741240802474">"Гудамж"</string>
-    <string name="postal_city" msgid="8674569121430005628">"Хот"</string>
-    <string name="postal_region" msgid="1730369286225469192">"Муж улс"</string>
-    <string name="postal_postcode" msgid="4450700741261990439">"Зип код"</string>
-    <string name="postal_country" msgid="232670707458768148">"Улс"</string>
-    <string name="map_home" msgid="4181131107392126938">"Гэрийн хаяг харах"</string>
-    <string name="map_work" msgid="5723471185992684400">"Ажлын хаяг харах"</string>
-    <string name="map_other" msgid="2253764780863500516">"Хаяг харах"</string>
-    <string name="map_custom" msgid="5581743097882436157">"<xliff:g id="CUSTOM">%s</xliff:g> хаяг харах"</string>
-    <string name="chat_aim" msgid="2954364435497941659">"AIM ашиглан чатлах"</string>
-    <string name="chat_msn" msgid="3130135239071228678">"Windows Live ашиглан чатлах"</string>
-    <string name="chat_yahoo" msgid="3233552142326865347">"Yahoo ашиглан чатлах"</string>
-    <string name="chat_skype" msgid="6486703981390592425">"Skype ашиглан чатлах"</string>
-    <string name="chat_qq" msgid="786924280665740019">"QQ ашиглан чатлах"</string>
-    <string name="chat_gtalk" msgid="7914674177243078035">"Google Talk ашиглан чатлах"</string>
-    <string name="chat_icq" msgid="3292934726414765801">"ICQ ашиглан чатлах"</string>
-    <string name="chat_jabber" msgid="6701542313597880204">"Jabber ашиглан чатлах"</string>
-    <string name="chat" msgid="1020428260359370236">"Чат"</string>
-    <string name="list_filter_all_accounts" msgid="473782314881473992">"Бүх харилцагч"</string>
-    <string name="listAllContactsInAccount" msgid="3486378621592995630">"<xliff:g id="NAME">%s</xliff:g> доторх харилцагчид"</string>
-    <string name="listCustomView" msgid="5306282632413086731">"Хувийн тохиргоотой харагдац дахь харилцагчид"</string>
-    <string name="listSingleContact" msgid="8620818791932382627">"Ганц харилцагч"</string>
-    <string name="display_options_sort_list_by" msgid="3541875948367831228">"Эрэмбэлэх"</string>
-    <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"Өөрийн нэр"</string>
-    <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"Овог"</string>
-    <string name="display_options_view_names_as" msgid="4204204205736735618">"Нэрийн формат"</string>
-    <string name="display_options_view_given_name_first" msgid="2308026973021171020">"Нэрийг эхэнд нь"</string>
-    <string name="display_options_view_family_name_first" msgid="987430497292428242">"Овгийг эхэнд нь"</string>
-    <string name="menu_clear_frequents" msgid="5358271535047496120">"Байнга харилцсаныг арилгах"</string>
-    <string name="action_menu_back_from_search" msgid="3550669942742167644">"хайлтыг зогсоох"</string>
-    <string name="description_clear_search" msgid="2347258825265600782">"Хайлтыг цэвэрлэх"</string>
-    <string name="select_account_dialog_title" msgid="2673504582803359239">"Бүртгэл"</string>
-    <string name="set_default_account" msgid="7966099951006467572">"Дуудлагад байнга үүнийг ашиглах"</string>
-    <string name="select_phone_account_for_calls" msgid="1784460686103423274">"Залгах"</string>
-    <string name="call_with_a_note" msgid="6242261320491851133">"Тэмдэглэл бүхий дуудлага хийх"</string>
-    <string name="call_subject_hint" msgid="7233138753650420800">"Дуудлаганд илгээх тэмдэглэл бичнэ үү..."</string>
-    <string name="send_and_call_button" msgid="4735168294120154013">"ИЛГЭЭХ, ДУУДЛАГА"</string>
-    <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="tab_title" msgid="3387876802026074288">"<xliff:g id="TITLE">%1$s</xliff:g> таб."</string>
-    <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
-      <item quantity="other"> <xliff:g id="TITLE_2">%1$s</xliff:g> таб. <xliff:g id="COUNT_3">%2$d</xliff:g> уншаагүй зүйл. </item>
-      <item quantity="one"> <xliff:g id="TITLE_0">%1$s</xliff:g> таб. <xliff:g id="COUNT_1">%2$d</xliff:g> уншаагүй зүйл. </item>
-    </plurals>
-    <string name="description_search_video_call" msgid="4337369876888024909">"Видео дуудлага"</string>
-    <string name="description_search_call_and_share" msgid="4912772842755050467">"Хуваалцаад залгах"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_custom">%s руу залгах</string>
+  <string name="call_home">Гэрийн утас руу залгах</string>
+  <string name="call_mobile">Гар утас руу залгах</string>
+  <string name="call_work">Ажил руу залгах</string>
+  <string name="call_fax_work">Ажлын факс руу залгах</string>
+  <string name="call_fax_home">Гэрийн факс руу залгах</string>
+  <string name="call_pager">Пейжер рүү залгах</string>
+  <string name="call_other">Залгах</string>
+  <string name="call_callback">Дуудлага хүлээж авахаар залгах</string>
+  <string name="call_car">Машин руу залгах</string>
+  <string name="call_company_main">Компаний үндсэн дугаар руу залгах</string>
+  <string name="call_isdn">ISDN руу залгах</string>
+  <string name="call_main">Үндсэн дугаар руу залгах</string>
+  <string name="call_other_fax">Факс руу залгах</string>
+  <string name="call_radio">Радио руу залгах</string>
+  <string name="call_telex">Телекс рүү залгах</string>
+  <string name="call_tty_tdd">TTY/TDD рүү залгах</string>
+  <string name="call_work_mobile">Ажлын гар утас руу залгах</string>
+  <string name="call_work_pager">Ажлын пейжер рүү залгах</string>
+  <string name="call_assistant">%s руу залгах</string>
+  <string name="call_mms">MMS рүү залгах</string>
+  <string name="sms_custom">%s руу зурвас илгээх</string>
+  <string name="sms_home">Гэрийн утас руу зурвас илгээх</string>
+  <string name="sms_mobile">Гар утас руу зурвас илгээх</string>
+  <string name="sms_work">Ажил руу зурвас илгээх</string>
+  <string name="sms_fax_work">Ажлын факс руу зурвас илгээх</string>
+  <string name="sms_fax_home">Гэрийн факс руу зурвас илгээх</string>
+  <string name="sms_pager">Пейжер рүү зурвас илгээх</string>
+  <string name="sms_other">Зурвас илгээх</string>
+  <string name="sms_callback">Дуудлага авах зурвас илгээх</string>
+  <string name="sms_car">Машин руу зурвас илгээх</string>
+  <string name="sms_company_main">Компаний үндсэн дугаар руу зурвас илгээх</string>
+  <string name="sms_isdn">ISDN рүү зурвас илгээх</string>
+  <string name="sms_main">Үндсэн дугаар руу зурвас илгээх</string>
+  <string name="sms_other_fax">Факс руу зурвас илгээх</string>
+  <string name="sms_radio">Радио руу зурвас илгээх</string>
+  <string name="sms_telex">Телекс рүү зурвас илгээх</string>
+  <string name="sms_tty_tdd">TTY/TDD рүү зурвас илгээх</string>
+  <string name="sms_work_mobile">Ажлын гар утас руу зурвас илгээх</string>
+  <string name="sms_work_pager">Ажлын пейжэр рүү зурвас илгээх</string>
+  <string name="sms_assistant">%s руу зурвас бичих</string>
+  <string name="sms_mms">MMS руу зурвас илгээх</string>
+  <string name="clearFrequentsConfirmation_title">Байнга холбоо барьдаг харилцагчдын жагсаалтыг устгах уу?</string>
+  <string name="clearFrequentsConfirmation">Та холбоо барих хэсэг болон утасны програмд байгаа тогтмол холбоо баридаг хаягуудыг устгах ба имэйл програмуудыг таны холбоо барих хаягуудыг эрэмбэлэх үйлдлийг идэвхжүүлэх болно.</string>
+  <string name="clearFrequentsProgress_title">Байнга холбоо барьдаг харилцагчдын жагсаалтыг устгаж байна…</string>
+  <string name="status_available">Холбогдсон</string>
+  <string name="status_away">Холдсон</string>
+  <string name="status_busy">Завгүй</string>
+  <string name="contactsList">Харилцагчид</string>
+  <string name="contact_suggestions">Санал болгосон шилдэг</string>
+  <string name="local_invisible_directory">Бусад</string>
+  <string name="directory_search_label">Директор</string>
+  <string name="directory_search_label_work">Ажлын лавлагаа</string>
+  <string name="local_search_label">Бүх харилцагчид</string>
+  <string name="local_suggestions_search_label">Санал болголт</string>
+  <string msgid="9154761216179882405" name="user_profile_contacts_list_header">Би</string>
+  <string name="missing_name">(нэр байхгүй)</string>
+  <string msgid="2795575601596468581" name="description_view_contact_detail">Харилцагчийг харах</string>
+  <string name="list_filter_phones">Утасны дугаартай бүх харилцагчид</string>
+  <string name="list_filter_phones_work">Ажлын профайлын харилцагч</string>
+  <string name="view_updates_from_group">Шинэчлэлтүүдийг харах</string>
+  <string name="account_phone">Зөвхөн төхөөрөмжид, синк хийгээгүй</string>
+  <string name="nameLabelsGroup">Нэр</string>
+  <string name="nicknameLabelsGroup">Хоч</string>
+  <string name="full_name">Нэр</string>
+  <string name="name_given">Өөрийн нэр</string>
+  <string name="name_family">Овог</string>
+  <string name="name_prefix">Нэрийн урьдитгал</string>
+  <string name="name_middle">Дундах нэр</string>
+  <string name="name_suffix">Нэрийн дагавар</string>
+  <string name="name_phonetic">Авианы нэр</string>
+  <string name="name_phonetic_given">Өөрийн нэрийн дуудлага</string>
+  <string name="name_phonetic_middle">Дундах авианы нэр</string>
+  <string name="name_phonetic_family">Овгийн дуудлага</string>
+  <string name="phoneLabelsGroup">Утас</string>
+  <string name="emailLabelsGroup">Имэйлдэх</string>
+  <string name="postalLabelsGroup">Хаяг</string>
+  <string name="imLabelsGroup">IM</string>
+  <string name="organizationLabelsGroup">Байгууллага</string>
+  <string name="relationLabelsGroup">Хамаарал</string>
+  <string name="eventLabelsGroup">Баярт өдөр</string>
+  <string name="sms">Текст зурвас</string>
+  <string name="postal_address">Хаяг</string>
+  <string name="ghostData_company">Компани</string>
+  <string name="ghostData_title">Гарчиг</string>
+  <string name="label_notes">Тэмдэглэл</string>
+  <string name="label_sip_address">SIP</string>
+  <string name="websiteLabelsGroup">Вэбсайт</string>
+  <string name="groupsLabel">Группүүд</string>
+  <string name="email_home">Гэр рүү имэйлдэх</string>
+  <string name="email_mobile">Гар утас руу имэйлдэх</string>
+  <string name="email_work">Ажил руу имэйлдэх</string>
+  <string name="email_other">Имэйлдэх</string>
+  <string name="email_custom">%s рүү имэйлдэх</string>
+  <string name="email">Имэйлдэх</string>
+  <string name="postal_street">Гудамж</string>
+  <string name="postal_city">Хот</string>
+  <string name="postal_region">Муж улс</string>
+  <string name="postal_postcode">Зип код</string>
+  <string name="postal_country">Улс</string>
+  <string name="map_home">Гэрийн хаяг харах</string>
+  <string name="map_work">Ажлын хаяг харах</string>
+  <string name="map_other">Хаяг харах</string>
+  <string name="map_custom">%s хаяг харах</string>
+  <string name="chat_aim">AIM ашиглан чатлах</string>
+  <string name="chat_msn">Windows Live ашиглан чатлах</string>
+  <string name="chat_yahoo">Yahoo ашиглан чатлах</string>
+  <string name="chat_skype">Skype ашиглан чатлах</string>
+  <string name="chat_qq">QQ ашиглан чатлах</string>
+  <string name="chat_gtalk">Google Talk ашиглан чатлах</string>
+  <string name="chat_icq">ICQ ашиглан чатлах</string>
+  <string name="chat_jabber">Jabber ашиглан чатлах</string>
+  <string name="chat">Чат</string>
+  <string name="list_filter_all_accounts">Бүх харилцагч</string>
+  <string name="listAllContactsInAccount">%s доторх харилцагчид</string>
+  <string name="listCustomView">Хувийн тохиргоотой харагдац дахь харилцагчид</string>
+  <string name="listSingleContact">Ганц харилцагч</string>
+  <string name="display_options_sort_list_by">Эрэмбэлэх</string>
+  <string name="display_options_sort_by_given_name">Өөрийн нэр</string>
+  <string name="display_options_sort_by_family_name">Овог</string>
+  <string name="display_options_view_names_as">Нэрийн формат</string>
+  <string name="display_options_view_given_name_first">Нэрийг эхэнд нь</string>
+  <string name="display_options_view_family_name_first">Овгийг эхэнд нь</string>
+  <string name="menu_clear_frequents">Байнга харилцсаныг арилгах</string>
+  <string name="action_menu_back_from_search">хайлтыг зогсоох</string>
+  <string name="description_clear_search">Хайлтыг цэвэрлэх</string>
+  <string name="select_account_dialog_title">Бүртгэл</string>
+  <string name="set_default_account">Дуудлагад байнга үүнийг ашиглах</string>
+  <string name="select_phone_account_for_calls">Энэ дуудлагд ашиглах SIM сонгоно уу</string>
+  <string name="select_phone_account_for_calls_remember">Энэ сонголтыг санах</string>
+  <string name="call_with_a_note">Тэмдэглэл бүхий дуудлага хийх</string>
+  <string name="call_subject_hint">Дуудлаганд илгээх тэмдэглэл бичнэ үү...</string>
+  <string name="send_and_call_button">ИЛГЭЭХ, ДУУДЛАГА</string>
+  <string name="call_subject_limit">%1$s / %2$s</string>
+  <string name="old_call_subject_type_and_number">%1$s %2$s</string>
+  <string name="tab_title">%1$s таб.</string>
+  <plurals name="tab_title_with_unread_items">
+    <item quantity="one"> %1$s таб. %2$d уншаагүй зүйл. </item>
+    <item quantity="other"> %1$s таб. %2$d уншаагүй зүйл. </item>
+  </plurals>
+  <string name="description_search_video_call">Видео дуудлага</string>
+  <string name="description_search_call_and_share">Хуваалцаад залгах</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-mr/strings.xml b/java/com/android/contacts/common/res/values-mr/strings.xml
index b6b3293..a520afb 100644
--- a/java/com/android/contacts/common/res/values-mr/strings.xml
+++ b/java/com/android/contacts/common/res/values-mr/strings.xml
@@ -1,162 +1,145 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="toast_text_copied" msgid="8979281391599667362">"मजकूर कॉपी केला"</string>
-    <string name="call_custom" msgid="3041673234638990874">"<xliff:g id="CUSTOM">%s</xliff:g> ला कॉल  करा"</string>
-    <string name="call_home" msgid="125893483593803791">"निवासस्‍थानी कॉल करा"</string>
-    <string name="call_mobile" msgid="967589404494150813">"मोबाईलवर कॉल करा"</string>
-    <string name="call_work" msgid="6040550697395300892">"कार्यस्‍थानी कॉल करा"</string>
-    <string name="call_fax_work" msgid="5260192771364592922">"कार्यस्‍थानी फॅक्‍स वर कॉल करा"</string>
-    <string name="call_fax_home" msgid="5174311195081144124">"निवास फॅक्‍स वर कॉल करा"</string>
-    <string name="call_pager" msgid="6814149227741274161">"पेजर वर कॉल करा"</string>
-    <string name="call_other" msgid="5536385588712587235">"कॉल करा"</string>
-    <string name="call_callback" msgid="6314019862718112786">"कॉलबॅकवर कॉल करा"</string>
-    <string name="call_car" msgid="3197417098027764954">"कारला कॉल करा"</string>
-    <string name="call_company_main" msgid="2557663310028446397">"कंपनी मुख्‍य ला कॉल करा"</string>
-    <string name="call_isdn" msgid="4691270442763649522">"ISDN कॉल करा"</string>
-    <string name="call_main" msgid="3293707608770407814">"मुख्य वर कॉल करा"</string>
-    <string name="call_other_fax" msgid="4724521984879021465">"फॅक्स वर कॉल करा"</string>
-    <string name="call_radio" msgid="8942441419845057942">"रेडिओ वर कॉल करा"</string>
-    <string name="call_telex" msgid="2031514461660668351">"टेलेक्स वर कॉल करा"</string>
-    <string name="call_tty_tdd" msgid="7807210224965727701">"TTY/TDD वर कॉल करा"</string>
-    <string name="call_work_mobile" msgid="2716342732938578495">"कार्यस्‍थानी मोबाईलवर कॉल करा"</string>
-    <string name="call_work_pager" msgid="3791778749827366574">"कार्यस्‍थानी पेजरवर कॉल करा"</string>
-    <string name="call_assistant" msgid="4177478845473789294">"<xliff:g id="ASSISTANT">%s</xliff:g> ला कॉल  करा"</string>
-    <string name="call_mms" msgid="4958811711741872901">"MMS वर कॉल करा"</string>
-    <string name="sms_custom" msgid="8785368968605026317">"<xliff:g id="CUSTOM">%s</xliff:g> मजकूर पाठवा"</string>
-    <string name="sms_home" msgid="3527719551060295243">"निवासस्थानी मजकूर पाठवा"</string>
-    <string name="sms_mobile" msgid="8883045857887736518">"मोबाईलवर मजकूर पाठवा"</string>
-    <string name="sms_work" msgid="4158595439553450966">"कार्यस्थानी मजकूर पाठवा"</string>
-    <string name="sms_fax_work" msgid="5483726627718055248">"कार्य फॅक्सवर मजकूर पाठवा"</string>
-    <string name="sms_fax_home" msgid="9219265155770746077">"घर फॅक्सवर मजकूर पाठवा"</string>
-    <string name="sms_pager" msgid="4901085068525193933">"पेजरवर मजकूर पाठवा"</string>
-    <string name="sms_other" msgid="1742702947993285933">"मजकूर"</string>
-    <string name="sms_callback" msgid="5833483630377538308">"कॉलबॅक वर मजकूर पाठवा"</string>
-    <string name="sms_car" msgid="4314577266154395174">"कार वर मजकूर पाठवा"</string>
-    <string name="sms_company_main" msgid="2308160928487360705">"कंपनी मुख्य वर मजकूर पाठवा"</string>
-    <string name="sms_isdn" msgid="6394300346179302542">"ISDN वर मजकूर पाठवा"</string>
-    <string name="sms_main" msgid="8908087742014140774">"मुख्य वर मजकूर पाठवा"</string>
-    <string name="sms_other_fax" msgid="8768455473295405427">"फॅक्सवर मजकूर पाठवा"</string>
-    <string name="sms_radio" msgid="855555176531704682">"रेडिओवर मजकूर पाठवा"</string>
-    <string name="sms_telex" msgid="6269029276223252719">"टेलेक्सवर मजकूर पाठवा"</string>
-    <string name="sms_tty_tdd" msgid="6229057354509192444">"TTY/TDD वर मजकूर पाठवा"</string>
-    <string name="sms_work_mobile" msgid="2155975469329969840">"कार्य मोबाईलवर मजकूर पाठवा"</string>
-    <string name="sms_work_pager" msgid="8500140274906830742">"कार्य पेजरवर मजकूर पाठवा"</string>
-    <string name="sms_assistant" msgid="8513548482745330818">"<xliff:g id="ASSISTANT">%s</xliff:g> मजकूर पाठवा"</string>
-    <string name="sms_mms" msgid="5187888900503248542">"MMS वर मजकूर पाठवा"</string>
-    <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"वारंवार सपर्क साधलेले साफ करायचे?"</string>
-    <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"आपण संपर्क आणि फोन अ‍ॅप्‍स मधील वारंवार संपर्क साधलेली सूची साफ कराल आणि ईमेल अ‍ॅप्‍सना सुरवातीपासून आपली पत्ता प्राधान्‍ये जाणून घेण्‍याची सक्ती कराल."</string>
-    <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"वारंवार सपर्क साधलेले साफ करीत आहे..."</string>
-    <string name="status_available" msgid="2648156525685472626">"उपलब्ध"</string>
-    <string name="status_away" msgid="2298688367552893953">"दूर आहे"</string>
-    <string name="status_busy" msgid="5990832098713248503">"व्यस्त"</string>
-    <string name="contactsList" msgid="8806067891419291513">"संपर्क"</string>
-    <string name="contact_suggestions" msgid="3324166754807120006">"सुचविलेले उत्कृष्ट"</string>
-    <string name="local_invisible_directory" msgid="4723238462733650090">"इतर"</string>
-    <string name="directory_search_label" msgid="4621215895484025229">"निर्देशिका"</string>
-    <string name="directory_search_label_work" msgid="7679326282707414897">"कार्य निर्देशिका"</string>
-    <string name="local_search_label" msgid="907622822323119235">"सर्व संपर्क"</string>
-    <string name="local_suggestions_search_label" msgid="1178575146224386118">"सूचना"</string>
-    <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"मी"</string>
-    <string name="missing_name" msgid="978606963362745020">"(नाव नाही)"</string>
-    <string name="description_view_contact_detail" msgid="2428742401208561136">"संपर्क पहा"</string>
-    <string name="list_filter_phones" msgid="8763316061763437182">"फोन नंबरसह सर्व संपर्क"</string>
-    <string name="list_filter_phones_work" msgid="7083575404573422965">"कार्य प्रोफाईल संपर्क"</string>
-    <string name="view_updates_from_group" msgid="9011641093168385729">"अपडेट पहा"</string>
-    <string name="account_phone" msgid="7067809073194061035">"केवळ डिव्हाइस, संकालित न केलेला"</string>
-    <string name="nameLabelsGroup" msgid="7730465833159557471">"नाव"</string>
-    <string name="nicknameLabelsGroup" msgid="6310556912361840029">"टोपणनाव"</string>
-    <string name="full_name" msgid="648186563998465740">"नाव"</string>
-    <string name="name_given" msgid="5096576006314820536">"नाव"</string>
-    <string name="name_family" msgid="6646235805198547467">"आडनाव"</string>
-    <string name="name_prefix" msgid="9215326539658838">"नाव उपसर्ग"</string>
-    <string name="name_middle" msgid="703755205331582769">"मधले नाव"</string>
-    <string name="name_suffix" msgid="5777083390282548702">"नाव उपसर्ग"</string>
-    <string name="name_phonetic" msgid="1650870996361663089">"ध्वन्यात्मक नाव"</string>
-    <string name="name_phonetic_given" msgid="618812334274603170">"ध्वन्यात्मक नाव"</string>
-    <string name="name_phonetic_middle" msgid="4826820763384625538">"ध्वन्यात्मक मधले नाव"</string>
-    <string name="name_phonetic_family" msgid="379905191212930771">"ध्वन्यात्मक आडनाव"</string>
-    <string name="phoneLabelsGroup" msgid="169661929021355548">"फोन"</string>
-    <string name="emailLabelsGroup" msgid="2249752810477488833">"ईमेल"</string>
-    <string name="postalLabelsGroup" msgid="6772000590189142253">"पत्ता"</string>
-    <string name="imLabelsGroup" msgid="5718066254237364731">"IM"</string>
-    <string name="organizationLabelsGroup" msgid="1101996309241601435">"संस्था"</string>
-    <string name="relationLabelsGroup" msgid="53866051664600053">"नातेसंबंध"</string>
-    <string name="eventLabelsGroup" msgid="1236970042646618489">"विशिष्ट तारीख"</string>
-    <string name="sms" msgid="7574344928185328095">"मजकूर संदेश"</string>
-    <string name="postal_address" msgid="1804707930129674200">"पत्ता"</string>
-    <string name="ghostData_company" msgid="2554310786296833424">"कंपनी"</string>
-    <string name="ghostData_title" msgid="4994968731830184837">"शीर्षक"</string>
-    <string name="label_notes" msgid="2050255313694219786">"टिपा"</string>
-    <string name="label_sip_address" msgid="8883266182575965926">"SIP"</string>
-    <string name="websiteLabelsGroup" msgid="1630734286462186790">"वेबसाइट"</string>
-    <string name="groupsLabel" msgid="2694002798416868728">"गट"</string>
-    <string name="email_home" msgid="889830029388962171">"निवासस्‍थानी ईमेल करा"</string>
-    <string name="email_mobile" msgid="4487686436743741150">"मोबाईलवर ईमेल करा"</string>
-    <string name="email_work" msgid="4223487303344613528">"कार्यस्‍थानावर ईमेल करा"</string>
-    <string name="email_other" msgid="4246411900126012062">"ईमेल"</string>
-    <string name="email_custom" msgid="7246580894327511013">"<xliff:g id="CUSTOM">%s</xliff:g> वर ईमेल करा"</string>
-    <string name="email" msgid="2807318537887091606">"ईमेल"</string>
-    <string name="postal_street" msgid="6918171741240802474">"मार्ग"</string>
-    <string name="postal_city" msgid="8674569121430005628">"शहर"</string>
-    <string name="postal_region" msgid="1730369286225469192">"राज्य"</string>
-    <string name="postal_postcode" msgid="4450700741261990439">"पिनकोड"</string>
-    <string name="postal_country" msgid="232670707458768148">"देश"</string>
-    <string name="map_home" msgid="4181131107392126938">"निवास पत्ता पहा"</string>
-    <string name="map_work" msgid="5723471185992684400">"कार्य पत्ता पहा"</string>
-    <string name="map_other" msgid="2253764780863500516">"पत्ता पहा"</string>
-    <string name="map_custom" msgid="5581743097882436157">"<xliff:g id="CUSTOM">%s</xliff:g> पत्ता पहा"</string>
-    <string name="chat_aim" msgid="2954364435497941659">"AIM चा वापर करून चॅट करा"</string>
-    <string name="chat_msn" msgid="3130135239071228678">"Windows Live चा वापर करून चॅट करा"</string>
-    <string name="chat_yahoo" msgid="3233552142326865347">"Yahoo चा वापर करून चॅट करा"</string>
-    <string name="chat_skype" msgid="6486703981390592425">"Skype चा वापर करून चॅट करा"</string>
-    <string name="chat_qq" msgid="786924280665740019">"QQ चा वापर करून चॅट करा"</string>
-    <string name="chat_gtalk" msgid="7914674177243078035">"Google Talk चा वापर करून चॅट करा"</string>
-    <string name="chat_icq" msgid="3292934726414765801">"ICQ चा वापर करून चॅट करा"</string>
-    <string name="chat_jabber" msgid="6701542313597880204">"Jabber चा वापर करून चॅट करा"</string>
-    <string name="chat" msgid="1020428260359370236">"चॅट करा"</string>
-    <string name="list_filter_all_accounts" msgid="473782314881473992">"सर्व संपर्क"</string>
-    <string name="listAllContactsInAccount" msgid="3486378621592995630">"<xliff:g id="NAME">%s</xliff:g> मधील संपर्क"</string>
-    <string name="listCustomView" msgid="5306282632413086731">"सानुकूल दृश्यामधील संपर्क"</string>
-    <string name="listSingleContact" msgid="8620818791932382627">"एकल संपर्क"</string>
-    <string name="display_options_sort_list_by" msgid="3541875948367831228">"नुसार क्रमवारी लावा"</string>
-    <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"नाव"</string>
-    <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"आडनाव"</string>
-    <string name="display_options_view_names_as" msgid="4204204205736735618">"नाव स्वरूपन"</string>
-    <string name="display_options_view_given_name_first" msgid="2308026973021171020">"नाव प्रथम"</string>
-    <string name="display_options_view_family_name_first" msgid="987430497292428242">"आडनाव प्रथम"</string>
-    <string name="menu_clear_frequents" msgid="5358271535047496120">"वारंवारता साफ करा"</string>
-    <string name="action_menu_back_from_search" msgid="3550669942742167644">"शोध थांबवा"</string>
-    <string name="description_clear_search" msgid="2347258825265600782">"शोध साफ करा"</string>
-    <string name="select_account_dialog_title" msgid="2673504582803359239">"खाते"</string>
-    <string name="set_default_account" msgid="7966099951006467572">"कॉलसाठी हे नेहमी वापरा"</string>
-    <string name="select_phone_account_for_calls" msgid="1784460686103423274">"यासह कॉल करा"</string>
-    <string name="call_with_a_note" msgid="6242261320491851133">"टीपसह कॉल करा"</string>
-    <string name="call_subject_hint" msgid="7233138753650420800">"कॉलसह पाठविण्‍यासाठी एक टीप टाइप करा..."</string>
-    <string name="send_and_call_button" msgid="4735168294120154013">"पाठवा आणि कॉल करा"</string>
-    <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="tab_title" msgid="3387876802026074288">"<xliff:g id="TITLE">%1$s</xliff:g> टॅब."</string>
-    <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
-      <item quantity="one"> <xliff:g id="TITLE_2">%1$s</xliff:g> टॅब. <xliff:g id="COUNT_3">%2$d</xliff:g> न वाचलेला आयटम. </item>
-      <item quantity="other"> <xliff:g id="TITLE_2">%1$s</xliff:g> टॅब. <xliff:g id="COUNT_3">%2$d</xliff:g> न वाचलेले आयटम. </item>
-    </plurals>
-    <string name="description_search_video_call" msgid="4337369876888024909">"व्हिडिओ कॉल"</string>
-    <string name="description_search_call_and_share" msgid="4912772842755050467">"सामायिक करा आणि कॉल करा"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_custom">%s ला कॉल  करा</string>
+  <string name="call_home">निवासस्‍थानी कॉल करा</string>
+  <string name="call_mobile">मोबाईलवर कॉल करा</string>
+  <string name="call_work">कार्यस्‍थानी कॉल करा</string>
+  <string name="call_fax_work">कार्यस्‍थानी फॅक्‍स वर कॉल करा</string>
+  <string name="call_fax_home">निवास फॅक्‍स वर कॉल करा</string>
+  <string name="call_pager">पेजर वर कॉल करा</string>
+  <string name="call_other">कॉल करा</string>
+  <string name="call_callback">कॉलबॅकवर कॉल करा</string>
+  <string name="call_car">कारला कॉल करा</string>
+  <string name="call_company_main">कंपनी मुख्‍य ला कॉल करा</string>
+  <string name="call_isdn">ISDN कॉल करा</string>
+  <string name="call_main">मुख्य वर कॉल करा</string>
+  <string name="call_other_fax">फॅक्स वर कॉल करा</string>
+  <string name="call_radio">रेडिओ वर कॉल करा</string>
+  <string name="call_telex">टेलेक्स वर कॉल करा</string>
+  <string name="call_tty_tdd">TTY/TDD वर कॉल करा</string>
+  <string name="call_work_mobile">कार्यस्‍थानी मोबाईलवर कॉल करा</string>
+  <string name="call_work_pager">कार्यस्‍थानी पेजरवर कॉल करा</string>
+  <string name="call_assistant">%s ला कॉल  करा</string>
+  <string name="call_mms">MMS वर कॉल करा</string>
+  <string name="sms_custom">%s मजकूर पाठवा</string>
+  <string name="sms_home">निवासस्थानी मजकूर पाठवा</string>
+  <string name="sms_mobile">मोबाईलवर मजकूर पाठवा</string>
+  <string name="sms_work">कार्यस्थानी मजकूर पाठवा</string>
+  <string name="sms_fax_work">कार्य फॅक्सवर मजकूर पाठवा</string>
+  <string name="sms_fax_home">घर फॅक्सवर मजकूर पाठवा</string>
+  <string name="sms_pager">पेजरवर मजकूर पाठवा</string>
+  <string name="sms_other">मजकूर</string>
+  <string name="sms_callback">कॉलबॅक वर मजकूर पाठवा</string>
+  <string name="sms_car">कार वर मजकूर पाठवा</string>
+  <string name="sms_company_main">कंपनी मुख्य वर मजकूर पाठवा</string>
+  <string name="sms_isdn">ISDN वर मजकूर पाठवा</string>
+  <string name="sms_main">मुख्य वर मजकूर पाठवा</string>
+  <string name="sms_other_fax">फॅक्सवर मजकूर पाठवा</string>
+  <string name="sms_radio">रेडिओवर मजकूर पाठवा</string>
+  <string name="sms_telex">टेलेक्सवर मजकूर पाठवा</string>
+  <string name="sms_tty_tdd">TTY/TDD वर मजकूर पाठवा</string>
+  <string name="sms_work_mobile">कार्य मोबाईलवर मजकूर पाठवा</string>
+  <string name="sms_work_pager">कार्य पेजरवर मजकूर पाठवा</string>
+  <string name="sms_assistant">%s मजकूर पाठवा</string>
+  <string name="sms_mms">MMS वर मजकूर पाठवा</string>
+  <string name="clearFrequentsConfirmation_title">वारंवार सपर्क साधलेले साफ करायचे?</string>
+  <string name="clearFrequentsConfirmation">आपण संपर्क आणि फोन अ‍ॅप्‍स मधील वारंवार संपर्क साधलेली सूची साफ कराल आणि ईमेल अ‍ॅप्‍सना सुरवातीपासून तुमची पत्ता प्राधान्‍ये जाणून घेण्‍याची सक्ती कराल.</string>
+  <string name="clearFrequentsProgress_title">वारंवार सपर्क साधलेले साफ करत आहे...</string>
+  <string name="status_available">उपलब्ध</string>
+  <string name="status_away">दूर आहे</string>
+  <string name="status_busy">व्यस्त</string>
+  <string name="contactsList">संपर्क</string>
+  <string name="contact_suggestions">सुचविलेले उत्कृष्ट</string>
+  <string name="local_invisible_directory">इतर</string>
+  <string name="directory_search_label">निर्देशिका</string>
+  <string name="directory_search_label_work">कार्य निर्देशिका</string>
+  <string name="local_search_label">सर्व संपर्क</string>
+  <string name="local_suggestions_search_label">सूचना</string>
+  <string msgid="9154761216179882405" name="user_profile_contacts_list_header">मी</string>
+  <string name="missing_name">(नाव नाही)</string>
+  <string msgid="2795575601596468581" name="description_view_contact_detail">संपर्क पहा</string>
+  <string name="list_filter_phones">फोन नंबरसह सर्व संपर्क</string>
+  <string name="list_filter_phones_work">कार्य प्रोफाईल संपर्क</string>
+  <string name="view_updates_from_group">अपडेट पहा</string>
+  <string name="account_phone">केवळ डिव्हाइस, संकालित न केलेला</string>
+  <string name="nameLabelsGroup">नाव</string>
+  <string name="nicknameLabelsGroup">टोपणनाव</string>
+  <string name="full_name">नाव</string>
+  <string name="name_given">नाव</string>
+  <string name="name_family">आडनाव</string>
+  <string name="name_prefix">नाव उपसर्ग</string>
+  <string name="name_middle">मधले नाव</string>
+  <string name="name_suffix">नाव उपसर्ग</string>
+  <string name="name_phonetic">ध्वन्यात्मक नाव</string>
+  <string name="name_phonetic_given">ध्वन्यात्मक नाव</string>
+  <string name="name_phonetic_middle">ध्वन्यात्मक मधले नाव</string>
+  <string name="name_phonetic_family">ध्वन्यात्मक आडनाव</string>
+  <string name="phoneLabelsGroup">फोन</string>
+  <string name="emailLabelsGroup">ईमेल</string>
+  <string name="postalLabelsGroup">पत्ता</string>
+  <string name="imLabelsGroup">IM</string>
+  <string name="organizationLabelsGroup">संस्था</string>
+  <string name="relationLabelsGroup">नातेसंबंध</string>
+  <string name="eventLabelsGroup">विशिष्ट तारीख</string>
+  <string name="sms">मजकूर मेसेज</string>
+  <string name="postal_address">पत्ता</string>
+  <string name="ghostData_company">कंपनी</string>
+  <string name="ghostData_title">शीर्षक</string>
+  <string name="label_notes">टिपा</string>
+  <string name="label_sip_address">SIP</string>
+  <string name="websiteLabelsGroup">वेबसाइट</string>
+  <string name="groupsLabel">गट</string>
+  <string name="email_home">निवासस्‍थानी ईमेल करा</string>
+  <string name="email_mobile">मोबाईलवर ईमेल करा</string>
+  <string name="email_work">कार्यस्‍थानावर ईमेल करा</string>
+  <string name="email_other">ईमेल</string>
+  <string name="email_custom">%s वर ईमेल करा</string>
+  <string name="email">ईमेल</string>
+  <string name="postal_street">मार्ग</string>
+  <string name="postal_city">शहर</string>
+  <string name="postal_region">राज्य</string>
+  <string name="postal_postcode">पिनकोड</string>
+  <string name="postal_country">देश</string>
+  <string name="map_home">निवास पत्ता पहा</string>
+  <string name="map_work">कार्य पत्ता पहा</string>
+  <string name="map_other">पत्ता पहा</string>
+  <string name="map_custom">%s पत्ता पहा</string>
+  <string name="chat_aim">AIM चा वापर करून चॅट करा</string>
+  <string name="chat_msn">Windows Live चा वापर करून चॅट करा</string>
+  <string name="chat_yahoo">Yahoo चा वापर करून चॅट करा</string>
+  <string name="chat_skype">Skype चा वापर करून चॅट करा</string>
+  <string name="chat_qq">QQ चा वापर करून चॅट करा</string>
+  <string name="chat_gtalk">Google Talk चा वापर करून चॅट करा</string>
+  <string name="chat_icq">ICQ चा वापर करून चॅट करा</string>
+  <string name="chat_jabber">Jabber चा वापर करून चॅट करा</string>
+  <string name="chat">चॅट करा</string>
+  <string name="list_filter_all_accounts">सर्व संपर्क</string>
+  <string name="listAllContactsInAccount">%s मधील संपर्क</string>
+  <string name="listCustomView">सानुकूल दृश्यामधील संपर्क</string>
+  <string name="listSingleContact">एकल संपर्क</string>
+  <string name="display_options_sort_list_by">नुसार क्रमवारी लावा</string>
+  <string name="display_options_sort_by_given_name">नाव</string>
+  <string name="display_options_sort_by_family_name">आडनाव</string>
+  <string name="display_options_view_names_as">नाव स्वरूपन</string>
+  <string name="display_options_view_given_name_first">नाव प्रथम</string>
+  <string name="display_options_view_family_name_first">आडनाव प्रथम</string>
+  <string name="menu_clear_frequents">वारंवारता साफ करा</string>
+  <string name="action_menu_back_from_search">शोध थांबवा</string>
+  <string name="description_clear_search">शोध साफ करा</string>
+  <string name="select_account_dialog_title">खाते</string>
+  <string name="set_default_account">कॉलसाठी हे नेहमी वापरा</string>
+  <string name="select_phone_account_for_calls">या कॉलसाठी सिम निवडा</string>
+  <string name="select_phone_account_for_calls_remember">ही निवड लक्षात ठेवा</string>
+  <string name="call_with_a_note">टीपसह कॉल करा</string>
+  <string name="call_subject_hint">कॉलसह पाठविण्‍यासाठी एक टीप टाइप करा...</string>
+  <string name="send_and_call_button">पाठवा आणि कॉल करा</string>
+  <string name="call_subject_limit">%1$s / %2$s</string>
+  <string name="old_call_subject_type_and_number">%1$s %2$s</string>
+  <string name="tab_title">%1$s टॅब.</string>
+  <plurals name="tab_title_with_unread_items">
+    <item quantity="one"> %1$s टॅब. %2$d न वाचलेला आयटम. </item>
+    <item quantity="other"> %1$s टॅब. %2$d न वाचलेले आयटम. </item>
+  </plurals>
+  <string name="description_search_video_call">व्हिडिओ कॉल</string>
+  <string name="description_search_call_and_share">शेअर करा आणि कॉल करा</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-ms/strings.xml b/java/com/android/contacts/common/res/values-ms/strings.xml
index 5616c09..aab737e 100644
--- a/java/com/android/contacts/common/res/values-ms/strings.xml
+++ b/java/com/android/contacts/common/res/values-ms/strings.xml
@@ -1,162 +1,145 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="toast_text_copied" msgid="8979281391599667362">"Teks disalin"</string>
-    <string name="call_custom" msgid="3041673234638990874">"Panggil <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="call_home" msgid="125893483593803791">"Panggil nombor rumah"</string>
-    <string name="call_mobile" msgid="967589404494150813">"Panggil nombor mudah alih"</string>
-    <string name="call_work" msgid="6040550697395300892">"Panggil tempat kerja"</string>
-    <string name="call_fax_work" msgid="5260192771364592922">"Panggil faks tempat kerja"</string>
-    <string name="call_fax_home" msgid="5174311195081144124">"Panggil faks rumah"</string>
-    <string name="call_pager" msgid="6814149227741274161">"Panggil alat kelui"</string>
-    <string name="call_other" msgid="5536385588712587235">"Panggil"</string>
-    <string name="call_callback" msgid="6314019862718112786">"Panggil nombor panggil balik"</string>
-    <string name="call_car" msgid="3197417098027764954">"Panggil kereta"</string>
-    <string name="call_company_main" msgid="2557663310028446397">"Panggil nombor utama syarikat"</string>
-    <string name="call_isdn" msgid="4691270442763649522">"Panggil ISDN"</string>
-    <string name="call_main" msgid="3293707608770407814">"Panggil nombor utama"</string>
-    <string name="call_other_fax" msgid="4724521984879021465">"Panggil faks"</string>
-    <string name="call_radio" msgid="8942441419845057942">"Panggil radio"</string>
-    <string name="call_telex" msgid="2031514461660668351">"Panggil teleks"</string>
-    <string name="call_tty_tdd" msgid="7807210224965727701">"Panggil TTY/TDD"</string>
-    <string name="call_work_mobile" msgid="2716342732938578495">"Panggil telefon mudah alih tempat kerja"</string>
-    <string name="call_work_pager" msgid="3791778749827366574">"Panggil alat kelui tempat kerja"</string>
-    <string name="call_assistant" msgid="4177478845473789294">"Panggil <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
-    <string name="call_mms" msgid="4958811711741872901">"Panggil MMS"</string>
-    <string name="sms_custom" msgid="8785368968605026317">"SMS <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="sms_home" msgid="3527719551060295243">"SMS rumah"</string>
-    <string name="sms_mobile" msgid="8883045857887736518">"SMS telefon mudah alih"</string>
-    <string name="sms_work" msgid="4158595439553450966">"SMS nombor tempat kerja"</string>
-    <string name="sms_fax_work" msgid="5483726627718055248">"SMS faks tempat kerja"</string>
-    <string name="sms_fax_home" msgid="9219265155770746077">"SMS faks rumah"</string>
-    <string name="sms_pager" msgid="4901085068525193933">"SMS alat kelui"</string>
-    <string name="sms_other" msgid="1742702947993285933">"SMS"</string>
-    <string name="sms_callback" msgid="5833483630377538308">"SMS nombor panggil balik"</string>
-    <string name="sms_car" msgid="4314577266154395174">"SMS kereta"</string>
-    <string name="sms_company_main" msgid="2308160928487360705">"SMS nombor utama syarikat"</string>
-    <string name="sms_isdn" msgid="6394300346179302542">"SMS ISDN"</string>
-    <string name="sms_main" msgid="8908087742014140774">"SMS nombor utama"</string>
-    <string name="sms_other_fax" msgid="8768455473295405427">"SMS nombor faks"</string>
-    <string name="sms_radio" msgid="855555176531704682">"SMS radio"</string>
-    <string name="sms_telex" msgid="6269029276223252719">"SMS nombor teleks"</string>
-    <string name="sms_tty_tdd" msgid="6229057354509192444">"SMS TTY/TDD"</string>
-    <string name="sms_work_mobile" msgid="2155975469329969840">"SMS telefon mudah alih tempat kerja"</string>
-    <string name="sms_work_pager" msgid="8500140274906830742">"SMS alat kelui tempat kerja"</string>
-    <string name="sms_assistant" msgid="8513548482745330818">"SMS <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
-    <string name="sms_mms" msgid="5187888900503248542">"SMS nombor MMS"</string>
-    <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"Padam bersih senarai kerap dihubungi?"</string>
-    <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"Anda akan mengosongkan senarai yang kerap dihubungi dalam apl Kenalan dan Telefon serta memaksa apl e-mel untuk mempelajari pilihan alamat anda dari awal."</string>
-    <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"Memadam bersih senarai kerap dihubungi..."</string>
-    <string name="status_available" msgid="2648156525685472626">"Ada"</string>
-    <string name="status_away" msgid="2298688367552893953">"Tiada"</string>
-    <string name="status_busy" msgid="5990832098713248503">"Sibuk"</string>
-    <string name="contactsList" msgid="8806067891419291513">"Kenalan"</string>
-    <string name="contact_suggestions" msgid="3324166754807120006">"Teratas Dicadangkan"</string>
-    <string name="local_invisible_directory" msgid="4723238462733650090">"Lain-lain"</string>
-    <string name="directory_search_label" msgid="4621215895484025229">"Direktori"</string>
-    <string name="directory_search_label_work" msgid="7679326282707414897">"Direktori kerja"</string>
-    <string name="local_search_label" msgid="907622822323119235">"Semua kenalan"</string>
-    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Cadangan"</string>
-    <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Saya"</string>
-    <string name="missing_name" msgid="978606963362745020">"(Tiada nama)"</string>
-    <string name="description_view_contact_detail" msgid="2428742401208561136">"Lihat kenalan"</string>
-    <string name="list_filter_phones" msgid="8763316061763437182">"Semua kenalan dengan nombor telefon"</string>
-    <string name="list_filter_phones_work" msgid="7083575404573422965">"Kenalan profil kerja"</string>
-    <string name="view_updates_from_group" msgid="9011641093168385729">"Lihat kemas kini"</string>
-    <string name="account_phone" msgid="7067809073194061035">"Peranti sahaja, tidak disegerakkan"</string>
-    <string name="nameLabelsGroup" msgid="7730465833159557471">"Nama"</string>
-    <string name="nicknameLabelsGroup" msgid="6310556912361840029">"Nama panggilan"</string>
-    <string name="full_name" msgid="648186563998465740">"Nama"</string>
-    <string name="name_given" msgid="5096576006314820536">"Nama pertama"</string>
-    <string name="name_family" msgid="6646235805198547467">"Nama keluarga"</string>
-    <string name="name_prefix" msgid="9215326539658838">"Awalan nama"</string>
-    <string name="name_middle" msgid="703755205331582769">"Nama tengah"</string>
-    <string name="name_suffix" msgid="5777083390282548702">"Akhiran nama"</string>
-    <string name="name_phonetic" msgid="1650870996361663089">"Nama fonetik"</string>
-    <string name="name_phonetic_given" msgid="618812334274603170">"Nama pertama fonetik"</string>
-    <string name="name_phonetic_middle" msgid="4826820763384625538">"Nama tengah fonetik"</string>
-    <string name="name_phonetic_family" msgid="379905191212930771">"Nama keluarga fonetik"</string>
-    <string name="phoneLabelsGroup" msgid="169661929021355548">"Telefon"</string>
-    <string name="emailLabelsGroup" msgid="2249752810477488833">"E-mel"</string>
-    <string name="postalLabelsGroup" msgid="6772000590189142253">"Alamat"</string>
-    <string name="imLabelsGroup" msgid="5718066254237364731">"IM"</string>
-    <string name="organizationLabelsGroup" msgid="1101996309241601435">"Organisasi"</string>
-    <string name="relationLabelsGroup" msgid="53866051664600053">"Hubungan"</string>
-    <string name="eventLabelsGroup" msgid="1236970042646618489">"Tarikh khas"</string>
-    <string name="sms" msgid="7574344928185328095">"Mesej teks"</string>
-    <string name="postal_address" msgid="1804707930129674200">"Alamat"</string>
-    <string name="ghostData_company" msgid="2554310786296833424">"Syarikat"</string>
-    <string name="ghostData_title" msgid="4994968731830184837">"Jawatan"</string>
-    <string name="label_notes" msgid="2050255313694219786">"Nota"</string>
-    <string name="label_sip_address" msgid="8883266182575965926">"SIP"</string>
-    <string name="websiteLabelsGroup" msgid="1630734286462186790">"Tapak web"</string>
-    <string name="groupsLabel" msgid="2694002798416868728">"Kumpulan"</string>
-    <string name="email_home" msgid="889830029388962171">"E-mel rumah"</string>
-    <string name="email_mobile" msgid="4487686436743741150">"E-mel telefon mudah alih"</string>
-    <string name="email_work" msgid="4223487303344613528">"E-mel tempat kerja"</string>
-    <string name="email_other" msgid="4246411900126012062">"E-mel"</string>
-    <string name="email_custom" msgid="7246580894327511013">"E-mel <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="email" msgid="2807318537887091606">"E-mel"</string>
-    <string name="postal_street" msgid="6918171741240802474">"Jalan"</string>
-    <string name="postal_city" msgid="8674569121430005628">"Bandar"</string>
-    <string name="postal_region" msgid="1730369286225469192">"Negeri"</string>
-    <string name="postal_postcode" msgid="4450700741261990439">"Poskod"</string>
-    <string name="postal_country" msgid="232670707458768148">"Negara"</string>
-    <string name="map_home" msgid="4181131107392126938">"Lihat alamat rumah"</string>
-    <string name="map_work" msgid="5723471185992684400">"Lihat alamat tempat kerja"</string>
-    <string name="map_other" msgid="2253764780863500516">"Lihat alamat"</string>
-    <string name="map_custom" msgid="5581743097882436157">"Lihat alamat <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="chat_aim" msgid="2954364435497941659">"Sembang menggunakan AIM"</string>
-    <string name="chat_msn" msgid="3130135239071228678">"Sembang menggunakan Windows Live"</string>
-    <string name="chat_yahoo" msgid="3233552142326865347">"Sembang menggunakan Yahoo"</string>
-    <string name="chat_skype" msgid="6486703981390592425">"Sembang menggunakan Skype"</string>
-    <string name="chat_qq" msgid="786924280665740019">"Sembang menggunakan QQ"</string>
-    <string name="chat_gtalk" msgid="7914674177243078035">"Sembang menggunakan Bual Google"</string>
-    <string name="chat_icq" msgid="3292934726414765801">"Sembang menggunakan ICQ"</string>
-    <string name="chat_jabber" msgid="6701542313597880204">"Sembang menggunakan Jabber"</string>
-    <string name="chat" msgid="1020428260359370236">"Sembang"</string>
-    <string name="list_filter_all_accounts" msgid="473782314881473992">"Semua kenalan"</string>
-    <string name="listAllContactsInAccount" msgid="3486378621592995630">"Kenalan dalam <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="listCustomView" msgid="5306282632413086731">"Kenalan dalam paparan tersuai"</string>
-    <string name="listSingleContact" msgid="8620818791932382627">"Kenalan tunggal"</string>
-    <string name="display_options_sort_list_by" msgid="3541875948367831228">"Isih mengikut"</string>
-    <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"Nama pertama"</string>
-    <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"Nama keluarga"</string>
-    <string name="display_options_view_names_as" msgid="4204204205736735618">"Format nama"</string>
-    <string name="display_options_view_given_name_first" msgid="2308026973021171020">"Nama pertama dahulu"</string>
-    <string name="display_options_view_family_name_first" msgid="987430497292428242">"Nama keluarga dahulu"</string>
-    <string name="menu_clear_frequents" msgid="5358271535047496120">"Padam bersih kerap dihubungi"</string>
-    <string name="action_menu_back_from_search" msgid="3550669942742167644">"berhenti mencari"</string>
-    <string name="description_clear_search" msgid="2347258825265600782">"Kosongkan carian"</string>
-    <string name="select_account_dialog_title" msgid="2673504582803359239">"Akaun"</string>
-    <string name="set_default_account" msgid="7966099951006467572">"Sentiasa gunakan ini untuk panggilan"</string>
-    <string name="select_phone_account_for_calls" msgid="1784460686103423274">"Panggil dengan"</string>
-    <string name="call_with_a_note" msgid="6242261320491851133">"Panggilan dengan nota"</string>
-    <string name="call_subject_hint" msgid="7233138753650420800">"Taip nota untuk dihantar dengan panggilan…"</string>
-    <string name="send_and_call_button" msgid="4735168294120154013">"HANTAR &amp; PANGGIL"</string>
-    <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="tab_title" msgid="3387876802026074288">"Tab <xliff:g id="TITLE">%1$s</xliff:g>."</string>
-    <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
-      <item quantity="other">Tab <xliff:g id="TITLE_2">%1$s</xliff:g>. <xliff:g id="COUNT_3">%2$d</xliff:g> item belum dibaca. </item>
-      <item quantity="one">Tab <xliff:g id="TITLE_0">%1$s</xliff:g>. <xliff:g id="COUNT_1">%2$d</xliff:g> item belum dibaca. </item>
-    </plurals>
-    <string name="description_search_video_call" msgid="4337369876888024909">"Panggilan video"</string>
-    <string name="description_search_call_and_share" msgid="4912772842755050467">"Kongsi dan panggil"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_custom">Panggil %s</string>
+  <string name="call_home">Panggil nombor rumah</string>
+  <string name="call_mobile">Panggil nombor mudah alih</string>
+  <string name="call_work">Panggil tempat kerja</string>
+  <string name="call_fax_work">Panggil faks tempat kerja</string>
+  <string name="call_fax_home">Panggil faks rumah</string>
+  <string name="call_pager">Panggil alat kelui</string>
+  <string name="call_other">Panggil</string>
+  <string name="call_callback">Panggil nombor panggil balik</string>
+  <string name="call_car">Panggil kereta</string>
+  <string name="call_company_main">Panggil nombor utama syarikat</string>
+  <string name="call_isdn">Panggil ISDN</string>
+  <string name="call_main">Panggil nombor utama</string>
+  <string name="call_other_fax">Panggil faks</string>
+  <string name="call_radio">Panggil radio</string>
+  <string name="call_telex">Panggil teleks</string>
+  <string name="call_tty_tdd">Panggil TTY/TDD</string>
+  <string name="call_work_mobile">Panggil telefon mudah alih tempat kerja</string>
+  <string name="call_work_pager">Panggil alat kelui tempat kerja</string>
+  <string name="call_assistant">Panggil %s</string>
+  <string name="call_mms">Panggil MMS</string>
+  <string name="sms_custom">SMS %s</string>
+  <string name="sms_home">SMS rumah</string>
+  <string name="sms_mobile">SMS telefon mudah alih</string>
+  <string name="sms_work">SMS nombor tempat kerja</string>
+  <string name="sms_fax_work">SMS faks tempat kerja</string>
+  <string name="sms_fax_home">SMS faks rumah</string>
+  <string name="sms_pager">SMS alat kelui</string>
+  <string name="sms_other">SMS</string>
+  <string name="sms_callback">SMS nombor panggil balik</string>
+  <string name="sms_car">SMS kereta</string>
+  <string name="sms_company_main">SMS nombor utama syarikat</string>
+  <string name="sms_isdn">SMS ISDN</string>
+  <string name="sms_main">SMS nombor utama</string>
+  <string name="sms_other_fax">SMS nombor faks</string>
+  <string name="sms_radio">SMS radio</string>
+  <string name="sms_telex">SMS nombor teleks</string>
+  <string name="sms_tty_tdd">SMS TTY/TDD</string>
+  <string name="sms_work_mobile">SMS telefon mudah alih tempat kerja</string>
+  <string name="sms_work_pager">SMS alat kelui tempat kerja</string>
+  <string name="sms_assistant">SMS %s</string>
+  <string name="sms_mms">SMS nombor MMS</string>
+  <string name="clearFrequentsConfirmation_title">Padam bersih senarai kerap dihubungi?</string>
+  <string name="clearFrequentsConfirmation">Anda akan mengosongkan senarai yang kerap dihubungi dalam apl Kenalan dan Telefon serta memaksa apl e-mel untuk mempelajari pilihan alamat anda dari awal.</string>
+  <string name="clearFrequentsProgress_title">Memadam bersih senarai kerap dihubungi...</string>
+  <string name="status_available">Ada</string>
+  <string name="status_away">Tiada</string>
+  <string name="status_busy">Sibuk</string>
+  <string name="contactsList">Kenalan</string>
+  <string name="contact_suggestions">Teratas Dicadangkan</string>
+  <string name="local_invisible_directory">Lain-lain</string>
+  <string name="directory_search_label">Direktori</string>
+  <string name="directory_search_label_work">Direktori kerja</string>
+  <string name="local_search_label">Semua kenalan</string>
+  <string name="local_suggestions_search_label">Cadangan</string>
+  <string msgid="9154761216179882405" name="user_profile_contacts_list_header">Saya</string>
+  <string name="missing_name">(Tiada nama)</string>
+  <string msgid="2795575601596468581" name="description_view_contact_detail">Lihat kenalan</string>
+  <string name="list_filter_phones">Semua kenalan dengan nombor telefon</string>
+  <string name="list_filter_phones_work">Kenalan profil kerja</string>
+  <string name="view_updates_from_group">Lihat kemas kini</string>
+  <string name="account_phone">Peranti sahaja, tidak disegerakkan</string>
+  <string name="nameLabelsGroup">Nama</string>
+  <string name="nicknameLabelsGroup">Nama panggilan</string>
+  <string name="full_name">Nama</string>
+  <string name="name_given">Nama pertama</string>
+  <string name="name_family">Nama keluarga</string>
+  <string name="name_prefix">Awalan nama</string>
+  <string name="name_middle">Nama tengah</string>
+  <string name="name_suffix">Akhiran nama</string>
+  <string name="name_phonetic">Nama fonetik</string>
+  <string name="name_phonetic_given">Nama pertama fonetik</string>
+  <string name="name_phonetic_middle">Nama tengah fonetik</string>
+  <string name="name_phonetic_family">Nama keluarga fonetik</string>
+  <string name="phoneLabelsGroup">Telefon</string>
+  <string name="emailLabelsGroup">E-mel</string>
+  <string name="postalLabelsGroup">Alamat</string>
+  <string name="imLabelsGroup">IM</string>
+  <string name="organizationLabelsGroup">Organisasi</string>
+  <string name="relationLabelsGroup">Hubungan</string>
+  <string name="eventLabelsGroup">Tarikh khas</string>
+  <string name="sms">Mesej teks</string>
+  <string name="postal_address">Alamat</string>
+  <string name="ghostData_company">Syarikat</string>
+  <string name="ghostData_title">Jawatan</string>
+  <string name="label_notes">Nota</string>
+  <string name="label_sip_address">SIP</string>
+  <string name="websiteLabelsGroup">Tapak web</string>
+  <string name="groupsLabel">Kumpulan</string>
+  <string name="email_home">E-mel rumah</string>
+  <string name="email_mobile">E-mel telefon mudah alih</string>
+  <string name="email_work">E-mel tempat kerja</string>
+  <string name="email_other">E-mel</string>
+  <string name="email_custom">E-mel %s</string>
+  <string name="email">E-mel</string>
+  <string name="postal_street">Jalan</string>
+  <string name="postal_city">Bandar</string>
+  <string name="postal_region">Negeri</string>
+  <string name="postal_postcode">Poskod</string>
+  <string name="postal_country">Negara</string>
+  <string name="map_home">Lihat alamat rumah</string>
+  <string name="map_work">Lihat alamat tempat kerja</string>
+  <string name="map_other">Lihat alamat</string>
+  <string name="map_custom">Lihat alamat %s</string>
+  <string name="chat_aim">Sembang menggunakan AIM</string>
+  <string name="chat_msn">Sembang menggunakan Windows Live</string>
+  <string name="chat_yahoo">Sembang menggunakan Yahoo</string>
+  <string name="chat_skype">Sembang menggunakan Skype</string>
+  <string name="chat_qq">Sembang menggunakan QQ</string>
+  <string name="chat_gtalk">Sembang menggunakan Bual Google</string>
+  <string name="chat_icq">Sembang menggunakan ICQ</string>
+  <string name="chat_jabber">Sembang menggunakan Jabber</string>
+  <string name="chat">Sembang</string>
+  <string name="list_filter_all_accounts">Semua kenalan</string>
+  <string name="listAllContactsInAccount">Kenalan dalam %s</string>
+  <string name="listCustomView">Kenalan dalam paparan tersuai</string>
+  <string name="listSingleContact">Kenalan tunggal</string>
+  <string name="display_options_sort_list_by">Isih mengikut</string>
+  <string name="display_options_sort_by_given_name">Nama pertama</string>
+  <string name="display_options_sort_by_family_name">Nama keluarga</string>
+  <string name="display_options_view_names_as">Format nama</string>
+  <string name="display_options_view_given_name_first">Nama pertama dahulu</string>
+  <string name="display_options_view_family_name_first">Nama keluarga dahulu</string>
+  <string name="menu_clear_frequents">Padam bersih kerap dihubungi</string>
+  <string name="action_menu_back_from_search">berhenti mencari</string>
+  <string name="description_clear_search">Kosongkan carian</string>
+  <string name="select_account_dialog_title">Akaun</string>
+  <string name="set_default_account">Sentiasa gunakan ini untuk panggilan</string>
+  <string name="select_phone_account_for_calls">Pilih SIM untuk panggilan ini</string>
+  <string name="select_phone_account_for_calls_remember">Ingat pilihan ini</string>
+  <string name="call_with_a_note">Panggilan dengan nota</string>
+  <string name="call_subject_hint">Taip nota untuk dihantar dengan panggilan…</string>
+  <string name="send_and_call_button">HANTAR &amp; PANGGIL</string>
+  <string name="call_subject_limit">%1$s / %2$s</string>
+  <string name="old_call_subject_type_and_number">%1$s %2$s</string>
+  <string name="tab_title">Tab %1$s.</string>
+  <plurals name="tab_title_with_unread_items">
+    <item quantity="one">Tab %1$s. %2$d item belum dibaca. </item>
+    <item quantity="other">Tab %1$s. %2$d item belum dibaca. </item>
+  </plurals>
+  <string name="description_search_video_call">Panggilan video</string>
+  <string name="description_search_call_and_share">Kongsi dan panggil</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-my/strings.xml b/java/com/android/contacts/common/res/values-my/strings.xml
index 007c147..3671f55 100644
--- a/java/com/android/contacts/common/res/values-my/strings.xml
+++ b/java/com/android/contacts/common/res/values-my/strings.xml
@@ -1,162 +1,145 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="toast_text_copied" msgid="8979281391599667362">"စာသားကူးယူပြီး"</string>
-    <string name="call_custom" msgid="3041673234638990874">"<xliff:g id="CUSTOM">%s</xliff:g> ကိုခေါ်ပါ"</string>
-    <string name="call_home" msgid="125893483593803791">"အိမ်ကိုခေါ်ပါ"</string>
-    <string name="call_mobile" msgid="967589404494150813">"မိုဘိုင်းကိုခေါ်ပါ"</string>
-    <string name="call_work" msgid="6040550697395300892">"အလုပ်ကိုခေါ်ပါ"</string>
-    <string name="call_fax_work" msgid="5260192771364592922">"အလုပ်ဖက်စ်ကိုခေါ်ပါ"</string>
-    <string name="call_fax_home" msgid="5174311195081144124">"အိမ်ဖက်စ်ကိုခေါ်ပါ"</string>
-    <string name="call_pager" msgid="6814149227741274161">"ပေဂျာကိုခေါ်ပါ"</string>
-    <string name="call_other" msgid="5536385588712587235">"ခေါ်ပါ"</string>
-    <string name="call_callback" msgid="6314019862718112786">"ပြန်ခေါ်ခြင်းဝန်ဆောင်မှုကို ခေါ်ပါ"</string>
-    <string name="call_car" msgid="3197417098027764954">"ကားကိုခေါ်ပါ"</string>
-    <string name="call_company_main" msgid="2557663310028446397">"ကုမ္ပဏီပင်မနံပါတ်ကို ခေါ်ပါ"</string>
-    <string name="call_isdn" msgid="4691270442763649522">"ISDN ကိုခေါ်ပါ"</string>
-    <string name="call_main" msgid="3293707608770407814">"ပင်မနံပါတ်ကို ခေါ်ပါ"</string>
-    <string name="call_other_fax" msgid="4724521984879021465">"ဖက်စ်ကိုခေါ်ပါ"</string>
-    <string name="call_radio" msgid="8942441419845057942">"ရေဒီယိုကိုခေါ်ပါ"</string>
-    <string name="call_telex" msgid="2031514461660668351">"တဲလက်ဇ်နံပါတ်ကိုခေါ်ပါ"</string>
-    <string name="call_tty_tdd" msgid="7807210224965727701">"TTY/TDD ကိုခေါ်ပါ"</string>
-    <string name="call_work_mobile" msgid="2716342732938578495">"အလုပ်မိုဘိုင်းကိုခေါ်ပါ"</string>
-    <string name="call_work_pager" msgid="3791778749827366574">"အလုပ်ပေဂျာကိုခေါ်ပါ"</string>
-    <string name="call_assistant" msgid="4177478845473789294">"<xliff:g id="ASSISTANT">%s</xliff:g> ကိုခေါ်ပါ"</string>
-    <string name="call_mms" msgid="4958811711741872901">"MMS ကိုခေါ်ပါ"</string>
-    <string name="sms_custom" msgid="8785368968605026317">"<xliff:g id="CUSTOM">%s</xliff:g> သို့ စာပို့ပါ"</string>
-    <string name="sms_home" msgid="3527719551060295243">"အိမ်သို့ စာပို့ပါ"</string>
-    <string name="sms_mobile" msgid="8883045857887736518">"မိုဘိုင်းသို့ စာပို့ပါ"</string>
-    <string name="sms_work" msgid="4158595439553450966">"အလုပ်နံပါတ်သို့ စာပို့ပါ"</string>
-    <string name="sms_fax_work" msgid="5483726627718055248">"အလုပ်ဖက်စ်သို့ စာပို့ပါ"</string>
-    <string name="sms_fax_home" msgid="9219265155770746077">"အိမ်ဖက်စ်သို့ စာပို့ပါ"</string>
-    <string name="sms_pager" msgid="4901085068525193933">"ပေဂျာနံပါတ်သို့ စာပို့ပါ"</string>
-    <string name="sms_other" msgid="1742702947993285933">"စာတို"</string>
-    <string name="sms_callback" msgid="5833483630377538308">"ပြန်ခေါ်မှုနံပါတ်ထံ စာပို့ပါ"</string>
-    <string name="sms_car" msgid="4314577266154395174">"ကားဆီ စာပို့ပါ"</string>
-    <string name="sms_company_main" msgid="2308160928487360705">"ကုမ္ပဏီ ပင်မနံပါတ်သို့ စာပို့ပါ"</string>
-    <string name="sms_isdn" msgid="6394300346179302542">"ISDN စာပို့ပါ"</string>
-    <string name="sms_main" msgid="8908087742014140774">"အဓိကနံပါတ်သို့ စာပို့ပါ"</string>
-    <string name="sms_other_fax" msgid="8768455473295405427">"ဖက်စ်နံပါတ်သို့ စာပို့ပါ"</string>
-    <string name="sms_radio" msgid="855555176531704682">"ရေဒီယိုနံပါတ်သို့ စာပို့ပါ"</string>
-    <string name="sms_telex" msgid="6269029276223252719">"တဲလက်စ်နံပါတ်သို့ စာပို့ပါ"</string>
-    <string name="sms_tty_tdd" msgid="6229057354509192444">"TTY/TDD နံပါတ်သို့ စာပို့ပါ"</string>
-    <string name="sms_work_mobile" msgid="2155975469329969840">"အလုပ်မိုဘိုင်းသို့ စာပို့ပါ"</string>
-    <string name="sms_work_pager" msgid="8500140274906830742">"အလုပ်ပေ့ဂျာသို့ စာပို့ပါ"</string>
-    <string name="sms_assistant" msgid="8513548482745330818">"<xliff:g id="ASSISTANT">%s</xliff:g>ထံ စာပို့ပါ"</string>
-    <string name="sms_mms" msgid="5187888900503248542">"MMS နံပါတ်သို့ စာပို့ပါ"</string>
-    <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"အသုံးများသောလိပ်စာများရှင်းပစ်မလား?"</string>
-    <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"အသုံးများသော အဆက်အသွယ်စာရင်းအား Contacts နှင့် Phone app များမှ သင် ရှင်းလင်းပစ်မှာဖြစ်ပြီး၊ အီးမေးလ် app များအား သင့်နှစ်သက်ရာ ​ပ​ြောဆိုဆက်ဆံမှုပုံစံကို အစမှပြန်လည် လေ့လာခိုင်းမည်။"</string>
-    <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"အသုံးများသောလိပ်စာများ ရှင်းလင်းနေစဉ်"</string>
-    <string name="status_available" msgid="2648156525685472626">"ဆက်သွယ်နိုင်ပါသည်"</string>
-    <string name="status_away" msgid="2298688367552893953">"အဝေးရောက်နေပါသည်"</string>
-    <string name="status_busy" msgid="5990832098713248503">"အလုပ်များနေသည်"</string>
-    <string name="contactsList" msgid="8806067891419291513">"အဆက်အသွယ်များ"</string>
-    <string name="contact_suggestions" msgid="3324166754807120006">"ထိပ်တန်း အကြံပြုထားပါသည်"</string>
-    <string name="local_invisible_directory" msgid="4723238462733650090">"တစ်ခြား"</string>
-    <string name="directory_search_label" msgid="4621215895484025229">"လမ်းညွှန်"</string>
-    <string name="directory_search_label_work" msgid="7679326282707414897">"အလုပ်လမ်းညွှန်"</string>
-    <string name="local_search_label" msgid="907622822323119235">"လိပ်စာများအားလုံး"</string>
-    <string name="local_suggestions_search_label" msgid="1178575146224386118">"အကြံပြုချက်များ"</string>
-    <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"ကျွန်ုပ်"</string>
-    <string name="missing_name" msgid="978606963362745020">"(အမည်မရှိ)"</string>
-    <string name="description_view_contact_detail" msgid="2428742401208561136">"အဆက်အသွယ်ကိုကြည့်ရန်"</string>
-    <string name="list_filter_phones" msgid="8763316061763437182">"ဖုန်းနံပါတ်ပါသော လိပ်စာများအားလုံး"</string>
-    <string name="list_filter_phones_work" msgid="7083575404573422965">"အလုပ်ပရိုဖိုင် အဆက်အသွယ်များ"</string>
-    <string name="view_updates_from_group" msgid="9011641093168385729">"အဆင့်မြှင့်ခြင်းများပြရန်"</string>
-    <string name="account_phone" msgid="7067809073194061035">"ကိရိယာတွင်သာ၊ စင့်ခ်မလုပ်ပါ"</string>
-    <string name="nameLabelsGroup" msgid="7730465833159557471">"အမည်"</string>
-    <string name="nicknameLabelsGroup" msgid="6310556912361840029">"နာမည်ဝှက်"</string>
-    <string name="full_name" msgid="648186563998465740">"အမည်"</string>
-    <string name="name_given" msgid="5096576006314820536">"ပထမ အမည်"</string>
-    <string name="name_family" msgid="6646235805198547467">"နောက်ဆုံး အမည်"</string>
-    <string name="name_prefix" msgid="9215326539658838">"နာမည်ရှေ့ဆောင်"</string>
-    <string name="name_middle" msgid="703755205331582769">"အလယ်နာမည်"</string>
-    <string name="name_suffix" msgid="5777083390282548702">"နာမည်နောက်စွဲ"</string>
-    <string name="name_phonetic" msgid="1650870996361663089">"အသံထွက်နာမည်"</string>
-    <string name="name_phonetic_given" msgid="618812334274603170">"အသံထွက် ပထမ အမည်"</string>
-    <string name="name_phonetic_middle" msgid="4826820763384625538">"အသံထွက် အလယ်နာမည်"</string>
-    <string name="name_phonetic_family" msgid="379905191212930771">"အသံထွက် နောက်ဆုံး အမည်"</string>
-    <string name="phoneLabelsGroup" msgid="169661929021355548">"ဖုန်း"</string>
-    <string name="emailLabelsGroup" msgid="2249752810477488833">"အီးမေးလ်"</string>
-    <string name="postalLabelsGroup" msgid="6772000590189142253">"လိပ်စာ"</string>
-    <string name="imLabelsGroup" msgid="5718066254237364731">"IM"</string>
-    <string name="organizationLabelsGroup" msgid="1101996309241601435">"အဖွဲ့အစည်း"</string>
-    <string name="relationLabelsGroup" msgid="53866051664600053">"ပတ်သတ်မှု"</string>
-    <string name="eventLabelsGroup" msgid="1236970042646618489">"အထူးနေ့"</string>
-    <string name="sms" msgid="7574344928185328095">"စာတို"</string>
-    <string name="postal_address" msgid="1804707930129674200">"လိပ်စာ"</string>
-    <string name="ghostData_company" msgid="2554310786296833424">"ကုမ္ပဏီ"</string>
-    <string name="ghostData_title" msgid="4994968731830184837">"ခေါင်းစဉ်"</string>
-    <string name="label_notes" msgid="2050255313694219786">"မှတ်စုများ"</string>
-    <string name="label_sip_address" msgid="8883266182575965926">"SIP"</string>
-    <string name="websiteLabelsGroup" msgid="1630734286462186790">"ဝဘ်ဆိုက်"</string>
-    <string name="groupsLabel" msgid="2694002798416868728">"အုပ်စုများ"</string>
-    <string name="email_home" msgid="889830029388962171">"အိမ်ကို အီးမေးလ် ပို့ပါ"</string>
-    <string name="email_mobile" msgid="4487686436743741150">"မိုဘိုင်း ကို အီးမေးလ် ပို့ပါ"</string>
-    <string name="email_work" msgid="4223487303344613528">"အလုပ်ကို အီးမေးလ် ပို့ပါ"</string>
-    <string name="email_other" msgid="4246411900126012062">"အီးမေးလ်"</string>
-    <string name="email_custom" msgid="7246580894327511013">"အီးမေးလ် <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="email" msgid="2807318537887091606">"အီးမေးလ်"</string>
-    <string name="postal_street" msgid="6918171741240802474">"လမ်း"</string>
-    <string name="postal_city" msgid="8674569121430005628">"မြို့"</string>
-    <string name="postal_region" msgid="1730369286225469192">"ပြည်နယ်"</string>
-    <string name="postal_postcode" msgid="4450700741261990439">"စာပို့သင်္ကေတ"</string>
-    <string name="postal_country" msgid="232670707458768148">"နိုင်ငံ"</string>
-    <string name="map_home" msgid="4181131107392126938">"အိမ်လိပ်စာအားကြည့်ရန်"</string>
-    <string name="map_work" msgid="5723471185992684400">"အလုပ်လိပ်စာအားကြည့်ရန်"</string>
-    <string name="map_other" msgid="2253764780863500516">"လိပ်စာအားကြည့်ရန်"</string>
-    <string name="map_custom" msgid="5581743097882436157">"<xliff:g id="CUSTOM">%s</xliff:g> လိပ်စာအားကြည့်ရန်"</string>
-    <string name="chat_aim" msgid="2954364435497941659">"AIM သုံး၍ ချက်တင်လုပ်ခြင်း"</string>
-    <string name="chat_msn" msgid="3130135239071228678">"Windows Liveသုံး၍ ချက်တင်ပြုလုပ်ခြင်း"</string>
-    <string name="chat_yahoo" msgid="3233552142326865347">"Yahoo သုံး၍ ချက်တင်ပြုလုပ်ခြင်း"</string>
-    <string name="chat_skype" msgid="6486703981390592425">"Skype သုံး၍ ချက်တင်ပြုလုပ်ခြင်း"</string>
-    <string name="chat_qq" msgid="786924280665740019">"QQ သုံး၍ ချက်တင်ပြုလုပ်ခြင်း"</string>
-    <string name="chat_gtalk" msgid="7914674177243078035">"ဂူးဂဲလ်တော့သုံး၍ ချက်တင်ပြုလုပ်ခြင်း"</string>
-    <string name="chat_icq" msgid="3292934726414765801">"ICQ သုံး၍ ချက်တင်ပြုလုပ်ခြင်း"</string>
-    <string name="chat_jabber" msgid="6701542313597880204">"Jabberသုံး၍ ချက်တင်ပြုလုပ်ခြင်း"</string>
-    <string name="chat" msgid="1020428260359370236">"ချက်တင်းပြောသည်"</string>
-    <string name="list_filter_all_accounts" msgid="473782314881473992">"ဆက်သွယ်အားလုံး"</string>
-    <string name="listAllContactsInAccount" msgid="3486378621592995630">"<xliff:g id="NAME">%s</xliff:g> ထဲမှ အဆက်အသွယ်များ"</string>
-    <string name="listCustomView" msgid="5306282632413086731">"မိမိစိတ်ကြိုက် မြင်ကွင်းမှ"</string>
-    <string name="listSingleContact" msgid="8620818791932382627">"အဆက်အသွယ်တစ်ခုတည်း"</string>
-    <string name="display_options_sort_list_by" msgid="3541875948367831228">"ဖြင့် စီပေးရန်"</string>
-    <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"ပထမ အမည်"</string>
-    <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"နောက်ဆုံး အမည်"</string>
-    <string name="display_options_view_names_as" msgid="4204204205736735618">"အမည် ချထားပုံစံ"</string>
-    <string name="display_options_view_given_name_first" msgid="2308026973021171020">"ပထမ အမည် ဦးစွာ"</string>
-    <string name="display_options_view_family_name_first" msgid="987430497292428242">"နောက်ဆုံး အမည် ဦးစွာ"</string>
-    <string name="menu_clear_frequents" msgid="5358271535047496120">"မကြာခဏအရာများအား ဖယ်ရှားရန်"</string>
-    <string name="action_menu_back_from_search" msgid="3550669942742167644">"ရှာဖွေမှုကို ရပ်ရန်"</string>
-    <string name="description_clear_search" msgid="2347258825265600782">"ရှာဖွေမှုကို ရှင်းပါ"</string>
-    <string name="select_account_dialog_title" msgid="2673504582803359239">"အကောင့်"</string>
-    <string name="set_default_account" msgid="7966099951006467572">"ခေါ်ဆိုမှုများ အတွက် အမြဲတမ်း ဒါကို သုံးရန်"</string>
-    <string name="select_phone_account_for_calls" msgid="1784460686103423274">"ဖြင့် ခေါ်ဆိုရန်"</string>
-    <string name="call_with_a_note" msgid="6242261320491851133">"မှတ်စုတစ်ခုဖြင့် ခေါ်ဆိုမည်"</string>
-    <string name="call_subject_hint" msgid="7233138753650420800">"ခေါ်ဆိုမှုဖြင့် ပေးပို့ရန် မှတ်စုတစ်ခု ရိုက်ပါ ..."</string>
-    <string name="send_and_call_button" msgid="4735168294120154013">"ပေးပို့ပြီး ခေါ်ပါ"</string>
-    <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="tab_title" msgid="3387876802026074288">"<xliff:g id="TITLE">%1$s</xliff:g> တဘ်။"</string>
-    <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
-      <item quantity="other"> <xliff:g id="TITLE_2">%1$s</xliff:g> တဘ်။ မဖတ်ရသေးသည့် အရာ <xliff:g id="COUNT_3">%2$d</xliff:g> ခု။ </item>
-      <item quantity="one"> <xliff:g id="TITLE_0">%1$s</xliff:g> တဘ်။ မဖတ်ရသေးသည့် အရာ <xliff:g id="COUNT_1">%2$d</xliff:g> ခု။ </item>
-    </plurals>
-    <string name="description_search_video_call" msgid="4337369876888024909">"ဗီဒီယို ခေါ်ဆိုမှု"</string>
-    <string name="description_search_call_and_share" msgid="4912772842755050467">"မျှဝေပြီး ခေါ်ဆိုရန်"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_custom">%s ကိုခေါ်ပါ</string>
+  <string name="call_home">အိမ်ကိုခေါ်ပါ</string>
+  <string name="call_mobile">မိုဘိုင်းကိုခေါ်ပါ</string>
+  <string name="call_work">အလုပ်ကိုခေါ်ပါ</string>
+  <string name="call_fax_work">အလုပ်ဖက်စ်ကိုခေါ်ပါ</string>
+  <string name="call_fax_home">အိမ်ဖက်စ်ကိုခေါ်ပါ</string>
+  <string name="call_pager">ပေဂျာကိုခေါ်ပါ</string>
+  <string name="call_other">ခေါ်ပါ</string>
+  <string name="call_callback">ပြန်ခေါ်ခြင်းဝန်ဆောင်မှုကို ခေါ်ပါ</string>
+  <string name="call_car">ကားကိုခေါ်ပါ</string>
+  <string name="call_company_main">ကုမ္ပဏီပင်မနံပါတ်ကို ခေါ်ပါ</string>
+  <string name="call_isdn">ISDN ကိုခေါ်ပါ</string>
+  <string name="call_main">ပင်မနံပါတ်ကို ခေါ်ပါ</string>
+  <string name="call_other_fax">ဖက်စ်ကိုခေါ်ပါ</string>
+  <string name="call_radio">ရေဒီယိုကိုခေါ်ပါ</string>
+  <string name="call_telex">တဲလက်ဇ်နံပါတ်ကိုခေါ်ပါ</string>
+  <string name="call_tty_tdd">TTY/TDD ကိုခေါ်ပါ</string>
+  <string name="call_work_mobile">အလုပ်မိုဘိုင်းကိုခေါ်ပါ</string>
+  <string name="call_work_pager">အလုပ်ပေဂျာကိုခေါ်ပါ</string>
+  <string name="call_assistant">%s ကိုခေါ်ပါ</string>
+  <string name="call_mms">MMS ကိုခေါ်ပါ</string>
+  <string name="sms_custom">%s သို့ စာပို့ပါ</string>
+  <string name="sms_home">အိမ်သို့ စာပို့ပါ</string>
+  <string name="sms_mobile">မိုဘိုင်းသို့ စာပို့ပါ</string>
+  <string name="sms_work">အလုပ်နံပါတ်သို့ စာပို့ပါ</string>
+  <string name="sms_fax_work">အလုပ်ဖက်စ်သို့ စာပို့ပါ</string>
+  <string name="sms_fax_home">အိမ်ဖက်စ်သို့ စာပို့ပါ</string>
+  <string name="sms_pager">ပေဂျာနံပါတ်သို့ စာပို့ပါ</string>
+  <string name="sms_other">စာတို</string>
+  <string name="sms_callback">ပြန်ခေါ်မှုနံပါတ်ထံ စာပို့ပါ</string>
+  <string name="sms_car">ကားဆီ စာပို့ပါ</string>
+  <string name="sms_company_main">ကုမ္ပဏီ ပင်မနံပါတ်သို့ စာပို့ပါ</string>
+  <string name="sms_isdn">ISDN စာပို့ပါ</string>
+  <string name="sms_main">အဓိကနံပါတ်သို့ စာပို့ပါ</string>
+  <string name="sms_other_fax">ဖက်စ်နံပါတ်သို့ စာပို့ပါ</string>
+  <string name="sms_radio">ရေဒီယိုနံပါတ်သို့ စာပို့ပါ</string>
+  <string name="sms_telex">တဲလက်စ်နံပါတ်သို့ စာပို့ပါ</string>
+  <string name="sms_tty_tdd">TTY/TDD နံပါတ်သို့ စာပို့ပါ</string>
+  <string name="sms_work_mobile">အလုပ်မိုဘိုင်းသို့ စာပို့ပါ</string>
+  <string name="sms_work_pager">အလုပ်ပေ့ဂျာသို့ စာပို့ပါ</string>
+  <string name="sms_assistant">%sထံ စာပို့ပါ</string>
+  <string name="sms_mms">MMS နံပါတ်သို့ စာပို့ပါ</string>
+  <string name="clearFrequentsConfirmation_title">အသုံးများသောလိပ်စာများရှင်းပစ်မလား?</string>
+  <string name="clearFrequentsConfirmation">အသုံးများသော အဆက်အသွယ်စာရင်းအား Contacts နှင့် Phone app များမှ သင် ရှင်းလင်းပစ်မှာဖြစ်ပြီး၊ အီးမေးလ် app များအား သင့်နှစ်သက်ရာ ​ပ​ြောဆိုဆက်ဆံမှုပုံစံကို အစမှပြန်လည် လေ့လာခိုင်းမည်။</string>
+  <string name="clearFrequentsProgress_title">အသုံးများသောလိပ်စာများ ရှင်းလင်းနေစဉ်</string>
+  <string name="status_available">ဆက်သွယ်နိုင်ပါသည်</string>
+  <string name="status_away">အဝေးရောက်နေပါသည်</string>
+  <string name="status_busy">အလုပ်များနေသည်</string>
+  <string name="contactsList">အဆက်အသွယ်များ</string>
+  <string name="contact_suggestions">ထိပ်တန်း အကြံပြုထားပါသည်</string>
+  <string name="local_invisible_directory">တစ်ခြား</string>
+  <string name="directory_search_label">လမ်းညွှန်</string>
+  <string name="directory_search_label_work">အလုပ်လမ်းညွှန်</string>
+  <string name="local_search_label">လိပ်စာများအားလုံး</string>
+  <string name="local_suggestions_search_label">အကြံပြုချက်များ</string>
+  <string msgid="9154761216179882405" name="user_profile_contacts_list_header">ကျွန်ုပ်</string>
+  <string name="missing_name">(အမည်မရှိ)</string>
+  <string msgid="2795575601596468581" name="description_view_contact_detail">အဆက်အသွယ်ကိုကြည့်ရန်</string>
+  <string name="list_filter_phones">ဖုန်းနံပါတ်ပါသော လိပ်စာများအားလုံး</string>
+  <string name="list_filter_phones_work">အလုပ်ပရိုဖိုင် အဆက်အသွယ်များ</string>
+  <string name="view_updates_from_group">အဆင့်မြှင့်ခြင်းများပြရန်</string>
+  <string name="account_phone">ကိရိယာတွင်သာ၊ စင့်ခ်မလုပ်ပါ</string>
+  <string name="nameLabelsGroup">အမည်</string>
+  <string name="nicknameLabelsGroup">နာမည်ဝှက်</string>
+  <string name="full_name">အမည်</string>
+  <string name="name_given">ပထမ အမည်</string>
+  <string name="name_family">နောက်ဆုံး အမည်</string>
+  <string name="name_prefix">နာမည်ရှေ့ဆောင်</string>
+  <string name="name_middle">အလယ်နာမည်</string>
+  <string name="name_suffix">နာမည်နောက်စွဲ</string>
+  <string name="name_phonetic">အသံထွက်နာမည်</string>
+  <string name="name_phonetic_given">အသံထွက် ပထမ အမည်</string>
+  <string name="name_phonetic_middle">အသံထွက် အလယ်နာမည်</string>
+  <string name="name_phonetic_family">အသံထွက် နောက်ဆုံး အမည်</string>
+  <string name="phoneLabelsGroup">ဖုန်း</string>
+  <string name="emailLabelsGroup">အီးမေးလ်</string>
+  <string name="postalLabelsGroup">လိပ်စာ</string>
+  <string name="imLabelsGroup">IM</string>
+  <string name="organizationLabelsGroup">အဖွဲ့အစည်း</string>
+  <string name="relationLabelsGroup">ပတ်သတ်မှု</string>
+  <string name="eventLabelsGroup">အထူးနေ့</string>
+  <string name="sms">စာတို</string>
+  <string name="postal_address">လိပ်စာ</string>
+  <string name="ghostData_company">ကုမ္ပဏီ</string>
+  <string name="ghostData_title">ခေါင်းစဉ်</string>
+  <string name="label_notes">မှတ်စုများ</string>
+  <string name="label_sip_address">SIP</string>
+  <string name="websiteLabelsGroup">ဝဘ်ဆိုက်</string>
+  <string name="groupsLabel">အုပ်စုများ</string>
+  <string name="email_home">အိမ်ကို အီးမေးလ် ပို့ပါ</string>
+  <string name="email_mobile">မိုဘိုင်း ကို အီးမေးလ် ပို့ပါ</string>
+  <string name="email_work">အလုပ်ကို အီးမေးလ် ပို့ပါ</string>
+  <string name="email_other">အီးမေးလ်</string>
+  <string name="email_custom">အီးမေးလ် %s</string>
+  <string name="email">အီးမေးလ်</string>
+  <string name="postal_street">လမ်း</string>
+  <string name="postal_city">မြို့</string>
+  <string name="postal_region">ပြည်နယ်</string>
+  <string name="postal_postcode">စာပို့သင်္ကေတ</string>
+  <string name="postal_country">နိုင်ငံ</string>
+  <string name="map_home">အိမ်လိပ်စာအားကြည့်ရန်</string>
+  <string name="map_work">အလုပ်လိပ်စာအားကြည့်ရန်</string>
+  <string name="map_other">လိပ်စာအားကြည့်ရန်</string>
+  <string name="map_custom">%s လိပ်စာအားကြည့်ရန်</string>
+  <string name="chat_aim">AIM သုံး၍ ချက်တင်လုပ်ခြင်း</string>
+  <string name="chat_msn">Windows Liveသုံး၍ ချက်တင်ပြုလုပ်ခြင်း</string>
+  <string name="chat_yahoo">Yahoo သုံး၍ ချက်တင်ပြုလုပ်ခြင်း</string>
+  <string name="chat_skype">Skype သုံး၍ ချက်တင်ပြုလုပ်ခြင်း</string>
+  <string name="chat_qq">QQ သုံး၍ ချက်တင်ပြုလုပ်ခြင်း</string>
+  <string name="chat_gtalk">ဂူးဂဲလ်တော့သုံး၍ ချက်တင်ပြုလုပ်ခြင်း</string>
+  <string name="chat_icq">ICQ သုံး၍ ချက်တင်ပြုလုပ်ခြင်း</string>
+  <string name="chat_jabber">Jabberသုံး၍ ချက်တင်ပြုလုပ်ခြင်း</string>
+  <string name="chat">ချက်တင်းပြောသည်</string>
+  <string name="list_filter_all_accounts">ဆက်သွယ်အားလုံး</string>
+  <string name="listAllContactsInAccount">%s ထဲမှ အဆက်အသွယ်များ</string>
+  <string name="listCustomView">မိမိစိတ်ကြိုက် မြင်ကွင်းမှ</string>
+  <string name="listSingleContact">အဆက်အသွယ်တစ်ခုတည်း</string>
+  <string name="display_options_sort_list_by">ဖြင့် စီပေးရန်</string>
+  <string name="display_options_sort_by_given_name">ပထမ အမည်</string>
+  <string name="display_options_sort_by_family_name">နောက်ဆုံး အမည်</string>
+  <string name="display_options_view_names_as">အမည် ချထားပုံစံ</string>
+  <string name="display_options_view_given_name_first">ပထမ အမည် ဦးစွာ</string>
+  <string name="display_options_view_family_name_first">နောက်ဆုံး အမည် ဦးစွာ</string>
+  <string name="menu_clear_frequents">မကြာခဏအရာများအား ဖယ်ရှားရန်</string>
+  <string name="action_menu_back_from_search">ရှာဖွေမှုကို ရပ်ရန်</string>
+  <string name="description_clear_search">ရှာဖွေမှုကို ရှင်းပါ</string>
+  <string name="select_account_dialog_title">အကောင့်</string>
+  <string name="set_default_account">ခေါ်ဆိုမှုများ အတွက် အမြဲတမ်း ဒါကို သုံးရန်</string>
+  <string name="select_phone_account_for_calls">ဤခေါ်ဆိုမှုအတွက် ဆင်းမ်ကဒ် ရွေးချယ်ခြင်း</string>
+  <string name="select_phone_account_for_calls_remember">ဤရွေးချယ်မှုကို မှတ်ထားရန်</string>
+  <string name="call_with_a_note">မှတ်စုတစ်ခုဖြင့် ခေါ်ဆိုမည်</string>
+  <string name="call_subject_hint">ခေါ်ဆိုမှုဖြင့် ပေးပို့ရန် မှတ်စုတစ်ခု ရိုက်ပါ ...</string>
+  <string name="send_and_call_button">ပေးပို့ပြီး ခေါ်ပါ</string>
+  <string name="call_subject_limit">%1$s / %2$s</string>
+  <string name="old_call_subject_type_and_number">%1$s %2$s</string>
+  <string name="tab_title">%1$s တဘ်။</string>
+  <plurals name="tab_title_with_unread_items">
+    <item quantity="one"> %1$s တဘ်။ မဖတ်ရသေးသည့် အရာ %2$d ခု။ </item>
+    <item quantity="other"> %1$s တဘ်။ မဖတ်ရသေးသည့် အရာ %2$d ခု။ </item>
+  </plurals>
+  <string name="description_search_video_call">ဗီဒီယို ခေါ်ဆိုမှု</string>
+  <string name="description_search_call_and_share">မျှဝေပြီး ခေါ်ဆိုရန်</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-nb/strings.xml b/java/com/android/contacts/common/res/values-nb/strings.xml
index 707033a..911dc0f 100644
--- a/java/com/android/contacts/common/res/values-nb/strings.xml
+++ b/java/com/android/contacts/common/res/values-nb/strings.xml
@@ -1,162 +1,145 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="toast_text_copied" msgid="8979281391599667362">"Tekst kopiert"</string>
-    <string name="call_custom" msgid="3041673234638990874">"Ring <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="call_home" msgid="125893483593803791">"Ring hjem"</string>
-    <string name="call_mobile" msgid="967589404494150813">"Ring mobilnummer"</string>
-    <string name="call_work" msgid="6040550697395300892">"Ring arbeidsnummer"</string>
-    <string name="call_fax_work" msgid="5260192771364592922">"Ring faksnummer (arbeid)"</string>
-    <string name="call_fax_home" msgid="5174311195081144124">"Ring faksnummer (hjemme)"</string>
-    <string name="call_pager" msgid="6814149227741274161">"Ring personsøkernummer"</string>
-    <string name="call_other" msgid="5536385588712587235">"Ring"</string>
-    <string name="call_callback" msgid="6314019862718112786">"Ring tilbakeringingsnummer"</string>
-    <string name="call_car" msgid="3197417098027764954">"Ring til bilnummer"</string>
-    <string name="call_company_main" msgid="2557663310028446397">"Ring til firma (hovednummer)"</string>
-    <string name="call_isdn" msgid="4691270442763649522">"Ring ISDN-nummer"</string>
-    <string name="call_main" msgid="3293707608770407814">"Ring hovednummer"</string>
-    <string name="call_other_fax" msgid="4724521984879021465">"Ring faksnummer"</string>
-    <string name="call_radio" msgid="8942441419845057942">"Ring radionummer"</string>
-    <string name="call_telex" msgid="2031514461660668351">"Ring teleksnummer"</string>
-    <string name="call_tty_tdd" msgid="7807210224965727701">"Ring TTY/TDD"</string>
-    <string name="call_work_mobile" msgid="2716342732938578495">"Ring mobilnummer (arbeid)"</string>
-    <string name="call_work_pager" msgid="3791778749827366574">"Ring personsøkernummer (arbeid)"</string>
-    <string name="call_assistant" msgid="4177478845473789294">"Ring <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
-    <string name="call_mms" msgid="4958811711741872901">"Ring multimediemeldingnummer"</string>
-    <string name="sms_custom" msgid="8785368968605026317">"Send tekstmelding til <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="sms_home" msgid="3527719551060295243">"Send tekstmelding til hjemmenummer"</string>
-    <string name="sms_mobile" msgid="8883045857887736518">"Send tekstmelding til mobilnummer"</string>
-    <string name="sms_work" msgid="4158595439553450966">"Send tekstmelding til arbeidsnummer"</string>
-    <string name="sms_fax_work" msgid="5483726627718055248">"Send tekstmelding til faksnummer (arbeid)"</string>
-    <string name="sms_fax_home" msgid="9219265155770746077">"Send tekstmelding til faksnummer (hjemme)"</string>
-    <string name="sms_pager" msgid="4901085068525193933">"Send tekstmelding til personsøkernummer"</string>
-    <string name="sms_other" msgid="1742702947993285933">"Send tekstmelding"</string>
-    <string name="sms_callback" msgid="5833483630377538308">"Send tekstmelding til tilbakeringingsnummer"</string>
-    <string name="sms_car" msgid="4314577266154395174">"Send tekstmelding til bilnummer"</string>
-    <string name="sms_company_main" msgid="2308160928487360705">"Send tekstmelding til firma (hovednummer)"</string>
-    <string name="sms_isdn" msgid="6394300346179302542">"Send tekstmelding til ISDN-nummer"</string>
-    <string name="sms_main" msgid="8908087742014140774">"Send tekstmelding til hovednummer"</string>
-    <string name="sms_other_fax" msgid="8768455473295405427">"Send tekstmelding til faksnummer"</string>
-    <string name="sms_radio" msgid="855555176531704682">"Send tekstmelding til radionummer"</string>
-    <string name="sms_telex" msgid="6269029276223252719">"Send tekstmelding til teleksnummer"</string>
-    <string name="sms_tty_tdd" msgid="6229057354509192444">"Send tekstmelding til TTY/TDD"</string>
-    <string name="sms_work_mobile" msgid="2155975469329969840">"Send tekstmelding til mobilnummer (arbeid)"</string>
-    <string name="sms_work_pager" msgid="8500140274906830742">"Send tekstmelding til personsøkernummer (arbeid)"</string>
-    <string name="sms_assistant" msgid="8513548482745330818">"Send tekstmelding til <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
-    <string name="sms_mms" msgid="5187888900503248542">"Send tekstmelding til multimediemeldingnummer"</string>
-    <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"Vil du fjerne ofte kontaktede personer?"</string>
-    <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"Du fjerner listen over ofte kontaktede personer i Kontakter- og Telefon-appene, og tvinger e-postappene til å lære seg adresseinnstillingene dine på nytt."</string>
-    <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"Fjerner ofte kontaktede personer ..."</string>
-    <string name="status_available" msgid="2648156525685472626">"Tilgjengelig"</string>
-    <string name="status_away" msgid="2298688367552893953">"Borte"</string>
-    <string name="status_busy" msgid="5990832098713248503">"Opptatt"</string>
-    <string name="contactsList" msgid="8806067891419291513">"Kontakter"</string>
-    <string name="contact_suggestions" msgid="3324166754807120006">"Toppforslag"</string>
-    <string name="local_invisible_directory" msgid="4723238462733650090">"Annen"</string>
-    <string name="directory_search_label" msgid="4621215895484025229">"Katalog"</string>
-    <string name="directory_search_label_work" msgid="7679326282707414897">"Jobbkatalog"</string>
-    <string name="local_search_label" msgid="907622822323119235">"Alle kontakter"</string>
-    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Forslag"</string>
-    <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Meg"</string>
-    <string name="missing_name" msgid="978606963362745020">"(Uten navn)"</string>
-    <string name="description_view_contact_detail" msgid="2428742401208561136">"Se kontakten"</string>
-    <string name="list_filter_phones" msgid="8763316061763437182">"Alle kontakter med telefonnumre"</string>
-    <string name="list_filter_phones_work" msgid="7083575404573422965">"Jobbprofilkontakter"</string>
-    <string name="view_updates_from_group" msgid="9011641093168385729">"Se oppdateringer"</string>
-    <string name="account_phone" msgid="7067809073194061035">"Bare på enheten din, uten synkronisering"</string>
-    <string name="nameLabelsGroup" msgid="7730465833159557471">"Navn"</string>
-    <string name="nicknameLabelsGroup" msgid="6310556912361840029">"Kallenavn"</string>
-    <string name="full_name" msgid="648186563998465740">"Navn"</string>
-    <string name="name_given" msgid="5096576006314820536">"Fornavn"</string>
-    <string name="name_family" msgid="6646235805198547467">"Etternavn"</string>
-    <string name="name_prefix" msgid="9215326539658838">"Navneprefiks"</string>
-    <string name="name_middle" msgid="703755205331582769">"Mellomnavn"</string>
-    <string name="name_suffix" msgid="5777083390282548702">"Navnesuffiks"</string>
-    <string name="name_phonetic" msgid="1650870996361663089">"Fonetisk navn"</string>
-    <string name="name_phonetic_given" msgid="618812334274603170">"Fonetisk fornavn"</string>
-    <string name="name_phonetic_middle" msgid="4826820763384625538">"Fonetisk mellomnavn"</string>
-    <string name="name_phonetic_family" msgid="379905191212930771">"Fonetisk etternavn"</string>
-    <string name="phoneLabelsGroup" msgid="169661929021355548">"Telefon"</string>
-    <string name="emailLabelsGroup" msgid="2249752810477488833">"Send e-post"</string>
-    <string name="postalLabelsGroup" msgid="6772000590189142253">"Adresse"</string>
-    <string name="imLabelsGroup" msgid="5718066254237364731">"Nettprat"</string>
-    <string name="organizationLabelsGroup" msgid="1101996309241601435">"Organisasjon"</string>
-    <string name="relationLabelsGroup" msgid="53866051664600053">"Tilknytning"</string>
-    <string name="eventLabelsGroup" msgid="1236970042646618489">"Spesialdato"</string>
-    <string name="sms" msgid="7574344928185328095">"SMS"</string>
-    <string name="postal_address" msgid="1804707930129674200">"Adresse"</string>
-    <string name="ghostData_company" msgid="2554310786296833424">"Firma"</string>
-    <string name="ghostData_title" msgid="4994968731830184837">"Stilling"</string>
-    <string name="label_notes" msgid="2050255313694219786">"Notater"</string>
-    <string name="label_sip_address" msgid="8883266182575965926">"SIP"</string>
-    <string name="websiteLabelsGroup" msgid="1630734286462186790">"Nettsted"</string>
-    <string name="groupsLabel" msgid="2694002798416868728">"Grupper"</string>
-    <string name="email_home" msgid="889830029388962171">"Send e-post (privat)"</string>
-    <string name="email_mobile" msgid="4487686436743741150">"Send e-post (mobil)"</string>
-    <string name="email_work" msgid="4223487303344613528">"Send e-post (jobb)"</string>
-    <string name="email_other" msgid="4246411900126012062">"Send e-post"</string>
-    <string name="email_custom" msgid="7246580894327511013">"Send e-post (<xliff:g id="CUSTOM">%s</xliff:g>)"</string>
-    <string name="email" msgid="2807318537887091606">"Send e-post"</string>
-    <string name="postal_street" msgid="6918171741240802474">"Gate"</string>
-    <string name="postal_city" msgid="8674569121430005628">"By"</string>
-    <string name="postal_region" msgid="1730369286225469192">"Fylke/delstat"</string>
-    <string name="postal_postcode" msgid="4450700741261990439">"Postnummer"</string>
-    <string name="postal_country" msgid="232670707458768148">"Land"</string>
-    <string name="map_home" msgid="4181131107392126938">"Se hjemmeadressen"</string>
-    <string name="map_work" msgid="5723471185992684400">"Se jobbadressen"</string>
-    <string name="map_other" msgid="2253764780863500516">"Se adressen"</string>
-    <string name="map_custom" msgid="5581743097882436157">"Se <xliff:g id="CUSTOM">%s</xliff:g>-adressen"</string>
-    <string name="chat_aim" msgid="2954364435497941659">"Nettprat med AIM"</string>
-    <string name="chat_msn" msgid="3130135239071228678">"Nettprat med Windows Live"</string>
-    <string name="chat_yahoo" msgid="3233552142326865347">"Nettprat med Yahoo"</string>
-    <string name="chat_skype" msgid="6486703981390592425">"Nettprat med Skype"</string>
-    <string name="chat_qq" msgid="786924280665740019">"Nettprat med QQ"</string>
-    <string name="chat_gtalk" msgid="7914674177243078035">"Nettprat med Google Talk"</string>
-    <string name="chat_icq" msgid="3292934726414765801">"Nettprat med ICQ"</string>
-    <string name="chat_jabber" msgid="6701542313597880204">"Nettprat med Jabber"</string>
-    <string name="chat" msgid="1020428260359370236">"Nettprat"</string>
-    <string name="list_filter_all_accounts" msgid="473782314881473992">"Alle kontakter"</string>
-    <string name="listAllContactsInAccount" msgid="3486378621592995630">"Kontakter i <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="listCustomView" msgid="5306282632413086731">"Kontakter i tilpasset visning"</string>
-    <string name="listSingleContact" msgid="8620818791932382627">"Enkeltkontakt"</string>
-    <string name="display_options_sort_list_by" msgid="3541875948367831228">"Sortér etter"</string>
-    <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"Fornavn"</string>
-    <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"Etternavn"</string>
-    <string name="display_options_view_names_as" msgid="4204204205736735618">"Navneformat"</string>
-    <string name="display_options_view_given_name_first" msgid="2308026973021171020">"Fornavnet først"</string>
-    <string name="display_options_view_family_name_first" msgid="987430497292428242">"Etternavnet først"</string>
-    <string name="menu_clear_frequents" msgid="5358271535047496120">"Fjern ofte kontaktede personer"</string>
-    <string name="action_menu_back_from_search" msgid="3550669942742167644">"avslutt søket"</string>
-    <string name="description_clear_search" msgid="2347258825265600782">"Slett søk"</string>
-    <string name="select_account_dialog_title" msgid="2673504582803359239">"Konto"</string>
-    <string name="set_default_account" msgid="7966099951006467572">"Bruk alltid dette for samtaler"</string>
-    <string name="select_phone_account_for_calls" msgid="1784460686103423274">"Ring med"</string>
-    <string name="call_with_a_note" msgid="6242261320491851133">"Ring med et notat"</string>
-    <string name="call_subject_hint" msgid="7233138753650420800">"Skriv et notat du vil sende med anropet …"</string>
-    <string name="send_and_call_button" msgid="4735168294120154013">"SEND OG RING"</string>
-    <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="tab_title" msgid="3387876802026074288">"<xliff:g id="TITLE">%1$s</xliff:g>-fanen."</string>
-    <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
-      <item quantity="other"> <xliff:g id="TITLE_2">%1$s</xliff:g>-fanen. <xliff:g id="COUNT_3">%2$d</xliff:g> uleste elementer. </item>
-      <item quantity="one"> <xliff:g id="TITLE_0">%1$s</xliff:g>-fanen. <xliff:g id="COUNT_1">%2$d</xliff:g> ulest element. </item>
-    </plurals>
-    <string name="description_search_video_call" msgid="4337369876888024909">"Videosamtale"</string>
-    <string name="description_search_call_and_share" msgid="4912772842755050467">"Del og ring"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_custom">Ring %s</string>
+  <string name="call_home">Ring hjem</string>
+  <string name="call_mobile">Ring mobilnummer</string>
+  <string name="call_work">Ring arbeidsnummer</string>
+  <string name="call_fax_work">Ring faksnummer (arbeid)</string>
+  <string name="call_fax_home">Ring faksnummer (hjemme)</string>
+  <string name="call_pager">Ring personsøkernummer</string>
+  <string name="call_other">Ring</string>
+  <string name="call_callback">Ring tilbakeringingsnummer</string>
+  <string name="call_car">Ring til bilnummer</string>
+  <string name="call_company_main">Ring til firma (hovednummer)</string>
+  <string name="call_isdn">Ring ISDN-nummer</string>
+  <string name="call_main">Ring hovednummer</string>
+  <string name="call_other_fax">Ring faksnummer</string>
+  <string name="call_radio">Ring radionummer</string>
+  <string name="call_telex">Ring teleksnummer</string>
+  <string name="call_tty_tdd">Ring TTY/TDD</string>
+  <string name="call_work_mobile">Ring mobilnummer (arbeid)</string>
+  <string name="call_work_pager">Ring personsøkernummer (arbeid)</string>
+  <string name="call_assistant">Ring %s</string>
+  <string name="call_mms">Ring multimediemeldingnummer</string>
+  <string name="sms_custom">Send tekstmelding til %s</string>
+  <string name="sms_home">Send tekstmelding til hjemmenummer</string>
+  <string name="sms_mobile">Send tekstmelding til mobilnummer</string>
+  <string name="sms_work">Send tekstmelding til arbeidsnummer</string>
+  <string name="sms_fax_work">Send tekstmelding til faksnummer (arbeid)</string>
+  <string name="sms_fax_home">Send tekstmelding til faksnummer (hjemme)</string>
+  <string name="sms_pager">Send tekstmelding til personsøkernummer</string>
+  <string name="sms_other">Send tekstmelding</string>
+  <string name="sms_callback">Send tekstmelding til tilbakeringingsnummer</string>
+  <string name="sms_car">Send tekstmelding til bilnummer</string>
+  <string name="sms_company_main">Send tekstmelding til firma (hovednummer)</string>
+  <string name="sms_isdn">Send tekstmelding til ISDN-nummer</string>
+  <string name="sms_main">Send tekstmelding til hovednummer</string>
+  <string name="sms_other_fax">Send tekstmelding til faksnummer</string>
+  <string name="sms_radio">Send tekstmelding til radionummer</string>
+  <string name="sms_telex">Send tekstmelding til teleksnummer</string>
+  <string name="sms_tty_tdd">Send tekstmelding til TTY/TDD</string>
+  <string name="sms_work_mobile">Send tekstmelding til mobilnummer (arbeid)</string>
+  <string name="sms_work_pager">Send tekstmelding til personsøkernummer (arbeid)</string>
+  <string name="sms_assistant">Send tekstmelding til %s</string>
+  <string name="sms_mms">Send tekstmelding til multimediemeldingnummer</string>
+  <string name="clearFrequentsConfirmation_title">Vil du fjerne ofte kontaktede personer?</string>
+  <string name="clearFrequentsConfirmation">Du fjerner listen over ofte kontaktede personer i Kontakter- og Telefon-appene, og tvinger e-postappene til å lære seg adresseinnstillingene dine på nytt.</string>
+  <string name="clearFrequentsProgress_title">Fjerner ofte kontaktede personer ...</string>
+  <string name="status_available">Tilgjengelig</string>
+  <string name="status_away">Borte</string>
+  <string name="status_busy">Opptatt</string>
+  <string name="contactsList">Kontakter</string>
+  <string name="contact_suggestions">Toppforslag</string>
+  <string name="local_invisible_directory">Annen</string>
+  <string name="directory_search_label">Katalog</string>
+  <string name="directory_search_label_work">Jobbkatalog</string>
+  <string name="local_search_label">Alle kontakter</string>
+  <string name="local_suggestions_search_label">Forslag</string>
+  <string msgid="9154761216179882405" name="user_profile_contacts_list_header">Meg</string>
+  <string name="missing_name">(Uten navn)</string>
+  <string msgid="2795575601596468581" name="description_view_contact_detail">Se kontakten</string>
+  <string name="list_filter_phones">Alle kontakter med telefonnumre</string>
+  <string name="list_filter_phones_work">Jobbprofilkontakter</string>
+  <string name="view_updates_from_group">Se oppdateringer</string>
+  <string name="account_phone">Bare på enheten din, uten synkronisering</string>
+  <string name="nameLabelsGroup">Navn</string>
+  <string name="nicknameLabelsGroup">Kallenavn</string>
+  <string name="full_name">Navn</string>
+  <string name="name_given">Fornavn</string>
+  <string name="name_family">Etternavn</string>
+  <string name="name_prefix">Navneprefiks</string>
+  <string name="name_middle">Mellomnavn</string>
+  <string name="name_suffix">Navnesuffiks</string>
+  <string name="name_phonetic">Fonetisk navn</string>
+  <string name="name_phonetic_given">Fonetisk fornavn</string>
+  <string name="name_phonetic_middle">Fonetisk mellomnavn</string>
+  <string name="name_phonetic_family">Fonetisk etternavn</string>
+  <string name="phoneLabelsGroup">Telefon</string>
+  <string name="emailLabelsGroup">Send e-post</string>
+  <string name="postalLabelsGroup">Adresse</string>
+  <string name="imLabelsGroup">Nettprat</string>
+  <string name="organizationLabelsGroup">Organisasjon</string>
+  <string name="relationLabelsGroup">Tilknytning</string>
+  <string name="eventLabelsGroup">Spesialdato</string>
+  <string name="sms">SMS</string>
+  <string name="postal_address">Adresse</string>
+  <string name="ghostData_company">Firma</string>
+  <string name="ghostData_title">Stilling</string>
+  <string name="label_notes">Notater</string>
+  <string name="label_sip_address">SIP</string>
+  <string name="websiteLabelsGroup">Nettsted</string>
+  <string name="groupsLabel">Grupper</string>
+  <string name="email_home">Send e-post (privat)</string>
+  <string name="email_mobile">Send e-post (mobil)</string>
+  <string name="email_work">Send e-post (jobb)</string>
+  <string name="email_other">Send e-post</string>
+  <string name="email_custom">Send e-post (%s)</string>
+  <string name="email">Send e-post</string>
+  <string name="postal_street">Gate</string>
+  <string name="postal_city">By</string>
+  <string name="postal_region">Fylke/delstat</string>
+  <string name="postal_postcode">Postnummer</string>
+  <string name="postal_country">Land</string>
+  <string name="map_home">Se hjemmeadressen</string>
+  <string name="map_work">Se jobbadressen</string>
+  <string name="map_other">Se adressen</string>
+  <string name="map_custom">Se %s-adressen</string>
+  <string name="chat_aim">Nettprat med AIM</string>
+  <string name="chat_msn">Nettprat med Windows Live</string>
+  <string name="chat_yahoo">Nettprat med Yahoo</string>
+  <string name="chat_skype">Nettprat med Skype</string>
+  <string name="chat_qq">Nettprat med QQ</string>
+  <string name="chat_gtalk">Nettprat med Google Talk</string>
+  <string name="chat_icq">Nettprat med ICQ</string>
+  <string name="chat_jabber">Nettprat med Jabber</string>
+  <string name="chat">Nettprat</string>
+  <string name="list_filter_all_accounts">Alle kontakter</string>
+  <string name="listAllContactsInAccount">Kontakter i %s</string>
+  <string name="listCustomView">Kontakter i tilpasset visning</string>
+  <string name="listSingleContact">Enkeltkontakt</string>
+  <string name="display_options_sort_list_by">Sortér etter</string>
+  <string name="display_options_sort_by_given_name">Fornavn</string>
+  <string name="display_options_sort_by_family_name">Etternavn</string>
+  <string name="display_options_view_names_as">Navneformat</string>
+  <string name="display_options_view_given_name_first">Fornavnet først</string>
+  <string name="display_options_view_family_name_first">Etternavnet først</string>
+  <string name="menu_clear_frequents">Fjern ofte kontaktede personer</string>
+  <string name="action_menu_back_from_search">avslutt søket</string>
+  <string name="description_clear_search">Slett søk</string>
+  <string name="select_account_dialog_title">Konto</string>
+  <string name="set_default_account">Bruk alltid dette for samtaler</string>
+  <string name="select_phone_account_for_calls">Velg SIM-kort for dette anropet</string>
+  <string name="select_phone_account_for_calls_remember">Husk dette valget</string>
+  <string name="call_with_a_note">Ring med et notat</string>
+  <string name="call_subject_hint">Skriv et notat du vil sende med anropet …</string>
+  <string name="send_and_call_button">SEND OG RING</string>
+  <string name="call_subject_limit">%1$s / %2$s</string>
+  <string name="old_call_subject_type_and_number">%1$s %2$s</string>
+  <string name="tab_title">%1$s-fanen.</string>
+  <plurals name="tab_title_with_unread_items">
+    <item quantity="one"> %1$s-fanen. %2$d ulest element. </item>
+    <item quantity="other"> %1$s-fanen. %2$d uleste elementer. </item>
+  </plurals>
+  <string name="description_search_video_call">Videosamtale</string>
+  <string name="description_search_call_and_share">Del og ring</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-ne/strings.xml b/java/com/android/contacts/common/res/values-ne/strings.xml
index 6a41f67..40f6d8a 100644
--- a/java/com/android/contacts/common/res/values-ne/strings.xml
+++ b/java/com/android/contacts/common/res/values-ne/strings.xml
@@ -1,162 +1,145 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="toast_text_copied" msgid="8979281391599667362">"पाठको प्रतिलिपि  गरियो"</string>
-    <string name="call_custom" msgid="3041673234638990874">"<xliff:g id="CUSTOM">%s</xliff:g> लाई कल गर्नुहोस्"</string>
-    <string name="call_home" msgid="125893483593803791">"घरमा कल गर्नुहोस्"</string>
-    <string name="call_mobile" msgid="967589404494150813">"मोबाइलमा कल गर्नुहोस्"</string>
-    <string name="call_work" msgid="6040550697395300892">"काममा कल गर्नुहोस्"</string>
-    <string name="call_fax_work" msgid="5260192771364592922">"कामको फ्याक्समा कल गर्नुहोस्"</string>
-    <string name="call_fax_home" msgid="5174311195081144124">"घरको फ्याक्समा कल गर्नुहोस्"</string>
-    <string name="call_pager" msgid="6814149227741274161">"पेजरलाई कल गर्नुहोस्"</string>
-    <string name="call_other" msgid="5536385588712587235">"कल गर्नुहोस्"</string>
-    <string name="call_callback" msgid="6314019862718112786">"कलब्याक कल गर्नुहोस्"</string>
-    <string name="call_car" msgid="3197417098027764954">"कारलाई कल गर्नुहोस्"</string>
-    <string name="call_company_main" msgid="2557663310028446397">"कम्पनी मूललाई कल गर्नुहोस्"</string>
-    <string name="call_isdn" msgid="4691270442763649522">"ISDN कल गर्नुहोस्"</string>
-    <string name="call_main" msgid="3293707608770407814">"मुख्यलाई कल गर्नुहोस्"</string>
-    <string name="call_other_fax" msgid="4724521984879021465">"फ्याक्सलाई कल गर्नुहोस्"</string>
-    <string name="call_radio" msgid="8942441419845057942">"रेडियोमा कल गर्नुहोस्"</string>
-    <string name="call_telex" msgid="2031514461660668351">"टेलेक्सलाई कल गर्नुहोस्"</string>
-    <string name="call_tty_tdd" msgid="7807210224965727701">"TTY/TDD लाई कल गर्नुहोस्"</string>
-    <string name="call_work_mobile" msgid="2716342732938578495">"काम मोबाइलमा कल गर्नुहोस्"</string>
-    <string name="call_work_pager" msgid="3791778749827366574">"काम पेजरमा कल गर्नुहोस्"</string>
-    <string name="call_assistant" msgid="4177478845473789294">"<xliff:g id="ASSISTANT">%s</xliff:g> लाई कल गर्नुहोस्"</string>
-    <string name="call_mms" msgid="4958811711741872901">"MMS लाई कल गर्नुहोस्"</string>
-    <string name="sms_custom" msgid="8785368968605026317">"पाठ <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="sms_home" msgid="3527719551060295243">"पाठ घर"</string>
-    <string name="sms_mobile" msgid="8883045857887736518">"पाठ मोबाइल"</string>
-    <string name="sms_work" msgid="4158595439553450966">"पाठ काम"</string>
-    <string name="sms_fax_work" msgid="5483726627718055248">"पाठ काम फ्याक्स"</string>
-    <string name="sms_fax_home" msgid="9219265155770746077">"पाठ घर फ्याक्स"</string>
-    <string name="sms_pager" msgid="4901085068525193933">"पाठ पेजर"</string>
-    <string name="sms_other" msgid="1742702947993285933">"पाठ"</string>
-    <string name="sms_callback" msgid="5833483630377538308">"पाठ कलब्याक"</string>
-    <string name="sms_car" msgid="4314577266154395174">"पाठ कार"</string>
-    <string name="sms_company_main" msgid="2308160928487360705">"पाठ कम्पनी मूल"</string>
-    <string name="sms_isdn" msgid="6394300346179302542">"पाठ ISDN"</string>
-    <string name="sms_main" msgid="8908087742014140774">"पाठ मुख्य"</string>
-    <string name="sms_other_fax" msgid="8768455473295405427">"पाठ फ्याक्स"</string>
-    <string name="sms_radio" msgid="855555176531704682">"पाठ रेडियो"</string>
-    <string name="sms_telex" msgid="6269029276223252719">"पाठ टेलेक्स"</string>
-    <string name="sms_tty_tdd" msgid="6229057354509192444">"पाठ TTY/TDD"</string>
-    <string name="sms_work_mobile" msgid="2155975469329969840">"पाठ काम मोबाइल"</string>
-    <string name="sms_work_pager" msgid="8500140274906830742">"पाठ काम पेजर"</string>
-    <string name="sms_assistant" msgid="8513548482745330818">"पाठ <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
-    <string name="sms_mms" msgid="5187888900503248542">"पाठ MMS"</string>
-    <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"प्रायः सम्पर्क भएकालाई हटाउने?"</string>
-    <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"तपाईंले सम्पर्कहरू र फोन अनुप्रयोगहरूमा बारम्बार सम्पर्क गरेको सूची खाली गर्नुहुनेछ र स्क्रयाचबाट तपाईंको ठेगाना प्राथमिकताहरू सिक्नको लागि इमेल अनुप्रयोगहरूलाई दबाब दिनुहुनेछ।"</string>
-    <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"बारम्बार सम्पर्क गरिएकाहरूलाई मेटाउँदै ..."</string>
-    <string name="status_available" msgid="2648156525685472626">"उपलब्ध"</string>
-    <string name="status_away" msgid="2298688367552893953">"टाढा"</string>
-    <string name="status_busy" msgid="5990832098713248503">"व्यस्त"</string>
-    <string name="contactsList" msgid="8806067891419291513">"सम्पर्क"</string>
-    <string name="contact_suggestions" msgid="3324166754807120006">"सबैभन्दा धेरै सुझाव दिइएको"</string>
-    <string name="local_invisible_directory" msgid="4723238462733650090">"अन्य"</string>
-    <string name="directory_search_label" msgid="4621215895484025229">"निर्देशिका"</string>
-    <string name="directory_search_label_work" msgid="7679326282707414897">"कार्यको निर्देशिका"</string>
-    <string name="local_search_label" msgid="907622822323119235">"सबै सम्पर्कहरू"</string>
-    <string name="local_suggestions_search_label" msgid="1178575146224386118">"सुझावहरू"</string>
-    <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"म"</string>
-    <string name="missing_name" msgid="978606963362745020">"(नाम छैन)"</string>
-    <string name="description_view_contact_detail" msgid="2428742401208561136">"सम्पर्क हेर्नुहोस्"</string>
-    <string name="list_filter_phones" msgid="8763316061763437182">"फोन नम्बर भएका सबै सम्पर्कहरू"</string>
-    <string name="list_filter_phones_work" msgid="7083575404573422965">"कार्य प्रोफाइलका सम्पर्कहरू"</string>
-    <string name="view_updates_from_group" msgid="9011641093168385729">"अद्यावधिकहरू अवलोकन गर्नुहोस्"</string>
-    <string name="account_phone" msgid="7067809073194061035">"यन्त्रमा-मात्र, सिङ्क नभएको"</string>
-    <string name="nameLabelsGroup" msgid="7730465833159557471">"नाम"</string>
-    <string name="nicknameLabelsGroup" msgid="6310556912361840029">"उपनाम"</string>
-    <string name="full_name" msgid="648186563998465740">"नाम"</string>
-    <string name="name_given" msgid="5096576006314820536">"नाम"</string>
-    <string name="name_family" msgid="6646235805198547467">"थर"</string>
-    <string name="name_prefix" msgid="9215326539658838">"नाम उपसर्ग"</string>
-    <string name="name_middle" msgid="703755205331582769">"बिचको नाम"</string>
-    <string name="name_suffix" msgid="5777083390282548702">"नाम प्रत्यय"</string>
-    <string name="name_phonetic" msgid="1650870996361663089">"फोनेटिक नाम"</string>
-    <string name="name_phonetic_given" msgid="618812334274603170">"फोनेटिक नाम"</string>
-    <string name="name_phonetic_middle" msgid="4826820763384625538">"फोनेटिक मध्य नाम"</string>
-    <string name="name_phonetic_family" msgid="379905191212930771">"फोनेटिक थर"</string>
-    <string name="phoneLabelsGroup" msgid="169661929021355548">"फोन"</string>
-    <string name="emailLabelsGroup" msgid="2249752810477488833">"इमेल गर्नुहोस्"</string>
-    <string name="postalLabelsGroup" msgid="6772000590189142253">"ठेगाना"</string>
-    <string name="imLabelsGroup" msgid="5718066254237364731">"IM"</string>
-    <string name="organizationLabelsGroup" msgid="1101996309241601435">"संगठन"</string>
-    <string name="relationLabelsGroup" msgid="53866051664600053">"सम्बन्ध"</string>
-    <string name="eventLabelsGroup" msgid="1236970042646618489">"विशेष मिति"</string>
-    <string name="sms" msgid="7574344928185328095">"पाठ सन्देश"</string>
-    <string name="postal_address" msgid="1804707930129674200">"ठेगाना"</string>
-    <string name="ghostData_company" msgid="2554310786296833424">"कम्पनी"</string>
-    <string name="ghostData_title" msgid="4994968731830184837">"शीर्षक"</string>
-    <string name="label_notes" msgid="2050255313694219786">"टिप्पणीहरू"</string>
-    <string name="label_sip_address" msgid="8883266182575965926">"SIP"</string>
-    <string name="websiteLabelsGroup" msgid="1630734286462186790">"वेबसाइट"</string>
-    <string name="groupsLabel" msgid="2694002798416868728">"समूहहरू"</string>
-    <string name="email_home" msgid="889830029388962171">"घरमा इमेल गर्नुहोस्"</string>
-    <string name="email_mobile" msgid="4487686436743741150">"इमेल मोबाइल"</string>
-    <string name="email_work" msgid="4223487303344613528">"काममा इमेल गर्नुहोस्"</string>
-    <string name="email_other" msgid="4246411900126012062">"इमेल गर्नुहोस्"</string>
-    <string name="email_custom" msgid="7246580894327511013">"<xliff:g id="CUSTOM">%s</xliff:g>लाई इमेल गर्नुहोस्"</string>
-    <string name="email" msgid="2807318537887091606">"इमेल गर्नुहोस्"</string>
-    <string name="postal_street" msgid="6918171741240802474">"सडक"</string>
-    <string name="postal_city" msgid="8674569121430005628">"शहर"</string>
-    <string name="postal_region" msgid="1730369286225469192">"स्थिति"</string>
-    <string name="postal_postcode" msgid="4450700741261990439">"ZIP कोड"</string>
-    <string name="postal_country" msgid="232670707458768148">"देश"</string>
-    <string name="map_home" msgid="4181131107392126938">"घरको ठेगाना हेर्नुहोस्"</string>
-    <string name="map_work" msgid="5723471185992684400">"कामको ठेगाना हेर्नुहोस्"</string>
-    <string name="map_other" msgid="2253764780863500516">"ठेगाना हेर्नुहोस्"</string>
-    <string name="map_custom" msgid="5581743097882436157">"<xliff:g id="CUSTOM">%s</xliff:g> ठेगाना हेर्नुहोस्"</string>
-    <string name="chat_aim" msgid="2954364435497941659">"AIM को प्रयोग गरेर च्याट गर्नुहोस्"</string>
-    <string name="chat_msn" msgid="3130135239071228678">"विन्डोज लाइभ चलाई कुराकानी गर्नुहोस्"</string>
-    <string name="chat_yahoo" msgid="3233552142326865347">"याहुको प्रयोग गरेर च्याट गर्नुहोस्"</string>
-    <string name="chat_skype" msgid="6486703981390592425">"स्काइप चलाएर कुराकानी गर्नुहोस्"</string>
-    <string name="chat_qq" msgid="786924280665740019">"QQ चलाएर कुराकानी गर्नुहोस्"</string>
-    <string name="chat_gtalk" msgid="7914674177243078035">"Google टक चलाएर कुराकानी गर्नुहोस्"</string>
-    <string name="chat_icq" msgid="3292934726414765801">"ICQको प्रयोग गरेर च्याट गर्नुहोस्"</string>
-    <string name="chat_jabber" msgid="6701542313597880204">"जाब्बरको प्रयोग गरेर च्याट गर्नुहोस्"</string>
-    <string name="chat" msgid="1020428260359370236">"कुराकानी"</string>
-    <string name="list_filter_all_accounts" msgid="473782314881473992">"सबै सम्पर्कहरू"</string>
-    <string name="listAllContactsInAccount" msgid="3486378621592995630">"<xliff:g id="NAME">%s</xliff:g>मा सम्पर्कहरू"</string>
-    <string name="listCustomView" msgid="5306282632413086731">"कस्टम दृश्यमा रहेका सम्पर्कहरू"</string>
-    <string name="listSingleContact" msgid="8620818791932382627">"एकल सम्पर्क"</string>
-    <string name="display_options_sort_list_by" msgid="3541875948367831228">"क्रमवद्घ गर्नुहोस्"</string>
-    <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"नाम"</string>
-    <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"थर"</string>
-    <string name="display_options_view_names_as" msgid="4204204205736735618">"नामको ढाँचा"</string>
-    <string name="display_options_view_given_name_first" msgid="2308026973021171020">"नाम पहिले"</string>
-    <string name="display_options_view_family_name_first" msgid="987430497292428242">"थर पहिले"</string>
-    <string name="menu_clear_frequents" msgid="5358271535047496120">"बारम्बारताहरू हटाउनुहोस्"</string>
-    <string name="action_menu_back_from_search" msgid="3550669942742167644">"खोजी गर्न  रोक्नुहोस्"</string>
-    <string name="description_clear_search" msgid="2347258825265600782">"खोजी सफा गर्नुहोस्"</string>
-    <string name="select_account_dialog_title" msgid="2673504582803359239">"खाता"</string>
-    <string name="set_default_account" msgid="7966099951006467572">"कल गर्नका लागि यसको प्रयोग सधैं गर्नुहोस्"</string>
-    <string name="select_phone_account_for_calls" msgid="1784460686103423274">"संग कल"</string>
-    <string name="call_with_a_note" msgid="6242261320491851133">"टिप्पणीसँगै कल गर्नुहोस्"</string>
-    <string name="call_subject_hint" msgid="7233138753650420800">"यस कलसँग पठाउन एक टिप्पणी  टाइप गर्नुहोस्"</string>
-    <string name="send_and_call_button" msgid="4735168294120154013">"पठाउनुहोस् र कल गर्नुहोस्"</string>
-    <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="tab_title" msgid="3387876802026074288">"<xliff:g id="TITLE">%1$s</xliff:g> ट्याब।"</string>
-    <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
-      <item quantity="other"> <xliff:g id="TITLE_2">%1$s</xliff:g> ट्याब। <xliff:g id="COUNT_3">%2$d</xliff:g> नपढिएका वस्तुहरू। </item>
-      <item quantity="one"> <xliff:g id="TITLE_0">%1$s</xliff:g> ट्याब। <xliff:g id="COUNT_1">%2$d</xliff:g> नपढिएको वस्तु। </item>
-    </plurals>
-    <string name="description_search_video_call" msgid="4337369876888024909">"भिडियो कल"</string>
-    <string name="description_search_call_and_share" msgid="4912772842755050467">"आदान-प्रदान र कल गर्नुहोस्"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_custom">%s लाई कल गर्नुहोस्</string>
+  <string name="call_home">घरमा कल गर्नुहोस्</string>
+  <string name="call_mobile">मोबाइलमा कल गर्नुहोस्</string>
+  <string name="call_work">काममा कल गर्नुहोस्</string>
+  <string name="call_fax_work">कामको फ्याक्समा कल गर्नुहोस्</string>
+  <string name="call_fax_home">घरको फ्याक्समा कल गर्नुहोस्</string>
+  <string name="call_pager">पेजरलाई कल गर्नुहोस्</string>
+  <string name="call_other">कल गर्नुहोस्</string>
+  <string name="call_callback">कलब्याक कल गर्नुहोस्</string>
+  <string name="call_car">कारलाई कल गर्नुहोस्</string>
+  <string name="call_company_main">कम्पनी मूललाई कल गर्नुहोस्</string>
+  <string name="call_isdn">ISDN कल गर्नुहोस्</string>
+  <string name="call_main">मुख्यलाई कल गर्नुहोस्</string>
+  <string name="call_other_fax">फ्याक्सलाई कल गर्नुहोस्</string>
+  <string name="call_radio">रेडियोमा कल गर्नुहोस्</string>
+  <string name="call_telex">टेलेक्सलाई कल गर्नुहोस्</string>
+  <string name="call_tty_tdd">TTY/TDD लाई कल गर्नुहोस्</string>
+  <string name="call_work_mobile">काम मोबाइलमा कल गर्नुहोस्</string>
+  <string name="call_work_pager">काम पेजरमा कल गर्नुहोस्</string>
+  <string name="call_assistant">%s लाई कल गर्नुहोस्</string>
+  <string name="call_mms">MMS लाई कल गर्नुहोस्</string>
+  <string name="sms_custom">पाठ %s</string>
+  <string name="sms_home">पाठ घर</string>
+  <string name="sms_mobile">पाठ मोबाइल</string>
+  <string name="sms_work">पाठ काम</string>
+  <string name="sms_fax_work">पाठ काम फ्याक्स</string>
+  <string name="sms_fax_home">पाठ घर फ्याक्स</string>
+  <string name="sms_pager">पाठ पेजर</string>
+  <string name="sms_other">पाठ</string>
+  <string name="sms_callback">पाठ कलब्याक</string>
+  <string name="sms_car">पाठ कार</string>
+  <string name="sms_company_main">पाठ कम्पनी मूल</string>
+  <string name="sms_isdn">पाठ ISDN</string>
+  <string name="sms_main">पाठ मुख्य</string>
+  <string name="sms_other_fax">पाठ फ्याक्स</string>
+  <string name="sms_radio">पाठ रेडियो</string>
+  <string name="sms_telex">पाठ टेलेक्स</string>
+  <string name="sms_tty_tdd">पाठ TTY/TDD</string>
+  <string name="sms_work_mobile">पाठ काम मोबाइल</string>
+  <string name="sms_work_pager">पाठ काम पेजर</string>
+  <string name="sms_assistant">पाठ %s</string>
+  <string name="sms_mms">पाठ MMS</string>
+  <string name="clearFrequentsConfirmation_title">प्रायः सम्पर्क भएकालाई हटाउने?</string>
+  <string name="clearFrequentsConfirmation">तपाईंले सम्पर्कहरू र फोन अनुप्रयोगहरूमा बारम्बार सम्पर्क गरेको सूची खाली गर्नुहुनेछ र स्क्रयाचबाट तपाईंको ठेगाना प्राथमिकताहरू सिक्नको लागि इमेल अनुप्रयोगहरूलाई दबाब दिनुहुनेछ।</string>
+  <string name="clearFrequentsProgress_title">बारम्बार सम्पर्क गरिएकाहरूलाई मेटाउँदै ...</string>
+  <string name="status_available">उपलब्ध</string>
+  <string name="status_away">टाढा</string>
+  <string name="status_busy">व्यस्त</string>
+  <string name="contactsList">सम्पर्क</string>
+  <string name="contact_suggestions">सबैभन्दा धेरै सुझाव दिइएको</string>
+  <string name="local_invisible_directory">अन्य</string>
+  <string name="directory_search_label">निर्देशिका</string>
+  <string name="directory_search_label_work">कार्यको निर्देशिका</string>
+  <string name="local_search_label">सबै सम्पर्कहरू</string>
+  <string name="local_suggestions_search_label">सुझावहरू</string>
+  <string msgid="9154761216179882405" name="user_profile_contacts_list_header">म</string>
+  <string name="missing_name">(नाम छैन)</string>
+  <string msgid="2795575601596468581" name="description_view_contact_detail">सम्पर्क हेर्नुहोस्</string>
+  <string name="list_filter_phones">फोन नम्बर भएका सबै सम्पर्कहरू</string>
+  <string name="list_filter_phones_work">कार्य प्रोफाइलका सम्पर्कहरू</string>
+  <string name="view_updates_from_group">अद्यावधिकहरू अवलोकन गर्नुहोस्</string>
+  <string name="account_phone">यन्त्रमा-मात्र, सिङ्क नभएको</string>
+  <string name="nameLabelsGroup">नाम</string>
+  <string name="nicknameLabelsGroup">उपनाम</string>
+  <string name="full_name">नाम</string>
+  <string name="name_given">नाम</string>
+  <string name="name_family">थर</string>
+  <string name="name_prefix">नाम उपसर्ग</string>
+  <string name="name_middle">बिचको नाम</string>
+  <string name="name_suffix">नाम प्रत्यय</string>
+  <string name="name_phonetic">फोनेटिक नाम</string>
+  <string name="name_phonetic_given">फोनेटिक नाम</string>
+  <string name="name_phonetic_middle">फोनेटिक मध्य नाम</string>
+  <string name="name_phonetic_family">फोनेटिक थर</string>
+  <string name="phoneLabelsGroup">फोन</string>
+  <string name="emailLabelsGroup">इमेल गर्नुहोस्</string>
+  <string name="postalLabelsGroup">ठेगाना</string>
+  <string name="imLabelsGroup">IM</string>
+  <string name="organizationLabelsGroup">संगठन</string>
+  <string name="relationLabelsGroup">सम्बन्ध</string>
+  <string name="eventLabelsGroup">विशेष मिति</string>
+  <string name="sms">पाठ सन्देश</string>
+  <string name="postal_address">ठेगाना</string>
+  <string name="ghostData_company">कम्पनी</string>
+  <string name="ghostData_title">शीर्षक</string>
+  <string name="label_notes">टिप्पणीहरू</string>
+  <string name="label_sip_address">SIP</string>
+  <string name="websiteLabelsGroup">वेबसाइट</string>
+  <string name="groupsLabel">समूहहरू</string>
+  <string name="email_home">घरमा इमेल गर्नुहोस्</string>
+  <string name="email_mobile">इमेल मोबाइल</string>
+  <string name="email_work">काममा इमेल गर्नुहोस्</string>
+  <string name="email_other">इमेल गर्नुहोस्</string>
+  <string name="email_custom">%sलाई इमेल गर्नुहोस्</string>
+  <string name="email">इमेल गर्नुहोस्</string>
+  <string name="postal_street">सडक</string>
+  <string name="postal_city">शहर</string>
+  <string name="postal_region">स्थिति</string>
+  <string name="postal_postcode">ZIP कोड</string>
+  <string name="postal_country">देश</string>
+  <string name="map_home">घरको ठेगाना हेर्नुहोस्</string>
+  <string name="map_work">कामको ठेगाना हेर्नुहोस्</string>
+  <string name="map_other">ठेगाना हेर्नुहोस्</string>
+  <string name="map_custom">%s ठेगाना हेर्नुहोस्</string>
+  <string name="chat_aim">AIM को प्रयोग गरेर च्याट गर्नुहोस्</string>
+  <string name="chat_msn">विन्डोज लाइभ चलाई कुराकानी गर्नुहोस्</string>
+  <string name="chat_yahoo">याहुको प्रयोग गरेर च्याट गर्नुहोस्</string>
+  <string name="chat_skype">स्काइप चलाएर कुराकानी गर्नुहोस्</string>
+  <string name="chat_qq">QQ चलाएर कुराकानी गर्नुहोस्</string>
+  <string name="chat_gtalk">Google टक चलाएर कुराकानी गर्नुहोस्</string>
+  <string name="chat_icq">ICQको प्रयोग गरेर च्याट गर्नुहोस्</string>
+  <string name="chat_jabber">जाब्बरको प्रयोग गरेर च्याट गर्नुहोस्</string>
+  <string name="chat">कुराकानी</string>
+  <string name="list_filter_all_accounts">सबै सम्पर्कहरू</string>
+  <string name="listAllContactsInAccount">%sमा सम्पर्कहरू</string>
+  <string name="listCustomView">कस्टम दृश्यमा रहेका सम्पर्कहरू</string>
+  <string name="listSingleContact">एकल सम्पर्क</string>
+  <string name="display_options_sort_list_by">क्रमवद्घ गर्नुहोस्</string>
+  <string name="display_options_sort_by_given_name">नाम</string>
+  <string name="display_options_sort_by_family_name">थर</string>
+  <string name="display_options_view_names_as">नामको ढाँचा</string>
+  <string name="display_options_view_given_name_first">नाम पहिले</string>
+  <string name="display_options_view_family_name_first">थर पहिले</string>
+  <string name="menu_clear_frequents">बारम्बारताहरू हटाउनुहोस्</string>
+  <string name="action_menu_back_from_search">खोजी गर्न  रोक्नुहोस्</string>
+  <string name="description_clear_search">खोजी सफा गर्नुहोस्</string>
+  <string name="select_account_dialog_title">खाता</string>
+  <string name="set_default_account">कल गर्नका लागि यसको प्रयोग सधैं गर्नुहोस्</string>
+  <string name="select_phone_account_for_calls">यो कल गर्न SIM छनौट गर्नुहोस्</string>
+  <string name="select_phone_account_for_calls_remember">यो रोजाइ याद राख्नुहोला</string>
+  <string name="call_with_a_note">टिप्पणीसँगै कल गर्नुहोस्</string>
+  <string name="call_subject_hint">यस कलसँग पठाउन एक टिप्पणी  टाइप गर्नुहोस्</string>
+  <string name="send_and_call_button">पठाउनुहोस् र कल गर्नुहोस्</string>
+  <string name="call_subject_limit">%1$s / %2$s</string>
+  <string name="old_call_subject_type_and_number">%1$s %2$s</string>
+  <string name="tab_title">%1$s ट्याब।</string>
+  <plurals name="tab_title_with_unread_items">
+    <item quantity="one"> %1$s ट्याब। %2$d नपढिएको वस्तु। </item>
+    <item quantity="other"> %1$s ट्याब। %2$d नपढिएका वस्तुहरू। </item>
+  </plurals>
+  <string name="description_search_video_call">भिडियो कल</string>
+  <string name="description_search_call_and_share">आदान प्रदान र कल गर्नुहोस्</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-nl/strings.xml b/java/com/android/contacts/common/res/values-nl/strings.xml
index 9fd2415..f16aa09 100644
--- a/java/com/android/contacts/common/res/values-nl/strings.xml
+++ b/java/com/android/contacts/common/res/values-nl/strings.xml
@@ -1,162 +1,145 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="toast_text_copied" msgid="8979281391599667362">"Tekst gekopieerd"</string>
-    <string name="call_custom" msgid="3041673234638990874">"<xliff:g id="CUSTOM">%s</xliff:g> bellen"</string>
-    <string name="call_home" msgid="125893483593803791">"Privé bellen"</string>
-    <string name="call_mobile" msgid="967589404494150813">"Mobiel bellen"</string>
-    <string name="call_work" msgid="6040550697395300892">"Werk bellen"</string>
-    <string name="call_fax_work" msgid="5260192771364592922">"Fax werk bellen"</string>
-    <string name="call_fax_home" msgid="5174311195081144124">"Fax privé bellen"</string>
-    <string name="call_pager" msgid="6814149227741274161">"Pager bellen"</string>
-    <string name="call_other" msgid="5536385588712587235">"Bellen"</string>
-    <string name="call_callback" msgid="6314019862718112786">"Terugbelnummer bellen"</string>
-    <string name="call_car" msgid="3197417098027764954">"Auto bellen"</string>
-    <string name="call_company_main" msgid="2557663310028446397">"Hoofdnummer bedrijf bellen"</string>
-    <string name="call_isdn" msgid="4691270442763649522">"ISDN bellen"</string>
-    <string name="call_main" msgid="3293707608770407814">"Hoofdnummer bellen"</string>
-    <string name="call_other_fax" msgid="4724521984879021465">"Fax bellen"</string>
-    <string name="call_radio" msgid="8942441419845057942">"Radio bellen"</string>
-    <string name="call_telex" msgid="2031514461660668351">"Telex bellen"</string>
-    <string name="call_tty_tdd" msgid="7807210224965727701">"TTY/TDD bellen"</string>
-    <string name="call_work_mobile" msgid="2716342732938578495">"Mobiel nummer werk bellen"</string>
-    <string name="call_work_pager" msgid="3791778749827366574">"Pager werk bellen"</string>
-    <string name="call_assistant" msgid="4177478845473789294">"<xliff:g id="ASSISTANT">%s</xliff:g> bellen"</string>
-    <string name="call_mms" msgid="4958811711741872901">"MMS bellen"</string>
-    <string name="sms_custom" msgid="8785368968605026317">"Sms\'en naar <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="sms_home" msgid="3527719551060295243">"Sms\'en naar huis"</string>
-    <string name="sms_mobile" msgid="8883045857887736518">"Sms\'en naar mobiel"</string>
-    <string name="sms_work" msgid="4158595439553450966">"Sms\'en naar werk"</string>
-    <string name="sms_fax_work" msgid="5483726627718055248">"Sms\'en naar fax werk"</string>
-    <string name="sms_fax_home" msgid="9219265155770746077">"Sms\'en naar fax privé"</string>
-    <string name="sms_pager" msgid="4901085068525193933">"Sms\'en naar pager"</string>
-    <string name="sms_other" msgid="1742702947993285933">"Sms\'en"</string>
-    <string name="sms_callback" msgid="5833483630377538308">"Sms\'en naar terugbelnummer"</string>
-    <string name="sms_car" msgid="4314577266154395174">"Sms\'en naar auto"</string>
-    <string name="sms_company_main" msgid="2308160928487360705">"Sms\'en naar hoofdnummer bedrijf"</string>
-    <string name="sms_isdn" msgid="6394300346179302542">"Sms\'en naar ISDN"</string>
-    <string name="sms_main" msgid="8908087742014140774">"Sms\'en naar hoofdnummer"</string>
-    <string name="sms_other_fax" msgid="8768455473295405427">"Sms\'en naar fax"</string>
-    <string name="sms_radio" msgid="855555176531704682">"Sms\'en naar radio"</string>
-    <string name="sms_telex" msgid="6269029276223252719">"Sms\'en naar telex"</string>
-    <string name="sms_tty_tdd" msgid="6229057354509192444">"Sms\'en naar TTY/TDD"</string>
-    <string name="sms_work_mobile" msgid="2155975469329969840">"Sms\'en naar mobiel nummer werk"</string>
-    <string name="sms_work_pager" msgid="8500140274906830742">"Sms\'en naar pager werk"</string>
-    <string name="sms_assistant" msgid="8513548482745330818">"Sms\'en naar <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
-    <string name="sms_mms" msgid="5187888900503248542">"Sms\'en naar MMS"</string>
-    <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"Lijst regelmatige contacten wissen?"</string>
-    <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"Je wist de lijst met contacten waarmee je regelmatig contact opneemt in de apps Contacten en Telefoon, en e-mailapps moeten je voorkeursadressen weer opnieuw leren."</string>
-    <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"Regelmatige contacten wissen..."</string>
-    <string name="status_available" msgid="2648156525685472626">"Beschikbaar"</string>
-    <string name="status_away" msgid="2298688367552893953">"Niet beschikbaar"</string>
-    <string name="status_busy" msgid="5990832098713248503">"Bezet"</string>
-    <string name="contactsList" msgid="8806067891419291513">"Contacten"</string>
-    <string name="contact_suggestions" msgid="3324166754807120006">"Populaire suggesties"</string>
-    <string name="local_invisible_directory" msgid="4723238462733650090">"Overig"</string>
-    <string name="directory_search_label" msgid="4621215895484025229">"Directory"</string>
-    <string name="directory_search_label_work" msgid="7679326282707414897">"Zakelijke contactenlijst"</string>
-    <string name="local_search_label" msgid="907622822323119235">"Alle contacten"</string>
-    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Suggesties"</string>
-    <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Ik"</string>
-    <string name="missing_name" msgid="978606963362745020">"(Geen naam)"</string>
-    <string name="description_view_contact_detail" msgid="2428742401208561136">"Contact weergeven"</string>
-    <string name="list_filter_phones" msgid="8763316061763437182">"Alle contacten met telefoonnummers"</string>
-    <string name="list_filter_phones_work" msgid="7083575404573422965">"Contacten uit werkprofiel"</string>
-    <string name="view_updates_from_group" msgid="9011641093168385729">"Updates bekijken"</string>
-    <string name="account_phone" msgid="7067809073194061035">"Alleen op apparaat, niet gesynchroniseerd"</string>
-    <string name="nameLabelsGroup" msgid="7730465833159557471">"Naam"</string>
-    <string name="nicknameLabelsGroup" msgid="6310556912361840029">"Bijnaam"</string>
-    <string name="full_name" msgid="648186563998465740">"Naam"</string>
-    <string name="name_given" msgid="5096576006314820536">"Voornaam"</string>
-    <string name="name_family" msgid="6646235805198547467">"Achternaam"</string>
-    <string name="name_prefix" msgid="9215326539658838">"Voorvoegsel van naam"</string>
-    <string name="name_middle" msgid="703755205331582769">"Tweede voornaam"</string>
-    <string name="name_suffix" msgid="5777083390282548702">"Achtervoegsel van naam"</string>
-    <string name="name_phonetic" msgid="1650870996361663089">"Fonetische naam"</string>
-    <string name="name_phonetic_given" msgid="618812334274603170">"Fonetische voornaam"</string>
-    <string name="name_phonetic_middle" msgid="4826820763384625538">"Fonetische tweede voornaam"</string>
-    <string name="name_phonetic_family" msgid="379905191212930771">"Fonetische achternaam"</string>
-    <string name="phoneLabelsGroup" msgid="169661929021355548">"Telefoon"</string>
-    <string name="emailLabelsGroup" msgid="2249752810477488833">"E-mailen"</string>
-    <string name="postalLabelsGroup" msgid="6772000590189142253">"Adres"</string>
-    <string name="imLabelsGroup" msgid="5718066254237364731">"IM"</string>
-    <string name="organizationLabelsGroup" msgid="1101996309241601435">"Organisatie"</string>
-    <string name="relationLabelsGroup" msgid="53866051664600053">"Relatie"</string>
-    <string name="eventLabelsGroup" msgid="1236970042646618489">"Speciale datum"</string>
-    <string name="sms" msgid="7574344928185328095">"Sms-bericht"</string>
-    <string name="postal_address" msgid="1804707930129674200">"Adres"</string>
-    <string name="ghostData_company" msgid="2554310786296833424">"Bedrijf"</string>
-    <string name="ghostData_title" msgid="4994968731830184837">"Titel"</string>
-    <string name="label_notes" msgid="2050255313694219786">"Notities"</string>
-    <string name="label_sip_address" msgid="8883266182575965926">"SIP"</string>
-    <string name="websiteLabelsGroup" msgid="1630734286462186790">"Website"</string>
-    <string name="groupsLabel" msgid="2694002798416868728">"Groepen"</string>
-    <string name="email_home" msgid="889830029388962171">"E-mailen naar huis"</string>
-    <string name="email_mobile" msgid="4487686436743741150">"E-mailen naar mobiel"</string>
-    <string name="email_work" msgid="4223487303344613528">"E-mailen naar werk"</string>
-    <string name="email_other" msgid="4246411900126012062">"E-mailen"</string>
-    <string name="email_custom" msgid="7246580894327511013">"E-mailen naar <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="email" msgid="2807318537887091606">"E-mailen"</string>
-    <string name="postal_street" msgid="6918171741240802474">"Straat"</string>
-    <string name="postal_city" msgid="8674569121430005628">"Stad"</string>
-    <string name="postal_region" msgid="1730369286225469192">"Staat"</string>
-    <string name="postal_postcode" msgid="4450700741261990439">"Postcode"</string>
-    <string name="postal_country" msgid="232670707458768148">"Land"</string>
-    <string name="map_home" msgid="4181131107392126938">"Thuisadres weergeven"</string>
-    <string name="map_work" msgid="5723471185992684400">"Werkadres weergeven"</string>
-    <string name="map_other" msgid="2253764780863500516">"Adres weergeven"</string>
-    <string name="map_custom" msgid="5581743097882436157">"<xliff:g id="CUSTOM">%s</xliff:g> adres weergeven"</string>
-    <string name="chat_aim" msgid="2954364435497941659">"Chatten via AIM"</string>
-    <string name="chat_msn" msgid="3130135239071228678">"Chatten via Windows Live"</string>
-    <string name="chat_yahoo" msgid="3233552142326865347">"Chatten via Yahoo"</string>
-    <string name="chat_skype" msgid="6486703981390592425">"Chatten via Skype"</string>
-    <string name="chat_qq" msgid="786924280665740019">"Chatten via QQ"</string>
-    <string name="chat_gtalk" msgid="7914674177243078035">"Chatten via Google Talk"</string>
-    <string name="chat_icq" msgid="3292934726414765801">"Chatten via ICQ"</string>
-    <string name="chat_jabber" msgid="6701542313597880204">"Chatten via Jabber"</string>
-    <string name="chat" msgid="1020428260359370236">"Chat"</string>
-    <string name="list_filter_all_accounts" msgid="473782314881473992">"Alle contacten"</string>
-    <string name="listAllContactsInAccount" msgid="3486378621592995630">"Contacten in <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="listCustomView" msgid="5306282632413086731">"Contacten in aangepaste weergave"</string>
-    <string name="listSingleContact" msgid="8620818791932382627">"Eén contact"</string>
-    <string name="display_options_sort_list_by" msgid="3541875948367831228">"Sorteren op"</string>
-    <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"Voornaam"</string>
-    <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"Achternaam"</string>
-    <string name="display_options_view_names_as" msgid="4204204205736735618">"Naamindeling"</string>
-    <string name="display_options_view_given_name_first" msgid="2308026973021171020">"Voornaam eerst"</string>
-    <string name="display_options_view_family_name_first" msgid="987430497292428242">"Achternaam eerst"</string>
-    <string name="menu_clear_frequents" msgid="5358271535047496120">"Regelmatige contacten wissen"</string>
-    <string name="action_menu_back_from_search" msgid="3550669942742167644">"stoppen met zoeken"</string>
-    <string name="description_clear_search" msgid="2347258825265600782">"Zoekopdracht wissen"</string>
-    <string name="select_account_dialog_title" msgid="2673504582803359239">"Account"</string>
-    <string name="set_default_account" msgid="7966099951006467572">"Altijd gebruiken voor oproepen"</string>
-    <string name="select_phone_account_for_calls" msgid="1784460686103423274">"Bellen met"</string>
-    <string name="call_with_a_note" msgid="6242261320491851133">"Oproep met een notitie"</string>
-    <string name="call_subject_hint" msgid="7233138753650420800">"Typ een notitie om te verzenden met de oproep..."</string>
-    <string name="send_and_call_button" msgid="4735168294120154013">"VERZENDEN EN BELLEN"</string>
-    <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g>/<xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="tab_title" msgid="3387876802026074288">"Tabblad <xliff:g id="TITLE">%1$s</xliff:g>."</string>
-    <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
-      <item quantity="other">Tabblad <xliff:g id="TITLE_2">%1$s</xliff:g>. <xliff:g id="COUNT_3">%2$d</xliff:g> ongelezen items. </item>
-      <item quantity="one">Tabblad <xliff:g id="TITLE_0">%1$s</xliff:g>. <xliff:g id="COUNT_1">%2$d</xliff:g> ongelezen item. </item>
-    </plurals>
-    <string name="description_search_video_call" msgid="4337369876888024909">"Videogesprek"</string>
-    <string name="description_search_call_and_share" msgid="4912772842755050467">"Delen en bellen"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_custom">%s bellen</string>
+  <string name="call_home">Privé bellen</string>
+  <string name="call_mobile">Mobiel bellen</string>
+  <string name="call_work">Werk bellen</string>
+  <string name="call_fax_work">Fax werk bellen</string>
+  <string name="call_fax_home">Fax privé bellen</string>
+  <string name="call_pager">Pager bellen</string>
+  <string name="call_other">Bellen</string>
+  <string name="call_callback">Terugbelnummer bellen</string>
+  <string name="call_car">Auto bellen</string>
+  <string name="call_company_main">Hoofdnummer bedrijf bellen</string>
+  <string name="call_isdn">ISDN bellen</string>
+  <string name="call_main">Hoofdnummer bellen</string>
+  <string name="call_other_fax">Fax bellen</string>
+  <string name="call_radio">Radio bellen</string>
+  <string name="call_telex">Telex bellen</string>
+  <string name="call_tty_tdd">TTY/TDD bellen</string>
+  <string name="call_work_mobile">Mobiel nummer werk bellen</string>
+  <string name="call_work_pager">Pager werk bellen</string>
+  <string name="call_assistant">%s bellen</string>
+  <string name="call_mms">MMS bellen</string>
+  <string name="sms_custom">Sms\'en naar %s</string>
+  <string name="sms_home">Sms\'en naar huis</string>
+  <string name="sms_mobile">Sms\'en naar mobiel</string>
+  <string name="sms_work">Sms\'en naar werk</string>
+  <string name="sms_fax_work">Sms\'en naar fax werk</string>
+  <string name="sms_fax_home">Sms\'en naar fax privé</string>
+  <string name="sms_pager">Sms\'en naar pager</string>
+  <string name="sms_other">Sms\'en</string>
+  <string name="sms_callback">Sms\'en naar terugbelnummer</string>
+  <string name="sms_car">Sms\'en naar auto</string>
+  <string name="sms_company_main">Sms\'en naar hoofdnummer bedrijf</string>
+  <string name="sms_isdn">Sms\'en naar ISDN</string>
+  <string name="sms_main">Sms\'en naar hoofdnummer</string>
+  <string name="sms_other_fax">Sms\'en naar fax</string>
+  <string name="sms_radio">Sms\'en naar radio</string>
+  <string name="sms_telex">Sms\'en naar telex</string>
+  <string name="sms_tty_tdd">Sms\'en naar TTY/TDD</string>
+  <string name="sms_work_mobile">Sms\'en naar mobiel nummer werk</string>
+  <string name="sms_work_pager">Sms\'en naar pager werk</string>
+  <string name="sms_assistant">Sms\'en naar %s</string>
+  <string name="sms_mms">Sms\'en naar MMS</string>
+  <string name="clearFrequentsConfirmation_title">Lijst regelmatige contacten wissen?</string>
+  <string name="clearFrequentsConfirmation">Je wist de lijst met contacten waarmee je regelmatig contact opneemt in de apps Contacten en Telefoon, en e-mailapps moeten je voorkeursadressen weer opnieuw leren.</string>
+  <string name="clearFrequentsProgress_title">Regelmatige contacten wissen...</string>
+  <string name="status_available">Beschikbaar</string>
+  <string name="status_away">Niet beschikbaar</string>
+  <string name="status_busy">Bezet</string>
+  <string name="contactsList">Contacten</string>
+  <string name="contact_suggestions">Populaire suggesties</string>
+  <string name="local_invisible_directory">Overig</string>
+  <string name="directory_search_label">Directory</string>
+  <string name="directory_search_label_work">Zakelijke contactenlijst</string>
+  <string name="local_search_label">Alle contacten</string>
+  <string name="local_suggestions_search_label">Suggesties</string>
+  <string msgid="9154761216179882405" name="user_profile_contacts_list_header">Ik</string>
+  <string name="missing_name">(Geen naam)</string>
+  <string msgid="2795575601596468581" name="description_view_contact_detail">Contact weergeven</string>
+  <string name="list_filter_phones">Alle contacten met telefoonnummers</string>
+  <string name="list_filter_phones_work">Contacten uit werkprofiel</string>
+  <string name="view_updates_from_group">Updates bekijken</string>
+  <string name="account_phone">Alleen op apparaat, niet gesynchroniseerd</string>
+  <string name="nameLabelsGroup">Naam</string>
+  <string name="nicknameLabelsGroup">Bijnaam</string>
+  <string name="full_name">Naam</string>
+  <string name="name_given">Voornaam</string>
+  <string name="name_family">Achternaam</string>
+  <string name="name_prefix">Voorvoegsel van naam</string>
+  <string name="name_middle">Tweede voornaam</string>
+  <string name="name_suffix">Achtervoegsel van naam</string>
+  <string name="name_phonetic">Fonetische naam</string>
+  <string name="name_phonetic_given">Fonetische voornaam</string>
+  <string name="name_phonetic_middle">Fonetische tweede voornaam</string>
+  <string name="name_phonetic_family">Fonetische achternaam</string>
+  <string name="phoneLabelsGroup">Telefoon</string>
+  <string name="emailLabelsGroup">E-mailen</string>
+  <string name="postalLabelsGroup">Adres</string>
+  <string name="imLabelsGroup">IM</string>
+  <string name="organizationLabelsGroup">Organisatie</string>
+  <string name="relationLabelsGroup">Relatie</string>
+  <string name="eventLabelsGroup">Speciale datum</string>
+  <string name="sms">Sms-bericht</string>
+  <string name="postal_address">Adres</string>
+  <string name="ghostData_company">Bedrijf</string>
+  <string name="ghostData_title">Titel</string>
+  <string name="label_notes">Notities</string>
+  <string name="label_sip_address">SIP</string>
+  <string name="websiteLabelsGroup">Website</string>
+  <string name="groupsLabel">Groepen</string>
+  <string name="email_home">E-mailen naar huis</string>
+  <string name="email_mobile">E-mailen naar mobiel</string>
+  <string name="email_work">E-mailen naar werk</string>
+  <string name="email_other">E-mailen</string>
+  <string name="email_custom">E-mailen naar %s</string>
+  <string name="email">E-mailen</string>
+  <string name="postal_street">Straat</string>
+  <string name="postal_city">Stad</string>
+  <string name="postal_region">Staat</string>
+  <string name="postal_postcode">Postcode</string>
+  <string name="postal_country">Land</string>
+  <string name="map_home">Thuisadres weergeven</string>
+  <string name="map_work">Werkadres weergeven</string>
+  <string name="map_other">Adres weergeven</string>
+  <string name="map_custom">%s adres weergeven</string>
+  <string name="chat_aim">Chatten via AIM</string>
+  <string name="chat_msn">Chatten via Windows Live</string>
+  <string name="chat_yahoo">Chatten via Yahoo</string>
+  <string name="chat_skype">Chatten via Skype</string>
+  <string name="chat_qq">Chatten via QQ</string>
+  <string name="chat_gtalk">Chatten via Google Talk</string>
+  <string name="chat_icq">Chatten via ICQ</string>
+  <string name="chat_jabber">Chatten via Jabber</string>
+  <string name="chat">Chat</string>
+  <string name="list_filter_all_accounts">Alle contacten</string>
+  <string name="listAllContactsInAccount">Contacten in %s</string>
+  <string name="listCustomView">Contacten in aangepaste weergave</string>
+  <string name="listSingleContact">Eén contact</string>
+  <string name="display_options_sort_list_by">Sorteren op</string>
+  <string name="display_options_sort_by_given_name">Voornaam</string>
+  <string name="display_options_sort_by_family_name">Achternaam</string>
+  <string name="display_options_view_names_as">Naamindeling</string>
+  <string name="display_options_view_given_name_first">Voornaam eerst</string>
+  <string name="display_options_view_family_name_first">Achternaam eerst</string>
+  <string name="menu_clear_frequents">Regelmatige contacten wissen</string>
+  <string name="action_menu_back_from_search">stoppen met zoeken</string>
+  <string name="description_clear_search">Zoekopdracht wissen</string>
+  <string name="select_account_dialog_title">Account</string>
+  <string name="set_default_account">Altijd gebruiken voor oproepen</string>
+  <string name="select_phone_account_for_calls">Simkaart voor deze oproep kiezen</string>
+  <string name="select_phone_account_for_calls_remember">Deze keuze onthouden</string>
+  <string name="call_with_a_note">Oproep met een notitie</string>
+  <string name="call_subject_hint">Typ een notitie om te verzenden met de oproep...</string>
+  <string name="send_and_call_button">VERZENDEN EN BELLEN</string>
+  <string name="call_subject_limit">%1$s/%2$s</string>
+  <string name="old_call_subject_type_and_number">%1$s %2$s</string>
+  <string name="tab_title">Tabblad %1$s.</string>
+  <plurals name="tab_title_with_unread_items">
+    <item quantity="one">Tabblad %1$s. %2$d ongelezen item. </item>
+    <item quantity="other">Tabblad %1$s. %2$d ongelezen items. </item>
+  </plurals>
+  <string name="description_search_video_call">Videogesprek</string>
+  <string name="description_search_call_and_share">Delen en bellen</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-no/strings.xml b/java/com/android/contacts/common/res/values-no/strings.xml
index 707033a..911dc0f 100644
--- a/java/com/android/contacts/common/res/values-no/strings.xml
+++ b/java/com/android/contacts/common/res/values-no/strings.xml
@@ -1,162 +1,145 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="toast_text_copied" msgid="8979281391599667362">"Tekst kopiert"</string>
-    <string name="call_custom" msgid="3041673234638990874">"Ring <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="call_home" msgid="125893483593803791">"Ring hjem"</string>
-    <string name="call_mobile" msgid="967589404494150813">"Ring mobilnummer"</string>
-    <string name="call_work" msgid="6040550697395300892">"Ring arbeidsnummer"</string>
-    <string name="call_fax_work" msgid="5260192771364592922">"Ring faksnummer (arbeid)"</string>
-    <string name="call_fax_home" msgid="5174311195081144124">"Ring faksnummer (hjemme)"</string>
-    <string name="call_pager" msgid="6814149227741274161">"Ring personsøkernummer"</string>
-    <string name="call_other" msgid="5536385588712587235">"Ring"</string>
-    <string name="call_callback" msgid="6314019862718112786">"Ring tilbakeringingsnummer"</string>
-    <string name="call_car" msgid="3197417098027764954">"Ring til bilnummer"</string>
-    <string name="call_company_main" msgid="2557663310028446397">"Ring til firma (hovednummer)"</string>
-    <string name="call_isdn" msgid="4691270442763649522">"Ring ISDN-nummer"</string>
-    <string name="call_main" msgid="3293707608770407814">"Ring hovednummer"</string>
-    <string name="call_other_fax" msgid="4724521984879021465">"Ring faksnummer"</string>
-    <string name="call_radio" msgid="8942441419845057942">"Ring radionummer"</string>
-    <string name="call_telex" msgid="2031514461660668351">"Ring teleksnummer"</string>
-    <string name="call_tty_tdd" msgid="7807210224965727701">"Ring TTY/TDD"</string>
-    <string name="call_work_mobile" msgid="2716342732938578495">"Ring mobilnummer (arbeid)"</string>
-    <string name="call_work_pager" msgid="3791778749827366574">"Ring personsøkernummer (arbeid)"</string>
-    <string name="call_assistant" msgid="4177478845473789294">"Ring <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
-    <string name="call_mms" msgid="4958811711741872901">"Ring multimediemeldingnummer"</string>
-    <string name="sms_custom" msgid="8785368968605026317">"Send tekstmelding til <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="sms_home" msgid="3527719551060295243">"Send tekstmelding til hjemmenummer"</string>
-    <string name="sms_mobile" msgid="8883045857887736518">"Send tekstmelding til mobilnummer"</string>
-    <string name="sms_work" msgid="4158595439553450966">"Send tekstmelding til arbeidsnummer"</string>
-    <string name="sms_fax_work" msgid="5483726627718055248">"Send tekstmelding til faksnummer (arbeid)"</string>
-    <string name="sms_fax_home" msgid="9219265155770746077">"Send tekstmelding til faksnummer (hjemme)"</string>
-    <string name="sms_pager" msgid="4901085068525193933">"Send tekstmelding til personsøkernummer"</string>
-    <string name="sms_other" msgid="1742702947993285933">"Send tekstmelding"</string>
-    <string name="sms_callback" msgid="5833483630377538308">"Send tekstmelding til tilbakeringingsnummer"</string>
-    <string name="sms_car" msgid="4314577266154395174">"Send tekstmelding til bilnummer"</string>
-    <string name="sms_company_main" msgid="2308160928487360705">"Send tekstmelding til firma (hovednummer)"</string>
-    <string name="sms_isdn" msgid="6394300346179302542">"Send tekstmelding til ISDN-nummer"</string>
-    <string name="sms_main" msgid="8908087742014140774">"Send tekstmelding til hovednummer"</string>
-    <string name="sms_other_fax" msgid="8768455473295405427">"Send tekstmelding til faksnummer"</string>
-    <string name="sms_radio" msgid="855555176531704682">"Send tekstmelding til radionummer"</string>
-    <string name="sms_telex" msgid="6269029276223252719">"Send tekstmelding til teleksnummer"</string>
-    <string name="sms_tty_tdd" msgid="6229057354509192444">"Send tekstmelding til TTY/TDD"</string>
-    <string name="sms_work_mobile" msgid="2155975469329969840">"Send tekstmelding til mobilnummer (arbeid)"</string>
-    <string name="sms_work_pager" msgid="8500140274906830742">"Send tekstmelding til personsøkernummer (arbeid)"</string>
-    <string name="sms_assistant" msgid="8513548482745330818">"Send tekstmelding til <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
-    <string name="sms_mms" msgid="5187888900503248542">"Send tekstmelding til multimediemeldingnummer"</string>
-    <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"Vil du fjerne ofte kontaktede personer?"</string>
-    <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"Du fjerner listen over ofte kontaktede personer i Kontakter- og Telefon-appene, og tvinger e-postappene til å lære seg adresseinnstillingene dine på nytt."</string>
-    <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"Fjerner ofte kontaktede personer ..."</string>
-    <string name="status_available" msgid="2648156525685472626">"Tilgjengelig"</string>
-    <string name="status_away" msgid="2298688367552893953">"Borte"</string>
-    <string name="status_busy" msgid="5990832098713248503">"Opptatt"</string>
-    <string name="contactsList" msgid="8806067891419291513">"Kontakter"</string>
-    <string name="contact_suggestions" msgid="3324166754807120006">"Toppforslag"</string>
-    <string name="local_invisible_directory" msgid="4723238462733650090">"Annen"</string>
-    <string name="directory_search_label" msgid="4621215895484025229">"Katalog"</string>
-    <string name="directory_search_label_work" msgid="7679326282707414897">"Jobbkatalog"</string>
-    <string name="local_search_label" msgid="907622822323119235">"Alle kontakter"</string>
-    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Forslag"</string>
-    <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Meg"</string>
-    <string name="missing_name" msgid="978606963362745020">"(Uten navn)"</string>
-    <string name="description_view_contact_detail" msgid="2428742401208561136">"Se kontakten"</string>
-    <string name="list_filter_phones" msgid="8763316061763437182">"Alle kontakter med telefonnumre"</string>
-    <string name="list_filter_phones_work" msgid="7083575404573422965">"Jobbprofilkontakter"</string>
-    <string name="view_updates_from_group" msgid="9011641093168385729">"Se oppdateringer"</string>
-    <string name="account_phone" msgid="7067809073194061035">"Bare på enheten din, uten synkronisering"</string>
-    <string name="nameLabelsGroup" msgid="7730465833159557471">"Navn"</string>
-    <string name="nicknameLabelsGroup" msgid="6310556912361840029">"Kallenavn"</string>
-    <string name="full_name" msgid="648186563998465740">"Navn"</string>
-    <string name="name_given" msgid="5096576006314820536">"Fornavn"</string>
-    <string name="name_family" msgid="6646235805198547467">"Etternavn"</string>
-    <string name="name_prefix" msgid="9215326539658838">"Navneprefiks"</string>
-    <string name="name_middle" msgid="703755205331582769">"Mellomnavn"</string>
-    <string name="name_suffix" msgid="5777083390282548702">"Navnesuffiks"</string>
-    <string name="name_phonetic" msgid="1650870996361663089">"Fonetisk navn"</string>
-    <string name="name_phonetic_given" msgid="618812334274603170">"Fonetisk fornavn"</string>
-    <string name="name_phonetic_middle" msgid="4826820763384625538">"Fonetisk mellomnavn"</string>
-    <string name="name_phonetic_family" msgid="379905191212930771">"Fonetisk etternavn"</string>
-    <string name="phoneLabelsGroup" msgid="169661929021355548">"Telefon"</string>
-    <string name="emailLabelsGroup" msgid="2249752810477488833">"Send e-post"</string>
-    <string name="postalLabelsGroup" msgid="6772000590189142253">"Adresse"</string>
-    <string name="imLabelsGroup" msgid="5718066254237364731">"Nettprat"</string>
-    <string name="organizationLabelsGroup" msgid="1101996309241601435">"Organisasjon"</string>
-    <string name="relationLabelsGroup" msgid="53866051664600053">"Tilknytning"</string>
-    <string name="eventLabelsGroup" msgid="1236970042646618489">"Spesialdato"</string>
-    <string name="sms" msgid="7574344928185328095">"SMS"</string>
-    <string name="postal_address" msgid="1804707930129674200">"Adresse"</string>
-    <string name="ghostData_company" msgid="2554310786296833424">"Firma"</string>
-    <string name="ghostData_title" msgid="4994968731830184837">"Stilling"</string>
-    <string name="label_notes" msgid="2050255313694219786">"Notater"</string>
-    <string name="label_sip_address" msgid="8883266182575965926">"SIP"</string>
-    <string name="websiteLabelsGroup" msgid="1630734286462186790">"Nettsted"</string>
-    <string name="groupsLabel" msgid="2694002798416868728">"Grupper"</string>
-    <string name="email_home" msgid="889830029388962171">"Send e-post (privat)"</string>
-    <string name="email_mobile" msgid="4487686436743741150">"Send e-post (mobil)"</string>
-    <string name="email_work" msgid="4223487303344613528">"Send e-post (jobb)"</string>
-    <string name="email_other" msgid="4246411900126012062">"Send e-post"</string>
-    <string name="email_custom" msgid="7246580894327511013">"Send e-post (<xliff:g id="CUSTOM">%s</xliff:g>)"</string>
-    <string name="email" msgid="2807318537887091606">"Send e-post"</string>
-    <string name="postal_street" msgid="6918171741240802474">"Gate"</string>
-    <string name="postal_city" msgid="8674569121430005628">"By"</string>
-    <string name="postal_region" msgid="1730369286225469192">"Fylke/delstat"</string>
-    <string name="postal_postcode" msgid="4450700741261990439">"Postnummer"</string>
-    <string name="postal_country" msgid="232670707458768148">"Land"</string>
-    <string name="map_home" msgid="4181131107392126938">"Se hjemmeadressen"</string>
-    <string name="map_work" msgid="5723471185992684400">"Se jobbadressen"</string>
-    <string name="map_other" msgid="2253764780863500516">"Se adressen"</string>
-    <string name="map_custom" msgid="5581743097882436157">"Se <xliff:g id="CUSTOM">%s</xliff:g>-adressen"</string>
-    <string name="chat_aim" msgid="2954364435497941659">"Nettprat med AIM"</string>
-    <string name="chat_msn" msgid="3130135239071228678">"Nettprat med Windows Live"</string>
-    <string name="chat_yahoo" msgid="3233552142326865347">"Nettprat med Yahoo"</string>
-    <string name="chat_skype" msgid="6486703981390592425">"Nettprat med Skype"</string>
-    <string name="chat_qq" msgid="786924280665740019">"Nettprat med QQ"</string>
-    <string name="chat_gtalk" msgid="7914674177243078035">"Nettprat med Google Talk"</string>
-    <string name="chat_icq" msgid="3292934726414765801">"Nettprat med ICQ"</string>
-    <string name="chat_jabber" msgid="6701542313597880204">"Nettprat med Jabber"</string>
-    <string name="chat" msgid="1020428260359370236">"Nettprat"</string>
-    <string name="list_filter_all_accounts" msgid="473782314881473992">"Alle kontakter"</string>
-    <string name="listAllContactsInAccount" msgid="3486378621592995630">"Kontakter i <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="listCustomView" msgid="5306282632413086731">"Kontakter i tilpasset visning"</string>
-    <string name="listSingleContact" msgid="8620818791932382627">"Enkeltkontakt"</string>
-    <string name="display_options_sort_list_by" msgid="3541875948367831228">"Sortér etter"</string>
-    <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"Fornavn"</string>
-    <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"Etternavn"</string>
-    <string name="display_options_view_names_as" msgid="4204204205736735618">"Navneformat"</string>
-    <string name="display_options_view_given_name_first" msgid="2308026973021171020">"Fornavnet først"</string>
-    <string name="display_options_view_family_name_first" msgid="987430497292428242">"Etternavnet først"</string>
-    <string name="menu_clear_frequents" msgid="5358271535047496120">"Fjern ofte kontaktede personer"</string>
-    <string name="action_menu_back_from_search" msgid="3550669942742167644">"avslutt søket"</string>
-    <string name="description_clear_search" msgid="2347258825265600782">"Slett søk"</string>
-    <string name="select_account_dialog_title" msgid="2673504582803359239">"Konto"</string>
-    <string name="set_default_account" msgid="7966099951006467572">"Bruk alltid dette for samtaler"</string>
-    <string name="select_phone_account_for_calls" msgid="1784460686103423274">"Ring med"</string>
-    <string name="call_with_a_note" msgid="6242261320491851133">"Ring med et notat"</string>
-    <string name="call_subject_hint" msgid="7233138753650420800">"Skriv et notat du vil sende med anropet …"</string>
-    <string name="send_and_call_button" msgid="4735168294120154013">"SEND OG RING"</string>
-    <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="tab_title" msgid="3387876802026074288">"<xliff:g id="TITLE">%1$s</xliff:g>-fanen."</string>
-    <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
-      <item quantity="other"> <xliff:g id="TITLE_2">%1$s</xliff:g>-fanen. <xliff:g id="COUNT_3">%2$d</xliff:g> uleste elementer. </item>
-      <item quantity="one"> <xliff:g id="TITLE_0">%1$s</xliff:g>-fanen. <xliff:g id="COUNT_1">%2$d</xliff:g> ulest element. </item>
-    </plurals>
-    <string name="description_search_video_call" msgid="4337369876888024909">"Videosamtale"</string>
-    <string name="description_search_call_and_share" msgid="4912772842755050467">"Del og ring"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_custom">Ring %s</string>
+  <string name="call_home">Ring hjem</string>
+  <string name="call_mobile">Ring mobilnummer</string>
+  <string name="call_work">Ring arbeidsnummer</string>
+  <string name="call_fax_work">Ring faksnummer (arbeid)</string>
+  <string name="call_fax_home">Ring faksnummer (hjemme)</string>
+  <string name="call_pager">Ring personsøkernummer</string>
+  <string name="call_other">Ring</string>
+  <string name="call_callback">Ring tilbakeringingsnummer</string>
+  <string name="call_car">Ring til bilnummer</string>
+  <string name="call_company_main">Ring til firma (hovednummer)</string>
+  <string name="call_isdn">Ring ISDN-nummer</string>
+  <string name="call_main">Ring hovednummer</string>
+  <string name="call_other_fax">Ring faksnummer</string>
+  <string name="call_radio">Ring radionummer</string>
+  <string name="call_telex">Ring teleksnummer</string>
+  <string name="call_tty_tdd">Ring TTY/TDD</string>
+  <string name="call_work_mobile">Ring mobilnummer (arbeid)</string>
+  <string name="call_work_pager">Ring personsøkernummer (arbeid)</string>
+  <string name="call_assistant">Ring %s</string>
+  <string name="call_mms">Ring multimediemeldingnummer</string>
+  <string name="sms_custom">Send tekstmelding til %s</string>
+  <string name="sms_home">Send tekstmelding til hjemmenummer</string>
+  <string name="sms_mobile">Send tekstmelding til mobilnummer</string>
+  <string name="sms_work">Send tekstmelding til arbeidsnummer</string>
+  <string name="sms_fax_work">Send tekstmelding til faksnummer (arbeid)</string>
+  <string name="sms_fax_home">Send tekstmelding til faksnummer (hjemme)</string>
+  <string name="sms_pager">Send tekstmelding til personsøkernummer</string>
+  <string name="sms_other">Send tekstmelding</string>
+  <string name="sms_callback">Send tekstmelding til tilbakeringingsnummer</string>
+  <string name="sms_car">Send tekstmelding til bilnummer</string>
+  <string name="sms_company_main">Send tekstmelding til firma (hovednummer)</string>
+  <string name="sms_isdn">Send tekstmelding til ISDN-nummer</string>
+  <string name="sms_main">Send tekstmelding til hovednummer</string>
+  <string name="sms_other_fax">Send tekstmelding til faksnummer</string>
+  <string name="sms_radio">Send tekstmelding til radionummer</string>
+  <string name="sms_telex">Send tekstmelding til teleksnummer</string>
+  <string name="sms_tty_tdd">Send tekstmelding til TTY/TDD</string>
+  <string name="sms_work_mobile">Send tekstmelding til mobilnummer (arbeid)</string>
+  <string name="sms_work_pager">Send tekstmelding til personsøkernummer (arbeid)</string>
+  <string name="sms_assistant">Send tekstmelding til %s</string>
+  <string name="sms_mms">Send tekstmelding til multimediemeldingnummer</string>
+  <string name="clearFrequentsConfirmation_title">Vil du fjerne ofte kontaktede personer?</string>
+  <string name="clearFrequentsConfirmation">Du fjerner listen over ofte kontaktede personer i Kontakter- og Telefon-appene, og tvinger e-postappene til å lære seg adresseinnstillingene dine på nytt.</string>
+  <string name="clearFrequentsProgress_title">Fjerner ofte kontaktede personer ...</string>
+  <string name="status_available">Tilgjengelig</string>
+  <string name="status_away">Borte</string>
+  <string name="status_busy">Opptatt</string>
+  <string name="contactsList">Kontakter</string>
+  <string name="contact_suggestions">Toppforslag</string>
+  <string name="local_invisible_directory">Annen</string>
+  <string name="directory_search_label">Katalog</string>
+  <string name="directory_search_label_work">Jobbkatalog</string>
+  <string name="local_search_label">Alle kontakter</string>
+  <string name="local_suggestions_search_label">Forslag</string>
+  <string msgid="9154761216179882405" name="user_profile_contacts_list_header">Meg</string>
+  <string name="missing_name">(Uten navn)</string>
+  <string msgid="2795575601596468581" name="description_view_contact_detail">Se kontakten</string>
+  <string name="list_filter_phones">Alle kontakter med telefonnumre</string>
+  <string name="list_filter_phones_work">Jobbprofilkontakter</string>
+  <string name="view_updates_from_group">Se oppdateringer</string>
+  <string name="account_phone">Bare på enheten din, uten synkronisering</string>
+  <string name="nameLabelsGroup">Navn</string>
+  <string name="nicknameLabelsGroup">Kallenavn</string>
+  <string name="full_name">Navn</string>
+  <string name="name_given">Fornavn</string>
+  <string name="name_family">Etternavn</string>
+  <string name="name_prefix">Navneprefiks</string>
+  <string name="name_middle">Mellomnavn</string>
+  <string name="name_suffix">Navnesuffiks</string>
+  <string name="name_phonetic">Fonetisk navn</string>
+  <string name="name_phonetic_given">Fonetisk fornavn</string>
+  <string name="name_phonetic_middle">Fonetisk mellomnavn</string>
+  <string name="name_phonetic_family">Fonetisk etternavn</string>
+  <string name="phoneLabelsGroup">Telefon</string>
+  <string name="emailLabelsGroup">Send e-post</string>
+  <string name="postalLabelsGroup">Adresse</string>
+  <string name="imLabelsGroup">Nettprat</string>
+  <string name="organizationLabelsGroup">Organisasjon</string>
+  <string name="relationLabelsGroup">Tilknytning</string>
+  <string name="eventLabelsGroup">Spesialdato</string>
+  <string name="sms">SMS</string>
+  <string name="postal_address">Adresse</string>
+  <string name="ghostData_company">Firma</string>
+  <string name="ghostData_title">Stilling</string>
+  <string name="label_notes">Notater</string>
+  <string name="label_sip_address">SIP</string>
+  <string name="websiteLabelsGroup">Nettsted</string>
+  <string name="groupsLabel">Grupper</string>
+  <string name="email_home">Send e-post (privat)</string>
+  <string name="email_mobile">Send e-post (mobil)</string>
+  <string name="email_work">Send e-post (jobb)</string>
+  <string name="email_other">Send e-post</string>
+  <string name="email_custom">Send e-post (%s)</string>
+  <string name="email">Send e-post</string>
+  <string name="postal_street">Gate</string>
+  <string name="postal_city">By</string>
+  <string name="postal_region">Fylke/delstat</string>
+  <string name="postal_postcode">Postnummer</string>
+  <string name="postal_country">Land</string>
+  <string name="map_home">Se hjemmeadressen</string>
+  <string name="map_work">Se jobbadressen</string>
+  <string name="map_other">Se adressen</string>
+  <string name="map_custom">Se %s-adressen</string>
+  <string name="chat_aim">Nettprat med AIM</string>
+  <string name="chat_msn">Nettprat med Windows Live</string>
+  <string name="chat_yahoo">Nettprat med Yahoo</string>
+  <string name="chat_skype">Nettprat med Skype</string>
+  <string name="chat_qq">Nettprat med QQ</string>
+  <string name="chat_gtalk">Nettprat med Google Talk</string>
+  <string name="chat_icq">Nettprat med ICQ</string>
+  <string name="chat_jabber">Nettprat med Jabber</string>
+  <string name="chat">Nettprat</string>
+  <string name="list_filter_all_accounts">Alle kontakter</string>
+  <string name="listAllContactsInAccount">Kontakter i %s</string>
+  <string name="listCustomView">Kontakter i tilpasset visning</string>
+  <string name="listSingleContact">Enkeltkontakt</string>
+  <string name="display_options_sort_list_by">Sortér etter</string>
+  <string name="display_options_sort_by_given_name">Fornavn</string>
+  <string name="display_options_sort_by_family_name">Etternavn</string>
+  <string name="display_options_view_names_as">Navneformat</string>
+  <string name="display_options_view_given_name_first">Fornavnet først</string>
+  <string name="display_options_view_family_name_first">Etternavnet først</string>
+  <string name="menu_clear_frequents">Fjern ofte kontaktede personer</string>
+  <string name="action_menu_back_from_search">avslutt søket</string>
+  <string name="description_clear_search">Slett søk</string>
+  <string name="select_account_dialog_title">Konto</string>
+  <string name="set_default_account">Bruk alltid dette for samtaler</string>
+  <string name="select_phone_account_for_calls">Velg SIM-kort for dette anropet</string>
+  <string name="select_phone_account_for_calls_remember">Husk dette valget</string>
+  <string name="call_with_a_note">Ring med et notat</string>
+  <string name="call_subject_hint">Skriv et notat du vil sende med anropet …</string>
+  <string name="send_and_call_button">SEND OG RING</string>
+  <string name="call_subject_limit">%1$s / %2$s</string>
+  <string name="old_call_subject_type_and_number">%1$s %2$s</string>
+  <string name="tab_title">%1$s-fanen.</string>
+  <plurals name="tab_title_with_unread_items">
+    <item quantity="one"> %1$s-fanen. %2$d ulest element. </item>
+    <item quantity="other"> %1$s-fanen. %2$d uleste elementer. </item>
+  </plurals>
+  <string name="description_search_video_call">Videosamtale</string>
+  <string name="description_search_call_and_share">Del og ring</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-pa/strings.xml b/java/com/android/contacts/common/res/values-pa/strings.xml
index 593abee..9e998f9 100644
--- a/java/com/android/contacts/common/res/values-pa/strings.xml
+++ b/java/com/android/contacts/common/res/values-pa/strings.xml
@@ -1,162 +1,145 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="toast_text_copied" msgid="8979281391599667362">"ਟੈਕਸਟ ਕਾਪੀ ਕੀਤਾ"</string>
-    <string name="call_custom" msgid="3041673234638990874">"<xliff:g id="CUSTOM">%s</xliff:g> ਨੂੰ ਕਾਲ ਕਰੋ"</string>
-    <string name="call_home" msgid="125893483593803791">"ਘਰ ਕਾਲ ਕਰੋ"</string>
-    <string name="call_mobile" msgid="967589404494150813">"ਮੋਬਾਈਲ ਤੇ ਕਾਲ ਕਰੋ"</string>
-    <string name="call_work" msgid="6040550697395300892">"ਦਫ਼ਤਰ ਕਾਲ ਕਰੋ"</string>
-    <string name="call_fax_work" msgid="5260192771364592922">"ਦਫ਼ਤਰ ਦੀ ਫੈਕਸ ਤੇ ਕਾਲ ਕਰੋ"</string>
-    <string name="call_fax_home" msgid="5174311195081144124">"ਘਰ ਦੀ ਫੈਕਸ ਤੇ ਕਾਲ ਕਰੋ"</string>
-    <string name="call_pager" msgid="6814149227741274161">"ਪੇਜ਼ਰ ਤੇ ਕਾਲ ਕਰੋ"</string>
-    <string name="call_other" msgid="5536385588712587235">"ਕਾਲ ਕਰੋ"</string>
-    <string name="call_callback" msgid="6314019862718112786">"ਕਾਲਬੈਕ ਕਾਲ ਕਰੋ"</string>
-    <string name="call_car" msgid="3197417098027764954">"ਕਾਰ ਕਾਲ ਕਰੋ"</string>
-    <string name="call_company_main" msgid="2557663310028446397">"ਕੰਪਨੀ ਦੇ ਮੁੱਖ ਨੰਬਰ ਤੇ ਕਾਲ ਕਰੋ"</string>
-    <string name="call_isdn" msgid="4691270442763649522">"ISDN ਤੇ ਕਾਲ ਕਰੋ"</string>
-    <string name="call_main" msgid="3293707608770407814">"ਮੁੱਖ ਨੰਬਰ ਤੇ ਕਾਲ ਕਰੋ"</string>
-    <string name="call_other_fax" msgid="4724521984879021465">"ਫੈਕਸ ਤੇ ਕਾਲ ਕਰੋ"</string>
-    <string name="call_radio" msgid="8942441419845057942">"ਰੇਡੀਓ ਕਾਲ ਕਰੋ"</string>
-    <string name="call_telex" msgid="2031514461660668351">"ਟੈਲੈਕਸ ਤੇ ਕਾਲ ਕਰੋ"</string>
-    <string name="call_tty_tdd" msgid="7807210224965727701">"TTY/TDD ਤੇ ਕਾਲ ਕਰੋ"</string>
-    <string name="call_work_mobile" msgid="2716342732938578495">"ਦਫ਼ਤਰ ਦੇ ਮੋਬਾਈਲ ਤੇ ਕਾਲ ਕਰੋ"</string>
-    <string name="call_work_pager" msgid="3791778749827366574">"ਦਫ਼ਤਰ ਦੇ ਪੇਜ਼ਰ ਤੇ ਕਾਲ ਕਰੋ"</string>
-    <string name="call_assistant" msgid="4177478845473789294">"<xliff:g id="ASSISTANT">%s</xliff:g> ਨੂੰ ਕਾਲ ਕਰੋ"</string>
-    <string name="call_mms" msgid="4958811711741872901">"MMS ਕਾਲ ਕਰੋ"</string>
-    <string name="sms_custom" msgid="8785368968605026317">"<xliff:g id="CUSTOM">%s</xliff:g> ਤੇ ਟੈਕਸਟ ਕਰੋ"</string>
-    <string name="sms_home" msgid="3527719551060295243">"ਘਰ ਦੇ ਨੰਬਰ ਤੇ ਟੈਕਸਟ ਕਰੋ"</string>
-    <string name="sms_mobile" msgid="8883045857887736518">"ਮੋਬਾਈਲ ਤੇ ਟੈਕਸਟ ਕਰੋ"</string>
-    <string name="sms_work" msgid="4158595439553450966">"ਦਫ਼ਤਰ ਦੇ ਨੰਬਰ ਤੇ ਟੈਕਸਟ ਕਰੋ"</string>
-    <string name="sms_fax_work" msgid="5483726627718055248">"ਦਫ਼ਤਰ ਦੀ ਫੈਕਸ ਤੇ ਟੈਕਸਟ ਕਰੋ"</string>
-    <string name="sms_fax_home" msgid="9219265155770746077">"ਘਰ ਦੀ ਫੈਕਸ ਤੇ ਟੈਕਸਟ ਕਰੋ"</string>
-    <string name="sms_pager" msgid="4901085068525193933">"ਪੇਜ਼ਰ ਤੇ ਟੈਕਸਟ ਕਰੋ"</string>
-    <string name="sms_other" msgid="1742702947993285933">"ਟੈਕਸਟ ਕਰੋ"</string>
-    <string name="sms_callback" msgid="5833483630377538308">"ਕਾਲਬੈਕ ਟੈਕਸਟ ਕਰੋ"</string>
-    <string name="sms_car" msgid="4314577266154395174">"ਕਾਰ ਟੈਕਸਟ ਕਰੋ"</string>
-    <string name="sms_company_main" msgid="2308160928487360705">"ਕੰਪਨੀ ਦੇ ਮੁੱਖ ਨੰਬਰ ਤੇ ਟੈਕਸਟ ਕਰੋ"</string>
-    <string name="sms_isdn" msgid="6394300346179302542">"ISDN ਤੇ ਟੈਕਸਟ ਕਰੋ"</string>
-    <string name="sms_main" msgid="8908087742014140774">"ਮੁੱਖ ਨੰਬਰ ਤੇ ਟੈਕਸਟ ਕਰੋ"</string>
-    <string name="sms_other_fax" msgid="8768455473295405427">"ਫੈਕਸ ਤੇ ਟੈਕਸਟ ਕਰੋ"</string>
-    <string name="sms_radio" msgid="855555176531704682">"ਰੇਡੀਓ ਤੇ ਟੈਕਸਟ ਕਰੋ"</string>
-    <string name="sms_telex" msgid="6269029276223252719">"ਟੈਲੈਕਸ ਤੇ ਟੈਕਸਟ ਕਰੋ"</string>
-    <string name="sms_tty_tdd" msgid="6229057354509192444">"TTY/TDD ਤੇ ਟੈਕਸਟ ਕਰੋ"</string>
-    <string name="sms_work_mobile" msgid="2155975469329969840">"ਦਫ਼ਤਰ ਦੇ ਮੋਬਾਈਲ ਤੇ ਟੈਕਸਟ ਕਰੋ"</string>
-    <string name="sms_work_pager" msgid="8500140274906830742">"ਦਫ਼ਤਰ ਦੇ ਪੇਜ਼ਰ ਤੇ ਟੈਕਸਟ ਕਰੋ"</string>
-    <string name="sms_assistant" msgid="8513548482745330818">"<xliff:g id="ASSISTANT">%s</xliff:g> ਨੂੰ ਟੈਕਸਟ ਕਰੋ"</string>
-    <string name="sms_mms" msgid="5187888900503248542">"MMS ਤੇ ਟੈਕਸਟ ਕਰੋ"</string>
-    <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"ਕੀ ਅਕਸਰ ਸੰਪਰਕ ਕੀਤੇ ਜਾਣ ਵਾਲੇ ਹਟਾਉਣੇ ਹਨ?"</string>
-    <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"ਤੁਸੀਂ ਵਾਰੀ-ਵਾਰੀ ਸੰਪਰਕ ਅਤੇ ਫੋਨ ਐਪਸ ਵਿੱਚ ਸੰਪਰਕ ਕੀਤੀ ਸੂਚੀ ਹਟਾਓਗੇ ਅਤੇ ਈਮੇਲ ਐਪਸ ਤੇ ਸਕ੍ਰੈਚ ਨਾਲ ਤੁਹਾਡੀਆਂ ਪਤਾ ਲਗਾਉਣ ਦੀਆਂ ਤਰਜੀਹਾਂ ਜਾਣਨ ਲਈ ਜ਼ੋਰ ਪਾਓਗੇ।"</string>
-    <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"ਅਕਸਰ ਸੰਪਰਕ ਕੀਤੇ ਜਾਣ ਵਾਲੇ ਹਟਾ ਰਿਹਾ ਹੈ…"</string>
-    <string name="status_available" msgid="2648156525685472626">"ਉਪਲਬਧ"</string>
-    <string name="status_away" msgid="2298688367552893953">"ਦੂਰ"</string>
-    <string name="status_busy" msgid="5990832098713248503">"ਰੁੱਝਾ ਹੋਇਆ ਹੈ"</string>
-    <string name="contactsList" msgid="8806067891419291513">"ਸੰਪਰਕ"</string>
-    <string name="contact_suggestions" msgid="3324166754807120006">"ਪ੍ਰਮੁੱਖ ਸੁਝਾਏ ਗਏ"</string>
-    <string name="local_invisible_directory" msgid="4723238462733650090">"ਹੋਰ"</string>
-    <string name="directory_search_label" msgid="4621215895484025229">"ਡਾਇਰੈਕਟਰੀ"</string>
-    <string name="directory_search_label_work" msgid="7679326282707414897">"ਕੰਮ ਡਾਇਰੈਕਟਰੀ"</string>
-    <string name="local_search_label" msgid="907622822323119235">"ਸਾਰੇ ਸੰਪਰਕ"</string>
-    <string name="local_suggestions_search_label" msgid="1178575146224386118">"ਸੁਝਾਅ"</string>
-    <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"ਮੈਂ"</string>
-    <string name="missing_name" msgid="978606963362745020">"(ਕੋਈ ਨਾਮ ਨਹੀਂ)"</string>
-    <string name="description_view_contact_detail" msgid="2428742401208561136">"ਸੰਪਰਕ ਦੇਖੋ"</string>
-    <string name="list_filter_phones" msgid="8763316061763437182">"ਫੋਨ ਨੰਬਰਾਂ ਵਾਲੇ ਸਾਰੇ ਸੰਪਰਕ"</string>
-    <string name="list_filter_phones_work" msgid="7083575404573422965">"ਕੰਮ ਪ੍ਰੋਫਾਈਲ ਸੰਪਰਕ"</string>
-    <string name="view_updates_from_group" msgid="9011641093168385729">"ਅਪਡੇਟਾਂ ਦੇਖੋ"</string>
-    <string name="account_phone" msgid="7067809073194061035">"ਸਿਰਫ਼-ਡੀਵਾਈਸ \'ਤੇ, ਅਣ-ਸਮਕਾਲੀਕਿਰਤ"</string>
-    <string name="nameLabelsGroup" msgid="7730465833159557471">"ਨਾਮ"</string>
-    <string name="nicknameLabelsGroup" msgid="6310556912361840029">"ਉਪਨਾਮ"</string>
-    <string name="full_name" msgid="648186563998465740">"ਨਾਮ"</string>
-    <string name="name_given" msgid="5096576006314820536">"ਪਹਿਲਾ ਨਾਮ"</string>
-    <string name="name_family" msgid="6646235805198547467">"ਆਖਰੀ ਨਾਮ"</string>
-    <string name="name_prefix" msgid="9215326539658838">"ਨਾਮ ਅਗੇਤਰ"</string>
-    <string name="name_middle" msgid="703755205331582769">"ਵਿਚਕਾਰਲਾ ਨਾਮ"</string>
-    <string name="name_suffix" msgid="5777083390282548702">"ਨਾਮ ਪਿਛੇਤਰ"</string>
-    <string name="name_phonetic" msgid="1650870996361663089">"ਧੁਨੀਆਤਮਿਕ ਨਾਮ"</string>
-    <string name="name_phonetic_given" msgid="618812334274603170">"ਧੁਨੀਆਤਮਿਕ ਪਹਿਲਾ ਨਾਮ"</string>
-    <string name="name_phonetic_middle" msgid="4826820763384625538">"ਧੁਨੀਆਤਮਿਕ ਵਿਚਕਾਰਲਾ ਨਾਮ"</string>
-    <string name="name_phonetic_family" msgid="379905191212930771">"ਧੁਨੀਆਤਮਿਕ ਆਖਰੀ ਨਾਮ"</string>
-    <string name="phoneLabelsGroup" msgid="169661929021355548">"ਫੋਨ"</string>
-    <string name="emailLabelsGroup" msgid="2249752810477488833">"ਈਮੇਲ"</string>
-    <string name="postalLabelsGroup" msgid="6772000590189142253">"ਪਤਾ"</string>
-    <string name="imLabelsGroup" msgid="5718066254237364731">"IM"</string>
-    <string name="organizationLabelsGroup" msgid="1101996309241601435">"ਕੰਪਨੀ"</string>
-    <string name="relationLabelsGroup" msgid="53866051664600053">"ਰਿਸ਼ਤਾ"</string>
-    <string name="eventLabelsGroup" msgid="1236970042646618489">"ਵਿਸ਼ੇਸ਼ ਮਿਤੀ"</string>
-    <string name="sms" msgid="7574344928185328095">"ਟੈਕਸਟ ਸੁਨੇਹਾ"</string>
-    <string name="postal_address" msgid="1804707930129674200">"ਪਤਾ"</string>
-    <string name="ghostData_company" msgid="2554310786296833424">"ਕੰਪਨੀ"</string>
-    <string name="ghostData_title" msgid="4994968731830184837">"ਸਿਰਲੇਖ"</string>
-    <string name="label_notes" msgid="2050255313694219786">"ਸੂਚਨਾਵਾਂ"</string>
-    <string name="label_sip_address" msgid="8883266182575965926">"SIP"</string>
-    <string name="websiteLabelsGroup" msgid="1630734286462186790">"ਵੈੱਬਸਾਈਟ"</string>
-    <string name="groupsLabel" msgid="2694002798416868728">"ਸਮੂਹ"</string>
-    <string name="email_home" msgid="889830029388962171">"ਘਰ ਈਮੇਲ ਕਰੋ"</string>
-    <string name="email_mobile" msgid="4487686436743741150">"ਮੋਬਾਈਲ ਤੇ ਈਮੇਲ ਕਰੋ"</string>
-    <string name="email_work" msgid="4223487303344613528">"ਦਫ਼ਤਰ ਈਮੇਲ ਕਰੋ"</string>
-    <string name="email_other" msgid="4246411900126012062">"ਈਮੇਲ"</string>
-    <string name="email_custom" msgid="7246580894327511013">"<xliff:g id="CUSTOM">%s</xliff:g> ਨੂੰ ਈਮੇਲ ਕਰੋ"</string>
-    <string name="email" msgid="2807318537887091606">"ਈਮੇਲ"</string>
-    <string name="postal_street" msgid="6918171741240802474">"ਗਲੀ"</string>
-    <string name="postal_city" msgid="8674569121430005628">"ਸ਼ਹਿਰ"</string>
-    <string name="postal_region" msgid="1730369286225469192">"ਰਾਜ"</string>
-    <string name="postal_postcode" msgid="4450700741261990439">"ਜ਼ਿੱਪ ਕੋਡ"</string>
-    <string name="postal_country" msgid="232670707458768148">"ਦੇਸ਼"</string>
-    <string name="map_home" msgid="4181131107392126938">"ਘਰ ਦਾ ਪਤਾ ਦੇਖੋ"</string>
-    <string name="map_work" msgid="5723471185992684400">"ਦਫ਼ਤਰ ਦਾ ਪਤਾ ਦੇਖੋ"</string>
-    <string name="map_other" msgid="2253764780863500516">"ਪਤਾ ਦੇਖੋ"</string>
-    <string name="map_custom" msgid="5581743097882436157">"<xliff:g id="CUSTOM">%s</xliff:g> ਪਤਾ ਦੇਖੋ"</string>
-    <string name="chat_aim" msgid="2954364435497941659">"AIM ਵਰਤਦੇ ਹੋਏ ਚੈਟ ਕਰੋ"</string>
-    <string name="chat_msn" msgid="3130135239071228678">"Windows Live ਵਰਤਦੇ ਹੋਏ ਚੈਟ ਕਰੋ"</string>
-    <string name="chat_yahoo" msgid="3233552142326865347">"Yahoo ਵਰਤਦੇ ਹੋਏ ਚੈਟ ਕਰੋ"</string>
-    <string name="chat_skype" msgid="6486703981390592425">"Skype ਵਰਤਦੇ ਹੋਏ ਚੈਟ ਕਰੋ"</string>
-    <string name="chat_qq" msgid="786924280665740019">"QQ ਵਰਤਦੇ ਹੋਏ ਚੈਟ ਕਰੋ"</string>
-    <string name="chat_gtalk" msgid="7914674177243078035">"Google Talk ਵਰਤਦੇ ਹੋਏ ਚੈਟ ਕਰੋ"</string>
-    <string name="chat_icq" msgid="3292934726414765801">"ICQ ਵਰਤਦੇ ਹੋਏ ਚੈਟ ਕਰੋ"</string>
-    <string name="chat_jabber" msgid="6701542313597880204">"Jabber ਵਰਤਦੇ ਹੋਏ ਚੈਟ ਕਰੋ"</string>
-    <string name="chat" msgid="1020428260359370236">"ਚੈਟ"</string>
-    <string name="list_filter_all_accounts" msgid="473782314881473992">"ਸਾਰੇ ਸੰਪਰਕ"</string>
-    <string name="listAllContactsInAccount" msgid="3486378621592995630">"<xliff:g id="NAME">%s</xliff:g> ਵਿੱਚ ਸੰਪਰਕ"</string>
-    <string name="listCustomView" msgid="5306282632413086731">"ਕਸਟਮ ਦ੍ਰਿਸ਼ ਵਿੱਚ ਸੰਪਰਕ"</string>
-    <string name="listSingleContact" msgid="8620818791932382627">"ਸਿੰਗਲ ਸੰਪਰਕ"</string>
-    <string name="display_options_sort_list_by" msgid="3541875948367831228">"ਇਸ ਮੁਤਾਬਕ ਛਾਂਟੋ"</string>
-    <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"ਪਹਿਲਾ ਨਾਮ"</string>
-    <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"ਆਖਰੀ ਨਾਮ"</string>
-    <string name="display_options_view_names_as" msgid="4204204205736735618">"ਨਾਮ ਦੀ ਵੰਨਗੀ"</string>
-    <string name="display_options_view_given_name_first" msgid="2308026973021171020">"ਪਹਿਲਾਂ ਪਹਿਲਾ ਨਾਮ"</string>
-    <string name="display_options_view_family_name_first" msgid="987430497292428242">"ਪਹਿਲਾਂ ਆਖਰੀ ਨਾਮ"</string>
-    <string name="menu_clear_frequents" msgid="5358271535047496120">"ਫ੍ਰੀਕਵੈਂਟਸ ਹਟਾਓ"</string>
-    <string name="action_menu_back_from_search" msgid="3550669942742167644">"ਖੋਜ ਕਰਨਾ ਬੰਦ ਕਰੋ"</string>
-    <string name="description_clear_search" msgid="2347258825265600782">"ਖੋਜ ਹਟਾਓ"</string>
-    <string name="select_account_dialog_title" msgid="2673504582803359239">"ਖਾਤਾ"</string>
-    <string name="set_default_account" msgid="7966099951006467572">"ਕਾਲਾਂ ਲਈ ਹਮੇਸ਼ਾਂ ਇਹ ਵਰਤੋ"</string>
-    <string name="select_phone_account_for_calls" msgid="1784460686103423274">"ਇਸਦੇ ਨਾਲ ਕਾਲ ਕਰੋ"</string>
-    <string name="call_with_a_note" msgid="6242261320491851133">"ਕੋਈ ਨੋਟ ਦੇ ਨਾਲ ਕਾਲ ਕਰੋ"</string>
-    <string name="call_subject_hint" msgid="7233138753650420800">"ਕਾਲ ਦੇ ਨਾਲ ਭੇਜਣ ਲਈ ਕੋਈ ਨੋਟ ਟਾਈਪ ਕਰੋ ..."</string>
-    <string name="send_and_call_button" msgid="4735168294120154013">"ਭੇਜੋ ਅਤੇ ਕਾਲ ਕਰੋ"</string>
-    <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="tab_title" msgid="3387876802026074288">"<xliff:g id="TITLE">%1$s</xliff:g> ਟੈਬ।"</string>
-    <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
-      <item quantity="one"> <xliff:g id="TITLE_2">%1$s</xliff:g> ਟੈਬ। <xliff:g id="COUNT_3">%2$d</xliff:g> ਅਣ-ਪੜ੍ਹੀਆਂ ਆਈਟਮਾਂ। </item>
-      <item quantity="other"> <xliff:g id="TITLE_2">%1$s</xliff:g> ਟੈਬ। <xliff:g id="COUNT_3">%2$d</xliff:g> ਅਣ-ਪੜ੍ਹੀਆਂ ਆਈਟਮਾਂ। </item>
-    </plurals>
-    <string name="description_search_video_call" msgid="4337369876888024909">"ਵੀਡੀਓ ਕਾਲ"</string>
-    <string name="description_search_call_and_share" msgid="4912772842755050467">"ਸਾਂਝਾ ਕਰੋ ਅਤੇ ਕਾਲ ਕਰੋ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_custom">%s ਨੂੰ ਕਾਲ ਕਰੋ</string>
+  <string name="call_home">ਘਰ ਕਾਲ ਕਰੋ</string>
+  <string name="call_mobile">ਮੋਬਾਈਲ ਤੇ ਕਾਲ ਕਰੋ</string>
+  <string name="call_work">ਦਫ਼ਤਰ ਕਾਲ ਕਰੋ</string>
+  <string name="call_fax_work">ਦਫ਼ਤਰ ਦੀ ਫੈਕਸ ਤੇ ਕਾਲ ਕਰੋ</string>
+  <string name="call_fax_home">ਘਰ ਦੀ ਫੈਕਸ ਤੇ ਕਾਲ ਕਰੋ</string>
+  <string name="call_pager">ਪੇਜ਼ਰ ਤੇ ਕਾਲ ਕਰੋ</string>
+  <string name="call_other">ਕਾਲ ਕਰੋ</string>
+  <string name="call_callback">ਕਾਲਬੈਕ ਕਾਲ ਕਰੋ</string>
+  <string name="call_car">ਕਾਰ ਕਾਲ ਕਰੋ</string>
+  <string name="call_company_main">ਕੰਪਨੀ ਦੇ ਮੁੱਖ ਨੰਬਰ ਤੇ ਕਾਲ ਕਰੋ</string>
+  <string name="call_isdn">ISDN ਤੇ ਕਾਲ ਕਰੋ</string>
+  <string name="call_main">ਮੁੱਖ ਨੰਬਰ ਤੇ ਕਾਲ ਕਰੋ</string>
+  <string name="call_other_fax">ਫੈਕਸ ਤੇ ਕਾਲ ਕਰੋ</string>
+  <string name="call_radio">ਰੇਡੀਓ ਕਾਲ ਕਰੋ</string>
+  <string name="call_telex">ਟੈਲੈਕਸ ਤੇ ਕਾਲ ਕਰੋ</string>
+  <string name="call_tty_tdd">TTY/TDD ਤੇ ਕਾਲ ਕਰੋ</string>
+  <string name="call_work_mobile">ਦਫ਼ਤਰ ਦੇ ਮੋਬਾਈਲ ਤੇ ਕਾਲ ਕਰੋ</string>
+  <string name="call_work_pager">ਦਫ਼ਤਰ ਦੇ ਪੇਜ਼ਰ ਤੇ ਕਾਲ ਕਰੋ</string>
+  <string name="call_assistant">%s ਨੂੰ ਕਾਲ ਕਰੋ</string>
+  <string name="call_mms">MMS ਕਾਲ ਕਰੋ</string>
+  <string name="sms_custom">%s ਤੇ ਟੈਕਸਟ ਕਰੋ</string>
+  <string name="sms_home">ਘਰ ਦੇ ਨੰਬਰ ਤੇ ਟੈਕਸਟ ਕਰੋ</string>
+  <string name="sms_mobile">ਮੋਬਾਈਲ ਤੇ ਟੈਕਸਟ ਕਰੋ</string>
+  <string name="sms_work">ਦਫ਼ਤਰ ਦੇ ਨੰਬਰ ਤੇ ਟੈਕਸਟ ਕਰੋ</string>
+  <string name="sms_fax_work">ਦਫ਼ਤਰ ਦੀ ਫੈਕਸ ਤੇ ਟੈਕਸਟ ਕਰੋ</string>
+  <string name="sms_fax_home">ਘਰ ਦੀ ਫੈਕਸ ਤੇ ਟੈਕਸਟ ਕਰੋ</string>
+  <string name="sms_pager">ਪੇਜ਼ਰ ਤੇ ਟੈਕਸਟ ਕਰੋ</string>
+  <string name="sms_other">ਟੈਕਸਟ ਕਰੋ</string>
+  <string name="sms_callback">ਕਾਲਬੈਕ ਟੈਕਸਟ ਕਰੋ</string>
+  <string name="sms_car">ਕਾਰ ਟੈਕਸਟ ਕਰੋ</string>
+  <string name="sms_company_main">ਕੰਪਨੀ ਦੇ ਮੁੱਖ ਨੰਬਰ ਤੇ ਟੈਕਸਟ ਕਰੋ</string>
+  <string name="sms_isdn">ISDN ਤੇ ਟੈਕਸਟ ਕਰੋ</string>
+  <string name="sms_main">ਮੁੱਖ ਨੰਬਰ ਤੇ ਟੈਕਸਟ ਕਰੋ</string>
+  <string name="sms_other_fax">ਫੈਕਸ ਤੇ ਟੈਕਸਟ ਕਰੋ</string>
+  <string name="sms_radio">ਰੇਡੀਓ ਤੇ ਟੈਕਸਟ ਕਰੋ</string>
+  <string name="sms_telex">ਟੈਲੈਕਸ ਤੇ ਟੈਕਸਟ ਕਰੋ</string>
+  <string name="sms_tty_tdd">TTY/TDD ਤੇ ਟੈਕਸਟ ਕਰੋ</string>
+  <string name="sms_work_mobile">ਦਫ਼ਤਰ ਦੇ ਮੋਬਾਈਲ ਤੇ ਟੈਕਸਟ ਕਰੋ</string>
+  <string name="sms_work_pager">ਦਫ਼ਤਰ ਦੇ ਪੇਜ਼ਰ ਤੇ ਟੈਕਸਟ ਕਰੋ</string>
+  <string name="sms_assistant">%s ਨੂੰ ਟੈਕਸਟ ਕਰੋ</string>
+  <string name="sms_mms">MMS ਤੇ ਟੈਕਸਟ ਕਰੋ</string>
+  <string name="clearFrequentsConfirmation_title">ਕੀ ਅਕਸਰ ਸੰਪਰਕ ਕੀਤੇ ਜਾਣ ਵਾਲੇ ਹਟਾਉਣੇ ਹਨ?</string>
+  <string name="clearFrequentsConfirmation">ਤੁਸੀਂ ਵਾਰੀ-ਵਾਰੀ ਸੰਪਰਕ ਅਤੇ ਫੋਨ ਐਪਸ ਵਿੱਚ ਸੰਪਰਕ ਕੀਤੀ ਸੂਚੀ ਹਟਾਓਗੇ ਅਤੇ ਈਮੇਲ ਐਪਸ ਤੇ ਸਕ੍ਰੈਚ ਨਾਲ ਤੁਹਾਡੀਆਂ ਪਤਾ ਲਗਾਉਣ ਦੀਆਂ ਤਰਜੀਹਾਂ ਜਾਣਨ ਲਈ ਜ਼ੋਰ ਪਾਓਗੇ।</string>
+  <string name="clearFrequentsProgress_title">ਅਕਸਰ ਸੰਪਰਕ ਕੀਤੇ ਜਾਣ ਵਾਲੇ ਹਟਾ ਰਿਹਾ ਹੈ…</string>
+  <string name="status_available">ਉਪਲਬਧ</string>
+  <string name="status_away">ਦੂਰ</string>
+  <string name="status_busy">ਰੁੱਝਾ ਹੋਇਆ ਹੈ</string>
+  <string name="contactsList">ਸੰਪਰਕ</string>
+  <string name="contact_suggestions">ਪ੍ਰਮੁੱਖ ਸੁਝਾਏ ਗਏ</string>
+  <string name="local_invisible_directory">ਹੋਰ</string>
+  <string name="directory_search_label">ਡਾਇਰੈਕਟਰੀ</string>
+  <string name="directory_search_label_work">ਕੰਮ ਡਾਇਰੈਕਟਰੀ</string>
+  <string name="local_search_label">ਸਾਰੇ ਸੰਪਰਕ</string>
+  <string name="local_suggestions_search_label">ਸੁਝਾਅ</string>
+  <string msgid="9154761216179882405" name="user_profile_contacts_list_header">ਮੈਂ</string>
+  <string name="missing_name">(ਕੋਈ ਨਾਮ ਨਹੀਂ)</string>
+  <string msgid="2795575601596468581" name="description_view_contact_detail">ਸੰਪਰਕ ਦੇਖੋ</string>
+  <string name="list_filter_phones">ਫੋਨ ਨੰਬਰਾਂ ਵਾਲੇ ਸਾਰੇ ਸੰਪਰਕ</string>
+  <string name="list_filter_phones_work">ਕੰਮ ਪ੍ਰੋਫਾਈਲ ਸੰਪਰਕ</string>
+  <string name="view_updates_from_group">ਅਪਡੇਟਾਂ ਦੇਖੋ</string>
+  <string name="account_phone">ਸਿਰਫ਼-ਡੀਵਾਈਸ \'ਤੇ, ਅਣ-ਸਮਕਾਲੀਕਿਰਤ</string>
+  <string name="nameLabelsGroup">ਨਾਮ</string>
+  <string name="nicknameLabelsGroup">ਉਪਨਾਮ</string>
+  <string name="full_name">ਨਾਮ</string>
+  <string name="name_given">ਪਹਿਲਾ ਨਾਮ</string>
+  <string name="name_family">ਆਖਰੀ ਨਾਮ</string>
+  <string name="name_prefix">ਨਾਮ ਅਗੇਤਰ</string>
+  <string name="name_middle">ਵਿਚਕਾਰਲਾ ਨਾਮ</string>
+  <string name="name_suffix">ਨਾਮ ਪਿਛੇਤਰ</string>
+  <string name="name_phonetic">ਧੁਨੀਆਤਮਿਕ ਨਾਮ</string>
+  <string name="name_phonetic_given">ਧੁਨੀਆਤਮਿਕ ਪਹਿਲਾ ਨਾਮ</string>
+  <string name="name_phonetic_middle">ਧੁਨੀਆਤਮਿਕ ਵਿਚਕਾਰਲਾ ਨਾਮ</string>
+  <string name="name_phonetic_family">ਧੁਨੀਆਤਮਿਕ ਆਖਰੀ ਨਾਮ</string>
+  <string name="phoneLabelsGroup">ਫੋਨ</string>
+  <string name="emailLabelsGroup">ਈਮੇਲ</string>
+  <string name="postalLabelsGroup">ਪਤਾ</string>
+  <string name="imLabelsGroup">IM</string>
+  <string name="organizationLabelsGroup">ਕੰਪਨੀ</string>
+  <string name="relationLabelsGroup">ਰਿਸ਼ਤਾ</string>
+  <string name="eventLabelsGroup">ਵਿਸ਼ੇਸ਼ ਮਿਤੀ</string>
+  <string name="sms">ਟੈਕਸਟ ਸੁਨੇਹਾ</string>
+  <string name="postal_address">ਪਤਾ</string>
+  <string name="ghostData_company">ਕੰਪਨੀ</string>
+  <string name="ghostData_title">ਸਿਰਲੇਖ</string>
+  <string name="label_notes">ਸੂਚਨਾਵਾਂ</string>
+  <string name="label_sip_address">SIP</string>
+  <string name="websiteLabelsGroup">ਵੈੱਬਸਾਈਟ</string>
+  <string name="groupsLabel">ਸਮੂਹ</string>
+  <string name="email_home">ਘਰ ਈਮੇਲ ਕਰੋ</string>
+  <string name="email_mobile">ਮੋਬਾਈਲ ਤੇ ਈਮੇਲ ਕਰੋ</string>
+  <string name="email_work">ਦਫ਼ਤਰ ਈਮੇਲ ਕਰੋ</string>
+  <string name="email_other">ਈਮੇਲ</string>
+  <string name="email_custom">%s ਨੂੰ ਈਮੇਲ ਕਰੋ</string>
+  <string name="email">ਈਮੇਲ</string>
+  <string name="postal_street">ਗਲੀ</string>
+  <string name="postal_city">ਸ਼ਹਿਰ</string>
+  <string name="postal_region">ਰਾਜ</string>
+  <string name="postal_postcode">ਜ਼ਿੱਪ ਕੋਡ</string>
+  <string name="postal_country">ਦੇਸ਼</string>
+  <string name="map_home">ਘਰ ਦਾ ਪਤਾ ਦੇਖੋ</string>
+  <string name="map_work">ਦਫ਼ਤਰ ਦਾ ਪਤਾ ਦੇਖੋ</string>
+  <string name="map_other">ਪਤਾ ਦੇਖੋ</string>
+  <string name="map_custom">%s ਪਤਾ ਦੇਖੋ</string>
+  <string name="chat_aim">AIM ਵਰਤਦੇ ਹੋਏ ਚੈਟ ਕਰੋ</string>
+  <string name="chat_msn">Windows Live ਵਰਤਦੇ ਹੋਏ ਚੈਟ ਕਰੋ</string>
+  <string name="chat_yahoo">Yahoo ਵਰਤਦੇ ਹੋਏ ਚੈਟ ਕਰੋ</string>
+  <string name="chat_skype">Skype ਵਰਤਦੇ ਹੋਏ ਚੈਟ ਕਰੋ</string>
+  <string name="chat_qq">QQ ਵਰਤਦੇ ਹੋਏ ਚੈਟ ਕਰੋ</string>
+  <string name="chat_gtalk">Google Talk ਵਰਤਦੇ ਹੋਏ ਚੈਟ ਕਰੋ</string>
+  <string name="chat_icq">ICQ ਵਰਤਦੇ ਹੋਏ ਚੈਟ ਕਰੋ</string>
+  <string name="chat_jabber">Jabber ਵਰਤਦੇ ਹੋਏ ਚੈਟ ਕਰੋ</string>
+  <string name="chat">ਚੈਟ</string>
+  <string name="list_filter_all_accounts">ਸਾਰੇ ਸੰਪਰਕ</string>
+  <string name="listAllContactsInAccount">%s ਵਿੱਚ ਸੰਪਰਕ</string>
+  <string name="listCustomView">ਕਸਟਮ ਦ੍ਰਿਸ਼ ਵਿੱਚ ਸੰਪਰਕ</string>
+  <string name="listSingleContact">ਸਿੰਗਲ ਸੰਪਰਕ</string>
+  <string name="display_options_sort_list_by">ਇਸ ਮੁਤਾਬਕ ਛਾਂਟੋ</string>
+  <string name="display_options_sort_by_given_name">ਪਹਿਲਾ ਨਾਮ</string>
+  <string name="display_options_sort_by_family_name">ਆਖਰੀ ਨਾਮ</string>
+  <string name="display_options_view_names_as">ਨਾਮ ਦੀ ਵੰਨਗੀ</string>
+  <string name="display_options_view_given_name_first">ਪਹਿਲਾਂ ਪਹਿਲਾ ਨਾਮ</string>
+  <string name="display_options_view_family_name_first">ਪਹਿਲਾਂ ਆਖਰੀ ਨਾਮ</string>
+  <string name="menu_clear_frequents">ਫ੍ਰੀਕਵੈਂਟਸ ਹਟਾਓ</string>
+  <string name="action_menu_back_from_search">ਖੋਜ ਕਰਨਾ ਬੰਦ ਕਰੋ</string>
+  <string name="description_clear_search">ਖੋਜ ਹਟਾਓ</string>
+  <string name="select_account_dialog_title">ਖਾਤਾ</string>
+  <string name="set_default_account">ਕਾਲਾਂ ਲਈ ਹਮੇਸ਼ਾਂ ਇਹ ਵਰਤੋ</string>
+  <string name="select_phone_account_for_calls">ਇਸ ਕਾਲ ਲਈ ਸਿਮ ਚੁਣੋ</string>
+  <string name="select_phone_account_for_calls_remember">ਇਹ ਚੋਣ ਯਾਦ ਰੱਖੋ</string>
+  <string name="call_with_a_note">ਕੋਈ ਨੋਟ ਦੇ ਨਾਲ ਕਾਲ ਕਰੋ</string>
+  <string name="call_subject_hint">ਕਾਲ ਦੇ ਨਾਲ ਭੇਜਣ ਲਈ ਕੋਈ ਨੋਟ ਟਾਈਪ ਕਰੋ ...</string>
+  <string name="send_and_call_button">ਭੇਜੋ ਅਤੇ ਕਾਲ ਕਰੋ</string>
+  <string name="call_subject_limit">%1$s / %2$s</string>
+  <string name="old_call_subject_type_and_number">%1$s %2$s</string>
+  <string name="tab_title">%1$s ਟੈਬ।</string>
+  <plurals name="tab_title_with_unread_items">
+    <item quantity="one"> %1$s ਟੈਬ। %2$d ਅਣ-ਪੜ੍ਹੀਆਂ ਆਈਟਮਾਂ। </item>
+    <item quantity="other"> %1$s ਟੈਬ। %2$d ਅਣ-ਪੜ੍ਹੀਆਂ ਆਈਟਮਾਂ। </item>
+  </plurals>
+  <string name="description_search_video_call">ਵੀਡੀਓ ਕਾਲ</string>
+  <string name="description_search_call_and_share">ਸਾਂਝਾ ਕਰੋ ਅਤੇ ਕਾਲ ਕਰੋ</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-pl/strings.xml b/java/com/android/contacts/common/res/values-pl/strings.xml
index bbb3854..ed371d7 100644
--- a/java/com/android/contacts/common/res/values-pl/strings.xml
+++ b/java/com/android/contacts/common/res/values-pl/strings.xml
@@ -1,164 +1,147 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="toast_text_copied" msgid="8979281391599667362">"Tekst skopiowany"</string>
-    <string name="call_custom" msgid="3041673234638990874">"Połącz – <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="call_home" msgid="125893483593803791">"Połącz – domowy"</string>
-    <string name="call_mobile" msgid="967589404494150813">"Połącz – komórka"</string>
-    <string name="call_work" msgid="6040550697395300892">"Połącz – służbowy"</string>
-    <string name="call_fax_work" msgid="5260192771364592922">"Połącz – faks służbowy"</string>
-    <string name="call_fax_home" msgid="5174311195081144124">"Połącz – faks domowy"</string>
-    <string name="call_pager" msgid="6814149227741274161">"Połącz – pager"</string>
-    <string name="call_other" msgid="5536385588712587235">"Zadzwoń"</string>
-    <string name="call_callback" msgid="6314019862718112786">"Połącz – numer zwrotny"</string>
-    <string name="call_car" msgid="3197417098027764954">"Połącz – samochód"</string>
-    <string name="call_company_main" msgid="2557663310028446397">"Połącz – firmowy główny"</string>
-    <string name="call_isdn" msgid="4691270442763649522">"Połącz – ISDN"</string>
-    <string name="call_main" msgid="3293707608770407814">"Połącz – numer główny"</string>
-    <string name="call_other_fax" msgid="4724521984879021465">"Połącz – faks"</string>
-    <string name="call_radio" msgid="8942441419845057942">"Połącz – radio"</string>
-    <string name="call_telex" msgid="2031514461660668351">"Połącz – teleks"</string>
-    <string name="call_tty_tdd" msgid="7807210224965727701">"Połącz – TTY/TDD"</string>
-    <string name="call_work_mobile" msgid="2716342732938578495">"Połącz – służbowa komórka"</string>
-    <string name="call_work_pager" msgid="3791778749827366574">"Połącz – służbowy pager"</string>
-    <string name="call_assistant" msgid="4177478845473789294">"Połącz – <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
-    <string name="call_mms" msgid="4958811711741872901">"Połącz – MMS"</string>
-    <string name="sms_custom" msgid="8785368968605026317">"SMS – <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="sms_home" msgid="3527719551060295243">"SMS – domowy"</string>
-    <string name="sms_mobile" msgid="8883045857887736518">"SMS – komórka"</string>
-    <string name="sms_work" msgid="4158595439553450966">"SMS – służbowy"</string>
-    <string name="sms_fax_work" msgid="5483726627718055248">"SMS – faks służbowy"</string>
-    <string name="sms_fax_home" msgid="9219265155770746077">"SMS – faks domowy"</string>
-    <string name="sms_pager" msgid="4901085068525193933">"SMS – pager"</string>
-    <string name="sms_other" msgid="1742702947993285933">"SMS"</string>
-    <string name="sms_callback" msgid="5833483630377538308">"SMS – numer zwrotny"</string>
-    <string name="sms_car" msgid="4314577266154395174">"SMS – samochód"</string>
-    <string name="sms_company_main" msgid="2308160928487360705">"SMS – firmowy główny"</string>
-    <string name="sms_isdn" msgid="6394300346179302542">"SMS – ISDN"</string>
-    <string name="sms_main" msgid="8908087742014140774">"SMS – główny"</string>
-    <string name="sms_other_fax" msgid="8768455473295405427">"SMS – faks"</string>
-    <string name="sms_radio" msgid="855555176531704682">"SMS – radio"</string>
-    <string name="sms_telex" msgid="6269029276223252719">"SMS – teleks"</string>
-    <string name="sms_tty_tdd" msgid="6229057354509192444">"SMS – TTY/TDD"</string>
-    <string name="sms_work_mobile" msgid="2155975469329969840">"SMS – służbowa komórka"</string>
-    <string name="sms_work_pager" msgid="8500140274906830742">"SMS – służbowy pager"</string>
-    <string name="sms_assistant" msgid="8513548482745330818">"SMS – <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
-    <string name="sms_mms" msgid="5187888900503248542">"SMS – MMS"</string>
-    <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"Wyczyścić częste kontakty?"</string>
-    <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"Wyczyścisz listę częstych kontaktów w aplikacjach Kontakty i Telefon. Aplikacje pocztowe będą musiały od nowa poznać Twoje preferencje adresowe."</string>
-    <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"Czyszczę częste kontakty…"</string>
-    <string name="status_available" msgid="2648156525685472626">"Dostępny"</string>
-    <string name="status_away" msgid="2298688367552893953">"Nieobecny"</string>
-    <string name="status_busy" msgid="5990832098713248503">"Zajęty"</string>
-    <string name="contactsList" msgid="8806067891419291513">"Kontakty"</string>
-    <string name="contact_suggestions" msgid="3324166754807120006">"Najlepsze sugestie"</string>
-    <string name="local_invisible_directory" msgid="4723238462733650090">"Inny"</string>
-    <string name="directory_search_label" msgid="4621215895484025229">"Katalog"</string>
-    <string name="directory_search_label_work" msgid="7679326282707414897">"Katalog służbowy"</string>
-    <string name="local_search_label" msgid="907622822323119235">"Wszystkie kontakty"</string>
-    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Sugestie"</string>
-    <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Ja"</string>
-    <string name="missing_name" msgid="978606963362745020">"(Bez nazwy)"</string>
-    <string name="description_view_contact_detail" msgid="2428742401208561136">"Pokaż kontakt"</string>
-    <string name="list_filter_phones" msgid="8763316061763437182">"Wszystkie kontakty z numerami telefonów"</string>
-    <string name="list_filter_phones_work" msgid="7083575404573422965">"Kontakty w profilu służbowym"</string>
-    <string name="view_updates_from_group" msgid="9011641093168385729">"Pokaż aktualizacje"</string>
-    <string name="account_phone" msgid="7067809073194061035">"Tylko na urządzeniu – bez synchronizacji"</string>
-    <string name="nameLabelsGroup" msgid="7730465833159557471">"Imię i nazwisko"</string>
-    <string name="nicknameLabelsGroup" msgid="6310556912361840029">"Pseudonim"</string>
-    <string name="full_name" msgid="648186563998465740">"Nazwa"</string>
-    <string name="name_given" msgid="5096576006314820536">"Imię"</string>
-    <string name="name_family" msgid="6646235805198547467">"Nazwisko"</string>
-    <string name="name_prefix" msgid="9215326539658838">"Tytuł przed nazwiskiem"</string>
-    <string name="name_middle" msgid="703755205331582769">"Drugie imię"</string>
-    <string name="name_suffix" msgid="5777083390282548702">"Tytuł po nazwisku"</string>
-    <string name="name_phonetic" msgid="1650870996361663089">"Nazwisko fonetycznie"</string>
-    <string name="name_phonetic_given" msgid="618812334274603170">"Imię fonetycznie"</string>
-    <string name="name_phonetic_middle" msgid="4826820763384625538">"Drugie imię fonetycznie"</string>
-    <string name="name_phonetic_family" msgid="379905191212930771">"Nazwisko fonetycznie"</string>
-    <string name="phoneLabelsGroup" msgid="169661929021355548">"Telefon"</string>
-    <string name="emailLabelsGroup" msgid="2249752810477488833">"E-mail"</string>
-    <string name="postalLabelsGroup" msgid="6772000590189142253">"Adres"</string>
-    <string name="imLabelsGroup" msgid="5718066254237364731">"Komunikator"</string>
-    <string name="organizationLabelsGroup" msgid="1101996309241601435">"Organizacja"</string>
-    <string name="relationLabelsGroup" msgid="53866051664600053">"Relacja"</string>
-    <string name="eventLabelsGroup" msgid="1236970042646618489">"Szczególna data"</string>
-    <string name="sms" msgid="7574344928185328095">"SMS"</string>
-    <string name="postal_address" msgid="1804707930129674200">"Adres"</string>
-    <string name="ghostData_company" msgid="2554310786296833424">"Firma"</string>
-    <string name="ghostData_title" msgid="4994968731830184837">"Tytuł"</string>
-    <string name="label_notes" msgid="2050255313694219786">"Notatki"</string>
-    <string name="label_sip_address" msgid="8883266182575965926">"Adres SIP"</string>
-    <string name="websiteLabelsGroup" msgid="1630734286462186790">"Witryna"</string>
-    <string name="groupsLabel" msgid="2694002798416868728">"Grupy"</string>
-    <string name="email_home" msgid="889830029388962171">"E-mail – dom"</string>
-    <string name="email_mobile" msgid="4487686436743741150">"E-mail – komórka"</string>
-    <string name="email_work" msgid="4223487303344613528">"E-mail – praca"</string>
-    <string name="email_other" msgid="4246411900126012062">"E-mail"</string>
-    <string name="email_custom" msgid="7246580894327511013">"E-mail – <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="email" msgid="2807318537887091606">"E-mail"</string>
-    <string name="postal_street" msgid="6918171741240802474">"Ulica"</string>
-    <string name="postal_city" msgid="8674569121430005628">"Miasto"</string>
-    <string name="postal_region" msgid="1730369286225469192">"Stan"</string>
-    <string name="postal_postcode" msgid="4450700741261990439">"Kod pocztowy"</string>
-    <string name="postal_country" msgid="232670707458768148">"Kraj"</string>
-    <string name="map_home" msgid="4181131107392126938">"Pokaż adres domowy"</string>
-    <string name="map_work" msgid="5723471185992684400">"Pokaż adres służbowy"</string>
-    <string name="map_other" msgid="2253764780863500516">"Pokaż adres"</string>
-    <string name="map_custom" msgid="5581743097882436157">"Pokaż adres: <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="chat_aim" msgid="2954364435497941659">"Czat w AIM"</string>
-    <string name="chat_msn" msgid="3130135239071228678">"Czat w Windows Live"</string>
-    <string name="chat_yahoo" msgid="3233552142326865347">"Czat w Yahoo"</string>
-    <string name="chat_skype" msgid="6486703981390592425">"Czat w Skype"</string>
-    <string name="chat_qq" msgid="786924280665740019">"Czat w QQ"</string>
-    <string name="chat_gtalk" msgid="7914674177243078035">"Czat w Google Talk"</string>
-    <string name="chat_icq" msgid="3292934726414765801">"Czat w ICQ"</string>
-    <string name="chat_jabber" msgid="6701542313597880204">"Czat w Jabberze"</string>
-    <string name="chat" msgid="1020428260359370236">"Czat"</string>
-    <string name="list_filter_all_accounts" msgid="473782314881473992">"Wszystkie kontakty"</string>
-    <string name="listAllContactsInAccount" msgid="3486378621592995630">"Kontakty na koncie <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="listCustomView" msgid="5306282632413086731">"Kontakty spełniające kryteria"</string>
-    <string name="listSingleContact" msgid="8620818791932382627">"Jeden kontakt"</string>
-    <string name="display_options_sort_list_by" msgid="3541875948367831228">"Sortuj według"</string>
-    <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"Imię"</string>
-    <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"Nazwisko"</string>
-    <string name="display_options_view_names_as" msgid="4204204205736735618">"Format imienia i nazwiska"</string>
-    <string name="display_options_view_given_name_first" msgid="2308026973021171020">"Najpierw imię"</string>
-    <string name="display_options_view_family_name_first" msgid="987430497292428242">"Najpierw nazwisko"</string>
-    <string name="menu_clear_frequents" msgid="5358271535047496120">"Wyczyść częste kontakty"</string>
-    <string name="action_menu_back_from_search" msgid="3550669942742167644">"zatrzymaj wyszukiwanie"</string>
-    <string name="description_clear_search" msgid="2347258825265600782">"Wyczyść wyszukiwanie"</string>
-    <string name="select_account_dialog_title" msgid="2673504582803359239">"Konto"</string>
-    <string name="set_default_account" msgid="7966099951006467572">"Zawsze używaj do połączeń"</string>
-    <string name="select_phone_account_for_calls" msgid="1784460686103423274">"Zadzwoń, używając"</string>
-    <string name="call_with_a_note" msgid="6242261320491851133">"Połącz i wyślij notatkę"</string>
-    <string name="call_subject_hint" msgid="7233138753650420800">"Wpisz notatkę, którą chcesz wysłać razem z połączeniem..."</string>
-    <string name="send_and_call_button" msgid="4735168294120154013">"WYŚLIJ I ZADZWOŃ"</string>
-    <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="tab_title" msgid="3387876802026074288">"Karta <xliff:g id="TITLE">%1$s</xliff:g>."</string>
-    <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
-      <item quantity="few"> Karta <xliff:g id="TITLE_2">%1$s</xliff:g>. <xliff:g id="COUNT_3">%2$d</xliff:g> nieprzeczytane elementy. </item>
-      <item quantity="many"> Karta <xliff:g id="TITLE_2">%1$s</xliff:g>. <xliff:g id="COUNT_3">%2$d</xliff:g> nieprzeczytanych elementów. </item>
-      <item quantity="other"> Karta <xliff:g id="TITLE_2">%1$s</xliff:g>. <xliff:g id="COUNT_3">%2$d</xliff:g> nieprzeczytanego elementu. </item>
-      <item quantity="one"> Karta <xliff:g id="TITLE_0">%1$s</xliff:g>. <xliff:g id="COUNT_1">%2$d</xliff:g> nieprzeczytany element. </item>
-    </plurals>
-    <string name="description_search_video_call" msgid="4337369876888024909">"Rozmowa wideo"</string>
-    <string name="description_search_call_and_share" msgid="4912772842755050467">"Udostępnij i zadzwoń"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_custom">Połącz – %s</string>
+  <string name="call_home">Połącz – domowy</string>
+  <string name="call_mobile">Połącz – komórka</string>
+  <string name="call_work">Połącz – służbowy</string>
+  <string name="call_fax_work">Połącz – faks służbowy</string>
+  <string name="call_fax_home">Połącz – faks domowy</string>
+  <string name="call_pager">Połącz – pager</string>
+  <string name="call_other">Zadzwoń</string>
+  <string name="call_callback">Połącz – numer zwrotny</string>
+  <string name="call_car">Połącz – samochód</string>
+  <string name="call_company_main">Połącz – firmowy główny</string>
+  <string name="call_isdn">Połącz – ISDN</string>
+  <string name="call_main">Połącz – numer główny</string>
+  <string name="call_other_fax">Połącz – faks</string>
+  <string name="call_radio">Połącz – radio</string>
+  <string name="call_telex">Połącz – teleks</string>
+  <string name="call_tty_tdd">Połącz – TTY/TDD</string>
+  <string name="call_work_mobile">Połącz – służbowa komórka</string>
+  <string name="call_work_pager">Połącz – służbowy pager</string>
+  <string name="call_assistant">Połącz – %s</string>
+  <string name="call_mms">Połącz – MMS</string>
+  <string name="sms_custom">SMS – %s</string>
+  <string name="sms_home">SMS – domowy</string>
+  <string name="sms_mobile">SMS – komórka</string>
+  <string name="sms_work">SMS – służbowy</string>
+  <string name="sms_fax_work">SMS – faks służbowy</string>
+  <string name="sms_fax_home">SMS – faks domowy</string>
+  <string name="sms_pager">SMS – pager</string>
+  <string name="sms_other">SMS</string>
+  <string name="sms_callback">SMS – numer zwrotny</string>
+  <string name="sms_car">SMS – samochód</string>
+  <string name="sms_company_main">SMS – firmowy główny</string>
+  <string name="sms_isdn">SMS – ISDN</string>
+  <string name="sms_main">SMS – główny</string>
+  <string name="sms_other_fax">SMS – faks</string>
+  <string name="sms_radio">SMS – radio</string>
+  <string name="sms_telex">SMS – teleks</string>
+  <string name="sms_tty_tdd">SMS – TTY/TDD</string>
+  <string name="sms_work_mobile">SMS – służbowa komórka</string>
+  <string name="sms_work_pager">SMS – służbowy pager</string>
+  <string name="sms_assistant">SMS – %s</string>
+  <string name="sms_mms">SMS – MMS</string>
+  <string name="clearFrequentsConfirmation_title">Wyczyścić częste kontakty?</string>
+  <string name="clearFrequentsConfirmation">Wyczyścisz listę częstych kontaktów w aplikacjach Kontakty i Telefon. Aplikacje pocztowe będą musiały od nowa poznać Twoje preferencje adresowe.</string>
+  <string name="clearFrequentsProgress_title">Czyszczę częste kontakty…</string>
+  <string name="status_available">Dostępny</string>
+  <string name="status_away">Nieobecny</string>
+  <string name="status_busy">Zajęty</string>
+  <string name="contactsList">Kontakty</string>
+  <string name="contact_suggestions">Najlepsze sugestie</string>
+  <string name="local_invisible_directory">Inny</string>
+  <string name="directory_search_label">Katalog</string>
+  <string name="directory_search_label_work">Katalog służbowy</string>
+  <string name="local_search_label">Wszystkie kontakty</string>
+  <string name="local_suggestions_search_label">Sugestie</string>
+  <string msgid="9154761216179882405" name="user_profile_contacts_list_header">Ja</string>
+  <string name="missing_name">(Bez nazwy)</string>
+  <string msgid="2795575601596468581" name="description_view_contact_detail">Pokaż kontakt</string>
+  <string name="list_filter_phones">Wszystkie kontakty z numerami telefonów</string>
+  <string name="list_filter_phones_work">Kontakty w profilu służbowym</string>
+  <string name="view_updates_from_group">Pokaż aktualizacje</string>
+  <string name="account_phone">Tylko na urządzeniu – bez synchronizacji</string>
+  <string name="nameLabelsGroup">Imię i nazwisko</string>
+  <string name="nicknameLabelsGroup">Pseudonim</string>
+  <string name="full_name">Nazwa</string>
+  <string name="name_given">Imię</string>
+  <string name="name_family">Nazwisko</string>
+  <string name="name_prefix">Tytuł przed nazwiskiem</string>
+  <string name="name_middle">Drugie imię</string>
+  <string name="name_suffix">Tytuł po nazwisku</string>
+  <string name="name_phonetic">Nazwisko fonetycznie</string>
+  <string name="name_phonetic_given">Imię fonetycznie</string>
+  <string name="name_phonetic_middle">Drugie imię fonetycznie</string>
+  <string name="name_phonetic_family">Nazwisko fonetycznie</string>
+  <string name="phoneLabelsGroup">Telefon</string>
+  <string name="emailLabelsGroup">E-mail</string>
+  <string name="postalLabelsGroup">Adres</string>
+  <string name="imLabelsGroup">Komunikator</string>
+  <string name="organizationLabelsGroup">Organizacja</string>
+  <string name="relationLabelsGroup">Relacja</string>
+  <string name="eventLabelsGroup">Szczególna data</string>
+  <string name="sms">SMS</string>
+  <string name="postal_address">Adres</string>
+  <string name="ghostData_company">Firma</string>
+  <string name="ghostData_title">Tytuł</string>
+  <string name="label_notes">Notatki</string>
+  <string name="label_sip_address">Adres SIP</string>
+  <string name="websiteLabelsGroup">Witryna</string>
+  <string name="groupsLabel">Grupy</string>
+  <string name="email_home">E-mail – dom</string>
+  <string name="email_mobile">E-mail – komórka</string>
+  <string name="email_work">E-mail – praca</string>
+  <string name="email_other">E-mail</string>
+  <string name="email_custom">E-mail – %s</string>
+  <string name="email">E-mail</string>
+  <string name="postal_street">Ulica</string>
+  <string name="postal_city">Miasto</string>
+  <string name="postal_region">Stan</string>
+  <string name="postal_postcode">Kod pocztowy</string>
+  <string name="postal_country">Kraj</string>
+  <string name="map_home">Pokaż adres domowy</string>
+  <string name="map_work">Pokaż adres służbowy</string>
+  <string name="map_other">Pokaż adres</string>
+  <string name="map_custom">Pokaż adres: %s</string>
+  <string name="chat_aim">Czat w AIM</string>
+  <string name="chat_msn">Czat w Windows Live</string>
+  <string name="chat_yahoo">Czat w Yahoo</string>
+  <string name="chat_skype">Czat w Skype</string>
+  <string name="chat_qq">Czat w QQ</string>
+  <string name="chat_gtalk">Czat w Google Talk</string>
+  <string name="chat_icq">Czat w ICQ</string>
+  <string name="chat_jabber">Czat w Jabberze</string>
+  <string name="chat">Czat</string>
+  <string name="list_filter_all_accounts">Wszystkie kontakty</string>
+  <string name="listAllContactsInAccount">Kontakty na koncie %s</string>
+  <string name="listCustomView">Kontakty spełniające kryteria</string>
+  <string name="listSingleContact">Jeden kontakt</string>
+  <string name="display_options_sort_list_by">Sortuj według</string>
+  <string name="display_options_sort_by_given_name">Imię</string>
+  <string name="display_options_sort_by_family_name">Nazwisko</string>
+  <string name="display_options_view_names_as">Format imienia i nazwiska</string>
+  <string name="display_options_view_given_name_first">Najpierw imię</string>
+  <string name="display_options_view_family_name_first">Najpierw nazwisko</string>
+  <string name="menu_clear_frequents">Wyczyść częste kontakty</string>
+  <string name="action_menu_back_from_search">zatrzymaj wyszukiwanie</string>
+  <string name="description_clear_search">Wyczyść wyszukiwanie</string>
+  <string name="select_account_dialog_title">Konto</string>
+  <string name="set_default_account">Zawsze używaj do połączeń</string>
+  <string name="select_phone_account_for_calls">Wybierz kartę SIM, aby zadzwonić</string>
+  <string name="select_phone_account_for_calls_remember">Zapamiętaj ten wybór</string>
+  <string name="call_with_a_note">Połącz i wyślij notatkę</string>
+  <string name="call_subject_hint">Wpisz notatkę, którą chcesz wysłać razem z połączeniem...</string>
+  <string name="send_and_call_button">WYŚLIJ I ZADZWOŃ</string>
+  <string name="call_subject_limit">%1$s / %2$s</string>
+  <string name="old_call_subject_type_and_number">%1$s %2$s</string>
+  <string name="tab_title">Karta %1$s.</string>
+  <plurals name="tab_title_with_unread_items">
+    <item quantity="one"> Karta %1$s. %2$d nieprzeczytany element. </item>
+    <item quantity="few"> Karta %1$s. %2$d nieprzeczytane elementy. </item>
+    <item quantity="many"> Karta %1$s. %2$d nieprzeczytanych elementów. </item>
+    <item quantity="other"> Karta %1$s. %2$d nieprzeczytanego elementu. </item>
+  </plurals>
+  <string name="description_search_video_call">Rozmowa wideo</string>
+  <string name="description_search_call_and_share">Udostępnij i zadzwoń</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-pt-rBR/strings.xml b/java/com/android/contacts/common/res/values-pt-rBR/strings.xml
index f517c7a..244db57 100644
--- a/java/com/android/contacts/common/res/values-pt-rBR/strings.xml
+++ b/java/com/android/contacts/common/res/values-pt-rBR/strings.xml
@@ -1,162 +1,145 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="toast_text_copied" msgid="8979281391599667362">"Texto copiado"</string>
-    <string name="call_custom" msgid="3041673234638990874">"Ligar para <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="call_home" msgid="125893483593803791">"Ligar para residência"</string>
-    <string name="call_mobile" msgid="967589404494150813">"Ligar para celular"</string>
-    <string name="call_work" msgid="6040550697395300892">"Ligar para trabalho"</string>
-    <string name="call_fax_work" msgid="5260192771364592922">"Ligar para fax comercial"</string>
-    <string name="call_fax_home" msgid="5174311195081144124">"Ligar para fax residencial"</string>
-    <string name="call_pager" msgid="6814149227741274161">"Ligar para pager"</string>
-    <string name="call_other" msgid="5536385588712587235">"Ligar"</string>
-    <string name="call_callback" msgid="6314019862718112786">"Retornar chamada"</string>
-    <string name="call_car" msgid="3197417098027764954">"Ligar para carro"</string>
-    <string name="call_company_main" msgid="2557663310028446397">"Ligar para empresa (principal)"</string>
-    <string name="call_isdn" msgid="4691270442763649522">"Ligar para ISDN"</string>
-    <string name="call_main" msgid="3293707608770407814">"Ligar para principal"</string>
-    <string name="call_other_fax" msgid="4724521984879021465">"Ligar para fax"</string>
-    <string name="call_radio" msgid="8942441419845057942">"Ligar para rádio"</string>
-    <string name="call_telex" msgid="2031514461660668351">"Ligar para telex"</string>
-    <string name="call_tty_tdd" msgid="7807210224965727701">"Ligar para TTY/TDD"</string>
-    <string name="call_work_mobile" msgid="2716342732938578495">"Ligar para celular comercial"</string>
-    <string name="call_work_pager" msgid="3791778749827366574">"Ligar para pager comercial"</string>
-    <string name="call_assistant" msgid="4177478845473789294">"Ligar para <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
-    <string name="call_mms" msgid="4958811711741872901">"Ligar para MMS"</string>
-    <string name="sms_custom" msgid="8785368968605026317">"Enviar SMS para <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="sms_home" msgid="3527719551060295243">"Enviar SMS para residência"</string>
-    <string name="sms_mobile" msgid="8883045857887736518">"Enviar SMS para celular"</string>
-    <string name="sms_work" msgid="4158595439553450966">"Enviar SMS para trabalho"</string>
-    <string name="sms_fax_work" msgid="5483726627718055248">"Enviar SMS para fax comercial"</string>
-    <string name="sms_fax_home" msgid="9219265155770746077">"Enviar SMS para fax residencial"</string>
-    <string name="sms_pager" msgid="4901085068525193933">"Enviar SMS para pager"</string>
-    <string name="sms_other" msgid="1742702947993285933">"Enviar SMS"</string>
-    <string name="sms_callback" msgid="5833483630377538308">"Enviar SMS para retorno de chamada"</string>
-    <string name="sms_car" msgid="4314577266154395174">"Enviar SMS para carro"</string>
-    <string name="sms_company_main" msgid="2308160928487360705">"Enviar SMS para empresa (principal)"</string>
-    <string name="sms_isdn" msgid="6394300346179302542">"Enviar SMS para ISDN"</string>
-    <string name="sms_main" msgid="8908087742014140774">"Enviar SMS para principal"</string>
-    <string name="sms_other_fax" msgid="8768455473295405427">"Enviar SMS para fax"</string>
-    <string name="sms_radio" msgid="855555176531704682">"Enviar SMS para rádio"</string>
-    <string name="sms_telex" msgid="6269029276223252719">"Enviar SMS para telex"</string>
-    <string name="sms_tty_tdd" msgid="6229057354509192444">"Enviar SMS para TTY/TDD"</string>
-    <string name="sms_work_mobile" msgid="2155975469329969840">"Enviar SMS para celular comercial"</string>
-    <string name="sms_work_pager" msgid="8500140274906830742">"Enviar SMS para pager comercial"</string>
-    <string name="sms_assistant" msgid="8513548482745330818">"Enviar SMS para <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
-    <string name="sms_mms" msgid="5187888900503248542">"Enviar SMS para MMS"</string>
-    <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"Apagar contatos frequentes?"</string>
-    <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"Você apagará a lista de contatos frequentes nos apps Contatos e Telefone, fazendo com que os apps de e-mail tenham que redefinir suas preferências de endereçamento."</string>
-    <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"Apagando contatos frequentes…"</string>
-    <string name="status_available" msgid="2648156525685472626">"Disponível"</string>
-    <string name="status_away" msgid="2298688367552893953">"Ausente"</string>
-    <string name="status_busy" msgid="5990832098713248503">"Ocupado"</string>
-    <string name="contactsList" msgid="8806067891419291513">"Contatos"</string>
-    <string name="contact_suggestions" msgid="3324166754807120006">"Principais sugestões"</string>
-    <string name="local_invisible_directory" msgid="4723238462733650090">"Outros"</string>
-    <string name="directory_search_label" msgid="4621215895484025229">"Diretório"</string>
-    <string name="directory_search_label_work" msgid="7679326282707414897">"Diretório de trabalho"</string>
-    <string name="local_search_label" msgid="907622822323119235">"Todos os contatos"</string>
-    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Sugestões"</string>
-    <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Eu"</string>
-    <string name="missing_name" msgid="978606963362745020">"(Sem nome)"</string>
-    <string name="description_view_contact_detail" msgid="2428742401208561136">"Visualizar contato"</string>
-    <string name="list_filter_phones" msgid="8763316061763437182">"Todos os contatos com números de telefone"</string>
-    <string name="list_filter_phones_work" msgid="7083575404573422965">"Contatos do perfil de trabalho"</string>
-    <string name="view_updates_from_group" msgid="9011641093168385729">"Ver atualizações"</string>
-    <string name="account_phone" msgid="7067809073194061035">"Somente no dispositivo, não sincronizado"</string>
-    <string name="nameLabelsGroup" msgid="7730465833159557471">"Nome"</string>
-    <string name="nicknameLabelsGroup" msgid="6310556912361840029">"Apelido"</string>
-    <string name="full_name" msgid="648186563998465740">"Nome"</string>
-    <string name="name_given" msgid="5096576006314820536">"Nome"</string>
-    <string name="name_family" msgid="6646235805198547467">"Sobrenome"</string>
-    <string name="name_prefix" msgid="9215326539658838">"Prefixo do nome"</string>
-    <string name="name_middle" msgid="703755205331582769">"Nome do meio"</string>
-    <string name="name_suffix" msgid="5777083390282548702">"Sufixo do nome"</string>
-    <string name="name_phonetic" msgid="1650870996361663089">"Nome fonético"</string>
-    <string name="name_phonetic_given" msgid="618812334274603170">"Nome fonético"</string>
-    <string name="name_phonetic_middle" msgid="4826820763384625538">"Nome do meio fonético"</string>
-    <string name="name_phonetic_family" msgid="379905191212930771">"Sobrenome fonético"</string>
-    <string name="phoneLabelsGroup" msgid="169661929021355548">"Telefone"</string>
-    <string name="emailLabelsGroup" msgid="2249752810477488833">"Enviar e-mail"</string>
-    <string name="postalLabelsGroup" msgid="6772000590189142253">"Endereço"</string>
-    <string name="imLabelsGroup" msgid="5718066254237364731">"IM"</string>
-    <string name="organizationLabelsGroup" msgid="1101996309241601435">"Organização"</string>
-    <string name="relationLabelsGroup" msgid="53866051664600053">"Relacionamento"</string>
-    <string name="eventLabelsGroup" msgid="1236970042646618489">"Data especial"</string>
-    <string name="sms" msgid="7574344928185328095">"Mensagem de texto"</string>
-    <string name="postal_address" msgid="1804707930129674200">"Endereço"</string>
-    <string name="ghostData_company" msgid="2554310786296833424">"Empresa"</string>
-    <string name="ghostData_title" msgid="4994968731830184837">"Título"</string>
-    <string name="label_notes" msgid="2050255313694219786">"Notas"</string>
-    <string name="label_sip_address" msgid="8883266182575965926">"SIP"</string>
-    <string name="websiteLabelsGroup" msgid="1630734286462186790">"Website"</string>
-    <string name="groupsLabel" msgid="2694002798416868728">"Grupos"</string>
-    <string name="email_home" msgid="889830029388962171">"Enviar e-mail para residencial"</string>
-    <string name="email_mobile" msgid="4487686436743741150">"Enviar e-mail para celular"</string>
-    <string name="email_work" msgid="4223487303344613528">"Enviar e-mail para comercial"</string>
-    <string name="email_other" msgid="4246411900126012062">"Enviar e-mail"</string>
-    <string name="email_custom" msgid="7246580894327511013">"Enviar e-mail para <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="email" msgid="2807318537887091606">"Enviar e-mail"</string>
-    <string name="postal_street" msgid="6918171741240802474">"Rua"</string>
-    <string name="postal_city" msgid="8674569121430005628">"Cidade"</string>
-    <string name="postal_region" msgid="1730369286225469192">"Estado"</string>
-    <string name="postal_postcode" msgid="4450700741261990439">"CEP"</string>
-    <string name="postal_country" msgid="232670707458768148">"País"</string>
-    <string name="map_home" msgid="4181131107392126938">"Ver endereço residencial"</string>
-    <string name="map_work" msgid="5723471185992684400">"Ver endereço comercial"</string>
-    <string name="map_other" msgid="2253764780863500516">"Ver endereço"</string>
-    <string name="map_custom" msgid="5581743097882436157">"Ver endereço de <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="chat_aim" msgid="2954364435497941659">"Bater papo usando o AIM"</string>
-    <string name="chat_msn" msgid="3130135239071228678">"Bater papo usando o Windows Live"</string>
-    <string name="chat_yahoo" msgid="3233552142326865347">"Bater papo usando o Yahoo"</string>
-    <string name="chat_skype" msgid="6486703981390592425">"Bater papo usando o Skype"</string>
-    <string name="chat_qq" msgid="786924280665740019">"Bater papo usando o QQ"</string>
-    <string name="chat_gtalk" msgid="7914674177243078035">"Bater papo usando o Google Talk"</string>
-    <string name="chat_icq" msgid="3292934726414765801">"Bater papo usando o ICQ"</string>
-    <string name="chat_jabber" msgid="6701542313597880204">"Bater papo usando o Jabber"</string>
-    <string name="chat" msgid="1020428260359370236">"Bate-papo"</string>
-    <string name="list_filter_all_accounts" msgid="473782314881473992">"Todos os contatos"</string>
-    <string name="listAllContactsInAccount" msgid="3486378621592995630">"Contatos em <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="listCustomView" msgid="5306282632413086731">"Cont. na vis. pers."</string>
-    <string name="listSingleContact" msgid="8620818791932382627">"Contato único"</string>
-    <string name="display_options_sort_list_by" msgid="3541875948367831228">"Classificar por"</string>
-    <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"Nome"</string>
-    <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"Sobrenome"</string>
-    <string name="display_options_view_names_as" msgid="4204204205736735618">"Formato de nome"</string>
-    <string name="display_options_view_given_name_first" msgid="2308026973021171020">"Primeiro o nome"</string>
-    <string name="display_options_view_family_name_first" msgid="987430497292428242">"Primeiro o sobrenome"</string>
-    <string name="menu_clear_frequents" msgid="5358271535047496120">"Apagar frequentes"</string>
-    <string name="action_menu_back_from_search" msgid="3550669942742167644">"parar de pesquisar"</string>
-    <string name="description_clear_search" msgid="2347258825265600782">"Limpar pesquisa"</string>
-    <string name="select_account_dialog_title" msgid="2673504582803359239">"Conta"</string>
-    <string name="set_default_account" msgid="7966099951006467572">"Sempre usar esta opção para chamadas"</string>
-    <string name="select_phone_account_for_calls" msgid="1784460686103423274">"Ligar com"</string>
-    <string name="call_with_a_note" msgid="6242261320491851133">"Chamada com uma nota"</string>
-    <string name="call_subject_hint" msgid="7233138753650420800">"Escreva uma nota para enviar com a chamada..."</string>
-    <string name="send_and_call_button" msgid="4735168294120154013">"ENVIAR E LIGAR"</string>
-    <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="tab_title" msgid="3387876802026074288">"Guia \"<xliff:g id="TITLE">%1$s</xliff:g>\"."</string>
-    <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
-      <item quantity="one">Guia \"<xliff:g id="TITLE_2">%1$s</xliff:g>\". <xliff:g id="COUNT_3">%2$d</xliff:g> item não lido. </item>
-      <item quantity="other">Guia \"<xliff:g id="TITLE_2">%1$s</xliff:g>\". <xliff:g id="COUNT_3">%2$d</xliff:g> itens não lidos. </item>
-    </plurals>
-    <string name="description_search_video_call" msgid="4337369876888024909">"Videochamada"</string>
-    <string name="description_search_call_and_share" msgid="4912772842755050467">"Compartilhar e ligar"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_custom">Ligar para %s</string>
+  <string name="call_home">Ligar para residência</string>
+  <string name="call_mobile">Ligar para celular</string>
+  <string name="call_work">Ligar para trabalho</string>
+  <string name="call_fax_work">Ligar para fax comercial</string>
+  <string name="call_fax_home">Ligar para fax residencial</string>
+  <string name="call_pager">Ligar para pager</string>
+  <string name="call_other">Ligar</string>
+  <string name="call_callback">Retornar chamada</string>
+  <string name="call_car">Ligar para carro</string>
+  <string name="call_company_main">Ligar para empresa (principal)</string>
+  <string name="call_isdn">Ligar para ISDN</string>
+  <string name="call_main">Ligar para principal</string>
+  <string name="call_other_fax">Ligar para fax</string>
+  <string name="call_radio">Ligar para rádio</string>
+  <string name="call_telex">Ligar para telex</string>
+  <string name="call_tty_tdd">Ligar para TTY/TDD</string>
+  <string name="call_work_mobile">Ligar para celular comercial</string>
+  <string name="call_work_pager">Ligar para pager comercial</string>
+  <string name="call_assistant">Ligar para %s</string>
+  <string name="call_mms">Ligar para MMS</string>
+  <string name="sms_custom">Enviar SMS para %s</string>
+  <string name="sms_home">Enviar SMS para residência</string>
+  <string name="sms_mobile">Enviar SMS para celular</string>
+  <string name="sms_work">Enviar SMS para trabalho</string>
+  <string name="sms_fax_work">Enviar SMS para fax comercial</string>
+  <string name="sms_fax_home">Enviar SMS para fax residencial</string>
+  <string name="sms_pager">Enviar SMS para pager</string>
+  <string name="sms_other">Enviar SMS</string>
+  <string name="sms_callback">Enviar SMS para retorno de chamada</string>
+  <string name="sms_car">Enviar SMS para carro</string>
+  <string name="sms_company_main">Enviar SMS para empresa (principal)</string>
+  <string name="sms_isdn">Enviar SMS para ISDN</string>
+  <string name="sms_main">Enviar SMS para principal</string>
+  <string name="sms_other_fax">Enviar SMS para fax</string>
+  <string name="sms_radio">Enviar SMS para rádio</string>
+  <string name="sms_telex">Enviar SMS para telex</string>
+  <string name="sms_tty_tdd">Enviar SMS para TTY/TDD</string>
+  <string name="sms_work_mobile">Enviar SMS para celular comercial</string>
+  <string name="sms_work_pager">Enviar SMS para pager comercial</string>
+  <string name="sms_assistant">Enviar SMS para %s</string>
+  <string name="sms_mms">Enviar SMS para MMS</string>
+  <string name="clearFrequentsConfirmation_title">Apagar contatos frequentes?</string>
+  <string name="clearFrequentsConfirmation">Você apagará a lista de contatos frequentes nos apps Contatos e Telefone, fazendo com que os apps de e-mail tenham que redefinir suas preferências de endereçamento.</string>
+  <string name="clearFrequentsProgress_title">Apagando contatos frequentes…</string>
+  <string name="status_available">Disponível</string>
+  <string name="status_away">Ausente</string>
+  <string name="status_busy">Ocupado</string>
+  <string name="contactsList">Contatos</string>
+  <string name="contact_suggestions">Principais sugestões</string>
+  <string name="local_invisible_directory">Outros</string>
+  <string name="directory_search_label">Diretório</string>
+  <string name="directory_search_label_work">Diretório de trabalho</string>
+  <string name="local_search_label">Todos os contatos</string>
+  <string name="local_suggestions_search_label">Sugestões</string>
+  <string msgid="9154761216179882405" name="user_profile_contacts_list_header">Eu</string>
+  <string name="missing_name">(Sem nome)</string>
+  <string msgid="2795575601596468581" name="description_view_contact_detail">Visualizar contato</string>
+  <string name="list_filter_phones">Todos os contatos com números de telefone</string>
+  <string name="list_filter_phones_work">Contatos do perfil de trabalho</string>
+  <string name="view_updates_from_group">Ver atualizações</string>
+  <string name="account_phone">Somente no dispositivo, não sincronizado</string>
+  <string name="nameLabelsGroup">Nome</string>
+  <string name="nicknameLabelsGroup">Apelido</string>
+  <string name="full_name">Nome</string>
+  <string name="name_given">Nome</string>
+  <string name="name_family">Sobrenome</string>
+  <string name="name_prefix">Prefixo do nome</string>
+  <string name="name_middle">Nome do meio</string>
+  <string name="name_suffix">Sufixo do nome</string>
+  <string name="name_phonetic">Nome fonético</string>
+  <string name="name_phonetic_given">Nome fonético</string>
+  <string name="name_phonetic_middle">Nome do meio fonético</string>
+  <string name="name_phonetic_family">Sobrenome fonético</string>
+  <string name="phoneLabelsGroup">Telefone</string>
+  <string name="emailLabelsGroup">Enviar e-mail</string>
+  <string name="postalLabelsGroup">Endereço</string>
+  <string name="imLabelsGroup">IM</string>
+  <string name="organizationLabelsGroup">Organização</string>
+  <string name="relationLabelsGroup">Relacionamento</string>
+  <string name="eventLabelsGroup">Data especial</string>
+  <string name="sms">Mensagem de texto</string>
+  <string name="postal_address">Endereço</string>
+  <string name="ghostData_company">Empresa</string>
+  <string name="ghostData_title">Título</string>
+  <string name="label_notes">Notas</string>
+  <string name="label_sip_address">SIP</string>
+  <string name="websiteLabelsGroup">Website</string>
+  <string name="groupsLabel">Grupos</string>
+  <string name="email_home">Enviar e-mail para residencial</string>
+  <string name="email_mobile">Enviar e-mail para celular</string>
+  <string name="email_work">Enviar e-mail para comercial</string>
+  <string name="email_other">Enviar e-mail</string>
+  <string name="email_custom">Enviar e-mail para %s</string>
+  <string name="email">Enviar e-mail</string>
+  <string name="postal_street">Rua</string>
+  <string name="postal_city">Cidade</string>
+  <string name="postal_region">Estado</string>
+  <string name="postal_postcode">CEP</string>
+  <string name="postal_country">País</string>
+  <string name="map_home">Ver endereço residencial</string>
+  <string name="map_work">Ver endereço comercial</string>
+  <string name="map_other">Ver endereço</string>
+  <string name="map_custom">Ver endereço de %s</string>
+  <string name="chat_aim">Bater papo usando o AIM</string>
+  <string name="chat_msn">Bater papo usando o Windows Live</string>
+  <string name="chat_yahoo">Bater papo usando o Yahoo</string>
+  <string name="chat_skype">Bater papo usando o Skype</string>
+  <string name="chat_qq">Bater papo usando o QQ</string>
+  <string name="chat_gtalk">Bater papo usando o Google Talk</string>
+  <string name="chat_icq">Bater papo usando o ICQ</string>
+  <string name="chat_jabber">Bater papo usando o Jabber</string>
+  <string name="chat">Bate-papo</string>
+  <string name="list_filter_all_accounts">Todos os contatos</string>
+  <string name="listAllContactsInAccount">Contatos em %s</string>
+  <string name="listCustomView">Cont. na vis. pers.</string>
+  <string name="listSingleContact">Contato único</string>
+  <string name="display_options_sort_list_by">Classificar por</string>
+  <string name="display_options_sort_by_given_name">Nome</string>
+  <string name="display_options_sort_by_family_name">Sobrenome</string>
+  <string name="display_options_view_names_as">Formato de nome</string>
+  <string name="display_options_view_given_name_first">Primeiro o nome</string>
+  <string name="display_options_view_family_name_first">Primeiro o sobrenome</string>
+  <string name="menu_clear_frequents">Apagar frequentes</string>
+  <string name="action_menu_back_from_search">parar de pesquisar</string>
+  <string name="description_clear_search">Limpar pesquisa</string>
+  <string name="select_account_dialog_title">Conta</string>
+  <string name="set_default_account">Sempre usar esta opção para chamadas</string>
+  <string name="select_phone_account_for_calls">Escolher o SIM para esta chamada</string>
+  <string name="select_phone_account_for_calls_remember">Lembrar desta escolha</string>
+  <string name="call_with_a_note">Chamada com uma nota</string>
+  <string name="call_subject_hint">Escreva uma nota para enviar com a chamada...</string>
+  <string name="send_and_call_button">ENVIAR E LIGAR</string>
+  <string name="call_subject_limit">%1$s / %2$s</string>
+  <string name="old_call_subject_type_and_number">%1$s %2$s</string>
+  <string name="tab_title">Guia \"%1$s\".</string>
+  <plurals name="tab_title_with_unread_items">
+    <item quantity="one">Guia \"%1$s\". %2$d item não lido. </item>
+    <item quantity="other">Guia \"%1$s\". %2$d itens não lidos. </item>
+  </plurals>
+  <string name="description_search_video_call">Videochamada</string>
+  <string name="description_search_call_and_share">Compartilhar e ligar</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-pt-rPT/strings.xml b/java/com/android/contacts/common/res/values-pt-rPT/strings.xml
index 4f612f5..22b9abe 100644
--- a/java/com/android/contacts/common/res/values-pt-rPT/strings.xml
+++ b/java/com/android/contacts/common/res/values-pt-rPT/strings.xml
@@ -1,162 +1,145 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="toast_text_copied" msgid="8979281391599667362">"Texto copiado"</string>
-    <string name="call_custom" msgid="3041673234638990874">"Telefonar para <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="call_home" msgid="125893483593803791">"Telefonar para casa"</string>
-    <string name="call_mobile" msgid="967589404494150813">"Telefonar para telemóvel"</string>
-    <string name="call_work" msgid="6040550697395300892">"Telefonar para o trabalho"</string>
-    <string name="call_fax_work" msgid="5260192771364592922">"Telefonar para o faxe do trabalho"</string>
-    <string name="call_fax_home" msgid="5174311195081144124">"Telefonar para o faxe de casa"</string>
-    <string name="call_pager" msgid="6814149227741274161">"Telefonar para o pager"</string>
-    <string name="call_other" msgid="5536385588712587235">"Telefonar"</string>
-    <string name="call_callback" msgid="6314019862718112786">"Telefonar para número de retorno de chamada"</string>
-    <string name="call_car" msgid="3197417098027764954">"Telefonar para o telefone do carro"</string>
-    <string name="call_company_main" msgid="2557663310028446397">"Telefonar para o número geral da empresa"</string>
-    <string name="call_isdn" msgid="4691270442763649522">"Telefonar para um telefone ISDN"</string>
-    <string name="call_main" msgid="3293707608770407814">"Telefonar para o número geral"</string>
-    <string name="call_other_fax" msgid="4724521984879021465">"Telefonar para o faxe"</string>
-    <string name="call_radio" msgid="8942441419845057942">"Telefonar para um radiotelefone"</string>
-    <string name="call_telex" msgid="2031514461660668351">"Telefonar para um telex"</string>
-    <string name="call_tty_tdd" msgid="7807210224965727701">"Telefonar para um teletipo (TTY/TDD)"</string>
-    <string name="call_work_mobile" msgid="2716342732938578495">"Telefonar para o telemóvel do trabalho"</string>
-    <string name="call_work_pager" msgid="3791778749827366574">"Telefonar para o pager do trabalho"</string>
-    <string name="call_assistant" msgid="4177478845473789294">"Telefonar para <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
-    <string name="call_mms" msgid="4958811711741872901">"Telefonar para um número MMS"</string>
-    <string name="sms_custom" msgid="8785368968605026317">"Enviar mensagem de texto para <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="sms_home" msgid="3527719551060295243">"Enviar mensagem de texto para o telefone de casa"</string>
-    <string name="sms_mobile" msgid="8883045857887736518">"Enviar mensagem de texto para telemóvel"</string>
-    <string name="sms_work" msgid="4158595439553450966">"Enviar mensagem de texto para trabalho"</string>
-    <string name="sms_fax_work" msgid="5483726627718055248">"Enviar mensagem de texto para o faxe do trabalho"</string>
-    <string name="sms_fax_home" msgid="9219265155770746077">"Enviar mensagem de texto para o faxe de casa"</string>
-    <string name="sms_pager" msgid="4901085068525193933">"Enviar mensagem de texto para o pager"</string>
-    <string name="sms_other" msgid="1742702947993285933">"Enviar mensagem de texto"</string>
-    <string name="sms_callback" msgid="5833483630377538308">"Enviar mensagem de texto para um número de retorno de chamada"</string>
-    <string name="sms_car" msgid="4314577266154395174">"Enviar mensagem de texto para o telefone do carro"</string>
-    <string name="sms_company_main" msgid="2308160928487360705">"Enviar mensagem de texto para o número geral da empresa"</string>
-    <string name="sms_isdn" msgid="6394300346179302542">"Enviar mensagem de texto para um telefone ISDN"</string>
-    <string name="sms_main" msgid="8908087742014140774">"Enviar mensagem de texto para o número de telefone geral"</string>
-    <string name="sms_other_fax" msgid="8768455473295405427">"Enviar mensagem de texto para o faxe"</string>
-    <string name="sms_radio" msgid="855555176531704682">"Enviar mensagem de texto para um radiotelefone"</string>
-    <string name="sms_telex" msgid="6269029276223252719">"Enviar mensagem de texto para o telex"</string>
-    <string name="sms_tty_tdd" msgid="6229057354509192444">"Enviar mensagem de texto para um teletipo (TTY/TDD)"</string>
-    <string name="sms_work_mobile" msgid="2155975469329969840">"Enviar mensagem de texto para o telemóvel do trabalho"</string>
-    <string name="sms_work_pager" msgid="8500140274906830742">"Enviar mensagem de texto para o pager do trabalho"</string>
-    <string name="sms_assistant" msgid="8513548482745330818">"Enviar mensagem de texto para <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
-    <string name="sms_mms" msgid="5187888900503248542">"Enviar mensagem de texto para um número MMS"</string>
-    <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"Limpar contactos frequentes?"</string>
-    <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"Limpa a lista de contactos frequentes nas aplicações Contactos e Telemóvel e força as aplicações de email a aprenderem as suas preferências de endereço de raiz."</string>
-    <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"A limpar contactos frequentes..."</string>
-    <string name="status_available" msgid="2648156525685472626">"Disponível"</string>
-    <string name="status_away" msgid="2298688367552893953">"Ausente"</string>
-    <string name="status_busy" msgid="5990832098713248503">"Ocupado(a)"</string>
-    <string name="contactsList" msgid="8806067891419291513">"Contactos"</string>
-    <string name="contact_suggestions" msgid="3324166754807120006">"Principais sugestões"</string>
-    <string name="local_invisible_directory" msgid="4723238462733650090">"Outro"</string>
-    <string name="directory_search_label" msgid="4621215895484025229">"Diretório"</string>
-    <string name="directory_search_label_work" msgid="7679326282707414897">"Diretório de trabalho"</string>
-    <string name="local_search_label" msgid="907622822323119235">"Todos os contactos"</string>
-    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Sugestões"</string>
-    <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Eu"</string>
-    <string name="missing_name" msgid="978606963362745020">"(Sem nome)"</string>
-    <string name="description_view_contact_detail" msgid="2428742401208561136">"Ver contacto"</string>
-    <string name="list_filter_phones" msgid="8763316061763437182">"Todos os contactos com números de telefone"</string>
-    <string name="list_filter_phones_work" msgid="7083575404573422965">"Contactos do perfil de trabalho"</string>
-    <string name="view_updates_from_group" msgid="9011641093168385729">"Ver atualizações"</string>
-    <string name="account_phone" msgid="7067809073194061035">"Apenas no dispositivo, não sincronizado"</string>
-    <string name="nameLabelsGroup" msgid="7730465833159557471">"Nome"</string>
-    <string name="nicknameLabelsGroup" msgid="6310556912361840029">"Pseudónimo"</string>
-    <string name="full_name" msgid="648186563998465740">"Nome"</string>
-    <string name="name_given" msgid="5096576006314820536">"Nome próprio"</string>
-    <string name="name_family" msgid="6646235805198547467">"Apelido"</string>
-    <string name="name_prefix" msgid="9215326539658838">"Prefixo do nome"</string>
-    <string name="name_middle" msgid="703755205331582769">"Primeiro apelido"</string>
-    <string name="name_suffix" msgid="5777083390282548702">"Sufixo do nome"</string>
-    <string name="name_phonetic" msgid="1650870996361663089">"Nome (fonética)"</string>
-    <string name="name_phonetic_given" msgid="618812334274603170">"Nome próprio fonético"</string>
-    <string name="name_phonetic_middle" msgid="4826820763384625538">"Nome do meio fonético"</string>
-    <string name="name_phonetic_family" msgid="379905191212930771">"Apelido fonético"</string>
-    <string name="phoneLabelsGroup" msgid="169661929021355548">"Telefone"</string>
-    <string name="emailLabelsGroup" msgid="2249752810477488833">"Enviar email"</string>
-    <string name="postalLabelsGroup" msgid="6772000590189142253">"Endereço"</string>
-    <string name="imLabelsGroup" msgid="5718066254237364731">"IM"</string>
-    <string name="organizationLabelsGroup" msgid="1101996309241601435">"Organização"</string>
-    <string name="relationLabelsGroup" msgid="53866051664600053">"Tipo de relação"</string>
-    <string name="eventLabelsGroup" msgid="1236970042646618489">"Data especial"</string>
-    <string name="sms" msgid="7574344928185328095">"Mensagem de texto"</string>
-    <string name="postal_address" msgid="1804707930129674200">"Endereço"</string>
-    <string name="ghostData_company" msgid="2554310786296833424">"Empresa"</string>
-    <string name="ghostData_title" msgid="4994968731830184837">"Título"</string>
-    <string name="label_notes" msgid="2050255313694219786">"Notas"</string>
-    <string name="label_sip_address" msgid="8883266182575965926">"SIP"</string>
-    <string name="websiteLabelsGroup" msgid="1630734286462186790">"Website"</string>
-    <string name="groupsLabel" msgid="2694002798416868728">"Grupos"</string>
-    <string name="email_home" msgid="889830029388962171">"Enviar email para residência"</string>
-    <string name="email_mobile" msgid="4487686436743741150">"Enviar email para dispositivo móvel"</string>
-    <string name="email_work" msgid="4223487303344613528">"Enviar email para emprego"</string>
-    <string name="email_other" msgid="4246411900126012062">"Enviar email"</string>
-    <string name="email_custom" msgid="7246580894327511013">"Enviar email a <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="email" msgid="2807318537887091606">"Enviar email"</string>
-    <string name="postal_street" msgid="6918171741240802474">"Rua"</string>
-    <string name="postal_city" msgid="8674569121430005628">"Cidade"</string>
-    <string name="postal_region" msgid="1730369286225469192">"Estado"</string>
-    <string name="postal_postcode" msgid="4450700741261990439">"Código postal"</string>
-    <string name="postal_country" msgid="232670707458768148">"País"</string>
-    <string name="map_home" msgid="4181131107392126938">"Ver endereço da residência"</string>
-    <string name="map_work" msgid="5723471185992684400">"Ver endereço do emprego"</string>
-    <string name="map_other" msgid="2253764780863500516">"Ver endereço"</string>
-    <string name="map_custom" msgid="5581743097882436157">"Ver endereço de <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="chat_aim" msgid="2954364435497941659">"Chat através do AIM"</string>
-    <string name="chat_msn" msgid="3130135239071228678">"Chat através do Windows Live"</string>
-    <string name="chat_yahoo" msgid="3233552142326865347">"Chat através do Yahoo"</string>
-    <string name="chat_skype" msgid="6486703981390592425">"Chat através do Skype"</string>
-    <string name="chat_qq" msgid="786924280665740019">"Chat através do QQ"</string>
-    <string name="chat_gtalk" msgid="7914674177243078035">"Chat através do Google Talk"</string>
-    <string name="chat_icq" msgid="3292934726414765801">"Chat através do ICQ"</string>
-    <string name="chat_jabber" msgid="6701542313597880204">"Chat através do Jabber"</string>
-    <string name="chat" msgid="1020428260359370236">"Chat"</string>
-    <string name="list_filter_all_accounts" msgid="473782314881473992">"Todos os contactos"</string>
-    <string name="listAllContactsInAccount" msgid="3486378621592995630">"Contactos em <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="listCustomView" msgid="5306282632413086731">"Contactos na vista personalizada"</string>
-    <string name="listSingleContact" msgid="8620818791932382627">"Contacto único"</string>
-    <string name="display_options_sort_list_by" msgid="3541875948367831228">"Ordenar por"</string>
-    <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"Nome próprio"</string>
-    <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"Apelido"</string>
-    <string name="display_options_view_names_as" msgid="4204204205736735618">"Formato do nome"</string>
-    <string name="display_options_view_given_name_first" msgid="2308026973021171020">"Nome próprio em primeiro lugar"</string>
-    <string name="display_options_view_family_name_first" msgid="987430497292428242">"Apelido em primeiro lugar"</string>
-    <string name="menu_clear_frequents" msgid="5358271535047496120">"Limpar frequentes"</string>
-    <string name="action_menu_back_from_search" msgid="3550669942742167644">"parar de pesquisar"</string>
-    <string name="description_clear_search" msgid="2347258825265600782">"Limpar pesquisa"</string>
-    <string name="select_account_dialog_title" msgid="2673504582803359239">"Conta"</string>
-    <string name="set_default_account" msgid="7966099951006467572">"Utilizar sempre este para chamadas"</string>
-    <string name="select_phone_account_for_calls" msgid="1784460686103423274">"Ao telefone com"</string>
-    <string name="call_with_a_note" msgid="6242261320491851133">"Ligar com uma nota"</string>
-    <string name="call_subject_hint" msgid="7233138753650420800">"Escrever uma nota para enviar com a chamada..."</string>
-    <string name="send_and_call_button" msgid="4735168294120154013">"ENVIAR E LIGAR"</string>
-    <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g>/<xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="tab_title" msgid="3387876802026074288">"Separador <xliff:g id="TITLE">%1$s</xliff:g>."</string>
-    <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
-      <item quantity="one"> Separador <xliff:g id="TITLE_0">%1$s</xliff:g>. <xliff:g id="COUNT_1">%2$d</xliff:g> item não lido. </item>
-      <item quantity="other"> Separador <xliff:g id="TITLE_2">%1$s</xliff:g>. <xliff:g id="COUNT_3">%2$d</xliff:g> itens não lidos. </item>
-    </plurals>
-    <string name="description_search_video_call" msgid="4337369876888024909">"Videochamada"</string>
-    <string name="description_search_call_and_share" msgid="4912772842755050467">"Partilhar e ligar"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_custom">Telefonar para %s</string>
+  <string name="call_home">Telefonar para casa</string>
+  <string name="call_mobile">Telefonar para telemóvel</string>
+  <string name="call_work">Telefonar para o trabalho</string>
+  <string name="call_fax_work">Telefonar para o faxe do trabalho</string>
+  <string name="call_fax_home">Telefonar para o faxe de casa</string>
+  <string name="call_pager">Telefonar para o pager</string>
+  <string name="call_other">Telefonar</string>
+  <string name="call_callback">Telefonar para número de retorno de chamada</string>
+  <string name="call_car">Telefonar para o telefone do carro</string>
+  <string name="call_company_main">Telefonar para o número geral da empresa</string>
+  <string name="call_isdn">Telefonar para um telefone ISDN</string>
+  <string name="call_main">Telefonar para o número geral</string>
+  <string name="call_other_fax">Telefonar para o faxe</string>
+  <string name="call_radio">Telefonar para um radiotelefone</string>
+  <string name="call_telex">Telefonar para um telex</string>
+  <string name="call_tty_tdd">Telefonar para um teletipo (TTY/TDD)</string>
+  <string name="call_work_mobile">Telefonar para o telemóvel do trabalho</string>
+  <string name="call_work_pager">Telefonar para o pager do trabalho</string>
+  <string name="call_assistant">Telefonar para %s</string>
+  <string name="call_mms">Telefonar para um número MMS</string>
+  <string name="sms_custom">Enviar mensagem de texto para %s</string>
+  <string name="sms_home">Enviar mensagem de texto para o telefone de casa</string>
+  <string name="sms_mobile">Enviar mensagem de texto para telemóvel</string>
+  <string name="sms_work">Enviar mensagem de texto para trabalho</string>
+  <string name="sms_fax_work">Enviar mensagem de texto para o faxe do trabalho</string>
+  <string name="sms_fax_home">Enviar mensagem de texto para o faxe de casa</string>
+  <string name="sms_pager">Enviar mensagem de texto para o pager</string>
+  <string name="sms_other">Enviar mensagem de texto</string>
+  <string name="sms_callback">Enviar mensagem de texto para um número de retorno de chamada</string>
+  <string name="sms_car">Enviar mensagem de texto para o telefone do carro</string>
+  <string name="sms_company_main">Enviar mensagem de texto para o número geral da empresa</string>
+  <string name="sms_isdn">Enviar mensagem de texto para um telefone ISDN</string>
+  <string name="sms_main">Enviar mensagem de texto para o número de telefone geral</string>
+  <string name="sms_other_fax">Enviar mensagem de texto para o faxe</string>
+  <string name="sms_radio">Enviar mensagem de texto para um radiotelefone</string>
+  <string name="sms_telex">Enviar mensagem de texto para o telex</string>
+  <string name="sms_tty_tdd">Enviar mensagem de texto para um teletipo (TTY/TDD)</string>
+  <string name="sms_work_mobile">Enviar mensagem de texto para o telemóvel do trabalho</string>
+  <string name="sms_work_pager">Enviar mensagem de texto para o pager do trabalho</string>
+  <string name="sms_assistant">Enviar mensagem de texto para %s</string>
+  <string name="sms_mms">Enviar mensagem de texto para um número MMS</string>
+  <string name="clearFrequentsConfirmation_title">Limpar contactos frequentes?</string>
+  <string name="clearFrequentsConfirmation">Limpa a lista de contactos frequentes nas aplicações Contactos e Telemóvel e força as aplicações de email a aprenderem as suas preferências de endereço de raiz.</string>
+  <string name="clearFrequentsProgress_title">A limpar contactos frequentes...</string>
+  <string name="status_available">Disponível</string>
+  <string name="status_away">Ausente</string>
+  <string name="status_busy">Ocupado(a)</string>
+  <string name="contactsList">Contactos</string>
+  <string name="contact_suggestions">Principais sugestões</string>
+  <string name="local_invisible_directory">Outro</string>
+  <string name="directory_search_label">Diretório</string>
+  <string name="directory_search_label_work">Diretório de trabalho</string>
+  <string name="local_search_label">Todos os contactos</string>
+  <string name="local_suggestions_search_label">Sugestões</string>
+  <string msgid="9154761216179882405" name="user_profile_contacts_list_header">Eu</string>
+  <string name="missing_name">(Sem nome)</string>
+  <string msgid="2795575601596468581" name="description_view_contact_detail">Ver contacto</string>
+  <string name="list_filter_phones">Todos os contactos com números de telefone</string>
+  <string name="list_filter_phones_work">Contactos do perfil de trabalho</string>
+  <string name="view_updates_from_group">Ver atualizações</string>
+  <string name="account_phone">Apenas no dispositivo, não sincronizado</string>
+  <string name="nameLabelsGroup">Nome</string>
+  <string name="nicknameLabelsGroup">Pseudónimo</string>
+  <string name="full_name">Nome</string>
+  <string name="name_given">Nome próprio</string>
+  <string name="name_family">Apelido</string>
+  <string name="name_prefix">Prefixo do nome</string>
+  <string name="name_middle">Primeiro apelido</string>
+  <string name="name_suffix">Sufixo do nome</string>
+  <string name="name_phonetic">Nome (fonética)</string>
+  <string name="name_phonetic_given">Nome próprio fonético</string>
+  <string name="name_phonetic_middle">Nome do meio fonético</string>
+  <string name="name_phonetic_family">Apelido fonético</string>
+  <string name="phoneLabelsGroup">Telefone</string>
+  <string name="emailLabelsGroup">Enviar email</string>
+  <string name="postalLabelsGroup">Endereço</string>
+  <string name="imLabelsGroup">IM</string>
+  <string name="organizationLabelsGroup">Organização</string>
+  <string name="relationLabelsGroup">Tipo de relação</string>
+  <string name="eventLabelsGroup">Data especial</string>
+  <string name="sms">Mensagem de texto</string>
+  <string name="postal_address">Endereço</string>
+  <string name="ghostData_company">Empresa</string>
+  <string name="ghostData_title">Título</string>
+  <string name="label_notes">Notas</string>
+  <string name="label_sip_address">SIP</string>
+  <string name="websiteLabelsGroup">Website</string>
+  <string name="groupsLabel">Grupos</string>
+  <string name="email_home">Enviar email para residência</string>
+  <string name="email_mobile">Enviar email para dispositivo móvel</string>
+  <string name="email_work">Enviar email para emprego</string>
+  <string name="email_other">Enviar email</string>
+  <string name="email_custom">Enviar email a %s</string>
+  <string name="email">Enviar email</string>
+  <string name="postal_street">Rua</string>
+  <string name="postal_city">Cidade</string>
+  <string name="postal_region">Estado</string>
+  <string name="postal_postcode">Código postal</string>
+  <string name="postal_country">País</string>
+  <string name="map_home">Ver endereço da residência</string>
+  <string name="map_work">Ver endereço do emprego</string>
+  <string name="map_other">Ver endereço</string>
+  <string name="map_custom">Ver endereço de %s</string>
+  <string name="chat_aim">Chat através do AIM</string>
+  <string name="chat_msn">Chat através do Windows Live</string>
+  <string name="chat_yahoo">Chat através do Yahoo</string>
+  <string name="chat_skype">Chat através do Skype</string>
+  <string name="chat_qq">Chat através do QQ</string>
+  <string name="chat_gtalk">Chat através do Google Talk</string>
+  <string name="chat_icq">Chat através do ICQ</string>
+  <string name="chat_jabber">Chat através do Jabber</string>
+  <string name="chat">Chat</string>
+  <string name="list_filter_all_accounts">Todos os contactos</string>
+  <string name="listAllContactsInAccount">Contactos em %s</string>
+  <string name="listCustomView">Contactos na vista personalizada</string>
+  <string name="listSingleContact">Contacto único</string>
+  <string name="display_options_sort_list_by">Ordenar por</string>
+  <string name="display_options_sort_by_given_name">Nome próprio</string>
+  <string name="display_options_sort_by_family_name">Apelido</string>
+  <string name="display_options_view_names_as">Formato do nome</string>
+  <string name="display_options_view_given_name_first">Nome próprio em primeiro lugar</string>
+  <string name="display_options_view_family_name_first">Apelido em primeiro lugar</string>
+  <string name="menu_clear_frequents">Limpar frequentes</string>
+  <string name="action_menu_back_from_search">parar de pesquisar</string>
+  <string name="description_clear_search">Limpar pesquisa</string>
+  <string name="select_account_dialog_title">Conta</string>
+  <string name="set_default_account">Utilizar sempre este para chamadas</string>
+  <string name="select_phone_account_for_calls">Escolher o SIM para esta chamada</string>
+  <string name="select_phone_account_for_calls_remember">Lembrar esta escolha</string>
+  <string name="call_with_a_note">Ligar com uma nota</string>
+  <string name="call_subject_hint">Escrever uma nota para enviar com a chamada...</string>
+  <string name="send_and_call_button">ENVIAR E LIGAR</string>
+  <string name="call_subject_limit">%1$s/%2$s</string>
+  <string name="old_call_subject_type_and_number">%1$s %2$s</string>
+  <string name="tab_title">Separador %1$s.</string>
+  <plurals name="tab_title_with_unread_items">
+    <item quantity="one"> Separador %1$s. %2$d item não lido. </item>
+    <item quantity="other"> Separador %1$s. %2$d itens não lidos. </item>
+  </plurals>
+  <string name="description_search_video_call">Videochamada</string>
+  <string name="description_search_call_and_share">Partilhar e ligar</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-pt/strings.xml b/java/com/android/contacts/common/res/values-pt/strings.xml
index f517c7a..244db57 100644
--- a/java/com/android/contacts/common/res/values-pt/strings.xml
+++ b/java/com/android/contacts/common/res/values-pt/strings.xml
@@ -1,162 +1,145 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="toast_text_copied" msgid="8979281391599667362">"Texto copiado"</string>
-    <string name="call_custom" msgid="3041673234638990874">"Ligar para <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="call_home" msgid="125893483593803791">"Ligar para residência"</string>
-    <string name="call_mobile" msgid="967589404494150813">"Ligar para celular"</string>
-    <string name="call_work" msgid="6040550697395300892">"Ligar para trabalho"</string>
-    <string name="call_fax_work" msgid="5260192771364592922">"Ligar para fax comercial"</string>
-    <string name="call_fax_home" msgid="5174311195081144124">"Ligar para fax residencial"</string>
-    <string name="call_pager" msgid="6814149227741274161">"Ligar para pager"</string>
-    <string name="call_other" msgid="5536385588712587235">"Ligar"</string>
-    <string name="call_callback" msgid="6314019862718112786">"Retornar chamada"</string>
-    <string name="call_car" msgid="3197417098027764954">"Ligar para carro"</string>
-    <string name="call_company_main" msgid="2557663310028446397">"Ligar para empresa (principal)"</string>
-    <string name="call_isdn" msgid="4691270442763649522">"Ligar para ISDN"</string>
-    <string name="call_main" msgid="3293707608770407814">"Ligar para principal"</string>
-    <string name="call_other_fax" msgid="4724521984879021465">"Ligar para fax"</string>
-    <string name="call_radio" msgid="8942441419845057942">"Ligar para rádio"</string>
-    <string name="call_telex" msgid="2031514461660668351">"Ligar para telex"</string>
-    <string name="call_tty_tdd" msgid="7807210224965727701">"Ligar para TTY/TDD"</string>
-    <string name="call_work_mobile" msgid="2716342732938578495">"Ligar para celular comercial"</string>
-    <string name="call_work_pager" msgid="3791778749827366574">"Ligar para pager comercial"</string>
-    <string name="call_assistant" msgid="4177478845473789294">"Ligar para <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
-    <string name="call_mms" msgid="4958811711741872901">"Ligar para MMS"</string>
-    <string name="sms_custom" msgid="8785368968605026317">"Enviar SMS para <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="sms_home" msgid="3527719551060295243">"Enviar SMS para residência"</string>
-    <string name="sms_mobile" msgid="8883045857887736518">"Enviar SMS para celular"</string>
-    <string name="sms_work" msgid="4158595439553450966">"Enviar SMS para trabalho"</string>
-    <string name="sms_fax_work" msgid="5483726627718055248">"Enviar SMS para fax comercial"</string>
-    <string name="sms_fax_home" msgid="9219265155770746077">"Enviar SMS para fax residencial"</string>
-    <string name="sms_pager" msgid="4901085068525193933">"Enviar SMS para pager"</string>
-    <string name="sms_other" msgid="1742702947993285933">"Enviar SMS"</string>
-    <string name="sms_callback" msgid="5833483630377538308">"Enviar SMS para retorno de chamada"</string>
-    <string name="sms_car" msgid="4314577266154395174">"Enviar SMS para carro"</string>
-    <string name="sms_company_main" msgid="2308160928487360705">"Enviar SMS para empresa (principal)"</string>
-    <string name="sms_isdn" msgid="6394300346179302542">"Enviar SMS para ISDN"</string>
-    <string name="sms_main" msgid="8908087742014140774">"Enviar SMS para principal"</string>
-    <string name="sms_other_fax" msgid="8768455473295405427">"Enviar SMS para fax"</string>
-    <string name="sms_radio" msgid="855555176531704682">"Enviar SMS para rádio"</string>
-    <string name="sms_telex" msgid="6269029276223252719">"Enviar SMS para telex"</string>
-    <string name="sms_tty_tdd" msgid="6229057354509192444">"Enviar SMS para TTY/TDD"</string>
-    <string name="sms_work_mobile" msgid="2155975469329969840">"Enviar SMS para celular comercial"</string>
-    <string name="sms_work_pager" msgid="8500140274906830742">"Enviar SMS para pager comercial"</string>
-    <string name="sms_assistant" msgid="8513548482745330818">"Enviar SMS para <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
-    <string name="sms_mms" msgid="5187888900503248542">"Enviar SMS para MMS"</string>
-    <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"Apagar contatos frequentes?"</string>
-    <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"Você apagará a lista de contatos frequentes nos apps Contatos e Telefone, fazendo com que os apps de e-mail tenham que redefinir suas preferências de endereçamento."</string>
-    <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"Apagando contatos frequentes…"</string>
-    <string name="status_available" msgid="2648156525685472626">"Disponível"</string>
-    <string name="status_away" msgid="2298688367552893953">"Ausente"</string>
-    <string name="status_busy" msgid="5990832098713248503">"Ocupado"</string>
-    <string name="contactsList" msgid="8806067891419291513">"Contatos"</string>
-    <string name="contact_suggestions" msgid="3324166754807120006">"Principais sugestões"</string>
-    <string name="local_invisible_directory" msgid="4723238462733650090">"Outros"</string>
-    <string name="directory_search_label" msgid="4621215895484025229">"Diretório"</string>
-    <string name="directory_search_label_work" msgid="7679326282707414897">"Diretório de trabalho"</string>
-    <string name="local_search_label" msgid="907622822323119235">"Todos os contatos"</string>
-    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Sugestões"</string>
-    <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Eu"</string>
-    <string name="missing_name" msgid="978606963362745020">"(Sem nome)"</string>
-    <string name="description_view_contact_detail" msgid="2428742401208561136">"Visualizar contato"</string>
-    <string name="list_filter_phones" msgid="8763316061763437182">"Todos os contatos com números de telefone"</string>
-    <string name="list_filter_phones_work" msgid="7083575404573422965">"Contatos do perfil de trabalho"</string>
-    <string name="view_updates_from_group" msgid="9011641093168385729">"Ver atualizações"</string>
-    <string name="account_phone" msgid="7067809073194061035">"Somente no dispositivo, não sincronizado"</string>
-    <string name="nameLabelsGroup" msgid="7730465833159557471">"Nome"</string>
-    <string name="nicknameLabelsGroup" msgid="6310556912361840029">"Apelido"</string>
-    <string name="full_name" msgid="648186563998465740">"Nome"</string>
-    <string name="name_given" msgid="5096576006314820536">"Nome"</string>
-    <string name="name_family" msgid="6646235805198547467">"Sobrenome"</string>
-    <string name="name_prefix" msgid="9215326539658838">"Prefixo do nome"</string>
-    <string name="name_middle" msgid="703755205331582769">"Nome do meio"</string>
-    <string name="name_suffix" msgid="5777083390282548702">"Sufixo do nome"</string>
-    <string name="name_phonetic" msgid="1650870996361663089">"Nome fonético"</string>
-    <string name="name_phonetic_given" msgid="618812334274603170">"Nome fonético"</string>
-    <string name="name_phonetic_middle" msgid="4826820763384625538">"Nome do meio fonético"</string>
-    <string name="name_phonetic_family" msgid="379905191212930771">"Sobrenome fonético"</string>
-    <string name="phoneLabelsGroup" msgid="169661929021355548">"Telefone"</string>
-    <string name="emailLabelsGroup" msgid="2249752810477488833">"Enviar e-mail"</string>
-    <string name="postalLabelsGroup" msgid="6772000590189142253">"Endereço"</string>
-    <string name="imLabelsGroup" msgid="5718066254237364731">"IM"</string>
-    <string name="organizationLabelsGroup" msgid="1101996309241601435">"Organização"</string>
-    <string name="relationLabelsGroup" msgid="53866051664600053">"Relacionamento"</string>
-    <string name="eventLabelsGroup" msgid="1236970042646618489">"Data especial"</string>
-    <string name="sms" msgid="7574344928185328095">"Mensagem de texto"</string>
-    <string name="postal_address" msgid="1804707930129674200">"Endereço"</string>
-    <string name="ghostData_company" msgid="2554310786296833424">"Empresa"</string>
-    <string name="ghostData_title" msgid="4994968731830184837">"Título"</string>
-    <string name="label_notes" msgid="2050255313694219786">"Notas"</string>
-    <string name="label_sip_address" msgid="8883266182575965926">"SIP"</string>
-    <string name="websiteLabelsGroup" msgid="1630734286462186790">"Website"</string>
-    <string name="groupsLabel" msgid="2694002798416868728">"Grupos"</string>
-    <string name="email_home" msgid="889830029388962171">"Enviar e-mail para residencial"</string>
-    <string name="email_mobile" msgid="4487686436743741150">"Enviar e-mail para celular"</string>
-    <string name="email_work" msgid="4223487303344613528">"Enviar e-mail para comercial"</string>
-    <string name="email_other" msgid="4246411900126012062">"Enviar e-mail"</string>
-    <string name="email_custom" msgid="7246580894327511013">"Enviar e-mail para <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="email" msgid="2807318537887091606">"Enviar e-mail"</string>
-    <string name="postal_street" msgid="6918171741240802474">"Rua"</string>
-    <string name="postal_city" msgid="8674569121430005628">"Cidade"</string>
-    <string name="postal_region" msgid="1730369286225469192">"Estado"</string>
-    <string name="postal_postcode" msgid="4450700741261990439">"CEP"</string>
-    <string name="postal_country" msgid="232670707458768148">"País"</string>
-    <string name="map_home" msgid="4181131107392126938">"Ver endereço residencial"</string>
-    <string name="map_work" msgid="5723471185992684400">"Ver endereço comercial"</string>
-    <string name="map_other" msgid="2253764780863500516">"Ver endereço"</string>
-    <string name="map_custom" msgid="5581743097882436157">"Ver endereço de <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="chat_aim" msgid="2954364435497941659">"Bater papo usando o AIM"</string>
-    <string name="chat_msn" msgid="3130135239071228678">"Bater papo usando o Windows Live"</string>
-    <string name="chat_yahoo" msgid="3233552142326865347">"Bater papo usando o Yahoo"</string>
-    <string name="chat_skype" msgid="6486703981390592425">"Bater papo usando o Skype"</string>
-    <string name="chat_qq" msgid="786924280665740019">"Bater papo usando o QQ"</string>
-    <string name="chat_gtalk" msgid="7914674177243078035">"Bater papo usando o Google Talk"</string>
-    <string name="chat_icq" msgid="3292934726414765801">"Bater papo usando o ICQ"</string>
-    <string name="chat_jabber" msgid="6701542313597880204">"Bater papo usando o Jabber"</string>
-    <string name="chat" msgid="1020428260359370236">"Bate-papo"</string>
-    <string name="list_filter_all_accounts" msgid="473782314881473992">"Todos os contatos"</string>
-    <string name="listAllContactsInAccount" msgid="3486378621592995630">"Contatos em <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="listCustomView" msgid="5306282632413086731">"Cont. na vis. pers."</string>
-    <string name="listSingleContact" msgid="8620818791932382627">"Contato único"</string>
-    <string name="display_options_sort_list_by" msgid="3541875948367831228">"Classificar por"</string>
-    <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"Nome"</string>
-    <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"Sobrenome"</string>
-    <string name="display_options_view_names_as" msgid="4204204205736735618">"Formato de nome"</string>
-    <string name="display_options_view_given_name_first" msgid="2308026973021171020">"Primeiro o nome"</string>
-    <string name="display_options_view_family_name_first" msgid="987430497292428242">"Primeiro o sobrenome"</string>
-    <string name="menu_clear_frequents" msgid="5358271535047496120">"Apagar frequentes"</string>
-    <string name="action_menu_back_from_search" msgid="3550669942742167644">"parar de pesquisar"</string>
-    <string name="description_clear_search" msgid="2347258825265600782">"Limpar pesquisa"</string>
-    <string name="select_account_dialog_title" msgid="2673504582803359239">"Conta"</string>
-    <string name="set_default_account" msgid="7966099951006467572">"Sempre usar esta opção para chamadas"</string>
-    <string name="select_phone_account_for_calls" msgid="1784460686103423274">"Ligar com"</string>
-    <string name="call_with_a_note" msgid="6242261320491851133">"Chamada com uma nota"</string>
-    <string name="call_subject_hint" msgid="7233138753650420800">"Escreva uma nota para enviar com a chamada..."</string>
-    <string name="send_and_call_button" msgid="4735168294120154013">"ENVIAR E LIGAR"</string>
-    <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="tab_title" msgid="3387876802026074288">"Guia \"<xliff:g id="TITLE">%1$s</xliff:g>\"."</string>
-    <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
-      <item quantity="one">Guia \"<xliff:g id="TITLE_2">%1$s</xliff:g>\". <xliff:g id="COUNT_3">%2$d</xliff:g> item não lido. </item>
-      <item quantity="other">Guia \"<xliff:g id="TITLE_2">%1$s</xliff:g>\". <xliff:g id="COUNT_3">%2$d</xliff:g> itens não lidos. </item>
-    </plurals>
-    <string name="description_search_video_call" msgid="4337369876888024909">"Videochamada"</string>
-    <string name="description_search_call_and_share" msgid="4912772842755050467">"Compartilhar e ligar"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_custom">Ligar para %s</string>
+  <string name="call_home">Ligar para residência</string>
+  <string name="call_mobile">Ligar para celular</string>
+  <string name="call_work">Ligar para trabalho</string>
+  <string name="call_fax_work">Ligar para fax comercial</string>
+  <string name="call_fax_home">Ligar para fax residencial</string>
+  <string name="call_pager">Ligar para pager</string>
+  <string name="call_other">Ligar</string>
+  <string name="call_callback">Retornar chamada</string>
+  <string name="call_car">Ligar para carro</string>
+  <string name="call_company_main">Ligar para empresa (principal)</string>
+  <string name="call_isdn">Ligar para ISDN</string>
+  <string name="call_main">Ligar para principal</string>
+  <string name="call_other_fax">Ligar para fax</string>
+  <string name="call_radio">Ligar para rádio</string>
+  <string name="call_telex">Ligar para telex</string>
+  <string name="call_tty_tdd">Ligar para TTY/TDD</string>
+  <string name="call_work_mobile">Ligar para celular comercial</string>
+  <string name="call_work_pager">Ligar para pager comercial</string>
+  <string name="call_assistant">Ligar para %s</string>
+  <string name="call_mms">Ligar para MMS</string>
+  <string name="sms_custom">Enviar SMS para %s</string>
+  <string name="sms_home">Enviar SMS para residência</string>
+  <string name="sms_mobile">Enviar SMS para celular</string>
+  <string name="sms_work">Enviar SMS para trabalho</string>
+  <string name="sms_fax_work">Enviar SMS para fax comercial</string>
+  <string name="sms_fax_home">Enviar SMS para fax residencial</string>
+  <string name="sms_pager">Enviar SMS para pager</string>
+  <string name="sms_other">Enviar SMS</string>
+  <string name="sms_callback">Enviar SMS para retorno de chamada</string>
+  <string name="sms_car">Enviar SMS para carro</string>
+  <string name="sms_company_main">Enviar SMS para empresa (principal)</string>
+  <string name="sms_isdn">Enviar SMS para ISDN</string>
+  <string name="sms_main">Enviar SMS para principal</string>
+  <string name="sms_other_fax">Enviar SMS para fax</string>
+  <string name="sms_radio">Enviar SMS para rádio</string>
+  <string name="sms_telex">Enviar SMS para telex</string>
+  <string name="sms_tty_tdd">Enviar SMS para TTY/TDD</string>
+  <string name="sms_work_mobile">Enviar SMS para celular comercial</string>
+  <string name="sms_work_pager">Enviar SMS para pager comercial</string>
+  <string name="sms_assistant">Enviar SMS para %s</string>
+  <string name="sms_mms">Enviar SMS para MMS</string>
+  <string name="clearFrequentsConfirmation_title">Apagar contatos frequentes?</string>
+  <string name="clearFrequentsConfirmation">Você apagará a lista de contatos frequentes nos apps Contatos e Telefone, fazendo com que os apps de e-mail tenham que redefinir suas preferências de endereçamento.</string>
+  <string name="clearFrequentsProgress_title">Apagando contatos frequentes…</string>
+  <string name="status_available">Disponível</string>
+  <string name="status_away">Ausente</string>
+  <string name="status_busy">Ocupado</string>
+  <string name="contactsList">Contatos</string>
+  <string name="contact_suggestions">Principais sugestões</string>
+  <string name="local_invisible_directory">Outros</string>
+  <string name="directory_search_label">Diretório</string>
+  <string name="directory_search_label_work">Diretório de trabalho</string>
+  <string name="local_search_label">Todos os contatos</string>
+  <string name="local_suggestions_search_label">Sugestões</string>
+  <string msgid="9154761216179882405" name="user_profile_contacts_list_header">Eu</string>
+  <string name="missing_name">(Sem nome)</string>
+  <string msgid="2795575601596468581" name="description_view_contact_detail">Visualizar contato</string>
+  <string name="list_filter_phones">Todos os contatos com números de telefone</string>
+  <string name="list_filter_phones_work">Contatos do perfil de trabalho</string>
+  <string name="view_updates_from_group">Ver atualizações</string>
+  <string name="account_phone">Somente no dispositivo, não sincronizado</string>
+  <string name="nameLabelsGroup">Nome</string>
+  <string name="nicknameLabelsGroup">Apelido</string>
+  <string name="full_name">Nome</string>
+  <string name="name_given">Nome</string>
+  <string name="name_family">Sobrenome</string>
+  <string name="name_prefix">Prefixo do nome</string>
+  <string name="name_middle">Nome do meio</string>
+  <string name="name_suffix">Sufixo do nome</string>
+  <string name="name_phonetic">Nome fonético</string>
+  <string name="name_phonetic_given">Nome fonético</string>
+  <string name="name_phonetic_middle">Nome do meio fonético</string>
+  <string name="name_phonetic_family">Sobrenome fonético</string>
+  <string name="phoneLabelsGroup">Telefone</string>
+  <string name="emailLabelsGroup">Enviar e-mail</string>
+  <string name="postalLabelsGroup">Endereço</string>
+  <string name="imLabelsGroup">IM</string>
+  <string name="organizationLabelsGroup">Organização</string>
+  <string name="relationLabelsGroup">Relacionamento</string>
+  <string name="eventLabelsGroup">Data especial</string>
+  <string name="sms">Mensagem de texto</string>
+  <string name="postal_address">Endereço</string>
+  <string name="ghostData_company">Empresa</string>
+  <string name="ghostData_title">Título</string>
+  <string name="label_notes">Notas</string>
+  <string name="label_sip_address">SIP</string>
+  <string name="websiteLabelsGroup">Website</string>
+  <string name="groupsLabel">Grupos</string>
+  <string name="email_home">Enviar e-mail para residencial</string>
+  <string name="email_mobile">Enviar e-mail para celular</string>
+  <string name="email_work">Enviar e-mail para comercial</string>
+  <string name="email_other">Enviar e-mail</string>
+  <string name="email_custom">Enviar e-mail para %s</string>
+  <string name="email">Enviar e-mail</string>
+  <string name="postal_street">Rua</string>
+  <string name="postal_city">Cidade</string>
+  <string name="postal_region">Estado</string>
+  <string name="postal_postcode">CEP</string>
+  <string name="postal_country">País</string>
+  <string name="map_home">Ver endereço residencial</string>
+  <string name="map_work">Ver endereço comercial</string>
+  <string name="map_other">Ver endereço</string>
+  <string name="map_custom">Ver endereço de %s</string>
+  <string name="chat_aim">Bater papo usando o AIM</string>
+  <string name="chat_msn">Bater papo usando o Windows Live</string>
+  <string name="chat_yahoo">Bater papo usando o Yahoo</string>
+  <string name="chat_skype">Bater papo usando o Skype</string>
+  <string name="chat_qq">Bater papo usando o QQ</string>
+  <string name="chat_gtalk">Bater papo usando o Google Talk</string>
+  <string name="chat_icq">Bater papo usando o ICQ</string>
+  <string name="chat_jabber">Bater papo usando o Jabber</string>
+  <string name="chat">Bate-papo</string>
+  <string name="list_filter_all_accounts">Todos os contatos</string>
+  <string name="listAllContactsInAccount">Contatos em %s</string>
+  <string name="listCustomView">Cont. na vis. pers.</string>
+  <string name="listSingleContact">Contato único</string>
+  <string name="display_options_sort_list_by">Classificar por</string>
+  <string name="display_options_sort_by_given_name">Nome</string>
+  <string name="display_options_sort_by_family_name">Sobrenome</string>
+  <string name="display_options_view_names_as">Formato de nome</string>
+  <string name="display_options_view_given_name_first">Primeiro o nome</string>
+  <string name="display_options_view_family_name_first">Primeiro o sobrenome</string>
+  <string name="menu_clear_frequents">Apagar frequentes</string>
+  <string name="action_menu_back_from_search">parar de pesquisar</string>
+  <string name="description_clear_search">Limpar pesquisa</string>
+  <string name="select_account_dialog_title">Conta</string>
+  <string name="set_default_account">Sempre usar esta opção para chamadas</string>
+  <string name="select_phone_account_for_calls">Escolher o SIM para esta chamada</string>
+  <string name="select_phone_account_for_calls_remember">Lembrar desta escolha</string>
+  <string name="call_with_a_note">Chamada com uma nota</string>
+  <string name="call_subject_hint">Escreva uma nota para enviar com a chamada...</string>
+  <string name="send_and_call_button">ENVIAR E LIGAR</string>
+  <string name="call_subject_limit">%1$s / %2$s</string>
+  <string name="old_call_subject_type_and_number">%1$s %2$s</string>
+  <string name="tab_title">Guia \"%1$s\".</string>
+  <plurals name="tab_title_with_unread_items">
+    <item quantity="one">Guia \"%1$s\". %2$d item não lido. </item>
+    <item quantity="other">Guia \"%1$s\". %2$d itens não lidos. </item>
+  </plurals>
+  <string name="description_search_video_call">Videochamada</string>
+  <string name="description_search_call_and_share">Compartilhar e ligar</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-ro/strings.xml b/java/com/android/contacts/common/res/values-ro/strings.xml
index b4426cd..f08de57 100644
--- a/java/com/android/contacts/common/res/values-ro/strings.xml
+++ b/java/com/android/contacts/common/res/values-ro/strings.xml
@@ -1,163 +1,146 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="toast_text_copied" msgid="8979281391599667362">"Text copiat"</string>
-    <string name="call_custom" msgid="3041673234638990874">"Apelați <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="call_home" msgid="125893483593803791">"Apelați numărul de domiciliu"</string>
-    <string name="call_mobile" msgid="967589404494150813">"Apelați numărul de mobil"</string>
-    <string name="call_work" msgid="6040550697395300892">"Apelați numărul de serviciu"</string>
-    <string name="call_fax_work" msgid="5260192771364592922">"Apelați numărul de fax de serviciu"</string>
-    <string name="call_fax_home" msgid="5174311195081144124">"Apelați numărul de fax de domiciliu"</string>
-    <string name="call_pager" msgid="6814149227741274161">"Apelați numărul de pager"</string>
-    <string name="call_other" msgid="5536385588712587235">"Apelați"</string>
-    <string name="call_callback" msgid="6314019862718112786">"Apelați un număr cu apelare inversă"</string>
-    <string name="call_car" msgid="3197417098027764954">"Apelați numărul de mașină"</string>
-    <string name="call_company_main" msgid="2557663310028446397">"Apelați numărul principal al companiei"</string>
-    <string name="call_isdn" msgid="4691270442763649522">"Apelați ISDN"</string>
-    <string name="call_main" msgid="3293707608770407814">"Apelați numărul principal"</string>
-    <string name="call_other_fax" msgid="4724521984879021465">"Apelați numărul de fax"</string>
-    <string name="call_radio" msgid="8942441419845057942">"Apelați un număr radio"</string>
-    <string name="call_telex" msgid="2031514461660668351">"Apelați un număr de telex"</string>
-    <string name="call_tty_tdd" msgid="7807210224965727701">"Apelați TTY/TDD"</string>
-    <string name="call_work_mobile" msgid="2716342732938578495">"Apelați numărul de mobil de la serviciu"</string>
-    <string name="call_work_pager" msgid="3791778749827366574">"Apelați numărul de pager de serviciu"</string>
-    <string name="call_assistant" msgid="4177478845473789294">"Apelați <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
-    <string name="call_mms" msgid="4958811711741872901">"Apelați MMS"</string>
-    <string name="sms_custom" msgid="8785368968605026317">"Trimiteți un mesaj text către <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="sms_home" msgid="3527719551060295243">"Trimiteți un mesaj text către telefonul de domiciliu"</string>
-    <string name="sms_mobile" msgid="8883045857887736518">"Trimiteți un mesaj text către numărul de mobil"</string>
-    <string name="sms_work" msgid="4158595439553450966">"Trimiteți un mesaj text către numărul de serviciu"</string>
-    <string name="sms_fax_work" msgid="5483726627718055248">"Trimiteți un mesaj text către un număr de fax de serviciu"</string>
-    <string name="sms_fax_home" msgid="9219265155770746077">"Trimiteți un mesaj text către un număr de fax de domiciliu"</string>
-    <string name="sms_pager" msgid="4901085068525193933">"Trimiteți un mesaj text către un număr de pager"</string>
-    <string name="sms_other" msgid="1742702947993285933">"Trimiteți un mesaj text"</string>
-    <string name="sms_callback" msgid="5833483630377538308">"Trimiteți un mesaj text către un număr cu apelare inversă"</string>
-    <string name="sms_car" msgid="4314577266154395174">"Trimiteți un mesaj text către un număr de telefon de mașină"</string>
-    <string name="sms_company_main" msgid="2308160928487360705">"Trimiteți un mesaj text către numărul principal al companiei"</string>
-    <string name="sms_isdn" msgid="6394300346179302542">"Trimiteți un mesaj text către un număr ISDN"</string>
-    <string name="sms_main" msgid="8908087742014140774">"Trimiteți un mesaj text către numărul principal"</string>
-    <string name="sms_other_fax" msgid="8768455473295405427">"Trimiteți un mesaj text către un număr de fax"</string>
-    <string name="sms_radio" msgid="855555176531704682">"Trimiteți un mesaj text către un număr radio"</string>
-    <string name="sms_telex" msgid="6269029276223252719">"Trimiteți un mesaj text către un număr de telex"</string>
-    <string name="sms_tty_tdd" msgid="6229057354509192444">"Trimiteți un mesaj text către TTY/TDD"</string>
-    <string name="sms_work_mobile" msgid="2155975469329969840">"Trimiteți un mesaj text către numărul de mobil de serviciu"</string>
-    <string name="sms_work_pager" msgid="8500140274906830742">"Trimiteți un mesaj text către un număr de pager de serviciu"</string>
-    <string name="sms_assistant" msgid="8513548482745330818">"Trimiteți un mesaj text către <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
-    <string name="sms_mms" msgid="5187888900503248542">"Trimiteți un mesaj text către un număr MMS"</string>
-    <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"Ștergeți pers. frecvent contactate?"</string>
-    <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"Veți șterge lista persoanelor contactate frecvent din aplicațiile Agendă și Telefon și veți forța aplicațiile de e-mail să vă învețe preferințele pentru adrese de la zero."</string>
-    <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"Se șterg pers. frecvent contactate…"</string>
-    <string name="status_available" msgid="2648156525685472626">"Disponibil(ă)"</string>
-    <string name="status_away" msgid="2298688367552893953">"Plecat(ă)"</string>
-    <string name="status_busy" msgid="5990832098713248503">"Ocupat(ă)"</string>
-    <string name="contactsList" msgid="8806067891419291513">"Agendă"</string>
-    <string name="contact_suggestions" msgid="3324166754807120006">"Cele mai populare sugestii"</string>
-    <string name="local_invisible_directory" msgid="4723238462733650090">"Altul"</string>
-    <string name="directory_search_label" msgid="4621215895484025229">"Director"</string>
-    <string name="directory_search_label_work" msgid="7679326282707414897">"Directorul de serviciu"</string>
-    <string name="local_search_label" msgid="907622822323119235">"Toată agenda"</string>
-    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Sugestii"</string>
-    <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Eu"</string>
-    <string name="missing_name" msgid="978606963362745020">"(Fără nume)"</string>
-    <string name="description_view_contact_detail" msgid="2428742401208561136">"Vizualizați persoana din agendă"</string>
-    <string name="list_filter_phones" msgid="8763316061763437182">"Toate persoanele de contact cu numere de telefon"</string>
-    <string name="list_filter_phones_work" msgid="7083575404573422965">"Persoane de contact din profilul de serviciu"</string>
-    <string name="view_updates_from_group" msgid="9011641093168385729">"Afișați actualizări"</string>
-    <string name="account_phone" msgid="7067809073194061035">"Numai pe dispozitiv, nesincronizat"</string>
-    <string name="nameLabelsGroup" msgid="7730465833159557471">"Nume"</string>
-    <string name="nicknameLabelsGroup" msgid="6310556912361840029">"Pseudonim"</string>
-    <string name="full_name" msgid="648186563998465740">"Nume"</string>
-    <string name="name_given" msgid="5096576006314820536">"Prenume"</string>
-    <string name="name_family" msgid="6646235805198547467">"Nume"</string>
-    <string name="name_prefix" msgid="9215326539658838">"Prefixul numelui"</string>
-    <string name="name_middle" msgid="703755205331582769">"Al doilea prenume"</string>
-    <string name="name_suffix" msgid="5777083390282548702">"Sufixul numelui"</string>
-    <string name="name_phonetic" msgid="1650870996361663089">"Nume fonetic"</string>
-    <string name="name_phonetic_given" msgid="618812334274603170">"Prenume fonetic"</string>
-    <string name="name_phonetic_middle" msgid="4826820763384625538">"Al doilea prenume fonetic"</string>
-    <string name="name_phonetic_family" msgid="379905191212930771">"Nume fonetic"</string>
-    <string name="phoneLabelsGroup" msgid="169661929021355548">"Telefon"</string>
-    <string name="emailLabelsGroup" msgid="2249752810477488833">"Trimiteți un e-mail"</string>
-    <string name="postalLabelsGroup" msgid="6772000590189142253">"Adresă"</string>
-    <string name="imLabelsGroup" msgid="5718066254237364731">"IM"</string>
-    <string name="organizationLabelsGroup" msgid="1101996309241601435">"Organizație"</string>
-    <string name="relationLabelsGroup" msgid="53866051664600053">"Relație"</string>
-    <string name="eventLabelsGroup" msgid="1236970042646618489">"Dată specială"</string>
-    <string name="sms" msgid="7574344928185328095">"Mesaj text"</string>
-    <string name="postal_address" msgid="1804707930129674200">"Adresă"</string>
-    <string name="ghostData_company" msgid="2554310786296833424">"Companie"</string>
-    <string name="ghostData_title" msgid="4994968731830184837">"Titlu"</string>
-    <string name="label_notes" msgid="2050255313694219786">"Note"</string>
-    <string name="label_sip_address" msgid="8883266182575965926">"SIP"</string>
-    <string name="websiteLabelsGroup" msgid="1630734286462186790">"Site web"</string>
-    <string name="groupsLabel" msgid="2694002798416868728">"Grupuri"</string>
-    <string name="email_home" msgid="889830029388962171">"Trimiteți un e-mail la o adresă de e-mail de domiciliu"</string>
-    <string name="email_mobile" msgid="4487686436743741150">"Trimiteți un e-mail către un telefon mobil"</string>
-    <string name="email_work" msgid="4223487303344613528">"Trimiteți un e-mail la o adresă de e-mail de serviciu"</string>
-    <string name="email_other" msgid="4246411900126012062">"Trimiteți un e-mail"</string>
-    <string name="email_custom" msgid="7246580894327511013">"Trimiteți un e-mail la <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="email" msgid="2807318537887091606">"Trimiteți un e-mail"</string>
-    <string name="postal_street" msgid="6918171741240802474">"Stradă"</string>
-    <string name="postal_city" msgid="8674569121430005628">"Oraș"</string>
-    <string name="postal_region" msgid="1730369286225469192">"Stat"</string>
-    <string name="postal_postcode" msgid="4450700741261990439">"Cod poștal"</string>
-    <string name="postal_country" msgid="232670707458768148">"Țară"</string>
-    <string name="map_home" msgid="4181131107392126938">"Vizualizați adresa de domiciliu"</string>
-    <string name="map_work" msgid="5723471185992684400">"Vizualizați adresa de serviciu"</string>
-    <string name="map_other" msgid="2253764780863500516">"Vizualizați adresa poștală"</string>
-    <string name="map_custom" msgid="5581743097882436157">"Vizualizați adresa <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="chat_aim" msgid="2954364435497941659">"Conversați prin AIM"</string>
-    <string name="chat_msn" msgid="3130135239071228678">"Conversați prin Windows Live"</string>
-    <string name="chat_yahoo" msgid="3233552142326865347">"Conversați prin Yahoo"</string>
-    <string name="chat_skype" msgid="6486703981390592425">"Conversați prin Skype"</string>
-    <string name="chat_qq" msgid="786924280665740019">"Conversați prin QQ"</string>
-    <string name="chat_gtalk" msgid="7914674177243078035">"Conversați prin Google Talk"</string>
-    <string name="chat_icq" msgid="3292934726414765801">"Conversați prin ICQ"</string>
-    <string name="chat_jabber" msgid="6701542313597880204">"Conversați prin Jabber"</string>
-    <string name="chat" msgid="1020428260359370236">"Conversați prin chat"</string>
-    <string name="list_filter_all_accounts" msgid="473782314881473992">"Toată agenda"</string>
-    <string name="listAllContactsInAccount" msgid="3486378621592995630">"Agenda din <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="listCustomView" msgid="5306282632413086731">"Agenda în afișarea personalizată"</string>
-    <string name="listSingleContact" msgid="8620818791932382627">"O singură persoană de contact"</string>
-    <string name="display_options_sort_list_by" msgid="3541875948367831228">"Sortați după"</string>
-    <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"Prenume"</string>
-    <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"Nume"</string>
-    <string name="display_options_view_names_as" msgid="4204204205736735618">"Format pentru nume"</string>
-    <string name="display_options_view_given_name_first" msgid="2308026973021171020">"Întâi prenumele"</string>
-    <string name="display_options_view_family_name_first" msgid="987430497292428242">"Întâi numele"</string>
-    <string name="menu_clear_frequents" msgid="5358271535047496120">"Ștergeți contacte frecvente"</string>
-    <string name="action_menu_back_from_search" msgid="3550669942742167644">"nu mai căutați"</string>
-    <string name="description_clear_search" msgid="2347258825265600782">"Ștergeți căutarea"</string>
-    <string name="select_account_dialog_title" msgid="2673504582803359239">"Cont"</string>
-    <string name="set_default_account" msgid="7966099951006467572">"Utilizați mereu pentru apeluri"</string>
-    <string name="select_phone_account_for_calls" msgid="1784460686103423274">"Apelați cu"</string>
-    <string name="call_with_a_note" msgid="6242261320491851133">"Apelați împreună cu o notă"</string>
-    <string name="call_subject_hint" msgid="7233138753650420800">"Introduceți o notă ca să o trimiteți împreună cu apelul..."</string>
-    <string name="send_and_call_button" msgid="4735168294120154013">"TRIMITEȚI ȘI APELAȚI"</string>
-    <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g>/<xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="tab_title" msgid="3387876802026074288">"Fila <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
-      <item quantity="few"> Fila <xliff:g id="TITLE_2">%1$s</xliff:g>. <xliff:g id="COUNT_3">%2$d</xliff:g> elemente necitite. </item>
-      <item quantity="other"> Fila <xliff:g id="TITLE_2">%1$s</xliff:g>. <xliff:g id="COUNT_3">%2$d</xliff:g> de elemente necitite. </item>
-      <item quantity="one"> Fila <xliff:g id="TITLE_0">%1$s</xliff:g>. <xliff:g id="COUNT_1">%2$d</xliff:g> element necitit. </item>
-    </plurals>
-    <string name="description_search_video_call" msgid="4337369876888024909">"Apel video"</string>
-    <string name="description_search_call_and_share" msgid="4912772842755050467">"Trimiteți și apelați"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_custom">Apelați %s</string>
+  <string name="call_home">Apelați numărul de domiciliu</string>
+  <string name="call_mobile">Apelați numărul de mobil</string>
+  <string name="call_work">Apelați numărul de serviciu</string>
+  <string name="call_fax_work">Apelați numărul de fax de serviciu</string>
+  <string name="call_fax_home">Apelați numărul de fax de domiciliu</string>
+  <string name="call_pager">Apelați numărul de pager</string>
+  <string name="call_other">Apelați</string>
+  <string name="call_callback">Apelați un număr cu apelare inversă</string>
+  <string name="call_car">Apelați numărul de mașină</string>
+  <string name="call_company_main">Apelați numărul principal al companiei</string>
+  <string name="call_isdn">Apelați ISDN</string>
+  <string name="call_main">Apelați numărul principal</string>
+  <string name="call_other_fax">Apelați numărul de fax</string>
+  <string name="call_radio">Apelați un număr radio</string>
+  <string name="call_telex">Apelați un număr de telex</string>
+  <string name="call_tty_tdd">Apelați TTY/TDD</string>
+  <string name="call_work_mobile">Apelați numărul de mobil de la serviciu</string>
+  <string name="call_work_pager">Apelați numărul de pager de serviciu</string>
+  <string name="call_assistant">Apelați %s</string>
+  <string name="call_mms">Apelați MMS</string>
+  <string name="sms_custom">Trimiteți un mesaj text către %s</string>
+  <string name="sms_home">Trimiteți un mesaj text către telefonul de domiciliu</string>
+  <string name="sms_mobile">Trimiteți un mesaj text către numărul de mobil</string>
+  <string name="sms_work">Trimiteți un mesaj text către numărul de serviciu</string>
+  <string name="sms_fax_work">Trimiteți un mesaj text către un număr de fax de serviciu</string>
+  <string name="sms_fax_home">Trimiteți un mesaj text către un număr de fax de domiciliu</string>
+  <string name="sms_pager">Trimiteți un mesaj text către un număr de pager</string>
+  <string name="sms_other">Trimiteți un mesaj text</string>
+  <string name="sms_callback">Trimiteți un mesaj text către un număr cu apelare inversă</string>
+  <string name="sms_car">Trimiteți un mesaj text către un număr de telefon de mașină</string>
+  <string name="sms_company_main">Trimiteți un mesaj text către numărul principal al companiei</string>
+  <string name="sms_isdn">Trimiteți un mesaj text către un număr ISDN</string>
+  <string name="sms_main">Trimiteți un mesaj text către numărul principal</string>
+  <string name="sms_other_fax">Trimiteți un mesaj text către un număr de fax</string>
+  <string name="sms_radio">Trimiteți un mesaj text către un număr radio</string>
+  <string name="sms_telex">Trimiteți un mesaj text către un număr de telex</string>
+  <string name="sms_tty_tdd">Trimiteți un mesaj text către TTY/TDD</string>
+  <string name="sms_work_mobile">Trimiteți un mesaj text către numărul de mobil de serviciu</string>
+  <string name="sms_work_pager">Trimiteți un mesaj text către un număr de pager de serviciu</string>
+  <string name="sms_assistant">Trimiteți un mesaj text către %s</string>
+  <string name="sms_mms">Trimiteți un mesaj text către un număr MMS</string>
+  <string name="clearFrequentsConfirmation_title">Ștergeți pers. frecvent contactate?</string>
+  <string name="clearFrequentsConfirmation">Veți șterge lista persoanelor contactate frecvent din aplicațiile Agendă și Telefon și veți forța aplicațiile de e-mail să vă învețe preferințele pentru adrese de la zero.</string>
+  <string name="clearFrequentsProgress_title">Se șterg pers. frecvent contactate…</string>
+  <string name="status_available">Disponibil(ă)</string>
+  <string name="status_away">Plecat(ă)</string>
+  <string name="status_busy">Ocupat(ă)</string>
+  <string name="contactsList">Agendă</string>
+  <string name="contact_suggestions">Cele mai populare sugestii</string>
+  <string name="local_invisible_directory">Altul</string>
+  <string name="directory_search_label">Director</string>
+  <string name="directory_search_label_work">Directorul de serviciu</string>
+  <string name="local_search_label">Toată agenda</string>
+  <string name="local_suggestions_search_label">Sugestii</string>
+  <string msgid="9154761216179882405" name="user_profile_contacts_list_header">Eu</string>
+  <string name="missing_name">(Fără nume)</string>
+  <string msgid="2795575601596468581" name="description_view_contact_detail">Vizualizați persoana din agendă</string>
+  <string name="list_filter_phones">Toate persoanele de contact cu numere de telefon</string>
+  <string name="list_filter_phones_work">Persoane de contact din profilul de serviciu</string>
+  <string name="view_updates_from_group">Afișați actualizări</string>
+  <string name="account_phone">Numai pe dispozitiv, nesincronizat</string>
+  <string name="nameLabelsGroup">Nume</string>
+  <string name="nicknameLabelsGroup">Pseudonim</string>
+  <string name="full_name">Nume</string>
+  <string name="name_given">Prenume</string>
+  <string name="name_family">Nume</string>
+  <string name="name_prefix">Prefixul numelui</string>
+  <string name="name_middle">Al doilea prenume</string>
+  <string name="name_suffix">Sufixul numelui</string>
+  <string name="name_phonetic">Nume fonetic</string>
+  <string name="name_phonetic_given">Prenume fonetic</string>
+  <string name="name_phonetic_middle">Al doilea prenume fonetic</string>
+  <string name="name_phonetic_family">Nume fonetic</string>
+  <string name="phoneLabelsGroup">Telefon</string>
+  <string name="emailLabelsGroup">Trimiteți un e-mail</string>
+  <string name="postalLabelsGroup">Adresă</string>
+  <string name="imLabelsGroup">IM</string>
+  <string name="organizationLabelsGroup">Organizație</string>
+  <string name="relationLabelsGroup">Relație</string>
+  <string name="eventLabelsGroup">Dată specială</string>
+  <string name="sms">Mesaj text</string>
+  <string name="postal_address">Adresă</string>
+  <string name="ghostData_company">Companie</string>
+  <string name="ghostData_title">Titlu</string>
+  <string name="label_notes">Note</string>
+  <string name="label_sip_address">SIP</string>
+  <string name="websiteLabelsGroup">Site web</string>
+  <string name="groupsLabel">Grupuri</string>
+  <string name="email_home">Trimiteți un e-mail la o adresă de e-mail de domiciliu</string>
+  <string name="email_mobile">Trimiteți un e-mail către un telefon mobil</string>
+  <string name="email_work">Trimiteți un e-mail la o adresă de e-mail de serviciu</string>
+  <string name="email_other">Trimiteți un e-mail</string>
+  <string name="email_custom">Trimiteți un e-mail la %s</string>
+  <string name="email">Trimiteți un e-mail</string>
+  <string name="postal_street">Stradă</string>
+  <string name="postal_city">Oraș</string>
+  <string name="postal_region">Stat</string>
+  <string name="postal_postcode">Cod poștal</string>
+  <string name="postal_country">Țară</string>
+  <string name="map_home">Vizualizați adresa de domiciliu</string>
+  <string name="map_work">Vizualizați adresa de serviciu</string>
+  <string name="map_other">Vizualizați adresa poștală</string>
+  <string name="map_custom">Vizualizați adresa %s</string>
+  <string name="chat_aim">Conversați prin AIM</string>
+  <string name="chat_msn">Conversați prin Windows Live</string>
+  <string name="chat_yahoo">Conversați prin Yahoo</string>
+  <string name="chat_skype">Conversați prin Skype</string>
+  <string name="chat_qq">Conversați prin QQ</string>
+  <string name="chat_gtalk">Conversați prin Google Talk</string>
+  <string name="chat_icq">Conversați prin ICQ</string>
+  <string name="chat_jabber">Conversați prin Jabber</string>
+  <string name="chat">Conversați prin chat</string>
+  <string name="list_filter_all_accounts">Toată agenda</string>
+  <string name="listAllContactsInAccount">Agenda din %s</string>
+  <string name="listCustomView">Agenda în afișarea personalizată</string>
+  <string name="listSingleContact">O singură persoană de contact</string>
+  <string name="display_options_sort_list_by">Sortați după</string>
+  <string name="display_options_sort_by_given_name">Prenume</string>
+  <string name="display_options_sort_by_family_name">Nume</string>
+  <string name="display_options_view_names_as">Format pentru nume</string>
+  <string name="display_options_view_given_name_first">Întâi prenumele</string>
+  <string name="display_options_view_family_name_first">Întâi numele</string>
+  <string name="menu_clear_frequents">Ștergeți contacte frecvente</string>
+  <string name="action_menu_back_from_search">nu mai căutați</string>
+  <string name="description_clear_search">Ștergeți căutarea</string>
+  <string name="select_account_dialog_title">Cont</string>
+  <string name="set_default_account">Utilizați mereu pentru apeluri</string>
+  <string name="select_phone_account_for_calls">Alegeți cardul SIM pentru acest apel</string>
+  <string name="select_phone_account_for_calls_remember">Rețineți această alegere</string>
+  <string name="call_with_a_note">Apelați împreună cu o notă</string>
+  <string name="call_subject_hint">Introduceți o notă ca să o trimiteți împreună cu apelul...</string>
+  <string name="send_and_call_button">TRIMITEȚI ȘI APELAȚI</string>
+  <string name="call_subject_limit">%1$s/%2$s</string>
+  <string name="old_call_subject_type_and_number">%1$s %2$s</string>
+  <string name="tab_title">Fila %1$s</string>
+  <plurals name="tab_title_with_unread_items">
+    <item quantity="one"> Fila %1$s. %2$d element necitit. </item>
+    <item quantity="few"> Fila %1$s. %2$d elemente necitite. </item>
+    <item quantity="other"> Fila %1$s. %2$d de elemente necitite. </item>
+  </plurals>
+  <string name="description_search_video_call">Apel video</string>
+  <string name="description_search_call_and_share">Trimiteți și apelați</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-ru/strings.xml b/java/com/android/contacts/common/res/values-ru/strings.xml
index f8b70a7..62e0647 100644
--- a/java/com/android/contacts/common/res/values-ru/strings.xml
+++ b/java/com/android/contacts/common/res/values-ru/strings.xml
@@ -1,164 +1,147 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="toast_text_copied" msgid="8979281391599667362">"Текст скопирован"</string>
-    <string name="call_custom" msgid="3041673234638990874">"Вызов:<xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="call_home" msgid="125893483593803791">"Домашний"</string>
-    <string name="call_mobile" msgid="967589404494150813">"Мобильный"</string>
-    <string name="call_work" msgid="6040550697395300892">"Рабочий"</string>
-    <string name="call_fax_work" msgid="5260192771364592922">"Рабочий факс"</string>
-    <string name="call_fax_home" msgid="5174311195081144124">"Домашний факс"</string>
-    <string name="call_pager" msgid="6814149227741274161">"Пейджер"</string>
-    <string name="call_other" msgid="5536385588712587235">"Набор"</string>
-    <string name="call_callback" msgid="6314019862718112786">"Обратный вызов"</string>
-    <string name="call_car" msgid="3197417098027764954">"Телефон в машине"</string>
-    <string name="call_company_main" msgid="2557663310028446397">"Телефон офиса"</string>
-    <string name="call_isdn" msgid="4691270442763649522">"Номер ISDN"</string>
-    <string name="call_main" msgid="3293707608770407814">"Основной телефон"</string>
-    <string name="call_other_fax" msgid="4724521984879021465">"Факс"</string>
-    <string name="call_radio" msgid="8942441419845057942">"Радиотелефон"</string>
-    <string name="call_telex" msgid="2031514461660668351">"Телекс"</string>
-    <string name="call_tty_tdd" msgid="7807210224965727701">"Телетайп"</string>
-    <string name="call_work_mobile" msgid="2716342732938578495">"Рабочий мобильный"</string>
-    <string name="call_work_pager" msgid="3791778749827366574">"Рабочий пейджер"</string>
-    <string name="call_assistant" msgid="4177478845473789294">"Вызов: <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
-    <string name="call_mms" msgid="4958811711741872901">"Номер MMS"</string>
-    <string name="sms_custom" msgid="8785368968605026317">"SMS: <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="sms_home" msgid="3527719551060295243">"SMS: домашний"</string>
-    <string name="sms_mobile" msgid="8883045857887736518">"SMS: мобильный"</string>
-    <string name="sms_work" msgid="4158595439553450966">"SMS: рабочий"</string>
-    <string name="sms_fax_work" msgid="5483726627718055248">"SMS: рабочий факс"</string>
-    <string name="sms_fax_home" msgid="9219265155770746077">"SMS: домашний факс"</string>
-    <string name="sms_pager" msgid="4901085068525193933">"SMS: пейджер"</string>
-    <string name="sms_other" msgid="1742702947993285933">"SMS"</string>
-    <string name="sms_callback" msgid="5833483630377538308">"SMS: номер обратного вызова"</string>
-    <string name="sms_car" msgid="4314577266154395174">"SMS: телефон в машине"</string>
-    <string name="sms_company_main" msgid="2308160928487360705">"SMS: телефон офиса"</string>
-    <string name="sms_isdn" msgid="6394300346179302542">"SMS: номер ISDN"</string>
-    <string name="sms_main" msgid="8908087742014140774">"SMS: основной номер"</string>
-    <string name="sms_other_fax" msgid="8768455473295405427">"SMS: факс"</string>
-    <string name="sms_radio" msgid="855555176531704682">"SMS: радиотелефон"</string>
-    <string name="sms_telex" msgid="6269029276223252719">"SMS: телекс"</string>
-    <string name="sms_tty_tdd" msgid="6229057354509192444">"SMS: телетайп"</string>
-    <string name="sms_work_mobile" msgid="2155975469329969840">"SMS: рабочий мобильный"</string>
-    <string name="sms_work_pager" msgid="8500140274906830742">"SMS: рабочий пейджер"</string>
-    <string name="sms_assistant" msgid="8513548482745330818">"SMS: <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
-    <string name="sms_mms" msgid="5187888900503248542">"SMS: номер MMS"</string>
-    <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"Очистить список популярных контактов?"</string>
-    <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"Список популярных контактов в приложениях \"Контакты\" и \"Телефон\" будет очищен, а приложения электронной почты начнут запоминать адреса заново."</string>
-    <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"Подождите…"</string>
-    <string name="status_available" msgid="2648156525685472626">"Доступен"</string>
-    <string name="status_away" msgid="2298688367552893953">"Отсутствует"</string>
-    <string name="status_busy" msgid="5990832098713248503">"Не беспокоить"</string>
-    <string name="contactsList" msgid="8806067891419291513">"Контакты"</string>
-    <string name="contact_suggestions" msgid="3324166754807120006">"Топ рекомендуемых"</string>
-    <string name="local_invisible_directory" msgid="4723238462733650090">"Другое"</string>
-    <string name="directory_search_label" msgid="4621215895484025229">"Каталог"</string>
-    <string name="directory_search_label_work" msgid="7679326282707414897">"Каталог контактов из рабочего профиля"</string>
-    <string name="local_search_label" msgid="907622822323119235">"Все контакты"</string>
-    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Рекомендуемые"</string>
-    <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Вы"</string>
-    <string name="missing_name" msgid="978606963362745020">"Имя не указано"</string>
-    <string name="description_view_contact_detail" msgid="2428742401208561136">"Посмотреть контакт"</string>
-    <string name="list_filter_phones" msgid="8763316061763437182">"Контакты с номерами телефонов"</string>
-    <string name="list_filter_phones_work" msgid="7083575404573422965">"Контакты из рабочего профиля"</string>
-    <string name="view_updates_from_group" msgid="9011641093168385729">"Просмотреть обновления"</string>
-    <string name="account_phone" msgid="7067809073194061035">"Только на устройстве, не синхронизируется"</string>
-    <string name="nameLabelsGroup" msgid="7730465833159557471">"Имя"</string>
-    <string name="nicknameLabelsGroup" msgid="6310556912361840029">"Псевдоним"</string>
-    <string name="full_name" msgid="648186563998465740">"Имя"</string>
-    <string name="name_given" msgid="5096576006314820536">"По имени"</string>
-    <string name="name_family" msgid="6646235805198547467">"По фамилии"</string>
-    <string name="name_prefix" msgid="9215326539658838">"Префикс имени"</string>
-    <string name="name_middle" msgid="703755205331582769">"Отчество"</string>
-    <string name="name_suffix" msgid="5777083390282548702">"Суффикс имени"</string>
-    <string name="name_phonetic" msgid="1650870996361663089">"Транскрипция имени"</string>
-    <string name="name_phonetic_given" msgid="618812334274603170">"Транскрипция имени"</string>
-    <string name="name_phonetic_middle" msgid="4826820763384625538">"Транскрипция отчества"</string>
-    <string name="name_phonetic_family" msgid="379905191212930771">"Транскрипция фамилии"</string>
-    <string name="phoneLabelsGroup" msgid="169661929021355548">"Телефон"</string>
-    <string name="emailLabelsGroup" msgid="2249752810477488833">"Написать письмо"</string>
-    <string name="postalLabelsGroup" msgid="6772000590189142253">"Адрес"</string>
-    <string name="imLabelsGroup" msgid="5718066254237364731">"Чат"</string>
-    <string name="organizationLabelsGroup" msgid="1101996309241601435">"Организация"</string>
-    <string name="relationLabelsGroup" msgid="53866051664600053">"Связи"</string>
-    <string name="eventLabelsGroup" msgid="1236970042646618489">"Определенная дата"</string>
-    <string name="sms" msgid="7574344928185328095">"SMS"</string>
-    <string name="postal_address" msgid="1804707930129674200">"Адрес"</string>
-    <string name="ghostData_company" msgid="2554310786296833424">"Организация"</string>
-    <string name="ghostData_title" msgid="4994968731830184837">"Должность"</string>
-    <string name="label_notes" msgid="2050255313694219786">"Примечания"</string>
-    <string name="label_sip_address" msgid="8883266182575965926">"SIP"</string>
-    <string name="websiteLabelsGroup" msgid="1630734286462186790">"Веб-сайт"</string>
-    <string name="groupsLabel" msgid="2694002798416868728">"Группы"</string>
-    <string name="email_home" msgid="889830029388962171">"Написать на личный адрес"</string>
-    <string name="email_mobile" msgid="4487686436743741150">"Написать на мобильную эл. почту"</string>
-    <string name="email_work" msgid="4223487303344613528">"Написать на рабочий адрес"</string>
-    <string name="email_other" msgid="4246411900126012062">"Написать письмо"</string>
-    <string name="email_custom" msgid="7246580894327511013">"Написать письмо (<xliff:g id="CUSTOM">%s</xliff:g>)"</string>
-    <string name="email" msgid="2807318537887091606">"Написать письмо"</string>
-    <string name="postal_street" msgid="6918171741240802474">"Улица"</string>
-    <string name="postal_city" msgid="8674569121430005628">"Город"</string>
-    <string name="postal_region" msgid="1730369286225469192">"Регион"</string>
-    <string name="postal_postcode" msgid="4450700741261990439">"Индекс"</string>
-    <string name="postal_country" msgid="232670707458768148">"Страна"</string>
-    <string name="map_home" msgid="4181131107392126938">"Посмотреть домашний адрес"</string>
-    <string name="map_work" msgid="5723471185992684400">"Посмотреть рабочий адрес"</string>
-    <string name="map_other" msgid="2253764780863500516">"Посмотреть адрес"</string>
-    <string name="map_custom" msgid="5581743097882436157">"Посмотреть адрес (<xliff:g id="CUSTOM">%s</xliff:g>)"</string>
-    <string name="chat_aim" msgid="2954364435497941659">"Чат через AIM"</string>
-    <string name="chat_msn" msgid="3130135239071228678">"Чат через Windows Live"</string>
-    <string name="chat_yahoo" msgid="3233552142326865347">"Чат через Yahoo"</string>
-    <string name="chat_skype" msgid="6486703981390592425">"Чат через Skype"</string>
-    <string name="chat_qq" msgid="786924280665740019">"Чат через QQ"</string>
-    <string name="chat_gtalk" msgid="7914674177243078035">"Чат через Google Talk"</string>
-    <string name="chat_icq" msgid="3292934726414765801">"Чат через ICQ"</string>
-    <string name="chat_jabber" msgid="6701542313597880204">"Чат через Jabber"</string>
-    <string name="chat" msgid="1020428260359370236">"Чат"</string>
-    <string name="list_filter_all_accounts" msgid="473782314881473992">"Все контакты"</string>
-    <string name="listAllContactsInAccount" msgid="3486378621592995630">"Контакты аккаунта \"<xliff:g id="NAME">%s</xliff:g>\""</string>
-    <string name="listCustomView" msgid="5306282632413086731">"Пользовательский фильтр"</string>
-    <string name="listSingleContact" msgid="8620818791932382627">"Один контакт"</string>
-    <string name="display_options_sort_list_by" msgid="3541875948367831228">"Сортировка"</string>
-    <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"По имени"</string>
-    <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"По фамилии"</string>
-    <string name="display_options_view_names_as" msgid="4204204205736735618">"Формат имени"</string>
-    <string name="display_options_view_given_name_first" msgid="2308026973021171020">"Сначала имя"</string>
-    <string name="display_options_view_family_name_first" msgid="987430497292428242">"Сначала фамилия"</string>
-    <string name="menu_clear_frequents" msgid="5358271535047496120">"Очистить популярные"</string>
-    <string name="action_menu_back_from_search" msgid="3550669942742167644">"прекратить поиск"</string>
-    <string name="description_clear_search" msgid="2347258825265600782">"Очистить условия поиска"</string>
-    <string name="select_account_dialog_title" msgid="2673504582803359239">"Аккаунт"</string>
-    <string name="set_default_account" msgid="7966099951006467572">"Всегда использовать для звонков"</string>
-    <string name="select_phone_account_for_calls" msgid="1784460686103423274">"Аккаунт для звонка"</string>
-    <string name="call_with_a_note" msgid="6242261320491851133">"Написать сообщение абоненту"</string>
-    <string name="call_subject_hint" msgid="7233138753650420800">"Введите текст…"</string>
-    <string name="send_and_call_button" msgid="4735168294120154013">"ОТПРАВИТЬ И ПОЗВОНИТЬ"</string>
-    <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g>/<xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="tab_title" msgid="3387876802026074288">"Вкладка \"<xliff:g id="TITLE">%1$s</xliff:g>\"."</string>
-    <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
-      <item quantity="one">Вкладка <xliff:g id="TITLE_2">%1$s</xliff:g>. <xliff:g id="COUNT_3">%2$d</xliff:g> непрочитанный элемент. </item>
-      <item quantity="few">Вкладка <xliff:g id="TITLE_2">%1$s</xliff:g>. <xliff:g id="COUNT_3">%2$d</xliff:g> непрочитанных элемента. </item>
-      <item quantity="many">Вкладка <xliff:g id="TITLE_2">%1$s</xliff:g>. <xliff:g id="COUNT_3">%2$d</xliff:g> непрочитанных элементов. </item>
-      <item quantity="other">Вкладка <xliff:g id="TITLE_2">%1$s</xliff:g>. <xliff:g id="COUNT_3">%2$d</xliff:g> непрочитанного элемента. </item>
-    </plurals>
-    <string name="description_search_video_call" msgid="4337369876888024909">"Видеовызов"</string>
-    <string name="description_search_call_and_share" msgid="4912772842755050467">"Поделиться и позвонить"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_custom">Вызов:%s</string>
+  <string name="call_home">Домашний</string>
+  <string name="call_mobile">Мобильный</string>
+  <string name="call_work">Рабочий</string>
+  <string name="call_fax_work">Рабочий факс</string>
+  <string name="call_fax_home">Домашний факс</string>
+  <string name="call_pager">Пейджер</string>
+  <string name="call_other">Набор</string>
+  <string name="call_callback">Обратный вызов</string>
+  <string name="call_car">Телефон в машине</string>
+  <string name="call_company_main">Телефон офиса</string>
+  <string name="call_isdn">Номер ISDN</string>
+  <string name="call_main">Основной телефон</string>
+  <string name="call_other_fax">Факс</string>
+  <string name="call_radio">Радиотелефон</string>
+  <string name="call_telex">Телекс</string>
+  <string name="call_tty_tdd">Телетайп</string>
+  <string name="call_work_mobile">Рабочий мобильный</string>
+  <string name="call_work_pager">Рабочий пейджер</string>
+  <string name="call_assistant">Вызов: %s</string>
+  <string name="call_mms">Номер MMS</string>
+  <string name="sms_custom">SMS: %s</string>
+  <string name="sms_home">SMS: домашний</string>
+  <string name="sms_mobile">SMS: мобильный</string>
+  <string name="sms_work">SMS: рабочий</string>
+  <string name="sms_fax_work">SMS: рабочий факс</string>
+  <string name="sms_fax_home">SMS: домашний факс</string>
+  <string name="sms_pager">SMS: пейджер</string>
+  <string name="sms_other">SMS</string>
+  <string name="sms_callback">SMS: номер обратного вызова</string>
+  <string name="sms_car">SMS: телефон в машине</string>
+  <string name="sms_company_main">SMS: телефон офиса</string>
+  <string name="sms_isdn">SMS: номер ISDN</string>
+  <string name="sms_main">SMS: основной номер</string>
+  <string name="sms_other_fax">SMS: факс</string>
+  <string name="sms_radio">SMS: радиотелефон</string>
+  <string name="sms_telex">SMS: телекс</string>
+  <string name="sms_tty_tdd">SMS: телетайп</string>
+  <string name="sms_work_mobile">SMS: рабочий мобильный</string>
+  <string name="sms_work_pager">SMS: рабочий пейджер</string>
+  <string name="sms_assistant">SMS: %s</string>
+  <string name="sms_mms">SMS: номер MMS</string>
+  <string name="clearFrequentsConfirmation_title">Очистить список популярных контактов?</string>
+  <string name="clearFrequentsConfirmation">Список популярных контактов в приложениях \"Контакты\" и \"Телефон\" будет очищен, а приложения электронной почты начнут запоминать адреса заново.</string>
+  <string name="clearFrequentsProgress_title">Подождите…</string>
+  <string name="status_available">Доступен</string>
+  <string name="status_away">Отсутствует</string>
+  <string name="status_busy">Не беспокоить</string>
+  <string name="contactsList">Контакты</string>
+  <string name="contact_suggestions">Топ рекомендуемых</string>
+  <string name="local_invisible_directory">Другое</string>
+  <string name="directory_search_label">Каталог</string>
+  <string name="directory_search_label_work">Каталог контактов из рабочего профиля</string>
+  <string name="local_search_label">Все контакты</string>
+  <string name="local_suggestions_search_label">Рекомендуемые</string>
+  <string msgid="9154761216179882405" name="user_profile_contacts_list_header">Вы</string>
+  <string name="missing_name">Имя не указано</string>
+  <string msgid="2795575601596468581" name="description_view_contact_detail">Посмотреть контакт</string>
+  <string name="list_filter_phones">Контакты с номерами телефонов</string>
+  <string name="list_filter_phones_work">Контакты из рабочего профиля</string>
+  <string name="view_updates_from_group">Просмотреть обновления</string>
+  <string name="account_phone">Только на устройстве, не синхронизируется</string>
+  <string name="nameLabelsGroup">Имя</string>
+  <string name="nicknameLabelsGroup">Псевдоним</string>
+  <string name="full_name">Имя</string>
+  <string name="name_given">По имени</string>
+  <string name="name_family">По фамилии</string>
+  <string name="name_prefix">Префикс имени</string>
+  <string name="name_middle">Отчество</string>
+  <string name="name_suffix">Суффикс имени</string>
+  <string name="name_phonetic">Транскрипция имени</string>
+  <string name="name_phonetic_given">Транскрипция имени</string>
+  <string name="name_phonetic_middle">Транскрипция отчества</string>
+  <string name="name_phonetic_family">Транскрипция фамилии</string>
+  <string name="phoneLabelsGroup">Телефон</string>
+  <string name="emailLabelsGroup">Написать письмо</string>
+  <string name="postalLabelsGroup">Адрес</string>
+  <string name="imLabelsGroup">Чат</string>
+  <string name="organizationLabelsGroup">Организация</string>
+  <string name="relationLabelsGroup">Связи</string>
+  <string name="eventLabelsGroup">Определенная дата</string>
+  <string name="sms">SMS</string>
+  <string name="postal_address">Адрес</string>
+  <string name="ghostData_company">Организация</string>
+  <string name="ghostData_title">Должность</string>
+  <string name="label_notes">Примечания</string>
+  <string name="label_sip_address">SIP</string>
+  <string name="websiteLabelsGroup">Веб-сайт</string>
+  <string name="groupsLabel">Группы</string>
+  <string name="email_home">Написать на личный адрес</string>
+  <string name="email_mobile">Написать на мобильную эл. почту</string>
+  <string name="email_work">Написать на рабочий адрес</string>
+  <string name="email_other">Написать письмо</string>
+  <string name="email_custom">Написать письмо (%s)</string>
+  <string name="email">Написать письмо</string>
+  <string name="postal_street">Улица</string>
+  <string name="postal_city">Город</string>
+  <string name="postal_region">Регион</string>
+  <string name="postal_postcode">Индекс</string>
+  <string name="postal_country">Страна</string>
+  <string name="map_home">Посмотреть домашний адрес</string>
+  <string name="map_work">Посмотреть рабочий адрес</string>
+  <string name="map_other">Посмотреть адрес</string>
+  <string name="map_custom">Посмотреть адрес (%s)</string>
+  <string name="chat_aim">Чат через AIM</string>
+  <string name="chat_msn">Чат через Windows Live</string>
+  <string name="chat_yahoo">Чат через Yahoo</string>
+  <string name="chat_skype">Чат через Skype</string>
+  <string name="chat_qq">Чат через QQ</string>
+  <string name="chat_gtalk">Чат через Google Talk</string>
+  <string name="chat_icq">Чат через ICQ</string>
+  <string name="chat_jabber">Чат через Jabber</string>
+  <string name="chat">Чат</string>
+  <string name="list_filter_all_accounts">Все контакты</string>
+  <string name="listAllContactsInAccount">Контакты аккаунта \"%s\"</string>
+  <string name="listCustomView">Пользовательский фильтр</string>
+  <string name="listSingleContact">Один контакт</string>
+  <string name="display_options_sort_list_by">Сортировка</string>
+  <string name="display_options_sort_by_given_name">По имени</string>
+  <string name="display_options_sort_by_family_name">По фамилии</string>
+  <string name="display_options_view_names_as">Формат имени</string>
+  <string name="display_options_view_given_name_first">Сначала имя</string>
+  <string name="display_options_view_family_name_first">Сначала фамилия</string>
+  <string name="menu_clear_frequents">Очистить популярные</string>
+  <string name="action_menu_back_from_search">прекратить поиск</string>
+  <string name="description_clear_search">Очистить условия поиска</string>
+  <string name="select_account_dialog_title">Аккаунт</string>
+  <string name="set_default_account">Всегда использовать для звонков</string>
+  <string name="select_phone_account_for_calls">Выберите SIM-карту для вызова</string>
+  <string name="select_phone_account_for_calls_remember">Запомнить выбор</string>
+  <string name="call_with_a_note">Написать сообщение абоненту</string>
+  <string name="call_subject_hint">Введите текст…</string>
+  <string name="send_and_call_button">ОТПРАВИТЬ И ПОЗВОНИТЬ</string>
+  <string name="call_subject_limit">%1$s/%2$s</string>
+  <string name="old_call_subject_type_and_number">%1$s %2$s</string>
+  <string name="tab_title">Вкладка \"%1$s\".</string>
+  <plurals name="tab_title_with_unread_items">
+    <item quantity="one">Вкладка %1$s. %2$d непрочитанный элемент. </item>
+    <item quantity="few">Вкладка %1$s. %2$d непрочитанных элемента. </item>
+    <item quantity="many">Вкладка %1$s. %2$d непрочитанных элементов. </item>
+    <item quantity="other">Вкладка %1$s. %2$d непрочитанного элемента. </item>
+  </plurals>
+  <string name="description_search_video_call">Видеовызов</string>
+  <string name="description_search_call_and_share">Поделиться и позвонить</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-si/strings.xml b/java/com/android/contacts/common/res/values-si/strings.xml
index 94612ef..b7c8044 100644
--- a/java/com/android/contacts/common/res/values-si/strings.xml
+++ b/java/com/android/contacts/common/res/values-si/strings.xml
@@ -1,162 +1,145 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="toast_text_copied" msgid="8979281391599667362">"පෙළ පිටපත් කරන ලදී"</string>
-    <string name="call_custom" msgid="3041673234638990874">"<xliff:g id="CUSTOM">%s</xliff:g> අමතන්න"</string>
-    <string name="call_home" msgid="125893483593803791">"ගෙදර අමතන්න"</string>
-    <string name="call_mobile" msgid="967589404494150813">"ජංගම දුරකථනය අමතන්න"</string>
-    <string name="call_work" msgid="6040550697395300892">"කාර්යාලය අමතන්න"</string>
-    <string name="call_fax_work" msgid="5260192771364592922">"කාර්යාල ෆැක්ස් අමතන්න"</string>
-    <string name="call_fax_home" msgid="5174311195081144124">"නිවෙස් ෆැක්ස් අමතන්න"</string>
-    <string name="call_pager" msgid="6814149227741274161">"පේජර් අමතන්න"</string>
-    <string name="call_other" msgid="5536385588712587235">"ඇමතුම"</string>
-    <string name="call_callback" msgid="6314019862718112786">"නැවත ඇමතුම අමතන්න"</string>
-    <string name="call_car" msgid="3197417098027764954">"කාරය අමතන්න"</string>
-    <string name="call_company_main" msgid="2557663310028446397">"ආයතන මූලිකය අමතන්න"</string>
-    <string name="call_isdn" msgid="4691270442763649522">"ISDN අමතන්න"</string>
-    <string name="call_main" msgid="3293707608770407814">"මූලිකය අමතන්න"</string>
-    <string name="call_other_fax" msgid="4724521984879021465">"ෆැක්ස් අමතන්න"</string>
-    <string name="call_radio" msgid="8942441419845057942">"රේඩියෝව අමතන්න"</string>
-    <string name="call_telex" msgid="2031514461660668351">"ටෙලෙක්ස් අමතන්න"</string>
-    <string name="call_tty_tdd" msgid="7807210224965727701">"TTY/TDD අමතන්න"</string>
-    <string name="call_work_mobile" msgid="2716342732938578495">"කාර්යාල ජංගම දුරකථනය අමතන්න"</string>
-    <string name="call_work_pager" msgid="3791778749827366574">"කාර්යාල පේජරය අමතන්න"</string>
-    <string name="call_assistant" msgid="4177478845473789294">"<xliff:g id="ASSISTANT">%s</xliff:g> අමතන්න"</string>
-    <string name="call_mms" msgid="4958811711741872901">"MMS අමතන්න"</string>
-    <string name="sms_custom" msgid="8785368968605026317">"<xliff:g id="CUSTOM">%s</xliff:g> ට කෙටි පණිවිඩයක් යවන්න"</string>
-    <string name="sms_home" msgid="3527719551060295243">"නිවසට කෙටි පණිවිඩයක් යවන්න"</string>
-    <string name="sms_mobile" msgid="8883045857887736518">"ජංගම දුරකථනයට කෙටි පණිවිඩයක් යවන්න"</string>
-    <string name="sms_work" msgid="4158595439553450966">"කාර්යාලයට කෙටි පණිවිඩයක් යවන්න"</string>
-    <string name="sms_fax_work" msgid="5483726627718055248">"කාර්යාල ෆැක්ස් වෙත කෙටි පණිවිඩයක් යවන්න"</string>
-    <string name="sms_fax_home" msgid="9219265155770746077">"නිවෙස් ෆැක්ස් වෙත කෙටි පණිවිඩයක් යවන්න"</string>
-    <string name="sms_pager" msgid="4901085068525193933">"පේජරයට කෙටි පණිවිඩයක් යවන්න"</string>
-    <string name="sms_other" msgid="1742702947993285933">"කෙටි පණිවිඩයක් යවන්න"</string>
-    <string name="sms_callback" msgid="5833483630377538308">"නැවත ඇමතුමට කෙටි පණිවිඩයක් යවන්න"</string>
-    <string name="sms_car" msgid="4314577266154395174">"කාරයට කෙටි පණිවිඩයක් යවන්න"</string>
-    <string name="sms_company_main" msgid="2308160928487360705">"ආයතනයේ මූලික එකට කෙටි පණිවිඩයක් යවන්න"</string>
-    <string name="sms_isdn" msgid="6394300346179302542">"ISDN වෙත කෙටි පණිවිඩයක් යවන්න"</string>
-    <string name="sms_main" msgid="8908087742014140774">"මූලික අංකයට කෙටි පණිවිඩයක් යවන්න"</string>
-    <string name="sms_other_fax" msgid="8768455473295405427">"ෆැක්ස් වෙත කෙටි පණිවිඩයක් යවන්න"</string>
-    <string name="sms_radio" msgid="855555176531704682">"රේඩියෝවට කෙටි පණිවිඩයක් යවන්න"</string>
-    <string name="sms_telex" msgid="6269029276223252719">"ටෙලෙක්ස් වෙත කෙටි පණිවිඩයක් යවන්න"</string>
-    <string name="sms_tty_tdd" msgid="6229057354509192444">"TTY/TDD වෙත කෙටි පණිවිඩයක් යවන්න"</string>
-    <string name="sms_work_mobile" msgid="2155975469329969840">"කාර්යාල ජංගම දුරකථනයට කෙටි පණිවිඩයක් යවන්න"</string>
-    <string name="sms_work_pager" msgid="8500140274906830742">"කාර්යාල පේජරයට කෙටි පණිවිඩයක් යවන්න"</string>
-    <string name="sms_assistant" msgid="8513548482745330818">"<xliff:g id="ASSISTANT">%s</xliff:g> ට කෙටි පණිවිඩයක් යවන්න"</string>
-    <string name="sms_mms" msgid="5187888900503248542">"MMS වෙත කෙටි පණිවිඩයක් යවන්න"</string>
-    <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"නිතරම සම්බන්ධ වන අය හිස් කරන්නද?"</string>
-    <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"ඔබ සම්බන්ධතා සහ දුරකථන යෙදුම්වලින් නිතරම සම්බන්ධ වුණු අයගේ ලැයිස්තුව හිස් කර, මුල සිටම ඔබගේ ලිපින අභිරුචි ඉගෙනීමට ඊ-තැපැල් යෙදුම්වලට බල කරයි."</string>
-    <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"නිතරම සම්බන්ධ වන අය හිස් කරමින්…"</string>
-    <string name="status_available" msgid="2648156525685472626">"සිටියි"</string>
-    <string name="status_away" msgid="2298688367552893953">"ළඟ නැත"</string>
-    <string name="status_busy" msgid="5990832098713248503">"කාර්යබහුල"</string>
-    <string name="contactsList" msgid="8806067891419291513">"සම්බන්ධතා"</string>
-    <string name="contact_suggestions" msgid="3324166754807120006">"ඉහළින්ම යෝජිත"</string>
-    <string name="local_invisible_directory" msgid="4723238462733650090">"වෙනත්"</string>
-    <string name="directory_search_label" msgid="4621215895484025229">"නාමාවලිය"</string>
-    <string name="directory_search_label_work" msgid="7679326282707414897">"කාර්යාල සම්බන්ධතා නාමාවලිය"</string>
-    <string name="local_search_label" msgid="907622822323119235">"සියලුම සම්බන්ධතා"</string>
-    <string name="local_suggestions_search_label" msgid="1178575146224386118">"යෝජනා"</string>
-    <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"මම"</string>
-    <string name="missing_name" msgid="978606963362745020">"(නමක් නොමැත)"</string>
-    <string name="description_view_contact_detail" msgid="2428742401208561136">"සම්බන්ධතාව පෙන්වන්න."</string>
-    <string name="list_filter_phones" msgid="8763316061763437182">"දුරකථන අංක සහිත සම්බන්ධතා"</string>
-    <string name="list_filter_phones_work" msgid="7083575404573422965">"කාර්යාල පැතිකඩ සම්බන්ධතා"</string>
-    <string name="view_updates_from_group" msgid="9011641093168385729">"යාවත්කාලීන වීම් පෙන්වන්න"</string>
-    <string name="account_phone" msgid="7067809073194061035">"උපාංගය-පමණී, සමමුහුර්තකරණය නොකරන ලදී"</string>
-    <string name="nameLabelsGroup" msgid="7730465833159557471">"නම‍"</string>
-    <string name="nicknameLabelsGroup" msgid="6310556912361840029">"අපනාමය"</string>
-    <string name="full_name" msgid="648186563998465740">"නම‍"</string>
-    <string name="name_given" msgid="5096576006314820536">"පළමු නම"</string>
-    <string name="name_family" msgid="6646235805198547467">"අවසාන නම"</string>
-    <string name="name_prefix" msgid="9215326539658838">"නම් උපසර්ගය"</string>
-    <string name="name_middle" msgid="703755205331582769">"මැද නම"</string>
-    <string name="name_suffix" msgid="5777083390282548702">"නම් ප්‍රත්‍යය"</string>
-    <string name="name_phonetic" msgid="1650870996361663089">"ස්වර නම"</string>
-    <string name="name_phonetic_given" msgid="618812334274603170">"ශබ්ද විද්‍යාත්මක මුල් නම"</string>
-    <string name="name_phonetic_middle" msgid="4826820763384625538">"ස්වර මැද නම"</string>
-    <string name="name_phonetic_family" msgid="379905191212930771">"ශබ්ද විද්‍යාත්මක අවසාන නම"</string>
-    <string name="phoneLabelsGroup" msgid="169661929021355548">"දුරකථනය"</string>
-    <string name="emailLabelsGroup" msgid="2249752810477488833">"ඊ-තැපෑල"</string>
-    <string name="postalLabelsGroup" msgid="6772000590189142253">"ලිපිනය"</string>
-    <string name="imLabelsGroup" msgid="5718066254237364731">"IM"</string>
-    <string name="organizationLabelsGroup" msgid="1101996309241601435">"සංවිධානය"</string>
-    <string name="relationLabelsGroup" msgid="53866051664600053">"ඥාතිත්වය"</string>
-    <string name="eventLabelsGroup" msgid="1236970042646618489">"විශේෂ දිනය"</string>
-    <string name="sms" msgid="7574344928185328095">"පෙළ පණිවුඩය"</string>
-    <string name="postal_address" msgid="1804707930129674200">"ලිපිනය"</string>
-    <string name="ghostData_company" msgid="2554310786296833424">"සමාගම"</string>
-    <string name="ghostData_title" msgid="4994968731830184837">"මාතෘකාව"</string>
-    <string name="label_notes" msgid="2050255313694219786">"සටහන්"</string>
-    <string name="label_sip_address" msgid="8883266182575965926">"SIP"</string>
-    <string name="websiteLabelsGroup" msgid="1630734286462186790">"වෙබ් අඩවිය"</string>
-    <string name="groupsLabel" msgid="2694002798416868728">"සමූහ"</string>
-    <string name="email_home" msgid="889830029388962171">"නිවසට ඊ-තැපැල් කරන්න"</string>
-    <string name="email_mobile" msgid="4487686436743741150">"ජංගමයට ඊ-තැපැල් කරන්න"</string>
-    <string name="email_work" msgid="4223487303344613528">"කාර්යාලයට ඊ-තැපැල් කරන්න"</string>
-    <string name="email_other" msgid="4246411900126012062">"ඊ-තැපෑල"</string>
-    <string name="email_custom" msgid="7246580894327511013">"<xliff:g id="CUSTOM">%s</xliff:g> ඊ-තැපැල් කරන්න"</string>
-    <string name="email" msgid="2807318537887091606">"ඊ-තැපෑල"</string>
-    <string name="postal_street" msgid="6918171741240802474">"වීථිය"</string>
-    <string name="postal_city" msgid="8674569121430005628">"නගරය"</string>
-    <string name="postal_region" msgid="1730369286225469192">"ජනපදය"</string>
-    <string name="postal_postcode" msgid="4450700741261990439">"ZIP කේතය"</string>
-    <string name="postal_country" msgid="232670707458768148">"රට"</string>
-    <string name="map_home" msgid="4181131107392126938">"නිවෙස් ලිපිනය පෙන්වන්න"</string>
-    <string name="map_work" msgid="5723471185992684400">"කාර්යාල ලිපිනය පෙන්වන්න"</string>
-    <string name="map_other" msgid="2253764780863500516">"ලිපිනය පෙන්වන්න"</string>
-    <string name="map_custom" msgid="5581743097882436157">"<xliff:g id="CUSTOM">%s</xliff:g> ලිපිනය පෙන්වන්න"</string>
-    <string name="chat_aim" msgid="2954364435497941659">"AIM භාවිතයෙන් කතාබස් කරන්න"</string>
-    <string name="chat_msn" msgid="3130135239071228678">"Windows Live භාවිතයෙන් කතාබස් කරන්න"</string>
-    <string name="chat_yahoo" msgid="3233552142326865347">"Yahoo භාවිතයෙන් කතාබස් කරන්න"</string>
-    <string name="chat_skype" msgid="6486703981390592425">"Skype භාවිතයෙන් කතාබස් කරන්න"</string>
-    <string name="chat_qq" msgid="786924280665740019">"QQ භාවිතයෙන් කතාබස් කරන්න"</string>
-    <string name="chat_gtalk" msgid="7914674177243078035">"Google Talk භාවිතයෙන් කතාබස් කරන්න"</string>
-    <string name="chat_icq" msgid="3292934726414765801">"ICQ භාවිතයෙන් කතාබස් කරන්න"</string>
-    <string name="chat_jabber" msgid="6701542313597880204">"Jabber භාවිතයෙන් කතාබස් කරන්න"</string>
-    <string name="chat" msgid="1020428260359370236">"කතාබස්"</string>
-    <string name="list_filter_all_accounts" msgid="473782314881473992">"සියලුම සම්බන්ධතා"</string>
-    <string name="listAllContactsInAccount" msgid="3486378621592995630">"<xliff:g id="NAME">%s</xliff:g> හි සම්බන්ධතා"</string>
-    <string name="listCustomView" msgid="5306282632413086731">"අභිරුචි පෙනුමේ සම්බන්ධතා"</string>
-    <string name="listSingleContact" msgid="8620818791932382627">"එක් සම්බන්ධතාවය"</string>
-    <string name="display_options_sort_list_by" msgid="3541875948367831228">"අනුපිළිවෙලට සකසා ඇත්තේ"</string>
-    <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"පළමු නම"</string>
-    <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"අවසාන නම"</string>
-    <string name="display_options_view_names_as" msgid="4204204205736735618">"නමේ ආකෘතිය"</string>
-    <string name="display_options_view_given_name_first" msgid="2308026973021171020">"මුල් නම මුලින්ම"</string>
-    <string name="display_options_view_family_name_first" msgid="987430497292428242">"අවසාන නම මුලින්ම"</string>
-    <string name="menu_clear_frequents" msgid="5358271535047496120">"නිතරමයන් හිස් කරන්න"</string>
-    <string name="action_menu_back_from_search" msgid="3550669942742167644">"සෙවීම අවසන් කරන්න"</string>
-    <string name="description_clear_search" msgid="2347258825265600782">"සෙවීම හිස් කරන්න"</string>
-    <string name="select_account_dialog_title" msgid="2673504582803359239">"ගිණුම"</string>
-    <string name="set_default_account" msgid="7966099951006467572">"ඇමතුම් සඳහා මෙම එක සැමවිටම භාවිතා කරන්න"</string>
-    <string name="select_phone_account_for_calls" msgid="1784460686103423274">"සමඟ අමතන්න"</string>
-    <string name="call_with_a_note" msgid="6242261320491851133">"සටහනක් සමගින් අමතන්න"</string>
-    <string name="call_subject_hint" msgid="7233138753650420800">"ඇමතුම සමග යැවීමට සටහනක් ටයිප් කරන්න ..."</string>
-    <string name="send_and_call_button" msgid="4735168294120154013">"යවන්න සහ අමතන්න"</string>
-    <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="tab_title" msgid="3387876802026074288">"<xliff:g id="TITLE">%1$s</xliff:g> ටැබය."</string>
-    <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
-      <item quantity="one"> <xliff:g id="TITLE_2">%1$s</xliff:g> ටැබය. නොකියවූ අයිතම <xliff:g id="COUNT_3">%2$d</xliff:g>. </item>
-      <item quantity="other"> <xliff:g id="TITLE_2">%1$s</xliff:g> ටැබය. නොකියවූ අයිතම <xliff:g id="COUNT_3">%2$d</xliff:g>. </item>
-    </plurals>
-    <string name="description_search_video_call" msgid="4337369876888024909">"වීඩියෝ ඇමතුම"</string>
-    <string name="description_search_call_and_share" msgid="4912772842755050467">"බෙදා ගෙන අමතන්න"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_custom">%s අමතන්න</string>
+  <string name="call_home">ගෙදර අමතන්න</string>
+  <string name="call_mobile">ජංගම දුරකථනය අමතන්න</string>
+  <string name="call_work">කාර්යාලය අමතන්න</string>
+  <string name="call_fax_work">කාර්යාල ෆැක්ස් අමතන්න</string>
+  <string name="call_fax_home">නිවෙස් ෆැක්ස් අමතන්න</string>
+  <string name="call_pager">පේජර් අමතන්න</string>
+  <string name="call_other">ඇමතුම</string>
+  <string name="call_callback">නැවත ඇමතුම අමතන්න</string>
+  <string name="call_car">කාරය අමතන්න</string>
+  <string name="call_company_main">ආයතන මූලිකය අමතන්න</string>
+  <string name="call_isdn">ISDN අමතන්න</string>
+  <string name="call_main">මූලිකය අමතන්න</string>
+  <string name="call_other_fax">ෆැක්ස් අමතන්න</string>
+  <string name="call_radio">රේඩියෝව අමතන්න</string>
+  <string name="call_telex">ටෙලෙක්ස් අමතන්න</string>
+  <string name="call_tty_tdd">TTY/TDD අමතන්න</string>
+  <string name="call_work_mobile">කාර්යාල ජංගම දුරකථනය අමතන්න</string>
+  <string name="call_work_pager">කාර්යාල පේජරය අමතන්න</string>
+  <string name="call_assistant">%s අමතන්න</string>
+  <string name="call_mms">MMS අමතන්න</string>
+  <string name="sms_custom">%s ට කෙටි පණිවිඩයක් යවන්න</string>
+  <string name="sms_home">නිවසට කෙටි පණිවිඩයක් යවන්න</string>
+  <string name="sms_mobile">ජංගම දුරකථනයට කෙටි පණිවිඩයක් යවන්න</string>
+  <string name="sms_work">කාර්යාලයට කෙටි පණිවිඩයක් යවන්න</string>
+  <string name="sms_fax_work">කාර්යාල ෆැක්ස් වෙත කෙටි පණිවිඩයක් යවන්න</string>
+  <string name="sms_fax_home">නිවෙස් ෆැක්ස් වෙත කෙටි පණිවිඩයක් යවන්න</string>
+  <string name="sms_pager">පේජරයට කෙටි පණිවිඩයක් යවන්න</string>
+  <string name="sms_other">කෙටි පණිවිඩයක් යවන්න</string>
+  <string name="sms_callback">නැවත ඇමතුමට කෙටි පණිවිඩයක් යවන්න</string>
+  <string name="sms_car">කාරයට කෙටි පණිවිඩයක් යවන්න</string>
+  <string name="sms_company_main">ආයතනයේ මූලික එකට කෙටි පණිවිඩයක් යවන්න</string>
+  <string name="sms_isdn">ISDN වෙත කෙටි පණිවිඩයක් යවන්න</string>
+  <string name="sms_main">මූලික අංකයට කෙටි පණිවිඩයක් යවන්න</string>
+  <string name="sms_other_fax">ෆැක්ස් වෙත කෙටි පණිවිඩයක් යවන්න</string>
+  <string name="sms_radio">රේඩියෝවට කෙටි පණිවිඩයක් යවන්න</string>
+  <string name="sms_telex">ටෙලෙක්ස් වෙත කෙටි පණිවිඩයක් යවන්න</string>
+  <string name="sms_tty_tdd">TTY/TDD වෙත කෙටි පණිවිඩයක් යවන්න</string>
+  <string name="sms_work_mobile">කාර්යාල ජංගම දුරකථනයට කෙටි පණිවිඩයක් යවන්න</string>
+  <string name="sms_work_pager">කාර්යාල පේජරයට කෙටි පණිවිඩයක් යවන්න</string>
+  <string name="sms_assistant">%s ට කෙටි පණිවිඩයක් යවන්න</string>
+  <string name="sms_mms">MMS වෙත කෙටි පණිවිඩයක් යවන්න</string>
+  <string name="clearFrequentsConfirmation_title">නිතරම සම්බන්ධ වන අය හිස් කරන්නද?</string>
+  <string name="clearFrequentsConfirmation">ඔබ සම්බන්ධතා සහ දුරකථන යෙදුම්වලින් නිතරම සම්බන්ධ වුණු අයගේ ලැයිස්තුව හිස් කර, මුල සිටම ඔබගේ ලිපින අභිරුචි ඉගෙනීමට ඊ-තැපැල් යෙදුම්වලට බල කරයි.</string>
+  <string name="clearFrequentsProgress_title">නිතරම සම්බන්ධ වන අය හිස් කරමින්…</string>
+  <string name="status_available">සිටියි</string>
+  <string name="status_away">ළඟ නැත</string>
+  <string name="status_busy">කාර්යබහුල</string>
+  <string name="contactsList">සම්බන්ධතා</string>
+  <string name="contact_suggestions">ඉහළින්ම යෝජිත</string>
+  <string name="local_invisible_directory">වෙනත්</string>
+  <string name="directory_search_label">නාමාවලිය</string>
+  <string name="directory_search_label_work">කාර්යාල සම්බන්ධතා නාමාවලිය</string>
+  <string name="local_search_label">සියලුම සම්බන්ධතා</string>
+  <string name="local_suggestions_search_label">යෝජනා</string>
+  <string msgid="9154761216179882405" name="user_profile_contacts_list_header">මම</string>
+  <string name="missing_name">(නමක් නොමැත)</string>
+  <string msgid="2795575601596468581" name="description_view_contact_detail">සම්බන්ධතාව පෙන්වන්න.</string>
+  <string name="list_filter_phones">දුරකථන අංක සහිත සම්බන්ධතා</string>
+  <string name="list_filter_phones_work">කාර්යාල පැතිකඩ සම්බන්ධතා</string>
+  <string name="view_updates_from_group">යාවත්කාලීන වීම් පෙන්වන්න</string>
+  <string name="account_phone">උපාංගය-පමණී, සමමුහුර්තකරණය නොකරන ලදී</string>
+  <string name="nameLabelsGroup">නම‍</string>
+  <string name="nicknameLabelsGroup">අපනාමය</string>
+  <string name="full_name">නම‍</string>
+  <string name="name_given">පළමු නම</string>
+  <string name="name_family">අවසාන නම</string>
+  <string name="name_prefix">නම් උපසර්ගය</string>
+  <string name="name_middle">මැද නම</string>
+  <string name="name_suffix">නම් ප්‍රත්‍යය</string>
+  <string name="name_phonetic">ස්වර නම</string>
+  <string name="name_phonetic_given">ශබ්ද විද්‍යාත්මක මුල් නම</string>
+  <string name="name_phonetic_middle">ස්වර මැද නම</string>
+  <string name="name_phonetic_family">ශබ්ද විද්‍යාත්මක අවසාන නම</string>
+  <string name="phoneLabelsGroup">දුරකථනය</string>
+  <string name="emailLabelsGroup">ඊ-තැපෑල</string>
+  <string name="postalLabelsGroup">ලිපිනය</string>
+  <string name="imLabelsGroup">IM</string>
+  <string name="organizationLabelsGroup">සංවිධානය</string>
+  <string name="relationLabelsGroup">ඥාතිත්වය</string>
+  <string name="eventLabelsGroup">විශේෂ දිනය</string>
+  <string name="sms">පෙළ පණිවුඩය</string>
+  <string name="postal_address">ලිපිනය</string>
+  <string name="ghostData_company">සමාගම</string>
+  <string name="ghostData_title">මාතෘකාව</string>
+  <string name="label_notes">සටහන්</string>
+  <string name="label_sip_address">SIP</string>
+  <string name="websiteLabelsGroup">වෙබ් අඩවිය</string>
+  <string name="groupsLabel">සමූහ</string>
+  <string name="email_home">නිවසට ඊ-තැපැල් කරන්න</string>
+  <string name="email_mobile">ජංගමයට ඊ-තැපැල් කරන්න</string>
+  <string name="email_work">කාර්යාලයට ඊ-තැපැල් කරන්න</string>
+  <string name="email_other">ඊ-තැපෑල</string>
+  <string name="email_custom">%s ඊ-තැපැල් කරන්න</string>
+  <string name="email">ඊ-තැපෑල</string>
+  <string name="postal_street">වීථිය</string>
+  <string name="postal_city">නගරය</string>
+  <string name="postal_region">ජනපදය</string>
+  <string name="postal_postcode">ZIP කේතය</string>
+  <string name="postal_country">රට</string>
+  <string name="map_home">නිවෙස් ලිපිනය පෙන්වන්න</string>
+  <string name="map_work">කාර්යාල ලිපිනය පෙන්වන්න</string>
+  <string name="map_other">ලිපිනය පෙන්වන්න</string>
+  <string name="map_custom">%s ලිපිනය පෙන්වන්න</string>
+  <string name="chat_aim">AIM භාවිතයෙන් කතාබස් කරන්න</string>
+  <string name="chat_msn">Windows Live භාවිතයෙන් කතාබස් කරන්න</string>
+  <string name="chat_yahoo">Yahoo භාවිතයෙන් කතාබස් කරන්න</string>
+  <string name="chat_skype">Skype භාවිතයෙන් කතාබස් කරන්න</string>
+  <string name="chat_qq">QQ භාවිතයෙන් කතාබස් කරන්න</string>
+  <string name="chat_gtalk">Google Talk භාවිතයෙන් කතාබස් කරන්න</string>
+  <string name="chat_icq">ICQ භාවිතයෙන් කතාබස් කරන්න</string>
+  <string name="chat_jabber">Jabber භාවිතයෙන් කතාබස් කරන්න</string>
+  <string name="chat">කතාබස්</string>
+  <string name="list_filter_all_accounts">සියලුම සම්බන්ධතා</string>
+  <string name="listAllContactsInAccount">%s හි සම්බන්ධතා</string>
+  <string name="listCustomView">අභිරුචි පෙනුමේ සම්බන්ධතා</string>
+  <string name="listSingleContact">එක් සම්බන්ධතාවය</string>
+  <string name="display_options_sort_list_by">අනුපිළිවෙලට සකසා ඇත්තේ</string>
+  <string name="display_options_sort_by_given_name">පළමු නම</string>
+  <string name="display_options_sort_by_family_name">අවසාන නම</string>
+  <string name="display_options_view_names_as">නමේ ආකෘතිය</string>
+  <string name="display_options_view_given_name_first">මුල් නම මුලින්ම</string>
+  <string name="display_options_view_family_name_first">අවසාන නම මුලින්ම</string>
+  <string name="menu_clear_frequents">නිතරමයන් හිස් කරන්න</string>
+  <string name="action_menu_back_from_search">සෙවීම අවසන් කරන්න</string>
+  <string name="description_clear_search">සෙවීම හිස් කරන්න</string>
+  <string name="select_account_dialog_title">ගිණුම</string>
+  <string name="set_default_account">ඇමතුම් සඳහා මෙම එක සැමවිටම භාවිතා කරන්න</string>
+  <string name="select_phone_account_for_calls">මෙම ඇමතුම සඳහා SIM තෝරන්න</string>
+  <string name="select_phone_account_for_calls_remember">මෙම තේරීම මතක තබා ගන්න</string>
+  <string name="call_with_a_note">සටහනක් සමගින් අමතන්න</string>
+  <string name="call_subject_hint">ඇමතුම සමග යැවීමට සටහනක් ටයිප් කරන්න ...</string>
+  <string name="send_and_call_button">යවන්න සහ අමතන්න</string>
+  <string name="call_subject_limit">%1$s / %2$s</string>
+  <string name="old_call_subject_type_and_number">%1$s %2$s</string>
+  <string name="tab_title">%1$s ටැබය.</string>
+  <plurals name="tab_title_with_unread_items">
+    <item quantity="one"> %1$s ටැබය. නොකියවූ අයිතම %2$d. </item>
+    <item quantity="other"> %1$s ටැබය. නොකියවූ අයිතම %2$d. </item>
+  </plurals>
+  <string name="description_search_video_call">වීඩියෝ ඇමතුම</string>
+  <string name="description_search_call_and_share">බෙදා ගෙන අමතන්න</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-sk/strings.xml b/java/com/android/contacts/common/res/values-sk/strings.xml
index dc4d041..1e11e18 100644
--- a/java/com/android/contacts/common/res/values-sk/strings.xml
+++ b/java/com/android/contacts/common/res/values-sk/strings.xml
@@ -1,164 +1,147 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="toast_text_copied" msgid="8979281391599667362">"Text bol skopírovaný"</string>
-    <string name="call_custom" msgid="3041673234638990874">"Volať kontakt <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="call_home" msgid="125893483593803791">"Volať na domáci telefón"</string>
-    <string name="call_mobile" msgid="967589404494150813">"Volať na mobil"</string>
-    <string name="call_work" msgid="6040550697395300892">"Volať na pracovný telefón"</string>
-    <string name="call_fax_work" msgid="5260192771364592922">"Volať na pracovný fax"</string>
-    <string name="call_fax_home" msgid="5174311195081144124">"Volať na domáci fax"</string>
-    <string name="call_pager" msgid="6814149227741274161">"Volať na pager"</string>
-    <string name="call_other" msgid="5536385588712587235">"Volať"</string>
-    <string name="call_callback" msgid="6314019862718112786">"Volať na číslo spätného volania"</string>
-    <string name="call_car" msgid="3197417098027764954">"Volať na telefón v aute"</string>
-    <string name="call_company_main" msgid="2557663310028446397">"Volať firme (hlavné číslo)"</string>
-    <string name="call_isdn" msgid="4691270442763649522">"Volať na číslo ISDN"</string>
-    <string name="call_main" msgid="3293707608770407814">"Volať na hlavné číslo"</string>
-    <string name="call_other_fax" msgid="4724521984879021465">"Volať na fax"</string>
-    <string name="call_radio" msgid="8942441419845057942">"Volať na rádiostanicu"</string>
-    <string name="call_telex" msgid="2031514461660668351">"Volať na číslo Telex"</string>
-    <string name="call_tty_tdd" msgid="7807210224965727701">"Volať na číslo TTY/TDD"</string>
-    <string name="call_work_mobile" msgid="2716342732938578495">"Volať na pracovný mobil"</string>
-    <string name="call_work_pager" msgid="3791778749827366574">"Volať na pracovný pager"</string>
-    <string name="call_assistant" msgid="4177478845473789294">"Volať kontakt <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
-    <string name="call_mms" msgid="4958811711741872901">"Volať na číslo MMS"</string>
-    <string name="sms_custom" msgid="8785368968605026317">"Poslať správu kontaktu <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="sms_home" msgid="3527719551060295243">"Poslať správu na domáci telefón"</string>
-    <string name="sms_mobile" msgid="8883045857887736518">"Poslať správu na mobil"</string>
-    <string name="sms_work" msgid="4158595439553450966">"Poslať správu na pracovný telefón"</string>
-    <string name="sms_fax_work" msgid="5483726627718055248">"Poslať správu na pracovný fax"</string>
-    <string name="sms_fax_home" msgid="9219265155770746077">"Poslať správu na domáci fax"</string>
-    <string name="sms_pager" msgid="4901085068525193933">"Poslať správu na pager"</string>
-    <string name="sms_other" msgid="1742702947993285933">"Poslať správu"</string>
-    <string name="sms_callback" msgid="5833483630377538308">"Poslať správu na číslo spätného volania"</string>
-    <string name="sms_car" msgid="4314577266154395174">"Poslať správu na telefón v aute"</string>
-    <string name="sms_company_main" msgid="2308160928487360705">"Poslať správu do firmy (hlavné číslo)"</string>
-    <string name="sms_isdn" msgid="6394300346179302542">"Poslať správu na číslo ISDN"</string>
-    <string name="sms_main" msgid="8908087742014140774">"Poslať správu na hlavné číslo"</string>
-    <string name="sms_other_fax" msgid="8768455473295405427">"Poslať správu na fax"</string>
-    <string name="sms_radio" msgid="855555176531704682">"Poslať správu na rádiostanicu"</string>
-    <string name="sms_telex" msgid="6269029276223252719">"Poslať správu na číslo Telex"</string>
-    <string name="sms_tty_tdd" msgid="6229057354509192444">"Poslať správu na číslo TTY/TDD"</string>
-    <string name="sms_work_mobile" msgid="2155975469329969840">"Poslať správu na pracovný mobil"</string>
-    <string name="sms_work_pager" msgid="8500140274906830742">"Poslať správu na pracovný pager"</string>
-    <string name="sms_assistant" msgid="8513548482745330818">"Poslať správu kontaktu <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
-    <string name="sms_mms" msgid="5187888900503248542">"Poslať správu na číslo MMS"</string>
-    <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"Vymazať často kontaktované osoby?"</string>
-    <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"Vymažete zoznam často kontaktovaných osôb v aplikáciách Kontakty a Telefón a e-mailové aplikácie budú musieť odznova vytvoriť predvoľby adresátov."</string>
-    <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"Mazanie často kontaktov. osôb..."</string>
-    <string name="status_available" msgid="2648156525685472626">"Som tu"</string>
-    <string name="status_away" msgid="2298688367552893953">"Som preč"</string>
-    <string name="status_busy" msgid="5990832098713248503">"Nemám čas"</string>
-    <string name="contactsList" msgid="8806067891419291513">"Kontakty"</string>
-    <string name="contact_suggestions" msgid="3324166754807120006">"Najviac odporúčané"</string>
-    <string name="local_invisible_directory" msgid="4723238462733650090">"Iné"</string>
-    <string name="directory_search_label" msgid="4621215895484025229">"Adresár"</string>
-    <string name="directory_search_label_work" msgid="7679326282707414897">"Pracovný adresár"</string>
-    <string name="local_search_label" msgid="907622822323119235">"Všetky kontakty"</string>
-    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Návrhy"</string>
-    <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Ja"</string>
-    <string name="missing_name" msgid="978606963362745020">"(Bez mena)"</string>
-    <string name="description_view_contact_detail" msgid="2428742401208561136">"Zobraziť kontakt"</string>
-    <string name="list_filter_phones" msgid="8763316061763437182">"Všetky kontakty s telefónnymi číslami"</string>
-    <string name="list_filter_phones_work" msgid="7083575404573422965">"Kontakty v pracovnom profile"</string>
-    <string name="view_updates_from_group" msgid="9011641093168385729">"Zobraziť aktualizácie"</string>
-    <string name="account_phone" msgid="7067809073194061035">"Len v zariadení, bez synchronizácie"</string>
-    <string name="nameLabelsGroup" msgid="7730465833159557471">"Meno"</string>
-    <string name="nicknameLabelsGroup" msgid="6310556912361840029">"Prezývka"</string>
-    <string name="full_name" msgid="648186563998465740">"Meno"</string>
-    <string name="name_given" msgid="5096576006314820536">"Krstné meno"</string>
-    <string name="name_family" msgid="6646235805198547467">"Priezvisko"</string>
-    <string name="name_prefix" msgid="9215326539658838">"Titul pred menom"</string>
-    <string name="name_middle" msgid="703755205331582769">"Stredné meno"</string>
-    <string name="name_suffix" msgid="5777083390282548702">"Titul za menom"</string>
-    <string name="name_phonetic" msgid="1650870996361663089">"Meno (foneticky)"</string>
-    <string name="name_phonetic_given" msgid="618812334274603170">"Krstné meno (foneticky)"</string>
-    <string name="name_phonetic_middle" msgid="4826820763384625538">"Stredné meno (foneticky)"</string>
-    <string name="name_phonetic_family" msgid="379905191212930771">"Priezvisko (foneticky)"</string>
-    <string name="phoneLabelsGroup" msgid="169661929021355548">"Telefón"</string>
-    <string name="emailLabelsGroup" msgid="2249752810477488833">"E-mail"</string>
-    <string name="postalLabelsGroup" msgid="6772000590189142253">"Adresa"</string>
-    <string name="imLabelsGroup" msgid="5718066254237364731">"Čet"</string>
-    <string name="organizationLabelsGroup" msgid="1101996309241601435">"Organizácia"</string>
-    <string name="relationLabelsGroup" msgid="53866051664600053">"Vzťah"</string>
-    <string name="eventLabelsGroup" msgid="1236970042646618489">"Špeciálny dátum"</string>
-    <string name="sms" msgid="7574344928185328095">"Textová správa"</string>
-    <string name="postal_address" msgid="1804707930129674200">"Adresa"</string>
-    <string name="ghostData_company" msgid="2554310786296833424">"Spoločnosť"</string>
-    <string name="ghostData_title" msgid="4994968731830184837">"Funkcia"</string>
-    <string name="label_notes" msgid="2050255313694219786">"Poznámky"</string>
-    <string name="label_sip_address" msgid="8883266182575965926">"SIP"</string>
-    <string name="websiteLabelsGroup" msgid="1630734286462186790">"Web"</string>
-    <string name="groupsLabel" msgid="2694002798416868728">"Skupiny"</string>
-    <string name="email_home" msgid="889830029388962171">"E-mail domov"</string>
-    <string name="email_mobile" msgid="4487686436743741150">"E-mail na mobil"</string>
-    <string name="email_work" msgid="4223487303344613528">"E-mail do práce"</string>
-    <string name="email_other" msgid="4246411900126012062">"E-mail"</string>
-    <string name="email_custom" msgid="7246580894327511013">"Poslať e-mail na adresu <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="email" msgid="2807318537887091606">"E-mail"</string>
-    <string name="postal_street" msgid="6918171741240802474">"Ulica"</string>
-    <string name="postal_city" msgid="8674569121430005628">"Mesto"</string>
-    <string name="postal_region" msgid="1730369286225469192">"Štát"</string>
-    <string name="postal_postcode" msgid="4450700741261990439">"PSČ"</string>
-    <string name="postal_country" msgid="232670707458768148">"Krajina"</string>
-    <string name="map_home" msgid="4181131107392126938">"Zobraziť adresu domov"</string>
-    <string name="map_work" msgid="5723471185992684400">"Zobraziť pracovnú adresu"</string>
-    <string name="map_other" msgid="2253764780863500516">"Zobraziť adresu"</string>
-    <string name="map_custom" msgid="5581743097882436157">"Zobraziť adresu <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="chat_aim" msgid="2954364435497941659">"Zhovárať sa pomocou služby AIM"</string>
-    <string name="chat_msn" msgid="3130135239071228678">"Zhovárať sa pomocou služby Windows Live"</string>
-    <string name="chat_yahoo" msgid="3233552142326865347">"Zhovárať sa pomocou služby Yahoo"</string>
-    <string name="chat_skype" msgid="6486703981390592425">"Zhovárať sa pomocou služby Skype"</string>
-    <string name="chat_qq" msgid="786924280665740019">"Zhovárať sa pomocou služby QQ"</string>
-    <string name="chat_gtalk" msgid="7914674177243078035">"Zhovárať sa pomocou aplikácie Google Talk"</string>
-    <string name="chat_icq" msgid="3292934726414765801">"Zhovárať sa pomocou služby ICQ"</string>
-    <string name="chat_jabber" msgid="6701542313597880204">"Zhovárať sa pomocou služby Jabber"</string>
-    <string name="chat" msgid="1020428260359370236">"Četovať"</string>
-    <string name="list_filter_all_accounts" msgid="473782314881473992">"Všetky kontakty"</string>
-    <string name="listAllContactsInAccount" msgid="3486378621592995630">"Kontakty v účte <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="listCustomView" msgid="5306282632413086731">"Kontakty vo vlastnom zobrazení"</string>
-    <string name="listSingleContact" msgid="8620818791932382627">"Jednotlivý kontakt"</string>
-    <string name="display_options_sort_list_by" msgid="3541875948367831228">"Zoradiť podľa"</string>
-    <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"Krstné meno"</string>
-    <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"Priezvisko"</string>
-    <string name="display_options_view_names_as" msgid="4204204205736735618">"Formát mena"</string>
-    <string name="display_options_view_given_name_first" msgid="2308026973021171020">"Najprv krstné meno"</string>
-    <string name="display_options_view_family_name_first" msgid="987430497292428242">"Najprv priezvisko"</string>
-    <string name="menu_clear_frequents" msgid="5358271535047496120">"Vymazať často kontaktovaných"</string>
-    <string name="action_menu_back_from_search" msgid="3550669942742167644">"zastaviť vyhľadávanie"</string>
-    <string name="description_clear_search" msgid="2347258825265600782">"Vymazať vyhľadávanie"</string>
-    <string name="select_account_dialog_title" msgid="2673504582803359239">"Účet"</string>
-    <string name="set_default_account" msgid="7966099951006467572">"Vždy používať pre hovory"</string>
-    <string name="select_phone_account_for_calls" msgid="1784460686103423274">"Volať pomocou"</string>
-    <string name="call_with_a_note" msgid="6242261320491851133">"Hovor s poznámkou"</string>
-    <string name="call_subject_hint" msgid="7233138753650420800">"Napíšte poznámku, ktorá sa odošle s hovorom..."</string>
-    <string name="send_and_call_button" msgid="4735168294120154013">"ODOSLAŤ A VOLAŤ"</string>
-    <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="tab_title" msgid="3387876802026074288">"Karta <xliff:g id="TITLE">%1$s</xliff:g>."</string>
-    <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
-      <item quantity="few"> Karta <xliff:g id="TITLE_2">%1$s</xliff:g>. <xliff:g id="COUNT_3">%2$d</xliff:g> neprečítané položky. </item>
-      <item quantity="many"> Karta <xliff:g id="TITLE_2">%1$s</xliff:g>. <xliff:g id="COUNT_3">%2$d</xliff:g> neprečítanej položky. </item>
-      <item quantity="other"> Karta <xliff:g id="TITLE_2">%1$s</xliff:g>. <xliff:g id="COUNT_3">%2$d</xliff:g> neprečítaných položiek. </item>
-      <item quantity="one"> Karta <xliff:g id="TITLE_0">%1$s</xliff:g>. <xliff:g id="COUNT_1">%2$d</xliff:g> neprečítaná položka. </item>
-    </plurals>
-    <string name="description_search_video_call" msgid="4337369876888024909">"Videohovor"</string>
-    <string name="description_search_call_and_share" msgid="4912772842755050467">"Zdieľať a volať"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_custom">Volať kontakt %s</string>
+  <string name="call_home">Volať na domáci telefón</string>
+  <string name="call_mobile">Volať na mobil</string>
+  <string name="call_work">Volať na pracovný telefón</string>
+  <string name="call_fax_work">Volať na pracovný fax</string>
+  <string name="call_fax_home">Volať na domáci fax</string>
+  <string name="call_pager">Volať na pager</string>
+  <string name="call_other">Volať</string>
+  <string name="call_callback">Volať na číslo spätného volania</string>
+  <string name="call_car">Volať na telefón v aute</string>
+  <string name="call_company_main">Volať firme (hlavné číslo)</string>
+  <string name="call_isdn">Volať na číslo ISDN</string>
+  <string name="call_main">Volať na hlavné číslo</string>
+  <string name="call_other_fax">Volať na fax</string>
+  <string name="call_radio">Volať na rádiostanicu</string>
+  <string name="call_telex">Volať na číslo Telex</string>
+  <string name="call_tty_tdd">Volať na číslo TTY/TDD</string>
+  <string name="call_work_mobile">Volať na pracovný mobil</string>
+  <string name="call_work_pager">Volať na pracovný pager</string>
+  <string name="call_assistant">Volať kontakt %s</string>
+  <string name="call_mms">Volať na číslo MMS</string>
+  <string name="sms_custom">Poslať správu kontaktu %s</string>
+  <string name="sms_home">Poslať správu na domáci telefón</string>
+  <string name="sms_mobile">Poslať správu na mobil</string>
+  <string name="sms_work">Poslať správu na pracovný telefón</string>
+  <string name="sms_fax_work">Poslať správu na pracovný fax</string>
+  <string name="sms_fax_home">Poslať správu na domáci fax</string>
+  <string name="sms_pager">Poslať správu na pager</string>
+  <string name="sms_other">Poslať správu</string>
+  <string name="sms_callback">Poslať správu na číslo spätného volania</string>
+  <string name="sms_car">Poslať správu na telefón v aute</string>
+  <string name="sms_company_main">Poslať správu do firmy (hlavné číslo)</string>
+  <string name="sms_isdn">Poslať správu na číslo ISDN</string>
+  <string name="sms_main">Poslať správu na hlavné číslo</string>
+  <string name="sms_other_fax">Poslať správu na fax</string>
+  <string name="sms_radio">Poslať správu na rádiostanicu</string>
+  <string name="sms_telex">Poslať správu na číslo Telex</string>
+  <string name="sms_tty_tdd">Poslať správu na číslo TTY/TDD</string>
+  <string name="sms_work_mobile">Poslať správu na pracovný mobil</string>
+  <string name="sms_work_pager">Poslať správu na pracovný pager</string>
+  <string name="sms_assistant">Poslať správu kontaktu %s</string>
+  <string name="sms_mms">Poslať správu na číslo MMS</string>
+  <string name="clearFrequentsConfirmation_title">Vymazať často kontaktované osoby?</string>
+  <string name="clearFrequentsConfirmation">Vymažete zoznam často kontaktovaných osôb v aplikáciách Kontakty a Telefón a e-mailové aplikácie budú musieť odznova vytvoriť predvoľby adresátov.</string>
+  <string name="clearFrequentsProgress_title">Mazanie často kontaktov. osôb...</string>
+  <string name="status_available">Som tu</string>
+  <string name="status_away">Som preč</string>
+  <string name="status_busy">Nemám čas</string>
+  <string name="contactsList">Kontakty</string>
+  <string name="contact_suggestions">Najviac odporúčané</string>
+  <string name="local_invisible_directory">Iné</string>
+  <string name="directory_search_label">Adresár</string>
+  <string name="directory_search_label_work">Pracovný adresár</string>
+  <string name="local_search_label">Všetky kontakty</string>
+  <string name="local_suggestions_search_label">Návrhy</string>
+  <string msgid="9154761216179882405" name="user_profile_contacts_list_header">Ja</string>
+  <string name="missing_name">(Bez mena)</string>
+  <string msgid="2795575601596468581" name="description_view_contact_detail">Zobraziť kontakt</string>
+  <string name="list_filter_phones">Všetky kontakty s telefónnymi číslami</string>
+  <string name="list_filter_phones_work">Kontakty v pracovnom profile</string>
+  <string name="view_updates_from_group">Zobraziť aktualizácie</string>
+  <string name="account_phone">Len v zariadení, bez synchronizácie</string>
+  <string name="nameLabelsGroup">Meno</string>
+  <string name="nicknameLabelsGroup">Prezývka</string>
+  <string name="full_name">Meno</string>
+  <string name="name_given">Krstné meno</string>
+  <string name="name_family">Priezvisko</string>
+  <string name="name_prefix">Titul pred menom</string>
+  <string name="name_middle">Stredné meno</string>
+  <string name="name_suffix">Titul za menom</string>
+  <string name="name_phonetic">Meno (foneticky)</string>
+  <string name="name_phonetic_given">Krstné meno (foneticky)</string>
+  <string name="name_phonetic_middle">Stredné meno (foneticky)</string>
+  <string name="name_phonetic_family">Priezvisko (foneticky)</string>
+  <string name="phoneLabelsGroup">Telefón</string>
+  <string name="emailLabelsGroup">E-mail</string>
+  <string name="postalLabelsGroup">Adresa</string>
+  <string name="imLabelsGroup">Čet</string>
+  <string name="organizationLabelsGroup">Organizácia</string>
+  <string name="relationLabelsGroup">Vzťah</string>
+  <string name="eventLabelsGroup">Špeciálny dátum</string>
+  <string name="sms">Textová správa</string>
+  <string name="postal_address">Adresa</string>
+  <string name="ghostData_company">Spoločnosť</string>
+  <string name="ghostData_title">Funkcia</string>
+  <string name="label_notes">Poznámky</string>
+  <string name="label_sip_address">SIP</string>
+  <string name="websiteLabelsGroup">Web</string>
+  <string name="groupsLabel">Skupiny</string>
+  <string name="email_home">E-mail domov</string>
+  <string name="email_mobile">E-mail na mobil</string>
+  <string name="email_work">E-mail do práce</string>
+  <string name="email_other">E-mail</string>
+  <string name="email_custom">Poslať e-mail na adresu %s</string>
+  <string name="email">E-mail</string>
+  <string name="postal_street">Ulica</string>
+  <string name="postal_city">Mesto</string>
+  <string name="postal_region">Štát</string>
+  <string name="postal_postcode">PSČ</string>
+  <string name="postal_country">Krajina</string>
+  <string name="map_home">Zobraziť adresu domov</string>
+  <string name="map_work">Zobraziť pracovnú adresu</string>
+  <string name="map_other">Zobraziť adresu</string>
+  <string name="map_custom">Zobraziť adresu %s</string>
+  <string name="chat_aim">Zhovárať sa pomocou služby AIM</string>
+  <string name="chat_msn">Zhovárať sa pomocou služby Windows Live</string>
+  <string name="chat_yahoo">Zhovárať sa pomocou služby Yahoo</string>
+  <string name="chat_skype">Zhovárať sa pomocou služby Skype</string>
+  <string name="chat_qq">Zhovárať sa pomocou služby QQ</string>
+  <string name="chat_gtalk">Zhovárať sa pomocou aplikácie Google Talk</string>
+  <string name="chat_icq">Zhovárať sa pomocou služby ICQ</string>
+  <string name="chat_jabber">Zhovárať sa pomocou služby Jabber</string>
+  <string name="chat">Četovať</string>
+  <string name="list_filter_all_accounts">Všetky kontakty</string>
+  <string name="listAllContactsInAccount">Kontakty v účte %s</string>
+  <string name="listCustomView">Kontakty vo vlastnom zobrazení</string>
+  <string name="listSingleContact">Jednotlivý kontakt</string>
+  <string name="display_options_sort_list_by">Zoradiť podľa</string>
+  <string name="display_options_sort_by_given_name">Krstné meno</string>
+  <string name="display_options_sort_by_family_name">Priezvisko</string>
+  <string name="display_options_view_names_as">Formát mena</string>
+  <string name="display_options_view_given_name_first">Najprv krstné meno</string>
+  <string name="display_options_view_family_name_first">Najprv priezvisko</string>
+  <string name="menu_clear_frequents">Vymazať často kontaktovaných</string>
+  <string name="action_menu_back_from_search">zastaviť vyhľadávanie</string>
+  <string name="description_clear_search">Vymazať vyhľadávanie</string>
+  <string name="select_account_dialog_title">Účet</string>
+  <string name="set_default_account">Vždy používať pre hovory</string>
+  <string name="select_phone_account_for_calls">Vyberte SIM kartu na tento hovor</string>
+  <string name="select_phone_account_for_calls_remember">Zapamätať si túto voľbu</string>
+  <string name="call_with_a_note">Hovor s poznámkou</string>
+  <string name="call_subject_hint">Napíšte poznámku, ktorá sa odošle s hovorom...</string>
+  <string name="send_and_call_button">ODOSLAŤ A VOLAŤ</string>
+  <string name="call_subject_limit">%1$s / %2$s</string>
+  <string name="old_call_subject_type_and_number">%1$s %2$s</string>
+  <string name="tab_title">Karta %1$s.</string>
+  <plurals name="tab_title_with_unread_items">
+    <item quantity="one"> Karta %1$s. %2$d neprečítaná položka. </item>
+    <item quantity="few"> Karta %1$s. %2$d neprečítané položky. </item>
+    <item quantity="many"> Karta %1$s. %2$d neprečítanej položky. </item>
+    <item quantity="other"> Karta %1$s. %2$d neprečítaných položiek. </item>
+  </plurals>
+  <string name="description_search_video_call">Videohovor</string>
+  <string name="description_search_call_and_share">Zdieľať a volať</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-sl/strings.xml b/java/com/android/contacts/common/res/values-sl/strings.xml
index 1a9eab7..92f8dcc 100644
--- a/java/com/android/contacts/common/res/values-sl/strings.xml
+++ b/java/com/android/contacts/common/res/values-sl/strings.xml
@@ -1,164 +1,147 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="toast_text_copied" msgid="8979281391599667362">"Besedilo kopirano"</string>
-    <string name="call_custom" msgid="3041673234638990874">"Pokliči številko <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="call_home" msgid="125893483593803791">"Pokliči domov"</string>
-    <string name="call_mobile" msgid="967589404494150813">"Pokliči mobilni telefon"</string>
-    <string name="call_work" msgid="6040550697395300892">"Pokliči v službo"</string>
-    <string name="call_fax_work" msgid="5260192771364592922">"Pokliči službeni faks"</string>
-    <string name="call_fax_home" msgid="5174311195081144124">"Pokliči domači faks"</string>
-    <string name="call_pager" msgid="6814149227741274161">"Pokliči pozivnik"</string>
-    <string name="call_other" msgid="5536385588712587235">"Pokliči"</string>
-    <string name="call_callback" msgid="6314019862718112786">"Pokliči številko za povratni klic"</string>
-    <string name="call_car" msgid="3197417098027764954">"Pokliči telefon v avtu"</string>
-    <string name="call_company_main" msgid="2557663310028446397">"Pokliči glavno telefonsko številko podjetja"</string>
-    <string name="call_isdn" msgid="4691270442763649522">"Pokliči številko ISDN"</string>
-    <string name="call_main" msgid="3293707608770407814">"Pokliči glavno telefonsko številko"</string>
-    <string name="call_other_fax" msgid="4724521984879021465">"Pokliči faks"</string>
-    <string name="call_radio" msgid="8942441419845057942">"Pokliči radijski telefon"</string>
-    <string name="call_telex" msgid="2031514461660668351">"Pokliči teleks"</string>
-    <string name="call_tty_tdd" msgid="7807210224965727701">"Pokliči številko TTY/TDD"</string>
-    <string name="call_work_mobile" msgid="2716342732938578495">"Pokliči službeni mobilni telefon"</string>
-    <string name="call_work_pager" msgid="3791778749827366574">"Pokliči službeni pozivnik"</string>
-    <string name="call_assistant" msgid="4177478845473789294">"Pokliči številko pomočnika <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
-    <string name="call_mms" msgid="4958811711741872901">"Pokliči telefon MMS"</string>
-    <string name="sms_custom" msgid="8785368968605026317">"Pošlji SMS na številko <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="sms_home" msgid="3527719551060295243">"Pošlji SMS domov"</string>
-    <string name="sms_mobile" msgid="8883045857887736518">"Pošlji SMS v mobilni telefon"</string>
-    <string name="sms_work" msgid="4158595439553450966">"Pošlji SMS v službeni telefon"</string>
-    <string name="sms_fax_work" msgid="5483726627718055248">"Pošlji SMS v službeni faks"</string>
-    <string name="sms_fax_home" msgid="9219265155770746077">"Pošlji SMS v domači faks"</string>
-    <string name="sms_pager" msgid="4901085068525193933">"Pošlji SMS v pozivnik"</string>
-    <string name="sms_other" msgid="1742702947993285933">"SMS"</string>
-    <string name="sms_callback" msgid="5833483630377538308">"Pošlji SMS na številko za povratni klic"</string>
-    <string name="sms_car" msgid="4314577266154395174">"Pošlji SMS v telefon v avtu"</string>
-    <string name="sms_company_main" msgid="2308160928487360705">"Pošlji SMS na glavno telefonsko številko podjetja"</string>
-    <string name="sms_isdn" msgid="6394300346179302542">"Pošlji SMS na številko ISDN"</string>
-    <string name="sms_main" msgid="8908087742014140774">"Pošlji SMS na glavno telefonsko številko"</string>
-    <string name="sms_other_fax" msgid="8768455473295405427">"Pošlji SMS v faks"</string>
-    <string name="sms_radio" msgid="855555176531704682">"Pošlji SMS v radijski telefon"</string>
-    <string name="sms_telex" msgid="6269029276223252719">"Pošlji SMS v teleks"</string>
-    <string name="sms_tty_tdd" msgid="6229057354509192444">"Pošlji SMS na telefonsko številko TTY/TDD"</string>
-    <string name="sms_work_mobile" msgid="2155975469329969840">"Pošlji SMS v službeni mobilni telefon"</string>
-    <string name="sms_work_pager" msgid="8500140274906830742">"Pošlji SMS v službeni pozivnik"</string>
-    <string name="sms_assistant" msgid="8513548482745330818">"Pošlji SMS pomočniku na številko <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
-    <string name="sms_mms" msgid="5187888900503248542">"Pošlji SMS na telefonsko številko MMS"</string>
-    <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"Želite izbrisati seznam pog. stikov?"</string>
-    <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"Izbrisali boste seznam pogostih stikov v aplikacijah Stiki in Telefon, zato bodo e-poštne aplikacije začele shranjevati pogoste naslovnike od začetka."</string>
-    <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"Brisanje seznama pogost. stikov ..."</string>
-    <string name="status_available" msgid="2648156525685472626">"Dosegljiv"</string>
-    <string name="status_away" msgid="2298688367552893953">"Odsoten"</string>
-    <string name="status_busy" msgid="5990832098713248503">"Zaseden"</string>
-    <string name="contactsList" msgid="8806067891419291513">"Stiki"</string>
-    <string name="contact_suggestions" msgid="3324166754807120006">"Najboljši predlogi"</string>
-    <string name="local_invisible_directory" msgid="4723238462733650090">"Drugo"</string>
-    <string name="directory_search_label" msgid="4621215895484025229">"Imenik"</string>
-    <string name="directory_search_label_work" msgid="7679326282707414897">"Delovni imenik"</string>
-    <string name="local_search_label" msgid="907622822323119235">"Vsi stiki"</string>
-    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Predlogi"</string>
-    <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Jaz"</string>
-    <string name="missing_name" msgid="978606963362745020">"(Ni imena)"</string>
-    <string name="description_view_contact_detail" msgid="2428742401208561136">"Ogled stika"</string>
-    <string name="list_filter_phones" msgid="8763316061763437182">"Vsi stiki s telefonskimi številkami"</string>
-    <string name="list_filter_phones_work" msgid="7083575404573422965">"Stiki za delovni profil"</string>
-    <string name="view_updates_from_group" msgid="9011641093168385729">"Prikaži posodobitve"</string>
-    <string name="account_phone" msgid="7067809073194061035">"Samo v napravi; se ne sinhronizira"</string>
-    <string name="nameLabelsGroup" msgid="7730465833159557471">"Ime"</string>
-    <string name="nicknameLabelsGroup" msgid="6310556912361840029">"Vzdevek"</string>
-    <string name="full_name" msgid="648186563998465740">"Ime"</string>
-    <string name="name_given" msgid="5096576006314820536">"Ime"</string>
-    <string name="name_family" msgid="6646235805198547467">"Priimek"</string>
-    <string name="name_prefix" msgid="9215326539658838">"Naziv (pred imenom)"</string>
-    <string name="name_middle" msgid="703755205331582769">"Drugo ime"</string>
-    <string name="name_suffix" msgid="5777083390282548702">"Naziv (za imenom)"</string>
-    <string name="name_phonetic" msgid="1650870996361663089">"Ime – fonetično"</string>
-    <string name="name_phonetic_given" msgid="618812334274603170">"Ime – fonetično"</string>
-    <string name="name_phonetic_middle" msgid="4826820763384625538">"Drugo ime – fonetično"</string>
-    <string name="name_phonetic_family" msgid="379905191212930771">"Priimek – fonetično"</string>
-    <string name="phoneLabelsGroup" msgid="169661929021355548">"Telefon"</string>
-    <string name="emailLabelsGroup" msgid="2249752810477488833">"Pošlji e-poštno sporočilo"</string>
-    <string name="postalLabelsGroup" msgid="6772000590189142253">"Naslov"</string>
-    <string name="imLabelsGroup" msgid="5718066254237364731">"Neposredno sporočanje"</string>
-    <string name="organizationLabelsGroup" msgid="1101996309241601435">"Organizacija"</string>
-    <string name="relationLabelsGroup" msgid="53866051664600053">"Razmerje"</string>
-    <string name="eventLabelsGroup" msgid="1236970042646618489">"Posebni datum"</string>
-    <string name="sms" msgid="7574344928185328095">"SMS"</string>
-    <string name="postal_address" msgid="1804707930129674200">"Naslov"</string>
-    <string name="ghostData_company" msgid="2554310786296833424">"Podjetje"</string>
-    <string name="ghostData_title" msgid="4994968731830184837">"Naziv"</string>
-    <string name="label_notes" msgid="2050255313694219786">"Zapiski"</string>
-    <string name="label_sip_address" msgid="8883266182575965926">"SIP"</string>
-    <string name="websiteLabelsGroup" msgid="1630734286462186790">"Spletno mesto"</string>
-    <string name="groupsLabel" msgid="2694002798416868728">"Skupine"</string>
-    <string name="email_home" msgid="889830029388962171">"Pošlji e-poštno sporočilo domov"</string>
-    <string name="email_mobile" msgid="4487686436743741150">"Pošlji e-poštno sporočilo v mobilno napravo"</string>
-    <string name="email_work" msgid="4223487303344613528">"Pošlji e-poštno sporočilo na službeni naslov"</string>
-    <string name="email_other" msgid="4246411900126012062">"Pošlji e-poštno sporočilo"</string>
-    <string name="email_custom" msgid="7246580894327511013">"Pošlji e-poštno sporočilo na <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="email" msgid="2807318537887091606">"Pošlji e-poštno sporočilo"</string>
-    <string name="postal_street" msgid="6918171741240802474">"Ulica"</string>
-    <string name="postal_city" msgid="8674569121430005628">"Kraj"</string>
-    <string name="postal_region" msgid="1730369286225469192">"Zvezna država"</string>
-    <string name="postal_postcode" msgid="4450700741261990439">"Poštna številka"</string>
-    <string name="postal_country" msgid="232670707458768148">"Država"</string>
-    <string name="map_home" msgid="4181131107392126938">"Prikaži domači naslov"</string>
-    <string name="map_work" msgid="5723471185992684400">"Prikaži službeni naslov"</string>
-    <string name="map_other" msgid="2253764780863500516">"Prikaži naslov"</string>
-    <string name="map_custom" msgid="5581743097882436157">"Prikaži naslov <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="chat_aim" msgid="2954364435497941659">"Klepet s storitvijo AIM"</string>
-    <string name="chat_msn" msgid="3130135239071228678">"Klepet s storitvijo Windows Live"</string>
-    <string name="chat_yahoo" msgid="3233552142326865347">"Klepet s storitvijo Yahoo"</string>
-    <string name="chat_skype" msgid="6486703981390592425">"Klepet s storitvijo Skype"</string>
-    <string name="chat_qq" msgid="786924280665740019">"Klepet s storitvijo QQ"</string>
-    <string name="chat_gtalk" msgid="7914674177243078035">"Klepet s storitvijo Google Talk"</string>
-    <string name="chat_icq" msgid="3292934726414765801">"Klepet s storitvijo ICQ"</string>
-    <string name="chat_jabber" msgid="6701542313597880204">"Klepet s storitvijo Jabber"</string>
-    <string name="chat" msgid="1020428260359370236">"Klepet"</string>
-    <string name="list_filter_all_accounts" msgid="473782314881473992">"Vsi stiki"</string>
-    <string name="listAllContactsInAccount" msgid="3486378621592995630">"Stiki v <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="listCustomView" msgid="5306282632413086731">"Stiki v pogledu po meri"</string>
-    <string name="listSingleContact" msgid="8620818791932382627">"Posamezen stik"</string>
-    <string name="display_options_sort_list_by" msgid="3541875948367831228">"Razvrsti glede na"</string>
-    <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"Ime"</string>
-    <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"Priimek"</string>
-    <string name="display_options_view_names_as" msgid="4204204205736735618">"Oblika imena"</string>
-    <string name="display_options_view_given_name_first" msgid="2308026973021171020">"Najprej ime"</string>
-    <string name="display_options_view_family_name_first" msgid="987430497292428242">"Najprej priimek"</string>
-    <string name="menu_clear_frequents" msgid="5358271535047496120">"Izbriši seznam pogostih stikov"</string>
-    <string name="action_menu_back_from_search" msgid="3550669942742167644">"ustavitev iskanja"</string>
-    <string name="description_clear_search" msgid="2347258825265600782">"Počisti iskalno polje"</string>
-    <string name="select_account_dialog_title" msgid="2673504582803359239">"Račun"</string>
-    <string name="set_default_account" msgid="7966099951006467572">"Vedno uporabi to možnost za klice"</string>
-    <string name="select_phone_account_for_calls" msgid="1784460686103423274">"Klicanje z …"</string>
-    <string name="call_with_a_note" msgid="6242261320491851133">"Klic z zapiskom"</string>
-    <string name="call_subject_hint" msgid="7233138753650420800">"Vnesite zapisek, ki ga želite poslati s klicem ..."</string>
-    <string name="send_and_call_button" msgid="4735168294120154013">"POŠLJI IN KLIČI"</string>
-    <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g>/<xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g>: <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="tab_title" msgid="3387876802026074288">"Zavihek »<xliff:g id="TITLE">%1$s</xliff:g>«."</string>
-    <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
-      <item quantity="one"> Zavihek »<xliff:g id="TITLE_2">%1$s</xliff:g>«. <xliff:g id="COUNT_3">%2$d</xliff:g> neprebran element. </item>
-      <item quantity="two"> Zavihek »<xliff:g id="TITLE_2">%1$s</xliff:g>«. <xliff:g id="COUNT_3">%2$d</xliff:g> neprebrana elementa. </item>
-      <item quantity="few"> Zavihek »<xliff:g id="TITLE_2">%1$s</xliff:g>«. <xliff:g id="COUNT_3">%2$d</xliff:g> neprebrani elementi. </item>
-      <item quantity="other"> Zavihek »<xliff:g id="TITLE_2">%1$s</xliff:g>«. <xliff:g id="COUNT_3">%2$d</xliff:g> neprebranih elementov. </item>
-    </plurals>
-    <string name="description_search_video_call" msgid="4337369876888024909">"Videoklic"</string>
-    <string name="description_search_call_and_share" msgid="4912772842755050467">"Klic s skupno rabo"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_custom">Pokliči številko %s</string>
+  <string name="call_home">Pokliči domov</string>
+  <string name="call_mobile">Pokliči mobilni telefon</string>
+  <string name="call_work">Pokliči v službo</string>
+  <string name="call_fax_work">Pokliči službeni faks</string>
+  <string name="call_fax_home">Pokliči domači faks</string>
+  <string name="call_pager">Pokliči pozivnik</string>
+  <string name="call_other">Pokliči</string>
+  <string name="call_callback">Pokliči številko za povratni klic</string>
+  <string name="call_car">Pokliči telefon v avtu</string>
+  <string name="call_company_main">Pokliči glavno telefonsko številko podjetja</string>
+  <string name="call_isdn">Pokliči številko ISDN</string>
+  <string name="call_main">Pokliči glavno telefonsko številko</string>
+  <string name="call_other_fax">Pokliči faks</string>
+  <string name="call_radio">Pokliči radijski telefon</string>
+  <string name="call_telex">Pokliči teleks</string>
+  <string name="call_tty_tdd">Pokliči številko TTY/TDD</string>
+  <string name="call_work_mobile">Pokliči službeni mobilni telefon</string>
+  <string name="call_work_pager">Pokliči službeni pozivnik</string>
+  <string name="call_assistant">Pokliči številko pomočnika %s</string>
+  <string name="call_mms">Pokliči telefon MMS</string>
+  <string name="sms_custom">Pošlji SMS na številko %s</string>
+  <string name="sms_home">Pošlji SMS domov</string>
+  <string name="sms_mobile">Pošlji SMS v mobilni telefon</string>
+  <string name="sms_work">Pošlji SMS v službeni telefon</string>
+  <string name="sms_fax_work">Pošlji SMS v službeni faks</string>
+  <string name="sms_fax_home">Pošlji SMS v domači faks</string>
+  <string name="sms_pager">Pošlji SMS v pozivnik</string>
+  <string name="sms_other">SMS</string>
+  <string name="sms_callback">Pošlji SMS na številko za povratni klic</string>
+  <string name="sms_car">Pošlji SMS v telefon v avtu</string>
+  <string name="sms_company_main">Pošlji SMS na glavno telefonsko številko podjetja</string>
+  <string name="sms_isdn">Pošlji SMS na številko ISDN</string>
+  <string name="sms_main">Pošlji SMS na glavno telefonsko številko</string>
+  <string name="sms_other_fax">Pošlji SMS v faks</string>
+  <string name="sms_radio">Pošlji SMS v radijski telefon</string>
+  <string name="sms_telex">Pošlji SMS v teleks</string>
+  <string name="sms_tty_tdd">Pošlji SMS na telefonsko številko TTY/TDD</string>
+  <string name="sms_work_mobile">Pošlji SMS v službeni mobilni telefon</string>
+  <string name="sms_work_pager">Pošlji SMS v službeni pozivnik</string>
+  <string name="sms_assistant">Pošlji SMS pomočniku na številko %s</string>
+  <string name="sms_mms">Pošlji SMS na telefonsko številko MMS</string>
+  <string name="clearFrequentsConfirmation_title">Želite izbrisati seznam pog. stikov?</string>
+  <string name="clearFrequentsConfirmation">Izbrisali boste seznam pogostih stikov v aplikacijah Stiki in Telefon, zato bodo e-poštne aplikacije začele shranjevati pogoste naslovnike od začetka.</string>
+  <string name="clearFrequentsProgress_title">Brisanje seznama pogost. stikov ...</string>
+  <string name="status_available">Dosegljiv</string>
+  <string name="status_away">Odsoten</string>
+  <string name="status_busy">Zaseden</string>
+  <string name="contactsList">Stiki</string>
+  <string name="contact_suggestions">Najboljši predlogi</string>
+  <string name="local_invisible_directory">Drugo</string>
+  <string name="directory_search_label">Imenik</string>
+  <string name="directory_search_label_work">Delovni imenik</string>
+  <string name="local_search_label">Vsi stiki</string>
+  <string name="local_suggestions_search_label">Predlogi</string>
+  <string msgid="9154761216179882405" name="user_profile_contacts_list_header">Jaz</string>
+  <string name="missing_name">(Ni imena)</string>
+  <string msgid="2795575601596468581" name="description_view_contact_detail">Ogled stika</string>
+  <string name="list_filter_phones">Vsi stiki s telefonskimi številkami</string>
+  <string name="list_filter_phones_work">Stiki za delovni profil</string>
+  <string name="view_updates_from_group">Prikaži posodobitve</string>
+  <string name="account_phone">Samo v napravi; se ne sinhronizira</string>
+  <string name="nameLabelsGroup">Ime</string>
+  <string name="nicknameLabelsGroup">Vzdevek</string>
+  <string name="full_name">Ime</string>
+  <string name="name_given">Ime</string>
+  <string name="name_family">Priimek</string>
+  <string name="name_prefix">Naziv (pred imenom)</string>
+  <string name="name_middle">Drugo ime</string>
+  <string name="name_suffix">Naziv (za imenom)</string>
+  <string name="name_phonetic">Ime – fonetično</string>
+  <string name="name_phonetic_given">Ime – fonetično</string>
+  <string name="name_phonetic_middle">Drugo ime – fonetično</string>
+  <string name="name_phonetic_family">Priimek – fonetično</string>
+  <string name="phoneLabelsGroup">Telefon</string>
+  <string name="emailLabelsGroup">Pošlji e-poštno sporočilo</string>
+  <string name="postalLabelsGroup">Naslov</string>
+  <string name="imLabelsGroup">Neposredno sporočanje</string>
+  <string name="organizationLabelsGroup">Organizacija</string>
+  <string name="relationLabelsGroup">Razmerje</string>
+  <string name="eventLabelsGroup">Posebni datum</string>
+  <string name="sms">SMS</string>
+  <string name="postal_address">Naslov</string>
+  <string name="ghostData_company">Podjetje</string>
+  <string name="ghostData_title">Naziv</string>
+  <string name="label_notes">Zapiski</string>
+  <string name="label_sip_address">SIP</string>
+  <string name="websiteLabelsGroup">Spletno mesto</string>
+  <string name="groupsLabel">Skupine</string>
+  <string name="email_home">Pošlji e-poštno sporočilo domov</string>
+  <string name="email_mobile">Pošlji e-poštno sporočilo v mobilno napravo</string>
+  <string name="email_work">Pošlji e-poštno sporočilo na službeni naslov</string>
+  <string name="email_other">Pošlji e-poštno sporočilo</string>
+  <string name="email_custom">Pošlji e-poštno sporočilo na %s</string>
+  <string name="email">Pošlji e-poštno sporočilo</string>
+  <string name="postal_street">Ulica</string>
+  <string name="postal_city">Kraj</string>
+  <string name="postal_region">Zvezna država</string>
+  <string name="postal_postcode">Poštna številka</string>
+  <string name="postal_country">Država</string>
+  <string name="map_home">Prikaži domači naslov</string>
+  <string name="map_work">Prikaži službeni naslov</string>
+  <string name="map_other">Prikaži naslov</string>
+  <string name="map_custom">Prikaži naslov %s</string>
+  <string name="chat_aim">Klepet s storitvijo AIM</string>
+  <string name="chat_msn">Klepet s storitvijo Windows Live</string>
+  <string name="chat_yahoo">Klepet s storitvijo Yahoo</string>
+  <string name="chat_skype">Klepet s storitvijo Skype</string>
+  <string name="chat_qq">Klepet s storitvijo QQ</string>
+  <string name="chat_gtalk">Klepet s storitvijo Google Talk</string>
+  <string name="chat_icq">Klepet s storitvijo ICQ</string>
+  <string name="chat_jabber">Klepet s storitvijo Jabber</string>
+  <string name="chat">Klepet</string>
+  <string name="list_filter_all_accounts">Vsi stiki</string>
+  <string name="listAllContactsInAccount">Stiki v %s</string>
+  <string name="listCustomView">Stiki v pogledu po meri</string>
+  <string name="listSingleContact">Posamezen stik</string>
+  <string name="display_options_sort_list_by">Razvrsti glede na</string>
+  <string name="display_options_sort_by_given_name">Ime</string>
+  <string name="display_options_sort_by_family_name">Priimek</string>
+  <string name="display_options_view_names_as">Oblika imena</string>
+  <string name="display_options_view_given_name_first">Najprej ime</string>
+  <string name="display_options_view_family_name_first">Najprej priimek</string>
+  <string name="menu_clear_frequents">Izbriši seznam pogostih stikov</string>
+  <string name="action_menu_back_from_search">ustavitev iskanja</string>
+  <string name="description_clear_search">Počisti iskalno polje</string>
+  <string name="select_account_dialog_title">Račun</string>
+  <string name="set_default_account">Vedno uporabi to možnost za klice</string>
+  <string name="select_phone_account_for_calls">Izbira kartice SIM za ta klic</string>
+  <string name="select_phone_account_for_calls_remember">Zapomni si to izbiro</string>
+  <string name="call_with_a_note">Klic z zapiskom</string>
+  <string name="call_subject_hint">Vnesite zapisek, ki ga želite poslati s klicem ...</string>
+  <string name="send_and_call_button">POŠLJI IN KLIČI</string>
+  <string name="call_subject_limit">%1$s/%2$s</string>
+  <string name="old_call_subject_type_and_number">%1$s %2$s</string>
+  <string name="tab_title">Zavihek »%1$s«.</string>
+  <plurals name="tab_title_with_unread_items">
+    <item quantity="one"> Zavihek »%1$s«. %2$d neprebran element. </item>
+    <item quantity="two"> Zavihek »%1$s«. %2$d neprebrana elementa. </item>
+    <item quantity="few"> Zavihek »%1$s«. %2$d neprebrani elementi. </item>
+    <item quantity="other"> Zavihek »%1$s«. %2$d neprebranih elementov. </item>
+  </plurals>
+  <string name="description_search_video_call">Videoklic</string>
+  <string name="description_search_call_and_share">Klic s skupno rabo</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-sq/strings.xml b/java/com/android/contacts/common/res/values-sq/strings.xml
index b40c98d..7ee06a8 100644
--- a/java/com/android/contacts/common/res/values-sq/strings.xml
+++ b/java/com/android/contacts/common/res/values-sq/strings.xml
@@ -1,162 +1,145 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="toast_text_copied" msgid="8979281391599667362">"Teksti u kopjua"</string>
-    <string name="call_custom" msgid="3041673234638990874">"Telefono <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="call_home" msgid="125893483593803791">"Telefono numrin e shtëpisë"</string>
-    <string name="call_mobile" msgid="967589404494150813">"Telefono numrin celular"</string>
-    <string name="call_work" msgid="6040550697395300892">"Telefono numrin e punës"</string>
-    <string name="call_fax_work" msgid="5260192771364592922">"Telefono faksin e punës"</string>
-    <string name="call_fax_home" msgid="5174311195081144124">"Telefono faksin e shtëpisë"</string>
-    <string name="call_pager" msgid="6814149227741274161">"Telefoni numrin e biperit"</string>
-    <string name="call_other" msgid="5536385588712587235">"Telefono"</string>
-    <string name="call_callback" msgid="6314019862718112786">"Telefono numrin e kthimit të telefonatave"</string>
-    <string name="call_car" msgid="3197417098027764954">"Telefono numrin e makinës"</string>
-    <string name="call_company_main" msgid="2557663310028446397">"Telefono numrin kryesor të kompanisë"</string>
-    <string name="call_isdn" msgid="4691270442763649522">"Telefono numrin ISDN"</string>
-    <string name="call_main" msgid="3293707608770407814">"Telefono numrin kryesor"</string>
-    <string name="call_other_fax" msgid="4724521984879021465">"Telefono numrin e faksit"</string>
-    <string name="call_radio" msgid="8942441419845057942">"Telefono numrin e radios"</string>
-    <string name="call_telex" msgid="2031514461660668351">"Telefono numrin e teletekstit"</string>
-    <string name="call_tty_tdd" msgid="7807210224965727701">"Telefono numrin e TTY/TDD"</string>
-    <string name="call_work_mobile" msgid="2716342732938578495">"Telefono numrin celular të punës"</string>
-    <string name="call_work_pager" msgid="3791778749827366574">"Telefono numrin e biperit të punës"</string>
-    <string name="call_assistant" msgid="4177478845473789294">"Telefono <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
-    <string name="call_mms" msgid="4958811711741872901">"Telefono numrin MMS"</string>
-    <string name="sms_custom" msgid="8785368968605026317">"Dërgo mesazh te <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="sms_home" msgid="3527719551060295243">"Dërgo mesazh te numri i shtëpisë"</string>
-    <string name="sms_mobile" msgid="8883045857887736518">"Dërgo mesazh te numri celular"</string>
-    <string name="sms_work" msgid="4158595439553450966">"Dërgo mesazh te numri i punës"</string>
-    <string name="sms_fax_work" msgid="5483726627718055248">"Dërgo mesazh te faksi i punës"</string>
-    <string name="sms_fax_home" msgid="9219265155770746077">"Dërgo mesazh te faksi i shtëpisë"</string>
-    <string name="sms_pager" msgid="4901085068525193933">"Dërgo mesazh te biperi"</string>
-    <string name="sms_other" msgid="1742702947993285933">"Dërgo mesazh"</string>
-    <string name="sms_callback" msgid="5833483630377538308">"Dërgo mesazh te numri i kthimit të telefonatave"</string>
-    <string name="sms_car" msgid="4314577266154395174">"Dërgo mesazh te numri i makinës"</string>
-    <string name="sms_company_main" msgid="2308160928487360705">"Dërgo mesazh te numri kryesor i kompanisë"</string>
-    <string name="sms_isdn" msgid="6394300346179302542">"Dërgo mesazh te numri ISDN"</string>
-    <string name="sms_main" msgid="8908087742014140774">"Dërgo mesazh te numri kryesor"</string>
-    <string name="sms_other_fax" msgid="8768455473295405427">"Dërgo mesazh te faksi"</string>
-    <string name="sms_radio" msgid="855555176531704682">"Dërgo mesazh te numri i radios"</string>
-    <string name="sms_telex" msgid="6269029276223252719">"Dërgo mesazh te numri i teletekstit"</string>
-    <string name="sms_tty_tdd" msgid="6229057354509192444">"Dërgo mesazh te numri TTY/TDD"</string>
-    <string name="sms_work_mobile" msgid="2155975469329969840">"Dërgo mesazh te numri i celularit"</string>
-    <string name="sms_work_pager" msgid="8500140274906830742">"Dërgo mesazh te numri i biperit"</string>
-    <string name="sms_assistant" msgid="8513548482745330818">"Dërgo mesazh te <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
-    <string name="sms_mms" msgid="5187888900503248542">"Dërgo mesazh te numri i MMS-së"</string>
-    <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"Të pastrohen kontaktet e shpeshta?"</string>
-    <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"Do ta pastrosh listën e kontakteve të shpeshta në aplikacionet \"Kontaktet\" dhe \"Telefoni\" dhe do t\'i detyrosh aplikacionet e mail-it të mësojnë preferencat e tua të adresimit nga e para."</string>
-    <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"Po pastron kontaktet e shpeshta…"</string>
-    <string name="status_available" msgid="2648156525685472626">"I gatshëm"</string>
-    <string name="status_away" msgid="2298688367552893953">"I larguar"</string>
-    <string name="status_busy" msgid="5990832098713248503">"I zënë"</string>
-    <string name="contactsList" msgid="8806067891419291513">"Kontaktet"</string>
-    <string name="contact_suggestions" msgid="3324166754807120006">"Sugjerimet kryesore"</string>
-    <string name="local_invisible_directory" msgid="4723238462733650090">"Tjetër"</string>
-    <string name="directory_search_label" msgid="4621215895484025229">"Direktoria"</string>
-    <string name="directory_search_label_work" msgid="7679326282707414897">"Direktoria e punës"</string>
-    <string name="local_search_label" msgid="907622822323119235">"Të gjitha kontaktet"</string>
-    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Sugjerimet"</string>
-    <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Unë"</string>
-    <string name="missing_name" msgid="978606963362745020">"(Pa emër)"</string>
-    <string name="description_view_contact_detail" msgid="2428742401208561136">"Shiko kontaktin"</string>
-    <string name="list_filter_phones" msgid="8763316061763437182">"Të gjitha kontaktet me numra telefoni"</string>
-    <string name="list_filter_phones_work" msgid="7083575404573422965">"Kontaktet e profilit të punës"</string>
-    <string name="view_updates_from_group" msgid="9011641093168385729">"Shiko përditësimet"</string>
-    <string name="account_phone" msgid="7067809073194061035">"Vetëm pajisja, e pasinkronizuar"</string>
-    <string name="nameLabelsGroup" msgid="7730465833159557471">"Emri"</string>
-    <string name="nicknameLabelsGroup" msgid="6310556912361840029">"Pseudonimi"</string>
-    <string name="full_name" msgid="648186563998465740">"Emri"</string>
-    <string name="name_given" msgid="5096576006314820536">"Emri"</string>
-    <string name="name_family" msgid="6646235805198547467">"Mbiemri"</string>
-    <string name="name_prefix" msgid="9215326539658838">"Parashtesa e emrit"</string>
-    <string name="name_middle" msgid="703755205331582769">"Emri i dytë"</string>
-    <string name="name_suffix" msgid="5777083390282548702">"Prapashtesa e emrit"</string>
-    <string name="name_phonetic" msgid="1650870996361663089">"Emri fonetik"</string>
-    <string name="name_phonetic_given" msgid="618812334274603170">"Emri fonetik"</string>
-    <string name="name_phonetic_middle" msgid="4826820763384625538">"Emri i dytë fonetik"</string>
-    <string name="name_phonetic_family" msgid="379905191212930771">"Mbiemri fonetik"</string>
-    <string name="phoneLabelsGroup" msgid="169661929021355548">"Telefoni"</string>
-    <string name="emailLabelsGroup" msgid="2249752810477488833">"Dërgo mail"</string>
-    <string name="postalLabelsGroup" msgid="6772000590189142253">"Adresa"</string>
-    <string name="imLabelsGroup" msgid="5718066254237364731">"IM"</string>
-    <string name="organizationLabelsGroup" msgid="1101996309241601435">"Organizata"</string>
-    <string name="relationLabelsGroup" msgid="53866051664600053">"Marrëdhënia"</string>
-    <string name="eventLabelsGroup" msgid="1236970042646618489">"Data e veçantë"</string>
-    <string name="sms" msgid="7574344928185328095">"Mesazh me tekst"</string>
-    <string name="postal_address" msgid="1804707930129674200">"Adresa"</string>
-    <string name="ghostData_company" msgid="2554310786296833424">"Kompania"</string>
-    <string name="ghostData_title" msgid="4994968731830184837">"Titulli"</string>
-    <string name="label_notes" msgid="2050255313694219786">"Shënime"</string>
-    <string name="label_sip_address" msgid="8883266182575965926">"SIP"</string>
-    <string name="websiteLabelsGroup" msgid="1630734286462186790">"Uebsajti"</string>
-    <string name="groupsLabel" msgid="2694002798416868728">"Grupet"</string>
-    <string name="email_home" msgid="889830029388962171">"Dërgoji mail shtëpisë"</string>
-    <string name="email_mobile" msgid="4487686436743741150">"Dërgoji mail celularit"</string>
-    <string name="email_work" msgid="4223487303344613528">"Dërgoji mail punës"</string>
-    <string name="email_other" msgid="4246411900126012062">"Dërgo mail"</string>
-    <string name="email_custom" msgid="7246580894327511013">"Dërgo mail në <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="email" msgid="2807318537887091606">"Dërgo mail"</string>
-    <string name="postal_street" msgid="6918171741240802474">"Rruga"</string>
-    <string name="postal_city" msgid="8674569121430005628">"Qyteti"</string>
-    <string name="postal_region" msgid="1730369286225469192">"Shteti"</string>
-    <string name="postal_postcode" msgid="4450700741261990439">"Kodi ZIP"</string>
-    <string name="postal_country" msgid="232670707458768148">"Shteti"</string>
-    <string name="map_home" msgid="4181131107392126938">"Shiko adresën e shtëpisë"</string>
-    <string name="map_work" msgid="5723471185992684400">"Shiko adresën e punës"</string>
-    <string name="map_other" msgid="2253764780863500516">"Shiko adresën"</string>
-    <string name="map_custom" msgid="5581743097882436157">"Shiko adresën e <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="chat_aim" msgid="2954364435497941659">"Bisedo me AIM"</string>
-    <string name="chat_msn" msgid="3130135239071228678">"Bisedo me Windows Live"</string>
-    <string name="chat_yahoo" msgid="3233552142326865347">"Bisedo me Yahoo"</string>
-    <string name="chat_skype" msgid="6486703981390592425">"Bisedo me Skype"</string>
-    <string name="chat_qq" msgid="786924280665740019">"Bisedo me QQ"</string>
-    <string name="chat_gtalk" msgid="7914674177243078035">"Bisedo me \"Bisedo me Google\""</string>
-    <string name="chat_icq" msgid="3292934726414765801">"Bisedo me ICQ"</string>
-    <string name="chat_jabber" msgid="6701542313597880204">"Bisedo me Jabber"</string>
-    <string name="chat" msgid="1020428260359370236">"Bisedo"</string>
-    <string name="list_filter_all_accounts" msgid="473782314881473992">"Të gjitha kontaktet"</string>
-    <string name="listAllContactsInAccount" msgid="3486378621592995630">"Kontaktet në <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="listCustomView" msgid="5306282632413086731">"Pamja e personalizuar"</string>
-    <string name="listSingleContact" msgid="8620818791932382627">"Një kontakt i vetëm"</string>
-    <string name="display_options_sort_list_by" msgid="3541875948367831228">"Rendit sipas"</string>
-    <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"Emri"</string>
-    <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"Mbiemri"</string>
-    <string name="display_options_view_names_as" msgid="4204204205736735618">"Formati i emrit"</string>
-    <string name="display_options_view_given_name_first" msgid="2308026973021171020">"Emri në fillim"</string>
-    <string name="display_options_view_family_name_first" msgid="987430497292428242">"Mbiemri në fillim"</string>
-    <string name="menu_clear_frequents" msgid="5358271535047496120">"Pastro kontaktet e shpeshta"</string>
-    <string name="action_menu_back_from_search" msgid="3550669942742167644">"ndalo kërkimin"</string>
-    <string name="description_clear_search" msgid="2347258825265600782">"Pastro kërkimin"</string>
-    <string name="select_account_dialog_title" msgid="2673504582803359239">"Llogaria"</string>
-    <string name="set_default_account" msgid="7966099951006467572">"Përdor gjithmonë këtë për telefonatat"</string>
-    <string name="select_phone_account_for_calls" msgid="1784460686103423274">"Telefono me"</string>
-    <string name="call_with_a_note" msgid="6242261320491851133">"Telefono me shënim"</string>
-    <string name="call_subject_hint" msgid="7233138753650420800">"Shkruaj një shënim për të dërguar një telefonatë..."</string>
-    <string name="send_and_call_button" msgid="4735168294120154013">"DËRGO DHE TELEFONO"</string>
-    <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="tab_title" msgid="3387876802026074288">"Skeda <xliff:g id="TITLE">%1$s</xliff:g>."</string>
-    <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
-      <item quantity="other"> Skeda <xliff:g id="TITLE_2">%1$s</xliff:g>. <xliff:g id="COUNT_3">%2$d</xliff:g> artikuj të palexuar. </item>
-      <item quantity="one"> Skeda <xliff:g id="TITLE_0">%1$s</xliff:g>. <xliff:g id="COUNT_1">%2$d</xliff:g> artikull i palexuar. </item>
-    </plurals>
-    <string name="description_search_video_call" msgid="4337369876888024909">"Telefonatë me video"</string>
-    <string name="description_search_call_and_share" msgid="4912772842755050467">"Ndaj dhe telefono"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_custom">Telefono %s</string>
+  <string name="call_home">Telefono numrin e shtëpisë</string>
+  <string name="call_mobile">Telefono numrin celular</string>
+  <string name="call_work">Telefono numrin e punës</string>
+  <string name="call_fax_work">Telefono faksin e punës</string>
+  <string name="call_fax_home">Telefono faksin e shtëpisë</string>
+  <string name="call_pager">Telefoni numrin e biperit</string>
+  <string name="call_other">Telefono</string>
+  <string name="call_callback">Telefono numrin e kthimit të telefonatave</string>
+  <string name="call_car">Telefono numrin e makinës</string>
+  <string name="call_company_main">Telefono numrin kryesor të kompanisë</string>
+  <string name="call_isdn">Telefono numrin ISDN</string>
+  <string name="call_main">Telefono numrin kryesor</string>
+  <string name="call_other_fax">Telefono numrin e faksit</string>
+  <string name="call_radio">Telefono numrin e radios</string>
+  <string name="call_telex">Telefono numrin e teletekstit</string>
+  <string name="call_tty_tdd">Telefono numrin e TTY/TDD</string>
+  <string name="call_work_mobile">Telefono numrin celular të punës</string>
+  <string name="call_work_pager">Telefono numrin e biperit të punës</string>
+  <string name="call_assistant">Telefono %s</string>
+  <string name="call_mms">Telefono numrin MMS</string>
+  <string name="sms_custom">Dërgo mesazh te %s</string>
+  <string name="sms_home">Dërgo mesazh te numri i shtëpisë</string>
+  <string name="sms_mobile">Dërgo mesazh te numri celular</string>
+  <string name="sms_work">Dërgo mesazh te numri i punës</string>
+  <string name="sms_fax_work">Dërgo mesazh te faksi i punës</string>
+  <string name="sms_fax_home">Dërgo mesazh te faksi i shtëpisë</string>
+  <string name="sms_pager">Dërgo mesazh te biperi</string>
+  <string name="sms_other">Dërgo mesazh</string>
+  <string name="sms_callback">Dërgo mesazh te numri i kthimit të telefonatave</string>
+  <string name="sms_car">Dërgo mesazh te numri i makinës</string>
+  <string name="sms_company_main">Dërgo mesazh te numri kryesor i kompanisë</string>
+  <string name="sms_isdn">Dërgo mesazh te numri ISDN</string>
+  <string name="sms_main">Dërgo mesazh te numri kryesor</string>
+  <string name="sms_other_fax">Dërgo mesazh te faksi</string>
+  <string name="sms_radio">Dërgo mesazh te numri i radios</string>
+  <string name="sms_telex">Dërgo mesazh te numri i teletekstit</string>
+  <string name="sms_tty_tdd">Dërgo mesazh te numri TTY/TDD</string>
+  <string name="sms_work_mobile">Dërgo mesazh te numri i celularit</string>
+  <string name="sms_work_pager">Dërgo mesazh te numri i biperit</string>
+  <string name="sms_assistant">Dërgo mesazh te %s</string>
+  <string name="sms_mms">Dërgo mesazh te numri i MMS-së</string>
+  <string name="clearFrequentsConfirmation_title">Të pastrohen kontaktet e shpeshta?</string>
+  <string name="clearFrequentsConfirmation">Do ta pastrosh listën e kontakteve të shpeshta në aplikacionet \"Kontaktet\" dhe \"Telefoni\" dhe do t\'i detyrosh aplikacionet e mail-it të mësojnë preferencat e tua të adresimit nga e para.</string>
+  <string name="clearFrequentsProgress_title">Po pastron kontaktet e shpeshta…</string>
+  <string name="status_available">I gatshëm</string>
+  <string name="status_away">I larguar</string>
+  <string name="status_busy">I zënë</string>
+  <string name="contactsList">Kontaktet</string>
+  <string name="contact_suggestions">Sugjerimet kryesore</string>
+  <string name="local_invisible_directory">Tjetër</string>
+  <string name="directory_search_label">Direktoria</string>
+  <string name="directory_search_label_work">Direktoria e punës</string>
+  <string name="local_search_label">Të gjitha kontaktet</string>
+  <string name="local_suggestions_search_label">Sugjerimet</string>
+  <string msgid="9154761216179882405" name="user_profile_contacts_list_header">Unë</string>
+  <string name="missing_name">(Pa emër)</string>
+  <string msgid="2795575601596468581" name="description_view_contact_detail">Shiko kontaktin</string>
+  <string name="list_filter_phones">Të gjitha kontaktet me numra telefoni</string>
+  <string name="list_filter_phones_work">Kontaktet e profilit të punës</string>
+  <string name="view_updates_from_group">Shiko përditësimet</string>
+  <string name="account_phone">Vetëm pajisja, e pasinkronizuar</string>
+  <string name="nameLabelsGroup">Emri</string>
+  <string name="nicknameLabelsGroup">Pseudonimi</string>
+  <string name="full_name">Emri</string>
+  <string name="name_given">Emri</string>
+  <string name="name_family">Mbiemri</string>
+  <string name="name_prefix">Parashtesa e emrit</string>
+  <string name="name_middle">Emri i dytë</string>
+  <string name="name_suffix">Prapashtesa e emrit</string>
+  <string name="name_phonetic">Emri fonetik</string>
+  <string name="name_phonetic_given">Emri fonetik</string>
+  <string name="name_phonetic_middle">Emri i dytë fonetik</string>
+  <string name="name_phonetic_family">Mbiemri fonetik</string>
+  <string name="phoneLabelsGroup">Telefoni</string>
+  <string name="emailLabelsGroup">Dërgo mail</string>
+  <string name="postalLabelsGroup">Adresa</string>
+  <string name="imLabelsGroup">IM</string>
+  <string name="organizationLabelsGroup">Organizata</string>
+  <string name="relationLabelsGroup">Marrëdhënia</string>
+  <string name="eventLabelsGroup">Data e veçantë</string>
+  <string name="sms">Mesazh me tekst</string>
+  <string name="postal_address">Adresa</string>
+  <string name="ghostData_company">Kompania</string>
+  <string name="ghostData_title">Titulli</string>
+  <string name="label_notes">Shënime</string>
+  <string name="label_sip_address">SIP</string>
+  <string name="websiteLabelsGroup">Uebsajti</string>
+  <string name="groupsLabel">Grupet</string>
+  <string name="email_home">Dërgoji mail shtëpisë</string>
+  <string name="email_mobile">Dërgoji mail celularit</string>
+  <string name="email_work">Dërgoji mail punës</string>
+  <string name="email_other">Dërgo mail</string>
+  <string name="email_custom">Dërgo mail në %s</string>
+  <string name="email">Dërgo mail</string>
+  <string name="postal_street">Rruga</string>
+  <string name="postal_city">Qyteti</string>
+  <string name="postal_region">Shteti</string>
+  <string name="postal_postcode">Kodi ZIP</string>
+  <string name="postal_country">Shteti</string>
+  <string name="map_home">Shiko adresën e shtëpisë</string>
+  <string name="map_work">Shiko adresën e punës</string>
+  <string name="map_other">Shiko adresën</string>
+  <string name="map_custom">Shiko adresën e %s</string>
+  <string name="chat_aim">Bisedo me AIM</string>
+  <string name="chat_msn">Bisedo me Windows Live</string>
+  <string name="chat_yahoo">Bisedo me Yahoo</string>
+  <string name="chat_skype">Bisedo me Skype</string>
+  <string name="chat_qq">Bisedo me QQ</string>
+  <string name="chat_gtalk">Bisedo me \"Bisedo me Google\"</string>
+  <string name="chat_icq">Bisedo me ICQ</string>
+  <string name="chat_jabber">Bisedo me Jabber</string>
+  <string name="chat">Bisedo</string>
+  <string name="list_filter_all_accounts">Të gjitha kontaktet</string>
+  <string name="listAllContactsInAccount">Kontaktet në %s</string>
+  <string name="listCustomView">Pamja e personalizuar</string>
+  <string name="listSingleContact">Një kontakt i vetëm</string>
+  <string name="display_options_sort_list_by">Rendit sipas</string>
+  <string name="display_options_sort_by_given_name">Emri</string>
+  <string name="display_options_sort_by_family_name">Mbiemri</string>
+  <string name="display_options_view_names_as">Formati i emrit</string>
+  <string name="display_options_view_given_name_first">Emri në fillim</string>
+  <string name="display_options_view_family_name_first">Mbiemri në fillim</string>
+  <string name="menu_clear_frequents">Pastro kontaktet e shpeshta</string>
+  <string name="action_menu_back_from_search">ndalo kërkimin</string>
+  <string name="description_clear_search">Pastro kërkimin</string>
+  <string name="select_account_dialog_title">Llogaria</string>
+  <string name="set_default_account">Përdor gjithmonë këtë për telefonatat</string>
+  <string name="select_phone_account_for_calls">Zgjidh kartën SIM për këtë telefonatë</string>
+  <string name="select_phone_account_for_calls_remember">Kujtoje këtë zgjedhje</string>
+  <string name="call_with_a_note">Telefono me shënim</string>
+  <string name="call_subject_hint">Shkruaj një shënim për të dërguar një telefonatë...</string>
+  <string name="send_and_call_button">DËRGO DHE TELEFONO</string>
+  <string name="call_subject_limit">%1$s / %2$s</string>
+  <string name="old_call_subject_type_and_number">%1$s %2$s</string>
+  <string name="tab_title">Skeda %1$s.</string>
+  <plurals name="tab_title_with_unread_items">
+    <item quantity="one"> Skeda %1$s. %2$d artikull i palexuar. </item>
+    <item quantity="other"> Skeda %1$s. %2$d artikuj të palexuar. </item>
+  </plurals>
+  <string name="description_search_video_call">Telefonatë me video</string>
+  <string name="description_search_call_and_share">Ndaj dhe telefono</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-sr/strings.xml b/java/com/android/contacts/common/res/values-sr/strings.xml
index f072f98..1878fad 100644
--- a/java/com/android/contacts/common/res/values-sr/strings.xml
+++ b/java/com/android/contacts/common/res/values-sr/strings.xml
@@ -1,163 +1,146 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="toast_text_copied" msgid="8979281391599667362">"Текст је копиран"</string>
-    <string name="call_custom" msgid="3041673234638990874">"Позови <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="call_home" msgid="125893483593803791">"Позови кућни телефон"</string>
-    <string name="call_mobile" msgid="967589404494150813">"Позови мобилни телефон"</string>
-    <string name="call_work" msgid="6040550697395300892">"Позови пословни телефон"</string>
-    <string name="call_fax_work" msgid="5260192771364592922">"Позови пословни факс"</string>
-    <string name="call_fax_home" msgid="5174311195081144124">"Позови кућни факс"</string>
-    <string name="call_pager" msgid="6814149227741274161">"Позови пејџер"</string>
-    <string name="call_other" msgid="5536385588712587235">"Позови"</string>
-    <string name="call_callback" msgid="6314019862718112786">"Позови за повратни позив"</string>
-    <string name="call_car" msgid="3197417098027764954">"Позови телефон у аутомобилу"</string>
-    <string name="call_company_main" msgid="2557663310028446397">"Позови главни телефон предузећа"</string>
-    <string name="call_isdn" msgid="4691270442763649522">"Позови ISDN"</string>
-    <string name="call_main" msgid="3293707608770407814">"Позови главни телефон"</string>
-    <string name="call_other_fax" msgid="4724521984879021465">"Позови факс"</string>
-    <string name="call_radio" msgid="8942441419845057942">"Позови радио"</string>
-    <string name="call_telex" msgid="2031514461660668351">"Позови телекс"</string>
-    <string name="call_tty_tdd" msgid="7807210224965727701">"Позови TTY/TDD"</string>
-    <string name="call_work_mobile" msgid="2716342732938578495">"Позови пословни мобилни телефон"</string>
-    <string name="call_work_pager" msgid="3791778749827366574">"Позови пословни пејџер"</string>
-    <string name="call_assistant" msgid="4177478845473789294">"Позови <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
-    <string name="call_mms" msgid="4958811711741872901">"Позови број за MMS"</string>
-    <string name="sms_custom" msgid="8785368968605026317">"Пошаљи SMS на <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="sms_home" msgid="3527719551060295243">"Пошаљи SMS на кућни телефон"</string>
-    <string name="sms_mobile" msgid="8883045857887736518">"Пошаљи SMS на мобилни телефон"</string>
-    <string name="sms_work" msgid="4158595439553450966">"Пошаљи SMS на пословни телефон"</string>
-    <string name="sms_fax_work" msgid="5483726627718055248">"Пошаљи SMS на пословни факс"</string>
-    <string name="sms_fax_home" msgid="9219265155770746077">"Пошаљи SMS на кућни факс"</string>
-    <string name="sms_pager" msgid="4901085068525193933">"Пошаљи SMS на пејџер"</string>
-    <string name="sms_other" msgid="1742702947993285933">"Пошаљи SMS"</string>
-    <string name="sms_callback" msgid="5833483630377538308">"Пошаљи SMS за повратни позив"</string>
-    <string name="sms_car" msgid="4314577266154395174">"Пошаљи SMS на телефон у аутомобилу"</string>
-    <string name="sms_company_main" msgid="2308160928487360705">"Пошаљи SMS на главни број телефона предузећа"</string>
-    <string name="sms_isdn" msgid="6394300346179302542">"Пошаљи SMS на ISDN"</string>
-    <string name="sms_main" msgid="8908087742014140774">"Пошаљи SMS на главни телефон"</string>
-    <string name="sms_other_fax" msgid="8768455473295405427">"Пошаљи SMS на факс"</string>
-    <string name="sms_radio" msgid="855555176531704682">"Пошаљи SMS на радио"</string>
-    <string name="sms_telex" msgid="6269029276223252719">"Пошаљи SMS на телекс"</string>
-    <string name="sms_tty_tdd" msgid="6229057354509192444">"Пошаљи SMS на TTY/TDD"</string>
-    <string name="sms_work_mobile" msgid="2155975469329969840">"Пошаљи SMS на пословни мобилни телефон"</string>
-    <string name="sms_work_pager" msgid="8500140274906830742">"Пошаљи SMS на пословни пејџер"</string>
-    <string name="sms_assistant" msgid="8513548482745330818">"Пошаљи SMS на <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
-    <string name="sms_mms" msgid="5187888900503248542">"Пошаљи SMS на број за MMS"</string>
-    <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"Бришете често контактиране?"</string>
-    <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"Обрисаћете листу често контактираних у апликацијама Контакти и Телефон, па ће имејл апликације морати поново да прикупе информације о адресирању."</string>
-    <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"Брисање често контактираних..."</string>
-    <string name="status_available" msgid="2648156525685472626">"Доступан/на"</string>
-    <string name="status_away" msgid="2298688367552893953">"Одсутан/на"</string>
-    <string name="status_busy" msgid="5990832098713248503">"Заузет/а"</string>
-    <string name="contactsList" msgid="8806067891419291513">"Контакти"</string>
-    <string name="contact_suggestions" msgid="3324166754807120006">"Најпопуларнији предлози"</string>
-    <string name="local_invisible_directory" msgid="4723238462733650090">"Другo"</string>
-    <string name="directory_search_label" msgid="4621215895484025229">"Директоријум"</string>
-    <string name="directory_search_label_work" msgid="7679326282707414897">"Директоријум за Work"</string>
-    <string name="local_search_label" msgid="907622822323119235">"Сви контакти"</string>
-    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Предлози"</string>
-    <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Ја"</string>
-    <string name="missing_name" msgid="978606963362745020">"(Нема имена)"</string>
-    <string name="description_view_contact_detail" msgid="2428742401208561136">"Прикажи контакт"</string>
-    <string name="list_filter_phones" msgid="8763316061763437182">"Сви контакти са бројевима телефона"</string>
-    <string name="list_filter_phones_work" msgid="7083575404573422965">"Контакти са профила за Work"</string>
-    <string name="view_updates_from_group" msgid="9011641093168385729">"Прикажи ажурирања"</string>
-    <string name="account_phone" msgid="7067809073194061035">"Само на уређају, не синхронизује се"</string>
-    <string name="nameLabelsGroup" msgid="7730465833159557471">"Име"</string>
-    <string name="nicknameLabelsGroup" msgid="6310556912361840029">"Надимак"</string>
-    <string name="full_name" msgid="648186563998465740">"Име"</string>
-    <string name="name_given" msgid="5096576006314820536">"Имену"</string>
-    <string name="name_family" msgid="6646235805198547467">"Презимену"</string>
-    <string name="name_prefix" msgid="9215326539658838">"Префикс за име"</string>
-    <string name="name_middle" msgid="703755205331582769">"Средње име"</string>
-    <string name="name_suffix" msgid="5777083390282548702">"Суфикс имена"</string>
-    <string name="name_phonetic" msgid="1650870996361663089">"Име – фонетски"</string>
-    <string name="name_phonetic_given" msgid="618812334274603170">"Име – фонетски"</string>
-    <string name="name_phonetic_middle" msgid="4826820763384625538">"Средње име – фонетски"</string>
-    <string name="name_phonetic_family" msgid="379905191212930771">"Презиме – фонетски"</string>
-    <string name="phoneLabelsGroup" msgid="169661929021355548">"Телефон"</string>
-    <string name="emailLabelsGroup" msgid="2249752810477488833">"Пошаљи имејл"</string>
-    <string name="postalLabelsGroup" msgid="6772000590189142253">"Адреса"</string>
-    <string name="imLabelsGroup" msgid="5718066254237364731">"Тренутне поруке"</string>
-    <string name="organizationLabelsGroup" msgid="1101996309241601435">"Организација"</string>
-    <string name="relationLabelsGroup" msgid="53866051664600053">"Однос"</string>
-    <string name="eventLabelsGroup" msgid="1236970042646618489">"Посебан дан"</string>
-    <string name="sms" msgid="7574344928185328095">"SMS"</string>
-    <string name="postal_address" msgid="1804707930129674200">"Адреса"</string>
-    <string name="ghostData_company" msgid="2554310786296833424">"Предузеће"</string>
-    <string name="ghostData_title" msgid="4994968731830184837">"Назив"</string>
-    <string name="label_notes" msgid="2050255313694219786">"Белешке"</string>
-    <string name="label_sip_address" msgid="8883266182575965926">"SIP"</string>
-    <string name="websiteLabelsGroup" msgid="1630734286462186790">"Веб-сајт"</string>
-    <string name="groupsLabel" msgid="2694002798416868728">"Групе"</string>
-    <string name="email_home" msgid="889830029388962171">"Пошаљи имејл на кућну имејл адресу"</string>
-    <string name="email_mobile" msgid="4487686436743741150">"Пошаљи имејл на мобилни телефон"</string>
-    <string name="email_work" msgid="4223487303344613528">"Пошаљи имејл на пословну имејл адресу"</string>
-    <string name="email_other" msgid="4246411900126012062">"Пошаљи имејл"</string>
-    <string name="email_custom" msgid="7246580894327511013">"Пошаљи имејл на <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="email" msgid="2807318537887091606">"Пошаљи имејл"</string>
-    <string name="postal_street" msgid="6918171741240802474">"Улица"</string>
-    <string name="postal_city" msgid="8674569121430005628">"Град"</string>
-    <string name="postal_region" msgid="1730369286225469192">"Држава"</string>
-    <string name="postal_postcode" msgid="4450700741261990439">"Поштански број"</string>
-    <string name="postal_country" msgid="232670707458768148">"Земља"</string>
-    <string name="map_home" msgid="4181131107392126938">"Прикажи кућну адресу"</string>
-    <string name="map_work" msgid="5723471185992684400">"Прикажи пословну адресу"</string>
-    <string name="map_other" msgid="2253764780863500516">"Прикажи адресу"</string>
-    <string name="map_custom" msgid="5581743097882436157">"Прикажи адресу <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="chat_aim" msgid="2954364435497941659">"Започни ћаскање преко AIM-а"</string>
-    <string name="chat_msn" msgid="3130135239071228678">"Започни ћаскање преко Windows Live-а"</string>
-    <string name="chat_yahoo" msgid="3233552142326865347">"Започни ћаскање преко Yahoo-а"</string>
-    <string name="chat_skype" msgid="6486703981390592425">"Започни ћаскање преко Skype-а"</string>
-    <string name="chat_qq" msgid="786924280665740019">"Започни ћаскање преко QQ-а"</string>
-    <string name="chat_gtalk" msgid="7914674177243078035">"Започни ћаскање преко Google Talk-а"</string>
-    <string name="chat_icq" msgid="3292934726414765801">"Започни ћаскање преко ICQ-а"</string>
-    <string name="chat_jabber" msgid="6701542313597880204">"Започни ћаскање преко Jabber-а"</string>
-    <string name="chat" msgid="1020428260359370236">"Ћаскање"</string>
-    <string name="list_filter_all_accounts" msgid="473782314881473992">"Сви контакти"</string>
-    <string name="listAllContactsInAccount" msgid="3486378621592995630">"Контакти у групи <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="listCustomView" msgid="5306282632413086731">"Контакти у прилагођеном приказу"</string>
-    <string name="listSingleContact" msgid="8620818791932382627">"Појединачни контакт"</string>
-    <string name="display_options_sort_list_by" msgid="3541875948367831228">"Сортирај према"</string>
-    <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"Имену"</string>
-    <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"Презимену"</string>
-    <string name="display_options_view_names_as" msgid="4204204205736735618">"Формат имена и презимена"</string>
-    <string name="display_options_view_given_name_first" msgid="2308026973021171020">"Прво име"</string>
-    <string name="display_options_view_family_name_first" msgid="987430497292428242">"Прво презиме"</string>
-    <string name="menu_clear_frequents" msgid="5358271535047496120">"Обриши често контактиране"</string>
-    <string name="action_menu_back_from_search" msgid="3550669942742167644">"заустављање претраживања"</string>
-    <string name="description_clear_search" msgid="2347258825265600782">"Брисање претраге"</string>
-    <string name="select_account_dialog_title" msgid="2673504582803359239">"Налог"</string>
-    <string name="set_default_account" msgid="7966099951006467572">"Увек користи ово за позиве"</string>
-    <string name="select_phone_account_for_calls" msgid="1784460686103423274">"Позови помоћу"</string>
-    <string name="call_with_a_note" msgid="6242261320491851133">"Позив са белешком"</string>
-    <string name="call_subject_hint" msgid="7233138753650420800">"Унесите белешку коју ћете послати уз позив..."</string>
-    <string name="send_and_call_button" msgid="4735168294120154013">"ПОШАЉИ И ПОЗОВИ"</string>
-    <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g>/<xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="tab_title" msgid="3387876802026074288">"Картица <xliff:g id="TITLE">%1$s</xliff:g>."</string>
-    <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
-      <item quantity="one"> Картица <xliff:g id="TITLE_2">%1$s</xliff:g>. <xliff:g id="COUNT_3">%2$d</xliff:g> непрочитана ставка. </item>
-      <item quantity="few"> Картица <xliff:g id="TITLE_2">%1$s</xliff:g>. <xliff:g id="COUNT_3">%2$d</xliff:g> непрочитане ставке. </item>
-      <item quantity="other"> Картица <xliff:g id="TITLE_2">%1$s</xliff:g>. <xliff:g id="COUNT_3">%2$d</xliff:g> непрочитаних ставки. </item>
-    </plurals>
-    <string name="description_search_video_call" msgid="4337369876888024909">"Видео позив"</string>
-    <string name="description_search_call_and_share" msgid="4912772842755050467">"Дели и позови"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_custom">Позови %s</string>
+  <string name="call_home">Позови кућни телефон</string>
+  <string name="call_mobile">Позови мобилни телефон</string>
+  <string name="call_work">Позови пословни телефон</string>
+  <string name="call_fax_work">Позови пословни факс</string>
+  <string name="call_fax_home">Позови кућни факс</string>
+  <string name="call_pager">Позови пејџер</string>
+  <string name="call_other">Позови</string>
+  <string name="call_callback">Позови за повратни позив</string>
+  <string name="call_car">Позови телефон у аутомобилу</string>
+  <string name="call_company_main">Позови главни телефон предузећа</string>
+  <string name="call_isdn">Позови ISDN</string>
+  <string name="call_main">Позови главни телефон</string>
+  <string name="call_other_fax">Позови факс</string>
+  <string name="call_radio">Позови радио</string>
+  <string name="call_telex">Позови телекс</string>
+  <string name="call_tty_tdd">Позови TTY/TDD</string>
+  <string name="call_work_mobile">Позови пословни мобилни телефон</string>
+  <string name="call_work_pager">Позови пословни пејџер</string>
+  <string name="call_assistant">Позови %s</string>
+  <string name="call_mms">Позови број за MMS</string>
+  <string name="sms_custom">Пошаљи SMS на %s</string>
+  <string name="sms_home">Пошаљи SMS на кућни телефон</string>
+  <string name="sms_mobile">Пошаљи SMS на мобилни телефон</string>
+  <string name="sms_work">Пошаљи SMS на пословни телефон</string>
+  <string name="sms_fax_work">Пошаљи SMS на пословни факс</string>
+  <string name="sms_fax_home">Пошаљи SMS на кућни факс</string>
+  <string name="sms_pager">Пошаљи SMS на пејџер</string>
+  <string name="sms_other">Пошаљи SMS</string>
+  <string name="sms_callback">Пошаљи SMS за повратни позив</string>
+  <string name="sms_car">Пошаљи SMS на телефон у аутомобилу</string>
+  <string name="sms_company_main">Пошаљи SMS на главни број телефона предузећа</string>
+  <string name="sms_isdn">Пошаљи SMS на ISDN</string>
+  <string name="sms_main">Пошаљи SMS на главни телефон</string>
+  <string name="sms_other_fax">Пошаљи SMS на факс</string>
+  <string name="sms_radio">Пошаљи SMS на радио</string>
+  <string name="sms_telex">Пошаљи SMS на телекс</string>
+  <string name="sms_tty_tdd">Пошаљи SMS на TTY/TDD</string>
+  <string name="sms_work_mobile">Пошаљи SMS на пословни мобилни телефон</string>
+  <string name="sms_work_pager">Пошаљи SMS на пословни пејџер</string>
+  <string name="sms_assistant">Пошаљи SMS на %s</string>
+  <string name="sms_mms">Пошаљи SMS на број за MMS</string>
+  <string name="clearFrequentsConfirmation_title">Бришете често контактиране?</string>
+  <string name="clearFrequentsConfirmation">Обрисаћете листу често контактираних у апликацијама Контакти и Телефон, па ће имејл апликације морати поново да прикупе информације о адресирању.</string>
+  <string name="clearFrequentsProgress_title">Брисање често контактираних...</string>
+  <string name="status_available">Доступан/на</string>
+  <string name="status_away">Одсутан/на</string>
+  <string name="status_busy">Заузет/а</string>
+  <string name="contactsList">Контакти</string>
+  <string name="contact_suggestions">Најпопуларнији предлози</string>
+  <string name="local_invisible_directory">Другo</string>
+  <string name="directory_search_label">Директоријум</string>
+  <string name="directory_search_label_work">Директоријум за Work</string>
+  <string name="local_search_label">Сви контакти</string>
+  <string name="local_suggestions_search_label">Предлози</string>
+  <string msgid="9154761216179882405" name="user_profile_contacts_list_header">Ја</string>
+  <string name="missing_name">(Нема имена)</string>
+  <string msgid="2795575601596468581" name="description_view_contact_detail">Прикажи контакт</string>
+  <string name="list_filter_phones">Сви контакти са бројевима телефона</string>
+  <string name="list_filter_phones_work">Контакти са профила за Work</string>
+  <string name="view_updates_from_group">Прикажи ажурирања</string>
+  <string name="account_phone">Само на уређају, не синхронизује се</string>
+  <string name="nameLabelsGroup">Име</string>
+  <string name="nicknameLabelsGroup">Надимак</string>
+  <string name="full_name">Име</string>
+  <string name="name_given">Имену</string>
+  <string name="name_family">Презимену</string>
+  <string name="name_prefix">Префикс за име</string>
+  <string name="name_middle">Средње име</string>
+  <string name="name_suffix">Суфикс имена</string>
+  <string name="name_phonetic">Име – фонетски</string>
+  <string name="name_phonetic_given">Име – фонетски</string>
+  <string name="name_phonetic_middle">Средње име – фонетски</string>
+  <string name="name_phonetic_family">Презиме – фонетски</string>
+  <string name="phoneLabelsGroup">Телефон</string>
+  <string name="emailLabelsGroup">Пошаљи имејл</string>
+  <string name="postalLabelsGroup">Адреса</string>
+  <string name="imLabelsGroup">Тренутне поруке</string>
+  <string name="organizationLabelsGroup">Организација</string>
+  <string name="relationLabelsGroup">Однос</string>
+  <string name="eventLabelsGroup">Посебан дан</string>
+  <string name="sms">SMS</string>
+  <string name="postal_address">Адреса</string>
+  <string name="ghostData_company">Предузеће</string>
+  <string name="ghostData_title">Назив</string>
+  <string name="label_notes">Белешке</string>
+  <string name="label_sip_address">SIP</string>
+  <string name="websiteLabelsGroup">Веб-сајт</string>
+  <string name="groupsLabel">Групе</string>
+  <string name="email_home">Пошаљи имејл на кућну имејл адресу</string>
+  <string name="email_mobile">Пошаљи имејл на мобилни телефон</string>
+  <string name="email_work">Пошаљи имејл на пословну имејл адресу</string>
+  <string name="email_other">Пошаљи имејл</string>
+  <string name="email_custom">Пошаљи имејл на %s</string>
+  <string name="email">Пошаљи имејл</string>
+  <string name="postal_street">Улица</string>
+  <string name="postal_city">Град</string>
+  <string name="postal_region">Држава</string>
+  <string name="postal_postcode">Поштански број</string>
+  <string name="postal_country">Земља</string>
+  <string name="map_home">Прикажи кућну адресу</string>
+  <string name="map_work">Прикажи пословну адресу</string>
+  <string name="map_other">Прикажи адресу</string>
+  <string name="map_custom">Прикажи адресу %s</string>
+  <string name="chat_aim">Започни ћаскање преко AIM-а</string>
+  <string name="chat_msn">Започни ћаскање преко Windows Live-а</string>
+  <string name="chat_yahoo">Започни ћаскање преко Yahoo-а</string>
+  <string name="chat_skype">Започни ћаскање преко Skype-а</string>
+  <string name="chat_qq">Започни ћаскање преко QQ-а</string>
+  <string name="chat_gtalk">Започни ћаскање преко Google Talk-а</string>
+  <string name="chat_icq">Започни ћаскање преко ICQ-а</string>
+  <string name="chat_jabber">Започни ћаскање преко Jabber-а</string>
+  <string name="chat">Ћаскање</string>
+  <string name="list_filter_all_accounts">Сви контакти</string>
+  <string name="listAllContactsInAccount">Контакти у групи %s</string>
+  <string name="listCustomView">Контакти у прилагођеном приказу</string>
+  <string name="listSingleContact">Појединачни контакт</string>
+  <string name="display_options_sort_list_by">Сортирај према</string>
+  <string name="display_options_sort_by_given_name">Имену</string>
+  <string name="display_options_sort_by_family_name">Презимену</string>
+  <string name="display_options_view_names_as">Формат имена и презимена</string>
+  <string name="display_options_view_given_name_first">Прво име</string>
+  <string name="display_options_view_family_name_first">Прво презиме</string>
+  <string name="menu_clear_frequents">Обриши често контактиране</string>
+  <string name="action_menu_back_from_search">заустављање претраживања</string>
+  <string name="description_clear_search">Брисање претраге</string>
+  <string name="select_account_dialog_title">Налог</string>
+  <string name="set_default_account">Увек користи ово за позиве</string>
+  <string name="select_phone_account_for_calls">Изаберите SIM за овај позив</string>
+  <string name="select_phone_account_for_calls_remember">Запамти овај избор</string>
+  <string name="call_with_a_note">Позив са белешком</string>
+  <string name="call_subject_hint">Унесите белешку коју ћете послати уз позив...</string>
+  <string name="send_and_call_button">ПОШАЉИ И ПОЗОВИ</string>
+  <string name="call_subject_limit">%1$s/%2$s</string>
+  <string name="old_call_subject_type_and_number">%1$s %2$s</string>
+  <string name="tab_title">Картица %1$s.</string>
+  <plurals name="tab_title_with_unread_items">
+    <item quantity="one"> Картица %1$s. %2$d непрочитана ставка. </item>
+    <item quantity="few"> Картица %1$s. %2$d непрочитане ставке. </item>
+    <item quantity="other"> Картица %1$s. %2$d непрочитаних ставки. </item>
+  </plurals>
+  <string name="description_search_video_call">Видео позив</string>
+  <string name="description_search_call_and_share">Дели и позови</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-sv/strings.xml b/java/com/android/contacts/common/res/values-sv/strings.xml
index eb1976e..08d52d0 100644
--- a/java/com/android/contacts/common/res/values-sv/strings.xml
+++ b/java/com/android/contacts/common/res/values-sv/strings.xml
@@ -1,162 +1,145 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="toast_text_copied" msgid="8979281391599667362">"Texten har kopierats"</string>
-    <string name="call_custom" msgid="3041673234638990874">"Ring <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="call_home" msgid="125893483593803791">"Ring hem"</string>
-    <string name="call_mobile" msgid="967589404494150813">"Ring mobilen"</string>
-    <string name="call_work" msgid="6040550697395300892">"Ring arbete"</string>
-    <string name="call_fax_work" msgid="5260192771364592922">"Ring upp arbetsfax"</string>
-    <string name="call_fax_home" msgid="5174311195081144124">"Ring upp hemfax"</string>
-    <string name="call_pager" msgid="6814149227741274161">"Ring personsökare"</string>
-    <string name="call_other" msgid="5536385588712587235">"Ring"</string>
-    <string name="call_callback" msgid="6314019862718112786">"Ring upp återuppringningsnummer"</string>
-    <string name="call_car" msgid="3197417098027764954">"Ring bilen"</string>
-    <string name="call_company_main" msgid="2557663310028446397">"Ring företag"</string>
-    <string name="call_isdn" msgid="4691270442763649522">"Ring upp ISDN"</string>
-    <string name="call_main" msgid="3293707608770407814">"Ring upp primärt nummer"</string>
-    <string name="call_other_fax" msgid="4724521984879021465">"Ring upp fax"</string>
-    <string name="call_radio" msgid="8942441419845057942">"Ring radio"</string>
-    <string name="call_telex" msgid="2031514461660668351">"Ring upp telex"</string>
-    <string name="call_tty_tdd" msgid="7807210224965727701">"Ring upp TTY/TDD"</string>
-    <string name="call_work_mobile" msgid="2716342732938578495">"Ring upp jobbmobil"</string>
-    <string name="call_work_pager" msgid="3791778749827366574">"Ring upp jobbpersonsökare"</string>
-    <string name="call_assistant" msgid="4177478845473789294">"Ring <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
-    <string name="call_mms" msgid="4958811711741872901">"Ring upp MMS"</string>
-    <string name="sms_custom" msgid="8785368968605026317">"Skicka SMS till <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="sms_home" msgid="3527719551060295243">"Skicka SMS till hem"</string>
-    <string name="sms_mobile" msgid="8883045857887736518">"Skicka SMS till mobil"</string>
-    <string name="sms_work" msgid="4158595439553450966">"Skicka SMS till arbete"</string>
-    <string name="sms_fax_work" msgid="5483726627718055248">"Skicka SMS till arbetsfax"</string>
-    <string name="sms_fax_home" msgid="9219265155770746077">"Skicka SMS till hemfax"</string>
-    <string name="sms_pager" msgid="4901085068525193933">"Skicka SMS till personsökare"</string>
-    <string name="sms_other" msgid="1742702947993285933">"SMS"</string>
-    <string name="sms_callback" msgid="5833483630377538308">"Skicka SMS till återuppringningsnummer"</string>
-    <string name="sms_car" msgid="4314577266154395174">"Skicka SMS till bil"</string>
-    <string name="sms_company_main" msgid="2308160928487360705">"Skicka SMS till företag"</string>
-    <string name="sms_isdn" msgid="6394300346179302542">"Skicka SMS till ISDN"</string>
-    <string name="sms_main" msgid="8908087742014140774">"Skicka SMS till primärt nummer"</string>
-    <string name="sms_other_fax" msgid="8768455473295405427">"Skicka SMS till fax"</string>
-    <string name="sms_radio" msgid="855555176531704682">"Skicka SMS till radio"</string>
-    <string name="sms_telex" msgid="6269029276223252719">"Skicka SMS till telex"</string>
-    <string name="sms_tty_tdd" msgid="6229057354509192444">"Skicka SMS till TTY/TDD"</string>
-    <string name="sms_work_mobile" msgid="2155975469329969840">"Skicka SMS till jobbmobil"</string>
-    <string name="sms_work_pager" msgid="8500140274906830742">"Skicka SMS till jobbpersonsökare"</string>
-    <string name="sms_assistant" msgid="8513548482745330818">"Skicka SMS till <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
-    <string name="sms_mms" msgid="5187888900503248542">"Skicka SMS till MMS"</string>
-    <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"Vill du rensa listan?"</string>
-    <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"Du rensar listan över personer som du kontaktar ofta i apparna Kontakter och Telefon. E-postappar tvingas lära sig dina mottagarinställningar från början."</string>
-    <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"Listan rensas …"</string>
-    <string name="status_available" msgid="2648156525685472626">"Tillgänglig"</string>
-    <string name="status_away" msgid="2298688367552893953">"Borta"</string>
-    <string name="status_busy" msgid="5990832098713248503">"Upptagen"</string>
-    <string name="contactsList" msgid="8806067891419291513">"Kontakter"</string>
-    <string name="contact_suggestions" msgid="3324166754807120006">"Bästa förslagen"</string>
-    <string name="local_invisible_directory" msgid="4723238462733650090">"Övrigt"</string>
-    <string name="directory_search_label" msgid="4621215895484025229">"Katalog"</string>
-    <string name="directory_search_label_work" msgid="7679326282707414897">"Jobbkatalog"</string>
-    <string name="local_search_label" msgid="907622822323119235">"Alla kontakter"</string>
-    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Förslag"</string>
-    <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Jag"</string>
-    <string name="missing_name" msgid="978606963362745020">"(Inget namn)"</string>
-    <string name="description_view_contact_detail" msgid="2428742401208561136">"Visa kontakten"</string>
-    <string name="list_filter_phones" msgid="8763316061763437182">"Alla kontakter med telefonnummer"</string>
-    <string name="list_filter_phones_work" msgid="7083575404573422965">"Kontakter i jobbprofilen"</string>
-    <string name="view_updates_from_group" msgid="9011641093168385729">"Visa uppdateringar"</string>
-    <string name="account_phone" msgid="7067809073194061035">"Endast enhet, osynkroniserad"</string>
-    <string name="nameLabelsGroup" msgid="7730465833159557471">"Namn"</string>
-    <string name="nicknameLabelsGroup" msgid="6310556912361840029">"Smeknamn"</string>
-    <string name="full_name" msgid="648186563998465740">"Namn"</string>
-    <string name="name_given" msgid="5096576006314820536">"Förnamn"</string>
-    <string name="name_family" msgid="6646235805198547467">"Efternamn"</string>
-    <string name="name_prefix" msgid="9215326539658838">"Namnprefix"</string>
-    <string name="name_middle" msgid="703755205331582769">"Mellannamn"</string>
-    <string name="name_suffix" msgid="5777083390282548702">"Namnsuffix"</string>
-    <string name="name_phonetic" msgid="1650870996361663089">"Fonetiskt namn"</string>
-    <string name="name_phonetic_given" msgid="618812334274603170">"Fonetiskt förnamn"</string>
-    <string name="name_phonetic_middle" msgid="4826820763384625538">"Fonetiskt mellannamn"</string>
-    <string name="name_phonetic_family" msgid="379905191212930771">"Fonetiskt efternamn"</string>
-    <string name="phoneLabelsGroup" msgid="169661929021355548">"Telefon"</string>
-    <string name="emailLabelsGroup" msgid="2249752810477488833">"E-post"</string>
-    <string name="postalLabelsGroup" msgid="6772000590189142253">"Adress"</string>
-    <string name="imLabelsGroup" msgid="5718066254237364731">"Chatt"</string>
-    <string name="organizationLabelsGroup" msgid="1101996309241601435">"Organisation"</string>
-    <string name="relationLabelsGroup" msgid="53866051664600053">"Relation"</string>
-    <string name="eventLabelsGroup" msgid="1236970042646618489">"Särskilt datum"</string>
-    <string name="sms" msgid="7574344928185328095">"Sms"</string>
-    <string name="postal_address" msgid="1804707930129674200">"Adress"</string>
-    <string name="ghostData_company" msgid="2554310786296833424">"Företag"</string>
-    <string name="ghostData_title" msgid="4994968731830184837">"Befattning"</string>
-    <string name="label_notes" msgid="2050255313694219786">"Anteckningar"</string>
-    <string name="label_sip_address" msgid="8883266182575965926">"SIP"</string>
-    <string name="websiteLabelsGroup" msgid="1630734286462186790">"Webbplats"</string>
-    <string name="groupsLabel" msgid="2694002798416868728">"Grupper"</string>
-    <string name="email_home" msgid="889830029388962171">"E-postadress – hem"</string>
-    <string name="email_mobile" msgid="4487686436743741150">"Skicka e-post till mobil"</string>
-    <string name="email_work" msgid="4223487303344613528">"E-postadress – arbete"</string>
-    <string name="email_other" msgid="4246411900126012062">"E-post"</string>
-    <string name="email_custom" msgid="7246580894327511013">"Skicka e-post till <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="email" msgid="2807318537887091606">"E-post"</string>
-    <string name="postal_street" msgid="6918171741240802474">"Gatuadress"</string>
-    <string name="postal_city" msgid="8674569121430005628">"Ort"</string>
-    <string name="postal_region" msgid="1730369286225469192">"Delstat"</string>
-    <string name="postal_postcode" msgid="4450700741261990439">"Postnummer"</string>
-    <string name="postal_country" msgid="232670707458768148">"Land"</string>
-    <string name="map_home" msgid="4181131107392126938">"Visa hemadress"</string>
-    <string name="map_work" msgid="5723471185992684400">"Visa jobbadress"</string>
-    <string name="map_other" msgid="2253764780863500516">"Visa adress"</string>
-    <string name="map_custom" msgid="5581743097882436157">"Visa adress, <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="chat_aim" msgid="2954364435497941659">"Chatta med AIM"</string>
-    <string name="chat_msn" msgid="3130135239071228678">"Chatta med Windows Live"</string>
-    <string name="chat_yahoo" msgid="3233552142326865347">"Chatta med Yahoo"</string>
-    <string name="chat_skype" msgid="6486703981390592425">"Chatta med Skype"</string>
-    <string name="chat_qq" msgid="786924280665740019">"Chatta med QQ"</string>
-    <string name="chat_gtalk" msgid="7914674177243078035">"Chatta med Google Talk"</string>
-    <string name="chat_icq" msgid="3292934726414765801">"Chatta med ICQ"</string>
-    <string name="chat_jabber" msgid="6701542313597880204">"Chatta med Jabber"</string>
-    <string name="chat" msgid="1020428260359370236">"Chatt"</string>
-    <string name="list_filter_all_accounts" msgid="473782314881473992">"Alla kontakter"</string>
-    <string name="listAllContactsInAccount" msgid="3486378621592995630">"Kontakter i <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="listCustomView" msgid="5306282632413086731">"Kontakter i anpassad vy"</string>
-    <string name="listSingleContact" msgid="8620818791932382627">"En kontakt"</string>
-    <string name="display_options_sort_list_by" msgid="3541875948367831228">"Sortera efter"</string>
-    <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"Förnamn"</string>
-    <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"Efternamn"</string>
-    <string name="display_options_view_names_as" msgid="4204204205736735618">"Namnformat"</string>
-    <string name="display_options_view_given_name_first" msgid="2308026973021171020">"Förnamn först"</string>
-    <string name="display_options_view_family_name_first" msgid="987430497292428242">"Efternamn först"</string>
-    <string name="menu_clear_frequents" msgid="5358271535047496120">"Rensa listan över kontakter"</string>
-    <string name="action_menu_back_from_search" msgid="3550669942742167644">"avbryt sökning"</string>
-    <string name="description_clear_search" msgid="2347258825265600782">"Rensa sökning"</string>
-    <string name="select_account_dialog_title" msgid="2673504582803359239">"Konto"</string>
-    <string name="set_default_account" msgid="7966099951006467572">"Använd alltid för samtal"</string>
-    <string name="select_phone_account_for_calls" msgid="1784460686103423274">"Ring med"</string>
-    <string name="call_with_a_note" msgid="6242261320491851133">"Ring med anteckning"</string>
-    <string name="call_subject_hint" msgid="7233138753650420800">"Gör en anteckning som skickas när du ringer …"</string>
-    <string name="send_and_call_button" msgid="4735168294120154013">"SKICKA OCH RING"</string>
-    <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g>/<xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="tab_title" msgid="3387876802026074288">"Fliken <xliff:g id="TITLE">%1$s</xliff:g>."</string>
-    <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
-      <item quantity="other">Fliken <xliff:g id="TITLE_2">%1$s</xliff:g>. <xliff:g id="COUNT_3">%2$d</xliff:g> olästa poster. </item>
-      <item quantity="one">Fliken <xliff:g id="TITLE_0">%1$s</xliff:g>. <xliff:g id="COUNT_1">%2$d</xliff:g> oläst post. </item>
-    </plurals>
-    <string name="description_search_video_call" msgid="4337369876888024909">"Videosamtal"</string>
-    <string name="description_search_call_and_share" msgid="4912772842755050467">"Dela och ring"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_custom">Ring %s</string>
+  <string name="call_home">Ring hem</string>
+  <string name="call_mobile">Ring mobilen</string>
+  <string name="call_work">Ring arbete</string>
+  <string name="call_fax_work">Ring upp arbetsfax</string>
+  <string name="call_fax_home">Ring upp hemfax</string>
+  <string name="call_pager">Ring personsökare</string>
+  <string name="call_other">Ring</string>
+  <string name="call_callback">Ring upp återuppringningsnummer</string>
+  <string name="call_car">Ring bilen</string>
+  <string name="call_company_main">Ring företag</string>
+  <string name="call_isdn">Ring upp ISDN</string>
+  <string name="call_main">Ring upp primärt nummer</string>
+  <string name="call_other_fax">Ring upp fax</string>
+  <string name="call_radio">Ring radio</string>
+  <string name="call_telex">Ring upp telex</string>
+  <string name="call_tty_tdd">Ring upp TTY/TDD</string>
+  <string name="call_work_mobile">Ring upp jobbmobil</string>
+  <string name="call_work_pager">Ring upp jobbpersonsökare</string>
+  <string name="call_assistant">Ring %s</string>
+  <string name="call_mms">Ring upp MMS</string>
+  <string name="sms_custom">Skicka SMS till %s</string>
+  <string name="sms_home">Skicka SMS till hem</string>
+  <string name="sms_mobile">Skicka SMS till mobil</string>
+  <string name="sms_work">Skicka SMS till arbete</string>
+  <string name="sms_fax_work">Skicka SMS till arbetsfax</string>
+  <string name="sms_fax_home">Skicka SMS till hemfax</string>
+  <string name="sms_pager">Skicka SMS till personsökare</string>
+  <string name="sms_other">SMS</string>
+  <string name="sms_callback">Skicka SMS till återuppringningsnummer</string>
+  <string name="sms_car">Skicka SMS till bil</string>
+  <string name="sms_company_main">Skicka SMS till företag</string>
+  <string name="sms_isdn">Skicka SMS till ISDN</string>
+  <string name="sms_main">Skicka SMS till primärt nummer</string>
+  <string name="sms_other_fax">Skicka SMS till fax</string>
+  <string name="sms_radio">Skicka SMS till radio</string>
+  <string name="sms_telex">Skicka SMS till telex</string>
+  <string name="sms_tty_tdd">Skicka SMS till TTY/TDD</string>
+  <string name="sms_work_mobile">Skicka SMS till jobbmobil</string>
+  <string name="sms_work_pager">Skicka SMS till jobbpersonsökare</string>
+  <string name="sms_assistant">Skicka SMS till %s</string>
+  <string name="sms_mms">Skicka SMS till MMS</string>
+  <string name="clearFrequentsConfirmation_title">Vill du rensa listan?</string>
+  <string name="clearFrequentsConfirmation">Du rensar listan över personer som du kontaktar ofta i apparna Kontakter och Telefon. E-postappar tvingas lära sig dina mottagarinställningar från början.</string>
+  <string name="clearFrequentsProgress_title">Listan rensas …</string>
+  <string name="status_available">Tillgänglig</string>
+  <string name="status_away">Borta</string>
+  <string name="status_busy">Upptagen</string>
+  <string name="contactsList">Kontakter</string>
+  <string name="contact_suggestions">Bästa förslagen</string>
+  <string name="local_invisible_directory">Övrigt</string>
+  <string name="directory_search_label">Katalog</string>
+  <string name="directory_search_label_work">Jobbkatalog</string>
+  <string name="local_search_label">Alla kontakter</string>
+  <string name="local_suggestions_search_label">Förslag</string>
+  <string msgid="9154761216179882405" name="user_profile_contacts_list_header">Jag</string>
+  <string name="missing_name">(Inget namn)</string>
+  <string msgid="2795575601596468581" name="description_view_contact_detail">Visa kontakten</string>
+  <string name="list_filter_phones">Alla kontakter med telefonnummer</string>
+  <string name="list_filter_phones_work">Kontakter i jobbprofilen</string>
+  <string name="view_updates_from_group">Visa uppdateringar</string>
+  <string name="account_phone">Endast enhet, osynkroniserad</string>
+  <string name="nameLabelsGroup">Namn</string>
+  <string name="nicknameLabelsGroup">Smeknamn</string>
+  <string name="full_name">Namn</string>
+  <string name="name_given">Förnamn</string>
+  <string name="name_family">Efternamn</string>
+  <string name="name_prefix">Namnprefix</string>
+  <string name="name_middle">Mellannamn</string>
+  <string name="name_suffix">Namnsuffix</string>
+  <string name="name_phonetic">Fonetiskt namn</string>
+  <string name="name_phonetic_given">Fonetiskt förnamn</string>
+  <string name="name_phonetic_middle">Fonetiskt mellannamn</string>
+  <string name="name_phonetic_family">Fonetiskt efternamn</string>
+  <string name="phoneLabelsGroup">Telefon</string>
+  <string name="emailLabelsGroup">E-post</string>
+  <string name="postalLabelsGroup">Adress</string>
+  <string name="imLabelsGroup">Chatt</string>
+  <string name="organizationLabelsGroup">Organisation</string>
+  <string name="relationLabelsGroup">Relation</string>
+  <string name="eventLabelsGroup">Särskilt datum</string>
+  <string name="sms">Sms</string>
+  <string name="postal_address">Adress</string>
+  <string name="ghostData_company">Företag</string>
+  <string name="ghostData_title">Befattning</string>
+  <string name="label_notes">Anteckningar</string>
+  <string name="label_sip_address">SIP</string>
+  <string name="websiteLabelsGroup">Webbplats</string>
+  <string name="groupsLabel">Grupper</string>
+  <string name="email_home">E-postadress – hem</string>
+  <string name="email_mobile">Skicka e-post till mobil</string>
+  <string name="email_work">E-postadress – arbete</string>
+  <string name="email_other">E-post</string>
+  <string name="email_custom">Skicka e-post till %s</string>
+  <string name="email">E-post</string>
+  <string name="postal_street">Gatuadress</string>
+  <string name="postal_city">Ort</string>
+  <string name="postal_region">Delstat</string>
+  <string name="postal_postcode">Postnummer</string>
+  <string name="postal_country">Land</string>
+  <string name="map_home">Visa hemadress</string>
+  <string name="map_work">Visa jobbadress</string>
+  <string name="map_other">Visa adress</string>
+  <string name="map_custom">Visa adress, %s</string>
+  <string name="chat_aim">Chatta med AIM</string>
+  <string name="chat_msn">Chatta med Windows Live</string>
+  <string name="chat_yahoo">Chatta med Yahoo</string>
+  <string name="chat_skype">Chatta med Skype</string>
+  <string name="chat_qq">Chatta med QQ</string>
+  <string name="chat_gtalk">Chatta med Google Talk</string>
+  <string name="chat_icq">Chatta med ICQ</string>
+  <string name="chat_jabber">Chatta med Jabber</string>
+  <string name="chat">Chatt</string>
+  <string name="list_filter_all_accounts">Alla kontakter</string>
+  <string name="listAllContactsInAccount">Kontakter i %s</string>
+  <string name="listCustomView">Kontakter i anpassad vy</string>
+  <string name="listSingleContact">En kontakt</string>
+  <string name="display_options_sort_list_by">Sortera efter</string>
+  <string name="display_options_sort_by_given_name">Förnamn</string>
+  <string name="display_options_sort_by_family_name">Efternamn</string>
+  <string name="display_options_view_names_as">Namnformat</string>
+  <string name="display_options_view_given_name_first">Förnamn först</string>
+  <string name="display_options_view_family_name_first">Efternamn först</string>
+  <string name="menu_clear_frequents">Rensa listan över kontakter</string>
+  <string name="action_menu_back_from_search">avbryt sökning</string>
+  <string name="description_clear_search">Rensa sökning</string>
+  <string name="select_account_dialog_title">Konto</string>
+  <string name="set_default_account">Använd alltid för samtal</string>
+  <string name="select_phone_account_for_calls">Välj SIM-kort till det här samtalet</string>
+  <string name="select_phone_account_for_calls_remember">Kom ihåg det här valet</string>
+  <string name="call_with_a_note">Ring med anteckning</string>
+  <string name="call_subject_hint">Gör en anteckning som skickas när du ringer …</string>
+  <string name="send_and_call_button">SKICKA OCH RING</string>
+  <string name="call_subject_limit">%1$s/%2$s</string>
+  <string name="old_call_subject_type_and_number">%1$s %2$s</string>
+  <string name="tab_title">Fliken %1$s.</string>
+  <plurals name="tab_title_with_unread_items">
+    <item quantity="one">Fliken %1$s. %2$d oläst post. </item>
+    <item quantity="other">Fliken %1$s. %2$d olästa poster. </item>
+  </plurals>
+  <string name="description_search_video_call">Videosamtal</string>
+  <string name="description_search_call_and_share">Dela och ring</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-sw/strings.xml b/java/com/android/contacts/common/res/values-sw/strings.xml
index 9388649..1be9f0a 100644
--- a/java/com/android/contacts/common/res/values-sw/strings.xml
+++ b/java/com/android/contacts/common/res/values-sw/strings.xml
@@ -1,162 +1,145 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="toast_text_copied" msgid="8979281391599667362">"Maandishi yamenakiliwa"</string>
-    <string name="call_custom" msgid="3041673234638990874">"Pia simu <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="call_home" msgid="125893483593803791">"Piga simu nyumbani"</string>
-    <string name="call_mobile" msgid="967589404494150813">"Pigia simu ya mkononi"</string>
-    <string name="call_work" msgid="6040550697395300892">"Piga simu kazini"</string>
-    <string name="call_fax_work" msgid="5260192771364592922">"Ipigie simu kipepesi cha kazini"</string>
-    <string name="call_fax_home" msgid="5174311195081144124">"Ipigie simu kipepesi cha nyumbani"</string>
-    <string name="call_pager" msgid="6814149227741274161">"Ipigie peja simu"</string>
-    <string name="call_other" msgid="5536385588712587235">"Piga simu"</string>
-    <string name="call_callback" msgid="6314019862718112786">"Mpigie simu aliyepiga"</string>
-    <string name="call_car" msgid="3197417098027764954">"Piga simu ya gari"</string>
-    <string name="call_company_main" msgid="2557663310028446397">"Pigia simu kuu ya kampuni"</string>
-    <string name="call_isdn" msgid="4691270442763649522">"Piga simu kwa ISDN"</string>
-    <string name="call_main" msgid="3293707608770407814">"Piga simu kuu"</string>
-    <string name="call_other_fax" msgid="4724521984879021465">"Ipigie kipepesi simu"</string>
-    <string name="call_radio" msgid="8942441419845057942">"Piga simu redioni"</string>
-    <string name="call_telex" msgid="2031514461660668351">"Piga simu kwa teleksi"</string>
-    <string name="call_tty_tdd" msgid="7807210224965727701">"Piga simu TTY/TDD"</string>
-    <string name="call_work_mobile" msgid="2716342732938578495">"Ipigie simu ya mkononi ya kazini"</string>
-    <string name="call_work_pager" msgid="3791778749827366574">"Ipigie peja ya kazini"</string>
-    <string name="call_assistant" msgid="4177478845473789294">"Piga simu <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
-    <string name="call_mms" msgid="4958811711741872901">"Piga simu kwa MMS"</string>
-    <string name="sms_custom" msgid="8785368968605026317">"Tumia ujumbe wa maandishi kwa <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="sms_home" msgid="3527719551060295243">"Tuma ujumbe wa maandishi nyumbani"</string>
-    <string name="sms_mobile" msgid="8883045857887736518">"Tumia simu ya mkononi ujumbe wa maandishi"</string>
-    <string name="sms_work" msgid="4158595439553450966">"Tuma ujumbe wa maandishi kazini"</string>
-    <string name="sms_fax_work" msgid="5483726627718055248">"Tumia ujumbe kwenda kipepesi cha kazini"</string>
-    <string name="sms_fax_home" msgid="9219265155770746077">"Tuma ujumbe kwenda kipepesi ch nyumbani"</string>
-    <string name="sms_pager" msgid="4901085068525193933">"Tumia peja ujumbe wa maandishi"</string>
-    <string name="sms_other" msgid="1742702947993285933">"Tuma ujumbe wa maandishi"</string>
-    <string name="sms_callback" msgid="5833483630377538308">"Tuma ujumbe wa maandishi kwa aliyepiga"</string>
-    <string name="sms_car" msgid="4314577266154395174">"Tuma ujumbe kwa gari"</string>
-    <string name="sms_company_main" msgid="2308160928487360705">"Tuma ujumbe wa maandishi kwenda simu kuu ya kampuni"</string>
-    <string name="sms_isdn" msgid="6394300346179302542">"Tumia ISDN ujumbe wa maandishi"</string>
-    <string name="sms_main" msgid="8908087742014140774">"Tumia simu kuu ujumbe wa maandishi"</string>
-    <string name="sms_other_fax" msgid="8768455473295405427">"Tuma ujumbe kwenda katika kipepesi"</string>
-    <string name="sms_radio" msgid="855555176531704682">"Tuma ujumbe wa maandishi redioni"</string>
-    <string name="sms_telex" msgid="6269029276223252719">"Tumia teleksi ujumbe wa maandishi"</string>
-    <string name="sms_tty_tdd" msgid="6229057354509192444">"Tumia TTY/TDD ujumbe wa maandishi"</string>
-    <string name="sms_work_mobile" msgid="2155975469329969840">"Itumie simu ya mkononi ya kazini ujumbe"</string>
-    <string name="sms_work_pager" msgid="8500140274906830742">"Itumie peja ya kazini ya kazini ujumbe"</string>
-    <string name="sms_assistant" msgid="8513548482745330818">"Tuma ujumbe wa maandishi kwa <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
-    <string name="sms_mms" msgid="5187888900503248542">"Tumia MMS ujmbe wa maandishi"</string>
-    <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"Futa unaowasiliana nao mara kwa mara?"</string>
-    <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"Utafuta orodha ya unaowasiliana nao mara kwa mara katika programu za Anwani na Simu, na ulazimishe programu za barua pepe zitambue mapendeleo yako ya anwani kutoka mwanzo."</string>
-    <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"Inafuta unaowasiliana nao mara kwa mara..."</string>
-    <string name="status_available" msgid="2648156525685472626">"Inapatikana"</string>
-    <string name="status_away" msgid="2298688367552893953">"Mbali"</string>
-    <string name="status_busy" msgid="5990832098713248503">"Ana shughuli"</string>
-    <string name="contactsList" msgid="8806067891419291513">"Anwani"</string>
-    <string name="contact_suggestions" msgid="3324166754807120006">"Mapendekezo Maarufu"</string>
-    <string name="local_invisible_directory" msgid="4723238462733650090">"Nyingineyo"</string>
-    <string name="directory_search_label" msgid="4621215895484025229">"Saraka"</string>
-    <string name="directory_search_label_work" msgid="7679326282707414897">"Anwani za kazi"</string>
-    <string name="local_search_label" msgid="907622822323119235">"Anwani zote"</string>
-    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Mapendekezo"</string>
-    <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Mimi"</string>
-    <string name="missing_name" msgid="978606963362745020">"(Hakuna jina)"</string>
-    <string name="description_view_contact_detail" msgid="2428742401208561136">"Angalia maelezo ya mawasiliano"</string>
-    <string name="list_filter_phones" msgid="8763316061763437182">"Anwani zote zilizo na nambari ya simu"</string>
-    <string name="list_filter_phones_work" msgid="7083575404573422965">"Anwani za watu wa kazini"</string>
-    <string name="view_updates_from_group" msgid="9011641093168385729">"Ona sasisho"</string>
-    <string name="account_phone" msgid="7067809073194061035">"Kwenye kifaa tu, haijasawazishwa"</string>
-    <string name="nameLabelsGroup" msgid="7730465833159557471">"Jina"</string>
-    <string name="nicknameLabelsGroup" msgid="6310556912361840029">"Lakabu"</string>
-    <string name="full_name" msgid="648186563998465740">"Jina"</string>
-    <string name="name_given" msgid="5096576006314820536">"Jina la kwanza"</string>
-    <string name="name_family" msgid="6646235805198547467">"Jina la mwisho"</string>
-    <string name="name_prefix" msgid="9215326539658838">"Herufi za kwanza za jina"</string>
-    <string name="name_middle" msgid="703755205331582769">"Jina la kati"</string>
-    <string name="name_suffix" msgid="5777083390282548702">"Herufi za mwisho za jina"</string>
-    <string name="name_phonetic" msgid="1650870996361663089">"Jina la kifonetiki"</string>
-    <string name="name_phonetic_given" msgid="618812334274603170">"Anza na jina kifonetiki"</string>
-    <string name="name_phonetic_middle" msgid="4826820763384625538">"Jina la kati kifonetiki"</string>
-    <string name="name_phonetic_family" msgid="379905191212930771">"Jina la mwisho kifonetiki"</string>
-    <string name="phoneLabelsGroup" msgid="169661929021355548">"Simu"</string>
-    <string name="emailLabelsGroup" msgid="2249752810477488833">"Tuma barua pepe"</string>
-    <string name="postalLabelsGroup" msgid="6772000590189142253">"Anwani"</string>
-    <string name="imLabelsGroup" msgid="5718066254237364731">"Ujumbe wa Papo Hapo"</string>
-    <string name="organizationLabelsGroup" msgid="1101996309241601435">"Shirika"</string>
-    <string name="relationLabelsGroup" msgid="53866051664600053">"Uhusiano"</string>
-    <string name="eventLabelsGroup" msgid="1236970042646618489">"Tarehe maalum"</string>
-    <string name="sms" msgid="7574344928185328095">"Ujumbe wa maandishi"</string>
-    <string name="postal_address" msgid="1804707930129674200">"Anwani"</string>
-    <string name="ghostData_company" msgid="2554310786296833424">"Kampuni"</string>
-    <string name="ghostData_title" msgid="4994968731830184837">"Jina"</string>
-    <string name="label_notes" msgid="2050255313694219786">"Madokezo"</string>
-    <string name="label_sip_address" msgid="8883266182575965926">"SIP"</string>
-    <string name="websiteLabelsGroup" msgid="1630734286462186790">"Tovuti"</string>
-    <string name="groupsLabel" msgid="2694002798416868728">"Vikundi"</string>
-    <string name="email_home" msgid="889830029388962171">"Tuma barua pepe nyumbani"</string>
-    <string name="email_mobile" msgid="4487686436743741150">"Tuma barua pepe kwenye simu ya mkononi"</string>
-    <string name="email_work" msgid="4223487303344613528">"Tuma barua pepe kazini"</string>
-    <string name="email_other" msgid="4246411900126012062">"Tuma barua pepe"</string>
-    <string name="email_custom" msgid="7246580894327511013">"Tuma barua pepe kwenye <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="email" msgid="2807318537887091606">"Tuma barua pepe"</string>
-    <string name="postal_street" msgid="6918171741240802474">"Barabara"</string>
-    <string name="postal_city" msgid="8674569121430005628">"Mji"</string>
-    <string name="postal_region" msgid="1730369286225469192">"Jimbo"</string>
-    <string name="postal_postcode" msgid="4450700741261990439">"Msimbo wa posta"</string>
-    <string name="postal_country" msgid="232670707458768148">"Nchi"</string>
-    <string name="map_home" msgid="4181131107392126938">"Tazama anwani ya nyumbani"</string>
-    <string name="map_work" msgid="5723471185992684400">"Tazama anwani ya kazini"</string>
-    <string name="map_other" msgid="2253764780863500516">"Tazama anwani"</string>
-    <string name="map_custom" msgid="5581743097882436157">"Tazama anwani ya <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="chat_aim" msgid="2954364435497941659">"Piga gumzo kutumia AIM"</string>
-    <string name="chat_msn" msgid="3130135239071228678">"Piga gumzo kutumia Windows Live"</string>
-    <string name="chat_yahoo" msgid="3233552142326865347">"Piga gumzo kutumia Yahoo"</string>
-    <string name="chat_skype" msgid="6486703981390592425">"Piga gumzo kutumia Skype"</string>
-    <string name="chat_qq" msgid="786924280665740019">"Piga gumzo kutumia QQ"</string>
-    <string name="chat_gtalk" msgid="7914674177243078035">"Piga gumzo kutumia Google Talk"</string>
-    <string name="chat_icq" msgid="3292934726414765801">"Piga gumzo kutumia ICQ"</string>
-    <string name="chat_jabber" msgid="6701542313597880204">"Piga gumzo kutumia Jabber"</string>
-    <string name="chat" msgid="1020428260359370236">"Gumzo"</string>
-    <string name="list_filter_all_accounts" msgid="473782314881473992">"Anwani zote"</string>
-    <string name="listAllContactsInAccount" msgid="3486378621592995630">"Anwani kwenye <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="listCustomView" msgid="5306282632413086731">"Anwani katika mwoneko maalum"</string>
-    <string name="listSingleContact" msgid="8620818791932382627">"Anwani moja"</string>
-    <string name="display_options_sort_list_by" msgid="3541875948367831228">"Panga kulingana na"</string>
-    <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"Jina la kwanza"</string>
-    <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"Jina la mwisho"</string>
-    <string name="display_options_view_names_as" msgid="4204204205736735618">"Mpangilio wa majina"</string>
-    <string name="display_options_view_given_name_first" msgid="2308026973021171020">"Anza kwa jina la kwanza"</string>
-    <string name="display_options_view_family_name_first" msgid="987430497292428242">"Anza kwa jina la mwisho"</string>
-    <string name="menu_clear_frequents" msgid="5358271535047496120">"Futa za mara kwa mara"</string>
-    <string name="action_menu_back_from_search" msgid="3550669942742167644">"acha kutafuta"</string>
-    <string name="description_clear_search" msgid="2347258825265600782">"Futa utafutaji"</string>
-    <string name="select_account_dialog_title" msgid="2673504582803359239">"Akaunti"</string>
-    <string name="set_default_account" msgid="7966099951006467572">"Tumia hii kwa simu wakati wote"</string>
-    <string name="select_phone_account_for_calls" msgid="1784460686103423274">"Piga simu ukitumia"</string>
-    <string name="call_with_a_note" msgid="6242261320491851133">"Piga simu inayoambatana na dokezo"</string>
-    <string name="call_subject_hint" msgid="7233138753650420800">"Andika dokezo litakaloambatana na simu utakayopiga ..."</string>
-    <string name="send_and_call_button" msgid="4735168294120154013">"TUMA na UPIGE SIMU"</string>
-    <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="tab_title" msgid="3387876802026074288">"Kichupo cha <xliff:g id="TITLE">%1$s</xliff:g>."</string>
-    <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
-      <item quantity="other"> Kichupo cha <xliff:g id="TITLE_2">%1$s</xliff:g>. Vipengee <xliff:g id="COUNT_3">%2$d</xliff:g> havijasomwa. </item>
-      <item quantity="one"> Kichupo cha <xliff:g id="TITLE_0">%1$s</xliff:g>. Kipengee <xliff:g id="COUNT_1">%2$d</xliff:g> hakijasomwa. </item>
-    </plurals>
-    <string name="description_search_video_call" msgid="4337369876888024909">"Simu ya video"</string>
-    <string name="description_search_call_and_share" msgid="4912772842755050467">"Shiriki na upige simu"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_custom">Pia simu %s</string>
+  <string name="call_home">Piga simu nyumbani</string>
+  <string name="call_mobile">Pigia simu ya mkononi</string>
+  <string name="call_work">Piga simu kazini</string>
+  <string name="call_fax_work">Ipigie simu kipepesi cha kazini</string>
+  <string name="call_fax_home">Ipigie simu kipepesi cha nyumbani</string>
+  <string name="call_pager">Ipigie peja simu</string>
+  <string name="call_other">Piga simu</string>
+  <string name="call_callback">Mpigie simu aliyepiga</string>
+  <string name="call_car">Piga simu ya gari</string>
+  <string name="call_company_main">Pigia simu kuu ya kampuni</string>
+  <string name="call_isdn">Piga simu kwa ISDN</string>
+  <string name="call_main">Piga simu kuu</string>
+  <string name="call_other_fax">Ipigie kipepesi simu</string>
+  <string name="call_radio">Piga simu redioni</string>
+  <string name="call_telex">Piga simu kwa teleksi</string>
+  <string name="call_tty_tdd">Piga simu TTY/TDD</string>
+  <string name="call_work_mobile">Ipigie simu ya mkononi ya kazini</string>
+  <string name="call_work_pager">Ipigie peja ya kazini</string>
+  <string name="call_assistant">Piga simu %s</string>
+  <string name="call_mms">Piga simu kwa MMS</string>
+  <string name="sms_custom">Tumia ujumbe wa maandishi kwa %s</string>
+  <string name="sms_home">Tuma ujumbe wa maandishi nyumbani</string>
+  <string name="sms_mobile">Tumia simu ya mkononi ujumbe wa maandishi</string>
+  <string name="sms_work">Tuma ujumbe wa maandishi kazini</string>
+  <string name="sms_fax_work">Tumia ujumbe kwenda kipepesi cha kazini</string>
+  <string name="sms_fax_home">Tuma ujumbe kwenda kipepesi ch nyumbani</string>
+  <string name="sms_pager">Tumia peja ujumbe wa maandishi</string>
+  <string name="sms_other">Tuma ujumbe wa maandishi</string>
+  <string name="sms_callback">Tuma ujumbe wa maandishi kwa aliyepiga</string>
+  <string name="sms_car">Tuma ujumbe kwa gari</string>
+  <string name="sms_company_main">Tuma ujumbe wa maandishi kwenda simu kuu ya kampuni</string>
+  <string name="sms_isdn">Tumia ISDN ujumbe wa maandishi</string>
+  <string name="sms_main">Tumia simu kuu ujumbe wa maandishi</string>
+  <string name="sms_other_fax">Tuma ujumbe kwenda katika kipepesi</string>
+  <string name="sms_radio">Tuma ujumbe wa maandishi redioni</string>
+  <string name="sms_telex">Tumia teleksi ujumbe wa maandishi</string>
+  <string name="sms_tty_tdd">Tumia TTY/TDD ujumbe wa maandishi</string>
+  <string name="sms_work_mobile">Itumie simu ya mkononi ya kazini ujumbe</string>
+  <string name="sms_work_pager">Itumie peja ya kazini ya kazini ujumbe</string>
+  <string name="sms_assistant">Tuma ujumbe wa maandishi kwa %s</string>
+  <string name="sms_mms">Tumia MMS ujmbe wa maandishi</string>
+  <string name="clearFrequentsConfirmation_title">Futa unaowasiliana nao mara kwa mara?</string>
+  <string name="clearFrequentsConfirmation">Utafuta orodha ya unaowasiliana nao mara kwa mara katika programu za Anwani na Simu, na ulazimishe programu za barua pepe zitambue mapendeleo yako ya anwani kutoka mwanzo.</string>
+  <string name="clearFrequentsProgress_title">Inafuta unaowasiliana nao mara kwa mara...</string>
+  <string name="status_available">Inapatikana</string>
+  <string name="status_away">Mbali</string>
+  <string name="status_busy">Ana shughuli</string>
+  <string name="contactsList">Anwani</string>
+  <string name="contact_suggestions">Mapendekezo Maarufu</string>
+  <string name="local_invisible_directory">Nyingineyo</string>
+  <string name="directory_search_label">Saraka</string>
+  <string name="directory_search_label_work">Anwani za kazi</string>
+  <string name="local_search_label">Anwani zote</string>
+  <string name="local_suggestions_search_label">Mapendekezo</string>
+  <string msgid="9154761216179882405" name="user_profile_contacts_list_header">Mimi</string>
+  <string name="missing_name">(Hakuna jina)</string>
+  <string msgid="2795575601596468581" name="description_view_contact_detail">Angalia maelezo ya mawasiliano</string>
+  <string name="list_filter_phones">Anwani zote zilizo na nambari ya simu</string>
+  <string name="list_filter_phones_work">Anwani za watu wa kazini</string>
+  <string name="view_updates_from_group">Ona sasisho</string>
+  <string name="account_phone">Kwenye kifaa tu, haijasawazishwa</string>
+  <string name="nameLabelsGroup">Jina</string>
+  <string name="nicknameLabelsGroup">Lakabu</string>
+  <string name="full_name">Jina</string>
+  <string name="name_given">Jina la kwanza</string>
+  <string name="name_family">Jina la mwisho</string>
+  <string name="name_prefix">Herufi za kwanza za jina</string>
+  <string name="name_middle">Jina la kati</string>
+  <string name="name_suffix">Herufi za mwisho za jina</string>
+  <string name="name_phonetic">Jina la kifonetiki</string>
+  <string name="name_phonetic_given">Anza na jina kifonetiki</string>
+  <string name="name_phonetic_middle">Jina la kati kifonetiki</string>
+  <string name="name_phonetic_family">Jina la mwisho kifonetiki</string>
+  <string name="phoneLabelsGroup">Simu</string>
+  <string name="emailLabelsGroup">Tuma barua pepe</string>
+  <string name="postalLabelsGroup">Anwani</string>
+  <string name="imLabelsGroup">Ujumbe wa Papo Hapo</string>
+  <string name="organizationLabelsGroup">Shirika</string>
+  <string name="relationLabelsGroup">Uhusiano</string>
+  <string name="eventLabelsGroup">Tarehe maalum</string>
+  <string name="sms">Ujumbe wa maandishi</string>
+  <string name="postal_address">Anwani</string>
+  <string name="ghostData_company">Kampuni</string>
+  <string name="ghostData_title">Jina</string>
+  <string name="label_notes">Madokezo</string>
+  <string name="label_sip_address">SIP</string>
+  <string name="websiteLabelsGroup">Tovuti</string>
+  <string name="groupsLabel">Vikundi</string>
+  <string name="email_home">Tuma barua pepe nyumbani</string>
+  <string name="email_mobile">Tuma barua pepe kwenye simu ya mkononi</string>
+  <string name="email_work">Tuma barua pepe kazini</string>
+  <string name="email_other">Tuma barua pepe</string>
+  <string name="email_custom">Tuma barua pepe kwenye %s</string>
+  <string name="email">Tuma barua pepe</string>
+  <string name="postal_street">Barabara</string>
+  <string name="postal_city">Mji</string>
+  <string name="postal_region">Jimbo</string>
+  <string name="postal_postcode">Msimbo wa posta</string>
+  <string name="postal_country">Nchi</string>
+  <string name="map_home">Tazama anwani ya nyumbani</string>
+  <string name="map_work">Tazama anwani ya kazini</string>
+  <string name="map_other">Tazama anwani</string>
+  <string name="map_custom">Tazama anwani ya %s</string>
+  <string name="chat_aim">Piga gumzo kutumia AIM</string>
+  <string name="chat_msn">Piga gumzo kutumia Windows Live</string>
+  <string name="chat_yahoo">Piga gumzo kutumia Yahoo</string>
+  <string name="chat_skype">Piga gumzo kutumia Skype</string>
+  <string name="chat_qq">Piga gumzo kutumia QQ</string>
+  <string name="chat_gtalk">Piga gumzo kutumia Google Talk</string>
+  <string name="chat_icq">Piga gumzo kutumia ICQ</string>
+  <string name="chat_jabber">Piga gumzo kutumia Jabber</string>
+  <string name="chat">Gumzo</string>
+  <string name="list_filter_all_accounts">Anwani zote</string>
+  <string name="listAllContactsInAccount">Anwani kwenye %s</string>
+  <string name="listCustomView">Anwani katika mwoneko maalum</string>
+  <string name="listSingleContact">Anwani moja</string>
+  <string name="display_options_sort_list_by">Panga kulingana na</string>
+  <string name="display_options_sort_by_given_name">Jina la kwanza</string>
+  <string name="display_options_sort_by_family_name">Jina la mwisho</string>
+  <string name="display_options_view_names_as">Mpangilio wa majina</string>
+  <string name="display_options_view_given_name_first">Anza kwa jina la kwanza</string>
+  <string name="display_options_view_family_name_first">Anza kwa jina la mwisho</string>
+  <string name="menu_clear_frequents">Futa za mara kwa mara</string>
+  <string name="action_menu_back_from_search">acha kutafuta</string>
+  <string name="description_clear_search">Futa utafutaji</string>
+  <string name="select_account_dialog_title">Akaunti</string>
+  <string name="set_default_account">Tumia hii kwa simu wakati wote</string>
+  <string name="select_phone_account_for_calls">Chagua SIM kwa ajili ya simu hii</string>
+  <string name="select_phone_account_for_calls_remember">Kumbuka chaguo hili</string>
+  <string name="call_with_a_note">Piga simu inayoambatana na dokezo</string>
+  <string name="call_subject_hint">Andika dokezo litakaloambatana na simu utakayopiga ...</string>
+  <string name="send_and_call_button">TUMA na UPIGE SIMU</string>
+  <string name="call_subject_limit">%1$s / %2$s</string>
+  <string name="old_call_subject_type_and_number">%1$s %2$s</string>
+  <string name="tab_title">Kichupo cha %1$s.</string>
+  <plurals name="tab_title_with_unread_items">
+    <item quantity="one"> Kichupo cha %1$s. Kipengee %2$d hakijasomwa. </item>
+    <item quantity="other"> Kichupo cha %1$s. Vipengee %2$d havijasomwa. </item>
+  </plurals>
+  <string name="description_search_video_call">Simu ya video</string>
+  <string name="description_search_call_and_share">Shiriki na upige simu</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-ta/strings.xml b/java/com/android/contacts/common/res/values-ta/strings.xml
index 182d7c7..3510235 100644
--- a/java/com/android/contacts/common/res/values-ta/strings.xml
+++ b/java/com/android/contacts/common/res/values-ta/strings.xml
@@ -1,162 +1,145 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="toast_text_copied" msgid="8979281391599667362">"உரை நகலெடுக்கப்பட்டது"</string>
-    <string name="call_custom" msgid="3041673234638990874">"<xliff:g id="CUSTOM">%s</xliff:g> மொபைல் எண்ணில் அழை"</string>
-    <string name="call_home" msgid="125893483593803791">"வீட்டு தொலைபேசி எண்ணில் அழை"</string>
-    <string name="call_mobile" msgid="967589404494150813">"மொபைல் எண்ணில் அழை"</string>
-    <string name="call_work" msgid="6040550697395300892">"பணியிடத் தொலைபேசி எண்ணில் அழை"</string>
-    <string name="call_fax_work" msgid="5260192771364592922">"பணியிடத்தின் தொலைநகல் எண்ணில் அழை"</string>
-    <string name="call_fax_home" msgid="5174311195081144124">"வீட்டின் தொலைநகல் எண்ணில் அழை"</string>
-    <string name="call_pager" msgid="6814149227741274161">"பேஜர் எண்ணில் அழை"</string>
-    <string name="call_other" msgid="5536385588712587235">"அழை"</string>
-    <string name="call_callback" msgid="6314019862718112786">"திரும்ப அழை"</string>
-    <string name="call_car" msgid="3197417098027764954">"காரின் மொபைல் எண்ணில் அழை"</string>
-    <string name="call_company_main" msgid="2557663310028446397">"நிறுவனத்தின் முதன்மை மொபைல் எண்ணில் அழை"</string>
-    <string name="call_isdn" msgid="4691270442763649522">"ISDN தொலைபேசி எண்ணில் அழை"</string>
-    <string name="call_main" msgid="3293707608770407814">"முதன்மைத் தொலைபேசி எண்ணில் அழை"</string>
-    <string name="call_other_fax" msgid="4724521984879021465">"தொலைநகல் எண்ணில் அழை"</string>
-    <string name="call_radio" msgid="8942441419845057942">"ரேடியோ தொலைபேசி எண்ணில் அழை"</string>
-    <string name="call_telex" msgid="2031514461660668351">"டெலக்ஸ் எண்ணில் அழை"</string>
-    <string name="call_tty_tdd" msgid="7807210224965727701">"TTY/TDD தொலைபேசி எண்ணில் அழை"</string>
-    <string name="call_work_mobile" msgid="2716342732938578495">"பணியிட மொபைல் எண்ணில் அழை"</string>
-    <string name="call_work_pager" msgid="3791778749827366574">"பணியிடத்தின் பேஜர் எண்ணில் அழை"</string>
-    <string name="call_assistant" msgid="4177478845473789294">"<xliff:g id="ASSISTANT">%s</xliff:g> ஐ அழை"</string>
-    <string name="call_mms" msgid="4958811711741872901">"MMS தொலைபேசி எண்ணில் அழை"</string>
-    <string name="sms_custom" msgid="8785368968605026317">"<xliff:g id="CUSTOM">%s</xliff:g> க்கு உரைச்செய்தி அனுப்பு"</string>
-    <string name="sms_home" msgid="3527719551060295243">"வீட்டு தொலைபேசி எண்ணிற்கு உரைச்செய்தி அனுப்பு"</string>
-    <string name="sms_mobile" msgid="8883045857887736518">"மொபைல் எண்ணிற்கு உரைச்செய்தி அனுப்பு"</string>
-    <string name="sms_work" msgid="4158595439553450966">"பணியிட தொலைபேசி எண்ணிற்கு உரைச்செய்தி அனுப்பு"</string>
-    <string name="sms_fax_work" msgid="5483726627718055248">"பணியிட தொலைநகல் எண்ணிற்கு உரைச்செய்தி அனுப்பு"</string>
-    <string name="sms_fax_home" msgid="9219265155770746077">"வீட்டு தொலைநகல் எண்ணிற்கு உரைச்செய்தி அனுப்பு"</string>
-    <string name="sms_pager" msgid="4901085068525193933">"பேஜர் எண்ணிற்கு உரைச்செய்தி அனுப்பு"</string>
-    <string name="sms_other" msgid="1742702947993285933">"உரை"</string>
-    <string name="sms_callback" msgid="5833483630377538308">"அழைத்த எண்ணிற்கு உரைச்செய்தி அனுப்பு"</string>
-    <string name="sms_car" msgid="4314577266154395174">"காரின் தொலைபேசி எண்ணிற்கு உரைச்செய்தி அனுப்பு"</string>
-    <string name="sms_company_main" msgid="2308160928487360705">"நிறுவனத்தின் முதன்மை மொபைல் எண்ணிற்கு உரைச்செய்தி அனுப்பு"</string>
-    <string name="sms_isdn" msgid="6394300346179302542">"ISDN தொலைபேசி எண்ணிற்கு உரைச்செய்தி அனுப்பு"</string>
-    <string name="sms_main" msgid="8908087742014140774">"முதன்மைத் தொலைபேசி எண்ணிற்கு உரைச்செய்தி அனுப்பு"</string>
-    <string name="sms_other_fax" msgid="8768455473295405427">"தொலைநகல் எண்ணிற்கு உரைச்செய்தி அனுப்பு"</string>
-    <string name="sms_radio" msgid="855555176531704682">"ரேடியோ தொலைபேசி எண்ணிற்கு உரைச்செய்தி அனுப்பு"</string>
-    <string name="sms_telex" msgid="6269029276223252719">"டெலக்ஸ் எண்ணிற்கு உரைச்செய்தி அனுப்பு"</string>
-    <string name="sms_tty_tdd" msgid="6229057354509192444">"TTY/TDD தொலைபேசி எண்ணிற்கு உரைச்செய்தி அனுப்பு"</string>
-    <string name="sms_work_mobile" msgid="2155975469329969840">"பணியிட மொபைல் எண்ணிற்கு உரைச்செய்தி அனுப்பு"</string>
-    <string name="sms_work_pager" msgid="8500140274906830742">"பணியிட பேஜர் எண்ணிற்கு உரைச்செய்தி அனுப்பு"</string>
-    <string name="sms_assistant" msgid="8513548482745330818">"<xliff:g id="ASSISTANT">%s</xliff:g> க்கு உரைச்செய்தி அனுப்பு"</string>
-    <string name="sms_mms" msgid="5187888900503248542">"MMS மொபைல் எண்ணிற்கு உரைச்செய்தி அனுப்பு"</string>
-    <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"அடிக்கடி தொடர்புகொண்ட தொடர்பை அழிக்கவா?"</string>
-    <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"தொடர்புகள் மற்றும் ஃபோன் பயன்பாடுகளில் உள்ள அடிக்கடி தொடர்பு கொண்டவர்களின் பட்டியல் அழிக்கப்பட்டு, தொடக்கத்திலிருந்து மீண்டும் உங்கள் முகவரியிடல் விருப்பத்தேர்வுகளை மின்னஞ்சல் பயன்பாடுகள் அறியும்படி செய்யப்படும்."</string>
-    <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"அடிக்கடித் தொடர்புகொண்ட தொடர்பை அழிக்கிறது…"</string>
-    <string name="status_available" msgid="2648156525685472626">"இருக்கிறார்"</string>
-    <string name="status_away" msgid="2298688367552893953">"வெளியே"</string>
-    <string name="status_busy" msgid="5990832098713248503">"பணிமிகுதி"</string>
-    <string name="contactsList" msgid="8806067891419291513">"தொடர்புகள்"</string>
-    <string name="contact_suggestions" msgid="3324166754807120006">"அதிகம் பரிந்துரைத்தவை"</string>
-    <string name="local_invisible_directory" msgid="4723238462733650090">"மற்றவை"</string>
-    <string name="directory_search_label" msgid="4621215895484025229">"கோப்பகம்"</string>
-    <string name="directory_search_label_work" msgid="7679326282707414897">"பணிக் கோப்பகம்"</string>
-    <string name="local_search_label" msgid="907622822323119235">"எல்லா தொடர்புகளும்"</string>
-    <string name="local_suggestions_search_label" msgid="1178575146224386118">"பரிந்துரைகள்"</string>
-    <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"எனக்கு"</string>
-    <string name="missing_name" msgid="978606963362745020">"(பெயர் இல்லை)"</string>
-    <string name="description_view_contact_detail" msgid="2428742401208561136">"தொடர்பைக் காட்டும் பொத்தான்"</string>
-    <string name="list_filter_phones" msgid="8763316061763437182">"மொபைல் எண்களுடனான எல்லா தொடர்புகளும்"</string>
-    <string name="list_filter_phones_work" msgid="7083575404573422965">"பணிச் சுயவிவரத் தொடர்புகள்"</string>
-    <string name="view_updates_from_group" msgid="9011641093168385729">"புதுப்பிப்புகளைக் காட்டு"</string>
-    <string name="account_phone" msgid="7067809073194061035">"சாதனத்தில் மட்டும், ஒத்திசைக்கப்படாது"</string>
-    <string name="nameLabelsGroup" msgid="7730465833159557471">"பெயர்"</string>
-    <string name="nicknameLabelsGroup" msgid="6310556912361840029">"செல்லப்பெயர்"</string>
-    <string name="full_name" msgid="648186563998465740">"பெயர்"</string>
-    <string name="name_given" msgid="5096576006314820536">"முதல் பெயர்"</string>
-    <string name="name_family" msgid="6646235805198547467">"இறுதிப் பெயர்"</string>
-    <string name="name_prefix" msgid="9215326539658838">"பெயரின் முன்னொட்டு"</string>
-    <string name="name_middle" msgid="703755205331582769">"பெயரின் நடுப்பகுதி"</string>
-    <string name="name_suffix" msgid="5777083390282548702">"பெயரின் பின்னொட்டு"</string>
-    <string name="name_phonetic" msgid="1650870996361663089">"ஒலிப்புமுறை பெயர்"</string>
-    <string name="name_phonetic_given" msgid="618812334274603170">"ஒலிப்புமுறை முதல் பெயர்"</string>
-    <string name="name_phonetic_middle" msgid="4826820763384625538">"ஒலிப்புமுறையில் பெயரின் நடுப்பகுதி"</string>
-    <string name="name_phonetic_family" msgid="379905191212930771">"ஒலிப்புமுறை இறுதிப் பெயர்"</string>
-    <string name="phoneLabelsGroup" msgid="169661929021355548">"மொபைல்"</string>
-    <string name="emailLabelsGroup" msgid="2249752810477488833">"மின்னஞ்சல்"</string>
-    <string name="postalLabelsGroup" msgid="6772000590189142253">"முகவரி"</string>
-    <string name="imLabelsGroup" msgid="5718066254237364731">"IM"</string>
-    <string name="organizationLabelsGroup" msgid="1101996309241601435">"நிறுவனம்"</string>
-    <string name="relationLabelsGroup" msgid="53866051664600053">"உறவுமுறை"</string>
-    <string name="eventLabelsGroup" msgid="1236970042646618489">"சிறப்புத் தேதி"</string>
-    <string name="sms" msgid="7574344928185328095">"உரைச் செய்தி"</string>
-    <string name="postal_address" msgid="1804707930129674200">"முகவரி"</string>
-    <string name="ghostData_company" msgid="2554310786296833424">"நிறுவனம்"</string>
-    <string name="ghostData_title" msgid="4994968731830184837">"தலைப்பு"</string>
-    <string name="label_notes" msgid="2050255313694219786">"குறிப்புகள்"</string>
-    <string name="label_sip_address" msgid="8883266182575965926">"SIP"</string>
-    <string name="websiteLabelsGroup" msgid="1630734286462186790">"இணையதளம்"</string>
-    <string name="groupsLabel" msgid="2694002798416868728">"குழுக்கள்"</string>
-    <string name="email_home" msgid="889830029388962171">"வீட்டு மின்னஞ்சல் முகவரிக்கு மின்னஞ்சல் அனுப்பு"</string>
-    <string name="email_mobile" msgid="4487686436743741150">"மொபைல் மின்னஞ்சல் முகவரிக்கு மின்னஞ்சல் அனுப்பு"</string>
-    <string name="email_work" msgid="4223487303344613528">"பணியிட மின்னஞ்சல் முகவரிக்கு மின்னஞ்சல் அனுப்பு"</string>
-    <string name="email_other" msgid="4246411900126012062">"மின்னஞ்சல்"</string>
-    <string name="email_custom" msgid="7246580894327511013">"<xliff:g id="CUSTOM">%s</xliff:g> க்கு மின்னஞ்சல் அனுப்பு"</string>
-    <string name="email" msgid="2807318537887091606">"மின்னஞ்சல்"</string>
-    <string name="postal_street" msgid="6918171741240802474">"தெரு"</string>
-    <string name="postal_city" msgid="8674569121430005628">"நகரம்"</string>
-    <string name="postal_region" msgid="1730369286225469192">"மாநிலம்"</string>
-    <string name="postal_postcode" msgid="4450700741261990439">"ஜிப் குறியீடு"</string>
-    <string name="postal_country" msgid="232670707458768148">"நாடு"</string>
-    <string name="map_home" msgid="4181131107392126938">"வீட்டு முகவரியைக் காட்டு"</string>
-    <string name="map_work" msgid="5723471185992684400">"பணியிட முகவரியைக் காட்டு"</string>
-    <string name="map_other" msgid="2253764780863500516">"முகவரியைக் காட்டு"</string>
-    <string name="map_custom" msgid="5581743097882436157">"<xliff:g id="CUSTOM">%s</xliff:g> முகவரியைக் காட்டு"</string>
-    <string name="chat_aim" msgid="2954364435497941659">"AIM இல் அரட்டையடி"</string>
-    <string name="chat_msn" msgid="3130135239071228678">"Windows Live இல் அரட்டையடி"</string>
-    <string name="chat_yahoo" msgid="3233552142326865347">"Yahoo இல் அரட்டையடி"</string>
-    <string name="chat_skype" msgid="6486703981390592425">"Skype இல் அரட்டையடி"</string>
-    <string name="chat_qq" msgid="786924280665740019">"QQ இல் அரட்டையடி"</string>
-    <string name="chat_gtalk" msgid="7914674177243078035">"Google Talk இல் அரட்டையடி"</string>
-    <string name="chat_icq" msgid="3292934726414765801">"ICQ இல் அரட்டையடி"</string>
-    <string name="chat_jabber" msgid="6701542313597880204">"Jabber இல் அரட்டையடி"</string>
-    <string name="chat" msgid="1020428260359370236">"அரட்டை"</string>
-    <string name="list_filter_all_accounts" msgid="473782314881473992">"எல்லா தொடர்புகளும்"</string>
-    <string name="listAllContactsInAccount" msgid="3486378621592995630">"<xliff:g id="NAME">%s</xliff:g> இல் உள்ள தொடர்புகள்"</string>
-    <string name="listCustomView" msgid="5306282632413086731">"தனிப்பயன் காட்சியில் உள்ள தொடர்புகள்"</string>
-    <string name="listSingleContact" msgid="8620818791932382627">"ஒரு தொடர்பு"</string>
-    <string name="display_options_sort_list_by" msgid="3541875948367831228">"வரிசைப்படுத்து"</string>
-    <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"முதல் பெயர்"</string>
-    <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"இறுதிப் பெயர்"</string>
-    <string name="display_options_view_names_as" msgid="4204204205736735618">"பெயர் வடிவம்"</string>
-    <string name="display_options_view_given_name_first" msgid="2308026973021171020">"முதல் பெயர் முதலில்"</string>
-    <string name="display_options_view_family_name_first" msgid="987430497292428242">"இறுதிப் பெயர் முதலில்"</string>
-    <string name="menu_clear_frequents" msgid="5358271535047496120">"அடிக்கடி தொடர்புகொண்டவர்களை அழி"</string>
-    <string name="action_menu_back_from_search" msgid="3550669942742167644">"தேடுவதை நிறுத்து"</string>
-    <string name="description_clear_search" msgid="2347258825265600782">"தேடலை அழி"</string>
-    <string name="select_account_dialog_title" msgid="2673504582803359239">"கணக்கு"</string>
-    <string name="set_default_account" msgid="7966099951006467572">"அழைப்புகளுக்கு எப்போதும் இதைப் பயன்படுத்து"</string>
-    <string name="select_phone_account_for_calls" msgid="1784460686103423274">"இதன் மூலம் அழை"</string>
-    <string name="call_with_a_note" msgid="6242261320491851133">"குறிப்புடன் அழைக்கவும்"</string>
-    <string name="call_subject_hint" msgid="7233138753650420800">"அழைப்புடன் சேர்த்து அனுப்ப, குறிப்பை உள்ளிடவும்..."</string>
-    <string name="send_and_call_button" msgid="4735168294120154013">"அனுப்பி அழை"</string>
-    <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="tab_title" msgid="3387876802026074288">"<xliff:g id="TITLE">%1$s</xliff:g> தாவல்."</string>
-    <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
-      <item quantity="other"> <xliff:g id="TITLE_2">%1$s</xliff:g> தாவல். படிக்காதவை (<xliff:g id="COUNT_3">%2$d</xliff:g>). </item>
-      <item quantity="one"> <xliff:g id="TITLE_0">%1$s</xliff:g> தாவல். படிக்காதது (<xliff:g id="COUNT_1">%2$d</xliff:g>). </item>
-    </plurals>
-    <string name="description_search_video_call" msgid="4337369876888024909">"வீடியோ அழைப்பைத் தொடங்குவதற்கான பொத்தான்"</string>
-    <string name="description_search_call_and_share" msgid="4912772842755050467">"பகிர்ந்து அழைப்பதற்கான பொத்தான்"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_custom">%s மொபைல் எண்ணில் அழை</string>
+  <string name="call_home">வீட்டு தொலைபேசி எண்ணில் அழை</string>
+  <string name="call_mobile">மொபைல் எண்ணில் அழை</string>
+  <string name="call_work">பணியிடத் தொலைபேசி எண்ணில் அழை</string>
+  <string name="call_fax_work">பணியிடத்தின் தொலைநகல் எண்ணில் அழை</string>
+  <string name="call_fax_home">வீட்டின் தொலைநகல் எண்ணில் அழை</string>
+  <string name="call_pager">பேஜர் எண்ணில் அழை</string>
+  <string name="call_other">அழை</string>
+  <string name="call_callback">திரும்ப அழை</string>
+  <string name="call_car">காரின் மொபைல் எண்ணில் அழை</string>
+  <string name="call_company_main">நிறுவனத்தின் முதன்மை மொபைல் எண்ணில் அழை</string>
+  <string name="call_isdn">ISDN தொலைபேசி எண்ணில் அழை</string>
+  <string name="call_main">முதன்மைத் தொலைபேசி எண்ணில் அழை</string>
+  <string name="call_other_fax">தொலைநகல் எண்ணில் அழை</string>
+  <string name="call_radio">ரேடியோ தொலைபேசி எண்ணில் அழை</string>
+  <string name="call_telex">டெலக்ஸ் எண்ணில் அழை</string>
+  <string name="call_tty_tdd">TTY/TDD தொலைபேசி எண்ணில் அழை</string>
+  <string name="call_work_mobile">பணியிட மொபைல் எண்ணில் அழை</string>
+  <string name="call_work_pager">பணியிடத்தின் பேஜர் எண்ணில் அழை</string>
+  <string name="call_assistant">%s ஐ அழை</string>
+  <string name="call_mms">MMS தொலைபேசி எண்ணில் அழை</string>
+  <string name="sms_custom">%s க்கு உரைச்செய்தி அனுப்பு</string>
+  <string name="sms_home">வீட்டு தொலைபேசி எண்ணிற்கு உரைச்செய்தி அனுப்பு</string>
+  <string name="sms_mobile">மொபைல் எண்ணிற்கு உரைச்செய்தி அனுப்பு</string>
+  <string name="sms_work">பணியிட தொலைபேசி எண்ணிற்கு உரைச்செய்தி அனுப்பு</string>
+  <string name="sms_fax_work">பணியிட தொலைநகல் எண்ணிற்கு உரைச்செய்தி அனுப்பு</string>
+  <string name="sms_fax_home">வீட்டு தொலைநகல் எண்ணிற்கு உரைச்செய்தி அனுப்பு</string>
+  <string name="sms_pager">பேஜர் எண்ணிற்கு உரைச்செய்தி அனுப்பு</string>
+  <string name="sms_other">உரை</string>
+  <string name="sms_callback">அழைத்த எண்ணிற்கு உரைச்செய்தி அனுப்பு</string>
+  <string name="sms_car">காரின் தொலைபேசி எண்ணிற்கு உரைச்செய்தி அனுப்பு</string>
+  <string name="sms_company_main">நிறுவனத்தின் முதன்மை மொபைல் எண்ணிற்கு உரைச்செய்தி அனுப்பு</string>
+  <string name="sms_isdn">ISDN தொலைபேசி எண்ணிற்கு உரைச்செய்தி அனுப்பு</string>
+  <string name="sms_main">முதன்மைத் தொலைபேசி எண்ணிற்கு உரைச்செய்தி அனுப்பு</string>
+  <string name="sms_other_fax">தொலைநகல் எண்ணிற்கு உரைச்செய்தி அனுப்பு</string>
+  <string name="sms_radio">ரேடியோ தொலைபேசி எண்ணிற்கு உரைச்செய்தி அனுப்பு</string>
+  <string name="sms_telex">டெலக்ஸ் எண்ணிற்கு உரைச்செய்தி அனுப்பு</string>
+  <string name="sms_tty_tdd">TTY/TDD தொலைபேசி எண்ணிற்கு உரைச்செய்தி அனுப்பு</string>
+  <string name="sms_work_mobile">பணியிட மொபைல் எண்ணிற்கு உரைச்செய்தி அனுப்பு</string>
+  <string name="sms_work_pager">பணியிட பேஜர் எண்ணிற்கு உரைச்செய்தி அனுப்பு</string>
+  <string name="sms_assistant">%s க்கு உரைச்செய்தி அனுப்பு</string>
+  <string name="sms_mms">MMS மொபைல் எண்ணிற்கு உரைச்செய்தி அனுப்பு</string>
+  <string name="clearFrequentsConfirmation_title">அடிக்கடி தொடர்புகொண்ட தொடர்பை அழிக்கவா?</string>
+  <string name="clearFrequentsConfirmation">தொடர்புகள் மற்றும் ஃபோன் பயன்பாடுகளில் உள்ள அடிக்கடி தொடர்பு கொண்டவர்களின் பட்டியல் அழிக்கப்பட்டு, தொடக்கத்திலிருந்து மீண்டும் உங்கள் முகவரியிடல் விருப்பத்தேர்வுகளை மின்னஞ்சல் பயன்பாடுகள் அறியும்படி செய்யப்படும்.</string>
+  <string name="clearFrequentsProgress_title">அடிக்கடித் தொடர்புகொண்ட தொடர்பை அழிக்கிறது…</string>
+  <string name="status_available">இருக்கிறார்</string>
+  <string name="status_away">வெளியே</string>
+  <string name="status_busy">பணிமிகுதி</string>
+  <string name="contactsList">தொடர்புகள்</string>
+  <string name="contact_suggestions">அதிகம் பரிந்துரைத்தவை</string>
+  <string name="local_invisible_directory">மற்றவை</string>
+  <string name="directory_search_label">கோப்பகம்</string>
+  <string name="directory_search_label_work">பணிக் கோப்பகம்</string>
+  <string name="local_search_label">எல்லா தொடர்புகளும்</string>
+  <string name="local_suggestions_search_label">பரிந்துரைகள்</string>
+  <string msgid="9154761216179882405" name="user_profile_contacts_list_header">எனக்கு</string>
+  <string name="missing_name">(பெயர் இல்லை)</string>
+  <string msgid="2795575601596468581" name="description_view_contact_detail">தொடர்பைக் காட்டும் பொத்தான்</string>
+  <string name="list_filter_phones">மொபைல் எண்களுடனான எல்லா தொடர்புகளும்</string>
+  <string name="list_filter_phones_work">பணிச் சுயவிவரத் தொடர்புகள்</string>
+  <string name="view_updates_from_group">புதுப்பிப்புகளைக் காட்டு</string>
+  <string name="account_phone">சாதனத்தில் மட்டும், ஒத்திசைக்கப்படாது</string>
+  <string name="nameLabelsGroup">பெயர்</string>
+  <string name="nicknameLabelsGroup">செல்லப்பெயர்</string>
+  <string name="full_name">பெயர்</string>
+  <string name="name_given">முதல் பெயர்</string>
+  <string name="name_family">இறுதிப் பெயர்</string>
+  <string name="name_prefix">பெயரின் முன்னொட்டு</string>
+  <string name="name_middle">பெயரின் நடுப்பகுதி</string>
+  <string name="name_suffix">பெயரின் பின்னொட்டு</string>
+  <string name="name_phonetic">ஒலிப்புமுறை பெயர்</string>
+  <string name="name_phonetic_given">ஒலிப்புமுறை முதல் பெயர்</string>
+  <string name="name_phonetic_middle">ஒலிப்புமுறையில் பெயரின் நடுப்பகுதி</string>
+  <string name="name_phonetic_family">ஒலிப்புமுறை இறுதிப் பெயர்</string>
+  <string name="phoneLabelsGroup">மொபைல்</string>
+  <string name="emailLabelsGroup">மின்னஞ்சல்</string>
+  <string name="postalLabelsGroup">முகவரி</string>
+  <string name="imLabelsGroup">IM</string>
+  <string name="organizationLabelsGroup">நிறுவனம்</string>
+  <string name="relationLabelsGroup">உறவுமுறை</string>
+  <string name="eventLabelsGroup">சிறப்புத் தேதி</string>
+  <string name="sms">உரைச் செய்தி</string>
+  <string name="postal_address">முகவரி</string>
+  <string name="ghostData_company">நிறுவனம்</string>
+  <string name="ghostData_title">தலைப்பு</string>
+  <string name="label_notes">குறிப்புகள்</string>
+  <string name="label_sip_address">SIP</string>
+  <string name="websiteLabelsGroup">இணையதளம்</string>
+  <string name="groupsLabel">குழுக்கள்</string>
+  <string name="email_home">வீட்டு மின்னஞ்சல் முகவரிக்கு மின்னஞ்சல் அனுப்பு</string>
+  <string name="email_mobile">மொபைல் மின்னஞ்சல் முகவரிக்கு மின்னஞ்சல் அனுப்பு</string>
+  <string name="email_work">பணியிட மின்னஞ்சல் முகவரிக்கு மின்னஞ்சல் அனுப்பு</string>
+  <string name="email_other">மின்னஞ்சல்</string>
+  <string name="email_custom">%s க்கு மின்னஞ்சல் அனுப்பு</string>
+  <string name="email">மின்னஞ்சல்</string>
+  <string name="postal_street">தெரு</string>
+  <string name="postal_city">நகரம்</string>
+  <string name="postal_region">மாநிலம்</string>
+  <string name="postal_postcode">ஜிப் குறியீடு</string>
+  <string name="postal_country">நாடு</string>
+  <string name="map_home">வீட்டு முகவரியைக் காட்டு</string>
+  <string name="map_work">பணியிட முகவரியைக் காட்டு</string>
+  <string name="map_other">முகவரியைக் காட்டு</string>
+  <string name="map_custom">%s முகவரியைக் காட்டு</string>
+  <string name="chat_aim">AIM இல் அரட்டையடி</string>
+  <string name="chat_msn">Windows Live இல் அரட்டையடி</string>
+  <string name="chat_yahoo">Yahoo இல் அரட்டையடி</string>
+  <string name="chat_skype">Skype இல் அரட்டையடி</string>
+  <string name="chat_qq">QQ இல் அரட்டையடி</string>
+  <string name="chat_gtalk">Google Talk இல் அரட்டையடி</string>
+  <string name="chat_icq">ICQ இல் அரட்டையடி</string>
+  <string name="chat_jabber">Jabber இல் அரட்டையடி</string>
+  <string name="chat">அரட்டை</string>
+  <string name="list_filter_all_accounts">எல்லா தொடர்புகளும்</string>
+  <string name="listAllContactsInAccount">%s இல் உள்ள தொடர்புகள்</string>
+  <string name="listCustomView">தனிப்பயன் காட்சியில் உள்ள தொடர்புகள்</string>
+  <string name="listSingleContact">ஒரு தொடர்பு</string>
+  <string name="display_options_sort_list_by">வரிசைப்படுத்து</string>
+  <string name="display_options_sort_by_given_name">முதல் பெயர்</string>
+  <string name="display_options_sort_by_family_name">இறுதிப் பெயர்</string>
+  <string name="display_options_view_names_as">பெயர் வடிவம்</string>
+  <string name="display_options_view_given_name_first">முதல் பெயர் முதலில்</string>
+  <string name="display_options_view_family_name_first">இறுதிப் பெயர் முதலில்</string>
+  <string name="menu_clear_frequents">அடிக்கடி தொடர்புகொண்டவர்களை அழி</string>
+  <string name="action_menu_back_from_search">தேடுவதை நிறுத்து</string>
+  <string name="description_clear_search">தேடலை அழி</string>
+  <string name="select_account_dialog_title">கணக்கு</string>
+  <string name="set_default_account">அழைப்புகளுக்கு எப்போதும் இதைப் பயன்படுத்து</string>
+  <string name="select_phone_account_for_calls">இந்த அழைப்பிற்கான சிம்மைத் தேர்வுசெய்க</string>
+  <string name="select_phone_account_for_calls_remember">இந்த விருப்பத்தை நினைவில்கொள்</string>
+  <string name="call_with_a_note">குறிப்புடன் அழைக்கவும்</string>
+  <string name="call_subject_hint">அழைப்புடன் சேர்த்து அனுப்ப, குறிப்பை உள்ளிடவும்...</string>
+  <string name="send_and_call_button">அனுப்பி அழை</string>
+  <string name="call_subject_limit">%1$s / %2$s</string>
+  <string name="old_call_subject_type_and_number">%1$s %2$s</string>
+  <string name="tab_title">%1$s தாவல்.</string>
+  <plurals name="tab_title_with_unread_items">
+    <item quantity="one"> %1$s தாவல். படிக்காதது (%2$d). </item>
+    <item quantity="other"> %1$s தாவல். படிக்காதவை (%2$d). </item>
+  </plurals>
+  <string name="description_search_video_call">வீடியோ அழைப்பைத் தொடங்குவதற்கான பொத்தான்</string>
+  <string name="description_search_call_and_share">பகிர்ந்து அழைப்பதற்கான பொத்தான்</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-te/strings.xml b/java/com/android/contacts/common/res/values-te/strings.xml
index b1f2214..8f0ac22 100644
--- a/java/com/android/contacts/common/res/values-te/strings.xml
+++ b/java/com/android/contacts/common/res/values-te/strings.xml
@@ -1,162 +1,145 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="toast_text_copied" msgid="8979281391599667362">"వచనం కాపీ చేయబడింది"</string>
-    <string name="call_custom" msgid="3041673234638990874">"<xliff:g id="CUSTOM">%s</xliff:g>కు కాల్ చేయండి"</string>
-    <string name="call_home" msgid="125893483593803791">"ఇంటికి కాల్ చేయండి"</string>
-    <string name="call_mobile" msgid="967589404494150813">"మొబైల్‌కు కాల్ చేయండి"</string>
-    <string name="call_work" msgid="6040550697395300892">"కార్యాలయానికి కాల్ చేయండి"</string>
-    <string name="call_fax_work" msgid="5260192771364592922">"కార్యాలయ ఫ్యాక్స్‌కు కాల్ చేయండి"</string>
-    <string name="call_fax_home" msgid="5174311195081144124">"ఇంటి ఫ్యాక్స్‌కు కాల్ చేయండి"</string>
-    <string name="call_pager" msgid="6814149227741274161">"పేజర్‌కు కాల్ చేయండి"</string>
-    <string name="call_other" msgid="5536385588712587235">"కాల్ చేయండి"</string>
-    <string name="call_callback" msgid="6314019862718112786">"కాల్‌బ్యాక్‌కు కాల్ చేయండి"</string>
-    <string name="call_car" msgid="3197417098027764954">"కారుకు కాల్ చేయండి"</string>
-    <string name="call_company_main" msgid="2557663310028446397">"కంపెనీ ప్రధాన నంబర్‌కు కాల్ చేయండి"</string>
-    <string name="call_isdn" msgid="4691270442763649522">"ISDNకి కాల్ చేయండి"</string>
-    <string name="call_main" msgid="3293707608770407814">"ప్రధాన నంబర్‌కు కాల్ చేయండి"</string>
-    <string name="call_other_fax" msgid="4724521984879021465">"ఫ్యాక్స్‌కు కాల్ చేయండి"</string>
-    <string name="call_radio" msgid="8942441419845057942">"రేడియోకు కాల్ చేయండి"</string>
-    <string name="call_telex" msgid="2031514461660668351">"టెలెక్స్‌కు కాల్ చేయండి"</string>
-    <string name="call_tty_tdd" msgid="7807210224965727701">"TTY/TDDకి కాల్ చేయండి"</string>
-    <string name="call_work_mobile" msgid="2716342732938578495">"కార్యాలయ మొబైల్‌కు కాల్ చేయండి"</string>
-    <string name="call_work_pager" msgid="3791778749827366574">"కార్యాలయ పేజర్‌కు కాల్ చేయండి"</string>
-    <string name="call_assistant" msgid="4177478845473789294">"<xliff:g id="ASSISTANT">%s</xliff:g>కు కాల్ చేయండి"</string>
-    <string name="call_mms" msgid="4958811711741872901">"MMSకు కాల్ చేయండి"</string>
-    <string name="sms_custom" msgid="8785368968605026317">"<xliff:g id="CUSTOM">%s</xliff:g>కు వచనం పంపండి"</string>
-    <string name="sms_home" msgid="3527719551060295243">"ఇంటికి వచనం పంపండి"</string>
-    <string name="sms_mobile" msgid="8883045857887736518">"మొబైల్‌కు వచనం పంపండి"</string>
-    <string name="sms_work" msgid="4158595439553450966">"కార్యాలయానికి వచనం పంపండి"</string>
-    <string name="sms_fax_work" msgid="5483726627718055248">"కార్యాలయం ఫ్యాక్స్‌కు వచనం పంపండి"</string>
-    <string name="sms_fax_home" msgid="9219265155770746077">"ఇంటి ఫ్యాక్స్‌కు వచనం పంపండి"</string>
-    <string name="sms_pager" msgid="4901085068525193933">"పేజర్‌కు వచనం పంపండి"</string>
-    <string name="sms_other" msgid="1742702947993285933">"వచనం పంపండి"</string>
-    <string name="sms_callback" msgid="5833483630377538308">"కాల్‌బ్యాక్‌కు వచనం పంపండి"</string>
-    <string name="sms_car" msgid="4314577266154395174">"కారుకు వచనం పంపండి"</string>
-    <string name="sms_company_main" msgid="2308160928487360705">"కంపెనీ ప్రధాన నంబర్‌కు వచనం పంపండి"</string>
-    <string name="sms_isdn" msgid="6394300346179302542">"ISDNకి వచనం పంపండి"</string>
-    <string name="sms_main" msgid="8908087742014140774">"ప్రధాన నంబర్‌కు వచనం పంపండి"</string>
-    <string name="sms_other_fax" msgid="8768455473295405427">"ఫ్యాక్స్‌కు వచనం పంపండి"</string>
-    <string name="sms_radio" msgid="855555176531704682">"రేడియోకు వచనం పంపండి"</string>
-    <string name="sms_telex" msgid="6269029276223252719">"టెలెక్స్‌కు వచనం పంపండి"</string>
-    <string name="sms_tty_tdd" msgid="6229057354509192444">"TTY/TDDకి వచనం పంపండి"</string>
-    <string name="sms_work_mobile" msgid="2155975469329969840">"కార్యాలయ మొబైల్‌కు వచనం పంపండి"</string>
-    <string name="sms_work_pager" msgid="8500140274906830742">"కార్యాలయ పేజర్‌కు వచనం పంపండి"</string>
-    <string name="sms_assistant" msgid="8513548482745330818">"<xliff:g id="ASSISTANT">%s</xliff:g>కు వచనం పంపండి"</string>
-    <string name="sms_mms" msgid="5187888900503248542">"MMSకు వచనం పంపండి"</string>
-    <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"తరచుగా సంప్రదించినవాటిని క్లియర్ చేయాలా?"</string>
-    <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"మీరు పరిచయాలు మరియు ఫోన్ అనువర్తనాల్లో తరచుగా సంప్రదించిన పరిచయాల జాబితాను తీసివేస్తారు మరియు స్క్రాచ్ నుండి మీ చిరునామా ప్రాధాన్యతలను తెలుసుకునేలా ఇమెయిల్ అనువర్తనాలను నిర్బంధిస్తారు."</string>
-    <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"తరచుగా సంప్రదించినవాటిని క్లియర్ చేస్తోంది…"</string>
-    <string name="status_available" msgid="2648156525685472626">"అందుబాటులో ఉన్నారు"</string>
-    <string name="status_away" msgid="2298688367552893953">"దూరంగా ఉన్నారు"</string>
-    <string name="status_busy" msgid="5990832098713248503">"బిజీగా ఉన్నారు"</string>
-    <string name="contactsList" msgid="8806067891419291513">"పరిచయాలు"</string>
-    <string name="contact_suggestions" msgid="3324166754807120006">"ఉత్తమ సూచనలు"</string>
-    <string name="local_invisible_directory" msgid="4723238462733650090">"ఇతరం"</string>
-    <string name="directory_search_label" msgid="4621215895484025229">"డైరెక్టరీ"</string>
-    <string name="directory_search_label_work" msgid="7679326282707414897">"కార్యాలయ డైరెక్టరీ"</string>
-    <string name="local_search_label" msgid="907622822323119235">"అన్ని పరిచయాలు"</string>
-    <string name="local_suggestions_search_label" msgid="1178575146224386118">"సూచనలు"</string>
-    <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"నేను"</string>
-    <string name="missing_name" msgid="978606963362745020">"(పేరు లేదు)"</string>
-    <string name="description_view_contact_detail" msgid="2428742401208561136">"పరిచయాన్ని వీక్షించండి"</string>
-    <string name="list_filter_phones" msgid="8763316061763437182">"ఫోన్ నంబర్‌లు గల అన్ని పరిచయాలు"</string>
-    <string name="list_filter_phones_work" msgid="7083575404573422965">"కార్యాలయ ప్రొఫైల్ పరిచయాలు"</string>
-    <string name="view_updates_from_group" msgid="9011641093168385729">"నవీకరణలను వీక్షించండి"</string>
-    <string name="account_phone" msgid="7067809073194061035">"పరికరంలో మాత్రమే ఉంటుంది, సమకాలీకరించబడదు"</string>
-    <string name="nameLabelsGroup" msgid="7730465833159557471">"పేరు"</string>
-    <string name="nicknameLabelsGroup" msgid="6310556912361840029">"మారుపేరు"</string>
-    <string name="full_name" msgid="648186563998465740">"పేరు"</string>
-    <string name="name_given" msgid="5096576006314820536">"మొదటి పేరు"</string>
-    <string name="name_family" msgid="6646235805198547467">"చివరి పేరు"</string>
-    <string name="name_prefix" msgid="9215326539658838">"పేరు ఆదిప్రత్యయం"</string>
-    <string name="name_middle" msgid="703755205331582769">"మధ్య పేరు"</string>
-    <string name="name_suffix" msgid="5777083390282548702">"పేరు అంత్యప్రత్యయం"</string>
-    <string name="name_phonetic" msgid="1650870996361663089">"ఫొనెటిక్ పేరు"</string>
-    <string name="name_phonetic_given" msgid="618812334274603170">"ఫొనెటిక్ మొదటి పేరు"</string>
-    <string name="name_phonetic_middle" msgid="4826820763384625538">"ఫొనెటిక్ మధ్య పేరు"</string>
-    <string name="name_phonetic_family" msgid="379905191212930771">"ఫొనెటిక్ చివరి పేరు"</string>
-    <string name="phoneLabelsGroup" msgid="169661929021355548">"ఫోన్"</string>
-    <string name="emailLabelsGroup" msgid="2249752810477488833">"ఇమెయిల్ చేయండి"</string>
-    <string name="postalLabelsGroup" msgid="6772000590189142253">"చిరునామా"</string>
-    <string name="imLabelsGroup" msgid="5718066254237364731">"IM"</string>
-    <string name="organizationLabelsGroup" msgid="1101996309241601435">"సంస్థ"</string>
-    <string name="relationLabelsGroup" msgid="53866051664600053">"సంబంధం"</string>
-    <string name="eventLabelsGroup" msgid="1236970042646618489">"ప్రత్యేక తేదీ"</string>
-    <string name="sms" msgid="7574344928185328095">"వచన సందేశం"</string>
-    <string name="postal_address" msgid="1804707930129674200">"చిరునామా"</string>
-    <string name="ghostData_company" msgid="2554310786296833424">"కంపెనీ"</string>
-    <string name="ghostData_title" msgid="4994968731830184837">"శీర్షిక"</string>
-    <string name="label_notes" msgid="2050255313694219786">"గమనికలు"</string>
-    <string name="label_sip_address" msgid="8883266182575965926">"SIP"</string>
-    <string name="websiteLabelsGroup" msgid="1630734286462186790">"వెబ్‌సైట్"</string>
-    <string name="groupsLabel" msgid="2694002798416868728">"సమూహాలు"</string>
-    <string name="email_home" msgid="889830029388962171">"ఇంటికి ఇమెయిల్ చేయండి"</string>
-    <string name="email_mobile" msgid="4487686436743741150">"మొబైల్‌కు ఇమెయిల్ చేయండి"</string>
-    <string name="email_work" msgid="4223487303344613528">"కార్యాలయానికి ఇమెయిల్ చేయండి"</string>
-    <string name="email_other" msgid="4246411900126012062">"ఇమెయిల్ చేయండి"</string>
-    <string name="email_custom" msgid="7246580894327511013">"<xliff:g id="CUSTOM">%s</xliff:g>కు ఇమెయిల్ చేయండి"</string>
-    <string name="email" msgid="2807318537887091606">"ఇమెయిల్ చేయండి"</string>
-    <string name="postal_street" msgid="6918171741240802474">"వీధి"</string>
-    <string name="postal_city" msgid="8674569121430005628">"నగరం"</string>
-    <string name="postal_region" msgid="1730369286225469192">"రాష్ట్రం"</string>
-    <string name="postal_postcode" msgid="4450700741261990439">"జిప్ కోడ్"</string>
-    <string name="postal_country" msgid="232670707458768148">"దేశం"</string>
-    <string name="map_home" msgid="4181131107392126938">"ఇంటి చిరునామాను వీక్షించండి"</string>
-    <string name="map_work" msgid="5723471185992684400">"కార్యాలయ చిరునామాను వీక్షించండి"</string>
-    <string name="map_other" msgid="2253764780863500516">"చిరునామాను వీక్షించండి"</string>
-    <string name="map_custom" msgid="5581743097882436157">"<xliff:g id="CUSTOM">%s</xliff:g> చిరునామాను వీక్షించండి"</string>
-    <string name="chat_aim" msgid="2954364435497941659">"AIMని ఉపయోగించి చాట్ చేయండి"</string>
-    <string name="chat_msn" msgid="3130135239071228678">"Windows Liveని ఉపయోగించి చాట్ చేయండి"</string>
-    <string name="chat_yahoo" msgid="3233552142326865347">"Yahooని ఉపయోగించి చాట్ చేయండి"</string>
-    <string name="chat_skype" msgid="6486703981390592425">"Skypeని ఉపయోగించి చాట్ చేయండి"</string>
-    <string name="chat_qq" msgid="786924280665740019">"QQని ఉపయోగించి చాట్ చేయండి"</string>
-    <string name="chat_gtalk" msgid="7914674177243078035">"Google Talkని ఉపయోగించి చాట్ చేయండి"</string>
-    <string name="chat_icq" msgid="3292934726414765801">"ICQని ఉపయోగించి చాట్ చేయండి"</string>
-    <string name="chat_jabber" msgid="6701542313597880204">"Jabberని ఉపయోగించి చాట్ చేయండి"</string>
-    <string name="chat" msgid="1020428260359370236">"చాట్ చేయండి"</string>
-    <string name="list_filter_all_accounts" msgid="473782314881473992">"అన్ని పరిచయాలు"</string>
-    <string name="listAllContactsInAccount" msgid="3486378621592995630">"<xliff:g id="NAME">%s</xliff:g>లో పరిచయాలు"</string>
-    <string name="listCustomView" msgid="5306282632413086731">"అనుకూల వీక్షణలో పరిచయాలు"</string>
-    <string name="listSingleContact" msgid="8620818791932382627">"ఒక పరిచయం"</string>
-    <string name="display_options_sort_list_by" msgid="3541875948367831228">"ఇలా క్రమబద్ధీకరించు"</string>
-    <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"మొదటి పేరు"</string>
-    <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"చివరి పేరు"</string>
-    <string name="display_options_view_names_as" msgid="4204204205736735618">"పేరు ఆకృతి"</string>
-    <string name="display_options_view_given_name_first" msgid="2308026973021171020">"ముందుగా మొదటి పేరు"</string>
-    <string name="display_options_view_family_name_first" msgid="987430497292428242">"ముందుగా చివరి పేరు"</string>
-    <string name="menu_clear_frequents" msgid="5358271535047496120">"తరచుగా ఉన్నవాటిని క్లియర్ చేయి"</string>
-    <string name="action_menu_back_from_search" msgid="3550669942742167644">"శోధించడం ఆపివేయి"</string>
-    <string name="description_clear_search" msgid="2347258825265600782">"శోధనను క్లియర్ చేయి"</string>
-    <string name="select_account_dialog_title" msgid="2673504582803359239">"ఖాతా"</string>
-    <string name="set_default_account" msgid="7966099951006467572">"కాల్‌ల కోసం ఎల్లప్పుడూ దీన్ని ఉపయోగించు"</string>
-    <string name="select_phone_account_for_calls" msgid="1784460686103423274">"దీనితో కాల్ చేయండి"</string>
-    <string name="call_with_a_note" msgid="6242261320491851133">"గమనికతో కాల్ చేయి"</string>
-    <string name="call_subject_hint" msgid="7233138753650420800">"కాల్‌తో పాటు పంపడానికి గమనికను టైప్ చేయండి ..."</string>
-    <string name="send_and_call_button" msgid="4735168294120154013">"పంపు &amp; కాల్ చేయి"</string>
-    <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="tab_title" msgid="3387876802026074288">"<xliff:g id="TITLE">%1$s</xliff:g> ట్యాబ్."</string>
-    <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
-      <item quantity="other"> <xliff:g id="TITLE_2">%1$s</xliff:g> ట్యాబ్. <xliff:g id="COUNT_3">%2$d</xliff:g> చదవని అంశాలు. </item>
-      <item quantity="one"> <xliff:g id="TITLE_0">%1$s</xliff:g> ట్యాబ్. <xliff:g id="COUNT_1">%2$d</xliff:g> చదవని అంశం. </item>
-    </plurals>
-    <string name="description_search_video_call" msgid="4337369876888024909">"వీడియో కాల్"</string>
-    <string name="description_search_call_and_share" msgid="4912772842755050467">"భాగస్వామ్యం చేసి, కాల్ చేయి"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_custom">%sకు కాల్ చేయండి</string>
+  <string name="call_home">ఇంటికి కాల్ చేయండి</string>
+  <string name="call_mobile">మొబైల్‌కు కాల్ చేయండి</string>
+  <string name="call_work">కార్యాలయానికి కాల్ చేయండి</string>
+  <string name="call_fax_work">కార్యాలయ ఫ్యాక్స్‌కు కాల్ చేయండి</string>
+  <string name="call_fax_home">ఇంటి ఫ్యాక్స్‌కు కాల్ చేయండి</string>
+  <string name="call_pager">పేజర్‌కు కాల్ చేయండి</string>
+  <string name="call_other">కాల్ చేయండి</string>
+  <string name="call_callback">కాల్‌బ్యాక్‌కు కాల్ చేయండి</string>
+  <string name="call_car">కారుకు కాల్ చేయండి</string>
+  <string name="call_company_main">కంపెనీ ప్రధాన నంబర్‌కు కాల్ చేయండి</string>
+  <string name="call_isdn">ISDNకి కాల్ చేయండి</string>
+  <string name="call_main">ప్రధాన నంబర్‌కు కాల్ చేయండి</string>
+  <string name="call_other_fax">ఫ్యాక్స్‌కు కాల్ చేయండి</string>
+  <string name="call_radio">రేడియోకు కాల్ చేయండి</string>
+  <string name="call_telex">టెలెక్స్‌కు కాల్ చేయండి</string>
+  <string name="call_tty_tdd">TTY/TDDకి కాల్ చేయండి</string>
+  <string name="call_work_mobile">కార్యాలయ మొబైల్‌కు కాల్ చేయండి</string>
+  <string name="call_work_pager">కార్యాలయ పేజర్‌కు కాల్ చేయండి</string>
+  <string name="call_assistant">%sకు కాల్ చేయండి</string>
+  <string name="call_mms">MMSకు కాల్ చేయండి</string>
+  <string name="sms_custom">%sకు వచనం పంపండి</string>
+  <string name="sms_home">ఇంటికి వచనం పంపండి</string>
+  <string name="sms_mobile">మొబైల్‌కు వచనం పంపండి</string>
+  <string name="sms_work">కార్యాలయానికి వచనం పంపండి</string>
+  <string name="sms_fax_work">కార్యాలయం ఫ్యాక్స్‌కు వచనం పంపండి</string>
+  <string name="sms_fax_home">ఇంటి ఫ్యాక్స్‌కు వచనం పంపండి</string>
+  <string name="sms_pager">పేజర్‌కు వచనం పంపండి</string>
+  <string name="sms_other">వచనం పంపండి</string>
+  <string name="sms_callback">కాల్‌బ్యాక్‌కు వచనం పంపండి</string>
+  <string name="sms_car">కారుకు వచనం పంపండి</string>
+  <string name="sms_company_main">కంపెనీ ప్రధాన నంబర్‌కు వచనం పంపండి</string>
+  <string name="sms_isdn">ISDNకి వచనం పంపండి</string>
+  <string name="sms_main">ప్రధాన నంబర్‌కు వచనం పంపండి</string>
+  <string name="sms_other_fax">ఫ్యాక్స్‌కు వచనం పంపండి</string>
+  <string name="sms_radio">రేడియోకు వచనం పంపండి</string>
+  <string name="sms_telex">టెలెక్స్‌కు వచనం పంపండి</string>
+  <string name="sms_tty_tdd">TTY/TDDకి వచనం పంపండి</string>
+  <string name="sms_work_mobile">కార్యాలయ మొబైల్‌కు వచనం పంపండి</string>
+  <string name="sms_work_pager">కార్యాలయ పేజర్‌కు వచనం పంపండి</string>
+  <string name="sms_assistant">%sకు వచనం పంపండి</string>
+  <string name="sms_mms">MMSకు వచనం పంపండి</string>
+  <string name="clearFrequentsConfirmation_title">తరచుగా సంప్రదించినవాటిని క్లియర్ చేయాలా?</string>
+  <string name="clearFrequentsConfirmation">మీరు పరిచయాలు మరియు ఫోన్ అనువర్తనాల్లో తరచుగా సంప్రదించిన పరిచయాల జాబితాను తీసివేస్తారు మరియు స్క్రాచ్ నుండి మీ చిరునామా ప్రాధాన్యతలను తెలుసుకునేలా ఇమెయిల్ అనువర్తనాలను నిర్బంధిస్తారు.</string>
+  <string name="clearFrequentsProgress_title">తరచుగా సంప్రదించినవాటిని క్లియర్ చేస్తోంది…</string>
+  <string name="status_available">అందుబాటులో ఉన్నారు</string>
+  <string name="status_away">దూరంగా ఉన్నారు</string>
+  <string name="status_busy">బిజీగా ఉన్నారు</string>
+  <string name="contactsList">పరిచయాలు</string>
+  <string name="contact_suggestions">ఉత్తమ సూచనలు</string>
+  <string name="local_invisible_directory">ఇతరం</string>
+  <string name="directory_search_label">డైరెక్టరీ</string>
+  <string name="directory_search_label_work">కార్యాలయ డైరెక్టరీ</string>
+  <string name="local_search_label">అన్ని పరిచయాలు</string>
+  <string name="local_suggestions_search_label">సూచనలు</string>
+  <string msgid="9154761216179882405" name="user_profile_contacts_list_header">నేను</string>
+  <string name="missing_name">(పేరు లేదు)</string>
+  <string msgid="2795575601596468581" name="description_view_contact_detail">పరిచయాన్ని వీక్షించండి</string>
+  <string name="list_filter_phones">ఫోన్ నంబర్‌లు గల అన్ని పరిచయాలు</string>
+  <string name="list_filter_phones_work">కార్యాలయ ప్రొఫైల్ పరిచయాలు</string>
+  <string name="view_updates_from_group">నవీకరణలను వీక్షించండి</string>
+  <string name="account_phone">పరికరంలో మాత్రమే ఉంటుంది, సమకాలీకరించబడదు</string>
+  <string name="nameLabelsGroup">పేరు</string>
+  <string name="nicknameLabelsGroup">మారుపేరు</string>
+  <string name="full_name">పేరు</string>
+  <string name="name_given">మొదటి పేరు</string>
+  <string name="name_family">చివరి పేరు</string>
+  <string name="name_prefix">పేరు ఆదిప్రత్యయం</string>
+  <string name="name_middle">మధ్య పేరు</string>
+  <string name="name_suffix">పేరు అంత్యప్రత్యయం</string>
+  <string name="name_phonetic">ఫొనెటిక్ పేరు</string>
+  <string name="name_phonetic_given">ఫొనెటిక్ మొదటి పేరు</string>
+  <string name="name_phonetic_middle">ఫొనెటిక్ మధ్య పేరు</string>
+  <string name="name_phonetic_family">ఫొనెటిక్ చివరి పేరు</string>
+  <string name="phoneLabelsGroup">ఫోన్</string>
+  <string name="emailLabelsGroup">ఇమెయిల్ చేయండి</string>
+  <string name="postalLabelsGroup">చిరునామా</string>
+  <string name="imLabelsGroup">IM</string>
+  <string name="organizationLabelsGroup">సంస్థ</string>
+  <string name="relationLabelsGroup">సంబంధం</string>
+  <string name="eventLabelsGroup">ప్రత్యేక తేదీ</string>
+  <string name="sms">వచన సందేశం</string>
+  <string name="postal_address">చిరునామా</string>
+  <string name="ghostData_company">కంపెనీ</string>
+  <string name="ghostData_title">శీర్షిక</string>
+  <string name="label_notes">గమనికలు</string>
+  <string name="label_sip_address">SIP</string>
+  <string name="websiteLabelsGroup">వెబ్‌సైట్</string>
+  <string name="groupsLabel">సమూహాలు</string>
+  <string name="email_home">ఇంటికి ఇమెయిల్ చేయండి</string>
+  <string name="email_mobile">మొబైల్‌కు ఇమెయిల్ చేయండి</string>
+  <string name="email_work">కార్యాలయానికి ఇమెయిల్ చేయండి</string>
+  <string name="email_other">ఇమెయిల్ చేయండి</string>
+  <string name="email_custom">%sకు ఇమెయిల్ చేయండి</string>
+  <string name="email">ఇమెయిల్ చేయండి</string>
+  <string name="postal_street">వీధి</string>
+  <string name="postal_city">నగరం</string>
+  <string name="postal_region">రాష్ట్రం</string>
+  <string name="postal_postcode">జిప్ కోడ్</string>
+  <string name="postal_country">దేశం</string>
+  <string name="map_home">ఇంటి చిరునామాను వీక్షించండి</string>
+  <string name="map_work">కార్యాలయ చిరునామాను వీక్షించండి</string>
+  <string name="map_other">చిరునామాను వీక్షించండి</string>
+  <string name="map_custom">%s చిరునామాను వీక్షించండి</string>
+  <string name="chat_aim">AIMని ఉపయోగించి చాట్ చేయండి</string>
+  <string name="chat_msn">Windows Liveని ఉపయోగించి చాట్ చేయండి</string>
+  <string name="chat_yahoo">Yahooని ఉపయోగించి చాట్ చేయండి</string>
+  <string name="chat_skype">Skypeని ఉపయోగించి చాట్ చేయండి</string>
+  <string name="chat_qq">QQని ఉపయోగించి చాట్ చేయండి</string>
+  <string name="chat_gtalk">Google Talkని ఉపయోగించి చాట్ చేయండి</string>
+  <string name="chat_icq">ICQని ఉపయోగించి చాట్ చేయండి</string>
+  <string name="chat_jabber">Jabberని ఉపయోగించి చాట్ చేయండి</string>
+  <string name="chat">చాట్ చేయండి</string>
+  <string name="list_filter_all_accounts">అన్ని పరిచయాలు</string>
+  <string name="listAllContactsInAccount">%sలో పరిచయాలు</string>
+  <string name="listCustomView">అనుకూల వీక్షణలో పరిచయాలు</string>
+  <string name="listSingleContact">ఒక పరిచయం</string>
+  <string name="display_options_sort_list_by">ఇలా క్రమబద్ధీకరించు</string>
+  <string name="display_options_sort_by_given_name">మొదటి పేరు</string>
+  <string name="display_options_sort_by_family_name">చివరి పేరు</string>
+  <string name="display_options_view_names_as">పేరు ఆకృతి</string>
+  <string name="display_options_view_given_name_first">ముందుగా మొదటి పేరు</string>
+  <string name="display_options_view_family_name_first">ముందుగా చివరి పేరు</string>
+  <string name="menu_clear_frequents">తరచుగా ఉన్నవాటిని క్లియర్ చేయి</string>
+  <string name="action_menu_back_from_search">శోధించడం ఆపివేయి</string>
+  <string name="description_clear_search">శోధనను క్లియర్ చేయి</string>
+  <string name="select_account_dialog_title">ఖాతా</string>
+  <string name="set_default_account">కాల్‌ల కోసం ఎల్లప్పుడూ దీన్ని ఉపయోగించు</string>
+  <string name="select_phone_account_for_calls">ఈ కాల్ కోసం SIMని ఎంచుకోండి</string>
+  <string name="select_phone_account_for_calls_remember">ఈ ఎంపికను గుర్తుంచుకో</string>
+  <string name="call_with_a_note">గమనికతో కాల్ చేయి</string>
+  <string name="call_subject_hint">కాల్‌తో పాటు పంపడానికి గమనికను టైప్ చేయండి ...</string>
+  <string name="send_and_call_button">పంపు &amp; కాల్ చేయి</string>
+  <string name="call_subject_limit">%1$s / %2$s</string>
+  <string name="old_call_subject_type_and_number">%1$s %2$s</string>
+  <string name="tab_title">%1$s ట్యాబ్.</string>
+  <plurals name="tab_title_with_unread_items">
+    <item quantity="one"> %1$s ట్యాబ్. %2$d చదవని అంశం. </item>
+    <item quantity="other"> %1$s ట్యాబ్. %2$d చదవని అంశాలు. </item>
+  </plurals>
+  <string name="description_search_video_call">వీడియో కాల్</string>
+  <string name="description_search_call_and_share">భాగస్వామ్యం చేసి, కాల్ చేయి</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-th/strings.xml b/java/com/android/contacts/common/res/values-th/strings.xml
index a5f8e9e..0768e24 100644
--- a/java/com/android/contacts/common/res/values-th/strings.xml
+++ b/java/com/android/contacts/common/res/values-th/strings.xml
@@ -1,162 +1,145 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="toast_text_copied" msgid="8979281391599667362">"คัดลอกข้อความแล้ว"</string>
-    <string name="call_custom" msgid="3041673234638990874">"โทรหา <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="call_home" msgid="125893483593803791">"โทรเข้าบ้าน"</string>
-    <string name="call_mobile" msgid="967589404494150813">"โทรเข้ามือถือ"</string>
-    <string name="call_work" msgid="6040550697395300892">"โทรหาที่ทำงาน"</string>
-    <string name="call_fax_work" msgid="5260192771364592922">"โทรหาแฟกซ์ที่ทำงาน"</string>
-    <string name="call_fax_home" msgid="5174311195081144124">"โทรเข้าหมายเลขแฟกซ์ที่บ้าน"</string>
-    <string name="call_pager" msgid="6814149227741274161">"โทรหาเพจเจอร์"</string>
-    <string name="call_other" msgid="5536385588712587235">"โทร"</string>
-    <string name="call_callback" msgid="6314019862718112786">"โทรหาหมายเลขติดต่อกลับ"</string>
-    <string name="call_car" msgid="3197417098027764954">"โทรเข้าโทรศัพท์ในรถ"</string>
-    <string name="call_company_main" msgid="2557663310028446397">"โทรหาโทรศัพท์หลักของบริษัท"</string>
-    <string name="call_isdn" msgid="4691270442763649522">"โทรหา ISDN"</string>
-    <string name="call_main" msgid="3293707608770407814">"โทรเข้าโทรศัพท์หลัก"</string>
-    <string name="call_other_fax" msgid="4724521984879021465">"โทรเข้าหมายเลขแฟกซ์"</string>
-    <string name="call_radio" msgid="8942441419845057942">"โทรเข้าวิทยุ"</string>
-    <string name="call_telex" msgid="2031514461660668351">"โทรเข้าหมายเลขเทเล็กซ์"</string>
-    <string name="call_tty_tdd" msgid="7807210224965727701">"โทรหา TTY/TDD"</string>
-    <string name="call_work_mobile" msgid="2716342732938578495">"โทรเข้ามือถือที่ทำงาน"</string>
-    <string name="call_work_pager" msgid="3791778749827366574">"โทรเข้าเพจเจอร์ที่ทำงาน"</string>
-    <string name="call_assistant" msgid="4177478845473789294">"โทรหา <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
-    <string name="call_mms" msgid="4958811711741872901">"โทรหา MMS"</string>
-    <string name="sms_custom" msgid="8785368968605026317">"ส่งข้อความถึง <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="sms_home" msgid="3527719551060295243">"ส่งข้อความเข้าโทรศัพท์บ้าน"</string>
-    <string name="sms_mobile" msgid="8883045857887736518">"ส่งข้อความเข้ามือถือ"</string>
-    <string name="sms_work" msgid="4158595439553450966">"ส่งข้อความถึงโทรศัพท์ที่ทำงาน"</string>
-    <string name="sms_fax_work" msgid="5483726627718055248">"ส่งข้อความถึงแฟกซ์ที่ทำงาน"</string>
-    <string name="sms_fax_home" msgid="9219265155770746077">"ส่งข้อความเข้าหมายเลขแฟกซ์บ้าน"</string>
-    <string name="sms_pager" msgid="4901085068525193933">"ส่งข้อความถึงเพจเจอร์"</string>
-    <string name="sms_other" msgid="1742702947993285933">"ข้อความ"</string>
-    <string name="sms_callback" msgid="5833483630377538308">"ส่งข้อความถึงหมายเลขติดต่อกลับ"</string>
-    <string name="sms_car" msgid="4314577266154395174">"ส่งข้อความถึงรถยนต์"</string>
-    <string name="sms_company_main" msgid="2308160928487360705">"ส่งข้อความเข้าโทรศัพท์หลักของบริษัท"</string>
-    <string name="sms_isdn" msgid="6394300346179302542">"ส่งข้อความถึง ISDN"</string>
-    <string name="sms_main" msgid="8908087742014140774">"ส่งข้อความถึงโทรศัพท์หลัก"</string>
-    <string name="sms_other_fax" msgid="8768455473295405427">"ส่งข้อความถึงหมายเลขแฟกซ์"</string>
-    <string name="sms_radio" msgid="855555176531704682">"ส่งข้อความถึงวิทยุ"</string>
-    <string name="sms_telex" msgid="6269029276223252719">"ส่งข้อความถึงเทเล็กซ์"</string>
-    <string name="sms_tty_tdd" msgid="6229057354509192444">"ส่งข้อความถึง TTY/TDD"</string>
-    <string name="sms_work_mobile" msgid="2155975469329969840">"ส่งข้อความถึงโทรศัพท์มือถือที่ทำงาน"</string>
-    <string name="sms_work_pager" msgid="8500140274906830742">"ส่งข้อความเข้าเพจเจอร์ที่ทำงาน"</string>
-    <string name="sms_assistant" msgid="8513548482745330818">"ส่งข้อความถึง <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
-    <string name="sms_mms" msgid="5187888900503248542">"ส่งข้อความถึง MMS"</string>
-    <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"ล้างรายชื่อที่ติดต่อบ่อยไหม"</string>
-    <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"คุณจะล้างรายชื่อของผู้ที่ติดต่อด้วยบ่อยๆ ในแอปพลิเคชัน Contacts  และ Phone และบังคับให้แอปพลิเคชันอีเมลเรียนรู้ค่ากำหนดที่อยู่ของคุณใหม่ตั้งแต่ต้น"</string>
-    <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"กำลังล้างรายชื่อที่ติดต่อบ่อย…"</string>
-    <string name="status_available" msgid="2648156525685472626">"พร้อมใช้งาน"</string>
-    <string name="status_away" msgid="2298688367552893953">"ไม่อยู่"</string>
-    <string name="status_busy" msgid="5990832098713248503">"ไม่ว่าง"</string>
-    <string name="contactsList" msgid="8806067891419291513">"รายชื่อติดต่อ"</string>
-    <string name="contact_suggestions" msgid="3324166754807120006">"รายการแนะนำยอดนิยม"</string>
-    <string name="local_invisible_directory" msgid="4723238462733650090">"อื่นๆ"</string>
-    <string name="directory_search_label" msgid="4621215895484025229">"ไดเรกทอรี"</string>
-    <string name="directory_search_label_work" msgid="7679326282707414897">"ไดเรกทอรีที่ทำงาน"</string>
-    <string name="local_search_label" msgid="907622822323119235">"รายชื่อติดต่อทั้งหมด"</string>
-    <string name="local_suggestions_search_label" msgid="1178575146224386118">"รายการแนะนำ"</string>
-    <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"ฉัน"</string>
-    <string name="missing_name" msgid="978606963362745020">"(ไม่มีชื่อ)"</string>
-    <string name="description_view_contact_detail" msgid="2428742401208561136">"ดูผู้ติดต่อ"</string>
-    <string name="list_filter_phones" msgid="8763316061763437182">"รายชื่อติดต่อทั้งหมดที่มีหมายเลขโทรศัพท์"</string>
-    <string name="list_filter_phones_work" msgid="7083575404573422965">"รายชื่อติดต่อในโปรไฟล์งาน"</string>
-    <string name="view_updates_from_group" msgid="9011641093168385729">"ดูการอัปเดต"</string>
-    <string name="account_phone" msgid="7067809073194061035">"อุปกรณ์เท่านั้น ไม่ซิงค์"</string>
-    <string name="nameLabelsGroup" msgid="7730465833159557471">"ชื่อ"</string>
-    <string name="nicknameLabelsGroup" msgid="6310556912361840029">"ชื่อเล่น"</string>
-    <string name="full_name" msgid="648186563998465740">"ชื่อ"</string>
-    <string name="name_given" msgid="5096576006314820536">"ชื่อ"</string>
-    <string name="name_family" msgid="6646235805198547467">"นามสกุล"</string>
-    <string name="name_prefix" msgid="9215326539658838">"คำนำหน้าชื่อ"</string>
-    <string name="name_middle" msgid="703755205331582769">"ชื่อกลาง"</string>
-    <string name="name_suffix" msgid="5777083390282548702">"คำต่อท้ายชื่อ"</string>
-    <string name="name_phonetic" msgid="1650870996361663089">"คำอ่านชื่อ"</string>
-    <string name="name_phonetic_given" msgid="618812334274603170">"การออกเสียงชื่อ"</string>
-    <string name="name_phonetic_middle" msgid="4826820763384625538">"ชื่อกลางแบบออกเสียง"</string>
-    <string name="name_phonetic_family" msgid="379905191212930771">"การออกเสียงนามสกุล"</string>
-    <string name="phoneLabelsGroup" msgid="169661929021355548">"โทรศัพท์"</string>
-    <string name="emailLabelsGroup" msgid="2249752810477488833">"อีเมล"</string>
-    <string name="postalLabelsGroup" msgid="6772000590189142253">"ที่อยู่"</string>
-    <string name="imLabelsGroup" msgid="5718066254237364731">"IM"</string>
-    <string name="organizationLabelsGroup" msgid="1101996309241601435">"องค์กร"</string>
-    <string name="relationLabelsGroup" msgid="53866051664600053">"ความเกี่ยวข้อง"</string>
-    <string name="eventLabelsGroup" msgid="1236970042646618489">"วันที่พิเศษ"</string>
-    <string name="sms" msgid="7574344928185328095">"ข้อความ"</string>
-    <string name="postal_address" msgid="1804707930129674200">"ที่อยู่"</string>
-    <string name="ghostData_company" msgid="2554310786296833424">"บริษัท"</string>
-    <string name="ghostData_title" msgid="4994968731830184837">"ชื่อ"</string>
-    <string name="label_notes" msgid="2050255313694219786">"บันทึก"</string>
-    <string name="label_sip_address" msgid="8883266182575965926">"SIP"</string>
-    <string name="websiteLabelsGroup" msgid="1630734286462186790">"เว็บไซต์"</string>
-    <string name="groupsLabel" msgid="2694002798416868728">"กลุ่ม"</string>
-    <string name="email_home" msgid="889830029388962171">"ส่งไปที่อีเมลส่วนตัว"</string>
-    <string name="email_mobile" msgid="4487686436743741150">"ส่งอีเมลเข้ามือถือ"</string>
-    <string name="email_work" msgid="4223487303344613528">"ส่งอีเมลถึงที่ทำงาน"</string>
-    <string name="email_other" msgid="4246411900126012062">"อีเมล"</string>
-    <string name="email_custom" msgid="7246580894327511013">"ส่งอีเมลถึง <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="email" msgid="2807318537887091606">"อีเมล"</string>
-    <string name="postal_street" msgid="6918171741240802474">"ถนน"</string>
-    <string name="postal_city" msgid="8674569121430005628">"เมือง"</string>
-    <string name="postal_region" msgid="1730369286225469192">"รัฐ"</string>
-    <string name="postal_postcode" msgid="4450700741261990439">"รหัสไปรษณีย์"</string>
-    <string name="postal_country" msgid="232670707458768148">"ประเทศ"</string>
-    <string name="map_home" msgid="4181131107392126938">"ดูที่อยู่บ้าน"</string>
-    <string name="map_work" msgid="5723471185992684400">"ดูที่อยู่ที่ทำงาน"</string>
-    <string name="map_other" msgid="2253764780863500516">"ดูที่อยู่"</string>
-    <string name="map_custom" msgid="5581743097882436157">"ดูที่อยู่ <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="chat_aim" msgid="2954364435497941659">"แชทโดยใช้ AIM"</string>
-    <string name="chat_msn" msgid="3130135239071228678">"แชทโดยใช้ Windows Live"</string>
-    <string name="chat_yahoo" msgid="3233552142326865347">"แชทโดยใช้ Yahoo"</string>
-    <string name="chat_skype" msgid="6486703981390592425">"แชทโดยใช้ Skype"</string>
-    <string name="chat_qq" msgid="786924280665740019">"แชทโดยใช้ QQ"</string>
-    <string name="chat_gtalk" msgid="7914674177243078035">"แชทโดยใช้ Google Talk"</string>
-    <string name="chat_icq" msgid="3292934726414765801">"แชทโดยใช้ ICQ"</string>
-    <string name="chat_jabber" msgid="6701542313597880204">"แชทโดยใช้ Jabber"</string>
-    <string name="chat" msgid="1020428260359370236">"แชท"</string>
-    <string name="list_filter_all_accounts" msgid="473782314881473992">"รายชื่อติดต่อทั้งหมด"</string>
-    <string name="listAllContactsInAccount" msgid="3486378621592995630">"รายชื่อติดต่อใน <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="listCustomView" msgid="5306282632413086731">"รายชื่อติดต่อในมุมมองที่กำหนดเอง"</string>
-    <string name="listSingleContact" msgid="8620818791932382627">"รายชื่อติดต่อเดียว"</string>
-    <string name="display_options_sort_list_by" msgid="3541875948367831228">"จัดเรียงตาม"</string>
-    <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"ชื่อ"</string>
-    <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"นามสกุล"</string>
-    <string name="display_options_view_names_as" msgid="4204204205736735618">"รูปแบบชื่อ"</string>
-    <string name="display_options_view_given_name_first" msgid="2308026973021171020">"ชื่อขึ้นก่อน"</string>
-    <string name="display_options_view_family_name_first" msgid="987430497292428242">"นามสกุลขึ้นก่อน"</string>
-    <string name="menu_clear_frequents" msgid="5358271535047496120">"ล้างรายชื่อที่ติดต่อบ่อย"</string>
-    <string name="action_menu_back_from_search" msgid="3550669942742167644">"หยุดการค้นหา"</string>
-    <string name="description_clear_search" msgid="2347258825265600782">"ล้างการค้นหา"</string>
-    <string name="select_account_dialog_title" msgid="2673504582803359239">"บัญชี"</string>
-    <string name="set_default_account" msgid="7966099951006467572">"ใช้ในการโทรทุกครั้ง"</string>
-    <string name="select_phone_account_for_calls" msgid="1784460686103423274">"โทรด้วย"</string>
-    <string name="call_with_a_note" msgid="6242261320491851133">"โทรพร้อมโน้ต"</string>
-    <string name="call_subject_hint" msgid="7233138753650420800">"พิมพ์โน้ตเพื่อส่งพร้อมการโทร ..."</string>
-    <string name="send_and_call_button" msgid="4735168294120154013">"ส่งและโทร"</string>
-    <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g>/<xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="tab_title" msgid="3387876802026074288">"แท็บ <xliff:g id="TITLE">%1$s</xliff:g>"</string>
-    <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
-      <item quantity="other"> แท็บ <xliff:g id="TITLE_2">%1$s</xliff:g> ยังไม่อ่าน <xliff:g id="COUNT_3">%2$d</xliff:g> รายการ </item>
-      <item quantity="one"> แท็บ <xliff:g id="TITLE_0">%1$s</xliff:g> ยังไม่อ่าน <xliff:g id="COUNT_1">%2$d</xliff:g> รายการ </item>
-    </plurals>
-    <string name="description_search_video_call" msgid="4337369876888024909">"แฮงเอาท์วิดีโอ"</string>
-    <string name="description_search_call_and_share" msgid="4912772842755050467">"แชร์และโทร"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_custom">โทรหา %s</string>
+  <string name="call_home">โทรเข้าบ้าน</string>
+  <string name="call_mobile">โทรเข้ามือถือ</string>
+  <string name="call_work">โทรหาที่ทำงาน</string>
+  <string name="call_fax_work">โทรหาแฟกซ์ที่ทำงาน</string>
+  <string name="call_fax_home">โทรเข้าหมายเลขแฟกซ์ที่บ้าน</string>
+  <string name="call_pager">โทรหาเพจเจอร์</string>
+  <string name="call_other">โทร</string>
+  <string name="call_callback">โทรหาหมายเลขติดต่อกลับ</string>
+  <string name="call_car">โทรเข้าโทรศัพท์ในรถ</string>
+  <string name="call_company_main">โทรหาโทรศัพท์หลักของบริษัท</string>
+  <string name="call_isdn">โทรหา ISDN</string>
+  <string name="call_main">โทรเข้าโทรศัพท์หลัก</string>
+  <string name="call_other_fax">โทรเข้าหมายเลขแฟกซ์</string>
+  <string name="call_radio">โทรเข้าวิทยุ</string>
+  <string name="call_telex">โทรเข้าหมายเลขเทเล็กซ์</string>
+  <string name="call_tty_tdd">โทรหา TTY/TDD</string>
+  <string name="call_work_mobile">โทรเข้ามือถือที่ทำงาน</string>
+  <string name="call_work_pager">โทรเข้าเพจเจอร์ที่ทำงาน</string>
+  <string name="call_assistant">โทรหา %s</string>
+  <string name="call_mms">โทรหา MMS</string>
+  <string name="sms_custom">ส่งข้อความถึง %s</string>
+  <string name="sms_home">ส่งข้อความเข้าโทรศัพท์บ้าน</string>
+  <string name="sms_mobile">ส่งข้อความเข้ามือถือ</string>
+  <string name="sms_work">ส่งข้อความถึงโทรศัพท์ที่ทำงาน</string>
+  <string name="sms_fax_work">ส่งข้อความถึงแฟกซ์ที่ทำงาน</string>
+  <string name="sms_fax_home">ส่งข้อความเข้าหมายเลขแฟกซ์บ้าน</string>
+  <string name="sms_pager">ส่งข้อความถึงเพจเจอร์</string>
+  <string name="sms_other">ส่งข้อความ</string>
+  <string name="sms_callback">ส่งข้อความถึงหมายเลขติดต่อกลับ</string>
+  <string name="sms_car">ส่งข้อความถึงรถยนต์</string>
+  <string name="sms_company_main">ส่งข้อความเข้าโทรศัพท์หลักของบริษัท</string>
+  <string name="sms_isdn">ส่งข้อความถึง ISDN</string>
+  <string name="sms_main">ส่งข้อความถึงโทรศัพท์หลัก</string>
+  <string name="sms_other_fax">ส่งข้อความถึงหมายเลขแฟกซ์</string>
+  <string name="sms_radio">ส่งข้อความถึงวิทยุ</string>
+  <string name="sms_telex">ส่งข้อความถึงเทเล็กซ์</string>
+  <string name="sms_tty_tdd">ส่งข้อความถึง TTY/TDD</string>
+  <string name="sms_work_mobile">ส่งข้อความถึงโทรศัพท์มือถือที่ทำงาน</string>
+  <string name="sms_work_pager">ส่งข้อความเข้าเพจเจอร์ที่ทำงาน</string>
+  <string name="sms_assistant">ส่งข้อความถึง %s</string>
+  <string name="sms_mms">ส่งข้อความถึง MMS</string>
+  <string name="clearFrequentsConfirmation_title">ล้างรายชื่อที่ติดต่อบ่อยไหม</string>
+  <string name="clearFrequentsConfirmation">คุณจะล้างรายชื่อของผู้ที่ติดต่อด้วยบ่อยๆ ในแอปพลิเคชัน Contacts  และ Phone และบังคับให้แอปพลิเคชันอีเมลเรียนรู้ค่ากำหนดที่อยู่ของคุณใหม่ตั้งแต่ต้น</string>
+  <string name="clearFrequentsProgress_title">กำลังล้างรายชื่อที่ติดต่อบ่อย…</string>
+  <string name="status_available">พร้อมใช้งาน</string>
+  <string name="status_away">ไม่อยู่</string>
+  <string name="status_busy">ไม่ว่าง</string>
+  <string name="contactsList">รายชื่อติดต่อ</string>
+  <string name="contact_suggestions">รายการแนะนำยอดนิยม</string>
+  <string name="local_invisible_directory">อื่นๆ</string>
+  <string name="directory_search_label">ไดเรกทอรี</string>
+  <string name="directory_search_label_work">ไดเรกทอรีที่ทำงาน</string>
+  <string name="local_search_label">รายชื่อติดต่อทั้งหมด</string>
+  <string name="local_suggestions_search_label">รายการแนะนำ</string>
+  <string msgid="9154761216179882405" name="user_profile_contacts_list_header">ฉัน</string>
+  <string name="missing_name">(ไม่มีชื่อ)</string>
+  <string msgid="2795575601596468581" name="description_view_contact_detail">ดูผู้ติดต่อ</string>
+  <string name="list_filter_phones">รายชื่อติดต่อทั้งหมดที่มีหมายเลขโทรศัพท์</string>
+  <string name="list_filter_phones_work">รายชื่อติดต่อในโปรไฟล์งาน</string>
+  <string name="view_updates_from_group">ดูการอัปเดต</string>
+  <string name="account_phone">อุปกรณ์เท่านั้น ไม่ซิงค์</string>
+  <string name="nameLabelsGroup">ชื่อ</string>
+  <string name="nicknameLabelsGroup">ชื่อเล่น</string>
+  <string name="full_name">ชื่อ</string>
+  <string name="name_given">ชื่อ</string>
+  <string name="name_family">นามสกุล</string>
+  <string name="name_prefix">คำนำหน้าชื่อ</string>
+  <string name="name_middle">ชื่อกลาง</string>
+  <string name="name_suffix">คำต่อท้ายชื่อ</string>
+  <string name="name_phonetic">คำอ่านชื่อ</string>
+  <string name="name_phonetic_given">การออกเสียงชื่อ</string>
+  <string name="name_phonetic_middle">ชื่อกลางแบบออกเสียง</string>
+  <string name="name_phonetic_family">การออกเสียงนามสกุล</string>
+  <string name="phoneLabelsGroup">โทรศัพท์</string>
+  <string name="emailLabelsGroup">อีเมล</string>
+  <string name="postalLabelsGroup">ที่อยู่</string>
+  <string name="imLabelsGroup">IM</string>
+  <string name="organizationLabelsGroup">องค์กร</string>
+  <string name="relationLabelsGroup">ความเกี่ยวข้อง</string>
+  <string name="eventLabelsGroup">วันที่พิเศษ</string>
+  <string name="sms">ข้อความ</string>
+  <string name="postal_address">ที่อยู่</string>
+  <string name="ghostData_company">บริษัท</string>
+  <string name="ghostData_title">ชื่อ</string>
+  <string name="label_notes">บันทึก</string>
+  <string name="label_sip_address">SIP</string>
+  <string name="websiteLabelsGroup">เว็บไซต์</string>
+  <string name="groupsLabel">กลุ่ม</string>
+  <string name="email_home">ส่งไปที่อีเมลส่วนตัว</string>
+  <string name="email_mobile">ส่งอีเมลเข้ามือถือ</string>
+  <string name="email_work">ส่งอีเมลถึงที่ทำงาน</string>
+  <string name="email_other">ส่งอีเมล</string>
+  <string name="email_custom">ส่งอีเมลถึง %s</string>
+  <string name="email">ส่งอีเมล</string>
+  <string name="postal_street">ถนน</string>
+  <string name="postal_city">เมือง</string>
+  <string name="postal_region">รัฐ</string>
+  <string name="postal_postcode">รหัสไปรษณีย์</string>
+  <string name="postal_country">ประเทศ</string>
+  <string name="map_home">ดูที่อยู่บ้าน</string>
+  <string name="map_work">ดูที่อยู่ที่ทำงาน</string>
+  <string name="map_other">ดูที่อยู่</string>
+  <string name="map_custom">ดูที่อยู่ %s</string>
+  <string name="chat_aim">แชทโดยใช้ AIM</string>
+  <string name="chat_msn">แชทโดยใช้ Windows Live</string>
+  <string name="chat_yahoo">แชทโดยใช้ Yahoo</string>
+  <string name="chat_skype">แชทโดยใช้ Skype</string>
+  <string name="chat_qq">แชทโดยใช้ QQ</string>
+  <string name="chat_gtalk">แชทโดยใช้ Google Talk</string>
+  <string name="chat_icq">แชทโดยใช้ ICQ</string>
+  <string name="chat_jabber">แชทโดยใช้ Jabber</string>
+  <string name="chat">แชท</string>
+  <string name="list_filter_all_accounts">รายชื่อติดต่อทั้งหมด</string>
+  <string name="listAllContactsInAccount">รายชื่อติดต่อใน %s</string>
+  <string name="listCustomView">รายชื่อติดต่อในมุมมองที่กำหนดเอง</string>
+  <string name="listSingleContact">รายชื่อติดต่อเดียว</string>
+  <string name="display_options_sort_list_by">จัดเรียงตาม</string>
+  <string name="display_options_sort_by_given_name">ชื่อ</string>
+  <string name="display_options_sort_by_family_name">นามสกุล</string>
+  <string name="display_options_view_names_as">รูปแบบชื่อ</string>
+  <string name="display_options_view_given_name_first">ชื่อขึ้นก่อน</string>
+  <string name="display_options_view_family_name_first">นามสกุลขึ้นก่อน</string>
+  <string name="menu_clear_frequents">ล้างรายชื่อที่ติดต่อบ่อย</string>
+  <string name="action_menu_back_from_search">หยุดการค้นหา</string>
+  <string name="description_clear_search">ล้างการค้นหา</string>
+  <string name="select_account_dialog_title">บัญชี</string>
+  <string name="set_default_account">ใช้ในการโทรทุกครั้ง</string>
+  <string name="select_phone_account_for_calls">เลือกซิมสำหรับการโทรนี้</string>
+  <string name="select_phone_account_for_calls_remember">จำตัวเลือกนี้</string>
+  <string name="call_with_a_note">โทรพร้อมโน้ต</string>
+  <string name="call_subject_hint">พิมพ์โน้ตเพื่อส่งพร้อมการโทร ...</string>
+  <string name="send_and_call_button">ส่งและโทร</string>
+  <string name="call_subject_limit">%1$s/%2$s</string>
+  <string name="old_call_subject_type_and_number">%1$s %2$s</string>
+  <string name="tab_title">แท็บ %1$s</string>
+  <plurals name="tab_title_with_unread_items">
+    <item quantity="one"> แท็บ %1$s ยังไม่อ่าน %2$d รายการ </item>
+    <item quantity="other"> แท็บ %1$s ยังไม่อ่าน %2$d รายการ </item>
+  </plurals>
+  <string name="description_search_video_call"> Hangouts วิดีโอ</string>
+  <string name="description_search_call_and_share">แชร์และโทร</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-tl/strings.xml b/java/com/android/contacts/common/res/values-tl/strings.xml
index 07696b7..5bceef5 100644
--- a/java/com/android/contacts/common/res/values-tl/strings.xml
+++ b/java/com/android/contacts/common/res/values-tl/strings.xml
@@ -1,162 +1,145 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="toast_text_copied" msgid="8979281391599667362">"Kinopya ang teksto"</string>
-    <string name="call_custom" msgid="3041673234638990874">"Tawagan sa <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="call_home" msgid="125893483593803791">"Tawagan sa bahay"</string>
-    <string name="call_mobile" msgid="967589404494150813">"Tawagan sa mobile"</string>
-    <string name="call_work" msgid="6040550697395300892">"Tawagan sa trabaho"</string>
-    <string name="call_fax_work" msgid="5260192771364592922">"Tawagan sa fax sa trabaho"</string>
-    <string name="call_fax_home" msgid="5174311195081144124">"Tawagan sa fax sa bahay"</string>
-    <string name="call_pager" msgid="6814149227741274161">"Tawagan sa pager"</string>
-    <string name="call_other" msgid="5536385588712587235">"Tawagan"</string>
-    <string name="call_callback" msgid="6314019862718112786">"Tawagan sa callback"</string>
-    <string name="call_car" msgid="3197417098027764954">"Tawagan sa kotse"</string>
-    <string name="call_company_main" msgid="2557663310028446397">"Tawagan sa pangunahing kumpanya"</string>
-    <string name="call_isdn" msgid="4691270442763649522">"Tawagan sa ISDN"</string>
-    <string name="call_main" msgid="3293707608770407814">"Tawagan sa pangunahin"</string>
-    <string name="call_other_fax" msgid="4724521984879021465">"Tawagan sa fax"</string>
-    <string name="call_radio" msgid="8942441419845057942">"Tawagan sa radyo"</string>
-    <string name="call_telex" msgid="2031514461660668351">"Tawagan sa telex"</string>
-    <string name="call_tty_tdd" msgid="7807210224965727701">"Tawagan sa TTY/TDD"</string>
-    <string name="call_work_mobile" msgid="2716342732938578495">"Tawagan sa mobile sa trabaho"</string>
-    <string name="call_work_pager" msgid="3791778749827366574">"Tawagan sa pager sa trabaho"</string>
-    <string name="call_assistant" msgid="4177478845473789294">"Tawagan sa <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
-    <string name="call_mms" msgid="4958811711741872901">"Tawagan sa MMS"</string>
-    <string name="sms_custom" msgid="8785368968605026317">"I-text sa <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="sms_home" msgid="3527719551060295243">"I-text sa bahay"</string>
-    <string name="sms_mobile" msgid="8883045857887736518">"I-text sa mobile"</string>
-    <string name="sms_work" msgid="4158595439553450966">"I-text sa trabaho"</string>
-    <string name="sms_fax_work" msgid="5483726627718055248">"I-text sa fax sa trabaho"</string>
-    <string name="sms_fax_home" msgid="9219265155770746077">"I-text sa fax sa bahay"</string>
-    <string name="sms_pager" msgid="4901085068525193933">"I-text sa pager"</string>
-    <string name="sms_other" msgid="1742702947993285933">"Mag-text"</string>
-    <string name="sms_callback" msgid="5833483630377538308">"I-text sa callback"</string>
-    <string name="sms_car" msgid="4314577266154395174">"I-text sa kotse"</string>
-    <string name="sms_company_main" msgid="2308160928487360705">"I-text sa pangunahing kumpanya"</string>
-    <string name="sms_isdn" msgid="6394300346179302542">"I-text sa ISDN"</string>
-    <string name="sms_main" msgid="8908087742014140774">"I-text sa pangunahin"</string>
-    <string name="sms_other_fax" msgid="8768455473295405427">"I-text sa fax"</string>
-    <string name="sms_radio" msgid="855555176531704682">"I-text sa radyo"</string>
-    <string name="sms_telex" msgid="6269029276223252719">"I-text sa telex"</string>
-    <string name="sms_tty_tdd" msgid="6229057354509192444">"I-text sa TTY/TDD"</string>
-    <string name="sms_work_mobile" msgid="2155975469329969840">"I-text sa mobile sa trabaho"</string>
-    <string name="sms_work_pager" msgid="8500140274906830742">"I-text sa pager sa trabaho"</string>
-    <string name="sms_assistant" msgid="8513548482745330818">"I-text sa <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
-    <string name="sms_mms" msgid="5187888900503248542">"I-text sa MMS"</string>
-    <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"I-clear ang madalas na kinontak"</string>
-    <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"Iki-clear mo ang listahan ng mga madalas na nakakaugnay sa mga app ng Mga Contact at Telepono at pupuwersahin mo ang mga app ng email na matutunan ang iyong mga kagustuhan sa pag-a-address mula sa simula."</string>
-    <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"Kini-clear madalas na inuugnayan…"</string>
-    <string name="status_available" msgid="2648156525685472626">"Available"</string>
-    <string name="status_away" msgid="2298688367552893953">"Wala"</string>
-    <string name="status_busy" msgid="5990832098713248503">"Abala"</string>
-    <string name="contactsList" msgid="8806067891419291513">"Mga Contact"</string>
-    <string name="contact_suggestions" msgid="3324166754807120006">"Mga Madalas Imungkahi"</string>
-    <string name="local_invisible_directory" msgid="4723238462733650090">"Iba pa"</string>
-    <string name="directory_search_label" msgid="4621215895484025229">"Direktoryo"</string>
-    <string name="directory_search_label_work" msgid="7679326282707414897">"Directory sa trabaho"</string>
-    <string name="local_search_label" msgid="907622822323119235">"Lahat ng mga contact"</string>
-    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Mga Mungkahi"</string>
-    <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Ako"</string>
-    <string name="missing_name" msgid="978606963362745020">"(Walang pangalan)"</string>
-    <string name="description_view_contact_detail" msgid="2428742401208561136">"Tingnan ang contact"</string>
-    <string name="list_filter_phones" msgid="8763316061763437182">"Lahat ng contact na may mga numero ng telepono"</string>
-    <string name="list_filter_phones_work" msgid="7083575404573422965">"Mga contact ng profile sa trabaho"</string>
-    <string name="view_updates_from_group" msgid="9011641093168385729">"Tingnan ang mga update"</string>
-    <string name="account_phone" msgid="7067809073194061035">"Device lang, inalis sa pagkaka-sync"</string>
-    <string name="nameLabelsGroup" msgid="7730465833159557471">"Pangalan"</string>
-    <string name="nicknameLabelsGroup" msgid="6310556912361840029">"Palayaw"</string>
-    <string name="full_name" msgid="648186563998465740">"Pangalan"</string>
-    <string name="name_given" msgid="5096576006314820536">"Pangalan"</string>
-    <string name="name_family" msgid="6646235805198547467">"Apelyido"</string>
-    <string name="name_prefix" msgid="9215326539658838">"Prefix ng pangalan"</string>
-    <string name="name_middle" msgid="703755205331582769">"Gitnang pangalan"</string>
-    <string name="name_suffix" msgid="5777083390282548702">"Suffix ng pangalan"</string>
-    <string name="name_phonetic" msgid="1650870996361663089">"Phonetic na pangalan"</string>
-    <string name="name_phonetic_given" msgid="618812334274603170">"Phonetic na pangalan"</string>
-    <string name="name_phonetic_middle" msgid="4826820763384625538">"Phonetic na gitnang pangalan"</string>
-    <string name="name_phonetic_family" msgid="379905191212930771">"Phonetic na apelyido"</string>
-    <string name="phoneLabelsGroup" msgid="169661929021355548">"Telepono"</string>
-    <string name="emailLabelsGroup" msgid="2249752810477488833">"Mag-email"</string>
-    <string name="postalLabelsGroup" msgid="6772000590189142253">"Address"</string>
-    <string name="imLabelsGroup" msgid="5718066254237364731">"IM"</string>
-    <string name="organizationLabelsGroup" msgid="1101996309241601435">"Samahan"</string>
-    <string name="relationLabelsGroup" msgid="53866051664600053">"Kaugnayan"</string>
-    <string name="eventLabelsGroup" msgid="1236970042646618489">"Espesyal na petsa"</string>
-    <string name="sms" msgid="7574344928185328095">"Text message"</string>
-    <string name="postal_address" msgid="1804707930129674200">"Address"</string>
-    <string name="ghostData_company" msgid="2554310786296833424">"Kumpanya"</string>
-    <string name="ghostData_title" msgid="4994968731830184837">"Pamagat"</string>
-    <string name="label_notes" msgid="2050255313694219786">"Mga Tala"</string>
-    <string name="label_sip_address" msgid="8883266182575965926">"SIP"</string>
-    <string name="websiteLabelsGroup" msgid="1630734286462186790">"Website"</string>
-    <string name="groupsLabel" msgid="2694002798416868728">"Mga Grupo"</string>
-    <string name="email_home" msgid="889830029388962171">"Mag-email sa bahay"</string>
-    <string name="email_mobile" msgid="4487686436743741150">"Mag-email sa mobile"</string>
-    <string name="email_work" msgid="4223487303344613528">"Mag-email sa trabaho"</string>
-    <string name="email_other" msgid="4246411900126012062">"Mag-email"</string>
-    <string name="email_custom" msgid="7246580894327511013">"Mag-email sa <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="email" msgid="2807318537887091606">"Mag-email"</string>
-    <string name="postal_street" msgid="6918171741240802474">"Kalye"</string>
-    <string name="postal_city" msgid="8674569121430005628">"Lungsod"</string>
-    <string name="postal_region" msgid="1730369286225469192">"Estado"</string>
-    <string name="postal_postcode" msgid="4450700741261990439">"ZIP code"</string>
-    <string name="postal_country" msgid="232670707458768148">"Bansa"</string>
-    <string name="map_home" msgid="4181131107392126938">"Tingnan ang address ng tahanan"</string>
-    <string name="map_work" msgid="5723471185992684400">"Tingnan ang address sa trabaho"</string>
-    <string name="map_other" msgid="2253764780863500516">"Tingnan ang address"</string>
-    <string name="map_custom" msgid="5581743097882436157">"Tingnan ang <xliff:g id="CUSTOM">%s</xliff:g> na address"</string>
-    <string name="chat_aim" msgid="2954364435497941659">"Makipag-chat gamit ang AIM"</string>
-    <string name="chat_msn" msgid="3130135239071228678">"Makipag-chat gamit ang Windows Live"</string>
-    <string name="chat_yahoo" msgid="3233552142326865347">"Makipag-chat gamit ang Yahoo"</string>
-    <string name="chat_skype" msgid="6486703981390592425">"Makipag-chat gamit ang Skype"</string>
-    <string name="chat_qq" msgid="786924280665740019">"Makipag-chat gamit ang QQ"</string>
-    <string name="chat_gtalk" msgid="7914674177243078035">"Makipag-chat gamit ang Google Talk"</string>
-    <string name="chat_icq" msgid="3292934726414765801">"Makipag-chat gamit ang ICQ"</string>
-    <string name="chat_jabber" msgid="6701542313597880204">"Makipag-chat gamit ang Jabber"</string>
-    <string name="chat" msgid="1020428260359370236">"Chat"</string>
-    <string name="list_filter_all_accounts" msgid="473782314881473992">"Lahat ng contact"</string>
-    <string name="listAllContactsInAccount" msgid="3486378621592995630">"Mga contact sa <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="listCustomView" msgid="5306282632413086731">"Mga contact sa custom na view"</string>
-    <string name="listSingleContact" msgid="8620818791932382627">"Iisang contact"</string>
-    <string name="display_options_sort_list_by" msgid="3541875948367831228">"Uriin ayon sa"</string>
-    <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"Pangalan"</string>
-    <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"Apelyido"</string>
-    <string name="display_options_view_names_as" msgid="4204204205736735618">"Format ng pangalan"</string>
-    <string name="display_options_view_given_name_first" msgid="2308026973021171020">"Pangalan muna"</string>
-    <string name="display_options_view_family_name_first" msgid="987430497292428242">"Apelyido muna"</string>
-    <string name="menu_clear_frequents" msgid="5358271535047496120">"I-clear ang mga frequent"</string>
-    <string name="action_menu_back_from_search" msgid="3550669942742167644">"ihinto ang paghahanap"</string>
-    <string name="description_clear_search" msgid="2347258825265600782">"I-clear ang paghahanap"</string>
-    <string name="select_account_dialog_title" msgid="2673504582803359239">"Account"</string>
-    <string name="set_default_account" msgid="7966099951006467572">"Gamitin ito palagi sa mga tawag"</string>
-    <string name="select_phone_account_for_calls" msgid="1784460686103423274">"Tumawag gamit ang"</string>
-    <string name="call_with_a_note" msgid="6242261320491851133">"Tumawag nang may kasamang tala"</string>
-    <string name="call_subject_hint" msgid="7233138753650420800">"Mag-type ng isang tala na ipadadala kasama ng tawag ..."</string>
-    <string name="send_and_call_button" msgid="4735168294120154013">"IPADALA AT TAWAGAN"</string>
-    <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="tab_title" msgid="3387876802026074288">"Tab ng <xliff:g id="TITLE">%1$s</xliff:g>."</string>
-    <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
-      <item quantity="one"> Tab ng <xliff:g id="TITLE_2">%1$s</xliff:g>. <xliff:g id="COUNT_3">%2$d</xliff:g> hindi pa nababasang item. </item>
-      <item quantity="other"> Tab ng <xliff:g id="TITLE_2">%1$s</xliff:g>. <xliff:g id="COUNT_3">%2$d</xliff:g> na hindi pa nababasang item. </item>
-    </plurals>
-    <string name="description_search_video_call" msgid="4337369876888024909">"Mag-video call"</string>
-    <string name="description_search_call_and_share" msgid="4912772842755050467">"Ibahagi at tumawag"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_custom">Tawagan sa %s</string>
+  <string name="call_home">Tawagan sa bahay</string>
+  <string name="call_mobile">Tawagan sa mobile</string>
+  <string name="call_work">Tawagan sa trabaho</string>
+  <string name="call_fax_work">Tawagan sa fax sa trabaho</string>
+  <string name="call_fax_home">Tawagan sa fax sa bahay</string>
+  <string name="call_pager">Tawagan sa pager</string>
+  <string name="call_other">Tawagan</string>
+  <string name="call_callback">Tawagan sa callback</string>
+  <string name="call_car">Tawagan sa kotse</string>
+  <string name="call_company_main">Tawagan sa pangunahing kumpanya</string>
+  <string name="call_isdn">Tawagan sa ISDN</string>
+  <string name="call_main">Tawagan sa pangunahin</string>
+  <string name="call_other_fax">Tawagan sa fax</string>
+  <string name="call_radio">Tawagan sa radyo</string>
+  <string name="call_telex">Tawagan sa telex</string>
+  <string name="call_tty_tdd">Tawagan sa TTY/TDD</string>
+  <string name="call_work_mobile">Tawagan sa mobile sa trabaho</string>
+  <string name="call_work_pager">Tawagan sa pager sa trabaho</string>
+  <string name="call_assistant">Tawagan sa %s</string>
+  <string name="call_mms">Tawagan sa MMS</string>
+  <string name="sms_custom">I-text sa %s</string>
+  <string name="sms_home">I-text sa bahay</string>
+  <string name="sms_mobile">I-text sa mobile</string>
+  <string name="sms_work">I-text sa trabaho</string>
+  <string name="sms_fax_work">I-text sa fax sa trabaho</string>
+  <string name="sms_fax_home">I-text sa fax sa bahay</string>
+  <string name="sms_pager">I-text sa pager</string>
+  <string name="sms_other">Mag-text</string>
+  <string name="sms_callback">I-text sa callback</string>
+  <string name="sms_car">I-text sa kotse</string>
+  <string name="sms_company_main">I-text sa pangunahing kumpanya</string>
+  <string name="sms_isdn">I-text sa ISDN</string>
+  <string name="sms_main">I-text sa pangunahin</string>
+  <string name="sms_other_fax">I-text sa fax</string>
+  <string name="sms_radio">I-text sa radyo</string>
+  <string name="sms_telex">I-text sa telex</string>
+  <string name="sms_tty_tdd">I-text sa TTY/TDD</string>
+  <string name="sms_work_mobile">I-text sa mobile sa trabaho</string>
+  <string name="sms_work_pager">I-text sa pager sa trabaho</string>
+  <string name="sms_assistant">I-text sa %s</string>
+  <string name="sms_mms">I-text sa MMS</string>
+  <string name="clearFrequentsConfirmation_title">I-clear ang madalas na kinontak</string>
+  <string name="clearFrequentsConfirmation">Iki-clear mo ang listahan ng mga madalas na nakakaugnay sa mga app ng Mga Contact at Telepono at pupuwersahin mo ang mga app ng email na matutunan ang iyong mga kagustuhan sa pag-a-address mula sa simula.</string>
+  <string name="clearFrequentsProgress_title">Kini-clear madalas na inuugnayan…</string>
+  <string name="status_available">Available</string>
+  <string name="status_away">Wala</string>
+  <string name="status_busy">Abala</string>
+  <string name="contactsList">Mga Contact</string>
+  <string name="contact_suggestions">Mga Madalas Imungkahi</string>
+  <string name="local_invisible_directory">Iba pa</string>
+  <string name="directory_search_label">Direktoryo</string>
+  <string name="directory_search_label_work">Directory sa trabaho</string>
+  <string name="local_search_label">Lahat ng mga contact</string>
+  <string name="local_suggestions_search_label">Mga Mungkahi</string>
+  <string msgid="9154761216179882405" name="user_profile_contacts_list_header">Ako</string>
+  <string name="missing_name">(Walang pangalan)</string>
+  <string msgid="2795575601596468581" name="description_view_contact_detail">Tingnan ang contact</string>
+  <string name="list_filter_phones">Lahat ng contact na may mga numero ng telepono</string>
+  <string name="list_filter_phones_work">Mga contact ng profile sa trabaho</string>
+  <string name="view_updates_from_group">Tingnan ang mga update</string>
+  <string name="account_phone">Device lang, inalis sa pagkaka-sync</string>
+  <string name="nameLabelsGroup">Pangalan</string>
+  <string name="nicknameLabelsGroup">Palayaw</string>
+  <string name="full_name">Pangalan</string>
+  <string name="name_given">Pangalan</string>
+  <string name="name_family">Apelyido</string>
+  <string name="name_prefix">Prefix ng pangalan</string>
+  <string name="name_middle">Gitnang pangalan</string>
+  <string name="name_suffix">Suffix ng pangalan</string>
+  <string name="name_phonetic">Phonetic na pangalan</string>
+  <string name="name_phonetic_given">Phonetic na pangalan</string>
+  <string name="name_phonetic_middle">Phonetic na gitnang pangalan</string>
+  <string name="name_phonetic_family">Phonetic na apelyido</string>
+  <string name="phoneLabelsGroup">Telepono</string>
+  <string name="emailLabelsGroup">Mag-email</string>
+  <string name="postalLabelsGroup">Address</string>
+  <string name="imLabelsGroup">IM</string>
+  <string name="organizationLabelsGroup">Samahan</string>
+  <string name="relationLabelsGroup">Kaugnayan</string>
+  <string name="eventLabelsGroup">Espesyal na petsa</string>
+  <string name="sms">Text message</string>
+  <string name="postal_address">Address</string>
+  <string name="ghostData_company">Kumpanya</string>
+  <string name="ghostData_title">Pamagat</string>
+  <string name="label_notes">Mga Tala</string>
+  <string name="label_sip_address">SIP</string>
+  <string name="websiteLabelsGroup">Website</string>
+  <string name="groupsLabel">Mga Grupo</string>
+  <string name="email_home">Mag-email sa bahay</string>
+  <string name="email_mobile">Mag-email sa mobile</string>
+  <string name="email_work">Mag-email sa trabaho</string>
+  <string name="email_other">Mag-email</string>
+  <string name="email_custom">Mag-email sa %s</string>
+  <string name="email">Mag-email</string>
+  <string name="postal_street">Kalye</string>
+  <string name="postal_city">Lungsod</string>
+  <string name="postal_region">Estado</string>
+  <string name="postal_postcode">ZIP code</string>
+  <string name="postal_country">Bansa</string>
+  <string name="map_home">Tingnan ang address ng tahanan</string>
+  <string name="map_work">Tingnan ang address sa trabaho</string>
+  <string name="map_other">Tingnan ang address</string>
+  <string name="map_custom">Tingnan ang %s na address</string>
+  <string name="chat_aim">Makipag-chat gamit ang AIM</string>
+  <string name="chat_msn">Makipag-chat gamit ang Windows Live</string>
+  <string name="chat_yahoo">Makipag-chat gamit ang Yahoo</string>
+  <string name="chat_skype">Makipag-chat gamit ang Skype</string>
+  <string name="chat_qq">Makipag-chat gamit ang QQ</string>
+  <string name="chat_gtalk">Makipag-chat gamit ang Google Talk</string>
+  <string name="chat_icq">Makipag-chat gamit ang ICQ</string>
+  <string name="chat_jabber">Makipag-chat gamit ang Jabber</string>
+  <string name="chat">Chat</string>
+  <string name="list_filter_all_accounts">Lahat ng contact</string>
+  <string name="listAllContactsInAccount">Mga contact sa %s</string>
+  <string name="listCustomView">Mga contact sa custom na view</string>
+  <string name="listSingleContact">Iisang contact</string>
+  <string name="display_options_sort_list_by">Uriin ayon sa</string>
+  <string name="display_options_sort_by_given_name">Pangalan</string>
+  <string name="display_options_sort_by_family_name">Apelyido</string>
+  <string name="display_options_view_names_as">Format ng pangalan</string>
+  <string name="display_options_view_given_name_first">Pangalan muna</string>
+  <string name="display_options_view_family_name_first">Apelyido muna</string>
+  <string name="menu_clear_frequents">I-clear ang mga frequent</string>
+  <string name="action_menu_back_from_search">ihinto ang paghahanap</string>
+  <string name="description_clear_search">I-clear ang paghahanap</string>
+  <string name="select_account_dialog_title">Account</string>
+  <string name="set_default_account">Gamitin ito palagi sa mga tawag</string>
+  <string name="select_phone_account_for_calls">Pumili ng SIM para sa tawag na ito</string>
+  <string name="select_phone_account_for_calls_remember">Tandaan ang pagpipiliang ito</string>
+  <string name="call_with_a_note">Tumawag nang may kasamang tala</string>
+  <string name="call_subject_hint">Mag-type ng isang tala na ipadadala kasama ng tawag ...</string>
+  <string name="send_and_call_button">IPADALA AT TAWAGAN</string>
+  <string name="call_subject_limit">%1$s / %2$s</string>
+  <string name="old_call_subject_type_and_number">%1$s %2$s</string>
+  <string name="tab_title">Tab ng %1$s.</string>
+  <plurals name="tab_title_with_unread_items">
+    <item quantity="one"> Tab ng %1$s. %2$d hindi pa nababasang item. </item>
+    <item quantity="other"> Tab ng %1$s. %2$d na hindi pa nababasang item. </item>
+  </plurals>
+  <string name="description_search_video_call">Mag-video call</string>
+  <string name="description_search_call_and_share">Ibahagi at tumawag</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-tr/strings.xml b/java/com/android/contacts/common/res/values-tr/strings.xml
index 6a11159..512891b 100644
--- a/java/com/android/contacts/common/res/values-tr/strings.xml
+++ b/java/com/android/contacts/common/res/values-tr/strings.xml
@@ -1,162 +1,145 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="toast_text_copied" msgid="8979281391599667362">"Metin kopyalandı"</string>
-    <string name="call_custom" msgid="3041673234638990874">"Ara (<xliff:g id="CUSTOM">%s</xliff:g>)"</string>
-    <string name="call_home" msgid="125893483593803791">"Ara (ev)"</string>
-    <string name="call_mobile" msgid="967589404494150813">"Ara (mobil)"</string>
-    <string name="call_work" msgid="6040550697395300892">"Ara (iş)"</string>
-    <string name="call_fax_work" msgid="5260192771364592922">"Ara (iş faksı)"</string>
-    <string name="call_fax_home" msgid="5174311195081144124">"Ara (ev faksı)"</string>
-    <string name="call_pager" msgid="6814149227741274161">"Ara (çağrı cihazı)"</string>
-    <string name="call_other" msgid="5536385588712587235">"Ara"</string>
-    <string name="call_callback" msgid="6314019862718112786">"Ara (geri arama)"</string>
-    <string name="call_car" msgid="3197417098027764954">"Ara (araç)"</string>
-    <string name="call_company_main" msgid="2557663310028446397">"Ara (şirket santrali)"</string>
-    <string name="call_isdn" msgid="4691270442763649522">"Ara (ISDN)"</string>
-    <string name="call_main" msgid="3293707608770407814">"Ara (santral)"</string>
-    <string name="call_other_fax" msgid="4724521984879021465">"Ara (faks)"</string>
-    <string name="call_radio" msgid="8942441419845057942">"Ara (telsiz)"</string>
-    <string name="call_telex" msgid="2031514461660668351">"Ara (teleks)"</string>
-    <string name="call_tty_tdd" msgid="7807210224965727701">"Ara (TTY/TDD)"</string>
-    <string name="call_work_mobile" msgid="2716342732938578495">"Ara (iş cep telefonu)"</string>
-    <string name="call_work_pager" msgid="3791778749827366574">"Ara (iş çağrı cihazı)"</string>
-    <string name="call_assistant" msgid="4177478845473789294">"Ara (<xliff:g id="ASSISTANT">%s</xliff:g>)"</string>
-    <string name="call_mms" msgid="4958811711741872901">"Ara (MMS)"</string>
-    <string name="sms_custom" msgid="8785368968605026317">"SMS gönder (<xliff:g id="CUSTOM">%s</xliff:g>)"</string>
-    <string name="sms_home" msgid="3527719551060295243">"SMS gönder (ev)"</string>
-    <string name="sms_mobile" msgid="8883045857887736518">"SMS gönder (mobil)"</string>
-    <string name="sms_work" msgid="4158595439553450966">"SMS gönder (iş)"</string>
-    <string name="sms_fax_work" msgid="5483726627718055248">"SMS gönder (iş faksı)"</string>
-    <string name="sms_fax_home" msgid="9219265155770746077">"SMS gönder (ev faksı)"</string>
-    <string name="sms_pager" msgid="4901085068525193933">"SMS gönder (çağrı cihazı)"</string>
-    <string name="sms_other" msgid="1742702947993285933">"SMS gönder"</string>
-    <string name="sms_callback" msgid="5833483630377538308">"SMS gönder (geri arama)"</string>
-    <string name="sms_car" msgid="4314577266154395174">"SMS gönder (araç)"</string>
-    <string name="sms_company_main" msgid="2308160928487360705">"SMS gönder (şirket santrali)"</string>
-    <string name="sms_isdn" msgid="6394300346179302542">"SMS gönder (ISDN)"</string>
-    <string name="sms_main" msgid="8908087742014140774">"SMS gönder (santral)"</string>
-    <string name="sms_other_fax" msgid="8768455473295405427">"SMS gönder (faks)"</string>
-    <string name="sms_radio" msgid="855555176531704682">"SMS gönder (telsiz)"</string>
-    <string name="sms_telex" msgid="6269029276223252719">"SMS gönder (teleks)"</string>
-    <string name="sms_tty_tdd" msgid="6229057354509192444">"SMS gönder (TTY/TDD)"</string>
-    <string name="sms_work_mobile" msgid="2155975469329969840">"SMS gönder (iş cep telefonu)"</string>
-    <string name="sms_work_pager" msgid="8500140274906830742">"SMS gönder (iş çağrı cihazı)"</string>
-    <string name="sms_assistant" msgid="8513548482745330818">"SMS gönder (<xliff:g id="ASSISTANT">%s</xliff:g>)"</string>
-    <string name="sms_mms" msgid="5187888900503248542">"SMS gönder (MMS)"</string>
-    <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"Sık iletişim kurulanlar silinsin mi?"</string>
-    <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"Kişiler ve Telefon uygulamalarındaki sık iletişim kurulanlar listesini temizleyecek ve e-posta uygulamalarını adres tercihlerinizi en baştan öğrenmeye zorlayacaksınız."</string>
-    <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"Sık iletişim kurulanlar siliniyor…"</string>
-    <string name="status_available" msgid="2648156525685472626">"Müsait"</string>
-    <string name="status_away" msgid="2298688367552893953">"Dışarıda"</string>
-    <string name="status_busy" msgid="5990832098713248503">"Meşgul"</string>
-    <string name="contactsList" msgid="8806067891419291513">"Kişiler"</string>
-    <string name="contact_suggestions" msgid="3324166754807120006">"En Çok Önerilenler"</string>
-    <string name="local_invisible_directory" msgid="4723238462733650090">"Diğer"</string>
-    <string name="directory_search_label" msgid="4621215895484025229">"Dizin"</string>
-    <string name="directory_search_label_work" msgid="7679326282707414897">"İş dizini"</string>
-    <string name="local_search_label" msgid="907622822323119235">"Tüm kişiler"</string>
-    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Öneriler"</string>
-    <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Ben"</string>
-    <string name="missing_name" msgid="978606963362745020">"(Adsız)"</string>
-    <string name="description_view_contact_detail" msgid="2428742401208561136">"Kişiyi görüntüle"</string>
-    <string name="list_filter_phones" msgid="8763316061763437182">"Telefon numarası olan tüm kişiler"</string>
-    <string name="list_filter_phones_work" msgid="7083575404573422965">"İş profili kişileri"</string>
-    <string name="view_updates_from_group" msgid="9011641093168385729">"Güncellemeleri görüntüle"</string>
-    <string name="account_phone" msgid="7067809073194061035">"Yalnızca cihaz, senkronize edilmemiş"</string>
-    <string name="nameLabelsGroup" msgid="7730465833159557471">"Adı"</string>
-    <string name="nicknameLabelsGroup" msgid="6310556912361840029">"Takma ad"</string>
-    <string name="full_name" msgid="648186563998465740">"Ad"</string>
-    <string name="name_given" msgid="5096576006314820536">"Ad"</string>
-    <string name="name_family" msgid="6646235805198547467">"Soyadı"</string>
-    <string name="name_prefix" msgid="9215326539658838">"Ad öneki"</string>
-    <string name="name_middle" msgid="703755205331582769">"İkinci adı"</string>
-    <string name="name_suffix" msgid="5777083390282548702">"Ad soneki"</string>
-    <string name="name_phonetic" msgid="1650870996361663089">"Fonetik adı"</string>
-    <string name="name_phonetic_given" msgid="618812334274603170">"Fonetik ad"</string>
-    <string name="name_phonetic_middle" msgid="4826820763384625538">"Fonetik ikinci adı"</string>
-    <string name="name_phonetic_family" msgid="379905191212930771">"Fonetik soyadı"</string>
-    <string name="phoneLabelsGroup" msgid="169661929021355548">"Telefon"</string>
-    <string name="emailLabelsGroup" msgid="2249752810477488833">"E-posta gönder"</string>
-    <string name="postalLabelsGroup" msgid="6772000590189142253">"Adres"</string>
-    <string name="imLabelsGroup" msgid="5718066254237364731">"IM"</string>
-    <string name="organizationLabelsGroup" msgid="1101996309241601435">"Kuruluş"</string>
-    <string name="relationLabelsGroup" msgid="53866051664600053">"İlişki"</string>
-    <string name="eventLabelsGroup" msgid="1236970042646618489">"Özel tarih"</string>
-    <string name="sms" msgid="7574344928185328095">"Kısa mesaj"</string>
-    <string name="postal_address" msgid="1804707930129674200">"Adres"</string>
-    <string name="ghostData_company" msgid="2554310786296833424">"Şirket"</string>
-    <string name="ghostData_title" msgid="4994968731830184837">"Unvan"</string>
-    <string name="label_notes" msgid="2050255313694219786">"Notlar"</string>
-    <string name="label_sip_address" msgid="8883266182575965926">"SIP"</string>
-    <string name="websiteLabelsGroup" msgid="1630734286462186790">"Web sitesi"</string>
-    <string name="groupsLabel" msgid="2694002798416868728">"Gruplar"</string>
-    <string name="email_home" msgid="889830029388962171">"E-posta gönder (ev)"</string>
-    <string name="email_mobile" msgid="4487686436743741150">"E-posta gönder (mobil)"</string>
-    <string name="email_work" msgid="4223487303344613528">"E-posta gönder (iş)"</string>
-    <string name="email_other" msgid="4246411900126012062">"E-posta gönder"</string>
-    <string name="email_custom" msgid="7246580894327511013">"E-posta gönder (<xliff:g id="CUSTOM">%s</xliff:g>)"</string>
-    <string name="email" msgid="2807318537887091606">"E-posta gönder"</string>
-    <string name="postal_street" msgid="6918171741240802474">"Cadde"</string>
-    <string name="postal_city" msgid="8674569121430005628">"Şehir"</string>
-    <string name="postal_region" msgid="1730369286225469192">"Eyalet"</string>
-    <string name="postal_postcode" msgid="4450700741261990439">"Posta kodu"</string>
-    <string name="postal_country" msgid="232670707458768148">"Ülke"</string>
-    <string name="map_home" msgid="4181131107392126938">"Ev adresini görüntüle"</string>
-    <string name="map_work" msgid="5723471185992684400">"İş adresini görüntüle"</string>
-    <string name="map_other" msgid="2253764780863500516">"Adresi görüntüle"</string>
-    <string name="map_custom" msgid="5581743097882436157">"<xliff:g id="CUSTOM">%s</xliff:g> adresini görüntüle"</string>
-    <string name="chat_aim" msgid="2954364435497941659">"AIM kullanarak sohbet et"</string>
-    <string name="chat_msn" msgid="3130135239071228678">"Windows Live kullanarak sohbet et"</string>
-    <string name="chat_yahoo" msgid="3233552142326865347">"Yahoo kullanarak sohbet et"</string>
-    <string name="chat_skype" msgid="6486703981390592425">"Skype kullanarak sohbet et"</string>
-    <string name="chat_qq" msgid="786924280665740019">"QQ kullanarak sohbet et"</string>
-    <string name="chat_gtalk" msgid="7914674177243078035">"Google Talk kullanarak sohbet et"</string>
-    <string name="chat_icq" msgid="3292934726414765801">"ICQ kullanarak sohbet et"</string>
-    <string name="chat_jabber" msgid="6701542313597880204">"Jabber kullanarak sohbet et"</string>
-    <string name="chat" msgid="1020428260359370236">"Sohbet"</string>
-    <string name="list_filter_all_accounts" msgid="473782314881473992">"Tüm kişiler"</string>
-    <string name="listAllContactsInAccount" msgid="3486378621592995630">"<xliff:g id="NAME">%s</xliff:g> hesabındaki kişiler"</string>
-    <string name="listCustomView" msgid="5306282632413086731">"Özel görünümdeki kişiler"</string>
-    <string name="listSingleContact" msgid="8620818791932382627">"Tek kişi"</string>
-    <string name="display_options_sort_list_by" msgid="3541875948367831228">"Sıralama ölçütü"</string>
-    <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"Ad"</string>
-    <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"Soyadı"</string>
-    <string name="display_options_view_names_as" msgid="4204204205736735618">"Ad biçimi"</string>
-    <string name="display_options_view_given_name_first" msgid="2308026973021171020">"Önce ad"</string>
-    <string name="display_options_view_family_name_first" msgid="987430497292428242">"Önce soyadı"</string>
-    <string name="menu_clear_frequents" msgid="5358271535047496120">"Sık iletişim kurulanları sil"</string>
-    <string name="action_menu_back_from_search" msgid="3550669942742167644">"aramayı durdur"</string>
-    <string name="description_clear_search" msgid="2347258825265600782">"Aramayı temizle"</string>
-    <string name="select_account_dialog_title" msgid="2673504582803359239">"Hesap"</string>
-    <string name="set_default_account" msgid="7966099951006467572">"Çağrılar için her zaman bunu kullan"</string>
-    <string name="select_phone_account_for_calls" msgid="1784460686103423274">"Çağrıyı şununla yap:"</string>
-    <string name="call_with_a_note" msgid="6242261320491851133">"Notla telefon et"</string>
-    <string name="call_subject_hint" msgid="7233138753650420800">"Çağrıyla göndermek için bir not yazın..."</string>
-    <string name="send_and_call_button" msgid="4735168294120154013">"GÖNDER VE ARA"</string>
-    <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="tab_title" msgid="3387876802026074288">"<xliff:g id="TITLE">%1$s</xliff:g> sekmesi."</string>
-    <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
-      <item quantity="other"> <xliff:g id="TITLE_2">%1$s</xliff:g> sekmesi. <xliff:g id="COUNT_3">%2$d</xliff:g> okunmamış öğe. </item>
-      <item quantity="one"> <xliff:g id="TITLE_0">%1$s</xliff:g> sekmesi. <xliff:g id="COUNT_1">%2$d</xliff:g> okunmamış öğe. </item>
-    </plurals>
-    <string name="description_search_video_call" msgid="4337369876888024909">"Görüntülü görüşme"</string>
-    <string name="description_search_call_and_share" msgid="4912772842755050467">"Paylaşır ve telefon eder"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_custom">Ara (%s)</string>
+  <string name="call_home">Ara (ev)</string>
+  <string name="call_mobile">Ara (mobil)</string>
+  <string name="call_work">Ara (iş)</string>
+  <string name="call_fax_work">Ara (iş faksı)</string>
+  <string name="call_fax_home">Ara (ev faksı)</string>
+  <string name="call_pager">Ara (çağrı cihazı)</string>
+  <string name="call_other">Ara</string>
+  <string name="call_callback">Ara (geri arama)</string>
+  <string name="call_car">Ara (araç)</string>
+  <string name="call_company_main">Ara (şirket santrali)</string>
+  <string name="call_isdn">Ara (ISDN)</string>
+  <string name="call_main">Ara (santral)</string>
+  <string name="call_other_fax">Ara (faks)</string>
+  <string name="call_radio">Ara (telsiz)</string>
+  <string name="call_telex">Ara (teleks)</string>
+  <string name="call_tty_tdd">Ara (TTY/TDD)</string>
+  <string name="call_work_mobile">Ara (iş cep telefonu)</string>
+  <string name="call_work_pager">Ara (iş çağrı cihazı)</string>
+  <string name="call_assistant">Ara (%s)</string>
+  <string name="call_mms">Ara (MMS)</string>
+  <string name="sms_custom">SMS gönder (%s)</string>
+  <string name="sms_home">SMS gönder (ev)</string>
+  <string name="sms_mobile">SMS gönder (mobil)</string>
+  <string name="sms_work">SMS gönder (iş)</string>
+  <string name="sms_fax_work">SMS gönder (iş faksı)</string>
+  <string name="sms_fax_home">SMS gönder (ev faksı)</string>
+  <string name="sms_pager">SMS gönder (çağrı cihazı)</string>
+  <string name="sms_other">SMS gönder</string>
+  <string name="sms_callback">SMS gönder (geri arama)</string>
+  <string name="sms_car">SMS gönder (araç)</string>
+  <string name="sms_company_main">SMS gönder (şirket santrali)</string>
+  <string name="sms_isdn">SMS gönder (ISDN)</string>
+  <string name="sms_main">SMS gönder (santral)</string>
+  <string name="sms_other_fax">SMS gönder (faks)</string>
+  <string name="sms_radio">SMS gönder (telsiz)</string>
+  <string name="sms_telex">SMS gönder (teleks)</string>
+  <string name="sms_tty_tdd">SMS gönder (TTY/TDD)</string>
+  <string name="sms_work_mobile">SMS gönder (iş cep telefonu)</string>
+  <string name="sms_work_pager">SMS gönder (iş çağrı cihazı)</string>
+  <string name="sms_assistant">SMS gönder (%s)</string>
+  <string name="sms_mms">SMS gönder (MMS)</string>
+  <string name="clearFrequentsConfirmation_title">Sık iletişim kurulanlar silinsin mi?</string>
+  <string name="clearFrequentsConfirmation">Kişiler ve Telefon uygulamalarındaki sık iletişim kurulanlar listesini temizleyecek ve e-posta uygulamalarını adres tercihlerinizi en baştan öğrenmeye zorlayacaksınız.</string>
+  <string name="clearFrequentsProgress_title">Sık iletişim kurulanlar siliniyor…</string>
+  <string name="status_available">Müsait</string>
+  <string name="status_away">Dışarıda</string>
+  <string name="status_busy">Meşgul</string>
+  <string name="contactsList">Kişiler</string>
+  <string name="contact_suggestions">En Çok Önerilenler</string>
+  <string name="local_invisible_directory">Diğer</string>
+  <string name="directory_search_label">Dizin</string>
+  <string name="directory_search_label_work">İş dizini</string>
+  <string name="local_search_label">Tüm kişiler</string>
+  <string name="local_suggestions_search_label">Öneriler</string>
+  <string msgid="9154761216179882405" name="user_profile_contacts_list_header">Ben</string>
+  <string name="missing_name">(Adsız)</string>
+  <string msgid="2795575601596468581" name="description_view_contact_detail">Kişiyi görüntüle</string>
+  <string name="list_filter_phones">Telefon numarası olan tüm kişiler</string>
+  <string name="list_filter_phones_work">İş profili kişileri</string>
+  <string name="view_updates_from_group">Güncellemeleri görüntüle</string>
+  <string name="account_phone">Yalnızca cihaz, senkronize edilmemiş</string>
+  <string name="nameLabelsGroup">Adı</string>
+  <string name="nicknameLabelsGroup">Takma ad</string>
+  <string name="full_name">Ad</string>
+  <string name="name_given">Ad</string>
+  <string name="name_family">Soyadı</string>
+  <string name="name_prefix">Ad öneki</string>
+  <string name="name_middle">İkinci adı</string>
+  <string name="name_suffix">Ad soneki</string>
+  <string name="name_phonetic">Fonetik adı</string>
+  <string name="name_phonetic_given">Fonetik ad</string>
+  <string name="name_phonetic_middle">Fonetik ikinci adı</string>
+  <string name="name_phonetic_family">Fonetik soyadı</string>
+  <string name="phoneLabelsGroup">Telefon</string>
+  <string name="emailLabelsGroup">E-posta gönder</string>
+  <string name="postalLabelsGroup">Adres</string>
+  <string name="imLabelsGroup">IM</string>
+  <string name="organizationLabelsGroup">Kuruluş</string>
+  <string name="relationLabelsGroup">İlişki</string>
+  <string name="eventLabelsGroup">Özel tarih</string>
+  <string name="sms">Kısa mesaj</string>
+  <string name="postal_address">Adres</string>
+  <string name="ghostData_company">Şirket</string>
+  <string name="ghostData_title">Unvan</string>
+  <string name="label_notes">Notlar</string>
+  <string name="label_sip_address">SIP</string>
+  <string name="websiteLabelsGroup">Web sitesi</string>
+  <string name="groupsLabel">Gruplar</string>
+  <string name="email_home">E-posta gönder (ev)</string>
+  <string name="email_mobile">E-posta gönder (mobil)</string>
+  <string name="email_work">E-posta gönder (iş)</string>
+  <string name="email_other">E-posta gönder</string>
+  <string name="email_custom">E-posta gönder (%s)</string>
+  <string name="email">E-posta gönder</string>
+  <string name="postal_street">Cadde</string>
+  <string name="postal_city">Şehir</string>
+  <string name="postal_region">Eyalet</string>
+  <string name="postal_postcode">Posta kodu</string>
+  <string name="postal_country">Ülke</string>
+  <string name="map_home">Ev adresini görüntüle</string>
+  <string name="map_work">İş adresini görüntüle</string>
+  <string name="map_other">Adresi görüntüle</string>
+  <string name="map_custom">%s adresini görüntüle</string>
+  <string name="chat_aim">AIM kullanarak sohbet et</string>
+  <string name="chat_msn">Windows Live kullanarak sohbet et</string>
+  <string name="chat_yahoo">Yahoo kullanarak sohbet et</string>
+  <string name="chat_skype">Skype kullanarak sohbet et</string>
+  <string name="chat_qq">QQ kullanarak sohbet et</string>
+  <string name="chat_gtalk">Google Talk kullanarak sohbet et</string>
+  <string name="chat_icq">ICQ kullanarak sohbet et</string>
+  <string name="chat_jabber">Jabber kullanarak sohbet et</string>
+  <string name="chat">Sohbet</string>
+  <string name="list_filter_all_accounts">Tüm kişiler</string>
+  <string name="listAllContactsInAccount">%s hesabındaki kişiler</string>
+  <string name="listCustomView">Özel görünümdeki kişiler</string>
+  <string name="listSingleContact">Tek kişi</string>
+  <string name="display_options_sort_list_by">Sıralama ölçütü</string>
+  <string name="display_options_sort_by_given_name">Ad</string>
+  <string name="display_options_sort_by_family_name">Soyadı</string>
+  <string name="display_options_view_names_as">Ad biçimi</string>
+  <string name="display_options_view_given_name_first">Önce ad</string>
+  <string name="display_options_view_family_name_first">Önce soyadı</string>
+  <string name="menu_clear_frequents">Sık iletişim kurulanları sil</string>
+  <string name="action_menu_back_from_search">aramayı durdur</string>
+  <string name="description_clear_search">Aramayı temizle</string>
+  <string name="select_account_dialog_title">Hesap</string>
+  <string name="set_default_account">Çağrılar için her zaman bunu kullan</string>
+  <string name="select_phone_account_for_calls">Bu görüşme için kullanılacak SIM\'i seçin</string>
+  <string name="select_phone_account_for_calls_remember">Bu tercihi hatırla</string>
+  <string name="call_with_a_note">Notla telefon et</string>
+  <string name="call_subject_hint">Çağrıyla göndermek için bir not yazın...</string>
+  <string name="send_and_call_button">GÖNDER VE ARA</string>
+  <string name="call_subject_limit">%1$s / %2$s</string>
+  <string name="old_call_subject_type_and_number">%1$s %2$s</string>
+  <string name="tab_title">%1$s sekmesi.</string>
+  <plurals name="tab_title_with_unread_items">
+    <item quantity="one"> %1$s sekmesi. %2$d okunmamış öğe. </item>
+    <item quantity="other"> %1$s sekmesi. %2$d okunmamış öğe. </item>
+  </plurals>
+  <string name="description_search_video_call">Görüntülü görüşme</string>
+  <string name="description_search_call_and_share">Paylaşır ve telefon eder</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-uk/strings.xml b/java/com/android/contacts/common/res/values-uk/strings.xml
index 81dda39..5e97e43 100644
--- a/java/com/android/contacts/common/res/values-uk/strings.xml
+++ b/java/com/android/contacts/common/res/values-uk/strings.xml
@@ -1,164 +1,147 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="toast_text_copied" msgid="8979281391599667362">"Текст скопійовано"</string>
-    <string name="call_custom" msgid="3041673234638990874">"Набрати <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="call_home" msgid="125893483593803791">"Набрати домашній номер телефону"</string>
-    <string name="call_mobile" msgid="967589404494150813">"Набрати номер мобільного телефону"</string>
-    <string name="call_work" msgid="6040550697395300892">"Набрати робочий номер телефону"</string>
-    <string name="call_fax_work" msgid="5260192771364592922">"Набрати робочий номер факсу"</string>
-    <string name="call_fax_home" msgid="5174311195081144124">"Набрати домашній номер факсу"</string>
-    <string name="call_pager" msgid="6814149227741274161">"Набрати номер пейджера"</string>
-    <string name="call_other" msgid="5536385588712587235">"Набрати"</string>
-    <string name="call_callback" msgid="6314019862718112786">"Набрати номер зворотного виклику"</string>
-    <string name="call_car" msgid="3197417098027764954">"Набрати номер в авто"</string>
-    <string name="call_company_main" msgid="2557663310028446397">"Набрати основний робочий номер телефону"</string>
-    <string name="call_isdn" msgid="4691270442763649522">"Набрати номер ISDN"</string>
-    <string name="call_main" msgid="3293707608770407814">"Набрати основний номер телефону"</string>
-    <string name="call_other_fax" msgid="4724521984879021465">"Набрати номер факсу"</string>
-    <string name="call_radio" msgid="8942441419845057942">"Набрати номер радіотелефону"</string>
-    <string name="call_telex" msgid="2031514461660668351">"Набрати номер телексу"</string>
-    <string name="call_tty_tdd" msgid="7807210224965727701">"Набрати номер TTY/TDD"</string>
-    <string name="call_work_mobile" msgid="2716342732938578495">"Набрати робочий номер мобільного телефону"</string>
-    <string name="call_work_pager" msgid="3791778749827366574">"Набрати робочий номер пейджера"</string>
-    <string name="call_assistant" msgid="4177478845473789294">"Набрати <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
-    <string name="call_mms" msgid="4958811711741872901">"Набрати номер MMS"</string>
-    <string name="sms_custom" msgid="8785368968605026317">"SMS на <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="sms_home" msgid="3527719551060295243">"SMS на домашній номер телефону"</string>
-    <string name="sms_mobile" msgid="8883045857887736518">"SMS на номер мобільного телефону"</string>
-    <string name="sms_work" msgid="4158595439553450966">"SMS на робочий номер телефону"</string>
-    <string name="sms_fax_work" msgid="5483726627718055248">"SMS на робочий номер факсу"</string>
-    <string name="sms_fax_home" msgid="9219265155770746077">"SMS на домашній номер факсу"</string>
-    <string name="sms_pager" msgid="4901085068525193933">"SMS на номер пейджера"</string>
-    <string name="sms_other" msgid="1742702947993285933">"SMS"</string>
-    <string name="sms_callback" msgid="5833483630377538308">"SMS на номер зворотного виклику"</string>
-    <string name="sms_car" msgid="4314577266154395174">"SMS на номер в авто"</string>
-    <string name="sms_company_main" msgid="2308160928487360705">"SMS на основний робочий номер телефону"</string>
-    <string name="sms_isdn" msgid="6394300346179302542">"SMS на номер ISDN"</string>
-    <string name="sms_main" msgid="8908087742014140774">"SMS на основний номер"</string>
-    <string name="sms_other_fax" msgid="8768455473295405427">"SMS на номер факсу"</string>
-    <string name="sms_radio" msgid="855555176531704682">"SMS на номер радіотелефону"</string>
-    <string name="sms_telex" msgid="6269029276223252719">"SMS на номер телексу"</string>
-    <string name="sms_tty_tdd" msgid="6229057354509192444">"SMS на номер TTY/TDD"</string>
-    <string name="sms_work_mobile" msgid="2155975469329969840">"SMS на робочий номер мобільного телефону"</string>
-    <string name="sms_work_pager" msgid="8500140274906830742">"SMS на робочий номер пейджера"</string>
-    <string name="sms_assistant" msgid="8513548482745330818">"SMS на <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
-    <string name="sms_mms" msgid="5187888900503248542">"SMS на номер MMS"</string>
-    <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"Очистити список частих контактів?"</string>
-    <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"Буде видалено список користувачів, з якими ви часто спілкуєтеся, з додатків Контакти та Телефон і скинуто налаштування адрес у додатках для електронної пошти."</string>
-    <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"Очищення списку частих контактів…"</string>
-    <string name="status_available" msgid="2648156525685472626">"На місці"</string>
-    <string name="status_away" msgid="2298688367552893953">"Не на місці"</string>
-    <string name="status_busy" msgid="5990832098713248503">"Не турбувати"</string>
-    <string name="contactsList" msgid="8806067891419291513">"Контакти"</string>
-    <string name="contact_suggestions" msgid="3324166754807120006">"Найкращі пропозиції"</string>
-    <string name="local_invisible_directory" msgid="4723238462733650090">"Інші"</string>
-    <string name="directory_search_label" msgid="4621215895484025229">"Каталог"</string>
-    <string name="directory_search_label_work" msgid="7679326282707414897">"Робочі контакти"</string>
-    <string name="local_search_label" msgid="907622822323119235">"Усі контакти"</string>
-    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Пропозиції"</string>
-    <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Я"</string>
-    <string name="missing_name" msgid="978606963362745020">"(Без імені)"</string>
-    <string name="description_view_contact_detail" msgid="2428742401208561136">"Переглянути контакт"</string>
-    <string name="list_filter_phones" msgid="8763316061763437182">"Усі контакти з номерами телефону"</string>
-    <string name="list_filter_phones_work" msgid="7083575404573422965">"Контакти в робочому профілі"</string>
-    <string name="view_updates_from_group" msgid="9011641093168385729">"Переглянути оновлення"</string>
-    <string name="account_phone" msgid="7067809073194061035">"Лише на пристрої, не синхронізується"</string>
-    <string name="nameLabelsGroup" msgid="7730465833159557471">"Ім’я"</string>
-    <string name="nicknameLabelsGroup" msgid="6310556912361840029">"Псевдонім"</string>
-    <string name="full_name" msgid="648186563998465740">"Ім\'я"</string>
-    <string name="name_given" msgid="5096576006314820536">"Ім’я"</string>
-    <string name="name_family" msgid="6646235805198547467">"Прізвище"</string>
-    <string name="name_prefix" msgid="9215326539658838">"Префікс імені"</string>
-    <string name="name_middle" msgid="703755205331582769">"По батькові"</string>
-    <string name="name_suffix" msgid="5777083390282548702">"Суфікс імені"</string>
-    <string name="name_phonetic" msgid="1650870996361663089">"Вимова імені"</string>
-    <string name="name_phonetic_given" msgid="618812334274603170">"Вимова імені"</string>
-    <string name="name_phonetic_middle" msgid="4826820763384625538">"Вимова по батькові"</string>
-    <string name="name_phonetic_family" msgid="379905191212930771">"Вимова прізвища"</string>
-    <string name="phoneLabelsGroup" msgid="169661929021355548">"Телефон"</string>
-    <string name="emailLabelsGroup" msgid="2249752810477488833">"Написати"</string>
-    <string name="postalLabelsGroup" msgid="6772000590189142253">"Адреса"</string>
-    <string name="imLabelsGroup" msgid="5718066254237364731">"Чат"</string>
-    <string name="organizationLabelsGroup" msgid="1101996309241601435">"Організація"</string>
-    <string name="relationLabelsGroup" msgid="53866051664600053">"Зв’язки"</string>
-    <string name="eventLabelsGroup" msgid="1236970042646618489">"Спеціальна дата"</string>
-    <string name="sms" msgid="7574344928185328095">"SMS"</string>
-    <string name="postal_address" msgid="1804707930129674200">"Адреса"</string>
-    <string name="ghostData_company" msgid="2554310786296833424">"Компанія"</string>
-    <string name="ghostData_title" msgid="4994968731830184837">"Назва"</string>
-    <string name="label_notes" msgid="2050255313694219786">"Нотатки"</string>
-    <string name="label_sip_address" msgid="8883266182575965926">"SIP"</string>
-    <string name="websiteLabelsGroup" msgid="1630734286462186790">"Веб-сайт"</string>
-    <string name="groupsLabel" msgid="2694002798416868728">"Групи"</string>
-    <string name="email_home" msgid="889830029388962171">"Написати на домашню електронну адресу"</string>
-    <string name="email_mobile" msgid="4487686436743741150">"Написати на мобільну електронну адресу"</string>
-    <string name="email_work" msgid="4223487303344613528">"Написати на робочу електронну адресу"</string>
-    <string name="email_other" msgid="4246411900126012062">"Написати"</string>
-    <string name="email_custom" msgid="7246580894327511013">"Написати на <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="email" msgid="2807318537887091606">"Написати"</string>
-    <string name="postal_street" msgid="6918171741240802474">"Вулиця"</string>
-    <string name="postal_city" msgid="8674569121430005628">"Місто"</string>
-    <string name="postal_region" msgid="1730369286225469192">"Штат/регіон"</string>
-    <string name="postal_postcode" msgid="4450700741261990439">"Поштовий індекс"</string>
-    <string name="postal_country" msgid="232670707458768148">"Країна"</string>
-    <string name="map_home" msgid="4181131107392126938">"Переглянути домашню адресу"</string>
-    <string name="map_work" msgid="5723471185992684400">"Переглянути робочу адресу"</string>
-    <string name="map_other" msgid="2253764780863500516">"Переглянути адресу"</string>
-    <string name="map_custom" msgid="5581743097882436157">"Переглянути адресу <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="chat_aim" msgid="2954364435497941659">"Чат через AIM"</string>
-    <string name="chat_msn" msgid="3130135239071228678">"Чат через Windows Live"</string>
-    <string name="chat_yahoo" msgid="3233552142326865347">"Чат через Yahoo"</string>
-    <string name="chat_skype" msgid="6486703981390592425">"Чат через Skype"</string>
-    <string name="chat_qq" msgid="786924280665740019">"Чат через QQ"</string>
-    <string name="chat_gtalk" msgid="7914674177243078035">"Чат через Google Talk"</string>
-    <string name="chat_icq" msgid="3292934726414765801">"Чат через ICQ"</string>
-    <string name="chat_jabber" msgid="6701542313597880204">"Чат через Jabber"</string>
-    <string name="chat" msgid="1020428260359370236">"Чат"</string>
-    <string name="list_filter_all_accounts" msgid="473782314881473992">"Усі контакти"</string>
-    <string name="listAllContactsInAccount" msgid="3486378621592995630">"Контакти в обліковому записі <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="listCustomView" msgid="5306282632413086731">"Користувацький фільтр"</string>
-    <string name="listSingleContact" msgid="8620818791932382627">"Один контакт"</string>
-    <string name="display_options_sort_list_by" msgid="3541875948367831228">"Параметри сортування"</string>
-    <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"Ім’я"</string>
-    <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"Прізвище"</string>
-    <string name="display_options_view_names_as" msgid="4204204205736735618">"Формат імені"</string>
-    <string name="display_options_view_given_name_first" msgid="2308026973021171020">"Ім’я спочатку"</string>
-    <string name="display_options_view_family_name_first" msgid="987430497292428242">"Прізвище спочатку"</string>
-    <string name="menu_clear_frequents" msgid="5358271535047496120">"Очистити часті контакти"</string>
-    <string name="action_menu_back_from_search" msgid="3550669942742167644">"припинити пошук"</string>
-    <string name="description_clear_search" msgid="2347258825265600782">"Очистити поле пошуку"</string>
-    <string name="select_account_dialog_title" msgid="2673504582803359239">"Обліковий запис"</string>
-    <string name="set_default_account" msgid="7966099951006467572">"Завжди використовувати для дзвінків"</string>
-    <string name="select_phone_account_for_calls" msgid="1784460686103423274">"Телефонувати за допомогою"</string>
-    <string name="call_with_a_note" msgid="6242261320491851133">"Зателефонувати й надіслати нотатку"</string>
-    <string name="call_subject_hint" msgid="7233138753650420800">"Введіть нотатку, яку хочете надіслати під час дзвінка…"</string>
-    <string name="send_and_call_button" msgid="4735168294120154013">"ЗАТЕЛЕФОНУВАТИ Й НАДІСЛАТИ"</string>
-    <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g> з <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="tab_title" msgid="3387876802026074288">"Вкладка \"<xliff:g id="TITLE">%1$s</xliff:g>\"."</string>
-    <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
-      <item quantity="one"> Вкладка \"<xliff:g id="TITLE_2">%1$s</xliff:g>\". <xliff:g id="COUNT_3">%2$d</xliff:g> непрочитаний елемент. </item>
-      <item quantity="few"> Вкладка \"<xliff:g id="TITLE_2">%1$s</xliff:g>\". <xliff:g id="COUNT_3">%2$d</xliff:g> непрочитаних елементи. </item>
-      <item quantity="many"> Вкладка \"<xliff:g id="TITLE_2">%1$s</xliff:g>\". <xliff:g id="COUNT_3">%2$d</xliff:g> непрочитаних елементів. </item>
-      <item quantity="other"> Вкладка \"<xliff:g id="TITLE_2">%1$s</xliff:g>\". <xliff:g id="COUNT_3">%2$d</xliff:g> непрочитаного елемента. </item>
-    </plurals>
-    <string name="description_search_video_call" msgid="4337369876888024909">"Відеодзвінок"</string>
-    <string name="description_search_call_and_share" msgid="4912772842755050467">"Надіслати й зателефонувати"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_custom">Набрати %s</string>
+  <string name="call_home">Набрати домашній номер телефону</string>
+  <string name="call_mobile">Набрати номер мобільного телефону</string>
+  <string name="call_work">Набрати робочий номер телефону</string>
+  <string name="call_fax_work">Набрати робочий номер факсу</string>
+  <string name="call_fax_home">Набрати домашній номер факсу</string>
+  <string name="call_pager">Набрати номер пейджера</string>
+  <string name="call_other">Набрати</string>
+  <string name="call_callback">Набрати номер зворотного виклику</string>
+  <string name="call_car">Набрати номер в авто</string>
+  <string name="call_company_main">Набрати основний робочий номер телефону</string>
+  <string name="call_isdn">Набрати номер ISDN</string>
+  <string name="call_main">Набрати основний номер телефону</string>
+  <string name="call_other_fax">Набрати номер факсу</string>
+  <string name="call_radio">Набрати номер радіотелефону</string>
+  <string name="call_telex">Набрати номер телексу</string>
+  <string name="call_tty_tdd">Набрати номер TTY/TDD</string>
+  <string name="call_work_mobile">Набрати робочий номер мобільного телефону</string>
+  <string name="call_work_pager">Набрати робочий номер пейджера</string>
+  <string name="call_assistant">Набрати %s</string>
+  <string name="call_mms">Набрати номер MMS</string>
+  <string name="sms_custom">SMS на %s</string>
+  <string name="sms_home">SMS на домашній номер телефону</string>
+  <string name="sms_mobile">SMS на номер мобільного телефону</string>
+  <string name="sms_work">SMS на робочий номер телефону</string>
+  <string name="sms_fax_work">SMS на робочий номер факсу</string>
+  <string name="sms_fax_home">SMS на домашній номер факсу</string>
+  <string name="sms_pager">SMS на номер пейджера</string>
+  <string name="sms_other">SMS</string>
+  <string name="sms_callback">SMS на номер зворотного виклику</string>
+  <string name="sms_car">SMS на номер в авто</string>
+  <string name="sms_company_main">SMS на основний робочий номер телефону</string>
+  <string name="sms_isdn">SMS на номер ISDN</string>
+  <string name="sms_main">SMS на основний номер</string>
+  <string name="sms_other_fax">SMS на номер факсу</string>
+  <string name="sms_radio">SMS на номер радіотелефону</string>
+  <string name="sms_telex">SMS на номер телексу</string>
+  <string name="sms_tty_tdd">SMS на номер TTY/TDD</string>
+  <string name="sms_work_mobile">SMS на робочий номер мобільного телефону</string>
+  <string name="sms_work_pager">SMS на робочий номер пейджера</string>
+  <string name="sms_assistant">SMS на %s</string>
+  <string name="sms_mms">SMS на номер MMS</string>
+  <string name="clearFrequentsConfirmation_title">Очистити список частих контактів?</string>
+  <string name="clearFrequentsConfirmation">Буде видалено список користувачів, з якими ви часто спілкуєтеся, з додатків Контакти та Телефон і скинуто налаштування адрес у додатках для електронної пошти.</string>
+  <string name="clearFrequentsProgress_title">Очищення списку частих контактів…</string>
+  <string name="status_available">На місці</string>
+  <string name="status_away">Не на місці</string>
+  <string name="status_busy">Не турбувати</string>
+  <string name="contactsList">Контакти</string>
+  <string name="contact_suggestions">Найкращі пропозиції</string>
+  <string name="local_invisible_directory">Інші</string>
+  <string name="directory_search_label">Каталог</string>
+  <string name="directory_search_label_work">Робочі контакти</string>
+  <string name="local_search_label">Усі контакти</string>
+  <string name="local_suggestions_search_label">Пропозиції</string>
+  <string msgid="9154761216179882405" name="user_profile_contacts_list_header">Я</string>
+  <string name="missing_name">(Без імені)</string>
+  <string msgid="2795575601596468581" name="description_view_contact_detail">Переглянути контакт</string>
+  <string name="list_filter_phones">Усі контакти з номерами телефону</string>
+  <string name="list_filter_phones_work">Контакти в робочому профілі</string>
+  <string name="view_updates_from_group">Переглянути оновлення</string>
+  <string name="account_phone">Лише на пристрої, не синхронізується</string>
+  <string name="nameLabelsGroup">Ім’я</string>
+  <string name="nicknameLabelsGroup">Псевдонім</string>
+  <string name="full_name">Ім\'я</string>
+  <string name="name_given">Ім’я</string>
+  <string name="name_family">Прізвище</string>
+  <string name="name_prefix">Префікс імені</string>
+  <string name="name_middle">По батькові</string>
+  <string name="name_suffix">Суфікс імені</string>
+  <string name="name_phonetic">Вимова імені</string>
+  <string name="name_phonetic_given">Вимова імені</string>
+  <string name="name_phonetic_middle">Вимова по батькові</string>
+  <string name="name_phonetic_family">Вимова прізвища</string>
+  <string name="phoneLabelsGroup">Телефон</string>
+  <string name="emailLabelsGroup">Написати</string>
+  <string name="postalLabelsGroup">Адреса</string>
+  <string name="imLabelsGroup">Чат</string>
+  <string name="organizationLabelsGroup">Організація</string>
+  <string name="relationLabelsGroup">Зв’язки</string>
+  <string name="eventLabelsGroup">Спеціальна дата</string>
+  <string name="sms">SMS</string>
+  <string name="postal_address">Адреса</string>
+  <string name="ghostData_company">Компанія</string>
+  <string name="ghostData_title">Назва</string>
+  <string name="label_notes">Нотатки</string>
+  <string name="label_sip_address">SIP</string>
+  <string name="websiteLabelsGroup">Веб-сайт</string>
+  <string name="groupsLabel">Групи</string>
+  <string name="email_home">Написати на домашню електронну адресу</string>
+  <string name="email_mobile">Написати на мобільну електронну адресу</string>
+  <string name="email_work">Написати на робочу електронну адресу</string>
+  <string name="email_other">Написати</string>
+  <string name="email_custom">Написати на %s</string>
+  <string name="email">Написати</string>
+  <string name="postal_street">Вулиця</string>
+  <string name="postal_city">Місто</string>
+  <string name="postal_region">Штат/регіон</string>
+  <string name="postal_postcode">Поштовий індекс</string>
+  <string name="postal_country">Країна</string>
+  <string name="map_home">Переглянути домашню адресу</string>
+  <string name="map_work">Переглянути робочу адресу</string>
+  <string name="map_other">Переглянути адресу</string>
+  <string name="map_custom">Переглянути адресу %s</string>
+  <string name="chat_aim">Чат через AIM</string>
+  <string name="chat_msn">Чат через Windows Live</string>
+  <string name="chat_yahoo">Чат через Yahoo</string>
+  <string name="chat_skype">Чат через Skype</string>
+  <string name="chat_qq">Чат через QQ</string>
+  <string name="chat_gtalk">Чат через Google Talk</string>
+  <string name="chat_icq">Чат через ICQ</string>
+  <string name="chat_jabber">Чат через Jabber</string>
+  <string name="chat">Чат</string>
+  <string name="list_filter_all_accounts">Усі контакти</string>
+  <string name="listAllContactsInAccount">Контакти в обліковому записі %s</string>
+  <string name="listCustomView">Користувацький фільтр</string>
+  <string name="listSingleContact">Один контакт</string>
+  <string name="display_options_sort_list_by">Параметри сортування</string>
+  <string name="display_options_sort_by_given_name">Ім’я</string>
+  <string name="display_options_sort_by_family_name">Прізвище</string>
+  <string name="display_options_view_names_as">Формат імені</string>
+  <string name="display_options_view_given_name_first">Ім’я спочатку</string>
+  <string name="display_options_view_family_name_first">Прізвище спочатку</string>
+  <string name="menu_clear_frequents">Очистити часті контакти</string>
+  <string name="action_menu_back_from_search">припинити пошук</string>
+  <string name="description_clear_search">Очистити поле пошуку</string>
+  <string name="select_account_dialog_title">Обліковий запис</string>
+  <string name="set_default_account">Завжди використовувати для дзвінків</string>
+  <string name="select_phone_account_for_calls">Вибрати SIM-карту для цього виклику</string>
+  <string name="select_phone_account_for_calls_remember">Запам’ятати цей вибір</string>
+  <string name="call_with_a_note">Зателефонувати й надіслати нотатку</string>
+  <string name="call_subject_hint">Введіть нотатку, яку хочете надіслати під час дзвінка…</string>
+  <string name="send_and_call_button">ЗАТЕЛЕФОНУВАТИ Й НАДІСЛАТИ</string>
+  <string name="call_subject_limit">%1$s з %2$s</string>
+  <string name="old_call_subject_type_and_number">%1$s %2$s</string>
+  <string name="tab_title">Вкладка \"%1$s\".</string>
+  <plurals name="tab_title_with_unread_items">
+    <item quantity="one"> Вкладка \"%1$s\". %2$d непрочитаний елемент. </item>
+    <item quantity="few"> Вкладка \"%1$s\". %2$d непрочитаних елементи. </item>
+    <item quantity="many"> Вкладка \"%1$s\". %2$d непрочитаних елементів. </item>
+    <item quantity="other"> Вкладка \"%1$s\". %2$d непрочитаного елемента. </item>
+  </plurals>
+  <string name="description_search_video_call">Відеодзвінок</string>
+  <string name="description_search_call_and_share">Надіслати й зателефонувати</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-ur/strings.xml b/java/com/android/contacts/common/res/values-ur/strings.xml
index eb9c888..89aa853 100644
--- a/java/com/android/contacts/common/res/values-ur/strings.xml
+++ b/java/com/android/contacts/common/res/values-ur/strings.xml
@@ -1,162 +1,145 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="toast_text_copied" msgid="8979281391599667362">"متن کاپی ہوگیا"</string>
-    <string name="call_custom" msgid="3041673234638990874">"<xliff:g id="CUSTOM">%s</xliff:g> کو کال کریں"</string>
-    <string name="call_home" msgid="125893483593803791">"گھر پر کال کریں"</string>
-    <string name="call_mobile" msgid="967589404494150813">"موبائل پر کال کریں"</string>
-    <string name="call_work" msgid="6040550697395300892">"دفتر کے نمبر پر کال کریں"</string>
-    <string name="call_fax_work" msgid="5260192771364592922">"دفتر کے فیکس پر کال کریں"</string>
-    <string name="call_fax_home" msgid="5174311195081144124">"گھر کے فیکس پر کال کریں"</string>
-    <string name="call_pager" msgid="6814149227741274161">"پیجر پر کال کریں"</string>
-    <string name="call_other" msgid="5536385588712587235">"کال کریں"</string>
-    <string name="call_callback" msgid="6314019862718112786">"کال بیک نمبر پر کال کریں"</string>
-    <string name="call_car" msgid="3197417098027764954">"کار کے نمبر پر کال کریں"</string>
-    <string name="call_company_main" msgid="2557663310028446397">"کمپنی کے اصل نمبر پر کال کریں"</string>
-    <string name="call_isdn" msgid="4691270442763649522">"‏ISDN پر کال کریں"</string>
-    <string name="call_main" msgid="3293707608770407814">"اصل نمبر پر کال کریں"</string>
-    <string name="call_other_fax" msgid="4724521984879021465">"فیکس پر کال کریں"</string>
-    <string name="call_radio" msgid="8942441419845057942">"ریڈیو پر کال کریں"</string>
-    <string name="call_telex" msgid="2031514461660668351">"ٹیلیکس پر کال کریں"</string>
-    <string name="call_tty_tdd" msgid="7807210224965727701">"‏TTY / TDD پر کال کریں"</string>
-    <string name="call_work_mobile" msgid="2716342732938578495">"دفتر کے موبائل پر کال کریں"</string>
-    <string name="call_work_pager" msgid="3791778749827366574">"دفتر کے پیجر پر کال کریں"</string>
-    <string name="call_assistant" msgid="4177478845473789294">"<xliff:g id="ASSISTANT">%s</xliff:g> کو کال کریں"</string>
-    <string name="call_mms" msgid="4958811711741872901">"‏MMS نمبر پر کال کریں"</string>
-    <string name="sms_custom" msgid="8785368968605026317">"<xliff:g id="CUSTOM">%s</xliff:g> پر متن بھیجیں"</string>
-    <string name="sms_home" msgid="3527719551060295243">"گھر کے نمبر پر متن بھیجیں"</string>
-    <string name="sms_mobile" msgid="8883045857887736518">"موبائل پر متن بھیجیں"</string>
-    <string name="sms_work" msgid="4158595439553450966">"دفتر کے نمبر پر متن بھیجیں"</string>
-    <string name="sms_fax_work" msgid="5483726627718055248">"دفتر کے فیکس نمبر پر متن بھیجیں"</string>
-    <string name="sms_fax_home" msgid="9219265155770746077">"گھر کے فیکس نمبر پر متن بھیجیں"</string>
-    <string name="sms_pager" msgid="4901085068525193933">"پیجر پر متن بھیجیں"</string>
-    <string name="sms_other" msgid="1742702947993285933">"متن بھیجیں"</string>
-    <string name="sms_callback" msgid="5833483630377538308">"کال بیک نمبر پر متن بھیجیں"</string>
-    <string name="sms_car" msgid="4314577266154395174">"کار کے نمبر پر متن بھیجیں"</string>
-    <string name="sms_company_main" msgid="2308160928487360705">"کمپنی کے اصل نمبر پر متن بھیجیں"</string>
-    <string name="sms_isdn" msgid="6394300346179302542">"‏ISDN نمبر پر متن بھیجیں"</string>
-    <string name="sms_main" msgid="8908087742014140774">"اصل نمبر پر متن بھیجیں"</string>
-    <string name="sms_other_fax" msgid="8768455473295405427">"فیکس پر متن بھیجیں"</string>
-    <string name="sms_radio" msgid="855555176531704682">"ریڈیو پر متن بھیجیں"</string>
-    <string name="sms_telex" msgid="6269029276223252719">"ٹیلکس پر متن بھیجیں"</string>
-    <string name="sms_tty_tdd" msgid="6229057354509192444">"‏TTY / TDD پر متن بھیجیں"</string>
-    <string name="sms_work_mobile" msgid="2155975469329969840">"دفتر کے موبائل پر متن بھیجیں"</string>
-    <string name="sms_work_pager" msgid="8500140274906830742">"دفتر کے پیجر پر متن بھیجیں"</string>
-    <string name="sms_assistant" msgid="8513548482745330818">"<xliff:g id="ASSISTANT">%s</xliff:g> پر متن بھیجیں"</string>
-    <string name="sms_mms" msgid="5187888900503248542">"‏MMS نمبر پر متن بھیجیں"</string>
-    <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"اکثر رابطہ کردہ کو صاف کریں؟"</string>
-    <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"آپ رابطے اور فون ایپس میں اکثر رابطہ کردہ فہرست کو صاف کر دیں گے اور ای میل ایپس کو از سر نو اپنے پتے کی ترجیحات جاننے پر مجبور کریں گے۔"</string>
-    <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"اکثر رابطہ کردہ کو صاف کر رہا ہے…"</string>
-    <string name="status_available" msgid="2648156525685472626">"دستیاب"</string>
-    <string name="status_away" msgid="2298688367552893953">"دور"</string>
-    <string name="status_busy" msgid="5990832098713248503">"مصروف"</string>
-    <string name="contactsList" msgid="8806067891419291513">"رابطے"</string>
-    <string name="contact_suggestions" msgid="3324166754807120006">"سرفہرست تجویز کردہ"</string>
-    <string name="local_invisible_directory" msgid="4723238462733650090">"دیگر"</string>
-    <string name="directory_search_label" msgid="4621215895484025229">"ڈائریکٹری"</string>
-    <string name="directory_search_label_work" msgid="7679326282707414897">"دفتری ڈائرکٹری"</string>
-    <string name="local_search_label" msgid="907622822323119235">"سبھی رابطے"</string>
-    <string name="local_suggestions_search_label" msgid="1178575146224386118">"تجاویز"</string>
-    <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"میں"</string>
-    <string name="missing_name" msgid="978606963362745020">"(کوئی نام نہیں)"</string>
-    <string name="description_view_contact_detail" msgid="2428742401208561136">"رابطہ دیکھیں"</string>
-    <string name="list_filter_phones" msgid="8763316061763437182">"فون نمبرز کے ساتھ سبھی رابطے"</string>
-    <string name="list_filter_phones_work" msgid="7083575404573422965">"دفتری پروفائل رابطے"</string>
-    <string name="view_updates_from_group" msgid="9011641093168385729">"اپ ڈیٹس دیکھیں"</string>
-    <string name="account_phone" msgid="7067809073194061035">"صرف آلہ۔ غیر مطابقت پذیر"</string>
-    <string name="nameLabelsGroup" msgid="7730465833159557471">"نام"</string>
-    <string name="nicknameLabelsGroup" msgid="6310556912361840029">"عرفی نام"</string>
-    <string name="full_name" msgid="648186563998465740">"نام"</string>
-    <string name="name_given" msgid="5096576006314820536">"پہلا نام"</string>
-    <string name="name_family" msgid="6646235805198547467">"آخری نام"</string>
-    <string name="name_prefix" msgid="9215326539658838">"نام کا سابقہ"</string>
-    <string name="name_middle" msgid="703755205331582769">"درمیانی نام"</string>
-    <string name="name_suffix" msgid="5777083390282548702">"نام کا لاحقہ"</string>
-    <string name="name_phonetic" msgid="1650870996361663089">"فونیٹک نام"</string>
-    <string name="name_phonetic_given" msgid="618812334274603170">"فونیٹک پہلا نام"</string>
-    <string name="name_phonetic_middle" msgid="4826820763384625538">"فونیٹک درمیانی نام"</string>
-    <string name="name_phonetic_family" msgid="379905191212930771">"فونیٹک آخری نام"</string>
-    <string name="phoneLabelsGroup" msgid="169661929021355548">"فون"</string>
-    <string name="emailLabelsGroup" msgid="2249752810477488833">"ای میل کریں"</string>
-    <string name="postalLabelsGroup" msgid="6772000590189142253">"پتہ"</string>
-    <string name="imLabelsGroup" msgid="5718066254237364731">"IM"</string>
-    <string name="organizationLabelsGroup" msgid="1101996309241601435">"تنظیم"</string>
-    <string name="relationLabelsGroup" msgid="53866051664600053">"تعلق"</string>
-    <string name="eventLabelsGroup" msgid="1236970042646618489">"خاص تاریخ"</string>
-    <string name="sms" msgid="7574344928185328095">"متنی پیغام"</string>
-    <string name="postal_address" msgid="1804707930129674200">"پتہ"</string>
-    <string name="ghostData_company" msgid="2554310786296833424">"کمپنی"</string>
-    <string name="ghostData_title" msgid="4994968731830184837">"عنوان"</string>
-    <string name="label_notes" msgid="2050255313694219786">"نوٹس"</string>
-    <string name="label_sip_address" msgid="8883266182575965926">"SIP"</string>
-    <string name="websiteLabelsGroup" msgid="1630734286462186790">"ویب سائٹ"</string>
-    <string name="groupsLabel" msgid="2694002798416868728">"گروپس"</string>
-    <string name="email_home" msgid="889830029388962171">"گھر کے پتے پر ای میل کریں"</string>
-    <string name="email_mobile" msgid="4487686436743741150">"موبائل پر ای میل کریں"</string>
-    <string name="email_work" msgid="4223487303344613528">"دفتر کو ای میل کریں"</string>
-    <string name="email_other" msgid="4246411900126012062">"ای میل کریں"</string>
-    <string name="email_custom" msgid="7246580894327511013">"ای میل کریں <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="email" msgid="2807318537887091606">"ای میل کریں"</string>
-    <string name="postal_street" msgid="6918171741240802474">"اسٹریٹ"</string>
-    <string name="postal_city" msgid="8674569121430005628">"شہر"</string>
-    <string name="postal_region" msgid="1730369286225469192">"ریاست"</string>
-    <string name="postal_postcode" msgid="4450700741261990439">"زپ کوڈ"</string>
-    <string name="postal_country" msgid="232670707458768148">"ملک"</string>
-    <string name="map_home" msgid="4181131107392126938">"گھر کا پتہ دیکھیں"</string>
-    <string name="map_work" msgid="5723471185992684400">"دفتر کا پتہ دیکھیں"</string>
-    <string name="map_other" msgid="2253764780863500516">"پتہ دیکھیں"</string>
-    <string name="map_custom" msgid="5581743097882436157">"<xliff:g id="CUSTOM">%s</xliff:g> پتہ دیکھیں"</string>
-    <string name="chat_aim" msgid="2954364435497941659">"‏AIM کے ذریعے چیٹ کریں"</string>
-    <string name="chat_msn" msgid="3130135239071228678">"‏Windows Live کے ذریعے چیٹ کریں"</string>
-    <string name="chat_yahoo" msgid="3233552142326865347">"‏Yahoo کے ذریعے چیٹ کریں"</string>
-    <string name="chat_skype" msgid="6486703981390592425">"‏Skype کے ذریعے چیٹ کریں"</string>
-    <string name="chat_qq" msgid="786924280665740019">"‏QQ کے ذریعے چیٹ کریں"</string>
-    <string name="chat_gtalk" msgid="7914674177243078035">"‏Google Talk کے ذریعے چیٹ کریں"</string>
-    <string name="chat_icq" msgid="3292934726414765801">"‏ICQ کے ذریعے چیٹ کریں"</string>
-    <string name="chat_jabber" msgid="6701542313597880204">"‏Jabber کے ذریعے چیٹ کریں"</string>
-    <string name="chat" msgid="1020428260359370236">"چیٹ کریں"</string>
-    <string name="list_filter_all_accounts" msgid="473782314881473992">"سبھی رابطے"</string>
-    <string name="listAllContactsInAccount" msgid="3486378621592995630">"<xliff:g id="NAME">%s</xliff:g> میں رابطے"</string>
-    <string name="listCustomView" msgid="5306282632413086731">"حسب ضرورت منظر میں رابطے"</string>
-    <string name="listSingleContact" msgid="8620818791932382627">"واحد رابطہ"</string>
-    <string name="display_options_sort_list_by" msgid="3541875948367831228">"ترتیب دیں بلحاظ"</string>
-    <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"پہلا نام"</string>
-    <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"آخری نام"</string>
-    <string name="display_options_view_names_as" msgid="4204204205736735618">"نام کا فارمیٹ"</string>
-    <string name="display_options_view_given_name_first" msgid="2308026973021171020">"پہلا نام پہلے"</string>
-    <string name="display_options_view_family_name_first" msgid="987430497292428242">"آخری نام پہلے"</string>
-    <string name="menu_clear_frequents" msgid="5358271535047496120">"اکثر و بیشتر کو صاف کریں"</string>
-    <string name="action_menu_back_from_search" msgid="3550669942742167644">"تلاش کرنا بند کریں"</string>
-    <string name="description_clear_search" msgid="2347258825265600782">"تلاش صاف کریں"</string>
-    <string name="select_account_dialog_title" msgid="2673504582803359239">"اکاؤنٹ"</string>
-    <string name="set_default_account" msgid="7966099951006467572">"کالز کیلئے ہمیشہ اس کا استعمال کریں"</string>
-    <string name="select_phone_account_for_calls" msgid="1784460686103423274">"کال کریں مع"</string>
-    <string name="call_with_a_note" msgid="6242261320491851133">"ایک نوٹ کے ساتھ کال کریں"</string>
-    <string name="call_subject_hint" msgid="7233138753650420800">"کال کے ساتھ بھیجنے کیلئے ایک نوٹ ٹائپ کریں…"</string>
-    <string name="send_and_call_button" msgid="4735168294120154013">"بھیجیں اور کال کریں"</string>
-    <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="tab_title" msgid="3387876802026074288">"<xliff:g id="TITLE">%1$s</xliff:g> ٹیب۔"</string>
-    <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
-      <item quantity="other"> <xliff:g id="TITLE_2">%1$s</xliff:g> ٹیب۔ <xliff:g id="COUNT_3">%2$d</xliff:g> بغیر پڑھی ہوئی آئٹمز۔ </item>
-      <item quantity="one"> <xliff:g id="TITLE_0">%1$s</xliff:g> ٹیب۔ <xliff:g id="COUNT_1">%2$d</xliff:g> بغیر پڑھی ہوئی آئٹم۔ </item>
-    </plurals>
-    <string name="description_search_video_call" msgid="4337369876888024909">"ویڈیو کال"</string>
-    <string name="description_search_call_and_share" msgid="4912772842755050467">"اشتراک کریں اور کال کریں"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_custom">%s کو کال کریں</string>
+  <string name="call_home">گھر پر کال کریں</string>
+  <string name="call_mobile">موبائل پر کال کریں</string>
+  <string name="call_work">دفتر کے نمبر پر کال کریں</string>
+  <string name="call_fax_work">دفتر کے فیکس پر کال کریں</string>
+  <string name="call_fax_home">گھر کے فیکس پر کال کریں</string>
+  <string name="call_pager">پیجر پر کال کریں</string>
+  <string name="call_other">کال کریں</string>
+  <string name="call_callback">کال بیک نمبر پر کال کریں</string>
+  <string name="call_car">کار کے نمبر پر کال کریں</string>
+  <string name="call_company_main">کمپنی کے اصل نمبر پر کال کریں</string>
+  <string name="call_isdn">‏ISDN پر کال کریں</string>
+  <string name="call_main">اصل نمبر پر کال کریں</string>
+  <string name="call_other_fax">فیکس پر کال کریں</string>
+  <string name="call_radio">ریڈیو پر کال کریں</string>
+  <string name="call_telex">ٹیلیکس پر کال کریں</string>
+  <string name="call_tty_tdd">‏TTY / TDD پر کال کریں</string>
+  <string name="call_work_mobile">دفتر کے موبائل پر کال کریں</string>
+  <string name="call_work_pager">دفتر کے پیجر پر کال کریں</string>
+  <string name="call_assistant">%s کو کال کریں</string>
+  <string name="call_mms">‏MMS نمبر پر کال کریں</string>
+  <string name="sms_custom">%s پر متن بھیجیں</string>
+  <string name="sms_home">گھر کے نمبر پر متن بھیجیں</string>
+  <string name="sms_mobile">موبائل پر متن بھیجیں</string>
+  <string name="sms_work">دفتر کے نمبر پر متن بھیجیں</string>
+  <string name="sms_fax_work">دفتر کے فیکس نمبر پر متن بھیجیں</string>
+  <string name="sms_fax_home">گھر کے فیکس نمبر پر متن بھیجیں</string>
+  <string name="sms_pager">پیجر پر متن بھیجیں</string>
+  <string name="sms_other">متن بھیجیں</string>
+  <string name="sms_callback">کال بیک نمبر پر متن بھیجیں</string>
+  <string name="sms_car">کار کے نمبر پر متن بھیجیں</string>
+  <string name="sms_company_main">کمپنی کے اصل نمبر پر متن بھیجیں</string>
+  <string name="sms_isdn">‏ISDN نمبر پر متن بھیجیں</string>
+  <string name="sms_main">اصل نمبر پر متن بھیجیں</string>
+  <string name="sms_other_fax">فیکس پر متن بھیجیں</string>
+  <string name="sms_radio">ریڈیو پر متن بھیجیں</string>
+  <string name="sms_telex">ٹیلکس پر متن بھیجیں</string>
+  <string name="sms_tty_tdd">‏TTY / TDD پر متن بھیجیں</string>
+  <string name="sms_work_mobile">دفتر کے موبائل پر متن بھیجیں</string>
+  <string name="sms_work_pager">دفتر کے پیجر پر متن بھیجیں</string>
+  <string name="sms_assistant">%s پر متن بھیجیں</string>
+  <string name="sms_mms">‏MMS نمبر پر متن بھیجیں</string>
+  <string name="clearFrequentsConfirmation_title">اکثر رابطہ کردہ کو صاف کریں؟</string>
+  <string name="clearFrequentsConfirmation">آپ رابطے اور فون ایپس میں اکثر رابطہ کردہ فہرست کو صاف کر دیں گے اور ای میل ایپس کو از سر نو اپنے پتے کی ترجیحات جاننے پر مجبور کریں گے۔</string>
+  <string name="clearFrequentsProgress_title">اکثر رابطہ کردہ کو صاف کر رہا ہے…</string>
+  <string name="status_available">دستیاب</string>
+  <string name="status_away">دور</string>
+  <string name="status_busy">مصروف</string>
+  <string name="contactsList">رابطے</string>
+  <string name="contact_suggestions">سرفہرست تجویز کردہ</string>
+  <string name="local_invisible_directory">دیگر</string>
+  <string name="directory_search_label">ڈائریکٹری</string>
+  <string name="directory_search_label_work">دفتری ڈائرکٹری</string>
+  <string name="local_search_label">سبھی رابطے</string>
+  <string name="local_suggestions_search_label">تجاویز</string>
+  <string msgid="9154761216179882405" name="user_profile_contacts_list_header">میں</string>
+  <string name="missing_name">(کوئی نام نہیں)</string>
+  <string msgid="2795575601596468581" name="description_view_contact_detail">رابطہ دیکھیں</string>
+  <string name="list_filter_phones">فون نمبرز کے ساتھ سبھی رابطے</string>
+  <string name="list_filter_phones_work">دفتری پروفائل رابطے</string>
+  <string name="view_updates_from_group">اپ ڈیٹس دیکھیں</string>
+  <string name="account_phone">صرف آلہ۔ غیر مطابقت پذیر</string>
+  <string name="nameLabelsGroup">نام</string>
+  <string name="nicknameLabelsGroup">عرفی نام</string>
+  <string name="full_name">نام</string>
+  <string name="name_given">پہلا نام</string>
+  <string name="name_family">آخری نام</string>
+  <string name="name_prefix">نام کا سابقہ</string>
+  <string name="name_middle">درمیانی نام</string>
+  <string name="name_suffix">نام کا لاحقہ</string>
+  <string name="name_phonetic">فونیٹک نام</string>
+  <string name="name_phonetic_given">فونیٹک پہلا نام</string>
+  <string name="name_phonetic_middle">فونیٹک درمیانی نام</string>
+  <string name="name_phonetic_family">فونیٹک آخری نام</string>
+  <string name="phoneLabelsGroup">فون</string>
+  <string name="emailLabelsGroup">ای میل کریں</string>
+  <string name="postalLabelsGroup">پتہ</string>
+  <string name="imLabelsGroup">IM</string>
+  <string name="organizationLabelsGroup">تنظیم</string>
+  <string name="relationLabelsGroup">تعلق</string>
+  <string name="eventLabelsGroup">خاص تاریخ</string>
+  <string name="sms">متنی پیغام</string>
+  <string name="postal_address">پتہ</string>
+  <string name="ghostData_company">کمپنی</string>
+  <string name="ghostData_title">عنوان</string>
+  <string name="label_notes">نوٹس</string>
+  <string name="label_sip_address">SIP</string>
+  <string name="websiteLabelsGroup">ویب سائٹ</string>
+  <string name="groupsLabel">گروپس</string>
+  <string name="email_home">گھر کے پتے پر ای میل کریں</string>
+  <string name="email_mobile">موبائل پر ای میل کریں</string>
+  <string name="email_work">دفتر کو ای میل کریں</string>
+  <string name="email_other">ای میل کریں</string>
+  <string name="email_custom">ای میل کریں %s</string>
+  <string name="email">ای میل کریں</string>
+  <string name="postal_street">اسٹریٹ</string>
+  <string name="postal_city">شہر</string>
+  <string name="postal_region">ریاست</string>
+  <string name="postal_postcode">زپ کوڈ</string>
+  <string name="postal_country">ملک</string>
+  <string name="map_home">گھر کا پتہ دیکھیں</string>
+  <string name="map_work">دفتر کا پتہ دیکھیں</string>
+  <string name="map_other">پتہ دیکھیں</string>
+  <string name="map_custom">%s پتہ دیکھیں</string>
+  <string name="chat_aim">‏AIM کے ذریعے چیٹ کریں</string>
+  <string name="chat_msn">‏Windows Live کے ذریعے چیٹ کریں</string>
+  <string name="chat_yahoo">‏Yahoo کے ذریعے چیٹ کریں</string>
+  <string name="chat_skype">‏Skype کے ذریعے چیٹ کریں</string>
+  <string name="chat_qq">‏QQ کے ذریعے چیٹ کریں</string>
+  <string name="chat_gtalk">‏Google Talk کے ذریعے چیٹ کریں</string>
+  <string name="chat_icq">‏ICQ کے ذریعے چیٹ کریں</string>
+  <string name="chat_jabber">‏Jabber کے ذریعے چیٹ کریں</string>
+  <string name="chat">چیٹ کریں</string>
+  <string name="list_filter_all_accounts">سبھی رابطے</string>
+  <string name="listAllContactsInAccount">%s میں رابطے</string>
+  <string name="listCustomView">حسب ضرورت منظر میں رابطے</string>
+  <string name="listSingleContact">واحد رابطہ</string>
+  <string name="display_options_sort_list_by">ترتیب دیں بلحاظ</string>
+  <string name="display_options_sort_by_given_name">پہلا نام</string>
+  <string name="display_options_sort_by_family_name">آخری نام</string>
+  <string name="display_options_view_names_as">نام کا فارمیٹ</string>
+  <string name="display_options_view_given_name_first">پہلا نام پہلے</string>
+  <string name="display_options_view_family_name_first">آخری نام پہلے</string>
+  <string name="menu_clear_frequents">اکثر و بیشتر کو صاف کریں</string>
+  <string name="action_menu_back_from_search">تلاش کرنا بند کریں</string>
+  <string name="description_clear_search">تلاش صاف کریں</string>
+  <string name="select_account_dialog_title">اکاؤنٹ</string>
+  <string name="set_default_account">کالز کیلئے ہمیشہ اس کا استعمال کریں</string>
+  <string name="select_phone_account_for_calls">‏اس کال کیلئے SIM منتخب کریں</string>
+  <string name="select_phone_account_for_calls_remember">یہ انتخاب یاد رکھیں</string>
+  <string name="call_with_a_note">ایک نوٹ کے ساتھ کال کریں</string>
+  <string name="call_subject_hint">کال کے ساتھ بھیجنے کیلئے ایک نوٹ ٹائپ کریں…</string>
+  <string name="send_and_call_button">بھیجیں اور کال کریں</string>
+  <string name="call_subject_limit">%1$s / %2$s</string>
+  <string name="old_call_subject_type_and_number">%1$s %2$s</string>
+  <string name="tab_title">%1$s ٹیب۔</string>
+  <plurals name="tab_title_with_unread_items">
+    <item quantity="one"> %1$s ٹیب۔ %2$d بغیر پڑھی ہوئی آئٹم۔ </item>
+    <item quantity="other"> %1$s ٹیب۔ %2$d بغیر پڑھی ہوئی آئٹمز۔ </item>
+  </plurals>
+  <string name="description_search_video_call">ویڈیو کال</string>
+  <string name="description_search_call_and_share">اشتراک کریں اور کال کریں</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-uz/strings.xml b/java/com/android/contacts/common/res/values-uz/strings.xml
index 2da34cd..28b8e18 100644
--- a/java/com/android/contacts/common/res/values-uz/strings.xml
+++ b/java/com/android/contacts/common/res/values-uz/strings.xml
@@ -1,162 +1,145 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="toast_text_copied" msgid="8979281391599667362">"Matndan nuxsa olindi"</string>
-    <string name="call_custom" msgid="3041673234638990874">"Qo‘ng‘iroq: <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="call_home" msgid="125893483593803791">"Uy telefoniga qo‘ng‘iroq qilish"</string>
-    <string name="call_mobile" msgid="967589404494150813">"Mobil"</string>
-    <string name="call_work" msgid="6040550697395300892">"Ish telefoniga qo‘ng‘iroq qilish"</string>
-    <string name="call_fax_work" msgid="5260192771364592922">"Ish faks raqamiga qo‘ng‘iroq qilish"</string>
-    <string name="call_fax_home" msgid="5174311195081144124">"Uy faks raqamiga qo‘ng‘iroq qilish"</string>
-    <string name="call_pager" msgid="6814149227741274161">"Peyjerga qo‘ng‘iroq qilish"</string>
-    <string name="call_other" msgid="5536385588712587235">"Chaqiruv"</string>
-    <string name="call_callback" msgid="6314019862718112786">"Qayta qo‘ng‘iroq raqamiga qo‘ng‘iroq qilish"</string>
-    <string name="call_car" msgid="3197417098027764954">"Mashina telefon raqamiga qo‘ng‘iroq qilish"</string>
-    <string name="call_company_main" msgid="2557663310028446397">"Kompaniya asosiy raqamiga qo‘ng‘iroq qilish"</string>
-    <string name="call_isdn" msgid="4691270442763649522">"ISDN telefon raqamiga qo‘ng‘iroq qilish"</string>
-    <string name="call_main" msgid="3293707608770407814">"Asosiy raqamga qo‘ng‘iroq qilish"</string>
-    <string name="call_other_fax" msgid="4724521984879021465">"Faks raqamiga qo‘ng‘iroq qilish"</string>
-    <string name="call_radio" msgid="8942441419845057942">"Radio telefon raqamiga qo‘ng‘iroq qilish"</string>
-    <string name="call_telex" msgid="2031514461660668351">"Teleks telefon raqamiga qo‘ng‘iroq qilish"</string>
-    <string name="call_tty_tdd" msgid="7807210224965727701">"TTY/TDD telefoniga qo‘ng‘iroq qilish"</string>
-    <string name="call_work_mobile" msgid="2716342732938578495">"Ishxona: mobil"</string>
-    <string name="call_work_pager" msgid="3791778749827366574">"Ish peyjeriga qo‘ng‘iroq qilish"</string>
-    <string name="call_assistant" msgid="4177478845473789294">"Qo‘ng‘iroq: <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
-    <string name="call_mms" msgid="4958811711741872901">"MMS raqamga qo‘ng‘iroq qilish"</string>
-    <string name="sms_custom" msgid="8785368968605026317">"<xliff:g id="CUSTOM">%s</xliff:g>ga sms jo‘natish"</string>
-    <string name="sms_home" msgid="3527719551060295243">"Uy telefoniga sms jo‘natish"</string>
-    <string name="sms_mobile" msgid="8883045857887736518">"SMS: mobil"</string>
-    <string name="sms_work" msgid="4158595439553450966">"Ish telefoniga sms yozish"</string>
-    <string name="sms_fax_work" msgid="5483726627718055248">"Ish faksiga sms jo‘natish"</string>
-    <string name="sms_fax_home" msgid="9219265155770746077">"Uy faksiga sms jo‘natish"</string>
-    <string name="sms_pager" msgid="4901085068525193933">"Peyjer raqamiga sms jo‘natish"</string>
-    <string name="sms_other" msgid="1742702947993285933">"Boshqa telefonga sms jo‘natish"</string>
-    <string name="sms_callback" msgid="5833483630377538308">"Teskari qo‘ng‘iroq qilish raqamiga sms jo‘natish"</string>
-    <string name="sms_car" msgid="4314577266154395174">"Mashina telefoniga sms jo‘natish"</string>
-    <string name="sms_company_main" msgid="2308160928487360705">"Kompaniya asosiy telefoniga sms jo‘natish"</string>
-    <string name="sms_isdn" msgid="6394300346179302542">"ISDN telefonga sms jo‘natish"</string>
-    <string name="sms_main" msgid="8908087742014140774">"Asosiy telefonga sms jo‘natish"</string>
-    <string name="sms_other_fax" msgid="8768455473295405427">"Faks raqamiga sms jo‘natish"</string>
-    <string name="sms_radio" msgid="855555176531704682">"Radio telefonga sms jo‘natish"</string>
-    <string name="sms_telex" msgid="6269029276223252719">"Teleks telefoniga sms jo‘natish"</string>
-    <string name="sms_tty_tdd" msgid="6229057354509192444">"TTY/TDD telefoniga sms jo‘natish"</string>
-    <string name="sms_work_mobile" msgid="2155975469329969840">"SMS: ishxona (mobil)"</string>
-    <string name="sms_work_pager" msgid="8500140274906830742">"Ish peyjeriga sms jo‘natish"</string>
-    <string name="sms_assistant" msgid="8513548482745330818">"<xliff:g id="ASSISTANT">%s</xliff:g> telefoniga qo‘ng‘iroq qilish"</string>
-    <string name="sms_mms" msgid="5187888900503248542">"MMS telefonga sms jo‘natish"</string>
-    <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"Bu ro‘yxat tozalansinmi?"</string>
-    <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"Kontaktlar va Telefon ilovalaridagi tez-tez aloqa qilingan kontaktlar ro‘yxati tozalanadi hamda e-pochta ilovalari manzillarni eslab qolishni qaytadan boshlaydi."</string>
-    <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"Ko‘p gaplashilganlar tozalanmoqda…"</string>
-    <string name="status_available" msgid="2648156525685472626">"Aloqada"</string>
-    <string name="status_away" msgid="2298688367552893953">"Tashqarida"</string>
-    <string name="status_busy" msgid="5990832098713248503">"Band"</string>
-    <string name="contactsList" msgid="8806067891419291513">"Kontaktlar"</string>
-    <string name="contact_suggestions" msgid="3324166754807120006">"Eng faol"</string>
-    <string name="local_invisible_directory" msgid="4723238462733650090">"Boshqa"</string>
-    <string name="directory_search_label" msgid="4621215895484025229">"Direktoriya"</string>
-    <string name="directory_search_label_work" msgid="7679326282707414897">"Ishchi katalogi"</string>
-    <string name="local_search_label" msgid="907622822323119235">"Barcha kontaktlar"</string>
-    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Takliflar"</string>
-    <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Men"</string>
-    <string name="missing_name" msgid="978606963362745020">"(Ismi yo‘q)"</string>
-    <string name="description_view_contact_detail" msgid="2428742401208561136">"Kontaktni ko‘rish"</string>
-    <string name="list_filter_phones" msgid="8763316061763437182">"Telefon raqamli kontaktlar"</string>
-    <string name="list_filter_phones_work" msgid="7083575404573422965">"Ishchi profili kontaktlari"</string>
-    <string name="view_updates_from_group" msgid="9011641093168385729">"Yangilanishlarni ko‘rish"</string>
-    <string name="account_phone" msgid="7067809073194061035">"Faqat qurilmalarda, sinxronlanmaydi"</string>
-    <string name="nameLabelsGroup" msgid="7730465833159557471">"Ism"</string>
-    <string name="nicknameLabelsGroup" msgid="6310556912361840029">"Taxallusi"</string>
-    <string name="full_name" msgid="648186563998465740">"Nomi"</string>
-    <string name="name_given" msgid="5096576006314820536">"Ismi asosida"</string>
-    <string name="name_family" msgid="6646235805198547467">"Familiyasi asosida"</string>
-    <string name="name_prefix" msgid="9215326539658838">"Ism prefiksi"</string>
-    <string name="name_middle" msgid="703755205331582769">"Otasining ismi"</string>
-    <string name="name_suffix" msgid="5777083390282548702">"Ism suffiksi"</string>
-    <string name="name_phonetic" msgid="1650870996361663089">"Ism talaffuzi"</string>
-    <string name="name_phonetic_given" msgid="618812334274603170">"Ism talaffuzi"</string>
-    <string name="name_phonetic_middle" msgid="4826820763384625538">"Otasining ismi talaffuzi"</string>
-    <string name="name_phonetic_family" msgid="379905191212930771">"Familiya talaffuzi"</string>
-    <string name="phoneLabelsGroup" msgid="169661929021355548">"Telefon"</string>
-    <string name="emailLabelsGroup" msgid="2249752810477488833">"Boshqa e-pochtalarga xat jo‘natish"</string>
-    <string name="postalLabelsGroup" msgid="6772000590189142253">"Manzil"</string>
-    <string name="imLabelsGroup" msgid="5718066254237364731">"IM"</string>
-    <string name="organizationLabelsGroup" msgid="1101996309241601435">"Tashkilot"</string>
-    <string name="relationLabelsGroup" msgid="53866051664600053">"Aloqadorligi"</string>
-    <string name="eventLabelsGroup" msgid="1236970042646618489">"Maxsus sana"</string>
-    <string name="sms" msgid="7574344928185328095">"Matnli xabar"</string>
-    <string name="postal_address" msgid="1804707930129674200">"Manzil"</string>
-    <string name="ghostData_company" msgid="2554310786296833424">"Kompaniya"</string>
-    <string name="ghostData_title" msgid="4994968731830184837">"Lavozimi"</string>
-    <string name="label_notes" msgid="2050255313694219786">"Qaydlar"</string>
-    <string name="label_sip_address" msgid="8883266182575965926">"SIP"</string>
-    <string name="websiteLabelsGroup" msgid="1630734286462186790">"Veb-sayt"</string>
-    <string name="groupsLabel" msgid="2694002798416868728">"Guruhlar"</string>
-    <string name="email_home" msgid="889830029388962171">"Uy e-pochtasiga xat jo‘natish"</string>
-    <string name="email_mobile" msgid="4487686436743741150">"Mobil e-pochtaga xat yozish"</string>
-    <string name="email_work" msgid="4223487303344613528">"Ish e-pochtasiga xat jo‘natish"</string>
-    <string name="email_other" msgid="4246411900126012062">"Boshqa e-pochtalarga xat jo‘natish"</string>
-    <string name="email_custom" msgid="7246580894327511013">"<xliff:g id="CUSTOM">%s</xliff:g>ga xat jo‘natish"</string>
-    <string name="email" msgid="2807318537887091606">"Boshqa e-pochtalarga xat jo‘natish"</string>
-    <string name="postal_street" msgid="6918171741240802474">"Ko‘cha"</string>
-    <string name="postal_city" msgid="8674569121430005628">"Shahar"</string>
-    <string name="postal_region" msgid="1730369286225469192">"Shahar"</string>
-    <string name="postal_postcode" msgid="4450700741261990439">"ZIP kodi"</string>
-    <string name="postal_country" msgid="232670707458768148">"Mamlakat"</string>
-    <string name="map_home" msgid="4181131107392126938">"Uy manzilini ko‘rish"</string>
-    <string name="map_work" msgid="5723471185992684400">"Ish manzilini ko‘rish"</string>
-    <string name="map_other" msgid="2253764780863500516">"Manzilni ko‘rish"</string>
-    <string name="map_custom" msgid="5581743097882436157">"<xliff:g id="CUSTOM">%s</xliff:g> manzillarni ko‘rish"</string>
-    <string name="chat_aim" msgid="2954364435497941659">"AIM’da suhbatlashish"</string>
-    <string name="chat_msn" msgid="3130135239071228678">"Windows Live orqali chat"</string>
-    <string name="chat_yahoo" msgid="3233552142326865347">"Yahoo’da suhbatlashish"</string>
-    <string name="chat_skype" msgid="6486703981390592425">"Skype’da suhbatlashish"</string>
-    <string name="chat_qq" msgid="786924280665740019">"QQ’da suhbatlashish"</string>
-    <string name="chat_gtalk" msgid="7914674177243078035">"Google Talk’da suhbatlashish"</string>
-    <string name="chat_icq" msgid="3292934726414765801">"ICQ’da suhbatlashish"</string>
-    <string name="chat_jabber" msgid="6701542313597880204">"Jabber’da suhbatlashish"</string>
-    <string name="chat" msgid="1020428260359370236">"Suhbatlashish"</string>
-    <string name="list_filter_all_accounts" msgid="473782314881473992">"Barcha kontaktlar"</string>
-    <string name="listAllContactsInAccount" msgid="3486378621592995630">"<xliff:g id="NAME">%s</xliff:g>dagi kontaktlar"</string>
-    <string name="listCustomView" msgid="5306282632413086731">"Filtrlangan kontaktlar"</string>
-    <string name="listSingleContact" msgid="8620818791932382627">"Bitta kontakt"</string>
-    <string name="display_options_sort_list_by" msgid="3541875948367831228">"Saralash tartibi"</string>
-    <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"Ismi asosida"</string>
-    <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"Familiyasi asosida"</string>
-    <string name="display_options_view_names_as" msgid="4204204205736735618">"Ism formati"</string>
-    <string name="display_options_view_given_name_first" msgid="2308026973021171020">"Avval ismi"</string>
-    <string name="display_options_view_family_name_first" msgid="987430497292428242">"Avval familiyasi"</string>
-    <string name="menu_clear_frequents" msgid="5358271535047496120">"Faol kontaktlarni tozalash"</string>
-    <string name="action_menu_back_from_search" msgid="3550669942742167644">"qidiruvni to‘xtatish"</string>
-    <string name="description_clear_search" msgid="2347258825265600782">"Izlashni tozalash"</string>
-    <string name="select_account_dialog_title" msgid="2673504582803359239">"Hisob"</string>
-    <string name="set_default_account" msgid="7966099951006467572">"Har doim qo‘ng‘iroqlar u-n foyd-sin"</string>
-    <string name="select_phone_account_for_calls" msgid="1784460686103423274">"Ushbu bilan qo‘ng‘iroq qilish"</string>
-    <string name="call_with_a_note" msgid="6242261320491851133">"Qo‘ng‘iroq va izoh"</string>
-    <string name="call_subject_hint" msgid="7233138753650420800">"Qo‘ng‘iroqqa qo‘shib yuborish uchun izoh yozing ..."</string>
-    <string name="send_and_call_button" msgid="4735168294120154013">"YUBORISH va QO‘NG‘IROQ QILISH"</string>
-    <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="tab_title" msgid="3387876802026074288">"<xliff:g id="TITLE">%1$s</xliff:g> ichki oynasi."</string>
-    <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
-      <item quantity="other"> <xliff:g id="TITLE_2">%1$s</xliff:g> ichki oynasi. <xliff:g id="COUNT_3">%2$d</xliff:g> ta o‘qilmagan narsa. </item>
-      <item quantity="one"> <xliff:g id="TITLE_0">%1$s</xliff:g> ichki oynasi. <xliff:g id="COUNT_1">%2$d</xliff:g> ta o‘qilmagan narsa. </item>
-    </plurals>
-    <string name="description_search_video_call" msgid="4337369876888024909">"Video suhbat"</string>
-    <string name="description_search_call_and_share" msgid="4912772842755050467">"Ulashish va chaqirish"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_custom">Qo‘ng‘iroq: %s</string>
+  <string name="call_home">Uy telefoniga qo‘ng‘iroq qilish</string>
+  <string name="call_mobile">Mobil</string>
+  <string name="call_work">Ish telefoniga qo‘ng‘iroq qilish</string>
+  <string name="call_fax_work">Ish faks raqamiga qo‘ng‘iroq qilish</string>
+  <string name="call_fax_home">Uy faks raqamiga qo‘ng‘iroq qilish</string>
+  <string name="call_pager">Peyjerga qo‘ng‘iroq qilish</string>
+  <string name="call_other">Chaqiruv</string>
+  <string name="call_callback">Qayta qo‘ng‘iroq raqamiga qo‘ng‘iroq qilish</string>
+  <string name="call_car">Mashina telefon raqamiga qo‘ng‘iroq qilish</string>
+  <string name="call_company_main">Kompaniya asosiy raqamiga qo‘ng‘iroq qilish</string>
+  <string name="call_isdn">ISDN telefon raqamiga qo‘ng‘iroq qilish</string>
+  <string name="call_main">Asosiy raqamga qo‘ng‘iroq qilish</string>
+  <string name="call_other_fax">Faks raqamiga qo‘ng‘iroq qilish</string>
+  <string name="call_radio">Radio telefon raqamiga qo‘ng‘iroq qilish</string>
+  <string name="call_telex">Teleks telefon raqamiga qo‘ng‘iroq qilish</string>
+  <string name="call_tty_tdd">TTY/TDD telefoniga qo‘ng‘iroq qilish</string>
+  <string name="call_work_mobile">Ishxona: mobil</string>
+  <string name="call_work_pager">Ish peyjeriga qo‘ng‘iroq qilish</string>
+  <string name="call_assistant">Qo‘ng‘iroq: %s</string>
+  <string name="call_mms">MMS raqamga qo‘ng‘iroq qilish</string>
+  <string name="sms_custom">%sga sms jo‘natish</string>
+  <string name="sms_home">Uy telefoniga sms jo‘natish</string>
+  <string name="sms_mobile">SMS: mobil</string>
+  <string name="sms_work">Ish telefoniga sms yozish</string>
+  <string name="sms_fax_work">Ish faksiga sms jo‘natish</string>
+  <string name="sms_fax_home">Uy faksiga sms jo‘natish</string>
+  <string name="sms_pager">Peyjer raqamiga sms jo‘natish</string>
+  <string name="sms_other">Boshqa telefonga sms jo‘natish</string>
+  <string name="sms_callback">Teskari qo‘ng‘iroq qilish raqamiga sms jo‘natish</string>
+  <string name="sms_car">Mashina telefoniga sms jo‘natish</string>
+  <string name="sms_company_main">Kompaniya asosiy telefoniga sms jo‘natish</string>
+  <string name="sms_isdn">ISDN telefonga sms jo‘natish</string>
+  <string name="sms_main">Asosiy telefonga sms jo‘natish</string>
+  <string name="sms_other_fax">Faks raqamiga sms jo‘natish</string>
+  <string name="sms_radio">Radio telefonga sms jo‘natish</string>
+  <string name="sms_telex">Teleks telefoniga sms jo‘natish</string>
+  <string name="sms_tty_tdd">TTY/TDD telefoniga sms jo‘natish</string>
+  <string name="sms_work_mobile">SMS: ishxona (mobil)</string>
+  <string name="sms_work_pager">Ish peyjeriga sms jo‘natish</string>
+  <string name="sms_assistant">%s telefoniga qo‘ng‘iroq qilish</string>
+  <string name="sms_mms">MMS telefonga sms jo‘natish</string>
+  <string name="clearFrequentsConfirmation_title">Bu ro‘yxat tozalansinmi?</string>
+  <string name="clearFrequentsConfirmation">Kontaktlar va Telefon ilovalaridagi tez-tez aloqa qilingan kontaktlar ro‘yxati tozalanadi hamda e-pochta ilovalari manzillarni eslab qolishni qaytadan boshlaydi.</string>
+  <string name="clearFrequentsProgress_title">Ko‘p gaplashilganlar tozalanmoqda…</string>
+  <string name="status_available">Aloqada</string>
+  <string name="status_away">Tashqarida</string>
+  <string name="status_busy">Band</string>
+  <string name="contactsList">Kontaktlar</string>
+  <string name="contact_suggestions">Eng faol</string>
+  <string name="local_invisible_directory">Boshqa</string>
+  <string name="directory_search_label">Direktoriya</string>
+  <string name="directory_search_label_work">Ishchi katalogi</string>
+  <string name="local_search_label">Barcha kontaktlar</string>
+  <string name="local_suggestions_search_label">Takliflar</string>
+  <string msgid="9154761216179882405" name="user_profile_contacts_list_header">Men</string>
+  <string name="missing_name">(Ismi yo‘q)</string>
+  <string msgid="2795575601596468581" name="description_view_contact_detail">Kontaktni ko‘rish</string>
+  <string name="list_filter_phones">Telefon raqamli kontaktlar</string>
+  <string name="list_filter_phones_work">Ishchi profili kontaktlari</string>
+  <string name="view_updates_from_group">Yangilanishlarni ko‘rish</string>
+  <string name="account_phone">Faqat qurilmalarda, sinxronlanmaydi</string>
+  <string name="nameLabelsGroup">Ism</string>
+  <string name="nicknameLabelsGroup">Taxallusi</string>
+  <string name="full_name">Nomi</string>
+  <string name="name_given">Ismi asosida</string>
+  <string name="name_family">Familiyasi asosida</string>
+  <string name="name_prefix">Ism prefiksi</string>
+  <string name="name_middle">Otasining ismi</string>
+  <string name="name_suffix">Ism suffiksi</string>
+  <string name="name_phonetic">Ism talaffuzi</string>
+  <string name="name_phonetic_given">Ism talaffuzi</string>
+  <string name="name_phonetic_middle">Otasining ismi talaffuzi</string>
+  <string name="name_phonetic_family">Familiya talaffuzi</string>
+  <string name="phoneLabelsGroup">Telefon</string>
+  <string name="emailLabelsGroup">Boshqa e-pochtalarga xat jo‘natish</string>
+  <string name="postalLabelsGroup">Manzil</string>
+  <string name="imLabelsGroup">IM</string>
+  <string name="organizationLabelsGroup">Tashkilot</string>
+  <string name="relationLabelsGroup">Aloqadorligi</string>
+  <string name="eventLabelsGroup">Maxsus sana</string>
+  <string name="sms">SMS xabar</string>
+  <string name="postal_address">Manzil</string>
+  <string name="ghostData_company">Kompaniya</string>
+  <string name="ghostData_title">Lavozimi</string>
+  <string name="label_notes">Qaydlar</string>
+  <string name="label_sip_address">SIP</string>
+  <string name="websiteLabelsGroup">Veb-sayt</string>
+  <string name="groupsLabel">Guruhlar</string>
+  <string name="email_home">Uy e-pochtasiga xat jo‘natish</string>
+  <string name="email_mobile">Mobil e-pochtaga xat yozish</string>
+  <string name="email_work">Ish e-pochtasiga xat jo‘natish</string>
+  <string name="email_other">Boshqa e-pochtalarga xat jo‘natish</string>
+  <string name="email_custom">%sga xat jo‘natish</string>
+  <string name="email">Boshqa e-pochtalarga xat jo‘natish</string>
+  <string name="postal_street">Ko‘cha</string>
+  <string name="postal_city">Shahar</string>
+  <string name="postal_region">Shahar</string>
+  <string name="postal_postcode">ZIP kodi</string>
+  <string name="postal_country">Mamlakat</string>
+  <string name="map_home">Uy manzilini ko‘rish</string>
+  <string name="map_work">Ish manzilini ko‘rish</string>
+  <string name="map_other">Manzilni ko‘rish</string>
+  <string name="map_custom">%s manzillarni ko‘rish</string>
+  <string name="chat_aim">AIM’da suhbatlashish</string>
+  <string name="chat_msn">Windows Live orqali chat</string>
+  <string name="chat_yahoo">Yahoo’da suhbatlashish</string>
+  <string name="chat_skype">Skype’da suhbatlashish</string>
+  <string name="chat_qq">QQ’da suhbatlashish</string>
+  <string name="chat_gtalk">Google Talk’da suhbatlashish</string>
+  <string name="chat_icq">ICQ’da suhbatlashish</string>
+  <string name="chat_jabber">Jabber’da suhbatlashish</string>
+  <string name="chat">Suhbatlashish</string>
+  <string name="list_filter_all_accounts">Barcha kontaktlar</string>
+  <string name="listAllContactsInAccount">%sdagi kontaktlar</string>
+  <string name="listCustomView">Filtrlangan kontaktlar</string>
+  <string name="listSingleContact">Bitta kontakt</string>
+  <string name="display_options_sort_list_by">Saralash</string>
+  <string name="display_options_sort_by_given_name">Ismi asosida</string>
+  <string name="display_options_sort_by_family_name">Familiyasi asosida</string>
+  <string name="display_options_view_names_as">Ism formati</string>
+  <string name="display_options_view_given_name_first">Avval ismi</string>
+  <string name="display_options_view_family_name_first">Avval familiyasi</string>
+  <string name="menu_clear_frequents">Faol kontaktlarni tozalash</string>
+  <string name="action_menu_back_from_search">qidiruvni to‘xtatish</string>
+  <string name="description_clear_search">Izlashni tozalash</string>
+  <string name="select_account_dialog_title">Hisob</string>
+  <string name="set_default_account">Har doim qo‘ng‘iroqlar u-n foyd-sin</string>
+  <string name="select_phone_account_for_calls">Chaqiruv uchun SIM kartani tanlang</string>
+  <string name="select_phone_account_for_calls_remember">Shu tanlov eslab qolinsin</string>
+  <string name="call_with_a_note">Qo‘ng‘iroq va izoh</string>
+  <string name="call_subject_hint">Qo‘ng‘iroqqa qo‘shib yuborish uchun izoh yozing ...</string>
+  <string name="send_and_call_button">YUBORISH va QO‘NG‘IROQ QILISH</string>
+  <string name="call_subject_limit">%1$s / %2$s</string>
+  <string name="old_call_subject_type_and_number">%1$s %2$s</string>
+  <string name="tab_title">%1$s ichki oynasi.</string>
+  <plurals name="tab_title_with_unread_items">
+    <item quantity="one"> %1$s ichki oynasi. %2$d ta o‘qilmagan narsa. </item>
+    <item quantity="other"> %1$s ichki oynasi. %2$d ta o‘qilmagan narsa. </item>
+  </plurals>
+  <string name="description_search_video_call">Video suhbat</string>
+  <string name="description_search_call_and_share">Ulashish va chaqirish</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-vi/strings.xml b/java/com/android/contacts/common/res/values-vi/strings.xml
index 31fe86a..f2f2a24 100644
--- a/java/com/android/contacts/common/res/values-vi/strings.xml
+++ b/java/com/android/contacts/common/res/values-vi/strings.xml
@@ -1,162 +1,145 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="toast_text_copied" msgid="8979281391599667362">"Đã sao chép văn bản"</string>
-    <string name="call_custom" msgid="3041673234638990874">"Gọi <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="call_home" msgid="125893483593803791">"Gọi số điện thoại nhà riêng"</string>
-    <string name="call_mobile" msgid="967589404494150813">"Gọi số điện thoại di động"</string>
-    <string name="call_work" msgid="6040550697395300892">"Gọi số điện thoại cơ quan"</string>
-    <string name="call_fax_work" msgid="5260192771364592922">"Gọi số fax cơ quan"</string>
-    <string name="call_fax_home" msgid="5174311195081144124">"Gọi số fax nhà riêng"</string>
-    <string name="call_pager" msgid="6814149227741274161">"Gọi số máy nhắn tin"</string>
-    <string name="call_other" msgid="5536385588712587235">"Gọi"</string>
-    <string name="call_callback" msgid="6314019862718112786">"Gọi số gọi lại"</string>
-    <string name="call_car" msgid="3197417098027764954">"Gọi số điện thoại trên ô tô"</string>
-    <string name="call_company_main" msgid="2557663310028446397">"Gọi số điện thoại chính của công ty"</string>
-    <string name="call_isdn" msgid="4691270442763649522">"Gọi ISDN"</string>
-    <string name="call_main" msgid="3293707608770407814">"Gọi số điện thoại chính"</string>
-    <string name="call_other_fax" msgid="4724521984879021465">"Gọi số fax"</string>
-    <string name="call_radio" msgid="8942441419845057942">"Gọi số điện thoại radio"</string>
-    <string name="call_telex" msgid="2031514461660668351">"Gọi số telex"</string>
-    <string name="call_tty_tdd" msgid="7807210224965727701">"Gọi số điện thoại TTY/TDD"</string>
-    <string name="call_work_mobile" msgid="2716342732938578495">"Gọi số điện thoại di động tại cơ quan"</string>
-    <string name="call_work_pager" msgid="3791778749827366574">"Gọi số máy nhắn tin cơ quan"</string>
-    <string name="call_assistant" msgid="4177478845473789294">"Gọi <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
-    <string name="call_mms" msgid="4958811711741872901">"Gọi MMS"</string>
-    <string name="sms_custom" msgid="8785368968605026317">"Nhắn tin tới <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="sms_home" msgid="3527719551060295243">"Nhắn tin tới số điện thoại nhà riêng"</string>
-    <string name="sms_mobile" msgid="8883045857887736518">"Nhắn tin tới số điện thoại di động"</string>
-    <string name="sms_work" msgid="4158595439553450966">"Nhắn tin tới số điện thoại cơ quan"</string>
-    <string name="sms_fax_work" msgid="5483726627718055248">"Nhắn tin tới số fax cơ quan"</string>
-    <string name="sms_fax_home" msgid="9219265155770746077">"Nhắn tin tới số fax nhà riêng"</string>
-    <string name="sms_pager" msgid="4901085068525193933">"Nhắn tin tới số máy nhắn tin"</string>
-    <string name="sms_other" msgid="1742702947993285933">"Nhắn tin"</string>
-    <string name="sms_callback" msgid="5833483630377538308">"Nhắn tin tới số gọi lại"</string>
-    <string name="sms_car" msgid="4314577266154395174">"Nhắn tin tới số điện thoại trên ô tô"</string>
-    <string name="sms_company_main" msgid="2308160928487360705">"Nhắn tin tới số điện thoại chính của công ty"</string>
-    <string name="sms_isdn" msgid="6394300346179302542">"Nhắn tin tới số điện thoại ISDN"</string>
-    <string name="sms_main" msgid="8908087742014140774">"Nhắn tin tới số điện thoại chính"</string>
-    <string name="sms_other_fax" msgid="8768455473295405427">"Nhắn tin tới số fax"</string>
-    <string name="sms_radio" msgid="855555176531704682">"Nhắn tin tới số điện thoại radio"</string>
-    <string name="sms_telex" msgid="6269029276223252719">"Nhắn tin tới số telex"</string>
-    <string name="sms_tty_tdd" msgid="6229057354509192444">"Nhắn tới số TTY/TDD"</string>
-    <string name="sms_work_mobile" msgid="2155975469329969840">"Nhắn tới số điện thoại di động tại cơ quan"</string>
-    <string name="sms_work_pager" msgid="8500140274906830742">"Nhắn tin tới số máy nhắn tin cơ quan"</string>
-    <string name="sms_assistant" msgid="8513548482745330818">"Nhắn tin tới <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
-    <string name="sms_mms" msgid="5187888900503248542">"Nhắn tin tới số điện thoại MMS"</string>
-    <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"Xóa danh sách liên hệ thường xuyên?"</string>
-    <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"Bạn sẽ xóa danh sách liên hệ thường xuyên trong ứng dụng Danh bạ và điện thoại cũng như buộc các ứng dụng email phải tìm hiểu các tùy chọn gửi của bạn lại từ đầu."</string>
-    <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"Đang xóa DS liên hệ thường xuyên…"</string>
-    <string name="status_available" msgid="2648156525685472626">"Có mặt"</string>
-    <string name="status_away" msgid="2298688367552893953">"Đã ra ngoài"</string>
-    <string name="status_busy" msgid="5990832098713248503">"Bận"</string>
-    <string name="contactsList" msgid="8806067891419291513">"Danh bạ"</string>
-    <string name="contact_suggestions" msgid="3324166754807120006">"Đề xuất hàng đầu"</string>
-    <string name="local_invisible_directory" msgid="4723238462733650090">"Khác"</string>
-    <string name="directory_search_label" msgid="4621215895484025229">"Thư mục"</string>
-    <string name="directory_search_label_work" msgid="7679326282707414897">"Thư mục công việc"</string>
-    <string name="local_search_label" msgid="907622822323119235">"Tất cả liên hệ"</string>
-    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Đề xuất"</string>
-    <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Tôi"</string>
-    <string name="missing_name" msgid="978606963362745020">"(Không có tên)"</string>
-    <string name="description_view_contact_detail" msgid="2428742401208561136">"Xem liên hệ"</string>
-    <string name="list_filter_phones" msgid="8763316061763437182">"Tất cả người liên hệ có số điện thoại"</string>
-    <string name="list_filter_phones_work" msgid="7083575404573422965">"Liên hệ trên hồ sơ công việc"</string>
-    <string name="view_updates_from_group" msgid="9011641093168385729">"Xem thông tin cập nhật"</string>
-    <string name="account_phone" msgid="7067809073194061035">"Chỉ trên thiết bị, chưa đồng bộ hóa"</string>
-    <string name="nameLabelsGroup" msgid="7730465833159557471">"Tên"</string>
-    <string name="nicknameLabelsGroup" msgid="6310556912361840029">"Biệt hiệu"</string>
-    <string name="full_name" msgid="648186563998465740">"Tên"</string>
-    <string name="name_given" msgid="5096576006314820536">"Tên"</string>
-    <string name="name_family" msgid="6646235805198547467">"Họ"</string>
-    <string name="name_prefix" msgid="9215326539658838">"Danh xưng"</string>
-    <string name="name_middle" msgid="703755205331582769">"Tên đệm"</string>
-    <string name="name_suffix" msgid="5777083390282548702">"Hậu tố tên"</string>
-    <string name="name_phonetic" msgid="1650870996361663089">"Tên theo phiên âm"</string>
-    <string name="name_phonetic_given" msgid="618812334274603170">"Tên theo phiên âm"</string>
-    <string name="name_phonetic_middle" msgid="4826820763384625538">"Tên đệm theo phiên âm"</string>
-    <string name="name_phonetic_family" msgid="379905191212930771">"Họ theo phiên âm"</string>
-    <string name="phoneLabelsGroup" msgid="169661929021355548">"Điện thoại"</string>
-    <string name="emailLabelsGroup" msgid="2249752810477488833">"Gửi email"</string>
-    <string name="postalLabelsGroup" msgid="6772000590189142253">"Địa chỉ"</string>
-    <string name="imLabelsGroup" msgid="5718066254237364731">"IM"</string>
-    <string name="organizationLabelsGroup" msgid="1101996309241601435">"Tổ chức"</string>
-    <string name="relationLabelsGroup" msgid="53866051664600053">"Mối quan hệ"</string>
-    <string name="eventLabelsGroup" msgid="1236970042646618489">"Ngày đặc biệt"</string>
-    <string name="sms" msgid="7574344928185328095">"Tin nhắn văn bản"</string>
-    <string name="postal_address" msgid="1804707930129674200">"Địa chỉ"</string>
-    <string name="ghostData_company" msgid="2554310786296833424">"Công ty"</string>
-    <string name="ghostData_title" msgid="4994968731830184837">"Chức danh"</string>
-    <string name="label_notes" msgid="2050255313694219786">"Ghi chú"</string>
-    <string name="label_sip_address" msgid="8883266182575965926">"SIP"</string>
-    <string name="websiteLabelsGroup" msgid="1630734286462186790">"Trang web"</string>
-    <string name="groupsLabel" msgid="2694002798416868728">"Nhóm"</string>
-    <string name="email_home" msgid="889830029388962171">"Gửi email tới địa chỉ email nhà riêng"</string>
-    <string name="email_mobile" msgid="4487686436743741150">"Gửi email tới địa chỉ email thiết bị di động"</string>
-    <string name="email_work" msgid="4223487303344613528">"Gửi email tới địa chỉ email cơ quan"</string>
-    <string name="email_other" msgid="4246411900126012062">"Gửi email"</string>
-    <string name="email_custom" msgid="7246580894327511013">"Gửi email cho <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="email" msgid="2807318537887091606">"Gửi email"</string>
-    <string name="postal_street" msgid="6918171741240802474">"Đường phố"</string>
-    <string name="postal_city" msgid="8674569121430005628">"Thành phố"</string>
-    <string name="postal_region" msgid="1730369286225469192">"Tiểu bang"</string>
-    <string name="postal_postcode" msgid="4450700741261990439">"Mã ZIP"</string>
-    <string name="postal_country" msgid="232670707458768148">"Quốc gia"</string>
-    <string name="map_home" msgid="4181131107392126938">"Xem địa chỉ nhà riêng"</string>
-    <string name="map_work" msgid="5723471185992684400">"Xem địa chỉ cơ quan"</string>
-    <string name="map_other" msgid="2253764780863500516">"Xem địa chỉ"</string>
-    <string name="map_custom" msgid="5581743097882436157">"Xem địa chỉ <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="chat_aim" msgid="2954364435497941659">"Trò chuyện sử dụng AIM"</string>
-    <string name="chat_msn" msgid="3130135239071228678">"Trò chuyện sử dụng Windows Live"</string>
-    <string name="chat_yahoo" msgid="3233552142326865347">"Trò chuyện sử dụng Yahoo"</string>
-    <string name="chat_skype" msgid="6486703981390592425">"Trò chuyện sử dụng Skype"</string>
-    <string name="chat_qq" msgid="786924280665740019">"Trò chuyện sử dụng QQ"</string>
-    <string name="chat_gtalk" msgid="7914674177243078035">"Trò chuyện sử dụng Google Talk"</string>
-    <string name="chat_icq" msgid="3292934726414765801">"Trò chuyện sử dụng ICQ"</string>
-    <string name="chat_jabber" msgid="6701542313597880204">"Trò chuyện sử dụng Jabber"</string>
-    <string name="chat" msgid="1020428260359370236">"Trò chuyện"</string>
-    <string name="list_filter_all_accounts" msgid="473782314881473992">"Tất cả liên hệ"</string>
-    <string name="listAllContactsInAccount" msgid="3486378621592995630">"Danh bạ trong <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="listCustomView" msgid="5306282632413086731">"Danh bạ ở chế độ xem tùy chỉnh"</string>
-    <string name="listSingleContact" msgid="8620818791932382627">"Một liên hệ"</string>
-    <string name="display_options_sort_list_by" msgid="3541875948367831228">"Sắp xếp theo"</string>
-    <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"Tên"</string>
-    <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"Họ"</string>
-    <string name="display_options_view_names_as" msgid="4204204205736735618">"Định dạng tên"</string>
-    <string name="display_options_view_given_name_first" msgid="2308026973021171020">"Tên trước"</string>
-    <string name="display_options_view_family_name_first" msgid="987430497292428242">"Họ trước"</string>
-    <string name="menu_clear_frequents" msgid="5358271535047496120">"Xóa DS liên hệ thường xuyên"</string>
-    <string name="action_menu_back_from_search" msgid="3550669942742167644">"ngừng tìm kiếm"</string>
-    <string name="description_clear_search" msgid="2347258825265600782">"Xóa tìm kiếm"</string>
-    <string name="select_account_dialog_title" msgid="2673504582803359239">"Tài khoản"</string>
-    <string name="set_default_account" msgid="7966099951006467572">"Luôn sử dụng SIM này để gọi"</string>
-    <string name="select_phone_account_for_calls" msgid="1784460686103423274">"Gọi bằng"</string>
-    <string name="call_with_a_note" msgid="6242261320491851133">"Gọi điện kèm theo ghi chú"</string>
-    <string name="call_subject_hint" msgid="7233138753650420800">"Nhập ghi chú để gửi kèm cuộc gọi..."</string>
-    <string name="send_and_call_button" msgid="4735168294120154013">"GỬI và GỌI"</string>
-    <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="tab_title" msgid="3387876802026074288">"Tab <xliff:g id="TITLE">%1$s</xliff:g>."</string>
-    <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
-      <item quantity="other"> Tab <xliff:g id="TITLE_2">%1$s</xliff:g>. <xliff:g id="COUNT_3">%2$d</xliff:g> mục chưa đọc. </item>
-      <item quantity="one"> Tab <xliff:g id="TITLE_0">%1$s</xliff:g>. <xliff:g id="COUNT_1">%2$d</xliff:g> mục chưa đọc. </item>
-    </plurals>
-    <string name="description_search_video_call" msgid="4337369876888024909">"Gọi điện video"</string>
-    <string name="description_search_call_and_share" msgid="4912772842755050467">"Chia sẻ và gọi"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_custom">Gọi %s</string>
+  <string name="call_home">Gọi số điện thoại nhà riêng</string>
+  <string name="call_mobile">Gọi số điện thoại di động</string>
+  <string name="call_work">Gọi số điện thoại cơ quan</string>
+  <string name="call_fax_work">Gọi số fax cơ quan</string>
+  <string name="call_fax_home">Gọi số fax nhà riêng</string>
+  <string name="call_pager">Gọi số máy nhắn tin</string>
+  <string name="call_other">Gọi</string>
+  <string name="call_callback">Gọi số gọi lại</string>
+  <string name="call_car">Gọi số điện thoại trên ô tô</string>
+  <string name="call_company_main">Gọi số điện thoại chính của công ty</string>
+  <string name="call_isdn">Gọi ISDN</string>
+  <string name="call_main">Gọi số điện thoại chính</string>
+  <string name="call_other_fax">Gọi số fax</string>
+  <string name="call_radio">Gọi số điện thoại radio</string>
+  <string name="call_telex">Gọi số telex</string>
+  <string name="call_tty_tdd">Gọi số điện thoại TTY/TDD</string>
+  <string name="call_work_mobile">Gọi số điện thoại di động tại cơ quan</string>
+  <string name="call_work_pager">Gọi số máy nhắn tin cơ quan</string>
+  <string name="call_assistant">Gọi %s</string>
+  <string name="call_mms">Gọi MMS</string>
+  <string name="sms_custom">Nhắn tin tới %s</string>
+  <string name="sms_home">Nhắn tin tới số điện thoại nhà riêng</string>
+  <string name="sms_mobile">Nhắn tin tới số điện thoại di động</string>
+  <string name="sms_work">Nhắn tin tới số điện thoại cơ quan</string>
+  <string name="sms_fax_work">Nhắn tin tới số fax cơ quan</string>
+  <string name="sms_fax_home">Nhắn tin tới số fax nhà riêng</string>
+  <string name="sms_pager">Nhắn tin tới số máy nhắn tin</string>
+  <string name="sms_other">Nhắn tin</string>
+  <string name="sms_callback">Nhắn tin tới số gọi lại</string>
+  <string name="sms_car">Nhắn tin tới số điện thoại trên ô tô</string>
+  <string name="sms_company_main">Nhắn tin tới số điện thoại chính của công ty</string>
+  <string name="sms_isdn">Nhắn tin tới số điện thoại ISDN</string>
+  <string name="sms_main">Nhắn tin tới số điện thoại chính</string>
+  <string name="sms_other_fax">Nhắn tin tới số fax</string>
+  <string name="sms_radio">Nhắn tin tới số điện thoại radio</string>
+  <string name="sms_telex">Nhắn tin tới số telex</string>
+  <string name="sms_tty_tdd">Nhắn tới số TTY/TDD</string>
+  <string name="sms_work_mobile">Nhắn tới số điện thoại di động tại cơ quan</string>
+  <string name="sms_work_pager">Nhắn tin tới số máy nhắn tin cơ quan</string>
+  <string name="sms_assistant">Nhắn tin tới %s</string>
+  <string name="sms_mms">Nhắn tin tới số điện thoại MMS</string>
+  <string name="clearFrequentsConfirmation_title">Xóa danh sách liên hệ thường xuyên?</string>
+  <string name="clearFrequentsConfirmation">Bạn sẽ xóa danh sách liên hệ thường xuyên trong ứng dụng Danh bạ và điện thoại cũng như buộc các ứng dụng email phải tìm hiểu các tùy chọn gửi của bạn lại từ đầu.</string>
+  <string name="clearFrequentsProgress_title">Đang xóa DS liên hệ thường xuyên…</string>
+  <string name="status_available">Có mặt</string>
+  <string name="status_away">Đã ra ngoài</string>
+  <string name="status_busy">Bận</string>
+  <string name="contactsList">Danh bạ</string>
+  <string name="contact_suggestions">Đề xuất hàng đầu</string>
+  <string name="local_invisible_directory">Khác</string>
+  <string name="directory_search_label">Thư mục</string>
+  <string name="directory_search_label_work">Thư mục công việc</string>
+  <string name="local_search_label">Tất cả liên hệ</string>
+  <string name="local_suggestions_search_label">Đề xuất</string>
+  <string msgid="9154761216179882405" name="user_profile_contacts_list_header">Tôi</string>
+  <string name="missing_name">(Không có tên)</string>
+  <string msgid="2795575601596468581" name="description_view_contact_detail">Xem liên hệ</string>
+  <string name="list_filter_phones">Tất cả người liên hệ có số điện thoại</string>
+  <string name="list_filter_phones_work">Liên hệ trên hồ sơ công việc</string>
+  <string name="view_updates_from_group">Xem thông tin cập nhật</string>
+  <string name="account_phone">Chỉ trên thiết bị, chưa đồng bộ hóa</string>
+  <string name="nameLabelsGroup">Tên</string>
+  <string name="nicknameLabelsGroup">Biệt hiệu</string>
+  <string name="full_name">Tên</string>
+  <string name="name_given">Tên</string>
+  <string name="name_family">Họ</string>
+  <string name="name_prefix">Danh xưng</string>
+  <string name="name_middle">Tên đệm</string>
+  <string name="name_suffix">Hậu tố tên</string>
+  <string name="name_phonetic">Tên theo phiên âm</string>
+  <string name="name_phonetic_given">Tên theo phiên âm</string>
+  <string name="name_phonetic_middle">Tên đệm theo phiên âm</string>
+  <string name="name_phonetic_family">Họ theo phiên âm</string>
+  <string name="phoneLabelsGroup">Điện thoại</string>
+  <string name="emailLabelsGroup">Gửi email</string>
+  <string name="postalLabelsGroup">Địa chỉ</string>
+  <string name="imLabelsGroup">IM</string>
+  <string name="organizationLabelsGroup">Tổ chức</string>
+  <string name="relationLabelsGroup">Mối quan hệ</string>
+  <string name="eventLabelsGroup">Ngày đặc biệt</string>
+  <string name="sms">Tin nhắn văn bản</string>
+  <string name="postal_address">Địa chỉ</string>
+  <string name="ghostData_company">Công ty</string>
+  <string name="ghostData_title">Chức danh</string>
+  <string name="label_notes">Ghi chú</string>
+  <string name="label_sip_address">SIP</string>
+  <string name="websiteLabelsGroup">Trang web</string>
+  <string name="groupsLabel">Nhóm</string>
+  <string name="email_home">Gửi email tới địa chỉ email nhà riêng</string>
+  <string name="email_mobile">Gửi email tới địa chỉ email thiết bị di động</string>
+  <string name="email_work">Gửi email tới địa chỉ email cơ quan</string>
+  <string name="email_other">Gửi email</string>
+  <string name="email_custom">Gửi email cho %s</string>
+  <string name="email">Gửi email</string>
+  <string name="postal_street">Đường phố</string>
+  <string name="postal_city">Thành phố</string>
+  <string name="postal_region">Tiểu bang</string>
+  <string name="postal_postcode">Mã ZIP</string>
+  <string name="postal_country">Quốc gia</string>
+  <string name="map_home">Xem địa chỉ nhà riêng</string>
+  <string name="map_work">Xem địa chỉ cơ quan</string>
+  <string name="map_other">Xem địa chỉ</string>
+  <string name="map_custom">Xem địa chỉ %s</string>
+  <string name="chat_aim">Trò chuyện sử dụng AIM</string>
+  <string name="chat_msn">Trò chuyện sử dụng Windows Live</string>
+  <string name="chat_yahoo">Trò chuyện sử dụng Yahoo</string>
+  <string name="chat_skype">Trò chuyện sử dụng Skype</string>
+  <string name="chat_qq">Trò chuyện sử dụng QQ</string>
+  <string name="chat_gtalk">Trò chuyện sử dụng Google Talk</string>
+  <string name="chat_icq">Trò chuyện sử dụng ICQ</string>
+  <string name="chat_jabber">Trò chuyện sử dụng Jabber</string>
+  <string name="chat">Trò chuyện</string>
+  <string name="list_filter_all_accounts">Tất cả liên hệ</string>
+  <string name="listAllContactsInAccount">Danh bạ trong %s</string>
+  <string name="listCustomView">Danh bạ ở chế độ xem tùy chỉnh</string>
+  <string name="listSingleContact">Một liên hệ</string>
+  <string name="display_options_sort_list_by">Sắp xếp theo</string>
+  <string name="display_options_sort_by_given_name">Tên</string>
+  <string name="display_options_sort_by_family_name">Họ</string>
+  <string name="display_options_view_names_as">Định dạng tên</string>
+  <string name="display_options_view_given_name_first">Tên trước</string>
+  <string name="display_options_view_family_name_first">Họ trước</string>
+  <string name="menu_clear_frequents">Xóa DS liên hệ thường xuyên</string>
+  <string name="action_menu_back_from_search">ngừng tìm kiếm</string>
+  <string name="description_clear_search">Xóa tìm kiếm</string>
+  <string name="select_account_dialog_title">Tài khoản</string>
+  <string name="set_default_account">Luôn sử dụng SIM này để gọi</string>
+  <string name="select_phone_account_for_calls">Chọn SIM cho cuộc gọi này</string>
+  <string name="select_phone_account_for_calls_remember">Nhớ lựa chọn này</string>
+  <string name="call_with_a_note">Gọi điện kèm theo ghi chú</string>
+  <string name="call_subject_hint">Nhập ghi chú để gửi kèm cuộc gọi...</string>
+  <string name="send_and_call_button">GỬI và GỌI</string>
+  <string name="call_subject_limit">%1$s / %2$s</string>
+  <string name="old_call_subject_type_and_number">%1$s %2$s</string>
+  <string name="tab_title">Tab %1$s.</string>
+  <plurals name="tab_title_with_unread_items">
+    <item quantity="one"> Tab %1$s. %2$d mục chưa đọc. </item>
+    <item quantity="other"> Tab %1$s. %2$d mục chưa đọc. </item>
+  </plurals>
+  <string name="description_search_video_call">Gọi điện video</string>
+  <string name="description_search_call_and_share">Chia sẻ và gọi</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-zh-rCN/donottranslate_config.xml b/java/com/android/contacts/common/res/values-zh-rCN/donottranslate_config.xml
deleted file mode 100644
index 0802399..0000000
--- a/java/com/android/contacts/common/res/values-zh-rCN/donottranslate_config.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  <!-- If true, an option is shown in Display Options UI to choose a sort order -->
-  <bool name="config_sort_order_user_changeable">false</bool>
-
-  <!-- If true, the default sort order is primary (i.e. by given name) -->
-  <bool name="config_default_sort_order_primary">true</bool>
-
-  <!-- If true, an option is shown in Display Options UI to choose a name display order -->
-  <bool name="config_display_order_user_changeable">false</bool>
-
-  <!-- If true, the default sort order is primary (i.e. by given name) -->
-  <bool name="config_default_display_order_primary">true</bool>
-
-  <!-- If true, the order of name fields in the editor is primary (i.e. given name first) -->
-  <bool name="config_editor_field_order_primary">false</bool>
-</resources>
\ No newline at end of file
diff --git a/java/com/android/contacts/common/res/values-zh-rCN/strings.xml b/java/com/android/contacts/common/res/values-zh-rCN/strings.xml
index a83d460..cdaba8c 100644
--- a/java/com/android/contacts/common/res/values-zh-rCN/strings.xml
+++ b/java/com/android/contacts/common/res/values-zh-rCN/strings.xml
@@ -1,162 +1,145 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="toast_text_copied" msgid="8979281391599667362">"文本已复制"</string>
-    <string name="call_custom" msgid="3041673234638990874">"拨打<xliff:g id="CUSTOM">%s</xliff:g>电话号码"</string>
-    <string name="call_home" msgid="125893483593803791">"拨打住宅电话号码"</string>
-    <string name="call_mobile" msgid="967589404494150813">"拨打手机号码"</string>
-    <string name="call_work" msgid="6040550697395300892">"拨打公司电话号码"</string>
-    <string name="call_fax_work" msgid="5260192771364592922">"拨打公司传真号码"</string>
-    <string name="call_fax_home" msgid="5174311195081144124">"拨打住宅传真号码"</string>
-    <string name="call_pager" msgid="6814149227741274161">"拨打寻呼机号码"</string>
-    <string name="call_other" msgid="5536385588712587235">"拨打电话"</string>
-    <string name="call_callback" msgid="6314019862718112786">"拨打回拨号码"</string>
-    <string name="call_car" msgid="3197417098027764954">"拨打车载电话号码"</string>
-    <string name="call_company_main" msgid="2557663310028446397">"拨打公司总机号码"</string>
-    <string name="call_isdn" msgid="4691270442763649522">"拨打 ISDN 电话号码"</string>
-    <string name="call_main" msgid="3293707608770407814">"拨打主电话号码"</string>
-    <string name="call_other_fax" msgid="4724521984879021465">"拨打传真号码"</string>
-    <string name="call_radio" msgid="8942441419845057942">"拨打无线通讯电话号码"</string>
-    <string name="call_telex" msgid="2031514461660668351">"拨打电报号码"</string>
-    <string name="call_tty_tdd" msgid="7807210224965727701">"拨打 TTY/TDD 号码"</string>
-    <string name="call_work_mobile" msgid="2716342732938578495">"拨打公司手机号码"</string>
-    <string name="call_work_pager" msgid="3791778749827366574">"拨打公司寻呼机号码"</string>
-    <string name="call_assistant" msgid="4177478845473789294">"拨打<xliff:g id="ASSISTANT">%s</xliff:g>的电话"</string>
-    <string name="call_mms" msgid="4958811711741872901">"拨打彩信电话号码"</string>
-    <string name="sms_custom" msgid="8785368968605026317">"向<xliff:g id="CUSTOM">%s</xliff:g>电话号码发短信"</string>
-    <string name="sms_home" msgid="3527719551060295243">"向住宅电话号码发短信"</string>
-    <string name="sms_mobile" msgid="8883045857887736518">"向手机发短信"</string>
-    <string name="sms_work" msgid="4158595439553450966">"向公司电话号码发短信"</string>
-    <string name="sms_fax_work" msgid="5483726627718055248">"向公司传真号码发短信"</string>
-    <string name="sms_fax_home" msgid="9219265155770746077">"向住宅传真号码发短信"</string>
-    <string name="sms_pager" msgid="4901085068525193933">"向寻呼机号码发短信"</string>
-    <string name="sms_other" msgid="1742702947993285933">"发短信"</string>
-    <string name="sms_callback" msgid="5833483630377538308">"向回拨号码发短信"</string>
-    <string name="sms_car" msgid="4314577266154395174">"向车载电话号码发短信"</string>
-    <string name="sms_company_main" msgid="2308160928487360705">"向公司总机号码发短信"</string>
-    <string name="sms_isdn" msgid="6394300346179302542">"向 ISDN 电话号码发短信"</string>
-    <string name="sms_main" msgid="8908087742014140774">"向主电话号码发短信"</string>
-    <string name="sms_other_fax" msgid="8768455473295405427">"向传真号码发短信"</string>
-    <string name="sms_radio" msgid="855555176531704682">"向无线通讯电话号码发短信"</string>
-    <string name="sms_telex" msgid="6269029276223252719">"向电报号码发短信"</string>
-    <string name="sms_tty_tdd" msgid="6229057354509192444">"向 TTY/TDD 号码发短信"</string>
-    <string name="sms_work_mobile" msgid="2155975469329969840">"向公司手机发短信"</string>
-    <string name="sms_work_pager" msgid="8500140274906830742">"向公司寻呼机号码发短信"</string>
-    <string name="sms_assistant" msgid="8513548482745330818">"向<xliff:g id="ASSISTANT">%s</xliff:g>发短信"</string>
-    <string name="sms_mms" msgid="5187888900503248542">"向彩信电话号码发短信"</string>
-    <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"是否清除常用联系人？"</string>
-    <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"此操作会清除“通讯录”和“电话”应用中的常用联系人列表，并强制电子邮件应用重新获取您最常使用的联系地址。"</string>
-    <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"正在清除常用联系人…"</string>
-    <string name="status_available" msgid="2648156525685472626">"在线"</string>
-    <string name="status_away" msgid="2298688367552893953">"离开"</string>
-    <string name="status_busy" msgid="5990832098713248503">"忙碌"</string>
-    <string name="contactsList" msgid="8806067891419291513">"通讯录"</string>
-    <string name="contact_suggestions" msgid="3324166754807120006">"常用联系人推荐"</string>
-    <string name="local_invisible_directory" msgid="4723238462733650090">"其他"</string>
-    <string name="directory_search_label" msgid="4621215895484025229">"目录"</string>
-    <string name="directory_search_label_work" msgid="7679326282707414897">"工作目录"</string>
-    <string name="local_search_label" msgid="907622822323119235">"所有联系人"</string>
-    <string name="local_suggestions_search_label" msgid="1178575146224386118">"建议"</string>
-    <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"我"</string>
-    <string name="missing_name" msgid="978606963362745020">"（无姓名）"</string>
-    <string name="description_view_contact_detail" msgid="2428742401208561136">"查看联系人"</string>
-    <string name="list_filter_phones" msgid="8763316061763437182">"所有拥有电话号码的联系人"</string>
-    <string name="list_filter_phones_work" msgid="7083575404573422965">"工作资料联系人"</string>
-    <string name="view_updates_from_group" msgid="9011641093168385729">"查看最新动态"</string>
-    <string name="account_phone" msgid="7067809073194061035">"仅限此设备，不同步"</string>
-    <string name="nameLabelsGroup" msgid="7730465833159557471">"姓名"</string>
-    <string name="nicknameLabelsGroup" msgid="6310556912361840029">"昵称"</string>
-    <string name="full_name" msgid="648186563998465740">"名称"</string>
-    <string name="name_given" msgid="5096576006314820536">"名字"</string>
-    <string name="name_family" msgid="6646235805198547467">"姓氏"</string>
-    <string name="name_prefix" msgid="9215326539658838">"姓名前缀"</string>
-    <string name="name_middle" msgid="703755205331582769">"中间名"</string>
-    <string name="name_suffix" msgid="5777083390282548702">"姓名后缀"</string>
-    <string name="name_phonetic" msgid="1650870996361663089">"姓名拼音"</string>
-    <string name="name_phonetic_given" msgid="618812334274603170">"名字拼音"</string>
-    <string name="name_phonetic_middle" msgid="4826820763384625538">"中间名拼音"</string>
-    <string name="name_phonetic_family" msgid="379905191212930771">"姓氏拼音"</string>
-    <string name="phoneLabelsGroup" msgid="169661929021355548">"电话"</string>
-    <string name="emailLabelsGroup" msgid="2249752810477488833">"发送电子邮件"</string>
-    <string name="postalLabelsGroup" msgid="6772000590189142253">"地址"</string>
-    <string name="imLabelsGroup" msgid="5718066254237364731">"聊天工具"</string>
-    <string name="organizationLabelsGroup" msgid="1101996309241601435">"组织"</string>
-    <string name="relationLabelsGroup" msgid="53866051664600053">"关系"</string>
-    <string name="eventLabelsGroup" msgid="1236970042646618489">"特别的日子"</string>
-    <string name="sms" msgid="7574344928185328095">"文字信息"</string>
-    <string name="postal_address" msgid="1804707930129674200">"地址"</string>
-    <string name="ghostData_company" msgid="2554310786296833424">"公司"</string>
-    <string name="ghostData_title" msgid="4994968731830184837">"职务"</string>
-    <string name="label_notes" msgid="2050255313694219786">"备注"</string>
-    <string name="label_sip_address" msgid="8883266182575965926">"SIP"</string>
-    <string name="websiteLabelsGroup" msgid="1630734286462186790">"网站"</string>
-    <string name="groupsLabel" msgid="2694002798416868728">"群组"</string>
-    <string name="email_home" msgid="889830029388962171">"向个人邮箱发送电子邮件"</string>
-    <string name="email_mobile" msgid="4487686436743741150">"向手机发送电子邮件"</string>
-    <string name="email_work" msgid="4223487303344613528">"向工作邮箱发送电子邮件"</string>
-    <string name="email_other" msgid="4246411900126012062">"发送电子邮件"</string>
-    <string name="email_custom" msgid="7246580894327511013">"向<xliff:g id="CUSTOM">%s</xliff:g>邮箱发送电子邮件"</string>
-    <string name="email" msgid="2807318537887091606">"发送电子邮件"</string>
-    <string name="postal_street" msgid="6918171741240802474">"街道"</string>
-    <string name="postal_city" msgid="8674569121430005628">"城市"</string>
-    <string name="postal_region" msgid="1730369286225469192">"省/自治区/直辖市"</string>
-    <string name="postal_postcode" msgid="4450700741261990439">"邮编"</string>
-    <string name="postal_country" msgid="232670707458768148">"国家/地区"</string>
-    <string name="map_home" msgid="4181131107392126938">"查看住宅地址"</string>
-    <string name="map_work" msgid="5723471185992684400">"查看工作地址"</string>
-    <string name="map_other" msgid="2253764780863500516">"查看地址"</string>
-    <string name="map_custom" msgid="5581743097882436157">"查看<xliff:g id="CUSTOM">%s</xliff:g>地址"</string>
-    <string name="chat_aim" msgid="2954364435497941659">"使用 AIM 聊天"</string>
-    <string name="chat_msn" msgid="3130135239071228678">"使用 Windows Live 聊天"</string>
-    <string name="chat_yahoo" msgid="3233552142326865347">"使用雅虎通聊天"</string>
-    <string name="chat_skype" msgid="6486703981390592425">"使用 Skype 聊天"</string>
-    <string name="chat_qq" msgid="786924280665740019">"使用 QQ 聊天"</string>
-    <string name="chat_gtalk" msgid="7914674177243078035">"使用Google Talk聊天"</string>
-    <string name="chat_icq" msgid="3292934726414765801">"使用 ICQ 聊天"</string>
-    <string name="chat_jabber" msgid="6701542313597880204">"使用 Jabber 聊天"</string>
-    <string name="chat" msgid="1020428260359370236">"聊天"</string>
-    <string name="list_filter_all_accounts" msgid="473782314881473992">"所有联系人"</string>
-    <string name="listAllContactsInAccount" msgid="3486378621592995630">"<xliff:g id="NAME">%s</xliff:g> 中的联系人"</string>
-    <string name="listCustomView" msgid="5306282632413086731">"自定义视图中的联系人"</string>
-    <string name="listSingleContact" msgid="8620818791932382627">"单个联系人"</string>
-    <string name="display_options_sort_list_by" msgid="3541875948367831228">"排序方式"</string>
-    <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"名字"</string>
-    <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"姓氏"</string>
-    <string name="display_options_view_names_as" msgid="4204204205736735618">"姓名格式"</string>
-    <string name="display_options_view_given_name_first" msgid="2308026973021171020">"名字在前"</string>
-    <string name="display_options_view_family_name_first" msgid="987430497292428242">"姓氏在前"</string>
-    <string name="menu_clear_frequents" msgid="5358271535047496120">"清除常用联系人"</string>
-    <string name="action_menu_back_from_search" msgid="3550669942742167644">"停止搜索"</string>
-    <string name="description_clear_search" msgid="2347258825265600782">"清除搜索内容"</string>
-    <string name="select_account_dialog_title" msgid="2673504582803359239">"帐号"</string>
-    <string name="set_default_account" msgid="7966099951006467572">"一律使用这张卡进行通话"</string>
-    <string name="select_phone_account_for_calls" msgid="1784460686103423274">"用于外拨电话的帐号"</string>
-    <string name="call_with_a_note" msgid="6242261320491851133">"拨打电话并发送备注"</string>
-    <string name="call_subject_hint" msgid="7233138753650420800">"输入要在拨打电话时发送的备注…"</string>
-    <string name="send_and_call_button" msgid="4735168294120154013">"发送并拨打电话"</string>
-    <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g>：<xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="tab_title" msgid="3387876802026074288">"<xliff:g id="TITLE">%1$s</xliff:g>标签。"</string>
-    <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
-      <item quantity="other"> <xliff:g id="TITLE_2">%1$s</xliff:g>标签。<xliff:g id="COUNT_3">%2$d</xliff:g> 项未读内容。</item>
-      <item quantity="one"> <xliff:g id="TITLE_0">%1$s</xliff:g>标签。<xliff:g id="COUNT_1">%2$d</xliff:g> 项未读内容。</item>
-    </plurals>
-    <string name="description_search_video_call" msgid="4337369876888024909">"视频通话"</string>
-    <string name="description_search_call_and_share" msgid="4912772842755050467">"分享并拨打电话"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_custom">拨打%s电话号码</string>
+  <string name="call_home">拨打住宅电话号码</string>
+  <string name="call_mobile">拨打手机号码</string>
+  <string name="call_work">拨打公司电话号码</string>
+  <string name="call_fax_work">拨打公司传真号码</string>
+  <string name="call_fax_home">拨打住宅传真号码</string>
+  <string name="call_pager">拨打寻呼机号码</string>
+  <string name="call_other">拨打电话</string>
+  <string name="call_callback">拨打回拨号码</string>
+  <string name="call_car">拨打车载电话号码</string>
+  <string name="call_company_main">拨打公司总机号码</string>
+  <string name="call_isdn">拨打 ISDN 电话号码</string>
+  <string name="call_main">拨打主电话号码</string>
+  <string name="call_other_fax">拨打传真号码</string>
+  <string name="call_radio">拨打无线通讯电话号码</string>
+  <string name="call_telex">拨打电报号码</string>
+  <string name="call_tty_tdd">拨打 TTY/TDD 号码</string>
+  <string name="call_work_mobile">拨打公司手机号码</string>
+  <string name="call_work_pager">拨打公司寻呼机号码</string>
+  <string name="call_assistant">拨打%s的电话</string>
+  <string name="call_mms">拨打彩信电话号码</string>
+  <string name="sms_custom">向%s电话号码发短信</string>
+  <string name="sms_home">向住宅电话号码发短信</string>
+  <string name="sms_mobile">向手机发短信</string>
+  <string name="sms_work">向公司电话号码发短信</string>
+  <string name="sms_fax_work">向公司传真号码发短信</string>
+  <string name="sms_fax_home">向住宅传真号码发短信</string>
+  <string name="sms_pager">向寻呼机号码发短信</string>
+  <string name="sms_other">发短信</string>
+  <string name="sms_callback">向回拨号码发短信</string>
+  <string name="sms_car">向车载电话号码发短信</string>
+  <string name="sms_company_main">向公司总机号码发短信</string>
+  <string name="sms_isdn">向 ISDN 电话号码发短信</string>
+  <string name="sms_main">向主电话号码发短信</string>
+  <string name="sms_other_fax">向传真号码发短信</string>
+  <string name="sms_radio">向无线通讯电话号码发短信</string>
+  <string name="sms_telex">向电报号码发短信</string>
+  <string name="sms_tty_tdd">向 TTY/TDD 号码发短信</string>
+  <string name="sms_work_mobile">向公司手机发短信</string>
+  <string name="sms_work_pager">向公司寻呼机号码发短信</string>
+  <string name="sms_assistant">向%s发短信</string>
+  <string name="sms_mms">向彩信电话号码发短信</string>
+  <string name="clearFrequentsConfirmation_title">是否清除常用联系人？</string>
+  <string name="clearFrequentsConfirmation">此操作会清除“通讯录”和“电话”应用中的常用联系人列表，并强制电子邮件应用重新获取您最常使用的联系地址。</string>
+  <string name="clearFrequentsProgress_title">正在清除常用联系人…</string>
+  <string name="status_available">在线</string>
+  <string name="status_away">离开</string>
+  <string name="status_busy">忙碌</string>
+  <string name="contactsList">通讯录</string>
+  <string name="contact_suggestions">常用联系人推荐</string>
+  <string name="local_invisible_directory">其他</string>
+  <string name="directory_search_label">目录</string>
+  <string name="directory_search_label_work">工作目录</string>
+  <string name="local_search_label">所有联系人</string>
+  <string name="local_suggestions_search_label">建议</string>
+  <string msgid="9154761216179882405" name="user_profile_contacts_list_header">我</string>
+  <string name="missing_name">（无姓名）</string>
+  <string msgid="2795575601596468581" name="description_view_contact_detail">查看联系人</string>
+  <string name="list_filter_phones">所有拥有电话号码的联系人</string>
+  <string name="list_filter_phones_work">工作资料联系人</string>
+  <string name="view_updates_from_group">查看最新动态</string>
+  <string name="account_phone">仅限此设备，不同步</string>
+  <string name="nameLabelsGroup">姓名</string>
+  <string name="nicknameLabelsGroup">昵称</string>
+  <string name="full_name">名称</string>
+  <string name="name_given">名字</string>
+  <string name="name_family">姓氏</string>
+  <string name="name_prefix">姓名前缀</string>
+  <string name="name_middle">中间名</string>
+  <string name="name_suffix">姓名后缀</string>
+  <string name="name_phonetic">姓名拼音</string>
+  <string name="name_phonetic_given">名字拼音</string>
+  <string name="name_phonetic_middle">中间名拼音</string>
+  <string name="name_phonetic_family">姓氏拼音</string>
+  <string name="phoneLabelsGroup">电话</string>
+  <string name="emailLabelsGroup">发送电子邮件</string>
+  <string name="postalLabelsGroup">地址</string>
+  <string name="imLabelsGroup">聊天工具</string>
+  <string name="organizationLabelsGroup">组织</string>
+  <string name="relationLabelsGroup">关系</string>
+  <string name="eventLabelsGroup">特别的日子</string>
+  <string name="sms">文字信息</string>
+  <string name="postal_address">地址</string>
+  <string name="ghostData_company">公司</string>
+  <string name="ghostData_title">职务</string>
+  <string name="label_notes">备注</string>
+  <string name="label_sip_address">SIP</string>
+  <string name="websiteLabelsGroup">网站</string>
+  <string name="groupsLabel">群组</string>
+  <string name="email_home">向个人邮箱发送电子邮件</string>
+  <string name="email_mobile">向手机发送电子邮件</string>
+  <string name="email_work">向工作邮箱发送电子邮件</string>
+  <string name="email_other">发送电子邮件</string>
+  <string name="email_custom">向%s邮箱发送电子邮件</string>
+  <string name="email">发送电子邮件</string>
+  <string name="postal_street">街道</string>
+  <string name="postal_city">城市</string>
+  <string name="postal_region">省/自治区/直辖市</string>
+  <string name="postal_postcode">邮编</string>
+  <string name="postal_country">国家/地区</string>
+  <string name="map_home">查看住宅地址</string>
+  <string name="map_work">查看工作地址</string>
+  <string name="map_other">查看地址</string>
+  <string name="map_custom">查看%s地址</string>
+  <string name="chat_aim">使用 AIM 聊天</string>
+  <string name="chat_msn">使用 Windows Live 聊天</string>
+  <string name="chat_yahoo">使用雅虎通聊天</string>
+  <string name="chat_skype">使用 Skype 聊天</string>
+  <string name="chat_qq">使用 QQ 聊天</string>
+  <string name="chat_gtalk">使用Google Talk聊天</string>
+  <string name="chat_icq">使用 ICQ 聊天</string>
+  <string name="chat_jabber">使用 Jabber 聊天</string>
+  <string name="chat">聊天</string>
+  <string name="list_filter_all_accounts">所有联系人</string>
+  <string name="listAllContactsInAccount">%s 中的联系人</string>
+  <string name="listCustomView">自定义视图中的联系人</string>
+  <string name="listSingleContact">单个联系人</string>
+  <string name="display_options_sort_list_by">排序方式</string>
+  <string name="display_options_sort_by_given_name">名字</string>
+  <string name="display_options_sort_by_family_name">姓氏</string>
+  <string name="display_options_view_names_as">姓名格式</string>
+  <string name="display_options_view_given_name_first">名字在前</string>
+  <string name="display_options_view_family_name_first">姓氏在前</string>
+  <string name="menu_clear_frequents">清除常用联系人</string>
+  <string name="action_menu_back_from_search">停止搜索</string>
+  <string name="description_clear_search">清除搜索内容</string>
+  <string name="select_account_dialog_title">帐号</string>
+  <string name="set_default_account">一律使用这张卡进行通话</string>
+  <string name="select_phone_account_for_calls">为此次通话选择 SIM 卡</string>
+  <string name="select_phone_account_for_calls_remember">记住此选择</string>
+  <string name="call_with_a_note">拨打电话并发送备注</string>
+  <string name="call_subject_hint">输入要在拨打电话时发送的备注…</string>
+  <string name="send_and_call_button">发送并拨打电话</string>
+  <string name="call_subject_limit">%1$s / %2$s</string>
+  <string name="old_call_subject_type_and_number">%1$s %2$s</string>
+  <string name="tab_title">%1$s标签。</string>
+  <plurals name="tab_title_with_unread_items">
+    <item quantity="one"> %1$s标签。%2$d 项未读内容。</item>
+    <item quantity="other"> %1$s标签。%2$d 项未读内容。</item>
+  </plurals>
+  <string name="description_search_video_call">视频通话</string>
+  <string name="description_search_call_and_share">分享并拨打电话</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-zh-rHK/strings.xml b/java/com/android/contacts/common/res/values-zh-rHK/strings.xml
index dfa6613..e10e0b4 100644
--- a/java/com/android/contacts/common/res/values-zh-rHK/strings.xml
+++ b/java/com/android/contacts/common/res/values-zh-rHK/strings.xml
@@ -1,162 +1,145 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="toast_text_copied" msgid="8979281391599667362">"文字已複製"</string>
-    <string name="call_custom" msgid="3041673234638990874">"撥打<xliff:g id="CUSTOM">%s</xliff:g>電話號碼"</string>
-    <string name="call_home" msgid="125893483593803791">"撥打住家電話號碼"</string>
-    <string name="call_mobile" msgid="967589404494150813">"撥打手機號碼"</string>
-    <string name="call_work" msgid="6040550697395300892">"撥打公司電話號碼"</string>
-    <string name="call_fax_work" msgid="5260192771364592922">"撥打公司傳真號碼"</string>
-    <string name="call_fax_home" msgid="5174311195081144124">"撥打住家傳真號碼"</string>
-    <string name="call_pager" msgid="6814149227741274161">"撥打傳呼機號碼"</string>
-    <string name="call_other" msgid="5536385588712587235">"撥號"</string>
-    <string name="call_callback" msgid="6314019862718112786">"撥打回撥號碼"</string>
-    <string name="call_car" msgid="3197417098027764954">"撥打車用電話號碼"</string>
-    <string name="call_company_main" msgid="2557663310028446397">"撥打公司總機號碼"</string>
-    <string name="call_isdn" msgid="4691270442763649522">"撥打 ISDN 電話號碼"</string>
-    <string name="call_main" msgid="3293707608770407814">"撥打總機號碼"</string>
-    <string name="call_other_fax" msgid="4724521984879021465">"撥打傳真號碼"</string>
-    <string name="call_radio" msgid="8942441419845057942">"撥打電台號碼"</string>
-    <string name="call_telex" msgid="2031514461660668351">"撥打 Telex 電話號碼"</string>
-    <string name="call_tty_tdd" msgid="7807210224965727701">"撥打 TTY/TDD 電話號碼"</string>
-    <string name="call_work_mobile" msgid="2716342732938578495">"撥打公司手機號碼"</string>
-    <string name="call_work_pager" msgid="3791778749827366574">"撥打公司傳呼機號碼"</string>
-    <string name="call_assistant" msgid="4177478845473789294">"撥打<xliff:g id="ASSISTANT">%s</xliff:g>的電話號碼"</string>
-    <string name="call_mms" msgid="4958811711741872901">"撥打 MMS 電話號碼"</string>
-    <string name="sms_custom" msgid="8785368968605026317">"傳送短訊至<xliff:g id="CUSTOM">%s</xliff:g>電話"</string>
-    <string name="sms_home" msgid="3527719551060295243">"傳送短訊至住家電話"</string>
-    <string name="sms_mobile" msgid="8883045857887736518">"傳送短訊至手機"</string>
-    <string name="sms_work" msgid="4158595439553450966">"傳送短訊至公司電話"</string>
-    <string name="sms_fax_work" msgid="5483726627718055248">"傳送短訊至公司傳真"</string>
-    <string name="sms_fax_home" msgid="9219265155770746077">"傳送短訊至住家傳真"</string>
-    <string name="sms_pager" msgid="4901085068525193933">"傳送短訊至傳呼機"</string>
-    <string name="sms_other" msgid="1742702947993285933">"傳送短訊"</string>
-    <string name="sms_callback" msgid="5833483630377538308">"傳送短訊至回撥號碼"</string>
-    <string name="sms_car" msgid="4314577266154395174">"傳送短訊至車用電話"</string>
-    <string name="sms_company_main" msgid="2308160928487360705">"傳送短訊至公司總機"</string>
-    <string name="sms_isdn" msgid="6394300346179302542">"傳送短訊至 ISDN"</string>
-    <string name="sms_main" msgid="8908087742014140774">"傳送短訊至總機"</string>
-    <string name="sms_other_fax" msgid="8768455473295405427">"傳送短訊至傳真"</string>
-    <string name="sms_radio" msgid="855555176531704682">"傳送短訊至電台"</string>
-    <string name="sms_telex" msgid="6269029276223252719">"傳送短訊至 Telex"</string>
-    <string name="sms_tty_tdd" msgid="6229057354509192444">"傳送短訊至 TTY/TDD"</string>
-    <string name="sms_work_mobile" msgid="2155975469329969840">"傳送短訊至公司手機"</string>
-    <string name="sms_work_pager" msgid="8500140274906830742">"傳送短訊至公司傳呼機"</string>
-    <string name="sms_assistant" msgid="8513548482745330818">"傳送短訊至<xliff:g id="ASSISTANT">%s</xliff:g>的電話"</string>
-    <string name="sms_mms" msgid="5187888900503248542">"傳送短訊至 MMS 電話號碼"</string>
-    <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"清除常用聯絡人？"</string>
-    <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"您將清除「通訊錄」應用程式和「電話」應用程式中的常用聯絡人名單，並強制電子郵件應用程式重新取得您的寄件偏好設定。"</string>
-    <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"正在清除常用聯絡人…"</string>
-    <string name="status_available" msgid="2648156525685472626">"在線"</string>
-    <string name="status_away" msgid="2298688367552893953">"離開"</string>
-    <string name="status_busy" msgid="5990832098713248503">"忙碌"</string>
-    <string name="contactsList" msgid="8806067891419291513">"通訊錄"</string>
-    <string name="contact_suggestions" msgid="3324166754807120006">"熱門建議"</string>
-    <string name="local_invisible_directory" msgid="4723238462733650090">"其他"</string>
-    <string name="directory_search_label" msgid="4621215895484025229">"名錄"</string>
-    <string name="directory_search_label_work" msgid="7679326282707414897">"工作目錄"</string>
-    <string name="local_search_label" msgid="907622822323119235">"所有聯絡人"</string>
-    <string name="local_suggestions_search_label" msgid="1178575146224386118">"建議"</string>
-    <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"我"</string>
-    <string name="missing_name" msgid="978606963362745020">"(沒有名稱)"</string>
-    <string name="description_view_contact_detail" msgid="2428742401208561136">"查看聯絡人"</string>
-    <string name="list_filter_phones" msgid="8763316061763437182">"所有附有電話號碼的聯絡人"</string>
-    <string name="list_filter_phones_work" msgid="7083575404573422965">"工作設定檔通訊錄"</string>
-    <string name="view_updates_from_group" msgid="9011641093168385729">"瀏覽更新資訊"</string>
-    <string name="account_phone" msgid="7067809073194061035">"僅限裝置，未同步"</string>
-    <string name="nameLabelsGroup" msgid="7730465833159557471">"姓名"</string>
-    <string name="nicknameLabelsGroup" msgid="6310556912361840029">"暱稱"</string>
-    <string name="full_name" msgid="648186563998465740">"名稱"</string>
-    <string name="name_given" msgid="5096576006314820536">"名字"</string>
-    <string name="name_family" msgid="6646235805198547467">"姓氏"</string>
-    <string name="name_prefix" msgid="9215326539658838">"姓名前稱謂"</string>
-    <string name="name_middle" msgid="703755205331582769">"中間名"</string>
-    <string name="name_suffix" msgid="5777083390282548702">"姓名後稱謂"</string>
-    <string name="name_phonetic" msgid="1650870996361663089">"姓名拼音"</string>
-    <string name="name_phonetic_given" msgid="618812334274603170">"名字拼音"</string>
-    <string name="name_phonetic_middle" msgid="4826820763384625538">"中間名拼音"</string>
-    <string name="name_phonetic_family" msgid="379905191212930771">"姓氏拼音"</string>
-    <string name="phoneLabelsGroup" msgid="169661929021355548">"電話"</string>
-    <string name="emailLabelsGroup" msgid="2249752810477488833">"傳送電郵"</string>
-    <string name="postalLabelsGroup" msgid="6772000590189142253">"地址"</string>
-    <string name="imLabelsGroup" msgid="5718066254237364731">"即時通訊"</string>
-    <string name="organizationLabelsGroup" msgid="1101996309241601435">"機構"</string>
-    <string name="relationLabelsGroup" msgid="53866051664600053">"關係"</string>
-    <string name="eventLabelsGroup" msgid="1236970042646618489">"特別日期"</string>
-    <string name="sms" msgid="7574344928185328095">"短訊"</string>
-    <string name="postal_address" msgid="1804707930129674200">"地址"</string>
-    <string name="ghostData_company" msgid="2554310786296833424">"公司"</string>
-    <string name="ghostData_title" msgid="4994968731830184837">"職稱"</string>
-    <string name="label_notes" msgid="2050255313694219786">"附註"</string>
-    <string name="label_sip_address" msgid="8883266182575965926">"SIP"</string>
-    <string name="websiteLabelsGroup" msgid="1630734286462186790">"網站"</string>
-    <string name="groupsLabel" msgid="2694002798416868728">"群組"</string>
-    <string name="email_home" msgid="889830029388962171">"傳送電郵至住家信箱"</string>
-    <string name="email_mobile" msgid="4487686436743741150">"傳送電郵至手機"</string>
-    <string name="email_work" msgid="4223487303344613528">"傳送電郵至公司信箱"</string>
-    <string name="email_other" msgid="4246411900126012062">"傳送電郵"</string>
-    <string name="email_custom" msgid="7246580894327511013">"傳送電郵至<xliff:g id="CUSTOM">%s</xliff:g>的信箱"</string>
-    <string name="email" msgid="2807318537887091606">"傳送電郵"</string>
-    <string name="postal_street" msgid="6918171741240802474">"街道"</string>
-    <string name="postal_city" msgid="8674569121430005628">"城市"</string>
-    <string name="postal_region" msgid="1730369286225469192">"州/省"</string>
-    <string name="postal_postcode" msgid="4450700741261990439">"郵遞區號"</string>
-    <string name="postal_country" msgid="232670707458768148">"國家/地區"</string>
-    <string name="map_home" msgid="4181131107392126938">"查看住家地址"</string>
-    <string name="map_work" msgid="5723471185992684400">"查看公司地址"</string>
-    <string name="map_other" msgid="2253764780863500516">"查看地址"</string>
-    <string name="map_custom" msgid="5581743097882436157">"查看<xliff:g id="CUSTOM">%s</xliff:g>地址"</string>
-    <string name="chat_aim" msgid="2954364435497941659">"使用 AIM 進行即時通訊"</string>
-    <string name="chat_msn" msgid="3130135239071228678">"使用 Windows Live 進行即時通訊"</string>
-    <string name="chat_yahoo" msgid="3233552142326865347">"使用 Yahoo 進行即時通訊"</string>
-    <string name="chat_skype" msgid="6486703981390592425">"使用 Skype 進行即時通訊"</string>
-    <string name="chat_qq" msgid="786924280665740019">"使用 QQ 進行即時通訊"</string>
-    <string name="chat_gtalk" msgid="7914674177243078035">"使用 Google Talk 進行即時通訊"</string>
-    <string name="chat_icq" msgid="3292934726414765801">"使用 ICQ 進行即時通訊"</string>
-    <string name="chat_jabber" msgid="6701542313597880204">"使用 Jabber 進行即時通訊"</string>
-    <string name="chat" msgid="1020428260359370236">"即時通訊"</string>
-    <string name="list_filter_all_accounts" msgid="473782314881473992">"所有聯絡人"</string>
-    <string name="listAllContactsInAccount" msgid="3486378621592995630">"<xliff:g id="NAME">%s</xliff:g> 中的聯絡人"</string>
-    <string name="listCustomView" msgid="5306282632413086731">"聯絡人自訂檢視"</string>
-    <string name="listSingleContact" msgid="8620818791932382627">"單一聯絡人"</string>
-    <string name="display_options_sort_list_by" msgid="3541875948367831228">"排序方式"</string>
-    <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"名字"</string>
-    <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"姓氏"</string>
-    <string name="display_options_view_names_as" msgid="4204204205736735618">"姓名格式"</string>
-    <string name="display_options_view_given_name_first" msgid="2308026973021171020">"名字在前"</string>
-    <string name="display_options_view_family_name_first" msgid="987430497292428242">"姓氏在前"</string>
-    <string name="menu_clear_frequents" msgid="5358271535047496120">"清除常用聯絡人"</string>
-    <string name="action_menu_back_from_search" msgid="3550669942742167644">"停止搜尋"</string>
-    <string name="description_clear_search" msgid="2347258825265600782">"清除搜尋"</string>
-    <string name="select_account_dialog_title" msgid="2673504582803359239">"帳戶"</string>
-    <string name="set_default_account" msgid="7966099951006467572">"永遠使用這張 SIM 卡通話"</string>
-    <string name="select_phone_account_for_calls" msgid="1784460686103423274">"選取用於撥號的 SIM 卡："</string>
-    <string name="call_with_a_note" msgid="6242261320491851133">"撥號時傳送筆記"</string>
-    <string name="call_subject_hint" msgid="7233138753650420800">"撥號時可以書寫和傳送筆記…"</string>
-    <string name="send_and_call_button" msgid="4735168294120154013">"傳送和撥號"</string>
-    <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="tab_title" msgid="3387876802026074288">"「<xliff:g id="TITLE">%1$s</xliff:g>」標籤。"</string>
-    <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
-      <item quantity="other">「<xliff:g id="TITLE_2">%1$s</xliff:g>」標籤 (<xliff:g id="COUNT_3">%2$d</xliff:g> 個未讀取項目)。</item>
-      <item quantity="one">「<xliff:g id="TITLE_0">%1$s</xliff:g>」標籤 (<xliff:g id="COUNT_1">%2$d</xliff:g> 個未讀取項目)。</item>
-    </plurals>
-    <string name="description_search_video_call" msgid="4337369876888024909">"視像通話"</string>
-    <string name="description_search_call_and_share" msgid="4912772842755050467">"分享並通話"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_custom">撥打%s電話號碼</string>
+  <string name="call_home">撥打住家電話號碼</string>
+  <string name="call_mobile">撥打手機號碼</string>
+  <string name="call_work">撥打公司電話號碼</string>
+  <string name="call_fax_work">撥打公司傳真號碼</string>
+  <string name="call_fax_home">撥打住家傳真號碼</string>
+  <string name="call_pager">撥打傳呼機號碼</string>
+  <string name="call_other">撥號</string>
+  <string name="call_callback">撥打回撥號碼</string>
+  <string name="call_car">撥打車用電話號碼</string>
+  <string name="call_company_main">撥打公司總機號碼</string>
+  <string name="call_isdn">撥打 ISDN 電話號碼</string>
+  <string name="call_main">撥打總機號碼</string>
+  <string name="call_other_fax">撥打傳真號碼</string>
+  <string name="call_radio">撥打電台號碼</string>
+  <string name="call_telex">撥打 Telex 電話號碼</string>
+  <string name="call_tty_tdd">撥打 TTY/TDD 電話號碼</string>
+  <string name="call_work_mobile">撥打公司手機號碼</string>
+  <string name="call_work_pager">撥打公司傳呼機號碼</string>
+  <string name="call_assistant">撥打%s的電話號碼</string>
+  <string name="call_mms">撥打 MMS 電話號碼</string>
+  <string name="sms_custom">傳送短訊至%s電話</string>
+  <string name="sms_home">傳送短訊至住家電話</string>
+  <string name="sms_mobile">傳送短訊至手機</string>
+  <string name="sms_work">傳送短訊至公司電話</string>
+  <string name="sms_fax_work">傳送短訊至公司傳真</string>
+  <string name="sms_fax_home">傳送短訊至住家傳真</string>
+  <string name="sms_pager">傳送短訊至傳呼機</string>
+  <string name="sms_other">傳送短訊</string>
+  <string name="sms_callback">傳送短訊至回撥號碼</string>
+  <string name="sms_car">傳送短訊至車用電話</string>
+  <string name="sms_company_main">傳送短訊至公司總機</string>
+  <string name="sms_isdn">傳送短訊至 ISDN</string>
+  <string name="sms_main">傳送短訊至總機</string>
+  <string name="sms_other_fax">傳送短訊至傳真</string>
+  <string name="sms_radio">傳送短訊至電台</string>
+  <string name="sms_telex">傳送短訊至 Telex</string>
+  <string name="sms_tty_tdd">傳送短訊至 TTY/TDD</string>
+  <string name="sms_work_mobile">傳送短訊至公司手機</string>
+  <string name="sms_work_pager">傳送短訊至公司傳呼機</string>
+  <string name="sms_assistant">傳送短訊至%s的電話</string>
+  <string name="sms_mms">傳送短訊至 MMS 電話號碼</string>
+  <string name="clearFrequentsConfirmation_title">清除常用聯絡人？</string>
+  <string name="clearFrequentsConfirmation">您將清除「通訊錄」應用程式和「電話」應用程式中的常用聯絡人名單，並強制電子郵件應用程式重新取得您的寄件偏好設定。</string>
+  <string name="clearFrequentsProgress_title">正在清除常用聯絡人…</string>
+  <string name="status_available">在線</string>
+  <string name="status_away">離開</string>
+  <string name="status_busy">忙碌</string>
+  <string name="contactsList">通訊錄</string>
+  <string name="contact_suggestions">熱門建議</string>
+  <string name="local_invisible_directory">其他</string>
+  <string name="directory_search_label">名錄</string>
+  <string name="directory_search_label_work">工作目錄</string>
+  <string name="local_search_label">所有聯絡人</string>
+  <string name="local_suggestions_search_label">建議</string>
+  <string msgid="9154761216179882405" name="user_profile_contacts_list_header">我</string>
+  <string name="missing_name">(沒有名稱)</string>
+  <string msgid="2795575601596468581" name="description_view_contact_detail">查看聯絡人</string>
+  <string name="list_filter_phones">所有附有電話號碼的聯絡人</string>
+  <string name="list_filter_phones_work">工作設定檔通訊錄</string>
+  <string name="view_updates_from_group">瀏覽更新資訊</string>
+  <string name="account_phone">僅限裝置，未同步</string>
+  <string name="nameLabelsGroup">姓名</string>
+  <string name="nicknameLabelsGroup">暱稱</string>
+  <string name="full_name">名稱</string>
+  <string name="name_given">名字</string>
+  <string name="name_family">姓氏</string>
+  <string name="name_prefix">姓名前稱謂</string>
+  <string name="name_middle">中間名</string>
+  <string name="name_suffix">姓名後稱謂</string>
+  <string name="name_phonetic">姓名拼音</string>
+  <string name="name_phonetic_given">名字拼音</string>
+  <string name="name_phonetic_middle">中間名拼音</string>
+  <string name="name_phonetic_family">姓氏拼音</string>
+  <string name="phoneLabelsGroup">電話</string>
+  <string name="emailLabelsGroup">傳送電郵</string>
+  <string name="postalLabelsGroup">地址</string>
+  <string name="imLabelsGroup">即時通訊</string>
+  <string name="organizationLabelsGroup">機構</string>
+  <string name="relationLabelsGroup">關係</string>
+  <string name="eventLabelsGroup">特別日期</string>
+  <string name="sms">短訊</string>
+  <string name="postal_address">地址</string>
+  <string name="ghostData_company">公司</string>
+  <string name="ghostData_title">職稱</string>
+  <string name="label_notes">附註</string>
+  <string name="label_sip_address">SIP</string>
+  <string name="websiteLabelsGroup">網站</string>
+  <string name="groupsLabel">群組</string>
+  <string name="email_home">傳送電郵至住家信箱</string>
+  <string name="email_mobile">傳送電郵至手機</string>
+  <string name="email_work">傳送電郵至公司信箱</string>
+  <string name="email_other">傳送電郵</string>
+  <string name="email_custom">傳送電郵至%s的信箱</string>
+  <string name="email">傳送電郵</string>
+  <string name="postal_street">街道</string>
+  <string name="postal_city">城市</string>
+  <string name="postal_region">州/省</string>
+  <string name="postal_postcode">郵遞區號</string>
+  <string name="postal_country">國家/地區</string>
+  <string name="map_home">查看住家地址</string>
+  <string name="map_work">查看公司地址</string>
+  <string name="map_other">查看地址</string>
+  <string name="map_custom">查看%s地址</string>
+  <string name="chat_aim">使用 AIM 進行即時通訊</string>
+  <string name="chat_msn">使用 Windows Live 進行即時通訊</string>
+  <string name="chat_yahoo">使用 Yahoo 進行即時通訊</string>
+  <string name="chat_skype">使用 Skype 進行即時通訊</string>
+  <string name="chat_qq">使用 QQ 進行即時通訊</string>
+  <string name="chat_gtalk">使用 Google Talk 進行即時通訊</string>
+  <string name="chat_icq">使用 ICQ 進行即時通訊</string>
+  <string name="chat_jabber">使用 Jabber 進行即時通訊</string>
+  <string name="chat">即時通訊</string>
+  <string name="list_filter_all_accounts">所有聯絡人</string>
+  <string name="listAllContactsInAccount">%s 中的聯絡人</string>
+  <string name="listCustomView">聯絡人自訂檢視</string>
+  <string name="listSingleContact">單一聯絡人</string>
+  <string name="display_options_sort_list_by">排序方式</string>
+  <string name="display_options_sort_by_given_name">名字</string>
+  <string name="display_options_sort_by_family_name">姓氏</string>
+  <string name="display_options_view_names_as">姓名格式</string>
+  <string name="display_options_view_given_name_first">名字在前</string>
+  <string name="display_options_view_family_name_first">姓氏在前</string>
+  <string name="menu_clear_frequents">清除常用聯絡人</string>
+  <string name="action_menu_back_from_search">停止搜尋</string>
+  <string name="description_clear_search">清除搜尋</string>
+  <string name="select_account_dialog_title">帳戶</string>
+  <string name="set_default_account">永遠使用這張 SIM 卡通話</string>
+  <string name="select_phone_account_for_calls">選擇此通話要使用的 SIM 卡</string>
+  <string name="select_phone_account_for_calls_remember">記住這個選擇</string>
+  <string name="call_with_a_note">撥號時傳送筆記</string>
+  <string name="call_subject_hint">撥號時可以書寫和傳送筆記…</string>
+  <string name="send_and_call_button">傳送和撥號</string>
+  <string name="call_subject_limit">%1$s / %2$s</string>
+  <string name="old_call_subject_type_and_number">%1$s %2$s</string>
+  <string name="tab_title">「%1$s」標籤。</string>
+  <plurals name="tab_title_with_unread_items">
+    <item quantity="one">「%1$s」標籤 (%2$d 個未讀取項目)。</item>
+    <item quantity="other">「%1$s」標籤 (%2$d 個未讀取項目)。</item>
+  </plurals>
+  <string name="description_search_video_call">視像通話</string>
+  <string name="description_search_call_and_share">分享並通話</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-zh-rTW/donottranslate_config.xml b/java/com/android/contacts/common/res/values-zh-rTW/donottranslate_config.xml
deleted file mode 100644
index 0802399..0000000
--- a/java/com/android/contacts/common/res/values-zh-rTW/donottranslate_config.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  <!-- If true, an option is shown in Display Options UI to choose a sort order -->
-  <bool name="config_sort_order_user_changeable">false</bool>
-
-  <!-- If true, the default sort order is primary (i.e. by given name) -->
-  <bool name="config_default_sort_order_primary">true</bool>
-
-  <!-- If true, an option is shown in Display Options UI to choose a name display order -->
-  <bool name="config_display_order_user_changeable">false</bool>
-
-  <!-- If true, the default sort order is primary (i.e. by given name) -->
-  <bool name="config_default_display_order_primary">true</bool>
-
-  <!-- If true, the order of name fields in the editor is primary (i.e. given name first) -->
-  <bool name="config_editor_field_order_primary">false</bool>
-</resources>
\ No newline at end of file
diff --git a/java/com/android/contacts/common/res/values-zh-rTW/strings.xml b/java/com/android/contacts/common/res/values-zh-rTW/strings.xml
index fca680b..3f7dfc0 100644
--- a/java/com/android/contacts/common/res/values-zh-rTW/strings.xml
+++ b/java/com/android/contacts/common/res/values-zh-rTW/strings.xml
@@ -1,162 +1,145 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="toast_text_copied" msgid="8979281391599667362">"文字已複製"</string>
-    <string name="call_custom" msgid="3041673234638990874">"撥打<xliff:g id="CUSTOM">%s</xliff:g>電話號碼"</string>
-    <string name="call_home" msgid="125893483593803791">"撥打住家電話號碼"</string>
-    <string name="call_mobile" msgid="967589404494150813">"撥打手機號碼"</string>
-    <string name="call_work" msgid="6040550697395300892">"撥打公司電話號碼"</string>
-    <string name="call_fax_work" msgid="5260192771364592922">"撥打公司傳真號碼"</string>
-    <string name="call_fax_home" msgid="5174311195081144124">"撥打住家傳真號碼"</string>
-    <string name="call_pager" msgid="6814149227741274161">"撥打呼叫器號碼"</string>
-    <string name="call_other" msgid="5536385588712587235">"撥號"</string>
-    <string name="call_callback" msgid="6314019862718112786">"撥打回撥號碼"</string>
-    <string name="call_car" msgid="3197417098027764954">"撥打車用電話號碼"</string>
-    <string name="call_company_main" msgid="2557663310028446397">"撥打公司代表號"</string>
-    <string name="call_isdn" msgid="4691270442763649522">"撥打 ISDN 電話號碼"</string>
-    <string name="call_main" msgid="3293707608770407814">"撥打代表號"</string>
-    <string name="call_other_fax" msgid="4724521984879021465">"撥打傳真號碼"</string>
-    <string name="call_radio" msgid="8942441419845057942">"撥打無線電號碼"</string>
-    <string name="call_telex" msgid="2031514461660668351">"撥打電報電話號碼"</string>
-    <string name="call_tty_tdd" msgid="7807210224965727701">"撥打 TTY/TDD 電話號碼"</string>
-    <string name="call_work_mobile" msgid="2716342732938578495">"撥打公司手機號碼"</string>
-    <string name="call_work_pager" msgid="3791778749827366574">"撥打公司呼叫器號碼"</string>
-    <string name="call_assistant" msgid="4177478845473789294">"撥打<xliff:g id="ASSISTANT">%s</xliff:g>電話號碼"</string>
-    <string name="call_mms" msgid="4958811711741872901">"撥打 MMS 電話號碼"</string>
-    <string name="sms_custom" msgid="8785368968605026317">"傳送簡訊至<xliff:g id="CUSTOM">%s</xliff:g>電話"</string>
-    <string name="sms_home" msgid="3527719551060295243">"傳送簡訊至住家電話"</string>
-    <string name="sms_mobile" msgid="8883045857887736518">"傳送簡訊至手機"</string>
-    <string name="sms_work" msgid="4158595439553450966">"傳送簡訊至公司電話"</string>
-    <string name="sms_fax_work" msgid="5483726627718055248">"傳送簡訊至公司傳真"</string>
-    <string name="sms_fax_home" msgid="9219265155770746077">"傳送簡訊至住家傳真"</string>
-    <string name="sms_pager" msgid="4901085068525193933">"傳送簡訊至呼叫器"</string>
-    <string name="sms_other" msgid="1742702947993285933">"傳送簡訊"</string>
-    <string name="sms_callback" msgid="5833483630377538308">"傳送簡訊至回撥號碼"</string>
-    <string name="sms_car" msgid="4314577266154395174">"傳送簡訊至車用電話"</string>
-    <string name="sms_company_main" msgid="2308160928487360705">"傳送簡訊至公司代表號"</string>
-    <string name="sms_isdn" msgid="6394300346179302542">"傳送簡訊至 ISDN 電話"</string>
-    <string name="sms_main" msgid="8908087742014140774">"傳送簡訊至代表號"</string>
-    <string name="sms_other_fax" msgid="8768455473295405427">"傳送簡訊至傳真"</string>
-    <string name="sms_radio" msgid="855555176531704682">"傳送簡訊至無線電"</string>
-    <string name="sms_telex" msgid="6269029276223252719">"傳送簡訊至電報電話"</string>
-    <string name="sms_tty_tdd" msgid="6229057354509192444">"傳送簡訊至 TTY/TDD 電話"</string>
-    <string name="sms_work_mobile" msgid="2155975469329969840">"傳送簡訊至公司手機"</string>
-    <string name="sms_work_pager" msgid="8500140274906830742">"傳送簡訊至公司呼叫器"</string>
-    <string name="sms_assistant" msgid="8513548482745330818">"傳送簡訊至<xliff:g id="ASSISTANT">%s</xliff:g>電話"</string>
-    <string name="sms_mms" msgid="5187888900503248542">"傳送簡訊至 MMS 電話"</string>
-    <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"清除常用聯絡人？"</string>
-    <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"您即將清除「聯絡人」應用程式和「電話」應用程式中的常用聯絡人清單，並設定讓電子郵件應用程式重新熟悉您的寄件偏好設定。"</string>
-    <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"正在清除常用聯絡人…"</string>
-    <string name="status_available" msgid="2648156525685472626">"線上"</string>
-    <string name="status_away" msgid="2298688367552893953">"離開"</string>
-    <string name="status_busy" msgid="5990832098713248503">"忙碌"</string>
-    <string name="contactsList" msgid="8806067891419291513">"聯絡人"</string>
-    <string name="contact_suggestions" msgid="3324166754807120006">"常用聯絡人建議"</string>
-    <string name="local_invisible_directory" msgid="4723238462733650090">"其他"</string>
-    <string name="directory_search_label" msgid="4621215895484025229">"目錄"</string>
-    <string name="directory_search_label_work" msgid="7679326282707414897">"Work 聯絡人目錄"</string>
-    <string name="local_search_label" msgid="907622822323119235">"所有聯絡人"</string>
-    <string name="local_suggestions_search_label" msgid="1178575146224386118">"建議"</string>
-    <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"我"</string>
-    <string name="missing_name" msgid="978606963362745020">"(無姓名)"</string>
-    <string name="description_view_contact_detail" msgid="2428742401208561136">"查看聯絡人"</string>
-    <string name="list_filter_phones" msgid="8763316061763437182">"所有包含電話號碼的聯絡人資訊"</string>
-    <string name="list_filter_phones_work" msgid="7083575404573422965">"Work 設定檔聯絡人"</string>
-    <string name="view_updates_from_group" msgid="9011641093168385729">"查看最新動態"</string>
-    <string name="account_phone" msgid="7067809073194061035">"只儲存在裝置上，不會同步處理"</string>
-    <string name="nameLabelsGroup" msgid="7730465833159557471">"姓名"</string>
-    <string name="nicknameLabelsGroup" msgid="6310556912361840029">"暱稱"</string>
-    <string name="full_name" msgid="648186563998465740">"名稱"</string>
-    <string name="name_given" msgid="5096576006314820536">"名字"</string>
-    <string name="name_family" msgid="6646235805198547467">"姓氏"</string>
-    <string name="name_prefix" msgid="9215326539658838">"姓名前稱謂"</string>
-    <string name="name_middle" msgid="703755205331582769">"中間名"</string>
-    <string name="name_suffix" msgid="5777083390282548702">"姓名後稱謂"</string>
-    <string name="name_phonetic" msgid="1650870996361663089">"姓名拼音"</string>
-    <string name="name_phonetic_given" msgid="618812334274603170">"名字拼音"</string>
-    <string name="name_phonetic_middle" msgid="4826820763384625538">"中間名拼音"</string>
-    <string name="name_phonetic_family" msgid="379905191212930771">"姓氏拼音"</string>
-    <string name="phoneLabelsGroup" msgid="169661929021355548">"電話"</string>
-    <string name="emailLabelsGroup" msgid="2249752810477488833">"電子郵件"</string>
-    <string name="postalLabelsGroup" msgid="6772000590189142253">"地址"</string>
-    <string name="imLabelsGroup" msgid="5718066254237364731">"即時訊息"</string>
-    <string name="organizationLabelsGroup" msgid="1101996309241601435">"機構"</string>
-    <string name="relationLabelsGroup" msgid="53866051664600053">"關係"</string>
-    <string name="eventLabelsGroup" msgid="1236970042646618489">"特別的日子"</string>
-    <string name="sms" msgid="7574344928185328095">"簡訊"</string>
-    <string name="postal_address" msgid="1804707930129674200">"地址"</string>
-    <string name="ghostData_company" msgid="2554310786296833424">"公司"</string>
-    <string name="ghostData_title" msgid="4994968731830184837">"職稱"</string>
-    <string name="label_notes" msgid="2050255313694219786">"附註"</string>
-    <string name="label_sip_address" msgid="8883266182575965926">"SIP"</string>
-    <string name="websiteLabelsGroup" msgid="1630734286462186790">"網站"</string>
-    <string name="groupsLabel" msgid="2694002798416868728">"群組"</string>
-    <string name="email_home" msgid="889830029388962171">"傳送電子郵件至住家電子郵件地址"</string>
-    <string name="email_mobile" msgid="4487686436743741150">"傳送電子郵件至行動裝置"</string>
-    <string name="email_work" msgid="4223487303344613528">"傳送電子郵件至公司電子郵件地址"</string>
-    <string name="email_other" msgid="4246411900126012062">"電子郵件"</string>
-    <string name="email_custom" msgid="7246580894327511013">"傳送電子郵件至「<xliff:g id="CUSTOM">%s</xliff:g>」"</string>
-    <string name="email" msgid="2807318537887091606">"電子郵件"</string>
-    <string name="postal_street" msgid="6918171741240802474">"街"</string>
-    <string name="postal_city" msgid="8674569121430005628">"縣市鄉鎮"</string>
-    <string name="postal_region" msgid="1730369286225469192">"州"</string>
-    <string name="postal_postcode" msgid="4450700741261990439">"郵遞區號"</string>
-    <string name="postal_country" msgid="232670707458768148">"國家/地區"</string>
-    <string name="map_home" msgid="4181131107392126938">"檢視住家地址"</string>
-    <string name="map_work" msgid="5723471185992684400">"檢視公司地址"</string>
-    <string name="map_other" msgid="2253764780863500516">"檢視地址"</string>
-    <string name="map_custom" msgid="5581743097882436157">"檢視<xliff:g id="CUSTOM">%s</xliff:g>地址"</string>
-    <string name="chat_aim" msgid="2954364435497941659">"使用 AIM 進行即時通訊"</string>
-    <string name="chat_msn" msgid="3130135239071228678">"使用 Windows Live 進行即時通訊"</string>
-    <string name="chat_yahoo" msgid="3233552142326865347">"使用 Yahoo 進行即時通訊"</string>
-    <string name="chat_skype" msgid="6486703981390592425">"使用 Skype 進行即時通訊"</string>
-    <string name="chat_qq" msgid="786924280665740019">"使用 QQ 進行即時通訊"</string>
-    <string name="chat_gtalk" msgid="7914674177243078035">"使用 Google Talk 進行即時通訊"</string>
-    <string name="chat_icq" msgid="3292934726414765801">"使用 ICQ 進行即時通訊"</string>
-    <string name="chat_jabber" msgid="6701542313597880204">"使用 Jabber 進行即時通訊"</string>
-    <string name="chat" msgid="1020428260359370236">"即時通訊"</string>
-    <string name="list_filter_all_accounts" msgid="473782314881473992">"所有聯絡人"</string>
-    <string name="listAllContactsInAccount" msgid="3486378621592995630">"<xliff:g id="NAME">%s</xliff:g> 中的聯絡人"</string>
-    <string name="listCustomView" msgid="5306282632413086731">"聯絡人自訂檢視"</string>
-    <string name="listSingleContact" msgid="8620818791932382627">"單一聯絡人"</string>
-    <string name="display_options_sort_list_by" msgid="3541875948367831228">"排序依據"</string>
-    <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"名字"</string>
-    <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"姓氏"</string>
-    <string name="display_options_view_names_as" msgid="4204204205736735618">"姓名格式"</string>
-    <string name="display_options_view_given_name_first" msgid="2308026973021171020">"名字在前"</string>
-    <string name="display_options_view_family_name_first" msgid="987430497292428242">"姓氏在前"</string>
-    <string name="menu_clear_frequents" msgid="5358271535047496120">"清除常用聯絡人"</string>
-    <string name="action_menu_back_from_search" msgid="3550669942742167644">"停止搜尋"</string>
-    <string name="description_clear_search" msgid="2347258825265600782">"清除搜尋"</string>
-    <string name="select_account_dialog_title" msgid="2673504582803359239">"帳戶"</string>
-    <string name="set_default_account" msgid="7966099951006467572">"一律使用這張 SIM 卡通話"</string>
-    <string name="select_phone_account_for_calls" msgid="1784460686103423274">"選擇通話帳戶"</string>
-    <string name="call_with_a_note" msgid="6242261320491851133">"撥號時傳送備註"</string>
-    <string name="call_subject_hint" msgid="7233138753650420800">"輸入可在撥號時傳送的備註..."</string>
-    <string name="send_and_call_button" msgid="4735168294120154013">"傳送並撥打"</string>
-    <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g>/<xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="tab_title" msgid="3387876802026074288">"<xliff:g id="TITLE">%1$s</xliff:g>分頁。"</string>
-    <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
-      <item quantity="other"> <xliff:g id="TITLE_2">%1$s</xliff:g>分頁。<xliff:g id="COUNT_3">%2$d</xliff:g> 個未讀項目。</item>
-      <item quantity="one"> <xliff:g id="TITLE_0">%1$s</xliff:g>分頁。<xliff:g id="COUNT_1">%2$d</xliff:g> 個未讀項目。</item>
-    </plurals>
-    <string name="description_search_video_call" msgid="4337369876888024909">"視訊通話"</string>
-    <string name="description_search_call_and_share" msgid="4912772842755050467">"分享及撥號"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_custom">撥打%s電話號碼</string>
+  <string name="call_home">撥打住家電話號碼</string>
+  <string name="call_mobile">撥打手機號碼</string>
+  <string name="call_work">撥打公司電話號碼</string>
+  <string name="call_fax_work">撥打公司傳真號碼</string>
+  <string name="call_fax_home">撥打住家傳真號碼</string>
+  <string name="call_pager">撥打呼叫器號碼</string>
+  <string name="call_other">撥號</string>
+  <string name="call_callback">撥打回撥號碼</string>
+  <string name="call_car">撥打車用電話號碼</string>
+  <string name="call_company_main">撥打公司代表號</string>
+  <string name="call_isdn">撥打 ISDN 電話號碼</string>
+  <string name="call_main">撥打代表號</string>
+  <string name="call_other_fax">撥打傳真號碼</string>
+  <string name="call_radio">撥打無線電號碼</string>
+  <string name="call_telex">撥打電報電話號碼</string>
+  <string name="call_tty_tdd">撥打 TTY/TDD 電話號碼</string>
+  <string name="call_work_mobile">撥打公司手機號碼</string>
+  <string name="call_work_pager">撥打公司呼叫器號碼</string>
+  <string name="call_assistant">撥打%s電話號碼</string>
+  <string name="call_mms">撥打 MMS 電話號碼</string>
+  <string name="sms_custom">傳送簡訊至%s電話</string>
+  <string name="sms_home">傳送簡訊至住家電話</string>
+  <string name="sms_mobile">傳送簡訊至手機</string>
+  <string name="sms_work">傳送簡訊至公司電話</string>
+  <string name="sms_fax_work">傳送簡訊至公司傳真</string>
+  <string name="sms_fax_home">傳送簡訊至住家傳真</string>
+  <string name="sms_pager">傳送簡訊至呼叫器</string>
+  <string name="sms_other">傳送簡訊</string>
+  <string name="sms_callback">傳送簡訊至回撥號碼</string>
+  <string name="sms_car">傳送簡訊至車用電話</string>
+  <string name="sms_company_main">傳送簡訊至公司代表號</string>
+  <string name="sms_isdn">傳送簡訊至 ISDN 電話</string>
+  <string name="sms_main">傳送簡訊至代表號</string>
+  <string name="sms_other_fax">傳送簡訊至傳真</string>
+  <string name="sms_radio">傳送簡訊至無線電</string>
+  <string name="sms_telex">傳送簡訊至電報電話</string>
+  <string name="sms_tty_tdd">傳送簡訊至 TTY/TDD 電話</string>
+  <string name="sms_work_mobile">傳送簡訊至公司手機</string>
+  <string name="sms_work_pager">傳送簡訊至公司呼叫器</string>
+  <string name="sms_assistant">傳送簡訊至%s電話</string>
+  <string name="sms_mms">傳送簡訊至 MMS 電話</string>
+  <string name="clearFrequentsConfirmation_title">清除常用聯絡人？</string>
+  <string name="clearFrequentsConfirmation">您即將清除「聯絡人」應用程式和「電話」應用程式中的常用聯絡人清單，並設定讓電子郵件應用程式重新熟悉您的寄件偏好設定。</string>
+  <string name="clearFrequentsProgress_title">正在清除常用聯絡人…</string>
+  <string name="status_available">線上</string>
+  <string name="status_away">離開</string>
+  <string name="status_busy">忙碌</string>
+  <string name="contactsList">聯絡人</string>
+  <string name="contact_suggestions">常用聯絡人建議</string>
+  <string name="local_invisible_directory">其他</string>
+  <string name="directory_search_label">目錄</string>
+  <string name="directory_search_label_work">工作聯絡人目錄</string>
+  <string name="local_search_label">所有聯絡人</string>
+  <string name="local_suggestions_search_label">建議</string>
+  <string msgid="9154761216179882405" name="user_profile_contacts_list_header">我</string>
+  <string name="missing_name">(無姓名)</string>
+  <string msgid="2795575601596468581" name="description_view_contact_detail">查看聯絡人</string>
+  <string name="list_filter_phones">所有包含電話號碼的聯絡人資訊</string>
+  <string name="list_filter_phones_work">工作資料夾聯絡人</string>
+  <string name="view_updates_from_group">查看最新動態</string>
+  <string name="account_phone">只儲存在裝置上，不會同步處理</string>
+  <string name="nameLabelsGroup">姓名</string>
+  <string name="nicknameLabelsGroup">暱稱</string>
+  <string name="full_name">名稱</string>
+  <string name="name_given">名字</string>
+  <string name="name_family">姓氏</string>
+  <string name="name_prefix">姓名前稱謂</string>
+  <string name="name_middle">中間名</string>
+  <string name="name_suffix">姓名後稱謂</string>
+  <string name="name_phonetic">姓名拼音</string>
+  <string name="name_phonetic_given">名字拼音</string>
+  <string name="name_phonetic_middle">中間名拼音</string>
+  <string name="name_phonetic_family">姓氏拼音</string>
+  <string name="phoneLabelsGroup">電話</string>
+  <string name="emailLabelsGroup">電子郵件</string>
+  <string name="postalLabelsGroup">地址</string>
+  <string name="imLabelsGroup">即時訊息</string>
+  <string name="organizationLabelsGroup">機構</string>
+  <string name="relationLabelsGroup">關係</string>
+  <string name="eventLabelsGroup">特別的日子</string>
+  <string name="sms">簡訊</string>
+  <string name="postal_address">地址</string>
+  <string name="ghostData_company">公司</string>
+  <string name="ghostData_title">職稱</string>
+  <string name="label_notes">附註</string>
+  <string name="label_sip_address">SIP</string>
+  <string name="websiteLabelsGroup">網站</string>
+  <string name="groupsLabel">群組</string>
+  <string name="email_home">傳送電子郵件至住家電子郵件地址</string>
+  <string name="email_mobile">傳送電子郵件至行動裝置</string>
+  <string name="email_work">傳送電子郵件至公司電子郵件地址</string>
+  <string name="email_other">電子郵件</string>
+  <string name="email_custom">傳送電子郵件至「%s」</string>
+  <string name="email">電子郵件</string>
+  <string name="postal_street">街</string>
+  <string name="postal_city">縣市鄉鎮</string>
+  <string name="postal_region">州</string>
+  <string name="postal_postcode">郵遞區號</string>
+  <string name="postal_country">國家/地區</string>
+  <string name="map_home">檢視住家地址</string>
+  <string name="map_work">檢視公司地址</string>
+  <string name="map_other">檢視地址</string>
+  <string name="map_custom">檢視%s地址</string>
+  <string name="chat_aim">使用 AIM 進行即時通訊</string>
+  <string name="chat_msn">使用 Windows Live 進行即時通訊</string>
+  <string name="chat_yahoo">使用 Yahoo 進行即時通訊</string>
+  <string name="chat_skype">使用 Skype 進行即時通訊</string>
+  <string name="chat_qq">使用 QQ 進行即時通訊</string>
+  <string name="chat_gtalk">使用 Google Talk 進行即時通訊</string>
+  <string name="chat_icq">使用 ICQ 進行即時通訊</string>
+  <string name="chat_jabber">使用 Jabber 進行即時通訊</string>
+  <string name="chat">即時通訊</string>
+  <string name="list_filter_all_accounts">所有聯絡人</string>
+  <string name="listAllContactsInAccount">%s 中的聯絡人</string>
+  <string name="listCustomView">聯絡人自訂檢視</string>
+  <string name="listSingleContact">單一聯絡人</string>
+  <string name="display_options_sort_list_by">排序依據</string>
+  <string name="display_options_sort_by_given_name">名字</string>
+  <string name="display_options_sort_by_family_name">姓氏</string>
+  <string name="display_options_view_names_as">姓名格式</string>
+  <string name="display_options_view_given_name_first">名字在前</string>
+  <string name="display_options_view_family_name_first">姓氏在前</string>
+  <string name="menu_clear_frequents">清除常用聯絡人</string>
+  <string name="action_menu_back_from_search">停止搜尋</string>
+  <string name="description_clear_search">清除搜尋</string>
+  <string name="select_account_dialog_title">帳戶</string>
+  <string name="set_default_account">一律使用這張 SIM 卡通話</string>
+  <string name="select_phone_account_for_calls">選擇本次通話要使用的 SIM 卡</string>
+  <string name="select_phone_account_for_calls_remember">記住這個選擇</string>
+  <string name="call_with_a_note">撥號時傳送備註</string>
+  <string name="call_subject_hint">輸入可在撥號時傳送的備註...</string>
+  <string name="send_and_call_button">傳送並撥打</string>
+  <string name="call_subject_limit">%1$s/%2$s</string>
+  <string name="old_call_subject_type_and_number">%1$s %2$s</string>
+  <string name="tab_title">%1$s分頁。</string>
+  <plurals name="tab_title_with_unread_items">
+    <item quantity="one"> %1$s分頁。%2$d 個未讀項目。</item>
+    <item quantity="other"> %1$s分頁。%2$d 個未讀項目。</item>
+  </plurals>
+  <string name="description_search_video_call">視訊通話</string>
+  <string name="description_search_call_and_share">分享及撥號</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values-zu/strings.xml b/java/com/android/contacts/common/res/values-zu/strings.xml
index e3cbc96..dcda725 100644
--- a/java/com/android/contacts/common/res/values-zu/strings.xml
+++ b/java/com/android/contacts/common/res/values-zu/strings.xml
@@ -1,162 +1,145 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="toast_text_copied" msgid="8979281391599667362">"Umbhalo okopishiwe"</string>
-    <string name="call_custom" msgid="3041673234638990874">"Fonela ku-<xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="call_home" msgid="125893483593803791">"Fonela ekhaya"</string>
-    <string name="call_mobile" msgid="967589404494150813">"Fonela iselula"</string>
-    <string name="call_work" msgid="6040550697395300892">"Fonela emsebenzini"</string>
-    <string name="call_fax_work" msgid="5260192771364592922">"Fonela ifeksi yasemsebenzini"</string>
-    <string name="call_fax_home" msgid="5174311195081144124">"Fonela ifeksi yasekhaya"</string>
-    <string name="call_pager" msgid="6814149227741274161">"Fonela isicingo"</string>
-    <string name="call_other" msgid="5536385588712587235">"Fonela"</string>
-    <string name="call_callback" msgid="6314019862718112786">"Fonela ukufonela emuva"</string>
-    <string name="call_car" msgid="3197417098027764954">"Fonela imoto"</string>
-    <string name="call_company_main" msgid="2557663310028446397">"Fonela isisekelo senkampani"</string>
-    <string name="call_isdn" msgid="4691270442763649522">"Fonela i-ISDN"</string>
-    <string name="call_main" msgid="3293707608770407814">"Fonela isisekelo"</string>
-    <string name="call_other_fax" msgid="4724521984879021465">"Fonela ifeksi"</string>
-    <string name="call_radio" msgid="8942441419845057942">"Fonela umsakazo"</string>
-    <string name="call_telex" msgid="2031514461660668351">"Fonela i-telex"</string>
-    <string name="call_tty_tdd" msgid="7807210224965727701">"Fonela i-TTY/TDD"</string>
-    <string name="call_work_mobile" msgid="2716342732938578495">"Fonela iselula yasemsebenzini"</string>
-    <string name="call_work_pager" msgid="3791778749827366574">"Fonela isicingo sasemsebenzini"</string>
-    <string name="call_assistant" msgid="4177478845473789294">"Fonela <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
-    <string name="call_mms" msgid="4958811711741872901">"Fonela i-MMS"</string>
-    <string name="sms_custom" msgid="8785368968605026317">"Bhalela ku-<xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="sms_home" msgid="3527719551060295243">"Bhalela ekhaya"</string>
-    <string name="sms_mobile" msgid="8883045857887736518">"Bhalela iselula"</string>
-    <string name="sms_work" msgid="4158595439553450966">"Bhalela emsebenzini"</string>
-    <string name="sms_fax_work" msgid="5483726627718055248">"Bhalela ifeksi yasemsebenzini"</string>
-    <string name="sms_fax_home" msgid="9219265155770746077">"Bhalela ifeksi yasekhaya"</string>
-    <string name="sms_pager" msgid="4901085068525193933">"Bhalela isicingo"</string>
-    <string name="sms_other" msgid="1742702947993285933">"Umbhalo"</string>
-    <string name="sms_callback" msgid="5833483630377538308">"Bhalela ukufonela emuva"</string>
-    <string name="sms_car" msgid="4314577266154395174">"Bhalela imoto"</string>
-    <string name="sms_company_main" msgid="2308160928487360705">"Bhalela isisekelo senkampani"</string>
-    <string name="sms_isdn" msgid="6394300346179302542">"Bhalela i-ISDN"</string>
-    <string name="sms_main" msgid="8908087742014140774">"Bhalela isisekelo"</string>
-    <string name="sms_other_fax" msgid="8768455473295405427">"Bhalela ifeksi"</string>
-    <string name="sms_radio" msgid="855555176531704682">"Bhalela umsakazo"</string>
-    <string name="sms_telex" msgid="6269029276223252719">"Bhalela i-telex"</string>
-    <string name="sms_tty_tdd" msgid="6229057354509192444">"Bhalela i-TTY/TDD"</string>
-    <string name="sms_work_mobile" msgid="2155975469329969840">"Bhalela iselula yasemsebenzini"</string>
-    <string name="sms_work_pager" msgid="8500140274906830742">"Bhalela isicingo sasemsebenzini"</string>
-    <string name="sms_assistant" msgid="8513548482745330818">"Bhalela ku-<xliff:g id="ASSISTANT">%s</xliff:g>"</string>
-    <string name="sms_mms" msgid="5187888900503248542">"Bhala i-MMS"</string>
-    <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"Sula oxhumana nabo njalo?"</string>
-    <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"Uzosula uhlu loxhumana nabo kakhulu kuzinhelo zokusebenza zokuxhumana noma zefoni, futhi uphoqelele izinhlelo zokusebenza ze-imeyili ukufunda izintandokazi zakho zekheli kusuka ekuqaleni."</string>
-    <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"Isula oxhumana nabo njalo…"</string>
-    <string name="status_available" msgid="2648156525685472626">"Ngiyatholakala"</string>
-    <string name="status_away" msgid="2298688367552893953">"Ngiphumile"</string>
-    <string name="status_busy" msgid="5990832098713248503">"Ngimatasa"</string>
-    <string name="contactsList" msgid="8806067891419291513">"Othi tana nabo"</string>
-    <string name="contact_suggestions" msgid="3324166754807120006">"Okuphezulu okuphakanyisiwe"</string>
-    <string name="local_invisible_directory" msgid="4723238462733650090">"Okunye"</string>
-    <string name="directory_search_label" msgid="4621215895484025229">"Uhla lwemibhalo"</string>
-    <string name="directory_search_label_work" msgid="7679326282707414897">"Uhla lwemibhalo lomsebenzi"</string>
-    <string name="local_search_label" msgid="907622822323119235">"Bonke othintana nabo"</string>
-    <string name="local_suggestions_search_label" msgid="1178575146224386118">"Iziphakamiso"</string>
-    <string name="user_profile_contacts_list_header" msgid="9180620153828279580">"Mina"</string>
-    <string name="missing_name" msgid="978606963362745020">"(Alikho igama)"</string>
-    <string name="description_view_contact_detail" msgid="2428742401208561136">"Buka oxhumana naye"</string>
-    <string name="list_filter_phones" msgid="8763316061763437182">"Bonke othintana nabo kanye nezinombolo zabo zefoni"</string>
-    <string name="list_filter_phones_work" msgid="7083575404573422965">"Oxhumana nabo bephrofayela yomsebenzi"</string>
-    <string name="view_updates_from_group" msgid="9011641093168385729">"Buka okubuyekeziwe"</string>
-    <string name="account_phone" msgid="7067809073194061035">"Idivayisi kuphela, akuvunyelanisiwe"</string>
-    <string name="nameLabelsGroup" msgid="7730465833159557471">"Igama"</string>
-    <string name="nicknameLabelsGroup" msgid="6310556912361840029">"Isidlaliso"</string>
-    <string name="full_name" msgid="648186563998465740">"Igama"</string>
-    <string name="name_given" msgid="5096576006314820536">"Igama lokuqala"</string>
-    <string name="name_family" msgid="6646235805198547467">"Isibongo"</string>
-    <string name="name_prefix" msgid="9215326539658838">"Isiqalo segama"</string>
-    <string name="name_middle" msgid="703755205331582769">"Igama eliphakathi"</string>
-    <string name="name_suffix" msgid="5777083390282548702">"Isijobelelo segama"</string>
-    <string name="name_phonetic" msgid="1650870996361663089">"Igama lefonethikhi"</string>
-    <string name="name_phonetic_given" msgid="618812334274603170">"Igama lokuqala lefonethiki"</string>
-    <string name="name_phonetic_middle" msgid="4826820763384625538">"Igama lefonethikhi eliphakakathi"</string>
-    <string name="name_phonetic_family" msgid="379905191212930771">"Isibongo sefonethiki"</string>
-    <string name="phoneLabelsGroup" msgid="169661929021355548">"Ifoni"</string>
-    <string name="emailLabelsGroup" msgid="2249752810477488833">"I-imeyili"</string>
-    <string name="postalLabelsGroup" msgid="6772000590189142253">"Ikheli"</string>
-    <string name="imLabelsGroup" msgid="5718066254237364731">"I-IM"</string>
-    <string name="organizationLabelsGroup" msgid="1101996309241601435">"Inhlangano"</string>
-    <string name="relationLabelsGroup" msgid="53866051664600053">"Ubudlelwane"</string>
-    <string name="eventLabelsGroup" msgid="1236970042646618489">"Idethi ekhethekile"</string>
-    <string name="sms" msgid="7574344928185328095">"Umlayezo wombhalo"</string>
-    <string name="postal_address" msgid="1804707930129674200">"Ikheli"</string>
-    <string name="ghostData_company" msgid="2554310786296833424">"Inkampani"</string>
-    <string name="ghostData_title" msgid="4994968731830184837">"Uhlobo lomsebenzi"</string>
-    <string name="label_notes" msgid="2050255313694219786">"Amanothi"</string>
-    <string name="label_sip_address" msgid="8883266182575965926">"SIP"</string>
-    <string name="websiteLabelsGroup" msgid="1630734286462186790">"Iwebhusayithi"</string>
-    <string name="groupsLabel" msgid="2694002798416868728">"Amaqembu"</string>
-    <string name="email_home" msgid="889830029388962171">"Thumela i-imeyili ekhaya"</string>
-    <string name="email_mobile" msgid="4487686436743741150">"Thumela i-imeyili kuselula"</string>
-    <string name="email_work" msgid="4223487303344613528">"Thumela i-imeyili emsebenzini"</string>
-    <string name="email_other" msgid="4246411900126012062">"I-imeyili"</string>
-    <string name="email_custom" msgid="7246580894327511013">"I-imeyili <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="email" msgid="2807318537887091606">"I-imeyili"</string>
-    <string name="postal_street" msgid="6918171741240802474">"Umgwaqo"</string>
-    <string name="postal_city" msgid="8674569121430005628">"Idolobha"</string>
-    <string name="postal_region" msgid="1730369286225469192">"Isifunda"</string>
-    <string name="postal_postcode" msgid="4450700741261990439">"Ikhodi ye-ZIP"</string>
-    <string name="postal_country" msgid="232670707458768148">"Izwe"</string>
-    <string name="map_home" msgid="4181131107392126938">"Buka ikheli lasekhaya"</string>
-    <string name="map_work" msgid="5723471185992684400">"Buka ikheli lasemsebenzini"</string>
-    <string name="map_other" msgid="2253764780863500516">"Buka ikheli"</string>
-    <string name="map_custom" msgid="5581743097882436157">"Buka ikheli le-<xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="chat_aim" msgid="2954364435497941659">"Xoxa usebenzisa i-AIM"</string>
-    <string name="chat_msn" msgid="3130135239071228678">"Xoxa usebenzisa i-Windows Live"</string>
-    <string name="chat_yahoo" msgid="3233552142326865347">"Xoxa usebenzisa i-Yahoo"</string>
-    <string name="chat_skype" msgid="6486703981390592425">"Xoxa usebenzisa i-Skype"</string>
-    <string name="chat_qq" msgid="786924280665740019">"Xoxa usebenzisa i-QQ"</string>
-    <string name="chat_gtalk" msgid="7914674177243078035">"Xoxa usebenzisa i-Google Talk"</string>
-    <string name="chat_icq" msgid="3292934726414765801">"Xoxa usebenzisa i-ICQ"</string>
-    <string name="chat_jabber" msgid="6701542313597880204">"Xoxa usebenzisa i-Jabber"</string>
-    <string name="chat" msgid="1020428260359370236">"Xoxa"</string>
-    <string name="list_filter_all_accounts" msgid="473782314881473992">"Bonke oxhumana nabo"</string>
-    <string name="listAllContactsInAccount" msgid="3486378621592995630">"Oxhumana nabo ku-<xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="listCustomView" msgid="5306282632413086731">"Oxhumana nabo ekubukweni okwenziwe ngendlela oyifisayo"</string>
-    <string name="listSingleContact" msgid="8620818791932382627">"Oyedwa oxhumana naye"</string>
-    <string name="display_options_sort_list_by" msgid="3541875948367831228">"Hlunga nge-"</string>
-    <string name="display_options_sort_by_given_name" msgid="4316351826810346915">"Igama lokuqala"</string>
-    <string name="display_options_sort_by_family_name" msgid="5238820876940079000">"Isibongo"</string>
-    <string name="display_options_view_names_as" msgid="4204204205736735618">"Ifomethi yegama"</string>
-    <string name="display_options_view_given_name_first" msgid="2308026973021171020">"Igama lokuqala kuqala"</string>
-    <string name="display_options_view_family_name_first" msgid="987430497292428242">"Isibongo kuqala"</string>
-    <string name="menu_clear_frequents" msgid="5358271535047496120">"Sula oxhumana nabo njalo"</string>
-    <string name="action_menu_back_from_search" msgid="3550669942742167644">"misa ukusesha"</string>
-    <string name="description_clear_search" msgid="2347258825265600782">"Sula usesho"</string>
-    <string name="select_account_dialog_title" msgid="2673504582803359239">"I-Akhawunti"</string>
-    <string name="set_default_account" msgid="7966099951006467572">"Njalo sebenzisa lokhu kumakholi"</string>
-    <string name="select_phone_account_for_calls" msgid="1784460686103423274">"Shaya nge"</string>
-    <string name="call_with_a_note" msgid="6242261320491851133">"Shaya ngenothi"</string>
-    <string name="call_subject_hint" msgid="7233138753650420800">"Thayipha inothi ukuthumela nekholi ..."</string>
-    <string name="send_and_call_button" msgid="4735168294120154013">"THUMELA FUTHI YENZA IKHOLI"</string>
-    <string name="call_subject_limit" msgid="8273208736191593939">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
-    <string name="call_subject_type_and_number" msgid="6338030032554019678">"<xliff:g id="TYPE">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="tab_title" msgid="3387876802026074288">"<xliff:g id="TITLE">%1$s</xliff:g> ithebhu."</string>
-    <plurals name="tab_title_with_unread_items" formatted="false" msgid="8548492980702182785">
-      <item quantity="one"><xliff:g id="TITLE_2">%1$s</xliff:g> ithebhu. <xliff:g id="COUNT_3">%2$d</xliff:g> izinto ezingafundiwe. </item>
-      <item quantity="other"><xliff:g id="TITLE_2">%1$s</xliff:g> ithebhu. <xliff:g id="COUNT_3">%2$d</xliff:g> izinto ezingafundiwe. </item>
-    </plurals>
-    <string name="description_search_video_call" msgid="4337369876888024909">"Ikholi yevidiyo"</string>
-    <string name="description_search_call_and_share" msgid="4912772842755050467">"Yabelana uphinde ushaye"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_custom">Fonela ku-%s</string>
+  <string name="call_home">Fonela ekhaya</string>
+  <string name="call_mobile">Fonela iselula</string>
+  <string name="call_work">Fonela emsebenzini</string>
+  <string name="call_fax_work">Fonela ifeksi yasemsebenzini</string>
+  <string name="call_fax_home">Fonela ifeksi yasekhaya</string>
+  <string name="call_pager">Fonela isicingo</string>
+  <string name="call_other">Fonela</string>
+  <string name="call_callback">Fonela ukufonela emuva</string>
+  <string name="call_car">Fonela imoto</string>
+  <string name="call_company_main">Fonela isisekelo senkampani</string>
+  <string name="call_isdn">Fonela i-ISDN</string>
+  <string name="call_main">Fonela isisekelo</string>
+  <string name="call_other_fax">Fonela ifeksi</string>
+  <string name="call_radio">Fonela umsakazo</string>
+  <string name="call_telex">Fonela i-telex</string>
+  <string name="call_tty_tdd">Fonela i-TTY/TDD</string>
+  <string name="call_work_mobile">Fonela iselula yasemsebenzini</string>
+  <string name="call_work_pager">Fonela isicingo sasemsebenzini</string>
+  <string name="call_assistant">Fonela %s</string>
+  <string name="call_mms">Fonela i-MMS</string>
+  <string name="sms_custom">Bhalela ku-%s</string>
+  <string name="sms_home">Bhalela ekhaya</string>
+  <string name="sms_mobile">Bhalela iselula</string>
+  <string name="sms_work">Bhalela emsebenzini</string>
+  <string name="sms_fax_work">Bhalela ifeksi yasemsebenzini</string>
+  <string name="sms_fax_home">Bhalela ifeksi yasekhaya</string>
+  <string name="sms_pager">Bhalela isicingo</string>
+  <string name="sms_other">Umbhalo</string>
+  <string name="sms_callback">Bhalela ukufonela emuva</string>
+  <string name="sms_car">Bhalela imoto</string>
+  <string name="sms_company_main">Bhalela isisekelo senkampani</string>
+  <string name="sms_isdn">Bhalela i-ISDN</string>
+  <string name="sms_main">Bhalela isisekelo</string>
+  <string name="sms_other_fax">Bhalela ifeksi</string>
+  <string name="sms_radio">Bhalela umsakazo</string>
+  <string name="sms_telex">Bhalela i-telex</string>
+  <string name="sms_tty_tdd">Bhalela i-TTY/TDD</string>
+  <string name="sms_work_mobile">Bhalela iselula yasemsebenzini</string>
+  <string name="sms_work_pager">Bhalela isicingo sasemsebenzini</string>
+  <string name="sms_assistant">Bhalela ku-%s</string>
+  <string name="sms_mms">Bhala i-MMS</string>
+  <string name="clearFrequentsConfirmation_title">Sula oxhumana nabo njalo?</string>
+  <string name="clearFrequentsConfirmation">Uzosula uhlu loxhumana nabo kakhulu kuzinhelo zokusebenza zokuxhumana noma zefoni, futhi uphoqelele izinhlelo zokusebenza ze-imeyili ukufunda izintandokazi zakho zekheli kusuka ekuqaleni.</string>
+  <string name="clearFrequentsProgress_title">Isula oxhumana nabo njalo…</string>
+  <string name="status_available">Ngiyatholakala</string>
+  <string name="status_away">Ngiphumile</string>
+  <string name="status_busy">Ngimatasa</string>
+  <string name="contactsList">Othi tana nabo</string>
+  <string name="contact_suggestions">Okuphezulu okuphakanyisiwe</string>
+  <string name="local_invisible_directory">Okunye</string>
+  <string name="directory_search_label">Uhla lwemibhalo</string>
+  <string name="directory_search_label_work">Uhla lwemibhalo lomsebenzi</string>
+  <string name="local_search_label">Bonke othintana nabo</string>
+  <string name="local_suggestions_search_label">Iziphakamiso</string>
+  <string msgid="9154761216179882405" name="user_profile_contacts_list_header">Mina</string>
+  <string name="missing_name">(Alikho igama)</string>
+  <string msgid="2795575601596468581" name="description_view_contact_detail">Buka oxhumana naye</string>
+  <string name="list_filter_phones">Bonke othintana nabo kanye nezinombolo zabo zefoni</string>
+  <string name="list_filter_phones_work">Oxhumana nabo bephrofayela yomsebenzi</string>
+  <string name="view_updates_from_group">Buka okubuyekeziwe</string>
+  <string name="account_phone">Idivayisi kuphela, akuvunyelanisiwe</string>
+  <string name="nameLabelsGroup">Igama</string>
+  <string name="nicknameLabelsGroup">Isidlaliso</string>
+  <string name="full_name">Igama</string>
+  <string name="name_given">Igama lokuqala</string>
+  <string name="name_family">Isibongo</string>
+  <string name="name_prefix">Isiqalo segama</string>
+  <string name="name_middle">Igama eliphakathi</string>
+  <string name="name_suffix">Isijobelelo segama</string>
+  <string name="name_phonetic">Igama lefonethikhi</string>
+  <string name="name_phonetic_given">Igama lokuqala lefonethiki</string>
+  <string name="name_phonetic_middle">Igama lefonethikhi eliphakakathi</string>
+  <string name="name_phonetic_family">Isibongo sefonethiki</string>
+  <string name="phoneLabelsGroup">Ifoni</string>
+  <string name="emailLabelsGroup">I-imeyili</string>
+  <string name="postalLabelsGroup">Ikheli</string>
+  <string name="imLabelsGroup">I-IM</string>
+  <string name="organizationLabelsGroup">Inhlangano</string>
+  <string name="relationLabelsGroup">Ubudlelwane</string>
+  <string name="eventLabelsGroup">Idethi ekhethekile</string>
+  <string name="sms">Umlayezo wombhalo</string>
+  <string name="postal_address">Ikheli</string>
+  <string name="ghostData_company">Inkampani</string>
+  <string name="ghostData_title">Uhlobo lomsebenzi</string>
+  <string name="label_notes">Amanothi</string>
+  <string name="label_sip_address">SIP</string>
+  <string name="websiteLabelsGroup">Iwebhusayithi</string>
+  <string name="groupsLabel">Amaqembu</string>
+  <string name="email_home">Thumela i-imeyili ekhaya</string>
+  <string name="email_mobile">Thumela i-imeyili kuselula</string>
+  <string name="email_work">Thumela i-imeyili emsebenzini</string>
+  <string name="email_other">I-imeyili</string>
+  <string name="email_custom">I-imeyili %s</string>
+  <string name="email">I-imeyili</string>
+  <string name="postal_street">Umgwaqo</string>
+  <string name="postal_city">Idolobha</string>
+  <string name="postal_region">Isifunda</string>
+  <string name="postal_postcode">Ikhodi ye-ZIP</string>
+  <string name="postal_country">Izwe</string>
+  <string name="map_home">Buka ikheli lasekhaya</string>
+  <string name="map_work">Buka ikheli lasemsebenzini</string>
+  <string name="map_other">Buka ikheli</string>
+  <string name="map_custom">Buka ikheli le-%s</string>
+  <string name="chat_aim">Xoxa usebenzisa i-AIM</string>
+  <string name="chat_msn">Xoxa usebenzisa i-Windows Live</string>
+  <string name="chat_yahoo">Xoxa usebenzisa i-Yahoo</string>
+  <string name="chat_skype">Xoxa usebenzisa i-Skype</string>
+  <string name="chat_qq">Xoxa usebenzisa i-QQ</string>
+  <string name="chat_gtalk">Xoxa usebenzisa i-Google Talk</string>
+  <string name="chat_icq">Xoxa usebenzisa i-ICQ</string>
+  <string name="chat_jabber">Xoxa usebenzisa i-Jabber</string>
+  <string name="chat">Xoxa</string>
+  <string name="list_filter_all_accounts">Bonke oxhumana nabo</string>
+  <string name="listAllContactsInAccount">Oxhumana nabo ku-%s</string>
+  <string name="listCustomView">Oxhumana nabo ekubukweni okwenziwe ngendlela oyifisayo</string>
+  <string name="listSingleContact">Oyedwa oxhumana naye</string>
+  <string name="display_options_sort_list_by">Hlunga nge-</string>
+  <string name="display_options_sort_by_given_name">Igama lokuqala</string>
+  <string name="display_options_sort_by_family_name">Isibongo</string>
+  <string name="display_options_view_names_as">Ifomethi yegama</string>
+  <string name="display_options_view_given_name_first">Igama lokuqala kuqala</string>
+  <string name="display_options_view_family_name_first">Isibongo kuqala</string>
+  <string name="menu_clear_frequents">Sula oxhumana nabo njalo</string>
+  <string name="action_menu_back_from_search">misa ukusesha</string>
+  <string name="description_clear_search">Sula usesho</string>
+  <string name="select_account_dialog_title">I-Akhawunti</string>
+  <string name="set_default_account">Njalo sebenzisa lokhu kumakholi</string>
+  <string name="select_phone_account_for_calls">Khetha i-SIM yale kholi</string>
+  <string name="select_phone_account_for_calls_remember">Khumbula lokhu okukhethiwe</string>
+  <string name="call_with_a_note">Shaya ngenothi</string>
+  <string name="call_subject_hint">Thayipha inothi ukuthumela nekholi ...</string>
+  <string name="send_and_call_button">THUMELA FUTHI YENZA IKHOLI</string>
+  <string name="call_subject_limit">%1$s / %2$s</string>
+  <string name="old_call_subject_type_and_number">%1$s %2$s</string>
+  <string name="tab_title">%1$s ithebhu.</string>
+  <plurals name="tab_title_with_unread_items">
+    <item quantity="one">%1$s ithebhu. %2$d izinto ezingafundiwe. </item>
+    <item quantity="other">%1$s ithebhu. %2$d izinto ezingafundiwe. </item>
+  </plurals>
+  <string name="description_search_video_call">Ikholi yevidiyo</string>
+  <string name="description_search_call_and_share">Yabelana uphinde ushaye</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values/colors.xml b/java/com/android/contacts/common/res/values/colors.xml
deleted file mode 100644
index 3044339..0000000
--- a/java/com/android/contacts/common/res/values/colors.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<!--
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-  -->
-
-<resources>
-  <!-- Color of ripples used for views with dark backgrounds -->
-  <color name="dialer_ripple_material_dark">#a0ffffff</color>
-
-  <!-- Color of ripples used for views with light backgrounds -->
-  <color name="dialer_ripple_material_light">#30000000</color>
-
-  <!-- Divider color for header separator -->
-  <color name="primary_text_color">#363636</color>
-
-  <color name="secondary_text_color">@color/dialer_secondary_text_color</color>
-
-  <!-- Text color for section header. -->
-  <color name="section_header_text_color">#2A56C6</color>
-
-  <!-- Color of the theme of the People app -->
-  <color name="people_app_theme_color">#363636</color>
-
-  <!-- Darker versions of letter_tile_colors, two shades darker. These colors are used
-      for settings secondary activity colors. -->
-  <array name="letter_tile_colors_dark">
-    <item>#C53929</item>
-    <item>#C2185B</item>
-    <item>#7B1FA2</item>
-    <item>#512DA8</item>
-    <item>#303F9F</item>
-    <item>#3367D6</item>
-    <item>#0277BD</item>
-    <item>#006064</item>
-    <item>#00796B</item>
-    <item>#0B8043</item>
-    <item>#33691E</item>
-    <item>#E65100</item>
-    <item>#E64A19</item>
-    <item>#424242</item>
-  </array>
-
-  <color name="contactscommon_actionbar_background_color">@color/dialer_theme_color</color>
-
-  <color name="tab_ripple_color">#ffffff</color>
-  <color name="tab_accent_color">@color/tab_ripple_color</color>
-  <color name="tab_selected_underline_color">#f50057</color>
-  <color name="tab_unread_count_background_color">#1C3AA9</color>
-
-  <!-- Color of the title to the Frequently Contacted section -->
-  <color name="frequently_contacted_title_color">@color/contactscommon_actionbar_background_color
-  </color>
-
-  <!-- Color of action bar text. Ensure this stays in sync with packages/Telephony
-  phone_settings_actionbar_text_color-->
-  <color name="actionbar_text_color">#ffffff</color>
-  <color name="actionbar_unselected_text_color">#a6ffffff</color>
-
-  <!-- Text color of the search box text as entered by user  -->
-  <color name="searchbox_text_color">@color/dialer_primary_text_color</color>
-  <!-- Background color of the search box -->
-  <color name="searchbox_background_color">#ffffff</color>
-
-  <color name="searchbox_hint_text_color">#737373</color>
-  <color name="searchbox_icon_tint">@color/searchbox_hint_text_color</color>
-
-  <color name="search_shortcut_icon_color">@color/dialtacts_theme_color</color>
-
-  <!-- Color of the background of the contact detail and editor pages -->
-  <color name="background_primary">#f9f9f9</color>
-  <color name="contact_all_list_background_color">#FFFFFF</color>
-
-  <!-- Text color used for character counter when the max limit has been exceeded -->
-  <color name="call_subject_limit_exceeded">#d1041c</color>
-
-  <!-- Tint color for the call subject history icon. -->
-  <color name="call_subject_history_icon">#000000</color>
-
-  <!-- Divider line on the call subject dialog. -->
-  <color name="call_subject_divider">#d8d8d8</color>
-
-  <!-- Text color for the SEND & CALL button on the call subject dialog. -->
-  <color name="call_subject_button">#00c853</color>
-
-  <!-- Background color for the call subject history view. -->
-  <color name="call_subject_history_background">#ffffff</color>
-  <color name="search_video_call_icon_tint">@color/searchbox_hint_text_color</color>
-</resources>
diff --git a/java/com/android/contacts/common/res/values/strings.xml b/java/com/android/contacts/common/res/values/strings.xml
deleted file mode 100644
index dbe97ea..0000000
--- a/java/com/android/contacts/common/res/values/strings.xml
+++ /dev/null
@@ -1,426 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-  -->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-
-  <!-- Action string for calling a custom phone number -->
-    <string name="call_custom">Call
-        <xliff:g id="custom">%s</xliff:g>
-    </string>
-  <!-- Action string for calling a home phone number -->
-  <string name="call_home">Call home</string>
-  <!-- Action string for calling a mobile phone number -->
-  <string name="call_mobile">Call mobile</string>
-  <!-- Action string for calling a work phone number -->
-  <string name="call_work">Call work</string>
-  <!-- Action string for calling a work fax phone number -->
-  <string name="call_fax_work">Call work fax</string>
-  <!-- Action string for calling a home fax phone number -->
-  <string name="call_fax_home">Call home fax</string>
-  <!-- Action string for calling a pager phone number -->
-  <string name="call_pager">Call pager</string>
-  <!-- Action string for calling an other phone number -->
-  <string name="call_other">Call</string>
-  <!-- Action string for calling a callback number -->
-  <string name="call_callback">Call callback</string>
-  <!-- Action string for calling a car phone number -->
-  <string name="call_car">Call car</string>
-  <!-- Action string for calling a company main phone number -->
-  <string name="call_company_main">Call company main</string>
-  <!-- Action string for calling a ISDN phone number -->
-  <string name="call_isdn">Call ISDN</string>
-  <!-- Action string for calling a main phone number -->
-  <string name="call_main">Call main</string>
-  <!-- Action string for calling an other fax phone number -->
-  <string name="call_other_fax">Call fax</string>
-  <!-- Action string for calling a radio phone number -->
-  <string name="call_radio">Call radio</string>
-  <!-- Action string for calling a Telex phone number -->
-  <string name="call_telex">Call telex</string>
-  <!-- Action string for calling a TTY/TDD phone number -->
-  <string name="call_tty_tdd">Call TTY/TDD</string>
-  <!-- Action string for calling a work mobile phone number -->
-  <string name="call_work_mobile">Call work mobile</string>
-  <!-- Action string for calling a work pager phone number -->
-  <string name="call_work_pager">Call work pager</string>
-  <!-- Action string for calling an assistant phone number -->
-    <string name="call_assistant">Call
-        <xliff:g id="assistant">%s</xliff:g>
-    </string>
-  <!-- Action string for calling a MMS phone number -->
-  <string name="call_mms">Call MMS</string>
-
-  <!-- Action string for sending an SMS to a custom phone number -->
-    <string name="sms_custom">Text
-        <xliff:g id="custom">%s</xliff:g>
-    </string>
-  <!-- Action string for sending an SMS to a home phone number -->
-  <string name="sms_home">Text home</string>
-  <!-- Action string for sending an SMS to a mobile phone number -->
-  <string name="sms_mobile">Text mobile</string>
-  <!-- Action string for sending an SMS to a work phone number -->
-  <string name="sms_work">Text work</string>
-  <!-- Action string for sending an SMS to a work fax phone number -->
-  <string name="sms_fax_work">Text work fax</string>
-  <!-- Action string for sending an SMS to a home fax phone number -->
-  <string name="sms_fax_home">Text home fax</string>
-  <!-- Action string for sending an SMS to a pager phone number -->
-  <string name="sms_pager">Text pager</string>
-  <!-- Action string for sending an SMS to an other phone number -->
-  <string name="sms_other">Text</string>
-  <!-- Action string for sending an SMS to a callback number -->
-  <string name="sms_callback">Text callback</string>
-  <!-- Action string for sending an SMS to a car phone number -->
-  <string name="sms_car">Text car</string>
-  <!-- Action string for sending an SMS to a company main phone number -->
-  <string name="sms_company_main">Text company main</string>
-  <!-- Action string for sending an SMS to a ISDN phone number -->
-  <string name="sms_isdn">Text ISDN</string>
-  <!-- Action string for sending an SMS to a main phone number -->
-  <string name="sms_main">Text main</string>
-  <!-- Action string for sending an SMS to an other fax phone number -->
-  <string name="sms_other_fax">Text fax</string>
-  <!-- Action string for sending an SMS to a radio phone number -->
-  <string name="sms_radio">Text radio</string>
-  <!-- Action string for sending an SMS to a Telex phone number -->
-  <string name="sms_telex">Text telex</string>
-  <!-- Action string for sending an SMS to a TTY/TDD phone number -->
-  <string name="sms_tty_tdd">Text TTY/TDD</string>
-  <!-- Action string for sending an SMS to a work mobile phone number -->
-  <string name="sms_work_mobile">Text work mobile</string>
-  <!-- Action string for sending an SMS to a work pager phone number -->
-  <string name="sms_work_pager">Text work pager</string>
-  <!-- Action string for sending an SMS to an assistant phone number -->
-    <string name="sms_assistant">Text
-        <xliff:g id="assistant">%s</xliff:g>
-    </string>
-  <!-- Action string for sending an SMS to a MMS phone number -->
-  <string name="sms_mms">Text MMS</string>
-
-  <!-- Title of the confirmation dialog for clearing frequents. [CHAR LIMIT=37] -->
-  <string name="clearFrequentsConfirmation_title">Clear frequently contacted?</string>
-
-  <!-- Confirmation dialog for clearing frequents. [CHAR LIMIT=NONE] -->
-    <string name="clearFrequentsConfirmation">You\'ll clear the frequently contacted list in the
-        Contacts and Phone apps, and force email apps to learn your addressing preferences from
-        scratch.
-    </string>
-
-  <!-- Title of the "Clearing frequently contacted" progress-dialog [CHAR LIMIT=35] -->
-  <string name="clearFrequentsProgress_title">Clearing frequently contacted\u2026</string>
-
-  <!--  Used to display as default status when the contact is available for chat [CHAR LIMIT=19] -->
-  <string name="status_available">Available</string>
-
-  <!--  Used to display as default status when the contact is away or idle for chat [CHAR LIMIT=19] -->
-  <string name="status_away">Away</string>
-
-  <!--  Used to display as default status when the contact is busy or Do not disturb for chat [CHAR LIMIT=19] -->
-  <string name="status_busy">Busy</string>
-
-  <!-- Directory partition name (also exists in contacts) -->
-  <string name="contactsList">Contacts</string>
-
-  <!-- Directory partition name for p13n suggestions -->
-  <string name="contact_suggestions">Top Suggested</string>
-
-  <!-- The name of the invisible local contact directory -->
-  <string name="local_invisible_directory">Other</string>
-
-  <!-- The label in section header in the contact list for a contact directory [CHAR LIMIT=128] -->
-  <string name="directory_search_label">Directory</string>
-
-  <!-- The label in section header in the contact list for a work contact directory [CHAR LIMIT=128] -->
-  <string name="directory_search_label_work">Work directory</string>
-
-  <!-- The label in section header in the contact list for a local contacts [CHAR LIMIT=128] -->
-  <string name="local_search_label">All contacts</string>
-
-  <!-- The label in section header in the contact list for a local suggested contacts [CHAR LIMIT=128] -->
-  <string name="local_suggestions_search_label">Suggestions</string>
-
-  <!-- String describing the text on the header of the profile contact in the contacts list
-       This may be programatically capitalized. [CHAR LIMIT=20] -->
-  <string msgid="9154761216179882405" name="user_profile_contacts_list_header">Me</string>
-
-  <!-- Shown as the display name for a person when the name is missing or unknown. [CHAR LIMIT=18]-->
-  <string name="missing_name">(No name)</string>
-
-  <!-- String describing a contact picture that introduces users to the contact detail screen.
-
-     Used by AccessibilityService to announce the purpose of the button.
-
-     [CHAR LIMIT=NONE]
-  -->
-  <string msgid="2795575601596468581" name="description_view_contact_detail">View contact</string>
-
-  <!-- Contact list filter selection indicating that the list shows all contacts with phone numbers [CHAR LIMIT=64] -->
-  <string name="list_filter_phones">All contacts with phone numbers</string>
-
-  <!-- Contact list filter selection indicating that the list shows all work contacts with phone numbers [CHAR LIMIT=64] -->
-  <string name="list_filter_phones_work">Work profile contacts</string>
-
-  <!-- Button to view the updates from the current group on the group detail page [CHAR LIMIT=25] -->
-  <string name="view_updates_from_group">View updates</string>
-
-  <!-- Title for data source when creating or editing a contact that doesn't
-       belong to a specific account.  This contact will only exist on the device
-       and will not be synced. -->
-  <string name="account_phone">Device-only, unsynced</string>
-
-  <!-- Header that expands to list all name types when editing a structured name of a contact
-       [CHAR LIMIT=20] -->
-  <string name="nameLabelsGroup">Name</string>
-
-  <!-- Header that expands to list all nickname types when editing a nickname of a contact
-       [CHAR LIMIT=20] -->
-  <string name="nicknameLabelsGroup">Nickname</string>
-
-  <!-- Field title for the full name of a contact [CHAR LIMIT=64]-->
-  <string name="full_name">Name</string>
-  <!-- Field title for the given name of a contact -->
-  <string name="name_given">First name</string>
-  <!-- Field title for the family name of a contact -->
-  <string name="name_family">Last name</string>
-  <!-- Field title for the prefix name of a contact -->
-  <string name="name_prefix">Name prefix</string>
-  <!-- Field title for the middle name of a contact -->
-  <string name="name_middle">Middle name</string>
-  <!-- Field title for the suffix name of a contact -->
-  <string name="name_suffix">Name suffix</string>
-
-  <!-- Field title for the phonetic name of a contact [CHAR LIMIT=64]-->
-  <string name="name_phonetic">Phonetic name</string>
-
-  <!-- Field title for the phonetic given name of a contact -->
-  <string name="name_phonetic_given">Phonetic first name</string>
-  <!-- Field title for the phonetic middle name of a contact -->
-  <string name="name_phonetic_middle">Phonetic middle name</string>
-  <!-- Field title for the phonetic family name of a contact -->
-  <string name="name_phonetic_family">Phonetic last name</string>
-
-  <!-- Header that expands to list all of the types of phone numbers when editing or creating a
-       phone number for a contact [CHAR LIMIT=20] -->
-  <string name="phoneLabelsGroup">Phone</string>
-
-  <!-- Header that expands to list all of the types of email addresses when editing or creating
-       an email address for a contact [CHAR LIMIT=20] -->
-  <string name="emailLabelsGroup">Email</string>
-
-  <!-- Header that expands to list all of the types of postal addresses when editing or creating
-       an postal address for a contact [CHAR LIMIT=20] -->
-  <string name="postalLabelsGroup">Address</string>
-
-  <!-- Header that expands to list all of the types of IM account when editing or creating an IM
-       account for a contact [CHAR LIMIT=20] -->
-  <string name="imLabelsGroup">IM</string>
-
-  <!-- Header that expands to list all organization types when editing an organization of a
-       contact [CHAR LIMIT=20] -->
-  <string name="organizationLabelsGroup">Organization</string>
-
-  <!-- Header for the list of all relationships for a contact [CHAR LIMIT=20] -->
-  <string name="relationLabelsGroup">Relationship</string>
-
-  <!-- Header that expands to list all event types when editing an event of a contact
-       [CHAR LIMIT=20] -->
-  <string name="eventLabelsGroup">Special date</string>
-
-  <!-- Generic action string for text messaging a contact. Used by AccessibilityService to
-       announce the purpose of the view. [CHAR LIMIT=NONE] -->
-  <string name="sms">Text message</string>
-
-  <!-- Field title for the full postal address of a contact [CHAR LIMIT=64]-->
-  <string name="postal_address">Address</string>
-
-  <!-- Hint text for the organization name when editing -->
-  <string name="ghostData_company">Company</string>
-
-  <!-- Hint text for the organization title when editing -->
-  <string name="ghostData_title">Title</string>
-
-  <!-- The label describing the Notes field of a contact. This field allows free form text entry
-       about a contact -->
-  <string name="label_notes">Notes</string>
-
-  <!-- The label describing the SIP address field of a contact. [CHAR LIMIT=20] -->
-  <string name="label_sip_address">SIP</string>
-
-  <!-- Header that expands to list all website types when editing a website of a contact
-       [CHAR LIMIT=20] -->
-  <string name="websiteLabelsGroup">Website</string>
-
-  <!-- Header for the list of all groups for a contact [CHAR LIMIT=20] -->
-  <string name="groupsLabel">Groups</string>
-
-  <!-- Action string for sending an email to a home email address -->
-  <string name="email_home">Email home</string>
-  <!-- Action string for sending an email to a mobile email address -->
-  <string name="email_mobile">Email mobile</string>
-  <!-- Action string for sending an email to a work email address -->
-  <string name="email_work">Email work</string>
-  <!-- Action string for sending an email to an other email address -->
-  <string name="email_other">Email</string>
-  <!-- Action string for sending an email to a custom email address -->
-  <string name="email_custom">Email <xliff:g id="custom">%s</xliff:g></string>
-
-  <!-- Generic action string for sending an email -->
-  <string name="email">Email</string>
-
-  <!-- Field title for the street of a structured postal address of a contact -->
-  <string name="postal_street">Street</string>
-  <!-- Field title for the city of a structured postal address of a contact -->
-  <string name="postal_city">City</string>
-  <!-- Field title for the region, or state, of a structured postal address of a contact -->
-  <string name="postal_region">State</string>
-  <!-- Field title for the postal code of a structured postal address of a contact -->
-  <string name="postal_postcode">ZIP code</string>
-  <!-- Field title for the country of a structured postal address of a contact -->
-  <string name="postal_country">Country</string>
-
-  <!-- Action string for viewing a home postal address -->
-  <string name="map_home">View home address</string>
-  <!-- Action string for viewing a work postal address -->
-  <string name="map_work">View work address</string>
-  <!-- Action string for viewing an other postal address -->
-  <string name="map_other">View address</string>
-  <!-- Action string for viewing a custom postal address -->
-  <string name="map_custom">View <xliff:g id="custom">%s</xliff:g> address</string>
-
-  <!-- Action string for starting an IM chat with the AIM protocol -->
-  <string name="chat_aim">Chat using AIM</string>
-  <!-- Action string for starting an IM chat with the MSN or Windows Live protocol -->
-  <string name="chat_msn">Chat using Windows Live</string>
-  <!-- Action string for starting an IM chat with the Yahoo protocol -->
-  <string name="chat_yahoo">Chat using Yahoo</string>
-  <!-- Action string for starting an IM chat with the Skype protocol -->
-  <string name="chat_skype">Chat using Skype</string>
-  <!-- Action string for starting an IM chat with the QQ protocol -->
-  <string name="chat_qq">Chat using QQ</string>
-  <!-- Action string for starting an IM chat with the Google Talk protocol -->
-  <string name="chat_gtalk">Chat using Google Talk</string>
-  <!-- Action string for starting an IM chat with the ICQ protocol -->
-  <string name="chat_icq">Chat using ICQ</string>
-  <!-- Action string for starting an IM chat with the Jabber protocol -->
-  <string name="chat_jabber">Chat using Jabber</string>
-
-  <!-- Generic action string for starting an IM chat -->
-  <string name="chat">Chat</string>
-
-  <!-- Contact list filter label indicating that the list is showing all available accounts [CHAR LIMIT=64] -->
-  <string name="list_filter_all_accounts">All contacts</string>
-
-  <!-- Displayed at the top of the contacts showing the account filter selected  [CHAR LIMIT=64] -->
-  <string name="listAllContactsInAccount">Contacts in <xliff:g example="abc@gmail.com" id="name">%s</xliff:g></string>
-
-  <!-- Displayed at the top of the contacts showing single contact. [CHAR LIMIT=64] -->
-  <string name="listCustomView">Contacts in custom view</string>
-
-  <!-- Displayed at the top of the contacts showing single contact. [CHAR LIMIT=64] -->
-  <string name="listSingleContact">Single contact</string>
-
-  <!-- Contact preferences related strings -->
-
-  <!-- Label of the "sort by" display option -->
-  <string name="display_options_sort_list_by">Sort by</string>
-
-  <!-- An allowable value for the "sort list by" contact display option  -->
-  <string name="display_options_sort_by_given_name">First name</string>
-
-  <!-- An allowable value for the "sort list by" contact display option  -->
-  <string name="display_options_sort_by_family_name">Last name</string>
-
-  <!-- Label of the "name format" display option [CHAR LIMIT=64]-->
-  <string name="display_options_view_names_as">Name format</string>
-
-  <!-- An allowable value for the "view names as" contact display option  -->
-  <string name="display_options_view_given_name_first">First name first</string>
-
-  <!-- An allowable value for the "view names as" contact display option  -->
-  <string name="display_options_view_family_name_first">Last name first</string>
-
-  <!--  The menu item to clear frequents [CHAR LIMIT=30] -->
-  <string name="menu_clear_frequents">Clear frequents</string>
-
-  <!-- Content description for the fake action menu up button as used
-   inside search. [CHAR LIMIT=NONE] -->
-  <string name="action_menu_back_from_search">stop searching</string>
-
-  <!--  String describing the icon used to clear the search field -->
-  <string name="description_clear_search">Clear search</string>
-
-  <!-- The font-family to use for the text inside the searchbox. -->
-  <string name="search_font_family" translatable="false">sans-serif</string>
-
-  <!-- Title for Select Account Dialog [CHAR LIMIT=30] -->
-  <string name="select_account_dialog_title">Account</string>
-
-  <!-- Label for the check box to toggle default sim card setting [CHAR LIMIT=35]-->
-  <string name="set_default_account">Always use this for calls</string>
-
-  <!-- Title for dialog to select Phone Account for outgoing call.  [CHAR LIMIT=40] -->
-  <string name="select_phone_account_for_calls">Call with</string>
-
-  <!-- String used for actions in the dialer call log and the quick contact card to initiate
-       a call to an individual.  The user is prompted to enter a note which is sent along with
-       the call (e.g. a call subject). [CHAR LIMIT=40] -->
-  <string name="call_with_a_note">Call with a note</string>
-
-  <!-- Hint text shown in the call subject dialog. [CHAR LIMIT=255] -->
-  <string name="call_subject_hint">Type a note to send with call ...</string>
-
-  <!-- Button used to start a new call with the user entered subject. [CHAR LIMIT=32] -->
-  <string name="send_and_call_button">SEND &amp; CALL</string>
-
-  <!-- String used to represent the total number of characters entered for a call subject,
-       compared to the character limit.  Example: 2 / 64 -->
-  <string name="call_subject_limit"><xliff:g example="4" id="count">%1$s</xliff:g> / <xliff:g example="64" id="limit">%2$s</xliff:g></string>
-
-  <!-- String used to build a phone number type and phone number string.
-       Example: Mobile 650-555-1212  -->
-  <string name="call_subject_type_and_number"><xliff:g example="Mobile" id="type">%1$s</xliff:g> <xliff:g example="(650) 555-1212" id="number">%2$s</xliff:g></string>
-
-  <!-- String format to describe a tab e.g.call history tab. -->
-  <string name="tab_title"><xliff:g id="title">%1$s</xliff:g> tab.</string>
-
-  <!-- String format to describe the number of unread items in a tab.
-
-      Note: AccessibilityServices use this attribute to announce what the view represents.
-            This is especially valuable for views without textual representation like ImageView.
-  -->
-  <plurals name="tab_title_with_unread_items">
-        <item quantity="one">
-            <xliff:g id="title">%1$s</xliff:g> tab. <xliff:g id="count">%2$d</xliff:g> unread item.
-        </item>
-        <item quantity="other">
-            <xliff:g id="title">%1$s</xliff:g> tab. <xliff:g id="count">%2$d</xliff:g> unread items.
-        </item>
-  </plurals>
-
-  <!-- Description string for an action button to initiate a video call from search results.
-       Note: AccessibilityServices use this attribute to announce what the view represents.
-       This is especially valuable for views without textual representation like ImageView.
-
-       [CHAR LIMIT=NONE]-->
-  <string name="description_search_video_call">Video call</string>
-
-  <!-- Description string for an action button to initiate an enriched call from search results.
-       Note: AccessibilityServices use this attribute to announce what the view represents.
-       This is especially valuable for views without textual representation like ImageView.
-
-       [CHAR LIMIT=NONE]-->
-  <string name="description_search_call_and_share">Share and call</string>
-</resources>
diff --git a/java/com/android/contacts/common/res/values/styles.xml b/java/com/android/contacts/common/res/values/styles.xml
deleted file mode 100644
index bb19afe..0000000
--- a/java/com/android/contacts/common/res/values/styles.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<!--
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-  -->
-
-<resources>
-
-  <style name="DirectoryHeader">
-    <item name="android:background">@android:color/transparent</item>
-  </style>
-
-  <style name="SectionHeaderStyle" parent="@android:style/TextAppearance.Large">
-    <item name="android:textSize">16sp</item>
-    <item name="android:textAllCaps">true</item>
-    <item name="android:textColor">@color/section_header_text_color</item>
-    <item name="android:textStyle">bold</item>
-  </style>
-
-  <style name="DirectoryHeaderStyle" parent="@android:style/TextAppearance.Small">
-    <item name="android:textSize">14sp</item>
-    <item name="android:textColor">@color/dialer_secondary_text_color</item>
-    <item name="android:fontFamily">sans-serif-medium</item>
-  </style>
-
-  <!-- TextView style used for headers.
-
-This is similar to ?android:attr/listSeparatorTextView but uses different
-background and text color. See also android:style/Widget.Holo.TextView.ListSeparator
-(which is private, so we cannot specify it as a parent style).  -->
-  <style name="ContactListSeparatorTextViewStyle">
-    <item name="android:layout_width">match_parent</item>
-    <item name="android:layout_height">wrap_content</item>
-    <!-- See comments for @dimen/list_section_divider_min_height -->
-    <item name="android:minHeight">@dimen/list_section_divider_min_height</item>
-    <item name="android:textAppearance">@style/DirectoryHeaderStyle</item>
-    <item name="android:gravity">center_vertical</item>
-    <item name="android:paddingLeft">8dip</item>
-    <item name="android:paddingStart">8dip</item>
-    <item name="android:paddingTop">4dip</item>
-    <item name="android:paddingBottom">4dip</item>
-    <item name="android:ellipsize">end</item>
-    <item name="android:singleLine">true</item>
-    <item name="android:textAllCaps">true</item>
-  </style>
-
-  <style name="TextAppearanceMedium" parent="@android:style/TextAppearance.Medium">
-    <item name="android:textSize">16sp</item>
-    <item name="android:textColor">#000000</item>
-  </style>
-
-  <style name="TextAppearanceSmall" parent="@android:style/TextAppearance.Small">
-    <item name="android:textSize">14sp</item>
-    <item name="android:textColor">#737373</item>
-  </style>
-
-  <style name="ListViewStyle" parent="@android:style/Widget.Material.Light.ListView">
-    <item name="android:overScrollMode">always</item>
-  </style>
-
-  <style name="BackgroundOnlyTheme" parent="@android:style/Theme.Material.Light">
-    <item name="android:windowBackground">@null</item>
-    <item name="android:windowContentOverlay">@null</item>
-    <item name="android:windowAnimationStyle">@null</item>
-    <item name="android:windowNoTitle">true</item>
-    <!-- Activities that use this theme are background activities without obvious displays.
-        However, some also have dialogs. Therefore, it doesn't make sense to set this true.-->
-    <item name="android:windowNoDisplay">false</item>
-    <item name="android:windowIsFloating">true</item>
-  </style>
-
-  <style name="Theme.CallSubjectDialogTheme" parent="@android:style/Theme.Material.Light.Dialog">
-    <item name="android:layout_width">match_parent</item>
-    <item name="android:layout_height">match_parent</item>
-
-    <!-- No backgrounds, titles or window float -->
-    <item name="android:windowIsTranslucent">true</item>
-    <item name="android:windowNoTitle">true</item>
-    <item name="android:windowFullscreen">false</item>
-    <item name="android:windowIsFloating">true</item>
-    <item name="android:windowBackground">@android:color/transparent</item>
-    <item name="android:windowDrawsSystemBarBackgrounds">false</item>
-    <item name="android:windowContentOverlay">@null</item>
-    <item name="android:windowElevation">0dp</item>
-  </style>
-</resources>
diff --git a/java/com/android/contacts/common/util/AccountFilterUtil.java b/java/com/android/contacts/common/util/AccountFilterUtil.java
index 25f937c..4587635 100644
--- a/java/com/android/contacts/common/util/AccountFilterUtil.java
+++ b/java/com/android/contacts/common/util/AccountFilterUtil.java
@@ -19,8 +19,8 @@
 import android.content.Context;
 import android.view.View;
 import android.widget.TextView;
-import com.android.contacts.common.R;
 import com.android.contacts.common.list.ContactListFilter;
+import com.android.dialer.contacts.resources.R;
 
 /** Utility class for account filter manipulation. */
 public class AccountFilterUtil {
diff --git a/java/com/android/contacts/common/util/ContactDisplayUtils.java b/java/com/android/contacts/common/util/ContactDisplayUtils.java
index 7d428e1..86d20bc 100644
--- a/java/com/android/contacts/common/util/ContactDisplayUtils.java
+++ b/java/com/android/contacts/common/util/ContactDisplayUtils.java
@@ -27,9 +27,8 @@
 import android.text.TextUtils;
 import android.text.style.TtsSpan;
 import android.util.Patterns;
-import com.android.contacts.common.R;
-import com.android.contacts.common.preference.ContactsPreferences;
 import com.android.dialer.common.LogUtil;
+import com.android.dialer.contacts.resources.R;
 import java.util.Objects;
 
 /** Methods for handling various contact data labels. */
@@ -244,62 +243,4 @@
     String msg = resources.getString(stringId, number);
     return ContactDisplayUtils.getTelephoneTtsSpannable(msg, number);
   }
-
-  /**
-   * Returns either namePrimary or nameAlternative based on the {@link ContactsPreferences}.
-   * Defaults to the name that is non-null.
-   *
-   * @param namePrimary the primary name.
-   * @param nameAlternative the alternative name.
-   * @param contactsPreferences the ContactsPreferences used to determine the preferred display
-   *     name.
-   * @return namePrimary or nameAlternative depending on the value of displayOrderPreference.
-   */
-  public static String getPreferredDisplayName(
-      String namePrimary,
-      String nameAlternative,
-      @Nullable ContactsPreferences contactsPreferences) {
-    if (contactsPreferences == null) {
-      return namePrimary != null ? namePrimary : nameAlternative;
-    }
-    if (contactsPreferences.getDisplayOrder() == ContactsPreferences.DISPLAY_ORDER_PRIMARY) {
-      return namePrimary;
-    }
-
-    if (contactsPreferences.getDisplayOrder() == ContactsPreferences.DISPLAY_ORDER_ALTERNATIVE
-        && !TextUtils.isEmpty(nameAlternative)) {
-      return nameAlternative;
-    }
-
-    return namePrimary;
-  }
-
-  /**
-   * Returns either namePrimary or nameAlternative based on the {@link ContactsPreferences}.
-   * Defaults to the name that is non-null.
-   *
-   * @param namePrimary the primary name.
-   * @param nameAlternative the alternative name.
-   * @param contactsPreferences the ContactsPreferences used to determine the preferred sort order.
-   * @return namePrimary or nameAlternative depending on the value of displayOrderPreference.
-   */
-  public static String getPreferredSortName(
-      String namePrimary,
-      String nameAlternative,
-      @Nullable ContactsPreferences contactsPreferences) {
-    if (contactsPreferences == null) {
-      return namePrimary != null ? namePrimary : nameAlternative;
-    }
-
-    if (contactsPreferences.getSortOrder() == ContactsPreferences.SORT_ORDER_PRIMARY) {
-      return namePrimary;
-    }
-
-    if (contactsPreferences.getSortOrder() == ContactsPreferences.SORT_ORDER_ALTERNATIVE
-        && !TextUtils.isEmpty(nameAlternative)) {
-      return nameAlternative;
-    }
-
-    return namePrimary;
-  }
 }
diff --git a/java/com/android/contacts/common/util/ContactListViewUtils.java b/java/com/android/contacts/common/util/ContactListViewUtils.java
index 278c27d..924789b 100644
--- a/java/com/android/contacts/common/util/ContactListViewUtils.java
+++ b/java/com/android/contacts/common/util/ContactListViewUtils.java
@@ -19,7 +19,7 @@
 import android.content.res.Resources;
 import android.view.View;
 import android.widget.ListView;
-import com.android.contacts.common.R;
+import com.android.dialer.contacts.resources.R;
 import com.android.dialer.util.ViewUtil;
 
 /** Utilities for configuring ListViews with a card background. */
diff --git a/java/com/android/contacts/common/util/MaterialColorMapUtils.java b/java/com/android/contacts/common/util/MaterialColorMapUtils.java
index bd32faa..ea8c5fc 100644
--- a/java/com/android/contacts/common/util/MaterialColorMapUtils.java
+++ b/java/com/android/contacts/common/util/MaterialColorMapUtils.java
@@ -29,9 +29,10 @@
 
   public MaterialColorMapUtils(Resources resources) {
     sPrimaryColors =
-        resources.obtainTypedArray(com.android.contacts.common.R.array.letter_tile_colors);
+        resources.obtainTypedArray(com.android.dialer.lettertile.R.array.letter_tile_colors);
     sSecondaryColors =
-        resources.obtainTypedArray(com.android.contacts.common.R.array.letter_tile_colors_dark);
+        resources.obtainTypedArray(
+            com.android.dialer.contacts.resources.R.array.letter_tile_colors_dark);
   }
 
   /**
diff --git a/java/com/android/contacts/common/widget/SelectPhoneAccountDialogFragment.java b/java/com/android/contacts/common/widget/SelectPhoneAccountDialogFragment.java
index 295aa96..014dcf2 100644
--- a/java/com/android/contacts/common/widget/SelectPhoneAccountDialogFragment.java
+++ b/java/com/android/contacts/common/widget/SelectPhoneAccountDialogFragment.java
@@ -43,14 +43,13 @@
 import android.widget.LinearLayout;
 import android.widget.ListAdapter;
 import android.widget.TextView;
-import com.android.contacts.common.R;
 import com.android.contacts.common.compat.PhoneAccountCompat;
+import com.android.dialer.contacts.resources.R;
 import com.android.dialer.location.GeoUtil;
 import com.android.dialer.phonenumberutil.PhoneNumberHelper;
+import com.android.dialer.protos.ProtoParsers;
 import com.android.dialer.telecom.TelecomUtil;
 import com.google.common.base.Optional;
-import java.util.ArrayList;
-import java.util.List;
 
 /**
  * Dialog that allows the user to select a phone accounts for a given action. Optionally provides
@@ -58,128 +57,74 @@
  */
 public class SelectPhoneAccountDialogFragment extends DialogFragment {
 
-  private static final String ARG_TITLE_RES_ID = "title_res_id";
-  private static final String ARG_CAN_SET_DEFAULT = "can_set_default";
-  private static final String ARG_SET_DEFAULT_RES_ID = "set_default_res_id";
-  private static final String ARG_ACCOUNT_HANDLES = "account_handles";
+  @VisibleForTesting public static final String ARG_OPTIONS = "options";
+
   private static final String ARG_IS_DEFAULT_CHECKED = "is_default_checked";
-  private static final String ARG_LISTENER = "listener";
-  private static final String ARG_CALL_ID = "call_id";
-  private static final String ARG_HINTS = "hints";
 
-  private List<PhoneAccountHandle> mAccountHandles;
-  private List<String> mHints;
-  private boolean mIsSelected;
-  private boolean mIsDefaultChecked;
-  private SelectPhoneAccountListener mListener;
+  private SelectPhoneAccountDialogOptions options =
+      SelectPhoneAccountDialogOptions.getDefaultInstance();
+  private SelectPhoneAccountListener listener;
 
-  public SelectPhoneAccountDialogFragment() {}
+  private boolean isDefaultChecked;
+  private boolean isSelected;
 
-  /**
-   * Create new fragment instance with default title and no option to set as default.
-   *
-   * @param accountHandles The {@code PhoneAccountHandle}s available to select from.
-   * @param listener The listener for the results of the account selection.
-   */
+  /** Create new fragment instance. */
   public static SelectPhoneAccountDialogFragment newInstance(
-      List<PhoneAccountHandle> accountHandles,
-      SelectPhoneAccountListener listener,
-      @Nullable String callId) {
-    return newInstance(
-        R.string.select_account_dialog_title, false, 0, accountHandles, listener, callId, null);
-  }
-
-  /**
-   * Create new fragment instance. This method also allows specifying a custom title and "set
-   * default" checkbox.
-   *
-   * @param titleResId The resource ID for the string to use in the title of the dialog.
-   * @param canSetDefault {@code true} if the dialog should include an option to set the selection
-   *     as the default. False otherwise.
-   * @param setDefaultResId The resource ID for the string to use in the "set as default" checkbox
-   * @param accountHandles The {@code PhoneAccountHandle}s available to select from.
-   * @param listener The listener for the results of the account selection.
-   * @param callId The callId to be passed back to the listener in {@link
-   *     SelectPhoneAccountListener#EXTRA_CALL_ID}
-   * @param hints Additional information to be shown underneath the phone account to help user
-   *     choose. Index must match {@code accountHandles}
-   */
-  public static SelectPhoneAccountDialogFragment newInstance(
-      int titleResId,
-      boolean canSetDefault,
-      int setDefaultResId,
-      List<PhoneAccountHandle> accountHandles,
-      SelectPhoneAccountListener listener,
-      @Nullable String callId,
-      @Nullable List<String> hints) {
-    ArrayList<PhoneAccountHandle> accountHandlesCopy = new ArrayList<>();
-    if (accountHandles != null) {
-      accountHandlesCopy.addAll(accountHandles);
-    }
+      SelectPhoneAccountDialogOptions options, SelectPhoneAccountListener listener) {
     SelectPhoneAccountDialogFragment fragment = new SelectPhoneAccountDialogFragment();
-    final Bundle args = new Bundle();
-    args.putInt(ARG_TITLE_RES_ID, titleResId);
-    args.putBoolean(ARG_CAN_SET_DEFAULT, canSetDefault);
-    if (setDefaultResId != 0) {
-      args.putInt(ARG_SET_DEFAULT_RES_ID, setDefaultResId);
-    }
-    args.putParcelableArrayList(ARG_ACCOUNT_HANDLES, accountHandlesCopy);
-    args.putParcelable(ARG_LISTENER, listener);
-    args.putString(ARG_CALL_ID, callId);
-    if (hints != null) {
-      args.putStringArrayList(ARG_HINTS, new ArrayList<>(hints));
-    }
-    fragment.setArguments(args);
     fragment.setListener(listener);
+    Bundle arguments = new Bundle();
+    ProtoParsers.put(arguments, ARG_OPTIONS, options);
+    fragment.setArguments(arguments);
     return fragment;
   }
 
   public void setListener(SelectPhoneAccountListener listener) {
-    mListener = listener;
+    this.listener = listener;
   }
 
   @Nullable
   @VisibleForTesting
   public SelectPhoneAccountListener getListener() {
-    return mListener;
+    return listener;
   }
 
   @VisibleForTesting
   public boolean canSetDefault() {
-    return getArguments().getBoolean(ARG_CAN_SET_DEFAULT);
+    return options.getCanSetDefault();
   }
 
   @Override
   public void onSaveInstanceState(Bundle outState) {
     super.onSaveInstanceState(outState);
-    outState.putBoolean(ARG_IS_DEFAULT_CHECKED, mIsDefaultChecked);
+    outState.putBoolean(ARG_IS_DEFAULT_CHECKED, isDefaultChecked);
   }
 
   @Override
   public Dialog onCreateDialog(Bundle savedInstanceState) {
-    int titleResId = getArguments().getInt(ARG_TITLE_RES_ID);
-    boolean canSetDefault = getArguments().getBoolean(ARG_CAN_SET_DEFAULT);
-    mAccountHandles = getArguments().getParcelableArrayList(ARG_ACCOUNT_HANDLES);
-    mListener = getArguments().getParcelable(ARG_LISTENER);
-    mHints = getArguments().getStringArrayList(ARG_HINTS);
+    options =
+        ProtoParsers.getTrusted(
+            getArguments(), ARG_OPTIONS, SelectPhoneAccountDialogOptions.getDefaultInstance());
     if (savedInstanceState != null) {
-      mIsDefaultChecked = savedInstanceState.getBoolean(ARG_IS_DEFAULT_CHECKED);
+      isDefaultChecked = savedInstanceState.getBoolean(ARG_IS_DEFAULT_CHECKED);
     }
-    mIsSelected = false;
+    isSelected = false;
 
     final DialogInterface.OnClickListener selectionListener =
         new DialogInterface.OnClickListener() {
           @Override
           public void onClick(DialogInterface dialog, int which) {
-            mIsSelected = true;
-            PhoneAccountHandle selectedAccountHandle = mAccountHandles.get(which);
+            isSelected = true;
+            PhoneAccountHandle selectedAccountHandle =
+                SelectPhoneAccountDialogOptionsUtil.getPhoneAccountHandle(
+                    options.getEntriesList().get(which));
             Bundle result = new Bundle();
             result.putParcelable(
                 SelectPhoneAccountListener.EXTRA_SELECTED_ACCOUNT_HANDLE, selectedAccountHandle);
-            result.putBoolean(SelectPhoneAccountListener.EXTRA_SET_DEFAULT, mIsDefaultChecked);
+            result.putBoolean(SelectPhoneAccountListener.EXTRA_SET_DEFAULT, isDefaultChecked);
             result.putString(SelectPhoneAccountListener.EXTRA_CALL_ID, getCallId());
-            if (mListener != null) {
-              mListener.onReceiveResult(SelectPhoneAccountListener.RESULT_SELECTED, result);
+            if (listener != null) {
+              listener.onReceiveResult(SelectPhoneAccountListener.RESULT_SELECTED, result);
             }
           }
         };
@@ -188,22 +133,23 @@
         new CompoundButton.OnCheckedChangeListener() {
           @Override
           public void onCheckedChanged(CompoundButton check, boolean isChecked) {
-            mIsDefaultChecked = isChecked;
+            isDefaultChecked = isChecked;
           }
         };
 
     AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
     ListAdapter selectAccountListAdapter =
         new SelectAccountListAdapter(
-            builder.getContext(), R.layout.select_account_list_item, mAccountHandles, mHints);
+            builder.getContext(), R.layout.select_account_list_item, options);
 
     AlertDialog dialog =
         builder
-            .setTitle(titleResId)
+            .setTitle(
+                options.hasTitle() ? options.getTitle() : R.string.select_account_dialog_title)
             .setAdapter(selectAccountListAdapter, selectionListener)
             .create();
 
-    if (canSetDefault) {
+    if (options.getCanSetDefault()) {
       // Generate custom checkbox view, lint suppressed since no appropriate parent (is dialog)
       @SuppressLint("InflateParams")
       LinearLayout checkboxLayout =
@@ -213,11 +159,13 @@
 
       CheckBox checkBox = checkboxLayout.findViewById(R.id.default_account_checkbox_view);
       checkBox.setOnCheckedChangeListener(checkListener);
-      checkBox.setChecked(mIsDefaultChecked);
+      checkBox.setChecked(isDefaultChecked);
 
       TextView textView = checkboxLayout.findViewById(R.id.default_account_checkbox_text);
       int setDefaultResId =
-          getArguments().getInt(ARG_SET_DEFAULT_RES_ID, R.string.set_default_account);
+          options.hasSetDefaultLabel()
+              ? options.getSetDefaultLabel()
+              : R.string.set_default_account;
       textView.setText(setDefaultResId);
       textView.setOnClickListener((view) -> checkBox.performClick());
       checkboxLayout.setOnClickListener((view) -> checkBox.performClick());
@@ -230,17 +178,17 @@
 
   @Override
   public void onCancel(DialogInterface dialog) {
-    if (!mIsSelected && mListener != null) {
+    if (!isSelected && listener != null) {
       Bundle result = new Bundle();
       result.putString(SelectPhoneAccountListener.EXTRA_CALL_ID, getCallId());
-      mListener.onReceiveResult(SelectPhoneAccountListener.RESULT_DISMISSED, result);
+      listener.onReceiveResult(SelectPhoneAccountListener.RESULT_DISMISSED, result);
     }
     super.onCancel(dialog);
   }
 
   @Nullable
   private String getCallId() {
-    return getArguments().getString(ARG_CALL_ID);
+    return options.getCallId();
   }
 
   public static class SelectPhoneAccountListener extends ResultReceiver {
@@ -274,22 +222,30 @@
     public void onDialogDismissed(@Nullable String callId) {}
   }
 
-  private static class SelectAccountListAdapter extends ArrayAdapter<PhoneAccountHandle> {
+  static class SelectAccountListAdapter
+      extends ArrayAdapter<SelectPhoneAccountDialogOptions.Entry> {
 
     private int mResId;
-    private final List<String> mHints;
+    private final SelectPhoneAccountDialogOptions options;
 
     SelectAccountListAdapter(
-        Context context,
-        int resource,
-        List<PhoneAccountHandle> accountHandles,
-        @Nullable List<String> hints) {
-      super(context, resource, accountHandles);
-      mHints = hints;
+        Context context, int resource, SelectPhoneAccountDialogOptions options) {
+      super(context, resource, options.getEntriesList());
+      this.options = options;
       mResId = resource;
     }
 
     @Override
+    public boolean areAllItemsEnabled() {
+      return false;
+    }
+
+    @Override
+    public boolean isEnabled(int position) {
+      return options.getEntries(position).getEnabled();
+    }
+
+    @Override
     public View getView(int position, View convertView, ViewGroup parent) {
       LayoutInflater inflater =
           (LayoutInflater) getContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE);
@@ -311,7 +267,9 @@
         holder = (ViewHolder) rowView.getTag();
       }
 
-      PhoneAccountHandle accountHandle = getItem(position);
+      SelectPhoneAccountDialogOptions.Entry entry = getItem(position);
+      PhoneAccountHandle accountHandle =
+          SelectPhoneAccountDialogOptionsUtil.getPhoneAccountHandle(entry);
       PhoneAccount account =
           getContext().getSystemService(TelecomManager.class).getPhoneAccount(accountHandle);
       if (account == null) {
@@ -331,18 +289,17 @@
       }
       holder.imageView.setImageDrawable(
           PhoneAccountCompat.createIconDrawable(account, getContext()));
-      if (mHints != null && position < mHints.size()) {
-        String hint = mHints.get(position);
-        if (TextUtils.isEmpty(hint)) {
-          holder.hintTextView.setVisibility(View.GONE);
-        } else {
-          holder.hintTextView.setVisibility(View.VISIBLE);
-          holder.hintTextView.setText(hint);
-        }
-      } else {
-        holder.hintTextView.setVisibility(View.GONE);
-      }
 
+      if (TextUtils.isEmpty(entry.getHint())) {
+        holder.hintTextView.setVisibility(View.GONE);
+      } else {
+        holder.hintTextView.setVisibility(View.VISIBLE);
+        holder.hintTextView.setText(entry.getHint());
+      }
+      holder.labelTextView.setEnabled(entry.getEnabled());
+      holder.numberTextView.setEnabled(entry.getEnabled());
+      holder.hintTextView.setEnabled(entry.getEnabled());
+      holder.imageView.setImageAlpha(entry.getEnabled() ? 255 : 97 /* 38%*/);
       return rowView;
     }
 
@@ -356,7 +313,7 @@
       return info.get().getCountryIso().toUpperCase();
     }
 
-    private static final class ViewHolder {
+    static final class ViewHolder {
 
       TextView labelTextView;
       TextView numberTextView;
diff --git a/java/com/android/contacts/common/widget/SelectPhoneAccountDialogOptionsUtil.java b/java/com/android/contacts/common/widget/SelectPhoneAccountDialogOptionsUtil.java
new file mode 100644
index 0000000..5a44ae7
--- /dev/null
+++ b/java/com/android/contacts/common/widget/SelectPhoneAccountDialogOptionsUtil.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.contacts.common.widget;
+
+import android.telecom.PhoneAccountHandle;
+import com.android.dialer.common.Assert;
+import com.android.dialer.telecom.TelecomUtil;
+import java.util.Collection;
+
+/** Provides common operation on a {@link SelectPhoneAccountDialogOptions} */
+public final class SelectPhoneAccountDialogOptionsUtil {
+  private SelectPhoneAccountDialogOptionsUtil() {}
+
+  public static PhoneAccountHandle getPhoneAccountHandle(
+      SelectPhoneAccountDialogOptions.Entry entry) {
+    return Assert.isNotNull(
+        TelecomUtil.composePhoneAccountHandle(
+            entry.getPhoneAccountHandleComponentName(), entry.getPhoneAccountHandleId()));
+  }
+
+  public static SelectPhoneAccountDialogOptions.Entry.Builder setPhoneAccountHandle(
+      SelectPhoneAccountDialogOptions.Entry.Builder entryBuilder,
+      PhoneAccountHandle phoneAccountHandle) {
+    entryBuilder.setPhoneAccountHandleComponentName(
+        phoneAccountHandle.getComponentName().flattenToString());
+    entryBuilder.setPhoneAccountHandleId(phoneAccountHandle.getId());
+    return entryBuilder;
+  }
+
+  public static SelectPhoneAccountDialogOptions.Builder builderWithAccounts(
+      Collection<PhoneAccountHandle> phoneAccountHandles) {
+    SelectPhoneAccountDialogOptions.Builder optionsBuilder =
+        SelectPhoneAccountDialogOptions.newBuilder();
+    for (PhoneAccountHandle phoneAccountHandle : phoneAccountHandles) {
+      optionsBuilder.addEntries(
+          SelectPhoneAccountDialogOptionsUtil.setPhoneAccountHandle(
+              SelectPhoneAccountDialogOptions.Entry.newBuilder(), phoneAccountHandle));
+    }
+    return optionsBuilder;
+  }
+}
diff --git a/java/com/android/contacts/common/widget/select_phone_account_dialog_options.proto b/java/com/android/contacts/common/widget/select_phone_account_dialog_options.proto
new file mode 100644
index 0000000..cc40c64
--- /dev/null
+++ b/java/com/android/contacts/common/widget/select_phone_account_dialog_options.proto
@@ -0,0 +1,54 @@
+// Copyright (C) 2018 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License
+
+syntax = "proto2";
+
+option java_package = "com.android.contacts.common.widget";
+option java_multiple_files = true;
+option optimize_for = LITE_RUNTIME;
+
+
+package com.android.contacts.common.widget;
+
+// Parameters for SelectPhoneAccountDialogFragment
+message SelectPhoneAccountDialogOptions {
+  // The resource ID for the title. Defaults to
+  // R.string.select_account_dialog_title
+  optional int32 title = 1;
+  // Whether the dialog should include a "set as default" checkbox. Defaults to
+  // false
+  optional bool can_set_default = 2;
+  // The label on the "set as default" checkbox. Defaults
+  // R.string.set_default_account
+  optional int32 set_default_label = 3;
+  // The call ID to pass back to the callback
+  optional string call_id = 4;
+  // Phone accounts to show in the dialog
+  repeated Entry entries = 5;
+
+  message Entry {
+    // PhoneAccountHandle.getComponentName().flattenToString()
+    optional string phone_account_handle_component_name = 1;
+    // PhoneAccountHandle.getId()
+    optional string phone_account_handle_id = 2;
+    // The hint to show under the phone account, for example showing the user
+    // the account was selected frequently before.
+    optional string hint = 3;
+    // Whether the account is actually selectable. Defaults to true. Sometimes
+    // an account will be temporarily unusable, for example the user is already
+    // in a call so the other SIM cannot be used. Hint should also be set to
+    // inform the user why the account is unavailable.
+    optional bool enabled = 4 [default = true];
+  }
+}
\ No newline at end of file
diff --git a/java/com/android/dialer/about/AndroidManifest.xml b/java/com/android/dialer/about/AndroidManifest.xml
index 3d5067a..6892674 100644
--- a/java/com/android/dialer/about/AndroidManifest.xml
+++ b/java/com/android/dialer/about/AndroidManifest.xml
@@ -14,7 +14,7 @@
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
   package="com.android.dialer.about">
-  <application android:theme="@style/Theme.AppCompat">
+  <application>
     <activity
         android:name="com.android.dialer.about.LicenseMenuActivity"
         android:label="@string/licenseActivityLabel"
diff --git a/java/com/android/dialer/about/res/raw/third_party_license_metadata b/java/com/android/dialer/about/res/raw/third_party_license_metadata
index f1ef939..bd6259c 100755
--- a/java/com/android/dialer/about/res/raw/third_party_license_metadata
+++ b/java/com/android/dialer/about/res/raw/third_party_license_metadata
@@ -1,44 +1,62 @@
 40:10695 Android Annotations Support Library
-10784:11344 Android Architecture Components Core Library
-22182:11344 Android Architecture Components Lifecycle Library
-33588:11344 Android Architecture Components Lifecycle Runtime Library
-44951:11358 Android Common
-56344:10695 Android Compat Support Library
-67077:10695 Android Compatibility Library v13
-77809:10695 Android Compatibility Library v4
-88541:10695 Android Compatibility Library v7
-99272:10695 Android Core UI Support Library
-110006:10691 Android Core Utils Support Library
-120732:10695 Android Design Support Library
-131473:10695 Android Dynamic Animation Support Library
-142206:10695 Android Fragments Support Library
-152938:10695 Android Graphics Support Library
-163674:10691 Android Media Compat Support Library
-174404:10691 Android Transition Support Library
-185117:11359 Apache Commons IO
-196487:11358 Dagger
-207861:11357 Error Prone
-219234:11358 Google Auto
-230607:11358 Guava JDK5
-241980:11362 Guava JDK7
-253353:11358 J2ObjC
-264723:11358 JSR 250
-276093:11365 JSR 330
-287494:11358 Material Components for Android
-298863:11358 OkHttp
-310230:11358 Okio
-321603:11358 OpenCensus
-332972:11358 Volley
-344341:10695 bubble
-355056:12847 carrierservices
-367915:11358 flexbox
-379287:11358 gRPC Java
-390663:12847 jibercsclient
-403529:10173 libphonenumber
-413713:18982 mime4j
-432714:10699 shortcutbadger
-443429:16013 Android SDK
-459452:4771 Glide
-464242:1096 Animal Sniffer
-465360:22655 Checker Framework
-488027:1602 JSR 305
+10771:11344 Android Architecture Components
+22164:11344 Android Architecture Components Core Library
+33562:11344 Android Architecture Components Lifecycle Library
+44968:11344 Android Architecture Components Lifecycle Runtime Library
+56331:11358 Android Common
+67724:10695 Android Compat Support Library
+78457:10695 Android Compatibility Library v13
+89189:10695 Android Compatibility Library v4
+99921:10695 Android Compatibility Library v7
+110652:10695 Android Core UI Support Library
+121386:10691 Android Core Utils Support Library
+132112:10695 Android Design Support Library
+142853:10695 Android Dynamic Animation Support Library
+153586:10695 Android Fragments Support Library
+164318:10695 Android Graphics Support Library
+175054:10691 Android Media Compat Support Library
+185784:10691 Android Transition Support Library
+196497:11359 Apache Commons IO
+207917:10693 Compatibility Libraries for Android asynclayoutinflater.
+218663:10693 Compatibility Libraries for Android collections.
+229415:10693 Compatibility Libraries for Android coordinatorlayout.
+240163:10693 Compatibility Libraries for Android cursoradapter.
+250908:10693 Compatibility Libraries for Android customview.
+261655:10693 Compatibility Libraries for Android documentfile.
+272402:10693 Compatibility Libraries for Android drawerlayout.
+283149:10693 Compatibility Libraries for Android interpolator.
+293890:10693 Compatibility Libraries for Android loader.
+304646:10693 Compatibility Libraries for Android localbroadcastmanager.
+315386:10693 Compatibility Libraries for Android print.
+326138:10693 Compatibility Libraries for Android slidingpanelayout.
+336891:10695 Compatibility Libraries for Android support-slices_core
+347646:10693 Compatibility Libraries for Android swiperefreshlayout.
+358390:10693 Compatibility Libraries for Android viewpager.
+369094:11358 Dagger
+380468:11357 Error Prone
+391841:11358 Google Auto
+403214:11358 Guava JDK5
+414587:11362 Guava JDK7
+425960:11358 J2ObjC
+437330:11358 JSR 250
+448700:11365 JSR 330
+460101:11358 Material Components for Android
+471470:11358 OkHttp
+482837:11358 Okio
+494210:11358 OpenCensus
+505579:11358 Volley
+516947:11357 ZXing
+528316:11358 flexbox
+539688:11358 gRPC Java
+551055:11358 gson
+562432:10173 libphonenumber
+572624:10699 shortcutbadger
+583339:16013 Android SDK
+599371:1096 Animal Sniffer
+600479:1602 JSR 305
+602099:1732 Protobuf Nano
+603865:1846 Checker Framework Annotations
+605721:4771 Glide
+610512:12847 carrierservices
+623377:12847 jibercsclient
+636235:18982 mime4j
diff --git a/java/com/android/dialer/about/res/raw/third_party_licenses b/java/com/android/dialer/about/res/raw/third_party_licenses
index f99315f..d8d9506 100755
--- a/java/com/android/dialer/about/res/raw/third_party_licenses
+++ b/java/com/android/dialer/about/res/raw/third_party_licenses
@@ -194,6 +194,212 @@
 
 
 
+Android Architecture Components:
+
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright 2012 Netflix, Inc.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+
 Android Architecture Components Core Library:
 
 
@@ -3547,6 +3753,2888 @@
 
 
 
+Compatibility Libraries for Android asynclayoutinflater.:
+
+
+   Copyright (c) 2005-2011, The Android Open Source Project
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+Compatibility Libraries for Android collections.:
+
+
+   Copyright (c) 2005-2011, The Android Open Source Project
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+Compatibility Libraries for Android coordinatorlayout.:
+
+
+   Copyright (c) 2005-2011, The Android Open Source Project
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+Compatibility Libraries for Android cursoradapter.:
+
+
+   Copyright (c) 2005-2011, The Android Open Source Project
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+Compatibility Libraries for Android customview.:
+
+
+   Copyright (c) 2005-2011, The Android Open Source Project
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+Compatibility Libraries for Android documentfile.:
+
+
+   Copyright (c) 2005-2011, The Android Open Source Project
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+Compatibility Libraries for Android drawerlayout.:
+
+
+   Copyright (c) 2005-2011, The Android Open Source Project
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+Compatibility Libraries for Android interpolator.:
+
+
+   Copyright (c) 2005-2011, The Android Open Source Project
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+Compatibility Libraries for Android loader.:
+
+
+   Copyright (c) 2005-2011, The Android Open Source Project
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+Compatibility Libraries for Android localbroadcastmanager.:
+
+
+   Copyright (c) 2005-2011, The Android Open Source Project
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+Compatibility Libraries for Android print.:
+
+
+   Copyright (c) 2005-2011, The Android Open Source Project
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+Compatibility Libraries for Android slidingpanelayout.:
+
+
+   Copyright (c) 2005-2011, The Android Open Source Project
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+Compatibility Libraries for Android support-slices_core:
+
+
+   Copyright (c) 2005-2011, The Android Open Source Project
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+
+
+Compatibility Libraries for Android swiperefreshlayout.:
+
+
+   Copyright (c) 2005-2011, The Android Open Source Project
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+Compatibility Libraries for Android viewpager.:
+
+
+   Copyright (c) 2005-2011, The Android Open Source Project
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
 Dagger:
 
 
@@ -6225,13 +9313,203 @@
    limitations under the License.
 
 
-bubble:
+ZXing:
 
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
 
-   Copyright (c) 2005-2008, The Android Open Source Project
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
 
    Unless required by applicable law or agreed to in writing, software
    distributed under the License is distributed on an "AS IS" BASIS,
@@ -6240,424 +9518,6 @@
    limitations under the License.
 
 
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-
-
-carrierservices:
-
-These components
-  com.google.android.rcs.core,
-  com.google.android.rcs.core.utils.CaseInsensitiveMap,
-  com.google.android.rcs.core.utils.DateTime,
-  com.google.android.rcs.core.utils.InetAddresses,
-  com.google.android.rcs.core.network.ConnectivityMonitor,
-  com.google.android.rcs.client.PrivateDataStorage,
-  com.google.android.rcs.client.utils.FastXmlSerializer,
-  com.google.android.rcs.client.utils.XmlUtils,
-  com.google.android.rcs.client.utils.QueuedWork
-are licensed under Apache v2.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-===============================================================================
-
-These components
-  com.google.android.rcs.core.utils.FastBase64,
-  com.google.android.rcs.core.utils.LibraryLoaderHelper
-are licensed under BSD.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
 flexbox:
 
 
@@ -7070,31 +9930,7 @@
    limitations under the License.
 
 
-jibercsclient:
-
-These components
-  com.google.android.rcs.core,
-  com.google.android.rcs.core.utils.CaseInsensitiveMap,
-  com.google.android.rcs.core.utils.DateTime,
-  com.google.android.rcs.core.utils.InetAddresses,
-  com.google.android.rcs.core.network.ConnectivityMonitor,
-  com.google.android.rcs.client.PrivateDataStorage,
-  com.google.android.rcs.client.utils.FastXmlSerializer,
-  com.google.android.rcs.client.utils.XmlUtils,
-  com.google.android.rcs.client.utils.QueuedWork
-are licensed under Apache v2.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
+gson:
 
 
                                  Apache License
@@ -7274,39 +10110,30 @@
 
    END OF TERMS AND CONDITIONS
 
-===============================================================================
+   APPENDIX: How to apply the Apache License to your work.
 
-These components
-  com.google.android.rcs.core.utils.FastBase64,
-  com.google.android.rcs.core.utils.LibraryLoaderHelper
-are licensed under BSD.
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
 
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
+   Copyright [yyyy] [name of copyright owner]
 
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
 
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
+       http://www.apache.org/licenses/LICENSE-2.0
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
 
 libphonenumber:
@@ -7489,371 +10316,6 @@
    END OF TERMS AND CONDITIONS
 
 
-mime4j:
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-   
-   
-   
-
-   THIS PRODUCT ALSO INCLUDES THIRD PARTY SOFTWARE REDISTRIBUTED UNDER THE
-   FOLLOWING LICENSES:
-
- Apache Commons Logging, 
-    The Apache Software License, Version 1.1 (commons-logging-1.1.1.jar)
-   
-   The Apache Software License, Version 1.1
-  
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions
-   are met:
-  
-   1. Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-  
-   2. Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in
-      the documentation and/or other materials provided with the
-      distribution.
-  
-   3. The end-user documentation included with the redistribution,
-      if any, must include the following acknowledgment:
-         "This product includes software developed by the
-          Apache Software Foundation (http://www.apache.org/)."
-      Alternately, this acknowledgment may appear in the software itself,
-      if and wherever such third-party acknowledgments normally appear.
-  
-   4. The names "Apache" and "Apache Software Foundation" must
-      not be used to endorse or promote products derived from this
-      software without prior written permission. For written
-      permission, please contact apache@apache.org.
-  
-   5. Products derived from this software may not be called "Apache",
-      nor may "Apache" appear in their name, without prior written
-      permission of the Apache Software Foundation.
-  
-   THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
-   WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-   OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-   DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
-   ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
-   USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-   ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-   OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
-   OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-   SUCH DAMAGE.
-  
-
- Test messages from the Perl-MIME-Tools project,
- 
-      The "Artistic License"
-  
-      Preamble
-  
-  The intent of this document is to state the conditions under which a
-  Package may be copied, such that the Copyright Holder maintains some
-  semblance of artistic control over the development of the package,
-  while giving the users of the package the right to use and distribute
-  the Package in a more-or-less customary fashion, plus the right to make
-  reasonable modifications.
-  
-  Definitions:
-  
-   "Package" refers to the collection of files distributed by the
-   Copyright Holder, and derivatives of that collection of files
-   created through textual modification.
-  
-   "Standard Version" refers to such a Package if it has not been
-   modified, or has been modified in accordance with the wishes
-   of the Copyright Holder as specified below.
-  
-   "Copyright Holder" is whoever is named in the copyright or
-   copyrights for the package.
-  
-   "You" is you, if you're thinking about copying or distributing
-   this Package.
-  
-   "Reasonable copying fee" is whatever you can justify on the
-   basis of media cost, duplication charges, time of people involved,
-   and so on.  (You will not be required to justify it to the
-   Copyright Holder, but only to the computing community at large
-   as a market that must bear the fee.)
-  
-   "Freely Available" means that no fee is charged for the item
-   itself, though there may be fees involved in handling the item.
-   It also means that recipients of the item may redistribute it
-   under the same conditions they received it.
-  
-  1. You may make and give away verbatim copies of the source form of the
-  Standard Version of this Package without restriction, provided that you
-  duplicate all of the original copyright notices and associated disclaimers.
-  
-  2. You may apply bug fixes, portability fixes and other modifications
-  derived from the Public Domain or from the Copyright Holder.  A Package
-  modified in such a way shall still be considered the Standard Version.
-  
-  3. You may otherwise modify your copy of this Package in any way, provided
-  that you insert a prominent notice in each changed file stating how and
-  when you changed that file, and provided that you do at least ONE of the
-  following:
-  
-      a) place your modifications in the Public Domain or otherwise make them
-      Freely Available, such as by posting said modifications to Usenet or
-      an equivalent medium, or placing the modifications on a major archive
-      site such as uunet.uu.net, or by allowing the Copyright Holder to include
-      your modifications in the Standard Version of the Package.
-  
-      b) use the modified Package only within your corporation or organization.
-  
-      c) rename any non-standard executables so the names do not conflict
-      with standard executables, which must also be provided, and provide
-      a separate manual page for each non-standard executable that clearly
-      documents how it differs from the Standard Version.
-  
-      d) make other distribution arrangements with the Copyright Holder.
-  
-  4. You may distribute the programs of this Package in object code or
-  executable form, provided that you do at least ONE of the following:
-  
-      a) distribute a Standard Version of the executables and library files,
-      together with instructions (in the manual page or equivalent) on where
-      to get the Standard Version.
-  
-      b) accompany the distribution with the machine-readable source of
-      the Package with your modifications.
-  
-      c) give non-standard executables non-standard names, and clearly
-      document the differences in manual pages (or equivalent), together
-      with instructions on where to get the Standard Version.
-  
-      d) make other distribution arrangements with the Copyright Holder.
-  
-  5. You may charge a reasonable copying fee for any distribution of this
-  Package.  You may charge any fee you choose for support of this
-  Package.  You may not charge a fee for this Package itself.  However,
-  you may distribute this Package in aggregate with other (possibly
-  commercial) programs as part of a larger (possibly commercial) software
-  distribution provided that you do not advertise this Package as a
-  product of your own.  You may embed this Package's interpreter within
-  an executable of yours (by linking); this shall be construed as a mere
-  form of aggregation, provided that the complete Standard Version of the
-  interpreter is so embedded.
-  
-  6. The scripts and library files supplied as input to or produced as
-  output from the programs of this Package do not automatically fall
-  under the copyright of this Package, but belong to whoever generated
-  them, and may be sold commercially, and may be aggregated with this
-  Package.  If such scripts or library files are aggregated with this
-  Package via the so-called "undump" or "unexec" methods of producing a
-  binary executable image, then distribution of such an image shall
-  neither be construed as a distribution of this Package nor shall it
-  fall under the restrictions of Paragraphs 3 and 4, provided that you do
-  not represent such an executable image as a Standard Version of this
-  Package.
-  
-  7. C subroutines (or comparably compiled subroutines in other
-  languages) supplied by you and linked into this Package in order to
-  emulate subroutines and variables of the language defined by this
-  Package shall not be considered part of this Package, but are the
-  equivalent of input as in Paragraph 6, provided these subroutines do
-  not change the language in any way that would cause it to fail the
-  regression tests for the language.
-  
-  8. Aggregation of this Package with a commercial distribution is always
-  permitted provided that the use of this Package is embedded; that is,
-  when no overt attempt is made to make this Package's interfaces visible
-  to the end user of the commercial distribution.  Such use shall not be
-  construed as a distribution of this Package.
-  
-  9. The name of the Copyright Holder may not be used to endorse or promote
-  products derived from this software without specific prior written permission.
-  
-  10. THIS PACKAGE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
-  IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-  WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-  
-      The End
-
- 
- 
-
 shortcutbadger:
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -8318,6 +10780,138 @@
 April 10, 2009
 
 
+Animal Sniffer:
+
+The MIT License
+
+Copyright (c) 2008 Kohsuke Kawaguchi and codehaus.org.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+
+JSR 305:
+
+Copyright (c) 2007-2009, JSR305 expert group
+All rights reserved.
+
+http://www.opensource.org/licenses/bsd-license.php
+
+Redistribution and use in source and binary forms, with or without 
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice, 
+      this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright notice, 
+      this list of conditions and the following disclaimer in the documentation 
+      and/or other materials provided with the distribution.
+    * Neither the name of the JSR305 expert group nor the names of its 
+      contributors may be used to endorse or promote products derived from 
+      this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, 
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE 
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
+POSSIBILITY OF SUCH DAMAGE.
+
+
+Protobuf Nano:
+
+Copyright 2008, Google Inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+    * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+    * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Code generated by the Protocol Buffer compiler is owned by the owner
+of the input file used when generating it.  This code is not
+standalone and requires a support library to be linked with it.  This
+support library is itself covered by the above license.
+
+
+Checker Framework Annotations:
+
+A few parts of the Checker Framework have more permissive licenses.
+
+ * The annotations are licensed under the MIT License.  (The text of this
+   license appears below.)  More specifically, all the parts of the Checker
+   Framework that you might want to include with your own program use the
+   MIT License.  This is the checker-qual.jar file and all the files that
+   appear in it:  every file in a qual/ directory, plus NullnessUtils.java
+   and RegexUtil.java.  In addition, the cleanroom implementations of
+   third-party annotations, which the Checker Framework recognizes as
+   aliases for its own annotations, are licensed under the MIT License.
+
+===========================================================================
+
+MIT License:
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+===========================================================================
+
+
 Glide:
 
 Covers library/
@@ -8418,478 +11012,845 @@
 that this copyright notice remain intact.
 
 
-Animal Sniffer:
+carrierservices:
 
-The MIT License
+These components
+  com.google.android.rcs.core,
+  com.google.android.rcs.core.utils.CaseInsensitiveMap,
+  com.google.android.rcs.core.utils.DateTime,
+  com.google.android.rcs.core.utils.InetAddresses,
+  com.google.android.rcs.core.network.ConnectivityMonitor,
+  com.google.android.rcs.client.PrivateDataStorage,
+  com.google.android.rcs.client.utils.FastXmlSerializer,
+  com.google.android.rcs.client.utils.XmlUtils,
+  com.google.android.rcs.client.utils.QueuedWork
+are licensed under Apache v2.
 
-Copyright (c) 2008 Kohsuke Kawaguchi and codehaus.org.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+    http://www.apache.org/licenses/LICENSE-2.0
 
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
 
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
 
-Checker Framework:
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 
-The Checker Framework is licensed under the GNU General Public License,
-version 2 (GPL2), with the classpath exception.  The text of this license
-appears below.  This is the same license used for OpenJDK.
+   1. Definitions.
 
-A few parts of the Checker Framework have more permissive licenses.
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
 
- * The annotations are licensed under the MIT License.  (The text of this
-   license appears below.)  More specifically, all the parts of the Checker
-   Framework that you might want to include with your own program use the
-   MIT License.  This is the checker-qual.jar file and all the files that
-   appear in it:  every file in a qual/ directory, plus NullnessUtils.java
-   and RegexUtil.java.  In addition, the cleanroom implementations of
-   third-party annotations, which the Checker Framework recognizes as
-   aliases for its own annotations, are licensed under the MIT License.
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
 
- * The Maven plugin is dual-licensed (you may use whichever you prefer)
-   under GPL2 and the Apache License, version 2.0 (Apache2).  The text of
-   Apache2 appears in file maven-plugin/LICENSE.txt.  Maven itself uses
-   Apache2.
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
 
- * The Eclipse plugin is dual-licensed (you may use whichever you prefer)
-   under GPL2 and the Eclipse Public License Version 1.0 (EPL).  EPL
-   appears http://www.eclipse.org/org/documents/epl-v10.php.  Eclipse
-   itself uses EPL.
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
 
-Some external libraries that are included with the Checker Framework have
-different licenses.
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
 
- * javaparser is licensed under the LGPL.  (The javaparser source code
-   contains a file with the text of the GPL, but it is not clear why, since
-   javaparser does not use the GPL.)  See file javaparser/COPYING.LESSER
-   and the source code of all its files.
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
 
- * junit is licensed under the Common Public License v1.0 (see
-   http://www.junit.org/license), with parts (Hamcrest) licensed under the
-   BSD License (see LICENSE.txt in checkers/tests/junit.jar ).
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
 
- * plume-lib is licensed under the MIT License.
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
 
-The Checker Framework includes annotations for several libraries, in
-directory checkers/jdk/.  The only one that uses a different license than
-the GPL is Google Guava, which uses Apache2.
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
 
-===========================================================================
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
 
-The GNU General Public License (GPL)
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
 
-Version 2, June 1991
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
 
-Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
 
-Everyone is permitted to copy and distribute verbatim copies of this license
-document, but changing it is not allowed.
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
 
-Preamble
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
 
-The licenses for most software are designed to take away your freedom to share
-and change it.  By contrast, the GNU General Public License is intended to
-guarantee your freedom to share and change free software--to make sure the
-software is free for all its users.  This General Public License applies to
-most of the Free Software Foundation's software and to any other program whose
-authors commit to using it.  (Some other Free Software Foundation software is
-covered by the GNU Library General Public License instead.) You can apply it to
-your programs, too.
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
 
-When we speak of free software, we are referring to freedom, not price.  Our
-General Public Licenses are designed to make sure that you have the freedom to
-distribute copies of free software (and charge for this service if you wish),
-that you receive source code or can get it if you want it, that you can change
-the software or use pieces of it in new free programs; and that you know you
-can do these things.
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
 
-To protect your rights, we need to make restrictions that forbid anyone to deny
-you these rights or to ask you to surrender the rights.  These restrictions
-translate to certain responsibilities for you if you distribute copies of the
-software, or if you modify it.
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
 
-For example, if you distribute copies of such a program, whether gratis or for
-a fee, you must give the recipients all the rights that you have.  You must
-make sure that they, too, receive or can get the source code.  And you must
-show them these terms so they know their rights.
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
 
-We protect your rights with two steps: (1) copyright the software, and (2)
-offer you this license which gives you legal permission to copy, distribute
-and/or modify the software.
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
 
-Also, for each author's protection and ours, we want to make certain that
-everyone understands that there is no warranty for this free software.  If the
-software is modified by someone else and passed on, we want its recipients to
-know that what they have is not the original, so that any problems introduced
-by others will not reflect on the original authors' reputations.
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
 
-Finally, any free program is threatened constantly by software patents.  We
-wish to avoid the danger that redistributors of a free program will
-individually obtain patent licenses, in effect making the program proprietary.
-To prevent this, we have made it clear that any patent must be licensed for
-everyone's free use or not licensed at all.
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
 
-The precise terms and conditions for copying, distribution and modification
-follow.
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
 
-TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+   END OF TERMS AND CONDITIONS
 
-0. This License applies to any program or other work which contains a notice
-placed by the copyright holder saying it may be distributed under the terms of
-this General Public License.  The "Program", below, refers to any such program
-or work, and a "work based on the Program" means either the Program or any
-derivative work under copyright law: that is to say, a work containing the
-Program or a portion of it, either verbatim or with modifications and/or
-translated into another language.  (Hereinafter, translation is included
-without limitation in the term "modification".) Each licensee is addressed as
-"you".
+===============================================================================
 
-Activities other than copying, distribution and modification are not covered by
-this License; they are outside its scope.  The act of running the Program is
-not restricted, and the output from the Program is covered only if its contents
-constitute a work based on the Program (independent of having been made by
-running the Program).  Whether that is true depends on what the Program does.
+These components
+  com.google.android.rcs.core.utils.FastBase64,
+  com.google.android.rcs.core.utils.LibraryLoaderHelper
+are licensed under BSD.
 
-1. You may copy and distribute verbatim copies of the Program's source code as
-you receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice and
-disclaimer of warranty; keep intact all the notices that refer to this License
-and to the absence of any warranty; and give any other recipients of the
-Program a copy of this License along with the Program.
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
 
-You may charge a fee for the physical act of transferring a copy, and you may
-at your option offer warranty protection in exchange for a fee.
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
 
-2. You may modify your copy or copies of the Program or any portion of it, thus
-forming a work based on the Program, and copy and distribute such modifications
-or work under the terms of Section 1 above, provided that you also meet all of
-these conditions:
+   * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
 
-    a) You must cause the modified files to carry prominent notices stating
-    that you changed the files and the date of any change.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-    b) You must cause any work that you distribute or publish, that in whole or
-    in part contains or is derived from the Program or any part thereof, to be
-    licensed as a whole at no charge to all third parties under the terms of
-    this License.
 
-    c) If the modified program normally reads commands interactively when run,
-    you must cause it, when started running for such interactive use in the
-    most ordinary way, to print or display an announcement including an
-    appropriate copyright notice and a notice that there is no warranty (or
-    else, saying that you provide a warranty) and that users may redistribute
-    the program under these conditions, and telling the user how to view a copy
-    of this License.  (Exception: if the Program itself is interactive but does
-    not normally print such an announcement, your work based on the Program is
-    not required to print an announcement.)
+jibercsclient:
 
-These requirements apply to the modified work as a whole.  If identifiable
-sections of that work are not derived from the Program, and can be reasonably
-considered independent and separate works in themselves, then this License, and
-its terms, do not apply to those sections when you distribute them as separate
-works.  But when you distribute the same sections as part of a whole which is a
-work based on the Program, the distribution of the whole must be on the terms
-of this License, whose permissions for other licensees extend to the entire
-whole, and thus to each and every part regardless of who wrote it.
+These components
+  com.google.android.rcs.core,
+  com.google.android.rcs.core.utils.CaseInsensitiveMap,
+  com.google.android.rcs.core.utils.DateTime,
+  com.google.android.rcs.core.utils.InetAddresses,
+  com.google.android.rcs.core.network.ConnectivityMonitor,
+  com.google.android.rcs.client.PrivateDataStorage,
+  com.google.android.rcs.client.utils.FastXmlSerializer,
+  com.google.android.rcs.client.utils.XmlUtils,
+  com.google.android.rcs.client.utils.QueuedWork
+are licensed under Apache v2.
 
-Thus, it is not the intent of this section to claim rights or contest your
-rights to work written entirely by you; rather, the intent is to exercise the
-right to control the distribution of derivative or collective works based on
-the Program.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
 
-In addition, mere aggregation of another work not based on the Program with the
-Program (or with a work based on the Program) on a volume of a storage or
-distribution medium does not bring the other work under the scope of this
-License.
+    http://www.apache.org/licenses/LICENSE-2.0
 
-3. You may copy and distribute the Program (or a work based on it, under
-Section 2) in object code or executable form under the terms of Sections 1 and
-2 above provided that you also do one of the following:
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
 
-    a) Accompany it with the complete corresponding machine-readable source
-    code, which must be distributed under the terms of Sections 1 and 2 above
-    on a medium customarily used for software interchange; or,
 
-    b) Accompany it with a written offer, valid for at least three years, to
-    give any third party, for a charge no more than your cost of physically
-    performing source distribution, a complete machine-readable copy of the
-    corresponding source code, to be distributed under the terms of Sections 1
-    and 2 above on a medium customarily used for software interchange; or,
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
 
-    c) Accompany it with the information you received as to the offer to
-    distribute corresponding source code.  (This alternative is allowed only
-    for noncommercial distribution and only if you received the program in
-    object code or executable form with such an offer, in accord with
-    Subsection b above.)
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 
-The source code for a work means the preferred form of the work for making
-modifications to it.  For an executable work, complete source code means all
-the source code for all modules it contains, plus any associated interface
-definition files, plus the scripts used to control compilation and installation
-of the executable.  However, as a special exception, the source code
-distributed need not include anything that is normally distributed (in either
-source or binary form) with the major components (compiler, kernel, and so on)
-of the operating system on which the executable runs, unless that component
-itself accompanies the executable.
+   1. Definitions.
 
-If distribution of executable or object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the source
-code from the same place counts as distribution of the source code, even though
-third parties are not compelled to copy the source along with the object code.
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
 
-4. You may not copy, modify, sublicense, or distribute the Program except as
-expressly provided under this License.  Any attempt otherwise to copy, modify,
-sublicense or distribute the Program is void, and will automatically terminate
-your rights under this License.  However, parties who have received copies, or
-rights, from you under this License will not have their licenses terminated so
-long as such parties remain in full compliance.
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
 
-5. You are not required to accept this License, since you have not signed it.
-However, nothing else grants you permission to modify or distribute the Program
-or its derivative works.  These actions are prohibited by law if you do not
-accept this License.  Therefore, by modifying or distributing the Program (or
-any work based on the Program), you indicate your acceptance of this License to
-do so, and all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
 
-6. Each time you redistribute the Program (or any work based on the Program),
-the recipient automatically receives a license from the original licensor to
-copy, distribute or modify the Program subject to these terms and conditions.
-You may not impose any further restrictions on the recipients' exercise of the
-rights granted herein.  You are not responsible for enforcing compliance by
-third parties to this License.
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
 
-7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues), conditions
-are imposed on you (whether by court order, agreement or otherwise) that
-contradict the conditions of this License, they do not excuse you from the
-conditions of this License.  If you cannot distribute so as to satisfy
-simultaneously your obligations under this License and any other pertinent
-obligations, then as a consequence you may not distribute the Program at all.
-For example, if a patent license would not permit royalty-free redistribution
-of the Program by all those who receive copies directly or indirectly through
-you, then the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
 
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply and
-the section as a whole is intended to apply in other circumstances.
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
 
-It is not the purpose of this section to induce you to infringe any patents or
-other property right claims or to contest validity of any such claims; this
-section has the sole purpose of protecting the integrity of the free software
-distribution system, which is implemented by public license practices.  Many
-people have made generous contributions to the wide range of software
-distributed through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing to
-distribute software through any other system and a licensee cannot impose that
-choice.
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
 
-This section is intended to make thoroughly clear what is believed to be a
-consequence of the rest of this License.
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
 
-8. If the distribution and/or use of the Program is restricted in certain
-countries either by patents or by copyrighted interfaces, the original
-copyright holder who places the Program under this License may add an explicit
-geographical distribution limitation excluding those countries, so that
-distribution is permitted only in or among countries not thus excluded.  In
-such case, this License incorporates the limitation as if written in the body
-of this License.
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
 
-9. The Free Software Foundation may publish revised and/or new versions of the
-General Public License from time to time.  Such new versions will be similar in
-spirit to the present version, but may differ in detail to address new problems
-or concerns.
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
 
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any later
-version", you have the option of following the terms and conditions either of
-that version or of any later version published by the Free Software Foundation.
-If the Program does not specify a version number of this License, you may
-choose any version ever published by the Free Software Foundation.
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
 
-10. If you wish to incorporate parts of the Program into other free programs
-whose distribution conditions are different, write to the author to ask for
-permission.  For software which is copyrighted by the Free Software Foundation,
-write to the Free Software Foundation; we sometimes make exceptions for this.
-Our decision will be guided by the two goals of preserving the free status of
-all derivatives of our free software and of promoting the sharing and reuse of
-software generally.
+   END OF TERMS AND CONDITIONS
 
-NO WARRANTY
+===============================================================================
 
-11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR
-THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN OTHERWISE
-STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE
-PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED,
-INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND
-PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE,
-YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+These components
+  com.google.android.rcs.core.utils.FastBase64,
+  com.google.android.rcs.core.utils.LibraryLoaderHelper
+are licensed under BSD.
 
-12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL
-ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE
-PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR
-INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA
-BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER
-OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
 
-END OF TERMS AND CONDITIONS
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
 
-How to Apply These Terms to Your New Programs
+   * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
 
-If you develop a new program, and you want it to be of the greatest possible
-use to the public, the best way to achieve this is to make it free software
-which everyone can redistribute and change under these terms.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-To do so, attach the following notices to the program.  It is safest to attach
-them to the start of each source file to most effectively convey the exclusion
-of warranty; and each file should have at least the "copyright" line and a
-pointer to where the full notice is found.
 
-    One line to give the program's name and a brief idea of what it does.
+mime4j:
 
-    Copyright (C) <year> <name of author>
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
 
-    This program is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the Free
-    Software Foundation; either version 2 of the License, or (at your option)
-    any later version.
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 
-    This program is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-    more details.
+   1. Definitions.
 
-    You should have received a copy of the GNU General Public License along
-    with this program; if not, write to the Free Software Foundation, Inc., 59
-    Temple Place, Suite 330, Boston, MA 02111-1307 USA
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
 
-Also add information on how to contact you by electronic and paper mail.
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
 
-If the program is interactive, make it output a short notice like this when it
-starts in an interactive mode:
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
 
-    Gnomovision version 69, Copyright (C) year name of author Gnomovision comes
-    with ABSOLUTELY NO WARRANTY; for details type 'show w'.  This is free
-    software, and you are welcome to redistribute it under certain conditions;
-    type 'show c' for details.
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
 
-The hypothetical commands 'show w' and 'show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may be
-called something other than 'show w' and 'show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
 
-You should also get your employer (if you work as a programmer) or your school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.  Here
-is a sample; alter the names:
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
 
-    Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-    'Gnomovision' (which makes passes at compilers) written by James Hacker.
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
 
-    signature of Ty Coon, 1 April 1989
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
 
-    Ty Coon, President of Vice
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
 
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General Public
-License instead of this License.
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
 
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
 
-"CLASSPATH" EXCEPTION TO THE GPL
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
 
-Certain source files distributed by Oracle America and/or its affiliates are
-subject to the following clarification and special exception to the GPL, but
-only where Oracle has expressly included in the particular source file's header
-the words "Oracle designates this particular file as subject to the "Classpath"
-exception as provided by Oracle in the LICENSE file that accompanied this code."
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
 
-    Linking this library statically or dynamically with other modules is making
-    a combined work based on this library.  Thus, the terms and conditions of
-    the GNU General Public License cover the whole combination.
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
 
-    As a special exception, the copyright holders of this library give you
-    permission to link this library with independent modules to produce an
-    executable, regardless of the license terms of these independent modules,
-    and to copy and distribute the resulting executable under terms of your
-    choice, provided that you also meet, for each linked independent module,
-    the terms and conditions of the license of that module.  An independent
-    module is a module which is not derived from or based on this library.  If
-    you modify this library, you may extend this exception to your version of
-    the library, but you are not obligated to do so.  If you do not wish to do
-    so, delete this exception statement from your version.
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
 
-===========================================================================
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
 
-MIT License:
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
 
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
 
-===========================================================================
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
 
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
 
-JSR 305:
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
 
-Copyright (c) 2007-2009, JSR305 expert group
-All rights reserved.
+   END OF TERMS AND CONDITIONS
+   
+   
+   
 
-http://www.opensource.org/licenses/bsd-license.php
+   THIS PRODUCT ALSO INCLUDES THIRD PARTY SOFTWARE REDISTRIBUTED UNDER THE
+   FOLLOWING LICENSES:
 
-Redistribution and use in source and binary forms, with or without 
-modification, are permitted provided that the following conditions are met:
+ Apache Commons Logging, 
+    The Apache Software License, Version 1.1 (commons-logging-1.1.1.jar)
+   
+   The Apache Software License, Version 1.1
+  
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+  
+   1. Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+  
+   2. Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in
+      the documentation and/or other materials provided with the
+      distribution.
+  
+   3. The end-user documentation included with the redistribution,
+      if any, must include the following acknowledgment:
+         "This product includes software developed by the
+          Apache Software Foundation (http://www.apache.org/)."
+      Alternately, this acknowledgment may appear in the software itself,
+      if and wherever such third-party acknowledgments normally appear.
+  
+   4. The names "Apache" and "Apache Software Foundation" must
+      not be used to endorse or promote products derived from this
+      software without prior written permission. For written
+      permission, please contact apache@apache.org.
+  
+   5. Products derived from this software may not be called "Apache",
+      nor may "Apache" appear in their name, without prior written
+      permission of the Apache Software Foundation.
+  
+   THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+   WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+   OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+   DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+   ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+   USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+   ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+   OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+   OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+   SUCH DAMAGE.
+  
 
-    * Redistributions of source code must retain the above copyright notice, 
-      this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright notice, 
-      this list of conditions and the following disclaimer in the documentation 
-      and/or other materials provided with the distribution.
-    * Neither the name of the JSR305 expert group nor the names of its 
-      contributors may be used to endorse or promote products derived from 
-      this software without specific prior written permission.
+ Test messages from the Perl-MIME-Tools project,
+ 
+      The "Artistic License"
+  
+      Preamble
+  
+  The intent of this document is to state the conditions under which a
+  Package may be copied, such that the Copyright Holder maintains some
+  semblance of artistic control over the development of the package,
+  while giving the users of the package the right to use and distribute
+  the Package in a more-or-less customary fashion, plus the right to make
+  reasonable modifications.
+  
+  Definitions:
+  
+   "Package" refers to the collection of files distributed by the
+   Copyright Holder, and derivatives of that collection of files
+   created through textual modification.
+  
+   "Standard Version" refers to such a Package if it has not been
+   modified, or has been modified in accordance with the wishes
+   of the Copyright Holder as specified below.
+  
+   "Copyright Holder" is whoever is named in the copyright or
+   copyrights for the package.
+  
+   "You" is you, if you're thinking about copying or distributing
+   this Package.
+  
+   "Reasonable copying fee" is whatever you can justify on the
+   basis of media cost, duplication charges, time of people involved,
+   and so on.  (You will not be required to justify it to the
+   Copyright Holder, but only to the computing community at large
+   as a market that must bear the fee.)
+  
+   "Freely Available" means that no fee is charged for the item
+   itself, though there may be fees involved in handling the item.
+   It also means that recipients of the item may redistribute it
+   under the same conditions they received it.
+  
+  1. You may make and give away verbatim copies of the source form of the
+  Standard Version of this Package without restriction, provided that you
+  duplicate all of the original copyright notices and associated disclaimers.
+  
+  2. You may apply bug fixes, portability fixes and other modifications
+  derived from the Public Domain or from the Copyright Holder.  A Package
+  modified in such a way shall still be considered the Standard Version.
+  
+  3. You may otherwise modify your copy of this Package in any way, provided
+  that you insert a prominent notice in each changed file stating how and
+  when you changed that file, and provided that you do at least ONE of the
+  following:
+  
+      a) place your modifications in the Public Domain or otherwise make them
+      Freely Available, such as by posting said modifications to Usenet or
+      an equivalent medium, or placing the modifications on a major archive
+      site such as uunet.uu.net, or by allowing the Copyright Holder to include
+      your modifications in the Standard Version of the Package.
+  
+      b) use the modified Package only within your corporation or organization.
+  
+      c) rename any non-standard executables so the names do not conflict
+      with standard executables, which must also be provided, and provide
+      a separate manual page for each non-standard executable that clearly
+      documents how it differs from the Standard Version.
+  
+      d) make other distribution arrangements with the Copyright Holder.
+  
+  4. You may distribute the programs of this Package in object code or
+  executable form, provided that you do at least ONE of the following:
+  
+      a) distribute a Standard Version of the executables and library files,
+      together with instructions (in the manual page or equivalent) on where
+      to get the Standard Version.
+  
+      b) accompany the distribution with the machine-readable source of
+      the Package with your modifications.
+  
+      c) give non-standard executables non-standard names, and clearly
+      document the differences in manual pages (or equivalent), together
+      with instructions on where to get the Standard Version.
+  
+      d) make other distribution arrangements with the Copyright Holder.
+  
+  5. You may charge a reasonable copying fee for any distribution of this
+  Package.  You may charge any fee you choose for support of this
+  Package.  You may not charge a fee for this Package itself.  However,
+  you may distribute this Package in aggregate with other (possibly
+  commercial) programs as part of a larger (possibly commercial) software
+  distribution provided that you do not advertise this Package as a
+  product of your own.  You may embed this Package's interpreter within
+  an executable of yours (by linking); this shall be construed as a mere
+  form of aggregation, provided that the complete Standard Version of the
+  interpreter is so embedded.
+  
+  6. The scripts and library files supplied as input to or produced as
+  output from the programs of this Package do not automatically fall
+  under the copyright of this Package, but belong to whoever generated
+  them, and may be sold commercially, and may be aggregated with this
+  Package.  If such scripts or library files are aggregated with this
+  Package via the so-called "undump" or "unexec" methods of producing a
+  binary executable image, then distribution of such an image shall
+  neither be construed as a distribution of this Package nor shall it
+  fall under the restrictions of Paragraphs 3 and 4, provided that you do
+  not represent such an executable image as a Standard Version of this
+  Package.
+  
+  7. C subroutines (or comparably compiled subroutines in other
+  languages) supplied by you and linked into this Package in order to
+  emulate subroutines and variables of the language defined by this
+  Package shall not be considered part of this Package, but are the
+  equivalent of input as in Paragraph 6, provided these subroutines do
+  not change the language in any way that would cause it to fail the
+  regression tests for the language.
+  
+  8. Aggregation of this Package with a commercial distribution is always
+  permitted provided that the use of this Package is embedded; that is,
+  when no overt attempt is made to make this Package's interfaces visible
+  to the end user of the commercial distribution.  Such use shall not be
+  construed as a distribution of this Package.
+  
+  9. The name of the Copyright Holder may not be used to endorse or promote
+  products derived from this software without specific prior written permission.
+  
+  10. THIS PACKAGE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
+  IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+  WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+  
+      The End
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, 
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE 
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
-POSSIBILITY OF SUCH DAMAGE.
+ 
+ 
\ No newline at end of file
diff --git a/java/com/android/dialer/about/res/values-af/strings.xml b/java/com/android/dialer/about/res/values-af/strings.xml
index 54bb158..b93cd10 100644
--- a/java/com/android/dialer/about/res/values-af/strings.xml
+++ b/java/com/android/dialer/about/res/values-af/strings.xml
@@ -1,9 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="build_version_label" msgid="3876300343684966840">"Bouweergawe"</string>
-    <string name="open_source_license_detail_label" msgid="2860076509914623912">"Lisensiebesonderhede vir oopbronsagteware"</string>
-    <string name="licenseActivityLabel" msgid="8258726177561826066">"Oopbronlisensies"</string>
-    <string name="privacy_policy_label" msgid="6567158248788870442">"Privaatheidsbeleid"</string>
-    <string name="terms_of_service_label" msgid="6788126078040996084">"Diensbepalings"</string>
+<resources>
+  <string name="build_version_label">Bouweergawe</string>
+  <string name="open_source_license_detail_label">Lisensiebesonderhede vir oopbronsagteware</string>
+  <string name="licenseActivityLabel">Oopbronlisensies</string>
+  <string name="privacy_policy_label">Privaatheidsbeleid</string>
+  <string name="terms_of_service_label">Diensbepalings</string>
 </resources>
diff --git a/java/com/android/dialer/about/res/values-am/strings.xml b/java/com/android/dialer/about/res/values-am/strings.xml
index d959fec..c9d53d4 100644
--- a/java/com/android/dialer/about/res/values-am/strings.xml
+++ b/java/com/android/dialer/about/res/values-am/strings.xml
@@ -1,9 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="build_version_label" msgid="3876300343684966840">"የግንብ ሥሪት"</string>
-    <string name="open_source_license_detail_label" msgid="2860076509914623912">"ለክፍት ምንጭ ሶፍትዌር የፈቃድ ዝርዝሮች"</string>
-    <string name="licenseActivityLabel" msgid="8258726177561826066">"የክፍት ምንጭ ፈቃዶች"</string>
-    <string name="privacy_policy_label" msgid="6567158248788870442">"የግላዊነት መመሪያ"</string>
-    <string name="terms_of_service_label" msgid="6788126078040996084">"የአገልግሎት ውል"</string>
+<resources>
+  <string name="build_version_label">የግንብ ሥሪት</string>
+  <string name="open_source_license_detail_label">ለክፍት ምንጭ ሶፍትዌር የፈቃድ ዝርዝሮች</string>
+  <string name="licenseActivityLabel">የክፍት ምንጭ ፈቃዶች</string>
+  <string name="privacy_policy_label">የግላዊነት መመሪያ</string>
+  <string name="terms_of_service_label">የአገልግሎት ውል</string>
 </resources>
diff --git a/java/com/android/dialer/about/res/values-ar/strings.xml b/java/com/android/dialer/about/res/values-ar/strings.xml
index bece5e9..f3beb67 100644
--- a/java/com/android/dialer/about/res/values-ar/strings.xml
+++ b/java/com/android/dialer/about/res/values-ar/strings.xml
@@ -1,9 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="build_version_label" msgid="3876300343684966840">"نسخة الإصدار"</string>
-    <string name="open_source_license_detail_label" msgid="2860076509914623912">"تفاصيل الترخيص للبرامج مفتوحة المصدر"</string>
-    <string name="licenseActivityLabel" msgid="8258726177561826066">"تراخيص البرامج المفتوحة المصدر"</string>
-    <string name="privacy_policy_label" msgid="6567158248788870442">"سياسة الخصوصية"</string>
-    <string name="terms_of_service_label" msgid="6788126078040996084">"بنود الخدمة"</string>
+<resources>
+  <string name="build_version_label">نسخة الإصدار</string>
+  <string name="open_source_license_detail_label">تفاصيل الترخيص للبرامج مفتوحة المصدر</string>
+  <string name="licenseActivityLabel">تراخيص البرامج المفتوحة المصدر</string>
+  <string name="privacy_policy_label">سياسة الخصوصية</string>
+  <string name="terms_of_service_label">بنود الخدمة</string>
 </resources>
diff --git a/java/com/android/dialer/about/res/values-az/strings.xml b/java/com/android/dialer/about/res/values-az/strings.xml
index 8dc7ee8..6d42e00 100644
--- a/java/com/android/dialer/about/res/values-az/strings.xml
+++ b/java/com/android/dialer/about/res/values-az/strings.xml
@@ -1,9 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="build_version_label" msgid="3876300343684966840">"Quruluş versiyası"</string>
-    <string name="open_source_license_detail_label" msgid="2860076509914623912">"Açıq mənbəli proqram təminatı üçün lisenziya detalları"</string>
-    <string name="licenseActivityLabel" msgid="8258726177561826066">"Mənbə lisenziyalarını açın"</string>
-    <string name="privacy_policy_label" msgid="6567158248788870442">"Məxfilik siyasəti"</string>
-    <string name="terms_of_service_label" msgid="6788126078040996084">"Xidmət şərtləri"</string>
+<resources>
+  <string name="build_version_label">Quruluş versiyası</string>
+  <string name="open_source_license_detail_label">Açıq mənbəli proqram təminatı üçün lisenziya detalları</string>
+  <string name="licenseActivityLabel">Mənbə lisenziyalarını açın</string>
+  <string name="privacy_policy_label">Məxfilik siyasəti</string>
+  <string name="terms_of_service_label">Xidmət şərtləri</string>
 </resources>
diff --git a/java/com/android/dialer/about/res/values-b+sr+Latn/strings.xml b/java/com/android/dialer/about/res/values-b+sr+Latn/strings.xml
index ba9da33..35cafe7 100644
--- a/java/com/android/dialer/about/res/values-b+sr+Latn/strings.xml
+++ b/java/com/android/dialer/about/res/values-b+sr+Latn/strings.xml
@@ -1,9 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="build_version_label" msgid="3876300343684966840">"Verzija"</string>
-    <string name="open_source_license_detail_label" msgid="2860076509914623912">"Podaci o licenci za softver otvorenog koda"</string>
-    <string name="licenseActivityLabel" msgid="8258726177561826066">"Licence otvorenog koda"</string>
-    <string name="privacy_policy_label" msgid="6567158248788870442">"Politika privatnosti"</string>
-    <string name="terms_of_service_label" msgid="6788126078040996084">"Uslovi korišćenja usluge"</string>
+<resources>
+  <string name="build_version_label">Verzija</string>
+  <string name="open_source_license_detail_label">Podaci o licenci za softver otvorenog koda</string>
+  <string name="licenseActivityLabel">Licence otvorenog koda</string>
+  <string name="privacy_policy_label">Politika privatnosti</string>
+  <string name="terms_of_service_label">Uslovi korišćenja usluge</string>
 </resources>
diff --git a/java/com/android/dialer/about/res/values-be/strings.xml b/java/com/android/dialer/about/res/values-be/strings.xml
index 3a77608..9767b51 100644
--- a/java/com/android/dialer/about/res/values-be/strings.xml
+++ b/java/com/android/dialer/about/res/values-be/strings.xml
@@ -1,9 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="build_version_label" msgid="3876300343684966840">"Версія зборкі"</string>
-    <string name="open_source_license_detail_label" msgid="2860076509914623912">"Звесткі аб ліцэнзіі на праграмнае забеспячэнне з адкрытым зыходным кодам"</string>
-    <string name="licenseActivityLabel" msgid="8258726177561826066">"Ліцэнзіі на ПЗ з адкрытым зыходным кодам"</string>
-    <string name="privacy_policy_label" msgid="6567158248788870442">"Палітыка прыватнасці"</string>
-    <string name="terms_of_service_label" msgid="6788126078040996084">"Умовы абслугоўвання"</string>
+<resources>
+  <string name="build_version_label">Версія зборкі</string>
+  <string name="open_source_license_detail_label">Звесткі аб ліцэнзіі на праграмнае забеспячэнне з адкрытым зыходным кодам</string>
+  <string name="licenseActivityLabel">Ліцэнзіі на ПЗ з адкрытым зыходным кодам</string>
+  <string name="privacy_policy_label">Палітыка прыватнасці</string>
+  <string name="terms_of_service_label">Умовы абслугоўвання</string>
 </resources>
diff --git a/java/com/android/dialer/about/res/values-bg/strings.xml b/java/com/android/dialer/about/res/values-bg/strings.xml
index e591961..dac25d1 100644
--- a/java/com/android/dialer/about/res/values-bg/strings.xml
+++ b/java/com/android/dialer/about/res/values-bg/strings.xml
@@ -1,9 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="build_version_label" msgid="3876300343684966840">"Версия"</string>
-    <string name="open_source_license_detail_label" msgid="2860076509914623912">"Подробности за лицензите на софтуера с отворен код"</string>
-    <string name="licenseActivityLabel" msgid="8258726177561826066">"Лицензи за отворен код"</string>
-    <string name="privacy_policy_label" msgid="6567158248788870442">"Декларация за поверителност"</string>
-    <string name="terms_of_service_label" msgid="6788126078040996084">"Общи условия"</string>
+<resources>
+  <string name="build_version_label">Версия</string>
+  <string name="open_source_license_detail_label">Подробности за лицензите на софтуера с отворен код</string>
+  <string name="licenseActivityLabel">Лицензи за отворен код</string>
+  <string name="privacy_policy_label">Декларация за поверителност</string>
+  <string name="terms_of_service_label">Общи условия</string>
 </resources>
diff --git a/java/com/android/dialer/about/res/values-bn/strings.xml b/java/com/android/dialer/about/res/values-bn/strings.xml
index 4b47b85..fafa74f 100644
--- a/java/com/android/dialer/about/res/values-bn/strings.xml
+++ b/java/com/android/dialer/about/res/values-bn/strings.xml
@@ -1,9 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="build_version_label" msgid="3876300343684966840">"বিল্ড সংস্করণ"</string>
-    <string name="open_source_license_detail_label" msgid="2860076509914623912">"মুক্ত উৎস সফ্টওয়্যারের লাইসেন্স বিবরণ"</string>
-    <string name="licenseActivityLabel" msgid="8258726177561826066">"মুক্ত উৎস লাইসেন্স"</string>
-    <string name="privacy_policy_label" msgid="6567158248788870442">"গোপনীয়তা নীতি"</string>
-    <string name="terms_of_service_label" msgid="6788126078040996084">"পরিষেবার শর্তাবলী"</string>
+<resources>
+  <string name="build_version_label">বিল্ড সংস্করণ</string>
+  <string name="open_source_license_detail_label">মুক্ত উৎস সফ্টওয়্যারের লাইসেন্স বিবরণ</string>
+  <string name="licenseActivityLabel">ওপেন সোর্স লাইসেন্স</string>
+  <string name="privacy_policy_label">গোপনীয়তা নীতি</string>
+  <string name="terms_of_service_label">পরিষেবার শর্তাবলী</string>
 </resources>
diff --git a/java/com/android/dialer/about/res/values-bs/strings.xml b/java/com/android/dialer/about/res/values-bs/strings.xml
index a4a9af5..775c59b 100644
--- a/java/com/android/dialer/about/res/values-bs/strings.xml
+++ b/java/com/android/dialer/about/res/values-bs/strings.xml
@@ -1,9 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="build_version_label" msgid="3876300343684966840">"Međuverzija aplikacije"</string>
-    <string name="open_source_license_detail_label" msgid="2860076509914623912">"Detalji o licenci za softver otvorenog koda"</string>
-    <string name="licenseActivityLabel" msgid="8258726177561826066">"Licence otvorenog koda"</string>
-    <string name="privacy_policy_label" msgid="6567158248788870442">"Pravila privatnosti"</string>
-    <string name="terms_of_service_label" msgid="6788126078040996084">"Uslovi korištenja usluge"</string>
+<resources>
+  <string name="build_version_label">Međuverzija aplikacije</string>
+  <string name="open_source_license_detail_label">Detalji o licenci za softver otvorenog koda</string>
+  <string name="licenseActivityLabel">Licence otvorenog koda</string>
+  <string name="privacy_policy_label">Pravila privatnosti</string>
+  <string name="terms_of_service_label">Uslovi korištenja usluge</string>
 </resources>
diff --git a/java/com/android/dialer/about/res/values-ca/strings.xml b/java/com/android/dialer/about/res/values-ca/strings.xml
index 4883ea7..ef2d641 100644
--- a/java/com/android/dialer/about/res/values-ca/strings.xml
+++ b/java/com/android/dialer/about/res/values-ca/strings.xml
@@ -1,9 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="build_version_label" msgid="3876300343684966840">"Versió de la compilació"</string>
-    <string name="open_source_license_detail_label" msgid="2860076509914623912">"Detalls de la llicència del programari lliure"</string>
-    <string name="licenseActivityLabel" msgid="8258726177561826066">"Llicències de programari lliure"</string>
-    <string name="privacy_policy_label" msgid="6567158248788870442">"Política de privadesa"</string>
-    <string name="terms_of_service_label" msgid="6788126078040996084">"Condicions del servei"</string>
+<resources>
+  <string name="build_version_label">Versió de la compilació</string>
+  <string name="open_source_license_detail_label">Detalls de la llicència del programari lliure</string>
+  <string name="licenseActivityLabel">Llicències de programari lliure</string>
+  <string name="privacy_policy_label">Política de privadesa</string>
+  <string name="terms_of_service_label">Condicions del servei</string>
 </resources>
diff --git a/java/com/android/dialer/about/res/values-cs/strings.xml b/java/com/android/dialer/about/res/values-cs/strings.xml
index 177fbec..d93ac12 100644
--- a/java/com/android/dialer/about/res/values-cs/strings.xml
+++ b/java/com/android/dialer/about/res/values-cs/strings.xml
@@ -1,9 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="build_version_label" msgid="3876300343684966840">"Verze sestavení"</string>
-    <string name="open_source_license_detail_label" msgid="2860076509914623912">"Podrobnosti o licencích pro software open source"</string>
-    <string name="licenseActivityLabel" msgid="8258726177561826066">"Licence open source"</string>
-    <string name="privacy_policy_label" msgid="6567158248788870442">"Zásady ochrany soukromí"</string>
-    <string name="terms_of_service_label" msgid="6788126078040996084">"Smluvní podmínky"</string>
+<resources>
+  <string name="build_version_label">Verze sestavení</string>
+  <string name="open_source_license_detail_label">Podrobnosti o licencích pro software open source</string>
+  <string name="licenseActivityLabel">Licence open source</string>
+  <string name="privacy_policy_label">Zásady ochrany soukromí</string>
+  <string name="terms_of_service_label">Smluvní podmínky</string>
 </resources>
diff --git a/java/com/android/dialer/about/res/values-da/strings.xml b/java/com/android/dialer/about/res/values-da/strings.xml
index cf86fae..aaf2ac8 100644
--- a/java/com/android/dialer/about/res/values-da/strings.xml
+++ b/java/com/android/dialer/about/res/values-da/strings.xml
@@ -1,9 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="build_version_label" msgid="3876300343684966840">"Build-version"</string>
-    <string name="open_source_license_detail_label" msgid="2860076509914623912">"Licensoplysninger til open source-software"</string>
-    <string name="licenseActivityLabel" msgid="8258726177561826066">"Open source-licenser"</string>
-    <string name="privacy_policy_label" msgid="6567158248788870442">"Privatlivspolitik"</string>
-    <string name="terms_of_service_label" msgid="6788126078040996084">"Servicevilkår"</string>
+<resources>
+  <string name="build_version_label">Build-version</string>
+  <string name="open_source_license_detail_label">Licensoplysninger til open source-software</string>
+  <string name="licenseActivityLabel">Open source-licenser</string>
+  <string name="privacy_policy_label">Privatlivspolitik</string>
+  <string name="terms_of_service_label">Servicevilkår</string>
 </resources>
diff --git a/java/com/android/dialer/about/res/values-de/strings.xml b/java/com/android/dialer/about/res/values-de/strings.xml
index cbf97a2..fd86c08 100644
--- a/java/com/android/dialer/about/res/values-de/strings.xml
+++ b/java/com/android/dialer/about/res/values-de/strings.xml
@@ -1,9 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="build_version_label" msgid="3876300343684966840">"Build-Version"</string>
-    <string name="open_source_license_detail_label" msgid="2860076509914623912">"Lizenzdetails für Open-Source-Software"</string>
-    <string name="licenseActivityLabel" msgid="8258726177561826066">"Open-Source-Lizenzen"</string>
-    <string name="privacy_policy_label" msgid="6567158248788870442">"Datenschutzerklärung"</string>
-    <string name="terms_of_service_label" msgid="6788126078040996084">"Nutzungsbedingungen"</string>
+<resources>
+  <string name="build_version_label">Build-Version</string>
+  <string name="open_source_license_detail_label">Lizenzdetails für Open-Source-Software</string>
+  <string name="licenseActivityLabel">Open Source-Lizenzen</string>
+  <string name="privacy_policy_label">Datenschutzerklärung</string>
+  <string name="terms_of_service_label">Nutzungsbedingungen</string>
 </resources>
diff --git a/java/com/android/dialer/about/res/values-el/strings.xml b/java/com/android/dialer/about/res/values-el/strings.xml
index 1fab3eb..0dde137 100644
--- a/java/com/android/dialer/about/res/values-el/strings.xml
+++ b/java/com/android/dialer/about/res/values-el/strings.xml
@@ -1,9 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="build_version_label" msgid="3876300343684966840">"Έκδοση build"</string>
-    <string name="open_source_license_detail_label" msgid="2860076509914623912">"Λεπτομέρειες άδειας λογισμικού ανοικτού κώδικα"</string>
-    <string name="licenseActivityLabel" msgid="8258726177561826066">"Άδειες λογισμικού ανοικτού κώδικα"</string>
-    <string name="privacy_policy_label" msgid="6567158248788870442">"Πολιτική απορρήτου"</string>
-    <string name="terms_of_service_label" msgid="6788126078040996084">"Όροι Παροχής Υπηρεσιών"</string>
+<resources>
+  <string name="build_version_label">Έκδοση build</string>
+  <string name="open_source_license_detail_label">Λεπτομέρειες άδειας λογισμικού ανοικτού κώδικα</string>
+  <string name="licenseActivityLabel">Άδειες λογισμικού ανοικτού κώδικα</string>
+  <string name="privacy_policy_label">Πολιτική απορρήτου</string>
+  <string name="terms_of_service_label">Όροι Παροχής Υπηρεσιών</string>
 </resources>
diff --git a/java/com/android/dialer/about/res/values-en-rAU/strings.xml b/java/com/android/dialer/about/res/values-en-rAU/strings.xml
index 6104bd8..0d59e68 100644
--- a/java/com/android/dialer/about/res/values-en-rAU/strings.xml
+++ b/java/com/android/dialer/about/res/values-en-rAU/strings.xml
@@ -1,9 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="build_version_label" msgid="3876300343684966840">"Build version"</string>
-    <string name="open_source_license_detail_label" msgid="2860076509914623912">"Licence details for open-source software"</string>
-    <string name="licenseActivityLabel" msgid="8258726177561826066">"Open-source licences"</string>
-    <string name="privacy_policy_label" msgid="6567158248788870442">"Privacy Policy"</string>
-    <string name="terms_of_service_label" msgid="6788126078040996084">"Terms of Service"</string>
+<resources>
+  <string name="build_version_label">Build version</string>
+  <string name="open_source_license_detail_label">Licence details for open-source software</string>
+  <string name="licenseActivityLabel">Open-source licences</string>
+  <string name="privacy_policy_label">Privacy Policy</string>
+  <string name="terms_of_service_label">Terms of Service</string>
 </resources>
diff --git a/java/com/android/dialer/about/res/values-en-rGB/strings.xml b/java/com/android/dialer/about/res/values-en-rGB/strings.xml
index 6104bd8..0d59e68 100644
--- a/java/com/android/dialer/about/res/values-en-rGB/strings.xml
+++ b/java/com/android/dialer/about/res/values-en-rGB/strings.xml
@@ -1,9 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="build_version_label" msgid="3876300343684966840">"Build version"</string>
-    <string name="open_source_license_detail_label" msgid="2860076509914623912">"Licence details for open-source software"</string>
-    <string name="licenseActivityLabel" msgid="8258726177561826066">"Open-source licences"</string>
-    <string name="privacy_policy_label" msgid="6567158248788870442">"Privacy Policy"</string>
-    <string name="terms_of_service_label" msgid="6788126078040996084">"Terms of Service"</string>
+<resources>
+  <string name="build_version_label">Build version</string>
+  <string name="open_source_license_detail_label">Licence details for open-source software</string>
+  <string name="licenseActivityLabel">Open-source licences</string>
+  <string name="privacy_policy_label">Privacy Policy</string>
+  <string name="terms_of_service_label">Terms of Service</string>
 </resources>
diff --git a/java/com/android/dialer/about/res/values-en-rIN/strings.xml b/java/com/android/dialer/about/res/values-en-rIN/strings.xml
index 6104bd8..0d59e68 100644
--- a/java/com/android/dialer/about/res/values-en-rIN/strings.xml
+++ b/java/com/android/dialer/about/res/values-en-rIN/strings.xml
@@ -1,9 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="build_version_label" msgid="3876300343684966840">"Build version"</string>
-    <string name="open_source_license_detail_label" msgid="2860076509914623912">"Licence details for open-source software"</string>
-    <string name="licenseActivityLabel" msgid="8258726177561826066">"Open-source licences"</string>
-    <string name="privacy_policy_label" msgid="6567158248788870442">"Privacy Policy"</string>
-    <string name="terms_of_service_label" msgid="6788126078040996084">"Terms of Service"</string>
+<resources>
+  <string name="build_version_label">Build version</string>
+  <string name="open_source_license_detail_label">Licence details for open-source software</string>
+  <string name="licenseActivityLabel">Open-source licences</string>
+  <string name="privacy_policy_label">Privacy Policy</string>
+  <string name="terms_of_service_label">Terms of Service</string>
 </resources>
diff --git a/java/com/android/dialer/about/res/values-es-rUS/strings.xml b/java/com/android/dialer/about/res/values-es-rUS/strings.xml
index 1395bda..142722f 100644
--- a/java/com/android/dialer/about/res/values-es-rUS/strings.xml
+++ b/java/com/android/dialer/about/res/values-es-rUS/strings.xml
@@ -1,9 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="build_version_label" msgid="3876300343684966840">"Versión de compilación"</string>
-    <string name="open_source_license_detail_label" msgid="2860076509914623912">"Detalles de la licencia de software de código abierto"</string>
-    <string name="licenseActivityLabel" msgid="8258726177561826066">"Licencias de código abierto"</string>
-    <string name="privacy_policy_label" msgid="6567158248788870442">"Política de privacidad"</string>
-    <string name="terms_of_service_label" msgid="6788126078040996084">"Condiciones del servicio"</string>
+<resources>
+  <string name="build_version_label">Versión de compilación</string>
+  <string name="open_source_license_detail_label">Detalles de la licencia de software de código abierto</string>
+  <string name="licenseActivityLabel">Licencias de código abierto</string>
+  <string name="privacy_policy_label">Política de privacidad</string>
+  <string name="terms_of_service_label">Condiciones del servicio</string>
 </resources>
diff --git a/java/com/android/dialer/about/res/values-es/strings.xml b/java/com/android/dialer/about/res/values-es/strings.xml
index 060f3a4..a903159 100644
--- a/java/com/android/dialer/about/res/values-es/strings.xml
+++ b/java/com/android/dialer/about/res/values-es/strings.xml
@@ -1,9 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="build_version_label" msgid="3876300343684966840">"Versión de la compilación"</string>
-    <string name="open_source_license_detail_label" msgid="2860076509914623912">"Detalles de las licencias de software libre"</string>
-    <string name="licenseActivityLabel" msgid="8258726177561826066">"Licencias de software libre"</string>
-    <string name="privacy_policy_label" msgid="6567158248788870442">"Política de Privacidad"</string>
-    <string name="terms_of_service_label" msgid="6788126078040996084">"Condiciones de Servicio"</string>
+<resources>
+  <string name="build_version_label">Versión de la compilación</string>
+  <string name="open_source_license_detail_label">Detalles de las licencias de software libre</string>
+  <string name="licenseActivityLabel">Licencias de software libre</string>
+  <string name="privacy_policy_label">Política de privacidad</string>
+  <string name="terms_of_service_label">Condiciones de servicio</string>
 </resources>
diff --git a/java/com/android/dialer/about/res/values-et/strings.xml b/java/com/android/dialer/about/res/values-et/strings.xml
index 1ff4839..f6af3aa 100644
--- a/java/com/android/dialer/about/res/values-et/strings.xml
+++ b/java/com/android/dialer/about/res/values-et/strings.xml
@@ -1,9 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="build_version_label" msgid="3876300343684966840">"Järguversioon"</string>
-    <string name="open_source_license_detail_label" msgid="2860076509914623912">"Avatud lähtekoodiga tarkvara litsentsi üksikasjad"</string>
-    <string name="licenseActivityLabel" msgid="8258726177561826066">"Avatud lähtekoodi litsentsid"</string>
-    <string name="privacy_policy_label" msgid="6567158248788870442">"Privaatsuseeskirjad"</string>
-    <string name="terms_of_service_label" msgid="6788126078040996084">"Teenusetingimused"</string>
+<resources>
+  <string name="build_version_label">Järguversioon</string>
+  <string name="open_source_license_detail_label">Avatud lähtekoodiga tarkvara litsentsi üksikasjad</string>
+  <string name="licenseActivityLabel">Avatud lähtekoodi litsentsid</string>
+  <string name="privacy_policy_label">Privaatsuseeskirjad</string>
+  <string name="terms_of_service_label">Teenusetingimused</string>
 </resources>
diff --git a/java/com/android/dialer/about/res/values-eu/strings.xml b/java/com/android/dialer/about/res/values-eu/strings.xml
index ef45117..a184bae 100644
--- a/java/com/android/dialer/about/res/values-eu/strings.xml
+++ b/java/com/android/dialer/about/res/values-eu/strings.xml
@@ -1,9 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="build_version_label" msgid="3876300343684966840">"Konpilazioaren bertsioa"</string>
-    <string name="open_source_license_detail_label" msgid="2860076509914623912">"Kode irekiko softwarearen lizentziaren xehetasunak"</string>
-    <string name="licenseActivityLabel" msgid="8258726177561826066">"Kode irekiko lizentziak"</string>
-    <string name="privacy_policy_label" msgid="6567158248788870442">"Pribatutasun-gidalerroak"</string>
-    <string name="terms_of_service_label" msgid="6788126078040996084">"Zerbitzu-baldintzak"</string>
+<resources>
+  <string name="build_version_label">Konpilazioaren bertsioa</string>
+  <string name="open_source_license_detail_label">Kode irekiko softwarearen lizentziaren xehetasunak</string>
+  <string name="licenseActivityLabel">Kode irekiko lizentziak</string>
+  <string name="privacy_policy_label">Pribatutasun-gidalerroak</string>
+  <string name="terms_of_service_label">Zerbitzu-baldintzak</string>
 </resources>
diff --git a/java/com/android/dialer/about/res/values-fa/strings.xml b/java/com/android/dialer/about/res/values-fa/strings.xml
index 275a644..16cdc82 100644
--- a/java/com/android/dialer/about/res/values-fa/strings.xml
+++ b/java/com/android/dialer/about/res/values-fa/strings.xml
@@ -1,9 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="build_version_label" msgid="3876300343684966840">"نسخه ساخت"</string>
-    <string name="open_source_license_detail_label" msgid="2860076509914623912">"جزئیات مجوز برای نرم‌افزار متن‌باز"</string>
-    <string name="licenseActivityLabel" msgid="8258726177561826066">"مجوزهای متن‌باز"</string>
-    <string name="privacy_policy_label" msgid="6567158248788870442">"خط‌مشی رازداری"</string>
-    <string name="terms_of_service_label" msgid="6788126078040996084">"شرایط و ضوابط"</string>
+<resources>
+  <string name="build_version_label">نسخه ساخت</string>
+  <string name="open_source_license_detail_label">جزئیات مجوز برای نرم‌افزار متن‌باز</string>
+  <string name="licenseActivityLabel">مجوزهای متن‌باز</string>
+  <string name="privacy_policy_label">خط‌مشی رازداری</string>
+  <string name="terms_of_service_label">شرایط و ضوابط</string>
 </resources>
diff --git a/java/com/android/dialer/about/res/values-fi/strings.xml b/java/com/android/dialer/about/res/values-fi/strings.xml
index 12edc9e..6f55181 100644
--- a/java/com/android/dialer/about/res/values-fi/strings.xml
+++ b/java/com/android/dialer/about/res/values-fi/strings.xml
@@ -1,9 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="build_version_label" msgid="3876300343684966840">"Koontiversio"</string>
-    <string name="open_source_license_detail_label" msgid="2860076509914623912">"Avoimen lähdekoodin ohjelmiston käyttöoikeustiedot"</string>
-    <string name="licenseActivityLabel" msgid="8258726177561826066">"Avoimen lähdekoodin käyttöoikeudet"</string>
-    <string name="privacy_policy_label" msgid="6567158248788870442">"Tietosuojakäytäntö"</string>
-    <string name="terms_of_service_label" msgid="6788126078040996084">"Käyttöehdot"</string>
+<resources>
+  <string name="build_version_label">Koontiversio</string>
+  <string name="open_source_license_detail_label">Avoimen lähdekoodin ohjelmiston käyttöoikeustiedot</string>
+  <string name="licenseActivityLabel">Avoimen lähdekoodin käyttöoikeudet</string>
+  <string name="privacy_policy_label">Tietosuojakäytäntö</string>
+  <string name="terms_of_service_label">Käyttöehdot</string>
 </resources>
diff --git a/java/com/android/dialer/about/res/values-fr-rCA/strings.xml b/java/com/android/dialer/about/res/values-fr-rCA/strings.xml
index 03bf1ba..add9be1 100644
--- a/java/com/android/dialer/about/res/values-fr-rCA/strings.xml
+++ b/java/com/android/dialer/about/res/values-fr-rCA/strings.xml
@@ -1,9 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="build_version_label" msgid="3876300343684966840">"Version"</string>
-    <string name="open_source_license_detail_label" msgid="2860076509914623912">"Renseignements sur les licences de logiciels libres"</string>
-    <string name="licenseActivityLabel" msgid="8258726177561826066">"Licences de logiciels libres"</string>
-    <string name="privacy_policy_label" msgid="6567158248788870442">"Politique de confidentialité"</string>
-    <string name="terms_of_service_label" msgid="6788126078040996084">"Conditions d\'utilisation"</string>
+<resources>
+  <string name="build_version_label">Version</string>
+  <string name="open_source_license_detail_label">Renseignements sur les licences de logiciels libres</string>
+  <string name="licenseActivityLabel">Licences de logiciels libres</string>
+  <string name="privacy_policy_label">Politique de confidentialité</string>
+  <string name="terms_of_service_label">Conditions d\'utilisation</string>
 </resources>
diff --git a/java/com/android/dialer/about/res/values-fr/strings.xml b/java/com/android/dialer/about/res/values-fr/strings.xml
index 2a44dad..99787bc 100644
--- a/java/com/android/dialer/about/res/values-fr/strings.xml
+++ b/java/com/android/dialer/about/res/values-fr/strings.xml
@@ -1,9 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="build_version_label" msgid="3876300343684966840">"Build"</string>
-    <string name="open_source_license_detail_label" msgid="2860076509914623912">"Informations sur les licences de logiciels Open Source"</string>
-    <string name="licenseActivityLabel" msgid="8258726177561826066">"Licences Open Source"</string>
-    <string name="privacy_policy_label" msgid="6567158248788870442">"Règles de confidentialité"</string>
-    <string name="terms_of_service_label" msgid="6788126078040996084">"Conditions d\'utilisation"</string>
+<resources>
+  <string name="build_version_label">Build</string>
+  <string name="open_source_license_detail_label">Informations sur les licences de logiciels Open Source</string>
+  <string name="licenseActivityLabel">Licences Open Source</string>
+  <string name="privacy_policy_label">Règles de confidentialité</string>
+  <string name="terms_of_service_label">Conditions d\'utilisation</string>
 </resources>
diff --git a/java/com/android/dialer/about/res/values-gl/strings.xml b/java/com/android/dialer/about/res/values-gl/strings.xml
index 243841b..9a10fd0 100644
--- a/java/com/android/dialer/about/res/values-gl/strings.xml
+++ b/java/com/android/dialer/about/res/values-gl/strings.xml
@@ -1,9 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="build_version_label" msgid="3876300343684966840">"Versión de compilación"</string>
-    <string name="open_source_license_detail_label" msgid="2860076509914623912">"Detalles da licenza para software de código aberto"</string>
-    <string name="licenseActivityLabel" msgid="8258726177561826066">"Licenzas de código aberto"</string>
-    <string name="privacy_policy_label" msgid="6567158248788870442">"Política de privacidade"</string>
-    <string name="terms_of_service_label" msgid="6788126078040996084">"Condicións de servizo"</string>
+<resources>
+  <string name="build_version_label">Versión de compilación</string>
+  <string name="open_source_license_detail_label">Detalles da licenza para software de código aberto</string>
+  <string name="licenseActivityLabel">Licenzas de código aberto</string>
+  <string name="privacy_policy_label">Política de privacidade</string>
+  <string name="terms_of_service_label">Condicións de servizo</string>
 </resources>
diff --git a/java/com/android/dialer/about/res/values-gu/strings.xml b/java/com/android/dialer/about/res/values-gu/strings.xml
index f97b732..a8e37a1 100644
--- a/java/com/android/dialer/about/res/values-gu/strings.xml
+++ b/java/com/android/dialer/about/res/values-gu/strings.xml
@@ -1,9 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="build_version_label" msgid="3876300343684966840">"બિલ્ડ સંસ્કરણ"</string>
-    <string name="open_source_license_detail_label" msgid="2860076509914623912">"ખુલ્લા સ્ત્રોતના સોફ્ટવેર માટે લાઇસન્સની વિગતો"</string>
-    <string name="licenseActivityLabel" msgid="8258726177561826066">"ખુલ્લા સ્ત્રોત લાઇસન્સ"</string>
-    <string name="privacy_policy_label" msgid="6567158248788870442">"ગોપનીયતા નીતિ"</string>
-    <string name="terms_of_service_label" msgid="6788126078040996084">"સેવાની શરતો"</string>
+<resources>
+  <string name="build_version_label">બિલ્ડ સંસ્કરણ</string>
+  <string name="open_source_license_detail_label">ખુલ્લા સ્ત્રોતના સોફ્ટવેર માટે લાઇસન્સની વિગતો</string>
+  <string name="licenseActivityLabel">ખુલ્લા સ્ત્રોત લાઇસન્સ</string>
+  <string name="privacy_policy_label">ગોપનીયતા નીતિ</string>
+  <string name="terms_of_service_label">સેવાની શરતો</string>
 </resources>
diff --git a/java/com/android/dialer/about/res/values-hi/strings.xml b/java/com/android/dialer/about/res/values-hi/strings.xml
index 480dab3..45cf106 100644
--- a/java/com/android/dialer/about/res/values-hi/strings.xml
+++ b/java/com/android/dialer/about/res/values-hi/strings.xml
@@ -1,9 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="build_version_label" msgid="3876300343684966840">"बिल्ड वर्शन"</string>
-    <string name="open_source_license_detail_label" msgid="2860076509914623912">"ओपन सोर्स सॉफ़्टवेयर के लाइसेंस वि‍वरण"</string>
-    <string name="licenseActivityLabel" msgid="8258726177561826066">"ओपन सोर्स लाइसेंस"</string>
-    <string name="privacy_policy_label" msgid="6567158248788870442">"निजता नीति"</string>
-    <string name="terms_of_service_label" msgid="6788126078040996084">"सेवा की शर्तें"</string>
+<resources>
+  <string name="build_version_label">बिल्ड वर्शन</string>
+  <string name="open_source_license_detail_label">ओपन सोर्स सॉफ़्टवेयर के लाइसेंस वि‍वरण</string>
+  <string name="licenseActivityLabel">ओपन सोर्स लाइसेंस</string>
+  <string name="privacy_policy_label">निजता नीति</string>
+  <string name="terms_of_service_label">सेवा की शर्तें</string>
 </resources>
diff --git a/java/com/android/dialer/about/res/values-hr/strings.xml b/java/com/android/dialer/about/res/values-hr/strings.xml
index 4464bf0..6179fd6 100644
--- a/java/com/android/dialer/about/res/values-hr/strings.xml
+++ b/java/com/android/dialer/about/res/values-hr/strings.xml
@@ -1,9 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="build_version_label" msgid="3876300343684966840">"Trenutačna međuverzija"</string>
-    <string name="open_source_license_detail_label" msgid="2860076509914623912">"Pojedinosti o licenci za softver otvorenog koda"</string>
-    <string name="licenseActivityLabel" msgid="8258726177561826066">"Licence otvorenog koda"</string>
-    <string name="privacy_policy_label" msgid="6567158248788870442">"Pravila o privatnosti"</string>
-    <string name="terms_of_service_label" msgid="6788126078040996084">"Uvjeti pružanja usluge"</string>
+<resources>
+  <string name="build_version_label">Trenutačna međuverzija</string>
+  <string name="open_source_license_detail_label">Pojedinosti o licenci za softver otvorenog koda</string>
+  <string name="licenseActivityLabel">Licence otvorenog koda</string>
+  <string name="privacy_policy_label">Pravila o privatnosti</string>
+  <string name="terms_of_service_label">Uvjeti pružanja usluge</string>
 </resources>
diff --git a/java/com/android/dialer/about/res/values-hu/strings.xml b/java/com/android/dialer/about/res/values-hu/strings.xml
index da4ecae..309bf4e 100644
--- a/java/com/android/dialer/about/res/values-hu/strings.xml
+++ b/java/com/android/dialer/about/res/values-hu/strings.xml
@@ -1,9 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="build_version_label" msgid="3876300343684966840">"Build verziószáma"</string>
-    <string name="open_source_license_detail_label" msgid="2860076509914623912">"A nyílt forráskódú szoftverekhez kapcsolódó licenc részletei"</string>
-    <string name="licenseActivityLabel" msgid="8258726177561826066">"Nyílt forráskódú licencek"</string>
-    <string name="privacy_policy_label" msgid="6567158248788870442">"Adatvédelmi irányelvek"</string>
-    <string name="terms_of_service_label" msgid="6788126078040996084">"Általános Szerződési Feltételek"</string>
+<resources>
+  <string name="build_version_label">Build verziószáma</string>
+  <string name="open_source_license_detail_label">A nyílt forráskódú szoftverekhez kapcsolódó licenc részletei</string>
+  <string name="licenseActivityLabel">Nyílt forráskódú licencek</string>
+  <string name="privacy_policy_label">Adatvédelmi irányelvek</string>
+  <string name="terms_of_service_label">Általános Szerződési Feltételek</string>
 </resources>
diff --git a/java/com/android/dialer/about/res/values-hy/strings.xml b/java/com/android/dialer/about/res/values-hy/strings.xml
index d018394..385400c 100644
--- a/java/com/android/dialer/about/res/values-hy/strings.xml
+++ b/java/com/android/dialer/about/res/values-hy/strings.xml
@@ -1,9 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="build_version_label" msgid="3876300343684966840">"Կառուցման տարբերակը"</string>
-    <string name="open_source_license_detail_label" msgid="2860076509914623912">"Բաց կոդով ծրագրակազմի արտոնագրերի մանրամասներ"</string>
-    <string name="licenseActivityLabel" msgid="8258726177561826066">"Բաց կոդով ծրագրակազմի արտոնագրեր"</string>
-    <string name="privacy_policy_label" msgid="6567158248788870442">"Գաղտնիության քաղաքականություն"</string>
-    <string name="terms_of_service_label" msgid="6788126078040996084">"Օգտագործման պայմաններ"</string>
+<resources>
+  <string name="build_version_label">Կառուցման տարբերակը</string>
+  <string name="open_source_license_detail_label">Բաց կոդով ծրագրակազմի արտոնագրերի մանրամասներ</string>
+  <string name="licenseActivityLabel">Բաց կոդով ծրագրակազմի արտոնագրեր</string>
+  <string name="privacy_policy_label">Գաղտնիության քաղաքականություն</string>
+  <string name="terms_of_service_label">Օգտագործման պայմաններ</string>
 </resources>
diff --git a/java/com/android/dialer/about/res/values-in/strings.xml b/java/com/android/dialer/about/res/values-in/strings.xml
index a757c20..1d643be 100644
--- a/java/com/android/dialer/about/res/values-in/strings.xml
+++ b/java/com/android/dialer/about/res/values-in/strings.xml
@@ -1,9 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="build_version_label" msgid="3876300343684966840">"Versi build"</string>
-    <string name="open_source_license_detail_label" msgid="2860076509914623912">"Detail lisensi untuk software open source"</string>
-    <string name="licenseActivityLabel" msgid="8258726177561826066">"Lisensi open source"</string>
-    <string name="privacy_policy_label" msgid="6567158248788870442">"Kebijakan privasi"</string>
-    <string name="terms_of_service_label" msgid="6788126078040996084">"Persyaratan layanan"</string>
+<resources>
+  <string name="build_version_label">Versi build</string>
+  <string name="open_source_license_detail_label">Detail lisensi untuk software open source</string>
+  <string name="licenseActivityLabel">Lisensi open source</string>
+  <string name="privacy_policy_label">Kebijakan privasi</string>
+  <string name="terms_of_service_label">Persyaratan layanan</string>
 </resources>
diff --git a/java/com/android/dialer/about/res/values-is/strings.xml b/java/com/android/dialer/about/res/values-is/strings.xml
index f6fbeba..fea9515 100644
--- a/java/com/android/dialer/about/res/values-is/strings.xml
+++ b/java/com/android/dialer/about/res/values-is/strings.xml
@@ -1,9 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="build_version_label" msgid="3876300343684966840">"Útgáfa smíði"</string>
-    <string name="open_source_license_detail_label" msgid="2860076509914623912">"Leyfisupplýsingar fyrir hugbúnað með opnum kóða"</string>
-    <string name="licenseActivityLabel" msgid="8258726177561826066">"Leyfi opins kóða"</string>
-    <string name="privacy_policy_label" msgid="6567158248788870442">"Persónuverndarstefna"</string>
-    <string name="terms_of_service_label" msgid="6788126078040996084">"Þjónustuskilmálar"</string>
+<resources>
+  <string name="build_version_label">Útgáfa smíði</string>
+  <string name="open_source_license_detail_label">Leyfisupplýsingar fyrir hugbúnað með opnum kóða</string>
+  <string name="licenseActivityLabel">Leyfi opins kóða</string>
+  <string name="privacy_policy_label">Persónuverndarstefna</string>
+  <string name="terms_of_service_label">Þjónustuskilmálar</string>
 </resources>
diff --git a/java/com/android/dialer/about/res/values-it/strings.xml b/java/com/android/dialer/about/res/values-it/strings.xml
index c832c15..071d58a 100644
--- a/java/com/android/dialer/about/res/values-it/strings.xml
+++ b/java/com/android/dialer/about/res/values-it/strings.xml
@@ -1,9 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="build_version_label" msgid="3876300343684966840">"Versione build"</string>
-    <string name="open_source_license_detail_label" msgid="2860076509914623912">"Dettagli delle licenze per il software open source"</string>
-    <string name="licenseActivityLabel" msgid="8258726177561826066">"Licenze open source"</string>
-    <string name="privacy_policy_label" msgid="6567158248788870442">"Norme sulla privacy"</string>
-    <string name="terms_of_service_label" msgid="6788126078040996084">"Termini di servizio"</string>
+<resources>
+  <string name="build_version_label">Versione build</string>
+  <string name="open_source_license_detail_label">Dettagli delle licenze per il software open source</string>
+  <string name="licenseActivityLabel">Licenze open source</string>
+  <string name="privacy_policy_label">Norme sulla privacy</string>
+  <string name="terms_of_service_label">Termini di servizio</string>
 </resources>
diff --git a/java/com/android/dialer/about/res/values-iw/strings.xml b/java/com/android/dialer/about/res/values-iw/strings.xml
index 161b5f8..0576fac 100644
--- a/java/com/android/dialer/about/res/values-iw/strings.xml
+++ b/java/com/android/dialer/about/res/values-iw/strings.xml
@@ -1,9 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="build_version_label" msgid="3876300343684966840">"‏גרסת Build"</string>
-    <string name="open_source_license_detail_label" msgid="2860076509914623912">"פרטי רישיון לתוכנות קוד פתוח"</string>
-    <string name="licenseActivityLabel" msgid="8258726177561826066">"רישיונות קוד פתוח"</string>
-    <string name="privacy_policy_label" msgid="6567158248788870442">"מדיניות הפרטיות"</string>
-    <string name="terms_of_service_label" msgid="6788126078040996084">"תנאים והגבלות"</string>
+<resources>
+  <string name="build_version_label">‏גרסת Build</string>
+  <string name="open_source_license_detail_label">פרטי רישיון לתוכנות קוד פתוח</string>
+  <string name="licenseActivityLabel">רישיונות קוד פתוח</string>
+  <string name="privacy_policy_label">מדיניות הפרטיות</string>
+  <string name="terms_of_service_label">תנאים והגבלות</string>
 </resources>
diff --git a/java/com/android/dialer/about/res/values-ja/strings.xml b/java/com/android/dialer/about/res/values-ja/strings.xml
index 789981e..42c29ad 100644
--- a/java/com/android/dialer/about/res/values-ja/strings.xml
+++ b/java/com/android/dialer/about/res/values-ja/strings.xml
@@ -1,9 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="build_version_label" msgid="3876300343684966840">"ビルド バージョン"</string>
-    <string name="open_source_license_detail_label" msgid="2860076509914623912">"オープンソース ソフトウェアのライセンスの詳細"</string>
-    <string name="licenseActivityLabel" msgid="8258726177561826066">"オープンソース ライセンス"</string>
-    <string name="privacy_policy_label" msgid="6567158248788870442">"プライバシー ポリシー"</string>
-    <string name="terms_of_service_label" msgid="6788126078040996084">"利用規約"</string>
+<resources>
+  <string name="build_version_label">ビルド バージョン</string>
+  <string name="open_source_license_detail_label">オープンソース ソフトウェアのライセンスの詳細</string>
+  <string name="licenseActivityLabel">オープンソース ライセンス</string>
+  <string name="privacy_policy_label">プライバシー ポリシー</string>
+  <string name="terms_of_service_label">利用規約</string>
 </resources>
diff --git a/java/com/android/dialer/about/res/values-ka/strings.xml b/java/com/android/dialer/about/res/values-ka/strings.xml
index 542c550..3801240 100644
--- a/java/com/android/dialer/about/res/values-ka/strings.xml
+++ b/java/com/android/dialer/about/res/values-ka/strings.xml
@@ -1,9 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="build_version_label" msgid="3876300343684966840">"Build-ის ვერსია"</string>
-    <string name="open_source_license_detail_label" msgid="2860076509914623912">"ღია კოდის პროგრამული უზრუნველყოფის ლიცენზირების დეტალები"</string>
-    <string name="licenseActivityLabel" msgid="8258726177561826066">"ღია კოდის ლიცენზიები"</string>
-    <string name="privacy_policy_label" msgid="6567158248788870442">"კონფიდენციალურობის დებულება"</string>
-    <string name="terms_of_service_label" msgid="6788126078040996084">"მომსახურების პირობები"</string>
+<resources>
+  <string name="build_version_label">Build-ის ვერსია</string>
+  <string name="open_source_license_detail_label">ღია კოდის პროგრამული უზრუნველყოფის ლიცენზირების დეტალები</string>
+  <string name="licenseActivityLabel">ღია კოდის ლიცენზიები</string>
+  <string name="privacy_policy_label">კონფიდენციალურობის დებულება</string>
+  <string name="terms_of_service_label">მომსახურების პირობები</string>
 </resources>
diff --git a/java/com/android/dialer/about/res/values-kk/strings.xml b/java/com/android/dialer/about/res/values-kk/strings.xml
index 8b4ba30..76c3db8 100644
--- a/java/com/android/dialer/about/res/values-kk/strings.xml
+++ b/java/com/android/dialer/about/res/values-kk/strings.xml
@@ -1,9 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="build_version_label" msgid="3876300343684966840">"Жинақ нұсқасы"</string>
-    <string name="open_source_license_detail_label" msgid="2860076509914623912">"Ашық бастапқы код бағдарламасына арналған лицензия туралы мәліметтер"</string>
-    <string name="licenseActivityLabel" msgid="8258726177561826066">"Ашық бастапқы код лицензиялары"</string>
-    <string name="privacy_policy_label" msgid="6567158248788870442">"Құпиялылық саясаты"</string>
-    <string name="terms_of_service_label" msgid="6788126078040996084">"Қызмет көрсету шарттары"</string>
+<resources>
+  <string name="build_version_label">Жинақ нұсқасы</string>
+  <string name="open_source_license_detail_label">Ашық бастапқы код бағдарламасына арналған лицензия туралы мәліметтер</string>
+  <string name="licenseActivityLabel">Ашық бастапқы код лицензиялары</string>
+  <string name="privacy_policy_label">Құпиялылық саясаты</string>
+  <string name="terms_of_service_label">Қызмет көрсету шарттары</string>
 </resources>
diff --git a/java/com/android/dialer/about/res/values-km/strings.xml b/java/com/android/dialer/about/res/values-km/strings.xml
index e5bf77f..464a2bf 100644
--- a/java/com/android/dialer/about/res/values-km/strings.xml
+++ b/java/com/android/dialer/about/res/values-km/strings.xml
@@ -1,9 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="build_version_label" msgid="3876300343684966840">"កំណែបង្កើត"</string>
-    <string name="open_source_license_detail_label" msgid="2860076509914623912">"ព័ត៌មាន​លម្អិត​អំពី​អាជ្ញាបណ្ណ​សម្រាប់​កម្មវិធី​ប្រភព​កូដ​ចំហ"</string>
-    <string name="licenseActivityLabel" msgid="8258726177561826066">"អាជ្ញាប័ណ្ណ​កម្មវិធី​​​​​កូដ​ចំហ"</string>
-    <string name="privacy_policy_label" msgid="6567158248788870442">"គោលការណ៍​ឯកជន​ភាព"</string>
-    <string name="terms_of_service_label" msgid="6788126078040996084">"លក្ខខណ្ឌ​ប្រើប្រាស់"</string>
+<resources>
+  <string name="build_version_label">កំណែបង្កើត</string>
+  <string name="open_source_license_detail_label">ព័ត៌មាន​លម្អិត​អំពី​អាជ្ញាបណ្ណ​សម្រាប់​កម្មវិធី​ប្រភព​កូដ​ចំហ</string>
+  <string name="licenseActivityLabel">អាជ្ញាប័ណ្ណ​កម្មវិធី​​​​​កូដ​ចំហ</string>
+  <string name="privacy_policy_label">គោលការណ៍​ឯកជន​ភាព</string>
+  <string name="terms_of_service_label">លក្ខខណ្ឌ​ប្រើប្រាស់</string>
 </resources>
diff --git a/java/com/android/dialer/about/res/values-kn/strings.xml b/java/com/android/dialer/about/res/values-kn/strings.xml
index 9acf179..947c54c 100644
--- a/java/com/android/dialer/about/res/values-kn/strings.xml
+++ b/java/com/android/dialer/about/res/values-kn/strings.xml
@@ -1,9 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="build_version_label" msgid="3876300343684966840">"ಬಿಲ್ಡ್ ಆವೃತ್ತಿ"</string>
-    <string name="open_source_license_detail_label" msgid="2860076509914623912">"ತೆರೆದ ಮೂಲ ಸಾಫ್ಟ್‌ವೇರ್‌ಗಾಗಿ ಪರವಾನಗಿ ವಿವರಗಳು"</string>
-    <string name="licenseActivityLabel" msgid="8258726177561826066">"ತೆರೆದ ಮೂಲ ಪರವಾನಗಿಗಳು"</string>
-    <string name="privacy_policy_label" msgid="6567158248788870442">"ಗೌಪ್ಯತೆ ನೀತಿ"</string>
-    <string name="terms_of_service_label" msgid="6788126078040996084">"ಸೇವಾ ನಿಯಮಗಳು"</string>
+<resources>
+  <string name="build_version_label">ಬಿಲ್ಡ್ ಆವೃತ್ತಿ</string>
+  <string name="open_source_license_detail_label">ತೆರೆದ ಮೂಲ ಸಾಫ್ಟ್‌ವೇರ್‌ಗಾಗಿ ಪರವಾನಗಿ ವಿವರಗಳು</string>
+  <string name="licenseActivityLabel">ತೆರೆದ ಮೂಲ ಪರವಾನಗಿಗಳು</string>
+  <string name="privacy_policy_label">ಗೌಪ್ಯತೆ ನೀತಿ</string>
+  <string name="terms_of_service_label">ಸೇವಾ ನಿಯಮಗಳು</string>
 </resources>
diff --git a/java/com/android/dialer/about/res/values-ko/strings.xml b/java/com/android/dialer/about/res/values-ko/strings.xml
index 5a08329..0ba1d92 100644
--- a/java/com/android/dialer/about/res/values-ko/strings.xml
+++ b/java/com/android/dialer/about/res/values-ko/strings.xml
@@ -1,9 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="build_version_label" msgid="3876300343684966840">"빌드 버전"</string>
-    <string name="open_source_license_detail_label" msgid="2860076509914623912">"오픈소스 소프트웨어 라이선스 세부정보"</string>
-    <string name="licenseActivityLabel" msgid="8258726177561826066">"오픈소스 라이선스"</string>
-    <string name="privacy_policy_label" msgid="6567158248788870442">"개인정보처리방침"</string>
-    <string name="terms_of_service_label" msgid="6788126078040996084">"서비스 약관"</string>
+<resources>
+  <string name="build_version_label">빌드 버전</string>
+  <string name="open_source_license_detail_label">오픈소스 소프트웨어 라이선스 세부정보</string>
+  <string name="licenseActivityLabel">오픈소스 라이선스</string>
+  <string name="privacy_policy_label">개인정보처리방침</string>
+  <string name="terms_of_service_label">서비스 약관</string>
 </resources>
diff --git a/java/com/android/dialer/about/res/values-ky/strings.xml b/java/com/android/dialer/about/res/values-ky/strings.xml
index d454aeb..8c4b0d2 100644
--- a/java/com/android/dialer/about/res/values-ky/strings.xml
+++ b/java/com/android/dialer/about/res/values-ky/strings.xml
@@ -1,9 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="build_version_label" msgid="3876300343684966840">"Куралма версиясы"</string>
-    <string name="open_source_license_detail_label" msgid="2860076509914623912">"Баштапкы коду ачык программанын уруксаттамасынын чоо-жайы"</string>
-    <string name="licenseActivityLabel" msgid="8258726177561826066">"Ачык программа уруксаттамалары"</string>
-    <string name="privacy_policy_label" msgid="6567158248788870442">"Купуялык саясаты"</string>
-    <string name="terms_of_service_label" msgid="6788126078040996084">"Тейлөө шарттары"</string>
+<resources>
+  <string name="build_version_label">Курама версиясы</string>
+  <string name="open_source_license_detail_label">Баштапкы коду ачык программанын уруксаттамасынын чоо-жайы</string>
+  <string name="licenseActivityLabel">Ачык программа уруксаттамалары</string>
+  <string name="privacy_policy_label">Купуялык саясаты</string>
+  <string name="terms_of_service_label">Тейлөө шарттары</string>
 </resources>
diff --git a/java/com/android/dialer/about/res/values-lo/strings.xml b/java/com/android/dialer/about/res/values-lo/strings.xml
index bd318fb..e59eab8 100644
--- a/java/com/android/dialer/about/res/values-lo/strings.xml
+++ b/java/com/android/dialer/about/res/values-lo/strings.xml
@@ -1,9 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="build_version_label" msgid="3876300343684966840">"ເວີຊັນສ້າງ"</string>
-    <string name="open_source_license_detail_label" msgid="2860076509914623912">"ລາຍລະອຽດໃບອະນຸຍາດໂອເພນຊອດ"</string>
-    <string name="licenseActivityLabel" msgid="8258726177561826066">"ໃບອະນຸຍາດໂອເພນຊອດ"</string>
-    <string name="privacy_policy_label" msgid="6567158248788870442">"ນະໂຍບາຍຄວາມເປັນສ່ວນຕົວ"</string>
-    <string name="terms_of_service_label" msgid="6788126078040996084">"ຂໍ້ກຳນົດບໍລິການ"</string>
+<resources>
+  <string name="build_version_label">ເວີຊັນສ້າງ</string>
+  <string name="open_source_license_detail_label">ລາຍລະອຽດໃບອະນຸຍາດໂອເພນຊອດ</string>
+  <string name="licenseActivityLabel">ໃບອະນຸຍາດໂອເພນຊອດ</string>
+  <string name="privacy_policy_label">ນະໂຍບາຍຄວາມເປັນສ່ວນຕົວ</string>
+  <string name="terms_of_service_label">ຂໍ້ກຳນົດບໍລິການ</string>
 </resources>
diff --git a/java/com/android/dialer/about/res/values-lt/strings.xml b/java/com/android/dialer/about/res/values-lt/strings.xml
index d6ad908..340004f 100644
--- a/java/com/android/dialer/about/res/values-lt/strings.xml
+++ b/java/com/android/dialer/about/res/values-lt/strings.xml
@@ -1,9 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="build_version_label" msgid="3876300343684966840">"Versija"</string>
-    <string name="open_source_license_detail_label" msgid="2860076509914623912">"Išsami atvirojo šaltinio programinės įrangos licencijos informacija"</string>
-    <string name="licenseActivityLabel" msgid="8258726177561826066">"Atvirojo šaltinio licencijos"</string>
-    <string name="privacy_policy_label" msgid="6567158248788870442">"Privatumo politika"</string>
-    <string name="terms_of_service_label" msgid="6788126078040996084">"Paslaugų teikimo sąlygos"</string>
+<resources>
+  <string name="build_version_label">Versija</string>
+  <string name="open_source_license_detail_label">Išsami atvirojo šaltinio programinės įrangos licencijos informacija</string>
+  <string name="licenseActivityLabel">Atvirojo šaltinio licencijos</string>
+  <string name="privacy_policy_label">Privatumo politika</string>
+  <string name="terms_of_service_label">Paslaugų teikimo sąlygos</string>
 </resources>
diff --git a/java/com/android/dialer/about/res/values-lv/strings.xml b/java/com/android/dialer/about/res/values-lv/strings.xml
index ff99d8c..cded741 100644
--- a/java/com/android/dialer/about/res/values-lv/strings.xml
+++ b/java/com/android/dialer/about/res/values-lv/strings.xml
@@ -1,9 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="build_version_label" msgid="3876300343684966840">"Versija"</string>
-    <string name="open_source_license_detail_label" msgid="2860076509914623912">"Licences informācija par atklātā pirmkoda programmatūru"</string>
-    <string name="licenseActivityLabel" msgid="8258726177561826066">"Atklātā pirmkoda licences"</string>
-    <string name="privacy_policy_label" msgid="6567158248788870442">"Konfidencialitātes politika"</string>
-    <string name="terms_of_service_label" msgid="6788126078040996084">"Pakalpojumu sniegšanas noteikumi"</string>
+<resources>
+  <string name="build_version_label">Versija</string>
+  <string name="open_source_license_detail_label">Licences informācija par atklātā pirmkoda programmatūru</string>
+  <string name="licenseActivityLabel">Atklātā pirmkoda licences</string>
+  <string name="privacy_policy_label">Konfidencialitātes politika</string>
+  <string name="terms_of_service_label">Pakalpojumu sniegšanas noteikumi</string>
 </resources>
diff --git a/java/com/android/dialer/about/res/values-mk/strings.xml b/java/com/android/dialer/about/res/values-mk/strings.xml
index d4b8176..17a6cf4 100644
--- a/java/com/android/dialer/about/res/values-mk/strings.xml
+++ b/java/com/android/dialer/about/res/values-mk/strings.xml
@@ -1,9 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="build_version_label" msgid="3876300343684966840">"Верзија"</string>
-    <string name="open_source_license_detail_label" msgid="2860076509914623912">"Детали за лиценцата за софтвер со отворен код"</string>
-    <string name="licenseActivityLabel" msgid="8258726177561826066">"Лиценци за софтвер со отворен код"</string>
-    <string name="privacy_policy_label" msgid="6567158248788870442">"Политика за приватност"</string>
-    <string name="terms_of_service_label" msgid="6788126078040996084">"Услови на користење"</string>
+<resources>
+  <string name="build_version_label">Верзија</string>
+  <string name="open_source_license_detail_label">Детали за лиценцата за софтвер со отворен код</string>
+  <string name="licenseActivityLabel">Лиценци за софтвер со отворен код</string>
+  <string name="privacy_policy_label">Политика за приватност</string>
+  <string name="terms_of_service_label">Услови на користење</string>
 </resources>
diff --git a/java/com/android/dialer/about/res/values-ml/strings.xml b/java/com/android/dialer/about/res/values-ml/strings.xml
index 9071819..00ce568 100644
--- a/java/com/android/dialer/about/res/values-ml/strings.xml
+++ b/java/com/android/dialer/about/res/values-ml/strings.xml
@@ -1,9 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="build_version_label" msgid="3876300343684966840">"ബിൽഡ് പതിപ്പ്"</string>
-    <string name="open_source_license_detail_label" msgid="2860076509914623912">"ഓപ്പൺ സോഴ്‌സ് സോഫ്റ്റ്‌വെയറിനായുള്ള ലൈസൻസ് വിശദാംശങ്ങൾ"</string>
-    <string name="licenseActivityLabel" msgid="8258726177561826066">"ഓപ്പൺ സോഴ്‌സ് ലൈസൻസുകൾ"</string>
-    <string name="privacy_policy_label" msgid="6567158248788870442">"സ്വകാര്യതാ നയം"</string>
-    <string name="terms_of_service_label" msgid="6788126078040996084">"സേവന നിബന്ധനകൾ"</string>
+<resources>
+  <string name="build_version_label">ബിൽഡ് പതിപ്പ്</string>
+  <string name="open_source_license_detail_label">ഓപ്പൺ സോഴ്‌സ് സോഫ്റ്റ്‌വെയറിനായുള്ള ലൈസൻസ് വിശദാംശങ്ങൾ</string>
+  <string name="licenseActivityLabel">ഓപ്പൺ സോഴ്‌സ് ലൈസൻസുകൾ</string>
+  <string name="privacy_policy_label">സ്വകാര്യതാ നയം</string>
+  <string name="terms_of_service_label">സേവന നിബന്ധനകൾ</string>
 </resources>
diff --git a/java/com/android/dialer/about/res/values-mn/strings.xml b/java/com/android/dialer/about/res/values-mn/strings.xml
index c47ff9b..075fec8 100644
--- a/java/com/android/dialer/about/res/values-mn/strings.xml
+++ b/java/com/android/dialer/about/res/values-mn/strings.xml
@@ -1,9 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="build_version_label" msgid="3876300343684966840">"Хийгдсэн хувилбар"</string>
-    <string name="open_source_license_detail_label" msgid="2860076509914623912">"Нээлттэй эхийн програмын лицензийн мэдээлэл"</string>
-    <string name="licenseActivityLabel" msgid="8258726177561826066">"Нээлттэй эхийн лиценз"</string>
-    <string name="privacy_policy_label" msgid="6567158248788870442">"Нууцлалын бодлого"</string>
-    <string name="terms_of_service_label" msgid="6788126078040996084">"Үйлчилгээний нөхцөл"</string>
+<resources>
+  <string name="build_version_label">Хийгдсэн хувилбар</string>
+  <string name="open_source_license_detail_label">Нээлттэй эхийн програмын лицензийн мэдээлэл</string>
+  <string name="licenseActivityLabel">Нээлттэй эхийн лиценз</string>
+  <string name="privacy_policy_label">Нууцлалын бодлого</string>
+  <string name="terms_of_service_label">Үйлчилгээний нөхцөл</string>
 </resources>
diff --git a/java/com/android/dialer/about/res/values-mr/strings.xml b/java/com/android/dialer/about/res/values-mr/strings.xml
index 9f0b315..c89e7a4 100644
--- a/java/com/android/dialer/about/res/values-mr/strings.xml
+++ b/java/com/android/dialer/about/res/values-mr/strings.xml
@@ -1,9 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="build_version_label" msgid="3876300343684966840">"बिल्ड आवृत्ती"</string>
-    <string name="open_source_license_detail_label" msgid="2860076509914623912">"मुक्त स्त्रोत सॉफ्टवेअरसाठी परवाना तपशील"</string>
-    <string name="licenseActivityLabel" msgid="8258726177561826066">"मुक्त स्रोत परवाने"</string>
-    <string name="privacy_policy_label" msgid="6567158248788870442">"गोपनीयता धोरण"</string>
-    <string name="terms_of_service_label" msgid="6788126078040996084">"सेवा अटी"</string>
+<resources>
+  <string name="build_version_label">बिल्ड आवृत्ती</string>
+  <string name="open_source_license_detail_label">मुक्त स्त्रोत सॉफ्टवेअरसाठी परवाना तपशील</string>
+  <string name="licenseActivityLabel">मुक्त स्रोत परवाने</string>
+  <string name="privacy_policy_label">गोपनीयता धोरण</string>
+  <string name="terms_of_service_label">सेवा अटी</string>
 </resources>
diff --git a/java/com/android/dialer/about/res/values-ms/strings.xml b/java/com/android/dialer/about/res/values-ms/strings.xml
index d31a9ec..b28a3bc 100644
--- a/java/com/android/dialer/about/res/values-ms/strings.xml
+++ b/java/com/android/dialer/about/res/values-ms/strings.xml
@@ -1,9 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="build_version_label" msgid="3876300343684966840">"Versi binaan"</string>
-    <string name="open_source_license_detail_label" msgid="2860076509914623912">"Butiran lesen untuk perisian sumber terbuka"</string>
-    <string name="licenseActivityLabel" msgid="8258726177561826066">"Lesen sumber terbuka"</string>
-    <string name="privacy_policy_label" msgid="6567158248788870442">"Dasar privasi"</string>
-    <string name="terms_of_service_label" msgid="6788126078040996084">"Syarat perkhidmatan"</string>
+<resources>
+  <string name="build_version_label">Versi binaan</string>
+  <string name="open_source_license_detail_label">Butiran lesen untuk perisian sumber terbuka</string>
+  <string name="licenseActivityLabel">Lesen sumber terbuka</string>
+  <string name="privacy_policy_label">Dasar privasi</string>
+  <string name="terms_of_service_label">Syarat perkhidmatan</string>
 </resources>
diff --git a/java/com/android/dialer/about/res/values-my/strings.xml b/java/com/android/dialer/about/res/values-my/strings.xml
index d12c67d..5e87ce6 100644
--- a/java/com/android/dialer/about/res/values-my/strings.xml
+++ b/java/com/android/dialer/about/res/values-my/strings.xml
@@ -1,9 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="build_version_label" msgid="3876300343684966840">"တည်ဆောက်မှု ဗားရှင်း"</string>
-    <string name="open_source_license_detail_label" msgid="2860076509914623912">"အခမဲ့ရင်းမြစ်ဆော့ဖ်ဝဲအတွက် လိုင်စင်အသေးစိတ်များ"</string>
-    <string name="licenseActivityLabel" msgid="8258726177561826066">"အခမဲ့ရင်းမြစ်လိုင်စင်များ"</string>
-    <string name="privacy_policy_label" msgid="6567158248788870442">"ပုဂ္ဂိုလ်ရေးဆိုင်ရာ မူဝါဒ"</string>
-    <string name="terms_of_service_label" msgid="6788126078040996084">"ဝန်ဆောင်မှု စည်းမျဉ်းများ"</string>
+<resources>
+  <string name="build_version_label">တည်ဆောက်မှု ဗားရှင်း</string>
+  <string name="open_source_license_detail_label">အခမဲ့ရင်းမြစ်ဆော့ဖ်ဝဲအတွက် လိုင်စင်အသေးစိတ်များ</string>
+  <string name="licenseActivityLabel">အခမဲ့ရင်းမြစ်လိုင်စင်များ</string>
+  <string name="privacy_policy_label">ပုဂ္ဂိုလ်ရေးဆိုင်ရာ မူဝါဒ</string>
+  <string name="terms_of_service_label">ဝန်ဆောင်မှု စည်းမျဉ်းများ</string>
 </resources>
diff --git a/java/com/android/dialer/about/res/values-nb/strings.xml b/java/com/android/dialer/about/res/values-nb/strings.xml
index 5c09a07..40dfb37 100644
--- a/java/com/android/dialer/about/res/values-nb/strings.xml
+++ b/java/com/android/dialer/about/res/values-nb/strings.xml
@@ -1,9 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="build_version_label" msgid="3876300343684966840">"Delversjon"</string>
-    <string name="open_source_license_detail_label" msgid="2860076509914623912">"Lisensdetaljer for programvare med åpen kildekode"</string>
-    <string name="licenseActivityLabel" msgid="8258726177561826066">"Lisenser for åpen kildekode"</string>
-    <string name="privacy_policy_label" msgid="6567158248788870442">"Personvernregler"</string>
-    <string name="terms_of_service_label" msgid="6788126078040996084">"Vilkår for bruk"</string>
+<resources>
+  <string name="build_version_label">Delversjon</string>
+  <string name="open_source_license_detail_label">Lisensdetaljer for programvare med åpen kildekode</string>
+  <string name="licenseActivityLabel">Lisenser for åpen kildekode</string>
+  <string name="privacy_policy_label">Personvernregler</string>
+  <string name="terms_of_service_label">Vilkår for bruk</string>
 </resources>
diff --git a/java/com/android/dialer/about/res/values-ne/strings.xml b/java/com/android/dialer/about/res/values-ne/strings.xml
index c74309b..88c8394 100644
--- a/java/com/android/dialer/about/res/values-ne/strings.xml
+++ b/java/com/android/dialer/about/res/values-ne/strings.xml
@@ -1,9 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="build_version_label" msgid="3876300343684966840">"बिल्ड संस्करण"</string>
-    <string name="open_source_license_detail_label" msgid="2860076509914623912">"खुला स्रोतका सफ्टवेयरका इजाजतपत्र सम्बन्धी विवरणहरू"</string>
-    <string name="licenseActivityLabel" msgid="8258726177561826066">"खुला स्रोतका इजाजतपत्रहरू"</string>
-    <string name="privacy_policy_label" msgid="6567158248788870442">"गोपनीयता नीति"</string>
-    <string name="terms_of_service_label" msgid="6788126078040996084">"सेवाका सर्तहरू"</string>
+<resources>
+  <string name="build_version_label">बिल्ड संस्करण</string>
+  <string name="open_source_license_detail_label">खुला स्रोतका सफ्टवेयरका इजाजतपत्र सम्बन्धी विवरणहरू</string>
+  <string name="licenseActivityLabel">खुला स्रोतका इजाजतपत्रहरू</string>
+  <string name="privacy_policy_label">गोपनीयता नीति</string>
+  <string name="terms_of_service_label">सेवाका सर्तहरू</string>
 </resources>
diff --git a/java/com/android/dialer/about/res/values-nl/strings.xml b/java/com/android/dialer/about/res/values-nl/strings.xml
index 153da59..481add7 100644
--- a/java/com/android/dialer/about/res/values-nl/strings.xml
+++ b/java/com/android/dialer/about/res/values-nl/strings.xml
@@ -1,9 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="build_version_label" msgid="3876300343684966840">"Buildversie"</string>
-    <string name="open_source_license_detail_label" msgid="2860076509914623912">"Licentiedetails voor open-sourcesoftware"</string>
-    <string name="licenseActivityLabel" msgid="8258726177561826066">"Open-sourcelicenties"</string>
-    <string name="privacy_policy_label" msgid="6567158248788870442">"Privacybeleid"</string>
-    <string name="terms_of_service_label" msgid="6788126078040996084">"Servicevoorwaarden"</string>
+<resources>
+  <string name="build_version_label">Buildversie</string>
+  <string name="open_source_license_detail_label">Licentiedetails voor open-sourcesoftware</string>
+  <string name="licenseActivityLabel">Open-sourcelicenties</string>
+  <string name="privacy_policy_label">Privacybeleid</string>
+  <string name="terms_of_service_label">Servicevoorwaarden</string>
 </resources>
diff --git a/java/com/android/dialer/about/res/values-no/strings.xml b/java/com/android/dialer/about/res/values-no/strings.xml
index 5c09a07..40dfb37 100644
--- a/java/com/android/dialer/about/res/values-no/strings.xml
+++ b/java/com/android/dialer/about/res/values-no/strings.xml
@@ -1,9 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="build_version_label" msgid="3876300343684966840">"Delversjon"</string>
-    <string name="open_source_license_detail_label" msgid="2860076509914623912">"Lisensdetaljer for programvare med åpen kildekode"</string>
-    <string name="licenseActivityLabel" msgid="8258726177561826066">"Lisenser for åpen kildekode"</string>
-    <string name="privacy_policy_label" msgid="6567158248788870442">"Personvernregler"</string>
-    <string name="terms_of_service_label" msgid="6788126078040996084">"Vilkår for bruk"</string>
+<resources>
+  <string name="build_version_label">Delversjon</string>
+  <string name="open_source_license_detail_label">Lisensdetaljer for programvare med åpen kildekode</string>
+  <string name="licenseActivityLabel">Lisenser for åpen kildekode</string>
+  <string name="privacy_policy_label">Personvernregler</string>
+  <string name="terms_of_service_label">Vilkår for bruk</string>
 </resources>
diff --git a/java/com/android/dialer/about/res/values-pa/strings.xml b/java/com/android/dialer/about/res/values-pa/strings.xml
index 94c0bec..deb84bb 100644
--- a/java/com/android/dialer/about/res/values-pa/strings.xml
+++ b/java/com/android/dialer/about/res/values-pa/strings.xml
@@ -1,9 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="build_version_label" msgid="3876300343684966840">"ਨਿਰਮਾਣ ਰੂਪ"</string>
-    <string name="open_source_license_detail_label" msgid="2860076509914623912">"ਖੁੱਲ੍ਹੇ ਸਰੋਤ ਸਾਫਟਵੇਅਰ ਲਈ ਲਾਇਸੰਸ ਵੇਰਵੇ"</string>
-    <string name="licenseActivityLabel" msgid="8258726177561826066">"ਖੁੱਲ੍ਹੇ ਸਰੋਤ ਲਾਇਸੰਸ"</string>
-    <string name="privacy_policy_label" msgid="6567158248788870442">"ਪਰਦੇਦਾਰੀ ਨੀਤੀ"</string>
-    <string name="terms_of_service_label" msgid="6788126078040996084">"ਸੇਵਾ ਦੀਆਂ ਮਦਾਂ"</string>
+<resources>
+  <string name="build_version_label">ਨਿਰਮਾਣ ਰੂਪ</string>
+  <string name="open_source_license_detail_label">ਖੁੱਲ੍ਹੇ ਸਰੋਤ ਸਾਫਟਵੇਅਰ ਲਈ ਲਾਇਸੰਸ ਵੇਰਵੇ</string>
+  <string name="licenseActivityLabel">ਖੁੱਲ੍ਹੇ ਸਰੋਤ ਲਾਇਸੰਸ</string>
+  <string name="privacy_policy_label">ਪਰਦੇਦਾਰੀ ਨੀਤੀ</string>
+  <string name="terms_of_service_label">ਸੇਵਾ ਦੀਆਂ ਮਦਾਂ</string>
 </resources>
diff --git a/java/com/android/dialer/about/res/values-pl/strings.xml b/java/com/android/dialer/about/res/values-pl/strings.xml
index 277573a..948aba4 100644
--- a/java/com/android/dialer/about/res/values-pl/strings.xml
+++ b/java/com/android/dialer/about/res/values-pl/strings.xml
@@ -1,9 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="build_version_label" msgid="3876300343684966840">"Wersja kompilacji"</string>
-    <string name="open_source_license_detail_label" msgid="2860076509914623912">"Szczegóły licencji na oprogramowanie open source"</string>
-    <string name="licenseActivityLabel" msgid="8258726177561826066">"Licencje open source"</string>
-    <string name="privacy_policy_label" msgid="6567158248788870442">"Polityka prywatności"</string>
-    <string name="terms_of_service_label" msgid="6788126078040996084">"Warunki korzystania z usługi"</string>
+<resources>
+  <string name="build_version_label">Wersja kompilacji</string>
+  <string name="open_source_license_detail_label">Szczegóły licencji na oprogramowanie open source</string>
+  <string name="licenseActivityLabel">Licencje open source</string>
+  <string name="privacy_policy_label">Polityka prywatności</string>
+  <string name="terms_of_service_label">Warunki korzystania z usługi</string>
 </resources>
diff --git a/java/com/android/dialer/about/res/values-pt-rBR/strings.xml b/java/com/android/dialer/about/res/values-pt-rBR/strings.xml
index c4b860d..2c21f23 100644
--- a/java/com/android/dialer/about/res/values-pt-rBR/strings.xml
+++ b/java/com/android/dialer/about/res/values-pt-rBR/strings.xml
@@ -1,9 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="build_version_label" msgid="3876300343684966840">"Versão"</string>
-    <string name="open_source_license_detail_label" msgid="2860076509914623912">"Detalhes da licença do software de código aberto"</string>
-    <string name="licenseActivityLabel" msgid="8258726177561826066">"Licenças de código aberto"</string>
-    <string name="privacy_policy_label" msgid="6567158248788870442">"Política de privacidade"</string>
-    <string name="terms_of_service_label" msgid="6788126078040996084">"Termos de Serviço"</string>
+<resources>
+  <string name="build_version_label">Versão</string>
+  <string name="open_source_license_detail_label">Detalhes da licença do software de código aberto</string>
+  <string name="licenseActivityLabel">Licenças de código aberto</string>
+  <string name="privacy_policy_label">Política de privacidade</string>
+  <string name="terms_of_service_label">Termos de Serviço</string>
 </resources>
diff --git a/java/com/android/dialer/about/res/values-pt-rPT/strings.xml b/java/com/android/dialer/about/res/values-pt-rPT/strings.xml
index f7c7cd6..c3ffd16 100644
--- a/java/com/android/dialer/about/res/values-pt-rPT/strings.xml
+++ b/java/com/android/dialer/about/res/values-pt-rPT/strings.xml
@@ -1,9 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="build_version_label" msgid="3876300343684966840">"Versão da compilação"</string>
-    <string name="open_source_license_detail_label" msgid="2860076509914623912">"Detalhes da licença para software de código aberto"</string>
-    <string name="licenseActivityLabel" msgid="8258726177561826066">"Licenças de código aberto"</string>
-    <string name="privacy_policy_label" msgid="6567158248788870442">"Política de Privacidade"</string>
-    <string name="terms_of_service_label" msgid="6788126078040996084">"Termos de Utilização"</string>
+<resources>
+  <string name="build_version_label">Versão da compilação</string>
+  <string name="open_source_license_detail_label">Detalhes da licença para software de código aberto</string>
+  <string name="licenseActivityLabel">Licenças de código aberto</string>
+  <string name="privacy_policy_label">Política de Privacidade</string>
+  <string name="terms_of_service_label">Termos de Utilização</string>
 </resources>
diff --git a/java/com/android/dialer/about/res/values-pt/strings.xml b/java/com/android/dialer/about/res/values-pt/strings.xml
index c4b860d..2c21f23 100644
--- a/java/com/android/dialer/about/res/values-pt/strings.xml
+++ b/java/com/android/dialer/about/res/values-pt/strings.xml
@@ -1,9 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="build_version_label" msgid="3876300343684966840">"Versão"</string>
-    <string name="open_source_license_detail_label" msgid="2860076509914623912">"Detalhes da licença do software de código aberto"</string>
-    <string name="licenseActivityLabel" msgid="8258726177561826066">"Licenças de código aberto"</string>
-    <string name="privacy_policy_label" msgid="6567158248788870442">"Política de privacidade"</string>
-    <string name="terms_of_service_label" msgid="6788126078040996084">"Termos de Serviço"</string>
+<resources>
+  <string name="build_version_label">Versão</string>
+  <string name="open_source_license_detail_label">Detalhes da licença do software de código aberto</string>
+  <string name="licenseActivityLabel">Licenças de código aberto</string>
+  <string name="privacy_policy_label">Política de privacidade</string>
+  <string name="terms_of_service_label">Termos de Serviço</string>
 </resources>
diff --git a/java/com/android/dialer/about/res/values-ro/strings.xml b/java/com/android/dialer/about/res/values-ro/strings.xml
index 909a7db..20183ef 100644
--- a/java/com/android/dialer/about/res/values-ro/strings.xml
+++ b/java/com/android/dialer/about/res/values-ro/strings.xml
@@ -1,9 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="build_version_label" msgid="3876300343684966840">"Versiunea"</string>
-    <string name="open_source_license_detail_label" msgid="2860076509914623912">"Detalii privind licența pentru software-ul open source"</string>
-    <string name="licenseActivityLabel" msgid="8258726177561826066">"Licențe open source"</string>
-    <string name="privacy_policy_label" msgid="6567158248788870442">"Politică de confidențialitate"</string>
-    <string name="terms_of_service_label" msgid="6788126078040996084">"Termeni și condiții"</string>
+<resources>
+  <string name="build_version_label">Versiunea</string>
+  <string name="open_source_license_detail_label">Detalii privind licența pentru software-ul open source</string>
+  <string name="licenseActivityLabel">Licențe open source</string>
+  <string name="privacy_policy_label">Politică de confidențialitate</string>
+  <string name="terms_of_service_label">Termeni și condiții</string>
 </resources>
diff --git a/java/com/android/dialer/about/res/values-ru/strings.xml b/java/com/android/dialer/about/res/values-ru/strings.xml
index fee6dfd..2cd1291 100644
--- a/java/com/android/dialer/about/res/values-ru/strings.xml
+++ b/java/com/android/dialer/about/res/values-ru/strings.xml
@@ -1,9 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="build_version_label" msgid="3876300343684966840">"Версия сборки"</string>
-    <string name="open_source_license_detail_label" msgid="2860076509914623912">"Сведения о лицензиях на ПО с открытым исходным кодом"</string>
-    <string name="licenseActivityLabel" msgid="8258726177561826066">"Лицензии открытого ПО"</string>
-    <string name="privacy_policy_label" msgid="6567158248788870442">"Конфиденциальность"</string>
-    <string name="terms_of_service_label" msgid="6788126078040996084">"Условия использования"</string>
+<resources>
+  <string name="build_version_label">Версия сборки</string>
+  <string name="open_source_license_detail_label">Сведения о лицензиях на ПО с открытым исходным кодом</string>
+  <string name="licenseActivityLabel">Лицензии открытого ПО</string>
+  <string name="privacy_policy_label">Конфиденциальность</string>
+  <string name="terms_of_service_label">Условия использования</string>
 </resources>
diff --git a/java/com/android/dialer/about/res/values-si/strings.xml b/java/com/android/dialer/about/res/values-si/strings.xml
index 24233ea..2fb320b 100644
--- a/java/com/android/dialer/about/res/values-si/strings.xml
+++ b/java/com/android/dialer/about/res/values-si/strings.xml
@@ -1,9 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="build_version_label" msgid="3876300343684966840">"නිමැවුම් අනුවාදය"</string>
-    <string name="open_source_license_detail_label" msgid="2860076509914623912">"විවෘත මූලාශ්‍ර මෘදුකාංග සඳහා බලපත්‍ර විස්තර"</string>
-    <string name="licenseActivityLabel" msgid="8258726177561826066">"විවෘත මූලාශ්‍ර බලපත්‍ර"</string>
-    <string name="privacy_policy_label" msgid="6567158248788870442">"රහස්‍යතා ප්‍රතිපත්තිය"</string>
-    <string name="terms_of_service_label" msgid="6788126078040996084">"සේවා නියම"</string>
+<resources>
+  <string name="build_version_label">නිමැවුම් අනුවාදය</string>
+  <string name="open_source_license_detail_label">විවෘත මූලාශ්‍ර මෘදුකාංග සඳහා බලපත්‍ර විස්තර</string>
+  <string name="licenseActivityLabel">විවෘත මූලාශ්‍ර බලපත්‍ර</string>
+  <string name="privacy_policy_label">රහස්‍යතා ප්‍රතිපත්තිය</string>
+  <string name="terms_of_service_label">සේවා නියම</string>
 </resources>
diff --git a/java/com/android/dialer/about/res/values-sk/strings.xml b/java/com/android/dialer/about/res/values-sk/strings.xml
index d772ed0..24b394f 100644
--- a/java/com/android/dialer/about/res/values-sk/strings.xml
+++ b/java/com/android/dialer/about/res/values-sk/strings.xml
@@ -1,9 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="build_version_label" msgid="3876300343684966840">"Verzia zostavy"</string>
-    <string name="open_source_license_detail_label" msgid="2860076509914623912">"Podrobnosti o licenciách pre softvér open source"</string>
-    <string name="licenseActivityLabel" msgid="8258726177561826066">"Licencie open source"</string>
-    <string name="privacy_policy_label" msgid="6567158248788870442">"Pravidlá ochrany súkromia"</string>
-    <string name="terms_of_service_label" msgid="6788126078040996084">"Zmluvné podmienky"</string>
+<resources>
+  <string name="build_version_label">Verzia zostavy</string>
+  <string name="open_source_license_detail_label">Podrobnosti o licenciách pre softvér open source</string>
+  <string name="licenseActivityLabel">Licencie open source</string>
+  <string name="privacy_policy_label">Pravidlá ochrany súkromia</string>
+  <string name="terms_of_service_label">Zmluvné podmienky</string>
 </resources>
diff --git a/java/com/android/dialer/about/res/values-sl/strings.xml b/java/com/android/dialer/about/res/values-sl/strings.xml
index ec15815..f0f28c5 100644
--- a/java/com/android/dialer/about/res/values-sl/strings.xml
+++ b/java/com/android/dialer/about/res/values-sl/strings.xml
@@ -1,9 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="build_version_label" msgid="3876300343684966840">"Delovna različica"</string>
-    <string name="open_source_license_detail_label" msgid="2860076509914623912">"Podrobnosti o licenci za odprtokodno programsko opremo"</string>
-    <string name="licenseActivityLabel" msgid="8258726177561826066">"Odprtokodne licence"</string>
-    <string name="privacy_policy_label" msgid="6567158248788870442">"Pravilnik o zasebnosti"</string>
-    <string name="terms_of_service_label" msgid="6788126078040996084">"Pogoji storitve"</string>
+<resources>
+  <string name="build_version_label">Delovna različica</string>
+  <string name="open_source_license_detail_label">Podrobnosti o licenci za odprtokodno programsko opremo</string>
+  <string name="licenseActivityLabel">Odprtokodne licence</string>
+  <string name="privacy_policy_label">Pravilnik o zasebnosti</string>
+  <string name="terms_of_service_label">Pogoji storitve</string>
 </resources>
diff --git a/java/com/android/dialer/about/res/values-sq/strings.xml b/java/com/android/dialer/about/res/values-sq/strings.xml
index 6b6bbd2..64369cc 100644
--- a/java/com/android/dialer/about/res/values-sq/strings.xml
+++ b/java/com/android/dialer/about/res/values-sq/strings.xml
@@ -1,9 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="build_version_label" msgid="3876300343684966840">"Versioni i ndërtimit"</string>
-    <string name="open_source_license_detail_label" msgid="2860076509914623912">"Detajet e licencës për softuer me burim të hapur"</string>
-    <string name="licenseActivityLabel" msgid="8258726177561826066">"Licencat me burim të hapur"</string>
-    <string name="privacy_policy_label" msgid="6567158248788870442">"Politika e privatësisë"</string>
-    <string name="terms_of_service_label" msgid="6788126078040996084">"Kushtet e shërbimit"</string>
+<resources>
+  <string name="build_version_label">Versioni i ndërtimit</string>
+  <string name="open_source_license_detail_label">Detajet e licencës për softuer me burim të hapur</string>
+  <string name="licenseActivityLabel">Licencat me burim të hapur</string>
+  <string name="privacy_policy_label">Politika e privatësisë</string>
+  <string name="terms_of_service_label">Kushtet e shërbimit</string>
 </resources>
diff --git a/java/com/android/dialer/about/res/values-sr/strings.xml b/java/com/android/dialer/about/res/values-sr/strings.xml
index 454e3c4..44442b9 100644
--- a/java/com/android/dialer/about/res/values-sr/strings.xml
+++ b/java/com/android/dialer/about/res/values-sr/strings.xml
@@ -1,9 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="build_version_label" msgid="3876300343684966840">"Верзија"</string>
-    <string name="open_source_license_detail_label" msgid="2860076509914623912">"Подаци о лиценци за софтвер отвореног кода"</string>
-    <string name="licenseActivityLabel" msgid="8258726177561826066">"Лиценце отвореног кода"</string>
-    <string name="privacy_policy_label" msgid="6567158248788870442">"Политика приватности"</string>
-    <string name="terms_of_service_label" msgid="6788126078040996084">"Услови коришћења услуге"</string>
+<resources>
+  <string name="build_version_label">Верзија</string>
+  <string name="open_source_license_detail_label">Подаци о лиценци за софтвер отвореног кода</string>
+  <string name="licenseActivityLabel">Лиценце отвореног кода</string>
+  <string name="privacy_policy_label">Политика приватности</string>
+  <string name="terms_of_service_label">Услови коришћења услуге</string>
 </resources>
diff --git a/java/com/android/dialer/about/res/values-sv/strings.xml b/java/com/android/dialer/about/res/values-sv/strings.xml
index 082cb50..2f60771 100644
--- a/java/com/android/dialer/about/res/values-sv/strings.xml
+++ b/java/com/android/dialer/about/res/values-sv/strings.xml
@@ -1,9 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="build_version_label" msgid="3876300343684966840">"Programversion"</string>
-    <string name="open_source_license_detail_label" msgid="2860076509914623912">"Licensinformation för programvara med öppen källkod"</string>
-    <string name="licenseActivityLabel" msgid="8258726177561826066">"Licenser för öppen källkod"</string>
-    <string name="privacy_policy_label" msgid="6567158248788870442">"Sekretesspolicy"</string>
-    <string name="terms_of_service_label" msgid="6788126078040996084">"Användarvillkor"</string>
+<resources>
+  <string name="build_version_label">Programversion</string>
+  <string name="open_source_license_detail_label">Licensinformation för programvara med öppen källkod</string>
+  <string name="licenseActivityLabel">Licenser för öppen källkod</string>
+  <string name="privacy_policy_label">Sekretesspolicy</string>
+  <string name="terms_of_service_label">Användarvillkor</string>
 </resources>
diff --git a/java/com/android/dialer/about/res/values-sw/strings.xml b/java/com/android/dialer/about/res/values-sw/strings.xml
index da14889..d84e07d 100644
--- a/java/com/android/dialer/about/res/values-sw/strings.xml
+++ b/java/com/android/dialer/about/res/values-sw/strings.xml
@@ -1,9 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="build_version_label" msgid="3876300343684966840">"Toleo la muundo"</string>
-    <string name="open_source_license_detail_label" msgid="2860076509914623912">"Maelezo ya leseni za programu huria"</string>
-    <string name="licenseActivityLabel" msgid="8258726177561826066">"Leseni za programu huria"</string>
-    <string name="privacy_policy_label" msgid="6567158248788870442">"Sera ya faragha"</string>
-    <string name="terms_of_service_label" msgid="6788126078040996084">"Sheria na masharti"</string>
+<resources>
+  <string name="build_version_label">Toleo la muundo</string>
+  <string name="open_source_license_detail_label">Maelezo ya leseni za programu huria</string>
+  <string name="licenseActivityLabel">Leseni za programu huria</string>
+  <string name="privacy_policy_label">Sera ya faragha</string>
+  <string name="terms_of_service_label">Sheria na masharti</string>
 </resources>
diff --git a/java/com/android/dialer/about/res/values-ta/strings.xml b/java/com/android/dialer/about/res/values-ta/strings.xml
index ad3c0e6..87c4f69 100644
--- a/java/com/android/dialer/about/res/values-ta/strings.xml
+++ b/java/com/android/dialer/about/res/values-ta/strings.xml
@@ -1,9 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="build_version_label" msgid="3876300343684966840">"நடப்புப் பதிப்பு"</string>
-    <string name="open_source_license_detail_label" msgid="2860076509914623912">"ஓப்பன் சோர்ஸ் மென்பொருளுக்கான உரிம விவரங்கள்"</string>
-    <string name="licenseActivityLabel" msgid="8258726177561826066">"ஓப்பன் சோர்ஸ் உரிமங்கள்"</string>
-    <string name="privacy_policy_label" msgid="6567158248788870442">"தனியுரிமைக் கொள்கை"</string>
-    <string name="terms_of_service_label" msgid="6788126078040996084">"சேவை விதிமுறைகள்"</string>
+<resources>
+  <string name="build_version_label">நடப்புப் பதிப்பு</string>
+  <string name="open_source_license_detail_label">ஓப்பன் சோர்ஸ் மென்பொருளுக்கான உரிம விவரங்கள்</string>
+  <string name="licenseActivityLabel">ஓப்பன் சோர்ஸ் உரிமங்கள்</string>
+  <string name="privacy_policy_label">தனியுரிமைக் கொள்கை</string>
+  <string name="terms_of_service_label">சேவை விதிமுறைகள்</string>
 </resources>
diff --git a/java/com/android/dialer/about/res/values-te/strings.xml b/java/com/android/dialer/about/res/values-te/strings.xml
index 183ed88..5d0c674 100644
--- a/java/com/android/dialer/about/res/values-te/strings.xml
+++ b/java/com/android/dialer/about/res/values-te/strings.xml
@@ -1,9 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="build_version_label" msgid="3876300343684966840">"బిల్డ్ సంస్కరణ"</string>
-    <string name="open_source_license_detail_label" msgid="2860076509914623912">"ఓపెన్ సోర్స్ సాఫ్ట్‌వేర్ యొక్క లైసెన్స్ వివరాలు"</string>
-    <string name="licenseActivityLabel" msgid="8258726177561826066">"ఓపెన్ సోర్స్ లైసెన్స్‌లు"</string>
-    <string name="privacy_policy_label" msgid="6567158248788870442">"గోప్యతా విధానం"</string>
-    <string name="terms_of_service_label" msgid="6788126078040996084">"సేవా నిబంధనలు"</string>
+<resources>
+  <string name="build_version_label">బిల్డ్ సంస్కరణ</string>
+  <string name="open_source_license_detail_label">ఓపెన్ సోర్స్ సాఫ్ట్‌వేర్ యొక్క లైసెన్స్ వివరాలు</string>
+  <string name="licenseActivityLabel">ఓపెన్ సోర్స్ లైసెన్స్‌లు</string>
+  <string name="privacy_policy_label">గోప్యతా విధానం</string>
+  <string name="terms_of_service_label">సేవా నిబంధనలు</string>
 </resources>
diff --git a/java/com/android/dialer/about/res/values-th/strings.xml b/java/com/android/dialer/about/res/values-th/strings.xml
index fead923..12d2bf0 100644
--- a/java/com/android/dialer/about/res/values-th/strings.xml
+++ b/java/com/android/dialer/about/res/values-th/strings.xml
@@ -1,9 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="build_version_label" msgid="3876300343684966840">"เวอร์ชันบิวด์"</string>
-    <string name="open_source_license_detail_label" msgid="2860076509914623912">"รายละเอียดสัญญาอนุญาตสำหรับซอฟต์แวร์โอเพนซอร์ส"</string>
-    <string name="licenseActivityLabel" msgid="8258726177561826066">"สัญญาอนุญาตโอเพนซอร์ส"</string>
-    <string name="privacy_policy_label" msgid="6567158248788870442">"นโยบายความเป็นส่วนตัว"</string>
-    <string name="terms_of_service_label" msgid="6788126078040996084">"ข้อกำหนดในการให้บริการ"</string>
+<resources>
+  <string name="build_version_label">เวอร์ชันบิวด์</string>
+  <string name="open_source_license_detail_label">รายละเอียดใบอนุญาตสำหรับซอฟต์แวร์โอเพนซอร์ส</string>
+  <string name="licenseActivityLabel">ใบอนุญาตโอเพนซอร์ส</string>
+  <string name="privacy_policy_label">นโยบายความเป็นส่วนตัว</string>
+  <string name="terms_of_service_label">ข้อกำหนดในการให้บริการ</string>
 </resources>
diff --git a/java/com/android/dialer/about/res/values-tl/strings.xml b/java/com/android/dialer/about/res/values-tl/strings.xml
index 5331e42..68f0395 100644
--- a/java/com/android/dialer/about/res/values-tl/strings.xml
+++ b/java/com/android/dialer/about/res/values-tl/strings.xml
@@ -1,9 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="build_version_label" msgid="3876300343684966840">"Bersyon ng build"</string>
-    <string name="open_source_license_detail_label" msgid="2860076509914623912">"Mga detalye ng lisensya para sa open source na software"</string>
-    <string name="licenseActivityLabel" msgid="8258726177561826066">"Mga open source na lisensya"</string>
-    <string name="privacy_policy_label" msgid="6567158248788870442">"Patakaran sa privacy"</string>
-    <string name="terms_of_service_label" msgid="6788126078040996084">"Mga tuntunin ng serbisyo"</string>
+<resources>
+  <string name="build_version_label">Bersyon ng build</string>
+  <string name="open_source_license_detail_label">Mga detalye ng lisensya para sa open source na software</string>
+  <string name="licenseActivityLabel">Mga open source na lisensya</string>
+  <string name="privacy_policy_label">Patakaran sa privacy</string>
+  <string name="terms_of_service_label">Mga tuntunin ng serbisyo</string>
 </resources>
diff --git a/java/com/android/dialer/about/res/values-tr/strings.xml b/java/com/android/dialer/about/res/values-tr/strings.xml
index ab9583b..8aec66e 100644
--- a/java/com/android/dialer/about/res/values-tr/strings.xml
+++ b/java/com/android/dialer/about/res/values-tr/strings.xml
@@ -1,9 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="build_version_label" msgid="3876300343684966840">"Derleme sürümü"</string>
-    <string name="open_source_license_detail_label" msgid="2860076509914623912">"Açık kaynak yazılımlar için lisans ayrıntıları"</string>
-    <string name="licenseActivityLabel" msgid="8258726177561826066">"Açık kaynak lisansları"</string>
-    <string name="privacy_policy_label" msgid="6567158248788870442">"Gizlilik politikası"</string>
-    <string name="terms_of_service_label" msgid="6788126078040996084">"Hizmet şartları"</string>
+<resources>
+  <string name="build_version_label">Derleme sürümü</string>
+  <string name="open_source_license_detail_label">Açık kaynak yazılımlar için lisans ayrıntıları</string>
+  <string name="licenseActivityLabel">Açık kaynak lisansları</string>
+  <string name="privacy_policy_label">Gizlilik politikası</string>
+  <string name="terms_of_service_label">Hizmet şartları</string>
 </resources>
diff --git a/java/com/android/dialer/about/res/values-uk/strings.xml b/java/com/android/dialer/about/res/values-uk/strings.xml
index f833f37..a7ef68d 100644
--- a/java/com/android/dialer/about/res/values-uk/strings.xml
+++ b/java/com/android/dialer/about/res/values-uk/strings.xml
@@ -1,9 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="build_version_label" msgid="3876300343684966840">"Версія складання"</string>
-    <string name="open_source_license_detail_label" msgid="2860076509914623912">"Деталі ліцензій на програмне забезпечення з відкритим кодом"</string>
-    <string name="licenseActivityLabel" msgid="8258726177561826066">"Ліцензії з відкритим кодом"</string>
-    <string name="privacy_policy_label" msgid="6567158248788870442">"Політика конфіденційності"</string>
-    <string name="terms_of_service_label" msgid="6788126078040996084">"Умови використання"</string>
+<resources>
+  <string name="build_version_label">Версія складання</string>
+  <string name="open_source_license_detail_label">Деталі ліцензій на програмне забезпечення з відкритим кодом</string>
+  <string name="licenseActivityLabel">Ліцензії з відкритим кодом</string>
+  <string name="privacy_policy_label">Політика конфіденційності</string>
+  <string name="terms_of_service_label">Умови використання</string>
 </resources>
diff --git a/java/com/android/dialer/about/res/values-ur/strings.xml b/java/com/android/dialer/about/res/values-ur/strings.xml
index 2404b4d..072cebc 100644
--- a/java/com/android/dialer/about/res/values-ur/strings.xml
+++ b/java/com/android/dialer/about/res/values-ur/strings.xml
@@ -1,9 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="build_version_label" msgid="3876300343684966840">"بلڈ ورژن"</string>
-    <string name="open_source_license_detail_label" msgid="2860076509914623912">"اوپن سورس سافٹ ویئر کیلئے لائسنس کی تفصیلات"</string>
-    <string name="licenseActivityLabel" msgid="8258726177561826066">"اوپن سورس لائسنسز"</string>
-    <string name="privacy_policy_label" msgid="6567158248788870442">"رازداری کی پالیسی"</string>
-    <string name="terms_of_service_label" msgid="6788126078040996084">"سروس کی شرائط"</string>
+<resources>
+  <string name="build_version_label">بلڈ ورژن</string>
+  <string name="open_source_license_detail_label">اوپن سورس سافٹ ویئر کیلئے لائسنس کی تفصیلات</string>
+  <string name="licenseActivityLabel">اوپن سورس لائسنسز</string>
+  <string name="privacy_policy_label">رازداری کی پالیسی</string>
+  <string name="terms_of_service_label">سروس کی شرائط</string>
 </resources>
diff --git a/java/com/android/dialer/about/res/values-uz/strings.xml b/java/com/android/dialer/about/res/values-uz/strings.xml
index fa1f274..325e293 100644
--- a/java/com/android/dialer/about/res/values-uz/strings.xml
+++ b/java/com/android/dialer/about/res/values-uz/strings.xml
@@ -1,9 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="build_version_label" msgid="3876300343684966840">"Yig‘ma versiyasi"</string>
-    <string name="open_source_license_detail_label" msgid="2860076509914623912">"Ochiq kodli DT litsenziyalari haqida ma’lumot"</string>
-    <string name="licenseActivityLabel" msgid="8258726177561826066">"Ochiq kodli DT litsenziyalari"</string>
-    <string name="privacy_policy_label" msgid="6567158248788870442">"Maxfiylik siyosati"</string>
-    <string name="terms_of_service_label" msgid="6788126078040996084">"Foydalanish shartlari"</string>
+<resources>
+  <string name="build_version_label">Yig‘ma versiyasi</string>
+  <string name="open_source_license_detail_label">Ochiq kodli DT litsenziyalari haqida ma’lumot</string>
+  <string name="licenseActivityLabel">Ochiq kodli DT litsenziyalari</string>
+  <string name="privacy_policy_label">Maxfiylik siyosati</string>
+  <string name="terms_of_service_label">Foydalanish shartlari</string>
 </resources>
diff --git a/java/com/android/dialer/about/res/values-vi/strings.xml b/java/com/android/dialer/about/res/values-vi/strings.xml
index 413909a..67ce780 100644
--- a/java/com/android/dialer/about/res/values-vi/strings.xml
+++ b/java/com/android/dialer/about/res/values-vi/strings.xml
@@ -1,9 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="build_version_label" msgid="3876300343684966840">"Phiên bản đóng gói"</string>
-    <string name="open_source_license_detail_label" msgid="2860076509914623912">"Chi tiết giấy phép cho phần mềm nguồn mở"</string>
-    <string name="licenseActivityLabel" msgid="8258726177561826066">"Giấy phép nguồn mở"</string>
-    <string name="privacy_policy_label" msgid="6567158248788870442">"Chính sách bảo mật"</string>
-    <string name="terms_of_service_label" msgid="6788126078040996084">"Điều khoản dịch vụ"</string>
+<resources>
+  <string name="build_version_label">Phiên bản đóng gói</string>
+  <string name="open_source_license_detail_label">Chi tiết giấy phép cho phần mềm nguồn mở</string>
+  <string name="licenseActivityLabel">Giấy phép nguồn mở</string>
+  <string name="privacy_policy_label">Chính sách bảo mật</string>
+  <string name="terms_of_service_label">Điều khoản dịch vụ</string>
 </resources>
diff --git a/java/com/android/dialer/about/res/values-zh-rCN/strings.xml b/java/com/android/dialer/about/res/values-zh-rCN/strings.xml
index a21d656..7efd200 100644
--- a/java/com/android/dialer/about/res/values-zh-rCN/strings.xml
+++ b/java/com/android/dialer/about/res/values-zh-rCN/strings.xml
@@ -1,9 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="build_version_label" msgid="3876300343684966840">"版本号"</string>
-    <string name="open_source_license_detail_label" msgid="2860076509914623912">"开放源代码软件的许可详情"</string>
-    <string name="licenseActivityLabel" msgid="8258726177561826066">"开放源代码许可"</string>
-    <string name="privacy_policy_label" msgid="6567158248788870442">"隐私权政策"</string>
-    <string name="terms_of_service_label" msgid="6788126078040996084">"服务条款"</string>
+<resources>
+  <string name="build_version_label">版本号</string>
+  <string name="open_source_license_detail_label">开放源代码软件的许可详情</string>
+  <string name="licenseActivityLabel">开放源代码许可</string>
+  <string name="privacy_policy_label">隐私权政策</string>
+  <string name="terms_of_service_label">服务条款</string>
 </resources>
diff --git a/java/com/android/dialer/about/res/values-zh-rHK/strings.xml b/java/com/android/dialer/about/res/values-zh-rHK/strings.xml
index bd8b880..f188b7e 100644
--- a/java/com/android/dialer/about/res/values-zh-rHK/strings.xml
+++ b/java/com/android/dialer/about/res/values-zh-rHK/strings.xml
@@ -1,9 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="build_version_label" msgid="3876300343684966840">"型號版本"</string>
-    <string name="open_source_license_detail_label" msgid="2860076509914623912">"開放原始碼軟件的授權詳情"</string>
-    <string name="licenseActivityLabel" msgid="8258726177561826066">"開放原始碼授權"</string>
-    <string name="privacy_policy_label" msgid="6567158248788870442">"私隱權政策"</string>
-    <string name="terms_of_service_label" msgid="6788126078040996084">"服務條款"</string>
+<resources>
+  <string name="build_version_label">型號版本</string>
+  <string name="open_source_license_detail_label">開放原始碼軟件的授權詳情</string>
+  <string name="licenseActivityLabel">開放原始碼授權</string>
+  <string name="privacy_policy_label">私隱權政策</string>
+  <string name="terms_of_service_label">服務條款</string>
 </resources>
diff --git a/java/com/android/dialer/about/res/values-zh-rTW/strings.xml b/java/com/android/dialer/about/res/values-zh-rTW/strings.xml
index 32809bc..5612957 100644
--- a/java/com/android/dialer/about/res/values-zh-rTW/strings.xml
+++ b/java/com/android/dialer/about/res/values-zh-rTW/strings.xml
@@ -1,9 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="build_version_label" msgid="3876300343684966840">"版本"</string>
-    <string name="open_source_license_detail_label" msgid="2860076509914623912">"開放原始碼軟體的授權詳細資料"</string>
-    <string name="licenseActivityLabel" msgid="8258726177561826066">"開放原始碼授權"</string>
-    <string name="privacy_policy_label" msgid="6567158248788870442">"隱私權政策"</string>
-    <string name="terms_of_service_label" msgid="6788126078040996084">"服務條款"</string>
+<resources>
+  <string name="build_version_label">版本</string>
+  <string name="open_source_license_detail_label">開放原始碼軟體的授權詳細資料</string>
+  <string name="licenseActivityLabel">開放原始碼授權</string>
+  <string name="privacy_policy_label">隱私權政策</string>
+  <string name="terms_of_service_label">服務條款</string>
 </resources>
diff --git a/java/com/android/dialer/about/res/values-zu/strings.xml b/java/com/android/dialer/about/res/values-zu/strings.xml
index 921a78d..4954ccc 100644
--- a/java/com/android/dialer/about/res/values-zu/strings.xml
+++ b/java/com/android/dialer/about/res/values-zu/strings.xml
@@ -1,9 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="build_version_label" msgid="3876300343684966840">"Yakha inguqulo"</string>
-    <string name="open_source_license_detail_label" msgid="2860076509914623912">"Iminingwane yelayisensi yesofthiwe yomthombo ovulelekile"</string>
-    <string name="licenseActivityLabel" msgid="8258726177561826066">"Amalayisense womthombo ovulekile"</string>
-    <string name="privacy_policy_label" msgid="6567158248788870442">"Inqubomgomo yemfihlo"</string>
-    <string name="terms_of_service_label" msgid="6788126078040996084">"Imigomo yesevisi"</string>
+<resources>
+  <string name="build_version_label">Yakha inguqulo</string>
+  <string name="open_source_license_detail_label">Iminingwane yelayisensi yesofthiwe yomthombo ovulelekile</string>
+  <string name="licenseActivityLabel">Amalayisense womthombo ovulekile</string>
+  <string name="privacy_policy_label">Inqubomgomo yemfihlo</string>
+  <string name="terms_of_service_label">Imigomo yesevisi</string>
 </resources>
diff --git a/java/com/android/dialer/activecalls/ActiveCallInfo.java b/java/com/android/dialer/activecalls/ActiveCallInfo.java
new file mode 100644
index 0000000..d4f76b3
--- /dev/null
+++ b/java/com/android/dialer/activecalls/ActiveCallInfo.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.dialer.activecalls;
+
+import android.support.annotation.Nullable;
+import android.telecom.PhoneAccountHandle;
+import com.google.auto.value.AutoValue;
+import com.google.common.base.Optional;
+
+/** Info of an active call */
+@AutoValue
+@SuppressWarnings("Guava")
+public abstract class ActiveCallInfo {
+
+  /** The {@link PhoneAccountHandle} the call is made with */
+  public abstract Optional<PhoneAccountHandle> phoneAccountHandle();
+
+  public static Builder builder() {
+    return new AutoValue_ActiveCallInfo.Builder();
+  }
+
+  /** Builder for {@link ActiveCallInfo}. Only In Call UI should create ActiveCallInfo */
+  @AutoValue.Builder
+  public abstract static class Builder {
+
+    public Builder setPhoneAccountHandle(@Nullable PhoneAccountHandle phoneAccountHandle) {
+      return setPhoneAccountHandle(Optional.fromNullable(phoneAccountHandle));
+    }
+
+    public abstract Builder setPhoneAccountHandle(Optional<PhoneAccountHandle> phoneAccountHandle);
+
+    public abstract ActiveCallInfo build();
+  }
+}
diff --git a/java/com/android/dialer/activecalls/ActiveCalls.java b/java/com/android/dialer/activecalls/ActiveCalls.java
new file mode 100644
index 0000000..600839c
--- /dev/null
+++ b/java/com/android/dialer/activecalls/ActiveCalls.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.dialer.activecalls;
+
+import android.support.annotation.MainThread;
+import com.google.common.collect.ImmutableList;
+
+/** Exposes information about current active calls to the whole dialer. */
+public interface ActiveCalls {
+
+  /**
+   * Return a list of current active calls. Any call that is not disconnected is regarded as active.
+   * Ordering of elements are not guaranteed.
+   */
+  ImmutableList<ActiveCallInfo> getActiveCalls();
+
+  /** Should only be called by in call UI. */
+  @MainThread
+  void setActiveCalls(ImmutableList<ActiveCallInfo> activeCalls);
+}
diff --git a/java/com/android/dialer/activecalls/ActiveCallsComponent.java b/java/com/android/dialer/activecalls/ActiveCallsComponent.java
new file mode 100644
index 0000000..99e0e94
--- /dev/null
+++ b/java/com/android/dialer/activecalls/ActiveCallsComponent.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.dialer.activecalls;
+
+import android.content.Context;
+import com.android.dialer.inject.HasRootComponent;
+import com.android.dialer.inject.IncludeInDialerRoot;
+import dagger.Subcomponent;
+
+/** Component for {@link ActiveCalls} */
+@Subcomponent
+public abstract class ActiveCallsComponent {
+
+  public abstract ActiveCalls activeCalls();
+
+  public static ActiveCallsComponent get(Context context) {
+    return ((HasComponent) ((HasRootComponent) context.getApplicationContext()).component())
+        .activeCallsComponent();
+  }
+
+  /** Used to refer to the root application component. */
+  @IncludeInDialerRoot
+  public interface HasComponent {
+    ActiveCallsComponent activeCallsComponent();
+  }
+}
diff --git a/java/com/android/dialer/activecalls/ActiveCallsModule.java b/java/com/android/dialer/activecalls/ActiveCallsModule.java
new file mode 100644
index 0000000..4d7f448
--- /dev/null
+++ b/java/com/android/dialer/activecalls/ActiveCallsModule.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.dialer.activecalls;
+
+import com.android.dialer.activecalls.impl.ActiveCallsImpl;
+import com.android.dialer.inject.DialerVariant;
+import com.android.dialer.inject.InstallIn;
+import dagger.Binds;
+import dagger.Module;
+import javax.inject.Singleton;
+
+/** Module for {@link ActiveCallsComponent} */
+@Module
+@InstallIn(variants = DialerVariant.DIALER_TEST) // TODO(weijiaxu): put all variants.
+public abstract class ActiveCallsModule {
+
+  @Singleton
+  @Binds
+  public abstract ActiveCalls to(ActiveCallsImpl impl);
+}
diff --git a/java/com/android/dialer/activecalls/impl/ActiveCallsImpl.java b/java/com/android/dialer/activecalls/impl/ActiveCallsImpl.java
new file mode 100644
index 0000000..3449cc8
--- /dev/null
+++ b/java/com/android/dialer/activecalls/impl/ActiveCallsImpl.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.dialer.activecalls.impl;
+
+import android.support.annotation.MainThread;
+import com.android.dialer.activecalls.ActiveCallInfo;
+import com.android.dialer.activecalls.ActiveCalls;
+import com.android.dialer.common.Assert;
+import com.google.common.collect.ImmutableList;
+import javax.inject.Inject;
+
+/** Implementation of {@link ActiveCalls} */
+public class ActiveCallsImpl implements ActiveCalls {
+
+  ImmutableList<ActiveCallInfo> activeCalls = ImmutableList.of();
+
+  @Inject
+  ActiveCallsImpl() {}
+
+  @Override
+  public ImmutableList<ActiveCallInfo> getActiveCalls() {
+    return activeCalls;
+  }
+
+  @Override
+  @MainThread
+  public void setActiveCalls(ImmutableList<ActiveCallInfo> activeCalls) {
+    Assert.isMainThread();
+    this.activeCalls = Assert.isNotNull(activeCalls);
+  }
+}
diff --git a/java/com/android/dialer/animation/AnimUtils.java b/java/com/android/dialer/animation/AnimUtils.java
index 9c9396e..9160cf5 100644
--- a/java/com/android/dialer/animation/AnimUtils.java
+++ b/java/com/android/dialer/animation/AnimUtils.java
@@ -22,17 +22,16 @@
 import android.view.View;
 import android.view.ViewPropertyAnimator;
 import android.view.animation.Interpolator;
-import com.android.dialer.compat.PathInterpolatorCompat;
+import android.view.animation.PathInterpolator;
 
 public class AnimUtils {
 
   public static final int DEFAULT_DURATION = -1;
   public static final int NO_DELAY = 0;
 
-  public static final Interpolator EASE_IN = PathInterpolatorCompat.create(0.0f, 0.0f, 0.2f, 1.0f);
-  public static final Interpolator EASE_OUT = PathInterpolatorCompat.create(0.4f, 0.0f, 1.0f, 1.0f);
-  public static final Interpolator EASE_OUT_EASE_IN =
-      PathInterpolatorCompat.create(0.4f, 0, 0.2f, 1);
+  public static final Interpolator EASE_IN = new PathInterpolator(0.0f, 0.0f, 0.2f, 1.0f);
+  public static final Interpolator EASE_OUT = new PathInterpolator(0.4f, 0.0f, 1.0f, 1.0f);
+  public static final Interpolator EASE_OUT_EASE_IN = new PathInterpolator(0.4f, 0, 0.2f, 1);
 
   public static void crossFadeViews(View fadeIn, View fadeOut, int duration) {
     fadeIn(fadeIn, duration);
diff --git a/java/com/android/dialer/app/AndroidManifest.xml b/java/com/android/dialer/app/AndroidManifest.xml
index 0c1a362..190f098 100644
--- a/java/com/android/dialer/app/AndroidManifest.xml
+++ b/java/com/android/dialer/app/AndroidManifest.xml
@@ -55,12 +55,12 @@
   <uses-permission android:name="android.permission.STOP_APP_SWITCHES"/>
 
   <uses-sdk
-    android:minSdkVersion="23"
-    android:targetSdkVersion="27"/>
+    android:minSdkVersion="24"
+    android:targetSdkVersion="28"/>
 
-  <application android:theme="@style/Theme.AppCompat">
+  <application>
 
-    <activity
+  <activity
       android:exported="false"
       android:label="@string/manage_blocked_numbers_label"
       android:name="com.android.dialer.app.filterednumber.BlockedNumbersSettingsActivity"
@@ -75,7 +75,7 @@
     <activity
       android:label="@string/call_log_activity_title"
       android:name="com.android.dialer.app.calllog.CallLogActivity"
-      android:theme="@style/DialtactsThemeWithoutActionBarOverlay">
+      android:theme="@style/DialtactsTheme">
     </activity>
 
     <receiver android:name="com.android.dialer.app.calllog.CallLogReceiver">
diff --git a/java/com/android/dialer/app/DialtactsActivity.java b/java/com/android/dialer/app/DialtactsActivity.java
index 37b241b..25a6956 100644
--- a/java/com/android/dialer/app/DialtactsActivity.java
+++ b/java/com/android/dialer/app/DialtactsActivity.java
@@ -26,7 +26,6 @@
 import android.content.pm.ResolveInfo;
 import android.content.res.Configuration;
 import android.content.res.Resources;
-import android.database.Cursor;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.SystemClock;
@@ -34,7 +33,6 @@
 import android.provider.CallLog.Calls;
 import android.provider.ContactsContract.QuickContact;
 import android.speech.RecognizerIntent;
-import android.support.annotation.MainThread;
 import android.support.annotation.NonNull;
 import android.support.annotation.VisibleForTesting;
 import android.support.design.widget.CoordinatorLayout;
@@ -48,6 +46,7 @@
 import android.text.Editable;
 import android.text.TextUtils;
 import android.text.TextWatcher;
+import android.view.ActionMode;
 import android.view.DragEvent;
 import android.view.Gravity;
 import android.view.Menu;
@@ -66,9 +65,6 @@
 import android.widget.Toast;
 import com.android.contacts.common.dialog.ClearFrequentsDialog;
 import com.android.contacts.common.list.OnPhoneNumberPickerActionListener;
-import com.android.contacts.common.list.PhoneNumberListAdapter;
-import com.android.contacts.common.list.PhoneNumberPickerFragment.CursorReranker;
-import com.android.contacts.common.list.PhoneNumberPickerFragment.OnLoadFinishedListener;
 import com.android.dialer.animation.AnimUtils;
 import com.android.dialer.animation.AnimationListenerAdapter;
 import com.android.dialer.app.calllog.CallLogActivity;
@@ -84,14 +80,11 @@
 import com.android.dialer.app.list.OnDragDropListener;
 import com.android.dialer.app.list.OnListFragmentScrolledListener;
 import com.android.dialer.app.list.PhoneFavoriteSquareTileView;
-import com.android.dialer.app.list.RegularSearchFragment;
-import com.android.dialer.app.list.SearchFragment;
-import com.android.dialer.app.list.SmartDialSearchFragment;
 import com.android.dialer.app.settings.DialerSettingsActivity;
 import com.android.dialer.app.widget.ActionBarController;
 import com.android.dialer.app.widget.SearchEditTextLayout;
 import com.android.dialer.callcomposer.CallComposerActivity;
-import com.android.dialer.calldetails.CallDetailsActivity;
+import com.android.dialer.calldetails.OldCallDetailsActivity;
 import com.android.dialer.callintent.CallInitiationType;
 import com.android.dialer.callintent.CallIntentBuilder;
 import com.android.dialer.callintent.CallSpecificAppData;
@@ -100,8 +93,7 @@
 import com.android.dialer.common.UiUtil;
 import com.android.dialer.common.concurrent.DialerExecutorComponent;
 import com.android.dialer.common.concurrent.ThreadUtil;
-import com.android.dialer.compat.CompatUtils;
-import com.android.dialer.configprovider.ConfigProviderBindings;
+import com.android.dialer.configprovider.ConfigProviderComponent;
 import com.android.dialer.constants.ActivityRequestCodes;
 import com.android.dialer.contactsfragment.ContactsFragment;
 import com.android.dialer.contactsfragment.ContactsFragment.OnContactSelectedListener;
@@ -111,6 +103,7 @@
 import com.android.dialer.dialpadview.DialpadFragment.DialpadListener;
 import com.android.dialer.dialpadview.DialpadFragment.LastOutgoingCallCallback;
 import com.android.dialer.duo.DuoComponent;
+import com.android.dialer.i18n.LocaleUtils;
 import com.android.dialer.interactions.PhoneNumberInteraction;
 import com.android.dialer.interactions.PhoneNumberInteraction.InteractionErrorCode;
 import com.android.dialer.logging.DialerImpression;
@@ -120,11 +113,6 @@
 import com.android.dialer.logging.UiAction;
 import com.android.dialer.metrics.Metrics;
 import com.android.dialer.metrics.MetricsComponent;
-import com.android.dialer.p13n.inference.P13nRanking;
-import com.android.dialer.p13n.inference.protocol.P13nRanker;
-import com.android.dialer.p13n.inference.protocol.P13nRanker.P13nRefreshCompleteListener;
-import com.android.dialer.p13n.logging.P13nLogger;
-import com.android.dialer.p13n.logging.P13nLogging;
 import com.android.dialer.performancereport.PerformanceReport;
 import com.android.dialer.postcall.PostCall;
 import com.android.dialer.precall.PreCall;
@@ -161,7 +149,6 @@
         ContactsFragment.OnContactsListScrolledListener,
         DialpadFragment.HostInterface,
         OldSpeedDialFragment.HostInterface,
-        SearchFragment.HostInterface,
         OnDragDropListener,
         OnPhoneNumberPickerActionListener,
         PopupMenu.OnMenuItemClickListener,
@@ -192,8 +179,6 @@
   private static final String KEY_IS_DIALPAD_SHOWN = "is_dialpad_shown";
   private static final String KEY_FAB_VISIBLE = "fab_visible";
   private static final String TAG_NEW_SEARCH_FRAGMENT = "new_search";
-  private static final String TAG_REGULAR_SEARCH_FRAGMENT = "search";
-  private static final String TAG_SMARTDIAL_SEARCH_FRAGMENT = "smartdial";
   private static final String TAG_FAVORITES_FRAGMENT = "favorites";
   /** Just for backward compatibility. Should behave as same as {@link Intent#ACTION_DIAL}. */
   private static final String ACTION_TOUCH_DIALER = "com.android.phone.action.TOUCH_DIALER";
@@ -212,11 +197,6 @@
 
   /** Root layout of DialtactsActivity */
   private CoordinatorLayout parentLayout;
-  /** Fragment for searching phone numbers using the alphanumeric keyboard. */
-  private RegularSearchFragment regularSearchFragment;
-
-  /** Fragment for searching phone numbers using the dialpad. */
-  private SmartDialSearchFragment smartDialSearchFragment;
 
   /** new Fragment for search phone numbers using the keyboard and the dialpad. */
   private NewSearchFragment newSearchFragment;
@@ -267,8 +247,6 @@
   private boolean wasConfigurationChange;
   private long timeTabSelected;
 
-  private P13nLogger p13nLogger;
-  private P13nRanker p13nRanker;
   public boolean isMultiSelectModeEnabled;
 
   private boolean isLastTabEnabled;
@@ -312,7 +290,6 @@
           LogUtil.v("DialtactsActivity.onTextChanged", "previous query: " + searchQuery);
           searchQuery = newText;
 
-          // TODO(calderwoodra): show p13n when newText is empty.
           // Show search fragment only when the query string is changed to non-empty text.
           if (!TextUtils.isEmpty(newText)) {
             // Call enterSearchUi only if we are switching search modes, or showing a search
@@ -324,11 +301,7 @@
             }
           }
 
-          if (smartDialSearchFragment != null && smartDialSearchFragment.isVisible()) {
-            smartDialSearchFragment.setQueryString(searchQuery);
-          } else if (regularSearchFragment != null && regularSearchFragment.isVisible()) {
-            regularSearchFragment.setQueryString(searchQuery);
-          } else if (newSearchFragment != null && newSearchFragment.isVisible()) {
+          if (newSearchFragment != null && newSearchFragment.isVisible()) {
             newSearchFragment.setQuery(searchQuery, getCallInitiationType());
           }
         }
@@ -394,7 +367,8 @@
     super.onCreate(savedInstanceState);
 
     firstLaunch = true;
-    isLastTabEnabled = ConfigProviderBindings.get(this).getBoolean("last_tab_enabled", false);
+    isLastTabEnabled =
+        ConfigProviderComponent.get(this).getConfigProvider().getBoolean("last_tab_enabled", false);
 
     final Resources resources = getResources();
     actionBarHeight = resources.getDimensionPixelSize(R.dimen.action_bar_height_large);
@@ -496,14 +470,9 @@
     SmartDialPrefix.initializeNanpSettings(this);
     Trace.endSection();
 
-    p13nLogger = P13nLogging.get(getApplicationContext());
-    p13nRanker = P13nRanking.get(getApplicationContext());
     Trace.endSection();
 
-    // Update the new search fragment to the correct position and the ActionBar's visibility.
-    if (ConfigProviderBindings.get(this).getBoolean("enable_new_search_fragment", false)) {
-      updateSearchFragmentPosition();
-    }
+    updateSearchFragmentPosition();
   }
 
   @NonNull
@@ -571,7 +540,7 @@
     // (1) the activity is not recreated with a new configuration, or
     // (2) the activity is recreated with a new configuration but the change is a language change.
     boolean isLanguageChanged =
-        !CompatUtils.getLocale(this).getISO3Language().equals(savedLanguageCode);
+        !LocaleUtils.getLocale(this).getISO3Language().equals(savedLanguageCode);
     if (!wasConfigurationChange || isLanguageChanged) {
       dialerDatabaseHelper.startSmartDialUpdateThread(/* forceUpdate = */ isLanguageChanged);
     }
@@ -624,14 +593,6 @@
     setSearchBoxHint();
     timeTabSelected = SystemClock.elapsedRealtime();
 
-    p13nLogger.reset();
-    p13nRanker.refresh(
-        new P13nRefreshCompleteListener() {
-          @Override
-          public void onP13nRefreshComplete() {
-            // TODO(strongarm): make zero-query search results visible
-          }
-        });
     Trace.endSection();
   }
 
@@ -679,7 +640,7 @@
     super.onSaveInstanceState(outState);
     outState.putString(KEY_SEARCH_QUERY, searchQuery);
     outState.putString(KEY_DIALPAD_QUERY, dialpadQuery);
-    outState.putString(KEY_SAVED_LANGUAGE_CODE, CompatUtils.getLocale(this).getISO3Language());
+    outState.putString(KEY_SAVED_LANGUAGE_CODE, LocaleUtils.getLocale(this).getISO3Language());
     outState.putBoolean(KEY_IN_REGULAR_SEARCH_UI, inRegularSearch);
     outState.putBoolean(KEY_IN_DIALPAD_SEARCH_UI, inDialpadSearch);
     outState.putBoolean(KEY_IN_NEW_SEARCH_UI, inNewSearch);
@@ -696,15 +657,6 @@
     LogUtil.i("DialtactsActivity.onAttachFragment", "fragment: %s", fragment);
     if (fragment instanceof DialpadFragment) {
       dialpadFragment = (DialpadFragment) fragment;
-    } else if (fragment instanceof SmartDialSearchFragment) {
-      smartDialSearchFragment = (SmartDialSearchFragment) fragment;
-      smartDialSearchFragment.setOnPhoneNumberPickerActionListener(this);
-      if (!TextUtils.isEmpty(dialpadQuery)) {
-        smartDialSearchFragment.setAddToContactNumber(dialpadQuery);
-      }
-    } else if (fragment instanceof SearchFragment) {
-      regularSearchFragment = (RegularSearchFragment) fragment;
-      regularSearchFragment.setOnPhoneNumberPickerActionListener(this);
     } else if (fragment instanceof ListsFragment) {
       listsFragment = (ListsFragment) fragment;
       listsFragment.addOnPageChangeListener(this);
@@ -712,28 +664,6 @@
       newSearchFragment = (NewSearchFragment) fragment;
       updateSearchFragmentPosition();
     }
-    if (fragment instanceof SearchFragment) {
-      final SearchFragment searchFragment = (SearchFragment) fragment;
-      searchFragment.setReranker(
-          new CursorReranker() {
-            @Override
-            @MainThread
-            public Cursor rerankCursor(Cursor data) {
-              Assert.isMainThread();
-              String queryString = searchFragment.getQueryString();
-              return p13nRanker.rankCursor(data, queryString == null ? 0 : queryString.length());
-            }
-          });
-      searchFragment.addOnLoadFinishedListener(
-          new OnLoadFinishedListener() {
-            @Override
-            public void onLoadFinished() {
-              p13nLogger.onSearchQuery(
-                  searchFragment.getQueryString(),
-                  (PhoneNumberListAdapter) searchFragment.getAdapter());
-            }
-          });
-    }
   }
 
   protected void handleMenuSettings() {
@@ -797,9 +727,6 @@
       handleMenuSettings();
       Logger.get(this).logScreenView(ScreenEvent.Type.SETTINGS, this);
       return true;
-    } else if (resId == R.id.menu_new_ui_launcher_shortcut) {
-      MainComponent.createNewUiLauncherShortcut(this);
-      return true;
     }
     return false;
   }
@@ -838,8 +765,8 @@
     } else if (requestCode == ActivityRequestCodes.DIALTACTS_CALL_DETAILS) {
       if (resultCode == RESULT_OK
           && data != null
-          && data.getBooleanExtra(CallDetailsActivity.EXTRA_HAS_ENRICHED_CALL_DATA, false)) {
-        String number = data.getStringExtra(CallDetailsActivity.EXTRA_PHONE_NUMBER);
+          && data.getBooleanExtra(OldCallDetailsActivity.EXTRA_HAS_ENRICHED_CALL_DATA, false)) {
+        String number = data.getStringExtra(OldCallDetailsActivity.EXTRA_PHONE_NUMBER);
         int snackbarDurationMillis = 5_000;
         Snackbar.make(parentLayout, getString(R.string.ec_data_deleted), snackbarDurationMillis)
             .setAction(
@@ -1001,24 +928,7 @@
   }
 
   private void updateSearchFragmentPosition() {
-    SearchFragment fragment = null;
-    if (smartDialSearchFragment != null) {
-      fragment = smartDialSearchFragment;
-    } else if (regularSearchFragment != null) {
-      fragment = regularSearchFragment;
-    }
-    LogUtil.d(
-        "DialtactsActivity.updateSearchFragmentPosition",
-        "fragment: %s, isVisible: %b",
-        fragment,
-        fragment != null && fragment.isVisible());
-    if (fragment != null) {
-      // We need to force animation here even when fragment is not visible since it might not be
-      // visible immediately after screen orientation change and dialpad height would not be
-      // available immediately which is required to update position. By forcing an animation,
-      // position will be updated after a delay by when the dialpad height would be available.
-      fragment.updatePosition(true /* animate */);
-    } else if (newSearchFragment != null) {
+    if (newSearchFragment != null) {
       int animationDuration = getResources().getInteger(R.integer.dialpad_slide_in_duration);
       int actionbarHeight = getResources().getDimensionPixelSize(R.dimen.action_bar_height_large);
       int shadowHeight = getResources().getDrawable(R.drawable.search_shadow).getIntrinsicHeight();
@@ -1208,29 +1118,9 @@
       return;
     }
 
-    final FragmentTransaction transaction = getFragmentManager().beginTransaction();
-    if (inDialpadSearch && smartDialSearchFragment != null) {
-      transaction.remove(smartDialSearchFragment);
-    } else if (inRegularSearch && regularSearchFragment != null) {
-      transaction.remove(regularSearchFragment);
-    }
-
-    final String tag;
-    inDialpadSearch = false;
-    inRegularSearch = false;
-    inNewSearch = false;
-    boolean useNewSearch =
-        ConfigProviderBindings.get(this).getBoolean("enable_new_search_fragment", false);
-    if (useNewSearch) {
-      tag = TAG_NEW_SEARCH_FRAGMENT;
-      inNewSearch = true;
-    } else if (smartDialSearch) {
-      tag = TAG_SMARTDIAL_SEARCH_FRAGMENT;
-      inDialpadSearch = true;
-    } else {
-      tag = TAG_REGULAR_SEARCH_FRAGMENT;
-      inRegularSearch = true;
-    }
+    FragmentTransaction transaction = getFragmentManager().beginTransaction();
+    String tag = TAG_NEW_SEARCH_FRAGMENT;
+    inNewSearch = true;
 
     floatingActionButtonController.scaleOut();
 
@@ -1240,59 +1130,23 @@
       transaction.setTransition(FragmentTransaction.TRANSIT_NONE);
     }
 
-    Fragment fragment = getFragmentManager().findFragmentByTag(tag);
+    NewSearchFragment fragment = (NewSearchFragment) getFragmentManager().findFragmentByTag(tag);
     if (fragment == null) {
-      if (useNewSearch) {
-        fragment = NewSearchFragment.newInstance(!isDialpadShown());
-      } else if (smartDialSearch) {
-        fragment = new SmartDialSearchFragment();
-      } else {
-        fragment = Bindings.getLegacy(this).newRegularSearchFragment();
-        ((SearchFragment) fragment)
-            .setOnTouchListener(
-                (v, event) -> {
-                  // Show the FAB when the user touches the lists fragment and the soft
-                  // keyboard is hidden.
-                  hideDialpadFragment(true, false);
-                  v.performClick();
-                  return false;
-                });
-      }
+      fragment = NewSearchFragment.newInstance();
       transaction.add(R.id.dialtacts_frame, fragment, tag);
     } else {
-      // TODO(calderwoodra): if this is a transition from dialpad to searchbar, animate fragment
-      // down, and vice versa. Perhaps just add a coordinator behavior with the search bar.
       transaction.show(fragment);
     }
 
     // DialtactsActivity will provide the options menu
     fragment.setHasOptionsMenu(false);
-
-    // Will show empty list if P13nRanker is not enabled. Else, re-ranked list by the ranker.
-    if (!useNewSearch) {
-      ((SearchFragment) fragment)
-          .setShowEmptyListForNullQuery(p13nRanker.shouldShowEmptyListForNullQuery());
-    } else {
-      // TODO(calderwoodra): add p13n ranker to new search.
-    }
-
-    if (!smartDialSearch && !useNewSearch) {
-      ((SearchFragment) fragment).setQueryString(query);
-    } else if (useNewSearch) {
-      ((NewSearchFragment) fragment).setQuery(query, getCallInitiationType());
-    }
+    fragment.setQuery(query, getCallInitiationType());
     transaction.commit();
 
     if (animate) {
       Assert.isNotNull(listsFragment.getView()).animate().alpha(0).withLayer();
     }
     listsFragment.setUserVisibleHint(false);
-
-    if (smartDialSearch) {
-      Logger.get(this).logScreenView(ScreenEvent.Type.SMART_DIAL_SEARCH, this);
-    } else {
-      Logger.get(this).logScreenView(ScreenEvent.Type.REGULAR_SEARCH, this);
-    }
   }
 
   /** Hides the search fragment */
@@ -1336,12 +1190,6 @@
     }
 
     final FragmentTransaction transaction = getFragmentManager().beginTransaction();
-    if (smartDialSearchFragment != null) {
-      transaction.remove(smartDialSearchFragment);
-    }
-    if (regularSearchFragment != null) {
-      transaction.remove(regularSearchFragment);
-    }
     if (newSearchFragment != null) {
       transaction.remove(newSearchFragment);
     }
@@ -1405,9 +1253,6 @@
   @Override
   public void onDialpadQueryChanged(String query) {
     dialpadQuery = query;
-    if (smartDialSearchFragment != null) {
-      smartDialSearchFragment.setAddToContactNumber(query);
-    }
     if (newSearchFragment != null) {
       newSearchFragment.setRawNumber(query);
     }
@@ -1443,13 +1288,6 @@
 
   @Override
   public boolean onDialpadSpacerTouchWithEmptyQuery() {
-    if (inDialpadSearch
-        && smartDialSearchFragment != null
-        && !smartDialSearchFragment.isShowingPermissionRequest()) {
-      PerformanceReport.recordClick(UiAction.Type.CLOSE_DIALPAD);
-      hideDialpadFragment(true /* animate */, true /* clearDialpad */);
-      return true;
-    }
     return false;
   }
 
@@ -1625,25 +1463,15 @@
   @Override
   public void onPageScrollStateChanged(int state) {}
 
-  @Override
   public boolean isActionBarShowing() {
     return actionBarController.isActionBarShowing();
   }
 
-  @Override
   public boolean isDialpadShown() {
     return isDialpadShown;
   }
 
   @Override
-  public int getDialpadHeight() {
-    if (dialpadFragment != null) {
-      return dialpadFragment.getDialpadHeight();
-    }
-    return 0;
-  }
-
-  @Override
   public void setActionBarHideOffset(int offset) {
     getActionBarSafely().setHideOffset(offset);
   }
@@ -1706,7 +1534,7 @@
   }
 
   @Override
-  public void onActionModeStateChanged(boolean isEnabled) {
+  public void onActionModeStateChanged(ActionMode mode, boolean isEnabled) {
     isMultiSelectModeEnabled = isEnabled;
   }
 
@@ -1727,6 +1555,9 @@
     clearSearchOnPause = true;
   }
 
+  @Override
+  public void requestingPermission() {}
+
   protected int getPreviouslySelectedTabIndex() {
     return previouslySelectedTabIndex;
   }
@@ -1767,10 +1598,6 @@
       } else {
         simulatorMenuItem.setVisible(false);
       }
-
-      menu.findItem(R.id.menu_new_ui_launcher_shortcut)
-          .setVisible(MainComponent.isNewUiEnabled(context));
-
       super.show();
     }
   }
@@ -1796,6 +1623,8 @@
   }
 
   private boolean newFavoritesIsEnabled() {
-    return ConfigProviderBindings.get(this).getBoolean("enable_new_favorites_tab", false);
+    return ConfigProviderComponent.get(this)
+        .getConfigProvider()
+        .getBoolean("enable_new_favorites_tab", false);
   }
 }
diff --git a/java/com/android/dialer/app/MainComponent.java b/java/com/android/dialer/app/MainComponent.java
index 3bd48bf..1d3a4ce 100644
--- a/java/com/android/dialer/app/MainComponent.java
+++ b/java/com/android/dialer/app/MainComponent.java
@@ -16,80 +16,18 @@
 
 package com.android.dialer.app;
 
-import android.annotation.TargetApi;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.os.Build;
-import android.os.Build.VERSION_CODES;
-import android.support.v4.content.pm.ShortcutInfoCompat;
-import android.support.v4.content.pm.ShortcutManagerCompat;
-import android.support.v4.graphics.drawable.IconCompat;
-import com.android.dialer.configprovider.ConfigProviderBindings;
 
-/** This class is a copy of dialer.main.impl.MainImpl to get around a dependency issue. */
+/**
+ * Main activity intents.
+ *
+ * <p>TODO(calderwoodra): Move this elsewhere.
+ */
 public class MainComponent {
 
-  private static final String SHORTCUT_KEY = "nui_launcher_shortcut";
-
-  public static boolean isNewUiEnabled(Context context) {
-    return ConfigProviderBindings.get(context).getBoolean("is_nui_shortcut_enabled", false);
-  }
-
-  public static void createNewUiLauncherShortcut(Context context) {
-    enableComponent(context);
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-      createLauncherShortcutO(context);
-    } else {
-      createLauncherShortcutPreO(context);
-    }
-  }
-
-  public static boolean isNuiComponentEnabled(Context context) {
-    if (!isNewUiEnabled(context)) {
-      return false;
-    }
-    return context
-            .getPackageManager()
-            .getComponentEnabledSetting(new ComponentName(context, getComponentName()))
-        == PackageManager.COMPONENT_ENABLED_STATE_ENABLED;
-  }
-
-  /**
-   * Enables the NUI activity component. By default the component is disabled and can't be accessed.
-   * Once the component has been enabled the user will get an option to use the new UI to handle
-   * DIAL (and other) intents.
-   */
-  private static void enableComponent(Context context) {
-    context
-        .getPackageManager()
-        .setComponentEnabledSetting(
-            new ComponentName(context, getComponentName()),
-            PackageManager.COMPONENT_ENABLED_STATE_ENABLED,
-            PackageManager.DONT_KILL_APP);
-  }
-
-  @TargetApi(VERSION_CODES.O)
-  private static void createLauncherShortcutO(Context context) {
-    ShortcutInfoCompat shortcutInfo =
-        new ShortcutInfoCompat.Builder(context, SHORTCUT_KEY)
-            .setIcon(IconCompat.createWithResource(context, R.drawable.nui_launcher_icon))
-            .setIntent(getIntent(context))
-            .setShortLabel(context.getString(R.string.nui_shortcut_name))
-            .build();
-    ShortcutManagerCompat.requestPinShortcut(context, shortcutInfo, null);
-  }
-
-  private static void createLauncherShortcutPreO(Context context) {
-    Intent intent = new Intent("com.android.launcher.action.INSTALL_SHORTCUT");
-    intent.putExtra(
-        Intent.EXTRA_SHORTCUT_ICON,
-        Intent.ShortcutIconResource.fromContext(context, R.drawable.nui_launcher_icon));
-    intent.putExtra(Intent.EXTRA_SHORTCUT_NAME, context.getString(R.string.nui_shortcut_name));
-    intent.putExtra(Intent.EXTRA_SHORTCUT_INTENT, getIntent(context));
-    context.sendBroadcast(intent);
-  }
+  public static final String EXTRA_CLEAR_NEW_VOICEMAILS = "EXTRA_CLEAR_NEW_VOICEMAILS";
 
   /**
    * @param context Context of the application package implementing MainActivity class.
@@ -116,10 +54,11 @@
     intent.setComponent(new ComponentName(context, getComponentName()));
     intent.setAction("ACTION_SHOW_TAB");
     intent.putExtra("EXTRA_SHOW_TAB", 3);
+    intent.putExtra(EXTRA_CLEAR_NEW_VOICEMAILS, true);
     return intent;
   }
 
   private static String getComponentName() {
-    return "com.android.dialer.main.impl.MainActivity";
+    return "com.android.dialer.app.DialtactsActivity";
   }
 }
diff --git a/java/com/android/dialer/app/calllog/BlockReportSpamListener.java b/java/com/android/dialer/app/calllog/BlockReportSpamListener.java
index c8f8f0c..865cb81 100644
--- a/java/com/android/dialer/app/calllog/BlockReportSpamListener.java
+++ b/java/com/android/dialer/app/calllog/BlockReportSpamListener.java
@@ -16,12 +16,15 @@
 
 package com.android.dialer.app.calllog;
 
-import android.app.FragmentManager;
 import android.content.Context;
 import android.support.annotation.NonNull;
+import android.support.v4.app.FragmentManager;
 import android.support.v7.widget.RecyclerView;
+import android.view.View;
 import com.android.dialer.blocking.FilteredNumberAsyncQueryHandler;
 import com.android.dialer.blockreportspam.BlockReportSpamDialogs;
+import com.android.dialer.blockreportspam.BlockReportSpamDialogs.DialogFragmentForReportingNotSpam;
+import com.android.dialer.blockreportspam.BlockReportSpamDialogs.DialogFragmentForUnblockingNumberAndReportingAsNotSpam;
 import com.android.dialer.common.LogUtil;
 import com.android.dialer.logging.ContactSource;
 import com.android.dialer.logging.DialerImpression;
@@ -29,26 +32,35 @@
 import com.android.dialer.logging.ReportingLocation;
 import com.android.dialer.spam.Spam;
 import com.android.dialer.spam.SpamComponent;
+import com.android.dialer.spam.SpamSettings;
+import com.android.dialer.spam.promo.SpamBlockingPromoHelper;
 
 /** Listener to show dialogs for block and report spam actions. */
 public class BlockReportSpamListener implements CallLogListItemViewHolder.OnClickListener {
 
   private final Context context;
+  private final View rootView;
   private final FragmentManager fragmentManager;
   private final RecyclerView.Adapter adapter;
   private final FilteredNumberAsyncQueryHandler filteredNumberAsyncQueryHandler;
   private final Spam spam;
+  private final SpamSettings spamSettings;
+  private final SpamBlockingPromoHelper spamBlockingPromoHelper;
 
   public BlockReportSpamListener(
       Context context,
+      View rootView,
       FragmentManager fragmentManager,
       RecyclerView.Adapter adapter,
       FilteredNumberAsyncQueryHandler filteredNumberAsyncQueryHandler) {
     this.context = context;
+    this.rootView = rootView;
     this.fragmentManager = fragmentManager;
     this.adapter = adapter;
     this.filteredNumberAsyncQueryHandler = filteredNumberAsyncQueryHandler;
     spam = SpamComponent.get(context).spam();
+    spamSettings = SpamComponent.get(context).spamSettings();
+    spamBlockingPromoHelper = new SpamBlockingPromoHelper(context, spamSettings);
   }
 
   @Override
@@ -58,12 +70,12 @@
       final String countryIso,
       final int callType,
       @NonNull final ContactSource.Type contactSourceType) {
-    BlockReportSpamDialogs.BlockReportSpamDialogFragment.newInstance(
+    BlockReportSpamDialogs.DialogFragmentForBlockingNumberAndOptionallyReportingAsSpam.newInstance(
             displayNumber,
-            spam.isDialogReportSpamCheckedByDefault(),
+            spamSettings.isDialogReportSpamCheckedByDefault(),
             isSpamChecked -> {
               LogUtil.i("BlockReportSpamListener.onBlockReportSpam", "onClick");
-              if (isSpamChecked && spam.isSpamEnabled()) {
+              if (isSpamChecked && spamSettings.isSpamEnabled()) {
                 Logger.get(context)
                     .logImpression(
                         DialerImpression.Type
@@ -83,6 +95,10 @@
                   },
                   number,
                   countryIso);
+
+              if (isSpamChecked) {
+                showSpamBlockingPromoDialog();
+              }
             },
             null)
         .show(fragmentManager, BlockReportSpamDialogs.BLOCK_REPORT_SPAM_DIALOG_TAG);
@@ -95,12 +111,12 @@
       final String countryIso,
       final int callType,
       @NonNull final ContactSource.Type contactSourceType) {
-    BlockReportSpamDialogs.BlockDialogFragment.newInstance(
+    BlockReportSpamDialogs.DialogFragmentForBlockingNumberAndReportingAsSpam.newInstance(
             displayNumber,
-            spam.isSpamEnabled(),
+            spamSettings.isSpamEnabled(),
             () -> {
               LogUtil.i("BlockReportSpamListener.onBlock", "onClick");
-              if (spam.isSpamEnabled()) {
+              if (spamSettings.isSpamEnabled()) {
                 Logger.get(context)
                     .logImpression(
                         DialerImpression.Type
@@ -120,6 +136,7 @@
                   },
                   number,
                   countryIso);
+              showSpamBlockingPromoDialog();
             },
             null)
         .show(fragmentManager, BlockReportSpamDialogs.BLOCK_DIALOG_TAG);
@@ -134,12 +151,12 @@
       final ContactSource.Type contactSourceType,
       final boolean isSpam,
       final Integer blockId) {
-    BlockReportSpamDialogs.UnblockDialogFragment.newInstance(
+    DialogFragmentForUnblockingNumberAndReportingAsNotSpam.newInstance(
             displayNumber,
             isSpam,
             () -> {
               LogUtil.i("BlockReportSpamListener.onUnblock", "onClick");
-              if (isSpam && spam.isSpamEnabled()) {
+              if (isSpam && spamSettings.isSpamEnabled()) {
                 Logger.get(context)
                     .logImpression(DialerImpression.Type.REPORT_AS_NOT_SPAM_VIA_UNBLOCK_NUMBER);
                 spam.reportNotSpamFromCallHistory(
@@ -168,11 +185,11 @@
       final String countryIso,
       final int callType,
       final ContactSource.Type contactSourceType) {
-    BlockReportSpamDialogs.ReportNotSpamDialogFragment.newInstance(
+    DialogFragmentForReportingNotSpam.newInstance(
             displayNumber,
             () -> {
               LogUtil.i("BlockReportSpamListener.onReportNotSpam", "onClick");
-              if (spam.isSpamEnabled()) {
+              if (spamSettings.isSpamEnabled()) {
                 Logger.get(context)
                     .logImpression(DialerImpression.Type.DIALOG_ACTION_CONFIRM_NUMBER_NOT_SPAM);
                 spam.reportNotSpamFromCallHistory(
@@ -187,4 +204,30 @@
             null)
         .show(fragmentManager, BlockReportSpamDialogs.NOT_SPAM_DIALOG_TAG);
   }
+
+  private void showSpamBlockingPromoDialog() {
+    if (!spamBlockingPromoHelper.shouldShowSpamBlockingPromo()) {
+      return;
+    }
+
+    Logger.get(context).logImpression(DialerImpression.Type.SPAM_BLOCKING_CALL_LOG_PROMO_SHOWN);
+    spamBlockingPromoHelper.showSpamBlockingPromoDialog(
+        fragmentManager,
+        () -> {
+          Logger.get(context)
+              .logImpression(DialerImpression.Type.SPAM_BLOCKING_ENABLED_THROUGH_CALL_LOG_PROMO);
+          spamSettings.modifySpamBlockingSetting(
+              true,
+              success -> {
+                if (!success) {
+                  Logger.get(context)
+                      .logImpression(
+                          DialerImpression.Type
+                              .SPAM_BLOCKING_MODIFY_FAILURE_THROUGH_CALL_LOG_PROMO);
+                }
+                spamBlockingPromoHelper.showModifySettingOnCompleteSnackbar(rootView, success);
+              });
+        },
+        null /* onDismissListener */);
+  }
 }
diff --git a/java/com/android/dialer/app/calllog/CallLogActivity.java b/java/com/android/dialer/app/calllog/CallLogActivity.java
index 99e11b0..fdfb3ab 100644
--- a/java/com/android/dialer/app/calllog/CallLogActivity.java
+++ b/java/com/android/dialer/app/calllog/CallLogActivity.java
@@ -31,9 +31,8 @@
 import android.view.MenuItem;
 import android.view.ViewGroup;
 import com.android.contacts.common.list.ViewPagerTabs;
-import com.android.dialer.app.DialtactsActivity;
 import com.android.dialer.app.R;
-import com.android.dialer.calldetails.CallDetailsActivity;
+import com.android.dialer.calldetails.OldCallDetailsActivity;
 import com.android.dialer.common.Assert;
 import com.android.dialer.constants.ActivityRequestCodes;
 import com.android.dialer.database.CallLogQueryHandler;
@@ -157,7 +156,7 @@
 
     if (item.getItemId() == android.R.id.home) {
       PerformanceReport.recordClick(UiAction.Type.CLOSE_CALL_HISTORY_WITH_CANCEL_BUTTON);
-      final Intent intent = new Intent(this, DialtactsActivity.class);
+      final Intent intent = new Intent("com.android.dialer.main.impl.MAIN");
       intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
       startActivity(intent);
       return true;
@@ -282,8 +281,8 @@
     if (requestCode == ActivityRequestCodes.DIALTACTS_CALL_DETAILS) {
       if (resultCode == RESULT_OK
           && data != null
-          && data.getBooleanExtra(CallDetailsActivity.EXTRA_HAS_ENRICHED_CALL_DATA, false)) {
-        String number = data.getStringExtra(CallDetailsActivity.EXTRA_PHONE_NUMBER);
+          && data.getBooleanExtra(OldCallDetailsActivity.EXTRA_HAS_ENRICHED_CALL_DATA, false)) {
+        String number = data.getStringExtra(OldCallDetailsActivity.EXTRA_PHONE_NUMBER);
         Snackbar.make(findViewById(R.id.calllog_frame), getString(R.string.ec_data_deleted), 5_000)
             .setAction(
                 R.string.view_conversation,
diff --git a/java/com/android/dialer/app/calllog/CallLogAdapter.java b/java/com/android/dialer/app/calllog/CallLogAdapter.java
index 4b860fe..485683b 100644
--- a/java/com/android/dialer/app/calllog/CallLogAdapter.java
+++ b/java/com/android/dialer/app/calllog/CallLogAdapter.java
@@ -36,6 +36,7 @@
 import android.support.annotation.VisibleForTesting;
 import android.support.annotation.WorkerThread;
 import android.support.v7.app.AlertDialog;
+import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.RecyclerView.ViewHolder;
 import android.telecom.PhoneAccountHandle;
@@ -52,8 +53,6 @@
 import android.view.View;
 import android.view.ViewGroup;
 import com.android.contacts.common.ContactsUtils;
-import com.android.contacts.common.preference.ContactsPreferences;
-import com.android.dialer.app.DialtactsActivity;
 import com.android.dialer.app.R;
 import com.android.dialer.app.calllog.CallLogFragment.CallLogFragmentListener;
 import com.android.dialer.app.calllog.CallLogGroupBuilder.GroupCreator;
@@ -64,7 +63,6 @@
 import com.android.dialer.blocking.FilteredNumberAsyncQueryHandler;
 import com.android.dialer.calldetails.CallDetailsEntries;
 import com.android.dialer.calldetails.CallDetailsEntries.CallDetailsEntry;
-import com.android.dialer.callintent.CallIntentBuilder;
 import com.android.dialer.calllogutils.CallbackActionHelper.CallbackAction;
 import com.android.dialer.calllogutils.PhoneCallDetails;
 import com.android.dialer.common.Assert;
@@ -73,17 +71,19 @@
 import com.android.dialer.common.concurrent.AsyncTaskExecutor;
 import com.android.dialer.common.concurrent.AsyncTaskExecutors;
 import com.android.dialer.compat.android.provider.VoicemailCompat;
-import com.android.dialer.configprovider.ConfigProviderBindings;
+import com.android.dialer.configprovider.ConfigProviderComponent;
+import com.android.dialer.contacts.ContactsComponent;
 import com.android.dialer.duo.Duo;
 import com.android.dialer.duo.DuoComponent;
-import com.android.dialer.duo.DuoConstants;
 import com.android.dialer.duo.DuoListener;
 import com.android.dialer.enrichedcall.EnrichedCallCapabilities;
 import com.android.dialer.enrichedcall.EnrichedCallComponent;
 import com.android.dialer.enrichedcall.EnrichedCallManager;
 import com.android.dialer.logging.ContactSource;
+import com.android.dialer.logging.ContactSource.Type;
 import com.android.dialer.logging.DialerImpression;
 import com.android.dialer.logging.Logger;
+import com.android.dialer.logging.LoggingBindings.ContactsProviderMatchInfo;
 import com.android.dialer.logging.UiAction;
 import com.android.dialer.main.MainActivityPeer;
 import com.android.dialer.performancereport.PerformanceReport;
@@ -94,9 +94,14 @@
 import com.android.dialer.spam.SpamComponent;
 import com.android.dialer.telecom.TelecomUtil;
 import com.android.dialer.util.PermissionsUtil;
+import com.google.i18n.phonenumbers.NumberParseException;
+import com.google.i18n.phonenumbers.PhoneNumberUtil;
+import com.google.i18n.phonenumbers.Phonenumber.PhoneNumber;
 import java.util.ArrayList;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
 
 /** Adapter class to fill in data for the Call Log. */
 public class CallLogAdapter extends GroupingListAdapter
@@ -119,6 +124,8 @@
   public static final String ENABLE_CALL_LOG_MULTI_SELECT = "enable_call_log_multiselect";
   public static final boolean ENABLE_CALL_LOG_MULTI_SELECT_FLAG = true;
 
+  @VisibleForTesting static final String FILTER_EMERGENCY_CALLS_FLAG = "filter_emergency_calls";
+
   protected final Activity activity;
   protected final VoicemailPlaybackPresenter voicemailPlaybackPresenter;
   /** Cache for repeated requests to Telecom/Telephony. */
@@ -150,6 +157,16 @@
   public boolean deselectAllMode = false;
   private final SparseArray<String> selectedItems = new SparseArray<>();
 
+  /**
+   * Maps a raw input number to match info. We only log one MatchInfo per raw input number to reduce
+   * the amount of data logged.
+   *
+   * <p>Note that this has to be a {@link ConcurrentMap} as the match info for each row in the UI is
+   * loaded in a background thread spawned when the ViewHolder is bound.
+   */
+  private final ConcurrentMap<String, ContactsProviderMatchInfo> contactsProviderMatchInfos =
+      new ConcurrentHashMap<>();
+
   private final ActionMode.Callback actionModeCallback =
       new ActionMode.Callback() {
 
@@ -166,7 +183,7 @@
           MenuInflater inflater = mode.getMenuInflater();
           inflater.inflate(R.menu.actionbar_delete, menu);
           multiSelectRemoveView.showMultiSelectRemoveView(true);
-          actionModeStateChangedListener.onActionModeStateChanged(true);
+          actionModeStateChangedListener.onActionModeStateChanged(mode, true);
           return true;
         }
 
@@ -204,14 +221,14 @@
           selectAllMode = false;
           deselectAllMode = false;
           multiSelectRemoveView.showMultiSelectRemoveView(false);
-          actionModeStateChangedListener.onActionModeStateChanged(false);
+          actionModeStateChangedListener.onActionModeStateChanged(null, false);
           notifyDataSetChanged();
         }
       };
 
   private void showDeleteSelectedItemsDialog() {
     SparseArray<String> voicemailsToDeleteOnConfirmation = selectedItems.clone();
-    new AlertDialog.Builder(activity, R.style.AlertDialogCustom)
+    new AlertDialog.Builder(activity)
         .setCancelable(true)
         .setTitle(
             activity
@@ -274,7 +291,8 @@
       new View.OnLongClickListener() {
         @Override
         public boolean onLongClick(View v) {
-          if (ConfigProviderBindings.get(v.getContext())
+          if (ConfigProviderComponent.get(v.getContext())
+                  .getConfigProvider()
                   .getBoolean(ENABLE_CALL_LOG_MULTI_SELECT, ENABLE_CALL_LOG_MULTI_SELECT_FLAG)
               && voicemailPlaybackPresenter != null) {
             if (v.getId() == R.id.primary_action_view || v.getId() == R.id.quick_contact_photo) {
@@ -381,39 +399,20 @@
             if (viewHolder.callType == CallLog.Calls.MISSED_TYPE) {
               CallLogAsyncTaskUtil.markCallAsRead(activity, viewHolder.callIds);
               if (activityType == ACTIVITY_TYPE_DIALTACTS) {
-                if (v.getContext() instanceof MainActivityPeer.PeerSupplier) {
-                  // This is really bad, but we must do this to prevent a dependency cycle, enforce
-                  // best practices in new code, and avoid refactoring DialtactsActivity.
-                  ((FragmentUtilListener)
-                          ((MainActivityPeer.PeerSupplier) v.getContext()).getPeer())
-                      .getImpl(CallLogFragmentListener.class)
-                      .updateTabUnreadCounts();
-                } else {
-                  ((DialtactsActivity) v.getContext()).updateTabUnreadCounts();
-                }
+                Assert.checkState(
+                    v.getContext() instanceof MainActivityPeer.PeerSupplier,
+                    "%s is not a PeerSupplier",
+                    v.getContext().getClass());
+                // This is really bad, but we must do this to prevent a dependency cycle, enforce
+                // best practices in new code, and avoid refactoring DialtactsActivity.
+                ((FragmentUtilListener) ((MainActivityPeer.PeerSupplier) v.getContext()).getPeer())
+                    .getImpl(CallLogFragmentListener.class)
+                    .updateTabUnreadCounts();
               }
             }
             expandViewHolderActions(viewHolder);
-
-            if (isDuoCallButtonVisible(viewHolder.videoCallButtonView)) {
-              CallIntentBuilder.increaseLightbringerCallButtonAppearInExpandedCallLogItemCount();
-            }
           }
         }
-
-        private boolean isDuoCallButtonVisible(View videoCallButtonView) {
-          if (videoCallButtonView == null) {
-            return false;
-          }
-          if (videoCallButtonView.getVisibility() != View.VISIBLE) {
-            return false;
-          }
-          IntentProvider intentProvider = (IntentProvider) videoCallButtonView.getTag();
-          if (intentProvider == null) {
-            return false;
-          }
-          return DuoConstants.PACKAGE_NAME.equals(intentProvider.getIntent(activity).getPackage());
-        }
       };
 
   @Nullable
@@ -512,7 +511,6 @@
   private final Map<Long, Integer> dayGroups = new ArrayMap<>();
 
   private boolean loading = true;
-  private ContactsPreferences contactsPreferences;
 
   private boolean isSpamEnabled;
 
@@ -554,15 +552,14 @@
         new PhoneCallDetailsHelper(this.activity, resources, this.callLogCache);
     callLogListItemHelper =
         new CallLogListItemHelper(phoneCallDetailsHelper, resources, this.callLogCache);
-    callLogGroupBuilder = new CallLogGroupBuilder(this);
+    callLogGroupBuilder = new CallLogGroupBuilder(activity.getApplicationContext(), this);
     this.filteredNumberAsyncQueryHandler = Assert.isNotNull(filteredNumberAsyncQueryHandler);
 
-    contactsPreferences = new ContactsPreferences(this.activity);
-
     blockReportSpamListener =
         new BlockReportSpamListener(
             this.activity,
-            ((Activity) this.activity).getFragmentManager(),
+            this.activity.findViewById(R.id.call_log_fragment_root),
+            ((AppCompatActivity) this.activity).getSupportFragmentManager(),
             this,
             this.filteredNumberAsyncQueryHandler);
     setHasStableIds(true);
@@ -675,16 +672,21 @@
   }
 
   public void onResume() {
+    contactsProviderMatchInfos.clear();
     if (PermissionsUtil.hasPermission(activity, android.Manifest.permission.READ_CONTACTS)) {
       contactInfoCache.start();
     }
-    contactsPreferences.refreshValue(ContactsPreferences.DISPLAY_ORDER_KEY);
-    isSpamEnabled = SpamComponent.get(activity).spam().isSpamEnabled();
+    isSpamEnabled = SpamComponent.get(activity).spamSettings().isSpamEnabled();
     getDuo().registerListener(this);
     notifyDataSetChanged();
   }
 
   public void onPause() {
+    // The call log can be resumed/paused without loading any contacts. Don't log these events.
+    if (!contactsProviderMatchInfos.isEmpty()) {
+      Logger.get(activity).logContactsProviderMetrics(contactsProviderMatchInfos.values());
+    }
+
     getDuo().unregisterListener(this);
     pauseCache();
     for (Uri uri : hiddenItemUris) {
@@ -840,7 +842,7 @@
   }
 
   private boolean isHiddenRow(@Nullable String number, long rowId) {
-    if (number != null && PhoneNumberUtils.isEmergencyNumber(number)) {
+    if (isHideableEmergencyNumberRow(number)) {
       return true;
     }
     if (hiddenRowIds.contains(rowId)) {
@@ -849,6 +851,15 @@
     return false;
   }
 
+  private boolean isHideableEmergencyNumberRow(@Nullable String number) {
+    if (!ConfigProviderComponent.get(activity)
+        .getConfigProvider()
+        .getBoolean(FILTER_EMERGENCY_CALLS_FLAG, false)) {
+      return false;
+    }
+    return number != null && PhoneNumberUtils.isEmergencyNumber(number);
+  }
+
   private void loadAndRender(
       final CallLogListItemViewHolder viewHolder,
       final long rowId,
@@ -935,10 +946,8 @@
       Cursor cursor, int count, final CallLogListItemViewHolder views) {
     Assert.isMainThread();
     final String number = cursor.getString(CallLogQuery.NUMBER);
-    final String postDialDigits =
-        (VERSION.SDK_INT >= VERSION_CODES.N) ? cursor.getString(CallLogQuery.POST_DIAL_DIGITS) : "";
-    final String viaNumber =
-        (VERSION.SDK_INT >= VERSION_CODES.N) ? cursor.getString(CallLogQuery.VIA_NUMBER) : "";
+    final String postDialDigits = cursor.getString(CallLogQuery.POST_DIAL_DIGITS);
+    final String viaNumber = cursor.getString(CallLogQuery.VIA_NUMBER);
     final int numberPresentation = cursor.getInt(CallLogQuery.NUMBER_PRESENTATION);
     final ContactInfo cachedContactInfo = ContactInfoHelper.getContactInfo(cursor);
     final int transcriptionState =
@@ -1000,12 +1009,13 @@
               .setDataUsage(cursor.getLong(CallLogQuery.DATA_USAGE))
               .setDate(cursor.getLong(CallLogQuery.DATE))
               .setDuration(cursor.getLong(CallLogQuery.DURATION))
-              .setFeatures(cursor.getInt(CallLogQuery.FEATURES));
+              .setFeatures(cursor.getInt(CallLogQuery.FEATURES))
+
+              .setCallMappingId(String.valueOf(cursor.getLong(CallLogQuery.DATE)));
+
 
       String phoneAccountComponentName = cursor.getString(CallLogQuery.ACCOUNT_COMPONENT_NAME);
-      if (DuoConstants.PHONE_ACCOUNT_COMPONENT_NAME
-          .flattenToString()
-          .equals(phoneAccountComponentName)) {
+      if (DuoComponent.get(activity).getDuo().isDuoAccount(phoneAccountComponentName)) {
         entry.setIsDuoCall(true);
       }
 
@@ -1050,8 +1060,10 @@
               details.countryIso,
               details.cachedContactInfo,
               position
-                  < ConfigProviderBindings.get(activity)
+                  < ConfigProviderComponent.get(activity)
+                      .getConfigProvider()
                       .getLong("number_of_call_to_do_remote_lookup", 5L));
+      logCp2Metrics(details, info);
     }
     CharSequence formattedNumber =
         info.formattedNumber == null
@@ -1067,7 +1079,8 @@
       details.contactUri = info.lookupUri;
       details.namePrimary = info.name;
       details.nameAlternative = info.nameAlternative;
-      details.nameDisplayOrder = contactsPreferences.getDisplayOrder();
+      details.nameDisplayOrder =
+          ContactsComponent.get(activity).contactDisplayPreferences().getDisplayOrder();
       details.numberType = info.type;
       details.numberLabel = info.label;
       details.photoUri = info.photoUri;
@@ -1456,6 +1469,45 @@
     notifyDataSetChanged();
   }
 
+  @WorkerThread
+  private void logCp2Metrics(PhoneCallDetails details, ContactInfo contactInfo) {
+    if (details == null) {
+      return;
+    }
+    CharSequence inputNumber = details.number;
+    if (inputNumber == null) {
+      return;
+    }
+
+    ContactsProviderMatchInfo.Builder matchInfo =
+        ContactsProviderMatchInfo.builder()
+            .setInputNumberLength(PhoneNumberUtils.normalizeNumber(inputNumber.toString()).length())
+            .setInputNumberHasPostdialDigits(
+                !PhoneNumberUtils.extractPostDialPortion(inputNumber.toString()).isEmpty()
+                    || (details.postDialDigits != null && !details.postDialDigits.isEmpty()));
+
+    PhoneNumberUtil phoneNumberUtil = PhoneNumberUtil.getInstance();
+    try {
+      PhoneNumber phoneNumber = phoneNumberUtil.parse(inputNumber, details.countryIso);
+      matchInfo.setInputNumberValid(phoneNumberUtil.isValidNumber(phoneNumber));
+    } catch (NumberParseException e) {
+      // Do nothing
+      matchInfo.setInputNumberValid(false);
+    }
+
+    if (contactInfo != null
+        && contactInfo.number != null
+        && contactInfo.sourceType == Type.SOURCE_TYPE_DIRECTORY) {
+      matchInfo
+          .setMatchedContact(true)
+          .setMatchedNumberLength(PhoneNumberUtils.normalizeNumber(contactInfo.number).length())
+          .setMatchedNumberHasPostdialDigits(
+              !PhoneNumberUtils.extractPostDialPortion(contactInfo.number).isEmpty());
+    }
+
+    contactsProviderMatchInfos.put(inputNumber.toString(), matchInfo.build());
+  }
+
   /** Interface used to initiate a refresh of the content. */
   public interface CallFetcher {
 
@@ -1465,7 +1517,7 @@
   /** Interface used to allow single tap multi select for contact photos. */
   public interface OnActionModeStateChangedListener {
 
-    void onActionModeStateChanged(boolean isEnabled);
+    void onActionModeStateChanged(ActionMode mode, boolean isEnabled);
 
     boolean isActionModeStateEnabled();
   }
diff --git a/java/com/android/dialer/app/calllog/CallLogAsyncTaskUtil.java b/java/com/android/dialer/app/calllog/CallLogAsyncTaskUtil.java
index 08f5585..f54ea79 100644
--- a/java/com/android/dialer/app/calllog/CallLogAsyncTaskUtil.java
+++ b/java/com/android/dialer/app/calllog/CallLogAsyncTaskUtil.java
@@ -16,13 +16,11 @@
 
 package com.android.dialer.app.calllog;
 
-import android.annotation.TargetApi;
 import android.content.ContentValues;
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.AsyncTask;
-import android.os.Build.VERSION_CODES;
 import android.provider.CallLog;
 import android.provider.VoicemailContract.Voicemails;
 import android.support.annotation.NonNull;
@@ -34,7 +32,7 @@
 import com.android.dialer.util.PermissionsUtil;
 import com.android.voicemail.VoicemailClient;
 
-@TargetApi(VERSION_CODES.M)
+/** TODO(calderwoodra): documentation */
 public class CallLogAsyncTaskUtil {
 
   private static final String TAG = "CallLogAsyncTaskUtil";
@@ -155,6 +153,7 @@
     UPDATE_DURATION,
   }
 
+  /** TODO(calderwoodra): documentation */
   public interface CallLogAsyncTaskListener {
     void onDeleteVoicemail();
   }
diff --git a/java/com/android/dialer/app/calllog/CallLogFragment.java b/java/com/android/dialer/app/calllog/CallLogFragment.java
index 7e49cc9..771254e 100644
--- a/java/com/android/dialer/app/calllog/CallLogFragment.java
+++ b/java/com/android/dialer/app/calllog/CallLogFragment.java
@@ -58,7 +58,7 @@
 import com.android.dialer.common.Assert;
 import com.android.dialer.common.FragmentUtils;
 import com.android.dialer.common.LogUtil;
-import com.android.dialer.configprovider.ConfigProviderBindings;
+import com.android.dialer.configprovider.ConfigProviderComponent;
 import com.android.dialer.database.CallLogQueryHandler;
 import com.android.dialer.database.CallLogQueryHandler.Listener;
 import com.android.dialer.location.GeoUtil;
@@ -297,7 +297,9 @@
 
   protected void setupView(View view) {
     recyclerView = (RecyclerView) view.findViewById(R.id.recycler_view);
-    if (ConfigProviderBindings.get(getContext()).getBoolean("is_call_log_item_anim_null", false)) {
+    if (ConfigProviderComponent.get(getContext())
+        .getConfigProvider()
+        .getBoolean("is_call_log_item_anim_null", false)) {
       recyclerView.setItemAnimator(null);
     }
     recyclerView.setHasFixedSize(true);
@@ -449,7 +451,7 @@
     super.onStart();
     CequintCallerIdManager cequintCallerIdManager = null;
     if (CequintCallerIdManager.isCequintCallerIdEnabled(getContext())) {
-      cequintCallerIdManager = CequintCallerIdManager.createInstanceForCallLog();
+      cequintCallerIdManager = new CequintCallerIdManager();
     }
     contactInfoCache.setCequintCallerIdManager(cequintCallerIdManager);
   }
@@ -489,7 +491,10 @@
   @Override
   public void fetchCalls() {
     callLogQueryHandler.fetchCalls(callTypeFilter, dateLimit);
-    if (!isCallLogActivity) {
+    if (!isCallLogActivity
+        && getActivity() != null
+        && !getActivity().isFinishing()
+        && FragmentUtils.getParent(this, CallLogFragmentListener.class) != null) {
       FragmentUtils.getParentUnsafe(this, CallLogFragmentListener.class).updateTabUnreadCounts();
     }
   }
diff --git a/java/com/android/dialer/app/calllog/CallLogGroupBuilder.java b/java/com/android/dialer/app/calllog/CallLogGroupBuilder.java
index 4a0d78d..e525911 100644
--- a/java/com/android/dialer/app/calllog/CallLogGroupBuilder.java
+++ b/java/com/android/dialer/app/calllog/CallLogGroupBuilder.java
@@ -16,9 +16,9 @@
 
 package com.android.dialer.app.calllog;
 
+import android.content.Context;
 import android.database.Cursor;
-import android.os.Build.VERSION;
-import android.os.Build.VERSION_CODES;
+import android.provider.CallLog.Calls;
 import android.support.annotation.Nullable;
 import android.support.annotation.VisibleForTesting;
 import android.telephony.PhoneNumberUtils;
@@ -27,8 +27,8 @@
 import com.android.contacts.common.util.DateUtils;
 import com.android.dialer.calllogutils.CallbackActionHelper;
 import com.android.dialer.calllogutils.CallbackActionHelper.CallbackAction;
-import com.android.dialer.compat.AppCompatConstants;
 import com.android.dialer.compat.telephony.TelephonyManagerCompat;
+import com.android.dialer.inject.ApplicationContext;
 import com.android.dialer.phonenumbercache.CallLogQuery;
 import com.android.dialer.phonenumberutil.PhoneNumberHelper;
 import java.util.Objects;
@@ -57,10 +57,13 @@
   public static final int DAY_GROUP_OTHER = 2;
   /** Instance of the time object used for time calculations. */
   private static final Time TIME = new Time();
+
+  private final Context appContext;
   /** The object on which the groups are created. */
   private final GroupCreator groupCreator;
 
-  public CallLogGroupBuilder(GroupCreator groupCreator) {
+  public CallLogGroupBuilder(@ApplicationContext Context appContext, GroupCreator groupCreator) {
+    this.appContext = appContext;
     this.groupCreator = groupCreator;
   }
 
@@ -99,15 +102,13 @@
     int groupFeatures = cursor.getInt(CallLogQuery.FEATURES);
     int groupCallbackAction =
         CallbackActionHelper.getCallbackAction(
-            groupNumber, groupFeatures, groupAccountComponentName);
+            appContext, groupNumber, groupFeatures, groupAccountComponentName);
     groupCreator.setCallbackAction(firstRowId, groupCallbackAction);
 
     // Instantiate other group values to those of the first call in the cursor.
     String groupAccountId = cursor.getString(CallLogQuery.ACCOUNT_ID);
-    String groupPostDialDigits =
-        (VERSION.SDK_INT >= VERSION_CODES.N) ? cursor.getString(CallLogQuery.POST_DIAL_DIGITS) : "";
-    String groupViaNumbers =
-        (VERSION.SDK_INT >= VERSION_CODES.N) ? cursor.getString(CallLogQuery.VIA_NUMBER) : "";
+    String groupPostDialDigits = cursor.getString(CallLogQuery.POST_DIAL_DIGITS);
+    String groupViaNumbers = cursor.getString(CallLogQuery.VIA_NUMBER);
     int groupCallType = cursor.getInt(CallLogQuery.CALL_TYPE);
     int groupSize = 1;
 
@@ -123,18 +124,15 @@
     while (cursor.moveToNext()) {
       // Obtain the values for the current call to group.
       number = cursor.getString(CallLogQuery.NUMBER);
-      numberPostDialDigits =
-          (VERSION.SDK_INT >= VERSION_CODES.N)
-              ? cursor.getString(CallLogQuery.POST_DIAL_DIGITS)
-              : "";
-      numberViaNumbers =
-          (VERSION.SDK_INT >= VERSION_CODES.N) ? cursor.getString(CallLogQuery.VIA_NUMBER) : "";
+      numberPostDialDigits = cursor.getString(CallLogQuery.POST_DIAL_DIGITS);
+      numberViaNumbers = cursor.getString(CallLogQuery.VIA_NUMBER);
       callType = cursor.getInt(CallLogQuery.CALL_TYPE);
       callFeatures = cursor.getInt(CallLogQuery.FEATURES);
       accountComponentName = cursor.getString(CallLogQuery.ACCOUNT_COMPONENT_NAME);
       accountId = cursor.getString(CallLogQuery.ACCOUNT_ID);
       callbackAction =
-          CallbackActionHelper.getCallbackAction(number, callFeatures, accountComponentName);
+          CallbackActionHelper.getCallbackAction(
+              appContext, number, callFeatures, accountComponentName);
 
       final boolean isSameNumber = equalNumbers(groupNumber, number);
       final boolean isSamePostDialDigits = groupPostDialDigits.equals(numberPostDialDigits);
@@ -269,18 +267,15 @@
   }
 
   private boolean areBothNotVoicemail(int callType, int groupCallType) {
-    return callType != AppCompatConstants.CALLS_VOICEMAIL_TYPE
-        && groupCallType != AppCompatConstants.CALLS_VOICEMAIL_TYPE;
+    return callType != Calls.VOICEMAIL_TYPE && groupCallType != Calls.VOICEMAIL_TYPE;
   }
 
   private boolean areBothNotBlocked(int callType, int groupCallType) {
-    return callType != AppCompatConstants.CALLS_BLOCKED_TYPE
-        && groupCallType != AppCompatConstants.CALLS_BLOCKED_TYPE;
+    return callType != Calls.BLOCKED_TYPE && groupCallType != Calls.BLOCKED_TYPE;
   }
 
   private boolean areBothBlocked(int callType, int groupCallType) {
-    return callType == AppCompatConstants.CALLS_BLOCKED_TYPE
-        && groupCallType == AppCompatConstants.CALLS_BLOCKED_TYPE;
+    return callType == Calls.BLOCKED_TYPE && groupCallType == Calls.BLOCKED_TYPE;
   }
 
   private boolean meetsAssistedDialingGroupingCriteria(int groupFeatures, int callFeatures) {
diff --git a/java/com/android/dialer/app/calllog/CallLogListItemHelper.java b/java/com/android/dialer/app/calllog/CallLogListItemHelper.java
index 13ee9a4..a30d4d7 100644
--- a/java/com/android/dialer/app/calllog/CallLogListItemHelper.java
+++ b/java/com/android/dialer/app/calllog/CallLogListItemHelper.java
@@ -26,7 +26,6 @@
 import com.android.dialer.calllogutils.PhoneCallDetails;
 import com.android.dialer.common.Assert;
 import com.android.dialer.common.LogUtil;
-import com.android.dialer.compat.AppCompatConstants;
 
 /** Helper class to fill in the views of a call log entry. */
 /* package */ class CallLogListItemHelper {
@@ -224,15 +223,15 @@
     int lastCallType = getLastCallType(callTypes);
     int stringID;
 
-    if (lastCallType == AppCompatConstants.CALLS_MISSED_TYPE) {
+    if (lastCallType == Calls.MISSED_TYPE) {
       //Message: Missed call from <NameOrNumber>, <TypeOrLocation>, <TimeOfCall>,
       //<PhoneAccount>.
       stringID = R.string.description_incoming_missed_call;
-    } else if (lastCallType == AppCompatConstants.CALLS_INCOMING_TYPE) {
+    } else if (lastCallType == Calls.INCOMING_TYPE) {
       //Message: Answered call from <NameOrNumber>, <TypeOrLocation>, <TimeOfCall>,
       //<PhoneAccount>.
       stringID = R.string.description_incoming_answered_call;
-    } else if (lastCallType == AppCompatConstants.CALLS_VOICEMAIL_TYPE) {
+    } else if (lastCallType == Calls.VOICEMAIL_TYPE) {
       //Message: (Unread) [V/v]oicemail from <NameOrNumber>, <TypeOrLocation>, <TimeOfCall>,
       //<PhoneAccount>.
       stringID =
diff --git a/java/com/android/dialer/app/calllog/CallLogListItemViewHolder.java b/java/com/android/dialer/app/calllog/CallLogListItemViewHolder.java
index 4c187fa..e044460 100644
--- a/java/com/android/dialer/app/calllog/CallLogListItemViewHolder.java
+++ b/java/com/android/dialer/app/calllog/CallLogListItemViewHolder.java
@@ -19,7 +19,6 @@
 import android.Manifest.permission;
 import android.annotation.SuppressLint;
 import android.app.Activity;
-import android.content.ActivityNotFoundException;
 import android.content.Context;
 import android.content.Intent;
 import android.content.res.Resources;
@@ -51,9 +50,7 @@
 import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.TextView;
-import android.widget.Toast;
 import com.android.contacts.common.dialog.CallSubjectDialog;
-import com.android.dialer.app.DialtactsActivity;
 import com.android.dialer.app.R;
 import com.android.dialer.app.calllog.CallLogAdapter.OnActionModeStateChangedListener;
 import com.android.dialer.app.calllog.calllogcache.CallLogCache;
@@ -63,23 +60,21 @@
 import com.android.dialer.blocking.FilteredNumberCompat;
 import com.android.dialer.blocking.FilteredNumbersUtil;
 import com.android.dialer.callcomposer.CallComposerActivity;
-import com.android.dialer.calldetails.CallDetailsActivity;
 import com.android.dialer.calldetails.CallDetailsEntries;
+import com.android.dialer.calldetails.OldCallDetailsActivity;
 import com.android.dialer.callintent.CallIntentBuilder;
 import com.android.dialer.calllogutils.CallbackActionHelper.CallbackAction;
 import com.android.dialer.clipboard.ClipboardUtils;
 import com.android.dialer.common.Assert;
 import com.android.dialer.common.LogUtil;
 import com.android.dialer.common.concurrent.AsyncTaskExecutors;
-import com.android.dialer.compat.CompatUtils;
-import com.android.dialer.configprovider.ConfigProviderBindings;
+import com.android.dialer.configprovider.ConfigProviderComponent;
 import com.android.dialer.constants.ActivityRequestCodes;
 import com.android.dialer.contactphoto.ContactPhotoManager;
 import com.android.dialer.dialercontact.DialerContact;
 import com.android.dialer.dialercontact.SimDetails;
 import com.android.dialer.duo.Duo;
 import com.android.dialer.duo.DuoComponent;
-import com.android.dialer.duo.DuoConstants;
 import com.android.dialer.lettertile.LetterTileDrawable;
 import com.android.dialer.lettertile.LetterTileDrawable.ContactType;
 import com.android.dialer.logging.ContactSource;
@@ -309,13 +304,12 @@
     }
 
     quickContactView.setOverlay(null);
-    if (CompatUtils.hasPrioritizedMimeType()) {
-      quickContactView.setPrioritizedMimeType(Phone.CONTENT_ITEM_TYPE);
-    }
+    quickContactView.setPrioritizedMimeType(Phone.CONTENT_ITEM_TYPE);
     primaryActionButtonView.setOnClickListener(this);
     primaryActionView.setOnClickListener(this.expandCollapseListener);
     if (this.voicemailPlaybackPresenter != null
-        && ConfigProviderBindings.get(this.context)
+        && ConfigProviderComponent.get(this.context)
+            .getConfigProvider()
             .getBoolean(
                 CallLogAdapter.ENABLE_CALL_LOG_MULTI_SELECT,
                 CallLogAdapter.ENABLE_CALL_LOG_MULTI_SELECT_FLAG)) {
@@ -407,7 +401,6 @@
       return true;
     } else if (resId == R.id.context_menu_edit_before_call) {
       final Intent intent = new Intent(Intent.ACTION_DIAL, CallUtil.getCallUri(number));
-      intent.setClass(context, DialtactsActivity.class);
       DialerUtils.startActivityWithErrorToast(context, intent);
       return true;
     } else if (resId == R.id.context_menu_block_report_spam) {
@@ -441,6 +434,7 @@
       blockReportListener.onReportNotSpam(
           displayNumber, number, countryIso, callType, info.sourceType);
     } else if (resId == R.id.context_menu_delete) {
+      Logger.get(context).logImpression(DialerImpression.Type.USER_DELETED_CALL_LOG_ITEM);
       AsyncTaskExecutors.createAsyncTaskExecutor()
           .submit(TASK_DELETE, new DeleteCallTask(context, callIds));
     }
@@ -552,7 +546,8 @@
       case CallbackAction.DUO:
         if (showDuoPrimaryButton()) {
           CallIntentBuilder.increaseLightbringerCallButtonAppearInCollapsedCallLogItemCount();
-          primaryActionButtonView.setTag(IntentProvider.getDuoVideoIntentProvider(number));
+          primaryActionButtonView.setTag(
+              IntentProvider.getDuoVideoIntentProvider(number, isNonContactEntry(info)));
         } else {
           primaryActionButtonView.setTag(IntentProvider.getReturnVideoCallIntentProvider(number));
         }
@@ -603,6 +598,29 @@
     setUpVideoButtonView.setVisibility(View.GONE);
     inviteVideoButtonView.setVisibility(View.GONE);
 
+    // For an emergency number, show "Call details" only.
+    if (PhoneNumberHelper.isLocalEmergencyNumber(context, number)) {
+      createNewContactButtonView.setVisibility(View.GONE);
+      addToExistingContactButtonView.setVisibility(View.GONE);
+      sendMessageView.setVisibility(View.GONE);
+      callWithNoteButtonView.setVisibility(View.GONE);
+      callComposeButtonView.setVisibility(View.GONE);
+      blockReportView.setVisibility(View.GONE);
+      blockView.setVisibility(View.GONE);
+      unblockView.setVisibility(View.GONE);
+      reportNotSpamView.setVisibility(View.GONE);
+      voicemailPlaybackView.setVisibility(View.GONE);
+
+      detailsButtonView.setVisibility(View.VISIBLE);
+      detailsButtonView.setTag(
+          IntentProvider.getCallDetailIntentProvider(
+              callDetailsEntries,
+              buildContact(),
+              /* canReportCallerId = */ false,
+              /* canSupportAssistedDialing = */ false));
+      return;
+    }
+
     if (isFullyUndialableVoicemail()) {
       // Sometimes the voicemail server will report the message is from some non phone number
       // source. If the number does not contains any dialable digit treat it as it is from a unknown
@@ -686,31 +704,39 @@
 
         boolean identifiedSpamCall = isSpamFeatureEnabled && isSpam;
         if (duo.isReachable(context, number)) {
-          videoCallButtonView.setTag(IntentProvider.getDuoVideoIntentProvider(number));
+          videoCallButtonView.setTag(
+              IntentProvider.getDuoVideoIntentProvider(number, isNonContactEntry(info)));
           videoCallButtonView.setVisibility(View.VISIBLE);
+          CallIntentBuilder.increaseLightbringerCallButtonAppearInExpandedCallLogItemCount();
         } else if (duo.isActivated(context) && !identifiedSpamCall) {
-          if (ConfigProviderBindings.get(context)
+          if (ConfigProviderComponent.get(context)
+              .getConfigProvider()
               .getBoolean("enable_call_log_duo_invite_button", false)) {
             inviteVideoButtonView.setTag(IntentProvider.getDuoInviteIntentProvider(number));
             inviteVideoButtonView.setVisibility(View.VISIBLE);
             Logger.get(context).logImpression(DialerImpression.Type.DUO_CALL_LOG_INVITE_SHOWN);
+            CallIntentBuilder.increaseLightbringerCallButtonAppearInExpandedCallLogItemCount();
           }
         } else if (duo.isEnabled(context) && !identifiedSpamCall) {
           if (!duo.isInstalled(context)) {
-            if (ConfigProviderBindings.get(context)
+            if (ConfigProviderComponent.get(context)
+                .getConfigProvider()
                 .getBoolean("enable_call_log_install_duo_button", false)) {
               setUpVideoButtonView.setTag(IntentProvider.getInstallDuoIntentProvider());
               setUpVideoButtonView.setVisibility(View.VISIBLE);
               Logger.get(context)
                   .logImpression(DialerImpression.Type.DUO_CALL_LOG_SET_UP_INSTALL_SHOWN);
+              CallIntentBuilder.increaseLightbringerCallButtonAppearInExpandedCallLogItemCount();
             }
           } else {
-            if (ConfigProviderBindings.get(context)
+            if (ConfigProviderComponent.get(context)
+                .getConfigProvider()
                 .getBoolean("enable_call_log_activate_duo_button", false)) {
               setUpVideoButtonView.setTag(IntentProvider.getSetUpDuoIntentProvider());
               setUpVideoButtonView.setVisibility(View.VISIBLE);
               Logger.get(context)
                   .logImpression(DialerImpression.Type.DUO_CALL_LOG_SET_UP_ACTIVATE_SHOWN);
+              CallIntentBuilder.increaseLightbringerCallButtonAppearInExpandedCallLogItemCount();
             }
           }
         }
@@ -784,7 +810,7 @@
 
     callComposeButtonView.setVisibility(isCallComposerCapable ? View.VISIBLE : View.GONE);
 
-    updateBlockReportActions(isVoicemailNumber);
+    updateBlockReportActions(canPlaceCallToNumber, isVoicemailNumber);
   }
 
   private boolean isFullyUndialableVoicemail() {
@@ -797,9 +823,10 @@
   }
 
   private boolean showDuoPrimaryButton() {
+    Duo duo = DuoComponent.get(context).getDuo();
     return accountHandle != null
-        && accountHandle.getComponentName().equals(DuoConstants.PHONE_ACCOUNT_COMPONENT_NAME)
-        && DuoComponent.get(context).getDuo().isReachable(context, number);
+        && duo.isDuoAccount(accountHandle)
+        && duo.isReachable(context, number);
   }
 
   private static boolean hasDialableChar(CharSequence number) {
@@ -1025,19 +1052,13 @@
     if (intentProvider == null) {
       return;
     }
-
+    intentProvider.logInteraction(context);
     final Intent intent = intentProvider.getIntent(context);
     // See IntentProvider.getCallDetailIntentProvider() for why this may be null.
     if (intent == null) {
       return;
     }
-
-    // We check to see if we are starting a Duo intent. The reason is Duo
-    // intents need to be started using startActivityForResult instead of the usual startActivity
-    String packageName = intent.getPackage();
-    if (DuoConstants.PACKAGE_NAME.equals(packageName)) {
-      startDuoActivity(intent);
-    } else if (CallDetailsActivity.isLaunchIntent(intent)) {
+    if (OldCallDetailsActivity.isLaunchIntent(intent)) {
       PerformanceReport.recordClick(UiAction.Type.OPEN_CALL_DETAIL);
       ((Activity) context)
           .startActivityForResult(intent, ActivityRequestCodes.DIALTACTS_CALL_DETAILS);
@@ -1046,9 +1067,6 @@
           && intent.getIntExtra(TelecomManager.EXTRA_START_CALL_WITH_VIDEO_STATE, -1)
               == VideoProfile.STATE_BIDIRECTIONAL) {
         Logger.get(context).logImpression(DialerImpression.Type.IMS_VIDEO_REQUESTED_FROM_CALL_LOG);
-      } else if (intent.getDataString() != null
-          && intent.getDataString().contains(DuoConstants.PACKAGE_NAME)) {
-        Logger.get(context).logImpression(DialerImpression.Type.DUO_CALL_LOG_SET_UP_INSTALL);
       }
 
       DialerUtils.startActivityWithErrorToast(context, intent);
@@ -1062,32 +1080,6 @@
     return false;
   }
 
-  private void startDuoActivity(Intent intent) {
-    if (DuoConstants.DUO_ACTIVATE_ACTION.equals(intent.getAction())) {
-      Logger.get(context).logImpression(DialerImpression.Type.DUO_CALL_LOG_SET_UP_ACTIVATE);
-    } else if (DuoConstants.DUO_INVITE_ACTION.equals(intent.getAction())) {
-      Logger.get(context).logImpression(DialerImpression.Type.DUO_CALL_LOG_INVITE);
-    } else if (DuoConstants.DUO_CALL_ACTION.equals(intent.getAction())) {
-      Logger.get(context)
-          .logImpression(DialerImpression.Type.LIGHTBRINGER_VIDEO_REQUESTED_FROM_CALL_LOG);
-      if (isNonContactEntry(info)) {
-        Logger.get(context)
-            .logImpression(
-                DialerImpression.Type.LIGHTBRINGER_NON_CONTACT_VIDEO_REQUESTED_FROM_CALL_LOG);
-      }
-    } else {
-      throw Assert.createIllegalStateFailException(
-          "Duo intent with invalid action" + intent.getAction());
-    }
-
-    try {
-      Activity activity = (Activity) context;
-      activity.startActivityForResult(intent, ActivityRequestCodes.DIALTACTS_DUO);
-    } catch (ActivityNotFoundException e) {
-      Toast.makeText(context, R.string.activity_not_available, Toast.LENGTH_SHORT).show();
-    }
-  }
-
   private DialerContact buildContact() {
     DialerContact.Builder contact = DialerContact.newBuilder();
     contact.setPhotoId(info.photoId);
@@ -1172,14 +1164,15 @@
     }
   }
 
-  private void updateBlockReportActions(boolean isVoicemailNumber) {
+  private void updateBlockReportActions(boolean canPlaceCallToNumber, boolean isVoicemailNumber) {
     // Set block/spam actions.
     blockReportView.setVisibility(View.GONE);
     blockView.setVisibility(View.GONE);
     unblockView.setVisibility(View.GONE);
     reportNotSpamView.setVisibility(View.GONE);
     String e164Number = PhoneNumberUtils.formatNumberToE164(number, countryIso);
-    if (isVoicemailNumber
+    if (!canPlaceCallToNumber
+        || isVoicemailNumber
         || !FilteredNumbersUtil.canBlockNumber(context, e164Number, number)
         || !FilteredNumberCompat.canAttemptBlockOperations(context)) {
       return;
@@ -1260,7 +1253,9 @@
 
     String e164Number = PhoneNumberUtils.formatNumberToE164(number, countryIso);
     boolean isVoicemailNumber = callLogCache.isVoicemailNumber(accountHandle, number);
-    if (!isVoicemailNumber
+    boolean canPlaceCallToNumber = PhoneNumberHelper.canPlaceCallsTo(number, numberPresentation);
+    if (canPlaceCallToNumber
+        && !isVoicemailNumber
         && FilteredNumbersUtil.canBlockNumber(context, e164Number, number)
         && FilteredNumberCompat.canAttemptBlockOperations(context)) {
       boolean isBlocked = blockId != null;
diff --git a/java/com/android/dialer/app/calllog/CallLogNotificationsQueryHelper.java b/java/com/android/dialer/app/calllog/CallLogNotificationsQueryHelper.java
index 3afb6bb..03b824e 100644
--- a/java/com/android/dialer/app/calllog/CallLogNotificationsQueryHelper.java
+++ b/java/com/android/dialer/app/calllog/CallLogNotificationsQueryHelper.java
@@ -17,7 +17,6 @@
 package com.android.dialer.app.calllog;
 
 import android.Manifest;
-import android.annotation.TargetApi;
 import android.content.ContentResolver;
 import android.content.ContentUris;
 import android.content.ContentValues;
@@ -39,7 +38,7 @@
 import com.android.dialer.common.LogUtil;
 import com.android.dialer.common.database.Selection;
 import com.android.dialer.compat.android.provider.VoicemailCompat;
-import com.android.dialer.configprovider.ConfigProviderBindings;
+import com.android.dialer.configprovider.ConfigProviderComponent;
 import com.android.dialer.location.GeoUtil;
 import com.android.dialer.phonenumbercache.ContactInfo;
 import com.android.dialer.phonenumbercache.ContactInfoHelper;
@@ -51,7 +50,6 @@
 import java.util.concurrent.TimeUnit;
 
 /** Helper class operating on call log notifications. */
-@TargetApi(Build.VERSION_CODES.M)
 public class CallLogNotificationsQueryHelper {
 
   @VisibleForTesting
@@ -111,7 +109,14 @@
       return;
     }
     if (!PermissionsUtil.hasPhonePermissions(context)) {
-      LogUtil.e("CallLogNotificationsQueryHelper.markMissedCallsInCallLogAsRead", "no permission");
+      LogUtil.e(
+          "CallLogNotificationsQueryHelper.markMissedCallsInCallLogAsRead", "no phone permission");
+      return;
+    }
+    if (!PermissionsUtil.hasCallLogWritePermissions(context)) {
+      LogUtil.e(
+          "CallLogNotificationsQueryHelper.markMissedCallsInCallLogAsRead",
+          "no call log write permission");
       return;
     }
 
@@ -160,7 +165,8 @@
     return newCallsQuery.query(
         Calls.VOICEMAIL_TYPE,
         System.currentTimeMillis()
-            - ConfigProviderBindings.get(context)
+            - ConfigProviderComponent.get(context)
+                .getConfigProvider()
                 .getLong(
                     CONFIG_NEW_VOICEMAIL_NOTIFICATION_THRESHOLD_OFFSET, TimeUnit.DAYS.toMillis(7)));
   }
@@ -252,7 +258,7 @@
 
     /** Returns a {@link NewCall} pointed by the {@code callsUri} */
     @Nullable
-    NewCall query(Uri callsUri);
+    NewCall queryUnreadVoicemail(Uri callsUri);
   }
 
   /** Information about a new voicemail. */
@@ -341,14 +347,12 @@
 
     @Override
     @Nullable
-    @TargetApi(Build.VERSION_CODES.M)
     public List<NewCall> query(int type) {
       return query(type, NO_THRESHOLD);
     }
 
     @Override
     @Nullable
-    @TargetApi(Build.VERSION_CODES.M)
     @SuppressWarnings("MissingPermission")
     public List<NewCall> query(int type, long thresholdMillis) {
       if (!PermissionsUtil.hasPermission(context, Manifest.permission.READ_CALL_LOG)) {
@@ -407,20 +411,26 @@
 
     @Nullable
     @Override
-    public NewCall query(Uri callsUri) {
+    @SuppressWarnings("missingPermission")
+    public NewCall queryUnreadVoicemail(Uri voicemailUri) {
       if (!PermissionsUtil.hasPermission(context, Manifest.permission.READ_CALL_LOG)) {
         LogUtil.w(
             "CallLogNotificationsQueryHelper.DefaultNewCallsQuery.query",
             "No READ_CALL_LOG permission, returning null for calls lookup.");
         return null;
       }
-      final String selection = String.format("%s = '%s'", Calls.VOICEMAIL_URI, callsUri.toString());
+      Selection selection =
+          Selection.column(Calls.VOICEMAIL_URI)
+              .is("=", voicemailUri)
+              .buildUpon()
+              .and(Selection.column(Calls.IS_READ).is("IS NOT", 1))
+              .build();
       try (Cursor cursor =
           contentResolver.query(
               Calls.CONTENT_URI_WITH_VOICEMAIL,
               (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) ? PROJECTION_O : PROJECTION,
-              selection,
-              null,
+              selection.getSelection(),
+              selection.getSelectionArgs(),
               null)) {
         if (cursor == null) {
           return null;
diff --git a/java/com/android/dialer/app/calllog/CallLogNotificationsService.java b/java/com/android/dialer/app/calllog/CallLogNotificationsService.java
index 10e30ff..d84bd42 100644
--- a/java/com/android/dialer/app/calllog/CallLogNotificationsService.java
+++ b/java/com/android/dialer/app/calllog/CallLogNotificationsService.java
@@ -150,12 +150,12 @@
     LogUtil.i("CallLogNotificationsService.onHandleIntent", "action: " + action);
     switch (action) {
       case ACTION_MARK_ALL_NEW_VOICEMAILS_AS_OLD:
-        VoicemailQueryHandler.markAllNewVoicemailsAsRead(this);
+        VoicemailQueryHandler.markAllNewVoicemailsAsOld(this);
         VisualVoicemailNotifier.cancelAllVoicemailNotifications(this);
         break;
       case ACTION_MARK_SINGLE_NEW_VOICEMAIL_AS_OLD:
         Uri voicemailUri = intent.getData();
-        VoicemailQueryHandler.markSingleNewVoicemailAsRead(this, voicemailUri);
+        VoicemailQueryHandler.markSingleNewVoicemailAsOld(this, voicemailUri);
         VisualVoicemailNotifier.cancelSingleVoicemailNotification(this, voicemailUri);
         break;
       case ACTION_LEGACY_VOICEMAIL_DISMISSED:
diff --git a/java/com/android/dialer/app/calllog/IntentProvider.java b/java/com/android/dialer/app/calllog/IntentProvider.java
index 3a07a6f..21f3418 100644
--- a/java/com/android/dialer/app/calllog/IntentProvider.java
+++ b/java/com/android/dialer/app/calllog/IntentProvider.java
@@ -22,18 +22,18 @@
 import android.net.Uri;
 import android.provider.ContactsContract;
 import android.support.annotation.Nullable;
-import android.telecom.PhoneAccount;
 import android.telecom.PhoneAccountHandle;
 import android.telephony.TelephonyManager;
 import com.android.contacts.common.model.Contact;
 import com.android.contacts.common.model.ContactLoader;
-import com.android.dialer.calldetails.CallDetailsActivity;
 import com.android.dialer.calldetails.CallDetailsEntries;
+import com.android.dialer.calldetails.OldCallDetailsActivity;
 import com.android.dialer.callintent.CallInitiationType;
 import com.android.dialer.callintent.CallIntentBuilder;
 import com.android.dialer.dialercontact.DialerContact;
 import com.android.dialer.duo.DuoComponent;
-import com.android.dialer.duo.DuoConstants;
+import com.android.dialer.logging.DialerImpression;
+import com.android.dialer.logging.Logger;
 import com.android.dialer.precall.PreCall;
 import com.android.dialer.util.IntentUtil;
 import java.util.ArrayList;
@@ -95,11 +95,26 @@
     };
   }
 
-  public static IntentProvider getDuoVideoIntentProvider(String number) {
+  public static IntentProvider getDuoVideoIntentProvider(String number, boolean isNonContact) {
     return new IntentProvider() {
       @Override
       public Intent getIntent(Context context) {
-        return DuoComponent.get(context).getDuo().getIntent(context, number);
+        return PreCall.getIntent(
+            context,
+            new CallIntentBuilder(number, CallInitiationType.Type.CALL_LOG)
+                .setIsDuoCall(true)
+                .setIsVideoCall(true));
+      }
+
+      @Override
+      public void logInteraction(Context context) {
+        Logger.get(context)
+            .logImpression(DialerImpression.Type.LIGHTBRINGER_VIDEO_REQUESTED_FROM_CALL_LOG);
+        if (isNonContact) {
+          Logger.get(context)
+              .logImpression(
+                  DialerImpression.Type.LIGHTBRINGER_NON_CONTACT_VIDEO_REQUESTED_FROM_CALL_LOG);
+        }
       }
     };
   }
@@ -108,18 +123,12 @@
     return new IntentProvider() {
       @Override
       public Intent getIntent(Context context) {
-        return new Intent(
-            Intent.ACTION_VIEW,
-            new Uri.Builder()
-                .scheme("https")
-                .authority("play.google.com")
-                .appendEncodedPath("store/apps/details")
-                .appendQueryParameter("id", DuoConstants.PACKAGE_NAME)
-                .appendQueryParameter(
-                    "referrer",
-                    "utm_source=dialer&utm_medium=text&utm_campaign=product") // This string is from
-                // the Duo team
-                .build());
+        return DuoComponent.get(context).getDuo().getInstallDuoIntent().orNull();
+      }
+
+      @Override
+      public void logInteraction(Context context) {
+        Logger.get(context).logImpression(DialerImpression.Type.DUO_CALL_LOG_SET_UP_INSTALL);
       }
     };
   }
@@ -128,7 +137,12 @@
     return new IntentProvider() {
       @Override
       public Intent getIntent(Context context) {
-        return new Intent(DuoConstants.DUO_ACTIVATE_ACTION).setPackage(DuoConstants.PACKAGE_NAME);
+        return DuoComponent.get(context).getDuo().getActivateIntent().orNull();
+      }
+
+      @Override
+      public void logInteraction(Context context) {
+        Logger.get(context).logImpression(DialerImpression.Type.DUO_CALL_LOG_SET_UP_ACTIVATE);
       }
     };
   }
@@ -137,11 +151,12 @@
     return new IntentProvider() {
       @Override
       public Intent getIntent(Context context) {
-        Intent intent =
-            new Intent(DuoConstants.DUO_INVITE_ACTION)
-                .setPackage(DuoConstants.PACKAGE_NAME)
-                .setData(Uri.fromParts(PhoneAccount.SCHEME_TEL, number, null /* fragment */));
-        return intent;
+        return DuoComponent.get(context).getDuo().getInviteIntent(number).orNull();
+      }
+
+      @Override
+      public void logInteraction(Context context) {
+        Logger.get(context).logImpression(DialerImpression.Type.DUO_CALL_LOG_INVITE);
       }
     };
   }
@@ -184,7 +199,7 @@
     return new IntentProvider() {
       @Override
       public Intent getIntent(Context context) {
-        return CallDetailsActivity.newInstance(
+        return OldCallDetailsActivity.newInstance(
             context, callDetailsEntries, contact, canReportCallerId, canSupportAssistedDialing);
       }
     };
@@ -261,4 +276,6 @@
   }
 
   public abstract Intent getIntent(Context context);
+
+  public void logInteraction(Context context) {}
 }
diff --git a/java/com/android/dialer/app/calllog/LegacyVoicemailNotifier.java b/java/com/android/dialer/app/calllog/LegacyVoicemailNotifier.java
index 5859a3e..1388f43 100644
--- a/java/com/android/dialer/app/calllog/LegacyVoicemailNotifier.java
+++ b/java/com/android/dialer/app/calllog/LegacyVoicemailNotifier.java
@@ -21,6 +21,7 @@
 import android.app.PendingIntent;
 import android.content.Context;
 import android.os.Build.VERSION_CODES;
+import android.os.PersistableBundle;
 import android.support.annotation.NonNull;
 import android.support.v4.os.BuildCompat;
 import android.telecom.PhoneAccount;
@@ -38,6 +39,7 @@
 import com.android.dialer.notification.VoicemailChannelUtils;
 import com.android.dialer.phonenumberutil.PhoneNumberHelper;
 import com.android.dialer.telecom.TelecomUtil;
+import com.android.dialer.theme.base.ThemeComponent;
 
 /** Shows a notification in the status bar for legacy vociemail. */
 @TargetApi(VERSION_CODES.O)
@@ -98,11 +100,14 @@
         context
             .getResources()
             .getQuantityString(R.plurals.notification_voicemail_title, count, count);
-    boolean isOngoing =
-        pinnedTelephonyManager
-            .getCarrierConfig()
-            .getBoolean(CarrierConfigManager.KEY_VOICEMAIL_NOTIFICATION_PERSISTENT_BOOL);
-
+    PersistableBundle config = pinnedTelephonyManager.getCarrierConfig();
+    boolean isOngoing;
+    if (config == null) {
+      isOngoing = false;
+    } else {
+      isOngoing =
+          config.getBoolean(CarrierConfigManager.KEY_VOICEMAIL_NOTIFICATION_PERSISTENT_BOOL);
+    }
     String contentText;
     PendingIntent contentIntent;
     if (!TextUtils.isEmpty(voicemailNumber) && callVoicemailIntent != null) {
@@ -116,7 +121,7 @@
     Notification.Builder builder =
         new Notification.Builder(context)
             .setSmallIcon(android.R.drawable.stat_notify_voicemail)
-            .setColor(context.getColor(R.color.dialer_theme_color))
+            .setColor(ThemeComponent.get(context).theme().getColorPrimary())
             .setWhen(System.currentTimeMillis())
             .setContentTitle(notificationTitle)
             .setContentText(contentText)
@@ -142,13 +147,14 @@
     if (TelecomUtil.getCallCapablePhoneAccounts(context).size() > 1) {
       TelecomManager telecomManager = context.getSystemService(TelecomManager.class);
       PhoneAccount phoneAccount = telecomManager.getPhoneAccount(handle);
-      return phoneAccount.getShortDescription().toString();
-    } else {
-      return String.format(
-          context.getString(R.string.notification_voicemail_text_format),
-          PhoneNumberHelper.formatNumber(
-              context, voicemailNumber, GeoUtil.getCurrentCountryIso(context)));
+      if (phoneAccount != null) {
+        return phoneAccount.getShortDescription().toString();
+      }
     }
+    return String.format(
+        context.getString(R.string.notification_voicemail_text_format),
+        PhoneNumberHelper.formatNumber(
+            context, voicemailNumber, GeoUtil.getCurrentCountryIso(context)));
   }
 
   public static void cancelNotification(
@@ -156,8 +162,18 @@
     LogUtil.enterBlock("LegacyVoicemailNotifier.cancelNotification");
     Assert.checkArgument(BuildCompat.isAtLeastO());
     Assert.isNotNull(phoneAccountHandle);
-    DialerNotificationManager.cancel(
-        context, getNotificationTag(context, phoneAccountHandle), NOTIFICATION_ID);
+    if ("null".equals(phoneAccountHandle.getId())) {
+      // while PhoneAccountHandle itself will never be null, telephony may still construct a "null"
+      // handle if the SIM is no longer available. Usually both SIM will be removed at the sames
+      // time, so just clear all notifications.
+      LogUtil.i(
+          "LegacyVoicemailNotifier.cancelNotification",
+          "'null' id, canceling all legacy voicemail notifications");
+      DialerNotificationManager.cancelAll(context, NOTIFICATION_TAG);
+    } else {
+      DialerNotificationManager.cancel(
+          context, getNotificationTag(context, phoneAccountHandle), NOTIFICATION_ID);
+    }
   }
 
   @NonNull
diff --git a/java/com/android/dialer/app/calllog/MissedCallNotificationReceiver.java b/java/com/android/dialer/app/calllog/MissedCallNotificationReceiver.java
index 641be85..f24b3cd 100644
--- a/java/com/android/dialer/app/calllog/MissedCallNotificationReceiver.java
+++ b/java/com/android/dialer/app/calllog/MissedCallNotificationReceiver.java
@@ -46,6 +46,8 @@
       return;
     }
 
+    LogUtil.enterBlock("MissedCallNotificationReceiver.onReceive");
+
     int count =
         intent.getIntExtra(
             EXTRA_NOTIFICATION_COUNT, CallLogNotificationsService.UNKNOWN_MISSED_CALL_COUNT);
diff --git a/java/com/android/dialer/app/calllog/MissedCallNotifier.java b/java/com/android/dialer/app/calllog/MissedCallNotifier.java
index 80901ce..4b5bfba 100644
--- a/java/com/android/dialer/app/calllog/MissedCallNotifier.java
+++ b/java/com/android/dialer/app/calllog/MissedCallNotifier.java
@@ -42,19 +42,17 @@
 import android.text.TextUtils;
 import android.util.ArraySet;
 import com.android.contacts.common.ContactsUtils;
-import com.android.dialer.app.DialtactsActivity;
 import com.android.dialer.app.MainComponent;
 import com.android.dialer.app.R;
 import com.android.dialer.app.calllog.CallLogNotificationsQueryHelper.NewCall;
 import com.android.dialer.app.contactinfo.ContactPhotoLoader;
-import com.android.dialer.app.list.DialtactsPagerAdapter;
 import com.android.dialer.callintent.CallInitiationType;
 import com.android.dialer.callintent.CallIntentBuilder;
 import com.android.dialer.common.Assert;
 import com.android.dialer.common.LogUtil;
 import com.android.dialer.common.concurrent.DialerExecutor.Worker;
 import com.android.dialer.compat.android.provider.VoicemailCompat;
-import com.android.dialer.duo.DuoConstants;
+import com.android.dialer.duo.DuoComponent;
 import com.android.dialer.enrichedcall.FuzzyPhoneNumberMatcher;
 import com.android.dialer.notification.DialerNotificationManager;
 import com.android.dialer.notification.NotificationChannelId;
@@ -64,6 +62,7 @@
 import com.android.dialer.phonenumbercache.ContactInfo;
 import com.android.dialer.phonenumberutil.PhoneNumberHelper;
 import com.android.dialer.precall.PreCall;
+import com.android.dialer.theme.base.ThemeComponent;
 import com.android.dialer.util.DialerUtils;
 import com.android.dialer.util.IntentUtil;
 import java.util.Iterator;
@@ -106,6 +105,8 @@
   @VisibleForTesting
   @WorkerThread
   void updateMissedCallNotification(int count, @Nullable String number) {
+    LogUtil.enterBlock("MissedCallNotifier.updateMissedCallNotification");
+
     final int titleResId;
     CharSequence expandedText; // The text in the notification's line 1 and 2.
 
@@ -137,6 +138,7 @@
     if (count == CallLogNotificationsService.UNKNOWN_MISSED_CALL_COUNT) {
       // If the intent did not contain a count, and we are unable to get a count from the
       // call log, then no notification can be shown.
+      LogUtil.i("MissedCallNotifier.updateMissedCallNotification", "unknown missed call count");
       return;
     }
 
@@ -144,6 +146,9 @@
     boolean useCallList = newCalls != null;
 
     if (count == 1) {
+      LogUtil.i(
+          "MissedCallNotifier.updateMissedCallNotification",
+          "1 missed call, looking up contact info");
       NewCall call =
           useCallList
               ? newCalls.get(0)
@@ -188,6 +193,8 @@
       expandedText = context.getString(R.string.notification_missedCallsMsg, count);
     }
 
+    LogUtil.i("MissedCallNotifier.updateMissedCallNotification", "preparing notification");
+
     // Create a public viewable version of the notification, suitable for display when sensitive
     // notification content is hidden.
     Notification.Builder publicSummaryBuilder = createNotificationBuilder();
@@ -223,15 +230,20 @@
 
     if (useCallList) {
       // Do not repost active notifications to prevent erasing post call notes.
-      Set<String> activeTags = new ArraySet<>();
+      Set<String> activeAndThrottledTags = new ArraySet<>();
       for (StatusBarNotification activeNotification :
           DialerNotificationManager.getActiveNotifications(context)) {
-        activeTags.add(activeNotification.getTag());
+        activeAndThrottledTags.add(activeNotification.getTag());
+      }
+      // Do not repost throttled notifications
+      for (StatusBarNotification throttledNotification :
+          DialerNotificationManager.getThrottledNotificationSet()) {
+        activeAndThrottledTags.add(throttledNotification.getTag());
       }
 
       for (NewCall call : newCalls) {
         String callTag = getNotificationTagForCall(call);
-        if (!activeTags.contains(callTag)) {
+        if (!activeAndThrottledTags.contains(callTag)) {
           DialerNotificationManager.notify(
               context,
               callTag,
@@ -269,7 +281,7 @@
       if (phoneAccount == null) {
         continue;
       }
-      if (DuoConstants.PHONE_ACCOUNT_HANDLE.equals(phoneAccountHandle)) {
+      if (DuoComponent.get(context).getDuo().isDuoAccount(phoneAccountHandle)) {
         iterator.remove();
         continue;
       }
@@ -385,7 +397,7 @@
     return new Notification.Builder(context)
         .setGroup(MissedCallConstants.GROUP_KEY)
         .setSmallIcon(android.R.drawable.stat_notify_missed_call)
-        .setColor(context.getResources().getColor(R.color.dialer_theme_color, null))
+        .setColor(ThemeComponent.get(context).theme().getColorPrimary())
         .setAutoCancel(true)
         .setOnlyAlertOnce(true)
         .setShowWhen(true)
@@ -446,13 +458,8 @@
    * @param callUri Uri of the call to jump to. May be null
    */
   private PendingIntent createCallLogPendingIntent(@Nullable Uri callUri) {
-    Intent contentIntent;
-    if (MainComponent.isNuiComponentEnabled(context)) {
-      contentIntent = MainComponent.getShowCallLogIntent(context);
-    } else {
-      contentIntent =
-          DialtactsActivity.getShowTabIntent(context, DialtactsPagerAdapter.TAB_INDEX_HISTORY);
-    }
+    Intent contentIntent = MainComponent.getShowCallLogIntent(context);
+
     // TODO (a bug): scroll to call
     contentIntent.setData(callUri);
     return PendingIntent.getActivity(context, 0, contentIntent, PendingIntent.FLAG_UPDATE_CURRENT);
diff --git a/java/com/android/dialer/app/calllog/PhoneCallDetailsHelper.java b/java/com/android/dialer/app/calllog/PhoneCallDetailsHelper.java
index 1f27e5b..9d04cb2 100644
--- a/java/com/android/dialer/app/calllog/PhoneCallDetailsHelper.java
+++ b/java/com/android/dialer/app/calllog/PhoneCallDetailsHelper.java
@@ -25,15 +25,14 @@
 import android.provider.CallLog.Calls;
 import android.provider.ContactsContract.CommonDataKinds.Phone;
 import android.support.v4.content.ContextCompat;
+import android.support.v4.os.BuildCompat;
 import android.telecom.PhoneAccount;
 import android.telecom.PhoneAccountHandle;
+import android.telephony.PhoneNumberUtils;
 import android.text.SpannableString;
-import android.text.Spanned;
 import android.text.TextUtils;
 import android.text.format.DateUtils;
 import android.text.method.LinkMovementMethod;
-import android.text.style.TextAppearanceSpan;
-import android.text.style.URLSpan;
 import android.text.util.Linkify;
 import android.util.TypedValue;
 import android.view.Gravity;
@@ -49,8 +48,12 @@
 import com.android.dialer.compat.telephony.TelephonyManagerCompat;
 import com.android.dialer.logging.ContactSource;
 import com.android.dialer.oem.MotorolaUtils;
+import com.android.dialer.phonenumbercache.CachedNumberLookupService;
+import com.android.dialer.phonenumbercache.PhoneNumberCache;
 import com.android.dialer.phonenumberutil.PhoneNumberHelper;
+import com.android.dialer.spannable.ContentWithLearnMoreSpanner;
 import com.android.dialer.storage.StorageComponent;
+import com.android.dialer.theme.base.ThemeComponent;
 import com.android.dialer.util.DialerUtils;
 import com.android.voicemail.VoicemailClient;
 import com.android.voicemail.VoicemailComponent;
@@ -75,6 +78,8 @@
   private final CallLogCache callLogCache;
   /** Calendar used to construct dates */
   private final Calendar calendar;
+
+  private final CachedNumberLookupService cachedNumberLookupService;
   /** The injected current time in milliseconds since the epoch. Used only by tests. */
   private Long currentTimeMillisForTest;
 
@@ -94,6 +99,55 @@
     this.resources = resources;
     this.callLogCache = callLogCache;
     calendar = Calendar.getInstance();
+    cachedNumberLookupService = PhoneNumberCache.get(context).getCachedNumberLookupService();
+  }
+
+  static boolean shouldShowVoicemailDonationPromo(
+      Context context, PhoneAccountHandle accountHandle) {
+    VoicemailClient client = VoicemailComponent.get(context).getVoicemailClient();
+    return client.isVoicemailDonationAvailable(context, accountHandle)
+        && !hasSeenVoicemailDonationPromo(context);
+  }
+
+  static boolean hasSeenVoicemailDonationPromo(Context context) {
+    return StorageComponent.get(context.getApplicationContext())
+        .unencryptedSharedPrefs()
+        .getBoolean(PREF_VOICEMAIL_DONATION_PROMO_SHOWN_KEY, false);
+  }
+
+  private static int dpsToPixels(Context context, int dps) {
+    return (int)
+        (TypedValue.applyDimension(
+            TypedValue.COMPLEX_UNIT_DIP, dps, context.getResources().getDisplayMetrics()));
+  }
+
+  private static void recordPromoShown(Context context) {
+    StorageComponent.get(context.getApplicationContext())
+        .unencryptedSharedPrefs()
+        .edit()
+        .putBoolean(PREF_VOICEMAIL_DONATION_PROMO_SHOWN_KEY, true)
+        .apply();
+  }
+
+  /** Returns true if primary name is empty or the data is from Cequint Caller ID. */
+  private boolean shouldShowLocation(PhoneCallDetails details) {
+    if (TextUtils.isEmpty(details.geocode)) {
+      return false;
+    }
+    // For caller ID provided by Cequint we want to show the geo location.
+    if (details.sourceType == ContactSource.Type.SOURCE_TYPE_CEQUINT_CALLER_ID) {
+      return true;
+    }
+    if (cachedNumberLookupService != null
+        && cachedNumberLookupService.isBusiness(details.sourceType)) {
+      return true;
+    }
+
+    // Don't bother showing geo location for contacts.
+    if (!TextUtils.isEmpty(details.namePrimary)) {
+      return false;
+    }
+    return true;
   }
 
   /** Fills the call details views with content. */
@@ -119,6 +173,9 @@
     views.callTypeIcons.setShowAssistedDialed(
         (details.features & TelephonyManagerCompat.FEATURES_ASSISTED_DIALING)
             == TelephonyManagerCompat.FEATURES_ASSISTED_DIALING);
+    if (BuildCompat.isAtLeastP()) {
+      views.callTypeIcons.setShowRtt((details.features & Calls.FEATURES_RTT) == Calls.FEATURES_RTT);
+    }
     views.callTypeIcons.requestLayout();
     views.callTypeIcons.setVisibility(View.VISIBLE);
 
@@ -158,20 +215,7 @@
       views.callAccountLabel.setVisibility(View.GONE);
     }
 
-    final CharSequence nameText;
-    final CharSequence displayNumber = details.displayNumber;
-    if (TextUtils.isEmpty(details.getPreferredName())) {
-      nameText = displayNumber;
-      // We have a real phone number as "nameView" so make it always LTR
-      views.nameView.setTextDirection(View.TEXT_DIRECTION_LTR);
-    } else {
-      nameText = details.getPreferredName();
-      // "nameView" is updated from phone number to contact name after number matching.
-      // Since TextDirection remains at View.TEXT_DIRECTION_LTR, initialize it.
-      views.nameView.setTextDirection(View.TEXT_DIRECTION_INHERIT);
-    }
-
-    views.nameView.setText(nameText);
+    setNameView(views, details);
 
     if (isVoicemail) {
       int relevantLinkTypes = Linkify.EMAIL_ADDRESSES | Linkify.PHONE_NUMBERS | Linkify.WEB_URLS;
@@ -236,9 +280,29 @@
     views.voicemailTranscriptionBrandingView.setTypeface(typeface);
     views.callLocationAndDate.setTypeface(typeface);
     views.callLocationAndDate.setTextColor(
-        ContextCompat.getColor(
-            context,
-            details.isRead ? R.color.call_log_detail_color : R.color.call_log_unread_text_color));
+        details.isRead
+            ? ThemeComponent.get(context).theme().getTextColorSecondary()
+            : ThemeComponent.get(context).theme().getTextColorPrimary());
+  }
+
+  private void setNameView(PhoneCallDetailsViews views, PhoneCallDetails details) {
+    if (!TextUtils.isEmpty(details.getPreferredName())) {
+      views.nameView.setText(details.getPreferredName());
+      // "nameView" is updated from phone number to contact name after number matching.
+      // Since TextDirection remains at View.TEXT_DIRECTION_LTR, initialize it.
+      views.nameView.setTextDirection(View.TEXT_DIRECTION_INHERIT);
+      return;
+    }
+
+    if (PhoneNumberUtils.isEmergencyNumber(details.displayNumber)) {
+      views.nameView.setText(R.string.emergency_number);
+      views.nameView.setTextDirection(View.TEXT_DIRECTION_INHERIT);
+      return;
+    }
+
+    views.nameView.setText(details.displayNumber);
+    // We have a real phone number as "nameView" so make it always LTR
+    views.nameView.setTextDirection(View.TEXT_DIRECTION_LTR);
   }
 
   private boolean shouldShowTranscriptionRating(
@@ -252,9 +316,10 @@
       return true;
     }
 
-    // Also show the rating option if voicemail transcription is available (but not enabled)
+    // Also show the rating option if voicemail donation is available (but not enabled)
     // and the donation promo has not yet been shown.
-    if (client.isVoicemailDonationAvailable(context) && !hasSeenVoicemailDonationPromo(context)) {
+    if (client.isVoicemailDonationAvailable(context, account)
+        && !hasSeenVoicemailDonationPromo(context)) {
       return true;
     }
 
@@ -265,7 +330,7 @@
       TranscriptionRatingValue ratingValue, PhoneCallDetails details, View ratingView) {
     LogUtil.enterBlock("PhoneCallDetailsHelper.recordTranscriptionRating");
 
-    if (shouldShowVoicemailDonationPromo(context)) {
+    if (shouldShowVoicemailDonationPromo(context, details.accountHandle)) {
       showVoicemailDonationPromo(ratingValue, details, ratingView);
     } else {
       TranscriptionRatingHelper.sendRating(
@@ -277,19 +342,6 @@
     }
   }
 
-  static boolean shouldShowVoicemailDonationPromo(Context context) {
-    VoicemailClient client = VoicemailComponent.get(context).getVoicemailClient();
-    return client.isVoicemailTranscriptionAvailable(context)
-        && client.isVoicemailDonationAvailable(context)
-        && !hasSeenVoicemailDonationPromo(context);
-  }
-
-  static boolean hasSeenVoicemailDonationPromo(Context context) {
-    return StorageComponent.get(context.getApplicationContext())
-        .unencryptedSharedPrefs()
-        .getBoolean(PREF_VOICEMAIL_DONATION_PROMO_SHOWN_KEY, false);
-  }
-
   private void showVoicemailDonationPromo(
       TranscriptionRatingValue ratingValue, PhoneCallDetails details, View ratingView) {
     AlertDialog.Builder builder = new AlertDialog.Builder(context);
@@ -319,6 +371,9 @@
         new DialogInterface.OnClickListener() {
           @Override
           public void onClick(final DialogInterface dialog, final int button) {
+            VoicemailComponent.get(context)
+                .getVoicemailClient()
+                .setVoicemailDonationEnabled(context, details.accountHandle, false);
             dialog.cancel();
             recordPromoShown(context);
             ratingView.setVisibility(View.GONE);
@@ -327,7 +382,6 @@
     builder.setCancelable(true);
     AlertDialog dialog = builder.create();
 
-    // Use a custom title to prevent truncation, sigh
     TextView title = new TextView(context);
     title.setText(R.string.voicemail_donation_promo_title);
 
@@ -349,48 +403,19 @@
     textView.setMovementMethod(LinkMovementMethod.getInstance());
     Button positiveButton = dialog.getButton(DialogInterface.BUTTON_POSITIVE);
     if (positiveButton != null) {
-      positiveButton.setTextColor(
-          context
-              .getResources()
-              .getColor(R.color.voicemail_donation_promo_positive_button_text_color));
+      positiveButton.setTextColor(ThemeComponent.get(context).theme().getColorPrimary());
     }
     Button negativeButton = dialog.getButton(DialogInterface.BUTTON_NEGATIVE);
     if (negativeButton != null) {
-      negativeButton.setTextColor(
-          context
-              .getResources()
-              .getColor(R.color.voicemail_donation_promo_negative_button_text_color));
+      negativeButton.setTextColor(ThemeComponent.get(context).theme().getTextColorSecondary());
     }
   }
 
-  private static int dpsToPixels(Context context, int dps) {
-    return (int)
-        (TypedValue.applyDimension(
-            TypedValue.COMPLEX_UNIT_DIP, dps, context.getResources().getDisplayMetrics()));
-  }
-
-  private static void recordPromoShown(Context context) {
-    StorageComponent.get(context.getApplicationContext())
-        .unencryptedSharedPrefs()
-        .edit()
-        .putBoolean(PREF_VOICEMAIL_DONATION_PROMO_SHOWN_KEY, true)
-        .apply();
-  }
-
   private SpannableString getVoicemailDonationPromoContent() {
-    CharSequence content = context.getString(R.string.voicemail_donation_promo_content);
-    CharSequence learnMore = context.getString(R.string.voicemail_donation_promo_learn_more);
-    String learnMoreUrl = context.getString(R.string.voicemail_donation_promo_learn_more_url);
-    SpannableString span = new SpannableString(content + " " + learnMore);
-    int end = span.length();
-    int start = end - learnMore.length();
-    span.setSpan(new URLSpan(learnMoreUrl), start, end, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
-    span.setSpan(
-        new TextAppearanceSpan(context, R.style.PromoLinkStyle),
-        start,
-        end,
-        Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
-    return span;
+    return new ContentWithLearnMoreSpanner(context)
+        .create(
+            context.getString(R.string.voicemail_donation_promo_content),
+            context.getString(R.string.voicemail_donation_promo_learn_more_url));
   }
 
   @Override
@@ -467,29 +492,12 @@
                 : Phone.getTypeLabel(resources, details.numberType, details.numberLabel);
       }
     }
-
     if (!TextUtils.isEmpty(details.namePrimary) && TextUtils.isEmpty(numberFormattedLabel)) {
       numberFormattedLabel = details.displayNumber;
     }
     return numberFormattedLabel;
   }
 
-  /** Returns true if primary name is empty or the data is from Cequint Caller ID. */
-  private static boolean shouldShowLocation(PhoneCallDetails details) {
-    if (TextUtils.isEmpty(details.geocode)) {
-      return false;
-    }
-    // For caller ID provided by Cequint we want to show the geo location.
-    if (details.sourceType == ContactSource.Type.SOURCE_TYPE_CEQUINT_CALLER_ID) {
-      return true;
-    }
-    // Don't bother showing geo location for contacts.
-    if (!TextUtils.isEmpty(details.namePrimary)) {
-      return false;
-    }
-    return true;
-  }
-
   public void setPhoneTypeLabelForTest(CharSequence phoneTypeLabel) {
     this.phoneTypeLabelForTest = phoneTypeLabel;
   }
@@ -559,24 +567,6 @@
     return currentYear != calendar.get(Calendar.YEAR);
   }
 
-  /** Sets the text of the header view for the details page of a phone call. */
-  public void setCallDetailsHeader(TextView nameView, PhoneCallDetails details) {
-    final CharSequence nameText;
-    if (!TextUtils.isEmpty(details.namePrimary)) {
-      nameText = details.namePrimary;
-    } else if (!TextUtils.isEmpty(details.displayNumber)) {
-      nameText = details.displayNumber;
-    } else {
-      nameText = resources.getString(R.string.unknown);
-    }
-
-    nameView.setText(nameText);
-  }
-
-  public void setCurrentTimeForTest(long currentTimeMillis) {
-    currentTimeMillisForTest = currentTimeMillis;
-  }
-
   /**
    * Returns the current time in milliseconds since the epoch.
    *
diff --git a/java/com/android/dialer/app/calllog/PhoneCallDetailsViews.java b/java/com/android/dialer/app/calllog/PhoneCallDetailsViews.java
index 8b7a92b..71cbc8c 100644
--- a/java/com/android/dialer/app/calllog/PhoneCallDetailsViews.java
+++ b/java/com/android/dialer/app/calllog/PhoneCallDetailsViews.java
@@ -21,11 +21,12 @@
 import android.widget.TextView;
 import com.android.dialer.app.R;
 import com.android.dialer.calllogutils.CallTypeIconsView;
+import com.android.dialer.widget.BidiTextView;
 
 /** Encapsulates the views that are used to display the details of a phone call in the call log. */
 public final class PhoneCallDetailsViews {
 
-  public final TextView nameView;
+  public final BidiTextView nameView;
   public final View callTypeView;
   public final CallTypeIconsView callTypeIcons;
   public final TextView callLocationAndDate;
@@ -36,7 +37,7 @@
   public final TextView callAccountLabel;
 
   private PhoneCallDetailsViews(
-      TextView nameView,
+      BidiTextView nameView,
       View callTypeView,
       CallTypeIconsView callTypeIcons,
       TextView callLocationAndDate,
@@ -65,7 +66,7 @@
    */
   public static PhoneCallDetailsViews fromView(View view) {
     return new PhoneCallDetailsViews(
-        (TextView) view.findViewById(R.id.name),
+        (BidiTextView) view.findViewById(R.id.name),
         view.findViewById(R.id.call_type),
         (CallTypeIconsView) view.findViewById(R.id.call_type_icons),
         (TextView) view.findViewById(R.id.call_location_and_date),
@@ -78,7 +79,7 @@
 
   public static PhoneCallDetailsViews createForTest(Context context) {
     return new PhoneCallDetailsViews(
-        new TextView(context),
+        new BidiTextView(context),
         new View(context),
         new CallTypeIconsView(context),
         new TextView(context),
diff --git a/java/com/android/dialer/app/calllog/VisualVoicemailCallLogFragment.java b/java/com/android/dialer/app/calllog/VisualVoicemailCallLogFragment.java
index f1ede89..5575cac 100644
--- a/java/com/android/dialer/app/calllog/VisualVoicemailCallLogFragment.java
+++ b/java/com/android/dialer/app/calllog/VisualVoicemailCallLogFragment.java
@@ -42,6 +42,7 @@
 import com.android.dialer.voicemail.listui.error.VoicemailErrorMessageCreator;
 import com.android.dialer.voicemail.listui.error.VoicemailStatus;
 import com.android.dialer.voicemail.listui.error.VoicemailStatusWorker;
+import com.android.dialer.widget.EmptyContentView;
 import java.util.List;
 
 public class VisualVoicemailCallLogFragment extends CallLogFragment {
@@ -110,6 +111,8 @@
   public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedState) {
     View view = inflater.inflate(R.layout.call_log_fragment, container, false);
     setupView(view);
+    EmptyContentView emptyContentView = view.findViewById(R.id.empty_list_view);
+    emptyContentView.setImage(R.drawable.quantum_ic_voicemail_vd_theme_24);
     return view;
   }
 
@@ -124,6 +127,12 @@
   public void onPause() {
     voicemailPlaybackPresenter.onPause();
     voicemailErrorManager.onPause();
+    // Necessary to reset the speaker when leaving otherwise the platform will still remain in
+    // speaker mode
+    AudioManager audioManager = getContext().getSystemService(AudioManager.class);
+    if (audioManager.isSpeakerphoneOn()) {
+      audioManager.setSpeakerphoneOn(false);
+    }
     super.onPause();
   }
 
@@ -151,7 +160,9 @@
   @Override
   public void fetchCalls() {
     super.fetchCalls();
-    FragmentUtils.getParentUnsafe(this, CallLogFragmentListener.class).updateTabUnreadCounts();
+    if (FragmentUtils.getParent(this, CallLogFragmentListener.class) != null) {
+      FragmentUtils.getParentUnsafe(this, CallLogFragmentListener.class).updateTabUnreadCounts();
+    }
   }
 
   @Override
@@ -176,10 +187,10 @@
   }
 
   @VisibleForTesting
-  static boolean shouldAutoSync(
+  boolean shouldAutoSync(
       VoicemailErrorMessageCreator errorMessageCreator, List<VoicemailStatus> statuses) {
     for (VoicemailStatus status : statuses) {
-      if (!status.isActive()) {
+      if (!status.isActive(getContext())) {
         continue;
       }
       if (errorMessageCreator.isSyncBlockingError(status)) {
diff --git a/java/com/android/dialer/app/calllog/VisualVoicemailNotifier.java b/java/com/android/dialer/app/calllog/VisualVoicemailNotifier.java
index 78d3075..7fc104b 100644
--- a/java/com/android/dialer/app/calllog/VisualVoicemailNotifier.java
+++ b/java/com/android/dialer/app/calllog/VisualVoicemailNotifier.java
@@ -33,12 +33,10 @@
 import android.telephony.TelephonyManager;
 import android.text.TextUtils;
 import com.android.contacts.common.util.ContactDisplayUtils;
-import com.android.dialer.app.DialtactsActivity;
 import com.android.dialer.app.MainComponent;
 import com.android.dialer.app.R;
 import com.android.dialer.app.calllog.CallLogNotificationsQueryHelper.NewCall;
 import com.android.dialer.app.contactinfo.ContactPhotoLoader;
-import com.android.dialer.app.list.DialtactsPagerAdapter;
 import com.android.dialer.common.LogUtil;
 import com.android.dialer.compat.android.provider.VoicemailCompat;
 import com.android.dialer.logging.DialerImpression;
@@ -48,6 +46,7 @@
 import com.android.dialer.notification.NotificationManagerUtils;
 import com.android.dialer.phonenumbercache.ContactInfo;
 import com.android.dialer.telecom.TelecomUtil;
+import com.android.dialer.theme.base.ThemeComponent;
 import java.util.List;
 import java.util.Map;
 
@@ -145,7 +144,7 @@
   private static NotificationCompat.Builder createNotificationBuilder(@NonNull Context context) {
     return new NotificationCompat.Builder(context)
         .setSmallIcon(android.R.drawable.stat_notify_voicemail)
-        .setColor(context.getColor(R.color.dialer_theme_color))
+        .setColor(ThemeComponent.get(context).theme().getColorPrimary())
         .setGroup(GROUP_KEY)
         .setOnlyAlertOnce(true)
         .setAutoCancel(true);
@@ -233,9 +232,6 @@
   @Nullable
   private static Uri getVoicemailRingtoneUri(
       @NonNull Context context, @Nullable PhoneAccountHandle handle) {
-    if (VERSION.SDK_INT < VERSION_CODES.N) {
-      return null;
-    }
     if (handle == null) {
       LogUtil.i("VisualVoicemailNotifier.getVoicemailRingtoneUri", "null handle, getting fallback");
       handle = getFallbackAccount(context);
@@ -251,9 +247,6 @@
 
   private static int getNotificationDefaultFlags(
       @NonNull Context context, @Nullable PhoneAccountHandle handle) {
-    if (VERSION.SDK_INT < VERSION_CODES.N) {
-      return Notification.DEFAULT_ALL;
-    }
     if (handle == null) {
       LogUtil.i(
           "VisualVoicemailNotifier.getNotificationDefaultFlags", "null handle, getting fallback");
@@ -273,18 +266,12 @@
 
   private static PendingIntent newVoicemailIntent(
       @NonNull Context context, @Nullable NewCall voicemail) {
-    Intent intent;
-    if (MainComponent.isNuiComponentEnabled(context)) {
-      intent = MainComponent.getShowVoicemailIntent(context);
-    } else {
-      intent =
-          DialtactsActivity.getShowTabIntent(context, DialtactsPagerAdapter.TAB_INDEX_VOICEMAIL);
-    }
+    Intent intent = MainComponent.getShowVoicemailIntent(context);
+
     // TODO (a bug): scroll to this voicemail
     if (voicemail != null) {
       intent.setData(voicemail.voicemailUri);
     }
-    intent.putExtra(DialtactsActivity.EXTRA_CLEAR_NEW_VOICEMAILS, true);
     return PendingIntent.getActivity(context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT);
   }
 
diff --git a/java/com/android/dialer/app/calllog/VisualVoicemailUpdateTask.java b/java/com/android/dialer/app/calllog/VisualVoicemailUpdateTask.java
index 2e12cec..e3cc515 100644
--- a/java/com/android/dialer/app/calllog/VisualVoicemailUpdateTask.java
+++ b/java/com/android/dialer/app/calllog/VisualVoicemailUpdateTask.java
@@ -32,8 +32,11 @@
 import com.android.dialer.common.LogUtil;
 import com.android.dialer.common.concurrent.DialerExecutor.Worker;
 import com.android.dialer.common.concurrent.DialerExecutorComponent;
+import com.android.dialer.logging.DialerImpression;
+import com.android.dialer.logging.Logger;
 import com.android.dialer.notification.DialerNotificationManager;
 import com.android.dialer.phonenumbercache.ContactInfo;
+import com.android.dialer.spam.SpamComponent;
 import com.android.dialer.telecom.TelecomUtil;
 import java.util.ArrayList;
 import java.util.List;
@@ -67,7 +70,15 @@
       // Query failed, just return
       return;
     }
-    voicemailsToNotify = filterBlockedNumbers(context, queryHandler, voicemailsToNotify);
+
+    if (FilteredNumbersUtil.hasRecentEmergencyCall(context)) {
+      LogUtil.i(
+          "VisualVoicemailUpdateTask.updateNotification",
+          "not filtering due to recent emergency call");
+    } else {
+      voicemailsToNotify = filterBlockedNumbers(context, queryHandler, voicemailsToNotify);
+      voicemailsToNotify = filterSpamNumbers(context, voicemailsToNotify);
+    }
     boolean shouldAlert =
         !voicemailsToNotify.isEmpty()
             && voicemailsToNotify.size() > getExistingNotificationCount(context);
@@ -149,7 +160,7 @@
       }
       String uri =
           notification.getTag().replace(VisualVoicemailNotifier.NOTIFICATION_TAG_PREFIX, "");
-      NewCall existingCall = queryHelper.getNewCallsQuery().query(Uri.parse(uri));
+      NewCall existingCall = queryHelper.getNewCallsQuery().queryUnreadVoicemail(Uri.parse(uri));
       if (existingCall != null) {
         result.add(existingCall);
       } else {
@@ -166,13 +177,6 @@
   private static List<NewCall> filterBlockedNumbers(
       Context context, FilteredNumberAsyncQueryHandler queryHandler, List<NewCall> newCalls) {
     Assert.isWorkerThread();
-    if (FilteredNumbersUtil.hasRecentEmergencyCall(context)) {
-      LogUtil.i(
-          "VisualVoicemailUpdateTask.filterBlockedNumbers",
-          "not filtering due to recent emergency call");
-      return newCalls;
-    }
-
     List<NewCall> result = new ArrayList<>();
     for (NewCall newCall : newCalls) {
       if (queryHandler.getBlockedIdSynchronous(newCall.number, newCall.countryIso) != null) {
@@ -190,6 +194,35 @@
     return result;
   }
 
+  @WorkerThread
+  private static List<NewCall> filterSpamNumbers(Context context, List<NewCall> newCalls) {
+    Assert.isWorkerThread();
+    if (!SpamComponent.get(context).spamSettings().isSpamBlockingEnabled()) {
+      return newCalls;
+    }
+
+    List<NewCall> result = new ArrayList<>();
+    for (NewCall newCall : newCalls) {
+      Logger.get(context).logImpression(DialerImpression.Type.INCOMING_VOICEMAIL_SCREENED);
+      if (SpamComponent.get(context)
+          .spam()
+          .checkSpamStatusSynchronous(newCall.number, newCall.countryIso)) {
+        LogUtil.i(
+            "VisualVoicemailUpdateTask.filterSpamNumbers",
+            "found voicemail from spam number, suppressing notification");
+        Logger.get(context)
+            .logImpression(DialerImpression.Type.INCOMING_VOICEMAIL_AUTO_BLOCKED_AS_SPAM);
+        if (newCall.voicemailUri != null) {
+          // Mark auto blocked voicemail as old so that we don't process it again.
+          VoicemailQueryHandler.markSingleNewVoicemailAsOld(context, newCall.voicemailUri);
+        }
+      } else {
+        result.add(newCall);
+      }
+    }
+    return result;
+  }
+
   /** Updates the voicemail notifications displayed. */
   static void scheduleTask(@NonNull Context context, @NonNull Runnable callback) {
     Assert.isNotNull(context);
diff --git a/java/com/android/dialer/app/calllog/VoicemailNotificationJobService.java b/java/com/android/dialer/app/calllog/VoicemailNotificationJobService.java
index ba61601..754ab27 100644
--- a/java/com/android/dialer/app/calllog/VoicemailNotificationJobService.java
+++ b/java/com/android/dialer/app/calllog/VoicemailNotificationJobService.java
@@ -22,7 +22,6 @@
 import android.app.job.JobService;
 import android.content.ComponentName;
 import android.content.Context;
-import android.os.Build;
 import android.provider.VoicemailContract;
 import com.android.dialer.common.LogUtil;
 import com.android.dialer.constants.ScheduledJobIds;
@@ -37,12 +36,8 @@
    * notification is visible.
    */
   public static void scheduleJob(Context context) {
-    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) {
-      LogUtil.i("VoicemailNotificationJobService.scheduleJob", "not supported");
-    } else {
-      context.getSystemService(JobScheduler.class).schedule(getJobInfo(context));
-      LogUtil.i("VoicemailNotificationJobService.scheduleJob", "job scheduled");
-    }
+    context.getSystemService(JobScheduler.class).schedule(getJobInfo(context));
+    LogUtil.i("VoicemailNotificationJobService.scheduleJob", "job scheduled");
   }
 
   /**
diff --git a/java/com/android/dialer/app/calllog/VoicemailQueryHandler.java b/java/com/android/dialer/app/calllog/VoicemailQueryHandler.java
index 169d0fd..5d8144c 100644
--- a/java/com/android/dialer/app/calllog/VoicemailQueryHandler.java
+++ b/java/com/android/dialer/app/calllog/VoicemailQueryHandler.java
@@ -42,7 +42,7 @@
   }
 
   @WorkerThread
-  public static void markAllNewVoicemailsAsRead(final @NonNull Context context) {
+  public static void markAllNewVoicemailsAsOld(final @NonNull Context context) {
     ThreadUtil.postOnUiThread(
         () -> {
           new VoicemailQueryHandler(context.getContentResolver())
@@ -51,10 +51,10 @@
   }
 
   @WorkerThread
-  public static void markSingleNewVoicemailAsRead(
+  public static void markSingleNewVoicemailAsOld(
       final @NonNull Context context, final Uri voicemailUri) {
     if (voicemailUri == null) {
-      LogUtil.e("VoicemailQueryHandler.markSingleNewVoicemailAsRead", "voicemail URI is null");
+      LogUtil.e("VoicemailQueryHandler.markSingleNewVoicemailAsOld", "voicemail URI is null");
       return;
     }
     ThreadUtil.postOnUiThread(
diff --git a/java/com/android/dialer/app/filterednumber/BlockedNumbersFragment.java b/java/com/android/dialer/app/filterednumber/BlockedNumbersFragment.java
index cae35d5..bf40fdf 100644
--- a/java/com/android/dialer/app/filterednumber/BlockedNumbersFragment.java
+++ b/java/com/android/dialer/app/filterednumber/BlockedNumbersFragment.java
@@ -23,13 +23,11 @@
 import android.database.Cursor;
 import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
-import android.support.v4.app.ActivityCompat;
 import android.support.v7.app.ActionBar;
 import android.support.v7.app.AppCompatActivity;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.ImageView;
 import android.widget.TextView;
 import com.android.dialer.app.R;
 import com.android.dialer.blocking.BlockedNumbersMigrator;
@@ -40,6 +38,7 @@
 import com.android.dialer.blocking.FilteredNumbersUtil.ImportSendToVoicemailContactsListener;
 import com.android.dialer.database.FilteredNumberContract;
 import com.android.dialer.lettertile.LetterTileDrawable;
+import com.android.dialer.theme.base.ThemeComponent;
 import com.android.dialer.voicemailstatus.VisualVoicemailEnabledChecker;
 
 /** TODO(calderwoodra): documentation */
@@ -73,13 +72,10 @@
     getListView().addHeaderView(inflater.inflate(R.layout.blocked_number_header, null));
     getListView().addFooterView(inflater.inflate(R.layout.blocked_number_footer, null));
     //replace the icon for add number with LetterTileDrawable(), so it will have identical style
-    ImageView addNumberIcon = (ImageView) getActivity().findViewById(R.id.add_number_icon);
     LetterTileDrawable drawable = new LetterTileDrawable(getResources());
     drawable.setLetter(ADD_BLOCKED_NUMBER_ICON_LETTER);
-    drawable.setColor(
-        ActivityCompat.getColor(getActivity(), R.color.add_blocked_number_icon_color));
+    drawable.setColor(ThemeComponent.get(getContext()).theme().getColorIcon());
     drawable.setIsCircular(true);
-    addNumberIcon.setImageDrawable(drawable);
 
     if (adapter == null) {
       adapter =
@@ -97,7 +93,6 @@
     blockedNumberListDivider = getActivity().findViewById(R.id.blocked_number_list_divider);
     getListView().findViewById(R.id.import_button).setOnClickListener(this);
     getListView().findViewById(R.id.view_numbers_button).setOnClickListener(this);
-    getListView().findViewById(R.id.add_number_linear_layout).setOnClickListener(this);
 
     footerText = (TextView) getActivity().findViewById(R.id.blocked_number_footer_textview);
     voicemailEnabledChecker = new VisualVoicemailEnabledChecker(getContext(), this);
@@ -123,7 +118,7 @@
 
     ActionBar actionBar = ((AppCompatActivity) getActivity()).getSupportActionBar();
     ColorDrawable backgroundDrawable =
-        new ColorDrawable(ActivityCompat.getColor(getActivity(), R.color.dialer_theme_color));
+        new ColorDrawable(ThemeComponent.get(getContext()).theme().getColorPrimary());
     actionBar.setBackgroundDrawable(backgroundDrawable);
     actionBar.setDisplayShowCustomEnabled(false);
     actionBar.setDisplayHomeAsUpEnabled(true);
@@ -137,8 +132,6 @@
     if (FilteredNumberCompat.canUseNewFiltering()) {
       migratePromoView.setVisibility(View.VISIBLE);
       blockedNumbersText.setVisibility(View.GONE);
-      getListView().findViewById(R.id.add_number_linear_layout).setVisibility(View.GONE);
-      getListView().findViewById(R.id.add_number_linear_layout).setOnClickListener(null);
       blockedNumberListDivider.setVisibility(View.GONE);
       importSettings.setVisibility(View.GONE);
       getListView().findViewById(R.id.import_button).setOnClickListener(null);
@@ -218,9 +211,7 @@
     }
 
     int resId = view.getId();
-    if (resId == R.id.add_number_linear_layout) {
-      activity.showSearchUi();
-    } else if (resId == R.id.view_numbers_button) {
+    if (resId == R.id.view_numbers_button) {
       activity.showNumbersToImportPreviewUi();
     } else if (resId == R.id.import_button) {
       FilteredNumbersUtil.importSendToVoicemailContacts(
diff --git a/java/com/android/dialer/app/filterednumber/BlockedNumbersSettingsActivity.java b/java/com/android/dialer/app/filterednumber/BlockedNumbersSettingsActivity.java
index 858d283..5475b4e 100644
--- a/java/com/android/dialer/app/filterednumber/BlockedNumbersSettingsActivity.java
+++ b/java/com/android/dialer/app/filterednumber/BlockedNumbersSettingsActivity.java
@@ -19,17 +19,13 @@
 import android.support.v7.app.AppCompatActivity;
 import android.view.MenuItem;
 import com.android.dialer.app.R;
-import com.android.dialer.app.list.BlockedListSearchFragment;
-import com.android.dialer.app.list.SearchFragment;
 import com.android.dialer.logging.Logger;
 import com.android.dialer.logging.ScreenEvent;
 
 /** TODO(calderwoodra): documentation */
-public class BlockedNumbersSettingsActivity extends AppCompatActivity
-    implements SearchFragment.HostInterface {
+public class BlockedNumbersSettingsActivity extends AppCompatActivity {
 
   private static final String TAG_BLOCKED_MANAGEMENT_FRAGMENT = "blocked_management";
-  private static final String TAG_BLOCKED_SEARCH_FRAGMENT = "blocked_search";
   private static final String TAG_VIEW_NUMBERS_TO_IMPORT_FRAGMENT = "view_numbers_to_import";
 
   @Override
@@ -60,27 +56,6 @@
     Logger.get(this).logScreenView(ScreenEvent.Type.BLOCKED_NUMBER_MANAGEMENT, this);
   }
 
-  /** Shows fragment with search UI for browsing/finding numbers to block. */
-  public void showSearchUi() {
-    BlockedListSearchFragment fragment =
-        (BlockedListSearchFragment)
-            getFragmentManager().findFragmentByTag(TAG_BLOCKED_SEARCH_FRAGMENT);
-    if (fragment == null) {
-      fragment = new BlockedListSearchFragment();
-      fragment.setHasOptionsMenu(false);
-      fragment.setShowEmptyListForNullQuery(true);
-      fragment.setDirectorySearchEnabled(false);
-    }
-
-    getFragmentManager()
-        .beginTransaction()
-        .replace(R.id.blocked_numbers_activity_container, fragment, TAG_BLOCKED_SEARCH_FRAGMENT)
-        .addToBackStack(null)
-        .commit();
-
-    Logger.get(this).logScreenView(ScreenEvent.Type.BLOCKED_NUMBER_ADD_NUMBER, this);
-  }
-
   /**
    * Shows fragment with UI to preview the numbers of contacts currently marked as send-to-voicemail
    * in Contacts. These numbers can be imported into Dialer's blocked number list.
@@ -119,24 +94,4 @@
       super.onBackPressed();
     }
   }
-
-  @Override
-  public boolean isActionBarShowing() {
-    return false;
-  }
-
-  @Override
-  public boolean isDialpadShown() {
-    return false;
-  }
-
-  @Override
-  public int getDialpadHeight() {
-    return 0;
-  }
-
-  @Override
-  public int getActionBarHeight() {
-    return 0;
-  }
 }
diff --git a/java/com/android/dialer/app/filterednumber/NumbersAdapter.java b/java/com/android/dialer/app/filterednumber/NumbersAdapter.java
index 3acb204..2c08558 100644
--- a/java/com/android/dialer/app/filterednumber/NumbersAdapter.java
+++ b/java/com/android/dialer/app/filterednumber/NumbersAdapter.java
@@ -27,7 +27,6 @@
 import android.widget.SimpleCursorAdapter;
 import android.widget.TextView;
 import com.android.dialer.app.R;
-import com.android.dialer.compat.CompatUtils;
 import com.android.dialer.contactphoto.ContactPhotoManager;
 import com.android.dialer.contactphoto.ContactPhotoManager.DefaultImageRequest;
 import com.android.dialer.lettertile.LetterTileDrawable;
@@ -63,9 +62,7 @@
     final QuickContactBadge quickContactBadge =
         (QuickContactBadge) view.findViewById(R.id.quick_contact_photo);
     quickContactBadge.setOverlay(null);
-    if (CompatUtils.hasPrioritizedMimeType()) {
-      quickContactBadge.setPrioritizedMimeType(Phone.CONTENT_ITEM_TYPE);
-    }
+    quickContactBadge.setPrioritizedMimeType(Phone.CONTENT_ITEM_TYPE);
 
     ContactInfo info = contactInfoHelper.lookupNumber(number, countryIso);
     if (info == null) {
diff --git a/java/com/android/dialer/app/legacybindings/DialerLegacyBindings.java b/java/com/android/dialer/app/legacybindings/DialerLegacyBindings.java
index a483af9..6eaa2b6 100644
--- a/java/com/android/dialer/app/legacybindings/DialerLegacyBindings.java
+++ b/java/com/android/dialer/app/legacybindings/DialerLegacyBindings.java
@@ -22,7 +22,6 @@
 import com.android.dialer.app.calllog.CallLogAdapter;
 import com.android.dialer.app.calllog.calllogcache.CallLogCache;
 import com.android.dialer.app.contactinfo.ContactInfoCache;
-import com.android.dialer.app.list.RegularSearchFragment;
 import com.android.dialer.app.voicemail.VoicemailPlaybackPresenter;
 import com.android.dialer.blocking.FilteredNumberAsyncQueryHandler;
 
@@ -47,6 +46,4 @@
       VoicemailPlaybackPresenter voicemailPlaybackPresenter,
       @NonNull FilteredNumberAsyncQueryHandler filteredNumberAsyncQueryHandler,
       int activityType);
-
-  RegularSearchFragment newRegularSearchFragment();
 }
diff --git a/java/com/android/dialer/app/legacybindings/DialerLegacyBindingsStub.java b/java/com/android/dialer/app/legacybindings/DialerLegacyBindingsStub.java
index 488fbad..e95c470 100644
--- a/java/com/android/dialer/app/legacybindings/DialerLegacyBindingsStub.java
+++ b/java/com/android/dialer/app/legacybindings/DialerLegacyBindingsStub.java
@@ -22,7 +22,6 @@
 import com.android.dialer.app.calllog.CallLogAdapter;
 import com.android.dialer.app.calllog.calllogcache.CallLogCache;
 import com.android.dialer.app.contactinfo.ContactInfoCache;
-import com.android.dialer.app.list.RegularSearchFragment;
 import com.android.dialer.app.voicemail.VoicemailPlaybackPresenter;
 import com.android.dialer.blocking.FilteredNumberAsyncQueryHandler;
 
@@ -53,9 +52,4 @@
         filteredNumberAsyncQueryHandler,
         activityType);
   }
-
-  @Override
-  public RegularSearchFragment newRegularSearchFragment() {
-    return new RegularSearchFragment();
-  }
 }
diff --git a/java/com/android/dialer/app/list/AllContactsFragment.java b/java/com/android/dialer/app/list/AllContactsFragment.java
deleted file mode 100644
index 5076fd9..0000000
--- a/java/com/android/dialer/app/list/AllContactsFragment.java
+++ /dev/null
@@ -1,204 +0,0 @@
-/*
- * Copyright (C) 2013 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.dialer.app.list;
-
-import static android.Manifest.permission.READ_CONTACTS;
-
-import android.app.Activity;
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.Loader;
-import android.content.pm.PackageManager;
-import android.database.Cursor;
-import android.net.Uri;
-import android.provider.ContactsContract.CommonDataKinds.Phone;
-import android.provider.ContactsContract.QuickContact;
-import android.support.v13.app.FragmentCompat;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.AdapterView;
-import com.android.contacts.common.list.ContactEntryListAdapter;
-import com.android.contacts.common.list.ContactEntryListFragment;
-import com.android.contacts.common.list.ContactListFilter;
-import com.android.contacts.common.list.DefaultContactListAdapter;
-import com.android.dialer.app.R;
-import com.android.dialer.common.LogUtil;
-import com.android.dialer.compat.CompatUtils;
-import com.android.dialer.logging.InteractionEvent;
-import com.android.dialer.logging.Logger;
-import com.android.dialer.util.DialerUtils;
-import com.android.dialer.util.IntentUtil;
-import com.android.dialer.util.PermissionsUtil;
-import com.android.dialer.widget.EmptyContentView;
-import com.android.dialer.widget.EmptyContentView.OnEmptyViewActionButtonClickedListener;
-import java.util.Arrays;
-
-/** Fragments to show all contacts with phone numbers. */
-public class AllContactsFragment extends ContactEntryListFragment<ContactEntryListAdapter>
-    implements OnEmptyViewActionButtonClickedListener,
-        FragmentCompat.OnRequestPermissionsResultCallback {
-
-  private static final int READ_CONTACTS_PERMISSION_REQUEST_CODE = 1;
-
-  private EmptyContentView emptyListView;
-
-  /**
-   * Listen to broadcast events about permissions in order to be notified if the READ_CONTACTS
-   * permission is granted via the UI in another fragment.
-   */
-  private BroadcastReceiver readContactsPermissionGrantedReceiver =
-      new BroadcastReceiver() {
-        @Override
-        public void onReceive(Context context, Intent intent) {
-          reloadData();
-        }
-      };
-
-  public AllContactsFragment() {
-    setQuickContactEnabled(false);
-    setAdjustSelectionBoundsEnabled(true);
-    setPhotoLoaderEnabled(true);
-    setSectionHeaderDisplayEnabled(true);
-    setDarkTheme(false);
-    setVisibleScrollbarEnabled(true);
-  }
-
-  @Override
-  public void onViewCreated(View view, android.os.Bundle savedInstanceState) {
-    super.onViewCreated(view, savedInstanceState);
-
-    emptyListView = (EmptyContentView) view.findViewById(R.id.empty_list_view);
-    emptyListView.setImage(R.drawable.empty_contacts);
-    emptyListView.setDescription(R.string.all_contacts_empty);
-    emptyListView.setActionClickedListener(this);
-    getListView().setEmptyView(emptyListView);
-    emptyListView.setVisibility(View.GONE);
-  }
-
-  @Override
-  public void onStart() {
-    super.onStart();
-    PermissionsUtil.registerPermissionReceiver(
-        getActivity(), readContactsPermissionGrantedReceiver, READ_CONTACTS);
-  }
-
-  @Override
-  public void onStop() {
-    PermissionsUtil.unregisterPermissionReceiver(
-        getActivity(), readContactsPermissionGrantedReceiver);
-    super.onStop();
-  }
-
-  @Override
-  protected void startLoading() {
-    if (PermissionsUtil.hasPermission(getActivity(), READ_CONTACTS)) {
-      super.startLoading();
-      emptyListView.setDescription(R.string.all_contacts_empty);
-      emptyListView.setActionLabel(R.string.all_contacts_empty_add_contact_action);
-    } else {
-      emptyListView.setDescription(R.string.permission_no_contacts);
-      emptyListView.setActionLabel(R.string.permission_single_turn_on);
-      emptyListView.setVisibility(View.VISIBLE);
-    }
-  }
-
-  @Override
-  public void onLoadFinished(Loader<Cursor> loader, Cursor data) {
-    super.onLoadFinished(loader, data);
-
-    if (data == null || data.getCount() == 0) {
-      emptyListView.setVisibility(View.VISIBLE);
-    }
-  }
-
-  @Override
-  protected ContactEntryListAdapter createListAdapter() {
-    final DefaultContactListAdapter adapter =
-        new DefaultContactListAdapter(getActivity()) {
-          @Override
-          protected void bindView(View itemView, int partition, Cursor cursor, int position) {
-            super.bindView(itemView, partition, cursor, position);
-            itemView.setTag(this.getContactUri(partition, cursor));
-          }
-        };
-    adapter.setDisplayPhotos(true);
-    adapter.setFilter(
-        ContactListFilter.createFilterWithType(ContactListFilter.FILTER_TYPE_DEFAULT));
-    adapter.setSectionHeaderDisplayEnabled(isSectionHeaderDisplayEnabled());
-    return adapter;
-  }
-
-  @Override
-  protected View inflateView(LayoutInflater inflater, ViewGroup container) {
-    return inflater.inflate(R.layout.all_contacts_fragment, null);
-  }
-
-  @Override
-  public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-    final Uri uri = (Uri) view.getTag();
-    if (uri != null) {
-      Logger.get(getContext())
-          .logInteraction(InteractionEvent.Type.OPEN_QUICK_CONTACT_FROM_ALL_CONTACTS_GENERAL);
-      if (CompatUtils.hasPrioritizedMimeType()) {
-        QuickContact.showQuickContact(getContext(), view, uri, null, Phone.CONTENT_ITEM_TYPE);
-      } else {
-        QuickContact.showQuickContact(getActivity(), view, uri, QuickContact.MODE_LARGE, null);
-      }
-    }
-  }
-
-  @Override
-  protected void onItemClick(int position, long id) {
-    // Do nothing. Implemented to satisfy ContactEntryListFragment.
-  }
-
-  @Override
-  public void onEmptyViewActionButtonClicked() {
-    final Activity activity = getActivity();
-    if (activity == null) {
-      return;
-    }
-
-    String[] deniedPermissions =
-        PermissionsUtil.getPermissionsCurrentlyDenied(
-            getContext(), PermissionsUtil.allContactsGroupPermissionsUsedInDialer);
-    if (deniedPermissions.length > 0) {
-      LogUtil.i(
-          "AllContactsFragment.onEmptyViewActionButtonClicked",
-          "Requesting permissions: " + Arrays.toString(deniedPermissions));
-      FragmentCompat.requestPermissions(
-          this, deniedPermissions, READ_CONTACTS_PERMISSION_REQUEST_CODE);
-    } else {
-      // Add new contact
-      DialerUtils.startActivityWithErrorToast(
-          activity, IntentUtil.getNewContactIntent(), R.string.add_contact_not_available);
-    }
-  }
-
-  @Override
-  public void onRequestPermissionsResult(
-      int requestCode, String[] permissions, int[] grantResults) {
-    if (requestCode == READ_CONTACTS_PERMISSION_REQUEST_CODE) {
-      if (grantResults.length >= 1 && PackageManager.PERMISSION_GRANTED == grantResults[0]) {
-        // Force a refresh of the data since we were missing the permission before this.
-        reloadData();
-      }
-    }
-  }
-}
diff --git a/java/com/android/dialer/app/list/BlockedListSearchAdapter.java b/java/com/android/dialer/app/list/BlockedListSearchAdapter.java
deleted file mode 100644
index 575d6e6..0000000
--- a/java/com/android/dialer/app/list/BlockedListSearchAdapter.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.dialer.app.list;
-
-import android.content.Context;
-import android.content.res.Resources;
-import android.database.Cursor;
-import android.view.View;
-import com.android.contacts.common.list.ContactListItemView;
-import com.android.dialer.app.R;
-import com.android.dialer.blocking.FilteredNumberAsyncQueryHandler;
-import com.android.dialer.location.GeoUtil;
-
-/** List adapter to display search results for adding a blocked number. */
-public class BlockedListSearchAdapter extends RegularSearchListAdapter {
-
-  private Resources resources;
-  private FilteredNumberAsyncQueryHandler filteredNumberAsyncQueryHandler;
-
-  public BlockedListSearchAdapter(Context context) {
-    super(context);
-    resources = context.getResources();
-    disableAllShortcuts();
-    setShortcutEnabled(SHORTCUT_BLOCK_NUMBER, true);
-
-    filteredNumberAsyncQueryHandler = new FilteredNumberAsyncQueryHandler(context);
-  }
-
-  @Override
-  protected boolean isChanged(boolean showNumberShortcuts) {
-    return setShortcutEnabled(SHORTCUT_BLOCK_NUMBER, showNumberShortcuts || isQuerySipAddress);
-  }
-
-  public void setViewBlocked(ContactListItemView view, Integer id) {
-    view.setTag(R.id.block_id, id);
-    final int textColor = resources.getColor(R.color.blocked_number_block_color);
-    view.getDataView().setTextColor(textColor);
-    view.getLabelView().setTextColor(textColor);
-    //TODO: Add icon
-  }
-
-  public void setViewUnblocked(ContactListItemView view) {
-    view.setTag(R.id.block_id, null);
-    final int textColor = resources.getColor(R.color.dialer_secondary_text_color);
-    view.getDataView().setTextColor(textColor);
-    view.getLabelView().setTextColor(textColor);
-    //TODO: Remove icon
-  }
-
-  @Override
-  protected void bindView(View itemView, int partition, Cursor cursor, int position) {
-    super.bindView(itemView, partition, cursor, position);
-
-    final ContactListItemView view = (ContactListItemView) itemView;
-    // Reset view state to unblocked.
-    setViewUnblocked(view);
-
-    final String number = getPhoneNumber(position);
-    final String countryIso = GeoUtil.getCurrentCountryIso(mContext);
-    final FilteredNumberAsyncQueryHandler.OnCheckBlockedListener onCheckListener =
-        new FilteredNumberAsyncQueryHandler.OnCheckBlockedListener() {
-          @Override
-          public void onCheckComplete(Integer id) {
-            if (id != null && id != FilteredNumberAsyncQueryHandler.INVALID_ID) {
-              setViewBlocked(view, id);
-            }
-          }
-        };
-    filteredNumberAsyncQueryHandler.isBlockedNumber(onCheckListener, number, countryIso);
-  }
-}
diff --git a/java/com/android/dialer/app/list/BlockedListSearchFragment.java b/java/com/android/dialer/app/list/BlockedListSearchFragment.java
deleted file mode 100644
index ce812af..0000000
--- a/java/com/android/dialer/app/list/BlockedListSearchFragment.java
+++ /dev/null
@@ -1,248 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.dialer.app.list;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.AppCompatActivity;
-import android.text.Editable;
-import android.text.TextUtils;
-import android.text.TextWatcher;
-import android.util.TypedValue;
-import android.view.View;
-import android.widget.AdapterView;
-import android.widget.EditText;
-import android.widget.Toast;
-import com.android.contacts.common.list.ContactEntryListAdapter;
-import com.android.contacts.common.util.ContactDisplayUtils;
-import com.android.dialer.app.R;
-import com.android.dialer.app.widget.SearchEditTextLayout;
-import com.android.dialer.blocking.BlockNumberDialogFragment;
-import com.android.dialer.blocking.FilteredNumberAsyncQueryHandler;
-import com.android.dialer.blocking.FilteredNumberAsyncQueryHandler.OnCheckBlockedListener;
-import com.android.dialer.common.LogUtil;
-import com.android.dialer.location.GeoUtil;
-import com.android.dialer.logging.InteractionEvent;
-import com.android.dialer.logging.Logger;
-import com.android.dialer.phonenumberutil.PhoneNumberHelper;
-
-/** TODO(calderwoodra): documentation */
-public class BlockedListSearchFragment extends RegularSearchFragment
-    implements BlockNumberDialogFragment.Callback {
-
-  private final TextWatcher phoneSearchQueryTextListener =
-      new TextWatcher() {
-        @Override
-        public void beforeTextChanged(CharSequence s, int start, int count, int after) {}
-
-        @Override
-        public void onTextChanged(CharSequence s, int start, int before, int count) {
-          setQueryString(s.toString());
-        }
-
-        @Override
-        public void afterTextChanged(Editable s) {}
-      };
-  private final SearchEditTextLayout.Callback searchLayoutCallback =
-      new SearchEditTextLayout.Callback() {
-        @Override
-        public void onBackButtonClicked() {
-          getActivity().onBackPressed();
-        }
-
-        @Override
-        public void onSearchViewClicked() {}
-      };
-  private FilteredNumberAsyncQueryHandler filteredNumberAsyncQueryHandler;
-  private EditText searchView;
-
-  @Override
-  public void onCreate(Bundle savedInstanceState) {
-    super.onCreate(savedInstanceState);
-
-    setShowEmptyListForNullQuery(true);
-    /*
-     * Pass in the empty string here so ContactEntryListFragment#setQueryString interprets it as
-     * an empty search query, rather than as an uninitalized value. In the latter case, the
-     * adapter returned by #createListAdapter is used, which populates the view with contacts.
-     * Passing in the empty string forces ContactEntryListFragment to interpret it as an empty
-     * query, which results in showing an empty view
-     */
-    setQueryString(getQueryString() == null ? "" : getQueryString());
-    filteredNumberAsyncQueryHandler = new FilteredNumberAsyncQueryHandler(getContext());
-  }
-
-  @Override
-  public void onResume() {
-    super.onResume();
-
-    ActionBar actionBar = ((AppCompatActivity) getActivity()).getSupportActionBar();
-    actionBar.setCustomView(R.layout.search_edittext);
-    actionBar.setDisplayShowCustomEnabled(true);
-    actionBar.setDisplayHomeAsUpEnabled(false);
-    actionBar.setDisplayShowHomeEnabled(false);
-
-    final SearchEditTextLayout searchEditTextLayout =
-        (SearchEditTextLayout) actionBar.getCustomView().findViewById(R.id.search_view_container);
-    searchEditTextLayout.expand(false, true);
-    searchEditTextLayout.setCallback(searchLayoutCallback);
-    searchEditTextLayout.setBackgroundDrawable(null);
-
-    searchView = (EditText) searchEditTextLayout.findViewById(R.id.search_view);
-    searchView.addTextChangedListener(phoneSearchQueryTextListener);
-    searchView.setHint(R.string.block_number_search_hint);
-
-    searchEditTextLayout
-        .findViewById(R.id.search_box_expanded)
-        .setBackgroundColor(getContext().getResources().getColor(android.R.color.white));
-
-    if (!TextUtils.isEmpty(getQueryString())) {
-      searchView.setText(getQueryString());
-    }
-
-    // TODO: Don't set custom text size; use default search text size.
-    searchView.setTextSize(
-        TypedValue.COMPLEX_UNIT_PX,
-        getResources().getDimension(R.dimen.blocked_number_search_text_size));
-  }
-
-  @Override
-  protected ContactEntryListAdapter createListAdapter() {
-    BlockedListSearchAdapter adapter = new BlockedListSearchAdapter(getActivity());
-    adapter.setDisplayPhotos(true);
-    // Don't show SIP addresses.
-    adapter.setUseCallableUri(false);
-    // Keep in sync with the queryString set in #onCreate
-    adapter.setQueryString(getQueryString() == null ? "" : getQueryString());
-    return adapter;
-  }
-
-  @Override
-  public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-    super.onItemClick(parent, view, position, id);
-    final int adapterPosition = position - getListView().getHeaderViewsCount();
-    final BlockedListSearchAdapter adapter = (BlockedListSearchAdapter) getAdapter();
-    final int shortcutType = adapter.getShortcutTypeFromPosition(adapterPosition);
-    final Integer blockId = (Integer) view.getTag(R.id.block_id);
-    final String number;
-    switch (shortcutType) {
-      case DialerPhoneNumberListAdapter.SHORTCUT_INVALID:
-        // Handles click on a search result, either contact or nearby places result.
-        number = adapter.getPhoneNumber(adapterPosition);
-        blockContactNumber(number, blockId);
-        break;
-      case DialerPhoneNumberListAdapter.SHORTCUT_BLOCK_NUMBER:
-        // Handles click on 'Block number' shortcut to add the user query as a number.
-        number = adapter.getQueryString();
-        blockNumber(number);
-        break;
-      default:
-        LogUtil.w(
-            "BlockedListSearchFragment.onItemClick",
-            "ignoring unsupported shortcut type: " + shortcutType);
-        break;
-    }
-  }
-
-  @Override
-  protected void onItemClick(int position, long id) {
-    // Prevent SearchFragment.onItemClicked from being called.
-  }
-
-  private void blockNumber(final String number) {
-    final String countryIso = GeoUtil.getCurrentCountryIso(getContext());
-    final OnCheckBlockedListener onCheckListener =
-        new OnCheckBlockedListener() {
-          @Override
-          public void onCheckComplete(Integer id) {
-            if (id == null) {
-              BlockNumberDialogFragment.show(
-                  id,
-                  number,
-                  countryIso,
-                  PhoneNumberHelper.formatNumber(getContext(), number, countryIso),
-                  R.id.blocked_numbers_activity_container,
-                  getFragmentManager(),
-                  BlockedListSearchFragment.this);
-            } else if (id == FilteredNumberAsyncQueryHandler.INVALID_ID) {
-              Toast.makeText(
-                      getContext(),
-                      ContactDisplayUtils.getTtsSpannedPhoneNumber(
-                          getResources(), R.string.invalidNumber, number),
-                      Toast.LENGTH_SHORT)
-                  .show();
-            } else {
-              Toast.makeText(
-                      getContext(),
-                      ContactDisplayUtils.getTtsSpannedPhoneNumber(
-                          getResources(), R.string.alreadyBlocked, number),
-                      Toast.LENGTH_SHORT)
-                  .show();
-            }
-          }
-        };
-    filteredNumberAsyncQueryHandler.isBlockedNumber(onCheckListener, number, countryIso);
-  }
-
-  @Override
-  public void onFilterNumberSuccess() {
-    Logger.get(getContext()).logInteraction(InteractionEvent.Type.BLOCK_NUMBER_MANAGEMENT_SCREEN);
-    goBack();
-  }
-
-  @Override
-  public void onUnfilterNumberSuccess() {
-    LogUtil.e(
-        "BlockedListSearchFragment.onUnfilterNumberSuccess",
-        "unblocked a number from the BlockedListSearchFragment");
-    goBack();
-  }
-
-  private void goBack() {
-    Activity activity = getActivity();
-    if (activity == null) {
-      return;
-    }
-    activity.onBackPressed();
-  }
-
-  @Override
-  public void onChangeFilteredNumberUndo() {
-    getAdapter().notifyDataSetChanged();
-  }
-
-  private void blockContactNumber(final String number, final Integer blockId) {
-    if (blockId != null) {
-      Toast.makeText(
-              getContext(),
-              ContactDisplayUtils.getTtsSpannedPhoneNumber(
-                  getResources(), R.string.alreadyBlocked, number),
-              Toast.LENGTH_SHORT)
-          .show();
-      return;
-    }
-
-    BlockNumberDialogFragment.show(
-        blockId,
-        number,
-        GeoUtil.getCurrentCountryIso(getContext()),
-        number,
-        R.id.blocked_numbers_activity_container,
-        getFragmentManager(),
-        this);
-  }
-}
diff --git a/java/com/android/dialer/app/list/DialerPhoneNumberListAdapter.java b/java/com/android/dialer/app/list/DialerPhoneNumberListAdapter.java
deleted file mode 100644
index d5609b8..0000000
--- a/java/com/android/dialer/app/list/DialerPhoneNumberListAdapter.java
+++ /dev/null
@@ -1,236 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.dialer.app.list;
-
-import android.content.Context;
-import android.content.res.Resources;
-import android.database.Cursor;
-import android.graphics.drawable.Drawable;
-import android.support.v4.content.ContextCompat;
-import android.telephony.PhoneNumberUtils;
-import android.text.BidiFormatter;
-import android.text.TextDirectionHeuristics;
-import android.view.View;
-import android.view.ViewGroup;
-import com.android.contacts.common.list.ContactListItemView;
-import com.android.contacts.common.list.PhoneNumberListAdapter;
-import com.android.contacts.common.util.ContactDisplayUtils;
-import com.android.dialer.app.R;
-import com.android.dialer.location.GeoUtil;
-import com.android.dialer.phonenumberutil.PhoneNumberHelper;
-
-/**
- * {@link PhoneNumberListAdapter} with the following added shortcuts, that are displayed as list
- * items: 1) Directly calling the phone number query 2) Adding the phone number query to a contact
- *
- * <p>These shortcuts can be enabled or disabled to toggle whether or not they show up in the list.
- */
-public class DialerPhoneNumberListAdapter extends PhoneNumberListAdapter {
-
-  public static final int SHORTCUT_INVALID = -1;
-  public static final int SHORTCUT_DIRECT_CALL = 0;
-  public static final int SHORTCUT_CREATE_NEW_CONTACT = 1;
-  public static final int SHORTCUT_ADD_TO_EXISTING_CONTACT = 2;
-  public static final int SHORTCUT_SEND_SMS_MESSAGE = 3;
-  public static final int SHORTCUT_MAKE_VIDEO_CALL = 4;
-  public static final int SHORTCUT_BLOCK_NUMBER = 5;
-  public static final int SHORTCUT_COUNT = 6;
-
-  private final boolean[] shortcutEnabled = new boolean[SHORTCUT_COUNT];
-  private final BidiFormatter bidiFormatter = BidiFormatter.getInstance();
-  private final String countryIso;
-
-  private String formattedQueryString;
-
-  public DialerPhoneNumberListAdapter(Context context) {
-    super(context);
-
-    countryIso = GeoUtil.getCurrentCountryIso(context);
-  }
-
-  @Override
-  public int getCount() {
-    return super.getCount() + getShortcutCount();
-  }
-
-  /** @return The number of enabled shortcuts. Ranges from 0 to a maximum of SHORTCUT_COUNT */
-  public int getShortcutCount() {
-    int count = 0;
-    for (int i = 0; i < shortcutEnabled.length; i++) {
-      if (shortcutEnabled[i]) {
-        count++;
-      }
-    }
-    return count;
-  }
-
-  public void disableAllShortcuts() {
-    for (int i = 0; i < shortcutEnabled.length; i++) {
-      shortcutEnabled[i] = false;
-    }
-  }
-
-  @Override
-  public int getItemViewType(int position) {
-    final int shortcut = getShortcutTypeFromPosition(position);
-    if (shortcut >= 0) {
-      // shortcutPos should always range from 1 to SHORTCUT_COUNT
-      return super.getViewTypeCount() + shortcut;
-    } else {
-      return super.getItemViewType(position);
-    }
-  }
-
-  @Override
-  public int getViewTypeCount() {
-    // Number of item view types in the super implementation + 2 for the 2 new shortcuts
-    return super.getViewTypeCount() + SHORTCUT_COUNT;
-  }
-
-  @Override
-  public View getView(int position, View convertView, ViewGroup parent) {
-    final int shortcutType = getShortcutTypeFromPosition(position);
-    if (shortcutType >= 0) {
-      if (convertView != null) {
-        assignShortcutToView((ContactListItemView) convertView, shortcutType);
-        return convertView;
-      } else {
-        final ContactListItemView v =
-            new ContactListItemView(getContext(), null, mIsImsVideoEnabled);
-        assignShortcutToView(v, shortcutType);
-        return v;
-      }
-    } else {
-      return super.getView(position, convertView, parent);
-    }
-  }
-
-  @Override
-  protected ContactListItemView newView(
-      Context context, int partition, Cursor cursor, int position, ViewGroup parent) {
-    final ContactListItemView view = super.newView(context, partition, cursor, position, parent);
-
-    view.setSupportVideoCallIcon(mIsImsVideoEnabled);
-    return view;
-  }
-
-  /**
-   * @param position The position of the item
-   * @return The enabled shortcut type matching the given position if the item is a shortcut, -1
-   *     otherwise
-   */
-  public int getShortcutTypeFromPosition(int position) {
-    int shortcutCount = position - super.getCount();
-    if (shortcutCount >= 0) {
-      // Iterate through the array of shortcuts, looking only for shortcuts where
-      // mShortcutEnabled[i] is true
-      for (int i = 0; shortcutCount >= 0 && i < shortcutEnabled.length; i++) {
-        if (shortcutEnabled[i]) {
-          shortcutCount--;
-          if (shortcutCount < 0) {
-            return i;
-          }
-        }
-      }
-      throw new IllegalArgumentException(
-          "Invalid position - greater than cursor count " + " but not a shortcut.");
-    }
-    return SHORTCUT_INVALID;
-  }
-
-  @Override
-  public boolean isEmpty() {
-    return getShortcutCount() == 0 && super.isEmpty();
-  }
-
-  @Override
-  public boolean isEnabled(int position) {
-    final int shortcutType = getShortcutTypeFromPosition(position);
-    if (shortcutType >= 0) {
-      return true;
-    } else {
-      return super.isEnabled(position);
-    }
-  }
-
-  private void assignShortcutToView(ContactListItemView v, int shortcutType) {
-    final CharSequence text;
-    final Drawable drawable;
-    final Resources resources = getContext().getResources();
-    final String number = getFormattedQueryString();
-    switch (shortcutType) {
-      case SHORTCUT_DIRECT_CALL:
-        text =
-            ContactDisplayUtils.getTtsSpannedPhoneNumber(
-                resources,
-                R.string.search_shortcut_call_number,
-                bidiFormatter.unicodeWrap(number, TextDirectionHeuristics.LTR));
-        drawable = ContextCompat.getDrawable(getContext(), R.drawable.quantum_ic_call_vd_theme_24);
-        break;
-      case SHORTCUT_CREATE_NEW_CONTACT:
-        text = resources.getString(R.string.search_shortcut_create_new_contact);
-        drawable =
-            ContextCompat.getDrawable(getContext(), R.drawable.quantum_ic_person_add_vd_theme_24);
-        drawable.setAutoMirrored(true);
-        break;
-      case SHORTCUT_ADD_TO_EXISTING_CONTACT:
-        text = resources.getString(R.string.search_shortcut_add_to_contact);
-        drawable =
-            ContextCompat.getDrawable(getContext(), R.drawable.quantum_ic_person_add_vd_theme_24);
-        break;
-      case SHORTCUT_SEND_SMS_MESSAGE:
-        text = resources.getString(R.string.search_shortcut_send_sms_message);
-        drawable =
-            ContextCompat.getDrawable(getContext(), R.drawable.quantum_ic_message_vd_theme_24);
-        break;
-      case SHORTCUT_MAKE_VIDEO_CALL:
-        text = resources.getString(R.string.search_shortcut_make_video_call);
-        drawable =
-            ContextCompat.getDrawable(getContext(), R.drawable.quantum_ic_videocam_vd_theme_24);
-        break;
-      case SHORTCUT_BLOCK_NUMBER:
-        text = resources.getString(R.string.search_shortcut_block_number);
-        drawable =
-            ContextCompat.getDrawable(getContext(), R.drawable.ic_not_interested_googblue_24dp);
-        break;
-      default:
-        throw new IllegalArgumentException("Invalid shortcut type");
-    }
-    v.setDrawable(drawable);
-    v.setDisplayName(text);
-    v.setAdjustSelectionBoundsEnabled(false);
-  }
-
-  /** @return True if the shortcut state (disabled vs enabled) was changed by this operation */
-  public boolean setShortcutEnabled(int shortcutType, boolean visible) {
-    final boolean changed = shortcutEnabled[shortcutType] != visible;
-    shortcutEnabled[shortcutType] = visible;
-    return changed;
-  }
-
-  public String getFormattedQueryString() {
-    return formattedQueryString;
-  }
-
-  @Override
-  public void setQueryString(String queryString) {
-    formattedQueryString =
-        PhoneNumberHelper.formatNumber(
-            getContext(), PhoneNumberUtils.normalizeNumber(queryString), countryIso);
-    super.setQueryString(queryString);
-  }
-}
diff --git a/java/com/android/dialer/app/list/DialtactsPagerAdapter.java b/java/com/android/dialer/app/list/DialtactsPagerAdapter.java
index d272932..317f24f 100644
--- a/java/com/android/dialer/app/list/DialtactsPagerAdapter.java
+++ b/java/com/android/dialer/app/list/DialtactsPagerAdapter.java
@@ -18,7 +18,6 @@
 
 import android.app.Fragment;
 import android.app.FragmentManager;
-import android.content.Context;
 import android.support.annotation.IntDef;
 import android.support.v13.app.FragmentPagerAdapter;
 import android.view.ViewGroup;
@@ -26,11 +25,9 @@
 import com.android.dialer.app.calllog.VisualVoicemailCallLogFragment;
 import com.android.dialer.common.Assert;
 import com.android.dialer.common.LogUtil;
-import com.android.dialer.configprovider.ConfigProviderBindings;
 import com.android.dialer.contactsfragment.ContactsFragment;
 import com.android.dialer.contactsfragment.ContactsFragment.Header;
 import com.android.dialer.database.CallLogQueryHandler;
-import com.android.dialer.speeddial.SpeedDialFragment;
 import com.android.dialer.util.ViewUtil;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -55,24 +52,16 @@
 
   private final List<Fragment> fragments = new ArrayList<>();
   private final String[] tabTitles;
-  private final boolean useNewSpeedDialTab;
-  private final boolean useNewContactsTab;
   private OldSpeedDialFragment oldSpeedDialFragment;
-  private SpeedDialFragment speedDialFragment;
   private CallLogFragment callLogFragment;
-  private AllContactsFragment oldContactsFragment;
   private ContactsFragment contactsFragment;
   private CallLogFragment voicemailFragment;
 
   private boolean hasActiveVoicemailProvider;
 
   public DialtactsPagerAdapter(
-      Context context, FragmentManager fm, String[] tabTitles, boolean hasVoicemailProvider) {
+      FragmentManager fm, String[] tabTitles, boolean hasVoicemailProvider) {
     super(fm);
-    useNewSpeedDialTab =
-        ConfigProviderBindings.get(context).getBoolean("enable_new_favorites_tab", false);
-    useNewContactsTab =
-        ConfigProviderBindings.get(context).getBoolean("enable_new_contacts_tab", true);
     this.tabTitles = tabTitles;
     hasActiveVoicemailProvider = hasVoicemailProvider;
     fragments.addAll(Collections.nCopies(TAB_COUNT_WITH_VOICEMAIL, null));
@@ -88,34 +77,20 @@
     LogUtil.d("ViewPagerAdapter.getItem", "position: %d", position);
     switch (getRtlPosition(position)) {
       case TAB_INDEX_SPEED_DIAL:
-        if (useNewSpeedDialTab) {
-          if (speedDialFragment == null) {
-            speedDialFragment = SpeedDialFragment.newInstance();
-          }
-          return speedDialFragment;
-        } else {
-          if (oldSpeedDialFragment == null) {
-            oldSpeedDialFragment = new OldSpeedDialFragment();
-          }
-          return oldSpeedDialFragment;
+        if (oldSpeedDialFragment == null) {
+          oldSpeedDialFragment = new OldSpeedDialFragment();
         }
+        return oldSpeedDialFragment;
       case TAB_INDEX_HISTORY:
         if (callLogFragment == null) {
           callLogFragment = new CallLogFragment(CallLogQueryHandler.CALL_TYPE_ALL);
         }
         return callLogFragment;
       case TAB_INDEX_ALL_CONTACTS:
-        if (useNewContactsTab) {
-          if (contactsFragment == null) {
-            contactsFragment = ContactsFragment.newInstance(Header.ADD_CONTACT);
-          }
-          return contactsFragment;
-        } else {
-          if (oldContactsFragment == null) {
-            oldContactsFragment = new AllContactsFragment();
-          }
-          return oldContactsFragment;
+        if (contactsFragment == null) {
+          contactsFragment = ContactsFragment.newInstance(Header.ADD_CONTACT);
         }
+        return contactsFragment;
       case TAB_INDEX_VOICEMAIL:
         if (voicemailFragment == null) {
           voicemailFragment = new VisualVoicemailCallLogFragment();
@@ -139,14 +114,10 @@
     final Fragment fragment = (Fragment) super.instantiateItem(container, position);
     if (fragment instanceof OldSpeedDialFragment) {
       oldSpeedDialFragment = (OldSpeedDialFragment) fragment;
-    } else if (fragment instanceof SpeedDialFragment) {
-      speedDialFragment = (SpeedDialFragment) fragment;
     } else if (fragment instanceof CallLogFragment && position == TAB_INDEX_HISTORY) {
       callLogFragment = (CallLogFragment) fragment;
     } else if (fragment instanceof ContactsFragment) {
       contactsFragment = (ContactsFragment) fragment;
-    } else if (fragment instanceof AllContactsFragment) {
-      oldContactsFragment = (AllContactsFragment) fragment;
     } else if (fragment instanceof CallLogFragment && position == TAB_INDEX_VOICEMAIL) {
       voicemailFragment = (CallLogFragment) fragment;
       LogUtil.v("ViewPagerAdapter.instantiateItem", voicemailFragment.toString());
diff --git a/java/com/android/dialer/app/list/DragDropController.java b/java/com/android/dialer/app/list/DragDropController.java
index 458e31e..1c33a8a 100644
--- a/java/com/android/dialer/app/list/DragDropController.java
+++ b/java/com/android/dialer/app/list/DragDropController.java
@@ -16,8 +16,6 @@
 
 package com.android.dialer.app.list;
 
-import android.os.Build.VERSION;
-import android.os.Build.VERSION_CODES;
 import android.view.View;
 import java.util.ArrayList;
 import java.util.List;
@@ -38,22 +36,15 @@
 
   /** @return True if the drag is started, false if the drag is cancelled for some reason. */
   boolean handleDragStarted(View v, int x, int y) {
-    int screenX = x;
-    int screenY = y;
-    // The coordinates in dragEvent of DragEvent.ACTION_DRAG_STARTED before NYC is window-related.
-    // This is fixed in NYC.
-    if (VERSION.SDK_INT >= VERSION_CODES.N) {
-      v.getLocationOnScreen(locationOnScreen);
-      screenX = x + locationOnScreen[0];
-      screenY = y + locationOnScreen[1];
-    }
-    final PhoneFavoriteSquareTileView tileView =
-        dragItemContainer.getViewForLocation(screenX, screenY);
+    v.getLocationOnScreen(locationOnScreen);
+    x = x + locationOnScreen[0];
+    y = y + locationOnScreen[1];
+    final PhoneFavoriteSquareTileView tileView = dragItemContainer.getViewForLocation(x, y);
     if (tileView == null) {
       return false;
     }
     for (int i = 0; i < onDragDropListeners.size(); i++) {
-      onDragDropListeners.get(i).onDragStarted(screenX, screenY, tileView);
+      onDragDropListeners.get(i).onDragStarted(x, y, tileView);
     }
 
     return true;
diff --git a/java/com/android/dialer/app/list/ListsFragment.java b/java/com/android/dialer/app/list/ListsFragment.java
index d314917..93e8923 100644
--- a/java/com/android/dialer/app/list/ListsFragment.java
+++ b/java/com/android/dialer/app/list/ListsFragment.java
@@ -45,7 +45,6 @@
 import com.android.dialer.logging.ScreenEvent;
 import com.android.dialer.logging.UiAction;
 import com.android.dialer.performancereport.PerformanceReport;
-import com.android.dialer.speeddial.SpeedDialFragment;
 import com.android.dialer.util.PermissionsUtil;
 import com.android.dialer.voicemail.listui.error.VoicemailStatusCorruptionHandler;
 import com.android.dialer.voicemail.listui.error.VoicemailStatusCorruptionHandler.Source;
@@ -199,7 +198,6 @@
     viewPager = (DialerViewPager) parentView.findViewById(R.id.lists_pager);
     adapter =
         new DialtactsPagerAdapter(
-            getContext(),
             getChildFragmentManager(),
             tabTitles,
             prefs.getBoolean(
@@ -456,11 +454,10 @@
   }
 
   public boolean hasFrequents() {
-    Fragment page =
-        adapter.getItem(adapter.getRtlPosition(DialtactsPagerAdapter.TAB_INDEX_SPEED_DIAL));
-    return page instanceof OldSpeedDialFragment
-        ? ((OldSpeedDialFragment) page).hasFrequents()
-        : ((SpeedDialFragment) page).hasFrequents();
+    OldSpeedDialFragment page =
+        (OldSpeedDialFragment)
+            adapter.getItem(adapter.getRtlPosition(DialtactsPagerAdapter.TAB_INDEX_SPEED_DIAL));
+    return page.hasFrequents();
   }
 
   public RemoveView getRemoveView() {
diff --git a/java/com/android/dialer/app/list/OldSpeedDialFragment.java b/java/com/android/dialer/app/list/OldSpeedDialFragment.java
index 9b83d54..9922ee2 100644
--- a/java/com/android/dialer/app/list/OldSpeedDialFragment.java
+++ b/java/com/android/dialer/app/list/OldSpeedDialFragment.java
@@ -113,9 +113,6 @@
   public void onResume() {
     Trace.beginSection(TAG + " onResume");
     super.onResume();
-    if (contactTileAdapter != null) {
-      contactTileAdapter.refreshContactsPreferences();
-    }
     if (PermissionsUtil.hasContactsReadPermissions(getContext())) {
       if (getLoaderManager().getLoader(LOADER_ID_CONTACT_TILE) == null) {
         getLoaderManager().initLoader(LOADER_ID_CONTACT_TILE, null, contactTileLoaderListener);
diff --git a/java/com/android/dialer/app/list/PhoneFavoriteSquareTileView.java b/java/com/android/dialer/app/list/PhoneFavoriteSquareTileView.java
index 330a361..8fe67f4 100644
--- a/java/com/android/dialer/app/list/PhoneFavoriteSquareTileView.java
+++ b/java/com/android/dialer/app/list/PhoneFavoriteSquareTileView.java
@@ -25,15 +25,13 @@
 import android.widget.TextView;
 import com.android.contacts.common.list.ContactEntry;
 import com.android.dialer.app.R;
-import com.android.dialer.compat.CompatUtils;
 import com.android.dialer.logging.InteractionEvent;
 import com.android.dialer.logging.Logger;
+import com.android.dialer.widget.BidiTextView;
 
 /** Displays the contact's picture overlaid with their name and number type in a tile. */
 public class PhoneFavoriteSquareTileView extends PhoneFavoriteTileView {
 
-  private static final String TAG = PhoneFavoriteSquareTileView.class.getSimpleName();
-
   private final float heightToWidthRatio;
 
   private ImageButton secondaryButton;
@@ -50,11 +48,12 @@
   @Override
   protected void onFinishInflate() {
     super.onFinishInflate();
-    final TextView nameView = (TextView) findViewById(R.id.contact_tile_name);
+    BidiTextView nameView = findViewById(R.id.contact_tile_name);
     nameView.setElegantTextHeight(false);
-    final TextView phoneTypeView = (TextView) findViewById(R.id.contact_tile_phone_type);
+
+    TextView phoneTypeView = findViewById(R.id.contact_tile_phone_type);
     phoneTypeView.setElegantTextHeight(false);
-    secondaryButton = (ImageButton) findViewById(R.id.contact_tile_secondary_button);
+    secondaryButton = findViewById(R.id.contact_tile_secondary_button);
   }
 
   @Override
@@ -64,21 +63,12 @@
   }
 
   private void launchQuickContact() {
-    if (CompatUtils.hasPrioritizedMimeType()) {
-      QuickContact.showQuickContact(
-          getContext(),
-          PhoneFavoriteSquareTileView.this,
-          getLookupUri(),
-          null,
-          Phone.CONTENT_ITEM_TYPE);
-    } else {
-      QuickContact.showQuickContact(
-          getContext(),
-          PhoneFavoriteSquareTileView.this,
-          getLookupUri(),
-          QuickContact.MODE_LARGE,
-          null);
-    }
+    QuickContact.showQuickContact(
+        getContext(),
+        PhoneFavoriteSquareTileView.this,
+        getLookupUri(),
+        null,
+        Phone.CONTENT_ITEM_TYPE);
   }
 
   @Override
@@ -114,7 +104,7 @@
 
   @Override
   protected String getNameForView(ContactEntry contactEntry) {
-    return contactEntry.getPreferredDisplayName();
+    return contactEntry.getPreferredDisplayName(getContext());
   }
 
   public ContactEntry getContactEntry() {
diff --git a/java/com/android/dialer/app/list/PhoneFavoriteTileView.java b/java/com/android/dialer/app/list/PhoneFavoriteTileView.java
index 30b8464..f9f8e0e 100644
--- a/java/com/android/dialer/app/list/PhoneFavoriteTileView.java
+++ b/java/com/android/dialer/app/list/PhoneFavoriteTileView.java
@@ -18,6 +18,8 @@
 
 import android.content.ClipData;
 import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Point;
 import android.net.Uri;
 import android.provider.ContactsContract.PinnedPositions;
 import android.text.TextUtils;
@@ -77,15 +79,12 @@
     shadowOverlay = findViewById(R.id.shadow_overlay);
 
     setOnLongClickListener(
-        new OnLongClickListener() {
-          @Override
-          public boolean onLongClick(View v) {
-            final PhoneFavoriteTileView view = (PhoneFavoriteTileView) v;
-            // NOTE The drag shadow is handled in the ListView.
-            view.startDrag(
-                EMPTY_CLIP_DATA, new View.DragShadowBuilder(), DRAG_PHONE_FAVORITE_TILE, 0);
-            return true;
-          }
+        (v) -> {
+          final PhoneFavoriteTileView view = (PhoneFavoriteTileView) v;
+          // NOTE The drag shadow is handled in the ListView.
+          view.startDragAndDrop(
+              EMPTY_CLIP_DATA, new EmptyDragShadowBuilder(), DRAG_PHONE_FAVORITE_TILE, 0);
+          return true;
         });
   }
 
@@ -207,4 +206,23 @@
     loader.registerListener(0, (loader1, contact) -> loader.reset());
     loader.startLoading();
   }
+
+  /**
+   * A {@link View.DragShadowBuilder} that doesn't draw anything. An object of this class should be
+   * passed to {@link View#startDragAndDrop} to prevent the framework from drawing a drag shadow.
+   */
+  public static class EmptyDragShadowBuilder extends View.DragShadowBuilder {
+
+    @Override
+    public void onProvideShadowMetrics(Point size, Point touch) {
+      // A workaround for P+ not accepting non-positive drag shadow sizes.
+      size.set(1, 1);
+      touch.set(0, 0);
+    }
+
+    @Override
+    public void onDrawShadow(Canvas canvas) {
+      // Don't draw anything
+    }
+  }
 }
diff --git a/java/com/android/dialer/app/list/PhoneFavoritesTileAdapter.java b/java/com/android/dialer/app/list/PhoneFavoritesTileAdapter.java
index a201859..4cc48a6 100644
--- a/java/com/android/dialer/app/list/PhoneFavoritesTileAdapter.java
+++ b/java/com/android/dialer/app/list/PhoneFavoritesTileAdapter.java
@@ -37,10 +37,10 @@
 import com.android.contacts.common.ContactTileLoaderFactory;
 import com.android.contacts.common.list.ContactEntry;
 import com.android.contacts.common.list.ContactTileView;
-import com.android.contacts.common.preference.ContactsPreferences;
 import com.android.dialer.app.R;
 import com.android.dialer.common.LogUtil;
 import com.android.dialer.contactphoto.ContactPhotoManager;
+import com.android.dialer.contacts.ContactsComponent;
 import com.android.dialer.duo.Duo;
 import com.android.dialer.duo.DuoComponent;
 import com.android.dialer.logging.InteractionEvent;
@@ -78,11 +78,11 @@
   private OnDataSetChangedForAnimationListener dataSetChangedListener;
   private Context context;
   private Resources resources;
-  private ContactsPreferences contactsPreferences;
   private final Comparator<ContactEntry> contactEntryComparator =
       new Comparator<ContactEntry>() {
         @Override
         public int compare(ContactEntry lhs, ContactEntry rhs) {
+
           return ComparisonChain.start()
               .compare(lhs.pinned, rhs.pinned)
               .compare(getPreferredSortName(lhs), getPreferredSortName(rhs))
@@ -90,11 +90,9 @@
         }
 
         private String getPreferredSortName(ContactEntry contactEntry) {
-          if (contactsPreferences.getSortOrder() == ContactsPreferences.SORT_ORDER_PRIMARY
-              || TextUtils.isEmpty(contactEntry.nameAlternative)) {
-            return contactEntry.namePrimary;
-          }
-          return contactEntry.nameAlternative;
+          return ContactsComponent.get(context)
+              .contactDisplayPreferences()
+              .getSortName(contactEntry.namePrimary, contactEntry.nameAlternative);
         }
       };
   /** Back up of the temporarily removed Contact during dragging. */
@@ -121,7 +119,6 @@
     this.listener = listener;
     this.context = context;
     resources = context.getResources();
-    contactsPreferences = new ContactsPreferences(this.context);
     numFrequents = 0;
     contactEntries = new ArrayList<>();
   }
@@ -140,11 +137,6 @@
     this.inDragging = inDragging;
   }
 
-  void refreshContactsPreferences() {
-    contactsPreferences.refreshValue(ContactsPreferences.DISPLAY_ORDER_KEY);
-    contactsPreferences.refreshValue(ContactsPreferences.SORT_ORDER_KEY);
-  }
-
   /**
    * Gets the number of frequents from the passed in cursor.
    *
@@ -256,7 +248,6 @@
             (!TextUtils.isEmpty(nameAlternative))
                 ? nameAlternative
                 : resources.getString(R.string.missing_name);
-        contact.nameDisplayOrder = contactsPreferences.getDisplayOrder();
         contact.photoUri = (photoUri != null ? Uri.parse(photoUri) : null);
         contact.lookupKey = lookupKey;
         contact.lookupUri =
diff --git a/java/com/android/dialer/app/list/RegularSearchFragment.java b/java/com/android/dialer/app/list/RegularSearchFragment.java
deleted file mode 100644
index d1927f0..0000000
--- a/java/com/android/dialer/app/list/RegularSearchFragment.java
+++ /dev/null
@@ -1,199 +0,0 @@
-/*
- * Copyright (C) 2013 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.dialer.app.list;
-
-import static android.Manifest.permission.READ_CONTACTS;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.pm.PackageManager;
-import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v13.app.FragmentCompat;
-import android.view.LayoutInflater;
-import android.view.ViewGroup;
-import com.android.contacts.common.list.ContactEntryListAdapter;
-import com.android.contacts.common.list.PinnedHeaderListView;
-import com.android.dialer.app.R;
-import com.android.dialer.callintent.CallInitiationType;
-import com.android.dialer.common.LogUtil;
-import com.android.dialer.common.concurrent.DialerExecutor;
-import com.android.dialer.common.concurrent.DialerExecutor.Worker;
-import com.android.dialer.common.concurrent.DialerExecutorComponent;
-import com.android.dialer.phonenumbercache.CachedNumberLookupService;
-import com.android.dialer.phonenumbercache.CachedNumberLookupService.CachedContactInfo;
-import com.android.dialer.phonenumbercache.PhoneNumberCache;
-import com.android.dialer.util.PermissionsUtil;
-import com.android.dialer.widget.EmptyContentView;
-import com.android.dialer.widget.EmptyContentView.OnEmptyViewActionButtonClickedListener;
-import java.util.Arrays;
-
-public class RegularSearchFragment extends SearchFragment
-    implements OnEmptyViewActionButtonClickedListener,
-        FragmentCompat.OnRequestPermissionsResultCallback {
-
-  public static final int PERMISSION_REQUEST_CODE = 1;
-
-  private static final int SEARCH_DIRECTORY_RESULT_LIMIT = 5;
-  protected String permissionToRequest;
-
-  private DialerExecutor<CachedContactInfo> addContactTask;
-
-  public RegularSearchFragment() {
-    configureDirectorySearch();
-  }
-
-  public void configureDirectorySearch() {
-    setDirectorySearchEnabled(true);
-    setDirectoryResultLimit(SEARCH_DIRECTORY_RESULT_LIMIT);
-  }
-
-  @Override
-  public void onCreate(Bundle savedState) {
-    super.onCreate(savedState);
-
-    addContactTask =
-        DialerExecutorComponent.get(getContext())
-            .dialerExecutorFactory()
-            .createUiTaskBuilder(
-                getFragmentManager(),
-                "RegularSearchFragment.addContact",
-                new AddContactWorker(getContext().getApplicationContext()))
-            .build();
-  }
-
-  @Override
-  protected void onCreateView(LayoutInflater inflater, ViewGroup container) {
-    super.onCreateView(inflater, container);
-    ((PinnedHeaderListView) getListView()).setScrollToSectionOnHeaderTouch(true);
-  }
-
-  @Override
-  protected ContactEntryListAdapter createListAdapter() {
-    RegularSearchListAdapter adapter = new RegularSearchListAdapter(getActivity());
-    adapter.setDisplayPhotos(true);
-    adapter.setUseCallableUri(usesCallableUri());
-    adapter.setListener(this);
-    return adapter;
-  }
-
-  @Override
-  protected void cacheContactInfo(int position) {
-    CachedNumberLookupService cachedNumberLookupService =
-        PhoneNumberCache.get(getContext()).getCachedNumberLookupService();
-    if (cachedNumberLookupService != null) {
-      final RegularSearchListAdapter adapter = (RegularSearchListAdapter) getAdapter();
-      CachedContactInfo cachedContactInfo =
-          adapter.getContactInfo(cachedNumberLookupService, position);
-      addContactTask.executeSerial(cachedContactInfo);
-    }
-  }
-
-  @Override
-  protected void setupEmptyView() {
-    if (emptyView != null && getActivity() != null) {
-      final int imageResource;
-      final int actionLabelResource;
-      final int descriptionResource;
-      final OnEmptyViewActionButtonClickedListener listener;
-      if (!PermissionsUtil.hasPermission(getActivity(), READ_CONTACTS)) {
-        imageResource = R.drawable.empty_contacts;
-        actionLabelResource = R.string.permission_single_turn_on;
-        descriptionResource = R.string.permission_no_search;
-        listener = this;
-        permissionToRequest = READ_CONTACTS;
-      } else {
-        imageResource = EmptyContentView.NO_IMAGE;
-        actionLabelResource = EmptyContentView.NO_LABEL;
-        descriptionResource = EmptyContentView.NO_LABEL;
-        listener = null;
-        permissionToRequest = null;
-      }
-
-      emptyView.setImage(imageResource);
-      emptyView.setActionLabel(actionLabelResource);
-      emptyView.setDescription(descriptionResource);
-      if (listener != null) {
-        emptyView.setActionClickedListener(listener);
-      }
-    }
-  }
-
-  @Override
-  public void onEmptyViewActionButtonClicked() {
-    final Activity activity = getActivity();
-    if (activity == null) {
-      return;
-    }
-
-    if (READ_CONTACTS.equals(permissionToRequest)) {
-      String[] deniedPermissions =
-          PermissionsUtil.getPermissionsCurrentlyDenied(
-              getContext(), PermissionsUtil.allContactsGroupPermissionsUsedInDialer);
-      if (deniedPermissions.length > 0) {
-        LogUtil.i(
-            "RegularSearchFragment.onEmptyViewActionButtonClicked",
-            "Requesting permissions: " + Arrays.toString(deniedPermissions));
-        FragmentCompat.requestPermissions(this, deniedPermissions, PERMISSION_REQUEST_CODE);
-      }
-    }
-  }
-
-  @Override
-  public void onRequestPermissionsResult(
-      int requestCode, String[] permissions, int[] grantResults) {
-    if (requestCode == PERMISSION_REQUEST_CODE) {
-      setupEmptyView();
-      if (grantResults != null
-          && grantResults.length == 1
-          && PackageManager.PERMISSION_GRANTED == grantResults[0]) {
-        PermissionsUtil.notifyPermissionGranted(getActivity(), permissions[0]);
-      }
-    }
-  }
-
-  @Override
-  protected CallInitiationType.Type getCallInitiationType(boolean isRemoteDirectory) {
-    return isRemoteDirectory
-        ? CallInitiationType.Type.REMOTE_DIRECTORY
-        : CallInitiationType.Type.REGULAR_SEARCH;
-  }
-
-  public interface CapabilityChecker {
-
-    boolean isNearbyPlacesSearchEnabled();
-  }
-
-  private static class AddContactWorker implements Worker<CachedContactInfo, Void> {
-
-    private final Context appContext;
-
-    private AddContactWorker(Context appContext) {
-      this.appContext = appContext;
-    }
-
-    @Nullable
-    @Override
-    public Void doInBackground(@Nullable CachedContactInfo contactInfo) throws Throwable {
-      CachedNumberLookupService cachedNumberLookupService =
-          PhoneNumberCache.get(appContext).getCachedNumberLookupService();
-      if (cachedNumberLookupService != null) {
-        cachedNumberLookupService.addContact(appContext, contactInfo);
-      }
-      return null;
-    }
-  }
-}
diff --git a/java/com/android/dialer/app/list/RegularSearchListAdapter.java b/java/com/android/dialer/app/list/RegularSearchListAdapter.java
deleted file mode 100644
index c92f48c..0000000
--- a/java/com/android/dialer/app/list/RegularSearchListAdapter.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * Copyright (C) 2013 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.dialer.app.list;
-
-import android.content.Context;
-import android.database.Cursor;
-import android.net.Uri;
-import android.text.TextUtils;
-import com.android.contacts.common.ContactsUtils;
-import com.android.contacts.common.list.DirectoryPartition;
-import com.android.dialer.common.cp2.DirectoryCompat;
-import com.android.dialer.phonenumbercache.CachedNumberLookupService;
-import com.android.dialer.phonenumbercache.CachedNumberLookupService.CachedContactInfo;
-import com.android.dialer.phonenumbercache.ContactInfo;
-import com.android.dialer.phonenumberutil.PhoneNumberHelper;
-import com.android.dialer.util.CallUtil;
-
-/** List adapter to display regular search results. */
-public class RegularSearchListAdapter extends DialerPhoneNumberListAdapter {
-
-  protected boolean isQuerySipAddress;
-
-  public RegularSearchListAdapter(Context context) {
-    super(context);
-    setShortcutEnabled(SHORTCUT_CREATE_NEW_CONTACT, false);
-    setShortcutEnabled(SHORTCUT_ADD_TO_EXISTING_CONTACT, false);
-  }
-
-  public CachedContactInfo getContactInfo(CachedNumberLookupService lookupService, int position) {
-    ContactInfo info = new ContactInfo();
-    CachedContactInfo cacheInfo = lookupService.buildCachedContactInfo(info);
-    final Cursor item = (Cursor) getItem(position);
-    if (item != null) {
-      final DirectoryPartition partition =
-          (DirectoryPartition) getPartition(getPartitionForPosition(position));
-      final long directoryId = partition.getDirectoryId();
-      final boolean isExtendedDirectory = isExtendedDirectory(directoryId);
-
-      info.name = item.getString(PhoneQuery.DISPLAY_NAME);
-      info.type = item.getInt(PhoneQuery.PHONE_TYPE);
-      info.label = item.getString(PhoneQuery.PHONE_LABEL);
-      info.number = item.getString(PhoneQuery.PHONE_NUMBER);
-      final String photoUriStr = item.getString(PhoneQuery.PHOTO_URI);
-      info.photoUri = photoUriStr == null ? null : Uri.parse(photoUriStr);
-      /*
-       * An extended directory is custom directory in the app, but not a directory provided by
-       * framework. So it can't be USER_TYPE_WORK.
-       *
-       * When a search result is selected, RegularSearchFragment calls getContactInfo and
-       * cache the resulting @{link ContactInfo} into local db. Set usertype to USER_TYPE_WORK
-       * only if it's NOT extended directory id and is enterprise directory.
-       */
-      info.userType =
-          !isExtendedDirectory && DirectoryCompat.isEnterpriseDirectoryId(directoryId)
-              ? ContactsUtils.USER_TYPE_WORK
-              : ContactsUtils.USER_TYPE_CURRENT;
-
-      cacheInfo.setLookupKey(item.getString(PhoneQuery.LOOKUP_KEY));
-
-      final String sourceName = partition.getLabel();
-      if (isExtendedDirectory) {
-        cacheInfo.setExtendedSource(sourceName, directoryId);
-      } else {
-        cacheInfo.setDirectorySource(sourceName, directoryId);
-      }
-    }
-    return cacheInfo;
-  }
-
-  @Override
-  public String getFormattedQueryString() {
-    if (isQuerySipAddress) {
-      // Return unnormalized SIP address
-      return getQueryString();
-    }
-    return super.getFormattedQueryString();
-  }
-
-  @Override
-  public void setQueryString(String queryString) {
-    // Don't show actions if the query string contains a letter.
-    final boolean showNumberShortcuts =
-        !TextUtils.isEmpty(getFormattedQueryString()) && hasDigitsInQueryString();
-    isQuerySipAddress = PhoneNumberHelper.isUriNumber(queryString);
-
-    if (isChanged(showNumberShortcuts)) {
-      notifyDataSetChanged();
-    }
-    super.setQueryString(queryString);
-  }
-
-  protected boolean isChanged(boolean showNumberShortcuts) {
-    boolean changed = false;
-    changed |= setShortcutEnabled(SHORTCUT_DIRECT_CALL, showNumberShortcuts || isQuerySipAddress);
-    changed |= setShortcutEnabled(SHORTCUT_SEND_SMS_MESSAGE, showNumberShortcuts);
-    changed |=
-        setShortcutEnabled(
-            SHORTCUT_MAKE_VIDEO_CALL, showNumberShortcuts && CallUtil.isVideoEnabled(getContext()));
-    return changed;
-  }
-
-  /** Whether there is at least one digit in the query string. */
-  private boolean hasDigitsInQueryString() {
-    String queryString = getQueryString();
-    int length = queryString.length();
-    for (int i = 0; i < length; i++) {
-      if (Character.isDigit(queryString.charAt(i))) {
-        return true;
-      }
-    }
-    return false;
-  }
-}
diff --git a/java/com/android/dialer/app/list/RemoveView.java b/java/com/android/dialer/app/list/RemoveView.java
index ed133d4..575c5a8 100644
--- a/java/com/android/dialer/app/list/RemoveView.java
+++ b/java/com/android/dialer/app/list/RemoveView.java
@@ -53,7 +53,7 @@
     removeText = (TextView) findViewById(R.id.remove_view_text);
     removeIcon = (ImageView) findViewById(R.id.remove_view_icon);
     final Resources r = getResources();
-    unhighlightedColor = r.getColor(R.color.remove_text_color);
+    unhighlightedColor = r.getColor(android.R.color.white);
     highlightedColor = r.getColor(R.color.remove_highlighted_text_color);
     removeDrawable = r.getDrawable(R.drawable.ic_remove);
   }
diff --git a/java/com/android/dialer/app/list/SearchFragment.java b/java/com/android/dialer/app/list/SearchFragment.java
deleted file mode 100644
index afb6789..0000000
--- a/java/com/android/dialer/app/list/SearchFragment.java
+++ /dev/null
@@ -1,425 +0,0 @@
-/*
- * Copyright (C) 2013 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.dialer.app.list;
-
-import android.animation.Animator;
-import android.animation.AnimatorInflater;
-import android.animation.AnimatorListenerAdapter;
-import android.app.Activity;
-import android.app.DialogFragment;
-import android.content.Intent;
-import android.content.res.Configuration;
-import android.content.res.Resources;
-import android.text.TextUtils;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.animation.Interpolator;
-import android.widget.AbsListView;
-import android.widget.AbsListView.OnScrollListener;
-import android.widget.LinearLayout;
-import android.widget.ListView;
-import android.widget.Space;
-import com.android.contacts.common.list.ContactEntryListAdapter;
-import com.android.contacts.common.list.OnPhoneNumberPickerActionListener;
-import com.android.contacts.common.list.PhoneNumberPickerFragment;
-import com.android.dialer.animation.AnimUtils;
-import com.android.dialer.app.R;
-import com.android.dialer.app.widget.DialpadSearchEmptyContentView;
-import com.android.dialer.callintent.CallSpecificAppData;
-import com.android.dialer.common.LogUtil;
-import com.android.dialer.dialpadview.DialpadFragment.ErrorDialogFragment;
-import com.android.dialer.logging.DialerImpression;
-import com.android.dialer.logging.Logger;
-import com.android.dialer.util.DialerUtils;
-import com.android.dialer.util.IntentUtil;
-import com.android.dialer.util.PermissionsUtil;
-import com.android.dialer.widget.EmptyContentView;
-
-public class SearchFragment extends PhoneNumberPickerFragment {
-
-  protected EmptyContentView emptyView;
-  private OnListFragmentScrolledListener activityScrollListener;
-  private View.OnTouchListener activityOnTouchListener;
-  /*
-   * Stores the untouched user-entered string that is used to populate the add to contacts
-   * intent.
-   */
-  private String addToContactNumber;
-  private int actionBarHeight;
-  private int shadowHeight;
-  private int paddingTop;
-  private int showDialpadDuration;
-  private int hideDialpadDuration;
-  /**
-   * Used to resize the list view containing search results so that it fits the available space
-   * above the dialpad. Does not have a user-visible effect in regular touch usage (since the
-   * dialpad hides that portion of the ListView anyway), but improves usability in accessibility
-   * mode.
-   */
-  private Space spacer;
-
-  private HostInterface activity;
-
-  @Override
-  public void onAttach(Activity activity) {
-    super.onAttach(activity);
-
-    setQuickContactEnabled(true);
-    setAdjustSelectionBoundsEnabled(false);
-    setDarkTheme(false);
-    setUseCallableUri(true);
-
-    try {
-      activityScrollListener = (OnListFragmentScrolledListener) activity;
-    } catch (ClassCastException e) {
-      LogUtil.v(
-          "SearchFragment.onAttach",
-          activity.toString()
-              + " doesn't implement OnListFragmentScrolledListener. "
-              + "Ignoring.");
-    }
-  }
-
-  @Override
-  public void onStart() {
-    LogUtil.d("SearchFragment.onStart", "");
-    super.onStart();
-
-    activity = (HostInterface) getActivity();
-
-    final Resources res = getResources();
-    actionBarHeight = activity.getActionBarHeight();
-    shadowHeight = res.getDrawable(R.drawable.search_shadow).getIntrinsicHeight();
-    paddingTop = res.getDimensionPixelSize(R.dimen.search_list_padding_top);
-    showDialpadDuration = res.getInteger(R.integer.dialpad_slide_in_duration);
-    hideDialpadDuration = res.getInteger(R.integer.dialpad_slide_out_duration);
-
-    final ListView listView = getListView();
-
-    if (emptyView == null) {
-      if (this instanceof SmartDialSearchFragment) {
-        emptyView = new DialpadSearchEmptyContentView(getActivity());
-      } else {
-        emptyView = new EmptyContentView(getActivity());
-      }
-      ((ViewGroup) getListView().getParent()).addView(emptyView);
-      getListView().setEmptyView(emptyView);
-      setupEmptyView();
-    }
-
-    listView.setBackgroundColor(res.getColor(R.color.background_dialer_results));
-    listView.setClipToPadding(false);
-    setVisibleScrollbarEnabled(false);
-
-    //Turn of accessibility live region as the list constantly update itself and spam messages.
-    listView.setAccessibilityLiveRegion(View.ACCESSIBILITY_LIVE_REGION_NONE);
-    ContentChangedFilter.addToParent(listView);
-
-    listView.setOnScrollListener(
-        new OnScrollListener() {
-          @Override
-          public void onScrollStateChanged(AbsListView view, int scrollState) {
-            if (activityScrollListener != null) {
-              activityScrollListener.onListFragmentScrollStateChange(scrollState);
-            }
-          }
-
-          @Override
-          public void onScroll(
-              AbsListView view, int firstVisibleItem, int visibleItemCount, int totalItemCount) {}
-        });
-    if (activityOnTouchListener != null) {
-      listView.setOnTouchListener(activityOnTouchListener);
-    }
-
-    updatePosition(false /* animate */);
-  }
-
-  @Override
-  public Animator onCreateAnimator(int transit, boolean enter, int nextAnim) {
-    Animator animator = null;
-    if (nextAnim != 0) {
-      animator = AnimatorInflater.loadAnimator(getActivity(), nextAnim);
-    }
-    if (animator != null) {
-      final View view = getView();
-      final int oldLayerType = view.getLayerType();
-      animator.addListener(
-          new AnimatorListenerAdapter() {
-            @Override
-            public void onAnimationEnd(Animator animation) {
-              view.setLayerType(oldLayerType, null);
-            }
-          });
-    }
-    return animator;
-  }
-
-  public void setAddToContactNumber(String addToContactNumber) {
-    this.addToContactNumber = addToContactNumber;
-  }
-
-  /**
-   * Return true if phone number is prohibited by a value -
-   * (R.string.config_prohibited_phone_number_regexp) in the config files. False otherwise.
-   */
-  public boolean checkForProhibitedPhoneNumber(String number) {
-    // Regular expression prohibiting manual phone call. Can be empty i.e. "no rule".
-    String prohibitedPhoneNumberRegexp =
-        getResources().getString(R.string.config_prohibited_phone_number_regexp);
-
-    // "persist.radio.otaspdial" is a temporary hack needed for one carrier's automated
-    // test equipment.
-    if (number != null
-        && !TextUtils.isEmpty(prohibitedPhoneNumberRegexp)
-        && number.matches(prohibitedPhoneNumberRegexp)) {
-      LogUtil.i(
-          "SearchFragment.checkForProhibitedPhoneNumber",
-          "the phone number is prohibited explicitly by a rule");
-      if (getActivity() != null) {
-        DialogFragment dialogFragment =
-            ErrorDialogFragment.newInstance(R.string.dialog_phone_call_prohibited_message);
-        dialogFragment.show(getFragmentManager(), "phone_prohibited_dialog");
-      }
-
-      return true;
-    }
-    return false;
-  }
-
-  @Override
-  protected ContactEntryListAdapter createListAdapter() {
-    DialerPhoneNumberListAdapter adapter = new DialerPhoneNumberListAdapter(getActivity());
-    adapter.setDisplayPhotos(true);
-    adapter.setUseCallableUri(super.usesCallableUri());
-    adapter.setListener(this);
-    return adapter;
-  }
-
-  @Override
-  protected void onItemClick(int position, long id) {
-    final DialerPhoneNumberListAdapter adapter = (DialerPhoneNumberListAdapter) getAdapter();
-    final int shortcutType = adapter.getShortcutTypeFromPosition(position);
-    final OnPhoneNumberPickerActionListener listener;
-    final Intent intent;
-    final String number;
-
-    LogUtil.i("SearchFragment.onItemClick", "shortcutType: " + shortcutType);
-
-    switch (shortcutType) {
-      case DialerPhoneNumberListAdapter.SHORTCUT_DIRECT_CALL:
-        number = adapter.getQueryString();
-        listener = getOnPhoneNumberPickerListener();
-        if (listener != null && !checkForProhibitedPhoneNumber(number)) {
-          CallSpecificAppData callSpecificAppData =
-              CallSpecificAppData.newBuilder()
-                  .setCallInitiationType(getCallInitiationType(false /* isRemoteDirectory */))
-                  .setPositionOfSelectedSearchResult(position)
-                  .setCharactersInSearchString(
-                      getQueryString() == null ? 0 : getQueryString().length())
-                  .build();
-          listener.onPickPhoneNumber(number, false /* isVideoCall */, callSpecificAppData);
-        }
-        break;
-      case DialerPhoneNumberListAdapter.SHORTCUT_CREATE_NEW_CONTACT:
-        if (this instanceof SmartDialSearchFragment) {
-          Logger.get(getContext())
-              .logImpression(DialerImpression.Type.CREATE_NEW_CONTACT_FROM_DIALPAD);
-        }
-        number =
-            TextUtils.isEmpty(addToContactNumber)
-                ? adapter.getFormattedQueryString()
-                : addToContactNumber;
-        intent = IntentUtil.getNewContactIntent(number);
-        DialerUtils.startActivityWithErrorToast(getActivity(), intent);
-        break;
-      case DialerPhoneNumberListAdapter.SHORTCUT_ADD_TO_EXISTING_CONTACT:
-        if (this instanceof SmartDialSearchFragment) {
-          Logger.get(getContext())
-              .logImpression(DialerImpression.Type.ADD_TO_A_CONTACT_FROM_DIALPAD);
-        }
-        number =
-            TextUtils.isEmpty(addToContactNumber)
-                ? adapter.getFormattedQueryString()
-                : addToContactNumber;
-        intent = IntentUtil.getAddToExistingContactIntent(number);
-        DialerUtils.startActivityWithErrorToast(
-            getActivity(), intent, R.string.add_contact_not_available);
-        break;
-      case DialerPhoneNumberListAdapter.SHORTCUT_SEND_SMS_MESSAGE:
-        number =
-            TextUtils.isEmpty(addToContactNumber)
-                ? adapter.getFormattedQueryString()
-                : addToContactNumber;
-        intent = IntentUtil.getSendSmsIntent(number);
-        DialerUtils.startActivityWithErrorToast(getActivity(), intent);
-        break;
-      case DialerPhoneNumberListAdapter.SHORTCUT_MAKE_VIDEO_CALL:
-        number =
-            TextUtils.isEmpty(addToContactNumber) ? adapter.getQueryString() : addToContactNumber;
-        listener = getOnPhoneNumberPickerListener();
-        if (listener != null && !checkForProhibitedPhoneNumber(number)) {
-          CallSpecificAppData callSpecificAppData =
-              CallSpecificAppData.newBuilder()
-                  .setCallInitiationType(getCallInitiationType(false /* isRemoteDirectory */))
-                  .setPositionOfSelectedSearchResult(position)
-                  .setCharactersInSearchString(
-                      getQueryString() == null ? 0 : getQueryString().length())
-                  .build();
-          listener.onPickPhoneNumber(number, true /* isVideoCall */, callSpecificAppData);
-        }
-        break;
-      case DialerPhoneNumberListAdapter.SHORTCUT_INVALID:
-      default:
-        super.onItemClick(position, id);
-        break;
-    }
-  }
-
-  /**
-   * Updates the position and padding of the search fragment, depending on whether the dialpad is
-   * shown. This can be optionally animated.
-   */
-  public void updatePosition(boolean animate) {
-    LogUtil.d("SearchFragment.updatePosition", "animate: %b", animate);
-    if (activity == null) {
-      // Activity will be set in onStart, and this method will be called again
-      return;
-    }
-
-    // Use negative shadow height instead of 0 to account for the 9-patch's shadow.
-    int startTranslationValue =
-        activity.isDialpadShown() ? actionBarHeight - shadowHeight : -shadowHeight;
-    int endTranslationValue = 0;
-    // Prevents ListView from being translated down after a rotation when the ActionBar is up.
-    if (animate || activity.isActionBarShowing()) {
-      endTranslationValue = activity.isDialpadShown() ? 0 : actionBarHeight - shadowHeight;
-    }
-    if (animate) {
-      // If the dialpad will be shown, then this animation involves sliding the list up.
-      final boolean slideUp = activity.isDialpadShown();
-
-      Interpolator interpolator = slideUp ? AnimUtils.EASE_IN : AnimUtils.EASE_OUT;
-      int duration = slideUp ? showDialpadDuration : hideDialpadDuration;
-      getView().setTranslationY(startTranslationValue);
-      getView()
-          .animate()
-          .translationY(endTranslationValue)
-          .setInterpolator(interpolator)
-          .setDuration(duration)
-          .setListener(
-              new AnimatorListenerAdapter() {
-                @Override
-                public void onAnimationStart(Animator animation) {
-                  if (!slideUp) {
-                    resizeListView();
-                  }
-                }
-
-                @Override
-                public void onAnimationEnd(Animator animation) {
-                  if (slideUp) {
-                    resizeListView();
-                  }
-                }
-              });
-
-    } else {
-      getView().setTranslationY(endTranslationValue);
-      resizeListView();
-    }
-
-    // There is padding which should only be applied when the dialpad is not shown.
-    int paddingTop = activity.isDialpadShown() ? 0 : this.paddingTop;
-    final ListView listView = getListView();
-    listView.setPaddingRelative(
-        listView.getPaddingStart(),
-        paddingTop,
-        listView.getPaddingEnd(),
-        listView.getPaddingBottom());
-  }
-
-  public void resizeListView() {
-    if (spacer == null) {
-      return;
-    }
-    int spacerHeight = activity.isDialpadShown() ? activity.getDialpadHeight() : 0;
-    LogUtil.d(
-        "SearchFragment.resizeListView",
-        "spacerHeight: %d -> %d, isDialpadShown: %b, dialpad height: %d",
-        spacer.getHeight(),
-        spacerHeight,
-        activity.isDialpadShown(),
-        activity.getDialpadHeight());
-    if (spacerHeight != spacer.getHeight()) {
-      final LinearLayout.LayoutParams lp = (LinearLayout.LayoutParams) spacer.getLayoutParams();
-      lp.height = spacerHeight;
-      spacer.setLayoutParams(lp);
-    }
-  }
-
-  @Override
-  protected void startLoading() {
-    if (getActivity() == null) {
-      return;
-    }
-
-    if (PermissionsUtil.hasContactsReadPermissions(getActivity())) {
-      super.startLoading();
-    } else if (TextUtils.isEmpty(getQueryString())) {
-      // Clear out any existing call shortcuts.
-      final DialerPhoneNumberListAdapter adapter = (DialerPhoneNumberListAdapter) getAdapter();
-      adapter.disableAllShortcuts();
-    } else {
-      // The contact list is not going to change (we have no results since permissions are
-      // denied), but the shortcuts might because of the different query, so update the
-      // list.
-      getAdapter().notifyDataSetChanged();
-    }
-
-    setupEmptyView();
-  }
-
-  public void setOnTouchListener(View.OnTouchListener onTouchListener) {
-    activityOnTouchListener = onTouchListener;
-  }
-
-  @Override
-  protected View inflateView(LayoutInflater inflater, ViewGroup container) {
-    final LinearLayout parent = (LinearLayout) super.inflateView(inflater, container);
-    final int orientation = getResources().getConfiguration().orientation;
-    if (orientation == Configuration.ORIENTATION_PORTRAIT) {
-      spacer = new Space(getActivity());
-      parent.addView(
-          spacer, new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, 0));
-    }
-    return parent;
-  }
-
-  protected void setupEmptyView() {}
-
-  public interface HostInterface {
-
-    boolean isActionBarShowing();
-
-    boolean isDialpadShown();
-
-    int getDialpadHeight();
-
-    int getActionBarHeight();
-  }
-}
diff --git a/java/com/android/dialer/app/list/SmartDialNumberListAdapter.java b/java/com/android/dialer/app/list/SmartDialNumberListAdapter.java
deleted file mode 100644
index c84bff7..0000000
--- a/java/com/android/dialer/app/list/SmartDialNumberListAdapter.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * Copyright (C) 2013 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.dialer.app.list;
-
-import android.content.Context;
-import android.database.Cursor;
-import android.support.annotation.NonNull;
-import android.telephony.PhoneNumberUtils;
-import android.text.TextUtils;
-import com.android.contacts.common.list.ContactListItemView;
-import com.android.dialer.common.LogUtil;
-import com.android.dialer.smartdial.SmartDialCursorLoader;
-import com.android.dialer.smartdial.util.SmartDialMatchPosition;
-import com.android.dialer.smartdial.util.SmartDialNameMatcher;
-import com.android.dialer.util.CallUtil;
-import java.util.ArrayList;
-
-/** List adapter to display the SmartDial search results. */
-public class SmartDialNumberListAdapter extends DialerPhoneNumberListAdapter {
-
-  private static final String TAG = SmartDialNumberListAdapter.class.getSimpleName();
-  private static final boolean DEBUG = false;
-
-  private final Context context;
-  @NonNull private final SmartDialNameMatcher nameMatcher;
-
-  public SmartDialNumberListAdapter(Context context) {
-    super(context);
-    this.context = context;
-    nameMatcher = new SmartDialNameMatcher("");
-    setShortcutEnabled(SmartDialNumberListAdapter.SHORTCUT_DIRECT_CALL, false);
-
-    if (DEBUG) {
-      LogUtil.v(TAG, "Constructing List Adapter");
-    }
-  }
-
-  /** Sets query for the SmartDialCursorLoader. */
-  public void configureLoader(SmartDialCursorLoader loader) {
-    if (DEBUG) {
-      LogUtil.v(TAG, "Configure Loader with query" + getQueryString());
-    }
-
-    if (getQueryString() == null) {
-      loader.configureQuery("");
-      nameMatcher.setQuery("");
-    } else {
-      loader.configureQuery(getQueryString());
-      nameMatcher.setQuery(PhoneNumberUtils.normalizeNumber(getQueryString()));
-    }
-  }
-
-  /**
-   * Sets highlight options for a List item in the SmartDial search results.
-   *
-   * @param view ContactListItemView where the result will be displayed.
-   * @param cursor Object containing information of the associated List item.
-   */
-  @Override
-  protected void setHighlight(ContactListItemView view, Cursor cursor) {
-    view.clearHighlightSequences();
-
-    if (nameMatcher.matches(context, cursor.getString(PhoneQuery.DISPLAY_NAME))) {
-      final ArrayList<SmartDialMatchPosition> nameMatches = nameMatcher.getMatchPositions();
-      for (SmartDialMatchPosition match : nameMatches) {
-        view.addNameHighlightSequence(match.start, match.end);
-        if (DEBUG) {
-          LogUtil.v(
-              TAG,
-              cursor.getString(PhoneQuery.DISPLAY_NAME)
-                  + " "
-                  + nameMatcher.getQuery()
-                  + " "
-                  + String.valueOf(match.start));
-        }
-      }
-    }
-
-    final SmartDialMatchPosition numberMatch =
-        nameMatcher.matchesNumber(context, cursor.getString(PhoneQuery.PHONE_NUMBER));
-    if (numberMatch != null) {
-      view.addNumberHighlightSequence(numberMatch.start, numberMatch.end);
-    }
-  }
-
-  @Override
-  public void setQueryString(String queryString) {
-    final boolean showNumberShortcuts = !TextUtils.isEmpty(getFormattedQueryString());
-    boolean changed = false;
-    changed |= setShortcutEnabled(SHORTCUT_CREATE_NEW_CONTACT, showNumberShortcuts);
-    changed |= setShortcutEnabled(SHORTCUT_ADD_TO_EXISTING_CONTACT, showNumberShortcuts);
-    changed |= setShortcutEnabled(SHORTCUT_SEND_SMS_MESSAGE, showNumberShortcuts);
-    changed |=
-        setShortcutEnabled(
-            SHORTCUT_MAKE_VIDEO_CALL, showNumberShortcuts && CallUtil.isVideoEnabled(getContext()));
-    if (changed) {
-      notifyDataSetChanged();
-    }
-    super.setQueryString(queryString);
-  }
-
-  public void setShowEmptyListForNullQuery(boolean show) {
-    nameMatcher.setShouldMatchEmptyQuery(!show);
-  }
-}
diff --git a/java/com/android/dialer/app/list/SmartDialSearchFragment.java b/java/com/android/dialer/app/list/SmartDialSearchFragment.java
deleted file mode 100644
index fdf0b5a..0000000
--- a/java/com/android/dialer/app/list/SmartDialSearchFragment.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
- * Copyright (C) 2013 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.dialer.app.list;
-
-import static android.Manifest.permission.CALL_PHONE;
-
-import android.app.Activity;
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.content.Loader;
-import android.database.Cursor;
-import android.os.Bundle;
-import android.support.v13.app.FragmentCompat;
-import com.android.contacts.common.list.ContactEntryListAdapter;
-import com.android.dialer.app.R;
-import com.android.dialer.callintent.CallInitiationType;
-import com.android.dialer.common.LogUtil;
-import com.android.dialer.database.DialerDatabaseHelper;
-import com.android.dialer.smartdial.SmartDialCursorLoader;
-import com.android.dialer.util.PermissionsUtil;
-import com.android.dialer.widget.EmptyContentView;
-import java.util.Arrays;
-
-/** Implements a fragment to load and display SmartDial search results. */
-public class SmartDialSearchFragment extends SearchFragment
-    implements EmptyContentView.OnEmptyViewActionButtonClickedListener,
-        FragmentCompat.OnRequestPermissionsResultCallback {
-
-  private static final int CALL_PHONE_PERMISSION_REQUEST_CODE = 1;
-
-  private final BroadcastReceiver smartDialUpdatedReceiver =
-      new BroadcastReceiver() {
-        @Override
-        public void onReceive(Context context, Intent intent) {
-          LogUtil.i("SmartDialSearchFragment.onReceive", "smart dial update broadcast received");
-          reloadData();
-        }
-      };
-
-  /** Creates a SmartDialListAdapter to display and operate on search results. */
-  @Override
-  protected ContactEntryListAdapter createListAdapter() {
-    SmartDialNumberListAdapter adapter = new SmartDialNumberListAdapter(getActivity());
-    adapter.setUseCallableUri(super.usesCallableUri());
-    adapter.setQuickContactEnabled(true);
-    adapter.setShowEmptyListForNullQuery(getShowEmptyListForNullQuery());
-    // Set adapter's query string to restore previous instance state.
-    adapter.setQueryString(getQueryString());
-    adapter.setListener(this);
-    return adapter;
-  }
-
-  /** Creates a SmartDialCursorLoader object to load query results. */
-  @Override
-  public Loader<Cursor> onCreateLoader(int id, Bundle args) {
-    // Smart dialing does not support Directory Load, falls back to normal search instead.
-    if (id == getDirectoryLoaderId()) {
-      return super.onCreateLoader(id, args);
-    } else {
-      final SmartDialNumberListAdapter adapter = (SmartDialNumberListAdapter) getAdapter();
-      SmartDialCursorLoader loader = new SmartDialCursorLoader(super.getContext());
-      loader.setShowEmptyListForNullQuery(getShowEmptyListForNullQuery());
-      adapter.configureLoader(loader);
-      return loader;
-    }
-  }
-
-  @Override
-  public boolean getShowEmptyListForNullQuery() {
-    return true;
-  }
-
-  @Override
-  protected void setupEmptyView() {
-    if (emptyView != null && getActivity() != null) {
-      if (!PermissionsUtil.hasPermission(getActivity(), CALL_PHONE)) {
-        emptyView.setImage(R.drawable.empty_contacts);
-        emptyView.setActionLabel(R.string.permission_single_turn_on);
-        emptyView.setDescription(R.string.permission_place_call);
-        emptyView.setActionClickedListener(this);
-      } else {
-        emptyView.setImage(EmptyContentView.NO_IMAGE);
-        emptyView.setActionLabel(EmptyContentView.NO_LABEL);
-        emptyView.setDescription(EmptyContentView.NO_LABEL);
-      }
-    }
-  }
-
-  @Override
-  public void onStart() {
-    super.onStart();
-
-    LogUtil.i("SmartDialSearchFragment.onStart", "registering smart dial update receiver");
-
-    getActivity()
-        .registerReceiver(
-            smartDialUpdatedReceiver,
-            new IntentFilter(DialerDatabaseHelper.ACTION_SMART_DIAL_UPDATED));
-  }
-
-  @Override
-  public void onStop() {
-    super.onStop();
-
-    LogUtil.i("SmartDialSearchFragment.onStop", "unregistering smart dial update receiver");
-
-    getActivity().unregisterReceiver(smartDialUpdatedReceiver);
-  }
-
-  @Override
-  public void onEmptyViewActionButtonClicked() {
-    final Activity activity = getActivity();
-    if (activity == null) {
-      return;
-    }
-
-    String[] deniedPermissions =
-        PermissionsUtil.getPermissionsCurrentlyDenied(
-            getContext(), PermissionsUtil.allPhoneGroupPermissionsUsedInDialer);
-    if (deniedPermissions.length > 0) {
-      LogUtil.i(
-          "SmartDialSearchFragment.onEmptyViewActionButtonClicked",
-          "Requesting permissions: " + Arrays.toString(deniedPermissions));
-      FragmentCompat.requestPermissions(
-          this, deniedPermissions, CALL_PHONE_PERMISSION_REQUEST_CODE);
-    }
-  }
-
-  @Override
-  public void onRequestPermissionsResult(
-      int requestCode, String[] permissions, int[] grantResults) {
-    if (requestCode == CALL_PHONE_PERMISSION_REQUEST_CODE) {
-      setupEmptyView();
-    }
-  }
-
-  @Override
-  protected CallInitiationType.Type getCallInitiationType(boolean isRemoteDirectory) {
-    return CallInitiationType.Type.SMART_DIAL;
-  }
-
-  public boolean isShowingPermissionRequest() {
-    return emptyView != null && emptyView.isShowingContent();
-  }
-
-  @Override
-  public void setShowEmptyListForNullQuery(boolean show) {
-    if (getAdapter() != null) {
-      ((SmartDialNumberListAdapter) getAdapter()).setShowEmptyListForNullQuery(show);
-    }
-    super.setShowEmptyListForNullQuery(show);
-  }
-}
diff --git a/java/com/android/dialer/app/manifests/activities/AndroidManifest.xml b/java/com/android/dialer/app/manifests/activities/AndroidManifest.xml
index 9e08f5f..7796877 100644
--- a/java/com/android/dialer/app/manifests/activities/AndroidManifest.xml
+++ b/java/com/android/dialer/app/manifests/activities/AndroidManifest.xml
@@ -17,113 +17,22 @@
      Google Dialer. TODO: Need to stop subclassing activities and move this
      back into the main manifest file. -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-  package="com.android.dialer.app">
+    package="com.android.dialer.app">
 
-  <application android:theme="@style/Theme.AppCompat">
+  <application>
 
     <activity
-      android:exported="false"
-      android:label="@string/dialer_settings_label"
-      android:name="com.android.dialer.app.settings.DialerSettingsActivity"
-      android:parentActivityName="com.android.dialer.app.DialtactsActivity"
-      android:theme="@style/SettingsStyle">
+        android:name="com.android.dialer.app.settings.DialerSettingsActivity"
+        android:exported="false"
+        android:label="@string/dialer_settings_label"
+        android:parentActivityName="com.android.dialer.main.impl.MainActivity"
+        android:theme="@style/SettingsStyle">
       <intent-filter>
-        <action android:name="android.intent.action.VIEW" />
+        <action android:name="android.intent.action.VIEW"/>
         <category android:name="android.intent.category.DEFAULT"/>
         <data android:scheme="header"/>
       </intent-filter>
     </activity>
 
-    <!-- The entrance point for Phone UI.
-         stateAlwaysHidden is set to suppress keyboard show up on
-         dialpad screen. -->
-    <activity
-      android:clearTaskOnLaunch="true"
-      android:directBootAware="true"
-      android:label="@string/launcherActivityLabel"
-      android:launchMode="singleTask"
-      android:name="com.android.dialer.app.DialtactsActivity"
-      android:resizeableActivity="true"
-      android:theme="@style/DialtactsActivityTheme"
-      android:windowSoftInputMode="stateAlwaysHidden|adjustNothing">
-
-      <intent-filter>
-        <action android:name="android.intent.action.DIAL"/>
-
-        <category android:name="android.intent.category.DEFAULT"/>
-        <category android:name="android.intent.category.BROWSABLE"/>
-
-        <data android:mimeType="vnd.android.cursor.item/phone"/>
-        <data android:mimeType="vnd.android.cursor.item/person"/>
-      </intent-filter>
-      <intent-filter>
-        <action android:name="android.intent.action.DIAL"/>
-
-        <category android:name="android.intent.category.DEFAULT"/>
-        <category android:name="android.intent.category.BROWSABLE"/>
-
-        <data android:scheme="voicemail"/>
-      </intent-filter>
-      <intent-filter>
-        <action android:name="android.intent.action.DIAL"/>
-        <category android:name="android.intent.category.DEFAULT"/>
-      </intent-filter>
-      <intent-filter>
-        <action android:name="android.intent.action.MAIN"/>
-
-        <category android:name="android.intent.category.DEFAULT"/>
-        <category android:name="android.intent.category.LAUNCHER"/>
-        <category android:name="android.intent.category.BROWSABLE"/>
-      </intent-filter>
-      <intent-filter>
-        <action android:name="android.intent.action.VIEW"/>
-        <action android:name="android.intent.action.DIAL"/>
-
-        <category android:name="android.intent.category.DEFAULT"/>
-        <category android:name="android.intent.category.BROWSABLE"/>
-
-        <data android:scheme="tel"/>
-      </intent-filter>
-      <intent-filter>
-        <action android:name="android.intent.action.VIEW"/>
-
-        <category android:name="android.intent.category.DEFAULT"/>
-        <category android:name="android.intent.category.BROWSABLE"/>
-
-        <data android:mimeType="vnd.android.cursor.dir/calls"/>
-      </intent-filter>
-      <intent-filter>
-        <action android:name="android.intent.action.CALL_BUTTON"/>
-
-        <category android:name="android.intent.category.DEFAULT"/>
-        <category android:name="android.intent.category.BROWSABLE"/>
-      </intent-filter>
-      <!-- This was never intended to be public, but is here for backward
-           compatibility.  Use Intent.ACTION_DIAL instead. -->
-      <intent-filter>
-        <action android:name="com.android.phone.action.TOUCH_DIALER"/>
-
-        <category android:name="android.intent.category.DEFAULT"/>
-        <category android:name="android.intent.category.TAB"/>
-      </intent-filter>
-      <intent-filter android:label="@string/callHistoryIconLabel">
-        <action android:name="com.android.phone.action.RECENT_CALLS"/>
-
-        <category android:name="android.intent.category.DEFAULT"/>
-        <category android:name="android.intent.category.TAB"/>
-      </intent-filter>
-
-
-      <meta-data
-        android:name="com.android.keyguard.layout"
-        android:resource="@layout/keyguard_preview"/>
-    </activity>
-
-    <activity-alias
-        android:exported="true"
-        android:name="com.android.dialer.DialtactsActivity"
-        android:targetActivity="com.android.dialer.app.DialtactsActivity"/>
-
   </application>
-
 </manifest>
diff --git a/java/com/android/dialer/app/res/color/settings_text_color_primary.xml b/java/com/android/dialer/app/res/color/settings_text_color_primary.xml
deleted file mode 100644
index ba25908..0000000
--- a/java/com/android/dialer/app/res/color/settings_text_color_primary.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-  <item android:color="@color/setting_disabled_color" android:state_enabled="false"/>
-  <item android:color="@color/setting_primary_color"/>
-</selector>
diff --git a/java/com/android/dialer/app/res/color/settings_text_color_secondary.xml b/java/com/android/dialer/app/res/color/settings_text_color_secondary.xml
deleted file mode 100644
index 2f78992..0000000
--- a/java/com/android/dialer/app/res/color/settings_text_color_secondary.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-  <item android:color="@color/setting_disabled_color" android:state_enabled="false"/>
-  <item android:color="@color/setting_secondary_color"/>
-</selector>
diff --git a/java/com/android/dialer/app/res/drawable-hdpi/empty_call_log.png b/java/com/android/dialer/app/res/drawable-hdpi/empty_call_log.png
index d6f6daa..b51b7b8 100644
--- a/java/com/android/dialer/app/res/drawable-hdpi/empty_call_log.png
+++ b/java/com/android/dialer/app/res/drawable-hdpi/empty_call_log.png
Binary files differ
diff --git a/java/com/android/dialer/app/res/drawable-hdpi/empty_speed_dial.png b/java/com/android/dialer/app/res/drawable-hdpi/empty_speed_dial.png
deleted file mode 100644
index 3e9232f..0000000
--- a/java/com/android/dialer/app/res/drawable-hdpi/empty_speed_dial.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/dialer/app/res/drawable-hdpi/ic_handle.png b/java/com/android/dialer/app/res/drawable-hdpi/ic_handle.png
deleted file mode 100644
index 34310aa..0000000
--- a/java/com/android/dialer/app/res/drawable-hdpi/ic_handle.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/dialer/app/res/drawable-hdpi/ic_menu_history_lt.png b/java/com/android/dialer/app/res/drawable-hdpi/ic_menu_history_lt.png
index a36323c..1c0c654 100644
--- a/java/com/android/dialer/app/res/drawable-hdpi/ic_menu_history_lt.png
+++ b/java/com/android/dialer/app/res/drawable-hdpi/ic_menu_history_lt.png
Binary files differ
diff --git a/java/com/android/dialer/app/res/drawable-hdpi/ic_mic_grey600.png b/java/com/android/dialer/app/res/drawable-hdpi/ic_mic_grey600.png
index 4b67cf7..a392ff6 100644
--- a/java/com/android/dialer/app/res/drawable-hdpi/ic_mic_grey600.png
+++ b/java/com/android/dialer/app/res/drawable-hdpi/ic_mic_grey600.png
Binary files differ
diff --git a/java/com/android/dialer/app/res/drawable-hdpi/ic_not_interested_googblue_24dp.png b/java/com/android/dialer/app/res/drawable-hdpi/ic_not_interested_googblue_24dp.png
index 26a26f9..393a0c8 100644
--- a/java/com/android/dialer/app/res/drawable-hdpi/ic_not_interested_googblue_24dp.png
+++ b/java/com/android/dialer/app/res/drawable-hdpi/ic_not_interested_googblue_24dp.png
Binary files differ
diff --git a/java/com/android/dialer/app/res/drawable-hdpi/ic_not_spam.png b/java/com/android/dialer/app/res/drawable-hdpi/ic_not_spam.png
index bf413f9..37caf38 100644
--- a/java/com/android/dialer/app/res/drawable-hdpi/ic_not_spam.png
+++ b/java/com/android/dialer/app/res/drawable-hdpi/ic_not_spam.png
Binary files differ
diff --git a/java/com/android/dialer/app/res/drawable-hdpi/ic_phone_24dp.png b/java/com/android/dialer/app/res/drawable-hdpi/ic_phone_24dp.png
index b27dfba..9d41482 100644
--- a/java/com/android/dialer/app/res/drawable-hdpi/ic_phone_24dp.png
+++ b/java/com/android/dialer/app/res/drawable-hdpi/ic_phone_24dp.png
Binary files differ
diff --git a/java/com/android/dialer/app/res/drawable-hdpi/ic_remove.png b/java/com/android/dialer/app/res/drawable-hdpi/ic_remove.png
index 1ee6adf..0af1e39 100644
--- a/java/com/android/dialer/app/res/drawable-hdpi/ic_remove.png
+++ b/java/com/android/dialer/app/res/drawable-hdpi/ic_remove.png
Binary files differ
diff --git a/java/com/android/dialer/app/res/drawable-hdpi/ic_star.png b/java/com/android/dialer/app/res/drawable-hdpi/ic_star.png
index 62e1f8a..91c08cf 100644
--- a/java/com/android/dialer/app/res/drawable-hdpi/ic_star.png
+++ b/java/com/android/dialer/app/res/drawable-hdpi/ic_star.png
Binary files differ
diff --git a/java/com/android/dialer/app/res/drawable-hdpi/ic_unblock.png b/java/com/android/dialer/app/res/drawable-hdpi/ic_unblock.png
index 03643b2..1777610 100644
--- a/java/com/android/dialer/app/res/drawable-hdpi/ic_unblock.png
+++ b/java/com/android/dialer/app/res/drawable-hdpi/ic_unblock.png
Binary files differ
diff --git a/java/com/android/dialer/app/res/drawable-hdpi/old_ic_handle.png b/java/com/android/dialer/app/res/drawable-hdpi/old_ic_handle.png
new file mode 100644
index 0000000..a1c248c
--- /dev/null
+++ b/java/com/android/dialer/app/res/drawable-hdpi/old_ic_handle.png
Binary files differ
diff --git a/java/com/android/dialer/app/res/drawable-hdpi/search_shadow.9.png b/java/com/android/dialer/app/res/drawable-hdpi/search_shadow.9.png
index 3dc1c17..7e7c7c1 100644
--- a/java/com/android/dialer/app/res/drawable-hdpi/search_shadow.9.png
+++ b/java/com/android/dialer/app/res/drawable-hdpi/search_shadow.9.png
Binary files differ
diff --git a/java/com/android/dialer/app/res/drawable-hdpi/shadow_contact_photo.png b/java/com/android/dialer/app/res/drawable-hdpi/shadow_contact_photo.png
index 44b06f2..1fa6c4a 100644
--- a/java/com/android/dialer/app/res/drawable-hdpi/shadow_contact_photo.png
+++ b/java/com/android/dialer/app/res/drawable-hdpi/shadow_contact_photo.png
Binary files differ
diff --git a/java/com/android/dialer/app/res/drawable-mdpi/empty_call_log.png b/java/com/android/dialer/app/res/drawable-mdpi/empty_call_log.png
index 3cd59b3..a8d5a0c 100644
--- a/java/com/android/dialer/app/res/drawable-mdpi/empty_call_log.png
+++ b/java/com/android/dialer/app/res/drawable-mdpi/empty_call_log.png
Binary files differ
diff --git a/java/com/android/dialer/app/res/drawable-mdpi/empty_speed_dial.png b/java/com/android/dialer/app/res/drawable-mdpi/empty_speed_dial.png
deleted file mode 100644
index 98152e0..0000000
--- a/java/com/android/dialer/app/res/drawable-mdpi/empty_speed_dial.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/dialer/app/res/drawable-mdpi/ic_handle.png b/java/com/android/dialer/app/res/drawable-mdpi/ic_handle.png
deleted file mode 100644
index 81a67ba..0000000
--- a/java/com/android/dialer/app/res/drawable-mdpi/ic_handle.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/dialer/app/res/drawable-mdpi/ic_menu_history_lt.png b/java/com/android/dialer/app/res/drawable-mdpi/ic_menu_history_lt.png
index 3597a5e..4a87c94 100644
--- a/java/com/android/dialer/app/res/drawable-mdpi/ic_menu_history_lt.png
+++ b/java/com/android/dialer/app/res/drawable-mdpi/ic_menu_history_lt.png
Binary files differ
diff --git a/java/com/android/dialer/app/res/drawable-mdpi/ic_mic_grey600.png b/java/com/android/dialer/app/res/drawable-mdpi/ic_mic_grey600.png
index 2310c73..f058bff 100644
--- a/java/com/android/dialer/app/res/drawable-mdpi/ic_mic_grey600.png
+++ b/java/com/android/dialer/app/res/drawable-mdpi/ic_mic_grey600.png
Binary files differ
diff --git a/java/com/android/dialer/app/res/drawable-mdpi/ic_not_spam.png b/java/com/android/dialer/app/res/drawable-mdpi/ic_not_spam.png
index b1f1c7e..211baa9 100644
--- a/java/com/android/dialer/app/res/drawable-mdpi/ic_not_spam.png
+++ b/java/com/android/dialer/app/res/drawable-mdpi/ic_not_spam.png
Binary files differ
diff --git a/java/com/android/dialer/app/res/drawable-mdpi/ic_phone_24dp.png b/java/com/android/dialer/app/res/drawable-mdpi/ic_phone_24dp.png
index c1766b8..6539c34 100644
--- a/java/com/android/dialer/app/res/drawable-mdpi/ic_phone_24dp.png
+++ b/java/com/android/dialer/app/res/drawable-mdpi/ic_phone_24dp.png
Binary files differ
diff --git a/java/com/android/dialer/app/res/drawable-mdpi/ic_remove.png b/java/com/android/dialer/app/res/drawable-mdpi/ic_remove.png
index 2c134ea..241a6a6 100644
--- a/java/com/android/dialer/app/res/drawable-mdpi/ic_remove.png
+++ b/java/com/android/dialer/app/res/drawable-mdpi/ic_remove.png
Binary files differ
diff --git a/java/com/android/dialer/app/res/drawable-mdpi/ic_star.png b/java/com/android/dialer/app/res/drawable-mdpi/ic_star.png
index d2af0ba..1f63663 100644
--- a/java/com/android/dialer/app/res/drawable-mdpi/ic_star.png
+++ b/java/com/android/dialer/app/res/drawable-mdpi/ic_star.png
Binary files differ
diff --git a/java/com/android/dialer/app/res/drawable-mdpi/ic_unblock.png b/java/com/android/dialer/app/res/drawable-mdpi/ic_unblock.png
index d80fb2f..9f303d9 100644
--- a/java/com/android/dialer/app/res/drawable-mdpi/ic_unblock.png
+++ b/java/com/android/dialer/app/res/drawable-mdpi/ic_unblock.png
Binary files differ
diff --git a/java/com/android/dialer/app/res/drawable-mdpi/old_ic_handle.png b/java/com/android/dialer/app/res/drawable-mdpi/old_ic_handle.png
new file mode 100644
index 0000000..3671e93
--- /dev/null
+++ b/java/com/android/dialer/app/res/drawable-mdpi/old_ic_handle.png
Binary files differ
diff --git a/java/com/android/dialer/app/res/drawable-mdpi/search_shadow.9.png b/java/com/android/dialer/app/res/drawable-mdpi/search_shadow.9.png
index 0c33905..758ce82 100644
--- a/java/com/android/dialer/app/res/drawable-mdpi/search_shadow.9.png
+++ b/java/com/android/dialer/app/res/drawable-mdpi/search_shadow.9.png
Binary files differ
diff --git a/java/com/android/dialer/app/res/drawable-mdpi/shadow_contact_photo.png b/java/com/android/dialer/app/res/drawable-mdpi/shadow_contact_photo.png
index 8665d83..5c802f9 100644
--- a/java/com/android/dialer/app/res/drawable-mdpi/shadow_contact_photo.png
+++ b/java/com/android/dialer/app/res/drawable-mdpi/shadow_contact_photo.png
Binary files differ
diff --git a/java/com/android/dialer/app/res/drawable-xhdpi/empty_call_log.png b/java/com/android/dialer/app/res/drawable-xhdpi/empty_call_log.png
index 14ec04b..eabc838 100644
--- a/java/com/android/dialer/app/res/drawable-xhdpi/empty_call_log.png
+++ b/java/com/android/dialer/app/res/drawable-xhdpi/empty_call_log.png
Binary files differ
diff --git a/java/com/android/dialer/app/res/drawable-xhdpi/empty_speed_dial.png b/java/com/android/dialer/app/res/drawable-xhdpi/empty_speed_dial.png
deleted file mode 100644
index a3a7675..0000000
--- a/java/com/android/dialer/app/res/drawable-xhdpi/empty_speed_dial.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/dialer/app/res/drawable-xhdpi/ic_handle.png b/java/com/android/dialer/app/res/drawable-xhdpi/ic_handle.png
deleted file mode 100644
index 0ad8392..0000000
--- a/java/com/android/dialer/app/res/drawable-xhdpi/ic_handle.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/dialer/app/res/drawable-xhdpi/ic_menu_history_lt.png b/java/com/android/dialer/app/res/drawable-xhdpi/ic_menu_history_lt.png
index 6b411cb..27dbebf 100644
--- a/java/com/android/dialer/app/res/drawable-xhdpi/ic_menu_history_lt.png
+++ b/java/com/android/dialer/app/res/drawable-xhdpi/ic_menu_history_lt.png
Binary files differ
diff --git a/java/com/android/dialer/app/res/drawable-xhdpi/ic_mic_grey600.png b/java/com/android/dialer/app/res/drawable-xhdpi/ic_mic_grey600.png
index a9a83b3..e1d6a5c 100644
--- a/java/com/android/dialer/app/res/drawable-xhdpi/ic_mic_grey600.png
+++ b/java/com/android/dialer/app/res/drawable-xhdpi/ic_mic_grey600.png
Binary files differ
diff --git a/java/com/android/dialer/app/res/drawable-xhdpi/ic_not_spam.png b/java/com/android/dialer/app/res/drawable-xhdpi/ic_not_spam.png
index 138f27c..8fdd43f 100644
--- a/java/com/android/dialer/app/res/drawable-xhdpi/ic_not_spam.png
+++ b/java/com/android/dialer/app/res/drawable-xhdpi/ic_not_spam.png
Binary files differ
diff --git a/java/com/android/dialer/app/res/drawable-xhdpi/ic_phone_24dp.png b/java/com/android/dialer/app/res/drawable-xhdpi/ic_phone_24dp.png
index 83167f4..8d250c8 100644
--- a/java/com/android/dialer/app/res/drawable-xhdpi/ic_phone_24dp.png
+++ b/java/com/android/dialer/app/res/drawable-xhdpi/ic_phone_24dp.png
Binary files differ
diff --git a/java/com/android/dialer/app/res/drawable-xhdpi/ic_remove.png b/java/com/android/dialer/app/res/drawable-xhdpi/ic_remove.png
index be81592..ac81f84 100644
--- a/java/com/android/dialer/app/res/drawable-xhdpi/ic_remove.png
+++ b/java/com/android/dialer/app/res/drawable-xhdpi/ic_remove.png
Binary files differ
diff --git a/java/com/android/dialer/app/res/drawable-xhdpi/ic_star.png b/java/com/android/dialer/app/res/drawable-xhdpi/ic_star.png
index 2071f42..1951884 100644
--- a/java/com/android/dialer/app/res/drawable-xhdpi/ic_star.png
+++ b/java/com/android/dialer/app/res/drawable-xhdpi/ic_star.png
Binary files differ
diff --git a/java/com/android/dialer/app/res/drawable-xhdpi/ic_unblock.png b/java/com/android/dialer/app/res/drawable-xhdpi/ic_unblock.png
index f7dfa21..c6e6595 100644
--- a/java/com/android/dialer/app/res/drawable-xhdpi/ic_unblock.png
+++ b/java/com/android/dialer/app/res/drawable-xhdpi/ic_unblock.png
Binary files differ
diff --git a/java/com/android/dialer/app/res/drawable-xhdpi/old_ic_handle.png b/java/com/android/dialer/app/res/drawable-xhdpi/old_ic_handle.png
new file mode 100644
index 0000000..36f3466
--- /dev/null
+++ b/java/com/android/dialer/app/res/drawable-xhdpi/old_ic_handle.png
Binary files differ
diff --git a/java/com/android/dialer/app/res/drawable-xhdpi/search_shadow.9.png b/java/com/android/dialer/app/res/drawable-xhdpi/search_shadow.9.png
index 5667ab3..ad45286 100644
--- a/java/com/android/dialer/app/res/drawable-xhdpi/search_shadow.9.png
+++ b/java/com/android/dialer/app/res/drawable-xhdpi/search_shadow.9.png
Binary files differ
diff --git a/java/com/android/dialer/app/res/drawable-xhdpi/shadow_contact_photo.png b/java/com/android/dialer/app/res/drawable-xhdpi/shadow_contact_photo.png
index 8359a50..4e09fd7 100644
--- a/java/com/android/dialer/app/res/drawable-xhdpi/shadow_contact_photo.png
+++ b/java/com/android/dialer/app/res/drawable-xhdpi/shadow_contact_photo.png
Binary files differ
diff --git a/java/com/android/dialer/app/res/drawable-xxhdpi/empty_call_log.png b/java/com/android/dialer/app/res/drawable-xxhdpi/empty_call_log.png
index 501d7f1..ddb8823 100644
--- a/java/com/android/dialer/app/res/drawable-xxhdpi/empty_call_log.png
+++ b/java/com/android/dialer/app/res/drawable-xxhdpi/empty_call_log.png
Binary files differ
diff --git a/java/com/android/dialer/app/res/drawable-xxhdpi/empty_speed_dial.png b/java/com/android/dialer/app/res/drawable-xxhdpi/empty_speed_dial.png
deleted file mode 100644
index fb2ea5f..0000000
--- a/java/com/android/dialer/app/res/drawable-xxhdpi/empty_speed_dial.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/dialer/app/res/drawable-xxhdpi/ic_handle.png b/java/com/android/dialer/app/res/drawable-xxhdpi/ic_handle.png
deleted file mode 100644
index d07a1d0..0000000
--- a/java/com/android/dialer/app/res/drawable-xxhdpi/ic_handle.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/dialer/app/res/drawable-xxhdpi/ic_menu_history_lt.png b/java/com/android/dialer/app/res/drawable-xxhdpi/ic_menu_history_lt.png
index 779bc06..75a633c 100644
--- a/java/com/android/dialer/app/res/drawable-xxhdpi/ic_menu_history_lt.png
+++ b/java/com/android/dialer/app/res/drawable-xxhdpi/ic_menu_history_lt.png
Binary files differ
diff --git a/java/com/android/dialer/app/res/drawable-xxhdpi/ic_mic_grey600.png b/java/com/android/dialer/app/res/drawable-xxhdpi/ic_mic_grey600.png
index 07128dd..726fc11 100644
--- a/java/com/android/dialer/app/res/drawable-xxhdpi/ic_mic_grey600.png
+++ b/java/com/android/dialer/app/res/drawable-xxhdpi/ic_mic_grey600.png
Binary files differ
diff --git a/java/com/android/dialer/app/res/drawable-xxhdpi/ic_not_spam.png b/java/com/android/dialer/app/res/drawable-xxhdpi/ic_not_spam.png
index f699959..941ce8d 100644
--- a/java/com/android/dialer/app/res/drawable-xxhdpi/ic_not_spam.png
+++ b/java/com/android/dialer/app/res/drawable-xxhdpi/ic_not_spam.png
Binary files differ
diff --git a/java/com/android/dialer/app/res/drawable-xxhdpi/ic_phone_24dp.png b/java/com/android/dialer/app/res/drawable-xxhdpi/ic_phone_24dp.png
index 8fff728..9b366f7 100644
--- a/java/com/android/dialer/app/res/drawable-xxhdpi/ic_phone_24dp.png
+++ b/java/com/android/dialer/app/res/drawable-xxhdpi/ic_phone_24dp.png
Binary files differ
diff --git a/java/com/android/dialer/app/res/drawable-xxhdpi/ic_remove.png b/java/com/android/dialer/app/res/drawable-xxhdpi/ic_remove.png
index 2722f23..9281ab9 100644
--- a/java/com/android/dialer/app/res/drawable-xxhdpi/ic_remove.png
+++ b/java/com/android/dialer/app/res/drawable-xxhdpi/ic_remove.png
Binary files differ
diff --git a/java/com/android/dialer/app/res/drawable-xxhdpi/ic_star.png b/java/com/android/dialer/app/res/drawable-xxhdpi/ic_star.png
index f3c8304..94fd394 100644
--- a/java/com/android/dialer/app/res/drawable-xxhdpi/ic_star.png
+++ b/java/com/android/dialer/app/res/drawable-xxhdpi/ic_star.png
Binary files differ
diff --git a/java/com/android/dialer/app/res/drawable-xxhdpi/ic_unblock.png b/java/com/android/dialer/app/res/drawable-xxhdpi/ic_unblock.png
index 828a487..52fce33 100644
--- a/java/com/android/dialer/app/res/drawable-xxhdpi/ic_unblock.png
+++ b/java/com/android/dialer/app/res/drawable-xxhdpi/ic_unblock.png
Binary files differ
diff --git a/java/com/android/dialer/app/res/drawable-xxhdpi/old_ic_handle.png b/java/com/android/dialer/app/res/drawable-xxhdpi/old_ic_handle.png
new file mode 100644
index 0000000..269cb38
--- /dev/null
+++ b/java/com/android/dialer/app/res/drawable-xxhdpi/old_ic_handle.png
Binary files differ
diff --git a/java/com/android/dialer/app/res/drawable-xxhdpi/search_shadow.9.png b/java/com/android/dialer/app/res/drawable-xxhdpi/search_shadow.9.png
index ff55620..fc6f3bf 100644
--- a/java/com/android/dialer/app/res/drawable-xxhdpi/search_shadow.9.png
+++ b/java/com/android/dialer/app/res/drawable-xxhdpi/search_shadow.9.png
Binary files differ
diff --git a/java/com/android/dialer/app/res/drawable-xxhdpi/shadow_contact_photo.png b/java/com/android/dialer/app/res/drawable-xxhdpi/shadow_contact_photo.png
index bfeb0ff..f7b8d2d 100644
--- a/java/com/android/dialer/app/res/drawable-xxhdpi/shadow_contact_photo.png
+++ b/java/com/android/dialer/app/res/drawable-xxhdpi/shadow_contact_photo.png
Binary files differ
diff --git a/java/com/android/dialer/app/res/drawable-xxxhdpi/empty_call_log.png b/java/com/android/dialer/app/res/drawable-xxxhdpi/empty_call_log.png
index fbac1e4..5704d75 100644
--- a/java/com/android/dialer/app/res/drawable-xxxhdpi/empty_call_log.png
+++ b/java/com/android/dialer/app/res/drawable-xxxhdpi/empty_call_log.png
Binary files differ
diff --git a/java/com/android/dialer/app/res/drawable-xxxhdpi/ic_handle.png b/java/com/android/dialer/app/res/drawable-xxxhdpi/ic_handle.png
deleted file mode 100644
index 72641c7..0000000
--- a/java/com/android/dialer/app/res/drawable-xxxhdpi/ic_handle.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/dialer/app/res/drawable-xxxhdpi/ic_mic_grey600.png b/java/com/android/dialer/app/res/drawable-xxxhdpi/ic_mic_grey600.png
index b7403ff..d80da4b 100644
--- a/java/com/android/dialer/app/res/drawable-xxxhdpi/ic_mic_grey600.png
+++ b/java/com/android/dialer/app/res/drawable-xxxhdpi/ic_mic_grey600.png
Binary files differ
diff --git a/java/com/android/dialer/app/res/drawable-xxxhdpi/ic_not_spam.png b/java/com/android/dialer/app/res/drawable-xxxhdpi/ic_not_spam.png
index 2a18de2..d1634c1 100644
--- a/java/com/android/dialer/app/res/drawable-xxxhdpi/ic_not_spam.png
+++ b/java/com/android/dialer/app/res/drawable-xxxhdpi/ic_not_spam.png
Binary files differ
diff --git a/java/com/android/dialer/app/res/drawable-xxxhdpi/ic_phone_24dp.png b/java/com/android/dialer/app/res/drawable-xxxhdpi/ic_phone_24dp.png
index 30d141d..71c48f1 100644
--- a/java/com/android/dialer/app/res/drawable-xxxhdpi/ic_phone_24dp.png
+++ b/java/com/android/dialer/app/res/drawable-xxxhdpi/ic_phone_24dp.png
Binary files differ
diff --git a/java/com/android/dialer/app/res/drawable-xxxhdpi/ic_unblock.png b/java/com/android/dialer/app/res/drawable-xxxhdpi/ic_unblock.png
index 99a1842..01551e2 100644
--- a/java/com/android/dialer/app/res/drawable-xxxhdpi/ic_unblock.png
+++ b/java/com/android/dialer/app/res/drawable-xxxhdpi/ic_unblock.png
Binary files differ
diff --git a/java/com/android/dialer/app/res/drawable-xxxhdpi/nui_launcher_icon.png b/java/com/android/dialer/app/res/drawable-xxxhdpi/nui_launcher_icon.png
deleted file mode 100644
index 7845ebc..0000000
--- a/java/com/android/dialer/app/res/drawable-xxxhdpi/nui_launcher_icon.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/dialer/app/res/drawable-xxxhdpi/old_ic_handle.png b/java/com/android/dialer/app/res/drawable-xxxhdpi/old_ic_handle.png
new file mode 100644
index 0000000..0a65998
--- /dev/null
+++ b/java/com/android/dialer/app/res/drawable-xxxhdpi/old_ic_handle.png
Binary files differ
diff --git a/java/com/android/dialer/app/res/drawable-xxxhdpi/search_shadow.9.png b/java/com/android/dialer/app/res/drawable-xxxhdpi/search_shadow.9.png
index ff55620..fc6f3bf 100644
--- a/java/com/android/dialer/app/res/drawable-xxxhdpi/search_shadow.9.png
+++ b/java/com/android/dialer/app/res/drawable-xxxhdpi/search_shadow.9.png
Binary files differ
diff --git a/java/com/android/dialer/app/res/drawable/ic_voicemail_seek_handle.xml b/java/com/android/dialer/app/res/drawable/ic_voicemail_seek_handle.xml
index 84cda03..00b23b8 100644
--- a/java/com/android/dialer/app/res/drawable/ic_voicemail_seek_handle.xml
+++ b/java/com/android/dialer/app/res/drawable/ic_voicemail_seek_handle.xml
@@ -15,6 +15,6 @@
   ~ limitations under the License
   -->
 <bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-  android:src="@drawable/ic_handle"
-  android:tint="@color/actionbar_background_color">
+  android:src="@drawable/old_ic_handle"
+  android:tint="?android:attr/colorPrimary">
 </bitmap>
\ No newline at end of file
diff --git a/java/com/android/dialer/app/res/drawable/ic_voicemail_seek_handle_disabled.xml b/java/com/android/dialer/app/res/drawable/ic_voicemail_seek_handle_disabled.xml
deleted file mode 100644
index 5e974c4..0000000
--- a/java/com/android/dialer/app/res/drawable/ic_voicemail_seek_handle_disabled.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2015 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-  -->
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-  android:src="@drawable/ic_handle"
-  android:tint="@color/voicemail_icon_disabled_tint">
-</bitmap>
\ No newline at end of file
diff --git a/java/com/android/dialer/app/res/drawable/old_ic_voicemail_seek_handle_disabled.xml b/java/com/android/dialer/app/res/drawable/old_ic_voicemail_seek_handle_disabled.xml
new file mode 100644
index 0000000..cfce818
--- /dev/null
+++ b/java/com/android/dialer/app/res/drawable/old_ic_voicemail_seek_handle_disabled.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2015 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+  android:src="@drawable/old_ic_handle"
+  android:tint="@color/voicemail_icon_disabled_tint">
+</bitmap>
\ No newline at end of file
diff --git a/java/com/android/dialer/app/res/drawable/rounded_corner.xml b/java/com/android/dialer/app/res/drawable/rounded_corner.xml
index 97b58b6..b4c1006 100644
--- a/java/com/android/dialer/app/res/drawable/rounded_corner.xml
+++ b/java/com/android/dialer/app/res/drawable/rounded_corner.xml
@@ -17,6 +17,6 @@
   -->
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
   android:shape="rectangle">
-  <solid android:color="@color/searchbox_background_color"/>
+  <solid android:color="?android:attr/colorBackgroundFloating"/>
   <corners android:radius="2dp"/>
 </shape>
diff --git a/java/com/android/dialer/app/res/drawable/seekbar_drawable.xml b/java/com/android/dialer/app/res/drawable/seekbar_drawable.xml
index e47a640..2288cf2 100644
--- a/java/com/android/dialer/app/res/drawable/seekbar_drawable.xml
+++ b/java/com/android/dialer/app/res/drawable/seekbar_drawable.xml
@@ -19,7 +19,7 @@
       <item android:id="@android:id/background">
         <shape android:shape="line">
           <stroke
-            android:color="@color/voicemail_playback_seek_bar_yet_to_play"
+            android:color="@color/dialer_divider_line_color"
             android:width="2dip"
             />
         </shape>
@@ -29,7 +29,7 @@
         <clip>
           <shape android:shape="line">
             <stroke
-              android:color="@color/voicemail_playback_seek_bar_already_played"
+              android:color="?android:attr/colorPrimary"
               android:width="2dip"
               />
           </shape>
@@ -42,7 +42,7 @@
       <item android:id="@android:id/background">
         <shape android:shape="line">
           <stroke
-            android:color="@color/voicemail_playback_seek_bar_yet_to_play"
+            android:color="@color/dialer_divider_line_color"
             android:width="2dip"
             />
         </shape>
@@ -52,7 +52,7 @@
         <clip>
           <shape android:shape="line">
             <stroke
-              android:color="@color/voicemail_playback_seek_bar_yet_to_play"
+              android:color="@color/dialer_divider_line_color"
               android:width="2dip"
               />
           </shape>
diff --git a/java/com/android/dialer/app/res/drawable/selectable_primary_flat_button.xml b/java/com/android/dialer/app/res/drawable/selectable_primary_flat_button.xml
index 47d1152..2a393a5 100644
--- a/java/com/android/dialer/app/res/drawable/selectable_primary_flat_button.xml
+++ b/java/com/android/dialer/app/res/drawable/selectable_primary_flat_button.xml
@@ -25,7 +25,7 @@
   </item>
   <item>
     <shape>
-      <solid android:color="@color/dialer_theme_color"/>
+      <solid android:color="?android:attr/colorPrimary"/>
     </shape>
   </item>
 </selector>
\ No newline at end of file
diff --git a/java/com/android/dialer/app/res/layout-land/empty_content_view_dialpad_search.xml b/java/com/android/dialer/app/res/layout-land/empty_content_view_dialpad_search.xml
index 59d1363..bf2a816 100644
--- a/java/com/android/dialer/app/res/layout-land/empty_content_view_dialpad_search.xml
+++ b/java/com/android/dialer/app/res/layout-land/empty_content_view_dialpad_search.xml
@@ -41,8 +41,7 @@
       android:paddingLeft="16dp"
       android:paddingRight="16dp"
       android:gravity="center_horizontal|top"
-      android:textColor="@color/empty_list_text_color"
-      android:textSize="@dimen/empty_list_message_text_size"/>
+      style="Dialer.TextAppearance.Primary"/>
 
     <TextView
       android:id="@+id/empty_list_view_action"
diff --git a/java/com/android/dialer/app/res/layout/all_contacts_fragment.xml b/java/com/android/dialer/app/res/layout/all_contacts_fragment.xml
deleted file mode 100644
index 422c529..0000000
--- a/java/com/android/dialer/app/res/layout/all_contacts_fragment.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  android:id="@+id/pinned_header_list_layout"
-  android:layout_width="match_parent"
-  android:layout_height="match_parent"
-  android:orientation="vertical">
-
-  <!-- Shown only when an Account filter is set.
-       - paddingTop should be here to show "shade" effect correctly. -->
-  <!-- TODO: Remove the filter header. -->
-  <include layout="@layout/account_filter_header"/>
-
-  <FrameLayout
-    android:layout_width="match_parent"
-    android:layout_height="0dip"
-    android:layout_weight="1">
-    <view
-      android:id="@android:id/list"
-      style="@style/DialtactsTheme"
-      class="com.android.contacts.common.list.PinnedHeaderListView"
-      android:layout_width="match_parent"
-      android:layout_height="match_parent"
-      android:layout_marginStart="?attr/contact_browser_list_padding_left"
-      android:layout_marginEnd="?attr/contact_browser_list_padding_right"
-      android:paddingTop="18dp"
-      android:fadingEdge="none"
-      android:fastScrollEnabled="true"
-      android:nestedScrollingEnabled="true"
-      android:cropToPadding="false"
-      android:clipToPadding="false"/>
-
-    <com.android.dialer.widget.EmptyContentView
-      android:id="@+id/empty_list_view"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:layout_gravity="center"
-      android:visibility="gone"/>
-
-  </FrameLayout>
-</LinearLayout>
diff --git a/java/com/android/dialer/app/res/layout/blocked_number_footer.xml b/java/com/android/dialer/app/res/layout/blocked_number_footer.xml
index 9e05cfb..2d36860 100644
--- a/java/com/android/dialer/app/res/layout/blocked_number_footer.xml
+++ b/java/com/android/dialer/app/res/layout/blocked_number_footer.xml
@@ -32,7 +32,6 @@
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
       android:text="@string/block_number_footer_message_vvm"
-      android:textColor="@color/blocked_number_secondary_text_color"
-      android:textSize="@dimen/blocked_number_settings_description_text_size"/>
+      style="@style/Dialer.TextAppearance.Secondary"/>
   </LinearLayout>
 </LinearLayout>
diff --git a/java/com/android/dialer/app/res/layout/blocked_number_fragment.xml b/java/com/android/dialer/app/res/layout/blocked_number_fragment.xml
index 745b913..22dcfef 100644
--- a/java/com/android/dialer/app/res/layout/blocked_number_fragment.xml
+++ b/java/com/android/dialer/app/res/layout/blocked_number_fragment.xml
@@ -17,7 +17,7 @@
   android:id="@+id/blocked_number_fragment"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
-  android:background="@color/blocked_number_background"
+  android:background="?android:attr/colorBackground"
   android:orientation="vertical">
 
   <ListView
diff --git a/java/com/android/dialer/app/res/layout/blocked_number_header.xml b/java/com/android/dialer/app/res/layout/blocked_number_header.xml
index e34510b..27b624c 100644
--- a/java/com/android/dialer/app/res/layout/blocked_number_header.xml
+++ b/java/com/android/dialer/app/res/layout/blocked_number_header.xml
@@ -29,7 +29,7 @@
     android:paddingBottom="29dp"
     android:paddingStart="@dimen/blocked_number_container_padding"
     android:paddingEnd="44dp"
-    android:background="@color/blocked_number_disabled_emergency_background_color"
+    android:background="?android:attr/colorBackground"
     android:focusable="true"
     android:orientation="vertical"
     android:visibility="gone">
@@ -69,7 +69,7 @@
         android:paddingStart="@dimen/blocked_number_container_padding"
         android:gravity="center_vertical"
         android:text="@string/block_list"
-        android:textColor="@color/blocked_number_header_color"/>
+        android:textColor="?android:attr/textColorPrimary"/>
 
       <RelativeLayout
         android:id="@+id/import_settings"
@@ -88,7 +88,7 @@
           android:paddingStart="@dimen/blocked_number_container_padding"
           android:paddingEnd="@dimen/blocked_number_container_padding"
           android:text="@string/blocked_call_settings_import_description"
-          android:textColor="@color/secondary_text_color"
+          android:textColor="?colorIcon"
           android:textSize="@dimen/blocked_number_settings_description_text_size"/>
 
         <Button
@@ -116,7 +116,7 @@
           android:layout_height="1dp"
           android:layout_marginTop="8dp"
           android:layout_below="@id/import_button"
-          android:background="@color/divider_line_color"/>
+          android:background="@color/dialer_divider_line_color"/>
 
       </RelativeLayout>
 
@@ -138,7 +138,7 @@
           android:paddingEnd="@dimen/blocked_number_container_padding"
           android:gravity="center_vertical"
           android:text="@string/migrate_blocked_numbers_dialog_title"
-          android:textColor="@color/blocked_number_header_color"/>
+          android:textColor="?android:attr/textColorPrimary"/>
 
         <TextView
           android:id="@+id/migrate_promo_description"
@@ -148,7 +148,7 @@
           android:layout_marginStart="@dimen/blocked_number_container_padding"
           android:layout_marginEnd="@dimen/blocked_number_container_padding"
           android:text="@string/migrate_blocked_numbers_dialog_message"
-          android:textColor="@color/secondary_text_color"/>
+          android:textColor="?colorIcon"/>
 
         <Button
           android:id="@+id/migrate_promo_allow_button"
@@ -166,52 +166,12 @@
 
       </LinearLayout>
 
-      <LinearLayout
-        android:id="@+id/add_number_linear_layout"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingTop="@dimen/blocked_number_add_top_margin"
-        android:paddingBottom="@dimen/blocked_number_add_bottom_margin"
-        android:paddingStart="@dimen/blocked_number_horizontal_margin"
-        android:background="?android:attr/selectableItemBackground"
-        android:baselineAligned="false"
-        android:clickable="true"
-        android:contentDescription="@string/addBlockedNumber"
-        android:focusable="true"
-        android:gravity="center_vertical"
-        android:orientation="horizontal">
-
-        <ImageView
-          android:id="@+id/add_number_icon"
-          android:layout_width="@dimen/contact_photo_size"
-          android:layout_height="@dimen/contact_photo_size"
-          android:importantForAccessibility="no"/>
-        <LinearLayout
-          android:layout_width="0dp"
-          android:layout_height="wrap_content"
-          android:layout_weight="1"
-          android:layout_marginStart="@dimen/blocked_number_horizontal_margin"
-          android:gravity="center_vertical"
-          android:orientation="vertical">
-
-          <TextView
-            android:id="@+id/add_number_textview"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:includeFontPadding="false"
-            android:text="@string/addBlockedNumber"
-            android:textColor="@color/blocked_number_primary_text_color"
-            android:textSize="@dimen/blocked_number_primary_text_size"/>
-        </LinearLayout>
-
-      </LinearLayout>
-
       <View
         android:id="@+id/blocked_number_list_divider"
         android:layout_width="match_parent"
         android:layout_height="1dp"
         android:layout_marginStart="72dp"
-        android:background="@color/divider_line_color"/>
+        android:background="@color/dialer_divider_line_color"/>
 
     </LinearLayout>
 
diff --git a/java/com/android/dialer/app/res/layout/blocked_number_item.xml b/java/com/android/dialer/app/res/layout/blocked_number_item.xml
index 92ebdc3..921c476 100644
--- a/java/com/android/dialer/app/res/layout/blocked_number_item.xml
+++ b/java/com/android/dialer/app/res/layout/blocked_number_item.xml
@@ -45,17 +45,13 @@
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:includeFontPadding="false"
-      android:singleLine="true"
-      android:textColor="@color/blocked_number_primary_text_color"
-      android:textSize="@dimen/blocked_number_primary_text_size"/>
+      style="@style/Dialer.TextAppearance.Primary.Ellipsize"/>
 
     <TextView
       android:id="@+id/caller_number"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:singleLine="true"
-      android:textColor="@color/blocked_number_secondary_text_color"
-      android:textSize="@dimen/blocked_number_settings_description_text_size"/>
+      style="@style/Dialer.TextAppearance.Secondary.Ellipsize"/>
   </LinearLayout>
 
   <ImageView
@@ -67,6 +63,5 @@
     android:contentDescription="@string/description_blocked_number_list_delete"
     android:scaleType="center"
     android:src="@drawable/ic_remove"
-    android:tint="@color/blocked_number_icon_tint"/>
-
+    android:tint="?colorIcon"/>
 </LinearLayout>
diff --git a/java/com/android/dialer/app/res/layout/call_log_activity.xml b/java/com/android/dialer/app/res/layout/call_log_activity.xml
index a5e5326..4b3c1e0 100644
--- a/java/com/android/dialer/app/res/layout/call_log_activity.xml
+++ b/java/com/android/dialer/app/res/layout/call_log_activity.xml
@@ -18,7 +18,7 @@
     android:id="@+id/calllog_frame"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/background_dialer_light"
+    android:background="?android:attr/colorBackground"
     android:orientation="vertical">
   <com.android.contacts.common.list.ViewPagerTabs
       android:id="@+id/viewpager_header"
diff --git a/java/com/android/dialer/app/res/layout/call_log_fragment.xml b/java/com/android/dialer/app/res/layout/call_log_fragment.xml
index efc08fb..bf91a3a 100644
--- a/java/com/android/dialer/app/res/layout/call_log_fragment.xml
+++ b/java/com/android/dialer/app/res/layout/call_log_fragment.xml
@@ -16,6 +16,7 @@
 
 <!-- Layout parameters are set programmatically. -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+  android:id="@+id/call_log_fragment_root"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
   android:orientation="vertical">
@@ -25,7 +26,7 @@
       android:layout_width="match_parent"
       android:layout_height="@dimen/tab_height"
       android:layout_gravity="start"
-      android:background="@color/actionbar_background_color"
+      android:background="?android:attr/colorPrimary"
       android:orientation="horizontal"
       android:visibility="gone">
 
@@ -46,8 +47,7 @@
         android:gravity="center_vertical"
         android:text="@string/select_all"
         android:textAllCaps="true"
-        android:textStyle="bold"
-        android:textColor="@color/remove_text_color"
+        android:textColor="?android:attr/textColorPrimaryInverse"
         android:textSize="@dimen/select_all_text_size"/>
   </LinearLayout>
 
diff --git a/java/com/android/dialer/app/res/layout/call_log_list_item.xml b/java/com/android/dialer/app/res/layout/call_log_list_item.xml
index acaa820..c9c1a67 100644
--- a/java/com/android/dialer/app/res/layout/call_log_list_item.xml
+++ b/java/com/android/dialer/app/res/layout/call_log_list_item.xml
@@ -29,11 +29,9 @@
     android:layout_gravity="start"
     android:layout_marginStart="@dimen/call_log_start_margin"
     android:layout_marginEnd="@dimen/call_log_outer_margin"
-    android:fontFamily="sans-serif-medium"
-    android:textColor="@color/call_log_day_group_heading_color"
-    android:textSize="@dimen/call_log_day_group_heading_size"
     android:paddingTop="@dimen/call_log_day_group_padding_top"
-    android:paddingBottom="@dimen/call_log_day_group_padding_bottom"/>
+    android:paddingBottom="@dimen/call_log_day_group_padding_bottom"
+    style="@style/Dialer.TextAppearance.OVERLINE.Ellipsize"/>
 
   <android.support.v7.widget.CardView
     android:id="@+id/call_log_row"
@@ -93,15 +91,13 @@
           android:gravity="center_vertical"
           android:layout_marginStart="@dimen/call_log_list_item_info_margin_start">
 
-          <TextView
+          <com.android.dialer.widget.BidiTextView
             android:id="@+id/name"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginBottom="@dimen/call_log_name_margin_bottom"
             android:layout_marginEnd="@dimen/call_log_icon_margin"
-            android:textColor="@color/call_log_primary_color"
-            android:textSize="@dimen/call_log_primary_text_size"
-            android:maxLines="1"/>
+            style="@style/Dialer.TextAppearance.Primary.Ellipsize"/>
 
           <LinearLayout
             android:id="@+id/call_type"
@@ -131,9 +127,7 @@
               android:layout_height="wrap_content"
               android:layout_marginEnd="@dimen/call_log_icon_margin"
               android:layout_gravity="center_vertical"
-              android:textColor="@color/call_log_detail_color"
-              android:textSize="@dimen/call_log_detail_text_size"
-              android:maxLines="1"/>
+              style="Dialer.TextAppearance.Secondary.Ellipsize"/>
 
           </LinearLayout>
 
@@ -143,10 +137,8 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/call_log_call_account_margin_bottom"
             android:layout_marginEnd="@dimen/call_log_icon_margin"
-            android:textColor="?android:textColorSecondary"
-            android:textSize="@dimen/call_log_detail_text_size"
             android:visibility="gone"
-            android:maxLines="1"/>
+            style="Dialer.TextAppearance.Secondary2.Ellipsize"/>
 
           <LinearLayout
             android:id="@+id/transcription"
@@ -160,22 +152,20 @@
               android:id="@+id/voicemail_transcription"
               android:layout_width="wrap_content"
               android:layout_height="wrap_content"
-              android:textColor="@color/call_log_voicemail_transcript_color"
-              android:textSize="@dimen/call_log_voicemail_transcription_text_size"
               android:focusable="true"
               android:nextFocusDown="@+id/voicemail_transcription_branding"
-              android:textIsSelectable="true"/>
+              android:textIsSelectable="true"
+              style="Dialer.TextAppearance.Secondary2"/>
 
             <TextView
               android:id="@+id/voicemail_transcription_branding"
               android:layout_width="wrap_content"
               android:layout_height="wrap_content"
-              android:textColor="@color/call_log_voicemail_transcript_branding_color"
-              android:textSize="@dimen/call_log_voicemail_transcription_text_size"
               android:focusable="true"
               android:nextFocusUp="@id/voicemail_transcription"
               android:nextFocusDown="@+id/voicemail_transcription_rating"
-              android:paddingTop="2dp"/>
+              android:paddingTop="2dp"
+              style="Dialer.TextAppearance.Secondary2"/>
 
             <LinearLayout
                 android:id="@+id/voicemail_transcription_rating"
@@ -230,7 +220,7 @@
           android:layout_gravity="center_vertical"
           android:background="?android:attr/selectableItemBackgroundBorderless"
           android:scaleType="center"
-          android:tint="@color/call_log_list_item_primary_action_icon_tint"
+          android:tint="?colorIcon"
           android:visibility="gone"/>
 
       </LinearLayout>
diff --git a/java/com/android/dialer/app/res/layout/call_log_list_item_actions.xml b/java/com/android/dialer/app/res/layout/call_log_list_item_actions.xml
index 7df0d15..7f24594 100644
--- a/java/com/android/dialer/app/res/layout/call_log_list_item_actions.xml
+++ b/java/com/android/dialer/app/res/layout/call_log_list_item_actions.xml
@@ -31,7 +31,7 @@
   <View
     android:layout_width="match_parent"
     android:layout_height="1dp"
-    android:background="@color/call_log_action_divider"/>
+    android:background="@color/dialer_divider_line_color"/>
 
   <LinearLayout
     android:id="@+id/call_action"
@@ -64,7 +64,7 @@
 
     <ImageView
       style="@style/CallLogActionIconStyle"
-      android:src="@drawable/quantum_ic_videocam_white_24"/>
+      android:src="@drawable/quantum_ic_videocam_vd_white_24"/>
 
     <TextView
       style="@style/CallLogActionTextStyle"
@@ -78,7 +78,7 @@
 
     <ImageView
         style="@style/CallLogActionIconStyle"
-        android:src="@drawable/quantum_ic_videocam_white_24"/>
+        android:src="@drawable/quantum_ic_videocam_vd_white_24"/>
 
     <TextView
         style="@style/CallLogActionTextStyle"
@@ -92,7 +92,7 @@
 
     <ImageView
         style="@style/CallLogActionIconStyle"
-        android:src="@drawable/quantum_ic_videocam_white_24"/>
+        android:src="@drawable/quantum_ic_videocam_vd_white_24"/>
 
     <TextView
         style="@style/CallLogActionTextStyle"
diff --git a/java/com/android/dialer/app/res/layout/dialtacts_activity.xml b/java/com/android/dialer/app/res/layout/dialtacts_activity.xml
index 1627844..f8e3000 100644
--- a/java/com/android/dialer/app/res/layout/dialtacts_activity.xml
+++ b/java/com/android/dialer/app/res/layout/dialtacts_activity.xml
@@ -19,7 +19,7 @@
   android:id="@+id/dialtacts_mainlayout"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
-  android:background="@color/background_dialer_light"
+  android:background="?android:attr/colorBackground"
   android:clipChildren="false"
   android:clipToPadding="false"
   android:focusable="true"
@@ -48,7 +48,7 @@
       android:contentDescription="@string/action_menu_dialpad_button"
       android:src="@drawable/quantum_ic_dialpad_white_24"
       app:elevation="@dimen/floating_action_button_translation_z"
-      app:backgroundTint="@color/dialer_secondary_color"/>
+      app:backgroundTint="?android:attr/colorAccent"/>
 
   <!-- Host container for the contact tile drag shadow -->
   <FrameLayout
diff --git a/java/com/android/dialer/app/res/layout/empty_content_view_dialpad_search.xml b/java/com/android/dialer/app/res/layout/empty_content_view_dialpad_search.xml
index 1d20479..d5f315e 100644
--- a/java/com/android/dialer/app/res/layout/empty_content_view_dialpad_search.xml
+++ b/java/com/android/dialer/app/res/layout/empty_content_view_dialpad_search.xml
@@ -28,12 +28,11 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:gravity="center_horizontal|top"
-    android:textSize="@dimen/empty_list_message_text_size"
-    android:textColor="@color/empty_list_text_color"
     android:paddingRight="16dp"
     android:paddingLeft="16dp"
     android:paddingTop="8dp"
-    android:paddingBottom="8dp"/>
+    android:paddingBottom="8dp"
+    style="@style/Dialer.TextAppearance.Primary.Ellipsize"/>
 
   <TextView
     android:id="@+id/empty_list_view_action"
diff --git a/java/com/android/dialer/app/res/layout/keyguard_preview.xml b/java/com/android/dialer/app/res/layout/keyguard_preview.xml
index eab98d2..e5207ac 100644
--- a/java/com/android/dialer/app/res/layout/keyguard_preview.xml
+++ b/java/com/android/dialer/app/res/layout/keyguard_preview.xml
@@ -23,7 +23,7 @@
   <View
     android:layout_width="match_parent"
     android:layout_height="25dp"
-    android:background="@color/dialer_theme_color_dark"/>
+    android:background="?android:attr/colorPrimaryDark"/>
   <View
     android:layout_width="match_parent"
     android:layout_height="0dp"
diff --git a/java/com/android/dialer/app/res/layout/lists_fragment.xml b/java/com/android/dialer/app/res/layout/lists_fragment.xml
index 9596172..6be1fe0 100644
--- a/java/com/android/dialer/app/res/layout/lists_fragment.xml
+++ b/java/com/android/dialer/app/res/layout/lists_fragment.xml
@@ -32,7 +32,7 @@
     <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="@dimen/action_bar_height_large"
-        android:background="@color/actionbar_background_color"
+        android:background="?android:attr/colorPrimary"
         android:elevation="@dimen/tab_elevation"/>
 
     <com.android.contacts.common.list.ViewPagerTabs
@@ -69,7 +69,7 @@
         android:id="@+id/remove_view_content"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/actionbar_background_color"
+        android:background="?android:attr/colorPrimary"
         android:gravity="center"
         android:orientation="horizontal"
         android:visibility="gone">
@@ -81,15 +81,15 @@
           android:layout_marginTop="8dp"
           android:layout_marginBottom="8dp"
           android:src="@drawable/ic_remove"
-          android:tint="@color/remove_text_color"/>
+          android:tint="?colorTextOnUnthemedDarkBackground"/>
 
       <TextView
           android:id="@+id/remove_view_text"
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"
           android:text="@string/remove_contact"
-          android:textColor="@color/remove_text_color"
-          android:textSize="@dimen/remove_text_size"/>
+          android:textColor="?colorTextOnUnthemedDarkBackground"
+          style="@style/Dialer.TextAppearance.Primary"/>
 
     </LinearLayout>
 
diff --git a/java/com/android/dialer/app/res/layout/phone_favorite_tile_view.xml b/java/com/android/dialer/app/res/layout/phone_favorite_tile_view.xml
index d2712e9..df7ce5c 100644
--- a/java/com/android/dialer/app/res/layout/phone_favorite_tile_view.xml
+++ b/java/com/android/dialer/app/res/layout/phone_favorite_tile_view.xml
@@ -63,7 +63,7 @@
           android:layout_height="wrap_content"
           android:gravity="center_vertical"
           android:orientation="horizontal">
-        <TextView
+        <com.android.dialer.widget.BidiTextView
             android:id="@+id/contact_tile_name"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -74,7 +74,7 @@
             android:fontFamily="sans-serif-medium"
             android:singleLine="true"
             android:textAlignment="viewStart"
-            android:textColor="@color/contact_tile_name_color"
+            android:textColor="?colorTextOnUnthemedDarkBackground"
             android:textSize="15sp"/>
         <ImageView
             android:id="@+id/contact_star_icon"
@@ -95,7 +95,7 @@
           android:gravity="center_vertical"
           android:singleLine="true"
           android:textAlignment="viewStart"
-          android:textColor="@color/contact_tile_name_color"
+          android:textColor="?colorTextOnUnthemedDarkBackground"
           android:textSize="11sp"/>
     </LinearLayout>
 
@@ -103,7 +103,7 @@
         android:id="@+id/contact_tile_push_state"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@drawable/item_background_material_dark"
+        android:background="?android:selectableItemBackground"
         android:importantForAccessibility="no"/>
 
     <!-- Wrap the ImageButton in a layout with a transparent background so the ripple has something to draw on -->
diff --git a/java/com/android/dialer/app/res/layout/search_edittext.xml b/java/com/android/dialer/app/res/layout/search_edittext.xml
index 5fc492d..aba5ba8 100644
--- a/java/com/android/dialer/app/res/layout/search_edittext.xml
+++ b/java/com/android/dialer/app/res/layout/search_edittext.xml
@@ -31,7 +31,7 @@
     android:id="@+id/search_box_collapsed"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?android:selectableItemBackground"
+    android:background="?android:attr/selectableItemBackground"
     android:gravity="center_vertical">
 
     <ImageView
@@ -43,7 +43,7 @@
       android:importantForAccessibility="no"
       android:scaleType="center"
       android:src="@drawable/quantum_ic_search_vd_theme_24"
-      android:tint="@color/searchbox_icon_tint"/>
+      android:tint="?colorIcon"/>
 
     <TextView
       android:id="@+id/search_box_start_search"
@@ -55,7 +55,6 @@
       android:fontFamily="@string/search_font_family"
       android:gravity="center_vertical"
       android:hint="@string/dialer_hint_find_contact"
-      android:textColorHint="@color/searchbox_hint_text_color"
       android:textSize="@dimen/search_collapsed_text_size"/>
 
     <ImageView
@@ -68,7 +67,7 @@
       android:contentDescription="@string/description_start_voice_search"
       android:scaleType="center"
       android:src="@drawable/ic_mic_grey600"
-      android:tint="@color/searchbox_icon_tint"/>
+      android:tint="?colorIcon"/>
 
     <ImageButton
       android:id="@+id/dialtacts_options_menu_button"
@@ -79,7 +78,7 @@
       android:contentDescription="@string/action_menu_overflow_description"
       android:scaleType="center"
       android:src="@drawable/quantum_ic_more_vert_white_24"
-      android:tint="@color/searchbox_icon_tint"/>
+      android:tint="?colorIcon"/>
   </RelativeLayout>
 
   <include layout="@layout/search_bar_expanded"/>
diff --git a/java/com/android/dialer/app/res/layout/view_numbers_to_import_fragment.xml b/java/com/android/dialer/app/res/layout/view_numbers_to_import_fragment.xml
index be69174..e821c06 100644
--- a/java/com/android/dialer/app/res/layout/view_numbers_to_import_fragment.xml
+++ b/java/com/android/dialer/app/res/layout/view_numbers_to_import_fragment.xml
@@ -16,7 +16,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
-  android:background="@color/blocked_number_background"
+  android:background="?android:attr/colorBackground"
   android:orientation="vertical">
 
   <ListView
diff --git a/java/com/android/dialer/app/res/layout/voicemail_playback_layout.xml b/java/com/android/dialer/app/res/layout/voicemail_playback_layout.xml
index 2589a67..c352e02 100644
--- a/java/com/android/dialer/app/res/layout/voicemail_playback_layout.xml
+++ b/java/com/android/dialer/app/res/layout/voicemail_playback_layout.xml
@@ -20,7 +20,7 @@
   android:layout_height="wrap_content"
   android:layout_marginStart="64dp"
   android:layout_marginEnd="24dp"
-  android:background="@color/background_dialer_call_log_list_item"
+  android:background="?android:attr/colorBackgroundFloating"
   android:orientation="vertical">
 
   <TextView
@@ -28,7 +28,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:gravity="center"
-    android:textSize="14sp"/>
+    style="@style/Dialer.TextAppearance.Secondary"/>
 
   <LinearLayout
     android:layout_width="match_parent"
@@ -42,7 +42,7 @@
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:importantForAccessibility="no"
-      android:textSize="14sp"/>
+      style="@style/Dialer.TextAppearance.Secondary"/>
 
     <SeekBar
       android:id="@+id/playback_seek"
@@ -60,7 +60,7 @@
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:importantForAccessibility="no"
-      android:textSize="14sp"/>
+      style="@style/Dialer.TextAppearance.Secondary"/>
 
   </LinearLayout>
 
@@ -80,7 +80,7 @@
       style="@style/VoicemailPlaybackLayoutButtonStyle"
       android:contentDescription="@string/description_playback_speakerphone"
       android:src="@drawable/quantum_ic_volume_down_white_24"
-      android:tint="@color/voicemail_icon_tint"/>
+      android:tint="?colorIcon"/>
 
     <Space
       android:layout_width="0dp"
@@ -103,7 +103,7 @@
       style="@style/VoicemailPlaybackLayoutButtonStyle"
       android:contentDescription="@string/call_log_trash_voicemail"
       android:src="@drawable/quantum_ic_delete_white_24"
-      android:tint="@color/voicemail_icon_tint"/>
+      android:tint="?colorIcon"/>
 
     <Space
       android:layout_width="0dp"
diff --git a/java/com/android/dialer/app/res/menu/dialtacts_options.xml b/java/com/android/dialer/app/res/menu/dialtacts_options.xml
index b50e6ad..fcd520a 100644
--- a/java/com/android/dialer/app/res/menu/dialtacts_options.xml
+++ b/java/com/android/dialer/app/res/menu/dialtacts_options.xml
@@ -28,8 +28,4 @@
   <item
     android:id="@+id/menu_simulator_submenu"
     android:title="@string/simulator_submenu_label"/>
-  <item
-      android:id="@+id/menu_new_ui_launcher_shortcut"
-      android:title="@string/new_ui_launcher_shortcut_label"/>
-
 </menu>
diff --git a/java/com/android/dialer/app/res/mipmap-hdpi/ic_launcher_phone.png b/java/com/android/dialer/app/res/mipmap-hdpi/ic_launcher_phone.png
index 15c4142..0d1769a 100644
--- a/java/com/android/dialer/app/res/mipmap-hdpi/ic_launcher_phone.png
+++ b/java/com/android/dialer/app/res/mipmap-hdpi/ic_launcher_phone.png
Binary files differ
diff --git a/java/com/android/dialer/app/res/mipmap-mdpi/ic_launcher_phone.png b/java/com/android/dialer/app/res/mipmap-mdpi/ic_launcher_phone.png
index 3088f75..667fc5d 100644
--- a/java/com/android/dialer/app/res/mipmap-mdpi/ic_launcher_phone.png
+++ b/java/com/android/dialer/app/res/mipmap-mdpi/ic_launcher_phone.png
Binary files differ
diff --git a/java/com/android/dialer/app/res/mipmap-xhdpi/ic_launcher_phone.png b/java/com/android/dialer/app/res/mipmap-xhdpi/ic_launcher_phone.png
index e87de01..2298d0d 100644
--- a/java/com/android/dialer/app/res/mipmap-xhdpi/ic_launcher_phone.png
+++ b/java/com/android/dialer/app/res/mipmap-xhdpi/ic_launcher_phone.png
Binary files differ
diff --git a/java/com/android/dialer/app/res/mipmap-xxhdpi/ic_launcher_phone.png b/java/com/android/dialer/app/res/mipmap-xxhdpi/ic_launcher_phone.png
index b866b79..b269b5a 100644
--- a/java/com/android/dialer/app/res/mipmap-xxhdpi/ic_launcher_phone.png
+++ b/java/com/android/dialer/app/res/mipmap-xxhdpi/ic_launcher_phone.png
Binary files differ
diff --git a/java/com/android/dialer/app/res/mipmap-xxxhdpi/ic_launcher_phone.png b/java/com/android/dialer/app/res/mipmap-xxxhdpi/ic_launcher_phone.png
index 26f51f1..dbc76f3 100644
--- a/java/com/android/dialer/app/res/mipmap-xxxhdpi/ic_launcher_phone.png
+++ b/java/com/android/dialer/app/res/mipmap-xxxhdpi/ic_launcher_phone.png
Binary files differ
diff --git a/java/com/android/dialer/app/res/values-af/strings.xml b/java/com/android/dialer/app/res/values-af/strings.xml
index 2df9c4f..0888327 100644
--- a/java/com/android/dialer/app/res/values-af/strings.xml
+++ b/java/com/android/dialer/app/res/values-af/strings.xml
@@ -1,179 +1,171 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="applicationLabel" msgid="2202739481132958990">"Foon"</string>
-    <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"Foonsleutelblok"</string>
-    <string name="callHistoryIconLabel" msgid="7493268743411968630">"Oproepgeskiedenis"</string>
-    <string name="action_copy_number_text" msgid="832682558551502319">"Kopieer nommer"</string>
-    <string name="copy_transcript_text" msgid="937904189017310829">"Kopieer transkripsie"</string>
-    <string name="action_edit_number_before_call" msgid="8017492815878473837">"Wysig nommer voor oproep"</string>
-    <string name="call_log_delete_all" msgid="7852970926906523784">"Vee oproepgeskiedenis uit"</string>
-    <string name="call_log_trash_voicemail" msgid="6118493534178533972">"Vee stemboodskap uit"</string>
-    <string name="snackbar_voicemail_deleted" msgid="7463166543725496307">"Stemboodskap is uitgevee"</string>
-    <string name="snackbar_voicemail_deleted_undo" msgid="6959743982796409941">"ONTDOEN"</string>
-    <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"Vee oproepgeskiedenis uit?"</string>
-    <string name="clearCallLogConfirmation" msgid="6844949465815109166">"Dit sal alle oproepe uit jou geskiedenis vee"</string>
-    <string name="clearCallLogProgress_title" msgid="995004835687361977">"Vee tans oproepgeskiedenis uit …"</string>
-    <string name="notification_missedCallTitle" msgid="8283366068539898486">"Gemiste oproep"</string>
-    <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"Gemiste werkoproep"</string>
-    <string name="notification_missedCallsTitle" msgid="3697442015345089802">"Gemiste oproepe"</string>
-    <string name="notification_missedCallsMsg" msgid="8176217633929018706">"<xliff:g id="NUM_MISSED_CALLS">%d</xliff:g> gemiste oproepe"</string>
-    <string name="notification_missedCall_call_back" msgid="3875698110051973965">"Bel terug"</string>
-    <string name="notification_missedCall_message" msgid="5086910028988305964">"Boodskap"</string>
-    <string name="post_call_notification_message" msgid="5417476789860590611">"<xliff:g id="NAME">%1$s</xliff:g>: <xliff:g id="MESSAGE">%2$s</xliff:g>"</string>
-    <string name="notification_voicemail_text_format" msgid="1895667520930252897">"Bel <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
-    <string name="notification_voicemail_no_vm_number" msgid="8942821987929495842">"Stemboodskapnommer onbekend"</string>
-    <plurals name="notification_voicemail_title" formatted="false" msgid="1551847434476438657">
-      <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> Stemboodskappe </item>
-      <item quantity="one">Stemboodskap</item>
-    </plurals>
-    <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
-    <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"Nuwe stemboodskap van <xliff:g id="CALLER">%1$s</xliff:g>"</string>
-    <string name="voicemail_playback_error" msgid="4384373852257757295">"Kon nie stemboodskap speel nie"</string>
-    <string name="voicemail_fetching_content" msgid="572320120918636014">"Laai tans stemboodskap …"</string>
-    <string name="voicemail_fetching_timout" msgid="2128873915839949783">"Kon nie stemboodskap laai nie"</string>
-    <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>)<xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_playback_speakerphone" msgid="4852027754869750227">"Skakel luidsprekerfoon aan of af"</string>
-    <string name="description_playback_seek" msgid="1340910573254132520">"Soek terugspeelposisie"</string>
-    <string name="action_menu_call_history_description" msgid="8829135306925008546">"Oproepgeskiedenis"</string>
-    <string name="action_menu_overflow_description" msgid="7648679686746517341">"Meer opsies"</string>
-    <string name="action_menu_dialpad_button" msgid="1970631633457493180">"sleutelblok"</string>
-    <string name="dialer_settings_label" msgid="4980176284150290175">"Instellings"</string>
-    <string name="simulator_submenu_label" msgid="186156287346615267">"Nabootser"</string>
-    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Skep nuwe UI-kortpad"</string>
-    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"Gaan tans grootmaathandelingmodus in"</string>
-    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"Het grootmaathandelingmodus verlaat"</string>
-    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"Het <xliff:g id="NAMEORNUMBER">%1$s</xliff:g> gekies"</string>
-    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"Het <xliff:g id="NAMEORNUMBER">%1$s</xliff:g> ontkies"</string>
-    <string name="description_contact_details" msgid="3341280873855253464">"Kontakbesonderhede van <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_spam_contact_details" msgid="5592578752881528368">"Kontakbesonderhede vir verdagte strooiposbeller <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> oproepe."</string>
-    <string name="description_video_call" msgid="3738199365585751727">"Video-oproep."</string>
-    <string name="description_start_voice_search" msgid="8380022725973015261">"Begin stemsoektog"</string>
-    <string name="voicemail" msgid="8899540969000957954">"Stemboodskap"</string>
-    <string name="description_cancel_multi_select" msgid="3930475950253360461">"Kanselleer grootmaathandelingmodus"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Vee uit"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Kanselleer"</string>
-    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> gekies"</string>
-    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
-      <item quantity="other">"<b>"Vee hierdie stemboodskappe uit? "</b>"</item>
-      <item quantity="one">"<b>"Vee hierdie stemboodskap uit? "</b>"</item>
-    </plurals>
-    <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
-    <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> om <xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
-    <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="voice_search_not_available" msgid="6546240433719732905">"Stemsoektog is nie beskikbaar nie"</string>
-    <string name="dialer_hint_find_contact" msgid="2023214799381149808">"Deursoek kontakte"</string>
-    <string name="block_number_search_hint" msgid="5377706079015099416">"Gee nommer of soek in kontakte"</string>
-    <string name="call_log_all_empty" msgid="3955572868518162004">"Jou oproepgeskiedenis is leeg"</string>
-    <string name="call_log_all_empty_action" msgid="852218280136243014">"Maak \'n oproep"</string>
-    <string name="call_log_missed_empty" msgid="7094936030845062214">"Jy het geen gemiste oproepe nie."</string>
-    <string name="call_log_voicemail_empty" msgid="273623903423275178">"Jou stemboodskapdiens se inkassie is leeg."</string>
-    <string name="call_log_activity_title" msgid="1275242727244945527">"Oproepgeskiedenis"</string>
-    <string name="call_log_all_title" msgid="6042262422192020327">"Alles"</string>
-    <string name="call_log_missed_title" msgid="17254005889268015">"Gemis"</string>
-    <string name="tab_speed_dial" msgid="6616404752227561075">"Spoedbel"</string>
-    <string name="tab_history" msgid="7420269368689503596">"Oproepgeskiedenis"</string>
-    <string name="tab_all_contacts" msgid="5531733977693943015">"Kontakte"</string>
-    <string name="tab_voicemail" msgid="2458548090088316246">"Stemboodskap"</string>
-    <string name="search_shortcut_call_number" msgid="8847918845036880688">"Bel <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"Skep nuwe kontak"</string>
-    <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"Voeg by \'n kontak"</string>
-    <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"Stuur SMS"</string>
-    <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"Maak video-oproep"</string>
-    <string name="search_shortcut_block_number" msgid="4587283230665805776">"Blokkeer nommer"</string>
-    <string name="speed_dial_empty" msgid="3346406399966039505">"Daar is nog niemand op jou spoedbel nie"</string>
-    <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"Voeg \'n gunsteling by"</string>
-    <string name="remove_contact" msgid="2353580570488923668">"Verwyder"</string>
-    <string name="select_all" msgid="408601760696146245">"Kies alles"</string>
-    <string name="call_log_action_video_call" msgid="7565549950343850819">"Video-oproep"</string>
-    <string name="call_log_action_send_message" msgid="6948727362660115554">"Stuur \'n boodskap"</string>
-    <string name="call_log_action_details" msgid="2091370737371449501">"Oproepbesonderhede"</string>
-    <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"Stuur na …"</string>
-    <string name="call_log_action_call" msgid="682724094251540583">"Bel <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_incoming_missed_call" msgid="8292535799379230029">"Oproep gemis vanaf <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_incoming_answered_call" msgid="3920182963103160610">"Oproep geantwoord vanaf <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_unread_voicemail" msgid="145170985013419170">"Ongeleeste stempos vanaf <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_read_voicemail" msgid="5585559881573227732">"Stempos vanaf <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_outgoing_call" msgid="543952487882919924">"Oproep na <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="call_log_via_number" msgid="1340307109806397650">"via <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> via <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="description_call_action" msgid="4042796498169106545">"Bel <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_video_call_action" msgid="1237090968588659650">"Maak video-oproep na <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
-    <string name="description_voicemail_action" msgid="3290143432403538524">"Luister na stemboodskap vanaf <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_create_new_contact_action" msgid="1928282350281564130">"Skep kontak vir <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"Voeg <xliff:g id="NAMEORNUMBER">^1</xliff:g> by \'n bestaande kontak"</string>
-    <string name="description_details_action" msgid="2061866409737706174">"Oproepbesonderhede vir <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="call_log_header_today" msgid="1576119097475845293">"Vandag"</string>
-    <string name="call_log_header_yesterday" msgid="5616077776205329563">"Gister"</string>
-    <string name="call_log_header_other" msgid="4940676886254217644">"Ouer"</string>
-    <string name="voicemail_speaker_on" msgid="3151333608926996668">"Skakel luidspreker aan."</string>
-    <string name="voicemail_speaker_off" msgid="2530064206962034201">"Skakel luidspreker af."</string>
-    <string name="voicemail_play_start_pause" msgid="3874823480278334664">"Begin of laat wag speel."</string>
-    <string name="display_options_title" msgid="3880091801055797975">"Vertoonopsies"</string>
-    <string name="sounds_and_vibration_title" msgid="3075050000721181384">"Klanke en vibrasie"</string>
-    <string name="accessibility_settings_title" msgid="3329027650429831820">"Toeganklikheid"</string>
-    <string name="ringtone_title" msgid="8377174189894648486">"Foonluitoon"</string>
-    <string name="vibrate_on_ring_title" msgid="631441314790960485">"Vibreer ook vir oproepe"</string>
-    <string name="dtmf_tone_enable_title" msgid="3273762431523939277">"Sleutelbordklanke"</string>
-    <string name="dtmf_tone_length_title" msgid="534096029202438539">"Sleutelbordklanklengte"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="applicationLabel">Foon</string>
+  <string name="launcherDialpadActivityLabel">Foonsleutelblok</string>
+  <string name="callHistoryIconLabel">Oproepgeskiedenis</string>
+  <string name="action_copy_number_text">Kopieer nommer</string>
+  <string name="copy_transcript_text">Kopieer transkripsie</string>
+  <string name="action_edit_number_before_call">Wysig nommer voor oproep</string>
+  <string name="call_log_delete_all">Vee oproepgeskiedenis uit</string>
+  <string name="call_log_trash_voicemail">Vee stemboodskap uit</string>
+  <string name="snackbar_voicemail_deleted">Stemboodskap is uitgevee</string>
+  <string name="clearCallLogConfirmation_title">Vee oproepgeskiedenis uit?</string>
+  <string name="clearCallLogConfirmation">Dit sal alle oproepe uit jou geskiedenis vee</string>
+  <string name="clearCallLogProgress_title">Vee tans oproepgeskiedenis uit …</string>
+  <string name="notification_missedCallTitle">Gemiste oproep</string>
+  <string name="notification_missedWorkCallTitle">Gemiste werkoproep</string>
+  <string name="notification_missedCallsTitle">Gemiste oproepe</string>
+  <string name="notification_missedCallsMsg">%d gemiste oproepe</string>
+  <string name="notification_missedCall_call_back">Bel terug</string>
+  <string name="notification_missedCall_message">Boodskap</string>
+  <string name="post_call_notification_message">%1$s: %2$s</string>
+  <string name="notification_voicemail_text_format">Bel %s</string>
+  <string name="notification_voicemail_no_vm_number">Stemboodskapnommer onbekend</string>
+  <plurals name="notification_voicemail_title">
+    <item quantity="one">Stemboodskap</item>
+    <item quantity="other"> %1$d Stemboodskappe </item>
+  </plurals>
+  <string name="notification_voicemail_callers_list">%1$s, %2$s</string>
+  <string name="notification_new_voicemail_ticker">Nuwe stemboodskap van %1$s</string>
+  <string name="voicemail_playback_error">Kon nie stemboodskap speel nie</string>
+  <string name="voicemail_fetching_content">Laai tans stemboodskap …</string>
+  <string name="voicemail_fetching_timout">Kon nie stemboodskap laai nie</string>
+  <string name="call_log_item_count_and_date">(%1$d)%2$s</string>
+  <string name="description_playback_speakerphone">Skakel luidsprekerfoon aan of af</string>
+  <string name="description_playback_seek">Soek terugspeelposisie</string>
+  <string name="action_menu_call_history_description">Oproepgeskiedenis</string>
+  <string msgid="2295659037509008453" name="action_menu_overflow_description">Meer opsies</string>
+  <string name="action_menu_dialpad_button">sleutelblok</string>
+  <string name="dialer_settings_label">Instellings</string>
+  <string name="simulator_submenu_label">Nabootser</string>
+  <string name="new_ui_launcher_shortcut_label">Skep nuwe UI-kortpad</string>
+  <string name="description_entering_bulk_action_mode">Gaan tans grootmaathandelingmodus in</string>
+  <string name="description_leaving_bulk_action_mode">Het grootmaathandelingmodus verlaat</string>
+  <string name="description_selecting_bulk_action_mode">Het %1$s gekies</string>
+  <string name="description_unselecting_bulk_action_mode">Het %1$s ontkies</string>
+  <string name="description_contact_details">Kontakbesonderhede van %1$s</string>
+  <string name="description_spam_contact_details">Kontakbesonderhede vir verdagte strooiposbeller %1$s</string>
+  <string name="description_num_calls">%1$s oproepe.</string>
+  <string name="description_video_call">Video-oproep.</string>
+  <string name="description_start_voice_search">Begin stemsoektog</string>
+  <string name="voicemail">Stemboodskap</string>
+  <string name="description_cancel_multi_select">Kanselleer grootmaathandelingmodus</string>
+  <string name="voicemailMultiSelectDeleteConfirm">Vee uit</string>
+  <string name="voicemailMultiSelectDeleteCancel">Kanselleer</string>
+  <string name="voicemailMultiSelectActionBarTitle">%1$s gekies</string>
+  <plurals name="delete_voicemails_confirmation_dialog_title">
+    <item quantity="one"><b>Vee hierdie stemboodskap uit? </b></item>
+    <item quantity="other"><b>Vee hierdie stemboodskappe uit? </b></item>
+  </plurals>
+  <string name="voicemailCallLogToday">@string/call_log_header_today</string>
+  <string name="voicemailCallLogDateTimeFormat">%1$s om %2$s</string>
+  <string name="voicemailDurationFormat">%1$02d:%2$02d</string>
+  <string name="voicemailCallLogDateTimeFormatWithDuration">%1$s • %2$s</string>
+  <string name="voice_search_not_available">Stemsoektog is nie beskikbaar nie</string>
+  <string name="dialer_hint_find_contact">Deursoek kontakte</string>
+  <string name="block_number_search_hint">Gee nommer of soek in kontakte</string>
+  <string name="call_log_all_empty">Jou oproepgeskiedenis is leeg</string>
+  <string name="call_log_all_empty_action">Maak \'n oproep</string>
+  <string name="call_log_missed_empty">Jy het geen gemiste oproepe nie.</string>
+  <string name="call_log_voicemail_empty">Jou stemboodskapdiens se inkassie is leeg.</string>
+  <string name="call_log_activity_title">Oproepgeskiedenis</string>
+  <string name="call_log_all_title">Alles</string>
+  <string name="call_log_missed_title">Gemis</string>
+  <string name="tab_speed_dial">Spoedbel</string>
+  <string name="tab_history">Oproepgeskiedenis</string>
+  <string name="tab_all_contacts">Kontakte</string>
+  <string name="tab_voicemail">Stemboodskap</string>
+  <string name="search_shortcut_call_number">Bel %s</string>
+  <string name="search_shortcut_create_new_contact">Skep nuwe kontak</string>
+  <string name="search_shortcut_add_to_contact">Voeg by \'n kontak</string>
+  <string name="search_shortcut_send_sms_message">Stuur SMS</string>
+  <string name="search_shortcut_make_video_call">Maak video-oproep</string>
+  <string name="search_shortcut_block_number">Blokkeer nommer</string>
+  <string name="speed_dial_empty">Daar is nog niemand op jou spoedbel nie</string>
+  <string name="speed_dial_empty_add_favorite_action">Voeg \'n gunsteling by</string>
+  <string name="remove_contact">Verwyder</string>
+  <string name="select_all">Kies alles</string>
+  <string name="call_log_action_video_call">Video-oproep</string>
+  <string name="call_log_action_set_up_video">Stel video-oproepe op</string>
+  <string name="call_log_action_invite_video">Nooi na video-oproep</string>
+  <string name="call_log_action_send_message">Stuur \'n boodskap</string>
+  <string name="call_log_action_details">Oproepbesonderhede</string>
+  <string name="call_log_action_share_voicemail">Stuur na …</string>
+  <string name="call_log_action_call">Bel ^1</string>
+  <string name="description_incoming_missed_call">Oproep gemis vanaf ^1, ^2, ^3, ^4.</string>
+  <string name="description_incoming_answered_call">Oproep geantwoord vanaf ^1, ^2, ^3, ^4.</string>
+  <string name="description_unread_voicemail">Ongeleeste stempos vanaf ^1, ^2, ^3, ^4.</string>
+  <string name="description_read_voicemail">Stempos vanaf ^1, ^2, ^3, ^4.</string>
+  <string name="description_outgoing_call">Oproep na ^1, ^2, ^3, ^4.</string>
+  <string name="call_log_via_number">via %1$s</string>
+  <string name="call_log_via_number_phone_account">%1$s via %2$s</string>
+  <string name="description_call_action">Bel ^1</string>
+  <string name="description_video_call_action">Maak video-oproep na ^1.</string>
+  <string name="description_voicemail_action">Luister na stemboodskap vanaf ^1</string>
+  <string name="description_create_new_contact_action">Skep kontak vir ^1</string>
+  <string name="description_add_to_existing_contact_action">Voeg ^1 by \'n bestaande kontak</string>
+  <string name="description_details_action">Oproepbesonderhede vir ^1</string>
+  <string name="call_log_header_today">Vandag</string>
+  <string name="call_log_header_yesterday">Gister</string>
+  <string name="call_log_header_other">Ouer</string>
+  <string name="voicemail_speaker_on">Skakel luidspreker aan.</string>
+  <string name="voicemail_speaker_off">Skakel luidspreker af.</string>
+  <string name="voicemail_play_start_pause">Begin of laat wag speel.</string>
+  <string name="display_options_title">Vertoonopsies</string>
+  <string name="sounds_and_vibration_title">Klanke en vibrasie</string>
+  <string name="accessibility_settings_title">Toeganklikheid</string>
+  <string name="ringtone_title">Foonluitoon</string>
+  <string name="vibrate_on_ring_title">Vibreer ook vir oproepe</string>
+  <string name="dtmf_tone_enable_title">Sleutelbordklanke</string>
+  <string name="dtmf_tone_length_title">Sleutelbordklanklengte</string>
   <string-array name="dtmf_tone_length_entries">
-    <item msgid="3136353015227162823">"Normaal"</item>
-    <item msgid="5376841175538523822">"Lank"</item>
+    <item>Normaal</item>
+    <item>Lank</item>
   </string-array>
-    <string name="respond_via_sms_setting_title" msgid="8008181606657693452">"Vinnige antwoorde"</string>
-    <string name="call_settings_label" msgid="7824611757200960807">"Oproepe"</string>
-    <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Oproepblokkering"</string>
-    <string name="voicemail_settings_label" msgid="4594299554519920570">"Stemboodskap"</string>
-    <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Oproepblokkering is tydelik af"</string>
-    <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Oproepblokkering is gedeaktiveer omdat jy die afgelope 48 uur nooddienste van hierdie foon af gekontak het. Dit sal outomaties heraktiveer word sodra die 48-uurtydperk verstryk."</string>
-    <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Voer nommers in"</string>
-    <string name="blocked_call_settings_import_description" msgid="1819412052545228965">"Jy het sommige bellers vroeër gemerk om outomaties via ander programme na stemboodskapdiens gestuur te word."</string>
-    <string name="blocked_call_settings_view_numbers_button" msgid="3332727948554356704">"Bekyk nommers"</string>
-    <string name="blocked_call_settings_import_button" msgid="7319111700387470727">"Voer in"</string>
-    <string name="description_blocked_number_list_delete" msgid="2139644216858370740">"Deblokkeer nommer"</string>
-    <string name="addBlockedNumber" msgid="3053473735238295551">"Voeg nommer by"</string>
-    <string name="block_number_footer_message_vvm" msgid="7955326304033982368">"Oproepe van hierdie nommers af sal geblokkeer word en stemboodskappe sal outomaties uitgevee word."</string>
-    <string name="block_number_footer_message_no_vvm" msgid="1152684139070471665">"Oproepe van hierdie nommers af sal geblokkeer word, maar die bellers sal dalk steeds vir jou stemboodskappe kan los."</string>
-    <string name="block_list" msgid="4701585783411870782">"Geblokkeerde nommers"</string>
-    <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g> is reeds geblokkeer."</string>
-    <string name="phone_account_settings_label" msgid="8372485478006965920">"Oproeprekeninge"</string>
-    <string name="permission_no_speeddial" msgid="8487215628510596753">"Skakel die kontaktetoestemming aan om spoedbel te aktiveer."</string>
-    <string name="permission_no_calllog" msgid="4053705651238775784">"Skakel die foontoestemming aan om jou oproeprekord te sien."</string>
-    <string name="permission_no_search" msgid="2424710404207193826">"Skakel die Kontakte-toestemmings aan om jou kontakte te deursoek."</string>
-    <string name="permission_place_call" msgid="8686908130349369423">"Skakel die foontoestemming aan om \'n oproep te maak."</string>
-    <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"Foonprogram het nie toestemming om stelselinstellings te stel nie."</string>
-    <string name="blocked_number_call_log_label" msgid="4212282846299997693">"Geblokkeer"</string>
-    <string name="call_log_action_block_report_number" msgid="7302636538668696729">"Blokkeer/gee strooipos aan"</string>
-    <string name="call_log_action_block_number" msgid="5048188386501998865">"Blokkeer nommer"</string>
-    <string name="call_log_action_remove_spam" msgid="2045319806318398403">"Nie strooipos nie"</string>
-    <string name="call_log_action_unblock_number" msgid="6100117033288448758">"Deblokkeer nommer"</string>
-    <string name="spam_number_call_log_label" msgid="2678431398326811131">"Strooipos"</string>
-    <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> is vanlyn en kan nie bereik word nie"</string>
-    <string name="about_phone_label" msgid="582991354677973731">"Meer oor"</string>
-    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Deur Google getranskribeer"</string>
-    <string name="voicemail_transcription_in_progress" msgid="2933320969613783210">"Google transkribeer tans …"</string>
-    <string name="voicemail_transcription_failed" msgid="335275303117412706">"Transkripsie nie beskikbaar nie."</string>
-    <string name="voicemail_transcription_failed_language_not_supported" msgid="4210332591050562553">"Transkripsie nie beskikbaar nie. Taal word nie ondersteun nie."</string>
-    <string name="voicemail_transcription_failed_no_speech" msgid="9093372879697874852">"Transkripsie nie beskikbaar nie. Geen spraak bespeur nie."</string>
-    <string name="view_conversation" msgid="7895904782094119702">"Bekyk"</string>
-    <string name="ec_data_deleted" msgid="4794880345545827107">"Oproep geskrap. Bekyk en vee aanhegsels uit wat gedurende hierdie oproep in Boodskappe gedeel is."</string>
-    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"Oproepe geskrap. Bekyk en vee aanhegsels uit wat gedurende oproepe in Boodskappe gedeel is."</string>
+  <string name="respond_via_sms_setting_title">Vinnige antwoorde</string>
+  <string name="call_settings_label">Oproepe</string>
+  <string name="manage_blocked_numbers_label">Geblokkeerde nommers</string>
+  <string name="voicemail_settings_label">Stemboodskap</string>
+  <string name="blocked_numbers_disabled_emergency_header_label">Oproepblokkering is tydelik af</string>
+  <string name="blocked_numbers_disabled_emergency_desc">Oproepblokkering is gedeaktiveer omdat jy die afgelope 48 uur nooddienste van hierdie foon af gekontak het. Dit sal outomaties heraktiveer word sodra die 48-uurtydperk verstryk.</string>
+  <string name="import_send_to_voicemail_numbers_label">Voer nommers in</string>
+  <string name="blocked_call_settings_import_description">Jy het sommige bellers vroeër gemerk om outomaties via ander programme na stemboodskapdiens gestuur te word.</string>
+  <string name="blocked_call_settings_view_numbers_button">Bekyk nommers</string>
+  <string name="blocked_call_settings_import_button">Voer in</string>
+  <string name="description_blocked_number_list_delete">Deblokkeer nommer</string>
+  <string name="addBlockedNumber">Voeg nommer by</string>
+  <string name="block_number_footer_message_vvm">Oproepe van hierdie nommers af sal geblokkeer word en stemboodskappe sal outomaties uitgevee word.</string>
+  <string name="block_number_footer_message_no_vvm">Oproepe van hierdie nommers af sal geblokkeer word, maar die bellers sal dalk steeds vir jou stemboodskappe kan los.</string>
+  <string name="block_list">Geblokkeerde nommers</string>
+  <string name="alreadyBlocked">%1$s is reeds geblokkeer.</string>
+  <string name="phone_account_settings_label">Oproeprekeninge</string>
+  <string name="permission_no_speeddial">Skakel die kontaktetoestemming aan om spoedbel te aktiveer.</string>
+  <string name="permission_no_calllog">Skakel die foontoestemming aan om jou oproeprekord te sien.</string>
+  <string name="permission_no_search">Skakel die Kontakte-toestemmings aan om jou kontakte te deursoek.</string>
+  <string name="permission_place_call">Skakel die foontoestemming aan om \'n oproep te maak.</string>
+  <string name="toast_cannot_write_system_settings">Foonprogram het nie toestemming om stelselinstellings te stel nie.</string>
+  <string name="blocked_number_call_log_label">Geblokkeer</string>
+  <string name="call_log_action_block_report_number">Blokkeer/gee strooipos aan</string>
+  <string name="call_log_action_block_number">Blokkeer nommer</string>
+  <string name="call_log_action_remove_spam">Nie strooipos nie</string>
+  <string name="call_log_action_unblock_number">Deblokkeer nommer</string>
+  <string name="spam_number_call_log_label">Strooipos</string>
+  <string name="call_composer_connection_failed">%1$s is vanlyn en kan nie bereik word nie</string>
+  <string name="about_phone_label">Meer oor</string>
+  <string name="voicemail_transcription_branding_text">Deur Google getranskribeer</string>
+  <string name="voicemail_transcription_in_progress">Transkribeer tans …</string>
+  <string name="voicemail_transcription_failed">Transkripsie nie beskikbaar nie.</string>
+  <string name="voicemail_transcription_failed_language_not_supported">Transkripsie nie beskikbaar nie. Taal word nie ondersteun nie.</string>
+  <string name="voicemail_transcription_failed_no_speech">Transkripsie nie beskikbaar nie. Geen spraak bespeur nie.</string>
+  <string name="voicemail_donation_promo_title">Help om transkripsie-akkuraatheid te verbeter?</string>
+  <string name="voicemail_donation_promo_content">Laat Google dié en toekomstige stemboodskapboodskappe met transkripsies hersien. Hulle sal anoniem geberg word. Verander enige tyd instellings. %1$s</string>
+  <string name="voicemail_donation_promo_opt_in">Ja, ek\'s in</string>
+  <string name="voicemail_donation_promo_opt_out">Nee, dankie</string>
+  <string name="voicemail_transcription_rating">Gradeer transkripsiegehalte</string>
+  <string name="voicemail_transcription_rating_thanks">Dankie vir jou terugvoer</string>
+  <string name="description_rating_good">Laaik</string>
+  <string name="description_rating_bad">Laaik nie</string>
+  <string name="view_conversation">Bekyk</string>
+  <string name="ec_data_deleted">Oproep geskrap. Bekyk en vee aanhegsels uit wat gedurende hierdie oproep in Boodskappe gedeel is.</string>
+  <string name="multiple_ec_data_deleted">Oproepe geskrap. Bekyk en vee aanhegsels uit wat gedurende oproepe in Boodskappe gedeel is.</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-am/strings.xml b/java/com/android/dialer/app/res/values-am/strings.xml
index 9eb2dbf..99fdcd0 100644
--- a/java/com/android/dialer/app/res/values-am/strings.xml
+++ b/java/com/android/dialer/app/res/values-am/strings.xml
@@ -1,179 +1,171 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="applicationLabel" msgid="2202739481132958990">"ስልክ"</string>
-    <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"የስልክ የቁልፍ ሰሌዳ"</string>
-    <string name="callHistoryIconLabel" msgid="7493268743411968630">"የጥሪ ታሪክ"</string>
-    <string name="action_copy_number_text" msgid="832682558551502319">"ቁጥር ቅዳ"</string>
-    <string name="copy_transcript_text" msgid="937904189017310829">"ወደ ጽሑፍ የተገለበጠውን ቅዳ"</string>
-    <string name="action_edit_number_before_call" msgid="8017492815878473837">"ከመደወል በፊት ቁጥር አርትዕ"</string>
-    <string name="call_log_delete_all" msgid="7852970926906523784">"የጥሪ ታሪክን አጽዳ"</string>
-    <string name="call_log_trash_voicemail" msgid="6118493534178533972">"የድምፅ መልዕክት ሰርዝ"</string>
-    <string name="snackbar_voicemail_deleted" msgid="7463166543725496307">"የድምጽ ፖስታ ተፈልጎ ተገኝቷል"</string>
-    <string name="snackbar_voicemail_deleted_undo" msgid="6959743982796409941">"ቀልብስ"</string>
-    <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"የጥሪ ታሪክ ይጽዳ?"</string>
-    <string name="clearCallLogConfirmation" msgid="6844949465815109166">"ይሄ ሁሉንም ጥሪዎች ከታሪክዎ ይሰርዛቸዋል"</string>
-    <string name="clearCallLogProgress_title" msgid="995004835687361977">"የጥሪ ታሪክን በማጽዳት ላይ…"</string>
-    <string name="notification_missedCallTitle" msgid="8283366068539898486">"ያመለጠጥሪ"</string>
-    <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"ያመለጠ የሥራ ጥሪ"</string>
-    <string name="notification_missedCallsTitle" msgid="3697442015345089802">"ያመለጡ ጥሪዎች"</string>
-    <string name="notification_missedCallsMsg" msgid="8176217633929018706">"<xliff:g id="NUM_MISSED_CALLS">%d</xliff:g> ያመለጡ ጥሪዎች"</string>
-    <string name="notification_missedCall_call_back" msgid="3875698110051973965">"መልሰህ ደውል"</string>
-    <string name="notification_missedCall_message" msgid="5086910028988305964">"መልእክት"</string>
-    <string name="post_call_notification_message" msgid="5417476789860590611">"<xliff:g id="NAME">%1$s</xliff:g>:<xliff:g id="MESSAGE">%2$s</xliff:g>"</string>
-    <string name="notification_voicemail_text_format" msgid="1895667520930252897">"<xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g> ይደውሉ"</string>
-    <string name="notification_voicemail_no_vm_number" msgid="8942821987929495842">"የማይታወቅ የድምፅ መልዕክት ቁጥር"</string>
-    <plurals name="notification_voicemail_title" formatted="false" msgid="1551847434476438657">
-      <item quantity="one"> <xliff:g id="COUNT">%1$d</xliff:g> የድምፅ መልዕክቶች </item>
-      <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> የድምፅ መልዕክቶች </item>
-    </plurals>
-    <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>፤<xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
-    <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"ከ<xliff:g id="CALLER">%1$s</xliff:g> አዲስ የድምፅመልዕክት"</string>
-    <string name="voicemail_playback_error" msgid="4384373852257757295">"የድምጽ መልዕክትን ማጫወት አልተቻለም"</string>
-    <string name="voicemail_fetching_content" msgid="572320120918636014">"የድምጽ መልዕክትን በመጫን ላይ…"</string>
-    <string name="voicemail_fetching_timout" msgid="2128873915839949783">"የድምጽ መልዕክትን መጫን አልተቻለም"</string>
-    <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_playback_speakerphone" msgid="4852027754869750227">"የስልክ ድምጽ ማጉያን ያብሩ ወይም ያጥፉ"</string>
-    <string name="description_playback_seek" msgid="1340910573254132520">"የመልሶ ማጫወት ቦታ ይፈልጉ"</string>
-    <string name="action_menu_call_history_description" msgid="8829135306925008546">"የጥሪ ታሪክ"</string>
-    <string name="action_menu_overflow_description" msgid="7648679686746517341">"ተጨማሪ አማራጮች"</string>
-    <string name="action_menu_dialpad_button" msgid="1970631633457493180">"ቁልፍ ሰሌዳ"</string>
-    <string name="dialer_settings_label" msgid="4980176284150290175">"ቅንብሮች"</string>
-    <string name="simulator_submenu_label" msgid="186156287346615267">"ማስመሰያ"</string>
-    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"አዲስ የዩአይ አቋራጭ ፍጠር"</string>
-    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"ወደ የጅምላ እርምጃ ሁነታ በመግባት ላይ"</string>
-    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"ከጅምላ እርምጃ ሁነታ ለቀው ወጥተዋል"</string>
-    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> ተመርጧል"</string>
-    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> አልተመረጠም"</string>
-    <string name="description_contact_details" msgid="3341280873855253464">"የ<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> እውቂያ ዝርዝሮች"</string>
-    <string name="description_spam_contact_details" msgid="5592578752881528368">"የተጠረጠረው አይፈለጌ ጥሪ አድራጊ ማግኛ አድራሻ<xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> ጥሪዎች።"</string>
-    <string name="description_video_call" msgid="3738199365585751727">"የቪዲዮ ጥሪ።"</string>
-    <string name="description_start_voice_search" msgid="8380022725973015261">"በድምፅ ፍለጋ ይጀምሩ"</string>
-    <string name="voicemail" msgid="8899540969000957954">"የድምፅ መልዕክት"</string>
-    <string name="description_cancel_multi_select" msgid="3930475950253360461">"የጅምላ እርምጃ ሁነታ ይቅር"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"ሰርዝ"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"ይቅር"</string>
-    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> ተመርጠዋል"</string>
-    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
-      <item quantity="one">"<b>"እነዚህ የድምፅ መልዕክቶች ይሰረዙ? "</b>"</item>
-      <item quantity="other">"<b>"እነዚህ የድምፅ መልዕክቶች ይሰረዙ? "</b>"</item>
-    </plurals>
-    <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
-    <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> <xliff:g id="TIME">%2$s</xliff:g> ላይ"</string>
-    <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
-    <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="voice_search_not_available" msgid="6546240433719732905">"የድምጽ ፍለጋ አይገኝም"</string>
-    <string name="dialer_hint_find_contact" msgid="2023214799381149808">"ዕውቅያዎችን ፈልግ"</string>
-    <string name="block_number_search_hint" msgid="5377706079015099416">"ቁጥር ያክሉ ወይም እውቂያዎችን ይፈልጉ"</string>
-    <string name="call_log_all_empty" msgid="3955572868518162004">"የእርስዎ የጥሪ ታሪክ ባዶ ነው"</string>
-    <string name="call_log_all_empty_action" msgid="852218280136243014">"ደውል"</string>
-    <string name="call_log_missed_empty" msgid="7094936030845062214">"ምንም ያመለጡዎት ጥሪዎች የሉዎትም።"</string>
-    <string name="call_log_voicemail_empty" msgid="273623903423275178">"የእርስዎ የድምጽ መልዕክት ገቢ መልዕክት ባዶ ነው።"</string>
-    <string name="call_log_activity_title" msgid="1275242727244945527">"የስልክ ጥሪ ታሪክ"</string>
-    <string name="call_log_all_title" msgid="6042262422192020327">"ሁሉም"</string>
-    <string name="call_log_missed_title" msgid="17254005889268015">"ያመለጡ"</string>
-    <string name="tab_speed_dial" msgid="6616404752227561075">"ፈጣን ደውል"</string>
-    <string name="tab_history" msgid="7420269368689503596">"የጥሪ ታሪክ"</string>
-    <string name="tab_all_contacts" msgid="5531733977693943015">"ዕውቂያዎች"</string>
-    <string name="tab_voicemail" msgid="2458548090088316246">"የድምፅ መልዕክት"</string>
-    <string name="search_shortcut_call_number" msgid="8847918845036880688">"ደውል<xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"አዲስ እውቂያ ይፍጠሩ"</string>
-    <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"ወደ እውቂያ አክል"</string>
-    <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"ኤስኤምኤስ ላክ"</string>
-    <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"የቪዲዮ ጥሪ አድርግ"</string>
-    <string name="search_shortcut_block_number" msgid="4587283230665805776">"ቁጥርን አግድ"</string>
-    <string name="speed_dial_empty" msgid="3346406399966039505">"በፈጥኖ መደወያ ላይ ገና ማንም የለዎትም"</string>
-    <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"ተወዳጅ አክል"</string>
-    <string name="remove_contact" msgid="2353580570488923668">"አስወግድ"</string>
-    <string name="select_all" msgid="408601760696146245">"ሁሉንም ምረጥ"</string>
-    <string name="call_log_action_video_call" msgid="7565549950343850819">"የቪዲዮ ጥሪ"</string>
-    <string name="call_log_action_send_message" msgid="6948727362660115554">"መልእክት ላክ"</string>
-    <string name="call_log_action_details" msgid="2091370737371449501">"የጥሪ ዝርዝሮች"</string>
-    <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"ላክ ወደ…"</string>
-    <string name="call_log_action_call" msgid="682724094251540583">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> ይደውሉ"</string>
-    <string name="description_incoming_missed_call" msgid="8292535799379230029">"ከ<xliff:g id="NAMEORNUMBER">^1</xliff:g>፣ <xliff:g id="TYPEORLOCATION">^2</xliff:g>፣ <xliff:g id="TIMEOFCALL">^3</xliff:g>፣ <xliff:g id="PHONEACCOUNT">^4</xliff:g> ያመለጠ ጥሪ።"</string>
-    <string name="description_incoming_answered_call" msgid="3920182963103160610">"ከ<xliff:g id="NAMEORNUMBER">^1</xliff:g>፣ <xliff:g id="TYPEORLOCATION">^2</xliff:g>፣ <xliff:g id="TIMEOFCALL">^3</xliff:g>፣ <xliff:g id="PHONEACCOUNT">^4</xliff:g> መልስ የተሰጠው ጥሪ።"</string>
-    <string name="description_unread_voicemail" msgid="145170985013419170">"ያልተነበበ የድምጽ ፖስታ ከ<xliff:g id="NAMEORNUMBER">^1</xliff:g>፣ <xliff:g id="TYPEORLOCATION">^2</xliff:g>፣ <xliff:g id="TIMEOFCALL">^3</xliff:g>፣ <xliff:g id="PHONEACCOUNT">^4</xliff:g>።"</string>
-    <string name="description_read_voicemail" msgid="5585559881573227732">"የድምጽ ፖስታ ከ<xliff:g id="NAMEORNUMBER">^1</xliff:g>፣ <xliff:g id="TYPEORLOCATION">^2</xliff:g>፣ <xliff:g id="TIMEOFCALL">^3</xliff:g>፣ <xliff:g id="PHONEACCOUNT">^4</xliff:g>።"</string>
-    <string name="description_outgoing_call" msgid="543952487882919924">"ወደ <xliff:g id="NAMEORNUMBER">^1</xliff:g>፣ <xliff:g id="TYPEORLOCATION">^2</xliff:g>፣ <xliff:g id="TIMEOFCALL">^3</xliff:g>፣ <xliff:g id="PHONEACCOUNT">^4</xliff:g> ደውል።"</string>
-    <string name="call_log_via_number" msgid="1340307109806397650">"በ <xliff:g id="NUMBER">%1$s</xliff:g> በኩል"</string>
-    <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> በ <xliff:g id="NUMBER">%2$s</xliff:g> በኩል"</string>
-    <string name="description_call_action" msgid="4042796498169106545">"ወደ <xliff:g id="NAMEORNUMBER">^1</xliff:g> ይደውሉ"</string>
-    <string name="description_video_call_action" msgid="1237090968588659650">"ቪዲዮ ጥሪ <xliff:g id="NAMEORNUMBER">^1</xliff:g>።"</string>
-    <string name="description_voicemail_action" msgid="3290143432403538524">"የ<xliff:g id="NAMEORNUMBER">^1</xliff:g>ን የድምጽ መልዕክት ያዳምጡ"</string>
-    <string name="description_create_new_contact_action" msgid="1928282350281564130">"ለ<xliff:g id="NAMEORNUMBER">^1</xliff:g> እውቂያ ፍጠር"</string>
-    <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>ን ወደ አሁን ያለ እውቂያ አክል"</string>
-    <string name="description_details_action" msgid="2061866409737706174">"የ<xliff:g id="NAMEORNUMBER">^1</xliff:g> የጥሪ ዝርዝሮች"</string>
-    <string name="call_log_header_today" msgid="1576119097475845293">"ዛሬ"</string>
-    <string name="call_log_header_yesterday" msgid="5616077776205329563">"ትላንት"</string>
-    <string name="call_log_header_other" msgid="4940676886254217644">"የቆየ"</string>
-    <string name="voicemail_speaker_on" msgid="3151333608926996668">"ድምጽ ማጉያን አብራ።"</string>
-    <string name="voicemail_speaker_off" msgid="2530064206962034201">"ድምጽ ማጉያን አጥፋ።"</string>
-    <string name="voicemail_play_start_pause" msgid="3874823480278334664">"መልሰህ አጫውትን አስጀምር ወይም ለአፍታ አቁም።"</string>
-    <string name="display_options_title" msgid="3880091801055797975">"የማሳያ አማራጮች"</string>
-    <string name="sounds_and_vibration_title" msgid="3075050000721181384">"ድምጾች እና ንዝረት"</string>
-    <string name="accessibility_settings_title" msgid="3329027650429831820">"ተደራሽነት"</string>
-    <string name="ringtone_title" msgid="8377174189894648486">"የስልክ ጥሪ ቅላጼ"</string>
-    <string name="vibrate_on_ring_title" msgid="631441314790960485">"እንዲሁም ለጥሪዎችም ንዘር"</string>
-    <string name="dtmf_tone_enable_title" msgid="3273762431523939277">"የቁልፍ ሰሌዳ ድምፆች"</string>
-    <string name="dtmf_tone_length_title" msgid="534096029202438539">"የቁልፍ ሰሌዳ ድምፅ ርዝመት"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="applicationLabel">ስልክ</string>
+  <string name="launcherDialpadActivityLabel">የስልክ የቁልፍ ሰሌዳ</string>
+  <string name="callHistoryIconLabel">የጥሪ ታሪክ</string>
+  <string name="action_copy_number_text">ቁጥር ቅዳ</string>
+  <string name="copy_transcript_text">ወደ ጽሑፍ የተገለበጠውን ቅዳ</string>
+  <string name="action_edit_number_before_call">ከመደወል በፊት ቁጥር አርትዕ</string>
+  <string name="call_log_delete_all">የጥሪ ታሪክን አጽዳ</string>
+  <string name="call_log_trash_voicemail">የድምፅ መልዕክት ሰርዝ</string>
+  <string name="snackbar_voicemail_deleted">የድምጽ ፖስታ ተፈልጎ ተገኝቷል</string>
+  <string name="clearCallLogConfirmation_title">የጥሪ ታሪክ ይጽዳ?</string>
+  <string name="clearCallLogConfirmation">ይሄ ሁሉንም ጥሪዎች ከታሪክዎ ይሰርዛቸዋል</string>
+  <string name="clearCallLogProgress_title">የጥሪ ታሪክን በማጽዳት ላይ…</string>
+  <string name="notification_missedCallTitle">ያመለጠጥሪ</string>
+  <string name="notification_missedWorkCallTitle">ያመለጠ የሥራ ጥሪ</string>
+  <string name="notification_missedCallsTitle">ያመለጡ ጥሪዎች</string>
+  <string name="notification_missedCallsMsg">%d ያመለጡ ጥሪዎች</string>
+  <string name="notification_missedCall_call_back">መልሰህ ደውል</string>
+  <string name="notification_missedCall_message">መልዕክት</string>
+  <string name="post_call_notification_message">%1$s:%2$s</string>
+  <string name="notification_voicemail_text_format">%s ይደውሉ</string>
+  <string name="notification_voicemail_no_vm_number">የማይታወቅ የድምፅ መልዕክት ቁጥር</string>
+  <plurals name="notification_voicemail_title">
+    <item quantity="one"> %1$d የድምፅ መልዕክቶች </item>
+    <item quantity="other"> %1$d የድምፅ መልዕክቶች </item>
+  </plurals>
+  <string name="notification_voicemail_callers_list">%1$s፤%2$s </string>
+  <string name="notification_new_voicemail_ticker">ከ%1$s አዲስ የድምፅመልዕክት </string>
+  <string name="voicemail_playback_error">የድምጽ መልዕክትን ማጫወት አልተቻለም</string>
+  <string name="voicemail_fetching_content">የድምጽ መልዕክትን በመጫን ላይ…</string>
+  <string name="voicemail_fetching_timout">የድምጽ መልዕክትን መጫን አልተቻለም</string>
+  <string name="call_log_item_count_and_date">(%1$d) %2$s</string>
+  <string name="description_playback_speakerphone">የስልክ ድምጽ ማጉያን ያብሩ ወይም ያጥፉ</string>
+  <string name="description_playback_seek">የመልሶ ማጫወት ቦታ ይፈልጉ</string>
+  <string name="action_menu_call_history_description">የጥሪ ታሪክ</string>
+  <string msgid="2295659037509008453" name="action_menu_overflow_description">ተጨማሪ አማራጮች</string>
+  <string name="action_menu_dialpad_button">ቁልፍ ሰሌዳ</string>
+  <string name="dialer_settings_label">ቅንብሮች</string>
+  <string name="simulator_submenu_label">ማስመሰያ</string>
+  <string name="new_ui_launcher_shortcut_label">አዲስ የዩአይ አቋራጭ ፍጠር</string>
+  <string name="description_entering_bulk_action_mode">ወደ የጅምላ እርምጃ ሁነታ በመግባት ላይ</string>
+  <string name="description_leaving_bulk_action_mode">ከጅምላ እርምጃ ሁነታ ለቀው ወጥተዋል</string>
+  <string name="description_selecting_bulk_action_mode">%1$s ተመርጧል</string>
+  <string name="description_unselecting_bulk_action_mode">%1$s አልተመረጠም</string>
+  <string name="description_contact_details">የ%1$s እውቂያ ዝርዝሮች</string>
+  <string name="description_spam_contact_details">የተጠረጠረው አይፈለጌ ጥሪ አድራጊ ማግኛ አድራሻ%1$s</string>
+  <string name="description_num_calls">%1$s ጥሪዎች።</string>
+  <string name="description_video_call">የቪዲዮ ጥሪ።</string>
+  <string name="description_start_voice_search">በድምፅ ፍለጋ ይጀምሩ</string>
+  <string name="voicemail">የድምፅ መልዕክት  </string>
+  <string name="description_cancel_multi_select">የጅምላ እርምጃ ሁነታ ይቅር</string>
+  <string name="voicemailMultiSelectDeleteConfirm">ሰርዝ</string>
+  <string name="voicemailMultiSelectDeleteCancel">ይቅር</string>
+  <string name="voicemailMultiSelectActionBarTitle">%1$s ተመርጠዋል</string>
+  <plurals name="delete_voicemails_confirmation_dialog_title">
+    <item quantity="one"><b>እነዚህ የድምፅ መልዕክቶች ይሰረዙ? </b></item>
+    <item quantity="other"><b>እነዚህ የድምፅ መልዕክቶች ይሰረዙ? </b></item>
+  </plurals>
+  <string name="voicemailCallLogToday">@string/call_log_header_today</string>
+  <string name="voicemailCallLogDateTimeFormat">%1$s %2$s ላይ</string>
+  <string name="voicemailDurationFormat">%1$02d:%2$02d</string>
+  <string name="voicemailCallLogDateTimeFormatWithDuration">%1$s • %2$s</string>
+  <string name="voice_search_not_available">የድምጽ ፍለጋ አይገኝም</string>
+  <string name="dialer_hint_find_contact">ዕውቅያዎችን ፈልግ</string>
+  <string name="block_number_search_hint">ቁጥር ያክሉ ወይም እውቂያዎችን ይፈልጉ</string>
+  <string name="call_log_all_empty">የእርስዎ የጥሪ ታሪክ ባዶ ነው</string>
+  <string name="call_log_all_empty_action">ደውል</string>
+  <string name="call_log_missed_empty">ምንም ያመለጡዎት ጥሪዎች የሉዎትም።</string>
+  <string name="call_log_voicemail_empty">የእርስዎ የድምጽ መልዕክት ገቢ መልዕክት ባዶ ነው።</string>
+  <string name="call_log_activity_title">የስልክ ጥሪ ታሪክ</string>
+  <string name="call_log_all_title">ሁሉም</string>
+  <string name="call_log_missed_title">ያመለጡ</string>
+  <string name="tab_speed_dial">ፈጣን ደውል</string>
+  <string name="tab_history">የጥሪ ታሪክ</string>
+  <string name="tab_all_contacts">ዕውቂያዎች</string>
+  <string name="tab_voicemail">የድምፅ መልዕክት</string>
+  <string name="search_shortcut_call_number">ደውል%s</string>
+  <string name="search_shortcut_create_new_contact">አዲስ እውቂያ ይፍጠሩ</string>
+  <string name="search_shortcut_add_to_contact">ወደ እውቂያ አክል</string>
+  <string name="search_shortcut_send_sms_message">ኤስኤምኤስ ላክ</string>
+  <string name="search_shortcut_make_video_call">የቪዲዮ ጥሪ አድርግ</string>
+  <string name="search_shortcut_block_number">ቁጥርን አግድ</string>
+  <string name="speed_dial_empty">በፈጥኖ መደወያ ላይ ገና ማንም የለዎትም</string>
+  <string name="speed_dial_empty_add_favorite_action">ተወዳጅ አክል</string>
+  <string name="remove_contact">አስወግድ</string>
+  <string name="select_all">ሁሉንም ምረጥ</string>
+  <string name="call_log_action_video_call">የቪዲዮ ጥሪ</string>
+  <string name="call_log_action_set_up_video">የቪዲዮ ጥሪ ያዋቅሩ</string>
+  <string name="call_log_action_invite_video">ወደ የቪዲዮ ጥሪ ይጋብዙ</string>
+  <string name="call_log_action_send_message">መልዕክት ላክ</string>
+  <string name="call_log_action_details">የጥሪ ዝርዝሮች</string>
+  <string name="call_log_action_share_voicemail">ላክ ወደ…</string>
+  <string name="call_log_action_call">^1 ይደውሉ</string>
+  <string name="description_incoming_missed_call">ከ^1፣ ^2፣ ^3፣ ^4 ያመለጠ ጥሪ።</string>
+  <string name="description_incoming_answered_call">ከ^1፣ ^2፣ ^3፣ ^4 መልስ የተሰጠው ጥሪ።</string>
+  <string name="description_unread_voicemail">ያልተነበበ የድምጽ ፖስታ ከ^1፣ ^2፣ ^3፣ ^4።</string>
+  <string name="description_read_voicemail">የድምጽ ፖስታ ከ^1፣ ^2፣ ^3፣ ^4።</string>
+  <string name="description_outgoing_call">ወደ ^1፣ ^2፣ ^3፣ ^4 ደውል።</string>
+  <string name="call_log_via_number">በ %1$s በኩል</string>
+  <string name="call_log_via_number_phone_account">%1$s በ %2$s በኩል</string>
+  <string name="description_call_action">ወደ ^1 ይደውሉ</string>
+  <string name="description_video_call_action">ቪዲዮ ጥሪ ^1።</string>
+  <string name="description_voicemail_action">የ^1ን የድምጽ መልዕክት ያዳምጡ</string>
+  <string name="description_create_new_contact_action">ለ^1 እውቂያ ፍጠር</string>
+  <string name="description_add_to_existing_contact_action">^1ን ወደ አሁን ያለ እውቂያ አክል</string>
+  <string name="description_details_action">የ^1 የጥሪ ዝርዝሮች</string>
+  <string name="call_log_header_today">ዛሬ</string>
+  <string name="call_log_header_yesterday">ትላንት</string>
+  <string name="call_log_header_other">የቆየ</string>
+  <string name="voicemail_speaker_on">ድምጽ ማጉያን አብራ።</string>
+  <string name="voicemail_speaker_off">ድምጽ ማጉያን አጥፋ።</string>
+  <string name="voicemail_play_start_pause">መልሰህ አጫውትን አስጀምር ወይም ለአፍታ አቁም።</string>
+  <string name="display_options_title">የማሳያ አማራጮች</string>
+  <string name="sounds_and_vibration_title">ድምጾች እና ንዝረት</string>
+  <string name="accessibility_settings_title">ተደራሽነት</string>
+  <string name="ringtone_title">የስልክ ጥሪ ቅላጼ</string>
+  <string name="vibrate_on_ring_title">እንዲሁም ለጥሪዎችም ንዘር</string>
+  <string name="dtmf_tone_enable_title">የቁልፍ ሰሌዳ ድምፆች</string>
+  <string name="dtmf_tone_length_title">የቁልፍ ሰሌዳ ድምፅ ርዝመት</string>
   <string-array name="dtmf_tone_length_entries">
-    <item msgid="3136353015227162823">"መደበኛ"</item>
-    <item msgid="5376841175538523822">"ረጅም"</item>
+    <item>መደበኛ</item>
+    <item>ረጅም</item>
   </string-array>
-    <string name="respond_via_sms_setting_title" msgid="8008181606657693452">"ፈጣን ምላሾች"</string>
-    <string name="call_settings_label" msgid="7824611757200960807">"ጥሪዎች"</string>
-    <string name="manage_blocked_numbers_label" msgid="16823761991832273">"ጥሪን ማገድ"</string>
-    <string name="voicemail_settings_label" msgid="4594299554519920570">"የድምፅ መልዕክት"</string>
-    <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"ጥሪን ማገድ ለጊዜው ተሰናክሏል"</string>
-    <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"ባለፉት 48 ሰዓቶች ውስጥ ከዚህ ስልክ ሆነው የአስቸኳይ አደጋ አገልግሎቶችን ስላነጋገሩ ጥሪን ማገድ ተሰናክሏል። አንዴ የ48 ሰዓቱ ጊዜ ካለፈ በኋላ በራስ-ሰር ዳግም ይነቃል።"</string>
-    <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"ቁጥሮችን አስመጣ"</string>
-    <string name="blocked_call_settings_import_description" msgid="1819412052545228965">"ከዚህ ቀደም አንዳንድ ደዋዮች በሌሎች መተግበሪያዎች በኩል በራስ-ሰር ወደ የድምፅ መልዕክት እንዲላኩ ምልክት አድርገባቸው ነበር።"</string>
-    <string name="blocked_call_settings_view_numbers_button" msgid="3332727948554356704">"ቁጥሮችን ይመልከቱ"</string>
-    <string name="blocked_call_settings_import_button" msgid="7319111700387470727">"አስመጣ"</string>
-    <string name="description_blocked_number_list_delete" msgid="2139644216858370740">"ቁጥርን አታግድ"</string>
-    <string name="addBlockedNumber" msgid="3053473735238295551">"ቁጥር አክል"</string>
-    <string name="block_number_footer_message_vvm" msgid="7955326304033982368">"ከእነዚህ ቁትሮች የሚመጡ ጥሪዎች ይታገዳሉ፣ እና የድምጽ መልዕክቶች በራስ-ሰር ይሰረዛሉ።"</string>
-    <string name="block_number_footer_message_no_vvm" msgid="1152684139070471665">"ከእነዚህ ቁትሮች የሚመጡ ጥሪዎች ይታገዳሉ፣ ነገር ግን አሁንም የድምጽ መልዕክቶችን ሊተዉልዎ ይችላሉ።"</string>
-    <string name="block_list" msgid="4701585783411870782">"የታገዱ ቁጥሮች"</string>
-    <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g> ቀድሞውኑ ታግዷል።"</string>
-    <string name="phone_account_settings_label" msgid="8372485478006965920">"የመደወያ መለያዎች"</string>
-    <string name="permission_no_speeddial" msgid="8487215628510596753">"ፈጥኖ መደወያን ለማንቃት የእውቂያዎች ፍቃዱን ያብሩ።"</string>
-    <string name="permission_no_calllog" msgid="4053705651238775784">"የጥሪ ምዝግብ ማስታወአሽዎን ለማየት የስልክ ፍቃዱን ያብሩ።"</string>
-    <string name="permission_no_search" msgid="2424710404207193826">"የእርስዎን እውቂያዎች ለመከታተል የእውቂያዎች ፍቃዶችን ያብሩ።"</string>
-    <string name="permission_place_call" msgid="8686908130349369423">"ስልክ ለመደወል የስልክ ፍቃዱን ያብሩ።"</string>
-    <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"የስልክ መተግበሪያ ወደ የስርዓት ቅንብሮች የመጻፍ ፍቃድ የለውም።"</string>
-    <string name="blocked_number_call_log_label" msgid="4212282846299997693">"ታግዷል"</string>
-    <string name="call_log_action_block_report_number" msgid="7302636538668696729">"አይፈለጌ መልእክትን አግድ/ሪፖርት አድርግ"</string>
-    <string name="call_log_action_block_number" msgid="5048188386501998865">"ቁጥርን አግድ"</string>
-    <string name="call_log_action_remove_spam" msgid="2045319806318398403">"አይፈለጌ መልእክት አይደለም"</string>
-    <string name="call_log_action_unblock_number" msgid="6100117033288448758">"ቁጥርን አታግድ"</string>
-    <string name="spam_number_call_log_label" msgid="2678431398326811131">"አይፈለጌ መልዕክት"</string>
-    <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> ከመስመር ውጭ ነው እና ሊደረስበት አይችልም"</string>
-    <string name="about_phone_label" msgid="582991354677973731">"ስለ"</string>
-    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"በGoogle ወደ ጽሁፍ የተለወጠ"</string>
-    <string name="voicemail_transcription_in_progress" msgid="2933320969613783210">"Google ወደ ጽሁፍ በመገልበጥ ላይ ነው…"</string>
-    <string name="voicemail_transcription_failed" msgid="335275303117412706">"ወደ ጽሁፍ ግልባጭ የለም።"</string>
-    <string name="voicemail_transcription_failed_language_not_supported" msgid="4210332591050562553">"ወደ ጽሁፍ ግልባጭ የለም። ቋንቋ አይደገፍም።"</string>
-    <string name="voicemail_transcription_failed_no_speech" msgid="9093372879697874852">"ወደ ጽሁፍ ግልባጭ የለም። ምንም ንግግር አልተደመጠም።"</string>
-    <string name="view_conversation" msgid="7895904782094119702">"አሳይ"</string>
-    <string name="ec_data_deleted" msgid="4794880345545827107">"ጥሪ ተሰርዟል። በዚህ ጥሪ ወቅት በመልዕክቶች ውስጥ የተጋሩ አባሪዎችን ይመልከቱ እንዲሁም ይሰርዙ።"</string>
-    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"ጥሪ ተሰርዟል። በዚህ ጥሪ ወቅት በመልዕክቶች ውስጥ የተጋሩ አባሪዎችን ይመልከቱ እንዲሁም ይሰርዙ።"</string>
+  <string name="respond_via_sms_setting_title">ፈጣን ምላሾች</string>
+  <string name="call_settings_label">ጥሪዎች</string>
+  <string name="manage_blocked_numbers_label">የታገዱ ቁጥሮች</string>
+  <string name="voicemail_settings_label">የድምፅ መልዕክት</string>
+  <string name="blocked_numbers_disabled_emergency_header_label">ጥሪን ማገድ ለጊዜው ተሰናክሏል</string>
+  <string name="blocked_numbers_disabled_emergency_desc">ባለፉት 48 ሰዓቶች ውስጥ ከዚህ ስልክ ሆነው የአስቸኳይ አደጋ አገልግሎቶችን ስላነጋገሩ ጥሪን ማገድ ተሰናክሏል። አንዴ የ48 ሰዓቱ ጊዜ ካለፈ በኋላ በራስ-ሰር ዳግም ይነቃል።</string>
+  <string name="import_send_to_voicemail_numbers_label">ቁጥሮችን አስመጣ</string>
+  <string name="blocked_call_settings_import_description">ከዚህ ቀደም አንዳንድ ደዋዮች በሌሎች መተግበሪያዎች በኩል በራስ-ሰር ወደ የድምፅ መልዕክት እንዲላኩ ምልክት አድርገባቸው ነበር።</string>
+  <string name="blocked_call_settings_view_numbers_button">ቁጥሮችን ይመልከቱ</string>
+  <string name="blocked_call_settings_import_button">አስመጣ</string>
+  <string name="description_blocked_number_list_delete">ቁጥርን አታግድ</string>
+  <string name="addBlockedNumber">ቁጥር አክል</string>
+  <string name="block_number_footer_message_vvm">ከእነዚህ ቁትሮች የሚመጡ ጥሪዎች ይታገዳሉ፣ እና የድምጽ መልዕክቶች በራስ-ሰር ይሰረዛሉ።</string>
+  <string name="block_number_footer_message_no_vvm">ከእነዚህ ቁትሮች የሚመጡ ጥሪዎች ይታገዳሉ፣ ነገር ግን አሁንም የድምጽ መልዕክቶችን ሊተዉልዎ ይችላሉ።</string>
+  <string name="block_list">የታገዱ ቁጥሮች</string>
+  <string name="alreadyBlocked">%1$s ቀድሞውኑ ታግዷል።</string>
+  <string name="phone_account_settings_label">የመደወያ መለያዎች</string>
+  <string name="permission_no_speeddial">ፈጥኖ መደወያን ለማንቃት የእውቂያዎች ፍቃዱን ያብሩ።</string>
+  <string name="permission_no_calllog">የጥሪ ምዝግብ ማስታወአሽዎን ለማየት የስልክ ፍቃዱን ያብሩ።</string>
+  <string name="permission_no_search">የእርስዎን እውቂያዎች ለመከታተል የእውቂያዎች ፍቃዶችን ያብሩ።</string>
+  <string name="permission_place_call">ስልክ ለመደወል የስልክ ፍቃዱን ያብሩ።</string>
+  <string name="toast_cannot_write_system_settings">የስልክ መተግበሪያ ወደ የስርዓት ቅንብሮች የመጻፍ ፍቃድ የለውም።</string>
+  <string name="blocked_number_call_log_label">ታግዷል</string>
+  <string name="call_log_action_block_report_number">አይፈለጌ መልእክትን አግድ/ሪፖርት አድርግ</string>
+  <string name="call_log_action_block_number">ቁጥርን አግድ</string>
+  <string name="call_log_action_remove_spam">አይፈለጌ መልዕክት አይደለም</string>
+  <string name="call_log_action_unblock_number">ቁጥርን አታግድ</string>
+  <string name="spam_number_call_log_label">አይፈለጌ መልዕክት</string>
+  <string name="call_composer_connection_failed">%1$s ከመስመር ውጭ ነው እና ሊደረስበት አይችልም</string>
+  <string name="about_phone_label">ስለ</string>
+  <string name="voicemail_transcription_branding_text">በGoogle ወደ ጽሁፍ የተለወጠ</string>
+  <string name="voicemail_transcription_in_progress">ወደ ፅሁፍ በመገልበጥ ላይ…</string>
+  <string name="voicemail_transcription_failed">ወደ ጽሁፍ ግልባጭ የለም።</string>
+  <string name="voicemail_transcription_failed_language_not_supported">ወደ ጽሁፍ ግልባጭ የለም። ቋንቋ አይደገፍም።</string>
+  <string name="voicemail_transcription_failed_no_speech">ወደ ጽሁፍ ግልባጭ የለም። ምንም ንግግር አልተደመጠም።</string>
+  <string name="voicemail_donation_promo_title">ወደ ጽሁፍ ግልበጣን ጥራት ለማሻሻል ያግዛሉ?</string>
+  <string name="voicemail_donation_promo_content">Google ይህን እና የወደፊት የድምጽ መልዕክቶችን ወደ ጽሁፍ ግለበጣን በመጠቀም እንዲገመግም ይፍቀዱ። የማንነታቸው ሳይገለጽ ይቀመጣሉ። ቅንብሮችን በማንኛውም ጊዜ ይቀይሩ። %1$s</string>
+  <string name="voicemail_donation_promo_opt_in">አዎ ገብቼያለሁ</string>
+  <string name="voicemail_donation_promo_opt_out">አይ አመሰግናለሁ</string>
+  <string name="voicemail_transcription_rating">ወደ ጽሁፍ የመገልበጥ ጥራትን ደረጃ ይስጡ</string>
+  <string name="voicemail_transcription_rating_thanks">ለግብረመልስዎ እናመሰግናለን</string>
+  <string name="description_rating_good">ውደድ</string>
+  <string name="description_rating_bad">አይውደዱ</string>
+  <string name="view_conversation">አሳይ</string>
+  <string name="ec_data_deleted">ጥሪ ተሰርዟል። በዚህ ጥሪ ወቅት በመልዕክቶች ውስጥ የተጋሩ አባሪዎችን ይመልከቱ እንዲሁም ይሰርዙ።</string>
+  <string name="multiple_ec_data_deleted">ጥሪ ተሰርዟል። በዚህ ጥሪ ወቅት በመልዕክቶች ውስጥ የተጋሩ አባሪዎችን ይመልከቱ እንዲሁም ይሰርዙ።</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-ar/strings.xml b/java/com/android/dialer/app/res/values-ar/strings.xml
index 2ab1771..b14f70b 100644
--- a/java/com/android/dialer/app/res/values-ar/strings.xml
+++ b/java/com/android/dialer/app/res/values-ar/strings.xml
@@ -1,187 +1,179 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="applicationLabel" msgid="2202739481132958990">"الهاتف"</string>
-    <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"لوحة مفاتيح الهاتف"</string>
-    <string name="callHistoryIconLabel" msgid="7493268743411968630">"سجل المكالمات"</string>
-    <string name="action_copy_number_text" msgid="832682558551502319">"نسخ الرقم"</string>
-    <string name="copy_transcript_text" msgid="937904189017310829">"نسخ الكتابة الصوتية"</string>
-    <string name="action_edit_number_before_call" msgid="8017492815878473837">"تعديل الرقم قبل الاتصال"</string>
-    <string name="call_log_delete_all" msgid="7852970926906523784">"محو سجل المكالمات"</string>
-    <string name="call_log_trash_voicemail" msgid="6118493534178533972">"حذف رسالة البريد الصوتي"</string>
-    <string name="snackbar_voicemail_deleted" msgid="7463166543725496307">"تم حذف الرسالة الصوتية"</string>
-    <string name="snackbar_voicemail_deleted_undo" msgid="6959743982796409941">"تراجع"</string>
-    <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"هل تريد محو سجل المكالمات؟"</string>
-    <string name="clearCallLogConfirmation" msgid="6844949465815109166">"سيؤدي ذلك إلى حذف جميع المكالمات من السجل"</string>
-    <string name="clearCallLogProgress_title" msgid="995004835687361977">"جارٍ محو سجل المكالمات…"</string>
-    <string name="notification_missedCallTitle" msgid="8283366068539898486">"مكالمة فائتة"</string>
-    <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"مكالمة عمل فائتة"</string>
-    <string name="notification_missedCallsTitle" msgid="3697442015345089802">"المكالمات الفائتة"</string>
-    <string name="notification_missedCallsMsg" msgid="8176217633929018706">"<xliff:g id="NUM_MISSED_CALLS">%d</xliff:g> من المكالمات الفائتة"</string>
-    <string name="notification_missedCall_call_back" msgid="3875698110051973965">"معاودة الاتصال"</string>
-    <string name="notification_missedCall_message" msgid="5086910028988305964">"رسالة"</string>
-    <string name="post_call_notification_message" msgid="5417476789860590611">"<xliff:g id="NAME">%1$s</xliff:g>: <xliff:g id="MESSAGE">%2$s</xliff:g>"</string>
-    <string name="notification_voicemail_text_format" msgid="1895667520930252897">"طلب <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
-    <string name="notification_voicemail_no_vm_number" msgid="8942821987929495842">"رقم البريد الصوتي غير معروف"</string>
-    <plurals name="notification_voicemail_title" formatted="false" msgid="1551847434476438657">
-      <item quantity="zero">لا تتوفر رسائل بريد صوتي (<xliff:g id="COUNT">%1$d</xliff:g>) </item>
-      <item quantity="two">رسالتا بريد صوتي (<xliff:g id="COUNT">%1$d</xliff:g>) </item>
-      <item quantity="few"> <xliff:g id="COUNT">%1$d</xliff:g> رسائل بريد صوتي </item>
-      <item quantity="many"> <xliff:g id="COUNT">%1$d</xliff:g> رسالة بريد صوتي </item>
-      <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> من رسائل البريد الصوتي </item>
-      <item quantity="one">رسالة بريد صوتي</item>
-    </plurals>
-    <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>، <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
-    <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"بريد صوتي جديد من <xliff:g id="CALLER">%1$s</xliff:g>"</string>
-    <string name="voicemail_playback_error" msgid="4384373852257757295">"تعذر تشغيل البريد الصوتي"</string>
-    <string name="voicemail_fetching_content" msgid="572320120918636014">"جارٍ تحميل البريد الصوتي…"</string>
-    <string name="voicemail_fetching_timout" msgid="2128873915839949783">"تعذر تحميل البريد الصوتي"</string>
-    <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_playback_speakerphone" msgid="4852027754869750227">"تشغيل مكبر الصوت أو تعطيله"</string>
-    <string name="description_playback_seek" msgid="1340910573254132520">"طلب موضع تشغيل"</string>
-    <string name="action_menu_call_history_description" msgid="8829135306925008546">"سجل المكالمات"</string>
-    <string name="action_menu_overflow_description" msgid="7648679686746517341">"مزيد من الخيارات"</string>
-    <string name="action_menu_dialpad_button" msgid="1970631633457493180">"لوحة المفاتيح"</string>
-    <string name="dialer_settings_label" msgid="4980176284150290175">"الإعدادات"</string>
-    <string name="simulator_submenu_label" msgid="186156287346615267">"المحاكي"</string>
-    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"إنشاء اختصار للواجهة الجديدة"</string>
-    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"يتم الدخول إلى وضع الإجراء المجمَّع"</string>
-    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"تمت مغادرة وضع الإجراء المجمَّع"</string>
-    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"تم تحديد <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"تم إلغاء تحديد <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_contact_details" msgid="3341280873855253464">"تفاصيل جهة الاتصال بـ <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_spam_contact_details" msgid="5592578752881528368">"تفاصيل جهة الاتصال للمتصل غير المرغوب فيه المشتبه به <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> من المكالمات."</string>
-    <string name="description_video_call" msgid="3738199365585751727">"مكالمة فيديو."</string>
-    <string name="description_start_voice_search" msgid="8380022725973015261">"بدء البحث الصوتي"</string>
-    <string name="voicemail" msgid="8899540969000957954">"البريد الصوتي"</string>
-    <string name="description_cancel_multi_select" msgid="3930475950253360461">"إلغاء وضع الإجراءات المجمَّع"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"حذف"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"إلغاء"</string>
-    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"تم تحديد <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
-      <item quantity="zero">"<b>"حذف رسائل البريد الصوتي هذه؟ "</b>"</item>
-      <item quantity="two">"<b>"حذف رسالتي البريد الصوتي هاتين؟ "</b>"</item>
-      <item quantity="few">"<b>"حذف رسائل البريد الصوتي هذه؟ "</b>"</item>
-      <item quantity="many">"<b>"حذف رسائل البريد الصوتي هذه؟ "</b>"</item>
-      <item quantity="other">"<b>"حذف رسائل البريد الصوتي هذه؟ "</b>"</item>
-      <item quantity="one">"<b>"حذف رسالة البريد الصوتي هذه؟ "</b>"</item>
-    </plurals>
-    <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
-    <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> في <xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
-    <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="voice_search_not_available" msgid="6546240433719732905">"البحث الصوتي غير متاح"</string>
-    <string name="dialer_hint_find_contact" msgid="2023214799381149808">"البحث في جهات الاتصال"</string>
-    <string name="block_number_search_hint" msgid="5377706079015099416">"إضافة رقم أو البحث في جهات الاتصال"</string>
-    <string name="call_log_all_empty" msgid="3955572868518162004">"سجل مكالماتك فارغ"</string>
-    <string name="call_log_all_empty_action" msgid="852218280136243014">"إجراء مكالمة"</string>
-    <string name="call_log_missed_empty" msgid="7094936030845062214">"ليست لديك أية مكالمات لم يتم الرد عليها."</string>
-    <string name="call_log_voicemail_empty" msgid="273623903423275178">"مجلد بريدك الوارد الصوتي فارغ."</string>
-    <string name="call_log_activity_title" msgid="1275242727244945527">"سجل المكالمات"</string>
-    <string name="call_log_all_title" msgid="6042262422192020327">"الكل"</string>
-    <string name="call_log_missed_title" msgid="17254005889268015">"فائتة"</string>
-    <string name="tab_speed_dial" msgid="6616404752227561075">"اتصال سريع"</string>
-    <string name="tab_history" msgid="7420269368689503596">"سجل المكالمات"</string>
-    <string name="tab_all_contacts" msgid="5531733977693943015">"جهات الاتصال"</string>
-    <string name="tab_voicemail" msgid="2458548090088316246">"البريد الصوتي"</string>
-    <string name="search_shortcut_call_number" msgid="8847918845036880688">"الاتصال بالرقم <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"إنشاء جهة اتصال جديدة"</string>
-    <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"إضافة إلى جهة اتصال"</string>
-    <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"‏إرسال رسالة قصيرة SMS"</string>
-    <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"إجراء مكالمة فيديو"</string>
-    <string name="search_shortcut_block_number" msgid="4587283230665805776">"حظر الرقم"</string>
-    <string name="speed_dial_empty" msgid="3346406399966039505">"لم تتم إضافة أية جهة اتصال إلى قائمة الاتصال السريع حتى الآن"</string>
-    <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"إضافة مفضلة"</string>
-    <string name="remove_contact" msgid="2353580570488923668">"إزالة"</string>
-    <string name="select_all" msgid="408601760696146245">"تحديد الكل"</string>
-    <string name="call_log_action_video_call" msgid="7565549950343850819">"مكالمة فيديو"</string>
-    <string name="call_log_action_send_message" msgid="6948727362660115554">"إرسال رسالة"</string>
-    <string name="call_log_action_details" msgid="2091370737371449501">"تفاصيل المكالمة"</string>
-    <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"إرسال إلى ..."</string>
-    <string name="call_log_action_call" msgid="682724094251540583">"الاتصال بـ <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_incoming_missed_call" msgid="8292535799379230029">"مكالمة لم يرد عليها من <xliff:g id="NAMEORNUMBER">^1</xliff:g>، <xliff:g id="TYPEORLOCATION">^2</xliff:g>، <xliff:g id="TIMEOFCALL">^3</xliff:g>، <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_incoming_answered_call" msgid="3920182963103160610">"تم الرد على مكالمة من <xliff:g id="NAMEORNUMBER">^1</xliff:g>، <xliff:g id="TYPEORLOCATION">^2</xliff:g>، <xliff:g id="TIMEOFCALL">^3</xliff:g>، <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_unread_voicemail" msgid="145170985013419170">"البريد الصوتي غير المقروء من <xliff:g id="NAMEORNUMBER">^1</xliff:g>، <xliff:g id="TYPEORLOCATION">^2</xliff:g>، <xliff:g id="TIMEOFCALL">^3</xliff:g>، <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_read_voicemail" msgid="5585559881573227732">"البريد الصوتي من <xliff:g id="NAMEORNUMBER">^1</xliff:g>، <xliff:g id="TYPEORLOCATION">^2</xliff:g>، <xliff:g id="TIMEOFCALL">^3</xliff:g>، <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_outgoing_call" msgid="543952487882919924">"اتصال بـ <xliff:g id="NAMEORNUMBER">^1</xliff:g>، <xliff:g id="TYPEORLOCATION">^2</xliff:g>، <xliff:g id="TIMEOFCALL">^3</xliff:g>، <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="call_log_via_number" msgid="1340307109806397650">"من خلال <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> من خلال <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="description_call_action" msgid="4042796498169106545">"الاتصال بـ <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_video_call_action" msgid="1237090968588659650">"إجراء مكالمة فيديو مع <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
-    <string name="description_voicemail_action" msgid="3290143432403538524">"استماع إلى بريد صوتي من <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_create_new_contact_action" msgid="1928282350281564130">"إنشاء جهة اتصال لـ <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"إضافة <xliff:g id="NAMEORNUMBER">^1</xliff:g> إلى جهة اتصال حالية"</string>
-    <string name="description_details_action" msgid="2061866409737706174">"تفاصيل الاتصال لـ <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="call_log_header_today" msgid="1576119097475845293">"اليوم"</string>
-    <string name="call_log_header_yesterday" msgid="5616077776205329563">"أمس"</string>
-    <string name="call_log_header_other" msgid="4940676886254217644">"أقدم"</string>
-    <string name="voicemail_speaker_on" msgid="3151333608926996668">"تشغيل مكبر الصوت."</string>
-    <string name="voicemail_speaker_off" msgid="2530064206962034201">"تعطيل مكبر الصوت."</string>
-    <string name="voicemail_play_start_pause" msgid="3874823480278334664">"بدء التشغيل أو إيقافه مؤقتًا."</string>
-    <string name="display_options_title" msgid="3880091801055797975">"خيارات العرض"</string>
-    <string name="sounds_and_vibration_title" msgid="3075050000721181384">"الأصوات والاهتزاز"</string>
-    <string name="accessibility_settings_title" msgid="3329027650429831820">"إمكانية الوصول"</string>
-    <string name="ringtone_title" msgid="8377174189894648486">"نغمة رنين الهاتف"</string>
-    <string name="vibrate_on_ring_title" msgid="631441314790960485">"الاهتزاز أيضًا مع المكالمات"</string>
-    <string name="dtmf_tone_enable_title" msgid="3273762431523939277">"نغمات لوحة المفاتيح"</string>
-    <string name="dtmf_tone_length_title" msgid="534096029202438539">"طول نغمة لوحة المفاتيح"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="applicationLabel">الهاتف</string>
+  <string name="launcherDialpadActivityLabel">لوحة مفاتيح الهاتف</string>
+  <string name="callHistoryIconLabel">سجل المكالمات</string>
+  <string name="action_copy_number_text">نسخ الرقم</string>
+  <string name="copy_transcript_text">نسخ الكتابة الصوتية</string>
+  <string name="action_edit_number_before_call">تعديل الرقم قبل الاتصال</string>
+  <string name="call_log_delete_all">محو سجل المكالمات</string>
+  <string name="call_log_trash_voicemail">حذف رسالة البريد الصوتي</string>
+  <string name="snackbar_voicemail_deleted">تم حذف الرسالة الصوتية</string>
+  <string name="clearCallLogConfirmation_title">هل تريد محو سجل المكالمات؟</string>
+  <string name="clearCallLogConfirmation">سيؤدي ذلك إلى حذف جميع المكالمات من السجل</string>
+  <string name="clearCallLogProgress_title">جارٍ محو سجل المكالمات…</string>
+  <string name="notification_missedCallTitle">مكالمة فائتة</string>
+  <string name="notification_missedWorkCallTitle">مكالمة عمل فائتة</string>
+  <string name="notification_missedCallsTitle">المكالمات الفائتة</string>
+  <string name="notification_missedCallsMsg">%d من المكالمات الفائتة</string>
+  <string name="notification_missedCall_call_back">معاودة الاتصال</string>
+  <string name="notification_missedCall_message">رسالة</string>
+  <string name="post_call_notification_message">%1$s: %2$s</string>
+  <string name="notification_voicemail_text_format">طلب %s</string>
+  <string name="notification_voicemail_no_vm_number">رقم البريد الصوتي غير معروف</string>
+  <plurals name="notification_voicemail_title">
+    <item quantity="zero">لا تتوفر رسائل بريد صوتي (%1$d) </item>
+    <item quantity="one">رسالة بريد صوتي</item>
+    <item quantity="two">رسالتا بريد صوتي (%1$d) </item>
+    <item quantity="few"> %1$d رسائل بريد صوتي </item>
+    <item quantity="many"> %1$d رسالة بريد صوتي </item>
+    <item quantity="other"> %1$d من رسائل البريد الصوتي </item>
+  </plurals>
+  <string name="notification_voicemail_callers_list">%1$s، %2$s</string>
+  <string name="notification_new_voicemail_ticker">بريد صوتي جديد من %1$s</string>
+  <string name="voicemail_playback_error">تعذر تشغيل البريد الصوتي</string>
+  <string name="voicemail_fetching_content">جارٍ تحميل البريد الصوتي…</string>
+  <string name="voicemail_fetching_timout">تعذر تحميل البريد الصوتي</string>
+  <string name="call_log_item_count_and_date">(%1$d) %2$s</string>
+  <string name="description_playback_speakerphone">تشغيل مكبر الصوت أو إيقافه</string>
+  <string name="description_playback_seek">طلب موضع تشغيل</string>
+  <string name="action_menu_call_history_description">سجل المكالمات</string>
+  <string msgid="2295659037509008453" name="action_menu_overflow_description">مزيد من الخيارات</string>
+  <string name="action_menu_dialpad_button">لوحة المفاتيح</string>
+  <string name="dialer_settings_label">الإعدادات</string>
+  <string name="simulator_submenu_label">المحاكي</string>
+  <string name="new_ui_launcher_shortcut_label">إنشاء اختصار للواجهة الجديدة</string>
+  <string name="description_entering_bulk_action_mode">يتم الدخول إلى وضع الإجراء المجمَّع</string>
+  <string name="description_leaving_bulk_action_mode">تمت مغادرة وضع الإجراء المجمَّع</string>
+  <string name="description_selecting_bulk_action_mode">تم تحديد %1$s</string>
+  <string name="description_unselecting_bulk_action_mode">تم إلغاء تحديد %1$s</string>
+  <string name="description_contact_details">تفاصيل جهة الاتصال بـ %1$s</string>
+  <string name="description_spam_contact_details">تفاصيل جهة الاتصال للمتصل غير المرغوب فيه المشتبه به %1$s</string>
+  <string name="description_num_calls">%1$s من المكالمات.</string>
+  <string name="description_video_call">مكالمة فيديو.</string>
+  <string name="description_start_voice_search">بدء البحث الصوتي</string>
+  <string name="voicemail">البريد الصوتي</string>
+  <string name="description_cancel_multi_select">إلغاء وضع الإجراءات المجمَّع</string>
+  <string name="voicemailMultiSelectDeleteConfirm">حذف</string>
+  <string name="voicemailMultiSelectDeleteCancel">إلغاء</string>
+  <string name="voicemailMultiSelectActionBarTitle">تم تحديد %1$s</string>
+  <plurals name="delete_voicemails_confirmation_dialog_title">
+    <item quantity="zero"><b>حذف رسائل البريد الصوتي هذه؟ </b></item>
+    <item quantity="one"><b>حذف رسالة البريد الصوتي هذه؟ </b></item>
+    <item quantity="two"><b>حذف رسالتي البريد الصوتي هاتين؟ </b></item>
+    <item quantity="few"><b>حذف رسائل البريد الصوتي هذه؟ </b></item>
+    <item quantity="many"><b>حذف رسائل البريد الصوتي هذه؟ </b></item>
+    <item quantity="other"><b>حذف رسائل البريد الصوتي هذه؟ </b></item>
+  </plurals>
+  <string name="voicemailCallLogToday">@string/call_log_header_today</string>
+  <string name="voicemailCallLogDateTimeFormat">%1$s في %2$s</string>
+  <string name="voicemailDurationFormat">%1$02d:%2$02d</string>
+  <string name="voicemailCallLogDateTimeFormatWithDuration">%1$s • %2$s</string>
+  <string name="voice_search_not_available">البحث الصوتي غير متاح</string>
+  <string name="dialer_hint_find_contact">البحث في جهات الاتصال</string>
+  <string name="block_number_search_hint">إضافة رقم أو البحث في جهات الاتصال</string>
+  <string name="call_log_all_empty">سجل مكالماتك فارغ</string>
+  <string name="call_log_all_empty_action">إجراء مكالمة</string>
+  <string name="call_log_missed_empty">ليست لديك أي مكالمات لم يتم الرد عليها.</string>
+  <string name="call_log_voicemail_empty">مجلد بريدك الوارد الصوتي فارغ.</string>
+  <string name="call_log_activity_title">سجل المكالمات</string>
+  <string name="call_log_all_title">الكل</string>
+  <string name="call_log_missed_title">فائتة</string>
+  <string name="tab_speed_dial">اتصال سريع</string>
+  <string name="tab_history">سجل المكالمات</string>
+  <string name="tab_all_contacts">جهات الاتصال</string>
+  <string name="tab_voicemail">البريد الصوتي</string>
+  <string name="search_shortcut_call_number">الاتصال بالرقم %s</string>
+  <string name="search_shortcut_create_new_contact">إنشاء جهة اتصال جديدة</string>
+  <string name="search_shortcut_add_to_contact">إضافة إلى جهة اتصال</string>
+  <string name="search_shortcut_send_sms_message">‏إرسال رسالة قصيرة SMS</string>
+  <string name="search_shortcut_make_video_call">إجراء مكالمة فيديو</string>
+  <string name="search_shortcut_block_number">حظر الرقم</string>
+  <string name="speed_dial_empty">لم تتم إضافة أي جهة اتصال إلى قائمة الاتصال السريع حتى الآن</string>
+  <string name="speed_dial_empty_add_favorite_action">إضافة مفضلة</string>
+  <string name="remove_contact">إزالة</string>
+  <string name="select_all">تحديد الكل</string>
+  <string name="call_log_action_video_call">مكالمة فيديو</string>
+  <string name="call_log_action_set_up_video">إعداد مكالمات الفيديو</string>
+  <string name="call_log_action_invite_video">دعوة إلى مكالمة فيديو</string>
+  <string name="call_log_action_send_message">إرسال رسالة</string>
+  <string name="call_log_action_details">تفاصيل المكالمة</string>
+  <string name="call_log_action_share_voicemail">إرسال إلى ...</string>
+  <string name="call_log_action_call">الاتصال بـ ^1</string>
+  <string name="description_incoming_missed_call">مكالمة لم يرد عليها من ^1، ^2، ^3، ^4.</string>
+  <string name="description_incoming_answered_call">تم الرد على مكالمة من ^1، ^2، ^3، ^4.</string>
+  <string name="description_unread_voicemail">البريد الصوتي غير المقروء من ^1، ^2، ^3، ^4.</string>
+  <string name="description_read_voicemail">البريد الصوتي من ^1، ^2، ^3، ^4.</string>
+  <string name="description_outgoing_call">اتصال بـ ^1، ^2، ^3، ^4.</string>
+  <string name="call_log_via_number">من خلال %1$s</string>
+  <string name="call_log_via_number_phone_account">%1$s من خلال %2$s</string>
+  <string name="description_call_action">الاتصال بـ ^1</string>
+  <string name="description_video_call_action">إجراء مكالمة فيديو مع ^1.</string>
+  <string name="description_voicemail_action">استماع إلى بريد صوتي من ^1</string>
+  <string name="description_create_new_contact_action">إنشاء جهة اتصال لـ ^1</string>
+  <string name="description_add_to_existing_contact_action">إضافة ^1 إلى جهة اتصال حالية</string>
+  <string name="description_details_action">تفاصيل الاتصال لـ ^1</string>
+  <string name="call_log_header_today">اليوم</string>
+  <string name="call_log_header_yesterday">أمس</string>
+  <string name="call_log_header_other">أقدم</string>
+  <string name="voicemail_speaker_on">تشغيل مكبر الصوت.</string>
+  <string name="voicemail_speaker_off">إيقاف مكبر الصوت.</string>
+  <string name="voicemail_play_start_pause">بدء التشغيل أو إيقافه مؤقتًا.</string>
+  <string name="display_options_title">خيارات العرض</string>
+  <string name="sounds_and_vibration_title">الأصوات والاهتزاز</string>
+  <string name="accessibility_settings_title">إمكانية الوصول</string>
+  <string name="ringtone_title">نغمة رنين الهاتف</string>
+  <string name="vibrate_on_ring_title">اهتزاز الجهاز مع المكالمات أيضًا</string>
+  <string name="dtmf_tone_enable_title">نغمات لوحة المفاتيح</string>
+  <string name="dtmf_tone_length_title">طول نغمة لوحة المفاتيح</string>
   <string-array name="dtmf_tone_length_entries">
-    <item msgid="3136353015227162823">"عادية"</item>
-    <item msgid="5376841175538523822">"طويلة"</item>
+    <item>عادية</item>
+    <item>طويلة</item>
   </string-array>
-    <string name="respond_via_sms_setting_title" msgid="8008181606657693452">"الردود السريعة"</string>
-    <string name="call_settings_label" msgid="7824611757200960807">"المكالمات"</string>
-    <string name="manage_blocked_numbers_label" msgid="16823761991832273">"حظر المكالمات"</string>
-    <string name="voicemail_settings_label" msgid="4594299554519920570">"البريد الصوتي"</string>
-    <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"حظر المكالمات معطّل مؤقتًا"</string>
-    <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"تم تعطيل حظر المكالمات لأنك اتصلت بخدمات الطوارئ خلال 48 ساعة ماضية. وستتم إعادة تمكينه تلقائيًا بعد انتهاء هذه الفترة التي تبلغ 48 ساعة."</string>
-    <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"استيراد الأرقام"</string>
-    <string name="blocked_call_settings_import_description" msgid="1819412052545228965">"سبق لك تعيين بعض المتصلين على الإرسال تلقائيًا للبريد الصوتي عبر التطبيقات الأخرى."</string>
-    <string name="blocked_call_settings_view_numbers_button" msgid="3332727948554356704">"عرض الأرقام"</string>
-    <string name="blocked_call_settings_import_button" msgid="7319111700387470727">"استيراد"</string>
-    <string name="description_blocked_number_list_delete" msgid="2139644216858370740">"إلغاء حظر الرقم"</string>
-    <string name="addBlockedNumber" msgid="3053473735238295551">"إضافة رقم"</string>
-    <string name="block_number_footer_message_vvm" msgid="7955326304033982368">"سيتم حظر المكالمات من هذه الأرقام وسيتم حذف الرسائل الصوتية تلقائيًا."</string>
-    <string name="block_number_footer_message_no_vvm" msgid="1152684139070471665">"سيتم حظر المكالمات من هذه الأرقام، إلا أنه قد يظل بإمكانك ترك رسائلك الصوتية."</string>
-    <string name="block_list" msgid="4701585783411870782">"الأرقام المحظورة"</string>
-    <string name="alreadyBlocked" msgid="5483253180532475653">"تم حظر <xliff:g id="NUMBER">%1$s</xliff:g>."</string>
-    <string name="phone_account_settings_label" msgid="8372485478006965920">"حسابات الاتصال"</string>
-    <string name="permission_no_speeddial" msgid="8487215628510596753">"لتمكين الاتصال السريع، شغِّل إذن جهات الاتصال."</string>
-    <string name="permission_no_calllog" msgid="4053705651238775784">"للاطلاع على سجل المكالمات، شغِّل إذن الهاتف."</string>
-    <string name="permission_no_search" msgid="2424710404207193826">"للبحث عن جهات الاتصال، عليك تشغيل أذونات جهات الاتصال."</string>
-    <string name="permission_place_call" msgid="8686908130349369423">"لإجراء مكالمة، شغِّل إذن الهاتف."</string>
-    <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"ليس لدى تطبيق الهاتف إذن لتعديل إعدادات النظام."</string>
-    <string name="blocked_number_call_log_label" msgid="4212282846299997693">"محظور"</string>
-    <string name="call_log_action_block_report_number" msgid="7302636538668696729">"حظر/إبلاغ عن رقم غير مرغوب فيه"</string>
-    <string name="call_log_action_block_number" msgid="5048188386501998865">"حظر الرقم"</string>
-    <string name="call_log_action_remove_spam" msgid="2045319806318398403">"ليس رقمًا غير مرغوب فيه"</string>
-    <string name="call_log_action_unblock_number" msgid="6100117033288448758">"إلغاء حظر الرقم"</string>
-    <string name="spam_number_call_log_label" msgid="2678431398326811131">"تعليق غير مرغوب فيه"</string>
-    <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> غير متصل ولا يمكن الوصول إليه"</string>
-    <string name="about_phone_label" msgid="582991354677973731">"حول"</string>
-    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"‏تم النسخ بواسطة Google"</string>
-    <string name="voicemail_transcription_in_progress" msgid="2933320969613783210">"‏جارٍ تحويل الصوت إلى نص بواسطة Google..."</string>
-    <string name="voicemail_transcription_failed" msgid="335275303117412706">"النص غير متاح."</string>
-    <string name="voicemail_transcription_failed_language_not_supported" msgid="4210332591050562553">"النص غير متاح. اللغة غير مدعومة."</string>
-    <string name="voicemail_transcription_failed_no_speech" msgid="9093372879697874852">"النص غير متاح. لم يتم اكتشاف أي كلام."</string>
-    <string name="view_conversation" msgid="7895904782094119702">"عرض"</string>
-    <string name="ec_data_deleted" msgid="4794880345545827107">"‏تم حذف المكالمة. يمكنك عرض وحذف المرفقات التي تمت مشاركتها أثناء هذه المكالمة في Messages."</string>
-    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"‏تم حذف المكالمة. يمكنك عرض وحذف المرفقات التي تمت مشاركتها أثناء إجراء المكالمات في Messages."</string>
+  <string name="respond_via_sms_setting_title">الردود السريعة</string>
+  <string name="call_settings_label">المكالمات</string>
+  <string name="manage_blocked_numbers_label">الأرقام المحظورة</string>
+  <string name="voicemail_settings_label">البريد الصوتي</string>
+  <string name="blocked_numbers_disabled_emergency_header_label">حظر المكالمات غير مفعّل مؤقتًا</string>
+  <string name="blocked_numbers_disabled_emergency_desc">تم إيقاف حظر المكالمات لأنك اتصلت بخدمات الطوارئ خلال 48 ساعة ماضية. وستتم إعادة تمكينه تلقائيًا بعد انتهاء هذه الفترة التي تبلغ 48 ساعة.</string>
+  <string name="import_send_to_voicemail_numbers_label">استيراد الأرقام</string>
+  <string name="blocked_call_settings_import_description">سبق لك تعيين بعض المتصلين على الإرسال تلقائيًا للبريد الصوتي عبر التطبيقات الأخرى.</string>
+  <string name="blocked_call_settings_view_numbers_button">عرض الأرقام</string>
+  <string name="blocked_call_settings_import_button">استيراد</string>
+  <string name="description_blocked_number_list_delete">إلغاء حظر الرقم</string>
+  <string name="addBlockedNumber">إضافة رقم</string>
+  <string name="block_number_footer_message_vvm">سيتم حظر المكالمات من هذه الأرقام وسيتم حذف الرسائل الصوتية تلقائيًا.</string>
+  <string name="block_number_footer_message_no_vvm">سيتم حظر المكالمات من هذه الأرقام، إلا أنه قد يظل بإمكانك ترك رسائلك الصوتية.</string>
+  <string name="block_list">الأرقام المحظورة</string>
+  <string name="alreadyBlocked">تم حظر %1$s.</string>
+  <string name="phone_account_settings_label">حسابات الاتصال</string>
+  <string name="permission_no_speeddial">لتمكين الاتصال السريع، شغِّل إذن جهات الاتصال.</string>
+  <string name="permission_no_calllog">للاطلاع على سجل المكالمات، شغِّل إذن الهاتف.</string>
+  <string name="permission_no_search">للبحث عن جهات الاتصال، عليك تشغيل أذونات جهات الاتصال.</string>
+  <string name="permission_place_call">لإجراء مكالمة، شغِّل إذن الهاتف.</string>
+  <string name="toast_cannot_write_system_settings">ليس لدى تطبيق الهاتف إذن لتعديل إعدادات النظام.</string>
+  <string name="blocked_number_call_log_label">محظور </string>
+  <string name="call_log_action_block_report_number">حظر/إبلاغ عن رقم غير مرغوب فيه</string>
+  <string name="call_log_action_block_number">حظر الرقم</string>
+  <string name="call_log_action_remove_spam">ليس رقمًا غير مرغوب فيه</string>
+  <string name="call_log_action_unblock_number">إلغاء حظر الرقم</string>
+  <string name="spam_number_call_log_label">تعليق غير مرغوب فيه</string>
+  <string name="call_composer_connection_failed">%1$s غير متصل ولا يمكن الوصول إليه</string>
+  <string name="about_phone_label">حول</string>
+  <string name="voicemail_transcription_branding_text">‏تم النسخ بواسطة Google</string>
+  <string name="voicemail_transcription_in_progress">جارٍ تحويل الصوت إلى نص…</string>
+  <string name="voicemail_transcription_failed">النص غير متاح.</string>
+  <string name="voicemail_transcription_failed_language_not_supported">النص غير متاح. اللغة غير مدعومة.</string>
+  <string name="voicemail_transcription_failed_no_speech">النص غير متاح. لم يتم اكتشاف أي كلام.</string>
+  <string name="voicemail_donation_promo_title">هل تريد المساعدة في تحسين دقة ميزة تحويل الصوت إلى نص؟</string>
+  <string name="voicemail_donation_promo_content">‏اسمح لخدمات Google بمراجعة رسالة البريد الصوتي هذه، بالإضافة إلى رسائل البريد الصوتي المستقبلية التي تحتوي على نصوص. سيتم تخزين الرسائل بدون تحديد هوية مالكها. يمكنك تغيير الإعدادات في أي وقت. %1$s</string>
+  <string name="voicemail_donation_promo_opt_in">نعم، موافق</string>
+  <string name="voicemail_donation_promo_opt_out">لا، شكرًا</string>
+  <string name="voicemail_transcription_rating">تقييم جودة تسجيل النص الصوتي</string>
+  <string name="voicemail_transcription_rating_thanks">شكرًا لتعليقاتك</string>
+  <string name="description_rating_good">أعجبني</string>
+  <string name="description_rating_bad">لم يُعجبني</string>
+  <string name="view_conversation">عرض</string>
+  <string name="ec_data_deleted">‏تم حذف المكالمة. يمكنك عرض وحذف المرفقات التي تمت مشاركتها أثناء هذه المكالمة في Messages.</string>
+  <string name="multiple_ec_data_deleted">‏تم حذف المكالمة. يمكنك عرض وحذف المرفقات التي تمت مشاركتها أثناء إجراء المكالمات في Messages.</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-az/strings.xml b/java/com/android/dialer/app/res/values-az/strings.xml
index 134b800..f8881e0 100644
--- a/java/com/android/dialer/app/res/values-az/strings.xml
+++ b/java/com/android/dialer/app/res/values-az/strings.xml
@@ -1,179 +1,171 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="applicationLabel" msgid="2202739481132958990">"Telefon"</string>
-    <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"Telefon Klaviaturası"</string>
-    <string name="callHistoryIconLabel" msgid="7493268743411968630">"Zəng tarixçəsi"</string>
-    <string name="action_copy_number_text" msgid="832682558551502319">"Nömrəni kopyalayın"</string>
-    <string name="copy_transcript_text" msgid="937904189017310829">"Transkripsiyanı kopyalayın"</string>
-    <string name="action_edit_number_before_call" msgid="8017492815878473837">"Zəng etmədən öncə nömrəyə düzəliş edin"</string>
-    <string name="call_log_delete_all" msgid="7852970926906523784">"Zəng tarixçəsini təmizlə"</string>
-    <string name="call_log_trash_voicemail" msgid="6118493534178533972">"Səsli məktubu silin"</string>
-    <string name="snackbar_voicemail_deleted" msgid="7463166543725496307">"Səsli məktub silindi"</string>
-    <string name="snackbar_voicemail_deleted_undo" msgid="6959743982796409941">"GERİ ALIN"</string>
-    <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"Zəng tarixçəsi təmizlənsin?"</string>
-    <string name="clearCallLogConfirmation" msgid="6844949465815109166">"Bu, tarixçənizdən bütün zəngləri siləcəkdir"</string>
-    <string name="clearCallLogProgress_title" msgid="995004835687361977">"Zəng tarixçəsi silinir…"</string>
-    <string name="notification_missedCallTitle" msgid="8283366068539898486">"Buraxılmış zəng"</string>
-    <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"Buraxılmış iş çağrısı"</string>
-    <string name="notification_missedCallsTitle" msgid="3697442015345089802">"Buraxılmış zənglər"</string>
-    <string name="notification_missedCallsMsg" msgid="8176217633929018706">"<xliff:g id="NUM_MISSED_CALLS">%d</xliff:g> buraxılmış zənglər"</string>
-    <string name="notification_missedCall_call_back" msgid="3875698110051973965">"Geriyə zəng"</string>
-    <string name="notification_missedCall_message" msgid="5086910028988305964">"Mesaj"</string>
-    <string name="post_call_notification_message" msgid="5417476789860590611">"<xliff:g id="NAME">%1$s</xliff:g>: <xliff:g id="MESSAGE">%2$s</xliff:g>"</string>
-    <string name="notification_voicemail_text_format" msgid="1895667520930252897">"<xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g> nömrəsini yığın"</string>
-    <string name="notification_voicemail_no_vm_number" msgid="8942821987929495842">"Səsli e-poçt nömrəsi naməlumdur"</string>
-    <plurals name="notification_voicemail_title" formatted="false" msgid="1551847434476438657">
-      <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> Səsli poçt </item>
-      <item quantity="one">Səsli poçt</item>
-    </plurals>
-    <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
-    <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"<xliff:g id="CALLER">%1$s</xliff:g> adlı şəxsdən yeni səsli məktub"</string>
-    <string name="voicemail_playback_error" msgid="4384373852257757295">"Səsli poçtu səsləndirmək mümkün deyil"</string>
-    <string name="voicemail_fetching_content" msgid="572320120918636014">"Səsli poçt yüklənir…"</string>
-    <string name="voicemail_fetching_timout" msgid="2128873915839949783">"Səsli poçtu yükləmək mümkün olmadı"</string>
-    <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_playback_speakerphone" msgid="4852027754869750227">"Spikerfonu aktiv və ya deaktiv edin"</string>
-    <string name="description_playback_seek" msgid="1340910573254132520">"Oxutma pozisiyası axtarın"</string>
-    <string name="action_menu_call_history_description" msgid="8829135306925008546">"Zəng tarixçəsi"</string>
-    <string name="action_menu_overflow_description" msgid="7648679686746517341">"Daha çox seçim"</string>
-    <string name="action_menu_dialpad_button" msgid="1970631633457493180">"klaviatura"</string>
-    <string name="dialer_settings_label" msgid="4980176284150290175">"Ayarlar"</string>
-    <string name="simulator_submenu_label" msgid="186156287346615267">"Stimulyator"</string>
-    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Yeni İİ Qısayolu yaradın"</string>
-    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"Toplu əməliyyat rejiminə daxil olunur"</string>
-    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"Toplu əməliyyat rejimi tərk edilir"</string>
-    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> seçildi"</string>
-    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> seçilmədi"</string>
-    <string name="description_contact_details" msgid="3341280873855253464">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> üçün kontakt detalları"</string>
-    <string name="description_spam_contact_details" msgid="5592578752881528368">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> şübhəli spam zəng edəni üçün kontakt detalları"</string>
-    <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> zəng."</string>
-    <string name="description_video_call" msgid="3738199365585751727">"Video çağrı."</string>
-    <string name="description_start_voice_search" msgid="8380022725973015261">"Səs axtarışına başlayın"</string>
-    <string name="voicemail" msgid="8899540969000957954">"Səsli poçt"</string>
-    <string name="description_cancel_multi_select" msgid="3930475950253360461">"Qrup əməliyyatları rejimini ləğv edin"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Silin"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Ləğv edin"</string>
-    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> seçilib"</string>
-    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
-      <item quantity="other">"<b>"Bu səsli e-məktub silinsin? "</b>"</item>
-      <item quantity="one">"<b>"Bu səsli e-məktub silinsin? "</b>"</item>
-    </plurals>
-    <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
-    <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> tarixində <xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
-    <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="voice_search_not_available" msgid="6546240433719732905">"Səsli axtarış mövcud deyil"</string>
-    <string name="dialer_hint_find_contact" msgid="2023214799381149808">"Kontakt axtarın"</string>
-    <string name="block_number_search_hint" msgid="5377706079015099416">"Nömrə əlavə edin və ya kontaktlarda axtarın"</string>
-    <string name="call_log_all_empty" msgid="3955572868518162004">"Zəng tarixçəniz boşdur"</string>
-    <string name="call_log_all_empty_action" msgid="852218280136243014">"Zəng edin"</string>
-    <string name="call_log_missed_empty" msgid="7094936030845062214">"Buraxılmış heç bir zənginiz yoxdur."</string>
-    <string name="call_log_voicemail_empty" msgid="273623903423275178">"Səsli poçt qutunuz boşdur."</string>
-    <string name="call_log_activity_title" msgid="1275242727244945527">"Çağrı Tarixçəsi"</string>
-    <string name="call_log_all_title" msgid="6042262422192020327">"Bütün"</string>
-    <string name="call_log_missed_title" msgid="17254005889268015">"Buraxılmış"</string>
-    <string name="tab_speed_dial" msgid="6616404752227561075">"Sürətli nömrə yığımı"</string>
-    <string name="tab_history" msgid="7420269368689503596">"Zəng Tarixçəsi"</string>
-    <string name="tab_all_contacts" msgid="5531733977693943015">"Kontaktlar"</string>
-    <string name="tab_voicemail" msgid="2458548090088316246">"Səsli poçt"</string>
-    <string name="search_shortcut_call_number" msgid="8847918845036880688">"<xliff:g id="NUMBER">%s</xliff:g> zəng edin"</string>
-    <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"Yeni kontakt yaradın"</string>
-    <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"Kontakta əlavə edin"</string>
-    <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"SMS göndərin"</string>
-    <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"Video zəng edin"</string>
-    <string name="search_shortcut_block_number" msgid="4587283230665805776">"Nömrəni blok edin"</string>
-    <string name="speed_dial_empty" msgid="3346406399966039505">"Hələ sürətli zəng siyahınızda hec kim yoxdur"</string>
-    <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"Sevimlilərə əlavə edin"</string>
-    <string name="remove_contact" msgid="2353580570488923668">"Yığışdır"</string>
-    <string name="select_all" msgid="408601760696146245">"Hamısını seçin"</string>
-    <string name="call_log_action_video_call" msgid="7565549950343850819">"Video zəng"</string>
-    <string name="call_log_action_send_message" msgid="6948727362660115554">"Mesaj göndərin"</string>
-    <string name="call_log_action_details" msgid="2091370737371449501">"Zəng detalları"</string>
-    <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"Bu şəxsə göndərin:"</string>
-    <string name="call_log_action_call" msgid="682724094251540583">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> nömrəsinə zəng edin"</string>
-    <string name="description_incoming_missed_call" msgid="8292535799379230029">"Buraxılmış zənglər: <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_incoming_answered_call" msgid="3920182963103160610">"Zəngləri cavablandırıb: <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_unread_voicemail" msgid="145170985013419170">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g> hesabına gələn oxunmamış səsli mesaj."</string>
-    <string name="description_read_voicemail" msgid="5585559881573227732">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g> hesabına gələn səsli mesaj."</string>
-    <string name="description_outgoing_call" msgid="543952487882919924">"Zəng et: <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="call_log_via_number" msgid="1340307109806397650">"<xliff:g id="NUMBER">%1$s</xliff:g> vasitəsilə"</string>
-    <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g> vasitəsilə"</string>
-    <string name="description_call_action" msgid="4042796498169106545">"Çağrı <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_video_call_action" msgid="1237090968588659650">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> video zəng edin."</string>
-    <string name="description_voicemail_action" msgid="3290143432403538524">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> tərəfdən səsli mesajı dinləyin"</string>
-    <string name="description_create_new_contact_action" msgid="1928282350281564130">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> üçün kontakt yaradın"</string>
-    <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"Mövcud kontakta <xliff:g id="NAMEORNUMBER">^1</xliff:g> əlavə edin"</string>
-    <string name="description_details_action" msgid="2061866409737706174">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> üçün detalları çağırın"</string>
-    <string name="call_log_header_today" msgid="1576119097475845293">"Bu gün"</string>
-    <string name="call_log_header_yesterday" msgid="5616077776205329563">"Dünən"</string>
-    <string name="call_log_header_other" msgid="4940676886254217644">"Keçmi"</string>
-    <string name="voicemail_speaker_on" msgid="3151333608926996668">"Dinamiki aktiv et."</string>
-    <string name="voicemail_speaker_off" msgid="2530064206962034201">"Dinamiki deaktiv et."</string>
-    <string name="voicemail_play_start_pause" msgid="3874823480278334664">"Oxunuşu başlat və ya durdur"</string>
-    <string name="display_options_title" msgid="3880091801055797975">"Ekran seçimləri"</string>
-    <string name="sounds_and_vibration_title" msgid="3075050000721181384">"Səslər və vibrasiya"</string>
-    <string name="accessibility_settings_title" msgid="3329027650429831820">"Münasiblik"</string>
-    <string name="ringtone_title" msgid="8377174189894648486">"Telefon zəng səsi"</string>
-    <string name="vibrate_on_ring_title" msgid="631441314790960485">"Həmçinin zənglər üçün vibrasiya olsun"</string>
-    <string name="dtmf_tone_enable_title" msgid="3273762431523939277">"Klaviatura səsi"</string>
-    <string name="dtmf_tone_length_title" msgid="534096029202438539">"Klaviatura səsinin uzunluğu"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="applicationLabel">Telefon</string>
+  <string name="launcherDialpadActivityLabel">Telefon Klaviaturası</string>
+  <string name="callHistoryIconLabel">Zəng tarixçəsi</string>
+  <string name="action_copy_number_text">Nömrəni kopyalayın</string>
+  <string name="copy_transcript_text">Transkripsiyanı kopyalayın</string>
+  <string name="action_edit_number_before_call">Zəng etmədən öncə nömrəyə düzəliş edin</string>
+  <string name="call_log_delete_all">Zəng tarixçəsini təmizlə</string>
+  <string name="call_log_trash_voicemail">Səsli məktubu silin</string>
+  <string name="snackbar_voicemail_deleted">Səsli məktub silindi</string>
+  <string name="clearCallLogConfirmation_title">Zəng tarixçəsi təmizlənsin?</string>
+  <string name="clearCallLogConfirmation">Bu, tarixçənizdən bütün zəngləri siləcəkdir</string>
+  <string name="clearCallLogProgress_title">Zəng tarixçəsi silinir…</string>
+  <string name="notification_missedCallTitle">Buraxılmış zəng</string>
+  <string name="notification_missedWorkCallTitle">Buraxılmış iş çağrısı</string>
+  <string name="notification_missedCallsTitle">Buraxılmış zənglər</string>
+  <string name="notification_missedCallsMsg">%d buraxılmış zənglər</string>
+  <string name="notification_missedCall_call_back">Geriyə zəng</string>
+  <string name="notification_missedCall_message">Mesaj</string>
+  <string name="post_call_notification_message">%1$s: %2$s</string>
+  <string name="notification_voicemail_text_format">%s nömrəsini yığın</string>
+  <string name="notification_voicemail_no_vm_number">Səsli e-poçt nömrəsi naməlumdur</string>
+  <plurals name="notification_voicemail_title">
+    <item quantity="one">Səsli poçt</item>
+    <item quantity="other"> %1$d Səsli poçt </item>
+  </plurals>
+  <string name="notification_voicemail_callers_list">%1$s, %2$s</string>
+  <string name="notification_new_voicemail_ticker">%1$s adlı şəxsdən yeni səsli məktub</string>
+  <string name="voicemail_playback_error">Səsli poçtu səsləndirmək mümkün deyil</string>
+  <string name="voicemail_fetching_content">Səsli poçt yüklənir…</string>
+  <string name="voicemail_fetching_timout">Səsli poçtu yükləmək mümkün olmadı</string>
+  <string name="call_log_item_count_and_date">(%1$d) %2$s</string>
+  <string name="description_playback_speakerphone">Spikerfonu aktiv və ya deaktiv edin</string>
+  <string name="description_playback_seek">Oxutma pozisiyası axtarın</string>
+  <string name="action_menu_call_history_description">Zəng tarixçəsi</string>
+  <string msgid="2295659037509008453" name="action_menu_overflow_description">Daha çox seçim</string>
+  <string name="action_menu_dialpad_button">klaviatura</string>
+  <string name="dialer_settings_label">Ayarlar</string>
+  <string name="simulator_submenu_label">Stimulyator</string>
+  <string name="new_ui_launcher_shortcut_label">Yeni İİ Qısayolu yaradın</string>
+  <string name="description_entering_bulk_action_mode">Toplu əməliyyat rejiminə daxil olunur</string>
+  <string name="description_leaving_bulk_action_mode">Toplu əməliyyat rejimi tərk edilir</string>
+  <string name="description_selecting_bulk_action_mode">%1$s seçildi</string>
+  <string name="description_unselecting_bulk_action_mode">%1$s seçilmədi</string>
+  <string name="description_contact_details">%1$s üçün kontakt detalları</string>
+  <string name="description_spam_contact_details">%1$s şübhəli spam zəng edəni üçün kontakt detalları</string>
+  <string name="description_num_calls">%1$s zəng.</string>
+  <string name="description_video_call">Video çağrı.</string>
+  <string name="description_start_voice_search">Səs axtarışına başlayın</string>
+  <string name="voicemail">Səsli poçt</string>
+  <string name="description_cancel_multi_select">Qrup əməliyyatları rejimini ləğv edin</string>
+  <string name="voicemailMultiSelectDeleteConfirm">Silin</string>
+  <string name="voicemailMultiSelectDeleteCancel">Ləğv edin</string>
+  <string name="voicemailMultiSelectActionBarTitle">%1$s seçilib</string>
+  <plurals name="delete_voicemails_confirmation_dialog_title">
+    <item quantity="one"><b>Bu səsli e-məktub silinsin? </b></item>
+    <item quantity="other"><b>Bu səsli e-məktub silinsin? </b></item>
+  </plurals>
+  <string name="voicemailCallLogToday">@string/call_log_header_today</string>
+  <string name="voicemailCallLogDateTimeFormat">%1$s tarixində %2$s</string>
+  <string name="voicemailDurationFormat">%1$02d:%2$02d</string>
+  <string name="voicemailCallLogDateTimeFormatWithDuration">%1$s • %2$s</string>
+  <string name="voice_search_not_available">Səsli axtarış mövcud deyil</string>
+  <string name="dialer_hint_find_contact">Kontakt axtarın</string>
+  <string name="block_number_search_hint">Nömrə əlavə edin və ya kontaktlarda axtarın</string>
+  <string name="call_log_all_empty">Zəng tarixçəniz boşdur</string>
+  <string name="call_log_all_empty_action">Zəng edin</string>
+  <string name="call_log_missed_empty">Buraxılmış heç bir zənginiz yoxdur.</string>
+  <string name="call_log_voicemail_empty">Səsli poçt qutunuz boşdur.</string>
+  <string name="call_log_activity_title">Çağrı Tarixçəsi</string>
+  <string name="call_log_all_title">Bütün</string>
+  <string name="call_log_missed_title">Buraxılmış</string>
+  <string name="tab_speed_dial">Sürətli nömrə yığımı</string>
+  <string name="tab_history">Zəng Tarixçəsi</string>
+  <string name="tab_all_contacts">Kontaktlar</string>
+  <string name="tab_voicemail">Səsli poçt</string>
+  <string name="search_shortcut_call_number">%s zəng edin</string>
+  <string name="search_shortcut_create_new_contact">Yeni kontakt yaradın</string>
+  <string name="search_shortcut_add_to_contact">Kontakta əlavə edin</string>
+  <string name="search_shortcut_send_sms_message">SMS göndərin</string>
+  <string name="search_shortcut_make_video_call">Video zəng edin</string>
+  <string name="search_shortcut_block_number">Nömrəni blok edin</string>
+  <string name="speed_dial_empty">Hələ sürətli zəng siyahınızda hec kim yoxdur</string>
+  <string name="speed_dial_empty_add_favorite_action">Sevimlilərə əlavə edin</string>
+  <string name="remove_contact">Yığışdır</string>
+  <string name="select_all">Hamısını seçin</string>
+  <string name="call_log_action_video_call">Video zəng</string>
+  <string name="call_log_action_set_up_video">Video zəngi quraşdırın</string>
+  <string name="call_log_action_invite_video">Video zəngə dəvət edin</string>
+  <string name="call_log_action_send_message">Mesaj göndərin</string>
+  <string name="call_log_action_details">Zəng detalları</string>
+  <string name="call_log_action_share_voicemail">Bu şəxsə göndərin:</string>
+  <string name="call_log_action_call">^1 nömrəsinə zəng edin</string>
+  <string name="description_incoming_missed_call">Buraxılmış zənglər: ^1, ^2, ^3, ^4.</string>
+  <string name="description_incoming_answered_call">Zəngləri cavablandırıb: ^1, ^2, ^3, ^4.</string>
+  <string name="description_unread_voicemail">^1, ^2, ^3, ^4 hesabına gələn oxunmamış səsli mesaj.</string>
+  <string name="description_read_voicemail">^1, ^2, ^3, ^4 hesabına gələn səsli mesaj.</string>
+  <string name="description_outgoing_call">Zəng et: ^1, ^2, ^3, ^4.</string>
+  <string name="call_log_via_number">%1$s vasitəsilə</string>
+  <string name="call_log_via_number_phone_account">%1$s %2$s vasitəsilə</string>
+  <string name="description_call_action">Çağrı ^1</string>
+  <string name="description_video_call_action">^1 video zəng edin.</string>
+  <string name="description_voicemail_action">^1 tərəfdən səsli mesajı dinləyin</string>
+  <string name="description_create_new_contact_action">^1 üçün kontakt yaradın</string>
+  <string name="description_add_to_existing_contact_action">Mövcud kontakta ^1 əlavə edin</string>
+  <string name="description_details_action">^1 üçün detalları çağırın</string>
+  <string name="call_log_header_today">Bu gün</string>
+  <string name="call_log_header_yesterday">Dünən</string>
+  <string name="call_log_header_other">Keçmi</string>
+  <string name="voicemail_speaker_on">Dinamiki aktiv et.</string>
+  <string name="voicemail_speaker_off">Dinamiki deaktiv et.</string>
+  <string name="voicemail_play_start_pause">Oxunuşu başlat və ya durdur</string>
+  <string name="display_options_title">Ekran seçimləri</string>
+  <string name="sounds_and_vibration_title">Səslər və vibrasiya</string>
+  <string name="accessibility_settings_title">Münasiblik</string>
+  <string name="ringtone_title">Telefon zəng səsi</string>
+  <string name="vibrate_on_ring_title">Həmçinin zənglər üçün vibrasiya olsun</string>
+  <string name="dtmf_tone_enable_title">Klaviatura səsi</string>
+  <string name="dtmf_tone_length_title">Klaviatura səsinin uzunluğu</string>
   <string-array name="dtmf_tone_length_entries">
-    <item msgid="3136353015227162823">"Normal"</item>
-    <item msgid="5376841175538523822">"Uzun"</item>
+    <item>Normal</item>
+    <item>Uzun</item>
   </string-array>
-    <string name="respond_via_sms_setting_title" msgid="8008181606657693452">"Tez cavablar"</string>
-    <string name="call_settings_label" msgid="7824611757200960807">"Zənglər"</string>
-    <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Zəng blok edilir"</string>
-    <string name="voicemail_settings_label" msgid="4594299554519920570">"Səsli e-məktub"</string>
-    <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Çağrının blok edilməsi müvəqqəti olaraq deaktiv edilib"</string>
-    <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Son 48 saat ərzində bu telefondan təcili yardım xidmətləri ilə əlaqə saxladığınız üçün Çağrı Bloklanması deaktiv edildi. 48 saatlıq müddət başa çatdıqda avtomatik olaraq yenidən aktiv ediləcək."</string>
-    <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Nömrələri import edin"</string>
-    <string name="blocked_call_settings_import_description" msgid="1819412052545228965">"Əvvəlcədən qeyd etdiyiniz bəzi zəng edənlər digər tətbiqlərin vasiyəsilə avtomatik olaraq səsli mesaja yönləndiriləcək."</string>
-    <string name="blocked_call_settings_view_numbers_button" msgid="3332727948554356704">"Rəqəmlərə baxın"</string>
-    <string name="blocked_call_settings_import_button" msgid="7319111700387470727">"İmport"</string>
-    <string name="description_blocked_number_list_delete" msgid="2139644216858370740">"Nömrəni blokdan çıxarın"</string>
-    <string name="addBlockedNumber" msgid="3053473735238295551">"Nömrə əlavə edin"</string>
-    <string name="block_number_footer_message_vvm" msgid="7955326304033982368">"Bu nömrələrdən zənglər blok ediləcək və səsli məktublar avtomatik silinəcək."</string>
-    <string name="block_number_footer_message_no_vvm" msgid="1152684139070471665">"Bu nömrələrdən zənglər blok ediləcək, amma yenə də səsli məktub qoya bilərsiniz."</string>
-    <string name="block_list" msgid="4701585783411870782">"Bloklanmış nömrələr"</string>
-    <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g> artıq bloklanıb."</string>
-    <string name="phone_account_settings_label" msgid="8372485478006965920">"Hesabların çağrılması"</string>
-    <string name="permission_no_speeddial" msgid="8487215628510596753">"Sürətli yığımı aktivləşdirmək üçün, Kontakt icazələrini aktivləşdirin."</string>
-    <string name="permission_no_calllog" msgid="4053705651238775784">"Çağrı jurnalınızı görmək üçün Telefon icazəsini aktivləşdirin."</string>
-    <string name="permission_no_search" msgid="2424710404207193826">"Kontaktlarınızı axtarmaq üçün, Kontakt icazələrini aktiv edin."</string>
-    <string name="permission_place_call" msgid="8686908130349369423">"Zəng etmək üçün, Telefon icazəsini aktivləşdirin."</string>
-    <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"Telefon tətbiqinin sistem ayarlarına yazmaq icazəsi yoxdur."</string>
-    <string name="blocked_number_call_log_label" msgid="4212282846299997693">"Bloklanmış"</string>
-    <string name="call_log_action_block_report_number" msgid="7302636538668696729">"Spamı blok edin/bildirin"</string>
-    <string name="call_log_action_block_number" msgid="5048188386501998865">"Nömrəni blok edin"</string>
-    <string name="call_log_action_remove_spam" msgid="2045319806318398403">"Spam deyil"</string>
-    <string name="call_log_action_unblock_number" msgid="6100117033288448758">"Nömrəni blokdan çıxarın"</string>
-    <string name="spam_number_call_log_label" msgid="2678431398326811131">"Spam"</string>
-    <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> oflayn olduğu üçün əlaqə saxlamaq mümkün deyil"</string>
-    <string name="about_phone_label" msgid="582991354677973731">"Haqqında"</string>
-    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Google tərəfindən kopyalandı"</string>
-    <string name="voicemail_transcription_in_progress" msgid="2933320969613783210">"Google transkripsiyanı yazır..."</string>
-    <string name="voicemail_transcription_failed" msgid="335275303117412706">"Transkripsiya əlçatan deyil."</string>
-    <string name="voicemail_transcription_failed_language_not_supported" msgid="4210332591050562553">"Transkripsiya əlçatan deyil. Dil dəstəklənmir."</string>
-    <string name="voicemail_transcription_failed_no_speech" msgid="9093372879697874852">"Transkripsiya əlçatan deyil. Nitq seçilməyib."</string>
-    <string name="view_conversation" msgid="7895904782094119702">"Baxın"</string>
-    <string name="ec_data_deleted" msgid="4794880345545827107">"Zəng silindi. Bu zəng zamanı paylaşılan qoşmalara Mesajlaşma tətbiqində baxın və silin."</string>
-    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"Zənglər silindi. Bu zənglər zamanı paylaşılan qoşmalara Mesajlaşma tətbiqində baxın və silin."</string>
+  <string name="respond_via_sms_setting_title">Tez cavablar</string>
+  <string name="call_settings_label">Zənglər</string>
+  <string name="manage_blocked_numbers_label">Blok edilmiş nömrələr</string>
+  <string name="voicemail_settings_label">Səsli e-məktub</string>
+  <string name="blocked_numbers_disabled_emergency_header_label">Çağrının blok edilməsi müvəqqəti olaraq deaktiv edilib</string>
+  <string name="blocked_numbers_disabled_emergency_desc">Son 48 saat ərzində bu telefondan təcili yardım xidmətləri ilə əlaqə saxladığınız üçün Çağrı Bloklanması deaktiv edildi. 48 saatlıq müddət başa çatdıqda avtomatik olaraq yenidən aktiv ediləcək.</string>
+  <string name="import_send_to_voicemail_numbers_label">Nömrələri import edin</string>
+  <string name="blocked_call_settings_import_description">Əvvəlcədən qeyd etdiyiniz bəzi zəng edənlər digər tətbiqlərin vasiyəsilə avtomatik olaraq səsli mesaja yönləndiriləcək.</string>
+  <string name="blocked_call_settings_view_numbers_button">Rəqəmlərə baxın</string>
+  <string name="blocked_call_settings_import_button">İmport</string>
+  <string name="description_blocked_number_list_delete">Nömrəni blokdan çıxarın</string>
+  <string name="addBlockedNumber">Nömrə əlavə edin</string>
+  <string name="block_number_footer_message_vvm">Bu nömrələrdən zənglər blok ediləcək və səsli məktublar avtomatik silinəcək.</string>
+  <string name="block_number_footer_message_no_vvm">Bu nömrələrdən zənglər blok ediləcək, amma yenə də səsli məktub qoya bilərsiniz.</string>
+  <string name="block_list">Bloklanmış nömrələr</string>
+  <string name="alreadyBlocked">%1$s artıq bloklanıb.</string>
+  <string name="phone_account_settings_label">Hesabların çağrılması</string>
+  <string name="permission_no_speeddial">Sürətli yığımı aktivləşdirmək üçün, Kontakt icazələrini aktivləşdirin.</string>
+  <string name="permission_no_calllog">Çağrı jurnalınızı görmək üçün Telefon icazəsini aktivləşdirin.</string>
+  <string name="permission_no_search">Kontaktlarınızı axtarmaq üçün, Kontakt icazələrini aktiv edin.</string>
+  <string name="permission_place_call">Zəng etmək üçün, Telefon icazəsini aktivləşdirin.</string>
+  <string name="toast_cannot_write_system_settings">Telefon tətbiqinin sistem ayarlarına yazmaq icazəsi yoxdur.</string>
+  <string name="blocked_number_call_log_label">Bloklanmış</string>
+  <string name="call_log_action_block_report_number">Spamı blok edin/bildirin</string>
+  <string name="call_log_action_block_number">Nömrəni blok edin</string>
+  <string name="call_log_action_remove_spam">Spam deyil</string>
+  <string name="call_log_action_unblock_number">Nömrəni blokdan çıxarın</string>
+  <string name="spam_number_call_log_label">Spam</string>
+  <string name="call_composer_connection_failed">%1$s oflayn olduğu üçün əlaqə saxlamaq mümkün deyil</string>
+  <string name="about_phone_label">Haqqında</string>
+  <string name="voicemail_transcription_branding_text">Google tərəfindən kopyalandı</string>
+  <string name="voicemail_transcription_in_progress">Transkripsiya edilir...</string>
+  <string name="voicemail_transcription_failed">Transkripsiya əlçatan deyil.</string>
+  <string name="voicemail_transcription_failed_language_not_supported">Transkripsiya əlçatan deyil. Dil dəstəklənmir.</string>
+  <string name="voicemail_transcription_failed_no_speech">Transkripsiya əlçatan deyil. Nitq seçilməyib.</string>
+  <string name="voicemail_donation_promo_title">Transkripsiya dəqiqliyi təkmilləşdirilsin?</string>
+  <string name="voicemail_donation_promo_content">Google\'a transkripsiyası olan bu və gələcək səsli e-poçt mesajlarını nəzərdən keçirmək icazəsi verin. Onlar anonim şəkildə saxlanılacaq. İstənilan vaxt Ayarları dəyişin. %1$s</string>
+  <string name="voicemail_donation_promo_opt_in">Bəli, razıyam</string>
+  <string name="voicemail_donation_promo_opt_out">Xeyr, təşəkkürlər</string>
+  <string name="voicemail_transcription_rating">Keyfiyyəti qiymətləndirin</string>
+  <string name="voicemail_transcription_rating_thanks">Rəyiniz üçün təşəkkür edirik</string>
+  <string name="description_rating_good">Bəyənin</string>
+  <string name="description_rating_bad">Bəyənməyin</string>
+  <string name="view_conversation">Baxın</string>
+  <string name="ec_data_deleted">Zəng silindi. Bu zəng zamanı paylaşılan qoşmalara Mesajlaşma tətbiqində baxın və silin.</string>
+  <string name="multiple_ec_data_deleted">Zənglər silindi. Bu zənglər zamanı paylaşılan qoşmalara Mesajlaşma tətbiqində baxın və silin.</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-b+sr+Latn/strings.xml b/java/com/android/dialer/app/res/values-b+sr+Latn/strings.xml
index f56a74d..2381880 100644
--- a/java/com/android/dialer/app/res/values-b+sr+Latn/strings.xml
+++ b/java/com/android/dialer/app/res/values-b+sr+Latn/strings.xml
@@ -1,181 +1,173 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="applicationLabel" msgid="2202739481132958990">"Telefon"</string>
-    <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"Telefonska tastatura"</string>
-    <string name="callHistoryIconLabel" msgid="7493268743411968630">"Istorija poziva"</string>
-    <string name="action_copy_number_text" msgid="832682558551502319">"Kopiraj broj"</string>
-    <string name="copy_transcript_text" msgid="937904189017310829">"Kopiraj transkripciju"</string>
-    <string name="action_edit_number_before_call" msgid="8017492815878473837">"Izmeni broj pre poziva"</string>
-    <string name="call_log_delete_all" msgid="7852970926906523784">"Obriši istoriju poziva"</string>
-    <string name="call_log_trash_voicemail" msgid="6118493534178533972">"Izbriši govornu poruku"</string>
-    <string name="snackbar_voicemail_deleted" msgid="7463166543725496307">"Gov. pošta je izbrisana"</string>
-    <string name="snackbar_voicemail_deleted_undo" msgid="6959743982796409941">"OPOZOVI"</string>
-    <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"Želite da obrišete istoriju poziva?"</string>
-    <string name="clearCallLogConfirmation" msgid="6844949465815109166">"Ovo će izbrisati sve pozive iz istorije"</string>
-    <string name="clearCallLogProgress_title" msgid="995004835687361977">"Briše se istorija poziva…"</string>
-    <string name="notification_missedCallTitle" msgid="8283366068539898486">"Propušten poziv"</string>
-    <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"Propušten poziv za Work"</string>
-    <string name="notification_missedCallsTitle" msgid="3697442015345089802">"Propušteni pozivi"</string>
-    <string name="notification_missedCallsMsg" msgid="8176217633929018706">"Broj propuštenih poziva: <xliff:g id="NUM_MISSED_CALLS">%d</xliff:g>"</string>
-    <string name="notification_missedCall_call_back" msgid="3875698110051973965">"Uzvrati poziv"</string>
-    <string name="notification_missedCall_message" msgid="5086910028988305964">"Pošalji SMS"</string>
-    <string name="post_call_notification_message" msgid="5417476789860590611">"<xliff:g id="NAME">%1$s</xliff:g>: <xliff:g id="MESSAGE">%2$s</xliff:g>"</string>
-    <string name="notification_voicemail_text_format" msgid="1895667520930252897">"Pozovi <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
-    <string name="notification_voicemail_no_vm_number" msgid="8942821987929495842">"Nepoznat broj govorne pošte"</string>
-    <plurals name="notification_voicemail_title" formatted="false" msgid="1551847434476438657">
-      <item quantity="one"> <xliff:g id="COUNT">%1$d</xliff:g> govorna poruka </item>
-      <item quantity="few"> <xliff:g id="COUNT">%1$d</xliff:g> govorne poruke </item>
-      <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> govornih poruka </item>
-    </plurals>
-    <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
-    <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"Nova govorna poruka od <xliff:g id="CALLER">%1$s</xliff:g>"</string>
-    <string name="voicemail_playback_error" msgid="4384373852257757295">"Puštanje govorne pošte nije uspelo"</string>
-    <string name="voicemail_fetching_content" msgid="572320120918636014">"Govorna pošta se učitava…"</string>
-    <string name="voicemail_fetching_timout" msgid="2128873915839949783">"Učitavanje govorne pošte nije uspelo"</string>
-    <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_playback_speakerphone" msgid="4852027754869750227">"Uključivanje ili isključivanje spikerfona"</string>
-    <string name="description_playback_seek" msgid="1340910573254132520">"Traženje pozicije u reprodukciji"</string>
-    <string name="action_menu_call_history_description" msgid="8829135306925008546">"Istorija poziva"</string>
-    <string name="action_menu_overflow_description" msgid="7648679686746517341">"Još opcija"</string>
-    <string name="action_menu_dialpad_button" msgid="1970631633457493180">"tastatura"</string>
-    <string name="dialer_settings_label" msgid="4980176284150290175">"Podešavanja"</string>
-    <string name="simulator_submenu_label" msgid="186156287346615267">"Simulator"</string>
-    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Napravite prečicu za novi UI"</string>
-    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"Ulazite u režim grupnih radnji"</string>
-    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"Izašli ste iz režima grupnih radnji"</string>
-    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"Izabrano je <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"Opozvan je izbor <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_contact_details" msgid="3341280873855253464">"Detalji o kontaktu za <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_spam_contact_details" msgid="5592578752881528368">"Kontakt informacije potencijalnog nepoželjnog pozivaoca <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> poziva."</string>
-    <string name="description_video_call" msgid="3738199365585751727">"Video poziv."</string>
-    <string name="description_start_voice_search" msgid="8380022725973015261">"Pokretanje glasovne pretrage"</string>
-    <string name="voicemail" msgid="8899540969000957954">"Govorna pošta"</string>
-    <string name="description_cancel_multi_select" msgid="3930475950253360461">"Otkažite režim grupnih radnji"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Izbriši"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Otkaži"</string>
-    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"Izabranih: <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
-      <item quantity="one">"<b>"Želite li da izbrišete ove govorne poruke? "</b>"</item>
-      <item quantity="few">"<b>"Želite li da izbrišete ove govorne poruke? "</b>"</item>
-      <item quantity="other">"<b>"Želite li da izbrišete ove govorne poruke? "</b>"</item>
-    </plurals>
-    <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
-    <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> u <xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
-    <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="voice_search_not_available" msgid="6546240433719732905">"Glasovna pretraga nije dostupna"</string>
-    <string name="dialer_hint_find_contact" msgid="2023214799381149808">"Pretraži kontakte"</string>
-    <string name="block_number_search_hint" msgid="5377706079015099416">"Dodajte broj ili pretražite kontakte"</string>
-    <string name="call_log_all_empty" msgid="3955572868518162004">"Istorija poziva je prazna"</string>
-    <string name="call_log_all_empty_action" msgid="852218280136243014">"Pozovi"</string>
-    <string name="call_log_missed_empty" msgid="7094936030845062214">"Nemate nijedan propušten poziv."</string>
-    <string name="call_log_voicemail_empty" msgid="273623903423275178">"Prijemno sanduče govorne pošte je prazno."</string>
-    <string name="call_log_activity_title" msgid="1275242727244945527">"Istorija poziva"</string>
-    <string name="call_log_all_title" msgid="6042262422192020327">"Svi"</string>
-    <string name="call_log_missed_title" msgid="17254005889268015">"Propušteni"</string>
-    <string name="tab_speed_dial" msgid="6616404752227561075">"Brzo biranje"</string>
-    <string name="tab_history" msgid="7420269368689503596">"Istorija poziva"</string>
-    <string name="tab_all_contacts" msgid="5531733977693943015">"Kontakti"</string>
-    <string name="tab_voicemail" msgid="2458548090088316246">"Govorna pošta"</string>
-    <string name="search_shortcut_call_number" msgid="8847918845036880688">"Pozovi <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"Napravi novi kontakt"</string>
-    <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"Dodaj u kontakt"</string>
-    <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"Pošalji SMS"</string>
-    <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"Uputi video poziv"</string>
-    <string name="search_shortcut_block_number" msgid="4587283230665805776">"Blokiraj broj"</string>
-    <string name="speed_dial_empty" msgid="3346406399966039505">"Nemate nijedan kontakt na brzom biranju"</string>
-    <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"Dodaj omiljen kontakt"</string>
-    <string name="remove_contact" msgid="2353580570488923668">"Ukloni"</string>
-    <string name="select_all" msgid="408601760696146245">"Izaberi sve"</string>
-    <string name="call_log_action_video_call" msgid="7565549950343850819">"Video poziv"</string>
-    <string name="call_log_action_send_message" msgid="6948727362660115554">"Pošalji poruku"</string>
-    <string name="call_log_action_details" msgid="2091370737371449501">"Detalji poziva"</string>
-    <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"Pošalji u…"</string>
-    <string name="call_log_action_call" msgid="682724094251540583">"Pozovi <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_incoming_missed_call" msgid="8292535799379230029">"Propušteni poziv: <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_incoming_answered_call" msgid="3920182963103160610">"Primljeni poziv: <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_unread_voicemail" msgid="145170985013419170">"Nepročitana govorna poruka od <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_read_voicemail" msgid="5585559881573227732">"Govorna poruka od <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_outgoing_call" msgid="543952487882919924">"Pozvali ste: <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="call_log_via_number" msgid="1340307109806397650">"preko <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> preko <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="description_call_action" msgid="4042796498169106545">"Pozovi <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_video_call_action" msgid="1237090968588659650">"Uputite video poziv kontaktu <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
-    <string name="description_voicemail_action" msgid="3290143432403538524">"Pusti govornu poštu od <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_create_new_contact_action" msgid="1928282350281564130">"Napravite kontakt za <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"Dodajte <xliff:g id="NAMEORNUMBER">^1</xliff:g> postojećem kontaktu"</string>
-    <string name="description_details_action" msgid="2061866409737706174">"Detalji poziva za <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="call_log_header_today" msgid="1576119097475845293">"Danas"</string>
-    <string name="call_log_header_yesterday" msgid="5616077776205329563">"Juče"</string>
-    <string name="call_log_header_other" msgid="4940676886254217644">"Stariji"</string>
-    <string name="voicemail_speaker_on" msgid="3151333608926996668">"Uključite zvučnik."</string>
-    <string name="voicemail_speaker_off" msgid="2530064206962034201">"Isključite zvučnik."</string>
-    <string name="voicemail_play_start_pause" msgid="3874823480278334664">"Započnite ili pauzirajte reprodukciju."</string>
-    <string name="display_options_title" msgid="3880091801055797975">"Opcije prikaza"</string>
-    <string name="sounds_and_vibration_title" msgid="3075050000721181384">"Zvuci i vibracija"</string>
-    <string name="accessibility_settings_title" msgid="3329027650429831820">"Pristupačnost"</string>
-    <string name="ringtone_title" msgid="8377174189894648486">"Zvuk zvona telefona"</string>
-    <string name="vibrate_on_ring_title" msgid="631441314790960485">"Vibriraj i za pozive"</string>
-    <string name="dtmf_tone_enable_title" msgid="3273762431523939277">"Tonovi tastature"</string>
-    <string name="dtmf_tone_length_title" msgid="534096029202438539">"Dužina trajanja tona tastature"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="applicationLabel">Telefon</string>
+  <string name="launcherDialpadActivityLabel">Telefonska tastatura</string>
+  <string name="callHistoryIconLabel">Istorija poziva</string>
+  <string name="action_copy_number_text">Kopiraj broj</string>
+  <string name="copy_transcript_text">Kopiraj transkripciju</string>
+  <string name="action_edit_number_before_call">Izmeni broj pre poziva</string>
+  <string name="call_log_delete_all">Obriši istoriju poziva</string>
+  <string name="call_log_trash_voicemail">Izbriši govornu poruku</string>
+  <string name="snackbar_voicemail_deleted">Gov. pošta je izbrisana</string>
+  <string name="clearCallLogConfirmation_title">Želite da obrišete istoriju poziva?</string>
+  <string name="clearCallLogConfirmation">Ovo će izbrisati sve pozive iz istorije</string>
+  <string name="clearCallLogProgress_title">Briše se istorija poziva…</string>
+  <string name="notification_missedCallTitle">Propušten poziv</string>
+  <string name="notification_missedWorkCallTitle">Propušten poziv za Work</string>
+  <string name="notification_missedCallsTitle">Propušteni pozivi</string>
+  <string name="notification_missedCallsMsg">Broj propuštenih poziva: %d</string>
+  <string name="notification_missedCall_call_back">Uzvrati poziv</string>
+  <string name="notification_missedCall_message">Pošalji SMS</string>
+  <string name="post_call_notification_message">%1$s: %2$s</string>
+  <string name="notification_voicemail_text_format">Pozovi %s</string>
+  <string name="notification_voicemail_no_vm_number">Nepoznat broj govorne pošte</string>
+  <plurals name="notification_voicemail_title">
+    <item quantity="one"> %1$d govorna poruka </item>
+    <item quantity="few"> %1$d govorne poruke </item>
+    <item quantity="other"> %1$d govornih poruka </item>
+  </plurals>
+  <string name="notification_voicemail_callers_list">%1$s, %2$s</string>
+  <string name="notification_new_voicemail_ticker">Nova govorna poruka od %1$s</string>
+  <string name="voicemail_playback_error">Puštanje govorne pošte nije uspelo</string>
+  <string name="voicemail_fetching_content">Govorna pošta se učitava…</string>
+  <string name="voicemail_fetching_timout">Učitavanje govorne pošte nije uspelo</string>
+  <string name="call_log_item_count_and_date">(%1$d) %2$s</string>
+  <string name="description_playback_speakerphone">Uključivanje ili isključivanje spikerfona</string>
+  <string name="description_playback_seek">Traženje pozicije u reprodukciji</string>
+  <string name="action_menu_call_history_description">Istorija poziva</string>
+  <string msgid="2295659037509008453" name="action_menu_overflow_description">Još opcija</string>
+  <string name="action_menu_dialpad_button">tastatura</string>
+  <string name="dialer_settings_label">Podešavanja</string>
+  <string name="simulator_submenu_label">Simulator</string>
+  <string name="new_ui_launcher_shortcut_label">Napravite prečicu za novi UI</string>
+  <string name="description_entering_bulk_action_mode">Ulazite u režim grupnih radnji</string>
+  <string name="description_leaving_bulk_action_mode">Izašli ste iz režima grupnih radnji</string>
+  <string name="description_selecting_bulk_action_mode">Izabrano je %1$s</string>
+  <string name="description_unselecting_bulk_action_mode">Opozvan je izbor %1$s</string>
+  <string name="description_contact_details">Detalji o kontaktu za %1$s</string>
+  <string name="description_spam_contact_details">Kontakt informacije potencijalnog nepoželjnog pozivaoca %1$s</string>
+  <string name="description_num_calls">%1$s poziva.</string>
+  <string name="description_video_call">Video poziv.</string>
+  <string name="description_start_voice_search">Pokretanje glasovne pretrage</string>
+  <string name="voicemail">Govorna pošta</string>
+  <string name="description_cancel_multi_select">Otkažite režim grupnih radnji</string>
+  <string name="voicemailMultiSelectDeleteConfirm">Izbriši</string>
+  <string name="voicemailMultiSelectDeleteCancel">Otkaži</string>
+  <string name="voicemailMultiSelectActionBarTitle">Izabranih: %1$s</string>
+  <plurals name="delete_voicemails_confirmation_dialog_title">
+    <item quantity="one"><b>Želite li da izbrišete ove govorne poruke? </b></item>
+    <item quantity="few"><b>Želite li da izbrišete ove govorne poruke? </b></item>
+    <item quantity="other"><b>Želite li da izbrišete ove govorne poruke? </b></item>
+  </plurals>
+  <string name="voicemailCallLogToday">@string/call_log_header_today</string>
+  <string name="voicemailCallLogDateTimeFormat">%1$s u %2$s</string>
+  <string name="voicemailDurationFormat">%1$02d:%2$02d</string>
+  <string name="voicemailCallLogDateTimeFormatWithDuration">%1$s • %2$s</string>
+  <string name="voice_search_not_available">Glasovna pretraga nije dostupna</string>
+  <string name="dialer_hint_find_contact">Pretraži kontakte</string>
+  <string name="block_number_search_hint">Dodajte broj ili pretražite kontakte</string>
+  <string name="call_log_all_empty">Istorija poziva je prazna</string>
+  <string name="call_log_all_empty_action">Pozovi</string>
+  <string name="call_log_missed_empty">Nemate nijedan propušten poziv.</string>
+  <string name="call_log_voicemail_empty">Prijemno sanduče govorne pošte je prazno.</string>
+  <string name="call_log_activity_title">Istorija poziva</string>
+  <string name="call_log_all_title">Svi</string>
+  <string name="call_log_missed_title">Propušteni</string>
+  <string name="tab_speed_dial">Brzo biranje</string>
+  <string name="tab_history">Istorija poziva</string>
+  <string name="tab_all_contacts">Kontakti</string>
+  <string name="tab_voicemail">Govorna pošta</string>
+  <string name="search_shortcut_call_number">Pozovi %s</string>
+  <string name="search_shortcut_create_new_contact">Napravi novi kontakt</string>
+  <string name="search_shortcut_add_to_contact">Dodaj u kontakt</string>
+  <string name="search_shortcut_send_sms_message">Pošalji SMS</string>
+  <string name="search_shortcut_make_video_call">Uputi video poziv</string>
+  <string name="search_shortcut_block_number">Blokiraj broj</string>
+  <string name="speed_dial_empty">Nemate nijedan kontakt na brzom biranju</string>
+  <string name="speed_dial_empty_add_favorite_action">Dodaj omiljen kontakt</string>
+  <string name="remove_contact">Ukloni</string>
+  <string name="select_all">Izaberi sve</string>
+  <string name="call_log_action_video_call">Video poziv</string>
+  <string name="call_log_action_set_up_video">Podesi video pozive</string>
+  <string name="call_log_action_invite_video">Pozovi u video poziv</string>
+  <string name="call_log_action_send_message">Pošalji poruku</string>
+  <string name="call_log_action_details">Detalji poziva</string>
+  <string name="call_log_action_share_voicemail">Pošalji u…</string>
+  <string name="call_log_action_call">Pozovi ^1</string>
+  <string name="description_incoming_missed_call">Propušteni poziv: ^1, ^2, ^3, ^4.</string>
+  <string name="description_incoming_answered_call">Primljeni poziv: ^1, ^2, ^3, ^4.</string>
+  <string name="description_unread_voicemail">Nepročitana govorna poruka od ^1, ^2, ^3, ^4.</string>
+  <string name="description_read_voicemail">Govorna poruka od ^1, ^2, ^3, ^4.</string>
+  <string name="description_outgoing_call">Pozvali ste: ^1, ^2, ^3, ^4.</string>
+  <string name="call_log_via_number">preko %1$s</string>
+  <string name="call_log_via_number_phone_account">%1$s preko %2$s</string>
+  <string name="description_call_action">Pozovi ^1</string>
+  <string name="description_video_call_action">Uputite video poziv kontaktu ^1.</string>
+  <string name="description_voicemail_action">Pusti govornu poštu od ^1</string>
+  <string name="description_create_new_contact_action">Napravite kontakt za ^1</string>
+  <string name="description_add_to_existing_contact_action">Dodajte ^1 postojećem kontaktu</string>
+  <string name="description_details_action">Detalji poziva za ^1</string>
+  <string name="call_log_header_today">Danas</string>
+  <string name="call_log_header_yesterday">Juče</string>
+  <string name="call_log_header_other">Stariji</string>
+  <string name="voicemail_speaker_on">Uključite zvučnik.</string>
+  <string name="voicemail_speaker_off">Isključite zvučnik.</string>
+  <string name="voicemail_play_start_pause">Započnite ili pauzirajte reprodukciju.</string>
+  <string name="display_options_title">Opcije prikaza</string>
+  <string name="sounds_and_vibration_title">Zvuci i vibracija</string>
+  <string name="accessibility_settings_title">Pristupačnost</string>
+  <string name="ringtone_title">Zvuk zvona telefona</string>
+  <string name="vibrate_on_ring_title">Vibriraj i za pozive</string>
+  <string name="dtmf_tone_enable_title">Tonovi tastature</string>
+  <string name="dtmf_tone_length_title">Dužina trajanja tona tastature</string>
   <string-array name="dtmf_tone_length_entries">
-    <item msgid="3136353015227162823">"Normalno"</item>
-    <item msgid="5376841175538523822">"Dugačak"</item>
+    <item>Normalno</item>
+    <item>Dugačak</item>
   </string-array>
-    <string name="respond_via_sms_setting_title" msgid="8008181606657693452">"Brzi odgovori"</string>
-    <string name="call_settings_label" msgid="7824611757200960807">"Pozivi"</string>
-    <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Blokiranje poziva"</string>
-    <string name="voicemail_settings_label" msgid="4594299554519920570">"Govorna pošta"</string>
-    <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Blokiranje poziva je privremeno isključeno"</string>
-    <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Blokiranje poziva je onemogućeno zato što ste kontaktirali službe za pomoć u hitnim slučajevima sa ovog telefona u poslednjih 48 sati. Automatski će biti ponovo omogućeno kada istekne period od 48 sati."</string>
-    <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Uvezi brojeve"</string>
-    <string name="blocked_call_settings_import_description" msgid="1819412052545228965">"Ranije ste označili neke pozivaoce koje automatski treba preusmeriti na govornu poštu preko drugih aplikacija."</string>
-    <string name="blocked_call_settings_view_numbers_button" msgid="3332727948554356704">"Prikaži brojeve"</string>
-    <string name="blocked_call_settings_import_button" msgid="7319111700387470727">"Uvezi"</string>
-    <string name="description_blocked_number_list_delete" msgid="2139644216858370740">"Deblokiraj broj"</string>
-    <string name="addBlockedNumber" msgid="3053473735238295551">"Dodaj broj"</string>
-    <string name="block_number_footer_message_vvm" msgid="7955326304033982368">"Pozivi sa ovih brojeva će biti blokirani i poruke govorne pošte će se automatski brisati."</string>
-    <string name="block_number_footer_message_no_vvm" msgid="1152684139070471665">"Pozivi sa ovih brojeva će biti blokirani, ali pozivaoci sa ovih brojeva će i dalje moći da vam ostavljaju poruke govorne pošte."</string>
-    <string name="block_list" msgid="4701585783411870782">"Blokirani brojevi"</string>
-    <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g> je već blokiran."</string>
-    <string name="phone_account_settings_label" msgid="8372485478006965920">"Nalozi za pozivanje"</string>
-    <string name="permission_no_speeddial" msgid="8487215628510596753">"Da biste omogućili brzo biranje, uključite dozvolu za Kontakte."</string>
-    <string name="permission_no_calllog" msgid="4053705651238775784">"Da biste videli evidenciju poziva, uključite dozvolu za Telefon."</string>
-    <string name="permission_no_search" msgid="2424710404207193826">"Da biste pretražili kontakte, uključite dozvole za Kontakte."</string>
-    <string name="permission_place_call" msgid="8686908130349369423">"Da biste uputili poziv, uključite dozvolu za Telefon."</string>
-    <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"Aplikacija Telefon nema dozvolu za upisivanje u sistemska podešavanja."</string>
-    <string name="blocked_number_call_log_label" msgid="4212282846299997693">"Blokirano"</string>
-    <string name="call_log_action_block_report_number" msgid="7302636538668696729">"Blokiraj/prijavi kao nepoželjan"</string>
-    <string name="call_log_action_block_number" msgid="5048188386501998865">"Blokiraj broj"</string>
-    <string name="call_log_action_remove_spam" msgid="2045319806318398403">"Nije nepoželjan"</string>
-    <string name="call_log_action_unblock_number" msgid="6100117033288448758">"Deblokiraj broj"</string>
-    <string name="spam_number_call_log_label" msgid="2678431398326811131">"Nepoželjan"</string>
-    <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> je oflajn i ne možete da ga/je kontaktirate"</string>
-    <string name="about_phone_label" msgid="582991354677973731">"Osnovni podaci"</string>
-    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Transkript je napravio Google"</string>
-    <string name="voicemail_transcription_in_progress" msgid="2933320969613783210">"Google pravi transkript…"</string>
-    <string name="voicemail_transcription_failed" msgid="335275303117412706">"Transkript nije dostupan."</string>
-    <string name="voicemail_transcription_failed_language_not_supported" msgid="4210332591050562553">"Transkript nije dostupan. Nije podržan jezik."</string>
-    <string name="voicemail_transcription_failed_no_speech" msgid="9093372879697874852">"Transkript nije dostupan. Nije otkriven govor."</string>
-    <string name="view_conversation" msgid="7895904782094119702">"Prikaži"</string>
-    <string name="ec_data_deleted" msgid="4794880345545827107">"Poziv je izbrisan. Pregledajte i izbrišite priloge deljene tokom ovog poziva u Messages-u."</string>
-    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"Pozivi su izbrisani. Pregledajte i izbrišite priloge deljene tokom poziva u Messages-u."</string>
+  <string name="respond_via_sms_setting_title">Brzi odgovori</string>
+  <string name="call_settings_label">Pozivi</string>
+  <string name="manage_blocked_numbers_label">Blokirani brojevi</string>
+  <string name="voicemail_settings_label">Govorna pošta</string>
+  <string name="blocked_numbers_disabled_emergency_header_label">Blokiranje poziva je privremeno isključeno</string>
+  <string name="blocked_numbers_disabled_emergency_desc">Blokiranje poziva je onemogućeno zato što ste kontaktirali službe za pomoć u hitnim slučajevima sa ovog telefona u poslednjih 48 sati. Automatski će biti ponovo omogućeno kada istekne period od 48 sati.</string>
+  <string name="import_send_to_voicemail_numbers_label">Uvezi brojeve</string>
+  <string name="blocked_call_settings_import_description">Ranije ste označili neke pozivaoce koje automatski treba preusmeriti na govornu poštu preko drugih aplikacija.</string>
+  <string name="blocked_call_settings_view_numbers_button">Prikaži brojeve</string>
+  <string name="blocked_call_settings_import_button">Uvezi</string>
+  <string name="description_blocked_number_list_delete">Deblokiraj broj</string>
+  <string name="addBlockedNumber">Dodaj broj</string>
+  <string name="block_number_footer_message_vvm">Pozivi sa ovih brojeva će biti blokirani i poruke govorne pošte će se automatski brisati.</string>
+  <string name="block_number_footer_message_no_vvm">Pozivi sa ovih brojeva će biti blokirani, ali pozivaoci sa ovih brojeva će i dalje moći da vam ostavljaju poruke govorne pošte.</string>
+  <string name="block_list">Blokirani brojevi</string>
+  <string name="alreadyBlocked">%1$s je već blokiran.</string>
+  <string name="phone_account_settings_label">Nalozi za pozivanje</string>
+  <string name="permission_no_speeddial">Da biste omogućili brzo biranje, uključite dozvolu za Kontakte.</string>
+  <string name="permission_no_calllog">Da biste videli evidenciju poziva, uključite dozvolu za Telefon.</string>
+  <string name="permission_no_search">Da biste pretražili kontakte, uključite dozvole za Kontakte.</string>
+  <string name="permission_place_call">Da biste uputili poziv, uključite dozvolu za Telefon.</string>
+  <string name="toast_cannot_write_system_settings">Aplikacija Telefon nema dozvolu za upisivanje u sistemska podešavanja.</string>
+  <string name="blocked_number_call_log_label">Blokirano</string>
+  <string name="call_log_action_block_report_number">Blokiraj/prijavi kao nepoželjan</string>
+  <string name="call_log_action_block_number">Blokiraj broj</string>
+  <string name="call_log_action_remove_spam">Nije nepoželjan</string>
+  <string name="call_log_action_unblock_number">Deblokiraj broj</string>
+  <string name="spam_number_call_log_label">Nepoželjan</string>
+  <string name="call_composer_connection_failed">%1$s je oflajn i ne možete da ga/je kontaktirate</string>
+  <string name="about_phone_label">Osnovni podaci</string>
+  <string name="voicemail_transcription_branding_text">Transkript je napravio Google</string>
+  <string name="voicemail_transcription_in_progress">Transkribuje se…</string>
+  <string name="voicemail_transcription_failed">Transkript nije dostupan.</string>
+  <string name="voicemail_transcription_failed_language_not_supported">Transkript nije dostupan. Nije podržan jezik.</string>
+  <string name="voicemail_transcription_failed_no_speech">Transkript nije dostupan. Nije otkriven govor.</string>
+  <string name="voicemail_donation_promo_title">Želite li da nam pomognete da poboljšamo tačnost transkripcije?</string>
+  <string name="voicemail_donation_promo_content">Dozvolite Google-u da pregleda ovu i buduće govorne poruke sa transkriptima. Čuvaće se anonimno. Podešavanja uvek možete da promenite. %1$s</string>
+  <string name="voicemail_donation_promo_opt_in">Da, omogući</string>
+  <string name="voicemail_donation_promo_opt_out">Ne, hvala</string>
+  <string name="voicemail_transcription_rating">Ocenite kvalitet transkripcije</string>
+  <string name="voicemail_transcription_rating_thanks">Hvala vam na oceni kvaliteta</string>
+  <string name="description_rating_good">Označite da je dobro</string>
+  <string name="description_rating_bad">Označite da je loše</string>
+  <string name="view_conversation">Prikaži</string>
+  <string name="ec_data_deleted">Poziv je izbrisan. Pregledajte i izbrišite priloge deljene tokom ovog poziva u Messages-u.</string>
+  <string name="multiple_ec_data_deleted">Pozivi su izbrisani. Pregledajte i izbrišite priloge deljene tokom poziva u Messages-u.</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-be/strings.xml b/java/com/android/dialer/app/res/values-be/strings.xml
index 78d86a3..37a8b8b 100644
--- a/java/com/android/dialer/app/res/values-be/strings.xml
+++ b/java/com/android/dialer/app/res/values-be/strings.xml
@@ -1,183 +1,175 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="applicationLabel" msgid="2202739481132958990">"Тэлефон"</string>
-    <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"Клавіятура тэлефона"</string>
-    <string name="callHistoryIconLabel" msgid="7493268743411968630">"Гісторыя выклікаў"</string>
-    <string name="action_copy_number_text" msgid="832682558551502319">"Скапіраваць нумар"</string>
-    <string name="copy_transcript_text" msgid="937904189017310829">"Капіраваць транскрыпцыю"</string>
-    <string name="action_edit_number_before_call" msgid="8017492815878473837">"Змяніць нумар перад тым, як тэлефанаваць"</string>
-    <string name="call_log_delete_all" msgid="7852970926906523784">"Ачысціць гісторыю выклікаў"</string>
-    <string name="call_log_trash_voicemail" msgid="6118493534178533972">"Выдаліць галас. паведамленне"</string>
-    <string name="snackbar_voicemail_deleted" msgid="7463166543725496307">"Павед.галасавой пошты выдалена"</string>
-    <string name="snackbar_voicemail_deleted_undo" msgid="6959743982796409941">"АДРАБІЦЬ"</string>
-    <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"Ачысціць гісторыю выклікаў?"</string>
-    <string name="clearCallLogConfirmation" msgid="6844949465815109166">"Гэта выдаліць усе выклікі з вашай гісторыі"</string>
-    <string name="clearCallLogProgress_title" msgid="995004835687361977">"Ачыстка гісторыі выклікаў…"</string>
-    <string name="notification_missedCallTitle" msgid="8283366068539898486">"Прапушчаны выклік"</string>
-    <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"Прапушчаны выклік па працы"</string>
-    <string name="notification_missedCallsTitle" msgid="3697442015345089802">"Прапушчаныя выклікі"</string>
-    <string name="notification_missedCallsMsg" msgid="8176217633929018706">"Прапушчаных выклікаў: <xliff:g id="NUM_MISSED_CALLS">%d</xliff:g>"</string>
-    <string name="notification_missedCall_call_back" msgid="3875698110051973965">"Адказаць"</string>
-    <string name="notification_missedCall_message" msgid="5086910028988305964">"Паведамленне"</string>
-    <string name="post_call_notification_message" msgid="5417476789860590611">"<xliff:g id="NAME">%1$s</xliff:g>: <xliff:g id="MESSAGE">%2$s</xliff:g>"</string>
-    <string name="notification_voicemail_text_format" msgid="1895667520930252897">"Набраць <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
-    <string name="notification_voicemail_no_vm_number" msgid="8942821987929495842">"Невядомы нумар галасавой пошты"</string>
-    <plurals name="notification_voicemail_title" formatted="false" msgid="1551847434476438657">
-      <item quantity="one"> <xliff:g id="COUNT">%1$d</xliff:g> Паведамленне галасавой пошты </item>
-      <item quantity="few"> <xliff:g id="COUNT">%1$d</xliff:g> Паведамленні галасавой пошты </item>
-      <item quantity="many"> <xliff:g id="COUNT">%1$d</xliff:g> Паведамленняў галасавой пошты </item>
-      <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> Паведамлення галасавой пошты </item>
-    </plurals>
-    <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
-    <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"Новае паведамл. ад <xliff:g id="CALLER">%1$s</xliff:g>"</string>
-    <string name="voicemail_playback_error" msgid="4384373852257757295">"Не ўдалося прайграць галасавую пошту"</string>
-    <string name="voicemail_fetching_content" msgid="572320120918636014">"Загрузка галасавой пошты…"</string>
-    <string name="voicemail_fetching_timout" msgid="2128873915839949783">"Не ўдалося загрузіць галасавую пошту"</string>
-    <string name="call_log_item_count_and_date" msgid="723848797957319181">"( <xliff:g id="COUNT">%1$d</xliff:g> ) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_playback_speakerphone" msgid="4852027754869750227">"Уключыць ці адключыць гучную сувязь"</string>
-    <string name="description_playback_seek" msgid="1340910573254132520">"Шукаць становішча прайгравання"</string>
-    <string name="action_menu_call_history_description" msgid="8829135306925008546">"Гісторыя выклікаў"</string>
-    <string name="action_menu_overflow_description" msgid="7648679686746517341">"Дадатковыя параметры"</string>
-    <string name="action_menu_dialpad_button" msgid="1970631633457493180">"клавіятура"</string>
-    <string name="dialer_settings_label" msgid="4980176284150290175">"Налады"</string>
-    <string name="simulator_submenu_label" msgid="186156287346615267">"Сродак мадэліравання"</string>
-    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Ярлык новага карыст. інтэрфейсу"</string>
-    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"Уваход у рэжым групавога дзеяння"</string>
-    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"Выхад з рэжыму групавога дзеяння"</string>
-    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"Выбрана: <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"Выбар скасаваны: <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_contact_details" msgid="3341280873855253464">"Падрабязнасці кантакту для <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_spam_contact_details" msgid="5592578752881528368">"Кантактныя даныя абанента <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>, які падазраецца ў спамерскіх выкліках"</string>
-    <string name="description_num_calls" msgid="6483594535796216044">"Выклікаў: <xliff:g id="NUMBEROFCALLS">%1$s</xliff:g>."</string>
-    <string name="description_video_call" msgid="3738199365585751727">"Відэавыклік."</string>
-    <string name="description_start_voice_search" msgid="8380022725973015261">"Пачаць галасавы пошук"</string>
-    <string name="voicemail" msgid="8899540969000957954">"Галасавая пошта"</string>
-    <string name="description_cancel_multi_select" msgid="3930475950253360461">"Скасаваць рэжым пакетных дзеянняў"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Выдаліць"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Скасаваць"</string>
-    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"Выбрана: <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
-      <item quantity="one">"<b>"Выдаліць гэтыя паведамленні галасавой пошты? "</b>"</item>
-      <item quantity="few">"<b>"Выдаліць гэтыя паведамленні галасавой пошты? "</b>"</item>
-      <item quantity="many">"<b>"Выдаліць гэтыя паведамленні галасавой пошты? "</b>"</item>
-      <item quantity="other">"<b>"Выдаліць гэтыя паведамленні галасавой пошты? "</b>"</item>
-    </plurals>
-    <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
-    <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> у <xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
-    <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="voice_search_not_available" msgid="6546240433719732905">"Галасавы пошук недаступны"</string>
-    <string name="dialer_hint_find_contact" msgid="2023214799381149808">"Пошук кантактаў"</string>
-    <string name="block_number_search_hint" msgid="5377706079015099416">"Дадайце нумар ці шукайце ў кантактах"</string>
-    <string name="call_log_all_empty" msgid="3955572868518162004">"Ваша гісторыя выклікаў пустая"</string>
-    <string name="call_log_all_empty_action" msgid="852218280136243014">"Зрабіць выклік"</string>
-    <string name="call_log_missed_empty" msgid="7094936030845062214">"У вас няма прапушчаных выклікаў."</string>
-    <string name="call_log_voicemail_empty" msgid="273623903423275178">"Ваша галасавая пошта пустая."</string>
-    <string name="call_log_activity_title" msgid="1275242727244945527">"Гісторыя выклікаў"</string>
-    <string name="call_log_all_title" msgid="6042262422192020327">"Усе"</string>
-    <string name="call_log_missed_title" msgid="17254005889268015">"Прапушчаныя"</string>
-    <string name="tab_speed_dial" msgid="6616404752227561075">"Хуткі набор"</string>
-    <string name="tab_history" msgid="7420269368689503596">"Гісторыя выклікаў"</string>
-    <string name="tab_all_contacts" msgid="5531733977693943015">"Кантакты"</string>
-    <string name="tab_voicemail" msgid="2458548090088316246">"Галасавая пошта"</string>
-    <string name="search_shortcut_call_number" msgid="8847918845036880688">"Выклікаць <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"Новы кантакт"</string>
-    <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"Дадаць у кантакт"</string>
-    <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"Адправiць SMS"</string>
-    <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"Зрабіць відэавыклік"</string>
-    <string name="search_shortcut_block_number" msgid="4587283230665805776">"Заблакіраваць нумар"</string>
-    <string name="speed_dial_empty" msgid="3346406399966039505">"У вас пакуль нікога няма на хуткім наборы"</string>
-    <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"Дадаць улюбёны"</string>
-    <string name="remove_contact" msgid="2353580570488923668">"Выдаліць"</string>
-    <string name="select_all" msgid="408601760696146245">"Выбраць усё"</string>
-    <string name="call_log_action_video_call" msgid="7565549950343850819">"Відэавыклік"</string>
-    <string name="call_log_action_send_message" msgid="6948727362660115554">"Адправiць паведамленне"</string>
-    <string name="call_log_action_details" msgid="2091370737371449501">"Падрабязнасці выкліку"</string>
-    <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"Адпраўляецца да…"</string>
-    <string name="call_log_action_call" msgid="682724094251540583">"Выклікаць <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_incoming_missed_call" msgid="8292535799379230029">"Прапушчаны выклік ад <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_incoming_answered_call" msgid="3920182963103160610">"Адказаны выклік ад <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_unread_voicemail" msgid="145170985013419170">"Непрачытанае паведамленне галасавой пошты ад <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_read_voicemail" msgid="5585559881573227732">"Паведамленне галасавой пошты ад <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_outgoing_call" msgid="543952487882919924">"Выклік абаненту <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="call_log_via_number" msgid="1340307109806397650">"праз <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> праз <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="description_call_action" msgid="4042796498169106545">"Выклікаць <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_video_call_action" msgid="1237090968588659650">"Відэавыклік ад <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
-    <string name="description_voicemail_action" msgid="3290143432403538524">"Праслухаць галасавое паведамленне ад <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_create_new_contact_action" msgid="1928282350281564130">"Стварыць кантакт для <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"Дадаць <xliff:g id="NAMEORNUMBER">^1</xliff:g> да існуючага кантакту"</string>
-    <string name="description_details_action" msgid="2061866409737706174">"Падрабязнасці кантакту для <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="call_log_header_today" msgid="1576119097475845293">"Сёння"</string>
-    <string name="call_log_header_yesterday" msgid="5616077776205329563">"Учора"</string>
-    <string name="call_log_header_other" msgid="4940676886254217644">"Больш старыя"</string>
-    <string name="voicemail_speaker_on" msgid="3151333608926996668">"Уключыць дынамік."</string>
-    <string name="voicemail_speaker_off" msgid="2530064206962034201">"Адключыць дынамік."</string>
-    <string name="voicemail_play_start_pause" msgid="3874823480278334664">"Пачаць ці прыпыніць прайграванне."</string>
-    <string name="display_options_title" msgid="3880091801055797975">"Параметры адлюстравання"</string>
-    <string name="sounds_and_vibration_title" msgid="3075050000721181384">"Гукі і вібрацыя"</string>
-    <string name="accessibility_settings_title" msgid="3329027650429831820">"Спецыяльныя магчымасці"</string>
-    <string name="ringtone_title" msgid="8377174189894648486">"Рынгтон тэлефона"</string>
-    <string name="vibrate_on_ring_title" msgid="631441314790960485">"Уключыць вібрацыю для выклікаў"</string>
-    <string name="dtmf_tone_enable_title" msgid="3273762431523939277">"Гукі клавіятуры"</string>
-    <string name="dtmf_tone_length_title" msgid="534096029202438539">"Даўжыня гукаў клавіятуры"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="applicationLabel">Тэлефон</string>
+  <string name="launcherDialpadActivityLabel">Клавіятура тэлефона</string>
+  <string name="callHistoryIconLabel">Гісторыя выклікаў</string>
+  <string name="action_copy_number_text">Скапіраваць нумар</string>
+  <string name="copy_transcript_text">Капіраваць транскрыпцыю</string>
+  <string name="action_edit_number_before_call">Змяніць нумар перад тым, як тэлефанаваць</string>
+  <string name="call_log_delete_all">Ачысціць гісторыю выклікаў</string>
+  <string name="call_log_trash_voicemail">Выдаліць галас. паведамленне</string>
+  <string name="snackbar_voicemail_deleted">Павед.галасавой пошты выдалена</string>
+  <string name="clearCallLogConfirmation_title">Ачысціць гісторыю выклікаў?</string>
+  <string name="clearCallLogConfirmation">Гэта выдаліць усе выклікі з вашай гісторыі</string>
+  <string name="clearCallLogProgress_title">Ачыстка гісторыі выклікаў…</string>
+  <string name="notification_missedCallTitle">Прапушчаны выклік</string>
+  <string name="notification_missedWorkCallTitle">Прапушчаны выклік па працы</string>
+  <string name="notification_missedCallsTitle">Прапушчаныя выклікі</string>
+  <string name="notification_missedCallsMsg">Прапушчаных выклікаў: %d</string>
+  <string name="notification_missedCall_call_back">Адказаць</string>
+  <string name="notification_missedCall_message">Паведамленне</string>
+  <string name="post_call_notification_message">%1$s: %2$s</string>
+  <string name="notification_voicemail_text_format">Набраць %s</string>
+  <string name="notification_voicemail_no_vm_number">Невядомы нумар галасавой пошты</string>
+  <plurals name="notification_voicemail_title">
+    <item quantity="one"> %1$d Паведамленне галасавой пошты </item>
+    <item quantity="few"> %1$d Паведамленні галасавой пошты </item>
+    <item quantity="many"> %1$d Паведамленняў галасавой пошты </item>
+    <item quantity="other"> %1$d Паведамлення галасавой пошты </item>
+  </plurals>
+  <string name="notification_voicemail_callers_list">%1$s, %2$s</string>
+  <string name="notification_new_voicemail_ticker">Новае паведамл. ад %1$s</string>
+  <string name="voicemail_playback_error">Не ўдалося прайграць галасавую пошту</string>
+  <string name="voicemail_fetching_content">Загрузка галасавой пошты…</string>
+  <string name="voicemail_fetching_timout">Не ўдалося загрузіць галасавую пошту</string>
+  <string name="call_log_item_count_and_date">( %1$d ) %2$s</string>
+  <string name="description_playback_speakerphone">Уключыць ці адключыць гучную сувязь</string>
+  <string name="description_playback_seek">Шукаць становішча прайгравання</string>
+  <string name="action_menu_call_history_description">Гісторыя выклікаў</string>
+  <string msgid="2295659037509008453" name="action_menu_overflow_description">Дадатковыя параметры</string>
+  <string name="action_menu_dialpad_button">клавіятура</string>
+  <string name="dialer_settings_label">Налады</string>
+  <string name="simulator_submenu_label">Сродак мадэліравання</string>
+  <string name="new_ui_launcher_shortcut_label">Ярлык новага карыст. інтэрфейсу</string>
+  <string name="description_entering_bulk_action_mode">Уваход у рэжым групавога дзеяння</string>
+  <string name="description_leaving_bulk_action_mode">Выхад з рэжыму групавога дзеяння</string>
+  <string name="description_selecting_bulk_action_mode">Выбрана: %1$s</string>
+  <string name="description_unselecting_bulk_action_mode">Выбар скасаваны: %1$s</string>
+  <string name="description_contact_details">Падрабязнасці кантакту для %1$s</string>
+  <string name="description_spam_contact_details">Кантактныя даныя абанента %1$s, які падазраецца ў спамерскіх выкліках</string>
+  <string name="description_num_calls">Выклікаў: %1$s.</string>
+  <string name="description_video_call">Відэавыклік.</string>
+  <string name="description_start_voice_search">Пачаць галасавы пошук</string>
+  <string name="voicemail">Галасавая пошта</string>
+  <string name="description_cancel_multi_select">Скасаваць рэжым пакетных дзеянняў</string>
+  <string name="voicemailMultiSelectDeleteConfirm">Выдаліць</string>
+  <string name="voicemailMultiSelectDeleteCancel">Скасаваць</string>
+  <string name="voicemailMultiSelectActionBarTitle">Выбрана: %1$s</string>
+  <plurals name="delete_voicemails_confirmation_dialog_title">
+    <item quantity="one"><b>Выдаліць гэтыя паведамленні галасавой пошты? </b></item>
+    <item quantity="few"><b>Выдаліць гэтыя паведамленні галасавой пошты? </b></item>
+    <item quantity="many"><b>Выдаліць гэтыя паведамленні галасавой пошты? </b></item>
+    <item quantity="other"><b>Выдаліць гэтыя паведамленні галасавой пошты? </b></item>
+  </plurals>
+  <string name="voicemailCallLogToday">@string/call_log_header_today</string>
+  <string name="voicemailCallLogDateTimeFormat">%1$s у %2$s</string>
+  <string name="voicemailDurationFormat">%1$02d:%2$02d</string>
+  <string name="voicemailCallLogDateTimeFormatWithDuration">%1$s • %2$s</string>
+  <string name="voice_search_not_available">Галасавы пошук недаступны</string>
+  <string name="dialer_hint_find_contact">Пошук кантактаў</string>
+  <string name="block_number_search_hint">Дадайце нумар ці шукайце ў кантактах</string>
+  <string name="call_log_all_empty">Ваша гісторыя выклікаў пустая</string>
+  <string name="call_log_all_empty_action">Зрабіць выклік</string>
+  <string name="call_log_missed_empty">У вас няма прапушчаных выклікаў.</string>
+  <string name="call_log_voicemail_empty">Ваша галасавая пошта пустая.</string>
+  <string name="call_log_activity_title">Гісторыя выклікаў</string>
+  <string name="call_log_all_title">Усе</string>
+  <string name="call_log_missed_title">Прапушчаныя</string>
+  <string name="tab_speed_dial">Хуткі набор</string>
+  <string name="tab_history">Гісторыя выклікаў</string>
+  <string name="tab_all_contacts">Кантакты</string>
+  <string name="tab_voicemail">Галасавая пошта</string>
+  <string name="search_shortcut_call_number">Выклікаць %s</string>
+  <string name="search_shortcut_create_new_contact">Новы кантакт</string>
+  <string name="search_shortcut_add_to_contact">Дадаць у кантакт</string>
+  <string name="search_shortcut_send_sms_message">Адправiць SMS</string>
+  <string name="search_shortcut_make_video_call">Зрабіць відэавыклік</string>
+  <string name="search_shortcut_block_number">Заблакіраваць нумар</string>
+  <string name="speed_dial_empty">У вас пакуль нікога няма на хуткім наборы</string>
+  <string name="speed_dial_empty_add_favorite_action">Дадаць улюбёны</string>
+  <string name="remove_contact">Выдаліць</string>
+  <string name="select_all">Выбраць усё</string>
+  <string name="call_log_action_video_call">Відэавыклік</string>
+  <string name="call_log_action_set_up_video">Наладзіць відэавыклікі</string>
+  <string name="call_log_action_invite_video">Запрасіць у відэавыклік</string>
+  <string name="call_log_action_send_message">Адправiць паведамленне</string>
+  <string name="call_log_action_details">Падрабязнасці выкліку</string>
+  <string name="call_log_action_share_voicemail">Адпраўляецца да…</string>
+  <string name="call_log_action_call">Выклікаць ^1</string>
+  <string name="description_incoming_missed_call">Прапушчаны выклік ад ^1, ^2, ^3, ^4.</string>
+  <string name="description_incoming_answered_call">Адказаны выклік ад ^1, ^2, ^3, ^4.</string>
+  <string name="description_unread_voicemail">Непрачытанае паведамленне галасавой пошты ад ^1, ^2, ^3, ^4.</string>
+  <string name="description_read_voicemail">Паведамленне галасавой пошты ад ^1, ^2, ^3, ^4.</string>
+  <string name="description_outgoing_call">Выклік абаненту ^1, ^2, ^3, ^4.</string>
+  <string name="call_log_via_number">праз %1$s</string>
+  <string name="call_log_via_number_phone_account">%1$s праз %2$s</string>
+  <string name="description_call_action">Выклікаць ^1</string>
+  <string name="description_video_call_action">Відэавыклік ад ^1.</string>
+  <string name="description_voicemail_action">Праслухаць галасавое паведамленне ад ^1</string>
+  <string name="description_create_new_contact_action">Стварыць кантакт для ^1</string>
+  <string name="description_add_to_existing_contact_action">Дадаць ^1 да існуючага кантакту</string>
+  <string name="description_details_action">Падрабязнасці кантакту для ^1</string>
+  <string name="call_log_header_today">Сёння</string>
+  <string name="call_log_header_yesterday">Учора</string>
+  <string name="call_log_header_other">Больш старыя</string>
+  <string name="voicemail_speaker_on">Уключыць дынамік.</string>
+  <string name="voicemail_speaker_off">Адключыць дынамік.</string>
+  <string name="voicemail_play_start_pause">Пачаць ці прыпыніць прайграванне.</string>
+  <string name="display_options_title">Параметры адлюстравання</string>
+  <string name="sounds_and_vibration_title">Гукі і вібрацыя</string>
+  <string name="accessibility_settings_title">Спецыяльныя магчымасці</string>
+  <string name="ringtone_title">Рынгтон тэлефона</string>
+  <string name="vibrate_on_ring_title">Уключыць вібрацыю для выклікаў</string>
+  <string name="dtmf_tone_enable_title">Гукі клавіятуры</string>
+  <string name="dtmf_tone_length_title">Даўжыня гукаў клавіятуры</string>
   <string-array name="dtmf_tone_length_entries">
-    <item msgid="3136353015227162823">"Звычайны"</item>
-    <item msgid="5376841175538523822">"Доўгі"</item>
+    <item>Звычайны</item>
+    <item>Доўгі</item>
   </string-array>
-    <string name="respond_via_sms_setting_title" msgid="8008181606657693452">"Хуткія адказы"</string>
-    <string name="call_settings_label" msgid="7824611757200960807">"Выклікі"</string>
-    <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Блакіраванне выклікаў"</string>
-    <string name="voicemail_settings_label" msgid="4594299554519920570">"Галасавая пошта"</string>
-    <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Блакіроўка выклікаў часова адключана"</string>
-    <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Блакіроўка выклікаў будзе адключана, таму што вы выклікалі экстранныя службы з гэтага тэлефона на працягу апошніх 48 гадзін. Яна будзе аўтаматычна адноўлена пасля заканчэння перыяду ў 48 гадзін."</string>
-    <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Імпартаваць нумары"</string>
-    <string name="blocked_call_settings_import_description" msgid="1819412052545228965">"Вы пазначалі праз іншыя праграмы некаторых абанентаў, якіх трэба аўтаматычна адпраўляць у галасавую пошту ."</string>
-    <string name="blocked_call_settings_view_numbers_button" msgid="3332727948554356704">"Прагледзець нумары"</string>
-    <string name="blocked_call_settings_import_button" msgid="7319111700387470727">"Імпартаваць"</string>
-    <string name="description_blocked_number_list_delete" msgid="2139644216858370740">"Разблакіраваць нумар"</string>
-    <string name="addBlockedNumber" msgid="3053473735238295551">"Дадаць нумар"</string>
-    <string name="block_number_footer_message_vvm" msgid="7955326304033982368">"Выклікі з гэтых нумароў будуць блакіравацца, а паведамленні галасавой пошты - аўтаматычна выдаляцца."</string>
-    <string name="block_number_footer_message_no_vvm" msgid="1152684139070471665">"Выклікі з гэтых нумароў будуць блакіравацца, але з іх яшчэ можна пакінуць вам паведамленні галасавой пошты."</string>
-    <string name="block_list" msgid="4701585783411870782">"Заблакіраваныя нумары"</string>
-    <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g> ужо заблакіраваны."</string>
-    <string name="phone_account_settings_label" msgid="8372485478006965920">"Уліковыя запісы для выклікаў"</string>
-    <string name="permission_no_speeddial" msgid="8487215628510596753">"Каб уключыць хуткі набор, уключыце дазвол для Кантактаў."</string>
-    <string name="permission_no_calllog" msgid="4053705651238775784">"Каб прагледзець свой журнал выклікаў, уключыце дазволы Тэлефона."</string>
-    <string name="permission_no_search" msgid="2424710404207193826">"Каб шукаць свае кантакты, уключыце дазвол для Кантактаў."</string>
-    <string name="permission_place_call" msgid="8686908130349369423">"Каб зрабіць выклік, уключыце дазвол для Тэлефона."</string>
-    <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"Праграма Тэлефон не мае дазволу на запіс у налады сістэмы."</string>
-    <string name="blocked_number_call_log_label" msgid="4212282846299997693">"Заблакiравана"</string>
-    <string name="call_log_action_block_report_number" msgid="7302636538668696729">"Заблакір./паведаміць пра спам"</string>
-    <string name="call_log_action_block_number" msgid="5048188386501998865">"Заблакіраваць нумар"</string>
-    <string name="call_log_action_remove_spam" msgid="2045319806318398403">"Не спам"</string>
-    <string name="call_log_action_unblock_number" msgid="6100117033288448758">"Разблакіраваць нумар"</string>
-    <string name="spam_number_call_log_label" msgid="2678431398326811131">"Спам"</string>
-    <string name="call_composer_connection_failed" msgid="6776461585447831242">"Карыстальнік <xliff:g id="NAME">%1$s</xliff:g> па-за сеткай і не даступны"</string>
-    <string name="about_phone_label" msgid="582991354677973731">"Інфармацыя"</string>
-    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Расшыфравана Google"</string>
-    <string name="voicemail_transcription_in_progress" msgid="2933320969613783210">"Google расшыфроўвае…"</string>
-    <string name="voicemail_transcription_failed" msgid="335275303117412706">"Расшыфроўка недаступная."</string>
-    <string name="voicemail_transcription_failed_language_not_supported" msgid="4210332591050562553">"Расшыфроўка недаступная. Мова не падтрымліваецца."</string>
-    <string name="voicemail_transcription_failed_no_speech" msgid="9093372879697874852">"Расшыфроўка недаступная. Маўленне не выяўлена."</string>
-    <string name="view_conversation" msgid="7895904782094119702">"Праглядзець"</string>
-    <string name="ec_data_deleted" msgid="4794880345545827107">"Выклік выдалены. У \"Паведамленнях\" праглядзіце і выдаліце далучэнні, якія былі абагулены падчас гэтага выкліку."</string>
-    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"Выклікі выдалены. У \"Паведамленнях\" праглядзіце і выдаліце далучэнні, якія былі абагулены падчас гэтых выклікаў."</string>
+  <string name="respond_via_sms_setting_title">Хуткія адказы</string>
+  <string name="call_settings_label">Выклікі</string>
+  <string name="manage_blocked_numbers_label">Заблакіраваныя нумары</string>
+  <string name="voicemail_settings_label">Галасавая пошта</string>
+  <string name="blocked_numbers_disabled_emergency_header_label">Блакіроўка выклікаў часова адключана</string>
+  <string name="blocked_numbers_disabled_emergency_desc">Блакіроўка выклікаў будзе адключана, таму што вы выклікалі экстранныя службы з гэтага тэлефона на працягу апошніх 48 гадзін. Яна будзе аўтаматычна адноўлена пасля заканчэння перыяду ў 48 гадзін.</string>
+  <string name="import_send_to_voicemail_numbers_label">Імпартаваць нумары</string>
+  <string name="blocked_call_settings_import_description">Вы пазначалі праз іншыя праграмы некаторых абанентаў, якіх трэба аўтаматычна адпраўляць у галасавую пошту .</string>
+  <string name="blocked_call_settings_view_numbers_button">Прагледзець нумары</string>
+  <string name="blocked_call_settings_import_button">Імпартаваць</string>
+  <string name="description_blocked_number_list_delete">Разблакіраваць нумар</string>
+  <string name="addBlockedNumber">Дадаць нумар</string>
+  <string name="block_number_footer_message_vvm">Выклікі з гэтых нумароў будуць блакіравацца, а паведамленні галасавой пошты - аўтаматычна выдаляцца.</string>
+  <string name="block_number_footer_message_no_vvm">Выклікі з гэтых нумароў будуць блакіравацца, але з іх яшчэ можна пакінуць вам паведамленні галасавой пошты.</string>
+  <string name="block_list">Заблакіраваныя нумары</string>
+  <string name="alreadyBlocked">%1$s ужо заблакіраваны.</string>
+  <string name="phone_account_settings_label">Уліковыя запісы для выклікаў</string>
+  <string name="permission_no_speeddial">Каб уключыць хуткі набор, уключыце дазвол для Кантактаў.</string>
+  <string name="permission_no_calllog">Каб прагледзець свой журнал выклікаў, уключыце дазволы Тэлефона.</string>
+  <string name="permission_no_search">Каб шукаць свае кантакты, уключыце дазвол для Кантактаў.</string>
+  <string name="permission_place_call">Каб зрабіць выклік, уключыце дазвол для Тэлефона.</string>
+  <string name="toast_cannot_write_system_settings">Праграма Тэлефон не мае дазволу на запіс у налады сістэмы.</string>
+  <string name="blocked_number_call_log_label">Заблакiравана</string>
+  <string name="call_log_action_block_report_number">Заблакір./паведаміць пра спам</string>
+  <string name="call_log_action_block_number">Заблакіраваць нумар</string>
+  <string name="call_log_action_remove_spam">Не спам</string>
+  <string name="call_log_action_unblock_number">Разблакіраваць нумар</string>
+  <string name="spam_number_call_log_label">Спам</string>
+  <string name="call_composer_connection_failed">Карыстальнік %1$s па-за сеткай і не даступны</string>
+  <string name="about_phone_label">Інфармацыя</string>
+  <string name="voicemail_transcription_branding_text">Расшыфравана Google</string>
+  <string name="voicemail_transcription_in_progress">Ідзе расшыфроўка…</string>
+  <string name="voicemail_transcription_failed">Расшыфроўка недаступная.</string>
+  <string name="voicemail_transcription_failed_language_not_supported">Расшыфроўка недаступная. Мова не падтрымліваецца.</string>
+  <string name="voicemail_transcription_failed_no_speech">Расшыфроўка недаступная. Маўленне не выяўлена.</string>
+  <string name="voicemail_donation_promo_title">Дапамажыце палепшыць якасць расшыфроўкі</string>
+  <string name="voicemail_donation_promo_content">Дайце Google доступ да расшыфраваных паведамленняў галасавой пошты. Яны будуць захоўвацца ананімна. Гэты параметр заўсёды можна змяніць у наладах. %1$s</string>
+  <string name="voicemail_donation_promo_opt_in">Так, згаджаюся</string>
+  <string name="voicemail_donation_promo_opt_out">Не, дзякуй</string>
+  <string name="voicemail_transcription_rating">Ацаніце якасць транскрыпцыі</string>
+  <string name="voicemail_transcription_rating_thanks">Дзякуй за водгук</string>
+  <string name="description_rating_good">Падабаецца</string>
+  <string name="description_rating_bad">Не падабаецца</string>
+  <string name="view_conversation">Праглядзець</string>
+  <string name="ec_data_deleted">Выклік выдалены. У \"Паведамленнях\" праглядзіце і выдаліце далучэнні, якія былі абагулены падчас гэтага выкліку.</string>
+  <string name="multiple_ec_data_deleted">Выклікі выдалены. У \"Паведамленнях\" праглядзіце і выдаліце далучэнні, якія былі абагулены падчас гэтых выклікаў.</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-bg/strings.xml b/java/com/android/dialer/app/res/values-bg/strings.xml
index f1f7509..88369ac 100644
--- a/java/com/android/dialer/app/res/values-bg/strings.xml
+++ b/java/com/android/dialer/app/res/values-bg/strings.xml
@@ -1,179 +1,171 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="applicationLabel" msgid="2202739481132958990">"Телефон"</string>
-    <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"Телефонна клавиатура"</string>
-    <string name="callHistoryIconLabel" msgid="7493268743411968630">"История на обажданията"</string>
-    <string name="action_copy_number_text" msgid="832682558551502319">"Копиране на номера"</string>
-    <string name="copy_transcript_text" msgid="937904189017310829">"Копиране на преписа"</string>
-    <string name="action_edit_number_before_call" msgid="8017492815878473837">"Редактиране на номера преди обаждане"</string>
-    <string name="call_log_delete_all" msgid="7852970926906523784">"Изчистване на историята на обажд."</string>
-    <string name="call_log_trash_voicemail" msgid="6118493534178533972">"Изтриване на гласова поща"</string>
-    <string name="snackbar_voicemail_deleted" msgid="7463166543725496307">"Гл. поща е изтрита"</string>
-    <string name="snackbar_voicemail_deleted_undo" msgid="6959743982796409941">"ОТМЯНА"</string>
-    <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"Да се изчисти ли историята на обажд.?"</string>
-    <string name="clearCallLogConfirmation" msgid="6844949465815109166">"Така ще се изтрият всички обаждания от историята ви"</string>
-    <string name="clearCallLogProgress_title" msgid="995004835687361977">"Историята на обажд. се изчиства…"</string>
-    <string name="notification_missedCallTitle" msgid="8283366068539898486">"Пропуснато обаждане"</string>
-    <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"Пропуснато служебно обаждане"</string>
-    <string name="notification_missedCallsTitle" msgid="3697442015345089802">"Пропуснати обаждания"</string>
-    <string name="notification_missedCallsMsg" msgid="8176217633929018706">"<xliff:g id="NUM_MISSED_CALLS">%d</xliff:g> пропуснати обаждания"</string>
-    <string name="notification_missedCall_call_back" msgid="3875698110051973965">"Обратно обаждане"</string>
-    <string name="notification_missedCall_message" msgid="5086910028988305964">"Съобщение"</string>
-    <string name="post_call_notification_message" msgid="5417476789860590611">"<xliff:g id="NAME">%1$s</xliff:g>: <xliff:g id="MESSAGE">%2$s</xliff:g>"</string>
-    <string name="notification_voicemail_text_format" msgid="1895667520930252897">"Набиране на <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
-    <string name="notification_voicemail_no_vm_number" msgid="8942821987929495842">"Неизвестен номер за гласова поща"</string>
-    <plurals name="notification_voicemail_title" formatted="false" msgid="1551847434476438657">
-      <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> гласови съобщения </item>
-      <item quantity="one">Гласово съобщение</item>
-    </plurals>
-    <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
-    <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"Нова гласова поща от <xliff:g id="CALLER">%1$s</xliff:g>"</string>
-    <string name="voicemail_playback_error" msgid="4384373852257757295">"Гл. поща не можа да се възпроизведе"</string>
-    <string name="voicemail_fetching_content" msgid="572320120918636014">"Гласовата поща се зарежда…"</string>
-    <string name="voicemail_fetching_timout" msgid="2128873915839949783">"Гласовата поща не можа да се зареди"</string>
-    <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_playback_speakerphone" msgid="4852027754869750227">"Включване или изключване на високоговорителя"</string>
-    <string name="description_playback_seek" msgid="1340910573254132520">"Търсене на позиция за възпроизвеждане"</string>
-    <string name="action_menu_call_history_description" msgid="8829135306925008546">"История на обажданията"</string>
-    <string name="action_menu_overflow_description" msgid="7648679686746517341">"Още опции"</string>
-    <string name="action_menu_dialpad_button" msgid="1970631633457493180">"цифрова клавиатура"</string>
-    <string name="dialer_settings_label" msgid="4980176284150290175">"Настройки"</string>
-    <string name="simulator_submenu_label" msgid="186156287346615267">"Симулатор"</string>
-    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Пряк път към новия ПИ"</string>
-    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"Влизате в режима на групови действия"</string>
-    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"Излязохте от режима на групови действия"</string>
-    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"Избрахте <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"Премахнахте избора от <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_contact_details" msgid="3341280873855253464">"Подробности за контакта за <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_spam_contact_details" msgid="5592578752881528368">"Подробности за връзка за обаждащия се <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>, евентуално разпространяващ спам"</string>
-    <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> обаждания."</string>
-    <string name="description_video_call" msgid="3738199365585751727">"Видеообаждане."</string>
-    <string name="description_start_voice_search" msgid="8380022725973015261">"Стартиране на гласово търсене"</string>
-    <string name="voicemail" msgid="8899540969000957954">"Гласова поща"</string>
-    <string name="description_cancel_multi_select" msgid="3930475950253360461">"Анулиране на режима на групови действия"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Изтриване"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Отказ"</string>
-    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"Избрахте <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
-      <item quantity="other">"<b>"Да се изтрият ли тези гласови съобщения? "</b>"</item>
-      <item quantity="one">"<b>"Да се изтрие ли това гласово съобщение? "</b>"</item>
-    </plurals>
-    <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
-    <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> в <xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
-    <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="voice_search_not_available" msgid="6546240433719732905">"Гласовото търсене не е налице"</string>
-    <string name="dialer_hint_find_contact" msgid="2023214799381149808">"Търсене в контактите"</string>
-    <string name="block_number_search_hint" msgid="5377706079015099416">"Доб. номер или потърс. контакт"</string>
-    <string name="call_log_all_empty" msgid="3955572868518162004">"Историята на обажданията ви е празна"</string>
-    <string name="call_log_all_empty_action" msgid="852218280136243014">"Извършване на обаждане"</string>
-    <string name="call_log_missed_empty" msgid="7094936030845062214">"Нямате пропуснати обаждания."</string>
-    <string name="call_log_voicemail_empty" msgid="273623903423275178">"Входящата ви гласова поща е празна."</string>
-    <string name="call_log_activity_title" msgid="1275242727244945527">"История на обажданията"</string>
-    <string name="call_log_all_title" msgid="6042262422192020327">"Всички"</string>
-    <string name="call_log_missed_title" msgid="17254005889268015">"Пропуснати"</string>
-    <string name="tab_speed_dial" msgid="6616404752227561075">"Бързо набиране"</string>
-    <string name="tab_history" msgid="7420269368689503596">"История на обажданията"</string>
-    <string name="tab_all_contacts" msgid="5531733977693943015">"Контакти"</string>
-    <string name="tab_voicemail" msgid="2458548090088316246">"Гласова поща"</string>
-    <string name="search_shortcut_call_number" msgid="8847918845036880688">"Обаждане на <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"Създаване на нов контакт"</string>
-    <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"Добавяне към контакт"</string>
-    <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"Изпращане на SMS"</string>
-    <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"Провеждане на видеообаждане"</string>
-    <string name="search_shortcut_block_number" msgid="4587283230665805776">"Блокиране на номера"</string>
-    <string name="speed_dial_empty" msgid="3346406399966039505">"Още нямате контакти за бързо набиране"</string>
-    <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"Добавяне на любим контакт"</string>
-    <string name="remove_contact" msgid="2353580570488923668">"Премахване"</string>
-    <string name="select_all" msgid="408601760696146245">"Избиране на всички"</string>
-    <string name="call_log_action_video_call" msgid="7565549950343850819">"Видеообаждане"</string>
-    <string name="call_log_action_send_message" msgid="6948727362660115554">"Изпращане на съобщение"</string>
-    <string name="call_log_action_details" msgid="2091370737371449501">"Подробности за обаждането"</string>
-    <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"Изпращане до…"</string>
-    <string name="call_log_action_call" msgid="682724094251540583">"Обаждане до <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_incoming_missed_call" msgid="8292535799379230029">"Пропуснато обаждане от <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_incoming_answered_call" msgid="3920182963103160610">"Прието обаждане от <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_unread_voicemail" msgid="145170985013419170">"Непрочетено гласово съобщение от <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_read_voicemail" msgid="5585559881573227732">"Гласово съобщение от <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_outgoing_call" msgid="543952487882919924">"Обаждане до <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="call_log_via_number" msgid="1340307109806397650">"през <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> през <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="description_call_action" msgid="4042796498169106545">"Обаждане на <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_video_call_action" msgid="1237090968588659650">"Видеообаждане до <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
-    <string name="description_voicemail_action" msgid="3290143432403538524">"Прослушване на гласовата поща от <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_create_new_contact_action" msgid="1928282350281564130">"Създаване на контакт за <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"Добавяне на <xliff:g id="NAMEORNUMBER">^1</xliff:g> към съществуващ контакт"</string>
-    <string name="description_details_action" msgid="2061866409737706174">"Подробности за обаждането за <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="call_log_header_today" msgid="1576119097475845293">"Днес"</string>
-    <string name="call_log_header_yesterday" msgid="5616077776205329563">"Вчера"</string>
-    <string name="call_log_header_other" msgid="4940676886254217644">"По-стари"</string>
-    <string name="voicemail_speaker_on" msgid="3151333608926996668">"Включване на високоговорителя."</string>
-    <string name="voicemail_speaker_off" msgid="2530064206962034201">"Изключване на високоговорителя."</string>
-    <string name="voicemail_play_start_pause" msgid="3874823480278334664">"Стартиране или поставяне на пауза на възпроизвеждането."</string>
-    <string name="display_options_title" msgid="3880091801055797975">"Опции за показване"</string>
-    <string name="sounds_and_vibration_title" msgid="3075050000721181384">"Звуци и вибриране"</string>
-    <string name="accessibility_settings_title" msgid="3329027650429831820">"Достъпност"</string>
-    <string name="ringtone_title" msgid="8377174189894648486">"Мелодия на телефона"</string>
-    <string name="vibrate_on_ring_title" msgid="631441314790960485">"Вибриране и при обаждания"</string>
-    <string name="dtmf_tone_enable_title" msgid="3273762431523939277">"Звуци от клавиатурата"</string>
-    <string name="dtmf_tone_length_title" msgid="534096029202438539">"Дължина на звуците от клавиатурата"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="applicationLabel">Телефон</string>
+  <string name="launcherDialpadActivityLabel">Телефонна клавиатура</string>
+  <string name="callHistoryIconLabel">История на обажданията</string>
+  <string name="action_copy_number_text">Копиране на номера</string>
+  <string name="copy_transcript_text">Копиране на преписа</string>
+  <string name="action_edit_number_before_call">Редактиране на номера преди обаждане</string>
+  <string name="call_log_delete_all">Изчистване на историята на обажд.</string>
+  <string name="call_log_trash_voicemail">Изтриване на гласова поща</string>
+  <string name="snackbar_voicemail_deleted">Гл. поща е изтрита</string>
+  <string name="clearCallLogConfirmation_title">Да се изчисти ли историята на обажд.?</string>
+  <string name="clearCallLogConfirmation">Така ще се изтрият всички обаждания от историята ви</string>
+  <string name="clearCallLogProgress_title">Историята на обажд. се изчиства…</string>
+  <string name="notification_missedCallTitle">Пропуснато обаждане</string>
+  <string name="notification_missedWorkCallTitle">Пропуснато служебно обаждане</string>
+  <string name="notification_missedCallsTitle">Пропуснати обаждания</string>
+  <string name="notification_missedCallsMsg">%d пропуснати обаждания</string>
+  <string name="notification_missedCall_call_back">Обратно обаждане</string>
+  <string name="notification_missedCall_message">Съобщение</string>
+  <string name="post_call_notification_message">%1$s: %2$s</string>
+  <string name="notification_voicemail_text_format">Набиране на %s</string>
+  <string name="notification_voicemail_no_vm_number">Неизвестен номер за гласова поща</string>
+  <plurals name="notification_voicemail_title">
+    <item quantity="one">Гласово съобщение</item>
+    <item quantity="other"> %1$d гласови съобщения </item>
+  </plurals>
+  <string name="notification_voicemail_callers_list">%1$s, %2$s</string>
+  <string name="notification_new_voicemail_ticker">Нова гласова поща от %1$s</string>
+  <string name="voicemail_playback_error">Гл. поща не можа да се възпроизведе</string>
+  <string name="voicemail_fetching_content">Гласовата поща се зарежда…</string>
+  <string name="voicemail_fetching_timout">Гласовата поща не можа да се зареди</string>
+  <string name="call_log_item_count_and_date">(%1$d) %2$s</string>
+  <string name="description_playback_speakerphone">Включване или изключване на високоговорителя</string>
+  <string name="description_playback_seek">Търсене на позиция за възпроизвеждане</string>
+  <string name="action_menu_call_history_description">История на обажданията</string>
+  <string msgid="2295659037509008453" name="action_menu_overflow_description">Още опции</string>
+  <string name="action_menu_dialpad_button">цифрова клавиатура</string>
+  <string name="dialer_settings_label">Настройки</string>
+  <string name="simulator_submenu_label">Симулатор</string>
+  <string name="new_ui_launcher_shortcut_label">Пряк път към новия ПИ</string>
+  <string name="description_entering_bulk_action_mode">Влизате в режима на групови действия</string>
+  <string name="description_leaving_bulk_action_mode">Излязохте от режима на групови действия</string>
+  <string name="description_selecting_bulk_action_mode">Избрахте %1$s</string>
+  <string name="description_unselecting_bulk_action_mode">Премахнахте избора от %1$s</string>
+  <string name="description_contact_details">Подробности за контакта за %1$s</string>
+  <string name="description_spam_contact_details">Подробности за връзка за обаждащия се %1$s, евентуално разпространяващ спам</string>
+  <string name="description_num_calls">%1$s обаждания.</string>
+  <string name="description_video_call">Видеообаждане.</string>
+  <string name="description_start_voice_search">Стартиране на гласово търсене</string>
+  <string name="voicemail">Гласова поща</string>
+  <string name="description_cancel_multi_select">Анулиране на режима на групови действия</string>
+  <string name="voicemailMultiSelectDeleteConfirm">Изтриване</string>
+  <string name="voicemailMultiSelectDeleteCancel">Отказ</string>
+  <string name="voicemailMultiSelectActionBarTitle">Избрахте %1$s</string>
+  <plurals name="delete_voicemails_confirmation_dialog_title">
+    <item quantity="one"><b>Да се изтрие ли това гласово съобщение? </b></item>
+    <item quantity="other"><b>Да се изтрият ли тези гласови съобщения? </b></item>
+  </plurals>
+  <string name="voicemailCallLogToday">@string/call_log_header_today</string>
+  <string name="voicemailCallLogDateTimeFormat">%1$s в %2$s</string>
+  <string name="voicemailDurationFormat">%1$02d:%2$02d</string>
+  <string name="voicemailCallLogDateTimeFormatWithDuration">%1$s • %2$s</string>
+  <string name="voice_search_not_available">Гласовото търсене не е налице</string>
+  <string name="dialer_hint_find_contact">Търсене в контактите</string>
+  <string name="block_number_search_hint">Доб. номер или потърс. контакт</string>
+  <string name="call_log_all_empty">Историята на обажданията ви е празна</string>
+  <string name="call_log_all_empty_action">Извършване на обаждане</string>
+  <string name="call_log_missed_empty">Нямате пропуснати обаждания.</string>
+  <string name="call_log_voicemail_empty">Входящата ви гласова поща е празна.</string>
+  <string name="call_log_activity_title">История на обажданията</string>
+  <string name="call_log_all_title">Всички</string>
+  <string name="call_log_missed_title">Пропуснати</string>
+  <string name="tab_speed_dial">Бързо набиране</string>
+  <string name="tab_history">История на обажданията</string>
+  <string name="tab_all_contacts">Контакти</string>
+  <string name="tab_voicemail">Гласова поща</string>
+  <string name="search_shortcut_call_number">Обаждане на %s</string>
+  <string name="search_shortcut_create_new_contact">Създаване на нов контакт</string>
+  <string name="search_shortcut_add_to_contact">Добавяне към контакт</string>
+  <string name="search_shortcut_send_sms_message">Изпращане на SMS</string>
+  <string name="search_shortcut_make_video_call">Провеждане на видеообаждане</string>
+  <string name="search_shortcut_block_number">Блокиране на номера</string>
+  <string name="speed_dial_empty">Още нямате контакти за бързо набиране</string>
+  <string name="speed_dial_empty_add_favorite_action">Добавяне на любим контакт</string>
+  <string name="remove_contact">Премахване</string>
+  <string name="select_all">Избиране на всички</string>
+  <string name="call_log_action_video_call">Видеообаждане</string>
+  <string name="call_log_action_set_up_video">Настройване на видеообаждания</string>
+  <string name="call_log_action_invite_video">Покана за видеообаждане</string>
+  <string name="call_log_action_send_message">Изпращане на съобщение</string>
+  <string name="call_log_action_details">Подробности за обаждането</string>
+  <string name="call_log_action_share_voicemail">Изпращане до…</string>
+  <string name="call_log_action_call">Обаждане до ^1</string>
+  <string name="description_incoming_missed_call">Пропуснато обаждане от ^1, ^2, ^3, ^4.</string>
+  <string name="description_incoming_answered_call">Прието обаждане от ^1, ^2, ^3, ^4.</string>
+  <string name="description_unread_voicemail">Непрочетено гласово съобщение от ^1, ^2, ^3, ^4.</string>
+  <string name="description_read_voicemail">Гласово съобщение от ^1, ^2, ^3, ^4.</string>
+  <string name="description_outgoing_call">Обаждане до ^1, ^2, ^3, ^4.</string>
+  <string name="call_log_via_number">през %1$s</string>
+  <string name="call_log_via_number_phone_account">%1$s през %2$s</string>
+  <string name="description_call_action">Обаждане на ^1</string>
+  <string name="description_video_call_action">Видеообаждане до ^1.</string>
+  <string name="description_voicemail_action">Прослушване на гласовата поща от ^1</string>
+  <string name="description_create_new_contact_action">Създаване на контакт за ^1</string>
+  <string name="description_add_to_existing_contact_action">Добавяне на ^1 към съществуващ контакт</string>
+  <string name="description_details_action">Подробности за обаждането за ^1</string>
+  <string name="call_log_header_today">Днес</string>
+  <string name="call_log_header_yesterday">Вчера</string>
+  <string name="call_log_header_other">По-стари</string>
+  <string name="voicemail_speaker_on">Включване на високоговорителя.</string>
+  <string name="voicemail_speaker_off">Изключване на високоговорителя.</string>
+  <string name="voicemail_play_start_pause">Стартиране или поставяне на пауза на възпроизвеждането.</string>
+  <string name="display_options_title">Опции за показване</string>
+  <string name="sounds_and_vibration_title">Звуци и вибриране</string>
+  <string name="accessibility_settings_title">Достъпност</string>
+  <string name="ringtone_title">Мелодия на телефона</string>
+  <string name="vibrate_on_ring_title">Вибриране и при обаждания</string>
+  <string name="dtmf_tone_enable_title">Звуци от клавиатурата</string>
+  <string name="dtmf_tone_length_title">Дължина на звуците от клавиатурата</string>
   <string-array name="dtmf_tone_length_entries">
-    <item msgid="3136353015227162823">"Нормално"</item>
-    <item msgid="5376841175538523822">"Продължително"</item>
+    <item>Нормално</item>
+    <item>Продължително</item>
   </string-array>
-    <string name="respond_via_sms_setting_title" msgid="8008181606657693452">"Бързи отговори"</string>
-    <string name="call_settings_label" msgid="7824611757200960807">"Обаждания"</string>
-    <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Блокиране на обажданията"</string>
-    <string name="voicemail_settings_label" msgid="4594299554519920570">"Гласова поща"</string>
-    <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Блокир. на обажданията е временно изкл."</string>
-    <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Блокирането на обажданията е деактивирано, защото в рамките на последните 48 часа сте се свързали със спешните служби от този телефон. То автоматично ще бъде активирано отново, когато периодът от 48 часа изтече."</string>
-    <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Импортиране на номерата"</string>
-    <string name="blocked_call_settings_import_description" msgid="1819412052545228965">"По-рано означихте обажданията от някои контакти автоматично да се прехвърлят към гласова поща чрез други приложения."</string>
-    <string name="blocked_call_settings_view_numbers_button" msgid="3332727948554356704">"Преглед на номерата"</string>
-    <string name="blocked_call_settings_import_button" msgid="7319111700387470727">"Импортиране"</string>
-    <string name="description_blocked_number_list_delete" msgid="2139644216858370740">"Отблокиране на номера"</string>
-    <string name="addBlockedNumber" msgid="3053473735238295551">"Добавяне на номер"</string>
-    <string name="block_number_footer_message_vvm" msgid="7955326304033982368">"Обажданията от тези номера ще бъдат блокирани, а гласовите съобщения – автоматично изтривани."</string>
-    <string name="block_number_footer_message_no_vvm" msgid="1152684139070471665">"Обажданията от тези номера ще бъдат блокирани, но обаждащите се от тях пак може да са в състояние да ви оставят гласови съобщения."</string>
-    <string name="block_list" msgid="4701585783411870782">"Блокирани номера"</string>
-    <string name="alreadyBlocked" msgid="5483253180532475653">"Номер <xliff:g id="NUMBER">%1$s</xliff:g> вече е блокиран."</string>
-    <string name="phone_account_settings_label" msgid="8372485478006965920">"Профили за обаждане"</string>
-    <string name="permission_no_speeddial" msgid="8487215628510596753">"За да активирате бързото набиране, включете разрешението за Контакти."</string>
-    <string name="permission_no_calllog" msgid="4053705651238775784">"За да видите списъка с обажданията си, включете разрешението за Телефон."</string>
-    <string name="permission_no_search" msgid="2424710404207193826">"За да търсите в контактите си, включете разрешенията за тях."</string>
-    <string name="permission_place_call" msgid="8686908130349369423">"За да извършите обаждане, включете разрешението за Телефон."</string>
-    <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"Приложението Телефон няма разрешение да записва в системните настройки."</string>
-    <string name="blocked_number_call_log_label" msgid="4212282846299997693">"Блокирано"</string>
-    <string name="call_log_action_block_report_number" msgid="7302636538668696729">"Блокиране/сигнал за спам"</string>
-    <string name="call_log_action_block_number" msgid="5048188386501998865">"Блокиране на номера"</string>
-    <string name="call_log_action_remove_spam" msgid="2045319806318398403">"Не е спам"</string>
-    <string name="call_log_action_unblock_number" msgid="6100117033288448758">"Отблокиране на номера"</string>
-    <string name="spam_number_call_log_label" msgid="2678431398326811131">"Спам"</string>
-    <string name="call_composer_connection_failed" msgid="6776461585447831242">"С <xliff:g id="NAME">%1$s</xliff:g> не може да се установи връзка, тъй като е офлайн"</string>
-    <string name="about_phone_label" msgid="582991354677973731">"Информация"</string>
-    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Транскрибирано от Google"</string>
-    <string name="voicemail_transcription_in_progress" msgid="2933320969613783210">"Google създава препис…"</string>
-    <string name="voicemail_transcription_failed" msgid="335275303117412706">"Няма наличен препис."</string>
-    <string name="voicemail_transcription_failed_language_not_supported" msgid="4210332591050562553">"Няма наличен препис. Езикът не се поддържа."</string>
-    <string name="voicemail_transcription_failed_no_speech" msgid="9093372879697874852">"Няма наличен препис. Не бе открита реч."</string>
-    <string name="view_conversation" msgid="7895904782094119702">"Преглед"</string>
-    <string name="ec_data_deleted" msgid="4794880345545827107">"Обаждането е изтрито. Прегледайте и изтрийте прикачените файлове, споделени по време на това обаждане в Messages."</string>
-    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"Обажданията са изтрити. Прегледайте и изтрийте прикачените файлове, споделени по време на обажданията в Messages."</string>
+  <string name="respond_via_sms_setting_title">Бързи отговори</string>
+  <string name="call_settings_label">Обаждания</string>
+  <string name="manage_blocked_numbers_label">Блокирани номера</string>
+  <string name="voicemail_settings_label">Гласова поща</string>
+  <string name="blocked_numbers_disabled_emergency_header_label">Блокир. на обажданията е временно изкл.</string>
+  <string name="blocked_numbers_disabled_emergency_desc">Блокирането на обажданията е деактивирано, защото в рамките на последните 48 часа сте се свързали със спешните служби от този телефон. То автоматично ще бъде активирано отново, когато периодът от 48 часа изтече.</string>
+  <string name="import_send_to_voicemail_numbers_label">Импортиране на номерата</string>
+  <string name="blocked_call_settings_import_description">По-рано означихте обажданията от някои контакти автоматично да се прехвърлят към гласова поща чрез други приложения.</string>
+  <string name="blocked_call_settings_view_numbers_button">Преглед на номерата</string>
+  <string name="blocked_call_settings_import_button">Импортиране</string>
+  <string name="description_blocked_number_list_delete">Отблокиране на номера</string>
+  <string name="addBlockedNumber">Добавяне на номер</string>
+  <string name="block_number_footer_message_vvm">Обажданията от тези номера ще бъдат блокирани, а гласовите съобщения – автоматично изтривани.</string>
+  <string name="block_number_footer_message_no_vvm">Обажданията от тези номера ще бъдат блокирани, но обаждащите се от тях пак може да са в състояние да ви оставят гласови съобщения.</string>
+  <string name="block_list">Блокирани номера</string>
+  <string name="alreadyBlocked">Номер %1$s вече е блокиран.</string>
+  <string name="phone_account_settings_label">Профили за обаждане</string>
+  <string name="permission_no_speeddial">За да активирате бързото набиране, включете разрешението за Контакти.</string>
+  <string name="permission_no_calllog">За да видите списъка с обажданията си, включете разрешението за Телефон.</string>
+  <string name="permission_no_search">За да търсите в контактите си, включете разрешенията за тях.</string>
+  <string name="permission_place_call">За да извършите обаждане, включете разрешението за Телефон.</string>
+  <string name="toast_cannot_write_system_settings">Приложението Телефон няма разрешение да записва в системните настройки.</string>
+  <string name="blocked_number_call_log_label">Блокирано</string>
+  <string name="call_log_action_block_report_number">Блокиране/сигнал за спам</string>
+  <string name="call_log_action_block_number">Блокиране на номера</string>
+  <string name="call_log_action_remove_spam">Не е спам</string>
+  <string name="call_log_action_unblock_number">Отблокиране на номера</string>
+  <string name="spam_number_call_log_label">Спам</string>
+  <string name="call_composer_connection_failed">С %1$s не може да се установи връзка, тъй като е офлайн</string>
+  <string name="about_phone_label">Информация</string>
+  <string name="voicemail_transcription_branding_text">Транскрибирано от Google</string>
+  <string name="voicemail_transcription_in_progress">Транскрибира се…</string>
+  <string name="voicemail_transcription_failed">Няма наличен препис.</string>
+  <string name="voicemail_transcription_failed_language_not_supported">Няма наличен препис. Езикът не се поддържа.</string>
+  <string name="voicemail_transcription_failed_no_speech">Няма наличен препис. Не бе открита реч.</string>
+  <string name="voicemail_donation_promo_title">Ще помогнете ли за подобряване на точността на преписите?</string>
+  <string name="voicemail_donation_promo_content">Позволете на Google да преглежда това и бъдещите съобщения в гласовата поща с преписи. Те ще бъдат съхранявани анонимно. Можете да промените настройките по всяко време. %1$s</string>
+  <string name="voicemail_donation_promo_opt_in">Да, ще участвам</string>
+  <string name="voicemail_donation_promo_opt_out">Не, благодаря</string>
+  <string name="voicemail_transcription_rating">Оценете качеството на преписа</string>
+  <string name="voicemail_transcription_rating_thanks">Благодарим ви за отзивите</string>
+  <string name="description_rating_good">Харесва ми</string>
+  <string name="description_rating_bad">Не ми харесва</string>
+  <string name="view_conversation">Преглед</string>
+  <string name="ec_data_deleted">Обаждането е изтрито. Прегледайте и изтрийте прикачените файлове, споделени по време на това обаждане в Messages.</string>
+  <string name="multiple_ec_data_deleted">Обажданията са изтрити. Прегледайте и изтрийте прикачените файлове, споделени по време на обажданията в Messages.</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-bn/strings.xml b/java/com/android/dialer/app/res/values-bn/strings.xml
index e5b89bf..9438584 100644
--- a/java/com/android/dialer/app/res/values-bn/strings.xml
+++ b/java/com/android/dialer/app/res/values-bn/strings.xml
@@ -1,179 +1,171 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="applicationLabel" msgid="2202739481132958990">"ফোন"</string>
-    <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"ফোনের কীপ্যাড"</string>
-    <string name="callHistoryIconLabel" msgid="7493268743411968630">"পুরোনো কলের তালিকা"</string>
-    <string name="action_copy_number_text" msgid="832682558551502319">"নম্বর প্রতিলিপি করুন"</string>
-    <string name="copy_transcript_text" msgid="937904189017310829">"ট্রান্সক্রিপশান প্রতিলিপি করুন"</string>
-    <string name="action_edit_number_before_call" msgid="8017492815878473837">"কল করার আগে নম্বর সম্পাদনা করুন"</string>
-    <string name="call_log_delete_all" msgid="7852970926906523784">"পুরোনো কলের তালিকা সাফ করুন"</string>
-    <string name="call_log_trash_voicemail" msgid="6118493534178533972">"ভয়েসমেল মুছুন"</string>
-    <string name="snackbar_voicemail_deleted" msgid="7463166543725496307">"ভয়েসমেল মোছা হয়েছে"</string>
-    <string name="snackbar_voicemail_deleted_undo" msgid="6959743982796409941">"পূর্বাবস্থায় ফিরুন"</string>
-    <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"পুরোনো কলের তালিকা সাফ করবেন?"</string>
-    <string name="clearCallLogConfirmation" msgid="6844949465815109166">"এটি আপনার ইতিহাস থেকে সমস্ত কল মুছে দেবে"</string>
-    <string name="clearCallLogProgress_title" msgid="995004835687361977">"পুরোনো কলের তালিকা সাফ করা হচ্ছে…"</string>
-    <string name="notification_missedCallTitle" msgid="8283366068539898486">"মিসড কল"</string>
-    <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"কাজের কল মিস করেছেন"</string>
-    <string name="notification_missedCallsTitle" msgid="3697442015345089802">"মিস করা কলগুলি"</string>
-    <string name="notification_missedCallsMsg" msgid="8176217633929018706">"<xliff:g id="NUM_MISSED_CALLS">%d</xliff:g>টি মিস করা কল"</string>
-    <string name="notification_missedCall_call_back" msgid="3875698110051973965">"কল ব্যাক করুন"</string>
-    <string name="notification_missedCall_message" msgid="5086910028988305964">"বার্তা"</string>
-    <string name="post_call_notification_message" msgid="5417476789860590611">"<xliff:g id="NAME">%1$s</xliff:g>: <xliff:g id="MESSAGE">%2$s</xliff:g>"</string>
-    <string name="notification_voicemail_text_format" msgid="1895667520930252897">"<xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g> এ ডায়াল করুন"</string>
-    <string name="notification_voicemail_no_vm_number" msgid="8942821987929495842">"ভয়েসমেল নম্বর অজানা"</string>
-    <plurals name="notification_voicemail_title" formatted="false" msgid="1551847434476438657">
-      <item quantity="one"> <xliff:g id="COUNT">%1$d</xliff:g>টি ভয়েসমেল </item>
-      <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g>টি ভয়েসমেল </item>
-    </plurals>
-    <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
-    <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"<xliff:g id="CALLER">%1$s</xliff:g> এর থেকে নতুন ভয়েসমেল"</string>
-    <string name="voicemail_playback_error" msgid="4384373852257757295">"ভয়েসমেল প্লে করা যায়নি"</string>
-    <string name="voicemail_fetching_content" msgid="572320120918636014">"ভয়েসমেল লোড করা হচ্ছে..."</string>
-    <string name="voicemail_fetching_timout" msgid="2128873915839949783">"ভয়েসমেল লোড করা যায়নি"</string>
-    <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_playback_speakerphone" msgid="4852027754869750227">"স্পিকার চালু বা বন্ধ করুন"</string>
-    <string name="description_playback_seek" msgid="1340910573254132520">"প্লেব্যাক অবস্থান খুঁজুন"</string>
-    <string name="action_menu_call_history_description" msgid="8829135306925008546">"কলের ইতিহাস"</string>
-    <string name="action_menu_overflow_description" msgid="7648679686746517341">"আরও বিকল্প"</string>
-    <string name="action_menu_dialpad_button" msgid="1970631633457493180">"কীপ্যাড"</string>
-    <string name="dialer_settings_label" msgid="4980176284150290175">"সেটিংস"</string>
-    <string name="simulator_submenu_label" msgid="186156287346615267">"সিমুলেটার"</string>
-    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"নতুন UI শর্টকাট তৈরি করুন"</string>
-    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"বাল্ক অ্যাকশন মোডে প্রবেশ করা হচ্ছে"</string>
-    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"বাল্ক অ্যাকশন মোড ত্যাগ করুন"</string>
-    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> নির্বাচন করা হয়েছে"</string>
-    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> অনির্বাচন করা হয়েছে"</string>
-    <string name="description_contact_details" msgid="3341280873855253464">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> পরিচিতির বিশদ বিবরণ"</string>
-    <string name="description_spam_contact_details" msgid="5592578752881528368">"সন্দেহভাজন স্প্যাম কলারের পরিচিতির বিশদ বিবরণ <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g>টি কল৷"</string>
-    <string name="description_video_call" msgid="3738199365585751727">"ভিডিও কল।"</string>
-    <string name="description_start_voice_search" msgid="8380022725973015261">"ভয়েস অনুসন্ধান শুরু করুন"</string>
-    <string name="voicemail" msgid="8899540969000957954">"ভয়েসমেল"</string>
-    <string name="description_cancel_multi_select" msgid="3930475950253360461">"ব্যাচ অ্যাকশন মোড বাতিল করুন"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"মুছুন"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"বাতিল করুন"</string>
-    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g>টি নির্বাচিত"</string>
-    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
-      <item quantity="one">"<b>"এই ভয়েসমেলগুলি মুছবেন? "</b>"</item>
-      <item quantity="other">"<b>"এই ভয়েসমেলগুলি মুছবেন? "</b>"</item>
-    </plurals>
-    <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
-    <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> তারিখে <xliff:g id="TIME">%2$s</xliff:g>\'টায়"</string>
-    <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
-    <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="voice_search_not_available" msgid="6546240433719732905">"ভয়েস অনুসন্ধান অনুপলব্ধ"</string>
-    <string name="dialer_hint_find_contact" msgid="2023214799381149808">"পরিচিতিগুলি খুঁজুন"</string>
-    <string name="block_number_search_hint" msgid="5377706079015099416">"সংখ্যা যোগ করুন বা পরিচিতিগুলি খুঁজুন"</string>
-    <string name="call_log_all_empty" msgid="3955572868518162004">"আপনার পুরোনো কলের তালিকা খালি আছে"</string>
-    <string name="call_log_all_empty_action" msgid="852218280136243014">"একটি কল করুন"</string>
-    <string name="call_log_missed_empty" msgid="7094936030845062214">"আপনার কোনো মিসড কল নেই।"</string>
-    <string name="call_log_voicemail_empty" msgid="273623903423275178">"আপনার ভয়েসমেলের ইনবক্স খালি রয়েছে।"</string>
-    <string name="call_log_activity_title" msgid="1275242727244945527">"পুরোনো কলের তালিকা"</string>
-    <string name="call_log_all_title" msgid="6042262422192020327">"সমস্ত"</string>
-    <string name="call_log_missed_title" msgid="17254005889268015">"মিসড"</string>
-    <string name="tab_speed_dial" msgid="6616404752227561075">"দ্রুত ডায়াল"</string>
-    <string name="tab_history" msgid="7420269368689503596">"পুরোনো কলের তালিকা"</string>
-    <string name="tab_all_contacts" msgid="5531733977693943015">"পরিচিতিগুলি"</string>
-    <string name="tab_voicemail" msgid="2458548090088316246">"ভয়েস মেল"</string>
-    <string name="search_shortcut_call_number" msgid="8847918845036880688">"<xliff:g id="NUMBER">%s</xliff:g> এ কল করুন"</string>
-    <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"নতুন পরিচিতি বানান"</string>
-    <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"একটি পরিচিতিতে যোগ করুন"</string>
-    <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"SMS পাঠান"</string>
-    <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"ভিডিও কল করুন"</string>
-    <string name="search_shortcut_block_number" msgid="4587283230665805776">"নম্বর অবরোধ করুন"</string>
-    <string name="speed_dial_empty" msgid="3346406399966039505">"আপনার স্পীড ডায়ালে এখনও পর্যন্ত কেউ নেই"</string>
-    <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"একটি পছন্দসই যোগ করুন"</string>
-    <string name="remove_contact" msgid="2353580570488923668">"সরান"</string>
-    <string name="select_all" msgid="408601760696146245">"সবগুলি বেছে নিন"</string>
-    <string name="call_log_action_video_call" msgid="7565549950343850819">"ভিডিও কল"</string>
-    <string name="call_log_action_send_message" msgid="6948727362660115554">"একটি বার্তা পাঠান"</string>
-    <string name="call_log_action_details" msgid="2091370737371449501">"কলের বিশদ বিবরণ"</string>
-    <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"এতে পাঠান ..."</string>
-    <string name="call_log_action_call" msgid="682724094251540583">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> এর কল"</string>
-    <string name="description_incoming_missed_call" msgid="8292535799379230029">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g> থেকে মিস হওয়া কল৷"</string>
-    <string name="description_incoming_answered_call" msgid="3920182963103160610">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g> এর থেকে উত্তর দেওয়া কল৷"</string>
-    <string name="description_unread_voicemail" msgid="145170985013419170">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> , <xliff:g id="TYPEORLOCATION">^2</xliff:g> , <xliff:g id="TIMEOFCALL">^3</xliff:g> , <xliff:g id="PHONEACCOUNT">^4</xliff:g> এর থেকে অপঠিত ভয়েসমেল৷"</string>
-    <string name="description_read_voicemail" msgid="5585559881573227732">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> , <xliff:g id="TYPEORLOCATION">^2</xliff:g> , <xliff:g id="TIMEOFCALL">^3</xliff:g> , <xliff:g id="PHONEACCOUNT">^4</xliff:g> এর থেকে ভয়েসমেল৷"</string>
-    <string name="description_outgoing_call" msgid="543952487882919924">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g> এ কল করুন৷"</string>
-    <string name="call_log_via_number" msgid="1340307109806397650">"<xliff:g id="NUMBER">%1$s</xliff:g> এর মাধ্যমে"</string>
-    <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="NUMBER">%2$s</xliff:g> এর মাধ্যমে <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>"</string>
-    <string name="description_call_action" msgid="4042796498169106545">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> এর কল"</string>
-    <string name="description_video_call_action" msgid="1237090968588659650">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>-এ ভিডিও কল করুন।"</string>
-    <string name="description_voicemail_action" msgid="3290143432403538524">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> এর থেকে আসা ভয়েসমেল শোনা হয়েছে"</string>
-    <string name="description_create_new_contact_action" msgid="1928282350281564130">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> এর জন্য পরিচিতি তৈরি করুন"</string>
-    <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"বিদ্যমান পরিচিতিতে <xliff:g id="NAMEORNUMBER">^1</xliff:g> যোগ করুন"</string>
-    <string name="description_details_action" msgid="2061866409737706174">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> এর কলের বিবরণ"</string>
-    <string name="call_log_header_today" msgid="1576119097475845293">"আজ"</string>
-    <string name="call_log_header_yesterday" msgid="5616077776205329563">"গতকাল"</string>
-    <string name="call_log_header_other" msgid="4940676886254217644">"পুরোনো"</string>
-    <string name="voicemail_speaker_on" msgid="3151333608926996668">"স্পিকার চালু করুন৷"</string>
-    <string name="voicemail_speaker_off" msgid="2530064206962034201">"স্পিকার বন্ধ করুন৷"</string>
-    <string name="voicemail_play_start_pause" msgid="3874823480278334664">"প্লেব্যাক শুরু করুন বা বিরতি দিন৷"</string>
-    <string name="display_options_title" msgid="3880091801055797975">"প্রদর্শনের বিকল্পগুলি"</string>
-    <string name="sounds_and_vibration_title" msgid="3075050000721181384">"শব্দ এবং কম্পন"</string>
-    <string name="accessibility_settings_title" msgid="3329027650429831820">"অ্যাক্সেসযোগ্যতা"</string>
-    <string name="ringtone_title" msgid="8377174189894648486">"ফোন রিংটোন"</string>
-    <string name="vibrate_on_ring_title" msgid="631441314790960485">"এছাড়াও কল এলে কম্পিত করুন"</string>
-    <string name="dtmf_tone_enable_title" msgid="3273762431523939277">"কীপ্যাড টোন"</string>
-    <string name="dtmf_tone_length_title" msgid="534096029202438539">"কীপ্যাড টোনের দৈর্ঘ্য"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="applicationLabel">ফোন</string>
+  <string name="launcherDialpadActivityLabel">ফোনের কীপ্যাড</string>
+  <string name="callHistoryIconLabel">পুরোনো কলের তালিকা</string>
+  <string name="action_copy_number_text">নম্বর কপি করুন</string>
+  <string name="copy_transcript_text">ট্রান্সক্রিপশান কপি করুন</string>
+  <string name="action_edit_number_before_call">কল করার আগে নম্বর সম্পাদনা করুন</string>
+  <string name="call_log_delete_all">পুরোনো কলের তালিকা সাফ করুন</string>
+  <string name="call_log_trash_voicemail">ভয়েসমেল মুছুন</string>
+  <string name="snackbar_voicemail_deleted">ভয়েসমেল মোছা হয়েছে</string>
+  <string name="clearCallLogConfirmation_title">পুরোনো কলের তালিকা সাফ করবেন?</string>
+  <string name="clearCallLogConfirmation">এটি আপনার ইতিহাস থেকে সমস্ত কল মুছে দেবে</string>
+  <string name="clearCallLogProgress_title">পুরোনো কলের তালিকা সাফ করা হচ্ছে…</string>
+  <string name="notification_missedCallTitle">মিসড কল</string>
+  <string name="notification_missedWorkCallTitle">কাজের কল মিস করেছেন</string>
+  <string name="notification_missedCallsTitle">মিস করা কলগুলি</string>
+  <string name="notification_missedCallsMsg">%dটি মিস করা কল</string>
+  <string name="notification_missedCall_call_back">কল ব্যাক করুন</string>
+  <string name="notification_missedCall_message">বার্তা</string>
+  <string name="post_call_notification_message">%1$s: %2$s</string>
+  <string name="notification_voicemail_text_format">%s এ ডায়াল করুন</string>
+  <string name="notification_voicemail_no_vm_number">ভয়েসমেল নম্বর অজানা</string>
+  <plurals name="notification_voicemail_title">
+    <item quantity="one"> %1$dটি ভয়েসমেল </item>
+    <item quantity="other"> %1$dটি ভয়েসমেল </item>
+  </plurals>
+  <string name="notification_voicemail_callers_list">%1$s, %2$s</string>
+  <string name="notification_new_voicemail_ticker">%1$s এর থেকে নতুন ভয়েসমেল</string>
+  <string name="voicemail_playback_error">ভয়েসমেল প্লে করা যায়নি</string>
+  <string name="voicemail_fetching_content">ভয়েসমেল লোড করা হচ্ছে...</string>
+  <string name="voicemail_fetching_timout">ভয়েসমেল লোড করা যায়নি</string>
+  <string name="call_log_item_count_and_date">(%1$d) %2$s</string>
+  <string name="description_playback_speakerphone">স্পিকার চালু বা বন্ধ করুন</string>
+  <string name="description_playback_seek">প্লেব্যাক লোকেশন খুঁজুন</string>
+  <string name="action_menu_call_history_description">কলের ইতিহাস</string>
+  <string msgid="2295659037509008453" name="action_menu_overflow_description">আরও বিকল্প</string>
+  <string name="action_menu_dialpad_button">কীপ্যাড</string>
+  <string name="dialer_settings_label">সেটিংস</string>
+  <string name="simulator_submenu_label">সিমুলেটার</string>
+  <string name="new_ui_launcher_shortcut_label">নতুন UI শর্টকাট তৈরি করুন</string>
+  <string name="description_entering_bulk_action_mode">বাল্ক অ্যাকশন মোডে প্রবেশ করা হচ্ছে</string>
+  <string name="description_leaving_bulk_action_mode">বাল্ক অ্যাকশন মোড ত্যাগ করুন</string>
+  <string name="description_selecting_bulk_action_mode">%1$s নির্বাচন করা হয়েছে</string>
+  <string name="description_unselecting_bulk_action_mode">%1$s অনির্বাচন করা হয়েছে</string>
+  <string name="description_contact_details">%1$s পরিচিতির বিশদ বিবরণ</string>
+  <string name="description_spam_contact_details">সন্দেহভাজন স্প্যাম কলারের পরিচিতির বিশদ বিবরণ %1$s</string>
+  <string name="description_num_calls">%1$sটি কল৷</string>
+  <string name="description_video_call">ভিডিও কল।</string>
+  <string name="description_start_voice_search">ভয়েস সার্চ শুরু করুন</string>
+  <string name="voicemail">ভয়েসমেল</string>
+  <string name="description_cancel_multi_select">ব্যাচ অ্যাকশন মোড বাতিল করুন</string>
+  <string name="voicemailMultiSelectDeleteConfirm">মুছুন</string>
+  <string name="voicemailMultiSelectDeleteCancel">বাতিল করুন</string>
+  <string name="voicemailMultiSelectActionBarTitle">%1$sটি নির্বাচিত</string>
+  <plurals name="delete_voicemails_confirmation_dialog_title">
+    <item quantity="one"><b>এই ভয়েসমেলগুলি মুছবেন? </b></item>
+    <item quantity="other"><b>এই ভয়েসমেলগুলি মুছবেন? </b></item>
+  </plurals>
+  <string name="voicemailCallLogToday">@string/call_log_header_today</string>
+  <string name="voicemailCallLogDateTimeFormat">%1$s তারিখে %2$s\'টায়</string>
+  <string name="voicemailDurationFormat">%1$02d:%2$02d</string>
+  <string name="voicemailCallLogDateTimeFormatWithDuration">%1$s • %2$s</string>
+  <string name="voice_search_not_available">ভয়েস সার্চ অনুপলব্ধ</string>
+  <string name="dialer_hint_find_contact">পরিচিতিগুলি খুঁজুন</string>
+  <string name="block_number_search_hint">সংখ্যা যোগ করুন বা পরিচিতিগুলি খুঁজুন</string>
+  <string name="call_log_all_empty">আপনার পুরোনো কলের তালিকা খালি আছে</string>
+  <string name="call_log_all_empty_action">একটি কল করুন</string>
+  <string name="call_log_missed_empty">আপনার কোনো মিসড কল নেই।</string>
+  <string name="call_log_voicemail_empty">আপনার ভয়েসমেলের ইনবক্স খালি রয়েছে।</string>
+  <string name="call_log_activity_title">পুরোনো কলের তালিকা</string>
+  <string name="call_log_all_title">সমস্ত</string>
+  <string name="call_log_missed_title">মিসড</string>
+  <string name="tab_speed_dial">দ্রুত ডায়াল</string>
+  <string name="tab_history">পুরোনো কলের তালিকা</string>
+  <string name="tab_all_contacts">পরিচিতিগুলি</string>
+  <string name="tab_voicemail">ভয়েস মেল</string>
+  <string name="search_shortcut_call_number">%s এ কল করুন</string>
+  <string name="search_shortcut_create_new_contact">নতুন পরিচিতি বানান</string>
+  <string name="search_shortcut_add_to_contact">একটি পরিচিতিতে যোগ করুন</string>
+  <string name="search_shortcut_send_sms_message">SMS পাঠান</string>
+  <string name="search_shortcut_make_video_call">ভিডিও কল করুন</string>
+  <string name="search_shortcut_block_number">নম্বর অবরোধ করুন</string>
+  <string name="speed_dial_empty">আপনার স্পীড ডায়ালে এখনও পর্যন্ত কেউ নেই</string>
+  <string name="speed_dial_empty_add_favorite_action">একটি পছন্দসই যোগ করুন</string>
+  <string name="remove_contact">সরান</string>
+  <string name="select_all">সবগুলি বেছে নিন</string>
+  <string name="call_log_action_video_call">ভিডিও কল</string>
+  <string name="call_log_action_set_up_video">ভিডিও কল সেট-আপ করুন</string>
+  <string name="call_log_action_invite_video">ভিডিও কলে আমন্ত্রণ জানান</string>
+  <string name="call_log_action_send_message">একটি বার্তা পাঠান</string>
+  <string name="call_log_action_details">কলের বিশদ বিবরণ</string>
+  <string name="call_log_action_share_voicemail">এতে পাঠান ...</string>
+  <string name="call_log_action_call">^1 এর কল</string>
+  <string name="description_incoming_missed_call">^1, ^2, ^3, ^4 থেকে মিস হওয়া কল৷</string>
+  <string name="description_incoming_answered_call">^1, ^2, ^3, ^4 এর থেকে উত্তর দেওয়া কল৷</string>
+  <string name="description_unread_voicemail">^1 , ^2 , ^3 , ^4 এর থেকে অপঠিত ভয়েসমেল৷</string>
+  <string name="description_read_voicemail">^1 , ^2 , ^3 , ^4 এর থেকে ভয়েসমেল৷</string>
+  <string name="description_outgoing_call">^1, ^2, ^3, ^4 এ কল করুন৷</string>
+  <string name="call_log_via_number">%1$s এর মাধ্যমে</string>
+  <string name="call_log_via_number_phone_account">%2$s এর মাধ্যমে %1$s</string>
+  <string name="description_call_action">^1 এর কল</string>
+  <string name="description_video_call_action">^1-এ ভিডিও কল করুন।</string>
+  <string name="description_voicemail_action">^1 এর থেকে আসা ভয়েসমেল শোনা হয়েছে</string>
+  <string name="description_create_new_contact_action">^1 এর জন্য পরিচিতি তৈরি করুন</string>
+  <string name="description_add_to_existing_contact_action">বিদ্যমান পরিচিতিতে ^1 যোগ করুন</string>
+  <string name="description_details_action">^1 এর কলের বিবরণ</string>
+  <string name="call_log_header_today">আজ</string>
+  <string name="call_log_header_yesterday">গতকাল</string>
+  <string name="call_log_header_other">পুরোনো</string>
+  <string name="voicemail_speaker_on">স্পিকার চালু করুন৷</string>
+  <string name="voicemail_speaker_off">স্পিকার বন্ধ করুন৷</string>
+  <string name="voicemail_play_start_pause">প্লেব্যাক শুরু করুন বা বিরতি দিন৷</string>
+  <string name="display_options_title">প্রদর্শনের বিকল্পগুলি</string>
+  <string name="sounds_and_vibration_title">শব্দ এবং কম্পন</string>
+  <string name="accessibility_settings_title">অ্যাক্সেসযোগ্যতা</string>
+  <string name="ringtone_title">ফোন রিংটোন</string>
+  <string name="vibrate_on_ring_title">এছাড়াও কল এলে কম্পিত করুন</string>
+  <string name="dtmf_tone_enable_title">কীপ্যাড টোন</string>
+  <string name="dtmf_tone_length_title">কীপ্যাড টোনের দৈর্ঘ্য</string>
   <string-array name="dtmf_tone_length_entries">
-    <item msgid="3136353015227162823">"স্বাভাবিক"</item>
-    <item msgid="5376841175538523822">"দীর্ঘ"</item>
+    <item>স্বাভাবিক</item>
+    <item>দীর্ঘ</item>
   </string-array>
-    <string name="respond_via_sms_setting_title" msgid="8008181606657693452">"দ্রুত প্রতিক্রিয়াগুলি"</string>
-    <string name="call_settings_label" msgid="7824611757200960807">"কল"</string>
-    <string name="manage_blocked_numbers_label" msgid="16823761991832273">"কল অবরোধ করা"</string>
-    <string name="voicemail_settings_label" msgid="4594299554519920570">"ভয়েসমেল"</string>
-    <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"কল অবরোধ সাময়িকভাবে বন্ধ রয়েছে"</string>
-    <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"কল অবরোধ অক্ষম করা হয়েছে কারণ আপনি গত ২৮ ঘন্টার মধ্যে এই ফোন থেকে জরুরি পরিষেবায় যোগাযোগ করেছেন। ২৮ ঘন্টার সময়সীমা পেরিয়ে গেলেই এটি স্বয়ংক্রিয়ভাবে আবার সক্ষম হবে।"</string>
-    <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"নম্বরগুলি আমদানি করুন"</string>
-    <string name="blocked_call_settings_import_description" msgid="1819412052545228965">"আপনি আগে থেকেই অন্য অ্যাপ্লিকেশানগুলির মাধ্যমে স্বয়ংক্রিয়ভাবে ভয়েস মেল পাঠানোর জন্য কিছু কলারকে চিহ্নিত করেছেন৷"</string>
-    <string name="blocked_call_settings_view_numbers_button" msgid="3332727948554356704">"নম্বরগুলি দেখুন"</string>
-    <string name="blocked_call_settings_import_button" msgid="7319111700387470727">"আমদানি করুন"</string>
-    <string name="description_blocked_number_list_delete" msgid="2139644216858370740">"নম্বর অবরোধ মুক্ত করুন"</string>
-    <string name="addBlockedNumber" msgid="3053473735238295551">"একটি নম্বর যোগ করুন"</string>
-    <string name="block_number_footer_message_vvm" msgid="7955326304033982368">"এই নম্বরগুলি থেকে আসা কলগুলি ব্লক করা হবে এবং ভয়েসমেলগুলি স্বয়ংক্রিয়ভাবে মুছে ফেলা হবে৷"</string>
-    <string name="block_number_footer_message_no_vvm" msgid="1152684139070471665">"এই নম্বরগুলি থেকে আসা কলগুলি অবরোধ করা হবে, কিন্তু তারা হয়ত এখনও আপনাকে ভয়েসমেলগুলি পাঠাতে পারবে৷"</string>
-    <string name="block_list" msgid="4701585783411870782">"ব্লক করা নাম্বারগুলি"</string>
-    <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g> ইতিমধ্যেই অববোধ করা রয়েছে৷"</string>
-    <string name="phone_account_settings_label" msgid="8372485478006965920">"কলিং অ্যাকাউন্টগুলি"</string>
-    <string name="permission_no_speeddial" msgid="8487215628510596753">"স্পীড ডায়াল সক্ষম করতে, পরিচিতিগুলির অনুমতি চালু করুন।"</string>
-    <string name="permission_no_calllog" msgid="4053705651238775784">"আপনার কল লগ দেখতে, ফোনের অনুমতি চালু করুন।"</string>
-    <string name="permission_no_search" msgid="2424710404207193826">"আপনার পরিচিতিগুলি অনুসন্ধান করতে, পরিচিতির অনুমতিগুলি চালু করুন।"</string>
-    <string name="permission_place_call" msgid="8686908130349369423">"একটি কল করতে, ফোনের অনুমতি চালু করুন।"</string>
-    <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"ফোনের অ্যাপ্লিকেশানকে সিস্টেম সেটিংসে লেখার অনুমতি দেওয়া হয়নি।"</string>
-    <string name="blocked_number_call_log_label" msgid="4212282846299997693">"অবরুদ্ধ"</string>
-    <string name="call_log_action_block_report_number" msgid="7302636538668696729">"অবরুদ্ধ করুন/স্প্যাম হিসাবে অভিযোগ করুন"</string>
-    <string name="call_log_action_block_number" msgid="5048188386501998865">"নম্বর অবরোধ করুন"</string>
-    <string name="call_log_action_remove_spam" msgid="2045319806318398403">"স্প্যাম নয়"</string>
-    <string name="call_log_action_unblock_number" msgid="6100117033288448758">"নম্বর অবরোধ মুক্ত করুন"</string>
-    <string name="spam_number_call_log_label" msgid="2678431398326811131">"স্প্যাম"</string>
-    <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> এখন অফলাইনে থাকায় যোগাযোগ করা যাবে না"</string>
-    <string name="about_phone_label" msgid="582991354677973731">"সম্পর্কে"</string>
-    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Google এর প্রতিলিপি করা হয়েছে"</string>
-    <string name="voicemail_transcription_in_progress" msgid="2933320969613783210">"Google ক্যাপশন তৈরি করছে…"</string>
-    <string name="voicemail_transcription_failed" msgid="335275303117412706">"ক্যাপশন তৈরি করা যায়নি।"</string>
-    <string name="voicemail_transcription_failed_language_not_supported" msgid="4210332591050562553">"এই ভাষাটি সমর্থিত নয়। ক্যাপশন তৈরি করা যায়নি।"</string>
-    <string name="voicemail_transcription_failed_no_speech" msgid="9093372879697874852">"কোনও ভাষ্য শনাক্ত করা যায়নি। ক্যাপশন তৈরি করা যাবে না।"</string>
-    <string name="view_conversation" msgid="7895904782094119702">"দেখুন"</string>
-    <string name="ec_data_deleted" msgid="4794880345545827107">"কল মোছা হয়েছে। বার্তার মধ্যে কলের সময় শেয়ার করা সংযুক্তি দেখুন ও মুছুন।"</string>
-    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"কলগুলি মোছা হয়েছে। বার্তার মধ্যে কলের সময় শেয়ার করা সংযুক্তিগুলি দেখুন ও মুছুন।"</string>
+  <string name="respond_via_sms_setting_title">দ্রুত প্রতিক্রিয়াগুলি</string>
+  <string name="call_settings_label">কল</string>
+  <string name="manage_blocked_numbers_label">ব্লক করা নম্বর</string>
+  <string name="voicemail_settings_label">ভয়েসমেল</string>
+  <string name="blocked_numbers_disabled_emergency_header_label">কল অবরোধ সাময়িকভাবে বন্ধ রয়েছে</string>
+  <string name="blocked_numbers_disabled_emergency_desc">কল অবরোধ অক্ষম করা হয়েছে কারণ আপনি গত ২৮ ঘন্টার মধ্যে এই ফোন থেকে জরুরি পরিষেবায় যোগাযোগ করেছেন। ২৮ ঘন্টার সময়সীমা পেরিয়ে গেলেই এটি স্বয়ংক্রিয়ভাবে আবার সক্ষম হবে।</string>
+  <string name="import_send_to_voicemail_numbers_label">নম্বরগুলি আমদানি করুন</string>
+  <string name="blocked_call_settings_import_description">আপনি আগে থেকেই অন্য অ্যাপ্লিকেশানগুলির মাধ্যমে স্বয়ংক্রিয়ভাবে ভয়েস মেল পাঠানোর জন্য কিছু কলারকে চিহ্নিত করেছেন৷</string>
+  <string name="blocked_call_settings_view_numbers_button">নম্বরগুলি দেখুন</string>
+  <string name="blocked_call_settings_import_button">আমদানি করুন</string>
+  <string name="description_blocked_number_list_delete">নম্বর অবরোধ মুক্ত করুন</string>
+  <string name="addBlockedNumber">একটি নম্বর যোগ করুন</string>
+  <string name="block_number_footer_message_vvm">এই নম্বরগুলি থেকে আসা কলগুলি ব্লক করা হবে এবং ভয়েসমেলগুলি স্বয়ংক্রিয়ভাবে মুছে ফেলা হবে৷</string>
+  <string name="block_number_footer_message_no_vvm">এই নম্বরগুলি থেকে আসা কলগুলি অবরোধ করা হবে, কিন্তু তারা হয়ত এখনও আপনাকে ভয়েসমেলগুলি পাঠাতে পারবে৷</string>
+  <string name="block_list">ব্লক করা নাম্বারগুলি</string>
+  <string name="alreadyBlocked">%1$s ইতিমধ্যেই অববোধ করা রয়েছে৷</string>
+  <string name="phone_account_settings_label">কলিং অ্যাকাউন্টগুলি</string>
+  <string name="permission_no_speeddial">স্পীড ডায়াল সক্ষম করতে, পরিচিতিগুলির অনুমতি চালু করুন।</string>
+  <string name="permission_no_calllog">আপনার কল লগ দেখতে, ফোনের অনুমতি চালু করুন।</string>
+  <string name="permission_no_search">আপনার পরিচিতিগুলি সার্চ করতে, পরিচিতির অনুমতিগুলি চালু করুন।</string>
+  <string name="permission_place_call">একটি কল করতে, ফোনের অনুমতি চালু করুন।</string>
+  <string name="toast_cannot_write_system_settings">ফোনের অ্যাপ্লিকেশানকে সিস্টেম সেটিংসে লেখার অনুমতি দেওয়া হয়নি।</string>
+  <string name="blocked_number_call_log_label">অবরুদ্ধ</string>
+  <string name="call_log_action_block_report_number">অবরুদ্ধ করুন/স্প্যাম হিসাবে অভিযোগ করুন</string>
+  <string name="call_log_action_block_number">নম্বর অবরোধ করুন</string>
+  <string name="call_log_action_remove_spam">স্প্যাম নয়</string>
+  <string name="call_log_action_unblock_number">নম্বর অবরোধ মুক্ত করুন</string>
+  <string name="spam_number_call_log_label">স্প্যাম</string>
+  <string name="call_composer_connection_failed">%1$s এখন অফলাইনে থাকায় যোগাযোগ করা যাবে না</string>
+  <string name="about_phone_label">সম্পর্কে</string>
+  <string name="voicemail_transcription_branding_text">Google এর প্রতিলিপি করা হয়েছে</string>
+  <string name="voicemail_transcription_in_progress">ট্রান্সক্রাইব করা হচ্ছে...</string>
+  <string name="voicemail_transcription_failed">ক্যাপশন তৈরি করা যায়নি।</string>
+  <string name="voicemail_transcription_failed_language_not_supported">এই ভাষাটি সমর্থিত নয়। ক্যাপশন তৈরি করা যায়নি।</string>
+  <string name="voicemail_transcription_failed_no_speech">কোনও ভাষ্য শনাক্ত করা যায়নি। ক্যাপশন তৈরি করা যাবে না।</string>
+  <string name="voicemail_donation_promo_title">ট্রান্সক্রিপশন বৈশিষ্ট্যটি আরও নির্ভুল করে তুলতে সাহায্য করবেন?</string>
+  <string name="voicemail_donation_promo_content">এই ভয়েসমেল মেসেজ এবং ভবিষ্যতে অন্যান্য যে সমস্ত মেসেজে ট্রান্সক্রিপ্ট থাকবে সেগুলি Google-কে পর্যালোচনা করতে দিন। আপনার পরিচয় গোপন রেখে সেগুলি স্টোর করা হবে। আপনি যেকোনও সময় এই সেটিংস পরিবর্তন করতে পারেন। %1$s</string>
+  <string name="voicemail_donation_promo_opt_in">হ্যাঁ, আমি রাজি</string>
+  <string name="voicemail_donation_promo_opt_out">না থাক</string>
+  <string name="voicemail_transcription_rating">ট্রান্সক্রিপশন গুণমানটির রেটিং</string>
+  <string name="voicemail_transcription_rating_thanks">মতামত জানানোর জন্য ধন্যবাদ</string>
+  <string name="description_rating_good">পছন্দ</string>
+  <string name="description_rating_bad">অপছন্দ</string>
+  <string name="view_conversation">দেখুন</string>
+  <string name="ec_data_deleted">কল মোছা হয়েছে। বার্তার মধ্যে কলের সময় শেয়ার করা সংযুক্তি দেখুন ও মুছুন।</string>
+  <string name="multiple_ec_data_deleted">কলগুলি মোছা হয়েছে। বার্তার মধ্যে কলের সময় শেয়ার করা সংযুক্তিগুলি দেখুন ও মুছুন।</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-bs/strings.xml b/java/com/android/dialer/app/res/values-bs/strings.xml
index 42552ac..100932b 100644
--- a/java/com/android/dialer/app/res/values-bs/strings.xml
+++ b/java/com/android/dialer/app/res/values-bs/strings.xml
@@ -1,181 +1,173 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="applicationLabel" msgid="2202739481132958990">"Telefon"</string>
-    <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"Telefonska tastatura"</string>
-    <string name="callHistoryIconLabel" msgid="7493268743411968630">"Historija poziva"</string>
-    <string name="action_copy_number_text" msgid="832682558551502319">"Kopiraj broj"</string>
-    <string name="copy_transcript_text" msgid="937904189017310829">"Kopiraj transkripciju"</string>
-    <string name="action_edit_number_before_call" msgid="8017492815878473837">"Uredi broj prije poziva"</string>
-    <string name="call_log_delete_all" msgid="7852970926906523784">"Obriši historiju poziva"</string>
-    <string name="call_log_trash_voicemail" msgid="6118493534178533972">"Izbriši govornu poštu"</string>
-    <string name="snackbar_voicemail_deleted" msgid="7463166543725496307">"Govorna pošta je izbrisana"</string>
-    <string name="snackbar_voicemail_deleted_undo" msgid="6959743982796409941">"PONIŠTI"</string>
-    <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"Obrisati historiju poziva?"</string>
-    <string name="clearCallLogConfirmation" msgid="6844949465815109166">"Ovo će izbrisati sve pozive iz historije"</string>
-    <string name="clearCallLogProgress_title" msgid="995004835687361977">"Brisanje historije poziva u toku…"</string>
-    <string name="notification_missedCallTitle" msgid="8283366068539898486">"Propušteni poziv"</string>
-    <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"Propušteni poslovni poziv"</string>
-    <string name="notification_missedCallsTitle" msgid="3697442015345089802">"Propušteni pozivi"</string>
-    <string name="notification_missedCallsMsg" msgid="8176217633929018706">"Propuštenih poziva: <xliff:g id="NUM_MISSED_CALLS">%d</xliff:g>"</string>
-    <string name="notification_missedCall_call_back" msgid="3875698110051973965">"Povr. poziv"</string>
-    <string name="notification_missedCall_message" msgid="5086910028988305964">"Poruka"</string>
-    <string name="post_call_notification_message" msgid="5417476789860590611">"<xliff:g id="NAME">%1$s</xliff:g>: <xliff:g id="MESSAGE">%2$s</xliff:g>"</string>
-    <string name="notification_voicemail_text_format" msgid="1895667520930252897">"Pozovi <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
-    <string name="notification_voicemail_no_vm_number" msgid="8942821987929495842">"Nepoznat broj govorne pošte"</string>
-    <plurals name="notification_voicemail_title" formatted="false" msgid="1551847434476438657">
-      <item quantity="one"> <xliff:g id="COUNT">%1$d</xliff:g> Poruka govorne pošte </item>
-      <item quantity="few"> <xliff:g id="COUNT">%1$d</xliff:g> Poruke govorne pošte </item>
-      <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> Poruka govorne pošte </item>
-    </plurals>
-    <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
-    <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"Nova govorna pošta od <xliff:g id="CALLER">%1$s</xliff:g>"</string>
-    <string name="voicemail_playback_error" msgid="4384373852257757295">"Nije moguće pokrenuti govornu poštu"</string>
-    <string name="voicemail_fetching_content" msgid="572320120918636014">"Učitavanje govorne pošte…"</string>
-    <string name="voicemail_fetching_timout" msgid="2128873915839949783">"Nije moguće učitati govornu poštu"</string>
-    <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_playback_speakerphone" msgid="4852027754869750227">"Uključi ili isključi zvučnik"</string>
-    <string name="description_playback_seek" msgid="1340910573254132520">"Traženje položaja reprodukcije"</string>
-    <string name="action_menu_call_history_description" msgid="8829135306925008546">"Historija poziva"</string>
-    <string name="action_menu_overflow_description" msgid="7648679686746517341">"Više opcija"</string>
-    <string name="action_menu_dialpad_button" msgid="1970631633457493180">"telefonska tastatura"</string>
-    <string name="dialer_settings_label" msgid="4980176284150290175">"Postavke"</string>
-    <string name="simulator_submenu_label" msgid="186156287346615267">"Simulator"</string>
-    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Kreiraj prečicu za novi UI"</string>
-    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"Ulazak u način rada za skupnu radnju"</string>
-    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"Napuštanje načina rada za skupnu radnju"</string>
-    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"Odabrano <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"Poništen odabir <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_contact_details" msgid="3341280873855253464">"Detalji o kontaktu <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_spam_contact_details" msgid="5592578752881528368">"Detalji o kontaktu za potencijalnog neželjenog pozivaoca <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_num_calls" msgid="6483594535796216044">"Broj poziva: <xliff:g id="NUMBEROFCALLS">%1$s</xliff:g>."</string>
-    <string name="description_video_call" msgid="3738199365585751727">"Videopoziv."</string>
-    <string name="description_start_voice_search" msgid="8380022725973015261">"Pokreni glasovno pretraživanje"</string>
-    <string name="voicemail" msgid="8899540969000957954">"Govorna pošta"</string>
-    <string name="description_cancel_multi_select" msgid="3930475950253360461">"Otkaži način rada za grupnu radnju"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Izbriši"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Otkaži"</string>
-    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"Odabrano <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
-      <item quantity="one">"<b>"Izbrisati ove govorne poruke? "</b>"</item>
-      <item quantity="few">"<b>"Izbrisati ove govorne poruke? "</b>"</item>
-      <item quantity="other">"<b>"Izbrisati ove govorne poruke? "</b>"</item>
-    </plurals>
-    <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
-    <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> u <xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
-    <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="voice_search_not_available" msgid="6546240433719732905">"Glasovno pretraživanje nije dostupno"</string>
-    <string name="dialer_hint_find_contact" msgid="2023214799381149808">"Traži kontakte"</string>
-    <string name="block_number_search_hint" msgid="5377706079015099416">"Dodajte broj ili tražite kontakte"</string>
-    <string name="call_log_all_empty" msgid="3955572868518162004">"Vaša historija poziva je prazna."</string>
-    <string name="call_log_all_empty_action" msgid="852218280136243014">"Pozovi"</string>
-    <string name="call_log_missed_empty" msgid="7094936030845062214">"Nemate propuštenih poziva."</string>
-    <string name="call_log_voicemail_empty" msgid="273623903423275178">"Vaše sanduče govorne pošte je prazno."</string>
-    <string name="call_log_activity_title" msgid="1275242727244945527">"Historija poziva"</string>
-    <string name="call_log_all_title" msgid="6042262422192020327">"Sve"</string>
-    <string name="call_log_missed_title" msgid="17254005889268015">"Propušteni"</string>
-    <string name="tab_speed_dial" msgid="6616404752227561075">"Brzo biranje"</string>
-    <string name="tab_history" msgid="7420269368689503596">"Historija poziva"</string>
-    <string name="tab_all_contacts" msgid="5531733977693943015">"Kontakti"</string>
-    <string name="tab_voicemail" msgid="2458548090088316246">"Govorna pošta"</string>
-    <string name="search_shortcut_call_number" msgid="8847918845036880688">"Pozovi <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"Izrada novog kontakta"</string>
-    <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"Dodaj u kontakt"</string>
-    <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"Pošalji SMS"</string>
-    <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"Uputi videopoziv"</string>
-    <string name="search_shortcut_block_number" msgid="4587283230665805776">"Blokiraj broj"</string>
-    <string name="speed_dial_empty" msgid="3346406399966039505">"Nemate nikog na brzom biranju"</string>
-    <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"Dodaj u favorite"</string>
-    <string name="remove_contact" msgid="2353580570488923668">"Ukloni"</string>
-    <string name="select_all" msgid="408601760696146245">"Odaberi sve"</string>
-    <string name="call_log_action_video_call" msgid="7565549950343850819">"Videopoziv"</string>
-    <string name="call_log_action_send_message" msgid="6948727362660115554">"Pošalji poruku"</string>
-    <string name="call_log_action_details" msgid="2091370737371449501">"Detalji o pozivu"</string>
-    <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"Pošalji na …"</string>
-    <string name="call_log_action_call" msgid="682724094251540583">"Pozovi kontakt <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_incoming_missed_call" msgid="8292535799379230029">"Propušteni poziv od kontakta <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_incoming_answered_call" msgid="3920182963103160610">"Odgovoreno na poziv od kontakta <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_unread_voicemail" msgid="145170985013419170">"Nepročitana govorna pošta od kontakta <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_read_voicemail" msgid="5585559881573227732">"Govorna pošta od kontakta <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_outgoing_call" msgid="543952487882919924">"Pozovi kontakt <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="call_log_via_number" msgid="1340307109806397650">"preko <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> preko <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="description_call_action" msgid="4042796498169106545">"Pozovi kontakt <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_video_call_action" msgid="1237090968588659650">"Uputi videopoziv kontaktu <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
-    <string name="description_voicemail_action" msgid="3290143432403538524">"Preslušaj govornu poštu od kontakta <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_create_new_contact_action" msgid="1928282350281564130">"Kreirajte kontakt za <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"Dodaj <xliff:g id="NAMEORNUMBER">^1</xliff:g> postojećem kontaktu"</string>
-    <string name="description_details_action" msgid="2061866409737706174">"Detalji poziva za <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="call_log_header_today" msgid="1576119097475845293">"Danas"</string>
-    <string name="call_log_header_yesterday" msgid="5616077776205329563">"Jučer"</string>
-    <string name="call_log_header_other" msgid="4940676886254217644">"Starije"</string>
-    <string name="voicemail_speaker_on" msgid="3151333608926996668">"Uključite zvučnik."</string>
-    <string name="voicemail_speaker_off" msgid="2530064206962034201">"Isključivanje zvučnika."</string>
-    <string name="voicemail_play_start_pause" msgid="3874823480278334664">"Pokreni ili pauziraj pokretanje"</string>
-    <string name="display_options_title" msgid="3880091801055797975">"Opcije prikaza"</string>
-    <string name="sounds_and_vibration_title" msgid="3075050000721181384">"Zvukovi i vibracija"</string>
-    <string name="accessibility_settings_title" msgid="3329027650429831820">"Pristupačnost"</string>
-    <string name="ringtone_title" msgid="8377174189894648486">"Melodija zvona telefona"</string>
-    <string name="vibrate_on_ring_title" msgid="631441314790960485">"Također vibriraj za pozive"</string>
-    <string name="dtmf_tone_enable_title" msgid="3273762431523939277">"Tonovi telefonske tastature"</string>
-    <string name="dtmf_tone_length_title" msgid="534096029202438539">"Dužina tonova telefonske tastature"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="applicationLabel">Telefon</string>
+  <string name="launcherDialpadActivityLabel">Telefonska tastatura</string>
+  <string name="callHistoryIconLabel">Historija poziva</string>
+  <string name="action_copy_number_text">Kopiraj broj</string>
+  <string name="copy_transcript_text">Kopiraj transkripciju</string>
+  <string name="action_edit_number_before_call">Uredi broj prije poziva</string>
+  <string name="call_log_delete_all">Obriši historiju poziva</string>
+  <string name="call_log_trash_voicemail">Izbriši govornu poštu</string>
+  <string name="snackbar_voicemail_deleted">Govorna pošta je izbrisana</string>
+  <string name="clearCallLogConfirmation_title">Obrisati historiju poziva?</string>
+  <string name="clearCallLogConfirmation">Ovo će izbrisati sve pozive iz historije</string>
+  <string name="clearCallLogProgress_title">Brisanje historije poziva u toku…</string>
+  <string name="notification_missedCallTitle">Propušteni poziv</string>
+  <string name="notification_missedWorkCallTitle">Propušteni poslovni poziv</string>
+  <string name="notification_missedCallsTitle">Propušteni pozivi</string>
+  <string name="notification_missedCallsMsg">Propuštenih poziva: %d</string>
+  <string name="notification_missedCall_call_back">Povr. poziv</string>
+  <string name="notification_missedCall_message">Poruka</string>
+  <string name="post_call_notification_message">%1$s: %2$s</string>
+  <string name="notification_voicemail_text_format">Pozovi %s</string>
+  <string name="notification_voicemail_no_vm_number">Nepoznat broj govorne pošte</string>
+  <plurals name="notification_voicemail_title">
+    <item quantity="one"> %1$d Poruka govorne pošte </item>
+    <item quantity="few"> %1$d Poruke govorne pošte </item>
+    <item quantity="other"> %1$d Poruka govorne pošte </item>
+  </plurals>
+  <string name="notification_voicemail_callers_list">%1$s, %2$s</string>
+  <string name="notification_new_voicemail_ticker">Nova govorna pošta od %1$s</string>
+  <string name="voicemail_playback_error">Nije moguće pokrenuti govornu poštu</string>
+  <string name="voicemail_fetching_content">Učitavanje govorne pošte…</string>
+  <string name="voicemail_fetching_timout">Nije moguće učitati govornu poštu</string>
+  <string name="call_log_item_count_and_date">(%1$d) %2$s</string>
+  <string name="description_playback_speakerphone">Uključi ili isključi zvučnik</string>
+  <string name="description_playback_seek">Traženje položaja reprodukcije</string>
+  <string name="action_menu_call_history_description">Historija poziva</string>
+  <string msgid="2295659037509008453" name="action_menu_overflow_description">Više opcija</string>
+  <string name="action_menu_dialpad_button">telefonska tastatura</string>
+  <string name="dialer_settings_label">Postavke</string>
+  <string name="simulator_submenu_label">Simulator</string>
+  <string name="new_ui_launcher_shortcut_label">Kreiraj prečicu za novi UI</string>
+  <string name="description_entering_bulk_action_mode">Ulazak u način rada za skupnu radnju</string>
+  <string name="description_leaving_bulk_action_mode">Napuštanje načina rada za skupnu radnju</string>
+  <string name="description_selecting_bulk_action_mode">Odabrano %1$s</string>
+  <string name="description_unselecting_bulk_action_mode">Poništen odabir %1$s</string>
+  <string name="description_contact_details">Detalji o kontaktu %1$s</string>
+  <string name="description_spam_contact_details">Detalji o kontaktu za potencijalnog neželjenog pozivaoca %1$s</string>
+  <string name="description_num_calls">Broj poziva: %1$s.</string>
+  <string name="description_video_call">Video poziv.</string>
+  <string name="description_start_voice_search">Pokreni glasovno pretraživanje</string>
+  <string name="voicemail">Govorna pošta</string>
+  <string name="description_cancel_multi_select">Otkaži način rada za grupnu radnju</string>
+  <string name="voicemailMultiSelectDeleteConfirm">Izbriši</string>
+  <string name="voicemailMultiSelectDeleteCancel">Otkaži</string>
+  <string name="voicemailMultiSelectActionBarTitle">Odabrano %1$s</string>
+  <plurals name="delete_voicemails_confirmation_dialog_title">
+    <item quantity="one"><b>Izbrisati ove govorne poruke? </b></item>
+    <item quantity="few"><b>Izbrisati ove govorne poruke? </b></item>
+    <item quantity="other"><b>Izbrisati ove govorne poruke? </b></item>
+  </plurals>
+  <string name="voicemailCallLogToday">@string/call_log_header_today</string>
+  <string name="voicemailCallLogDateTimeFormat">%1$s u %2$s</string>
+  <string name="voicemailDurationFormat">%1$02d:%2$02d</string>
+  <string name="voicemailCallLogDateTimeFormatWithDuration">%1$s • %2$s</string>
+  <string name="voice_search_not_available">Glasovno pretraživanje nije dostupno</string>
+  <string name="dialer_hint_find_contact">Traži kontakte</string>
+  <string name="block_number_search_hint">Dodajte broj ili tražite kontakte</string>
+  <string name="call_log_all_empty">Vaša historija poziva je prazna.</string>
+  <string name="call_log_all_empty_action">Pozovi</string>
+  <string name="call_log_missed_empty">Nemate propuštenih poziva.</string>
+  <string name="call_log_voicemail_empty">Vaše sanduče govorne pošte je prazno.</string>
+  <string name="call_log_activity_title">Historija poziva</string>
+  <string name="call_log_all_title">Sve</string>
+  <string name="call_log_missed_title">Propušteni</string>
+  <string name="tab_speed_dial">Brzo biranje</string>
+  <string name="tab_history">Historija poziva</string>
+  <string name="tab_all_contacts">Kontakti</string>
+  <string name="tab_voicemail">Govorna pošta</string>
+  <string name="search_shortcut_call_number">Pozovi %s</string>
+  <string name="search_shortcut_create_new_contact">Izrada novog kontakta</string>
+  <string name="search_shortcut_add_to_contact">Dodaj u kontakt</string>
+  <string name="search_shortcut_send_sms_message">Pošalji SMS</string>
+  <string name="search_shortcut_make_video_call">Uputi video poziv</string>
+  <string name="search_shortcut_block_number">Blokiraj broj</string>
+  <string name="speed_dial_empty">Nemate nikog na brzom biranju</string>
+  <string name="speed_dial_empty_add_favorite_action">Dodaj u omiljeno</string>
+  <string name="remove_contact">Ukloni</string>
+  <string name="select_all">Odaberi sve</string>
+  <string name="call_log_action_video_call">Video poziv</string>
+  <string name="call_log_action_set_up_video">Postavi video poziv</string>
+  <string name="call_log_action_invite_video">Pozivnica za video poziv</string>
+  <string name="call_log_action_send_message">Pošalji poruku</string>
+  <string name="call_log_action_details">Detalji o pozivu</string>
+  <string name="call_log_action_share_voicemail">Pošalji na …</string>
+  <string name="call_log_action_call">Pozovi kontakt ^1</string>
+  <string name="description_incoming_missed_call">Propušteni poziv od kontakta ^1, ^2, ^3, ^4.</string>
+  <string name="description_incoming_answered_call">Odgovoreno na poziv od kontakta ^1, ^2, ^3, ^4.</string>
+  <string name="description_unread_voicemail">Nepročitana govorna pošta od kontakta ^1, ^2, ^3, ^4.</string>
+  <string name="description_read_voicemail">Govorna pošta od kontakta ^1, ^2, ^3, ^4.</string>
+  <string name="description_outgoing_call">Pozovi kontakt ^1, ^2, ^3, ^4.</string>
+  <string name="call_log_via_number">preko %1$s</string>
+  <string name="call_log_via_number_phone_account">%1$s preko %2$s</string>
+  <string name="description_call_action">Pozovi kontakt ^1</string>
+  <string name="description_video_call_action">Uputi video poziv kontaktu ^1.</string>
+  <string name="description_voicemail_action">Preslušaj govornu poštu od kontakta ^1</string>
+  <string name="description_create_new_contact_action">Kreirajte kontakt za ^1</string>
+  <string name="description_add_to_existing_contact_action">Dodaj ^1 postojećem kontaktu</string>
+  <string name="description_details_action">Detalji poziva za ^1</string>
+  <string name="call_log_header_today">Danas</string>
+  <string name="call_log_header_yesterday">Jučer</string>
+  <string name="call_log_header_other">Starije</string>
+  <string name="voicemail_speaker_on">Uključite zvučnik.</string>
+  <string name="voicemail_speaker_off">Isključivanje zvučnika.</string>
+  <string name="voicemail_play_start_pause">Pokreni ili pauziraj pokretanje</string>
+  <string name="display_options_title">Opcije prikaza</string>
+  <string name="sounds_and_vibration_title">Zvukovi i vibracija</string>
+  <string name="accessibility_settings_title">Pristupačnost</string>
+  <string name="ringtone_title">Melodija zvona telefona</string>
+  <string name="vibrate_on_ring_title">Također vibriraj za pozive</string>
+  <string name="dtmf_tone_enable_title">Tonovi telefonske tastature</string>
+  <string name="dtmf_tone_length_title">Dužina tonova telefonske tastature</string>
   <string-array name="dtmf_tone_length_entries">
-    <item msgid="3136353015227162823">"Normalno"</item>
-    <item msgid="5376841175538523822">"Dugo"</item>
+    <item>Normalno</item>
+    <item>Dugo</item>
   </string-array>
-    <string name="respond_via_sms_setting_title" msgid="8008181606657693452">"Brzi odgovori"</string>
-    <string name="call_settings_label" msgid="7824611757200960807">"Pozivi"</string>
-    <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Blokiranje poziva"</string>
-    <string name="voicemail_settings_label" msgid="4594299554519920570">"Govorna pošta"</string>
-    <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Blokiranje poziva je privremeno isključeno"</string>
-    <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Blokiranje poziva je onemogućeno jer ste kontaktirali hitnu službu s ovog telefona u proteklih 48 sati. Automatski će se ponovo omogućiti kada istekne 48 sati."</string>
-    <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Uvezi brojeve"</string>
-    <string name="blocked_call_settings_import_description" msgid="1819412052545228965">"Ranije ste označili da se neki pozivaoci automatski šalju na govornu poštu preko drugih aplikacija."</string>
-    <string name="blocked_call_settings_view_numbers_button" msgid="3332727948554356704">"Prikaži brojeve"</string>
-    <string name="blocked_call_settings_import_button" msgid="7319111700387470727">"Uvezi"</string>
-    <string name="description_blocked_number_list_delete" msgid="2139644216858370740">"Deblokiraj broj"</string>
-    <string name="addBlockedNumber" msgid="3053473735238295551">"Dodaj broj"</string>
-    <string name="block_number_footer_message_vvm" msgid="7955326304033982368">"Pozivi s ovih brojeva će biti blokirani, a govorna pošta će se automatski brisati."</string>
-    <string name="block_number_footer_message_no_vvm" msgid="1152684139070471665">"Pozivi s ovih brojeva će biti blokirani, ali pozivaoci će vam moći ostavljati govornu poštu."</string>
-    <string name="block_list" msgid="4701585783411870782">"Blokirani brojevi"</string>
-    <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g> je već blokiran."</string>
-    <string name="phone_account_settings_label" msgid="8372485478006965920">"Računi za pozivanje"</string>
-    <string name="permission_no_speeddial" msgid="8487215628510596753">"Da omogućite brzo biranje, uključite dozvolu za Kontakte."</string>
-    <string name="permission_no_calllog" msgid="4053705651238775784">"Da vidite popis poziva, uključite dozvolu za Telefon."</string>
-    <string name="permission_no_search" msgid="2424710404207193826">"Da pretražujete kontakte, uključite dozvole za Kontakte."</string>
-    <string name="permission_place_call" msgid="8686908130349369423">"Da uputite poziv, uključite dozvolu za Telefon."</string>
-    <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"Aplikacija za telefon nema dozvolu za pisanje u postavkama sistema."</string>
-    <string name="blocked_number_call_log_label" msgid="4212282846299997693">"Blokirano"</string>
-    <string name="call_log_action_block_report_number" msgid="7302636538668696729">"Blokiraj/prijavi než. sadržaj"</string>
-    <string name="call_log_action_block_number" msgid="5048188386501998865">"Blokiraj broj"</string>
-    <string name="call_log_action_remove_spam" msgid="2045319806318398403">"Ovo nije neželjeni sadržaj"</string>
-    <string name="call_log_action_unblock_number" msgid="6100117033288448758">"Deblokiraj broj"</string>
-    <string name="spam_number_call_log_label" msgid="2678431398326811131">"Neželjena pošta"</string>
-    <string name="call_composer_connection_failed" msgid="6776461585447831242">"Osoba <xliff:g id="NAME">%1$s</xliff:g> je van mreže i ne možete je kontaktirati"</string>
-    <string name="about_phone_label" msgid="582991354677973731">"O aplikaciji"</string>
-    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Transkribirao Google"</string>
-    <string name="voicemail_transcription_in_progress" msgid="2933320969613783210">"Google transkribira…"</string>
-    <string name="voicemail_transcription_failed" msgid="335275303117412706">"Transkript nije dostupan."</string>
-    <string name="voicemail_transcription_failed_language_not_supported" msgid="4210332591050562553">"Transkript nije dostupan jer nije podržan jezik."</string>
-    <string name="voicemail_transcription_failed_no_speech" msgid="9093372879697874852">"Transkript nije dostupan jer nije prepoznat govor."</string>
-    <string name="view_conversation" msgid="7895904782094119702">"Prikaži"</string>
-    <string name="ec_data_deleted" msgid="4794880345545827107">"Poziv je izbrisan. Pogledajte i izbrišite priloge podijeljene tokom ovog poziva u aplikaciji Messages."</string>
-    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"Pozivi su izbrisani. Pogledajte i izbrišite priloge podijeljene tokom poziva u aplikaciji Messages."</string>
+  <string name="respond_via_sms_setting_title">Brzi odgovori</string>
+  <string name="call_settings_label">Pozivi</string>
+  <string name="manage_blocked_numbers_label">Blokirani brojevi</string>
+  <string name="voicemail_settings_label">Govorna pošta</string>
+  <string name="blocked_numbers_disabled_emergency_header_label">Blokiranje poziva je privremeno isključeno</string>
+  <string name="blocked_numbers_disabled_emergency_desc">Blokiranje poziva je onemogućeno jer ste kontaktirali hitnu službu s ovog telefona u proteklih 48 sati. Automatski će se ponovo omogućiti kada istekne 48 sati.</string>
+  <string name="import_send_to_voicemail_numbers_label">Uvezi brojeve</string>
+  <string name="blocked_call_settings_import_description">Ranije ste označili da se neki pozivaoci automatski šalju na govornu poštu preko drugih aplikacija.</string>
+  <string name="blocked_call_settings_view_numbers_button">Prikaži brojeve</string>
+  <string name="blocked_call_settings_import_button">Uvezi</string>
+  <string name="description_blocked_number_list_delete">Deblokiraj broj</string>
+  <string name="addBlockedNumber">Dodaj broj</string>
+  <string name="block_number_footer_message_vvm">Pozivi s ovih brojeva će biti blokirani, a govorna pošta će se automatski brisati.</string>
+  <string name="block_number_footer_message_no_vvm">Pozivi s ovih brojeva će biti blokirani, ali pozivaoci će vam moći ostavljati govornu poštu.</string>
+  <string name="block_list">Blokirani brojevi</string>
+  <string name="alreadyBlocked">%1$s je već blokiran.</string>
+  <string name="phone_account_settings_label">Računi za pozivanje</string>
+  <string name="permission_no_speeddial">Da omogućite brzo biranje, uključite odobrenje za Kontakte.</string>
+  <string name="permission_no_calllog">Da vidite popis poziva, uključite odobrenje za Telefon.</string>
+  <string name="permission_no_search">Da pretražujete kontakte, uključite odobrenja za Kontakte.</string>
+  <string name="permission_place_call">Da uputite poziv, uključite odobrenje za Telefon.</string>
+  <string name="toast_cannot_write_system_settings">Aplikacija za telefon nema odobrenje za pisanje u postavkama sistema.</string>
+  <string name="blocked_number_call_log_label">Blokirano</string>
+  <string name="call_log_action_block_report_number">Blokiraj/prijavi než. sadržaj</string>
+  <string name="call_log_action_block_number">Blokiraj broj</string>
+  <string name="call_log_action_remove_spam">Ovo nije neželjeni sadržaj</string>
+  <string name="call_log_action_unblock_number">Deblokiraj broj</string>
+  <string name="spam_number_call_log_label">Neželjena pošta</string>
+  <string name="call_composer_connection_failed">Osoba %1$s je van mreže i ne možete je kontaktirati</string>
+  <string name="about_phone_label">O aplikaciji</string>
+  <string name="voicemail_transcription_branding_text">Transkribirao Google</string>
+  <string name="voicemail_transcription_in_progress">Transkripcija...</string>
+  <string name="voicemail_transcription_failed">Transkript nije dostupan.</string>
+  <string name="voicemail_transcription_failed_language_not_supported">Transkript nije dostupan jer nije podržan jezik.</string>
+  <string name="voicemail_transcription_failed_no_speech">Transkript nije dostupan jer nije prepoznat govor.</string>
+  <string name="voicemail_donation_promo_title">Želite li pomoći u poboljšanju tačnosti transkripcije?</string>
+  <string name="voicemail_donation_promo_content">Dozvolite da Google pregleda ovu i buduće poruke govorne pošte s transkriptima. One će biti pohranjene anonimno. Postavke možete promijeniti u bilo kojem trenutku. %1$s</string>
+  <string name="voicemail_donation_promo_opt_in">Da, želim</string>
+  <string name="voicemail_donation_promo_opt_out">Ne hvala</string>
+  <string name="voicemail_transcription_rating">Ocijenite kvalitet transkrip.</string>
+  <string name="voicemail_transcription_rating_thanks">Hvala na povratnim informac.</string>
+  <string name="description_rating_good">Sviđa mi se</string>
+  <string name="description_rating_bad">Ne sviđa mi se</string>
+  <string name="view_conversation">Prikaži</string>
+  <string name="ec_data_deleted">Poziv je izbrisan. Pogledajte i izbrišite priloge podijeljene tokom ovog poziva u aplikaciji Messages.</string>
+  <string name="multiple_ec_data_deleted">Pozivi su izbrisani. Pogledajte i izbrišite priloge podijeljene tokom poziva u aplikaciji Messages.</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-ca/strings.xml b/java/com/android/dialer/app/res/values-ca/strings.xml
index c88990a..c9c4d42 100644
--- a/java/com/android/dialer/app/res/values-ca/strings.xml
+++ b/java/com/android/dialer/app/res/values-ca/strings.xml
@@ -1,179 +1,171 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="applicationLabel" msgid="2202739481132958990">"Telèfon"</string>
-    <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"Teclat del telèfon"</string>
-    <string name="callHistoryIconLabel" msgid="7493268743411968630">"Historial de trucades"</string>
-    <string name="action_copy_number_text" msgid="832682558551502319">"Copia el número"</string>
-    <string name="copy_transcript_text" msgid="937904189017310829">"Copia la transcripció"</string>
-    <string name="action_edit_number_before_call" msgid="8017492815878473837">"Edita el número abans de trucar"</string>
-    <string name="call_log_delete_all" msgid="7852970926906523784">"Esborra l\'historial de trucades"</string>
-    <string name="call_log_trash_voicemail" msgid="6118493534178533972">"Suprimeix la bústia de veu"</string>
-    <string name="snackbar_voicemail_deleted" msgid="7463166543725496307">"Correu de veu suprimit"</string>
-    <string name="snackbar_voicemail_deleted_undo" msgid="6959743982796409941">"DESFÉS"</string>
-    <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"Esborrar l\'historial de trucades?"</string>
-    <string name="clearCallLogConfirmation" msgid="6844949465815109166">"Se suprimiran totes les trucades de l\'historial."</string>
-    <string name="clearCallLogProgress_title" msgid="995004835687361977">"Esborrant historial de trucades..."</string>
-    <string name="notification_missedCallTitle" msgid="8283366068539898486">"Trucada perduda"</string>
-    <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"Trucada perduda de feina"</string>
-    <string name="notification_missedCallsTitle" msgid="3697442015345089802">"Trucades perdudes"</string>
-    <string name="notification_missedCallsMsg" msgid="8176217633929018706">"<xliff:g id="NUM_MISSED_CALLS">%d</xliff:g> trucades perdudes"</string>
-    <string name="notification_missedCall_call_back" msgid="3875698110051973965">"Torna la trucada"</string>
-    <string name="notification_missedCall_message" msgid="5086910028988305964">"Missatge"</string>
-    <string name="post_call_notification_message" msgid="5417476789860590611">"<xliff:g id="NAME">%1$s</xliff:g>: <xliff:g id="MESSAGE">%2$s</xliff:g>"</string>
-    <string name="notification_voicemail_text_format" msgid="1895667520930252897">"Marca el número <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
-    <string name="notification_voicemail_no_vm_number" msgid="8942821987929495842">"Número de la bústia de veu desconegut"</string>
-    <plurals name="notification_voicemail_title" formatted="false" msgid="1551847434476438657">
-      <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> bústies de veu </item>
-      <item quantity="one">Bústia de veu</item>
-    </plurals>
-    <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
-    <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"Nou missatge de veu de <xliff:g id="CALLER">%1$s</xliff:g>"</string>
-    <string name="voicemail_playback_error" msgid="4384373852257757295">"Error en reproduir el missatge de veu."</string>
-    <string name="voicemail_fetching_content" msgid="572320120918636014">"S\'està carregant la bústia de veu..."</string>
-    <string name="voicemail_fetching_timout" msgid="2128873915839949783">"No s\'ha pogut carregar la bústia de veu."</string>
-    <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_playback_speakerphone" msgid="4852027754869750227">"Activa o desactiva el mans lliures"</string>
-    <string name="description_playback_seek" msgid="1340910573254132520">"Cerca la posició de la reproducció"</string>
-    <string name="action_menu_call_history_description" msgid="8829135306925008546">"Historial de trucades"</string>
-    <string name="action_menu_overflow_description" msgid="7648679686746517341">"Més opcions"</string>
-    <string name="action_menu_dialpad_button" msgid="1970631633457493180">"teclat"</string>
-    <string name="dialer_settings_label" msgid="4980176284150290175">"Configuració"</string>
-    <string name="simulator_submenu_label" msgid="186156287346615267">"Simulador"</string>
-    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Crea drecera per a la nova IU"</string>
-    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"S\'està accedint al mode d\'acció massiva"</string>
-    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"S\'ha sortit del mode d\'acció massiva"</string>
-    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"S\'ha seleccionat <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"S\'ha desseleccionat <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_contact_details" msgid="3341280873855253464">"Dades de contacte de: <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_spam_contact_details" msgid="5592578752881528368">"Dades de contacte de la possible trucada brossa: <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> trucades"</string>
-    <string name="description_video_call" msgid="3738199365585751727">"Videotrucada"</string>
-    <string name="description_start_voice_search" msgid="8380022725973015261">"Inicia la cerca per veu"</string>
-    <string name="voicemail" msgid="8899540969000957954">"Bústia de veu"</string>
-    <string name="description_cancel_multi_select" msgid="3930475950253360461">"Cancel·la el mode d\'accions en lot"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Suprimeix"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Cancel·la"</string>
-    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> seleccionades"</string>
-    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
-      <item quantity="other">"<b>"Vols suprimir aquests missatges de veu? "</b>"</item>
-      <item quantity="one">"<b>"Vols suprimir aquest missatge de veu? "</b>"</item>
-    </plurals>
-    <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
-    <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> a les <xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
-    <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="voice_search_not_available" msgid="6546240433719732905">"La cerca per veu no està disponible."</string>
-    <string name="dialer_hint_find_contact" msgid="2023214799381149808">"Cerca als contactes"</string>
-    <string name="block_number_search_hint" msgid="5377706079015099416">"Afegeix núm. o cerca contactes"</string>
-    <string name="call_log_all_empty" msgid="3955572868518162004">"El teu historial de trucades és buit"</string>
-    <string name="call_log_all_empty_action" msgid="852218280136243014">"Fes una trucada"</string>
-    <string name="call_log_missed_empty" msgid="7094936030845062214">"No tens cap trucada perduda."</string>
-    <string name="call_log_voicemail_empty" msgid="273623903423275178">"La safata d\'entrada de la bústia de veu és buida."</string>
-    <string name="call_log_activity_title" msgid="1275242727244945527">"Historial de trucades"</string>
-    <string name="call_log_all_title" msgid="6042262422192020327">"Totes"</string>
-    <string name="call_log_missed_title" msgid="17254005889268015">"Perdudes"</string>
-    <string name="tab_speed_dial" msgid="6616404752227561075">"Marcatge ràpid"</string>
-    <string name="tab_history" msgid="7420269368689503596">"Historial de trucades"</string>
-    <string name="tab_all_contacts" msgid="5531733977693943015">"Contactes"</string>
-    <string name="tab_voicemail" msgid="2458548090088316246">"Bústia de veu"</string>
-    <string name="search_shortcut_call_number" msgid="8847918845036880688">"Truca al <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"Crea un contacte"</string>
-    <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"Afegeix a un contacte"</string>
-    <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"Envia SMS"</string>
-    <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"Fes una videotrucada"</string>
-    <string name="search_shortcut_block_number" msgid="4587283230665805776">"Bloqueja el número"</string>
-    <string name="speed_dial_empty" msgid="3346406399966039505">"Encara no tens cap contacte al marcatge ràpid"</string>
-    <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"Afegeix un preferit"</string>
-    <string name="remove_contact" msgid="2353580570488923668">"Suprimeix"</string>
-    <string name="select_all" msgid="408601760696146245">"Selecciona-ho tot"</string>
-    <string name="call_log_action_video_call" msgid="7565549950343850819">"Videotrucada"</string>
-    <string name="call_log_action_send_message" msgid="6948727362660115554">"Envia un missatge"</string>
-    <string name="call_log_action_details" msgid="2091370737371449501">"Detalls de la trucada"</string>
-    <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"Envia a…"</string>
-    <string name="call_log_action_call" msgid="682724094251540583">"Truca a <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_incoming_missed_call" msgid="8292535799379230029">"Trucada perduda de: <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_incoming_answered_call" msgid="3920182963103160610">"Trucada resposta de: <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_unread_voicemail" msgid="145170985013419170">"Missatge de veu no escoltat del contacte <xliff:g id="NAMEORNUMBER">^1</xliff:g>: <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_read_voicemail" msgid="5585559881573227732">"Missatge de veu del contacte <xliff:g id="NAMEORNUMBER">^1</xliff:g>: <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_outgoing_call" msgid="543952487882919924">"Trucada a <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="call_log_via_number" msgid="1340307109806397650">"al número <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> al número <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="description_call_action" msgid="4042796498169106545">"Truca a <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_video_call_action" msgid="1237090968588659650">"Videotrucada amb <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
-    <string name="description_voicemail_action" msgid="3290143432403538524">"Escolta el missatge a la bústia de veu de: <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_create_new_contact_action" msgid="1928282350281564130">"Crea un contacte per a <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"Afegeix <xliff:g id="NAMEORNUMBER">^1</xliff:g> a un contacte existent"</string>
-    <string name="description_details_action" msgid="2061866409737706174">"Detalls de la trucada de <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="call_log_header_today" msgid="1576119097475845293">"Avui"</string>
-    <string name="call_log_header_yesterday" msgid="5616077776205329563">"Ahir"</string>
-    <string name="call_log_header_other" msgid="4940676886254217644">"Més antiga"</string>
-    <string name="voicemail_speaker_on" msgid="3151333608926996668">"Activa l\'altaveu."</string>
-    <string name="voicemail_speaker_off" msgid="2530064206962034201">"Desactiva l\'altaveu."</string>
-    <string name="voicemail_play_start_pause" msgid="3874823480278334664">"Inicia la reproducció o la posa en pausa."</string>
-    <string name="display_options_title" msgid="3880091801055797975">"Opcions de visualització"</string>
-    <string name="sounds_and_vibration_title" msgid="3075050000721181384">"Sons i vibració"</string>
-    <string name="accessibility_settings_title" msgid="3329027650429831820">"Accessibilitat"</string>
-    <string name="ringtone_title" msgid="8377174189894648486">"So de trucada"</string>
-    <string name="vibrate_on_ring_title" msgid="631441314790960485">"Vibra també en trucades"</string>
-    <string name="dtmf_tone_enable_title" msgid="3273762431523939277">"Tons del teclat"</string>
-    <string name="dtmf_tone_length_title" msgid="534096029202438539">"Durada del to del teclat"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="applicationLabel">Telèfon</string>
+  <string name="launcherDialpadActivityLabel">Teclat del telèfon</string>
+  <string name="callHistoryIconLabel">Historial de trucades</string>
+  <string name="action_copy_number_text">Copia el número</string>
+  <string name="copy_transcript_text">Copia la transcripció</string>
+  <string name="action_edit_number_before_call">Edita el número abans de trucar</string>
+  <string name="call_log_delete_all">Esborra l\'historial de trucades</string>
+  <string name="call_log_trash_voicemail">Suprimeix la bústia de veu</string>
+  <string name="snackbar_voicemail_deleted">Correu de veu suprimit</string>
+  <string name="clearCallLogConfirmation_title">Esborrar l\'historial de trucades?</string>
+  <string name="clearCallLogConfirmation">Se suprimiran totes les trucades de l\'historial.</string>
+  <string name="clearCallLogProgress_title">Esborrant historial de trucades...</string>
+  <string name="notification_missedCallTitle">Trucada perduda</string>
+  <string name="notification_missedWorkCallTitle">Trucada perduda de feina</string>
+  <string name="notification_missedCallsTitle">Trucades perdudes</string>
+  <string name="notification_missedCallsMsg">%d trucades perdudes</string>
+  <string name="notification_missedCall_call_back">Torna la trucada</string>
+  <string name="notification_missedCall_message">Missatge</string>
+  <string name="post_call_notification_message">%1$s: %2$s</string>
+  <string name="notification_voicemail_text_format">Marca el número %s</string>
+  <string name="notification_voicemail_no_vm_number">Número de la bústia de veu desconegut</string>
+  <plurals name="notification_voicemail_title">
+    <item quantity="one">Bústia de veu</item>
+    <item quantity="other"> %1$d bústies de veu </item>
+  </plurals>
+  <string name="notification_voicemail_callers_list">%1$s, %2$s</string>
+  <string name="notification_new_voicemail_ticker">Nou missatge de veu de %1$s</string>
+  <string name="voicemail_playback_error">Error en reproduir el missatge de veu.</string>
+  <string name="voicemail_fetching_content">S\'està carregant la bústia de veu...</string>
+  <string name="voicemail_fetching_timout">No s\'ha pogut carregar la bústia de veu.</string>
+  <string name="call_log_item_count_and_date">(%1$d) %2$s</string>
+  <string name="description_playback_speakerphone">Activa o desactiva el mans lliures</string>
+  <string name="description_playback_seek">Cerca la posició de la reproducció</string>
+  <string name="action_menu_call_history_description">Historial de trucades</string>
+  <string msgid="2295659037509008453" name="action_menu_overflow_description">Més opcions</string>
+  <string name="action_menu_dialpad_button">teclat</string>
+  <string name="dialer_settings_label">Configuració</string>
+  <string name="simulator_submenu_label">Simulador</string>
+  <string name="new_ui_launcher_shortcut_label">Crea drecera per a la nova IU</string>
+  <string name="description_entering_bulk_action_mode">S\'està accedint al mode d\'acció massiva</string>
+  <string name="description_leaving_bulk_action_mode">S\'ha sortit del mode d\'acció massiva</string>
+  <string name="description_selecting_bulk_action_mode">S\'ha seleccionat %1$s</string>
+  <string name="description_unselecting_bulk_action_mode">S\'ha desseleccionat %1$s</string>
+  <string name="description_contact_details">Dades de contacte de: %1$s</string>
+  <string name="description_spam_contact_details">Dades de contacte de la possible trucada brossa: %1$s</string>
+  <string name="description_num_calls">%1$s trucades</string>
+  <string name="description_video_call">Videotrucada</string>
+  <string name="description_start_voice_search">Inicia la cerca per veu</string>
+  <string name="voicemail">Bústia de veu</string>
+  <string name="description_cancel_multi_select">Cancel·la el mode d\'accions en lot</string>
+  <string name="voicemailMultiSelectDeleteConfirm">Suprimeix</string>
+  <string name="voicemailMultiSelectDeleteCancel">Cancel·la</string>
+  <string name="voicemailMultiSelectActionBarTitle">%1$s seleccionades</string>
+  <plurals name="delete_voicemails_confirmation_dialog_title">
+    <item quantity="one"><b>Vols suprimir aquest missatge de veu? </b></item>
+    <item quantity="other"><b>Vols suprimir aquests missatges de veu? </b></item>
+  </plurals>
+  <string name="voicemailCallLogToday">@string/call_log_header_today</string>
+  <string name="voicemailCallLogDateTimeFormat">%1$s a les %2$s</string>
+  <string name="voicemailDurationFormat">%1$02d:%2$02d</string>
+  <string name="voicemailCallLogDateTimeFormatWithDuration">%1$s • %2$s</string>
+  <string name="voice_search_not_available">La cerca per veu no està disponible.</string>
+  <string name="dialer_hint_find_contact">Cerca als contactes</string>
+  <string name="block_number_search_hint">Afegeix núm. o cerca contactes</string>
+  <string name="call_log_all_empty">El teu historial de trucades és buit</string>
+  <string name="call_log_all_empty_action">Fes una trucada</string>
+  <string name="call_log_missed_empty">No tens cap trucada perduda.</string>
+  <string name="call_log_voicemail_empty">La safata d\'entrada de la bústia de veu és buida.</string>
+  <string name="call_log_activity_title">Historial de trucades</string>
+  <string name="call_log_all_title">Totes</string>
+  <string name="call_log_missed_title">Perdudes</string>
+  <string name="tab_speed_dial">Marcatge ràpid</string>
+  <string name="tab_history">Historial de trucades</string>
+  <string name="tab_all_contacts">Contactes</string>
+  <string name="tab_voicemail">Bústia de veu</string>
+  <string name="search_shortcut_call_number">Truca al %s</string>
+  <string name="search_shortcut_create_new_contact">Crea un contacte</string>
+  <string name="search_shortcut_add_to_contact">Afegeix a un contacte</string>
+  <string name="search_shortcut_send_sms_message">Envia SMS</string>
+  <string name="search_shortcut_make_video_call">Fes una videotrucada</string>
+  <string name="search_shortcut_block_number">Bloqueja el número</string>
+  <string name="speed_dial_empty">Encara no tens cap contacte al marcatge ràpid</string>
+  <string name="speed_dial_empty_add_favorite_action">Afegeix un preferit</string>
+  <string name="remove_contact">Suprimeix</string>
+  <string name="select_all">Selecciona-ho tot</string>
+  <string name="call_log_action_video_call">Videotrucada</string>
+  <string name="call_log_action_set_up_video">Configura les videotrucades</string>
+  <string name="call_log_action_invite_video">Convida a una videotrucada</string>
+  <string name="call_log_action_send_message">Envia un missatge</string>
+  <string name="call_log_action_details">Detalls de trucada</string>
+  <string name="call_log_action_share_voicemail">Envia a…</string>
+  <string name="call_log_action_call">Truca a ^1</string>
+  <string name="description_incoming_missed_call">Trucada perduda de: ^1, ^2, ^3, ^4.</string>
+  <string name="description_incoming_answered_call">Trucada resposta de: ^1, ^2, ^3, ^4.</string>
+  <string name="description_unread_voicemail">Missatge de veu no escoltat del contacte ^1: ^2, ^3, ^4.</string>
+  <string name="description_read_voicemail">Missatge de veu del contacte ^1: ^2, ^3, ^4.</string>
+  <string name="description_outgoing_call">Trucada a ^1, ^2, ^3, ^4.</string>
+  <string name="call_log_via_number">al número %1$s</string>
+  <string name="call_log_via_number_phone_account">%1$s al número %2$s</string>
+  <string name="description_call_action">Truca a ^1</string>
+  <string name="description_video_call_action">Videotrucada amb ^1.</string>
+  <string name="description_voicemail_action">Escolta el missatge a la bústia de veu de: ^1</string>
+  <string name="description_create_new_contact_action">Crea un contacte per a ^1</string>
+  <string name="description_add_to_existing_contact_action">Afegeix ^1 a un contacte existent</string>
+  <string name="description_details_action">Detalls de trucada de ^1</string>
+  <string name="call_log_header_today">Avui</string>
+  <string name="call_log_header_yesterday">Ahir</string>
+  <string name="call_log_header_other">Més antiga</string>
+  <string name="voicemail_speaker_on">Activa l\'altaveu.</string>
+  <string name="voicemail_speaker_off">Desactiva l\'altaveu.</string>
+  <string name="voicemail_play_start_pause">Inicia la reproducció o la posa en pausa.</string>
+  <string name="display_options_title">Opcions de visualització</string>
+  <string name="sounds_and_vibration_title">Sons i vibració</string>
+  <string name="accessibility_settings_title">Accessibilitat</string>
+  <string name="ringtone_title">So de trucada</string>
+  <string name="vibrate_on_ring_title">Vibra també en trucades</string>
+  <string name="dtmf_tone_enable_title">Tons del teclat</string>
+  <string name="dtmf_tone_length_title">Durada del to del teclat</string>
   <string-array name="dtmf_tone_length_entries">
-    <item msgid="3136353015227162823">"Normal"</item>
-    <item msgid="5376841175538523822">"Llarg"</item>
+    <item>Normal</item>
+    <item>Llarg</item>
   </string-array>
-    <string name="respond_via_sms_setting_title" msgid="8008181606657693452">"Respostes ràpides"</string>
-    <string name="call_settings_label" msgid="7824611757200960807">"Trucades"</string>
-    <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Bloqueig de trucades"</string>
-    <string name="voicemail_settings_label" msgid="4594299554519920570">"Bústia de veu"</string>
-    <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Bloqueig de trucades desactivat tempor."</string>
-    <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"El bloqueig de trucades s\'ha desactivat perquè has contactat amb els serveis d\'emergència des d\'aquest telèfon durant les últimes 48 hores. Es tornarà a activar automàticament una vegada transcorregut el període de 48 hores."</string>
-    <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Importa els números"</string>
-    <string name="blocked_call_settings_import_description" msgid="1819412052545228965">"Has indicat que les trucades d\'alguns contactes s\'enviïn automàticament a la bústia de veu mitjançant altres aplicacions."</string>
-    <string name="blocked_call_settings_view_numbers_button" msgid="3332727948554356704">"Mostra els números"</string>
-    <string name="blocked_call_settings_import_button" msgid="7319111700387470727">"Importa"</string>
-    <string name="description_blocked_number_list_delete" msgid="2139644216858370740">"Desbloqueja el número"</string>
-    <string name="addBlockedNumber" msgid="3053473735238295551">"Afegeix un número"</string>
-    <string name="block_number_footer_message_vvm" msgid="7955326304033982368">"Es bloquejaran les trucades d\'aquests números i els missatges de veu se suprimiran automàticament."</string>
-    <string name="block_number_footer_message_no_vvm" msgid="1152684139070471665">"Es bloquejaran les trucades d\'aquests números, però és possible que continuïn deixant-te missatges de veu."</string>
-    <string name="block_list" msgid="4701585783411870782">"Números bloquejats"</string>
-    <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g> ja està bloquejat."</string>
-    <string name="phone_account_settings_label" msgid="8372485478006965920">"Comptes de trucades"</string>
-    <string name="permission_no_speeddial" msgid="8487215628510596753">"Activa el permís Contactes per activar el marcatge ràpid."</string>
-    <string name="permission_no_calllog" msgid="4053705651238775784">"Activa el permís Telèfon per veure el teu registre de trucades."</string>
-    <string name="permission_no_search" msgid="2424710404207193826">"Per cercar els teus contactes, activa els permisos de Contactes."</string>
-    <string name="permission_place_call" msgid="8686908130349369423">"Activa el permís Telèfon per fer una trucada."</string>
-    <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"L\'aplicació Telèfon no té permís per escriure a la configuració del sistema."</string>
-    <string name="blocked_number_call_log_label" msgid="4212282846299997693">"S\'ha bloquejat"</string>
-    <string name="call_log_action_block_report_number" msgid="7302636538668696729">"Bloqueja o marca com a brossa"</string>
-    <string name="call_log_action_block_number" msgid="5048188386501998865">"Bloqueja el número"</string>
-    <string name="call_log_action_remove_spam" msgid="2045319806318398403">"No és una trucada brossa"</string>
-    <string name="call_log_action_unblock_number" msgid="6100117033288448758">"Desbloqueja el número"</string>
-    <string name="spam_number_call_log_label" msgid="2678431398326811131">"Trucada brossa"</string>
-    <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> no té connexió i no s\'hi pot contactar"</string>
-    <string name="about_phone_label" msgid="582991354677973731">"Informació"</string>
-    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Transcripció feta per Google"</string>
-    <string name="voicemail_transcription_in_progress" msgid="2933320969613783210">"Google està transcrivint…"</string>
-    <string name="voicemail_transcription_failed" msgid="335275303117412706">"Transcripció no disponible."</string>
-    <string name="voicemail_transcription_failed_language_not_supported" msgid="4210332591050562553">"Transcripció no disponible. No s\'admet aquest idioma."</string>
-    <string name="voicemail_transcription_failed_no_speech" msgid="9093372879697874852">"Transcripció no disponible. No s\'ha detectat cap discurs."</string>
-    <string name="view_conversation" msgid="7895904782094119702">"Mostra"</string>
-    <string name="ec_data_deleted" msgid="4794880345545827107">"S\'ha suprimit la trucada. Consulta i suprimeix els fitxers adjunts compartits durant aquesta trucada a Missatges."</string>
-    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"S\'han suprimit les trucades. Consulta i suprimeix els fitxers adjunts compartits durant les trucades a Missatges."</string>
+  <string name="respond_via_sms_setting_title">Respostes ràpides</string>
+  <string name="call_settings_label">Trucades</string>
+  <string name="manage_blocked_numbers_label">Números bloquejats</string>
+  <string name="voicemail_settings_label">Bústia de veu</string>
+  <string name="blocked_numbers_disabled_emergency_header_label">Bloqueig de trucades desactivat tempor.</string>
+  <string name="blocked_numbers_disabled_emergency_desc">El bloqueig de trucades s\'ha desactivat perquè has contactat amb els serveis d\'emergència des d\'aquest telèfon durant les últimes 48 hores. Es tornarà a activar automàticament una vegada transcorregut el període de 48 hores.</string>
+  <string name="import_send_to_voicemail_numbers_label">Importa els números</string>
+  <string name="blocked_call_settings_import_description">Has indicat que les trucades d\'alguns contactes s\'enviïn automàticament a la bústia de veu mitjançant altres aplicacions.</string>
+  <string name="blocked_call_settings_view_numbers_button">Mostra els números</string>
+  <string name="blocked_call_settings_import_button">Importa</string>
+  <string name="description_blocked_number_list_delete">Desbloqueja el número</string>
+  <string name="addBlockedNumber">Afegeix un número</string>
+  <string name="block_number_footer_message_vvm">Es bloquejaran les trucades d\'aquests números i els missatges de veu se suprimiran automàticament.</string>
+  <string name="block_number_footer_message_no_vvm">Es bloquejaran les trucades d\'aquests números, però és possible que continuïn deixant-te missatges de veu.</string>
+  <string name="block_list">Números bloquejats</string>
+  <string name="alreadyBlocked">%1$s ja està bloquejat.</string>
+  <string name="phone_account_settings_label">Comptes de trucades</string>
+  <string name="permission_no_speeddial">Activa el permís Contactes per activar el marcatge ràpid.</string>
+  <string name="permission_no_calllog">Activa el permís Telèfon per veure el teu registre de trucades.</string>
+  <string name="permission_no_search">Per cercar els teus contactes, activa els permisos de Contactes.</string>
+  <string name="permission_place_call">Activa el permís Telèfon per fer una trucada.</string>
+  <string name="toast_cannot_write_system_settings">L\'aplicació Telèfon no té permís per escriure a la configuració del sistema.</string>
+  <string name="blocked_number_call_log_label">S\'ha bloquejat</string>
+  <string name="call_log_action_block_report_number">Bloqueja o marca com a brossa</string>
+  <string name="call_log_action_block_number">Bloqueja el número</string>
+  <string name="call_log_action_remove_spam">No és una trucada brossa</string>
+  <string name="call_log_action_unblock_number">Desbloqueja el número</string>
+  <string name="spam_number_call_log_label">Trucada brossa</string>
+  <string name="call_composer_connection_failed">%1$s no té connexió i no s\'hi pot contactar</string>
+  <string name="about_phone_label">Informació</string>
+  <string name="voicemail_transcription_branding_text">Transcripció feta per Google</string>
+  <string name="voicemail_transcription_in_progress">S\'està transcrivint…</string>
+  <string name="voicemail_transcription_failed">Transcripció no disponible.</string>
+  <string name="voicemail_transcription_failed_language_not_supported">Transcripció no disponible. No s\'admet aquest idioma.</string>
+  <string name="voicemail_transcription_failed_no_speech">Transcripció no disponible. No s\'ha detectat cap discurs.</string>
+  <string name="voicemail_donation_promo_title">Vols contribuir a millorar la precisió de les transcripcions?</string>
+  <string name="voicemail_donation_promo_content">Permet que Google revisi aquest missatge de veu transcrit, així com d\'altres que rebis més endavant. S\'emmagatzemaran de manera anònima. Pots canviar aquesta opció des de Configuració en qualsevol moment. %1$s</string>
+  <string name="voicemail_donation_promo_opt_in">D\'acord</string>
+  <string name="voicemail_donation_promo_opt_out">No, gràcies</string>
+  <string name="voicemail_transcription_rating">Puntua qualitat transcripció</string>
+  <string name="voicemail_transcription_rating_thanks">Gràcies pels teus suggeriments</string>
+  <string name="description_rating_good">M\'agrada</string>
+  <string name="description_rating_bad">No m\'agrada</string>
+  <string name="view_conversation">Mostra</string>
+  <string name="ec_data_deleted">S\'ha suprimit la trucada. Consulta i suprimeix els fitxers adjunts compartits durant aquesta trucada a Missatges.</string>
+  <string name="multiple_ec_data_deleted">S\'han suprimit les trucades. Consulta i suprimeix els fitxers adjunts compartits durant les trucades a Missatges.</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-cs/strings.xml b/java/com/android/dialer/app/res/values-cs/strings.xml
index a41475b..ede1518 100644
--- a/java/com/android/dialer/app/res/values-cs/strings.xml
+++ b/java/com/android/dialer/app/res/values-cs/strings.xml
@@ -1,183 +1,175 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="applicationLabel" msgid="2202739481132958990">"Telefon"</string>
-    <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"Klávesnice telefonu"</string>
-    <string name="callHistoryIconLabel" msgid="7493268743411968630">"Historie volání"</string>
-    <string name="action_copy_number_text" msgid="832682558551502319">"Kopírovat číslo"</string>
-    <string name="copy_transcript_text" msgid="937904189017310829">"Kopírovat přepis"</string>
-    <string name="action_edit_number_before_call" msgid="8017492815878473837">"Před voláním upravit číslo"</string>
-    <string name="call_log_delete_all" msgid="7852970926906523784">"Vymazat historii volání"</string>
-    <string name="call_log_trash_voicemail" msgid="6118493534178533972">"Smazat hlasovou zprávu"</string>
-    <string name="snackbar_voicemail_deleted" msgid="7463166543725496307">"Hlas. zpráva smazána"</string>
-    <string name="snackbar_voicemail_deleted_undo" msgid="6959743982796409941">"VRÁTIT"</string>
-    <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"Vymazat historii hovorů?"</string>
-    <string name="clearCallLogConfirmation" msgid="6844949465815109166">"Tímto z historie smažete všechny hovory."</string>
-    <string name="clearCallLogProgress_title" msgid="995004835687361977">"Mazání historie volání…"</string>
-    <string name="notification_missedCallTitle" msgid="8283366068539898486">"Zmeškaný hovor"</string>
-    <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"Zmeškaný pracovní hovor"</string>
-    <string name="notification_missedCallsTitle" msgid="3697442015345089802">"Zmeškané hovory"</string>
-    <string name="notification_missedCallsMsg" msgid="8176217633929018706">"Zmeškané hovory: <xliff:g id="NUM_MISSED_CALLS">%d</xliff:g>"</string>
-    <string name="notification_missedCall_call_back" msgid="3875698110051973965">"Zavolat zpět"</string>
-    <string name="notification_missedCall_message" msgid="5086910028988305964">"Zpráva"</string>
-    <string name="post_call_notification_message" msgid="5417476789860590611">"<xliff:g id="NAME">%1$s</xliff:g>: <xliff:g id="MESSAGE">%2$s</xliff:g>"</string>
-    <string name="notification_voicemail_text_format" msgid="1895667520930252897">"Volat hlasovou schránku <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
-    <string name="notification_voicemail_no_vm_number" msgid="8942821987929495842">"Číslo hlasové schránky není známé"</string>
-    <plurals name="notification_voicemail_title" formatted="false" msgid="1551847434476438657">
-      <item quantity="few"> <xliff:g id="COUNT">%1$d</xliff:g> hlasové zprávy </item>
-      <item quantity="many"> <xliff:g id="COUNT">%1$d</xliff:g> hlasové zprávy </item>
-      <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> hlasových zpráv </item>
-      <item quantity="one">Hlasová zpráva</item>
-    </plurals>
-    <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
-    <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"Nová hlasová zpráva – <xliff:g id="CALLER">%1$s</xliff:g>"</string>
-    <string name="voicemail_playback_error" msgid="4384373852257757295">"Hlasovou schránku nelze přehrát."</string>
-    <string name="voicemail_fetching_content" msgid="572320120918636014">"Načítání hlasové schránky…"</string>
-    <string name="voicemail_fetching_timout" msgid="2128873915839949783">"Hlasovou schránku nelze načíst."</string>
-    <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_playback_speakerphone" msgid="4852027754869750227">"Zapnutí a vypnutí reproduktoru"</string>
-    <string name="description_playback_seek" msgid="1340910573254132520">"Vyhledání pozice přehrávání"</string>
-    <string name="action_menu_call_history_description" msgid="8829135306925008546">"Historie volání"</string>
-    <string name="action_menu_overflow_description" msgid="7648679686746517341">"Více možností"</string>
-    <string name="action_menu_dialpad_button" msgid="1970631633457493180">"klávesnice"</string>
-    <string name="dialer_settings_label" msgid="4980176284150290175">"Nastavení"</string>
-    <string name="simulator_submenu_label" msgid="186156287346615267">"Simulátor"</string>
-    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Vytv. zkratku na nové rozhraní"</string>
-    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"Vstupování do režimu hromadných akcí"</string>
-    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"Opustili jste režim hromadných akcí"</string>
-    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"Položka <xliff:g id="NAMEORNUMBER">%1$s</xliff:g> je vybrána"</string>
-    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"Položka <xliff:g id="NAMEORNUMBER">%1$s</xliff:g> není vybrána"</string>
-    <string name="description_contact_details" msgid="3341280873855253464">"Podrobnosti kontaktu pro <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_spam_contact_details" msgid="5592578752881528368">"Kontaktní údaje volajícího podezřelého ze spamu: <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_num_calls" msgid="6483594535796216044">"Počet hovorů: <xliff:g id="NUMBEROFCALLS">%1$s</xliff:g>"</string>
-    <string name="description_video_call" msgid="3738199365585751727">"Videohovor"</string>
-    <string name="description_start_voice_search" msgid="8380022725973015261">"Spustit hlasové vyhledávání"</string>
-    <string name="voicemail" msgid="8899540969000957954">"Hlasová schránka"</string>
-    <string name="description_cancel_multi_select" msgid="3930475950253360461">"Zrušit režim hromadných akcí"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Smazat"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Zrušit"</string>
-    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"Vybráno: <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
-      <item quantity="few">"<b>"Smazat tyto hlasové zprávy? "</b>"</item>
-      <item quantity="many">"<b>"Smazat tyto hlasové zprávy? "</b>"</item>
-      <item quantity="other">"<b>"Smazat tyto hlasové zprávy? "</b>"</item>
-      <item quantity="one">"<b>"Smazat tuto hlasovou zprávu? "</b>"</item>
-    </plurals>
-    <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
-    <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> v <xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
-    <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="voice_search_not_available" msgid="6546240433719732905">"Hlasové vyhledávání není k dispozici."</string>
-    <string name="dialer_hint_find_contact" msgid="2023214799381149808">"Vyhledat kontakty"</string>
-    <string name="block_number_search_hint" msgid="5377706079015099416">"Přidejte číslo nebo vyhledejte kontakty"</string>
-    <string name="call_log_all_empty" msgid="3955572868518162004">"Historie volání je prázdná"</string>
-    <string name="call_log_all_empty_action" msgid="852218280136243014">"Zavolat"</string>
-    <string name="call_log_missed_empty" msgid="7094936030845062214">"Nemáte žádné zmeškané hovory."</string>
-    <string name="call_log_voicemail_empty" msgid="273623903423275178">"Hlasová schránka je prázdná."</string>
-    <string name="call_log_activity_title" msgid="1275242727244945527">"Historie volání"</string>
-    <string name="call_log_all_title" msgid="6042262422192020327">"Všechny"</string>
-    <string name="call_log_missed_title" msgid="17254005889268015">"Zmeškané"</string>
-    <string name="tab_speed_dial" msgid="6616404752227561075">"Rychlá volba"</string>
-    <string name="tab_history" msgid="7420269368689503596">"Historie volání"</string>
-    <string name="tab_all_contacts" msgid="5531733977693943015">"Kontakty"</string>
-    <string name="tab_voicemail" msgid="2458548090088316246">"Hlasová schránka"</string>
-    <string name="search_shortcut_call_number" msgid="8847918845036880688">"Zavolat <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"Vytvořit nový kontakt"</string>
-    <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"Přidat ke kontaktu"</string>
-    <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"Odeslat SMS"</string>
-    <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"Uskutečnit videohovor"</string>
-    <string name="search_shortcut_block_number" msgid="4587283230665805776">"Blokovat číslo"</string>
-    <string name="speed_dial_empty" msgid="3346406399966039505">"V rychlém vytáčení zatím nemáte žádný kontakt."</string>
-    <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"Přidat oblíbený kontakt"</string>
-    <string name="remove_contact" msgid="2353580570488923668">"Odstranit"</string>
-    <string name="select_all" msgid="408601760696146245">"Vybrat všechny"</string>
-    <string name="call_log_action_video_call" msgid="7565549950343850819">"Videohovor"</string>
-    <string name="call_log_action_send_message" msgid="6948727362660115554">"Odeslat zprávu"</string>
-    <string name="call_log_action_details" msgid="2091370737371449501">"Podrobnosti hovoru"</string>
-    <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"Poslat přes aplikaci…"</string>
-    <string name="call_log_action_call" msgid="682724094251540583">"Volat kontakt <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_incoming_missed_call" msgid="8292535799379230029">"Nepřijatý hovor: <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_incoming_answered_call" msgid="3920182963103160610">"Přijatý hovor: <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_unread_voicemail" msgid="145170985013419170">"Nepřečtená hlasová zpráva od <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>"</string>
-    <string name="description_read_voicemail" msgid="5585559881573227732">"Hlasová zpráva od <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>"</string>
-    <string name="description_outgoing_call" msgid="543952487882919924">"Odchozí hovor: <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="call_log_via_number" msgid="1340307109806397650">"z čísla <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"na účet <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, z čísla <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="description_call_action" msgid="4042796498169106545">"Volat kontakt <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_video_call_action" msgid="1237090968588659650">"Videohovor s kontaktem <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_action" msgid="3290143432403538524">"Poslech hlasové schránky od <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_create_new_contact_action" msgid="1928282350281564130">"Pro záznam <xliff:g id="NAMEORNUMBER">^1</xliff:g> se vytvoří nový kontakt"</string>
-    <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"Záznam <xliff:g id="NAMEORNUMBER">^1</xliff:g> se přidá k existujícímu kontaktu"</string>
-    <string name="description_details_action" msgid="2061866409737706174">"Podrobnosti volání <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="call_log_header_today" msgid="1576119097475845293">"Dnes"</string>
-    <string name="call_log_header_yesterday" msgid="5616077776205329563">"Včera"</string>
-    <string name="call_log_header_other" msgid="4940676886254217644">"Starší"</string>
-    <string name="voicemail_speaker_on" msgid="3151333608926996668">"Zapnout reproduktor."</string>
-    <string name="voicemail_speaker_off" msgid="2530064206962034201">"Vypnout reproduktor."</string>
-    <string name="voicemail_play_start_pause" msgid="3874823480278334664">"Spustit nebo pozastavit přehrávání."</string>
-    <string name="display_options_title" msgid="3880091801055797975">"Možnosti zobrazení"</string>
-    <string name="sounds_and_vibration_title" msgid="3075050000721181384">"Zvuky a vibrace"</string>
-    <string name="accessibility_settings_title" msgid="3329027650429831820">"Přístupnost"</string>
-    <string name="ringtone_title" msgid="8377174189894648486">"Vyzváněcí tón telefonu"</string>
-    <string name="vibrate_on_ring_title" msgid="631441314790960485">"U hovorů také vibrovat"</string>
-    <string name="dtmf_tone_enable_title" msgid="3273762431523939277">"Tóny klávesnice"</string>
-    <string name="dtmf_tone_length_title" msgid="534096029202438539">"Délka tónů klávesnice"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="applicationLabel">Telefon</string>
+  <string name="launcherDialpadActivityLabel">Klávesnice telefonu</string>
+  <string name="callHistoryIconLabel">Historie volání</string>
+  <string name="action_copy_number_text">Kopírovat číslo</string>
+  <string name="copy_transcript_text">Kopírovat přepis</string>
+  <string name="action_edit_number_before_call">Před voláním upravit číslo</string>
+  <string name="call_log_delete_all">Vymazat historii volání</string>
+  <string name="call_log_trash_voicemail">Smazat hlasovou zprávu</string>
+  <string name="snackbar_voicemail_deleted">Hlas. zpráva smazána</string>
+  <string name="clearCallLogConfirmation_title">Vymazat historii hovorů?</string>
+  <string name="clearCallLogConfirmation">Tímto z historie smažete všechny hovory.</string>
+  <string name="clearCallLogProgress_title">Mazání historie volání…</string>
+  <string name="notification_missedCallTitle">Zmeškaný hovor</string>
+  <string name="notification_missedWorkCallTitle">Zmeškaný pracovní hovor</string>
+  <string name="notification_missedCallsTitle">Zmeškané hovory</string>
+  <string name="notification_missedCallsMsg">Zmeškané hovory: %d</string>
+  <string name="notification_missedCall_call_back">Zavolat zpět</string>
+  <string name="notification_missedCall_message">Zpráva</string>
+  <string name="post_call_notification_message">%1$s: %2$s</string>
+  <string name="notification_voicemail_text_format">Volat hlasovou schránku %s</string>
+  <string name="notification_voicemail_no_vm_number">Číslo hlasové schránky není známé</string>
+  <plurals name="notification_voicemail_title">
+    <item quantity="one">Hlasová zpráva</item>
+    <item quantity="few"> %1$d hlasové zprávy </item>
+    <item quantity="many"> %1$d hlasové zprávy </item>
+    <item quantity="other"> %1$d hlasových zpráv </item>
+  </plurals>
+  <string name="notification_voicemail_callers_list">%1$s, %2$s</string>
+  <string name="notification_new_voicemail_ticker">Nová hlasová zpráva – %1$s</string>
+  <string name="voicemail_playback_error">Hlasovou schránku nelze přehrát.</string>
+  <string name="voicemail_fetching_content">Načítání hlasové schránky…</string>
+  <string name="voicemail_fetching_timout">Hlasovou schránku nelze načíst.</string>
+  <string name="call_log_item_count_and_date">(%1$d) %2$s</string>
+  <string name="description_playback_speakerphone">Zapnutí a vypnutí reproduktoru</string>
+  <string name="description_playback_seek">Vyhledání pozice přehrávání</string>
+  <string name="action_menu_call_history_description">Historie volání</string>
+  <string msgid="2295659037509008453" name="action_menu_overflow_description">Více možností</string>
+  <string name="action_menu_dialpad_button">klávesnice</string>
+  <string name="dialer_settings_label">Nastavení</string>
+  <string name="simulator_submenu_label">Simulátor</string>
+  <string name="new_ui_launcher_shortcut_label">Vytv. zkratku na nové rozhraní</string>
+  <string name="description_entering_bulk_action_mode">Vstupování do režimu hromadných akcí</string>
+  <string name="description_leaving_bulk_action_mode">Opustili jste režim hromadných akcí</string>
+  <string name="description_selecting_bulk_action_mode">Položka %1$s je vybrána</string>
+  <string name="description_unselecting_bulk_action_mode">Položka %1$s není vybrána</string>
+  <string name="description_contact_details">Podrobnosti kontaktu pro %1$s</string>
+  <string name="description_spam_contact_details">Kontaktní údaje volajícího podezřelého ze spamu: %1$s</string>
+  <string name="description_num_calls">Počet hovorů: %1$s</string>
+  <string name="description_video_call">Videohovor</string>
+  <string name="description_start_voice_search">Spustit hlasové vyhledávání</string>
+  <string name="voicemail">Hlasová schránka</string>
+  <string name="description_cancel_multi_select">Zrušit režim hromadných akcí</string>
+  <string name="voicemailMultiSelectDeleteConfirm">Smazat</string>
+  <string name="voicemailMultiSelectDeleteCancel">Zrušit</string>
+  <string name="voicemailMultiSelectActionBarTitle">Vybráno: %1$s</string>
+  <plurals name="delete_voicemails_confirmation_dialog_title">
+    <item quantity="one"><b>Smazat tuto hlasovou zprávu? </b></item>
+    <item quantity="few"><b>Smazat tyto hlasové zprávy? </b></item>
+    <item quantity="many"><b>Smazat tyto hlasové zprávy? </b></item>
+    <item quantity="other"><b>Smazat tyto hlasové zprávy? </b></item>
+  </plurals>
+  <string name="voicemailCallLogToday">@string/call_log_header_today</string>
+  <string name="voicemailCallLogDateTimeFormat">%1$s v %2$s</string>
+  <string name="voicemailDurationFormat">%1$02d:%2$02d</string>
+  <string name="voicemailCallLogDateTimeFormatWithDuration">%1$s • %2$s</string>
+  <string name="voice_search_not_available">Hlasové vyhledávání není k dispozici.</string>
+  <string name="dialer_hint_find_contact">Vyhledat kontakty</string>
+  <string name="block_number_search_hint">Přidejte číslo nebo vyhledejte kontakty</string>
+  <string name="call_log_all_empty">Historie volání je prázdná</string>
+  <string name="call_log_all_empty_action">Zavolat</string>
+  <string name="call_log_missed_empty">Nemáte žádné zmeškané hovory.</string>
+  <string name="call_log_voicemail_empty">Hlasová schránka je prázdná.</string>
+  <string name="call_log_activity_title">Historie volání</string>
+  <string name="call_log_all_title">Všechny</string>
+  <string name="call_log_missed_title">Zmeškané</string>
+  <string name="tab_speed_dial">Rychlá volba</string>
+  <string name="tab_history">Historie volání</string>
+  <string name="tab_all_contacts">Kontakty</string>
+  <string name="tab_voicemail">Hlasová schránka</string>
+  <string name="search_shortcut_call_number">Zavolat %s</string>
+  <string name="search_shortcut_create_new_contact">Vytvořit nový kontakt</string>
+  <string name="search_shortcut_add_to_contact">Přidat ke kontaktu</string>
+  <string name="search_shortcut_send_sms_message">Odeslat SMS</string>
+  <string name="search_shortcut_make_video_call">Uskutečnit videohovor</string>
+  <string name="search_shortcut_block_number">Blokovat číslo</string>
+  <string name="speed_dial_empty">V rychlém vytáčení zatím nemáte žádný kontakt.</string>
+  <string name="speed_dial_empty_add_favorite_action">Přidat oblíbený kontakt</string>
+  <string name="remove_contact">Odstranit</string>
+  <string name="select_all">Vybrat všechny</string>
+  <string name="call_log_action_video_call">Videohovor</string>
+  <string name="call_log_action_set_up_video">Nastavit videohovory</string>
+  <string name="call_log_action_invite_video">Pozvat na videohovor</string>
+  <string name="call_log_action_send_message">Odeslat zprávu</string>
+  <string name="call_log_action_details">Podrobnosti hovoru</string>
+  <string name="call_log_action_share_voicemail">Poslat přes aplikaci…</string>
+  <string name="call_log_action_call">Volat kontakt ^1</string>
+  <string name="description_incoming_missed_call">Nepřijatý hovor: ^1, ^2, ^3, ^4.</string>
+  <string name="description_incoming_answered_call">Přijatý hovor: ^1, ^2, ^3, ^4.</string>
+  <string name="description_unread_voicemail">Nepřečtená hlasová zpráva od ^1, ^2, ^3, ^4</string>
+  <string name="description_read_voicemail">Hlasová zpráva od ^1, ^2, ^3, ^4</string>
+  <string name="description_outgoing_call">Odchozí hovor: ^1, ^2, ^3, ^4.</string>
+  <string name="call_log_via_number">z čísla %1$s</string>
+  <string name="call_log_via_number_phone_account">na účet %1$s, z čísla %2$s</string>
+  <string name="description_call_action">Volat kontakt ^1</string>
+  <string name="description_video_call_action">Videohovor s kontaktem ^1</string>
+  <string name="description_voicemail_action">Poslech hlasové schránky od ^1</string>
+  <string name="description_create_new_contact_action">Pro záznam ^1 se vytvoří nový kontakt</string>
+  <string name="description_add_to_existing_contact_action">Záznam ^1 se přidá k existujícímu kontaktu</string>
+  <string name="description_details_action">Podrobnosti volání ^1</string>
+  <string name="call_log_header_today">Dnes</string>
+  <string name="call_log_header_yesterday">Včera</string>
+  <string name="call_log_header_other">Starší</string>
+  <string name="voicemail_speaker_on">Zapnout reproduktor.</string>
+  <string name="voicemail_speaker_off">Vypnout reproduktor.</string>
+  <string name="voicemail_play_start_pause">Spustit nebo pozastavit přehrávání.</string>
+  <string name="display_options_title">Možnosti zobrazení</string>
+  <string name="sounds_and_vibration_title">Zvuky a vibrace</string>
+  <string name="accessibility_settings_title">Přístupnost</string>
+  <string name="ringtone_title">Vyzváněcí tón telefonu</string>
+  <string name="vibrate_on_ring_title">U hovorů také vibrovat</string>
+  <string name="dtmf_tone_enable_title">Tóny klávesnice</string>
+  <string name="dtmf_tone_length_title">Délka tónů klávesnice</string>
   <string-array name="dtmf_tone_length_entries">
-    <item msgid="3136353015227162823">"Normální"</item>
-    <item msgid="5376841175538523822">"Dlouhé"</item>
+    <item>Normální</item>
+    <item>Dlouhé</item>
   </string-array>
-    <string name="respond_via_sms_setting_title" msgid="8008181606657693452">"Rychlé odpovědi"</string>
-    <string name="call_settings_label" msgid="7824611757200960807">"Volání"</string>
-    <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Blokování hovorů"</string>
-    <string name="voicemail_settings_label" msgid="4594299554519920570">"Hlasová schránka"</string>
-    <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Blokování hovorů je dočasně vypnuto"</string>
-    <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Protože jste z tohoto telefonu během posledních 48 hodin volali na tísňovou linku, bylo blokování hovorů vypnuto. Po uplynutí 48 hodin se automaticky znovu zapne."</string>
-    <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Importovat čísla"</string>
-    <string name="blocked_call_settings_import_description" msgid="1819412052545228965">"Pomocí dalších aplikací jste dříve některé volající označili k automatickému přesměrování do hlasové schránky."</string>
-    <string name="blocked_call_settings_view_numbers_button" msgid="3332727948554356704">"Zobrazit čísla"</string>
-    <string name="blocked_call_settings_import_button" msgid="7319111700387470727">"Importovat"</string>
-    <string name="description_blocked_number_list_delete" msgid="2139644216858370740">"Zrušit blokování čísla"</string>
-    <string name="addBlockedNumber" msgid="3053473735238295551">"Přidat číslo"</string>
-    <string name="block_number_footer_message_vvm" msgid="7955326304033982368">"Volání z těchto čísel budou zablokována. Hlasové zprávy budou automaticky smazány."</string>
-    <string name="block_number_footer_message_no_vvm" msgid="1152684139070471665">"Volání z těchto čísel budou zablokována, avšak volající vám budou moci zanechat hlasovou zprávu."</string>
-    <string name="block_list" msgid="4701585783411870782">"Blokovaná čísla"</string>
-    <string name="alreadyBlocked" msgid="5483253180532475653">"Číslo <xliff:g id="NUMBER">%1$s</xliff:g> je již blokováno."</string>
-    <string name="phone_account_settings_label" msgid="8372485478006965920">"Účty pro volání"</string>
-    <string name="permission_no_speeddial" msgid="8487215628510596753">"Chcete-li povolit rychlé vytáčení, aktivujte oprávnění Kontakty."</string>
-    <string name="permission_no_calllog" msgid="4053705651238775784">"Chcete-li zobrazit seznam hovorů, aktivujte oprávnění Telefon."</string>
-    <string name="permission_no_search" msgid="2424710404207193826">"Chcete-li vyhledat kontakty, zapněte oprávnění Kontakty."</string>
-    <string name="permission_place_call" msgid="8686908130349369423">"Chcete-li uskutečnit hovor, aktivujte oprávnění Telefon."</string>
-    <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"Aplikace Telefon nemá oprávnění provádět zápis do nastavení systému."</string>
-    <string name="blocked_number_call_log_label" msgid="4212282846299997693">"Zablokováno"</string>
-    <string name="call_log_action_block_report_number" msgid="7302636538668696729">"Zablokovat / nahlásit spam"</string>
-    <string name="call_log_action_block_number" msgid="5048188386501998865">"Blokovat číslo"</string>
-    <string name="call_log_action_remove_spam" msgid="2045319806318398403">"Není spam"</string>
-    <string name="call_log_action_unblock_number" msgid="6100117033288448758">"Zrušit blokování čísla"</string>
-    <string name="spam_number_call_log_label" msgid="2678431398326811131">"Spam"</string>
-    <string name="call_composer_connection_failed" msgid="6776461585447831242">"Uživatel <xliff:g id="NAME">%1$s</xliff:g> je offline a není možné se s ním spojit"</string>
-    <string name="about_phone_label" msgid="582991354677973731">"O aplikaci"</string>
-    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Přepsáno Googlem"</string>
-    <string name="voicemail_transcription_in_progress" msgid="2933320969613783210">"Google přepisuje zprávu…"</string>
-    <string name="voicemail_transcription_failed" msgid="335275303117412706">"Přepis není k dispozici."</string>
-    <string name="voicemail_transcription_failed_language_not_supported" msgid="4210332591050562553">"Přepis není k dispozici. Jazyk není podporován."</string>
-    <string name="voicemail_transcription_failed_no_speech" msgid="9093372879697874852">"Přepis není k dispozici. Nebyla zaznamenána žádná řeč."</string>
-    <string name="view_conversation" msgid="7895904782094119702">"Zobrazit"</string>
-    <string name="ec_data_deleted" msgid="4794880345545827107">"Hovor byl smazán. Přílohy sdílené během něj můžete zobrazit a smazat v aplikaci Zprávy."</string>
-    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"Hovory byly smazány. Přílohy sdílené během nich můžete zobrazit a smazat v aplikaci Zprávy."</string>
+  <string name="respond_via_sms_setting_title">Rychlé odpovědi</string>
+  <string name="call_settings_label">Volání</string>
+  <string name="manage_blocked_numbers_label">Blokovaná čísla</string>
+  <string name="voicemail_settings_label">Hlasová schránka</string>
+  <string name="blocked_numbers_disabled_emergency_header_label">Blokování hovorů je dočasně vypnuto</string>
+  <string name="blocked_numbers_disabled_emergency_desc">Protože jste z tohoto telefonu během posledních 48 hodin volali na tísňovou linku, bylo blokování hovorů vypnuto. Po uplynutí 48 hodin se automaticky znovu zapne.</string>
+  <string name="import_send_to_voicemail_numbers_label">Importovat čísla</string>
+  <string name="blocked_call_settings_import_description">Pomocí dalších aplikací jste dříve některé volající označili k automatickému přesměrování do hlasové schránky.</string>
+  <string name="blocked_call_settings_view_numbers_button">Zobrazit čísla</string>
+  <string name="blocked_call_settings_import_button">Importovat</string>
+  <string name="description_blocked_number_list_delete">Zrušit blokování čísla</string>
+  <string name="addBlockedNumber">Přidat číslo</string>
+  <string name="block_number_footer_message_vvm">Volání z těchto čísel budou zablokována. Hlasové zprávy budou automaticky smazány.</string>
+  <string name="block_number_footer_message_no_vvm">Volání z těchto čísel budou zablokována, avšak volající vám budou moci zanechat hlasovou zprávu.</string>
+  <string name="block_list">Blokovaná čísla</string>
+  <string name="alreadyBlocked">Číslo %1$s je již blokováno.</string>
+  <string name="phone_account_settings_label">Účty pro volání</string>
+  <string name="permission_no_speeddial">Chcete-li povolit rychlé vytáčení, aktivujte oprávnění Kontakty.</string>
+  <string name="permission_no_calllog">Chcete-li zobrazit seznam hovorů, aktivujte oprávnění Telefon.</string>
+  <string name="permission_no_search">Chcete-li vyhledat kontakty, zapněte oprávnění Kontakty.</string>
+  <string name="permission_place_call">Chcete-li uskutečnit hovor, aktivujte oprávnění Telefon.</string>
+  <string name="toast_cannot_write_system_settings">Aplikace Telefon nemá oprávnění provádět zápis do nastavení systému.</string>
+  <string name="blocked_number_call_log_label">Zablokováno</string>
+  <string name="call_log_action_block_report_number">Zablokovat / nahlásit spam</string>
+  <string name="call_log_action_block_number">Blokovat číslo</string>
+  <string name="call_log_action_remove_spam">Není spam</string>
+  <string name="call_log_action_unblock_number">Zrušit blokování čísla</string>
+  <string name="spam_number_call_log_label">Spam</string>
+  <string name="call_composer_connection_failed">Uživatel %1$s je offline a není možné se s ním spojit</string>
+  <string name="about_phone_label">O aplikaci</string>
+  <string name="voicemail_transcription_branding_text">Přepsáno Googlem</string>
+  <string name="voicemail_transcription_in_progress">Přepisování…</string>
+  <string name="voicemail_transcription_failed">Přepis není k dispozici.</string>
+  <string name="voicemail_transcription_failed_language_not_supported">Přepis není k dispozici. Jazyk není podporován.</string>
+  <string name="voicemail_transcription_failed_no_speech">Přepis není k dispozici. Nebyla zaznamenána žádná řeč.</string>
+  <string name="voicemail_donation_promo_title">Pomozte vylepšit přesnost přepisu!</string>
+  <string name="voicemail_donation_promo_content">Dovolte Googlu kontrolovat vaše hlasové zprávy (počínaje touto) s jejich přepisy. Zprávy se budou ukládat anonymně. Nastavení můžete kdykoli změnit. %1$s</string>
+  <string name="voicemail_donation_promo_opt_in">Ano, souhlasím</string>
+  <string name="voicemail_donation_promo_opt_out">Ne, díky</string>
+  <string name="voicemail_transcription_rating">Ohodnoťte kvalitu přepisu</string>
+  <string name="voicemail_transcription_rating_thanks">Děkujeme za zpětnou vazbu</string>
+  <string name="description_rating_good">Líbí se mi</string>
+  <string name="description_rating_bad">Nelíbí se</string>
+  <string name="view_conversation">Zobrazit</string>
+  <string name="ec_data_deleted">Hovor byl smazán. Přílohy sdílené během něj můžete zobrazit a smazat v aplikaci Zprávy.</string>
+  <string name="multiple_ec_data_deleted">Hovory byly smazány. Přílohy sdílené během nich můžete zobrazit a smazat v aplikaci Zprávy.</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-da/strings.xml b/java/com/android/dialer/app/res/values-da/strings.xml
index 0202d3c..73f92ee 100644
--- a/java/com/android/dialer/app/res/values-da/strings.xml
+++ b/java/com/android/dialer/app/res/values-da/strings.xml
@@ -1,179 +1,171 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="applicationLabel" msgid="2202739481132958990">"Opkald"</string>
-    <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"Telefontastatur"</string>
-    <string name="callHistoryIconLabel" msgid="7493268743411968630">"Opkaldshistorik"</string>
-    <string name="action_copy_number_text" msgid="832682558551502319">"Kopiér nummeret"</string>
-    <string name="copy_transcript_text" msgid="937904189017310829">"Kopiér transskriptionen"</string>
-    <string name="action_edit_number_before_call" msgid="8017492815878473837">"Rediger nummeret før opkald"</string>
-    <string name="call_log_delete_all" msgid="7852970926906523784">"Ryd opkaldshistorik"</string>
-    <string name="call_log_trash_voicemail" msgid="6118493534178533972">"Slet talemeddelelsen"</string>
-    <string name="snackbar_voicemail_deleted" msgid="7463166543725496307">"Talebeskeden blev slettet"</string>
-    <string name="snackbar_voicemail_deleted_undo" msgid="6959743982796409941">"FORTRYD"</string>
-    <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"Vil du rydde opkaldshistorikken?"</string>
-    <string name="clearCallLogConfirmation" msgid="6844949465815109166">"Dette vil slette alle opkald fra din historik"</string>
-    <string name="clearCallLogProgress_title" msgid="995004835687361977">"Opkaldshistorik ryddes..."</string>
-    <string name="notification_missedCallTitle" msgid="8283366068539898486">"Ubesvarede opkald"</string>
-    <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"Ubesvaret arbejdsopkald"</string>
-    <string name="notification_missedCallsTitle" msgid="3697442015345089802">"Ubesvarede opkald"</string>
-    <string name="notification_missedCallsMsg" msgid="8176217633929018706">"<xliff:g id="NUM_MISSED_CALLS">%d</xliff:g> ubesvarede opkald"</string>
-    <string name="notification_missedCall_call_back" msgid="3875698110051973965">"Ring tilbage"</string>
-    <string name="notification_missedCall_message" msgid="5086910028988305964">"Besked"</string>
-    <string name="post_call_notification_message" msgid="5417476789860590611">"<xliff:g id="NAME">%1$s</xliff:g>: <xliff:g id="MESSAGE">%2$s</xliff:g>"</string>
-    <string name="notification_voicemail_text_format" msgid="1895667520930252897">"Ring til <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
-    <string name="notification_voicemail_no_vm_number" msgid="8942821987929495842">"Nummeret til telefonsvareren er ukendt"</string>
-    <plurals name="notification_voicemail_title" formatted="false" msgid="1551847434476438657">
-      <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> talebeskeder </item>
-      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> talebeskeder </item>
-    </plurals>
-    <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
-    <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"Ny besked fra <xliff:g id="CALLER">%1$s</xliff:g>"</string>
-    <string name="voicemail_playback_error" msgid="4384373852257757295">"Telefonsvarerbesked kan ikke afspilles"</string>
-    <string name="voicemail_fetching_content" msgid="572320120918636014">"Telefonsvarerbesked indlæses..."</string>
-    <string name="voicemail_fetching_timout" msgid="2128873915839949783">"Telefonsvarerbesked kan ikke indlæses"</string>
-    <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_playback_speakerphone" msgid="4852027754869750227">"Slå medhør til eller fra"</string>
-    <string name="description_playback_seek" msgid="1340910573254132520">"Søg efter afspilningsposition"</string>
-    <string name="action_menu_call_history_description" msgid="8829135306925008546">"Opkaldshistorik"</string>
-    <string name="action_menu_overflow_description" msgid="7648679686746517341">"Flere valgmuligheder"</string>
-    <string name="action_menu_dialpad_button" msgid="1970631633457493180">"tastatur"</string>
-    <string name="dialer_settings_label" msgid="4980176284150290175">"Indstillinger"</string>
-    <string name="simulator_submenu_label" msgid="186156287346615267">"Simulator"</string>
-    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Opret ny brugerfladegenvej"</string>
-    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"Massehandlingstilstanden startes"</string>
-    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"Massehandlingstilstanden blev afsluttet"</string>
-    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"Valgt <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"Fravalgt <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_contact_details" msgid="3341280873855253464">"Kontaktoplysninger for <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_spam_contact_details" msgid="5592578752881528368">"Kontaktoplysninger om formodet spammer <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> opkald."</string>
-    <string name="description_video_call" msgid="3738199365585751727">"Videoopkald."</string>
-    <string name="description_start_voice_search" msgid="8380022725973015261">"Start talesøgning"</string>
-    <string name="voicemail" msgid="8899540969000957954">"Telefonsvarer"</string>
-    <string name="description_cancel_multi_select" msgid="3930475950253360461">"Annuller massehandlingstilstand"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Slet"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Annuller"</string>
-    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> er valgt"</string>
-    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
-      <item quantity="one">"<b>"Vil du slette denne talebesked? "</b>"</item>
-      <item quantity="other">"<b>"Vil du slette disse talebeskeder? "</b>"</item>
-    </plurals>
-    <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
-    <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> kl. <xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
-    <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="voice_search_not_available" msgid="6546240433719732905">"Talesøgning er ikke tilgængelig"</string>
-    <string name="dialer_hint_find_contact" msgid="2023214799381149808">"Søg i kontakter"</string>
-    <string name="block_number_search_hint" msgid="5377706079015099416">"Tilføj nummer, eller søg i kontaktpersoner"</string>
-    <string name="call_log_all_empty" msgid="3955572868518162004">"Din opkaldshistorik er tom"</string>
-    <string name="call_log_all_empty_action" msgid="852218280136243014">"Foretag et opkald"</string>
-    <string name="call_log_missed_empty" msgid="7094936030845062214">"Du har ingen ubesvarede opkald."</string>
-    <string name="call_log_voicemail_empty" msgid="273623903423275178">"Indbakken for din telefonsvarer er tom."</string>
-    <string name="call_log_activity_title" msgid="1275242727244945527">"Opkaldshistorik"</string>
-    <string name="call_log_all_title" msgid="6042262422192020327">"Alle"</string>
-    <string name="call_log_missed_title" msgid="17254005889268015">"Ubesvarede"</string>
-    <string name="tab_speed_dial" msgid="6616404752227561075">"Hurtigopkald"</string>
-    <string name="tab_history" msgid="7420269368689503596">"Opkaldshistorik"</string>
-    <string name="tab_all_contacts" msgid="5531733977693943015">"Kontaktpersoner"</string>
-    <string name="tab_voicemail" msgid="2458548090088316246">"Telefonsvarer"</string>
-    <string name="search_shortcut_call_number" msgid="8847918845036880688">"Ring til <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"Opret ny kontaktperson"</string>
-    <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"Føj til en kontaktperson"</string>
-    <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"Send sms"</string>
-    <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"Foretag videoopkald"</string>
-    <string name="search_shortcut_block_number" msgid="4587283230665805776">"Bloker nummer"</string>
-    <string name="speed_dial_empty" msgid="3346406399966039505">"Der er endnu ingen kontaktpersoner i Hurtigopkald"</string>
-    <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"Angiv en kontaktperson som foretrukken"</string>
-    <string name="remove_contact" msgid="2353580570488923668">"Fjern"</string>
-    <string name="select_all" msgid="408601760696146245">"Vælg alt"</string>
-    <string name="call_log_action_video_call" msgid="7565549950343850819">"Videoopkald"</string>
-    <string name="call_log_action_send_message" msgid="6948727362660115554">"Send en sms-besked"</string>
-    <string name="call_log_action_details" msgid="2091370737371449501">"Opkaldsinfo"</string>
-    <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"Send til…"</string>
-    <string name="call_log_action_call" msgid="682724094251540583">"Ring til <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_incoming_missed_call" msgid="8292535799379230029">"Mistet opkald fra <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_incoming_answered_call" msgid="3920182963103160610">"Besvaret opkald fra <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_unread_voicemail" msgid="145170985013419170">"Ulæst talebesked fra <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_read_voicemail" msgid="5585559881573227732">"Talebesked fra <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_outgoing_call" msgid="543952487882919924">"Ring til <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="call_log_via_number" msgid="1340307109806397650">"via <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> via <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="description_call_action" msgid="4042796498169106545">"Ring til <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_video_call_action" msgid="1237090968588659650">"Videoopkald <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
-    <string name="description_voicemail_action" msgid="3290143432403538524">"Lyt til indtalt besked fra <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_create_new_contact_action" msgid="1928282350281564130">"Opret en kontaktperson for <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"Føj <xliff:g id="NAMEORNUMBER">^1</xliff:g> til en eksisterende kontaktperson"</string>
-    <string name="description_details_action" msgid="2061866409737706174">"Opkaldsoplysninger for <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="call_log_header_today" msgid="1576119097475845293">"I dag"</string>
-    <string name="call_log_header_yesterday" msgid="5616077776205329563">"I går"</string>
-    <string name="call_log_header_other" msgid="4940676886254217644">"Ældre"</string>
-    <string name="voicemail_speaker_on" msgid="3151333608926996668">"Slå højttaler til."</string>
-    <string name="voicemail_speaker_off" msgid="2530064206962034201">"Slå højttaler fra."</string>
-    <string name="voicemail_play_start_pause" msgid="3874823480278334664">"Start afspilningen, eller sæt den på pause."</string>
-    <string name="display_options_title" msgid="3880091801055797975">"Valgmuligheder for visning"</string>
-    <string name="sounds_and_vibration_title" msgid="3075050000721181384">"Lyde og vibration"</string>
-    <string name="accessibility_settings_title" msgid="3329027650429831820">"Hjælpefunktioner"</string>
-    <string name="ringtone_title" msgid="8377174189894648486">"Ringetone for opkald"</string>
-    <string name="vibrate_on_ring_title" msgid="631441314790960485">"Vibrer også ved opkald"</string>
-    <string name="dtmf_tone_enable_title" msgid="3273762431523939277">"Tastaturtoner"</string>
-    <string name="dtmf_tone_length_title" msgid="534096029202438539">"Tastaturtonernes længde"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="applicationLabel">Opkald</string>
+  <string name="launcherDialpadActivityLabel">Telefontastatur</string>
+  <string name="callHistoryIconLabel">Opkaldshistorik</string>
+  <string name="action_copy_number_text">Kopiér nummeret</string>
+  <string name="copy_transcript_text">Kopiér transskriptionen</string>
+  <string name="action_edit_number_before_call">Rediger nummeret før opkald</string>
+  <string name="call_log_delete_all">Ryd opkaldshistorik</string>
+  <string name="call_log_trash_voicemail">Slet talemeddelelsen</string>
+  <string name="snackbar_voicemail_deleted">Talebeskeden blev slettet</string>
+  <string name="clearCallLogConfirmation_title">Vil du rydde opkaldshistorikken?</string>
+  <string name="clearCallLogConfirmation">Dette vil slette alle opkald fra din historik</string>
+  <string name="clearCallLogProgress_title">Opkaldshistorik ryddes...</string>
+  <string name="notification_missedCallTitle">Ubesvarede opkald</string>
+  <string name="notification_missedWorkCallTitle">Ubesvaret arbejdsopkald</string>
+  <string name="notification_missedCallsTitle">Ubesvarede opkald</string>
+  <string name="notification_missedCallsMsg">%d ubesvarede opkald</string>
+  <string name="notification_missedCall_call_back">Ring tilbage</string>
+  <string name="notification_missedCall_message">Besked</string>
+  <string name="post_call_notification_message">%1$s: %2$s</string>
+  <string name="notification_voicemail_text_format">Ring til %s</string>
+  <string name="notification_voicemail_no_vm_number">Nummeret til telefonsvareren er ukendt</string>
+  <plurals name="notification_voicemail_title">
+    <item quantity="one">%1$d talebeskeder </item>
+    <item quantity="other">%1$d talebeskeder </item>
+  </plurals>
+  <string name="notification_voicemail_callers_list">%1$s, %2$s</string>
+  <string name="notification_new_voicemail_ticker">Ny besked fra %1$s</string>
+  <string name="voicemail_playback_error">Telefonsvarerbesked kan ikke afspilles</string>
+  <string name="voicemail_fetching_content">Telefonsvarerbesked indlæses...</string>
+  <string name="voicemail_fetching_timout">Telefonsvarerbesked kan ikke indlæses</string>
+  <string name="call_log_item_count_and_date">(%1$d) %2$s</string>
+  <string name="description_playback_speakerphone">Slå medhør til eller fra</string>
+  <string name="description_playback_seek">Søg efter afspilningsposition</string>
+  <string name="action_menu_call_history_description">Opkaldshistorik</string>
+  <string msgid="2295659037509008453" name="action_menu_overflow_description">Flere valgmuligheder</string>
+  <string name="action_menu_dialpad_button">tastatur</string>
+  <string name="dialer_settings_label">Indstillinger</string>
+  <string name="simulator_submenu_label">Simulator</string>
+  <string name="new_ui_launcher_shortcut_label">Opret ny brugerfladegenvej</string>
+  <string name="description_entering_bulk_action_mode">Massehandlingstilstanden startes</string>
+  <string name="description_leaving_bulk_action_mode">Massehandlingstilstanden blev afsluttet</string>
+  <string name="description_selecting_bulk_action_mode">Valgt %1$s</string>
+  <string name="description_unselecting_bulk_action_mode">Fravalgt %1$s</string>
+  <string name="description_contact_details">Kontaktoplysninger for %1$s</string>
+  <string name="description_spam_contact_details">Kontaktoplysninger om formodet spammer %1$s</string>
+  <string name="description_num_calls">%1$s opkald.</string>
+  <string name="description_video_call">Videoopkald.</string>
+  <string name="description_start_voice_search">Start talesøgning</string>
+  <string name="voicemail">Telefonsvarer</string>
+  <string name="description_cancel_multi_select">Annuller massehandlingstilstand</string>
+  <string name="voicemailMultiSelectDeleteConfirm">Slet</string>
+  <string name="voicemailMultiSelectDeleteCancel">Annuller</string>
+  <string name="voicemailMultiSelectActionBarTitle">%1$s er valgt</string>
+  <plurals name="delete_voicemails_confirmation_dialog_title">
+    <item quantity="one"><b>Vil du slette denne talebesked? </b></item>
+    <item quantity="other"><b>Vil du slette disse talebeskeder? </b></item>
+  </plurals>
+  <string name="voicemailCallLogToday">@string/call_log_header_today</string>
+  <string name="voicemailCallLogDateTimeFormat">%1$s kl. %2$s</string>
+  <string name="voicemailDurationFormat">%1$02d:%2$02d</string>
+  <string name="voicemailCallLogDateTimeFormatWithDuration">%1$s • %2$s</string>
+  <string name="voice_search_not_available">Talesøgning er ikke tilgængelig</string>
+  <string name="dialer_hint_find_contact">Søg i kontakter</string>
+  <string name="block_number_search_hint">Tilføj nummer, eller søg i kontaktpersoner</string>
+  <string name="call_log_all_empty">Din opkaldshistorik er tom</string>
+  <string name="call_log_all_empty_action">Foretag et opkald</string>
+  <string name="call_log_missed_empty">Du har ingen ubesvarede opkald.</string>
+  <string name="call_log_voicemail_empty">Indbakken for din telefonsvarer er tom.</string>
+  <string name="call_log_activity_title">Opkaldshistorik</string>
+  <string name="call_log_all_title">Alle</string>
+  <string name="call_log_missed_title">Ubesvarede</string>
+  <string name="tab_speed_dial">Hurtigopkald</string>
+  <string name="tab_history">Opkaldshistorik</string>
+  <string name="tab_all_contacts">Kontaktpersoner</string>
+  <string name="tab_voicemail">Telefonsvarer</string>
+  <string name="search_shortcut_call_number">Ring til %s</string>
+  <string name="search_shortcut_create_new_contact">Opret ny kontaktperson</string>
+  <string name="search_shortcut_add_to_contact">Føj til en kontaktperson</string>
+  <string name="search_shortcut_send_sms_message">Send sms</string>
+  <string name="search_shortcut_make_video_call">Foretag videoopkald</string>
+  <string name="search_shortcut_block_number">Bloker nummer</string>
+  <string name="speed_dial_empty">Der er endnu ingen kontaktpersoner i Hurtigopkald</string>
+  <string name="speed_dial_empty_add_favorite_action">Angiv en kontaktperson som foretrukken</string>
+  <string name="remove_contact">Fjern</string>
+  <string name="select_all">Vælg alt</string>
+  <string name="call_log_action_video_call">Videoopkald</string>
+  <string name="call_log_action_set_up_video">Konfigurer videoopkald</string>
+  <string name="call_log_action_invite_video">Inviter til videoopkald</string>
+  <string name="call_log_action_send_message">Send en sms-besked</string>
+  <string name="call_log_action_details">Opkaldsinfo</string>
+  <string name="call_log_action_share_voicemail">Send til…</string>
+  <string name="call_log_action_call">Ring til ^1</string>
+  <string name="description_incoming_missed_call">Mistet opkald fra ^1, ^2, ^3, ^4.</string>
+  <string name="description_incoming_answered_call">Besvaret opkald fra ^1, ^2, ^3, ^4.</string>
+  <string name="description_unread_voicemail">Ulæst talebesked fra ^1, ^2, ^3, ^4.</string>
+  <string name="description_read_voicemail">Talebesked fra ^1, ^2, ^3, ^4.</string>
+  <string name="description_outgoing_call">Ring til ^1, ^2, ^3, ^4.</string>
+  <string name="call_log_via_number">via %1$s</string>
+  <string name="call_log_via_number_phone_account">%1$s via %2$s</string>
+  <string name="description_call_action">Ring til ^1</string>
+  <string name="description_video_call_action">Videoopkald ^1.</string>
+  <string name="description_voicemail_action">Lyt til indtalt besked fra ^1</string>
+  <string name="description_create_new_contact_action">Opret en kontaktperson for ^1</string>
+  <string name="description_add_to_existing_contact_action">Føj ^1 til en eksisterende kontaktperson</string>
+  <string name="description_details_action">Opkaldsoplysninger for ^1</string>
+  <string name="call_log_header_today">I dag</string>
+  <string name="call_log_header_yesterday">I går</string>
+  <string name="call_log_header_other">Ældre</string>
+  <string name="voicemail_speaker_on">Slå højttaler til.</string>
+  <string name="voicemail_speaker_off">Slå højttaler fra.</string>
+  <string name="voicemail_play_start_pause">Start afspilningen, eller sæt den på pause.</string>
+  <string name="display_options_title">Valgmuligheder for visning</string>
+  <string name="sounds_and_vibration_title">Lyde og vibration</string>
+  <string name="accessibility_settings_title">Hjælpefunktioner</string>
+  <string name="ringtone_title">Ringetone ved opkald</string>
+  <string name="vibrate_on_ring_title">Vibrer også ved opkald</string>
+  <string name="dtmf_tone_enable_title">Tastaturtoner</string>
+  <string name="dtmf_tone_length_title">Tastaturtonernes længde</string>
   <string-array name="dtmf_tone_length_entries">
-    <item msgid="3136353015227162823">"Normal"</item>
-    <item msgid="5376841175538523822">"Lang"</item>
+    <item>Normal</item>
+    <item>Lang</item>
   </string-array>
-    <string name="respond_via_sms_setting_title" msgid="8008181606657693452">"Hurtige svar"</string>
-    <string name="call_settings_label" msgid="7824611757200960807">"Opkald"</string>
-    <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Opkaldsblokering"</string>
-    <string name="voicemail_settings_label" msgid="4594299554519920570">"Telefonsvarer"</string>
-    <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Opkaldsblokering er midlertidigt slået fra"</string>
-    <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Opkaldsblokering er blevet deaktiveret, da du inden for de sidste 48 timer har kontaktet en alarmcentral. Blokeringen aktiveres automatisk igen, når perioden på 48 timer er udløbet."</string>
-    <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Importér numre"</string>
-    <string name="blocked_call_settings_import_description" msgid="1819412052545228965">"Du har tidligere angivet, at nogle opkaldere automatisk skal sendes til telefonsvareren via andre apps."</string>
-    <string name="blocked_call_settings_view_numbers_button" msgid="3332727948554356704">"Se numre"</string>
-    <string name="blocked_call_settings_import_button" msgid="7319111700387470727">"Importér"</string>
-    <string name="description_blocked_number_list_delete" msgid="2139644216858370740">"Fjern blokering af nummer"</string>
-    <string name="addBlockedNumber" msgid="3053473735238295551">"Tilføj nummer"</string>
-    <string name="block_number_footer_message_vvm" msgid="7955326304033982368">"Opkald fra disse numre blokeres, og beskeder i telefonsvareren slettes automatisk."</string>
-    <string name="block_number_footer_message_no_vvm" msgid="1152684139070471665">"Opkald fra disse numre bliver blokeret, men der kan muligvis stadig lægges beskeder i din telefonsvarer."</string>
-    <string name="block_list" msgid="4701585783411870782">"Blokerede telefonnumre"</string>
-    <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g> er allerede blokeret."</string>
-    <string name="phone_account_settings_label" msgid="8372485478006965920">"Opkaldskonti"</string>
-    <string name="permission_no_speeddial" msgid="8487215628510596753">"Slå tilladelsen Kontaktpersoner til for at aktivere hurtigopkald."</string>
-    <string name="permission_no_calllog" msgid="4053705651238775784">"Slå tilladelsen Telefon til for at se din opkaldsliste."</string>
-    <string name="permission_no_search" msgid="2424710404207193826">"Hvis du vil søge i dine kontaktpersoner, skal du slå tilladelserne Kontaktpersoner til."</string>
-    <string name="permission_place_call" msgid="8686908130349369423">"Slå tilladelsen Telefon til for at foretage et opkald."</string>
-    <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"Opkaldsappen har ikke tilladelse til at ændre systemindstillinger."</string>
-    <string name="blocked_number_call_log_label" msgid="4212282846299997693">"Blokeret"</string>
-    <string name="call_log_action_block_report_number" msgid="7302636538668696729">"Bloker/rapportér spam"</string>
-    <string name="call_log_action_block_number" msgid="5048188386501998865">"Bloker nummer"</string>
-    <string name="call_log_action_remove_spam" msgid="2045319806318398403">"Ikke spam"</string>
-    <string name="call_log_action_unblock_number" msgid="6100117033288448758">"Fjern blokering af nummer"</string>
-    <string name="spam_number_call_log_label" msgid="2678431398326811131">"Spam"</string>
-    <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> er offline og kan ikke nås"</string>
-    <string name="about_phone_label" msgid="582991354677973731">"Om"</string>
-    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Transskriberet af Google"</string>
-    <string name="voicemail_transcription_in_progress" msgid="2933320969613783210">"Google transskriberer…"</string>
-    <string name="voicemail_transcription_failed" msgid="335275303117412706">"Transskriptionen er ikke tilgængelig."</string>
-    <string name="voicemail_transcription_failed_language_not_supported" msgid="4210332591050562553">"Transskriptionen er ikke tilgængelig. Sproget understøttes ikke."</string>
-    <string name="voicemail_transcription_failed_no_speech" msgid="9093372879697874852">"Transskriptionen er ikke tilgængelig. Ingen tale er registreret."</string>
-    <string name="view_conversation" msgid="7895904782094119702">"Vis"</string>
-    <string name="ec_data_deleted" msgid="4794880345545827107">"Opkaldet er slettet. Du kan se og slette vedhæftede filer, der er delt i forbindelse med dette opkald, i Beskeder."</string>
-    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"Opkaldene er slettet. Du kan se og slette vedhæftede filer, der er delt i forbindelse med opkald, i Beskeder."</string>
+  <string name="respond_via_sms_setting_title">Hurtige svar</string>
+  <string name="call_settings_label">Opkald</string>
+  <string name="manage_blocked_numbers_label">Blokerede numre</string>
+  <string name="voicemail_settings_label">Telefonsvarer</string>
+  <string name="blocked_numbers_disabled_emergency_header_label">Opkaldsblokering er midlertidigt slået fra</string>
+  <string name="blocked_numbers_disabled_emergency_desc">Opkaldsblokering er blevet deaktiveret, da du inden for de sidste 48 timer har kontaktet en alarmcentral. Blokeringen aktiveres automatisk igen, når perioden på 48 timer er udløbet.</string>
+  <string name="import_send_to_voicemail_numbers_label">Importér numre</string>
+  <string name="blocked_call_settings_import_description">Du har tidligere angivet, at nogle opkaldere automatisk skal sendes til telefonsvareren via andre apps.</string>
+  <string name="blocked_call_settings_view_numbers_button">Se numre</string>
+  <string name="blocked_call_settings_import_button">Importér</string>
+  <string name="description_blocked_number_list_delete">Fjern blokering af nummer</string>
+  <string name="addBlockedNumber">Tilføj nummer</string>
+  <string name="block_number_footer_message_vvm">Opkald fra disse numre blokeres, og beskeder i telefonsvareren slettes automatisk.</string>
+  <string name="block_number_footer_message_no_vvm">Opkald fra disse numre bliver blokeret, men der kan muligvis stadig lægges beskeder i din telefonsvarer.</string>
+  <string name="block_list">Blokerede telefonnumre</string>
+  <string name="alreadyBlocked">%1$s er allerede blokeret.</string>
+  <string name="phone_account_settings_label">Opkaldskonti</string>
+  <string name="permission_no_speeddial">Slå tilladelsen Kontaktpersoner til for at aktivere hurtigopkald.</string>
+  <string name="permission_no_calllog">Slå tilladelsen Telefon til for at se din opkaldsliste.</string>
+  <string name="permission_no_search">Hvis du vil søge i dine kontaktpersoner, skal du slå tilladelserne Kontaktpersoner til.</string>
+  <string name="permission_place_call">Slå tilladelsen Telefon til for at foretage et opkald.</string>
+  <string name="toast_cannot_write_system_settings">Opkaldsappen har ikke tilladelse til at ændre systemindstillinger.</string>
+  <string name="blocked_number_call_log_label">Blokeret</string>
+  <string name="call_log_action_block_report_number">Bloker/rapportér spam</string>
+  <string name="call_log_action_block_number">Bloker nummer</string>
+  <string name="call_log_action_remove_spam">Ikke spam</string>
+  <string name="call_log_action_unblock_number">Fjern blokering af nummer</string>
+  <string name="spam_number_call_log_label">Spam</string>
+  <string name="call_composer_connection_failed">%1$s er offline og kan ikke nås</string>
+  <string name="about_phone_label">Om</string>
+  <string name="voicemail_transcription_branding_text">Transskriberet af Google</string>
+  <string name="voicemail_transcription_in_progress">Transskriberer…</string>
+  <string name="voicemail_transcription_failed">Transskriptionen er ikke tilgængelig.</string>
+  <string name="voicemail_transcription_failed_language_not_supported">Transskriptionen er ikke tilgængelig. Sproget understøttes ikke.</string>
+  <string name="voicemail_transcription_failed_no_speech">Transskriptionen er ikke tilgængelig. Ingen tale er registreret.</string>
+  <string name="voicemail_donation_promo_title">Vil du hjælpe med at forbedre nøjagtigheden af transskriptioner?</string>
+  <string name="voicemail_donation_promo_content">Tillad, at Google gennemgår denne og fremtidige talebeskeder med transskriptioner. De gemmes anonymt. Du kan altid ændre dine indstillinger. %1$s</string>
+  <string name="voicemail_donation_promo_opt_in">Ja tak</string>
+  <string name="voicemail_donation_promo_opt_out">Nej tak</string>
+  <string name="voicemail_transcription_rating">Bedøm transskriptionskvalitet</string>
+  <string name="voicemail_transcription_rating_thanks">Tak for din feedback</string>
+  <string name="description_rating_good">Giv et like</string>
+  <string name="description_rating_bad">Fjern dit like</string>
+  <string name="view_conversation">Vis</string>
+  <string name="ec_data_deleted">Opkaldet er slettet. Du kan se og slette vedhæftede filer, der er delt i forbindelse med dette opkald, i Beskeder.</string>
+  <string name="multiple_ec_data_deleted">Opkaldene er slettet. Du kan se og slette vedhæftede filer, der er delt i forbindelse med opkald, i Beskeder.</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-de/strings.xml b/java/com/android/dialer/app/res/values-de/strings.xml
index 786692d..2743f5c 100644
--- a/java/com/android/dialer/app/res/values-de/strings.xml
+++ b/java/com/android/dialer/app/res/values-de/strings.xml
@@ -1,179 +1,171 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="applicationLabel" msgid="2202739481132958990">"Telefon"</string>
-    <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"Wähltasten für Telefon"</string>
-    <string name="callHistoryIconLabel" msgid="7493268743411968630">"Anrufliste"</string>
-    <string name="action_copy_number_text" msgid="832682558551502319">"Nummer kopieren"</string>
-    <string name="copy_transcript_text" msgid="937904189017310829">"Transkription kopieren"</string>
-    <string name="action_edit_number_before_call" msgid="8017492815878473837">"Nummer vor Anruf bearbeiten"</string>
-    <string name="call_log_delete_all" msgid="7852970926906523784">"Anrufliste löschen"</string>
-    <string name="call_log_trash_voicemail" msgid="6118493534178533972">"Mailboxnachricht löschen"</string>
-    <string name="snackbar_voicemail_deleted" msgid="7463166543725496307">"Mailbox gelöscht"</string>
-    <string name="snackbar_voicemail_deleted_undo" msgid="6959743982796409941">"Rückgängig"</string>
-    <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"Anrufliste löschen?"</string>
-    <string name="clearCallLogConfirmation" msgid="6844949465815109166">"Alle Anrufe werden aus deinem Verlauf gelöscht."</string>
-    <string name="clearCallLogProgress_title" msgid="995004835687361977">"Anrufliste wird gelöscht…"</string>
-    <string name="notification_missedCallTitle" msgid="8283366068539898486">"Entgangener Anruf"</string>
-    <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"Verpasster geschäftlicher Anruf"</string>
-    <string name="notification_missedCallsTitle" msgid="3697442015345089802">"Entgangene Anrufe"</string>
-    <string name="notification_missedCallsMsg" msgid="8176217633929018706">"<xliff:g id="NUM_MISSED_CALLS">%d</xliff:g> entgangene Anrufe"</string>
-    <string name="notification_missedCall_call_back" msgid="3875698110051973965">"Zurückrufen"</string>
-    <string name="notification_missedCall_message" msgid="5086910028988305964">"Nachricht"</string>
-    <string name="post_call_notification_message" msgid="5417476789860590611">"<xliff:g id="NAME">%1$s</xliff:g>: <xliff:g id="MESSAGE">%2$s</xliff:g>"</string>
-    <string name="notification_voicemail_text_format" msgid="1895667520930252897">"<xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g> wählen"</string>
-    <string name="notification_voicemail_no_vm_number" msgid="8942821987929495842">"Mailboxnummer unbekannt"</string>
-    <plurals name="notification_voicemail_title" formatted="false" msgid="1551847434476438657">
-      <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> Mailboxnachrichten </item>
-      <item quantity="one">Mailboxnachricht</item>
-    </plurals>
-    <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
-    <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"Neue Mailboxnachricht von <xliff:g id="CALLER">%1$s</xliff:g>"</string>
-    <string name="voicemail_playback_error" msgid="4384373852257757295">"Mailboxnachricht-Wiedergabe nicht möglich"</string>
-    <string name="voicemail_fetching_content" msgid="572320120918636014">"Mailboxnachricht wird geladen…"</string>
-    <string name="voicemail_fetching_timout" msgid="2128873915839949783">"Laden der Mailboxnachricht nicht möglich"</string>
-    <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_playback_speakerphone" msgid="4852027754869750227">"Freisprechfunktion aktivieren oder deaktivieren"</string>
-    <string name="description_playback_seek" msgid="1340910573254132520">"Wiedergabeposition suchen"</string>
-    <string name="action_menu_call_history_description" msgid="8829135306925008546">"Anrufliste"</string>
-    <string name="action_menu_overflow_description" msgid="7648679686746517341">"Mehr Optionen"</string>
-    <string name="action_menu_dialpad_button" msgid="1970631633457493180">"Wähltasten"</string>
-    <string name="dialer_settings_label" msgid="4980176284150290175">"Einstellungen"</string>
-    <string name="simulator_submenu_label" msgid="186156287346615267">"Simulator"</string>
-    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Verknüpfung für neue Benutzeroberfläche erstellen"</string>
-    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"Es wird in den Modus für Bulk-Aktionen gewechselt"</string>
-    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"Der Modus für Bulk-Aktionen wurde verlassen"</string>
-    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> ausgewählt"</string>
-    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"Auswahl für <xliff:g id="NAMEORNUMBER">%1$s</xliff:g> aufgehoben"</string>
-    <string name="description_contact_details" msgid="3341280873855253464">"Kontaktdetails für <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_spam_contact_details" msgid="5592578752881528368">"Kontaktdetails für möglichen Spamanrufer <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> Anrufe"</string>
-    <string name="description_video_call" msgid="3738199365585751727">"Videoanruf"</string>
-    <string name="description_start_voice_search" msgid="8380022725973015261">"Sprachsuche starten"</string>
-    <string name="voicemail" msgid="8899540969000957954">"Mailbox"</string>
-    <string name="description_cancel_multi_select" msgid="3930475950253360461">"Modus für Batch-Aktionen abbrechen"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Löschen"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Abbrechen"</string>
-    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> ausgewählt"</string>
-    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
-      <item quantity="other">"<b>"Diese Mailboxnachrichten löschen? "</b>"</item>
-      <item quantity="one">"<b>"Diese Mailboxnachricht löschen? "</b>"</item>
-    </plurals>
-    <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
-    <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> um <xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
-    <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="voice_search_not_available" msgid="6546240433719732905">"Sprachsuche nicht verfügbar"</string>
-    <string name="dialer_hint_find_contact" msgid="2023214799381149808">"In Kontakten suchen"</string>
-    <string name="block_number_search_hint" msgid="5377706079015099416">"Nummer hinzufügen oder in Kontakten suchen"</string>
-    <string name="call_log_all_empty" msgid="3955572868518162004">"Deine Anrufliste ist leer"</string>
-    <string name="call_log_all_empty_action" msgid="852218280136243014">"Anrufen"</string>
-    <string name="call_log_missed_empty" msgid="7094936030845062214">"Keine verpassten Anrufe"</string>
-    <string name="call_log_voicemail_empty" msgid="273623903423275178">"Dein Mailbox-Posteingang ist leer."</string>
-    <string name="call_log_activity_title" msgid="1275242727244945527">"Anrufliste"</string>
-    <string name="call_log_all_title" msgid="6042262422192020327">"Alle"</string>
-    <string name="call_log_missed_title" msgid="17254005889268015">"Verpasst"</string>
-    <string name="tab_speed_dial" msgid="6616404752227561075">"Schnellauswahl"</string>
-    <string name="tab_history" msgid="7420269368689503596">"Anrufliste"</string>
-    <string name="tab_all_contacts" msgid="5531733977693943015">"Kontakte"</string>
-    <string name="tab_voicemail" msgid="2458548090088316246">"Mailbox"</string>
-    <string name="search_shortcut_call_number" msgid="8847918845036880688">"<xliff:g id="NUMBER">%s</xliff:g> wählen"</string>
-    <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"Neuen Kontakt erstellen"</string>
-    <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"Zu Kontakt hinzufügen"</string>
-    <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"SMS senden"</string>
-    <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"Videoanruf starten"</string>
-    <string name="search_shortcut_block_number" msgid="4587283230665805776">"Nummer blockieren"</string>
-    <string name="speed_dial_empty" msgid="3346406399966039505">"Du hast für noch niemanden eine Kurzwahl festgelegt"</string>
-    <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"Favoriten hinzufügen"</string>
-    <string name="remove_contact" msgid="2353580570488923668">"Entfernen"</string>
-    <string name="select_all" msgid="408601760696146245">"Alle auswählen"</string>
-    <string name="call_log_action_video_call" msgid="7565549950343850819">"Videoanruf"</string>
-    <string name="call_log_action_send_message" msgid="6948727362660115554">"SMS senden"</string>
-    <string name="call_log_action_details" msgid="2091370737371449501">"Anrufdetails"</string>
-    <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"Senden an…"</string>
-    <string name="call_log_action_call" msgid="682724094251540583">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> anrufen"</string>
-    <string name="description_incoming_missed_call" msgid="8292535799379230029">"Anruf von <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g> verpasst"</string>
-    <string name="description_incoming_answered_call" msgid="3920182963103160610">"Anruf von <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g> angenommen"</string>
-    <string name="description_unread_voicemail" msgid="145170985013419170">"Ungelesene Mailboxnachricht von <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_read_voicemail" msgid="5585559881573227732">"Mailboxnachricht von <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_outgoing_call" msgid="543952487882919924">"Ausgehender Anruf an <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>"</string>
-    <string name="call_log_via_number" msgid="1340307109806397650">"über <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> über <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="description_call_action" msgid="4042796498169106545">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> anrufen"</string>
-    <string name="description_video_call_action" msgid="1237090968588659650">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> über Videoanruf anrufen"</string>
-    <string name="description_voicemail_action" msgid="3290143432403538524">"Mailboxnachricht von <xliff:g id="NAMEORNUMBER">^1</xliff:g> anhören"</string>
-    <string name="description_create_new_contact_action" msgid="1928282350281564130">"Kontakt für <xliff:g id="NAMEORNUMBER">^1</xliff:g> erstellen"</string>
-    <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> zu vorhandenem Kontakt hinzufügen"</string>
-    <string name="description_details_action" msgid="2061866409737706174">"Anrufdetails für <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="call_log_header_today" msgid="1576119097475845293">"Heute"</string>
-    <string name="call_log_header_yesterday" msgid="5616077776205329563">"Gestern"</string>
-    <string name="call_log_header_other" msgid="4940676886254217644">"Ältere"</string>
-    <string name="voicemail_speaker_on" msgid="3151333608926996668">"Lautsprecher einschalten"</string>
-    <string name="voicemail_speaker_off" msgid="2530064206962034201">"Lautsprecher ausschalten"</string>
-    <string name="voicemail_play_start_pause" msgid="3874823480278334664">"Wiedergabe starten oder pausieren"</string>
-    <string name="display_options_title" msgid="3880091801055797975">"Anzeigeoptionen"</string>
-    <string name="sounds_and_vibration_title" msgid="3075050000721181384">"Töne und Vibration"</string>
-    <string name="accessibility_settings_title" msgid="3329027650429831820">"Bedienungshilfen"</string>
-    <string name="ringtone_title" msgid="8377174189894648486">"Klingelton"</string>
-    <string name="vibrate_on_ring_title" msgid="631441314790960485">"Bei Anrufen auch vibrieren"</string>
-    <string name="dtmf_tone_enable_title" msgid="3273762431523939277">"Wähltastentöne"</string>
-    <string name="dtmf_tone_length_title" msgid="534096029202438539">"Länge der Wähltastentöne"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="applicationLabel">Telefon</string>
+  <string name="launcherDialpadActivityLabel">Wähltasten für Telefon</string>
+  <string name="callHistoryIconLabel">Anrufliste</string>
+  <string name="action_copy_number_text">Nummer kopieren</string>
+  <string name="copy_transcript_text">Transkription kopieren</string>
+  <string name="action_edit_number_before_call">Nummer vor Anruf bearbeiten</string>
+  <string name="call_log_delete_all">Anrufliste löschen</string>
+  <string name="call_log_trash_voicemail">Mailboxnachricht löschen</string>
+  <string name="snackbar_voicemail_deleted">Mailbox gelöscht</string>
+  <string name="clearCallLogConfirmation_title">Anrufliste löschen?</string>
+  <string name="clearCallLogConfirmation">Alle Anrufe werden aus deinem Verlauf gelöscht.</string>
+  <string name="clearCallLogProgress_title">Anrufliste wird gelöscht…</string>
+  <string name="notification_missedCallTitle">Entgangener Anruf</string>
+  <string name="notification_missedWorkCallTitle">Verpasster geschäftlicher Anruf</string>
+  <string name="notification_missedCallsTitle">Entgangene Anrufe</string>
+  <string name="notification_missedCallsMsg">%d entgangene Anrufe</string>
+  <string name="notification_missedCall_call_back">Zurückrufen</string>
+  <string name="notification_missedCall_message">Nachricht</string>
+  <string name="post_call_notification_message">%1$s: %2$s</string>
+  <string name="notification_voicemail_text_format">%s wählen</string>
+  <string name="notification_voicemail_no_vm_number">Mailboxnummer unbekannt</string>
+  <plurals name="notification_voicemail_title">
+    <item quantity="one">Mailboxnachricht</item>
+    <item quantity="other"> %1$d Mailboxnachrichten </item>
+  </plurals>
+  <string name="notification_voicemail_callers_list">%1$s, %2$s</string>
+  <string name="notification_new_voicemail_ticker">Neue Mailboxnachricht von %1$s</string>
+  <string name="voicemail_playback_error">Mailboxnachricht-Wiedergabe nicht möglich</string>
+  <string name="voicemail_fetching_content">Mailboxnachricht wird geladen…</string>
+  <string name="voicemail_fetching_timout">Laden der Mailboxnachricht nicht möglich</string>
+  <string name="call_log_item_count_and_date">(%1$d) %2$s</string>
+  <string name="description_playback_speakerphone">Freisprechfunktion aktivieren oder deaktivieren</string>
+  <string name="description_playback_seek">Wiedergabeposition suchen</string>
+  <string name="action_menu_call_history_description">Anrufliste</string>
+  <string msgid="2295659037509008453" name="action_menu_overflow_description">Mehr Optionen</string>
+  <string name="action_menu_dialpad_button">Wähltasten</string>
+  <string name="dialer_settings_label">Einstellungen</string>
+  <string name="simulator_submenu_label">Simulator</string>
+  <string name="new_ui_launcher_shortcut_label">Verknüpfung für neue Benutzeroberfläche erstellen</string>
+  <string name="description_entering_bulk_action_mode">Es wird in den Modus für Bulk-Aktionen gewechselt</string>
+  <string name="description_leaving_bulk_action_mode">Der Modus für Bulk-Aktionen wurde verlassen</string>
+  <string name="description_selecting_bulk_action_mode">%1$s ausgewählt</string>
+  <string name="description_unselecting_bulk_action_mode">Auswahl für %1$s aufgehoben</string>
+  <string name="description_contact_details">Kontaktdetails für %1$s</string>
+  <string name="description_spam_contact_details">Kontaktdetails für möglichen Spamanrufer %1$s</string>
+  <string name="description_num_calls">%1$s Anrufe</string>
+  <string name="description_video_call">Videoanruf</string>
+  <string name="description_start_voice_search">Sprachsuche starten</string>
+  <string name="voicemail">Mailbox</string>
+  <string name="description_cancel_multi_select">Modus für Batch-Aktionen abbrechen</string>
+  <string name="voicemailMultiSelectDeleteConfirm">Löschen</string>
+  <string name="voicemailMultiSelectDeleteCancel">Abbrechen</string>
+  <string name="voicemailMultiSelectActionBarTitle">%1$s ausgewählt</string>
+  <plurals name="delete_voicemails_confirmation_dialog_title">
+    <item quantity="one"><b>Diese Mailboxnachricht löschen? </b></item>
+    <item quantity="other"><b>Diese Mailboxnachrichten löschen? </b></item>
+  </plurals>
+  <string name="voicemailCallLogToday">@string/call_log_header_today</string>
+  <string name="voicemailCallLogDateTimeFormat">%1$s um %2$s</string>
+  <string name="voicemailDurationFormat">%1$02d:%2$02d</string>
+  <string name="voicemailCallLogDateTimeFormatWithDuration">%1$s • %2$s</string>
+  <string name="voice_search_not_available">Sprachsuche nicht verfügbar</string>
+  <string name="dialer_hint_find_contact">In Kontakten suchen</string>
+  <string name="block_number_search_hint">Nummer hinzufügen oder in Kontakten suchen</string>
+  <string name="call_log_all_empty">Deine Anrufliste ist leer</string>
+  <string name="call_log_all_empty_action">Anrufen</string>
+  <string name="call_log_missed_empty">Keine verpassten Anrufe</string>
+  <string name="call_log_voicemail_empty">Dein Mailbox-Posteingang ist leer.</string>
+  <string name="call_log_activity_title">Anrufliste</string>
+  <string name="call_log_all_title">Alle</string>
+  <string name="call_log_missed_title">Verpasst</string>
+  <string name="tab_speed_dial">Schnellauswahl</string>
+  <string name="tab_history">Anrufliste</string>
+  <string name="tab_all_contacts">Kontakte</string>
+  <string name="tab_voicemail">Mailbox</string>
+  <string name="search_shortcut_call_number">%s wählen</string>
+  <string name="search_shortcut_create_new_contact">Neuen Kontakt erstellen</string>
+  <string name="search_shortcut_add_to_contact">Zu Kontakt hinzufügen</string>
+  <string name="search_shortcut_send_sms_message">SMS senden</string>
+  <string name="search_shortcut_make_video_call">Videoanruf starten</string>
+  <string name="search_shortcut_block_number">Nummer blockieren</string>
+  <string name="speed_dial_empty">Du hast noch keine Kurzwahl festgelegt</string>
+  <string name="speed_dial_empty_add_favorite_action">Favoriten hinzufügen</string>
+  <string name="remove_contact">Entfernen</string>
+  <string name="select_all">Alle auswählen</string>
+  <string name="call_log_action_video_call">Videoanruf</string>
+  <string name="call_log_action_set_up_video">Videoanrufe einrichten</string>
+  <string name="call_log_action_invite_video">Zu Videoanruf einladen</string>
+  <string name="call_log_action_send_message">SMS senden</string>
+  <string name="call_log_action_details">Anrufdetails</string>
+  <string name="call_log_action_share_voicemail">Senden an…</string>
+  <string name="call_log_action_call">^1 anrufen</string>
+  <string name="description_incoming_missed_call">Anruf von ^1, ^2, ^3, ^4 verpasst</string>
+  <string name="description_incoming_answered_call">Anruf von ^1, ^2, ^3, ^4 angenommen</string>
+  <string name="description_unread_voicemail">Ungelesene Mailboxnachricht von ^1, ^2, ^3, ^4.</string>
+  <string name="description_read_voicemail">Mailboxnachricht von ^1, ^2, ^3, ^4.</string>
+  <string name="description_outgoing_call">Ausgehender Anruf an ^1, ^2, ^3, ^4</string>
+  <string name="call_log_via_number">über %1$s</string>
+  <string name="call_log_via_number_phone_account">%1$s über %2$s</string>
+  <string name="description_call_action">^1 anrufen</string>
+  <string name="description_video_call_action">^1 über Videoanruf anrufen</string>
+  <string name="description_voicemail_action">Mailboxnachricht von ^1 anhören</string>
+  <string name="description_create_new_contact_action">Kontakt für ^1 erstellen</string>
+  <string name="description_add_to_existing_contact_action">^1 zu vorhandenem Kontakt hinzufügen</string>
+  <string name="description_details_action">Anrufdetails für ^1</string>
+  <string name="call_log_header_today">Heute</string>
+  <string name="call_log_header_yesterday">Gestern</string>
+  <string name="call_log_header_other">Ältere</string>
+  <string name="voicemail_speaker_on">Lautsprecher einschalten</string>
+  <string name="voicemail_speaker_off">Lautsprecher ausschalten</string>
+  <string name="voicemail_play_start_pause">Wiedergabe starten oder pausieren</string>
+  <string name="display_options_title">Anzeigeoptionen</string>
+  <string name="sounds_and_vibration_title">Töne und Vibration</string>
+  <string name="accessibility_settings_title">Bedienungshilfen</string>
+  <string name="ringtone_title">Klingelton</string>
+  <string name="vibrate_on_ring_title">Bei Anrufen auch vibrieren</string>
+  <string name="dtmf_tone_enable_title">Wähltastentöne</string>
+  <string name="dtmf_tone_length_title">Länge der Wähltastentöne</string>
   <string-array name="dtmf_tone_length_entries">
-    <item msgid="3136353015227162823">"Normal"</item>
-    <item msgid="5376841175538523822">"Lang"</item>
+    <item>Normal</item>
+    <item>Lang</item>
   </string-array>
-    <string name="respond_via_sms_setting_title" msgid="8008181606657693452">"Kurzantworten"</string>
-    <string name="call_settings_label" msgid="7824611757200960807">"Anrufe"</string>
-    <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Anrufblockierung"</string>
-    <string name="voicemail_settings_label" msgid="4594299554519920570">"Mailbox"</string>
-    <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Anrufblockierung vorübergehend aus"</string>
-    <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Die Anrufblockierung wurde deaktiviert, weil du innerhalb der letzten 48 Stunden mit diesem Telefon den Notruf gewählt hast. Nach Ablauf dieser 48-Stunden-Frist wird die Blockierung automatisch wieder aktiviert."</string>
-    <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Nummern importieren"</string>
-    <string name="blocked_call_settings_import_description" msgid="1819412052545228965">"Du hast zuvor einige Anrufer markiert, die automatisch über andere Apps an die Mailbox gesendet werden."</string>
-    <string name="blocked_call_settings_view_numbers_button" msgid="3332727948554356704">"Nummern anzeigen"</string>
-    <string name="blocked_call_settings_import_button" msgid="7319111700387470727">"Importieren"</string>
-    <string name="description_blocked_number_list_delete" msgid="2139644216858370740">"Blockierung der Nummer aufheben"</string>
-    <string name="addBlockedNumber" msgid="3053473735238295551">"Nummer hinzufügen"</string>
-    <string name="block_number_footer_message_vvm" msgid="7955326304033982368">"Anrufe von diesen Nummern werden blockiert und Mailboxnachrichten automatisch gelöscht."</string>
-    <string name="block_number_footer_message_no_vvm" msgid="1152684139070471665">"Anrufe von diesen Nummern werden blockiert. Die Anrufer haben aber unter Umständen weiterhin die Möglichkeit, dir Mailboxnachrichten zu hinterlassen."</string>
-    <string name="block_list" msgid="4701585783411870782">"Blockierte Nummern"</string>
-    <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g> ist bereits blockiert."</string>
-    <string name="phone_account_settings_label" msgid="8372485478006965920">"Anrufkonten"</string>
-    <string name="permission_no_speeddial" msgid="8487215628510596753">"Aktiviere die Berechtigung \"Kontakte\", um die Kurzwahlfunktion zu verwenden."</string>
-    <string name="permission_no_calllog" msgid="4053705651238775784">"Aktiviere die Berechtigung \"Telefon\", um dein Anrufprotokoll abzurufen."</string>
-    <string name="permission_no_search" msgid="2424710404207193826">"Aktiviere die Berechtigungen \"Kontakte\", um deine Kontakte zu suchen."</string>
-    <string name="permission_place_call" msgid="8686908130349369423">"Aktiviere die Berechtigung \"Telefon\", um einen Anruf zu tätigen."</string>
-    <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"Die App \"Telefon\" ist nicht berechtigt, die Systemeinstellungen zu überschreiben."</string>
-    <string name="blocked_number_call_log_label" msgid="4212282846299997693">"Blockiert"</string>
-    <string name="call_log_action_block_report_number" msgid="7302636538668696729">"Blockieren/Spam melden"</string>
-    <string name="call_log_action_block_number" msgid="5048188386501998865">"Nummer blockieren"</string>
-    <string name="call_log_action_remove_spam" msgid="2045319806318398403">"Kein Spam"</string>
-    <string name="call_log_action_unblock_number" msgid="6100117033288448758">"Blockierung der Nummer aufheben"</string>
-    <string name="spam_number_call_log_label" msgid="2678431398326811131">"Spam"</string>
-    <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> ist offline und nicht erreichbar"</string>
-    <string name="about_phone_label" msgid="582991354677973731">"Info"</string>
-    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Transkribiert von Google"</string>
-    <string name="voicemail_transcription_in_progress" msgid="2933320969613783210">"Google transkribiert…"</string>
-    <string name="voicemail_transcription_failed" msgid="335275303117412706">"Transkript nicht verfügbar."</string>
-    <string name="voicemail_transcription_failed_language_not_supported" msgid="4210332591050562553">"Transkript nicht verfügbar. Sprache wird nicht unterstützt."</string>
-    <string name="voicemail_transcription_failed_no_speech" msgid="9093372879697874852">"Transkript nicht verfügbar. Keine Spracheingabe erkannt."</string>
-    <string name="view_conversation" msgid="7895904782094119702">"Ansehen"</string>
-    <string name="ec_data_deleted" msgid="4794880345545827107">"Anruf gelöscht. Du kannst in diesem Anruf geteilte Anhänge unter \"Nachrichten\" ansehen und löschen."</string>
-    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"Anrufe gelöscht. Du kannst in diesen Anrufen geteilte Anhänge unter \"Nachrichten\" ansehen und löschen."</string>
+  <string name="respond_via_sms_setting_title">Kurzantworten</string>
+  <string name="call_settings_label">Anrufe</string>
+  <string name="manage_blocked_numbers_label">Blockierte Nummern</string>
+  <string name="voicemail_settings_label">Mailbox</string>
+  <string name="blocked_numbers_disabled_emergency_header_label">Anrufblockierung vorübergehend aus</string>
+  <string name="blocked_numbers_disabled_emergency_desc">Die Anrufblockierung wurde deaktiviert, weil du innerhalb der letzten 48 Stunden mit diesem Telefon den Notruf gewählt hast. Nach Ablauf dieser 48-Stunden-Frist wird die Blockierung automatisch wieder aktiviert.</string>
+  <string name="import_send_to_voicemail_numbers_label">Nummern importieren</string>
+  <string name="blocked_call_settings_import_description">Du hast zuvor einige Anrufer markiert, die automatisch über andere Apps an die Mailbox gesendet werden.</string>
+  <string name="blocked_call_settings_view_numbers_button">Nummern anzeigen</string>
+  <string name="blocked_call_settings_import_button">Importieren</string>
+  <string name="description_blocked_number_list_delete">Blockierung der Nummer aufheben</string>
+  <string name="addBlockedNumber">Nummer hinzufügen</string>
+  <string name="block_number_footer_message_vvm">Anrufe von diesen Nummern werden blockiert und Mailboxnachrichten automatisch gelöscht.</string>
+  <string name="block_number_footer_message_no_vvm">Anrufe von diesen Nummern werden blockiert. Die Anrufer haben aber unter Umständen weiterhin die Möglichkeit, dir Mailboxnachrichten zu hinterlassen.</string>
+  <string name="block_list">Blockierte Nummern</string>
+  <string name="alreadyBlocked">%1$s ist bereits blockiert.</string>
+  <string name="phone_account_settings_label">Anrufkonten</string>
+  <string name="permission_no_speeddial">Aktiviere die Berechtigung \"Kontakte\", um die Kurzwahlfunktion zu verwenden.</string>
+  <string name="permission_no_calllog">Aktiviere die Berechtigung \"Telefon\", um dein Anrufprotokoll abzurufen.</string>
+  <string name="permission_no_search">Aktiviere die Berechtigungen \"Kontakte\", um deine Kontakte zu suchen.</string>
+  <string name="permission_place_call">Aktiviere die Berechtigung \"Telefon\", um einen Anruf zu tätigen.</string>
+  <string name="toast_cannot_write_system_settings">Die App \"Telefon\" ist nicht berechtigt, die Systemeinstellungen zu überschreiben.</string>
+  <string name="blocked_number_call_log_label">Blockiert</string>
+  <string name="call_log_action_block_report_number">Blockieren/Spam melden</string>
+  <string name="call_log_action_block_number">Nummer blockieren</string>
+  <string name="call_log_action_remove_spam">Kein Spam</string>
+  <string name="call_log_action_unblock_number">Blockierung der Nummer aufheben</string>
+  <string name="spam_number_call_log_label">Spam</string>
+  <string name="call_composer_connection_failed">%1$s ist offline und nicht erreichbar</string>
+  <string name="about_phone_label">Info</string>
+  <string name="voicemail_transcription_branding_text">Transkribiert von Google</string>
+  <string name="voicemail_transcription_in_progress">Wird transkribiert…</string>
+  <string name="voicemail_transcription_failed">Transkript nicht verfügbar.</string>
+  <string name="voicemail_transcription_failed_language_not_supported">Transkript nicht verfügbar. Sprache wird nicht unterstützt.</string>
+  <string name="voicemail_transcription_failed_no_speech">Transkript nicht verfügbar. Keine Spracheingabe erkannt.</string>
+  <string name="voicemail_donation_promo_title">Möchtest du uns dabei helfen, die Transkriptionen zu verbessern?</string>
+  <string name="voicemail_donation_promo_content">Du kannst erlauben, dass Google diese und zukünftige Mailboxnachrichten mit Transkripten analysiert. Sie werden dazu anonym gespeichert. Du kannst die Einstellungen jederzeit ändern. %1$s</string>
+  <string name="voicemail_donation_promo_opt_in">OK</string>
+  <string name="voicemail_donation_promo_opt_out">Nein danke</string>
+  <string name="voicemail_transcription_rating">Qualität der Transkription bewerten</string>
+  <string name="voicemail_transcription_rating_thanks">Vielen Dank für dein Feedback</string>
+  <string name="description_rating_good">Gut</string>
+  <string name="description_rating_bad">Schlecht</string>
+  <string name="view_conversation">Ansehen</string>
+  <string name="ec_data_deleted">Anruf gelöscht. Du kannst in diesem Anruf geteilte Anhänge unter \"Nachrichten\" ansehen und löschen.</string>
+  <string name="multiple_ec_data_deleted">Anrufe gelöscht. Du kannst in diesen Anrufen geteilte Anhänge unter \"Nachrichten\" ansehen und löschen.</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-el/strings.xml b/java/com/android/dialer/app/res/values-el/strings.xml
index a8ecb38..24eaffb 100644
--- a/java/com/android/dialer/app/res/values-el/strings.xml
+++ b/java/com/android/dialer/app/res/values-el/strings.xml
@@ -1,179 +1,171 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="applicationLabel" msgid="2202739481132958990">"Τηλέφωνο"</string>
-    <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"Πληκτρολόγιο τηλεφώνου"</string>
-    <string name="callHistoryIconLabel" msgid="7493268743411968630">"Ιστορικό κλήσεων"</string>
-    <string name="action_copy_number_text" msgid="832682558551502319">"Αντιγραφή αριθμού"</string>
-    <string name="copy_transcript_text" msgid="937904189017310829">"Αντιγραφή μεταγραφής"</string>
-    <string name="action_edit_number_before_call" msgid="8017492815878473837">"Επεξεργασία αριθμού πριν την κλήση"</string>
-    <string name="call_log_delete_all" msgid="7852970926906523784">"Διαγραφή ιστορικού κλήσεων"</string>
-    <string name="call_log_trash_voicemail" msgid="6118493534178533972">"Διαγραφή αυτόματου τηλεφωνητή"</string>
-    <string name="snackbar_voicemail_deleted" msgid="7463166543725496307">"Μήν.αυτ. τηλ. διαγρ."</string>
-    <string name="snackbar_voicemail_deleted_undo" msgid="6959743982796409941">"ΑΝΑΙΡΕΣΗ"</string>
-    <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"Διαγραφή ιστορικού κλήσεων;"</string>
-    <string name="clearCallLogConfirmation" msgid="6844949465815109166">"Αυτό θα διαγράψει όλες τις κλήσεις από το ιστορικό σας"</string>
-    <string name="clearCallLogProgress_title" msgid="995004835687361977">"Διαγραφή ιστορικού κλήσεων…"</string>
-    <string name="notification_missedCallTitle" msgid="8283366068539898486">"Αναπάντητη κλήση"</string>
-    <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"Αναπάντητη κλήση εργασίας"</string>
-    <string name="notification_missedCallsTitle" msgid="3697442015345089802">"Αναπάντητες κλήσεις"</string>
-    <string name="notification_missedCallsMsg" msgid="8176217633929018706">"<xliff:g id="NUM_MISSED_CALLS">%d</xliff:g> αναπάντητες κλήσεις"</string>
-    <string name="notification_missedCall_call_back" msgid="3875698110051973965">"Επανάκληση"</string>
-    <string name="notification_missedCall_message" msgid="5086910028988305964">"Μήνυμα"</string>
-    <string name="post_call_notification_message" msgid="5417476789860590611">"<xliff:g id="NAME">%1$s</xliff:g>: <xliff:g id="MESSAGE">%2$s</xliff:g>"</string>
-    <string name="notification_voicemail_text_format" msgid="1895667520930252897">"Κλήση <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
-    <string name="notification_voicemail_no_vm_number" msgid="8942821987929495842">"Ο αριθμός αυτόματου τηλεφωνητή είναι άγνωστος"</string>
-    <plurals name="notification_voicemail_title" formatted="false" msgid="1551847434476438657">
-      <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> Μηνύματα αυτόμ. τηλεφωνητή </item>
-      <item quantity="one">Μήνυμα αυτόματου τηλεφωνητή</item>
-    </plurals>
-    <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
-    <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"Νέα μην. αυτ. τηλεφ. από <xliff:g id="CALLER">%1$s</xliff:g>"</string>
-    <string name="voicemail_playback_error" msgid="4384373852257757295">"Αδύνατη αναπαραγωγή φωνητικού μηνύματος"</string>
-    <string name="voicemail_fetching_content" msgid="572320120918636014">"Φόρτωση φωνητικών μηνυμάτων…"</string>
-    <string name="voicemail_fetching_timout" msgid="2128873915839949783">"Αδύνατη φόρτωση φωνητικών μηνυμάτων"</string>
-    <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_playback_speakerphone" msgid="4852027754869750227">"Ενεργοποίηση ή απενεργοποίηση μεγαφώνου"</string>
-    <string name="description_playback_seek" msgid="1340910573254132520">"Αναζήτηση θέσης αναπαραγωγής"</string>
-    <string name="action_menu_call_history_description" msgid="8829135306925008546">"Ιστορικό κλήσεων"</string>
-    <string name="action_menu_overflow_description" msgid="7648679686746517341">"Περισσότερες επιλογές"</string>
-    <string name="action_menu_dialpad_button" msgid="1970631633457493180">"πληκτρολόγιο"</string>
-    <string name="dialer_settings_label" msgid="4980176284150290175">"Ρυθμίσεις"</string>
-    <string name="simulator_submenu_label" msgid="186156287346615267">"Προσομοιωτής"</string>
-    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Δημ. νέας συντόμ. διεπαφής"</string>
-    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"Εισαγωγή στη λειτουργία μαζικών ενεργειών"</string>
-    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"Αποχώρηση από τη λειτουργία μαζικών ενεργειών"</string>
-    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"Έγινε επιλογή <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"Καταργήθηκε η επιλογή <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_contact_details" msgid="3341280873855253464">"Στοιχεία επικοινωνίας του <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_spam_contact_details" msgid="5592578752881528368">"Στοιχεία επικοινωνίας για πιθανώς ανεπιθύμητο καλούντα <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> κλήσεις."</string>
-    <string name="description_video_call" msgid="3738199365585751727">"Βιντεοκλήση."</string>
-    <string name="description_start_voice_search" msgid="8380022725973015261">"Έναρξη φωνητικής αναζήτησης"</string>
-    <string name="voicemail" msgid="8899540969000957954">"Αυτόματος τηλεφωνητής"</string>
-    <string name="description_cancel_multi_select" msgid="3930475950253360461">"Ακύρωση λειτουργίας μαζικών ενεργειών"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Διαγραφή"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Ακύρωση"</string>
-    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"Έχουν επιλεγεί <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
-      <item quantity="other">"<b>"Διαγραφή αυτών των μηνυμάτων αυτόματου τηλεφωνητή; "</b>"</item>
-      <item quantity="one">"<b>"Διαγραφή αυτού του μηνύματος αυτόματου τηλεφωνητή; "</b>"</item>
-    </plurals>
-    <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
-    <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> στις <xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
-    <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="voice_search_not_available" msgid="6546240433719732905">"Η φωνητική αναζήτηση δεν είναι διαθέσιμη"</string>
-    <string name="dialer_hint_find_contact" msgid="2023214799381149808">"Αναζήτηση επαφών"</string>
-    <string name="block_number_search_hint" msgid="5377706079015099416">"Προσθήκη αριθμού ή αναζήτηση επαφών"</string>
-    <string name="call_log_all_empty" msgid="3955572868518162004">"Το ιστορικό κλήσεων είναι κενό"</string>
-    <string name="call_log_all_empty_action" msgid="852218280136243014">"Πραγματοποίηση κλήσης"</string>
-    <string name="call_log_missed_empty" msgid="7094936030845062214">"Δεν υπάρχουν αναπάντητες κλήσεις."</string>
-    <string name="call_log_voicemail_empty" msgid="273623903423275178">"Ο φάκελος εισερχομένων του αυτόματου τηλεφωνητή σας είναι κενός."</string>
-    <string name="call_log_activity_title" msgid="1275242727244945527">"Ιστορικό κλήσεων"</string>
-    <string name="call_log_all_title" msgid="6042262422192020327">"Όλα"</string>
-    <string name="call_log_missed_title" msgid="17254005889268015">"Αναπάντητες"</string>
-    <string name="tab_speed_dial" msgid="6616404752227561075">"Γρήγορη κλήση"</string>
-    <string name="tab_history" msgid="7420269368689503596">"Ιστορικό κλήσεων"</string>
-    <string name="tab_all_contacts" msgid="5531733977693943015">"Επαφές"</string>
-    <string name="tab_voicemail" msgid="2458548090088316246">"Αυτόματος τηλεφωνητής"</string>
-    <string name="search_shortcut_call_number" msgid="8847918845036880688">"Κλήση <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"Δημιουργία νέας επαφής"</string>
-    <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"Προσθήκη σε μια επαφή"</string>
-    <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"Αποστολή SMS"</string>
-    <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"Πραγματοποίηση βιντεοκλήσης"</string>
-    <string name="search_shortcut_block_number" msgid="4587283230665805776">"Αποκλεισμός αριθμού"</string>
-    <string name="speed_dial_empty" msgid="3346406399966039505">"Δεν έχετε ορίσει ακόμη κάποια επαφή στις ταχείες κλήσεις"</string>
-    <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"Προσθέστε ένα αγαπημένο"</string>
-    <string name="remove_contact" msgid="2353580570488923668">"Κατάργηση"</string>
-    <string name="select_all" msgid="408601760696146245">"Επιλογή όλων"</string>
-    <string name="call_log_action_video_call" msgid="7565549950343850819">"Βιντεοκλήση"</string>
-    <string name="call_log_action_send_message" msgid="6948727362660115554">"Αποστολή μηνύματος"</string>
-    <string name="call_log_action_details" msgid="2091370737371449501">"Λεπτομέρειες κλήσης"</string>
-    <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"Αποστολή προς …"</string>
-    <string name="call_log_action_call" msgid="682724094251540583">"Κλήση <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_incoming_missed_call" msgid="8292535799379230029">"Αναπάντητη κλήση από <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_incoming_answered_call" msgid="3920182963103160610">"Ληφθείσα κλήση από <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_unread_voicemail" msgid="145170985013419170">"Μη αναγνωσμένο μήνυμα αυτόματου τηλεφωνητή από <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_read_voicemail" msgid="5585559881573227732">"Μήνυμα αυτόματου τηλεφωνητή από <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_outgoing_call" msgid="543952487882919924">"Κλήση προς <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="call_log_via_number" msgid="1340307109806397650">"μέσω <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> μέσω <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="description_call_action" msgid="4042796498169106545">"Κλήση <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_video_call_action" msgid="1237090968588659650">"Βιντεοκλήση <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
-    <string name="description_voicemail_action" msgid="3290143432403538524">"Ακρόαση μηνύματος αυτόματου τηλεφωνητή από το χρήστη <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_create_new_contact_action" msgid="1928282350281564130">"Δημιουργία επαφής για <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"Προσθήκη <xliff:g id="NAMEORNUMBER">^1</xliff:g> σε υπάρχουσα επαφή"</string>
-    <string name="description_details_action" msgid="2061866409737706174">"Λεπτομέρειες κλήσης για <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="call_log_header_today" msgid="1576119097475845293">"Σήμερα"</string>
-    <string name="call_log_header_yesterday" msgid="5616077776205329563">"Χθες"</string>
-    <string name="call_log_header_other" msgid="4940676886254217644">"Παλαιότερες"</string>
-    <string name="voicemail_speaker_on" msgid="3151333608926996668">"Ενεργοποίηση ηχείου."</string>
-    <string name="voicemail_speaker_off" msgid="2530064206962034201">"Απενεργοποίηση ηχείου."</string>
-    <string name="voicemail_play_start_pause" msgid="3874823480278334664">"Έναρξη ή παύση αναπαραγωγής."</string>
-    <string name="display_options_title" msgid="3880091801055797975">"Επιλογές εμφάνισης"</string>
-    <string name="sounds_and_vibration_title" msgid="3075050000721181384">"Ήχοι και δόνηση"</string>
-    <string name="accessibility_settings_title" msgid="3329027650429831820">"Προσβασιμότητα"</string>
-    <string name="ringtone_title" msgid="8377174189894648486">"Ήχος κλήσης τηλεφώνου"</string>
-    <string name="vibrate_on_ring_title" msgid="631441314790960485">"Δόνηση στις κλήσεις"</string>
-    <string name="dtmf_tone_enable_title" msgid="3273762431523939277">"Ήχοι πλήκτρων"</string>
-    <string name="dtmf_tone_length_title" msgid="534096029202438539">"Διάρκεια ήχων πλήκτρων"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="applicationLabel">Τηλέφωνο</string>
+  <string name="launcherDialpadActivityLabel">Πληκτρολόγιο τηλεφώνου</string>
+  <string name="callHistoryIconLabel">Ιστορικό κλήσεων</string>
+  <string name="action_copy_number_text">Αντιγραφή αριθμού</string>
+  <string name="copy_transcript_text">Αντιγραφή μεταγραφής</string>
+  <string name="action_edit_number_before_call">Επεξεργασία αριθμού πριν την κλήση</string>
+  <string name="call_log_delete_all">Διαγραφή ιστορικού κλήσεων</string>
+  <string name="call_log_trash_voicemail">Διαγραφή αυτόματου τηλεφωνητή</string>
+  <string name="snackbar_voicemail_deleted">Μήν.αυτ. τηλ. διαγρ.</string>
+  <string name="clearCallLogConfirmation_title">Διαγραφή ιστορικού κλήσεων;</string>
+  <string name="clearCallLogConfirmation">Αυτό θα διαγράψει όλες τις κλήσεις από το ιστορικό σας</string>
+  <string name="clearCallLogProgress_title">Διαγραφή ιστορικού κλήσεων…</string>
+  <string name="notification_missedCallTitle">Αναπάντητη κλήση</string>
+  <string name="notification_missedWorkCallTitle">Αναπάντητη κλήση εργασίας</string>
+  <string name="notification_missedCallsTitle">Αναπάντητες κλήσεις</string>
+  <string name="notification_missedCallsMsg">%d αναπάντητες κλήσεις</string>
+  <string name="notification_missedCall_call_back">Επανάκληση</string>
+  <string name="notification_missedCall_message">Μήνυμα</string>
+  <string name="post_call_notification_message">%1$s: %2$s</string>
+  <string name="notification_voicemail_text_format">Κλήση %s</string>
+  <string name="notification_voicemail_no_vm_number">Ο αριθμός αυτόματου τηλεφωνητή είναι άγνωστος</string>
+  <plurals name="notification_voicemail_title">
+    <item quantity="one">Μήνυμα αυτόματου τηλεφωνητή</item>
+    <item quantity="other"> %1$d Μηνύματα αυτόμ. τηλεφωνητή </item>
+  </plurals>
+  <string name="notification_voicemail_callers_list">%1$s, %2$s</string>
+  <string name="notification_new_voicemail_ticker">Νέα μην. αυτ. τηλεφ. από %1$s</string>
+  <string name="voicemail_playback_error">Αδύνατη αναπαραγωγή φωνητικού μηνύματος</string>
+  <string name="voicemail_fetching_content">Φόρτωση φωνητικών μηνυμάτων…</string>
+  <string name="voicemail_fetching_timout">Αδύνατη φόρτωση φωνητικών μηνυμάτων</string>
+  <string name="call_log_item_count_and_date">(%1$d) %2$s</string>
+  <string name="description_playback_speakerphone">Ενεργοποίηση ή απενεργοποίηση μεγαφώνου</string>
+  <string name="description_playback_seek">Αναζήτηση θέσης αναπαραγωγής</string>
+  <string name="action_menu_call_history_description">Ιστορικό κλήσεων</string>
+  <string msgid="2295659037509008453" name="action_menu_overflow_description">Περισσότερες επιλογές</string>
+  <string name="action_menu_dialpad_button">πληκτρολόγιο</string>
+  <string name="dialer_settings_label">Ρυθμίσεις</string>
+  <string name="simulator_submenu_label">Προσομοιωτής</string>
+  <string name="new_ui_launcher_shortcut_label">Δημ. νέας συντόμ. διεπαφής</string>
+  <string name="description_entering_bulk_action_mode">Εισαγωγή στη λειτουργία μαζικών ενεργειών</string>
+  <string name="description_leaving_bulk_action_mode">Αποχώρηση από τη λειτουργία μαζικών ενεργειών</string>
+  <string name="description_selecting_bulk_action_mode">Έγινε επιλογή %1$s</string>
+  <string name="description_unselecting_bulk_action_mode">Καταργήθηκε η επιλογή %1$s</string>
+  <string name="description_contact_details">Στοιχεία επικοινωνίας του %1$s</string>
+  <string name="description_spam_contact_details">Στοιχεία επικοινωνίας για πιθανώς ανεπιθύμητο καλούντα %1$s</string>
+  <string name="description_num_calls">%1$s κλήσεις.</string>
+  <string name="description_video_call">Βιντεοκλήση.</string>
+  <string name="description_start_voice_search">Έναρξη φωνητικής αναζήτησης</string>
+  <string name="voicemail">Αυτόματος τηλεφωνητής</string>
+  <string name="description_cancel_multi_select">Ακύρωση λειτουργίας μαζικών ενεργειών</string>
+  <string name="voicemailMultiSelectDeleteConfirm">Διαγραφή</string>
+  <string name="voicemailMultiSelectDeleteCancel">Ακύρωση</string>
+  <string name="voicemailMultiSelectActionBarTitle">Έχουν επιλεγεί %1$s</string>
+  <plurals name="delete_voicemails_confirmation_dialog_title">
+    <item quantity="one"><b>Διαγραφή αυτού του μηνύματος αυτόματου τηλεφωνητή; </b></item>
+    <item quantity="other"><b>Διαγραφή αυτών των μηνυμάτων αυτόματου τηλεφωνητή; </b></item>
+  </plurals>
+  <string name="voicemailCallLogToday">@string/call_log_header_today</string>
+  <string name="voicemailCallLogDateTimeFormat">%1$s στις %2$s</string>
+  <string name="voicemailDurationFormat">%1$02d:%2$02d</string>
+  <string name="voicemailCallLogDateTimeFormatWithDuration">%1$s • %2$s</string>
+  <string name="voice_search_not_available">Η φωνητική αναζήτηση δεν είναι διαθέσιμη</string>
+  <string name="dialer_hint_find_contact">Αναζήτηση επαφών</string>
+  <string name="block_number_search_hint">Προσθήκη αριθμού ή αναζήτηση επαφών</string>
+  <string name="call_log_all_empty">Το ιστορικό κλήσεων είναι κενό</string>
+  <string name="call_log_all_empty_action">Πραγματοποίηση κλήσης</string>
+  <string name="call_log_missed_empty">Δεν υπάρχουν αναπάντητες κλήσεις.</string>
+  <string name="call_log_voicemail_empty">Ο φάκελος εισερχομένων του αυτόματου τηλεφωνητή σας είναι κενός.</string>
+  <string name="call_log_activity_title">Ιστορικό κλήσεων</string>
+  <string name="call_log_all_title">Όλα</string>
+  <string name="call_log_missed_title">Αναπάντητες</string>
+  <string name="tab_speed_dial">Γρήγορη κλήση</string>
+  <string name="tab_history">Ιστορικό κλήσεων</string>
+  <string name="tab_all_contacts">Επαφές</string>
+  <string name="tab_voicemail">Αυτόματος τηλεφωνητής</string>
+  <string name="search_shortcut_call_number">Κλήση %s</string>
+  <string name="search_shortcut_create_new_contact">Δημιουργία νέας επαφής</string>
+  <string name="search_shortcut_add_to_contact">Προσθήκη σε μια επαφή</string>
+  <string name="search_shortcut_send_sms_message">Αποστολή SMS</string>
+  <string name="search_shortcut_make_video_call">Πραγματοποίηση βιντεοκλήσης</string>
+  <string name="search_shortcut_block_number">Αποκλεισμός αριθμού</string>
+  <string name="speed_dial_empty">Δεν έχετε ορίσει ακόμη κάποια επαφή στις ταχείες κλήσεις</string>
+  <string name="speed_dial_empty_add_favorite_action">Προσθέστε ένα αγαπημένο</string>
+  <string name="remove_contact">Κατάργηση</string>
+  <string name="select_all">Επιλογή όλων</string>
+  <string name="call_log_action_video_call">Βιντεοκλήση</string>
+  <string name="call_log_action_set_up_video">Ρύθμιση βιντεοκλήσεων</string>
+  <string name="call_log_action_invite_video">Πρόσκληση σε βιντεοκλήση</string>
+  <string name="call_log_action_send_message">Αποστολή μηνύματος</string>
+  <string name="call_log_action_details">Λεπτομέρειες κλήσης</string>
+  <string name="call_log_action_share_voicemail">Αποστολή προς …</string>
+  <string name="call_log_action_call">Κλήση ^1</string>
+  <string name="description_incoming_missed_call">Αναπάντητη κλήση από ^1, ^2, ^3, ^4.</string>
+  <string name="description_incoming_answered_call">Ληφθείσα κλήση από ^1, ^2, ^3, ^4.</string>
+  <string name="description_unread_voicemail">Μη αναγνωσμένο μήνυμα αυτόματου τηλεφωνητή από ^1, ^2, ^3, ^4.</string>
+  <string name="description_read_voicemail">Μήνυμα αυτόματου τηλεφωνητή από ^1, ^2, ^3, ^4.</string>
+  <string name="description_outgoing_call">Κλήση προς ^1, ^2, ^3, ^4.</string>
+  <string name="call_log_via_number">μέσω %1$s</string>
+  <string name="call_log_via_number_phone_account">%1$s μέσω %2$s</string>
+  <string name="description_call_action">Κλήση ^1</string>
+  <string name="description_video_call_action">Βιντεοκλήση ^1.</string>
+  <string name="description_voicemail_action">Ακρόαση μηνύματος αυτόματου τηλεφωνητή από το χρήστη ^1</string>
+  <string name="description_create_new_contact_action">Δημιουργία επαφής για ^1</string>
+  <string name="description_add_to_existing_contact_action">Προσθήκη ^1 σε υπάρχουσα επαφή</string>
+  <string name="description_details_action">Λεπτομέρειες κλήσης για ^1</string>
+  <string name="call_log_header_today">Σήμερα</string>
+  <string name="call_log_header_yesterday">Χθες</string>
+  <string name="call_log_header_other">Παλαιότερες</string>
+  <string name="voicemail_speaker_on">Ενεργοποίηση ηχείου.</string>
+  <string name="voicemail_speaker_off">Απενεργοποίηση ηχείου.</string>
+  <string name="voicemail_play_start_pause">Έναρξη ή παύση αναπαραγωγής.</string>
+  <string name="display_options_title">Επιλογές εμφάνισης</string>
+  <string name="sounds_and_vibration_title">Ήχοι και δόνηση</string>
+  <string name="accessibility_settings_title">Προσβασιμότητα</string>
+  <string name="ringtone_title">Ήχος κλήσης τηλεφώνου</string>
+  <string name="vibrate_on_ring_title">Δόνηση στις κλήσεις</string>
+  <string name="dtmf_tone_enable_title">Ήχοι πλήκτρων</string>
+  <string name="dtmf_tone_length_title">Διάρκεια ήχων πλήκτρων</string>
   <string-array name="dtmf_tone_length_entries">
-    <item msgid="3136353015227162823">"Κανονική"</item>
-    <item msgid="5376841175538523822">"Συνεχόμενος"</item>
+    <item>Κανονική</item>
+    <item>Συνεχόμενος</item>
   </string-array>
-    <string name="respond_via_sms_setting_title" msgid="8008181606657693452">"Γρήγορες απαντήσεις"</string>
-    <string name="call_settings_label" msgid="7824611757200960807">"Κλήσεις"</string>
-    <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Αποκλεισμός κλήσεων"</string>
-    <string name="voicemail_settings_label" msgid="4594299554519920570">"Αυτόματος τηλεφωνητής"</string>
-    <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Προσωρινά απενεργοποιημένη φραγή κλήσεων"</string>
-    <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Η φραγή κλήσεων έχει απενεργοποιηθεί προσωρινά επειδή επικοινωνήσατε με τις υπηρεσίες έκτακτης ανάγκης από αυτό το τηλέφωνο μέσα στις τελευταίες 48 ώρες. Θα ενεργοποιηθεί ξανά αυτόματα μόλις λήξει η περίοδος των 48 ωρών."</string>
-    <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Εισαγωγή αριθμών"</string>
-    <string name="blocked_call_settings_import_description" msgid="1819412052545228965">"Στο παρελθόν ρυθμίσατε ορισμένους καλούντες ώστε να αποστέλλονται αυτόματα στον τηλεφωνητή μέσω άλλων εφαρμογών."</string>
-    <string name="blocked_call_settings_view_numbers_button" msgid="3332727948554356704">"Προβολή αριθμών"</string>
-    <string name="blocked_call_settings_import_button" msgid="7319111700387470727">"Εισαγωγή"</string>
-    <string name="description_blocked_number_list_delete" msgid="2139644216858370740">"Κατάργηση αποκλεισμού αριθμού"</string>
-    <string name="addBlockedNumber" msgid="3053473735238295551">"Προσθήκη αριθμού"</string>
-    <string name="block_number_footer_message_vvm" msgid="7955326304033982368">"Οι κλήσεις από αυτούς τους αριθμούς θα αποκλείονται και τα μηνύματα στον αυτόματο τηλεφωνητή θα διαγράφονται αυτόματα."</string>
-    <string name="block_number_footer_message_no_vvm" msgid="1152684139070471665">"Οι κλήσεις από αυτούς τους αριθμούς θα αποκλείονται, αλλά ενδέχεται να λαμβάνετε από αυτούς μηνύματα στον αυτόματο τηλεφωνητή."</string>
-    <string name="block_list" msgid="4701585783411870782">"Αποκλεισμένοι αριθμοί"</string>
-    <string name="alreadyBlocked" msgid="5483253180532475653">"Ο αριθμός <xliff:g id="NUMBER">%1$s</xliff:g> αποκλείστηκε ήδη."</string>
-    <string name="phone_account_settings_label" msgid="8372485478006965920">"Λογαριασμοί κλήσης"</string>
-    <string name="permission_no_speeddial" msgid="8487215628510596753">"Για να ενεργοποιήσετε την ταχεία κλήση, ενεργοποιήστε την άδεια επαφών."</string>
-    <string name="permission_no_calllog" msgid="4053705651238775784">"Για να δείτε το αρχείο καταγραφής κλήσεών σας, ενεργοποιήστε την άδεια τηλεφώνου."</string>
-    <string name="permission_no_search" msgid="2424710404207193826">"Για να κάνετε αναζήτηση στις επαφές σας, ενεργοποιήστε τις άδειες \"Επαφές\"."</string>
-    <string name="permission_place_call" msgid="8686908130349369423">"Για να πραγματοποιήσετε μια κλήση, ενεργοποιήστε την άδεια τηλεφώνου."</string>
-    <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"Η εφαρμογή \"Τηλέφωνο\" δεν έχει άδεια εγγραφής στις ρυθμίσεις συστήματος."</string>
-    <string name="blocked_number_call_log_label" msgid="4212282846299997693">"Αποκλεισμένο"</string>
-    <string name="call_log_action_block_report_number" msgid="7302636538668696729">"Αποκλεισμός/αναφορά ανεπιθύμ."</string>
-    <string name="call_log_action_block_number" msgid="5048188386501998865">"Αποκλεισμός αριθμού"</string>
-    <string name="call_log_action_remove_spam" msgid="2045319806318398403">"Μη ανεπιθύμητος"</string>
-    <string name="call_log_action_unblock_number" msgid="6100117033288448758">"Κατάργηση αποκλεισμού αριθμού"</string>
-    <string name="spam_number_call_log_label" msgid="2678431398326811131">"Ανεπιθύμητα"</string>
-    <string name="call_composer_connection_failed" msgid="6776461585447831242">"Ο χρήστης <xliff:g id="NAME">%1$s</xliff:g> είναι εκτός σύνδεσης και δεν μπορείτε να έρθετε σε επικοινωνία μαζί του"</string>
-    <string name="about_phone_label" msgid="582991354677973731">"Πληροφορίες"</string>
-    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Μεταγραφή από την Google"</string>
-    <string name="voicemail_transcription_in_progress" msgid="2933320969613783210">"Μεταγραφή Google σε εξέλιξη…"</string>
-    <string name="voicemail_transcription_failed" msgid="335275303117412706">"Δεν υπάρχει διαθέσιμη μεταγραφή."</string>
-    <string name="voicemail_transcription_failed_language_not_supported" msgid="4210332591050562553">"Δεν υπάρχει διαθέσιμη μεταγραφή. Μη υποστηριζόμενη γλώσσα."</string>
-    <string name="voicemail_transcription_failed_no_speech" msgid="9093372879697874852">"Δεν υπάρχει διαθέσιμη μεταγραφή. Δεν εντοπίστηκε ομιλία."</string>
-    <string name="view_conversation" msgid="7895904782094119702">"Προβολή"</string>
-    <string name="ec_data_deleted" msgid="4794880345545827107">"Η κλήση διαγράφηκε. Προβάλετε και διαγράψτε τα συνημμένα που κοινοποιήθηκαν κατά τη διάρκεια αυτής της κλήσης στο Messages."</string>
-    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"Οι κλήσεις διαγράφηκαν. Προβάλετε και διαγράψτε τα συνημμένα που κοινοποιήθηκαν κατά τη διάρκεια αυτών των κλήσεων στο Messages."</string>
+  <string name="respond_via_sms_setting_title">Γρήγορες απαντήσεις</string>
+  <string name="call_settings_label">Κλήσεις</string>
+  <string name="manage_blocked_numbers_label">Αποκλεισμένοι αριθμοί</string>
+  <string name="voicemail_settings_label">Αυτόματος τηλεφωνητής</string>
+  <string name="blocked_numbers_disabled_emergency_header_label">Προσωρινά απενεργοποιημένη φραγή κλήσεων</string>
+  <string name="blocked_numbers_disabled_emergency_desc">Η φραγή κλήσεων έχει απενεργοποιηθεί προσωρινά επειδή επικοινωνήσατε με τις υπηρεσίες έκτακτης ανάγκης από αυτό το τηλέφωνο μέσα στις τελευταίες 48 ώρες. Θα ενεργοποιηθεί ξανά αυτόματα μόλις λήξει η περίοδος των 48 ωρών.</string>
+  <string name="import_send_to_voicemail_numbers_label">Εισαγωγή αριθμών</string>
+  <string name="blocked_call_settings_import_description">Στο παρελθόν ρυθμίσατε ορισμένους καλούντες ώστε να αποστέλλονται αυτόματα στον τηλεφωνητή μέσω άλλων εφαρμογών.</string>
+  <string name="blocked_call_settings_view_numbers_button">Προβολή αριθμών</string>
+  <string name="blocked_call_settings_import_button">Εισαγωγή</string>
+  <string name="description_blocked_number_list_delete">Κατάργηση αποκλεισμού αριθμού</string>
+  <string name="addBlockedNumber">Προσθήκη αριθμού</string>
+  <string name="block_number_footer_message_vvm">Οι κλήσεις από αυτούς τους αριθμούς θα αποκλείονται και τα μηνύματα στον αυτόματο τηλεφωνητή θα διαγράφονται αυτόματα.</string>
+  <string name="block_number_footer_message_no_vvm">Οι κλήσεις από αυτούς τους αριθμούς θα αποκλείονται, αλλά ενδέχεται να λαμβάνετε από αυτούς μηνύματα στον αυτόματο τηλεφωνητή.</string>
+  <string name="block_list">Αποκλεισμένοι αριθμοί</string>
+  <string name="alreadyBlocked">Ο αριθμός %1$s αποκλείστηκε ήδη.</string>
+  <string name="phone_account_settings_label">Λογαριασμοί κλήσης</string>
+  <string name="permission_no_speeddial">Για να ενεργοποιήσετε την ταχεία κλήση, ενεργοποιήστε την άδεια επαφών.</string>
+  <string name="permission_no_calllog">Για να δείτε το αρχείο καταγραφής κλήσεών σας, ενεργοποιήστε την άδεια τηλεφώνου.</string>
+  <string name="permission_no_search">Για να κάνετε αναζήτηση στις επαφές σας, ενεργοποιήστε τις άδειες \"Επαφές\".</string>
+  <string name="permission_place_call">Για να πραγματοποιήσετε μια κλήση, ενεργοποιήστε την άδεια τηλεφώνου.</string>
+  <string name="toast_cannot_write_system_settings">Η εφαρμογή \"Τηλέφωνο\" δεν έχει άδεια εγγραφής στις ρυθμίσεις συστήματος.</string>
+  <string name="blocked_number_call_log_label">Αποκλεισμένο</string>
+  <string name="call_log_action_block_report_number">Αποκλεισμός/αναφορά ανεπιθύμ.</string>
+  <string name="call_log_action_block_number">Αποκλεισμός αριθμού</string>
+  <string name="call_log_action_remove_spam">Μη ανεπιθύμητος</string>
+  <string name="call_log_action_unblock_number">Κατάργηση αποκλεισμού αριθμού</string>
+  <string name="spam_number_call_log_label">Ανεπιθύμητα</string>
+  <string name="call_composer_connection_failed">Ο χρήστης %1$s είναι εκτός σύνδεσης και δεν μπορείτε να έρθετε σε επικοινωνία μαζί του</string>
+  <string name="about_phone_label">Πληροφορίες</string>
+  <string name="voicemail_transcription_branding_text">Μεταγραφή από την Google</string>
+  <string name="voicemail_transcription_in_progress">Μεταγραφή…</string>
+  <string name="voicemail_transcription_failed">Δεν υπάρχει διαθέσιμη μεταγραφή.</string>
+  <string name="voicemail_transcription_failed_language_not_supported">Δεν υπάρχει διαθέσιμη μεταγραφή. Μη υποστηριζόμενη γλώσσα.</string>
+  <string name="voicemail_transcription_failed_no_speech">Δεν υπάρχει διαθέσιμη μεταγραφή. Δεν εντοπίστηκε ομιλία.</string>
+  <string name="voicemail_donation_promo_title">Θέλετε να βοηθήσετε στη βελτίωση της ακρίβειας της μεταγραφής;</string>
+  <string name="voicemail_donation_promo_content">Επιτρέψτε στην Google να ελέγξει αυτό, αλλά και τυχόν μελλοντικά μηνύματα φωνητικού ταχυδρομείου με μεταγραφή. Θα αποθηκευτούν ανώνυμα. Μπορείτε να αλλάξετε τις Ρυθμίσεις ανά πάσα στιγμή. %1$s</string>
+  <string name="voicemail_donation_promo_opt_in">Ναι, συμφωνώ</string>
+  <string name="voicemail_donation_promo_opt_out">Όχι, ευχαριστώ</string>
+  <string name="voicemail_transcription_rating">Αξιολόγ. ποιότητας μεταγραφής</string>
+  <string name="voicemail_transcription_rating_thanks">Ευχαριστούμε για τα σχόλιά σας</string>
+  <string name="description_rating_good">Μου αρέσει</string>
+  <string name="description_rating_bad">Δεν αρέσει</string>
+  <string name="view_conversation">Προβολή</string>
+  <string name="ec_data_deleted">Η κλήση διαγράφηκε. Προβάλετε και διαγράψτε τα συνημμένα που κοινοποιήθηκαν κατά τη διάρκεια αυτής της κλήσης στο Messages.</string>
+  <string name="multiple_ec_data_deleted">Οι κλήσεις διαγράφηκαν. Προβάλετε και διαγράψτε τα συνημμένα που κοινοποιήθηκαν κατά τη διάρκεια αυτών των κλήσεων στο Messages.</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-en-rAU/strings.xml b/java/com/android/dialer/app/res/values-en-rAU/strings.xml
index 8e8757f..65f56f1 100644
--- a/java/com/android/dialer/app/res/values-en-rAU/strings.xml
+++ b/java/com/android/dialer/app/res/values-en-rAU/strings.xml
@@ -1,179 +1,171 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="applicationLabel" msgid="2202739481132958990">"Phone"</string>
-    <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"Phone keypad"</string>
-    <string name="callHistoryIconLabel" msgid="7493268743411968630">"Call history"</string>
-    <string name="action_copy_number_text" msgid="832682558551502319">"Copy number"</string>
-    <string name="copy_transcript_text" msgid="937904189017310829">"Copy transcription"</string>
-    <string name="action_edit_number_before_call" msgid="8017492815878473837">"Edit number before call"</string>
-    <string name="call_log_delete_all" msgid="7852970926906523784">"Clear call history"</string>
-    <string name="call_log_trash_voicemail" msgid="6118493534178533972">"Delete voicemail"</string>
-    <string name="snackbar_voicemail_deleted" msgid="7463166543725496307">"Voicemail deleted"</string>
-    <string name="snackbar_voicemail_deleted_undo" msgid="6959743982796409941">"UNDO"</string>
-    <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"Clear call history?"</string>
-    <string name="clearCallLogConfirmation" msgid="6844949465815109166">"This will delete all calls from your history"</string>
-    <string name="clearCallLogProgress_title" msgid="995004835687361977">"Clearing call history…"</string>
-    <string name="notification_missedCallTitle" msgid="8283366068539898486">"Missed call"</string>
-    <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"Missed work call"</string>
-    <string name="notification_missedCallsTitle" msgid="3697442015345089802">"Missed calls"</string>
-    <string name="notification_missedCallsMsg" msgid="8176217633929018706">"<xliff:g id="NUM_MISSED_CALLS">%d</xliff:g> missed calls"</string>
-    <string name="notification_missedCall_call_back" msgid="3875698110051973965">"Call back"</string>
-    <string name="notification_missedCall_message" msgid="5086910028988305964">"Message"</string>
-    <string name="post_call_notification_message" msgid="5417476789860590611">"<xliff:g id="NAME">%1$s</xliff:g>: <xliff:g id="MESSAGE">%2$s</xliff:g>"</string>
-    <string name="notification_voicemail_text_format" msgid="1895667520930252897">"Dial <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
-    <string name="notification_voicemail_no_vm_number" msgid="8942821987929495842">"Voicemail number unknown"</string>
-    <plurals name="notification_voicemail_title" formatted="false" msgid="1551847434476438657">
-      <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> Voicemails </item>
-      <item quantity="one">Voicemail</item>
-    </plurals>
-    <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
-    <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"New voicemail from <xliff:g id="CALLER">%1$s</xliff:g>"</string>
-    <string name="voicemail_playback_error" msgid="4384373852257757295">"Couldn\'t play voicemail"</string>
-    <string name="voicemail_fetching_content" msgid="572320120918636014">"Loading voicemail…"</string>
-    <string name="voicemail_fetching_timout" msgid="2128873915839949783">"Couldn\'t load voicemail"</string>
-    <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_playback_speakerphone" msgid="4852027754869750227">"Switch on or off speakerphone"</string>
-    <string name="description_playback_seek" msgid="1340910573254132520">"Seek playback position"</string>
-    <string name="action_menu_call_history_description" msgid="8829135306925008546">"Call history"</string>
-    <string name="action_menu_overflow_description" msgid="7648679686746517341">"More options"</string>
-    <string name="action_menu_dialpad_button" msgid="1970631633457493180">"key pad"</string>
-    <string name="dialer_settings_label" msgid="4980176284150290175">"Settings"</string>
-    <string name="simulator_submenu_label" msgid="186156287346615267">"Simulator"</string>
-    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Create new UI shortcut"</string>
-    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"Entering bulk action mode"</string>
-    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"Left bulk action mode"</string>
-    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"Selected <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"Unselected <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_contact_details" msgid="3341280873855253464">"Contact details for <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_spam_contact_details" msgid="5592578752881528368">"Contact details for suspected spam caller <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> calls."</string>
-    <string name="description_video_call" msgid="3738199365585751727">"Video call."</string>
-    <string name="description_start_voice_search" msgid="8380022725973015261">"Start voice search"</string>
-    <string name="voicemail" msgid="8899540969000957954">"Voicemail"</string>
-    <string name="description_cancel_multi_select" msgid="3930475950253360461">"Cancel batch actions mode"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Delete"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Cancel"</string>
-    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> selected"</string>
-    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
-      <item quantity="other">"<b>"Delete these voicemails? "</b>"</item>
-      <item quantity="one">"<b>"Delete this voicemail? "</b>"</item>
-    </plurals>
-    <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
-    <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> at <xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
-    <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="voice_search_not_available" msgid="6546240433719732905">"Voice search not available"</string>
-    <string name="dialer_hint_find_contact" msgid="2023214799381149808">"Search contacts"</string>
-    <string name="block_number_search_hint" msgid="5377706079015099416">"Add number or search contacts"</string>
-    <string name="call_log_all_empty" msgid="3955572868518162004">"Your call history is empty"</string>
-    <string name="call_log_all_empty_action" msgid="852218280136243014">"Make a call"</string>
-    <string name="call_log_missed_empty" msgid="7094936030845062214">"You have no missed calls."</string>
-    <string name="call_log_voicemail_empty" msgid="273623903423275178">"Your voicemail inbox is empty."</string>
-    <string name="call_log_activity_title" msgid="1275242727244945527">"Call history"</string>
-    <string name="call_log_all_title" msgid="6042262422192020327">"All"</string>
-    <string name="call_log_missed_title" msgid="17254005889268015">"Missed"</string>
-    <string name="tab_speed_dial" msgid="6616404752227561075">"Speed dial"</string>
-    <string name="tab_history" msgid="7420269368689503596">"Call history"</string>
-    <string name="tab_all_contacts" msgid="5531733977693943015">"Contacts"</string>
-    <string name="tab_voicemail" msgid="2458548090088316246">"Voicemail"</string>
-    <string name="search_shortcut_call_number" msgid="8847918845036880688">"Call <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"Create new contact"</string>
-    <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"Add to a contact"</string>
-    <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"Send SMS"</string>
-    <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"Make video call"</string>
-    <string name="search_shortcut_block_number" msgid="4587283230665805776">"Block number"</string>
-    <string name="speed_dial_empty" msgid="3346406399966039505">"No one is on your speed dial yet"</string>
-    <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"Add a favourite"</string>
-    <string name="remove_contact" msgid="2353580570488923668">"Remove"</string>
-    <string name="select_all" msgid="408601760696146245">"Select all"</string>
-    <string name="call_log_action_video_call" msgid="7565549950343850819">"Video call"</string>
-    <string name="call_log_action_send_message" msgid="6948727362660115554">"Send a message"</string>
-    <string name="call_log_action_details" msgid="2091370737371449501">"Call details"</string>
-    <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"Send to…"</string>
-    <string name="call_log_action_call" msgid="682724094251540583">"Call <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_incoming_missed_call" msgid="8292535799379230029">"Missed call from <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_incoming_answered_call" msgid="3920182963103160610">"Answered call from <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_unread_voicemail" msgid="145170985013419170">"Unread voicemail from <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_read_voicemail" msgid="5585559881573227732">"Voicemail from <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_outgoing_call" msgid="543952487882919924">"Call to <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="call_log_via_number" msgid="1340307109806397650">"via <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, via <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="description_call_action" msgid="4042796498169106545">"Call <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_video_call_action" msgid="1237090968588659650">"Video call <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
-    <string name="description_voicemail_action" msgid="3290143432403538524">"Listen to voicemail from <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_create_new_contact_action" msgid="1928282350281564130">"Create contact for <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"Add <xliff:g id="NAMEORNUMBER">^1</xliff:g> to existing contact"</string>
-    <string name="description_details_action" msgid="2061866409737706174">"Call details for <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="call_log_header_today" msgid="1576119097475845293">"Today"</string>
-    <string name="call_log_header_yesterday" msgid="5616077776205329563">"Yesterday"</string>
-    <string name="call_log_header_other" msgid="4940676886254217644">"Older"</string>
-    <string name="voicemail_speaker_on" msgid="3151333608926996668">"Turn speaker on."</string>
-    <string name="voicemail_speaker_off" msgid="2530064206962034201">"Turn speaker off."</string>
-    <string name="voicemail_play_start_pause" msgid="3874823480278334664">"Start or pause playback."</string>
-    <string name="display_options_title" msgid="3880091801055797975">"Display options"</string>
-    <string name="sounds_and_vibration_title" msgid="3075050000721181384">"Sounds and vibration"</string>
-    <string name="accessibility_settings_title" msgid="3329027650429831820">"Accessibility"</string>
-    <string name="ringtone_title" msgid="8377174189894648486">"Phone ringtone"</string>
-    <string name="vibrate_on_ring_title" msgid="631441314790960485">"Also vibrate for calls"</string>
-    <string name="dtmf_tone_enable_title" msgid="3273762431523939277">"Keypad tones"</string>
-    <string name="dtmf_tone_length_title" msgid="534096029202438539">"Keypad tone length"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="applicationLabel">Phone</string>
+  <string name="launcherDialpadActivityLabel">Phone keypad</string>
+  <string name="callHistoryIconLabel">Call history</string>
+  <string name="action_copy_number_text">Copy number</string>
+  <string name="copy_transcript_text">Copy transcription</string>
+  <string name="action_edit_number_before_call">Edit number before call</string>
+  <string name="call_log_delete_all">Clear call history</string>
+  <string name="call_log_trash_voicemail">Delete voicemail</string>
+  <string name="snackbar_voicemail_deleted">Voicemail deleted</string>
+  <string name="clearCallLogConfirmation_title">Clear call history?</string>
+  <string name="clearCallLogConfirmation">This will delete all calls from your history</string>
+  <string name="clearCallLogProgress_title">Clearing call history…</string>
+  <string name="notification_missedCallTitle">Missed call</string>
+  <string name="notification_missedWorkCallTitle">Missed work call</string>
+  <string name="notification_missedCallsTitle">Missed calls</string>
+  <string name="notification_missedCallsMsg">%d missed calls</string>
+  <string name="notification_missedCall_call_back">Call back</string>
+  <string name="notification_missedCall_message">Message</string>
+  <string name="post_call_notification_message">%1$s: %2$s</string>
+  <string name="notification_voicemail_text_format">Dial %s</string>
+  <string name="notification_voicemail_no_vm_number">Voicemail number unknown</string>
+  <plurals name="notification_voicemail_title">
+    <item quantity="one">Voicemail</item>
+    <item quantity="other"> %1$d Voicemails </item>
+  </plurals>
+  <string name="notification_voicemail_callers_list">%1$s, %2$s</string>
+  <string name="notification_new_voicemail_ticker">New voicemail from %1$s</string>
+  <string name="voicemail_playback_error">Couldn\'t play voicemail</string>
+  <string name="voicemail_fetching_content">Loading voicemail…</string>
+  <string name="voicemail_fetching_timout">Couldn\'t load voicemail</string>
+  <string name="call_log_item_count_and_date">(%1$d) %2$s</string>
+  <string name="description_playback_speakerphone">Switch on or off speakerphone</string>
+  <string name="description_playback_seek">Seek playback position</string>
+  <string name="action_menu_call_history_description">Call history</string>
+  <string msgid="2295659037509008453" name="action_menu_overflow_description">More options</string>
+  <string name="action_menu_dialpad_button">key pad</string>
+  <string name="dialer_settings_label">Settings</string>
+  <string name="simulator_submenu_label">Simulator</string>
+  <string name="new_ui_launcher_shortcut_label">Create new UI shortcut</string>
+  <string name="description_entering_bulk_action_mode">Entering bulk action mode</string>
+  <string name="description_leaving_bulk_action_mode">Left bulk action mode</string>
+  <string name="description_selecting_bulk_action_mode">Selected %1$s</string>
+  <string name="description_unselecting_bulk_action_mode">Unselected %1$s</string>
+  <string name="description_contact_details">Contact details for %1$s</string>
+  <string name="description_spam_contact_details">Contact details for suspected spam caller %1$s</string>
+  <string name="description_num_calls">%1$s calls.</string>
+  <string name="description_video_call">Video call.</string>
+  <string name="description_start_voice_search">Start voice search</string>
+  <string name="voicemail">Voicemail</string>
+  <string name="description_cancel_multi_select">Cancel batch actions mode</string>
+  <string name="voicemailMultiSelectDeleteConfirm">Delete</string>
+  <string name="voicemailMultiSelectDeleteCancel">Cancel</string>
+  <string name="voicemailMultiSelectActionBarTitle">%1$s selected</string>
+  <plurals name="delete_voicemails_confirmation_dialog_title">
+    <item quantity="one"><b>Delete this voicemail? </b></item>
+    <item quantity="other"><b>Delete these voicemails? </b></item>
+  </plurals>
+  <string name="voicemailCallLogToday">@string/call_log_header_today</string>
+  <string name="voicemailCallLogDateTimeFormat">%1$s at %2$s</string>
+  <string name="voicemailDurationFormat">%1$02d:%2$02d</string>
+  <string name="voicemailCallLogDateTimeFormatWithDuration">%1$s • %2$s</string>
+  <string name="voice_search_not_available">Voice search not available</string>
+  <string name="dialer_hint_find_contact">Search contacts</string>
+  <string name="block_number_search_hint">Add number or search contacts</string>
+  <string name="call_log_all_empty">Your call history is empty</string>
+  <string name="call_log_all_empty_action">Make a call</string>
+  <string name="call_log_missed_empty">You have no missed calls.</string>
+  <string name="call_log_voicemail_empty">Your voicemail inbox is empty.</string>
+  <string name="call_log_activity_title">Call history</string>
+  <string name="call_log_all_title">All</string>
+  <string name="call_log_missed_title">Missed</string>
+  <string name="tab_speed_dial">Speed dial</string>
+  <string name="tab_history">Call history</string>
+  <string name="tab_all_contacts">Contacts</string>
+  <string name="tab_voicemail">Voicemail</string>
+  <string name="search_shortcut_call_number">Call %s</string>
+  <string name="search_shortcut_create_new_contact">Create new contact</string>
+  <string name="search_shortcut_add_to_contact">Add to a contact</string>
+  <string name="search_shortcut_send_sms_message">Send SMS</string>
+  <string name="search_shortcut_make_video_call">Make video call</string>
+  <string name="search_shortcut_block_number">Block number</string>
+  <string name="speed_dial_empty">No one is on your speed dial yet</string>
+  <string name="speed_dial_empty_add_favorite_action">Add a favourite</string>
+  <string name="remove_contact">Remove</string>
+  <string name="select_all">Select all</string>
+  <string name="call_log_action_video_call">Video call</string>
+  <string name="call_log_action_set_up_video">Set up video calling</string>
+  <string name="call_log_action_invite_video">Invite to video call</string>
+  <string name="call_log_action_send_message">Send a message</string>
+  <string name="call_log_action_details">Call details</string>
+  <string name="call_log_action_share_voicemail">Send to…</string>
+  <string name="call_log_action_call">Call ^1</string>
+  <string name="description_incoming_missed_call">Missed call from ^1, ^2, ^3, ^4.</string>
+  <string name="description_incoming_answered_call">Answered call from ^1, ^2, ^3, ^4.</string>
+  <string name="description_unread_voicemail">Unread voicemail from ^1, ^2, ^3, ^4.</string>
+  <string name="description_read_voicemail">Voicemail from ^1, ^2, ^3, ^4.</string>
+  <string name="description_outgoing_call">Call to ^1, ^2, ^3, ^4.</string>
+  <string name="call_log_via_number">via %1$s</string>
+  <string name="call_log_via_number_phone_account">%1$s, via %2$s</string>
+  <string name="description_call_action">Call ^1</string>
+  <string name="description_video_call_action">Video call ^1.</string>
+  <string name="description_voicemail_action">Listen to voicemail from ^1</string>
+  <string name="description_create_new_contact_action">Create contact for ^1</string>
+  <string name="description_add_to_existing_contact_action">Add ^1 to existing contact</string>
+  <string name="description_details_action">Call details for ^1</string>
+  <string name="call_log_header_today">Today</string>
+  <string name="call_log_header_yesterday">Yesterday</string>
+  <string name="call_log_header_other">Older</string>
+  <string name="voicemail_speaker_on">Turn speaker on.</string>
+  <string name="voicemail_speaker_off">Turn speaker off.</string>
+  <string name="voicemail_play_start_pause">Start or pause playback.</string>
+  <string name="display_options_title">Display options</string>
+  <string name="sounds_and_vibration_title">Sounds and vibration</string>
+  <string name="accessibility_settings_title">Accessibility</string>
+  <string name="ringtone_title">Phone ringtone</string>
+  <string name="vibrate_on_ring_title">Also vibrate for calls</string>
+  <string name="dtmf_tone_enable_title">Keypad tones</string>
+  <string name="dtmf_tone_length_title">Keypad tone length</string>
   <string-array name="dtmf_tone_length_entries">
-    <item msgid="3136353015227162823">"Normal"</item>
-    <item msgid="5376841175538523822">"Long"</item>
+    <item>Normal</item>
+    <item>Long</item>
   </string-array>
-    <string name="respond_via_sms_setting_title" msgid="8008181606657693452">"Quick responses"</string>
-    <string name="call_settings_label" msgid="7824611757200960807">"Calls"</string>
-    <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Call blocking"</string>
-    <string name="voicemail_settings_label" msgid="4594299554519920570">"Voicemail"</string>
-    <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Call blocking temporarily off"</string>
-    <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Call blocking has been disabled because you contacted emergency services from this phone within the last 48 hours. It will be automatically re-enabled once the 48 hour period expires."</string>
-    <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Import numbers"</string>
-    <string name="blocked_call_settings_import_description" msgid="1819412052545228965">"You previously marked some callers to be automatically sent to voicemail via other apps."</string>
-    <string name="blocked_call_settings_view_numbers_button" msgid="3332727948554356704">"View Numbers"</string>
-    <string name="blocked_call_settings_import_button" msgid="7319111700387470727">"Import"</string>
-    <string name="description_blocked_number_list_delete" msgid="2139644216858370740">"Unblock number"</string>
-    <string name="addBlockedNumber" msgid="3053473735238295551">"Add number"</string>
-    <string name="block_number_footer_message_vvm" msgid="7955326304033982368">"Calls from these numbers will be blocked and voicemails will be automatically deleted."</string>
-    <string name="block_number_footer_message_no_vvm" msgid="1152684139070471665">"Calls from these numbers will be blocked, but they may still be able to leave you voicemails."</string>
-    <string name="block_list" msgid="4701585783411870782">"Blocked numbers"</string>
-    <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g> is already blocked."</string>
-    <string name="phone_account_settings_label" msgid="8372485478006965920">"Calling accounts"</string>
-    <string name="permission_no_speeddial" msgid="8487215628510596753">"To enable speed dial, turn on the Contacts permission."</string>
-    <string name="permission_no_calllog" msgid="4053705651238775784">"To see your call log, turn on the Phone permission."</string>
-    <string name="permission_no_search" msgid="2424710404207193826">"To search your contacts, turn on the Contacts permissions."</string>
-    <string name="permission_place_call" msgid="8686908130349369423">"To place a call, turn on the Phone permission."</string>
-    <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"Phone app does not have permission to write to system settings."</string>
-    <string name="blocked_number_call_log_label" msgid="4212282846299997693">"Blocked"</string>
-    <string name="call_log_action_block_report_number" msgid="7302636538668696729">"Block/report spam"</string>
-    <string name="call_log_action_block_number" msgid="5048188386501998865">"Block number"</string>
-    <string name="call_log_action_remove_spam" msgid="2045319806318398403">"Not spam"</string>
-    <string name="call_log_action_unblock_number" msgid="6100117033288448758">"Unblock number"</string>
-    <string name="spam_number_call_log_label" msgid="2678431398326811131">"Spam"</string>
-    <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> is offline and can\'t be reached"</string>
-    <string name="about_phone_label" msgid="582991354677973731">"About"</string>
-    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Transcribed by Google"</string>
-    <string name="voicemail_transcription_in_progress" msgid="2933320969613783210">"Google is transcribing…"</string>
-    <string name="voicemail_transcription_failed" msgid="335275303117412706">"Transcript not available."</string>
-    <string name="voicemail_transcription_failed_language_not_supported" msgid="4210332591050562553">"Transcript not available. Language not supported."</string>
-    <string name="voicemail_transcription_failed_no_speech" msgid="9093372879697874852">"Transcript not available. No speech detected."</string>
-    <string name="view_conversation" msgid="7895904782094119702">"View"</string>
-    <string name="ec_data_deleted" msgid="4794880345545827107">"Call deleted. View and delete attachments shared during this call in Messages."</string>
-    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"Calls deleted. View and delete attachments shared during calls in Messages."</string>
+  <string name="respond_via_sms_setting_title">Quick responses</string>
+  <string name="call_settings_label">Calls</string>
+  <string name="manage_blocked_numbers_label">Blocked numbers</string>
+  <string name="voicemail_settings_label">Voicemail</string>
+  <string name="blocked_numbers_disabled_emergency_header_label">Call blocking temporarily off</string>
+  <string name="blocked_numbers_disabled_emergency_desc">Call blocking has been disabled because you contacted emergency services from this phone within the last 48 hours. It will be automatically re-enabled once the 48 hour period expires.</string>
+  <string name="import_send_to_voicemail_numbers_label">Import numbers</string>
+  <string name="blocked_call_settings_import_description">You previously marked some callers to be automatically sent to voicemail via other apps.</string>
+  <string name="blocked_call_settings_view_numbers_button">View Numbers</string>
+  <string name="blocked_call_settings_import_button">Import</string>
+  <string name="description_blocked_number_list_delete">Unblock number</string>
+  <string name="addBlockedNumber">Add number</string>
+  <string name="block_number_footer_message_vvm">Calls from these numbers will be blocked and voicemails will be automatically deleted.</string>
+  <string name="block_number_footer_message_no_vvm">Calls from these numbers will be blocked, but they may still be able to leave you voicemails.</string>
+  <string name="block_list">Blocked numbers</string>
+  <string name="alreadyBlocked">%1$s is already blocked.</string>
+  <string name="phone_account_settings_label">Calling accounts</string>
+  <string name="permission_no_speeddial">To enable speed dial, turn on the Contacts permission.</string>
+  <string name="permission_no_calllog">To see your call log, turn on the Phone permission.</string>
+  <string name="permission_no_search">To search your contacts, turn on the Contacts permissions.</string>
+  <string name="permission_place_call">To place a call, turn on the Phone permission.</string>
+  <string name="toast_cannot_write_system_settings">Phone app does not have permission to write to system settings.</string>
+  <string name="blocked_number_call_log_label">Blocked</string>
+  <string name="call_log_action_block_report_number">Block/report spam</string>
+  <string name="call_log_action_block_number">Block number</string>
+  <string name="call_log_action_remove_spam">Not spam</string>
+  <string name="call_log_action_unblock_number">Unblock number</string>
+  <string name="spam_number_call_log_label">Spam</string>
+  <string name="call_composer_connection_failed">%1$s is offline and can\'t be reached</string>
+  <string name="about_phone_label">About</string>
+  <string name="voicemail_transcription_branding_text">Transcribed by Google</string>
+  <string name="voicemail_transcription_in_progress">Transcribing…</string>
+  <string name="voicemail_transcription_failed">Transcript not available.</string>
+  <string name="voicemail_transcription_failed_language_not_supported">Transcript not available. Language not supported.</string>
+  <string name="voicemail_transcription_failed_no_speech">Transcript not available. No speech detected.</string>
+  <string name="voicemail_donation_promo_title">Help improve transcription accuracy?</string>
+  <string name="voicemail_donation_promo_content">Let Google review this and future voicemail messages with transcripts. They\'ll be stored anonymously. Change Settings at any time. %1$s</string>
+  <string name="voicemail_donation_promo_opt_in">Yes, I\'m in</string>
+  <string name="voicemail_donation_promo_opt_out">No thanks</string>
+  <string name="voicemail_transcription_rating">Rate transcription quality</string>
+  <string name="voicemail_transcription_rating_thanks">Thanks for your feedback</string>
+  <string name="description_rating_good">Like</string>
+  <string name="description_rating_bad">Dislike</string>
+  <string name="view_conversation">View</string>
+  <string name="ec_data_deleted">Call deleted. View and delete attachments shared during this call in Messages.</string>
+  <string name="multiple_ec_data_deleted">Calls deleted. View and delete attachments shared during calls in Messages.</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-en-rGB/strings.xml b/java/com/android/dialer/app/res/values-en-rGB/strings.xml
index 8e8757f..65f56f1 100644
--- a/java/com/android/dialer/app/res/values-en-rGB/strings.xml
+++ b/java/com/android/dialer/app/res/values-en-rGB/strings.xml
@@ -1,179 +1,171 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="applicationLabel" msgid="2202739481132958990">"Phone"</string>
-    <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"Phone keypad"</string>
-    <string name="callHistoryIconLabel" msgid="7493268743411968630">"Call history"</string>
-    <string name="action_copy_number_text" msgid="832682558551502319">"Copy number"</string>
-    <string name="copy_transcript_text" msgid="937904189017310829">"Copy transcription"</string>
-    <string name="action_edit_number_before_call" msgid="8017492815878473837">"Edit number before call"</string>
-    <string name="call_log_delete_all" msgid="7852970926906523784">"Clear call history"</string>
-    <string name="call_log_trash_voicemail" msgid="6118493534178533972">"Delete voicemail"</string>
-    <string name="snackbar_voicemail_deleted" msgid="7463166543725496307">"Voicemail deleted"</string>
-    <string name="snackbar_voicemail_deleted_undo" msgid="6959743982796409941">"UNDO"</string>
-    <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"Clear call history?"</string>
-    <string name="clearCallLogConfirmation" msgid="6844949465815109166">"This will delete all calls from your history"</string>
-    <string name="clearCallLogProgress_title" msgid="995004835687361977">"Clearing call history…"</string>
-    <string name="notification_missedCallTitle" msgid="8283366068539898486">"Missed call"</string>
-    <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"Missed work call"</string>
-    <string name="notification_missedCallsTitle" msgid="3697442015345089802">"Missed calls"</string>
-    <string name="notification_missedCallsMsg" msgid="8176217633929018706">"<xliff:g id="NUM_MISSED_CALLS">%d</xliff:g> missed calls"</string>
-    <string name="notification_missedCall_call_back" msgid="3875698110051973965">"Call back"</string>
-    <string name="notification_missedCall_message" msgid="5086910028988305964">"Message"</string>
-    <string name="post_call_notification_message" msgid="5417476789860590611">"<xliff:g id="NAME">%1$s</xliff:g>: <xliff:g id="MESSAGE">%2$s</xliff:g>"</string>
-    <string name="notification_voicemail_text_format" msgid="1895667520930252897">"Dial <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
-    <string name="notification_voicemail_no_vm_number" msgid="8942821987929495842">"Voicemail number unknown"</string>
-    <plurals name="notification_voicemail_title" formatted="false" msgid="1551847434476438657">
-      <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> Voicemails </item>
-      <item quantity="one">Voicemail</item>
-    </plurals>
-    <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
-    <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"New voicemail from <xliff:g id="CALLER">%1$s</xliff:g>"</string>
-    <string name="voicemail_playback_error" msgid="4384373852257757295">"Couldn\'t play voicemail"</string>
-    <string name="voicemail_fetching_content" msgid="572320120918636014">"Loading voicemail…"</string>
-    <string name="voicemail_fetching_timout" msgid="2128873915839949783">"Couldn\'t load voicemail"</string>
-    <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_playback_speakerphone" msgid="4852027754869750227">"Switch on or off speakerphone"</string>
-    <string name="description_playback_seek" msgid="1340910573254132520">"Seek playback position"</string>
-    <string name="action_menu_call_history_description" msgid="8829135306925008546">"Call history"</string>
-    <string name="action_menu_overflow_description" msgid="7648679686746517341">"More options"</string>
-    <string name="action_menu_dialpad_button" msgid="1970631633457493180">"key pad"</string>
-    <string name="dialer_settings_label" msgid="4980176284150290175">"Settings"</string>
-    <string name="simulator_submenu_label" msgid="186156287346615267">"Simulator"</string>
-    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Create new UI shortcut"</string>
-    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"Entering bulk action mode"</string>
-    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"Left bulk action mode"</string>
-    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"Selected <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"Unselected <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_contact_details" msgid="3341280873855253464">"Contact details for <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_spam_contact_details" msgid="5592578752881528368">"Contact details for suspected spam caller <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> calls."</string>
-    <string name="description_video_call" msgid="3738199365585751727">"Video call."</string>
-    <string name="description_start_voice_search" msgid="8380022725973015261">"Start voice search"</string>
-    <string name="voicemail" msgid="8899540969000957954">"Voicemail"</string>
-    <string name="description_cancel_multi_select" msgid="3930475950253360461">"Cancel batch actions mode"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Delete"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Cancel"</string>
-    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> selected"</string>
-    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
-      <item quantity="other">"<b>"Delete these voicemails? "</b>"</item>
-      <item quantity="one">"<b>"Delete this voicemail? "</b>"</item>
-    </plurals>
-    <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
-    <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> at <xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
-    <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="voice_search_not_available" msgid="6546240433719732905">"Voice search not available"</string>
-    <string name="dialer_hint_find_contact" msgid="2023214799381149808">"Search contacts"</string>
-    <string name="block_number_search_hint" msgid="5377706079015099416">"Add number or search contacts"</string>
-    <string name="call_log_all_empty" msgid="3955572868518162004">"Your call history is empty"</string>
-    <string name="call_log_all_empty_action" msgid="852218280136243014">"Make a call"</string>
-    <string name="call_log_missed_empty" msgid="7094936030845062214">"You have no missed calls."</string>
-    <string name="call_log_voicemail_empty" msgid="273623903423275178">"Your voicemail inbox is empty."</string>
-    <string name="call_log_activity_title" msgid="1275242727244945527">"Call history"</string>
-    <string name="call_log_all_title" msgid="6042262422192020327">"All"</string>
-    <string name="call_log_missed_title" msgid="17254005889268015">"Missed"</string>
-    <string name="tab_speed_dial" msgid="6616404752227561075">"Speed dial"</string>
-    <string name="tab_history" msgid="7420269368689503596">"Call history"</string>
-    <string name="tab_all_contacts" msgid="5531733977693943015">"Contacts"</string>
-    <string name="tab_voicemail" msgid="2458548090088316246">"Voicemail"</string>
-    <string name="search_shortcut_call_number" msgid="8847918845036880688">"Call <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"Create new contact"</string>
-    <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"Add to a contact"</string>
-    <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"Send SMS"</string>
-    <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"Make video call"</string>
-    <string name="search_shortcut_block_number" msgid="4587283230665805776">"Block number"</string>
-    <string name="speed_dial_empty" msgid="3346406399966039505">"No one is on your speed dial yet"</string>
-    <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"Add a favourite"</string>
-    <string name="remove_contact" msgid="2353580570488923668">"Remove"</string>
-    <string name="select_all" msgid="408601760696146245">"Select all"</string>
-    <string name="call_log_action_video_call" msgid="7565549950343850819">"Video call"</string>
-    <string name="call_log_action_send_message" msgid="6948727362660115554">"Send a message"</string>
-    <string name="call_log_action_details" msgid="2091370737371449501">"Call details"</string>
-    <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"Send to…"</string>
-    <string name="call_log_action_call" msgid="682724094251540583">"Call <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_incoming_missed_call" msgid="8292535799379230029">"Missed call from <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_incoming_answered_call" msgid="3920182963103160610">"Answered call from <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_unread_voicemail" msgid="145170985013419170">"Unread voicemail from <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_read_voicemail" msgid="5585559881573227732">"Voicemail from <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_outgoing_call" msgid="543952487882919924">"Call to <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="call_log_via_number" msgid="1340307109806397650">"via <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, via <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="description_call_action" msgid="4042796498169106545">"Call <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_video_call_action" msgid="1237090968588659650">"Video call <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
-    <string name="description_voicemail_action" msgid="3290143432403538524">"Listen to voicemail from <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_create_new_contact_action" msgid="1928282350281564130">"Create contact for <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"Add <xliff:g id="NAMEORNUMBER">^1</xliff:g> to existing contact"</string>
-    <string name="description_details_action" msgid="2061866409737706174">"Call details for <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="call_log_header_today" msgid="1576119097475845293">"Today"</string>
-    <string name="call_log_header_yesterday" msgid="5616077776205329563">"Yesterday"</string>
-    <string name="call_log_header_other" msgid="4940676886254217644">"Older"</string>
-    <string name="voicemail_speaker_on" msgid="3151333608926996668">"Turn speaker on."</string>
-    <string name="voicemail_speaker_off" msgid="2530064206962034201">"Turn speaker off."</string>
-    <string name="voicemail_play_start_pause" msgid="3874823480278334664">"Start or pause playback."</string>
-    <string name="display_options_title" msgid="3880091801055797975">"Display options"</string>
-    <string name="sounds_and_vibration_title" msgid="3075050000721181384">"Sounds and vibration"</string>
-    <string name="accessibility_settings_title" msgid="3329027650429831820">"Accessibility"</string>
-    <string name="ringtone_title" msgid="8377174189894648486">"Phone ringtone"</string>
-    <string name="vibrate_on_ring_title" msgid="631441314790960485">"Also vibrate for calls"</string>
-    <string name="dtmf_tone_enable_title" msgid="3273762431523939277">"Keypad tones"</string>
-    <string name="dtmf_tone_length_title" msgid="534096029202438539">"Keypad tone length"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="applicationLabel">Phone</string>
+  <string name="launcherDialpadActivityLabel">Phone keypad</string>
+  <string name="callHistoryIconLabel">Call history</string>
+  <string name="action_copy_number_text">Copy number</string>
+  <string name="copy_transcript_text">Copy transcription</string>
+  <string name="action_edit_number_before_call">Edit number before call</string>
+  <string name="call_log_delete_all">Clear call history</string>
+  <string name="call_log_trash_voicemail">Delete voicemail</string>
+  <string name="snackbar_voicemail_deleted">Voicemail deleted</string>
+  <string name="clearCallLogConfirmation_title">Clear call history?</string>
+  <string name="clearCallLogConfirmation">This will delete all calls from your history</string>
+  <string name="clearCallLogProgress_title">Clearing call history…</string>
+  <string name="notification_missedCallTitle">Missed call</string>
+  <string name="notification_missedWorkCallTitle">Missed work call</string>
+  <string name="notification_missedCallsTitle">Missed calls</string>
+  <string name="notification_missedCallsMsg">%d missed calls</string>
+  <string name="notification_missedCall_call_back">Call back</string>
+  <string name="notification_missedCall_message">Message</string>
+  <string name="post_call_notification_message">%1$s: %2$s</string>
+  <string name="notification_voicemail_text_format">Dial %s</string>
+  <string name="notification_voicemail_no_vm_number">Voicemail number unknown</string>
+  <plurals name="notification_voicemail_title">
+    <item quantity="one">Voicemail</item>
+    <item quantity="other"> %1$d Voicemails </item>
+  </plurals>
+  <string name="notification_voicemail_callers_list">%1$s, %2$s</string>
+  <string name="notification_new_voicemail_ticker">New voicemail from %1$s</string>
+  <string name="voicemail_playback_error">Couldn\'t play voicemail</string>
+  <string name="voicemail_fetching_content">Loading voicemail…</string>
+  <string name="voicemail_fetching_timout">Couldn\'t load voicemail</string>
+  <string name="call_log_item_count_and_date">(%1$d) %2$s</string>
+  <string name="description_playback_speakerphone">Switch on or off speakerphone</string>
+  <string name="description_playback_seek">Seek playback position</string>
+  <string name="action_menu_call_history_description">Call history</string>
+  <string msgid="2295659037509008453" name="action_menu_overflow_description">More options</string>
+  <string name="action_menu_dialpad_button">key pad</string>
+  <string name="dialer_settings_label">Settings</string>
+  <string name="simulator_submenu_label">Simulator</string>
+  <string name="new_ui_launcher_shortcut_label">Create new UI shortcut</string>
+  <string name="description_entering_bulk_action_mode">Entering bulk action mode</string>
+  <string name="description_leaving_bulk_action_mode">Left bulk action mode</string>
+  <string name="description_selecting_bulk_action_mode">Selected %1$s</string>
+  <string name="description_unselecting_bulk_action_mode">Unselected %1$s</string>
+  <string name="description_contact_details">Contact details for %1$s</string>
+  <string name="description_spam_contact_details">Contact details for suspected spam caller %1$s</string>
+  <string name="description_num_calls">%1$s calls.</string>
+  <string name="description_video_call">Video call.</string>
+  <string name="description_start_voice_search">Start voice search</string>
+  <string name="voicemail">Voicemail</string>
+  <string name="description_cancel_multi_select">Cancel batch actions mode</string>
+  <string name="voicemailMultiSelectDeleteConfirm">Delete</string>
+  <string name="voicemailMultiSelectDeleteCancel">Cancel</string>
+  <string name="voicemailMultiSelectActionBarTitle">%1$s selected</string>
+  <plurals name="delete_voicemails_confirmation_dialog_title">
+    <item quantity="one"><b>Delete this voicemail? </b></item>
+    <item quantity="other"><b>Delete these voicemails? </b></item>
+  </plurals>
+  <string name="voicemailCallLogToday">@string/call_log_header_today</string>
+  <string name="voicemailCallLogDateTimeFormat">%1$s at %2$s</string>
+  <string name="voicemailDurationFormat">%1$02d:%2$02d</string>
+  <string name="voicemailCallLogDateTimeFormatWithDuration">%1$s • %2$s</string>
+  <string name="voice_search_not_available">Voice search not available</string>
+  <string name="dialer_hint_find_contact">Search contacts</string>
+  <string name="block_number_search_hint">Add number or search contacts</string>
+  <string name="call_log_all_empty">Your call history is empty</string>
+  <string name="call_log_all_empty_action">Make a call</string>
+  <string name="call_log_missed_empty">You have no missed calls.</string>
+  <string name="call_log_voicemail_empty">Your voicemail inbox is empty.</string>
+  <string name="call_log_activity_title">Call history</string>
+  <string name="call_log_all_title">All</string>
+  <string name="call_log_missed_title">Missed</string>
+  <string name="tab_speed_dial">Speed dial</string>
+  <string name="tab_history">Call history</string>
+  <string name="tab_all_contacts">Contacts</string>
+  <string name="tab_voicemail">Voicemail</string>
+  <string name="search_shortcut_call_number">Call %s</string>
+  <string name="search_shortcut_create_new_contact">Create new contact</string>
+  <string name="search_shortcut_add_to_contact">Add to a contact</string>
+  <string name="search_shortcut_send_sms_message">Send SMS</string>
+  <string name="search_shortcut_make_video_call">Make video call</string>
+  <string name="search_shortcut_block_number">Block number</string>
+  <string name="speed_dial_empty">No one is on your speed dial yet</string>
+  <string name="speed_dial_empty_add_favorite_action">Add a favourite</string>
+  <string name="remove_contact">Remove</string>
+  <string name="select_all">Select all</string>
+  <string name="call_log_action_video_call">Video call</string>
+  <string name="call_log_action_set_up_video">Set up video calling</string>
+  <string name="call_log_action_invite_video">Invite to video call</string>
+  <string name="call_log_action_send_message">Send a message</string>
+  <string name="call_log_action_details">Call details</string>
+  <string name="call_log_action_share_voicemail">Send to…</string>
+  <string name="call_log_action_call">Call ^1</string>
+  <string name="description_incoming_missed_call">Missed call from ^1, ^2, ^3, ^4.</string>
+  <string name="description_incoming_answered_call">Answered call from ^1, ^2, ^3, ^4.</string>
+  <string name="description_unread_voicemail">Unread voicemail from ^1, ^2, ^3, ^4.</string>
+  <string name="description_read_voicemail">Voicemail from ^1, ^2, ^3, ^4.</string>
+  <string name="description_outgoing_call">Call to ^1, ^2, ^3, ^4.</string>
+  <string name="call_log_via_number">via %1$s</string>
+  <string name="call_log_via_number_phone_account">%1$s, via %2$s</string>
+  <string name="description_call_action">Call ^1</string>
+  <string name="description_video_call_action">Video call ^1.</string>
+  <string name="description_voicemail_action">Listen to voicemail from ^1</string>
+  <string name="description_create_new_contact_action">Create contact for ^1</string>
+  <string name="description_add_to_existing_contact_action">Add ^1 to existing contact</string>
+  <string name="description_details_action">Call details for ^1</string>
+  <string name="call_log_header_today">Today</string>
+  <string name="call_log_header_yesterday">Yesterday</string>
+  <string name="call_log_header_other">Older</string>
+  <string name="voicemail_speaker_on">Turn speaker on.</string>
+  <string name="voicemail_speaker_off">Turn speaker off.</string>
+  <string name="voicemail_play_start_pause">Start or pause playback.</string>
+  <string name="display_options_title">Display options</string>
+  <string name="sounds_and_vibration_title">Sounds and vibration</string>
+  <string name="accessibility_settings_title">Accessibility</string>
+  <string name="ringtone_title">Phone ringtone</string>
+  <string name="vibrate_on_ring_title">Also vibrate for calls</string>
+  <string name="dtmf_tone_enable_title">Keypad tones</string>
+  <string name="dtmf_tone_length_title">Keypad tone length</string>
   <string-array name="dtmf_tone_length_entries">
-    <item msgid="3136353015227162823">"Normal"</item>
-    <item msgid="5376841175538523822">"Long"</item>
+    <item>Normal</item>
+    <item>Long</item>
   </string-array>
-    <string name="respond_via_sms_setting_title" msgid="8008181606657693452">"Quick responses"</string>
-    <string name="call_settings_label" msgid="7824611757200960807">"Calls"</string>
-    <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Call blocking"</string>
-    <string name="voicemail_settings_label" msgid="4594299554519920570">"Voicemail"</string>
-    <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Call blocking temporarily off"</string>
-    <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Call blocking has been disabled because you contacted emergency services from this phone within the last 48 hours. It will be automatically re-enabled once the 48 hour period expires."</string>
-    <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Import numbers"</string>
-    <string name="blocked_call_settings_import_description" msgid="1819412052545228965">"You previously marked some callers to be automatically sent to voicemail via other apps."</string>
-    <string name="blocked_call_settings_view_numbers_button" msgid="3332727948554356704">"View Numbers"</string>
-    <string name="blocked_call_settings_import_button" msgid="7319111700387470727">"Import"</string>
-    <string name="description_blocked_number_list_delete" msgid="2139644216858370740">"Unblock number"</string>
-    <string name="addBlockedNumber" msgid="3053473735238295551">"Add number"</string>
-    <string name="block_number_footer_message_vvm" msgid="7955326304033982368">"Calls from these numbers will be blocked and voicemails will be automatically deleted."</string>
-    <string name="block_number_footer_message_no_vvm" msgid="1152684139070471665">"Calls from these numbers will be blocked, but they may still be able to leave you voicemails."</string>
-    <string name="block_list" msgid="4701585783411870782">"Blocked numbers"</string>
-    <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g> is already blocked."</string>
-    <string name="phone_account_settings_label" msgid="8372485478006965920">"Calling accounts"</string>
-    <string name="permission_no_speeddial" msgid="8487215628510596753">"To enable speed dial, turn on the Contacts permission."</string>
-    <string name="permission_no_calllog" msgid="4053705651238775784">"To see your call log, turn on the Phone permission."</string>
-    <string name="permission_no_search" msgid="2424710404207193826">"To search your contacts, turn on the Contacts permissions."</string>
-    <string name="permission_place_call" msgid="8686908130349369423">"To place a call, turn on the Phone permission."</string>
-    <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"Phone app does not have permission to write to system settings."</string>
-    <string name="blocked_number_call_log_label" msgid="4212282846299997693">"Blocked"</string>
-    <string name="call_log_action_block_report_number" msgid="7302636538668696729">"Block/report spam"</string>
-    <string name="call_log_action_block_number" msgid="5048188386501998865">"Block number"</string>
-    <string name="call_log_action_remove_spam" msgid="2045319806318398403">"Not spam"</string>
-    <string name="call_log_action_unblock_number" msgid="6100117033288448758">"Unblock number"</string>
-    <string name="spam_number_call_log_label" msgid="2678431398326811131">"Spam"</string>
-    <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> is offline and can\'t be reached"</string>
-    <string name="about_phone_label" msgid="582991354677973731">"About"</string>
-    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Transcribed by Google"</string>
-    <string name="voicemail_transcription_in_progress" msgid="2933320969613783210">"Google is transcribing…"</string>
-    <string name="voicemail_transcription_failed" msgid="335275303117412706">"Transcript not available."</string>
-    <string name="voicemail_transcription_failed_language_not_supported" msgid="4210332591050562553">"Transcript not available. Language not supported."</string>
-    <string name="voicemail_transcription_failed_no_speech" msgid="9093372879697874852">"Transcript not available. No speech detected."</string>
-    <string name="view_conversation" msgid="7895904782094119702">"View"</string>
-    <string name="ec_data_deleted" msgid="4794880345545827107">"Call deleted. View and delete attachments shared during this call in Messages."</string>
-    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"Calls deleted. View and delete attachments shared during calls in Messages."</string>
+  <string name="respond_via_sms_setting_title">Quick responses</string>
+  <string name="call_settings_label">Calls</string>
+  <string name="manage_blocked_numbers_label">Blocked numbers</string>
+  <string name="voicemail_settings_label">Voicemail</string>
+  <string name="blocked_numbers_disabled_emergency_header_label">Call blocking temporarily off</string>
+  <string name="blocked_numbers_disabled_emergency_desc">Call blocking has been disabled because you contacted emergency services from this phone within the last 48 hours. It will be automatically re-enabled once the 48 hour period expires.</string>
+  <string name="import_send_to_voicemail_numbers_label">Import numbers</string>
+  <string name="blocked_call_settings_import_description">You previously marked some callers to be automatically sent to voicemail via other apps.</string>
+  <string name="blocked_call_settings_view_numbers_button">View Numbers</string>
+  <string name="blocked_call_settings_import_button">Import</string>
+  <string name="description_blocked_number_list_delete">Unblock number</string>
+  <string name="addBlockedNumber">Add number</string>
+  <string name="block_number_footer_message_vvm">Calls from these numbers will be blocked and voicemails will be automatically deleted.</string>
+  <string name="block_number_footer_message_no_vvm">Calls from these numbers will be blocked, but they may still be able to leave you voicemails.</string>
+  <string name="block_list">Blocked numbers</string>
+  <string name="alreadyBlocked">%1$s is already blocked.</string>
+  <string name="phone_account_settings_label">Calling accounts</string>
+  <string name="permission_no_speeddial">To enable speed dial, turn on the Contacts permission.</string>
+  <string name="permission_no_calllog">To see your call log, turn on the Phone permission.</string>
+  <string name="permission_no_search">To search your contacts, turn on the Contacts permissions.</string>
+  <string name="permission_place_call">To place a call, turn on the Phone permission.</string>
+  <string name="toast_cannot_write_system_settings">Phone app does not have permission to write to system settings.</string>
+  <string name="blocked_number_call_log_label">Blocked</string>
+  <string name="call_log_action_block_report_number">Block/report spam</string>
+  <string name="call_log_action_block_number">Block number</string>
+  <string name="call_log_action_remove_spam">Not spam</string>
+  <string name="call_log_action_unblock_number">Unblock number</string>
+  <string name="spam_number_call_log_label">Spam</string>
+  <string name="call_composer_connection_failed">%1$s is offline and can\'t be reached</string>
+  <string name="about_phone_label">About</string>
+  <string name="voicemail_transcription_branding_text">Transcribed by Google</string>
+  <string name="voicemail_transcription_in_progress">Transcribing…</string>
+  <string name="voicemail_transcription_failed">Transcript not available.</string>
+  <string name="voicemail_transcription_failed_language_not_supported">Transcript not available. Language not supported.</string>
+  <string name="voicemail_transcription_failed_no_speech">Transcript not available. No speech detected.</string>
+  <string name="voicemail_donation_promo_title">Help improve transcription accuracy?</string>
+  <string name="voicemail_donation_promo_content">Let Google review this and future voicemail messages with transcripts. They\'ll be stored anonymously. Change Settings at any time. %1$s</string>
+  <string name="voicemail_donation_promo_opt_in">Yes, I\'m in</string>
+  <string name="voicemail_donation_promo_opt_out">No thanks</string>
+  <string name="voicemail_transcription_rating">Rate transcription quality</string>
+  <string name="voicemail_transcription_rating_thanks">Thanks for your feedback</string>
+  <string name="description_rating_good">Like</string>
+  <string name="description_rating_bad">Dislike</string>
+  <string name="view_conversation">View</string>
+  <string name="ec_data_deleted">Call deleted. View and delete attachments shared during this call in Messages.</string>
+  <string name="multiple_ec_data_deleted">Calls deleted. View and delete attachments shared during calls in Messages.</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-en-rIN/strings.xml b/java/com/android/dialer/app/res/values-en-rIN/strings.xml
index 8e8757f..65f56f1 100644
--- a/java/com/android/dialer/app/res/values-en-rIN/strings.xml
+++ b/java/com/android/dialer/app/res/values-en-rIN/strings.xml
@@ -1,179 +1,171 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="applicationLabel" msgid="2202739481132958990">"Phone"</string>
-    <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"Phone keypad"</string>
-    <string name="callHistoryIconLabel" msgid="7493268743411968630">"Call history"</string>
-    <string name="action_copy_number_text" msgid="832682558551502319">"Copy number"</string>
-    <string name="copy_transcript_text" msgid="937904189017310829">"Copy transcription"</string>
-    <string name="action_edit_number_before_call" msgid="8017492815878473837">"Edit number before call"</string>
-    <string name="call_log_delete_all" msgid="7852970926906523784">"Clear call history"</string>
-    <string name="call_log_trash_voicemail" msgid="6118493534178533972">"Delete voicemail"</string>
-    <string name="snackbar_voicemail_deleted" msgid="7463166543725496307">"Voicemail deleted"</string>
-    <string name="snackbar_voicemail_deleted_undo" msgid="6959743982796409941">"UNDO"</string>
-    <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"Clear call history?"</string>
-    <string name="clearCallLogConfirmation" msgid="6844949465815109166">"This will delete all calls from your history"</string>
-    <string name="clearCallLogProgress_title" msgid="995004835687361977">"Clearing call history…"</string>
-    <string name="notification_missedCallTitle" msgid="8283366068539898486">"Missed call"</string>
-    <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"Missed work call"</string>
-    <string name="notification_missedCallsTitle" msgid="3697442015345089802">"Missed calls"</string>
-    <string name="notification_missedCallsMsg" msgid="8176217633929018706">"<xliff:g id="NUM_MISSED_CALLS">%d</xliff:g> missed calls"</string>
-    <string name="notification_missedCall_call_back" msgid="3875698110051973965">"Call back"</string>
-    <string name="notification_missedCall_message" msgid="5086910028988305964">"Message"</string>
-    <string name="post_call_notification_message" msgid="5417476789860590611">"<xliff:g id="NAME">%1$s</xliff:g>: <xliff:g id="MESSAGE">%2$s</xliff:g>"</string>
-    <string name="notification_voicemail_text_format" msgid="1895667520930252897">"Dial <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
-    <string name="notification_voicemail_no_vm_number" msgid="8942821987929495842">"Voicemail number unknown"</string>
-    <plurals name="notification_voicemail_title" formatted="false" msgid="1551847434476438657">
-      <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> Voicemails </item>
-      <item quantity="one">Voicemail</item>
-    </plurals>
-    <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
-    <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"New voicemail from <xliff:g id="CALLER">%1$s</xliff:g>"</string>
-    <string name="voicemail_playback_error" msgid="4384373852257757295">"Couldn\'t play voicemail"</string>
-    <string name="voicemail_fetching_content" msgid="572320120918636014">"Loading voicemail…"</string>
-    <string name="voicemail_fetching_timout" msgid="2128873915839949783">"Couldn\'t load voicemail"</string>
-    <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_playback_speakerphone" msgid="4852027754869750227">"Switch on or off speakerphone"</string>
-    <string name="description_playback_seek" msgid="1340910573254132520">"Seek playback position"</string>
-    <string name="action_menu_call_history_description" msgid="8829135306925008546">"Call history"</string>
-    <string name="action_menu_overflow_description" msgid="7648679686746517341">"More options"</string>
-    <string name="action_menu_dialpad_button" msgid="1970631633457493180">"key pad"</string>
-    <string name="dialer_settings_label" msgid="4980176284150290175">"Settings"</string>
-    <string name="simulator_submenu_label" msgid="186156287346615267">"Simulator"</string>
-    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Create new UI shortcut"</string>
-    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"Entering bulk action mode"</string>
-    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"Left bulk action mode"</string>
-    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"Selected <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"Unselected <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_contact_details" msgid="3341280873855253464">"Contact details for <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_spam_contact_details" msgid="5592578752881528368">"Contact details for suspected spam caller <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> calls."</string>
-    <string name="description_video_call" msgid="3738199365585751727">"Video call."</string>
-    <string name="description_start_voice_search" msgid="8380022725973015261">"Start voice search"</string>
-    <string name="voicemail" msgid="8899540969000957954">"Voicemail"</string>
-    <string name="description_cancel_multi_select" msgid="3930475950253360461">"Cancel batch actions mode"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Delete"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Cancel"</string>
-    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> selected"</string>
-    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
-      <item quantity="other">"<b>"Delete these voicemails? "</b>"</item>
-      <item quantity="one">"<b>"Delete this voicemail? "</b>"</item>
-    </plurals>
-    <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
-    <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> at <xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
-    <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="voice_search_not_available" msgid="6546240433719732905">"Voice search not available"</string>
-    <string name="dialer_hint_find_contact" msgid="2023214799381149808">"Search contacts"</string>
-    <string name="block_number_search_hint" msgid="5377706079015099416">"Add number or search contacts"</string>
-    <string name="call_log_all_empty" msgid="3955572868518162004">"Your call history is empty"</string>
-    <string name="call_log_all_empty_action" msgid="852218280136243014">"Make a call"</string>
-    <string name="call_log_missed_empty" msgid="7094936030845062214">"You have no missed calls."</string>
-    <string name="call_log_voicemail_empty" msgid="273623903423275178">"Your voicemail inbox is empty."</string>
-    <string name="call_log_activity_title" msgid="1275242727244945527">"Call history"</string>
-    <string name="call_log_all_title" msgid="6042262422192020327">"All"</string>
-    <string name="call_log_missed_title" msgid="17254005889268015">"Missed"</string>
-    <string name="tab_speed_dial" msgid="6616404752227561075">"Speed dial"</string>
-    <string name="tab_history" msgid="7420269368689503596">"Call history"</string>
-    <string name="tab_all_contacts" msgid="5531733977693943015">"Contacts"</string>
-    <string name="tab_voicemail" msgid="2458548090088316246">"Voicemail"</string>
-    <string name="search_shortcut_call_number" msgid="8847918845036880688">"Call <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"Create new contact"</string>
-    <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"Add to a contact"</string>
-    <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"Send SMS"</string>
-    <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"Make video call"</string>
-    <string name="search_shortcut_block_number" msgid="4587283230665805776">"Block number"</string>
-    <string name="speed_dial_empty" msgid="3346406399966039505">"No one is on your speed dial yet"</string>
-    <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"Add a favourite"</string>
-    <string name="remove_contact" msgid="2353580570488923668">"Remove"</string>
-    <string name="select_all" msgid="408601760696146245">"Select all"</string>
-    <string name="call_log_action_video_call" msgid="7565549950343850819">"Video call"</string>
-    <string name="call_log_action_send_message" msgid="6948727362660115554">"Send a message"</string>
-    <string name="call_log_action_details" msgid="2091370737371449501">"Call details"</string>
-    <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"Send to…"</string>
-    <string name="call_log_action_call" msgid="682724094251540583">"Call <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_incoming_missed_call" msgid="8292535799379230029">"Missed call from <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_incoming_answered_call" msgid="3920182963103160610">"Answered call from <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_unread_voicemail" msgid="145170985013419170">"Unread voicemail from <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_read_voicemail" msgid="5585559881573227732">"Voicemail from <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_outgoing_call" msgid="543952487882919924">"Call to <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="call_log_via_number" msgid="1340307109806397650">"via <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, via <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="description_call_action" msgid="4042796498169106545">"Call <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_video_call_action" msgid="1237090968588659650">"Video call <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
-    <string name="description_voicemail_action" msgid="3290143432403538524">"Listen to voicemail from <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_create_new_contact_action" msgid="1928282350281564130">"Create contact for <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"Add <xliff:g id="NAMEORNUMBER">^1</xliff:g> to existing contact"</string>
-    <string name="description_details_action" msgid="2061866409737706174">"Call details for <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="call_log_header_today" msgid="1576119097475845293">"Today"</string>
-    <string name="call_log_header_yesterday" msgid="5616077776205329563">"Yesterday"</string>
-    <string name="call_log_header_other" msgid="4940676886254217644">"Older"</string>
-    <string name="voicemail_speaker_on" msgid="3151333608926996668">"Turn speaker on."</string>
-    <string name="voicemail_speaker_off" msgid="2530064206962034201">"Turn speaker off."</string>
-    <string name="voicemail_play_start_pause" msgid="3874823480278334664">"Start or pause playback."</string>
-    <string name="display_options_title" msgid="3880091801055797975">"Display options"</string>
-    <string name="sounds_and_vibration_title" msgid="3075050000721181384">"Sounds and vibration"</string>
-    <string name="accessibility_settings_title" msgid="3329027650429831820">"Accessibility"</string>
-    <string name="ringtone_title" msgid="8377174189894648486">"Phone ringtone"</string>
-    <string name="vibrate_on_ring_title" msgid="631441314790960485">"Also vibrate for calls"</string>
-    <string name="dtmf_tone_enable_title" msgid="3273762431523939277">"Keypad tones"</string>
-    <string name="dtmf_tone_length_title" msgid="534096029202438539">"Keypad tone length"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="applicationLabel">Phone</string>
+  <string name="launcherDialpadActivityLabel">Phone keypad</string>
+  <string name="callHistoryIconLabel">Call history</string>
+  <string name="action_copy_number_text">Copy number</string>
+  <string name="copy_transcript_text">Copy transcription</string>
+  <string name="action_edit_number_before_call">Edit number before call</string>
+  <string name="call_log_delete_all">Clear call history</string>
+  <string name="call_log_trash_voicemail">Delete voicemail</string>
+  <string name="snackbar_voicemail_deleted">Voicemail deleted</string>
+  <string name="clearCallLogConfirmation_title">Clear call history?</string>
+  <string name="clearCallLogConfirmation">This will delete all calls from your history</string>
+  <string name="clearCallLogProgress_title">Clearing call history…</string>
+  <string name="notification_missedCallTitle">Missed call</string>
+  <string name="notification_missedWorkCallTitle">Missed work call</string>
+  <string name="notification_missedCallsTitle">Missed calls</string>
+  <string name="notification_missedCallsMsg">%d missed calls</string>
+  <string name="notification_missedCall_call_back">Call back</string>
+  <string name="notification_missedCall_message">Message</string>
+  <string name="post_call_notification_message">%1$s: %2$s</string>
+  <string name="notification_voicemail_text_format">Dial %s</string>
+  <string name="notification_voicemail_no_vm_number">Voicemail number unknown</string>
+  <plurals name="notification_voicemail_title">
+    <item quantity="one">Voicemail</item>
+    <item quantity="other"> %1$d Voicemails </item>
+  </plurals>
+  <string name="notification_voicemail_callers_list">%1$s, %2$s</string>
+  <string name="notification_new_voicemail_ticker">New voicemail from %1$s</string>
+  <string name="voicemail_playback_error">Couldn\'t play voicemail</string>
+  <string name="voicemail_fetching_content">Loading voicemail…</string>
+  <string name="voicemail_fetching_timout">Couldn\'t load voicemail</string>
+  <string name="call_log_item_count_and_date">(%1$d) %2$s</string>
+  <string name="description_playback_speakerphone">Switch on or off speakerphone</string>
+  <string name="description_playback_seek">Seek playback position</string>
+  <string name="action_menu_call_history_description">Call history</string>
+  <string msgid="2295659037509008453" name="action_menu_overflow_description">More options</string>
+  <string name="action_menu_dialpad_button">key pad</string>
+  <string name="dialer_settings_label">Settings</string>
+  <string name="simulator_submenu_label">Simulator</string>
+  <string name="new_ui_launcher_shortcut_label">Create new UI shortcut</string>
+  <string name="description_entering_bulk_action_mode">Entering bulk action mode</string>
+  <string name="description_leaving_bulk_action_mode">Left bulk action mode</string>
+  <string name="description_selecting_bulk_action_mode">Selected %1$s</string>
+  <string name="description_unselecting_bulk_action_mode">Unselected %1$s</string>
+  <string name="description_contact_details">Contact details for %1$s</string>
+  <string name="description_spam_contact_details">Contact details for suspected spam caller %1$s</string>
+  <string name="description_num_calls">%1$s calls.</string>
+  <string name="description_video_call">Video call.</string>
+  <string name="description_start_voice_search">Start voice search</string>
+  <string name="voicemail">Voicemail</string>
+  <string name="description_cancel_multi_select">Cancel batch actions mode</string>
+  <string name="voicemailMultiSelectDeleteConfirm">Delete</string>
+  <string name="voicemailMultiSelectDeleteCancel">Cancel</string>
+  <string name="voicemailMultiSelectActionBarTitle">%1$s selected</string>
+  <plurals name="delete_voicemails_confirmation_dialog_title">
+    <item quantity="one"><b>Delete this voicemail? </b></item>
+    <item quantity="other"><b>Delete these voicemails? </b></item>
+  </plurals>
+  <string name="voicemailCallLogToday">@string/call_log_header_today</string>
+  <string name="voicemailCallLogDateTimeFormat">%1$s at %2$s</string>
+  <string name="voicemailDurationFormat">%1$02d:%2$02d</string>
+  <string name="voicemailCallLogDateTimeFormatWithDuration">%1$s • %2$s</string>
+  <string name="voice_search_not_available">Voice search not available</string>
+  <string name="dialer_hint_find_contact">Search contacts</string>
+  <string name="block_number_search_hint">Add number or search contacts</string>
+  <string name="call_log_all_empty">Your call history is empty</string>
+  <string name="call_log_all_empty_action">Make a call</string>
+  <string name="call_log_missed_empty">You have no missed calls.</string>
+  <string name="call_log_voicemail_empty">Your voicemail inbox is empty.</string>
+  <string name="call_log_activity_title">Call history</string>
+  <string name="call_log_all_title">All</string>
+  <string name="call_log_missed_title">Missed</string>
+  <string name="tab_speed_dial">Speed dial</string>
+  <string name="tab_history">Call history</string>
+  <string name="tab_all_contacts">Contacts</string>
+  <string name="tab_voicemail">Voicemail</string>
+  <string name="search_shortcut_call_number">Call %s</string>
+  <string name="search_shortcut_create_new_contact">Create new contact</string>
+  <string name="search_shortcut_add_to_contact">Add to a contact</string>
+  <string name="search_shortcut_send_sms_message">Send SMS</string>
+  <string name="search_shortcut_make_video_call">Make video call</string>
+  <string name="search_shortcut_block_number">Block number</string>
+  <string name="speed_dial_empty">No one is on your speed dial yet</string>
+  <string name="speed_dial_empty_add_favorite_action">Add a favourite</string>
+  <string name="remove_contact">Remove</string>
+  <string name="select_all">Select all</string>
+  <string name="call_log_action_video_call">Video call</string>
+  <string name="call_log_action_set_up_video">Set up video calling</string>
+  <string name="call_log_action_invite_video">Invite to video call</string>
+  <string name="call_log_action_send_message">Send a message</string>
+  <string name="call_log_action_details">Call details</string>
+  <string name="call_log_action_share_voicemail">Send to…</string>
+  <string name="call_log_action_call">Call ^1</string>
+  <string name="description_incoming_missed_call">Missed call from ^1, ^2, ^3, ^4.</string>
+  <string name="description_incoming_answered_call">Answered call from ^1, ^2, ^3, ^4.</string>
+  <string name="description_unread_voicemail">Unread voicemail from ^1, ^2, ^3, ^4.</string>
+  <string name="description_read_voicemail">Voicemail from ^1, ^2, ^3, ^4.</string>
+  <string name="description_outgoing_call">Call to ^1, ^2, ^3, ^4.</string>
+  <string name="call_log_via_number">via %1$s</string>
+  <string name="call_log_via_number_phone_account">%1$s, via %2$s</string>
+  <string name="description_call_action">Call ^1</string>
+  <string name="description_video_call_action">Video call ^1.</string>
+  <string name="description_voicemail_action">Listen to voicemail from ^1</string>
+  <string name="description_create_new_contact_action">Create contact for ^1</string>
+  <string name="description_add_to_existing_contact_action">Add ^1 to existing contact</string>
+  <string name="description_details_action">Call details for ^1</string>
+  <string name="call_log_header_today">Today</string>
+  <string name="call_log_header_yesterday">Yesterday</string>
+  <string name="call_log_header_other">Older</string>
+  <string name="voicemail_speaker_on">Turn speaker on.</string>
+  <string name="voicemail_speaker_off">Turn speaker off.</string>
+  <string name="voicemail_play_start_pause">Start or pause playback.</string>
+  <string name="display_options_title">Display options</string>
+  <string name="sounds_and_vibration_title">Sounds and vibration</string>
+  <string name="accessibility_settings_title">Accessibility</string>
+  <string name="ringtone_title">Phone ringtone</string>
+  <string name="vibrate_on_ring_title">Also vibrate for calls</string>
+  <string name="dtmf_tone_enable_title">Keypad tones</string>
+  <string name="dtmf_tone_length_title">Keypad tone length</string>
   <string-array name="dtmf_tone_length_entries">
-    <item msgid="3136353015227162823">"Normal"</item>
-    <item msgid="5376841175538523822">"Long"</item>
+    <item>Normal</item>
+    <item>Long</item>
   </string-array>
-    <string name="respond_via_sms_setting_title" msgid="8008181606657693452">"Quick responses"</string>
-    <string name="call_settings_label" msgid="7824611757200960807">"Calls"</string>
-    <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Call blocking"</string>
-    <string name="voicemail_settings_label" msgid="4594299554519920570">"Voicemail"</string>
-    <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Call blocking temporarily off"</string>
-    <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Call blocking has been disabled because you contacted emergency services from this phone within the last 48 hours. It will be automatically re-enabled once the 48 hour period expires."</string>
-    <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Import numbers"</string>
-    <string name="blocked_call_settings_import_description" msgid="1819412052545228965">"You previously marked some callers to be automatically sent to voicemail via other apps."</string>
-    <string name="blocked_call_settings_view_numbers_button" msgid="3332727948554356704">"View Numbers"</string>
-    <string name="blocked_call_settings_import_button" msgid="7319111700387470727">"Import"</string>
-    <string name="description_blocked_number_list_delete" msgid="2139644216858370740">"Unblock number"</string>
-    <string name="addBlockedNumber" msgid="3053473735238295551">"Add number"</string>
-    <string name="block_number_footer_message_vvm" msgid="7955326304033982368">"Calls from these numbers will be blocked and voicemails will be automatically deleted."</string>
-    <string name="block_number_footer_message_no_vvm" msgid="1152684139070471665">"Calls from these numbers will be blocked, but they may still be able to leave you voicemails."</string>
-    <string name="block_list" msgid="4701585783411870782">"Blocked numbers"</string>
-    <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g> is already blocked."</string>
-    <string name="phone_account_settings_label" msgid="8372485478006965920">"Calling accounts"</string>
-    <string name="permission_no_speeddial" msgid="8487215628510596753">"To enable speed dial, turn on the Contacts permission."</string>
-    <string name="permission_no_calllog" msgid="4053705651238775784">"To see your call log, turn on the Phone permission."</string>
-    <string name="permission_no_search" msgid="2424710404207193826">"To search your contacts, turn on the Contacts permissions."</string>
-    <string name="permission_place_call" msgid="8686908130349369423">"To place a call, turn on the Phone permission."</string>
-    <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"Phone app does not have permission to write to system settings."</string>
-    <string name="blocked_number_call_log_label" msgid="4212282846299997693">"Blocked"</string>
-    <string name="call_log_action_block_report_number" msgid="7302636538668696729">"Block/report spam"</string>
-    <string name="call_log_action_block_number" msgid="5048188386501998865">"Block number"</string>
-    <string name="call_log_action_remove_spam" msgid="2045319806318398403">"Not spam"</string>
-    <string name="call_log_action_unblock_number" msgid="6100117033288448758">"Unblock number"</string>
-    <string name="spam_number_call_log_label" msgid="2678431398326811131">"Spam"</string>
-    <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> is offline and can\'t be reached"</string>
-    <string name="about_phone_label" msgid="582991354677973731">"About"</string>
-    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Transcribed by Google"</string>
-    <string name="voicemail_transcription_in_progress" msgid="2933320969613783210">"Google is transcribing…"</string>
-    <string name="voicemail_transcription_failed" msgid="335275303117412706">"Transcript not available."</string>
-    <string name="voicemail_transcription_failed_language_not_supported" msgid="4210332591050562553">"Transcript not available. Language not supported."</string>
-    <string name="voicemail_transcription_failed_no_speech" msgid="9093372879697874852">"Transcript not available. No speech detected."</string>
-    <string name="view_conversation" msgid="7895904782094119702">"View"</string>
-    <string name="ec_data_deleted" msgid="4794880345545827107">"Call deleted. View and delete attachments shared during this call in Messages."</string>
-    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"Calls deleted. View and delete attachments shared during calls in Messages."</string>
+  <string name="respond_via_sms_setting_title">Quick responses</string>
+  <string name="call_settings_label">Calls</string>
+  <string name="manage_blocked_numbers_label">Blocked numbers</string>
+  <string name="voicemail_settings_label">Voicemail</string>
+  <string name="blocked_numbers_disabled_emergency_header_label">Call blocking temporarily off</string>
+  <string name="blocked_numbers_disabled_emergency_desc">Call blocking has been disabled because you contacted emergency services from this phone within the last 48 hours. It will be automatically re-enabled once the 48 hour period expires.</string>
+  <string name="import_send_to_voicemail_numbers_label">Import numbers</string>
+  <string name="blocked_call_settings_import_description">You previously marked some callers to be automatically sent to voicemail via other apps.</string>
+  <string name="blocked_call_settings_view_numbers_button">View Numbers</string>
+  <string name="blocked_call_settings_import_button">Import</string>
+  <string name="description_blocked_number_list_delete">Unblock number</string>
+  <string name="addBlockedNumber">Add number</string>
+  <string name="block_number_footer_message_vvm">Calls from these numbers will be blocked and voicemails will be automatically deleted.</string>
+  <string name="block_number_footer_message_no_vvm">Calls from these numbers will be blocked, but they may still be able to leave you voicemails.</string>
+  <string name="block_list">Blocked numbers</string>
+  <string name="alreadyBlocked">%1$s is already blocked.</string>
+  <string name="phone_account_settings_label">Calling accounts</string>
+  <string name="permission_no_speeddial">To enable speed dial, turn on the Contacts permission.</string>
+  <string name="permission_no_calllog">To see your call log, turn on the Phone permission.</string>
+  <string name="permission_no_search">To search your contacts, turn on the Contacts permissions.</string>
+  <string name="permission_place_call">To place a call, turn on the Phone permission.</string>
+  <string name="toast_cannot_write_system_settings">Phone app does not have permission to write to system settings.</string>
+  <string name="blocked_number_call_log_label">Blocked</string>
+  <string name="call_log_action_block_report_number">Block/report spam</string>
+  <string name="call_log_action_block_number">Block number</string>
+  <string name="call_log_action_remove_spam">Not spam</string>
+  <string name="call_log_action_unblock_number">Unblock number</string>
+  <string name="spam_number_call_log_label">Spam</string>
+  <string name="call_composer_connection_failed">%1$s is offline and can\'t be reached</string>
+  <string name="about_phone_label">About</string>
+  <string name="voicemail_transcription_branding_text">Transcribed by Google</string>
+  <string name="voicemail_transcription_in_progress">Transcribing…</string>
+  <string name="voicemail_transcription_failed">Transcript not available.</string>
+  <string name="voicemail_transcription_failed_language_not_supported">Transcript not available. Language not supported.</string>
+  <string name="voicemail_transcription_failed_no_speech">Transcript not available. No speech detected.</string>
+  <string name="voicemail_donation_promo_title">Help improve transcription accuracy?</string>
+  <string name="voicemail_donation_promo_content">Let Google review this and future voicemail messages with transcripts. They\'ll be stored anonymously. Change Settings at any time. %1$s</string>
+  <string name="voicemail_donation_promo_opt_in">Yes, I\'m in</string>
+  <string name="voicemail_donation_promo_opt_out">No thanks</string>
+  <string name="voicemail_transcription_rating">Rate transcription quality</string>
+  <string name="voicemail_transcription_rating_thanks">Thanks for your feedback</string>
+  <string name="description_rating_good">Like</string>
+  <string name="description_rating_bad">Dislike</string>
+  <string name="view_conversation">View</string>
+  <string name="ec_data_deleted">Call deleted. View and delete attachments shared during this call in Messages.</string>
+  <string name="multiple_ec_data_deleted">Calls deleted. View and delete attachments shared during calls in Messages.</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-es-rUS/strings.xml b/java/com/android/dialer/app/res/values-es-rUS/strings.xml
index c1c60d0..2431fd4 100644
--- a/java/com/android/dialer/app/res/values-es-rUS/strings.xml
+++ b/java/com/android/dialer/app/res/values-es-rUS/strings.xml
@@ -1,179 +1,171 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="applicationLabel" msgid="2202739481132958990">"Teléfono"</string>
-    <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"Teclado del teléfono"</string>
-    <string name="callHistoryIconLabel" msgid="7493268743411968630">"Historial de llamadas"</string>
-    <string name="action_copy_number_text" msgid="832682558551502319">"Copiar número"</string>
-    <string name="copy_transcript_text" msgid="937904189017310829">"Copiar transcripción"</string>
-    <string name="action_edit_number_before_call" msgid="8017492815878473837">"Editar número antes de realizar llamada"</string>
-    <string name="call_log_delete_all" msgid="7852970926906523784">"Eliminar el historial de llamadas"</string>
-    <string name="call_log_trash_voicemail" msgid="6118493534178533972">"Borrar buzón de voz"</string>
-    <string name="snackbar_voicemail_deleted" msgid="7463166543725496307">"Buzón de voz borrado"</string>
-    <string name="snackbar_voicemail_deleted_undo" msgid="6959743982796409941">"DESHACER"</string>
-    <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"¿Eliminar el historial de llamadas?"</string>
-    <string name="clearCallLogConfirmation" msgid="6844949465815109166">"Se eliminarán todas las llamadas del historial."</string>
-    <string name="clearCallLogProgress_title" msgid="995004835687361977">"Eliminando historial de llamadas…"</string>
-    <string name="notification_missedCallTitle" msgid="8283366068539898486">"Llamada perdida"</string>
-    <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"Llamada de trabajo perdida"</string>
-    <string name="notification_missedCallsTitle" msgid="3697442015345089802">"Llamadas perdidas"</string>
-    <string name="notification_missedCallsMsg" msgid="8176217633929018706">"<xliff:g id="NUM_MISSED_CALLS">%d</xliff:g> llamadas perdidas"</string>
-    <string name="notification_missedCall_call_back" msgid="3875698110051973965">"Llamar"</string>
-    <string name="notification_missedCall_message" msgid="5086910028988305964">"Mensaje"</string>
-    <string name="post_call_notification_message" msgid="5417476789860590611">"<xliff:g id="NAME">%1$s</xliff:g>: <xliff:g id="MESSAGE">%2$s</xliff:g>"</string>
-    <string name="notification_voicemail_text_format" msgid="1895667520930252897">"Marcar <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
-    <string name="notification_voicemail_no_vm_number" msgid="8942821987929495842">"Número de correo de voz desconocido"</string>
-    <plurals name="notification_voicemail_title" formatted="false" msgid="1551847434476438657">
-      <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> mensajes de voz </item>
-      <item quantity="one">mensaje de voz</item>
-    </plurals>
-    <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
-    <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"Nuevo mensaje de voz de <xliff:g id="CALLER">%1$s</xliff:g>"</string>
-    <string name="voicemail_playback_error" msgid="4384373852257757295">"Error al reproducir el buzón de voz"</string>
-    <string name="voicemail_fetching_content" msgid="572320120918636014">"Cargando buzón de voz…"</string>
-    <string name="voicemail_fetching_timout" msgid="2128873915839949783">"Error al cargar el buzón de voz"</string>
-    <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_playback_speakerphone" msgid="4852027754869750227">"Activar o desactivar el altavoz"</string>
-    <string name="description_playback_seek" msgid="1340910573254132520">"Busca la posición de reproducción"</string>
-    <string name="action_menu_call_history_description" msgid="8829135306925008546">"Historial de llamadas"</string>
-    <string name="action_menu_overflow_description" msgid="7648679686746517341">"Más opciones"</string>
-    <string name="action_menu_dialpad_button" msgid="1970631633457493180">"teclado"</string>
-    <string name="dialer_settings_label" msgid="4980176284150290175">"Configuración"</string>
-    <string name="simulator_submenu_label" msgid="186156287346615267">"Simulador"</string>
-    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Crear acceso a la nueva IU"</string>
-    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"Entrando al modo de acción masiva"</string>
-    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"Saliendo del modo de acción masiva"</string>
-    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"Se seleccionó <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"Se anuló la selección de <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_contact_details" msgid="3341280873855253464">"Datos de contacto de <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_spam_contact_details" msgid="5592578752881528368">"Detalles de contacto de <xliff:g id="NAMEORNUMBER">%1$s</xliff:g> (posible generador de spam)"</string>
-    <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> llamadas"</string>
-    <string name="description_video_call" msgid="3738199365585751727">"Videollamada"</string>
-    <string name="description_start_voice_search" msgid="8380022725973015261">"Iniciar búsqueda por voz"</string>
-    <string name="voicemail" msgid="8899540969000957954">"Correo de voz"</string>
-    <string name="description_cancel_multi_select" msgid="3930475950253360461">"Cancelar el modo de acción masiva"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Borrar"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Cancelar"</string>
-    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> seleccionada(s)"</string>
-    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
-      <item quantity="other">"<b>"¿Deseas borrar estos mensajes de voz? "</b>"</item>
-      <item quantity="one">"<b>"¿Deseas borrar este mensaje de voz? "</b>"</item>
-    </plurals>
-    <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
-    <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"El <xliff:g id="DATE">%1$s</xliff:g> a la hora <xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
-    <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="voice_search_not_available" msgid="6546240433719732905">"Búsqueda por voz no disponible"</string>
-    <string name="dialer_hint_find_contact" msgid="2023214799381149808">"Buscar contactos"</string>
-    <string name="block_number_search_hint" msgid="5377706079015099416">"Agregar número o buscar contactos"</string>
-    <string name="call_log_all_empty" msgid="3955572868518162004">"El historial de llamadas está vacío."</string>
-    <string name="call_log_all_empty_action" msgid="852218280136243014">"Hacer una llamada"</string>
-    <string name="call_log_missed_empty" msgid="7094936030845062214">"No tienes llamadas perdidas"</string>
-    <string name="call_log_voicemail_empty" msgid="273623903423275178">"La bandeja de entrada del buzón de voz está vacía."</string>
-    <string name="call_log_activity_title" msgid="1275242727244945527">"Historial de llamadas"</string>
-    <string name="call_log_all_title" msgid="6042262422192020327">"Todo"</string>
-    <string name="call_log_missed_title" msgid="17254005889268015">"Perdidas"</string>
-    <string name="tab_speed_dial" msgid="6616404752227561075">"Marcado rápido"</string>
-    <string name="tab_history" msgid="7420269368689503596">"Historial de llamadas"</string>
-    <string name="tab_all_contacts" msgid="5531733977693943015">"Contactos"</string>
-    <string name="tab_voicemail" msgid="2458548090088316246">"Buzón de voz"</string>
-    <string name="search_shortcut_call_number" msgid="8847918845036880688">"Llamar al <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"Crear contacto nuevo"</string>
-    <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"Agregar a un contacto"</string>
-    <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"Enviar SMS"</string>
-    <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"Realizar videollamada"</string>
-    <string name="search_shortcut_block_number" msgid="4587283230665805776">"Bloquear número"</string>
-    <string name="speed_dial_empty" msgid="3346406399966039505">"Aún no tienes contactos en la opción de marcado rápido"</string>
-    <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"Agregar un favorito"</string>
-    <string name="remove_contact" msgid="2353580570488923668">"Eliminar"</string>
-    <string name="select_all" msgid="408601760696146245">"Seleccionar todo"</string>
-    <string name="call_log_action_video_call" msgid="7565549950343850819">"Videollamada"</string>
-    <string name="call_log_action_send_message" msgid="6948727362660115554">"Enviar un mensaje"</string>
-    <string name="call_log_action_details" msgid="2091370737371449501">"Detalles de la llamada"</string>
-    <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"Enviar a…"</string>
-    <string name="call_log_action_call" msgid="682724094251540583">"Llamar a <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_incoming_missed_call" msgid="8292535799379230029">"Llamada perdida de <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_incoming_answered_call" msgid="3920182963103160610">"Llamada contestada de <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_unread_voicemail" msgid="145170985013419170">"Mensaje de voz no leído de <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_read_voicemail" msgid="5585559881573227732">"Mensaje de voz de <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_outgoing_call" msgid="543952487882919924">"Llamar a <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="call_log_via_number" msgid="1340307109806397650">"a través de <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> a través de <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="description_call_action" msgid="4042796498169106545">"Llamar a <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_video_call_action" msgid="1237090968588659650">"Realizar una videollamada a <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_action" msgid="3290143432403538524">"Escuchar buzón de voz de <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_create_new_contact_action" msgid="1928282350281564130">"Crear un contacto para <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"Agregar <xliff:g id="NAMEORNUMBER">^1</xliff:g> a un contacto existente"</string>
-    <string name="description_details_action" msgid="2061866409737706174">"Detalles de llamada de <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="call_log_header_today" msgid="1576119097475845293">"Hoy"</string>
-    <string name="call_log_header_yesterday" msgid="5616077776205329563">"Ayer"</string>
-    <string name="call_log_header_other" msgid="4940676886254217644">"Antiguos"</string>
-    <string name="voicemail_speaker_on" msgid="3151333608926996668">"Activar altavoz"</string>
-    <string name="voicemail_speaker_off" msgid="2530064206962034201">"Desactivar altavoz"</string>
-    <string name="voicemail_play_start_pause" msgid="3874823480278334664">"Iniciar o pausar la reproducción"</string>
-    <string name="display_options_title" msgid="3880091801055797975">"Opciones de visualización"</string>
-    <string name="sounds_and_vibration_title" msgid="3075050000721181384">"Sonidos y vibración"</string>
-    <string name="accessibility_settings_title" msgid="3329027650429831820">"Accesibilidad"</string>
-    <string name="ringtone_title" msgid="8377174189894648486">"Tono del teléfono"</string>
-    <string name="vibrate_on_ring_title" msgid="631441314790960485">"Vibrar también en llamadas"</string>
-    <string name="dtmf_tone_enable_title" msgid="3273762431523939277">"Tonos del teclado"</string>
-    <string name="dtmf_tone_length_title" msgid="534096029202438539">"Duración del tono del teclado"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="applicationLabel">Teléfono</string>
+  <string name="launcherDialpadActivityLabel">Teclado del teléfono</string>
+  <string name="callHistoryIconLabel">Historial de llamadas</string>
+  <string name="action_copy_number_text">Copiar número</string>
+  <string name="copy_transcript_text">Copiar transcripción</string>
+  <string name="action_edit_number_before_call">Editar número antes de realizar llamada</string>
+  <string name="call_log_delete_all">Eliminar el historial de llamadas</string>
+  <string name="call_log_trash_voicemail">Borrar correo de voz</string>
+  <string name="snackbar_voicemail_deleted">Correo de voz borrado</string>
+  <string name="clearCallLogConfirmation_title">¿Eliminar el historial de llamadas?</string>
+  <string name="clearCallLogConfirmation">Se eliminarán todas las llamadas del historial.</string>
+  <string name="clearCallLogProgress_title">Eliminando historial de llamadas…</string>
+  <string name="notification_missedCallTitle">Llamada perdida</string>
+  <string name="notification_missedWorkCallTitle">Llamada de trabajo perdida</string>
+  <string name="notification_missedCallsTitle">Llamadas perdidas</string>
+  <string name="notification_missedCallsMsg">%d llamadas perdidas</string>
+  <string name="notification_missedCall_call_back">Llamar</string>
+  <string name="notification_missedCall_message">Mensaje</string>
+  <string name="post_call_notification_message">%1$s: %2$s</string>
+  <string name="notification_voicemail_text_format">Marcar %s</string>
+  <string name="notification_voicemail_no_vm_number">Número de correo de voz desconocido</string>
+  <plurals name="notification_voicemail_title">
+    <item quantity="one">correo de voz</item>
+    <item quantity="other"> %1$d correos de voz </item>
+  </plurals>
+  <string name="notification_voicemail_callers_list">%1$s, %2$s</string>
+  <string name="notification_new_voicemail_ticker">Nuevo correo de voz de %1$s</string>
+  <string name="voicemail_playback_error">Error al reproducir el correo de voz</string>
+  <string name="voicemail_fetching_content">Cargando correo de voz…</string>
+  <string name="voicemail_fetching_timout">Error al cargar el correo de voz</string>
+  <string name="call_log_item_count_and_date">(%1$d) %2$s</string>
+  <string name="description_playback_speakerphone">Activar o desactivar el altavoz</string>
+  <string name="description_playback_seek">Busca la posición de reproducción</string>
+  <string name="action_menu_call_history_description">Historial de llamadas</string>
+  <string msgid="2295659037509008453" name="action_menu_overflow_description">Más opciones</string>
+  <string name="action_menu_dialpad_button">teclado</string>
+  <string name="dialer_settings_label">Configuración</string>
+  <string name="simulator_submenu_label">Simulador</string>
+  <string name="new_ui_launcher_shortcut_label">Crear acceso a la nueva IU</string>
+  <string name="description_entering_bulk_action_mode">Entrando al modo de acción masiva</string>
+  <string name="description_leaving_bulk_action_mode">Saliendo del modo de acción masiva</string>
+  <string name="description_selecting_bulk_action_mode">Se seleccionó %1$s</string>
+  <string name="description_unselecting_bulk_action_mode">Se anuló la selección de %1$s</string>
+  <string name="description_contact_details">Datos de contacto de %1$s</string>
+  <string name="description_spam_contact_details">Detalles de contacto de %1$s (posible generador de spam)</string>
+  <string name="description_num_calls">%1$s llamadas</string>
+  <string name="description_video_call">Videollamada</string>
+  <string name="description_start_voice_search">Iniciar búsqueda por voz</string>
+  <string name="voicemail">Correo de voz</string>
+  <string name="description_cancel_multi_select">Cancelar el modo de acción masiva</string>
+  <string name="voicemailMultiSelectDeleteConfirm">Borrar</string>
+  <string name="voicemailMultiSelectDeleteCancel">Cancelar</string>
+  <string name="voicemailMultiSelectActionBarTitle">%1$s seleccionada(s)</string>
+  <plurals name="delete_voicemails_confirmation_dialog_title">
+    <item quantity="one"><b>¿Deseas borrar este mensaje de voz? </b></item>
+    <item quantity="other"><b>¿Deseas borrar estos mensajes de voz? </b></item>
+  </plurals>
+  <string name="voicemailCallLogToday">@string/call_log_header_today</string>
+  <string name="voicemailCallLogDateTimeFormat">El %1$s a la hora %2$s</string>
+  <string name="voicemailDurationFormat">%1$02d:%2$02d</string>
+  <string name="voicemailCallLogDateTimeFormatWithDuration">%1$s • %2$s</string>
+  <string name="voice_search_not_available">Búsqueda por voz no disponible</string>
+  <string name="dialer_hint_find_contact">Buscar contactos</string>
+  <string name="block_number_search_hint">Agregar número o buscar contactos</string>
+  <string name="call_log_all_empty">El historial de llamadas está vacío.</string>
+  <string name="call_log_all_empty_action">Hacer una llamada</string>
+  <string name="call_log_missed_empty">No tienes llamadas perdidas</string>
+  <string name="call_log_voicemail_empty">La bandeja de entrada del correo de voz está vacía.</string>
+  <string name="call_log_activity_title">Historial de llamadas</string>
+  <string name="call_log_all_title">Todas</string>
+  <string name="call_log_missed_title">Perdidas</string>
+  <string name="tab_speed_dial">Marcado rápido</string>
+  <string name="tab_history">Historial de llamadas</string>
+  <string name="tab_all_contacts">Contactos</string>
+  <string name="tab_voicemail">Correo de voz</string>
+  <string name="search_shortcut_call_number">Llamar al %s</string>
+  <string name="search_shortcut_create_new_contact">Crear contacto nuevo</string>
+  <string name="search_shortcut_add_to_contact">Agregar a un contacto</string>
+  <string name="search_shortcut_send_sms_message">Enviar SMS</string>
+  <string name="search_shortcut_make_video_call">Realizar videollamada</string>
+  <string name="search_shortcut_block_number">Bloquear número</string>
+  <string name="speed_dial_empty">Aún no tienes contactos en la opción de marcado rápido</string>
+  <string name="speed_dial_empty_add_favorite_action">Agregar un favorito</string>
+  <string name="remove_contact">Eliminar</string>
+  <string name="select_all">Seleccionar todo</string>
+  <string name="call_log_action_video_call">Videollamada</string>
+  <string name="call_log_action_set_up_video">Configurar las videollamadas</string>
+  <string name="call_log_action_invite_video">Invitar a la videollamada</string>
+  <string name="call_log_action_send_message">Enviar un mensaje</string>
+  <string name="call_log_action_details">Detalles de la llamada</string>
+  <string name="call_log_action_share_voicemail">Enviar a…</string>
+  <string name="call_log_action_call">Llamar a ^1</string>
+  <string name="description_incoming_missed_call">Llamada perdida de ^1, ^2, ^3, ^4.</string>
+  <string name="description_incoming_answered_call">Llamada contestada de ^1, ^2, ^3, ^4.</string>
+  <string name="description_unread_voicemail">Correo de voz no leído de ^1, ^2, ^3, ^4.</string>
+  <string name="description_read_voicemail">Correo de voz de ^1, ^2, ^3, ^4.</string>
+  <string name="description_outgoing_call">Llamar a ^1, ^2, ^3, ^4.</string>
+  <string name="call_log_via_number">a través de %1$s</string>
+  <string name="call_log_via_number_phone_account">%1$s a través de %2$s</string>
+  <string name="description_call_action">Llamar a ^1</string>
+  <string name="description_video_call_action">Realizar una videollamada a ^1</string>
+  <string name="description_voicemail_action">Escuchar correo de voz de ^1</string>
+  <string name="description_create_new_contact_action">Crear un contacto para ^1</string>
+  <string name="description_add_to_existing_contact_action">Agregar ^1 a un contacto existente</string>
+  <string name="description_details_action">Detalles de llamada de ^1</string>
+  <string name="call_log_header_today">Hoy</string>
+  <string name="call_log_header_yesterday">Ayer</string>
+  <string name="call_log_header_other">Antiguas</string>
+  <string name="voicemail_speaker_on">Activar altavoz</string>
+  <string name="voicemail_speaker_off">Desactivar altavoz</string>
+  <string name="voicemail_play_start_pause">Iniciar o pausar la reproducción</string>
+  <string name="display_options_title">Opciones de visualización</string>
+  <string name="sounds_and_vibration_title">Sonidos y vibración</string>
+  <string name="accessibility_settings_title">Accesibilidad</string>
+  <string name="ringtone_title">Tono del teléfono</string>
+  <string name="vibrate_on_ring_title">Vibrar también en llamadas</string>
+  <string name="dtmf_tone_enable_title">Tonos del teclado</string>
+  <string name="dtmf_tone_length_title">Duración del tono del teclado</string>
   <string-array name="dtmf_tone_length_entries">
-    <item msgid="3136353015227162823">"Normal"</item>
-    <item msgid="5376841175538523822">"Largo"</item>
+    <item>Normal</item>
+    <item>Largo</item>
   </string-array>
-    <string name="respond_via_sms_setting_title" msgid="8008181606657693452">"Respuestas rápidas"</string>
-    <string name="call_settings_label" msgid="7824611757200960807">"Llamadas"</string>
-    <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Bloqueo de llamadas"</string>
-    <string name="voicemail_settings_label" msgid="4594299554519920570">"Buzón de voz"</string>
-    <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Bloqueo de llamadas desactivado temporalmente"</string>
-    <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Se inhabilitó el bloqueo de llamadas porque te comunicaste con servicios de emergencia en las últimas 48 horas desde este teléfono. Se volverá a habilitar de forma automática una vez que venza el período de 48 horas."</string>
-    <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Importar números"</string>
-    <string name="blocked_call_settings_import_description" msgid="1819412052545228965">"Ya marcaste algunos emisores para que se envíen de forma automática al buzón de voz por medio de otras apps."</string>
-    <string name="blocked_call_settings_view_numbers_button" msgid="3332727948554356704">"Ver números"</string>
-    <string name="blocked_call_settings_import_button" msgid="7319111700387470727">"Importar"</string>
-    <string name="description_blocked_number_list_delete" msgid="2139644216858370740">"Desbloquear número"</string>
-    <string name="addBlockedNumber" msgid="3053473735238295551">"Agregar número"</string>
-    <string name="block_number_footer_message_vvm" msgid="7955326304033982368">"Se bloquearán las llamadas que provengan de estos números y se borrarán los mensajes del buzón de voz de forma automática."</string>
-    <string name="block_number_footer_message_no_vvm" msgid="1152684139070471665">"Se bloquearán las llamadas que provengan de estos números, pero es posible que se puedan dejar mensajes en el buzón de voz."</string>
-    <string name="block_list" msgid="4701585783411870782">"Números bloqueados"</string>
-    <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g> ya está bloqueado."</string>
-    <string name="phone_account_settings_label" msgid="8372485478006965920">"Cuentas telefónicas"</string>
-    <string name="permission_no_speeddial" msgid="8487215628510596753">"Para habilitar el marcado rápido, activa el permiso Contactos."</string>
-    <string name="permission_no_calllog" msgid="4053705651238775784">"Para ver el registro de llamadas, activa el permiso Teléfono."</string>
-    <string name="permission_no_search" msgid="2424710404207193826">"Para buscar contactos, activa el permiso Contactos."</string>
-    <string name="permission_place_call" msgid="8686908130349369423">"Para realizar una llamada, activa el permiso Teléfono."</string>
-    <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"La aplicación de teléfono no tiene permiso para modificar la configuración del sistema."</string>
-    <string name="blocked_number_call_log_label" msgid="4212282846299997693">"Bloqueado"</string>
-    <string name="call_log_action_block_report_number" msgid="7302636538668696729">"Bloquear/marcar como spam"</string>
-    <string name="call_log_action_block_number" msgid="5048188386501998865">"Bloquear número"</string>
-    <string name="call_log_action_remove_spam" msgid="2045319806318398403">"No es spam"</string>
-    <string name="call_log_action_unblock_number" msgid="6100117033288448758">"Desbloquear número"</string>
-    <string name="spam_number_call_log_label" msgid="2678431398326811131">"Spam"</string>
-    <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> está sin conexión y no se lo puede contactar"</string>
-    <string name="about_phone_label" msgid="582991354677973731">"Acerca de"</string>
-    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Transcrito por Google"</string>
-    <string name="voicemail_transcription_in_progress" msgid="2933320969613783210">"Google está transcribiendo…"</string>
-    <string name="voicemail_transcription_failed" msgid="335275303117412706">"Transcripción no disponible."</string>
-    <string name="voicemail_transcription_failed_language_not_supported" msgid="4210332591050562553">"Transcripción no disponible. El idioma no es compatible."</string>
-    <string name="voicemail_transcription_failed_no_speech" msgid="9093372879697874852">"Transcripción no disponible. No se escuchó nada."</string>
-    <string name="view_conversation" msgid="7895904782094119702">"Ver"</string>
-    <string name="ec_data_deleted" msgid="4794880345545827107">"Llamada eliminada. En Mensajes, puedes ver y eliminar archivos adjuntos compartidos durante esta llamada."</string>
-    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"Llamadas eliminadas. En Mensajes, puedes ver y eliminar archivos adjuntos durante las llamadas."</string>
+  <string name="respond_via_sms_setting_title">Respuestas rápidas</string>
+  <string name="call_settings_label">Llamadas</string>
+  <string name="manage_blocked_numbers_label">Números bloqueados</string>
+  <string name="voicemail_settings_label">Correo de voz</string>
+  <string name="blocked_numbers_disabled_emergency_header_label">Bloqueo de llamadas desactivado temporalmente</string>
+  <string name="blocked_numbers_disabled_emergency_desc">Se inhabilitó el bloqueo de llamadas porque te comunicaste con servicios de emergencia en las últimas 48 horas desde este teléfono. Se volverá a habilitar de forma automática una vez que venza el período de 48 horas.</string>
+  <string name="import_send_to_voicemail_numbers_label">Importar números</string>
+  <string name="blocked_call_settings_import_description">Ya marcaste algunos emisores para que se envíen de forma automática al correo de voz por medio de otras apps.</string>
+  <string name="blocked_call_settings_view_numbers_button">Ver números</string>
+  <string name="blocked_call_settings_import_button">Importar</string>
+  <string name="description_blocked_number_list_delete">Desbloquear número</string>
+  <string name="addBlockedNumber">Agregar número</string>
+  <string name="block_number_footer_message_vvm">Se bloquearán las llamadas que provengan de estos números y se borrarán los mensajes del correo de voz de forma automática.</string>
+  <string name="block_number_footer_message_no_vvm">Se bloquearán las llamadas que provengan de estos números, pero es posible que se puedan dejar mensajes en el correo de voz.</string>
+  <string name="block_list">Números bloqueados</string>
+  <string name="alreadyBlocked">%1$s ya está bloqueado.</string>
+  <string name="phone_account_settings_label">Cuentas telefónicas</string>
+  <string name="permission_no_speeddial">Para habilitar el marcado rápido, activa el permiso Contactos.</string>
+  <string name="permission_no_calllog">Para ver el registro de llamadas, activa el permiso Teléfono.</string>
+  <string name="permission_no_search">Para buscar contactos, activa el permiso Contactos.</string>
+  <string name="permission_place_call">Para realizar una llamada, activa el permiso Teléfono.</string>
+  <string name="toast_cannot_write_system_settings">La aplicación de teléfono no tiene permiso para modificar la configuración del sistema.</string>
+  <string name="blocked_number_call_log_label">Bloqueado</string>
+  <string name="call_log_action_block_report_number">Bloquear/marcar como spam</string>
+  <string name="call_log_action_block_number">Bloquear número</string>
+  <string name="call_log_action_remove_spam">No es spam</string>
+  <string name="call_log_action_unblock_number">Desbloquear número</string>
+  <string name="spam_number_call_log_label">Spam</string>
+  <string name="call_composer_connection_failed">%1$s está sin conexión y no se lo puede contactar</string>
+  <string name="about_phone_label">Acerca de</string>
+  <string name="voicemail_transcription_branding_text">Transcrito por Google</string>
+  <string name="voicemail_transcription_in_progress">Transcribiendo…</string>
+  <string name="voicemail_transcription_failed">Transcripción no disponible.</string>
+  <string name="voicemail_transcription_failed_language_not_supported">Transcripción no disponible. El idioma no es compatible.</string>
+  <string name="voicemail_transcription_failed_no_speech">Transcripción no disponible. No se escuchó nada.</string>
+  <string name="voicemail_donation_promo_title">¿Quieres ayudar a mejorar la precisión de las transcripciones?</string>
+  <string name="voicemail_donation_promo_content">Permite que Google acceda a este mensaje de voz y a los próximos con las transcripciones. Se almacenarán de forma anónima. Puedes cambiar la configuración en cualquier momento. %1$s</string>
+  <string name="voicemail_donation_promo_opt_in">Sí, acepto</string>
+  <string name="voicemail_donation_promo_opt_out">No</string>
+  <string name="voicemail_transcription_rating">Califica la transcripción</string>
+  <string name="voicemail_transcription_rating_thanks">Gracias por tus comentarios</string>
+  <string name="description_rating_good">Me gusta</string>
+  <string name="description_rating_bad">No me gusta</string>
+  <string name="view_conversation">Ver</string>
+  <string name="ec_data_deleted">Llamada eliminada. En Mensajes, puedes ver y eliminar archivos adjuntos compartidos durante esta llamada.</string>
+  <string name="multiple_ec_data_deleted">Llamadas eliminadas. En Mensajes, puedes ver y eliminar archivos adjuntos durante las llamadas.</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-es/strings.xml b/java/com/android/dialer/app/res/values-es/strings.xml
index 1b87fd7..bbbd705 100644
--- a/java/com/android/dialer/app/res/values-es/strings.xml
+++ b/java/com/android/dialer/app/res/values-es/strings.xml
@@ -1,179 +1,171 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="applicationLabel" msgid="2202739481132958990">"Teléfono"</string>
-    <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"Teclado del teléfono"</string>
-    <string name="callHistoryIconLabel" msgid="7493268743411968630">"Historial de llamadas"</string>
-    <string name="action_copy_number_text" msgid="832682558551502319">"Copiar número"</string>
-    <string name="copy_transcript_text" msgid="937904189017310829">"Copiar transcripción"</string>
-    <string name="action_edit_number_before_call" msgid="8017492815878473837">"Editar número antes de llamar"</string>
-    <string name="call_log_delete_all" msgid="7852970926906523784">"Borrar historial de llamadas"</string>
-    <string name="call_log_trash_voicemail" msgid="6118493534178533972">"Eliminar mensaje de voz"</string>
-    <string name="snackbar_voicemail_deleted" msgid="7463166543725496307">"Buzón voz eliminado"</string>
-    <string name="snackbar_voicemail_deleted_undo" msgid="6959743982796409941">"DESHACER"</string>
-    <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"¿Borrar historial de llamadas?"</string>
-    <string name="clearCallLogConfirmation" msgid="6844949465815109166">"Se eliminarán todas las llamadas del historial."</string>
-    <string name="clearCallLogProgress_title" msgid="995004835687361977">"Borrando historial de llamadas…"</string>
-    <string name="notification_missedCallTitle" msgid="8283366068539898486">"Llamada perdida"</string>
-    <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"Llamada de trabajo perdida"</string>
-    <string name="notification_missedCallsTitle" msgid="3697442015345089802">"Llamadas perdidas"</string>
-    <string name="notification_missedCallsMsg" msgid="8176217633929018706">"<xliff:g id="NUM_MISSED_CALLS">%d</xliff:g> llamadas perdidas"</string>
-    <string name="notification_missedCall_call_back" msgid="3875698110051973965">"Llamar"</string>
-    <string name="notification_missedCall_message" msgid="5086910028988305964">"Mensaje"</string>
-    <string name="post_call_notification_message" msgid="5417476789860590611">"<xliff:g id="NAME">%1$s</xliff:g>: <xliff:g id="MESSAGE">%2$s</xliff:g>"</string>
-    <string name="notification_voicemail_text_format" msgid="1895667520930252897">"Marcar <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
-    <string name="notification_voicemail_no_vm_number" msgid="8942821987929495842">"Número de buzón de voz desconocido"</string>
-    <plurals name="notification_voicemail_title" formatted="false" msgid="1551847434476438657">
-      <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> mensajes de voz </item>
-      <item quantity="one"> mensaje de voz</item>
-    </plurals>
-    <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
-    <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"Nuevo mensaje de voz de <xliff:g id="CALLER">%1$s</xliff:g>"</string>
-    <string name="voicemail_playback_error" msgid="4384373852257757295">"Error al reproducir el buzón de voz"</string>
-    <string name="voicemail_fetching_content" msgid="572320120918636014">"Cargando buzón de voz…"</string>
-    <string name="voicemail_fetching_timout" msgid="2128873915839949783">"Error al cargar el buzón de voz"</string>
-    <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_playback_speakerphone" msgid="4852027754869750227">"Activar o desactivar el altavoz"</string>
-    <string name="description_playback_seek" msgid="1340910573254132520">"Buscar posición de reproducción"</string>
-    <string name="action_menu_call_history_description" msgid="8829135306925008546">"Historial de llamadas"</string>
-    <string name="action_menu_overflow_description" msgid="7648679686746517341">"Más opciones"</string>
-    <string name="action_menu_dialpad_button" msgid="1970631633457493180">"teclado"</string>
-    <string name="dialer_settings_label" msgid="4980176284150290175">"Ajustes"</string>
-    <string name="simulator_submenu_label" msgid="186156287346615267">"Simulador"</string>
-    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Crear acceso a la interfaz"</string>
-    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"Entrando en el modo de acción en bloque"</string>
-    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"Se ha salido del modo de acción en bloque"</string>
-    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> seleccionado"</string>
-    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"Selección de <xliff:g id="NAMEORNUMBER">%1$s</xliff:g> anulada"</string>
-    <string name="description_contact_details" msgid="3341280873855253464">"Información de contacto de <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_spam_contact_details" msgid="5592578752881528368">"Información de contacto del posible spammer <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> llamadas."</string>
-    <string name="description_video_call" msgid="3738199365585751727">"Videollamada."</string>
-    <string name="description_start_voice_search" msgid="8380022725973015261">"Iniciar búsqueda por voz"</string>
-    <string name="voicemail" msgid="8899540969000957954">"Buzón de voz"</string>
-    <string name="description_cancel_multi_select" msgid="3930475950253360461">"Cancelar el modo de acciones en lote"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Eliminar"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Cancelar"</string>
-    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"Se han seleccionado <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
-      <item quantity="other">"<b>"¿Eliminar estos mensajes de voz? "</b>"</item>
-      <item quantity="one">"<b>"¿Eliminar este mensaje de voz? "</b>"</item>
-    </plurals>
-    <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
-    <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> a las <xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
-    <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="voice_search_not_available" msgid="6546240433719732905">"La búsqueda por voz no está disponible"</string>
-    <string name="dialer_hint_find_contact" msgid="2023214799381149808">"Buscar contactos"</string>
-    <string name="block_number_search_hint" msgid="5377706079015099416">"Añade número o busca contactos"</string>
-    <string name="call_log_all_empty" msgid="3955572868518162004">"Tu historial de llamadas está vacío"</string>
-    <string name="call_log_all_empty_action" msgid="852218280136243014">"Hacer una llamada"</string>
-    <string name="call_log_missed_empty" msgid="7094936030845062214">"No tienes llamadas perdidas."</string>
-    <string name="call_log_voicemail_empty" msgid="273623903423275178">"La bandeja de entrada del buzón de voz está vacía."</string>
-    <string name="call_log_activity_title" msgid="1275242727244945527">"Historial de llamadas"</string>
-    <string name="call_log_all_title" msgid="6042262422192020327">"Todas"</string>
-    <string name="call_log_missed_title" msgid="17254005889268015">"Perdidas"</string>
-    <string name="tab_speed_dial" msgid="6616404752227561075">"Marcación rápida"</string>
-    <string name="tab_history" msgid="7420269368689503596">"Historial de llamadas"</string>
-    <string name="tab_all_contacts" msgid="5531733977693943015">"Contactos"</string>
-    <string name="tab_voicemail" msgid="2458548090088316246">"Buzón de voz"</string>
-    <string name="search_shortcut_call_number" msgid="8847918845036880688">"Llamar a <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"Crear nuevo contacto"</string>
-    <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"Añadir a un contacto"</string>
-    <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"Enviar SMS"</string>
-    <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"Hacer videollamada"</string>
-    <string name="search_shortcut_block_number" msgid="4587283230665805776">"Bloquear número"</string>
-    <string name="speed_dial_empty" msgid="3346406399966039505">"Aún no tienes contactos en la función de marcación rápida"</string>
-    <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"Añadir un favorito"</string>
-    <string name="remove_contact" msgid="2353580570488923668">"Eliminar"</string>
-    <string name="select_all" msgid="408601760696146245">"Seleccionar todo"</string>
-    <string name="call_log_action_video_call" msgid="7565549950343850819">"Videollamada"</string>
-    <string name="call_log_action_send_message" msgid="6948727362660115554">"Enviar un mensaje"</string>
-    <string name="call_log_action_details" msgid="2091370737371449501">"Detalles de la llamada"</string>
-    <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"Enviar a…"</string>
-    <string name="call_log_action_call" msgid="682724094251540583">"Llamar a <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_incoming_missed_call" msgid="8292535799379230029">"Llamada perdida de <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_incoming_answered_call" msgid="3920182963103160610">"Has respondido una llamada de <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_unread_voicemail" msgid="145170985013419170">"Mensaje de voz sin leer de <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_read_voicemail" msgid="5585559881573227732">"Mensaje de voz de <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_outgoing_call" msgid="543952487882919924">"Llamar a <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="call_log_via_number" msgid="1340307109806397650">"a través del <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> a través del <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="description_call_action" msgid="4042796498169106545">"Llamar a <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_video_call_action" msgid="1237090968588659650">"Videollamada a <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
-    <string name="description_voicemail_action" msgid="3290143432403538524">"Escuchar el buzón de voz de <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_create_new_contact_action" msgid="1928282350281564130">"Crear contacto para <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"Añadir <xliff:g id="NAMEORNUMBER">^1</xliff:g> a un contacto"</string>
-    <string name="description_details_action" msgid="2061866409737706174">"Detalles de llamada de <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="call_log_header_today" msgid="1576119097475845293">"Hoy"</string>
-    <string name="call_log_header_yesterday" msgid="5616077776205329563">"Ayer"</string>
-    <string name="call_log_header_other" msgid="4940676886254217644">"Más antiguo"</string>
-    <string name="voicemail_speaker_on" msgid="3151333608926996668">"Activar altavoz."</string>
-    <string name="voicemail_speaker_off" msgid="2530064206962034201">"Desactivar altavoz."</string>
-    <string name="voicemail_play_start_pause" msgid="3874823480278334664">"Iniciar o pausar reproducción."</string>
-    <string name="display_options_title" msgid="3880091801055797975">"Opciones de visualización"</string>
-    <string name="sounds_and_vibration_title" msgid="3075050000721181384">"Sonido y vibración"</string>
-    <string name="accessibility_settings_title" msgid="3329027650429831820">"Accesibilidad"</string>
-    <string name="ringtone_title" msgid="8377174189894648486">"Tono del teléfono"</string>
-    <string name="vibrate_on_ring_title" msgid="631441314790960485">"Vibrar también en llamadas"</string>
-    <string name="dtmf_tone_enable_title" msgid="3273762431523939277">"Tonos del teclado"</string>
-    <string name="dtmf_tone_length_title" msgid="534096029202438539">"Duración del tono del teclado"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="applicationLabel">Teléfono</string>
+  <string name="launcherDialpadActivityLabel">Teclado del teléfono</string>
+  <string name="callHistoryIconLabel">Historial de llamadas</string>
+  <string name="action_copy_number_text">Copiar número</string>
+  <string name="copy_transcript_text">Copiar transcripción</string>
+  <string name="action_edit_number_before_call">Editar número antes de llamar</string>
+  <string name="call_log_delete_all">Borrar historial de llamadas</string>
+  <string name="call_log_trash_voicemail">Eliminar mensaje de voz</string>
+  <string name="snackbar_voicemail_deleted">Buzón voz eliminado</string>
+  <string name="clearCallLogConfirmation_title">¿Borrar historial de llamadas?</string>
+  <string name="clearCallLogConfirmation">Se eliminarán todas las llamadas del historial.</string>
+  <string name="clearCallLogProgress_title">Borrando historial de llamadas…</string>
+  <string name="notification_missedCallTitle">Llamada perdida</string>
+  <string name="notification_missedWorkCallTitle">Llamada de trabajo perdida</string>
+  <string name="notification_missedCallsTitle">Llamadas perdidas</string>
+  <string name="notification_missedCallsMsg">%d llamadas perdidas</string>
+  <string name="notification_missedCall_call_back">Llamar</string>
+  <string name="notification_missedCall_message">Mensaje</string>
+  <string name="post_call_notification_message">%1$s: %2$s</string>
+  <string name="notification_voicemail_text_format">Marcar %s</string>
+  <string name="notification_voicemail_no_vm_number">Número de buzón de voz desconocido</string>
+  <plurals name="notification_voicemail_title">
+    <item quantity="one"> mensaje de voz</item>
+    <item quantity="other"> %1$d mensajes de voz </item>
+  </plurals>
+  <string name="notification_voicemail_callers_list">%1$s, %2$s</string>
+  <string name="notification_new_voicemail_ticker">Nuevo mensaje de voz de %1$s</string>
+  <string name="voicemail_playback_error">Error al reproducir el buzón de voz</string>
+  <string name="voicemail_fetching_content">Cargando buzón de voz…</string>
+  <string name="voicemail_fetching_timout">Error al cargar el buzón de voz</string>
+  <string name="call_log_item_count_and_date">(%1$d) %2$s</string>
+  <string name="description_playback_speakerphone">Activar o desactivar el altavoz</string>
+  <string name="description_playback_seek">Buscar posición de reproducción</string>
+  <string name="action_menu_call_history_description">Historial de llamadas</string>
+  <string msgid="2295659037509008453" name="action_menu_overflow_description">Más opciones</string>
+  <string name="action_menu_dialpad_button">teclado</string>
+  <string name="dialer_settings_label">Ajustes</string>
+  <string name="simulator_submenu_label">Simulador</string>
+  <string name="new_ui_launcher_shortcut_label">Crear acceso a la interfaz</string>
+  <string name="description_entering_bulk_action_mode">Entrando en el modo de acción en bloque</string>
+  <string name="description_leaving_bulk_action_mode">Se ha salido del modo de acción en bloque</string>
+  <string name="description_selecting_bulk_action_mode">%1$s seleccionado</string>
+  <string name="description_unselecting_bulk_action_mode">Selección de %1$s anulada</string>
+  <string name="description_contact_details">Información de contacto de %1$s</string>
+  <string name="description_spam_contact_details">Información de contacto del posible spammer %1$s</string>
+  <string name="description_num_calls">%1$s llamadas.</string>
+  <string name="description_video_call">Videollamada.</string>
+  <string name="description_start_voice_search">Iniciar búsqueda por voz</string>
+  <string name="voicemail">Buzón de voz</string>
+  <string name="description_cancel_multi_select">Cancelar el modo de acciones en lote</string>
+  <string name="voicemailMultiSelectDeleteConfirm">Eliminar</string>
+  <string name="voicemailMultiSelectDeleteCancel">Cancelar</string>
+  <string name="voicemailMultiSelectActionBarTitle">Se han seleccionado %1$s</string>
+  <plurals name="delete_voicemails_confirmation_dialog_title">
+    <item quantity="one"><b>¿Eliminar este mensaje de voz? </b></item>
+    <item quantity="other"><b>¿Eliminar estos mensajes de voz? </b></item>
+  </plurals>
+  <string name="voicemailCallLogToday">@string/call_log_header_today</string>
+  <string name="voicemailCallLogDateTimeFormat">%1$s a las %2$s</string>
+  <string name="voicemailDurationFormat">%1$02d:%2$02d</string>
+  <string name="voicemailCallLogDateTimeFormatWithDuration">%1$s • %2$s</string>
+  <string name="voice_search_not_available">La búsqueda por voz no está disponible</string>
+  <string name="dialer_hint_find_contact">Buscar contactos</string>
+  <string name="block_number_search_hint">Añade número o busca contactos</string>
+  <string name="call_log_all_empty">Tu historial de llamadas está vacío</string>
+  <string name="call_log_all_empty_action">Hacer una llamada</string>
+  <string name="call_log_missed_empty">No tienes llamadas perdidas.</string>
+  <string name="call_log_voicemail_empty">La bandeja de entrada del buzón de voz está vacía.</string>
+  <string name="call_log_activity_title">Historial de llamadas</string>
+  <string name="call_log_all_title">Todas</string>
+  <string name="call_log_missed_title">Perdidas</string>
+  <string name="tab_speed_dial">Marcación rápida</string>
+  <string name="tab_history">Historial de llamadas</string>
+  <string name="tab_all_contacts">Contactos</string>
+  <string name="tab_voicemail">Buzón de voz</string>
+  <string name="search_shortcut_call_number">Llamar a %s</string>
+  <string name="search_shortcut_create_new_contact">Crear nuevo contacto</string>
+  <string name="search_shortcut_add_to_contact">Añadir a un contacto</string>
+  <string name="search_shortcut_send_sms_message">Enviar SMS</string>
+  <string name="search_shortcut_make_video_call">Hacer videollamada</string>
+  <string name="search_shortcut_block_number">Bloquear número</string>
+  <string name="speed_dial_empty">Aún no tienes contactos en la función de marcación rápida</string>
+  <string name="speed_dial_empty_add_favorite_action">Añadir un favorito</string>
+  <string name="remove_contact">Eliminar</string>
+  <string name="select_all">Seleccionar todo</string>
+  <string name="call_log_action_video_call">Videollamada</string>
+  <string name="call_log_action_set_up_video">Configurar una videollamada</string>
+  <string name="call_log_action_invite_video">Invitar a una videollamada</string>
+  <string name="call_log_action_send_message">Enviar un mensaje</string>
+  <string name="call_log_action_details">Detalles de la llamada</string>
+  <string name="call_log_action_share_voicemail">Enviar a…</string>
+  <string name="call_log_action_call">Llamar a ^1</string>
+  <string name="description_incoming_missed_call">Llamada perdida de ^1, ^2, ^3, ^4.</string>
+  <string name="description_incoming_answered_call">Has respondido una llamada de ^1, ^2, ^3, ^4.</string>
+  <string name="description_unread_voicemail">Mensaje de voz sin leer de ^1, ^2, ^3, ^4.</string>
+  <string name="description_read_voicemail">Mensaje de voz de ^1, ^2, ^3, ^4.</string>
+  <string name="description_outgoing_call">Llamar a ^1, ^2, ^3, ^4.</string>
+  <string name="call_log_via_number">a través del %1$s</string>
+  <string name="call_log_via_number_phone_account">%1$s a través del %2$s</string>
+  <string name="description_call_action">Llamar a ^1</string>
+  <string name="description_video_call_action">Videollamada a ^1.</string>
+  <string name="description_voicemail_action">Escuchar el buzón de voz de ^1</string>
+  <string name="description_create_new_contact_action">Crear contacto para ^1</string>
+  <string name="description_add_to_existing_contact_action">Añadir ^1 a un contacto</string>
+  <string name="description_details_action">Detalles de llamada de ^1</string>
+  <string name="call_log_header_today">Hoy</string>
+  <string name="call_log_header_yesterday">Ayer</string>
+  <string name="call_log_header_other">Más antiguo</string>
+  <string name="voicemail_speaker_on">Activar altavoz.</string>
+  <string name="voicemail_speaker_off">Desactivar altavoz.</string>
+  <string name="voicemail_play_start_pause">Iniciar o pausar reproducción.</string>
+  <string name="display_options_title">Opciones de visualización</string>
+  <string name="sounds_and_vibration_title">Sonido y vibración</string>
+  <string name="accessibility_settings_title">Accesibilidad</string>
+  <string name="ringtone_title">Tono del teléfono</string>
+  <string name="vibrate_on_ring_title">Vibrar también en llamadas</string>
+  <string name="dtmf_tone_enable_title">Tonos del teclado</string>
+  <string name="dtmf_tone_length_title">Duración del tono del teclado</string>
   <string-array name="dtmf_tone_length_entries">
-    <item msgid="3136353015227162823">"Tono normal"</item>
-    <item msgid="5376841175538523822">"Largo"</item>
+    <item>Tono normal</item>
+    <item>Largo</item>
   </string-array>
-    <string name="respond_via_sms_setting_title" msgid="8008181606657693452">"Respuestas rápidas"</string>
-    <string name="call_settings_label" msgid="7824611757200960807">"Llamadas"</string>
-    <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Bloqueo de llamadas"</string>
-    <string name="voicemail_settings_label" msgid="4594299554519920570">"Buzón de voz"</string>
-    <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Bloqueo de llamadas desactivado temporalmente"</string>
-    <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Se ha inhabilitado el bloqueo de llamadas porque te has puesto en contacto con los servicios de emergencia desde este teléfono en las últimas 48 horas. Se volverá a habilitar automáticamente cuando finalice este periodo de tiempo."</string>
-    <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Importar números"</string>
-    <string name="blocked_call_settings_import_description" msgid="1819412052545228965">"Anteriormente marcaste algunas llamadas para que se enviaran automáticamente al buzón de voz a través de otras aplicaciones."</string>
-    <string name="blocked_call_settings_view_numbers_button" msgid="3332727948554356704">"Ver números"</string>
-    <string name="blocked_call_settings_import_button" msgid="7319111700387470727">"Importar"</string>
-    <string name="description_blocked_number_list_delete" msgid="2139644216858370740">"Desbloquear número"</string>
-    <string name="addBlockedNumber" msgid="3053473735238295551">"Añadir número"</string>
-    <string name="block_number_footer_message_vvm" msgid="7955326304033982368">"Se bloquearán las llamadas de estos números y se eliminarán los mensajes del buzón de voz automáticamente."</string>
-    <string name="block_number_footer_message_no_vvm" msgid="1152684139070471665">"Se bloquearán las llamadas de estos números, pero podrán seguir dejando mensajes en el buzón de voz."</string>
-    <string name="block_list" msgid="4701585783411870782">"Números bloqueados"</string>
-    <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g> ya está bloqueado."</string>
-    <string name="phone_account_settings_label" msgid="8372485478006965920">"Cuentas de llamadas"</string>
-    <string name="permission_no_speeddial" msgid="8487215628510596753">"Para habilitar la marcación rápida, activa el permiso la aplicación Contactos."</string>
-    <string name="permission_no_calllog" msgid="4053705651238775784">"Para ver el registro de llamadas, activa el permiso de la aplicación Teléfono."</string>
-    <string name="permission_no_search" msgid="2424710404207193826">"Para poder buscar tus contactos, activa los permisos de contactos."</string>
-    <string name="permission_place_call" msgid="8686908130349369423">"Para hacer una llamada, activa el permiso de la aplicación Teléfono."</string>
-    <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"La aplicación Teléfono no tiene permiso para editar los ajustes del sistema."</string>
-    <string name="blocked_number_call_log_label" msgid="4212282846299997693">"Bloqueado"</string>
-    <string name="call_log_action_block_report_number" msgid="7302636538668696729">"Bloquear/Marcar como spam"</string>
-    <string name="call_log_action_block_number" msgid="5048188386501998865">"Bloquear número"</string>
-    <string name="call_log_action_remove_spam" msgid="2045319806318398403">"No es spam"</string>
-    <string name="call_log_action_unblock_number" msgid="6100117033288448758">"Desbloquear número"</string>
-    <string name="spam_number_call_log_label" msgid="2678431398326811131">"Spam"</string>
-    <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> no tiene conexión y no se puede contactar"</string>
-    <string name="about_phone_label" msgid="582991354677973731">"Información"</string>
-    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Transcrito por Google"</string>
-    <string name="voicemail_transcription_in_progress" msgid="2933320969613783210">"Google está transcribiendo…"</string>
-    <string name="voicemail_transcription_failed" msgid="335275303117412706">"La transcripción no está disponible."</string>
-    <string name="voicemail_transcription_failed_language_not_supported" msgid="4210332591050562553">"La transcripción no está disponible. No se admite el idioma."</string>
-    <string name="voicemail_transcription_failed_no_speech" msgid="9093372879697874852">"La transcripción no está disponible. No se detectó ninguna voz."</string>
-    <string name="view_conversation" msgid="7895904782094119702">"Ver"</string>
-    <string name="ec_data_deleted" msgid="4794880345545827107">"Se ha eliminado la llamada. Si quieres ver y eliminar los archivos adjuntos compartidos durante esta llamada, ve a Mensajes."</string>
-    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"Se han eliminado las llamadas. Si quieres ver y eliminar los archivos adjuntos compartidos durante las llamadas, ve a Mensajes."</string>
+  <string name="respond_via_sms_setting_title">Respuestas rápidas</string>
+  <string name="call_settings_label">Llamadas</string>
+  <string name="manage_blocked_numbers_label">Números bloqueados</string>
+  <string name="voicemail_settings_label">Buzón de voz</string>
+  <string name="blocked_numbers_disabled_emergency_header_label">Bloqueo de llamadas desactivado temporalmente</string>
+  <string name="blocked_numbers_disabled_emergency_desc">Se ha inhabilitado el bloqueo de llamadas porque te has puesto en contacto con los servicios de emergencia desde este teléfono en las últimas 48 horas. Se volverá a habilitar automáticamente cuando finalice este periodo de tiempo.</string>
+  <string name="import_send_to_voicemail_numbers_label">Importar números</string>
+  <string name="blocked_call_settings_import_description">Anteriormente marcaste algunas llamadas para que se enviaran automáticamente al buzón de voz a través de otras aplicaciones.</string>
+  <string name="blocked_call_settings_view_numbers_button">Ver números</string>
+  <string name="blocked_call_settings_import_button">Importar</string>
+  <string name="description_blocked_number_list_delete">Desbloquear número</string>
+  <string name="addBlockedNumber">Añadir número</string>
+  <string name="block_number_footer_message_vvm">Se bloquearán las llamadas de estos números y se eliminarán los mensajes del buzón de voz automáticamente.</string>
+  <string name="block_number_footer_message_no_vvm">Se bloquearán las llamadas de estos números, pero podrán seguir dejando mensajes en el buzón de voz.</string>
+  <string name="block_list">Números bloqueados</string>
+  <string name="alreadyBlocked">%1$s ya está bloqueado.</string>
+  <string name="phone_account_settings_label">Cuentas de llamadas</string>
+  <string name="permission_no_speeddial">Para habilitar la marcación rápida, activa el permiso la aplicación Contactos.</string>
+  <string name="permission_no_calllog">Para ver el registro de llamadas, habilita el permiso de teléfono.</string>
+  <string name="permission_no_search">Para poder buscar tus contactos, activa los permisos de contactos.</string>
+  <string name="permission_place_call">Para hacer una llamada, activa el permiso de la aplicación Teléfono.</string>
+  <string name="toast_cannot_write_system_settings">La aplicación Teléfono no tiene permiso para editar los ajustes del sistema.</string>
+  <string name="blocked_number_call_log_label">Bloqueado</string>
+  <string name="call_log_action_block_report_number">Bloquear/Marcar como spam</string>
+  <string name="call_log_action_block_number">Bloquear número</string>
+  <string name="call_log_action_remove_spam">No es spam</string>
+  <string name="call_log_action_unblock_number">Desbloquear número</string>
+  <string name="spam_number_call_log_label">Spam</string>
+  <string name="call_composer_connection_failed">%1$s no tiene conexión y no se puede contactar</string>
+  <string name="about_phone_label">Información</string>
+  <string name="voicemail_transcription_branding_text">Transcrito por Google</string>
+  <string name="voicemail_transcription_in_progress">Transcribiendo…</string>
+  <string name="voicemail_transcription_failed">La transcripción no está disponible.</string>
+  <string name="voicemail_transcription_failed_language_not_supported">La transcripción no está disponible. No se admite el idioma.</string>
+  <string name="voicemail_transcription_failed_no_speech">La transcripción no está disponible. No se detectó ninguna voz.</string>
+  <string name="voicemail_donation_promo_title">¿Quieres ayudarnos a mejorar la precisión de las transcripciones?</string>
+  <string name="voicemail_donation_promo_content">Deja que Google revise este y otros mensajes del buzón de voz que recibas mediante transcripciones. Se guardarán de manera anónima. Puedes cambiar esta opción en Ajustes cuando quieras. %1$s</string>
+  <string name="voicemail_donation_promo_opt_in">Sí, acepto</string>
+  <string name="voicemail_donation_promo_opt_out">No, gracias</string>
+  <string name="voicemail_transcription_rating">Valora la calidad de transcripción</string>
+  <string name="voicemail_transcription_rating_thanks">Gracias por tus comentarios</string>
+  <string name="description_rating_good">Me gusta</string>
+  <string name="description_rating_bad">No me gusta</string>
+  <string name="view_conversation">Ver</string>
+  <string name="ec_data_deleted">Se ha eliminado la llamada. Si quieres ver y eliminar los archivos adjuntos compartidos durante esta llamada, ve a Mensajes.</string>
+  <string name="multiple_ec_data_deleted">Se han eliminado las llamadas. Si quieres ver y eliminar los archivos adjuntos compartidos durante las llamadas, ve a Mensajes.</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-et/strings.xml b/java/com/android/dialer/app/res/values-et/strings.xml
index 52d62a7..64551ec 100644
--- a/java/com/android/dialer/app/res/values-et/strings.xml
+++ b/java/com/android/dialer/app/res/values-et/strings.xml
@@ -1,179 +1,171 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="applicationLabel" msgid="2202739481132958990">"Telefon"</string>
-    <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"Telefoni klaviatuur"</string>
-    <string name="callHistoryIconLabel" msgid="7493268743411968630">"Kõneajalugu"</string>
-    <string name="action_copy_number_text" msgid="832682558551502319">"Kopeeri number"</string>
-    <string name="copy_transcript_text" msgid="937904189017310829">"Kopeeri transkribeerimine"</string>
-    <string name="action_edit_number_before_call" msgid="8017492815878473837">"Muuda enne helistamist numbrit"</string>
-    <string name="call_log_delete_all" msgid="7852970926906523784">"Kõneajaloo kustutamine"</string>
-    <string name="call_log_trash_voicemail" msgid="6118493534178533972">"Kustuta kõnepost"</string>
-    <string name="snackbar_voicemail_deleted" msgid="7463166543725496307">"Kõnepost kustutati"</string>
-    <string name="snackbar_voicemail_deleted_undo" msgid="6959743982796409941">"VÕTA TAGASI"</string>
-    <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"Kas kustutada kõneajalugu?"</string>
-    <string name="clearCallLogConfirmation" msgid="6844949465815109166">"See kustutab ajaloost kõik kõned"</string>
-    <string name="clearCallLogProgress_title" msgid="995004835687361977">"Kõneajaloo kustutamine ..."</string>
-    <string name="notification_missedCallTitle" msgid="8283366068539898486">"Vastamata kõne"</string>
-    <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"Vastamata kõne töölt"</string>
-    <string name="notification_missedCallsTitle" msgid="3697442015345089802">"Vastamata kõned"</string>
-    <string name="notification_missedCallsMsg" msgid="8176217633929018706">"<xliff:g id="NUM_MISSED_CALLS">%d</xliff:g> vastamata kõnet"</string>
-    <string name="notification_missedCall_call_back" msgid="3875698110051973965">"Helista tagasi"</string>
-    <string name="notification_missedCall_message" msgid="5086910028988305964">"Saada sõnum"</string>
-    <string name="post_call_notification_message" msgid="5417476789860590611">"<xliff:g id="NAME">%1$s</xliff:g>: <xliff:g id="MESSAGE">%2$s</xliff:g>"</string>
-    <string name="notification_voicemail_text_format" msgid="1895667520930252897">"Valige <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
-    <string name="notification_voicemail_no_vm_number" msgid="8942821987929495842">"Kõneposti number on teadmata"</string>
-    <plurals name="notification_voicemail_title" formatted="false" msgid="1551847434476438657">
-      <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> kõneposti teadet </item>
-      <item quantity="one">Kõneposti teade</item>
-    </plurals>
-    <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
-    <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"Uus kõnepostisõnum kasutajalt <xliff:g id="CALLER">%1$s</xliff:g>"</string>
-    <string name="voicemail_playback_error" msgid="4384373852257757295">"Kõneposti ei õnnestunud esitada"</string>
-    <string name="voicemail_fetching_content" msgid="572320120918636014">"Kõneposti laadimine ..."</string>
-    <string name="voicemail_fetching_timout" msgid="2128873915839949783">"Kõneposti laadimine ebaõnnestus"</string>
-    <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_playback_speakerphone" msgid="4852027754869750227">"Valjuhääldi sisse- või väljalülitamine"</string>
-    <string name="description_playback_seek" msgid="1340910573254132520">"Taasesituse positsiooni otsimine"</string>
-    <string name="action_menu_call_history_description" msgid="8829135306925008546">"Kõneajalugu"</string>
-    <string name="action_menu_overflow_description" msgid="7648679686746517341">"Rohkem valikuid"</string>
-    <string name="action_menu_dialpad_button" msgid="1970631633457493180">"klaviatuur"</string>
-    <string name="dialer_settings_label" msgid="4980176284150290175">"Seaded"</string>
-    <string name="simulator_submenu_label" msgid="186156287346615267">"Simulaator"</string>
-    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Loo uue kasutajaliid. otsetee"</string>
-    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"Sisenemine hulgitoimingute režiimi"</string>
-    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"Lahkumine hulgitoimingute režiimist"</string>
-    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> on valitud"</string>
-    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> on valimata"</string>
-    <string name="description_contact_details" msgid="3341280873855253464">"Kontakti <xliff:g id="NAMEORNUMBER">%1$s</xliff:g> üksikasjad"</string>
-    <string name="description_spam_contact_details" msgid="5592578752881528368">"Arvatava rämpskõnetegija <xliff:g id="NAMEORNUMBER">%1$s</xliff:g> kontaktandmed"</string>
-    <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> kõnet."</string>
-    <string name="description_video_call" msgid="3738199365585751727">"Videokõne."</string>
-    <string name="description_start_voice_search" msgid="8380022725973015261">"Häälotsingu alustamine"</string>
-    <string name="voicemail" msgid="8899540969000957954">"Kõnepost"</string>
-    <string name="description_cancel_multi_select" msgid="3930475950253360461">"Mitme toimigu režiimi tühistamine"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Kustuta"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Tühista"</string>
-    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> on valitud"</string>
-    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
-      <item quantity="other">"<b>"Kas kustutada need kõnepostisõnumid? "</b>"</item>
-      <item quantity="one">"<b>"Kas kustutada see kõnepostisõnum? "</b>"</item>
-    </plurals>
-    <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
-    <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> kell <xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
-    <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="voice_search_not_available" msgid="6546240433719732905">"Häälotsing ei ole saadaval"</string>
-    <string name="dialer_hint_find_contact" msgid="2023214799381149808">"Otsige kontakte"</string>
-    <string name="block_number_search_hint" msgid="5377706079015099416">"Lisage nr või otsige kontakte"</string>
-    <string name="call_log_all_empty" msgid="3955572868518162004">"Teie kõneajalugu on tühi"</string>
-    <string name="call_log_all_empty_action" msgid="852218280136243014">"Helista"</string>
-    <string name="call_log_missed_empty" msgid="7094936030845062214">"Vastamata kõnesid pole."</string>
-    <string name="call_log_voicemail_empty" msgid="273623903423275178">"Kõneposti postkast on tühi."</string>
-    <string name="call_log_activity_title" msgid="1275242727244945527">"Kõneajalugu"</string>
-    <string name="call_log_all_title" msgid="6042262422192020327">"Kõik"</string>
-    <string name="call_log_missed_title" msgid="17254005889268015">"Vastamata"</string>
-    <string name="tab_speed_dial" msgid="6616404752227561075">"Kiirvalimine"</string>
-    <string name="tab_history" msgid="7420269368689503596">"Kõneajalugu"</string>
-    <string name="tab_all_contacts" msgid="5531733977693943015">"Kontaktid"</string>
-    <string name="tab_voicemail" msgid="2458548090088316246">"Kõnepost"</string>
-    <string name="search_shortcut_call_number" msgid="8847918845036880688">"Helista: <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"Loo uus kontakt"</string>
-    <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"Lisa kontaktile"</string>
-    <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"Saada SMS"</string>
-    <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"Videokõne tegemine"</string>
-    <string name="search_shortcut_block_number" msgid="4587283230665805776">"Blokeeri number"</string>
-    <string name="speed_dial_empty" msgid="3346406399966039505">"Te pole veel kedagi kiirvalimisse lisanud"</string>
-    <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"Lisa lemmik"</string>
-    <string name="remove_contact" msgid="2353580570488923668">"Eemalda"</string>
-    <string name="select_all" msgid="408601760696146245">"Vali kõik"</string>
-    <string name="call_log_action_video_call" msgid="7565549950343850819">"Videokõne"</string>
-    <string name="call_log_action_send_message" msgid="6948727362660115554">"Saada sõnum"</string>
-    <string name="call_log_action_details" msgid="2091370737371449501">"Kõne üksikasjad"</string>
-    <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"Saada: …"</string>
-    <string name="call_log_action_call" msgid="682724094251540583">"Helistamine: <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_incoming_missed_call" msgid="8292535799379230029">"Vastamata kõne: <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_incoming_answered_call" msgid="3920182963103160610">"Vastati kõnele: <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_unread_voicemail" msgid="145170985013419170">"Lugemata kõnepost kasutajalt <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_read_voicemail" msgid="5585559881573227732">"Kõnepost kasutajalt <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_outgoing_call" msgid="543952487882919924">"Kõne: <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="call_log_via_number" msgid="1340307109806397650">"numbri <xliff:g id="NUMBER">%1$s</xliff:g> kaudu"</string>
-    <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> numbri <xliff:g id="NUMBER">%2$s</xliff:g> kaudu"</string>
-    <string name="description_call_action" msgid="4042796498169106545">"Helistamine: <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_video_call_action" msgid="1237090968588659650">"Videokõne kirjele <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
-    <string name="description_voicemail_action" msgid="3290143432403538524">"Kontakti <xliff:g id="NAMEORNUMBER">^1</xliff:g> kõneposti kuulamine"</string>
-    <string name="description_create_new_contact_action" msgid="1928282350281564130">"Kontakti loomine kirjele <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"Kirje <xliff:g id="NAMEORNUMBER">^1</xliff:g> lisamine olemasolevale kontaktile"</string>
-    <string name="description_details_action" msgid="2061866409737706174">"Kontakti <xliff:g id="NAMEORNUMBER">^1</xliff:g> kõne üksikasjad"</string>
-    <string name="call_log_header_today" msgid="1576119097475845293">"Täna"</string>
-    <string name="call_log_header_yesterday" msgid="5616077776205329563">"Eile"</string>
-    <string name="call_log_header_other" msgid="4940676886254217644">"Vanem"</string>
-    <string name="voicemail_speaker_on" msgid="3151333608926996668">"Kõlari sisselülitamine."</string>
-    <string name="voicemail_speaker_off" msgid="2530064206962034201">"Kõlari väljalülitamine."</string>
-    <string name="voicemail_play_start_pause" msgid="3874823480278334664">"Esituse alustamine või peatamine."</string>
-    <string name="display_options_title" msgid="3880091801055797975">"Kuvamisvalikud"</string>
-    <string name="sounds_and_vibration_title" msgid="3075050000721181384">"Helid ja vibreerimine"</string>
-    <string name="accessibility_settings_title" msgid="3329027650429831820">"Juurdepääsetavus"</string>
-    <string name="ringtone_title" msgid="8377174189894648486">"Telefoni helin"</string>
-    <string name="vibrate_on_ring_title" msgid="631441314790960485">"Vibreeri ka kõnede puhul"</string>
-    <string name="dtmf_tone_enable_title" msgid="3273762431523939277">"Klaviatuuri toonid"</string>
-    <string name="dtmf_tone_length_title" msgid="534096029202438539">"Klaviatuuri toonide pikkus"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="applicationLabel">Telefon</string>
+  <string name="launcherDialpadActivityLabel">Telefoni klaviatuur</string>
+  <string name="callHistoryIconLabel">Kõneajalugu</string>
+  <string name="action_copy_number_text">Kopeeri number</string>
+  <string name="copy_transcript_text">Kopeeri transkribeerimine</string>
+  <string name="action_edit_number_before_call">Muuda enne helistamist numbrit</string>
+  <string name="call_log_delete_all">Kõneajaloo kustutamine</string>
+  <string name="call_log_trash_voicemail">Kustuta kõnepost</string>
+  <string name="snackbar_voicemail_deleted">Kõnepost kustutati</string>
+  <string name="clearCallLogConfirmation_title">Kas kustutada kõneajalugu?</string>
+  <string name="clearCallLogConfirmation">See kustutab ajaloost kõik kõned</string>
+  <string name="clearCallLogProgress_title">Kõneajaloo kustutamine ...</string>
+  <string name="notification_missedCallTitle">Vastamata kõne</string>
+  <string name="notification_missedWorkCallTitle">Vastamata kõne töölt</string>
+  <string name="notification_missedCallsTitle">Vastamata kõned</string>
+  <string name="notification_missedCallsMsg">%d vastamata kõnet</string>
+  <string name="notification_missedCall_call_back">Helista tagasi</string>
+  <string name="notification_missedCall_message">Saada sõnum</string>
+  <string name="post_call_notification_message">%1$s: %2$s</string>
+  <string name="notification_voicemail_text_format">Valige %s</string>
+  <string name="notification_voicemail_no_vm_number">Kõneposti number on teadmata</string>
+  <plurals name="notification_voicemail_title">
+    <item quantity="one">Kõneposti teade</item>
+    <item quantity="other"> %1$d kõneposti teadet </item>
+  </plurals>
+  <string name="notification_voicemail_callers_list">%1$s, %2$s</string>
+  <string name="notification_new_voicemail_ticker">Uus kõnepostisõnum kasutajalt %1$s</string>
+  <string name="voicemail_playback_error">Kõneposti ei õnnestunud esitada</string>
+  <string name="voicemail_fetching_content">Kõneposti laadimine ...</string>
+  <string name="voicemail_fetching_timout">Kõneposti laadimine ebaõnnestus</string>
+  <string name="call_log_item_count_and_date">(%1$d) %2$s</string>
+  <string name="description_playback_speakerphone">Valjuhääldi sisse- või väljalülitamine</string>
+  <string name="description_playback_seek">Taasesituse positsiooni otsimine</string>
+  <string name="action_menu_call_history_description">Kõneajalugu</string>
+  <string msgid="2295659037509008453" name="action_menu_overflow_description">Rohkem valikuid</string>
+  <string name="action_menu_dialpad_button">klaviatuur</string>
+  <string name="dialer_settings_label">Seaded</string>
+  <string name="simulator_submenu_label">Simulaator</string>
+  <string name="new_ui_launcher_shortcut_label">Loo uue kasutajaliid. otsetee</string>
+  <string name="description_entering_bulk_action_mode">Sisenemine hulgitoimingute režiimi</string>
+  <string name="description_leaving_bulk_action_mode">Lahkumine hulgitoimingute režiimist</string>
+  <string name="description_selecting_bulk_action_mode">%1$s on valitud</string>
+  <string name="description_unselecting_bulk_action_mode">%1$s on valimata</string>
+  <string name="description_contact_details">Kontakti %1$s üksikasjad</string>
+  <string name="description_spam_contact_details">Arvatava rämpskõnetegija %1$s kontaktandmed</string>
+  <string name="description_num_calls">%1$s kõnet.</string>
+  <string name="description_video_call">Videokõne.</string>
+  <string name="description_start_voice_search">Häälotsingu alustamine</string>
+  <string name="voicemail">Kõnepost</string>
+  <string name="description_cancel_multi_select">Mitme toimigu režiimi tühistamine</string>
+  <string name="voicemailMultiSelectDeleteConfirm">Kustuta</string>
+  <string name="voicemailMultiSelectDeleteCancel">Tühista</string>
+  <string name="voicemailMultiSelectActionBarTitle">%1$s on valitud</string>
+  <plurals name="delete_voicemails_confirmation_dialog_title">
+    <item quantity="one"><b>Kas kustutada see kõnepostisõnum? </b></item>
+    <item quantity="other"><b>Kas kustutada need kõnepostisõnumid? </b></item>
+  </plurals>
+  <string name="voicemailCallLogToday">@string/call_log_header_today</string>
+  <string name="voicemailCallLogDateTimeFormat">%1$s kell %2$s</string>
+  <string name="voicemailDurationFormat">%1$02d:%2$02d</string>
+  <string name="voicemailCallLogDateTimeFormatWithDuration">%1$s • %2$s</string>
+  <string name="voice_search_not_available">Häälotsing ei ole saadaval</string>
+  <string name="dialer_hint_find_contact">Otsige kontakte</string>
+  <string name="block_number_search_hint">Lisage nr või otsige kontakte</string>
+  <string name="call_log_all_empty">Teie kõneajalugu on tühi</string>
+  <string name="call_log_all_empty_action">Helista</string>
+  <string name="call_log_missed_empty">Vastamata kõnesid pole.</string>
+  <string name="call_log_voicemail_empty">Kõneposti postkast on tühi.</string>
+  <string name="call_log_activity_title">Kõneajalugu</string>
+  <string name="call_log_all_title">Kõik</string>
+  <string name="call_log_missed_title">Vastamata</string>
+  <string name="tab_speed_dial">Kiirvalimine</string>
+  <string name="tab_history">Kõneajalugu</string>
+  <string name="tab_all_contacts">Kontaktid</string>
+  <string name="tab_voicemail">Kõnepost</string>
+  <string name="search_shortcut_call_number">Helista: %s</string>
+  <string name="search_shortcut_create_new_contact">Loo uus kontakt</string>
+  <string name="search_shortcut_add_to_contact">Lisa kontaktile</string>
+  <string name="search_shortcut_send_sms_message">Saada SMS</string>
+  <string name="search_shortcut_make_video_call">Videokõne tegemine</string>
+  <string name="search_shortcut_block_number">Blokeeri number</string>
+  <string name="speed_dial_empty">Te pole veel kedagi kiirvalimisse lisanud</string>
+  <string name="speed_dial_empty_add_favorite_action">Lisa lemmik</string>
+  <string name="remove_contact">Eemalda</string>
+  <string name="select_all">Vali kõik</string>
+  <string name="call_log_action_video_call">Videokõne</string>
+  <string name="call_log_action_set_up_video">Videokõne seadistamine</string>
+  <string name="call_log_action_invite_video">Videokõnesse kutsumine</string>
+  <string name="call_log_action_send_message">Saada sõnum</string>
+  <string name="call_log_action_details">Kõne üksikasjad</string>
+  <string name="call_log_action_share_voicemail">Saada: …</string>
+  <string name="call_log_action_call">Helistamine: ^1</string>
+  <string name="description_incoming_missed_call">Vastamata kõne: ^1, ^2, ^3, ^4.</string>
+  <string name="description_incoming_answered_call">Vastati kõnele: ^1, ^2, ^3, ^4.</string>
+  <string name="description_unread_voicemail">Lugemata kõnepost kasutajalt ^1, ^2, ^3, ^4.</string>
+  <string name="description_read_voicemail">Kõnepost kasutajalt ^1, ^2, ^3, ^4.</string>
+  <string name="description_outgoing_call">Kõne: ^1, ^2, ^3, ^4.</string>
+  <string name="call_log_via_number">numbri %1$s kaudu</string>
+  <string name="call_log_via_number_phone_account">%1$s numbri %2$s kaudu</string>
+  <string name="description_call_action">Helistamine: ^1</string>
+  <string name="description_video_call_action">Videokõne kirjele ^1.</string>
+  <string name="description_voicemail_action">Kontakti ^1 kõneposti kuulamine</string>
+  <string name="description_create_new_contact_action">Kontakti loomine kirjele ^1</string>
+  <string name="description_add_to_existing_contact_action">Kirje ^1 lisamine olemasolevale kontaktile</string>
+  <string name="description_details_action">Kontakti ^1 kõne üksikasjad</string>
+  <string name="call_log_header_today">Täna</string>
+  <string name="call_log_header_yesterday">Eile</string>
+  <string name="call_log_header_other">Vanem</string>
+  <string name="voicemail_speaker_on">Kõlari sisselülitamine.</string>
+  <string name="voicemail_speaker_off">Kõlari väljalülitamine.</string>
+  <string name="voicemail_play_start_pause">Esituse alustamine või peatamine.</string>
+  <string name="display_options_title">Kuvamisvalikud</string>
+  <string name="sounds_and_vibration_title">Helid ja vibreerimine</string>
+  <string name="accessibility_settings_title">Juurdepääsetavus</string>
+  <string name="ringtone_title">Telefoni helin</string>
+  <string name="vibrate_on_ring_title">Vibreeri ka kõnede puhul</string>
+  <string name="dtmf_tone_enable_title">Klaviatuuri toonid</string>
+  <string name="dtmf_tone_length_title">Klaviatuuri toonide pikkus</string>
   <string-array name="dtmf_tone_length_entries">
-    <item msgid="3136353015227162823">"Tavaline"</item>
-    <item msgid="5376841175538523822">"Pikk"</item>
+    <item>Tavaline</item>
+    <item>Pikk</item>
   </string-array>
-    <string name="respond_via_sms_setting_title" msgid="8008181606657693452">"Kiirvastused"</string>
-    <string name="call_settings_label" msgid="7824611757200960807">"Kõned"</string>
-    <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Kõnede blokeerimine"</string>
-    <string name="voicemail_settings_label" msgid="4594299554519920570">"Kõnepost"</string>
-    <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Kõnede blokeerimine on ajutiselt väljas"</string>
-    <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Kõnede blokeerimine on keelatud, kuna võtsite sellelt telefonilt viimase 48 tunni jooksul ühendust hädaabiteenustega. See lubatakse 48 tunni möödumisel automaatselt uuesti."</string>
-    <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Impordi numbrid"</string>
-    <string name="blocked_call_settings_import_description" msgid="1819412052545228965">"Märkisite varem, et osad helistajad saadetaks muude rakenduste kaudu automaatselt kõneposti."</string>
-    <string name="blocked_call_settings_view_numbers_button" msgid="3332727948554356704">"Vaata numbreid"</string>
-    <string name="blocked_call_settings_import_button" msgid="7319111700387470727">"Impordi"</string>
-    <string name="description_blocked_number_list_delete" msgid="2139644216858370740">"Numbri deblokeerimine"</string>
-    <string name="addBlockedNumber" msgid="3053473735238295551">"Lisa number"</string>
-    <string name="block_number_footer_message_vvm" msgid="7955326304033982368">"Kõned nendelt numbritelt blokeeritakse ja kõnepostisõnumid kustutatakse automaatselt."</string>
-    <string name="block_number_footer_message_no_vvm" msgid="1152684139070471665">"Kõned nendelt numbritelt blokeeritakse, kuid helistajad saavad võib-olla siiski teile kõnepostisõnumeid jätta."</string>
-    <string name="block_list" msgid="4701585783411870782">"Blokeeritud numbrid"</string>
-    <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g> on juba blokeeritud."</string>
-    <string name="phone_account_settings_label" msgid="8372485478006965920">"Helistamiskontod"</string>
-    <string name="permission_no_speeddial" msgid="8487215628510596753">"Kiirvalimise lubamiseks lülitage sisse kontaktiluba."</string>
-    <string name="permission_no_calllog" msgid="4053705651238775784">"Kõnelogi vaatamiseks lülitage sisse telefoniluba."</string>
-    <string name="permission_no_search" msgid="2424710404207193826">"Kontaktide otsimiseks lülitage sisse kontaktiload."</string>
-    <string name="permission_place_call" msgid="8686908130349369423">"Helistamiseks lülitage sisse telefoniluba."</string>
-    <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"Telefonirakendusel pole luba süsteemiseadetesse kirjutada."</string>
-    <string name="blocked_number_call_log_label" msgid="4212282846299997693">"Blokeeritud"</string>
-    <string name="call_log_action_block_report_number" msgid="7302636538668696729">"Blokeeri / teavita rämpssisust"</string>
-    <string name="call_log_action_block_number" msgid="5048188386501998865">"Blokeeri number"</string>
-    <string name="call_log_action_remove_spam" msgid="2045319806318398403">"Pole rämpssisu"</string>
-    <string name="call_log_action_unblock_number" msgid="6100117033288448758">"Numbri deblokeerimine"</string>
-    <string name="spam_number_call_log_label" msgid="2678431398326811131">"Rämpspost"</string>
-    <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> ei ole võrgus ja temaga ei saa ühendust"</string>
-    <string name="about_phone_label" msgid="582991354677973731">"Teave"</string>
-    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Google\'i transkribeeritud"</string>
-    <string name="voicemail_transcription_in_progress" msgid="2933320969613783210">"Google transkribeerib …"</string>
-    <string name="voicemail_transcription_failed" msgid="335275303117412706">"Transkribeerimine pole saadaval."</string>
-    <string name="voicemail_transcription_failed_language_not_supported" msgid="4210332591050562553">"Transkribeerimine pole saadaval. Keelt ei toetata."</string>
-    <string name="voicemail_transcription_failed_no_speech" msgid="9093372879697874852">"Transkribeerimine pole saadaval. Kõnet ei tuvastatud."</string>
-    <string name="view_conversation" msgid="7895904782094119702">"Kuva"</string>
-    <string name="ec_data_deleted" msgid="4794880345545827107">"Kõne kustutati. Selle kõne ajal jagatud manuseid saate vaadata ja kustutada rakenduses Messages."</string>
-    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"Kõned kustutati. Nende kõnede ajal jagatud manuseid saate vaadata ja kustutada rakenduses Messages."</string>
+  <string name="respond_via_sms_setting_title">Kiirvastused</string>
+  <string name="call_settings_label">Kõned</string>
+  <string name="manage_blocked_numbers_label">Blokeeritud numbrid</string>
+  <string name="voicemail_settings_label">Kõnepost</string>
+  <string name="blocked_numbers_disabled_emergency_header_label">Kõnede blokeerimine on ajutiselt väljas</string>
+  <string name="blocked_numbers_disabled_emergency_desc">Kõnede blokeerimine on keelatud, kuna võtsite sellelt telefonilt viimase 48 tunni jooksul ühendust hädaabiteenustega. See lubatakse 48 tunni möödumisel automaatselt uuesti.</string>
+  <string name="import_send_to_voicemail_numbers_label">Impordi numbrid</string>
+  <string name="blocked_call_settings_import_description">Märkisite varem, et osad helistajad saadetaks muude rakenduste kaudu automaatselt kõneposti.</string>
+  <string name="blocked_call_settings_view_numbers_button">Vaata numbreid</string>
+  <string name="blocked_call_settings_import_button">Impordi</string>
+  <string name="description_blocked_number_list_delete">Numbri deblokeerimine</string>
+  <string name="addBlockedNumber">Lisa number</string>
+  <string name="block_number_footer_message_vvm">Kõned nendelt numbritelt blokeeritakse ja kõnepostisõnumid kustutatakse automaatselt.</string>
+  <string name="block_number_footer_message_no_vvm">Kõned nendelt numbritelt blokeeritakse, kuid helistajad saavad võib-olla siiski teile kõnepostisõnumeid jätta.</string>
+  <string name="block_list">Blokeeritud numbrid</string>
+  <string name="alreadyBlocked">%1$s on juba blokeeritud.</string>
+  <string name="phone_account_settings_label">Helistamiskontod</string>
+  <string name="permission_no_speeddial">Kiirvalimise lubamiseks lülitage sisse kontaktiluba.</string>
+  <string name="permission_no_calllog">Kõnelogi vaatamiseks lülitage sisse telefoniluba.</string>
+  <string name="permission_no_search">Kontaktide otsimiseks lülitage sisse kontaktiload.</string>
+  <string name="permission_place_call">Helistamiseks lülitage sisse telefoniluba.</string>
+  <string name="toast_cannot_write_system_settings">Telefonirakendusel pole luba süsteemiseadetesse kirjutada.</string>
+  <string name="blocked_number_call_log_label">Blokeeritud</string>
+  <string name="call_log_action_block_report_number">Blokeeri / teavita rämpssisust</string>
+  <string name="call_log_action_block_number">Blokeeri number</string>
+  <string name="call_log_action_remove_spam">Pole rämpssisu</string>
+  <string name="call_log_action_unblock_number">Numbri deblokeerimine</string>
+  <string name="spam_number_call_log_label">Rämpspost</string>
+  <string name="call_composer_connection_failed">%1$s ei ole võrgus ja temaga ei saa ühendust</string>
+  <string name="about_phone_label">Teave</string>
+  <string name="voicemail_transcription_branding_text">Google\'i transkribeeritud</string>
+  <string name="voicemail_transcription_in_progress">Transkribeerimine …</string>
+  <string name="voicemail_transcription_failed">Transkribeerimine pole saadaval.</string>
+  <string name="voicemail_transcription_failed_language_not_supported">Transkribeerimine pole saadaval. Keelt ei toetata.</string>
+  <string name="voicemail_transcription_failed_no_speech">Transkribeerimine pole saadaval. Kõnet ei tuvastatud.</string>
+  <string name="voicemail_donation_promo_title">Kas soovite aidata parandada transkriptsiooni täpsust?</string>
+  <string name="voicemail_donation_promo_content">Lubage Google\'il see ja tulevased kõnepostisõnumid transkriptsioonidega üle vaadata. Need salvestatakse anonüümselt. Seadeid saab alati muuta. %1$s</string>
+  <string name="voicemail_donation_promo_opt_in">Jah, sobib</string>
+  <string name="voicemail_donation_promo_opt_out">Tänan, ei</string>
+  <string name="voicemail_transcription_rating">Hinnake transkript. kvaliteeti</string>
+  <string name="voicemail_transcription_rating_thanks">Suur tänu tagasiside eest</string>
+  <string name="description_rating_good">Meeldib</string>
+  <string name="description_rating_bad">Ei meeldi</string>
+  <string name="view_conversation">Kuva</string>
+  <string name="ec_data_deleted">Kõne kustutati. Selle kõne ajal jagatud manuseid saate vaadata ja kustutada rakenduses Messages.</string>
+  <string name="multiple_ec_data_deleted">Kõned kustutati. Nende kõnede ajal jagatud manuseid saate vaadata ja kustutada rakenduses Messages.</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-eu/strings.xml b/java/com/android/dialer/app/res/values-eu/strings.xml
index 1e62902..4a60fc6 100644
--- a/java/com/android/dialer/app/res/values-eu/strings.xml
+++ b/java/com/android/dialer/app/res/values-eu/strings.xml
@@ -1,179 +1,171 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="applicationLabel" msgid="2202739481132958990">"Telefonoa"</string>
-    <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"Telefonoko teklatua"</string>
-    <string name="callHistoryIconLabel" msgid="7493268743411968630">"Deien historia"</string>
-    <string name="action_copy_number_text" msgid="832682558551502319">"Kopiatu zenbakia"</string>
-    <string name="copy_transcript_text" msgid="937904189017310829">"Kopiatu transkripzioa"</string>
-    <string name="action_edit_number_before_call" msgid="8017492815878473837">"Editatu zenbakia deitu aurretik"</string>
-    <string name="call_log_delete_all" msgid="7852970926906523784">"Garbitu deien historia"</string>
-    <string name="call_log_trash_voicemail" msgid="6118493534178533972">"Ezabatu ahots-mezua"</string>
-    <string name="snackbar_voicemail_deleted" msgid="7463166543725496307">"Ahots-mezua ezabatzea"</string>
-    <string name="snackbar_voicemail_deleted_undo" msgid="6959743982796409941">"DESEGIN"</string>
-    <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"Deien historia garbitu?"</string>
-    <string name="clearCallLogConfirmation" msgid="6844949465815109166">"Historiako dei guztiak ezabatuko dira"</string>
-    <string name="clearCallLogProgress_title" msgid="995004835687361977">"Deien historia garbitzen…"</string>
-    <string name="notification_missedCallTitle" msgid="8283366068539898486">"Galdutako deia"</string>
-    <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"Laneko dei bat galdu duzu"</string>
-    <string name="notification_missedCallsTitle" msgid="3697442015345089802">"Dei galduak"</string>
-    <string name="notification_missedCallsMsg" msgid="8176217633929018706">"<xliff:g id="NUM_MISSED_CALLS">%d</xliff:g> dei galdu"</string>
-    <string name="notification_missedCall_call_back" msgid="3875698110051973965">"Erantzun deiari"</string>
-    <string name="notification_missedCall_message" msgid="5086910028988305964">"Mezua"</string>
-    <string name="post_call_notification_message" msgid="5417476789860590611">"<xliff:g id="NAME">%1$s</xliff:g>: <xliff:g id="MESSAGE">%2$s</xliff:g>"</string>
-    <string name="notification_voicemail_text_format" msgid="1895667520930252897">"Markatu <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
-    <string name="notification_voicemail_no_vm_number" msgid="8942821987929495842">"Erantzungailuaren zenbakia ezezaguna da"</string>
-    <plurals name="notification_voicemail_title" formatted="false" msgid="1551847434476438657">
-      <item quantity="other"> Erantzungailuko <xliff:g id="COUNT">%1$d</xliff:g> mezu </item>
-      <item quantity="one">Erantzungailuko mezua</item>
-    </plurals>
-    <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
-    <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"<xliff:g id="CALLER">%1$s</xliff:g> deitzailearen ahots-mezu berria"</string>
-    <string name="voicemail_playback_error" msgid="4384373852257757295">"Ezin izan dira erreproduzitu ahots-mezuak"</string>
-    <string name="voicemail_fetching_content" msgid="572320120918636014">"Erantzungailua kargatzen…"</string>
-    <string name="voicemail_fetching_timout" msgid="2128873915839949783">"Ezin izan da kargatu erantzungailua"</string>
-    <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_playback_speakerphone" msgid="4852027754869750227">"Aktibatu edo desaktibatu bozgorailua"</string>
-    <string name="description_playback_seek" msgid="1340910573254132520">"Bilatu erreprodukzioaren posizioa"</string>
-    <string name="action_menu_call_history_description" msgid="8829135306925008546">"Deien historia"</string>
-    <string name="action_menu_overflow_description" msgid="7648679686746517341">"Aukera gehiago"</string>
-    <string name="action_menu_dialpad_button" msgid="1970631633457493180">"teklatua"</string>
-    <string name="dialer_settings_label" msgid="4980176284150290175">"Ezarpenak"</string>
-    <string name="simulator_submenu_label" msgid="186156287346615267">"Simulagailua"</string>
-    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Sortu interfazerako esteka"</string>
-    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"Ekintzak multzoka gauzatzeko modua aktibatzen"</string>
-    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"Ekintzak multzoka gauzatzeko modua desaktibatu da"</string>
-    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> hautatu da"</string>
-    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> desautatu da"</string>
-    <string name="description_contact_details" msgid="3341280873855253464">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> kontaktuaren xehetasunak"</string>
-    <string name="description_spam_contact_details" msgid="5592578752881528368">"Antza spam-igorlea den <xliff:g id="NAMEORNUMBER">%1$s</xliff:g> zenbakiaren harremanetarako datuak"</string>
-    <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> dei."</string>
-    <string name="description_video_call" msgid="3738199365585751727">"Bideo-deia."</string>
-    <string name="description_start_voice_search" msgid="8380022725973015261">"Hasi ahozko bilaketa"</string>
-    <string name="voicemail" msgid="8899540969000957954">"Erantzungailua"</string>
-    <string name="description_cancel_multi_select" msgid="3930475950253360461">"Utzi bertan behera ekintzak multzoka gauzatzeko modua"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Ezabatu"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Utzi"</string>
-    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> hautatu dira"</string>
-    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
-      <item quantity="other">"<b>"Ahots-mezu hauek ezabatu nahi dituzu? "</b>"</item>
-      <item quantity="one">"<b>"Ahots-mezu hau ezabatu nahi duzu? "</b>"</item>
-    </plurals>
-    <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
-    <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> (<xliff:g id="TIME">%2$s</xliff:g>)"</string>
-    <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
-    <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="voice_search_not_available" msgid="6546240433719732905">"Ahozko bilaketa ez dago erabilgarri"</string>
-    <string name="dialer_hint_find_contact" msgid="2023214799381149808">"Bilatu kontaktuetan"</string>
-    <string name="block_number_search_hint" msgid="5377706079015099416">"Gehitu zk. edo bilatu kontaktua"</string>
-    <string name="call_log_all_empty" msgid="3955572868518162004">"Hutsik dago deien historia"</string>
-    <string name="call_log_all_empty_action" msgid="852218280136243014">"Deitu"</string>
-    <string name="call_log_missed_empty" msgid="7094936030845062214">"Ez duzu dei galdurik."</string>
-    <string name="call_log_voicemail_empty" msgid="273623903423275178">"Erantzungailuaren sarrerako ontzia hutsik dago."</string>
-    <string name="call_log_activity_title" msgid="1275242727244945527">"Deien historia"</string>
-    <string name="call_log_all_title" msgid="6042262422192020327">"Guztiak"</string>
-    <string name="call_log_missed_title" msgid="17254005889268015">"Galduak"</string>
-    <string name="tab_speed_dial" msgid="6616404752227561075">"Markatze bizkorra"</string>
-    <string name="tab_history" msgid="7420269368689503596">"Deien historia"</string>
-    <string name="tab_all_contacts" msgid="5531733977693943015">"Kontaktuak"</string>
-    <string name="tab_voicemail" msgid="2458548090088316246">"Erantzungailua"</string>
-    <string name="search_shortcut_call_number" msgid="8847918845036880688">"Deitu <xliff:g id="NUMBER">%s</xliff:g> zenbakira"</string>
-    <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"Sortu kontaktua"</string>
-    <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"Gehitu kontaktuetan"</string>
-    <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"Bidali SMS mezua"</string>
-    <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"Egin bideo-deia"</string>
-    <string name="search_shortcut_block_number" msgid="4587283230665805776">"Blokeatu zenbakia"</string>
-    <string name="speed_dial_empty" msgid="3346406399966039505">"Ez duzu inor markatze bizkorrean oraindik"</string>
-    <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"Gehitu gogokoak"</string>
-    <string name="remove_contact" msgid="2353580570488923668">"Kendu"</string>
-    <string name="select_all" msgid="408601760696146245">"Hautatu guztiak"</string>
-    <string name="call_log_action_video_call" msgid="7565549950343850819">"Bideo-deia"</string>
-    <string name="call_log_action_send_message" msgid="6948727362660115554">"Bidali mezua"</string>
-    <string name="call_log_action_details" msgid="2091370737371449501">"Deiaren xehetasunak"</string>
-    <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"Bidali hona…"</string>
-    <string name="call_log_action_call" msgid="682724094251540583">"Deitu: <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_incoming_missed_call" msgid="8292535799379230029">"Galdutako deiaren xehetasunak: <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_incoming_answered_call" msgid="3920182963103160610">"Erantzundako deiaren xehetasunak: <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_unread_voicemail" msgid="145170985013419170">"Erantzungailuko mezua, irakurri gabe: <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_read_voicemail" msgid="5585559881573227732">"Erantzungailuko mezua: <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_outgoing_call" msgid="543952487882919924">"Egindako deiaren xehetasunak: <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="call_log_via_number" msgid="1340307109806397650">"<xliff:g id="NUMBER">%1$s</xliff:g> bidez"</string>
-    <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, <xliff:g id="NUMBER">%2$s</xliff:g> bidez"</string>
-    <string name="description_call_action" msgid="4042796498169106545">"Deitu <xliff:g id="NAMEORNUMBER">^1</xliff:g> deitzaileari"</string>
-    <string name="description_video_call_action" msgid="1237090968588659650">"Egin bideo-deia (<xliff:g id="NAMEORNUMBER">^1</xliff:g>)."</string>
-    <string name="description_voicemail_action" msgid="3290143432403538524">"Deitzaile honek erantzungailuan utzitako ahots-mezuak entzutea: <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_create_new_contact_action" msgid="1928282350281564130">"Sortu kontaktua (<xliff:g id="NAMEORNUMBER">^1</xliff:g>)"</string>
-    <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"Gehitu <xliff:g id="NAMEORNUMBER">^1</xliff:g> lehendik dagoen kontaktu batean"</string>
-    <string name="description_details_action" msgid="2061866409737706174">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> kontaktuaren xehetasunak"</string>
-    <string name="call_log_header_today" msgid="1576119097475845293">"Gaur"</string>
-    <string name="call_log_header_yesterday" msgid="5616077776205329563">"Atzo"</string>
-    <string name="call_log_header_other" msgid="4940676886254217644">"Zaharrak"</string>
-    <string name="voicemail_speaker_on" msgid="3151333608926996668">"Aktibatu bozgorailua."</string>
-    <string name="voicemail_speaker_off" msgid="2530064206962034201">"Desaktibatu bozgorailua."</string>
-    <string name="voicemail_play_start_pause" msgid="3874823480278334664">"Hasi edo gelditu erreprodukzioa."</string>
-    <string name="display_options_title" msgid="3880091801055797975">"Bistaratze-aukerak"</string>
-    <string name="sounds_and_vibration_title" msgid="3075050000721181384">"Soinuak eta dardara"</string>
-    <string name="accessibility_settings_title" msgid="3329027650429831820">"Erabilerraztasuna"</string>
-    <string name="ringtone_title" msgid="8377174189894648486">"Telefonoaren tonua"</string>
-    <string name="vibrate_on_ring_title" msgid="631441314790960485">"Deiak jasotzean, egin dardara"</string>
-    <string name="dtmf_tone_enable_title" msgid="3273762431523939277">"Teklatuaren tonuak"</string>
-    <string name="dtmf_tone_length_title" msgid="534096029202438539">"Teklatuaren tonuen iraupena"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="applicationLabel">Telefonoa</string>
+  <string name="launcherDialpadActivityLabel">Telefonoko teklatua</string>
+  <string name="callHistoryIconLabel">Deien historia</string>
+  <string name="action_copy_number_text">Kopiatu zenbakia</string>
+  <string name="copy_transcript_text">Kopiatu transkripzioa</string>
+  <string name="action_edit_number_before_call">Editatu zenbakia deitu aurretik</string>
+  <string name="call_log_delete_all">Garbitu deien historia</string>
+  <string name="call_log_trash_voicemail">Ezabatu ahots-mezua</string>
+  <string name="snackbar_voicemail_deleted">Ahots-mezua ezabatzea</string>
+  <string name="clearCallLogConfirmation_title">Deien historia garbitu?</string>
+  <string name="clearCallLogConfirmation">Historiako dei guztiak ezabatuko dira</string>
+  <string name="clearCallLogProgress_title">Deien historia garbitzen…</string>
+  <string name="notification_missedCallTitle">Dei galdua</string>
+  <string name="notification_missedWorkCallTitle">Laneko dei bat galdu duzu</string>
+  <string name="notification_missedCallsTitle">Dei galduak</string>
+  <string name="notification_missedCallsMsg">%d dei galdu</string>
+  <string name="notification_missedCall_call_back">Erantzun deiari</string>
+  <string name="notification_missedCall_message">Mezua</string>
+  <string name="post_call_notification_message">%1$s: %2$s</string>
+  <string name="notification_voicemail_text_format">Markatu %s</string>
+  <string name="notification_voicemail_no_vm_number">Erantzungailuaren zenbakia ezezaguna da</string>
+  <plurals name="notification_voicemail_title">
+    <item quantity="one">Erantzungailuko mezua</item>
+    <item quantity="other"> Erantzungailuko %1$d mezu </item>
+  </plurals>
+  <string name="notification_voicemail_callers_list">%1$s, %2$s</string>
+  <string name="notification_new_voicemail_ticker">%1$s deitzailearen ahots-mezu berria</string>
+  <string name="voicemail_playback_error">Ezin izan dira erreproduzitu ahots-mezuak</string>
+  <string name="voicemail_fetching_content">Erantzungailua kargatzen…</string>
+  <string name="voicemail_fetching_timout">Ezin izan da kargatu erantzungailua</string>
+  <string name="call_log_item_count_and_date">(%1$d) %2$s</string>
+  <string name="description_playback_speakerphone">Aktibatu edo desaktibatu bozgorailua</string>
+  <string name="description_playback_seek">Bilatu erreprodukzioaren posizioa</string>
+  <string name="action_menu_call_history_description">Deien historia</string>
+  <string msgid="2295659037509008453" name="action_menu_overflow_description">Aukera gehiago</string>
+  <string name="action_menu_dialpad_button">teklatua</string>
+  <string name="dialer_settings_label">Ezarpenak</string>
+  <string name="simulator_submenu_label">Simulagailua</string>
+  <string name="new_ui_launcher_shortcut_label">Sortu interfazerako esteka</string>
+  <string name="description_entering_bulk_action_mode">Ekintzak multzoka gauzatzeko modua aktibatzen</string>
+  <string name="description_leaving_bulk_action_mode">Ekintzak multzoka gauzatzeko modua desaktibatu da</string>
+  <string name="description_selecting_bulk_action_mode">%1$s hautatu da</string>
+  <string name="description_unselecting_bulk_action_mode">%1$s desautatu da</string>
+  <string name="description_contact_details">%1$s kontaktuaren xehetasunak</string>
+  <string name="description_spam_contact_details">Antza spam-igorlea den %1$s zenbakiaren harremanetarako datuak</string>
+  <string name="description_num_calls">%1$s dei.</string>
+  <string name="description_video_call">Bideo-deia.</string>
+  <string name="description_start_voice_search">Hasi ahozko bilaketa</string>
+  <string name="voicemail">Erantzungailua</string>
+  <string name="description_cancel_multi_select">Utzi bertan behera ekintzak multzoka gauzatzeko modua</string>
+  <string name="voicemailMultiSelectDeleteConfirm">Ezabatu</string>
+  <string name="voicemailMultiSelectDeleteCancel">Utzi</string>
+  <string name="voicemailMultiSelectActionBarTitle">%1$s hautatu dira</string>
+  <plurals name="delete_voicemails_confirmation_dialog_title">
+    <item quantity="one"><b>Ahots-mezu hau ezabatu nahi duzu? </b></item>
+    <item quantity="other"><b>Ahots-mezu hauek ezabatu nahi dituzu? </b></item>
+  </plurals>
+  <string name="voicemailCallLogToday">@string/call_log_header_today</string>
+  <string name="voicemailCallLogDateTimeFormat">%1$s (%2$s)</string>
+  <string name="voicemailDurationFormat">%1$02d:%2$02d</string>
+  <string name="voicemailCallLogDateTimeFormatWithDuration">%1$s • %2$s</string>
+  <string name="voice_search_not_available">Ahozko bilaketa ez dago erabilgarri</string>
+  <string name="dialer_hint_find_contact">Bilatu kontaktuetan</string>
+  <string name="block_number_search_hint">Gehitu zk. edo bilatu kontaktua</string>
+  <string name="call_log_all_empty">Hutsik dago deien historia</string>
+  <string name="call_log_all_empty_action">Deitu</string>
+  <string name="call_log_missed_empty">Ez duzu dei galdurik.</string>
+  <string name="call_log_voicemail_empty">Erantzungailuaren sarrerako ontzia hutsik dago.</string>
+  <string name="call_log_activity_title">Deien historia</string>
+  <string name="call_log_all_title">Guztiak</string>
+  <string name="call_log_missed_title">Galduak</string>
+  <string name="tab_speed_dial">Markatze bizkorra</string>
+  <string name="tab_history">Deien historia</string>
+  <string name="tab_all_contacts">Kontaktuak</string>
+  <string name="tab_voicemail">Erantzungailua</string>
+  <string name="search_shortcut_call_number">Deitu %s zenbakira</string>
+  <string name="search_shortcut_create_new_contact">Sortu kontaktua</string>
+  <string name="search_shortcut_add_to_contact">Gehitu kontaktuetan</string>
+  <string name="search_shortcut_send_sms_message">Bidali SMS mezua</string>
+  <string name="search_shortcut_make_video_call">Egin bideo-deia</string>
+  <string name="search_shortcut_block_number">Blokeatu zenbakia</string>
+  <string name="speed_dial_empty">Ez duzu inor markatze bizkorrean oraindik</string>
+  <string name="speed_dial_empty_add_favorite_action">Gehitu gogokoak</string>
+  <string name="remove_contact">Kendu</string>
+  <string name="select_all">Hautatu guztiak</string>
+  <string name="call_log_action_video_call">Bideo-deia</string>
+  <string name="call_log_action_set_up_video">Konfiguratu bideo-deiak</string>
+  <string name="call_log_action_invite_video">Gonbidatu bideo-deiak egitera</string>
+  <string name="call_log_action_send_message">Bidali mezua</string>
+  <string name="call_log_action_details">Deiaren xehetasunak</string>
+  <string name="call_log_action_share_voicemail">Bidali hona…</string>
+  <string name="call_log_action_call">Deitu: ^1</string>
+  <string name="description_incoming_missed_call">Dei galduaren xehetasunak: ^1, ^2, ^3, ^4.</string>
+  <string name="description_incoming_answered_call">Erantzundako deiaren xehetasunak: ^1, ^2, ^3, ^4.</string>
+  <string name="description_unread_voicemail">Erantzungailuko mezua, irakurri gabe: ^1, ^2, ^3, ^4.</string>
+  <string name="description_read_voicemail">Erantzungailuko mezua: ^1, ^2, ^3, ^4.</string>
+  <string name="description_outgoing_call">Egindako deiaren xehetasunak: ^1, ^2, ^3, ^4.</string>
+  <string name="call_log_via_number">%1$s bidez</string>
+  <string name="call_log_via_number_phone_account">%1$s, %2$s bidez</string>
+  <string name="description_call_action">Deitu ^1 deitzaileari</string>
+  <string name="description_video_call_action">Egin bideo-deia (^1).</string>
+  <string name="description_voicemail_action">Deitzaile honek erantzungailuan utzitako ahots-mezuak entzutea: ^1</string>
+  <string name="description_create_new_contact_action">Sortu kontaktua (^1)</string>
+  <string name="description_add_to_existing_contact_action">Gehitu ^1 lehendik dagoen kontaktu batean</string>
+  <string name="description_details_action">^1 kontaktuaren xehetasunak</string>
+  <string name="call_log_header_today">Gaur</string>
+  <string name="call_log_header_yesterday">Atzo</string>
+  <string name="call_log_header_other">Zaharrak</string>
+  <string name="voicemail_speaker_on">Aktibatu bozgorailua.</string>
+  <string name="voicemail_speaker_off">Desaktibatu bozgorailua.</string>
+  <string name="voicemail_play_start_pause">Hasi edo gelditu erreprodukzioa.</string>
+  <string name="display_options_title">Bistaratze-aukerak</string>
+  <string name="sounds_and_vibration_title">Soinuak eta dardara</string>
+  <string name="accessibility_settings_title">Erabilerraztasuna</string>
+  <string name="ringtone_title">Telefonoaren tonua</string>
+  <string name="vibrate_on_ring_title">Deiak jasotzean, egin dardara</string>
+  <string name="dtmf_tone_enable_title">Teklatuaren tonuak</string>
+  <string name="dtmf_tone_length_title">Teklatuaren tonuen iraupena</string>
   <string-array name="dtmf_tone_length_entries">
-    <item msgid="3136353015227162823">"Normala"</item>
-    <item msgid="5376841175538523822">"Luzea"</item>
+    <item>Normala</item>
+    <item>Luzea</item>
   </string-array>
-    <string name="respond_via_sms_setting_title" msgid="8008181606657693452">"Erantzun bizkorrak"</string>
-    <string name="call_settings_label" msgid="7824611757200960807">"Deiak"</string>
-    <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Deien blokeoa"</string>
-    <string name="voicemail_settings_label" msgid="4594299554519920570">"Erantzungailua"</string>
-    <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Deien blokeoa aldi baterako desgaituta"</string>
-    <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Deiak blokeatzeko aukera desgaitu egin da, azken 48 orduetan larrialdi-zerbitzuekin harremanetan jarri zarelako telefono honetatik. Berriro gaituko da 48 orduko epea igaro ondoren."</string>
-    <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Inportatu zenbakiak"</string>
-    <string name="blocked_call_settings_import_description" msgid="1819412052545228965">"Deitzaile batzuk beste aplikazio batzuen bidez erantzungailura automatikoki bidaltzea aukeratu duzu."</string>
-    <string name="blocked_call_settings_view_numbers_button" msgid="3332727948554356704">"Ikusi zenbakiak"</string>
-    <string name="blocked_call_settings_import_button" msgid="7319111700387470727">"Inportatu"</string>
-    <string name="description_blocked_number_list_delete" msgid="2139644216858370740">"Desblokeatu zenbakia"</string>
-    <string name="addBlockedNumber" msgid="3053473735238295551">"Gehitu zenbakia"</string>
-    <string name="block_number_footer_message_vvm" msgid="7955326304033982368">"Zenbaki hauetatik jasotzen diren deiak blokeatu egingo dira, eta mezuak automatikoki ezabatuko dira erantzungailutik."</string>
-    <string name="block_number_footer_message_no_vvm" msgid="1152684139070471665">"Zenbaki hauetatik jasotzen diren deiak blokeatu egingo dira, baina deitzaileek mezuak utzi ahal izango dizkizute erantzungailuan."</string>
-    <string name="block_list" msgid="4701585783411870782">"Blokeatutako zenbakiak"</string>
-    <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g> blokeatuta dago dagoeneko."</string>
-    <string name="phone_account_settings_label" msgid="8372485478006965920">"Deiak egiteko kontuak"</string>
-    <string name="permission_no_speeddial" msgid="8487215628510596753">"Markatze bizkorra gaitzeko, aktibatu Kontaktuak erabiltzeko baimena."</string>
-    <string name="permission_no_calllog" msgid="4053705651238775784">"Deien erregistroa ikusteko, aktibatu Telefonoa erabiltzeko baimena."</string>
-    <string name="permission_no_search" msgid="2424710404207193826">"Kontaktuak bilatzeko, aktibatu kontaktuak atzitzeko baimenak."</string>
-    <string name="permission_place_call" msgid="8686908130349369423">"Deiak egiteko, aktibatu Telefonoa erabiltzeko baimena."</string>
-    <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"Telefonoa aplikazioak ez du baimenik sistemaren ezarpenetan ezer idazteko."</string>
-    <string name="blocked_number_call_log_label" msgid="4212282846299997693">"Blokeatuta"</string>
-    <string name="call_log_action_block_report_number" msgid="7302636538668696729">"Blokeatu eta salatu spama dela"</string>
-    <string name="call_log_action_block_number" msgid="5048188386501998865">"Blokeatu zenbakia"</string>
-    <string name="call_log_action_remove_spam" msgid="2045319806318398403">"Ez da spama"</string>
-    <string name="call_log_action_unblock_number" msgid="6100117033288448758">"Desblokeatu zenbakia"</string>
-    <string name="spam_number_call_log_label" msgid="2678431398326811131">"Spama"</string>
-    <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> ez dago konektatuta, eta ezin zara jarri harremanetan berarekin"</string>
-    <string name="about_phone_label" msgid="582991354677973731">"Honi buruz"</string>
-    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Google-k transkribatu du"</string>
-    <string name="voicemail_transcription_in_progress" msgid="2933320969613783210">"Transkribatzen ari da Google…"</string>
-    <string name="voicemail_transcription_failed" msgid="335275303117412706">"Transkripzioa ez dago erabilgarri."</string>
-    <string name="voicemail_transcription_failed_language_not_supported" msgid="4210332591050562553">"Transkripzioa ez dago erabilgarri. Ez da onartzen hizkuntza."</string>
-    <string name="voicemail_transcription_failed_no_speech" msgid="9093372879697874852">"Transkripzioa ez dago erabilgarri. Ez da detektatu ahotsik."</string>
-    <string name="view_conversation" msgid="7895904782094119702">"Ikusi"</string>
-    <string name="ec_data_deleted" msgid="4794880345545827107">"Ezabatu da deia. Ikusi eta ezabatu dei honetan partekatutako eranskinak Mezuak aplikazioan."</string>
-    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"Ezabatu dira deiak. Ikusi eta ezabatu dei hauetan partekatutako eranskinak Mezuak aplikazioan."</string>
+  <string name="respond_via_sms_setting_title">Erantzun bizkorrak</string>
+  <string name="call_settings_label">Deiak</string>
+  <string name="manage_blocked_numbers_label">Blokeatutako zenbakiak</string>
+  <string name="voicemail_settings_label">Erantzungailua</string>
+  <string name="blocked_numbers_disabled_emergency_header_label">Deien blokeoa aldi baterako desgaituta</string>
+  <string name="blocked_numbers_disabled_emergency_desc">Deiak blokeatzeko aukera desgaitu egin da, azken 48 orduetan larrialdi-zerbitzuekin harremanetan jarri zarelako telefono honetatik. Berriro gaituko da 48 orduko epea igaro ondoren.</string>
+  <string name="import_send_to_voicemail_numbers_label">Inportatu zenbakiak</string>
+  <string name="blocked_call_settings_import_description">Deitzaile batzuk beste aplikazio batzuen bidez erantzungailura automatikoki bidaltzea aukeratu duzu.</string>
+  <string name="blocked_call_settings_view_numbers_button">Ikusi zenbakiak</string>
+  <string name="blocked_call_settings_import_button">Inportatu</string>
+  <string name="description_blocked_number_list_delete">Desblokeatu zenbakia</string>
+  <string name="addBlockedNumber">Gehitu zenbakia</string>
+  <string name="block_number_footer_message_vvm">Zenbaki hauetatik jasotzen diren deiak blokeatu egingo dira, eta mezuak automatikoki ezabatuko dira erantzungailutik.</string>
+  <string name="block_number_footer_message_no_vvm">Zenbaki hauetatik jasotzen diren deiak blokeatu egingo dira, baina deitzaileek mezuak utzi ahal izango dizkizute erantzungailuan.</string>
+  <string name="block_list">Blokeatutako zenbakiak</string>
+  <string name="alreadyBlocked">%1$s blokeatuta dago dagoeneko.</string>
+  <string name="phone_account_settings_label">Deiak egiteko kontuak</string>
+  <string name="permission_no_speeddial">Markatze bizkorra gaitzeko, aktibatu Kontaktuak erabiltzeko baimena.</string>
+  <string name="permission_no_calllog">Deien erregistroa ikusteko, aktibatu Telefonoa erabiltzeko baimena.</string>
+  <string name="permission_no_search">Kontaktuak bilatzeko, aktibatu kontaktuak atzitzeko baimenak.</string>
+  <string name="permission_place_call">Deiak egiteko, aktibatu Telefonoa erabiltzeko baimena.</string>
+  <string name="toast_cannot_write_system_settings">Telefonoa aplikazioak ez du baimenik sistemaren ezarpenetan ezer idazteko.</string>
+  <string name="blocked_number_call_log_label">Blokeatuta</string>
+  <string name="call_log_action_block_report_number">Blokeatu eta salatu spama dela</string>
+  <string name="call_log_action_block_number">Blokeatu zenbakia</string>
+  <string name="call_log_action_remove_spam">Ez da spama</string>
+  <string name="call_log_action_unblock_number">Desblokeatu zenbakia</string>
+  <string name="spam_number_call_log_label">Spama</string>
+  <string name="call_composer_connection_failed">%1$s ez dago konektatuta, eta ezin zara jarri harremanetan berarekin</string>
+  <string name="about_phone_label">Honi buruz</string>
+  <string name="voicemail_transcription_branding_text">Google-k transkribatu du</string>
+  <string name="voicemail_transcription_in_progress">Transkribatzen…</string>
+  <string name="voicemail_transcription_failed">Transkripzioa ez dago erabilgarri.</string>
+  <string name="voicemail_transcription_failed_language_not_supported">Transkripzioa ez dago erabilgarri. Ez da onartzen hizkuntza.</string>
+  <string name="voicemail_transcription_failed_no_speech">Transkripzioa ez dago erabilgarri. Ez da detektatu ahotsik.</string>
+  <string name="voicemail_donation_promo_title">Transkripzioen zehaztasuna hobetzen lagundu nahi duzu?</string>
+  <string name="voicemail_donation_promo_content">Utzi Google-ri ahots-mezu hau eta aurrerantzekoak berrikusten transkripzioekin batera. Anonimoki gordeko dira. Aukera hori aldatzeko, joan Ezarpenak atalera. %1$s</string>
+  <string name="voicemail_donation_promo_opt_in">Bai, ados</string>
+  <string name="voicemail_donation_promo_opt_out">Ez, eskerrik asko</string>
+  <string name="voicemail_transcription_rating">Baloratu transkripzioaren kalitatea</string>
+  <string name="voicemail_transcription_rating_thanks">Mila esker iritzia bidaltzeagatik</string>
+  <string name="description_rating_good">Gustatzen zait</string>
+  <string name="description_rating_bad">Ez zait gustatzen</string>
+  <string name="view_conversation">Ikusi</string>
+  <string name="ec_data_deleted">Ezabatu da deia. Ikusi eta ezabatu dei honetan partekatutako eranskinak Mezuak aplikazioan.</string>
+  <string name="multiple_ec_data_deleted">Ezabatu dira deiak. Ikusi eta ezabatu dei hauetan partekatutako eranskinak Mezuak aplikazioan.</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-fa/strings.xml b/java/com/android/dialer/app/res/values-fa/strings.xml
index 30701a5..b07e809 100644
--- a/java/com/android/dialer/app/res/values-fa/strings.xml
+++ b/java/com/android/dialer/app/res/values-fa/strings.xml
@@ -1,179 +1,171 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="applicationLabel" msgid="2202739481132958990">"تلفن"</string>
-    <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"صفحه کلید تلفن"</string>
-    <string name="callHistoryIconLabel" msgid="7493268743411968630">"سابقه تماس"</string>
-    <string name="action_copy_number_text" msgid="832682558551502319">"کپی کردن شماره"</string>
-    <string name="copy_transcript_text" msgid="937904189017310829">"کپی کردن آوانویسی"</string>
-    <string name="action_edit_number_before_call" msgid="8017492815878473837">"ویرایش شماره قبل از تماس"</string>
-    <string name="call_log_delete_all" msgid="7852970926906523784">"پاک کردن سابقه تماس"</string>
-    <string name="call_log_trash_voicemail" msgid="6118493534178533972">"حذف پست صوتی"</string>
-    <string name="snackbar_voicemail_deleted" msgid="7463166543725496307">"پست صوتی حذف شد"</string>
-    <string name="snackbar_voicemail_deleted_undo" msgid="6959743982796409941">"واگرد"</string>
-    <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"سابقه تماس پاک شود؟"</string>
-    <string name="clearCallLogConfirmation" msgid="6844949465815109166">"این کار همه تماس‌ها را از سابقه شما حذف می‌کند"</string>
-    <string name="clearCallLogProgress_title" msgid="995004835687361977">"در حال پاک کردن سابقه تماس..."</string>
-    <string name="notification_missedCallTitle" msgid="8283366068539898486">"تماس بی پاسخ"</string>
-    <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"تماس کاری ازدست‌رفته"</string>
-    <string name="notification_missedCallsTitle" msgid="3697442015345089802">"تماس‌های بی‌پاسخ"</string>
-    <string name="notification_missedCallsMsg" msgid="8176217633929018706">"<xliff:g id="NUM_MISSED_CALLS">%d</xliff:g> تماس بی‌پاسخ"</string>
-    <string name="notification_missedCall_call_back" msgid="3875698110051973965">"پاسخ تماس"</string>
-    <string name="notification_missedCall_message" msgid="5086910028988305964">"پیام"</string>
-    <string name="post_call_notification_message" msgid="5417476789860590611">"<xliff:g id="NAME">%1$s</xliff:g>: <xliff:g id="MESSAGE">%2$s</xliff:g>"</string>
-    <string name="notification_voicemail_text_format" msgid="1895667520930252897">"شماره‌گیری <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
-    <string name="notification_voicemail_no_vm_number" msgid="8942821987929495842">"شماره پست صوتی ناشناس"</string>
-    <plurals name="notification_voicemail_title" formatted="false" msgid="1551847434476438657">
-      <item quantity="one"> <xliff:g id="COUNT">%1$d</xliff:g> پست صوتی </item>
-      <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> پست صوتی </item>
-    </plurals>
-    <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>، <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
-    <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"پست صوتی جدید از <xliff:g id="CALLER">%1$s</xliff:g>"</string>
-    <string name="voicemail_playback_error" msgid="4384373852257757295">"پست صوتی پخش نشد"</string>
-    <string name="voicemail_fetching_content" msgid="572320120918636014">"در حال بارگیری پست صوتی..."</string>
-    <string name="voicemail_fetching_timout" msgid="2128873915839949783">"پست صوتی بارگیری نشد"</string>
-    <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_playback_speakerphone" msgid="4852027754869750227">"روشن یا خاموش کردن بلندگوی تلفن"</string>
-    <string name="description_playback_seek" msgid="1340910573254132520">"جستجوی موقعیت بازپخش"</string>
-    <string name="action_menu_call_history_description" msgid="8829135306925008546">"سابقه تماس"</string>
-    <string name="action_menu_overflow_description" msgid="7648679686746517341">"گزینه‌های بیشتر"</string>
-    <string name="action_menu_dialpad_button" msgid="1970631633457493180">"صفحه کلید"</string>
-    <string name="dialer_settings_label" msgid="4980176284150290175">"تنظیمات"</string>
-    <string name="simulator_submenu_label" msgid="186156287346615267">"شبیه‌ساز"</string>
-    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"ایجاد میان‌بر رابط کاربری جدید"</string>
-    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"درحال ورود به حالت اقدام انبوه"</string>
-    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"خروج از حالت اقدام انبوه"</string>
-    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> انتخاب شد"</string>
-    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> از حالت انتخاب خارج شد"</string>
-    <string name="description_contact_details" msgid="3341280873855253464">"جزئیات تماس برای <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_spam_contact_details" msgid="5592578752881528368">"جزئیات تماس برای تماس‌گیرندگان هرزنامه پشتیبانی شده <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> تماس."</string>
-    <string name="description_video_call" msgid="3738199365585751727">"تماس ویدئویی."</string>
-    <string name="description_start_voice_search" msgid="8380022725973015261">"شروع جستجوی گفتاری"</string>
-    <string name="voicemail" msgid="8899540969000957954">"پست صوتی"</string>
-    <string name="description_cancel_multi_select" msgid="3930475950253360461">"لغو حالت اقدام‌ دسته‌ای"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"حذف"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"لغو"</string>
-    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> مورد انتخاب شد"</string>
-    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
-      <item quantity="one">"<b>"این پست‌های صوتی حذف شوند؟ "</b>"</item>
-      <item quantity="other">"<b>"این پست‌های صوتی حذف شوند؟ "</b>"</item>
-    </plurals>
-    <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
-    <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> ساعت <xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
-    <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="voice_search_not_available" msgid="6546240433719732905">"جستجوی گفتاری در دسترس نیست"</string>
-    <string name="dialer_hint_find_contact" msgid="2023214799381149808">"جستجوی مخاطبین"</string>
-    <string name="block_number_search_hint" msgid="5377706079015099416">"افزودن شماره یا جستجوی مخاطب"</string>
-    <string name="call_log_all_empty" msgid="3955572868518162004">"سابقه تماستان خالی است"</string>
-    <string name="call_log_all_empty_action" msgid="852218280136243014">"برقراری تماس تلفنی"</string>
-    <string name="call_log_missed_empty" msgid="7094936030845062214">"تماس بی‌پاسخی ندارید."</string>
-    <string name="call_log_voicemail_empty" msgid="273623903423275178">"صندوق پست صوتی‌تان خالی است."</string>
-    <string name="call_log_activity_title" msgid="1275242727244945527">"سابقه تماس"</string>
-    <string name="call_log_all_title" msgid="6042262422192020327">"همه موارد"</string>
-    <string name="call_log_missed_title" msgid="17254005889268015">"بی‌پاسخ"</string>
-    <string name="tab_speed_dial" msgid="6616404752227561075">"شماره‌گیری سریع"</string>
-    <string name="tab_history" msgid="7420269368689503596">"سابقه تماس"</string>
-    <string name="tab_all_contacts" msgid="5531733977693943015">"مخاطبین"</string>
-    <string name="tab_voicemail" msgid="2458548090088316246">"پست صوتی"</string>
-    <string name="search_shortcut_call_number" msgid="8847918845036880688">"تماس با <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"ایجاد مخاطب جدید"</string>
-    <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"افزودن به مخاطب"</string>
-    <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"ارسال پیامک"</string>
-    <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"برقراری تماس ویدئویی"</string>
-    <string name="search_shortcut_block_number" msgid="4587283230665805776">"مسدود کردن شماره"</string>
-    <string name="speed_dial_empty" msgid="3346406399966039505">"هنوز کسی در فهرست شماره‌گیری سریع شما نیست"</string>
-    <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"افزودن مورد دلخواه"</string>
-    <string name="remove_contact" msgid="2353580570488923668">"حذف"</string>
-    <string name="select_all" msgid="408601760696146245">"انتخاب همه"</string>
-    <string name="call_log_action_video_call" msgid="7565549950343850819">"تماس ویدئویی"</string>
-    <string name="call_log_action_send_message" msgid="6948727362660115554">"ارسال پیام"</string>
-    <string name="call_log_action_details" msgid="2091370737371449501">"جزئیات تماس"</string>
-    <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"ارسال به..."</string>
-    <string name="call_log_action_call" msgid="682724094251540583">"تماس با <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_incoming_missed_call" msgid="8292535799379230029">"تماس از دست رفته از <xliff:g id="NAMEORNUMBER">^1</xliff:g>، ‏<xliff:g id="TYPEORLOCATION">^2</xliff:g>، ‏<xliff:g id="TIMEOFCALL">^3</xliff:g>، ‏<xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_incoming_answered_call" msgid="3920182963103160610">"تماس پاسخ داده شده از <xliff:g id="NAMEORNUMBER">^1</xliff:g>، ‏<xliff:g id="TYPEORLOCATION">^2</xliff:g>، ‏<xliff:g id="TIMEOFCALL">^3</xliff:g>، ‏<xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_unread_voicemail" msgid="145170985013419170">"پست صوتی خوانده نشده از <xliff:g id="NAMEORNUMBER">^1</xliff:g>،‏ <xliff:g id="TYPEORLOCATION">^2</xliff:g>،‏ <xliff:g id="TIMEOFCALL">^3</xliff:g>،‏ <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_read_voicemail" msgid="5585559881573227732">"پست صوتی از <xliff:g id="NAMEORNUMBER">^1</xliff:g>،‏ <xliff:g id="TYPEORLOCATION">^2</xliff:g>،‏ <xliff:g id="TIMEOFCALL">^3</xliff:g>،‏ <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_outgoing_call" msgid="543952487882919924">"تماس با <xliff:g id="NAMEORNUMBER">^1</xliff:g>، ‏<xliff:g id="TYPEORLOCATION">^2</xliff:g>، ‏<xliff:g id="TIMEOFCALL">^3</xliff:g>، ‏<xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="call_log_via_number" msgid="1340307109806397650">"از طریق <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> از طریق <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="description_call_action" msgid="4042796498169106545">"تماس با <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_video_call_action" msgid="1237090968588659650">"تماس ویدئویی با <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
-    <string name="description_voicemail_action" msgid="3290143432403538524">"گوش دادن به پست صوتی از <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_create_new_contact_action" msgid="1928282350281564130">"ایجاد مخاطب برای <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"افزودن <xliff:g id="NAMEORNUMBER">^1</xliff:g> به مخاطب موجود"</string>
-    <string name="description_details_action" msgid="2061866409737706174">"جزئیات تماس برای <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="call_log_header_today" msgid="1576119097475845293">"امروز"</string>
-    <string name="call_log_header_yesterday" msgid="5616077776205329563">"دیروز"</string>
-    <string name="call_log_header_other" msgid="4940676886254217644">"قدیمی‌تر"</string>
-    <string name="voicemail_speaker_on" msgid="3151333608926996668">"روشن کردن بلندگو."</string>
-    <string name="voicemail_speaker_off" msgid="2530064206962034201">"خاموش کردن بلندگو."</string>
-    <string name="voicemail_play_start_pause" msgid="3874823480278334664">"شروع یا مکث بازپخش."</string>
-    <string name="display_options_title" msgid="3880091801055797975">"گزینه‌های نمایش"</string>
-    <string name="sounds_and_vibration_title" msgid="3075050000721181384">"صدا و لرزش"</string>
-    <string name="accessibility_settings_title" msgid="3329027650429831820">"دسترس‌پذیری"</string>
-    <string name="ringtone_title" msgid="8377174189894648486">"آهنگ زنگ تلفن"</string>
-    <string name="vibrate_on_ring_title" msgid="631441314790960485">"تماس‌‌ها لرزش هم داشته باشند"</string>
-    <string name="dtmf_tone_enable_title" msgid="3273762431523939277">"آهنگ‌های صفحه کلید"</string>
-    <string name="dtmf_tone_length_title" msgid="534096029202438539">"طول آهنگ صفحه کلید"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="applicationLabel">تلفن</string>
+  <string name="launcherDialpadActivityLabel">صفحه کلید تلفن</string>
+  <string name="callHistoryIconLabel">سابقه تماس</string>
+  <string name="action_copy_number_text">کپی کردن شماره</string>
+  <string name="copy_transcript_text">کپی کردن ترانویسی</string>
+  <string name="action_edit_number_before_call">ویرایش شماره قبل از تماس</string>
+  <string name="call_log_delete_all">پاک کردن سابقه تماس</string>
+  <string name="call_log_trash_voicemail">حذف پست صوتی</string>
+  <string name="snackbar_voicemail_deleted">پست صوتی حذف شد</string>
+  <string name="clearCallLogConfirmation_title">سابقه تماس پاک شود؟</string>
+  <string name="clearCallLogConfirmation">این کار همه تماس‌ها را از سابقه شما حذف می‌کند</string>
+  <string name="clearCallLogProgress_title">در حال پاک کردن سابقه تماس...</string>
+  <string name="notification_missedCallTitle">تماس بی پاسخ</string>
+  <string name="notification_missedWorkCallTitle">تماس کاری ازدست‌رفته</string>
+  <string name="notification_missedCallsTitle">تماس‌های بی‌پاسخ</string>
+  <string name="notification_missedCallsMsg">%d تماس بی‌پاسخ</string>
+  <string name="notification_missedCall_call_back">پاسخ تماس</string>
+  <string name="notification_missedCall_message">پیام</string>
+  <string name="post_call_notification_message">%1$s: %2$s</string>
+  <string name="notification_voicemail_text_format">شماره‌گیری %s</string>
+  <string name="notification_voicemail_no_vm_number">شماره پست صوتی ناشناس</string>
+  <plurals name="notification_voicemail_title">
+    <item quantity="one"> %1$d پست صوتی </item>
+    <item quantity="other"> %1$d پست صوتی </item>
+  </plurals>
+  <string name="notification_voicemail_callers_list">%1$s، %2$s</string>
+  <string name="notification_new_voicemail_ticker">پست صوتی جدید از %1$s</string>
+  <string name="voicemail_playback_error">پست صوتی پخش نشد</string>
+  <string name="voicemail_fetching_content">در حال بارگیری پست صوتی...</string>
+  <string name="voicemail_fetching_timout">پست صوتی بارگیری نشد</string>
+  <string name="call_log_item_count_and_date">(%1$d) %2$s</string>
+  <string name="description_playback_speakerphone">روشن یا خاموش کردن بلندگوی تلفن</string>
+  <string name="description_playback_seek">جستجوی موقعیت بازپخش</string>
+  <string name="action_menu_call_history_description">سابقه تماس</string>
+  <string msgid="2295659037509008453" name="action_menu_overflow_description">گزینه‌های بیشتر</string>
+  <string name="action_menu_dialpad_button">صفحه کلید</string>
+  <string name="dialer_settings_label">تنظیمات</string>
+  <string name="simulator_submenu_label">شبیه‌ساز</string>
+  <string name="new_ui_launcher_shortcut_label">ایجاد میان‌بر رابط کاربری جدید</string>
+  <string name="description_entering_bulk_action_mode">درحال ورود به حالت اقدام انبوه</string>
+  <string name="description_leaving_bulk_action_mode">خروج از حالت اقدام انبوه</string>
+  <string name="description_selecting_bulk_action_mode">%1$s انتخاب شد</string>
+  <string name="description_unselecting_bulk_action_mode">%1$s از حالت انتخاب خارج شد</string>
+  <string name="description_contact_details">جزئیات تماس برای %1$s</string>
+  <string name="description_spam_contact_details">جزئیات تماس برای تماس‌گیرندگان هرزنامه پشتیبانی شده %1$s</string>
+  <string name="description_num_calls">%1$s تماس.</string>
+  <string name="description_video_call">تماس ویدئویی.</string>
+  <string name="description_start_voice_search">شروع جستجوی گفتاری</string>
+  <string name="voicemail">پست صوتی</string>
+  <string name="description_cancel_multi_select">لغو حالت اقدام‌ دسته‌ای</string>
+  <string name="voicemailMultiSelectDeleteConfirm">حذف</string>
+  <string name="voicemailMultiSelectDeleteCancel">لغو</string>
+  <string name="voicemailMultiSelectActionBarTitle">%1$s مورد انتخاب شد</string>
+  <plurals name="delete_voicemails_confirmation_dialog_title">
+    <item quantity="one"><b>این پست‌های صوتی حذف شوند؟ </b></item>
+    <item quantity="other"><b>این پست‌های صوتی حذف شوند؟ </b></item>
+  </plurals>
+  <string name="voicemailCallLogToday">@string/call_log_header_today</string>
+  <string name="voicemailCallLogDateTimeFormat">%1$s ساعت %2$s</string>
+  <string name="voicemailDurationFormat">%1$02d:%2$02d</string>
+  <string name="voicemailCallLogDateTimeFormatWithDuration">%1$s • %2$s</string>
+  <string name="voice_search_not_available">جستجوی گفتاری در دسترس نیست</string>
+  <string name="dialer_hint_find_contact">جستجوی مخاطبین</string>
+  <string name="block_number_search_hint">افزودن شماره یا جستجوی مخاطب</string>
+  <string name="call_log_all_empty">سابقه تماستان خالی است</string>
+  <string name="call_log_all_empty_action">برقراری تماس تلفنی</string>
+  <string name="call_log_missed_empty">تماس بی‌پاسخی ندارید.</string>
+  <string name="call_log_voicemail_empty">صندوق پست صوتی‌تان خالی است.</string>
+  <string name="call_log_activity_title">سابقه تماس</string>
+  <string name="call_log_all_title">همه موارد</string>
+  <string name="call_log_missed_title">بی‌پاسخ</string>
+  <string name="tab_speed_dial">شماره‌گیری سریع</string>
+  <string name="tab_history">سابقه تماس</string>
+  <string name="tab_all_contacts">مخاطبین</string>
+  <string name="tab_voicemail">پست صوتی</string>
+  <string name="search_shortcut_call_number">تماس با %s</string>
+  <string name="search_shortcut_create_new_contact">ایجاد مخاطب جدید</string>
+  <string name="search_shortcut_add_to_contact">افزودن به مخاطب</string>
+  <string name="search_shortcut_send_sms_message">ارسال پیامک</string>
+  <string name="search_shortcut_make_video_call">برقراری تماس ویدئویی</string>
+  <string name="search_shortcut_block_number">مسدود کردن شماره</string>
+  <string name="speed_dial_empty">هنوز کسی در فهرست شماره‌گیری سریع شما نیست</string>
+  <string name="speed_dial_empty_add_favorite_action">افزودن مورد دلخواه</string>
+  <string name="remove_contact">حذف</string>
+  <string name="select_all">انتخاب همه</string>
+  <string name="call_log_action_video_call">تماس ویدئویی</string>
+  <string name="call_log_action_set_up_video">راه‌اندازی تماس ویدیویی</string>
+  <string name="call_log_action_invite_video">دعوت به تماس ویدیویی</string>
+  <string name="call_log_action_send_message">ارسال پیام</string>
+  <string name="call_log_action_details">جزئیات تماس</string>
+  <string name="call_log_action_share_voicemail">ارسال به...</string>
+  <string name="call_log_action_call">تماس با ^1</string>
+  <string name="description_incoming_missed_call">تماس از دست رفته از ^1، ‏^2، ‏^3، ‏^4.</string>
+  <string name="description_incoming_answered_call">تماس پاسخ داده شده از ^1، ‏^2، ‏^3، ‏^4.</string>
+  <string name="description_unread_voicemail">پست صوتی خوانده نشده از ^1،‏ ^2،‏ ^3،‏ ^4.</string>
+  <string name="description_read_voicemail">پست صوتی از ^1،‏ ^2،‏ ^3،‏ ^4.</string>
+  <string name="description_outgoing_call">تماس با ^1، ‏^2، ‏^3، ‏^4.</string>
+  <string name="call_log_via_number">از طریق %1$s</string>
+  <string name="call_log_via_number_phone_account">%1$s از طریق %2$s</string>
+  <string name="description_call_action">تماس با ^1</string>
+  <string name="description_video_call_action">تماس ویدئویی با ^1.</string>
+  <string name="description_voicemail_action">گوش دادن به پست صوتی از ^1</string>
+  <string name="description_create_new_contact_action">ایجاد مخاطب برای ^1</string>
+  <string name="description_add_to_existing_contact_action">افزودن ^1 به مخاطب موجود</string>
+  <string name="description_details_action">جزئیات تماس برای ^1</string>
+  <string name="call_log_header_today">امروز</string>
+  <string name="call_log_header_yesterday">دیروز</string>
+  <string name="call_log_header_other">قدیمی‌تر</string>
+  <string name="voicemail_speaker_on">روشن کردن بلندگو.</string>
+  <string name="voicemail_speaker_off">خاموش کردن بلندگو.</string>
+  <string name="voicemail_play_start_pause">شروع یا مکث بازپخش.</string>
+  <string name="display_options_title">گزینه‌های نمایش</string>
+  <string name="sounds_and_vibration_title">صدا و لرزش</string>
+  <string name="accessibility_settings_title">دسترس‌پذیری</string>
+  <string name="ringtone_title">آهنگ زنگ تلفن</string>
+  <string name="vibrate_on_ring_title">تماس‌‌ها لرزش هم داشته باشند</string>
+  <string name="dtmf_tone_enable_title">آهنگ‌های صفحه کلید</string>
+  <string name="dtmf_tone_length_title">طول آهنگ صفحه کلید</string>
   <string-array name="dtmf_tone_length_entries">
-    <item msgid="3136353015227162823">"عادی"</item>
-    <item msgid="5376841175538523822">"طولانی"</item>
+    <item>عادی</item>
+    <item>طولانی</item>
   </string-array>
-    <string name="respond_via_sms_setting_title" msgid="8008181606657693452">"پاسخ‌های سریع"</string>
-    <string name="call_settings_label" msgid="7824611757200960807">"تماس‌ها"</string>
-    <string name="manage_blocked_numbers_label" msgid="16823761991832273">"مسدود کردن تماس"</string>
-    <string name="voicemail_settings_label" msgid="4594299554519920570">"پست صوتی"</string>
-    <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"انسداد تماس موقتاً خاموش است"</string>
-    <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"چون در ۴۸ ساعت گذشته با این تلفن با سرویس‌های اضطراری تماس گرفتید، انسداد تماس غیرفعال شده است. پس از گذشت ۴۸ ساعت، این قابلیت دوباره فعال می‌شود."</string>
-    <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"وارد کردن شماره‌ها"</string>
-    <string name="blocked_call_settings_import_description" msgid="1819412052545228965">"قبلاً ازطریق برنامه‌های دیگر، برخی از تماس‌گیرندگان را برای ارسال خودکار به پست صوتی علامت زده‌اید."</string>
-    <string name="blocked_call_settings_view_numbers_button" msgid="3332727948554356704">"مشاهده شماره‌ها"</string>
-    <string name="blocked_call_settings_import_button" msgid="7319111700387470727">"وارد کردن"</string>
-    <string name="description_blocked_number_list_delete" msgid="2139644216858370740">"رفع انسداد شماره"</string>
-    <string name="addBlockedNumber" msgid="3053473735238295551">"افزودن شماره"</string>
-    <string name="block_number_footer_message_vvm" msgid="7955326304033982368">"تماس‌‌ها از این شماره‌ها مسدود می‌شود و پست‌‌های صوتی به‌طور خودکار حذف می‌شود."</string>
-    <string name="block_number_footer_message_no_vvm" msgid="1152684139070471665">"تماس‌‌ها از این شماره‌ها مسدود می‌شود اما ممکن است همچنان بتوانند برای شما پست صوتی بگذارند."</string>
-    <string name="block_list" msgid="4701585783411870782">"شماره‌های مسدود‌شده"</string>
-    <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g> درحال‌حاضر مسدود شده است."</string>
-    <string name="phone_account_settings_label" msgid="8372485478006965920">"حساب‌های تماس"</string>
-    <string name="permission_no_speeddial" msgid="8487215628510596753">"برای فعال کردن شماره‌گیری سریع، مجوز «مخاطبین» را روشن کنید."</string>
-    <string name="permission_no_calllog" msgid="4053705651238775784">"برای دیدن گزارش تماستان، مجوز «تلفن» را روشن کنید."</string>
-    <string name="permission_no_search" msgid="2424710404207193826">"برای جستجوی مخاطبینتان، مجوزهای مخاطبین را روشن کنید."</string>
-    <string name="permission_place_call" msgid="8686908130349369423">"برای برقراری تماس، مجوز «تلفن» را روشن کنید."</string>
-    <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"برنامه تلفن اجازه نوشتن در تنظیمات سیستم را ندارد."</string>
-    <string name="blocked_number_call_log_label" msgid="4212282846299997693">"مسدود شده"</string>
-    <string name="call_log_action_block_report_number" msgid="7302636538668696729">"مسدود کردن/گزارش هرزنامه"</string>
-    <string name="call_log_action_block_number" msgid="5048188386501998865">"مسدود کردن شماره"</string>
-    <string name="call_log_action_remove_spam" msgid="2045319806318398403">"هرزنامه نیست"</string>
-    <string name="call_log_action_unblock_number" msgid="6100117033288448758">"رفع انسداد شماره"</string>
-    <string name="spam_number_call_log_label" msgid="2678431398326811131">"هرزنامه"</string>
-    <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> آفلاین است و در دسترس نمی‌باشد"</string>
-    <string name="about_phone_label" msgid="582991354677973731">"درباره"</string>
-    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"‏رونویسی‌شده توسط Google"</string>
-    <string name="voicemail_transcription_in_progress" msgid="2933320969613783210">"‏Google درحال ترانویسی است…"</string>
-    <string name="voicemail_transcription_failed" msgid="335275303117412706">"ترانوشت دردسترس نیست."</string>
-    <string name="voicemail_transcription_failed_language_not_supported" msgid="4210332591050562553">"ترانوشت دردسترس نیست. زبان پشتیبانی نمی‌شود."</string>
-    <string name="voicemail_transcription_failed_no_speech" msgid="9093372879697874852">"ترانوشت دردسترس نیست. گفتگویی شناسایی نشد."</string>
-    <string name="view_conversation" msgid="7895904782094119702">"مشاهده"</string>
-    <string name="ec_data_deleted" msgid="4794880345545827107">"تماس حذف شد. پیوست‌های به اشتراک‌گذاشته‌شده درطول این تماس را در «پیام‌ها» مشاهده و حذف کنید."</string>
-    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"تماس‌ها حذف شدند. پیوست‌های به اشتراک‌گذاشته‌شده درطول تماس‌ها را در «پیام‌ها» مشاهده و حذف کنید."</string>
+  <string name="respond_via_sms_setting_title">پاسخ‌های سریع</string>
+  <string name="call_settings_label">تماس‌ها</string>
+  <string name="manage_blocked_numbers_label">شماره‌های مسدودشده</string>
+  <string name="voicemail_settings_label">پست صوتی</string>
+  <string name="blocked_numbers_disabled_emergency_header_label">انسداد تماس موقتاً خاموش است</string>
+  <string name="blocked_numbers_disabled_emergency_desc">چون در ۴۸ ساعت گذشته با این تلفن با سرویس‌های اضطراری تماس گرفتید، انسداد تماس غیرفعال شده است. پس از گذشت ۴۸ ساعت، این قابلیت دوباره فعال می‌شود.</string>
+  <string name="import_send_to_voicemail_numbers_label">وارد کردن شماره‌ها</string>
+  <string name="blocked_call_settings_import_description">قبلاً ازطریق برنامه‌های دیگر، برخی از تماس‌گیرندگان را برای ارسال خودکار به پست صوتی علامت زده‌اید.</string>
+  <string name="blocked_call_settings_view_numbers_button">مشاهده شماره‌ها</string>
+  <string name="blocked_call_settings_import_button">وارد کردن</string>
+  <string name="description_blocked_number_list_delete">رفع انسداد شماره</string>
+  <string name="addBlockedNumber">افزودن شماره</string>
+  <string name="block_number_footer_message_vvm">تماس‌‌ها از این شماره‌ها مسدود می‌شود و پست‌‌های صوتی به‌طور خودکار حذف می‌شود.</string>
+  <string name="block_number_footer_message_no_vvm">تماس‌‌ها از این شماره‌ها مسدود می‌شود اما ممکن است همچنان بتوانند برای شما پست صوتی بگذارند.</string>
+  <string name="block_list">شماره‌های مسدود‌شده</string>
+  <string name="alreadyBlocked">%1$s درحال‌حاضر مسدود شده است.</string>
+  <string name="phone_account_settings_label">حساب‌های تماس</string>
+  <string name="permission_no_speeddial">برای فعال کردن شماره‌گیری سریع، مجوز «مخاطبین» را روشن کنید.</string>
+  <string name="permission_no_calllog">برای دیدن گزارش تماستان، مجوز «تلفن» را روشن کنید.</string>
+  <string name="permission_no_search">برای جستجوی مخاطبینتان، مجوزهای مخاطبین را روشن کنید.</string>
+  <string name="permission_place_call">برای برقراری تماس، مجوز «تلفن» را روشن کنید.</string>
+  <string name="toast_cannot_write_system_settings">برنامه تلفن اجازه نوشتن در تنظیمات سیستم را ندارد.</string>
+  <string name="blocked_number_call_log_label">مسدود شده</string>
+  <string name="call_log_action_block_report_number">مسدود کردن/گزارش هرزنامه</string>
+  <string name="call_log_action_block_number">مسدود کردن شماره</string>
+  <string name="call_log_action_remove_spam">هرزنامه نیست</string>
+  <string name="call_log_action_unblock_number">رفع انسداد شماره</string>
+  <string name="spam_number_call_log_label">هرزنامه</string>
+  <string name="call_composer_connection_failed">%1$s آفلاین است و در دسترس نمی‌باشد</string>
+  <string name="about_phone_label">درباره</string>
+  <string name="voicemail_transcription_branding_text">‏رونویسی‌شده توسط Google</string>
+  <string name="voicemail_transcription_in_progress">درحال رونوشت‌برداری…</string>
+  <string name="voicemail_transcription_failed">ترانوشت دردسترس نیست.</string>
+  <string name="voicemail_transcription_failed_language_not_supported">ترانوشت دردسترس نیست. زبان پشتیبانی نمی‌شود.</string>
+  <string name="voicemail_transcription_failed_no_speech">ترانوشت دردسترس نیست. گفتگویی شناسایی نشد.</string>
+  <string name="voicemail_donation_promo_title">به بهبود دقت ترانویسی کمک می‌کنید؟</string>
+  <string name="voicemail_donation_promo_content">‏به Google اجازه دهید این پیام صوتی و پیام‌های صوتی آتی دارای ترانویسی را مرور کند. این پیام‌ها به‌صورت ناشناس ذخیره می‌شوند. هر وقت خواستید «تنظیمات» را تغییر دهید. %1$s</string>
+  <string name="voicemail_donation_promo_opt_in">بله، موافقم</string>
+  <string name="voicemail_donation_promo_opt_out">نه متشکرم</string>
+  <string name="voicemail_transcription_rating">به کیفیت ترانویسی رتبه بدهید</string>
+  <string name="voicemail_transcription_rating_thanks">از بازخوردتان سپاسگزاریم</string>
+  <string name="description_rating_good">پسندیدن</string>
+  <string name="description_rating_bad">نپسندیدن</string>
+  <string name="view_conversation">مشاهده</string>
+  <string name="ec_data_deleted">تماس حذف شد. پیوست‌های به اشتراک‌گذاشته‌شده درطول این تماس را در «پیام‌ها» مشاهده و حذف کنید.</string>
+  <string name="multiple_ec_data_deleted">تماس‌ها حذف شدند. پیوست‌های به اشتراک‌گذاشته‌شده درطول تماس‌ها را در «پیام‌ها» مشاهده و حذف کنید.</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-fi/strings.xml b/java/com/android/dialer/app/res/values-fi/strings.xml
index d2bdc9b..dd1d648 100644
--- a/java/com/android/dialer/app/res/values-fi/strings.xml
+++ b/java/com/android/dialer/app/res/values-fi/strings.xml
@@ -1,179 +1,171 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="applicationLabel" msgid="2202739481132958990">"Puhelin"</string>
-    <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"Puhelimen näppäimistö"</string>
-    <string name="callHistoryIconLabel" msgid="7493268743411968630">"Soittohistoria"</string>
-    <string name="action_copy_number_text" msgid="832682558551502319">"Kopioi numero"</string>
-    <string name="copy_transcript_text" msgid="937904189017310829">"Kopioi transkriptio"</string>
-    <string name="action_edit_number_before_call" msgid="8017492815878473837">"Muokkaa numeroa ennen puhelua"</string>
-    <string name="call_log_delete_all" msgid="7852970926906523784">"Tyhjennä soittohistoria"</string>
-    <string name="call_log_trash_voicemail" msgid="6118493534178533972">"Poista vastaajaviesti"</string>
-    <string name="snackbar_voicemail_deleted" msgid="7463166543725496307">"Viesti poistettiin."</string>
-    <string name="snackbar_voicemail_deleted_undo" msgid="6959743982796409941">"KUMOA"</string>
-    <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"Tyhjennetäänkö soittohistoria?"</string>
-    <string name="clearCallLogConfirmation" msgid="6844949465815109166">"Kaikki soittohistorian tiedot poistetaan"</string>
-    <string name="clearCallLogProgress_title" msgid="995004835687361977">"Tyhjennetään soittohistoriaa…"</string>
-    <string name="notification_missedCallTitle" msgid="8283366068539898486">"Vastaamatta jäänyt puhelu"</string>
-    <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"Vastaamaton työpuhelu"</string>
-    <string name="notification_missedCallsTitle" msgid="3697442015345089802">"Vastaamattomat puhelut"</string>
-    <string name="notification_missedCallsMsg" msgid="8176217633929018706">"<xliff:g id="NUM_MISSED_CALLS">%d</xliff:g> vastaamatonta puhelua"</string>
-    <string name="notification_missedCall_call_back" msgid="3875698110051973965">"Soita"</string>
-    <string name="notification_missedCall_message" msgid="5086910028988305964">"Viesti"</string>
-    <string name="post_call_notification_message" msgid="5417476789860590611">"<xliff:g id="NAME">%1$s</xliff:g>: <xliff:g id="MESSAGE">%2$s</xliff:g>"</string>
-    <string name="notification_voicemail_text_format" msgid="1895667520930252897">"Soita numeroon <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
-    <string name="notification_voicemail_no_vm_number" msgid="8942821987929495842">"Puhelinvastaajan numero tuntematon"</string>
-    <plurals name="notification_voicemail_title" formatted="false" msgid="1551847434476438657">
-      <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> vastaajaviestiä </item>
-      <item quantity="one">Vastaajaviesti</item>
-    </plurals>
-    <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
-    <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"Uusi vastaajaviesti: <xliff:g id="CALLER">%1$s</xliff:g>"</string>
-    <string name="voicemail_playback_error" msgid="4384373852257757295">"Viestin toistaminen epäonnistui"</string>
-    <string name="voicemail_fetching_content" msgid="572320120918636014">"Ladataan puhelinvastaajaa…"</string>
-    <string name="voicemail_fetching_timout" msgid="2128873915839949783">"Puhelinvastaajan lataaminen epäonnistui"</string>
-    <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_playback_speakerphone" msgid="4852027754869750227">"Ota kaiutin käyttöön tai poista käytöstä"</string>
-    <string name="description_playback_seek" msgid="1340910573254132520">"Toisto-osoitin"</string>
-    <string name="action_menu_call_history_description" msgid="8829135306925008546">"Soittohistoria"</string>
-    <string name="action_menu_overflow_description" msgid="7648679686746517341">"Lisää vaihtoehtoja"</string>
-    <string name="action_menu_dialpad_button" msgid="1970631633457493180">"näppäimistö"</string>
-    <string name="dialer_settings_label" msgid="4980176284150290175">"Asetukset"</string>
-    <string name="simulator_submenu_label" msgid="186156287346615267">"Simulaattori"</string>
-    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Luo uusi UI-pikakuvake"</string>
-    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"Siirrytään joukkotoimintotilaan."</string>
-    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"Poistuttiin joukkotoimintotilasta."</string>
-    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> valittiin."</string>
-    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> ei ole enää valittuna."</string>
-    <string name="description_contact_details" msgid="3341280873855253464">"Yhteystiedot: <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_spam_contact_details" msgid="5592578752881528368">"Mahdollisen häirikkösoittajan yhteystiedot: <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> puhelua."</string>
-    <string name="description_video_call" msgid="3738199365585751727">"Videopuhelu."</string>
-    <string name="description_start_voice_search" msgid="8380022725973015261">"Aloita puhehaku"</string>
-    <string name="voicemail" msgid="8899540969000957954">"Vastaaja"</string>
-    <string name="description_cancel_multi_select" msgid="3930475950253360461">"Peruuta joukkotoimintotila."</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Poista"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Peruuta"</string>
-    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> valittu"</string>
-    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
-      <item quantity="other">"<b>"Poistetaanko nämä vastaajaviestit? "</b>"</item>
-      <item quantity="one">"<b>"Poistetaanko tämä vastaajaviesti? "</b>"</item>
-    </plurals>
-    <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
-    <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> klo <xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>.<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
-    <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="voice_search_not_available" msgid="6546240433719732905">"Puhehaku ei ole käytettävissä"</string>
-    <string name="dialer_hint_find_contact" msgid="2023214799381149808">"Hae yhteystiedoista"</string>
-    <string name="block_number_search_hint" msgid="5377706079015099416">"Lisää numero tai hae yhteystiedoista"</string>
-    <string name="call_log_all_empty" msgid="3955572868518162004">"Soittohistoriasi on tyhjä."</string>
-    <string name="call_log_all_empty_action" msgid="852218280136243014">"Soita puhelu"</string>
-    <string name="call_log_missed_empty" msgid="7094936030845062214">"Sinulla ei ole vastaamattomia puheluita."</string>
-    <string name="call_log_voicemail_empty" msgid="273623903423275178">"Puhelinvastaajasi postilaatikko on tyhjä."</string>
-    <string name="call_log_activity_title" msgid="1275242727244945527">"Soittohistoria"</string>
-    <string name="call_log_all_title" msgid="6042262422192020327">"Kaikki"</string>
-    <string name="call_log_missed_title" msgid="17254005889268015">"Vastaamattomat"</string>
-    <string name="tab_speed_dial" msgid="6616404752227561075">"Pikavalinta"</string>
-    <string name="tab_history" msgid="7420269368689503596">"Soittohistoria"</string>
-    <string name="tab_all_contacts" msgid="5531733977693943015">"Yhteystiedot"</string>
-    <string name="tab_voicemail" msgid="2458548090088316246">"Puhelinvastaaja"</string>
-    <string name="search_shortcut_call_number" msgid="8847918845036880688">"Soita <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"Luo uusi yhteystieto"</string>
-    <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"Lisää yhteystietoihin"</string>
-    <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"Lähetä tekstiviesti"</string>
-    <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"Soita videopuhelu"</string>
-    <string name="search_shortcut_block_number" msgid="4587283230665805776">"Estä numero"</string>
-    <string name="speed_dial_empty" msgid="3346406399966039505">"Pikavalinnassa ei ole vielä yhtään yhteystietoa."</string>
-    <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"Lisää suosikki"</string>
-    <string name="remove_contact" msgid="2353580570488923668">"Poista"</string>
-    <string name="select_all" msgid="408601760696146245">"Valitse kaikki"</string>
-    <string name="call_log_action_video_call" msgid="7565549950343850819">"Videopuhelu"</string>
-    <string name="call_log_action_send_message" msgid="6948727362660115554">"Lähetä viesti"</string>
-    <string name="call_log_action_details" msgid="2091370737371449501">"Puhelun tiedot"</string>
-    <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"Vastaanottaja: …"</string>
-    <string name="call_log_action_call" msgid="682724094251540583">"Soita: <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_incoming_missed_call" msgid="8292535799379230029">"Vastaamaton puhelu soittajalta <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_incoming_answered_call" msgid="3920182963103160610">"Vastattu puhelu soittajalta <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_unread_voicemail" msgid="145170985013419170">"Lukematon vastaajaviesti: <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_read_voicemail" msgid="5585559881573227732">"Vastaajaviesti: <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_outgoing_call" msgid="543952487882919924">"Soita vastaanottajalle <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="call_log_via_number" msgid="1340307109806397650">"numerosta <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> numerosta <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="description_call_action" msgid="4042796498169106545">"Soita: <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_video_call_action" msgid="1237090968588659650">"Soita videopuhelu: <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
-    <string name="description_voicemail_action" msgid="3290143432403538524">"Kuuntele vastaajaviesti: <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_create_new_contact_action" msgid="1928282350281564130">"Luo kontakti: <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
-    <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"Lisää <xliff:g id="NAMEORNUMBER">^1</xliff:g> olemassa olevaan kontaktiin."</string>
-    <string name="description_details_action" msgid="2061866409737706174">"Yhteystiedon <xliff:g id="NAMEORNUMBER">^1</xliff:g> puhelutiedot"</string>
-    <string name="call_log_header_today" msgid="1576119097475845293">"Tänään"</string>
-    <string name="call_log_header_yesterday" msgid="5616077776205329563">"Eilen"</string>
-    <string name="call_log_header_other" msgid="4940676886254217644">"Vanhempi"</string>
-    <string name="voicemail_speaker_on" msgid="3151333608926996668">"Ota kaiutin käyttöön."</string>
-    <string name="voicemail_speaker_off" msgid="2530064206962034201">"Poista kaiutin käytöstä."</string>
-    <string name="voicemail_play_start_pause" msgid="3874823480278334664">"Aloita tai keskeytä toisto."</string>
-    <string name="display_options_title" msgid="3880091801055797975">"Näyttöasetukset"</string>
-    <string name="sounds_and_vibration_title" msgid="3075050000721181384">"Äänet ja värinä"</string>
-    <string name="accessibility_settings_title" msgid="3329027650429831820">"Esteettömyys"</string>
-    <string name="ringtone_title" msgid="8377174189894648486">"Puhelimen soittoääni"</string>
-    <string name="vibrate_on_ring_title" msgid="631441314790960485">"Värinä myös puheluille"</string>
-    <string name="dtmf_tone_enable_title" msgid="3273762431523939277">"Näppäinäänet"</string>
-    <string name="dtmf_tone_length_title" msgid="534096029202438539">"Näppäinäänten pituus"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="applicationLabel">Puhelin</string>
+  <string name="launcherDialpadActivityLabel">Puhelimen näppäimistö</string>
+  <string name="callHistoryIconLabel">Soittohistoria</string>
+  <string name="action_copy_number_text">Kopioi numero</string>
+  <string name="copy_transcript_text">Kopioi transkriptio</string>
+  <string name="action_edit_number_before_call">Muokkaa numeroa ennen puhelua</string>
+  <string name="call_log_delete_all">Tyhjennä soittohistoria</string>
+  <string name="call_log_trash_voicemail">Poista vastaajaviesti</string>
+  <string name="snackbar_voicemail_deleted">Viesti poistettiin.</string>
+  <string name="clearCallLogConfirmation_title">Tyhjennetäänkö soittohistoria?</string>
+  <string name="clearCallLogConfirmation">Kaikki soittohistorian tiedot poistetaan</string>
+  <string name="clearCallLogProgress_title">Tyhjennetään soittohistoriaa…</string>
+  <string name="notification_missedCallTitle">Vastaamatta jäänyt puhelu</string>
+  <string name="notification_missedWorkCallTitle">Vastaamaton työpuhelu</string>
+  <string name="notification_missedCallsTitle">Vastaamattomat puhelut</string>
+  <string name="notification_missedCallsMsg">%d vastaamatonta puhelua</string>
+  <string name="notification_missedCall_call_back">Soita</string>
+  <string name="notification_missedCall_message">Viesti</string>
+  <string name="post_call_notification_message">%1$s: %2$s</string>
+  <string name="notification_voicemail_text_format">Soita numeroon %s</string>
+  <string name="notification_voicemail_no_vm_number">Puhelinvastaajan numero tuntematon</string>
+  <plurals name="notification_voicemail_title">
+    <item quantity="one">Vastaajaviesti</item>
+    <item quantity="other"> %1$d vastaajaviestiä </item>
+  </plurals>
+  <string name="notification_voicemail_callers_list">%1$s, %2$s</string>
+  <string name="notification_new_voicemail_ticker">Uusi vastaajaviesti: %1$s</string>
+  <string name="voicemail_playback_error">Viestin toistaminen epäonnistui</string>
+  <string name="voicemail_fetching_content">Ladataan puhelinvastaajaa…</string>
+  <string name="voicemail_fetching_timout">Puhelinvastaajan lataaminen epäonnistui</string>
+  <string name="call_log_item_count_and_date">(%1$d) %2$s</string>
+  <string name="description_playback_speakerphone">Ota kaiutin käyttöön tai poista käytöstä</string>
+  <string name="description_playback_seek">Toisto-osoitin</string>
+  <string name="action_menu_call_history_description">Soittohistoria</string>
+  <string msgid="2295659037509008453" name="action_menu_overflow_description">Lisää vaihtoehtoja</string>
+  <string name="action_menu_dialpad_button">näppäimistö</string>
+  <string name="dialer_settings_label">Asetukset</string>
+  <string name="simulator_submenu_label">Simulaattori</string>
+  <string name="new_ui_launcher_shortcut_label">Luo uusi UI-pikakuvake</string>
+  <string name="description_entering_bulk_action_mode">Siirrytään joukkotoimintotilaan.</string>
+  <string name="description_leaving_bulk_action_mode">Poistuttiin joukkotoimintotilasta.</string>
+  <string name="description_selecting_bulk_action_mode">%1$s valittiin.</string>
+  <string name="description_unselecting_bulk_action_mode">%1$s ei ole enää valittuna.</string>
+  <string name="description_contact_details">Yhteystiedot: %1$s</string>
+  <string name="description_spam_contact_details">Mahdollisen häirikkösoittajan yhteystiedot: %1$s</string>
+  <string name="description_num_calls">%1$s puhelua.</string>
+  <string name="description_video_call">Videopuhelu.</string>
+  <string name="description_start_voice_search">Aloita puhehaku</string>
+  <string name="voicemail">Vastaaja</string>
+  <string name="description_cancel_multi_select">Peruuta joukkotoimintotila.</string>
+  <string name="voicemailMultiSelectDeleteConfirm">Poista</string>
+  <string name="voicemailMultiSelectDeleteCancel">Peruuta</string>
+  <string name="voicemailMultiSelectActionBarTitle">%1$s valittu</string>
+  <plurals name="delete_voicemails_confirmation_dialog_title">
+    <item quantity="one"><b>Poistetaanko tämä vastaajaviesti? </b></item>
+    <item quantity="other"><b>Poistetaanko nämä vastaajaviestit? </b></item>
+  </plurals>
+  <string name="voicemailCallLogToday">@string/call_log_header_today</string>
+  <string name="voicemailCallLogDateTimeFormat">%1$s klo %2$s</string>
+  <string name="voicemailDurationFormat">%1$02d.%2$02d</string>
+  <string name="voicemailCallLogDateTimeFormatWithDuration">%1$s • %2$s</string>
+  <string name="voice_search_not_available">Puhehaku ei ole käytettävissä</string>
+  <string name="dialer_hint_find_contact">Hae yhteystiedoista</string>
+  <string name="block_number_search_hint">Lisää numero tai hae yhteystiedoista</string>
+  <string name="call_log_all_empty">Soittohistoriasi on tyhjä.</string>
+  <string name="call_log_all_empty_action">Soita puhelu</string>
+  <string name="call_log_missed_empty">Sinulla ei ole vastaamattomia puheluita.</string>
+  <string name="call_log_voicemail_empty">Puhelinvastaajasi postilaatikko on tyhjä.</string>
+  <string name="call_log_activity_title">Soittohistoria</string>
+  <string name="call_log_all_title">Kaikki</string>
+  <string name="call_log_missed_title">Vastaamattomat</string>
+  <string name="tab_speed_dial">Pikavalinta</string>
+  <string name="tab_history">Soittohistoria</string>
+  <string name="tab_all_contacts">Yhteystiedot</string>
+  <string name="tab_voicemail">Puhelinvastaaja</string>
+  <string name="search_shortcut_call_number">Soita %s</string>
+  <string name="search_shortcut_create_new_contact">Luo uusi yhteystieto</string>
+  <string name="search_shortcut_add_to_contact">Lisää yhteystietoihin</string>
+  <string name="search_shortcut_send_sms_message">Lähetä tekstiviesti</string>
+  <string name="search_shortcut_make_video_call">Soita videopuhelu</string>
+  <string name="search_shortcut_block_number">Estä numero</string>
+  <string name="speed_dial_empty">Pikavalinnassa ei ole vielä yhtään yhteystietoa.</string>
+  <string name="speed_dial_empty_add_favorite_action">Lisää suosikki</string>
+  <string name="remove_contact">Poista</string>
+  <string name="select_all">Valitse kaikki</string>
+  <string name="call_log_action_video_call">Videopuhelu</string>
+  <string name="call_log_action_set_up_video">Aloita videopuhelu</string>
+  <string name="call_log_action_invite_video">Kutsu muita videopuheluun</string>
+  <string name="call_log_action_send_message">Lähetä viesti</string>
+  <string name="call_log_action_details">Puhelun tiedot</string>
+  <string name="call_log_action_share_voicemail">Vastaanottaja: …</string>
+  <string name="call_log_action_call">Soita: ^1</string>
+  <string name="description_incoming_missed_call">Vastaamaton puhelu soittajalta ^1, ^2, ^3, ^4.</string>
+  <string name="description_incoming_answered_call">Vastattu puhelu soittajalta ^1, ^2, ^3, ^4.</string>
+  <string name="description_unread_voicemail">Lukematon vastaajaviesti: ^1, ^2, ^3, ^4.</string>
+  <string name="description_read_voicemail">Vastaajaviesti: ^1, ^2, ^3, ^4.</string>
+  <string name="description_outgoing_call">Soita vastaanottajalle ^1, ^2, ^3, ^4.</string>
+  <string name="call_log_via_number">numerosta %1$s</string>
+  <string name="call_log_via_number_phone_account">%1$s numerosta %2$s</string>
+  <string name="description_call_action">Soita: ^1</string>
+  <string name="description_video_call_action">Soita videopuhelu: ^1.</string>
+  <string name="description_voicemail_action">Kuuntele vastaajaviesti: ^1</string>
+  <string name="description_create_new_contact_action">Luo kontakti: ^1.</string>
+  <string name="description_add_to_existing_contact_action">Lisää ^1 olemassa olevaan kontaktiin.</string>
+  <string name="description_details_action">Yhteystiedon ^1 puhelutiedot</string>
+  <string name="call_log_header_today">Tänään</string>
+  <string name="call_log_header_yesterday">Eilen</string>
+  <string name="call_log_header_other">Vanhempi</string>
+  <string name="voicemail_speaker_on">Ota kaiutin käyttöön.</string>
+  <string name="voicemail_speaker_off">Poista kaiutin käytöstä.</string>
+  <string name="voicemail_play_start_pause">Aloita tai keskeytä toisto.</string>
+  <string name="display_options_title">Näyttöasetukset</string>
+  <string name="sounds_and_vibration_title">Äänet ja värinä</string>
+  <string name="accessibility_settings_title">Esteettömyys</string>
+  <string name="ringtone_title">Puhelimen soittoääni</string>
+  <string name="vibrate_on_ring_title">Värinä myös puheluille</string>
+  <string name="dtmf_tone_enable_title">Näppäinäänet</string>
+  <string name="dtmf_tone_length_title">Näppäinäänten pituus</string>
   <string-array name="dtmf_tone_length_entries">
-    <item msgid="3136353015227162823">"Normaali"</item>
-    <item msgid="5376841175538523822">"Pitkä"</item>
+    <item>Normaali</item>
+    <item>Pitkä</item>
   </string-array>
-    <string name="respond_via_sms_setting_title" msgid="8008181606657693452">"Pikavastaukset"</string>
-    <string name="call_settings_label" msgid="7824611757200960807">"Puhelut"</string>
-    <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Puhelujen esto"</string>
-    <string name="voicemail_settings_label" msgid="4594299554519920570">"Vastaaja"</string>
-    <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Puheluesto väliaikaisesti pois käytöstä"</string>
-    <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Puheluiden estäminen on poistettu käytöstä, koska olet ottanut yhteyttä hätäpalveluihin tästä puhelimesta viimeisen 48 tunnin aikana. Esto otetaan automaattisesti uudelleen käyttöön, kun puhelusta on kulunut 48 tuntia."</string>
-    <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Tuo numerot"</string>
-    <string name="blocked_call_settings_import_description" msgid="1819412052545228965">"Valitsit aiemmin muilla sovelluksilla, että tiettyjen soittajien puhelut siirretään automaattisesti vastaajaan."</string>
-    <string name="blocked_call_settings_view_numbers_button" msgid="3332727948554356704">"Näytä numerot"</string>
-    <string name="blocked_call_settings_import_button" msgid="7319111700387470727">"Tuo"</string>
-    <string name="description_blocked_number_list_delete" msgid="2139644216858370740">"Poista numeron esto"</string>
-    <string name="addBlockedNumber" msgid="3053473735238295551">"Lisää numero"</string>
-    <string name="block_number_footer_message_vvm" msgid="7955326304033982368">"Näistä numeroista tulevat puhelut estetään, ja vastaajaviestit poistetaan automaattisesti."</string>
-    <string name="block_number_footer_message_no_vvm" msgid="1152684139070471665">"Näistä numeroista tulevat puhelut estetään, mutta soittajat voivat silti mahdollisesti jättää vastaajaviestejä."</string>
-    <string name="block_list" msgid="4701585783411870782">"Estetyt numerot"</string>
-    <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g> on jo estetty."</string>
-    <string name="phone_account_settings_label" msgid="8372485478006965920">"Puhelutilit"</string>
-    <string name="permission_no_speeddial" msgid="8487215628510596753">"Jos haluat käyttää pikavalintaa, ota Yhteystiedot-käyttöoikeus käyttöön."</string>
-    <string name="permission_no_calllog" msgid="4053705651238775784">"Jos haluat katsella puhelulokiasi, ota Puhelin-käyttöoikeus käyttöön."</string>
-    <string name="permission_no_search" msgid="2424710404207193826">"Jos haluat hakea kontaktejasi, ota käyttöön kontaktien käyttöoikeudet."</string>
-    <string name="permission_place_call" msgid="8686908130349369423">"Jos haluat soittaa puheluja, ota Puhelin-käyttöoikeus käyttöön."</string>
-    <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"Puhelinsovelluksella ei ole oikeutta muokata järjestelmän asetuksia."</string>
-    <string name="blocked_number_call_log_label" msgid="4212282846299997693">"Estetty"</string>
-    <string name="call_log_action_block_report_number" msgid="7302636538668696729">"Estä / ilmoita häiriköinnistä"</string>
-    <string name="call_log_action_block_number" msgid="5048188386501998865">"Estä numero"</string>
-    <string name="call_log_action_remove_spam" msgid="2045319806318398403">"Ei ole häirikkösoittaja"</string>
-    <string name="call_log_action_unblock_number" msgid="6100117033288448758">"Poista numeron esto"</string>
-    <string name="spam_number_call_log_label" msgid="2678431398326811131">"Roskaposti"</string>
-    <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> on offline-tilassa, eikä siihen saada yhteyttä."</string>
-    <string name="about_phone_label" msgid="582991354677973731">"Tietoja"</string>
-    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Googlen litteroima"</string>
-    <string name="voicemail_transcription_in_progress" msgid="2933320969613783210">"Google litteroi…"</string>
-    <string name="voicemail_transcription_failed" msgid="335275303117412706">"Transkriptio ei ole saatavilla."</string>
-    <string name="voicemail_transcription_failed_language_not_supported" msgid="4210332591050562553">"Transkriptio ei ole saatavilla. Kieltä ei tueta."</string>
-    <string name="voicemail_transcription_failed_no_speech" msgid="9093372879697874852">"Transkriptio ei ole saatavilla. Puhetta ei tunnistettu."</string>
-    <string name="view_conversation" msgid="7895904782094119702">"Näytä"</string>
-    <string name="ec_data_deleted" msgid="4794880345545827107">"Puhelu poistettu. Voit tarkastella ja poistaa puhelun aikana jaettuja liitteitä Viesteissä."</string>
-    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"Puhelut poistettu. Voit tarkastella ja poistaa puhelujen aikana jaettuja liitteitä Viesteissä."</string>
+  <string name="respond_via_sms_setting_title">Pikavastaukset</string>
+  <string name="call_settings_label">Puhelut</string>
+  <string name="manage_blocked_numbers_label">Estetyt numerot</string>
+  <string name="voicemail_settings_label">Vastaaja</string>
+  <string name="blocked_numbers_disabled_emergency_header_label">Puheluesto väliaikaisesti pois käytöstä</string>
+  <string name="blocked_numbers_disabled_emergency_desc">Puheluiden estäminen on poistettu käytöstä, koska olet ottanut yhteyttä hätäpalveluihin tästä puhelimesta viimeisen 48 tunnin aikana. Esto otetaan automaattisesti uudelleen käyttöön, kun puhelusta on kulunut 48 tuntia.</string>
+  <string name="import_send_to_voicemail_numbers_label">Tuo numerot</string>
+  <string name="blocked_call_settings_import_description">Valitsit aiemmin muilla sovelluksilla, että tiettyjen soittajien puhelut siirretään automaattisesti vastaajaan.</string>
+  <string name="blocked_call_settings_view_numbers_button">Näytä numerot</string>
+  <string name="blocked_call_settings_import_button">Tuo</string>
+  <string name="description_blocked_number_list_delete">Poista numeron esto</string>
+  <string name="addBlockedNumber">Lisää numero</string>
+  <string name="block_number_footer_message_vvm">Näistä numeroista tulevat puhelut estetään, ja vastaajaviestit poistetaan automaattisesti.</string>
+  <string name="block_number_footer_message_no_vvm">Näistä numeroista tulevat puhelut estetään, mutta soittajat voivat silti mahdollisesti jättää vastaajaviestejä.</string>
+  <string name="block_list">Estetyt numerot</string>
+  <string name="alreadyBlocked">%1$s on jo estetty.</string>
+  <string name="phone_account_settings_label">Puhelutilit</string>
+  <string name="permission_no_speeddial">Jos haluat käyttää pikavalintaa, ota Yhteystiedot-käyttöoikeus käyttöön.</string>
+  <string name="permission_no_calllog">Jos haluat katsella puhelulokiasi, ota Puhelin-käyttöoikeus käyttöön.</string>
+  <string name="permission_no_search">Jos haluat hakea kontaktejasi, ota käyttöön kontaktien käyttöoikeudet.</string>
+  <string name="permission_place_call">Jos haluat soittaa puheluja, ota Puhelin-käyttöoikeus käyttöön.</string>
+  <string name="toast_cannot_write_system_settings">Puhelinsovelluksella ei ole oikeutta muokata järjestelmän asetuksia.</string>
+  <string name="blocked_number_call_log_label">Estetty</string>
+  <string name="call_log_action_block_report_number">Estä / ilmoita häiriköinnistä</string>
+  <string name="call_log_action_block_number">Estä numero</string>
+  <string name="call_log_action_remove_spam">Ei ole häirikkösoittaja</string>
+  <string name="call_log_action_unblock_number">Poista numeron esto</string>
+  <string name="spam_number_call_log_label">Roskaposti</string>
+  <string name="call_composer_connection_failed">%1$s on offline-tilassa, eikä siihen saada yhteyttä.</string>
+  <string name="about_phone_label">Tietoja</string>
+  <string name="voicemail_transcription_branding_text">Googlen litteroima</string>
+  <string name="voicemail_transcription_in_progress">Litteroidaan…</string>
+  <string name="voicemail_transcription_failed">Transkriptio ei ole saatavilla.</string>
+  <string name="voicemail_transcription_failed_language_not_supported">Transkriptio ei ole saatavilla. Kieltä ei tueta.</string>
+  <string name="voicemail_transcription_failed_no_speech">Transkriptio ei ole saatavilla. Puhetta ei tunnistettu.</string>
+  <string name="voicemail_donation_promo_title">Haluatko auttaa transkriptioiden tarkkuuden parantamisessa?</string>
+  <string name="voicemail_donation_promo_content">Anna Googlen arvioida tämä vastaajaviesti ja tulevat viestit transkriptioiden avulla. Tiedot tallennetaan nimettöminä. Voit muuttaa asetusta milloin tahansa. %1$s</string>
+  <string name="voicemail_donation_promo_opt_in">Kyllä</string>
+  <string name="voicemail_donation_promo_opt_out">Ei kiitos</string>
+  <string name="voicemail_transcription_rating">Arvioi transkription laatu</string>
+  <string name="voicemail_transcription_rating_thanks">Kiitos palautteestasi</string>
+  <string name="description_rating_good">Tykkään</string>
+  <string name="description_rating_bad">En tykkää</string>
+  <string name="view_conversation">Näytä</string>
+  <string name="ec_data_deleted">Puhelu poistettu. Voit tarkastella ja poistaa puhelun aikana jaettuja liitteitä Viesteissä.</string>
+  <string name="multiple_ec_data_deleted">Puhelut poistettu. Voit tarkastella ja poistaa puhelujen aikana jaettuja liitteitä Viesteissä.</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-fr-rCA/strings.xml b/java/com/android/dialer/app/res/values-fr-rCA/strings.xml
index 28b6a4f..554b1e6 100644
--- a/java/com/android/dialer/app/res/values-fr-rCA/strings.xml
+++ b/java/com/android/dialer/app/res/values-fr-rCA/strings.xml
@@ -1,179 +1,171 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="applicationLabel" msgid="2202739481132958990">"Téléphone"</string>
-    <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"Clavier du téléphone"</string>
-    <string name="callHistoryIconLabel" msgid="7493268743411968630">"Historique des appels"</string>
-    <string name="action_copy_number_text" msgid="832682558551502319">"Copier le numéro"</string>
-    <string name="copy_transcript_text" msgid="937904189017310829">"Copier la transcription"</string>
-    <string name="action_edit_number_before_call" msgid="8017492815878473837">"Modifier le numéro avant l\'appel"</string>
-    <string name="call_log_delete_all" msgid="7852970926906523784">"Effacer l\'historique d\'appels"</string>
-    <string name="call_log_trash_voicemail" msgid="6118493534178533972">"Supprimer le message vocal"</string>
-    <string name="snackbar_voicemail_deleted" msgid="7463166543725496307">"Mess. vocal supprimé"</string>
-    <string name="snackbar_voicemail_deleted_undo" msgid="6959743982796409941">"ANNULER"</string>
-    <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"Effacer l\'historique des appels?"</string>
-    <string name="clearCallLogConfirmation" msgid="6844949465815109166">"Tous les appels seront supprimés de votre historique."</string>
-    <string name="clearCallLogProgress_title" msgid="995004835687361977">"Suppression historique des appels…"</string>
-    <string name="notification_missedCallTitle" msgid="8283366068539898486">"Appel manqué"</string>
-    <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"Appel professionnel manqué"</string>
-    <string name="notification_missedCallsTitle" msgid="3697442015345089802">"Appels manqués"</string>
-    <string name="notification_missedCallsMsg" msgid="8176217633929018706">"<xliff:g id="NUM_MISSED_CALLS">%d</xliff:g> appels manqués"</string>
-    <string name="notification_missedCall_call_back" msgid="3875698110051973965">"Rappeler"</string>
-    <string name="notification_missedCall_message" msgid="5086910028988305964">"Message"</string>
-    <string name="post_call_notification_message" msgid="5417476789860590611">"<xliff:g id="NAME">%1$s</xliff:g> : <xliff:g id="MESSAGE">%2$s</xliff:g>"</string>
-    <string name="notification_voicemail_text_format" msgid="1895667520930252897">"Composer le <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
-    <string name="notification_voicemail_no_vm_number" msgid="8942821987929495842">"Numéro de messagerie vocale inconnu"</string>
-    <plurals name="notification_voicemail_title" formatted="false" msgid="1551847434476438657">
-      <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> message vocal </item>
-      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> messages vocaux </item>
-    </plurals>
-    <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
-    <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"Nouveau message vocal de <xliff:g id="CALLER">%1$s</xliff:g>"</string>
-    <string name="voicemail_playback_error" msgid="4384373852257757295">"Impossible de lire le message vocal"</string>
-    <string name="voicemail_fetching_content" msgid="572320120918636014">"Chargement du message vocal en cours…"</string>
-    <string name="voicemail_fetching_timout" msgid="2128873915839949783">"Impossible de charger la messagerie vocale"</string>
-    <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_playback_speakerphone" msgid="4852027754869750227">"Activer ou désactiver le haut-parleur"</string>
-    <string name="description_playback_seek" msgid="1340910573254132520">"Rechercher une position de lecture"</string>
-    <string name="action_menu_call_history_description" msgid="8829135306925008546">"Historique des appels"</string>
-    <string name="action_menu_overflow_description" msgid="7648679686746517341">"Plus d\'options"</string>
-    <string name="action_menu_dialpad_button" msgid="1970631633457493180">"clavier"</string>
-    <string name="dialer_settings_label" msgid="4980176284150290175">"Paramètres"</string>
-    <string name="simulator_submenu_label" msgid="186156287346615267">"Simulateur"</string>
-    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Créer un raccourci vers l\'IU"</string>
-    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"Entrée du mode d\'action groupée en cours…"</string>
-    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"Mode d\'action groupée quitté"</string>
-    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"Sélection : <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"Désélection : <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_contact_details" msgid="3341280873855253464">"Coordonnées de <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_spam_contact_details" msgid="5592578752881528368">"Coordonnées de l\'auteur de l\'appel suspect <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> appels."</string>
-    <string name="description_video_call" msgid="3738199365585751727">"Appel vidéo."</string>
-    <string name="description_start_voice_search" msgid="8380022725973015261">"Démarrer la recherche vocale"</string>
-    <string name="voicemail" msgid="8899540969000957954">"Messagerie vocale"</string>
-    <string name="description_cancel_multi_select" msgid="3930475950253360461">"Annuler le mode d\'action par lots"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Supprimer"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Annuler"</string>
-    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> sélection(s)"</string>
-    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
-      <item quantity="one">"<b>"Supprimer ce message vocal? "</b>"</item>
-      <item quantity="other">"<b>"Supprimer ces messages vocaux? "</b>"</item>
-    </plurals>
-    <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
-    <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> à <xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
-    <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="voice_search_not_available" msgid="6546240433719732905">"Recherche vocale non disponible"</string>
-    <string name="dialer_hint_find_contact" msgid="2023214799381149808">"Rechercher des contacts"</string>
-    <string name="block_number_search_hint" msgid="5377706079015099416">"Ajouter nº ou chercher contact"</string>
-    <string name="call_log_all_empty" msgid="3955572868518162004">"Votre historique des appels est vide"</string>
-    <string name="call_log_all_empty_action" msgid="852218280136243014">"Faire un appel"</string>
-    <string name="call_log_missed_empty" msgid="7094936030845062214">"Vous n\'avez aucun appel manqué."</string>
-    <string name="call_log_voicemail_empty" msgid="273623903423275178">"La boîte de réception de votre messagerie vocale est vide."</string>
-    <string name="call_log_activity_title" msgid="1275242727244945527">"Historique des appels"</string>
-    <string name="call_log_all_title" msgid="6042262422192020327">"Tous"</string>
-    <string name="call_log_missed_title" msgid="17254005889268015">"Manqués"</string>
-    <string name="tab_speed_dial" msgid="6616404752227561075">"Composition abrégée"</string>
-    <string name="tab_history" msgid="7420269368689503596">"Historique des appels"</string>
-    <string name="tab_all_contacts" msgid="5531733977693943015">"Contacts"</string>
-    <string name="tab_voicemail" msgid="2458548090088316246">"Messagerie vocale"</string>
-    <string name="search_shortcut_call_number" msgid="8847918845036880688">"Appeler le <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"Créer un contact"</string>
-    <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"Ajouter à un contact"</string>
-    <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"Envoyer un texto"</string>
-    <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"Faire un appel vidéo"</string>
-    <string name="search_shortcut_block_number" msgid="4587283230665805776">"Bloquer le numéro"</string>
-    <string name="speed_dial_empty" msgid="3346406399966039505">"Aucun contact ne figure dans vos numéros de composition abrégée"</string>
-    <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"Ajouter un favori"</string>
-    <string name="remove_contact" msgid="2353580570488923668">"Supprimer"</string>
-    <string name="select_all" msgid="408601760696146245">"Tout sélectionner"</string>
-    <string name="call_log_action_video_call" msgid="7565549950343850819">"Appel vidéo"</string>
-    <string name="call_log_action_send_message" msgid="6948727362660115554">"Envoyer un message"</string>
-    <string name="call_log_action_details" msgid="2091370737371449501">"Détails de l\'appel"</string>
-    <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"Envoyer à…"</string>
-    <string name="call_log_action_call" msgid="682724094251540583">"Appeler <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_incoming_missed_call" msgid="8292535799379230029">"Appel manqué : <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_incoming_answered_call" msgid="3920182963103160610">"Appel répondu : <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_unread_voicemail" msgid="145170985013419170">"Message vocal non écouté de <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_read_voicemail" msgid="5585559881573227732">"Message vocal de <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_outgoing_call" msgid="543952487882919924">"Appel effectué : <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="call_log_via_number" msgid="1340307109806397650">"au <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, au <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="description_call_action" msgid="4042796498169106545">"Appeler <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_video_call_action" msgid="1237090968588659650">"Appel vidéo avec <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_action" msgid="3290143432403538524">"Écouter le message vocal de <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_create_new_contact_action" msgid="1928282350281564130">"Créer un contact pour <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"Ajouter <xliff:g id="NAMEORNUMBER">^1</xliff:g> à un contact existant"</string>
-    <string name="description_details_action" msgid="2061866409737706174">"Détails de l\'appel pour <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="call_log_header_today" msgid="1576119097475845293">"Aujourd\'hui"</string>
-    <string name="call_log_header_yesterday" msgid="5616077776205329563">"Hier"</string>
-    <string name="call_log_header_other" msgid="4940676886254217644">"Plus anciens"</string>
-    <string name="voicemail_speaker_on" msgid="3151333608926996668">"Activer le haut-parleur."</string>
-    <string name="voicemail_speaker_off" msgid="2530064206962034201">"Désactiver le haut-parleur."</string>
-    <string name="voicemail_play_start_pause" msgid="3874823480278334664">"Lancer ou interrompre la lecture."</string>
-    <string name="display_options_title" msgid="3880091801055797975">"Options d\'affichage"</string>
-    <string name="sounds_and_vibration_title" msgid="3075050000721181384">"Sons et vibration"</string>
-    <string name="accessibility_settings_title" msgid="3329027650429831820">"Accessibilité"</string>
-    <string name="ringtone_title" msgid="8377174189894648486">"Sonnerie du téléphone"</string>
-    <string name="vibrate_on_ring_title" msgid="631441314790960485">"Vibrer aussi pour les appels"</string>
-    <string name="dtmf_tone_enable_title" msgid="3273762431523939277">"Tonalités du clavier"</string>
-    <string name="dtmf_tone_length_title" msgid="534096029202438539">"Durée des tonalités du clavier"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="applicationLabel">Téléphone</string>
+  <string name="launcherDialpadActivityLabel">Clavier du téléphone</string>
+  <string name="callHistoryIconLabel">Historique des appels</string>
+  <string name="action_copy_number_text">Copier le numéro</string>
+  <string name="copy_transcript_text">Copier la transcription</string>
+  <string name="action_edit_number_before_call">Modifier le numéro avant l\'appel</string>
+  <string name="call_log_delete_all">Effacer l\'historique d\'appels</string>
+  <string name="call_log_trash_voicemail">Supprimer le message vocal</string>
+  <string name="snackbar_voicemail_deleted">Mess. vocal supprimé</string>
+  <string name="clearCallLogConfirmation_title">Effacer l\'historique des appels?</string>
+  <string name="clearCallLogConfirmation">Tous les appels seront supprimés de votre historique.</string>
+  <string name="clearCallLogProgress_title">Suppression historique des appels…</string>
+  <string name="notification_missedCallTitle">Appel manqué</string>
+  <string name="notification_missedWorkCallTitle">Appel professionnel manqué</string>
+  <string name="notification_missedCallsTitle">Appels manqués</string>
+  <string name="notification_missedCallsMsg">%d appels manqués</string>
+  <string name="notification_missedCall_call_back">Rappeler</string>
+  <string name="notification_missedCall_message">Message</string>
+  <string name="post_call_notification_message">%1$s : %2$s</string>
+  <string name="notification_voicemail_text_format">Composer le %s</string>
+  <string name="notification_voicemail_no_vm_number">Numéro de messagerie vocale inconnu</string>
+  <plurals name="notification_voicemail_title">
+    <item quantity="one">%1$d message vocal </item>
+    <item quantity="other">%1$d messages vocaux </item>
+  </plurals>
+  <string name="notification_voicemail_callers_list">%1$s, %2$s</string>
+  <string name="notification_new_voicemail_ticker">Nouveau message vocal de %1$s</string>
+  <string name="voicemail_playback_error">Impossible de lire le message vocal</string>
+  <string name="voicemail_fetching_content">Chargement du message vocal en cours…</string>
+  <string name="voicemail_fetching_timout">Impossible de charger la messagerie vocale</string>
+  <string name="call_log_item_count_and_date">(%1$d) %2$s</string>
+  <string name="description_playback_speakerphone">Activer ou désactiver le haut-parleur</string>
+  <string name="description_playback_seek">Rechercher une position de lecture</string>
+  <string name="action_menu_call_history_description">Historique des appels</string>
+  <string msgid="2295659037509008453" name="action_menu_overflow_description">Plus d\'options</string>
+  <string name="action_menu_dialpad_button">clavier</string>
+  <string name="dialer_settings_label">Paramètres</string>
+  <string name="simulator_submenu_label">Simulateur</string>
+  <string name="new_ui_launcher_shortcut_label">Créer un raccourci vers l\'IU</string>
+  <string name="description_entering_bulk_action_mode">Entrée du mode d\'action groupée en cours…</string>
+  <string name="description_leaving_bulk_action_mode">Mode d\'action groupée quitté</string>
+  <string name="description_selecting_bulk_action_mode">Sélection : %1$s</string>
+  <string name="description_unselecting_bulk_action_mode">Désélection : %1$s</string>
+  <string name="description_contact_details">Coordonnées de %1$s</string>
+  <string name="description_spam_contact_details">Coordonnées de l\'auteur de l\'appel suspect %1$s</string>
+  <string name="description_num_calls">%1$s appels.</string>
+  <string name="description_video_call">Appel vidéo.</string>
+  <string name="description_start_voice_search">Démarrer la recherche vocale</string>
+  <string name="voicemail">Messagerie vocale</string>
+  <string name="description_cancel_multi_select">Annuler le mode d\'action par lots</string>
+  <string name="voicemailMultiSelectDeleteConfirm">Supprimer</string>
+  <string name="voicemailMultiSelectDeleteCancel">Annuler</string>
+  <string name="voicemailMultiSelectActionBarTitle">%1$s sélection(s)</string>
+  <plurals name="delete_voicemails_confirmation_dialog_title">
+    <item quantity="one"><b>Supprimer ce message vocal? </b></item>
+    <item quantity="other"><b>Supprimer ces messages vocaux? </b></item>
+  </plurals>
+  <string name="voicemailCallLogToday">@string/call_log_header_today</string>
+  <string name="voicemailCallLogDateTimeFormat">%1$s à %2$s</string>
+  <string name="voicemailDurationFormat">%1$02d:%2$02d</string>
+  <string name="voicemailCallLogDateTimeFormatWithDuration">%1$s • %2$s</string>
+  <string name="voice_search_not_available">Recherche vocale non disponible</string>
+  <string name="dialer_hint_find_contact">Rechercher des contacts</string>
+  <string name="block_number_search_hint">Ajouter nº ou chercher contact</string>
+  <string name="call_log_all_empty">Votre historique des appels est vide</string>
+  <string name="call_log_all_empty_action">Faire un appel</string>
+  <string name="call_log_missed_empty">Vous n\'avez aucun appel manqué.</string>
+  <string name="call_log_voicemail_empty">La boîte de réception de votre messagerie vocale est vide.</string>
+  <string name="call_log_activity_title">Historique des appels</string>
+  <string name="call_log_all_title">Tous</string>
+  <string name="call_log_missed_title">Manqués</string>
+  <string name="tab_speed_dial">Composition abrégée</string>
+  <string name="tab_history">Historique des appels</string>
+  <string name="tab_all_contacts">Contacts</string>
+  <string name="tab_voicemail">Messagerie vocale</string>
+  <string name="search_shortcut_call_number">Appeler le %s</string>
+  <string name="search_shortcut_create_new_contact">Créer un contact</string>
+  <string name="search_shortcut_add_to_contact">Ajouter à un contact</string>
+  <string name="search_shortcut_send_sms_message">Envoyer un texto</string>
+  <string name="search_shortcut_make_video_call">Faire un appel vidéo</string>
+  <string name="search_shortcut_block_number">Bloquer le numéro</string>
+  <string name="speed_dial_empty">Aucun contact ne figure dans vos numéros de composition abrégée</string>
+  <string name="speed_dial_empty_add_favorite_action">Ajouter un favori</string>
+  <string name="remove_contact">Supprimer</string>
+  <string name="select_all">Tout sélectionner</string>
+  <string name="call_log_action_video_call">Appel vidéo</string>
+  <string name="call_log_action_set_up_video">Configurer les appels vidéo</string>
+  <string name="call_log_action_invite_video">Inviter à un appel vidéo</string>
+  <string name="call_log_action_send_message">Envoyer un message</string>
+  <string name="call_log_action_details">Détails de l\'appel</string>
+  <string name="call_log_action_share_voicemail">Envoyer à…</string>
+  <string name="call_log_action_call">Appeler ^1</string>
+  <string name="description_incoming_missed_call">Appel manqué : ^1, ^2, ^3, ^4.</string>
+  <string name="description_incoming_answered_call">Appel répondu : ^1, ^2, ^3, ^4.</string>
+  <string name="description_unread_voicemail">Message vocal non écouté de ^1, ^2, ^3, ^4.</string>
+  <string name="description_read_voicemail">Message vocal de ^1, ^2, ^3, ^4.</string>
+  <string name="description_outgoing_call">Appel effectué : ^1, ^2, ^3, ^4.</string>
+  <string name="call_log_via_number">au %1$s</string>
+  <string name="call_log_via_number_phone_account">%1$s, au %2$s</string>
+  <string name="description_call_action">Appeler ^1</string>
+  <string name="description_video_call_action">Appel vidéo avec ^1</string>
+  <string name="description_voicemail_action">Écouter le message vocal de ^1</string>
+  <string name="description_create_new_contact_action">Créer un contact pour ^1</string>
+  <string name="description_add_to_existing_contact_action">Ajouter ^1 à un contact existant</string>
+  <string name="description_details_action">Détails de l\'appel pour ^1</string>
+  <string name="call_log_header_today">Aujourd\'hui</string>
+  <string name="call_log_header_yesterday">Hier</string>
+  <string name="call_log_header_other">Plus anciens</string>
+  <string name="voicemail_speaker_on">Activer le haut-parleur.</string>
+  <string name="voicemail_speaker_off">Désactiver le haut-parleur.</string>
+  <string name="voicemail_play_start_pause">Lancer ou interrompre la lecture.</string>
+  <string name="display_options_title">Options d\'affichage</string>
+  <string name="sounds_and_vibration_title">Sons et vibration</string>
+  <string name="accessibility_settings_title">Accessibilité</string>
+  <string name="ringtone_title">Sonnerie du téléphone</string>
+  <string name="vibrate_on_ring_title">Vibrer aussi pour les appels</string>
+  <string name="dtmf_tone_enable_title">Tonalités du clavier</string>
+  <string name="dtmf_tone_length_title">Durée des tonalités du clavier</string>
   <string-array name="dtmf_tone_length_entries">
-    <item msgid="3136353015227162823">"Normale"</item>
-    <item msgid="5376841175538523822">"Longues"</item>
+    <item>Normale</item>
+    <item>Longues</item>
   </string-array>
-    <string name="respond_via_sms_setting_title" msgid="8008181606657693452">"Réponses rapides"</string>
-    <string name="call_settings_label" msgid="7824611757200960807">"Appels"</string>
-    <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Blocage des appels"</string>
-    <string name="voicemail_settings_label" msgid="4594299554519920570">"Messagerie vocale"</string>
-    <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Blocage appels désactivé temporairement"</string>
-    <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Le blocage des appels a été désactivé, car vous avez communiqué avec les services d\'urgence à partir de ce téléphone au cours des dernières 48 heures. Le blocage sera réactivé automatiquement après 48 heures."</string>
-    <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Importer les numéros"</string>
-    <string name="blocked_call_settings_import_description" msgid="1819412052545228965">"Vous avez indiqué que certains appelants devaient automatiquement être renvoyés vers la messagerie vocale par d\'autres applications."</string>
-    <string name="blocked_call_settings_view_numbers_button" msgid="3332727948554356704">"Afficher les numéros"</string>
-    <string name="blocked_call_settings_import_button" msgid="7319111700387470727">"Importer"</string>
-    <string name="description_blocked_number_list_delete" msgid="2139644216858370740">"Débloquer le numéro"</string>
-    <string name="addBlockedNumber" msgid="3053473735238295551">"Ajouter un numéro"</string>
-    <string name="block_number_footer_message_vvm" msgid="7955326304033982368">"Les appels provenant de ces numéros seront bloqués et les messages vocaux seront automatiquement supprimés."</string>
-    <string name="block_number_footer_message_no_vvm" msgid="1152684139070471665">"Les appels provenant de ces numéros seront bloqués, mais il se peut que les appelants puissent quand même vous laisser des messages vocaux."</string>
-    <string name="block_list" msgid="4701585783411870782">"Numéros bloqués"</string>
-    <string name="alreadyBlocked" msgid="5483253180532475653">"Le numéro <xliff:g id="NUMBER">%1$s</xliff:g> est déjà bloqué."</string>
-    <string name="phone_account_settings_label" msgid="8372485478006965920">"Comptes d\'appel"</string>
-    <string name="permission_no_speeddial" msgid="8487215628510596753">"Pour activer la composition abrégée, activez l\'autorisation Contacts."</string>
-    <string name="permission_no_calllog" msgid="4053705651238775784">"Pour consulter votre journal d\'appels, activez l\'autorisation Téléphone."</string>
-    <string name="permission_no_search" msgid="2424710404207193826">"Pour rechercher vos contacts et les lieux à proximité, activez les autorisations Contacts."</string>
-    <string name="permission_place_call" msgid="8686908130349369423">"Pour faire un appel, activez l\'autorisation Téléphone."</string>
-    <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"L\'application Téléphone n\'est pas autorisée à modifier les paramètres du système."</string>
-    <string name="blocked_number_call_log_label" msgid="4212282846299997693">"Bloqué"</string>
-    <string name="call_log_action_block_report_number" msgid="7302636538668696729">"Bloquer/signaler comme pourriel"</string>
-    <string name="call_log_action_block_number" msgid="5048188386501998865">"Bloquer le numéro"</string>
-    <string name="call_log_action_remove_spam" msgid="2045319806318398403">"N\'est pas un pourriel"</string>
-    <string name="call_log_action_unblock_number" msgid="6100117033288448758">"Débloquer le numéro"</string>
-    <string name="spam_number_call_log_label" msgid="2678431398326811131">"Pourriel"</string>
-    <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> est hors connexion et injoignable"</string>
-    <string name="about_phone_label" msgid="582991354677973731">"À propos"</string>
-    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Transcrit par Google"</string>
-    <string name="voicemail_transcription_in_progress" msgid="2933320969613783210">"Google transcrit…"</string>
-    <string name="voicemail_transcription_failed" msgid="335275303117412706">"Transcription non disponible."</string>
-    <string name="voicemail_transcription_failed_language_not_supported" msgid="4210332591050562553">"Transcription non disponible. Langue non prise en charge."</string>
-    <string name="voicemail_transcription_failed_no_speech" msgid="9093372879697874852">"Transcription non disponible. Aucune parole détectée."</string>
-    <string name="view_conversation" msgid="7895904782094119702">"Afficher"</string>
-    <string name="ec_data_deleted" msgid="4794880345545827107">"Appel supprimé. Affichez et supprimez les pièces jointes partagées pendant cet appel dans les messages."</string>
-    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"Appels supprimés. Affichez et supprimez les pièces jointes partagées pendant ces appels dans les messages."</string>
+  <string name="respond_via_sms_setting_title">Réponses rapides</string>
+  <string name="call_settings_label">Appels</string>
+  <string name="manage_blocked_numbers_label">Numéros bloqués</string>
+  <string name="voicemail_settings_label">Messagerie vocale</string>
+  <string name="blocked_numbers_disabled_emergency_header_label">Blocage appels désactivé temporairement</string>
+  <string name="blocked_numbers_disabled_emergency_desc">Le blocage des appels a été désactivé, car vous avez communiqué avec les services d\'urgence à partir de ce téléphone au cours des dernières 48 heures. Le blocage sera réactivé automatiquement après 48 heures.</string>
+  <string name="import_send_to_voicemail_numbers_label">Importer les numéros</string>
+  <string name="blocked_call_settings_import_description">Vous avez indiqué que certains appelants devaient automatiquement être renvoyés vers la messagerie vocale par d\'autres applications.</string>
+  <string name="blocked_call_settings_view_numbers_button">Afficher les numéros</string>
+  <string name="blocked_call_settings_import_button">Importer</string>
+  <string name="description_blocked_number_list_delete">Débloquer le numéro</string>
+  <string name="addBlockedNumber">Ajouter un numéro</string>
+  <string name="block_number_footer_message_vvm">Les appels provenant de ces numéros seront bloqués et les messages vocaux seront automatiquement supprimés.</string>
+  <string name="block_number_footer_message_no_vvm">Les appels provenant de ces numéros seront bloqués, mais il se peut que les appelants puissent quand même vous laisser des messages vocaux.</string>
+  <string name="block_list">Numéros bloqués</string>
+  <string name="alreadyBlocked">Le numéro %1$s est déjà bloqué.</string>
+  <string name="phone_account_settings_label">Comptes d\'appel</string>
+  <string name="permission_no_speeddial">Pour activer la composition abrégée, activez l\'autorisation Contacts.</string>
+  <string name="permission_no_calllog">Pour consulter votre journal d\'appels, activez l\'autorisation Téléphone.</string>
+  <string name="permission_no_search">Pour rechercher vos contacts et les lieux à proximité, activez les autorisations Contacts.</string>
+  <string name="permission_place_call">Pour faire un appel, activez l\'autorisation Téléphone.</string>
+  <string name="toast_cannot_write_system_settings">L\'application Téléphone n\'est pas autorisée à modifier les paramètres du système.</string>
+  <string name="blocked_number_call_log_label">Bloqué</string>
+  <string name="call_log_action_block_report_number">Bloquer/signaler comme pourriel</string>
+  <string name="call_log_action_block_number">Bloquer le numéro</string>
+  <string name="call_log_action_remove_spam">N\'est pas un pourriel</string>
+  <string name="call_log_action_unblock_number">Débloquer le numéro</string>
+  <string name="spam_number_call_log_label">Pourriel</string>
+  <string name="call_composer_connection_failed">%1$s est hors connexion et injoignable</string>
+  <string name="about_phone_label">À propos</string>
+  <string name="voicemail_transcription_branding_text">Transcrit par Google</string>
+  <string name="voicemail_transcription_in_progress">Transcription en cours…</string>
+  <string name="voicemail_transcription_failed">Transcription non disponible.</string>
+  <string name="voicemail_transcription_failed_language_not_supported">Transcription non disponible. Langue non prise en charge.</string>
+  <string name="voicemail_transcription_failed_no_speech">Transcription non disponible. Aucune parole détectée.</string>
+  <string name="voicemail_donation_promo_title">Aider à améliorer l\'exactitude des transcriptions?</string>
+  <string name="voicemail_donation_promo_content">Autorisez Google à accéder à ce message vocal avec transcription et à ceux qui suivront. Ils seront stockés de façon anonyme. Vous pouvez modifier les paramètres à tout moment. %1$s</string>
+  <string name="voicemail_donation_promo_opt_in">Oui, j\'accepte</string>
+  <string name="voicemail_donation_promo_opt_out">Non, merci</string>
+  <string name="voicemail_transcription_rating">Évaluez la transcription</string>
+  <string name="voicemail_transcription_rating_thanks">Merci pour votre évaluation</string>
+  <string name="description_rating_good">J\'aime</string>
+  <string name="description_rating_bad">Je n\'aime pas</string>
+  <string name="view_conversation">Afficher</string>
+  <string name="ec_data_deleted">Appel supprimé. Affichez et supprimez les pièces jointes partagées pendant cet appel dans les messages.</string>
+  <string name="multiple_ec_data_deleted">Appels supprimés. Affichez et supprimez les pièces jointes partagées pendant ces appels dans les messages.</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-fr/strings.xml b/java/com/android/dialer/app/res/values-fr/strings.xml
index 22a2c6a..14b5f6e 100644
--- a/java/com/android/dialer/app/res/values-fr/strings.xml
+++ b/java/com/android/dialer/app/res/values-fr/strings.xml
@@ -1,179 +1,171 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="applicationLabel" msgid="2202739481132958990">"Téléphone"</string>
-    <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"Clavier téléphonique"</string>
-    <string name="callHistoryIconLabel" msgid="7493268743411968630">"Historique des appels"</string>
-    <string name="action_copy_number_text" msgid="832682558551502319">"Copier le numéro"</string>
-    <string name="copy_transcript_text" msgid="937904189017310829">"Copier la transcription"</string>
-    <string name="action_edit_number_before_call" msgid="8017492815878473837">"Modifier numéro avant d\'appeler"</string>
-    <string name="call_log_delete_all" msgid="7852970926906523784">"Supprimer l\'historique des appels"</string>
-    <string name="call_log_trash_voicemail" msgid="6118493534178533972">"Supprimer le message vocal"</string>
-    <string name="snackbar_voicemail_deleted" msgid="7463166543725496307">"Mess. vocal supprimé"</string>
-    <string name="snackbar_voicemail_deleted_undo" msgid="6959743982796409941">"ANNULER"</string>
-    <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"Supprimer l\'historique des appels ?"</string>
-    <string name="clearCallLogConfirmation" msgid="6844949465815109166">"Tous les appels seront supprimés de votre historique."</string>
-    <string name="clearCallLogProgress_title" msgid="995004835687361977">"Suppression historique des appels…"</string>
-    <string name="notification_missedCallTitle" msgid="8283366068539898486">"Appel manqué"</string>
-    <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"Appel professionnel manqué"</string>
-    <string name="notification_missedCallsTitle" msgid="3697442015345089802">"Appels manqués"</string>
-    <string name="notification_missedCallsMsg" msgid="8176217633929018706">"<xliff:g id="NUM_MISSED_CALLS">%d</xliff:g> appels manqués"</string>
-    <string name="notification_missedCall_call_back" msgid="3875698110051973965">"Rappeler"</string>
-    <string name="notification_missedCall_message" msgid="5086910028988305964">"Envoyer un SMS"</string>
-    <string name="post_call_notification_message" msgid="5417476789860590611">"<xliff:g id="NAME">%1$s</xliff:g> : <xliff:g id="MESSAGE">%2$s</xliff:g>"</string>
-    <string name="notification_voicemail_text_format" msgid="1895667520930252897">"Composer le <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
-    <string name="notification_voicemail_no_vm_number" msgid="8942821987929495842">"Numéro de messagerie vocale inconnu"</string>
-    <plurals name="notification_voicemail_title" formatted="false" msgid="1551847434476438657">
-      <item quantity="one"> <xliff:g id="COUNT">%1$d</xliff:g> message vocal </item>
-      <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> messages vocaux </item>
-    </plurals>
-    <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
-    <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"Nouveau message vocal de <xliff:g id="CALLER">%1$s</xliff:g>"</string>
-    <string name="voicemail_playback_error" msgid="4384373852257757295">"Impossible de lire le message vocal."</string>
-    <string name="voicemail_fetching_content" msgid="572320120918636014">"Chargement du message vocal en cours…"</string>
-    <string name="voicemail_fetching_timout" msgid="2128873915839949783">"Impossible de charger le message vocal."</string>
-    <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_playback_speakerphone" msgid="4852027754869750227">"Activer ou désactiver le haut-parleur"</string>
-    <string name="description_playback_seek" msgid="1340910573254132520">"Rechercher une position de lecture"</string>
-    <string name="action_menu_call_history_description" msgid="8829135306925008546">"Historique des appels"</string>
-    <string name="action_menu_overflow_description" msgid="7648679686746517341">"Plus d\'options"</string>
-    <string name="action_menu_dialpad_button" msgid="1970631633457493180">"Clavier"</string>
-    <string name="dialer_settings_label" msgid="4980176284150290175">"Paramètres"</string>
-    <string name="simulator_submenu_label" msgid="186156287346615267">"Simulateur"</string>
-    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Créer un raccourci vers la nouvelle interface"</string>
-    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"Activation du mode d\'action groupée"</string>
-    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"Désactivation du mode d\'action groupée"</string>
-    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> sélectionné"</string>
-    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> désélectionné"</string>
-    <string name="description_contact_details" msgid="3341280873855253464">"Coordonnées associées à <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_spam_contact_details" msgid="5592578752881528368">"Coordonnées correspondant à l\'appel indésirable suspecté (<xliff:g id="NAMEORNUMBER">%1$s</xliff:g>)"</string>
-    <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> appels"</string>
-    <string name="description_video_call" msgid="3738199365585751727">"Appel vidéo"</string>
-    <string name="description_start_voice_search" msgid="8380022725973015261">"Démarrer la recherche vocale"</string>
-    <string name="voicemail" msgid="8899540969000957954">"Messagerie vocale"</string>
-    <string name="description_cancel_multi_select" msgid="3930475950253360461">"Annuler le mode d\'actions groupées"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Supprimer"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Annuler"</string>
-    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> sélectionnés"</string>
-    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
-      <item quantity="one">"<b>"Supprimer ce message vocal ? "</b>"</item>
-      <item quantity="other">"<b>"Supprimer ces message vocaux ? "</b>"</item>
-    </plurals>
-    <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
-    <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> à <xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
-    <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="voice_search_not_available" msgid="6546240433719732905">"Recherche vocale non disponible"</string>
-    <string name="dialer_hint_find_contact" msgid="2023214799381149808">"Rech. des contacts"</string>
-    <string name="block_number_search_hint" msgid="5377706079015099416">"Ajouter num. ou rech. contacts"</string>
-    <string name="call_log_all_empty" msgid="3955572868518162004">"Votre historique des appels est vide."</string>
-    <string name="call_log_all_empty_action" msgid="852218280136243014">"Passer un appel"</string>
-    <string name="call_log_missed_empty" msgid="7094936030845062214">"Vous n\'avez aucun appel manqué."</string>
-    <string name="call_log_voicemail_empty" msgid="273623903423275178">"La boîte de réception de la messagerie vocale est vide."</string>
-    <string name="call_log_activity_title" msgid="1275242727244945527">"Historique des appels"</string>
-    <string name="call_log_all_title" msgid="6042262422192020327">"Tous"</string>
-    <string name="call_log_missed_title" msgid="17254005889268015">"Manqués"</string>
-    <string name="tab_speed_dial" msgid="6616404752227561075">"Numérotation abrégée"</string>
-    <string name="tab_history" msgid="7420269368689503596">"Historique des appels"</string>
-    <string name="tab_all_contacts" msgid="5531733977693943015">"Contacts"</string>
-    <string name="tab_voicemail" msgid="2458548090088316246">"Messagerie vocale"</string>
-    <string name="search_shortcut_call_number" msgid="8847918845036880688">"Appeler le <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"Créer un contact"</string>
-    <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"Ajouter à un contact"</string>
-    <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"Envoyer un SMS"</string>
-    <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"Passer un appel vidéo"</string>
-    <string name="search_shortcut_block_number" msgid="4587283230665805776">"Bloquer le numéro"</string>
-    <string name="speed_dial_empty" msgid="3346406399966039505">"Aucun contact pour la numérotation abrégée"</string>
-    <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"Ajouter un favori"</string>
-    <string name="remove_contact" msgid="2353580570488923668">"Supprimer"</string>
-    <string name="select_all" msgid="408601760696146245">"Tout sélectionner"</string>
-    <string name="call_log_action_video_call" msgid="7565549950343850819">"Appel vidéo"</string>
-    <string name="call_log_action_send_message" msgid="6948727362660115554">"Envoyer un message"</string>
-    <string name="call_log_action_details" msgid="2091370737371449501">"Informations sur l\'appel"</string>
-    <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"Envoyer à…"</string>
-    <string name="call_log_action_call" msgid="682724094251540583">"Appeler <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_incoming_missed_call" msgid="8292535799379230029">"Appel manqué <xliff:g id="TIMEOFCALL">^3</xliff:g> (appelant : <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>)"</string>
-    <string name="description_incoming_answered_call" msgid="3920182963103160610">"Appel reçu <xliff:g id="TIMEOFCALL">^3</xliff:g> (appelant : <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>)"</string>
-    <string name="description_unread_voicemail" msgid="145170985013419170">"Message vocal à écouter de <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_read_voicemail" msgid="5585559881573227732">"Message vocal de <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_outgoing_call" msgid="543952487882919924">"Appel émis <xliff:g id="TIMEOFCALL">^3</xliff:g> (destinataire : <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>)"</string>
-    <string name="call_log_via_number" msgid="1340307109806397650">"au <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> au <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="description_call_action" msgid="4042796498169106545">"Appeler <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_video_call_action" msgid="1237090968588659650">"Appel vidéo de \"<xliff:g id="NAMEORNUMBER">^1</xliff:g>\""</string>
-    <string name="description_voicemail_action" msgid="3290143432403538524">"Écouter le message vocal laissé par le numéro ou le contact \"<xliff:g id="NAMEORNUMBER">^1</xliff:g>\""</string>
-    <string name="description_create_new_contact_action" msgid="1928282350281564130">"Créer un contact pour \"<xliff:g id="NAMEORNUMBER">^1</xliff:g>\""</string>
-    <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"Ajouter \"<xliff:g id="NAMEORNUMBER">^1</xliff:g>\" à un contact"</string>
-    <string name="description_details_action" msgid="2061866409737706174">"Informations sur l\'appel pour <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="call_log_header_today" msgid="1576119097475845293">"Aujourd\'hui"</string>
-    <string name="call_log_header_yesterday" msgid="5616077776205329563">"Hier"</string>
-    <string name="call_log_header_other" msgid="4940676886254217644">"Plus anciens"</string>
-    <string name="voicemail_speaker_on" msgid="3151333608926996668">"Activer le haut-parleur"</string>
-    <string name="voicemail_speaker_off" msgid="2530064206962034201">"Désactiver le haut-parleur"</string>
-    <string name="voicemail_play_start_pause" msgid="3874823480278334664">"Lancer ou suspendre la lecture"</string>
-    <string name="display_options_title" msgid="3880091801055797975">"Options d\'affichage"</string>
-    <string name="sounds_and_vibration_title" msgid="3075050000721181384">"Sons et vibreur"</string>
-    <string name="accessibility_settings_title" msgid="3329027650429831820">"Accessibilité"</string>
-    <string name="ringtone_title" msgid="8377174189894648486">"Sonnerie du téléphone"</string>
-    <string name="vibrate_on_ring_title" msgid="631441314790960485">"Vibrer aussi pour les appels"</string>
-    <string name="dtmf_tone_enable_title" msgid="3273762431523939277">"Son du clavier"</string>
-    <string name="dtmf_tone_length_title" msgid="534096029202438539">"Durée du son du clavier"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="applicationLabel">Téléphone</string>
+  <string name="launcherDialpadActivityLabel">Clavier téléphonique</string>
+  <string name="callHistoryIconLabel">Historique des appels</string>
+  <string name="action_copy_number_text">Copier le numéro</string>
+  <string name="copy_transcript_text">Copier la transcription</string>
+  <string name="action_edit_number_before_call">Modifier numéro avant d\'appeler</string>
+  <string name="call_log_delete_all">Supprimer l\'historique des appels</string>
+  <string name="call_log_trash_voicemail">Supprimer le message vocal</string>
+  <string name="snackbar_voicemail_deleted">Mess. vocal supprimé</string>
+  <string name="clearCallLogConfirmation_title">Supprimer l\'historique des appels ?</string>
+  <string name="clearCallLogConfirmation">Tous les appels seront supprimés de votre historique.</string>
+  <string name="clearCallLogProgress_title">Suppression historique des appels…</string>
+  <string name="notification_missedCallTitle">Appel manqué</string>
+  <string name="notification_missedWorkCallTitle">Appel professionnel manqué</string>
+  <string name="notification_missedCallsTitle">Appels manqués</string>
+  <string name="notification_missedCallsMsg">%d appels manqués</string>
+  <string name="notification_missedCall_call_back">Rappeler</string>
+  <string name="notification_missedCall_message">Envoyer un SMS</string>
+  <string name="post_call_notification_message">%1$s : %2$s</string>
+  <string name="notification_voicemail_text_format">Composer le %s</string>
+  <string name="notification_voicemail_no_vm_number">Numéro de messagerie vocale inconnu</string>
+  <plurals name="notification_voicemail_title">
+    <item quantity="one"> %1$d message vocal </item>
+    <item quantity="other"> %1$d messages vocaux </item>
+  </plurals>
+  <string name="notification_voicemail_callers_list">%1$s, %2$s</string>
+  <string name="notification_new_voicemail_ticker">Nouveau message vocal de %1$s</string>
+  <string name="voicemail_playback_error">Impossible de lire le message vocal.</string>
+  <string name="voicemail_fetching_content">Chargement du message vocal en cours…</string>
+  <string name="voicemail_fetching_timout">Impossible de charger le message vocal.</string>
+  <string name="call_log_item_count_and_date">(%1$d) %2$s</string>
+  <string name="description_playback_speakerphone">Activer ou désactiver le haut-parleur</string>
+  <string name="description_playback_seek">Rechercher une position de lecture</string>
+  <string name="action_menu_call_history_description">Historique des appels</string>
+  <string msgid="2295659037509008453" name="action_menu_overflow_description">Plus d\'options</string>
+  <string name="action_menu_dialpad_button">Clavier</string>
+  <string name="dialer_settings_label">Paramètres</string>
+  <string name="simulator_submenu_label">Simulateur</string>
+  <string name="new_ui_launcher_shortcut_label">Créer un raccourci vers la nouvelle interface</string>
+  <string name="description_entering_bulk_action_mode">Activation du mode d\'action groupée</string>
+  <string name="description_leaving_bulk_action_mode">Désactivation du mode d\'action groupée</string>
+  <string name="description_selecting_bulk_action_mode">%1$s sélectionné</string>
+  <string name="description_unselecting_bulk_action_mode">%1$s désélectionné</string>
+  <string name="description_contact_details">Coordonnées associées à %1$s</string>
+  <string name="description_spam_contact_details">Coordonnées correspondant à l\'appel indésirable suspecté (%1$s)</string>
+  <string name="description_num_calls">%1$s appels</string>
+  <string name="description_video_call">Appel vidéo</string>
+  <string name="description_start_voice_search">Démarrer la recherche vocale</string>
+  <string name="voicemail">Messagerie vocale</string>
+  <string name="description_cancel_multi_select">Annuler le mode d\'actions groupées</string>
+  <string name="voicemailMultiSelectDeleteConfirm">Supprimer</string>
+  <string name="voicemailMultiSelectDeleteCancel">Annuler</string>
+  <string name="voicemailMultiSelectActionBarTitle">%1$s sélectionnés</string>
+  <plurals name="delete_voicemails_confirmation_dialog_title">
+    <item quantity="one"><b>Supprimer ce message vocal ? </b></item>
+    <item quantity="other"><b>Supprimer ces message vocaux ? </b></item>
+  </plurals>
+  <string name="voicemailCallLogToday">@string/call_log_header_today</string>
+  <string name="voicemailCallLogDateTimeFormat">%1$s à %2$s</string>
+  <string name="voicemailDurationFormat">%1$02d:%2$02d</string>
+  <string name="voicemailCallLogDateTimeFormatWithDuration">%1$s • %2$s</string>
+  <string name="voice_search_not_available">Recherche vocale non disponible</string>
+  <string name="dialer_hint_find_contact">Rech. des contacts</string>
+  <string name="block_number_search_hint">Ajouter num. ou rech. contacts</string>
+  <string name="call_log_all_empty">Votre historique des appels est vide.</string>
+  <string name="call_log_all_empty_action">Passer un appel</string>
+  <string name="call_log_missed_empty">Vous n\'avez aucun appel manqué.</string>
+  <string name="call_log_voicemail_empty">La boîte de réception de la messagerie vocale est vide.</string>
+  <string name="call_log_activity_title">Historique des appels</string>
+  <string name="call_log_all_title">Tous</string>
+  <string name="call_log_missed_title">Manqués</string>
+  <string name="tab_speed_dial">Numérotation abrégée</string>
+  <string name="tab_history">Historique des appels</string>
+  <string name="tab_all_contacts">Contacts</string>
+  <string name="tab_voicemail">Messagerie vocale</string>
+  <string name="search_shortcut_call_number">Appeler le %s</string>
+  <string name="search_shortcut_create_new_contact">Créer un contact</string>
+  <string name="search_shortcut_add_to_contact">Ajouter à un contact</string>
+  <string name="search_shortcut_send_sms_message">Envoyer un SMS</string>
+  <string name="search_shortcut_make_video_call">Passer un appel vidéo</string>
+  <string name="search_shortcut_block_number">Bloquer le numéro</string>
+  <string name="speed_dial_empty">Aucun contact pour la numérotation abrégée</string>
+  <string name="speed_dial_empty_add_favorite_action">Ajouter un favori</string>
+  <string name="remove_contact">Supprimer</string>
+  <string name="select_all">Tout sélectionner</string>
+  <string name="call_log_action_video_call">Appel vidéo</string>
+  <string name="call_log_action_set_up_video">Configurer l\'appel vidéo</string>
+  <string name="call_log_action_invite_video">Inviter à l\'appel vidéo</string>
+  <string name="call_log_action_send_message">Envoyer un message</string>
+  <string name="call_log_action_details">Informations sur l\'appel</string>
+  <string name="call_log_action_share_voicemail">Envoyer à…</string>
+  <string name="call_log_action_call">Appeler ^1</string>
+  <string name="description_incoming_missed_call">Appel manqué ^3 (appelant : ^1, ^2, ^4)</string>
+  <string name="description_incoming_answered_call">Appel reçu ^3 (appelant : ^1, ^2, ^4)</string>
+  <string name="description_unread_voicemail">Message vocal à écouter de ^1, ^2, ^3, ^4.</string>
+  <string name="description_read_voicemail">Message vocal de ^1, ^2, ^3, ^4.</string>
+  <string name="description_outgoing_call">Appel émis ^3 (destinataire : ^1, ^2, ^4)</string>
+  <string name="call_log_via_number">au %1$s</string>
+  <string name="call_log_via_number_phone_account">%1$s au %2$s</string>
+  <string name="description_call_action">Appeler ^1</string>
+  <string name="description_video_call_action">Appel vidéo de \"^1\"</string>
+  <string name="description_voicemail_action">Écouter le message vocal laissé par le numéro ou le contact \"^1\"</string>
+  <string name="description_create_new_contact_action">Créer un contact pour \"^1\"</string>
+  <string name="description_add_to_existing_contact_action">Ajouter \"^1\" à un contact</string>
+  <string name="description_details_action">Informations sur l\'appel pour ^1</string>
+  <string name="call_log_header_today">Aujourd\'hui</string>
+  <string name="call_log_header_yesterday">Hier</string>
+  <string name="call_log_header_other">Plus anciens</string>
+  <string name="voicemail_speaker_on">Activer le haut-parleur</string>
+  <string name="voicemail_speaker_off">Désactiver le haut-parleur</string>
+  <string name="voicemail_play_start_pause">Lancer ou suspendre la lecture</string>
+  <string name="display_options_title">Options d\'affichage</string>
+  <string name="sounds_and_vibration_title">Sons et vibreur</string>
+  <string name="accessibility_settings_title">Accessibilité</string>
+  <string name="ringtone_title">Sonnerie du téléphone</string>
+  <string name="vibrate_on_ring_title">Vibrer aussi pour les appels</string>
+  <string name="dtmf_tone_enable_title">Son du clavier</string>
+  <string name="dtmf_tone_length_title">Durée du son du clavier</string>
   <string-array name="dtmf_tone_length_entries">
-    <item msgid="3136353015227162823">"Normale"</item>
-    <item msgid="5376841175538523822">"Longues"</item>
+    <item>Normale</item>
+    <item>Longues</item>
   </string-array>
-    <string name="respond_via_sms_setting_title" msgid="8008181606657693452">"Réponses rapides"</string>
-    <string name="call_settings_label" msgid="7824611757200960807">"Appels"</string>
-    <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Blocage des appels"</string>
-    <string name="voicemail_settings_label" msgid="4594299554519920570">"Messagerie vocale"</string>
-    <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Blocage appels désactivé temporairement"</string>
-    <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Le blocage des appels a été désactivé, car vous avez contacté les services d\'urgence à l\'aide de ce téléphone au cours des dernières 48 heures. Le blocage sera réactivé automatiquement après 48 heures."</string>
-    <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Importer les numéros"</string>
-    <string name="blocked_call_settings_import_description" msgid="1819412052545228965">"Vous avez indiqué que certains appelants devaient automatiquement être renvoyés vers la messagerie vocale via d\'autres applications."</string>
-    <string name="blocked_call_settings_view_numbers_button" msgid="3332727948554356704">"Afficher les numéros"</string>
-    <string name="blocked_call_settings_import_button" msgid="7319111700387470727">"Importer"</string>
-    <string name="description_blocked_number_list_delete" msgid="2139644216858370740">"Débloquer le numéro"</string>
-    <string name="addBlockedNumber" msgid="3053473735238295551">"Ajouter un numéro"</string>
-    <string name="block_number_footer_message_vvm" msgid="7955326304033982368">"Les appels associés à ces numéros seront bloqués, et les messages vocaux seront automatiquement supprimés."</string>
-    <string name="block_number_footer_message_no_vvm" msgid="1152684139070471665">"Les appels associés à ces numéros seront bloqués, mais les appelants pourront peut-être toujours vous laisser des messages vocaux."</string>
-    <string name="block_list" msgid="4701585783411870782">"Numéros bloqués"</string>
-    <string name="alreadyBlocked" msgid="5483253180532475653">"Le numéro \"<xliff:g id="NUMBER">%1$s</xliff:g>\" est déjà bloqué."</string>
-    <string name="phone_account_settings_label" msgid="8372485478006965920">"Comptes téléphoniques"</string>
-    <string name="permission_no_speeddial" msgid="8487215628510596753">"Pour activer la numérotation abrégée, activez l\'autorisation Contacts."</string>
-    <string name="permission_no_calllog" msgid="4053705651238775784">"Pour consulter votre journal d\'appels, activez l\'autorisation Téléphone."</string>
-    <string name="permission_no_search" msgid="2424710404207193826">"Pour rechercher vos contacts, activez l\'autorisation Contacts."</string>
-    <string name="permission_place_call" msgid="8686908130349369423">"Pour passer un appel, activez l\'autorisation Téléphone."</string>
-    <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"L\'application Téléphone n\'est pas autorisée à modifier les paramètres du système."</string>
-    <string name="blocked_number_call_log_label" msgid="4212282846299997693">"Bloqué"</string>
-    <string name="call_log_action_block_report_number" msgid="7302636538668696729">"Bloquer/Signaler le spam vocal"</string>
-    <string name="call_log_action_block_number" msgid="5048188386501998865">"Bloquer le numéro"</string>
-    <string name="call_log_action_remove_spam" msgid="2045319806318398403">"Numéro fiable"</string>
-    <string name="call_log_action_unblock_number" msgid="6100117033288448758">"Débloquer le numéro"</string>
-    <string name="spam_number_call_log_label" msgid="2678431398326811131">"Spam"</string>
-    <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> est injoignable, car non connecté"</string>
-    <string name="about_phone_label" msgid="582991354677973731">"À propos"</string>
-    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Message transcrit par Google"</string>
-    <string name="voicemail_transcription_in_progress" msgid="2933320969613783210">"Transcription Google..."</string>
-    <string name="voicemail_transcription_failed" msgid="335275303117412706">"Transcription non disponible."</string>
-    <string name="voicemail_transcription_failed_language_not_supported" msgid="4210332591050562553">"Transcription non disponible. La langue n\'est pas compatible."</string>
-    <string name="voicemail_transcription_failed_no_speech" msgid="9093372879697874852">"Transcription non disponible. Aucune voix détectée."</string>
-    <string name="view_conversation" msgid="7895904782094119702">"Afficher"</string>
-    <string name="ec_data_deleted" msgid="4794880345545827107">"Appel supprimé. Affichez et supprimez les pièces jointes échangées au cours de cet appel dans Messages."</string>
-    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"Appels supprimés. Affichez et supprimez les pièces jointes échangées au cours de ces appels dans Messages."</string>
+  <string name="respond_via_sms_setting_title">Réponses rapides</string>
+  <string name="call_settings_label">Appels</string>
+  <string name="manage_blocked_numbers_label">Numéros bloqués</string>
+  <string name="voicemail_settings_label">Messagerie vocale</string>
+  <string name="blocked_numbers_disabled_emergency_header_label">Blocage appels désactivé temporairement</string>
+  <string name="blocked_numbers_disabled_emergency_desc">Le blocage des appels a été désactivé, car vous avez contacté les services d\'urgence à l\'aide de ce téléphone au cours des dernières 48 heures. Le blocage sera réactivé automatiquement après 48 heures.</string>
+  <string name="import_send_to_voicemail_numbers_label">Importer les numéros</string>
+  <string name="blocked_call_settings_import_description">Vous avez indiqué que certains appelants devaient automatiquement être renvoyés vers la messagerie vocale via d\'autres applications.</string>
+  <string name="blocked_call_settings_view_numbers_button">Afficher les numéros</string>
+  <string name="blocked_call_settings_import_button">Importer</string>
+  <string name="description_blocked_number_list_delete">Débloquer le numéro</string>
+  <string name="addBlockedNumber">Ajouter un numéro</string>
+  <string name="block_number_footer_message_vvm">Les appels associés à ces numéros seront bloqués, et les messages vocaux seront automatiquement supprimés.</string>
+  <string name="block_number_footer_message_no_vvm">Les appels associés à ces numéros seront bloqués, mais les appelants pourront peut-être toujours vous laisser des messages vocaux.</string>
+  <string name="block_list">Numéros bloqués</string>
+  <string name="alreadyBlocked">Le numéro \"%1$s\" est déjà bloqué.</string>
+  <string name="phone_account_settings_label">Comptes téléphoniques</string>
+  <string name="permission_no_speeddial">Pour activer la numérotation abrégée, activez l\'autorisation Contacts.</string>
+  <string name="permission_no_calllog">Pour consulter votre journal d\'appels, activez l\'autorisation Téléphone.</string>
+  <string name="permission_no_search">Pour rechercher vos contacts, activez l\'autorisation Contacts.</string>
+  <string name="permission_place_call">Pour passer un appel, activez l\'autorisation Téléphone.</string>
+  <string name="toast_cannot_write_system_settings">L\'application Téléphone n\'est pas autorisée à modifier les paramètres du système.</string>
+  <string name="blocked_number_call_log_label">Bloqué</string>
+  <string name="call_log_action_block_report_number">Bloquer/Signaler le spam vocal</string>
+  <string name="call_log_action_block_number">Bloquer le numéro</string>
+  <string name="call_log_action_remove_spam">Numéro fiable</string>
+  <string name="call_log_action_unblock_number">Débloquer le numéro</string>
+  <string name="spam_number_call_log_label">Spam</string>
+  <string name="call_composer_connection_failed">%1$s est injoignable, car non connecté</string>
+  <string name="about_phone_label">À propos</string>
+  <string name="voicemail_transcription_branding_text">Message transcrit par Google</string>
+  <string name="voicemail_transcription_in_progress">Transcription…</string>
+  <string name="voicemail_transcription_failed">Transcription non disponible.</string>
+  <string name="voicemail_transcription_failed_language_not_supported">Transcription non disponible. La langue n\'est pas compatible.</string>
+  <string name="voicemail_transcription_failed_no_speech">Transcription non disponible. Aucune voix détectée.</string>
+  <string name="voicemail_donation_promo_title">Voulez-vous aider à améliorer la pertinence de la transcription ?</string>
+  <string name="voicemail_donation_promo_content">Autorisez Google à analyser cette transcription, ainsi que celle des autres messages vocaux que vous recevrez. Les messages seront stockés de manière anonyme et vous pourrez modifier ces paramètres à tout moment. %1$s</string>
+  <string name="voicemail_donation_promo_opt_in">J\'accepte</string>
+  <string name="voicemail_donation_promo_opt_out">Non merci</string>
+  <string name="voicemail_transcription_rating">Notez la transcription</string>
+  <string name="voicemail_transcription_rating_thanks">Merci pour votre avis</string>
+  <string name="description_rating_good">J\'aime</string>
+  <string name="description_rating_bad">Je n\'aime pas</string>
+  <string name="view_conversation">Afficher</string>
+  <string name="ec_data_deleted">Appel supprimé. Affichez et supprimez les pièces jointes échangées au cours de cet appel dans Messages.</string>
+  <string name="multiple_ec_data_deleted">Appels supprimés. Affichez et supprimez les pièces jointes échangées au cours de ces appels dans Messages.</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-gl/strings.xml b/java/com/android/dialer/app/res/values-gl/strings.xml
index 0ab4cf8..54215fd 100644
--- a/java/com/android/dialer/app/res/values-gl/strings.xml
+++ b/java/com/android/dialer/app/res/values-gl/strings.xml
@@ -1,179 +1,171 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="applicationLabel" msgid="2202739481132958990">"Teléfono"</string>
-    <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"Teclado do teléfono"</string>
-    <string name="callHistoryIconLabel" msgid="7493268743411968630">"Historial de chamadas"</string>
-    <string name="action_copy_number_text" msgid="832682558551502319">"Copiar número"</string>
-    <string name="copy_transcript_text" msgid="937904189017310829">"Copiar transcrición"</string>
-    <string name="action_edit_number_before_call" msgid="8017492815878473837">"Editar número antes de chamar"</string>
-    <string name="call_log_delete_all" msgid="7852970926906523784">"Borrar historial de chamadas"</string>
-    <string name="call_log_trash_voicemail" msgid="6118493534178533972">"Eliminar correo de voz"</string>
-    <string name="snackbar_voicemail_deleted" msgid="7463166543725496307">"Correo voz eliminado"</string>
-    <string name="snackbar_voicemail_deleted_undo" msgid="6959743982796409941">"DESFACER"</string>
-    <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"Borrar o historial de chamadas?"</string>
-    <string name="clearCallLogConfirmation" msgid="6844949465815109166">"Esta acción eliminará todas as chamadas do teu historial"</string>
-    <string name="clearCallLogProgress_title" msgid="995004835687361977">"Borrando historial de chamadas…"</string>
-    <string name="notification_missedCallTitle" msgid="8283366068539898486">"Chamada perdida"</string>
-    <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"Chamada de traballo perdida"</string>
-    <string name="notification_missedCallsTitle" msgid="3697442015345089802">"Chamadas perdidas"</string>
-    <string name="notification_missedCallsMsg" msgid="8176217633929018706">"<xliff:g id="NUM_MISSED_CALLS">%d</xliff:g> chamadas perdidas"</string>
-    <string name="notification_missedCall_call_back" msgid="3875698110051973965">"Devolver chamada"</string>
-    <string name="notification_missedCall_message" msgid="5086910028988305964">"Mensaxe"</string>
-    <string name="post_call_notification_message" msgid="5417476789860590611">"<xliff:g id="NAME">%1$s</xliff:g>: <xliff:g id="MESSAGE">%2$s</xliff:g>"</string>
-    <string name="notification_voicemail_text_format" msgid="1895667520930252897">"Marca o <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
-    <string name="notification_voicemail_no_vm_number" msgid="8942821987929495842">"Número de correo de voz descoñecido"</string>
-    <plurals name="notification_voicemail_title" formatted="false" msgid="1551847434476438657">
-      <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> correos de voz </item>
-      <item quantity="one">Correo de voz</item>
-    </plurals>
-    <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
-    <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"Novo correo de voz de <xliff:g id="CALLER">%1$s</xliff:g>"</string>
-    <string name="voicemail_playback_error" msgid="4384373852257757295">"Non se puido reproducir o correo de voz"</string>
-    <string name="voicemail_fetching_content" msgid="572320120918636014">"Cargando correo de voz…"</string>
-    <string name="voicemail_fetching_timout" msgid="2128873915839949783">"Non se puido cargar o correo de voz"</string>
-    <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_playback_speakerphone" msgid="4852027754869750227">"Activar ou desactivar o altofalante"</string>
-    <string name="description_playback_seek" msgid="1340910573254132520">"Buscar posición de reprodución"</string>
-    <string name="action_menu_call_history_description" msgid="8829135306925008546">"Historial de chamadas"</string>
-    <string name="action_menu_overflow_description" msgid="7648679686746517341">"Máis opcións"</string>
-    <string name="action_menu_dialpad_button" msgid="1970631633457493180">"Teclado"</string>
-    <string name="dialer_settings_label" msgid="4980176284150290175">"Configuración"</string>
-    <string name="simulator_submenu_label" msgid="186156287346615267">"Simulador"</string>
-    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Crear atallo para a nova IU"</string>
-    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"Entrando no modo de acción en bloque"</string>
-    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"Saíu do modo de acción en bloque"</string>
-    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"Seleccionouse: <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"Anulouse a selección de: <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_contact_details" msgid="3341280873855253464">"Detalles de contacto de <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_spam_contact_details" msgid="5592578752881528368">"Detalles de contacto da chamada sospeitosa de spam: <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> chamadas"</string>
-    <string name="description_video_call" msgid="3738199365585751727">"Videochamada"</string>
-    <string name="description_start_voice_search" msgid="8380022725973015261">"Iniciar busca por voz"</string>
-    <string name="voicemail" msgid="8899540969000957954">"Correo de voz"</string>
-    <string name="description_cancel_multi_select" msgid="3930475950253360461">"Cancela o modo de accións en lote"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Eliminar"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Cancelar"</string>
-    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"Cantidade seleccionada: <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
-      <item quantity="other">"<b>"Queres eliminar estes correos de voz? "</b>"</item>
-      <item quantity="one">"<b>"Queres eliminar este correo de voz? "</b>"</item>
-    </plurals>
-    <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
-    <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> ás <xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
-    <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> (<xliff:g id="DURATION">%2$s</xliff:g>)"</string>
-    <string name="voice_search_not_available" msgid="6546240433719732905">"Busca por voz non dispoñible"</string>
-    <string name="dialer_hint_find_contact" msgid="2023214799381149808">"Buscar contactos"</string>
-    <string name="block_number_search_hint" msgid="5377706079015099416">"Engade número/busca contactos"</string>
-    <string name="call_log_all_empty" msgid="3955572868518162004">"O teu historial de chamadas está baleiro"</string>
-    <string name="call_log_all_empty_action" msgid="852218280136243014">"Facer unha chamada"</string>
-    <string name="call_log_missed_empty" msgid="7094936030845062214">"Non tes chamadas perdidas."</string>
-    <string name="call_log_voicemail_empty" msgid="273623903423275178">"A caixa de entrada do correo de voz está baleira."</string>
-    <string name="call_log_activity_title" msgid="1275242727244945527">"Historial de chamadas"</string>
-    <string name="call_log_all_title" msgid="6042262422192020327">"Todas"</string>
-    <string name="call_log_missed_title" msgid="17254005889268015">"Perdidas"</string>
-    <string name="tab_speed_dial" msgid="6616404752227561075">"Marcación rápida"</string>
-    <string name="tab_history" msgid="7420269368689503596">"Historial de chamadas"</string>
-    <string name="tab_all_contacts" msgid="5531733977693943015">"Contactos"</string>
-    <string name="tab_voicemail" msgid="2458548090088316246">"Correo de voz"</string>
-    <string name="search_shortcut_call_number" msgid="8847918845036880688">"Chamar ao <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"Crear novo contacto"</string>
-    <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"Engadir a un contacto"</string>
-    <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"Enviar SMS"</string>
-    <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"Realizar unha videochamada"</string>
-    <string name="search_shortcut_block_number" msgid="4587283230665805776">"Bloquear número"</string>
-    <string name="speed_dial_empty" msgid="3346406399966039505">"Aínda non tes ningún contacto na marcación directa"</string>
-    <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"Engade un favorito para a marcación directa"</string>
-    <string name="remove_contact" msgid="2353580570488923668">"Eliminar"</string>
-    <string name="select_all" msgid="408601760696146245">"Seleccionar todos"</string>
-    <string name="call_log_action_video_call" msgid="7565549950343850819">"Videochamada"</string>
-    <string name="call_log_action_send_message" msgid="6948727362660115554">"Enviar unha mensaxe"</string>
-    <string name="call_log_action_details" msgid="2091370737371449501">"Detalles da chamada"</string>
-    <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"Enviar a…"</string>
-    <string name="call_log_action_call" msgid="682724094251540583">"Chamar a <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_incoming_missed_call" msgid="8292535799379230029">"Chamada perdida desde <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_incoming_answered_call" msgid="3920182963103160610">"Chamada respondida desde <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_unread_voicemail" msgid="145170985013419170">"Correo de voz non lido de <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_read_voicemail" msgid="5585559881573227732">"Correo de voz de <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_outgoing_call" msgid="543952487882919924">"Chamada a <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="call_log_via_number" msgid="1340307109806397650">"a través do <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> a través do <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="description_call_action" msgid="4042796498169106545">"Chamar a <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_video_call_action" msgid="1237090968588659650">"Videochamada a <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
-    <string name="description_voicemail_action" msgid="3290143432403538524">"Escoitar o correo de voz de <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_create_new_contact_action" msgid="1928282350281564130">"Crear contacto para <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"Engadir <xliff:g id="NAMEORNUMBER">^1</xliff:g> ao contacto existente"</string>
-    <string name="description_details_action" msgid="2061866409737706174">"Detalles da chamada para <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="call_log_header_today" msgid="1576119097475845293">"Hoxe"</string>
-    <string name="call_log_header_yesterday" msgid="5616077776205329563">"Onte"</string>
-    <string name="call_log_header_other" msgid="4940676886254217644">"Anteriores"</string>
-    <string name="voicemail_speaker_on" msgid="3151333608926996668">"Activar o altofalante."</string>
-    <string name="voicemail_speaker_off" msgid="2530064206962034201">"Desactivar o altofalante."</string>
-    <string name="voicemail_play_start_pause" msgid="3874823480278334664">"Iniciar ou pausar a reprodución."</string>
-    <string name="display_options_title" msgid="3880091801055797975">"Opcións de visualización"</string>
-    <string name="sounds_and_vibration_title" msgid="3075050000721181384">"Sons e vibración"</string>
-    <string name="accessibility_settings_title" msgid="3329027650429831820">"Accesibilidade"</string>
-    <string name="ringtone_title" msgid="8377174189894648486">"Ton de chamada do teléfono"</string>
-    <string name="vibrate_on_ring_title" msgid="631441314790960485">"Vibrar tamén nas chamadas"</string>
-    <string name="dtmf_tone_enable_title" msgid="3273762431523939277">"Tons do teclado"</string>
-    <string name="dtmf_tone_length_title" msgid="534096029202438539">"Duración do ton do teclado"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="applicationLabel">Teléfono</string>
+  <string name="launcherDialpadActivityLabel">Teclado do teléfono</string>
+  <string name="callHistoryIconLabel">Historial de chamadas</string>
+  <string name="action_copy_number_text">Copiar número</string>
+  <string name="copy_transcript_text">Copiar transcrición</string>
+  <string name="action_edit_number_before_call">Editar número antes de chamar</string>
+  <string name="call_log_delete_all">Borrar historial de chamadas</string>
+  <string name="call_log_trash_voicemail">Eliminar correo de voz</string>
+  <string name="snackbar_voicemail_deleted">Correo voz eliminado</string>
+  <string name="clearCallLogConfirmation_title">Borrar o historial de chamadas?</string>
+  <string name="clearCallLogConfirmation">Esta acción eliminará todas as chamadas do teu historial</string>
+  <string name="clearCallLogProgress_title">Borrando historial de chamadas…</string>
+  <string name="notification_missedCallTitle">Chamada perdida</string>
+  <string name="notification_missedWorkCallTitle">Chamada de traballo perdida</string>
+  <string name="notification_missedCallsTitle">Chamadas perdidas</string>
+  <string name="notification_missedCallsMsg">%d chamadas perdidas</string>
+  <string name="notification_missedCall_call_back">Devolver chamada</string>
+  <string name="notification_missedCall_message">Mensaxe</string>
+  <string name="post_call_notification_message">%1$s: %2$s</string>
+  <string name="notification_voicemail_text_format">Marca o %s</string>
+  <string name="notification_voicemail_no_vm_number">Número de correo de voz descoñecido</string>
+  <plurals name="notification_voicemail_title">
+    <item quantity="one">Correo de voz</item>
+    <item quantity="other"> %1$d correos de voz </item>
+  </plurals>
+  <string name="notification_voicemail_callers_list">%1$s, %2$s</string>
+  <string name="notification_new_voicemail_ticker">Novo correo de voz de %1$s</string>
+  <string name="voicemail_playback_error">Non se puido reproducir o correo de voz</string>
+  <string name="voicemail_fetching_content">Cargando correo de voz…</string>
+  <string name="voicemail_fetching_timout">Non se puido cargar o correo de voz</string>
+  <string name="call_log_item_count_and_date">(%1$d) %2$s</string>
+  <string name="description_playback_speakerphone">Activar ou desactivar o altofalante</string>
+  <string name="description_playback_seek">Buscar posición de reprodución</string>
+  <string name="action_menu_call_history_description">Historial de chamadas</string>
+  <string msgid="2295659037509008453" name="action_menu_overflow_description">Máis opcións</string>
+  <string name="action_menu_dialpad_button">Teclado</string>
+  <string name="dialer_settings_label">Configuración</string>
+  <string name="simulator_submenu_label">Simulador</string>
+  <string name="new_ui_launcher_shortcut_label">Crear atallo para a nova IU</string>
+  <string name="description_entering_bulk_action_mode">Entrando no modo de acción en bloque</string>
+  <string name="description_leaving_bulk_action_mode">Saíu do modo de acción en bloque</string>
+  <string name="description_selecting_bulk_action_mode">Seleccionouse: %1$s</string>
+  <string name="description_unselecting_bulk_action_mode">Anulouse a selección de: %1$s</string>
+  <string name="description_contact_details">Detalles de contacto de %1$s</string>
+  <string name="description_spam_contact_details">Detalles de contacto da chamada sospeitosa de spam: %1$s</string>
+  <string name="description_num_calls">%1$s chamadas</string>
+  <string name="description_video_call">Videochamada</string>
+  <string name="description_start_voice_search">Iniciar busca por voz</string>
+  <string name="voicemail">Correo de voz</string>
+  <string name="description_cancel_multi_select">Cancela o modo de accións en lote</string>
+  <string name="voicemailMultiSelectDeleteConfirm">Eliminar</string>
+  <string name="voicemailMultiSelectDeleteCancel">Cancelar</string>
+  <string name="voicemailMultiSelectActionBarTitle">Cantidade seleccionada: %1$s</string>
+  <plurals name="delete_voicemails_confirmation_dialog_title">
+    <item quantity="one"><b>Queres eliminar este correo de voz? </b></item>
+    <item quantity="other"><b>Queres eliminar estes correos de voz? </b></item>
+  </plurals>
+  <string name="voicemailCallLogToday">@string/call_log_header_today</string>
+  <string name="voicemailCallLogDateTimeFormat">%1$s ás %2$s</string>
+  <string name="voicemailDurationFormat">%1$02d:%2$02d</string>
+  <string name="voicemailCallLogDateTimeFormatWithDuration">%1$s (%2$s)</string>
+  <string name="voice_search_not_available">Busca por voz non dispoñible</string>
+  <string name="dialer_hint_find_contact">Buscar contactos</string>
+  <string name="block_number_search_hint">Engade número/busca contactos</string>
+  <string name="call_log_all_empty">O teu historial de chamadas está baleiro</string>
+  <string name="call_log_all_empty_action">Facer unha chamada</string>
+  <string name="call_log_missed_empty">Non tes chamadas perdidas.</string>
+  <string name="call_log_voicemail_empty">A caixa de entrada do correo de voz está baleira.</string>
+  <string name="call_log_activity_title">Historial de chamadas</string>
+  <string name="call_log_all_title">Todas</string>
+  <string name="call_log_missed_title">Perdidas</string>
+  <string name="tab_speed_dial">Marcación rápida</string>
+  <string name="tab_history">Historial de chamadas</string>
+  <string name="tab_all_contacts">Contactos</string>
+  <string name="tab_voicemail">Correo de voz</string>
+  <string name="search_shortcut_call_number">Chamar ao %s</string>
+  <string name="search_shortcut_create_new_contact">Crear novo contacto</string>
+  <string name="search_shortcut_add_to_contact">Engadir a un contacto</string>
+  <string name="search_shortcut_send_sms_message">Enviar SMS</string>
+  <string name="search_shortcut_make_video_call">Realizar unha videochamada</string>
+  <string name="search_shortcut_block_number">Bloquear número</string>
+  <string name="speed_dial_empty">Aínda non tes ningún contacto na marcación directa</string>
+  <string name="speed_dial_empty_add_favorite_action">Engade un favorito para a marcación directa</string>
+  <string name="remove_contact">Eliminar</string>
+  <string name="select_all">Seleccionar todos</string>
+  <string name="call_log_action_video_call">Videochamada</string>
+  <string name="call_log_action_set_up_video">Configurar videochamadas</string>
+  <string name="call_log_action_invite_video">Invitar a unha videochamada</string>
+  <string name="call_log_action_send_message">Enviar unha mensaxe</string>
+  <string name="call_log_action_details">Detalles da chamada</string>
+  <string name="call_log_action_share_voicemail">Enviar a…</string>
+  <string name="call_log_action_call">Chamar a ^1</string>
+  <string name="description_incoming_missed_call">Chamada perdida desde ^1, ^2, ^3, ^4.</string>
+  <string name="description_incoming_answered_call">Chamada respondida desde ^1, ^2, ^3, ^4.</string>
+  <string name="description_unread_voicemail">Correo de voz non lido de ^1, ^2, ^3, ^4.</string>
+  <string name="description_read_voicemail">Correo de voz de ^1, ^2, ^3, ^4.</string>
+  <string name="description_outgoing_call">Chamada a ^1, ^2, ^3, ^4.</string>
+  <string name="call_log_via_number">a través do %1$s</string>
+  <string name="call_log_via_number_phone_account">%1$s a través do %2$s</string>
+  <string name="description_call_action">Chamar a ^1</string>
+  <string name="description_video_call_action">Videochamada a ^1.</string>
+  <string name="description_voicemail_action">Escoitar o correo de voz de ^1</string>
+  <string name="description_create_new_contact_action">Crear contacto para ^1</string>
+  <string name="description_add_to_existing_contact_action">Engadir ^1 ao contacto existente</string>
+  <string name="description_details_action">Detalles da chamada para ^1</string>
+  <string name="call_log_header_today">Hoxe</string>
+  <string name="call_log_header_yesterday">Onte</string>
+  <string name="call_log_header_other">Anteriores</string>
+  <string name="voicemail_speaker_on">Activar o altofalante.</string>
+  <string name="voicemail_speaker_off">Desactivar o altofalante.</string>
+  <string name="voicemail_play_start_pause">Iniciar ou pausar a reprodución.</string>
+  <string name="display_options_title">Opcións de visualización</string>
+  <string name="sounds_and_vibration_title">Sons e vibración</string>
+  <string name="accessibility_settings_title">Accesibilidade</string>
+  <string name="ringtone_title">Ton de chamada do teléfono</string>
+  <string name="vibrate_on_ring_title">Vibrar tamén nas chamadas</string>
+  <string name="dtmf_tone_enable_title">Tons do teclado</string>
+  <string name="dtmf_tone_length_title">Duración do ton do teclado</string>
   <string-array name="dtmf_tone_length_entries">
-    <item msgid="3136353015227162823">"Normal"</item>
-    <item msgid="5376841175538523822">"Longo"</item>
+    <item>Normal</item>
+    <item>Longo</item>
   </string-array>
-    <string name="respond_via_sms_setting_title" msgid="8008181606657693452">"Respostas rápidas"</string>
-    <string name="call_settings_label" msgid="7824611757200960807">"Chamadas"</string>
-    <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Bloqueo de chamadas"</string>
-    <string name="voicemail_settings_label" msgid="4594299554519920570">"Correo de voz"</string>
-    <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"O bloqueo de chamadas desactivouse temporalmente"</string>
-    <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"O bloqueo de chamadas desactivouse porque contactaches cos servizos de emerxencias desde este teléfono nas últimas 48 horas. Volverase activar automaticamente unha vez que pase o período de 48 horas."</string>
-    <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Importar números"</string>
-    <string name="blocked_call_settings_import_description" msgid="1819412052545228965">"Previamente marcaches algúns emisores da chamada para que se envíen automaticamente ao correo de voz a través doutras aplicacións."</string>
-    <string name="blocked_call_settings_view_numbers_button" msgid="3332727948554356704">"Ver números"</string>
-    <string name="blocked_call_settings_import_button" msgid="7319111700387470727">"Importar"</string>
-    <string name="description_blocked_number_list_delete" msgid="2139644216858370740">"Desbloquear número"</string>
-    <string name="addBlockedNumber" msgid="3053473735238295551">"Engadir número"</string>
-    <string name="block_number_footer_message_vvm" msgid="7955326304033982368">"Bloquearanse as chamadas destes números e eliminaranse automaticamente os correos de voz."</string>
-    <string name="block_number_footer_message_no_vvm" msgid="1152684139070471665">"Bloquearanse as chamadas destes números, pero é posible que aínda poidan deixarche correos de voz."</string>
-    <string name="block_list" msgid="4701585783411870782">"Números bloqueados"</string>
-    <string name="alreadyBlocked" msgid="5483253180532475653">"O <xliff:g id="NUMBER">%1$s</xliff:g> xa está bloqueado."</string>
-    <string name="phone_account_settings_label" msgid="8372485478006965920">"Contas de chamadas"</string>
-    <string name="permission_no_speeddial" msgid="8487215628510596753">"Para activar a marcación rápida, activa o permiso de Contactos."</string>
-    <string name="permission_no_calllog" msgid="4053705651238775784">"Para ver o teu rexistro de chamadas, activa o permiso de Teléfono."</string>
-    <string name="permission_no_search" msgid="2424710404207193826">"Para buscar os teus contactos, activa os permisos de Contactos."</string>
-    <string name="permission_place_call" msgid="8686908130349369423">"Para facer unha chamada, activa o permiso de Teléfono."</string>
-    <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"A aplicación Teléfono non ten permiso para modificar a configuración do sistema."</string>
-    <string name="blocked_number_call_log_label" msgid="4212282846299997693">"Bloqueado"</string>
-    <string name="call_log_action_block_report_number" msgid="7302636538668696729">"Bloquear/marcar como spam"</string>
-    <string name="call_log_action_block_number" msgid="5048188386501998865">"Bloquear número"</string>
-    <string name="call_log_action_remove_spam" msgid="2045319806318398403">"Non é spam"</string>
-    <string name="call_log_action_unblock_number" msgid="6100117033288448758">"Desbloquear número"</string>
-    <string name="spam_number_call_log_label" msgid="2678431398326811131">"Spam"</string>
-    <string name="call_composer_connection_failed" msgid="6776461585447831242">"Non se pode contactar con <xliff:g id="NAME">%1$s</xliff:g> porque está sen conexión"</string>
-    <string name="about_phone_label" msgid="582991354677973731">"Acerca de"</string>
-    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Transcrito por Google"</string>
-    <string name="voicemail_transcription_in_progress" msgid="2933320969613783210">"Google está transcribindo…"</string>
-    <string name="voicemail_transcription_failed" msgid="335275303117412706">"Transcrición non dispoñible."</string>
-    <string name="voicemail_transcription_failed_language_not_supported" msgid="4210332591050562553">"Transcrición non dispoñible. Non se admite o idioma."</string>
-    <string name="voicemail_transcription_failed_no_speech" msgid="9093372879697874852">"Transcrición non dispoñible. Non se detectou ningunha voz."</string>
-    <string name="view_conversation" msgid="7895904782094119702">"Ver"</string>
-    <string name="ec_data_deleted" msgid="4794880345545827107">"Eliminouse a chamada. Podes ver e eliminar os anexos compartidos durante esta chamada en Mensaxes."</string>
-    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"Elimináronse as chamadas. Podes ver e eliminar os anexos compartidos durante as chamadas en Mensaxes."</string>
+  <string name="respond_via_sms_setting_title">Respostas rápidas</string>
+  <string name="call_settings_label">Chamadas</string>
+  <string name="manage_blocked_numbers_label">Números bloqueados</string>
+  <string name="voicemail_settings_label">Correo de voz</string>
+  <string name="blocked_numbers_disabled_emergency_header_label">O bloqueo de chamadas desactivouse temporalmente</string>
+  <string name="blocked_numbers_disabled_emergency_desc">O bloqueo de chamadas desactivouse porque contactaches cos servizos de urxencias desde este teléfono nas últimas 48 horas. Volverase activar automaticamente unha vez que pase o período de 48 horas.</string>
+  <string name="import_send_to_voicemail_numbers_label">Importar números</string>
+  <string name="blocked_call_settings_import_description">Previamente marcaches algúns emisores da chamada para que se envíen automaticamente ao correo de voz a través doutras aplicacións.</string>
+  <string name="blocked_call_settings_view_numbers_button">Ver números</string>
+  <string name="blocked_call_settings_import_button">Importar</string>
+  <string name="description_blocked_number_list_delete">Desbloquear número</string>
+  <string name="addBlockedNumber">Engadir número</string>
+  <string name="block_number_footer_message_vvm">Bloquearanse as chamadas destes números e eliminaranse automaticamente os correos de voz.</string>
+  <string name="block_number_footer_message_no_vvm">Bloquearanse as chamadas destes números, pero é posible que aínda poidan deixarche correos de voz.</string>
+  <string name="block_list">Números bloqueados</string>
+  <string name="alreadyBlocked">O %1$s xa está bloqueado.</string>
+  <string name="phone_account_settings_label">Contas de chamadas</string>
+  <string name="permission_no_speeddial">Para activar a marcación rápida, activa o permiso de Contactos.</string>
+  <string name="permission_no_calllog">Para ver o teu rexistro de chamadas, activa o permiso de Teléfono.</string>
+  <string name="permission_no_search">Para buscar os teus contactos, activa os permisos de Contactos.</string>
+  <string name="permission_place_call">Para facer unha chamada, activa o permiso de Teléfono.</string>
+  <string name="toast_cannot_write_system_settings">A aplicación Teléfono non ten permiso para modificar a configuración do sistema.</string>
+  <string name="blocked_number_call_log_label">Bloqueado</string>
+  <string name="call_log_action_block_report_number">Bloquear/marcar como spam</string>
+  <string name="call_log_action_block_number">Bloquear número</string>
+  <string name="call_log_action_remove_spam">Non é spam</string>
+  <string name="call_log_action_unblock_number">Desbloquear número</string>
+  <string name="spam_number_call_log_label">Spam</string>
+  <string name="call_composer_connection_failed">Non se pode contactar con %1$s porque está sen conexión</string>
+  <string name="about_phone_label">Acerca de</string>
+  <string name="voicemail_transcription_branding_text">Transcrito por Google</string>
+  <string name="voicemail_transcription_in_progress">Transcribindo…</string>
+  <string name="voicemail_transcription_failed">Transcrición non dispoñible.</string>
+  <string name="voicemail_transcription_failed_language_not_supported">Transcrición non dispoñible. Non se admite o idioma.</string>
+  <string name="voicemail_transcription_failed_no_speech">Transcrición non dispoñible. Non se detectou ningunha voz.</string>
+  <string name="voicemail_donation_promo_title">Queres axudar a mellorar a calidade das transcricións?</string>
+  <string name="voicemail_donation_promo_content">Permite que Google revise esta mensaxe do correo de voz, así como as que recibas no futuro, usando as transcricións. Almacenaranse de forma anónima. Podes cambiar a configuración en calquera momento. %1$s</string>
+  <string name="voicemail_donation_promo_opt_in">Si, acepto</string>
+  <string name="voicemail_donation_promo_opt_out">Non, grazas</string>
+  <string name="voicemail_transcription_rating">Valora a transcrición</string>
+  <string name="voicemail_transcription_rating_thanks">Grazas pola túa opinión</string>
+  <string name="description_rating_good">Gústame</string>
+  <string name="description_rating_bad">Non me gusta</string>
+  <string name="view_conversation">Ver</string>
+  <string name="ec_data_deleted">Eliminouse a chamada. Podes ver e eliminar os anexos compartidos durante esta chamada en Mensaxes.</string>
+  <string name="multiple_ec_data_deleted">Elimináronse as chamadas. Podes ver e eliminar os anexos compartidos durante as chamadas en Mensaxes.</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-gu/strings.xml b/java/com/android/dialer/app/res/values-gu/strings.xml
index 798578c..264d05b 100644
--- a/java/com/android/dialer/app/res/values-gu/strings.xml
+++ b/java/com/android/dialer/app/res/values-gu/strings.xml
@@ -1,179 +1,171 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="applicationLabel" msgid="2202739481132958990">"ફોન"</string>
-    <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"ફોન કીપેડ"</string>
-    <string name="callHistoryIconLabel" msgid="7493268743411968630">"કૉલ ઇતિહાસ"</string>
-    <string name="action_copy_number_text" msgid="832682558551502319">"નંબર કૉપિ કરો"</string>
-    <string name="copy_transcript_text" msgid="937904189017310829">"ટ્રાંસ્ક્રિપ્શન કૉપિ કરો"</string>
-    <string name="action_edit_number_before_call" msgid="8017492815878473837">"કૉલ કરતાં પહેલાં નંબર સંપાદિત કરો"</string>
-    <string name="call_log_delete_all" msgid="7852970926906523784">"કૉલ ઇતિહાસ સાફ કરો"</string>
-    <string name="call_log_trash_voicemail" msgid="6118493534178533972">"વૉઇસમેઇલ કાઢી નાખો"</string>
-    <string name="snackbar_voicemail_deleted" msgid="7463166543725496307">"વૉઇસમેઇલ કાઢી નાખ્યો"</string>
-    <string name="snackbar_voicemail_deleted_undo" msgid="6959743982796409941">"પૂર્વવત્ કરો"</string>
-    <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"કૉલ ઇતિહાસ સાફ કરીએ?"</string>
-    <string name="clearCallLogConfirmation" msgid="6844949465815109166">"આ તમારા ઇતિહાસમાંથી તમામ કૉલ્સ કાઢી નાખશે"</string>
-    <string name="clearCallLogProgress_title" msgid="995004835687361977">"કૉલ ઇતિહાસ સાફ કરી રહ્યાં છે…"</string>
-    <string name="notification_missedCallTitle" msgid="8283366068539898486">"છૂટેલો કૉલ"</string>
-    <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"ચૂકી ગયેલ કાર્ય કૉલ"</string>
-    <string name="notification_missedCallsTitle" msgid="3697442015345089802">"છૂટેલા કૉલ્સ"</string>
-    <string name="notification_missedCallsMsg" msgid="8176217633929018706">"<xliff:g id="NUM_MISSED_CALLS">%d</xliff:g> છૂટેલા કૉલ"</string>
-    <string name="notification_missedCall_call_back" msgid="3875698110051973965">"કૉલ બેક"</string>
-    <string name="notification_missedCall_message" msgid="5086910028988305964">"સંદેશ"</string>
-    <string name="post_call_notification_message" msgid="5417476789860590611">"<xliff:g id="NAME">%1$s</xliff:g>: <xliff:g id="MESSAGE">%2$s</xliff:g>"</string>
-    <string name="notification_voicemail_text_format" msgid="1895667520930252897">"<xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g> ડાયલ કરો"</string>
-    <string name="notification_voicemail_no_vm_number" msgid="8942821987929495842">"વૉઇસમેઇલ નંબર અજાણ"</string>
-    <plurals name="notification_voicemail_title" formatted="false" msgid="1551847434476438657">
-      <item quantity="one"> <xliff:g id="COUNT">%1$d</xliff:g> વૉઇસમેઇલ્સ </item>
-      <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> વૉઇસમેઇલ્સ </item>
-    </plurals>
-    <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
-    <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"<xliff:g id="CALLER">%1$s</xliff:g> તરફથી નવો વૉઇસમેઇલ."</string>
-    <string name="voicemail_playback_error" msgid="4384373852257757295">"વૉઇસમેઇલ ચલાવી શકાઈ નથી"</string>
-    <string name="voicemail_fetching_content" msgid="572320120918636014">"વૉઇસમેઇલ લોડ કરી રહ્યું છે…"</string>
-    <string name="voicemail_fetching_timout" msgid="2128873915839949783">"વૉઇસમેઇલ લોડ કરી શકાઈ નથી"</string>
-    <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_playback_speakerphone" msgid="4852027754869750227">"સ્પીકરફોન ચાલુ કે બંધ કરો"</string>
-    <string name="description_playback_seek" msgid="1340910573254132520">"પ્લેબેક સ્થિતિ શોધો"</string>
-    <string name="action_menu_call_history_description" msgid="8829135306925008546">"કૉલ ઇતિહાસ"</string>
-    <string name="action_menu_overflow_description" msgid="7648679686746517341">"વધુ વિકલ્પો"</string>
-    <string name="action_menu_dialpad_button" msgid="1970631633457493180">"કી પેડ"</string>
-    <string name="dialer_settings_label" msgid="4980176284150290175">"સેટિંગ્સ"</string>
-    <string name="simulator_submenu_label" msgid="186156287346615267">"સિમ્યુલેટર"</string>
-    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"નવું UI શૉર્ટકટ્સ બનાવો"</string>
-    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"બલ્ક ક્રિયા મોડમાં દાખલ થઈ રહ્યાં છે"</string>
-    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"બલ્ક ક્રિયા મોડ છોડી દીધો"</string>
-    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> પસંદ કર્યો"</string>
-    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> પસંદગીમાંથી દૂર કર્યો"</string>
-    <string name="description_contact_details" msgid="3341280873855253464">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> માટે સંપર્ક વિગતો"</string>
-    <string name="description_spam_contact_details" msgid="5592578752881528368">"શંકાસ્પદ સ્પામ કૉલર <xliff:g id="NAMEORNUMBER">%1$s</xliff:g> માટેની સંપર્ક વિગતો"</string>
-    <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> કૉલ્સ."</string>
-    <string name="description_video_call" msgid="3738199365585751727">"વિડિઓ કૉલ."</string>
-    <string name="description_start_voice_search" msgid="8380022725973015261">"વૉઇસ શોધ શરૂ કરો"</string>
-    <string name="voicemail" msgid="8899540969000957954">"વૉઇસમેઇલ"</string>
-    <string name="description_cancel_multi_select" msgid="3930475950253360461">"બૅચ ક્રિયા મોડ રદ કરો"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"કાઢી નાખો"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"રદ કરો"</string>
-    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> પસંદ કરી"</string>
-    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
-      <item quantity="one">"<b>"આ વૉઇસમેઇલ કાઢી નાખીએ? "</b>"</item>
-      <item quantity="other">"<b>"આ વૉઇસમેઇલ કાઢી નાખીએ? "</b>"</item>
-    </plurals>
-    <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
-    <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> નાં રોજ <xliff:g id="TIME">%2$s</xliff:g> વાગ્યે"</string>
-    <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
-    <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="voice_search_not_available" msgid="6546240433719732905">"વૉઇસ શોધ ઉપલબ્ધ નથી"</string>
-    <string name="dialer_hint_find_contact" msgid="2023214799381149808">"સંપર્કો શોધો"</string>
-    <string name="block_number_search_hint" msgid="5377706079015099416">"નંબર ઉમેરો અથવા સંપર્કો શોધો"</string>
-    <string name="call_log_all_empty" msgid="3955572868518162004">"તમારો કૉલ ઇતિહાસ ખાલી છે"</string>
-    <string name="call_log_all_empty_action" msgid="852218280136243014">"કૉલ કરો"</string>
-    <string name="call_log_missed_empty" msgid="7094936030845062214">"તમારી પાસે કોઇ છૂટેલાં કૉલ્સ નથી."</string>
-    <string name="call_log_voicemail_empty" msgid="273623903423275178">"તમારું વૉઇસમેઇલ ઇનબોક્સ ખાલી છે."</string>
-    <string name="call_log_activity_title" msgid="1275242727244945527">"કૉલ ઇતિહાસ"</string>
-    <string name="call_log_all_title" msgid="6042262422192020327">"તમામ"</string>
-    <string name="call_log_missed_title" msgid="17254005889268015">"છૂટેલ"</string>
-    <string name="tab_speed_dial" msgid="6616404752227561075">"સ્પીડ ડાયલ"</string>
-    <string name="tab_history" msgid="7420269368689503596">"કૉલ ઇતિહાસ"</string>
-    <string name="tab_all_contacts" msgid="5531733977693943015">"સંપર્કો"</string>
-    <string name="tab_voicemail" msgid="2458548090088316246">"વૉઇસમેઇલ"</string>
-    <string name="search_shortcut_call_number" msgid="8847918845036880688">"<xliff:g id="NUMBER">%s</xliff:g> ને કૉલ કરો"</string>
-    <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"નવો સંપર્ક બનાવો"</string>
-    <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"સંપર્કમાં ઉમેરો"</string>
-    <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"SMS મોકલો"</string>
-    <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"વિડિઓ કૉલ કરો"</string>
-    <string name="search_shortcut_block_number" msgid="4587283230665805776">"નંબર અવરોધિત કરો"</string>
-    <string name="speed_dial_empty" msgid="3346406399966039505">"તમારા ઝડપી ડાયલ પર હજી સુધી કોઇ નથી"</string>
-    <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"એક મનપસંદ ઉમેરો"</string>
-    <string name="remove_contact" msgid="2353580570488923668">"દૂર કરો"</string>
-    <string name="select_all" msgid="408601760696146245">"તમામ પસંદ કરો"</string>
-    <string name="call_log_action_video_call" msgid="7565549950343850819">"વિડિઓ કૉલ"</string>
-    <string name="call_log_action_send_message" msgid="6948727362660115554">"એક સંદેશ મોકલો"</string>
-    <string name="call_log_action_details" msgid="2091370737371449501">"કૉલની વિગતો"</string>
-    <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"આને મોકલો ..."</string>
-    <string name="call_log_action_call" msgid="682724094251540583">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> ને કૉલ કરો"</string>
-    <string name="description_incoming_missed_call" msgid="8292535799379230029">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g> નો છૂટેલ કૉલ"</string>
-    <string name="description_incoming_answered_call" msgid="3920182963103160610">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g> નો જવાબી કૉલ"</string>
-    <string name="description_unread_voicemail" msgid="145170985013419170">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g> તરફથી ન વાંચેલો વૉઇસમેઇલ"</string>
-    <string name="description_read_voicemail" msgid="5585559881573227732">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g> તરફથી વૉઇસમેઇલ"</string>
-    <string name="description_outgoing_call" msgid="543952487882919924">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g> પર કૉલ."</string>
-    <string name="call_log_via_number" msgid="1340307109806397650">"<xliff:g id="NUMBER">%1$s</xliff:g> મારફતે"</string>
-    <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> પર, <xliff:g id="NUMBER">%2$s</xliff:g> મારફતે"</string>
-    <string name="description_call_action" msgid="4042796498169106545">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> ને કૉલ કરો"</string>
-    <string name="description_video_call_action" msgid="1237090968588659650">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> ને વિડિઓ કૉલ કરો."</string>
-    <string name="description_voicemail_action" msgid="3290143432403538524">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> ના વૉઇસમેઇલને સાંભળો"</string>
-    <string name="description_create_new_contact_action" msgid="1928282350281564130">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> માટે સંપર્ક બનાવો"</string>
-    <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> ને અસ્તિત્વમાંના સંપર્કમાં ઉમેરો"</string>
-    <string name="description_details_action" msgid="2061866409737706174">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> માટે કૉલ વિગતો"</string>
-    <string name="call_log_header_today" msgid="1576119097475845293">"આજે"</string>
-    <string name="call_log_header_yesterday" msgid="5616077776205329563">"ગઈ કાલે"</string>
-    <string name="call_log_header_other" msgid="4940676886254217644">"જૂનું"</string>
-    <string name="voicemail_speaker_on" msgid="3151333608926996668">"સ્પીકર ચાલુ કરો."</string>
-    <string name="voicemail_speaker_off" msgid="2530064206962034201">"સ્પીકર બંધ કરો."</string>
-    <string name="voicemail_play_start_pause" msgid="3874823480278334664">"પ્લેબેક ચલાવો અથવા થોભાવો"</string>
-    <string name="display_options_title" msgid="3880091801055797975">"પ્રદર્શન વિકલ્પો"</string>
-    <string name="sounds_and_vibration_title" msgid="3075050000721181384">"ધ્વનિ અને વાઇબ્રેશન"</string>
-    <string name="accessibility_settings_title" msgid="3329027650429831820">"ઍક્સેસિબિલિટી"</string>
-    <string name="ringtone_title" msgid="8377174189894648486">"ફોન રિંગટોન"</string>
-    <string name="vibrate_on_ring_title" msgid="631441314790960485">"કૉલ્સ માટે વાઇબ્રેટ પણ કરો"</string>
-    <string name="dtmf_tone_enable_title" msgid="3273762431523939277">"કીપેડ ટોન"</string>
-    <string name="dtmf_tone_length_title" msgid="534096029202438539">"કીપેડ ટોનની લંબાઈ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="applicationLabel">ફોન</string>
+  <string name="launcherDialpadActivityLabel">ફોન કીપેડ</string>
+  <string name="callHistoryIconLabel">કૉલ ઇતિહાસ</string>
+  <string name="action_copy_number_text">નંબર કૉપિ કરો</string>
+  <string name="copy_transcript_text">ટ્રાંસ્ક્રિપ્શન કૉપિ કરો</string>
+  <string name="action_edit_number_before_call">કૉલ કરતાં પહેલાં નંબર સંપાદિત કરો</string>
+  <string name="call_log_delete_all">કૉલ ઇતિહાસ સાફ કરો</string>
+  <string name="call_log_trash_voicemail">વૉઇસમેઇલ કાઢી નાખો</string>
+  <string name="snackbar_voicemail_deleted">વૉઇસમેઇલ કાઢી નાખ્યો</string>
+  <string name="clearCallLogConfirmation_title">કૉલ ઇતિહાસ સાફ કરીએ?</string>
+  <string name="clearCallLogConfirmation">આ તમારા ઇતિહાસમાંથી તમામ કૉલ્સ કાઢી નાખશે</string>
+  <string name="clearCallLogProgress_title">કૉલ ઇતિહાસ સાફ કરી રહ્યાં છે…</string>
+  <string name="notification_missedCallTitle">છૂટેલો કૉલ</string>
+  <string name="notification_missedWorkCallTitle">ચૂકી ગયેલ કાર્ય કૉલ</string>
+  <string name="notification_missedCallsTitle">છૂટેલા કૉલ્સ</string>
+  <string name="notification_missedCallsMsg">%d છૂટેલા કૉલ</string>
+  <string name="notification_missedCall_call_back">કૉલ બેક</string>
+  <string name="notification_missedCall_message">સંદેશ</string>
+  <string name="post_call_notification_message">%1$s: %2$s</string>
+  <string name="notification_voicemail_text_format">%s ડાયલ કરો</string>
+  <string name="notification_voicemail_no_vm_number">વૉઇસમેઇલ નંબર અજાણ</string>
+  <plurals name="notification_voicemail_title">
+    <item quantity="one"> %1$d વૉઇસમેઇલ્સ </item>
+    <item quantity="other"> %1$d વૉઇસમેઇલ્સ </item>
+  </plurals>
+  <string name="notification_voicemail_callers_list">%1$s, %2$s</string>
+  <string name="notification_new_voicemail_ticker">%1$s તરફથી નવો વૉઇસમેઇલ.</string>
+  <string name="voicemail_playback_error">વૉઇસમેઇલ ચલાવી શકાઈ નથી</string>
+  <string name="voicemail_fetching_content">વૉઇસમેઇલ લોડ કરી રહ્યું છે…</string>
+  <string name="voicemail_fetching_timout">વૉઇસમેઇલ લોડ કરી શકાઈ નથી</string>
+  <string name="call_log_item_count_and_date">(%1$d) %2$s</string>
+  <string name="description_playback_speakerphone">સ્પીકરફોન ચાલુ કે બંધ કરો</string>
+  <string name="description_playback_seek">પ્લેબેક સ્થિતિ શોધો</string>
+  <string name="action_menu_call_history_description">કૉલ ઇતિહાસ</string>
+  <string msgid="2295659037509008453" name="action_menu_overflow_description">વધુ વિકલ્પો</string>
+  <string name="action_menu_dialpad_button">કી પેડ</string>
+  <string name="dialer_settings_label">સેટિંગ્સ</string>
+  <string name="simulator_submenu_label">સિમ્યુલેટર</string>
+  <string name="new_ui_launcher_shortcut_label">નવું UI શૉર્ટકટ્સ બનાવો</string>
+  <string name="description_entering_bulk_action_mode">બલ્ક ક્રિયા મોડમાં દાખલ થઈ રહ્યાં છે</string>
+  <string name="description_leaving_bulk_action_mode">બલ્ક ક્રિયા મોડ છોડી દીધો</string>
+  <string name="description_selecting_bulk_action_mode">%1$s પસંદ કર્યો</string>
+  <string name="description_unselecting_bulk_action_mode">%1$s પસંદગીમાંથી દૂર કર્યો</string>
+  <string name="description_contact_details">%1$s માટે સંપર્ક વિગતો</string>
+  <string name="description_spam_contact_details">શંકાસ્પદ સ્પામ કૉલર %1$s માટેની સંપર્ક વિગતો</string>
+  <string name="description_num_calls">%1$s કૉલ્સ.</string>
+  <string name="description_video_call">વિડિઓ કૉલ.</string>
+  <string name="description_start_voice_search">વૉઇસ શોધ શરૂ કરો</string>
+  <string name="voicemail">વૉઇસમેઇલ</string>
+  <string name="description_cancel_multi_select">બૅચ ક્રિયા મોડ રદ કરો</string>
+  <string name="voicemailMultiSelectDeleteConfirm">કાઢી નાખો</string>
+  <string name="voicemailMultiSelectDeleteCancel">રદ કરો</string>
+  <string name="voicemailMultiSelectActionBarTitle">%1$s પસંદ કરી</string>
+  <plurals name="delete_voicemails_confirmation_dialog_title">
+    <item quantity="one"><b>આ વૉઇસમેઇલ કાઢી નાખીએ? </b></item>
+    <item quantity="other"><b>આ વૉઇસમેઇલ કાઢી નાખીએ? </b></item>
+  </plurals>
+  <string name="voicemailCallLogToday">@string/call_log_header_today</string>
+  <string name="voicemailCallLogDateTimeFormat">%1$s નાં રોજ %2$s વાગ્યે</string>
+  <string name="voicemailDurationFormat">%1$02d:%2$02d</string>
+  <string name="voicemailCallLogDateTimeFormatWithDuration">%1$s • %2$s</string>
+  <string name="voice_search_not_available">વૉઇસ શોધ ઉપલબ્ધ નથી</string>
+  <string name="dialer_hint_find_contact">સંપર્કો શોધો</string>
+  <string name="block_number_search_hint">નંબર ઉમેરો અથવા સંપર્કો શોધો</string>
+  <string name="call_log_all_empty">તમારો કૉલ ઇતિહાસ ખાલી છે</string>
+  <string name="call_log_all_empty_action">કૉલ કરો</string>
+  <string name="call_log_missed_empty">તમારી પાસે કોઇ છૂટેલાં કૉલ્સ નથી.</string>
+  <string name="call_log_voicemail_empty">તમારું વૉઇસમેઇલ ઇનબોક્સ ખાલી છે.</string>
+  <string name="call_log_activity_title">કૉલ ઇતિહાસ</string>
+  <string name="call_log_all_title">તમામ</string>
+  <string name="call_log_missed_title">છૂટેલ</string>
+  <string name="tab_speed_dial">સ્પીડ ડાયલ</string>
+  <string name="tab_history">કૉલ ઇતિહાસ</string>
+  <string name="tab_all_contacts">સંપર્કો</string>
+  <string name="tab_voicemail">વૉઇસમેઇલ</string>
+  <string name="search_shortcut_call_number">%s ને કૉલ કરો</string>
+  <string name="search_shortcut_create_new_contact">નવો સંપર્ક બનાવો</string>
+  <string name="search_shortcut_add_to_contact">સંપર્કમાં ઉમેરો</string>
+  <string name="search_shortcut_send_sms_message">SMS મોકલો</string>
+  <string name="search_shortcut_make_video_call">વિડિઓ કૉલ કરો</string>
+  <string name="search_shortcut_block_number">નંબર અવરોધિત કરો</string>
+  <string name="speed_dial_empty">તમારા ઝડપી ડાયલ પર હજી સુધી કોઇ નથી</string>
+  <string name="speed_dial_empty_add_favorite_action">એક મનપસંદ ઉમેરો</string>
+  <string name="remove_contact">દૂર કરો</string>
+  <string name="select_all">તમામ પસંદ કરો</string>
+  <string name="call_log_action_video_call">વિડિઓ કૉલ</string>
+  <string name="call_log_action_set_up_video">વીડિઓ કૉલિંગ સેટ કરો</string>
+  <string name="call_log_action_invite_video">વીડિઓ કૉલ માટે આમંત્રિત કરો</string>
+  <string name="call_log_action_send_message">એક સંદેશ મોકલો</string>
+  <string name="call_log_action_details">કૉલની વિગતો</string>
+  <string name="call_log_action_share_voicemail">આને મોકલો ...</string>
+  <string name="call_log_action_call">^1 ને કૉલ કરો</string>
+  <string name="description_incoming_missed_call">^1, ^2, ^3, ^4 નો છૂટેલ કૉલ</string>
+  <string name="description_incoming_answered_call">^1, ^2, ^3, ^4 નો જવાબી કૉલ</string>
+  <string name="description_unread_voicemail">^1, ^2, ^3, ^4 તરફથી ન વાંચેલો વૉઇસમેઇલ</string>
+  <string name="description_read_voicemail">^1, ^2, ^3, ^4 તરફથી વૉઇસમેઇલ</string>
+  <string name="description_outgoing_call">^1, ^2, ^3, ^4 પર કૉલ.</string>
+  <string name="call_log_via_number">%1$s મારફતે</string>
+  <string name="call_log_via_number_phone_account">%1$s પર, %2$s મારફતે</string>
+  <string name="description_call_action">^1 ને કૉલ કરો</string>
+  <string name="description_video_call_action">^1 ને વિડિઓ કૉલ કરો.</string>
+  <string name="description_voicemail_action">^1 ના વૉઇસમેઇલને સાંભળો</string>
+  <string name="description_create_new_contact_action">^1 માટે સંપર્ક બનાવો</string>
+  <string name="description_add_to_existing_contact_action">^1 ને અસ્તિત્વમાંના સંપર્કમાં ઉમેરો</string>
+  <string name="description_details_action">^1 માટે કૉલ વિગતો</string>
+  <string name="call_log_header_today">આજે</string>
+  <string name="call_log_header_yesterday">ગઈ કાલે</string>
+  <string name="call_log_header_other">જૂનું</string>
+  <string name="voicemail_speaker_on">સ્પીકર ચાલુ કરો.</string>
+  <string name="voicemail_speaker_off">સ્પીકર બંધ કરો.</string>
+  <string name="voicemail_play_start_pause">પ્લેબેક ચલાવો અથવા થોભાવો</string>
+  <string name="display_options_title">પ્રદર્શન વિકલ્પો</string>
+  <string name="sounds_and_vibration_title">ધ્વનિ અને વાઇબ્રેશન</string>
+  <string name="accessibility_settings_title">ઍક્સેસિબિલિટી</string>
+  <string name="ringtone_title">ફોન રિંગટોન</string>
+  <string name="vibrate_on_ring_title">કૉલ્સ માટે વાઇબ્રેટ પણ કરો</string>
+  <string name="dtmf_tone_enable_title">કીપેડ ટોન</string>
+  <string name="dtmf_tone_length_title">કીપેડ ટોનની લંબાઈ</string>
   <string-array name="dtmf_tone_length_entries">
-    <item msgid="3136353015227162823">"સામાન્ય"</item>
-    <item msgid="5376841175538523822">"લાંબુ"</item>
+    <item>સામાન્ય</item>
+    <item>લાંબુ</item>
   </string-array>
-    <string name="respond_via_sms_setting_title" msgid="8008181606657693452">"ઝડપી પ્રતિસાદ"</string>
-    <string name="call_settings_label" msgid="7824611757200960807">"કૉલ્સ"</string>
-    <string name="manage_blocked_numbers_label" msgid="16823761991832273">"કૉલ અવરોધ"</string>
-    <string name="voicemail_settings_label" msgid="4594299554519920570">"વૉઇસમેઇલ"</string>
-    <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"કૉલ અવરોધિત કરવાનું અસ્થાયીરૂપે બંધ છે"</string>
-    <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"કૉલ અવરોધિત કરવાનું અક્ષમ કરવામાં આવ્યું છે કારણ કે તમે આ ફોનમાંથી છેલ્લા 48 કલાકમાં કટોકટીની સેવાઓનો સંપર્ક કર્યો હતો. એકવાર 48 કલાકનો સમયગાળો સમાપ્ત થાય, પછી તે આપમેળે ફરીથી સક્ષમ કરવામાં આવશે."</string>
-    <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"નંબર્સ આયાત કરો"</string>
-    <string name="blocked_call_settings_import_description" msgid="1819412052545228965">"તમે પહેલાં કેટલાક કૉલર્સને અન્ય ઍપ્લિકેશનો મારફતે વૉઇસમેઇલ પર આપમેળે મોકલવા માટે ચિહ્નિત કર્યા."</string>
-    <string name="blocked_call_settings_view_numbers_button" msgid="3332727948554356704">"સંખ્યા જુઓ"</string>
-    <string name="blocked_call_settings_import_button" msgid="7319111700387470727">"આયાત કરો"</string>
-    <string name="description_blocked_number_list_delete" msgid="2139644216858370740">"નંબર અનાવરોધિત કરો"</string>
-    <string name="addBlockedNumber" msgid="3053473735238295551">"નંબર ઉમેરો"</string>
-    <string name="block_number_footer_message_vvm" msgid="7955326304033982368">"આ નંબરથી આવનારા કૉલ્સ અવરોધિત કરવામાં આવશે અને વૉઇસમેઇલ્સ આપમેળે કાઢી નાખવામાં આવશે."</string>
-    <string name="block_number_footer_message_no_vvm" msgid="1152684139070471665">"આ નંબરથી આવનારા કૉલ્સ અવરોધિત કરવામાં આવશે, પરંતુ તેઓ હજી પણ તમારા માટે વૉઇસમેઇલ્સ મૂકવામાં સમર્થ હોઈ શકે છે."</string>
-    <string name="block_list" msgid="4701585783411870782">"અવરોધિત નંબરો"</string>
-    <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g> ને પહેલેથી અવરોધિત કરવામાં આવ્યો છે."</string>
-    <string name="phone_account_settings_label" msgid="8372485478006965920">"કૉલિંગ એકાઉન્ટ્સ"</string>
-    <string name="permission_no_speeddial" msgid="8487215628510596753">"ઝડપી ડાયલ સક્ષમ કરવા માટે, સંપર્કોની પરવાનગી ચાલુ કરો."</string>
-    <string name="permission_no_calllog" msgid="4053705651238775784">"તમારો કૉલ લૉગ જોવા માટે, ફોન પરવાનગી ચાલુ કરો."</string>
-    <string name="permission_no_search" msgid="2424710404207193826">"તમારા સંપર્કો શોધવા માટે, સંપર્કોની પરવાનગીઓ ચાલુ કરો."</string>
-    <string name="permission_place_call" msgid="8686908130349369423">"કૉલ કરવા માટે, ફોન પરવાનગી ચાલુ કરો."</string>
-    <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"ફોન એપ્લિકેશનને સિસ્ટમ સેટિંગ્સ પર લખવાની પરવાનગી નથી."</string>
-    <string name="blocked_number_call_log_label" msgid="4212282846299997693">"અવરોધિત"</string>
-    <string name="call_log_action_block_report_number" msgid="7302636538668696729">"સ્પામની જાણ કરો/અવરોધિત કરો"</string>
-    <string name="call_log_action_block_number" msgid="5048188386501998865">"નંબર અવરોધિત કરો"</string>
-    <string name="call_log_action_remove_spam" msgid="2045319806318398403">"સ્પામ નથી"</string>
-    <string name="call_log_action_unblock_number" msgid="6100117033288448758">"નંબર અનાવરોધિત કરો"</string>
-    <string name="spam_number_call_log_label" msgid="2678431398326811131">"સ્પામ"</string>
-    <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> ઑફલાઇન છે અને તેના સુધી પહોંચી શકતાં નથી"</string>
-    <string name="about_phone_label" msgid="582991354677973731">"વિશે"</string>
-    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Google દ્વારા ટ્રાન્સ્ક્રાઇબ કરેલ"</string>
-    <string name="voicemail_transcription_in_progress" msgid="2933320969613783210">"Google ટ્રાન્સ્ક્રાઇબ કરી રહ્યું છે…"</string>
-    <string name="voicemail_transcription_failed" msgid="335275303117412706">"ટ્રાન્સક્રિપ્ટ ઉપલબ્ધ નથી."</string>
-    <string name="voicemail_transcription_failed_language_not_supported" msgid="4210332591050562553">"ટ્રાન્સક્રિપ્ટ ઉપલબ્ધ નથી. ભાષા સમર્થિત નથી."</string>
-    <string name="voicemail_transcription_failed_no_speech" msgid="9093372879697874852">"ટ્રાન્સક્રિપ્ટ ઉપલબ્ધ નથી. કોઈ ધ્વનિ સંભળાયો નથી."</string>
-    <string name="view_conversation" msgid="7895904782094119702">"જુઓ"</string>
-    <string name="ec_data_deleted" msgid="4794880345545827107">"કૉલ કાઢી નાખ્યો. આ કૉલ દરમિયાન સંદેશામાં શેર કરેલ જોડાણ જુઓ અને કાઢી નાખો."</string>
-    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"કૉલ કાઢી નાખ્યા. કૉલ દરમિયાન સંદેશામાં શેર કરેલ જોડાણ જુઓ અને કાઢી નાખો."</string>
+  <string name="respond_via_sms_setting_title">ઝડપી પ્રતિસાદ</string>
+  <string name="call_settings_label">કૉલ્સ</string>
+  <string name="manage_blocked_numbers_label">બ્લૉક કરેલ નંબર</string>
+  <string name="voicemail_settings_label">વૉઇસમેઇલ</string>
+  <string name="blocked_numbers_disabled_emergency_header_label">કૉલ અવરોધિત કરવાનું અસ્થાયીરૂપે બંધ છે</string>
+  <string name="blocked_numbers_disabled_emergency_desc">કૉલ અવરોધિત કરવાનું અક્ષમ કરવામાં આવ્યું છે કારણ કે તમે આ ફોનમાંથી છેલ્લા 48 કલાકમાં કટોકટીની સેવાઓનો સંપર્ક કર્યો હતો. એકવાર 48 કલાકનો સમયગાળો સમાપ્ત થાય, પછી તે આપમેળે ફરીથી સક્ષમ કરવામાં આવશે.</string>
+  <string name="import_send_to_voicemail_numbers_label">નંબર્સ આયાત કરો</string>
+  <string name="blocked_call_settings_import_description">તમે પહેલાં કેટલાક કૉલર્સને અન્ય ઍપ્લિકેશનો મારફતે વૉઇસમેઇલ પર આપમેળે મોકલવા માટે ચિહ્નિત કર્યા.</string>
+  <string name="blocked_call_settings_view_numbers_button">સંખ્યા જુઓ</string>
+  <string name="blocked_call_settings_import_button">આયાત કરો</string>
+  <string name="description_blocked_number_list_delete">નંબર અનાવરોધિત કરો</string>
+  <string name="addBlockedNumber">નંબર ઉમેરો</string>
+  <string name="block_number_footer_message_vvm">આ નંબરથી આવનારા કૉલ્સ અવરોધિત કરવામાં આવશે અને વૉઇસમેઇલ્સ આપમેળે કાઢી નાખવામાં આવશે.</string>
+  <string name="block_number_footer_message_no_vvm">આ નંબરથી આવનારા કૉલ્સ અવરોધિત કરવામાં આવશે, પરંતુ તેઓ હજી પણ તમારા માટે વૉઇસમેઇલ્સ મૂકવામાં સમર્થ હોઈ શકે છે.</string>
+  <string name="block_list">અવરોધિત નંબરો</string>
+  <string name="alreadyBlocked">%1$s ને પહેલેથી અવરોધિત કરવામાં આવ્યો છે.</string>
+  <string name="phone_account_settings_label">કૉલિંગ એકાઉન્ટ્સ</string>
+  <string name="permission_no_speeddial">ઝડપી ડાયલ સક્ષમ કરવા માટે, સંપર્કોની પરવાનગી ચાલુ કરો.</string>
+  <string name="permission_no_calllog">તમારો કૉલ લૉગ જોવા માટે, ફોન પરવાનગી ચાલુ કરો.</string>
+  <string name="permission_no_search">તમારા સંપર્કો શોધવા માટે, સંપર્કોની પરવાનગીઓ ચાલુ કરો.</string>
+  <string name="permission_place_call">કૉલ કરવા માટે, ફોન પરવાનગી ચાલુ કરો.</string>
+  <string name="toast_cannot_write_system_settings">ફોન એપ્લિકેશનને સિસ્ટમ સેટિંગ્સ પર લખવાની પરવાનગી નથી.</string>
+  <string name="blocked_number_call_log_label">અવરોધિત</string>
+  <string name="call_log_action_block_report_number">સ્પામની જાણ કરો/અવરોધિત કરો</string>
+  <string name="call_log_action_block_number">નંબર અવરોધિત કરો</string>
+  <string name="call_log_action_remove_spam">સ્પામ નથી</string>
+  <string name="call_log_action_unblock_number">નંબર અનાવરોધિત કરો</string>
+  <string name="spam_number_call_log_label">સ્પામ</string>
+  <string name="call_composer_connection_failed">%1$s ઑફલાઇન છે અને તેના સુધી પહોંચી શકતાં નથી</string>
+  <string name="about_phone_label">વિશે</string>
+  <string name="voicemail_transcription_branding_text">Google દ્વારા ટ્રાન્સ્ક્રાઇબ કરેલ</string>
+  <string name="voicemail_transcription_in_progress">ટ્રાન્સ્ક્રાઇબ કરી રહ્યાં છીએ…</string>
+  <string name="voicemail_transcription_failed">ટ્રાન્સક્રિપ્ટ ઉપલબ્ધ નથી.</string>
+  <string name="voicemail_transcription_failed_language_not_supported">ટ્રાન્સક્રિપ્ટ ઉપલબ્ધ નથી. ભાષા સમર્થિત નથી.</string>
+  <string name="voicemail_transcription_failed_no_speech">ટ્રાન્સક્રિપ્ટ ઉપલબ્ધ નથી. કોઈ ધ્વનિ સંભળાયો નથી.</string>
+  <string name="voicemail_donation_promo_title">ટ્રાન્સક્રિપ્શનની સચોટતા બહેતર બનાવવામાં સહાય કરવા ઈચ્છો છો?</string>
+  <string name="voicemail_donation_promo_content">Googleને આ અને ભાવિ વૉઇસમેઇલ સંદેશા ટ્રાન્સક્રિપ્ટ વડે રિવ્યૂ કરવા દો. તે અજ્ઞાત રૂપે સ્ટોર કરવામાં આવશે. ગમે ત્યારે સેટિંગમાં જઈને બદલો. %1$s</string>
+  <string name="voicemail_donation_promo_opt_in">હા, ઠીક છે</string>
+  <string name="voicemail_donation_promo_opt_out">ના, આભાર</string>
+  <string name="voicemail_transcription_rating">ટ્રાન્સક્રિપ્શનની ક્વૉલિટીને રેટ કરો</string>
+  <string name="voicemail_transcription_rating_thanks">તમારા પ્રતિસાદ બદલ આભાર</string>
+  <string name="description_rating_good">પસંદ</string>
+  <string name="description_rating_bad">નાપસંદ</string>
+  <string name="view_conversation">જુઓ</string>
+  <string name="ec_data_deleted">કૉલ કાઢી નાખ્યો. આ કૉલ દરમિયાન સંદેશામાં શેર કરેલ જોડાણ જુઓ અને કાઢી નાખો.</string>
+  <string name="multiple_ec_data_deleted">કૉલ કાઢી નાખ્યા. કૉલ દરમિયાન સંદેશામાં શેર કરેલ જોડાણ જુઓ અને કાઢી નાખો.</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-hi/strings.xml b/java/com/android/dialer/app/res/values-hi/strings.xml
index 640d0b2..9caf78b 100644
--- a/java/com/android/dialer/app/res/values-hi/strings.xml
+++ b/java/com/android/dialer/app/res/values-hi/strings.xml
@@ -1,179 +1,171 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="applicationLabel" msgid="2202739481132958990">"फ़ोन"</string>
-    <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"फ़ोन कीपैड"</string>
-    <string name="callHistoryIconLabel" msgid="7493268743411968630">"कॉल इतिहास"</string>
-    <string name="action_copy_number_text" msgid="832682558551502319">"नंबर कॉपी करें"</string>
-    <string name="copy_transcript_text" msgid="937904189017310829">"ट्रांसक्रिप्शन को कॉपी करें"</string>
-    <string name="action_edit_number_before_call" msgid="8017492815878473837">"कॉल करने से पहले नंबर संपादित करें"</string>
-    <string name="call_log_delete_all" msgid="7852970926906523784">"कॉल इतिहास साफ़ करें"</string>
-    <string name="call_log_trash_voicemail" msgid="6118493534178533972">"वॉइसमेल हटाएं"</string>
-    <string name="snackbar_voicemail_deleted" msgid="7463166543725496307">"वॉइसमेल हटाया गया"</string>
-    <string name="snackbar_voicemail_deleted_undo" msgid="6959743982796409941">"वापस लाएं"</string>
-    <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"कॉल इतिहास साफ़ करें?"</string>
-    <string name="clearCallLogConfirmation" msgid="6844949465815109166">"इससे आपके इतिहास से सभी कॉल हटा दिए जाएंगे"</string>
-    <string name="clearCallLogProgress_title" msgid="995004835687361977">"कॉल इतिहास साफ़ किया जा रहा है…"</string>
-    <string name="notification_missedCallTitle" msgid="8283366068539898486">"छूटी कॉल"</string>
-    <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"कार्यस्थल का छूटा हुआ कॉल"</string>
-    <string name="notification_missedCallsTitle" msgid="3697442015345089802">"छूटे कॉल"</string>
-    <string name="notification_missedCallsMsg" msgid="8176217633929018706">"<xliff:g id="NUM_MISSED_CALLS">%d</xliff:g> छूटे कॉल"</string>
-    <string name="notification_missedCall_call_back" msgid="3875698110051973965">"वापस कॉल करें"</string>
-    <string name="notification_missedCall_message" msgid="5086910028988305964">"संदेश"</string>
-    <string name="post_call_notification_message" msgid="5417476789860590611">"<xliff:g id="NAME">%1$s</xliff:g>: <xliff:g id="MESSAGE">%2$s</xliff:g>"</string>
-    <string name="notification_voicemail_text_format" msgid="1895667520930252897">"<xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g> डायल करें"</string>
-    <string name="notification_voicemail_no_vm_number" msgid="8942821987929495842">"वॉइसमेल नंबर अज्ञात"</string>
-    <plurals name="notification_voicemail_title" formatted="false" msgid="1551847434476438657">
-      <item quantity="one"> <xliff:g id="COUNT">%1$d</xliff:g> वॉइसमेल </item>
-      <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> वॉइसमेल </item>
-    </plurals>
-    <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
-    <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"<xliff:g id="CALLER">%1$s</xliff:g> की ओर से नया ध्‍वनिमेल"</string>
-    <string name="voicemail_playback_error" msgid="4384373852257757295">"वॉइसमेल नहीं चलाया जा सका"</string>
-    <string name="voicemail_fetching_content" msgid="572320120918636014">"वॉइसमेल लोड हो रहा है…"</string>
-    <string name="voicemail_fetching_timout" msgid="2128873915839949783">"वॉइसमेल लोड नहीं किया जा सका"</string>
-    <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_playback_speakerphone" msgid="4852027754869750227">"स्पीकरफ़ोन को चालू या बंद पर स्विच करें"</string>
-    <string name="description_playback_seek" msgid="1340910573254132520">"प्लेबैक स्थिति का पता लगाएं"</string>
-    <string name="action_menu_call_history_description" msgid="8829135306925008546">"कॉल इतिहास"</string>
-    <string name="action_menu_overflow_description" msgid="7648679686746517341">"अधिक विकल्प"</string>
-    <string name="action_menu_dialpad_button" msgid="1970631633457493180">"कीपैड"</string>
-    <string name="dialer_settings_label" msgid="4980176284150290175">"सेटिंग"</string>
-    <string name="simulator_submenu_label" msgid="186156287346615267">"सिम्युलेटर"</string>
-    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"नया UI शॉर्टकट बनाएं"</string>
-    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"बल्क कार्रवाई मोड में प्रवेश कर रहे हैं"</string>
-    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"बल्क कार्रवाई मोड छोड़ा"</string>
-    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> को चुना गया"</string>
-    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> को नहीं चुना गया"</string>
-    <string name="description_contact_details" msgid="3341280873855253464">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> का संपर्क विवरण"</string>
-    <string name="description_spam_contact_details" msgid="5592578752881528368">"संदिग्ध स्पैम कॉलर <xliff:g id="NAMEORNUMBER">%1$s</xliff:g> के लिए संपर्क विवरण"</string>
-    <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> कॉल."</string>
-    <string name="description_video_call" msgid="3738199365585751727">"वीडियो कॉल."</string>
-    <string name="description_start_voice_search" msgid="8380022725973015261">"बोलकर खोजें शुरु करें"</string>
-    <string name="voicemail" msgid="8899540969000957954">"वॉयस मेल"</string>
-    <string name="description_cancel_multi_select" msgid="3930475950253360461">"बैच कार्रवाई मोड रद्द करें"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"हटाएं"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"रद्द करें"</string>
-    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> चयनित"</string>
-    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
-      <item quantity="one">"<b>"ये वॉइसमेल हटाएं? "</b>"</item>
-      <item quantity="other">"<b>"ये वॉइसमेल हटाएं? "</b>"</item>
-    </plurals>
-    <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
-    <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> को <xliff:g id="TIME">%2$s</xliff:g> बजे"</string>
-    <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
-    <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="voice_search_not_available" msgid="6546240433719732905">"बोलकर खोजना उपलब्‍ध नहीं है"</string>
-    <string name="dialer_hint_find_contact" msgid="2023214799381149808">"संपर्क खोजें"</string>
-    <string name="block_number_search_hint" msgid="5377706079015099416">"नंबर जोड़ें या संपर्क खोजें"</string>
-    <string name="call_log_all_empty" msgid="3955572868518162004">"आपका कॉल इतिहास खाली है"</string>
-    <string name="call_log_all_empty_action" msgid="852218280136243014">"कॉल करें"</string>
-    <string name="call_log_missed_empty" msgid="7094936030845062214">"आपके पास कोई भी छूटा हुआ कॉल नहीं है."</string>
-    <string name="call_log_voicemail_empty" msgid="273623903423275178">"आपका वॉइसमेल इनबाॅक्‍स खाली है."</string>
-    <string name="call_log_activity_title" msgid="1275242727244945527">"कॉल इतिहास"</string>
-    <string name="call_log_all_title" msgid="6042262422192020327">"सभी"</string>
-    <string name="call_log_missed_title" msgid="17254005889268015">"छूटे हुए"</string>
-    <string name="tab_speed_dial" msgid="6616404752227561075">"स्पीड डायल"</string>
-    <string name="tab_history" msgid="7420269368689503596">"कॉल इतिहास"</string>
-    <string name="tab_all_contacts" msgid="5531733977693943015">"संपर्क"</string>
-    <string name="tab_voicemail" msgid="2458548090088316246">"वॉइसमेल"</string>
-    <string name="search_shortcut_call_number" msgid="8847918845036880688">"<xliff:g id="NUMBER">%s</xliff:g> पर कॉल करें"</string>
-    <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"नया संपर्क बनाएं"</string>
-    <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"किसी संपर्क में जोड़ें"</string>
-    <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"SMS भेजें"</string>
-    <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"वीडियो कॉल करें"</string>
-    <string name="search_shortcut_block_number" msgid="4587283230665805776">"नंबर अवरुद्ध करें"</string>
-    <string name="speed_dial_empty" msgid="3346406399966039505">"आपके स्‍पीड डायल पर अभी तक कोई भी नहीं है"</string>
-    <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"कोई पसंदीदा जोड़ें"</string>
-    <string name="remove_contact" msgid="2353580570488923668">"निकालें"</string>
-    <string name="select_all" msgid="408601760696146245">"सभी चुनें"</string>
-    <string name="call_log_action_video_call" msgid="7565549950343850819">"वीडियो कॉल"</string>
-    <string name="call_log_action_send_message" msgid="6948727362660115554">"संदेश भेजें"</string>
-    <string name="call_log_action_details" msgid="2091370737371449501">"कॉल विवरण"</string>
-    <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"इन्हें भेजें …"</string>
-    <string name="call_log_action_call" msgid="682724094251540583">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> को कॉल करें"</string>
-    <string name="description_incoming_missed_call" msgid="8292535799379230029">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g> से छूटा हुआ कॉल."</string>
-    <string name="description_incoming_answered_call" msgid="3920182963103160610">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g> से आए कॉल का उत्तर दिया गया."</string>
-    <string name="description_unread_voicemail" msgid="145170985013419170">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g> के अपठित वॉइसमेल."</string>
-    <string name="description_read_voicemail" msgid="5585559881573227732">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g> के वॉइसमेल."</string>
-    <string name="description_outgoing_call" msgid="543952487882919924">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g> पर किया गया कॉल."</string>
-    <string name="call_log_via_number" msgid="1340307109806397650">"<xliff:g id="NUMBER">%1$s</xliff:g> से"</string>
-    <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g> से"</string>
-    <string name="description_call_action" msgid="4042796498169106545">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> को कॉल करें"</string>
-    <string name="description_video_call_action" msgid="1237090968588659650">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> को वीडियो कॉल करें."</string>
-    <string name="description_voicemail_action" msgid="3290143432403538524">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> की वॉयस मेल सुनें"</string>
-    <string name="description_create_new_contact_action" msgid="1928282350281564130">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> के लिए संपर्क बनाएं"</string>
-    <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> को मौजूदा संपर्क में जोड़ें"</string>
-    <string name="description_details_action" msgid="2061866409737706174">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> के कॉल विवरण"</string>
-    <string name="call_log_header_today" msgid="1576119097475845293">"आज"</string>
-    <string name="call_log_header_yesterday" msgid="5616077776205329563">"कल"</string>
-    <string name="call_log_header_other" msgid="4940676886254217644">"पुराना"</string>
-    <string name="voicemail_speaker_on" msgid="3151333608926996668">"स्पीकर चालू करें."</string>
-    <string name="voicemail_speaker_off" msgid="2530064206962034201">"स्पीकर बंद करें."</string>
-    <string name="voicemail_play_start_pause" msgid="3874823480278334664">"प्लेबैक प्रारंभ करें या रोकें."</string>
-    <string name="display_options_title" msgid="3880091801055797975">"प्रदर्शन विकल्प"</string>
-    <string name="sounds_and_vibration_title" msgid="3075050000721181384">"ध्‍वनि और कंपन"</string>
-    <string name="accessibility_settings_title" msgid="3329027650429831820">"सरल उपयोग"</string>
-    <string name="ringtone_title" msgid="8377174189894648486">"फ़ोन रिंगटोन"</string>
-    <string name="vibrate_on_ring_title" msgid="631441314790960485">"कॉल के लिए भी कंपन"</string>
-    <string name="dtmf_tone_enable_title" msgid="3273762431523939277">"कीपैड टोन"</string>
-    <string name="dtmf_tone_length_title" msgid="534096029202438539">"कीपैड टोन की अवधि"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="applicationLabel">फ़ोन</string>
+  <string name="launcherDialpadActivityLabel">फ़ोन कीपैड</string>
+  <string name="callHistoryIconLabel">कॉल इतिहास</string>
+  <string name="action_copy_number_text">नंबर कॉपी करें</string>
+  <string name="copy_transcript_text">ट्रांसक्रिप्शन को कॉपी करें</string>
+  <string name="action_edit_number_before_call">कॉल करने से पहले नंबर संपादित करें</string>
+  <string name="call_log_delete_all">कॉल इतिहास साफ़ करें</string>
+  <string name="call_log_trash_voicemail">वॉइसमेल हटाएं</string>
+  <string name="snackbar_voicemail_deleted">वॉइसमेल हटाया गया</string>
+  <string name="clearCallLogConfirmation_title">कॉल इतिहास साफ़ करें?</string>
+  <string name="clearCallLogConfirmation">इससे आपके इतिहास से सभी कॉल हटा दिए जाएंगे</string>
+  <string name="clearCallLogProgress_title">कॉल इतिहास साफ़ किया जा रहा है…</string>
+  <string name="notification_missedCallTitle">छूटी कॉल</string>
+  <string name="notification_missedWorkCallTitle">कार्यस्थल का छूटा हुआ कॉल</string>
+  <string name="notification_missedCallsTitle">छूटे कॉल</string>
+  <string name="notification_missedCallsMsg">%d छूटे कॉल</string>
+  <string name="notification_missedCall_call_back">वापस कॉल करें</string>
+  <string name="notification_missedCall_message">संदेश</string>
+  <string name="post_call_notification_message">%1$s: %2$s</string>
+  <string name="notification_voicemail_text_format">%s डायल करें</string>
+  <string name="notification_voicemail_no_vm_number">वॉइसमेल नंबर अज्ञात</string>
+  <plurals name="notification_voicemail_title">
+    <item quantity="one"> %1$d वॉइसमेल </item>
+    <item quantity="other"> %1$d वॉइसमेल </item>
+  </plurals>
+  <string name="notification_voicemail_callers_list">%1$s, %2$s</string>
+  <string name="notification_new_voicemail_ticker">%1$s की ओर से नया ध्‍वनिमेल</string>
+  <string name="voicemail_playback_error">वॉइसमेल नहीं चलाया जा सका</string>
+  <string name="voicemail_fetching_content">वॉइसमेल लोड हो रहा है…</string>
+  <string name="voicemail_fetching_timout">वॉइसमेल लोड नहीं किया जा सका</string>
+  <string name="call_log_item_count_and_date">(%1$d) %2$s</string>
+  <string name="description_playback_speakerphone">स्पीकरफ़ोन को चालू या बंद पर स्विच करें</string>
+  <string name="description_playback_seek">प्लेबैक स्थिति का पता लगाएं</string>
+  <string name="action_menu_call_history_description">कॉल इतिहास</string>
+  <string msgid="2295659037509008453" name="action_menu_overflow_description">अधिक विकल्प</string>
+  <string name="action_menu_dialpad_button">कीपैड</string>
+  <string name="dialer_settings_label">सेटिंग</string>
+  <string name="simulator_submenu_label">सिम्युलेटर</string>
+  <string name="new_ui_launcher_shortcut_label">नया UI शॉर्टकट बनाएं</string>
+  <string name="description_entering_bulk_action_mode">बल्क कार्रवाई मोड में प्रवेश कर रहे हैं</string>
+  <string name="description_leaving_bulk_action_mode">बल्क कार्रवाई मोड छोड़ा</string>
+  <string name="description_selecting_bulk_action_mode">%1$s को चुना गया</string>
+  <string name="description_unselecting_bulk_action_mode">%1$s को नहीं चुना गया</string>
+  <string name="description_contact_details">%1$s का संपर्क विवरण</string>
+  <string name="description_spam_contact_details">संदिग्ध स्पैम कॉलर %1$s के लिए संपर्क विवरण</string>
+  <string name="description_num_calls">%1$s कॉल.</string>
+  <string name="description_video_call">वीडियो कॉल.</string>
+  <string name="description_start_voice_search">बोलकर खोजें शुरु करें</string>
+  <string name="voicemail">वॉइसमेल</string>
+  <string name="description_cancel_multi_select">बैच कार्रवाई मोड रद्द करें</string>
+  <string name="voicemailMultiSelectDeleteConfirm">हटाएं</string>
+  <string name="voicemailMultiSelectDeleteCancel">रद्द करें</string>
+  <string name="voicemailMultiSelectActionBarTitle">%1$s चयनित</string>
+  <plurals name="delete_voicemails_confirmation_dialog_title">
+    <item quantity="one"><b>ये वॉइसमेल हटाएं? </b></item>
+    <item quantity="other"><b>ये वॉइसमेल हटाएं? </b></item>
+  </plurals>
+  <string name="voicemailCallLogToday">@string/call_log_header_today</string>
+  <string name="voicemailCallLogDateTimeFormat">%1$s को %2$s बजे</string>
+  <string name="voicemailDurationFormat">%1$02d:%2$02d</string>
+  <string name="voicemailCallLogDateTimeFormatWithDuration">%1$s • %2$s</string>
+  <string name="voice_search_not_available">बोलकर खोजना उपलब्‍ध नहीं है</string>
+  <string name="dialer_hint_find_contact">संपर्क खोजें</string>
+  <string name="block_number_search_hint">नंबर जोड़ें या संपर्क खोजें</string>
+  <string name="call_log_all_empty">आपके कॉल इतिहास में कुछ नहीं है</string>
+  <string name="call_log_all_empty_action">कॉल करें</string>
+  <string name="call_log_missed_empty">आपके पास कोई भी मिस्ड कॉल (छूटा हुआ) कॉल नहीं है.</string>
+  <string name="call_log_voicemail_empty">आपका वॉइसमेल इनबाॅक्‍स खाली है.</string>
+  <string name="call_log_activity_title">कॉल इतिहास</string>
+  <string name="call_log_all_title">सभी</string>
+  <string name="call_log_missed_title">मिस्ड कॉल (छूटे हुए)</string>
+  <string name="tab_speed_dial">स्पीड डायल</string>
+  <string name="tab_history">कॉल इतिहास</string>
+  <string name="tab_all_contacts">संपर्क</string>
+  <string name="tab_voicemail">वॉइसमेल</string>
+  <string name="search_shortcut_call_number">%s पर कॉल करें</string>
+  <string name="search_shortcut_create_new_contact">नया संपर्क बनाएं</string>
+  <string name="search_shortcut_add_to_contact">किसी संपर्क में जोड़ें</string>
+  <string name="search_shortcut_send_sms_message">SMS भेजें</string>
+  <string name="search_shortcut_make_video_call">वीडियो कॉल करें</string>
+  <string name="search_shortcut_block_number">नंबर ब्लॉक करें</string>
+  <string name="speed_dial_empty">आपके स्‍पीड डायल पर अभी तक कोई भी नहीं है</string>
+  <string name="speed_dial_empty_add_favorite_action">पसंदीदा संपर्क जोड़ें</string>
+  <string name="remove_contact">निकालें</string>
+  <string name="select_all">सभी चुनें</string>
+  <string name="call_log_action_video_call">वीडियो कॉल</string>
+  <string name="call_log_action_set_up_video">वीडियो कॉलिंग सेट अप करें</string>
+  <string name="call_log_action_invite_video">वीडियो कॉल पर आमंत्रित करें</string>
+  <string name="call_log_action_send_message">संदेश भेजें</string>
+  <string name="call_log_action_details">कॉल विवरण</string>
+  <string name="call_log_action_share_voicemail">इन्हें भेजें …</string>
+  <string name="call_log_action_call">^1 को कॉल करें</string>
+  <string name="description_incoming_missed_call">^1, ^2, ^3, ^4 से छूटा हुआ कॉल.</string>
+  <string name="description_incoming_answered_call">^1, ^2, ^3, ^4 से आए कॉल का उत्तर दिया गया.</string>
+  <string name="description_unread_voicemail">^1, ^2, ^3, ^4 के अपठित वॉइसमेल.</string>
+  <string name="description_read_voicemail">^1, ^2, ^3, ^4 के वॉइसमेल.</string>
+  <string name="description_outgoing_call">^1, ^2, ^3, ^4 पर किया गया कॉल.</string>
+  <string name="call_log_via_number">%1$s से</string>
+  <string name="call_log_via_number_phone_account">%1$s %2$s से</string>
+  <string name="description_call_action">^1 को कॉल करें</string>
+  <string name="description_video_call_action">^1 को वीडियो कॉल करें.</string>
+  <string name="description_voicemail_action">^1 की वॉयस मेल सुनें</string>
+  <string name="description_create_new_contact_action">^1 के लिए संपर्क बनाएं</string>
+  <string name="description_add_to_existing_contact_action">^1 को मौजूदा संपर्क में जोड़ें</string>
+  <string name="description_details_action">^1 के कॉल विवरण</string>
+  <string name="call_log_header_today">आज</string>
+  <string name="call_log_header_yesterday">कल</string>
+  <string name="call_log_header_other">पुराना</string>
+  <string name="voicemail_speaker_on">स्पीकर चालू करें.</string>
+  <string name="voicemail_speaker_off">स्पीकर बंद करें.</string>
+  <string name="voicemail_play_start_pause">प्लेबैक प्रारंभ करें या रोकें.</string>
+  <string name="display_options_title">डिसप्ले के विकल्प</string>
+  <string name="sounds_and_vibration_title">साउंड और वाइब्रेशन</string>
+  <string name="accessibility_settings_title">सरल उपयोग</string>
+  <string name="ringtone_title">फ़ोन रिंगटोन</string>
+  <string name="vibrate_on_ring_title">कॉल के लिए भी कंपन</string>
+  <string name="dtmf_tone_enable_title">कीपैड टोन</string>
+  <string name="dtmf_tone_length_title">कीपैड टोन की अवधि</string>
   <string-array name="dtmf_tone_length_entries">
-    <item msgid="3136353015227162823">"सामान्य"</item>
-    <item msgid="5376841175538523822">"लंबा"</item>
+    <item>सामान्य</item>
+    <item>लंबा</item>
   </string-array>
-    <string name="respond_via_sms_setting_title" msgid="8008181606657693452">"झटपट उत्तर"</string>
-    <string name="call_settings_label" msgid="7824611757200960807">"कॉल"</string>
-    <string name="manage_blocked_numbers_label" msgid="16823761991832273">"कॉल अवरुद्ध करें"</string>
-    <string name="voicemail_settings_label" msgid="4594299554519920570">"वॉइसमेल"</string>
-    <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"कॉल अवरुद्ध करना अस्‍थायी रूप से बंद है"</string>
-    <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"कॉल अवरुद्ध किए जाने को अक्षम कर दिया गया है क्योंकि पिछले 48 घंटों में आपने इस फ़ोन से आपातकालीन सेवाओं से संपर्क किया है. 48 घंटे की अवधि बीत जाने पर यह अपने आप फिर से सक्षम हो जाएगी."</string>
-    <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"नंबर आयात करें"</string>
-    <string name="blocked_call_settings_import_description" msgid="1819412052545228965">"आपने पहले कुछ कॉलर को अपने आप अन्य ऐप्स के द्वारा वॉइसमेल भेजे जाने के लिए चिह्नित किया था."</string>
-    <string name="blocked_call_settings_view_numbers_button" msgid="3332727948554356704">"नंबर देखें"</string>
-    <string name="blocked_call_settings_import_button" msgid="7319111700387470727">"आयात करें"</string>
-    <string name="description_blocked_number_list_delete" msgid="2139644216858370740">"नंबर अनवरोधित करें"</string>
-    <string name="addBlockedNumber" msgid="3053473735238295551">"नंबर जोड़ें"</string>
-    <string name="block_number_footer_message_vvm" msgid="7955326304033982368">"इन नंबर से आने वाले कॉल अवरुद्ध कर दिए जाएंगे और वॉइसमेल अपने आप हटा दिए जाएंगे."</string>
-    <string name="block_number_footer_message_no_vvm" msgid="1152684139070471665">"इन नंबर से आने वाले कॉल अवरुद्ध कर दिए जाएंगे, लेकिन वे अब भी आपके लिए वॉइसमेल भेज  सकेंगे."</string>
-    <string name="block_list" msgid="4701585783411870782">"अवरोधित नंबर"</string>
-    <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g> पहले से अवरोधित है."</string>
-    <string name="phone_account_settings_label" msgid="8372485478006965920">"कॉलिंग खाते"</string>
-    <string name="permission_no_speeddial" msgid="8487215628510596753">"स्पीड डायल सक्षम करने के लिए, संपर्क अनुमति चालू करें."</string>
-    <string name="permission_no_calllog" msgid="4053705651238775784">"अपना कॉल लॉग देखने के लिए, फ़ोन अनुमति चालू करें."</string>
-    <string name="permission_no_search" msgid="2424710404207193826">"अपने संपर्कों की खोज करने के लिए, संपर्क अनुमतियों को चालू करें."</string>
-    <string name="permission_place_call" msgid="8686908130349369423">"कॉल करने के लिए, फ़ोन अनुमति चालू करें."</string>
-    <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"फ़ोन ऐप को सिस्टम सेटिंग में लिखने की अनुमति नहीं है."</string>
-    <string name="blocked_number_call_log_label" msgid="4212282846299997693">"अवरोधित"</string>
-    <string name="call_log_action_block_report_number" msgid="7302636538668696729">"अवरुद्ध करें/स्पैम की रिपोर्ट करें"</string>
-    <string name="call_log_action_block_number" msgid="5048188386501998865">"नंबर अवरुद्ध करें"</string>
-    <string name="call_log_action_remove_spam" msgid="2045319806318398403">"स्पैम नहीं है"</string>
-    <string name="call_log_action_unblock_number" msgid="6100117033288448758">"नंबर अनवरोधित करें"</string>
-    <string name="spam_number_call_log_label" msgid="2678431398326811131">"स्पैम"</string>
-    <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> ऑफ़लाइन हैं और उन तक नहीं पहुंचा जा सकता"</string>
-    <string name="about_phone_label" msgid="582991354677973731">"संक्षिप्त विवरण"</string>
-    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"यह ट्रांसक्रिप्शन Google ने किया है"</string>
-    <string name="voicemail_transcription_in_progress" msgid="2933320969613783210">"Google प्रतिलेखन कर रहा है…"</string>
-    <string name="voicemail_transcription_failed" msgid="335275303117412706">"ट्रांसक्रिप्ट उपलब्‍ध नहीं है."</string>
-    <string name="voicemail_transcription_failed_language_not_supported" msgid="4210332591050562553">"ट्रांसक्रिप्ट उपलब्‍ध नहीं है. यह भाषा उपलब्ध नहीं है."</string>
-    <string name="voicemail_transcription_failed_no_speech" msgid="9093372879697874852">"ट्रांसक्रिप्ट उपलब्‍ध नहीं है. कोई भी भाषण नहीं मिला."</string>
-    <string name="view_conversation" msgid="7895904782094119702">"देखें"</string>
-    <string name="ec_data_deleted" msgid="4794880345545827107">"कॉल हटाया गया. संदेश में जा कर इस कॉल के दौरान साझा किए गए अटैचमेंट देखें और हटाएं."</string>
-    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"कॉल हटाए गए. संदेश में जा कर इस कॉल के दौरान साझा किए गए अटैचमेंट देखें और हटाएं."</string>
+  <string name="respond_via_sms_setting_title">पहले से तैयार जवाब</string>
+  <string name="call_settings_label">कॉल</string>
+  <string name="manage_blocked_numbers_label">ब्लॉक किए गए नंबर</string>
+  <string name="voicemail_settings_label">वॉइसमेल</string>
+  <string name="blocked_numbers_disabled_emergency_header_label">कॉल अवरुद्ध करना अस्‍थायी रूप से बंद है</string>
+  <string name="blocked_numbers_disabled_emergency_desc">कॉल अवरुद्ध किए जाने को अक्षम कर दिया गया है क्योंकि पिछले 48 घंटों में आपने इस फ़ोन से आपातकालीन सेवाओं से संपर्क किया है. 48 घंटे की अवधि बीत जाने पर यह अपने आप फिर से सक्षम हो जाएगी.</string>
+  <string name="import_send_to_voicemail_numbers_label">नंबर आयात करें</string>
+  <string name="blocked_call_settings_import_description">आपने पहले कुछ कॉलर को अपने आप अन्य ऐप्स के द्वारा वॉइसमेल भेजे जाने के लिए चिह्नित किया था.</string>
+  <string name="blocked_call_settings_view_numbers_button">नंबर देखें</string>
+  <string name="blocked_call_settings_import_button">आयात करें</string>
+  <string name="description_blocked_number_list_delete">नंबर अनवरोधित करें</string>
+  <string name="addBlockedNumber">नंबर जोड़ें</string>
+  <string name="block_number_footer_message_vvm">इन नंबर से आने वाले कॉल ब्लॉक कर दिए जाएंगे और वॉइसमेल अपने आप हटा दिए जाएंगे.</string>
+  <string name="block_number_footer_message_no_vvm">इन नंबर से आने वाले कॉल ब्लॉक कर दिए जाएंगे, लेकिन वे अब भी आपके लिए वॉइसमेल भेज सकेंगे.</string>
+  <string name="block_list">ब्लॉक किए गए नंबर</string>
+  <string name="alreadyBlocked">%1$s पहले से अवरोधित है.</string>
+  <string name="phone_account_settings_label">कॉलिंग खाते</string>
+  <string name="permission_no_speeddial">स्पीड डायल सक्षम करने के लिए, संपर्क अनुमति चालू करें.</string>
+  <string name="permission_no_calllog">अपना कॉल लॉग देखने के लिए, फ़ोन अनुमति चालू करें.</string>
+  <string name="permission_no_search">अपने संपर्कों की खोज करने के लिए, संपर्क अनुमतियों को चालू करें.</string>
+  <string name="permission_place_call">कॉल करने के लिए, फ़ोन अनुमति चालू करें.</string>
+  <string name="toast_cannot_write_system_settings">फ़ोन ऐप को सिस्टम सेटिंग में लिखने की अनुमति नहीं है.</string>
+  <string name="blocked_number_call_log_label">अवरोधित</string>
+  <string name="call_log_action_block_report_number">अवरुद्ध करें/स्पैम की रिपोर्ट करें</string>
+  <string name="call_log_action_block_number">नंबर ब्लॉक करें</string>
+  <string name="call_log_action_remove_spam">स्पैम नहीं है</string>
+  <string name="call_log_action_unblock_number">नंबर अनवरोधित करें</string>
+  <string name="spam_number_call_log_label">स्पैम</string>
+  <string name="call_composer_connection_failed">%1$s ऑफ़लाइन हैं और उन तक नहीं पहुंचा जा सकता</string>
+  <string name="about_phone_label">संक्षिप्त विवरण</string>
+  <string name="voicemail_transcription_branding_text">यह ट्रांसक्रिप्शन Google ने किया है</string>
+  <string name="voicemail_transcription_in_progress">ट्रांसक्राइब कर रहा है…</string>
+  <string name="voicemail_transcription_failed">ट्रांसक्रिप्ट उपलब्‍ध नहीं है.</string>
+  <string name="voicemail_transcription_failed_language_not_supported">ट्रांसक्रिप्ट उपलब्‍ध नहीं है. यह भाषा उपलब्ध नहीं है.</string>
+  <string name="voicemail_transcription_failed_no_speech">ट्रांसक्रिप्ट उपलब्‍ध नहीं है. कोई भी भाषण नहीं मिला.</string>
+  <string name="voicemail_donation_promo_title">क्या वॉइसमेल को लेख में बदलने की सटीकता को सुधारना चाहते हैं?</string>
+  <string name="voicemail_donation_promo_content">Google को इस मैसेज के साथ-साथ भविष्य में भी लेख वाले सभी वॉइसमेल मैसेज की समीक्षा करने दें. उन्हें गुमनाम रूप से संग्रहित किया जाएगा. आप जब चाहें सेटिंग में बदलाव कर सकते हैं. %1$s</string>
+  <string name="voicemail_donation_promo_opt_in">हां मैं सहमत हूं</string>
+  <string name="voicemail_donation_promo_opt_out">नहीं, धन्यवाद</string>
+  <string name="voicemail_transcription_rating">ट्रांसक्रिप्शन क्वालिटी आंकें</string>
+  <string name="voicemail_transcription_rating_thanks">आपके सुझाव के लिए धन्यवाद</string>
+  <string name="description_rating_good">पसंद करें</string>
+  <string name="description_rating_bad">नापसंद करें</string>
+  <string name="view_conversation">देखें</string>
+  <string name="ec_data_deleted">कॉल हटाया गया. संदेश में जा कर इस कॉल के दौरान शेयर किए गए अटैचमेंट देखें और हटाएं.</string>
+  <string name="multiple_ec_data_deleted">कॉल हटाए गए. संदेश में जा कर इस कॉल के दौरान शेयर किए गए अटैचमेंट देखें और हटाएं.</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-hr/strings.xml b/java/com/android/dialer/app/res/values-hr/strings.xml
index ee82914..1f8f11b 100644
--- a/java/com/android/dialer/app/res/values-hr/strings.xml
+++ b/java/com/android/dialer/app/res/values-hr/strings.xml
@@ -1,181 +1,173 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="applicationLabel" msgid="2202739481132958990">"Telefon"</string>
-    <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"Telefonska tipkovnica"</string>
-    <string name="callHistoryIconLabel" msgid="7493268743411968630">"Povijest poziva"</string>
-    <string name="action_copy_number_text" msgid="832682558551502319">"Kopiraj broj"</string>
-    <string name="copy_transcript_text" msgid="937904189017310829">"Kopiraj prijepis"</string>
-    <string name="action_edit_number_before_call" msgid="8017492815878473837">"Uredi broj prije pozivanja"</string>
-    <string name="call_log_delete_all" msgid="7852970926906523784">"Izbriši povijest poziva"</string>
-    <string name="call_log_trash_voicemail" msgid="6118493534178533972">"Izbriši govornu poštu"</string>
-    <string name="snackbar_voicemail_deleted" msgid="7463166543725496307">"Gov. pošta izbrisana"</string>
-    <string name="snackbar_voicemail_deleted_undo" msgid="6959743982796409941">"PONIŠTI"</string>
-    <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"Želite li izbrisati povijest poziva?"</string>
-    <string name="clearCallLogConfirmation" msgid="6844949465815109166">"Izbrisat će se svi pozivi iz vaše povijesti"</string>
-    <string name="clearCallLogProgress_title" msgid="995004835687361977">"Brisanje povijesti poziva…"</string>
-    <string name="notification_missedCallTitle" msgid="8283366068539898486">"Propušteni poziv"</string>
-    <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"Propušten poslovni poziv"</string>
-    <string name="notification_missedCallsTitle" msgid="3697442015345089802">"Propušteni pozivi"</string>
-    <string name="notification_missedCallsMsg" msgid="8176217633929018706">"Propušteni pozivi (<xliff:g id="NUM_MISSED_CALLS">%d</xliff:g>)"</string>
-    <string name="notification_missedCall_call_back" msgid="3875698110051973965">"Povratni poziv"</string>
-    <string name="notification_missedCall_message" msgid="5086910028988305964">"Poruka"</string>
-    <string name="post_call_notification_message" msgid="5417476789860590611">"<xliff:g id="NAME">%1$s</xliff:g>: <xliff:g id="MESSAGE">%2$s</xliff:g>"</string>
-    <string name="notification_voicemail_text_format" msgid="1895667520930252897">"Biraj <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
-    <string name="notification_voicemail_no_vm_number" msgid="8942821987929495842">"Nepoznat broj govorne pošte"</string>
-    <plurals name="notification_voicemail_title" formatted="false" msgid="1551847434476438657">
-      <item quantity="one"> <xliff:g id="COUNT">%1$d</xliff:g> poruka govorne pošte </item>
-      <item quantity="few"> <xliff:g id="COUNT">%1$d</xliff:g> poruke govorne pošte </item>
-      <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> poruka govorne pošte </item>
-    </plurals>
-    <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
-    <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"Nova govorna pošta od kontakta <xliff:g id="CALLER">%1$s</xliff:g>"</string>
-    <string name="voicemail_playback_error" msgid="4384373852257757295">"Nije moguće reproducirati govornu poštu"</string>
-    <string name="voicemail_fetching_content" msgid="572320120918636014">"Učitavanje govorne pošte…"</string>
-    <string name="voicemail_fetching_timout" msgid="2128873915839949783">"Govorna pošta nije učitana"</string>
-    <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_playback_speakerphone" msgid="4852027754869750227">"Uključivanje ili isključivanje zvučnika"</string>
-    <string name="description_playback_seek" msgid="1340910573254132520">"Traženje položaja reprodukcije"</string>
-    <string name="action_menu_call_history_description" msgid="8829135306925008546">"Povijest poziva"</string>
-    <string name="action_menu_overflow_description" msgid="7648679686746517341">"Više opcija"</string>
-    <string name="action_menu_dialpad_button" msgid="1970631633457493180">"tipkovnica"</string>
-    <string name="dialer_settings_label" msgid="4980176284150290175">"Postavke"</string>
-    <string name="simulator_submenu_label" msgid="186156287346615267">"Simulator"</string>
-    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Izrada prečaca novog sučelja"</string>
-    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"Ulazak u način skupne radnje"</string>
-    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"Napuštanje načina skupne radnje"</string>
-    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"Odabrano: <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"Poništen odabir: <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_contact_details" msgid="3341280873855253464">"Pojedinosti o kontaktu <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_spam_contact_details" msgid="5592578752881528368">"Podaci za kontakt mogućeg neželjenog pozivatelja <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_num_calls" msgid="6483594535796216044">"Broj poziva: <xliff:g id="NUMBEROFCALLS">%1$s</xliff:g>."</string>
-    <string name="description_video_call" msgid="3738199365585751727">"Videopoziv."</string>
-    <string name="description_start_voice_search" msgid="8380022725973015261">"Pokretanje glasovnog pretraživanja"</string>
-    <string name="voicemail" msgid="8899540969000957954">"Govorna pošta"</string>
-    <string name="description_cancel_multi_select" msgid="3930475950253360461">"Otkaži način skupnih radnji"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Izbriši"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Odustani"</string>
-    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"Odabrano: <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
-      <item quantity="one">"<b>"Želite li izbrisati ove poruke govorne pošte? "</b>"</item>
-      <item quantity="few">"<b>"Želite li izbrisati ove poruke govorne pošte? "</b>"</item>
-      <item quantity="other">"<b>"Želite li izbrisati ove poruke govorne pošte? "</b>"</item>
-    </plurals>
-    <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
-    <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> u <xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>.<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
-    <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="voice_search_not_available" msgid="6546240433719732905">"Glasovno pretraživanje nije dostupno"</string>
-    <string name="dialer_hint_find_contact" msgid="2023214799381149808">"Pretraži kontakte"</string>
-    <string name="block_number_search_hint" msgid="5377706079015099416">"Dodaj broj ili potraži kontakt"</string>
-    <string name="call_log_all_empty" msgid="3955572868518162004">"Vaša je povijest poziva prazna"</string>
-    <string name="call_log_all_empty_action" msgid="852218280136243014">"Uputite poziv"</string>
-    <string name="call_log_missed_empty" msgid="7094936030845062214">"Nemate propuštene pozive."</string>
-    <string name="call_log_voicemail_empty" msgid="273623903423275178">"Nemate pristiglih poruka govorne pošte."</string>
-    <string name="call_log_activity_title" msgid="1275242727244945527">"Povijest poziva"</string>
-    <string name="call_log_all_title" msgid="6042262422192020327">"Sve"</string>
-    <string name="call_log_missed_title" msgid="17254005889268015">"Propušteni"</string>
-    <string name="tab_speed_dial" msgid="6616404752227561075">"Brzo biranje"</string>
-    <string name="tab_history" msgid="7420269368689503596">"Povijest poziva"</string>
-    <string name="tab_all_contacts" msgid="5531733977693943015">"Kontakti"</string>
-    <string name="tab_voicemail" msgid="2458548090088316246">"Govorna pošta"</string>
-    <string name="search_shortcut_call_number" msgid="8847918845036880688">"Nazovite <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"Izrada novog kontakta"</string>
-    <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"Dodaj kontaktu"</string>
-    <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"Pošalji SMS"</string>
-    <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"Uputite videopoziv"</string>
-    <string name="search_shortcut_block_number" msgid="4587283230665805776">"Blokiraj broj"</string>
-    <string name="speed_dial_empty" msgid="3346406399966039505">"Još nemate nikog na brzom biranju"</string>
-    <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"Dodaj omiljeni kontakt"</string>
-    <string name="remove_contact" msgid="2353580570488923668">"Ukloni"</string>
-    <string name="select_all" msgid="408601760696146245">"Odaberi sve"</string>
-    <string name="call_log_action_video_call" msgid="7565549950343850819">"Videopoziv"</string>
-    <string name="call_log_action_send_message" msgid="6948727362660115554">"Pošalji poruku"</string>
-    <string name="call_log_action_details" msgid="2091370737371449501">"Pojedinosti poziva"</string>
-    <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"Pošalji na..."</string>
-    <string name="call_log_action_call" msgid="682724094251540583">"Nazovi <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_incoming_missed_call" msgid="8292535799379230029">"Propušten poziv: <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_incoming_answered_call" msgid="3920182963103160610">"Prihvaćen poziv: <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_unread_voicemail" msgid="145170985013419170">"Nepročitana govorna pošta kontakta <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_read_voicemail" msgid="5585559881573227732">"Govorna pošta kontakta <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_outgoing_call" msgid="543952487882919924">"Poziv: <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="call_log_via_number" msgid="1340307109806397650">"putem <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> putem <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="description_call_action" msgid="4042796498169106545">"Pozovi <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_video_call_action" msgid="1237090968588659650">"Videopoziv <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
-    <string name="description_voicemail_action" msgid="3290143432403538524">"Slušanje govorne pošte kontakta <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_create_new_contact_action" msgid="1928282350281564130">"Izrada kontakta za <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"Dodavanje kontakta <xliff:g id="NAMEORNUMBER">^1</xliff:g> postojećem kontaktu"</string>
-    <string name="description_details_action" msgid="2061866409737706174">"Pojedinosti o pozivu za kontakt <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="call_log_header_today" msgid="1576119097475845293">"Danas"</string>
-    <string name="call_log_header_yesterday" msgid="5616077776205329563">"Jučer"</string>
-    <string name="call_log_header_other" msgid="4940676886254217644">"Stariji"</string>
-    <string name="voicemail_speaker_on" msgid="3151333608926996668">"Uključivanje zvučnika."</string>
-    <string name="voicemail_speaker_off" msgid="2530064206962034201">"Isključivanje zvučnika."</string>
-    <string name="voicemail_play_start_pause" msgid="3874823480278334664">"Pokretanje ili pauziranje reprodukcije."</string>
-    <string name="display_options_title" msgid="3880091801055797975">"Opcije prikaza"</string>
-    <string name="sounds_and_vibration_title" msgid="3075050000721181384">"Zvukovi i vibracije"</string>
-    <string name="accessibility_settings_title" msgid="3329027650429831820">"Pristupačnost"</string>
-    <string name="ringtone_title" msgid="8377174189894648486">"Melodija zvona telefona"</string>
-    <string name="vibrate_on_ring_title" msgid="631441314790960485">"Vibracija i za pozive"</string>
-    <string name="dtmf_tone_enable_title" msgid="3273762431523939277">"Tonovi tipkovnice"</string>
-    <string name="dtmf_tone_length_title" msgid="534096029202438539">"Trajanje zvuka tipkovnice"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="applicationLabel">Telefon</string>
+  <string name="launcherDialpadActivityLabel">Telefonska tipkovnica</string>
+  <string name="callHistoryIconLabel">Povijest poziva</string>
+  <string name="action_copy_number_text">Kopiraj broj</string>
+  <string name="copy_transcript_text">Kopiraj prijepis</string>
+  <string name="action_edit_number_before_call">Uredi broj prije pozivanja</string>
+  <string name="call_log_delete_all">Izbriši povijest poziva</string>
+  <string name="call_log_trash_voicemail">Izbriši govornu poštu</string>
+  <string name="snackbar_voicemail_deleted">Gov. pošta izbrisana</string>
+  <string name="clearCallLogConfirmation_title">Želite li izbrisati povijest poziva?</string>
+  <string name="clearCallLogConfirmation">Izbrisat će se svi pozivi iz vaše povijesti</string>
+  <string name="clearCallLogProgress_title">Brisanje povijesti poziva…</string>
+  <string name="notification_missedCallTitle">Propušteni poziv</string>
+  <string name="notification_missedWorkCallTitle">Propušten poslovni poziv</string>
+  <string name="notification_missedCallsTitle">Propušteni pozivi</string>
+  <string name="notification_missedCallsMsg">Propušteni pozivi (%d)</string>
+  <string name="notification_missedCall_call_back">Povratni poziv</string>
+  <string name="notification_missedCall_message">Poruka</string>
+  <string name="post_call_notification_message">%1$s: %2$s</string>
+  <string name="notification_voicemail_text_format">Biraj %s</string>
+  <string name="notification_voicemail_no_vm_number">Nepoznat broj govorne pošte</string>
+  <plurals name="notification_voicemail_title">
+    <item quantity="one"> %1$d poruka govorne pošte </item>
+    <item quantity="few"> %1$d poruke govorne pošte </item>
+    <item quantity="other"> %1$d poruka govorne pošte </item>
+  </plurals>
+  <string name="notification_voicemail_callers_list">%1$s, %2$s</string>
+  <string name="notification_new_voicemail_ticker">Nova govorna pošta od kontakta %1$s</string>
+  <string name="voicemail_playback_error">Nije moguće reproducirati govornu poštu</string>
+  <string name="voicemail_fetching_content">Učitavanje govorne pošte…</string>
+  <string name="voicemail_fetching_timout">Govorna pošta nije učitana</string>
+  <string name="call_log_item_count_and_date">(%1$d) %2$s</string>
+  <string name="description_playback_speakerphone">Uključivanje ili isključivanje zvučnika</string>
+  <string name="description_playback_seek">Traženje položaja reprodukcije</string>
+  <string name="action_menu_call_history_description">Povijest poziva</string>
+  <string msgid="2295659037509008453" name="action_menu_overflow_description">Više opcija</string>
+  <string name="action_menu_dialpad_button">tipkovnica</string>
+  <string name="dialer_settings_label">Postavke</string>
+  <string name="simulator_submenu_label">Simulator</string>
+  <string name="new_ui_launcher_shortcut_label">Izrada prečaca novog sučelja</string>
+  <string name="description_entering_bulk_action_mode">Ulazak u način skupne radnje</string>
+  <string name="description_leaving_bulk_action_mode">Napuštanje načina skupne radnje</string>
+  <string name="description_selecting_bulk_action_mode">Odabrano: %1$s</string>
+  <string name="description_unselecting_bulk_action_mode">Poništen odabir: %1$s</string>
+  <string name="description_contact_details">Pojedinosti o kontaktu %1$s</string>
+  <string name="description_spam_contact_details">Podaci za kontakt mogućeg neželjenog pozivatelja %1$s</string>
+  <string name="description_num_calls">Broj poziva: %1$s.</string>
+  <string name="description_video_call">Videopoziv.</string>
+  <string name="description_start_voice_search">Pokretanje glasovnog pretraživanja</string>
+  <string name="voicemail">Govorna pošta</string>
+  <string name="description_cancel_multi_select">Otkaži način skupnih radnji</string>
+  <string name="voicemailMultiSelectDeleteConfirm">Izbriši</string>
+  <string name="voicemailMultiSelectDeleteCancel">Odustani</string>
+  <string name="voicemailMultiSelectActionBarTitle">Odabrano: %1$s</string>
+  <plurals name="delete_voicemails_confirmation_dialog_title">
+    <item quantity="one"><b>Želite li izbrisati ove poruke govorne pošte? </b></item>
+    <item quantity="few"><b>Želite li izbrisati ove poruke govorne pošte? </b></item>
+    <item quantity="other"><b>Želite li izbrisati ove poruke govorne pošte? </b></item>
+  </plurals>
+  <string name="voicemailCallLogToday">@string/call_log_header_today</string>
+  <string name="voicemailCallLogDateTimeFormat">%1$s u %2$s</string>
+  <string name="voicemailDurationFormat">%1$02d.%2$02d</string>
+  <string name="voicemailCallLogDateTimeFormatWithDuration">%1$s • %2$s</string>
+  <string name="voice_search_not_available">Glasovno pretraživanje nije dostupno</string>
+  <string name="dialer_hint_find_contact">Pretraži kontakte</string>
+  <string name="block_number_search_hint">Dodaj broj ili potraži kontakt</string>
+  <string name="call_log_all_empty">Vaša je povijest poziva prazna</string>
+  <string name="call_log_all_empty_action">Uputite poziv</string>
+  <string name="call_log_missed_empty">Nemate propuštene pozive.</string>
+  <string name="call_log_voicemail_empty">Nemate pristiglih poruka govorne pošte.</string>
+  <string name="call_log_activity_title">Povijest poziva</string>
+  <string name="call_log_all_title">Sve</string>
+  <string name="call_log_missed_title">Propušteni</string>
+  <string name="tab_speed_dial">Brzo biranje</string>
+  <string name="tab_history">Povijest poziva</string>
+  <string name="tab_all_contacts">Kontakti</string>
+  <string name="tab_voicemail">Govorna pošta</string>
+  <string name="search_shortcut_call_number">Nazovite %s</string>
+  <string name="search_shortcut_create_new_contact">Izrada novog kontakta</string>
+  <string name="search_shortcut_add_to_contact">Dodaj kontaktu</string>
+  <string name="search_shortcut_send_sms_message">Pošalji SMS</string>
+  <string name="search_shortcut_make_video_call">Uputite videopoziv</string>
+  <string name="search_shortcut_block_number">Blokiraj broj</string>
+  <string name="speed_dial_empty">Još nemate nikog na brzom biranju</string>
+  <string name="speed_dial_empty_add_favorite_action">Dodaj omiljeni kontakt</string>
+  <string name="remove_contact">Ukloni</string>
+  <string name="select_all">Odaberi sve</string>
+  <string name="call_log_action_video_call">Videopoziv</string>
+  <string name="call_log_action_set_up_video">Postavi videopozivanje</string>
+  <string name="call_log_action_invite_video">Pozovi u videopoziv</string>
+  <string name="call_log_action_send_message">Pošalji poruku</string>
+  <string name="call_log_action_details">Pojedinosti poziva</string>
+  <string name="call_log_action_share_voicemail">Pošalji na...</string>
+  <string name="call_log_action_call">Nazovi ^1</string>
+  <string name="description_incoming_missed_call">Propušten poziv: ^1, ^2, ^3, ^4.</string>
+  <string name="description_incoming_answered_call">Prihvaćen poziv: ^1, ^2, ^3, ^4.</string>
+  <string name="description_unread_voicemail">Nepročitana govorna pošta kontakta ^1, ^2, ^3, ^4.</string>
+  <string name="description_read_voicemail">Govorna pošta kontakta ^1, ^2, ^3, ^4.</string>
+  <string name="description_outgoing_call">Poziv: ^1, ^2, ^3, ^4.</string>
+  <string name="call_log_via_number">putem %1$s</string>
+  <string name="call_log_via_number_phone_account">%1$s putem %2$s</string>
+  <string name="description_call_action">Pozovi ^1</string>
+  <string name="description_video_call_action">Videopoziv ^1.</string>
+  <string name="description_voicemail_action">Slušanje govorne pošte kontakta ^1</string>
+  <string name="description_create_new_contact_action">Izrada kontakta za ^1</string>
+  <string name="description_add_to_existing_contact_action">Dodavanje kontakta ^1 postojećem kontaktu</string>
+  <string name="description_details_action">Pojedinosti o pozivu za kontakt ^1</string>
+  <string name="call_log_header_today">Danas</string>
+  <string name="call_log_header_yesterday">Jučer</string>
+  <string name="call_log_header_other">Stariji</string>
+  <string name="voicemail_speaker_on">Uključivanje zvučnika.</string>
+  <string name="voicemail_speaker_off">Isključivanje zvučnika.</string>
+  <string name="voicemail_play_start_pause">Pokretanje ili pauziranje reprodukcije.</string>
+  <string name="display_options_title">Opcije prikaza</string>
+  <string name="sounds_and_vibration_title">Zvukovi i vibracije</string>
+  <string name="accessibility_settings_title">Pristupačnost</string>
+  <string name="ringtone_title">Melodija zvona telefona</string>
+  <string name="vibrate_on_ring_title">Vibracija i za pozive</string>
+  <string name="dtmf_tone_enable_title">Tonovi tipkovnice</string>
+  <string name="dtmf_tone_length_title">Trajanje zvuka tipkovnice</string>
   <string-array name="dtmf_tone_length_entries">
-    <item msgid="3136353015227162823">"Uobičajena"</item>
-    <item msgid="5376841175538523822">"Dugo"</item>
+    <item>Uobičajena</item>
+    <item>Dugo</item>
   </string-array>
-    <string name="respond_via_sms_setting_title" msgid="8008181606657693452">"Brzi odgovori"</string>
-    <string name="call_settings_label" msgid="7824611757200960807">"Pozivi"</string>
-    <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Blokiranje poziva"</string>
-    <string name="voicemail_settings_label" msgid="4594299554519920570">"Govorna pošta"</string>
-    <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Blokiranje poziva privremeno isključeno"</string>
-    <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Blokiranje poziva onemogućeno je jer ste kontaktirali hitne službe s ovog telefona u posljednjih 48 sati. Automatski će se ponovo omogućiti kada prođe 48 sati."</string>
-    <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Uvoz brojeva"</string>
-    <string name="blocked_call_settings_import_description" msgid="1819412052545228965">"Ranije ste na drugim aplikacijama naveli da se neki pozivatelji automatski šalju na govornu poštu."</string>
-    <string name="blocked_call_settings_view_numbers_button" msgid="3332727948554356704">"Prikaži brojeve"</string>
-    <string name="blocked_call_settings_import_button" msgid="7319111700387470727">"Uvezi"</string>
-    <string name="description_blocked_number_list_delete" msgid="2139644216858370740">"Deblokiranje broja"</string>
-    <string name="addBlockedNumber" msgid="3053473735238295551">"Dodaj broj"</string>
-    <string name="block_number_footer_message_vvm" msgid="7955326304033982368">"Pozivi s tih brojeva blokirat će se, a govorna pošta automatski će se brisati."</string>
-    <string name="block_number_footer_message_no_vvm" msgid="1152684139070471665">"Pozivi s tih brojeva blokirat će se, ali pozivatelji će vam moći ostavljati govornu poštu."</string>
-    <string name="block_list" msgid="4701585783411870782">"Blokirani brojevi"</string>
-    <string name="alreadyBlocked" msgid="5483253180532475653">"Broj <xliff:g id="NUMBER">%1$s</xliff:g> već je blokiran."</string>
-    <string name="phone_account_settings_label" msgid="8372485478006965920">"Pozivanje računa"</string>
-    <string name="permission_no_speeddial" msgid="8487215628510596753">"Da biste omogućili brzo biranje, uključite dopuštenje za kontakte."</string>
-    <string name="permission_no_calllog" msgid="4053705651238775784">"Da biste vidjeli zapisnik poziva, uključite dopuštenje za telefon."</string>
-    <string name="permission_no_search" msgid="2424710404207193826">"Da biste pretraživali kontakte, uključite dopuštenja za kontakte."</string>
-    <string name="permission_place_call" msgid="8686908130349369423">"Da biste nazvali nekog, uključite dopuštenje za telefon."</string>
-    <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"Aplikacija Telefon nema dopuštenje za pisanje u postavke sustava."</string>
-    <string name="blocked_number_call_log_label" msgid="4212282846299997693">"Blokirano"</string>
-    <string name="call_log_action_block_report_number" msgid="7302636538668696729">"Blokiraj/prijavi neželjen broj"</string>
-    <string name="call_log_action_block_number" msgid="5048188386501998865">"Blokiraj broj"</string>
-    <string name="call_log_action_remove_spam" msgid="2045319806318398403">"Nije neželjeni broj"</string>
-    <string name="call_log_action_unblock_number" msgid="6100117033288448758">"Deblokiranje broja"</string>
-    <string name="spam_number_call_log_label" msgid="2678431398326811131">"Neželjena pošta"</string>
-    <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> nije online i nije dostupan"</string>
-    <string name="about_phone_label" msgid="582991354677973731">"O aplikaciji"</string>
-    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Prijepis: Google"</string>
-    <string name="voicemail_transcription_in_progress" msgid="2933320969613783210">"Google provodi prijepis..."</string>
-    <string name="voicemail_transcription_failed" msgid="335275303117412706">"Prijepis nije dostupan."</string>
-    <string name="voicemail_transcription_failed_language_not_supported" msgid="4210332591050562553">"Prijepis nije dostupan. Jezik nije podržan."</string>
-    <string name="voicemail_transcription_failed_no_speech" msgid="9093372879697874852">"Prijepis nije dostupan. Govor nije otkriven."</string>
-    <string name="view_conversation" msgid="7895904782094119702">"Prikaži"</string>
-    <string name="ec_data_deleted" msgid="4794880345545827107">"Poziv je izbrisan. U Porukama pregledajte i izbrišite privitke podijeljene tijekom ovog poziva."</string>
-    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"Pozivi su izbrisani. U Porukama pregledajte i izbrišite privitke podijeljene tijekom poziva."</string>
+  <string name="respond_via_sms_setting_title">Brzi odgovori</string>
+  <string name="call_settings_label">Pozivi</string>
+  <string name="manage_blocked_numbers_label">Blokirani brojevi</string>
+  <string name="voicemail_settings_label">Govorna pošta</string>
+  <string name="blocked_numbers_disabled_emergency_header_label">Blokiranje poziva privremeno isključeno</string>
+  <string name="blocked_numbers_disabled_emergency_desc">Blokiranje poziva onemogućeno je jer ste kontaktirali hitne službe s ovog telefona u posljednjih 48 sati. Automatski će se ponovo omogućiti kada prođe 48 sati.</string>
+  <string name="import_send_to_voicemail_numbers_label">Uvoz brojeva</string>
+  <string name="blocked_call_settings_import_description">Ranije ste na drugim aplikacijama naveli da se neki pozivatelji automatski šalju na govornu poštu.</string>
+  <string name="blocked_call_settings_view_numbers_button">Prikaži brojeve</string>
+  <string name="blocked_call_settings_import_button">Uvezi</string>
+  <string name="description_blocked_number_list_delete">Deblokiranje broja</string>
+  <string name="addBlockedNumber">Dodaj broj</string>
+  <string name="block_number_footer_message_vvm">Pozivi s tih brojeva blokirat će se, a govorna pošta automatski će se brisati.</string>
+  <string name="block_number_footer_message_no_vvm">Pozivi s tih brojeva blokirat će se, ali pozivatelji će vam moći ostavljati govornu poštu.</string>
+  <string name="block_list">Blokirani brojevi</string>
+  <string name="alreadyBlocked">Broj %1$s već je blokiran.</string>
+  <string name="phone_account_settings_label">Pozivanje računa</string>
+  <string name="permission_no_speeddial">Da biste omogućili brzo biranje, uključite dopuštenje za kontakte.</string>
+  <string name="permission_no_calllog">Da biste vidjeli zapisnik poziva, uključite dopuštenje za telefon.</string>
+  <string name="permission_no_search">Da biste pretraživali kontakte, uključite dopuštenja za kontakte.</string>
+  <string name="permission_place_call">Da biste nazvali nekog, uključite dopuštenje za telefon.</string>
+  <string name="toast_cannot_write_system_settings">Aplikacija Telefon nema dopuštenje za pisanje u postavke sustava.</string>
+  <string name="blocked_number_call_log_label">Blokirano</string>
+  <string name="call_log_action_block_report_number">Blokiraj/prijavi neželjen broj</string>
+  <string name="call_log_action_block_number">Blokiraj broj</string>
+  <string name="call_log_action_remove_spam">Nije neželjeni broj</string>
+  <string name="call_log_action_unblock_number">Deblokiranje broja</string>
+  <string name="spam_number_call_log_label">Neželjena pošta</string>
+  <string name="call_composer_connection_failed">%1$s nije online i nije dostupan</string>
+  <string name="about_phone_label">O aplikaciji</string>
+  <string name="voicemail_transcription_branding_text">Prijepis: Google</string>
+  <string name="voicemail_transcription_in_progress">Transkripcija...</string>
+  <string name="voicemail_transcription_failed">Prijepis nije dostupan.</string>
+  <string name="voicemail_transcription_failed_language_not_supported">Prijepis nije dostupan. Jezik nije podržan.</string>
+  <string name="voicemail_transcription_failed_no_speech">Prijepis nije dostupan. Govor nije otkriven.</string>
+  <string name="voicemail_donation_promo_title">Želite li pomoći poboljšati točnost prijepisa?</string>
+  <string name="voicemail_donation_promo_content">Google će pregledati ove i buduće poruke govorne pošte pomoću transkripata. Pohranit će se anonimno. Promijenite Postavke u bilo kojem trenutku. %1$s</string>
+  <string name="voicemail_donation_promo_opt_in">Da, u redu</string>
+  <string name="voicemail_donation_promo_opt_out">Ne, hvala</string>
+  <string name="voicemail_transcription_rating">Ocijenite kvalitetu prijepisa</string>
+  <string name="voicemail_transcription_rating_thanks">Zahvaljujemo na povratnim informacijama</string>
+  <string name="description_rating_good">Sviđa mi se</string>
+  <string name="description_rating_bad">Ne sviđa mi se</string>
+  <string name="view_conversation">Prikaži</string>
+  <string name="ec_data_deleted">Poziv je izbrisan. U Porukama pregledajte i izbrišite privitke podijeljene tijekom ovog poziva.</string>
+  <string name="multiple_ec_data_deleted">Pozivi su izbrisani. U Porukama pregledajte i izbrišite privitke podijeljene tijekom poziva.</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-hu/strings.xml b/java/com/android/dialer/app/res/values-hu/strings.xml
index 91dbb86..4ee1ecd 100644
--- a/java/com/android/dialer/app/res/values-hu/strings.xml
+++ b/java/com/android/dialer/app/res/values-hu/strings.xml
@@ -1,179 +1,171 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="applicationLabel" msgid="2202739481132958990">"Telefon"</string>
-    <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"Telefonbillenyűzet"</string>
-    <string name="callHistoryIconLabel" msgid="7493268743411968630">"Híváslista"</string>
-    <string name="action_copy_number_text" msgid="832682558551502319">"Szám másolása"</string>
-    <string name="copy_transcript_text" msgid="937904189017310829">"Átírás másolása"</string>
-    <string name="action_edit_number_before_call" msgid="8017492815878473837">"Szám szerkesztése hívás előtt"</string>
-    <string name="call_log_delete_all" msgid="7852970926906523784">"A híváslista törlése"</string>
-    <string name="call_log_trash_voicemail" msgid="6118493534178533972">"Hangposta törlése"</string>
-    <string name="snackbar_voicemail_deleted" msgid="7463166543725496307">"Hangposta törölve"</string>
-    <string name="snackbar_voicemail_deleted_undo" msgid="6959743982796409941">"VISSZAVONÁS"</string>
-    <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"Törli a híváslistát?"</string>
-    <string name="clearCallLogConfirmation" msgid="6844949465815109166">"Ezzel törli az összes hívást az előzmények közül"</string>
-    <string name="clearCallLogProgress_title" msgid="995004835687361977">"Híváslista törlése…"</string>
-    <string name="notification_missedCallTitle" msgid="8283366068539898486">"Nem fogadott hívás"</string>
-    <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"Nem fogadott munkahelyi hívás"</string>
-    <string name="notification_missedCallsTitle" msgid="3697442015345089802">"Elmulasztott hívások"</string>
-    <string name="notification_missedCallsMsg" msgid="8176217633929018706">"<xliff:g id="NUM_MISSED_CALLS">%d</xliff:g> elmulasztott hívás"</string>
-    <string name="notification_missedCall_call_back" msgid="3875698110051973965">"Visszahívás"</string>
-    <string name="notification_missedCall_message" msgid="5086910028988305964">"Üzenet"</string>
-    <string name="post_call_notification_message" msgid="5417476789860590611">"<xliff:g id="NAME">%1$s</xliff:g>: <xliff:g id="MESSAGE">%2$s</xliff:g>"</string>
-    <string name="notification_voicemail_text_format" msgid="1895667520930252897">"Tárcsázás: <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
-    <string name="notification_voicemail_no_vm_number" msgid="8942821987929495842">"A hangposta száma ismeretlen"</string>
-    <plurals name="notification_voicemail_title" formatted="false" msgid="1551847434476438657">
-      <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> hangpostaüzenet </item>
-      <item quantity="one">Hangpostaüzenet</item>
-    </plurals>
-    <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
-    <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"Új hangüzenet tőle: <xliff:g id="CALLER">%1$s</xliff:g>"</string>
-    <string name="voicemail_playback_error" msgid="4384373852257757295">"Nem sikerült lejátszani a hangpostát"</string>
-    <string name="voicemail_fetching_content" msgid="572320120918636014">"Hangposta betöltése…"</string>
-    <string name="voicemail_fetching_timout" msgid="2128873915839949783">"Nem sikerült betölteni a hangpostát"</string>
-    <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_playback_speakerphone" msgid="4852027754869750227">"Kihangosító be- vagy kikapcsolása"</string>
-    <string name="description_playback_seek" msgid="1340910573254132520">"Lejátszási pozíció módosítása"</string>
-    <string name="action_menu_call_history_description" msgid="8829135306925008546">"Híváslista"</string>
-    <string name="action_menu_overflow_description" msgid="7648679686746517341">"További beállítások"</string>
-    <string name="action_menu_dialpad_button" msgid="1970631633457493180">"billentyűzet"</string>
-    <string name="dialer_settings_label" msgid="4980176284150290175">"Beállítások"</string>
-    <string name="simulator_submenu_label" msgid="186156287346615267">"Szimulátor"</string>
-    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Új felh. felület-parancsikon"</string>
-    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"Belépés tömeges műveleti módba"</string>
-    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"Kilépett a tömeges műveleti módból"</string>
-    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"Kijelölés: <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"Kijelölés megszüntetve: <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_contact_details" msgid="3341280873855253464">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> részletes adatai."</string>
-    <string name="description_spam_contact_details" msgid="5592578752881528368">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> (feltételezett spamhívó) részletes adatai"</string>
-    <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> hívás"</string>
-    <string name="description_video_call" msgid="3738199365585751727">"Videohívás."</string>
-    <string name="description_start_voice_search" msgid="8380022725973015261">"Hangalapú keresés indítása"</string>
-    <string name="voicemail" msgid="8899540969000957954">"Hangposta"</string>
-    <string name="description_cancel_multi_select" msgid="3930475950253360461">"Köteges művelet mód leállítva"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Törlés"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Mégse"</string>
-    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> kiválasztva"</string>
-    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
-      <item quantity="other">"<b>"Törli ezeket a hangpostaüzeneteket? "</b>"</item>
-      <item quantity="one">"<b>"Törli ezt a hangpostaüzenetet? "</b>"</item>
-    </plurals>
-    <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
-    <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g>, <xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
-    <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="voice_search_not_available" msgid="6546240433719732905">"A hangalapú keresés nem érhető el"</string>
-    <string name="dialer_hint_find_contact" msgid="2023214799381149808">"Keresés a névjegyek között"</string>
-    <string name="block_number_search_hint" msgid="5377706079015099416">"Adjon meg egy számot, vagy keressen a névjegyek között"</string>
-    <string name="call_log_all_empty" msgid="3955572868518162004">"A híváslista üres"</string>
-    <string name="call_log_all_empty_action" msgid="852218280136243014">"Hívásindítás"</string>
-    <string name="call_log_missed_empty" msgid="7094936030845062214">"Nincsenek nem fogadott hívások."</string>
-    <string name="call_log_voicemail_empty" msgid="273623903423275178">"Hangpostafiókjában nincsenek beérkezett üzenetek."</string>
-    <string name="call_log_activity_title" msgid="1275242727244945527">"Hívási előzmények"</string>
-    <string name="call_log_all_title" msgid="6042262422192020327">"Összes"</string>
-    <string name="call_log_missed_title" msgid="17254005889268015">"Nem fogadott"</string>
-    <string name="tab_speed_dial" msgid="6616404752227561075">"Gyorshívó"</string>
-    <string name="tab_history" msgid="7420269368689503596">"Híváslista"</string>
-    <string name="tab_all_contacts" msgid="5531733977693943015">"Címtár"</string>
-    <string name="tab_voicemail" msgid="2458548090088316246">"Hangposta"</string>
-    <string name="search_shortcut_call_number" msgid="8847918845036880688">"Hívás: <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"Új névjegy létrehozása"</string>
-    <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"Hozzáadás névjegyhez"</string>
-    <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"SMS küldése"</string>
-    <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"Videohívás kezdeményezése"</string>
-    <string name="search_shortcut_block_number" msgid="4587283230665805776">"Szám tiltása"</string>
-    <string name="speed_dial_empty" msgid="3346406399966039505">"Még semelyik telefonszám sincs gyorshívón"</string>
-    <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"Kedvenc hozzáadása"</string>
-    <string name="remove_contact" msgid="2353580570488923668">"Eltávolítás"</string>
-    <string name="select_all" msgid="408601760696146245">"Az összes kijelölése"</string>
-    <string name="call_log_action_video_call" msgid="7565549950343850819">"Videohívás"</string>
-    <string name="call_log_action_send_message" msgid="6948727362660115554">"Üzenet küldése"</string>
-    <string name="call_log_action_details" msgid="2091370737371449501">"Hívás adatai"</string>
-    <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"Címzett…"</string>
-    <string name="call_log_action_call" msgid="682724094251540583">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> hívása"</string>
-    <string name="description_incoming_missed_call" msgid="8292535799379230029">"Elmulasztott hívás: <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_incoming_answered_call" msgid="3920182963103160610">"Fogadott hívás: <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_unread_voicemail" msgid="145170985013419170">"Olvasatlan hangpostaüzenet a következőtől: <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_read_voicemail" msgid="5585559881573227732">"Hangpostaüzenet a következőtől: <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_outgoing_call" msgid="543952487882919924">"Kimenő hívás: <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="call_log_via_number" msgid="1340307109806397650">"szám: <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, szám: <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="description_call_action" msgid="4042796498169106545">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> hívása"</string>
-    <string name="description_video_call_action" msgid="1237090968588659650">"A következő hívása videokapcsolattal: <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
-    <string name="description_voicemail_action" msgid="3290143432403538524">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> hangpostaüzenetének meghallgatása"</string>
-    <string name="description_create_new_contact_action" msgid="1928282350281564130">"Névjegy létrehozása a következőhöz: <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"A(z) <xliff:g id="NAMEORNUMBER">^1</xliff:g> hozzáadása meglévő névjegyhez"</string>
-    <string name="description_details_action" msgid="2061866409737706174">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> – hívásrészletek"</string>
-    <string name="call_log_header_today" msgid="1576119097475845293">"Ma"</string>
-    <string name="call_log_header_yesterday" msgid="5616077776205329563">"Tegnap"</string>
-    <string name="call_log_header_other" msgid="4940676886254217644">"Korábbi"</string>
-    <string name="voicemail_speaker_on" msgid="3151333608926996668">"Hangszóró bekapcsolása."</string>
-    <string name="voicemail_speaker_off" msgid="2530064206962034201">"Hangszóró kikapcsolása."</string>
-    <string name="voicemail_play_start_pause" msgid="3874823480278334664">"Lejátszás indítása vagy szüneteltetése."</string>
-    <string name="display_options_title" msgid="3880091801055797975">"Megjelenítési beállítások"</string>
-    <string name="sounds_and_vibration_title" msgid="3075050000721181384">"Hangok és rezgés"</string>
-    <string name="accessibility_settings_title" msgid="3329027650429831820">"Kisegítő lehetőségek"</string>
-    <string name="ringtone_title" msgid="8377174189894648486">"Telefon csengőhangja"</string>
-    <string name="vibrate_on_ring_title" msgid="631441314790960485">"A hívásoknál rezegjen is"</string>
-    <string name="dtmf_tone_enable_title" msgid="3273762431523939277">"Billentyűhangok"</string>
-    <string name="dtmf_tone_length_title" msgid="534096029202438539">"Billentyűhang hossza"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="applicationLabel">Telefon</string>
+  <string name="launcherDialpadActivityLabel">Telefonbillenyűzet</string>
+  <string name="callHistoryIconLabel">Híváslista</string>
+  <string name="action_copy_number_text">Szám másolása</string>
+  <string name="copy_transcript_text">Átírás másolása</string>
+  <string name="action_edit_number_before_call">Szám szerkesztése hívás előtt</string>
+  <string name="call_log_delete_all">A híváslista törlése</string>
+  <string name="call_log_trash_voicemail">Hangposta törlése</string>
+  <string name="snackbar_voicemail_deleted">Hangposta törölve</string>
+  <string name="clearCallLogConfirmation_title">Törli a híváslistát?</string>
+  <string name="clearCallLogConfirmation">Ezzel törli az összes hívást az előzmények közül</string>
+  <string name="clearCallLogProgress_title">Híváslista törlése…</string>
+  <string name="notification_missedCallTitle">Nem fogadott hívás</string>
+  <string name="notification_missedWorkCallTitle">Nem fogadott munkahelyi hívás</string>
+  <string name="notification_missedCallsTitle">Elmulasztott hívások</string>
+  <string name="notification_missedCallsMsg">%d elmulasztott hívás</string>
+  <string name="notification_missedCall_call_back">Visszahívás</string>
+  <string name="notification_missedCall_message">Üzenet</string>
+  <string name="post_call_notification_message">%1$s: %2$s</string>
+  <string name="notification_voicemail_text_format">Tárcsázás: %s</string>
+  <string name="notification_voicemail_no_vm_number">A hangposta száma ismeretlen</string>
+  <plurals name="notification_voicemail_title">
+    <item quantity="one">Hangpostaüzenet</item>
+    <item quantity="other"> %1$d hangpostaüzenet </item>
+  </plurals>
+  <string name="notification_voicemail_callers_list">%1$s, %2$s</string>
+  <string name="notification_new_voicemail_ticker">Új hangüzenet tőle: %1$s</string>
+  <string name="voicemail_playback_error">Nem sikerült lejátszani a hangpostát</string>
+  <string name="voicemail_fetching_content">Hangposta betöltése…</string>
+  <string name="voicemail_fetching_timout">Nem sikerült betölteni a hangpostát</string>
+  <string name="call_log_item_count_and_date">(%1$d) %2$s</string>
+  <string name="description_playback_speakerphone">Kihangosító be- vagy kikapcsolása</string>
+  <string name="description_playback_seek">Lejátszási pozíció módosítása</string>
+  <string name="action_menu_call_history_description">Híváslista</string>
+  <string msgid="2295659037509008453" name="action_menu_overflow_description">További beállítások</string>
+  <string name="action_menu_dialpad_button">billentyűzet</string>
+  <string name="dialer_settings_label">Beállítások</string>
+  <string name="simulator_submenu_label">Szimulátor</string>
+  <string name="new_ui_launcher_shortcut_label">Új felh. felület-parancsikon</string>
+  <string name="description_entering_bulk_action_mode">Belépés tömeges műveleti módba</string>
+  <string name="description_leaving_bulk_action_mode">Kilépett a tömeges műveleti módból</string>
+  <string name="description_selecting_bulk_action_mode">Kijelölés: %1$s</string>
+  <string name="description_unselecting_bulk_action_mode">Kijelölés megszüntetve: %1$s</string>
+  <string name="description_contact_details">%1$s részletes adatai.</string>
+  <string name="description_spam_contact_details">%1$s (feltételezett spamhívó) részletes adatai</string>
+  <string name="description_num_calls">%1$s hívás</string>
+  <string name="description_video_call">Videohívás.</string>
+  <string name="description_start_voice_search">Hangalapú keresés indítása</string>
+  <string name="voicemail">Hangposta</string>
+  <string name="description_cancel_multi_select">Köteges művelet mód leállítva</string>
+  <string name="voicemailMultiSelectDeleteConfirm">Törlés</string>
+  <string name="voicemailMultiSelectDeleteCancel">Mégse</string>
+  <string name="voicemailMultiSelectActionBarTitle">%1$s kiválasztva</string>
+  <plurals name="delete_voicemails_confirmation_dialog_title">
+    <item quantity="one"><b>Törli ezt a hangpostaüzenetet? </b></item>
+    <item quantity="other"><b>Törli ezeket a hangpostaüzeneteket? </b></item>
+  </plurals>
+  <string name="voicemailCallLogToday">@string/call_log_header_today</string>
+  <string name="voicemailCallLogDateTimeFormat">%1$s, %2$s</string>
+  <string name="voicemailDurationFormat">%1$02d:%2$02d</string>
+  <string name="voicemailCallLogDateTimeFormatWithDuration">%1$s • %2$s</string>
+  <string name="voice_search_not_available">A hangalapú keresés nem érhető el</string>
+  <string name="dialer_hint_find_contact">Keresés a névjegyek között</string>
+  <string name="block_number_search_hint">Adjon meg egy számot, vagy keressen a névjegyek között</string>
+  <string name="call_log_all_empty">A híváslista üres</string>
+  <string name="call_log_all_empty_action">Hívásindítás</string>
+  <string name="call_log_missed_empty">Nincsenek nem fogadott hívások.</string>
+  <string name="call_log_voicemail_empty">Hangpostafiókjában nincsenek beérkezett üzenetek.</string>
+  <string name="call_log_activity_title">Hívási előzmények</string>
+  <string name="call_log_all_title">Összes</string>
+  <string name="call_log_missed_title">Nem fogadott </string>
+  <string name="tab_speed_dial">Gyorshívó</string>
+  <string name="tab_history">Híváslista</string>
+  <string name="tab_all_contacts">Címtár</string>
+  <string name="tab_voicemail">Hangposta</string>
+  <string name="search_shortcut_call_number">Hívás: %s</string>
+  <string name="search_shortcut_create_new_contact">Új névjegy létrehozása</string>
+  <string name="search_shortcut_add_to_contact">Hozzáadás névjegyhez</string>
+  <string name="search_shortcut_send_sms_message">SMS küldése</string>
+  <string name="search_shortcut_make_video_call">Videohívás kezdeményezése</string>
+  <string name="search_shortcut_block_number">Szám tiltása</string>
+  <string name="speed_dial_empty">Még semelyik telefonszám sincs gyorshívón</string>
+  <string name="speed_dial_empty_add_favorite_action">Kedvenc hozzáadása</string>
+  <string name="remove_contact">Eltávolítás</string>
+  <string name="select_all">Az összes kijelölése</string>
+  <string name="call_log_action_video_call">Videohívás</string>
+  <string name="call_log_action_set_up_video">Videohívás beállítása</string>
+  <string name="call_log_action_invite_video">Meghívás videohívásba</string>
+  <string name="call_log_action_send_message">Üzenet küldése</string>
+  <string name="call_log_action_details">Hívás adatai</string>
+  <string name="call_log_action_share_voicemail">Címzett…</string>
+  <string name="call_log_action_call">^1 hívása</string>
+  <string name="description_incoming_missed_call">Elmulasztott hívás: ^1, ^2, ^3, ^4.</string>
+  <string name="description_incoming_answered_call">Fogadott hívás: ^1, ^2, ^3, ^4.</string>
+  <string name="description_unread_voicemail">Olvasatlan hangpostaüzenet a következőtől: ^1, ^2, ^3, ^4.</string>
+  <string name="description_read_voicemail">Hangpostaüzenet a következőtől: ^1, ^2, ^3, ^4.</string>
+  <string name="description_outgoing_call">Kimenő hívás: ^1, ^2, ^3, ^4.</string>
+  <string name="call_log_via_number">szám: %1$s</string>
+  <string name="call_log_via_number_phone_account">%1$s, szám: %2$s</string>
+  <string name="description_call_action">^1 hívása</string>
+  <string name="description_video_call_action">A következő hívása videokapcsolattal: ^1.</string>
+  <string name="description_voicemail_action">^1 hangpostaüzenetének meghallgatása</string>
+  <string name="description_create_new_contact_action">Névjegy létrehozása a következőhöz: ^1</string>
+  <string name="description_add_to_existing_contact_action">A(z) ^1 hozzáadása meglévő névjegyhez</string>
+  <string name="description_details_action">^1 – hívásrészletek</string>
+  <string name="call_log_header_today">Ma</string>
+  <string name="call_log_header_yesterday">Tegnap</string>
+  <string name="call_log_header_other">Korábbi</string>
+  <string name="voicemail_speaker_on">Hangszóró bekapcsolása.</string>
+  <string name="voicemail_speaker_off">Hangszóró kikapcsolása.</string>
+  <string name="voicemail_play_start_pause">Lejátszás indítása vagy szüneteltetése.</string>
+  <string name="display_options_title">Megjelenítési beállítások</string>
+  <string name="sounds_and_vibration_title">Hangok és rezgés</string>
+  <string name="accessibility_settings_title">Kisegítő lehetőségek</string>
+  <string name="ringtone_title">Telefon csengőhangja</string>
+  <string name="vibrate_on_ring_title">A hívásoknál rezegjen is</string>
+  <string name="dtmf_tone_enable_title">Billentyűhangok</string>
+  <string name="dtmf_tone_length_title">Billentyűhang hossza</string>
   <string-array name="dtmf_tone_length_entries">
-    <item msgid="3136353015227162823">"Normál"</item>
-    <item msgid="5376841175538523822">"Hosszú"</item>
+    <item>Normál</item>
+    <item>Hosszú</item>
   </string-array>
-    <string name="respond_via_sms_setting_title" msgid="8008181606657693452">"Gyors válaszok"</string>
-    <string name="call_settings_label" msgid="7824611757200960807">"Hívások"</string>
-    <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Hívásletiltás"</string>
-    <string name="voicemail_settings_label" msgid="4594299554519920570">"Hangposta"</string>
-    <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Hívástiltás átmenetileg felfüggesztve"</string>
-    <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Felfüggesztettük a hívások tiltását, mert az elmúlt 48 órában tárcsázta a segélyhívót erről a telefonról. A funkciót automatikusan újból engedélyezzük 48 óra elteltével."</string>
-    <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Számok importálása"</string>
-    <string name="blocked_call_settings_import_description" msgid="1819412052545228965">"Más alkalmazásokban korábban beállította, hogy bizonyos személyeket automatikusan a hangpostafiókba irányítsa a rendszer, amikor felhívják Önt."</string>
-    <string name="blocked_call_settings_view_numbers_button" msgid="3332727948554356704">"Számok megtekintése"</string>
-    <string name="blocked_call_settings_import_button" msgid="7319111700387470727">"Importálás"</string>
-    <string name="description_blocked_number_list_delete" msgid="2139644216858370740">"Szám tiltásának feloldása"</string>
-    <string name="addBlockedNumber" msgid="3053473735238295551">"Szám hozzáadása"</string>
-    <string name="block_number_footer_message_vvm" msgid="7955326304033982368">"Az ezekről a számokról érkező hívásokat a rendszer letiltja, továbbá automatikusan törli az onnan érkező hangpostaüzeneteket is."</string>
-    <string name="block_number_footer_message_no_vvm" msgid="1152684139070471665">"Az ezekről a számokról érkező hívásokat letiltja a rendszer, azonban a hívó felek továbbra is hagyhatnak hangpostaüzeneteket."</string>
-    <string name="block_list" msgid="4701585783411870782">"Letiltott számok"</string>
-    <string name="alreadyBlocked" msgid="5483253180532475653">"A következő szám már le van tiltva: <xliff:g id="NUMBER">%1$s</xliff:g>."</string>
-    <string name="phone_account_settings_label" msgid="8372485478006965920">"Telefonos fiókok"</string>
-    <string name="permission_no_speeddial" msgid="8487215628510596753">"Gyorshívás engedélyezéséhez kapcsolja be a Névjegyek engedélyt."</string>
-    <string name="permission_no_calllog" msgid="4053705651238775784">"A hívásnapló megtekintéséhez kapcsolja be a Telefon engedélyt."</string>
-    <string name="permission_no_search" msgid="2424710404207193826">"A névjegyek kereséséhez adja meg a Névjegyek engedélyeket."</string>
-    <string name="permission_place_call" msgid="8686908130349369423">"Hívásindításhoz kapcsolja be a Telefon engedélyt."</string>
-    <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"A Telefon alkalmazásnak nincs engedélye szerkeszteni a rendszerbeállításokat."</string>
-    <string name="blocked_number_call_log_label" msgid="4212282846299997693">"Letiltva"</string>
-    <string name="call_log_action_block_report_number" msgid="7302636538668696729">"Letiltás/spam bejelentése"</string>
-    <string name="call_log_action_block_number" msgid="5048188386501998865">"Szám tiltása"</string>
-    <string name="call_log_action_remove_spam" msgid="2045319806318398403">"Nem spam"</string>
-    <string name="call_log_action_unblock_number" msgid="6100117033288448758">"Szám tiltásának feloldása"</string>
-    <string name="spam_number_call_log_label" msgid="2678431398326811131">"Spam"</string>
-    <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> offline, és nem érhető el."</string>
-    <string name="about_phone_label" msgid="582991354677973731">"Névjegy"</string>
-    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Az átirat készítője a Google"</string>
-    <string name="voicemail_transcription_in_progress" msgid="2933320969613783210">"A Google átiratot készít…"</string>
-    <string name="voicemail_transcription_failed" msgid="335275303117412706">"Sikertelen átírás."</string>
-    <string name="voicemail_transcription_failed_language_not_supported" msgid="4210332591050562553">"Sikertelen átírás. A nyelv nem támogatott."</string>
-    <string name="voicemail_transcription_failed_no_speech" msgid="9093372879697874852">"Sikertelen átírás. Nem észlelhető beszéd."</string>
-    <string name="view_conversation" msgid="7895904782094119702">"Megtekintés"</string>
-    <string name="ec_data_deleted" msgid="4794880345545827107">"Hívás törölve. A hívás során megosztott mellékleteket az Üzenetek alkalmazásban tekintheti meg és törölheti."</string>
-    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"Hívások törölve. A hívások során megosztott mellékleteket az Üzenetek alkalmazásban tekintheti meg és törölheti."</string>
+  <string name="respond_via_sms_setting_title">Gyors válaszok</string>
+  <string name="call_settings_label">Hívások</string>
+  <string name="manage_blocked_numbers_label">Letiltott számok</string>
+  <string name="voicemail_settings_label">Hangposta</string>
+  <string name="blocked_numbers_disabled_emergency_header_label">Hívástiltás átmenetileg felfüggesztve</string>
+  <string name="blocked_numbers_disabled_emergency_desc">Felfüggesztettük a hívások tiltását, mert az elmúlt 48 órában tárcsázta a segélyhívót erről a telefonról. A funkciót automatikusan újból engedélyezzük 48 óra elteltével.</string>
+  <string name="import_send_to_voicemail_numbers_label">Számok importálása</string>
+  <string name="blocked_call_settings_import_description">Más alkalmazásokban korábban beállította, hogy bizonyos személyeket automatikusan a hangpostafiókba irányítsa a rendszer, amikor felhívják Önt.</string>
+  <string name="blocked_call_settings_view_numbers_button">Számok megtekintése</string>
+  <string name="blocked_call_settings_import_button">Importálás</string>
+  <string name="description_blocked_number_list_delete">Szám tiltásának feloldása</string>
+  <string name="addBlockedNumber">Szám hozzáadása</string>
+  <string name="block_number_footer_message_vvm">Az ezekről a számokról érkező hívásokat a rendszer letiltja, továbbá automatikusan törli az onnan érkező hangpostaüzeneteket is.</string>
+  <string name="block_number_footer_message_no_vvm">Az ezekről a számokról érkező hívásokat letiltja a rendszer, azonban a hívó felek továbbra is hagyhatnak hangpostaüzeneteket.</string>
+  <string name="block_list">Letiltott számok</string>
+  <string name="alreadyBlocked">A következő szám már le van tiltva: %1$s.</string>
+  <string name="phone_account_settings_label">Telefonos fiókok</string>
+  <string name="permission_no_speeddial">Gyorshívás engedélyezéséhez kapcsolja be a Névjegyek engedélyt.</string>
+  <string name="permission_no_calllog">A hívásnapló megtekintéséhez kapcsolja be a Telefon engedélyt.</string>
+  <string name="permission_no_search">A névjegyek kereséséhez adja meg a Névjegyek engedélyeket.</string>
+  <string name="permission_place_call">Hívásindításhoz kapcsolja be a Telefon engedélyt.</string>
+  <string name="toast_cannot_write_system_settings">A Telefon alkalmazásnak nincs engedélye szerkeszteni a rendszerbeállításokat.</string>
+  <string name="blocked_number_call_log_label">Letiltva</string>
+  <string name="call_log_action_block_report_number">Letiltás/spam bejelentése</string>
+  <string name="call_log_action_block_number">Szám tiltása</string>
+  <string name="call_log_action_remove_spam">Nem spam</string>
+  <string name="call_log_action_unblock_number">Szám tiltásának feloldása</string>
+  <string name="spam_number_call_log_label">Spam</string>
+  <string name="call_composer_connection_failed">%1$s offline, és nem érhető el.</string>
+  <string name="about_phone_label">Névjegy</string>
+  <string name="voicemail_transcription_branding_text">Az átirat készítője a Google</string>
+  <string name="voicemail_transcription_in_progress">Átírás…</string>
+  <string name="voicemail_transcription_failed">Sikertelen átírás.</string>
+  <string name="voicemail_transcription_failed_language_not_supported">Sikertelen átírás. A nyelv nem támogatott.</string>
+  <string name="voicemail_transcription_failed_no_speech">Sikertelen átírás. Nem észlelhető beszéd.</string>
+  <string name="voicemail_donation_promo_title">Segítene az átiratok pontosságának javításában?</string>
+  <string name="voicemail_donation_promo_content">Engedélyezze a Google számára, hogy ellenőrizze ezt és a jövőbeli hangpostaüzenetek átiratát. Az üzeneteket anonim módon tároljuk. A beállításoknál ezt bármikor módosíthatja. %1$s</string>
+  <string name="voicemail_donation_promo_opt_in">Igen, csatlakozom</string>
+  <string name="voicemail_donation_promo_opt_out">Nem</string>
+  <string name="voicemail_transcription_rating">Átirat minőségének értékelése</string>
+  <string name="voicemail_transcription_rating_thanks">Köszönjük a visszajelzését.</string>
+  <string name="description_rating_good">Tetszik</string>
+  <string name="description_rating_bad">Nem tetszik</string>
+  <string name="view_conversation">Megtekintés</string>
+  <string name="ec_data_deleted">Hívás törölve. A hívás során megosztott mellékleteket az Üzenetek alkalmazásban tekintheti meg és törölheti.</string>
+  <string name="multiple_ec_data_deleted">Hívások törölve. A hívások során megosztott mellékleteket az Üzenetek alkalmazásban tekintheti meg és törölheti.</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-hy/strings.xml b/java/com/android/dialer/app/res/values-hy/strings.xml
index 1110c30..9deb0d9 100644
--- a/java/com/android/dialer/app/res/values-hy/strings.xml
+++ b/java/com/android/dialer/app/res/values-hy/strings.xml
@@ -1,179 +1,171 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="applicationLabel" msgid="2202739481132958990">"Հեռախոս"</string>
-    <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"Հեռախոսի ստեղնաշար"</string>
-    <string name="callHistoryIconLabel" msgid="7493268743411968630">"Զանգերի պատմություն"</string>
-    <string name="action_copy_number_text" msgid="832682558551502319">"Պատճենել համարը"</string>
-    <string name="copy_transcript_text" msgid="937904189017310829">"Պատճենել տառադարձությունը"</string>
-    <string name="action_edit_number_before_call" msgid="8017492815878473837">"Փոփոխել համարը զանգելուց առաջ"</string>
-    <string name="call_log_delete_all" msgid="7852970926906523784">"Մաքրել զանգերի պատմությունը"</string>
-    <string name="call_log_trash_voicemail" msgid="6118493534178533972">"Ջնջել ձայնային փոստը"</string>
-    <string name="snackbar_voicemail_deleted" msgid="7463166543725496307">"Ձայնային փոստը ջնջվեց"</string>
-    <string name="snackbar_voicemail_deleted_undo" msgid="6959743982796409941">"ՀԵՏԱՐԿԵԼ"</string>
-    <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"Մաքրե՞լ զանգերի պատմությունը:"</string>
-    <string name="clearCallLogConfirmation" msgid="6844949465815109166">"Այս գործողությունը ամբողջովին կջնջի զանգերի պատմությունը"</string>
-    <string name="clearCallLogProgress_title" msgid="995004835687361977">"Զանգերի պատմության մաքրում…"</string>
-    <string name="notification_missedCallTitle" msgid="8283366068539898486">"Բաց թողնված զանգ"</string>
-    <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"Բաց թողնված աշխատանքային զանգ"</string>
-    <string name="notification_missedCallsTitle" msgid="3697442015345089802">"Բաց թողնված զանգեր"</string>
-    <string name="notification_missedCallsMsg" msgid="8176217633929018706">"<xliff:g id="NUM_MISSED_CALLS">%d</xliff:g> բաց թողնված զանգ"</string>
-    <string name="notification_missedCall_call_back" msgid="3875698110051973965">"Հետ զանգել"</string>
-    <string name="notification_missedCall_message" msgid="5086910028988305964">"Հաղորդագրություն"</string>
-    <string name="post_call_notification_message" msgid="5417476789860590611">"<xliff:g id="NAME">%1$s</xliff:g>՝ <xliff:g id="MESSAGE">%2$s</xliff:g>"</string>
-    <string name="notification_voicemail_text_format" msgid="1895667520930252897">"Զանգել <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g> համարին"</string>
-    <string name="notification_voicemail_no_vm_number" msgid="8942821987929495842">"Ձայնային փոստի համարն անհայտ է"</string>
-    <plurals name="notification_voicemail_title" formatted="false" msgid="1551847434476438657">
-      <item quantity="one"> <xliff:g id="COUNT">%1$d</xliff:g> ձայնային փոստ </item>
-      <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> ձայնային փոստ </item>
-    </plurals>
-    <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
-    <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"Նոր ձայնային փոստ <xliff:g id="CALLER">%1$s</xliff:g>-ից"</string>
-    <string name="voicemail_playback_error" msgid="4384373852257757295">"Հաղորդագրությունը չհաջողվեց նվագարկել"</string>
-    <string name="voicemail_fetching_content" msgid="572320120918636014">"Ձայնային հաղորդագրության բեռնում…"</string>
-    <string name="voicemail_fetching_timout" msgid="2128873915839949783">"Հաղորդագրությունը չհաջողվեց բեռնել"</string>
-    <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_playback_speakerphone" msgid="4852027754869750227">"Միացնել կամ անջատել բարձրախոսը"</string>
-    <string name="description_playback_seek" msgid="1340910573254132520">"Փնտրել նվագարկման դիրքը"</string>
-    <string name="action_menu_call_history_description" msgid="8829135306925008546">"Զանգերի պատմություն"</string>
-    <string name="action_menu_overflow_description" msgid="7648679686746517341">"Այլ ընտրանքներ"</string>
-    <string name="action_menu_dialpad_button" msgid="1970631633457493180">"ստեղնաշար"</string>
-    <string name="dialer_settings_label" msgid="4980176284150290175">"Կարգավորումներ"</string>
-    <string name="simulator_submenu_label" msgid="186156287346615267">"Նմանակիչ"</string>
-    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Ստեղծել միջերեսի նոր դյուրանցում"</string>
-    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"Դուք մտել եք զանգվածային գործողության ռեժիմ"</string>
-    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"Դուք դուրս եկաք զանգվածային գործողությունների ռեժիմից"</string>
-    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"Ընտրվեց՝ <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"Ապընտրվեց՝ <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_contact_details" msgid="3341280873855253464">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g>-ի կոնտակտային տվյալները"</string>
-    <string name="description_spam_contact_details" msgid="5592578752881528368">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g>-ի կոնտակտային տվյալներ (լցոնի կասկած)"</string>
-    <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> զանգ:"</string>
-    <string name="description_video_call" msgid="3738199365585751727">"Տեսազանգ"</string>
-    <string name="description_start_voice_search" msgid="8380022725973015261">"Սկսկեք ձայնային որոնումը"</string>
-    <string name="voicemail" msgid="8899540969000957954">"Ձայնային փոստ"</string>
-    <string name="description_cancel_multi_select" msgid="3930475950253360461">"Չեղարկել փաթեթային գործողությունների ռեժիմը"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Ջնջել"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Չեղարկել"</string>
-    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"Ընտրվել է՝ <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
-      <item quantity="one">"<b>"Delete these voicemails? "</b>"</item>
-      <item quantity="other">"<b>"Ջնջե՞լ այս ձայնային հաղորդագրությունները "</b>"</item>
-    </plurals>
-    <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
-    <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g>-ին, ժամը <xliff:g id="TIME">%2$s</xliff:g>-ին"</string>
-    <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
-    <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="voice_search_not_available" msgid="6546240433719732905">"Ձայնային որոնումը հասանելի չէ"</string>
-    <string name="dialer_hint_find_contact" msgid="2023214799381149808">"Կոնտակտների որոնում"</string>
-    <string name="block_number_search_hint" msgid="5377706079015099416">"Ավելացրեք համար/որոնեք կոնտակտներ"</string>
-    <string name="call_log_all_empty" msgid="3955572868518162004">"Զանգերի մատյանը դատարկ է"</string>
-    <string name="call_log_all_empty_action" msgid="852218280136243014">"Զանգել"</string>
-    <string name="call_log_missed_empty" msgid="7094936030845062214">"Բաց թողնված զանգեր չունեք:"</string>
-    <string name="call_log_voicemail_empty" msgid="273623903423275178">"Ձայնային փոստի մուտքի արկղը դատարկ է:"</string>
-    <string name="call_log_activity_title" msgid="1275242727244945527">"Զանգերի պատմությունը"</string>
-    <string name="call_log_all_title" msgid="6042262422192020327">"Բոլորը"</string>
-    <string name="call_log_missed_title" msgid="17254005889268015">"Բաց թողնված"</string>
-    <string name="tab_speed_dial" msgid="6616404752227561075">"Արագ համարարկում"</string>
-    <string name="tab_history" msgid="7420269368689503596">"Զանգերի պատմությունը"</string>
-    <string name="tab_all_contacts" msgid="5531733977693943015">"Կոնտակտներ"</string>
-    <string name="tab_voicemail" msgid="2458548090088316246">"Ձայնային փոստ"</string>
-    <string name="search_shortcut_call_number" msgid="8847918845036880688">"Զանգել <xliff:g id="NUMBER">%s</xliff:g>-ին"</string>
-    <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"Ստեղծել նոր կոնտակտ"</string>
-    <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"Ավելացնել կոնտակտին"</string>
-    <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"Ուղարկել SMS"</string>
-    <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"Տեսազանգ սկսել"</string>
-    <string name="search_shortcut_block_number" msgid="4587283230665805776">"Արգելափակել համարը"</string>
-    <string name="speed_dial_empty" msgid="3346406399966039505">"Արագ համարահավաքման ցանկը դատարկ է"</string>
-    <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"Ավելացնել կոնտակտ"</string>
-    <string name="remove_contact" msgid="2353580570488923668">"Հեռացնել"</string>
-    <string name="select_all" msgid="408601760696146245">"Ընտրել բոլորը"</string>
-    <string name="call_log_action_video_call" msgid="7565549950343850819">"Տեսազանգ"</string>
-    <string name="call_log_action_send_message" msgid="6948727362660115554">"Ուղարկել հաղորդագրություն"</string>
-    <string name="call_log_action_details" msgid="2091370737371449501">"Զանգի մանրամասները"</string>
-    <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"Ուղարկել…"</string>
-    <string name="call_log_action_call" msgid="682724094251540583">"Զանգել <xliff:g id="NAMEORNUMBER">^1</xliff:g>-ին"</string>
-    <string name="description_incoming_missed_call" msgid="8292535799379230029">"Բաց է թողնվել զանգ <xliff:g id="NAMEORNUMBER">^1</xliff:g> կոնտակտից, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>:"</string>
-    <string name="description_incoming_answered_call" msgid="3920182963103160610">"Ընդունվել է զանգ <xliff:g id="NAMEORNUMBER">^1</xliff:g> կոնտակտից, <xliff:g id="TYPEORLOCATION">^2</xliff:g> , <xliff:g id="TIMEOFCALL">^3</xliff:g> , <xliff:g id="PHONEACCOUNT">^4</xliff:g>:"</string>
-    <string name="description_unread_voicemail" msgid="145170985013419170">"Չկարդացված ձայնային փոստի հաղորդագրություն <xliff:g id="NAMEORNUMBER">^1</xliff:g>-ից, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>:"</string>
-    <string name="description_read_voicemail" msgid="5585559881573227732">"Ձայնային փոստի հաղորդագրություն <xliff:g id="NAMEORNUMBER">^1</xliff:g>-ից, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>:"</string>
-    <string name="description_outgoing_call" msgid="543952487882919924">"Զանգ <xliff:g id="NAMEORNUMBER">^1</xliff:g> կոնտակտին, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>:"</string>
-    <string name="call_log_via_number" msgid="1340307109806397650">"<xliff:g id="NUMBER">%1$s</xliff:g> համարի միջոցով"</string>
-    <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g>-ին <xliff:g id="NUMBER">%2$s</xliff:g> համարի միջոցով"</string>
-    <string name="description_call_action" msgid="4042796498169106545">"Զանգել <xliff:g id="NAMEORNUMBER">^1</xliff:g>-ին"</string>
-    <string name="description_video_call_action" msgid="1237090968588659650">"Տեսազանգ <xliff:g id="NAMEORNUMBER">^1</xliff:g> կոնտակտին:"</string>
-    <string name="description_voicemail_action" msgid="3290143432403538524">"Լսել ձայնային փոստը <xliff:g id="NAMEORNUMBER">^1</xliff:g>-ից"</string>
-    <string name="description_create_new_contact_action" msgid="1928282350281564130">"Ստեղծել <xliff:g id="NAMEORNUMBER">^1</xliff:g> կոնտակտը"</string>
-    <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"Ավելացնել <xliff:g id="NAMEORNUMBER">^1</xliff:g>-ը առկա կոնտակտին"</string>
-    <string name="description_details_action" msgid="2061866409737706174">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> զանգի մասին տվյալներ"</string>
-    <string name="call_log_header_today" msgid="1576119097475845293">"Այսօր"</string>
-    <string name="call_log_header_yesterday" msgid="5616077776205329563">"Երեկ"</string>
-    <string name="call_log_header_other" msgid="4940676886254217644">"Ավելի հին"</string>
-    <string name="voicemail_speaker_on" msgid="3151333608926996668">"Միացնել խոսափողը:"</string>
-    <string name="voicemail_speaker_off" msgid="2530064206962034201">"Անջատել բարձրախոսը:"</string>
-    <string name="voicemail_play_start_pause" msgid="3874823480278334664">"Սկսել կամ դադարեցնել նվագարկումը:"</string>
-    <string name="display_options_title" msgid="3880091801055797975">"Ցուցադրման ընտրանքներ"</string>
-    <string name="sounds_and_vibration_title" msgid="3075050000721181384">"Ձայներ և թրթռոց"</string>
-    <string name="accessibility_settings_title" msgid="3329027650429831820">"Մատչելիություն"</string>
-    <string name="ringtone_title" msgid="8377174189894648486">"Հեռախոսի զանգերանգ"</string>
-    <string name="vibrate_on_ring_title" msgid="631441314790960485">"Թրթռոց զանգերի ժամանակ"</string>
-    <string name="dtmf_tone_enable_title" msgid="3273762431523939277">"Ստեղնաշարի ձայներանգներ"</string>
-    <string name="dtmf_tone_length_title" msgid="534096029202438539">"Ստեղնաշարի ձայներանգի երկարությունը"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="applicationLabel">Հեռախոս</string>
+  <string name="launcherDialpadActivityLabel">Հեռախոսի ստեղնաշար</string>
+  <string name="callHistoryIconLabel">Զանգերի պատմություն</string>
+  <string name="action_copy_number_text">Պատճենել համարը</string>
+  <string name="copy_transcript_text">Պատճենել տառադարձությունը</string>
+  <string name="action_edit_number_before_call">Փոփոխել համարը զանգելուց առաջ</string>
+  <string name="call_log_delete_all">Մաքրել զանգերի պատմությունը</string>
+  <string name="call_log_trash_voicemail">Ջնջել ձայնային փոստը</string>
+  <string name="snackbar_voicemail_deleted">Ձայնային փոստը ջնջվեց</string>
+  <string name="clearCallLogConfirmation_title">Մաքրե՞լ զանգերի պատմությունը:</string>
+  <string name="clearCallLogConfirmation">Այս գործողությունը ամբողջովին կջնջի զանգերի պատմությունը</string>
+  <string name="clearCallLogProgress_title">Զանգերի պատմության մաքրում…</string>
+  <string name="notification_missedCallTitle">Բաց թողնված զանգ</string>
+  <string name="notification_missedWorkCallTitle">Բաց թողնված աշխատանքային զանգ</string>
+  <string name="notification_missedCallsTitle">Բաց թողնված զանգեր</string>
+  <string name="notification_missedCallsMsg">%d բաց թողնված զանգ</string>
+  <string name="notification_missedCall_call_back">Հետ զանգել</string>
+  <string name="notification_missedCall_message">Հաղորդագրություն</string>
+  <string name="post_call_notification_message">%1$s՝ %2$s</string>
+  <string name="notification_voicemail_text_format">Զանգել %s համարին</string>
+  <string name="notification_voicemail_no_vm_number">Ձայնային փոստի համարն անհայտ է</string>
+  <plurals name="notification_voicemail_title">
+    <item quantity="one"> %1$d ձայնային փոստ </item>
+    <item quantity="other"> %1$d ձայնային փոստ </item>
+  </plurals>
+  <string name="notification_voicemail_callers_list">%1$s, %2$s</string>
+  <string name="notification_new_voicemail_ticker">Նոր ձայնային փոստ %1$s-ից</string>
+  <string name="voicemail_playback_error">Հաղորդագրությունը չհաջողվեց նվագարկել</string>
+  <string name="voicemail_fetching_content">Ձայնային հաղորդագրության բեռնում…</string>
+  <string name="voicemail_fetching_timout">Հաղորդագրությունը չհաջողվեց բեռնել</string>
+  <string name="call_log_item_count_and_date">(%1$d) %2$s</string>
+  <string name="description_playback_speakerphone">Միացնել կամ անջատել բարձրախոսը</string>
+  <string name="description_playback_seek">Փնտրել նվագարկման դիրքը</string>
+  <string name="action_menu_call_history_description">Զանգերի պատմություն</string>
+  <string msgid="2295659037509008453" name="action_menu_overflow_description">Այլ ընտրանքներ</string>
+  <string name="action_menu_dialpad_button">ստեղնաշար</string>
+  <string name="dialer_settings_label">Կարգավորումներ</string>
+  <string name="simulator_submenu_label">Նմանակիչ</string>
+  <string name="new_ui_launcher_shortcut_label">Ստեղծել միջերեսի նոր դյուրանցում</string>
+  <string name="description_entering_bulk_action_mode">Դուք մտել եք զանգվածային գործողության ռեժիմ</string>
+  <string name="description_leaving_bulk_action_mode">Դուք դուրս եկաք զանգվածային գործողությունների ռեժիմից</string>
+  <string name="description_selecting_bulk_action_mode">Ընտրվեց՝ %1$s</string>
+  <string name="description_unselecting_bulk_action_mode">Ապընտրվեց՝ %1$s</string>
+  <string name="description_contact_details">%1$s-ի կոնտակտային տվյալները</string>
+  <string name="description_spam_contact_details">%1$s-ի կոնտակտային տվյալներ (սպամի կասկած)</string>
+  <string name="description_num_calls">%1$s զանգ:</string>
+  <string name="description_video_call">Տեսազանգ</string>
+  <string name="description_start_voice_search">Սկսկեք ձայնային որոնումը</string>
+  <string name="voicemail">Ձայնային փոստ</string>
+  <string name="description_cancel_multi_select">Չեղարկել փաթեթային գործողությունների ռեժիմը</string>
+  <string name="voicemailMultiSelectDeleteConfirm">Ջնջել</string>
+  <string name="voicemailMultiSelectDeleteCancel">Չեղարկել</string>
+  <string name="voicemailMultiSelectActionBarTitle">Ընտրվել է՝ %1$s</string>
+  <plurals name="delete_voicemails_confirmation_dialog_title">
+    <item quantity="one"><b>Delete these voicemails? </b></item>
+    <item quantity="other"><b>Ջնջե՞լ այս ձայնային հաղորդագրությունները </b></item>
+  </plurals>
+  <string name="voicemailCallLogToday">@string/call_log_header_today</string>
+  <string name="voicemailCallLogDateTimeFormat">%1$s-ին, ժամը %2$s-ին</string>
+  <string name="voicemailDurationFormat">%1$02d:%2$02d</string>
+  <string name="voicemailCallLogDateTimeFormatWithDuration">%1$s • %2$s</string>
+  <string name="voice_search_not_available">Ձայնային որոնումը հասանելի չէ</string>
+  <string name="dialer_hint_find_contact">Կոնտակտների որոնում</string>
+  <string name="block_number_search_hint">Ավելացրեք համար/որոնեք կոնտակտներ</string>
+  <string name="call_log_all_empty">Զանգերի մատյանը դատարկ է</string>
+  <string name="call_log_all_empty_action">Զանգել</string>
+  <string name="call_log_missed_empty">Բաց թողնված զանգեր չունեք:</string>
+  <string name="call_log_voicemail_empty">Ձայնային փոստի մուտքի արկղը դատարկ է:</string>
+  <string name="call_log_activity_title">Զանգերի պատմությունը</string>
+  <string name="call_log_all_title">Բոլորը</string>
+  <string name="call_log_missed_title">Բաց թողնված</string>
+  <string name="tab_speed_dial">Արագ համարարկում</string>
+  <string name="tab_history">Զանգերի պատմությունը</string>
+  <string name="tab_all_contacts">Կոնտակտներ</string>
+  <string name="tab_voicemail">Ձայնային փոստ</string>
+  <string name="search_shortcut_call_number">Զանգել %s-ին</string>
+  <string name="search_shortcut_create_new_contact">Ստեղծել նոր կոնտակտ</string>
+  <string name="search_shortcut_add_to_contact">Ավելացնել կոնտակտին</string>
+  <string name="search_shortcut_send_sms_message">Ուղարկել SMS</string>
+  <string name="search_shortcut_make_video_call">Տեսազանգ սկսել</string>
+  <string name="search_shortcut_block_number">Արգելափակել համարը</string>
+  <string name="speed_dial_empty">Արագ համարահավաքման ցանկը դատարկ է</string>
+  <string name="speed_dial_empty_add_favorite_action">Ավելացնել կոնտակտ</string>
+  <string name="remove_contact">Հեռացնել</string>
+  <string name="select_all">Ընտրել բոլորը</string>
+  <string name="call_log_action_video_call">Տեսազանգ</string>
+  <string name="call_log_action_set_up_video">Կարգավորել տեսազանգը</string>
+  <string name="call_log_action_invite_video">Հրավիրել տեսազանգի</string>
+  <string name="call_log_action_send_message">Ուղարկել հաղորդագրություն</string>
+  <string name="call_log_action_details">Զանգի մանրամասները</string>
+  <string name="call_log_action_share_voicemail">Ուղարկել…</string>
+  <string name="call_log_action_call">Զանգել ^1-ին</string>
+  <string name="description_incoming_missed_call">Բաց է թողնվել զանգ ^1 կոնտակտից, ^2, ^3, ^4:</string>
+  <string name="description_incoming_answered_call">Ընդունվել է զանգ ^1 կոնտակտից, ^2 , ^3 , ^4:</string>
+  <string name="description_unread_voicemail">Չկարդացված ձայնային փոստի հաղորդագրություն ^1-ից, ^2, ^3, ^4:</string>
+  <string name="description_read_voicemail">Ձայնային փոստի հաղորդագրություն ^1-ից, ^2, ^3, ^4:</string>
+  <string name="description_outgoing_call">Զանգ ^1 կոնտակտին, ^2, ^3, ^4:</string>
+  <string name="call_log_via_number">%1$s համարի միջոցով</string>
+  <string name="call_log_via_number_phone_account">%1$s-ին %2$s համարի միջոցով</string>
+  <string name="description_call_action">Զանգել ^1-ին</string>
+  <string name="description_video_call_action">Տեսազանգ ^1 կոնտակտին:</string>
+  <string name="description_voicemail_action">Լսել ձայնային փոստը ^1-ից</string>
+  <string name="description_create_new_contact_action">Ստեղծել ^1 կոնտակտը</string>
+  <string name="description_add_to_existing_contact_action">Ավելացնել ^1-ը առկա կոնտակտին</string>
+  <string name="description_details_action">^1 զանգի մասին տվյալներ</string>
+  <string name="call_log_header_today">Այսօր</string>
+  <string name="call_log_header_yesterday">Երեկ</string>
+  <string name="call_log_header_other">Ավելի հին</string>
+  <string name="voicemail_speaker_on">Միացնել խոսափողը:</string>
+  <string name="voicemail_speaker_off">Անջատել բարձրախոսը:</string>
+  <string name="voicemail_play_start_pause">Սկսել կամ դադարեցնել նվագարկումը:</string>
+  <string name="display_options_title">Ցուցադրման ընտրանքներ</string>
+  <string name="sounds_and_vibration_title">Ձայներ և թրթռոց</string>
+  <string name="accessibility_settings_title">Հատուկ գործառույթներ</string>
+  <string name="ringtone_title">Հեռախոսի զանգերանգ</string>
+  <string name="vibrate_on_ring_title">Թրթռոց զանգերի ժամանակ</string>
+  <string name="dtmf_tone_enable_title">Ստեղնաշարի ձայներանգներ</string>
+  <string name="dtmf_tone_length_title">Ստեղնաշարի ձայներանգի երկարությունը</string>
   <string-array name="dtmf_tone_length_entries">
-    <item msgid="3136353015227162823">"Սովորական"</item>
-    <item msgid="5376841175538523822">"Երկար"</item>
+    <item>Սովորական</item>
+    <item>Երկար</item>
   </string-array>
-    <string name="respond_via_sms_setting_title" msgid="8008181606657693452">"Արագ պատասխաններ"</string>
-    <string name="call_settings_label" msgid="7824611757200960807">"Զանգեր"</string>
-    <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Զանգերի արգելափակում"</string>
-    <string name="voicemail_settings_label" msgid="4594299554519920570">"Ձայնային փոստ"</string>
-    <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Զանգերի արգելափակումը կասեցվել է"</string>
-    <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Զանգերի արգելափակումը կասեցվել է, քանի որ վերջին 48 ժամվա ընթացքում դուք այս հեռախոսից զանգել եք արտակարգ իրավիճակների ծառայություններին: 48 ժամ տևողությամբ ժամանակահատվածի ավարտից հետո այն ավտոմատ կերպով կվերամիացվի:"</string>
-    <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Ներմուծել համարները"</string>
-    <string name="blocked_call_settings_import_description" msgid="1819412052545228965">"Համաձայն ձեր նախկին կարգավորումների՝ որոշ զանգողների պետք է ինքնաշխատորեն ուղարկվի ձայնային փոստ այլ հավելվածների միջոցով:"</string>
-    <string name="blocked_call_settings_view_numbers_button" msgid="3332727948554356704">"Կոնտակտների թիվը"</string>
-    <string name="blocked_call_settings_import_button" msgid="7319111700387470727">"Ներմուծում"</string>
-    <string name="description_blocked_number_list_delete" msgid="2139644216858370740">"Արգելաբացել համարը"</string>
-    <string name="addBlockedNumber" msgid="3053473735238295551">"Ավելացնել համար"</string>
-    <string name="block_number_footer_message_vvm" msgid="7955326304033982368">"Այս համարներից զանգերը կարգելափակվեն, իսկ ձայնային փոստի հաղորդագրություններն ավտոմատ կերպով կջնջվեն:"</string>
-    <string name="block_number_footer_message_no_vvm" msgid="1152684139070471665">"Այս համարներից զանգերը կարգելափակվեն, սակայն նրանք կկարողանան ձեզ համար ձայնային փոստի հաղորդագրություններ թողնել:"</string>
-    <string name="block_list" msgid="4701585783411870782">"Արգելափակված համարներ"</string>
-    <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g> համարն արդեն արգելափակված է:"</string>
-    <string name="phone_account_settings_label" msgid="8372485478006965920">"Հաշիվներ զանգերի համար"</string>
-    <string name="permission_no_speeddial" msgid="8487215628510596753">"Արագ համարահավաքը թույլատրելու համար միացրեք Կոնտակտների թույլտվությունը:"</string>
-    <string name="permission_no_calllog" msgid="4053705651238775784">"Ձեր զանգերի մատյանը տեսնելու համար միացրեք Հեռախոսի թույլտվությունը:"</string>
-    <string name="permission_no_search" msgid="2424710404207193826">"Կոնտակտները որոնելու համար միացրեք Կոնտակտների թույլտվությունները:"</string>
-    <string name="permission_place_call" msgid="8686908130349369423">"Զանգ կատարելու համար միացրեք Հեռախոսի թույլտվությունը:"</string>
-    <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"Հեռախոս հավելվածը համակարգի կարգավորումները գրելու թույլտվություն չունի:"</string>
-    <string name="blocked_number_call_log_label" msgid="4212282846299997693">"Արգելափակված է"</string>
-    <string name="call_log_action_block_report_number" msgid="7302636538668696729">"Արգելափակել/Նշել որպես լցոն"</string>
-    <string name="call_log_action_block_number" msgid="5048188386501998865">"Արգելափակել համարը"</string>
-    <string name="call_log_action_remove_spam" msgid="2045319806318398403">"Լցոն չէ"</string>
-    <string name="call_log_action_unblock_number" msgid="6100117033288448758">"Արգելաբացել համարը"</string>
-    <string name="spam_number_call_log_label" msgid="2678431398326811131">"Լցոն"</string>
-    <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> օգտատերը միացած չէ ցանցին և անհասանելի է"</string>
-    <string name="about_phone_label" msgid="582991354677973731">"Հավելվածի մասին"</string>
-    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Տառադրումն ըստ Google-ի"</string>
-    <string name="voicemail_transcription_in_progress" msgid="2933320969613783210">"Տառադրում…"</string>
-    <string name="voicemail_transcription_failed" msgid="335275303117412706">"Տառադրումն անհասանելի է:"</string>
-    <string name="voicemail_transcription_failed_language_not_supported" msgid="4210332591050562553">"Տառադրումն անհասանելի է: Լեզուն չի աջակցվում:"</string>
-    <string name="voicemail_transcription_failed_no_speech" msgid="9093372879697874852">"Տառադրումն անհասանելի է: Խոսք չի գտնվել:"</string>
-    <string name="view_conversation" msgid="7895904782094119702">"Դիտել"</string>
-    <string name="ec_data_deleted" msgid="4794880345545827107">"Զանգը ջնջվեց: Դիտեք և ջնջեք զանգի ընթացքում ստացված կցորդները Messages հավելվածում:"</string>
-    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"Զանգերը ջնջվեցին: Դիտեք և ջնջեք զանգերի ընթացքում ստացված կցորդները Messages հավելվածում:"</string>
+  <string name="respond_via_sms_setting_title">Արագ պատասխաններ</string>
+  <string name="call_settings_label">Զանգեր</string>
+  <string name="manage_blocked_numbers_label">Արգելափակված համարներ</string>
+  <string name="voicemail_settings_label">Ձայնային փոստ</string>
+  <string name="blocked_numbers_disabled_emergency_header_label">Զանգերի արգելափակումը կասեցվել է</string>
+  <string name="blocked_numbers_disabled_emergency_desc">Զանգերի արգելափակումը կասեցվել է, քանի որ վերջին 48 ժամվա ընթացքում դուք այս հեռախոսից զանգել եք արտակարգ իրավիճակների ծառայություններին: 48 ժամ տևողությամբ ժամանակահատվածի ավարտից հետո այն ավտոմատ կերպով կվերամիացվի:</string>
+  <string name="import_send_to_voicemail_numbers_label">Ներմուծել համարները</string>
+  <string name="blocked_call_settings_import_description">Համաձայն ձեր նախկին կարգավորումների՝ որոշ զանգողների պետք է ավտոմատ ուղարկվի ձայնային փոստ այլ հավելվածների միջոցով:</string>
+  <string name="blocked_call_settings_view_numbers_button">Կոնտակտների թիվը</string>
+  <string name="blocked_call_settings_import_button">Ներմուծում</string>
+  <string name="description_blocked_number_list_delete">Արգելաբացել համարը</string>
+  <string name="addBlockedNumber">Ավելացնել համար</string>
+  <string name="block_number_footer_message_vvm">Այս համարներից զանգերը կարգելափակվեն, իսկ ձայնային փոստի հաղորդագրություններն ավտոմատ կերպով կջնջվեն:</string>
+  <string name="block_number_footer_message_no_vvm">Այս համարներից զանգերը կարգելափակվեն, սակայն նրանք կկարողանան ձեզ համար ձայնային փոստի հաղորդագրություններ թողնել:</string>
+  <string name="block_list">Արգելափակված համարներ</string>
+  <string name="alreadyBlocked">%1$s համարն արդեն արգելափակված է:</string>
+  <string name="phone_account_settings_label">Հաշիվներ զանգերի համար</string>
+  <string name="permission_no_speeddial">Արագ համարահավաքը թույլատրելու համար միացրեք Կոնտակտների թույլտվությունը:</string>
+  <string name="permission_no_calllog">Ձեր զանգերի մատյանը տեսնելու համար միացրեք Հեռախոսի թույլտվությունը:</string>
+  <string name="permission_no_search">Կոնտակտները որոնելու համար միացրեք Կոնտակտների թույլտվությունները:</string>
+  <string name="permission_place_call">Զանգ կատարելու համար միացրեք Հեռախոսի թույլտվությունը:</string>
+  <string name="toast_cannot_write_system_settings">Հեռախոս հավելվածը համակարգի կարգավորումները գրելու թույլտվություն չունի:</string>
+  <string name="blocked_number_call_log_label">Արգելափակված է</string>
+  <string name="call_log_action_block_report_number">Արգելափակել/Նշել որպես սպամ</string>
+  <string name="call_log_action_block_number">Արգելափակել համարը</string>
+  <string name="call_log_action_remove_spam">Սպամ չէ</string>
+  <string name="call_log_action_unblock_number">Արգելաբացել համարը</string>
+  <string name="spam_number_call_log_label">Սպամ</string>
+  <string name="call_composer_connection_failed">%1$s օգտատերը միացած չէ ցանցին և անհասանելի է</string>
+  <string name="about_phone_label">Հավելվածի մասին</string>
+  <string name="voicemail_transcription_branding_text">Տառադրումն ըստ Google-ի</string>
+  <string name="voicemail_transcription_in_progress">Տառադրում…</string>
+  <string name="voicemail_transcription_failed">Տառադրումն անհասանելի է:</string>
+  <string name="voicemail_transcription_failed_language_not_supported">Տառադրումն անհասանելի է: Լեզուն չի աջակցվում:</string>
+  <string name="voicemail_transcription_failed_no_speech">Տառադրումն անհասանելի է: Խոսք չի գտնվել:</string>
+  <string name="voicemail_donation_promo_title">Կօգնե՞ք բարելավել տառադրման ճշգրտությունը</string>
+  <string name="voicemail_donation_promo_content">Թույլ տվեք Google-ին ստուգել տառադրում ունեցող այս և հետագա ձայնային հաղորդագրությունները: Դրանք կպահվեն անանուն կերպով: Ցանկացած պահի կարող եք փոխել կարգավորումները: %1$s</string>
+  <string name="voicemail_donation_promo_opt_in">Այո</string>
+  <string name="voicemail_donation_promo_opt_out">Ոչ</string>
+  <string name="voicemail_transcription_rating">Գնահատեք տառադրման որակը</string>
+  <string name="voicemail_transcription_rating_thanks">Շնորհակալ ենք արձագանքի համար</string>
+  <string name="description_rating_good">Հավանել</string>
+  <string name="description_rating_bad">Չհավանել</string>
+  <string name="view_conversation">Դիտել</string>
+  <string name="ec_data_deleted">Զանգը ջնջվեց: Դիտեք և ջնջեք զանգի ընթացքում ստացված կցորդները Messages հավելվածում:</string>
+  <string name="multiple_ec_data_deleted">Զանգերը ջնջվեցին: Դիտեք և ջնջեք զանգերի ընթացքում ստացված կցորդները Messages հավելվածում:</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-in/strings.xml b/java/com/android/dialer/app/res/values-in/strings.xml
index 7f99677..669c43a 100644
--- a/java/com/android/dialer/app/res/values-in/strings.xml
+++ b/java/com/android/dialer/app/res/values-in/strings.xml
@@ -1,179 +1,171 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="applicationLabel" msgid="2202739481132958990">"Telepon"</string>
-    <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"Keypad Ponsel"</string>
-    <string name="callHistoryIconLabel" msgid="7493268743411968630">"Riwayat panggilan"</string>
-    <string name="action_copy_number_text" msgid="832682558551502319">"Salin nomor"</string>
-    <string name="copy_transcript_text" msgid="937904189017310829">"Salin transkripsi"</string>
-    <string name="action_edit_number_before_call" msgid="8017492815878473837">"Edit nomor sebelum memanggil"</string>
-    <string name="call_log_delete_all" msgid="7852970926906523784">"Hapus riwayat panggilan"</string>
-    <string name="call_log_trash_voicemail" msgid="6118493534178533972">"Hapus pesan suara"</string>
-    <string name="snackbar_voicemail_deleted" msgid="7463166543725496307">"Pesan suara dihapus"</string>
-    <string name="snackbar_voicemail_deleted_undo" msgid="6959743982796409941">"URUNGKAN"</string>
-    <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"Hapus riwayat panggilan?"</string>
-    <string name="clearCallLogConfirmation" msgid="6844949465815109166">"Tindakan ini akan menghapus semua panggilan telepon dari riwayat"</string>
-    <string name="clearCallLogProgress_title" msgid="995004835687361977">"Menghapus riwayat panggilan..."</string>
-    <string name="notification_missedCallTitle" msgid="8283366068539898486">"Panggilan tak terjawab"</string>
-    <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"Panggilan tak terjawab di telepon kerja"</string>
-    <string name="notification_missedCallsTitle" msgid="3697442015345089802">"Panggilan tak terjawab"</string>
-    <string name="notification_missedCallsMsg" msgid="8176217633929018706">"<xliff:g id="NUM_MISSED_CALLS">%d</xliff:g> panggilan tak terjawab"</string>
-    <string name="notification_missedCall_call_back" msgid="3875698110051973965">"Telepon"</string>
-    <string name="notification_missedCall_message" msgid="5086910028988305964">"Pesan"</string>
-    <string name="post_call_notification_message" msgid="5417476789860590611">"<xliff:g id="NAME">%1$s</xliff:g>: <xliff:g id="MESSAGE">%2$s</xliff:g>"</string>
-    <string name="notification_voicemail_text_format" msgid="1895667520930252897">"Telepon <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
-    <string name="notification_voicemail_no_vm_number" msgid="8942821987929495842">"Nomor pesan suara tidak dikenal"</string>
-    <plurals name="notification_voicemail_title" formatted="false" msgid="1551847434476438657">
-      <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> Pesan suara </item>
-      <item quantity="one">Pesan suara</item>
-    </plurals>
-    <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
-    <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"Pesan suara baru dari <xliff:g id="CALLER">%1$s</xliff:g>"</string>
-    <string name="voicemail_playback_error" msgid="4384373852257757295">"Tidak dapat memutar pesan suara"</string>
-    <string name="voicemail_fetching_content" msgid="572320120918636014">"Memuat pesan suara..."</string>
-    <string name="voicemail_fetching_timout" msgid="2128873915839949783">"Tidak dapat memuat pesan suara"</string>
-    <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_playback_speakerphone" msgid="4852027754869750227">"Mengaktifkan/menonaktifkan pengeras suara ponsel"</string>
-    <string name="description_playback_seek" msgid="1340910573254132520">"Mencari posisi pemutaran"</string>
-    <string name="action_menu_call_history_description" msgid="8829135306925008546">"Riwayat panggilan"</string>
-    <string name="action_menu_overflow_description" msgid="7648679686746517341">"Opsi lainnya"</string>
-    <string name="action_menu_dialpad_button" msgid="1970631633457493180">"keypad"</string>
-    <string name="dialer_settings_label" msgid="4980176284150290175">"Setelan"</string>
-    <string name="simulator_submenu_label" msgid="186156287346615267">"Simulator"</string>
-    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Buat Pintasan UI Baru"</string>
-    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"Masuk ke mode tindakan massal"</string>
-    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"Keluar dari mode tindakan massal"</string>
-    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> dipilih"</string>
-    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> tidak dipilih"</string>
-    <string name="description_contact_details" msgid="3341280873855253464">"Detail kontak untuk <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_spam_contact_details" msgid="5592578752881528368">"Detail kontak untuk penelepon spam yang dicurigai <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> panggilan."</string>
-    <string name="description_video_call" msgid="3738199365585751727">"Video call."</string>
-    <string name="description_start_voice_search" msgid="8380022725973015261">"Memulai penelusuran suara"</string>
-    <string name="voicemail" msgid="8899540969000957954">"Kotak Pesan"</string>
-    <string name="description_cancel_multi_select" msgid="3930475950253360461">"Membatalkan mode tindakan kelompok"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Hapus"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Batal"</string>
-    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> dipilih"</string>
-    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
-      <item quantity="other">"<b>"Hapus pesan suara ini? "</b>"</item>
-      <item quantity="one">"<b>"Hapus pesan suara ini? "</b>"</item>
-    </plurals>
-    <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
-    <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> pukul <xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>.<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
-    <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="voice_search_not_available" msgid="6546240433719732905">"Penelusuran suara tidak tersedia"</string>
-    <string name="dialer_hint_find_contact" msgid="2023214799381149808">"Telusuri kontak"</string>
-    <string name="block_number_search_hint" msgid="5377706079015099416">"Tambahkan nomor atau telusuri kontak"</string>
-    <string name="call_log_all_empty" msgid="3955572868518162004">"Riwayat panggilan kosong"</string>
-    <string name="call_log_all_empty_action" msgid="852218280136243014">"Lakukan panggilan telepon"</string>
-    <string name="call_log_missed_empty" msgid="7094936030845062214">"Tidak ada panggilan yang tidak terjawab."</string>
-    <string name="call_log_voicemail_empty" msgid="273623903423275178">"Kotak masuk pesan suara kosong."</string>
-    <string name="call_log_activity_title" msgid="1275242727244945527">"Riwayat Panggilan"</string>
-    <string name="call_log_all_title" msgid="6042262422192020327">"Semua"</string>
-    <string name="call_log_missed_title" msgid="17254005889268015">"Tak Dijawab"</string>
-    <string name="tab_speed_dial" msgid="6616404752227561075">"Panggilan cepat"</string>
-    <string name="tab_history" msgid="7420269368689503596">"Riwayat Panggilan"</string>
-    <string name="tab_all_contacts" msgid="5531733977693943015">"Kontak"</string>
-    <string name="tab_voicemail" msgid="2458548090088316246">"Pesan suara"</string>
-    <string name="search_shortcut_call_number" msgid="8847918845036880688">"Telepon <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"Buat kontak baru"</string>
-    <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"Tambahkan ke kontak"</string>
-    <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"Kirim SMS"</string>
-    <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"Lakukan video call"</string>
-    <string name="search_shortcut_block_number" msgid="4587283230665805776">"Blokir nomor"</string>
-    <string name="speed_dial_empty" msgid="3346406399966039505">"Daftar panggilan cepat masih kosong"</string>
-    <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"Tambahkan favorit"</string>
-    <string name="remove_contact" msgid="2353580570488923668">"Hapus"</string>
-    <string name="select_all" msgid="408601760696146245">"Pilih semua"</string>
-    <string name="call_log_action_video_call" msgid="7565549950343850819">"Panggilan video"</string>
-    <string name="call_log_action_send_message" msgid="6948727362660115554">"Kirim pesan"</string>
-    <string name="call_log_action_details" msgid="2091370737371449501">"Detail panggilan"</string>
-    <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"Kirim ke…"</string>
-    <string name="call_log_action_call" msgid="682724094251540583">"Telepon <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_incoming_missed_call" msgid="8292535799379230029">"Panggilan tak terjawab dari <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_incoming_answered_call" msgid="3920182963103160610">"Panggilan terjawab dari <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_unread_voicemail" msgid="145170985013419170">"Pesan suara yang belum dibaca dari <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_read_voicemail" msgid="5585559881573227732">"Pesan suara dari <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_outgoing_call" msgid="543952487882919924">"Panggilan ke <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="call_log_via_number" msgid="1340307109806397650">"melalui <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> melalui <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="description_call_action" msgid="4042796498169106545">"Telepon <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_video_call_action" msgid="1237090968588659650">"Lakukan panggilan video ke <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
-    <string name="description_voicemail_action" msgid="3290143432403538524">"Dengarkan kotak pesan dari <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_create_new_contact_action" msgid="1928282350281564130">"Buat kontak untuk <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"Tambahkan <xliff:g id="NAMEORNUMBER">^1</xliff:g> ke akun yang ada"</string>
-    <string name="description_details_action" msgid="2061866409737706174">"Detail panggilan telepon untuk <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="call_log_header_today" msgid="1576119097475845293">"Hari ini"</string>
-    <string name="call_log_header_yesterday" msgid="5616077776205329563">"Kemarin"</string>
-    <string name="call_log_header_other" msgid="4940676886254217644">"Lebih lama"</string>
-    <string name="voicemail_speaker_on" msgid="3151333608926996668">"Aktifkan pengeras suara."</string>
-    <string name="voicemail_speaker_off" msgid="2530064206962034201">"Nonaktifkan pengeras suara."</string>
-    <string name="voicemail_play_start_pause" msgid="3874823480278334664">"Mulai atau jeda pemutaran."</string>
-    <string name="display_options_title" msgid="3880091801055797975">"Opsi tampilan"</string>
-    <string name="sounds_and_vibration_title" msgid="3075050000721181384">"Suara dan getaran"</string>
-    <string name="accessibility_settings_title" msgid="3329027650429831820">"Aksesibilitas"</string>
-    <string name="ringtone_title" msgid="8377174189894648486">"Nada dering ponsel"</string>
-    <string name="vibrate_on_ring_title" msgid="631441314790960485">"Getarkan juga untuk panggilan"</string>
-    <string name="dtmf_tone_enable_title" msgid="3273762431523939277">"Nada keypad"</string>
-    <string name="dtmf_tone_length_title" msgid="534096029202438539">"Panjang nada keypad"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="applicationLabel">Telepon</string>
+  <string name="launcherDialpadActivityLabel">Keypad Ponsel</string>
+  <string name="callHistoryIconLabel">Histori panggilan</string>
+  <string name="action_copy_number_text">Salin nomor</string>
+  <string name="copy_transcript_text">Salin transkripsi</string>
+  <string name="action_edit_number_before_call">Edit nomor sebelum memanggil</string>
+  <string name="call_log_delete_all">Hapus histori panggilan</string>
+  <string name="call_log_trash_voicemail">Hapus pesan suara</string>
+  <string name="snackbar_voicemail_deleted">Pesan suara dihapus</string>
+  <string name="clearCallLogConfirmation_title">Hapus histori panggilan?</string>
+  <string name="clearCallLogConfirmation">Tindakan ini akan menghapus semua panggilan telepon dari histori</string>
+  <string name="clearCallLogProgress_title">Menghapus histori panggilan...</string>
+  <string name="notification_missedCallTitle">Panggilan tak terjawab</string>
+  <string name="notification_missedWorkCallTitle">Panggilan tak terjawab di telepon kerja</string>
+  <string name="notification_missedCallsTitle">Panggilan tak terjawab</string>
+  <string name="notification_missedCallsMsg">%d panggilan tak terjawab</string>
+  <string name="notification_missedCall_call_back">Telepon</string>
+  <string name="notification_missedCall_message">Pesan</string>
+  <string name="post_call_notification_message">%1$s: %2$s</string>
+  <string name="notification_voicemail_text_format">Telepon %s</string>
+  <string name="notification_voicemail_no_vm_number">Nomor pesan suara tidak dikenal</string>
+  <plurals name="notification_voicemail_title">
+    <item quantity="one">Pesan suara</item>
+    <item quantity="other"> %1$d Pesan suara </item>
+  </plurals>
+  <string name="notification_voicemail_callers_list">%1$s, %2$s</string>
+  <string name="notification_new_voicemail_ticker">Pesan suara baru dari %1$s</string>
+  <string name="voicemail_playback_error">Tidak dapat memutar pesan suara</string>
+  <string name="voicemail_fetching_content">Memuat pesan suara...</string>
+  <string name="voicemail_fetching_timout">Tidak dapat memuat pesan suara</string>
+  <string name="call_log_item_count_and_date">(%1$d) %2$s</string>
+  <string name="description_playback_speakerphone">Mengaktifkan/menonaktifkan pengeras suara ponsel</string>
+  <string name="description_playback_seek">Mencari posisi pemutaran</string>
+  <string name="action_menu_call_history_description">Histori panggilan</string>
+  <string msgid="2295659037509008453" name="action_menu_overflow_description">Opsi lainnya</string>
+  <string name="action_menu_dialpad_button">keypad</string>
+  <string name="dialer_settings_label">Setelan</string>
+  <string name="simulator_submenu_label">Simulator</string>
+  <string name="new_ui_launcher_shortcut_label">Buat Pintasan UI Baru</string>
+  <string name="description_entering_bulk_action_mode">Masuk ke mode tindakan massal</string>
+  <string name="description_leaving_bulk_action_mode">Keluar dari mode tindakan massal</string>
+  <string name="description_selecting_bulk_action_mode">%1$s dipilih</string>
+  <string name="description_unselecting_bulk_action_mode">%1$s tidak dipilih</string>
+  <string name="description_contact_details">Detail kontak untuk %1$s</string>
+  <string name="description_spam_contact_details">Detail kontak untuk penelepon spam yang dicurigai %1$s</string>
+  <string name="description_num_calls">%1$s panggilan.</string>
+  <string name="description_video_call">Video call.</string>
+  <string name="description_start_voice_search">Memulai penelusuran suara</string>
+  <string name="voicemail">Kotak Pesan</string>
+  <string name="description_cancel_multi_select">Membatalkan mode tindakan kelompok</string>
+  <string name="voicemailMultiSelectDeleteConfirm">Hapus</string>
+  <string name="voicemailMultiSelectDeleteCancel">Batal</string>
+  <string name="voicemailMultiSelectActionBarTitle">%1$s dipilih</string>
+  <plurals name="delete_voicemails_confirmation_dialog_title">
+    <item quantity="one"><b>Hapus pesan suara ini? </b></item>
+    <item quantity="other"><b>Hapus pesan suara ini? </b></item>
+  </plurals>
+  <string name="voicemailCallLogToday">@string/call_log_header_today</string>
+  <string name="voicemailCallLogDateTimeFormat">%1$s pukul %2$s</string>
+  <string name="voicemailDurationFormat">%1$02d.%2$02d</string>
+  <string name="voicemailCallLogDateTimeFormatWithDuration">%1$s • %2$s</string>
+  <string name="voice_search_not_available">Penelusuran suara tidak tersedia</string>
+  <string name="dialer_hint_find_contact">Telusuri kontak</string>
+  <string name="block_number_search_hint">Tambahkan nomor atau telusuri kontak</string>
+  <string name="call_log_all_empty">Histori panggilan kosong</string>
+  <string name="call_log_all_empty_action">Lakukan panggilan telepon</string>
+  <string name="call_log_missed_empty">Tidak ada panggilan yang tidak terjawab.</string>
+  <string name="call_log_voicemail_empty">Kotak masuk pesan suara kosong.</string>
+  <string name="call_log_activity_title">Histori Panggilan</string>
+  <string name="call_log_all_title">Semua</string>
+  <string name="call_log_missed_title">Tak Dijawab</string>
+  <string name="tab_speed_dial">Panggilan cepat</string>
+  <string name="tab_history">Histori Panggilan</string>
+  <string name="tab_all_contacts">Kontak</string>
+  <string name="tab_voicemail">Pesan suara</string>
+  <string name="search_shortcut_call_number">Telepon %s</string>
+  <string name="search_shortcut_create_new_contact">Buat kontak baru</string>
+  <string name="search_shortcut_add_to_contact">Tambahkan ke kontak</string>
+  <string name="search_shortcut_send_sms_message">Kirim SMS</string>
+  <string name="search_shortcut_make_video_call">Lakukan video call</string>
+  <string name="search_shortcut_block_number">Blokir nomor</string>
+  <string name="speed_dial_empty">Daftar panggilan cepat masih kosong</string>
+  <string name="speed_dial_empty_add_favorite_action">Tambahkan favorit</string>
+  <string name="remove_contact">Hapus</string>
+  <string name="select_all">Pilih semua</string>
+  <string name="call_log_action_video_call">Panggilan video</string>
+  <string name="call_log_action_set_up_video">Siapkan video call</string>
+  <string name="call_log_action_invite_video">Undang ke video call</string>
+  <string name="call_log_action_send_message">Kirim pesan</string>
+  <string name="call_log_action_details">Detail panggilan</string>
+  <string name="call_log_action_share_voicemail">Kirim ke…</string>
+  <string name="call_log_action_call">Telepon ^1</string>
+  <string name="description_incoming_missed_call">Panggilan tak terjawab dari ^1, ^2, ^3, ^4.</string>
+  <string name="description_incoming_answered_call">Panggilan terjawab dari ^1, ^2, ^3, ^4.</string>
+  <string name="description_unread_voicemail">Pesan suara yang belum dibaca dari ^1, ^2, ^3, ^4.</string>
+  <string name="description_read_voicemail">Pesan suara dari ^1, ^2, ^3, ^4.</string>
+  <string name="description_outgoing_call">Panggilan ke ^1, ^2, ^3, ^4.</string>
+  <string name="call_log_via_number">melalui %1$s</string>
+  <string name="call_log_via_number_phone_account">%1$s melalui %2$s</string>
+  <string name="description_call_action">Telepon ^1</string>
+  <string name="description_video_call_action">Lakukan panggilan video ke ^1.</string>
+  <string name="description_voicemail_action">Dengarkan kotak pesan dari ^1</string>
+  <string name="description_create_new_contact_action">Buat kontak untuk ^1</string>
+  <string name="description_add_to_existing_contact_action">Tambahkan ^1 ke akun yang ada</string>
+  <string name="description_details_action">Detail panggilan telepon untuk ^1</string>
+  <string name="call_log_header_today">Hari ini</string>
+  <string name="call_log_header_yesterday">Kemarin</string>
+  <string name="call_log_header_other">Lebih lama</string>
+  <string name="voicemail_speaker_on">Aktifkan pengeras suara.</string>
+  <string name="voicemail_speaker_off">Nonaktifkan pengeras suara.</string>
+  <string name="voicemail_play_start_pause">Mulai atau jeda pemutaran.</string>
+  <string name="display_options_title">Opsi tampilan</string>
+  <string name="sounds_and_vibration_title">Suara dan getaran</string>
+  <string name="accessibility_settings_title">Aksesibilitas</string>
+  <string name="ringtone_title">Nada dering ponsel</string>
+  <string name="vibrate_on_ring_title">Getarkan juga untuk panggilan</string>
+  <string name="dtmf_tone_enable_title">Nada keypad</string>
+  <string name="dtmf_tone_length_title">Panjang nada keypad</string>
   <string-array name="dtmf_tone_length_entries">
-    <item msgid="3136353015227162823">"Normal"</item>
-    <item msgid="5376841175538523822">"Jauh"</item>
+    <item>Normal</item>
+    <item>Jauh</item>
   </string-array>
-    <string name="respond_via_sms_setting_title" msgid="8008181606657693452">"Respons cepat"</string>
-    <string name="call_settings_label" msgid="7824611757200960807">"Panggilan telepon"</string>
-    <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Pemblokiran panggilan telepon"</string>
-    <string name="voicemail_settings_label" msgid="4594299554519920570">"Pesan Suara"</string>
-    <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Blokir panggilan dinonaktifkan sementara"</string>
-    <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Pemblokiran panggilan telepon telah dinonaktifkan karena Anda menghubungi layanan darurat dari telepon ini dalam 48 jam terakhir. Akan diaktifkan kembali secara otomatis setelah masa 48 jam berakhir."</string>
-    <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Impor nomor"</string>
-    <string name="blocked_call_settings_import_description" msgid="1819412052545228965">"Anda sebelumnya menandai beberapa penelepon agar dialihkan secara otomatis ke pesan suara melalui aplikasi lain."</string>
-    <string name="blocked_call_settings_view_numbers_button" msgid="3332727948554356704">"Lihat Nomor"</string>
-    <string name="blocked_call_settings_import_button" msgid="7319111700387470727">"Impor"</string>
-    <string name="description_blocked_number_list_delete" msgid="2139644216858370740">"Bebaskan nomor"</string>
-    <string name="addBlockedNumber" msgid="3053473735238295551">"Tambahkan nomor"</string>
-    <string name="block_number_footer_message_vvm" msgid="7955326304033982368">"Panggilan telepon dari nomor ini akan diblokir dan pesan suara akan dihapus secara otomatis."</string>
-    <string name="block_number_footer_message_no_vvm" msgid="1152684139070471665">"Panggilan telepon dari nomor ini akan diblokir, tetapi penelepon mungkin masih dapat meninggalkan pesan suara."</string>
-    <string name="block_list" msgid="4701585783411870782">"Nomor yang diblokir"</string>
-    <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g> sudah diblokir."</string>
-    <string name="phone_account_settings_label" msgid="8372485478006965920">"Akun panggilan"</string>
-    <string name="permission_no_speeddial" msgid="8487215628510596753">"Untuk mengaktifkan panggilan cepat, aktifkan izin Kontak."</string>
-    <string name="permission_no_calllog" msgid="4053705651238775784">"Untuk melihat log panggilan, aktifkan izin Telepon."</string>
-    <string name="permission_no_search" msgid="2424710404207193826">"Untuk menelusuri kontak, aktifkan izin Kontak."</string>
-    <string name="permission_place_call" msgid="8686908130349369423">"Untuk melakukan panggilan, aktifkan izin Telepon."</string>
-    <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"Aplikasi telepon tidak memiliki izin untuk menulis ke setelan sistem."</string>
-    <string name="blocked_number_call_log_label" msgid="4212282846299997693">"Diblokir"</string>
-    <string name="call_log_action_block_report_number" msgid="7302636538668696729">"Blokir/laporkan spam"</string>
-    <string name="call_log_action_block_number" msgid="5048188386501998865">"Blokir nomor"</string>
-    <string name="call_log_action_remove_spam" msgid="2045319806318398403">"Bukan spam"</string>
-    <string name="call_log_action_unblock_number" msgid="6100117033288448758">"Bebaskan nomor"</string>
-    <string name="spam_number_call_log_label" msgid="2678431398326811131">"Spam"</string>
-    <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> sedang offline dan tidak dapat dijangkau"</string>
-    <string name="about_phone_label" msgid="582991354677973731">"Tentang"</string>
-    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Ditranskripsi oleh Google"</string>
-    <string name="voicemail_transcription_in_progress" msgid="2933320969613783210">"Google sedang membuat transkripsi…"</string>
-    <string name="voicemail_transcription_failed" msgid="335275303117412706">"Transkrip tidak tersedia."</string>
-    <string name="voicemail_transcription_failed_language_not_supported" msgid="4210332591050562553">"Transkrip tidak tersedia. Bahasa tidak didukung."</string>
-    <string name="voicemail_transcription_failed_no_speech" msgid="9093372879697874852">"Transkrip tidak tersedia. Tidak ada ucapan yang terdeteksi."</string>
-    <string name="view_conversation" msgid="7895904782094119702">"Tampilkan"</string>
-    <string name="ec_data_deleted" msgid="4794880345545827107">"Panggilan dihapus. Lihat dan hapus lampiran yang dibagikan selama panggilan ini di Message."</string>
-    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"Panggilan dihapus. Lihat dan hapus lampiran yang dibagikan selama panggilan ini di Message."</string>
+  <string name="respond_via_sms_setting_title">Respons cepat</string>
+  <string name="call_settings_label">Panggilan telepon</string>
+  <string name="manage_blocked_numbers_label">Nomor yang diblokir</string>
+  <string name="voicemail_settings_label">Pesan Suara</string>
+  <string name="blocked_numbers_disabled_emergency_header_label">Blokir panggilan dinonaktifkan sementara</string>
+  <string name="blocked_numbers_disabled_emergency_desc">Pemblokiran panggilan telepon telah dinonaktifkan karena Anda menghubungi layanan darurat dari telepon ini dalam 48 jam terakhir. Akan diaktifkan kembali secara otomatis setelah masa 48 jam berakhir.</string>
+  <string name="import_send_to_voicemail_numbers_label">Impor nomor</string>
+  <string name="blocked_call_settings_import_description">Anda sebelumnya menandai beberapa penelepon agar dialihkan secara otomatis ke pesan suara melalui aplikasi lain.</string>
+  <string name="blocked_call_settings_view_numbers_button">Lihat Nomor</string>
+  <string name="blocked_call_settings_import_button">Impor</string>
+  <string name="description_blocked_number_list_delete">Bebaskan nomor</string>
+  <string name="addBlockedNumber">Tambahkan nomor</string>
+  <string name="block_number_footer_message_vvm">Panggilan telepon dari nomor ini akan diblokir dan pesan suara akan dihapus secara otomatis.</string>
+  <string name="block_number_footer_message_no_vvm">Panggilan telepon dari nomor ini akan diblokir, tetapi penelepon mungkin masih dapat meninggalkan pesan suara.</string>
+  <string name="block_list">Nomor yang diblokir</string>
+  <string name="alreadyBlocked">%1$s sudah diblokir.</string>
+  <string name="phone_account_settings_label">Akun panggilan</string>
+  <string name="permission_no_speeddial">Untuk mengaktifkan panggilan cepat, aktifkan izin Kontak.</string>
+  <string name="permission_no_calllog">Untuk melihat log panggilan, aktifkan izin Telepon.</string>
+  <string name="permission_no_search">Untuk menelusuri kontak, aktifkan izin Kontak.</string>
+  <string name="permission_place_call">Untuk melakukan panggilan, aktifkan izin Telepon.</string>
+  <string name="toast_cannot_write_system_settings">Aplikasi telepon tidak memiliki izin untuk menulis ke setelan sistem.</string>
+  <string name="blocked_number_call_log_label">Diblokir</string>
+  <string name="call_log_action_block_report_number">Blokir/laporkan spam</string>
+  <string name="call_log_action_block_number">Blokir nomor</string>
+  <string name="call_log_action_remove_spam">Bukan spam</string>
+  <string name="call_log_action_unblock_number">Bebaskan nomor</string>
+  <string name="spam_number_call_log_label">Spam</string>
+  <string name="call_composer_connection_failed">%1$s sedang offline dan tidak dapat dijangkau</string>
+  <string name="about_phone_label">Tentang</string>
+  <string name="voicemail_transcription_branding_text">Ditranskripsi oleh Google</string>
+  <string name="voicemail_transcription_in_progress">Mentranskripsikan...</string>
+  <string name="voicemail_transcription_failed">Transkrip tidak tersedia.</string>
+  <string name="voicemail_transcription_failed_language_not_supported">Transkrip tidak tersedia. Bahasa tidak didukung.</string>
+  <string name="voicemail_transcription_failed_no_speech">Transkrip tidak tersedia. Tidak ada ucapan yang terdeteksi.</string>
+  <string name="voicemail_donation_promo_title">Bantu menyempurnakan akurasi transkripsi?</string>
+  <string name="voicemail_donation_promo_content">Izinkan Google meninjau pesan suara ini dan pesan suara selanjutnya beserta transkripnya. Pesan suara akan disimpan secara anonim. Ubah Setelan kapan saja. %1$s</string>
+  <string name="voicemail_donation_promo_opt_in">Ya, saya ikut</string>
+  <string name="voicemail_donation_promo_opt_out">Tidak, terima kasih</string>
+  <string name="voicemail_transcription_rating">Nilai kualitas transkripsi</string>
+  <string name="voicemail_transcription_rating_thanks">Terima kasih atas masukan Anda</string>
+  <string name="description_rating_good">Suka</string>
+  <string name="description_rating_bad">Tidak suka</string>
+  <string name="view_conversation">Tampilkan</string>
+  <string name="ec_data_deleted">Panggilan dihapus. Lihat dan hapus lampiran yang dibagikan selama panggilan ini di Message.</string>
+  <string name="multiple_ec_data_deleted">Panggilan dihapus. Lihat dan hapus lampiran yang dibagikan selama panggilan ini di Message.</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-is/strings.xml b/java/com/android/dialer/app/res/values-is/strings.xml
index 4317d2e..0301191 100644
--- a/java/com/android/dialer/app/res/values-is/strings.xml
+++ b/java/com/android/dialer/app/res/values-is/strings.xml
@@ -1,179 +1,171 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="applicationLabel" msgid="2202739481132958990">"Sími"</string>
-    <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"Talnaborð á síma"</string>
-    <string name="callHistoryIconLabel" msgid="7493268743411968630">"Símtalaferill"</string>
-    <string name="action_copy_number_text" msgid="832682558551502319">"Afrita númer"</string>
-    <string name="copy_transcript_text" msgid="937904189017310829">"Afrita umritun"</string>
-    <string name="action_edit_number_before_call" msgid="8017492815878473837">"Breyta númeri áður en hringt er"</string>
-    <string name="call_log_delete_all" msgid="7852970926906523784">"Hreinsa símtalaferil"</string>
-    <string name="call_log_trash_voicemail" msgid="6118493534178533972">"Eyða talhólfsskilaboðum"</string>
-    <string name="snackbar_voicemail_deleted" msgid="7463166543725496307">"Talhólfi eytt"</string>
-    <string name="snackbar_voicemail_deleted_undo" msgid="6959743982796409941">"AFTURKALLA"</string>
-    <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"Hreinsa símtalaferil?"</string>
-    <string name="clearCallLogConfirmation" msgid="6844949465815109166">"Þetta eyðir öllum símtölum af ferlinum"</string>
-    <string name="clearCallLogProgress_title" msgid="995004835687361977">"Hreinsar símtalaferil…"</string>
-    <string name="notification_missedCallTitle" msgid="8283366068539898486">"Ósvarað símtal"</string>
-    <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"Ósvarað vinnusímtal"</string>
-    <string name="notification_missedCallsTitle" msgid="3697442015345089802">"Ósvöruð símtöl"</string>
-    <string name="notification_missedCallsMsg" msgid="8176217633929018706">"<xliff:g id="NUM_MISSED_CALLS">%d</xliff:g> ósvöruð símtöl"</string>
-    <string name="notification_missedCall_call_back" msgid="3875698110051973965">"Hringja til baka"</string>
-    <string name="notification_missedCall_message" msgid="5086910028988305964">"Skilaboð"</string>
-    <string name="post_call_notification_message" msgid="5417476789860590611">"<xliff:g id="NAME">%1$s</xliff:g>: <xliff:g id="MESSAGE">%2$s</xliff:g>"</string>
-    <string name="notification_voicemail_text_format" msgid="1895667520930252897">"Hringja í <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
-    <string name="notification_voicemail_no_vm_number" msgid="8942821987929495842">"Talhólfsnúmer ekki þekkt"</string>
-    <plurals name="notification_voicemail_title" formatted="false" msgid="1551847434476438657">
-      <item quantity="one"> <xliff:g id="COUNT">%1$d</xliff:g> talhólfsskilaboð </item>
-      <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> talhólfsskilaboð </item>
-    </plurals>
-    <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
-    <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"Ný talhólfsskilaboð frá <xliff:g id="CALLER">%1$s</xliff:g>"</string>
-    <string name="voicemail_playback_error" msgid="4384373852257757295">"Ekki tókst að spila talhólfsskilaboð"</string>
-    <string name="voicemail_fetching_content" msgid="572320120918636014">"Hleður talhólfsskilaboð…"</string>
-    <string name="voicemail_fetching_timout" msgid="2128873915839949783">"Ekki tókst að hlaða talhólfsskilaboð"</string>
-    <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_playback_speakerphone" msgid="4852027754869750227">"Kveikja eða slökkva á hátalara"</string>
-    <string name="description_playback_seek" msgid="1340910573254132520">"Breyta spilunarstöðu"</string>
-    <string name="action_menu_call_history_description" msgid="8829135306925008546">"Símtalaferill"</string>
-    <string name="action_menu_overflow_description" msgid="7648679686746517341">"Fleiri valkostir"</string>
-    <string name="action_menu_dialpad_button" msgid="1970631633457493180">"talnaborð"</string>
-    <string name="dialer_settings_label" msgid="4980176284150290175">"Stillingar"</string>
-    <string name="simulator_submenu_label" msgid="186156287346615267">"Hermir"</string>
-    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Stofna flýtileið í nýtt viðmót"</string>
-    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"Opnar fjöldaaðgerðastillingu"</string>
-    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"Fjöldaaðgerðastillingu lokað"</string>
-    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"Valdi <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"Fjarlægði val á <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_contact_details" msgid="3341280873855253464">"Tengiliðaupplýsingar um <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_spam_contact_details" msgid="5592578752881528368">"Tengiliðaupplýsingar fyrir mögulegt ruslnúmer <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> símtöl."</string>
-    <string name="description_video_call" msgid="3738199365585751727">"Myndsímtal"</string>
-    <string name="description_start_voice_search" msgid="8380022725973015261">"Hefja raddleit"</string>
-    <string name="voicemail" msgid="8899540969000957954">"Talhólf"</string>
-    <string name="description_cancel_multi_select" msgid="3930475950253360461">"Hætta við runuaðgerðastillingu"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Eyða"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Hætta við"</string>
-    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> valin"</string>
-    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
-      <item quantity="one">"<b>"Eyða þessum talhólfsskilaboðum? "</b>"</item>
-      <item quantity="other">"<b>"Eyða þessum talhólfsskilaboðum? "</b>"</item>
-    </plurals>
-    <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
-    <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> kl. <xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
-    <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="voice_search_not_available" msgid="6546240433719732905">"Raddleit er ekki í boði"</string>
-    <string name="dialer_hint_find_contact" msgid="2023214799381149808">"Leita í tengiliðum"</string>
-    <string name="block_number_search_hint" msgid="5377706079015099416">"Bættu við númeri eða tengilið"</string>
-    <string name="call_log_all_empty" msgid="3955572868518162004">"Símtalaferillinn er auður"</string>
-    <string name="call_log_all_empty_action" msgid="852218280136243014">"Hringja"</string>
-    <string name="call_log_missed_empty" msgid="7094936030845062214">"Þú ert ekki með nein ósvöruð símtöl."</string>
-    <string name="call_log_voicemail_empty" msgid="273623903423275178">"Talhólfið þitt er tómt."</string>
-    <string name="call_log_activity_title" msgid="1275242727244945527">"Símtalaferill"</string>
-    <string name="call_log_all_title" msgid="6042262422192020327">"Allt"</string>
-    <string name="call_log_missed_title" msgid="17254005889268015">"Ósvöruð"</string>
-    <string name="tab_speed_dial" msgid="6616404752227561075">"Hraðval"</string>
-    <string name="tab_history" msgid="7420269368689503596">"Símtalaferill"</string>
-    <string name="tab_all_contacts" msgid="5531733977693943015">"Tengiliðir"</string>
-    <string name="tab_voicemail" msgid="2458548090088316246">"Talhólf"</string>
-    <string name="search_shortcut_call_number" msgid="8847918845036880688">"Hringja í <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"Búa til nýjan tengilið"</string>
-    <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"Bæta við tengilið"</string>
-    <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"Senda SMS-skilaboð"</string>
-    <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"Hringja myndsímtal"</string>
-    <string name="search_shortcut_block_number" msgid="4587283230665805776">"Setja númer á bannlista"</string>
-    <string name="speed_dial_empty" msgid="3346406399966039505">"Þú ert ekki með neinn í hraðvali enn sem komið er"</string>
-    <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"Bæta uppáhaldi við"</string>
-    <string name="remove_contact" msgid="2353580570488923668">"Fjarlægja"</string>
-    <string name="select_all" msgid="408601760696146245">"Velja allt"</string>
-    <string name="call_log_action_video_call" msgid="7565549950343850819">"Myndsímtal"</string>
-    <string name="call_log_action_send_message" msgid="6948727362660115554">"Senda skilaboð"</string>
-    <string name="call_log_action_details" msgid="2091370737371449501">"Símtalsupplýsingar"</string>
-    <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"Senda til …"</string>
-    <string name="call_log_action_call" msgid="682724094251540583">"Hringja í <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_incoming_missed_call" msgid="8292535799379230029">"Ósvarað símtal frá <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_incoming_answered_call" msgid="3920182963103160610">"Svarað símtal frá <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_unread_voicemail" msgid="145170985013419170">"Ólesin talhólfsskilaboð frá <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_read_voicemail" msgid="5585559881573227732">"Talhólfsskilaboð frá <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_outgoing_call" msgid="543952487882919924">"Símtal til <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="call_log_via_number" msgid="1340307109806397650">"í gegnum <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> í gegnum <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="description_call_action" msgid="4042796498169106545">"Hringja í <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_video_call_action" msgid="1237090968588659650">"Hringja myndsímtal í <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
-    <string name="description_voicemail_action" msgid="3290143432403538524">"Hlusta á talhólfsskilaboð frá <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_create_new_contact_action" msgid="1928282350281564130">"Búa til tengilið fyrir <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"Bæta <xliff:g id="NAMEORNUMBER">^1</xliff:g> við fyrirliggjandi tengilið"</string>
-    <string name="description_details_action" msgid="2061866409737706174">"Símtalsupplýsingar fyrir <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="call_log_header_today" msgid="1576119097475845293">"Í dag"</string>
-    <string name="call_log_header_yesterday" msgid="5616077776205329563">"Í gær"</string>
-    <string name="call_log_header_other" msgid="4940676886254217644">"Eldra"</string>
-    <string name="voicemail_speaker_on" msgid="3151333608926996668">"Kveikja á hátalara."</string>
-    <string name="voicemail_speaker_off" msgid="2530064206962034201">"Slökkva á hátalara."</string>
-    <string name="voicemail_play_start_pause" msgid="3874823480278334664">"Hefja eða gera hlé á spilun."</string>
-    <string name="display_options_title" msgid="3880091801055797975">"Birtingarvalkostir"</string>
-    <string name="sounds_and_vibration_title" msgid="3075050000721181384">"Hljóð og titringur"</string>
-    <string name="accessibility_settings_title" msgid="3329027650429831820">"Aðgengi"</string>
-    <string name="ringtone_title" msgid="8377174189894648486">"Hringitónn síma"</string>
-    <string name="vibrate_on_ring_title" msgid="631441314790960485">"Titra líka fyrir símtöl"</string>
-    <string name="dtmf_tone_enable_title" msgid="3273762431523939277">"Hljóð á talnaborði"</string>
-    <string name="dtmf_tone_length_title" msgid="534096029202438539">"Lengd tóns á talnaborði"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="applicationLabel">Sími</string>
+  <string name="launcherDialpadActivityLabel">Talnaborð á síma</string>
+  <string name="callHistoryIconLabel">Símtalaferill</string>
+  <string name="action_copy_number_text">Afrita númer</string>
+  <string name="copy_transcript_text">Afrita umritun</string>
+  <string name="action_edit_number_before_call">Breyta númeri áður en hringt er</string>
+  <string name="call_log_delete_all">Hreinsa símtalaferil</string>
+  <string name="call_log_trash_voicemail">Eyða talhólfsskilaboðum</string>
+  <string name="snackbar_voicemail_deleted">Talhólfi eytt</string>
+  <string name="clearCallLogConfirmation_title">Hreinsa símtalaferil?</string>
+  <string name="clearCallLogConfirmation">Þetta eyðir öllum símtölum af ferlinum</string>
+  <string name="clearCallLogProgress_title">Hreinsar símtalaferil…</string>
+  <string name="notification_missedCallTitle">Ósvarað símtal</string>
+  <string name="notification_missedWorkCallTitle">Ósvarað vinnusímtal</string>
+  <string name="notification_missedCallsTitle">Ósvöruð símtöl</string>
+  <string name="notification_missedCallsMsg">%d ósvöruð símtöl</string>
+  <string name="notification_missedCall_call_back">Hringja til baka</string>
+  <string name="notification_missedCall_message">Skilaboð</string>
+  <string name="post_call_notification_message">%1$s: %2$s</string>
+  <string name="notification_voicemail_text_format">Hringja í %s</string>
+  <string name="notification_voicemail_no_vm_number">Talhólfsnúmer ekki þekkt</string>
+  <plurals name="notification_voicemail_title">
+    <item quantity="one"> %1$d talhólfsskilaboð </item>
+    <item quantity="other"> %1$d talhólfsskilaboð </item>
+  </plurals>
+  <string name="notification_voicemail_callers_list">%1$s, %2$s</string>
+  <string name="notification_new_voicemail_ticker">Ný talhólfsskilaboð frá %1$s</string>
+  <string name="voicemail_playback_error">Ekki tókst að spila talhólfsskilaboð</string>
+  <string name="voicemail_fetching_content">Hleður talhólfsskilaboð…</string>
+  <string name="voicemail_fetching_timout">Ekki tókst að hlaða talhólfsskilaboð</string>
+  <string name="call_log_item_count_and_date">(%1$d) %2$s</string>
+  <string name="description_playback_speakerphone">Kveikja eða slökkva á hátalara</string>
+  <string name="description_playback_seek">Breyta spilunarstöðu</string>
+  <string name="action_menu_call_history_description">Símtalaferill</string>
+  <string msgid="2295659037509008453" name="action_menu_overflow_description">Fleiri valkostir</string>
+  <string name="action_menu_dialpad_button">talnaborð</string>
+  <string name="dialer_settings_label">Stillingar</string>
+  <string name="simulator_submenu_label">Hermir</string>
+  <string name="new_ui_launcher_shortcut_label">Stofna flýtileið í nýtt viðmót</string>
+  <string name="description_entering_bulk_action_mode">Opnar fjöldaaðgerðastillingu</string>
+  <string name="description_leaving_bulk_action_mode">Fjöldaaðgerðastillingu lokað</string>
+  <string name="description_selecting_bulk_action_mode">Valdi %1$s</string>
+  <string name="description_unselecting_bulk_action_mode">Fjarlægði val á %1$s</string>
+  <string name="description_contact_details">Tengiliðaupplýsingar um %1$s</string>
+  <string name="description_spam_contact_details">Tengiliðaupplýsingar fyrir mögulegt ruslnúmer %1$s</string>
+  <string name="description_num_calls">%1$s símtöl.</string>
+  <string name="description_video_call">Myndsímtal</string>
+  <string name="description_start_voice_search">Hefja raddleit</string>
+  <string name="voicemail">Talhólf</string>
+  <string name="description_cancel_multi_select">Hætta við runuaðgerðastillingu</string>
+  <string name="voicemailMultiSelectDeleteConfirm">Eyða</string>
+  <string name="voicemailMultiSelectDeleteCancel">Hætta við</string>
+  <string name="voicemailMultiSelectActionBarTitle">%1$s valin</string>
+  <plurals name="delete_voicemails_confirmation_dialog_title">
+    <item quantity="one"><b>Eyða þessum talhólfsskilaboðum? </b></item>
+    <item quantity="other"><b>Eyða þessum talhólfsskilaboðum? </b></item>
+  </plurals>
+  <string name="voicemailCallLogToday">@string/call_log_header_today</string>
+  <string name="voicemailCallLogDateTimeFormat">%1$s kl. %2$s</string>
+  <string name="voicemailDurationFormat">%1$02d:%2$02d</string>
+  <string name="voicemailCallLogDateTimeFormatWithDuration">%1$s • %2$s</string>
+  <string name="voice_search_not_available">Raddleit er ekki í boði</string>
+  <string name="dialer_hint_find_contact">Leita í tengiliðum</string>
+  <string name="block_number_search_hint">Bættu við númeri eða tengilið</string>
+  <string name="call_log_all_empty">Símtalaferillinn er auður</string>
+  <string name="call_log_all_empty_action">Hringja</string>
+  <string name="call_log_missed_empty">Þú ert ekki með nein ósvöruð símtöl.</string>
+  <string name="call_log_voicemail_empty">Talhólfið þitt er tómt.</string>
+  <string name="call_log_activity_title">Símtalaferill</string>
+  <string name="call_log_all_title">Allt</string>
+  <string name="call_log_missed_title">Ósvöruð</string>
+  <string name="tab_speed_dial">Hraðval</string>
+  <string name="tab_history">Símtalaferill</string>
+  <string name="tab_all_contacts">Tengiliðir</string>
+  <string name="tab_voicemail">Talhólf</string>
+  <string name="search_shortcut_call_number">Hringja í %s</string>
+  <string name="search_shortcut_create_new_contact">Búa til nýjan tengilið</string>
+  <string name="search_shortcut_add_to_contact">Bæta við tengilið</string>
+  <string name="search_shortcut_send_sms_message">Senda SMS-skilaboð</string>
+  <string name="search_shortcut_make_video_call">Hringja myndsímtal</string>
+  <string name="search_shortcut_block_number">Setja númer á bannlista</string>
+  <string name="speed_dial_empty">Þú ert ekki með neinn í hraðvali enn sem komið er</string>
+  <string name="speed_dial_empty_add_favorite_action">Bæta uppáhaldi við</string>
+  <string name="remove_contact">Fjarlægja</string>
+  <string name="select_all">Velja allt</string>
+  <string name="call_log_action_video_call">Myndsímtal</string>
+  <string name="call_log_action_set_up_video">Setja upp myndsímtöl</string>
+  <string name="call_log_action_invite_video">Bjóða í myndsímtal</string>
+  <string name="call_log_action_send_message">Senda skilaboð</string>
+  <string name="call_log_action_details">Símtalsupplýsingar</string>
+  <string name="call_log_action_share_voicemail">Senda til …</string>
+  <string name="call_log_action_call">Hringja í ^1</string>
+  <string name="description_incoming_missed_call">Ósvarað símtal frá ^1, ^2, ^3, ^4.</string>
+  <string name="description_incoming_answered_call">Svarað símtal frá ^1, ^2, ^3, ^4.</string>
+  <string name="description_unread_voicemail">Ólesin talhólfsskilaboð frá ^1, ^2, ^3, ^4.</string>
+  <string name="description_read_voicemail">Talhólfsskilaboð frá ^1, ^2, ^3, ^4.</string>
+  <string name="description_outgoing_call">Símtal til ^1, ^2, ^3, ^4.</string>
+  <string name="call_log_via_number">í gegnum %1$s</string>
+  <string name="call_log_via_number_phone_account">%1$s í gegnum %2$s</string>
+  <string name="description_call_action">Hringja í ^1</string>
+  <string name="description_video_call_action">Hringja myndsímtal í ^1.</string>
+  <string name="description_voicemail_action">Hlusta á talhólfsskilaboð frá ^1</string>
+  <string name="description_create_new_contact_action">Búa til tengilið fyrir ^1</string>
+  <string name="description_add_to_existing_contact_action">Bæta ^1 við fyrirliggjandi tengilið</string>
+  <string name="description_details_action">Símtalsupplýsingar fyrir ^1</string>
+  <string name="call_log_header_today">Í dag</string>
+  <string name="call_log_header_yesterday">Í gær</string>
+  <string name="call_log_header_other">Eldra</string>
+  <string name="voicemail_speaker_on">Kveikja á hátalara.</string>
+  <string name="voicemail_speaker_off">Slökkva á hátalara.</string>
+  <string name="voicemail_play_start_pause">Hefja eða gera hlé á spilun.</string>
+  <string name="display_options_title">Birtingarvalkostir</string>
+  <string name="sounds_and_vibration_title">Hljóð og titringur</string>
+  <string name="accessibility_settings_title">Aðgengi</string>
+  <string name="ringtone_title">Hringitónn síma</string>
+  <string name="vibrate_on_ring_title">Titra líka fyrir símtöl</string>
+  <string name="dtmf_tone_enable_title">Hljóð á talnaborði</string>
+  <string name="dtmf_tone_length_title">Lengd tóns á talnaborði</string>
   <string-array name="dtmf_tone_length_entries">
-    <item msgid="3136353015227162823">"Venjulegur"</item>
-    <item msgid="5376841175538523822">"Langir"</item>
+    <item>Venjulegur</item>
+    <item>Langir</item>
   </string-array>
-    <string name="respond_via_sms_setting_title" msgid="8008181606657693452">"Snarsvör"</string>
-    <string name="call_settings_label" msgid="7824611757200960807">"Símtöl"</string>
-    <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Lokað fyrir símtöl"</string>
-    <string name="voicemail_settings_label" msgid="4594299554519920570">"Talhólf"</string>
-    <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Tímabundið slökkt á lokun fyrir símtöl"</string>
-    <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Lokun fyrir símtöl hefur verið gerð óvirk vegna þess að þú hafðir samband við neyðarþjónustu úr þessum síma á undanförnum tveimur sólarhringum. Lokunin verður aftur virk að þessum tveimur sólarhringum liðnum."</string>
-    <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Flytja inn númer"</string>
-    <string name="blocked_call_settings_import_description" msgid="1819412052545228965">"Þú merktir áður nokkra hringjendur þannig að þeir verði sjálfkrafa sendir í talhólfið í gegnum önnur forrit."</string>
-    <string name="blocked_call_settings_view_numbers_button" msgid="3332727948554356704">"Skoða tölur"</string>
-    <string name="blocked_call_settings_import_button" msgid="7319111700387470727">"Flytja inn"</string>
-    <string name="description_blocked_number_list_delete" msgid="2139644216858370740">"Taka númer af bannlista"</string>
-    <string name="addBlockedNumber" msgid="3053473735238295551">"Bæta númeri við"</string>
-    <string name="block_number_footer_message_vvm" msgid="7955326304033982368">"Lokað verður fyrir símtöl frá þessum númerum og talhólfsskilaboðum sjálfkrafa eytt."</string>
-    <string name="block_number_footer_message_no_vvm" msgid="1152684139070471665">"Lokað verður fyrir símtöl frá þessum númerum. Hugsanlegt er að þeir sem hringja geti engu að síður sent þér talhólfsskilaboð."</string>
-    <string name="block_list" msgid="4701585783411870782">"Númer á bannlista"</string>
-    <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g> er nú þegar á bannlista."</string>
-    <string name="phone_account_settings_label" msgid="8372485478006965920">"Símtalareikningar"</string>
-    <string name="permission_no_speeddial" msgid="8487215628510596753">"Kveiktu á tengiliðaheimildinni til að gera hraðval virkt."</string>
-    <string name="permission_no_calllog" msgid="4053705651238775784">"Kveiktu á heimild símaforritsins til að sjá símtalaskrána þína."</string>
-    <string name="permission_no_search" msgid="2424710404207193826">"Kveiktu á heimildunum fyrir tengiliði til að leita að tengiliðum."</string>
-    <string name="permission_place_call" msgid="8686908130349369423">"Kveiktu á heimild símaforritsins til að hringja símtal."</string>
-    <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"Símaforritið hefur ekki heimild til að breyta kerfisstillingum."</string>
-    <string name="blocked_number_call_log_label" msgid="4212282846299997693">"Á bannlista"</string>
-    <string name="call_log_action_block_report_number" msgid="7302636538668696729">"Setja á bannlista / tilkynna"</string>
-    <string name="call_log_action_block_number" msgid="5048188386501998865">"Setja númer á bannlista"</string>
-    <string name="call_log_action_remove_spam" msgid="2045319806318398403">"Ekki rusl"</string>
-    <string name="call_log_action_unblock_number" msgid="6100117033288448758">"Taka númer af bannlista"</string>
-    <string name="spam_number_call_log_label" msgid="2678431398326811131">"Ruslnúmer"</string>
-    <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> er án nettengingar og ekki er hægt að ná í viðkomandi"</string>
-    <string name="about_phone_label" msgid="582991354677973731">"Um forritið"</string>
-    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Umritað af Google"</string>
-    <string name="voicemail_transcription_in_progress" msgid="2933320969613783210">"Google er að skrifa upp…"</string>
-    <string name="voicemail_transcription_failed" msgid="335275303117412706">"Textauppskrift er ekki í boði."</string>
-    <string name="voicemail_transcription_failed_language_not_supported" msgid="4210332591050562553">"Textauppskrift er ekki í boði. Tungumálið er ekki stutt."</string>
-    <string name="voicemail_transcription_failed_no_speech" msgid="9093372879697874852">"Textauppskrift er ekki í boði. Ekkert tal greindist."</string>
-    <string name="view_conversation" msgid="7895904782094119702">"Skoða"</string>
-    <string name="ec_data_deleted" msgid="4794880345545827107">"Símtali eytt. Skoðaðu og eyddu viðhengjum sem var deilt í þessu símtali í Messages."</string>
-    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"Símtölum eytt. Skoðaðu og eyddu viðhengjum sem var deilt í þessum símtölum í Messages."</string>
+  <string name="respond_via_sms_setting_title">Snarsvör</string>
+  <string name="call_settings_label">Símtöl</string>
+  <string name="manage_blocked_numbers_label">Númer á bannlista</string>
+  <string name="voicemail_settings_label">Talhólf</string>
+  <string name="blocked_numbers_disabled_emergency_header_label">Tímabundið slökkt á lokun fyrir símtöl</string>
+  <string name="blocked_numbers_disabled_emergency_desc">Lokun fyrir símtöl hefur verið gerð óvirk vegna þess að þú hafðir samband við neyðarþjónustu úr þessum síma á undanförnum tveimur sólarhringum. Lokunin verður aftur virk að þessum tveimur sólarhringum liðnum.</string>
+  <string name="import_send_to_voicemail_numbers_label">Flytja inn númer</string>
+  <string name="blocked_call_settings_import_description">Þú merktir áður nokkra hringjendur þannig að þeir verði sjálfkrafa sendir í talhólfið í gegnum önnur forrit.</string>
+  <string name="blocked_call_settings_view_numbers_button">Skoða tölur</string>
+  <string name="blocked_call_settings_import_button">Flytja inn</string>
+  <string name="description_blocked_number_list_delete">Taka númer af bannlista</string>
+  <string name="addBlockedNumber">Bæta númeri við</string>
+  <string name="block_number_footer_message_vvm">Lokað verður fyrir símtöl frá þessum númerum og talhólfsskilaboðum sjálfkrafa eytt.</string>
+  <string name="block_number_footer_message_no_vvm">Lokað verður fyrir símtöl frá þessum númerum. Hugsanlegt er að þeir sem hringja geti engu að síður sent þér talhólfsskilaboð.</string>
+  <string name="block_list">Númer á bannlista</string>
+  <string name="alreadyBlocked">%1$s er nú þegar á bannlista.</string>
+  <string name="phone_account_settings_label">Símtalareikningar</string>
+  <string name="permission_no_speeddial">Kveiktu á tengiliðaheimildinni til að gera hraðval virkt.</string>
+  <string name="permission_no_calllog">Kveiktu á heimild símaforritsins til að sjá símtalaskrána þína.</string>
+  <string name="permission_no_search">Kveiktu á heimildunum fyrir tengiliði til að leita að tengiliðum.</string>
+  <string name="permission_place_call">Kveiktu á heimild símaforritsins til að hringja símtal.</string>
+  <string name="toast_cannot_write_system_settings">Símaforritið hefur ekki heimild til að breyta kerfisstillingum.</string>
+  <string name="blocked_number_call_log_label">Á bannlista</string>
+  <string name="call_log_action_block_report_number">Setja á bannlista / tilkynna</string>
+  <string name="call_log_action_block_number">Setja númer á bannlista</string>
+  <string name="call_log_action_remove_spam">Ekki rusl</string>
+  <string name="call_log_action_unblock_number">Taka númer af bannlista</string>
+  <string name="spam_number_call_log_label">Ruslnúmer</string>
+  <string name="call_composer_connection_failed">%1$s er án nettengingar og ekki er hægt að ná í viðkomandi</string>
+  <string name="about_phone_label">Um forritið</string>
+  <string name="voicemail_transcription_branding_text">Umritað af Google</string>
+  <string name="voicemail_transcription_in_progress">Skrifar upp…</string>
+  <string name="voicemail_transcription_failed">Textauppskrift er ekki í boði.</string>
+  <string name="voicemail_transcription_failed_language_not_supported">Textauppskrift er ekki í boði. Tungumálið er ekki stutt.</string>
+  <string name="voicemail_transcription_failed_no_speech">Textauppskrift er ekki í boði. Ekkert tal greindist.</string>
+  <string name="voicemail_donation_promo_title">Viltu hjálpa okkur að gera uppskrift nákvæmari?</string>
+  <string name="voicemail_donation_promo_content">Leyfðu Google að fara yfir þessi og síðari talhólfsskilaboð með uppskrift. Þetta verður vistað nafnlaust. Þú getur breytt stillingunum hvenær sem er. %1$s</string>
+  <string name="voicemail_donation_promo_opt_in">Hljómar vel</string>
+  <string name="voicemail_donation_promo_opt_out">Nei, takk</string>
+  <string name="voicemail_transcription_rating">Gefa textauppskrift einkunn</string>
+  <string name="voicemail_transcription_rating_thanks">Takk fyrir ábendinguna!</string>
+  <string name="description_rating_good">Líkar við</string>
+  <string name="description_rating_bad">Mislíkar</string>
+  <string name="view_conversation">Skoða</string>
+  <string name="ec_data_deleted">Símtali eytt. Skoðaðu og eyddu viðhengjum sem var deilt í þessu símtali í Messages.</string>
+  <string name="multiple_ec_data_deleted">Símtölum eytt. Skoðaðu og eyddu viðhengjum sem var deilt í þessum símtölum í Messages.</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-it/strings.xml b/java/com/android/dialer/app/res/values-it/strings.xml
index 3f51350..816c305 100644
--- a/java/com/android/dialer/app/res/values-it/strings.xml
+++ b/java/com/android/dialer/app/res/values-it/strings.xml
@@ -1,179 +1,171 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="applicationLabel" msgid="2202739481132958990">"Telefono"</string>
-    <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"Tastierino del telefono"</string>
-    <string name="callHistoryIconLabel" msgid="7493268743411968630">"Cronologia chiamate"</string>
-    <string name="action_copy_number_text" msgid="832682558551502319">"Copia numero"</string>
-    <string name="copy_transcript_text" msgid="937904189017310829">"Copia trascrizione"</string>
-    <string name="action_edit_number_before_call" msgid="8017492815878473837">"Modifica numero prima di chiamare"</string>
-    <string name="call_log_delete_all" msgid="7852970926906523784">"Cancella cronologia chiamate"</string>
-    <string name="call_log_trash_voicemail" msgid="6118493534178533972">"Elimina messaggi della segreteria"</string>
-    <string name="snackbar_voicemail_deleted" msgid="7463166543725496307">"Mes vocali eliminati"</string>
-    <string name="snackbar_voicemail_deleted_undo" msgid="6959743982796409941">"ANNULLA"</string>
-    <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"Cancellare la cronologia chiamate?"</string>
-    <string name="clearCallLogConfirmation" msgid="6844949465815109166">"Verranno eliminate tutte le chiamate dalla cronologia"</string>
-    <string name="clearCallLogProgress_title" msgid="995004835687361977">"Cancellazione cronologia chiamate…"</string>
-    <string name="notification_missedCallTitle" msgid="8283366068539898486">"Chiamata persa"</string>
-    <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"Chiamata di lavoro persa"</string>
-    <string name="notification_missedCallsTitle" msgid="3697442015345089802">"Chiamate perse"</string>
-    <string name="notification_missedCallsMsg" msgid="8176217633929018706">"<xliff:g id="NUM_MISSED_CALLS">%d</xliff:g> chiamate perse"</string>
-    <string name="notification_missedCall_call_back" msgid="3875698110051973965">"Richiama"</string>
-    <string name="notification_missedCall_message" msgid="5086910028988305964">"Messaggio"</string>
-    <string name="post_call_notification_message" msgid="5417476789860590611">"<xliff:g id="NAME">%1$s</xliff:g>: <xliff:g id="MESSAGE">%2$s</xliff:g>"</string>
-    <string name="notification_voicemail_text_format" msgid="1895667520930252897">"Componi <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
-    <string name="notification_voicemail_no_vm_number" msgid="8942821987929495842">"Numero segreteria sconosciuto"</string>
-    <plurals name="notification_voicemail_title" formatted="false" msgid="1551847434476438657">
-      <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> messaggi in segreteria </item>
-      <item quantity="one">Messaggio in segreteria</item>
-    </plurals>
-    <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
-    <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"Nuovo messaggio vocale da <xliff:g id="CALLER">%1$s</xliff:g>"</string>
-    <string name="voicemail_playback_error" msgid="4384373852257757295">"Impossibile riprodurre i messaggi vocali"</string>
-    <string name="voicemail_fetching_content" msgid="572320120918636014">"Caricamento dei messaggi vocali…"</string>
-    <string name="voicemail_fetching_timout" msgid="2128873915839949783">"Impossibile caricare i messaggi vocali"</string>
-    <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_playback_speakerphone" msgid="4852027754869750227">"Attiva o disattiva vivavoce"</string>
-    <string name="description_playback_seek" msgid="1340910573254132520">"Cerca posizione di riproduzione"</string>
-    <string name="action_menu_call_history_description" msgid="8829135306925008546">"Cronologia chiamate"</string>
-    <string name="action_menu_overflow_description" msgid="7648679686746517341">"Altre opzioni"</string>
-    <string name="action_menu_dialpad_button" msgid="1970631633457493180">"tastierino"</string>
-    <string name="dialer_settings_label" msgid="4980176284150290175">"Impostazioni"</string>
-    <string name="simulator_submenu_label" msgid="186156287346615267">"Simulatore"</string>
-    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Crea nuova scorciatoia UI"</string>
-    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"Attivazione della modalità di azione collettiva"</string>
-    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"Disttivazione della modalità di azione collettiva"</string>
-    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> selezionato"</string>
-    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> deselezionato"</string>
-    <string name="description_contact_details" msgid="3341280873855253464">"Dettagli contatto <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_spam_contact_details" msgid="5592578752881528368">"Dettagli di contatto del sospetto spammer: <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> chiamate."</string>
-    <string name="description_video_call" msgid="3738199365585751727">"Videochiamata."</string>
-    <string name="description_start_voice_search" msgid="8380022725973015261">"Avvia la ricerca vocale"</string>
-    <string name="voicemail" msgid="8899540969000957954">"Segreteria"</string>
-    <string name="description_cancel_multi_select" msgid="3930475950253360461">"Annulla modalità di azione collettiva"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Elimina"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Annulla"</string>
-    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> selezionate"</string>
-    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
-      <item quantity="other">"<b>"Eliminare questi messaggi vocali? "</b>"</item>
-      <item quantity="one">"<b>"Eliminare questo messaggio vocale? "</b>"</item>
-    </plurals>
-    <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
-    <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> alle ore <xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
-    <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="voice_search_not_available" msgid="6546240433719732905">"Ricerca vocale non disponibile"</string>
-    <string name="dialer_hint_find_contact" msgid="2023214799381149808">"Cerca contatti"</string>
-    <string name="block_number_search_hint" msgid="5377706079015099416">"Aggiungi numero/cerca contatti"</string>
-    <string name="call_log_all_empty" msgid="3955572868518162004">"La cronologia delle chiamate è vuota"</string>
-    <string name="call_log_all_empty_action" msgid="852218280136243014">"Fai una chiamata"</string>
-    <string name="call_log_missed_empty" msgid="7094936030845062214">"Nessuna chiamata persa."</string>
-    <string name="call_log_voicemail_empty" msgid="273623903423275178">"La casella della segreteria è vuota."</string>
-    <string name="call_log_activity_title" msgid="1275242727244945527">"Cronologia chiamate"</string>
-    <string name="call_log_all_title" msgid="6042262422192020327">"Tutte"</string>
-    <string name="call_log_missed_title" msgid="17254005889268015">"Perse"</string>
-    <string name="tab_speed_dial" msgid="6616404752227561075">"Composizione rapida"</string>
-    <string name="tab_history" msgid="7420269368689503596">"Cronologia chiamate"</string>
-    <string name="tab_all_contacts" msgid="5531733977693943015">"Contatti"</string>
-    <string name="tab_voicemail" msgid="2458548090088316246">"Segreteria"</string>
-    <string name="search_shortcut_call_number" msgid="8847918845036880688">"Chiama <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"Crea nuovo contatto"</string>
-    <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"Aggiungi a un contatto"</string>
-    <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"Invia SMS"</string>
-    <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"Fai una videochiamata"</string>
-    <string name="search_shortcut_block_number" msgid="4587283230665805776">"Blocca numero"</string>
-    <string name="speed_dial_empty" msgid="3346406399966039505">"Nessun preferito disponibile nella Composizione rapida"</string>
-    <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"Aggiungi un preferito"</string>
-    <string name="remove_contact" msgid="2353580570488923668">"Rimuovi"</string>
-    <string name="select_all" msgid="408601760696146245">"Seleziona tutto"</string>
-    <string name="call_log_action_video_call" msgid="7565549950343850819">"Videochiamata"</string>
-    <string name="call_log_action_send_message" msgid="6948727362660115554">"Invia un messaggio"</string>
-    <string name="call_log_action_details" msgid="2091370737371449501">"Dettagli chiamata"</string>
-    <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"Invia a…"</string>
-    <string name="call_log_action_call" msgid="682724094251540583">"Chiama <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_incoming_missed_call" msgid="8292535799379230029">"Chiamata senza risposta di <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_incoming_answered_call" msgid="3920182963103160610">"Risposta alla chiamata di <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_unread_voicemail" msgid="145170985013419170">"Messaggio in segreteria da ascoltare da <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_read_voicemail" msgid="5585559881573227732">"Messaggio in segreteria da <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_outgoing_call" msgid="543952487882919924">"Chiamata a <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="call_log_via_number" msgid="1340307109806397650">"tramite <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> tramite <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="description_call_action" msgid="4042796498169106545">"Chiama <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_video_call_action" msgid="1237090968588659650">"Videochiamata <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
-    <string name="description_voicemail_action" msgid="3290143432403538524">"Ascolta il messaggio vocale di: <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_create_new_contact_action" msgid="1928282350281564130">"Crea contatto per <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"Aggiungi <xliff:g id="NAMEORNUMBER">^1</xliff:g> al contatto esistente"</string>
-    <string name="description_details_action" msgid="2061866409737706174">"Dettagli chiamata per <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="call_log_header_today" msgid="1576119097475845293">"Oggi"</string>
-    <string name="call_log_header_yesterday" msgid="5616077776205329563">"Ieri"</string>
-    <string name="call_log_header_other" msgid="4940676886254217644">"Meno recenti"</string>
-    <string name="voicemail_speaker_on" msgid="3151333608926996668">"Attiva altoparlante."</string>
-    <string name="voicemail_speaker_off" msgid="2530064206962034201">"Disattiva altoparlante."</string>
-    <string name="voicemail_play_start_pause" msgid="3874823480278334664">"Avvia o metti in pausa la riproduzione."</string>
-    <string name="display_options_title" msgid="3880091801055797975">"Opzioni di visualizzazione"</string>
-    <string name="sounds_and_vibration_title" msgid="3075050000721181384">"Suoni e vibrazione"</string>
-    <string name="accessibility_settings_title" msgid="3329027650429831820">"Accessibilità"</string>
-    <string name="ringtone_title" msgid="8377174189894648486">"Suoneria telefono"</string>
-    <string name="vibrate_on_ring_title" msgid="631441314790960485">"Vibrazione per le chiamate"</string>
-    <string name="dtmf_tone_enable_title" msgid="3273762431523939277">"Toni tastierino"</string>
-    <string name="dtmf_tone_length_title" msgid="534096029202438539">"Durata tono tastierino"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="applicationLabel">Telefono</string>
+  <string name="launcherDialpadActivityLabel">Tastierino del telefono</string>
+  <string name="callHistoryIconLabel">Cronologia chiamate</string>
+  <string name="action_copy_number_text">Copia numero</string>
+  <string name="copy_transcript_text">Copia trascrizione</string>
+  <string name="action_edit_number_before_call">Modifica numero prima di chiamare</string>
+  <string name="call_log_delete_all">Cancella cronologia chiamate</string>
+  <string name="call_log_trash_voicemail">Elimina messaggi della segreteria</string>
+  <string name="snackbar_voicemail_deleted">Mes vocali eliminati</string>
+  <string name="clearCallLogConfirmation_title">Cancellare la cronologia chiamate?</string>
+  <string name="clearCallLogConfirmation">Verranno eliminate tutte le chiamate dalla cronologia</string>
+  <string name="clearCallLogProgress_title">Cancellazione cronologia chiamate…</string>
+  <string name="notification_missedCallTitle">Chiamata persa</string>
+  <string name="notification_missedWorkCallTitle">Chiamata di lavoro persa</string>
+  <string name="notification_missedCallsTitle">Chiamate perse</string>
+  <string name="notification_missedCallsMsg">%d chiamate perse</string>
+  <string name="notification_missedCall_call_back">Richiama</string>
+  <string name="notification_missedCall_message">Messaggio</string>
+  <string name="post_call_notification_message">%1$s: %2$s</string>
+  <string name="notification_voicemail_text_format">Componi %s</string>
+  <string name="notification_voicemail_no_vm_number">Numero segreteria sconosciuto</string>
+  <plurals name="notification_voicemail_title">
+    <item quantity="one">Messaggio in segreteria</item>
+    <item quantity="other"> %1$d messaggi in segreteria </item>
+  </plurals>
+  <string name="notification_voicemail_callers_list">%1$s, %2$s</string>
+  <string name="notification_new_voicemail_ticker">Nuovo messaggio vocale da %1$s</string>
+  <string name="voicemail_playback_error">Impossibile riprodurre i messaggi vocali</string>
+  <string name="voicemail_fetching_content">Caricamento dei messaggi vocali…</string>
+  <string name="voicemail_fetching_timout">Impossibile caricare i messaggi vocali</string>
+  <string name="call_log_item_count_and_date">(%1$d) %2$s</string>
+  <string name="description_playback_speakerphone">Attiva o disattiva vivavoce</string>
+  <string name="description_playback_seek">Cerca posizione di riproduzione</string>
+  <string name="action_menu_call_history_description">Cronologia chiamate</string>
+  <string msgid="2295659037509008453" name="action_menu_overflow_description">Altre opzioni</string>
+  <string name="action_menu_dialpad_button">tastierino</string>
+  <string name="dialer_settings_label">Impostazioni</string>
+  <string name="simulator_submenu_label">Simulatore</string>
+  <string name="new_ui_launcher_shortcut_label">Crea nuova scorciatoia UI</string>
+  <string name="description_entering_bulk_action_mode">Attivazione della modalità di azione collettiva</string>
+  <string name="description_leaving_bulk_action_mode">Disttivazione della modalità di azione collettiva</string>
+  <string name="description_selecting_bulk_action_mode">%1$s selezionato</string>
+  <string name="description_unselecting_bulk_action_mode">%1$s deselezionato</string>
+  <string name="description_contact_details">Dettagli contatto %1$s</string>
+  <string name="description_spam_contact_details">Dettagli di contatto del sospetto spammer: %1$s</string>
+  <string name="description_num_calls">%1$s chiamate.</string>
+  <string name="description_video_call">Videochiamata.</string>
+  <string name="description_start_voice_search">Avvia la ricerca vocale</string>
+  <string name="voicemail">Segreteria</string>
+  <string name="description_cancel_multi_select">Annulla modalità di azione collettiva</string>
+  <string name="voicemailMultiSelectDeleteConfirm">Elimina</string>
+  <string name="voicemailMultiSelectDeleteCancel">Annulla</string>
+  <string name="voicemailMultiSelectActionBarTitle">%1$s selezionate</string>
+  <plurals name="delete_voicemails_confirmation_dialog_title">
+    <item quantity="one"><b>Eliminare questo messaggio vocale? </b></item>
+    <item quantity="other"><b>Eliminare questi messaggi vocali? </b></item>
+  </plurals>
+  <string name="voicemailCallLogToday">@string/call_log_header_today</string>
+  <string name="voicemailCallLogDateTimeFormat">%1$s alle ore %2$s</string>
+  <string name="voicemailDurationFormat">%1$02d:%2$02d</string>
+  <string name="voicemailCallLogDateTimeFormatWithDuration">%1$s • %2$s</string>
+  <string name="voice_search_not_available">Ricerca vocale non disponibile</string>
+  <string name="dialer_hint_find_contact">Cerca contatti</string>
+  <string name="block_number_search_hint">Aggiungi numero/cerca contatti</string>
+  <string name="call_log_all_empty">La cronologia delle chiamate è vuota</string>
+  <string name="call_log_all_empty_action">Fai una chiamata</string>
+  <string name="call_log_missed_empty">Nessuna chiamata persa.</string>
+  <string name="call_log_voicemail_empty">La casella della segreteria è vuota.</string>
+  <string name="call_log_activity_title">Cronologia chiamate</string>
+  <string name="call_log_all_title">Tutte</string>
+  <string name="call_log_missed_title">Perse</string>
+  <string name="tab_speed_dial">Composizione rapida</string>
+  <string name="tab_history">Cronologia chiamate</string>
+  <string name="tab_all_contacts">Contatti</string>
+  <string name="tab_voicemail">Segreteria</string>
+  <string name="search_shortcut_call_number">Chiama %s</string>
+  <string name="search_shortcut_create_new_contact">Crea nuovo contatto</string>
+  <string name="search_shortcut_add_to_contact">Aggiungi a un contatto</string>
+  <string name="search_shortcut_send_sms_message">Invia SMS</string>
+  <string name="search_shortcut_make_video_call">Fai una videochiamata</string>
+  <string name="search_shortcut_block_number">Blocca numero</string>
+  <string name="speed_dial_empty">Nessun preferito disponibile nella Composizione rapida</string>
+  <string name="speed_dial_empty_add_favorite_action">Aggiungi un preferito</string>
+  <string name="remove_contact">Rimuovi</string>
+  <string name="select_all">Seleziona tutto</string>
+  <string name="call_log_action_video_call">Videochiamata</string>
+  <string name="call_log_action_set_up_video">Imposta la videochiamata</string>
+  <string name="call_log_action_invite_video">Invita alla videochiamata</string>
+  <string name="call_log_action_send_message">Invia un messaggio</string>
+  <string name="call_log_action_details">Dettagli chiamata</string>
+  <string name="call_log_action_share_voicemail">Invia a…</string>
+  <string name="call_log_action_call">Chiama ^1</string>
+  <string name="description_incoming_missed_call">Chiamata senza risposta di ^1, ^2, ^3, ^4.</string>
+  <string name="description_incoming_answered_call">Risposta alla chiamata di ^1, ^2, ^3, ^4.</string>
+  <string name="description_unread_voicemail">Messaggio in segreteria da ascoltare da ^1, ^2, ^3, ^4.</string>
+  <string name="description_read_voicemail">Messaggio in segreteria da ^1, ^2, ^3, ^4.</string>
+  <string name="description_outgoing_call">Chiamata a ^1, ^2, ^3, ^4.</string>
+  <string name="call_log_via_number">tramite %1$s</string>
+  <string name="call_log_via_number_phone_account">%1$s tramite %2$s</string>
+  <string name="description_call_action">Chiama ^1</string>
+  <string name="description_video_call_action">Videochiamata ^1.</string>
+  <string name="description_voicemail_action">Ascolta il messaggio vocale di: ^1</string>
+  <string name="description_create_new_contact_action">Crea contatto per ^1</string>
+  <string name="description_add_to_existing_contact_action">Aggiungi ^1 al contatto esistente</string>
+  <string name="description_details_action">Dettagli chiamata per ^1</string>
+  <string name="call_log_header_today">Oggi</string>
+  <string name="call_log_header_yesterday">Ieri</string>
+  <string name="call_log_header_other">Meno recenti</string>
+  <string name="voicemail_speaker_on">Attiva altoparlante.</string>
+  <string name="voicemail_speaker_off">Disattiva altoparlante.</string>
+  <string name="voicemail_play_start_pause">Avvia o metti in pausa la riproduzione.</string>
+  <string name="display_options_title">Opzioni di visualizzazione</string>
+  <string name="sounds_and_vibration_title">Suoni e vibrazione</string>
+  <string name="accessibility_settings_title">Accessibilità</string>
+  <string name="ringtone_title">Suoneria telefono</string>
+  <string name="vibrate_on_ring_title">Vibrazione per le chiamate</string>
+  <string name="dtmf_tone_enable_title">Toni tastierino</string>
+  <string name="dtmf_tone_length_title">Durata tono tastierino</string>
   <string-array name="dtmf_tone_length_entries">
-    <item msgid="3136353015227162823">"Normale"</item>
-    <item msgid="5376841175538523822">"Lunghi"</item>
+    <item>Normale</item>
+    <item>Lunghi</item>
   </string-array>
-    <string name="respond_via_sms_setting_title" msgid="8008181606657693452">"Risposte rapide"</string>
-    <string name="call_settings_label" msgid="7824611757200960807">"Chiamate"</string>
-    <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Blocco delle chiamate"</string>
-    <string name="voicemail_settings_label" msgid="4594299554519920570">"Messaggi vocali"</string>
-    <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Blocco chiamate temporaneam. disattivato"</string>
-    <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Il blocco chiamate è stato disattivato perché hai contattato servizi di emergenza da questo telefono nelle ultime 48 ore. Verrà riattivato automaticamente una volta trascorso il periodo di 48 ore."</string>
-    <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Importa numeri"</string>
-    <string name="blocked_call_settings_import_description" msgid="1819412052545228965">"Hai già contrassegnato alcuni chiamanti da inviare automaticamente alla segreteria tramite altre app."</string>
-    <string name="blocked_call_settings_view_numbers_button" msgid="3332727948554356704">"Visualizza numeri"</string>
-    <string name="blocked_call_settings_import_button" msgid="7319111700387470727">"Importa"</string>
-    <string name="description_blocked_number_list_delete" msgid="2139644216858370740">"Sblocca numero"</string>
-    <string name="addBlockedNumber" msgid="3053473735238295551">"Aggiungi numero"</string>
-    <string name="block_number_footer_message_vvm" msgid="7955326304033982368">"Le chiamate da questi numeri verranno bloccate e i messaggi in segreteria verranno automaticamente eliminati."</string>
-    <string name="block_number_footer_message_no_vvm" msgid="1152684139070471665">"Le chiamate da questi numeri verranno bloccate, ma i chiamanti potrebbero lasciarti messaggi in segreteria."</string>
-    <string name="block_list" msgid="4701585783411870782">"Numeri bloccati"</string>
-    <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g> è già bloccato."</string>
-    <string name="phone_account_settings_label" msgid="8372485478006965920">"Account di chiamata"</string>
-    <string name="permission_no_speeddial" msgid="8487215628510596753">"Per attivare la composizione rapida, attiva l\'autorizzazione Contatti."</string>
-    <string name="permission_no_calllog" msgid="4053705651238775784">"Per accedere al registro chiamate, attiva l\'autorizzazione sul telefono."</string>
-    <string name="permission_no_search" msgid="2424710404207193826">"Per cercare nei tuoi contatti, attiva le autorizzazioni Contatti."</string>
-    <string name="permission_place_call" msgid="8686908130349369423">"Per fare una chiamata, attiva l\'autorizzazione sul telefono."</string>
-    <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"L\'app Telefono non dispone dell\'autorizzazione per modificare le impostazioni di sistema."</string>
-    <string name="blocked_number_call_log_label" msgid="4212282846299997693">"Bloccato"</string>
-    <string name="call_log_action_block_report_number" msgid="7302636538668696729">"Blocca/Segnala come spam"</string>
-    <string name="call_log_action_block_number" msgid="5048188386501998865">"Blocca numero"</string>
-    <string name="call_log_action_remove_spam" msgid="2045319806318398403">"Non spam"</string>
-    <string name="call_log_action_unblock_number" msgid="6100117033288448758">"Sblocca numero"</string>
-    <string name="spam_number_call_log_label" msgid="2678431398326811131">"Spam"</string>
-    <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> è offline e non può essere raggiunto"</string>
-    <string name="about_phone_label" msgid="582991354677973731">"Informazioni"</string>
-    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Trascritto da Google"</string>
-    <string name="voicemail_transcription_in_progress" msgid="2933320969613783210">"Google sta trascrivendo…"</string>
-    <string name="voicemail_transcription_failed" msgid="335275303117412706">"Trascrizione non disponibile."</string>
-    <string name="voicemail_transcription_failed_language_not_supported" msgid="4210332591050562553">"Trascrizione non disponibile. Lingua non supportata."</string>
-    <string name="voicemail_transcription_failed_no_speech" msgid="9093372879697874852">"Trascrizione non disponibile. Nessun discorso rilevato."</string>
-    <string name="view_conversation" msgid="7895904782094119702">"Visualizza"</string>
-    <string name="ec_data_deleted" msgid="4794880345545827107">"Chiamata eliminata. Visualizza ed elimina gli allegati condivisi durante questa chiamata in Messaggi."</string>
-    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"Chiamate eliminate. Visualizza ed elimina gli allegati condivisi durante queste chiamate in Messaggi."</string>
+  <string name="respond_via_sms_setting_title">Risposte rapide</string>
+  <string name="call_settings_label">Chiamate</string>
+  <string name="manage_blocked_numbers_label">Numeri bloccati</string>
+  <string name="voicemail_settings_label">Messaggi vocali</string>
+  <string name="blocked_numbers_disabled_emergency_header_label">Blocco chiamate temporaneam. disattivato</string>
+  <string name="blocked_numbers_disabled_emergency_desc">Il blocco chiamate è stato disattivato perché hai contattato servizi di emergenza da questo telefono nelle ultime 48 ore. Verrà riattivato automaticamente una volta trascorso il periodo di 48 ore.</string>
+  <string name="import_send_to_voicemail_numbers_label">Importa numeri</string>
+  <string name="blocked_call_settings_import_description">Hai già contrassegnato alcuni chiamanti da inviare automaticamente alla segreteria tramite altre app.</string>
+  <string name="blocked_call_settings_view_numbers_button">Visualizza numeri</string>
+  <string name="blocked_call_settings_import_button">Importa</string>
+  <string name="description_blocked_number_list_delete">Sblocca numero</string>
+  <string name="addBlockedNumber">Aggiungi numero</string>
+  <string name="block_number_footer_message_vvm">Le chiamate da questi numeri verranno bloccate e i messaggi in segreteria verranno automaticamente eliminati.</string>
+  <string name="block_number_footer_message_no_vvm">Le chiamate da questi numeri verranno bloccate, ma i chiamanti potrebbero lasciarti messaggi in segreteria.</string>
+  <string name="block_list">Numeri bloccati</string>
+  <string name="alreadyBlocked">%1$s è già bloccato.</string>
+  <string name="phone_account_settings_label">Account di chiamata</string>
+  <string name="permission_no_speeddial">Per attivare la composizione rapida, attiva l\'autorizzazione Contatti.</string>
+  <string name="permission_no_calllog">Per accedere al registro chiamate, attiva l\'autorizzazione sul telefono.</string>
+  <string name="permission_no_search">Per cercare nei tuoi contatti, attiva le autorizzazioni Contatti.</string>
+  <string name="permission_place_call">Per fare una chiamata, attiva l\'autorizzazione sul telefono.</string>
+  <string name="toast_cannot_write_system_settings">L\'app Telefono non dispone dell\'autorizzazione per modificare le impostazioni di sistema.</string>
+  <string name="blocked_number_call_log_label">Bloccato</string>
+  <string name="call_log_action_block_report_number">Blocca/Segnala come spam</string>
+  <string name="call_log_action_block_number">Blocca numero</string>
+  <string name="call_log_action_remove_spam">Non spam</string>
+  <string name="call_log_action_unblock_number">Sblocca numero</string>
+  <string name="spam_number_call_log_label">Spam</string>
+  <string name="call_composer_connection_failed">%1$s è offline e non può essere raggiunto</string>
+  <string name="about_phone_label">Informazioni</string>
+  <string name="voicemail_transcription_branding_text">Trascritto da Google</string>
+  <string name="voicemail_transcription_in_progress">Trascrizione in corso…</string>
+  <string name="voicemail_transcription_failed">Trascrizione non disponibile.</string>
+  <string name="voicemail_transcription_failed_language_not_supported">Trascrizione non disponibile. Lingua non supportata.</string>
+  <string name="voicemail_transcription_failed_no_speech">Trascrizione non disponibile. Nessun discorso rilevato.</string>
+  <string name="voicemail_donation_promo_title">Vuoi contribuire a migliorare l\'accuratezza della trascrizione?</string>
+  <string name="voicemail_donation_promo_content">Consenti a Google di rivedere questo messaggio vocale e quelli futuri a cui sono associate trascrizioni. I messaggi verranno archiviati in modo anonimo. Puoi modificare le impostazioni in qualsiasi momento. %1$s</string>
+  <string name="voicemail_donation_promo_opt_in">Sì, accetto</string>
+  <string name="voicemail_donation_promo_opt_out">No grazie</string>
+  <string name="voicemail_transcription_rating">Valuta la qualità della trascrizione</string>
+  <string name="voicemail_transcription_rating_thanks">Grazie per il tuo feedback</string>
+  <string name="description_rating_good">Mi piace</string>
+  <string name="description_rating_bad">Non mi piace</string>
+  <string name="view_conversation">Visualizza</string>
+  <string name="ec_data_deleted">Chiamata eliminata. Visualizza ed elimina gli allegati condivisi durante questa chiamata in Messaggi.</string>
+  <string name="multiple_ec_data_deleted">Chiamate eliminate. Visualizza ed elimina gli allegati condivisi durante queste chiamate in Messaggi.</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-iw/strings.xml b/java/com/android/dialer/app/res/values-iw/strings.xml
index 47b94fb..7ef5762 100644
--- a/java/com/android/dialer/app/res/values-iw/strings.xml
+++ b/java/com/android/dialer/app/res/values-iw/strings.xml
@@ -1,183 +1,175 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="applicationLabel" msgid="2202739481132958990">"טלפון"</string>
-    <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"לוח החיוג של הטלפון"</string>
-    <string name="callHistoryIconLabel" msgid="7493268743411968630">"היסטוריית שיחות"</string>
-    <string name="action_copy_number_text" msgid="832682558551502319">"העתק מספר"</string>
-    <string name="copy_transcript_text" msgid="937904189017310829">"העתק תמלול"</string>
-    <string name="action_edit_number_before_call" msgid="8017492815878473837">"ערוך את המספר לפני השיחה"</string>
-    <string name="call_log_delete_all" msgid="7852970926906523784">"נקה את היסטוריית השיחות"</string>
-    <string name="call_log_trash_voicemail" msgid="6118493534178533972">"מחק דואר קולי"</string>
-    <string name="snackbar_voicemail_deleted" msgid="7463166543725496307">"דואר קולי נמחק"</string>
-    <string name="snackbar_voicemail_deleted_undo" msgid="6959743982796409941">"בטל"</string>
-    <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"האם לנקות את היסטוריית השיחות?"</string>
-    <string name="clearCallLogConfirmation" msgid="6844949465815109166">"פעולה זו תמחק את כל השיחות מההיסטוריה שלך"</string>
-    <string name="clearCallLogProgress_title" msgid="995004835687361977">"מנקה היסטוריית שיחות…"</string>
-    <string name="notification_missedCallTitle" msgid="8283366068539898486">"שיחה שלא נענתה"</string>
-    <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"שיחה עסקית שלא נענתה"</string>
-    <string name="notification_missedCallsTitle" msgid="3697442015345089802">"שיחות שלא נענו"</string>
-    <string name="notification_missedCallsMsg" msgid="8176217633929018706">"<xliff:g id="NUM_MISSED_CALLS">%d</xliff:g> שיחות שלא נענו"</string>
-    <string name="notification_missedCall_call_back" msgid="3875698110051973965">"התקשר חזרה"</string>
-    <string name="notification_missedCall_message" msgid="5086910028988305964">"הודעה"</string>
-    <string name="post_call_notification_message" msgid="5417476789860590611">"<xliff:g id="NAME">%1$s</xliff:g>: <xliff:g id="MESSAGE">%2$s</xliff:g>"</string>
-    <string name="notification_voicemail_text_format" msgid="1895667520930252897">"‏חיוג אל ‎<xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>‎"</string>
-    <string name="notification_voicemail_no_vm_number" msgid="8942821987929495842">"המספר של תא הדואר הקולי אינו ידוע"</string>
-    <plurals name="notification_voicemail_title" formatted="false" msgid="1551847434476438657">
-      <item quantity="two"> <xliff:g id="COUNT">%1$d</xliff:g> הודעות דואר קולי </item>
-      <item quantity="many"> <xliff:g id="COUNT">%1$d</xliff:g> הודעות דואר קולי </item>
-      <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> הודעות דואר קולי </item>
-      <item quantity="one">הודעת דואר קולי</item>
-    </plurals>
-    <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
-    <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"דואר קולי חדש מאת <xliff:g id="CALLER">%1$s</xliff:g>"</string>
-    <string name="voicemail_playback_error" msgid="4384373852257757295">"לא ניתן היה להשמיע דואר קולי"</string>
-    <string name="voicemail_fetching_content" msgid="572320120918636014">"טוען דואר קולי…"</string>
-    <string name="voicemail_fetching_timout" msgid="2128873915839949783">"לא ניתן היה לטעון דואר קולי"</string>
-    <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_playback_speakerphone" msgid="4852027754869750227">"הפעל או כבה את רמקול הטלפון"</string>
-    <string name="description_playback_seek" msgid="1340910573254132520">"חפש מיקום בהפעלה"</string>
-    <string name="action_menu_call_history_description" msgid="8829135306925008546">"היסטוריית שיחות"</string>
-    <string name="action_menu_overflow_description" msgid="7648679686746517341">"אפשרויות נוספות"</string>
-    <string name="action_menu_dialpad_button" msgid="1970631633457493180">"לוח חיוג"</string>
-    <string name="dialer_settings_label" msgid="4980176284150290175">"הגדרות"</string>
-    <string name="simulator_submenu_label" msgid="186156287346615267">"סימולטור"</string>
-    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"יצירת קיצור דרך לממשק החדש"</string>
-    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"עברת למצב של ביצוע פעולות בכמות גדולה"</string>
-    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"עזבת את המצב של ביצוע פעולות בכמות גדולה"</string>
-    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"בחרת את <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"ביטלת את הבחירה של <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_contact_details" msgid="3341280873855253464">"פרטי יצירת קשר עבור <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_spam_contact_details" msgid="5592578752881528368">"פרטי התקשרות לשיחה שחשודה כספאם <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> שיחות."</string>
-    <string name="description_video_call" msgid="3738199365585751727">"שיחת וידאו."</string>
-    <string name="description_start_voice_search" msgid="8380022725973015261">"התחל חיפוש קולי"</string>
-    <string name="voicemail" msgid="8899540969000957954">"דואר קולי"</string>
-    <string name="description_cancel_multi_select" msgid="3930475950253360461">"ביטול המצב של ביצוע פעולות בכמות גדולה"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"מחיקה"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"ביטול"</string>
-    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> נבחרו"</string>
-    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
-      <item quantity="two">"<b>"האם למחוק את ההודעות הקוליות האלה? "</b>"</item>
-      <item quantity="many">"<b>"האם למחוק את ההודעות הקוליות האלה? "</b>"</item>
-      <item quantity="other">"<b>"האם למחוק את ההודעות הקוליות האלה? "</b>"</item>
-      <item quantity="one">"<b>"האם למחוק את ההודעה הקולית הזו? "</b>"</item>
-    </plurals>
-    <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
-    <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> ב-<xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
-    <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="voice_search_not_available" msgid="6546240433719732905">"חיפוש קולי אינו זמין"</string>
-    <string name="dialer_hint_find_contact" msgid="2023214799381149808">"חפש אנשי קשר"</string>
-    <string name="block_number_search_hint" msgid="5377706079015099416">"הוסף מספר או חפש אנשי קשר"</string>
-    <string name="call_log_all_empty" msgid="3955572868518162004">"היסטוריית השיחות שלך ריקה"</string>
-    <string name="call_log_all_empty_action" msgid="852218280136243014">"התקשר"</string>
-    <string name="call_log_missed_empty" msgid="7094936030845062214">"אין שיחות שלא נענו."</string>
-    <string name="call_log_voicemail_empty" msgid="273623903423275178">"תיבת הדואר הקולי ריקה."</string>
-    <string name="call_log_activity_title" msgid="1275242727244945527">"היסטוריית שיחות"</string>
-    <string name="call_log_all_title" msgid="6042262422192020327">"הכל"</string>
-    <string name="call_log_missed_title" msgid="17254005889268015">"שיחות שלא נענו"</string>
-    <string name="tab_speed_dial" msgid="6616404752227561075">"חיוג מהיר"</string>
-    <string name="tab_history" msgid="7420269368689503596">"היסטוריית שיחות"</string>
-    <string name="tab_all_contacts" msgid="5531733977693943015">"אנשי קשר"</string>
-    <string name="tab_voicemail" msgid="2458548090088316246">"דואר קולי"</string>
-    <string name="search_shortcut_call_number" msgid="8847918845036880688">"התקשר אל <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"איש קשר חדש"</string>
-    <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"הוסף לאיש קשר"</string>
-    <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"‏שלח SMS"</string>
-    <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"בצע שיחת וידאו"</string>
-    <string name="search_shortcut_block_number" msgid="4587283230665805776">"חסום מספר"</string>
-    <string name="speed_dial_empty" msgid="3346406399966039505">"עדיין לא הוגדר חיוג מהיר לאף איש קשר"</string>
-    <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"הוסף פריט מועדף"</string>
-    <string name="remove_contact" msgid="2353580570488923668">"הסר"</string>
-    <string name="select_all" msgid="408601760696146245">"בחירת הכל"</string>
-    <string name="call_log_action_video_call" msgid="7565549950343850819">"שיחת וידאו"</string>
-    <string name="call_log_action_send_message" msgid="6948727362660115554">"שלח הודעה"</string>
-    <string name="call_log_action_details" msgid="2091370737371449501">"פרטי שיחה"</string>
-    <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"שלח אל..."</string>
-    <string name="call_log_action_call" msgid="682724094251540583">"התקשר אל <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_incoming_missed_call" msgid="8292535799379230029">"שיחה לא נענתה מ-<xliff:g id="NAMEORNUMBER">^1</xliff:g>‏, <xliff:g id="TYPEORLOCATION">^2</xliff:g>‏, <xliff:g id="TIMEOFCALL">^3</xliff:g>‏, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_incoming_answered_call" msgid="3920182963103160610">"נענתה שיחה מ-<xliff:g id="NAMEORNUMBER">^1</xliff:g>‏, <xliff:g id="TYPEORLOCATION">^2</xliff:g>‏, <xliff:g id="TIMEOFCALL">^3</xliff:g>‏, <xliff:g id="PHONEACCOUNT">^4</xliff:g>‏."</string>
-    <string name="description_unread_voicemail" msgid="145170985013419170">"דואר קולי שלא נקרא מ-<xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_read_voicemail" msgid="5585559881573227732">"דואר קולי מ-<xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_outgoing_call" msgid="543952487882919924">"שיחה אל <xliff:g id="NAMEORNUMBER">^1</xliff:g>‏, <xliff:g id="TYPEORLOCATION">^2</xliff:g>‏, <xliff:g id="TIMEOFCALL">^3</xliff:g>‏, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="call_log_via_number" msgid="1340307109806397650">"דרך <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> דרך <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="description_call_action" msgid="4042796498169106545">"התקשר אל <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_video_call_action" msgid="1237090968588659650">"שיחת וידאו עם <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
-    <string name="description_voicemail_action" msgid="3290143432403538524">"האזן לדואר קולי מאת <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_create_new_contact_action" msgid="1928282350281564130">"צור איש קשר בשביל <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"הוסף את <xliff:g id="NAMEORNUMBER">^1</xliff:g> לאיש קשר קיים"</string>
-    <string name="description_details_action" msgid="2061866409737706174">"פרטי שיחה עבור <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="call_log_header_today" msgid="1576119097475845293">"היום"</string>
-    <string name="call_log_header_yesterday" msgid="5616077776205329563">"אתמול"</string>
-    <string name="call_log_header_other" msgid="4940676886254217644">"ישנות יותר"</string>
-    <string name="voicemail_speaker_on" msgid="3151333608926996668">"הפעל את הרמקול."</string>
-    <string name="voicemail_speaker_off" msgid="2530064206962034201">"כבה את הרמקול."</string>
-    <string name="voicemail_play_start_pause" msgid="3874823480278334664">"התחל או השהה הפעלה."</string>
-    <string name="display_options_title" msgid="3880091801055797975">"אפשרויות תצוגה"</string>
-    <string name="sounds_and_vibration_title" msgid="3075050000721181384">"צלילים ורטט"</string>
-    <string name="accessibility_settings_title" msgid="3329027650429831820">"נגישות"</string>
-    <string name="ringtone_title" msgid="8377174189894648486">"רינגטון של טלפון"</string>
-    <string name="vibrate_on_ring_title" msgid="631441314790960485">"רטט גם עבור שיחות"</string>
-    <string name="dtmf_tone_enable_title" msgid="3273762431523939277">"צלילי לוח החיוג"</string>
-    <string name="dtmf_tone_length_title" msgid="534096029202438539">"אורך הצלילים של לוח החיוג"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="applicationLabel">טלפון</string>
+  <string name="launcherDialpadActivityLabel">לוח החיוג של הטלפון</string>
+  <string name="callHistoryIconLabel">היסטוריית שיחות</string>
+  <string name="action_copy_number_text">העתק מספר</string>
+  <string name="copy_transcript_text">העתק תמלול</string>
+  <string name="action_edit_number_before_call">ערוך את המספר לפני השיחה</string>
+  <string name="call_log_delete_all">נקה את היסטוריית השיחות</string>
+  <string name="call_log_trash_voicemail">מחק דואר קולי</string>
+  <string name="snackbar_voicemail_deleted">דואר קולי נמחק</string>
+  <string name="clearCallLogConfirmation_title">האם לנקות את היסטוריית השיחות?</string>
+  <string name="clearCallLogConfirmation">פעולה זו תמחק את כל השיחות מההיסטוריה שלך</string>
+  <string name="clearCallLogProgress_title">מנקה היסטוריית שיחות…</string>
+  <string name="notification_missedCallTitle">שיחה שלא נענתה</string>
+  <string name="notification_missedWorkCallTitle">שיחה עסקית שלא נענתה</string>
+  <string name="notification_missedCallsTitle">שיחות שלא נענו</string>
+  <string name="notification_missedCallsMsg">%d שיחות שלא נענו</string>
+  <string name="notification_missedCall_call_back">התקשר חזרה</string>
+  <string name="notification_missedCall_message">הודעה</string>
+  <string name="post_call_notification_message">%1$s: %2$s</string>
+  <string name="notification_voicemail_text_format">‏חיוג אל ‎%s‎</string>
+  <string name="notification_voicemail_no_vm_number">המספר של תא הדואר הקולי אינו ידוע</string>
+  <plurals name="notification_voicemail_title">
+    <item quantity="one">הודעת דואר קולי</item>
+    <item quantity="two"> %1$d הודעות דואר קולי </item>
+    <item quantity="many"> %1$d הודעות דואר קולי </item>
+    <item quantity="other"> %1$d הודעות דואר קולי </item>
+  </plurals>
+  <string name="notification_voicemail_callers_list">%1$s, %2$s</string>
+  <string name="notification_new_voicemail_ticker">דואר קולי חדש מאת %1$s</string>
+  <string name="voicemail_playback_error">לא ניתן היה להשמיע דואר קולי</string>
+  <string name="voicemail_fetching_content">טוען דואר קולי…</string>
+  <string name="voicemail_fetching_timout">לא ניתן היה לטעון דואר קולי</string>
+  <string name="call_log_item_count_and_date">(%1$d) %2$s</string>
+  <string name="description_playback_speakerphone">הפעל או כבה את רמקול הטלפון</string>
+  <string name="description_playback_seek">חפש מיקום בהפעלה</string>
+  <string name="action_menu_call_history_description">היסטוריית שיחות</string>
+  <string msgid="2295659037509008453" name="action_menu_overflow_description">אפשרויות נוספות</string>
+  <string name="action_menu_dialpad_button">לוח חיוג</string>
+  <string name="dialer_settings_label">הגדרות</string>
+  <string name="simulator_submenu_label">סימולטור</string>
+  <string name="new_ui_launcher_shortcut_label">יצירת קיצור דרך לממשק החדש</string>
+  <string name="description_entering_bulk_action_mode">עברת למצב של ביצוע פעולות בכמות גדולה</string>
+  <string name="description_leaving_bulk_action_mode">עזבת את המצב של ביצוע פעולות בכמות גדולה</string>
+  <string name="description_selecting_bulk_action_mode">בחרת את %1$s</string>
+  <string name="description_unselecting_bulk_action_mode">ביטלת את הבחירה של %1$s</string>
+  <string name="description_contact_details">פרטי יצירת קשר עבור %1$s</string>
+  <string name="description_spam_contact_details">פרטי התקשרות לשיחה שחשודה כספאם %1$s</string>
+  <string name="description_num_calls">%1$s שיחות.</string>
+  <string name="description_video_call">שיחת וידאו.</string>
+  <string name="description_start_voice_search">התחל חיפוש קולי</string>
+  <string name="voicemail">דואר קולי</string>
+  <string name="description_cancel_multi_select">ביטול המצב של ביצוע פעולות בכמות גדולה</string>
+  <string name="voicemailMultiSelectDeleteConfirm">מחיקה</string>
+  <string name="voicemailMultiSelectDeleteCancel">ביטול</string>
+  <string name="voicemailMultiSelectActionBarTitle">%1$s נבחרו</string>
+  <plurals name="delete_voicemails_confirmation_dialog_title">
+    <item quantity="one"><b>האם למחוק את ההודעה הקולית הזו? </b></item>
+    <item quantity="two"><b>האם למחוק את ההודעות הקוליות האלה? </b></item>
+    <item quantity="many"><b>האם למחוק את ההודעות הקוליות האלה? </b></item>
+    <item quantity="other"><b>האם למחוק את ההודעות הקוליות האלה? </b></item>
+  </plurals>
+  <string name="voicemailCallLogToday">@string/call_log_header_today</string>
+  <string name="voicemailCallLogDateTimeFormat">%1$s ב-%2$s</string>
+  <string name="voicemailDurationFormat">%1$02d:%2$02d</string>
+  <string name="voicemailCallLogDateTimeFormatWithDuration">%1$s • %2$s</string>
+  <string name="voice_search_not_available">חיפוש קולי אינו זמין</string>
+  <string name="dialer_hint_find_contact">חפש אנשי קשר</string>
+  <string name="block_number_search_hint">הוסף מספר או חפש אנשי קשר</string>
+  <string name="call_log_all_empty">היסטוריית השיחות שלך ריקה</string>
+  <string name="call_log_all_empty_action">התקשר</string>
+  <string name="call_log_missed_empty">אין שיחות שלא נענו.</string>
+  <string name="call_log_voicemail_empty">תיבת הדואר הקולי ריקה.</string>
+  <string name="call_log_activity_title">היסטוריית שיחות</string>
+  <string name="call_log_all_title">הכל</string>
+  <string name="call_log_missed_title">שיחות שלא נענו</string>
+  <string name="tab_speed_dial">חיוג מהיר</string>
+  <string name="tab_history">היסטוריית שיחות</string>
+  <string name="tab_all_contacts">אנשי קשר</string>
+  <string name="tab_voicemail">דואר קולי</string>
+  <string name="search_shortcut_call_number">התקשר אל %s</string>
+  <string name="search_shortcut_create_new_contact">איש קשר חדש</string>
+  <string name="search_shortcut_add_to_contact">הוסף לאיש קשר</string>
+  <string name="search_shortcut_send_sms_message">‏שלח SMS</string>
+  <string name="search_shortcut_make_video_call">בצע שיחת וידאו</string>
+  <string name="search_shortcut_block_number">חסום מספר</string>
+  <string name="speed_dial_empty">עדיין לא הוגדר חיוג מהיר לאף איש קשר</string>
+  <string name="speed_dial_empty_add_favorite_action">הוסף פריט מועדף</string>
+  <string name="remove_contact">הסר</string>
+  <string name="select_all">בחירת הכל</string>
+  <string name="call_log_action_video_call">שיחת וידאו</string>
+  <string name="call_log_action_set_up_video">התחלה של שיחת וידאו</string>
+  <string name="call_log_action_invite_video">הזמנה לשיחת וידאו</string>
+  <string name="call_log_action_send_message">שלח הודעה</string>
+  <string name="call_log_action_details">פרטי שיחה</string>
+  <string name="call_log_action_share_voicemail">שלח אל...</string>
+  <string name="call_log_action_call">התקשר אל ^1</string>
+  <string name="description_incoming_missed_call">שיחה לא נענתה מ-^1‏, ^2‏, ^3‏, ^4.</string>
+  <string name="description_incoming_answered_call">נענתה שיחה מ-^1‏, ^2‏, ^3‏, ^4‏.</string>
+  <string name="description_unread_voicemail">דואר קולי שלא נקרא מ-^1, ^2, ^3, ^4.</string>
+  <string name="description_read_voicemail">דואר קולי מ-^1, ^2, ^3, ^4.</string>
+  <string name="description_outgoing_call">שיחה אל ^1‏, ^2‏, ^3‏, ^4.</string>
+  <string name="call_log_via_number">דרך %1$s</string>
+  <string name="call_log_via_number_phone_account">%1$s דרך %2$s</string>
+  <string name="description_call_action">התקשר אל ^1</string>
+  <string name="description_video_call_action">שיחת וידאו עם ^1.</string>
+  <string name="description_voicemail_action">האזן לדואר קולי מאת ^1</string>
+  <string name="description_create_new_contact_action">צור איש קשר בשביל ^1</string>
+  <string name="description_add_to_existing_contact_action">הוסף את ^1 לאיש קשר קיים</string>
+  <string name="description_details_action">פרטי שיחה עבור ^1</string>
+  <string name="call_log_header_today">היום</string>
+  <string name="call_log_header_yesterday">אתמול</string>
+  <string name="call_log_header_other">ישנות יותר</string>
+  <string name="voicemail_speaker_on">הפעל את הרמקול.</string>
+  <string name="voicemail_speaker_off">כבה את הרמקול.</string>
+  <string name="voicemail_play_start_pause">התחל או השהה הפעלה.</string>
+  <string name="display_options_title">אפשרויות תצוגה</string>
+  <string name="sounds_and_vibration_title">צלילים ורטט</string>
+  <string name="accessibility_settings_title">נגישות</string>
+  <string name="ringtone_title">רינגטון של טלפון</string>
+  <string name="vibrate_on_ring_title">רטט גם עבור שיחות</string>
+  <string name="dtmf_tone_enable_title">צלילי לוח החיוג</string>
+  <string name="dtmf_tone_length_title">אורך הצלילים של לוח החיוג</string>
   <string-array name="dtmf_tone_length_entries">
-    <item msgid="3136353015227162823">"רגיל"</item>
-    <item msgid="5376841175538523822">"ארוך"</item>
+    <item>רגיל</item>
+    <item>ארוך</item>
   </string-array>
-    <string name="respond_via_sms_setting_title" msgid="8008181606657693452">"תגובות מהירות"</string>
-    <string name="call_settings_label" msgid="7824611757200960807">"שיחות"</string>
-    <string name="manage_blocked_numbers_label" msgid="16823761991832273">"חסימת שיחות"</string>
-    <string name="voicemail_settings_label" msgid="4594299554519920570">"דואר קולי"</string>
-    <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"חסימת השיחות מושבתת באופן זמני"</string>
-    <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"חסימת השיחות הושבתה מפני שיצרת קשר מטלפון זה עם שירותי חירום במהלך 48 השעות האחרונות. הפונקציה תופעל מחדש באופן אוטומטי בתום 48 השעות."</string>
-    <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"יבא מספרים"</string>
-    <string name="blocked_call_settings_import_description" msgid="1819412052545228965">"סימנת בעבר באמצעות יישומים אחרים כמה מתקשרים שיישלחו באופן אוטומטי לדואר קולי."</string>
-    <string name="blocked_call_settings_view_numbers_button" msgid="3332727948554356704">"הצג מספרים"</string>
-    <string name="blocked_call_settings_import_button" msgid="7319111700387470727">"יבא"</string>
-    <string name="description_blocked_number_list_delete" msgid="2139644216858370740">"בטל חסימת מספר"</string>
-    <string name="addBlockedNumber" msgid="3053473735238295551">"הוסף מספר"</string>
-    <string name="block_number_footer_message_vvm" msgid="7955326304033982368">"שיחות ממספרים אלה ייחסמו והודעות דואר קולי יימחקו באופן אוטומטי."</string>
-    <string name="block_number_footer_message_no_vvm" msgid="1152684139070471665">"שיחות ממספרים אלה ייחסמו, אבל המתקשרים עדיין יוכלו להשאיר לך הודעות דואר קולי."</string>
-    <string name="block_list" msgid="4701585783411870782">"מספרים חסומים"</string>
-    <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g> כבר חסום."</string>
-    <string name="phone_account_settings_label" msgid="8372485478006965920">"חשבונות לביצוע שיחות"</string>
-    <string name="permission_no_speeddial" msgid="8487215628510596753">"כדי להפעיל חיוג מהיר, הפעל את ההרשאה \'אנשי קשר\'."</string>
-    <string name="permission_no_calllog" msgid="4053705651238775784">"כדי לראות את יומן השיחות, הפעל את ההרשאה \'טלפון\'."</string>
-    <string name="permission_no_search" msgid="2424710404207193826">"כדי לחפש באנשי הקשר, הפעל את ההרשאה \'אנשי קשר\'."</string>
-    <string name="permission_place_call" msgid="8686908130349369423">"כדי להתקשר, הפעל את ההרשאה \'טלפון\'."</string>
-    <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"לאפליקציית הטלפון אין הרשאה לכתוב בהגדרות המערכת."</string>
-    <string name="blocked_number_call_log_label" msgid="4212282846299997693">"חסום"</string>
-    <string name="call_log_action_block_report_number" msgid="7302636538668696729">"חסום/דווח על ספאם"</string>
-    <string name="call_log_action_block_number" msgid="5048188386501998865">"חסום מספר"</string>
-    <string name="call_log_action_remove_spam" msgid="2045319806318398403">"לא ספאם"</string>
-    <string name="call_log_action_unblock_number" msgid="6100117033288448758">"בטל חסימת מספר"</string>
-    <string name="spam_number_call_log_label" msgid="2678431398326811131">"ספאם"</string>
-    <string name="call_composer_connection_failed" msgid="6776461585447831242">"לא ניתן להתקשר כי המכשיר של <xliff:g id="NAME">%1$s</xliff:g> לא מחובר כרגע"</string>
-    <string name="about_phone_label" msgid="582991354677973731">"מידע כללי"</string>
-    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"‏התעתוק בוצע על ידי Google"</string>
-    <string name="voicemail_transcription_in_progress" msgid="2933320969613783210">"‏ההודעה מתומללת על ידי Google…"</string>
-    <string name="voicemail_transcription_failed" msgid="335275303117412706">"התמלול לא בוצע."</string>
-    <string name="voicemail_transcription_failed_language_not_supported" msgid="4210332591050562553">"התמלול לא בוצע מכיוון שהשפה לא נתמכת."</string>
-    <string name="voicemail_transcription_failed_no_speech" msgid="9093372879697874852">"התמלול לא בוצע מכיוון שלא זיהינו דיבור."</string>
-    <string name="view_conversation" msgid="7895904782094119702">"הצג"</string>
-    <string name="ec_data_deleted" msgid="4794880345545827107">"השיחה נמחקה. כדי להציג ולמחוק קבצים מצורפים ששותפו בזמן השיחה, עבור ל\'הודעות\'."</string>
-    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"השיחות נמחקו. כדי להציג ולמחוק קבצים מצורפים ששותפו בזמן השיחות, עבור ל\'הודעות\'."</string>
+  <string name="respond_via_sms_setting_title">תגובות מהירות</string>
+  <string name="call_settings_label">שיחות</string>
+  <string name="manage_blocked_numbers_label">מספרים חסומים</string>
+  <string name="voicemail_settings_label">דואר קולי</string>
+  <string name="blocked_numbers_disabled_emergency_header_label">חסימת השיחות מושבתת באופן זמני</string>
+  <string name="blocked_numbers_disabled_emergency_desc">חסימת השיחות הושבתה מפני שיצרת קשר מטלפון זה עם שירותי חירום במהלך 48 השעות האחרונות. הפונקציה תופעל מחדש באופן אוטומטי בתום 48 השעות.</string>
+  <string name="import_send_to_voicemail_numbers_label">יבא מספרים</string>
+  <string name="blocked_call_settings_import_description">סימנת בעבר באמצעות יישומים אחרים כמה מתקשרים שיישלחו באופן אוטומטי לדואר קולי.</string>
+  <string name="blocked_call_settings_view_numbers_button">הצג מספרים</string>
+  <string name="blocked_call_settings_import_button">יבא</string>
+  <string name="description_blocked_number_list_delete">בטל חסימת מספר</string>
+  <string name="addBlockedNumber">הוסף מספר</string>
+  <string name="block_number_footer_message_vvm">שיחות ממספרים אלה ייחסמו והודעות דואר קולי יימחקו באופן אוטומטי.</string>
+  <string name="block_number_footer_message_no_vvm">שיחות ממספרים אלה ייחסמו, אבל המתקשרים עדיין יוכלו להשאיר לך הודעות דואר קולי.</string>
+  <string name="block_list">מספרים חסומים</string>
+  <string name="alreadyBlocked">%1$s כבר חסום.</string>
+  <string name="phone_account_settings_label">חשבונות לביצוע שיחות</string>
+  <string name="permission_no_speeddial">כדי להפעיל חיוג מהיר, הפעל את ההרשאה \'אנשי קשר\'.</string>
+  <string name="permission_no_calllog">כדי לראות את יומן השיחות, הפעל את ההרשאה \'טלפון\'.</string>
+  <string name="permission_no_search">כדי לחפש באנשי הקשר, הפעל את ההרשאה \'אנשי קשר\'.</string>
+  <string name="permission_place_call">כדי להתקשר, הפעל את ההרשאה \'טלפון\'.</string>
+  <string name="toast_cannot_write_system_settings">לאפליקציית הטלפון אין הרשאה לכתוב בהגדרות המערכת.</string>
+  <string name="blocked_number_call_log_label">חסום</string>
+  <string name="call_log_action_block_report_number">חסום/דיווח על ספאם</string>
+  <string name="call_log_action_block_number">חסום מספר</string>
+  <string name="call_log_action_remove_spam">לא ספאם</string>
+  <string name="call_log_action_unblock_number">בטל חסימת מספר</string>
+  <string name="spam_number_call_log_label">ספאם</string>
+  <string name="call_composer_connection_failed">לא ניתן להתקשר כי המכשיר של %1$s לא מחובר כרגע</string>
+  <string name="about_phone_label">מידע כללי</string>
+  <string name="voicemail_transcription_branding_text">‏התעתוק בוצע על ידי Google</string>
+  <string name="voicemail_transcription_in_progress">אנחנו מתמללים…</string>
+  <string name="voicemail_transcription_failed">התמלול לא בוצע.</string>
+  <string name="voicemail_transcription_failed_language_not_supported">התמלול לא בוצע מכיוון שהשפה לא נתמכת.</string>
+  <string name="voicemail_transcription_failed_no_speech">התמלול לא בוצע מכיוון שלא זיהינו דיבור.</string>
+  <string name="voicemail_donation_promo_title">רוצה לעזור לנו לשפר את דיוק התמלול?</string>
+  <string name="voicemail_donation_promo_content">‏נשמח לקבל ממך אישור לבדוק את ההודעות הקוליות שלך ואת התמלולים שלהן עכשיו ובעתיד. ההודעות והתמלולים יישמרו באופן אנונימי על ידי Google ואפשר לשנות את ההגדרה הזו מתי שרוצים. %1$s</string>
+  <string name="voicemail_donation_promo_opt_in">כן, אני רוצה</string>
+  <string name="voicemail_donation_promo_opt_out">לא תודה</string>
+  <string name="voicemail_transcription_rating">רוצה לדרג את האיכות של התמלול?</string>
+  <string name="voicemail_transcription_rating_thanks">תודה על המשוב</string>
+  <string name="description_rating_good">אהבתי</string>
+  <string name="description_rating_bad">לא אהבתי</string>
+  <string name="view_conversation">הצג</string>
+  <string name="ec_data_deleted">השיחה נמחקה. כדי להציג ולמחוק קבצים מצורפים ששותפו בזמן השיחה, עבור ל\'הודעות\'.</string>
+  <string name="multiple_ec_data_deleted">השיחות נמחקו. כדי להציג ולמחוק קבצים מצורפים ששותפו בזמן השיחות, עבור ל\'הודעות\'.</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-ja/strings.xml b/java/com/android/dialer/app/res/values-ja/strings.xml
index fa9889c..d9cf44c 100644
--- a/java/com/android/dialer/app/res/values-ja/strings.xml
+++ b/java/com/android/dialer/app/res/values-ja/strings.xml
@@ -1,179 +1,171 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="applicationLabel" msgid="2202739481132958990">"電話"</string>
-    <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"スマートフォンのキーパッド"</string>
-    <string name="callHistoryIconLabel" msgid="7493268743411968630">"通話履歴"</string>
-    <string name="action_copy_number_text" msgid="832682558551502319">"番号をコピー"</string>
-    <string name="copy_transcript_text" msgid="937904189017310829">"音声文字変換をコピー"</string>
-    <string name="action_edit_number_before_call" msgid="8017492815878473837">"発信前に番号を編集"</string>
-    <string name="call_log_delete_all" msgid="7852970926906523784">"通話履歴を消去"</string>
-    <string name="call_log_trash_voicemail" msgid="6118493534178533972">"ボイスメールを削除"</string>
-    <string name="snackbar_voicemail_deleted" msgid="7463166543725496307">"ボイスメールの削除"</string>
-    <string name="snackbar_voicemail_deleted_undo" msgid="6959743982796409941">"元に戻す"</string>
-    <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"通話履歴を消去しますか？"</string>
-    <string name="clearCallLogConfirmation" msgid="6844949465815109166">"消去すると、すべての通話が履歴から削除されます"</string>
-    <string name="clearCallLogProgress_title" msgid="995004835687361977">"通話履歴の消去中…"</string>
-    <string name="notification_missedCallTitle" msgid="8283366068539898486">"不在着信"</string>
-    <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"仕事の通話の不在着信"</string>
-    <string name="notification_missedCallsTitle" msgid="3697442015345089802">"不在着信"</string>
-    <string name="notification_missedCallsMsg" msgid="8176217633929018706">"不在着信 <xliff:g id="NUM_MISSED_CALLS">%d</xliff:g> 件"</string>
-    <string name="notification_missedCall_call_back" msgid="3875698110051973965">"コールバック"</string>
-    <string name="notification_missedCall_message" msgid="5086910028988305964">"メッセージ"</string>
-    <string name="post_call_notification_message" msgid="5417476789860590611">"<xliff:g id="NAME">%1$s</xliff:g> さん: <xliff:g id="MESSAGE">%2$s</xliff:g>"</string>
-    <string name="notification_voicemail_text_format" msgid="1895667520930252897">"<xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g> 宛に発信"</string>
-    <string name="notification_voicemail_no_vm_number" msgid="8942821987929495842">"ボイスメールの番号が不明です"</string>
-    <plurals name="notification_voicemail_title" formatted="false" msgid="1551847434476438657">
-      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g>件のボイスメール</item>
-      <item quantity="one">1件のボイスメール</item>
-    </plurals>
-    <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>、<xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
-    <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"<xliff:g id="CALLER">%1$s</xliff:g>から新着ボイスメール"</string>
-    <string name="voicemail_playback_error" msgid="4384373852257757295">"ボイスメールを再生できませんでした"</string>
-    <string name="voicemail_fetching_content" msgid="572320120918636014">"ボイスメールを読み込んでいます…"</string>
-    <string name="voicemail_fetching_timout" msgid="2128873915839949783">"ボイスメールを読み込めませんでした"</string>
-    <string name="call_log_item_count_and_date" msgid="723848797957319181">"（<xliff:g id="COUNT">%1$d</xliff:g>）<xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_playback_speakerphone" msgid="4852027754869750227">"スピーカーフォンのON/OFFを切り替える"</string>
-    <string name="description_playback_seek" msgid="1340910573254132520">"再生位置を探す"</string>
-    <string name="action_menu_call_history_description" msgid="8829135306925008546">"通話履歴"</string>
-    <string name="action_menu_overflow_description" msgid="7648679686746517341">"その他のオプション"</string>
-    <string name="action_menu_dialpad_button" msgid="1970631633457493180">"キーパッド"</string>
-    <string name="dialer_settings_label" msgid="4980176284150290175">"設定"</string>
-    <string name="simulator_submenu_label" msgid="186156287346615267">"シミュレーション"</string>
-    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"新しいUIのショートカットを作成"</string>
-    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"一括操作モードを開始します"</string>
-    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"一括操作モードを終了しました"</string>
-    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> を選択しました"</string>
-    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> を選択解除しました"</string>
-    <string name="description_contact_details" msgid="3341280873855253464">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g>の連絡先の詳細"</string>
-    <string name="description_spam_contact_details" msgid="5592578752881528368">"迷惑電話の疑いがある発信者 <xliff:g id="NAMEORNUMBER">%1$s</xliff:g> の連絡先の詳細"</string>
-    <string name="description_num_calls" msgid="6483594535796216044">"通話回数は<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g>回。"</string>
-    <string name="description_video_call" msgid="3738199365585751727">"ビデオハングアウト"</string>
-    <string name="description_start_voice_search" msgid="8380022725973015261">"音声検索を開始"</string>
-    <string name="voicemail" msgid="8899540969000957954">"ボイスメール"</string>
-    <string name="description_cancel_multi_select" msgid="3930475950253360461">"一括操作モードをキャンセルします"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"削除"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"キャンセル"</string>
-    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> 件選択済み"</string>
-    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
-      <item quantity="other">"<b>"これらのボイスメールを削除しますか？"</b>"</item>
-      <item quantity="one">"<b>"このボイスメールを削除しますか？"</b>"</item>
-    </plurals>
-    <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
-    <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g>、<xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g> 分 <xliff:g id="SECONDS">%2$02d</xliff:g> 秒"</string>
-    <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g>（<xliff:g id="DURATION">%2$s</xliff:g>）"</string>
-    <string name="voice_search_not_available" msgid="6546240433719732905">"音声検索を利用できません"</string>
-    <string name="dialer_hint_find_contact" msgid="2023214799381149808">"連絡先を検索"</string>
-    <string name="block_number_search_hint" msgid="5377706079015099416">"番号を追加するか連絡先を検索"</string>
-    <string name="call_log_all_empty" msgid="3955572868518162004">"通話履歴はありません"</string>
-    <string name="call_log_all_empty_action" msgid="852218280136243014">"発信"</string>
-    <string name="call_log_missed_empty" msgid="7094936030845062214">"不在着信はありません。"</string>
-    <string name="call_log_voicemail_empty" msgid="273623903423275178">"ボイスメール受信トレイは空です。"</string>
-    <string name="call_log_activity_title" msgid="1275242727244945527">"通話履歴"</string>
-    <string name="call_log_all_title" msgid="6042262422192020327">"すべて"</string>
-    <string name="call_log_missed_title" msgid="17254005889268015">"不在着信"</string>
-    <string name="tab_speed_dial" msgid="6616404752227561075">"クイックアクセス"</string>
-    <string name="tab_history" msgid="7420269368689503596">"通話履歴"</string>
-    <string name="tab_all_contacts" msgid="5531733977693943015">"連絡先"</string>
-    <string name="tab_voicemail" msgid="2458548090088316246">"ボイスメール"</string>
-    <string name="search_shortcut_call_number" msgid="8847918845036880688">"<xliff:g id="NUMBER">%s</xliff:g>に発信"</string>
-    <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"新しい連絡先を作成"</string>
-    <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"連絡先に追加"</string>
-    <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"SMSを送信"</string>
-    <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"ビデオハングアウト"</string>
-    <string name="search_shortcut_block_number" msgid="4587283230665805776">"番号をブロック"</string>
-    <string name="speed_dial_empty" msgid="3346406399966039505">"クイックアクセスに登録済みの連絡先はまだありません"</string>
-    <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"お気に入りを追加"</string>
-    <string name="remove_contact" msgid="2353580570488923668">"削除"</string>
-    <string name="select_all" msgid="408601760696146245">"すべて選択"</string>
-    <string name="call_log_action_video_call" msgid="7565549950343850819">"ビデオハングアウト"</string>
-    <string name="call_log_action_send_message" msgid="6948727362660115554">"メッセージを送信"</string>
-    <string name="call_log_action_details" msgid="2091370737371449501">"通話の詳細"</string>
-    <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"送信先…"</string>
-    <string name="call_log_action_call" msgid="682724094251540583">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>に発信"</string>
-    <string name="description_incoming_missed_call" msgid="8292535799379230029">"<xliff:g id="TIMEOFCALL">^3</xliff:g>の<xliff:g id="TYPEORLOCATION">^2</xliff:g><xliff:g id="NAMEORNUMBER">^1</xliff:g>（<xliff:g id="PHONEACCOUNT">^4</xliff:g>）からの不在着信。"</string>
-    <string name="description_incoming_answered_call" msgid="3920182963103160610">"<xliff:g id="TIMEOFCALL">^3</xliff:g>の<xliff:g id="TYPEORLOCATION">^2</xliff:g><xliff:g id="NAMEORNUMBER">^1</xliff:g>（<xliff:g id="PHONEACCOUNT">^4</xliff:g>）からの着信。"</string>
-    <string name="description_unread_voicemail" msgid="145170985013419170">"<xliff:g id="TIMEOFCALL">^3</xliff:g>の<xliff:g id="TYPEORLOCATION">^2</xliff:g><xliff:g id="NAMEORNUMBER">^1</xliff:g>（<xliff:g id="PHONEACCOUNT">^4</xliff:g>）からの未読のボイスメール。"</string>
-    <string name="description_read_voicemail" msgid="5585559881573227732">"<xliff:g id="TIMEOFCALL">^3</xliff:g>の<xliff:g id="TYPEORLOCATION">^2</xliff:g><xliff:g id="NAMEORNUMBER">^1</xliff:g>（<xliff:g id="PHONEACCOUNT">^4</xliff:g>）からのボイスメール。"</string>
-    <string name="description_outgoing_call" msgid="543952487882919924">"<xliff:g id="TIMEOFCALL">^3</xliff:g>の<xliff:g id="TYPEORLOCATION">^2</xliff:g><xliff:g id="NAMEORNUMBER">^1</xliff:g>（<xliff:g id="PHONEACCOUNT">^4</xliff:g>）への発信。"</string>
-    <string name="call_log_via_number" msgid="1340307109806397650">"<xliff:g id="NUMBER">%1$s</xliff:g> で受信"</string>
-    <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g>（<xliff:g id="NUMBER">%2$s</xliff:g>）で受信"</string>
-    <string name="description_call_action" msgid="4042796498169106545">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>に発信します"</string>
-    <string name="description_video_call_action" msgid="1237090968588659650">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>にビデオハングアウト発信します。"</string>
-    <string name="description_voicemail_action" msgid="3290143432403538524">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>からのボイスメールを再生"</string>
-    <string name="description_create_new_contact_action" msgid="1928282350281564130">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>の連絡先を作成します"</string>
-    <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"既存の連絡先に<xliff:g id="NAMEORNUMBER">^1</xliff:g>を追加します"</string>
-    <string name="description_details_action" msgid="2061866409737706174">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>の通話の詳細"</string>
-    <string name="call_log_header_today" msgid="1576119097475845293">"今日"</string>
-    <string name="call_log_header_yesterday" msgid="5616077776205329563">"昨日"</string>
-    <string name="call_log_header_other" msgid="4940676886254217644">"以前の着信"</string>
-    <string name="voicemail_speaker_on" msgid="3151333608926996668">"スピーカーをONにします。"</string>
-    <string name="voicemail_speaker_off" msgid="2530064206962034201">"スピーカーをOFFにします。"</string>
-    <string name="voicemail_play_start_pause" msgid="3874823480278334664">"再生を開始または一時停止します。"</string>
-    <string name="display_options_title" msgid="3880091801055797975">"表示オプション"</string>
-    <string name="sounds_and_vibration_title" msgid="3075050000721181384">"音とバイブレーション"</string>
-    <string name="accessibility_settings_title" msgid="3329027650429831820">"ユーザー補助機能"</string>
-    <string name="ringtone_title" msgid="8377174189894648486">"着信音"</string>
-    <string name="vibrate_on_ring_title" msgid="631441314790960485">"着信時にバイブレーションもON"</string>
-    <string name="dtmf_tone_enable_title" msgid="3273762431523939277">"キーパッドの操作音"</string>
-    <string name="dtmf_tone_length_title" msgid="534096029202438539">"キーパッドの操作音の長さ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="applicationLabel">電話</string>
+  <string name="launcherDialpadActivityLabel">スマートフォンのキーパッド</string>
+  <string name="callHistoryIconLabel">通話履歴</string>
+  <string name="action_copy_number_text">番号をコピー</string>
+  <string name="copy_transcript_text">音声文字変換をコピー</string>
+  <string name="action_edit_number_before_call">発信前に番号を編集</string>
+  <string name="call_log_delete_all">通話履歴を消去</string>
+  <string name="call_log_trash_voicemail">ボイスメールを削除</string>
+  <string name="snackbar_voicemail_deleted">ボイスメールの削除</string>
+  <string name="clearCallLogConfirmation_title">通話履歴を消去しますか？</string>
+  <string name="clearCallLogConfirmation">消去すると、すべての通話が履歴から削除されます</string>
+  <string name="clearCallLogProgress_title">通話履歴の消去中…</string>
+  <string name="notification_missedCallTitle">不在着信</string>
+  <string name="notification_missedWorkCallTitle">仕事の通話の不在着信</string>
+  <string name="notification_missedCallsTitle">不在着信</string>
+  <string name="notification_missedCallsMsg">不在着信 %d 件</string>
+  <string name="notification_missedCall_call_back">コールバック</string>
+  <string name="notification_missedCall_message">メッセージ</string>
+  <string name="post_call_notification_message">%1$s さん: %2$s</string>
+  <string name="notification_voicemail_text_format">%s 宛に発信</string>
+  <string name="notification_voicemail_no_vm_number">ボイスメールの番号が不明です</string>
+  <plurals name="notification_voicemail_title">
+    <item quantity="one">1件のボイスメール</item>
+    <item quantity="other">%1$d件のボイスメール</item>
+  </plurals>
+  <string name="notification_voicemail_callers_list">%1$s、%2$s</string>
+  <string name="notification_new_voicemail_ticker">%1$sから新着ボイスメール</string>
+  <string name="voicemail_playback_error">ボイスメールを再生できませんでした</string>
+  <string name="voicemail_fetching_content">ボイスメールを読み込んでいます…</string>
+  <string name="voicemail_fetching_timout">ボイスメールを読み込めませんでした</string>
+  <string name="call_log_item_count_and_date">（%1$d）%2$s</string>
+  <string name="description_playback_speakerphone">スピーカーフォンのON/OFFを切り替える</string>
+  <string name="description_playback_seek">再生位置を探す</string>
+  <string name="action_menu_call_history_description">通話履歴</string>
+  <string msgid="2295659037509008453" name="action_menu_overflow_description">その他のオプション</string>
+  <string name="action_menu_dialpad_button">キーパッド</string>
+  <string name="dialer_settings_label">設定</string>
+  <string name="simulator_submenu_label">シミュレーション</string>
+  <string name="new_ui_launcher_shortcut_label">新しいUIのショートカットを作成</string>
+  <string name="description_entering_bulk_action_mode">一括操作モードを開始します</string>
+  <string name="description_leaving_bulk_action_mode">一括操作モードを終了しました</string>
+  <string name="description_selecting_bulk_action_mode">%1$s を選択しました</string>
+  <string name="description_unselecting_bulk_action_mode">%1$s を選択解除しました</string>
+  <string name="description_contact_details">%1$sの連絡先の詳細</string>
+  <string name="description_spam_contact_details">迷惑電話の疑いがある発信者 %1$s の連絡先の詳細</string>
+  <string name="description_num_calls">通話回数は%1$s回。</string>
+  <string name="description_video_call">ビデオハングアウト</string>
+  <string name="description_start_voice_search">音声検索を開始</string>
+  <string name="voicemail">ボイスメール</string>
+  <string name="description_cancel_multi_select">一括操作モードをキャンセルします</string>
+  <string name="voicemailMultiSelectDeleteConfirm">削除</string>
+  <string name="voicemailMultiSelectDeleteCancel">キャンセル</string>
+  <string name="voicemailMultiSelectActionBarTitle">%1$s 件選択済み</string>
+  <plurals name="delete_voicemails_confirmation_dialog_title">
+    <item quantity="one"><b>このボイスメールを削除しますか？</b></item>
+    <item quantity="other"><b>これらのボイスメールを削除しますか？</b></item>
+  </plurals>
+  <string name="voicemailCallLogToday">@string/call_log_header_today</string>
+  <string name="voicemailCallLogDateTimeFormat">%1$s、%2$s</string>
+  <string name="voicemailDurationFormat">%1$02d 分 %2$02d 秒</string>
+  <string name="voicemailCallLogDateTimeFormatWithDuration">%1$s（%2$s）</string>
+  <string name="voice_search_not_available">音声検索を利用できません</string>
+  <string name="dialer_hint_find_contact">連絡先を検索</string>
+  <string name="block_number_search_hint">番号を追加するか連絡先を検索</string>
+  <string name="call_log_all_empty">通話履歴はありません</string>
+  <string name="call_log_all_empty_action">発信</string>
+  <string name="call_log_missed_empty">不在着信はありません。</string>
+  <string name="call_log_voicemail_empty">ボイスメール受信トレイは空です。</string>
+  <string name="call_log_activity_title">通話履歴</string>
+  <string name="call_log_all_title">すべて</string>
+  <string name="call_log_missed_title">不在着信</string>
+  <string name="tab_speed_dial">クイックアクセス</string>
+  <string name="tab_history">通話履歴</string>
+  <string name="tab_all_contacts">連絡先</string>
+  <string name="tab_voicemail">ボイスメール</string>
+  <string name="search_shortcut_call_number">%sに発信</string>
+  <string name="search_shortcut_create_new_contact">新しい連絡先を作成</string>
+  <string name="search_shortcut_add_to_contact">連絡先に追加</string>
+  <string name="search_shortcut_send_sms_message">SMSを送信</string>
+  <string name="search_shortcut_make_video_call">ビデオハングアウト</string>
+  <string name="search_shortcut_block_number">番号をブロック</string>
+  <string name="speed_dial_empty">クイックアクセスに登録済みの連絡先はありません</string>
+  <string name="speed_dial_empty_add_favorite_action">お気に入りを追加</string>
+  <string name="remove_contact">削除</string>
+  <string name="select_all">すべて選択</string>
+  <string name="call_log_action_video_call">ビデオハングアウト</string>
+  <string name="call_log_action_set_up_video">ビデオ通話をセットアップ</string>
+  <string name="call_log_action_invite_video">ビデオ通話に招待</string>
+  <string name="call_log_action_send_message">メッセージを送信</string>
+  <string name="call_log_action_details">通話の詳細</string>
+  <string name="call_log_action_share_voicemail">送信先…</string>
+  <string name="call_log_action_call">^1に発信</string>
+  <string name="description_incoming_missed_call">^3の^2^1（^4）からの不在着信。</string>
+  <string name="description_incoming_answered_call">^3の^2^1（^4）からの着信。</string>
+  <string name="description_unread_voicemail">^3の^2^1（^4）からの未読のボイスメール。</string>
+  <string name="description_read_voicemail">^3の^2^1（^4）からのボイスメール。</string>
+  <string name="description_outgoing_call">^3の^2^1（^4）への発信。</string>
+  <string name="call_log_via_number">%1$s で受信</string>
+  <string name="call_log_via_number_phone_account">%1$s（%2$s）で受信</string>
+  <string name="description_call_action">^1に発信します</string>
+  <string name="description_video_call_action">^1にビデオハングアウト発信します。</string>
+  <string name="description_voicemail_action">^1からのボイスメールを再生</string>
+  <string name="description_create_new_contact_action">^1の連絡先を作成します</string>
+  <string name="description_add_to_existing_contact_action">既存の連絡先に^1を追加します</string>
+  <string name="description_details_action">^1の通話の詳細</string>
+  <string name="call_log_header_today">今日</string>
+  <string name="call_log_header_yesterday">昨日</string>
+  <string name="call_log_header_other">以前の着信</string>
+  <string name="voicemail_speaker_on">スピーカーをONにします。</string>
+  <string name="voicemail_speaker_off">スピーカーをOFFにします。</string>
+  <string name="voicemail_play_start_pause">再生を開始または一時停止します。</string>
+  <string name="display_options_title">表示オプション</string>
+  <string name="sounds_and_vibration_title">音とバイブレーション</string>
+  <string name="accessibility_settings_title">ユーザー補助機能</string>
+  <string name="ringtone_title">着信音</string>
+  <string name="vibrate_on_ring_title">着信時にバイブレーションもON</string>
+  <string name="dtmf_tone_enable_title">キーパッドの操作音</string>
+  <string name="dtmf_tone_length_title">キーパッドの操作音の長さ</string>
   <string-array name="dtmf_tone_length_entries">
-    <item msgid="3136353015227162823">"標準"</item>
-    <item msgid="5376841175538523822">"長め"</item>
+    <item>標準</item>
+    <item>長め</item>
   </string-array>
-    <string name="respond_via_sms_setting_title" msgid="8008181606657693452">"クイック返信"</string>
-    <string name="call_settings_label" msgid="7824611757200960807">"通話"</string>
-    <string name="manage_blocked_numbers_label" msgid="16823761991832273">"着信のブロック"</string>
-    <string name="voicemail_settings_label" msgid="4594299554519920570">"ボイスメール"</string>
-    <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"着信のブロックは一時的にOFFです"</string>
-    <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"このスマートフォンから緊急通報番号への発信が過去48時間以内に行われているため、着信のブロックは無効になっています。48時間経過すると、着信のブロックは自動的に有効になります。"</string>
-    <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"番号をインポート"</string>
-    <string name="blocked_call_settings_import_description" msgid="1819412052545228965">"以前に一部の発信者について、他のアプリを通じて自動的にボイスメールに転送するようマークを付けています。"</string>
-    <string name="blocked_call_settings_view_numbers_button" msgid="3332727948554356704">"番号を表示"</string>
-    <string name="blocked_call_settings_import_button" msgid="7319111700387470727">"インポート"</string>
-    <string name="description_blocked_number_list_delete" msgid="2139644216858370740">"番号のブロックを解除"</string>
-    <string name="addBlockedNumber" msgid="3053473735238295551">"電話番号を追加"</string>
-    <string name="block_number_footer_message_vvm" msgid="7955326304033982368">"この番号からの着信はブロックされ、ボイスメールは自動的に削除されます。"</string>
-    <string name="block_number_footer_message_no_vvm" msgid="1152684139070471665">"この番号からの着信はブロックされますが、発信者は今後もボイスメールを残すことができます。"</string>
-    <string name="block_list" msgid="4701585783411870782">"ブロックした番号"</string>
-    <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g>は既にブロックしています。"</string>
-    <string name="phone_account_settings_label" msgid="8372485478006965920">"通話アカウント"</string>
-    <string name="permission_no_speeddial" msgid="8487215628510596753">"クイックアクセスを有効にするには、連絡先権限をONにしてください。"</string>
-    <string name="permission_no_calllog" msgid="4053705651238775784">"通話履歴を表示するには、電話権限をONにしてください。"</string>
-    <string name="permission_no_search" msgid="2424710404207193826">"連絡先を検索するには、連絡先権限をONにしてください。"</string>
-    <string name="permission_place_call" msgid="8686908130349369423">"電話をかけるには、電話権限をONにしてください。"</string>
-    <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"電話アプリにはシステム設定への書き込み権限がありません。"</string>
-    <string name="blocked_number_call_log_label" msgid="4212282846299997693">"ブロック済み"</string>
-    <string name="call_log_action_block_report_number" msgid="7302636538668696729">"ブロック / 迷惑電話を報告"</string>
-    <string name="call_log_action_block_number" msgid="5048188386501998865">"番号をブロック"</string>
-    <string name="call_log_action_remove_spam" msgid="2045319806318398403">"迷惑電話ではない"</string>
-    <string name="call_log_action_unblock_number" msgid="6100117033288448758">"番号のブロックを解除"</string>
-    <string name="spam_number_call_log_label" msgid="2678431398326811131">"スパム"</string>
-    <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> さんはオフラインのため、通話を受信できません"</string>
-    <string name="about_phone_label" msgid="582991354677973731">"電話アプリについて"</string>
-    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"文字変換: Google"</string>
-    <string name="voicemail_transcription_in_progress" msgid="2933320969613783210">"Google が文字に変換しています…"</string>
-    <string name="voicemail_transcription_failed" msgid="335275303117412706">"文字に変換できません。"</string>
-    <string name="voicemail_transcription_failed_language_not_supported" msgid="4210332591050562553">"この言語はサポートされていないため、文字に変換できません。"</string>
-    <string name="voicemail_transcription_failed_no_speech" msgid="9093372879697874852">"言語音が検出されなかったため、文字に変換できません。"</string>
-    <string name="view_conversation" msgid="7895904782094119702">"表示"</string>
-    <string name="ec_data_deleted" msgid="4794880345545827107">"通話を削除しました。通話中に共有した添付ファイルを、メッセージで確認して削除してください。"</string>
-    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"通話を削除しました。通話中に共有した添付ファイルを、メッセージで確認して削除してください。"</string>
+  <string name="respond_via_sms_setting_title">クイック返信</string>
+  <string name="call_settings_label">通話</string>
+  <string name="manage_blocked_numbers_label">ブロック中の電話番号</string>
+  <string name="voicemail_settings_label">ボイスメール</string>
+  <string name="blocked_numbers_disabled_emergency_header_label">着信のブロックは一時的にOFFです</string>
+  <string name="blocked_numbers_disabled_emergency_desc">このスマートフォンから緊急通報番号への発信が過去48時間以内に行われているため、着信のブロックは無効になっています。48時間経過すると、着信のブロックは自動的に有効になります。</string>
+  <string name="import_send_to_voicemail_numbers_label">番号をインポート</string>
+  <string name="blocked_call_settings_import_description">以前に一部の発信者について、他のアプリを通じて自動的にボイスメールに転送するようマークを付けています。</string>
+  <string name="blocked_call_settings_view_numbers_button">番号を表示</string>
+  <string name="blocked_call_settings_import_button">インポート</string>
+  <string name="description_blocked_number_list_delete">番号のブロックを解除</string>
+  <string name="addBlockedNumber">電話番号を追加</string>
+  <string name="block_number_footer_message_vvm">この番号からの着信はブロックされ、ボイスメールは自動的に削除されます。</string>
+  <string name="block_number_footer_message_no_vvm">この番号からの着信はブロックされますが、発信者は今後もボイスメールを残すことができます。</string>
+  <string name="block_list">ブロックした番号</string>
+  <string name="alreadyBlocked">%1$sは既にブロックしています。</string>
+  <string name="phone_account_settings_label">通話アカウント</string>
+  <string name="permission_no_speeddial">クイックアクセスを有効にするには、連絡先権限をONにしてください。</string>
+  <string name="permission_no_calllog">通話履歴を表示するには、電話権限をONにしてください。</string>
+  <string name="permission_no_search">連絡先を検索するには、連絡先権限をONにしてください。</string>
+  <string name="permission_place_call">電話をかけるには、電話権限をONにしてください。</string>
+  <string name="toast_cannot_write_system_settings">電話アプリにはシステム設定への書き込み権限がありません。</string>
+  <string name="blocked_number_call_log_label">ブロック済み</string>
+  <string name="call_log_action_block_report_number">ブロック / 迷惑電話を報告</string>
+  <string name="call_log_action_block_number">番号をブロック</string>
+  <string name="call_log_action_remove_spam">迷惑電話ではない</string>
+  <string name="call_log_action_unblock_number">番号のブロックを解除</string>
+  <string name="spam_number_call_log_label">スパム</string>
+  <string name="call_composer_connection_failed">%1$s さんはオフラインのため、通話を受信できません</string>
+  <string name="about_phone_label">電話アプリについて</string>
+  <string name="voicemail_transcription_branding_text">文字変換: Google</string>
+  <string name="voicemail_transcription_in_progress">文字に変換しています…</string>
+  <string name="voicemail_transcription_failed">文字に変換できません。</string>
+  <string name="voicemail_transcription_failed_language_not_supported">この言語はサポートされていないため、文字に変換できません。</string>
+  <string name="voicemail_transcription_failed_no_speech">言語音が検出されなかったため、文字に変換できません。</string>
+  <string name="voicemail_donation_promo_title">音声文字変換機能の精度改善にご協力ください</string>
+  <string name="voicemail_donation_promo_content">よろしければ Google によるボイスメール メッセージと音声文字変換結果の分析にご協力ください。ご協力いただける場合は、今回と以降のメッセージが匿名で保存されます。この設定はいつでも変更していただけます。%1$s</string>
+  <string name="voicemail_donation_promo_opt_in">協力する</string>
+  <string name="voicemail_donation_promo_opt_out">協力しない</string>
+  <string name="voicemail_transcription_rating">文字変換機能を評価してください</string>
+  <string name="voicemail_transcription_rating_thanks">ありがとうございました</string>
+  <string name="description_rating_good">高評価</string>
+  <string name="description_rating_bad">低評価</string>
+  <string name="view_conversation">表示</string>
+  <string name="ec_data_deleted">通話を削除しました。通話中に共有した添付ファイルを、メッセージで確認して削除してください。</string>
+  <string name="multiple_ec_data_deleted">通話を削除しました。通話中に共有した添付ファイルを、メッセージで確認して削除してください。</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-ka/strings.xml b/java/com/android/dialer/app/res/values-ka/strings.xml
index 87ea8fc..ff5c432 100644
--- a/java/com/android/dialer/app/res/values-ka/strings.xml
+++ b/java/com/android/dialer/app/res/values-ka/strings.xml
@@ -1,179 +1,171 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="applicationLabel" msgid="2202739481132958990">"ტელეფონი"</string>
-    <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"ტელეფონის კლავიატურა"</string>
-    <string name="callHistoryIconLabel" msgid="7493268743411968630">"საუბრის ისტორია"</string>
-    <string name="action_copy_number_text" msgid="832682558551502319">"ნომრის კოპირება"</string>
-    <string name="copy_transcript_text" msgid="937904189017310829">"ტრანსკრიპტის კოპირება"</string>
-    <string name="action_edit_number_before_call" msgid="8017492815878473837">"ნომრის რედაქტირება დარეკვამდე"</string>
-    <string name="call_log_delete_all" msgid="7852970926906523784">"ზარის ისტორიის გასუფთავება"</string>
-    <string name="call_log_trash_voicemail" msgid="6118493534178533972">"ხმოვანი ფოსტის წაშლა"</string>
-    <string name="snackbar_voicemail_deleted" msgid="7463166543725496307">"ხმოვანი ფოსტა წაიშალა"</string>
-    <string name="snackbar_voicemail_deleted_undo" msgid="6959743982796409941">"დაბრუნება"</string>
-    <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"გასუფთავდეს ზარის ისტორია?"</string>
-    <string name="clearCallLogConfirmation" msgid="6844949465815109166">"ეს წაშლის ყველა ზარს თქვენი ისტორიიდან"</string>
-    <string name="clearCallLogProgress_title" msgid="995004835687361977">"მიმდ. ზარ. ისტ. გასუფთავება…"</string>
-    <string name="notification_missedCallTitle" msgid="8283366068539898486">"გამოტოვებული ზარი"</string>
-    <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"გამოტოვებული ზარი (სამსახური)"</string>
-    <string name="notification_missedCallsTitle" msgid="3697442015345089802">"გამოტოვებული ზარები"</string>
-    <string name="notification_missedCallsMsg" msgid="8176217633929018706">"<xliff:g id="NUM_MISSED_CALLS">%d</xliff:g> გამოტოვებული ზარი"</string>
-    <string name="notification_missedCall_call_back" msgid="3875698110051973965">"გადარეკვა"</string>
-    <string name="notification_missedCall_message" msgid="5086910028988305964">"შეტყობინება"</string>
-    <string name="post_call_notification_message" msgid="5417476789860590611">"<xliff:g id="NAME">%1$s</xliff:g>: <xliff:g id="MESSAGE">%2$s</xliff:g>"</string>
-    <string name="notification_voicemail_text_format" msgid="1895667520930252897">"<xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>-ის აკრეფა"</string>
-    <string name="notification_voicemail_no_vm_number" msgid="8942821987929495842">"ხმოვანი ფოსტის ნომერი უცნობია"</string>
-    <plurals name="notification_voicemail_title" formatted="false" msgid="1551847434476438657">
-      <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> ხმოვანი ფოსტა </item>
-      <item quantity="one">ხმოვანი ფოსტა</item>
-    </plurals>
-    <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
-    <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"ახალი ხმოვანი ფოსტა <xliff:g id="CALLER">%1$s</xliff:g>-ისგან"</string>
-    <string name="voicemail_playback_error" msgid="4384373852257757295">"ვერ ხორციელდება ხმოვანი ფოსტა ჩართვა"</string>
-    <string name="voicemail_fetching_content" msgid="572320120918636014">"ხმოვანი ფოსტა იტვირთება…"</string>
-    <string name="voicemail_fetching_timout" msgid="2128873915839949783">"ვერ ხორციელდება ხმოვანი ფოსტის ჩატვირთვა"</string>
-    <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>-ში"</string>
-    <string name="description_playback_speakerphone" msgid="4852027754869750227">"სპიკერები შეგიძლიათ ჩართოთ და გამორთოთ."</string>
-    <string name="description_playback_seek" msgid="1340910573254132520">"დაკვრის პოზიციის მოძებნა"</string>
-    <string name="action_menu_call_history_description" msgid="8829135306925008546">"ზარების ისტორია"</string>
-    <string name="action_menu_overflow_description" msgid="7648679686746517341">"სხვა პარამეტრები"</string>
-    <string name="action_menu_dialpad_button" msgid="1970631633457493180">"კლავიატურა"</string>
-    <string name="dialer_settings_label" msgid="4980176284150290175">"პარამეტრები"</string>
-    <string name="simulator_submenu_label" msgid="186156287346615267">"სიმულატორი"</string>
-    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"ახალი UI მალსახმობის შექმნა"</string>
-    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"მიმდინარეობს ერთიანი ქმედების რეჟიმში შესვლა"</string>
-    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"ერთიანი ქმედების რეჟიმიდან გამოხვედით"</string>
-    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"არჩეულია <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g>-ის არჩევა გაუქმდა"</string>
-    <string name="description_contact_details" msgid="3341280873855253464">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g>-ის კონტაქტის დეტალები"</string>
-    <string name="description_spam_contact_details" msgid="5592578752881528368">"სავარაუდოდ სპამერი აბონენტის <xliff:g id="NAMEORNUMBER">%1$s</xliff:g> საკონტაქტო დეტალები"</string>
-    <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> ზარი."</string>
-    <string name="description_video_call" msgid="3738199365585751727">"ვიდეოზარი."</string>
-    <string name="description_start_voice_search" msgid="8380022725973015261">"ხმოვანი ძიების დაწყება"</string>
-    <string name="voicemail" msgid="8899540969000957954">"ხმოვანი ფოსტა"</string>
-    <string name="description_cancel_multi_select" msgid="3930475950253360461">"ერთიანი ქმედების რეჟიმის გაუქმება"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"წაშლა"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"გაუქმება"</string>
-    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"არჩეულია <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
-      <item quantity="other">"<b>"გსურთ ამ ხმოვანი შეტყობინებების წაშლა? "</b>"</item>
-      <item quantity="one">"<b>"გსურთ ამ ხმოვანი შეტყობინების წაშლა? "</b>"</item>
-    </plurals>
-    <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
-    <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g>, <xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
-    <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="voice_search_not_available" msgid="6546240433719732905">"ხმოვანი ძიება არ არის ხელმისაწვდომი"</string>
-    <string name="dialer_hint_find_contact" msgid="2023214799381149808">"კონტაქტებში ძიება"</string>
-    <string name="block_number_search_hint" msgid="5377706079015099416">"დაამატეთ ნომერი ან მოიძიეთ კონტაქტებიდან"</string>
-    <string name="call_log_all_empty" msgid="3955572868518162004">"თქვენი საუბრის ისტორია ცარიელია"</string>
-    <string name="call_log_all_empty_action" msgid="852218280136243014">"დარეკვა"</string>
-    <string name="call_log_missed_empty" msgid="7094936030845062214">"გამოტოვებული ზარები არ გაქვთ."</string>
-    <string name="call_log_voicemail_empty" msgid="273623903423275178">"თქვენი ხმოვანი ელფოსტის შემოსულები ცარიელია."</string>
-    <string name="call_log_activity_title" msgid="1275242727244945527">"საუბრის ისტორია"</string>
-    <string name="call_log_all_title" msgid="6042262422192020327">"ყველა"</string>
-    <string name="call_log_missed_title" msgid="17254005889268015">"გამოტოვებული"</string>
-    <string name="tab_speed_dial" msgid="6616404752227561075">"სწრაფი დარეკვა"</string>
-    <string name="tab_history" msgid="7420269368689503596">"საუბრის ისტორია"</string>
-    <string name="tab_all_contacts" msgid="5531733977693943015">"კონტაქტები"</string>
-    <string name="tab_voicemail" msgid="2458548090088316246">"ხმოვანი ფოსტა"</string>
-    <string name="search_shortcut_call_number" msgid="8847918845036880688">"დარეკვა <xliff:g id="NUMBER">%s</xliff:g>-ზე"</string>
-    <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"ახალი კონტაქტის შექმნა"</string>
-    <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"კონტაქტისადმი დამატება"</string>
-    <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"SMS-ის გაგზავნა"</string>
-    <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"ვიდეოზარის განხორციელება"</string>
-    <string name="search_shortcut_block_number" msgid="4587283230665805776">"ნომრის დაბლოკვა"</string>
-    <string name="speed_dial_empty" msgid="3346406399966039505">"სწრაფი აკრეფისთვის რჩეულები ჯერ არ გყავთ"</string>
-    <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"რჩეული კონტაქტის დამატება"</string>
-    <string name="remove_contact" msgid="2353580570488923668">"ამოშლა"</string>
-    <string name="select_all" msgid="408601760696146245">"ყველას არჩევა"</string>
-    <string name="call_log_action_video_call" msgid="7565549950343850819">"ვიდეო ზარი"</string>
-    <string name="call_log_action_send_message" msgid="6948727362660115554">"შეტყობინების გაგზავნა"</string>
-    <string name="call_log_action_details" msgid="2091370737371449501">"ზარის მონაცემები"</string>
-    <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"გაგზავნა:"</string>
-    <string name="call_log_action_call" msgid="682724094251540583">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>-თან დარეკვა"</string>
-    <string name="description_incoming_missed_call" msgid="8292535799379230029">"გამოტოვებული ზარი აბონენტისგან: <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_incoming_answered_call" msgid="3920182963103160610">"უპასუხო ზარი აბონენტისგან <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_unread_voicemail" msgid="145170985013419170">"წაუკითხავი ხმოვანი ფოსტა აბონენტისგან: <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_read_voicemail" msgid="5585559881573227732">"ხმოვანი ფოსტა აბონენტისგან: <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_outgoing_call" msgid="543952487882919924">"ზარი აბონენტთან <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="call_log_via_number" msgid="1340307109806397650">"<xliff:g id="NUMBER">%1$s</xliff:g>-ის მეშვეობით"</string>
-    <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, <xliff:g id="NUMBER">%2$s</xliff:g>-ის მეშვეობით"</string>
-    <string name="description_call_action" msgid="4042796498169106545">"დარეკვა <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_video_call_action" msgid="1237090968588659650">"ვიდეო ზარი <xliff:g id="NAMEORNUMBER">^1</xliff:g>-თან."</string>
-    <string name="description_voicemail_action" msgid="3290143432403538524">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>-ის ხმოვანი ფოსტის მოსმენა"</string>
-    <string name="description_create_new_contact_action" msgid="1928282350281564130">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>-ისთვის კონტაქტის შექმნა"</string>
-    <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>-ის დამატება არსებულ კონტაქტზე"</string>
-    <string name="description_details_action" msgid="2061866409737706174">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> ზარის დეტალები"</string>
-    <string name="call_log_header_today" msgid="1576119097475845293">"დღეს"</string>
-    <string name="call_log_header_yesterday" msgid="5616077776205329563">"გუშინ"</string>
-    <string name="call_log_header_other" msgid="4940676886254217644">"უფრო ძველი"</string>
-    <string name="voicemail_speaker_on" msgid="3151333608926996668">"სპიკერის ჩართვა."</string>
-    <string name="voicemail_speaker_off" msgid="2530064206962034201">"სპიკერის გამორთვა."</string>
-    <string name="voicemail_play_start_pause" msgid="3874823480278334664">"დაკვრის დაწყება ან პაუზა."</string>
-    <string name="display_options_title" msgid="3880091801055797975">"ეკრანის პარამეტრები"</string>
-    <string name="sounds_and_vibration_title" msgid="3075050000721181384">"ხმა და ვიბრაცია"</string>
-    <string name="accessibility_settings_title" msgid="3329027650429831820">"მარტივი წვდომა"</string>
-    <string name="ringtone_title" msgid="8377174189894648486">"ტელეფონის ზარი"</string>
-    <string name="vibrate_on_ring_title" msgid="631441314790960485">"ზარებზე ასევე ვიბრირება"</string>
-    <string name="dtmf_tone_enable_title" msgid="3273762431523939277">"კლავიატურის ტონები"</string>
-    <string name="dtmf_tone_length_title" msgid="534096029202438539">"კლავიატურის ტონის ხანგრძლივობა"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="applicationLabel">ტელეფონი</string>
+  <string name="launcherDialpadActivityLabel">ტელეფონის კლავიატურა</string>
+  <string name="callHistoryIconLabel">საუბრის ისტორია</string>
+  <string name="action_copy_number_text">ნომრის კოპირება</string>
+  <string name="copy_transcript_text">ტრანსკრიპტის კოპირება</string>
+  <string name="action_edit_number_before_call">ნომრის რედაქტირება დარეკვამდე</string>
+  <string name="call_log_delete_all">ზარის ისტორიის გასუფთავება</string>
+  <string name="call_log_trash_voicemail">ხმოვანი ფოსტის წაშლა</string>
+  <string name="snackbar_voicemail_deleted">ხმოვანი ფოსტა წაიშალა</string>
+  <string name="clearCallLogConfirmation_title">გასუფთავდეს ზარის ისტორია?</string>
+  <string name="clearCallLogConfirmation">ეს წაშლის ყველა ზარს თქვენი ისტორიიდან</string>
+  <string name="clearCallLogProgress_title">მიმდ. ზარ. ისტ. გასუფთავება…</string>
+  <string name="notification_missedCallTitle">გამოტოვებული ზარი</string>
+  <string name="notification_missedWorkCallTitle">გამოტოვებული ზარი (სამსახური)</string>
+  <string name="notification_missedCallsTitle">გამოტოვებული ზარები</string>
+  <string name="notification_missedCallsMsg">%d გამოტოვებული ზარი</string>
+  <string name="notification_missedCall_call_back">გადარეკვა</string>
+  <string name="notification_missedCall_message">შეტყობინება</string>
+  <string name="post_call_notification_message">%1$s: %2$s</string>
+  <string name="notification_voicemail_text_format">%s-ის აკრეფა</string>
+  <string name="notification_voicemail_no_vm_number">ხმოვანი ფოსტის ნომერი უცნობია</string>
+  <plurals name="notification_voicemail_title">
+    <item quantity="one">ხმოვანი ფოსტა</item>
+    <item quantity="other"> %1$d ხმოვანი ფოსტა </item>
+  </plurals>
+  <string name="notification_voicemail_callers_list">%1$s, %2$s</string>
+  <string name="notification_new_voicemail_ticker">ახალი ხმოვანი ფოსტა %1$s-ისგან</string>
+  <string name="voicemail_playback_error">ვერ ხორციელდება ხმოვანი ფოსტა ჩართვა</string>
+  <string name="voicemail_fetching_content">ხმოვანი ფოსტა იტვირთება…</string>
+  <string name="voicemail_fetching_timout">ვერ ხორციელდება ხმოვანი ფოსტის ჩატვირთვა</string>
+  <string name="call_log_item_count_and_date">(%1$d) %2$s-ში</string>
+  <string name="description_playback_speakerphone">სპიკერები შეგიძლიათ ჩართოთ და გამორთოთ.</string>
+  <string name="description_playback_seek">დაკვრის პოზიციის მოძებნა</string>
+  <string name="action_menu_call_history_description">ზარების ისტორია</string>
+  <string msgid="2295659037509008453" name="action_menu_overflow_description">სხვა პარამეტრები</string>
+  <string name="action_menu_dialpad_button">კლავიატურა</string>
+  <string name="dialer_settings_label">პარამეტრები</string>
+  <string name="simulator_submenu_label">სიმულატორი</string>
+  <string name="new_ui_launcher_shortcut_label">ახალი UI მალსახმობის შექმნა</string>
+  <string name="description_entering_bulk_action_mode">მიმდინარეობს ერთიანი ქმედების რეჟიმში შესვლა</string>
+  <string name="description_leaving_bulk_action_mode">ერთიანი ქმედების რეჟიმიდან გამოხვედით</string>
+  <string name="description_selecting_bulk_action_mode">არჩეულია %1$s</string>
+  <string name="description_unselecting_bulk_action_mode">%1$s-ის არჩევა გაუქმდა</string>
+  <string name="description_contact_details">%1$s-ის კონტაქტის დეტალები</string>
+  <string name="description_spam_contact_details">სავარაუდოდ სპამერი აბონენტის %1$s საკონტაქტო დეტალები</string>
+  <string name="description_num_calls">%1$s ზარი.</string>
+  <string name="description_video_call">ვიდეოზარი.</string>
+  <string name="description_start_voice_search">ხმოვანი ძიების დაწყება</string>
+  <string name="voicemail">ხმოვანი ფოსტა</string>
+  <string name="description_cancel_multi_select">ერთიანი ქმედების რეჟიმის გაუქმება</string>
+  <string name="voicemailMultiSelectDeleteConfirm">წაშლა</string>
+  <string name="voicemailMultiSelectDeleteCancel">გაუქმება</string>
+  <string name="voicemailMultiSelectActionBarTitle">არჩეულია %1$s</string>
+  <plurals name="delete_voicemails_confirmation_dialog_title">
+    <item quantity="one"><b>გსურთ ამ ხმოვანი შეტყობინების წაშლა? </b></item>
+    <item quantity="other"><b>გსურთ ამ ხმოვანი შეტყობინებების წაშლა? </b></item>
+  </plurals>
+  <string name="voicemailCallLogToday">@string/call_log_header_today</string>
+  <string name="voicemailCallLogDateTimeFormat">%1$s, %2$s</string>
+  <string name="voicemailDurationFormat">%1$02d:%2$02d</string>
+  <string name="voicemailCallLogDateTimeFormatWithDuration">%1$s • %2$s</string>
+  <string name="voice_search_not_available">ხმოვანი ძიება არ არის ხელმისაწვდომი</string>
+  <string name="dialer_hint_find_contact">კონტაქტებში ძიება</string>
+  <string name="block_number_search_hint">დაამატეთ ნომერი ან მოიძიეთ კონტაქტებიდან</string>
+  <string name="call_log_all_empty">თქვენი საუბრის ისტორია ცარიელია</string>
+  <string name="call_log_all_empty_action">დარეკვა</string>
+  <string name="call_log_missed_empty">გამოტოვებული ზარები არ გაქვთ.</string>
+  <string name="call_log_voicemail_empty">თქვენი ხმოვანი ელფოსტის შემოსულები ცარიელია.</string>
+  <string name="call_log_activity_title">საუბრის ისტორია</string>
+  <string name="call_log_all_title">ყველა</string>
+  <string name="call_log_missed_title">გამოტოვებული</string>
+  <string name="tab_speed_dial">სწრაფი დარეკვა</string>
+  <string name="tab_history">საუბრის ისტორია</string>
+  <string name="tab_all_contacts">კონტაქტები</string>
+  <string name="tab_voicemail">ხმოვანი ფოსტა</string>
+  <string name="search_shortcut_call_number">დარეკვა %s-ზე</string>
+  <string name="search_shortcut_create_new_contact">ახალი კონტაქტის შექმნა</string>
+  <string name="search_shortcut_add_to_contact">კონტაქტისადმი დამატება</string>
+  <string name="search_shortcut_send_sms_message">SMS-ის გაგზავნა</string>
+  <string name="search_shortcut_make_video_call">ვიდეოზარის განხორციელება</string>
+  <string name="search_shortcut_block_number">ნომრის დაბლოკვა</string>
+  <string name="speed_dial_empty">სწრაფი აკრეფისთვის რჩეულები ჯერ არ გყავთ</string>
+  <string name="speed_dial_empty_add_favorite_action">რჩეული კონტაქტის დამატება</string>
+  <string name="remove_contact">ამოშლა</string>
+  <string name="select_all">ყველას არჩევა</string>
+  <string name="call_log_action_video_call">ვიდეო ზარი</string>
+  <string name="call_log_action_set_up_video">ვიდეო დარეკვის დაყენება</string>
+  <string name="call_log_action_invite_video">ვიდეოზარში მოწვევა</string>
+  <string name="call_log_action_send_message">შეტყობინების გაგზავნა</string>
+  <string name="call_log_action_details">ზარის მონაცემები</string>
+  <string name="call_log_action_share_voicemail">გაგზავნა:</string>
+  <string name="call_log_action_call">^1-თან დარეკვა</string>
+  <string name="description_incoming_missed_call">გამოტოვებული ზარი აბონენტისგან: ^1, ^2, ^3, ^4.</string>
+  <string name="description_incoming_answered_call">უპასუხო ზარი აბონენტისგან ^1, ^2, ^3, ^4.</string>
+  <string name="description_unread_voicemail">წაუკითხავი ხმოვანი ფოსტა აბონენტისგან: ^1, ^2, ^3, ^4.</string>
+  <string name="description_read_voicemail">ხმოვანი ფოსტა აბონენტისგან: ^1, ^2, ^3, ^4.</string>
+  <string name="description_outgoing_call">ზარი აბონენტთან ^1, ^2, ^3, ^4.</string>
+  <string name="call_log_via_number">%1$s-ის მეშვეობით</string>
+  <string name="call_log_via_number_phone_account">%1$s, %2$s-ის მეშვეობით</string>
+  <string name="description_call_action">დარეკვა ^1</string>
+  <string name="description_video_call_action">ვიდეო ზარი ^1-თან.</string>
+  <string name="description_voicemail_action">^1-ის ხმოვანი ფოსტის მოსმენა</string>
+  <string name="description_create_new_contact_action">^1-ისთვის კონტაქტის შექმნა</string>
+  <string name="description_add_to_existing_contact_action">^1-ის დამატება არსებულ კონტაქტზე</string>
+  <string name="description_details_action">^1 ზარის დეტალები</string>
+  <string name="call_log_header_today">დღეს</string>
+  <string name="call_log_header_yesterday">გუშინ</string>
+  <string name="call_log_header_other">უფრო ძველი</string>
+  <string name="voicemail_speaker_on">სპიკერის ჩართვა.</string>
+  <string name="voicemail_speaker_off">სპიკერის გამორთვა.</string>
+  <string name="voicemail_play_start_pause">დაკვრის დაწყება ან პაუზა.</string>
+  <string name="display_options_title">ეკრანის პარამეტრები</string>
+  <string name="sounds_and_vibration_title">ხმა და ვიბრაცია</string>
+  <string name="accessibility_settings_title">მარტივი წვდომა</string>
+  <string name="ringtone_title">ტელეფონის ზარი</string>
+  <string name="vibrate_on_ring_title">ზარებზე ასევე ვიბრირება</string>
+  <string name="dtmf_tone_enable_title">კლავიატურის ტონები</string>
+  <string name="dtmf_tone_length_title">კლავიატურის ტონის ხანგრძლივობა</string>
   <string-array name="dtmf_tone_length_entries">
-    <item msgid="3136353015227162823">"ჩვეულებრივი"</item>
-    <item msgid="5376841175538523822">"გრძელი"</item>
+    <item>ჩვეულებრივი</item>
+    <item>გრძელი</item>
   </string-array>
-    <string name="respond_via_sms_setting_title" msgid="8008181606657693452">"სწრაფი პასუხი"</string>
-    <string name="call_settings_label" msgid="7824611757200960807">"ზარები"</string>
-    <string name="manage_blocked_numbers_label" msgid="16823761991832273">"ზარების დაბლოკვა"</string>
-    <string name="voicemail_settings_label" msgid="4594299554519920570">"ხმოვანი ფოსტა"</string>
-    <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"ზარების დაბლოკვა დროებით გამოირთო"</string>
-    <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"ზარების დაბლოკვა გაითიშა, რადგან ბოლო 48 საათში ამ ტელეფონიდან საგანგებო სამსახურებს დაუკავშირდით. 48 საათის გასვლის შემდეგ ის ავტომატურად ჩაირთვება."</string>
-    <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"ნომრების იმპორტი"</string>
-    <string name="blocked_call_settings_import_description" msgid="1819412052545228965">"სხვა აპების მეშვეობით თქვენ მიერ ადრე ზოგიერთი აბონენტის ხმოვან ფოსტაზე ავტომატური გადამისამართება მოინიშნა."</string>
-    <string name="blocked_call_settings_view_numbers_button" msgid="3332727948554356704">"ნომრების ნახვა"</string>
-    <string name="blocked_call_settings_import_button" msgid="7319111700387470727">"იმპორტი"</string>
-    <string name="description_blocked_number_list_delete" msgid="2139644216858370740">"ნომრის განბლოკვა"</string>
-    <string name="addBlockedNumber" msgid="3053473735238295551">"ნომრის დამატება"</string>
-    <string name="block_number_footer_message_vvm" msgid="7955326304033982368">"ამ ნომრებიდან შემოსული ზარები დაიბლოკება, ხოლო ხმოვანი ფოსტა ავტომატურად წაიშლება."</string>
-    <string name="block_number_footer_message_no_vvm" msgid="1152684139070471665">"ამ ნომრებიდან შემოსული ზარები დაიბლოკება, თუმცა აბონენტებს მაინც შეეძლებათ თქვენთვის ხმოვანი ფოსტის დატოვება."</string>
-    <string name="block_list" msgid="4701585783411870782">"დაბლოკილი ნომრები"</string>
-    <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g> უკვე დაბლოკილია."</string>
-    <string name="phone_account_settings_label" msgid="8372485478006965920">"ანგარიშების გამოძახება"</string>
-    <string name="permission_no_speeddial" msgid="8487215628510596753">"სწრაფი აკრეფის გასააქტიურებლად, ჩართეთ კონტაქტების ნებართვა."</string>
-    <string name="permission_no_calllog" msgid="4053705651238775784">"ზარების ჟურნალის სანახავად, ჩართეთ ტელეფონის ნებართვა."</string>
-    <string name="permission_no_search" msgid="2424710404207193826">"თქვენი კონტაქტების მოსაძებნად ჩართეთ კონტაქტების ნებართვები."</string>
-    <string name="permission_place_call" msgid="8686908130349369423">"ზარის განსახორციელებლად, ჩართეთ ტელეფონის ნებართვა."</string>
-    <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"ტელეფონის აპს სისტემის პარამეტრებში ჩაწერის ნებართვა არ აქვს."</string>
-    <string name="blocked_number_call_log_label" msgid="4212282846299997693">"დაბლოკილი"</string>
-    <string name="call_log_action_block_report_number" msgid="7302636538668696729">"დაბლოკვა/სპამის შეტყობინება"</string>
-    <string name="call_log_action_block_number" msgid="5048188386501998865">"ნომრის დაბლოკვა"</string>
-    <string name="call_log_action_remove_spam" msgid="2045319806318398403">"არ არის სპამი"</string>
-    <string name="call_log_action_unblock_number" msgid="6100117033288448758">"ნომრის განბლოკვა"</string>
-    <string name="spam_number_call_log_label" msgid="2678431398326811131">"სპამი"</string>
-    <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> ხაზგარეშეა და ვერ დაუკავშირდებით"</string>
-    <string name="about_phone_label" msgid="582991354677973731">"აპის შესახებ"</string>
-    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"ტრასკრიბ. შეასრულა Google-მა"</string>
-    <string name="voicemail_transcription_in_progress" msgid="2933320969613783210">"Google ტრანსკრიბირებას ასრულებს…"</string>
-    <string name="voicemail_transcription_failed" msgid="335275303117412706">"ტრანსკრიპტი მიუწვდომელია."</string>
-    <string name="voicemail_transcription_failed_language_not_supported" msgid="4210332591050562553">"ტრანსკრიპტი მიუწვდომელია. ენა მხარდაჭერილი არ არის."</string>
-    <string name="voicemail_transcription_failed_no_speech" msgid="9093372879697874852">"ტრანსკრიპტი მიუწვდომელია. მეტყველება აღმოჩენილი არ არის."</string>
-    <string name="view_conversation" msgid="7895904782094119702">"ნახვა"</string>
-    <string name="ec_data_deleted" msgid="4794880345545827107">"ზარი წაიშალა. ამ ზარის დროს გაზიარებული დანართები იხილეთ და წაშალეთ Messages-ში."</string>
-    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"ზარები წაიშალა. ამ ზარის დროს გაზიარებული დანართები იხილეთ და წაშალეთ Messages-ში."</string>
+  <string name="respond_via_sms_setting_title">სწრაფი პასუხი</string>
+  <string name="call_settings_label">ზარები</string>
+  <string name="manage_blocked_numbers_label">დაბლოკილი ნომრები</string>
+  <string name="voicemail_settings_label">ხმოვანი ფოსტა</string>
+  <string name="blocked_numbers_disabled_emergency_header_label">ზარების დაბლოკვა დროებით გამოირთო</string>
+  <string name="blocked_numbers_disabled_emergency_desc">ზარების დაბლოკვა გაითიშა, რადგან ბოლო 48 საათში ამ ტელეფონიდან საგანგებო სამსახურებს დაუკავშირდით. 48 საათის გასვლის შემდეგ ის ავტომატურად ჩაირთვება.</string>
+  <string name="import_send_to_voicemail_numbers_label">ნომრების იმპორტი</string>
+  <string name="blocked_call_settings_import_description">სხვა აპების მეშვეობით თქვენ მიერ ადრე ზოგიერთი აბონენტის ხმოვან ფოსტაზე ავტომატური გადამისამართება მოინიშნა.</string>
+  <string name="blocked_call_settings_view_numbers_button">ნომრების ნახვა</string>
+  <string name="blocked_call_settings_import_button">იმპორტი</string>
+  <string name="description_blocked_number_list_delete">ნომრის განბლოკვა</string>
+  <string name="addBlockedNumber">ნომრის დამატება</string>
+  <string name="block_number_footer_message_vvm">ამ ნომრებიდან შემოსული ზარები დაიბლოკება, ხოლო ხმოვანი ფოსტა ავტომატურად წაიშლება.</string>
+  <string name="block_number_footer_message_no_vvm">ამ ნომრებიდან შემოსული ზარები დაიბლოკება, თუმცა აბონენტებს მაინც შეეძლებათ თქვენთვის ხმოვანი ფოსტის დატოვება.</string>
+  <string name="block_list">დაბლოკილი ნომრები</string>
+  <string name="alreadyBlocked">%1$s უკვე დაბლოკილია.</string>
+  <string name="phone_account_settings_label">ანგარიშების გამოძახება</string>
+  <string name="permission_no_speeddial">სწრაფი აკრეფის გასააქტიურებლად, ჩართეთ კონტაქტების ნებართვა.</string>
+  <string name="permission_no_calllog">ზარების ჟურნალის სანახავად, ჩართეთ ტელეფონის ნებართვა.</string>
+  <string name="permission_no_search">თქვენი კონტაქტების მოსაძებნად ჩართეთ კონტაქტების ნებართვები.</string>
+  <string name="permission_place_call">ზარის განსახორციელებლად, ჩართეთ ტელეფონის ნებართვა.</string>
+  <string name="toast_cannot_write_system_settings">ტელეფონის აპს სისტემის პარამეტრებში ჩაწერის ნებართვა არ აქვს.</string>
+  <string name="blocked_number_call_log_label">დაბლოკილი</string>
+  <string name="call_log_action_block_report_number">დაბლოკვა/სპამის შეტყობინება</string>
+  <string name="call_log_action_block_number">ნომრის დაბლოკვა</string>
+  <string name="call_log_action_remove_spam">არ არის სპამი</string>
+  <string name="call_log_action_unblock_number">ნომრის განბლოკვა</string>
+  <string name="spam_number_call_log_label">სპამი</string>
+  <string name="call_composer_connection_failed">%1$s ხაზგარეშეა და ვერ დაუკავშირდებით</string>
+  <string name="about_phone_label">აპის შესახებ</string>
+  <string name="voicemail_transcription_branding_text">ტრასკრიბ. შეასრულა Google-მა</string>
+  <string name="voicemail_transcription_in_progress">მიმდინარეობს ტრანსკრიბირება…</string>
+  <string name="voicemail_transcription_failed">ტრანსკრიპტი მიუწვდომელია.</string>
+  <string name="voicemail_transcription_failed_language_not_supported">ტრანსკრიპტი მიუწვდომელია. ენა მხარდაჭერილი არ არის.</string>
+  <string name="voicemail_transcription_failed_no_speech">ტრანსკრიპტი მიუწვდომელია. მეტყველება აღმოჩენილი არ არის.</string>
+  <string name="voicemail_donation_promo_title">გსურთ, დაგვეხმაროთ ტრანსკრიბირების სიზუსტის გაუმჯობესებაში?</string>
+  <string name="voicemail_donation_promo_content">მიეცით Google-ს უფლება, გადახედოს ხმოვანი ფოსტის ამ და მომავალ ტრანსკრიპტიან შეტყობინებებს. ისინი ანონიმურად შეინახება. პარამეტრების შეცვლა ნებისმიერ დროს შეგიძლიათ. %1$s</string>
+  <string name="voicemail_donation_promo_opt_in">თანახმა ვარ</string>
+  <string name="voicemail_donation_promo_opt_out">არა, გმადლობთ</string>
+  <string name="voicemail_transcription_rating">შეაფასეთ ტრანსკრიბირ. ხარისხი</string>
+  <string name="voicemail_transcription_rating_thanks">გმადლობთ გამოხმაურებისთვის</string>
+  <string name="description_rating_good">მოწონება</string>
+  <string name="description_rating_bad">დაწუნება</string>
+  <string name="view_conversation">ნახვა</string>
+  <string name="ec_data_deleted">ზარი წაიშალა. ამ ზარის დროს გაზიარებული დანართები იხილეთ და წაშალეთ Messages-ში.</string>
+  <string name="multiple_ec_data_deleted">ზარები წაიშალა. ამ ზარის დროს გაზიარებული დანართები იხილეთ და წაშალეთ Messages-ში.</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-kk/strings.xml b/java/com/android/dialer/app/res/values-kk/strings.xml
index 872568a..99fa3e1 100644
--- a/java/com/android/dialer/app/res/values-kk/strings.xml
+++ b/java/com/android/dialer/app/res/values-kk/strings.xml
@@ -1,179 +1,171 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="applicationLabel" msgid="2202739481132958990">"Телефон"</string>
-    <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"Телефон пернетақтасы"</string>
-    <string name="callHistoryIconLabel" msgid="7493268743411968630">"Қоңыраулар тарихы"</string>
-    <string name="action_copy_number_text" msgid="832682558551502319">"Нөмірді көшіру"</string>
-    <string name="copy_transcript_text" msgid="937904189017310829">"Транскрипцияны көшіру"</string>
-    <string name="action_edit_number_before_call" msgid="8017492815878473837">"Қоңырау алдында нөмірді өзгерту"</string>
-    <string name="call_log_delete_all" msgid="7852970926906523784">"Қоңыраулар тарихын тазалау"</string>
-    <string name="call_log_trash_voicemail" msgid="6118493534178533972">"Дауыстық хабарды жою"</string>
-    <string name="snackbar_voicemail_deleted" msgid="7463166543725496307">"Дауыстық хабар жойылды"</string>
-    <string name="snackbar_voicemail_deleted_undo" msgid="6959743982796409941">"КЕРІ ҚАЙТАРУ"</string>
-    <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"Қоңыраулар тарихын тазалау керек пе?"</string>
-    <string name="clearCallLogConfirmation" msgid="6844949465815109166">"Бұл тарихтан барлық қоңырауларды жояды"</string>
-    <string name="clearCallLogProgress_title" msgid="995004835687361977">"Қоңыраулар тарихы тазалануда…"</string>
-    <string name="notification_missedCallTitle" msgid="8283366068539898486">"Қабылданбаған қоңырау"</string>
-    <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"Өткізіп алынған жұмыс қоңырауы"</string>
-    <string name="notification_missedCallsTitle" msgid="3697442015345089802">"Қабылданбаған қоңыраулар"</string>
-    <string name="notification_missedCallsMsg" msgid="8176217633929018706">"<xliff:g id="NUM_MISSED_CALLS">%d</xliff:g> өткізіп алған қоңырау"</string>
-    <string name="notification_missedCall_call_back" msgid="3875698110051973965">"Қоңырау шалу"</string>
-    <string name="notification_missedCall_message" msgid="5086910028988305964">"Хабар"</string>
-    <string name="post_call_notification_message" msgid="5417476789860590611">"<xliff:g id="NAME">%1$s</xliff:g>: <xliff:g id="MESSAGE">%2$s</xliff:g>"</string>
-    <string name="notification_voicemail_text_format" msgid="1895667520930252897">"<xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g> нөмірін теру"</string>
-    <string name="notification_voicemail_no_vm_number" msgid="8942821987929495842">"Дауыстық пошта нөмірі белгісіз"</string>
-    <plurals name="notification_voicemail_title" formatted="false" msgid="1551847434476438657">
-      <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> дауыстық хабар </item>
-      <item quantity="one">Дауыстық хабар</item>
-    </plurals>
-    <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
-    <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"<xliff:g id="CALLER">%1$s</xliff:g> жіберген жаңа дауыс-хабар"</string>
-    <string name="voicemail_playback_error" msgid="4384373852257757295">"Дауыстық хабарды ойнату мүмкін болмады"</string>
-    <string name="voicemail_fetching_content" msgid="572320120918636014">"Дауыстық хабар жүктелуде…"</string>
-    <string name="voicemail_fetching_timout" msgid="2128873915839949783">"Дауыстық хабарды жүктеу мүмкін болмады"</string>
-    <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_playback_speakerphone" msgid="4852027754869750227">"Спикерфонды қосу немесе өшіру"</string>
-    <string name="description_playback_seek" msgid="1340910573254132520">"Ойнату орнын іздеу"</string>
-    <string name="action_menu_call_history_description" msgid="8829135306925008546">"Қоңыраулар тарихы"</string>
-    <string name="action_menu_overflow_description" msgid="7648679686746517341">"Басқа опциялар"</string>
-    <string name="action_menu_dialpad_button" msgid="1970631633457493180">"пернетақта"</string>
-    <string name="dialer_settings_label" msgid="4980176284150290175">"Параметрлер"</string>
-    <string name="simulator_submenu_label" msgid="186156287346615267">"Симулятор"</string>
-    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Жаңа пайдаланушы интерфейсінің пернелер тіркесімін жасау"</string>
-    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"Жаппай әрекет режиміне өту"</string>
-    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"Жаппай әрекет режиімінен шығу"</string>
-    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> таңдалды"</string>
-    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> таңдауы алынды"</string>
-    <string name="description_contact_details" msgid="3341280873855253464">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> контакт деректері"</string>
-    <string name="description_spam_contact_details" msgid="5592578752881528368">"Күдікті <xliff:g id="NAMEORNUMBER">%1$s</xliff:g> спам қоңырау шалушының байланысу мәліметтері"</string>
-    <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> қоңыраулар."</string>
-    <string name="description_video_call" msgid="3738199365585751727">"Бейне қоңырау."</string>
-    <string name="description_start_voice_search" msgid="8380022725973015261">"Дауыс іздеуді бастау"</string>
-    <string name="voicemail" msgid="8899540969000957954">"Дауыстық пошта"</string>
-    <string name="description_cancel_multi_select" msgid="3930475950253360461">"Топтама әрекеттер режимін жабу"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Жою"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Жабу"</string>
-    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> таңдалды"</string>
-    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
-      <item quantity="other">"<b>"Осы дауыстық хабарларды жою қажет пе? "</b>"</item>
-      <item quantity="one">"<b>"Осы дауыстық хабарды жою қажет пе? "</b>"</item>
-    </plurals>
-    <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
-    <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g>, <xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
-    <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="voice_search_not_available" msgid="6546240433719732905">"Дауыс арқылы іздеу қол жетімді емес"</string>
-    <string name="dialer_hint_find_contact" msgid="2023214799381149808">"Контактілерді іздеу"</string>
-    <string name="block_number_search_hint" msgid="5377706079015099416">"Нөмірді енгізіңіз немесе контактілерден іздеп табыңыз"</string>
-    <string name="call_log_all_empty" msgid="3955572868518162004">"Қоңыраулар тарихы бос"</string>
-    <string name="call_log_all_empty_action" msgid="852218280136243014">"Қоңырау шалу"</string>
-    <string name="call_log_missed_empty" msgid="7094936030845062214">"Қабылданбаған қоңыраулар жоқ."</string>
-    <string name="call_log_voicemail_empty" msgid="273623903423275178">"Дауыс поштасының \"Кіріс\" қалтасы бос."</string>
-    <string name="call_log_activity_title" msgid="1275242727244945527">"Қоңырау тарихы"</string>
-    <string name="call_log_all_title" msgid="6042262422192020327">"Барлық"</string>
-    <string name="call_log_missed_title" msgid="17254005889268015">"Қабылданбаған"</string>
-    <string name="tab_speed_dial" msgid="6616404752227561075">"Жылдам теру"</string>
-    <string name="tab_history" msgid="7420269368689503596">"Қоңыраулар тарихы"</string>
-    <string name="tab_all_contacts" msgid="5531733977693943015">"Контактілер"</string>
-    <string name="tab_voicemail" msgid="2458548090088316246">"Дауыстық хабар"</string>
-    <string name="search_shortcut_call_number" msgid="8847918845036880688">"<xliff:g id="NUMBER">%s</xliff:g> нөміріне қоңырау шалу"</string>
-    <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"Жаңа контакт жасау"</string>
-    <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"Контактіге қосу"</string>
-    <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"SMS жіберу"</string>
-    <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"Бейне қоңырау шалу"</string>
-    <string name="search_shortcut_block_number" msgid="4587283230665805776">"Нөмірді бөгеу"</string>
-    <string name="speed_dial_empty" msgid="3346406399966039505">"Жылдам теруде әлі ешкім жоқ"</string>
-    <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"Таңдаулыны қосу"</string>
-    <string name="remove_contact" msgid="2353580570488923668">"Алып тастау"</string>
-    <string name="select_all" msgid="408601760696146245">"Барлығын таңдау"</string>
-    <string name="call_log_action_video_call" msgid="7565549950343850819">"Бейне қоңырау"</string>
-    <string name="call_log_action_send_message" msgid="6948727362660115554">"Хабар жіберу"</string>
-    <string name="call_log_action_details" msgid="2091370737371449501">"Қоңырау мәліметтері"</string>
-    <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"Жіберу:"</string>
-    <string name="call_log_action_call" msgid="682724094251540583">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> нөміріне қоңырау шалу"</string>
-    <string name="description_incoming_missed_call" msgid="8292535799379230029">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> қоңырауы өткізіп алынды, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_incoming_answered_call" msgid="3920182963103160610">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> қоңырауына жауап берілді, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_unread_voicemail" msgid="145170985013419170">"Оқылмаған дауыстық хабар: <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_read_voicemail" msgid="5585559881573227732">"Дауыстық хабар: <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_outgoing_call" msgid="543952487882919924">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> нөміріне қоңырау шалу, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="call_log_via_number" msgid="1340307109806397650">"Нөмірі: <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g>. Нөмірі: <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="description_call_action" msgid="4042796498169106545">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> нөміріне қоңырау шалу"</string>
-    <string name="description_video_call_action" msgid="1237090968588659650">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> бейне қоңырау шалу."</string>
-    <string name="description_voicemail_action" msgid="3290143432403538524">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> дауыстық хабарын тыңдау"</string>
-    <string name="description_create_new_contact_action" msgid="1928282350281564130">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> үшін контакт жасау"</string>
-    <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> бар контактіге қосу"</string>
-    <string name="description_details_action" msgid="2061866409737706174">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> үшін қоңырау мәліметтері"</string>
-    <string name="call_log_header_today" msgid="1576119097475845293">"Бүгін"</string>
-    <string name="call_log_header_yesterday" msgid="5616077776205329563">"Кеше"</string>
-    <string name="call_log_header_other" msgid="4940676886254217644">"Ескілеу"</string>
-    <string name="voicemail_speaker_on" msgid="3151333608926996668">"Динамикті қосу."</string>
-    <string name="voicemail_speaker_off" msgid="2530064206962034201">"Динамикті өшіру."</string>
-    <string name="voicemail_play_start_pause" msgid="3874823480278334664">"Ойнатуды бастау немесе кідірту."</string>
-    <string name="display_options_title" msgid="3880091801055797975">"Көрсету опциялары"</string>
-    <string name="sounds_and_vibration_title" msgid="3075050000721181384">"Дыбыстар мен діріл"</string>
-    <string name="accessibility_settings_title" msgid="3329027650429831820">"Арнайы мүмкіндіктер"</string>
-    <string name="ringtone_title" msgid="8377174189894648486">"Телефон қоңырау әуені"</string>
-    <string name="vibrate_on_ring_title" msgid="631441314790960485">"Қоңырау кезінде дірілдету"</string>
-    <string name="dtmf_tone_enable_title" msgid="3273762431523939277">"Пернетақта дыбысы"</string>
-    <string name="dtmf_tone_length_title" msgid="534096029202438539">"Пернетақта дыбысының ұзақтығы"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="applicationLabel">Телефон</string>
+  <string name="launcherDialpadActivityLabel">Телефон пернетақтасы</string>
+  <string name="callHistoryIconLabel">Қоңыраулар тарихы</string>
+  <string name="action_copy_number_text">Нөмірді көшіру</string>
+  <string name="copy_transcript_text">Транскрипцияны көшіру</string>
+  <string name="action_edit_number_before_call">Қоңырау алдында нөмірді өзгерту</string>
+  <string name="call_log_delete_all">Қоңыраулар тарихын тазалау</string>
+  <string name="call_log_trash_voicemail">Дауыстық хабарды жою</string>
+  <string name="snackbar_voicemail_deleted">Дауыстық хабар жойылды</string>
+  <string name="clearCallLogConfirmation_title">Қоңыраулар тарихын тазалау керек пе?</string>
+  <string name="clearCallLogConfirmation">Бұл тарихтан барлық қоңырауларды жояды</string>
+  <string name="clearCallLogProgress_title">Қоңыраулар тарихы тазалануда…</string>
+  <string name="notification_missedCallTitle">Қабылданбаған қоңырау</string>
+  <string name="notification_missedWorkCallTitle">Өткізіп алынған жұмыс қоңырауы</string>
+  <string name="notification_missedCallsTitle">Қабылданбаған қоңыраулар</string>
+  <string name="notification_missedCallsMsg">%d өткізіп алған қоңырау</string>
+  <string name="notification_missedCall_call_back">Қоңырау шалу</string>
+  <string name="notification_missedCall_message">Хабар</string>
+  <string name="post_call_notification_message">%1$s: %2$s</string>
+  <string name="notification_voicemail_text_format">%s нөмірін теру</string>
+  <string name="notification_voicemail_no_vm_number">Дауыстық пошта нөмірі белгісіз</string>
+  <plurals name="notification_voicemail_title">
+    <item quantity="one">Дауыстық хабар</item>
+    <item quantity="other"> %1$d дауыстық хабар </item>
+  </plurals>
+  <string name="notification_voicemail_callers_list">%1$s, %2$s</string>
+  <string name="notification_new_voicemail_ticker">%1$s жіберген жаңа дауыс-хабар</string>
+  <string name="voicemail_playback_error">Дауыстық хабарды ойнату мүмкін болмады</string>
+  <string name="voicemail_fetching_content">Дауыстық хабар жүктелуде…</string>
+  <string name="voicemail_fetching_timout">Дауыстық хабарды жүктеу мүмкін болмады</string>
+  <string name="call_log_item_count_and_date">(%1$d) %2$s</string>
+  <string name="description_playback_speakerphone">Спикерфонды қосу немесе өшіру</string>
+  <string name="description_playback_seek">Ойнату орнын іздеу</string>
+  <string name="action_menu_call_history_description">Қоңыраулар тарихы</string>
+  <string msgid="2295659037509008453" name="action_menu_overflow_description">Басқа опциялар</string>
+  <string name="action_menu_dialpad_button">пернетақта</string>
+  <string name="dialer_settings_label">Параметрлер</string>
+  <string name="simulator_submenu_label">Симулятор</string>
+  <string name="new_ui_launcher_shortcut_label">Жаңа пайдаланушы интерфейсінің пернелер тіркесімін жасау</string>
+  <string name="description_entering_bulk_action_mode">Жаппай әрекет режиміне өту</string>
+  <string name="description_leaving_bulk_action_mode">Жаппай әрекет режиімінен шығу</string>
+  <string name="description_selecting_bulk_action_mode">%1$s таңдалды</string>
+  <string name="description_unselecting_bulk_action_mode">%1$s таңдауы алынды</string>
+  <string name="description_contact_details">%1$s контакт деректері</string>
+  <string name="description_spam_contact_details">Күдікті %1$s спам қоңырау шалушының байланысу мәліметтері</string>
+  <string name="description_num_calls">%1$s қоңыраулар.</string>
+  <string name="description_video_call">Бейне қоңырау.</string>
+  <string name="description_start_voice_search">Дауыс іздеуді бастау</string>
+  <string name="voicemail">Дауыстық пошта</string>
+  <string name="description_cancel_multi_select">Топтама әрекеттер режимін жабу</string>
+  <string name="voicemailMultiSelectDeleteConfirm">Жою</string>
+  <string name="voicemailMultiSelectDeleteCancel">Жабу</string>
+  <string name="voicemailMultiSelectActionBarTitle">%1$s таңдалды</string>
+  <plurals name="delete_voicemails_confirmation_dialog_title">
+    <item quantity="one"><b>Осы дауыстық хабарды жою қажет пе? </b></item>
+    <item quantity="other"><b>Осы дауыстық хабарларды жою қажет пе? </b></item>
+  </plurals>
+  <string name="voicemailCallLogToday">@string/call_log_header_today</string>
+  <string name="voicemailCallLogDateTimeFormat">%1$s, %2$s</string>
+  <string name="voicemailDurationFormat">%1$02d:%2$02d</string>
+  <string name="voicemailCallLogDateTimeFormatWithDuration">%1$s • %2$s</string>
+  <string name="voice_search_not_available">Дауыс арқылы іздеу қол жетімді емес</string>
+  <string name="dialer_hint_find_contact">Контактілерді іздеу</string>
+  <string name="block_number_search_hint">Нөмірді енгізіңіз немесе контактілерден іздеп табыңыз</string>
+  <string name="call_log_all_empty">Қоңыраулар тарихы бос</string>
+  <string name="call_log_all_empty_action">Қоңырау шалу</string>
+  <string name="call_log_missed_empty">Қабылданбаған қоңыраулар жоқ.</string>
+  <string name="call_log_voicemail_empty">Дауыс поштасының \"Кіріс\" қалтасы бос.</string>
+  <string name="call_log_activity_title">Қоңырау тарихы</string>
+  <string name="call_log_all_title">Барлық</string>
+  <string name="call_log_missed_title">Қабылданбаған</string>
+  <string name="tab_speed_dial">Жылдам теру</string>
+  <string name="tab_history">Қоңыраулар тарихы</string>
+  <string name="tab_all_contacts">Контактілер</string>
+  <string name="tab_voicemail">Дауыстық хабар</string>
+  <string name="search_shortcut_call_number">%s нөміріне қоңырау шалу</string>
+  <string name="search_shortcut_create_new_contact">Жаңа контакт жасау</string>
+  <string name="search_shortcut_add_to_contact">Контактіге қосу</string>
+  <string name="search_shortcut_send_sms_message">SMS жіберу</string>
+  <string name="search_shortcut_make_video_call">Бейне қоңырау шалу</string>
+  <string name="search_shortcut_block_number">Нөмірді бөгеу</string>
+  <string name="speed_dial_empty">Жылдам теруде әлі ешкім жоқ</string>
+  <string name="speed_dial_empty_add_favorite_action">Таңдаулыны қосу</string>
+  <string name="remove_contact">Алып тастау</string>
+  <string name="select_all">Барлығын таңдау</string>
+  <string name="call_log_action_video_call">Бейне қоңырау</string>
+  <string name="call_log_action_set_up_video">Бейне қоңырау орнату</string>
+  <string name="call_log_action_invite_video">Бейне қоңырауға шақыру</string>
+  <string name="call_log_action_send_message">Хабар жіберу</string>
+  <string name="call_log_action_details">Қоңырау мәліметтері</string>
+  <string name="call_log_action_share_voicemail">Жіберу:</string>
+  <string name="call_log_action_call">^1 нөміріне қоңырау шалу</string>
+  <string name="description_incoming_missed_call">^1 қоңырауы өткізіп алынды, ^2, ^3, ^4.</string>
+  <string name="description_incoming_answered_call">^1 қоңырауына жауап берілді, ^2, ^3, ^4.</string>
+  <string name="description_unread_voicemail">Оқылмаған дауыстық хабар: ^1, ^2, ^3, ^4.</string>
+  <string name="description_read_voicemail">Дауыстық хабар: ^1, ^2, ^3, ^4.</string>
+  <string name="description_outgoing_call">^1 нөміріне қоңырау шалу, ^2, ^3, ^4.</string>
+  <string name="call_log_via_number">Нөмірі: %1$s</string>
+  <string name="call_log_via_number_phone_account">%1$s. Нөмірі: %2$s</string>
+  <string name="description_call_action">^1 нөміріне қоңырау шалу</string>
+  <string name="description_video_call_action">^1 бейне қоңырау шалу.</string>
+  <string name="description_voicemail_action">^1 дауыстық хабарын тыңдау</string>
+  <string name="description_create_new_contact_action">^1 үшін контакт жасау</string>
+  <string name="description_add_to_existing_contact_action">^1 бар контактіге қосу</string>
+  <string name="description_details_action">^1 үшін қоңырау мәліметтері</string>
+  <string name="call_log_header_today">Бүгін</string>
+  <string name="call_log_header_yesterday">Кеше</string>
+  <string name="call_log_header_other">Ескілеу</string>
+  <string name="voicemail_speaker_on">Динамикті қосу.</string>
+  <string name="voicemail_speaker_off">Динамикті өшіру.</string>
+  <string name="voicemail_play_start_pause">Ойнатуды бастау немесе кідірту.</string>
+  <string name="display_options_title">Көрсету опциялары</string>
+  <string name="sounds_and_vibration_title">Дыбыстар мен діріл</string>
+  <string name="accessibility_settings_title">Арнайы мүмкіндіктер</string>
+  <string name="ringtone_title">Телефон қоңырау әуені</string>
+  <string name="vibrate_on_ring_title">Қоңырау кезінде дірілдету</string>
+  <string name="dtmf_tone_enable_title">Пернетақта дыбысы</string>
+  <string name="dtmf_tone_length_title">Пернетақта дыбысының ұзақтығы</string>
   <string-array name="dtmf_tone_length_entries">
-    <item msgid="3136353015227162823">"Қалыпты"</item>
-    <item msgid="5376841175538523822">"Ұзақ"</item>
+    <item>Қалыпты</item>
+    <item>Ұзақ</item>
   </string-array>
-    <string name="respond_via_sms_setting_title" msgid="8008181606657693452">"Жылдам жауаптар"</string>
-    <string name="call_settings_label" msgid="7824611757200960807">"Қоңыраулар"</string>
-    <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Қоңырауларға тыйым салу"</string>
-    <string name="voicemail_settings_label" msgid="4594299554519920570">"Дауыстық хабар"</string>
-    <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Қоңырауларға тыйым салу уақытша өшірулі"</string>
-    <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Қоңырауларға тыйым салу өшірілді, өйткені сіз соңғы 48 сағат ішінде осы телефоннан төтенше қызметтерге хабарластыңыз. Ол 48 сағаттық кезең өткеннен кейін автоматты түрде қайта қосылады."</string>
-    <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Нөмірлерді импорттау"</string>
-    <string name="blocked_call_settings_import_description" msgid="1819412052545228965">"Сіз бұрын кейбір қоңырау шалушыларды басқа қолданбалар арқылы дауыс поштасына автоматты түрде жіберу үшін белгілеген."</string>
-    <string name="blocked_call_settings_view_numbers_button" msgid="3332727948554356704">"Нөмірлерді көру"</string>
-    <string name="blocked_call_settings_import_button" msgid="7319111700387470727">"Импорттау"</string>
-    <string name="description_blocked_number_list_delete" msgid="2139644216858370740">"Нөмірді бөгеуден шығару"</string>
-    <string name="addBlockedNumber" msgid="3053473735238295551">"Нөмір қосу"</string>
-    <string name="block_number_footer_message_vvm" msgid="7955326304033982368">"Осы нөмірлерден қоңыраулар бөгеледі және дауыстық хабарлар автоматты түрде жойылады."</string>
-    <string name="block_number_footer_message_no_vvm" msgid="1152684139070471665">"Осы нөмірлерден қоңыраулар бөгеледі, бірақ олар әлі де сізге дауыстық хабарлар қалдыра алуы мүмкін."</string>
-    <string name="block_list" msgid="4701585783411870782">"Бөгелген нөмірлер"</string>
-    <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g> бөгеліп қойылған."</string>
-    <string name="phone_account_settings_label" msgid="8372485478006965920">"Қоңырау шалу есептік жазбалары"</string>
-    <string name="permission_no_speeddial" msgid="8487215628510596753">"Жылдам теруді қосу үшін \"Контактілер\" рұқсатын қосыңыз."</string>
-    <string name="permission_no_calllog" msgid="4053705651238775784">"Қоңыраулар журналы көру үшін \"Телефон\" рұқсатын қосыңыз."</string>
-    <string name="permission_no_search" msgid="2424710404207193826">"Контактілерді іздеу үшін \"Контактілер\" рұқсаттарын қосыңыз."</string>
-    <string name="permission_place_call" msgid="8686908130349369423">"Қоңырауды шалу үшін \"Телефон\" рұқсатын қосыңыз."</string>
-    <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"Телефон қолданбасында жүйелік параметрлерге жазуға рұқсат жоқ."</string>
-    <string name="blocked_number_call_log_label" msgid="4212282846299997693">"Бөгелген"</string>
-    <string name="call_log_action_block_report_number" msgid="7302636538668696729">"Бөгеу/спам туралы есеп беру"</string>
-    <string name="call_log_action_block_number" msgid="5048188386501998865">"Нөмірді бөгеу"</string>
-    <string name="call_log_action_remove_spam" msgid="2045319806318398403">"Спам емес"</string>
-    <string name="call_log_action_unblock_number" msgid="6100117033288448758">"Нөмірді бөгеуден шығару"</string>
-    <string name="spam_number_call_log_label" msgid="2678431398326811131">"Спам"</string>
-    <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> желіден тыс және байланысу мүмкін емес"</string>
-    <string name="about_phone_label" msgid="582991354677973731">"Мәліметтер"</string>
-    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Транскрипцияны жасаған – Google"</string>
-    <string name="voicemail_transcription_in_progress" msgid="2933320969613783210">"Google транскрипциясын жасап жатыр..."</string>
-    <string name="voicemail_transcription_failed" msgid="335275303117412706">"Tранскрипция жасау мүмкіндігі жоқ."</string>
-    <string name="voicemail_transcription_failed_language_not_supported" msgid="4210332591050562553">"Tранскрипция жасау мүмкіндігі жоқ.  Бұл тіл қолданылмайды."</string>
-    <string name="voicemail_transcription_failed_no_speech" msgid="9093372879697874852">"Tранскрипция жасау мүмкіндігі жоқ. Аудио табылмады."</string>
-    <string name="view_conversation" msgid="7895904782094119702">"Көру"</string>
-    <string name="ec_data_deleted" msgid="4794880345545827107">"Қоңырау жойылды. Осы қоңырау кезінде жіберілген тіркемелерді \"Хабарлар\" бөлімінен тауып жойыңыз."</string>
-    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"Қоңыраулар жойылды. Осы қоңыраулар кезінде жіберілген тіркемелерді \"Хабарлар\" бөлімінен тауып жойыңыз."</string>
+  <string name="respond_via_sms_setting_title">Жылдам жауаптар</string>
+  <string name="call_settings_label">Қоңыраулар</string>
+  <string name="manage_blocked_numbers_label">Бөгелген нөмірлер</string>
+  <string name="voicemail_settings_label">Дауыстық хабар</string>
+  <string name="blocked_numbers_disabled_emergency_header_label">Қоңырауларға тыйым салу уақытша өшірулі</string>
+  <string name="blocked_numbers_disabled_emergency_desc">Қоңырауларға тыйым салу өшірілді, өйткені сіз соңғы 48 сағат ішінде осы телефоннан төтенше қызметтерге хабарластыңыз. Ол 48 сағаттық кезең өткеннен кейін автоматты түрде қайта қосылады.</string>
+  <string name="import_send_to_voicemail_numbers_label">Нөмірлерді импорттау</string>
+  <string name="blocked_call_settings_import_description">Сіз бұрын кейбір қоңырау шалушыларды басқа қолданбалар арқылы дауыс поштасына автоматты түрде жіберу үшін белгілеген.</string>
+  <string name="blocked_call_settings_view_numbers_button">Нөмірлерді көру</string>
+  <string name="blocked_call_settings_import_button">Импорттау</string>
+  <string name="description_blocked_number_list_delete">Нөмірді бөгеуден шығару</string>
+  <string name="addBlockedNumber">Нөмір қосу</string>
+  <string name="block_number_footer_message_vvm">Осы нөмірлерден қоңыраулар бөгеледі және дауыстық хабарлар автоматты түрде жойылады.</string>
+  <string name="block_number_footer_message_no_vvm">Осы нөмірлерден қоңыраулар бөгеледі, бірақ олар әлі де сізге дауыстық хабарлар қалдыра алуы мүмкін.</string>
+  <string name="block_list">Бөгелген нөмірлер</string>
+  <string name="alreadyBlocked">%1$s бөгеліп қойылған.</string>
+  <string name="phone_account_settings_label">Қоңырау шалу есептік жазбалары</string>
+  <string name="permission_no_speeddial">Жылдам теруді қосу үшін \"Контактілер\" рұқсатын қосыңыз.</string>
+  <string name="permission_no_calllog">Қоңыраулар журналы көру үшін \"Телефон\" рұқсатын қосыңыз.</string>
+  <string name="permission_no_search">Контактілерді іздеу үшін \"Контактілер\" рұқсаттарын қосыңыз.</string>
+  <string name="permission_place_call">Қоңырауды шалу үшін \"Телефон\" рұқсатын қосыңыз.</string>
+  <string name="toast_cannot_write_system_settings">Телефон қолданбасында жүйелік параметрлерге жазуға рұқсат жоқ.</string>
+  <string name="blocked_number_call_log_label">Бөгелген</string>
+  <string name="call_log_action_block_report_number">Бөгеу/спам туралы есеп беру</string>
+  <string name="call_log_action_block_number">Нөмірді бөгеу</string>
+  <string name="call_log_action_remove_spam">Спам емес</string>
+  <string name="call_log_action_unblock_number">Нөмірді бөгеуден шығару</string>
+  <string name="spam_number_call_log_label">Спам</string>
+  <string name="call_composer_connection_failed">%1$s желіден тыс және байланысу мүмкін емес</string>
+  <string name="about_phone_label">Мәліметтер</string>
+  <string name="voicemail_transcription_branding_text">Транскрипцияны жасаған – Google</string>
+  <string name="voicemail_transcription_in_progress">Транскрипциясы жасалуда...</string>
+  <string name="voicemail_transcription_failed">Tранскрипция жасау мүмкіндігі жоқ.</string>
+  <string name="voicemail_transcription_failed_language_not_supported">Tранскрипция жасау мүмкіндігі жоқ.  Бұл тіл қолданылмайды.</string>
+  <string name="voicemail_transcription_failed_no_speech">Tранскрипция жасау мүмкіндігі жоқ. Аудио табылмады.</string>
+  <string name="voicemail_donation_promo_title">Транскрипция сапасын жақсартуға үлес қосқыңыз келе ме?</string>
+  <string name="voicemail_donation_promo_content">Google-ға осы және болашақ транскрипциялары бар дауыстық хабарларды шолуға рұқсат беріңіз. Олар анонимді түрде сақталады. Бұл параметрді кез келген уақытта өзгертуіңізге болады. %1$s</string>
+  <string name="voicemail_donation_promo_opt_in">Жарайды</string>
+  <string name="voicemail_donation_promo_opt_out">Жоқ, рақмет</string>
+  <string name="voicemail_transcription_rating">Транскрипция сапасын бағалау</string>
+  <string name="voicemail_transcription_rating_thanks">Пікіріңізге рақмет</string>
+  <string name="description_rating_good">Ұнату</string>
+  <string name="description_rating_bad">Ұнатпау</string>
+  <string name="view_conversation">Көру</string>
+  <string name="ec_data_deleted">Қоңырау жойылды. Осы қоңырау кезінде жіберілген тіркемелерді \"Хабарлар\" бөлімінен тауып жойыңыз.</string>
+  <string name="multiple_ec_data_deleted">Қоңыраулар жойылды. Осы қоңыраулар кезінде жіберілген тіркемелерді \"Хабарлар\" бөлімінен тауып жойыңыз.</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-km/strings.xml b/java/com/android/dialer/app/res/values-km/strings.xml
index ff427be..5141be5 100644
--- a/java/com/android/dialer/app/res/values-km/strings.xml
+++ b/java/com/android/dialer/app/res/values-km/strings.xml
@@ -1,179 +1,171 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="applicationLabel" msgid="2202739481132958990">"ទូរស័ព្ទ"</string>
-    <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"បន្ទះ​ចុច​លេខទូរសព្ទ"</string>
-    <string name="callHistoryIconLabel" msgid="7493268743411968630">"ប្រវត្តិ​ហៅ"</string>
-    <string name="action_copy_number_text" msgid="832682558551502319">"ថតចម្លងលេខទូរស័ព្ទ"</string>
-    <string name="copy_transcript_text" msgid="937904189017310829">"ថតចម្លងសំណៅពីសារសម្លេង"</string>
-    <string name="action_edit_number_before_call" msgid="8017492815878473837">"កែ​លេខ​មុន​ពេល​ហៅ"</string>
-    <string name="call_log_delete_all" msgid="7852970926906523784">"ជម្រះប្រវត្តិហៅ"</string>
-    <string name="call_log_trash_voicemail" msgid="6118493534178533972">"លុប​សារ​ជា​សំឡេង"</string>
-    <string name="snackbar_voicemail_deleted" msgid="7463166543725496307">"បានលុបសារសម្លេង"</string>
-    <string name="snackbar_voicemail_deleted_undo" msgid="6959743982796409941">"​មិន​ធ្វើវិញ"</string>
-    <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"ជម្រះប្រវត្តិហៅ?"</string>
-    <string name="clearCallLogConfirmation" msgid="6844949465815109166">"វានឹងលុបការហៅទាំងអស់ចេញពីប្រវត្តិរបស់អ្នក"</string>
-    <string name="clearCallLogProgress_title" msgid="995004835687361977">"កំពុងជម្រះប្រវត្តិហៅ…"</string>
-    <string name="notification_missedCallTitle" msgid="8283366068539898486">"ខកខាន​ទទួល"</string>
-    <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"បានខកខានការហៅចូលពីកន្លែងការងារ"</string>
-    <string name="notification_missedCallsTitle" msgid="3697442015345089802">"ខកខាន​ទទួល"</string>
-    <string name="notification_missedCallsMsg" msgid="8176217633929018706">"ខកខានទទួល <xliff:g id="NUM_MISSED_CALLS">%d</xliff:g> ដង"</string>
-    <string name="notification_missedCall_call_back" msgid="3875698110051973965">"ហៅ​ទៅ​វិញ"</string>
-    <string name="notification_missedCall_message" msgid="5086910028988305964">"សារ"</string>
-    <string name="post_call_notification_message" msgid="5417476789860590611">"<xliff:g id="NAME">%1$s</xliff:g>: <xliff:g id="MESSAGE">%2$s</xliff:g>"</string>
-    <string name="notification_voicemail_text_format" msgid="1895667520930252897">"ហៅ​ទូរសព្ទ​ទៅកាន់ <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
-    <string name="notification_voicemail_no_vm_number" msgid="8942821987929495842">"មិន​ស្គាល់​លេខ​សារ​ជា​សំឡេង​ទេ"</string>
-    <plurals name="notification_voicemail_title" formatted="false" msgid="1551847434476438657">
-      <item quantity="other">សារជាសម្លេង <xliff:g id="COUNT">%1$d</xliff:g> </item>
-      <item quantity="one">សារជាសម្លេង</item>
-    </plurals>
-    <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
-    <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"សារ​ជា​សំឡេង​ថ្មី​ពី <xliff:g id="CALLER">%1$s</xliff:g>"</string>
-    <string name="voicemail_playback_error" msgid="4384373852257757295">"មិនអាចចាក់សារជាសម្លេងបានទេ"</string>
-    <string name="voicemail_fetching_content" msgid="572320120918636014">"កំពុងផ្ទុកសារជាសម្លេង…"</string>
-    <string name="voicemail_fetching_timout" msgid="2128873915839949783">"មិនអាចផ្ទុកសារជាសម្លេងបានទេ"</string>
-    <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_playback_speakerphone" msgid="4852027754869750227">"បិទ ឬ​បើក​អូប៉ាល័រទូរស័ព្ទ"</string>
-    <string name="description_playback_seek" msgid="1340910573254132520">"រកមើល​ទីតាំង​ចាក់​ឡើងវិញ"</string>
-    <string name="action_menu_call_history_description" msgid="8829135306925008546">"ប្រវត្តិហៅ"</string>
-    <string name="action_menu_overflow_description" msgid="7648679686746517341">"ជម្រើស​បន្ថែម"</string>
-    <string name="action_menu_dialpad_button" msgid="1970631633457493180">"បន្ទះ​​ចុច​លេខ"</string>
-    <string name="dialer_settings_label" msgid="4980176284150290175">"ការកំណត់"</string>
-    <string name="simulator_submenu_label" msgid="186156287346615267">"កម្មវិធីធ្វើ​ដូច​មែនទែន"</string>
-    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"បង្កើត​ផ្លូវកាត់ UI ថ្មី"</string>
-    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"ចូល​មុខងារ​សកម្មភាព​ច្រើន"</string>
-    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"បាន​ចាកចេញ​ពី​មុខងារ​សកម្មភាព​ច្រើន"</string>
-    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"បាន​ជ្រើសរើស <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"បាន​ដក​ការជ្រើសរើស <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_contact_details" msgid="3341280873855253464">"ព័ត៌មាន​លម្អិត​ទំនាក់ទំនង​សម្រាប់ <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_spam_contact_details" msgid="5592578752881528368">"ព័ត៌មាន​លម្អិត​ទំនាក់ទំនង​សម្រាប់​អ្នក​ហៅ​ឥត​បាន​ការ​ដែល​សង្ស័យ <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_num_calls" msgid="6483594535796216044">"ការ​ហៅ <xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> ។"</string>
-    <string name="description_video_call" msgid="3738199365585751727">"ការ​ហៅ​ជា​វីដេអូ​។"</string>
-    <string name="description_start_voice_search" msgid="8380022725973015261">"ចាប់ផ្ដើម​ស្វែងរក​ជា​សំឡេង"</string>
-    <string name="voicemail" msgid="8899540969000957954">"សារ​ជា​សំឡេង"</string>
-    <string name="description_cancel_multi_select" msgid="3930475950253360461">"បោះបង់​មុខងារ​សកម្មភាព​ជា​ក្រុម"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"លុប"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"បោះបង់"</string>
-    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"បាន​ជ្រើសរើស <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
-      <item quantity="other">"<b>"លុប​សារ​ជា​សំឡេង​ទាំងនេះ? "</b>"</item>
-      <item quantity="one">"<b>"លុប​សារ​ជា​សំឡេង​នេះ? "</b>"</item>
-    </plurals>
-    <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
-    <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> នៅម៉ោង <xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
-    <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="voice_search_not_available" msgid="6546240433719732905">"ការស្វែងរកជាសម្លេងមិនមានទេ"</string>
-    <string name="dialer_hint_find_contact" msgid="2023214799381149808">"រក​ទំនាក់ទំនង"</string>
-    <string name="block_number_search_hint" msgid="5377706079015099416">"បន្ថែមលេខទូរស័ព្ទ ឬស្វែងរកទំនាក់ទំនង"</string>
-    <string name="call_log_all_empty" msgid="3955572868518162004">"ប្រវត្តិហៅរបស់អ្នកទទេ"</string>
-    <string name="call_log_all_empty_action" msgid="852218280136243014">"ហៅទូរសព្ទ"</string>
-    <string name="call_log_missed_empty" msgid="7094936030845062214">"អ្នកមិនមានការខកខានទទួលទូរសព្ទទេ។"</string>
-    <string name="call_log_voicemail_empty" msgid="273623903423275178">"ប្រអប់ទទួលសារជាសំឡេងរបស់អ្នកទទេ។"</string>
-    <string name="call_log_activity_title" msgid="1275242727244945527">"ប្រវត្តិ​ហៅ"</string>
-    <string name="call_log_all_title" msgid="6042262422192020327">"ទាំង​អស់"</string>
-    <string name="call_log_missed_title" msgid="17254005889268015">"ខកខាន​ទទួល"</string>
-    <string name="tab_speed_dial" msgid="6616404752227561075">"ហៅទូរស័ព្ទល្បឿនលឿន"</string>
-    <string name="tab_history" msgid="7420269368689503596">"ប្រវត្តិហៅ"</string>
-    <string name="tab_all_contacts" msgid="5531733977693943015">"ទំនាក់ទំនង"</string>
-    <string name="tab_voicemail" msgid="2458548090088316246">"សារជាសំឡេង"</string>
-    <string name="search_shortcut_call_number" msgid="8847918845036880688">"ហៅ <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"បង្កើតទំនាក់ទំនងថ្មី"</string>
-    <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"បន្ថែមទៅទំនាក់ទំនង"</string>
-    <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"ផ្ញើសារ SMS"</string>
-    <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"ការ​ហៅ​ជា​វីដេអូ"</string>
-    <string name="search_shortcut_block_number" msgid="4587283230665805776">"រារាំងលេខ"</string>
-    <string name="speed_dial_empty" msgid="3346406399966039505">"គ្មាននរណាម្នាក់នៅក្នុងការហៅរហ័សរបស់អ្នកនៅឡើយទេ"</string>
-    <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"បញ្ចូលសំណព្វ"</string>
-    <string name="remove_contact" msgid="2353580570488923668">"លុបចេញ"</string>
-    <string name="select_all" msgid="408601760696146245">"ជ្រើសរើស​​ទាំងអស់"</string>
-    <string name="call_log_action_video_call" msgid="7565549950343850819">"ហៅជាវីដេអូ"</string>
-    <string name="call_log_action_send_message" msgid="6948727362660115554">"ផ្ញើសារ"</string>
-    <string name="call_log_action_details" msgid="2091370737371449501">"ព័ត៌មានលម្អិតអំពីការហៅ"</string>
-    <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"ផ្ញើទៅ..."</string>
-    <string name="call_log_action_call" msgid="682724094251540583">"ហៅ <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_incoming_missed_call" msgid="8292535799379230029">"ខកខានទទួលកាហៅពី <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>។"</string>
-    <string name="description_incoming_answered_call" msgid="3920182963103160610">"បានឆ្លើយតបការហៅពី <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>។"</string>
-    <string name="description_unread_voicemail" msgid="145170985013419170">"សារជាសំឡេងដែលមិនទាន់អានពី <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>"</string>
-    <string name="description_read_voicemail" msgid="5585559881573227732">"សារជាសំឡេងពី <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>"</string>
-    <string name="description_outgoing_call" msgid="543952487882919924">"ហៅទៅ <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>។"</string>
-    <string name="call_log_via_number" msgid="1340307109806397650">"តាមរយៈ <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> តាមរយៈ <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="description_call_action" msgid="4042796498169106545">"ហៅ <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_video_call_action" msgid="1237090968588659650">"ហៅទៅ <xliff:g id="NAMEORNUMBER">^1</xliff:g> ជាវីដេអូ។"</string>
-    <string name="description_voicemail_action" msgid="3290143432403538524">"ស្ដាប់​សារ​ជា​សំឡេង​ពី <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_create_new_contact_action" msgid="1928282350281564130">"បង្កើតទំនាក់ទំនងសម្រាប់ <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"បន្ថែម <xliff:g id="NAMEORNUMBER">^1</xliff:g> ទៅទំនាក់ទំនងដែលមានស្រាប់"</string>
-    <string name="description_details_action" msgid="2061866409737706174">"ព័ត៌មាន​លម្អិត​អំពីការហៅ​សម្រាប់ <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="call_log_header_today" msgid="1576119097475845293">"ថ្ងៃនេះ"</string>
-    <string name="call_log_header_yesterday" msgid="5616077776205329563">"ម្សិលមិញ"</string>
-    <string name="call_log_header_other" msgid="4940676886254217644">"ចាស់ៗ"</string>
-    <string name="voicemail_speaker_on" msgid="3151333608926996668">"បើក​អូប៉ាល័រ។"</string>
-    <string name="voicemail_speaker_off" msgid="2530064206962034201">"បិទ​អូប៉ាល័រ។"</string>
-    <string name="voicemail_play_start_pause" msgid="3874823480278334664">"ចាប់ផ្ដើម ឬ​ផ្អាក​ការ​ចាក់​ឡើងវិញ។"</string>
-    <string name="display_options_title" msgid="3880091801055797975">"ជម្រើសបង្ហាញ"</string>
-    <string name="sounds_and_vibration_title" msgid="3075050000721181384">"សំឡេង និងរំញ័រ"</string>
-    <string name="accessibility_settings_title" msgid="3329027650429831820">"ភាពងាយស្រួល"</string>
-    <string name="ringtone_title" msgid="8377174189894648486">"សំឡេង​រោទ៍​ទូរសព្ទ"</string>
-    <string name="vibrate_on_ring_title" msgid="631441314790960485">"ញ័រ​សម្រាប់​ការ​ហៅ​ផងដែរ"</string>
-    <string name="dtmf_tone_enable_title" msgid="3273762431523939277">"សំឡេង​ពេល​ចុច​លេខ"</string>
-    <string name="dtmf_tone_length_title" msgid="534096029202438539">"រយៈពេល​សំឡេង​ពេលចុច"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="applicationLabel">ទូរស័ព្ទ</string>
+  <string name="launcherDialpadActivityLabel">បន្ទះ​ចុច​លេខទូរសព្ទ</string>
+  <string name="callHistoryIconLabel">ប្រវត្តិ​ហៅ</string>
+  <string name="action_copy_number_text">ថតចម្លងលេខទូរស័ព្ទ</string>
+  <string name="copy_transcript_text">ថតចម្លងសំណៅពីសារសម្លេង</string>
+  <string name="action_edit_number_before_call">កែ​លេខ​មុន​ពេល​ហៅ</string>
+  <string name="call_log_delete_all">ជម្រះប្រវត្តិហៅ</string>
+  <string name="call_log_trash_voicemail">លុប​សារ​ជា​សំឡេង</string>
+  <string name="snackbar_voicemail_deleted">បានលុបសារសម្លេង</string>
+  <string name="clearCallLogConfirmation_title">ជម្រះប្រវត្តិហៅ?</string>
+  <string name="clearCallLogConfirmation">វានឹងលុបការហៅទាំងអស់ចេញពីប្រវត្តិរបស់អ្នក</string>
+  <string name="clearCallLogProgress_title">កំពុងជម្រះប្រវត្តិហៅ…</string>
+  <string name="notification_missedCallTitle">ខកខាន​ទទួល</string>
+  <string name="notification_missedWorkCallTitle">បានខកខានការហៅចូលពីកន្លែងការងារ</string>
+  <string name="notification_missedCallsTitle">ខកខាន​ទទួល</string>
+  <string name="notification_missedCallsMsg">ខកខានទទួល %d ដង</string>
+  <string name="notification_missedCall_call_back">ហៅ​ទៅ​វិញ</string>
+  <string name="notification_missedCall_message">សារ</string>
+  <string name="post_call_notification_message">%1$s: %2$s</string>
+  <string name="notification_voicemail_text_format">ហៅ​ទូរសព្ទ​ទៅកាន់ %s</string>
+  <string name="notification_voicemail_no_vm_number">មិន​ស្គាល់​លេខ​សារ​ជា​សំឡេង​ទេ</string>
+  <plurals name="notification_voicemail_title">
+    <item quantity="one">សារជាសម្លេង</item>
+    <item quantity="other">សារជាសម្លេង %1$d </item>
+  </plurals>
+  <string name="notification_voicemail_callers_list">%1$s, %2$s</string>
+  <string name="notification_new_voicemail_ticker">សារ​ជា​សំឡេង​ថ្មី​ពី %1$s</string>
+  <string name="voicemail_playback_error">មិនអាចចាក់សារជាសម្លេងបានទេ</string>
+  <string name="voicemail_fetching_content">កំពុងផ្ទុកសារជាសម្លេង…</string>
+  <string name="voicemail_fetching_timout">មិនអាចផ្ទុកសារជាសម្លេងបានទេ</string>
+  <string name="call_log_item_count_and_date">(%1$d) %2$s</string>
+  <string name="description_playback_speakerphone">បិទ ឬ​បើក​អូប៉ាល័រទូរស័ព្ទ</string>
+  <string name="description_playback_seek">រកមើល​ទីតាំង​ចាក់​ឡើងវិញ</string>
+  <string name="action_menu_call_history_description">ប្រវត្តិហៅ</string>
+  <string msgid="2295659037509008453" name="action_menu_overflow_description">ជម្រើស​បន្ថែម</string>
+  <string name="action_menu_dialpad_button">បន្ទះ​​ចុច​លេខ</string>
+  <string name="dialer_settings_label">ការកំណត់</string>
+  <string name="simulator_submenu_label">កម្មវិធីធ្វើ​ដូច​មែនទែន</string>
+  <string name="new_ui_launcher_shortcut_label">បង្កើត​ផ្លូវកាត់ UI ថ្មី</string>
+  <string name="description_entering_bulk_action_mode">ចូល​មុខងារ​សកម្មភាព​ច្រើន</string>
+  <string name="description_leaving_bulk_action_mode">បាន​ចាកចេញ​ពី​មុខងារ​សកម្មភាព​ច្រើន</string>
+  <string name="description_selecting_bulk_action_mode">បាន​ជ្រើសរើស %1$s</string>
+  <string name="description_unselecting_bulk_action_mode">បាន​ដក​ការជ្រើសរើស %1$s</string>
+  <string name="description_contact_details">ព័ត៌មាន​លម្អិត​ទំនាក់ទំនង​សម្រាប់ %1$s</string>
+  <string name="description_spam_contact_details">ព័ត៌មាន​លម្អិត​ទំនាក់ទំនង​សម្រាប់​អ្នក​ហៅ​ឥត​បាន​ការ​ដែល​សង្ស័យ %1$s</string>
+  <string name="description_num_calls">ការ​ហៅ %1$s ។</string>
+  <string name="description_video_call">ការ​ហៅ​ជា​វីដេអូ​។</string>
+  <string name="description_start_voice_search">ចាប់ផ្ដើម​ស្វែងរក​ជា​សំឡេង</string>
+  <string name="voicemail">សារ​ជា​សំឡេង</string>
+  <string name="description_cancel_multi_select">បោះបង់​មុខងារ​សកម្មភាព​ជា​ក្រុម</string>
+  <string name="voicemailMultiSelectDeleteConfirm">លុប</string>
+  <string name="voicemailMultiSelectDeleteCancel">បោះបង់</string>
+  <string name="voicemailMultiSelectActionBarTitle">បាន​ជ្រើសរើស %1$s</string>
+  <plurals name="delete_voicemails_confirmation_dialog_title">
+    <item quantity="one"><b>លុប​សារ​ជា​សំឡេង​នេះ? </b></item>
+    <item quantity="other"><b>លុប​សារ​ជា​សំឡេង​ទាំងនេះ? </b></item>
+  </plurals>
+  <string name="voicemailCallLogToday">@string/call_log_header_today</string>
+  <string name="voicemailCallLogDateTimeFormat">%1$s នៅម៉ោង %2$s</string>
+  <string name="voicemailDurationFormat">%1$02d:%2$02d</string>
+  <string name="voicemailCallLogDateTimeFormatWithDuration">%1$s • %2$s</string>
+  <string name="voice_search_not_available">ការស្វែងរកជាសម្លេងមិនមានទេ</string>
+  <string name="dialer_hint_find_contact">រក​ទំនាក់ទំនង</string>
+  <string name="block_number_search_hint">បន្ថែមលេខទូរស័ព្ទ ឬស្វែងរកទំនាក់ទំនង</string>
+  <string name="call_log_all_empty">ប្រវត្តិហៅរបស់អ្នកទទេ</string>
+  <string name="call_log_all_empty_action">ហៅទូរសព្ទ</string>
+  <string name="call_log_missed_empty">អ្នកមិនមានការខកខានទទួលទូរសព្ទទេ។</string>
+  <string name="call_log_voicemail_empty">ប្រអប់ទទួលសារជាសំឡេងរបស់អ្នកទទេ។</string>
+  <string name="call_log_activity_title">ប្រវត្តិ​ហៅ</string>
+  <string name="call_log_all_title">ទាំង​អស់</string>
+  <string name="call_log_missed_title">ខកខាន​ទទួល</string>
+  <string name="tab_speed_dial">ហៅទូរស័ព្ទល្បឿនលឿន</string>
+  <string name="tab_history">ប្រវត្តិហៅ</string>
+  <string name="tab_all_contacts">ទំនាក់ទំនង</string>
+  <string name="tab_voicemail">សារជាសំឡេង</string>
+  <string name="search_shortcut_call_number">ហៅ %s</string>
+  <string name="search_shortcut_create_new_contact">បង្កើតទំនាក់ទំនងថ្មី</string>
+  <string name="search_shortcut_add_to_contact">បន្ថែមទៅទំនាក់ទំនង</string>
+  <string name="search_shortcut_send_sms_message">ផ្ញើសារ SMS</string>
+  <string name="search_shortcut_make_video_call">ការ​ហៅ​ជា​វីដេអូ</string>
+  <string name="search_shortcut_block_number">រារាំងលេខ</string>
+  <string name="speed_dial_empty">គ្មាននរណាម្នាក់នៅក្នុងការហៅរហ័សរបស់អ្នកនៅឡើយទេ</string>
+  <string name="speed_dial_empty_add_favorite_action">បញ្ចូលសំណព្វ</string>
+  <string name="remove_contact">លុបចេញ</string>
+  <string name="select_all">ជ្រើសរើស​​ទាំងអស់</string>
+  <string name="call_log_action_video_call">ហៅជាវីដេអូ</string>
+  <string name="call_log_action_set_up_video">រៀបចំការហៅ​ជា​វីដេអូ​</string>
+  <string name="call_log_action_invite_video">អញ្ជើញ​ចូលរួម​ការហៅ​តាម​​វីដេអូ</string>
+  <string name="call_log_action_send_message">ផ្ញើសារ</string>
+  <string name="call_log_action_details">ព័ត៌មានលម្អិតអំពីការហៅ</string>
+  <string name="call_log_action_share_voicemail">ផ្ញើទៅ...</string>
+  <string name="call_log_action_call">ហៅ ^1</string>
+  <string name="description_incoming_missed_call">ខកខានទទួលកាហៅពី ^1, ^2, ^3, ^4។</string>
+  <string name="description_incoming_answered_call">បានឆ្លើយតបការហៅពី ^1, ^2, ^3, ^4។</string>
+  <string name="description_unread_voicemail">សារជាសំឡេងដែលមិនទាន់អានពី ^1, ^2, ^3, ^4</string>
+  <string name="description_read_voicemail">សារជាសំឡេងពី ^1, ^2, ^3, ^4</string>
+  <string name="description_outgoing_call">ហៅទៅ ^1, ^2, ^3, ^4។</string>
+  <string name="call_log_via_number">តាមរយៈ %1$s</string>
+  <string name="call_log_via_number_phone_account">%1$s តាមរយៈ %2$s</string>
+  <string name="description_call_action">ហៅ ^1</string>
+  <string name="description_video_call_action">ហៅទៅ ^1 ជាវីដេអូ។</string>
+  <string name="description_voicemail_action">ស្ដាប់​សារ​ជា​សំឡេង​ពី ^1</string>
+  <string name="description_create_new_contact_action">បង្កើតទំនាក់ទំនងសម្រាប់ ^1</string>
+  <string name="description_add_to_existing_contact_action">បន្ថែម ^1 ទៅទំនាក់ទំនងដែលមានស្រាប់</string>
+  <string name="description_details_action">ព័ត៌មាន​លម្អិត​អំពីការហៅ​សម្រាប់ ^1</string>
+  <string name="call_log_header_today">ថ្ងៃនេះ</string>
+  <string name="call_log_header_yesterday">ម្សិលមិញ</string>
+  <string name="call_log_header_other">ចាស់ៗ</string>
+  <string name="voicemail_speaker_on">បើក​អូប៉ាល័រ។</string>
+  <string name="voicemail_speaker_off">បិទ​អូប៉ាល័រ។</string>
+  <string name="voicemail_play_start_pause">ចាប់ផ្ដើម ឬ​ផ្អាក​ការ​ចាក់​ឡើងវិញ។</string>
+  <string name="display_options_title">ជម្រើសបង្ហាញ</string>
+  <string name="sounds_and_vibration_title">សំឡេង និងរំញ័រ</string>
+  <string name="accessibility_settings_title">ភាពងាយស្រួល</string>
+  <string name="ringtone_title">សំឡេង​រោទ៍​ទូរសព្ទ</string>
+  <string name="vibrate_on_ring_title">ញ័រ​សម្រាប់​ការ​ហៅ​ផងដែរ</string>
+  <string name="dtmf_tone_enable_title">សំឡេង​ពេល​ចុច​លេខ</string>
+  <string name="dtmf_tone_length_title">រយៈពេល​សំឡេង​ពេលចុច</string>
   <string-array name="dtmf_tone_length_entries">
-    <item msgid="3136353015227162823">"ធម្មតា"</item>
-    <item msgid="5376841175538523822">"វែង"</item>
+    <item>ធម្មតា</item>
+    <item>វែង</item>
   </string-array>
-    <string name="respond_via_sms_setting_title" msgid="8008181606657693452">"ការ​ឆ្លើយតប​រហ័ស"</string>
-    <string name="call_settings_label" msgid="7824611757200960807">"ការហៅ"</string>
-    <string name="manage_blocked_numbers_label" msgid="16823761991832273">"ការរារាំងការហៅ"</string>
-    <string name="voicemail_settings_label" msgid="4594299554519920570">"សារ​ជា​សំឡេង"</string>
-    <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"ការរារាំងការហៅត្រូវបានបិទជាបណ្តោះអាសន្ន"</string>
-    <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"ការរារាំងការហៅត្រូវបានបិទដំណើរការ ដោយសារតែអ្នកបានទាក់ទងទៅសេវាអាសន្នចេញពីទូរស័ព្ទនេះក្នុងចន្លោះពេល 48 ម៉ោងកន្លងមកនេះ។ វានឹងបើកដំណើរការឡើងវិញ បន្ទាប់ពីរយៈពេល 48 ម៉ោងផុតកំណត់។"</string>
-    <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"នាំចូលលេខ"</string>
-    <string name="blocked_call_settings_import_description" msgid="1819412052545228965">"កាលពីមុនអ្នកបានដាក់សម្គាល់ឲ្យបញ្ជូនអ្នកហៅមួយចំនួនដោយស្វ័យប្រវត្តិទៅកាន់សារជាសំឡេងតាមរយៈកម្មវិធីផ្សេងទៀត។"</string>
-    <string name="blocked_call_settings_view_numbers_button" msgid="3332727948554356704">"មើលលេខ"</string>
-    <string name="blocked_call_settings_import_button" msgid="7319111700387470727">"នាំចូល"</string>
-    <string name="description_blocked_number_list_delete" msgid="2139644216858370740">"ឈប់ទប់ស្កាត់លេខ"</string>
-    <string name="addBlockedNumber" msgid="3053473735238295551">"បន្ថែមលេខ"</string>
-    <string name="block_number_footer_message_vvm" msgid="7955326304033982368">"ការហៅចេញពីលេខទាំងនេះនឹងត្រូវបានរារាំង ហើយសារជាសំឡេងនឹងត្រូវបានលុបដោយស្វ័យប្រវត្តិ។"</string>
-    <string name="block_number_footer_message_no_vvm" msgid="1152684139070471665">"ការហៅចេញពីលេខទាំងនេះនឹងត្រូវបានរារាំង ប៉ុន្តែពួកគេនៅតែអាចទុកសារជាសំឡេងឲ្យអ្នកបាន។"</string>
-    <string name="block_list" msgid="4701585783411870782">"លេខបានរារាំង"</string>
-    <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g> ត្រូវបានទប់ស្កាត់រួចហើយ"</string>
-    <string name="phone_account_settings_label" msgid="8372485478006965920">"គណនីហៅទូរសព្ទ"</string>
-    <string name="permission_no_speeddial" msgid="8487215628510596753">"ដើម្បីបើកដំណើរការហៅរហ័ស សូមបើកសិទ្ធិអនុញ្ញាតកម្មវិធីទំនាក់ទំនង។"</string>
-    <string name="permission_no_calllog" msgid="4053705651238775784">"ដើម្បីមើលកំណត់ហេតុហៅទូរស័ព្ទរបស់អ្នក សូមបើកសិទ្ធិអនុញ្ញាតកម្មវិធីហៅទូរស័ព្ទ។"</string>
-    <string name="permission_no_search" msgid="2424710404207193826">"ដើម្បីស្វែងរកទំនាក់ទំនងរបស់អ្នក សូមបើកសិទ្ធិអនុញ្ញាតទំនាក់ទំនង។"</string>
-    <string name="permission_place_call" msgid="8686908130349369423">"ដើម្បីធ្វើការហៅទូរស័ព្ទ សូមបើកសិទ្ធិអនុញ្ញាតកម្មវិធីហៅទូរស័ព្ទ។"</string>
-    <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"កម្មវិធីទូរស័ព្ទមិនមានសិទ្ធិអនុញ្ញាតដើម្បីសរសេរការកំណត់ប្រព័ន្ធទេ។"</string>
-    <string name="blocked_number_call_log_label" msgid="4212282846299997693">"បាន​ទប់ស្កាត់"</string>
-    <string name="call_log_action_block_report_number" msgid="7302636538668696729">"រារាំង/រាយការណ៍សារដែលមិនចង់បាន"</string>
-    <string name="call_log_action_block_number" msgid="5048188386501998865">"រារាំងលេខ"</string>
-    <string name="call_log_action_remove_spam" msgid="2045319806318398403">"មិនមែន​សារ​ឥតបានការ"</string>
-    <string name="call_log_action_unblock_number" msgid="6100117033288448758">"ឈប់ទប់ស្កាត់លេខ"</string>
-    <string name="spam_number_call_log_label" msgid="2678431398326811131">"សារ​ឥតបានការ"</string>
-    <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> មិន​នៅ​លើ​អ៊ីនធឺណិត និង​មិន​អាច​ទាក់ទង​បាន​ទេ"</string>
-    <string name="about_phone_label" msgid="582991354677973731">"អំពី"</string>
-    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"បាន​ធ្វើ​ប្រតិចារឹក​ដោយ Google"</string>
-    <string name="voicemail_transcription_in_progress" msgid="2933320969613783210">"Google កំពុង​ធ្វើ​ប្រតិចារឹក..."</string>
-    <string name="voicemail_transcription_failed" msgid="335275303117412706">"មិន​មាន​ប្រតិចារឹក​ទេ"</string>
-    <string name="voicemail_transcription_failed_language_not_supported" msgid="4210332591050562553">"Transcript not available. Language not supported."</string>
-    <string name="voicemail_transcription_failed_no_speech" msgid="9093372879697874852">"Transcript not available. No speech detected."</string>
-    <string name="view_conversation" msgid="7895904782094119702">"មើល"</string>
-    <string name="ec_data_deleted" msgid="4794880345545827107">"បាន​លុប​ការហៅទូរសព្ទ។ មើល និង​លុប​ឯកសារ​ភ្ជាប់​ដែល​បាន​ចែករំលែក​នៅ​អំឡុង​ពេល​ហៅ​ទូរសព្ទ​នេះ​នៅ​ក្នុង Messages ។"</string>
-    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"បាន​លុប​ការហៅទូរសព្ទ។ មើល និង​លុប​ឯកសារ​ភ្ជាប់​ដែល​បាន​ចែករំលែក​នៅ​អំឡុង​ពេល​ហៅ​ទូរសព្ទ​នៅ​ក្នុង Messages ។"</string>
+  <string name="respond_via_sms_setting_title">ការ​ឆ្លើយតប​រហ័ស</string>
+  <string name="call_settings_label">ការហៅ</string>
+  <string name="manage_blocked_numbers_label">លេខ​ដែល​ទប់ស្កាត់</string>
+  <string name="voicemail_settings_label">សារ​ជា​សំឡេង</string>
+  <string name="blocked_numbers_disabled_emergency_header_label">ការរារាំងការហៅត្រូវបានបិទជាបណ្តោះអាសន្ន</string>
+  <string name="blocked_numbers_disabled_emergency_desc">ការរារាំងការហៅត្រូវបានបិទដំណើរការ ដោយសារតែអ្នកបានទាក់ទងទៅសេវាអាសន្នចេញពីទូរស័ព្ទនេះក្នុងចន្លោះពេល 48 ម៉ោងកន្លងមកនេះ។ វានឹងបើកដំណើរការឡើងវិញ បន្ទាប់ពីរយៈពេល 48 ម៉ោងផុតកំណត់។</string>
+  <string name="import_send_to_voicemail_numbers_label">នាំចូលលេខ</string>
+  <string name="blocked_call_settings_import_description">កាលពីមុនអ្នកបានដាក់សម្គាល់ឲ្យបញ្ជូនអ្នកហៅមួយចំនួនដោយស្វ័យប្រវត្តិទៅកាន់សារជាសំឡេងតាមរយៈកម្មវិធីផ្សេងទៀត។</string>
+  <string name="blocked_call_settings_view_numbers_button">មើលលេខ</string>
+  <string name="blocked_call_settings_import_button">នាំចូល</string>
+  <string name="description_blocked_number_list_delete">ឈប់ទប់ស្កាត់លេខ</string>
+  <string name="addBlockedNumber">បន្ថែមលេខ</string>
+  <string name="block_number_footer_message_vvm">ការហៅចេញពីលេខទាំងនេះនឹងត្រូវបានរារាំង ហើយសារជាសំឡេងនឹងត្រូវបានលុបដោយស្វ័យប្រវត្តិ។</string>
+  <string name="block_number_footer_message_no_vvm">ការហៅចេញពីលេខទាំងនេះនឹងត្រូវបានរារាំង ប៉ុន្តែពួកគេនៅតែអាចទុកសារជាសំឡេងឲ្យអ្នកបាន។</string>
+  <string name="block_list">លេខបានរារាំង</string>
+  <string name="alreadyBlocked">%1$s ត្រូវបានទប់ស្កាត់រួចហើយ</string>
+  <string name="phone_account_settings_label">គណនីហៅទូរសព្ទ</string>
+  <string name="permission_no_speeddial">ដើម្បីបើកដំណើរការហៅរហ័ស សូមបើកសិទ្ធិអនុញ្ញាតកម្មវិធីទំនាក់ទំនង។</string>
+  <string name="permission_no_calllog">ដើម្បីមើលកំណត់ហេតុហៅទូរស័ព្ទរបស់អ្នក សូមបើកសិទ្ធិអនុញ្ញាតកម្មវិធីហៅទូរស័ព្ទ។</string>
+  <string name="permission_no_search">ដើម្បីស្វែងរកទំនាក់ទំនងរបស់អ្នក សូមបើកសិទ្ធិអនុញ្ញាតទំនាក់ទំនង។</string>
+  <string name="permission_place_call">ដើម្បីធ្វើការហៅទូរស័ព្ទ សូមបើកសិទ្ធិអនុញ្ញាតកម្មវិធីហៅទូរស័ព្ទ។</string>
+  <string name="toast_cannot_write_system_settings">កម្មវិធីទូរស័ព្ទមិនមានសិទ្ធិអនុញ្ញាតដើម្បីសរសេរការកំណត់ប្រព័ន្ធទេ។</string>
+  <string name="blocked_number_call_log_label">បាន​ទប់ស្កាត់</string>
+  <string name="call_log_action_block_report_number">រារាំង/រាយការណ៍សារដែលមិនចង់បាន</string>
+  <string name="call_log_action_block_number">រារាំងលេខ</string>
+  <string name="call_log_action_remove_spam">មិនមែន​សារ​ឥតបានការ</string>
+  <string name="call_log_action_unblock_number">ឈប់ទប់ស្កាត់លេខ</string>
+  <string name="spam_number_call_log_label">សារ​ឥតបានការ</string>
+  <string name="call_composer_connection_failed">%1$s មិន​នៅ​លើ​អ៊ីនធឺណិត និង​មិន​អាច​ទាក់ទង​បាន​ទេ</string>
+  <string name="about_phone_label">អំពី</string>
+  <string name="voicemail_transcription_branding_text">បាន​ធ្វើ​ប្រតិចារឹក​ដោយ Google</string>
+  <string name="voicemail_transcription_in_progress">កំពុងធ្វើប្រតិចារឹក...</string>
+  <string name="voicemail_transcription_failed">មិន​មាន​ប្រតិចារឹក​ទេ</string>
+  <string name="voicemail_transcription_failed_language_not_supported">Transcript not available. Language not supported.</string>
+  <string name="voicemail_transcription_failed_no_speech">Transcript not available. No speech detected.</string>
+  <string name="voicemail_donation_promo_title">ជួយ​ធ្វើ​ឱ្យ​ភាពត្រឹមត្រូវ​នៃ​ប្រតិចារឹក​ប្រសើរ​ឡើង​ទេ?</string>
+  <string name="voicemail_donation_promo_content">អនុញ្ញាត​ឱ្យ Google ពិនិត្យ​មើល​វា និង​សារ​ជា​សំឡេងអនាគត​ដែល​មាន​ប្រតិចារឹក​។ សារ​ទាំង​នេះ​នឹង​ត្រូវ​បាន​រក្សា​ទុក​ជា​លក្ខណៈ​អនាមិក។ ផ្លាស់ប្ដូរ​ការកំណត់​បាន​គ្រប់​ពេល។ %1$s</string>
+  <string name="voicemail_donation_promo_opt_in">បាទ/ចាស ខ្ញុំយល់ព្រម</string>
+  <string name="voicemail_donation_promo_opt_out">ទេ អរគុណ</string>
+  <string name="voicemail_transcription_rating">វាយតម្លៃ​គុណភាព​ប្រតិចារឹក</string>
+  <string name="voicemail_transcription_rating_thanks">អរគុណ​ចំពោះ​ការ​ផ្ដល់​មតិ​កែលម្អ</string>
+  <string name="description_rating_good">ចូលចិត្ត</string>
+  <string name="description_rating_bad">មិន​ចូលចិត្ត</string>
+  <string name="view_conversation">មើល</string>
+  <string name="ec_data_deleted">បាន​លុប​ការហៅទូរសព្ទ។ មើល និង​លុប​ឯកសារ​ភ្ជាប់​ដែល​បាន​ចែករំលែក​នៅ​អំឡុង​ពេល​ហៅ​ទូរសព្ទ​នេះ​នៅ​ក្នុង Messages ។</string>
+  <string name="multiple_ec_data_deleted">បាន​លុប​ការហៅទូរសព្ទ។ មើល និង​លុប​ឯកសារ​ភ្ជាប់​ដែល​បាន​ចែករំលែក​នៅ​អំឡុង​ពេល​ហៅ​ទូរសព្ទ​នៅ​ក្នុង Messages ។</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-kn/strings.xml b/java/com/android/dialer/app/res/values-kn/strings.xml
index 45ac943..bdd4b89 100644
--- a/java/com/android/dialer/app/res/values-kn/strings.xml
+++ b/java/com/android/dialer/app/res/values-kn/strings.xml
@@ -1,179 +1,171 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="applicationLabel" msgid="2202739481132958990">"ಫೋನ್"</string>
-    <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"ಫೋನ್ ಕೀಪ್ಯಾಡ್"</string>
-    <string name="callHistoryIconLabel" msgid="7493268743411968630">"ಕರೆ ಇತಿಹಾಸ"</string>
-    <string name="action_copy_number_text" msgid="832682558551502319">"ಸಂಖ್ಯೆಯನ್ನು ನಕಲಿಸಿ"</string>
-    <string name="copy_transcript_text" msgid="937904189017310829">"ಟ್ರಾನ್ಸ್‌ಕ್ರಿಪ್ಶನ್ ನಕಲಿಸಿ"</string>
-    <string name="action_edit_number_before_call" msgid="8017492815878473837">"ಕರೆ ಮಾಡುವ ಮೊದಲು ಸಂಖ್ಯೆಯನ್ನು ಎಡಿಟ್ ಮಾಡಿ"</string>
-    <string name="call_log_delete_all" msgid="7852970926906523784">"ಕರೆ ಇತಿಹಾಸ ತೆರವುಗೊಳಿಸಿ"</string>
-    <string name="call_log_trash_voicemail" msgid="6118493534178533972">"ಧ್ವನಿಮೇಲ್‌ ಅಳಿಸಿ"</string>
-    <string name="snackbar_voicemail_deleted" msgid="7463166543725496307">"ಧ್ವನಿಮೇಲ್ ಅಳಿಸಲಾಗಿದೆ"</string>
-    <string name="snackbar_voicemail_deleted_undo" msgid="6959743982796409941">"ರದ್ದುಮಾಡಿ"</string>
-    <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"ಕರೆ ಇತಿಹಾಸವನ್ನು ತೆರವುಗೊಳಿಸುವುದೇ?"</string>
-    <string name="clearCallLogConfirmation" msgid="6844949465815109166">"ಇದು ನಿಮ್ಮ ಇತಿಹಾಸದಿಂದ ಎಲ್ಲಾ ಕರೆಗಳನ್ನು ಅಳಿಸುತ್ತದೆ"</string>
-    <string name="clearCallLogProgress_title" msgid="995004835687361977">"ಕರೆ ಇತಿಹಾಸವನ್ನು ತೆರವುಗೊಳಿಸಲಾಗುತ್ತಿದೆ…"</string>
-    <string name="notification_missedCallTitle" msgid="8283366068539898486">"ಮಿಸ್ಡ್‌ ಕಾಲ್‌"</string>
-    <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"ಮಿಸ್ಡ್‌ ಕೆಲಸದ ಕರೆ"</string>
-    <string name="notification_missedCallsTitle" msgid="3697442015345089802">"ಮಿಸ್ಡ್‌ ಕರೆಗಳು"</string>
-    <string name="notification_missedCallsMsg" msgid="8176217633929018706">"<xliff:g id="NUM_MISSED_CALLS">%d</xliff:g> ಮಿಸ್ಡ್‌ ಕರೆಗಳು"</string>
-    <string name="notification_missedCall_call_back" msgid="3875698110051973965">"ಮರಳಿ ಕರೆ ಮಾಡಿ"</string>
-    <string name="notification_missedCall_message" msgid="5086910028988305964">"ಸಂದೇಶ"</string>
-    <string name="post_call_notification_message" msgid="5417476789860590611">"<xliff:g id="NAME">%1$s</xliff:g>: <xliff:g id="MESSAGE">%2$s</xliff:g>"</string>
-    <string name="notification_voicemail_text_format" msgid="1895667520930252897">"<xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g> ಗೆ ಡಯಲ್‌‌ ಮಾಡಿ"</string>
-    <string name="notification_voicemail_no_vm_number" msgid="8942821987929495842">"ಅಪರಿಚಿತ ಧ್ವನಿಮೇಲ್‌ ಸಂಖ್ಯೆ"</string>
-    <plurals name="notification_voicemail_title" formatted="false" msgid="1551847434476438657">
-      <item quantity="one"> <xliff:g id="COUNT">%1$d</xliff:g> ಧ್ವನಿಮೇಲ್‌ಗಳು </item>
-      <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> ಧ್ವನಿಮೇಲ್‌ಗಳು </item>
-    </plurals>
-    <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
-    <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"<xliff:g id="CALLER">%1$s</xliff:g> ಇವರಿಂದ ಹೊಸ ಧ್ವನಿಮೇಲ್‌"</string>
-    <string name="voicemail_playback_error" msgid="4384373852257757295">"ಧ್ವನಿಮೇಲ್‌ ಪ್ಲೇ ಮಾಡಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ"</string>
-    <string name="voicemail_fetching_content" msgid="572320120918636014">"ಧ್ವನಿಮೇಲ್‌ ಲೋಡ್‌ ಮಾಡಲಾಗುತ್ತಿದೆ…"</string>
-    <string name="voicemail_fetching_timout" msgid="2128873915839949783">"ಧ್ವನಿಮೇಲ್‌ ಲೋಡ್‌ ಮಾಡಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ"</string>
-    <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_playback_speakerphone" msgid="4852027754869750227">"ಸ್ಪೀಕರ್‌ಫೋನ್ ಸ್ವಿಚ್ ಆನ್ ಅಥವಾ ಆಫ್ ಮಾಡಿ"</string>
-    <string name="description_playback_seek" msgid="1340910573254132520">"ಪ್ಲೇಬ್ಯಾಕ್ ಸ್ಥಾನವನ್ನು ಪಡೆಯಿರಿ"</string>
-    <string name="action_menu_call_history_description" msgid="8829135306925008546">"ಕರೆ ಇತಿಹಾಸ"</string>
-    <string name="action_menu_overflow_description" msgid="7648679686746517341">"ಇನ್ನಷ್ಟು ಆಯ್ಕೆಗಳು"</string>
-    <string name="action_menu_dialpad_button" msgid="1970631633457493180">"ಕೀ ಪ್ಯಾಡ್‌"</string>
-    <string name="dialer_settings_label" msgid="4980176284150290175">"ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
-    <string name="simulator_submenu_label" msgid="186156287346615267">"ಸಿಮ್ಯುಲೇಟರ್"</string>
-    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"ಹೊಸ UI ಶಾರ್ಟ್‌ಕಟ್ ರಚಿಸಿ"</string>
-    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"ದೊಡ್ಡ ಪ್ರಮಾಣದ ಕ್ರಿಯೆಯ ಮೋಡ್‌ಗೆ ಪ್ರವೇಶಿಸಲಾಗುತ್ತಿದೆ"</string>
-    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"ದೊಡ್ಡ ಪ್ರಮಾಣದ ಕ್ರಿಯೆಯ ಮೋಡ್ ತೊರೆಯಲಾಗಿದೆ"</string>
-    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> ಆಯ್ಕೆಮಾಡಲಾಗಿದೆ"</string>
-    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> ಆಯ್ಕೆಯನ್ನು ರದ್ದುಮಾಡಲಾಗಿದೆ"</string>
-    <string name="description_contact_details" msgid="3341280873855253464">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> ಗೆ ಸಂಪರ್ಕ ವಿವರಗಳು"</string>
-    <string name="description_spam_contact_details" msgid="5592578752881528368">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> ಶಂಕಿತ ಸ್ಪ್ಯಾಮ್ ಕರೆದಾರರಿಗಾಗಿ ಸಂಪರ್ಕ ವಿವರಗಳು"</string>
-    <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> ಕರೆಗಳು."</string>
-    <string name="description_video_call" msgid="3738199365585751727">"ವೀಡಿಯೊ ಕರೆ."</string>
-    <string name="description_start_voice_search" msgid="8380022725973015261">"ಧ್ವನಿ ಹುಡುಕಾಟ ಪ್ರಾರಂಭಿಸಿ"</string>
-    <string name="voicemail" msgid="8899540969000957954">"ಧ್ವನಿಮೇಲ್"</string>
-    <string name="description_cancel_multi_select" msgid="3930475950253360461">"ಬ್ಯಾಚ್ ಕ್ರಿಯೆಗಳ ಮೋಡ್ ಅನ್ನು ರದ್ದುಮಾಡಿ"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"ಅಳಿಸಿ"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"ರದ್ದುಮಾಡಿ"</string>
-    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> ಆಯ್ಕೆಮಾಡಲಾಗಿದೆ"</string>
-    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
-      <item quantity="one">"<b>"ಈ ಧ್ವನಿಮೇಲ್‌ಗಳನ್ನು ಅಳಿಸುವುದೇ? "</b>"</item>
-      <item quantity="other">"<b>"ಈ ಧ್ವನಿಮೇಲ್‌ಗಳನ್ನು ಅಳಿಸುವುದೇ? "</b>"</item>
-    </plurals>
-    <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
-    <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> ರಂದು <xliff:g id="TIME">%2$s</xliff:g> ಗಂಟೆಗೆ"</string>
-    <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
-    <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="voice_search_not_available" msgid="6546240433719732905">"ಧ್ವನಿ ಹುಡುಕಾಟ ಲಭ್ಯವಿಲ್ಲ"</string>
-    <string name="dialer_hint_find_contact" msgid="2023214799381149808">"ಸಂಪರ್ಕಗಳನ್ನು ಹುಡುಕಿ"</string>
-    <string name="block_number_search_hint" msgid="5377706079015099416">"ಸಂ. ಸೇರಿಸಿ ಅಥವಾ ಸಂಪರ್ಕ ಹುಡುಕಿ"</string>
-    <string name="call_log_all_empty" msgid="3955572868518162004">"ನಿಮ್ಮ ಕರೆ ಇತಿಹಾಸ ಖಾಲಿಯಾಗಿದೆ"</string>
-    <string name="call_log_all_empty_action" msgid="852218280136243014">"ಕರೆ ಮಾಡಿ"</string>
-    <string name="call_log_missed_empty" msgid="7094936030845062214">"ನೀವು ಯಾವುದೇ ಮಿಸ್ಡ್ ಕರೆಗಳನ್ನು ಹೊಂದಿಲ್ಲ."</string>
-    <string name="call_log_voicemail_empty" msgid="273623903423275178">"ನಿಮ್ಮ ಧ್ವನಿಮೇಲ್ ಇನ್‌ಬಾಕ್ಸ್ ಖಾಲಿ ಇದೆ."</string>
-    <string name="call_log_activity_title" msgid="1275242727244945527">"ಕರೆ ಇತಿಹಾಸ"</string>
-    <string name="call_log_all_title" msgid="6042262422192020327">"ಎಲ್ಲಾ ಕರೆಗಳು"</string>
-    <string name="call_log_missed_title" msgid="17254005889268015">"ಮಿಸ್ಡ್‌ ಕರೆಗಳು"</string>
-    <string name="tab_speed_dial" msgid="6616404752227561075">"ಸ್ಪೀಡ್ ಡಯಲ್"</string>
-    <string name="tab_history" msgid="7420269368689503596">"ಕರೆ ಇತಿಹಾಸ"</string>
-    <string name="tab_all_contacts" msgid="5531733977693943015">"ಸಂಪರ್ಕಗಳು"</string>
-    <string name="tab_voicemail" msgid="2458548090088316246">"ಧ್ವನಿಮೇಲ್"</string>
-    <string name="search_shortcut_call_number" msgid="8847918845036880688">"<xliff:g id="NUMBER">%s</xliff:g> ಕರೆ ಮಾಡಿ"</string>
-    <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"ಹೊಸ ಸಂಪರ್ಕ ರಚಿಸು"</string>
-    <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"ಸಂಪರ್ಕಕ್ಕೆ ಸೇರಿಸು"</string>
-    <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"SMS ಕಳುಹಿಸು"</string>
-    <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"ವೀಡಿಯೊ ಕರೆ ಮಾಡಿ"</string>
-    <string name="search_shortcut_block_number" msgid="4587283230665805776">"ಸಂಖ್ಯೆಯನ್ನು ನಿರ್ಬಂಧಿಸು"</string>
-    <string name="speed_dial_empty" msgid="3346406399966039505">"ನಿಮ್ಮ ತ್ವರಿತ ಡಯಲ್‌ನಲ್ಲಿ ಇದುವರೆಗೆ ಯಾರೂ ಇಲ್ಲ"</string>
-    <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"ಮೆಚ್ಚಿನದನ್ನು ಸೇರಿಸಿ"</string>
-    <string name="remove_contact" msgid="2353580570488923668">"ತೆಗೆದುಹಾಕು"</string>
-    <string name="select_all" msgid="408601760696146245">"ಎಲ್ಲವನ್ನೂ ಆಯ್ಕೆ ಮಾಡಿ"</string>
-    <string name="call_log_action_video_call" msgid="7565549950343850819">"ವೀಡಿಯೊ ಕರೆ"</string>
-    <string name="call_log_action_send_message" msgid="6948727362660115554">"ಸಂದೇಶ ಕಳುಹಿಸಿ"</string>
-    <string name="call_log_action_details" msgid="2091370737371449501">"ಕರೆಯ ವಿವರಗಳು"</string>
-    <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"ಇದಕ್ಕೆ ಕಳುಹಿಸಿ ..."</string>
-    <string name="call_log_action_call" msgid="682724094251540583">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> ಕರೆ ಮಾಡಿ"</string>
-    <string name="description_incoming_missed_call" msgid="8292535799379230029">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g> ರಿಂದ ತಪ್ಪಿದ ಕರೆ."</string>
-    <string name="description_incoming_answered_call" msgid="3920182963103160610">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g> ರಿಂದ ಕರೆಗೆ ಉತ್ತರಿಸಲಾಗಿದೆ."</string>
-    <string name="description_unread_voicemail" msgid="145170985013419170">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g> ರಿಂದ ಓದದಿರುವ ಧ್ವನಿಮೇಲ್."</string>
-    <string name="description_read_voicemail" msgid="5585559881573227732">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g> ರಿಂದ ಧ್ವನಿಮೇಲ್."</string>
-    <string name="description_outgoing_call" msgid="543952487882919924">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g> ಗೆ ಕರೆ."</string>
-    <string name="call_log_via_number" msgid="1340307109806397650">"<xliff:g id="NUMBER">%1$s</xliff:g> ಮೂಲಕ"</string>
-    <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="NUMBER">%2$s</xliff:g> ಮೂಲಕ <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>"</string>
-    <string name="description_call_action" msgid="4042796498169106545">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> ಕರೆ ಮಾಡಿ"</string>
-    <string name="description_video_call_action" msgid="1237090968588659650">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> ಗೆ ವೀಡಿಯೊ ಕರೆ ಮಾಡಿ."</string>
-    <string name="description_voicemail_action" msgid="3290143432403538524">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> ರಿಂದ ಧ್ವನಿಮೇಲ್ ಆಲಿಸಿ"</string>
-    <string name="description_create_new_contact_action" msgid="1928282350281564130">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> ಗೆ ಸಂಪರ್ಕವನ್ನು ರಚಿಸಿ"</string>
-    <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ ಸಂಪರ್ಕಕ್ಕೆ <xliff:g id="NAMEORNUMBER">^1</xliff:g> ಸೇರಿಸಿ"</string>
-    <string name="description_details_action" msgid="2061866409737706174">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> ಗೆ ಸಂಪರ್ಕದ ವಿವರಗಳು"</string>
-    <string name="call_log_header_today" msgid="1576119097475845293">"ಇಂದು"</string>
-    <string name="call_log_header_yesterday" msgid="5616077776205329563">"ನಿನ್ನೆ"</string>
-    <string name="call_log_header_other" msgid="4940676886254217644">"ಹಳೆಯದು"</string>
-    <string name="voicemail_speaker_on" msgid="3151333608926996668">"ಸ್ಪೀಕರ್ ಆನ್ ಮಾಡಿ."</string>
-    <string name="voicemail_speaker_off" msgid="2530064206962034201">"ಸ್ಪೀಕರ್ ಆಫ್ ಮಾಡಿ."</string>
-    <string name="voicemail_play_start_pause" msgid="3874823480278334664">"ಪ್ಲೇಬ್ಯಾಕ್‌ ಪ್ರಾರಂಭಿಸಿ ಅಥವಾ ವಿರಾಮಗೊಳಿಸಿ."</string>
-    <string name="display_options_title" msgid="3880091801055797975">"ಡಿಸ್‌ಪ್ಲೇ ಆಯ್ಕೆಗಳು"</string>
-    <string name="sounds_and_vibration_title" msgid="3075050000721181384">"ಧ್ವನಿ ಮತ್ತು ವೈಬ್ರೇಷನ್‌"</string>
-    <string name="accessibility_settings_title" msgid="3329027650429831820">"ಪ್ರವೇಶಿಸುವಿಕೆ"</string>
-    <string name="ringtone_title" msgid="8377174189894648486">"ಫೋನ್ ರಿಂಗ್‌ಟೋನ್"</string>
-    <string name="vibrate_on_ring_title" msgid="631441314790960485">"ಕರೆಗಳಿಗೂ ಸಹ ವೈಬ್ರೇಟ್‌"</string>
-    <string name="dtmf_tone_enable_title" msgid="3273762431523939277">"ಕೀಪ್ಯಾಡ್ ಟೋನ್‌ಗಳು"</string>
-    <string name="dtmf_tone_length_title" msgid="534096029202438539">"ಕೀಪ್ಯಾಡ್ ಟೋನ್ ಅಳತೆ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="applicationLabel">ಫೋನ್</string>
+  <string name="launcherDialpadActivityLabel">ಫೋನ್ ಕೀಪ್ಯಾಡ್</string>
+  <string name="callHistoryIconLabel">ಕರೆ ಇತಿಹಾಸ</string>
+  <string name="action_copy_number_text">ಸಂಖ್ಯೆಯನ್ನು ನಕಲಿಸಿ</string>
+  <string name="copy_transcript_text">ಟ್ರಾನ್ಸ್‌ಕ್ರಿಪ್ಶನ್ ನಕಲಿಸಿ</string>
+  <string name="action_edit_number_before_call">ಕರೆ ಮಾಡುವ ಮೊದಲು ಸಂಖ್ಯೆಯನ್ನು ಎಡಿಟ್ ಮಾಡಿ</string>
+  <string name="call_log_delete_all">ಕರೆ ಇತಿಹಾಸ ತೆರವುಗೊಳಿಸಿ</string>
+  <string name="call_log_trash_voicemail">ಧ್ವನಿಮೇಲ್‌ ಅಳಿಸಿ</string>
+  <string name="snackbar_voicemail_deleted">ಧ್ವನಿಮೇಲ್ ಅಳಿಸಲಾಗಿದೆ</string>
+  <string name="clearCallLogConfirmation_title">ಕರೆ ಇತಿಹಾಸವನ್ನು ತೆರವುಗೊಳಿಸುವುದೇ?</string>
+  <string name="clearCallLogConfirmation">ಇದು ನಿಮ್ಮ ಇತಿಹಾಸದಿಂದ ಎಲ್ಲಾ ಕರೆಗಳನ್ನು ಅಳಿಸುತ್ತದೆ</string>
+  <string name="clearCallLogProgress_title">ಕರೆ ಇತಿಹಾಸವನ್ನು ತೆರವುಗೊಳಿಸಲಾಗುತ್ತಿದೆ…</string>
+  <string name="notification_missedCallTitle">ಮಿಸ್ಡ್‌ ಕಾಲ್‌</string>
+  <string name="notification_missedWorkCallTitle">ಮಿಸ್ಡ್‌ ಕೆಲಸದ ಕರೆ</string>
+  <string name="notification_missedCallsTitle">ಮಿಸ್ಡ್‌ ಕರೆಗಳು</string>
+  <string name="notification_missedCallsMsg">%d ಮಿಸ್ಡ್‌ ಕರೆಗಳು</string>
+  <string name="notification_missedCall_call_back">ಮರಳಿ ಕರೆ ಮಾಡಿ</string>
+  <string name="notification_missedCall_message">ಸಂದೇಶ</string>
+  <string name="post_call_notification_message">%1$s: %2$s</string>
+  <string name="notification_voicemail_text_format">%s ಗೆ ಡಯಲ್‌‌ ಮಾಡಿ</string>
+  <string name="notification_voicemail_no_vm_number">ಅಪರಿಚಿತ ಧ್ವನಿಮೇಲ್‌ ಸಂಖ್ಯೆ</string>
+  <plurals name="notification_voicemail_title">
+    <item quantity="one"> %1$d ಧ್ವನಿಮೇಲ್‌ಗಳು </item>
+    <item quantity="other"> %1$d ಧ್ವನಿಮೇಲ್‌ಗಳು </item>
+  </plurals>
+  <string name="notification_voicemail_callers_list">%1$s, %2$s</string>
+  <string name="notification_new_voicemail_ticker">%1$s ಇವರಿಂದ ಹೊಸ ಧ್ವನಿಮೇಲ್‌</string>
+  <string name="voicemail_playback_error">ಧ್ವನಿಮೇಲ್‌ ಪ್ಲೇ ಮಾಡಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ</string>
+  <string name="voicemail_fetching_content">ಧ್ವನಿಮೇಲ್‌ ಲೋಡ್‌ ಮಾಡಲಾಗುತ್ತಿದೆ…</string>
+  <string name="voicemail_fetching_timout">ಧ್ವನಿಮೇಲ್‌ ಲೋಡ್‌ ಮಾಡಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ</string>
+  <string name="call_log_item_count_and_date">(%1$d) %2$s</string>
+  <string name="description_playback_speakerphone">ಸ್ಪೀಕರ್‌ಫೋನ್ ಸ್ವಿಚ್ ಆನ್ ಅಥವಾ ಆಫ್ ಮಾಡಿ</string>
+  <string name="description_playback_seek">ಪ್ಲೇಬ್ಯಾಕ್ ಸ್ಥಾನವನ್ನು ಪಡೆಯಿರಿ</string>
+  <string name="action_menu_call_history_description">ಕರೆ ಇತಿಹಾಸ</string>
+  <string msgid="2295659037509008453" name="action_menu_overflow_description">ಇನ್ನಷ್ಟು ಆಯ್ಕೆಗಳು</string>
+  <string name="action_menu_dialpad_button">ಕೀ ಪ್ಯಾಡ್‌</string>
+  <string name="dialer_settings_label">ಸೆಟ್ಟಿಂಗ್‌ಗಳು</string>
+  <string name="simulator_submenu_label">ಸಿಮ್ಯುಲೇಟರ್</string>
+  <string name="new_ui_launcher_shortcut_label">ಹೊಸ UI ಶಾರ್ಟ್‌ಕಟ್ ರಚಿಸಿ</string>
+  <string name="description_entering_bulk_action_mode">ದೊಡ್ಡ ಪ್ರಮಾಣದ ಕ್ರಿಯೆಯ ಮೋಡ್‌ಗೆ ಪ್ರವೇಶಿಸಲಾಗುತ್ತಿದೆ</string>
+  <string name="description_leaving_bulk_action_mode">ದೊಡ್ಡ ಪ್ರಮಾಣದ ಕ್ರಿಯೆಯ ಮೋಡ್ ತೊರೆಯಲಾಗಿದೆ</string>
+  <string name="description_selecting_bulk_action_mode">%1$s ಆಯ್ಕೆಮಾಡಲಾಗಿದೆ</string>
+  <string name="description_unselecting_bulk_action_mode">%1$s ಆಯ್ಕೆಯನ್ನು ರದ್ದುಮಾಡಲಾಗಿದೆ</string>
+  <string name="description_contact_details">%1$s ಗೆ ಸಂಪರ್ಕ ವಿವರಗಳು</string>
+  <string name="description_spam_contact_details">%1$s ಶಂಕಿತ ಸ್ಪ್ಯಾಮ್ ಕರೆದಾರರಿಗಾಗಿ ಸಂಪರ್ಕ ವಿವರಗಳು</string>
+  <string name="description_num_calls">%1$s ಕರೆಗಳು.</string>
+  <string name="description_video_call">ವೀಡಿಯೊ ಕರೆ.</string>
+  <string name="description_start_voice_search">ಧ್ವನಿ ಹುಡುಕಾಟ ಪ್ರಾರಂಭಿಸಿ</string>
+  <string name="voicemail">ಧ್ವನಿಮೇಲ್</string>
+  <string name="description_cancel_multi_select">ಬ್ಯಾಚ್ ಕ್ರಿಯೆಗಳ ಮೋಡ್ ಅನ್ನು ರದ್ದುಮಾಡಿ</string>
+  <string name="voicemailMultiSelectDeleteConfirm">ಅಳಿಸಿ</string>
+  <string name="voicemailMultiSelectDeleteCancel">ರದ್ದುಮಾಡಿ</string>
+  <string name="voicemailMultiSelectActionBarTitle">%1$s ಆಯ್ಕೆಮಾಡಲಾಗಿದೆ</string>
+  <plurals name="delete_voicemails_confirmation_dialog_title">
+    <item quantity="one"><b>ಈ ಧ್ವನಿಮೇಲ್‌ಗಳನ್ನು ಅಳಿಸುವುದೇ? </b></item>
+    <item quantity="other"><b>ಈ ಧ್ವನಿಮೇಲ್‌ಗಳನ್ನು ಅಳಿಸುವುದೇ? </b></item>
+  </plurals>
+  <string name="voicemailCallLogToday">@string/call_log_header_today</string>
+  <string name="voicemailCallLogDateTimeFormat">%1$s ರಂದು %2$s ಗಂಟೆಗೆ</string>
+  <string name="voicemailDurationFormat">%1$02d:%2$02d</string>
+  <string name="voicemailCallLogDateTimeFormatWithDuration">%1$s • %2$s</string>
+  <string name="voice_search_not_available">ಧ್ವನಿ ಹುಡುಕಾಟ ಲಭ್ಯವಿಲ್ಲ</string>
+  <string name="dialer_hint_find_contact">ಸಂಪರ್ಕಗಳನ್ನು ಹುಡುಕಿ</string>
+  <string name="block_number_search_hint">ಸಂ. ಸೇರಿಸಿ ಅಥವಾ ಸಂಪರ್ಕ ಹುಡುಕಿ</string>
+  <string name="call_log_all_empty">ನಿಮ್ಮ ಕರೆ ಇತಿಹಾಸ ಖಾಲಿಯಾಗಿದೆ</string>
+  <string name="call_log_all_empty_action">ಕರೆ ಮಾಡಿ</string>
+  <string name="call_log_missed_empty">ನೀವು ಯಾವುದೇ ಮಿಸ್ಡ್ ಕರೆಗಳನ್ನು ಹೊಂದಿಲ್ಲ.</string>
+  <string name="call_log_voicemail_empty">ನಿಮ್ಮ ಧ್ವನಿಮೇಲ್ ಇನ್‌ಬಾಕ್ಸ್ ಖಾಲಿ ಇದೆ.</string>
+  <string name="call_log_activity_title">ಕರೆ ಇತಿಹಾಸ</string>
+  <string name="call_log_all_title">ಎಲ್ಲಾ ಕರೆಗಳು</string>
+  <string name="call_log_missed_title">ಮಿಸ್ಡ್‌ ಕರೆಗಳು</string>
+  <string name="tab_speed_dial">ಸ್ಪೀಡ್ ಡಯಲ್</string>
+  <string name="tab_history">ಕರೆ ಇತಿಹಾಸ</string>
+  <string name="tab_all_contacts">ಸಂಪರ್ಕಗಳು</string>
+  <string name="tab_voicemail">ಧ್ವನಿಮೇಲ್</string>
+  <string name="search_shortcut_call_number">%s ಕರೆ ಮಾಡಿ</string>
+  <string name="search_shortcut_create_new_contact">ಹೊಸ ಸಂಪರ್ಕ ರಚಿಸು</string>
+  <string name="search_shortcut_add_to_contact">ಸಂಪರ್ಕಕ್ಕೆ ಸೇರಿಸು</string>
+  <string name="search_shortcut_send_sms_message">SMS ಕಳುಹಿಸು</string>
+  <string name="search_shortcut_make_video_call">ವೀಡಿಯೊ ಕರೆ ಮಾಡಿ</string>
+  <string name="search_shortcut_block_number">ಸಂಖ್ಯೆಯನ್ನು ನಿರ್ಬಂಧಿಸು</string>
+  <string name="speed_dial_empty">ನಿಮ್ಮ ತ್ವರಿತ ಡಯಲ್‌ನಲ್ಲಿ ಇದುವರೆಗೆ ಯಾರೂ ಇಲ್ಲ</string>
+  <string name="speed_dial_empty_add_favorite_action">ಮೆಚ್ಚಿನದನ್ನು ಸೇರಿಸಿ</string>
+  <string name="remove_contact">ತೆಗೆದುಹಾಕು</string>
+  <string name="select_all">ಎಲ್ಲವನ್ನೂ ಆಯ್ಕೆ ಮಾಡಿ</string>
+  <string name="call_log_action_video_call">ವೀಡಿಯೊ ಕರೆ</string>
+  <string name="call_log_action_set_up_video">ವೀಡಿಯೊ ಕರೆಮಾಡುವಿಕೆ ಹೊಂದಿಸಿ</string>
+  <string name="call_log_action_invite_video">ವೀಡಿಯೊ ಕರೆಗೆ ಆಹ್ವಾನಿಸಿ</string>
+  <string name="call_log_action_send_message">ಸಂದೇಶ ಕಳುಹಿಸಿ</string>
+  <string name="call_log_action_details">ಕರೆಯ ವಿವರಗಳು</string>
+  <string name="call_log_action_share_voicemail">ಇದಕ್ಕೆ ಕಳುಹಿಸಿ ...</string>
+  <string name="call_log_action_call">^1 ಕರೆ ಮಾಡಿ</string>
+  <string name="description_incoming_missed_call">^1, ^2, ^3, ^4 ರಿಂದ ತಪ್ಪಿದ ಕರೆ.</string>
+  <string name="description_incoming_answered_call">^1, ^2, ^3, ^4 ರಿಂದ ಕರೆಗೆ ಉತ್ತರಿಸಲಾಗಿದೆ.</string>
+  <string name="description_unread_voicemail">^1, ^2, ^3, ^4 ರಿಂದ ಓದದಿರುವ ಧ್ವನಿಮೇಲ್.</string>
+  <string name="description_read_voicemail">^1, ^2, ^3, ^4 ರಿಂದ ಧ್ವನಿಮೇಲ್.</string>
+  <string name="description_outgoing_call">^1, ^2, ^3, ^4 ಗೆ ಕರೆ.</string>
+  <string name="call_log_via_number">%1$s ಮೂಲಕ</string>
+  <string name="call_log_via_number_phone_account">%2$s ಮೂಲಕ %1$s</string>
+  <string name="description_call_action">^1 ಕರೆ ಮಾಡಿ</string>
+  <string name="description_video_call_action">^1 ಗೆ ವೀಡಿಯೊ ಕರೆ ಮಾಡಿ.</string>
+  <string name="description_voicemail_action">^1 ರಿಂದ ಧ್ವನಿಮೇಲ್ ಆಲಿಸಿ</string>
+  <string name="description_create_new_contact_action">^1 ಗೆ ಸಂಪರ್ಕವನ್ನು ರಚಿಸಿ</string>
+  <string name="description_add_to_existing_contact_action">ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ ಸಂಪರ್ಕಕ್ಕೆ ^1 ಸೇರಿಸಿ</string>
+  <string name="description_details_action">^1 ಗೆ ಸಂಪರ್ಕದ ವಿವರಗಳು</string>
+  <string name="call_log_header_today">ಇಂದು</string>
+  <string name="call_log_header_yesterday">ನಿನ್ನೆ</string>
+  <string name="call_log_header_other">ಹಳೆಯದು</string>
+  <string name="voicemail_speaker_on">ಸ್ಪೀಕರ್ ಆನ್ ಮಾಡಿ.</string>
+  <string name="voicemail_speaker_off">ಸ್ಪೀಕರ್ ಆಫ್ ಮಾಡಿ.</string>
+  <string name="voicemail_play_start_pause">ಪ್ಲೇಬ್ಯಾಕ್‌ ಪ್ರಾರಂಭಿಸಿ ಅಥವಾ ವಿರಾಮಗೊಳಿಸಿ.</string>
+  <string name="display_options_title">ಡಿಸ್‌ಪ್ಲೇ ಆಯ್ಕೆಗಳು</string>
+  <string name="sounds_and_vibration_title">ಧ್ವನಿ ಮತ್ತು ವೈಬ್ರೇಷನ್‌</string>
+  <string name="accessibility_settings_title">ಪ್ರವೇಶಿಸುವಿಕೆ</string>
+  <string name="ringtone_title">ಫೋನ್ ರಿಂಗ್‌ಟೋನ್</string>
+  <string name="vibrate_on_ring_title">ಕರೆಗಳಿಗೂ ಸಹ ವೈಬ್ರೇಟ್‌</string>
+  <string name="dtmf_tone_enable_title">ಕೀಪ್ಯಾಡ್ ಟೋನ್‌ಗಳು</string>
+  <string name="dtmf_tone_length_title">ಕೀಪ್ಯಾಡ್ ಟೋನ್ ಅಳತೆ</string>
   <string-array name="dtmf_tone_length_entries">
-    <item msgid="3136353015227162823">"ಸಾಮಾನ್ಯ"</item>
-    <item msgid="5376841175538523822">"ದೀರ್ಘವಾದ"</item>
+    <item>ಸಾಮಾನ್ಯ</item>
+    <item>ದೀರ್ಘವಾದ</item>
   </string-array>
-    <string name="respond_via_sms_setting_title" msgid="8008181606657693452">"ತ್ವರಿತ ಪ್ರತಿಕ್ರಿಯೆಗಳು"</string>
-    <string name="call_settings_label" msgid="7824611757200960807">"ಕರೆಗಳು"</string>
-    <string name="manage_blocked_numbers_label" msgid="16823761991832273">"ಕರೆ ನಿರ್ಬಂಧಿಸುವಿಕೆ"</string>
-    <string name="voicemail_settings_label" msgid="4594299554519920570">"ಧ್ವನಿಮೇಲ್"</string>
-    <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"ಕರೆ ನಿರ್ಬಂಧಿಸುವಿಕೆ ತಾತ್ಕಾಲಿಕ ಆಫ್ ಮಾಡಲಾಗಿದೆ"</string>
-    <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"ನೀವು ಕಳೆದ 48 ಗಂಟೆಗಳಲ್ಲಿ ಈ ಫೋನ್‌ನಿಂದ ತುರ್ತು ಸೇವೆಗಳಿಗೆ ಸಂಪರ್ಕಿಸಿರುವ ಕಾರಣದಿಂದ ಕರೆ ನಿರ್ಬಂಧಿಸುವಿಕೆಯನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ. ಒಮ್ಮೆ 48 ಗಂಟೆಗಳ ಅವಧಿಯು ಮುಕ್ತಾಯಗೊಂಡ ನಂತರ ಅದನ್ನು ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಮರುಸಕ್ರಿಯಗೊಳಿಸಲಾಗುವುದು."</string>
-    <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"ಸಂಖ್ಯೆಗಳನ್ನು ಆಮದು ಮಾಡಿ"</string>
-    <string name="blocked_call_settings_import_description" msgid="1819412052545228965">"ನೀವು ಈ ಹಿಂದೆ ಗುರುತು ಮಾಡಲಾದ ಕೆಲವು ಕಾಲರ್‌ಗಳನ್ನು ಇತರ ಅಪ್ಲಿಕೇಶನ್‌ಗಳ ಮೂಲಕ ಧ್ವನಿಮೇಲ್‌ಗೆ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಕಳುಹಿಸಲಾಗುತ್ತದೆ."</string>
-    <string name="blocked_call_settings_view_numbers_button" msgid="3332727948554356704">"ಸಂಖ್ಯೆಗಳನ್ನು ವೀಕ್ಷಿಸಿ"</string>
-    <string name="blocked_call_settings_import_button" msgid="7319111700387470727">"ಆಮದು ಮಾಡಿ"</string>
-    <string name="description_blocked_number_list_delete" msgid="2139644216858370740">"ಸಂಖ್ಯೆಯನ್ನು ಅನಿರ್ಬಂಧಿಸು"</string>
-    <string name="addBlockedNumber" msgid="3053473735238295551">"ಸಂಖ್ಯೆಯನ್ನು ಸೇರಿಸಿ"</string>
-    <string name="block_number_footer_message_vvm" msgid="7955326304033982368">"ಈ ಸಂಖ್ಯೆಗಳಿಗೆ ಕರೆಗಳನ್ನು ನಿರ್ಬಂಧಿಸಲಾಗುತ್ತದೆ ಮತ್ತು ಧ್ವನಿಮೇಲ್‌ಗಳನ್ನು ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಅಳಿಸಲಾಗುತ್ತದೆ."</string>
-    <string name="block_number_footer_message_no_vvm" msgid="1152684139070471665">"ಈ ಸಂಖ್ಯೆಗಳಿಗೆ ಕರೆಗಳನ್ನು ನಿರ್ಬಂಧಿಸಲಾಗುವುದು, ಆದರೆ ಅವರು ಧ್ವನಿಮೇಲ್‌ಗಳನ್ನು ಈಗಲೂ ನಿಮಗೆ ಕಳುಹಿಸಬಹುದು."</string>
-    <string name="block_list" msgid="4701585783411870782">"ನಿರ್ಬಂಧಿಸಲಾದ ಸಂಖ್ಯೆಗಳು"</string>
-    <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g> ಈಗಾಗಲೇ ನಿರ್ಬಂಧಿಸಲಾಗಿದೆ."</string>
-    <string name="phone_account_settings_label" msgid="8372485478006965920">"ಕರೆ ಮಾಡುವ ಖಾತೆಗಳು"</string>
-    <string name="permission_no_speeddial" msgid="8487215628510596753">"ವೇಗ ಡಯಲ್ ಸಕ್ರಿಯಗೊಳಿಸಲು, ಸಂಪರ್ಕಗಳ ಅನುಮತಿಯನ್ನು ಆನ್ ಮಾಡಿ."</string>
-    <string name="permission_no_calllog" msgid="4053705651238775784">"ನಿಮ್ಮ ಕರೆಯ ಲಾಗ್ ಅನ್ನು ವೀಕ್ಷಿಸಲು, ಫೋನ್ ಅನುಮತಿಯನ್ನು ಆನ್ ಮಾಡಿ."</string>
-    <string name="permission_no_search" msgid="2424710404207193826">"ನಿಮ್ಮ ಸಂಪರ್ಕಗಳನ್ನು ಹುಡುಕಲು, ಸಂಪರ್ಕಗಳ ಅನುಮತಿಗಳನ್ನು ಆನ್ ಮಾಡಿ."</string>
-    <string name="permission_place_call" msgid="8686908130349369423">"ಕರೆ ಮಾಡಲು, ಫೋನ್ ಅನುಮತಿಯನ್ನು ಆನ್ ಮಾಡಿ."</string>
-    <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"ಸಿಸ್ಟಂ ಸೆಟ್ಟಿಂಗ್‌ಗಳಿಗೆ ಬರೆಯಲು ಫೋನ್ ಅಪ್ಲಿಕೇಶನ್ ಅನುಮತಿಯನ್ನು ಹೊಂದಿಲ್ಲ."</string>
-    <string name="blocked_number_call_log_label" msgid="4212282846299997693">"ನಿರ್ಬಂಧಿಸಲಾಗಿದೆ"</string>
-    <string name="call_log_action_block_report_number" msgid="7302636538668696729">"ಸ್ಪ್ಯಾಮ್ ನಿರ್ಬಂಧಿಸು/ವರದಿ ಮಾಡು"</string>
-    <string name="call_log_action_block_number" msgid="5048188386501998865">"ಸಂಖ್ಯೆಯನ್ನು ನಿರ್ಬಂಧಿಸು"</string>
-    <string name="call_log_action_remove_spam" msgid="2045319806318398403">"ಸ್ಪ್ಯಾಮ್‌ ಅಲ್ಲ"</string>
-    <string name="call_log_action_unblock_number" msgid="6100117033288448758">"ಸಂಖ್ಯೆಯನ್ನು ಅನಿರ್ಬಂಧಿಸು"</string>
-    <string name="spam_number_call_log_label" msgid="2678431398326811131">"ಸ್ಪ್ಯಾಮ್"</string>
-    <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> ಆಫ್‌ಲೈನ್ ಆಗಿದ್ದಾರೆ ಮತ್ತು ಅವರನ್ನು ತಲುಪಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ"</string>
-    <string name="about_phone_label" msgid="582991354677973731">"ಕುರಿತು"</string>
-    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Google ನಿಂದ ಲಿಪ್ಯಂತರ ಮಾಡಲಾಗಿದೆ"</string>
-    <string name="voicemail_transcription_in_progress" msgid="2933320969613783210">"Google ಲಿಪ್ಯಂತರ ಮಾಡುತ್ತಿದೆ…"</string>
-    <string name="voicemail_transcription_failed" msgid="335275303117412706">"ಲಿಪ್ಯಂತರ ಲಭ್ಯವಿಲ್ಲ."</string>
-    <string name="voicemail_transcription_failed_language_not_supported" msgid="4210332591050562553">"ಲಿಪ್ಯಂತರ ಲಭ್ಯವಿಲ್ಲ. ಈ ಭಾಷೆಗೆ ಬೆಂಬಲವಿಲ್ಲ."</string>
-    <string name="voicemail_transcription_failed_no_speech" msgid="9093372879697874852">"ಲಿಪ್ಯಂತರ ಲಭ್ಯವಿಲ್ಲ. ಇದರಲ್ಲಿ ಮಾತು ಪತ್ತೆಯಾಗಿಲ್ಲ."</string>
-    <string name="view_conversation" msgid="7895904782094119702">"ವೀಕ್ಷಿಸಿ"</string>
-    <string name="ec_data_deleted" msgid="4794880345545827107">"ಕರೆ ಅಳಿಸಲಾಗಿದೆ. ಈ ಕರೆಯ ಸಮಯದಲ್ಲಿ ಸಂದೇಶಗಳಲ್ಲಿ ಹಂಚಿಕೊಳ್ಳಲಾದ ಲಗತ್ತುಗಳನ್ನು ವೀಕ್ಷಿಸಿ ಮತ್ತು ಅಳಿಸಿ."</string>
-    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"ಕರೆಗಳನ್ನು ಅಳಿಸಲಾಗಿದೆ. ಈ ಕರೆಗಳನ್ನು ಮಾಡುವ ಸಮಯದಲ್ಲಿ ಸಂದೇಶಗಳಲ್ಲಿ ಹಂಚಿಕೊಳ್ಳಲಾದ ಲಗತ್ತುಗಳನ್ನು ವೀಕ್ಷಿಸಿ ಮತ್ತು ಅಳಿಸಿ."</string>
+  <string name="respond_via_sms_setting_title">ತ್ವರಿತ ಪ್ರತಿಕ್ರಿಯೆಗಳು</string>
+  <string name="call_settings_label">ಕರೆಗಳು</string>
+  <string name="manage_blocked_numbers_label">ನಿರ್ಬಂಧಿಸಲಾದ ಸಂಖ್ಯೆಗಳು</string>
+  <string name="voicemail_settings_label">ಧ್ವನಿಮೇಲ್</string>
+  <string name="blocked_numbers_disabled_emergency_header_label">ಕರೆ ನಿರ್ಬಂಧಿಸುವಿಕೆ ತಾತ್ಕಾಲಿಕ ಆಫ್ ಮಾಡಲಾಗಿದೆ</string>
+  <string name="blocked_numbers_disabled_emergency_desc">ನೀವು ಕಳೆದ 48 ಗಂಟೆಗಳಲ್ಲಿ ಈ ಫೋನ್‌ನಿಂದ ತುರ್ತು ಸೇವೆಗಳಿಗೆ ಸಂಪರ್ಕಿಸಿರುವ ಕಾರಣದಿಂದ ಕರೆ ನಿರ್ಬಂಧಿಸುವಿಕೆಯನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ. ಒಮ್ಮೆ 48 ಗಂಟೆಗಳ ಅವಧಿಯು ಮುಕ್ತಾಯಗೊಂಡ ನಂತರ ಅದನ್ನು ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಮರುಸಕ್ರಿಯಗೊಳಿಸಲಾಗುವುದು.</string>
+  <string name="import_send_to_voicemail_numbers_label">ಸಂಖ್ಯೆಗಳನ್ನು ಆಮದು ಮಾಡಿ</string>
+  <string name="blocked_call_settings_import_description">ನೀವು ಈ ಹಿಂದೆ ಗುರುತು ಮಾಡಲಾದ ಕೆಲವು ಕಾಲರ್‌ಗಳನ್ನು ಇತರ ಅಪ್ಲಿಕೇಶನ್‌ಗಳ ಮೂಲಕ ಧ್ವನಿಮೇಲ್‌ಗೆ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಕಳುಹಿಸಲಾಗುತ್ತದೆ.</string>
+  <string name="blocked_call_settings_view_numbers_button">ಸಂಖ್ಯೆಗಳನ್ನು ವೀಕ್ಷಿಸಿ</string>
+  <string name="blocked_call_settings_import_button">ಆಮದು ಮಾಡಿ</string>
+  <string name="description_blocked_number_list_delete">ಸಂಖ್ಯೆಯನ್ನು ಅನಿರ್ಬಂಧಿಸು</string>
+  <string name="addBlockedNumber">ಸಂಖ್ಯೆಯನ್ನು ಸೇರಿಸಿ</string>
+  <string name="block_number_footer_message_vvm">ಈ ಸಂಖ್ಯೆಗಳಿಗೆ ಕರೆಗಳನ್ನು ನಿರ್ಬಂಧಿಸಲಾಗುತ್ತದೆ ಮತ್ತು ಧ್ವನಿಮೇಲ್‌ಗಳನ್ನು ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಅಳಿಸಲಾಗುತ್ತದೆ.</string>
+  <string name="block_number_footer_message_no_vvm">ಈ ಸಂಖ್ಯೆಗಳಿಗೆ ಕರೆಗಳನ್ನು ನಿರ್ಬಂಧಿಸಲಾಗುವುದು, ಆದರೆ ಅವರು ಧ್ವನಿಮೇಲ್‌ಗಳನ್ನು ಈಗಲೂ ನಿಮಗೆ ಕಳುಹಿಸಬಹುದು.</string>
+  <string name="block_list">ನಿರ್ಬಂಧಿಸಲಾದ ಸಂಖ್ಯೆಗಳು</string>
+  <string name="alreadyBlocked">%1$s ಈಗಾಗಲೇ ನಿರ್ಬಂಧಿಸಲಾಗಿದೆ.</string>
+  <string name="phone_account_settings_label">ಕರೆ ಮಾಡುವ ಖಾತೆಗಳು</string>
+  <string name="permission_no_speeddial">ವೇಗ ಡಯಲ್ ಸಕ್ರಿಯಗೊಳಿಸಲು, ಸಂಪರ್ಕಗಳ ಅನುಮತಿಯನ್ನು ಆನ್ ಮಾಡಿ.</string>
+  <string name="permission_no_calllog">ನಿಮ್ಮ ಕರೆಯ ಲಾಗ್ ಅನ್ನು ವೀಕ್ಷಿಸಲು, ಫೋನ್ ಅನುಮತಿಯನ್ನು ಆನ್ ಮಾಡಿ.</string>
+  <string name="permission_no_search">ನಿಮ್ಮ ಸಂಪರ್ಕಗಳನ್ನು ಹುಡುಕಲು, ಸಂಪರ್ಕಗಳ ಅನುಮತಿಗಳನ್ನು ಆನ್ ಮಾಡಿ.</string>
+  <string name="permission_place_call">ಕರೆ ಮಾಡಲು, ಫೋನ್ ಅನುಮತಿಯನ್ನು ಆನ್ ಮಾಡಿ.</string>
+  <string name="toast_cannot_write_system_settings">ಸಿಸ್ಟಂ ಸೆಟ್ಟಿಂಗ್‌ಗಳಿಗೆ ಬರೆಯಲು ಫೋನ್ ಅಪ್ಲಿಕೇಶನ್ ಅನುಮತಿಯನ್ನು ಹೊಂದಿಲ್ಲ.</string>
+  <string name="blocked_number_call_log_label">ನಿರ್ಬಂಧಿಸಲಾಗಿದೆ</string>
+  <string name="call_log_action_block_report_number">ಸ್ಪ್ಯಾಮ್ ನಿರ್ಬಂಧಿಸು/ವರದಿ ಮಾಡು</string>
+  <string name="call_log_action_block_number">ಸಂಖ್ಯೆಯನ್ನು ನಿರ್ಬಂಧಿಸು</string>
+  <string name="call_log_action_remove_spam">ಸ್ಪ್ಯಾಮ್‌ ಅಲ್ಲ</string>
+  <string name="call_log_action_unblock_number">ಸಂಖ್ಯೆಯನ್ನು ಅನಿರ್ಬಂಧಿಸು</string>
+  <string name="spam_number_call_log_label">ಸ್ಪ್ಯಾಮ್</string>
+  <string name="call_composer_connection_failed">%1$s ಆಫ್‌ಲೈನ್ ಆಗಿದ್ದಾರೆ ಮತ್ತು ಅವರನ್ನು ತಲುಪಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ</string>
+  <string name="about_phone_label">ಕುರಿತು</string>
+  <string name="voicemail_transcription_branding_text">Google ನಿಂದ ಲಿಪ್ಯಂತರ ಮಾಡಲಾಗಿದೆ</string>
+  <string name="voicemail_transcription_in_progress">ಲಿಪ್ಯಂತರಿಸಲಾಗುತ್ತಿದೆ…</string>
+  <string name="voicemail_transcription_failed">ಲಿಪ್ಯಂತರ ಲಭ್ಯವಿಲ್ಲ.</string>
+  <string name="voicemail_transcription_failed_language_not_supported">ಲಿಪ್ಯಂತರ ಲಭ್ಯವಿಲ್ಲ. ಈ ಭಾಷೆಗೆ ಬೆಂಬಲವಿಲ್ಲ.</string>
+  <string name="voicemail_transcription_failed_no_speech">ಲಿಪ್ಯಂತರ ಲಭ್ಯವಿಲ್ಲ. ಇದರಲ್ಲಿ ಮಾತು ಪತ್ತೆಯಾಗಿಲ್ಲ.</string>
+  <string name="voicemail_donation_promo_title">ಲಿಪ್ಯಂತರ ನಿಖರತೆಯನ್ನು ಸುಧಾರಿಸಲು ಸಹಾಯ ಮಾಡುವುದೇ?</string>
+  <string name="voicemail_donation_promo_content">ಲಿಪ್ಯಂತರಗಳೊಂದಿಗೆ ಇದನ್ನು ಮತ್ತು ಭವಿಷ್ಯದ ಧ್ವನಿಮೇಲ್ ಸಂದೇಶಗಳನ್ನು ಪರಿಶೀಲಿಸಲು Google ಗೆ ಅನುಮತಿಸಿ. ಅವುಗಳನ್ನು ಅನಾಮಧೇಯವಾಗಿ ಸಂಗ್ರಹಿಸಲಾಗುತ್ತದೆ. ಯಾವುದೇ ಸಮಯದಲ್ಲಿ ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ಬದಲಾಯಿಸಿ. %1$s</string>
+  <string name="voicemail_donation_promo_opt_in">ಹೌದು, ನಾನಿದ್ದೇನೆ</string>
+  <string name="voicemail_donation_promo_opt_out">ಬೇಡ</string>
+  <string name="voicemail_transcription_rating">ಈ ಟ್ರಾನ್ಸ್‌ಕ್ರಿಪ್ಶನ್ ಗುಣಮಟ್ಟಕ್ಕೆ ದರ ನಿಗದಿಪಡಿಸಿ</string>
+  <string name="voicemail_transcription_rating_thanks">ನಿಮ್ಮ ಪ್ರತಿಕ್ರಿಯೆಗೆ ಧನ್ಯವಾದಗಳು.</string>
+  <string name="description_rating_good">ಇಷ್ಟ</string>
+  <string name="description_rating_bad">ಇಷ್ಟವಿಲ್ಲ</string>
+  <string name="view_conversation">ವೀಕ್ಷಿಸಿ</string>
+  <string name="ec_data_deleted">ಕರೆ ಅಳಿಸಲಾಗಿದೆ. ಈ ಕರೆಯ ಸಮಯದಲ್ಲಿ ಸಂದೇಶಗಳಲ್ಲಿ ಹಂಚಿಕೊಳ್ಳಲಾದ ಲಗತ್ತುಗಳನ್ನು ವೀಕ್ಷಿಸಿ ಮತ್ತು ಅಳಿಸಿ.</string>
+  <string name="multiple_ec_data_deleted">ಕರೆಗಳನ್ನು ಅಳಿಸಲಾಗಿದೆ. ಈ ಕರೆಗಳನ್ನು ಮಾಡುವ ಸಮಯದಲ್ಲಿ ಸಂದೇಶಗಳಲ್ಲಿ ಹಂಚಿಕೊಳ್ಳಲಾದ ಲಗತ್ತುಗಳನ್ನು ವೀಕ್ಷಿಸಿ ಮತ್ತು ಅಳಿಸಿ.</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-ko/strings.xml b/java/com/android/dialer/app/res/values-ko/strings.xml
index 4de7011..55bc453 100644
--- a/java/com/android/dialer/app/res/values-ko/strings.xml
+++ b/java/com/android/dialer/app/res/values-ko/strings.xml
@@ -1,179 +1,171 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="applicationLabel" msgid="2202739481132958990">"전화"</string>
-    <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"휴대전화 키패드"</string>
-    <string name="callHistoryIconLabel" msgid="7493268743411968630">"통화 기록"</string>
-    <string name="action_copy_number_text" msgid="832682558551502319">"전화번호 복사"</string>
-    <string name="copy_transcript_text" msgid="937904189017310829">"텍스트 변환 복사"</string>
-    <string name="action_edit_number_before_call" msgid="8017492815878473837">"통화하기 전에 번호 수정"</string>
-    <string name="call_log_delete_all" msgid="7852970926906523784">"통화 기록 삭제"</string>
-    <string name="call_log_trash_voicemail" msgid="6118493534178533972">"음성사서함 삭제"</string>
-    <string name="snackbar_voicemail_deleted" msgid="7463166543725496307">"음성사서함 삭제됨"</string>
-    <string name="snackbar_voicemail_deleted_undo" msgid="6959743982796409941">"실행취소"</string>
-    <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"통화 기록을 삭제하시겠습니까?"</string>
-    <string name="clearCallLogConfirmation" msgid="6844949465815109166">"모든 통화가 기록에서 삭제됩니다."</string>
-    <string name="clearCallLogProgress_title" msgid="995004835687361977">"통화 기록을 삭제하는 중…"</string>
-    <string name="notification_missedCallTitle" msgid="8283366068539898486">"부재중 전화"</string>
-    <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"부재중 업무 통화"</string>
-    <string name="notification_missedCallsTitle" msgid="3697442015345089802">"부재중 전화"</string>
-    <string name="notification_missedCallsMsg" msgid="8176217633929018706">"부재중 전화 <xliff:g id="NUM_MISSED_CALLS">%d</xliff:g>통"</string>
-    <string name="notification_missedCall_call_back" msgid="3875698110051973965">"통화하기"</string>
-    <string name="notification_missedCall_message" msgid="5086910028988305964">"메시지"</string>
-    <string name="post_call_notification_message" msgid="5417476789860590611">"<xliff:g id="NAME">%1$s</xliff:g>: <xliff:g id="MESSAGE">%2$s</xliff:g>"</string>
-    <string name="notification_voicemail_text_format" msgid="1895667520930252897">"<xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>(으)로 전화걸기"</string>
-    <string name="notification_voicemail_no_vm_number" msgid="8942821987929495842">"알 수 없는 음성사서함 번호"</string>
-    <plurals name="notification_voicemail_title" formatted="false" msgid="1551847434476438657">
-      <item quantity="other">음성메일 <xliff:g id="COUNT">%1$d</xliff:g>개</item>
-      <item quantity="one">음성메일</item>
-    </plurals>
-    <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
-    <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"<xliff:g id="CALLER">%1$s</xliff:g>님이 보낸 새 음성사서함"</string>
-    <string name="voicemail_playback_error" msgid="4384373852257757295">"음성사서함을 재생할 수 없습니다."</string>
-    <string name="voicemail_fetching_content" msgid="572320120918636014">"음성사서함 로드 중…"</string>
-    <string name="voicemail_fetching_timout" msgid="2128873915839949783">"음성사서함을 로드할 수 없습니다."</string>
-    <string name="call_log_item_count_and_date" msgid="723848797957319181">"<xliff:g id="DATE">%2$s</xliff:g>에 통화 <xliff:g id="COUNT">%1$d</xliff:g>통"</string>
-    <string name="description_playback_speakerphone" msgid="4852027754869750227">"스피커폰 켜고 끄기"</string>
-    <string name="description_playback_seek" msgid="1340910573254132520">"재생 위치 찾기"</string>
-    <string name="action_menu_call_history_description" msgid="8829135306925008546">"통화 기록"</string>
-    <string name="action_menu_overflow_description" msgid="7648679686746517341">"옵션 더보기"</string>
-    <string name="action_menu_dialpad_button" msgid="1970631633457493180">"키패드"</string>
-    <string name="dialer_settings_label" msgid="4980176284150290175">"설정"</string>
-    <string name="simulator_submenu_label" msgid="186156287346615267">"시뮬레이터"</string>
-    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"새 UI 바로가기 만들기"</string>
-    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"일괄 작업 모드 시작 중"</string>
-    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"일괄 작업 모드 종료됨"</string>
-    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> 선택됨"</string>
-    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> 선택 취소됨"</string>
-    <string name="description_contact_details" msgid="3341280873855253464">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g>의 연락처 세부정보"</string>
-    <string name="description_spam_contact_details" msgid="5592578752881528368">"스팸으로 의심되는 발신자 <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>의 연락처 세부정보"</string>
-    <string name="description_num_calls" msgid="6483594535796216044">"통화 횟수: <xliff:g id="NUMBEROFCALLS">%1$s</xliff:g>번"</string>
-    <string name="description_video_call" msgid="3738199365585751727">"화상 통화"</string>
-    <string name="description_start_voice_search" msgid="8380022725973015261">"음성 검색 시작"</string>
-    <string name="voicemail" msgid="8899540969000957954">"음성사서함"</string>
-    <string name="description_cancel_multi_select" msgid="3930475950253360461">"일괄 작업 모드 취소"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"삭제"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"취소"</string>
-    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g>개 선택됨"</string>
-    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
-      <item quantity="other">"<b>"이 음성사서함을 삭제하시겠습니까? "</b>"</item>
-      <item quantity="one">"<b>"이 음성사서함을 삭제하시겠습니까? "</b>"</item>
-    </plurals>
-    <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
-    <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> <xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>분 <xliff:g id="SECONDS">%2$02d</xliff:g>초"</string>
-    <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="voice_search_not_available" msgid="6546240433719732905">"음성검색이 지원되지 않습니다."</string>
-    <string name="dialer_hint_find_contact" msgid="2023214799381149808">"주소록 검색"</string>
-    <string name="block_number_search_hint" msgid="5377706079015099416">"번호 추가 또는 연락처 검색"</string>
-    <string name="call_log_all_empty" msgid="3955572868518162004">"통화 기록이 비어있습니다."</string>
-    <string name="call_log_all_empty_action" msgid="852218280136243014">"전화 걸기"</string>
-    <string name="call_log_missed_empty" msgid="7094936030845062214">"부재중 전화가 없습니다."</string>
-    <string name="call_log_voicemail_empty" msgid="273623903423275178">"음성사서함 받은편지함이 비어 있습니다."</string>
-    <string name="call_log_activity_title" msgid="1275242727244945527">"통화 기록"</string>
-    <string name="call_log_all_title" msgid="6042262422192020327">"전체"</string>
-    <string name="call_log_missed_title" msgid="17254005889268015">"부재중 전화"</string>
-    <string name="tab_speed_dial" msgid="6616404752227561075">"단축번호"</string>
-    <string name="tab_history" msgid="7420269368689503596">"통화 기록"</string>
-    <string name="tab_all_contacts" msgid="5531733977693943015">"주소록"</string>
-    <string name="tab_voicemail" msgid="2458548090088316246">"음성사서함"</string>
-    <string name="search_shortcut_call_number" msgid="8847918845036880688">"<xliff:g id="NUMBER">%s</xliff:g>에 전화"</string>
-    <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"새 연락처 만들기"</string>
-    <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"연락처에 추가"</string>
-    <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"SMS 보내기"</string>
-    <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"화상 통화하기"</string>
-    <string name="search_shortcut_block_number" msgid="4587283230665805776">"번호 차단"</string>
-    <string name="speed_dial_empty" msgid="3346406399966039505">"아직 단축 다이얼이 설정된 연락처가 없습니다."</string>
-    <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"단축 다이얼 추가"</string>
-    <string name="remove_contact" msgid="2353580570488923668">"삭제"</string>
-    <string name="select_all" msgid="408601760696146245">"모두 선택"</string>
-    <string name="call_log_action_video_call" msgid="7565549950343850819">"화상 통화"</string>
-    <string name="call_log_action_send_message" msgid="6948727362660115554">"메시지 보내기"</string>
-    <string name="call_log_action_details" msgid="2091370737371449501">"통화 세부정보"</string>
-    <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"수신자"</string>
-    <string name="call_log_action_call" msgid="682724094251540583">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>에 전화 걸기"</string>
-    <string name="description_incoming_missed_call" msgid="8292535799379230029">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>의 부재중 전화(<xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>)"</string>
-    <string name="description_incoming_answered_call" msgid="3920182963103160610">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>에게 걸려온 수신 전화(<xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>)"</string>
-    <string name="description_unread_voicemail" msgid="145170985013419170">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>에서 보낸 읽지 않은 음성사서함"</string>
-    <string name="description_read_voicemail" msgid="5585559881573227732">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>에서 보낸 음성사서함"</string>
-    <string name="description_outgoing_call" msgid="543952487882919924">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>에게 건 전화(<xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>)"</string>
-    <string name="call_log_via_number" msgid="1340307109806397650">"<xliff:g id="NUMBER">%1$s</xliff:g>번으로 수신"</string>
-    <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g>번으로 수신"</string>
-    <string name="description_call_action" msgid="4042796498169106545">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>에 전화 걸기"</string>
-    <string name="description_video_call_action" msgid="1237090968588659650">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>에 화상 통화 걸기"</string>
-    <string name="description_voicemail_action" msgid="3290143432403538524">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> 음성사서함 듣기"</string>
-    <string name="description_create_new_contact_action" msgid="1928282350281564130">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> 연락처 만들기"</string>
-    <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>님을 기존 연락처에 추가합니다."</string>
-    <string name="description_details_action" msgid="2061866409737706174">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>의 통화 세부정보"</string>
-    <string name="call_log_header_today" msgid="1576119097475845293">"오늘"</string>
-    <string name="call_log_header_yesterday" msgid="5616077776205329563">"어제"</string>
-    <string name="call_log_header_other" msgid="4940676886254217644">"이전"</string>
-    <string name="voicemail_speaker_on" msgid="3151333608926996668">"스피커를 켭니다."</string>
-    <string name="voicemail_speaker_off" msgid="2530064206962034201">"스피커를 끕니다."</string>
-    <string name="voicemail_play_start_pause" msgid="3874823480278334664">"재생을 시작하거나 일시중지합니다."</string>
-    <string name="display_options_title" msgid="3880091801055797975">"표시 옵션"</string>
-    <string name="sounds_and_vibration_title" msgid="3075050000721181384">"소리 및 진동"</string>
-    <string name="accessibility_settings_title" msgid="3329027650429831820">"접근성"</string>
-    <string name="ringtone_title" msgid="8377174189894648486">"전화 벨소리"</string>
-    <string name="vibrate_on_ring_title" msgid="631441314790960485">"전화 올 때 벨소리와 함께 진동"</string>
-    <string name="dtmf_tone_enable_title" msgid="3273762431523939277">"키패드 소리"</string>
-    <string name="dtmf_tone_length_title" msgid="534096029202438539">"키패드 소리 길이"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="applicationLabel">전화</string>
+  <string name="launcherDialpadActivityLabel">휴대전화 키패드</string>
+  <string name="callHistoryIconLabel">통화 기록</string>
+  <string name="action_copy_number_text">전화번호 복사</string>
+  <string name="copy_transcript_text">텍스트 변환 복사</string>
+  <string name="action_edit_number_before_call">통화하기 전에 번호 수정</string>
+  <string name="call_log_delete_all">통화 기록 삭제</string>
+  <string name="call_log_trash_voicemail">음성사서함 삭제</string>
+  <string name="snackbar_voicemail_deleted">음성사서함 삭제됨</string>
+  <string name="clearCallLogConfirmation_title">통화 기록을 삭제하시겠습니까?</string>
+  <string name="clearCallLogConfirmation">모든 통화가 기록에서 삭제됩니다.</string>
+  <string name="clearCallLogProgress_title">통화 기록을 삭제하는 중…</string>
+  <string name="notification_missedCallTitle">부재중 전화</string>
+  <string name="notification_missedWorkCallTitle">부재중 업무 통화</string>
+  <string name="notification_missedCallsTitle">부재중 전화</string>
+  <string name="notification_missedCallsMsg">부재중 전화 %d통</string>
+  <string name="notification_missedCall_call_back">통화하기</string>
+  <string name="notification_missedCall_message">메시지</string>
+  <string name="post_call_notification_message">%1$s: %2$s</string>
+  <string name="notification_voicemail_text_format">%s(으)로 전화걸기</string>
+  <string name="notification_voicemail_no_vm_number">알 수 없는 음성사서함 번호</string>
+  <plurals name="notification_voicemail_title">
+    <item quantity="one">음성메일</item>
+    <item quantity="other">음성메일 %1$d개</item>
+  </plurals>
+  <string name="notification_voicemail_callers_list">%1$s, %2$s</string>
+  <string name="notification_new_voicemail_ticker">%1$s님이 보낸 새 음성사서함</string>
+  <string name="voicemail_playback_error">음성사서함을 재생할 수 없습니다.</string>
+  <string name="voicemail_fetching_content">음성사서함 로드 중…</string>
+  <string name="voicemail_fetching_timout">음성사서함을 로드할 수 없습니다.</string>
+  <string name="call_log_item_count_and_date">%2$s에 통화 %1$d통</string>
+  <string name="description_playback_speakerphone">스피커폰 켜고 끄기</string>
+  <string name="description_playback_seek">재생 위치 찾기</string>
+  <string name="action_menu_call_history_description">통화 기록</string>
+  <string msgid="2295659037509008453" name="action_menu_overflow_description">옵션 더보기</string>
+  <string name="action_menu_dialpad_button">키패드</string>
+  <string name="dialer_settings_label">설정</string>
+  <string name="simulator_submenu_label">시뮬레이터</string>
+  <string name="new_ui_launcher_shortcut_label">새 UI 바로가기 만들기</string>
+  <string name="description_entering_bulk_action_mode">일괄 작업 모드 시작 중</string>
+  <string name="description_leaving_bulk_action_mode">일괄 작업 모드 종료됨</string>
+  <string name="description_selecting_bulk_action_mode">%1$s 선택됨</string>
+  <string name="description_unselecting_bulk_action_mode">%1$s 선택 취소됨</string>
+  <string name="description_contact_details">%1$s의 연락처 세부정보</string>
+  <string name="description_spam_contact_details">스팸으로 의심되는 발신자 %1$s의 연락처 세부정보</string>
+  <string name="description_num_calls">통화 횟수: %1$s번</string>
+  <string name="description_video_call">화상 통화</string>
+  <string name="description_start_voice_search">음성 검색 시작</string>
+  <string name="voicemail">음성사서함</string>
+  <string name="description_cancel_multi_select">일괄 작업 모드 취소</string>
+  <string name="voicemailMultiSelectDeleteConfirm">삭제</string>
+  <string name="voicemailMultiSelectDeleteCancel">취소</string>
+  <string name="voicemailMultiSelectActionBarTitle">%1$s개 선택됨</string>
+  <plurals name="delete_voicemails_confirmation_dialog_title">
+    <item quantity="one"><b>이 음성사서함을 삭제하시겠습니까? </b></item>
+    <item quantity="other"><b>이 음성사서함을 삭제하시겠습니까? </b></item>
+  </plurals>
+  <string name="voicemailCallLogToday">@string/call_log_header_today</string>
+  <string name="voicemailCallLogDateTimeFormat">%1$s %2$s</string>
+  <string name="voicemailDurationFormat">%1$02d분 %2$02d초</string>
+  <string name="voicemailCallLogDateTimeFormatWithDuration">%1$s • %2$s</string>
+  <string name="voice_search_not_available">음성검색이 지원되지 않습니다.</string>
+  <string name="dialer_hint_find_contact">주소록 검색</string>
+  <string name="block_number_search_hint">번호 추가 또는 연락처 검색</string>
+  <string name="call_log_all_empty">통화 기록이 비어있습니다.</string>
+  <string name="call_log_all_empty_action">전화 걸기</string>
+  <string name="call_log_missed_empty">부재중 전화가 없습니다.</string>
+  <string name="call_log_voicemail_empty">음성사서함 받은편지함이 비어 있습니다.</string>
+  <string name="call_log_activity_title">통화 기록</string>
+  <string name="call_log_all_title">전체</string>
+  <string name="call_log_missed_title">부재중 전화</string>
+  <string name="tab_speed_dial">단축번호</string>
+  <string name="tab_history">통화 기록</string>
+  <string name="tab_all_contacts">주소록</string>
+  <string name="tab_voicemail">음성사서함</string>
+  <string name="search_shortcut_call_number">%s에 전화</string>
+  <string name="search_shortcut_create_new_contact">새 연락처 만들기</string>
+  <string name="search_shortcut_add_to_contact">연락처에 추가</string>
+  <string name="search_shortcut_send_sms_message">SMS 보내기</string>
+  <string name="search_shortcut_make_video_call">화상 통화하기</string>
+  <string name="search_shortcut_block_number">번호 차단</string>
+  <string name="speed_dial_empty">아직 단축 다이얼이 설정된 연락처가 없습니다.</string>
+  <string name="speed_dial_empty_add_favorite_action">단축 다이얼 추가</string>
+  <string name="remove_contact">삭제</string>
+  <string name="select_all">모두 선택</string>
+  <string name="call_log_action_video_call">화상 통화</string>
+  <string name="call_log_action_set_up_video">화상 통화 설정</string>
+  <string name="call_log_action_invite_video">화상 통화에 초대</string>
+  <string name="call_log_action_send_message">메시지 보내기</string>
+  <string name="call_log_action_details">통화 세부정보</string>
+  <string name="call_log_action_share_voicemail">수신자</string>
+  <string name="call_log_action_call">^1에 전화 걸기</string>
+  <string name="description_incoming_missed_call">^1의 부재중 전화(^2, ^3, ^4)</string>
+  <string name="description_incoming_answered_call">^1에게 걸려온 수신 전화(^2, ^3, ^4)</string>
+  <string name="description_unread_voicemail">^1, ^2, ^3, ^4에서 보낸 읽지 않은 음성사서함</string>
+  <string name="description_read_voicemail">^1, ^2, ^3, ^4에서 보낸 음성사서함</string>
+  <string name="description_outgoing_call">^1에게 건 전화(^2, ^3, ^4)</string>
+  <string name="call_log_via_number">%1$s번으로 수신</string>
+  <string name="call_log_via_number_phone_account">%1$s %2$s번으로 수신</string>
+  <string name="description_call_action">^1에 전화 걸기</string>
+  <string name="description_video_call_action">^1에 화상 통화 걸기</string>
+  <string name="description_voicemail_action">^1 음성사서함 듣기</string>
+  <string name="description_create_new_contact_action">^1 연락처 만들기</string>
+  <string name="description_add_to_existing_contact_action">^1님을 기존 연락처에 추가합니다.</string>
+  <string name="description_details_action">^1의 통화 세부정보</string>
+  <string name="call_log_header_today">오늘</string>
+  <string name="call_log_header_yesterday">어제</string>
+  <string name="call_log_header_other">이전</string>
+  <string name="voicemail_speaker_on">스피커를 켭니다.</string>
+  <string name="voicemail_speaker_off">스피커를 끕니다.</string>
+  <string name="voicemail_play_start_pause">재생을 시작하거나 일시중지합니다.</string>
+  <string name="display_options_title">표시 옵션</string>
+  <string name="sounds_and_vibration_title">소리 및 진동</string>
+  <string name="accessibility_settings_title">접근성</string>
+  <string name="ringtone_title">전화 벨소리</string>
+  <string name="vibrate_on_ring_title">전화 올 때 벨소리와 함께 진동</string>
+  <string name="dtmf_tone_enable_title">키패드 소리</string>
+  <string name="dtmf_tone_length_title">키패드 소리 길이</string>
   <string-array name="dtmf_tone_length_entries">
-    <item msgid="3136353015227162823">"보통"</item>
-    <item msgid="5376841175538523822">"길게"</item>
+    <item>보통</item>
+    <item>길게</item>
   </string-array>
-    <string name="respond_via_sms_setting_title" msgid="8008181606657693452">"빠른 응답"</string>
-    <string name="call_settings_label" msgid="7824611757200960807">"통화"</string>
-    <string name="manage_blocked_numbers_label" msgid="16823761991832273">"통화 차단"</string>
-    <string name="voicemail_settings_label" msgid="4594299554519920570">"음성사서함"</string>
-    <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"통화 차단 기능이 일시적으로 중지됨"</string>
-    <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"지난 48시간 이내에 이 휴대전화를 사용해 응급 서비스에 연락했으므로 통화 차단 기능이 중지되었습니다. 48시간이 지나면 통화 차단 기능이 자동으로 다시 사용 설정됩니다."</string>
-    <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"번호 가져오기"</string>
-    <string name="blocked_call_settings_import_description" msgid="1819412052545228965">"이전에 다른 앱을 통해 일부 발신자를 자동으로 음성사서함으로 보내도록 표시했습니다."</string>
-    <string name="blocked_call_settings_view_numbers_button" msgid="3332727948554356704">"개수 보기"</string>
-    <string name="blocked_call_settings_import_button" msgid="7319111700387470727">"가져오기"</string>
-    <string name="description_blocked_number_list_delete" msgid="2139644216858370740">"번호 차단 해제"</string>
-    <string name="addBlockedNumber" msgid="3053473735238295551">"번호 추가"</string>
-    <string name="block_number_footer_message_vvm" msgid="7955326304033982368">"이러한 번호에서 걸려오는 전화가 차단되며 음성사서함이 자동으로 삭제됩니다."</string>
-    <string name="block_number_footer_message_no_vvm" msgid="1152684139070471665">"이러한 번호에서 걸려오는 전화가 차단되지만, 발신자가 음성사서함에 메시지를 남길 수는 있습니다."</string>
-    <string name="block_list" msgid="4701585783411870782">"차단된 번호"</string>
-    <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g>번은 이미 차단되었습니다."</string>
-    <string name="phone_account_settings_label" msgid="8372485478006965920">"통화 계정"</string>
-    <string name="permission_no_speeddial" msgid="8487215628510596753">"단축번호를 사용하려면 주소록 권한을 사용하도록 설정하세요."</string>
-    <string name="permission_no_calllog" msgid="4053705651238775784">"통화 기록을 보려면 전화 권한을 사용하도록 설정하세요."</string>
-    <string name="permission_no_search" msgid="2424710404207193826">"주소록을 검색하려면 주소록 권한을 사용하도록 설정하세요."</string>
-    <string name="permission_place_call" msgid="8686908130349369423">"전화를 걸려면 전화 권한을 사용하도록 설정하세요."</string>
-    <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"전화 앱은 시스템 설정에 쓸 수 있는 권한이 없습니다."</string>
-    <string name="blocked_number_call_log_label" msgid="4212282846299997693">"차단됨"</string>
-    <string name="call_log_action_block_report_number" msgid="7302636538668696729">"스팸 차단/신고"</string>
-    <string name="call_log_action_block_number" msgid="5048188386501998865">"번호 차단"</string>
-    <string name="call_log_action_remove_spam" msgid="2045319806318398403">"스팸 해제"</string>
-    <string name="call_log_action_unblock_number" msgid="6100117033288448758">"번호 차단 해제"</string>
-    <string name="spam_number_call_log_label" msgid="2678431398326811131">"스팸"</string>
-    <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g>님은 오프라인 상태이며 연락할 수 없습니다."</string>
-    <string name="about_phone_label" msgid="582991354677973731">"정보"</string>
-    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"텍스트 변환 Google 제공"</string>
-    <string name="voicemail_transcription_in_progress" msgid="2933320969613783210">"Google에서 텍스트 변환 중…"</string>
-    <string name="voicemail_transcription_failed" msgid="335275303117412706">"텍스트 변환을 사용할 수 없습니다."</string>
-    <string name="voicemail_transcription_failed_language_not_supported" msgid="4210332591050562553">"텍스트 변환을 사용할 수 없습니다. 지원되지 않는 언어입니다."</string>
-    <string name="voicemail_transcription_failed_no_speech" msgid="9093372879697874852">"텍스트 변환을 사용할 수 없습니다. 감지된 음성이 없습니다."</string>
-    <string name="view_conversation" msgid="7895904782094119702">"보기"</string>
-    <string name="ec_data_deleted" msgid="4794880345545827107">"통화가 삭제되었습니다. 메시지에서 이 통화 중에 공유된 첨부파일을 확인하고 삭제하세요."</string>
-    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"통화가 삭제되었습니다. 메시지에서 통화 중에 공유된 첨부파일을 확인하고 삭제하세요."</string>
+  <string name="respond_via_sms_setting_title">빠른 응답</string>
+  <string name="call_settings_label">통화</string>
+  <string name="manage_blocked_numbers_label">차단된 번호</string>
+  <string name="voicemail_settings_label">음성사서함</string>
+  <string name="blocked_numbers_disabled_emergency_header_label">통화 차단 기능이 일시적으로 중지됨</string>
+  <string name="blocked_numbers_disabled_emergency_desc">지난 48시간 이내에 이 휴대전화를 사용해 응급 서비스에 연락했으므로 통화 차단 기능이 중지되었습니다. 48시간이 지나면 통화 차단 기능이 자동으로 다시 사용 설정됩니다.</string>
+  <string name="import_send_to_voicemail_numbers_label">번호 가져오기</string>
+  <string name="blocked_call_settings_import_description">이전에 다른 앱을 통해 일부 발신자를 자동으로 음성사서함으로 보내도록 표시했습니다.</string>
+  <string name="blocked_call_settings_view_numbers_button">개수 보기</string>
+  <string name="blocked_call_settings_import_button">가져오기</string>
+  <string name="description_blocked_number_list_delete">번호 차단 해제</string>
+  <string name="addBlockedNumber">번호 추가</string>
+  <string name="block_number_footer_message_vvm">이러한 번호에서 걸려오는 전화가 차단되며 음성사서함이 자동으로 삭제됩니다.</string>
+  <string name="block_number_footer_message_no_vvm">이러한 번호에서 걸려오는 전화가 차단되지만, 발신자가 음성사서함에 메시지를 남길 수는 있습니다.</string>
+  <string name="block_list">차단된 번호</string>
+  <string name="alreadyBlocked">%1$s번은 이미 차단되었습니다.</string>
+  <string name="phone_account_settings_label">통화 계정</string>
+  <string name="permission_no_speeddial">단축번호를 사용하려면 주소록 권한을 사용하도록 설정하세요.</string>
+  <string name="permission_no_calllog">통화 기록을 보려면 전화 권한을 사용하도록 설정하세요.</string>
+  <string name="permission_no_search">주소록을 검색하려면 주소록 권한을 사용하도록 설정하세요.</string>
+  <string name="permission_place_call">전화를 걸려면 전화 권한을 사용하도록 설정하세요.</string>
+  <string name="toast_cannot_write_system_settings">전화 앱은 시스템 설정에 쓸 수 있는 권한이 없습니다.</string>
+  <string name="blocked_number_call_log_label">차단됨</string>
+  <string name="call_log_action_block_report_number">스팸 차단/신고</string>
+  <string name="call_log_action_block_number">번호 차단</string>
+  <string name="call_log_action_remove_spam">스팸 해제</string>
+  <string name="call_log_action_unblock_number">번호 차단 해제</string>
+  <string name="spam_number_call_log_label">스팸</string>
+  <string name="call_composer_connection_failed">%1$s님은 오프라인 상태이며 연락할 수 없습니다.</string>
+  <string name="about_phone_label">정보</string>
+  <string name="voicemail_transcription_branding_text">텍스트 변환 Google 제공</string>
+  <string name="voicemail_transcription_in_progress">텍스트 변환 중…</string>
+  <string name="voicemail_transcription_failed">텍스트 변환을 사용할 수 없습니다.</string>
+  <string name="voicemail_transcription_failed_language_not_supported">텍스트 변환을 사용할 수 없습니다. 지원되지 않는 언어입니다.</string>
+  <string name="voicemail_transcription_failed_no_speech">텍스트 변환을 사용할 수 없습니다. 감지된 음성이 없습니다.</string>
+  <string name="voicemail_donation_promo_title">텍스트 변환 정확성 개선에 참여하시겠습니까?</string>
+  <string name="voicemail_donation_promo_content">Google에서 이번 및 향후 음성사서함 메시지와 스크립트를 검토하도록 허용해 주세요. 정보는 익명으로 저장되며 설정은 언제든지 변경할 수 있습니다. %1$s</string>
+  <string name="voicemail_donation_promo_opt_in">사용</string>
+  <string name="voicemail_donation_promo_opt_out">사용 안함</string>
+  <string name="voicemail_transcription_rating">텍스트 변환 품질 평가</string>
+  <string name="voicemail_transcription_rating_thanks">의견을 보내 주셔서 감사합니다</string>
+  <string name="description_rating_good">좋아요</string>
+  <string name="description_rating_bad">싫어요</string>
+  <string name="view_conversation">보기</string>
+  <string name="ec_data_deleted">통화가 삭제되었습니다. 메시지에서 이 통화 중에 공유된 첨부파일을 확인하고 삭제하세요.</string>
+  <string name="multiple_ec_data_deleted">통화가 삭제되었습니다. 메시지에서 통화 중에 공유된 첨부파일을 확인하고 삭제하세요.</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-ky/strings.xml b/java/com/android/dialer/app/res/values-ky/strings.xml
index 761e242..fa11a96 100644
--- a/java/com/android/dialer/app/res/values-ky/strings.xml
+++ b/java/com/android/dialer/app/res/values-ky/strings.xml
@@ -1,179 +1,171 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="applicationLabel" msgid="2202739481132958990">"Телефон"</string>
-    <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"Телефондун номер тергичи"</string>
-    <string name="callHistoryIconLabel" msgid="7493268743411968630">"Чалуулар таржымалы"</string>
-    <string name="action_copy_number_text" msgid="832682558551502319">"Номерди көчүрүү"</string>
-    <string name="copy_transcript_text" msgid="937904189017310829">"Транскрипцияны көчүрүү"</string>
-    <string name="action_edit_number_before_call" msgid="8017492815878473837">"Чалуудан мурун номерди түзөтүү"</string>
-    <string name="call_log_delete_all" msgid="7852970926906523784">"Чалуулар таржымалын тазалоо"</string>
-    <string name="call_log_trash_voicemail" msgid="6118493534178533972">"Үн почтасын жок кылуу"</string>
-    <string name="snackbar_voicemail_deleted" msgid="7463166543725496307">"Үн почтасы жок кылнд"</string>
-    <string name="snackbar_voicemail_deleted_undo" msgid="6959743982796409941">"КАЙТАРУУ"</string>
-    <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"Чалуулар таржымалы тазалансынбы?"</string>
-    <string name="clearCallLogConfirmation" msgid="6844949465815109166">"Ушуну менен бул таржымалдагы бардык чалуулар жок болот"</string>
-    <string name="clearCallLogProgress_title" msgid="995004835687361977">"Чалуулар таржымалы тазаланууда…"</string>
-    <string name="notification_missedCallTitle" msgid="8283366068539898486">"Кабыл алынбаган чалуу"</string>
-    <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"Кабыл алынбай калган чалуу (жумуш)"</string>
-    <string name="notification_missedCallsTitle" msgid="3697442015345089802">"Кабыл алынбаган чалуулар"</string>
-    <string name="notification_missedCallsMsg" msgid="8176217633929018706">"<xliff:g id="NUM_MISSED_CALLS">%d</xliff:g> кабыл алынбаган чалуу"</string>
-    <string name="notification_missedCall_call_back" msgid="3875698110051973965">"Кайра чалуу"</string>
-    <string name="notification_missedCall_message" msgid="5086910028988305964">"Билдирүү"</string>
-    <string name="post_call_notification_message" msgid="5417476789860590611">"<xliff:g id="NAME">%1$s</xliff:g>: <xliff:g id="MESSAGE">%2$s</xliff:g>"</string>
-    <string name="notification_voicemail_text_format" msgid="1895667520930252897">"<xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g> номерин терүү"</string>
-    <string name="notification_voicemail_no_vm_number" msgid="8942821987929495842">"Үн почтасынын номери белгисиз"</string>
-    <plurals name="notification_voicemail_title" formatted="false" msgid="1551847434476438657">
-      <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> Үн каты </item>
-      <item quantity="one">Үн каты</item>
-    </plurals>
-    <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
-    <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"<xliff:g id="CALLER">%1$s</xliff:g> жаңы үнкат калтырды"</string>
-    <string name="voicemail_playback_error" msgid="4384373852257757295">"Үн почтасы ойнолгон жок"</string>
-    <string name="voicemail_fetching_content" msgid="572320120918636014">"Үн почтасы жүктөлүүдө…"</string>
-    <string name="voicemail_fetching_timout" msgid="2128873915839949783">"Үн почтасы жүктөлгөн жок"</string>
-    <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_playback_speakerphone" msgid="4852027754869750227">"Катуу сүйлөткүчтү күйгүзүү же өчүрүү"</string>
-    <string name="description_playback_seek" msgid="1340910573254132520">"Ойнотуунун жайгашкан жерин издөө"</string>
-    <string name="action_menu_call_history_description" msgid="8829135306925008546">"Чалуулар таржымалы"</string>
-    <string name="action_menu_overflow_description" msgid="7648679686746517341">"Көбүрөөк мүмкүнчүлүктөр"</string>
-    <string name="action_menu_dialpad_button" msgid="1970631633457493180">"номер тергич"</string>
-    <string name="dialer_settings_label" msgid="4980176284150290175">"Жөндөөлөр"</string>
-    <string name="simulator_submenu_label" msgid="186156287346615267">"Симулятор"</string>
-    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Жаңы интерфейс үчүн кыска жол түзүү"</string>
-    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"Жапырт аракет режимине кирдиңиз"</string>
-    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"Жапырт аракет режиминен чыктыңыз"</string>
-    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> объект тандалды"</string>
-    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> объект тандоодон чыгарылды"</string>
-    <string name="description_contact_details" msgid="3341280873855253464">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> байланыш маалыматтары"</string>
-    <string name="description_spam_contact_details" msgid="5592578752881528368">"Спам деп шектелип жаткан чалуучунун байланыш маалыматы <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> чалуу."</string>
-    <string name="description_video_call" msgid="3738199365585751727">"Видео чалуу."</string>
-    <string name="description_start_voice_search" msgid="8380022725973015261">"Үн менен издеп баштоо"</string>
-    <string name="voicemail" msgid="8899540969000957954">"Үн почтасы"</string>
-    <string name="description_cancel_multi_select" msgid="3930475950253360461">"Жапырт аракет режимин жокко чыгаруу"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Жок кылуу"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Жокко чыгаруу"</string>
-    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> тандалды"</string>
-    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
-      <item quantity="other">"<b>"Бул үн почталар жок кылынсынбы? "</b>"</item>
-      <item quantity="one">"<b>"Бул үн почта жок кылынсынбы? "</b>"</item>
-    </plurals>
-    <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
-    <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> саат <xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
-    <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="voice_search_not_available" msgid="6546240433719732905">"Үн менен издөө жеткиликтүү эмес"</string>
-    <string name="dialer_hint_find_contact" msgid="2023214799381149808">"Байланыштарды издөө"</string>
-    <string name="block_number_search_hint" msgid="5377706079015099416">"Номер кошуңуз же байлнш издңз"</string>
-    <string name="call_log_all_empty" msgid="3955572868518162004">"Чалуулар таржымалыңыз бош"</string>
-    <string name="call_log_all_empty_action" msgid="852218280136243014">"Чалуу"</string>
-    <string name="call_log_missed_empty" msgid="7094936030845062214">"Кабыл алынбаган чалуулар жок."</string>
-    <string name="call_log_voicemail_empty" msgid="273623903423275178">"Үн почтаңыздын келген билдирүүлөр куржуну бош."</string>
-    <string name="call_log_activity_title" msgid="1275242727244945527">"Чалуулар таржымалы"</string>
-    <string name="call_log_all_title" msgid="6042262422192020327">"Бардыгы"</string>
-    <string name="call_log_missed_title" msgid="17254005889268015">"Кабыл алынбагандар"</string>
-    <string name="tab_speed_dial" msgid="6616404752227561075">"Тез терүү"</string>
-    <string name="tab_history" msgid="7420269368689503596">"Чалуулар таржымалы"</string>
-    <string name="tab_all_contacts" msgid="5531733977693943015">"Байланыштар"</string>
-    <string name="tab_voicemail" msgid="2458548090088316246">"Үн почтасы"</string>
-    <string name="search_shortcut_call_number" msgid="8847918845036880688">"Чалуу <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"Жаңы байланыш түзүү"</string>
-    <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"Байланышка кошуу"</string>
-    <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"SMS жөнөтүү"</string>
-    <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"Видео түрүндө чалуу"</string>
-    <string name="search_shortcut_block_number" msgid="4587283230665805776">"Номерди бөгөттөө"</string>
-    <string name="speed_dial_empty" msgid="3346406399966039505">"Азырынча тез териле турган номерлер жок"</string>
-    <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"Сүйүктүү номер кошуу"</string>
-    <string name="remove_contact" msgid="2353580570488923668">"Алып салуу"</string>
-    <string name="select_all" msgid="408601760696146245">"Баарын тандоо"</string>
-    <string name="call_log_action_video_call" msgid="7565549950343850819">"Видео чалуу"</string>
-    <string name="call_log_action_send_message" msgid="6948727362660115554">"Билдирүү жөнөтүү"</string>
-    <string name="call_log_action_details" msgid="2091370737371449501">"Чалуунун чоо-жайы"</string>
-    <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"Төмөнкүгө жөнөтүү…"</string>
-    <string name="call_log_action_call" msgid="682724094251540583">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> чалуу"</string>
-    <string name="description_incoming_missed_call" msgid="8292535799379230029">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g> дегенден жооп берилбей калган чалуу."</string>
-    <string name="description_incoming_answered_call" msgid="3920182963103160610">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g> дегенден жооп берилген чалуу."</string>
-    <string name="description_unread_voicemail" msgid="145170985013419170">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> дегенден окула элек үн почтасы, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_read_voicemail" msgid="5585559881573227732">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> дегенден үн почтасы, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_outgoing_call" msgid="543952487882919924">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g> дегенге чалуу."</string>
-    <string name="call_log_via_number" msgid="1340307109806397650">"<xliff:g id="NUMBER">%1$s</xliff:g> аркылуу"</string>
-    <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="NUMBER">%2$s</xliff:g> аркылуу <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>"</string>
-    <string name="description_call_action" msgid="4042796498169106545">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> чалуу"</string>
-    <string name="description_video_call_action" msgid="1237090968588659650">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> видео чалуу."</string>
-    <string name="description_voicemail_action" msgid="3290143432403538524">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> үн катын угуу"</string>
-    <string name="description_create_new_contact_action" msgid="1928282350281564130">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> номери үчүн байланыш түзүү"</string>
-    <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> учурдагы байланышка кошуу"</string>
-    <string name="description_details_action" msgid="2061866409737706174">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> чалуу чоо-жайы"</string>
-    <string name="call_log_header_today" msgid="1576119097475845293">"Бүгүн"</string>
-    <string name="call_log_header_yesterday" msgid="5616077776205329563">"Кечээ"</string>
-    <string name="call_log_header_other" msgid="4940676886254217644">"Мурункураак"</string>
-    <string name="voicemail_speaker_on" msgid="3151333608926996668">"Катуу сүйлөткүч күйгүзүлгөн."</string>
-    <string name="voicemail_speaker_off" msgid="2530064206962034201">"Катуу сүйлөткүч өчүрүлгөн."</string>
-    <string name="voicemail_play_start_pause" msgid="3874823480278334664">"Ойнотуп баштоо же бир азга токтотуу"</string>
-    <string name="display_options_title" msgid="3880091801055797975">"Көрсөтүү параметрлери"</string>
-    <string name="sounds_and_vibration_title" msgid="3075050000721181384">"Үндөр жана дирилдөө"</string>
-    <string name="accessibility_settings_title" msgid="3329027650429831820">"Атайын мүмкүнчүлүктөр"</string>
-    <string name="ringtone_title" msgid="8377174189894648486">"Телефондун шыңгыры"</string>
-    <string name="vibrate_on_ring_title" msgid="631441314790960485">"Дирилдеп чалынсын"</string>
-    <string name="dtmf_tone_enable_title" msgid="3273762431523939277">"Номер тергичтин үнү"</string>
-    <string name="dtmf_tone_length_title" msgid="534096029202438539">"Номер тергичтин үнүнүн узундугу"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="applicationLabel">Телефон</string>
+  <string name="launcherDialpadActivityLabel">Телефондун номер тергичи</string>
+  <string name="callHistoryIconLabel">Чалуулар таржымалы</string>
+  <string name="action_copy_number_text">Номерди көчүрүү</string>
+  <string name="copy_transcript_text">Транскрипцияны көчүрүү</string>
+  <string name="action_edit_number_before_call">Чалуудан мурун номерди түзөтүү</string>
+  <string name="call_log_delete_all">Чалуулар таржымалын тазалоо</string>
+  <string name="call_log_trash_voicemail">Үн почтасын жок кылуу</string>
+  <string name="snackbar_voicemail_deleted">Үн почтасы жок кылнд</string>
+  <string name="clearCallLogConfirmation_title">Чалуулар таржымалы тазалансынбы?</string>
+  <string name="clearCallLogConfirmation">Ушуну менен бул таржымалдагы бардык чалуулар жок болот</string>
+  <string name="clearCallLogProgress_title">Чалуулар таржымалы тазаланууда…</string>
+  <string name="notification_missedCallTitle">Кабыл алынбаган чалуу</string>
+  <string name="notification_missedWorkCallTitle">Кабыл алынбай калган чалуу (жумуш)</string>
+  <string name="notification_missedCallsTitle">Кабыл алынбаган чалуулар</string>
+  <string name="notification_missedCallsMsg">%d кабыл алынбаган чалуу</string>
+  <string name="notification_missedCall_call_back">Кайра чалуу</string>
+  <string name="notification_missedCall_message">Билдирүү</string>
+  <string name="post_call_notification_message">%1$s: %2$s</string>
+  <string name="notification_voicemail_text_format">%s номерин терүү</string>
+  <string name="notification_voicemail_no_vm_number">Үн почтасынын номери белгисиз</string>
+  <plurals name="notification_voicemail_title">
+    <item quantity="one">Үн каты</item>
+    <item quantity="other"> %1$d Үн каты </item>
+  </plurals>
+  <string name="notification_voicemail_callers_list">%1$s, %2$s</string>
+  <string name="notification_new_voicemail_ticker">%1$s жаңы үнкат калтырды</string>
+  <string name="voicemail_playback_error">Үн почтасы ойнолгон жок</string>
+  <string name="voicemail_fetching_content">Үн почтасы жүктөлүүдө…</string>
+  <string name="voicemail_fetching_timout">Үн почтасы жүктөлгөн жок</string>
+  <string name="call_log_item_count_and_date">(%1$d) %2$s</string>
+  <string name="description_playback_speakerphone">Катуу сүйлөткүчтү күйгүзүү же өчүрүү</string>
+  <string name="description_playback_seek">Ойнотуунун жайгашкан жерин издөө</string>
+  <string name="action_menu_call_history_description">Чалуулар таржымалы</string>
+  <string msgid="2295659037509008453" name="action_menu_overflow_description">Көбүрөөк мүмкүнчүлүктөр</string>
+  <string name="action_menu_dialpad_button">номер тергич</string>
+  <string name="dialer_settings_label">Жөндөөлөр</string>
+  <string name="simulator_submenu_label">Симулятор</string>
+  <string name="new_ui_launcher_shortcut_label">Жаңы интерфейс үчүн кыска жол түзүү</string>
+  <string name="description_entering_bulk_action_mode">Жапырт аракет режимине кирдиңиз</string>
+  <string name="description_leaving_bulk_action_mode">Жапырт аракет режиминен чыктыңыз</string>
+  <string name="description_selecting_bulk_action_mode">%1$s объект тандалды</string>
+  <string name="description_unselecting_bulk_action_mode">%1$s объект тандоодон чыгарылды</string>
+  <string name="description_contact_details">%1$s байланыш маалыматтары</string>
+  <string name="description_spam_contact_details">Спам деп шектелип жаткан чалуучунун байланыш маалыматы %1$s</string>
+  <string name="description_num_calls">%1$s чалуу.</string>
+  <string name="description_video_call">Видео чалуу.</string>
+  <string name="description_start_voice_search">Үн менен издеп баштоо</string>
+  <string name="voicemail">Үн почтасы</string>
+  <string name="description_cancel_multi_select">Жапырт аракет режимин жокко чыгаруу</string>
+  <string name="voicemailMultiSelectDeleteConfirm">Жок кылуу</string>
+  <string name="voicemailMultiSelectDeleteCancel">Жокко чыгаруу</string>
+  <string name="voicemailMultiSelectActionBarTitle">%1$s тандалды</string>
+  <plurals name="delete_voicemails_confirmation_dialog_title">
+    <item quantity="one"><b>Бул үн почта жок кылынсынбы? </b></item>
+    <item quantity="other"><b>Бул үн почталар жок кылынсынбы? </b></item>
+  </plurals>
+  <string name="voicemailCallLogToday">@string/call_log_header_today</string>
+  <string name="voicemailCallLogDateTimeFormat">%1$s саат %2$s</string>
+  <string name="voicemailDurationFormat">%1$02d:%2$02d</string>
+  <string name="voicemailCallLogDateTimeFormatWithDuration">%1$s • %2$s</string>
+  <string name="voice_search_not_available">Үн менен издөө жеткиликтүү эмес</string>
+  <string name="dialer_hint_find_contact">Байланыштарды издөө</string>
+  <string name="block_number_search_hint">Номер кошуңуз же байлнш издңз</string>
+  <string name="call_log_all_empty">Чалуулар таржымалыңыз бош</string>
+  <string name="call_log_all_empty_action">Чалуу</string>
+  <string name="call_log_missed_empty">Кабыл алынбаган чалуулар жок.</string>
+  <string name="call_log_voicemail_empty">Үн почтаңыздын келген билдирүүлөр куржуну бош.</string>
+  <string name="call_log_activity_title">Чалуулар таржымалы</string>
+  <string name="call_log_all_title">Бардыгы</string>
+  <string name="call_log_missed_title">Кабыл алынбагандар</string>
+  <string name="tab_speed_dial">Тез терүү</string>
+  <string name="tab_history">Чалуулар таржымалы</string>
+  <string name="tab_all_contacts">Байланыштар</string>
+  <string name="tab_voicemail">Үн почтасы</string>
+  <string name="search_shortcut_call_number">Чалуу %s</string>
+  <string name="search_shortcut_create_new_contact">Жаңы байланыш түзүү</string>
+  <string name="search_shortcut_add_to_contact">Байланышка кошуу</string>
+  <string name="search_shortcut_send_sms_message">SMS жөнөтүү</string>
+  <string name="search_shortcut_make_video_call">Видео түрүндө чалуу</string>
+  <string name="search_shortcut_block_number">Номерди бөгөттөө</string>
+  <string name="speed_dial_empty">Азырынча тез териле турган номерлер жок</string>
+  <string name="speed_dial_empty_add_favorite_action">Сүйүктүү номер кошуу</string>
+  <string name="remove_contact">Алып салуу</string>
+  <string name="select_all">Баарын тандоо</string>
+  <string name="call_log_action_video_call">Видео чалуу</string>
+  <string name="call_log_action_set_up_video">Видео режиминде чалууну жөндөө</string>
+  <string name="call_log_action_invite_video">Видео режиминде чалууга чакыр</string>
+  <string name="call_log_action_send_message">Билдирүү жөнөтүү</string>
+  <string name="call_log_action_details">Чалуунун чоо-жайы</string>
+  <string name="call_log_action_share_voicemail">Төмөнкүгө жөнөтүү…</string>
+  <string name="call_log_action_call">^1 чалуу</string>
+  <string name="description_incoming_missed_call">^1, ^2, ^3, ^4 дегенден жооп берилбей калган чалуу.</string>
+  <string name="description_incoming_answered_call">^1, ^2, ^3, ^4 дегенден жооп берилген чалуу.</string>
+  <string name="description_unread_voicemail">^1 дегенден окула элек үн почтасы, ^2, ^3, ^4.</string>
+  <string name="description_read_voicemail">^1 дегенден үн почтасы, ^2, ^3, ^4.</string>
+  <string name="description_outgoing_call">^1, ^2, ^3, ^4 дегенге чалуу.</string>
+  <string name="call_log_via_number">%1$s аркылуу</string>
+  <string name="call_log_via_number_phone_account">%2$s аркылуу %1$s</string>
+  <string name="description_call_action">^1 чалуу</string>
+  <string name="description_video_call_action">^1 видео чалуу.</string>
+  <string name="description_voicemail_action">^1 үн катын угуу</string>
+  <string name="description_create_new_contact_action">^1 номери үчүн байланыш түзүү</string>
+  <string name="description_add_to_existing_contact_action">^1 учурдагы байланышка кошуу</string>
+  <string name="description_details_action">^1 чалуу чоо-жайы</string>
+  <string name="call_log_header_today">Бүгүн</string>
+  <string name="call_log_header_yesterday">Кечээ</string>
+  <string name="call_log_header_other">Мурункураак</string>
+  <string name="voicemail_speaker_on">Катуу сүйлөткүч күйгүзүлгөн.</string>
+  <string name="voicemail_speaker_off">Катуу сүйлөткүч өчүрүлгөн.</string>
+  <string name="voicemail_play_start_pause">Ойнотуп баштоо же бир азга токтотуу</string>
+  <string name="display_options_title">Көрсөтүү параметрлери</string>
+  <string name="sounds_and_vibration_title">Үндөр жана дирилдөө</string>
+  <string name="accessibility_settings_title">Атайын мүмкүнчүлүктөр</string>
+  <string name="ringtone_title">Телефондун шыңгыры</string>
+  <string name="vibrate_on_ring_title">Дирилдеп чалынсын</string>
+  <string name="dtmf_tone_enable_title">Номер тергичтин үнү</string>
+  <string name="dtmf_tone_length_title">Номер тергичтин үнүнүн узундугу</string>
   <string-array name="dtmf_tone_length_entries">
-    <item msgid="3136353015227162823">"Орточо"</item>
-    <item msgid="5376841175538523822">"Узун"</item>
+    <item>Орточо</item>
+    <item>Узун</item>
   </string-array>
-    <string name="respond_via_sms_setting_title" msgid="8008181606657693452">"Тез жооптор"</string>
-    <string name="call_settings_label" msgid="7824611757200960807">"Чалуулар"</string>
-    <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Чалууларды бөгөттөө"</string>
-    <string name="voicemail_settings_label" msgid="4594299554519920570">"Үн почтасы"</string>
-    <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Чалууну бөгөттөө убактылуу өчүрүлгөн"</string>
-    <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Акыркы 48 саат ичинде бул телефондон өзгөчө кырдаал кызматына байланышкандыктан чалууну бөгөттөө өчүрүлдү. 48 сааттык мөөнөтү аяктагандан кийин ал автоматтык түрдө кайра иштетилет."</string>
-    <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Номерлерди импорттоо"</string>
-    <string name="blocked_call_settings_import_description" msgid="1819412052545228965">"Мурда башка колдонмолор аркылуу айрым чалуучуларга автоматтык түрдө үн почтасы жөнөтүлгүдөй кылып белгилегенсиз."</string>
-    <string name="blocked_call_settings_view_numbers_button" msgid="3332727948554356704">"Номерлерди көрүү"</string>
-    <string name="blocked_call_settings_import_button" msgid="7319111700387470727">"Импорттоо"</string>
-    <string name="description_blocked_number_list_delete" msgid="2139644216858370740">"Номерди бөгөттөн чыгаруу"</string>
-    <string name="addBlockedNumber" msgid="3053473735238295551">"Номер кошуу"</string>
-    <string name="block_number_footer_message_vvm" msgid="7955326304033982368">"Бул номерлерден келген чалуулар бөгөттөлөт жана үн билдирүүлөрү автоматтык түрдө жок кылынат."</string>
-    <string name="block_number_footer_message_no_vvm" msgid="1152684139070471665">"Бул номерлерден келген чалуулар бөгөттөлөт, бирок алар сизге үн билдирүүлөрүн калтыра берет."</string>
-    <string name="block_list" msgid="4701585783411870782">"Бөгөттөлгөн номерлер"</string>
-    <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g> мурунтан эле бөгөттөлгөн."</string>
-    <string name="phone_account_settings_label" msgid="8372485478006965920">"Чалуу каттоо эсептери"</string>
-    <string name="permission_no_speeddial" msgid="8487215628510596753">"Тез терүүнү иштетүү үчүн, \"Байланыштар\" колдонмосуна уруксат бериңиз."</string>
-    <string name="permission_no_calllog" msgid="4053705651238775784">"Чалуулар таржымалыңызды көрүү үчүн, \"Телефон\" колдонмосуна уруксат бериңиз."</string>
-    <string name="permission_no_search" msgid="2424710404207193826">"Байланыштарыңызды издөө үчүн, Байланыштарга уруксатты күйгүзүңүз."</string>
-    <string name="permission_place_call" msgid="8686908130349369423">"Чалуу үчүн, \"Телефон\" колдонмосуна уруксат бериңиз."</string>
-    <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"Телефон колдонмосунун Тутум жөндөөлөрүнө жазууга уруксаты жок."</string>
-    <string name="blocked_number_call_log_label" msgid="4212282846299997693">"Бөгөттөлгөн"</string>
-    <string name="call_log_action_block_report_number" msgid="7302636538668696729">"Бөгөттөө/спам катары кабарлоо"</string>
-    <string name="call_log_action_block_number" msgid="5048188386501998865">"Номерди бөгөттөө"</string>
-    <string name="call_log_action_remove_spam" msgid="2045319806318398403">"Спам эмес"</string>
-    <string name="call_log_action_unblock_number" msgid="6100117033288448758">"Номерди бөгөттөн чыгаруу"</string>
-    <string name="spam_number_call_log_label" msgid="2678431398326811131">"Спам"</string>
-    <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> оффлайн режиминде болгондуктан, байланышууга болбойт"</string>
-    <string name="about_phone_label" msgid="582991354677973731">"Колдонмо жөнүндө"</string>
-    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Google тарабынан чечмеленди"</string>
-    <string name="voicemail_transcription_in_progress" msgid="2933320969613783210">"Күтө туруңуз…"</string>
-    <string name="voicemail_transcription_failed" msgid="335275303117412706">"Чечмелөө жеткиликсиз."</string>
-    <string name="voicemail_transcription_failed_language_not_supported" msgid="4210332591050562553">"Чечмелүү жеткиликсиз. Тил колдоого алынбайт."</string>
-    <string name="voicemail_transcription_failed_no_speech" msgid="9093372879697874852">"Чечмелөө жеткиликсиз. Cөз таанылган жок."</string>
-    <string name="view_conversation" msgid="7895904782094119702">"Карап көрүү"</string>
-    <string name="ec_data_deleted" msgid="4794880345545827107">"Чалуу жок кылынды. Билдирүүлөр колдонмосунда чалуу убагында жөнөтүлгөн файлдарды текшерип, жок кылыңыз."</string>
-    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"Чалуулар жок кылынды. Билдирүүлөр колдонмосунда чалуулар убагында жөнөтүлгөн файлдарды текшерип, жок кылыңыз."</string>
+  <string name="respond_via_sms_setting_title">Тез жооптор</string>
+  <string name="call_settings_label">Чалуулар</string>
+  <string name="manage_blocked_numbers_label">Бөгөттөлгөн номерлер</string>
+  <string name="voicemail_settings_label">Үн почтасы</string>
+  <string name="blocked_numbers_disabled_emergency_header_label">Чалууну бөгөттөө убактылуу өчүрүлгөн</string>
+  <string name="blocked_numbers_disabled_emergency_desc">Акыркы 48 саат ичинде бул телефондон өзгөчө кырдаал кызматына байланышкандыктан чалууну бөгөттөө өчүрүлдү. 48 сааттык мөөнөтү аяктагандан кийин ал автоматтык түрдө кайра иштетилет.</string>
+  <string name="import_send_to_voicemail_numbers_label">Номерлерди импорттоо</string>
+  <string name="blocked_call_settings_import_description">Мурда башка колдонмолор аркылуу айрым чалуучуларга автоматтык түрдө үн почтасы жөнөтүлгүдөй кылып белгилегенсиз.</string>
+  <string name="blocked_call_settings_view_numbers_button">Номерлерди көрүү</string>
+  <string name="blocked_call_settings_import_button">Импорттоо</string>
+  <string name="description_blocked_number_list_delete">Номерди бөгөттөн чыгаруу</string>
+  <string name="addBlockedNumber">Номер кошуу</string>
+  <string name="block_number_footer_message_vvm">Бул номерлерден келген чалуулар бөгөттөлөт жана үн билдирүүлөрү автоматтык түрдө жок кылынат.</string>
+  <string name="block_number_footer_message_no_vvm">Бул номерлерден келген чалуулар бөгөттөлөт, бирок алар сизге үн билдирүүлөрүн калтыра берет.</string>
+  <string name="block_list">Бөгөттөлгөн номерлер</string>
+  <string name="alreadyBlocked">%1$s мурунтан эле бөгөттөлгөн.</string>
+  <string name="phone_account_settings_label">Чалуу каттоо эсептери</string>
+  <string name="permission_no_speeddial">Тез терүүнү иштетүү үчүн, \"Байланыштар\" колдонмосуна уруксат бериңиз.</string>
+  <string name="permission_no_calllog">Чалуулар таржымалыңызды көрүү үчүн, \"Телефон\" колдонмосуна уруксат бериңиз.</string>
+  <string name="permission_no_search">Байланыштарыңызды издөө үчүн, Байланыштарга уруксатты күйгүзүңүз.</string>
+  <string name="permission_place_call">Чалуу үчүн, \"Телефон\" колдонмосуна уруксат бериңиз.</string>
+  <string name="toast_cannot_write_system_settings">Телефон колдонмосунун Тутум жөндөөлөрүнө жазууга уруксаты жок.</string>
+  <string name="blocked_number_call_log_label">Бөгөттөлгөн</string>
+  <string name="call_log_action_block_report_number">Бөгөттөө/спам катары кабарлоо</string>
+  <string name="call_log_action_block_number">Номерди бөгөттөө</string>
+  <string name="call_log_action_remove_spam">Спам эмес</string>
+  <string name="call_log_action_unblock_number">Номерди бөгөттөн чыгаруу</string>
+  <string name="spam_number_call_log_label">Спам</string>
+  <string name="call_composer_connection_failed">%1$s оффлайн режиминде болгондуктан, байланышууга болбойт</string>
+  <string name="about_phone_label">Колдонмо жөнүндө</string>
+  <string name="voicemail_transcription_branding_text">Google тарабынан чечмеленди</string>
+  <string name="voicemail_transcription_in_progress">Күтө туруңуз...</string>
+  <string name="voicemail_transcription_failed">Чечмелөө жеткиликсиз.</string>
+  <string name="voicemail_transcription_failed_language_not_supported">Чечмелүү жеткиликсиз. Тил колдоого алынбайт.</string>
+  <string name="voicemail_transcription_failed_no_speech">Чечмелөө жеткиликсиз. Cөз таанылган жок.</string>
+  <string name="voicemail_donation_promo_title">Транскрипциянын тактыгын жакшыртууга жардам бересизби?</string>
+  <string name="voicemail_donation_promo_content">Үн почтаңыздын ушул жана башка билдирүүлөрүн Google транскрипциялары менен карап чыгышы керек. Алар жашыруун мүнөздө сакталат. Жөндөөлөрдү каалаган убакытта өзгөртсөңүз болот. %1$s</string>
+  <string name="voicemail_donation_promo_opt_in">Ооба, макулмун</string>
+  <string name="voicemail_donation_promo_opt_out">Жок, рахмат</string>
+  <string name="voicemail_transcription_rating">Баалоо транскрипциясынын сапаты</string>
+  <string name="voicemail_transcription_rating_thanks">Жооп-пикириңиз үчүн рахмат</string>
+  <string name="description_rating_good">Жакты</string>
+  <string name="description_rating_bad">Жаккан жок</string>
+  <string name="view_conversation">Карап көрүү</string>
+  <string name="ec_data_deleted">Чалуу жок кылынды. Билдирүүлөр колдонмосунда чалуу убагында жөнөтүлгөн файлдарды текшерип, жок кылыңыз.</string>
+  <string name="multiple_ec_data_deleted">Чалуулар жок кылынды. Билдирүүлөр колдонмосунда чалуулар убагында жөнөтүлгөн файлдарды текшерип, жок кылыңыз.</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-lo/strings.xml b/java/com/android/dialer/app/res/values-lo/strings.xml
index 5bc9167..cec4b39 100644
--- a/java/com/android/dialer/app/res/values-lo/strings.xml
+++ b/java/com/android/dialer/app/res/values-lo/strings.xml
@@ -1,179 +1,171 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="applicationLabel" msgid="2202739481132958990">"ໂທລະສັບ"</string>
-    <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"ແປ້ນກົດໂທລະສັບ"</string>
-    <string name="callHistoryIconLabel" msgid="7493268743411968630">"ປະຫວັດການໂທ"</string>
-    <string name="action_copy_number_text" msgid="832682558551502319">"ອັດ​ສຳ​ເນົາ​ໝາຍເລກ"</string>
-    <string name="copy_transcript_text" msgid="937904189017310829">"ອັດ​ສຳ​ເນົາ​ການ​ກ່າຍ​ເປັນ​ໜັງ​ສື"</string>
-    <string name="action_edit_number_before_call" msgid="8017492815878473837">"ແກ້ໄຂໝາຍເລກກ່ອນໂທ"</string>
-    <string name="call_log_delete_all" msgid="7852970926906523784">"ລຶບ​ປະ​ຫວັດ​ການ​ໂທ​"</string>
-    <string name="call_log_trash_voicemail" msgid="6118493534178533972">"ລຶບຂໍ້ຄວາມສຽງ"</string>
-    <string name="snackbar_voicemail_deleted" msgid="7463166543725496307">"ລຶບ​ຂໍ້​ຄວາມ​ສຽງ​ແລ້ວ"</string>
-    <string name="snackbar_voicemail_deleted_undo" msgid="6959743982796409941">"ບໍ່​ເຮັດ"</string>
-    <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"ລຶບ​ປະ​ຫວັດ​ການ​ໂທ​ບໍ?"</string>
-    <string name="clearCallLogConfirmation" msgid="6844949465815109166">"ອັນ​ນີ້​ຈະ​ລຶບ​ທຸກ​ສາຍ​ໂທ​ຈາກ​ປະ​ຫວັດ​ຂອງ​ທ່ານ"</string>
-    <string name="clearCallLogProgress_title" msgid="995004835687361977">"ກຳ​ລັງ​ລຶບ​ປະ​ຫວັດ​ການ​ໂທ…"</string>
-    <string name="notification_missedCallTitle" msgid="8283366068539898486">"ສາຍທີ່ບໍ່ໄດ້ຮັບ"</string>
-    <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"ສາຍບໍ່ໄດ້ຮັບຈາກບ່ອນເຮັດວຽກ"</string>
-    <string name="notification_missedCallsTitle" msgid="3697442015345089802">"ສາຍທີ່ບໍ່ໄດ້ຮັບ"</string>
-    <string name="notification_missedCallsMsg" msgid="8176217633929018706">"<xliff:g id="NUM_MISSED_CALLS">%d</xliff:g> ສາຍບໍ່ໄດ້ຮັບ"</string>
-    <string name="notification_missedCall_call_back" msgid="3875698110051973965">"ໂທກັບ"</string>
-    <string name="notification_missedCall_message" msgid="5086910028988305964">"ຂໍ້ຄວາມ"</string>
-    <string name="post_call_notification_message" msgid="5417476789860590611">"<xliff:g id="NAME">%1$s</xliff:g>: <xliff:g id="MESSAGE">%2$s</xliff:g>"</string>
-    <string name="notification_voicemail_text_format" msgid="1895667520930252897">"ໂທຫາ <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
-    <string name="notification_voicemail_no_vm_number" msgid="8942821987929495842">"ບໍ່ຮູ້ຈັກເບີຂໍ້ຄວາມສຽງ"</string>
-    <plurals name="notification_voicemail_title" formatted="false" msgid="1551847434476438657">
-      <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> ຂໍ້ຄວາມສຽງ </item>
-      <item quantity="one">ຂໍ້ຄວາມສຽງ</item>
-    </plurals>
-    <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
-    <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"ບໍ່ມີຂໍ້ຄວາມສຽງຈາກ <xliff:g id="CALLER">%1$s</xliff:g>"</string>
-    <string name="voicemail_playback_error" msgid="4384373852257757295">"ບໍ່​ສາ​ມາດ​ຫຼິ້ນ​ຂໍ້​ຄວາມ​ສຽງ​ໄດ້"</string>
-    <string name="voicemail_fetching_content" msgid="572320120918636014">"ກຳ​ລັງ​ໂຫຼດ​ຂໍ້​ຄວາມ​ສຽງ…"</string>
-    <string name="voicemail_fetching_timout" msgid="2128873915839949783">"ບໍ່​ສາ​ມາດ​ໂຫຼດ​ຂໍ້​ຄວາມ​ສຽງ​ໄດ້"</string>
-    <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_playback_speakerphone" msgid="4852027754869750227">"​ປິດຫຼື​ເປີດ​ລຳ​ໂພງ​ມື​ຖື"</string>
-    <string name="description_playback_seek" msgid="1340910573254132520">"​ຊອກ​ຫາ​ຕຳ​​ແໜ່ງ​ຫຼິ້ນ"</string>
-    <string name="action_menu_call_history_description" msgid="8829135306925008546">"ປະຫວັດການໂທ"</string>
-    <string name="action_menu_overflow_description" msgid="7648679686746517341">"ໂຕເລືອກເພີ່ມເຕີມ"</string>
-    <string name="action_menu_dialpad_button" msgid="1970631633457493180">"ແປ້ນກົດ"</string>
-    <string name="dialer_settings_label" msgid="4980176284150290175">"ການ​ຕັ້ງ​ຄ່າ"</string>
-    <string name="simulator_submenu_label" msgid="186156287346615267">"ຕົວຈຳລອງ"</string>
-    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"ສ້າງປຸ່ມລັດສ່ວນຕິດຕໍ່ຜູ້ໃຊ້ໃໝ່"</string>
-    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"ກຳລັງເຂົ້າໂໝດຄຳສັ່ງຈຳນວນຫຼາຍ"</string>
-    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"ອອກຈາກໂໝດຄຳສັ່ງຈຳນວນຫຼາຍແລ້ວ"</string>
-    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"ເລືອກ <xliff:g id="NAMEORNUMBER">%1$s</xliff:g> ແລ້ວ"</string>
-    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"ເຊົາເລືອກ <xliff:g id="NAMEORNUMBER">%1$s</xliff:g> ແລ້ວ"</string>
-    <string name="description_contact_details" msgid="3341280873855253464">"ລາຍລະອຽດ​ລາຍຊື່​ຜູ່ຕິດຕໍ່​ສຳລັບ <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_spam_contact_details" msgid="5592578752881528368">"ລາຍລະອຽດການຕິດຕໍ່ສຳລັບຜູ້ໂທທີ່ສົງໄສວ່າເປັນສະແປມ <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> ການໂທ."</string>
-    <string name="description_video_call" msgid="3738199365585751727">"ການ​ໂທ​ດ້ວຍ​ວິ​ດີ​ໂອ."</string>
-    <string name="description_start_voice_search" msgid="8380022725973015261">"ເລີ່ມການຊອກຫາດ້ວຍສຽງ"</string>
-    <string name="voicemail" msgid="8899540969000957954">"ຂໍ້ຄວາມສຽງ"</string>
-    <string name="description_cancel_multi_select" msgid="3930475950253360461">"ຍົກເລີກໂໝດຄຳສັ່ງເປັນຊຸດ"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"ລຶບ"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"ຍົກເລີກ"</string>
-    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"ເລືອກ <xliff:g id="NUMBER">%1$s</xliff:g> ລາຍການແລ້ວ"</string>
-    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
-      <item quantity="other">"<b>"ລຶບຂໍ້ຄວາມສຽງເຫຼົ່ານີ້ບໍ? "</b>"</item>
-      <item quantity="one">"<b>"ລຶບຂໍ້ຄວາມສຽງນີ້ບໍ? "</b>"</item>
-    </plurals>
-    <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
-    <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> ເວລາ <xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
-    <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="voice_search_not_available" msgid="6546240433719732905">"ບໍ່​ມີ​ການ​ຊອກ​ຫາ​ດ້ວຍ​ສຽງ​ຢູ່"</string>
-    <string name="dialer_hint_find_contact" msgid="2023214799381149808">"ຊອກຫາລາຍຊື່ຜູ່ຕິດຕໍ່"</string>
-    <string name="block_number_search_hint" msgid="5377706079015099416">"ເພີ່ມ​ເບີ​ໂທ​ລະ​ສັບ ຫຼື ຊອກ​ຫາ​ລາຍ​ຊື່​ຕິດ​ຕໍ່"</string>
-    <string name="call_log_all_empty" msgid="3955572868518162004">"ປະ​ຫວັດ​ການ​ໂທ​ຂອງ​ທ່ານ​ຫວ່າງ​ເປົ່າ"</string>
-    <string name="call_log_all_empty_action" msgid="852218280136243014">"​ໂທ​ອອກ"</string>
-    <string name="call_log_missed_empty" msgid="7094936030845062214">"ທ່ານບໍ່ມີສາຍທີ່ບໍ່ໄດ້ຮັບ."</string>
-    <string name="call_log_voicemail_empty" msgid="273623903423275178">"ກ່ອງເຂົ້າ​ຂໍ້​ຄວາມ​ສຽງ​ຂອງ​ທ່ານ​ຫວ່າງ​ເປົ່າ."</string>
-    <string name="call_log_activity_title" msgid="1275242727244945527">"ປະຫວັດການໂທ"</string>
-    <string name="call_log_all_title" msgid="6042262422192020327">"ທັງໝົດ"</string>
-    <string name="call_log_missed_title" msgid="17254005889268015">"ສາຍທີ່ບໍ່ໄດ້ຮັບ"</string>
-    <string name="tab_speed_dial" msgid="6616404752227561075">"ການ​ໂທ​ດ່ວນ"</string>
-    <string name="tab_history" msgid="7420269368689503596">"ປະຫວັດການໂທ"</string>
-    <string name="tab_all_contacts" msgid="5531733977693943015">"ລາຍ​ຊື່​ຜູ່​ຕິດ​ຕໍ່"</string>
-    <string name="tab_voicemail" msgid="2458548090088316246">"ຂໍ້ຄວາມສຽງ"</string>
-    <string name="search_shortcut_call_number" msgid="8847918845036880688">"ໂທ​ຫາ <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"ສ້າງລາຍຊື່ຜູ້ຕິດຕໍ່ໃໝ່"</string>
-    <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"ເພີ່ມ​ໃສ່​ລາຍ​ຊື່"</string>
-    <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"ສົ່ງ SMS"</string>
-    <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"​ໂທ​ອອກ​ດ້ວຍ​ວິ​ດີ​ໂອ"</string>
-    <string name="search_shortcut_block_number" msgid="4587283230665805776">"ບ​ລັອກ​ໝາຍ​ເລກ"</string>
-    <string name="speed_dial_empty" msgid="3346406399966039505">"ບໍ່​ມີ​ຜູ້​ໃດ​ຢູ່​ໃນ​ການ​ໂທ​ດ່ວນ​ຂອງ​ທ່ານ​ເທື່ອ"</string>
-    <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"ເພີ່ມ​ລາຍ​ການ​ທີ່​ມັກ"</string>
-    <string name="remove_contact" msgid="2353580570488923668">"​ລຶບ​ອອກ"</string>
-    <string name="select_all" msgid="408601760696146245">"ເລືອກທັງໝົດ"</string>
-    <string name="call_log_action_video_call" msgid="7565549950343850819">"​ໂທ​ດ້ວຍ​ວິ​ດີ​ໂອ"</string>
-    <string name="call_log_action_send_message" msgid="6948727362660115554">"ສົ່ງຂໍ້ຄວາມ"</string>
-    <string name="call_log_action_details" msgid="2091370737371449501">"ລາຍລະອຽດ​ການໂທ"</string>
-    <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"ສົ່ງໄປ ..."</string>
-    <string name="call_log_action_call" msgid="682724094251540583">"ໂທຫາ <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_incoming_missed_call" msgid="8292535799379230029">"ສາຍ​ບໍ່​ໄດ້​ຮັບ​ຈາກ <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_incoming_answered_call" msgid="3920182963103160610">"ຮັບ​ສາຍ​ໂທ​ຈາກ <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_unread_voicemail" msgid="145170985013419170">"ຂໍ້​ຄວາມ​ສຽງ​ບໍ່​ໄດ້​ອ່ານ​ຈາກ <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_read_voicemail" msgid="5585559881573227732">"ຂໍ້​ຄວາມ​ສຽງ​ຈາກ <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_outgoing_call" msgid="543952487882919924">"ໂທ​ຫາ <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="call_log_via_number" msgid="1340307109806397650">"ຜ່ານ <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> ຜ່ານ <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="description_call_action" msgid="4042796498169106545">"ໂທ​ຫາ <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_video_call_action" msgid="1237090968588659650">"ການ​ໂທວິ​ດີ​ໂອ <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
-    <string name="description_voicemail_action" msgid="3290143432403538524">"​ຟັງ​ຂໍ້​ຄວາມ​ສຽງ​ຈາກ <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_create_new_contact_action" msgid="1928282350281564130">"ສ້າງ​ລາຍ​ຊື່​ສຳ​ລັບ <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"ເພີ່ມ <xliff:g id="NAMEORNUMBER">^1</xliff:g> ໃສ່​ລາຍ​ຊື່​ທີ່​ມີ​ຢູ່"</string>
-    <string name="description_details_action" msgid="2061866409737706174">"ລາຍລະອຽດ​ການ​ໂທ​ສຳລັບ <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="call_log_header_today" msgid="1576119097475845293">"ມື້ນີ້"</string>
-    <string name="call_log_header_yesterday" msgid="5616077776205329563">"ມື້​ວານ​ນີ້"</string>
-    <string name="call_log_header_other" msgid="4940676886254217644">"ເກົ່າກວ່າ"</string>
-    <string name="voicemail_speaker_on" msgid="3151333608926996668">"ເປີດ​ລຳໂພງ."</string>
-    <string name="voicemail_speaker_off" msgid="2530064206962034201">"ປິດ​ລຳໂພງ."</string>
-    <string name="voicemail_play_start_pause" msgid="3874823480278334664">"ເລີ່ມຫຼືຢຸດ​ການ​ຫຼິ້ນຊົ່ວຄາວ."</string>
-    <string name="display_options_title" msgid="3880091801055797975">"ຕົວເລືອກການສະແດງຜົນ"</string>
-    <string name="sounds_and_vibration_title" msgid="3075050000721181384">"ສຽງ ແລະ ການສັ່ນ"</string>
-    <string name="accessibility_settings_title" msgid="3329027650429831820">"​ການ​ຊ່ວຍ​ເຂົ້າ​ເຖິງ"</string>
-    <string name="ringtone_title" msgid="8377174189894648486">"ຣິງໂທນໂທລະສັບ"</string>
-    <string name="vibrate_on_ring_title" msgid="631441314790960485">"ສັ່ນ​ເຕືອນ​ເມື່ອ​ມີ​ການ​ໂທ​ເຂົ້າ"</string>
-    <string name="dtmf_tone_enable_title" msgid="3273762431523939277">"ສຽງແປ້ນກົດ"</string>
-    <string name="dtmf_tone_length_title" msgid="534096029202438539">"ຄວາມຍາວສຽງແປ້ນກົດ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="applicationLabel">ໂທລະສັບ</string>
+  <string name="launcherDialpadActivityLabel">ແປ້ນກົດໂທລະສັບ</string>
+  <string name="callHistoryIconLabel">ປະຫວັດການໂທ</string>
+  <string name="action_copy_number_text">ອັດ​ສຳ​ເນົາ​ໝາຍເລກ</string>
+  <string name="copy_transcript_text">ອັດ​ສຳ​ເນົາ​ການ​ກ່າຍ​ເປັນ​ໜັງ​ສື</string>
+  <string name="action_edit_number_before_call">ແກ້ໄຂໝາຍເລກກ່ອນໂທ</string>
+  <string name="call_log_delete_all">ລຶບ​ປະ​ຫວັດ​ການ​ໂທ​</string>
+  <string name="call_log_trash_voicemail">ລຶບຂໍ້ຄວາມສຽງ</string>
+  <string name="snackbar_voicemail_deleted">ລຶບ​ຂໍ້​ຄວາມ​ສຽງ​ແລ້ວ</string>
+  <string name="clearCallLogConfirmation_title">ລຶບ​ປະ​ຫວັດ​ການ​ໂທ​ບໍ?</string>
+  <string name="clearCallLogConfirmation">ອັນ​ນີ້​ຈະ​ລຶບ​ທຸກ​ສາຍ​ໂທ​ຈາກ​ປະ​ຫວັດ​ຂອງ​ທ່ານ</string>
+  <string name="clearCallLogProgress_title">ກຳ​ລັງ​ລຶບ​ປະ​ຫວັດ​ການ​ໂທ…</string>
+  <string name="notification_missedCallTitle">ສາຍທີ່ບໍ່ໄດ້ຮັບ</string>
+  <string name="notification_missedWorkCallTitle">ສາຍບໍ່ໄດ້ຮັບຈາກບ່ອນເຮັດວຽກ</string>
+  <string name="notification_missedCallsTitle">ສາຍທີ່ບໍ່ໄດ້ຮັບ</string>
+  <string name="notification_missedCallsMsg">%d ສາຍບໍ່ໄດ້ຮັບ</string>
+  <string name="notification_missedCall_call_back">ໂທກັບ</string>
+  <string name="notification_missedCall_message">ຂໍ້ຄວາມ</string>
+  <string name="post_call_notification_message">%1$s: %2$s</string>
+  <string name="notification_voicemail_text_format">ໂທຫາ %s</string>
+  <string name="notification_voicemail_no_vm_number">ບໍ່ຮູ້ຈັກເບີຂໍ້ຄວາມສຽງ</string>
+  <plurals name="notification_voicemail_title">
+    <item quantity="one">ຂໍ້ຄວາມສຽງ</item>
+    <item quantity="other"> %1$d ຂໍ້ຄວາມສຽງ </item>
+  </plurals>
+  <string name="notification_voicemail_callers_list">%1$s, %2$s</string>
+  <string name="notification_new_voicemail_ticker">ບໍ່ມີຂໍ້ຄວາມສຽງຈາກ %1$s</string>
+  <string name="voicemail_playback_error">ບໍ່​ສາ​ມາດ​ຫຼິ້ນ​ຂໍ້​ຄວາມ​ສຽງ​ໄດ້</string>
+  <string name="voicemail_fetching_content">ກຳ​ລັງ​ໂຫຼດ​ຂໍ້​ຄວາມ​ສຽງ…</string>
+  <string name="voicemail_fetching_timout">ບໍ່​ສາ​ມາດ​ໂຫຼດ​ຂໍ້​ຄວາມ​ສຽງ​ໄດ້</string>
+  <string name="call_log_item_count_and_date">(%1$d) %2$s</string>
+  <string name="description_playback_speakerphone">​ປິດຫຼື​ເປີດ​ລຳ​ໂພງ​ມື​ຖື</string>
+  <string name="description_playback_seek">​ຊອກ​ຫາ​ຕຳ​​ແໜ່ງ​ຫຼິ້ນ</string>
+  <string name="action_menu_call_history_description">ປະຫວັດການໂທ</string>
+  <string msgid="2295659037509008453" name="action_menu_overflow_description">ໂຕເລືອກເພີ່ມເຕີມ</string>
+  <string name="action_menu_dialpad_button">ແປ້ນກົດ</string>
+  <string name="dialer_settings_label">ການ​ຕັ້ງ​ຄ່າ</string>
+  <string name="simulator_submenu_label">ຕົວຈຳລອງ</string>
+  <string name="new_ui_launcher_shortcut_label">ສ້າງປຸ່ມລັດສ່ວນຕິດຕໍ່ຜູ້ໃຊ້ໃໝ່</string>
+  <string name="description_entering_bulk_action_mode">ກຳລັງເຂົ້າໂໝດຄຳສັ່ງຈຳນວນຫຼາຍ</string>
+  <string name="description_leaving_bulk_action_mode">ອອກຈາກໂໝດຄຳສັ່ງຈຳນວນຫຼາຍແລ້ວ</string>
+  <string name="description_selecting_bulk_action_mode">ເລືອກ %1$s ແລ້ວ</string>
+  <string name="description_unselecting_bulk_action_mode">ເຊົາເລືອກ %1$s ແລ້ວ</string>
+  <string name="description_contact_details">ລາຍລະອຽດ​ລາຍຊື່​ຜູ່ຕິດຕໍ່​ສຳລັບ %1$s</string>
+  <string name="description_spam_contact_details">ລາຍລະອຽດການຕິດຕໍ່ສຳລັບຜູ້ໂທທີ່ສົງໄສວ່າເປັນສະແປມ %1$s</string>
+  <string name="description_num_calls">%1$s ການໂທ.</string>
+  <string name="description_video_call">ການ​ໂທ​ດ້ວຍ​ວິ​ດີ​ໂອ.</string>
+  <string name="description_start_voice_search">ເລີ່ມການຊອກຫາດ້ວຍສຽງ</string>
+  <string name="voicemail">ຂໍ້ຄວາມສຽງ</string>
+  <string name="description_cancel_multi_select">ຍົກເລີກໂໝດຄຳສັ່ງເປັນຊຸດ</string>
+  <string name="voicemailMultiSelectDeleteConfirm">ລຶບ</string>
+  <string name="voicemailMultiSelectDeleteCancel">ຍົກເລີກ</string>
+  <string name="voicemailMultiSelectActionBarTitle">ເລືອກ %1$s ລາຍການແລ້ວ</string>
+  <plurals name="delete_voicemails_confirmation_dialog_title">
+    <item quantity="one"><b>ລຶບຂໍ້ຄວາມສຽງນີ້ບໍ? </b></item>
+    <item quantity="other"><b>ລຶບຂໍ້ຄວາມສຽງເຫຼົ່ານີ້ບໍ? </b></item>
+  </plurals>
+  <string name="voicemailCallLogToday">@string/call_log_header_today</string>
+  <string name="voicemailCallLogDateTimeFormat">%1$s ເວລາ %2$s</string>
+  <string name="voicemailDurationFormat">%1$02d:%2$02d</string>
+  <string name="voicemailCallLogDateTimeFormatWithDuration">%1$s • %2$s</string>
+  <string name="voice_search_not_available">ບໍ່​ມີ​ການ​ຊອກ​ຫາ​ດ້ວຍ​ສຽງ​ຢູ່</string>
+  <string name="dialer_hint_find_contact">ຊອກຫາລາຍຊື່ຜູ່ຕິດຕໍ່</string>
+  <string name="block_number_search_hint">ເພີ່ມ​ເບີ​ໂທ​ລະ​ສັບ ຫຼື ຊອກ​ຫາ​ລາຍ​ຊື່​ຕິດ​ຕໍ່</string>
+  <string name="call_log_all_empty">ປະ​ຫວັດ​ການ​ໂທ​ຂອງ​ທ່ານ​ຫວ່າງ​ເປົ່າ</string>
+  <string name="call_log_all_empty_action">​ໂທ​ອອກ</string>
+  <string name="call_log_missed_empty">ທ່ານບໍ່ມີສາຍທີ່ບໍ່ໄດ້ຮັບ.</string>
+  <string name="call_log_voicemail_empty">ກ່ອງເຂົ້າ​ຂໍ້​ຄວາມ​ສຽງ​ຂອງ​ທ່ານ​ຫວ່າງ​ເປົ່າ.</string>
+  <string name="call_log_activity_title">ປະຫວັດການໂທ</string>
+  <string name="call_log_all_title">ທັງໝົດ</string>
+  <string name="call_log_missed_title">ສາຍທີ່ບໍ່ໄດ້ຮັບ</string>
+  <string name="tab_speed_dial">ການ​ໂທ​ດ່ວນ</string>
+  <string name="tab_history">ປະຫວັດການໂທ</string>
+  <string name="tab_all_contacts">ລາຍ​ຊື່​ຜູ່​ຕິດ​ຕໍ່</string>
+  <string name="tab_voicemail">ຂໍ້ຄວາມສຽງ</string>
+  <string name="search_shortcut_call_number">ໂທ​ຫາ %s</string>
+  <string name="search_shortcut_create_new_contact">ສ້າງລາຍຊື່ຜູ້ຕິດຕໍ່ໃໝ່</string>
+  <string name="search_shortcut_add_to_contact">ເພີ່ມ​ໃສ່​ລາຍ​ຊື່</string>
+  <string name="search_shortcut_send_sms_message">ສົ່ງ SMS</string>
+  <string name="search_shortcut_make_video_call">​ໂທ​ອອກ​ດ້ວຍ​ວິ​ດີ​ໂອ</string>
+  <string name="search_shortcut_block_number">ບ​ລັອກ​ໝາຍ​ເລກ</string>
+  <string name="speed_dial_empty">ບໍ່​ມີ​ຜູ້​ໃດ​ຢູ່​ໃນ​ການ​ໂທ​ດ່ວນ​ຂອງ​ທ່ານ​ເທື່ອ</string>
+  <string name="speed_dial_empty_add_favorite_action">ເພີ່ມ​ລາຍ​ການ​ທີ່​ມັກ</string>
+  <string name="remove_contact">​ລຶບ​ອອກ</string>
+  <string name="select_all">ເລືອກທັງໝົດ</string>
+  <string name="call_log_action_video_call">​ໂທ​ດ້ວຍ​ວິ​ດີ​ໂອ</string>
+  <string name="call_log_action_set_up_video">ຕັ້ງຄ່າການໂທວິດີໂອ</string>
+  <string name="call_log_action_invite_video">ເຊີນເຂົ້າຮ່ວມການໂທວິດີໂອ</string>
+  <string name="call_log_action_send_message">ສົ່ງຂໍ້ຄວາມ</string>
+  <string name="call_log_action_details">ລາຍລະອຽດ​ການໂທ</string>
+  <string name="call_log_action_share_voicemail">ສົ່ງໄປ ...</string>
+  <string name="call_log_action_call">ໂທຫາ ^1</string>
+  <string name="description_incoming_missed_call">ສາຍ​ບໍ່​ໄດ້​ຮັບ​ຈາກ ^1, ^2, ^3, ^4.</string>
+  <string name="description_incoming_answered_call">ຮັບ​ສາຍ​ໂທ​ຈາກ ^1, ^2, ^3, ^4.</string>
+  <string name="description_unread_voicemail">ຂໍ້​ຄວາມ​ສຽງ​ບໍ່​ໄດ້​ອ່ານ​ຈາກ ^1, ^2, ^3, ^4.</string>
+  <string name="description_read_voicemail">ຂໍ້​ຄວາມ​ສຽງ​ຈາກ ^1, ^2, ^3, ^4.</string>
+  <string name="description_outgoing_call">ໂທ​ຫາ ^1, ^2, ^3, ^4.</string>
+  <string name="call_log_via_number">ຜ່ານ %1$s</string>
+  <string name="call_log_via_number_phone_account">%1$s ຜ່ານ %2$s</string>
+  <string name="description_call_action">ໂທ​ຫາ ^1</string>
+  <string name="description_video_call_action">ການ​ໂທວິ​ດີ​ໂອ ^1.</string>
+  <string name="description_voicemail_action">​ຟັງ​ຂໍ້​ຄວາມ​ສຽງ​ຈາກ ^1</string>
+  <string name="description_create_new_contact_action">ສ້າງ​ລາຍ​ຊື່​ສຳ​ລັບ ^1</string>
+  <string name="description_add_to_existing_contact_action">ເພີ່ມ ^1 ໃສ່​ລາຍ​ຊື່​ທີ່​ມີ​ຢູ່</string>
+  <string name="description_details_action">ລາຍລະອຽດ​ການ​ໂທ​ສຳລັບ ^1</string>
+  <string name="call_log_header_today">ມື້ນີ້</string>
+  <string name="call_log_header_yesterday">ມື້​ວານ​ນີ້</string>
+  <string name="call_log_header_other">ເກົ່າກວ່າ</string>
+  <string name="voicemail_speaker_on">ເປີດ​ລຳໂພງ.</string>
+  <string name="voicemail_speaker_off">ປິດ​ລຳໂພງ.</string>
+  <string name="voicemail_play_start_pause">ເລີ່ມຫຼືຢຸດ​ການ​ຫຼິ້ນຊົ່ວຄາວ.</string>
+  <string name="display_options_title">ຕົວເລືອກການສະແດງຜົນ</string>
+  <string name="sounds_and_vibration_title">ສຽງ ແລະ ການສັ່ນ</string>
+  <string name="accessibility_settings_title">​ການ​ຊ່ວຍ​ເຂົ້າ​ເຖິງ</string>
+  <string name="ringtone_title">ຣິງໂທນໂທລະສັບ</string>
+  <string name="vibrate_on_ring_title">ສັ່ນ​ເຕືອນ​ເມື່ອ​ມີ​ການ​ໂທ​ເຂົ້າ</string>
+  <string name="dtmf_tone_enable_title">ສຽງແປ້ນກົດ</string>
+  <string name="dtmf_tone_length_title">ຄວາມຍາວສຽງແປ້ນກົດ</string>
   <string-array name="dtmf_tone_length_entries">
-    <item msgid="3136353015227162823">"ປົກ​ກ​ະ​ຕິ"</item>
-    <item msgid="5376841175538523822">"ຍາວ"</item>
+    <item>ປົກ​ກ​ະ​ຕິ</item>
+    <item>ຍາວ</item>
   </string-array>
-    <string name="respond_via_sms_setting_title" msgid="8008181606657693452">"ຕອບກັບດ່ວນ"</string>
-    <string name="call_settings_label" msgid="7824611757200960807">"​ການ​ໂທ"</string>
-    <string name="manage_blocked_numbers_label" msgid="16823761991832273">"ການບລັອກສາຍ"</string>
-    <string name="voicemail_settings_label" msgid="4594299554519920570">"ຂໍ້ຄວາມສຽງ"</string>
-    <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"ການບ​ລັອກ​ສາຍ​ໂທ​ປິດ​ຊົ່ວ​ຄາວ"</string>
-    <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"ການບ​ລັອກ​ສາຍ​ໂທ​ຖືກ​ປິດ​ໃຊ້​ງານ​ແລ້ວ ເພາະ​ວ່າ​ທ່ານ​ໄດ້​ຕິດ​ຕໍ່​ຫາ​ຝ່າຍ​ບໍ​ລິ​ການ​ສຸກ​ເສີນ​ຈາກ​ໂທ​ລະ​ສັບ​ນີ້​ພາຍ​ໃນ 48 ຊົ່ວ​ໂມງ​ສຸດ​ທ້າຍ. ມັນ​ຈະ​ຖືກ​ເປີດ​ໃຊ້​ງານ​ອີກ​ໂດຍ​ອັດ​ຕະ​ໂນ​ມັດ ເມື່ອ​ໝົດ​ໄລ​ຍະ 48 ຊົ່ວ​ໂມງ​ໄປ​ແລ້ວ."</string>
-    <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"ນຳ​ຕົວ​ເລກ​ເຂົ້າ"</string>
-    <string name="blocked_call_settings_import_description" msgid="1819412052545228965">"ຜ່ານ​ມາ​ທ່ານ​ໄດ້​ໝາຍ​ຜູ້​ໂທ​ບາງ​ຄົນ​ໃຫ້​ຖືກ​ສົ່ງ​​ຫາ​ຂໍ້​ຄວາມ​ສຽງໂດຍ​ອັດ​ຕະ​ໂນ​ມັດ​ຜ່ານ​ແອັບ​ອື່ນ​."</string>
-    <string name="blocked_call_settings_view_numbers_button" msgid="3332727948554356704">"ເບິ່ງ​ຕົວ​ເລກ"</string>
-    <string name="blocked_call_settings_import_button" msgid="7319111700387470727">"ນໍາເຂົ້າ"</string>
-    <string name="description_blocked_number_list_delete" msgid="2139644216858370740">"ປົດ​ບ​ລັອກ​ໝາຍ​ເລກ"</string>
-    <string name="addBlockedNumber" msgid="3053473735238295551">"ເພີ່ມໝາຍເລກ"</string>
-    <string name="block_number_footer_message_vvm" msgid="7955326304033982368">"ການໂທຈາກເບີໂທເຫຼົ່ານີ້ຈະຖືກບລັອກໄວ້ ແລະຂໍ້ຄວາມສຽງຈະຖືກລຶບໂດຍອັດຕະໂນມັດ."</string>
-    <string name="block_number_footer_message_no_vvm" msgid="1152684139070471665">"ການໂທຈາກເບີໂທເຫຼົ່ານີ້ຈະຖືກບລັອກໄວ້, ແຕ່ພວກເຂົາອາດຈະຍັງສາມາດຝາກຂໍ້ຄວາມສຽງໃຫ້ທ່ານໄດ້."</string>
-    <string name="block_list" msgid="4701585783411870782">"ເບີໂທລະສັບທີ່ບລັອກໄວ້"</string>
-    <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g> ຖືກ​ບ​ລັອກ​ແລ້ວ."</string>
-    <string name="phone_account_settings_label" msgid="8372485478006965920">"ບັນ​ຊີ​ໂທ"</string>
-    <string name="permission_no_speeddial" msgid="8487215628510596753">"ເພື່ອ​ເປີດ​ໃຊ້​ງານ​ການໂທດ່ວນ, ເປີດ​ການ​ອະ​ນຸ​ຍາດ​ລາຍ​ຊື່."</string>
-    <string name="permission_no_calllog" msgid="4053705651238775784">"ເພື່ອ​ເບິ່ງ​ບັນ​ທຶກ​ການ​ໂທ​ຂອງ​ທ່ານ, ເປີດ​ການ​ອະ​ນຸ​ຍາດ​ໂທ​ລະ​ສັບ."</string>
-    <string name="permission_no_search" msgid="2424710404207193826">"ເພື່ອຄົ້ນຫາລາຍາຊື່ຂອງທ່ານ, ໃຫ້ເປີດການອະນຸຍາດລາຍຊື່."</string>
-    <string name="permission_place_call" msgid="8686908130349369423">"ເພື່ອ​ເຮັດການໂທ, ເປີດ​ການ​ອະ​ນຸ​ຍາດ​ໂທ​ລະ​ສັບ."</string>
-    <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"ແອັບໂທລະສັບບໍ່ມີການອະນຸຍາດໃຫ້ຂຽນໃສ່ການຕັ້ງຄ່າລະບົບ."</string>
-    <string name="blocked_number_call_log_label" msgid="4212282846299997693">"ບລັອກ​ແລ້ວ"</string>
-    <string name="call_log_action_block_report_number" msgid="7302636538668696729">"ບລັອກ/ລາຍງານສະແປມ"</string>
-    <string name="call_log_action_block_number" msgid="5048188386501998865">"ບ​ລັອກ​ໝາຍ​ເລກ"</string>
-    <string name="call_log_action_remove_spam" msgid="2045319806318398403">"ບໍ່ແມ່ນສະແປມ"</string>
-    <string name="call_log_action_unblock_number" msgid="6100117033288448758">"ປົດ​ບ​ລັອກ​ໝາຍ​ເລກ"</string>
-    <string name="spam_number_call_log_label" msgid="2678431398326811131">"ສະແປມ"</string>
-    <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> ອອບລາຍຢູ່ ແລະ ບໍ່ສາມາດຕິດຕໍ່ຫາໄດ້"</string>
-    <string name="about_phone_label" msgid="582991354677973731">"ກ່ຽວກັບ"</string>
-    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"ຖອດຂໍ້ຄວາມໂດຍ Google"</string>
-    <string name="voicemail_transcription_in_progress" msgid="2933320969613783210">"Google ກຳລັງຖອດຂໍ້ຄວາມ..."</string>
-    <string name="voicemail_transcription_failed" msgid="335275303117412706">"ບໍ່ມີການຖອດຂໍ້ຄວາມ."</string>
-    <string name="voicemail_transcription_failed_language_not_supported" msgid="4210332591050562553">"ບໍ່ສາມາດຖອດຂໍ້ຄວາມໄດ້. ບໍ່ຮອງຮັບພາສາ."</string>
-    <string name="voicemail_transcription_failed_no_speech" msgid="9093372879697874852">"ບໍ່ສາມາດຖອດຂໍ້ຄວາມໄດ້. ບໍ່ພົບການເວົ້າ."</string>
-    <string name="view_conversation" msgid="7895904782094119702">"ເບິ່ງ"</string>
-    <string name="ec_data_deleted" msgid="4794880345545827107">"ລຶບການໂທແລ້ວ. ເບິ່ງ ແລະ ລຶບໄຟລ໌ແນບທີ່ແບ່ງປັນໃນລະຫວ່າງການໂທນີ້ຢູ່ Messages ໄດ້."</string>
-    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"ລຶບການໂທແລ້ວ. ເບິ່ງ ແລະ ລຶບໄຟລ໌ແນບທີ່ແບ່ງປັນໃນລະຫວ່າງການໂທຕ່າງໆຢູ່ Messages ໄດ້."</string>
+  <string name="respond_via_sms_setting_title">ຕອບກັບດ່ວນ</string>
+  <string name="call_settings_label">​ການ​ໂທ</string>
+  <string name="manage_blocked_numbers_label">ໝາຍເລກທີ່ບລັອກແລ້ວ</string>
+  <string name="voicemail_settings_label">ຂໍ້ຄວາມສຽງ</string>
+  <string name="blocked_numbers_disabled_emergency_header_label">ການບ​ລັອກ​ສາຍ​ໂທ​ປິດ​ຊົ່ວ​ຄາວ</string>
+  <string name="blocked_numbers_disabled_emergency_desc">ການບ​ລັອກ​ສາຍ​ໂທ​ຖືກ​ປິດ​ໃຊ້​ງານ​ແລ້ວ ເພາະ​ວ່າ​ທ່ານ​ໄດ້​ຕິດ​ຕໍ່​ຫາ​ຝ່າຍ​ບໍ​ລິ​ການ​ສຸກ​ເສີນ​ຈາກ​ໂທ​ລະ​ສັບ​ນີ້​ພາຍ​ໃນ 48 ຊົ່ວ​ໂມງ​ສຸດ​ທ້າຍ. ມັນ​ຈະ​ຖືກ​ເປີດ​ໃຊ້​ງານ​ອີກ​ໂດຍ​ອັດ​ຕະ​ໂນ​ມັດ ເມື່ອ​ໝົດ​ໄລ​ຍະ 48 ຊົ່ວ​ໂມງ​ໄປ​ແລ້ວ.</string>
+  <string name="import_send_to_voicemail_numbers_label">ນຳ​ຕົວ​ເລກ​ເຂົ້າ</string>
+  <string name="blocked_call_settings_import_description">ຜ່ານ​ມາ​ທ່ານ​ໄດ້​ໝາຍ​ຜູ້​ໂທ​ບາງ​ຄົນ​ໃຫ້​ຖືກ​ສົ່ງ​​ຫາ​ຂໍ້​ຄວາມ​ສຽງໂດຍ​ອັດ​ຕະ​ໂນ​ມັດ​ຜ່ານ​ແອັບ​ອື່ນ​.</string>
+  <string name="blocked_call_settings_view_numbers_button">ເບິ່ງ​ຕົວ​ເລກ</string>
+  <string name="blocked_call_settings_import_button">ນໍາເຂົ້າ</string>
+  <string name="description_blocked_number_list_delete">ປົດ​ບ​ລັອກ​ໝາຍ​ເລກ</string>
+  <string name="addBlockedNumber">ເພີ່ມໝາຍເລກ</string>
+  <string name="block_number_footer_message_vvm">ການໂທຈາກເບີໂທເຫຼົ່ານີ້ຈະຖືກບລັອກໄວ້ ແລະຂໍ້ຄວາມສຽງຈະຖືກລຶບໂດຍອັດຕະໂນມັດ.</string>
+  <string name="block_number_footer_message_no_vvm">ການໂທຈາກເບີໂທເຫຼົ່ານີ້ຈະຖືກບລັອກໄວ້, ແຕ່ພວກເຂົາອາດຈະຍັງສາມາດຝາກຂໍ້ຄວາມສຽງໃຫ້ທ່ານໄດ້.</string>
+  <string name="block_list">ເບີໂທລະສັບທີ່ບລັອກໄວ້</string>
+  <string name="alreadyBlocked">%1$s ຖືກ​ບ​ລັອກ​ແລ້ວ.</string>
+  <string name="phone_account_settings_label">ບັນ​ຊີ​ໂທ</string>
+  <string name="permission_no_speeddial">ເພື່ອ​ເປີດ​ໃຊ້​ງານ​ການໂທດ່ວນ, ເປີດ​ການ​ອະ​ນຸ​ຍາດ​ລາຍ​ຊື່.</string>
+  <string name="permission_no_calllog">ເພື່ອ​ເບິ່ງ​ບັນ​ທຶກ​ການ​ໂທ​ຂອງ​ທ່ານ, ເປີດ​ການ​ອະ​ນຸ​ຍາດ​ໂທ​ລະ​ສັບ.</string>
+  <string name="permission_no_search">ເພື່ອຄົ້ນຫາລາຍາຊື່ຂອງທ່ານ, ໃຫ້ເປີດການອະນຸຍາດລາຍຊື່.</string>
+  <string name="permission_place_call">ເພື່ອ​ເຮັດການໂທ, ເປີດ​ການ​ອະ​ນຸ​ຍາດ​ໂທ​ລະ​ສັບ.</string>
+  <string name="toast_cannot_write_system_settings">ແອັບໂທລະສັບບໍ່ມີການອະນຸຍາດໃຫ້ຂຽນໃສ່ການຕັ້ງຄ່າລະບົບ.</string>
+  <string name="blocked_number_call_log_label">ບລັອກ​ແລ້ວ</string>
+  <string name="call_log_action_block_report_number">ບລັອກ/ລາຍງານສະແປມ</string>
+  <string name="call_log_action_block_number">ບ​ລັອກ​ໝາຍ​ເລກ</string>
+  <string name="call_log_action_remove_spam">ບໍ່ແມ່ນສະແປມ</string>
+  <string name="call_log_action_unblock_number">ປົດ​ບ​ລັອກ​ໝາຍ​ເລກ</string>
+  <string name="spam_number_call_log_label">ສະແປມ</string>
+  <string name="call_composer_connection_failed">%1$s ອອບລາຍຢູ່ ແລະ ບໍ່ສາມາດຕິດຕໍ່ຫາໄດ້</string>
+  <string name="about_phone_label">ກ່ຽວກັບ</string>
+  <string name="voicemail_transcription_branding_text">ຖອດຂໍ້ຄວາມໂດຍ Google</string>
+  <string name="voicemail_transcription_in_progress">ກຳລັງຖອດຂໍ້ຄວາມ...</string>
+  <string name="voicemail_transcription_failed">ບໍ່ມີການຖອດຂໍ້ຄວາມ.</string>
+  <string name="voicemail_transcription_failed_language_not_supported">ບໍ່ສາມາດຖອດຂໍ້ຄວາມໄດ້. ບໍ່ຮອງຮັບພາສາ.</string>
+  <string name="voicemail_transcription_failed_no_speech">ບໍ່ສາມາດຖອດຂໍ້ຄວາມໄດ້. ບໍ່ພົບການເວົ້າ.</string>
+  <string name="voicemail_donation_promo_title">ຊ່ວຍປັບປຸງຄວາມຖືກຕ້ອງໃນການຖອດຂໍ້ຄວາມ?</string>
+  <string name="voicemail_donation_promo_content">ອະນຸຍາດໃຫ້ Google ກວດສອບຂໍ້ຄວາມສຽງນີ້ ແລະ ຂໍ້ຄວາມສຽງໃນອະນາຄົດດ້ວຍການຖອດຂໍ້ຄວາມ. ພວກມັນຈະຖືກເກັບໄວ້ໂດຍບໍ່ລະບຸຊື່. ທ່ານສາມາດປ່ຽນການຕັ້ງຄ່ານີ້ໄດ້ທຸກເວລາ. %1$s</string>
+  <string name="voicemail_donation_promo_opt_in">ແມ່ນ, ຂ້ອຍເຂົ້າຮ່ວມ</string>
+  <string name="voicemail_donation_promo_opt_out">ບໍ່, ຂອບໃຈ</string>
+  <string name="voicemail_transcription_rating">ໃຫ້ຄະແນນຄຸນນະພາບການຖອດຂໍ້ຄວາມ</string>
+  <string name="voicemail_transcription_rating_thanks">ຂໍຂອບໃຈສຳລັບຄຳເຫັນຕິຊົມຂອງທ່ານ</string>
+  <string name="description_rating_good">ຖືກໃຈ</string>
+  <string name="description_rating_bad">ບໍ່ຖືກໃຈ</string>
+  <string name="view_conversation">ເບິ່ງ</string>
+  <string name="ec_data_deleted">ລຶບການໂທແລ້ວ. ເບິ່ງ ແລະ ລຶບໄຟລ໌ແນບທີ່ແບ່ງປັນໃນລະຫວ່າງການໂທນີ້ຢູ່ Messages ໄດ້.</string>
+  <string name="multiple_ec_data_deleted">ລຶບການໂທແລ້ວ. ເບິ່ງ ແລະ ລຶບໄຟລ໌ແນບທີ່ແບ່ງປັນໃນລະຫວ່າງການໂທຕ່າງໆຢູ່ Messages ໄດ້.</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-lt/strings.xml b/java/com/android/dialer/app/res/values-lt/strings.xml
index eb092f1..4a1d746 100644
--- a/java/com/android/dialer/app/res/values-lt/strings.xml
+++ b/java/com/android/dialer/app/res/values-lt/strings.xml
@@ -1,183 +1,175 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="applicationLabel" msgid="2202739481132958990">"Telefonas"</string>
-    <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"Telefono klaviatūra"</string>
-    <string name="callHistoryIconLabel" msgid="7493268743411968630">"Skambučių istorija"</string>
-    <string name="action_copy_number_text" msgid="832682558551502319">"Kopijuoti numerį"</string>
-    <string name="copy_transcript_text" msgid="937904189017310829">"Kopijuoti transkribuotą tekstą"</string>
-    <string name="action_edit_number_before_call" msgid="8017492815878473837">"Redaguoti numerį prieš skambinant"</string>
-    <string name="call_log_delete_all" msgid="7852970926906523784">"Išvalyti skambučių istoriją"</string>
-    <string name="call_log_trash_voicemail" msgid="6118493534178533972">"Ištrinti balso pašto pranešim."</string>
-    <string name="snackbar_voicemail_deleted" msgid="7463166543725496307">"Balso pšt. ištrintas"</string>
-    <string name="snackbar_voicemail_deleted_undo" msgid="6959743982796409941">"ANULIUOTI"</string>
-    <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"Išvalyti skambučių istoriją?"</string>
-    <string name="clearCallLogConfirmation" msgid="6844949465815109166">"Bus ištrinti visi skambučiai iš istorijos"</string>
-    <string name="clearCallLogProgress_title" msgid="995004835687361977">"Išvaloma skambučių istorija..."</string>
-    <string name="notification_missedCallTitle" msgid="8283366068539898486">"Praleistas skambutis"</string>
-    <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"Praleistas darbo skambutis"</string>
-    <string name="notification_missedCallsTitle" msgid="3697442015345089802">"Praleisti skambučiai"</string>
-    <string name="notification_missedCallsMsg" msgid="8176217633929018706">"Praleistų skambučių: <xliff:g id="NUM_MISSED_CALLS">%d</xliff:g>"</string>
-    <string name="notification_missedCall_call_back" msgid="3875698110051973965">"Perskambinti"</string>
-    <string name="notification_missedCall_message" msgid="5086910028988305964">"Siųsti pranešimą"</string>
-    <string name="post_call_notification_message" msgid="5417476789860590611">"<xliff:g id="NAME">%1$s</xliff:g>: „<xliff:g id="MESSAGE">%2$s</xliff:g>“"</string>
-    <string name="notification_voicemail_text_format" msgid="1895667520930252897">"Rinkti <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
-    <string name="notification_voicemail_no_vm_number" msgid="8942821987929495842">"Nežinomas balso pašto numeris"</string>
-    <plurals name="notification_voicemail_title" formatted="false" msgid="1551847434476438657">
-      <item quantity="one"> <xliff:g id="COUNT">%1$d</xliff:g> balso pašto pranešimas </item>
-      <item quantity="few"> <xliff:g id="COUNT">%1$d</xliff:g> balso pašto pranešimai </item>
-      <item quantity="many"> <xliff:g id="COUNT">%1$d</xliff:g> balso pašto pranešimo </item>
-      <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> balso pašto pranešimų </item>
-    </plurals>
-    <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
-    <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"Nauji b. pašto pran. iš <xliff:g id="CALLER">%1$s</xliff:g>"</string>
-    <string name="voicemail_playback_error" msgid="4384373852257757295">"Nepavyko paleisti balso pašto pranešimo"</string>
-    <string name="voicemail_fetching_content" msgid="572320120918636014">"Įkeliamas balso pašto pranešimas..."</string>
-    <string name="voicemail_fetching_timout" msgid="2128873915839949783">"Nepavyko įkelti balso pašto pranešimo"</string>
-    <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_playback_speakerphone" msgid="4852027754869750227">"Įjungti arba išjungti garsiakalbį"</string>
-    <string name="description_playback_seek" msgid="1340910573254132520">"Ieškoti atkūrimo pozicijos"</string>
-    <string name="action_menu_call_history_description" msgid="8829135306925008546">"Skambučių istorija"</string>
-    <string name="action_menu_overflow_description" msgid="7648679686746517341">"Daugiau parinkčių"</string>
-    <string name="action_menu_dialpad_button" msgid="1970631633457493180">"klaviatūra"</string>
-    <string name="dialer_settings_label" msgid="4980176284150290175">"Nustatymai"</string>
-    <string name="simulator_submenu_label" msgid="186156287346615267">"Simuliatorius"</string>
-    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Sukurti naują NS spart. klav."</string>
-    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"Įjungiamas masinių veiksmų režimas"</string>
-    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"Masinių veiksmų režimas išjungtas"</string>
-    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"Pasirinkta: <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"Pasirinkimas atšauktas: <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_contact_details" msgid="3341280873855253464">"Išsami kontaktinė informacija: <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_spam_contact_details" msgid="5592578752881528368">"Išsami kontaktinė įtartino skambintojo dėl šlamšto informacija: <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_num_calls" msgid="6483594535796216044">"Skambučių: <xliff:g id="NUMBEROFCALLS">%1$s</xliff:g>."</string>
-    <string name="description_video_call" msgid="3738199365585751727">"Vaizdo skambutis."</string>
-    <string name="description_start_voice_search" msgid="8380022725973015261">"Pradėti paiešką balsu"</string>
-    <string name="voicemail" msgid="8899540969000957954">"Balso paštas"</string>
-    <string name="description_cancel_multi_select" msgid="3930475950253360461">"Atšaukti masinių veiksmų režimą"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Ištrinti"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Atšaukti"</string>
-    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"Pasirinkta: <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
-      <item quantity="one">"<b>"Ištrinti šiuos balso pašto pranešimus? "</b>"</item>
-      <item quantity="few">"<b>"Ištrinti šiuos balso pašto pranešimus? "</b>"</item>
-      <item quantity="many">"<b>"Ištrinti šiuos balso pašto pranešimus? "</b>"</item>
-      <item quantity="other">"<b>"Ištrinti šiuos balso pašto pranešimus? "</b>"</item>
-    </plurals>
-    <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
-    <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g>, <xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
-    <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="voice_search_not_available" msgid="6546240433719732905">"Paieška balsu nepasiekiama"</string>
-    <string name="dialer_hint_find_contact" msgid="2023214799381149808">"Ieškoti adresatų"</string>
-    <string name="block_number_search_hint" msgid="5377706079015099416">"Prid. nr. arba iešk. kontaktų"</string>
-    <string name="call_log_all_empty" msgid="3955572868518162004">"Skambučių istorija yra tuščia"</string>
-    <string name="call_log_all_empty_action" msgid="852218280136243014">"Skambinti"</string>
-    <string name="call_log_missed_empty" msgid="7094936030845062214">"Nėra jokių praleistų skambučių."</string>
-    <string name="call_log_voicemail_empty" msgid="273623903423275178">"Balso pašto gautųjų aplankas yra tuščias."</string>
-    <string name="call_log_activity_title" msgid="1275242727244945527">"Skambučių istorija"</string>
-    <string name="call_log_all_title" msgid="6042262422192020327">"Visi"</string>
-    <string name="call_log_missed_title" msgid="17254005889268015">"Praleisti"</string>
-    <string name="tab_speed_dial" msgid="6616404752227561075">"Spartusis rinkimas"</string>
-    <string name="tab_history" msgid="7420269368689503596">"Skambučių istorija"</string>
-    <string name="tab_all_contacts" msgid="5531733977693943015">"Kontaktai"</string>
-    <string name="tab_voicemail" msgid="2458548090088316246">"Balso paštas"</string>
-    <string name="search_shortcut_call_number" msgid="8847918845036880688">"Skambinti <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"Kurti naują kontaktą"</string>
-    <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"Pridėti prie kontakto"</string>
-    <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"Siųsti SMS"</string>
-    <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"Atlikti vaizdo skambutį"</string>
-    <string name="search_shortcut_block_number" msgid="4587283230665805776">"Blokuoti numerį"</string>
-    <string name="speed_dial_empty" msgid="3346406399966039505">"Dar nieko neįtraukėte į sparčiojo rinkimo sąrašą"</string>
-    <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"Pridėti mėgstamiausią"</string>
-    <string name="remove_contact" msgid="2353580570488923668">"Pašalinti"</string>
-    <string name="select_all" msgid="408601760696146245">"Pasirinkti viską"</string>
-    <string name="call_log_action_video_call" msgid="7565549950343850819">"Vaizdo skambutis"</string>
-    <string name="call_log_action_send_message" msgid="6948727362660115554">"Siųsti pranešimą"</string>
-    <string name="call_log_action_details" msgid="2091370737371449501">"Išsami skambučio informacija"</string>
-    <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"Siųsti…"</string>
-    <string name="call_log_action_call" msgid="682724094251540583">"Skambinti <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_incoming_missed_call" msgid="8292535799379230029">"Praleistas skambutis: <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_incoming_answered_call" msgid="3920182963103160610">"Atsakytas skambutis: <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_unread_voicemail" msgid="145170985013419170">"Neskaitytas balso pašto pranešimas: <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_read_voicemail" msgid="5585559881573227732">"Balso pašto pranešimas: <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_outgoing_call" msgid="543952487882919924">"Skambutis: <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="call_log_via_number" msgid="1340307109806397650">"numeriu <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> numeriu <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="description_call_action" msgid="4042796498169106545">"Skambinti <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_video_call_action" msgid="1237090968588659650">"Vaizdo skambutis <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
-    <string name="description_voicemail_action" msgid="3290143432403538524">"Klausyti balso pašto nuo <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_create_new_contact_action" msgid="1928282350281564130">"Sukurti <xliff:g id="NAMEORNUMBER">^1</xliff:g> kontaktą"</string>
-    <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"Pridėti <xliff:g id="NAMEORNUMBER">^1</xliff:g> prie esamo kontakto"</string>
-    <string name="description_details_action" msgid="2061866409737706174">"Išsami skambučio informacija (<xliff:g id="NAMEORNUMBER">^1</xliff:g>)"</string>
-    <string name="call_log_header_today" msgid="1576119097475845293">"Šiandien"</string>
-    <string name="call_log_header_yesterday" msgid="5616077776205329563">"Vakar"</string>
-    <string name="call_log_header_other" msgid="4940676886254217644">"Senesni"</string>
-    <string name="voicemail_speaker_on" msgid="3151333608926996668">"Įjungti garsiakalbį."</string>
-    <string name="voicemail_speaker_off" msgid="2530064206962034201">"Išjungti garsiakalbį."</string>
-    <string name="voicemail_play_start_pause" msgid="3874823480278334664">"Pradėti arba pristabdyti atkūrimą."</string>
-    <string name="display_options_title" msgid="3880091801055797975">"Pateikties parinktys"</string>
-    <string name="sounds_and_vibration_title" msgid="3075050000721181384">"Garsai ir vibravimas"</string>
-    <string name="accessibility_settings_title" msgid="3329027650429831820">"Pritaikymas neįgaliesiems"</string>
-    <string name="ringtone_title" msgid="8377174189894648486">"Telefono skambėjimo tonas"</string>
-    <string name="vibrate_on_ring_title" msgid="631441314790960485">"Taip pat vibruoti, kai skamb."</string>
-    <string name="dtmf_tone_enable_title" msgid="3273762431523939277">"Klaviatūros tonai"</string>
-    <string name="dtmf_tone_length_title" msgid="534096029202438539">"Klaviatūros tono trukmė"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="applicationLabel">Telefonas</string>
+  <string name="launcherDialpadActivityLabel">Telefono klaviatūra</string>
+  <string name="callHistoryIconLabel">Skambučių istorija</string>
+  <string name="action_copy_number_text">Kopijuoti numerį</string>
+  <string name="copy_transcript_text">Kopijuoti transkribuotą tekstą</string>
+  <string name="action_edit_number_before_call">Redaguoti numerį prieš skambinant</string>
+  <string name="call_log_delete_all">Išvalyti skambučių istoriją</string>
+  <string name="call_log_trash_voicemail">Ištrinti balso pašto pranešim.</string>
+  <string name="snackbar_voicemail_deleted">Balso pšt. ištrintas</string>
+  <string name="clearCallLogConfirmation_title">Išvalyti skambučių istoriją?</string>
+  <string name="clearCallLogConfirmation">Bus ištrinti visi skambučiai iš istorijos</string>
+  <string name="clearCallLogProgress_title">Išvaloma skambučių istorija...</string>
+  <string name="notification_missedCallTitle">Praleistas skambutis</string>
+  <string name="notification_missedWorkCallTitle">Praleistas darbo skambutis</string>
+  <string name="notification_missedCallsTitle">Praleisti skambučiai</string>
+  <string name="notification_missedCallsMsg">Praleistų skambučių: %d</string>
+  <string name="notification_missedCall_call_back">Perskambinti</string>
+  <string name="notification_missedCall_message">Siųsti pranešimą</string>
+  <string name="post_call_notification_message">%1$s: „%2$s“</string>
+  <string name="notification_voicemail_text_format">Rinkti %s</string>
+  <string name="notification_voicemail_no_vm_number">Nežinomas balso pašto numeris</string>
+  <plurals name="notification_voicemail_title">
+    <item quantity="one"> %1$d balso pašto pranešimas </item>
+    <item quantity="few"> %1$d balso pašto pranešimai </item>
+    <item quantity="many"> %1$d balso pašto pranešimo </item>
+    <item quantity="other"> %1$d balso pašto pranešimų </item>
+  </plurals>
+  <string name="notification_voicemail_callers_list">%1$s, %2$s</string>
+  <string name="notification_new_voicemail_ticker">Nauji b. pašto pran. iš %1$s</string>
+  <string name="voicemail_playback_error">Nepavyko paleisti balso pašto pranešimo</string>
+  <string name="voicemail_fetching_content">Įkeliamas balso pašto pranešimas...</string>
+  <string name="voicemail_fetching_timout">Nepavyko įkelti balso pašto pranešimo</string>
+  <string name="call_log_item_count_and_date">(%1$d) %2$s</string>
+  <string name="description_playback_speakerphone">Įjungti arba išjungti garsiakalbį</string>
+  <string name="description_playback_seek">Ieškoti atkūrimo pozicijos</string>
+  <string name="action_menu_call_history_description">Skambučių istorija</string>
+  <string msgid="2295659037509008453" name="action_menu_overflow_description">Daugiau parinkčių</string>
+  <string name="action_menu_dialpad_button">klaviatūra</string>
+  <string name="dialer_settings_label">Nustatymai</string>
+  <string name="simulator_submenu_label">Simuliatorius</string>
+  <string name="new_ui_launcher_shortcut_label">Sukurti naują NS spart. klav.</string>
+  <string name="description_entering_bulk_action_mode">Įjungiamas masinių veiksmų režimas</string>
+  <string name="description_leaving_bulk_action_mode">Masinių veiksmų režimas išjungtas</string>
+  <string name="description_selecting_bulk_action_mode">Pasirinkta: %1$s</string>
+  <string name="description_unselecting_bulk_action_mode">Pasirinkimas atšauktas: %1$s</string>
+  <string name="description_contact_details">Išsami kontaktinė informacija: %1$s</string>
+  <string name="description_spam_contact_details">Išsami kontaktinė įtartino skambintojo dėl šlamšto informacija: %1$s</string>
+  <string name="description_num_calls">Skambučių: %1$s.</string>
+  <string name="description_video_call">Vaizdo skambutis.</string>
+  <string name="description_start_voice_search">Pradėti paiešką balsu</string>
+  <string name="voicemail">Balso paštas</string>
+  <string name="description_cancel_multi_select">Atšaukti masinių veiksmų režimą</string>
+  <string name="voicemailMultiSelectDeleteConfirm">Ištrinti</string>
+  <string name="voicemailMultiSelectDeleteCancel">Atšaukti</string>
+  <string name="voicemailMultiSelectActionBarTitle">Pasirinkta: %1$s</string>
+  <plurals name="delete_voicemails_confirmation_dialog_title">
+    <item quantity="one"><b>Ištrinti šiuos balso pašto pranešimus? </b></item>
+    <item quantity="few"><b>Ištrinti šiuos balso pašto pranešimus? </b></item>
+    <item quantity="many"><b>Ištrinti šiuos balso pašto pranešimus? </b></item>
+    <item quantity="other"><b>Ištrinti šiuos balso pašto pranešimus? </b></item>
+  </plurals>
+  <string name="voicemailCallLogToday">@string/call_log_header_today</string>
+  <string name="voicemailCallLogDateTimeFormat">%1$s, %2$s</string>
+  <string name="voicemailDurationFormat">%1$02d:%2$02d</string>
+  <string name="voicemailCallLogDateTimeFormatWithDuration">%1$s • %2$s</string>
+  <string name="voice_search_not_available">Paieška balsu nepasiekiama</string>
+  <string name="dialer_hint_find_contact">Ieškoti adresatų</string>
+  <string name="block_number_search_hint">Prid. nr. arba iešk. kontaktų</string>
+  <string name="call_log_all_empty">Skambučių istorija yra tuščia</string>
+  <string name="call_log_all_empty_action">Skambinti</string>
+  <string name="call_log_missed_empty">Nėra jokių praleistų skambučių.</string>
+  <string name="call_log_voicemail_empty">Balso pašto gautųjų aplankas yra tuščias.</string>
+  <string name="call_log_activity_title">Skambučių istorija</string>
+  <string name="call_log_all_title">Visi</string>
+  <string name="call_log_missed_title">Praleisti</string>
+  <string name="tab_speed_dial">Spartusis rinkimas</string>
+  <string name="tab_history">Skambučių istorija</string>
+  <string name="tab_all_contacts">Kontaktai</string>
+  <string name="tab_voicemail">Balso paštas</string>
+  <string name="search_shortcut_call_number">Skambinti %s</string>
+  <string name="search_shortcut_create_new_contact">Kurti naują kontaktą</string>
+  <string name="search_shortcut_add_to_contact">Pridėti prie kontakto</string>
+  <string name="search_shortcut_send_sms_message">Siųsti SMS</string>
+  <string name="search_shortcut_make_video_call">Atlikti vaizdo skambutį</string>
+  <string name="search_shortcut_block_number">Blokuoti numerį</string>
+  <string name="speed_dial_empty">Dar nieko neįtraukėte į sparčiojo rinkimo sąrašą</string>
+  <string name="speed_dial_empty_add_favorite_action">Pridėti mėgstamiausią</string>
+  <string name="remove_contact">Pašalinti</string>
+  <string name="select_all">Pasirinkti viską</string>
+  <string name="call_log_action_video_call">Vaizdo skambutis</string>
+  <string name="call_log_action_set_up_video">Nustatyti vaizdo skambučius</string>
+  <string name="call_log_action_invite_video">Pakviesti į vaizdo skambutį</string>
+  <string name="call_log_action_send_message">Siųsti pranešimą</string>
+  <string name="call_log_action_details">Išsami skambučio informacija</string>
+  <string name="call_log_action_share_voicemail">Siųsti…</string>
+  <string name="call_log_action_call">Skambinti ^1</string>
+  <string name="description_incoming_missed_call">Praleistas skambutis: ^1, ^2, ^3, ^4.</string>
+  <string name="description_incoming_answered_call">Atsakytas skambutis: ^1, ^2, ^3, ^4.</string>
+  <string name="description_unread_voicemail">Neskaitytas balso pašto pranešimas: ^1, ^2, ^3, ^4.</string>
+  <string name="description_read_voicemail">Balso pašto pranešimas: ^1, ^2, ^3, ^4.</string>
+  <string name="description_outgoing_call">Skambutis: ^1, ^2, ^3, ^4.</string>
+  <string name="call_log_via_number">numeriu %1$s</string>
+  <string name="call_log_via_number_phone_account">%1$s numeriu %2$s</string>
+  <string name="description_call_action">Skambinti ^1</string>
+  <string name="description_video_call_action">Vaizdo skambutis ^1.</string>
+  <string name="description_voicemail_action">Klausyti balso pašto nuo ^1</string>
+  <string name="description_create_new_contact_action">Sukurti ^1 kontaktą</string>
+  <string name="description_add_to_existing_contact_action">Pridėti ^1 prie esamo kontakto</string>
+  <string name="description_details_action">Išsami skambučio informacija (^1)</string>
+  <string name="call_log_header_today">Šiandien</string>
+  <string name="call_log_header_yesterday">Vakar</string>
+  <string name="call_log_header_other">Senesni</string>
+  <string name="voicemail_speaker_on">Įjungti garsiakalbį.</string>
+  <string name="voicemail_speaker_off">Išjungti garsiakalbį.</string>
+  <string name="voicemail_play_start_pause">Pradėti arba pristabdyti atkūrimą.</string>
+  <string name="display_options_title">Pateikties parinktys</string>
+  <string name="sounds_and_vibration_title">Garsai ir vibravimas</string>
+  <string name="accessibility_settings_title">Pritaikymas neįgaliesiems</string>
+  <string name="ringtone_title">Telefono skambėjimo tonas</string>
+  <string name="vibrate_on_ring_title">Taip pat vibruoti, kai skamb.</string>
+  <string name="dtmf_tone_enable_title">Klaviatūros tonai</string>
+  <string name="dtmf_tone_length_title">Klaviatūros tono trukmė</string>
   <string-array name="dtmf_tone_length_entries">
-    <item msgid="3136353015227162823">"Įprastas"</item>
-    <item msgid="5376841175538523822">"Ilgas"</item>
+    <item>Įprastas</item>
+    <item>Ilgas</item>
   </string-array>
-    <string name="respond_via_sms_setting_title" msgid="8008181606657693452">"Greiti atsakai"</string>
-    <string name="call_settings_label" msgid="7824611757200960807">"Skambučiai"</string>
-    <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Skambučių blokavimas"</string>
-    <string name="voicemail_settings_label" msgid="4594299554519920570">"Balso paštas"</string>
-    <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Skamb. blokavimo funkcija laikinai išj."</string>
-    <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Skambučių blokavimo funkcija buvo išjungta, nes iš šio telefono buvote susisiekę su pagalbos tarnybomis per pastarąsias 48 val. Ši funkcija bus automatiškai įgalinta iš naujo, kai 48 val. laikotarpis pasibaigs."</string>
-    <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Importuoti numerius"</string>
-    <string name="blocked_call_settings_import_description" msgid="1819412052545228965">"Naudodami kitas programas anksčiau buvote pažymėję, kad kai kurie skambintojai būtų automatiškai nusiųsti į balso paštą."</string>
-    <string name="blocked_call_settings_view_numbers_button" msgid="3332727948554356704">"Žr. skaičius"</string>
-    <string name="blocked_call_settings_import_button" msgid="7319111700387470727">"Importuoti"</string>
-    <string name="description_blocked_number_list_delete" msgid="2139644216858370740">"Panaikinti numerio blokavimą"</string>
-    <string name="addBlockedNumber" msgid="3053473735238295551">"Pridėti numerį"</string>
-    <string name="block_number_footer_message_vvm" msgid="7955326304033982368">"Skambučiai iš šių numerių bus užblokuoti, o balso pašto pranešimai bus automatiškai ištrinti."</string>
-    <string name="block_number_footer_message_no_vvm" msgid="1152684139070471665">"Skambučiai iš šių numerių bus užblokuoti, tačiau skambintojai vis tiek galės palikti jums balso pašto pranešimus."</string>
-    <string name="block_list" msgid="4701585783411870782">"Užblokuoti numeriai"</string>
-    <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g> jau užblokuotas."</string>
-    <string name="phone_account_settings_label" msgid="8372485478006965920">"Skambinimo paskyros"</string>
-    <string name="permission_no_speeddial" msgid="8487215628510596753">"Jei norite įgalinti spartųjį rinkimą, įjunkite Kontaktų programos leidimą."</string>
-    <string name="permission_no_calllog" msgid="4053705651238775784">"Jei norite peržiūrėti skambučių žurnalą, įjunkite Telefono programos leidimą."</string>
-    <string name="permission_no_search" msgid="2424710404207193826">"Kad galėtumėte ieškoti kontaktų, įjunkite Kontaktų leidimus."</string>
-    <string name="permission_place_call" msgid="8686908130349369423">"Jei norite paskambinti, įjunkite Telefono programos leidimą."</string>
-    <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"Telefono programa neturi leidimo keisti sistemos nustatymų."</string>
-    <string name="blocked_number_call_log_label" msgid="4212282846299997693">"Užblokuota"</string>
-    <string name="call_log_action_block_report_number" msgid="7302636538668696729">"Blokuoti / pran. apie šlamštą"</string>
-    <string name="call_log_action_block_number" msgid="5048188386501998865">"Blokuoti numerį"</string>
-    <string name="call_log_action_remove_spam" msgid="2045319806318398403">"Ne šlamštas"</string>
-    <string name="call_log_action_unblock_number" msgid="6100117033288448758">"Panaikinti numerio blokavimą"</string>
-    <string name="spam_number_call_log_label" msgid="2678431398326811131">"Šlamštas"</string>
-    <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> yra neprisijungęs (-usi) ir su juo (ja) negalima susisiekti"</string>
-    <string name="about_phone_label" msgid="582991354677973731">"Apie"</string>
-    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Transkribavo „Google“"</string>
-    <string name="voicemail_transcription_in_progress" msgid="2933320969613783210">"„Google“ transkribuoja…"</string>
-    <string name="voicemail_transcription_failed" msgid="335275303117412706">"Scenarijus nepasiekiamas."</string>
-    <string name="voicemail_transcription_failed_language_not_supported" msgid="4210332591050562553">"Scenarijus nepasiekiamas. Kalba nepalaikoma."</string>
-    <string name="voicemail_transcription_failed_no_speech" msgid="9093372879697874852">"Scenarijus nepasiekiamas. Neaptikta, kad būtų kalbama."</string>
-    <string name="view_conversation" msgid="7895904782094119702">"Peržiūrėti"</string>
-    <string name="ec_data_deleted" msgid="4794880345545827107">"Skambutis ištrintas. Peržiūrėkite ir ištrinkite priedus, kurie buvo bendrinti per šį skambutį programoje „Messages“."</string>
-    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"Skambučiai ištrinti. Peržiūrėkite ir ištrinkite priedus, kurie buvo bendrinti per skambučius programoje „Messages“."</string>
+  <string name="respond_via_sms_setting_title">Greiti atsakai</string>
+  <string name="call_settings_label">Skambučiai</string>
+  <string name="manage_blocked_numbers_label">Užblokuoti numeriai</string>
+  <string name="voicemail_settings_label">Balso paštas</string>
+  <string name="blocked_numbers_disabled_emergency_header_label">Skamb. blokavimo funkcija laikinai išj.</string>
+  <string name="blocked_numbers_disabled_emergency_desc">Skambučių blokavimo funkcija buvo išjungta, nes iš šio telefono buvote susisiekę su pagalbos tarnybomis per pastarąsias 48 val. Ši funkcija bus automatiškai įgalinta iš naujo, kai 48 val. laikotarpis pasibaigs.</string>
+  <string name="import_send_to_voicemail_numbers_label">Importuoti numerius</string>
+  <string name="blocked_call_settings_import_description">Naudodami kitas programas anksčiau buvote pažymėję, kad kai kurie skambintojai būtų automatiškai nusiųsti į balso paštą.</string>
+  <string name="blocked_call_settings_view_numbers_button">Žr. skaičius</string>
+  <string name="blocked_call_settings_import_button">Importuoti</string>
+  <string name="description_blocked_number_list_delete">Panaikinti numerio blokavimą</string>
+  <string name="addBlockedNumber">Pridėti numerį</string>
+  <string name="block_number_footer_message_vvm">Skambučiai iš šių numerių bus užblokuoti, o balso pašto pranešimai bus automatiškai ištrinti.</string>
+  <string name="block_number_footer_message_no_vvm">Skambučiai iš šių numerių bus užblokuoti, tačiau skambintojai vis tiek galės palikti jums balso pašto pranešimus.</string>
+  <string name="block_list">Užblokuoti numeriai</string>
+  <string name="alreadyBlocked">%1$s jau užblokuotas.</string>
+  <string name="phone_account_settings_label">Skambinimo paskyros</string>
+  <string name="permission_no_speeddial">Jei norite įgalinti spartųjį rinkimą, įjunkite Kontaktų programos leidimą.</string>
+  <string name="permission_no_calllog">Jei norite peržiūrėti skambučių žurnalą, įjunkite Telefono programos leidimą.</string>
+  <string name="permission_no_search">Kad galėtumėte ieškoti kontaktų, įjunkite Kontaktų leidimus.</string>
+  <string name="permission_place_call">Jei norite paskambinti, įjunkite Telefono programos leidimą.</string>
+  <string name="toast_cannot_write_system_settings">Telefono programa neturi leidimo keisti sistemos nustatymų.</string>
+  <string name="blocked_number_call_log_label">Užblokuota</string>
+  <string name="call_log_action_block_report_number">Blokuoti / pran. apie šlamštą</string>
+  <string name="call_log_action_block_number">Blokuoti numerį</string>
+  <string name="call_log_action_remove_spam">Ne šlamštas</string>
+  <string name="call_log_action_unblock_number">Panaikinti numerio blokavimą</string>
+  <string name="spam_number_call_log_label">Šlamštas</string>
+  <string name="call_composer_connection_failed">%1$s yra neprisijungęs (-usi) ir su juo (ja) negalima susisiekti</string>
+  <string name="about_phone_label">Apie</string>
+  <string name="voicemail_transcription_branding_text">Transkribavo „Google“</string>
+  <string name="voicemail_transcription_in_progress">Transkribuojama…</string>
+  <string name="voicemail_transcription_failed">Scenarijus nepasiekiamas.</string>
+  <string name="voicemail_transcription_failed_language_not_supported">Scenarijus nepasiekiamas. Kalba nepalaikoma.</string>
+  <string name="voicemail_transcription_failed_no_speech">Scenarijus nepasiekiamas. Neaptikta, kad būtų kalbama.</string>
+  <string name="voicemail_donation_promo_title">Norite padėti tobulinti transkribavimo tikslumą?</string>
+  <string name="voicemail_donation_promo_content">Leiskite „Google“ peržiūrėti šį ir būsimus balso pašto pranešimus su nuorašais. Jie bus saugomi anonimiškai. Nustatymus galite pakeisti bet kuriuo metu. %1$s</string>
+  <string name="voicemail_donation_promo_opt_in">Taip, sutinku</string>
+  <string name="voicemail_donation_promo_opt_out">Ne, ačiū</string>
+  <string name="voicemail_transcription_rating">Įvertinkite nuorašo kokybę</string>
+  <string name="voicemail_transcription_rating_thanks">Dėkojame už atsiliepimą</string>
+  <string name="description_rating_good">Patinka</string>
+  <string name="description_rating_bad">Nepatinka</string>
+  <string name="view_conversation">Peržiūrėti</string>
+  <string name="ec_data_deleted">Skambutis ištrintas. Peržiūrėkite ir ištrinkite priedus, kurie buvo bendrinti per šį skambutį programoje „Messages“.</string>
+  <string name="multiple_ec_data_deleted">Skambučiai ištrinti. Peržiūrėkite ir ištrinkite priedus, kurie buvo bendrinti per skambučius programoje „Messages“.</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-lv/strings.xml b/java/com/android/dialer/app/res/values-lv/strings.xml
index 01bcfde..d49e713 100644
--- a/java/com/android/dialer/app/res/values-lv/strings.xml
+++ b/java/com/android/dialer/app/res/values-lv/strings.xml
@@ -1,181 +1,173 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="applicationLabel" msgid="2202739481132958990">"Tālrunis"</string>
-    <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"Tālruņa cipartastatūra"</string>
-    <string name="callHistoryIconLabel" msgid="7493268743411968630">"Zvanu vēsture"</string>
-    <string name="action_copy_number_text" msgid="832682558551502319">"Kopēt numuru"</string>
-    <string name="copy_transcript_text" msgid="937904189017310829">"Kopēt transkripciju"</string>
-    <string name="action_edit_number_before_call" msgid="8017492815878473837">"Rediģēt numuru pirms zvanīšanas"</string>
-    <string name="call_log_delete_all" msgid="7852970926906523784">"Dzēst zvanu vēsturi"</string>
-    <string name="call_log_trash_voicemail" msgid="6118493534178533972">"Dzēst balss pasta ziņojumu"</string>
-    <string name="snackbar_voicemail_deleted" msgid="7463166543725496307">"Balss pasts dzēsts"</string>
-    <string name="snackbar_voicemail_deleted_undo" msgid="6959743982796409941">"ATSAUKT"</string>
-    <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"Vai dzēst zvanu vēsturi?"</string>
-    <string name="clearCallLogConfirmation" msgid="6844949465815109166">"Tiks dzēsti visi vēsturē saglabātie zvani."</string>
-    <string name="clearCallLogProgress_title" msgid="995004835687361977">"Notiek zvanu vēstures dzēšana…"</string>
-    <string name="notification_missedCallTitle" msgid="8283366068539898486">"Neatbildēts zvans"</string>
-    <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"Neatbildēts darba zvans"</string>
-    <string name="notification_missedCallsTitle" msgid="3697442015345089802">"Neatbildēti zvani"</string>
-    <string name="notification_missedCallsMsg" msgid="8176217633929018706">"<xliff:g id="NUM_MISSED_CALLS">%d</xliff:g> neatbildēti zvani"</string>
-    <string name="notification_missedCall_call_back" msgid="3875698110051973965">"Atzvanīt"</string>
-    <string name="notification_missedCall_message" msgid="5086910028988305964">"Sūtīt ziņojumu"</string>
-    <string name="post_call_notification_message" msgid="5417476789860590611">"<xliff:g id="NAME">%1$s</xliff:g>: <xliff:g id="MESSAGE">%2$s</xliff:g>"</string>
-    <string name="notification_voicemail_text_format" msgid="1895667520930252897">"Sastādiet šādu numuru: <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
-    <string name="notification_voicemail_no_vm_number" msgid="8942821987929495842">"Balss pasta numurs nav zināms."</string>
-    <plurals name="notification_voicemail_title" formatted="false" msgid="1551847434476438657">
-      <item quantity="zero"><xliff:g id="COUNT">%1$d</xliff:g> balss pasta ziņojumi </item>
-      <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> balss pasta ziņojums </item>
-      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> balss pasta ziņojumi </item>
-    </plurals>
-    <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
-    <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"Jauns b. pasta ziņ. no: <xliff:g id="CALLER">%1$s</xliff:g>"</string>
-    <string name="voicemail_playback_error" msgid="4384373852257757295">"Nevarēja atskaņot balss pasta ziņojumu."</string>
-    <string name="voicemail_fetching_content" msgid="572320120918636014">"Notiek balss pasta ziņojumu ielāde…"</string>
-    <string name="voicemail_fetching_timout" msgid="2128873915839949783">"Nevarēja ielādēt balss pasta ziņojumu."</string>
-    <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_playback_speakerphone" msgid="4852027754869750227">"Ieslēgt vai izslēgt mikrofonu ar skaļruni"</string>
-    <string name="description_playback_seek" msgid="1340910573254132520">"Meklēt atskaņošanas pozīciju"</string>
-    <string name="action_menu_call_history_description" msgid="8829135306925008546">"Zvanu vēsture"</string>
-    <string name="action_menu_overflow_description" msgid="7648679686746517341">"Vairāk opciju"</string>
-    <string name="action_menu_dialpad_button" msgid="1970631633457493180">"cipartastatūra"</string>
-    <string name="dialer_settings_label" msgid="4980176284150290175">"Iestatījumi"</string>
-    <string name="simulator_submenu_label" msgid="186156287346615267">"Simulators"</string>
-    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Jaunās liet. saskarnes saīsne"</string>
-    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"Tiek atvērts lielapjoma darbību režīms"</string>
-    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"Tika aizvērts lielapjoma darbību režīms"</string>
-    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"Atlasīt: <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"Noņemt atlasi: <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_contact_details" msgid="3341280873855253464">"Kontaktpersonas informācija: <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_spam_contact_details" msgid="5592578752881528368">"Nevēlama zvanītāja (<xliff:g id="NAMEORNUMBER">%1$s</xliff:g>) kontaktinformācija"</string>
-    <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> zvani."</string>
-    <string name="description_video_call" msgid="3738199365585751727">"Videozvans"</string>
-    <string name="description_start_voice_search" msgid="8380022725973015261">"Sākt meklēšanu ar balsi"</string>
-    <string name="voicemail" msgid="8899540969000957954">"Balss pasts"</string>
-    <string name="description_cancel_multi_select" msgid="3930475950253360461">"Iziet no grupas darbību režīma"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Dzēst"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Atcelt"</string>
-    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"Atlasīti: <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
-      <item quantity="zero">"<b>"Vai dzēst šos balss pasta ziņojumus? "</b>"</item>
-      <item quantity="one">"<b>"Vai dzēst šos balss pasta ziņojumus? "</b>"</item>
-      <item quantity="other">"<b>"Vai dzēst šos balss pasta ziņojumus? "</b>"</item>
-    </plurals>
-    <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
-    <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> plkst. <xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
-    <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="voice_search_not_available" msgid="6546240433719732905">"Meklēšana ar balsi nav pieejama."</string>
-    <string name="dialer_hint_find_contact" msgid="2023214799381149808">"Meklēt kontaktpersonas"</string>
-    <string name="block_number_search_hint" msgid="5377706079015099416">"Pievienojiet numuru vai meklējiet kontaktpersonas"</string>
-    <string name="call_log_all_empty" msgid="3955572868518162004">"Jūsu zvanu vēsturē nav ierakstu."</string>
-    <string name="call_log_all_empty_action" msgid="852218280136243014">"Zvanīt"</string>
-    <string name="call_log_missed_empty" msgid="7094936030845062214">"Jums nav neatbildētu zvanu."</string>
-    <string name="call_log_voicemail_empty" msgid="273623903423275178">"Jūsu balss pasta iesūtne ir tukša."</string>
-    <string name="call_log_activity_title" msgid="1275242727244945527">"Zvanu vēsture"</string>
-    <string name="call_log_all_title" msgid="6042262422192020327">"Visi"</string>
-    <string name="call_log_missed_title" msgid="17254005889268015">"Neatb."</string>
-    <string name="tab_speed_dial" msgid="6616404752227561075">"Ātrie zvani"</string>
-    <string name="tab_history" msgid="7420269368689503596">"Zvanu vēsture"</string>
-    <string name="tab_all_contacts" msgid="5531733977693943015">"Kontaktpersonas"</string>
-    <string name="tab_voicemail" msgid="2458548090088316246">"Balss pasts"</string>
-    <string name="search_shortcut_call_number" msgid="8847918845036880688">"Zvanīt: <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"Izveidot jaunu kontaktpersonu"</string>
-    <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"Pievienot kontaktpersonai"</string>
-    <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"Sūtīt īsziņu"</string>
-    <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"Veikt videozvanu"</string>
-    <string name="search_shortcut_block_number" msgid="4587283230665805776">"Bloķēt numuru"</string>
-    <string name="speed_dial_empty" msgid="3346406399966039505">"Ātro zvanu sarakstā vēl nav nevienas kontaktpersonas."</string>
-    <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"Pievienot izlasei"</string>
-    <string name="remove_contact" msgid="2353580570488923668">"Noņemt"</string>
-    <string name="select_all" msgid="408601760696146245">"Atlasīt visu"</string>
-    <string name="call_log_action_video_call" msgid="7565549950343850819">"Videozvans"</string>
-    <string name="call_log_action_send_message" msgid="6948727362660115554">"Sūtīt ziņojumu"</string>
-    <string name="call_log_action_details" msgid="2091370737371449501">"Informācija par zvanu"</string>
-    <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"Nosūtīt uz…"</string>
-    <string name="call_log_action_call" msgid="682724094251540583">"Zvanīt: <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_incoming_missed_call" msgid="8292535799379230029">"Neatbildēts zvans no: <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_incoming_answered_call" msgid="3920182963103160610">"Atbildēts zvans no: <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_unread_voicemail" msgid="145170985013419170">"Nelasīts balss pasts no <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_read_voicemail" msgid="5585559881573227732">"Balss pasts no <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_outgoing_call" msgid="543952487882919924">"Izejošs zvans: <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="call_log_via_number" msgid="1340307109806397650">"izmantojot numuru <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, izmantojot numuru <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="description_call_action" msgid="4042796498169106545">"Zvanīt: <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_video_call_action" msgid="1237090968588659650">"Zvaniet kontaktpersonai <xliff:g id="NAMEORNUMBER">^1</xliff:g>, izmantojot videozvanu."</string>
-    <string name="description_voicemail_action" msgid="3290143432403538524">"Klausīties balss pasta ziņojumu no: <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_create_new_contact_action" msgid="1928282350281564130">"Izveidojiet kontaktpersonu, izmantojot vienumu <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
-    <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"Pievienojiet vienumu <xliff:g id="NAMEORNUMBER">^1</xliff:g> esošai kontaktpersonai."</string>
-    <string name="description_details_action" msgid="2061866409737706174">"Zvanu informācija par šādu numuru: <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="call_log_header_today" msgid="1576119097475845293">"Šodien"</string>
-    <string name="call_log_header_yesterday" msgid="5616077776205329563">"Vakar"</string>
-    <string name="call_log_header_other" msgid="4940676886254217644">"Vecāki zvani"</string>
-    <string name="voicemail_speaker_on" msgid="3151333608926996668">"Ieslēgt skaļruni."</string>
-    <string name="voicemail_speaker_off" msgid="2530064206962034201">"Izslēgt skaļruni."</string>
-    <string name="voicemail_play_start_pause" msgid="3874823480278334664">"Sākt vai apturēt atskaņošanu."</string>
-    <string name="display_options_title" msgid="3880091801055797975">"Attēlojuma opcijas"</string>
-    <string name="sounds_and_vibration_title" msgid="3075050000721181384">"Skaņas un vibrācija"</string>
-    <string name="accessibility_settings_title" msgid="3329027650429831820">"Pieejamība"</string>
-    <string name="ringtone_title" msgid="8377174189894648486">"Tālruņa zvana signāls"</string>
-    <string name="vibrate_on_ring_title" msgid="631441314790960485">"Izmantot vibrozvanu zvaniem"</string>
-    <string name="dtmf_tone_enable_title" msgid="3273762431523939277">"Cipartastatūras signāli"</string>
-    <string name="dtmf_tone_length_title" msgid="534096029202438539">"Cipartastatūras signāla ilgums"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="applicationLabel">Tālrunis</string>
+  <string name="launcherDialpadActivityLabel">Tālruņa cipartastatūra</string>
+  <string name="callHistoryIconLabel">Zvanu vēsture</string>
+  <string name="action_copy_number_text">Kopēt numuru</string>
+  <string name="copy_transcript_text">Kopēt transkripciju</string>
+  <string name="action_edit_number_before_call">Rediģēt numuru pirms zvanīšanas</string>
+  <string name="call_log_delete_all">Dzēst zvanu vēsturi</string>
+  <string name="call_log_trash_voicemail">Dzēst balss pasta ziņojumu</string>
+  <string name="snackbar_voicemail_deleted">Balss pasts dzēsts</string>
+  <string name="clearCallLogConfirmation_title">Vai dzēst zvanu vēsturi?</string>
+  <string name="clearCallLogConfirmation">Tiks dzēsti visi vēsturē saglabātie zvani.</string>
+  <string name="clearCallLogProgress_title">Notiek zvanu vēstures dzēšana…</string>
+  <string name="notification_missedCallTitle">Neatbildēts zvans</string>
+  <string name="notification_missedWorkCallTitle">Neatbildēts darba zvans</string>
+  <string name="notification_missedCallsTitle">Neatbildēti zvani</string>
+  <string name="notification_missedCallsMsg">%d neatbildēti zvani</string>
+  <string name="notification_missedCall_call_back">Atzvanīt</string>
+  <string name="notification_missedCall_message">Sūtīt ziņojumu</string>
+  <string name="post_call_notification_message">%1$s: %2$s</string>
+  <string name="notification_voicemail_text_format">Sastādiet šādu numuru: %s</string>
+  <string name="notification_voicemail_no_vm_number">Balss pasta numurs nav zināms.</string>
+  <plurals name="notification_voicemail_title">
+    <item quantity="zero">%1$d balss pasta ziņojumi </item>
+    <item quantity="one">%1$d balss pasta ziņojums </item>
+    <item quantity="other">%1$d balss pasta ziņojumi </item>
+  </plurals>
+  <string name="notification_voicemail_callers_list">%1$s, %2$s</string>
+  <string name="notification_new_voicemail_ticker">Jauns b. pasta ziņ. no: %1$s</string>
+  <string name="voicemail_playback_error">Nevarēja atskaņot balss pasta ziņojumu.</string>
+  <string name="voicemail_fetching_content">Notiek balss pasta ziņojumu ielāde…</string>
+  <string name="voicemail_fetching_timout">Nevarēja ielādēt balss pasta ziņojumu.</string>
+  <string name="call_log_item_count_and_date">(%1$d) %2$s</string>
+  <string name="description_playback_speakerphone">Ieslēgt vai izslēgt mikrofonu ar skaļruni</string>
+  <string name="description_playback_seek">Meklēt atskaņošanas pozīciju</string>
+  <string name="action_menu_call_history_description">Zvanu vēsture</string>
+  <string msgid="2295659037509008453" name="action_menu_overflow_description">Vairāk opciju</string>
+  <string name="action_menu_dialpad_button">cipartastatūra</string>
+  <string name="dialer_settings_label">Iestatījumi</string>
+  <string name="simulator_submenu_label">Simulators</string>
+  <string name="new_ui_launcher_shortcut_label">Jaunās liet. saskarnes saīsne</string>
+  <string name="description_entering_bulk_action_mode">Tiek atvērts lielapjoma darbību režīms</string>
+  <string name="description_leaving_bulk_action_mode">Tika aizvērts lielapjoma darbību režīms</string>
+  <string name="description_selecting_bulk_action_mode">Atlasīt: %1$s</string>
+  <string name="description_unselecting_bulk_action_mode">Noņemt atlasi: %1$s</string>
+  <string name="description_contact_details">Kontaktpersonas informācija: %1$s</string>
+  <string name="description_spam_contact_details">Nevēlama zvanītāja (%1$s) kontaktinformācija</string>
+  <string name="description_num_calls">%1$s zvani.</string>
+  <string name="description_video_call">Videozvans</string>
+  <string name="description_start_voice_search">Sākt meklēšanu ar balsi</string>
+  <string name="voicemail">Balss pasts</string>
+  <string name="description_cancel_multi_select">Iziet no grupas darbību režīma</string>
+  <string name="voicemailMultiSelectDeleteConfirm">Dzēst</string>
+  <string name="voicemailMultiSelectDeleteCancel">Atcelt</string>
+  <string name="voicemailMultiSelectActionBarTitle">Atlasīti: %1$s</string>
+  <plurals name="delete_voicemails_confirmation_dialog_title">
+    <item quantity="zero"><b>Vai dzēst šos balss pasta ziņojumus? </b></item>
+    <item quantity="one"><b>Vai dzēst šos balss pasta ziņojumus? </b></item>
+    <item quantity="other"><b>Vai dzēst šos balss pasta ziņojumus? </b></item>
+  </plurals>
+  <string name="voicemailCallLogToday">@string/call_log_header_today</string>
+  <string name="voicemailCallLogDateTimeFormat">%1$s plkst. %2$s</string>
+  <string name="voicemailDurationFormat">%1$02d:%2$02d</string>
+  <string name="voicemailCallLogDateTimeFormatWithDuration">%1$s • %2$s</string>
+  <string name="voice_search_not_available">Meklēšana ar balsi nav pieejama.</string>
+  <string name="dialer_hint_find_contact">Meklēt kontaktpersonas</string>
+  <string name="block_number_search_hint">Pievienojiet numuru vai meklējiet kontaktpersonas</string>
+  <string name="call_log_all_empty">Jūsu zvanu vēsturē nav ierakstu.</string>
+  <string name="call_log_all_empty_action">Zvanīt</string>
+  <string name="call_log_missed_empty">Jums nav neatbildētu zvanu.</string>
+  <string name="call_log_voicemail_empty">Jūsu balss pasta iesūtne ir tukša.</string>
+  <string name="call_log_activity_title">Zvanu vēsture</string>
+  <string name="call_log_all_title">Visi</string>
+  <string name="call_log_missed_title">Neatb.</string>
+  <string name="tab_speed_dial">Ātrie zvani</string>
+  <string name="tab_history">Zvanu vēsture</string>
+  <string name="tab_all_contacts">Kontaktpersonas</string>
+  <string name="tab_voicemail">Balss pasts</string>
+  <string name="search_shortcut_call_number">Zvanīt: %s</string>
+  <string name="search_shortcut_create_new_contact">Izveidot jaunu kontaktpersonu</string>
+  <string name="search_shortcut_add_to_contact">Pievienot kontaktpersonai</string>
+  <string name="search_shortcut_send_sms_message">Sūtīt īsziņu</string>
+  <string name="search_shortcut_make_video_call">Veikt videozvanu</string>
+  <string name="search_shortcut_block_number">Bloķēt numuru</string>
+  <string name="speed_dial_empty">Ātro zvanu sarakstā vēl nav nevienas kontaktpersonas.</string>
+  <string name="speed_dial_empty_add_favorite_action">Pievienot izlasei</string>
+  <string name="remove_contact">Noņemt</string>
+  <string name="select_all">Atlasīt visu</string>
+  <string name="call_log_action_video_call">Videozvans</string>
+  <string name="call_log_action_set_up_video">Iestatīt videozvanu</string>
+  <string name="call_log_action_invite_video">Uzaicināt uz videozvanu</string>
+  <string name="call_log_action_send_message">Sūtīt ziņojumu</string>
+  <string name="call_log_action_details">Informācija par zvanu</string>
+  <string name="call_log_action_share_voicemail">Nosūtīt uz…</string>
+  <string name="call_log_action_call">Zvanīt: ^1</string>
+  <string name="description_incoming_missed_call">Neatbildēts zvans no: ^1, ^2, ^3, ^4.</string>
+  <string name="description_incoming_answered_call">Atbildēts zvans no: ^1, ^2, ^3, ^4.</string>
+  <string name="description_unread_voicemail">Nelasīts balss pasts no ^1, ^2, ^3, ^4.</string>
+  <string name="description_read_voicemail">Balss pasts no ^1, ^2, ^3, ^4.</string>
+  <string name="description_outgoing_call">Izejošs zvans: ^1, ^2, ^3, ^4.</string>
+  <string name="call_log_via_number">izmantojot numuru %1$s</string>
+  <string name="call_log_via_number_phone_account">%1$s, izmantojot numuru %2$s</string>
+  <string name="description_call_action">Zvanīt: ^1</string>
+  <string name="description_video_call_action">Zvaniet kontaktpersonai ^1, izmantojot videozvanu.</string>
+  <string name="description_voicemail_action">Klausīties balss pasta ziņojumu no: ^1</string>
+  <string name="description_create_new_contact_action">Izveidojiet kontaktpersonu, izmantojot vienumu ^1.</string>
+  <string name="description_add_to_existing_contact_action">Pievienojiet vienumu ^1 esošai kontaktpersonai.</string>
+  <string name="description_details_action">Zvanu informācija par šādu numuru: ^1</string>
+  <string name="call_log_header_today">Šodien</string>
+  <string name="call_log_header_yesterday">Vakar</string>
+  <string name="call_log_header_other">Vecāki zvani</string>
+  <string name="voicemail_speaker_on">Ieslēgt skaļruni.</string>
+  <string name="voicemail_speaker_off">Izslēgt skaļruni.</string>
+  <string name="voicemail_play_start_pause">Sākt vai apturēt atskaņošanu.</string>
+  <string name="display_options_title">Attēlojuma opcijas</string>
+  <string name="sounds_and_vibration_title">Skaņas un vibrācija</string>
+  <string name="accessibility_settings_title">Pieejamība</string>
+  <string name="ringtone_title">Tālruņa zvana signāls</string>
+  <string name="vibrate_on_ring_title">Izmantot vibrozvanu zvaniem</string>
+  <string name="dtmf_tone_enable_title">Cipartastatūras signāli</string>
+  <string name="dtmf_tone_length_title">Cipartastatūras signāla ilgums</string>
   <string-array name="dtmf_tone_length_entries">
-    <item msgid="3136353015227162823">"Parasts"</item>
-    <item msgid="5376841175538523822">"Ilgs"</item>
+    <item>Parasts</item>
+    <item>Ilgs</item>
   </string-array>
-    <string name="respond_via_sms_setting_title" msgid="8008181606657693452">"Ātrās atbildes"</string>
-    <string name="call_settings_label" msgid="7824611757200960807">"Zvani"</string>
-    <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Zvanu bloķēšana"</string>
-    <string name="voicemail_settings_label" msgid="4594299554519920570">"Balss pasts"</string>
-    <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Zvanu bloķēšana ir īslaicīgi izslēgta"</string>
-    <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Zvanu bloķēšana ir atspējota, jo pēdējo 48 stundu laikā jūs sazinājāties ar ārkārtas palīdzības dienestiem, izmantojot šo tālruni. Zvanu bloķēšana tiks automātiski iespējota, tiklīdz beigsies 48 stundu periods."</string>
-    <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Importēt numurus"</string>
-    <string name="blocked_call_settings_import_description" msgid="1819412052545228965">"Jūs iepriekš atzīmējāt dažus zvanītājus, kuri automātiski jānovirza uz balss pastu, izmantojot citas lietotnes."</string>
-    <string name="blocked_call_settings_view_numbers_button" msgid="3332727948554356704">"Skatīt numurus"</string>
-    <string name="blocked_call_settings_import_button" msgid="7319111700387470727">"Importēt"</string>
-    <string name="description_blocked_number_list_delete" msgid="2139644216858370740">"Atbloķēt numuru"</string>
-    <string name="addBlockedNumber" msgid="3053473735238295551">"Pievienot numuru"</string>
-    <string name="block_number_footer_message_vvm" msgid="7955326304033982368">"No šiem numuriem saņemtie zvani tiks bloķēti, un balss pasta ziņojumi tiks automātiski dzēsti."</string>
-    <string name="block_number_footer_message_no_vvm" msgid="1152684139070471665">"No šiem numuriem saņemtie zvani tiks bloķēti, taču zvanītāji joprojām varēs jums atstāt balss pasta ziņojumus."</string>
-    <string name="block_list" msgid="4701585783411870782">"Bloķētie numuri"</string>
-    <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g> jau ir bloķēts."</string>
-    <string name="phone_account_settings_label" msgid="8372485478006965920">"Zvanu konti"</string>
-    <string name="permission_no_speeddial" msgid="8487215628510596753">"Lai iespējotu ātros zvanus, ieslēdziet atļauju Kontaktpersonas."</string>
-    <string name="permission_no_calllog" msgid="4053705651238775784">"Lai skatītu zvanu žurnālu, ieslēdziet atļauju Tālrunis."</string>
-    <string name="permission_no_search" msgid="2424710404207193826">"Lai meklētu savas kontaktpersonas, ieslēdziet atļauju Kontaktpersonas."</string>
-    <string name="permission_place_call" msgid="8686908130349369423">"Lai veiktu zvanu, ieslēdziet atļauju Tālrunis."</string>
-    <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"Tālruņa lietotnei nav atļaujas rakstīt sistēmas iestatījumos."</string>
-    <string name="blocked_number_call_log_label" msgid="4212282846299997693">"Bloķēts"</string>
-    <string name="call_log_action_block_report_number" msgid="7302636538668696729">"Bloķēt numuru/ziņot par to"</string>
-    <string name="call_log_action_block_number" msgid="5048188386501998865">"Bloķēt numuru"</string>
-    <string name="call_log_action_remove_spam" msgid="2045319806318398403">"Nav nevēlams numurs"</string>
-    <string name="call_log_action_unblock_number" msgid="6100117033288448758">"Atbloķēt numuru"</string>
-    <string name="spam_number_call_log_label" msgid="2678431398326811131">"Nevēlami zvani"</string>
-    <string name="call_composer_connection_failed" msgid="6776461585447831242">"Lietotājs <xliff:g id="NAME">%1$s</xliff:g> ir bezsaistē un nav sasniedzams"</string>
-    <string name="about_phone_label" msgid="582991354677973731">"Par"</string>
-    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Transkribēja: Google"</string>
-    <string name="voicemail_transcription_in_progress" msgid="2933320969613783210">"Google transkribē…"</string>
-    <string name="voicemail_transcription_failed" msgid="335275303117412706">"Transkripcija nav pieejama."</string>
-    <string name="voicemail_transcription_failed_language_not_supported" msgid="4210332591050562553">"Transkripcija nav pieejama. Valoda netiek atbalstīta."</string>
-    <string name="voicemail_transcription_failed_no_speech" msgid="9093372879697874852">"Transkripcija nav pieejama. Runa nav konstatēta."</string>
-    <string name="view_conversation" msgid="7895904782094119702">"Skatīt"</string>
-    <string name="ec_data_deleted" msgid="4794880345545827107">"Zvans izdzēsts. Skatiet un dzēsiet pielikumus, kas kopīgoti šī zvana laikā, izmantojot lietotni Ziņojumi."</string>
-    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"Zvani izdzēsti. Skatiet un dzēsiet pielikumus, kas kopīgoti šo zvanu laikā, izmantojot lietotni Ziņojumi."</string>
+  <string name="respond_via_sms_setting_title">Ātrās atbildes</string>
+  <string name="call_settings_label">Zvani</string>
+  <string name="manage_blocked_numbers_label">Bloķētie numuri</string>
+  <string name="voicemail_settings_label">Balss pasts</string>
+  <string name="blocked_numbers_disabled_emergency_header_label">Zvanu bloķēšana ir īslaicīgi izslēgta</string>
+  <string name="blocked_numbers_disabled_emergency_desc">Zvanu bloķēšana ir atspējota, jo pēdējo 48 stundu laikā jūs sazinājāties ar ārkārtas palīdzības dienestiem, izmantojot šo tālruni. Zvanu bloķēšana tiks automātiski iespējota, tiklīdz beigsies 48 stundu periods.</string>
+  <string name="import_send_to_voicemail_numbers_label">Importēt numurus</string>
+  <string name="blocked_call_settings_import_description">Jūs iepriekš atzīmējāt dažus zvanītājus, kuri automātiski jānovirza uz balss pastu, izmantojot citas lietotnes.</string>
+  <string name="blocked_call_settings_view_numbers_button">Skatīt numurus</string>
+  <string name="blocked_call_settings_import_button">Importēt</string>
+  <string name="description_blocked_number_list_delete">Atbloķēt numuru</string>
+  <string name="addBlockedNumber">Pievienot numuru</string>
+  <string name="block_number_footer_message_vvm">No šiem numuriem saņemtie zvani tiks bloķēti, un balss pasta ziņojumi tiks automātiski dzēsti.</string>
+  <string name="block_number_footer_message_no_vvm">No šiem numuriem saņemtie zvani tiks bloķēti, taču zvanītāji joprojām varēs jums atstāt balss pasta ziņojumus.</string>
+  <string name="block_list">Bloķētie numuri</string>
+  <string name="alreadyBlocked">%1$s jau ir bloķēts.</string>
+  <string name="phone_account_settings_label">Zvanu konti</string>
+  <string name="permission_no_speeddial">Lai iespējotu ātros zvanus, ieslēdziet atļauju Kontaktpersonas.</string>
+  <string name="permission_no_calllog">Lai skatītu zvanu žurnālu, ieslēdziet atļauju Tālrunis.</string>
+  <string name="permission_no_search">Lai meklētu savas kontaktpersonas, ieslēdziet atļauju Kontaktpersonas.</string>
+  <string name="permission_place_call">Lai veiktu zvanu, ieslēdziet atļauju Tālrunis.</string>
+  <string name="toast_cannot_write_system_settings">Tālruņa lietotnei nav atļaujas rakstīt sistēmas iestatījumos.</string>
+  <string name="blocked_number_call_log_label">Bloķēts</string>
+  <string name="call_log_action_block_report_number">Bloķēt numuru/ziņot par to</string>
+  <string name="call_log_action_block_number">Bloķēt numuru</string>
+  <string name="call_log_action_remove_spam">Nav nevēlams numurs</string>
+  <string name="call_log_action_unblock_number">Atbloķēt numuru</string>
+  <string name="spam_number_call_log_label">Nevēlami zvani</string>
+  <string name="call_composer_connection_failed">Lietotājs %1$s ir bezsaistē un nav sasniedzams</string>
+  <string name="about_phone_label">Par</string>
+  <string name="voicemail_transcription_branding_text">Transkribēja: Google</string>
+  <string name="voicemail_transcription_in_progress">Notiek transkribēšana…</string>
+  <string name="voicemail_transcription_failed">Transkripcija nav pieejama.</string>
+  <string name="voicemail_transcription_failed_language_not_supported">Transkripcija nav pieejama. Valoda netiek atbalstīta.</string>
+  <string name="voicemail_transcription_failed_no_speech">Transkripcija nav pieejama. Runa nav konstatēta.</string>
+  <string name="voicemail_donation_promo_title">Palīdziet uzlabot transkripcijas precizitāti!</string>
+  <string name="voicemail_donation_promo_content">Ļaujiet Google pārskatīt šo un turpmākos balss pasta ziņojumus ar transkripciju. Tie tiks glabāti anonīmi. Mainiet iestatījumus jebkurā laikā. %1$s</string>
+  <string name="voicemail_donation_promo_opt_in">Jā, piekrītu</string>
+  <string name="voicemail_donation_promo_opt_out">Nē, paldies</string>
+  <string name="voicemail_transcription_rating">Transkripcijas kvalitāte</string>
+  <string name="voicemail_transcription_rating_thanks">Paldies par atsauksmēm!</string>
+  <string name="description_rating_good">Patīk</string>
+  <string name="description_rating_bad">Nepatīk</string>
+  <string name="view_conversation">Skatīt</string>
+  <string name="ec_data_deleted">Zvans izdzēsts. Skatiet un dzēsiet pielikumus, kas kopīgoti šī zvana laikā, izmantojot lietotni Ziņojumi.</string>
+  <string name="multiple_ec_data_deleted">Zvani izdzēsti. Skatiet un dzēsiet pielikumus, kas kopīgoti šo zvanu laikā, izmantojot lietotni Ziņojumi.</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-mk/strings.xml b/java/com/android/dialer/app/res/values-mk/strings.xml
index f89c34d..6b8544a 100644
--- a/java/com/android/dialer/app/res/values-mk/strings.xml
+++ b/java/com/android/dialer/app/res/values-mk/strings.xml
@@ -1,179 +1,171 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="applicationLabel" msgid="2202739481132958990">"Телефон"</string>
-    <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"Тастатура за бирање на телефон"</string>
-    <string name="callHistoryIconLabel" msgid="7493268743411968630">"Историја на повици"</string>
-    <string name="action_copy_number_text" msgid="832682558551502319">"Копирај го бројот"</string>
-    <string name="copy_transcript_text" msgid="937904189017310829">"Копирај транскрипција"</string>
-    <string name="action_edit_number_before_call" msgid="8017492815878473837">"Уредете го бројот пред повикот"</string>
-    <string name="call_log_delete_all" msgid="7852970926906523784">"Избришете историја на повици?"</string>
-    <string name="call_log_trash_voicemail" msgid="6118493534178533972">"Избришете ја говорната пошта"</string>
-    <string name="snackbar_voicemail_deleted" msgid="7463166543725496307">"Гов. пошта е избриш."</string>
-    <string name="snackbar_voicemail_deleted_undo" msgid="6959743982796409941">"ВРАТИ"</string>
-    <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"Избришете историја на повици?"</string>
-    <string name="clearCallLogConfirmation" msgid="6844949465815109166">"Ова ќе ги избрише сите повици од историјата"</string>
-    <string name="clearCallLogProgress_title" msgid="995004835687361977">"Се чисти историјата на повици…"</string>
-    <string name="notification_missedCallTitle" msgid="8283366068539898486">"Пропуштен повик"</string>
-    <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"Пропуштен работен повик"</string>
-    <string name="notification_missedCallsTitle" msgid="3697442015345089802">"Пропуштени повици"</string>
-    <string name="notification_missedCallsMsg" msgid="8176217633929018706">"<xliff:g id="NUM_MISSED_CALLS">%d</xliff:g> пропуштени повици"</string>
-    <string name="notification_missedCall_call_back" msgid="3875698110051973965">"Повикува назад"</string>
-    <string name="notification_missedCall_message" msgid="5086910028988305964">"Порака"</string>
-    <string name="post_call_notification_message" msgid="5417476789860590611">"<xliff:g id="NAME">%1$s</xliff:g>: <xliff:g id="MESSAGE">%2$s</xliff:g>"</string>
-    <string name="notification_voicemail_text_format" msgid="1895667520930252897">"Бирајте <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
-    <string name="notification_voicemail_no_vm_number" msgid="8942821987929495842">"Бројот на говорната пошта е непознат"</string>
-    <plurals name="notification_voicemail_title" formatted="false" msgid="1551847434476438657">
-      <item quantity="one"> <xliff:g id="COUNT">%1$d</xliff:g> говорна порака </item>
-      <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> говорни пораки </item>
-    </plurals>
-    <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
-    <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"Нова говорна пошта од <xliff:g id="CALLER">%1$s</xliff:g>"</string>
-    <string name="voicemail_playback_error" msgid="4384373852257757295">"Говорната пошта не можеше да се репродуцира"</string>
-    <string name="voicemail_fetching_content" msgid="572320120918636014">"Се вчитува говорната пошта…"</string>
-    <string name="voicemail_fetching_timout" msgid="2128873915839949783">"Говорната пошта не можеше да се вчита"</string>
-    <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_playback_speakerphone" msgid="4852027754869750227">"Вклучете или исклучете интерфон"</string>
-    <string name="description_playback_seek" msgid="1340910573254132520">"Барајте позиција на репродукција"</string>
-    <string name="action_menu_call_history_description" msgid="8829135306925008546">"Историја на повици"</string>
-    <string name="action_menu_overflow_description" msgid="7648679686746517341">"Повеќе опции"</string>
-    <string name="action_menu_dialpad_button" msgid="1970631633457493180">"тастатура за бирање"</string>
-    <string name="dialer_settings_label" msgid="4980176284150290175">"Поставки"</string>
-    <string name="simulator_submenu_label" msgid="186156287346615267">"Симулатор"</string>
-    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Создај крат. за нов интерфејс"</string>
-    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"Влегувате во режим на групно дејство"</string>
-    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"Излеговте од режим на групно дејство"</string>
-    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"Избрано е <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"Поништен е изборот на <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_contact_details" msgid="3341280873855253464">"Детали за контакт за <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_spam_contact_details" msgid="5592578752881528368">"Детали за контакт за повици што се можен спам <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> повици."</string>
-    <string name="description_video_call" msgid="3738199365585751727">"Видеоповик."</string>
-    <string name="description_start_voice_search" msgid="8380022725973015261">"Започни гласовно пребарување"</string>
-    <string name="voicemail" msgid="8899540969000957954">"Говорна пошта"</string>
-    <string name="description_cancel_multi_select" msgid="3930475950253360461">"Откажи го режимот на групни дејства"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Избриши"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Откажи"</string>
-    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"Избрани се <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
-      <item quantity="one">"<b>"Да се избришат говорните пораки? "</b>"</item>
-      <item quantity="other">"<b>"Да се избришат говорните пораки? "</b>"</item>
-    </plurals>
-    <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
-    <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> во <xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
-    <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="voice_search_not_available" msgid="6546240433719732905">"Гласовното пребарување не е достапно"</string>
-    <string name="dialer_hint_find_contact" msgid="2023214799381149808">"Пребарај контакти"</string>
-    <string name="block_number_search_hint" msgid="5377706079015099416">"Додајте број или побарајте контакти"</string>
-    <string name="call_log_all_empty" msgid="3955572868518162004">"Историјата на повици е празна"</string>
-    <string name="call_log_all_empty_action" msgid="852218280136243014">"Повикај"</string>
-    <string name="call_log_missed_empty" msgid="7094936030845062214">"Немате пропуштени повици."</string>
-    <string name="call_log_voicemail_empty" msgid="273623903423275178">"Приемното сандаче на говорната пошта е празно."</string>
-    <string name="call_log_activity_title" msgid="1275242727244945527">"Историја на повици"</string>
-    <string name="call_log_all_title" msgid="6042262422192020327">"Сите"</string>
-    <string name="call_log_missed_title" msgid="17254005889268015">"Пропуштени"</string>
-    <string name="tab_speed_dial" msgid="6616404752227561075">"Брзо бирање"</string>
-    <string name="tab_history" msgid="7420269368689503596">"Историја на повици"</string>
-    <string name="tab_all_contacts" msgid="5531733977693943015">"Контакти"</string>
-    <string name="tab_voicemail" msgid="2458548090088316246">"Говорна пошта"</string>
-    <string name="search_shortcut_call_number" msgid="8847918845036880688">"Повикај <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"Создај нов контакт"</string>
-    <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"Додај на контакт"</string>
-    <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"Испрати SMS"</string>
-    <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"Остварете видеоповик"</string>
-    <string name="search_shortcut_block_number" msgid="4587283230665805776">"Блокирај го бројот"</string>
-    <string name="speed_dial_empty" msgid="3346406399966039505">"Сè уште немате никого на брзо бирање"</string>
-    <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"Додај омилено"</string>
-    <string name="remove_contact" msgid="2353580570488923668">"Отстрани"</string>
-    <string name="select_all" msgid="408601760696146245">"Изберете ги сите"</string>
-    <string name="call_log_action_video_call" msgid="7565549950343850819">"Видеоповик"</string>
-    <string name="call_log_action_send_message" msgid="6948727362660115554">"Испрати порака"</string>
-    <string name="call_log_action_details" msgid="2091370737371449501">"Детали на повик"</string>
-    <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"Испрати на…"</string>
-    <string name="call_log_action_call" msgid="682724094251540583">"Повикај <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_incoming_missed_call" msgid="8292535799379230029">"Пропуштен повик од <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_incoming_answered_call" msgid="3920182963103160610">"Одговорен повик од <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_unread_voicemail" msgid="145170985013419170">"Непрочитана говорна порака од <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_read_voicemail" msgid="5585559881573227732">"Говорна порака од <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_outgoing_call" msgid="543952487882919924">"Повик до <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="call_log_via_number" msgid="1340307109806397650">"на <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> на <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="description_call_action" msgid="4042796498169106545">"Повикај <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_video_call_action" msgid="1237090968588659650">"Видеоповик до <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
-    <string name="description_voicemail_action" msgid="3290143432403538524">"Слушајте говорна пошта од <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_create_new_contact_action" msgid="1928282350281564130">"Создај контакт за <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"Додај <xliff:g id="NAMEORNUMBER">^1</xliff:g> во постоечки контакт"</string>
-    <string name="description_details_action" msgid="2061866409737706174">"Информации на повикот за <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="call_log_header_today" msgid="1576119097475845293">"Денес"</string>
-    <string name="call_log_header_yesterday" msgid="5616077776205329563">"Вчера"</string>
-    <string name="call_log_header_other" msgid="4940676886254217644">"Постари"</string>
-    <string name="voicemail_speaker_on" msgid="3151333608926996668">"Вклучете го звучникот."</string>
-    <string name="voicemail_speaker_off" msgid="2530064206962034201">"Исклучете го звучникот."</string>
-    <string name="voicemail_play_start_pause" msgid="3874823480278334664">"Запрете ја или паузирајте ја репродукцијата."</string>
-    <string name="display_options_title" msgid="3880091801055797975">"Опции за приказ"</string>
-    <string name="sounds_and_vibration_title" msgid="3075050000721181384">"Звуци и вибрации"</string>
-    <string name="accessibility_settings_title" msgid="3329027650429831820">"Пристапност"</string>
-    <string name="ringtone_title" msgid="8377174189894648486">"Мелодија на телефон"</string>
-    <string name="vibrate_on_ring_title" msgid="631441314790960485">"Вибрации и за повици"</string>
-    <string name="dtmf_tone_enable_title" msgid="3273762431523939277">"Тонови на тастатура за бирање"</string>
-    <string name="dtmf_tone_length_title" msgid="534096029202438539">"Должина на тонови на тастатура за бирање"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="applicationLabel">Телефон</string>
+  <string name="launcherDialpadActivityLabel">Тастатура за бирање на телефон</string>
+  <string name="callHistoryIconLabel">Историја на повици</string>
+  <string name="action_copy_number_text">Копирај го бројот</string>
+  <string name="copy_transcript_text">Копирај транскрипција</string>
+  <string name="action_edit_number_before_call">Уредете го бројот пред повикот</string>
+  <string name="call_log_delete_all">Избришете историја на повици?</string>
+  <string name="call_log_trash_voicemail">Избришете ја говорната пошта</string>
+  <string name="snackbar_voicemail_deleted">Гов. пошта е избриш.</string>
+  <string name="clearCallLogConfirmation_title">Избришете историја на повици?</string>
+  <string name="clearCallLogConfirmation">Ова ќе ги избрише сите повици од историјата</string>
+  <string name="clearCallLogProgress_title">Се чисти историјата на повици…</string>
+  <string name="notification_missedCallTitle">Пропуштен повик</string>
+  <string name="notification_missedWorkCallTitle">Пропуштен работен повик</string>
+  <string name="notification_missedCallsTitle">Пропуштени повици</string>
+  <string name="notification_missedCallsMsg">%d пропуштени повици</string>
+  <string name="notification_missedCall_call_back">Повикува назад</string>
+  <string name="notification_missedCall_message">Порака</string>
+  <string name="post_call_notification_message">%1$s: %2$s</string>
+  <string name="notification_voicemail_text_format">Бирајте %s</string>
+  <string name="notification_voicemail_no_vm_number">Бројот на говорната пошта е непознат</string>
+  <plurals name="notification_voicemail_title">
+    <item quantity="one"> %1$d говорна порака </item>
+    <item quantity="other"> %1$d говорни пораки </item>
+  </plurals>
+  <string name="notification_voicemail_callers_list">%1$s, %2$s</string>
+  <string name="notification_new_voicemail_ticker">Нова говорна пошта од %1$s</string>
+  <string name="voicemail_playback_error">Говорната пошта не можеше да се репродуцира</string>
+  <string name="voicemail_fetching_content">Се вчитува говорната пошта…</string>
+  <string name="voicemail_fetching_timout">Говорната пошта не можеше да се вчита</string>
+  <string name="call_log_item_count_and_date">(%1$d) %2$s</string>
+  <string name="description_playback_speakerphone">Вклучете или исклучете интерфон</string>
+  <string name="description_playback_seek">Барајте позиција на репродукција</string>
+  <string name="action_menu_call_history_description">Историја на повици</string>
+  <string msgid="2295659037509008453" name="action_menu_overflow_description">Повеќе опции</string>
+  <string name="action_menu_dialpad_button">тастатура за бирање</string>
+  <string name="dialer_settings_label">Поставки</string>
+  <string name="simulator_submenu_label">Симулатор</string>
+  <string name="new_ui_launcher_shortcut_label">Создај крат. за нов интерфејс</string>
+  <string name="description_entering_bulk_action_mode">Влегувате во режим на групно дејство</string>
+  <string name="description_leaving_bulk_action_mode">Излеговте од режим на групно дејство</string>
+  <string name="description_selecting_bulk_action_mode">Избрано е %1$s</string>
+  <string name="description_unselecting_bulk_action_mode">Поништен е изборот на %1$s</string>
+  <string name="description_contact_details">Детали за контакт за %1$s</string>
+  <string name="description_spam_contact_details">Детали за контакт за повици што се можен спам %1$s</string>
+  <string name="description_num_calls">%1$s повици.</string>
+  <string name="description_video_call">Видеоповик.</string>
+  <string name="description_start_voice_search">Започни гласовно пребарување</string>
+  <string name="voicemail">Говорна пошта</string>
+  <string name="description_cancel_multi_select">Откажи го режимот на групни дејства</string>
+  <string name="voicemailMultiSelectDeleteConfirm">Избриши</string>
+  <string name="voicemailMultiSelectDeleteCancel">Откажи</string>
+  <string name="voicemailMultiSelectActionBarTitle">Избрани се %1$s</string>
+  <plurals name="delete_voicemails_confirmation_dialog_title">
+    <item quantity="one"><b>Да се избришат говорните пораки? </b></item>
+    <item quantity="other"><b>Да се избришат говорните пораки? </b></item>
+  </plurals>
+  <string name="voicemailCallLogToday">@string/call_log_header_today</string>
+  <string name="voicemailCallLogDateTimeFormat">%1$s во %2$s</string>
+  <string name="voicemailDurationFormat">%1$02d:%2$02d</string>
+  <string name="voicemailCallLogDateTimeFormatWithDuration">%1$s • %2$s</string>
+  <string name="voice_search_not_available">Гласовното пребарување не е достапно</string>
+  <string name="dialer_hint_find_contact">Пребарај контакти</string>
+  <string name="block_number_search_hint">Додајте број или побарајте контакти</string>
+  <string name="call_log_all_empty">Историјата на повици е празна</string>
+  <string name="call_log_all_empty_action">Повикај</string>
+  <string name="call_log_missed_empty">Немате пропуштени повици.</string>
+  <string name="call_log_voicemail_empty">Приемното сандаче на говорната пошта е празно.</string>
+  <string name="call_log_activity_title">Историја на повици</string>
+  <string name="call_log_all_title">Сите</string>
+  <string name="call_log_missed_title">Пропуштени</string>
+  <string name="tab_speed_dial">Брзо бирање</string>
+  <string name="tab_history">Историја на повици</string>
+  <string name="tab_all_contacts">Контакти</string>
+  <string name="tab_voicemail">Говорна пошта</string>
+  <string name="search_shortcut_call_number">Повикај %s</string>
+  <string name="search_shortcut_create_new_contact">Создај нов контакт</string>
+  <string name="search_shortcut_add_to_contact">Додај на контакт</string>
+  <string name="search_shortcut_send_sms_message">Испрати SMS</string>
+  <string name="search_shortcut_make_video_call">Остварете видеоповик</string>
+  <string name="search_shortcut_block_number">Блокирај го бројот</string>
+  <string name="speed_dial_empty">Сè уште немате никого на брзо бирање</string>
+  <string name="speed_dial_empty_add_favorite_action">Додај омилено</string>
+  <string name="remove_contact">Отстрани</string>
+  <string name="select_all">Изберете ги сите</string>
+  <string name="call_log_action_video_call">Видеоповик</string>
+  <string name="call_log_action_set_up_video">Поставете видеоповикување</string>
+  <string name="call_log_action_invite_video">Испратете покана за видеоповик</string>
+  <string name="call_log_action_send_message">Испрати порака</string>
+  <string name="call_log_action_details">Детали на повик</string>
+  <string name="call_log_action_share_voicemail">Испрати на…</string>
+  <string name="call_log_action_call">Повикај ^1</string>
+  <string name="description_incoming_missed_call">Пропуштен повик од ^1, ^2, ^3, ^4.</string>
+  <string name="description_incoming_answered_call">Одговорен повик од ^1, ^2, ^3, ^4.</string>
+  <string name="description_unread_voicemail">Непрочитана говорна порака од ^1, ^2, ^3, ^4.</string>
+  <string name="description_read_voicemail">Говорна порака од ^1, ^2, ^3, ^4.</string>
+  <string name="description_outgoing_call">Повик до ^1, ^2, ^3, ^4.</string>
+  <string name="call_log_via_number">на %1$s</string>
+  <string name="call_log_via_number_phone_account">%1$s на %2$s</string>
+  <string name="description_call_action">Повикај ^1</string>
+  <string name="description_video_call_action">Видеоповик до ^1.</string>
+  <string name="description_voicemail_action">Слушајте говорна пошта од ^1</string>
+  <string name="description_create_new_contact_action">Создај контакт за ^1</string>
+  <string name="description_add_to_existing_contact_action">Додај ^1 во постоечки контакт</string>
+  <string name="description_details_action">Информации на повикот за ^1</string>
+  <string name="call_log_header_today">Денес</string>
+  <string name="call_log_header_yesterday">Вчера</string>
+  <string name="call_log_header_other">Постари</string>
+  <string name="voicemail_speaker_on">Вклучете го звучникот.</string>
+  <string name="voicemail_speaker_off">Исклучете го звучникот.</string>
+  <string name="voicemail_play_start_pause">Запрете ја или паузирајте ја репродукцијата.</string>
+  <string name="display_options_title">Опции за приказ</string>
+  <string name="sounds_and_vibration_title">Звуци и вибрации</string>
+  <string name="accessibility_settings_title">Пристапност</string>
+  <string name="ringtone_title">Мелодија на телефон</string>
+  <string name="vibrate_on_ring_title">Вибрации и за повици</string>
+  <string name="dtmf_tone_enable_title">Тонови на тастатура за бирање</string>
+  <string name="dtmf_tone_length_title">Должина на тонови на тастатура за бирање</string>
   <string-array name="dtmf_tone_length_entries">
-    <item msgid="3136353015227162823">"Нормално"</item>
-    <item msgid="5376841175538523822">"Долги"</item>
+    <item>Нормално</item>
+    <item>Долги</item>
   </string-array>
-    <string name="respond_via_sms_setting_title" msgid="8008181606657693452">"Брзи одговори"</string>
-    <string name="call_settings_label" msgid="7824611757200960807">"Повици"</string>
-    <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Блокирање повик"</string>
-    <string name="voicemail_settings_label" msgid="4594299554519920570">"Говорна пошта"</string>
-    <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Блокирањето повик е привремено исклучено"</string>
-    <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Блокирањето повици е исклучено бидејќи ја контактиравте службата за итни случаи од телефонов во изминатите 48 часа. Повторно ќе се овозможи автоматски откако ќе истече периодот од 48 часа."</string>
-    <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Увези броеви"</string>
-    <string name="blocked_call_settings_import_description" msgid="1819412052545228965">"Претходно означивте некои повикувачи да се испратат автоматски на говорната пошта преку други апликации."</string>
-    <string name="blocked_call_settings_view_numbers_button" msgid="3332727948554356704">"Прикажи броеви"</string>
-    <string name="blocked_call_settings_import_button" msgid="7319111700387470727">"Увези"</string>
-    <string name="description_blocked_number_list_delete" msgid="2139644216858370740">"Одблокирај го бројот"</string>
-    <string name="addBlockedNumber" msgid="3053473735238295551">"Додај број"</string>
-    <string name="block_number_footer_message_vvm" msgid="7955326304033982368">"Повиците од овие броеви ќе се блокираат, а говорната пошта автоматски ќе се брише."</string>
-    <string name="block_number_footer_message_no_vvm" msgid="1152684139070471665">"Повиците од овие броеви ќе се блокираат, но можно е сѐ уште да може да ви оставаат говорна пошта."</string>
-    <string name="block_list" msgid="4701585783411870782">"Блокирани броеви"</string>
-    <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g> веќе е блокиран."</string>
-    <string name="phone_account_settings_label" msgid="8372485478006965920">"Сметки за повикување"</string>
-    <string name="permission_no_speeddial" msgid="8487215628510596753">"За да овозможите брзо бирање, вклучете ја дозволата за контакти."</string>
-    <string name="permission_no_calllog" msgid="4053705651238775784">"За да ја видите евиденцијата на повици, вклучете ја дозволата за телефон."</string>
-    <string name="permission_no_search" msgid="2424710404207193826">"За да ги пребарувате контактите, вклучете ги дозволите за контакти."</string>
-    <string name="permission_place_call" msgid="8686908130349369423">"За да воспоставите повик, вклучете ја дозволата за телефон."</string>
-    <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"Апликацијата на телефонот нема дозвола да пишува во поставките на системот."</string>
-    <string name="blocked_number_call_log_label" msgid="4212282846299997693">"Блокирано"</string>
-    <string name="call_log_action_block_report_number" msgid="7302636538668696729">"Блокирај/пријави спам"</string>
-    <string name="call_log_action_block_number" msgid="5048188386501998865">"Блокирај го бројот"</string>
-    <string name="call_log_action_remove_spam" msgid="2045319806318398403">"Не е спам"</string>
-    <string name="call_log_action_unblock_number" msgid="6100117033288448758">"Одблокирај го бројот"</string>
-    <string name="spam_number_call_log_label" msgid="2678431398326811131">"Спам"</string>
-    <string name="call_composer_connection_failed" msgid="6776461585447831242">"Контактот <xliff:g id="NAME">%1$s</xliff:g> е офлајн и недостапен"</string>
-    <string name="about_phone_label" msgid="582991354677973731">"За"</string>
-    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Транскрибирано од Google"</string>
-    <string name="voicemail_transcription_in_progress" msgid="2933320969613783210">"Google транскрибира…"</string>
-    <string name="voicemail_transcription_failed" msgid="335275303117412706">"Не е достапна транскрипција."</string>
-    <string name="voicemail_transcription_failed_language_not_supported" msgid="4210332591050562553">"Не е достапна транскрипција. Јазикот не е поддржан."</string>
-    <string name="voicemail_transcription_failed_no_speech" msgid="9093372879697874852">"Не е достапна транскрипција. Нема откриен говор."</string>
-    <string name="view_conversation" msgid="7895904782094119702">"Прикажи"</string>
-    <string name="ec_data_deleted" msgid="4794880345545827107">"Повикот е избришан. За преглед и бришење на прилозите споделени во текот на разговоров, одете во „Пораки“."</string>
-    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"Повиците се избришани. За преглед и бришење на прилозите споделени во текот на разговорите, одете во „Пораки“."</string>
+  <string name="respond_via_sms_setting_title">Брзи одговори</string>
+  <string name="call_settings_label">Повици</string>
+  <string name="manage_blocked_numbers_label">Блокирани броеви</string>
+  <string name="voicemail_settings_label">Говорна пошта</string>
+  <string name="blocked_numbers_disabled_emergency_header_label">Блокирањето повик е привремено исклучено</string>
+  <string name="blocked_numbers_disabled_emergency_desc">Блокирањето повици е исклучено бидејќи ја контактиравте службата за итни случаи од телефонов во изминатите 48 часа. Повторно ќе се овозможи автоматски откако ќе истече периодот од 48 часа.</string>
+  <string name="import_send_to_voicemail_numbers_label">Увези броеви</string>
+  <string name="blocked_call_settings_import_description">Претходно означивте некои повикувачи да се испратат автоматски на говорната пошта преку други апликации.</string>
+  <string name="blocked_call_settings_view_numbers_button">Прикажи броеви</string>
+  <string name="blocked_call_settings_import_button">Увези</string>
+  <string name="description_blocked_number_list_delete">Одблокирај го бројот</string>
+  <string name="addBlockedNumber">Додај број</string>
+  <string name="block_number_footer_message_vvm">Повиците од овие броеви ќе се блокираат, а говорната пошта автоматски ќе се брише.</string>
+  <string name="block_number_footer_message_no_vvm">Повиците од овие броеви ќе се блокираат, но можно е сѐ уште да може да ви оставаат говорна пошта.</string>
+  <string name="block_list">Блокирани броеви</string>
+  <string name="alreadyBlocked">%1$s веќе е блокиран.</string>
+  <string name="phone_account_settings_label">Сметки за повикување</string>
+  <string name="permission_no_speeddial">За да овозможите брзо бирање, вклучете ја дозволата за контакти.</string>
+  <string name="permission_no_calllog">За да ја видите евиденцијата на повици, вклучете ја дозволата за телефон.</string>
+  <string name="permission_no_search">За да ги пребарувате контактите, вклучете ги дозволите за контакти.</string>
+  <string name="permission_place_call">За да воспоставите повик, вклучете ја дозволата за телефон.</string>
+  <string name="toast_cannot_write_system_settings">Апликацијата на телефонот нема дозвола да пишува во поставките на системот.</string>
+  <string name="blocked_number_call_log_label">Блокирано</string>
+  <string name="call_log_action_block_report_number">Блокирај/пријави спам</string>
+  <string name="call_log_action_block_number">Блокирај го бројот</string>
+  <string name="call_log_action_remove_spam">Не е спам</string>
+  <string name="call_log_action_unblock_number">Одблокирај го бројот</string>
+  <string name="spam_number_call_log_label">Спам</string>
+  <string name="call_composer_connection_failed">Контактот %1$s е офлајн и недостапен</string>
+  <string name="about_phone_label">За</string>
+  <string name="voicemail_transcription_branding_text">Транскрибирано од Google</string>
+  <string name="voicemail_transcription_in_progress">Се транскрибира…</string>
+  <string name="voicemail_transcription_failed">Не е достапна транскрипција.</string>
+  <string name="voicemail_transcription_failed_language_not_supported">Не е достапна транскрипција. Јазикот не е поддржан.</string>
+  <string name="voicemail_transcription_failed_no_speech">Не е достапна транскрипција. Нема откриен говор.</string>
+  <string name="voicemail_donation_promo_title">Ќе помогнете да се зголеми прецизноста на транскрипцијата?</string>
+  <string name="voicemail_donation_promo_content">Дозволете Google да ги прегледува оваа и идните пораки од говорната пошта со преписи. Ќе се складираат анонимно. Променете во „Поставки“ во секое време. %1$s</string>
+  <string name="voicemail_donation_promo_opt_in">Да, прифаќам</string>
+  <string name="voicemail_donation_promo_opt_out">Не, фала</string>
+  <string name="voicemail_transcription_rating">Оценете го квалит. на преписот</string>
+  <string name="voicemail_transcription_rating_thanks">Ви благодариме за повратните информации</string>
+  <string name="description_rating_good">Ми се допаѓа</string>
+  <string name="description_rating_bad">Не ми се допаѓа</string>
+  <string name="view_conversation">Прикажи</string>
+  <string name="ec_data_deleted">Повикот е избришан. За преглед и бришење на прилозите споделени во текот на разговоров, одете во „Пораки“.</string>
+  <string name="multiple_ec_data_deleted">Повиците се избришани. За преглед и бришење на прилозите споделени во текот на разговорите, одете во „Пораки“.</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-ml/strings.xml b/java/com/android/dialer/app/res/values-ml/strings.xml
index 1618042..d6fbb5b 100644
--- a/java/com/android/dialer/app/res/values-ml/strings.xml
+++ b/java/com/android/dialer/app/res/values-ml/strings.xml
@@ -1,179 +1,171 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="applicationLabel" msgid="2202739481132958990">"ഫോണ്‍"</string>
-    <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"ഫോൺ കീപാഡ്"</string>
-    <string name="callHistoryIconLabel" msgid="7493268743411968630">"കോള്‍‌ ചരിത്രം"</string>
-    <string name="action_copy_number_text" msgid="832682558551502319">"നമ്പർ പകർത്തുക"</string>
-    <string name="copy_transcript_text" msgid="937904189017310829">"ട്രാൻസ്ക്രിപ്ഷൻ പകർത്തുക"</string>
-    <string name="action_edit_number_before_call" msgid="8017492815878473837">"കോൾ ചെയ്യുംമുമ്പ് നമ്പർ എഡിറ്റുചെയ്യൂ"</string>
-    <string name="call_log_delete_all" msgid="7852970926906523784">"കോൾ ചരിത്രം മായ്‌ക്കുക"</string>
-    <string name="call_log_trash_voicemail" msgid="6118493534178533972">"വോയ്‌സ്മെയിൽ ഇല്ലാതാക്കുക"</string>
-    <string name="snackbar_voicemail_deleted" msgid="7463166543725496307">"വോയ്സ്മെയിൽ ഇല്ലാതാക്കി"</string>
-    <string name="snackbar_voicemail_deleted_undo" msgid="6959743982796409941">"പഴയപടിയാക്കുക"</string>
-    <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"കോൾ ചരിത്രം മായ്‌ക്കണോ?"</string>
-    <string name="clearCallLogConfirmation" msgid="6844949465815109166">"ഇത് നിങ്ങളുടെ ചരിത്രത്തിൽ നിന്ന് എല്ലാ കോളുകളും ഇല്ലാതാക്കും"</string>
-    <string name="clearCallLogProgress_title" msgid="995004835687361977">"കോൾ ചരിത്രം മായ്‌ക്കുന്നു..."</string>
-    <string name="notification_missedCallTitle" msgid="8283366068539898486">"മിസ്‌ഡ് കോൾ"</string>
-    <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"മിസ്ഡ് ഔദ്യോഗിക കോൾ"</string>
-    <string name="notification_missedCallsTitle" msgid="3697442015345089802">"മിസ്‌ഡ് കോളുകൾ"</string>
-    <string name="notification_missedCallsMsg" msgid="8176217633929018706">"<xliff:g id="NUM_MISSED_CALLS">%d</xliff:g> മിസ്‌ഡ് കോളുകൾ"</string>
-    <string name="notification_missedCall_call_back" msgid="3875698110051973965">"കോൾബാക്ക്"</string>
-    <string name="notification_missedCall_message" msgid="5086910028988305964">"സന്ദേശം"</string>
-    <string name="post_call_notification_message" msgid="5417476789860590611">"<xliff:g id="NAME">%1$s</xliff:g>: <xliff:g id="MESSAGE">%2$s</xliff:g>"</string>
-    <string name="notification_voicemail_text_format" msgid="1895667520930252897">"<xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g> ഡയൽ ചെയ്യുക"</string>
-    <string name="notification_voicemail_no_vm_number" msgid="8942821987929495842">"വോയ്‌സ്‌മെയിൽ നമ്പർ അജ്ഞാതമാണ്"</string>
-    <plurals name="notification_voicemail_title" formatted="false" msgid="1551847434476438657">
-      <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> വോയ്‌സ്‌മെയിലുകൾ </item>
-      <item quantity="one">വോയ്‌സ്‌മെയിൽ</item>
-    </plurals>
-    <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
-    <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"<xliff:g id="CALLER">%1$s</xliff:g> എന്നയാളിൽ നിന്നുള്ള പുതിയ വോയ്‌സ്‌മെയിൽ"</string>
-    <string name="voicemail_playback_error" msgid="4384373852257757295">"വോയ്‌സ്‌മെയിൽ പ്‌ലേ ചെയ്യാനായില്ല"</string>
-    <string name="voicemail_fetching_content" msgid="572320120918636014">"വോയ്‌സ്‌മെയിൽ ലോഡുചെയ്യുന്നു..."</string>
-    <string name="voicemail_fetching_timout" msgid="2128873915839949783">"വോയ്‌സ്‌മെയിൽ ലോഡുചെയ്യാനായില്ല"</string>
-    <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_playback_speakerphone" msgid="4852027754869750227">"സ്‌പീക്കർ ഫോൺ ഓണാക്കുക അല്ലെങ്കിൽ ഓഫാക്കുക"</string>
-    <string name="description_playback_seek" msgid="1340910573254132520">"പ്ലേബാക്ക് സ്ഥാനം തിരയുക"</string>
-    <string name="action_menu_call_history_description" msgid="8829135306925008546">"കോള്‍‌ ചരിത്രം"</string>
-    <string name="action_menu_overflow_description" msgid="7648679686746517341">"കൂടുതൽ‍ ഓപ്‌ഷനുകള്‍"</string>
-    <string name="action_menu_dialpad_button" msgid="1970631633457493180">"കീപാഡ്"</string>
-    <string name="dialer_settings_label" msgid="4980176284150290175">"ക്രമീകരണം"</string>
-    <string name="simulator_submenu_label" msgid="186156287346615267">"സിമുലേറ്റർ"</string>
-    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"പുതിയ UI കുറുക്കുവഴി സൃഷ്‌ടിക്കുക"</string>
-    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"ബൾക്ക് പ്രവർത്തന മോഡിലേക്ക് പ്രവേശിക്കുന്നു"</string>
-    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"ബൾക്ക് പ്രവർത്തന മോഡ് വിട്ടു"</string>
-    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> തിരഞ്ഞെടുത്തു"</string>
-    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> തിരഞ്ഞെടുത്തത് മാറ്റി"</string>
-    <string name="description_contact_details" msgid="3341280873855253464">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> എന്നതിന്റെ കോൺ‌ടാക്റ്റ് വിശദാംശങ്ങൾ"</string>
-    <string name="description_spam_contact_details" msgid="5592578752881528368">"സംശയമുള്ള <xliff:g id="NAMEORNUMBER">%1$s</xliff:g> സ്‌പാം കോളറിന്റെ കോൺടാക്‌റ്റ് വിശദാംശങ്ങൾ"</string>
-    <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> കോളുകൾ."</string>
-    <string name="description_video_call" msgid="3738199365585751727">"വീഡിയോ കോൾ."</string>
-    <string name="description_start_voice_search" msgid="8380022725973015261">"ശബ്ദ തിരയൽ ആരംഭിക്കുക"</string>
-    <string name="voicemail" msgid="8899540969000957954">"വോയ്‌സ്‌മെയിൽ"</string>
-    <string name="description_cancel_multi_select" msgid="3930475950253360461">"\'ബാച്ച് പ്രവർത്തനങ്ങൾ\' മോഡ് റദ്ദാക്കുക"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"ഇല്ലാതാക്കുക"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"റദ്ദാക്കൂ"</string>
-    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> എണ്ണം തിരഞ്ഞെടുത്തു"</string>
-    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
-      <item quantity="other">"<b>"ഈ വോയ്‌സ്‌മെയിലുകൾ ഇല്ലാതാക്കണോ? "</b>"</item>
-      <item quantity="one">"<b>"ഈ വോയ്‌സ്‌മെയിൽ ഇല്ലാതാക്കണോ? "</b>"</item>
-    </plurals>
-    <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
-    <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g>, <xliff:g id="TIME">%2$s</xliff:g>-ന്"</string>
-    <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
-    <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="voice_search_not_available" msgid="6546240433719732905">"വോയ്‌സ് തിരയൽ ലഭ്യമല്ല"</string>
-    <string name="dialer_hint_find_contact" msgid="2023214799381149808">"കോണ്‍‌ടാക്റ്റുകള്‍ തിരയുക"</string>
-    <string name="block_number_search_hint" msgid="5377706079015099416">"നമ്പർ ചേർക്കുക അല്ലെങ്കിൽ കോൺടാക്റ്റുകൾ തിരയുക"</string>
-    <string name="call_log_all_empty" msgid="3955572868518162004">"നിങ്ങളുടെ കോൾ ചരിത്രം ശൂന്യമാണ്"</string>
-    <string name="call_log_all_empty_action" msgid="852218280136243014">"ഒരു കോൾ ചെയ്യുക"</string>
-    <string name="call_log_missed_empty" msgid="7094936030845062214">"നിങ്ങൾക്ക് മിസ്‌ഡ് കോളുകളൊന്നുമില്ല."</string>
-    <string name="call_log_voicemail_empty" msgid="273623903423275178">"നിങ്ങളുടെ വോയ്സ്മെയിൽ ഇൻബോക്സ് ശൂന്യമാണ്."</string>
-    <string name="call_log_activity_title" msgid="1275242727244945527">"കോള്‍‌ ചരിത്രം"</string>
-    <string name="call_log_all_title" msgid="6042262422192020327">"എല്ലാം"</string>
-    <string name="call_log_missed_title" msgid="17254005889268015">"മിസ്‌ഡ്"</string>
-    <string name="tab_speed_dial" msgid="6616404752227561075">"സ്‌പീഡ് ഡയൽ"</string>
-    <string name="tab_history" msgid="7420269368689503596">"കോൾ ചരിത്രം"</string>
-    <string name="tab_all_contacts" msgid="5531733977693943015">"കോണ്‍ടാക്റ്റുകള്‍"</string>
-    <string name="tab_voicemail" msgid="2458548090088316246">"വോയ്‌സ്‌മെയിൽ"</string>
-    <string name="search_shortcut_call_number" msgid="8847918845036880688">"വിളിക്കുക <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"പുതിയകോൺടാക്റ്റ് സൃഷ്‌ടിക്കൂ"</string>
-    <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"ഒരുകോൺടാക്റ്റിൽ ചേർക്കൂ"</string>
-    <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"SMS അയയ്ക്കുക"</string>
-    <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"വീഡിയോ കോൾ ചെയ്യുക"</string>
-    <string name="search_shortcut_block_number" msgid="4587283230665805776">"നമ്പർ ബ്ലോക്കുചെയ്യുക"</string>
-    <string name="speed_dial_empty" msgid="3346406399966039505">"ഇതുവരെ ആരും നിങ്ങളുടെ സ്പീഡ് ഡയലിൽ ഇല്ല"</string>
-    <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"പ്രിയപ്പെട്ടത് ചേർക്കുക"</string>
-    <string name="remove_contact" msgid="2353580570488923668">"നീക്കംചെയ്യുക"</string>
-    <string name="select_all" msgid="408601760696146245">"എല്ലാം തിരഞ്ഞെടുക്കുക"</string>
-    <string name="call_log_action_video_call" msgid="7565549950343850819">"വീഡിയോ കോള്‍"</string>
-    <string name="call_log_action_send_message" msgid="6948727362660115554">"ഒരു സന്ദേശം അയയ്‌ക്കുക"</string>
-    <string name="call_log_action_details" msgid="2091370737371449501">"കോൾ വിശദാംശങ്ങൾ"</string>
-    <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"ഇതിലേക്ക് അയയ്‌ക്കുക ..."</string>
-    <string name="call_log_action_call" msgid="682724094251540583">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> എന്ന നമ്പർ/വ്യക്തിയെ വിളിക്കൂ"</string>
-    <string name="description_incoming_missed_call" msgid="8292535799379230029">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g> എന്നതിൽ നിന്നുള്ള മിസ്ഡ് കോൾ."</string>
-    <string name="description_incoming_answered_call" msgid="3920182963103160610">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g> എന്നതിൽ നിന്നുള്ള മറുപടി നൽകിയ കോൾ."</string>
-    <string name="description_unread_voicemail" msgid="145170985013419170">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g> എന്നതിൽ നിന്നുള്ള വായിക്കാത്ത വോയ്സ്മെയിൽ."</string>
-    <string name="description_read_voicemail" msgid="5585559881573227732">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g> എന്നതിൽ നിന്നുള്ള വോയ്സ്മെയിൽ."</string>
-    <string name="description_outgoing_call" msgid="543952487882919924">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g> എന്നതിലേക്കുള്ള കോൾ."</string>
-    <string name="call_log_via_number" msgid="1340307109806397650">"<xliff:g id="NUMBER">%1$s</xliff:g> നമ്പർ വഴി"</string>
-    <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="NUMBER">%2$s</xliff:g> നമ്പർ വഴി, <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>"</string>
-    <string name="description_call_action" msgid="4042796498169106545">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> വിളിക്കുക"</string>
-    <string name="description_video_call_action" msgid="1237090968588659650">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> എന്നതുമായി വീഡിയോ കോൾ നടത്തുക."</string>
-    <string name="description_voicemail_action" msgid="3290143432403538524">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> എന്നയാളിൽ നിന്നുള്ള വോയ്‌സ്മെയിൽ കേൾക്കുക"</string>
-    <string name="description_create_new_contact_action" msgid="1928282350281564130">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> എന്നതിനായി കോൺടാക്റ്റ് സൃഷ്‌ടിക്കുക"</string>
-    <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"നിലവിലുള്ള കോൺടാക്റ്റിലേക്ക് <xliff:g id="NAMEORNUMBER">^1</xliff:g> ചേർക്കുക"</string>
-    <string name="description_details_action" msgid="2061866409737706174">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> എന്നയാളുടെ കോൾ വിശദാംശങ്ങൾ"</string>
-    <string name="call_log_header_today" msgid="1576119097475845293">"ഇന്ന്"</string>
-    <string name="call_log_header_yesterday" msgid="5616077776205329563">"ഇന്നലെ"</string>
-    <string name="call_log_header_other" msgid="4940676886254217644">"പഴയത്"</string>
-    <string name="voicemail_speaker_on" msgid="3151333608926996668">"സ്‌പീക്കർ ഓണാക്കുക."</string>
-    <string name="voicemail_speaker_off" msgid="2530064206962034201">"സ്‌പീക്കർ ഓഫാക്കുക."</string>
-    <string name="voicemail_play_start_pause" msgid="3874823480278334664">"പ്ലേബാക്ക് ആരംഭിക്കുകയോ താൽക്കാലികമായി നിർത്തുകയോ ചെയ്യുക."</string>
-    <string name="display_options_title" msgid="3880091801055797975">"ഡിസ്‌പ്ലേ ഓപ്‌ഷനുകൾ"</string>
-    <string name="sounds_and_vibration_title" msgid="3075050000721181384">"ശബ്‌ദവും വൈബ്രേഷനും"</string>
-    <string name="accessibility_settings_title" msgid="3329027650429831820">"ഉപയോഗസഹായി"</string>
-    <string name="ringtone_title" msgid="8377174189894648486">"ഫോൺ റിംഗ്ടോൺ"</string>
-    <string name="vibrate_on_ring_title" msgid="631441314790960485">"കോളുകൾക്കും വൈബ്രേറ്റ്"</string>
-    <string name="dtmf_tone_enable_title" msgid="3273762431523939277">"കീപാഡ് ടോണുകൾ"</string>
-    <string name="dtmf_tone_length_title" msgid="534096029202438539">"കീപാഡ് ടോണിന്റെ ദൈർഘ്യം"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="applicationLabel">ഫോണ്‍</string>
+  <string name="launcherDialpadActivityLabel">ഫോൺ കീപാഡ്</string>
+  <string name="callHistoryIconLabel">കോള്‍‌ ചരിത്രം</string>
+  <string name="action_copy_number_text">നമ്പർ പകർത്തുക</string>
+  <string name="copy_transcript_text">ട്രാൻസ്ക്രിപ്ഷൻ പകർത്തുക</string>
+  <string name="action_edit_number_before_call">കോൾ ചെയ്യുംമുമ്പ് നമ്പർ എഡിറ്റുചെയ്യൂ</string>
+  <string name="call_log_delete_all">കോൾ ചരിത്രം മായ്‌ക്കുക</string>
+  <string name="call_log_trash_voicemail">വോയ്‌സ്മെയിൽ ഇല്ലാതാക്കുക</string>
+  <string name="snackbar_voicemail_deleted">വോയ്സ്മെയിൽ ഇല്ലാതാക്കി</string>
+  <string name="clearCallLogConfirmation_title">കോൾ ചരിത്രം മായ്‌ക്കണോ?</string>
+  <string name="clearCallLogConfirmation">ഇത് നിങ്ങളുടെ ചരിത്രത്തിൽ നിന്ന് എല്ലാ കോളുകളും ഇല്ലാതാക്കും</string>
+  <string name="clearCallLogProgress_title">കോൾ ചരിത്രം മായ്‌ക്കുന്നു...</string>
+  <string name="notification_missedCallTitle">മിസ്‌ഡ് കോൾ</string>
+  <string name="notification_missedWorkCallTitle">മിസ്ഡ് ഔദ്യോഗിക കോൾ</string>
+  <string name="notification_missedCallsTitle">മിസ്‌ഡ് കോളുകൾ</string>
+  <string name="notification_missedCallsMsg">%d മിസ്‌ഡ് കോളുകൾ</string>
+  <string name="notification_missedCall_call_back">കോൾബാക്ക്</string>
+  <string name="notification_missedCall_message">സന്ദേശം</string>
+  <string name="post_call_notification_message">%1$s: %2$s</string>
+  <string name="notification_voicemail_text_format">%s ഡയൽ ചെയ്യുക</string>
+  <string name="notification_voicemail_no_vm_number">വോയ്‌സ്‌മെയിൽ നമ്പർ അജ്ഞാതമാണ്</string>
+  <plurals name="notification_voicemail_title">
+    <item quantity="one">വോയ്‌സ്‌മെയിൽ</item>
+    <item quantity="other"> %1$d വോയ്‌സ്‌മെയിലുകൾ </item>
+  </plurals>
+  <string name="notification_voicemail_callers_list">%1$s, %2$s</string>
+  <string name="notification_new_voicemail_ticker">%1$s എന്നയാളിൽ നിന്നുള്ള പുതിയ വോയ്‌സ്‌മെയിൽ</string>
+  <string name="voicemail_playback_error">വോയ്‌സ്‌മെയിൽ പ്‌ലേ ചെയ്യാനായില്ല</string>
+  <string name="voicemail_fetching_content">വോയ്‌സ്‌മെയിൽ ലോഡുചെയ്യുന്നു...</string>
+  <string name="voicemail_fetching_timout">വോയ്‌സ്‌മെയിൽ ലോഡുചെയ്യാനായില്ല</string>
+  <string name="call_log_item_count_and_date">(%1$d) %2$s</string>
+  <string name="description_playback_speakerphone">സ്‌പീക്കർ ഫോൺ ഓണാക്കുക അല്ലെങ്കിൽ ഓഫാക്കുക</string>
+  <string name="description_playback_seek">പ്ലേബാക്ക് സ്ഥാനം തിരയുക</string>
+  <string name="action_menu_call_history_description">കോള്‍‌ ചരിത്രം</string>
+  <string msgid="2295659037509008453" name="action_menu_overflow_description">കൂടുതൽ‍ ഓപ്‌ഷനുകള്‍</string>
+  <string name="action_menu_dialpad_button">കീപാഡ്</string>
+  <string name="dialer_settings_label">ക്രമീകരണം</string>
+  <string name="simulator_submenu_label">സിമുലേറ്റർ</string>
+  <string name="new_ui_launcher_shortcut_label">പുതിയ UI കുറുക്കുവഴി സൃഷ്‌ടിക്കുക</string>
+  <string name="description_entering_bulk_action_mode">ബൾക്ക് പ്രവർത്തന മോഡിലേക്ക് പ്രവേശിക്കുന്നു</string>
+  <string name="description_leaving_bulk_action_mode">ബൾക്ക് പ്രവർത്തന മോഡ് വിട്ടു</string>
+  <string name="description_selecting_bulk_action_mode">%1$s തിരഞ്ഞെടുത്തു</string>
+  <string name="description_unselecting_bulk_action_mode">%1$s തിരഞ്ഞെടുത്തത് മാറ്റി</string>
+  <string name="description_contact_details">%1$s എന്നതിന്റെ കോൺ‌ടാക്റ്റ് വിശദാംശങ്ങൾ</string>
+  <string name="description_spam_contact_details">സംശയമുള്ള %1$s സ്‌പാം കോളറിന്റെ കോൺടാക്‌റ്റ് വിശദാംശങ്ങൾ</string>
+  <string name="description_num_calls">%1$s കോളുകൾ.</string>
+  <string name="description_video_call">വീഡിയോ കോൾ.</string>
+  <string name="description_start_voice_search">ശബ്ദ തിരയൽ ആരംഭിക്കുക</string>
+  <string name="voicemail">വോയ്‌സ്‌മെയിൽ</string>
+  <string name="description_cancel_multi_select">\'ബാച്ച് പ്രവർത്തനങ്ങൾ\' മോഡ് റദ്ദാക്കുക</string>
+  <string name="voicemailMultiSelectDeleteConfirm">ഇല്ലാതാക്കുക</string>
+  <string name="voicemailMultiSelectDeleteCancel">റദ്ദാക്കൂ</string>
+  <string name="voicemailMultiSelectActionBarTitle">%1$s എണ്ണം തിരഞ്ഞെടുത്തു</string>
+  <plurals name="delete_voicemails_confirmation_dialog_title">
+    <item quantity="one"><b>ഈ വോയ്‌സ്‌മെയിൽ ഇല്ലാതാക്കണോ? </b></item>
+    <item quantity="other"><b>ഈ വോയ്‌സ്‌മെയിലുകൾ ഇല്ലാതാക്കണോ? </b></item>
+  </plurals>
+  <string name="voicemailCallLogToday">@string/call_log_header_today</string>
+  <string name="voicemailCallLogDateTimeFormat">%1$s, %2$s-ന്</string>
+  <string name="voicemailDurationFormat">%1$02d:%2$02d</string>
+  <string name="voicemailCallLogDateTimeFormatWithDuration">%1$s • %2$s</string>
+  <string name="voice_search_not_available">വോയ്‌സ് തിരയൽ ലഭ്യമല്ല</string>
+  <string name="dialer_hint_find_contact">കോണ്‍‌ടാക്റ്റുകള്‍ തിരയുക</string>
+  <string name="block_number_search_hint">നമ്പർ ചേർക്കുക അല്ലെങ്കിൽ കോൺടാക്റ്റുകൾ തിരയുക</string>
+  <string name="call_log_all_empty">നിങ്ങളുടെ കോൾ ചരിത്രം ശൂന്യമാണ്</string>
+  <string name="call_log_all_empty_action">ഒരു കോൾ ചെയ്യുക</string>
+  <string name="call_log_missed_empty">നിങ്ങൾക്ക് മിസ്‌ഡ് കോളുകളൊന്നുമില്ല.</string>
+  <string name="call_log_voicemail_empty">നിങ്ങളുടെ വോയ്സ്മെയിൽ ഇൻബോക്സ് ശൂന്യമാണ്.</string>
+  <string name="call_log_activity_title">കോള്‍‌ ചരിത്രം</string>
+  <string name="call_log_all_title">എല്ലാം</string>
+  <string name="call_log_missed_title">മിസ്‌ഡ്</string>
+  <string name="tab_speed_dial">സ്‌പീഡ് ഡയൽ</string>
+  <string name="tab_history">കോൾ ചരിത്രം</string>
+  <string name="tab_all_contacts">കോണ്‍ടാക്റ്റുകള്‍</string>
+  <string name="tab_voicemail">വോയ്‌സ്‌മെയിൽ</string>
+  <string name="search_shortcut_call_number">വിളിക്കുക %s</string>
+  <string name="search_shortcut_create_new_contact">പുതിയകോൺടാക്റ്റ് സൃഷ്‌ടിക്കൂ</string>
+  <string name="search_shortcut_add_to_contact">ഒരുകോൺടാക്റ്റിൽ ചേർക്കൂ</string>
+  <string name="search_shortcut_send_sms_message">SMS അയയ്ക്കുക</string>
+  <string name="search_shortcut_make_video_call">വീഡിയോ കോൾ ചെയ്യുക</string>
+  <string name="search_shortcut_block_number">നമ്പർ ബ്ലോക്കുചെയ്യുക</string>
+  <string name="speed_dial_empty">ഇതുവരെ ആരും നിങ്ങളുടെ സ്പീഡ് ഡയലിൽ ഇല്ല</string>
+  <string name="speed_dial_empty_add_favorite_action">പ്രിയപ്പെട്ടത് ചേർക്കുക</string>
+  <string name="remove_contact">നീക്കംചെയ്യുക</string>
+  <string name="select_all">എല്ലാം തിരഞ്ഞെടുക്കുക</string>
+  <string name="call_log_action_video_call">വീഡിയോ കോള്‍</string>
+  <string name="call_log_action_set_up_video">വീഡിയോ കോളിംഗ് സജ്ജമാക്കുക</string>
+  <string name="call_log_action_invite_video">വീഡിയോ കോളിലേക്ക് ക്ഷണിക്കുക</string>
+  <string name="call_log_action_send_message">ഒരു സന്ദേശം അയയ്‌ക്കുക</string>
+  <string name="call_log_action_details">കോൾ വിശദാംശങ്ങൾ</string>
+  <string name="call_log_action_share_voicemail">ഇതിലേക്ക് അയയ്‌ക്കുക ...</string>
+  <string name="call_log_action_call">^1 എന്ന നമ്പർ/വ്യക്തിയെ വിളിക്കൂ</string>
+  <string name="description_incoming_missed_call">^1, ^2, ^3, ^4 എന്നതിൽ നിന്നുള്ള മിസ്ഡ് കോൾ.</string>
+  <string name="description_incoming_answered_call">^1, ^2, ^3, ^4 എന്നതിൽ നിന്നുള്ള മറുപടി നൽകിയ കോൾ.</string>
+  <string name="description_unread_voicemail">^1, ^2, ^3, ^4 എന്നതിൽ നിന്നുള്ള വായിക്കാത്ത വോയ്സ്മെയിൽ.</string>
+  <string name="description_read_voicemail">^1, ^2, ^3, ^4 എന്നതിൽ നിന്നുള്ള വോയ്സ്മെയിൽ.</string>
+  <string name="description_outgoing_call">^1, ^2, ^3, ^4 എന്നതിലേക്കുള്ള കോൾ.</string>
+  <string name="call_log_via_number">%1$s നമ്പർ വഴി</string>
+  <string name="call_log_via_number_phone_account">%2$s നമ്പർ വഴി, %1$s</string>
+  <string name="description_call_action">^1 വിളിക്കുക</string>
+  <string name="description_video_call_action">^1 എന്നതുമായി വീഡിയോ കോൾ നടത്തുക.</string>
+  <string name="description_voicemail_action">^1 എന്നയാളിൽ നിന്നുള്ള വോയ്‌സ്മെയിൽ കേൾക്കുക</string>
+  <string name="description_create_new_contact_action">^1 എന്നതിനായി കോൺടാക്റ്റ് സൃഷ്‌ടിക്കുക</string>
+  <string name="description_add_to_existing_contact_action">നിലവിലുള്ള കോൺടാക്റ്റിലേക്ക് ^1 ചേർക്കുക</string>
+  <string name="description_details_action">^1 എന്നയാളുടെ കോൾ വിശദാംശങ്ങൾ</string>
+  <string name="call_log_header_today">ഇന്ന്</string>
+  <string name="call_log_header_yesterday">ഇന്നലെ</string>
+  <string name="call_log_header_other">പഴയത്</string>
+  <string name="voicemail_speaker_on">സ്‌പീക്കർ ഓണാക്കുക.</string>
+  <string name="voicemail_speaker_off">സ്‌പീക്കർ ഓഫാക്കുക.</string>
+  <string name="voicemail_play_start_pause">പ്ലേബാക്ക് ആരംഭിക്കുകയോ താൽക്കാലികമായി നിർത്തുകയോ ചെയ്യുക.</string>
+  <string name="display_options_title">ഡിസ്‌പ്ലേ ഓപ്‌ഷനുകൾ</string>
+  <string name="sounds_and_vibration_title">ശബ്‌ദവും വൈബ്രേഷനും</string>
+  <string name="accessibility_settings_title">ഉപയോഗസഹായി</string>
+  <string name="ringtone_title">ഫോൺ റിംഗ്ടോൺ</string>
+  <string name="vibrate_on_ring_title">കോളുകൾക്കും വൈബ്രേറ്റ്</string>
+  <string name="dtmf_tone_enable_title">കീപാഡ് ടോണുകൾ</string>
+  <string name="dtmf_tone_length_title">കീപാഡ് ടോണിന്റെ ദൈർഘ്യം</string>
   <string-array name="dtmf_tone_length_entries">
-    <item msgid="3136353015227162823">"സാധാരണം"</item>
-    <item msgid="5376841175538523822">"ദൈർഘ്യമുള്ളത്"</item>
+    <item>സാധാരണം</item>
+    <item>ദൈർഘ്യമുള്ളത്</item>
   </string-array>
-    <string name="respond_via_sms_setting_title" msgid="8008181606657693452">"അതിവേഗ പ്രതികരണങ്ങൾ"</string>
-    <string name="call_settings_label" msgid="7824611757200960807">"കോളുകൾ"</string>
-    <string name="manage_blocked_numbers_label" msgid="16823761991832273">"കോൾ ബ്ലോക്കുചെയ്യൽ"</string>
-    <string name="voicemail_settings_label" msgid="4594299554519920570">"വോയ്സ് മെയില്‍"</string>
-    <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"കോൾ ബ്ലോക്കുചെയ്യൽ താൽക്കാലികമായി ഓഫാണ്"</string>
-    <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"കഴിഞ്ഞ 48 മണിക്കൂറിനുള്ളിൽ നിങ്ങൾ ഈ ഫോണിൽ നിന്ന് അടിയന്തിര സേവനങ്ങളുമായി ബന്ധപ്പെട്ടതിനാൽ കോൾ ബ്ലോക്കുചെയ്യൽ പ്രവർത്തനരഹിതമാക്കി. 48 മണിക്കൂർ സമയപരിധി കഴിഞ്ഞയുടൻ ഇത് സ്വയമേവ പ്രവർത്തനക്ഷമമാക്കപ്പെടും."</string>
-    <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"നമ്പറുകൾ ഇമ്പോർട്ടുചെയ്യുക"</string>
-    <string name="blocked_call_settings_import_description" msgid="1819412052545228965">"മറ്റ് ആപ്സ് വഴി വോയ്സ്‌മെയിൽ സ്വയമേവ അയയ്ക്കുന്നതിന് കോൾ ചെയ്യുന്നവരിൽ ചിലരെ നിങ്ങൾ മുമ്പ് അടയാളപ്പെടുത്തി."</string>
-    <string name="blocked_call_settings_view_numbers_button" msgid="3332727948554356704">"നമ്പറുകൾ കാണുക"</string>
-    <string name="blocked_call_settings_import_button" msgid="7319111700387470727">"ഇമ്പോർട്ടുചെയ്യുക"</string>
-    <string name="description_blocked_number_list_delete" msgid="2139644216858370740">"നമ്പർ അൺബ്ലോക്കുചെയ്യുക"</string>
-    <string name="addBlockedNumber" msgid="3053473735238295551">"നമ്പർ ചേർക്കുക"</string>
-    <string name="block_number_footer_message_vvm" msgid="7955326304033982368">"ഈ നമ്പറുകളിൽ നിന്നുള്ള കോളുകൾ ബ്ലോക്കുചെയ്യും, വോയ്സ്മെയിലുകളെ സ്വയമേവ ഇല്ലാതാക്കും."</string>
-    <string name="block_number_footer_message_no_vvm" msgid="1152684139070471665">"ഈ നമ്പറുകളിൽ നിന്നുള്ള കോളുകൾ ബ്ലോക്കുചെയ്യും, എന്നാൽ വിളിക്കുന്നവർക്ക് അപ്പോഴും നിങ്ങൾക്ക് വോയ്സ്‌മെയിലുകൾ അയയ്ക്കാൻ കഴിഞ്ഞേക്കാം."</string>
-    <string name="block_list" msgid="4701585783411870782">"ബ്ലോക്കുചെയ്ത നമ്പറുകൾ"</string>
-    <string name="alreadyBlocked" msgid="5483253180532475653">"ഇതിനകം തന്നെ <xliff:g id="NUMBER">%1$s</xliff:g> ബ്ലോക്കുചെയ്തിരിക്കുന്നു"</string>
-    <string name="phone_account_settings_label" msgid="8372485478006965920">"കോളിംഗ് അക്കൗണ്ട്"</string>
-    <string name="permission_no_speeddial" msgid="8487215628510596753">"സ്പീഡ് ഡയൽ പ്രവർത്തനക്ഷമാക്കുന്നതിന്, \'കോൺടാക്റ്റുകൾ\' അനുമതി ഓണാക്കുക."</string>
-    <string name="permission_no_calllog" msgid="4053705651238775784">"നിങ്ങളുടെ കോൾ ലോഗ് കാണുന്നതിന്, \'ഫോൺ\' അനുമതി ഓണാക്കുക."</string>
-    <string name="permission_no_search" msgid="2424710404207193826">"നിങ്ങളുടെ കോൺടാക്റ്റുകൾ തിരയുന്നതിന് കോൺടാക്റ്റുകൾക്കുള്ള അനുമതികൾ ഓണാക്കുക."</string>
-    <string name="permission_place_call" msgid="8686908130349369423">"കോൾ വിളിക്കുന്നതിന്, \'ഫോൺ\' അനുമതി ഓണാക്കുക."</string>
-    <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"സിസ്റ്റം ക്രമീകരണത്തിലേക്ക് എഴുതാൻ ഫോൺ ആപ്പിന് അനുമതിയില്ല."</string>
-    <string name="blocked_number_call_log_label" msgid="4212282846299997693">"തടഞ്ഞിരിക്കുന്നു"</string>
-    <string name="call_log_action_block_report_number" msgid="7302636538668696729">"ബ്ലോക്കുചെയ്യുക/സ്പാമാണെന്ന് റിപ്പോർട്ടുചെയ്യുക"</string>
-    <string name="call_log_action_block_number" msgid="5048188386501998865">"നമ്പർ ബ്ലോക്കുചെയ്യുക"</string>
-    <string name="call_log_action_remove_spam" msgid="2045319806318398403">"സ്പാം അല്ല"</string>
-    <string name="call_log_action_unblock_number" msgid="6100117033288448758">"നമ്പർ അൺബ്ലോക്കുചെയ്യുക"</string>
-    <string name="spam_number_call_log_label" msgid="2678431398326811131">"സ്‌പാം"</string>
-    <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> ഓഫ്‌ലൈനായതിനാൽ കോൾ ചെയ്യാനാവില്ല"</string>
-    <string name="about_phone_label" msgid="582991354677973731">"ആമുഖം"</string>
-    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Google ട്രാൻസ്‌ക്രൈബ് ചെയ്‌തത്"</string>
-    <string name="voicemail_transcription_in_progress" msgid="2933320969613783210">"Google കേട്ടെഴുതുന്നു…"</string>
-    <string name="voicemail_transcription_failed" msgid="335275303117412706">"ട്രാൻസ്‌ക്രിപ്‌റ്റ് ലഭ്യമല്ല."</string>
-    <string name="voicemail_transcription_failed_language_not_supported" msgid="4210332591050562553">"ട്രാൻസ്‌ക്രിപ്‌റ്റ് ലഭ്യമല്ല. ഭാഷ പിന്തുണയ്‌ക്കുന്നില്ല."</string>
-    <string name="voicemail_transcription_failed_no_speech" msgid="9093372879697874852">"ട്രാൻസ്‌ക്രിപ്‌റ്റ് ലഭ്യമല്ല. സംഭാഷണമൊന്നും കണ്ടെത്തിയില്ല."</string>
-    <string name="view_conversation" msgid="7895904782094119702">"കാണുക"</string>
-    <string name="ec_data_deleted" msgid="4794880345545827107">"കോൾ ഇല്ലാതാക്കി. ഈ കോൾ ചെയ്യുമ്പോൾ പങ്കിട്ട അറ്റാച്ച്‌മെന്റുകൾ മെസേജിൽ കാണുകയും ഇല്ലാതാക്കുകയും ചെയ്യുക."</string>
-    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"കോളുകൾ ഇല്ലാതാക്കി. ഈ കോളുകൾ ചെയ്യുമ്പോൾ പങ്കിട്ട അറ്റാച്ച്‌മെന്റുകൾ മെസേജിൽ കാണുകയും ഇല്ലാതാക്കുകയും ചെയ്യുക."</string>
+  <string name="respond_via_sms_setting_title">അതിവേഗ പ്രതികരണങ്ങൾ</string>
+  <string name="call_settings_label">കോളുകൾ</string>
+  <string name="manage_blocked_numbers_label">ബ്ലോക്ക് ചെയ്‌ത നമ്പറുകൾ</string>
+  <string name="voicemail_settings_label">വോയ്സ് മെയില്‍</string>
+  <string name="blocked_numbers_disabled_emergency_header_label">കോൾ ബ്ലോക്കുചെയ്യൽ താൽക്കാലികമായി ഓഫാണ്</string>
+  <string name="blocked_numbers_disabled_emergency_desc">കഴിഞ്ഞ 48 മണിക്കൂറിനുള്ളിൽ നിങ്ങൾ ഈ ഫോണിൽ നിന്ന് അടിയന്തിര സേവനങ്ങളുമായി ബന്ധപ്പെട്ടതിനാൽ കോൾ ബ്ലോക്കുചെയ്യൽ പ്രവർത്തനരഹിതമാക്കി. 48 മണിക്കൂർ സമയപരിധി കഴിഞ്ഞയുടൻ ഇത് സ്വയമേവ പ്രവർത്തനക്ഷമമാക്കപ്പെടും.</string>
+  <string name="import_send_to_voicemail_numbers_label">നമ്പറുകൾ ഇമ്പോർട്ടുചെയ്യുക</string>
+  <string name="blocked_call_settings_import_description">മറ്റ് ആപ്സ് വഴി വോയ്സ്‌മെയിൽ സ്വയമേവ അയയ്ക്കുന്നതിന് കോൾ ചെയ്യുന്നവരിൽ ചിലരെ നിങ്ങൾ മുമ്പ് അടയാളപ്പെടുത്തി.</string>
+  <string name="blocked_call_settings_view_numbers_button">നമ്പറുകൾ കാണുക</string>
+  <string name="blocked_call_settings_import_button">ഇമ്പോർട്ടുചെയ്യുക</string>
+  <string name="description_blocked_number_list_delete">നമ്പർ അൺബ്ലോക്കുചെയ്യുക</string>
+  <string name="addBlockedNumber">നമ്പർ ചേർക്കുക</string>
+  <string name="block_number_footer_message_vvm">ഈ നമ്പറുകളിൽ നിന്നുള്ള കോളുകൾ ബ്ലോക്കുചെയ്യും, വോയ്സ്മെയിലുകളെ സ്വയമേവ ഇല്ലാതാക്കും.</string>
+  <string name="block_number_footer_message_no_vvm">ഈ നമ്പറുകളിൽ നിന്നുള്ള കോളുകൾ ബ്ലോക്കുചെയ്യും, എന്നാൽ വിളിക്കുന്നവർക്ക് അപ്പോഴും നിങ്ങൾക്ക് വോയ്സ്‌മെയിലുകൾ അയയ്ക്കാൻ കഴിഞ്ഞേക്കാം.</string>
+  <string name="block_list">ബ്ലോക്കുചെയ്ത നമ്പറുകൾ</string>
+  <string name="alreadyBlocked">ഇതിനകം തന്നെ %1$s ബ്ലോക്കുചെയ്തിരിക്കുന്നു</string>
+  <string name="phone_account_settings_label">കോളിംഗ് അക്കൗണ്ട്</string>
+  <string name="permission_no_speeddial">സ്പീഡ് ഡയൽ പ്രവർത്തനക്ഷമാക്കുന്നതിന്, \'കോൺടാക്റ്റുകൾ\' അനുമതി ഓണാക്കുക.</string>
+  <string name="permission_no_calllog">നിങ്ങളുടെ കോൾ ലോഗ് കാണുന്നതിന്, \'ഫോൺ\' അനുമതി ഓണാക്കുക.</string>
+  <string name="permission_no_search">നിങ്ങളുടെ കോൺടാക്റ്റുകൾ തിരയുന്നതിന് കോൺടാക്റ്റുകൾക്കുള്ള അനുമതികൾ ഓണാക്കുക.</string>
+  <string name="permission_place_call">കോൾ വിളിക്കുന്നതിന്, \'ഫോൺ\' അനുമതി ഓണാക്കുക.</string>
+  <string name="toast_cannot_write_system_settings">സിസ്റ്റം ക്രമീകരണത്തിലേക്ക് എഴുതാൻ ഫോൺ ആപ്പിന് അനുമതിയില്ല.</string>
+  <string name="blocked_number_call_log_label">തടഞ്ഞിരിക്കുന്നു</string>
+  <string name="call_log_action_block_report_number">ബ്ലോക്കുചെയ്യുക/സ്പാമാണെന്ന് റിപ്പോർട്ടുചെയ്യുക</string>
+  <string name="call_log_action_block_number">നമ്പർ ബ്ലോക്കുചെയ്യുക</string>
+  <string name="call_log_action_remove_spam">സ്പാം അല്ല</string>
+  <string name="call_log_action_unblock_number">നമ്പർ അൺബ്ലോക്കുചെയ്യുക</string>
+  <string name="spam_number_call_log_label">സ്‌പാം</string>
+  <string name="call_composer_connection_failed">%1$s ഓഫ്‌ലൈനായതിനാൽ കോൾ ചെയ്യാനാവില്ല</string>
+  <string name="about_phone_label">ആമുഖം</string>
+  <string name="voicemail_transcription_branding_text">Google ട്രാൻസ്‌ക്രൈബ് ചെയ്‌തത്</string>
+  <string name="voicemail_transcription_in_progress">കേട്ടെഴുതുന്നു...</string>
+  <string name="voicemail_transcription_failed">ട്രാൻസ്‌ക്രിപ്‌റ്റ് ലഭ്യമല്ല.</string>
+  <string name="voicemail_transcription_failed_language_not_supported">ട്രാൻസ്‌ക്രിപ്‌റ്റ് ലഭ്യമല്ല. ഭാഷ പിന്തുണയ്‌ക്കുന്നില്ല.</string>
+  <string name="voicemail_transcription_failed_no_speech">ട്രാൻസ്‌ക്രിപ്‌റ്റ് ലഭ്യമല്ല. സംഭാഷണമൊന്നും കണ്ടെത്തിയില്ല.</string>
+  <string name="voicemail_donation_promo_title">ട്രാൻസ്‌ക്രിപ്ഷൻ കൃത്യത മെച്ചപ്പെടുത്താൻ സഹായിക്കണോ?</string>
+  <string name="voicemail_donation_promo_content">ട്രാൻസ്‌ക്രിപ്‌റ്റുകൾ ഉപയോഗിച്ച് ഇതും ഭാവി വോയ്‌സ്‌മെയിൽ സന്ദേശങ്ങളും അവലോകനം ചെയ്യാൻ Google-നെ അനുവദിക്കുക. അവ അജ്ഞാതമായാണ് സംഭരിക്കുക. ഏത് സമയത്തും ക്രമീകരണം മാറ്റാം. %1$s</string>
+  <string name="voicemail_donation_promo_opt_in">ഞാൻ തയ്യാറാണ്</string>
+  <string name="voicemail_donation_promo_opt_out">വേണ്ട</string>
+  <string name="voicemail_transcription_rating">ട്രാൻസ്‌ക്രിപ്ഷൻ റേറ്റ് ചെയ്യൂ</string>
+  <string name="voicemail_transcription_rating_thanks">നിങ്ങളുടെ ഫീഡ്‌ബാക്കിന് നന്ദി</string>
+  <string name="description_rating_good">ലൈക്ക് ചെയ്യുക</string>
+  <string name="description_rating_bad">ഡിസ്‌ലൈക്ക് ചെയ്യുക</string>
+  <string name="view_conversation">കാണുക</string>
+  <string name="ec_data_deleted">കോൾ ഇല്ലാതാക്കി. ഈ കോൾ ചെയ്യുമ്പോൾ പങ്കിട്ട അറ്റാച്ച്‌മെന്റുകൾ മെസേജിൽ കാണുകയും ഇല്ലാതാക്കുകയും ചെയ്യുക.</string>
+  <string name="multiple_ec_data_deleted">കോളുകൾ ഇല്ലാതാക്കി. ഈ കോളുകൾ ചെയ്യുമ്പോൾ പങ്കിട്ട അറ്റാച്ച്‌മെന്റുകൾ മെസേജിൽ കാണുകയും ഇല്ലാതാക്കുകയും ചെയ്യുക.</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-mn/strings.xml b/java/com/android/dialer/app/res/values-mn/strings.xml
index 55cc1b5..b879349 100644
--- a/java/com/android/dialer/app/res/values-mn/strings.xml
+++ b/java/com/android/dialer/app/res/values-mn/strings.xml
@@ -1,179 +1,171 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="applicationLabel" msgid="2202739481132958990">"Гар утас"</string>
-    <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"Утасны товчлуур"</string>
-    <string name="callHistoryIconLabel" msgid="7493268743411968630">"Дуудлагын түүх"</string>
-    <string name="action_copy_number_text" msgid="832682558551502319">"Дугаар хуулах"</string>
-    <string name="copy_transcript_text" msgid="937904189017310829">"Галиглалыг хуулах"</string>
-    <string name="action_edit_number_before_call" msgid="8017492815878473837">"Залгахын өмнө дугаар засах"</string>
-    <string name="call_log_delete_all" msgid="7852970926906523784">"Дуудлагын түүхийг устгах уу?"</string>
-    <string name="call_log_trash_voicemail" msgid="6118493534178533972">"Дуут шууданг устгах"</string>
-    <string name="snackbar_voicemail_deleted" msgid="7463166543725496307">"Дуут шууданг устгасан"</string>
-    <string name="snackbar_voicemail_deleted_undo" msgid="6959743982796409941">"БУЦААХ"</string>
-    <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"Дуудлагын түүхийг устгах уу?"</string>
-    <string name="clearCallLogConfirmation" msgid="6844949465815109166">"Энэ нь таны хийсэн бүх дуудлагыг түүхээс устгана."</string>
-    <string name="clearCallLogProgress_title" msgid="995004835687361977">"Дуудлагын түүхийг устгаж байна..."</string>
-    <string name="notification_missedCallTitle" msgid="8283366068539898486">"Аваагүй дуудлага"</string>
-    <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"Аваагүй албаны дуудлага"</string>
-    <string name="notification_missedCallsTitle" msgid="3697442015345089802">"Аваагүй дуудлага"</string>
-    <string name="notification_missedCallsMsg" msgid="8176217633929018706">"<xliff:g id="NUM_MISSED_CALLS">%d</xliff:g> аваагүй дуудлага"</string>
-    <string name="notification_missedCall_call_back" msgid="3875698110051973965">"Буцааж залгах"</string>
-    <string name="notification_missedCall_message" msgid="5086910028988305964">"Зурвас"</string>
-    <string name="post_call_notification_message" msgid="5417476789860590611">"<xliff:g id="NAME">%1$s</xliff:g>: <xliff:g id="MESSAGE">%2$s</xliff:g>"</string>
-    <string name="notification_voicemail_text_format" msgid="1895667520930252897">"<xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g> руу залгах"</string>
-    <string name="notification_voicemail_no_vm_number" msgid="8942821987929495842">"Дуут шуудангийн дугаар тодорхойгүй"</string>
-    <plurals name="notification_voicemail_title" formatted="false" msgid="1551847434476438657">
-      <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> Дуут шуудан </item>
-      <item quantity="one">Дуут шуудан</item>
-    </plurals>
-    <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
-    <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"<xliff:g id="CALLER">%1$s</xliff:g>-с ирсэн шинэ дуут шуудан"</string>
-    <string name="voicemail_playback_error" msgid="4384373852257757295">"Дуут шууданг тоглуулж чадсангүй"</string>
-    <string name="voicemail_fetching_content" msgid="572320120918636014">"Дуут шууданг ачаалж байна..."</string>
-    <string name="voicemail_fetching_timout" msgid="2128873915839949783">"Дуут шууданг ачаалж чадсангүй"</string>
-    <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_playback_speakerphone" msgid="4852027754869750227">"Чанга яригчийг асаах буюу унтраах"</string>
-    <string name="description_playback_seek" msgid="1340910573254132520">"Тоглуулах байрлалыг хайх"</string>
-    <string name="action_menu_call_history_description" msgid="8829135306925008546">"Дуудлагын түүх"</string>
-    <string name="action_menu_overflow_description" msgid="7648679686746517341">"Нэмэлт сонголтууд"</string>
-    <string name="action_menu_dialpad_button" msgid="1970631633457493180">"Товчлуур"</string>
-    <string name="dialer_settings_label" msgid="4980176284150290175">"Тохиргоо"</string>
-    <string name="simulator_submenu_label" msgid="186156287346615267">"Симулятор"</string>
-    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Шинэ UI үүсгэх товчлол"</string>
-    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"Багц үйлдлийн горимд орж байна"</string>
-    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"Багц үйлдлийн горимоос гарсан"</string>
-    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> сонгосон"</string>
-    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> сонголтыг болиулсан"</string>
-    <string name="description_contact_details" msgid="3341280873855253464">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g>-н харилцагчийн мэдээлэл"</string>
-    <string name="description_spam_contact_details" msgid="5592578752881528368">"Спам тараагч байж болзошгүй <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>-н дэлгэрэнгүй мэдээлэл"</string>
-    <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> дуудлага."</string>
-    <string name="description_video_call" msgid="3738199365585751727">"Видео дуудлага."</string>
-    <string name="description_start_voice_search" msgid="8380022725973015261">"Дуун хайлтыг эхлүүлэх"</string>
-    <string name="voicemail" msgid="8899540969000957954">"Дуут шуудан"</string>
-    <string name="description_cancel_multi_select" msgid="3930475950253360461">"Багц үйлдлийн горимыг цуцлах"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Устгах"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Цуцлах"</string>
-    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> сонгосон"</string>
-    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
-      <item quantity="other">"<b>"Эдгээр дуут шууданг устгах уу? "</b>"</item>
-      <item quantity="one">"<b>"Энэ дуут шууданг устгах уу? "</b>"</item>
-    </plurals>
-    <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
-    <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> <xliff:g id="TIME">%2$s</xliff:g>-д"</string>
-    <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
-    <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="voice_search_not_available" msgid="6546240433719732905">"Дуут хайлт хийх боломжгүй байна"</string>
-    <string name="dialer_hint_find_contact" msgid="2023214799381149808">"Харилцагчдаас хайх"</string>
-    <string name="block_number_search_hint" msgid="5377706079015099416">"Дугаар нэмэх болон харилцагч хайх"</string>
-    <string name="call_log_all_empty" msgid="3955572868518162004">"Таны дуудлагын түүх хоосон байна"</string>
-    <string name="call_log_all_empty_action" msgid="852218280136243014">"Дуудлага хийх"</string>
-    <string name="call_log_missed_empty" msgid="7094936030845062214">"Танд аваагүй дуудлага байхгүй байна."</string>
-    <string name="call_log_voicemail_empty" msgid="273623903423275178">"Таны дуут шуудангийн хайрцаг хоосон байна."</string>
-    <string name="call_log_activity_title" msgid="1275242727244945527">"Дуудлагын түүх"</string>
-    <string name="call_log_all_title" msgid="6042262422192020327">"Бүгд"</string>
-    <string name="call_log_missed_title" msgid="17254005889268015">"Аваагүй"</string>
-    <string name="tab_speed_dial" msgid="6616404752227561075">"Түргэн залгалт"</string>
-    <string name="tab_history" msgid="7420269368689503596">"Дуудлагын түүх"</string>
-    <string name="tab_all_contacts" msgid="5531733977693943015">"Харилцагчид"</string>
-    <string name="tab_voicemail" msgid="2458548090088316246">"Дуут шуудан"</string>
-    <string name="search_shortcut_call_number" msgid="8847918845036880688">"<xliff:g id="NUMBER">%s</xliff:g> руу залгах"</string>
-    <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"Шинэ хаяг үүсгэх"</string>
-    <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"Харилцагчийн хаягт нэмэх"</string>
-    <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"Мессеж илгээх"</string>
-    <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"Видео дуудлага хийх"</string>
-    <string name="search_shortcut_block_number" msgid="4587283230665805776">"Дугаар блоклох"</string>
-    <string name="speed_dial_empty" msgid="3346406399966039505">"Таны яаралтай залгах тохиргоон дээр одоогоор харилцагч байхгүй байна"</string>
-    <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"Таалагдсан хэсэгт нэмэх"</string>
-    <string name="remove_contact" msgid="2353580570488923668">"Хасах"</string>
-    <string name="select_all" msgid="408601760696146245">"Бүгдийг сонгох"</string>
-    <string name="call_log_action_video_call" msgid="7565549950343850819">"Видео дуудлага"</string>
-    <string name="call_log_action_send_message" msgid="6948727362660115554">"Зурвас илгээх"</string>
-    <string name="call_log_action_details" msgid="2091370737371449501">"Дуудлагын мэдээлэл"</string>
-    <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"Илгээх ..."</string>
-    <string name="call_log_action_call" msgid="682724094251540583">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> руу дуудлага хийх"</string>
-    <string name="description_incoming_missed_call" msgid="8292535799379230029">"Дараах дуудлагыг хүлээн аваагүй <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_incoming_answered_call" msgid="3920182963103160610">"Дараах дуудлагыг хүлээн авсан <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_unread_voicemail" msgid="145170985013419170">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>-н уншаагүй дуут шуудан"</string>
-    <string name="description_read_voicemail" msgid="5585559881573227732">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>-н дуут шуудан"</string>
-    <string name="description_outgoing_call" msgid="543952487882919924">"Дараах дугаар луу залгасан <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="call_log_via_number" msgid="1340307109806397650">"<xliff:g id="NUMBER">%1$s</xliff:g>-р"</string>
-    <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="NUMBER">%2$s</xliff:g>-р <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>"</string>
-    <string name="description_call_action" msgid="4042796498169106545">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> руу дуудлага хийх"</string>
-    <string name="description_video_call_action" msgid="1237090968588659650">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>-ын видео дуудлага."</string>
-    <string name="description_voicemail_action" msgid="3290143432403538524">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>-н дуут шууданг сонсох"</string>
-    <string name="description_create_new_contact_action" msgid="1928282350281564130">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>-д харилцагч шинээр үүсгэх"</string>
-    <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>-ыг одоогийн харилцагч руугаа нэмнэ"</string>
-    <string name="description_details_action" msgid="2061866409737706174">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> дуудлагын дэлгэрэнгүй мэдээлэл"</string>
-    <string name="call_log_header_today" msgid="1576119097475845293">"Өнөөдөр"</string>
-    <string name="call_log_header_yesterday" msgid="5616077776205329563">"Өчигдөр"</string>
-    <string name="call_log_header_other" msgid="4940676886254217644">"Хуучин"</string>
-    <string name="voicemail_speaker_on" msgid="3151333608926996668">"Чанга яригчийг асаах."</string>
-    <string name="voicemail_speaker_off" msgid="2530064206962034201">"Чанга яригчийг унтраах."</string>
-    <string name="voicemail_play_start_pause" msgid="3874823480278334664">"Тоглуулахыг эхлүүлэх буюу түр зогсоох."</string>
-    <string name="display_options_title" msgid="3880091801055797975">"Сонголтуудыг харуулах"</string>
-    <string name="sounds_and_vibration_title" msgid="3075050000721181384">"Дуу болон чичиргээ"</string>
-    <string name="accessibility_settings_title" msgid="3329027650429831820">"Хандалт"</string>
-    <string name="ringtone_title" msgid="8377174189894648486">"Утасны хонхны ая"</string>
-    <string name="vibrate_on_ring_title" msgid="631441314790960485">"Дуудлагад бас чичрэх"</string>
-    <string name="dtmf_tone_enable_title" msgid="3273762431523939277">"Товчлуурын дуу"</string>
-    <string name="dtmf_tone_length_title" msgid="534096029202438539">"Товчлуурын дууны урт"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="applicationLabel">Гар утас</string>
+  <string name="launcherDialpadActivityLabel">Утасны товчлуур</string>
+  <string name="callHistoryIconLabel">Дуудлагын түүх</string>
+  <string name="action_copy_number_text">Дугаар хуулах</string>
+  <string name="copy_transcript_text">Галиглалыг хуулах</string>
+  <string name="action_edit_number_before_call">Залгахын өмнө дугаар засах</string>
+  <string name="call_log_delete_all">Дуудлагын түүхийг устгах уу?</string>
+  <string name="call_log_trash_voicemail">Дуут шууданг устгах</string>
+  <string name="snackbar_voicemail_deleted">Дуут шууданг устгасан</string>
+  <string name="clearCallLogConfirmation_title">Дуудлагын түүхийг устгах уу?</string>
+  <string name="clearCallLogConfirmation">Энэ нь таны хийсэн бүх дуудлагыг түүхээс устгана.</string>
+  <string name="clearCallLogProgress_title">Дуудлагын түүхийг устгаж байна...</string>
+  <string name="notification_missedCallTitle">Аваагүй дуудлага</string>
+  <string name="notification_missedWorkCallTitle">Аваагүй албаны дуудлага</string>
+  <string name="notification_missedCallsTitle">Аваагүй дуудлага</string>
+  <string name="notification_missedCallsMsg">%d аваагүй дуудлага</string>
+  <string name="notification_missedCall_call_back">Буцааж залгах</string>
+  <string name="notification_missedCall_message">Зурвас</string>
+  <string name="post_call_notification_message">%1$s: %2$s</string>
+  <string name="notification_voicemail_text_format">%s руу залгах</string>
+  <string name="notification_voicemail_no_vm_number">Дуут шуудангийн дугаар тодорхойгүй</string>
+  <plurals name="notification_voicemail_title">
+    <item quantity="one">Дуут шуудан</item>
+    <item quantity="other"> %1$d Дуут шуудан </item>
+  </plurals>
+  <string name="notification_voicemail_callers_list">%1$s, %2$s</string>
+  <string name="notification_new_voicemail_ticker">%1$s-с ирсэн шинэ дуут шуудан</string>
+  <string name="voicemail_playback_error">Дуут шууданг тоглуулж чадсангүй</string>
+  <string name="voicemail_fetching_content">Дуут шууданг ачаалж байна...</string>
+  <string name="voicemail_fetching_timout">Дуут шууданг ачаалж чадсангүй</string>
+  <string name="call_log_item_count_and_date">(%1$d) %2$s</string>
+  <string name="description_playback_speakerphone">Чанга яригчийг асаах буюу унтраах</string>
+  <string name="description_playback_seek">Тоглуулах байрлалыг хайх</string>
+  <string name="action_menu_call_history_description">Дуудлагын түүх</string>
+  <string msgid="2295659037509008453" name="action_menu_overflow_description">Нэмэлт сонголтууд</string>
+  <string name="action_menu_dialpad_button">Товчлуур</string>
+  <string name="dialer_settings_label">Тохиргоо</string>
+  <string name="simulator_submenu_label">Симулятор</string>
+  <string name="new_ui_launcher_shortcut_label">Шинэ UI үүсгэх товчлол</string>
+  <string name="description_entering_bulk_action_mode">Багц үйлдлийн горимд орж байна</string>
+  <string name="description_leaving_bulk_action_mode">Багц үйлдлийн горимоос гарсан</string>
+  <string name="description_selecting_bulk_action_mode">%1$s сонгосон</string>
+  <string name="description_unselecting_bulk_action_mode">%1$s сонголтыг болиулсан</string>
+  <string name="description_contact_details">%1$s-н харилцагчийн мэдээлэл</string>
+  <string name="description_spam_contact_details">Спам тараагч байж болзошгүй %1$s-н дэлгэрэнгүй мэдээлэл</string>
+  <string name="description_num_calls">%1$s дуудлага.</string>
+  <string name="description_video_call">Видео дуудлага.</string>
+  <string name="description_start_voice_search">Дуун хайлтыг эхлүүлэх</string>
+  <string name="voicemail">Дуут шуудан</string>
+  <string name="description_cancel_multi_select">Багц үйлдлийн горимыг цуцлах</string>
+  <string name="voicemailMultiSelectDeleteConfirm">Устгах</string>
+  <string name="voicemailMultiSelectDeleteCancel">Цуцлах</string>
+  <string name="voicemailMultiSelectActionBarTitle">%1$s сонгосон</string>
+  <plurals name="delete_voicemails_confirmation_dialog_title">
+    <item quantity="one"><b>Энэ дуут шууданг устгах уу? </b></item>
+    <item quantity="other"><b>Эдгээр дуут шууданг устгах уу? </b></item>
+  </plurals>
+  <string name="voicemailCallLogToday">@string/call_log_header_today</string>
+  <string name="voicemailCallLogDateTimeFormat">%1$s %2$s-д</string>
+  <string name="voicemailDurationFormat">%1$02d:%2$02d</string>
+  <string name="voicemailCallLogDateTimeFormatWithDuration">%1$s • %2$s</string>
+  <string name="voice_search_not_available">Дуут хайлт хийх боломжгүй байна</string>
+  <string name="dialer_hint_find_contact">Харилцагчдаас хайх</string>
+  <string name="block_number_search_hint">Дугаар нэмэх болон харилцагч хайх</string>
+  <string name="call_log_all_empty">Таны дуудлагын түүх хоосон байна</string>
+  <string name="call_log_all_empty_action">Дуудлага хийх</string>
+  <string name="call_log_missed_empty">Танд аваагүй дуудлага байхгүй байна.</string>
+  <string name="call_log_voicemail_empty">Таны дуут шуудангийн хайрцаг хоосон байна.</string>
+  <string name="call_log_activity_title">Дуудлагын түүх</string>
+  <string name="call_log_all_title">Бүгд</string>
+  <string name="call_log_missed_title">Аваагүй</string>
+  <string name="tab_speed_dial">Түргэн залгалт</string>
+  <string name="tab_history">Дуудлагын түүх</string>
+  <string name="tab_all_contacts">Харилцагчид</string>
+  <string name="tab_voicemail">Дуут шуудан</string>
+  <string name="search_shortcut_call_number">%s руу залгах</string>
+  <string name="search_shortcut_create_new_contact">Шинэ хаяг үүсгэх</string>
+  <string name="search_shortcut_add_to_contact">Харилцагчийн хаягт нэмэх</string>
+  <string name="search_shortcut_send_sms_message">Мессеж илгээх</string>
+  <string name="search_shortcut_make_video_call">Видео дуудлага хийх</string>
+  <string name="search_shortcut_block_number">Дугаар блоклох</string>
+  <string name="speed_dial_empty">Таны яаралтай залгах тохиргоон дээр одоогоор харилцагч байхгүй байна</string>
+  <string name="speed_dial_empty_add_favorite_action">Таалагдсан хэсэгт нэмэх</string>
+  <string name="remove_contact">Хасах</string>
+  <string name="select_all">Бүгдийг сонгох</string>
+  <string name="call_log_action_video_call">Видео дуудлага</string>
+  <string name="call_log_action_set_up_video">Видео дуудлагад бэлтгэх</string>
+  <string name="call_log_action_invite_video">Видео дуудлагад урих</string>
+  <string name="call_log_action_send_message">Зурвас илгээх</string>
+  <string name="call_log_action_details">Дуудлагын мэдээлэл</string>
+  <string name="call_log_action_share_voicemail">Илгээх ...</string>
+  <string name="call_log_action_call">^1 руу дуудлага хийх</string>
+  <string name="description_incoming_missed_call">Дараах дуудлагыг хүлээн аваагүй ^1, ^2, ^3, ^4.</string>
+  <string name="description_incoming_answered_call">Дараах дуудлагыг хүлээн авсан ^1, ^2, ^3, ^4.</string>
+  <string name="description_unread_voicemail">^1, ^2, ^3, ^4-н уншаагүй дуут шуудан</string>
+  <string name="description_read_voicemail">^1, ^2, ^3, ^4-н дуут шуудан</string>
+  <string name="description_outgoing_call">Дараах дугаар луу залгасан ^1, ^2, ^3, ^4.</string>
+  <string name="call_log_via_number">%1$s-р</string>
+  <string name="call_log_via_number_phone_account">%2$s-р %1$s</string>
+  <string name="description_call_action">^1 руу дуудлага хийх</string>
+  <string name="description_video_call_action">^1-ын видео дуудлага.</string>
+  <string name="description_voicemail_action">^1-н дуут шууданг сонсох</string>
+  <string name="description_create_new_contact_action">^1-д харилцагч шинээр үүсгэх</string>
+  <string name="description_add_to_existing_contact_action">^1-ыг одоогийн харилцагч руугаа нэмнэ</string>
+  <string name="description_details_action">^1 дуудлагын дэлгэрэнгүй мэдээлэл</string>
+  <string name="call_log_header_today">Өнөөдөр</string>
+  <string name="call_log_header_yesterday">Өчигдөр</string>
+  <string name="call_log_header_other">Хуучин</string>
+  <string name="voicemail_speaker_on">Чанга яригчийг асаах.</string>
+  <string name="voicemail_speaker_off">Чанга яригчийг унтраах.</string>
+  <string name="voicemail_play_start_pause">Тоглуулахыг эхлүүлэх буюу түр зогсоох.</string>
+  <string name="display_options_title">Сонголтуудыг харуулах</string>
+  <string name="sounds_and_vibration_title">Дуу болон чичиргээ</string>
+  <string name="accessibility_settings_title">Хандалт</string>
+  <string name="ringtone_title">Утасны хонхны ая</string>
+  <string name="vibrate_on_ring_title">Дуудлага ирэхэд бас чичрэх</string>
+  <string name="dtmf_tone_enable_title">Товчлуурын дуу</string>
+  <string name="dtmf_tone_length_title">Товчлуурын дууны урт</string>
   <string-array name="dtmf_tone_length_entries">
-    <item msgid="3136353015227162823">"Энгийн"</item>
-    <item msgid="5376841175538523822">"Урт"</item>
+    <item>Энгийн</item>
+    <item>Урт</item>
   </string-array>
-    <string name="respond_via_sms_setting_title" msgid="8008181606657693452">"Шуурхай хариунууд"</string>
-    <string name="call_settings_label" msgid="7824611757200960807">"Дуудлага"</string>
-    <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Дуудлага блоклох"</string>
-    <string name="voicemail_settings_label" msgid="4594299554519920570">"Дуут шуудан"</string>
-    <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Дуудлага блоклох тохиргоог түр хугацаагаар унтраасан"</string>
-    <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Та сүүлийн 48 цагийн дотор энэ утсаар тусламжийн дуудлага хийсэн тул дуудлага блоклох тохиргоог идэвхгүй болгосон. Энэ тохиргоо нь 48 цагийн хугацаа дуусахад автоматаар идэвхэжнэ."</string>
-    <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Импортын тоо"</string>
-    <string name="blocked_call_settings_import_description" msgid="1819412052545228965">"Тань руу залгасан зарим хүмүүсийг бусад апп ашиглан автоматаар дуут шуудан илгээж байхаар өмнө нь тэмдэглэсэн."</string>
-    <string name="blocked_call_settings_view_numbers_button" msgid="3332727948554356704">"Дугаар харах"</string>
-    <string name="blocked_call_settings_import_button" msgid="7319111700387470727">"Импортлох"</string>
-    <string name="description_blocked_number_list_delete" msgid="2139644216858370740">"Дугаар блокноос гаргах"</string>
-    <string name="addBlockedNumber" msgid="3053473735238295551">"Дугаар нэмэх"</string>
-    <string name="block_number_footer_message_vvm" msgid="7955326304033982368">"Эдгээр дугаараас ирэх дуудлагыг блоклож, дуут шууданг автоматаар устгана."</string>
-    <string name="block_number_footer_message_no_vvm" msgid="1152684139070471665">"Эдгээр дугаараас ирэх дуудлагыг блоклож, харин танд дуут шуудан илгээх боломжтой."</string>
-    <string name="block_list" msgid="4701585783411870782">"Блоклосон дугаар"</string>
-    <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g>-г аль хэдийн блоклосон байна."</string>
-    <string name="phone_account_settings_label" msgid="8372485478006965920">"Дуудах бүртгэл"</string>
-    <string name="permission_no_speeddial" msgid="8487215628510596753">"Яаралтай дуудлагыг идэвхжүүлэхийн тулд Харилцагчдын зөвшөөрлийг идэвхжүүлнэ үү."</string>
-    <string name="permission_no_calllog" msgid="4053705651238775784">"Дуудлагын жагсаалтыг харахын тулд утасны зөвшөөрлийг идэвхжүүлнэ үү."</string>
-    <string name="permission_no_search" msgid="2424710404207193826">"Харилцагчаа хайхын тулд, Харилцагчийн жагсаалтын зөвшөөрлийг идэвхжүүлнэ үү."</string>
-    <string name="permission_place_call" msgid="8686908130349369423">"Залгахын тулд Утасны зөвшөөрлийг идэвхжүүлнэ үү."</string>
-    <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"Гар утасны апп-д системийн тохиргоо бичих зөвшөөрөл алга."</string>
-    <string name="blocked_number_call_log_label" msgid="4212282846299997693">"Хориглогдсон"</string>
-    <string name="call_log_action_block_report_number" msgid="7302636538668696729">"Спам гэж мэдээлэх/хориглох"</string>
-    <string name="call_log_action_block_number" msgid="5048188386501998865">"Дугаар блоклох"</string>
-    <string name="call_log_action_remove_spam" msgid="2045319806318398403">"Спам биш"</string>
-    <string name="call_log_action_unblock_number" msgid="6100117033288448758">"Дугаар блокноос гаргах"</string>
-    <string name="spam_number_call_log_label" msgid="2678431398326811131">"Спам"</string>
-    <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> офлайн, холбогдох боломжгүй байна"</string>
-    <string name="about_phone_label" msgid="582991354677973731">"Тухай"</string>
-    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Google-с сийрүүлсэн"</string>
-    <string name="voicemail_transcription_in_progress" msgid="2933320969613783210">"Google сийрүүлж байна..."</string>
-    <string name="voicemail_transcription_failed" msgid="335275303117412706">"Сийрүүлэг ашиглах боломжгүй."</string>
-    <string name="voicemail_transcription_failed_language_not_supported" msgid="4210332591050562553">"Сийрүүлэг ашиглах боломжгүй. Тухайн хэл дэмжигдээгүй."</string>
-    <string name="voicemail_transcription_failed_no_speech" msgid="9093372879697874852">"Сийрүүлэг ашиглах боломжгүй. Яриа танигдаагүй."</string>
-    <string name="view_conversation" msgid="7895904782094119702">"Үзэх"</string>
-    <string name="ec_data_deleted" msgid="4794880345545827107">"Дуудлагыг устгасан. Энэ дуудлагын явцад Зурвас дотор хуваалцсан хавсралтуудыг үзэх болон устгах."</string>
-    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"Дуудлагуудыг устгасан. Энэ дуудлагын явцад Зурвас дотор хуваалцсан хавсралтуудыг үзэх болон устгах."</string>
+  <string name="respond_via_sms_setting_title">Шуурхай хариунууд</string>
+  <string name="call_settings_label">Дуудлага</string>
+  <string name="manage_blocked_numbers_label">Хориглосон дугаар</string>
+  <string name="voicemail_settings_label">Дуут шуудан</string>
+  <string name="blocked_numbers_disabled_emergency_header_label">Дуудлага блоклох тохиргоог түр хугацаагаар унтраасан</string>
+  <string name="blocked_numbers_disabled_emergency_desc">Та сүүлийн 48 цагийн дотор энэ утсаар тусламжийн дуудлага хийсэн тул дуудлага блоклох тохиргоог идэвхгүй болгосон. Энэ тохиргоо нь 48 цагийн хугацаа дуусахад автоматаар идэвхэжнэ.</string>
+  <string name="import_send_to_voicemail_numbers_label">Импортын тоо</string>
+  <string name="blocked_call_settings_import_description">Тань руу залгасан зарим хүмүүсийг бусад апп ашиглан автоматаар дуут шуудан илгээж байхаар өмнө нь тэмдэглэсэн.</string>
+  <string name="blocked_call_settings_view_numbers_button">Дугаар харах</string>
+  <string name="blocked_call_settings_import_button">Импортлох</string>
+  <string name="description_blocked_number_list_delete">Дугаар блокноос гаргах</string>
+  <string name="addBlockedNumber">Дугаар нэмэх</string>
+  <string name="block_number_footer_message_vvm">Эдгээр дугаараас ирэх дуудлагыг блоклож, дуут шууданг автоматаар устгана.</string>
+  <string name="block_number_footer_message_no_vvm">Эдгээр дугаараас ирэх дуудлагыг блоклож, харин танд дуут шуудан илгээх боломжтой.</string>
+  <string name="block_list">Блоклосон дугаар</string>
+  <string name="alreadyBlocked">%1$s-г аль хэдийн блоклосон байна.</string>
+  <string name="phone_account_settings_label">Дуудах бүртгэл</string>
+  <string name="permission_no_speeddial">Яаралтай дуудлагыг идэвхжүүлэхийн тулд Харилцагчдын зөвшөөрлийг идэвхжүүлнэ үү.</string>
+  <string name="permission_no_calllog">Дуудлагын жагсаалтыг харахын тулд утасны зөвшөөрлийг идэвхжүүлнэ үү.</string>
+  <string name="permission_no_search">Харилцагчаа хайхын тулд, Харилцагчийн жагсаалтын зөвшөөрлийг идэвхжүүлнэ үү.</string>
+  <string name="permission_place_call">Залгахын тулд Утасны зөвшөөрлийг идэвхжүүлнэ үү.</string>
+  <string name="toast_cannot_write_system_settings">Гар утасны апп-д системийн тохиргоо бичих зөвшөөрөл алга.</string>
+  <string name="blocked_number_call_log_label">Хориглогдсон</string>
+  <string name="call_log_action_block_report_number">Спам гэж мэдээлэх/хориглох</string>
+  <string name="call_log_action_block_number">Дугаар блоклох</string>
+  <string name="call_log_action_remove_spam">Спам биш</string>
+  <string name="call_log_action_unblock_number">Дугаар блокноос гаргах</string>
+  <string name="spam_number_call_log_label">Спам</string>
+  <string name="call_composer_connection_failed">%1$s офлайн, холбогдох боломжгүй байна</string>
+  <string name="about_phone_label">Тухай</string>
+  <string name="voicemail_transcription_branding_text">Google-с сийрүүлсэн</string>
+  <string name="voicemail_transcription_in_progress">Сийрүүлж байна...</string>
+  <string name="voicemail_transcription_failed">Сийрүүлэг ашиглах боломжгүй.</string>
+  <string name="voicemail_transcription_failed_language_not_supported">Сийрүүлэг ашиглах боломжгүй. Тухайн хэл дэмжигдээгүй.</string>
+  <string name="voicemail_transcription_failed_no_speech">Сийрүүлэг ашиглах боломжгүй. Яриа танигдаагүй.</string>
+  <string name="voicemail_donation_promo_title">Сийрүүлгийн нарийвчлалыг сайжруулахад туслах уу?</string>
+  <string name="voicemail_donation_promo_content">Google-д энэ болон цаашдын дуут шуудангийн зурвасуудыг сийрүүлгээр хянах боломж олгох. Тэдгээрийг нэр заахгүй хадгалах болно. Дуртай үедээ Тохиргоог өөрчлөх боломжтой. %1$s</string>
+  <string name="voicemail_donation_promo_opt_in">Тийм, би зөвшөөрч байна</string>
+  <string name="voicemail_donation_promo_opt_out">Үгүй</string>
+  <string name="voicemail_transcription_rating">Сийрүүлгийн чанарыг үнэлэх</string>
+  <string name="voicemail_transcription_rating_thanks">Санал хүсэлт ирүүлсэнд баярлалаа</string>
+  <string name="description_rating_good">Таалагдсан</string>
+  <string name="description_rating_bad">Таалагдаагүй</string>
+  <string name="view_conversation">Үзэх</string>
+  <string name="ec_data_deleted">Дуудлагыг устгасан. Энэ дуудлагын явцад Зурвас дотор хуваалцсан хавсралтуудыг үзэх болон устгах.</string>
+  <string name="multiple_ec_data_deleted">Дуудлагуудыг устгасан. Энэ дуудлагын явцад Зурвас дотор хуваалцсан хавсралтуудыг үзэх болон устгах.</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-mr/strings.xml b/java/com/android/dialer/app/res/values-mr/strings.xml
index d986247..da2c4fa 100644
--- a/java/com/android/dialer/app/res/values-mr/strings.xml
+++ b/java/com/android/dialer/app/res/values-mr/strings.xml
@@ -1,179 +1,171 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="applicationLabel" msgid="2202739481132958990">"फोन"</string>
-    <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"फोन कीपॅड"</string>
-    <string name="callHistoryIconLabel" msgid="7493268743411968630">"कॉल इतिहास"</string>
-    <string name="action_copy_number_text" msgid="832682558551502319">"नंबर कॉपी करा"</string>
-    <string name="copy_transcript_text" msgid="937904189017310829">"प्रतिलेखन कॉपी करा"</string>
-    <string name="action_edit_number_before_call" msgid="8017492815878473837">"कॉल करण्यापूर्वी नंबर संपादित करा"</string>
-    <string name="call_log_delete_all" msgid="7852970926906523784">"कॉल इतिहास साफ करा"</string>
-    <string name="call_log_trash_voicemail" msgid="6118493534178533972">"व्हॉइसमेल हटवा"</string>
-    <string name="snackbar_voicemail_deleted" msgid="7463166543725496307">"व्हॉइसमेल आढळले"</string>
-    <string name="snackbar_voicemail_deleted_undo" msgid="6959743982796409941">"पूर्ववत करा"</string>
-    <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"कॉल इतिहास साफ करायचा?"</string>
-    <string name="clearCallLogConfirmation" msgid="6844949465815109166">"हे आपल्या कॉल इतिहासातून सर्व कॉल हटवेल"</string>
-    <string name="clearCallLogProgress_title" msgid="995004835687361977">"कॉल इतिहास साफ करत आहे…"</string>
-    <string name="notification_missedCallTitle" msgid="8283366068539898486">"सुटलेला कॉल"</string>
-    <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"कार्याचा कॉल चुकविला"</string>
-    <string name="notification_missedCallsTitle" msgid="3697442015345089802">"सुटलेले कॉल"</string>
-    <string name="notification_missedCallsMsg" msgid="8176217633929018706">"<xliff:g id="NUM_MISSED_CALLS">%d</xliff:g> सुटलेले कॉल"</string>
-    <string name="notification_missedCall_call_back" msgid="3875698110051973965">"पुन्हा कॉल करा"</string>
-    <string name="notification_missedCall_message" msgid="5086910028988305964">"संदेश"</string>
-    <string name="post_call_notification_message" msgid="5417476789860590611">"<xliff:g id="NAME">%1$s</xliff:g>: <xliff:g id="MESSAGE">%2$s</xliff:g>"</string>
-    <string name="notification_voicemail_text_format" msgid="1895667520930252897">"<xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g> डायल करा"</string>
-    <string name="notification_voicemail_no_vm_number" msgid="8942821987929495842">"व्हॉइसमेल नंबर अज्ञात"</string>
-    <plurals name="notification_voicemail_title" formatted="false" msgid="1551847434476438657">
-      <item quantity="one"> <xliff:g id="COUNT">%1$d</xliff:g> व्हॉइसमेल </item>
-      <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> व्हॉइसमेल </item>
-    </plurals>
-    <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
-    <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"<xliff:g id="CALLER">%1$s</xliff:g> कडील नवीन व्हॉइसमेल"</string>
-    <string name="voicemail_playback_error" msgid="4384373852257757295">"व्हॉइसमेल प्ले करू शकलो नाही"</string>
-    <string name="voicemail_fetching_content" msgid="572320120918636014">"व्हॉइसमेल लोड करत आहे…"</string>
-    <string name="voicemail_fetching_timout" msgid="2128873915839949783">"व्हॉइसमेल लोड करू शकलो नाही"</string>
-    <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_playback_speakerphone" msgid="4852027754869750227">"स्‍पीकरफोन चालू किंवा बंद करा"</string>
-    <string name="description_playback_seek" msgid="1340910573254132520">"प्लेबॅक स्थान शोधतात"</string>
-    <string name="action_menu_call_history_description" msgid="8829135306925008546">"कॉल इतिहास"</string>
-    <string name="action_menu_overflow_description" msgid="7648679686746517341">"अधिक पर्याय"</string>
-    <string name="action_menu_dialpad_button" msgid="1970631633457493180">"की पॅड"</string>
-    <string name="dialer_settings_label" msgid="4980176284150290175">"सेटिंग्ज"</string>
-    <string name="simulator_submenu_label" msgid="186156287346615267">"सिम्युलेटर"</string>
-    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"नवीन UI शॉर्टकट तयार करा"</string>
-    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"मोठ्या प्रमाणात क्रिया मोडमध्ये प्रवेश करीत आहे"</string>
-    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"मोठ्या प्रमाणात क्रिया मोड सोडत आहे"</string>
-    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> निवडले"</string>
-    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> ची निवड रद्द केली"</string>
-    <string name="description_contact_details" msgid="3341280873855253464">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> साठी संपर्क तपशील"</string>
-    <string name="description_spam_contact_details" msgid="5592578752881528368">"संशयास्पद स्पॅम कॉलर <xliff:g id="NAMEORNUMBER">%1$s</xliff:g> साठी संपर्क तपशील"</string>
-    <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> कॉल."</string>
-    <string name="description_video_call" msgid="3738199365585751727">"व्हिडिओ कॉल."</string>
-    <string name="description_start_voice_search" msgid="8380022725973015261">"व्हॉइस शोध प्रारंभ करा"</string>
-    <string name="voicemail" msgid="8899540969000957954">"व्हॉइसमेल"</string>
-    <string name="description_cancel_multi_select" msgid="3930475950253360461">"बॅच क्रिया मोड रद्द करा"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"हटवा"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"रद्द करा"</string>
-    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> निवडले"</string>
-    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
-      <item quantity="one">"<b>"हा व्हॉइसमेल हटवायचा? "</b>"</item>
-      <item quantity="other">"<b>"हे व्हॉइसमेल हटवायचे? "</b>"</item>
-    </plurals>
-    <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
-    <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> रोजी <xliff:g id="TIME">%2$s</xliff:g> वाजता"</string>
-    <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
-    <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="voice_search_not_available" msgid="6546240433719732905">"व्हॉइस शोध उपलब्ध नाही"</string>
-    <string name="dialer_hint_find_contact" msgid="2023214799381149808">"संपर्क शोधा"</string>
-    <string name="block_number_search_hint" msgid="5377706079015099416">"नंबर जोडा किंवा संपर्क शोधा"</string>
-    <string name="call_log_all_empty" msgid="3955572868518162004">"आपला कॉल इतिहास रिक्त आहे"</string>
-    <string name="call_log_all_empty_action" msgid="852218280136243014">"एक कॉल करा"</string>
-    <string name="call_log_missed_empty" msgid="7094936030845062214">"आपल्‍याकडे कोणतेही सुटलेले कॉल नाहीत."</string>
-    <string name="call_log_voicemail_empty" msgid="273623903423275178">"आपला व्हॉइसमेल इनबॉक्स रिक्त आहे."</string>
-    <string name="call_log_activity_title" msgid="1275242727244945527">"कॉल इतिहास"</string>
-    <string name="call_log_all_title" msgid="6042262422192020327">"सर्व"</string>
-    <string name="call_log_missed_title" msgid="17254005889268015">"सुटलेले"</string>
-    <string name="tab_speed_dial" msgid="6616404752227561075">"स्पीड डायल"</string>
-    <string name="tab_history" msgid="7420269368689503596">"कॉल इतिहास"</string>
-    <string name="tab_all_contacts" msgid="5531733977693943015">"संपर्क"</string>
-    <string name="tab_voicemail" msgid="2458548090088316246">"व्हॉइसमेल"</string>
-    <string name="search_shortcut_call_number" msgid="8847918845036880688">"<xliff:g id="NUMBER">%s</xliff:g> ला कॉल  करा"</string>
-    <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"नवीन संपर्क तयार करा"</string>
-    <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"संपर्कांमध्‍ये जोडा"</string>
-    <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"SMS पाठवा"</string>
-    <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"व्‍हिडिओ कॉल करा"</string>
-    <string name="search_shortcut_block_number" msgid="4587283230665805776">"नंबर अवरोधित करा"</string>
-    <string name="speed_dial_empty" msgid="3346406399966039505">"अद्याप आपल्‍या स्पीड डायलवर कोणीही नाही"</string>
-    <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"एक आवडते जोडा"</string>
-    <string name="remove_contact" msgid="2353580570488923668">"काढा"</string>
-    <string name="select_all" msgid="408601760696146245">"सर्व निवडा"</string>
-    <string name="call_log_action_video_call" msgid="7565549950343850819">"व्हिडिओ कॉल"</string>
-    <string name="call_log_action_send_message" msgid="6948727362660115554">"एक संदेश पाठवा"</string>
-    <string name="call_log_action_details" msgid="2091370737371449501">"कॉल तपशील"</string>
-    <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"यांना पाठवा ..."</string>
-    <string name="call_log_action_call" msgid="682724094251540583">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> वर कॉल करा"</string>
-    <string name="description_incoming_missed_call" msgid="8292535799379230029">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g> वरून कॉल सुटला."</string>
-    <string name="description_incoming_answered_call" msgid="3920182963103160610">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g> वरून कॉलला उत्तर दिले."</string>
-    <string name="description_unread_voicemail" msgid="145170985013419170">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g> कडून न वाचलेला व्हॉइसमेल."</string>
-    <string name="description_read_voicemail" msgid="5585559881573227732">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g> कडून व्हॉॅइसमेल."</string>
-    <string name="description_outgoing_call" msgid="543952487882919924">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g> वर कॉल करा."</string>
-    <string name="call_log_via_number" msgid="1340307109806397650">"<xliff:g id="NUMBER">%1$s</xliff:g> द्वारे"</string>
-    <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="NUMBER">%2$s</xliff:g> द्वारे <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>"</string>
-    <string name="description_call_action" msgid="4042796498169106545">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> वर कॉल करा"</string>
-    <string name="description_video_call_action" msgid="1237090968588659650">"व्हिडिओ कॉल <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
-    <string name="description_voicemail_action" msgid="3290143432403538524">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> कडील व्हॉइसमेल ऐका"</string>
-    <string name="description_create_new_contact_action" msgid="1928282350281564130">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> साठी संपर्क तयार करा"</string>
-    <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"विद्यमान संपर्कांमध्ये <xliff:g id="NAMEORNUMBER">^1</xliff:g> जोडा"</string>
-    <string name="description_details_action" msgid="2061866409737706174">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> साठी कॉल तपशील"</string>
-    <string name="call_log_header_today" msgid="1576119097475845293">"आज"</string>
-    <string name="call_log_header_yesterday" msgid="5616077776205329563">"काल"</string>
-    <string name="call_log_header_other" msgid="4940676886254217644">"अधिक जुने"</string>
-    <string name="voicemail_speaker_on" msgid="3151333608926996668">"स्पीकर चालू करा."</string>
-    <string name="voicemail_speaker_off" msgid="2530064206962034201">"स्पीकर बंद करा."</string>
-    <string name="voicemail_play_start_pause" msgid="3874823480278334664">"प्लेबॅक प्रारंभ करा किंवा त्यास विराम द्या."</string>
-    <string name="display_options_title" msgid="3880091801055797975">"प्रदर्शन पर्याय"</string>
-    <string name="sounds_and_vibration_title" msgid="3075050000721181384">"ध्वनी आणि कंपने"</string>
-    <string name="accessibility_settings_title" msgid="3329027650429831820">"प्रवेशयोग्यता"</string>
-    <string name="ringtone_title" msgid="8377174189894648486">"फोन रिंगटोन"</string>
-    <string name="vibrate_on_ring_title" msgid="631441314790960485">"कॉल साठी कंपन देखील करा"</string>
-    <string name="dtmf_tone_enable_title" msgid="3273762431523939277">"कीपॅड टोन"</string>
-    <string name="dtmf_tone_length_title" msgid="534096029202438539">"कीपॅड टोन लांबी"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="applicationLabel">फोन</string>
+  <string name="launcherDialpadActivityLabel">फोन कीपॅड</string>
+  <string name="callHistoryIconLabel">कॉल इतिहास</string>
+  <string name="action_copy_number_text">नंबर कॉपी करा</string>
+  <string name="copy_transcript_text">प्रतिलेखन कॉपी करा</string>
+  <string name="action_edit_number_before_call">कॉल करण्यापूर्वी नंबर संपादित करा</string>
+  <string name="call_log_delete_all">कॉल इतिहास साफ करा</string>
+  <string name="call_log_trash_voicemail">व्हॉइसमेल हटवा</string>
+  <string name="snackbar_voicemail_deleted">व्हॉइसमेल आढळले</string>
+  <string name="clearCallLogConfirmation_title">कॉल इतिहास साफ करायचा?</string>
+  <string name="clearCallLogConfirmation">हे आपल्या कॉल इतिहासातून सर्व कॉल हटवेल</string>
+  <string name="clearCallLogProgress_title">कॉल इतिहास साफ करत आहे…</string>
+  <string name="notification_missedCallTitle">सुटलेला कॉल</string>
+  <string name="notification_missedWorkCallTitle">कार्याचा कॉल चुकविला</string>
+  <string name="notification_missedCallsTitle">सुटलेले कॉल</string>
+  <string name="notification_missedCallsMsg">%d सुटलेले कॉल</string>
+  <string name="notification_missedCall_call_back">पुन्हा कॉल करा</string>
+  <string name="notification_missedCall_message">मेसेज</string>
+  <string name="post_call_notification_message">%1$s: %2$s</string>
+  <string name="notification_voicemail_text_format">%s डायल करा</string>
+  <string name="notification_voicemail_no_vm_number">व्हॉइसमेल नंबर अज्ञात</string>
+  <plurals name="notification_voicemail_title">
+    <item quantity="one"> %1$d व्हॉइसमेल </item>
+    <item quantity="other"> %1$d व्हॉइसमेल </item>
+  </plurals>
+  <string name="notification_voicemail_callers_list">%1$s, %2$s</string>
+  <string name="notification_new_voicemail_ticker">%1$s कडील नवीन व्हॉइसमेल</string>
+  <string name="voicemail_playback_error">व्हॉइसमेल प्ले करू शकलो नाही</string>
+  <string name="voicemail_fetching_content">व्हॉइसमेल लोड करत आहे…</string>
+  <string name="voicemail_fetching_timout">व्हॉइसमेल लोड करू शकलो नाही</string>
+  <string name="call_log_item_count_and_date">(%1$d) %2$s</string>
+  <string name="description_playback_speakerphone">स्‍पीकरफोन चालू किंवा बंद करा</string>
+  <string name="description_playback_seek">प्लेबॅक स्थान शोधतात</string>
+  <string name="action_menu_call_history_description">कॉल इतिहास</string>
+  <string msgid="2295659037509008453" name="action_menu_overflow_description">अधिक पर्याय</string>
+  <string name="action_menu_dialpad_button">की पॅड</string>
+  <string name="dialer_settings_label">सेटिंग्ज</string>
+  <string name="simulator_submenu_label">सिम्युलेटर</string>
+  <string name="new_ui_launcher_shortcut_label">नवीन UI शॉर्टकट तयार करा</string>
+  <string name="description_entering_bulk_action_mode">मोठ्या प्रमाणात क्रिया मोडमध्ये प्रवेश करत आहे</string>
+  <string name="description_leaving_bulk_action_mode">मोठ्या प्रमाणात क्रिया मोड सोडत आहे</string>
+  <string name="description_selecting_bulk_action_mode">%1$s निवडले</string>
+  <string name="description_unselecting_bulk_action_mode">%1$s ची निवड रद्द केली</string>
+  <string name="description_contact_details">%1$s साठी संपर्क तपशील</string>
+  <string name="description_spam_contact_details">संशयास्पद स्पॅम कॉलर %1$s साठी संपर्क तपशील</string>
+  <string name="description_num_calls">%1$s कॉल.</string>
+  <string name="description_video_call">व्हिडिओ कॉल.</string>
+  <string name="description_start_voice_search">व्हॉइस शोध प्रारंभ करा</string>
+  <string name="voicemail">व्हॉइसमेल</string>
+  <string name="description_cancel_multi_select">बॅच क्रिया मोड रद्द करा</string>
+  <string name="voicemailMultiSelectDeleteConfirm">हटवा</string>
+  <string name="voicemailMultiSelectDeleteCancel">रद्द करा</string>
+  <string name="voicemailMultiSelectActionBarTitle">%1$s निवडले</string>
+  <plurals name="delete_voicemails_confirmation_dialog_title">
+    <item quantity="one"><b>हा व्हॉइसमेल हटवायचा? </b></item>
+    <item quantity="other"><b>हे व्हॉइसमेल हटवायचे? </b></item>
+  </plurals>
+  <string name="voicemailCallLogToday">@string/call_log_header_today</string>
+  <string name="voicemailCallLogDateTimeFormat">%1$s रोजी %2$s वाजता</string>
+  <string name="voicemailDurationFormat">%1$02d:%2$02d</string>
+  <string name="voicemailCallLogDateTimeFormatWithDuration">%1$s • %2$s</string>
+  <string name="voice_search_not_available">व्हॉइस शोध उपलब्ध नाही</string>
+  <string name="dialer_hint_find_contact">संपर्क शोधा</string>
+  <string name="block_number_search_hint">नंबर जोडा किंवा संपर्क शोधा</string>
+  <string name="call_log_all_empty">आपला कॉल इतिहास रिक्त आहे</string>
+  <string name="call_log_all_empty_action">एक कॉल करा</string>
+  <string name="call_log_missed_empty">आपल्‍याकडे कोणतेही सुटलेले कॉल नाहीत.</string>
+  <string name="call_log_voicemail_empty">आपला व्हॉइसमेल इनबॉक्स रिक्त आहे.</string>
+  <string name="call_log_activity_title">कॉल इतिहास</string>
+  <string name="call_log_all_title">सर्व</string>
+  <string name="call_log_missed_title">सुटलेले</string>
+  <string name="tab_speed_dial">स्पीड डायल</string>
+  <string name="tab_history">कॉल इतिहास</string>
+  <string name="tab_all_contacts">संपर्क</string>
+  <string name="tab_voicemail">व्हॉइसमेल</string>
+  <string name="search_shortcut_call_number">%s ला कॉल  करा</string>
+  <string name="search_shortcut_create_new_contact">नवीन संपर्क तयार करा</string>
+  <string name="search_shortcut_add_to_contact">संपर्कांमध्‍ये जोडा</string>
+  <string name="search_shortcut_send_sms_message">SMS पाठवा</string>
+  <string name="search_shortcut_make_video_call">व्‍हिडिओ कॉल करा</string>
+  <string name="search_shortcut_block_number">नंबर अवरोधित करा</string>
+  <string name="speed_dial_empty">अद्याप आपल्‍या स्पीड डायलवर कोणीही नाही</string>
+  <string name="speed_dial_empty_add_favorite_action">एक आवडते जोडा</string>
+  <string name="remove_contact">काढा</string>
+  <string name="select_all">सर्व निवडा</string>
+  <string name="call_log_action_video_call">व्हिडिओ कॉल</string>
+  <string name="call_log_action_set_up_video">व्हिडिओ कॉल करणे सेट करा</string>
+  <string name="call_log_action_invite_video">व्हिडिओ कॉलसाठी आमंत्रित करा</string>
+  <string name="call_log_action_send_message">एक मेसेज पाठवा</string>
+  <string name="call_log_action_details">कॉल तपशील</string>
+  <string name="call_log_action_share_voicemail">यांना पाठवा ...</string>
+  <string name="call_log_action_call">^1 वर कॉल करा</string>
+  <string name="description_incoming_missed_call">^1, ^2, ^3, ^4 वरून कॉल सुटला.</string>
+  <string name="description_incoming_answered_call">^1, ^2, ^3, ^4 वरून कॉलला उत्तर दिले.</string>
+  <string name="description_unread_voicemail">^1, ^2, ^3, ^4 कडून न वाचलेला व्हॉइसमेल.</string>
+  <string name="description_read_voicemail">^1, ^2, ^3, ^4 कडून व्हॉॅइसमेल.</string>
+  <string name="description_outgoing_call">^1, ^2, ^3, ^4 वर कॉल करा.</string>
+  <string name="call_log_via_number">%1$s द्वारे</string>
+  <string name="call_log_via_number_phone_account">%2$s द्वारे %1$s</string>
+  <string name="description_call_action">^1 वर कॉल करा</string>
+  <string name="description_video_call_action">व्हिडिओ कॉल ^1.</string>
+  <string name="description_voicemail_action">^1 कडील व्हॉइसमेल ऐका</string>
+  <string name="description_create_new_contact_action">^1 साठी संपर्क तयार करा</string>
+  <string name="description_add_to_existing_contact_action">विद्यमान संपर्कांमध्ये ^1 जोडा</string>
+  <string name="description_details_action">^1 साठी कॉल तपशील</string>
+  <string name="call_log_header_today">आज</string>
+  <string name="call_log_header_yesterday">काल</string>
+  <string name="call_log_header_other">अधिक जुने</string>
+  <string name="voicemail_speaker_on">स्पीकर चालू करा.</string>
+  <string name="voicemail_speaker_off">स्पीकर बंद करा.</string>
+  <string name="voicemail_play_start_pause">प्लेबॅक प्रारंभ करा किंवा त्यास विराम द्या.</string>
+  <string name="display_options_title">प्रदर्शन पर्याय</string>
+  <string name="sounds_and_vibration_title">ध्वनी आणि कंपने</string>
+  <string name="accessibility_settings_title">प्रवेशयोग्यता</string>
+  <string name="ringtone_title">फोन रिंगटोन</string>
+  <string name="vibrate_on_ring_title">कॉल साठी कंपन देखील करा</string>
+  <string name="dtmf_tone_enable_title">कीपॅड टोन</string>
+  <string name="dtmf_tone_length_title">कीपॅड टोन लांबी</string>
   <string-array name="dtmf_tone_length_entries">
-    <item msgid="3136353015227162823">"सामान्य"</item>
-    <item msgid="5376841175538523822">"दीर्घ"</item>
+    <item>सामान्य</item>
+    <item>दीर्घ</item>
   </string-array>
-    <string name="respond_via_sms_setting_title" msgid="8008181606657693452">"द्रुत प्रतिसाद"</string>
-    <string name="call_settings_label" msgid="7824611757200960807">"कॉल"</string>
-    <string name="manage_blocked_numbers_label" msgid="16823761991832273">"कॉल अवरोधित करणे"</string>
-    <string name="voicemail_settings_label" msgid="4594299554519920570">"व्हॉइसमेल"</string>
-    <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"कॉल अवरोधित करणे तात्पुरते बंद"</string>
-    <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"आपण मागील 48 तासात या फोनवरून आणीबाणी सेवांशी संपर्क साधला असल्याने कॉल अवरोधित करणे अक्षम केले गेले आहे. एकदा 48 तासांचा कालावधी कालबाह्य झाला की ते स्वयंचलितपणे पुन्हा सक्षम केले जाईल."</string>
-    <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"नंबर अायात करा"</string>
-    <string name="blocked_call_settings_import_description" msgid="1819412052545228965">"आपण पूर्वीपासून काही कॉलरना स्वयंचलितपणे इतर अॅप्सद्वारे व्हॉइसमेलमध्ये पाठविण्यासाठी चिन्हांकित केले आहे."</string>
-    <string name="blocked_call_settings_view_numbers_button" msgid="3332727948554356704">"नंबर पहा"</string>
-    <string name="blocked_call_settings_import_button" msgid="7319111700387470727">"आयात करा"</string>
-    <string name="description_blocked_number_list_delete" msgid="2139644216858370740">"नंबर अनावरोधित करा"</string>
-    <string name="addBlockedNumber" msgid="3053473735238295551">"नंबर जोडा"</string>
-    <string name="block_number_footer_message_vvm" msgid="7955326304033982368">"या नंबरवरून केलेले कॉल अवरोधित केले जातील आणि व्हॉइसमेल स्वयंचलितपणे हटविले जातील."</string>
-    <string name="block_number_footer_message_no_vvm" msgid="1152684139070471665">"या नंबर वरून केलेले कॉल अवरोधित केले जातील परंतु ते आपल्‍यासाठी व्हॉइसमेल सोडण्यात अद्याप कदाचित सक्षम असतील."</string>
-    <string name="block_list" msgid="4701585783411870782">"अवरोधित केलेले नंबर"</string>
-    <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g> आधीच अवरोधित केलेला आहे."</string>
-    <string name="phone_account_settings_label" msgid="8372485478006965920">"कॉल करण्याची खाती"</string>
-    <string name="permission_no_speeddial" msgid="8487215628510596753">"स्पीड डायल सक्षम करण्‍यासाठी, संपर्क परवानगी चालू करा."</string>
-    <string name="permission_no_calllog" msgid="4053705651238775784">"आपला कॉल लॉग पाहण्‍यासाठी, फोन परवानगी चालू करा."</string>
-    <string name="permission_no_search" msgid="2424710404207193826">"आपले संपर्क शोधण्‍यासाठी, संपर्क परवानग्या चालू करा."</string>
-    <string name="permission_place_call" msgid="8686908130349369423">"कॉल करण्यासाठी, फोन परवानगी चालू करा."</string>
-    <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"फोन अॅपला सिस्टम स‍ेटिंग्जमध्ये लिहिण्याची परवानगी नाही."</string>
-    <string name="blocked_number_call_log_label" msgid="4212282846299997693">"अवरोधित केले"</string>
-    <string name="call_log_action_block_report_number" msgid="7302636538668696729">"अवरोधित करा/स्पॅमचा अहवाल द्या"</string>
-    <string name="call_log_action_block_number" msgid="5048188386501998865">"नंबर अवरोधित करा"</string>
-    <string name="call_log_action_remove_spam" msgid="2045319806318398403">"स्पॅम नाही"</string>
-    <string name="call_log_action_unblock_number" msgid="6100117033288448758">"नंबर अनावरोधित करा"</string>
-    <string name="spam_number_call_log_label" msgid="2678431398326811131">"स्पॅम"</string>
-    <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> ऑफलाइन आहे आणि त्यांच्याशी संपर्क साधू शकत नाही"</string>
-    <string name="about_phone_label" msgid="582991354677973731">"बद्दल"</string>
-    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Google ने प्रतिलेखन केलेले"</string>
-    <string name="voicemail_transcription_in_progress" msgid="2933320969613783210">"Google प्रतिलेखित करत आहे..."</string>
-    <string name="voicemail_transcription_failed" msgid="335275303117412706">"प्रतिलेखन उपलब्ध नाही"</string>
-    <string name="voicemail_transcription_failed_language_not_supported" msgid="4210332591050562553">"प्रतिलेखन उपलब्ध नाही. भाषा सपोर्ट करत नाही."</string>
-    <string name="voicemail_transcription_failed_no_speech" msgid="9093372879697874852">"प्रतिलेखन उपलब्ध नाही. स्‍पीच सापडले नाही."</string>
-    <string name="view_conversation" msgid="7895904782094119702">"पहा"</string>
-    <string name="ec_data_deleted" msgid="4794880345545827107">"कॉल हटविला. या कॉल दरम्यान Messages मध्ये सामायिक केलेली संलग्नके पहा आणि हटवा."</string>
-    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"कॉल हटविला. कॉल दरम्यान Messages मध्ये सामायिक केलेली संलग्नके पहा आणि हटवा."</string>
+  <string name="respond_via_sms_setting_title">द्रुत प्रतिसाद</string>
+  <string name="call_settings_label">कॉल</string>
+  <string name="manage_blocked_numbers_label">ब्लॉक केलेले नंबर</string>
+  <string name="voicemail_settings_label">व्हॉइसमेल</string>
+  <string name="blocked_numbers_disabled_emergency_header_label">कॉल अवरोधित करणे तात्पुरते बंद</string>
+  <string name="blocked_numbers_disabled_emergency_desc">आपण मागील 48 तासात या फोनवरून आणीबाणी सेवांशी संपर्क साधला असल्याने कॉल अवरोधित करणे अक्षम केले गेले आहे. एकदा 48 तासांचा कालावधी कालबाह्य झाला की ते स्वयंचलितपणे पुन्हा सक्षम केले जाईल.</string>
+  <string name="import_send_to_voicemail_numbers_label">नंबर अायात करा</string>
+  <string name="blocked_call_settings_import_description">आपण पूर्वीपासून काही कॉलरना स्वयंचलितपणे इतर अॅप्सद्वारे व्हॉइसमेलमध्ये पाठविण्यासाठी चिन्हांकित केले आहे.</string>
+  <string name="blocked_call_settings_view_numbers_button">नंबर पहा</string>
+  <string name="blocked_call_settings_import_button">आयात करा</string>
+  <string name="description_blocked_number_list_delete">नंबर अनावरोधित करा</string>
+  <string name="addBlockedNumber">नंबर जोडा</string>
+  <string name="block_number_footer_message_vvm">या नंबरवरून केलेले कॉल अवरोधित केले जातील आणि व्हॉइसमेल स्वयंचलितपणे हटविले जातील.</string>
+  <string name="block_number_footer_message_no_vvm">या नंबर वरून केलेले कॉल अवरोधित केले जातील परंतु ते आपल्‍यासाठी व्हॉइसमेल सोडण्यात अद्याप कदाचित सक्षम असतील.</string>
+  <string name="block_list">अवरोधित केलेले नंबर</string>
+  <string name="alreadyBlocked">%1$s आधीच अवरोधित केलेला आहे.</string>
+  <string name="phone_account_settings_label">कॉल करण्याची खाती</string>
+  <string name="permission_no_speeddial">स्पीड डायल सक्षम करण्‍यासाठी, संपर्क परवानगी चालू करा.</string>
+  <string name="permission_no_calllog">आपला कॉल लॉग पाहण्‍यासाठी, फोन परवानगी चालू करा.</string>
+  <string name="permission_no_search">आपले संपर्क शोधण्‍यासाठी, संपर्क परवानग्या चालू करा.</string>
+  <string name="permission_place_call">कॉल करण्यासाठी, फोन परवानगी चालू करा.</string>
+  <string name="toast_cannot_write_system_settings">फोन अॅपला सिस्टम स‍ेटिंग्जमध्ये लिहिण्याची परवानगी नाही.</string>
+  <string name="blocked_number_call_log_label">अवरोधित केले</string>
+  <string name="call_log_action_block_report_number">अवरोधित करा/स्पॅमचा अहवाल द्या</string>
+  <string name="call_log_action_block_number">नंबर अवरोधित करा</string>
+  <string name="call_log_action_remove_spam">स्पॅम नाही</string>
+  <string name="call_log_action_unblock_number">नंबर अनावरोधित करा</string>
+  <string name="spam_number_call_log_label">स्पॅम</string>
+  <string name="call_composer_connection_failed">%1$s ऑफलाइन आहे आणि त्यांच्याशी संपर्क साधू शकत नाही</string>
+  <string name="about_phone_label">बद्दल</string>
+  <string name="voicemail_transcription_branding_text">Google ने प्रतिलेखन केलेले</string>
+  <string name="voicemail_transcription_in_progress">प्रतिलेखन करणे चालू आहे…</string>
+  <string name="voicemail_transcription_failed">प्रतिलेखन उपलब्ध नाही</string>
+  <string name="voicemail_transcription_failed_language_not_supported">प्रतिलेखन उपलब्ध नाही. भाषा सपोर्ट करत नाही.</string>
+  <string name="voicemail_transcription_failed_no_speech">प्रतिलेखन उपलब्ध नाही. स्‍पीच सापडले नाही.</string>
+  <string name="voicemail_donation_promo_title">प्रतिलेखनाची अचूकता सुधारण्यात मदत करायची आहे का?</string>
+  <string name="voicemail_donation_promo_content">Google ला या आणि भविष्यात येणार्‍या व्हॉइसमेलचे त्यांच्या प्रतिलेखनासह पुनरावलोकन करू द्या. ते अनामिकपणे सेव्ह केले जातील. सेटिंग्ज कधीही बदला. %1$s</string>
+  <string name="voicemail_donation_promo_opt_in">होय, मला मान्य आहे</string>
+  <string name="voicemail_donation_promo_opt_out">नाही नको</string>
+  <string name="voicemail_transcription_rating">रेट प्रतिलेख गुणवत्ता</string>
+  <string name="voicemail_transcription_rating_thanks">तुमच्या फीडबॅकबद्दल धन्यवाद</string>
+  <string name="description_rating_good">आवडले</string>
+  <string name="description_rating_bad">आवडली नाही</string>
+  <string name="view_conversation">पहा</string>
+  <string name="ec_data_deleted">कॉल हटवला. या कॉल दरम्यान Messages मध्ये सामायिक केलेली संलग्नके पहा आणि हटवा.</string>
+  <string name="multiple_ec_data_deleted">कॉल हटवला. कॉल दरम्यान Messages मध्ये सामायिक केलेली संलग्नके पहा आणि हटवा.</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-ms/strings.xml b/java/com/android/dialer/app/res/values-ms/strings.xml
index 1e26096..a501a74 100644
--- a/java/com/android/dialer/app/res/values-ms/strings.xml
+++ b/java/com/android/dialer/app/res/values-ms/strings.xml
@@ -1,179 +1,171 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="applicationLabel" msgid="2202739481132958990">"Telefon"</string>
-    <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"Pad Kekunci Telefon"</string>
-    <string name="callHistoryIconLabel" msgid="7493268743411968630">"Sejarah panggilan"</string>
-    <string name="action_copy_number_text" msgid="832682558551502319">"Salin nombor"</string>
-    <string name="copy_transcript_text" msgid="937904189017310829">"Salin transkripsi"</string>
-    <string name="action_edit_number_before_call" msgid="8017492815878473837">"Edit nombor sebelum memanggil"</string>
-    <string name="call_log_delete_all" msgid="7852970926906523784">"Kosongkan sejarah panggilan"</string>
-    <string name="call_log_trash_voicemail" msgid="6118493534178533972">"Padamkan mel suara"</string>
-    <string name="snackbar_voicemail_deleted" msgid="7463166543725496307">"Mel suara dipadamkan"</string>
-    <string name="snackbar_voicemail_deleted_undo" msgid="6959743982796409941">"BUAT ASAL"</string>
-    <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"Kosongkan sejarah panggilan?"</string>
-    <string name="clearCallLogConfirmation" msgid="6844949465815109166">"Tindakan ini akan memadamkan semua panggilan daripada sejarah anda"</string>
-    <string name="clearCallLogProgress_title" msgid="995004835687361977">"Mengosongkan sejarah panggilan..."</string>
-    <string name="notification_missedCallTitle" msgid="8283366068539898486">"Panggilan tidak dijawab"</string>
-    <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"Panggilan terlepas daripada tempat kerja"</string>
-    <string name="notification_missedCallsTitle" msgid="3697442015345089802">"Panggilan terlepas"</string>
-    <string name="notification_missedCallsMsg" msgid="8176217633929018706">"<xliff:g id="NUM_MISSED_CALLS">%d</xliff:g> panggilan terlepas"</string>
-    <string name="notification_missedCall_call_back" msgid="3875698110051973965">"Panggil balik"</string>
-    <string name="notification_missedCall_message" msgid="5086910028988305964">"Mesej"</string>
-    <string name="post_call_notification_message" msgid="5417476789860590611">"<xliff:g id="NAME">%1$s</xliff:g>: <xliff:g id="MESSAGE">%2$s</xliff:g>"</string>
-    <string name="notification_voicemail_text_format" msgid="1895667520930252897">"Dail <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
-    <string name="notification_voicemail_no_vm_number" msgid="8942821987929495842">"Nombor mel suara tidak dikenali"</string>
-    <plurals name="notification_voicemail_title" formatted="false" msgid="1551847434476438657">
-      <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> Mel suara </item>
-      <item quantity="one">Mel suara</item>
-    </plurals>
-    <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
-    <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"Mel suara baharu daripada <xliff:g id="CALLER">%1$s</xliff:g>"</string>
-    <string name="voicemail_playback_error" msgid="4384373852257757295">"Tidak dapat memainkan mel suara"</string>
-    <string name="voicemail_fetching_content" msgid="572320120918636014">"Memuatkan mel suara..."</string>
-    <string name="voicemail_fetching_timout" msgid="2128873915839949783">"Tidak dapat memuatkan mel suara"</string>
-    <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_playback_speakerphone" msgid="4852027754869750227">"Hidupkan atau matikan pembesar suara"</string>
-    <string name="description_playback_seek" msgid="1340910573254132520">"Dapatkan kedudukan main balik"</string>
-    <string name="action_menu_call_history_description" msgid="8829135306925008546">"Sejarah panggilan"</string>
-    <string name="action_menu_overflow_description" msgid="7648679686746517341">"Lagi pilihan"</string>
-    <string name="action_menu_dialpad_button" msgid="1970631633457493180">"pad kekunci"</string>
-    <string name="dialer_settings_label" msgid="4980176284150290175">"Tetapan"</string>
-    <string name="simulator_submenu_label" msgid="186156287346615267">"Simulator"</string>
-    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Buat Pintasan UI Baharu"</string>
-    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"Memasuki mod tindakan pukal"</string>
-    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"Meninggalkan mod tindakan pukal"</string>
-    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> dipilih"</string>
-    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> dinyahpilih"</string>
-    <string name="description_contact_details" msgid="3341280873855253464">"Butiran hubungan untuk <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_spam_contact_details" msgid="5592578752881528368">"Butiran hubungan pemanggil spam yang disyaki <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> panggilan."</string>
-    <string name="description_video_call" msgid="3738199365585751727">"Panggilan video."</string>
-    <string name="description_start_voice_search" msgid="8380022725973015261">"Mulakan carian suara"</string>
-    <string name="voicemail" msgid="8899540969000957954">"Mel suara"</string>
-    <string name="description_cancel_multi_select" msgid="3930475950253360461">"Batalkan mod tindakan kelompok"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Padam"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Batal"</string>
-    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> dipilih"</string>
-    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
-      <item quantity="other">"<b>"Padamkan mel suara ini? "</b>"</item>
-      <item quantity="one">"<b>"Padamkan mel suara ini? "</b>"</item>
-    </plurals>
-    <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
-    <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> pada <xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
-    <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="voice_search_not_available" msgid="6546240433719732905">"Carian suara tidak tersedia"</string>
-    <string name="dialer_hint_find_contact" msgid="2023214799381149808">"Cari dalam kenalan"</string>
-    <string name="block_number_search_hint" msgid="5377706079015099416">"Tambahkn no. atau cari kenalan"</string>
-    <string name="call_log_all_empty" msgid="3955572868518162004">"Sejarah panggilan anda kosong"</string>
-    <string name="call_log_all_empty_action" msgid="852218280136243014">"Buat panggilan"</string>
-    <string name="call_log_missed_empty" msgid="7094936030845062214">"Anda tiada panggilan terlepas."</string>
-    <string name="call_log_voicemail_empty" msgid="273623903423275178">"Peti masuk mel suara anda kosong."</string>
-    <string name="call_log_activity_title" msgid="1275242727244945527">"Sejarah Panggilan"</string>
-    <string name="call_log_all_title" msgid="6042262422192020327">"Semua"</string>
-    <string name="call_log_missed_title" msgid="17254005889268015">"Tidak dijawab"</string>
-    <string name="tab_speed_dial" msgid="6616404752227561075">"Dail laju"</string>
-    <string name="tab_history" msgid="7420269368689503596">"Sejarah Panggilan"</string>
-    <string name="tab_all_contacts" msgid="5531733977693943015">"Kenalan"</string>
-    <string name="tab_voicemail" msgid="2458548090088316246">"Mel suara"</string>
-    <string name="search_shortcut_call_number" msgid="8847918845036880688">"Panggil <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"Buat kenalan baharu"</string>
-    <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"Tambahkan pada kenalan"</string>
-    <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"Hantar SMS"</string>
-    <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"Buat panggilan video"</string>
-    <string name="search_shortcut_block_number" msgid="4587283230665805776">"Sekat nombor"</string>
-    <string name="speed_dial_empty" msgid="3346406399966039505">"Belum ada sesiapa pada dail pantas anda"</string>
-    <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"Tambahkan kegemaran"</string>
-    <string name="remove_contact" msgid="2353580570488923668">"Alih keluar"</string>
-    <string name="select_all" msgid="408601760696146245">"Pilih semua"</string>
-    <string name="call_log_action_video_call" msgid="7565549950343850819">"Panggilan video"</string>
-    <string name="call_log_action_send_message" msgid="6948727362660115554">"Hantar mesej"</string>
-    <string name="call_log_action_details" msgid="2091370737371449501">"Butiran panggilan"</string>
-    <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"Hantar ke ..."</string>
-    <string name="call_log_action_call" msgid="682724094251540583">"Panggil <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_incoming_missed_call" msgid="8292535799379230029">"Panggilan tidak dijawab daripada <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_incoming_answered_call" msgid="3920182963103160610">"Panggilan telah dijawab daripada <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_unread_voicemail" msgid="145170985013419170">"Mel suara yang belum dibaca daripada <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_read_voicemail" msgid="5585559881573227732">"Mel suara daripada <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_outgoing_call" msgid="543952487882919924">"Buat panggilan kepada <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="call_log_via_number" msgid="1340307109806397650">"melalui <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> melalui <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="description_call_action" msgid="4042796498169106545">"Panggil <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_video_call_action" msgid="1237090968588659650">"Panggilan video <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
-    <string name="description_voicemail_action" msgid="3290143432403538524">"Dengar mel suara daripada <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_create_new_contact_action" msgid="1928282350281564130">"Buat kenalan untuk <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"Tambahkan <xliff:g id="NAMEORNUMBER">^1</xliff:g> pada kenalan yang sedia ada"</string>
-    <string name="description_details_action" msgid="2061866409737706174">"Butiran panggilan untuk <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="call_log_header_today" msgid="1576119097475845293">"Hari ini"</string>
-    <string name="call_log_header_yesterday" msgid="5616077776205329563">"Semalam"</string>
-    <string name="call_log_header_other" msgid="4940676886254217644">"Lebih lama"</string>
-    <string name="voicemail_speaker_on" msgid="3151333608926996668">"Hidupkan pembesar suara."</string>
-    <string name="voicemail_speaker_off" msgid="2530064206962034201">"Matikan pembesar suara."</string>
-    <string name="voicemail_play_start_pause" msgid="3874823480278334664">"Mulakan atau jeda main balik."</string>
-    <string name="display_options_title" msgid="3880091801055797975">"Pilihan paparan"</string>
-    <string name="sounds_and_vibration_title" msgid="3075050000721181384">"Bunyi dan getaran"</string>
-    <string name="accessibility_settings_title" msgid="3329027650429831820">"Kebolehaksesan"</string>
-    <string name="ringtone_title" msgid="8377174189894648486">"Nada dering telefon"</string>
-    <string name="vibrate_on_ring_title" msgid="631441314790960485">"Juga bergetar untuk panggilan"</string>
-    <string name="dtmf_tone_enable_title" msgid="3273762431523939277">"Nada pad kekunci"</string>
-    <string name="dtmf_tone_length_title" msgid="534096029202438539">"Panjang nada pad kekunci"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="applicationLabel">Telefon</string>
+  <string name="launcherDialpadActivityLabel">Pad Kekunci Telefon</string>
+  <string name="callHistoryIconLabel">Sejarah panggilan</string>
+  <string name="action_copy_number_text">Salin nombor</string>
+  <string name="copy_transcript_text">Salin transkripsi</string>
+  <string name="action_edit_number_before_call">Edit nombor sebelum memanggil</string>
+  <string name="call_log_delete_all">Kosongkan sejarah panggilan</string>
+  <string name="call_log_trash_voicemail">Padamkan mel suara</string>
+  <string name="snackbar_voicemail_deleted">Mel suara dipadamkan</string>
+  <string name="clearCallLogConfirmation_title">Kosongkan sejarah panggilan?</string>
+  <string name="clearCallLogConfirmation">Tindakan ini akan memadamkan semua panggilan daripada sejarah anda</string>
+  <string name="clearCallLogProgress_title">Mengosongkan sejarah panggilan...</string>
+  <string name="notification_missedCallTitle">Panggilan tidak dijawab</string>
+  <string name="notification_missedWorkCallTitle">Panggilan terlepas daripada tempat kerja</string>
+  <string name="notification_missedCallsTitle">Panggilan terlepas</string>
+  <string name="notification_missedCallsMsg">%d panggilan terlepas</string>
+  <string name="notification_missedCall_call_back">Panggil balik</string>
+  <string name="notification_missedCall_message">Mesej</string>
+  <string name="post_call_notification_message">%1$s: %2$s</string>
+  <string name="notification_voicemail_text_format">Dail %s</string>
+  <string name="notification_voicemail_no_vm_number">Nombor mel suara tidak dikenali</string>
+  <plurals name="notification_voicemail_title">
+    <item quantity="one">Mel suara</item>
+    <item quantity="other"> %1$d Mel suara </item>
+  </plurals>
+  <string name="notification_voicemail_callers_list">%1$s, %2$s</string>
+  <string name="notification_new_voicemail_ticker">Mel suara baharu daripada %1$s</string>
+  <string name="voicemail_playback_error">Tidak dapat memainkan mel suara</string>
+  <string name="voicemail_fetching_content">Memuatkan mel suara...</string>
+  <string name="voicemail_fetching_timout">Tidak dapat memuatkan mel suara</string>
+  <string name="call_log_item_count_and_date">(%1$d) %2$s</string>
+  <string name="description_playback_speakerphone">Hidupkan atau matikan pembesar suara</string>
+  <string name="description_playback_seek">Dapatkan kedudukan main balik</string>
+  <string name="action_menu_call_history_description">Sejarah panggilan</string>
+  <string msgid="2295659037509008453" name="action_menu_overflow_description">Lagi pilihan</string>
+  <string name="action_menu_dialpad_button">pad kekunci</string>
+  <string name="dialer_settings_label">Tetapan</string>
+  <string name="simulator_submenu_label">Simulator</string>
+  <string name="new_ui_launcher_shortcut_label">Buat Pintasan UI Baharu</string>
+  <string name="description_entering_bulk_action_mode">Memasuki mod tindakan pukal</string>
+  <string name="description_leaving_bulk_action_mode">Meninggalkan mod tindakan pukal</string>
+  <string name="description_selecting_bulk_action_mode">%1$s dipilih</string>
+  <string name="description_unselecting_bulk_action_mode">%1$s dinyahpilih</string>
+  <string name="description_contact_details">Butiran hubungan untuk %1$s</string>
+  <string name="description_spam_contact_details">Butiran hubungan pemanggil spam yang disyaki %1$s</string>
+  <string name="description_num_calls">%1$s panggilan.</string>
+  <string name="description_video_call">Panggilan video.</string>
+  <string name="description_start_voice_search">Mulakan carian suara</string>
+  <string name="voicemail">Mel suara</string>
+  <string name="description_cancel_multi_select">Batalkan mod tindakan kelompok</string>
+  <string name="voicemailMultiSelectDeleteConfirm">Padam</string>
+  <string name="voicemailMultiSelectDeleteCancel">Batal</string>
+  <string name="voicemailMultiSelectActionBarTitle">%1$s dipilih</string>
+  <plurals name="delete_voicemails_confirmation_dialog_title">
+    <item quantity="one"><b>Padamkan mel suara ini? </b></item>
+    <item quantity="other"><b>Padamkan mel suara ini? </b></item>
+  </plurals>
+  <string name="voicemailCallLogToday">@string/call_log_header_today</string>
+  <string name="voicemailCallLogDateTimeFormat">%1$s pada %2$s</string>
+  <string name="voicemailDurationFormat">%1$02d:%2$02d</string>
+  <string name="voicemailCallLogDateTimeFormatWithDuration">%1$s • %2$s</string>
+  <string name="voice_search_not_available">Carian suara tidak tersedia</string>
+  <string name="dialer_hint_find_contact">Cari dalam kenalan</string>
+  <string name="block_number_search_hint">Tambahkn no. atau cari kenalan</string>
+  <string name="call_log_all_empty">Sejarah panggilan anda kosong</string>
+  <string name="call_log_all_empty_action">Buat panggilan</string>
+  <string name="call_log_missed_empty">Anda tiada panggilan terlepas.</string>
+  <string name="call_log_voicemail_empty">Peti masuk mel suara anda kosong.</string>
+  <string name="call_log_activity_title">Sejarah Panggilan</string>
+  <string name="call_log_all_title">Semua</string>
+  <string name="call_log_missed_title">Tidak dijawab</string>
+  <string name="tab_speed_dial">Dail laju</string>
+  <string name="tab_history">Sejarah Panggilan</string>
+  <string name="tab_all_contacts">Kenalan</string>
+  <string name="tab_voicemail">Mel suara</string>
+  <string name="search_shortcut_call_number">Panggil %s</string>
+  <string name="search_shortcut_create_new_contact">Buat kenalan baharu</string>
+  <string name="search_shortcut_add_to_contact">Tambahkan pada kenalan</string>
+  <string name="search_shortcut_send_sms_message">Hantar SMS</string>
+  <string name="search_shortcut_make_video_call">Buat panggilan video</string>
+  <string name="search_shortcut_block_number">Sekat nombor</string>
+  <string name="speed_dial_empty">Belum ada sesiapa pada dail pantas anda</string>
+  <string name="speed_dial_empty_add_favorite_action">Tambahkan kegemaran</string>
+  <string name="remove_contact">Alih keluar</string>
+  <string name="select_all">Pilih semua</string>
+  <string name="call_log_action_video_call">Panggilan video</string>
+  <string name="call_log_action_set_up_video">Sediakan panggilan video</string>
+  <string name="call_log_action_invite_video">Jemput ke panggilan video</string>
+  <string name="call_log_action_send_message">Hantar mesej</string>
+  <string name="call_log_action_details">Butiran panggilan</string>
+  <string name="call_log_action_share_voicemail">Hantar ke ...</string>
+  <string name="call_log_action_call">Panggil ^1</string>
+  <string name="description_incoming_missed_call">Panggilan tidak dijawab daripada ^1, ^2, ^3, ^4.</string>
+  <string name="description_incoming_answered_call">Panggilan telah dijawab daripada ^1, ^2, ^3, ^4.</string>
+  <string name="description_unread_voicemail">Mel suara yang belum dibaca daripada ^1, ^2, ^3, ^4.</string>
+  <string name="description_read_voicemail">Mel suara daripada ^1, ^2, ^3, ^4.</string>
+  <string name="description_outgoing_call">Buat panggilan kepada ^1, ^2, ^3, ^4.</string>
+  <string name="call_log_via_number">melalui %1$s</string>
+  <string name="call_log_via_number_phone_account">%1$s melalui %2$s</string>
+  <string name="description_call_action">Panggil ^1</string>
+  <string name="description_video_call_action">Panggilan video ^1.</string>
+  <string name="description_voicemail_action">Dengar mel suara daripada ^1</string>
+  <string name="description_create_new_contact_action">Buat kenalan untuk ^1</string>
+  <string name="description_add_to_existing_contact_action">Tambahkan ^1 pada kenalan yang sedia ada</string>
+  <string name="description_details_action">Butiran panggilan untuk ^1</string>
+  <string name="call_log_header_today">Hari ini</string>
+  <string name="call_log_header_yesterday">Semalam</string>
+  <string name="call_log_header_other">Lebih lama</string>
+  <string name="voicemail_speaker_on">Hidupkan pembesar suara.</string>
+  <string name="voicemail_speaker_off">Matikan pembesar suara.</string>
+  <string name="voicemail_play_start_pause">Mulakan atau jeda main balik.</string>
+  <string name="display_options_title">Pilihan paparan</string>
+  <string name="sounds_and_vibration_title">Bunyi dan getaran</string>
+  <string name="accessibility_settings_title">Kebolehaksesan</string>
+  <string name="ringtone_title">Nada dering telefon</string>
+  <string name="vibrate_on_ring_title">Juga bergetar untuk panggilan</string>
+  <string name="dtmf_tone_enable_title">Nada pad kekunci</string>
+  <string name="dtmf_tone_length_title">Panjang nada pad kekunci</string>
   <string-array name="dtmf_tone_length_entries">
-    <item msgid="3136353015227162823">"Biasa"</item>
-    <item msgid="5376841175538523822">"Panjang"</item>
+    <item>Biasa</item>
+    <item>Panjang</item>
   </string-array>
-    <string name="respond_via_sms_setting_title" msgid="8008181606657693452">"Respons pantas"</string>
-    <string name="call_settings_label" msgid="7824611757200960807">"Panggilan"</string>
-    <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Sekatan panggilan"</string>
-    <string name="voicemail_settings_label" msgid="4594299554519920570">"Mel suara"</string>
-    <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Sekatan panggilan dimatikan sementara"</string>
-    <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Sekatan panggilan telah dilumpuhkan kerana anda menghubungi perkhidmatan kecemasan daripada telefon ini dalam masa 48 jam yang lalu. Ciri ini akan didayakan semula secara automatik apabila tempoh 48 jam berakhir."</string>
-    <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Import nombor"</string>
-    <string name="blocked_call_settings_import_description" msgid="1819412052545228965">"Sebelum ini anda telah menandakan beberapa pemanggil dihantar ke mel suara secara automatik melalui aplikasi lain."</string>
-    <string name="blocked_call_settings_view_numbers_button" msgid="3332727948554356704">"Lihat nombor"</string>
-    <string name="blocked_call_settings_import_button" msgid="7319111700387470727">"Import"</string>
-    <string name="description_blocked_number_list_delete" msgid="2139644216858370740">"Nyahsekat nombor"</string>
-    <string name="addBlockedNumber" msgid="3053473735238295551">"Tambah nombor"</string>
-    <string name="block_number_footer_message_vvm" msgid="7955326304033982368">"Panggilan daripada nombor ini akan disekat dan mel suara akan dipadamkan secara automatik."</string>
-    <string name="block_number_footer_message_no_vvm" msgid="1152684139070471665">"Panggilan daripada nombor ini akan disekat, tetapi mereka masih boleh meninggalkan mel suara kepada anda."</string>
-    <string name="block_list" msgid="4701585783411870782">"Nombor yang disekat"</string>
-    <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g> sudah disekat."</string>
-    <string name="phone_account_settings_label" msgid="8372485478006965920">"Akaun panggilan"</string>
-    <string name="permission_no_speeddial" msgid="8487215628510596753">"Untuk mendayakan dail laju, hidupkan kebenaran Kenalan."</string>
-    <string name="permission_no_calllog" msgid="4053705651238775784">"Untuk melihat log panggilan anda, hidupkan kebenaran Telefon."</string>
-    <string name="permission_no_search" msgid="2424710404207193826">"Untuk mencari kenalan anda, hidupkan kebenaran Kenalan."</string>
-    <string name="permission_place_call" msgid="8686908130349369423">"Untuk membuat panggilan, hidupkan kebenaran Telefon."</string>
-    <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"Apl telefon tiada kebenaran untuk menulis ke tetapan sistem."</string>
-    <string name="blocked_number_call_log_label" msgid="4212282846299997693">"Disekat"</string>
-    <string name="call_log_action_block_report_number" msgid="7302636538668696729">"Sekat/laporkan spam"</string>
-    <string name="call_log_action_block_number" msgid="5048188386501998865">"Sekat nombor"</string>
-    <string name="call_log_action_remove_spam" msgid="2045319806318398403">"Bukan spam"</string>
-    <string name="call_log_action_unblock_number" msgid="6100117033288448758">"Nyahsekat nombor"</string>
-    <string name="spam_number_call_log_label" msgid="2678431398326811131">"Spam"</string>
-    <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> di luar talian dan tidak dapat dihubungi"</string>
-    <string name="about_phone_label" msgid="582991354677973731">"Perihal"</string>
-    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Ditranskripsikan oleh Google"</string>
-    <string name="voicemail_transcription_in_progress" msgid="2933320969613783210">"Google sedang mentranskripsi…"</string>
-    <string name="voicemail_transcription_failed" msgid="335275303117412706">"Transkrip tidak tersedia."</string>
-    <string name="voicemail_transcription_failed_language_not_supported" msgid="4210332591050562553">"Transkrip tidak tersedia. Bahasa tidak disokong."</string>
-    <string name="voicemail_transcription_failed_no_speech" msgid="9093372879697874852">"Transkrip tidak tersedia. Pertuturan tidak dikesan."</string>
-    <string name="view_conversation" msgid="7895904782094119702">"Lihat"</string>
-    <string name="ec_data_deleted" msgid="4794880345545827107">"Panggilan dipadam. Lihat dan padam lampiran yang dikongsi semasa panggilan ini dalam Mesej."</string>
-    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"Panggilan dipadam. Lihat dan padam lampiran yang dikongsi semasa panggilan dalam Mesej."</string>
+  <string name="respond_via_sms_setting_title">Respons pantas</string>
+  <string name="call_settings_label">Panggilan</string>
+  <string name="manage_blocked_numbers_label">Nombor yang disekat</string>
+  <string name="voicemail_settings_label">Mel suara</string>
+  <string name="blocked_numbers_disabled_emergency_header_label">Sekatan panggilan dimatikan sementara</string>
+  <string name="blocked_numbers_disabled_emergency_desc">Sekatan panggilan telah dilumpuhkan kerana anda menghubungi perkhidmatan kecemasan daripada telefon ini dalam masa 48 jam yang lalu. Ciri ini akan didayakan semula secara automatik apabila tempoh 48 jam berakhir.</string>
+  <string name="import_send_to_voicemail_numbers_label">Import nombor</string>
+  <string name="blocked_call_settings_import_description">Sebelum ini anda telah menandakan beberapa pemanggil dihantar ke mel suara secara automatik melalui aplikasi lain.</string>
+  <string name="blocked_call_settings_view_numbers_button">Lihat nombor</string>
+  <string name="blocked_call_settings_import_button">Import</string>
+  <string name="description_blocked_number_list_delete">Nyahsekat nombor</string>
+  <string name="addBlockedNumber">Tambah nombor</string>
+  <string name="block_number_footer_message_vvm">Panggilan daripada nombor ini akan disekat dan mel suara akan dipadamkan secara automatik.</string>
+  <string name="block_number_footer_message_no_vvm">Panggilan daripada nombor ini akan disekat, tetapi mereka masih boleh meninggalkan mel suara kepada anda.</string>
+  <string name="block_list">Nombor yang disekat</string>
+  <string name="alreadyBlocked">%1$s sudah disekat.</string>
+  <string name="phone_account_settings_label">Akaun panggilan</string>
+  <string name="permission_no_speeddial">Untuk mendayakan dail laju, hidupkan kebenaran Kenalan.</string>
+  <string name="permission_no_calllog">Untuk melihat log panggilan anda, hidupkan kebenaran Telefon.</string>
+  <string name="permission_no_search">Untuk mencari kenalan anda, hidupkan kebenaran Kenalan.</string>
+  <string name="permission_place_call">Untuk membuat panggilan, hidupkan kebenaran Telefon.</string>
+  <string name="toast_cannot_write_system_settings">Apl telefon tiada kebenaran untuk menulis ke tetapan sistem.</string>
+  <string name="blocked_number_call_log_label">Disekat</string>
+  <string name="call_log_action_block_report_number">Sekat/laporkan spam</string>
+  <string name="call_log_action_block_number">Sekat nombor</string>
+  <string name="call_log_action_remove_spam">Bukan spam</string>
+  <string name="call_log_action_unblock_number">Nyahsekat nombor</string>
+  <string name="spam_number_call_log_label">Spam</string>
+  <string name="call_composer_connection_failed">%1$s di luar talian dan tidak dapat dihubungi</string>
+  <string name="about_phone_label">Perihal</string>
+  <string name="voicemail_transcription_branding_text">Ditranskripsikan oleh Google</string>
+  <string name="voicemail_transcription_in_progress">Mentranskripsi…</string>
+  <string name="voicemail_transcription_failed">Transkrip tidak tersedia.</string>
+  <string name="voicemail_transcription_failed_language_not_supported">Transkrip tidak tersedia. Bahasa tidak disokong.</string>
+  <string name="voicemail_transcription_failed_no_speech">Transkrip tidak tersedia. Pertuturan tidak dikesan.</string>
+  <string name="voicemail_donation_promo_title">Bantu meningkatkan ketepatan transkripsi?</string>
+  <string name="voicemail_donation_promo_content">Benarkan Google menyemak mesej mel suara ini dan masa hadapan dengan transkrip. Mesej mel suara akan disimpan secara awanama. Tukar Tetapan pada bila-bila masa. %1$s</string>
+  <string name="voicemail_donation_promo_opt_in">Ya, saya setuju</string>
+  <string name="voicemail_donation_promo_opt_out">Tidak perlu</string>
+  <string name="voicemail_transcription_rating">Nilaikan kualiti transkripsi</string>
+  <string name="voicemail_transcription_rating_thanks">Terima kasih</string>
+  <string name="description_rating_good">Suka</string>
+  <string name="description_rating_bad">Tidak suka</string>
+  <string name="view_conversation">Lihat</string>
+  <string name="ec_data_deleted">Panggilan dipadam. Lihat dan padam lampiran yang dikongsi semasa panggilan ini dalam Mesej.</string>
+  <string name="multiple_ec_data_deleted">Panggilan dipadam. Lihat dan padam lampiran yang dikongsi semasa panggilan dalam Mesej.</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-my/strings.xml b/java/com/android/dialer/app/res/values-my/strings.xml
index fcd50eb..363138e 100644
--- a/java/com/android/dialer/app/res/values-my/strings.xml
+++ b/java/com/android/dialer/app/res/values-my/strings.xml
@@ -1,179 +1,171 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="applicationLabel" msgid="2202739481132958990">"ဖုန်း"</string>
-    <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"ဖုန်းခလုတ်ခုံ"</string>
-    <string name="callHistoryIconLabel" msgid="7493268743411968630">"ခေါ်ဆိုမှု မှတ်တမ်း"</string>
-    <string name="action_copy_number_text" msgid="832682558551502319">"နံပါတ်ကိုကူးရန်"</string>
-    <string name="copy_transcript_text" msgid="937904189017310829">"အသံမှစာအဖြစ်ဘာသာပြန်ခြင်းကို ကူးရန်"</string>
-    <string name="action_edit_number_before_call" msgid="8017492815878473837">"မခေါ်ဆိုမီ နံပါတ်ကိုတည်းဖြတ်ရန်"</string>
-    <string name="call_log_delete_all" msgid="7852970926906523784">"ခေါ်ဆိုမှု မှတ်တမ်း ရှင်းရန်"</string>
-    <string name="call_log_trash_voicemail" msgid="6118493534178533972">"အသံပို့စာ အားဖျက်ရန်"</string>
-    <string name="snackbar_voicemail_deleted" msgid="7463166543725496307">"အသံမေးလ် ရှာတွေ့ခဲ့"</string>
-    <string name="snackbar_voicemail_deleted_undo" msgid="6959743982796409941">"ပြန်ဖျက်ရန်"</string>
-    <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"ခေါ်ဆိုမှု မှတ်တမ်းကို ဖယ်ရှားရမလား။"</string>
-    <string name="clearCallLogConfirmation" msgid="6844949465815109166">"ဒါက သင့် မှတ်တမ်းထဲက ခေါ်ဆိုမှုများ  အားလုံးကို ဖျက်ပစ်မည်"</string>
-    <string name="clearCallLogProgress_title" msgid="995004835687361977">"ခေါ်ဆိုမှု မှတ်တမ်းကို ရှင်းနေ…"</string>
-    <string name="notification_missedCallTitle" msgid="8283366068539898486">"လွဲသွားသော ဖုန်းခေါ်မှု"</string>
-    <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"လွတ်သွားသည့် အလုပ်ဆိုင်ရာ ခ​ေါ်ဆိုမှု"</string>
-    <string name="notification_missedCallsTitle" msgid="3697442015345089802">"လွတ်သွားသော ခေါ်ဆိုမှုများ"</string>
-    <string name="notification_missedCallsMsg" msgid="8176217633929018706">"လွတ်သွားသော ခေါ်ဆိုမှု <xliff:g id="NUM_MISSED_CALLS">%d</xliff:g>"</string>
-    <string name="notification_missedCall_call_back" msgid="3875698110051973965">"ပြန်ခေါ်ပါ"</string>
-    <string name="notification_missedCall_message" msgid="5086910028988305964">"မက်ဆေ့ဂျ်"</string>
-    <string name="post_call_notification_message" msgid="5417476789860590611">"<xliff:g id="NAME">%1$s</xliff:g> - <xliff:g id="MESSAGE">%2$s</xliff:g>"</string>
-    <string name="notification_voicemail_text_format" msgid="1895667520930252897">"<xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g> ကို ခေါ်ပါ"</string>
-    <string name="notification_voicemail_no_vm_number" msgid="8942821987929495842">"အသံမေးလ်နံပါတ် မသိပါ"</string>
-    <plurals name="notification_voicemail_title" formatted="false" msgid="1551847434476438657">
-      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> အသံမေးလ်များ </item>
-      <item quantity="one"> အသံမေးလ်</item>
-    </plurals>
-    <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
-    <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"<xliff:g id="CALLER">%1$s</xliff:g> ဆီမှ အသံစာ အသစ်"</string>
-    <string name="voicemail_playback_error" msgid="4384373852257757295">"အသံမေးလ်ကို ဖွင့်မပေးနိုင်ခဲ့"</string>
-    <string name="voicemail_fetching_content" msgid="572320120918636014">"အသံမေးလ်ကို တင်ပေးနေ…"</string>
-    <string name="voicemail_fetching_timout" msgid="2128873915839949783">"အသံမေးလ်ကို တင်မပေးနိုင်ခဲ့"</string>
-    <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_playback_speakerphone" msgid="4852027754869750227">"စပီကာဖုန်းကို ဖွင့် သို့မဟုတ် ပိတ်ရန်"</string>
-    <string name="description_playback_seek" msgid="1340910573254132520">"အသံပြန်ဖွင့်ရေး နေရာကို ရှာရန်"</string>
-    <string name="action_menu_call_history_description" msgid="8829135306925008546">"ခေါ်ဆိုမှုမှတ်တမ်း"</string>
-    <string name="action_menu_overflow_description" msgid="7648679686746517341">"ပိုမိုရွေးချယ်စရာများ"</string>
-    <string name="action_menu_dialpad_button" msgid="1970631633457493180">"ခလုတ်ခုံ"</string>
-    <string name="dialer_settings_label" msgid="4980176284150290175">"ဆက်တင်များ"</string>
-    <string name="simulator_submenu_label" msgid="186156287346615267">"အသစ်ကဲ့သို့ တုပသည့်စနစ်"</string>
-    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"UI ဖြတ်လမ်းလင့်ခ်အသစ် လုပ်ရန်"</string>
-    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"တပြိုင်နက်တည်း စုပြုံလုပ်ဆောင်ချက်မုဒ်ကို ထည့်သွင်းခြင်း"</string>
-    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"တပြိုင်နက်တည်း စုပြုံလုပ်ဆောင်ချက်မုဒ်မှ ထွက်လိုက်သည်"</string>
-    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"ရွေးချယ်ထားသော <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"မရွေးချယ်ထားသော <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_contact_details" msgid="3341280873855253464">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> ရဲ့ အဆက်အသွယ် အသေးစိတ်"</string>
-    <string name="description_spam_contact_details" msgid="5592578752881528368">"သံသယဖြစ်ဖွယ်စပမ်းခေါ်ဆိုသူ <xliff:g id="NAMEORNUMBER">%1$s</xliff:g> အတွက် အဆက်အသွယ်အသေးစိတ်"</string>
-    <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> ခါ"</string>
-    <string name="description_video_call" msgid="3738199365585751727">"ဗီဒီယို ခေါ်ဆိုမှု"</string>
-    <string name="description_start_voice_search" msgid="8380022725973015261">"အသံဖွင့်ရှာဖွေမှု စရန်"</string>
-    <string name="voicemail" msgid="8899540969000957954">"အသံစာပို့စနစ်"</string>
-    <string name="description_cancel_multi_select" msgid="3930475950253360461">"တပြိုင်နက်တည်း စုပြုံလုပ်ဆောင်ချက်များမုဒ်ကိ ပယ်ဖျက်ရန်"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"ဖျက်ပါ"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"မလုပ်တော့"</string>
-    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> ကို ရွေးချယ်ထားသည်"</string>
-    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
-      <item quantity="other">"<b>"ဤအသံမေးလ်များကို ဖျက်မလား။ "</b>"</item>
-      <item quantity="one">"<b>"ဤအသံမေးလ်ကို ဖျက်မလား။ "</b>"</item>
-    </plurals>
-    <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
-    <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> <xliff:g id="TIME">%2$s</xliff:g> ၌"</string>
-    <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
-    <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="voice_search_not_available" msgid="6546240433719732905">"အသံဖြင့် ရှာဖွေမှု မရှိ"</string>
-    <string name="dialer_hint_find_contact" msgid="2023214799381149808">"အဆက်အသွယ်များရှာပါ"</string>
-    <string name="block_number_search_hint" msgid="5377706079015099416">"နံပါတ်ပေါင်းထည့်ပါ သို့မဟုတ် အဆက်အသွယ်များ ရှာဖွေပါ"</string>
-    <string name="call_log_all_empty" msgid="3955572868518162004">"သင့်ခေါ်ဆိုမှတ်တမ်းတွင် ဘာမှမရှိပါ"</string>
-    <string name="call_log_all_empty_action" msgid="852218280136243014">"ဖုန်းခေါ်ရန်"</string>
-    <string name="call_log_missed_empty" msgid="7094936030845062214">"သင့်တွင် လွတ်သွားသည့်ခေါ်ဆိုမှုများ မရှိပါ။"</string>
-    <string name="call_log_voicemail_empty" msgid="273623903423275178">"သင့်အသံမေးလ် စာတိုက်ပုံးတွင် ဘာမှမရှိပါ။"</string>
-    <string name="call_log_activity_title" msgid="1275242727244945527">"ယခင်ခေါ်ဆိုမှုများ"</string>
-    <string name="call_log_all_title" msgid="6042262422192020327">"အားလုံး"</string>
-    <string name="call_log_missed_title" msgid="17254005889268015">"လွတ်သွားသော"</string>
-    <string name="tab_speed_dial" msgid="6616404752227561075">"အမြန် နံပါတ်လှည့်မှု"</string>
-    <string name="tab_history" msgid="7420269368689503596">"ခေါ်ဆိုမှု မှတ်တမ်း"</string>
-    <string name="tab_all_contacts" msgid="5531733977693943015">"အဆက်အသွယ်များ"</string>
-    <string name="tab_voicemail" msgid="2458548090088316246">"အသံမေးလ်"</string>
-    <string name="search_shortcut_call_number" msgid="8847918845036880688">"<xliff:g id="NUMBER">%s</xliff:g> ကိုခေါ်ပါ"</string>
-    <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"အဆက်အသွယ် အသစ် ဖန်တီးရန်"</string>
-    <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"အဆက်အသွယ်သို့ ပေါင်းထည့်ရန်"</string>
-    <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"စာတို ပို့ရန်"</string>
-    <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"ဗီဒီယို ဖုန်းခေါ်ရန်"</string>
-    <string name="search_shortcut_block_number" msgid="4587283230665805776">"နံပါတ်ကို ပိတ်ဆို့ရန်"</string>
-    <string name="speed_dial_empty" msgid="3346406399966039505">"သင်၏အမြန်ခေါ်စာရင်းတွင် မည်သူမျှ မရှိသေးပါ"</string>
-    <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"အနှစ်သက်ဆုံးတစ်ခု ထည့်ရန်"</string>
-    <string name="remove_contact" msgid="2353580570488923668">"ဖယ်ရှာခြင်း"</string>
-    <string name="select_all" msgid="408601760696146245">"အားလုံးကို ရွေးချယ်ပါ"</string>
-    <string name="call_log_action_video_call" msgid="7565549950343850819">"ဗီဒီယို ခေါ်ဆိုမှု"</string>
-    <string name="call_log_action_send_message" msgid="6948727362660115554">"စာ တစ်စောင် ပို့ပါ"</string>
-    <string name="call_log_action_details" msgid="2091370737371449501">"ဖုန်းခေါ်မှု အသေးစိတ်အချက်အလက်"</string>
-    <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"... သို့ ပို့ပါ"</string>
-    <string name="call_log_action_call" msgid="682724094251540583">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> အား ခေါ်ပါ"</string>
-    <string name="description_incoming_missed_call" msgid="8292535799379230029">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>၊ <xliff:g id="TYPEORLOCATION">^2</xliff:g>၊ <xliff:g id="TIMEOFCALL">^3</xliff:g>၊ <xliff:g id="PHONEACCOUNT">^4</xliff:g> မှ ခေါ်ဆိုမှု လွတ်သွား၏။"</string>
-    <string name="description_incoming_answered_call" msgid="3920182963103160610">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>၊ <xliff:g id="TYPEORLOCATION">^2</xliff:g>၊ <xliff:g id="TIMEOFCALL">^3</xliff:g>၊ <xliff:g id="PHONEACCOUNT">^4</xliff:g> မှ ခ​ေါ်ဆိုမှုအား ဖြေထား၏။"</string>
-    <string name="description_unread_voicemail" msgid="145170985013419170">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>၊ <xliff:g id="TYPEORLOCATION">^2</xliff:g>၊ <xliff:g id="TIMEOFCALL">^3</xliff:g>၊ <xliff:g id="PHONEACCOUNT">^4</xliff:g>ထံမှ အသံစာကို ဖတ်ပါ။"</string>
-    <string name="description_read_voicemail" msgid="5585559881573227732">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>၊ <xliff:g id="TYPEORLOCATION">^2</xliff:g>၊ <xliff:g id="TIMEOFCALL">^3</xliff:g>၊ <xliff:g id="PHONEACCOUNT">^4</xliff:g>ထံမှ အသံစာ။"</string>
-    <string name="description_outgoing_call" msgid="543952487882919924">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>၊ <xliff:g id="TYPEORLOCATION">^2</xliff:g>၊ <xliff:g id="TIMEOFCALL">^3</xliff:g>၊ <xliff:g id="PHONEACCOUNT">^4</xliff:g> အား ခေါ်ခြင်း။"</string>
-    <string name="call_log_via_number" msgid="1340307109806397650">"<xliff:g id="NUMBER">%1$s</xliff:g> မှတစ်ဆင့်"</string>
-    <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> <xliff:g id="NUMBER">%2$s</xliff:g> မှတစ်ဆင့်"</string>
-    <string name="description_call_action" msgid="4042796498169106545">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> အားခေါ်ရန်"</string>
-    <string name="description_video_call_action" msgid="1237090968588659650">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> ကိုဗီဒီယိုခေါ်ဆိုမည်။"</string>
-    <string name="description_voicemail_action" msgid="3290143432403538524">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>ထံမှ အသံစာကို နားထောင်ရန်"</string>
-    <string name="description_create_new_contact_action" msgid="1928282350281564130">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> အတွက် အဆက်အသွယ် ဖန်တီးမည်"</string>
-    <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> အားလက်ရှိ အဆက်အသွယ်သို့ ပေါင်းထည့်မည်"</string>
-    <string name="description_details_action" msgid="2061866409737706174">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>၏ ခေါ်ဆိုမှု အသေးစိတ်များ"</string>
-    <string name="call_log_header_today" msgid="1576119097475845293">"ယနေ့"</string>
-    <string name="call_log_header_yesterday" msgid="5616077776205329563">"မနေ့က"</string>
-    <string name="call_log_header_other" msgid="4940676886254217644">"ပိုဟောင်းသော"</string>
-    <string name="voicemail_speaker_on" msgid="3151333608926996668">"စပီကာကို ဖွင့်ပါ။"</string>
-    <string name="voicemail_speaker_off" msgid="2530064206962034201">"စပီကာကို ပိတ်ပါ။"</string>
-    <string name="voicemail_play_start_pause" msgid="3874823480278334664">"ဖွင့်မှု စတင် သို့မဟုတ် ဆိုင်းငံ့ရန်"</string>
-    <string name="display_options_title" msgid="3880091801055797975">"ပြသမှုအတွက်ရွေးစရာများ"</string>
-    <string name="sounds_and_vibration_title" msgid="3075050000721181384">"အသံများနှင့် တုန်ခါမှု"</string>
-    <string name="accessibility_settings_title" msgid="3329027650429831820">"ရယူသုံးနိုင်မှု"</string>
-    <string name="ringtone_title" msgid="8377174189894648486">"ဖုန်း သံစဉ်"</string>
-    <string name="vibrate_on_ring_title" msgid="631441314790960485">"ဖုန်းဝင်လျှင် တုန်ခါရန်"</string>
-    <string name="dtmf_tone_enable_title" msgid="3273762431523939277">"ခလုတ်ခုံအသံများ"</string>
-    <string name="dtmf_tone_length_title" msgid="534096029202438539">"ခလုတ်ခုံအသံအပိုင်းအခြား"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="applicationLabel">ဖုန်း</string>
+  <string name="launcherDialpadActivityLabel">ဖုန်းခလုတ်ခုံ</string>
+  <string name="callHistoryIconLabel">ခေါ်ဆိုမှု မှတ်တမ်း</string>
+  <string name="action_copy_number_text">နံပါတ်ကိုကူးရန်</string>
+  <string name="copy_transcript_text">အသံမှစာအဖြစ်ဘာသာပြန်ခြင်းကို ကူးရန်</string>
+  <string name="action_edit_number_before_call">မခေါ်ဆိုမီ နံပါတ်ကိုတည်းဖြတ်ရန်</string>
+  <string name="call_log_delete_all">ခေါ်ဆိုမှု မှတ်တမ်း ရှင်းရန်</string>
+  <string name="call_log_trash_voicemail">အသံပို့စာ အားဖျက်ရန်</string>
+  <string name="snackbar_voicemail_deleted">အသံမေးလ် ရှာတွေ့ခဲ့</string>
+  <string name="clearCallLogConfirmation_title">ခေါ်ဆိုမှု မှတ်တမ်းကို ဖယ်ရှားရမလား။</string>
+  <string name="clearCallLogConfirmation">ဒါက သင့် မှတ်တမ်းထဲက ခေါ်ဆိုမှုများ  အားလုံးကို ဖျက်ပစ်မည်</string>
+  <string name="clearCallLogProgress_title">ခေါ်ဆိုမှု မှတ်တမ်းကို ရှင်းနေ…</string>
+  <string name="notification_missedCallTitle">လွဲသွားသော ဖုန်းခေါ်မှု</string>
+  <string name="notification_missedWorkCallTitle">လွတ်သွားသည့် အလုပ်ဆိုင်ရာ ခ​ေါ်ဆိုမှု</string>
+  <string name="notification_missedCallsTitle">လွတ်သွားသော ခေါ်ဆိုမှုများ</string>
+  <string name="notification_missedCallsMsg">လွတ်သွားသော ခေါ်ဆိုမှု %d</string>
+  <string name="notification_missedCall_call_back">ပြန်ခေါ်ပါ</string>
+  <string name="notification_missedCall_message">မက်ဆေ့ဂျ်</string>
+  <string name="post_call_notification_message">%1$s - %2$s</string>
+  <string name="notification_voicemail_text_format">%s ကို ခေါ်ပါ</string>
+  <string name="notification_voicemail_no_vm_number">အသံမေးလ်နံပါတ် မသိပါ</string>
+  <plurals name="notification_voicemail_title">
+    <item quantity="one"> အသံမေးလ်</item>
+    <item quantity="other">%1$d အသံမေးလ်များ </item>
+  </plurals>
+  <string name="notification_voicemail_callers_list">%1$s, %2$s</string>
+  <string name="notification_new_voicemail_ticker">%1$s ဆီမှ အသံစာ အသစ်</string>
+  <string name="voicemail_playback_error">အသံမေးလ်ကို ဖွင့်မပေးနိုင်ခဲ့</string>
+  <string name="voicemail_fetching_content">အသံမေးလ်ကို တင်ပေးနေ…</string>
+  <string name="voicemail_fetching_timout">အသံမေးလ်ကို တင်မပေးနိုင်ခဲ့</string>
+  <string name="call_log_item_count_and_date">(%1$d) %2$s</string>
+  <string name="description_playback_speakerphone">စပီကာဖုန်းကို ဖွင့် သို့မဟုတ် ပိတ်ရန်</string>
+  <string name="description_playback_seek">အသံပြန်ဖွင့်ရေး နေရာကို ရှာရန်</string>
+  <string name="action_menu_call_history_description">ခေါ်ဆိုမှုမှတ်တမ်း</string>
+  <string msgid="2295659037509008453" name="action_menu_overflow_description">ပိုမိုရွေးချယ်စရာများ</string>
+  <string name="action_menu_dialpad_button">ခလုတ်ခုံ</string>
+  <string name="dialer_settings_label">ဆက်တင်များ</string>
+  <string name="simulator_submenu_label">အသစ်ကဲ့သို့ တုပသည့်စနစ်</string>
+  <string name="new_ui_launcher_shortcut_label">UI ဖြတ်လမ်းလင့်ခ်အသစ် လုပ်ရန်</string>
+  <string name="description_entering_bulk_action_mode">တပြိုင်နက်တည်း စုပြုံလုပ်ဆောင်ချက်မုဒ်ကို ထည့်သွင်းခြင်း</string>
+  <string name="description_leaving_bulk_action_mode">တပြိုင်နက်တည်း စုပြုံလုပ်ဆောင်ချက်မုဒ်မှ ထွက်လိုက်သည်</string>
+  <string name="description_selecting_bulk_action_mode">ရွေးချယ်ထားသော %1$s</string>
+  <string name="description_unselecting_bulk_action_mode">မရွေးချယ်ထားသော %1$s</string>
+  <string name="description_contact_details">%1$s ရဲ့ အဆက်အသွယ် အသေးစိတ်</string>
+  <string name="description_spam_contact_details">သံသယဖြစ်ဖွယ်စပမ်းခေါ်ဆိုသူ %1$s အတွက် အဆက်အသွယ်အသေးစိတ်</string>
+  <string name="description_num_calls">%1$s ခါ</string>
+  <string name="description_video_call">ဗီဒီယို ခေါ်ဆိုမှု</string>
+  <string name="description_start_voice_search">အသံဖွင့်ရှာဖွေမှု စရန်</string>
+  <string name="voicemail">အသံစာပို့စနစ်</string>
+  <string name="description_cancel_multi_select">တပြိုင်နက်တည်း စုပြုံလုပ်ဆောင်ချက်များမုဒ်ကိ ပယ်ဖျက်ရန်</string>
+  <string name="voicemailMultiSelectDeleteConfirm">ဖျက်ပါ</string>
+  <string name="voicemailMultiSelectDeleteCancel">မလုပ်တော့</string>
+  <string name="voicemailMultiSelectActionBarTitle">%1$s ကို ရွေးချယ်ထားသည်</string>
+  <plurals name="delete_voicemails_confirmation_dialog_title">
+    <item quantity="one"><b>ဤအသံမေးလ်ကို ဖျက်မလား။ </b></item>
+    <item quantity="other"><b>ဤအသံမေးလ်များကို ဖျက်မလား။ </b></item>
+  </plurals>
+  <string name="voicemailCallLogToday">@string/call_log_header_today</string>
+  <string name="voicemailCallLogDateTimeFormat">%1$s %2$s ၌</string>
+  <string name="voicemailDurationFormat">%1$02d:%2$02d</string>
+  <string name="voicemailCallLogDateTimeFormatWithDuration">%1$s • %2$s</string>
+  <string name="voice_search_not_available">အသံဖြင့် ရှာဖွေမှု မရှိ</string>
+  <string name="dialer_hint_find_contact">အဆက်အသွယ်များရှာပါ</string>
+  <string name="block_number_search_hint">နံပါတ်ပေါင်းထည့်ပါ သို့မဟုတ် အဆက်အသွယ်များ ရှာဖွေပါ</string>
+  <string name="call_log_all_empty">သင့်ခေါ်ဆိုမှတ်တမ်းတွင် ဘာမှမရှိပါ</string>
+  <string name="call_log_all_empty_action">ဖုန်းခေါ်ရန်</string>
+  <string name="call_log_missed_empty">သင့်တွင် လွတ်သွားသည့်ခေါ်ဆိုမှုများ မရှိပါ။</string>
+  <string name="call_log_voicemail_empty">သင့်အသံမေးလ် စာတိုက်ပုံးတွင် ဘာမှမရှိပါ။</string>
+  <string name="call_log_activity_title">ယခင်ခေါ်ဆိုမှုများ</string>
+  <string name="call_log_all_title">အားလုံး</string>
+  <string name="call_log_missed_title">လွတ်သွားသော</string>
+  <string name="tab_speed_dial">အမြန် နံပါတ်လှည့်မှု</string>
+  <string name="tab_history">ခေါ်ဆိုမှု မှတ်တမ်း</string>
+  <string name="tab_all_contacts">အဆက်အသွယ်များ</string>
+  <string name="tab_voicemail">အသံမေးလ်</string>
+  <string name="search_shortcut_call_number">%s ကိုခေါ်ပါ</string>
+  <string name="search_shortcut_create_new_contact">အဆက်အသွယ် အသစ် ဖန်တီးရန်</string>
+  <string name="search_shortcut_add_to_contact">အဆက်အသွယ်သို့ ပေါင်းထည့်ရန်</string>
+  <string name="search_shortcut_send_sms_message">စာတို ပို့ရန်</string>
+  <string name="search_shortcut_make_video_call">ဗီဒီယို ဖုန်းခေါ်ရန်</string>
+  <string name="search_shortcut_block_number">နံပါတ်ကို ပိတ်ဆို့ရန်</string>
+  <string name="speed_dial_empty">သင်၏အမြန်ခေါ်စာရင်းတွင် မည်သူမျှ မရှိသေးပါ</string>
+  <string name="speed_dial_empty_add_favorite_action">အနှစ်သက်ဆုံးတစ်ခု ထည့်ရန်</string>
+  <string name="remove_contact">ဖယ်ရှာခြင်း</string>
+  <string name="select_all">အားလုံးကို ရွေးချယ်ပါ</string>
+  <string name="call_log_action_video_call">ဗီဒီယို ခေါ်ဆိုမှု</string>
+  <string name="call_log_action_set_up_video">ဗီဒီယိုခေါ်ဆိုမှု စတင်ရန်</string>
+  <string name="call_log_action_invite_video">ဗီဒီယိုခေါ်ဆိုမှုသို့ ဖိတ်ရန်</string>
+  <string name="call_log_action_send_message">စာ တစ်စောင် ပို့ပါ</string>
+  <string name="call_log_action_details">ဖုန်းခေါ်မှု အသေးစိတ်အချက်အလက်</string>
+  <string name="call_log_action_share_voicemail">... သို့ ပို့ပါ</string>
+  <string name="call_log_action_call">^1 အား ခေါ်ပါ</string>
+  <string name="description_incoming_missed_call">^1၊ ^2၊ ^3၊ ^4 မှ ခေါ်ဆိုမှု လွတ်သွား၏။</string>
+  <string name="description_incoming_answered_call">^1၊ ^2၊ ^3၊ ^4 မှ ခ​ေါ်ဆိုမှုအား ဖြေထား၏။</string>
+  <string name="description_unread_voicemail">^1၊ ^2၊ ^3၊ ^4ထံမှ အသံစာကို ဖတ်ပါ။</string>
+  <string name="description_read_voicemail">^1၊ ^2၊ ^3၊ ^4ထံမှ အသံစာ။</string>
+  <string name="description_outgoing_call">^1၊ ^2၊ ^3၊ ^4 အား ခေါ်ခြင်း။</string>
+  <string name="call_log_via_number">%1$s မှတစ်ဆင့်</string>
+  <string name="call_log_via_number_phone_account">%1$s %2$s မှတစ်ဆင့်</string>
+  <string name="description_call_action">^1 အားခေါ်ရန်</string>
+  <string name="description_video_call_action">^1 ကိုဗီဒီယိုခေါ်ဆိုမည်။</string>
+  <string name="description_voicemail_action">^1ထံမှ အသံစာကို နားထောင်ရန်</string>
+  <string name="description_create_new_contact_action">^1 အတွက် အဆက်အသွယ် ဖန်တီးမည်</string>
+  <string name="description_add_to_existing_contact_action">^1 အားလက်ရှိ အဆက်အသွယ်သို့ ပေါင်းထည့်မည်</string>
+  <string name="description_details_action">^1၏ ခေါ်ဆိုမှု အသေးစိတ်များ</string>
+  <string name="call_log_header_today">ယနေ့</string>
+  <string name="call_log_header_yesterday">မနေ့က</string>
+  <string name="call_log_header_other">ပိုဟောင်းသော</string>
+  <string name="voicemail_speaker_on">စပီကာကို ဖွင့်ပါ။</string>
+  <string name="voicemail_speaker_off">စပီကာကို ပိတ်ပါ။</string>
+  <string name="voicemail_play_start_pause">ဖွင့်မှု စတင် သို့မဟုတ် ဆိုင်းငံ့ရန်</string>
+  <string name="display_options_title">ပြသမှုအတွက်ရွေးစရာများ</string>
+  <string name="sounds_and_vibration_title">အသံများနှင့် တုန်ခါမှု</string>
+  <string name="accessibility_settings_title">ရယူသုံးနိုင်မှု</string>
+  <string name="ringtone_title">ဖုန်း သံစဉ်</string>
+  <string name="vibrate_on_ring_title">ဖုန်းဝင်လျှင် တုန်ခါရန်</string>
+  <string name="dtmf_tone_enable_title">ခလုတ်ခုံအသံများ</string>
+  <string name="dtmf_tone_length_title">ခလုတ်ခုံအသံအပိုင်းအခြား</string>
   <string-array name="dtmf_tone_length_entries">
-    <item msgid="3136353015227162823">"ပုံမှန်"</item>
-    <item msgid="5376841175538523822">"အရှည်"</item>
+    <item>ပုံမှန်</item>
+    <item>အရှည်</item>
   </string-array>
-    <string name="respond_via_sms_setting_title" msgid="8008181606657693452">"အမြန်တုံ့ပြန်ချက်များ"</string>
-    <string name="call_settings_label" msgid="7824611757200960807">"ခေါ်ဆိုမှုများ"</string>
-    <string name="manage_blocked_numbers_label" msgid="16823761991832273">"ခေါ်ဆိုမှု ပိတ်ဆို့ခြင်း"</string>
-    <string name="voicemail_settings_label" msgid="4594299554519920570">"အသံမေးလ်"</string>
-    <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"ခေါ်ဆိုမှုပိတ်ဆို့ခြင်း ယာယီပိတ်ထားသည်"</string>
-    <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"သင်သည် လွန်ခဲ့သည့် ၄၈ နာရီအတွင်း ဤဖုန်းဖြင့် အရေးပေါ်ဌာနကိုဖုန်း ခေါ်ဆိုခဲ့သောကြောင့် ခေါ်ဆိုမှုပိတ်ဆို့ခြင်းကို ဖြုတ်ထားသည်။ ၄၈ နာရီကျော်လွန်သည်နှင့် ၎င်းကိုအလိုအလျောက် ပြန်ဖွင့်ပေးပါမည်။"</string>
-    <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"နံပါတ်များ သွင်းရန်"</string>
-    <string name="blocked_call_settings_import_description" msgid="1819412052545228965">"သင်သည် ယခင်က အချို့ခေါ်ဆိုသူများကို အလိုအလျောက် အခြား အက်ပ်များမှ တဆင့် အသံစာသို့ ပို့ရန် မှတ်ပေးခဲ့သည်။"</string>
-    <string name="blocked_call_settings_view_numbers_button" msgid="3332727948554356704">"နံပါတ်များကို ကြည့်ရန်"</string>
-    <string name="blocked_call_settings_import_button" msgid="7319111700387470727">"တင်သွင်းရန်"</string>
-    <string name="description_blocked_number_list_delete" msgid="2139644216858370740">"နံပါတ်ကို ဖွင့်မည်"</string>
-    <string name="addBlockedNumber" msgid="3053473735238295551">"နံပါတ် ထည့်သွင်းပါ"</string>
-    <string name="block_number_footer_message_vvm" msgid="7955326304033982368">"ဤနံပါတ်များမှ ခေါ်ဆိုမှုများကို ပိတ်ဆို့လိုက်မည်ဖြစ်ပြီး အသံမေးလ်များကို အလိုအလျောက် ဖျက်လိုက်ပါမည်။"</string>
-    <string name="block_number_footer_message_no_vvm" msgid="1152684139070471665">"ဤနံပါတ်များမှ ခေါ်ဆိုမှုများကို ပိတ်ဆို့လိုက်ပါမည်၊ သို့သော် ၎င်းတို့သည် သင့်ကို အသံမေးလ်ချန်ခဲ့နိုင်ပါသည်။"</string>
-    <string name="block_list" msgid="4701585783411870782">"ပိတ်ထားသည့် နံပါတ်များ"</string>
-    <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g> အားပိတ်ဆို့ထားပြီးပါပြီ။"</string>
-    <string name="phone_account_settings_label" msgid="8372485478006965920">"ခေါ်ဆိုသော အကောင့်များ"</string>
-    <string name="permission_no_speeddial" msgid="8487215628510596753">"မြန်နှုန်းမြင့်ဖုန်းခေါ်ဆိုမှုကို ဖွင့်ရန်၊ အဆက်အသွယ်ခွင့်ပြုချက်ကို ဖွင့်ပါ။"</string>
-    <string name="permission_no_calllog" msgid="4053705651238775784">"ခေါ်ဆိုမှုမှတ်တမ်းကို ကြည့်ရန်၊ ဖုန်းခွင့်ပြုချက်ကို ဖွင့်ပါ။"</string>
-    <string name="permission_no_search" msgid="2424710404207193826">"သင့်အဆက်အသွယ်များကို ရှာဖွေရန်၊ အဆက်အသွယ်ခွင့်ပြုချက်များကို ဖွင့်ပါ။"</string>
-    <string name="permission_place_call" msgid="8686908130349369423">"ဖုန်းခေါ်ဆိုရန်၊ ဖုန်းခွင့်ပြုချက်ကိုဖွင့်ပါ။"</string>
-    <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"ဖုန်း အက်ပ်ဆီတွင် စနစ် ဆက်တင်များသို့ ရေးသားခွင့် မရှိပါ။"</string>
-    <string name="blocked_number_call_log_label" msgid="4212282846299997693">"ပိတ်ဆို့ထား"</string>
-    <string name="call_log_action_block_report_number" msgid="7302636538668696729">"စပမ်းကို ပိတ်ဆို့ပါ/သတင်းပို့ပါ"</string>
-    <string name="call_log_action_block_number" msgid="5048188386501998865">"နံပါတ်ကို ပိတ်ဆို့ရန်"</string>
-    <string name="call_log_action_remove_spam" msgid="2045319806318398403">"စပမ်း မဟုတ်ပါ"</string>
-    <string name="call_log_action_unblock_number" msgid="6100117033288448758">"နံပါတ်ကို ဖွင့်မည်"</string>
-    <string name="spam_number_call_log_label" msgid="2678431398326811131">"စပမ်း"</string>
-    <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> သည် အော့ဖ်လိုင်းဖြစ်နေသောကြောင့် ဆက်သွယ်၍ မရနိုင်ပါ"</string>
-    <string name="about_phone_label" msgid="582991354677973731">"အကြောင်း"</string>
-    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Google ၏ စာသားမှတ်တမ်း"</string>
-    <string name="voicemail_transcription_in_progress" msgid="2933320969613783210">"Google က ကူးယူနေသည်…"</string>
-    <string name="voicemail_transcription_failed" msgid="335275303117412706">"စာသားမှတ်တမ်း မရရှိနိုင်ပါ။"</string>
-    <string name="voicemail_transcription_failed_language_not_supported" msgid="4210332591050562553">"စာသားမှတ်တမ်း မရရှိနိုင်ပါ။ ဘာသာစကား ပံ့ပိုးမထားပါ။"</string>
-    <string name="voicemail_transcription_failed_no_speech" msgid="9093372879697874852">"စာသားမှတ်တမ်း မရရှိနိုင်ပါ။ မည်သည့် ပြောဆိုမှုကိုမျှ ရှာမတွေ့ပါ။"</string>
-    <string name="view_conversation" msgid="7895904782094119702">"ကြည့်ရန်"</string>
-    <string name="ec_data_deleted" msgid="4794880345545827107">"ခေါ်ဆိုမှုကို ဖျက်လိုက်ပါပြီ။ မက်ဆေ့ဂျ်များရှိ ဤခေါ်ဆိုမှုအတောအတွင်း မျှဝေထားသော ပူးတွဲပါဖိုင်များကို ကြည့်ရှုပြီး ဖျက်ပါ။"</string>
-    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"ခေါ်ဆိုမှုကို ဖျက်လိုက်ပါပြီ။ မက်ဆေ့ဂျ်များရှိ ဤခေါ်ဆိုမှုများအတွင်း မျှဝေထားသော ပူးတွဲပါဖိုင်များကို ကြည့်ရှုပြီး ဖျက်ပါ။"</string>
+  <string name="respond_via_sms_setting_title">အမြန်တုံ့ပြန်ချက်များ</string>
+  <string name="call_settings_label">ခေါ်ဆိုမှုများ</string>
+  <string name="manage_blocked_numbers_label">ပိတ်ထားသော နံပါတ်များ</string>
+  <string name="voicemail_settings_label">အသံမေးလ်</string>
+  <string name="blocked_numbers_disabled_emergency_header_label">ခေါ်ဆိုမှုပိတ်ဆို့ခြင်း ယာယီပိတ်ထားသည်</string>
+  <string name="blocked_numbers_disabled_emergency_desc">သင်သည် လွန်ခဲ့သည့် ၄၈ နာရီအတွင်း ဤဖုန်းဖြင့် အရေးပေါ်ဌာနကိုဖုန်း ခေါ်ဆိုခဲ့သောကြောင့် ခေါ်ဆိုမှုပိတ်ဆို့ခြင်းကို ဖြုတ်ထားသည်။ ၄၈ နာရီကျော်လွန်သည်နှင့် ၎င်းကိုအလိုအလျောက် ပြန်ဖွင့်ပေးပါမည်။</string>
+  <string name="import_send_to_voicemail_numbers_label">နံပါတ်များ သွင်းရန်</string>
+  <string name="blocked_call_settings_import_description">သင်သည် ယခင်က အချို့ခေါ်ဆိုသူများကို အလိုအလျောက် အခြား အက်ပ်များမှ တဆင့် အသံစာသို့ ပို့ရန် မှတ်ပေးခဲ့သည်။</string>
+  <string name="blocked_call_settings_view_numbers_button">နံပါတ်များကို ကြည့်ရန်</string>
+  <string name="blocked_call_settings_import_button">တင်သွင်းရန်</string>
+  <string name="description_blocked_number_list_delete">နံပါတ်ကို ဖွင့်မည်</string>
+  <string name="addBlockedNumber">နံပါတ် ထည့်သွင်းပါ</string>
+  <string name="block_number_footer_message_vvm">ဤနံပါတ်များမှ ခေါ်ဆိုမှုများကို ပိတ်ဆို့လိုက်မည်ဖြစ်ပြီး အသံမေးလ်များကို အလိုအလျောက် ဖျက်လိုက်ပါမည်။</string>
+  <string name="block_number_footer_message_no_vvm">ဤနံပါတ်များမှ ခေါ်ဆိုမှုများကို ပိတ်ဆို့လိုက်ပါမည်၊ သို့သော် ၎င်းတို့သည် သင့်ကို အသံမေးလ်ချန်ခဲ့နိုင်ပါသည်။</string>
+  <string name="block_list">ပိတ်ထားသည့် နံပါတ်များ</string>
+  <string name="alreadyBlocked">%1$s အားပိတ်ဆို့ထားပြီးပါပြီ။</string>
+  <string name="phone_account_settings_label">ခေါ်ဆိုသော အကောင့်များ</string>
+  <string name="permission_no_speeddial">မြန်နှုန်းမြင့်ဖုန်းခေါ်ဆိုမှုကို ဖွင့်ရန်၊ အဆက်အသွယ်ခွင့်ပြုချက်ကို ဖွင့်ပါ။</string>
+  <string name="permission_no_calllog">ခေါ်ဆိုမှုမှတ်တမ်းကို ကြည့်ရန်၊ ဖုန်းခွင့်ပြုချက်ကို ဖွင့်ပါ။</string>
+  <string name="permission_no_search">သင့်အဆက်အသွယ်များကို ရှာဖွေရန်၊ အဆက်အသွယ်ခွင့်ပြုချက်များကို ဖွင့်ပါ။</string>
+  <string name="permission_place_call">ဖုန်းခေါ်ဆိုရန်၊ ဖုန်းခွင့်ပြုချက်ကိုဖွင့်ပါ။</string>
+  <string name="toast_cannot_write_system_settings">ဖုန်း အက်ပ်ဆီတွင် စနစ် ဆက်တင်များသို့ ရေးသားခွင့် မရှိပါ။</string>
+  <string name="blocked_number_call_log_label">ပိတ်ဆို့ထား</string>
+  <string name="call_log_action_block_report_number">စပမ်းကို ပိတ်ဆို့ပါ/သတင်းပို့ပါ</string>
+  <string name="call_log_action_block_number">နံပါတ်ကို ပိတ်ဆို့ရန်</string>
+  <string name="call_log_action_remove_spam">စပမ်း မဟုတ်ပါ</string>
+  <string name="call_log_action_unblock_number">နံပါတ်ကို ဖွင့်မည်</string>
+  <string name="spam_number_call_log_label">စပမ်း</string>
+  <string name="call_composer_connection_failed">%1$s သည် အော့ဖ်လိုင်းဖြစ်နေသောကြောင့် ဆက်သွယ်၍ မရနိုင်ပါ</string>
+  <string name="about_phone_label">အကြောင်း</string>
+  <string name="voicemail_transcription_branding_text">Google ၏ စာသားမှတ်တမ်း</string>
+  <string name="voicemail_transcription_in_progress">ကူးယူနေသည်...</string>
+  <string name="voicemail_transcription_failed">စာသားမှတ်တမ်း မရရှိနိုင်ပါ။</string>
+  <string name="voicemail_transcription_failed_language_not_supported">စာသားမှတ်တမ်း မရရှိနိုင်ပါ။ ဘာသာစကား ပံ့ပိုးမထားပါ။</string>
+  <string name="voicemail_transcription_failed_no_speech">စာသားမှတ်တမ်း မရရှိနိုင်ပါ။ မည်သည့် ပြောဆိုမှုကိုမျှ ရှာမတွေ့ပါ။</string>
+  <string name="voicemail_donation_promo_title">စာသားမှတ်တမ်း တိကျမှု ပိုကောင်းလာစေရန် ကူညီမလား။</string>
+  <string name="voicemail_donation_promo_content">စာသားမှတ်တမ်းပါ ဤသည်နှင့် နောင်လာမည့် အသံမေးလ်မက်ဆေ့ဂျ်များကို Google အား သုံးသပ်ခွင့်ပေးပါ။ ၎င်းတို့ကို အမည်မဖော်ဘဲ သိမ်းထားပါမည်။ \'ဆက်တင်များ\' ကို အချိန်မရွေး ပြောင်းပါ။ %1$s</string>
+  <string name="voicemail_donation_promo_opt_in">ပါဝင်ပါမည်</string>
+  <string name="voicemail_donation_promo_opt_out">မလိုတော့ပါ</string>
+  <string name="voicemail_transcription_rating">စာသားမှတ်တမ်း အဆင့်သတ်မှတ်ရန်</string>
+  <string name="voicemail_transcription_rating_thanks">သင့်အကြံပြုချက်အတွက် ကျေးဇူးပါ</string>
+  <string name="description_rating_good">လိုက်ခ်လုပ်ရန်</string>
+  <string name="description_rating_bad">မကြိုက်</string>
+  <string name="view_conversation">ကြည့်ရန်</string>
+  <string name="ec_data_deleted">ခေါ်ဆိုမှုကို ဖျက်လိုက်ပါပြီ။ မက်ဆေ့ဂျ်များရှိ ဤခေါ်ဆိုမှုအတောအတွင်း မျှဝေထားသော ပူးတွဲပါဖိုင်များကို ကြည့်ရှုပြီး ဖျက်ပါ။</string>
+  <string name="multiple_ec_data_deleted">ခေါ်ဆိုမှုကို ဖျက်လိုက်ပါပြီ။ မက်ဆေ့ဂျ်များရှိ ဤခေါ်ဆိုမှုများအတွင်း မျှဝေထားသော ပူးတွဲပါဖိုင်များကို ကြည့်ရှုပြီး ဖျက်ပါ။</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-nb/strings.xml b/java/com/android/dialer/app/res/values-nb/strings.xml
index d530f21..b51470b 100644
--- a/java/com/android/dialer/app/res/values-nb/strings.xml
+++ b/java/com/android/dialer/app/res/values-nb/strings.xml
@@ -1,179 +1,171 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="applicationLabel" msgid="2202739481132958990">"Telefon"</string>
-    <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"Telefontastatur"</string>
-    <string name="callHistoryIconLabel" msgid="7493268743411968630">"Anropslogg"</string>
-    <string name="action_copy_number_text" msgid="832682558551502319">"Kopiér nummeret"</string>
-    <string name="copy_transcript_text" msgid="937904189017310829">"Kopiér transkripsjonen"</string>
-    <string name="action_edit_number_before_call" msgid="8017492815878473837">"Endre nummeret før du ringer"</string>
-    <string name="call_log_delete_all" msgid="7852970926906523784">"Slett anropsloggen"</string>
-    <string name="call_log_trash_voicemail" msgid="6118493534178533972">"Slett talepost"</string>
-    <string name="snackbar_voicemail_deleted" msgid="7463166543725496307">"Taleposten er slettet"</string>
-    <string name="snackbar_voicemail_deleted_undo" msgid="6959743982796409941">"ANGRE"</string>
-    <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"Vil du slette anropsloggen?"</string>
-    <string name="clearCallLogConfirmation" msgid="6844949465815109166">"Dette sletter alle anrop fra loggen"</string>
-    <string name="clearCallLogProgress_title" msgid="995004835687361977">"Sletter anropsloggen …"</string>
-    <string name="notification_missedCallTitle" msgid="8283366068539898486">"Tapt anrop"</string>
-    <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"Tapt jobbanrop"</string>
-    <string name="notification_missedCallsTitle" msgid="3697442015345089802">"Tapte anrop"</string>
-    <string name="notification_missedCallsMsg" msgid="8176217633929018706">"<xliff:g id="NUM_MISSED_CALLS">%d</xliff:g> tapte anrop"</string>
-    <string name="notification_missedCall_call_back" msgid="3875698110051973965">"Ring tilbake"</string>
-    <string name="notification_missedCall_message" msgid="5086910028988305964">"Melding"</string>
-    <string name="post_call_notification_message" msgid="5417476789860590611">"<xliff:g id="NAME">%1$s</xliff:g>: <xliff:g id="MESSAGE">%2$s</xliff:g>"</string>
-    <string name="notification_voicemail_text_format" msgid="1895667520930252897">"Ring <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
-    <string name="notification_voicemail_no_vm_number" msgid="8942821987929495842">"Mangler nummer til talepostkasse"</string>
-    <plurals name="notification_voicemail_title" formatted="false" msgid="1551847434476438657">
-      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> talemeldinger </item>
-      <item quantity="one">talemelding</item>
-    </plurals>
-    <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
-    <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"Ny talemelding fra <xliff:g id="CALLER">%1$s</xliff:g>"</string>
-    <string name="voicemail_playback_error" msgid="4384373852257757295">"Kunne ikke spille av talepost"</string>
-    <string name="voicemail_fetching_content" msgid="572320120918636014">"Laster inn talepost …"</string>
-    <string name="voicemail_fetching_timout" msgid="2128873915839949783">"Kunne ikke laste inn taleposten"</string>
-    <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_playback_speakerphone" msgid="4852027754869750227">"Slå høyttaleren på eller av"</string>
-    <string name="description_playback_seek" msgid="1340910573254132520">"Søk etter avspillingsposisjon"</string>
-    <string name="action_menu_call_history_description" msgid="8829135306925008546">"Anropslogg"</string>
-    <string name="action_menu_overflow_description" msgid="7648679686746517341">"Flere alternativer"</string>
-    <string name="action_menu_dialpad_button" msgid="1970631633457493180">"Tastatur"</string>
-    <string name="dialer_settings_label" msgid="4980176284150290175">"Innstillinger"</string>
-    <string name="simulator_submenu_label" msgid="186156287346615267">"Simulator"</string>
-    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Nytt grensesnitt – lag snarvei"</string>
-    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"Starter massehandlingsmodus"</string>
-    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"Massehandlingsmodus er avsluttet"</string>
-    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"Du har valgt <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"Du har valgt bort <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_contact_details" msgid="3341280873855253464">"Kontaktinformasjon for <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_spam_contact_details" msgid="5592578752881528368">"Kontaktdetaljer for den potensielt useriøse oppringeren <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> samtaler."</string>
-    <string name="description_video_call" msgid="3738199365585751727">"Videoanrop."</string>
-    <string name="description_start_voice_search" msgid="8380022725973015261">"Start talesøk"</string>
-    <string name="voicemail" msgid="8899540969000957954">"Telefonsvarer"</string>
-    <string name="description_cancel_multi_select" msgid="3930475950253360461">"Avbryt massehandlinsmodus"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Slett"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Avbryt"</string>
-    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> er valgt"</string>
-    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
-      <item quantity="other">"<b>"Vil du slette disse talemeldingene? "</b>"</item>
-      <item quantity="one">"<b>"Vil du slette denne talemeldingen? "</b>"</item>
-    </plurals>
-    <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
-    <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> kl. <xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
-    <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="voice_search_not_available" msgid="6546240433719732905">"Talesøk er ikke tilgjengelig"</string>
-    <string name="dialer_hint_find_contact" msgid="2023214799381149808">"Søk i kontakter"</string>
-    <string name="block_number_search_hint" msgid="5377706079015099416">"Legg til nummer eller søk etter kontakter"</string>
-    <string name="call_log_all_empty" msgid="3955572868518162004">"Anropsloggen er tom"</string>
-    <string name="call_log_all_empty_action" msgid="852218280136243014">"Start en samtale"</string>
-    <string name="call_log_missed_empty" msgid="7094936030845062214">"Du har ingen tapte anrop."</string>
-    <string name="call_log_voicemail_empty" msgid="273623903423275178">"Talepostkassen din er tom."</string>
-    <string name="call_log_activity_title" msgid="1275242727244945527">"Anropslogg"</string>
-    <string name="call_log_all_title" msgid="6042262422192020327">"Alle"</string>
-    <string name="call_log_missed_title" msgid="17254005889268015">"Ubesvarte"</string>
-    <string name="tab_speed_dial" msgid="6616404752227561075">"Hurtigvalg"</string>
-    <string name="tab_history" msgid="7420269368689503596">"Anropslogg"</string>
-    <string name="tab_all_contacts" msgid="5531733977693943015">"Kontakter"</string>
-    <string name="tab_voicemail" msgid="2458548090088316246">"Talepostkasse"</string>
-    <string name="search_shortcut_call_number" msgid="8847918845036880688">"Ring <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"Opprett ny kontakt"</string>
-    <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"Legg til for en kontakt"</string>
-    <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"Send SMS"</string>
-    <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"Start en videosamtale"</string>
-    <string name="search_shortcut_block_number" msgid="4587283230665805776">"Blokkér nummeret"</string>
-    <string name="speed_dial_empty" msgid="3346406399966039505">"Du har ingen på hurtigoppringning ennå"</string>
-    <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"Legg til en favoritt"</string>
-    <string name="remove_contact" msgid="2353580570488923668">"Fjern"</string>
-    <string name="select_all" msgid="408601760696146245">"Velg alle"</string>
-    <string name="call_log_action_video_call" msgid="7565549950343850819">"Videoanrop"</string>
-    <string name="call_log_action_send_message" msgid="6948727362660115554">"Send en melding"</string>
-    <string name="call_log_action_details" msgid="2091370737371449501">"Samtaleinformasjon"</string>
-    <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"Send til …"</string>
-    <string name="call_log_action_call" msgid="682724094251540583">"Ring <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_incoming_missed_call" msgid="8292535799379230029">"Ubesvart anrop fra <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_incoming_answered_call" msgid="3920182963103160610">"Besvart anrop fra <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_unread_voicemail" msgid="145170985013419170">"Ulest talepost fra <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_read_voicemail" msgid="5585559881573227732">"Talepost fra <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_outgoing_call" msgid="543952487882919924">"Ring til <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="call_log_via_number" msgid="1340307109806397650">"via <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> via <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="description_call_action" msgid="4042796498169106545">"Ring <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_video_call_action" msgid="1237090968588659650">"Start videoanrop med <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
-    <string name="description_voicemail_action" msgid="3290143432403538524">"Lytt til talepostkasse fra <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_create_new_contact_action" msgid="1928282350281564130">"Opprett kontakt for <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"Legg <xliff:g id="NAMEORNUMBER">^1</xliff:g> til en eksisterende kontakt"</string>
-    <string name="description_details_action" msgid="2061866409737706174">"Samtaledetaljer for <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="call_log_header_today" msgid="1576119097475845293">"I dag"</string>
-    <string name="call_log_header_yesterday" msgid="5616077776205329563">"I går"</string>
-    <string name="call_log_header_other" msgid="4940676886254217644">"Eldre"</string>
-    <string name="voicemail_speaker_on" msgid="3151333608926996668">"Slå på høyttaleren."</string>
-    <string name="voicemail_speaker_off" msgid="2530064206962034201">"Slå av høyttaleren."</string>
-    <string name="voicemail_play_start_pause" msgid="3874823480278334664">"Start eller stopp avspillingen."</string>
-    <string name="display_options_title" msgid="3880091801055797975">"Visningsalternativer"</string>
-    <string name="sounds_and_vibration_title" msgid="3075050000721181384">"Lyder og vibrasjon"</string>
-    <string name="accessibility_settings_title" msgid="3329027650429831820">"Tilgjengelighet"</string>
-    <string name="ringtone_title" msgid="8377174189894648486">"Telefonringelyd"</string>
-    <string name="vibrate_on_ring_title" msgid="631441314790960485">"Vibrer også når det ringer"</string>
-    <string name="dtmf_tone_enable_title" msgid="3273762431523939277">"Tastaturlyder"</string>
-    <string name="dtmf_tone_length_title" msgid="534096029202438539">"Lengde på tastaturlyder"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="applicationLabel">Telefon</string>
+  <string name="launcherDialpadActivityLabel">Telefontastatur</string>
+  <string name="callHistoryIconLabel">Anropslogg</string>
+  <string name="action_copy_number_text">Kopiér nummeret</string>
+  <string name="copy_transcript_text">Kopiér transkripsjonen</string>
+  <string name="action_edit_number_before_call">Endre nummeret før du ringer</string>
+  <string name="call_log_delete_all">Slett anropsloggen</string>
+  <string name="call_log_trash_voicemail">Slett talepost</string>
+  <string name="snackbar_voicemail_deleted">Taleposten er slettet</string>
+  <string name="clearCallLogConfirmation_title">Vil du slette anropsloggen?</string>
+  <string name="clearCallLogConfirmation">Dette sletter alle anrop fra loggen</string>
+  <string name="clearCallLogProgress_title">Sletter anropsloggen …</string>
+  <string name="notification_missedCallTitle">Tapt anrop</string>
+  <string name="notification_missedWorkCallTitle">Tapt jobbanrop</string>
+  <string name="notification_missedCallsTitle">Tapte anrop</string>
+  <string name="notification_missedCallsMsg">%d tapte anrop</string>
+  <string name="notification_missedCall_call_back">Ring tilbake</string>
+  <string name="notification_missedCall_message">Melding</string>
+  <string name="post_call_notification_message">%1$s: %2$s</string>
+  <string name="notification_voicemail_text_format">Ring %s</string>
+  <string name="notification_voicemail_no_vm_number">Mangler nummer til talepostkasse</string>
+  <plurals name="notification_voicemail_title">
+    <item quantity="one">talemelding</item>
+    <item quantity="other">%1$d talemeldinger </item>
+  </plurals>
+  <string name="notification_voicemail_callers_list">%1$s, %2$s</string>
+  <string name="notification_new_voicemail_ticker">Ny talemelding fra %1$s</string>
+  <string name="voicemail_playback_error">Kunne ikke spille av talepost</string>
+  <string name="voicemail_fetching_content">Laster inn talepost …</string>
+  <string name="voicemail_fetching_timout">Kunne ikke laste inn taleposten</string>
+  <string name="call_log_item_count_and_date">(%1$d) %2$s</string>
+  <string name="description_playback_speakerphone">Slå høyttaleren på eller av</string>
+  <string name="description_playback_seek">Søk etter avspillingsposisjon</string>
+  <string name="action_menu_call_history_description">Anropslogg</string>
+  <string msgid="2295659037509008453" name="action_menu_overflow_description">Flere alternativer</string>
+  <string name="action_menu_dialpad_button">Tastatur</string>
+  <string name="dialer_settings_label">Innstillinger</string>
+  <string name="simulator_submenu_label">Simulator</string>
+  <string name="new_ui_launcher_shortcut_label">Nytt grensesnitt – lag snarvei</string>
+  <string name="description_entering_bulk_action_mode">Starter massehandlingsmodus</string>
+  <string name="description_leaving_bulk_action_mode">Massehandlingsmodus er avsluttet</string>
+  <string name="description_selecting_bulk_action_mode">Du har valgt %1$s</string>
+  <string name="description_unselecting_bulk_action_mode">Du har valgt bort %1$s</string>
+  <string name="description_contact_details">Kontaktinformasjon for %1$s</string>
+  <string name="description_spam_contact_details">Kontaktdetaljer for den potensielt useriøse oppringeren %1$s</string>
+  <string name="description_num_calls">%1$s samtaler.</string>
+  <string name="description_video_call">Videoanrop.</string>
+  <string name="description_start_voice_search">Start talesøk</string>
+  <string name="voicemail">Telefonsvarer</string>
+  <string name="description_cancel_multi_select">Avbryt massehandlinsmodus</string>
+  <string name="voicemailMultiSelectDeleteConfirm">Slett</string>
+  <string name="voicemailMultiSelectDeleteCancel">Avbryt</string>
+  <string name="voicemailMultiSelectActionBarTitle">%1$s er valgt</string>
+  <plurals name="delete_voicemails_confirmation_dialog_title">
+    <item quantity="one"><b>Vil du slette denne talemeldingen? </b></item>
+    <item quantity="other"><b>Vil du slette disse talemeldingene? </b></item>
+  </plurals>
+  <string name="voicemailCallLogToday">@string/call_log_header_today</string>
+  <string name="voicemailCallLogDateTimeFormat">%1$s kl. %2$s</string>
+  <string name="voicemailDurationFormat">%1$02d:%2$02d</string>
+  <string name="voicemailCallLogDateTimeFormatWithDuration">%1$s • %2$s</string>
+  <string name="voice_search_not_available">Talesøk er ikke tilgjengelig</string>
+  <string name="dialer_hint_find_contact">Søk i kontakter</string>
+  <string name="block_number_search_hint">Legg til nummer eller søk etter kontakter</string>
+  <string name="call_log_all_empty">Anropsloggen er tom</string>
+  <string name="call_log_all_empty_action">Start en samtale</string>
+  <string name="call_log_missed_empty">Du har ingen tapte anrop.</string>
+  <string name="call_log_voicemail_empty">Talepostkassen din er tom.</string>
+  <string name="call_log_activity_title">Anropslogg</string>
+  <string name="call_log_all_title">Alle</string>
+  <string name="call_log_missed_title">Ubesvarte</string>
+  <string name="tab_speed_dial">Hurtigvalg</string>
+  <string name="tab_history">Anropslogg</string>
+  <string name="tab_all_contacts">Kontakter</string>
+  <string name="tab_voicemail">Talepostkasse</string>
+  <string name="search_shortcut_call_number">Ring %s</string>
+  <string name="search_shortcut_create_new_contact">Opprett ny kontakt</string>
+  <string name="search_shortcut_add_to_contact">Legg til for en kontakt</string>
+  <string name="search_shortcut_send_sms_message">Send SMS</string>
+  <string name="search_shortcut_make_video_call">Start en videosamtale</string>
+  <string name="search_shortcut_block_number">Blokkér nummeret</string>
+  <string name="speed_dial_empty">Du har ingen på hurtigoppringning ennå</string>
+  <string name="speed_dial_empty_add_favorite_action">Legg til en favoritt</string>
+  <string name="remove_contact">Fjern</string>
+  <string name="select_all">Velg alle</string>
+  <string name="call_log_action_video_call">Videoanrop</string>
+  <string name="call_log_action_set_up_video">Konfigurer videoanrop</string>
+  <string name="call_log_action_invite_video">Inviter til videosamtale</string>
+  <string name="call_log_action_send_message">Send en melding</string>
+  <string name="call_log_action_details">Samtaleinformasjon</string>
+  <string name="call_log_action_share_voicemail">Send til …</string>
+  <string name="call_log_action_call">Ring ^1</string>
+  <string name="description_incoming_missed_call">Ubesvart anrop fra ^1, ^2, ^3, ^4.</string>
+  <string name="description_incoming_answered_call">Besvart anrop fra ^1, ^2, ^3, ^4.</string>
+  <string name="description_unread_voicemail">Ulest talepost fra ^1, ^2, ^3, ^4.</string>
+  <string name="description_read_voicemail">Talepost fra ^1, ^2, ^3, ^4.</string>
+  <string name="description_outgoing_call">Ring til ^1, ^2, ^3, ^4.</string>
+  <string name="call_log_via_number">via %1$s</string>
+  <string name="call_log_via_number_phone_account">%1$s via %2$s</string>
+  <string name="description_call_action">Ring ^1</string>
+  <string name="description_video_call_action">Start videoanrop med ^1.</string>
+  <string name="description_voicemail_action">Lytt til talepostkasse fra ^1</string>
+  <string name="description_create_new_contact_action">Opprett kontakt for ^1</string>
+  <string name="description_add_to_existing_contact_action">Legg ^1 til en eksisterende kontakt</string>
+  <string name="description_details_action">Samtaledetaljer for ^1</string>
+  <string name="call_log_header_today">I dag</string>
+  <string name="call_log_header_yesterday">I går</string>
+  <string name="call_log_header_other">Eldre</string>
+  <string name="voicemail_speaker_on">Slå på høyttaleren.</string>
+  <string name="voicemail_speaker_off">Slå av høyttaleren.</string>
+  <string name="voicemail_play_start_pause">Start eller stopp avspillingen.</string>
+  <string name="display_options_title">Visningsalternativer</string>
+  <string name="sounds_and_vibration_title">Lyder og vibrasjon</string>
+  <string name="accessibility_settings_title">Tilgjengelighet</string>
+  <string name="ringtone_title">Telefonringelyd</string>
+  <string name="vibrate_on_ring_title">Vibrer også når det ringer</string>
+  <string name="dtmf_tone_enable_title">Tastaturlyder</string>
+  <string name="dtmf_tone_length_title">Lengde på tastaturlyder</string>
   <string-array name="dtmf_tone_length_entries">
-    <item msgid="3136353015227162823">"Normal"</item>
-    <item msgid="5376841175538523822">"Lang"</item>
+    <item>Normal</item>
+    <item>Lang</item>
   </string-array>
-    <string name="respond_via_sms_setting_title" msgid="8008181606657693452">"Hurtigsvar"</string>
-    <string name="call_settings_label" msgid="7824611757200960807">"Anrop"</string>
-    <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Anropsblokkering"</string>
-    <string name="voicemail_settings_label" msgid="4594299554519920570">"Talepost"</string>
-    <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Blokkering av anrop er midlertidig slått av"</string>
-    <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Blokkering av anrop er slått av fordi du kontaktet nødtjenester fra denne telefonen i løpet av de siste 48 timene. Funksjonen blir automatisk slått på igjen når perioden på 48 timer er utløpt."</string>
-    <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Importér numre"</string>
-    <string name="blocked_call_settings_import_description" msgid="1819412052545228965">"Du markerte tidligere noen anropere for automatisk overføring til talepost via andre apper."</string>
-    <string name="blocked_call_settings_view_numbers_button" msgid="3332727948554356704">"Se numre"</string>
-    <string name="blocked_call_settings_import_button" msgid="7319111700387470727">"Importér"</string>
-    <string name="description_blocked_number_list_delete" msgid="2139644216858370740">"Opphev blokkeringen av nummeret"</string>
-    <string name="addBlockedNumber" msgid="3053473735238295551">"Legg til nummer"</string>
-    <string name="block_number_footer_message_vvm" msgid="7955326304033982368">"Anrop fra disse numrene blokkeres, og talepost blir automatisk slettet."</string>
-    <string name="block_number_footer_message_no_vvm" msgid="1152684139070471665">"Anrop fra dette nummeret blokkeres, men du kan fortsatt motta talepost."</string>
-    <string name="block_list" msgid="4701585783411870782">"Blokkerte numre"</string>
-    <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g> er allerede blokkert."</string>
-    <string name="phone_account_settings_label" msgid="8372485478006965920">"Ringekontoer"</string>
-    <string name="permission_no_speeddial" msgid="8487215628510596753">"For å slå på hurtigoppringning, slå på Kontakter-tillatelsen."</string>
-    <string name="permission_no_calllog" msgid="4053705651238775784">"For å se samtaleloggen din, slå på Telefon-tillatelsen."</string>
-    <string name="permission_no_search" msgid="2424710404207193826">"For å søke i kontaktene dine, slå på tillatelser for Kontakter."</string>
-    <string name="permission_place_call" msgid="8686908130349369423">"For å ringe, slå på Telefon-tillatelsen."</string>
-    <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"Telefonappen har ikke tillatelse til å skrive til systeminnstillinger."</string>
-    <string name="blocked_number_call_log_label" msgid="4212282846299997693">"Blokkert"</string>
-    <string name="call_log_action_block_report_number" msgid="7302636538668696729">"Blokkér/rapportér som useriøs"</string>
-    <string name="call_log_action_block_number" msgid="5048188386501998865">"Blokkér nummeret"</string>
-    <string name="call_log_action_remove_spam" msgid="2045319806318398403">"Ikke useriøs"</string>
-    <string name="call_log_action_unblock_number" msgid="6100117033288448758">"Opphev blokkeringen av nummeret"</string>
-    <string name="spam_number_call_log_label" msgid="2678431398326811131">"Nettsøppel"</string>
-    <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> er frakoblet og kan ikke nås"</string>
-    <string name="about_phone_label" msgid="582991354677973731">"Om"</string>
-    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Transkribert av Google"</string>
-    <string name="voicemail_transcription_in_progress" msgid="2933320969613783210">"Google transkriberer …"</string>
-    <string name="voicemail_transcription_failed" msgid="335275303117412706">"Ingen transkripsjon."</string>
-    <string name="voicemail_transcription_failed_language_not_supported" msgid="4210332591050562553">"Ingen transkripsjon. Språket støttes ikke."</string>
-    <string name="voicemail_transcription_failed_no_speech" msgid="9093372879697874852">"Ingen transkripsjon. Ingen tale ble registrert."</string>
-    <string name="view_conversation" msgid="7895904782094119702">"Se"</string>
-    <string name="ec_data_deleted" msgid="4794880345545827107">"Anropet er slettet. Se og slett vedleggene som ble delt i denne samtalen, i Meldinger."</string>
-    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"Anropene er slettet. Se og slett vedleggene som ble delt i samtalene, i Meldinger."</string>
+  <string name="respond_via_sms_setting_title">Hurtigsvar</string>
+  <string name="call_settings_label">Anrop</string>
+  <string name="manage_blocked_numbers_label">Blokkerte numre</string>
+  <string name="voicemail_settings_label">Talepost</string>
+  <string name="blocked_numbers_disabled_emergency_header_label">Blokkering av anrop er midlertidig slått av</string>
+  <string name="blocked_numbers_disabled_emergency_desc">Blokkering av anrop er slått av fordi du kontaktet nødtjenester fra denne telefonen i løpet av de siste 48 timene. Funksjonen blir automatisk slått på igjen når perioden på 48 timer er utløpt.</string>
+  <string name="import_send_to_voicemail_numbers_label">Importér numre</string>
+  <string name="blocked_call_settings_import_description">Du markerte tidligere noen anropere for automatisk overføring til talepost via andre apper.</string>
+  <string name="blocked_call_settings_view_numbers_button">Se numre</string>
+  <string name="blocked_call_settings_import_button">Importér</string>
+  <string name="description_blocked_number_list_delete">Opphev blokkeringen av nummeret</string>
+  <string name="addBlockedNumber">Legg til nummer</string>
+  <string name="block_number_footer_message_vvm">Anrop fra disse numrene blokkeres, og talepost blir automatisk slettet.</string>
+  <string name="block_number_footer_message_no_vvm">Anrop fra dette nummeret blokkeres, men du kan fortsatt motta talepost.</string>
+  <string name="block_list">Blokkerte numre</string>
+  <string name="alreadyBlocked">%1$s er allerede blokkert.</string>
+  <string name="phone_account_settings_label">Ringekontoer</string>
+  <string name="permission_no_speeddial">For å slå på hurtigoppringning, slå på Kontakter-tillatelsen.</string>
+  <string name="permission_no_calllog">For å se samtaleloggen din, slå på Telefon-tillatelsen.</string>
+  <string name="permission_no_search">For å søke i kontaktene dine, slå på tillatelser for Kontakter.</string>
+  <string name="permission_place_call">For å ringe, slå på Telefon-tillatelsen.</string>
+  <string name="toast_cannot_write_system_settings">Telefonappen har ikke tillatelse til å skrive til systeminnstillinger.</string>
+  <string name="blocked_number_call_log_label">Blokkert</string>
+  <string name="call_log_action_block_report_number">Blokkér/rapportér som useriøs</string>
+  <string name="call_log_action_block_number">Blokkér nummeret</string>
+  <string name="call_log_action_remove_spam">Ikke useriøs</string>
+  <string name="call_log_action_unblock_number">Opphev blokkeringen av nummeret</string>
+  <string name="spam_number_call_log_label">Nettsøppel</string>
+  <string name="call_composer_connection_failed">%1$s er frakoblet og kan ikke nås</string>
+  <string name="about_phone_label">Om</string>
+  <string name="voicemail_transcription_branding_text">Transkribert av Google</string>
+  <string name="voicemail_transcription_in_progress">Transkriberer …</string>
+  <string name="voicemail_transcription_failed">Ingen transkripsjon.</string>
+  <string name="voicemail_transcription_failed_language_not_supported">Ingen transkripsjon. Språket støttes ikke.</string>
+  <string name="voicemail_transcription_failed_no_speech">Ingen transkripsjon. Ingen tale ble registrert.</string>
+  <string name="voicemail_donation_promo_title">Vil du hjelpe oss med å gjøre transkripsjoner mer nøyaktige?</string>
+  <string name="voicemail_donation_promo_content">La Google gå gjennom denne og fremtidige talemeldinger med transkripsjoner. De blir lagret anonymt. Du kan endre innstillingene når som helst. %1$s</string>
+  <string name="voicemail_donation_promo_opt_in">Ja, jeg er med</string>
+  <string name="voicemail_donation_promo_opt_out">Nei takk</string>
+  <string name="voicemail_transcription_rating">Vurder transkripsjonskvalitet</string>
+  <string name="voicemail_transcription_rating_thanks">Takk for tilbakemeldingen</string>
+  <string name="description_rating_good">Liker</string>
+  <string name="description_rating_bad">Liker ikke</string>
+  <string name="view_conversation">Se</string>
+  <string name="ec_data_deleted">Anropet er slettet. Se og slett vedleggene som ble delt i denne samtalen, i Meldinger.</string>
+  <string name="multiple_ec_data_deleted">Anropene er slettet. Se og slett vedleggene som ble delt i samtalene, i Meldinger.</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-ne/strings.xml b/java/com/android/dialer/app/res/values-ne/strings.xml
index 4a8b31e..1a05817 100644
--- a/java/com/android/dialer/app/res/values-ne/strings.xml
+++ b/java/com/android/dialer/app/res/values-ne/strings.xml
@@ -1,179 +1,171 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="applicationLabel" msgid="2202739481132958990">"फोन"</string>
-    <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"फोनको किप्याड"</string>
-    <string name="callHistoryIconLabel" msgid="7493268743411968630">"कल इतिहास"</string>
-    <string name="action_copy_number_text" msgid="832682558551502319">"नम्बर प्रतिलिपि गर्नुहोस्"</string>
-    <string name="copy_transcript_text" msgid="937904189017310829">"ट्रान्सक्रिप्शनको प्रतिलिपि बनाउँनुहोस्"</string>
-    <string name="action_edit_number_before_call" msgid="8017492815878473837">"कल गर्न अगाडि नम्बर सम्पादन गर्नुहोस्"</string>
-    <string name="call_log_delete_all" msgid="7852970926906523784">"कल इतिहास हटाउनुहोस्"</string>
-    <string name="call_log_trash_voicemail" msgid="6118493534178533972">"भ्वाइसमेल हटाउनुहोस्"</string>
-    <string name="snackbar_voicemail_deleted" msgid="7463166543725496307">"भ्वाइस मेल मेटाइयो"</string>
-    <string name="snackbar_voicemail_deleted_undo" msgid="6959743982796409941">"अनडू गर्नुहोस्"</string>
-    <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"कल इतिहास मेटाउने हो?"</string>
-    <string name="clearCallLogConfirmation" msgid="6844949465815109166">"यस कार्यले तपाईँको इतिहासबाट सबै कल मेट्नेछ"</string>
-    <string name="clearCallLogProgress_title" msgid="995004835687361977">"कल इतिहास हाटउँदै..."</string>
-    <string name="notification_missedCallTitle" msgid="8283366068539898486">"छुटेका कल"</string>
-    <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"छुटेको कार्यको कल"</string>
-    <string name="notification_missedCallsTitle" msgid="3697442015345089802">"छुटेका कलहरू"</string>
-    <string name="notification_missedCallsMsg" msgid="8176217633929018706">"<xliff:g id="NUM_MISSED_CALLS">%d</xliff:g> छुटेका कलहरू"</string>
-    <string name="notification_missedCall_call_back" msgid="3875698110051973965">"फेरि कल गर्नुहोस्"</string>
-    <string name="notification_missedCall_message" msgid="5086910028988305964">"सन्देश"</string>
-    <string name="post_call_notification_message" msgid="5417476789860590611">"<xliff:g id="NAME">%1$s</xliff:g>: <xliff:g id="MESSAGE">%2$s</xliff:g>"</string>
-    <string name="notification_voicemail_text_format" msgid="1895667520930252897">"<xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>मा डायल गर्नुहोस्"</string>
-    <string name="notification_voicemail_no_vm_number" msgid="8942821987929495842">"अज्ञात भ्वाइस मेल नम्बर"</string>
-    <plurals name="notification_voicemail_title" formatted="false" msgid="1551847434476438657">
-      <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> भ्वाइसमेलहरू </item>
-      <item quantity="one">भ्वाइसमेल</item>
-    </plurals>
-    <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g> , <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
-    <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"<xliff:g id="CALLER">%1$s</xliff:g> बाट नयाँ भ्वाइसमेल"</string>
-    <string name="voicemail_playback_error" msgid="4384373852257757295">"भ्वाइस मेललाई बजाउन सकिएन"</string>
-    <string name="voicemail_fetching_content" msgid="572320120918636014">"भ्वाइस मेल लोड हुँदै ..."</string>
-    <string name="voicemail_fetching_timout" msgid="2128873915839949783">"भ्वाइस मेललाई लोड गर्न सकिएन"</string>
-    <string name="call_log_item_count_and_date" msgid="723848797957319181">"( <xliff:g id="COUNT">%1$d</xliff:g> ) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_playback_speakerphone" msgid="4852027754869750227">"स्पीकरफोन खोल्नुहोस् वा बन्द गर्नुहोस्"</string>
-    <string name="description_playback_seek" msgid="1340910573254132520">"प्लेब्याक स्थिति खोज्नुहोस्"</string>
-    <string name="action_menu_call_history_description" msgid="8829135306925008546">"कलको इतिहास"</string>
-    <string name="action_menu_overflow_description" msgid="7648679686746517341">"थप विकल्पहरू"</string>
-    <string name="action_menu_dialpad_button" msgid="1970631633457493180">"किप्याड"</string>
-    <string name="dialer_settings_label" msgid="4980176284150290175">"सेटिङ्हरू"</string>
-    <string name="simulator_submenu_label" msgid="186156287346615267">"सिम्युलेटर"</string>
-    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"नयाँ UI सर्टकट सिर्जना गर्ने"</string>
-    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"बल्क कारबाही सम्बन्धी मोडमा प्रवेश गर्दै"</string>
-    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"बल्क कारबाही सम्बन्धी मोड छोडियो"</string>
-    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> चयन गरियो"</string>
-    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> चयन हटाइयो"</string>
-    <string name="description_contact_details" msgid="3341280873855253464">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> को लागि सम्पर्क विवरणहरू"</string>
-    <string name="description_spam_contact_details" msgid="5592578752881528368">"शंकास्पद स्प्याम कलर <xliff:g id="NAMEORNUMBER">%1$s</xliff:g> का सम्पर्क सम्बन्धी विवरणहरू"</string>
-    <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> कल।"</string>
-    <string name="description_video_call" msgid="3738199365585751727">"भिडियो कल।"</string>
-    <string name="description_start_voice_search" msgid="8380022725973015261">"आवाज खोजी सुरु गर्नुहोस्"</string>
-    <string name="voicemail" msgid="8899540969000957954">"भ्वाइसमेल"</string>
-    <string name="description_cancel_multi_select" msgid="3930475950253360461">"ब्याच सम्बन्धी कारबाहीको मोडलाई रद्द गर्नुहोस्"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"मेट्नुहोस्"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"रद्द गर्नुहोस्"</string>
-    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> चयन गरियो"</string>
-    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
-      <item quantity="other">"<b>"यी भ्वाइस मेलहरू मेट्ने हो? "</b>"</item>
-      <item quantity="one">"<b>"यो भ्वाइस मेल मेट्ने हो? "</b>"</item>
-    </plurals>
-    <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
-    <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> मा <xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
-    <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="voice_search_not_available" msgid="6546240433719732905">"आवाज खोजी उपलब्ध छैन"</string>
-    <string name="dialer_hint_find_contact" msgid="2023214799381149808">"सम्पर्कहरू खोज्नुहोस्"</string>
-    <string name="block_number_search_hint" msgid="5377706079015099416">"नम्बर थप्नुहोस् वा सम्पर्कहरू खोज्नुहोस्"</string>
-    <string name="call_log_all_empty" msgid="3955572868518162004">"तपाईँको कल इतिहास खाली छ"</string>
-    <string name="call_log_all_empty_action" msgid="852218280136243014">"कल गर्नुहोस्"</string>
-    <string name="call_log_missed_empty" msgid="7094936030845062214">"तपाईँसँग कुनै पनि छुटेका कलहरू छैनन्।"</string>
-    <string name="call_log_voicemail_empty" msgid="273623903423275178">"तपाईँको भ्वाइस मेल खाली छ।"</string>
-    <string name="call_log_activity_title" msgid="1275242727244945527">"कल इतिहास"</string>
-    <string name="call_log_all_title" msgid="6042262422192020327">"सबै"</string>
-    <string name="call_log_missed_title" msgid="17254005889268015">"छुटेको"</string>
-    <string name="tab_speed_dial" msgid="6616404752227561075">"द्रूत डायल"</string>
-    <string name="tab_history" msgid="7420269368689503596">"कल इतिहास"</string>
-    <string name="tab_all_contacts" msgid="5531733977693943015">"सम्पर्कहरू"</string>
-    <string name="tab_voicemail" msgid="2458548090088316246">"भ्वाइसमेल"</string>
-    <string name="search_shortcut_call_number" msgid="8847918845036880688">"<xliff:g id="NUMBER">%s</xliff:g> कल गर्नुहोस्"</string>
-    <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"नयाँ सम्पर्क सिर्जना गर्नुहोस्"</string>
-    <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"सम्पर्कमा थप्नुहोस्"</string>
-    <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"SMS पठाउनुहोस्"</string>
-    <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"भिडियो कल बनाउनुहोस्"</string>
-    <string name="search_shortcut_block_number" msgid="4587283230665805776">"नम्बरलाई निषेध गर्नुहोस्"</string>
-    <string name="speed_dial_empty" msgid="3346406399966039505">"तपाईँको स्पिड डायलमा अझसम्म कोही छैन"</string>
-    <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"एक मनपर्ने थप्नुहोस्"</string>
-    <string name="remove_contact" msgid="2353580570488923668">"हटाउँनुहोस्"</string>
-    <string name="select_all" msgid="408601760696146245">"सबैलाई चयन गर्नुहोस्"</string>
-    <string name="call_log_action_video_call" msgid="7565549950343850819">"भिडियो कल"</string>
-    <string name="call_log_action_send_message" msgid="6948727362660115554">"सन्देश पठाउनुहोस्"</string>
-    <string name="call_log_action_details" msgid="2091370737371449501">"कल विवरणहरु"</string>
-    <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"…मा पठाउनुहोस्"</string>
-    <string name="call_log_action_call" msgid="682724094251540583">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> कल गर्नुहोस्"</string>
-    <string name="description_incoming_missed_call" msgid="8292535799379230029">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g> बाट मिस्ड कल।"</string>
-    <string name="description_incoming_answered_call" msgid="3920182963103160610">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g> बाट कलको जवाफ दिइयो।"</string>
-    <string name="description_unread_voicemail" msgid="145170985013419170">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g> बाट पढ्न बाँकी भ्वाइस मेल।"</string>
-    <string name="description_read_voicemail" msgid="5585559881573227732">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g> बाट भ्वाइस मेल।"</string>
-    <string name="description_outgoing_call" msgid="543952487882919924">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g> लाई कल गर्नुहोस्।"</string>
-    <string name="call_log_via_number" msgid="1340307109806397650">"<xliff:g id="NUMBER">%1$s</xliff:g> मार्फत"</string>
-    <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="NUMBER">%2$s</xliff:g> मार्फत <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>"</string>
-    <string name="description_call_action" msgid="4042796498169106545">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> कल गर्नुहोस्"</string>
-    <string name="description_video_call_action" msgid="1237090968588659650">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> भिडियो कल गर्नुहोस्।"</string>
-    <string name="description_voicemail_action" msgid="3290143432403538524">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> बाट भ्वाइसमेल सुन्नुहोस्"</string>
-    <string name="description_create_new_contact_action" msgid="1928282350281564130">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> का लागि नयाँ सम्पर्क बनाउँनुहोस्"</string>
-    <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"विद्यमान सम्पर्कमा <xliff:g id="NAMEORNUMBER">^1</xliff:g> थप्नुहोस्"</string>
-    <string name="description_details_action" msgid="2061866409737706174">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> का लागि कल विवरणहरू"</string>
-    <string name="call_log_header_today" msgid="1576119097475845293">"आज"</string>
-    <string name="call_log_header_yesterday" msgid="5616077776205329563">"हिजो"</string>
-    <string name="call_log_header_other" msgid="4940676886254217644">"अझ पुरानो"</string>
-    <string name="voicemail_speaker_on" msgid="3151333608926996668">"स्पिकर खोल्नुहोस्।"</string>
-    <string name="voicemail_speaker_off" msgid="2530064206962034201">"स्पिकर बन्द गर्नुहोस्।"</string>
-    <string name="voicemail_play_start_pause" msgid="3874823480278334664">"दोहर्याउने सुरु गर्नुहोस् वा रोक्नुहोस्।"</string>
-    <string name="display_options_title" msgid="3880091801055797975">"विकल्पहरू प्रदर्शन गर्नुहोस्"</string>
-    <string name="sounds_and_vibration_title" msgid="3075050000721181384">"ध्वनि र कम्पन"</string>
-    <string name="accessibility_settings_title" msgid="3329027650429831820">"पहुँचता"</string>
-    <string name="ringtone_title" msgid="8377174189894648486">"फोन रिङटोन"</string>
-    <string name="vibrate_on_ring_title" msgid="631441314790960485">"कलका लागि कम्पन पनि गर्नुहोस्"</string>
-    <string name="dtmf_tone_enable_title" msgid="3273762431523939277">"किप्याडका टोनहरू"</string>
-    <string name="dtmf_tone_length_title" msgid="534096029202438539">"किप्याडको टोनको लम्बाइ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="applicationLabel">फोन</string>
+  <string name="launcherDialpadActivityLabel">फोनको किप्याड</string>
+  <string name="callHistoryIconLabel">कल इतिहास</string>
+  <string name="action_copy_number_text">नम्बर प्रतिलिपि गर्नुहोस्</string>
+  <string name="copy_transcript_text">ट्रान्सक्रिप्शनको प्रतिलिपि बनाउँनुहोस्</string>
+  <string name="action_edit_number_before_call">कल गर्न अगाडि नम्बर सम्पादन गर्नुहोस्</string>
+  <string name="call_log_delete_all">कल इतिहास हटाउनुहोस्</string>
+  <string name="call_log_trash_voicemail">भ्वाइसमेल हटाउनुहोस्</string>
+  <string name="snackbar_voicemail_deleted">भ्वाइस मेल मेटाइयो</string>
+  <string name="clearCallLogConfirmation_title">कल इतिहास मेटाउने हो?</string>
+  <string name="clearCallLogConfirmation">यस कार्यले तपाईँको इतिहासबाट सबै कल मेट्नेछ</string>
+  <string name="clearCallLogProgress_title">कल इतिहास हाटउँदै...</string>
+  <string name="notification_missedCallTitle">छुटेका कल</string>
+  <string name="notification_missedWorkCallTitle">छुटेको कार्यको कल</string>
+  <string name="notification_missedCallsTitle">छुटेका कलहरू</string>
+  <string name="notification_missedCallsMsg">%d छुटेका कलहरू</string>
+  <string name="notification_missedCall_call_back">फेरि कल गर्नुहोस्</string>
+  <string name="notification_missedCall_message">सन्देश</string>
+  <string name="post_call_notification_message">%1$s: %2$s</string>
+  <string name="notification_voicemail_text_format">%sमा डायल गर्नुहोस्</string>
+  <string name="notification_voicemail_no_vm_number">अज्ञात भ्वाइस मेल नम्बर</string>
+  <plurals name="notification_voicemail_title">
+    <item quantity="one">भ्वाइसमेल</item>
+    <item quantity="other"> %1$d भ्वाइसमेलहरू </item>
+  </plurals>
+  <string name="notification_voicemail_callers_list">%1$s , %2$s</string>
+  <string name="notification_new_voicemail_ticker">%1$s बाट नयाँ भ्वाइसमेल</string>
+  <string name="voicemail_playback_error">भ्वाइस मेललाई बजाउन सकिएन</string>
+  <string name="voicemail_fetching_content">भ्वाइस मेल लोड हुँदै ...</string>
+  <string name="voicemail_fetching_timout">भ्वाइस मेललाई लोड गर्न सकिएन</string>
+  <string name="call_log_item_count_and_date">( %1$d ) %2$s</string>
+  <string name="description_playback_speakerphone">स्पीकरफोन खोल्नुहोस् वा बन्द गर्नुहोस्</string>
+  <string name="description_playback_seek">प्लेब्याक स्थिति खोज्नुहोस्</string>
+  <string name="action_menu_call_history_description">कलको इतिहास</string>
+  <string msgid="2295659037509008453" name="action_menu_overflow_description">थप विकल्पहरू</string>
+  <string name="action_menu_dialpad_button">किप्याड</string>
+  <string name="dialer_settings_label">सेटिङहरू</string>
+  <string name="simulator_submenu_label">सिम्युलेटर</string>
+  <string name="new_ui_launcher_shortcut_label">नयाँ UI सर्टकट सिर्जना गर्ने</string>
+  <string name="description_entering_bulk_action_mode">बल्क कारबाही सम्बन्धी मोडमा प्रवेश गर्दै</string>
+  <string name="description_leaving_bulk_action_mode">बल्क कारबाही सम्बन्धी मोड छोडियो</string>
+  <string name="description_selecting_bulk_action_mode">%1$s चयन गरियो</string>
+  <string name="description_unselecting_bulk_action_mode">%1$s चयन हटाइयो</string>
+  <string name="description_contact_details">%1$s को लागि सम्पर्क विवरणहरू</string>
+  <string name="description_spam_contact_details">शंकास्पद स्प्याम कलर %1$s का सम्पर्क सम्बन्धी विवरणहरू</string>
+  <string name="description_num_calls">%1$s कल।</string>
+  <string name="description_video_call">भिडियो कल।</string>
+  <string name="description_start_voice_search">आवाज खोजी सुरु गर्नुहोस्</string>
+  <string name="voicemail">भ्वाइसमेल</string>
+  <string name="description_cancel_multi_select">ब्याच सम्बन्धी कारबाहीको मोडलाई रद्द गर्नुहोस्</string>
+  <string name="voicemailMultiSelectDeleteConfirm">मेट्नुहोस्</string>
+  <string name="voicemailMultiSelectDeleteCancel">रद्द गर्नुहोस्</string>
+  <string name="voicemailMultiSelectActionBarTitle">%1$s चयन गरियो</string>
+  <plurals name="delete_voicemails_confirmation_dialog_title">
+    <item quantity="one"><b>यो भ्वाइस मेल मेट्ने हो? </b></item>
+    <item quantity="other"><b>यी भ्वाइस मेलहरू मेट्ने हो? </b></item>
+  </plurals>
+  <string name="voicemailCallLogToday">@string/call_log_header_today</string>
+  <string name="voicemailCallLogDateTimeFormat">%1$s मा %2$s</string>
+  <string name="voicemailDurationFormat">%1$02d:%2$02d</string>
+  <string name="voicemailCallLogDateTimeFormatWithDuration">%1$s • %2$s</string>
+  <string name="voice_search_not_available">आवाज खोजी उपलब्ध छैन</string>
+  <string name="dialer_hint_find_contact">सम्पर्कहरू खोज्नुहोस्</string>
+  <string name="block_number_search_hint">नम्बर थप्नुहोस् वा सम्पर्कहरू खोज्नुहोस्</string>
+  <string name="call_log_all_empty">तपाईँको कल इतिहास खाली छ</string>
+  <string name="call_log_all_empty_action">कल गर्नुहोस्</string>
+  <string name="call_log_missed_empty">तपाईँसँग कुनै पनि छुटेका कलहरू छैनन्।</string>
+  <string name="call_log_voicemail_empty">तपाईँको भ्वाइस मेल खाली छ।</string>
+  <string name="call_log_activity_title">कल इतिहास</string>
+  <string name="call_log_all_title">सबै</string>
+  <string name="call_log_missed_title">छुटेको</string>
+  <string name="tab_speed_dial">द्रूत डायल</string>
+  <string name="tab_history">कल इतिहास</string>
+  <string name="tab_all_contacts">सम्पर्कहरू</string>
+  <string name="tab_voicemail">भ्वाइसमेल</string>
+  <string name="search_shortcut_call_number">%s कल गर्नुहोस्</string>
+  <string name="search_shortcut_create_new_contact">नयाँ सम्पर्क सिर्जना गर्नुहोस्</string>
+  <string name="search_shortcut_add_to_contact">सम्पर्कमा थप्नुहोस्</string>
+  <string name="search_shortcut_send_sms_message">SMS पठाउनुहोस्</string>
+  <string name="search_shortcut_make_video_call">भिडियो कल बनाउनुहोस्</string>
+  <string name="search_shortcut_block_number">नम्बरलाई निषेध गर्नुहोस्</string>
+  <string name="speed_dial_empty">तपाईँको स्पिड डायलमा अझसम्म कोही छैन</string>
+  <string name="speed_dial_empty_add_favorite_action">एक मन पर्ने थप्नुहोस्</string>
+  <string name="remove_contact">हटाउँनुहोस्</string>
+  <string name="select_all">सबैलाई चयन गर्नुहोस्</string>
+  <string name="call_log_action_video_call">भिडियो कल</string>
+  <string name="call_log_action_set_up_video">भिडियो कलिङ सेटअप गर्नुहोस्</string>
+  <string name="call_log_action_invite_video">भिडियो कलमा आमन्त्रित गर्नु…</string>
+  <string name="call_log_action_send_message">सन्देश पठाउनुहोस्</string>
+  <string name="call_log_action_details">कल विवरणहरु</string>
+  <string name="call_log_action_share_voicemail">…मा पठाउनुहोस्</string>
+  <string name="call_log_action_call">^1 कल गर्नुहोस्</string>
+  <string name="description_incoming_missed_call">^1, ^2, ^3, ^4 बाट मिस्ड कल।</string>
+  <string name="description_incoming_answered_call">^1, ^2, ^3, ^4 बाट कलको जवाफ दिइयो।</string>
+  <string name="description_unread_voicemail">^1, ^2, ^3, ^4 बाट पढ्न बाँकी भ्वाइस मेल।</string>
+  <string name="description_read_voicemail">^1, ^2, ^3, ^4 बाट भ्वाइस मेल।</string>
+  <string name="description_outgoing_call">^1, ^2, ^3, ^4 लाई कल गर्नुहोस्।</string>
+  <string name="call_log_via_number">%1$s मार्फत</string>
+  <string name="call_log_via_number_phone_account">%2$s मार्फत %1$s</string>
+  <string name="description_call_action">^1 कल गर्नुहोस्</string>
+  <string name="description_video_call_action">^1 भिडियो कल गर्नुहोस्।</string>
+  <string name="description_voicemail_action">^1 बाट भ्वाइसमेल सुन्नुहोस्</string>
+  <string name="description_create_new_contact_action">^1 का लागि नयाँ सम्पर्क बनाउँनुहोस्</string>
+  <string name="description_add_to_existing_contact_action">विद्यमान सम्पर्कमा ^1 थप्नुहोस्</string>
+  <string name="description_details_action">^1 का लागि कल विवरणहरू</string>
+  <string name="call_log_header_today">आज</string>
+  <string name="call_log_header_yesterday">हिजो</string>
+  <string name="call_log_header_other">अझ पुरानो</string>
+  <string name="voicemail_speaker_on">स्पिकर खोल्नुहोस्।</string>
+  <string name="voicemail_speaker_off">स्पिकर बन्द गर्नुहोस्।</string>
+  <string name="voicemail_play_start_pause">दोहर्याउने सुरु गर्नुहोस् वा रोक्नुहोस्।</string>
+  <string name="display_options_title">विकल्पहरू प्रदर्शन गर्नुहोस्</string>
+  <string name="sounds_and_vibration_title">ध्वनि र कम्पन</string>
+  <string name="accessibility_settings_title">पहुँचता</string>
+  <string name="ringtone_title">फोन रिङटोन</string>
+  <string name="vibrate_on_ring_title">कलका लागि कम्पन पनि गर्नुहोस्</string>
+  <string name="dtmf_tone_enable_title">किप्याडका टोनहरू</string>
+  <string name="dtmf_tone_length_title">किप्याडको टोनको लम्बाइ</string>
   <string-array name="dtmf_tone_length_entries">
-    <item msgid="3136353015227162823">"सामान्य"</item>
-    <item msgid="5376841175538523822">"लामो"</item>
+    <item>सामान्य</item>
+    <item>लामो</item>
   </string-array>
-    <string name="respond_via_sms_setting_title" msgid="8008181606657693452">"द्रुत प्रतिक्रियाहरू"</string>
-    <string name="call_settings_label" msgid="7824611757200960807">"कलहरू"</string>
-    <string name="manage_blocked_numbers_label" msgid="16823761991832273">"कल रोक्दै"</string>
-    <string name="voicemail_settings_label" msgid="4594299554519920570">"भ्वाइस मेल"</string>
-    <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"कल अवरुद्ध अस्थायी रुपमा निष्क्रिय"</string>
-    <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"कल अवरुद्ध अस्थायी रुपमा असक्षम गरिएको छ किनभने तपाईँले अन्तिम ४८ घन्टा भित्र यस फोनबाट आपत्कालीन सेवाहरू सम्पर्क गर्नुभयो। एकपटक ४८ घन्टा अवधि समाप्त भएपछि यो स्वचालित रूपले पुनः सक्रिय हुनेछ।"</string>
-    <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"नम्बरहरू आयात गर्नुहोस्"</string>
-    <string name="blocked_call_settings_import_description" msgid="1819412052545228965">"तपाईँले पहिल्यै केही कल गर्ने व्यक्तिहरूलाई अन्य अनुप्रयोगहरू मार्फत स्वत: रूपमा भ्वाइस मेल पठाउन नै चिन्ह लगाउनु भएको थियो।"</string>
-    <string name="blocked_call_settings_view_numbers_button" msgid="3332727948554356704">"नम्बरहरू हेर्नुहोस्"</string>
-    <string name="blocked_call_settings_import_button" msgid="7319111700387470727">"आयात गर्नुहोस्"</string>
-    <string name="description_blocked_number_list_delete" msgid="2139644216858370740">"नम्बरमाथिको रोक हटाउनुहोस्"</string>
-    <string name="addBlockedNumber" msgid="3053473735238295551">"नम्बर थप्नुहोस्"</string>
-    <string name="block_number_footer_message_vvm" msgid="7955326304033982368">"यी नम्बरहरूबाट सबै कलहरू रोकिनेछन् र भ्वाइसमेलहरू स्वचालित रूपमा मेटिनेछन्।"</string>
-    <string name="block_number_footer_message_no_vvm" msgid="1152684139070471665">"यो नम्बरहरूबाट सबै कलहरू रोकिनेछन्। तर तिनिहरूले अझै तपाईँलाई भ्वाइस मेलहरू भने छोड्न सक्नेछन्।"</string>
-    <string name="block_list" msgid="4701585783411870782">"रोकिएका नम्बरहरू"</string>
-    <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g> पहिले नै रोकिएको छ।"</string>
-    <string name="phone_account_settings_label" msgid="8372485478006965920">"खाता कलिङ"</string>
-    <string name="permission_no_speeddial" msgid="8487215628510596753">"तीव्र डायल सक्षम गर्न, सम्पर्क अनुमति सक्षम गर्नुहोस्।"</string>
-    <string name="permission_no_calllog" msgid="4053705651238775784">"आफ्नो कल लग हेर्न, फोन अनुमति सक्रिय गर्नुहोस्।"</string>
-    <string name="permission_no_search" msgid="2424710404207193826">"तपाईँको सम्पर्कहरू खोज गर्न सम्पर्क अनुमतिहरू सक्रिय गर्नुहोस्।"</string>
-    <string name="permission_place_call" msgid="8686908130349369423">"कल गर्न फोन अनुमति सक्रिय गर्नुहोस्।"</string>
-    <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"प्रणाली सेटिङहरूमा लेख्न फोन अनुप्रयोगसँग अनुमति छैन।"</string>
-    <string name="blocked_number_call_log_label" msgid="4212282846299997693">"अवरूद्ध गरियो"</string>
-    <string name="call_log_action_block_report_number" msgid="7302636538668696729">"स्प्यामलाई रोक्नुहोस्/रिपोर्ट गर्नुहोस्"</string>
-    <string name="call_log_action_block_number" msgid="5048188386501998865">"नम्बरलाई निषेध गर्नुहोस्"</string>
-    <string name="call_log_action_remove_spam" msgid="2045319806318398403">"स्प्याम होइन"</string>
-    <string name="call_log_action_unblock_number" msgid="6100117033288448758">"नम्बरमाथिको रोक हटाउनुहोस्"</string>
-    <string name="spam_number_call_log_label" msgid="2678431398326811131">"स्प्याम"</string>
-    <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> अफलाइन हुनुहुन्छ र वहाँलाई भेट्न सकिँदैन"</string>
-    <string name="about_phone_label" msgid="582991354677973731">"बारेमा"</string>
-    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Google द्वारा ट्रान्सक्राइब गरिएको"</string>
-    <string name="voicemail_transcription_in_progress" msgid="2933320969613783210">"Google ले ट्रान्सक्राइब गर्दैछ…"</string>
-    <string name="voicemail_transcription_failed" msgid="335275303117412706">"ट्रान्स्क्रिप्ट उपलब्ध छैन।"</string>
-    <string name="voicemail_transcription_failed_language_not_supported" msgid="4210332591050562553">"ट्रान्स्क्रिप्ट उपलब्ध छैन। भाषा समर्थित छैन।"</string>
-    <string name="voicemail_transcription_failed_no_speech" msgid="9093372879697874852">"ट्रान्स्क्रिप्ट उपलब्ध छैन। कुनै बोली पत्ता लागेन।"</string>
-    <string name="view_conversation" msgid="7895904782094119702">"हेर्नुहोस्"</string>
-    <string name="ec_data_deleted" msgid="4794880345545827107">"कल मेटाइयो। Messages मा गरिएको यो कलका क्रममा समावेश गरी आदान-प्रदान गरिएका कागजातलाई हेर्नुहोस् र मेटाउनुहोस्।"</string>
-    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"कलहरू मेटाइए। Messages मा गरिएका कलहरूमा समावेश गरी आदान-प्रदान गरिएका कागजातलाई हेर्नुहोस् र मेटाउनुहोस्।"</string>
+  <string name="respond_via_sms_setting_title">द्रुत प्रतिक्रियाहरू</string>
+  <string name="call_settings_label">कलहरू</string>
+  <string name="manage_blocked_numbers_label">रोक लगाइएका नम्बरहरू</string>
+  <string name="voicemail_settings_label">भ्वाइस मेल</string>
+  <string name="blocked_numbers_disabled_emergency_header_label">कल अवरुद्ध अस्थायी रुपमा निष्क्रिय</string>
+  <string name="blocked_numbers_disabled_emergency_desc">कल अवरुद्ध अस्थायी रुपमा असक्षम गरिएको छ किनभने तपाईँले अन्तिम ४८ घन्टा भित्र यस फोनबाट आपत्कालीन सेवाहरू सम्पर्क गर्नुभयो। एकपटक ४८ घन्टा अवधि समाप्त भएपछि यो स्वचालित रूपले पुनः सक्रिय हुनेछ।</string>
+  <string name="import_send_to_voicemail_numbers_label">नम्बरहरू आयात गर्नुहोस्</string>
+  <string name="blocked_call_settings_import_description">तपाईँले पहिल्यै केही कल गर्ने व्यक्तिहरूलाई अन्य अनुप्रयोगहरू मार्फत स्वत: रूपमा भ्वाइस मेल पठाउन नै चिन्ह लगाउनु भएको थियो।</string>
+  <string name="blocked_call_settings_view_numbers_button">नम्बरहरू हेर्नुहोस्</string>
+  <string name="blocked_call_settings_import_button">आयात गर्नुहोस्</string>
+  <string name="description_blocked_number_list_delete">नम्बरमाथिको रोक हटाउनुहोस्</string>
+  <string name="addBlockedNumber">नम्बर थप्नुहोस्</string>
+  <string name="block_number_footer_message_vvm">यी नम्बरहरूबाट सबै कलहरू रोकिनेछन् र भ्वाइसमेलहरू स्वचालित रूपमा मेटिनेछन्।</string>
+  <string name="block_number_footer_message_no_vvm">यो नम्बरहरूबाट सबै कलहरू रोकिनेछन्। तर तिनिहरूले अझै तपाईँलाई भ्वाइस मेलहरू भने छोड्न सक्नेछन्।</string>
+  <string name="block_list">रोकिएका नम्बरहरू</string>
+  <string name="alreadyBlocked">%1$s पहिले नै रोकिएको छ।</string>
+  <string name="phone_account_settings_label">खाता कलिङ</string>
+  <string name="permission_no_speeddial">तीव्र डायल सक्षम गर्न, सम्पर्क अनुमति सक्षम गर्नुहोस्।</string>
+  <string name="permission_no_calllog">आफ्नो कल लग हेर्न, फोन अनुमति सक्रिय गर्नुहोस्।</string>
+  <string name="permission_no_search">तपाईँको सम्पर्कहरू खोज गर्न सम्पर्क अनुमतिहरू सक्रिय गर्नुहोस्।</string>
+  <string name="permission_place_call">कल गर्न फोन अनुमति सक्रिय गर्नुहोस्।</string>
+  <string name="toast_cannot_write_system_settings">प्रणाली सेटिङहरूमा लेख्न फोन अनुप्रयोगसँग अनुमति छैन।</string>
+  <string name="blocked_number_call_log_label">अवरूद्ध गरियो</string>
+  <string name="call_log_action_block_report_number">स्प्यामलाई रोक्नुहोस्/रिपोर्ट गर्नुहोस्</string>
+  <string name="call_log_action_block_number">नम्बरलाई निषेध गर्नुहोस्</string>
+  <string name="call_log_action_remove_spam">स्प्याम होइन</string>
+  <string name="call_log_action_unblock_number">नम्बरमाथिको रोक हटाउनुहोस्</string>
+  <string name="spam_number_call_log_label">स्प्याम</string>
+  <string name="call_composer_connection_failed">%1$s अफलाइन हुनुहुन्छ र वहाँलाई भेट्न सकिँदैन</string>
+  <string name="about_phone_label">बारेमा</string>
+  <string name="voicemail_transcription_branding_text">Google द्वारा ट्रान्सक्राइब गरिएको</string>
+  <string name="voicemail_transcription_in_progress">ट्रान्सक्राइब गर्दै…</string>
+  <string name="voicemail_transcription_failed">ट्रान्स्क्रिप्ट उपलब्ध छैन।</string>
+  <string name="voicemail_transcription_failed_language_not_supported">ट्रान्स्क्रिप्ट उपलब्ध छैन। भाषा समर्थित छैन।</string>
+  <string name="voicemail_transcription_failed_no_speech">ट्रान्स्क्रिप्ट उपलब्ध छैन। कुनै बोली पत्ता लागेन।</string>
+  <string name="voicemail_donation_promo_title">ट्रान्स्क्रिप्सनको सटीकता सुधार गर्न मद्दत गर्ने हो?</string>
+  <string name="voicemail_donation_promo_content">Google लाई यो र भविष्यका भ्वाइस मेलका ट्रान्स्क्रिप्टहरूसहितका सन्देशहरूलाई समीक्षा गर्न दिनुहोस्। ती सन्देशहरूलाई अज्ञात रूपमा भण्डारण गरिने छ। सेटिङहरू जुनसुकै बेला परिवर्तन गर्नुहोस्।%1$s</string>
+  <string name="voicemail_donation_promo_opt_in">हो, म सहमत छु</string>
+  <string name="voicemail_donation_promo_opt_out">पर्दैन, धन्यवाद</string>
+  <string name="voicemail_transcription_rating">ट्रान्सक्रिप्सनको गुणस्तर मूल्याङ्कन गर्नु…</string>
+  <string name="voicemail_transcription_rating_thanks">तपाईंको प्रतिक्रियाका लागि धन्यवाद</string>
+  <string name="description_rating_good">मन पऱ्यो</string>
+  <string name="description_rating_bad">मन परेन</string>
+  <string name="view_conversation">हेर्नुहोस्</string>
+  <string name="ec_data_deleted">कल मेटाइयो। Messages मा गरिएको यो कलका क्रममा समावेश गरी आदान प्रदान गरिएका कागजातलाई हेर्नुहोस् र मेटाउनुहोस्।</string>
+  <string name="multiple_ec_data_deleted">कलहरू मेटाइए। Messages मा गरिएका कलहरूमा समावेश गरी आदान प्रदान गरिएका कागजातलाई हेर्नुहोस् र मेटाउनुहोस्।</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-nl/strings.xml b/java/com/android/dialer/app/res/values-nl/strings.xml
index 58d10a8..6ed92e4 100644
--- a/java/com/android/dialer/app/res/values-nl/strings.xml
+++ b/java/com/android/dialer/app/res/values-nl/strings.xml
@@ -1,179 +1,171 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="applicationLabel" msgid="2202739481132958990">"Telefoon"</string>
-    <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"Toetsenblok van telefoon"</string>
-    <string name="callHistoryIconLabel" msgid="7493268743411968630">"Oproepgeschiedenis"</string>
-    <string name="action_copy_number_text" msgid="832682558551502319">"Nummer kopiëren"</string>
-    <string name="copy_transcript_text" msgid="937904189017310829">"Transcriptie kopiëren"</string>
-    <string name="action_edit_number_before_call" msgid="8017492815878473837">"Nummer bewerken vóór bellen"</string>
-    <string name="call_log_delete_all" msgid="7852970926906523784">"Oproepgeschiedenis wissen"</string>
-    <string name="call_log_trash_voicemail" msgid="6118493534178533972">"Voicemail verwijderen"</string>
-    <string name="snackbar_voicemail_deleted" msgid="7463166543725496307">"Voicemail verwijderd"</string>
-    <string name="snackbar_voicemail_deleted_undo" msgid="6959743982796409941">"ONGED. MKN"</string>
-    <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"Oproepgeschiedenis wissen?"</string>
-    <string name="clearCallLogConfirmation" msgid="6844949465815109166">"Hiermee worden alle oproepen uit je geschiedenis verwijderd"</string>
-    <string name="clearCallLogProgress_title" msgid="995004835687361977">"Oproepgeschiedenis wissen…"</string>
-    <string name="notification_missedCallTitle" msgid="8283366068539898486">"Gemiste oproep"</string>
-    <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"Gemiste zakelijke oproep"</string>
-    <string name="notification_missedCallsTitle" msgid="3697442015345089802">"Gemiste oproepen"</string>
-    <string name="notification_missedCallsMsg" msgid="8176217633929018706">"<xliff:g id="NUM_MISSED_CALLS">%d</xliff:g> gemiste oproepen"</string>
-    <string name="notification_missedCall_call_back" msgid="3875698110051973965">"Terugbellen"</string>
-    <string name="notification_missedCall_message" msgid="5086910028988305964">"Bericht"</string>
-    <string name="post_call_notification_message" msgid="5417476789860590611">"<xliff:g id="NAME">%1$s</xliff:g>: <xliff:g id="MESSAGE">%2$s</xliff:g>"</string>
-    <string name="notification_voicemail_text_format" msgid="1895667520930252897">"<xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g> bellen"</string>
-    <string name="notification_voicemail_no_vm_number" msgid="8942821987929495842">"Voicemailnummer onbekend"</string>
-    <plurals name="notification_voicemail_title" formatted="false" msgid="1551847434476438657">
-      <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> voicemails </item>
-      <item quantity="one">Voicemail</item>
-    </plurals>
-    <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
-    <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"Nieuwe voicemail van <xliff:g id="CALLER">%1$s</xliff:g>"</string>
-    <string name="voicemail_playback_error" msgid="4384373852257757295">"Kan voicemail niet afspelen"</string>
-    <string name="voicemail_fetching_content" msgid="572320120918636014">"Voicemail laden…"</string>
-    <string name="voicemail_fetching_timout" msgid="2128873915839949783">"Kan voicemail niet laden"</string>
-    <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_playback_speakerphone" msgid="4852027754869750227">"Luidsprekertelefoon in- of uitschakelen"</string>
-    <string name="description_playback_seek" msgid="1340910573254132520">"Afspeelpositie zoeken"</string>
-    <string name="action_menu_call_history_description" msgid="8829135306925008546">"Oproepgeschiedenis"</string>
-    <string name="action_menu_overflow_description" msgid="7648679686746517341">"Meer opties"</string>
-    <string name="action_menu_dialpad_button" msgid="1970631633457493180">"toetsenblok"</string>
-    <string name="dialer_settings_label" msgid="4980176284150290175">"Instellingen"</string>
-    <string name="simulator_submenu_label" msgid="186156287346615267">"Simulator"</string>
-    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Snelkoppeling voor nieuwe UI"</string>
-    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"Modus voor bulkacties openen"</string>
-    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"Modus voor bulkacties verlaten"</string>
-    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> geselecteerd"</string>
-    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"Selectie van <xliff:g id="NAMEORNUMBER">%1$s</xliff:g> opgeheven"</string>
-    <string name="description_contact_details" msgid="3341280873855253464">"Contactgegevens voor <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_spam_contact_details" msgid="5592578752881528368">"Contactgegevens voor vermoedelijke spambeller <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> telefoongesprekken."</string>
-    <string name="description_video_call" msgid="3738199365585751727">"Videogesprek."</string>
-    <string name="description_start_voice_search" msgid="8380022725973015261">"Gesproken zoekopdracht"</string>
-    <string name="voicemail" msgid="8899540969000957954">"Voicemail"</string>
-    <string name="description_cancel_multi_select" msgid="3930475950253360461">"Modus voor batchacties annuleren"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Verwijderen"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Annuleren"</string>
-    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> geselecteerd"</string>
-    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
-      <item quantity="other">"<b>"Deze voicemails verwijderen? "</b>"</item>
-      <item quantity="one">"<b>"Deze voicemail verwijderen? "</b>"</item>
-    </plurals>
-    <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
-    <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> om <xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
-    <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="voice_search_not_available" msgid="6546240433719732905">"Gesproken zoekopdracht niet beschikbaar"</string>
-    <string name="dialer_hint_find_contact" msgid="2023214799381149808">"Contacten zoeken"</string>
-    <string name="block_number_search_hint" msgid="5377706079015099416">"Voeg nummer toe of zoek contacten"</string>
-    <string name="call_log_all_empty" msgid="3955572868518162004">"Je oproepgeschiedenis is leeg"</string>
-    <string name="call_log_all_empty_action" msgid="852218280136243014">"Bellen"</string>
-    <string name="call_log_missed_empty" msgid="7094936030845062214">"Je hebt geen gemiste oproepen."</string>
-    <string name="call_log_voicemail_empty" msgid="273623903423275178">"Je voicemail-inbox is leeg."</string>
-    <string name="call_log_activity_title" msgid="1275242727244945527">"Oproepgeschiedenis"</string>
-    <string name="call_log_all_title" msgid="6042262422192020327">"Alle"</string>
-    <string name="call_log_missed_title" msgid="17254005889268015">"Gemist"</string>
-    <string name="tab_speed_dial" msgid="6616404752227561075">"Snelkeuze"</string>
-    <string name="tab_history" msgid="7420269368689503596">"Oproepgeschiedenis"</string>
-    <string name="tab_all_contacts" msgid="5531733977693943015">"Contacten"</string>
-    <string name="tab_voicemail" msgid="2458548090088316246">"Voicemail"</string>
-    <string name="search_shortcut_call_number" msgid="8847918845036880688">"<xliff:g id="NUMBER">%s</xliff:g> bellen"</string>
-    <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"Nieuw contact maken"</string>
-    <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"Toevoegen aan een contact"</string>
-    <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"Sms verzenden"</string>
-    <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"Videogesprek starten"</string>
-    <string name="search_shortcut_block_number" msgid="4587283230665805776">"Nummer blokkeren"</string>
-    <string name="speed_dial_empty" msgid="3346406399966039505">"Er staat nog niemand in je snelkeuzelijst"</string>
-    <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"Een favoriet toevoegen"</string>
-    <string name="remove_contact" msgid="2353580570488923668">"Verwijderen"</string>
-    <string name="select_all" msgid="408601760696146245">"Alles selecteren"</string>
-    <string name="call_log_action_video_call" msgid="7565549950343850819">"Videogesprek"</string>
-    <string name="call_log_action_send_message" msgid="6948727362660115554">"Een bericht verzenden"</string>
-    <string name="call_log_action_details" msgid="2091370737371449501">"Oproepdetails"</string>
-    <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"Verzenden naar…"</string>
-    <string name="call_log_action_call" msgid="682724094251540583">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> bellen"</string>
-    <string name="description_incoming_missed_call" msgid="8292535799379230029">"Oproep gemist van <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_incoming_answered_call" msgid="3920182963103160610">"Oproep beantwoord van <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_unread_voicemail" msgid="145170985013419170">"Ongelezen voicemail van <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_read_voicemail" msgid="5585559881573227732">"Voicemail van <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_outgoing_call" msgid="543952487882919924">"Oproep naar <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="call_log_via_number" msgid="1340307109806397650">"via <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> via <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="description_call_action" msgid="4042796498169106545">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> bellen"</string>
-    <string name="description_video_call_action" msgid="1237090968588659650">"Videogesprek <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
-    <string name="description_voicemail_action" msgid="3290143432403538524">"Voicemail beluisteren van <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_create_new_contact_action" msgid="1928282350281564130">"Contact maken voor <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> toevoegen aan bestaand contact"</string>
-    <string name="description_details_action" msgid="2061866409737706174">"Oproepgegevens voor <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="call_log_header_today" msgid="1576119097475845293">"Vandaag"</string>
-    <string name="call_log_header_yesterday" msgid="5616077776205329563">"Gisteren"</string>
-    <string name="call_log_header_other" msgid="4940676886254217644">"Ouder"</string>
-    <string name="voicemail_speaker_on" msgid="3151333608926996668">"Luidspreker inschakelen."</string>
-    <string name="voicemail_speaker_off" msgid="2530064206962034201">"Luidspreker uitschakelen."</string>
-    <string name="voicemail_play_start_pause" msgid="3874823480278334664">"Afspelen starten of onderbreken."</string>
-    <string name="display_options_title" msgid="3880091801055797975">"Weergaveopties"</string>
-    <string name="sounds_and_vibration_title" msgid="3075050000721181384">"Geluiden en trillingen"</string>
-    <string name="accessibility_settings_title" msgid="3329027650429831820">"Toegankelijkheid"</string>
-    <string name="ringtone_title" msgid="8377174189894648486">"Beltoon telefoon"</string>
-    <string name="vibrate_on_ring_title" msgid="631441314790960485">"Ook trillen voor oproepen"</string>
-    <string name="dtmf_tone_enable_title" msgid="3273762431523939277">"Toetsenbloktonen"</string>
-    <string name="dtmf_tone_length_title" msgid="534096029202438539">"Duur van toetsenbloktonen"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="applicationLabel">Telefoon</string>
+  <string name="launcherDialpadActivityLabel">Toetsenblok van telefoon</string>
+  <string name="callHistoryIconLabel">Oproepgeschiedenis</string>
+  <string name="action_copy_number_text">Nummer kopiëren</string>
+  <string name="copy_transcript_text">Transcriptie kopiëren</string>
+  <string name="action_edit_number_before_call">Nummer bewerken vóór bellen</string>
+  <string name="call_log_delete_all">Oproepgeschiedenis wissen</string>
+  <string name="call_log_trash_voicemail">Voicemail verwijderen</string>
+  <string name="snackbar_voicemail_deleted">Voicemail verwijderd</string>
+  <string name="clearCallLogConfirmation_title">Oproepgeschiedenis wissen?</string>
+  <string name="clearCallLogConfirmation">Hiermee worden alle oproepen uit je geschiedenis verwijderd</string>
+  <string name="clearCallLogProgress_title">Oproepgeschiedenis wissen…</string>
+  <string name="notification_missedCallTitle">Gemiste oproep</string>
+  <string name="notification_missedWorkCallTitle">Gemiste zakelijke oproep</string>
+  <string name="notification_missedCallsTitle">Gemiste oproepen</string>
+  <string name="notification_missedCallsMsg">%d gemiste oproepen</string>
+  <string name="notification_missedCall_call_back">Terugbellen</string>
+  <string name="notification_missedCall_message">Bericht</string>
+  <string name="post_call_notification_message">%1$s: %2$s</string>
+  <string name="notification_voicemail_text_format">%s bellen</string>
+  <string name="notification_voicemail_no_vm_number">Voicemailnummer onbekend</string>
+  <plurals name="notification_voicemail_title">
+    <item quantity="one">Voicemail</item>
+    <item quantity="other"> %1$d voicemails </item>
+  </plurals>
+  <string name="notification_voicemail_callers_list">%1$s, %2$s</string>
+  <string name="notification_new_voicemail_ticker">Nieuwe voicemail van %1$s</string>
+  <string name="voicemail_playback_error">Kan voicemail niet afspelen</string>
+  <string name="voicemail_fetching_content">Voicemail laden…</string>
+  <string name="voicemail_fetching_timout">Kan voicemail niet laden</string>
+  <string name="call_log_item_count_and_date">(%1$d) %2$s</string>
+  <string name="description_playback_speakerphone">Luidsprekertelefoon in- of uitschakelen</string>
+  <string name="description_playback_seek">Afspeelpositie zoeken</string>
+  <string name="action_menu_call_history_description">Oproepgeschiedenis</string>
+  <string msgid="2295659037509008453" name="action_menu_overflow_description">Meer opties</string>
+  <string name="action_menu_dialpad_button">toetsenblok</string>
+  <string name="dialer_settings_label">Instellingen</string>
+  <string name="simulator_submenu_label">Simulator</string>
+  <string name="new_ui_launcher_shortcut_label">Snelkoppeling voor nieuwe UI</string>
+  <string name="description_entering_bulk_action_mode">Modus voor bulkacties openen</string>
+  <string name="description_leaving_bulk_action_mode">Modus voor bulkacties verlaten</string>
+  <string name="description_selecting_bulk_action_mode">%1$s geselecteerd</string>
+  <string name="description_unselecting_bulk_action_mode">Selectie van %1$s opgeheven</string>
+  <string name="description_contact_details">Contactgegevens voor %1$s</string>
+  <string name="description_spam_contact_details">Contactgegevens voor vermoedelijke spambeller %1$s</string>
+  <string name="description_num_calls">%1$s telefoongesprekken.</string>
+  <string name="description_video_call">Videogesprek.</string>
+  <string name="description_start_voice_search">Gesproken zoekopdracht</string>
+  <string name="voicemail">Voicemail</string>
+  <string name="description_cancel_multi_select">Modus voor batchacties annuleren</string>
+  <string name="voicemailMultiSelectDeleteConfirm">Verwijderen</string>
+  <string name="voicemailMultiSelectDeleteCancel">Annuleren</string>
+  <string name="voicemailMultiSelectActionBarTitle">%1$s geselecteerd</string>
+  <plurals name="delete_voicemails_confirmation_dialog_title">
+    <item quantity="one"><b>Deze voicemail verwijderen? </b></item>
+    <item quantity="other"><b>Deze voicemails verwijderen? </b></item>
+  </plurals>
+  <string name="voicemailCallLogToday">@string/call_log_header_today</string>
+  <string name="voicemailCallLogDateTimeFormat">%1$s om %2$s</string>
+  <string name="voicemailDurationFormat">%1$02d:%2$02d</string>
+  <string name="voicemailCallLogDateTimeFormatWithDuration">%1$s • %2$s</string>
+  <string name="voice_search_not_available">Gesproken zoekopdracht niet beschikbaar</string>
+  <string name="dialer_hint_find_contact">Contacten zoeken</string>
+  <string name="block_number_search_hint">Voeg nummer toe of zoek contacten</string>
+  <string name="call_log_all_empty">Je oproepgeschiedenis is leeg</string>
+  <string name="call_log_all_empty_action">Bellen</string>
+  <string name="call_log_missed_empty">Je hebt geen gemiste oproepen.</string>
+  <string name="call_log_voicemail_empty">Je voicemail-inbox is leeg.</string>
+  <string name="call_log_activity_title">Oproepgeschiedenis</string>
+  <string name="call_log_all_title">Alle</string>
+  <string name="call_log_missed_title">Gemist</string>
+  <string name="tab_speed_dial">Snelkeuze</string>
+  <string name="tab_history">Oproepgeschiedenis</string>
+  <string name="tab_all_contacts">Contacten</string>
+  <string name="tab_voicemail">Voicemail</string>
+  <string name="search_shortcut_call_number">%s bellen</string>
+  <string name="search_shortcut_create_new_contact">Nieuw contact maken</string>
+  <string name="search_shortcut_add_to_contact">Toevoegen aan een contact</string>
+  <string name="search_shortcut_send_sms_message">Sms verzenden</string>
+  <string name="search_shortcut_make_video_call">Videogesprek starten</string>
+  <string name="search_shortcut_block_number">Nummer blokkeren</string>
+  <string name="speed_dial_empty">Er staat nog niemand in je snelkeuzelijst</string>
+  <string name="speed_dial_empty_add_favorite_action">Een favoriet toevoegen</string>
+  <string name="remove_contact">Verwijderen</string>
+  <string name="select_all">Alles selecteren</string>
+  <string name="call_log_action_video_call">Videogesprek</string>
+  <string name="call_log_action_set_up_video">Videogesprekken instellen</string>
+  <string name="call_log_action_invite_video">Uitnodigen voor videogesprek</string>
+  <string name="call_log_action_send_message">Een bericht verzenden</string>
+  <string name="call_log_action_details">Oproepdetails</string>
+  <string name="call_log_action_share_voicemail">Verzenden naar…</string>
+  <string name="call_log_action_call">^1 bellen</string>
+  <string name="description_incoming_missed_call">Oproep gemist van ^1, ^2, ^3, ^4.</string>
+  <string name="description_incoming_answered_call">Oproep beantwoord van ^1, ^2, ^3, ^4.</string>
+  <string name="description_unread_voicemail">Ongelezen voicemail van ^1, ^2, ^3, ^4.</string>
+  <string name="description_read_voicemail">Voicemail van ^1, ^2, ^3, ^4.</string>
+  <string name="description_outgoing_call">Oproep naar ^1, ^2, ^3, ^4.</string>
+  <string name="call_log_via_number">via %1$s</string>
+  <string name="call_log_via_number_phone_account">%1$s via %2$s</string>
+  <string name="description_call_action">^1 bellen</string>
+  <string name="description_video_call_action">Videogesprek ^1.</string>
+  <string name="description_voicemail_action">Voicemail beluisteren van ^1</string>
+  <string name="description_create_new_contact_action">Contact maken voor ^1</string>
+  <string name="description_add_to_existing_contact_action">^1 toevoegen aan bestaand contact</string>
+  <string name="description_details_action">Oproepgegevens voor ^1</string>
+  <string name="call_log_header_today">Vandaag</string>
+  <string name="call_log_header_yesterday">Gisteren</string>
+  <string name="call_log_header_other">Ouder</string>
+  <string name="voicemail_speaker_on">Luidspreker inschakelen.</string>
+  <string name="voicemail_speaker_off">Luidspreker uitschakelen.</string>
+  <string name="voicemail_play_start_pause">Afspelen starten of onderbreken.</string>
+  <string name="display_options_title">Weergaveopties</string>
+  <string name="sounds_and_vibration_title">Geluiden en trillingen</string>
+  <string name="accessibility_settings_title">Toegankelijkheid</string>
+  <string name="ringtone_title">Beltoon telefoon</string>
+  <string name="vibrate_on_ring_title">Ook trillen voor oproepen</string>
+  <string name="dtmf_tone_enable_title">Toetsenbloktonen</string>
+  <string name="dtmf_tone_length_title">Duur van toetsenbloktonen</string>
   <string-array name="dtmf_tone_length_entries">
-    <item msgid="3136353015227162823">"Normaal"</item>
-    <item msgid="5376841175538523822">"Lang"</item>
+    <item>Normaal</item>
+    <item>Lang</item>
   </string-array>
-    <string name="respond_via_sms_setting_title" msgid="8008181606657693452">"Snelle reacties"</string>
-    <string name="call_settings_label" msgid="7824611757200960807">"Oproepen"</string>
-    <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Oproepen blokkeren"</string>
-    <string name="voicemail_settings_label" msgid="4594299554519920570">"Voicemail"</string>
-    <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Oproepblokkering tijdelijk uitgeschakeld"</string>
-    <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Oproepblokkering is uitgeschakeld omdat je in de afgelopen 48 uur contact met de noodhulpdiensten hebt opgenomen via deze telefoon. De functie wordt automatisch weer ingeschakeld nadat de periode van 48 uur is verstreken."</string>
-    <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Nummers importeren"</string>
-    <string name="blocked_call_settings_import_description" msgid="1819412052545228965">"Je hebt via andere apps al aangegeven dat bepaalde bellers moeten worden doorgeschakeld naar de voicemail."</string>
-    <string name="blocked_call_settings_view_numbers_button" msgid="3332727948554356704">"Nummers bekijken"</string>
-    <string name="blocked_call_settings_import_button" msgid="7319111700387470727">"Importeren"</string>
-    <string name="description_blocked_number_list_delete" msgid="2139644216858370740">"Blokkeren van nummer opheffen"</string>
-    <string name="addBlockedNumber" msgid="3053473735238295551">"Nummer toevoegen"</string>
-    <string name="block_number_footer_message_vvm" msgid="7955326304033982368">"Oproepen van deze nummers worden geblokkeerd en voicemails worden automatisch verwijderd."</string>
-    <string name="block_number_footer_message_no_vvm" msgid="1152684139070471665">"Oproepen van deze nummers worden geblokkeerd, maar de bellers kunnen nog wel voicemail achterlaten."</string>
-    <string name="block_list" msgid="4701585783411870782">"Geblokkeerde nummers"</string>
-    <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g> is al geblokkeerd."</string>
-    <string name="phone_account_settings_label" msgid="8372485478006965920">"Oproepaccounts"</string>
-    <string name="permission_no_speeddial" msgid="8487215628510596753">"Als je de snelkeuzefunctie wilt inschakelen, schakel je de machtiging voor Contacten in."</string>
-    <string name="permission_no_calllog" msgid="4053705651238775784">"Als je je gesprekkenlijst wilt bekijken, schakel je de machtiging voor Telefoon in."</string>
-    <string name="permission_no_search" msgid="2424710404207193826">"Als je naar contacten wilt zoeken, schakel je de contacttoestemming in."</string>
-    <string name="permission_place_call" msgid="8686908130349369423">"Als je iemand wilt bellen, schakel je de machtiging voor Telefoon in."</string>
-    <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"Telefoon-app heeft geen toestemming om systeeminstellingen te schrijven."</string>
-    <string name="blocked_number_call_log_label" msgid="4212282846299997693">"Geblokkeerd"</string>
-    <string name="call_log_action_block_report_number" msgid="7302636538668696729">"Blokkeren/spam melden"</string>
-    <string name="call_log_action_block_number" msgid="5048188386501998865">"Nummer blokkeren"</string>
-    <string name="call_log_action_remove_spam" msgid="2045319806318398403">"Geen spam"</string>
-    <string name="call_log_action_unblock_number" msgid="6100117033288448758">"Blokkeren van nummer opheffen"</string>
-    <string name="spam_number_call_log_label" msgid="2678431398326811131">"Spam"</string>
-    <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> is offline en kan niet worden bereikt"</string>
-    <string name="about_phone_label" msgid="582991354677973731">"Over"</string>
-    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Getranscribeerd door Google"</string>
-    <string name="voicemail_transcription_in_progress" msgid="2933320969613783210">"Bezig met transcriberen…"</string>
-    <string name="voicemail_transcription_failed" msgid="335275303117412706">"Transcript niet beschikbaar."</string>
-    <string name="voicemail_transcription_failed_language_not_supported" msgid="4210332591050562553">"Transcript niet beschikbaar. Taal niet ondersteund."</string>
-    <string name="voicemail_transcription_failed_no_speech" msgid="9093372879697874852">"Transcript niet beschikbaar. Geen spraak gedetecteerd."</string>
-    <string name="view_conversation" msgid="7895904782094119702">"Weergeven"</string>
-    <string name="ec_data_deleted" msgid="4794880345545827107">"Gesprek verwijderd. Bijlagen die in dit gesprek zijn gedeeld, kun je bekijken en verwijderen via Berichten."</string>
-    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"Gesprekken verwijderd. Bijlagen die in deze gesprekken zijn gedeeld, kun je bekijken en verwijderen via Berichten."</string>
+  <string name="respond_via_sms_setting_title">Snelle reacties</string>
+  <string name="call_settings_label">Oproepen</string>
+  <string name="manage_blocked_numbers_label">Geblokkeerde nummers</string>
+  <string name="voicemail_settings_label">Voicemail</string>
+  <string name="blocked_numbers_disabled_emergency_header_label">Oproepblokkering tijdelijk uitgeschakeld</string>
+  <string name="blocked_numbers_disabled_emergency_desc">Oproepblokkering is uitgeschakeld omdat je in de afgelopen 48 uur contact met de noodhulpdiensten hebt opgenomen via deze telefoon. De functie wordt automatisch weer ingeschakeld nadat de periode van 48 uur is verstreken.</string>
+  <string name="import_send_to_voicemail_numbers_label">Nummers importeren</string>
+  <string name="blocked_call_settings_import_description">Je hebt via andere apps al aangegeven dat bepaalde bellers moeten worden doorgeschakeld naar de voicemail.</string>
+  <string name="blocked_call_settings_view_numbers_button">Nummers bekijken</string>
+  <string name="blocked_call_settings_import_button">Importeren</string>
+  <string name="description_blocked_number_list_delete">Blokkeren van nummer opheffen</string>
+  <string name="addBlockedNumber">Nummer toevoegen</string>
+  <string name="block_number_footer_message_vvm">Oproepen van deze nummers worden geblokkeerd en voicemails worden automatisch verwijderd.</string>
+  <string name="block_number_footer_message_no_vvm">Oproepen van deze nummers worden geblokkeerd, maar de bellers kunnen nog wel voicemail achterlaten.</string>
+  <string name="block_list">Geblokkeerde nummers</string>
+  <string name="alreadyBlocked">%1$s is al geblokkeerd.</string>
+  <string name="phone_account_settings_label">Oproepaccounts</string>
+  <string name="permission_no_speeddial">Als je de snelkeuzefunctie wilt inschakelen, schakel je de machtiging voor Contacten in.</string>
+  <string name="permission_no_calllog">Als je je gesprekkenlijst wilt bekijken, schakel je de machtiging voor Telefoon in.</string>
+  <string name="permission_no_search">Als je naar contacten wilt zoeken, schakel je de contacttoestemming in.</string>
+  <string name="permission_place_call">Als je iemand wilt bellen, schakel je de machtiging voor Telefoon in.</string>
+  <string name="toast_cannot_write_system_settings">Telefoon-app heeft geen toestemming om systeeminstellingen te schrijven.</string>
+  <string name="blocked_number_call_log_label">Geblokkeerd</string>
+  <string name="call_log_action_block_report_number">Blokkeren/spam melden</string>
+  <string name="call_log_action_block_number">Nummer blokkeren</string>
+  <string name="call_log_action_remove_spam">Geen spam</string>
+  <string name="call_log_action_unblock_number">Blokkeren van nummer opheffen</string>
+  <string name="spam_number_call_log_label">Spam</string>
+  <string name="call_composer_connection_failed">%1$s is offline en kan niet worden bereikt</string>
+  <string name="about_phone_label">Over</string>
+  <string name="voicemail_transcription_branding_text">Getranscribeerd door Google</string>
+  <string name="voicemail_transcription_in_progress">Transcript maken…</string>
+  <string name="voicemail_transcription_failed">Transcript niet beschikbaar.</string>
+  <string name="voicemail_transcription_failed_language_not_supported">Transcript niet beschikbaar. Taal niet ondersteund.</string>
+  <string name="voicemail_transcription_failed_no_speech">Transcript niet beschikbaar. Geen spraak gedetecteerd.</string>
+  <string name="voicemail_donation_promo_title">Wil je helpen de nauwkeurigheid van transcripties te verbeteren?</string>
+  <string name="voicemail_donation_promo_content">Laat Google deze en toekomstige voicemailberichten met transcripten controleren. Ze worden anoniem opgeslagen. Je kunt deze instellingen op elk gewenst moment wijzigen. %1$s</string>
+  <string name="voicemail_donation_promo_opt_in">Ja, is goed</string>
+  <string name="voicemail_donation_promo_opt_out">Nee</string>
+  <string name="voicemail_transcription_rating">Beoordeel transcriptkwaliteit</string>
+  <string name="voicemail_transcription_rating_thanks">Bedankt voor je feedback</string>
+  <string name="description_rating_good">Like</string>
+  <string name="description_rating_bad">Dislike</string>
+  <string name="view_conversation">Weergeven</string>
+  <string name="ec_data_deleted">Gesprek verwijderd. Bijlagen die in dit gesprek zijn gedeeld, kun je bekijken en verwijderen via Berichten.</string>
+  <string name="multiple_ec_data_deleted">Gesprekken verwijderd. Bijlagen die in deze gesprekken zijn gedeeld, kun je bekijken en verwijderen via Berichten.</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-no/strings.xml b/java/com/android/dialer/app/res/values-no/strings.xml
index d530f21..b51470b 100644
--- a/java/com/android/dialer/app/res/values-no/strings.xml
+++ b/java/com/android/dialer/app/res/values-no/strings.xml
@@ -1,179 +1,171 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="applicationLabel" msgid="2202739481132958990">"Telefon"</string>
-    <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"Telefontastatur"</string>
-    <string name="callHistoryIconLabel" msgid="7493268743411968630">"Anropslogg"</string>
-    <string name="action_copy_number_text" msgid="832682558551502319">"Kopiér nummeret"</string>
-    <string name="copy_transcript_text" msgid="937904189017310829">"Kopiér transkripsjonen"</string>
-    <string name="action_edit_number_before_call" msgid="8017492815878473837">"Endre nummeret før du ringer"</string>
-    <string name="call_log_delete_all" msgid="7852970926906523784">"Slett anropsloggen"</string>
-    <string name="call_log_trash_voicemail" msgid="6118493534178533972">"Slett talepost"</string>
-    <string name="snackbar_voicemail_deleted" msgid="7463166543725496307">"Taleposten er slettet"</string>
-    <string name="snackbar_voicemail_deleted_undo" msgid="6959743982796409941">"ANGRE"</string>
-    <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"Vil du slette anropsloggen?"</string>
-    <string name="clearCallLogConfirmation" msgid="6844949465815109166">"Dette sletter alle anrop fra loggen"</string>
-    <string name="clearCallLogProgress_title" msgid="995004835687361977">"Sletter anropsloggen …"</string>
-    <string name="notification_missedCallTitle" msgid="8283366068539898486">"Tapt anrop"</string>
-    <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"Tapt jobbanrop"</string>
-    <string name="notification_missedCallsTitle" msgid="3697442015345089802">"Tapte anrop"</string>
-    <string name="notification_missedCallsMsg" msgid="8176217633929018706">"<xliff:g id="NUM_MISSED_CALLS">%d</xliff:g> tapte anrop"</string>
-    <string name="notification_missedCall_call_back" msgid="3875698110051973965">"Ring tilbake"</string>
-    <string name="notification_missedCall_message" msgid="5086910028988305964">"Melding"</string>
-    <string name="post_call_notification_message" msgid="5417476789860590611">"<xliff:g id="NAME">%1$s</xliff:g>: <xliff:g id="MESSAGE">%2$s</xliff:g>"</string>
-    <string name="notification_voicemail_text_format" msgid="1895667520930252897">"Ring <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
-    <string name="notification_voicemail_no_vm_number" msgid="8942821987929495842">"Mangler nummer til talepostkasse"</string>
-    <plurals name="notification_voicemail_title" formatted="false" msgid="1551847434476438657">
-      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> talemeldinger </item>
-      <item quantity="one">talemelding</item>
-    </plurals>
-    <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
-    <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"Ny talemelding fra <xliff:g id="CALLER">%1$s</xliff:g>"</string>
-    <string name="voicemail_playback_error" msgid="4384373852257757295">"Kunne ikke spille av talepost"</string>
-    <string name="voicemail_fetching_content" msgid="572320120918636014">"Laster inn talepost …"</string>
-    <string name="voicemail_fetching_timout" msgid="2128873915839949783">"Kunne ikke laste inn taleposten"</string>
-    <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_playback_speakerphone" msgid="4852027754869750227">"Slå høyttaleren på eller av"</string>
-    <string name="description_playback_seek" msgid="1340910573254132520">"Søk etter avspillingsposisjon"</string>
-    <string name="action_menu_call_history_description" msgid="8829135306925008546">"Anropslogg"</string>
-    <string name="action_menu_overflow_description" msgid="7648679686746517341">"Flere alternativer"</string>
-    <string name="action_menu_dialpad_button" msgid="1970631633457493180">"Tastatur"</string>
-    <string name="dialer_settings_label" msgid="4980176284150290175">"Innstillinger"</string>
-    <string name="simulator_submenu_label" msgid="186156287346615267">"Simulator"</string>
-    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Nytt grensesnitt – lag snarvei"</string>
-    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"Starter massehandlingsmodus"</string>
-    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"Massehandlingsmodus er avsluttet"</string>
-    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"Du har valgt <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"Du har valgt bort <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_contact_details" msgid="3341280873855253464">"Kontaktinformasjon for <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_spam_contact_details" msgid="5592578752881528368">"Kontaktdetaljer for den potensielt useriøse oppringeren <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> samtaler."</string>
-    <string name="description_video_call" msgid="3738199365585751727">"Videoanrop."</string>
-    <string name="description_start_voice_search" msgid="8380022725973015261">"Start talesøk"</string>
-    <string name="voicemail" msgid="8899540969000957954">"Telefonsvarer"</string>
-    <string name="description_cancel_multi_select" msgid="3930475950253360461">"Avbryt massehandlinsmodus"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Slett"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Avbryt"</string>
-    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> er valgt"</string>
-    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
-      <item quantity="other">"<b>"Vil du slette disse talemeldingene? "</b>"</item>
-      <item quantity="one">"<b>"Vil du slette denne talemeldingen? "</b>"</item>
-    </plurals>
-    <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
-    <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> kl. <xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
-    <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="voice_search_not_available" msgid="6546240433719732905">"Talesøk er ikke tilgjengelig"</string>
-    <string name="dialer_hint_find_contact" msgid="2023214799381149808">"Søk i kontakter"</string>
-    <string name="block_number_search_hint" msgid="5377706079015099416">"Legg til nummer eller søk etter kontakter"</string>
-    <string name="call_log_all_empty" msgid="3955572868518162004">"Anropsloggen er tom"</string>
-    <string name="call_log_all_empty_action" msgid="852218280136243014">"Start en samtale"</string>
-    <string name="call_log_missed_empty" msgid="7094936030845062214">"Du har ingen tapte anrop."</string>
-    <string name="call_log_voicemail_empty" msgid="273623903423275178">"Talepostkassen din er tom."</string>
-    <string name="call_log_activity_title" msgid="1275242727244945527">"Anropslogg"</string>
-    <string name="call_log_all_title" msgid="6042262422192020327">"Alle"</string>
-    <string name="call_log_missed_title" msgid="17254005889268015">"Ubesvarte"</string>
-    <string name="tab_speed_dial" msgid="6616404752227561075">"Hurtigvalg"</string>
-    <string name="tab_history" msgid="7420269368689503596">"Anropslogg"</string>
-    <string name="tab_all_contacts" msgid="5531733977693943015">"Kontakter"</string>
-    <string name="tab_voicemail" msgid="2458548090088316246">"Talepostkasse"</string>
-    <string name="search_shortcut_call_number" msgid="8847918845036880688">"Ring <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"Opprett ny kontakt"</string>
-    <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"Legg til for en kontakt"</string>
-    <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"Send SMS"</string>
-    <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"Start en videosamtale"</string>
-    <string name="search_shortcut_block_number" msgid="4587283230665805776">"Blokkér nummeret"</string>
-    <string name="speed_dial_empty" msgid="3346406399966039505">"Du har ingen på hurtigoppringning ennå"</string>
-    <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"Legg til en favoritt"</string>
-    <string name="remove_contact" msgid="2353580570488923668">"Fjern"</string>
-    <string name="select_all" msgid="408601760696146245">"Velg alle"</string>
-    <string name="call_log_action_video_call" msgid="7565549950343850819">"Videoanrop"</string>
-    <string name="call_log_action_send_message" msgid="6948727362660115554">"Send en melding"</string>
-    <string name="call_log_action_details" msgid="2091370737371449501">"Samtaleinformasjon"</string>
-    <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"Send til …"</string>
-    <string name="call_log_action_call" msgid="682724094251540583">"Ring <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_incoming_missed_call" msgid="8292535799379230029">"Ubesvart anrop fra <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_incoming_answered_call" msgid="3920182963103160610">"Besvart anrop fra <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_unread_voicemail" msgid="145170985013419170">"Ulest talepost fra <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_read_voicemail" msgid="5585559881573227732">"Talepost fra <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_outgoing_call" msgid="543952487882919924">"Ring til <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="call_log_via_number" msgid="1340307109806397650">"via <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> via <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="description_call_action" msgid="4042796498169106545">"Ring <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_video_call_action" msgid="1237090968588659650">"Start videoanrop med <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
-    <string name="description_voicemail_action" msgid="3290143432403538524">"Lytt til talepostkasse fra <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_create_new_contact_action" msgid="1928282350281564130">"Opprett kontakt for <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"Legg <xliff:g id="NAMEORNUMBER">^1</xliff:g> til en eksisterende kontakt"</string>
-    <string name="description_details_action" msgid="2061866409737706174">"Samtaledetaljer for <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="call_log_header_today" msgid="1576119097475845293">"I dag"</string>
-    <string name="call_log_header_yesterday" msgid="5616077776205329563">"I går"</string>
-    <string name="call_log_header_other" msgid="4940676886254217644">"Eldre"</string>
-    <string name="voicemail_speaker_on" msgid="3151333608926996668">"Slå på høyttaleren."</string>
-    <string name="voicemail_speaker_off" msgid="2530064206962034201">"Slå av høyttaleren."</string>
-    <string name="voicemail_play_start_pause" msgid="3874823480278334664">"Start eller stopp avspillingen."</string>
-    <string name="display_options_title" msgid="3880091801055797975">"Visningsalternativer"</string>
-    <string name="sounds_and_vibration_title" msgid="3075050000721181384">"Lyder og vibrasjon"</string>
-    <string name="accessibility_settings_title" msgid="3329027650429831820">"Tilgjengelighet"</string>
-    <string name="ringtone_title" msgid="8377174189894648486">"Telefonringelyd"</string>
-    <string name="vibrate_on_ring_title" msgid="631441314790960485">"Vibrer også når det ringer"</string>
-    <string name="dtmf_tone_enable_title" msgid="3273762431523939277">"Tastaturlyder"</string>
-    <string name="dtmf_tone_length_title" msgid="534096029202438539">"Lengde på tastaturlyder"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="applicationLabel">Telefon</string>
+  <string name="launcherDialpadActivityLabel">Telefontastatur</string>
+  <string name="callHistoryIconLabel">Anropslogg</string>
+  <string name="action_copy_number_text">Kopiér nummeret</string>
+  <string name="copy_transcript_text">Kopiér transkripsjonen</string>
+  <string name="action_edit_number_before_call">Endre nummeret før du ringer</string>
+  <string name="call_log_delete_all">Slett anropsloggen</string>
+  <string name="call_log_trash_voicemail">Slett talepost</string>
+  <string name="snackbar_voicemail_deleted">Taleposten er slettet</string>
+  <string name="clearCallLogConfirmation_title">Vil du slette anropsloggen?</string>
+  <string name="clearCallLogConfirmation">Dette sletter alle anrop fra loggen</string>
+  <string name="clearCallLogProgress_title">Sletter anropsloggen …</string>
+  <string name="notification_missedCallTitle">Tapt anrop</string>
+  <string name="notification_missedWorkCallTitle">Tapt jobbanrop</string>
+  <string name="notification_missedCallsTitle">Tapte anrop</string>
+  <string name="notification_missedCallsMsg">%d tapte anrop</string>
+  <string name="notification_missedCall_call_back">Ring tilbake</string>
+  <string name="notification_missedCall_message">Melding</string>
+  <string name="post_call_notification_message">%1$s: %2$s</string>
+  <string name="notification_voicemail_text_format">Ring %s</string>
+  <string name="notification_voicemail_no_vm_number">Mangler nummer til talepostkasse</string>
+  <plurals name="notification_voicemail_title">
+    <item quantity="one">talemelding</item>
+    <item quantity="other">%1$d talemeldinger </item>
+  </plurals>
+  <string name="notification_voicemail_callers_list">%1$s, %2$s</string>
+  <string name="notification_new_voicemail_ticker">Ny talemelding fra %1$s</string>
+  <string name="voicemail_playback_error">Kunne ikke spille av talepost</string>
+  <string name="voicemail_fetching_content">Laster inn talepost …</string>
+  <string name="voicemail_fetching_timout">Kunne ikke laste inn taleposten</string>
+  <string name="call_log_item_count_and_date">(%1$d) %2$s</string>
+  <string name="description_playback_speakerphone">Slå høyttaleren på eller av</string>
+  <string name="description_playback_seek">Søk etter avspillingsposisjon</string>
+  <string name="action_menu_call_history_description">Anropslogg</string>
+  <string msgid="2295659037509008453" name="action_menu_overflow_description">Flere alternativer</string>
+  <string name="action_menu_dialpad_button">Tastatur</string>
+  <string name="dialer_settings_label">Innstillinger</string>
+  <string name="simulator_submenu_label">Simulator</string>
+  <string name="new_ui_launcher_shortcut_label">Nytt grensesnitt – lag snarvei</string>
+  <string name="description_entering_bulk_action_mode">Starter massehandlingsmodus</string>
+  <string name="description_leaving_bulk_action_mode">Massehandlingsmodus er avsluttet</string>
+  <string name="description_selecting_bulk_action_mode">Du har valgt %1$s</string>
+  <string name="description_unselecting_bulk_action_mode">Du har valgt bort %1$s</string>
+  <string name="description_contact_details">Kontaktinformasjon for %1$s</string>
+  <string name="description_spam_contact_details">Kontaktdetaljer for den potensielt useriøse oppringeren %1$s</string>
+  <string name="description_num_calls">%1$s samtaler.</string>
+  <string name="description_video_call">Videoanrop.</string>
+  <string name="description_start_voice_search">Start talesøk</string>
+  <string name="voicemail">Telefonsvarer</string>
+  <string name="description_cancel_multi_select">Avbryt massehandlinsmodus</string>
+  <string name="voicemailMultiSelectDeleteConfirm">Slett</string>
+  <string name="voicemailMultiSelectDeleteCancel">Avbryt</string>
+  <string name="voicemailMultiSelectActionBarTitle">%1$s er valgt</string>
+  <plurals name="delete_voicemails_confirmation_dialog_title">
+    <item quantity="one"><b>Vil du slette denne talemeldingen? </b></item>
+    <item quantity="other"><b>Vil du slette disse talemeldingene? </b></item>
+  </plurals>
+  <string name="voicemailCallLogToday">@string/call_log_header_today</string>
+  <string name="voicemailCallLogDateTimeFormat">%1$s kl. %2$s</string>
+  <string name="voicemailDurationFormat">%1$02d:%2$02d</string>
+  <string name="voicemailCallLogDateTimeFormatWithDuration">%1$s • %2$s</string>
+  <string name="voice_search_not_available">Talesøk er ikke tilgjengelig</string>
+  <string name="dialer_hint_find_contact">Søk i kontakter</string>
+  <string name="block_number_search_hint">Legg til nummer eller søk etter kontakter</string>
+  <string name="call_log_all_empty">Anropsloggen er tom</string>
+  <string name="call_log_all_empty_action">Start en samtale</string>
+  <string name="call_log_missed_empty">Du har ingen tapte anrop.</string>
+  <string name="call_log_voicemail_empty">Talepostkassen din er tom.</string>
+  <string name="call_log_activity_title">Anropslogg</string>
+  <string name="call_log_all_title">Alle</string>
+  <string name="call_log_missed_title">Ubesvarte</string>
+  <string name="tab_speed_dial">Hurtigvalg</string>
+  <string name="tab_history">Anropslogg</string>
+  <string name="tab_all_contacts">Kontakter</string>
+  <string name="tab_voicemail">Talepostkasse</string>
+  <string name="search_shortcut_call_number">Ring %s</string>
+  <string name="search_shortcut_create_new_contact">Opprett ny kontakt</string>
+  <string name="search_shortcut_add_to_contact">Legg til for en kontakt</string>
+  <string name="search_shortcut_send_sms_message">Send SMS</string>
+  <string name="search_shortcut_make_video_call">Start en videosamtale</string>
+  <string name="search_shortcut_block_number">Blokkér nummeret</string>
+  <string name="speed_dial_empty">Du har ingen på hurtigoppringning ennå</string>
+  <string name="speed_dial_empty_add_favorite_action">Legg til en favoritt</string>
+  <string name="remove_contact">Fjern</string>
+  <string name="select_all">Velg alle</string>
+  <string name="call_log_action_video_call">Videoanrop</string>
+  <string name="call_log_action_set_up_video">Konfigurer videoanrop</string>
+  <string name="call_log_action_invite_video">Inviter til videosamtale</string>
+  <string name="call_log_action_send_message">Send en melding</string>
+  <string name="call_log_action_details">Samtaleinformasjon</string>
+  <string name="call_log_action_share_voicemail">Send til …</string>
+  <string name="call_log_action_call">Ring ^1</string>
+  <string name="description_incoming_missed_call">Ubesvart anrop fra ^1, ^2, ^3, ^4.</string>
+  <string name="description_incoming_answered_call">Besvart anrop fra ^1, ^2, ^3, ^4.</string>
+  <string name="description_unread_voicemail">Ulest talepost fra ^1, ^2, ^3, ^4.</string>
+  <string name="description_read_voicemail">Talepost fra ^1, ^2, ^3, ^4.</string>
+  <string name="description_outgoing_call">Ring til ^1, ^2, ^3, ^4.</string>
+  <string name="call_log_via_number">via %1$s</string>
+  <string name="call_log_via_number_phone_account">%1$s via %2$s</string>
+  <string name="description_call_action">Ring ^1</string>
+  <string name="description_video_call_action">Start videoanrop med ^1.</string>
+  <string name="description_voicemail_action">Lytt til talepostkasse fra ^1</string>
+  <string name="description_create_new_contact_action">Opprett kontakt for ^1</string>
+  <string name="description_add_to_existing_contact_action">Legg ^1 til en eksisterende kontakt</string>
+  <string name="description_details_action">Samtaledetaljer for ^1</string>
+  <string name="call_log_header_today">I dag</string>
+  <string name="call_log_header_yesterday">I går</string>
+  <string name="call_log_header_other">Eldre</string>
+  <string name="voicemail_speaker_on">Slå på høyttaleren.</string>
+  <string name="voicemail_speaker_off">Slå av høyttaleren.</string>
+  <string name="voicemail_play_start_pause">Start eller stopp avspillingen.</string>
+  <string name="display_options_title">Visningsalternativer</string>
+  <string name="sounds_and_vibration_title">Lyder og vibrasjon</string>
+  <string name="accessibility_settings_title">Tilgjengelighet</string>
+  <string name="ringtone_title">Telefonringelyd</string>
+  <string name="vibrate_on_ring_title">Vibrer også når det ringer</string>
+  <string name="dtmf_tone_enable_title">Tastaturlyder</string>
+  <string name="dtmf_tone_length_title">Lengde på tastaturlyder</string>
   <string-array name="dtmf_tone_length_entries">
-    <item msgid="3136353015227162823">"Normal"</item>
-    <item msgid="5376841175538523822">"Lang"</item>
+    <item>Normal</item>
+    <item>Lang</item>
   </string-array>
-    <string name="respond_via_sms_setting_title" msgid="8008181606657693452">"Hurtigsvar"</string>
-    <string name="call_settings_label" msgid="7824611757200960807">"Anrop"</string>
-    <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Anropsblokkering"</string>
-    <string name="voicemail_settings_label" msgid="4594299554519920570">"Talepost"</string>
-    <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Blokkering av anrop er midlertidig slått av"</string>
-    <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Blokkering av anrop er slått av fordi du kontaktet nødtjenester fra denne telefonen i løpet av de siste 48 timene. Funksjonen blir automatisk slått på igjen når perioden på 48 timer er utløpt."</string>
-    <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Importér numre"</string>
-    <string name="blocked_call_settings_import_description" msgid="1819412052545228965">"Du markerte tidligere noen anropere for automatisk overføring til talepost via andre apper."</string>
-    <string name="blocked_call_settings_view_numbers_button" msgid="3332727948554356704">"Se numre"</string>
-    <string name="blocked_call_settings_import_button" msgid="7319111700387470727">"Importér"</string>
-    <string name="description_blocked_number_list_delete" msgid="2139644216858370740">"Opphev blokkeringen av nummeret"</string>
-    <string name="addBlockedNumber" msgid="3053473735238295551">"Legg til nummer"</string>
-    <string name="block_number_footer_message_vvm" msgid="7955326304033982368">"Anrop fra disse numrene blokkeres, og talepost blir automatisk slettet."</string>
-    <string name="block_number_footer_message_no_vvm" msgid="1152684139070471665">"Anrop fra dette nummeret blokkeres, men du kan fortsatt motta talepost."</string>
-    <string name="block_list" msgid="4701585783411870782">"Blokkerte numre"</string>
-    <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g> er allerede blokkert."</string>
-    <string name="phone_account_settings_label" msgid="8372485478006965920">"Ringekontoer"</string>
-    <string name="permission_no_speeddial" msgid="8487215628510596753">"For å slå på hurtigoppringning, slå på Kontakter-tillatelsen."</string>
-    <string name="permission_no_calllog" msgid="4053705651238775784">"For å se samtaleloggen din, slå på Telefon-tillatelsen."</string>
-    <string name="permission_no_search" msgid="2424710404207193826">"For å søke i kontaktene dine, slå på tillatelser for Kontakter."</string>
-    <string name="permission_place_call" msgid="8686908130349369423">"For å ringe, slå på Telefon-tillatelsen."</string>
-    <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"Telefonappen har ikke tillatelse til å skrive til systeminnstillinger."</string>
-    <string name="blocked_number_call_log_label" msgid="4212282846299997693">"Blokkert"</string>
-    <string name="call_log_action_block_report_number" msgid="7302636538668696729">"Blokkér/rapportér som useriøs"</string>
-    <string name="call_log_action_block_number" msgid="5048188386501998865">"Blokkér nummeret"</string>
-    <string name="call_log_action_remove_spam" msgid="2045319806318398403">"Ikke useriøs"</string>
-    <string name="call_log_action_unblock_number" msgid="6100117033288448758">"Opphev blokkeringen av nummeret"</string>
-    <string name="spam_number_call_log_label" msgid="2678431398326811131">"Nettsøppel"</string>
-    <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> er frakoblet og kan ikke nås"</string>
-    <string name="about_phone_label" msgid="582991354677973731">"Om"</string>
-    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Transkribert av Google"</string>
-    <string name="voicemail_transcription_in_progress" msgid="2933320969613783210">"Google transkriberer …"</string>
-    <string name="voicemail_transcription_failed" msgid="335275303117412706">"Ingen transkripsjon."</string>
-    <string name="voicemail_transcription_failed_language_not_supported" msgid="4210332591050562553">"Ingen transkripsjon. Språket støttes ikke."</string>
-    <string name="voicemail_transcription_failed_no_speech" msgid="9093372879697874852">"Ingen transkripsjon. Ingen tale ble registrert."</string>
-    <string name="view_conversation" msgid="7895904782094119702">"Se"</string>
-    <string name="ec_data_deleted" msgid="4794880345545827107">"Anropet er slettet. Se og slett vedleggene som ble delt i denne samtalen, i Meldinger."</string>
-    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"Anropene er slettet. Se og slett vedleggene som ble delt i samtalene, i Meldinger."</string>
+  <string name="respond_via_sms_setting_title">Hurtigsvar</string>
+  <string name="call_settings_label">Anrop</string>
+  <string name="manage_blocked_numbers_label">Blokkerte numre</string>
+  <string name="voicemail_settings_label">Talepost</string>
+  <string name="blocked_numbers_disabled_emergency_header_label">Blokkering av anrop er midlertidig slått av</string>
+  <string name="blocked_numbers_disabled_emergency_desc">Blokkering av anrop er slått av fordi du kontaktet nødtjenester fra denne telefonen i løpet av de siste 48 timene. Funksjonen blir automatisk slått på igjen når perioden på 48 timer er utløpt.</string>
+  <string name="import_send_to_voicemail_numbers_label">Importér numre</string>
+  <string name="blocked_call_settings_import_description">Du markerte tidligere noen anropere for automatisk overføring til talepost via andre apper.</string>
+  <string name="blocked_call_settings_view_numbers_button">Se numre</string>
+  <string name="blocked_call_settings_import_button">Importér</string>
+  <string name="description_blocked_number_list_delete">Opphev blokkeringen av nummeret</string>
+  <string name="addBlockedNumber">Legg til nummer</string>
+  <string name="block_number_footer_message_vvm">Anrop fra disse numrene blokkeres, og talepost blir automatisk slettet.</string>
+  <string name="block_number_footer_message_no_vvm">Anrop fra dette nummeret blokkeres, men du kan fortsatt motta talepost.</string>
+  <string name="block_list">Blokkerte numre</string>
+  <string name="alreadyBlocked">%1$s er allerede blokkert.</string>
+  <string name="phone_account_settings_label">Ringekontoer</string>
+  <string name="permission_no_speeddial">For å slå på hurtigoppringning, slå på Kontakter-tillatelsen.</string>
+  <string name="permission_no_calllog">For å se samtaleloggen din, slå på Telefon-tillatelsen.</string>
+  <string name="permission_no_search">For å søke i kontaktene dine, slå på tillatelser for Kontakter.</string>
+  <string name="permission_place_call">For å ringe, slå på Telefon-tillatelsen.</string>
+  <string name="toast_cannot_write_system_settings">Telefonappen har ikke tillatelse til å skrive til systeminnstillinger.</string>
+  <string name="blocked_number_call_log_label">Blokkert</string>
+  <string name="call_log_action_block_report_number">Blokkér/rapportér som useriøs</string>
+  <string name="call_log_action_block_number">Blokkér nummeret</string>
+  <string name="call_log_action_remove_spam">Ikke useriøs</string>
+  <string name="call_log_action_unblock_number">Opphev blokkeringen av nummeret</string>
+  <string name="spam_number_call_log_label">Nettsøppel</string>
+  <string name="call_composer_connection_failed">%1$s er frakoblet og kan ikke nås</string>
+  <string name="about_phone_label">Om</string>
+  <string name="voicemail_transcription_branding_text">Transkribert av Google</string>
+  <string name="voicemail_transcription_in_progress">Transkriberer …</string>
+  <string name="voicemail_transcription_failed">Ingen transkripsjon.</string>
+  <string name="voicemail_transcription_failed_language_not_supported">Ingen transkripsjon. Språket støttes ikke.</string>
+  <string name="voicemail_transcription_failed_no_speech">Ingen transkripsjon. Ingen tale ble registrert.</string>
+  <string name="voicemail_donation_promo_title">Vil du hjelpe oss med å gjøre transkripsjoner mer nøyaktige?</string>
+  <string name="voicemail_donation_promo_content">La Google gå gjennom denne og fremtidige talemeldinger med transkripsjoner. De blir lagret anonymt. Du kan endre innstillingene når som helst. %1$s</string>
+  <string name="voicemail_donation_promo_opt_in">Ja, jeg er med</string>
+  <string name="voicemail_donation_promo_opt_out">Nei takk</string>
+  <string name="voicemail_transcription_rating">Vurder transkripsjonskvalitet</string>
+  <string name="voicemail_transcription_rating_thanks">Takk for tilbakemeldingen</string>
+  <string name="description_rating_good">Liker</string>
+  <string name="description_rating_bad">Liker ikke</string>
+  <string name="view_conversation">Se</string>
+  <string name="ec_data_deleted">Anropet er slettet. Se og slett vedleggene som ble delt i denne samtalen, i Meldinger.</string>
+  <string name="multiple_ec_data_deleted">Anropene er slettet. Se og slett vedleggene som ble delt i samtalene, i Meldinger.</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-pa/strings.xml b/java/com/android/dialer/app/res/values-pa/strings.xml
index cbc249a..d8e09a0 100644
--- a/java/com/android/dialer/app/res/values-pa/strings.xml
+++ b/java/com/android/dialer/app/res/values-pa/strings.xml
@@ -1,179 +1,171 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="applicationLabel" msgid="2202739481132958990">"ਫ਼ੋਨ"</string>
-    <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"ਫ਼ੋਨ ਕੀਪੈਡ"</string>
-    <string name="callHistoryIconLabel" msgid="7493268743411968630">"ਕਾਲ ਇਤਿਹਾਸ"</string>
-    <string name="action_copy_number_text" msgid="832682558551502319">"ਨੰਬਰ ਕਾਪੀ ਕਰੋ"</string>
-    <string name="copy_transcript_text" msgid="937904189017310829">"ਲਿਪੀ ਬਦਲਣਾ ਕਾਪੀ ਕਰੋ"</string>
-    <string name="action_edit_number_before_call" msgid="8017492815878473837">"ਕਾਲ ਤੋਂ ਪਹਿਲਾਂ ਨੰਬਰ ਸੰਪਾਦਿਤ ਕਰੋ"</string>
-    <string name="call_log_delete_all" msgid="7852970926906523784">"ਕਾਲ ਇਤਿਹਾਸ ਹਟਾਓ"</string>
-    <string name="call_log_trash_voicemail" msgid="6118493534178533972">"ਵੌਇਸਮੇਲ ਮਿਟਾਓ"</string>
-    <string name="snackbar_voicemail_deleted" msgid="7463166543725496307">"ਵੌਇਸਮੇਲ ਮਿਟਾਈ ਗਈ"</string>
-    <string name="snackbar_voicemail_deleted_undo" msgid="6959743982796409941">"ਪਹਿਲਾਂ ਵਰਗਾ ਕਰੋ"</string>
-    <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"ਕੀ ਕਾਲ ਇਤਿਹਾਸ ਹਟਾਉਣਾ ਹੈ?"</string>
-    <string name="clearCallLogConfirmation" msgid="6844949465815109166">"ਇਹ ਤੁਹਾਡੇ ਇਤਿਹਾਸ ਤੋਂ ਸਾਰੀਆਂ ਕਾਲਾਂ ਮਿਟਾ ਦੇਵੇਗਾ"</string>
-    <string name="clearCallLogProgress_title" msgid="995004835687361977">"ਕਾਲ ਇਤਿਹਾਸ ਹਟਾ ਰਿਹਾ ਹੈ…"</string>
-    <string name="notification_missedCallTitle" msgid="8283366068539898486">"ਮਿਸਡ ਕਾਲ"</string>
-    <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"ਕੰਮ ਨਾਲ ਸਬੰਧਿਤ ਖੁੰਝੀ ਕਾਲ"</string>
-    <string name="notification_missedCallsTitle" msgid="3697442015345089802">"ਮਿਸ ਹੋਈਆਂ ਕਾਲਾਂ"</string>
-    <string name="notification_missedCallsMsg" msgid="8176217633929018706">"<xliff:g id="NUM_MISSED_CALLS">%d</xliff:g> ਮਿਸ ਹੋਈਆਂ ਕਾਲਾਂ"</string>
-    <string name="notification_missedCall_call_back" msgid="3875698110051973965">"ਕਾਲ ਬੈਕ ਕਰੋ"</string>
-    <string name="notification_missedCall_message" msgid="5086910028988305964">"ਸੁਨੇਹਾ"</string>
-    <string name="post_call_notification_message" msgid="5417476789860590611">"<xliff:g id="NAME">%1$s</xliff:g>: <xliff:g id="MESSAGE">%2$s</xliff:g>"</string>
-    <string name="notification_voicemail_text_format" msgid="1895667520930252897">"<xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g> ਡਾਇਲ ਕਰੋ"</string>
-    <string name="notification_voicemail_no_vm_number" msgid="8942821987929495842">"ਵੌਇਸਮੇਲ ਨੰਬਰ ਅਗਿਆਤ"</string>
-    <plurals name="notification_voicemail_title" formatted="false" msgid="1551847434476438657">
-      <item quantity="one"> <xliff:g id="COUNT">%1$d</xliff:g> ਵੌਇਸਮੇਲਾਂ </item>
-      <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> ਵੌਇਸਮੇਲਾਂ </item>
-    </plurals>
-    <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
-    <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"<xliff:g id="CALLER">%1$s</xliff:g> ਦੀ ਨਵੀਂ ਵੌਇਸਮੇਲ"</string>
-    <string name="voicemail_playback_error" msgid="4384373852257757295">"ਵੌਇਸਮੇਲ ਪਲੇ ਨਹੀਂ ਕਰ ਸਕਿਆ"</string>
-    <string name="voicemail_fetching_content" msgid="572320120918636014">"ਵੌਇਸਮੇਲ ਲੋਡ ਕਰ ਰਿਹਾ ਹੈ…"</string>
-    <string name="voicemail_fetching_timout" msgid="2128873915839949783">"ਵੌਇਸਮੇਲ ਲੋਡ ਨਹੀਂ ਕਰ ਸਕਿਆ"</string>
-    <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_playback_speakerphone" msgid="4852027754869750227">"ਸਪੀਕਰਫੋਨ ਨੂੰ ਚਾਲੂ ਜਾਂ ਬੰਦ ਕਰੋ"</string>
-    <string name="description_playback_seek" msgid="1340910573254132520">"ਪਲੇਬੈਕ ਪੋਜੀਸ਼ਨ ਖੋਜੋ"</string>
-    <string name="action_menu_call_history_description" msgid="8829135306925008546">"ਕਾਲ ਇਤਿਹਾਸ"</string>
-    <string name="action_menu_overflow_description" msgid="7648679686746517341">"ਹੋਰ ਚੋਣਾਂ"</string>
-    <string name="action_menu_dialpad_button" msgid="1970631633457493180">"ਕੀ-ਪੈਡ"</string>
-    <string name="dialer_settings_label" msgid="4980176284150290175">"ਸੈਟਿੰਗਾਂ"</string>
-    <string name="simulator_submenu_label" msgid="186156287346615267">"ਸਿਮੁਲੇਟਰ"</string>
-    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"ਨਵਾਂ UI ਸ਼ਾਰਟਕੱਟ ਬਣਾਓ"</string>
-    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"ਬਲਕ ਕਾਰਵਾਈ ਮੋਡ ਵਿੱਚ ਦਾਖਲ ਹੋਇਆ ਜਾ ਰਿਹਾ ਹੈ"</string>
-    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"ਬਲਕ ਕਾਰਵਾਈ ਮੋਡ ਨੂੰ ਛੱਡਿਆ"</string>
-    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> ਨੂੰ ਚੁਣਿਆ ਗਿਆ"</string>
-    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> ਨੂੰ ਅਣ-ਚੁਣਿਆ ਕੀਤਾ ਗਿਆ"</string>
-    <string name="description_contact_details" msgid="3341280873855253464">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> ਲਈ ਸੰਪਰਕ ਵੇਰਵੇ"</string>
-    <string name="description_spam_contact_details" msgid="5592578752881528368">"ਸ਼ੱਕੀ ਸਪੈਮ ਕਾਲਰ <xliff:g id="NAMEORNUMBER">%1$s</xliff:g> ਲਈ ਸੰਪਰਕ ਵੇਰਵੇ"</string>
-    <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> ਕਾਲਾਂ।"</string>
-    <string name="description_video_call" msgid="3738199365585751727">"ਵੀਡੀਓ ਕਾਲ।"</string>
-    <string name="description_start_voice_search" msgid="8380022725973015261">"ਵੌਇਸ ਖੋਜ ਚਾਲੂ ਕਰੋ"</string>
-    <string name="voicemail" msgid="8899540969000957954">"ਵੌਇਸਮੇਲ"</string>
-    <string name="description_cancel_multi_select" msgid="3930475950253360461">"ਬੈਚ ਕਾਰਵਾਈਆਂ ਮੋਡ ਨੂੰ ਰੱਦ ਕਰੋ"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"ਮਿਟਾਓ"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"ਰੱਦ ਕਰੋ"</string>
-    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> ਨੂੰ ਚੁਣਿਆ ਗਿਆ"</string>
-    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
-      <item quantity="one">"<b>"ਕੀ ਇਸ ਵੌਇਸਮੇਲ ਨੂੰ ਮਿਟਾਉਣਾ ਹੈ? "</b>"</item>
-      <item quantity="other">"<b>"ਕੀ ਇਹਨਾਂ ਵੌਇਸਮੇਲਾਂ ਨੂੰ ਮਿਟਾਉਣਾ ਹੈ? "</b>"</item>
-    </plurals>
-    <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
-    <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> ਨੂੰ <xliff:g id="TIME">%2$s</xliff:g> ਵਜੇ"</string>
-    <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
-    <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="voice_search_not_available" msgid="6546240433719732905">"ਵੌਇਸ ਖੋਜ ਉਪਲਬਧ ਨਹੀਂ ਹੈ"</string>
-    <string name="dialer_hint_find_contact" msgid="2023214799381149808">"ਸੰਪਰਕ ਖੋਜੋ"</string>
-    <string name="block_number_search_hint" msgid="5377706079015099416">"ਨੰਬਰ ਜੋੜੋ ਜਾਂ ਸੰਪਰਕ ਖੋਜੋ"</string>
-    <string name="call_log_all_empty" msgid="3955572868518162004">"ਤੁਹਾਡਾ ਕਾਲ ਇਤਿਹਾਸ ਖਾਲੀ ਹੈ"</string>
-    <string name="call_log_all_empty_action" msgid="852218280136243014">"ਇੱਕ ਕਾਲ ਕਰੋ"</string>
-    <string name="call_log_missed_empty" msgid="7094936030845062214">"ਤੁਹਾਡੇ ਕੋਲ ਕੋਈ ਵੀ ਖੁੰਝੀਆਂ ਕਾਲਾਂ ਨਹੀਂ ਹਨ।"</string>
-    <string name="call_log_voicemail_empty" msgid="273623903423275178">"ਤੁਹਾਡਾ ਵੌਇਸਮੇਲ ਇਨਬਾਕਸ ਖਾਲੀ ਹੈ।"</string>
-    <string name="call_log_activity_title" msgid="1275242727244945527">"ਕਾਲ ਇਤਿਹਾਸ"</string>
-    <string name="call_log_all_title" msgid="6042262422192020327">"ਸਭ"</string>
-    <string name="call_log_missed_title" msgid="17254005889268015">"ਮਿਸਡ"</string>
-    <string name="tab_speed_dial" msgid="6616404752227561075">"ਸਪੀਡ ਡਾਇਲ"</string>
-    <string name="tab_history" msgid="7420269368689503596">"ਕਾਲ ਇਤਿਹਾਸ"</string>
-    <string name="tab_all_contacts" msgid="5531733977693943015">"ਸੰਪਰਕ"</string>
-    <string name="tab_voicemail" msgid="2458548090088316246">"ਵੌਇਸਮੇਲ"</string>
-    <string name="search_shortcut_call_number" msgid="8847918845036880688">"<xliff:g id="NUMBER">%s</xliff:g> ਨੂੰ ਕਾਲ ਕਰੋ"</string>
-    <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"ਨਵਾਂ ਸੰਪਰਕ ਬਣਾਓ"</string>
-    <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"ਕਿਸੇ ਸੰਪਰਕ ਵਿੱਚ ਸ਼ਾਮਲ ਕਰੋ"</string>
-    <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"SMS ਭੇਜੋ"</string>
-    <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"ਵੀਡੀਓ ਕਾਲ ਕਰੋ"</string>
-    <string name="search_shortcut_block_number" msgid="4587283230665805776">"ਨੰਬਰ ਨੂੰ ਬਲੌਕ ਕਰੋ"</string>
-    <string name="speed_dial_empty" msgid="3346406399966039505">"ਅਜੇ ਤੁਹਾਡੇ ਸਪੀਡ ਡਾਇਲ \'ਤੇ ਕੋਈ ਵੀ ਵਿਅਕਤੀ ਨਹੀਂ ਹੈ"</string>
-    <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"ਕੋਈ ਮਨਪਸੰਦ ਸ਼ਾਮਲ ਕਰੋ"</string>
-    <string name="remove_contact" msgid="2353580570488923668">"ਹਟਾਓ"</string>
-    <string name="select_all" msgid="408601760696146245">"ਸਭ ਚੁਣੋ"</string>
-    <string name="call_log_action_video_call" msgid="7565549950343850819">"ਵੀਡੀਓ ਕਾਲ"</string>
-    <string name="call_log_action_send_message" msgid="6948727362660115554">"ਇੱਕ ਸੁਨੇਹਾ ਭੇਜੋ"</string>
-    <string name="call_log_action_details" msgid="2091370737371449501">"ਕਾਲ ਵੇਰਵੇ"</string>
-    <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"ਇਸ \'ਤੇ ਭੇਜੋ..."</string>
-    <string name="call_log_action_call" msgid="682724094251540583">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> ਨੂੰ ਕਾਲ ਕਰੋ"</string>
-    <string name="description_incoming_missed_call" msgid="8292535799379230029">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g> ਦੀ ਮਿਸਡ ਕਾਲ।"</string>
-    <string name="description_incoming_answered_call" msgid="3920182963103160610">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g> ਦੀ ਕਾਲ ਦਾ ਜਵਾਬ ਦਿੱਤਾ।"</string>
-    <string name="description_unread_voicemail" msgid="145170985013419170">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> , <xliff:g id="TYPEORLOCATION">^2</xliff:g> , <xliff:g id="TIMEOFCALL">^3</xliff:g> , <xliff:g id="PHONEACCOUNT">^4</xliff:g> ਵੱਲੋਂ ਬਿਨਾਂ-ਪੜ੍ਹੀ ਵੌਇਸਮੇਲ।"</string>
-    <string name="description_read_voicemail" msgid="5585559881573227732">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g> ਵੱਲੋਂ ਵੌਇਸਮੇਲ।"</string>
-    <string name="description_outgoing_call" msgid="543952487882919924">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g> ਨੂੰ ਕਾਲ ਕਰੋ।"</string>
-    <string name="call_log_via_number" msgid="1340307109806397650">"<xliff:g id="NUMBER">%1$s</xliff:g> ਰਾਹੀਂ"</string>
-    <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, <xliff:g id="NUMBER">%2$s</xliff:g> ਰਾਹੀਂ"</string>
-    <string name="description_call_action" msgid="4042796498169106545">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> ਨੂੰ ਕਾਲ ਕਰੋ"</string>
-    <string name="description_video_call_action" msgid="1237090968588659650">"ਵੀਡੀਓ ਕਾਲ <xliff:g id="NAMEORNUMBER">^1</xliff:g>।"</string>
-    <string name="description_voicemail_action" msgid="3290143432403538524">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> ਦੀ ਵੌਇਸਮੇਲ ਚੁਣੋ"</string>
-    <string name="description_create_new_contact_action" msgid="1928282350281564130">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> ਲਈ ਸੰਪਰਕ ਬਣਾਓ"</string>
-    <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> ਨੂੰ ਮੌਜੂਦਾ ਸੰਪਰਕ ਵਿੱਚ ਜੋੜੋ"</string>
-    <string name="description_details_action" msgid="2061866409737706174">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> ਲਈ ਕਾਲ ਵੇਰਵੇ"</string>
-    <string name="call_log_header_today" msgid="1576119097475845293">"ਅੱਜ"</string>
-    <string name="call_log_header_yesterday" msgid="5616077776205329563">"ਕੱਲ੍ਹ"</string>
-    <string name="call_log_header_other" msgid="4940676886254217644">"ਪੁਰਾਣੇ"</string>
-    <string name="voicemail_speaker_on" msgid="3151333608926996668">"ਸਪੀਕਰ ਚਾਲੂ ਕਰੋ।"</string>
-    <string name="voicemail_speaker_off" msgid="2530064206962034201">"ਸਪੀਕਰ ਬੰਦ ਕਰੋ।"</string>
-    <string name="voicemail_play_start_pause" msgid="3874823480278334664">"ਪਲੇਬੈਕ ਚਾਲੂ ਕਰੋ ਜਾਂ ਰੋਕੋ।"</string>
-    <string name="display_options_title" msgid="3880091801055797975">"ਡਿਸਪਲੇ ਚੋਣਾਂ"</string>
-    <string name="sounds_and_vibration_title" msgid="3075050000721181384">"ਧੁਨੀਆਂ ਅਤੇ ਥਰਥਰਾਹਟ"</string>
-    <string name="accessibility_settings_title" msgid="3329027650429831820">"ਪਹੁੰਚਯੋਗਤਾ"</string>
-    <string name="ringtone_title" msgid="8377174189894648486">"ਫੋਨ ਰਿੰਗਟੋਨ"</string>
-    <string name="vibrate_on_ring_title" msgid="631441314790960485">"ਕਾਲਾਂ ਲਈ ਥਰਥਰਾਹਟ ਵੀ ਕਰੋ"</string>
-    <string name="dtmf_tone_enable_title" msgid="3273762431523939277">"ਕੀਪੈਡ ਟੋਨਾਂ"</string>
-    <string name="dtmf_tone_length_title" msgid="534096029202438539">"ਕੀਪੈਡ ਟੋਨ ਦੀ ਲੰਬਾਈ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="applicationLabel">ਫ਼ੋਨ</string>
+  <string name="launcherDialpadActivityLabel">ਫ਼ੋਨ ਕੀਪੈਡ</string>
+  <string name="callHistoryIconLabel">ਕਾਲ ਇਤਿਹਾਸ</string>
+  <string name="action_copy_number_text">ਨੰਬਰ ਕਾਪੀ ਕਰੋ</string>
+  <string name="copy_transcript_text">ਲਿਪੀ ਬਦਲਣਾ ਕਾਪੀ ਕਰੋ</string>
+  <string name="action_edit_number_before_call">ਕਾਲ ਤੋਂ ਪਹਿਲਾਂ ਨੰਬਰ ਸੰਪਾਦਿਤ ਕਰੋ</string>
+  <string name="call_log_delete_all">ਕਾਲ ਇਤਿਹਾਸ ਹਟਾਓ</string>
+  <string name="call_log_trash_voicemail">ਵੌਇਸਮੇਲ ਮਿਟਾਓ</string>
+  <string name="snackbar_voicemail_deleted">ਵੌਇਸਮੇਲ ਮਿਟਾਈ ਗਈ</string>
+  <string name="clearCallLogConfirmation_title">ਕੀ ਕਾਲ ਇਤਿਹਾਸ ਹਟਾਉਣਾ ਹੈ?</string>
+  <string name="clearCallLogConfirmation">ਇਹ ਤੁਹਾਡੇ ਇਤਿਹਾਸ ਤੋਂ ਸਾਰੀਆਂ ਕਾਲਾਂ ਮਿਟਾ ਦੇਵੇਗਾ</string>
+  <string name="clearCallLogProgress_title">ਕਾਲ ਇਤਿਹਾਸ ਹਟਾ ਰਿਹਾ ਹੈ…</string>
+  <string name="notification_missedCallTitle">ਮਿਸਡ ਕਾਲ</string>
+  <string name="notification_missedWorkCallTitle">ਕੰਮ ਨਾਲ ਸਬੰਧਿਤ ਖੁੰਝੀ ਕਾਲ</string>
+  <string name="notification_missedCallsTitle">ਮਿਸ ਹੋਈਆਂ ਕਾਲਾਂ</string>
+  <string name="notification_missedCallsMsg">%d ਮਿਸ ਹੋਈਆਂ ਕਾਲਾਂ</string>
+  <string name="notification_missedCall_call_back">ਕਾਲ ਬੈਕ ਕਰੋ</string>
+  <string name="notification_missedCall_message">ਸੁਨੇਹਾ</string>
+  <string name="post_call_notification_message">%1$s: %2$s</string>
+  <string name="notification_voicemail_text_format">%s ਡਾਇਲ ਕਰੋ</string>
+  <string name="notification_voicemail_no_vm_number">ਵੌਇਸਮੇਲ ਨੰਬਰ ਅਗਿਆਤ</string>
+  <plurals name="notification_voicemail_title">
+    <item quantity="one"> %1$d ਵੌਇਸਮੇਲਾਂ </item>
+    <item quantity="other"> %1$d ਵੌਇਸਮੇਲਾਂ </item>
+  </plurals>
+  <string name="notification_voicemail_callers_list">%1$s, %2$s</string>
+  <string name="notification_new_voicemail_ticker">%1$s ਦੀ ਨਵੀਂ ਵੌਇਸਮੇਲ</string>
+  <string name="voicemail_playback_error">ਵੌਇਸਮੇਲ ਪਲੇ ਨਹੀਂ ਕਰ ਸਕਿਆ</string>
+  <string name="voicemail_fetching_content">ਵੌਇਸਮੇਲ ਲੋਡ ਕਰ ਰਿਹਾ ਹੈ…</string>
+  <string name="voicemail_fetching_timout">ਵੌਇਸਮੇਲ ਲੋਡ ਨਹੀਂ ਕਰ ਸਕਿਆ</string>
+  <string name="call_log_item_count_and_date">(%1$d) %2$s</string>
+  <string name="description_playback_speakerphone">ਸਪੀਕਰਫੋਨ ਨੂੰ ਚਾਲੂ ਜਾਂ ਬੰਦ ਕਰੋ</string>
+  <string name="description_playback_seek">ਪਲੇਬੈਕ ਪੋਜੀਸ਼ਨ ਖੋਜੋ</string>
+  <string name="action_menu_call_history_description">ਕਾਲ ਇਤਿਹਾਸ</string>
+  <string msgid="2295659037509008453" name="action_menu_overflow_description">ਹੋਰ ਚੋਣਾਂ</string>
+  <string name="action_menu_dialpad_button">ਕੀ-ਪੈਡ</string>
+  <string name="dialer_settings_label">ਸੈਟਿੰਗਾਂ</string>
+  <string name="simulator_submenu_label">ਸਿਮੁਲੇਟਰ</string>
+  <string name="new_ui_launcher_shortcut_label">ਨਵਾਂ UI ਸ਼ਾਰਟਕੱਟ ਬਣਾਓ</string>
+  <string name="description_entering_bulk_action_mode">ਬਲਕ ਕਾਰਵਾਈ ਮੋਡ ਵਿੱਚ ਦਾਖਲ ਹੋਇਆ ਜਾ ਰਿਹਾ ਹੈ</string>
+  <string name="description_leaving_bulk_action_mode">ਬਲਕ ਕਾਰਵਾਈ ਮੋਡ ਨੂੰ ਛੱਡਿਆ</string>
+  <string name="description_selecting_bulk_action_mode">%1$s ਨੂੰ ਚੁਣਿਆ ਗਿਆ</string>
+  <string name="description_unselecting_bulk_action_mode">%1$s ਨੂੰ ਅਣ-ਚੁਣਿਆ ਕੀਤਾ ਗਿਆ</string>
+  <string name="description_contact_details">%1$s ਲਈ ਸੰਪਰਕ ਵੇਰਵੇ</string>
+  <string name="description_spam_contact_details">ਸ਼ੱਕੀ ਸਪੈਮ ਕਾਲਰ %1$s ਲਈ ਸੰਪਰਕ ਵੇਰਵੇ</string>
+  <string name="description_num_calls">%1$s ਕਾਲਾਂ।</string>
+  <string name="description_video_call">ਵੀਡੀਓ ਕਾਲ।</string>
+  <string name="description_start_voice_search">ਵੌਇਸ ਖੋਜ ਚਾਲੂ ਕਰੋ</string>
+  <string name="voicemail">ਵੌਇਸਮੇਲ</string>
+  <string name="description_cancel_multi_select">ਬੈਚ ਕਾਰਵਾਈਆਂ ਮੋਡ ਨੂੰ ਰੱਦ ਕਰੋ</string>
+  <string name="voicemailMultiSelectDeleteConfirm">ਮਿਟਾਓ</string>
+  <string name="voicemailMultiSelectDeleteCancel">ਰੱਦ ਕਰੋ</string>
+  <string name="voicemailMultiSelectActionBarTitle">%1$s ਨੂੰ ਚੁਣਿਆ ਗਿਆ</string>
+  <plurals name="delete_voicemails_confirmation_dialog_title">
+    <item quantity="one"><b>ਕੀ ਇਸ ਵੌਇਸਮੇਲ ਨੂੰ ਮਿਟਾਉਣਾ ਹੈ? </b></item>
+    <item quantity="other"><b>ਕੀ ਇਹਨਾਂ ਵੌਇਸਮੇਲਾਂ ਨੂੰ ਮਿਟਾਉਣਾ ਹੈ? </b></item>
+  </plurals>
+  <string name="voicemailCallLogToday">@string/call_log_header_today</string>
+  <string name="voicemailCallLogDateTimeFormat">%1$s ਨੂੰ %2$s ਵਜੇ</string>
+  <string name="voicemailDurationFormat">%1$02d:%2$02d</string>
+  <string name="voicemailCallLogDateTimeFormatWithDuration">%1$s • %2$s</string>
+  <string name="voice_search_not_available">ਵੌਇਸ ਖੋਜ ਉਪਲਬਧ ਨਹੀਂ ਹੈ</string>
+  <string name="dialer_hint_find_contact">ਸੰਪਰਕ ਖੋਜੋ</string>
+  <string name="block_number_search_hint">ਨੰਬਰ ਜੋੜੋ ਜਾਂ ਸੰਪਰਕ ਖੋਜੋ</string>
+  <string name="call_log_all_empty">ਤੁਹਾਡਾ ਕਾਲ ਇਤਿਹਾਸ ਖਾਲੀ ਹੈ</string>
+  <string name="call_log_all_empty_action">ਇੱਕ ਕਾਲ ਕਰੋ</string>
+  <string name="call_log_missed_empty">ਤੁਹਾਡੇ ਕੋਲ ਕੋਈ ਵੀ ਖੁੰਝੀਆਂ ਕਾਲਾਂ ਨਹੀਂ ਹਨ।</string>
+  <string name="call_log_voicemail_empty">ਤੁਹਾਡਾ ਵੌਇਸਮੇਲ ਇਨਬਾਕਸ ਖਾਲੀ ਹੈ।</string>
+  <string name="call_log_activity_title">ਕਾਲ ਇਤਿਹਾਸ</string>
+  <string name="call_log_all_title">ਸਭ</string>
+  <string name="call_log_missed_title">ਮਿਸਡ</string>
+  <string name="tab_speed_dial">ਸਪੀਡ ਡਾਇਲ</string>
+  <string name="tab_history">ਕਾਲ ਇਤਿਹਾਸ</string>
+  <string name="tab_all_contacts">ਸੰਪਰਕ</string>
+  <string name="tab_voicemail">ਵੌਇਸਮੇਲ</string>
+  <string name="search_shortcut_call_number">%s ਨੂੰ ਕਾਲ ਕਰੋ</string>
+  <string name="search_shortcut_create_new_contact">ਨਵਾਂ ਸੰਪਰਕ ਬਣਾਓ</string>
+  <string name="search_shortcut_add_to_contact">ਕਿਸੇ ਸੰਪਰਕ ਵਿੱਚ ਸ਼ਾਮਲ ਕਰੋ</string>
+  <string name="search_shortcut_send_sms_message">SMS ਭੇਜੋ</string>
+  <string name="search_shortcut_make_video_call">ਵੀਡੀਓ ਕਾਲ ਕਰੋ</string>
+  <string name="search_shortcut_block_number">ਨੰਬਰ ਨੂੰ ਬਲੌਕ ਕਰੋ</string>
+  <string name="speed_dial_empty">ਅਜੇ ਤੁਹਾਡੇ ਸਪੀਡ ਡਾਇਲ \'ਤੇ ਕੋਈ ਵੀ ਵਿਅਕਤੀ ਨਹੀਂ ਹੈ</string>
+  <string name="speed_dial_empty_add_favorite_action">ਕੋਈ ਮਨਪਸੰਦ ਸ਼ਾਮਲ ਕਰੋ</string>
+  <string name="remove_contact">ਹਟਾਓ</string>
+  <string name="select_all">ਸਭ ਚੁਣੋ</string>
+  <string name="call_log_action_video_call">ਵੀਡੀਓ ਕਾਲ</string>
+  <string name="call_log_action_set_up_video">ਵੀਡੀਓ ਕਾਲਿੰਗ ਸੈੱਟਅੱਪ ਕਰੋ</string>
+  <string name="call_log_action_invite_video">ਵੀਡੀਓ ਕਾਲ \'ਤੇ ਸੱਦਾ ਦਿਓ</string>
+  <string name="call_log_action_send_message">ਇੱਕ ਸੁਨੇਹਾ ਭੇਜੋ</string>
+  <string name="call_log_action_details">ਕਾਲ ਵੇਰਵੇ</string>
+  <string name="call_log_action_share_voicemail">ਇਸ \'ਤੇ ਭੇਜੋ...</string>
+  <string name="call_log_action_call">^1 ਨੂੰ ਕਾਲ ਕਰੋ</string>
+  <string name="description_incoming_missed_call">^1, ^2, ^3, ^4 ਦੀ ਮਿਸਡ ਕਾਲ।</string>
+  <string name="description_incoming_answered_call">^1, ^2, ^3, ^4 ਦੀ ਕਾਲ ਦਾ ਜਵਾਬ ਦਿੱਤਾ।</string>
+  <string name="description_unread_voicemail">^1 , ^2 , ^3 , ^4 ਵੱਲੋਂ ਬਿਨਾਂ-ਪੜ੍ਹੀ ਵੌਇਸਮੇਲ।</string>
+  <string name="description_read_voicemail">^1, ^2, ^3, ^4 ਵੱਲੋਂ ਵੌਇਸਮੇਲ।</string>
+  <string name="description_outgoing_call">^1, ^2, ^3, ^4 ਨੂੰ ਕਾਲ ਕਰੋ।</string>
+  <string name="call_log_via_number">%1$s ਰਾਹੀਂ</string>
+  <string name="call_log_via_number_phone_account">%1$s, %2$s ਰਾਹੀਂ</string>
+  <string name="description_call_action">^1 ਨੂੰ ਕਾਲ ਕਰੋ</string>
+  <string name="description_video_call_action">ਵੀਡੀਓ ਕਾਲ ^1।</string>
+  <string name="description_voicemail_action">^1 ਦੀ ਵੌਇਸਮੇਲ ਚੁਣੋ</string>
+  <string name="description_create_new_contact_action">^1 ਲਈ ਸੰਪਰਕ ਬਣਾਓ</string>
+  <string name="description_add_to_existing_contact_action">^1 ਨੂੰ ਮੌਜੂਦਾ ਸੰਪਰਕ ਵਿੱਚ ਜੋੜੋ</string>
+  <string name="description_details_action">^1 ਲਈ ਕਾਲ ਵੇਰਵੇ</string>
+  <string name="call_log_header_today">ਅੱਜ</string>
+  <string name="call_log_header_yesterday">ਕੱਲ੍ਹ</string>
+  <string name="call_log_header_other">ਪੁਰਾਣੇ</string>
+  <string name="voicemail_speaker_on">ਸਪੀਕਰ ਚਾਲੂ ਕਰੋ।</string>
+  <string name="voicemail_speaker_off">ਸਪੀਕਰ ਬੰਦ ਕਰੋ।</string>
+  <string name="voicemail_play_start_pause">ਪਲੇਬੈਕ ਚਾਲੂ ਕਰੋ ਜਾਂ ਰੋਕੋ।</string>
+  <string name="display_options_title">ਡਿਸਪਲੇ ਚੋਣਾਂ</string>
+  <string name="sounds_and_vibration_title">ਧੁਨੀਆਂ ਅਤੇ ਥਰਥਰਾਹਟ</string>
+  <string name="accessibility_settings_title">ਪਹੁੰਚਯੋਗਤਾ</string>
+  <string name="ringtone_title">ਫੋਨ ਰਿੰਗਟੋਨ</string>
+  <string name="vibrate_on_ring_title">ਕਾਲਾਂ ਲਈ ਥਰਥਰਾਹਟ ਵੀ ਕਰੋ</string>
+  <string name="dtmf_tone_enable_title">ਕੀਪੈਡ ਟੋਨਾਂ</string>
+  <string name="dtmf_tone_length_title">ਕੀਪੈਡ ਟੋਨ ਦੀ ਲੰਬਾਈ</string>
   <string-array name="dtmf_tone_length_entries">
-    <item msgid="3136353015227162823">"ਸਧਾਰਨ"</item>
-    <item msgid="5376841175538523822">"ਲੰਮਾ"</item>
+    <item>ਸਧਾਰਨ</item>
+    <item>ਲੰਮਾ</item>
   </string-array>
-    <string name="respond_via_sms_setting_title" msgid="8008181606657693452">"ਤਤਕਾਲ ਜਵਾਬ"</string>
-    <string name="call_settings_label" msgid="7824611757200960807">"ਕਾਲਾਂ"</string>
-    <string name="manage_blocked_numbers_label" msgid="16823761991832273">"ਕਾਲ ਬਲੌਕ ਕਰਨਾ"</string>
-    <string name="voicemail_settings_label" msgid="4594299554519920570">"ਵੌਇਸਮੇਲ"</string>
-    <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"ਕਾਲ ਬਲੌਕਿੰਗ ਆਰਜ਼ੀ ਤੌਰ ਤੇ ਬੰਦ ਹੈ"</string>
-    <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"ਕਾਲ ਬਲੌਕਿੰਗ ਅਸਮਰੱਥ ਕਰ ਦਿੱਤੀ ਗਈ ਹੈ ਕਿਉਂਕਿ ਤੁਸੀਂ ਇਸ ਫੋਨ ਦੁਆਰਾ ਪਿਛਲੇ 48 ਘੰਟਿਆਂ ਤੋਂ ਐਮਰਜੈਂਸੀ ਸੇਵਾਵਾਂ ਨਾਲ ਕਨੈਕਟ ਕੀਤਾ ਹੋਇਆ ਹੈ। ਇਹ 48 ਘੰਟਿਆਂ ਦਾ ਸਮਾਂ ਪੂਰਾ ਹੋਣ ਤੇੋਂ ਬਾਅਦ ਆਟੋਮੈਟਿਕਲੀ ਮੁੜ-ਸਮਰੱਥ ਹੋ ਜਾਵੇਗੀ।"</string>
-    <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"ਆਯਾਤ ਨੰਬਰ"</string>
-    <string name="blocked_call_settings_import_description" msgid="1819412052545228965">"ਤੁਹਾਡੇ ਚਿੰਨ੍ਹਿਤ ਕੀਤੇ ਪਿਛਲੇ ਕੁਝ ਕਾਲਰ ਹੋਰ ਐਪਸ ਦੁਆਰਾ ਆਟੋਮੈਟਿਕ ਤੌਰ ਤੇ ਵੌਇਸਮੇਲ ਨੂੰ ਭੇਜੇ ਗਏ ਹਨ।"</string>
-    <string name="blocked_call_settings_view_numbers_button" msgid="3332727948554356704">"ਨੰਬਰ  ਦਿਖਾਓ"</string>
-    <string name="blocked_call_settings_import_button" msgid="7319111700387470727">"ਆਯਾਤ ਕਰੋ"</string>
-    <string name="description_blocked_number_list_delete" msgid="2139644216858370740">"ਨੰਬਰ ਨੂੰ ਅਨਬਲੌਕ ਕਰੋ"</string>
-    <string name="addBlockedNumber" msgid="3053473735238295551">"ਨੰਬਰ ਜੋੜੋ"</string>
-    <string name="block_number_footer_message_vvm" msgid="7955326304033982368">"ਇਹਨਾਂ ਨੰਬਰਾਂ ਤੋਂ ਕਾਲਾਂ ਬਲੌਕ ਕੀਤੀਆਂ ਜਾਣਗੀਆਂ ਅਤੇ ਵੌਇਸਮੇਲਾਂ ਆਪਣੇ ਆਪ ਮਿਟਾ ਦਿੱਤੀਆਂ ਜਾਣਗੀਆਂ।"</string>
-    <string name="block_number_footer_message_no_vvm" msgid="1152684139070471665">"ਇਹਨਾਂ ਨੰਬਰਾਂ ਤੋਂ ਕਾਲਾਂ ਬਲੌਕ ਕੀਤੀਆਂ ਜਾਣਗੀਆਂ, ਪਰ ਇਹ ਹਾਲੇ ਵੀ ਤੁਹਾਡੇ ਲਈ ਵੌਇਸਮੇਲਾਂ ਛੱਡ ਸਕਦੇ ਹਨ।"</string>
-    <string name="block_list" msgid="4701585783411870782">"ਬਲੌਕ ਕੀਤੇ ਗਏ ਨੰਬਰ"</string>
-    <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g> ਪਹਿਲਾਂ ਹੀ ਬਲੌਕ ਕੀਤਾ ਹੋਇਆ ਹੈ।"</string>
-    <string name="phone_account_settings_label" msgid="8372485478006965920">"ਕਾਲਿੰਗ ਖਾਤੇ"</string>
-    <string name="permission_no_speeddial" msgid="8487215628510596753">"ਸਪੀਡ ਡਾਇਲ ਨੂੰ ਸਮਰੱਥ ਕਰਨ ਲਈ, ਸੰਪਰਕ ਅਨੁਮਤੀ ਚਾਲੂ ਕਰੋ।"</string>
-    <string name="permission_no_calllog" msgid="4053705651238775784">"ਆਪਣਾ ਕਾਲ ਲੌਗ  ਦੇਖਣ  ਲਈ, ਫ਼ੋਨ ਅਨੁਮਤੀ ਚਾਲੂ ਕਰੋ।"</string>
-    <string name="permission_no_search" msgid="2424710404207193826">"ਆਪਣੇ ਸੰਪਰਕਾਂ ਦੀ ਖੋਜ ਕਰਨ ਲਈ,, ਸੰਪਰਕ ਅਨੁਮਤੀਆਂ ਨੂੰ ਚਾਲੂ ਕਰੋ।"</string>
-    <string name="permission_place_call" msgid="8686908130349369423">"ਕਾਲ ਕਰਨ ਲਈ, ਫ਼ੋਨ ਅਨੁਮਤੀ ਚਾਲੂ ਕਰੋ।"</string>
-    <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"ਫ਼ੋਨ ਐਪ ਦੇ ਕੋਲ ਸਿਸਟਮ ਸੈਟਿੰਗਜ਼ ਵਿੱਚ ਲਿੱਖਣ ਦੀ ਅਨੁਮਤੀ ਨਹੀਂ ਹੁੰਦੀ ਹੈ।"</string>
-    <string name="blocked_number_call_log_label" msgid="4212282846299997693">"ਬਲੌਕ ਕੀਤਾ"</string>
-    <string name="call_log_action_block_report_number" msgid="7302636538668696729">"ਸਪੈਮ ਨੂੰ ਬਲੌਕ ਕਰੋ/ਰਿਪੋਰਟ ਕਰੋ"</string>
-    <string name="call_log_action_block_number" msgid="5048188386501998865">"ਨੰਬਰ ਨੂੰ ਬਲੌਕ ਕਰੋ"</string>
-    <string name="call_log_action_remove_spam" msgid="2045319806318398403">"ਸਪੈਮ ਨਹੀਂ"</string>
-    <string name="call_log_action_unblock_number" msgid="6100117033288448758">"ਨੰਬਰ ਨੂੰ ਅਨਬਲੌਕ ਕਰੋ"</string>
-    <string name="spam_number_call_log_label" msgid="2678431398326811131">"ਸਪੈਮ"</string>
-    <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> ਆਫ਼ਲਾਈਨ ਹੈ ਅਤੇ ਉਸ \'ਤੇ ਪਹੁੰਚ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕਦੀ"</string>
-    <string name="about_phone_label" msgid="582991354677973731">"ਇਸ ਬਾਰੇ"</string>
-    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"ਇਹ ਟ੍ਰਾਂਸਕ੍ਰਾਈਬ Google ਵੱਲੋਂ ਕੀਤਾ ਗਿਆ ਹੈ"</string>
-    <string name="voicemail_transcription_in_progress" msgid="2933320969613783210">"Google ਵੱਲੋਂ ਪ੍ਰਤਿਲਿਪੀ ਬਣਾਈ ਜਾ ਰਹੀ ਹੈ…"</string>
-    <string name="voicemail_transcription_failed" msgid="335275303117412706">"ਪ੍ਰਤਿਲਿਪੀ ਉਪਲਬਧ ਨਹੀਂ ਹੈ।"</string>
-    <string name="voicemail_transcription_failed_language_not_supported" msgid="4210332591050562553">"ਪ੍ਰਤਿਲਿਪੀ ਉਪਲਬਧ ਨਹੀਂ ਹੈ। ਭਾਸ਼ਾ ਸਮਰਥਿਤ ਨਹੀਂ ਹੈ।"</string>
-    <string name="voicemail_transcription_failed_no_speech" msgid="9093372879697874852">"ਪ੍ਰਤਿਲਿਪੀ ਉਪਲਬਧ ਨਹੀਂ ਹੈ। ਕੋਈ ਬੋਲੀ ਨਹੀਂ ਮਿਲੀ।"</string>
-    <string name="view_conversation" msgid="7895904782094119702">"ਦੇਖੋ"</string>
-    <string name="ec_data_deleted" msgid="4794880345545827107">"ਕਾਲ ਮਿਟਾਈ ਗਈ। ਇਸ ਕਾਲ ਦੌਰਾਨ &amp;quot;ਸੁਨੇਹੇ&amp;quot; ਐਪ ਵਿੱਚ ਸਾਂਝੀਆਂ ਕੀਤੀਆਂ ਅਟੈਚਮੈਂਟਾਂ ਨੂੰ ਦੇਖੋ ਅਤੇ ਮਿਟਾਓ।"</string>
-    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"ਕਾਲ ਮਿਟਾਈ ਗਈ। ਕਾਲਾਂ ਦੌਰਾਨ &amp;quot;ਸੁਨੇਹੇ&amp;quot; ਐਪ ਵਿੱਚ ਸਾਂਝੀਆਂ ਕੀਤੀਆਂ ਅਟੈਚਮੈਂਟਾਂ ਨੂੰ ਦੇਖੋ ਅਤੇ ਮਿਟਾਓ।"</string>
+  <string name="respond_via_sms_setting_title">ਤਤਕਾਲ ਜਵਾਬ</string>
+  <string name="call_settings_label">ਕਾਲਾਂ</string>
+  <string name="manage_blocked_numbers_label">ਬਲਾਕ ਕੀਤੇ ਨੰਬਰ</string>
+  <string name="voicemail_settings_label">ਵੌਇਸਮੇਲ</string>
+  <string name="blocked_numbers_disabled_emergency_header_label">ਕਾਲ ਬਲੌਕਿੰਗ ਆਰਜ਼ੀ ਤੌਰ ਤੇ ਬੰਦ ਹੈ</string>
+  <string name="blocked_numbers_disabled_emergency_desc">ਕਾਲ ਬਲੌਕਿੰਗ ਅਸਮਰੱਥ ਕਰ ਦਿੱਤੀ ਗਈ ਹੈ ਕਿਉਂਕਿ ਤੁਸੀਂ ਇਸ ਫੋਨ ਦੁਆਰਾ ਪਿਛਲੇ 48 ਘੰਟਿਆਂ ਤੋਂ ਐਮਰਜੈਂਸੀ ਸੇਵਾਵਾਂ ਨਾਲ ਕਨੈਕਟ ਕੀਤਾ ਹੋਇਆ ਹੈ। ਇਹ 48 ਘੰਟਿਆਂ ਦਾ ਸਮਾਂ ਪੂਰਾ ਹੋਣ ਤੇੋਂ ਬਾਅਦ ਆਟੋਮੈਟਿਕਲੀ ਮੁੜ-ਸਮਰੱਥ ਹੋ ਜਾਵੇਗੀ।</string>
+  <string name="import_send_to_voicemail_numbers_label">ਆਯਾਤ ਨੰਬਰ</string>
+  <string name="blocked_call_settings_import_description">ਤੁਹਾਡੇ ਚਿੰਨ੍ਹਿਤ ਕੀਤੇ ਪਿਛਲੇ ਕੁਝ ਕਾਲਰ ਹੋਰ ਐਪਸ ਦੁਆਰਾ ਆਟੋਮੈਟਿਕ ਤੌਰ ਤੇ ਵੌਇਸਮੇਲ ਨੂੰ ਭੇਜੇ ਗਏ ਹਨ।</string>
+  <string name="blocked_call_settings_view_numbers_button">ਨੰਬਰ  ਦਿਖਾਓ </string>
+  <string name="blocked_call_settings_import_button">ਆਯਾਤ ਕਰੋ</string>
+  <string name="description_blocked_number_list_delete">ਨੰਬਰ ਨੂੰ ਅਨਬਲੌਕ ਕਰੋ</string>
+  <string name="addBlockedNumber">ਨੰਬਰ ਜੋੜੋ</string>
+  <string name="block_number_footer_message_vvm">ਇਹਨਾਂ ਨੰਬਰਾਂ ਤੋਂ ਕਾਲਾਂ ਬਲੌਕ ਕੀਤੀਆਂ ਜਾਣਗੀਆਂ ਅਤੇ ਵੌਇਸਮੇਲਾਂ ਆਪਣੇ ਆਪ ਮਿਟਾ ਦਿੱਤੀਆਂ ਜਾਣਗੀਆਂ।</string>
+  <string name="block_number_footer_message_no_vvm">ਇਹਨਾਂ ਨੰਬਰਾਂ ਤੋਂ ਕਾਲਾਂ ਬਲੌਕ ਕੀਤੀਆਂ ਜਾਣਗੀਆਂ, ਪਰ ਇਹ ਹਾਲੇ ਵੀ ਤੁਹਾਡੇ ਲਈ ਵੌਇਸਮੇਲਾਂ ਛੱਡ ਸਕਦੇ ਹਨ।</string>
+  <string name="block_list">ਬਲੌਕ ਕੀਤੇ ਗਏ ਨੰਬਰ</string>
+  <string name="alreadyBlocked">%1$s ਪਹਿਲਾਂ ਹੀ ਬਲੌਕ ਕੀਤਾ ਹੋਇਆ ਹੈ।</string>
+  <string name="phone_account_settings_label">ਕਾਲਿੰਗ ਖਾਤੇ</string>
+  <string name="permission_no_speeddial">ਸਪੀਡ ਡਾਇਲ ਨੂੰ ਸਮਰੱਥ ਕਰਨ ਲਈ, ਸੰਪਰਕ ਅਨੁਮਤੀ ਚਾਲੂ ਕਰੋ।</string>
+  <string name="permission_no_calllog">ਆਪਣਾ ਕਾਲ ਲੌਗ  ਦੇਖਣ  ਲਈ, ਫ਼ੋਨ ਅਨੁਮਤੀ ਚਾਲੂ ਕਰੋ।</string>
+  <string name="permission_no_search">ਆਪਣੇ ਸੰਪਰਕਾਂ ਦੀ ਖੋਜ ਕਰਨ ਲਈ,, ਸੰਪਰਕ ਅਨੁਮਤੀਆਂ ਨੂੰ ਚਾਲੂ ਕਰੋ।</string>
+  <string name="permission_place_call">ਕਾਲ ਕਰਨ ਲਈ, ਫ਼ੋਨ ਅਨੁਮਤੀ ਚਾਲੂ ਕਰੋ।</string>
+  <string name="toast_cannot_write_system_settings">ਫ਼ੋਨ ਐਪ ਦੇ ਕੋਲ ਸਿਸਟਮ ਸੈਟਿੰਗਜ਼ ਵਿੱਚ ਲਿੱਖਣ ਦੀ ਅਨੁਮਤੀ ਨਹੀਂ ਹੁੰਦੀ ਹੈ।</string>
+  <string name="blocked_number_call_log_label">ਬਲੌਕ ਕੀਤਾ</string>
+  <string name="call_log_action_block_report_number">ਸਪੈਮ ਨੂੰ ਬਲੌਕ ਕਰੋ/ਰਿਪੋਰਟ ਕਰੋ</string>
+  <string name="call_log_action_block_number">ਨੰਬਰ ਨੂੰ ਬਲੌਕ ਕਰੋ</string>
+  <string name="call_log_action_remove_spam">ਸਪੈਮ ਨਹੀਂ</string>
+  <string name="call_log_action_unblock_number">ਨੰਬਰ ਨੂੰ ਅਨਬਲੌਕ ਕਰੋ</string>
+  <string name="spam_number_call_log_label">ਸਪੈਮ</string>
+  <string name="call_composer_connection_failed">%1$s ਆਫ਼ਲਾਈਨ ਹੈ ਅਤੇ ਉਸ \'ਤੇ ਪਹੁੰਚ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕਦੀ</string>
+  <string name="about_phone_label">ਇਸ ਬਾਰੇ</string>
+  <string name="voicemail_transcription_branding_text">ਇਹ ਟ੍ਰਾਂਸਕ੍ਰਾਈਬ Google ਵੱਲੋਂ ਕੀਤਾ ਗਿਆ ਹੈ</string>
+  <string name="voicemail_transcription_in_progress">ਪ੍ਰਤਿਲਿਪੀ ਬਣਾਈ ਜਾ ਰਹੀ ਹੈ…</string>
+  <string name="voicemail_transcription_failed">ਪ੍ਰਤਿਲਿਪੀ ਉਪਲਬਧ ਨਹੀਂ ਹੈ।</string>
+  <string name="voicemail_transcription_failed_language_not_supported">ਪ੍ਰਤਿਲਿਪੀ ਉਪਲਬਧ ਨਹੀਂ ਹੈ। ਭਾਸ਼ਾ ਸਮਰਥਿਤ ਨਹੀਂ ਹੈ।</string>
+  <string name="voicemail_transcription_failed_no_speech">ਪ੍ਰਤਿਲਿਪੀ ਉਪਲਬਧ ਨਹੀਂ ਹੈ। ਕੋਈ ਬੋਲੀ ਨਹੀਂ ਮਿਲੀ।</string>
+  <string name="voicemail_donation_promo_title">ਕੀ ਪ੍ਰਤੀਲਿਪੀ ਦੀ ਸਟੀਕਤਾ ਨੂੰ ਬਿਹਤਰ ਬਣਾਉਣ ਵਿੱਚ ਮਦਦ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?</string>
+  <string name="voicemail_donation_promo_content">Google ਨੂੰ ਪ੍ਰਤੀਲਿਪੀਆਂ ਵਾਲੇ ਇਸ ਅਤੇ ਭਵਿੱਖੀ ਵੌਇਸਮੇਲ ਸੁਨੇਹਿਆਂ ਦੀ ਸਮੀਖਿਆ ਕਰਨ ਦਿਓ। ਉਹਨਾਂ ਨੂੰ ਗੁਮਨਾਮ ਵਜੋਂ ਸਟੋਰ ਕੀਤਾ ਜਾਵੇਗਾ। ਕਿਸੇ ਵੇਲੇ ਵੀ ਸੈਟਿੰਗਾਂ ਬਦਲੋ। %1$s</string>
+  <string name="voicemail_donation_promo_opt_in">ਹਾਂ, ਸਹਿਮਤ ਹਾਂ</string>
+  <string name="voicemail_donation_promo_opt_out">ਨਹੀਂ ਧੰਨਵਾਦ</string>
+  <string name="voicemail_transcription_rating">ਪ੍ਰਤਿਲਿਪੀ ਗੁਣਵੱਤਾ ਨੂੰ ਰੇਟ ਕਰੋ</string>
+  <string name="voicemail_transcription_rating_thanks">ਤੁਹਾਡੇ ਵਿਚਾਰ ਲਈ ਤੁਹਾਡਾ ਧੰਨਵਾਦ</string>
+  <string name="description_rating_good">ਪਸੰਦ ਕਰੋ</string>
+  <string name="description_rating_bad">ਨਾਪਸੰਦ ਕਰੋ</string>
+  <string name="view_conversation">ਦੇਖੋ</string>
+  <string name="ec_data_deleted">ਕਾਲ ਮਿਟਾਈ ਗਈ। ਇਸ ਕਾਲ ਦੌਰਾਨ &quot;ਸੁਨੇਹੇ&quot; ਐਪ ਵਿੱਚ ਸਾਂਝੀਆਂ ਕੀਤੀਆਂ ਅਟੈਚਮੈਂਟਾਂ ਨੂੰ ਦੇਖੋ ਅਤੇ ਮਿਟਾਓ।</string>
+  <string name="multiple_ec_data_deleted">ਕਾਲ ਮਿਟਾਈ ਗਈ। ਕਾਲਾਂ ਦੌਰਾਨ &quot;ਸੁਨੇਹੇ&quot; ਐਪ ਵਿੱਚ ਸਾਂਝੀਆਂ ਕੀਤੀਆਂ ਅਟੈਚਮੈਂਟਾਂ ਨੂੰ ਦੇਖੋ ਅਤੇ ਮਿਟਾਓ।</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-pl/strings.xml b/java/com/android/dialer/app/res/values-pl/strings.xml
index d8168b6..a589f92 100644
--- a/java/com/android/dialer/app/res/values-pl/strings.xml
+++ b/java/com/android/dialer/app/res/values-pl/strings.xml
@@ -1,183 +1,175 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="applicationLabel" msgid="2202739481132958990">"Telefon"</string>
-    <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"Klawiatura telefonu"</string>
-    <string name="callHistoryIconLabel" msgid="7493268743411968630">"Historia połączeń"</string>
-    <string name="action_copy_number_text" msgid="832682558551502319">"Kopiuj numer"</string>
-    <string name="copy_transcript_text" msgid="937904189017310829">"Kopiuj zapis"</string>
-    <string name="action_edit_number_before_call" msgid="8017492815878473837">"Edytuj numer przed połączeniem"</string>
-    <string name="call_log_delete_all" msgid="7852970926906523784">"Wyczyść historię połączeń"</string>
-    <string name="call_log_trash_voicemail" msgid="6118493534178533972">"Usuń pocztę głosową"</string>
-    <string name="snackbar_voicemail_deleted" msgid="7463166543725496307">"Poczta usunięta"</string>
-    <string name="snackbar_voicemail_deleted_undo" msgid="6959743982796409941">"COFNIJ"</string>
-    <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"Wyczyścić historię połączeń?"</string>
-    <string name="clearCallLogConfirmation" msgid="6844949465815109166">"Spowoduje to usunięcie wszystkich połączeń z historii."</string>
-    <string name="clearCallLogProgress_title" msgid="995004835687361977">"Czyszczę historię połączeń…"</string>
-    <string name="notification_missedCallTitle" msgid="8283366068539898486">"Nieodebrane połączenie"</string>
-    <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"Nieodebrane połączenie (praca)"</string>
-    <string name="notification_missedCallsTitle" msgid="3697442015345089802">"Nieodebrane połączenia"</string>
-    <string name="notification_missedCallsMsg" msgid="8176217633929018706">"Liczba nieodebranych połączeń: <xliff:g id="NUM_MISSED_CALLS">%d</xliff:g>"</string>
-    <string name="notification_missedCall_call_back" msgid="3875698110051973965">"Oddzwoń"</string>
-    <string name="notification_missedCall_message" msgid="5086910028988305964">"Wyślij SMS-a"</string>
-    <string name="post_call_notification_message" msgid="5417476789860590611">"<xliff:g id="NAME">%1$s</xliff:g>: <xliff:g id="MESSAGE">%2$s</xliff:g>"</string>
-    <string name="notification_voicemail_text_format" msgid="1895667520930252897">"Zadzwoń pod numer <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
-    <string name="notification_voicemail_no_vm_number" msgid="8942821987929495842">"Numer poczty głosowej jest nieznany"</string>
-    <plurals name="notification_voicemail_title" formatted="false" msgid="1551847434476438657">
-      <item quantity="few"> <xliff:g id="COUNT">%1$d</xliff:g> wiadomości głosowe </item>
-      <item quantity="many"> <xliff:g id="COUNT">%1$d</xliff:g> wiadomości głosowych </item>
-      <item quantity="other"> Wiadomości głosowe: <xliff:g id="COUNT">%1$d</xliff:g> </item>
-      <item quantity="one">Wiadomość głosowa</item>
-    </plurals>
-    <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
-    <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"Nowa poczta głosowa od: <xliff:g id="CALLER">%1$s</xliff:g>"</string>
-    <string name="voicemail_playback_error" msgid="4384373852257757295">"Nie można odtworzyć wiadomości głosowej"</string>
-    <string name="voicemail_fetching_content" msgid="572320120918636014">"Wczytuję zawartość poczty głosowej…"</string>
-    <string name="voicemail_fetching_timout" msgid="2128873915839949783">"Nie można wczytać zawartości poczty głosowej"</string>
-    <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_playback_speakerphone" msgid="4852027754869750227">"Włącz lub wyłącz tryb głośnomówiący"</string>
-    <string name="description_playback_seek" msgid="1340910573254132520">"Szukaj pozycji odtwarzania"</string>
-    <string name="action_menu_call_history_description" msgid="8829135306925008546">"Historia połączeń"</string>
-    <string name="action_menu_overflow_description" msgid="7648679686746517341">"Więcej opcji"</string>
-    <string name="action_menu_dialpad_button" msgid="1970631633457493180">"klawiatura"</string>
-    <string name="dialer_settings_label" msgid="4980176284150290175">"Ustawienia"</string>
-    <string name="simulator_submenu_label" msgid="186156287346615267">"Symulator"</string>
-    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Utwórz skrót do nowego interfejsu"</string>
-    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"Włączono tryb działań zbiorczych"</string>
-    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"Wyłączono tryb działań zbiorczych"</string>
-    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"Wybrano: <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"Anulowano wybór: <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_contact_details" msgid="3341280873855253464">"Szczegóły kontaktu: <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_spam_contact_details" msgid="5592578752881528368">"Szczegóły kontaktu <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>, który jest podejrzany o spam"</string>
-    <string name="description_num_calls" msgid="6483594535796216044">"Połączenia: <xliff:g id="NUMBEROFCALLS">%1$s</xliff:g>."</string>
-    <string name="description_video_call" msgid="3738199365585751727">"Rozmowa wideo."</string>
-    <string name="description_start_voice_search" msgid="8380022725973015261">"Wyszukiwanie głosowe"</string>
-    <string name="voicemail" msgid="8899540969000957954">"Poczta głosowa"</string>
-    <string name="description_cancel_multi_select" msgid="3930475950253360461">"Anuluj tryb działań zbiorczych"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Usuń"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Anuluj"</string>
-    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"Wybrane: <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
-      <item quantity="few">"<b>"Usunąć te wiadomości głosowe? "</b>"</item>
-      <item quantity="many">"<b>"Usunąć te wiadomości głosowe? "</b>"</item>
-      <item quantity="other">"<b>"Usunąć te wiadomości głosowe? "</b>"</item>
-      <item quantity="one">"<b>"Usunąć tę wiadomość głosową? "</b>"</item>
-    </plurals>
-    <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
-    <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> o <xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
-    <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="voice_search_not_available" msgid="6546240433719732905">"Wyszukiwanie głosowe jest niedostępne"</string>
-    <string name="dialer_hint_find_contact" msgid="2023214799381149808">"Przeszukuj kontakty"</string>
-    <string name="block_number_search_hint" msgid="5377706079015099416">"Dodaj numer lub wyszukaj kontakty"</string>
-    <string name="call_log_all_empty" msgid="3955572868518162004">"Twoja historia połączeń jest pusta"</string>
-    <string name="call_log_all_empty_action" msgid="852218280136243014">"Zadzwoń"</string>
-    <string name="call_log_missed_empty" msgid="7094936030845062214">"Nie masz nieodebranych połączeń."</string>
-    <string name="call_log_voicemail_empty" msgid="273623903423275178">"Skrzynka odbiorcza poczty głosowej jest pusta."</string>
-    <string name="call_log_activity_title" msgid="1275242727244945527">"Historia połączeń"</string>
-    <string name="call_log_all_title" msgid="6042262422192020327">"Wszystkie"</string>
-    <string name="call_log_missed_title" msgid="17254005889268015">"Nieodebrane"</string>
-    <string name="tab_speed_dial" msgid="6616404752227561075">"Szybkie wybieranie"</string>
-    <string name="tab_history" msgid="7420269368689503596">"Historia połączeń"</string>
-    <string name="tab_all_contacts" msgid="5531733977693943015">"Kontakty"</string>
-    <string name="tab_voicemail" msgid="2458548090088316246">"Poczta głosowa"</string>
-    <string name="search_shortcut_call_number" msgid="8847918845036880688">"Zadzwoń: <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"Utwórz nowy kontakt"</string>
-    <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"Dodaj do kontaktu"</string>
-    <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"Wyślij SMS-a"</string>
-    <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"Rozmowa wideo"</string>
-    <string name="search_shortcut_block_number" msgid="4587283230665805776">"Zablokuj numer"</string>
-    <string name="speed_dial_empty" msgid="3346406399966039505">"Lista szybkiego wybierania jest pusta"</string>
-    <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"Dodaj do ulubionych"</string>
-    <string name="remove_contact" msgid="2353580570488923668">"Usuń"</string>
-    <string name="select_all" msgid="408601760696146245">"Zaznacz wszystkie"</string>
-    <string name="call_log_action_video_call" msgid="7565549950343850819">"Rozmowa wideo"</string>
-    <string name="call_log_action_send_message" msgid="6948727362660115554">"Wyślij wiadomość"</string>
-    <string name="call_log_action_details" msgid="2091370737371449501">"Szczegóły połączenia"</string>
-    <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"Wyślij do…"</string>
-    <string name="call_log_action_call" msgid="682724094251540583">"Zadzwoń: <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_incoming_missed_call" msgid="8292535799379230029">"Nieodebrane połączenie: <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_incoming_answered_call" msgid="3920182963103160610">"Odebrane połączenie: <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_unread_voicemail" msgid="145170985013419170">"Nieodsłuchana poczta głosowa od: <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_read_voicemail" msgid="5585559881573227732">"Poczta głosowa od: <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_outgoing_call" msgid="543952487882919924">"Połączenie: <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="call_log_via_number" msgid="1340307109806397650">"przez <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> przez <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="description_call_action" msgid="4042796498169106545">"Zadzwoń: <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_video_call_action" msgid="1237090968588659650">"Rozpocznij rozmowę wideo z: <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
-    <string name="description_voicemail_action" msgid="3290143432403538524">"Posłuchaj wiadomości głosowej od: <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_create_new_contact_action" msgid="1928282350281564130">"Utwórz kontakt <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"Dodaj: <xliff:g id="NAMEORNUMBER">^1</xliff:g> do istniejącego kontaktu"</string>
-    <string name="description_details_action" msgid="2061866409737706174">"Szczegóły połączeń: <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="call_log_header_today" msgid="1576119097475845293">"Dzisiaj"</string>
-    <string name="call_log_header_yesterday" msgid="5616077776205329563">"Wczoraj"</string>
-    <string name="call_log_header_other" msgid="4940676886254217644">"Starsze"</string>
-    <string name="voicemail_speaker_on" msgid="3151333608926996668">"Włącz głośnik."</string>
-    <string name="voicemail_speaker_off" msgid="2530064206962034201">"Wyłącz głośnik."</string>
-    <string name="voicemail_play_start_pause" msgid="3874823480278334664">"Rozpocznij lub wstrzymaj odtwarzanie."</string>
-    <string name="display_options_title" msgid="3880091801055797975">"Opcje wyświetlania"</string>
-    <string name="sounds_and_vibration_title" msgid="3075050000721181384">"Dźwięki i wibracje"</string>
-    <string name="accessibility_settings_title" msgid="3329027650429831820">"Ułatwienia dostępu"</string>
-    <string name="ringtone_title" msgid="8377174189894648486">"Dzwonek telefonu"</string>
-    <string name="vibrate_on_ring_title" msgid="631441314790960485">"Wibracja przy połączeniach"</string>
-    <string name="dtmf_tone_enable_title" msgid="3273762431523939277">"Dźwięki klawiatury"</string>
-    <string name="dtmf_tone_length_title" msgid="534096029202438539">"Długość dźwięków klawiatury"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="applicationLabel">Telefon</string>
+  <string name="launcherDialpadActivityLabel">Klawiatura telefonu</string>
+  <string name="callHistoryIconLabel">Historia połączeń</string>
+  <string name="action_copy_number_text">Kopiuj numer</string>
+  <string name="copy_transcript_text">Kopiuj zapis</string>
+  <string name="action_edit_number_before_call">Edytuj numer przed połączeniem</string>
+  <string name="call_log_delete_all">Wyczyść historię połączeń</string>
+  <string name="call_log_trash_voicemail">Usuń pocztę głosową</string>
+  <string name="snackbar_voicemail_deleted">Poczta usunięta</string>
+  <string name="clearCallLogConfirmation_title">Wyczyścić historię połączeń?</string>
+  <string name="clearCallLogConfirmation">Spowoduje to usunięcie wszystkich połączeń z historii.</string>
+  <string name="clearCallLogProgress_title">Czyszczę historię połączeń…</string>
+  <string name="notification_missedCallTitle">Nieodebrane połączenie</string>
+  <string name="notification_missedWorkCallTitle">Nieodebrane połączenie (praca)</string>
+  <string name="notification_missedCallsTitle">Nieodebrane połączenia</string>
+  <string name="notification_missedCallsMsg">Liczba nieodebranych połączeń: %d</string>
+  <string name="notification_missedCall_call_back">Oddzwoń</string>
+  <string name="notification_missedCall_message">Wyślij SMS-a</string>
+  <string name="post_call_notification_message">%1$s: %2$s</string>
+  <string name="notification_voicemail_text_format">Zadzwoń pod numer %s</string>
+  <string name="notification_voicemail_no_vm_number">Numer poczty głosowej jest nieznany</string>
+  <plurals name="notification_voicemail_title">
+    <item quantity="one">Wiadomość głosowa</item>
+    <item quantity="few"> %1$d wiadomości głosowe </item>
+    <item quantity="many"> %1$d wiadomości głosowych </item>
+    <item quantity="other"> Wiadomości głosowe: %1$d </item>
+  </plurals>
+  <string name="notification_voicemail_callers_list">%1$s, %2$s</string>
+  <string name="notification_new_voicemail_ticker">Nowa poczta głosowa od: %1$s</string>
+  <string name="voicemail_playback_error">Nie można odtworzyć wiadomości głosowej</string>
+  <string name="voicemail_fetching_content">Wczytuję zawartość poczty głosowej…</string>
+  <string name="voicemail_fetching_timout">Nie można wczytać zawartości poczty głosowej</string>
+  <string name="call_log_item_count_and_date">(%1$d) %2$s</string>
+  <string name="description_playback_speakerphone">Włącz lub wyłącz tryb głośnomówiący</string>
+  <string name="description_playback_seek">Szukaj pozycji odtwarzania</string>
+  <string name="action_menu_call_history_description">Historia połączeń</string>
+  <string msgid="2295659037509008453" name="action_menu_overflow_description">Więcej opcji</string>
+  <string name="action_menu_dialpad_button">klawiatura</string>
+  <string name="dialer_settings_label">Ustawienia</string>
+  <string name="simulator_submenu_label">Symulator</string>
+  <string name="new_ui_launcher_shortcut_label">Utwórz skrót do nowego interfejsu</string>
+  <string name="description_entering_bulk_action_mode">Włączono tryb działań zbiorczych</string>
+  <string name="description_leaving_bulk_action_mode">Wyłączono tryb działań zbiorczych</string>
+  <string name="description_selecting_bulk_action_mode">Wybrano: %1$s</string>
+  <string name="description_unselecting_bulk_action_mode">Anulowano wybór: %1$s</string>
+  <string name="description_contact_details">Szczegóły kontaktu: %1$s</string>
+  <string name="description_spam_contact_details">Szczegóły kontaktu %1$s, który jest podejrzany o spam</string>
+  <string name="description_num_calls">Połączenia: %1$s.</string>
+  <string name="description_video_call">Rozmowa wideo.</string>
+  <string name="description_start_voice_search">Wyszukiwanie głosowe</string>
+  <string name="voicemail">Poczta głosowa</string>
+  <string name="description_cancel_multi_select">Anuluj tryb działań zbiorczych</string>
+  <string name="voicemailMultiSelectDeleteConfirm">Usuń</string>
+  <string name="voicemailMultiSelectDeleteCancel">Anuluj</string>
+  <string name="voicemailMultiSelectActionBarTitle">Wybrane: %1$s</string>
+  <plurals name="delete_voicemails_confirmation_dialog_title">
+    <item quantity="one"><b>Usunąć tę wiadomość głosową? </b></item>
+    <item quantity="few"><b>Usunąć te wiadomości głosowe? </b></item>
+    <item quantity="many"><b>Usunąć te wiadomości głosowe? </b></item>
+    <item quantity="other"><b>Usunąć te wiadomości głosowe? </b></item>
+  </plurals>
+  <string name="voicemailCallLogToday">@string/call_log_header_today</string>
+  <string name="voicemailCallLogDateTimeFormat">%1$s o %2$s</string>
+  <string name="voicemailDurationFormat">%1$02d:%2$02d</string>
+  <string name="voicemailCallLogDateTimeFormatWithDuration">%1$s • %2$s</string>
+  <string name="voice_search_not_available">Wyszukiwanie głosowe jest niedostępne</string>
+  <string name="dialer_hint_find_contact">Przeszukuj kontakty</string>
+  <string name="block_number_search_hint">Dodaj numer lub wyszukaj kontakty</string>
+  <string name="call_log_all_empty">Twoja historia połączeń jest pusta</string>
+  <string name="call_log_all_empty_action">Zadzwoń</string>
+  <string name="call_log_missed_empty">Nie masz nieodebranych połączeń.</string>
+  <string name="call_log_voicemail_empty">Skrzynka odbiorcza poczty głosowej jest pusta.</string>
+  <string name="call_log_activity_title">Historia połączeń</string>
+  <string name="call_log_all_title">Wszystkie</string>
+  <string name="call_log_missed_title">Nieodebrane</string>
+  <string name="tab_speed_dial">Szybkie wybieranie</string>
+  <string name="tab_history">Historia połączeń</string>
+  <string name="tab_all_contacts">Kontakty</string>
+  <string name="tab_voicemail">Poczta głosowa</string>
+  <string name="search_shortcut_call_number">Zadzwoń: %s</string>
+  <string name="search_shortcut_create_new_contact">Utwórz nowy kontakt</string>
+  <string name="search_shortcut_add_to_contact">Dodaj do kontaktu</string>
+  <string name="search_shortcut_send_sms_message">Wyślij SMS-a</string>
+  <string name="search_shortcut_make_video_call">Rozmowa wideo</string>
+  <string name="search_shortcut_block_number">Zablokuj numer</string>
+  <string name="speed_dial_empty">Lista szybkiego wybierania jest pusta</string>
+  <string name="speed_dial_empty_add_favorite_action">Dodaj do ulubionych</string>
+  <string name="remove_contact">Usuń</string>
+  <string name="select_all">Zaznacz wszystkie</string>
+  <string name="call_log_action_video_call">Rozmowa wideo</string>
+  <string name="call_log_action_set_up_video">Skonfiguruj rozmowy wideo</string>
+  <string name="call_log_action_invite_video">Zaproś na rozmowę wideo</string>
+  <string name="call_log_action_send_message">Wyślij wiadomość</string>
+  <string name="call_log_action_details">Szczegóły połączenia</string>
+  <string name="call_log_action_share_voicemail">Wyślij do…</string>
+  <string name="call_log_action_call">Zadzwoń: ^1</string>
+  <string name="description_incoming_missed_call">Nieodebrane połączenie: ^1, ^2, ^3, ^4.</string>
+  <string name="description_incoming_answered_call">Odebrane połączenie: ^1, ^2, ^3, ^4.</string>
+  <string name="description_unread_voicemail">Nieodsłuchana poczta głosowa od: ^1, ^2, ^3, ^4.</string>
+  <string name="description_read_voicemail">Poczta głosowa od: ^1, ^2, ^3, ^4.</string>
+  <string name="description_outgoing_call">Połączenie: ^1, ^2, ^3, ^4.</string>
+  <string name="call_log_via_number">przez %1$s</string>
+  <string name="call_log_via_number_phone_account">%1$s przez %2$s</string>
+  <string name="description_call_action">Zadzwoń: ^1</string>
+  <string name="description_video_call_action">Rozpocznij rozmowę wideo z: ^1.</string>
+  <string name="description_voicemail_action">Posłuchaj wiadomości głosowej od: ^1</string>
+  <string name="description_create_new_contact_action">Utwórz kontakt ^1</string>
+  <string name="description_add_to_existing_contact_action">Dodaj: ^1 do istniejącego kontaktu</string>
+  <string name="description_details_action">Szczegóły połączeń: ^1</string>
+  <string name="call_log_header_today">Dzisiaj</string>
+  <string name="call_log_header_yesterday">Wczoraj</string>
+  <string name="call_log_header_other">Starsze</string>
+  <string name="voicemail_speaker_on">Włącz głośnik.</string>
+  <string name="voicemail_speaker_off">Wyłącz głośnik.</string>
+  <string name="voicemail_play_start_pause">Rozpocznij lub wstrzymaj odtwarzanie.</string>
+  <string name="display_options_title">Opcje wyświetlania</string>
+  <string name="sounds_and_vibration_title">Dźwięki i wibracje</string>
+  <string name="accessibility_settings_title">Ułatwienia dostępu</string>
+  <string name="ringtone_title">Dzwonek telefonu</string>
+  <string name="vibrate_on_ring_title">Wibracja przy połączeniach</string>
+  <string name="dtmf_tone_enable_title">Dźwięki klawiatury</string>
+  <string name="dtmf_tone_length_title">Długość dźwięków klawiatury</string>
   <string-array name="dtmf_tone_length_entries">
-    <item msgid="3136353015227162823">"Normalne"</item>
-    <item msgid="5376841175538523822">"Długie"</item>
+    <item>Normalne</item>
+    <item>Długie</item>
   </string-array>
-    <string name="respond_via_sms_setting_title" msgid="8008181606657693452">"Szybkie odpowiedzi"</string>
-    <string name="call_settings_label" msgid="7824611757200960807">"Połączenia"</string>
-    <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Blokowanie połączeń"</string>
-    <string name="voicemail_settings_label" msgid="4594299554519920570">"Poczta głosowa"</string>
-    <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Blokada połączeń tymczasowo wyłączona"</string>
-    <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Blokada połączeń została wyłączona, ponieważ w ciągu ostatnich 48 godzin dzwoniono z tego telefonu na numer alarmowy. Blokada zostanie automatycznie przywrócona po upływie 48 godzin."</string>
-    <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Zaimportuj numery"</string>
-    <string name="blocked_call_settings_import_description" msgid="1819412052545228965">"Oznaczyłeś wcześniej niektórych rozmówców, aby byli automatycznie przekierowywani na pocztę głosową przy użyciu innych aplikacji."</string>
-    <string name="blocked_call_settings_view_numbers_button" msgid="3332727948554356704">"Pokaż numery"</string>
-    <string name="blocked_call_settings_import_button" msgid="7319111700387470727">"Importuj"</string>
-    <string name="description_blocked_number_list_delete" msgid="2139644216858370740">"Odblokuj numer"</string>
-    <string name="addBlockedNumber" msgid="3053473735238295551">"Dodaj numer"</string>
-    <string name="block_number_footer_message_vvm" msgid="7955326304033982368">"Połączenia z tych numerów będą blokowane, a wiadomości głosowe będą usuwane automatycznie."</string>
-    <string name="block_number_footer_message_no_vvm" msgid="1152684139070471665">"Połączenia z tych numerów będą blokowane, ale dzwoniący wciąż będą mogli zostawiać wiadomości głosowe."</string>
-    <string name="block_list" msgid="4701585783411870782">"Zablokowane numery"</string>
-    <string name="alreadyBlocked" msgid="5483253180532475653">"Numer <xliff:g id="NUMBER">%1$s</xliff:g> jest już zablokowany."</string>
-    <string name="phone_account_settings_label" msgid="8372485478006965920">"Konta telefoniczne"</string>
-    <string name="permission_no_speeddial" msgid="8487215628510596753">"Aby włączyć szybkie wybieranie, włącz uprawnienie Kontakty."</string>
-    <string name="permission_no_calllog" msgid="4053705651238775784">"Aby zobaczyć swój rejestr połączeń, włącz uprawnienie Telefon."</string>
-    <string name="permission_no_search" msgid="2424710404207193826">"Aby wyszukać kontakty, włącz uprawnienia Kontakty."</string>
-    <string name="permission_place_call" msgid="8686908130349369423">"Aby nawiązać połączenie, włącz uprawnienie Telefon."</string>
-    <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"Aplikacja Telefon nie ma uprawnień do zapisu w ustawieniach systemowych."</string>
-    <string name="blocked_number_call_log_label" msgid="4212282846299997693">"Zablokowany"</string>
-    <string name="call_log_action_block_report_number" msgid="7302636538668696729">"Zablokuj/zgłoś spam"</string>
-    <string name="call_log_action_block_number" msgid="5048188386501998865">"Zablokuj numer"</string>
-    <string name="call_log_action_remove_spam" msgid="2045319806318398403">"To nie spam"</string>
-    <string name="call_log_action_unblock_number" msgid="6100117033288448758">"Odblokuj numer"</string>
-    <string name="spam_number_call_log_label" msgid="2678431398326811131">"Spam"</string>
-    <string name="call_composer_connection_failed" msgid="6776461585447831242">"Użytkownik <xliff:g id="NAME">%1$s</xliff:g> jest offline i nie można się z nim skontaktować"</string>
-    <string name="about_phone_label" msgid="582991354677973731">"Informacje"</string>
-    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Transkrypcja: Google"</string>
-    <string name="voicemail_transcription_in_progress" msgid="2933320969613783210">"Google tworzy transkrypcję…"</string>
-    <string name="voicemail_transcription_failed" msgid="335275303117412706">"Transkrypcja niedostępna."</string>
-    <string name="voicemail_transcription_failed_language_not_supported" msgid="4210332591050562553">"Transkrypcja niedostępna. Język nie jest obsługiwany."</string>
-    <string name="voicemail_transcription_failed_no_speech" msgid="9093372879697874852">"Transkrypcja niedostępna. Nie wykryto głosu."</string>
-    <string name="view_conversation" msgid="7895904782094119702">"Wyświetl"</string>
-    <string name="ec_data_deleted" msgid="4794880345545827107">"Połączenie zostało usunięte. Załączniki udostępnione podczas tego połączenia możesz wyświetlić i usunąć w Wiadomościach."</string>
-    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"Połączenia zostały usunięte. Załączniki udostępnione podczas połączeń możesz wyświetlić i usunąć w Wiadomościach."</string>
+  <string name="respond_via_sms_setting_title">Szybkie odpowiedzi</string>
+  <string name="call_settings_label">Połączenia</string>
+  <string name="manage_blocked_numbers_label">Zablokowane numery</string>
+  <string name="voicemail_settings_label">Poczta głosowa</string>
+  <string name="blocked_numbers_disabled_emergency_header_label">Blokada połączeń tymczasowo wyłączona</string>
+  <string name="blocked_numbers_disabled_emergency_desc">Blokada połączeń została wyłączona, ponieważ w ciągu ostatnich 48 godzin dzwoniono z tego telefonu na numer alarmowy. Blokada zostanie automatycznie przywrócona po upływie 48 godzin.</string>
+  <string name="import_send_to_voicemail_numbers_label">Zaimportuj numery</string>
+  <string name="blocked_call_settings_import_description">Oznaczyłeś wcześniej niektórych rozmówców, aby byli automatycznie przekierowywani na pocztę głosową przy użyciu innych aplikacji.</string>
+  <string name="blocked_call_settings_view_numbers_button">Pokaż numery</string>
+  <string name="blocked_call_settings_import_button">Importuj</string>
+  <string name="description_blocked_number_list_delete">Odblokuj numer</string>
+  <string name="addBlockedNumber">Dodaj numer</string>
+  <string name="block_number_footer_message_vvm">Połączenia z tych numerów będą blokowane, a wiadomości głosowe będą usuwane automatycznie.</string>
+  <string name="block_number_footer_message_no_vvm">Połączenia z tych numerów będą blokowane, ale dzwoniący wciąż będą mogli zostawiać wiadomości głosowe.</string>
+  <string name="block_list">Zablokowane numery</string>
+  <string name="alreadyBlocked">Numer %1$s jest już zablokowany.</string>
+  <string name="phone_account_settings_label">Konta telefoniczne</string>
+  <string name="permission_no_speeddial">Aby włączyć szybkie wybieranie, włącz uprawnienie Kontakty.</string>
+  <string name="permission_no_calllog">Aby zobaczyć swój rejestr połączeń, włącz uprawnienie Telefon.</string>
+  <string name="permission_no_search">Aby wyszukać kontakty, włącz uprawnienia Kontakty.</string>
+  <string name="permission_place_call">Aby nawiązać połączenie, włącz uprawnienie Telefon.</string>
+  <string name="toast_cannot_write_system_settings">Aplikacja Telefon nie ma uprawnień do zapisu w ustawieniach systemowych.</string>
+  <string name="blocked_number_call_log_label">Zablokowany</string>
+  <string name="call_log_action_block_report_number">Zablokuj/zgłoś spam</string>
+  <string name="call_log_action_block_number">Zablokuj numer</string>
+  <string name="call_log_action_remove_spam">To nie spam</string>
+  <string name="call_log_action_unblock_number">Odblokuj numer</string>
+  <string name="spam_number_call_log_label">Spam</string>
+  <string name="call_composer_connection_failed">Użytkownik %1$s jest offline i nie można się z nim skontaktować</string>
+  <string name="about_phone_label">Informacje</string>
+  <string name="voicemail_transcription_branding_text">Transkrypcja: Google</string>
+  <string name="voicemail_transcription_in_progress">Tworzę transkrypcję…</string>
+  <string name="voicemail_transcription_failed">Transkrypcja niedostępna.</string>
+  <string name="voicemail_transcription_failed_language_not_supported">Transkrypcja niedostępna. Język nie jest obsługiwany.</string>
+  <string name="voicemail_transcription_failed_no_speech">Transkrypcja niedostępna. Nie wykryto głosu.</string>
+  <string name="voicemail_donation_promo_title">Chcesz pomóc w ulepszaniu jakości transkrypcji?</string>
+  <string name="voicemail_donation_promo_content">Pozwól Google na sprawdzenie tej i przyszłych wiadomości głosowych z transkrypcją. Będą one przechowywane anonimowo. W każdej chwili możesz zmienić to ustawienie. %1$s</string>
+  <string name="voicemail_donation_promo_opt_in">Tak</string>
+  <string name="voicemail_donation_promo_opt_out">Nie</string>
+  <string name="voicemail_transcription_rating">Oceń jakość transkrypcji</string>
+  <string name="voicemail_transcription_rating_thanks">Dziękujemy za opinię</string>
+  <string name="description_rating_good">Podoba mi się</string>
+  <string name="description_rating_bad">Nie podoba mi się</string>
+  <string name="view_conversation">Wyświetl</string>
+  <string name="ec_data_deleted">Połączenie zostało usunięte. Załączniki udostępnione podczas tego połączenia możesz wyświetlić i usunąć w Wiadomościach.</string>
+  <string name="multiple_ec_data_deleted">Połączenia zostały usunięte. Załączniki udostępnione podczas połączeń możesz wyświetlić i usunąć w Wiadomościach.</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-pt-rBR/strings.xml b/java/com/android/dialer/app/res/values-pt-rBR/strings.xml
index 86548bc..aae2d43 100644
--- a/java/com/android/dialer/app/res/values-pt-rBR/strings.xml
+++ b/java/com/android/dialer/app/res/values-pt-rBR/strings.xml
@@ -1,179 +1,171 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="applicationLabel" msgid="2202739481132958990">"Telefone"</string>
-    <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"Teclado do smartphone"</string>
-    <string name="callHistoryIconLabel" msgid="7493268743411968630">"Histórico de chamadas"</string>
-    <string name="action_copy_number_text" msgid="832682558551502319">"Copiar número"</string>
-    <string name="copy_transcript_text" msgid="937904189017310829">"Copiar transcrição"</string>
-    <string name="action_edit_number_before_call" msgid="8017492815878473837">"Editar número antes de chamar"</string>
-    <string name="call_log_delete_all" msgid="7852970926906523784">"Limpar histórico de chamadas"</string>
-    <string name="call_log_trash_voicemail" msgid="6118493534178533972">"Excluir mensagem de voz"</string>
-    <string name="snackbar_voicemail_deleted" msgid="7463166543725496307">"Correio de voz excluído"</string>
-    <string name="snackbar_voicemail_deleted_undo" msgid="6959743982796409941">"DESFAZER"</string>
-    <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"Limpar histórico de chamadas?"</string>
-    <string name="clearCallLogConfirmation" msgid="6844949465815109166">"Esta ação excluirá todas as chamadas do seu histórico"</string>
-    <string name="clearCallLogProgress_title" msgid="995004835687361977">"Limpando histórico de chamadas…"</string>
-    <string name="notification_missedCallTitle" msgid="8283366068539898486">"Chamada perdida"</string>
-    <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"Chamada de trabalho perdida"</string>
-    <string name="notification_missedCallsTitle" msgid="3697442015345089802">"Chamadas perdidas"</string>
-    <string name="notification_missedCallsMsg" msgid="8176217633929018706">"<xliff:g id="NUM_MISSED_CALLS">%d</xliff:g> chamadas perdidas"</string>
-    <string name="notification_missedCall_call_back" msgid="3875698110051973965">"Retornar chamada"</string>
-    <string name="notification_missedCall_message" msgid="5086910028988305964">"Mensagem"</string>
-    <string name="post_call_notification_message" msgid="5417476789860590611">"<xliff:g id="NAME">%1$s</xliff:g>: <xliff:g id="MESSAGE">%2$s</xliff:g>"</string>
-    <string name="notification_voicemail_text_format" msgid="1895667520930252897">"Discar <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
-    <string name="notification_voicemail_no_vm_number" msgid="8942821987929495842">"Número do correio de voz desconhecido"</string>
-    <plurals name="notification_voicemail_title" formatted="false" msgid="1551847434476438657">
-      <item quantity="one"> <xliff:g id="COUNT">%1$d</xliff:g> Correios de voz </item>
-      <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> Correios de voz </item>
-    </plurals>
-    <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
-    <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"Nova mensagem de voz de <xliff:g id="CALLER">%1$s</xliff:g>"</string>
-    <string name="voicemail_playback_error" msgid="4384373852257757295">"Não foi possível repr. correio de voz"</string>
-    <string name="voicemail_fetching_content" msgid="572320120918636014">"Carregando correio de voz..."</string>
-    <string name="voicemail_fetching_timout" msgid="2128873915839949783">"Não foi possível carregar correio de voz"</string>
-    <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_playback_speakerphone" msgid="4852027754869750227">"Ligar ou desligar o viva-voz"</string>
-    <string name="description_playback_seek" msgid="1340910573254132520">"Procurar posição de reprodução"</string>
-    <string name="action_menu_call_history_description" msgid="8829135306925008546">"Histórico de chamadas"</string>
-    <string name="action_menu_overflow_description" msgid="7648679686746517341">"Mais opções"</string>
-    <string name="action_menu_dialpad_button" msgid="1970631633457493180">"Teclado"</string>
-    <string name="dialer_settings_label" msgid="4980176284150290175">"Configurações"</string>
-    <string name="simulator_submenu_label" msgid="186156287346615267">"Simulador"</string>
-    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Criar atalho para a nova IU"</string>
-    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"Entrando no modo de ação em massa"</string>
-    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"Saindo do modo de ação em massa"</string>
-    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> selecionado"</string>
-    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> não selecionado"</string>
-    <string name="description_contact_details" msgid="3341280873855253464">"Detalhes de contato para <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_spam_contact_details" msgid="5592578752881528368">"Detalhes do contato do autor da chamada suspeito de spam <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> chamadas."</string>
-    <string name="description_video_call" msgid="3738199365585751727">"Videochamada."</string>
-    <string name="description_start_voice_search" msgid="8380022725973015261">"Iniciar pesquisa por voz"</string>
-    <string name="voicemail" msgid="8899540969000957954">"Correio de voz"</string>
-    <string name="description_cancel_multi_select" msgid="3930475950253360461">"Cancelar modo de ações em lote"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Excluir"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Cancelar"</string>
-    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"Itens selecionados: <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
-      <item quantity="one">"<b>"Excluir este correio de voz? "</b>"</item>
-      <item quantity="other">"<b>"Excluir estes correios de voz? "</b>"</item>
-    </plurals>
-    <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
-    <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> às <xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
-    <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="voice_search_not_available" msgid="6546240433719732905">"A pesquisa por voz não está disponível"</string>
-    <string name="dialer_hint_find_contact" msgid="2023214799381149808">"Pesquisar contatos"</string>
-    <string name="block_number_search_hint" msgid="5377706079015099416">"Adicionar número ou pesquisar contatos"</string>
-    <string name="call_log_all_empty" msgid="3955572868518162004">"Seu histórico de chamadas está vazio"</string>
-    <string name="call_log_all_empty_action" msgid="852218280136243014">"Fazer uma chamada"</string>
-    <string name="call_log_missed_empty" msgid="7094936030845062214">"Você não tem chamadas perdidas."</string>
-    <string name="call_log_voicemail_empty" msgid="273623903423275178">"Sua caixa de entrada de correio de voz está vazia."</string>
-    <string name="call_log_activity_title" msgid="1275242727244945527">"Histórico de chamadas"</string>
-    <string name="call_log_all_title" msgid="6042262422192020327">"Todas"</string>
-    <string name="call_log_missed_title" msgid="17254005889268015">"Perdidas"</string>
-    <string name="tab_speed_dial" msgid="6616404752227561075">"Discagem rápida"</string>
-    <string name="tab_history" msgid="7420269368689503596">"Histórico de chamadas"</string>
-    <string name="tab_all_contacts" msgid="5531733977693943015">"Contatos"</string>
-    <string name="tab_voicemail" msgid="2458548090088316246">"Correio de voz"</string>
-    <string name="search_shortcut_call_number" msgid="8847918845036880688">"Ligar para <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"Criar novo contato"</string>
-    <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"Adicionar a um contato"</string>
-    <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"Enviar SMS"</string>
-    <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"Fazer videochamada"</string>
-    <string name="search_shortcut_block_number" msgid="4587283230665805776">"Bloquear número"</string>
-    <string name="speed_dial_empty" msgid="3346406399966039505">"Ainda não há ninguém na sua discagem rápida"</string>
-    <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"Adicionar favorito"</string>
-    <string name="remove_contact" msgid="2353580570488923668">"Remover"</string>
-    <string name="select_all" msgid="408601760696146245">"Selecionar tudo"</string>
-    <string name="call_log_action_video_call" msgid="7565549950343850819">"Videochamada"</string>
-    <string name="call_log_action_send_message" msgid="6948727362660115554">"Enviar uma mensagem"</string>
-    <string name="call_log_action_details" msgid="2091370737371449501">"Detalhes da chamada"</string>
-    <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"Enviar para…"</string>
-    <string name="call_log_action_call" msgid="682724094251540583">"Ligar para <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_incoming_missed_call" msgid="8292535799379230029">"Chamada perdida de <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_incoming_answered_call" msgid="3920182963103160610">"Chamada atendida de <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_unread_voicemail" msgid="145170985013419170">"Correio de voz não lido de <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_read_voicemail" msgid="5585559881573227732">"Correio de voz de <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_outgoing_call" msgid="543952487882919924">"Chamada para <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="call_log_via_number" msgid="1340307109806397650">"por <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> por <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="description_call_action" msgid="4042796498169106545">"Ligar para <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_video_call_action" msgid="1237090968588659650">"Videochamada <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
-    <string name="description_voicemail_action" msgid="3290143432403538524">"Ouvir mensagem de voz de <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_create_new_contact_action" msgid="1928282350281564130">"Criar contato para <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"Adicionar <xliff:g id="NAMEORNUMBER">^1</xliff:g> a um contato já existente"</string>
-    <string name="description_details_action" msgid="2061866409737706174">"Detalhes de chamada para <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="call_log_header_today" msgid="1576119097475845293">"Hoje"</string>
-    <string name="call_log_header_yesterday" msgid="5616077776205329563">"Ontem"</string>
-    <string name="call_log_header_other" msgid="4940676886254217644">"Antiga"</string>
-    <string name="voicemail_speaker_on" msgid="3151333608926996668">"Ative o alto-falante."</string>
-    <string name="voicemail_speaker_off" msgid="2530064206962034201">"Desative o alto-falante."</string>
-    <string name="voicemail_play_start_pause" msgid="3874823480278334664">"Inicie ou pause a reprodução."</string>
-    <string name="display_options_title" msgid="3880091801055797975">"Opções de exibição"</string>
-    <string name="sounds_and_vibration_title" msgid="3075050000721181384">"Sons e vibração"</string>
-    <string name="accessibility_settings_title" msgid="3329027650429831820">"Acessibilidade"</string>
-    <string name="ringtone_title" msgid="8377174189894648486">"Toque do telefone"</string>
-    <string name="vibrate_on_ring_title" msgid="631441314790960485">"Também vibrar para chamadas"</string>
-    <string name="dtmf_tone_enable_title" msgid="3273762431523939277">"Tons do teclado"</string>
-    <string name="dtmf_tone_length_title" msgid="534096029202438539">"Duração do tom do teclado"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="applicationLabel">Telefone</string>
+  <string name="launcherDialpadActivityLabel">Teclado do smartphone</string>
+  <string name="callHistoryIconLabel">Histórico de chamadas</string>
+  <string name="action_copy_number_text">Copiar número</string>
+  <string name="copy_transcript_text">Copiar transcrição</string>
+  <string name="action_edit_number_before_call">Editar número antes de chamar</string>
+  <string name="call_log_delete_all">Limpar histórico de chamadas</string>
+  <string name="call_log_trash_voicemail">Excluir correio de voz</string>
+  <string name="snackbar_voicemail_deleted">Correio de voz excluído</string>
+  <string name="clearCallLogConfirmation_title">Limpar histórico de chamadas?</string>
+  <string name="clearCallLogConfirmation">Esta ação excluirá todas as chamadas do seu histórico</string>
+  <string name="clearCallLogProgress_title">Limpando histórico de chamadas…</string>
+  <string name="notification_missedCallTitle">Chamada perdida</string>
+  <string name="notification_missedWorkCallTitle">Chamada de trabalho perdida</string>
+  <string name="notification_missedCallsTitle">Chamadas perdidas</string>
+  <string name="notification_missedCallsMsg">%d chamadas perdidas</string>
+  <string name="notification_missedCall_call_back">Retornar chamada</string>
+  <string name="notification_missedCall_message">Mensagem</string>
+  <string name="post_call_notification_message">%1$s: %2$s</string>
+  <string name="notification_voicemail_text_format">Discar %s</string>
+  <string name="notification_voicemail_no_vm_number">Número do correio de voz desconhecido</string>
+  <plurals name="notification_voicemail_title">
+    <item quantity="one"> %1$d Correio de voz </item>
+    <item quantity="other"> %1$d Correios de voz </item>
+  </plurals>
+  <string name="notification_voicemail_callers_list">%1$s, %2$s</string>
+  <string name="notification_new_voicemail_ticker">Novo correio de voz de %1$s</string>
+  <string name="voicemail_playback_error">Não foi possível repr. correio de voz</string>
+  <string name="voicemail_fetching_content">Carregando correio de voz...</string>
+  <string name="voicemail_fetching_timout">Não foi possível carregar correio de voz</string>
+  <string name="call_log_item_count_and_date">(%1$d) %2$s</string>
+  <string name="description_playback_speakerphone">Ligar ou desligar o viva-voz</string>
+  <string name="description_playback_seek">Procurar posição de reprodução</string>
+  <string name="action_menu_call_history_description">Histórico de chamadas</string>
+  <string msgid="2295659037509008453" name="action_menu_overflow_description">Mais opções</string>
+  <string name="action_menu_dialpad_button">Teclado</string>
+  <string name="dialer_settings_label">Configurações</string>
+  <string name="simulator_submenu_label">Simulador</string>
+  <string name="new_ui_launcher_shortcut_label">Criar atalho para a nova IU</string>
+  <string name="description_entering_bulk_action_mode">Entrando no modo de ação em massa</string>
+  <string name="description_leaving_bulk_action_mode">Saindo do modo de ação em massa</string>
+  <string name="description_selecting_bulk_action_mode">%1$s selecionado</string>
+  <string name="description_unselecting_bulk_action_mode">%1$s não selecionado</string>
+  <string name="description_contact_details">Detalhes de contato para %1$s</string>
+  <string name="description_spam_contact_details">Detalhes do contato do autor da chamada suspeito de spam %1$s</string>
+  <string name="description_num_calls">%1$s chamadas.</string>
+  <string name="description_video_call">Videochamada.</string>
+  <string name="description_start_voice_search">Iniciar pesquisa por voz</string>
+  <string name="voicemail">Correio de voz</string>
+  <string name="description_cancel_multi_select">Cancelar modo de ações em lote</string>
+  <string name="voicemailMultiSelectDeleteConfirm">Excluir</string>
+  <string name="voicemailMultiSelectDeleteCancel">Cancelar</string>
+  <string name="voicemailMultiSelectActionBarTitle">Itens selecionados: %1$s</string>
+  <plurals name="delete_voicemails_confirmation_dialog_title">
+    <item quantity="one"><b>Excluir este correio de voz? </b></item>
+    <item quantity="other"><b>Excluir estes correios de voz? </b></item>
+  </plurals>
+  <string name="voicemailCallLogToday">@string/call_log_header_today</string>
+  <string name="voicemailCallLogDateTimeFormat">%1$s às %2$s</string>
+  <string name="voicemailDurationFormat">%1$02d:%2$02d</string>
+  <string name="voicemailCallLogDateTimeFormatWithDuration">%1$s • %2$s</string>
+  <string name="voice_search_not_available">A pesquisa por voz não está disponível</string>
+  <string name="dialer_hint_find_contact">Pesquisar contatos</string>
+  <string name="block_number_search_hint">Adicionar número ou pesquisar contatos</string>
+  <string name="call_log_all_empty">Seu histórico de chamadas está vazio</string>
+  <string name="call_log_all_empty_action">Fazer uma chamada</string>
+  <string name="call_log_missed_empty">Você não tem chamadas perdidas.</string>
+  <string name="call_log_voicemail_empty">Sua caixa de entrada de correio de voz está vazia.</string>
+  <string name="call_log_activity_title">Histórico de chamadas</string>
+  <string name="call_log_all_title">Todas</string>
+  <string name="call_log_missed_title">Perdidas</string>
+  <string name="tab_speed_dial">Discagem rápida</string>
+  <string name="tab_history">Histórico de chamadas</string>
+  <string name="tab_all_contacts">Contatos</string>
+  <string name="tab_voicemail">Correio de voz</string>
+  <string name="search_shortcut_call_number">Ligar para %s</string>
+  <string name="search_shortcut_create_new_contact">Criar novo contato</string>
+  <string name="search_shortcut_add_to_contact">Adicionar a um contato</string>
+  <string name="search_shortcut_send_sms_message">Enviar SMS</string>
+  <string name="search_shortcut_make_video_call">Fazer videochamada</string>
+  <string name="search_shortcut_block_number">Bloquear número</string>
+  <string name="speed_dial_empty">Ainda não há ninguém na sua discagem rápida</string>
+  <string name="speed_dial_empty_add_favorite_action">Adicionar favorito</string>
+  <string name="remove_contact">Remover</string>
+  <string name="select_all">Selecionar tudo</string>
+  <string name="call_log_action_video_call">Videochamada</string>
+  <string name="call_log_action_set_up_video">Configurar videochamada</string>
+  <string name="call_log_action_invite_video">Convidar para videochamada</string>
+  <string name="call_log_action_send_message">Enviar uma mensagem</string>
+  <string name="call_log_action_details">Detalhes da chamada</string>
+  <string name="call_log_action_share_voicemail">Enviar para…</string>
+  <string name="call_log_action_call">Ligar para ^1</string>
+  <string name="description_incoming_missed_call">Chamada perdida de ^1, ^2, ^3, ^4.</string>
+  <string name="description_incoming_answered_call">Chamada atendida de ^1, ^2, ^3, ^4.</string>
+  <string name="description_unread_voicemail">Correio de voz não lido de ^1, ^2, ^3, ^4.</string>
+  <string name="description_read_voicemail">Correio de voz de ^1, ^2, ^3, ^4.</string>
+  <string name="description_outgoing_call">Chamada para ^1, ^2, ^3, ^4.</string>
+  <string name="call_log_via_number">por %1$s</string>
+  <string name="call_log_via_number_phone_account">%1$s por %2$s</string>
+  <string name="description_call_action">Ligar para ^1</string>
+  <string name="description_video_call_action">Videochamada ^1.</string>
+  <string name="description_voicemail_action">Ouvir correio de voz de ^1</string>
+  <string name="description_create_new_contact_action">Criar contato para ^1</string>
+  <string name="description_add_to_existing_contact_action">Adicionar ^1 a um contato já existente</string>
+  <string name="description_details_action">Detalhes de chamada para ^1</string>
+  <string name="call_log_header_today">Hoje</string>
+  <string name="call_log_header_yesterday">Ontem</string>
+  <string name="call_log_header_other">Antiga</string>
+  <string name="voicemail_speaker_on">Ative o alto-falante.</string>
+  <string name="voicemail_speaker_off">Desative o alto-falante.</string>
+  <string name="voicemail_play_start_pause">Inicie ou pause a reprodução.</string>
+  <string name="display_options_title">Opções de exibição</string>
+  <string name="sounds_and_vibration_title">Sons e vibração</string>
+  <string name="accessibility_settings_title">Acessibilidade</string>
+  <string name="ringtone_title">Toque do telefone</string>
+  <string name="vibrate_on_ring_title">Também vibrar para chamadas</string>
+  <string name="dtmf_tone_enable_title">Tons do teclado</string>
+  <string name="dtmf_tone_length_title">Duração do tom do teclado</string>
   <string-array name="dtmf_tone_length_entries">
-    <item msgid="3136353015227162823">"Normais"</item>
-    <item msgid="5376841175538523822">"Longo"</item>
+    <item>Normais</item>
+    <item>Longo</item>
   </string-array>
-    <string name="respond_via_sms_setting_title" msgid="8008181606657693452">"Respostas rápidas"</string>
-    <string name="call_settings_label" msgid="7824611757200960807">"Chamadas"</string>
-    <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Bloqueio de chamadas"</string>
-    <string name="voicemail_settings_label" msgid="4594299554519920570">"Correio de voz"</string>
-    <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Bloqueio de chamadas temporiamente desativado"</string>
-    <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"O bloqueio de chamadas foi desativado porque você entrou em contato com serviços de emergência usando este telefone nas últimas 48 horas. Ele será reativado automaticamente depois de um período de 48 horas."</string>
-    <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Importar números"</string>
-    <string name="blocked_call_settings_import_description" msgid="1819412052545228965">"Anteriormente, você marcou alguns autores de chamada para serem enviados automaticamente para o correio de voz por meio de outros apps."</string>
-    <string name="blocked_call_settings_view_numbers_button" msgid="3332727948554356704">"Ver números"</string>
-    <string name="blocked_call_settings_import_button" msgid="7319111700387470727">"Importar"</string>
-    <string name="description_blocked_number_list_delete" msgid="2139644216858370740">"Desbloquear número"</string>
-    <string name="addBlockedNumber" msgid="3053473735238295551">"Adicionar número"</string>
-    <string name="block_number_footer_message_vvm" msgid="7955326304033982368">"Chamadas a partir destes números serão bloqueadas. Correios de voz serão excluídos automaticamente."</string>
-    <string name="block_number_footer_message_no_vvm" msgid="1152684139070471665">"Chamadas feitas a partir destes números serão bloqueadas, mas é possível que eles ainda consigam deixar correios de voz para você."</string>
-    <string name="block_list" msgid="4701585783411870782">"Números bloqueados"</string>
-    <string name="alreadyBlocked" msgid="5483253180532475653">"O número <xliff:g id="NUMBER">%1$s</xliff:g> já está bloqueado."</string>
-    <string name="phone_account_settings_label" msgid="8372485478006965920">"Contas de chamadas"</string>
-    <string name="permission_no_speeddial" msgid="8487215628510596753">"Para ativar a discagem rápida, ative a permissão para o app Contatos."</string>
-    <string name="permission_no_calllog" msgid="4053705651238775784">"Para ver seu registro de chamadas, ative a permissão para o app Telefone."</string>
-    <string name="permission_no_search" msgid="2424710404207193826">"Para pesquisar seus contatos, ative as permissões para \"Contatos\"."</string>
-    <string name="permission_place_call" msgid="8686908130349369423">"Para fazer uma chamada, ative a permissão para o app Telefone."</string>
-    <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"O app Telefone não tem permissão para gravar nas configurações do sistema."</string>
-    <string name="blocked_number_call_log_label" msgid="4212282846299997693">"Bloqueado"</string>
-    <string name="call_log_action_block_report_number" msgid="7302636538668696729">"Bloquear/denunciar spam"</string>
-    <string name="call_log_action_block_number" msgid="5048188386501998865">"Bloquear número"</string>
-    <string name="call_log_action_remove_spam" msgid="2045319806318398403">"Não é spam"</string>
-    <string name="call_log_action_unblock_number" msgid="6100117033288448758">"Desbloquear número"</string>
-    <string name="spam_number_call_log_label" msgid="2678431398326811131">"Spam"</string>
-    <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> está off-line e não é possível entrar em contato"</string>
-    <string name="about_phone_label" msgid="582991354677973731">"Sobre"</string>
-    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Transcrito pelo Google"</string>
-    <string name="voicemail_transcription_in_progress" msgid="2933320969613783210">"O Google está transcrevendo..."</string>
-    <string name="voicemail_transcription_failed" msgid="335275303117412706">"Transcrição indisponível."</string>
-    <string name="voicemail_transcription_failed_language_not_supported" msgid="4210332591050562553">"Transcrição indisponível: o idioma é incompatível."</string>
-    <string name="voicemail_transcription_failed_no_speech" msgid="9093372879697874852">"Transcrição indisponível: nenhuma voz foi detectada."</string>
-    <string name="view_conversation" msgid="7895904782094119702">"Ver"</string>
-    <string name="ec_data_deleted" msgid="4794880345545827107">"A chamada foi excluída. Veja e exclua os anexos compartilhados durante a chamada no Mensagens."</string>
-    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"As chamadas foram excluídas. Veja e exclua os anexos compartilhados durante as chamadas no Mensagens."</string>
+  <string name="respond_via_sms_setting_title">Respostas rápidas</string>
+  <string name="call_settings_label">Chamadas</string>
+  <string name="manage_blocked_numbers_label">Números bloqueados</string>
+  <string name="voicemail_settings_label">Correio de voz</string>
+  <string name="blocked_numbers_disabled_emergency_header_label">Bloqueio de chamadas temporiamente desativado</string>
+  <string name="blocked_numbers_disabled_emergency_desc">O bloqueio de chamadas foi desativado porque você entrou em contato com serviços de emergência usando este telefone nas últimas 48 horas. Ele será reativado automaticamente depois de um período de 48 horas.</string>
+  <string name="import_send_to_voicemail_numbers_label">Importar números</string>
+  <string name="blocked_call_settings_import_description">Anteriormente, você marcou alguns autores de chamada para serem enviados automaticamente para o correio de voz por meio de outros apps.</string>
+  <string name="blocked_call_settings_view_numbers_button">Ver números</string>
+  <string name="blocked_call_settings_import_button">Importar</string>
+  <string name="description_blocked_number_list_delete">Desbloquear número</string>
+  <string name="addBlockedNumber">Adicionar número</string>
+  <string name="block_number_footer_message_vvm">Chamadas a partir destes números serão bloqueadas. Correios de voz serão excluídos automaticamente.</string>
+  <string name="block_number_footer_message_no_vvm">Chamadas feitas a partir destes números serão bloqueadas, mas é possível que eles ainda consigam deixar correios de voz para você.</string>
+  <string name="block_list">Números bloqueados</string>
+  <string name="alreadyBlocked">O número %1$s já está bloqueado.</string>
+  <string name="phone_account_settings_label">Contas de chamadas</string>
+  <string name="permission_no_speeddial">Para ativar a discagem rápida, ative a permissão para o app Contatos.</string>
+  <string name="permission_no_calllog">Para ver seu registro de chamadas, ative a permissão para o app Telefone.</string>
+  <string name="permission_no_search">Para pesquisar seus contatos, ative as permissões para \"Contatos\".</string>
+  <string name="permission_place_call">Para fazer uma chamada, ative a permissão para o app Telefone.</string>
+  <string name="toast_cannot_write_system_settings">O app Telefone não tem permissão para gravar nas configurações do sistema.</string>
+  <string name="blocked_number_call_log_label">Bloqueado</string>
+  <string name="call_log_action_block_report_number">Bloquear/denunciar spam</string>
+  <string name="call_log_action_block_number">Bloquear número</string>
+  <string name="call_log_action_remove_spam">Não é spam</string>
+  <string name="call_log_action_unblock_number">Desbloquear número</string>
+  <string name="spam_number_call_log_label">Spam</string>
+  <string name="call_composer_connection_failed">%1$s está off-line e não é possível entrar em contato</string>
+  <string name="about_phone_label">Sobre</string>
+  <string name="voicemail_transcription_branding_text">Transcrito pelo Google</string>
+  <string name="voicemail_transcription_in_progress">Transcrevendo…</string>
+  <string name="voicemail_transcription_failed">Transcrição indisponível.</string>
+  <string name="voicemail_transcription_failed_language_not_supported">Transcrição indisponível: o idioma é incompatível.</string>
+  <string name="voicemail_transcription_failed_no_speech">Transcrição indisponível: nenhuma voz foi detectada.</string>
+  <string name="voicemail_donation_promo_title">Ajudar a tornar a transcrição mais precisa?</string>
+  <string name="voicemail_donation_promo_content">Permita que o Google analise esta e as próximas mensagens do correio de voz usando as transcrições. As mensagens serão armazenadas anonimamente. Altere as configurações a qualquer momento. %1$s</string>
+  <string name="voicemail_donation_promo_opt_in">Sim</string>
+  <string name="voicemail_donation_promo_opt_out">Não</string>
+  <string name="voicemail_transcription_rating">Avaliar transcrição</string>
+  <string name="voicemail_transcription_rating_thanks">Agradecemos seu feedback</string>
+  <string name="description_rating_good">Marcar como \"Gostei\"</string>
+  <string name="description_rating_bad">Marcar como \"Não gostei\"</string>
+  <string name="view_conversation">Ver</string>
+  <string name="ec_data_deleted">A chamada foi excluída. Veja e exclua os anexos compartilhados durante a chamada no Mensagens.</string>
+  <string name="multiple_ec_data_deleted">As chamadas foram excluídas. Veja e exclua os anexos compartilhados durante as chamadas no Mensagens.</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-pt-rPT/strings.xml b/java/com/android/dialer/app/res/values-pt-rPT/strings.xml
index 92e1daa..558d0e0 100644
--- a/java/com/android/dialer/app/res/values-pt-rPT/strings.xml
+++ b/java/com/android/dialer/app/res/values-pt-rPT/strings.xml
@@ -1,179 +1,171 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="applicationLabel" msgid="2202739481132958990">"Telemóvel"</string>
-    <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"Teclado do telemóvel"</string>
-    <string name="callHistoryIconLabel" msgid="7493268743411968630">"Histórico de chamadas"</string>
-    <string name="action_copy_number_text" msgid="832682558551502319">"Copiar número"</string>
-    <string name="copy_transcript_text" msgid="937904189017310829">"Copiar transcrição"</string>
-    <string name="action_edit_number_before_call" msgid="8017492815878473837">"Editar número antes de ligar"</string>
-    <string name="call_log_delete_all" msgid="7852970926906523784">"Limpar histórico de chamadas"</string>
-    <string name="call_log_trash_voicemail" msgid="6118493534178533972">"Eliminar correio de voz"</string>
-    <string name="snackbar_voicemail_deleted" msgid="7463166543725496307">"Correio de voz elim."</string>
-    <string name="snackbar_voicemail_deleted_undo" msgid="6959743982796409941">"ANULAR"</string>
-    <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"Limpar histórico de chamadas?"</string>
-    <string name="clearCallLogConfirmation" msgid="6844949465815109166">"Todas as chamadas serão eliminadas do histórico"</string>
-    <string name="clearCallLogProgress_title" msgid="995004835687361977">"A limpar histórico de chamadas…"</string>
-    <string name="notification_missedCallTitle" msgid="8283366068539898486">"Chamada não atendida"</string>
-    <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"Chamada de trabalho não atendida"</string>
-    <string name="notification_missedCallsTitle" msgid="3697442015345089802">"Chamadas não atendidas"</string>
-    <string name="notification_missedCallsMsg" msgid="8176217633929018706">"<xliff:g id="NUM_MISSED_CALLS">%d</xliff:g> chamadas não atendidas"</string>
-    <string name="notification_missedCall_call_back" msgid="3875698110051973965">"Ligar de volta"</string>
-    <string name="notification_missedCall_message" msgid="5086910028988305964">"Mensagem"</string>
-    <string name="post_call_notification_message" msgid="5417476789860590611">"<xliff:g id="NAME">%1$s</xliff:g>: <xliff:g id="MESSAGE">%2$s</xliff:g>"</string>
-    <string name="notification_voicemail_text_format" msgid="1895667520930252897">"Marcar <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
-    <string name="notification_voicemail_no_vm_number" msgid="8942821987929495842">"Número do correio de voz desconhecido"</string>
-    <plurals name="notification_voicemail_title" formatted="false" msgid="1551847434476438657">
-      <item quantity="one">Mensagem de correio de voz</item>
-      <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> mensagens de correio de voz </item>
-    </plurals>
-    <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g> , <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
-    <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"Nova msg de correio de voz de <xliff:g id="CALLER">%1$s</xliff:g>"</string>
-    <string name="voicemail_playback_error" msgid="4384373852257757295">"Não foi poss. reprod. o correio de voz"</string>
-    <string name="voicemail_fetching_content" msgid="572320120918636014">"A carregar o correio de voz..."</string>
-    <string name="voicemail_fetching_timout" msgid="2128873915839949783">"Não foi poss. carregar o correio de voz"</string>
-    <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_playback_speakerphone" msgid="4852027754869750227">"Ligar ou desligar o altifalante"</string>
-    <string name="description_playback_seek" msgid="1340910573254132520">"Procurar a posição da reprodução"</string>
-    <string name="action_menu_call_history_description" msgid="8829135306925008546">"Histórico de chamadas"</string>
-    <string name="action_menu_overflow_description" msgid="7648679686746517341">"Mais opções"</string>
-    <string name="action_menu_dialpad_button" msgid="1970631633457493180">"teclado"</string>
-    <string name="dialer_settings_label" msgid="4980176284150290175">"Definições"</string>
-    <string name="simulator_submenu_label" msgid="186156287346615267">"Simulador"</string>
-    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Criar novo atalho de IU"</string>
-    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"A entrar no modo de ação em massa…"</string>
-    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"Saiu do modo de ação em massa"</string>
-    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> selecionado"</string>
-    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> não selecionado"</string>
-    <string name="description_contact_details" msgid="3341280873855253464">"Detalhes de contacto para <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_spam_contact_details" msgid="5592578752881528368">"Detalhes de contacto para um autor de chamadas de spam suspeito: <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> chamadas."</string>
-    <string name="description_video_call" msgid="3738199365585751727">"Videochamada."</string>
-    <string name="description_start_voice_search" msgid="8380022725973015261">"Iniciar pesquisa por voz"</string>
-    <string name="voicemail" msgid="8899540969000957954">"Correio de voz"</string>
-    <string name="description_cancel_multi_select" msgid="3930475950253360461">"Cancelar modo de ações em lote"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Eliminar"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Cancelar"</string>
-    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> selecionada(s)"</string>
-    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
-      <item quantity="one">"<b>"Pretende eliminar esta mensagem de correio de voz? "</b>"</item>
-      <item quantity="other">"<b>"Pretende eliminar estas mensagens de correio de voz? "</b>"</item>
-    </plurals>
-    <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
-    <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> às <xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
-    <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="voice_search_not_available" msgid="6546240433719732905">"Pesquisa por voz não disponível"</string>
-    <string name="dialer_hint_find_contact" msgid="2023214799381149808">"Pesquisar contactos"</string>
-    <string name="block_number_search_hint" msgid="5377706079015099416">"Adic. n.º ou pesq. contactos"</string>
-    <string name="call_log_all_empty" msgid="3955572868518162004">"O seu histórico de chamadas está vazio"</string>
-    <string name="call_log_all_empty_action" msgid="852218280136243014">"Efetuar uma chamada"</string>
-    <string name="call_log_missed_empty" msgid="7094936030845062214">"Não tem chamadas não atendidas."</string>
-    <string name="call_log_voicemail_empty" msgid="273623903423275178">"A caixa de entrada do correio de voz está vazia."</string>
-    <string name="call_log_activity_title" msgid="1275242727244945527">"Histórico de chamadas"</string>
-    <string name="call_log_all_title" msgid="6042262422192020327">"Todas"</string>
-    <string name="call_log_missed_title" msgid="17254005889268015">"Não atendidas"</string>
-    <string name="tab_speed_dial" msgid="6616404752227561075">"Marcação rápida"</string>
-    <string name="tab_history" msgid="7420269368689503596">"Histórico de Chamadas"</string>
-    <string name="tab_all_contacts" msgid="5531733977693943015">"Contactos"</string>
-    <string name="tab_voicemail" msgid="2458548090088316246">"Correio de voz"</string>
-    <string name="search_shortcut_call_number" msgid="8847918845036880688">"Telefonar para <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"Criar novo contacto"</string>
-    <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"Adicionar a um contacto"</string>
-    <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"Enviar SMS"</string>
-    <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"Fazer videochamada"</string>
-    <string name="search_shortcut_block_number" msgid="4587283230665805776">"Bloquear número"</string>
-    <string name="speed_dial_empty" msgid="3346406399966039505">"Ainda não tem ninguém na marcação rápida"</string>
-    <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"Adicionar um favorito"</string>
-    <string name="remove_contact" msgid="2353580570488923668">"Remover"</string>
-    <string name="select_all" msgid="408601760696146245">"Selecionar tudo"</string>
-    <string name="call_log_action_video_call" msgid="7565549950343850819">"Videochamada"</string>
-    <string name="call_log_action_send_message" msgid="6948727362660115554">"Enviar uma mensagem"</string>
-    <string name="call_log_action_details" msgid="2091370737371449501">"Detalhes da chamada"</string>
-    <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"Enviar para…"</string>
-    <string name="call_log_action_call" msgid="682724094251540583">"Telefonar a <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_incoming_missed_call" msgid="8292535799379230029">"Chamada não atendida de <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_incoming_answered_call" msgid="3920182963103160610">"Chamada atendida de <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_unread_voicemail" msgid="145170985013419170">"Mensagem de correio de voz não lida de <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_read_voicemail" msgid="5585559881573227732">"Mensagem de correio de voz de <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_outgoing_call" msgid="543952487882919924">"Telefonar para <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="call_log_via_number" msgid="1340307109806397650">"através do número <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> através do número <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="description_call_action" msgid="4042796498169106545">"Telefonar a <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_video_call_action" msgid="1237090968588659650">"Fazer videochamada com <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
-    <string name="description_voicemail_action" msgid="3290143432403538524">"Ouvir o correio de voz de <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_create_new_contact_action" msgid="1928282350281564130">"Criar contacto para <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"Adicionar <xliff:g id="NAMEORNUMBER">^1</xliff:g> ao contacto existente"</string>
-    <string name="description_details_action" msgid="2061866409737706174">"Detalhes de chamadas de <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="call_log_header_today" msgid="1576119097475845293">"Hoje"</string>
-    <string name="call_log_header_yesterday" msgid="5616077776205329563">"Ontem"</string>
-    <string name="call_log_header_other" msgid="4940676886254217644">"Mais antigas"</string>
-    <string name="voicemail_speaker_on" msgid="3151333608926996668">"Ligar altifalante."</string>
-    <string name="voicemail_speaker_off" msgid="2530064206962034201">"Desligar altifalante"</string>
-    <string name="voicemail_play_start_pause" msgid="3874823480278334664">"Iniciar ou interromper a reprodução."</string>
-    <string name="display_options_title" msgid="3880091801055797975">"Opções de visualização"</string>
-    <string name="sounds_and_vibration_title" msgid="3075050000721181384">"Sons e vibração"</string>
-    <string name="accessibility_settings_title" msgid="3329027650429831820">"Acessibilidade"</string>
-    <string name="ringtone_title" msgid="8377174189894648486">"Toque do telemóvel"</string>
-    <string name="vibrate_on_ring_title" msgid="631441314790960485">"Vibrar também para chamadas"</string>
-    <string name="dtmf_tone_enable_title" msgid="3273762431523939277">"Tons do teclado"</string>
-    <string name="dtmf_tone_length_title" msgid="534096029202438539">"Duração do tom do teclado"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="applicationLabel">Telemóvel</string>
+  <string name="launcherDialpadActivityLabel">Teclado do telemóvel</string>
+  <string name="callHistoryIconLabel">Histórico de chamadas</string>
+  <string name="action_copy_number_text">Copiar número</string>
+  <string name="copy_transcript_text">Copiar transcrição</string>
+  <string name="action_edit_number_before_call">Editar número antes de ligar</string>
+  <string name="call_log_delete_all">Limpar histórico de chamadas</string>
+  <string name="call_log_trash_voicemail">Eliminar correio de voz</string>
+  <string name="snackbar_voicemail_deleted">Correio de voz elim.</string>
+  <string name="clearCallLogConfirmation_title">Limpar histórico de chamadas?</string>
+  <string name="clearCallLogConfirmation">Todas as chamadas serão eliminadas do histórico</string>
+  <string name="clearCallLogProgress_title">A limpar histórico de chamadas…</string>
+  <string name="notification_missedCallTitle">Chamada não atendida</string>
+  <string name="notification_missedWorkCallTitle">Chamada de trabalho não atendida</string>
+  <string name="notification_missedCallsTitle">Chamadas não atendidas</string>
+  <string name="notification_missedCallsMsg">%d chamadas não atendidas</string>
+  <string name="notification_missedCall_call_back">Ligar de volta</string>
+  <string name="notification_missedCall_message">Mensagem</string>
+  <string name="post_call_notification_message">%1$s: %2$s</string>
+  <string name="notification_voicemail_text_format">Marcar %s</string>
+  <string name="notification_voicemail_no_vm_number">Número do correio de voz desconhecido</string>
+  <plurals name="notification_voicemail_title">
+    <item quantity="one">Mensagem de correio de voz</item>
+    <item quantity="other"> %1$d mensagens de correio de voz </item>
+  </plurals>
+  <string name="notification_voicemail_callers_list">%1$s , %2$s</string>
+  <string name="notification_new_voicemail_ticker">Nova msg de correio de voz de %1$s</string>
+  <string name="voicemail_playback_error">Não foi poss. reprod. o correio de voz</string>
+  <string name="voicemail_fetching_content">A carregar o correio de voz...</string>
+  <string name="voicemail_fetching_timout">Não foi poss. carregar o correio de voz</string>
+  <string name="call_log_item_count_and_date">(%1$d) %2$s</string>
+  <string name="description_playback_speakerphone">Ligar ou desligar o altifalante</string>
+  <string name="description_playback_seek">Procurar a posição da reprodução</string>
+  <string name="action_menu_call_history_description">Histórico de chamadas</string>
+  <string msgid="2295659037509008453" name="action_menu_overflow_description">Mais opções</string>
+  <string name="action_menu_dialpad_button">teclado</string>
+  <string name="dialer_settings_label">Definições</string>
+  <string name="simulator_submenu_label">Simulador</string>
+  <string name="new_ui_launcher_shortcut_label">Criar novo atalho de IU</string>
+  <string name="description_entering_bulk_action_mode">A entrar no modo de ação em massa…</string>
+  <string name="description_leaving_bulk_action_mode">Saiu do modo de ação em massa</string>
+  <string name="description_selecting_bulk_action_mode">%1$s selecionado</string>
+  <string name="description_unselecting_bulk_action_mode">%1$s não selecionado</string>
+  <string name="description_contact_details">Detalhes de contacto para %1$s</string>
+  <string name="description_spam_contact_details">Detalhes de contacto para um autor de chamadas de spam suspeito: %1$s</string>
+  <string name="description_num_calls">%1$s chamadas.</string>
+  <string name="description_video_call">Videochamada.</string>
+  <string name="description_start_voice_search">Iniciar pesquisa por voz</string>
+  <string name="voicemail">Correio de voz</string>
+  <string name="description_cancel_multi_select">Cancelar modo de ações em lote</string>
+  <string name="voicemailMultiSelectDeleteConfirm">Eliminar</string>
+  <string name="voicemailMultiSelectDeleteCancel">Cancelar</string>
+  <string name="voicemailMultiSelectActionBarTitle">%1$s selecionada(s)</string>
+  <plurals name="delete_voicemails_confirmation_dialog_title">
+    <item quantity="one"><b>Pretende eliminar esta mensagem de correio de voz? </b></item>
+    <item quantity="other"><b>Pretende eliminar estas mensagens de correio de voz? </b></item>
+  </plurals>
+  <string name="voicemailCallLogToday">@string/call_log_header_today</string>
+  <string name="voicemailCallLogDateTimeFormat">%1$s às %2$s</string>
+  <string name="voicemailDurationFormat">%1$02d:%2$02d</string>
+  <string name="voicemailCallLogDateTimeFormatWithDuration">%1$s • %2$s</string>
+  <string name="voice_search_not_available">Pesquisa por voz não disponível</string>
+  <string name="dialer_hint_find_contact">Pesquisar contactos</string>
+  <string name="block_number_search_hint">Adic. n.º ou pesq. contactos</string>
+  <string name="call_log_all_empty">O seu histórico de chamadas está vazio</string>
+  <string name="call_log_all_empty_action">Efetuar uma chamada</string>
+  <string name="call_log_missed_empty">Não tem chamadas não atendidas.</string>
+  <string name="call_log_voicemail_empty">A caixa de entrada do correio de voz está vazia.</string>
+  <string name="call_log_activity_title">Histórico de chamadas</string>
+  <string name="call_log_all_title">Todas</string>
+  <string name="call_log_missed_title">Não atendidas</string>
+  <string name="tab_speed_dial">Marcação rápida</string>
+  <string name="tab_history">Histórico de Chamadas</string>
+  <string name="tab_all_contacts">Contactos</string>
+  <string name="tab_voicemail">Correio de voz</string>
+  <string name="search_shortcut_call_number">Telefonar para %s</string>
+  <string name="search_shortcut_create_new_contact">Criar novo contacto</string>
+  <string name="search_shortcut_add_to_contact">Adicionar a um contacto</string>
+  <string name="search_shortcut_send_sms_message">Enviar SMS</string>
+  <string name="search_shortcut_make_video_call">Fazer videochamada</string>
+  <string name="search_shortcut_block_number">Bloquear número</string>
+  <string name="speed_dial_empty">Ainda não tem ninguém na marcação rápida</string>
+  <string name="speed_dial_empty_add_favorite_action">Adicionar um favorito</string>
+  <string name="remove_contact">Remover</string>
+  <string name="select_all">Selecionar tudo</string>
+  <string name="call_log_action_video_call">Videochamada</string>
+  <string name="call_log_action_set_up_video">Configurar videochamadas</string>
+  <string name="call_log_action_invite_video">Convidar para videochamada</string>
+  <string name="call_log_action_send_message">Enviar uma mensagem</string>
+  <string name="call_log_action_details">Detalhes da chamada</string>
+  <string name="call_log_action_share_voicemail">Enviar para…</string>
+  <string name="call_log_action_call">Telefonar a ^1</string>
+  <string name="description_incoming_missed_call">Chamada não atendida de ^1, ^2, ^3, ^4.</string>
+  <string name="description_incoming_answered_call">Chamada atendida de ^1, ^2, ^3, ^4.</string>
+  <string name="description_unread_voicemail">Mensagem de correio de voz não lida de ^1, ^2, ^3, ^4.</string>
+  <string name="description_read_voicemail">Mensagem de correio de voz de ^1, ^2, ^3, ^4.</string>
+  <string name="description_outgoing_call">Telefonar para ^1, ^2, ^3, ^4.</string>
+  <string name="call_log_via_number">através do número %1$s</string>
+  <string name="call_log_via_number_phone_account">%1$s através do número %2$s</string>
+  <string name="description_call_action">Telefonar a ^1</string>
+  <string name="description_video_call_action">Fazer videochamada com ^1.</string>
+  <string name="description_voicemail_action">Ouvir o correio de voz de ^1</string>
+  <string name="description_create_new_contact_action">Criar contacto para ^1</string>
+  <string name="description_add_to_existing_contact_action">Adicionar ^1 ao contacto existente</string>
+  <string name="description_details_action">Detalhes de chamadas de ^1</string>
+  <string name="call_log_header_today">Hoje</string>
+  <string name="call_log_header_yesterday">Ontem</string>
+  <string name="call_log_header_other">Mais antigas</string>
+  <string name="voicemail_speaker_on">Ligar altifalante.</string>
+  <string name="voicemail_speaker_off">Desligar altifalante</string>
+  <string name="voicemail_play_start_pause">Iniciar ou interromper a reprodução.</string>
+  <string name="display_options_title">Opções de visualização</string>
+  <string name="sounds_and_vibration_title">Sons e vibração</string>
+  <string name="accessibility_settings_title">Acessibilidade</string>
+  <string name="ringtone_title">Toque do telemóvel</string>
+  <string name="vibrate_on_ring_title">Vibrar também para chamadas</string>
+  <string name="dtmf_tone_enable_title">Tons do teclado</string>
+  <string name="dtmf_tone_length_title">Duração do tom do teclado</string>
   <string-array name="dtmf_tone_length_entries">
-    <item msgid="3136353015227162823">"Normal"</item>
-    <item msgid="5376841175538523822">"Longo"</item>
+    <item>Normal</item>
+    <item>Longo</item>
   </string-array>
-    <string name="respond_via_sms_setting_title" msgid="8008181606657693452">"Respostas rápidas"</string>
-    <string name="call_settings_label" msgid="7824611757200960807">"Chamadas"</string>
-    <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Bloqueio de chamadas"</string>
-    <string name="voicemail_settings_label" msgid="4594299554519920570">"Correio de voz"</string>
-    <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Bloqueio de chamadas tempor. desativado"</string>
-    <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"O bloqueio de chamadas foi desativado porque contactou os serviços de emergência a partir deste telemóvel nas últimas 48 horas. O bloqueio será automaticamente reativado assim que expirar o período de 48 horas."</string>
-    <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Importar números"</string>
-    <string name="blocked_call_settings_import_description" msgid="1819412052545228965">"Anteriormente, marcou alguns autores de chamadas para serem automaticamente enviados para o correio de voz através de outras aplicações."</string>
-    <string name="blocked_call_settings_view_numbers_button" msgid="3332727948554356704">"Ver números"</string>
-    <string name="blocked_call_settings_import_button" msgid="7319111700387470727">"Importar"</string>
-    <string name="description_blocked_number_list_delete" msgid="2139644216858370740">"Desbloquear número"</string>
-    <string name="addBlockedNumber" msgid="3053473735238295551">"Adicionar número"</string>
-    <string name="block_number_footer_message_vvm" msgid="7955326304033982368">"As chamadas a partir destes números serão bloqueadas e as mensagens de correio de voz serão automaticamente eliminadas."</string>
-    <string name="block_number_footer_message_no_vvm" msgid="1152684139070471665">"As chamadas a partir destes números serão bloqueadas, mas os respetivos autores poderão deixar-lhe mensagens de correio de voz."</string>
-    <string name="block_list" msgid="4701585783411870782">"Números bloqueados"</string>
-    <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g> já está bloqueado."</string>
-    <string name="phone_account_settings_label" msgid="8372485478006965920">"Contas de chamadas"</string>
-    <string name="permission_no_speeddial" msgid="8487215628510596753">"Para ativar a marcação rápida, ative a autorização Contactos."</string>
-    <string name="permission_no_calllog" msgid="4053705651238775784">"Para ver o registo de chamadas, ative a autorização Telemóvel."</string>
-    <string name="permission_no_search" msgid="2424710404207193826">"Para pesquisar os seus contactos, ative as autorizações Contactos."</string>
-    <string name="permission_place_call" msgid="8686908130349369423">"Para efetuar uma chamada, ative a autorização Telemóvel."</string>
-    <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"A aplicação Telefone não tem autorização para gravar nas definições do sistema."</string>
-    <string name="blocked_number_call_log_label" msgid="4212282846299997693">"Bloqueado"</string>
-    <string name="call_log_action_block_report_number" msgid="7302636538668696729">"Bloquear/denunciar spam"</string>
-    <string name="call_log_action_block_number" msgid="5048188386501998865">"Bloquear número"</string>
-    <string name="call_log_action_remove_spam" msgid="2045319806318398403">"Não é spam"</string>
-    <string name="call_log_action_unblock_number" msgid="6100117033288448758">"Desbloquear número"</string>
-    <string name="spam_number_call_log_label" msgid="2678431398326811131">"Spam"</string>
-    <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> está offline e não pode ser contactado"</string>
-    <string name="about_phone_label" msgid="582991354677973731">"Acerca de"</string>
-    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Transcrito pelo Google"</string>
-    <string name="voicemail_transcription_in_progress" msgid="2933320969613783210">"O Google está a transcrever…"</string>
-    <string name="voicemail_transcription_failed" msgid="335275303117412706">"Transcrição não disponível"</string>
-    <string name="voicemail_transcription_failed_language_not_supported" msgid="4210332591050562553">"Transcrição não disponível. Idioma não suportado."</string>
-    <string name="voicemail_transcription_failed_no_speech" msgid="9093372879697874852">"Transcrição não disponível. Não foi detetada nenhuma voz."</string>
-    <string name="view_conversation" msgid="7895904782094119702">"Ver"</string>
-    <string name="ec_data_deleted" msgid="4794880345545827107">"A chamada foi eliminada. Veja e elimine os anexos partilhados durante esta chamada na aplicação Mensagens."</string>
-    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"As chamadas foram eliminadas. Veja e elimine os anexos partilhados durante as chamadas na aplicação Mensagens."</string>
+  <string name="respond_via_sms_setting_title">Respostas rápidas</string>
+  <string name="call_settings_label">Chamadas</string>
+  <string name="manage_blocked_numbers_label">Números bloqueados</string>
+  <string name="voicemail_settings_label">Correio de voz</string>
+  <string name="blocked_numbers_disabled_emergency_header_label">Bloqueio de chamadas tempor. desativado</string>
+  <string name="blocked_numbers_disabled_emergency_desc">O bloqueio de chamadas foi desativado porque contactou os serviços de emergência a partir deste telemóvel nas últimas 48 horas. O bloqueio será automaticamente reativado assim que expirar o período de 48 horas.</string>
+  <string name="import_send_to_voicemail_numbers_label">Importar números</string>
+  <string name="blocked_call_settings_import_description">Anteriormente, marcou alguns autores de chamadas para serem automaticamente enviados para o correio de voz através de outras aplicações.</string>
+  <string name="blocked_call_settings_view_numbers_button">Ver números</string>
+  <string name="blocked_call_settings_import_button">Importar</string>
+  <string name="description_blocked_number_list_delete">Desbloquear número</string>
+  <string name="addBlockedNumber">Adicionar número</string>
+  <string name="block_number_footer_message_vvm">As chamadas a partir destes números serão bloqueadas e as mensagens de correio de voz serão automaticamente eliminadas.</string>
+  <string name="block_number_footer_message_no_vvm">As chamadas a partir destes números serão bloqueadas, mas os respetivos autores poderão deixar-lhe mensagens de correio de voz.</string>
+  <string name="block_list">Números bloqueados</string>
+  <string name="alreadyBlocked">%1$s já está bloqueado.</string>
+  <string name="phone_account_settings_label">Contas de chamadas</string>
+  <string name="permission_no_speeddial">Para ativar a marcação rápida, ative a autorização Contactos.</string>
+  <string name="permission_no_calllog">Para ver o registo de chamadas, ative a autorização Telemóvel.</string>
+  <string name="permission_no_search">Para pesquisar os seus contactos, ative as autorizações Contactos.</string>
+  <string name="permission_place_call">Para efetuar uma chamada, ative a autorização Telemóvel.</string>
+  <string name="toast_cannot_write_system_settings">A aplicação Telefone não tem autorização para gravar nas definições do sistema.</string>
+  <string name="blocked_number_call_log_label">Bloqueado</string>
+  <string name="call_log_action_block_report_number">Bloquear/denunciar spam</string>
+  <string name="call_log_action_block_number">Bloquear número</string>
+  <string name="call_log_action_remove_spam">Não é spam</string>
+  <string name="call_log_action_unblock_number">Desbloquear número</string>
+  <string name="spam_number_call_log_label">Spam</string>
+  <string name="call_composer_connection_failed">%1$s está offline e não pode ser contactado</string>
+  <string name="about_phone_label">Acerca de</string>
+  <string name="voicemail_transcription_branding_text">Transcrito pelo Google</string>
+  <string name="voicemail_transcription_in_progress">A transcrever…</string>
+  <string name="voicemail_transcription_failed">Transcrição não disponível</string>
+  <string name="voicemail_transcription_failed_language_not_supported">Transcrição não disponível. Idioma não suportado.</string>
+  <string name="voicemail_transcription_failed_no_speech">Transcrição não disponível. Não foi detetada nenhuma voz.</string>
+  <string name="voicemail_donation_promo_title">Ajudar a melhorar a precisão das transcrições?</string>
+  <string name="voicemail_donation_promo_content">Permita que a Google reveja esta e as futuras mensagens de correio de voz com transcrições. Serão armazenadas anonimamente. Pode alterar as Definições a qualquer momento.%1$s</string>
+  <string name="voicemail_donation_promo_opt_in">Sim, aceito</string>
+  <string name="voicemail_donation_promo_opt_out">Não, obrigado</string>
+  <string name="voicemail_transcription_rating">Aval. qualidade da transcrição</string>
+  <string name="voicemail_transcription_rating_thanks">Obrigado pelo seu comentário</string>
+  <string name="description_rating_good">Gosto</string>
+  <string name="description_rating_bad">Não gosto</string>
+  <string name="view_conversation">Ver</string>
+  <string name="ec_data_deleted">A chamada foi eliminada. Veja e elimine os anexos partilhados durante esta chamada na aplicação Mensagens.</string>
+  <string name="multiple_ec_data_deleted">As chamadas foram eliminadas. Veja e elimine os anexos partilhados durante as chamadas na aplicação Mensagens.</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-pt/strings.xml b/java/com/android/dialer/app/res/values-pt/strings.xml
index 86548bc..aae2d43 100644
--- a/java/com/android/dialer/app/res/values-pt/strings.xml
+++ b/java/com/android/dialer/app/res/values-pt/strings.xml
@@ -1,179 +1,171 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="applicationLabel" msgid="2202739481132958990">"Telefone"</string>
-    <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"Teclado do smartphone"</string>
-    <string name="callHistoryIconLabel" msgid="7493268743411968630">"Histórico de chamadas"</string>
-    <string name="action_copy_number_text" msgid="832682558551502319">"Copiar número"</string>
-    <string name="copy_transcript_text" msgid="937904189017310829">"Copiar transcrição"</string>
-    <string name="action_edit_number_before_call" msgid="8017492815878473837">"Editar número antes de chamar"</string>
-    <string name="call_log_delete_all" msgid="7852970926906523784">"Limpar histórico de chamadas"</string>
-    <string name="call_log_trash_voicemail" msgid="6118493534178533972">"Excluir mensagem de voz"</string>
-    <string name="snackbar_voicemail_deleted" msgid="7463166543725496307">"Correio de voz excluído"</string>
-    <string name="snackbar_voicemail_deleted_undo" msgid="6959743982796409941">"DESFAZER"</string>
-    <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"Limpar histórico de chamadas?"</string>
-    <string name="clearCallLogConfirmation" msgid="6844949465815109166">"Esta ação excluirá todas as chamadas do seu histórico"</string>
-    <string name="clearCallLogProgress_title" msgid="995004835687361977">"Limpando histórico de chamadas…"</string>
-    <string name="notification_missedCallTitle" msgid="8283366068539898486">"Chamada perdida"</string>
-    <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"Chamada de trabalho perdida"</string>
-    <string name="notification_missedCallsTitle" msgid="3697442015345089802">"Chamadas perdidas"</string>
-    <string name="notification_missedCallsMsg" msgid="8176217633929018706">"<xliff:g id="NUM_MISSED_CALLS">%d</xliff:g> chamadas perdidas"</string>
-    <string name="notification_missedCall_call_back" msgid="3875698110051973965">"Retornar chamada"</string>
-    <string name="notification_missedCall_message" msgid="5086910028988305964">"Mensagem"</string>
-    <string name="post_call_notification_message" msgid="5417476789860590611">"<xliff:g id="NAME">%1$s</xliff:g>: <xliff:g id="MESSAGE">%2$s</xliff:g>"</string>
-    <string name="notification_voicemail_text_format" msgid="1895667520930252897">"Discar <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
-    <string name="notification_voicemail_no_vm_number" msgid="8942821987929495842">"Número do correio de voz desconhecido"</string>
-    <plurals name="notification_voicemail_title" formatted="false" msgid="1551847434476438657">
-      <item quantity="one"> <xliff:g id="COUNT">%1$d</xliff:g> Correios de voz </item>
-      <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> Correios de voz </item>
-    </plurals>
-    <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
-    <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"Nova mensagem de voz de <xliff:g id="CALLER">%1$s</xliff:g>"</string>
-    <string name="voicemail_playback_error" msgid="4384373852257757295">"Não foi possível repr. correio de voz"</string>
-    <string name="voicemail_fetching_content" msgid="572320120918636014">"Carregando correio de voz..."</string>
-    <string name="voicemail_fetching_timout" msgid="2128873915839949783">"Não foi possível carregar correio de voz"</string>
-    <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_playback_speakerphone" msgid="4852027754869750227">"Ligar ou desligar o viva-voz"</string>
-    <string name="description_playback_seek" msgid="1340910573254132520">"Procurar posição de reprodução"</string>
-    <string name="action_menu_call_history_description" msgid="8829135306925008546">"Histórico de chamadas"</string>
-    <string name="action_menu_overflow_description" msgid="7648679686746517341">"Mais opções"</string>
-    <string name="action_menu_dialpad_button" msgid="1970631633457493180">"Teclado"</string>
-    <string name="dialer_settings_label" msgid="4980176284150290175">"Configurações"</string>
-    <string name="simulator_submenu_label" msgid="186156287346615267">"Simulador"</string>
-    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Criar atalho para a nova IU"</string>
-    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"Entrando no modo de ação em massa"</string>
-    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"Saindo do modo de ação em massa"</string>
-    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> selecionado"</string>
-    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> não selecionado"</string>
-    <string name="description_contact_details" msgid="3341280873855253464">"Detalhes de contato para <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_spam_contact_details" msgid="5592578752881528368">"Detalhes do contato do autor da chamada suspeito de spam <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> chamadas."</string>
-    <string name="description_video_call" msgid="3738199365585751727">"Videochamada."</string>
-    <string name="description_start_voice_search" msgid="8380022725973015261">"Iniciar pesquisa por voz"</string>
-    <string name="voicemail" msgid="8899540969000957954">"Correio de voz"</string>
-    <string name="description_cancel_multi_select" msgid="3930475950253360461">"Cancelar modo de ações em lote"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Excluir"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Cancelar"</string>
-    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"Itens selecionados: <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
-      <item quantity="one">"<b>"Excluir este correio de voz? "</b>"</item>
-      <item quantity="other">"<b>"Excluir estes correios de voz? "</b>"</item>
-    </plurals>
-    <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
-    <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> às <xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
-    <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="voice_search_not_available" msgid="6546240433719732905">"A pesquisa por voz não está disponível"</string>
-    <string name="dialer_hint_find_contact" msgid="2023214799381149808">"Pesquisar contatos"</string>
-    <string name="block_number_search_hint" msgid="5377706079015099416">"Adicionar número ou pesquisar contatos"</string>
-    <string name="call_log_all_empty" msgid="3955572868518162004">"Seu histórico de chamadas está vazio"</string>
-    <string name="call_log_all_empty_action" msgid="852218280136243014">"Fazer uma chamada"</string>
-    <string name="call_log_missed_empty" msgid="7094936030845062214">"Você não tem chamadas perdidas."</string>
-    <string name="call_log_voicemail_empty" msgid="273623903423275178">"Sua caixa de entrada de correio de voz está vazia."</string>
-    <string name="call_log_activity_title" msgid="1275242727244945527">"Histórico de chamadas"</string>
-    <string name="call_log_all_title" msgid="6042262422192020327">"Todas"</string>
-    <string name="call_log_missed_title" msgid="17254005889268015">"Perdidas"</string>
-    <string name="tab_speed_dial" msgid="6616404752227561075">"Discagem rápida"</string>
-    <string name="tab_history" msgid="7420269368689503596">"Histórico de chamadas"</string>
-    <string name="tab_all_contacts" msgid="5531733977693943015">"Contatos"</string>
-    <string name="tab_voicemail" msgid="2458548090088316246">"Correio de voz"</string>
-    <string name="search_shortcut_call_number" msgid="8847918845036880688">"Ligar para <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"Criar novo contato"</string>
-    <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"Adicionar a um contato"</string>
-    <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"Enviar SMS"</string>
-    <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"Fazer videochamada"</string>
-    <string name="search_shortcut_block_number" msgid="4587283230665805776">"Bloquear número"</string>
-    <string name="speed_dial_empty" msgid="3346406399966039505">"Ainda não há ninguém na sua discagem rápida"</string>
-    <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"Adicionar favorito"</string>
-    <string name="remove_contact" msgid="2353580570488923668">"Remover"</string>
-    <string name="select_all" msgid="408601760696146245">"Selecionar tudo"</string>
-    <string name="call_log_action_video_call" msgid="7565549950343850819">"Videochamada"</string>
-    <string name="call_log_action_send_message" msgid="6948727362660115554">"Enviar uma mensagem"</string>
-    <string name="call_log_action_details" msgid="2091370737371449501">"Detalhes da chamada"</string>
-    <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"Enviar para…"</string>
-    <string name="call_log_action_call" msgid="682724094251540583">"Ligar para <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_incoming_missed_call" msgid="8292535799379230029">"Chamada perdida de <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_incoming_answered_call" msgid="3920182963103160610">"Chamada atendida de <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_unread_voicemail" msgid="145170985013419170">"Correio de voz não lido de <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_read_voicemail" msgid="5585559881573227732">"Correio de voz de <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_outgoing_call" msgid="543952487882919924">"Chamada para <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="call_log_via_number" msgid="1340307109806397650">"por <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> por <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="description_call_action" msgid="4042796498169106545">"Ligar para <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_video_call_action" msgid="1237090968588659650">"Videochamada <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
-    <string name="description_voicemail_action" msgid="3290143432403538524">"Ouvir mensagem de voz de <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_create_new_contact_action" msgid="1928282350281564130">"Criar contato para <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"Adicionar <xliff:g id="NAMEORNUMBER">^1</xliff:g> a um contato já existente"</string>
-    <string name="description_details_action" msgid="2061866409737706174">"Detalhes de chamada para <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="call_log_header_today" msgid="1576119097475845293">"Hoje"</string>
-    <string name="call_log_header_yesterday" msgid="5616077776205329563">"Ontem"</string>
-    <string name="call_log_header_other" msgid="4940676886254217644">"Antiga"</string>
-    <string name="voicemail_speaker_on" msgid="3151333608926996668">"Ative o alto-falante."</string>
-    <string name="voicemail_speaker_off" msgid="2530064206962034201">"Desative o alto-falante."</string>
-    <string name="voicemail_play_start_pause" msgid="3874823480278334664">"Inicie ou pause a reprodução."</string>
-    <string name="display_options_title" msgid="3880091801055797975">"Opções de exibição"</string>
-    <string name="sounds_and_vibration_title" msgid="3075050000721181384">"Sons e vibração"</string>
-    <string name="accessibility_settings_title" msgid="3329027650429831820">"Acessibilidade"</string>
-    <string name="ringtone_title" msgid="8377174189894648486">"Toque do telefone"</string>
-    <string name="vibrate_on_ring_title" msgid="631441314790960485">"Também vibrar para chamadas"</string>
-    <string name="dtmf_tone_enable_title" msgid="3273762431523939277">"Tons do teclado"</string>
-    <string name="dtmf_tone_length_title" msgid="534096029202438539">"Duração do tom do teclado"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="applicationLabel">Telefone</string>
+  <string name="launcherDialpadActivityLabel">Teclado do smartphone</string>
+  <string name="callHistoryIconLabel">Histórico de chamadas</string>
+  <string name="action_copy_number_text">Copiar número</string>
+  <string name="copy_transcript_text">Copiar transcrição</string>
+  <string name="action_edit_number_before_call">Editar número antes de chamar</string>
+  <string name="call_log_delete_all">Limpar histórico de chamadas</string>
+  <string name="call_log_trash_voicemail">Excluir correio de voz</string>
+  <string name="snackbar_voicemail_deleted">Correio de voz excluído</string>
+  <string name="clearCallLogConfirmation_title">Limpar histórico de chamadas?</string>
+  <string name="clearCallLogConfirmation">Esta ação excluirá todas as chamadas do seu histórico</string>
+  <string name="clearCallLogProgress_title">Limpando histórico de chamadas…</string>
+  <string name="notification_missedCallTitle">Chamada perdida</string>
+  <string name="notification_missedWorkCallTitle">Chamada de trabalho perdida</string>
+  <string name="notification_missedCallsTitle">Chamadas perdidas</string>
+  <string name="notification_missedCallsMsg">%d chamadas perdidas</string>
+  <string name="notification_missedCall_call_back">Retornar chamada</string>
+  <string name="notification_missedCall_message">Mensagem</string>
+  <string name="post_call_notification_message">%1$s: %2$s</string>
+  <string name="notification_voicemail_text_format">Discar %s</string>
+  <string name="notification_voicemail_no_vm_number">Número do correio de voz desconhecido</string>
+  <plurals name="notification_voicemail_title">
+    <item quantity="one"> %1$d Correio de voz </item>
+    <item quantity="other"> %1$d Correios de voz </item>
+  </plurals>
+  <string name="notification_voicemail_callers_list">%1$s, %2$s</string>
+  <string name="notification_new_voicemail_ticker">Novo correio de voz de %1$s</string>
+  <string name="voicemail_playback_error">Não foi possível repr. correio de voz</string>
+  <string name="voicemail_fetching_content">Carregando correio de voz...</string>
+  <string name="voicemail_fetching_timout">Não foi possível carregar correio de voz</string>
+  <string name="call_log_item_count_and_date">(%1$d) %2$s</string>
+  <string name="description_playback_speakerphone">Ligar ou desligar o viva-voz</string>
+  <string name="description_playback_seek">Procurar posição de reprodução</string>
+  <string name="action_menu_call_history_description">Histórico de chamadas</string>
+  <string msgid="2295659037509008453" name="action_menu_overflow_description">Mais opções</string>
+  <string name="action_menu_dialpad_button">Teclado</string>
+  <string name="dialer_settings_label">Configurações</string>
+  <string name="simulator_submenu_label">Simulador</string>
+  <string name="new_ui_launcher_shortcut_label">Criar atalho para a nova IU</string>
+  <string name="description_entering_bulk_action_mode">Entrando no modo de ação em massa</string>
+  <string name="description_leaving_bulk_action_mode">Saindo do modo de ação em massa</string>
+  <string name="description_selecting_bulk_action_mode">%1$s selecionado</string>
+  <string name="description_unselecting_bulk_action_mode">%1$s não selecionado</string>
+  <string name="description_contact_details">Detalhes de contato para %1$s</string>
+  <string name="description_spam_contact_details">Detalhes do contato do autor da chamada suspeito de spam %1$s</string>
+  <string name="description_num_calls">%1$s chamadas.</string>
+  <string name="description_video_call">Videochamada.</string>
+  <string name="description_start_voice_search">Iniciar pesquisa por voz</string>
+  <string name="voicemail">Correio de voz</string>
+  <string name="description_cancel_multi_select">Cancelar modo de ações em lote</string>
+  <string name="voicemailMultiSelectDeleteConfirm">Excluir</string>
+  <string name="voicemailMultiSelectDeleteCancel">Cancelar</string>
+  <string name="voicemailMultiSelectActionBarTitle">Itens selecionados: %1$s</string>
+  <plurals name="delete_voicemails_confirmation_dialog_title">
+    <item quantity="one"><b>Excluir este correio de voz? </b></item>
+    <item quantity="other"><b>Excluir estes correios de voz? </b></item>
+  </plurals>
+  <string name="voicemailCallLogToday">@string/call_log_header_today</string>
+  <string name="voicemailCallLogDateTimeFormat">%1$s às %2$s</string>
+  <string name="voicemailDurationFormat">%1$02d:%2$02d</string>
+  <string name="voicemailCallLogDateTimeFormatWithDuration">%1$s • %2$s</string>
+  <string name="voice_search_not_available">A pesquisa por voz não está disponível</string>
+  <string name="dialer_hint_find_contact">Pesquisar contatos</string>
+  <string name="block_number_search_hint">Adicionar número ou pesquisar contatos</string>
+  <string name="call_log_all_empty">Seu histórico de chamadas está vazio</string>
+  <string name="call_log_all_empty_action">Fazer uma chamada</string>
+  <string name="call_log_missed_empty">Você não tem chamadas perdidas.</string>
+  <string name="call_log_voicemail_empty">Sua caixa de entrada de correio de voz está vazia.</string>
+  <string name="call_log_activity_title">Histórico de chamadas</string>
+  <string name="call_log_all_title">Todas</string>
+  <string name="call_log_missed_title">Perdidas</string>
+  <string name="tab_speed_dial">Discagem rápida</string>
+  <string name="tab_history">Histórico de chamadas</string>
+  <string name="tab_all_contacts">Contatos</string>
+  <string name="tab_voicemail">Correio de voz</string>
+  <string name="search_shortcut_call_number">Ligar para %s</string>
+  <string name="search_shortcut_create_new_contact">Criar novo contato</string>
+  <string name="search_shortcut_add_to_contact">Adicionar a um contato</string>
+  <string name="search_shortcut_send_sms_message">Enviar SMS</string>
+  <string name="search_shortcut_make_video_call">Fazer videochamada</string>
+  <string name="search_shortcut_block_number">Bloquear número</string>
+  <string name="speed_dial_empty">Ainda não há ninguém na sua discagem rápida</string>
+  <string name="speed_dial_empty_add_favorite_action">Adicionar favorito</string>
+  <string name="remove_contact">Remover</string>
+  <string name="select_all">Selecionar tudo</string>
+  <string name="call_log_action_video_call">Videochamada</string>
+  <string name="call_log_action_set_up_video">Configurar videochamada</string>
+  <string name="call_log_action_invite_video">Convidar para videochamada</string>
+  <string name="call_log_action_send_message">Enviar uma mensagem</string>
+  <string name="call_log_action_details">Detalhes da chamada</string>
+  <string name="call_log_action_share_voicemail">Enviar para…</string>
+  <string name="call_log_action_call">Ligar para ^1</string>
+  <string name="description_incoming_missed_call">Chamada perdida de ^1, ^2, ^3, ^4.</string>
+  <string name="description_incoming_answered_call">Chamada atendida de ^1, ^2, ^3, ^4.</string>
+  <string name="description_unread_voicemail">Correio de voz não lido de ^1, ^2, ^3, ^4.</string>
+  <string name="description_read_voicemail">Correio de voz de ^1, ^2, ^3, ^4.</string>
+  <string name="description_outgoing_call">Chamada para ^1, ^2, ^3, ^4.</string>
+  <string name="call_log_via_number">por %1$s</string>
+  <string name="call_log_via_number_phone_account">%1$s por %2$s</string>
+  <string name="description_call_action">Ligar para ^1</string>
+  <string name="description_video_call_action">Videochamada ^1.</string>
+  <string name="description_voicemail_action">Ouvir correio de voz de ^1</string>
+  <string name="description_create_new_contact_action">Criar contato para ^1</string>
+  <string name="description_add_to_existing_contact_action">Adicionar ^1 a um contato já existente</string>
+  <string name="description_details_action">Detalhes de chamada para ^1</string>
+  <string name="call_log_header_today">Hoje</string>
+  <string name="call_log_header_yesterday">Ontem</string>
+  <string name="call_log_header_other">Antiga</string>
+  <string name="voicemail_speaker_on">Ative o alto-falante.</string>
+  <string name="voicemail_speaker_off">Desative o alto-falante.</string>
+  <string name="voicemail_play_start_pause">Inicie ou pause a reprodução.</string>
+  <string name="display_options_title">Opções de exibição</string>
+  <string name="sounds_and_vibration_title">Sons e vibração</string>
+  <string name="accessibility_settings_title">Acessibilidade</string>
+  <string name="ringtone_title">Toque do telefone</string>
+  <string name="vibrate_on_ring_title">Também vibrar para chamadas</string>
+  <string name="dtmf_tone_enable_title">Tons do teclado</string>
+  <string name="dtmf_tone_length_title">Duração do tom do teclado</string>
   <string-array name="dtmf_tone_length_entries">
-    <item msgid="3136353015227162823">"Normais"</item>
-    <item msgid="5376841175538523822">"Longo"</item>
+    <item>Normais</item>
+    <item>Longo</item>
   </string-array>
-    <string name="respond_via_sms_setting_title" msgid="8008181606657693452">"Respostas rápidas"</string>
-    <string name="call_settings_label" msgid="7824611757200960807">"Chamadas"</string>
-    <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Bloqueio de chamadas"</string>
-    <string name="voicemail_settings_label" msgid="4594299554519920570">"Correio de voz"</string>
-    <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Bloqueio de chamadas temporiamente desativado"</string>
-    <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"O bloqueio de chamadas foi desativado porque você entrou em contato com serviços de emergência usando este telefone nas últimas 48 horas. Ele será reativado automaticamente depois de um período de 48 horas."</string>
-    <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Importar números"</string>
-    <string name="blocked_call_settings_import_description" msgid="1819412052545228965">"Anteriormente, você marcou alguns autores de chamada para serem enviados automaticamente para o correio de voz por meio de outros apps."</string>
-    <string name="blocked_call_settings_view_numbers_button" msgid="3332727948554356704">"Ver números"</string>
-    <string name="blocked_call_settings_import_button" msgid="7319111700387470727">"Importar"</string>
-    <string name="description_blocked_number_list_delete" msgid="2139644216858370740">"Desbloquear número"</string>
-    <string name="addBlockedNumber" msgid="3053473735238295551">"Adicionar número"</string>
-    <string name="block_number_footer_message_vvm" msgid="7955326304033982368">"Chamadas a partir destes números serão bloqueadas. Correios de voz serão excluídos automaticamente."</string>
-    <string name="block_number_footer_message_no_vvm" msgid="1152684139070471665">"Chamadas feitas a partir destes números serão bloqueadas, mas é possível que eles ainda consigam deixar correios de voz para você."</string>
-    <string name="block_list" msgid="4701585783411870782">"Números bloqueados"</string>
-    <string name="alreadyBlocked" msgid="5483253180532475653">"O número <xliff:g id="NUMBER">%1$s</xliff:g> já está bloqueado."</string>
-    <string name="phone_account_settings_label" msgid="8372485478006965920">"Contas de chamadas"</string>
-    <string name="permission_no_speeddial" msgid="8487215628510596753">"Para ativar a discagem rápida, ative a permissão para o app Contatos."</string>
-    <string name="permission_no_calllog" msgid="4053705651238775784">"Para ver seu registro de chamadas, ative a permissão para o app Telefone."</string>
-    <string name="permission_no_search" msgid="2424710404207193826">"Para pesquisar seus contatos, ative as permissões para \"Contatos\"."</string>
-    <string name="permission_place_call" msgid="8686908130349369423">"Para fazer uma chamada, ative a permissão para o app Telefone."</string>
-    <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"O app Telefone não tem permissão para gravar nas configurações do sistema."</string>
-    <string name="blocked_number_call_log_label" msgid="4212282846299997693">"Bloqueado"</string>
-    <string name="call_log_action_block_report_number" msgid="7302636538668696729">"Bloquear/denunciar spam"</string>
-    <string name="call_log_action_block_number" msgid="5048188386501998865">"Bloquear número"</string>
-    <string name="call_log_action_remove_spam" msgid="2045319806318398403">"Não é spam"</string>
-    <string name="call_log_action_unblock_number" msgid="6100117033288448758">"Desbloquear número"</string>
-    <string name="spam_number_call_log_label" msgid="2678431398326811131">"Spam"</string>
-    <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> está off-line e não é possível entrar em contato"</string>
-    <string name="about_phone_label" msgid="582991354677973731">"Sobre"</string>
-    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Transcrito pelo Google"</string>
-    <string name="voicemail_transcription_in_progress" msgid="2933320969613783210">"O Google está transcrevendo..."</string>
-    <string name="voicemail_transcription_failed" msgid="335275303117412706">"Transcrição indisponível."</string>
-    <string name="voicemail_transcription_failed_language_not_supported" msgid="4210332591050562553">"Transcrição indisponível: o idioma é incompatível."</string>
-    <string name="voicemail_transcription_failed_no_speech" msgid="9093372879697874852">"Transcrição indisponível: nenhuma voz foi detectada."</string>
-    <string name="view_conversation" msgid="7895904782094119702">"Ver"</string>
-    <string name="ec_data_deleted" msgid="4794880345545827107">"A chamada foi excluída. Veja e exclua os anexos compartilhados durante a chamada no Mensagens."</string>
-    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"As chamadas foram excluídas. Veja e exclua os anexos compartilhados durante as chamadas no Mensagens."</string>
+  <string name="respond_via_sms_setting_title">Respostas rápidas</string>
+  <string name="call_settings_label">Chamadas</string>
+  <string name="manage_blocked_numbers_label">Números bloqueados</string>
+  <string name="voicemail_settings_label">Correio de voz</string>
+  <string name="blocked_numbers_disabled_emergency_header_label">Bloqueio de chamadas temporiamente desativado</string>
+  <string name="blocked_numbers_disabled_emergency_desc">O bloqueio de chamadas foi desativado porque você entrou em contato com serviços de emergência usando este telefone nas últimas 48 horas. Ele será reativado automaticamente depois de um período de 48 horas.</string>
+  <string name="import_send_to_voicemail_numbers_label">Importar números</string>
+  <string name="blocked_call_settings_import_description">Anteriormente, você marcou alguns autores de chamada para serem enviados automaticamente para o correio de voz por meio de outros apps.</string>
+  <string name="blocked_call_settings_view_numbers_button">Ver números</string>
+  <string name="blocked_call_settings_import_button">Importar</string>
+  <string name="description_blocked_number_list_delete">Desbloquear número</string>
+  <string name="addBlockedNumber">Adicionar número</string>
+  <string name="block_number_footer_message_vvm">Chamadas a partir destes números serão bloqueadas. Correios de voz serão excluídos automaticamente.</string>
+  <string name="block_number_footer_message_no_vvm">Chamadas feitas a partir destes números serão bloqueadas, mas é possível que eles ainda consigam deixar correios de voz para você.</string>
+  <string name="block_list">Números bloqueados</string>
+  <string name="alreadyBlocked">O número %1$s já está bloqueado.</string>
+  <string name="phone_account_settings_label">Contas de chamadas</string>
+  <string name="permission_no_speeddial">Para ativar a discagem rápida, ative a permissão para o app Contatos.</string>
+  <string name="permission_no_calllog">Para ver seu registro de chamadas, ative a permissão para o app Telefone.</string>
+  <string name="permission_no_search">Para pesquisar seus contatos, ative as permissões para \"Contatos\".</string>
+  <string name="permission_place_call">Para fazer uma chamada, ative a permissão para o app Telefone.</string>
+  <string name="toast_cannot_write_system_settings">O app Telefone não tem permissão para gravar nas configurações do sistema.</string>
+  <string name="blocked_number_call_log_label">Bloqueado</string>
+  <string name="call_log_action_block_report_number">Bloquear/denunciar spam</string>
+  <string name="call_log_action_block_number">Bloquear número</string>
+  <string name="call_log_action_remove_spam">Não é spam</string>
+  <string name="call_log_action_unblock_number">Desbloquear número</string>
+  <string name="spam_number_call_log_label">Spam</string>
+  <string name="call_composer_connection_failed">%1$s está off-line e não é possível entrar em contato</string>
+  <string name="about_phone_label">Sobre</string>
+  <string name="voicemail_transcription_branding_text">Transcrito pelo Google</string>
+  <string name="voicemail_transcription_in_progress">Transcrevendo…</string>
+  <string name="voicemail_transcription_failed">Transcrição indisponível.</string>
+  <string name="voicemail_transcription_failed_language_not_supported">Transcrição indisponível: o idioma é incompatível.</string>
+  <string name="voicemail_transcription_failed_no_speech">Transcrição indisponível: nenhuma voz foi detectada.</string>
+  <string name="voicemail_donation_promo_title">Ajudar a tornar a transcrição mais precisa?</string>
+  <string name="voicemail_donation_promo_content">Permita que o Google analise esta e as próximas mensagens do correio de voz usando as transcrições. As mensagens serão armazenadas anonimamente. Altere as configurações a qualquer momento. %1$s</string>
+  <string name="voicemail_donation_promo_opt_in">Sim</string>
+  <string name="voicemail_donation_promo_opt_out">Não</string>
+  <string name="voicemail_transcription_rating">Avaliar transcrição</string>
+  <string name="voicemail_transcription_rating_thanks">Agradecemos seu feedback</string>
+  <string name="description_rating_good">Marcar como \"Gostei\"</string>
+  <string name="description_rating_bad">Marcar como \"Não gostei\"</string>
+  <string name="view_conversation">Ver</string>
+  <string name="ec_data_deleted">A chamada foi excluída. Veja e exclua os anexos compartilhados durante a chamada no Mensagens.</string>
+  <string name="multiple_ec_data_deleted">As chamadas foram excluídas. Veja e exclua os anexos compartilhados durante as chamadas no Mensagens.</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-ro/strings.xml b/java/com/android/dialer/app/res/values-ro/strings.xml
index 6df3f54..c8125a1 100644
--- a/java/com/android/dialer/app/res/values-ro/strings.xml
+++ b/java/com/android/dialer/app/res/values-ro/strings.xml
@@ -1,181 +1,173 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="applicationLabel" msgid="2202739481132958990">"Telefon"</string>
-    <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"Tastatura telefonului"</string>
-    <string name="callHistoryIconLabel" msgid="7493268743411968630">"Istoricul apelurilor"</string>
-    <string name="action_copy_number_text" msgid="832682558551502319">"Copiați numărul"</string>
-    <string name="copy_transcript_text" msgid="937904189017310829">"Copiați transcrierea"</string>
-    <string name="action_edit_number_before_call" msgid="8017492815878473837">"Modificați numărul înainte de apelare"</string>
-    <string name="call_log_delete_all" msgid="7852970926906523784">"Ștergeți istoricul apelurilor"</string>
-    <string name="call_log_trash_voicemail" msgid="6118493534178533972">"Ștergeți mesajul vocal"</string>
-    <string name="snackbar_voicemail_deleted" msgid="7463166543725496307">"Mesaj vocal șters"</string>
-    <string name="snackbar_voicemail_deleted_undo" msgid="6959743982796409941">"ANULAȚI"</string>
-    <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"Ștergeți istoricul apelurilor?"</string>
-    <string name="clearCallLogConfirmation" msgid="6844949465815109166">"Vor fi șterse toate apelurile din istoric"</string>
-    <string name="clearCallLogProgress_title" msgid="995004835687361977">"Se șterge istoricul apelurilor…"</string>
-    <string name="notification_missedCallTitle" msgid="8283366068539898486">"Apel nepreluat"</string>
-    <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"Apel de serviciu nepreluat"</string>
-    <string name="notification_missedCallsTitle" msgid="3697442015345089802">"Apeluri nepreluate"</string>
-    <string name="notification_missedCallsMsg" msgid="8176217633929018706">"<xliff:g id="NUM_MISSED_CALLS">%d</xliff:g> apeluri nepreluate"</string>
-    <string name="notification_missedCall_call_back" msgid="3875698110051973965">"Sunați"</string>
-    <string name="notification_missedCall_message" msgid="5086910028988305964">"Trimiteți mesaj"</string>
-    <string name="post_call_notification_message" msgid="5417476789860590611">"<xliff:g id="NAME">%1$s</xliff:g>: <xliff:g id="MESSAGE">%2$s</xliff:g>"</string>
-    <string name="notification_voicemail_text_format" msgid="1895667520930252897">"Apelați <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
-    <string name="notification_voicemail_no_vm_number" msgid="8942821987929495842">"Numărul mesageriei vocale necunoscut"</string>
-    <plurals name="notification_voicemail_title" formatted="false" msgid="1551847434476438657">
-      <item quantity="few"> <xliff:g id="COUNT">%1$d</xliff:g> mesaje vocale </item>
-      <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> de mesaje vocale </item>
-      <item quantity="one">Mesaj vocal</item>
-    </plurals>
-    <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
-    <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"Mesaj vocal nou de la <xliff:g id="CALLER">%1$s</xliff:g>"</string>
-    <string name="voicemail_playback_error" msgid="4384373852257757295">"Nu s-a putut reda mesageria vocală"</string>
-    <string name="voicemail_fetching_content" msgid="572320120918636014">"Se încarcă mesageria vocală…"</string>
-    <string name="voicemail_fetching_timout" msgid="2128873915839949783">"Nu s-a putut încărca mesageria vocală"</string>
-    <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_playback_speakerphone" msgid="4852027754869750227">"Activați sau dezactivați difuzorul"</string>
-    <string name="description_playback_seek" msgid="1340910573254132520">"Căutați poziția de redare"</string>
-    <string name="action_menu_call_history_description" msgid="8829135306925008546">"Istoricul apelurilor"</string>
-    <string name="action_menu_overflow_description" msgid="7648679686746517341">"Mai multe opțiuni"</string>
-    <string name="action_menu_dialpad_button" msgid="1970631633457493180">"tastatură"</string>
-    <string name="dialer_settings_label" msgid="4980176284150290175">"Setări"</string>
-    <string name="simulator_submenu_label" msgid="186156287346615267">"Simulator"</string>
-    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Creați comandă rapidă IU nouă"</string>
-    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"Se intră în modul acțiune în bloc"</string>
-    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"Ați ieșit din modul acțiune în bloc"</string>
-    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"S-a selectat <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"S-a deselectat <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_contact_details" msgid="3341280873855253464">"Detalii de contact pentru <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_spam_contact_details" msgid="5592578752881528368">"Detalii de contact pentru apelantul suspectat de spam <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> (de) apeluri."</string>
-    <string name="description_video_call" msgid="3738199365585751727">"Apel video."</string>
-    <string name="description_start_voice_search" msgid="8380022725973015261">"Începeți căutarea vocală"</string>
-    <string name="voicemail" msgid="8899540969000957954">"Mesagerie vocală"</string>
-    <string name="description_cancel_multi_select" msgid="3930475950253360461">"Anulați modul de acțiuni în lot"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Ștergeți"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Anulați"</string>
-    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> selectate"</string>
-    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
-      <item quantity="few">"<b>"Ștergeți aceste mesaje vocale? "</b>"</item>
-      <item quantity="other">"<b>"Ștergeți aceste mesaje vocale? "</b>"</item>
-      <item quantity="one">"<b>"Ștergeți acest mesaj vocal? "</b>"</item>
-    </plurals>
-    <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
-    <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> la <xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
-    <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="voice_search_not_available" msgid="6546240433719732905">"Căutarea vocală nu este disponibilă"</string>
-    <string name="dialer_hint_find_contact" msgid="2023214799381149808">"Căutați în Agendă"</string>
-    <string name="block_number_search_hint" msgid="5377706079015099416">"Adăugați număr/căutați contacte"</string>
-    <string name="call_log_all_empty" msgid="3955572868518162004">"Istoricul apelurilor este gol"</string>
-    <string name="call_log_all_empty_action" msgid="852218280136243014">"Apelați"</string>
-    <string name="call_log_missed_empty" msgid="7094936030845062214">"Nu aveți niciun apel nepreluat."</string>
-    <string name="call_log_voicemail_empty" msgid="273623903423275178">"Nu există mesaje primite în mesageria vocală."</string>
-    <string name="call_log_activity_title" msgid="1275242727244945527">"Istoricul apelurilor"</string>
-    <string name="call_log_all_title" msgid="6042262422192020327">"Toate"</string>
-    <string name="call_log_missed_title" msgid="17254005889268015">"Nepreluate"</string>
-    <string name="tab_speed_dial" msgid="6616404752227561075">"Apelare rapidă"</string>
-    <string name="tab_history" msgid="7420269368689503596">"Istoricul apelurilor"</string>
-    <string name="tab_all_contacts" msgid="5531733977693943015">"Agendă"</string>
-    <string name="tab_voicemail" msgid="2458548090088316246">"Mesagerie vocală"</string>
-    <string name="search_shortcut_call_number" msgid="8847918845036880688">"Apelați <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"Creați o intrare nouă"</string>
-    <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"Adăugați la o intrare"</string>
-    <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"Trimiteți SMS"</string>
-    <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"Inițiați un apel video"</string>
-    <string name="search_shortcut_block_number" msgid="4587283230665805776">"Blocați numărul"</string>
-    <string name="speed_dial_empty" msgid="3346406399966039505">"Nicio persoană de contact setată pentru apelarea rapidă"</string>
-    <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"Adăugați o persoană de contact preferată"</string>
-    <string name="remove_contact" msgid="2353580570488923668">"Eliminați"</string>
-    <string name="select_all" msgid="408601760696146245">"Selectați tot"</string>
-    <string name="call_log_action_video_call" msgid="7565549950343850819">"Apel video"</string>
-    <string name="call_log_action_send_message" msgid="6948727362660115554">"Trimiteți un mesaj"</string>
-    <string name="call_log_action_details" msgid="2091370737371449501">"Detaliile apelului"</string>
-    <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"Trimiteți către …"</string>
-    <string name="call_log_action_call" msgid="682724094251540583">"Apelați <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_incoming_missed_call" msgid="8292535799379230029">"Apel nepreluat de la <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_incoming_answered_call" msgid="3920182963103160610">"Apel preluat de la <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_unread_voicemail" msgid="145170985013419170">"Mesaj vocal necitit de la <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_read_voicemail" msgid="5585559881573227732">"Mesaj vocal de la <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_outgoing_call" msgid="543952487882919924">"Apel către <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="call_log_via_number" msgid="1340307109806397650">"prin <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> prin <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="description_call_action" msgid="4042796498169106545">"Apelați <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_video_call_action" msgid="1237090968588659650">"Apelați video <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
-    <string name="description_voicemail_action" msgid="3290143432403538524">"Ascultați mesajul vocal de la <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_create_new_contact_action" msgid="1928282350281564130">"Creați o persoană de contact pentru <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"Adăugați <xliff:g id="NAMEORNUMBER">^1</xliff:g> la o persoană de contact existentă"</string>
-    <string name="description_details_action" msgid="2061866409737706174">"Detaliile apelului pentru <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="call_log_header_today" msgid="1576119097475845293">"Astăzi"</string>
-    <string name="call_log_header_yesterday" msgid="5616077776205329563">"Ieri"</string>
-    <string name="call_log_header_other" msgid="4940676886254217644">"Mai vechi"</string>
-    <string name="voicemail_speaker_on" msgid="3151333608926996668">"Porniți difuzorul."</string>
-    <string name="voicemail_speaker_off" msgid="2530064206962034201">"Opriți difuzorul."</string>
-    <string name="voicemail_play_start_pause" msgid="3874823480278334664">"Porniți sau întrerupeți redarea."</string>
-    <string name="display_options_title" msgid="3880091801055797975">"Opțiuni de afișare"</string>
-    <string name="sounds_and_vibration_title" msgid="3075050000721181384">"Sunete și vibrații"</string>
-    <string name="accessibility_settings_title" msgid="3329027650429831820">"Accesibilitate"</string>
-    <string name="ringtone_title" msgid="8377174189894648486">"Ton de sonerie al telefonului"</string>
-    <string name="vibrate_on_ring_title" msgid="631441314790960485">"Vibrează și pentru apeluri"</string>
-    <string name="dtmf_tone_enable_title" msgid="3273762431523939277">"Tonuri ale tastaturii"</string>
-    <string name="dtmf_tone_length_title" msgid="534096029202438539">"Durată a tonului tastaturii"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="applicationLabel">Telefon</string>
+  <string name="launcherDialpadActivityLabel">Tastatura telefonului</string>
+  <string name="callHistoryIconLabel">Istoricul apelurilor</string>
+  <string name="action_copy_number_text">Copiați numărul</string>
+  <string name="copy_transcript_text">Copiați transcrierea</string>
+  <string name="action_edit_number_before_call">Modificați numărul înainte de apelare</string>
+  <string name="call_log_delete_all">Ștergeți istoricul apelurilor</string>
+  <string name="call_log_trash_voicemail">Ștergeți mesajul vocal</string>
+  <string name="snackbar_voicemail_deleted">Mesaj vocal șters</string>
+  <string name="clearCallLogConfirmation_title">Ștergeți istoricul apelurilor?</string>
+  <string name="clearCallLogConfirmation">Vor fi șterse toate apelurile din istoric</string>
+  <string name="clearCallLogProgress_title">Se șterge istoricul apelurilor…</string>
+  <string name="notification_missedCallTitle">Apel nepreluat</string>
+  <string name="notification_missedWorkCallTitle">Apel de serviciu nepreluat</string>
+  <string name="notification_missedCallsTitle">Apeluri nepreluate</string>
+  <string name="notification_missedCallsMsg">%d apeluri nepreluate</string>
+  <string name="notification_missedCall_call_back">Sunați</string>
+  <string name="notification_missedCall_message">Trimiteți mesaj</string>
+  <string name="post_call_notification_message">%1$s: %2$s</string>
+  <string name="notification_voicemail_text_format">Apelați %s</string>
+  <string name="notification_voicemail_no_vm_number">Numărul mesageriei vocale necunoscut</string>
+  <plurals name="notification_voicemail_title">
+    <item quantity="one">Mesaj vocal</item>
+    <item quantity="few"> %1$d mesaje vocale </item>
+    <item quantity="other"> %1$d de mesaje vocale </item>
+  </plurals>
+  <string name="notification_voicemail_callers_list">%1$s, %2$s</string>
+  <string name="notification_new_voicemail_ticker">Mesaj vocal nou de la %1$s</string>
+  <string name="voicemail_playback_error">Nu s-a putut reda mesageria vocală</string>
+  <string name="voicemail_fetching_content">Se încarcă mesageria vocală…</string>
+  <string name="voicemail_fetching_timout">Nu s-a putut încărca mesageria vocală</string>
+  <string name="call_log_item_count_and_date">(%1$d) %2$s</string>
+  <string name="description_playback_speakerphone">Activați sau dezactivați difuzorul</string>
+  <string name="description_playback_seek">Căutați poziția de redare</string>
+  <string name="action_menu_call_history_description">Istoricul apelurilor</string>
+  <string msgid="2295659037509008453" name="action_menu_overflow_description">Mai multe opțiuni</string>
+  <string name="action_menu_dialpad_button">tastatură</string>
+  <string name="dialer_settings_label">Setări</string>
+  <string name="simulator_submenu_label">Simulator</string>
+  <string name="new_ui_launcher_shortcut_label">Creați comandă rapidă IU nouă</string>
+  <string name="description_entering_bulk_action_mode">Se intră în modul acțiune în bloc</string>
+  <string name="description_leaving_bulk_action_mode">Ați ieșit din modul acțiune în bloc</string>
+  <string name="description_selecting_bulk_action_mode">S-a selectat %1$s</string>
+  <string name="description_unselecting_bulk_action_mode">S-a deselectat %1$s</string>
+  <string name="description_contact_details">Detalii de contact pentru %1$s</string>
+  <string name="description_spam_contact_details">Detalii de contact pentru apelantul suspectat de spam %1$s</string>
+  <string name="description_num_calls">%1$s (de) apeluri.</string>
+  <string name="description_video_call">Apel video.</string>
+  <string name="description_start_voice_search">Începeți căutarea vocală</string>
+  <string name="voicemail">Mesagerie vocală</string>
+  <string name="description_cancel_multi_select">Anulați modul de acțiuni în lot</string>
+  <string name="voicemailMultiSelectDeleteConfirm">Ștergeți</string>
+  <string name="voicemailMultiSelectDeleteCancel">Anulați</string>
+  <string name="voicemailMultiSelectActionBarTitle">%1$s selectate</string>
+  <plurals name="delete_voicemails_confirmation_dialog_title">
+    <item quantity="one"><b>Ștergeți acest mesaj vocal? </b></item>
+    <item quantity="few"><b>Ștergeți aceste mesaje vocale? </b></item>
+    <item quantity="other"><b>Ștergeți aceste mesaje vocale? </b></item>
+  </plurals>
+  <string name="voicemailCallLogToday">@string/call_log_header_today</string>
+  <string name="voicemailCallLogDateTimeFormat">%1$s la %2$s</string>
+  <string name="voicemailDurationFormat">%1$02d:%2$02d</string>
+  <string name="voicemailCallLogDateTimeFormatWithDuration">%1$s • %2$s</string>
+  <string name="voice_search_not_available">Căutarea vocală nu este disponibilă</string>
+  <string name="dialer_hint_find_contact">Căutați în Agendă</string>
+  <string name="block_number_search_hint">Adăugați număr/căutați contacte</string>
+  <string name="call_log_all_empty">Istoricul apelurilor este gol</string>
+  <string name="call_log_all_empty_action">Apelați</string>
+  <string name="call_log_missed_empty">Nu aveți niciun apel nepreluat.</string>
+  <string name="call_log_voicemail_empty">Nu există mesaje primite în mesageria vocală.</string>
+  <string name="call_log_activity_title">Istoricul apelurilor</string>
+  <string name="call_log_all_title">Toate</string>
+  <string name="call_log_missed_title">Nepreluate</string>
+  <string name="tab_speed_dial">Apelare rapidă</string>
+  <string name="tab_history">Istoricul apelurilor</string>
+  <string name="tab_all_contacts">Agendă</string>
+  <string name="tab_voicemail">Mesagerie vocală</string>
+  <string name="search_shortcut_call_number">Apelați %s</string>
+  <string name="search_shortcut_create_new_contact">Creați o intrare nouă</string>
+  <string name="search_shortcut_add_to_contact">Adăugați la o intrare</string>
+  <string name="search_shortcut_send_sms_message">Trimiteți SMS</string>
+  <string name="search_shortcut_make_video_call">Inițiați un apel video</string>
+  <string name="search_shortcut_block_number">Blocați numărul</string>
+  <string name="speed_dial_empty">Nicio persoană de contact setată pentru apelarea rapidă</string>
+  <string name="speed_dial_empty_add_favorite_action">Adăugați o persoană de contact preferată</string>
+  <string name="remove_contact">Eliminați</string>
+  <string name="select_all">Selectați tot</string>
+  <string name="call_log_action_video_call">Apel video</string>
+  <string name="call_log_action_set_up_video">Configurați apelarea video</string>
+  <string name="call_log_action_invite_video">Invitați la un apel video</string>
+  <string name="call_log_action_send_message">Trimiteți un mesaj</string>
+  <string name="call_log_action_details">Detaliile apelului</string>
+  <string name="call_log_action_share_voicemail">Trimiteți către …</string>
+  <string name="call_log_action_call">Apelați ^1</string>
+  <string name="description_incoming_missed_call">Apel nepreluat de la ^1, ^2, ^3, ^4.</string>
+  <string name="description_incoming_answered_call">Apel preluat de la ^1, ^2, ^3, ^4.</string>
+  <string name="description_unread_voicemail">Mesaj vocal necitit de la ^1, ^2, ^3, ^4.</string>
+  <string name="description_read_voicemail">Mesaj vocal de la ^1, ^2, ^3, ^4.</string>
+  <string name="description_outgoing_call">Apel către ^1, ^2, ^3, ^4.</string>
+  <string name="call_log_via_number">prin %1$s</string>
+  <string name="call_log_via_number_phone_account">%1$s prin %2$s</string>
+  <string name="description_call_action">Apelați ^1</string>
+  <string name="description_video_call_action">Apelați video ^1.</string>
+  <string name="description_voicemail_action">Ascultați mesajul vocal de la ^1</string>
+  <string name="description_create_new_contact_action">Creați o persoană de contact pentru ^1</string>
+  <string name="description_add_to_existing_contact_action">Adăugați ^1 la o persoană de contact existentă</string>
+  <string name="description_details_action">Detaliile apelului pentru ^1</string>
+  <string name="call_log_header_today">Astăzi</string>
+  <string name="call_log_header_yesterday">Ieri</string>
+  <string name="call_log_header_other">Mai vechi</string>
+  <string name="voicemail_speaker_on">Porniți difuzorul.</string>
+  <string name="voicemail_speaker_off">Opriți difuzorul.</string>
+  <string name="voicemail_play_start_pause">Porniți sau întrerupeți redarea.</string>
+  <string name="display_options_title">Opțiuni de afișare</string>
+  <string name="sounds_and_vibration_title">Sunete și vibrații</string>
+  <string name="accessibility_settings_title">Accesibilitate</string>
+  <string name="ringtone_title">Ton de sonerie al telefonului</string>
+  <string name="vibrate_on_ring_title">Vibrează și pentru apeluri</string>
+  <string name="dtmf_tone_enable_title">Tonuri ale tastaturii</string>
+  <string name="dtmf_tone_length_title">Durată a tonului tastaturii</string>
   <string-array name="dtmf_tone_length_entries">
-    <item msgid="3136353015227162823">"Normală"</item>
-    <item msgid="5376841175538523822">"Lung"</item>
+    <item>Normală</item>
+    <item>Lung</item>
   </string-array>
-    <string name="respond_via_sms_setting_title" msgid="8008181606657693452">"Răspunsuri rapide"</string>
-    <string name="call_settings_label" msgid="7824611757200960807">"Apeluri"</string>
-    <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Blocarea apelurilor"</string>
-    <string name="voicemail_settings_label" msgid="4594299554519920570">"Mesagerie vocală"</string>
-    <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Blocarea apelurilor e dezactivată temporar"</string>
-    <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Blocarea apelurilor a fost dezactivată, deoarece ați contactat serviciile de urgență de pe acest telefon în ultimele 48 de ore. Funcția va fi reactivată automat după ce perioada de 48 de ore va expira."</string>
-    <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Importați numere"</string>
-    <string name="blocked_call_settings_import_description" msgid="1819412052545228965">"Anterior, ați marcat câțiva apelanți pentru a fi redirecționați automat spre mesageria vocală prin alte aplicații."</string>
-    <string name="blocked_call_settings_view_numbers_button" msgid="3332727948554356704">"Vedeți numerele"</string>
-    <string name="blocked_call_settings_import_button" msgid="7319111700387470727">"Importați"</string>
-    <string name="description_blocked_number_list_delete" msgid="2139644216858370740">"Deblocați numărul"</string>
-    <string name="addBlockedNumber" msgid="3053473735238295551">"Adăugați un număr"</string>
-    <string name="block_number_footer_message_vvm" msgid="7955326304033982368">"Apelurile de la aceste numere vor fi blocate, iar mesajele vocale vor fi șterse automat."</string>
-    <string name="block_number_footer_message_no_vvm" msgid="1152684139070471665">"Apelurile de la aceste numere vor fi blocate, dar apelanții vor putea totuși să vă lase mesaje vocale."</string>
-    <string name="block_list" msgid="4701585783411870782">"Numere blocate"</string>
-    <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g> este deja blocat."</string>
-    <string name="phone_account_settings_label" msgid="8372485478006965920">"Conturi pentru apelare"</string>
-    <string name="permission_no_speeddial" msgid="8487215628510596753">"Pentru a activa apelarea rapidă, activați permisiunea Agendă."</string>
-    <string name="permission_no_calllog" msgid="4053705651238775784">"Pentru a vedea jurnalul de apeluri, activați permisiunea Telefon."</string>
-    <string name="permission_no_search" msgid="2424710404207193826">"Pentru a căuta în persoanele de contact, activați permisiunea Agendă."</string>
-    <string name="permission_place_call" msgid="8686908130349369423">"Pentru a apela, activați permisiunea Telefon."</string>
-    <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"Aplicația Telefon nu are permisiunea să modifice setările de sistem."</string>
-    <string name="blocked_number_call_log_label" msgid="4212282846299997693">"Blocat"</string>
-    <string name="call_log_action_block_report_number" msgid="7302636538668696729">"Blocați/raportați ca spam"</string>
-    <string name="call_log_action_block_number" msgid="5048188386501998865">"Blocați numărul"</string>
-    <string name="call_log_action_remove_spam" msgid="2045319806318398403">"Nu este spam"</string>
-    <string name="call_log_action_unblock_number" msgid="6100117033288448758">"Deblocați numărul"</string>
-    <string name="spam_number_call_log_label" msgid="2678431398326811131">"Spam"</string>
-    <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> este offline și nu poate fi contactat(ă)"</string>
-    <string name="about_phone_label" msgid="582991354677973731">"Despre"</string>
-    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Transcris de Google"</string>
-    <string name="voicemail_transcription_in_progress" msgid="2933320969613783210">"Google transcrie…"</string>
-    <string name="voicemail_transcription_failed" msgid="335275303117412706">"Transcrierea nu e disponibilă."</string>
-    <string name="voicemail_transcription_failed_language_not_supported" msgid="4210332591050562553">"Transcrierea nu e disponibilă. Limba nu e acceptată."</string>
-    <string name="voicemail_transcription_failed_no_speech" msgid="9093372879697874852">"Transcrierea nu e disponibilă. Nu s-a detectat nimic rostit."</string>
-    <string name="view_conversation" msgid="7895904782094119702">"Afișați"</string>
-    <string name="ec_data_deleted" msgid="4794880345545827107">"Apelul a fost șters. Afișați și ștergeți atașamentele trimise în timpul acestui apel în Messages."</string>
-    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"Apelurile au fost șterse. Afișați și ștergeți atașamentele trimise în timpul apelurilor în Messages."</string>
+  <string name="respond_via_sms_setting_title">Răspunsuri rapide</string>
+  <string name="call_settings_label">Apeluri</string>
+  <string name="manage_blocked_numbers_label">Numere blocate</string>
+  <string name="voicemail_settings_label">Mesagerie vocală</string>
+  <string name="blocked_numbers_disabled_emergency_header_label">Blocarea apelurilor e dezactivată temporar</string>
+  <string name="blocked_numbers_disabled_emergency_desc">Blocarea apelurilor a fost dezactivată, deoarece ați contactat serviciile de urgență de pe acest telefon în ultimele 48 de ore. Funcția va fi reactivată automat după ce perioada de 48 de ore va expira.</string>
+  <string name="import_send_to_voicemail_numbers_label">Importați numere</string>
+  <string name="blocked_call_settings_import_description">Anterior, ați marcat câțiva apelanți pentru a fi redirecționați automat spre mesageria vocală prin alte aplicații.</string>
+  <string name="blocked_call_settings_view_numbers_button">Vedeți numerele</string>
+  <string name="blocked_call_settings_import_button">Importați</string>
+  <string name="description_blocked_number_list_delete">Deblocați numărul</string>
+  <string name="addBlockedNumber">Adăugați un număr</string>
+  <string name="block_number_footer_message_vvm">Apelurile de la aceste numere vor fi blocate, iar mesajele vocale vor fi șterse automat.</string>
+  <string name="block_number_footer_message_no_vvm">Apelurile de la aceste numere vor fi blocate, dar apelanții vor putea totuși să vă lase mesaje vocale.</string>
+  <string name="block_list">Numere blocate</string>
+  <string name="alreadyBlocked">%1$s este deja blocat.</string>
+  <string name="phone_account_settings_label">Conturi pentru apelare</string>
+  <string name="permission_no_speeddial">Pentru a activa apelarea rapidă, activați permisiunea Agendă.</string>
+  <string name="permission_no_calllog">Pentru a vedea jurnalul de apeluri, activați permisiunea Telefon.</string>
+  <string name="permission_no_search">Pentru a căuta în persoanele de contact, activați permisiunea Agendă.</string>
+  <string name="permission_place_call">Pentru a apela, activați permisiunea Telefon.</string>
+  <string name="toast_cannot_write_system_settings">Aplicația Telefon nu are permisiunea să modifice setările de sistem.</string>
+  <string name="blocked_number_call_log_label">Blocat</string>
+  <string name="call_log_action_block_report_number">Blocați/raportați ca spam</string>
+  <string name="call_log_action_block_number">Blocați numărul</string>
+  <string name="call_log_action_remove_spam">Nu este spam</string>
+  <string name="call_log_action_unblock_number">Deblocați numărul</string>
+  <string name="spam_number_call_log_label">Spam</string>
+  <string name="call_composer_connection_failed">%1$s este offline și nu poate fi contactat(ă)</string>
+  <string name="about_phone_label">Despre</string>
+  <string name="voicemail_transcription_branding_text">Transcris de Google</string>
+  <string name="voicemail_transcription_in_progress">Se transcrie…</string>
+  <string name="voicemail_transcription_failed">Transcrierea nu e disponibilă.</string>
+  <string name="voicemail_transcription_failed_language_not_supported">Transcrierea nu e disponibilă. Limba nu e acceptată.</string>
+  <string name="voicemail_transcription_failed_no_speech">Transcrierea nu e disponibilă. Nu s-a detectat nimic rostit.</string>
+  <string name="voicemail_donation_promo_title">Vreți să contribuiți la îmbunătățirea acurateței transcrierii?</string>
+  <string name="voicemail_donation_promo_content">Permiteți serviciului Google să examineze aceste mesaj vocal și pe cele viitoare cu transcrieri. Ele vor fi stocate anonim. Puteți modifica setările oricând. %1$s</string>
+  <string name="voicemail_donation_promo_opt_in">Da, accept</string>
+  <string name="voicemail_donation_promo_opt_out">Nu, mulțumesc</string>
+  <string name="voicemail_transcription_rating">Evaluați calitatea</string>
+  <string name="voicemail_transcription_rating_thanks">Vă mulțumim pentru feedback!</string>
+  <string name="description_rating_good">Apreciez</string>
+  <string name="description_rating_bad">Nu apreciez</string>
+  <string name="view_conversation">Afișați</string>
+  <string name="ec_data_deleted">Apelul a fost șters. Afișați și ștergeți atașamentele trimise în timpul acestui apel în Messages.</string>
+  <string name="multiple_ec_data_deleted">Apelurile au fost șterse. Afișați și ștergeți atașamentele trimise în timpul apelurilor în Messages.</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-ru/strings.xml b/java/com/android/dialer/app/res/values-ru/strings.xml
index a96d51b..fec18a1 100644
--- a/java/com/android/dialer/app/res/values-ru/strings.xml
+++ b/java/com/android/dialer/app/res/values-ru/strings.xml
@@ -1,183 +1,175 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="applicationLabel" msgid="2202739481132958990">"Телефон"</string>
-    <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"Набор номера"</string>
-    <string name="callHistoryIconLabel" msgid="7493268743411968630">"Журнал звонков."</string>
-    <string name="action_copy_number_text" msgid="832682558551502319">"Скопировать номер"</string>
-    <string name="copy_transcript_text" msgid="937904189017310829">"Скопировать транскрипцию"</string>
-    <string name="action_edit_number_before_call" msgid="8017492815878473837">"Изменить номер и позвонить"</string>
-    <string name="call_log_delete_all" msgid="7852970926906523784">"Очистить журнал звонков"</string>
-    <string name="call_log_trash_voicemail" msgid="6118493534178533972">"Удалить голосовое сообщение"</string>
-    <string name="snackbar_voicemail_deleted" msgid="7463166543725496307">"Сообщение удалено"</string>
-    <string name="snackbar_voicemail_deleted_undo" msgid="6959743982796409941">"ОТМЕНИТЬ"</string>
-    <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"Очистить журнал звонков?"</string>
-    <string name="clearCallLogConfirmation" msgid="6844949465815109166">"Журнал звонков будет удален."</string>
-    <string name="clearCallLogProgress_title" msgid="995004835687361977">"Очистка журнала звонков…"</string>
-    <string name="notification_missedCallTitle" msgid="8283366068539898486">"Пропущенный вызов"</string>
-    <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"Пропущенный звонок (работа)"</string>
-    <string name="notification_missedCallsTitle" msgid="3697442015345089802">"Пропущенные вызовы"</string>
-    <string name="notification_missedCallsMsg" msgid="8176217633929018706">"Пропущенных вызовов: <xliff:g id="NUM_MISSED_CALLS">%d</xliff:g>"</string>
-    <string name="notification_missedCall_call_back" msgid="3875698110051973965">"Позвонить"</string>
-    <string name="notification_missedCall_message" msgid="5086910028988305964">"Написать SMS"</string>
-    <string name="post_call_notification_message" msgid="5417476789860590611">"<xliff:g id="NAME">%1$s</xliff:g>: <xliff:g id="MESSAGE">%2$s</xliff:g>"</string>
-    <string name="notification_voicemail_text_format" msgid="1895667520930252897">"Позвонить: <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
-    <string name="notification_voicemail_no_vm_number" msgid="8942821987929495842">"Номер голосовой почты неизвестен"</string>
-    <plurals name="notification_voicemail_title" formatted="false" msgid="1551847434476438657">
-      <item quantity="one"> <xliff:g id="COUNT">%1$d</xliff:g> голосовое сообщение </item>
-      <item quantity="few"> <xliff:g id="COUNT">%1$d</xliff:g> голосовых сообщения </item>
-      <item quantity="many"> <xliff:g id="COUNT">%1$d</xliff:g> голосовых сообщений </item>
-      <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> голосового сообщения </item>
-    </plurals>
-    <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
-    <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"Новое гол. сообщение: <xliff:g id="CALLER">%1$s</xliff:g>"</string>
-    <string name="voicemail_playback_error" msgid="4384373852257757295">"Не удалось воспроизвести сообщения"</string>
-    <string name="voicemail_fetching_content" msgid="572320120918636014">"Загрузка сообщений…"</string>
-    <string name="voicemail_fetching_timout" msgid="2128873915839949783">"Не удалось загрузить голосовую почту"</string>
-    <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_playback_speakerphone" msgid="4852027754869750227">"Включить или отключить громкую связь"</string>
-    <string name="description_playback_seek" msgid="1340910573254132520">"Выбрать позицию для воспроизведения"</string>
-    <string name="action_menu_call_history_description" msgid="8829135306925008546">"Журнал звонков"</string>
-    <string name="action_menu_overflow_description" msgid="7648679686746517341">"Ещё"</string>
-    <string name="action_menu_dialpad_button" msgid="1970631633457493180">"клавиатура"</string>
-    <string name="dialer_settings_label" msgid="4980176284150290175">"Настройки"</string>
-    <string name="simulator_submenu_label" msgid="186156287346615267">"Симулятор"</string>
-    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Создать ярлык для нового интерфейса"</string>
-    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"Вы вошли в режим массового действия"</string>
-    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"Вы вышли из режима массового действия"</string>
-    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"Выбран объект <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"Выбор объекта <xliff:g id="NAMEORNUMBER">%1$s</xliff:g> отменен"</string>
-    <string name="description_contact_details" msgid="3341280873855253464">"Сведения о контакте <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_spam_contact_details" msgid="5592578752881528368">"Сведения о контакте <xliff:g id="NAMEORNUMBER">%1$s</xliff:g> (подозрение на спам)"</string>
-    <string name="description_num_calls" msgid="6483594535796216044">"Вызовов: <xliff:g id="NUMBEROFCALLS">%1$s</xliff:g>."</string>
-    <string name="description_video_call" msgid="3738199365585751727">"Видеовстреча"</string>
-    <string name="description_start_voice_search" msgid="8380022725973015261">"Начать голосовой поиск"</string>
-    <string name="voicemail" msgid="8899540969000957954">"Голосовая почта"</string>
-    <string name="description_cancel_multi_select" msgid="3930475950253360461">"Отмена режима массового действия"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Удалить"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Отмена"</string>
-    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"Выбрано: <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
-      <item quantity="one">"<b>"Удалить эти голосовые сообщения? "</b>"</item>
-      <item quantity="few">"<b>"Удалить эти голосовые сообщения? "</b>"</item>
-      <item quantity="many">"<b>"Удалить эти голосовые сообщения? "</b>"</item>
-      <item quantity="other">"<b>"Удалить эти голосовые сообщения? "</b>"</item>
-    </plurals>
-    <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
-    <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> в <xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
-    <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="voice_search_not_available" msgid="6546240433719732905">"Голосовой поиск недоступен"</string>
-    <string name="dialer_hint_find_contact" msgid="2023214799381149808">"Поиск в контактах"</string>
-    <string name="block_number_search_hint" msgid="5377706079015099416">"Найдите контакт или введите номер"</string>
-    <string name="call_log_all_empty" msgid="3955572868518162004">"В журнале пока нет звонков"</string>
-    <string name="call_log_all_empty_action" msgid="852218280136243014">"Вызов"</string>
-    <string name="call_log_missed_empty" msgid="7094936030845062214">"Нет пропущенных звонков"</string>
-    <string name="call_log_voicemail_empty" msgid="273623903423275178">"Нет входящих голосовых сообщений"</string>
-    <string name="call_log_activity_title" msgid="1275242727244945527">"Журнал звонков"</string>
-    <string name="call_log_all_title" msgid="6042262422192020327">"Все"</string>
-    <string name="call_log_missed_title" msgid="17254005889268015">"Пропущенные"</string>
-    <string name="tab_speed_dial" msgid="6616404752227561075">"Быстрый набор"</string>
-    <string name="tab_history" msgid="7420269368689503596">"Журнал звонков"</string>
-    <string name="tab_all_contacts" msgid="5531733977693943015">"Контакты"</string>
-    <string name="tab_voicemail" msgid="2458548090088316246">"Голосовая почта"</string>
-    <string name="search_shortcut_call_number" msgid="8847918845036880688">"Позвонить: <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"Создать контакт"</string>
-    <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"Добавить к контакту"</string>
-    <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"Отправить SMS"</string>
-    <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"Начать видеовстречу"</string>
-    <string name="search_shortcut_block_number" msgid="4587283230665805776">"Заблокировать номер"</string>
-    <string name="speed_dial_empty" msgid="3346406399966039505">"Нет номеров для быстрого набора"</string>
-    <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"Настроить быстрый набор"</string>
-    <string name="remove_contact" msgid="2353580570488923668">"Удалить"</string>
-    <string name="select_all" msgid="408601760696146245">"Выбрать все"</string>
-    <string name="call_log_action_video_call" msgid="7565549950343850819">"Видеовстреча"</string>
-    <string name="call_log_action_send_message" msgid="6948727362660115554">"Отправить сообщение"</string>
-    <string name="call_log_action_details" msgid="2091370737371449501">"Сведения о вызове"</string>
-    <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"Отправить"</string>
-    <string name="call_log_action_call" msgid="682724094251540583">"Позвонить: <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_incoming_missed_call" msgid="8292535799379230029">"Пропущен вызов от контакта <xliff:g id="NAMEORNUMBER">^1</xliff:g>. <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_incoming_answered_call" msgid="3920182963103160610">"Принят вызов от контакта <xliff:g id="NAMEORNUMBER">^1</xliff:g>. <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_unread_voicemail" msgid="145170985013419170">"Непрослушанное сообщение от контакта <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_read_voicemail" msgid="5585559881573227732">"Голосовая почта от контакта <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_outgoing_call" msgid="543952487882919924">"Вызов контакту <xliff:g id="NAMEORNUMBER">^1</xliff:g>. <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="call_log_via_number" msgid="1340307109806397650">"Номер: <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g>. Номер: <xliff:g id="NUMBER">%2$s</xliff:g>."</string>
-    <string name="description_call_action" msgid="4042796498169106545">"Позвонить: <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_video_call_action" msgid="1237090968588659650">"Видеовстреча: <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_action" msgid="3290143432403538524">"Прослушать сообщение от контакта <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
-    <string name="description_create_new_contact_action" msgid="1928282350281564130">"Добавить контакт: <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"Добавить \"<xliff:g id="NAMEORNUMBER">^1</xliff:g>\" к контакту"</string>
-    <string name="description_details_action" msgid="2061866409737706174">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> – сведения о вызове"</string>
-    <string name="call_log_header_today" msgid="1576119097475845293">"Сегодня"</string>
-    <string name="call_log_header_yesterday" msgid="5616077776205329563">"Вчера"</string>
-    <string name="call_log_header_other" msgid="4940676886254217644">"Предыдущие записи"</string>
-    <string name="voicemail_speaker_on" msgid="3151333608926996668">"Включить динамик."</string>
-    <string name="voicemail_speaker_off" msgid="2530064206962034201">"Выключить динамик."</string>
-    <string name="voicemail_play_start_pause" msgid="3874823480278334664">"Начать или приостановить воспроизведение."</string>
-    <string name="display_options_title" msgid="3880091801055797975">"Отображение контактов"</string>
-    <string name="sounds_and_vibration_title" msgid="3075050000721181384">"Звуки и вибрация"</string>
-    <string name="accessibility_settings_title" msgid="3329027650429831820">"Специальные возможности"</string>
-    <string name="ringtone_title" msgid="8377174189894648486">"Рингтон"</string>
-    <string name="vibrate_on_ring_title" msgid="631441314790960485">"Вибросигнал при вызове"</string>
-    <string name="dtmf_tone_enable_title" msgid="3273762431523939277">"Звук при наборе номера"</string>
-    <string name="dtmf_tone_length_title" msgid="534096029202438539">"Длительность сигналов при наборе номера"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="applicationLabel">Телефон</string>
+  <string name="launcherDialpadActivityLabel">Набор номера</string>
+  <string name="callHistoryIconLabel">Журнал звонков.</string>
+  <string name="action_copy_number_text">Скопировать номер</string>
+  <string name="copy_transcript_text">Скопировать транскрипцию</string>
+  <string name="action_edit_number_before_call">Изменить номер и позвонить</string>
+  <string name="call_log_delete_all">Очистить журнал звонков</string>
+  <string name="call_log_trash_voicemail">Удалить голосовое сообщение</string>
+  <string name="snackbar_voicemail_deleted">Сообщение удалено</string>
+  <string name="clearCallLogConfirmation_title">Очистить журнал звонков?</string>
+  <string name="clearCallLogConfirmation">Журнал звонков будет удален.</string>
+  <string name="clearCallLogProgress_title">Очистка журнала звонков…</string>
+  <string name="notification_missedCallTitle">Пропущенный вызов</string>
+  <string name="notification_missedWorkCallTitle">Пропущенный звонок (работа)</string>
+  <string name="notification_missedCallsTitle">Пропущенные вызовы</string>
+  <string name="notification_missedCallsMsg">Пропущенных вызовов: %d</string>
+  <string name="notification_missedCall_call_back">Перезвонить</string>
+  <string name="notification_missedCall_message">Написать SMS</string>
+  <string name="post_call_notification_message">%1$s: %2$s</string>
+  <string name="notification_voicemail_text_format">Позвонить: %s</string>
+  <string name="notification_voicemail_no_vm_number">Номер голосовой почты неизвестен</string>
+  <plurals name="notification_voicemail_title">
+    <item quantity="one"> %1$d голосовое сообщение </item>
+    <item quantity="few"> %1$d голосовых сообщения </item>
+    <item quantity="many"> %1$d голосовых сообщений </item>
+    <item quantity="other"> %1$d голосового сообщения </item>
+  </plurals>
+  <string name="notification_voicemail_callers_list">%1$s, %2$s</string>
+  <string name="notification_new_voicemail_ticker">Новое гол. сообщение: %1$s</string>
+  <string name="voicemail_playback_error">Не удалось воспроизвести сообщения</string>
+  <string name="voicemail_fetching_content">Загрузка сообщений…</string>
+  <string name="voicemail_fetching_timout">Не удалось загрузить голосовую почту</string>
+  <string name="call_log_item_count_and_date">(%1$d) %2$s</string>
+  <string name="description_playback_speakerphone">Включить или отключить громкую связь</string>
+  <string name="description_playback_seek">Выбрать позицию для воспроизведения</string>
+  <string name="action_menu_call_history_description">Журнал звонков</string>
+  <string msgid="2295659037509008453" name="action_menu_overflow_description">Ещё</string>
+  <string name="action_menu_dialpad_button">клавиатура</string>
+  <string name="dialer_settings_label">Настройки</string>
+  <string name="simulator_submenu_label">Симулятор</string>
+  <string name="new_ui_launcher_shortcut_label">Создать ярлык для нового интерфейса</string>
+  <string name="description_entering_bulk_action_mode">Вы вошли в режим массового действия</string>
+  <string name="description_leaving_bulk_action_mode">Вы вышли из режима массового действия</string>
+  <string name="description_selecting_bulk_action_mode">Выбран объект %1$s</string>
+  <string name="description_unselecting_bulk_action_mode">Выбор объекта %1$s отменен</string>
+  <string name="description_contact_details">Сведения о контакте %1$s</string>
+  <string name="description_spam_contact_details">Сведения о контакте %1$s (подозрение на спам)</string>
+  <string name="description_num_calls">Вызовов: %1$s.</string>
+  <string name="description_video_call">Видеовстреча</string>
+  <string name="description_start_voice_search">Начать голосовой поиск</string>
+  <string name="voicemail">Голосовая почта</string>
+  <string name="description_cancel_multi_select">Отмена режима массового действия</string>
+  <string name="voicemailMultiSelectDeleteConfirm">Удалить</string>
+  <string name="voicemailMultiSelectDeleteCancel">Отмена</string>
+  <string name="voicemailMultiSelectActionBarTitle">Выбрано: %1$s</string>
+  <plurals name="delete_voicemails_confirmation_dialog_title">
+    <item quantity="one"><b>Удалить эти голосовые сообщения? </b></item>
+    <item quantity="few"><b>Удалить эти голосовые сообщения? </b></item>
+    <item quantity="many"><b>Удалить эти голосовые сообщения? </b></item>
+    <item quantity="other"><b>Удалить эти голосовые сообщения? </b></item>
+  </plurals>
+  <string name="voicemailCallLogToday">@string/call_log_header_today</string>
+  <string name="voicemailCallLogDateTimeFormat">%1$s в %2$s</string>
+  <string name="voicemailDurationFormat">%1$02d:%2$02d</string>
+  <string name="voicemailCallLogDateTimeFormatWithDuration">%1$s • %2$s</string>
+  <string name="voice_search_not_available">Голосовой поиск недоступен</string>
+  <string name="dialer_hint_find_contact">Поиск в контактах</string>
+  <string name="block_number_search_hint">Найдите контакт или введите номер</string>
+  <string name="call_log_all_empty">В журнале пока нет звонков</string>
+  <string name="call_log_all_empty_action">Позвонить</string>
+  <string name="call_log_missed_empty">Нет пропущенных звонков</string>
+  <string name="call_log_voicemail_empty">Нет входящих голосовых сообщений</string>
+  <string name="call_log_activity_title">Журнал звонков</string>
+  <string name="call_log_all_title">Все</string>
+  <string name="call_log_missed_title">Пропущенные</string>
+  <string name="tab_speed_dial">Быстрый набор</string>
+  <string name="tab_history">Журнал звонков</string>
+  <string name="tab_all_contacts">Контакты</string>
+  <string name="tab_voicemail">Голосовая почта</string>
+  <string name="search_shortcut_call_number">Позвонить: %s</string>
+  <string name="search_shortcut_create_new_contact">Создать контакт</string>
+  <string name="search_shortcut_add_to_contact">Добавить к контакту</string>
+  <string name="search_shortcut_send_sms_message">Отправить SMS</string>
+  <string name="search_shortcut_make_video_call">Начать видеовстречу</string>
+  <string name="search_shortcut_block_number">Заблокировать номер</string>
+  <string name="speed_dial_empty">Нет номеров для быстрого набора</string>
+  <string name="speed_dial_empty_add_favorite_action">Настроить быстрый набор</string>
+  <string name="remove_contact">Удалить</string>
+  <string name="select_all">Выбрать все</string>
+  <string name="call_log_action_video_call">Видеовстреча</string>
+  <string name="call_log_action_set_up_video">Настроить видеосвязь</string>
+  <string name="call_log_action_invite_video">Пригласить на видеовстречу</string>
+  <string name="call_log_action_send_message">Отправить сообщение</string>
+  <string name="call_log_action_details">Сведения о вызове</string>
+  <string name="call_log_action_share_voicemail">Отправить</string>
+  <string name="call_log_action_call">Позвонить: ^1</string>
+  <string name="description_incoming_missed_call">Пропущен вызов от контакта ^1. ^2, ^3, ^4.</string>
+  <string name="description_incoming_answered_call">Принят вызов от контакта ^1. ^2, ^3, ^4.</string>
+  <string name="description_unread_voicemail">Непрослушанное сообщение от контакта ^1, ^2, ^3, ^4.</string>
+  <string name="description_read_voicemail">Голосовая почта от контакта ^1, ^2, ^3, ^4.</string>
+  <string name="description_outgoing_call">Вызов контакту ^1. ^2, ^3, ^4.</string>
+  <string name="call_log_via_number">Номер: %1$s</string>
+  <string name="call_log_via_number_phone_account">%1$s. Номер: %2$s.</string>
+  <string name="description_call_action">Позвонить: ^1</string>
+  <string name="description_video_call_action">Видеовстреча: ^1</string>
+  <string name="description_voicemail_action">Прослушать сообщение от контакта ^1.</string>
+  <string name="description_create_new_contact_action">Добавить контакт: ^1</string>
+  <string name="description_add_to_existing_contact_action">Добавить \"^1\" к контакту</string>
+  <string name="description_details_action">^1 – сведения о вызове</string>
+  <string name="call_log_header_today">Сегодня</string>
+  <string name="call_log_header_yesterday">Вчера</string>
+  <string name="call_log_header_other">Предыдущие записи</string>
+  <string name="voicemail_speaker_on">Включить динамик.</string>
+  <string name="voicemail_speaker_off">Выключить динамик.</string>
+  <string name="voicemail_play_start_pause">Начать или приостановить воспроизведение.</string>
+  <string name="display_options_title">Отображение контактов</string>
+  <string name="sounds_and_vibration_title">Звуки и вибрация</string>
+  <string name="accessibility_settings_title">Специальные возможности</string>
+  <string name="ringtone_title">Рингтон</string>
+  <string name="vibrate_on_ring_title">Вибросигнал при вызове</string>
+  <string name="dtmf_tone_enable_title">Звук при наборе номера</string>
+  <string name="dtmf_tone_length_title">Длительность сигналов при наборе номера</string>
   <string-array name="dtmf_tone_length_entries">
-    <item msgid="3136353015227162823">"Обычная"</item>
-    <item msgid="5376841175538523822">"Длинные"</item>
+    <item>Обычная</item>
+    <item>Длинные</item>
   </string-array>
-    <string name="respond_via_sms_setting_title" msgid="8008181606657693452">"Быстрые ответы"</string>
-    <string name="call_settings_label" msgid="7824611757200960807">"Вызовы"</string>
-    <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Блокировка вызовов"</string>
-    <string name="voicemail_settings_label" msgid="4594299554519920570">"Голосовая почта"</string>
-    <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Блокировка вызовов временно отключена"</string>
-    <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Блокировка вызовов отключена, поскольку вы недавно набирали номер экстренной службы. Когда с момента звонка пройдет 48 часов, эта функция включится автоматически."</string>
-    <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Импортировать номера"</string>
-    <string name="blocked_call_settings_import_description" msgid="1819412052545228965">"Вы настроили перенаправление вызовов от некоторых абонентов в голосовую почту в других приложениях."</string>
-    <string name="blocked_call_settings_view_numbers_button" msgid="3332727948554356704">"Просмотреть номера"</string>
-    <string name="blocked_call_settings_import_button" msgid="7319111700387470727">"Импортировать"</string>
-    <string name="description_blocked_number_list_delete" msgid="2139644216858370740">"Разблокировать номер"</string>
-    <string name="addBlockedNumber" msgid="3053473735238295551">"Добавить номер"</string>
-    <string name="block_number_footer_message_vvm" msgid="7955326304033982368">"Вызовы с этих номеров будут блокироваться, а голосовые сообщения – автоматически удаляться."</string>
-    <string name="block_number_footer_message_no_vvm" msgid="1152684139070471665">"Вызовы с этих номеров будут блокироваться, но абоненты смогут оставлять вам голосовые сообщения."</string>
-    <string name="block_list" msgid="4701585783411870782">"Заблокированные номера"</string>
-    <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g> уже заблокирован."</string>
-    <string name="phone_account_settings_label" msgid="8372485478006965920">"Аккаунты для звонков"</string>
-    <string name="permission_no_speeddial" msgid="8487215628510596753">"Чтобы настроить быстрый набор, предоставьте приложению разрешение \"Контакты\"."</string>
-    <string name="permission_no_calllog" msgid="4053705651238775784">"Чтобы открыть список вызовов, предоставьте приложению разрешение \"Телефон\"."</string>
-    <string name="permission_no_search" msgid="2424710404207193826">"Для поиска контактов включите разрешение \"Контакты\"."</string>
-    <string name="permission_place_call" msgid="8686908130349369423">"Чтобы позвонить, предоставьте приложению разрешение \"Телефон\"."</string>
-    <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"У приложения \"Телефон\" нет разрешения на изменение системных настроек."</string>
-    <string name="blocked_number_call_log_label" msgid="4212282846299997693">"Заблокировано"</string>
-    <string name="call_log_action_block_report_number" msgid="7302636538668696729">"Заблокировать/сообщить о спаме"</string>
-    <string name="call_log_action_block_number" msgid="5048188386501998865">"Заблокировать номер"</string>
-    <string name="call_log_action_remove_spam" msgid="2045319806318398403">"Не спам"</string>
-    <string name="call_log_action_unblock_number" msgid="6100117033288448758">"Разблокировать номер"</string>
-    <string name="spam_number_call_log_label" msgid="2678431398326811131">"Спам"</string>
-    <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> сейчас офлайн и не ответит на вызов"</string>
-    <string name="about_phone_label" msgid="582991354677973731">"О приложении"</string>
-    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Расшифровано Google"</string>
-    <string name="voicemail_transcription_in_progress" msgid="2933320969613783210">"Подождите…"</string>
-    <string name="voicemail_transcription_failed" msgid="335275303117412706">"Транскрипция недоступна."</string>
-    <string name="voicemail_transcription_failed_language_not_supported" msgid="4210332591050562553">"Транскрипция недоступна. Язык не поддерживается."</string>
-    <string name="voicemail_transcription_failed_no_speech" msgid="9093372879697874852">"Транскрипция недоступна. Речь не найдена."</string>
-    <string name="view_conversation" msgid="7895904782094119702">"Посмотреть"</string>
-    <string name="ec_data_deleted" msgid="4794880345545827107">"Вызов удален. Посмотреть и удалить прикрепленные к нему файлы можно в приложении \"Сообщения\"."</string>
-    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"Вызовы удалены. Посмотреть и удалить прикрепленные к ним файлы можно в приложении \"Сообщения\"."</string>
+  <string name="respond_via_sms_setting_title">Быстрые ответы</string>
+  <string name="call_settings_label">Вызовы</string>
+  <string name="manage_blocked_numbers_label">Заблокированные номера</string>
+  <string name="voicemail_settings_label">Голосовая почта</string>
+  <string name="blocked_numbers_disabled_emergency_header_label">Блокировка вызовов временно отключена</string>
+  <string name="blocked_numbers_disabled_emergency_desc">Блокировка вызовов отключена, поскольку вы недавно набирали номер экстренной службы. Когда с момента звонка пройдет 48 часов, эта функция включится автоматически.</string>
+  <string name="import_send_to_voicemail_numbers_label">Импортировать номера</string>
+  <string name="blocked_call_settings_import_description">Вы настроили перенаправление вызовов от некоторых абонентов в голосовую почту в других приложениях.</string>
+  <string name="blocked_call_settings_view_numbers_button">Просмотреть номера</string>
+  <string name="blocked_call_settings_import_button">Импортировать</string>
+  <string name="description_blocked_number_list_delete">Разблокировать номер</string>
+  <string name="addBlockedNumber">Добавить номер</string>
+  <string name="block_number_footer_message_vvm">Вызовы с этих номеров будут блокироваться, а голосовые сообщения – автоматически удаляться.</string>
+  <string name="block_number_footer_message_no_vvm">Вызовы с этих номеров будут блокироваться, но абоненты смогут оставлять вам голосовые сообщения.</string>
+  <string name="block_list">Заблокированные номера</string>
+  <string name="alreadyBlocked">%1$s уже заблокирован.</string>
+  <string name="phone_account_settings_label">Аккаунты для звонков</string>
+  <string name="permission_no_speeddial">Чтобы настроить быстрый набор, предоставьте приложению разрешение \"Контакты\".</string>
+  <string name="permission_no_calllog">Чтобы открыть список вызовов, предоставьте приложению разрешение \"Телефон\".</string>
+  <string name="permission_no_search">Для поиска контактов включите разрешение \"Контакты\".</string>
+  <string name="permission_place_call">Чтобы позвонить, предоставьте приложению разрешение \"Телефон\".</string>
+  <string name="toast_cannot_write_system_settings">У приложения \"Телефон\" нет разрешения на изменение системных настроек.</string>
+  <string name="blocked_number_call_log_label">Заблокировано</string>
+  <string name="call_log_action_block_report_number">Заблокировать/сообщить о спаме</string>
+  <string name="call_log_action_block_number">Заблокировать номер</string>
+  <string name="call_log_action_remove_spam">Не спам</string>
+  <string name="call_log_action_unblock_number">Разблокировать номер</string>
+  <string name="spam_number_call_log_label">Спам</string>
+  <string name="call_composer_connection_failed">%1$s сейчас офлайн и не ответит на вызов</string>
+  <string name="about_phone_label">О приложении</string>
+  <string name="voicemail_transcription_branding_text">Расшифровано Google</string>
+  <string name="voicemail_transcription_in_progress">Выполняется запись текста…</string>
+  <string name="voicemail_transcription_failed">Транскрипция недоступна.</string>
+  <string name="voicemail_transcription_failed_language_not_supported">Транскрипция недоступна. Язык не поддерживается.</string>
+  <string name="voicemail_transcription_failed_no_speech">Транскрипция недоступна. Речь не найдена.</string>
+  <string name="voicemail_donation_promo_title">Помогите сделать расшифровки более точными</string>
+  <string name="voicemail_donation_promo_content">Предоставьте Google доступ к этому и последующим сообщениям голосовой почты с расшифровками. Они будут храниться анонимно. Изменить настройки можно в любое время. %1$s</string>
+  <string name="voicemail_donation_promo_opt_in">ОК</string>
+  <string name="voicemail_donation_promo_opt_out">Нет</string>
+  <string name="voicemail_transcription_rating">Оцените качество транскрипции:</string>
+  <string name="voicemail_transcription_rating_thanks">Благодарим за отзыв</string>
+  <string name="description_rating_good">Мне понравилось</string>
+  <string name="description_rating_bad">Мне не понравилось</string>
+  <string name="view_conversation">Посмотреть</string>
+  <string name="ec_data_deleted">Вызов удален. Посмотреть и удалить прикрепленные к нему файлы можно в приложении \"Сообщения\".</string>
+  <string name="multiple_ec_data_deleted">Вызовы удалены. Посмотреть и удалить прикрепленные к ним файлы можно в приложении \"Сообщения\".</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-si/strings.xml b/java/com/android/dialer/app/res/values-si/strings.xml
index 4784820..deea355 100644
--- a/java/com/android/dialer/app/res/values-si/strings.xml
+++ b/java/com/android/dialer/app/res/values-si/strings.xml
@@ -1,179 +1,171 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="applicationLabel" msgid="2202739481132958990">"දුරකථනය"</string>
-    <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"දුරකථන යතුරු පුවරුව"</string>
-    <string name="callHistoryIconLabel" msgid="7493268743411968630">"ඇමතුම් ඉතිහාසය"</string>
-    <string name="action_copy_number_text" msgid="832682558551502319">"අංකය පිටපත් කරන්න"</string>
-    <string name="copy_transcript_text" msgid="937904189017310829">"පිටපත් කිරීම පිටපත් කරන්න"</string>
-    <string name="action_edit_number_before_call" msgid="8017492815878473837">"ඇමතුමට පෙර අංකය සංස්කරණය"</string>
-    <string name="call_log_delete_all" msgid="7852970926906523784">"ඇමතුම් ඉතිහාසය හිස් කරන්න"</string>
-    <string name="call_log_trash_voicemail" msgid="6118493534178533972">"හඬ තැපෑල මකන්න"</string>
-    <string name="snackbar_voicemail_deleted" msgid="7463166543725496307">"හඬ තැපෑල මකන ලදී"</string>
-    <string name="snackbar_voicemail_deleted_undo" msgid="6959743982796409941">"අස් කරන්න"</string>
-    <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"ඇමතුම් ඉතිහාසය හිස් කරන්නද?"</string>
-    <string name="clearCallLogConfirmation" msgid="6844949465815109166">"මෙය ඔබේ ඉතිහාසයෙන් සියලු ඇමතුම් මකනු ඇත"</string>
-    <string name="clearCallLogProgress_title" msgid="995004835687361977">"ඇමතුම් ඉතිහාසය හිස් කරමින්…"</string>
-    <string name="notification_missedCallTitle" msgid="8283366068539898486">"මඟ හැරුණු ඇමතුම"</string>
-    <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"මග හැරුණ කාර්යාල ඇමතුම"</string>
-    <string name="notification_missedCallsTitle" msgid="3697442015345089802">"මඟ හැරුණු ඇමතුම්"</string>
-    <string name="notification_missedCallsMsg" msgid="8176217633929018706">"මඟ හැරුණු ඇමතුම් <xliff:g id="NUM_MISSED_CALLS">%d</xliff:g>"</string>
-    <string name="notification_missedCall_call_back" msgid="3875698110051973965">"නැවත අමතන්න"</string>
-    <string name="notification_missedCall_message" msgid="5086910028988305964">"පණිවිඩය"</string>
-    <string name="post_call_notification_message" msgid="5417476789860590611">"<xliff:g id="NAME">%1$s</xliff:g>: <xliff:g id="MESSAGE">%2$s</xliff:g>"</string>
-    <string name="notification_voicemail_text_format" msgid="1895667520930252897">"<xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g> ඩයල් කරන්න"</string>
-    <string name="notification_voicemail_no_vm_number" msgid="8942821987929495842">"හඬ තැපැල් අංකය නොදනී"</string>
-    <plurals name="notification_voicemail_title" formatted="false" msgid="1551847434476438657">
-      <item quantity="one">හඬ තැපැල් <xliff:g id="COUNT">%1$d</xliff:g> </item>
-      <item quantity="other">හඬ තැපැල් <xliff:g id="COUNT">%1$d</xliff:g> </item>
-    </plurals>
-    <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
-    <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"<xliff:g id="CALLER">%1$s</xliff:g> වෙතින් නව හඬ තැපැලක්"</string>
-    <string name="voicemail_playback_error" msgid="4384373852257757295">"හඬ තැපෑල වාදනය කිරීමට නොහැකි විය"</string>
-    <string name="voicemail_fetching_content" msgid="572320120918636014">"හඬ තැපෑල ප්‍රවේශනය වෙමින්…"</string>
-    <string name="voicemail_fetching_timout" msgid="2128873915839949783">"හඬ තැපෑල ප්‍රවේශනය කිරීමට නොහැකි විය"</string>
-    <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_playback_speakerphone" msgid="4852027754869750227">"ස්පීකර්ෆෝන් ක්‍රියා කරන්න හෝ නොකරන්න"</string>
-    <string name="description_playback_seek" msgid="1340910573254132520">"Playback ස්ථානය සොයාබලන්න"</string>
-    <string name="action_menu_call_history_description" msgid="8829135306925008546">"ඇමතුම් ඉතිහාසය"</string>
-    <string name="action_menu_overflow_description" msgid="7648679686746517341">"තවත් විකල්ප"</string>
-    <string name="action_menu_dialpad_button" msgid="1970631633457493180">"යතුරු පුවරුව"</string>
-    <string name="dialer_settings_label" msgid="4980176284150290175">"සැකසීම්"</string>
-    <string name="simulator_submenu_label" msgid="186156287346615267">"සමාකෘතිය"</string>
-    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"නව UI කෙටිමග තනන්න"</string>
-    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"තොග ක්‍රියා ප්‍රකාරය ඇතුළු කරමින්"</string>
-    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"තොග ක්‍රියා ප්‍රකාරය හැර යන ලදී"</string>
-    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> තෝරා ගන්නා ලදී"</string>
-    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> තෝරා ගැනීම ඉවත් කරන ලදී"</string>
-    <string name="description_contact_details" msgid="3341280873855253464">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> සඳහා ඇමතුම් විස්තර"</string>
-    <string name="description_spam_contact_details" msgid="5592578752881528368">"සැකසහිත අයාචිත තැපැල්කරු <xliff:g id="NAMEORNUMBER">%1$s</xliff:g> සඳහා ඇමතුම් විස්තර"</string>
-    <string name="description_num_calls" msgid="6483594535796216044">"ඇමතුම් <xliff:g id="NUMBEROFCALLS">%1$s</xliff:g>."</string>
-    <string name="description_video_call" msgid="3738199365585751727">"වීඩියෝ ඇමතුම."</string>
-    <string name="description_start_voice_search" msgid="8380022725973015261">"හඬ සෙවීම අරඹන්න"</string>
-    <string name="voicemail" msgid="8899540969000957954">"හඬ තැපෑල"</string>
-    <string name="description_cancel_multi_select" msgid="3930475950253360461">"කාණ්ඩ ක්‍රියා ප්‍රකාරය අවලංගු කරන්න"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"මකන්න"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"අවලංගු කරන්න"</string>
-    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> තෝරා ගන්නා ලදි"</string>
-    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
-      <item quantity="one">"<b>"මෙම හඬ තැපැල් මකන්නද? "</b>"</item>
-      <item quantity="other">"<b>"මෙම හඬ තැපැල් මකන්නද? "</b>"</item>
-    </plurals>
-    <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
-    <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> දින <xliff:g id="TIME">%2$s</xliff:g>ට"</string>
-    <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
-    <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="voice_search_not_available" msgid="6546240433719732905">"හඬ සෙවුම ලබාගත නොහැකිය"</string>
-    <string name="dialer_hint_find_contact" msgid="2023214799381149808">"සම්බන්ධතා සෙවීම"</string>
-    <string name="block_number_search_hint" msgid="5377706079015099416">"අංකය එක් කරන්න හෝ සම්බන්ධතා සොයන්න"</string>
-    <string name="call_log_all_empty" msgid="3955572868518162004">"ඔබගේ ඇමතුම් ඉතිහාසය හිස්ය"</string>
-    <string name="call_log_all_empty_action" msgid="852218280136243014">"ඇමතුමක් සිදු කරන්න"</string>
-    <string name="call_log_missed_empty" msgid="7094936030845062214">"ඔබට මඟ හැරුණු ඇමතුම් නැත."</string>
-    <string name="call_log_voicemail_empty" msgid="273623903423275178">"ඔබේ හඬ තැපැල් එන ලිපි හිස්ය."</string>
-    <string name="call_log_activity_title" msgid="1275242727244945527">"ඇමතුම් ඉතිහාසය"</string>
-    <string name="call_log_all_title" msgid="6042262422192020327">"සියලු"</string>
-    <string name="call_log_missed_title" msgid="17254005889268015">"මග හැරුණේය"</string>
-    <string name="tab_speed_dial" msgid="6616404752227561075">"වේග ඩයල් කිරීම"</string>
-    <string name="tab_history" msgid="7420269368689503596">"ඇමතුම් ඉතිහාසය"</string>
-    <string name="tab_all_contacts" msgid="5531733977693943015">"සම්බන්ධතා"</string>
-    <string name="tab_voicemail" msgid="2458548090088316246">"හඬ තැපෑල"</string>
-    <string name="search_shortcut_call_number" msgid="8847918845036880688">"<xliff:g id="NUMBER">%s</xliff:g> අමතන්න"</string>
-    <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"නව සම්බන්ධතාවයක් සාදන්න"</string>
-    <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"සම්බන්ධතාවකට එක් කරන්න"</string>
-    <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"SMS යවන්න"</string>
-    <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"වීඩියෝ ඇමතුමක් ලබාගන්න"</string>
-    <string name="search_shortcut_block_number" msgid="4587283230665805776">"අංකය අවහිර කරන්න"</string>
-    <string name="speed_dial_empty" msgid="3346406399966039505">"ඔබගේ වේග ඩයල් එකේ තවමත් කවුරුවත් නැහැ"</string>
-    <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"ප්‍රියතම ලෙස එක් කරන්න"</string>
-    <string name="remove_contact" msgid="2353580570488923668">"ඉවත් කරන්න"</string>
-    <string name="select_all" msgid="408601760696146245">"සියල්ල තෝරන්න"</string>
-    <string name="call_log_action_video_call" msgid="7565549950343850819">"වීඩියෝ ඇමතුම"</string>
-    <string name="call_log_action_send_message" msgid="6948727362660115554">"පණිවිඩයක් යවන්න"</string>
-    <string name="call_log_action_details" msgid="2091370737371449501">"ඇමතුම් විස්තර"</string>
-    <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"වෙත යවන්න …"</string>
-    <string name="call_log_action_call" msgid="682724094251540583">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> අමතන්න"</string>
-    <string name="description_incoming_missed_call" msgid="8292535799379230029">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g> වෙතින් ඇමතුමක් මගහැරුණා."</string>
-    <string name="description_incoming_answered_call" msgid="3920182963103160610">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g> වෙතින් ඇමතුමකට පිළිතුරු දුන්නා."</string>
-    <string name="description_unread_voicemail" msgid="145170985013419170">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g> වෙතින් නොකියවූ හඬ තැපෑල."</string>
-    <string name="description_read_voicemail" msgid="5585559881573227732">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g> වෙතින් හඬ තැපෑල."</string>
-    <string name="description_outgoing_call" msgid="543952487882919924">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g> වෙත ඇමතුමක්."</string>
-    <string name="call_log_via_number" msgid="1340307109806397650">"<xliff:g id="NUMBER">%1$s</xliff:g> හරහා"</string>
-    <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="NUMBER">%2$s</xliff:g> හරහා <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>"</string>
-    <string name="description_call_action" msgid="4042796498169106545">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> අමතන්න"</string>
-    <string name="description_video_call_action" msgid="1237090968588659650">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>. වීඩියෝ ඇමතුම"</string>
-    <string name="description_voicemail_action" msgid="3290143432403538524">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> වෙතින් හඬ තැපෑලට සවන් දෙන්න"</string>
-    <string name="description_create_new_contact_action" msgid="1928282350281564130">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> සඳහා සම්බන්ධතාවක් සාදන්න"</string>
-    <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"පවතින සම්බන්ධතාව වෙත <xliff:g id="NAMEORNUMBER">^1</xliff:g> එක් කරන්න"</string>
-    <string name="description_details_action" msgid="2061866409737706174">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> සඳහා ඇමතුම් විස්තර"</string>
-    <string name="call_log_header_today" msgid="1576119097475845293">"අද"</string>
-    <string name="call_log_header_yesterday" msgid="5616077776205329563">"ඊයේ"</string>
-    <string name="call_log_header_other" msgid="4940676886254217644">"වඩා පරණ"</string>
-    <string name="voicemail_speaker_on" msgid="3151333608926996668">"ශබ්දවාහිනී සක්‍රිය කරන්න."</string>
-    <string name="voicemail_speaker_off" msgid="2530064206962034201">"ශබ්දවාහිනී අක්‍රිය කරන්න."</string>
-    <string name="voicemail_play_start_pause" msgid="3874823480278334664">"නැවත ධාවනයෙදී ආරම්භ කරන්න හෝ විරාමය කරන්න."</string>
-    <string name="display_options_title" msgid="3880091801055797975">"විකල්ප පෙන්වන්න"</string>
-    <string name="sounds_and_vibration_title" msgid="3075050000721181384">"ශබ්ද සහ කම්පන"</string>
-    <string name="accessibility_settings_title" msgid="3329027650429831820">"ප්‍රවේශ්‍යතාව"</string>
-    <string name="ringtone_title" msgid="8377174189894648486">"දුරකථන රිගින්ටෝනය"</string>
-    <string name="vibrate_on_ring_title" msgid="631441314790960485">"ඇමතුම් සඳහාත් කම්පනය කරන්න"</string>
-    <string name="dtmf_tone_enable_title" msgid="3273762431523939277">"යතුරු පුවරු නාද"</string>
-    <string name="dtmf_tone_length_title" msgid="534096029202438539">"යතුරු පුවරු නාද දිග"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="applicationLabel">දුරකථනය</string>
+  <string name="launcherDialpadActivityLabel">දුරකථන යතුරු පුවරුව</string>
+  <string name="callHistoryIconLabel">ඇමතුම් ඉතිහාසය</string>
+  <string name="action_copy_number_text">අංකය පිටපත් කරන්න</string>
+  <string name="copy_transcript_text">පිටපත් කිරීම පිටපත් කරන්න</string>
+  <string name="action_edit_number_before_call">ඇමතුමට පෙර අංකය සංස්කරණය</string>
+  <string name="call_log_delete_all">ඇමතුම් ඉතිහාසය හිස් කරන්න</string>
+  <string name="call_log_trash_voicemail">හඬ තැපෑල මකන්න</string>
+  <string name="snackbar_voicemail_deleted">හඬ තැපෑල මකන ලදී</string>
+  <string name="clearCallLogConfirmation_title">ඇමතුම් ඉතිහාසය හිස් කරන්නද?</string>
+  <string name="clearCallLogConfirmation">මෙය ඔබේ ඉතිහාසයෙන් සියලු ඇමතුම් මකනු ඇත</string>
+  <string name="clearCallLogProgress_title">ඇමතුම් ඉතිහාසය හිස් කරමින්…</string>
+  <string name="notification_missedCallTitle">මඟ හැරුණු ඇමතුම</string>
+  <string name="notification_missedWorkCallTitle">මග හැරුණ කාර්යාල ඇමතුම</string>
+  <string name="notification_missedCallsTitle">මඟ හැරුණු ඇමතුම්</string>
+  <string name="notification_missedCallsMsg">මඟ හැරුණු ඇමතුම් %d</string>
+  <string name="notification_missedCall_call_back">නැවත අමතන්න</string>
+  <string name="notification_missedCall_message">පණිවිඩය</string>
+  <string name="post_call_notification_message">%1$s: %2$s</string>
+  <string name="notification_voicemail_text_format">%s ඩයල් කරන්න</string>
+  <string name="notification_voicemail_no_vm_number">හඬ තැපැල් අංකය නොදනී</string>
+  <plurals name="notification_voicemail_title">
+    <item quantity="one">හඬ තැපැල් %1$d </item>
+    <item quantity="other">හඬ තැපැල් %1$d </item>
+  </plurals>
+  <string name="notification_voicemail_callers_list">%1$s, %2$s</string>
+  <string name="notification_new_voicemail_ticker">%1$s වෙතින් නව හඬ තැපැලක්</string>
+  <string name="voicemail_playback_error">හඬ තැපෑල වාදනය කිරීමට නොහැකි විය</string>
+  <string name="voicemail_fetching_content">හඬ තැපෑල ප්‍රවේශනය වෙමින්…</string>
+  <string name="voicemail_fetching_timout">හඬ තැපෑල ප්‍රවේශනය කිරීමට නොහැකි විය</string>
+  <string name="call_log_item_count_and_date">(%1$d) %2$s</string>
+  <string name="description_playback_speakerphone">ස්පීකර්ෆෝන් ක්‍රියා කරන්න හෝ නොකරන්න</string>
+  <string name="description_playback_seek">Playback ස්ථානය සොයාබලන්න</string>
+  <string name="action_menu_call_history_description">ඇමතුම් ඉතිහාසය</string>
+  <string msgid="2295659037509008453" name="action_menu_overflow_description">තවත් විකල්ප</string>
+  <string name="action_menu_dialpad_button">යතුරු පුවරුව</string>
+  <string name="dialer_settings_label">සැකසීම්</string>
+  <string name="simulator_submenu_label">සමාකෘතිය</string>
+  <string name="new_ui_launcher_shortcut_label">නව UI කෙටිමග තනන්න</string>
+  <string name="description_entering_bulk_action_mode">තොග ක්‍රියා ප්‍රකාරය ඇතුළු කරමින්</string>
+  <string name="description_leaving_bulk_action_mode">තොග ක්‍රියා ප්‍රකාරය හැර යන ලදී</string>
+  <string name="description_selecting_bulk_action_mode">%1$s තෝරා ගන්නා ලදී</string>
+  <string name="description_unselecting_bulk_action_mode">%1$s තෝරා ගැනීම ඉවත් කරන ලදී</string>
+  <string name="description_contact_details">%1$s සඳහා ඇමතුම් විස්තර</string>
+  <string name="description_spam_contact_details">සැකසහිත අයාචිත තැපැල්කරු %1$s සඳහා ඇමතුම් විස්තර</string>
+  <string name="description_num_calls">ඇමතුම් %1$s.</string>
+  <string name="description_video_call">වීඩියෝ ඇමතුම.</string>
+  <string name="description_start_voice_search">හඬ සෙවීම අරඹන්න</string>
+  <string name="voicemail">හඬ තැපෑල</string>
+  <string name="description_cancel_multi_select">කාණ්ඩ ක්‍රියා ප්‍රකාරය අවලංගු කරන්න</string>
+  <string name="voicemailMultiSelectDeleteConfirm">මකන්න</string>
+  <string name="voicemailMultiSelectDeleteCancel">අවලංගු කරන්න</string>
+  <string name="voicemailMultiSelectActionBarTitle">%1$s තෝරා ගන්නා ලදි</string>
+  <plurals name="delete_voicemails_confirmation_dialog_title">
+    <item quantity="one"><b>මෙම හඬ තැපැල් මකන්නද? </b></item>
+    <item quantity="other"><b>මෙම හඬ තැපැල් මකන්නද? </b></item>
+  </plurals>
+  <string name="voicemailCallLogToday">@string/call_log_header_today</string>
+  <string name="voicemailCallLogDateTimeFormat">%1$s දින %2$sට</string>
+  <string name="voicemailDurationFormat">%1$02d:%2$02d</string>
+  <string name="voicemailCallLogDateTimeFormatWithDuration">%1$s • %2$s</string>
+  <string name="voice_search_not_available">හඬ සෙවුම ලබාගත නොහැකිය</string>
+  <string name="dialer_hint_find_contact">සම්බන්ධතා සෙවීම</string>
+  <string name="block_number_search_hint">අංකය එක් කරන්න හෝ සම්බන්ධතා සොයන්න</string>
+  <string name="call_log_all_empty">ඔබගේ ඇමතුම් ඉතිහාසය හිස්ය</string>
+  <string name="call_log_all_empty_action">ඇමතුමක් සිදු කරන්න</string>
+  <string name="call_log_missed_empty">ඔබට මඟ හැරුණු ඇමතුම් නැත.</string>
+  <string name="call_log_voicemail_empty">ඔබේ හඬ තැපැල් එන ලිපි හිස්ය.</string>
+  <string name="call_log_activity_title">ඇමතුම් ඉතිහාසය</string>
+  <string name="call_log_all_title">සියලු</string>
+  <string name="call_log_missed_title">මග හැරුණේය</string>
+  <string name="tab_speed_dial">වේග ඩයල් කිරීම</string>
+  <string name="tab_history">ඇමතුම් ඉතිහාසය</string>
+  <string name="tab_all_contacts">සම්බන්ධතා</string>
+  <string name="tab_voicemail">හඬ තැපෑල</string>
+  <string name="search_shortcut_call_number">%s අමතන්න</string>
+  <string name="search_shortcut_create_new_contact">නව සම්බන්ධතාවයක් සාදන්න</string>
+  <string name="search_shortcut_add_to_contact">සම්බන්ධතාවකට එක් කරන්න</string>
+  <string name="search_shortcut_send_sms_message">SMS යවන්න</string>
+  <string name="search_shortcut_make_video_call">වීඩියෝ ඇමතුමක් ලබාගන්න</string>
+  <string name="search_shortcut_block_number">අංකය අවහිර කරන්න</string>
+  <string name="speed_dial_empty">ඔබගේ වේග ඩයල් එකේ තවමත් කවුරුවත් නැහැ</string>
+  <string name="speed_dial_empty_add_favorite_action">ප්‍රියතම ලෙස එක් කරන්න</string>
+  <string name="remove_contact">ඉවත් කරන්න</string>
+  <string name="select_all">සියල්ල තෝරන්න</string>
+  <string name="call_log_action_video_call">වීඩියෝ ඇමතුම</string>
+  <string name="call_log_action_set_up_video">වීඩියෝ ඇමතීම පිහිටුවන්න</string>
+  <string name="call_log_action_invite_video">වීඩියෝ ඇමතුමට ආරාධනා කරන්න</string>
+  <string name="call_log_action_send_message">පණිවිඩයක් යවන්න</string>
+  <string name="call_log_action_details">ඇමතුම් විස්තර</string>
+  <string name="call_log_action_share_voicemail">වෙත යවන්න …</string>
+  <string name="call_log_action_call">^1 අමතන්න</string>
+  <string name="description_incoming_missed_call">^1, ^2, ^3, ^4 වෙතින් ඇමතුමක් මගහැරුණා.</string>
+  <string name="description_incoming_answered_call">^1, ^2, ^3, ^4 වෙතින් ඇමතුමකට පිළිතුරු දුන්නා.</string>
+  <string name="description_unread_voicemail">^1, ^2, ^3, ^4 වෙතින් නොකියවූ හඬ තැපෑල.</string>
+  <string name="description_read_voicemail">^1, ^2, ^3, ^4 වෙතින් හඬ තැපෑල.</string>
+  <string name="description_outgoing_call">^1, ^2, ^3, ^4 වෙත ඇමතුමක්.</string>
+  <string name="call_log_via_number">%1$s හරහා</string>
+  <string name="call_log_via_number_phone_account">%2$s හරහා %1$s</string>
+  <string name="description_call_action">^1 අමතන්න</string>
+  <string name="description_video_call_action">^1. වීඩියෝ ඇමතුම</string>
+  <string name="description_voicemail_action">^1 වෙතින් හඬ තැපෑලට සවන් දෙන්න</string>
+  <string name="description_create_new_contact_action">^1 සඳහා සම්බන්ධතාවක් සාදන්න</string>
+  <string name="description_add_to_existing_contact_action">පවතින සම්බන්ධතාව වෙත ^1 එක් කරන්න</string>
+  <string name="description_details_action">^1 සඳහා ඇමතුම් විස්තර</string>
+  <string name="call_log_header_today">අද</string>
+  <string name="call_log_header_yesterday">ඊයේ</string>
+  <string name="call_log_header_other">වඩා පරණ</string>
+  <string name="voicemail_speaker_on">ශබ්දවාහිනී සක්‍රිය කරන්න.</string>
+  <string name="voicemail_speaker_off">ශබ්දවාහිනී අක්‍රිය කරන්න.</string>
+  <string name="voicemail_play_start_pause">නැවත ධාවනයෙදී ආරම්භ කරන්න හෝ විරාමය කරන්න.</string>
+  <string name="display_options_title">විකල්ප පෙන්වන්න</string>
+  <string name="sounds_and_vibration_title">ශබ්ද සහ කම්පන</string>
+  <string name="accessibility_settings_title">ප්‍රවේශ්‍යතාව</string>
+  <string name="ringtone_title">දුරකථන රිගින්ටෝනය</string>
+  <string name="vibrate_on_ring_title">ඇමතුම් සඳහාත් කම්පනය කරන්න</string>
+  <string name="dtmf_tone_enable_title">යතුරු පුවරු නාද</string>
+  <string name="dtmf_tone_length_title">යතුරු පුවරු නාද දිග</string>
   <string-array name="dtmf_tone_length_entries">
-    <item msgid="3136353015227162823">"සාමාන්‍ය"</item>
-    <item msgid="5376841175538523822">"දීර්ඝ"</item>
+    <item>සාමාන්‍ය</item>
+    <item>දීර්ඝ</item>
   </string-array>
-    <string name="respond_via_sms_setting_title" msgid="8008181606657693452">"ක්ෂණික ප්‍රතිචාර"</string>
-    <string name="call_settings_label" msgid="7824611757200960807">"ඇමතුම්"</string>
-    <string name="manage_blocked_numbers_label" msgid="16823761991832273">"ඇමතුම් අවහිර කිරීම"</string>
-    <string name="voicemail_settings_label" msgid="4594299554519920570">"හඬ තැපෑල"</string>
-    <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"ඇමතුම් අවහිර කිරීම තාවකාලිකව අක්‍රියයි"</string>
-    <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"ඔබ පසුගිය පැය 48 ඇතුළත මෙම දුරකථනයෙන් හදිසි අවස්ථා සේවා ඇමතූ බැව්න් ඇමතුම් අවහිර කිරීම අබල කර ඇත. පැය 48ක කාල සීමාව ඉකුත් වූ විට එය ස්වයංක්‍රියව යළි සබල කෙරේ."</string>
-    <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"අංක ආයාත කරන්න"</string>
-    <string name="blocked_call_settings_import_description" msgid="1819412052545228965">"ඔබ පෙරදී සමහර අමතන්නන් වෙනත් යෙදුම් හරහා ස්වයංක්‍රියව හඬ තැපෑල වෙත යැවීමට ලකුණු කරන ලදී."</string>
-    <string name="blocked_call_settings_view_numbers_button" msgid="3332727948554356704">"අංක බලන්න"</string>
-    <string name="blocked_call_settings_import_button" msgid="7319111700387470727">"ආයාත කරන්න"</string>
-    <string name="description_blocked_number_list_delete" msgid="2139644216858370740">"අංකය අවහිර නොකරන්න"</string>
-    <string name="addBlockedNumber" msgid="3053473735238295551">"අංකයක් එක් කරන්න"</string>
-    <string name="block_number_footer_message_vvm" msgid="7955326304033982368">"මෙම අංක වෙතින් වන ඇමතුම් අවහිර කරනු ඇති අතර හඬ තැපැල් ස්වයංක්‍රියව මකනු ඇත."</string>
-    <string name="block_number_footer_message_no_vvm" msgid="1152684139070471665">"මෙම අංක වෙතින් වන ඇමතුම් අවහිර කරනු ඇති නමුත්, ඔවුන්ට තවම ඔබට හඬ තැපැල් තැබීමට හැකිය."</string>
-    <string name="block_list" msgid="4701585783411870782">"අවහිර කළ අංක"</string>
-    <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g> දැනටමත් අවහිර කර ඇත."</string>
-    <string name="phone_account_settings_label" msgid="8372485478006965920">"ගිණුම් ඇමතීම"</string>
-    <string name="permission_no_speeddial" msgid="8487215628510596753">"වේග ඩයල් කිරීම සබල කිරීමට, සම්බන්ධතා අවසරය ක්‍රියාත්මක කරන්න."</string>
-    <string name="permission_no_calllog" msgid="4053705651238775784">"ඔබේ ඇමතුම් ලොගය බැලීමට, දුරකථන අවසරය ක්‍රියාත්මක කරන්න."</string>
-    <string name="permission_no_search" msgid="2424710404207193826">"ඔබේ සම්බන්ධතා සෙවීමට, සම්බන්ධතා අවසර ක්‍රියාත්මක කරන්න."</string>
-    <string name="permission_place_call" msgid="8686908130349369423">"ඇමතුමක් ලබා ගැනීමට, දුරකථන අවසරය ක්‍රියාත්මක කරන්න."</string>
-    <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"දුරකථන යෙදුමට පද්ධති සැකසීම් වෙත ලිවීමට අවසර නැත."</string>
-    <string name="blocked_number_call_log_label" msgid="4212282846299997693">"අවහිර කරන ලදි"</string>
-    <string name="call_log_action_block_report_number" msgid="7302636538668696729">"අයාචිත තැපැල අවහිර/වාර්තා කර."</string>
-    <string name="call_log_action_block_number" msgid="5048188386501998865">"අංකය අවහිර කරන්න"</string>
-    <string name="call_log_action_remove_spam" msgid="2045319806318398403">"අයාචිත තැපෑලක් නොවේ"</string>
-    <string name="call_log_action_unblock_number" msgid="6100117033288448758">"අංකය අවහිර නොකරන්න"</string>
-    <string name="spam_number_call_log_label" msgid="2678431398326811131">"අයාචිත තැපෑල"</string>
-    <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> නොබැඳි අතර ළඟා වීමට නොහැකිය"</string>
-    <string name="about_phone_label" msgid="582991354677973731">"ගැන"</string>
-    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Google මගින් පිටපත් කරන ලදී"</string>
-    <string name="voicemail_transcription_in_progress" msgid="2933320969613783210">"Google පිටපත් කරමින් සිටී…"</string>
-    <string name="voicemail_transcription_failed" msgid="335275303117412706">"අනුපිටපතක් නොමැත."</string>
-    <string name="voicemail_transcription_failed_language_not_supported" msgid="4210332591050562553">"අනුපිටපතක් නොමැත. භාෂාව සහාය නොදක්වයි."</string>
-    <string name="voicemail_transcription_failed_no_speech" msgid="9093372879697874852">"අනුපිටපතක් නොමැත. කථනය අනාවරණය කරගෙන නැත."</string>
-    <string name="view_conversation" msgid="7895904782094119702">"බලන්න"</string>
-    <string name="ec_data_deleted" msgid="4794880345545827107">"ඇමතුම මකන ලදී. Messages වල මෙම ඇමතුම අතරතුර බෙදා ගත් ඇමුණුම් බලා මකන්න."</string>
-    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"ඇමතුම මකන ලදී. Messages වල මෙම ඇමතුම් අතරතුර බෙදා ගත් ඇමුණුම් බලා මකන්න."</string>
+  <string name="respond_via_sms_setting_title">ක්ෂණික ප්‍රතිචාර</string>
+  <string name="call_settings_label">ඇමතුම්</string>
+  <string name="manage_blocked_numbers_label">අවහිර කළ අංක</string>
+  <string name="voicemail_settings_label">හඬ තැපෑල</string>
+  <string name="blocked_numbers_disabled_emergency_header_label">ඇමතුම් අවහිර කිරීම තාවකාලිකව අක්‍රියයි</string>
+  <string name="blocked_numbers_disabled_emergency_desc">ඔබ පසුගිය පැය 48 ඇතුළත මෙම දුරකථනයෙන් හදිසි අවස්ථා සේවා ඇමතූ බැව්න් ඇමතුම් අවහිර කිරීම අබල කර ඇත. පැය 48ක කාල සීමාව ඉකුත් වූ විට එය ස්වයංක්‍රියව යළි සබල කෙරේ.</string>
+  <string name="import_send_to_voicemail_numbers_label">අංක ආයාත කරන්න</string>
+  <string name="blocked_call_settings_import_description">ඔබ පෙරදී සමහර අමතන්නන් වෙනත් යෙදුම් හරහා ස්වයංක්‍රියව හඬ තැපෑල වෙත යැවීමට ලකුණු කරන ලදී.</string>
+  <string name="blocked_call_settings_view_numbers_button">අංක බලන්න</string>
+  <string name="blocked_call_settings_import_button">ආයාත කරන්න</string>
+  <string name="description_blocked_number_list_delete">අංකය අවහිර නොකරන්න</string>
+  <string name="addBlockedNumber">අංකයක් එක් කරන්න</string>
+  <string name="block_number_footer_message_vvm">මෙම අංක වෙතින් වන ඇමතුම් අවහිර කරනු ඇති අතර හඬ තැපැල් ස්වයංක්‍රියව මකනු ඇත.</string>
+  <string name="block_number_footer_message_no_vvm">මෙම අංක වෙතින් වන ඇමතුම් අවහිර කරනු ඇති නමුත්, ඔවුන්ට තවම ඔබට හඬ තැපැල් තැබීමට හැකිය.</string>
+  <string name="block_list">අවහිර කළ අංක</string>
+  <string name="alreadyBlocked">%1$s දැනටමත් අවහිර කර ඇත.</string>
+  <string name="phone_account_settings_label">ගිණුම් ඇමතීම</string>
+  <string name="permission_no_speeddial">වේග ඩයල් කිරීම සබල කිරීමට, සම්බන්ධතා අවසරය ක්‍රියාත්මක කරන්න.</string>
+  <string name="permission_no_calllog">ඔබේ ඇමතුම් ලොගය බැලීමට, දුරකථන අවසරය ක්‍රියාත්මක කරන්න.</string>
+  <string name="permission_no_search">ඔබේ සම්බන්ධතා සෙවීමට, සම්බන්ධතා අවසර ක්‍රියාත්මක කරන්න.</string>
+  <string name="permission_place_call">ඇමතුමක් ලබා ගැනීමට, දුරකථන අවසරය ක්‍රියාත්මක කරන්න.</string>
+  <string name="toast_cannot_write_system_settings">දුරකථන යෙදුමට පද්ධති සැකසීම් වෙත ලිවීමට අවසර නැත.</string>
+  <string name="blocked_number_call_log_label">අවහිර කරන ලදි</string>
+  <string name="call_log_action_block_report_number">අයාචිත තැපැල අවහිර/වාර්තා කර.</string>
+  <string name="call_log_action_block_number">අංකය අවහිර කරන්න</string>
+  <string name="call_log_action_remove_spam">අයාචිත තැපෑලක් නොවේ</string>
+  <string name="call_log_action_unblock_number">අංකය අවහිර නොකරන්න</string>
+  <string name="spam_number_call_log_label">අයාචිත තැපෑල</string>
+  <string name="call_composer_connection_failed">%1$s නොබැඳි අතර ළඟා වීමට නොහැකිය</string>
+  <string name="about_phone_label">ගැන</string>
+  <string name="voicemail_transcription_branding_text">Google මගින් පිටපත් කරන ලදී</string>
+  <string name="voicemail_transcription_in_progress">පිටපත් කරමින්…</string>
+  <string name="voicemail_transcription_failed">අනුපිටපතක් නොමැත.</string>
+  <string name="voicemail_transcription_failed_language_not_supported">අනුපිටපතක් නොමැත. භාෂාව සහාය නොදක්වයි.</string>
+  <string name="voicemail_transcription_failed_no_speech">අනුපිටපතක් නොමැත. කථනය අනාවරණය කරගෙන නැත.</string>
+  <string name="voicemail_donation_promo_title">පිටපත් කිරීමේ නිරවද්‍යතාව වැඩිදියුණු කිරීමට උදව් වන්නද?</string>
+  <string name="voicemail_donation_promo_content">පිටපත් සමග මෙම සහ අනාගත හඬ තැපෑල් පණිවිඩ සමාලෝචනය කිරීමට Google හට ඉඩ දෙන්න. ඒවා නිර්නාමිකව ගබඩා කෙරෙනු ඇත. ඕනෑම අවස්ථාවක සැකසීම් වෙනස් කරන්න. %1$s</string>
+  <string name="voicemail_donation_promo_opt_in">ඔව්, මම කැමතියි</string>
+  <string name="voicemail_donation_promo_opt_out">එපා ස්තූතියි</string>
+  <string name="voicemail_transcription_rating">පිටපත් කිරීමේ ගුණත්වය අගයන්න</string>
+  <string name="voicemail_transcription_rating_thanks">ඔබේ ප්‍රතිපෝෂණයට ස්තුතියි!</string>
+  <string name="description_rating_good">කැමතියි</string>
+  <string name="description_rating_bad">අකමැතියි</string>
+  <string name="view_conversation">බලන්න</string>
+  <string name="ec_data_deleted">ඇමතුම මකන ලදී. Messages වල මෙම ඇමතුම අතරතුර බෙදා ගත් ඇමුණුම් බලා මකන්න.</string>
+  <string name="multiple_ec_data_deleted">ඇමතුම මකන ලදී. Messages වල මෙම ඇමතුම් අතරතුර බෙදා ගත් ඇමුණුම් බලා මකන්න.</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-sk/strings.xml b/java/com/android/dialer/app/res/values-sk/strings.xml
index a5a747a..d2726f3 100644
--- a/java/com/android/dialer/app/res/values-sk/strings.xml
+++ b/java/com/android/dialer/app/res/values-sk/strings.xml
@@ -1,183 +1,175 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="applicationLabel" msgid="2202739481132958990">"Telefón"</string>
-    <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"Klávesnica telefónu"</string>
-    <string name="callHistoryIconLabel" msgid="7493268743411968630">"História hovorov"</string>
-    <string name="action_copy_number_text" msgid="832682558551502319">"Kopírovať číslo"</string>
-    <string name="copy_transcript_text" msgid="937904189017310829">"Kopírovať prepis"</string>
-    <string name="action_edit_number_before_call" msgid="8017492815878473837">"Pred volaním upraviť číslo"</string>
-    <string name="call_log_delete_all" msgid="7852970926906523784">"Vymazať históriu hovorov"</string>
-    <string name="call_log_trash_voicemail" msgid="6118493534178533972">"Odstrániť hlasovú správu"</string>
-    <string name="snackbar_voicemail_deleted" msgid="7463166543725496307">"Hlas. schránka odstránená"</string>
-    <string name="snackbar_voicemail_deleted_undo" msgid="6959743982796409941">"SPÄŤ"</string>
-    <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"Chcete vymazať históriu hovorov?"</string>
-    <string name="clearCallLogConfirmation" msgid="6844949465815109166">"Týmto z histórie odstránite všetky hovory."</string>
-    <string name="clearCallLogProgress_title" msgid="995004835687361977">"Vymazáva sa história hovorov..."</string>
-    <string name="notification_missedCallTitle" msgid="8283366068539898486">"Zmeškaný hovor"</string>
-    <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"Zmeškaný pracovný hovor"</string>
-    <string name="notification_missedCallsTitle" msgid="3697442015345089802">"Zmeškané hovory"</string>
-    <string name="notification_missedCallsMsg" msgid="8176217633929018706">"Zmeškané hovory: <xliff:g id="NUM_MISSED_CALLS">%d</xliff:g>"</string>
-    <string name="notification_missedCall_call_back" msgid="3875698110051973965">"Zavolať"</string>
-    <string name="notification_missedCall_message" msgid="5086910028988305964">"Správa"</string>
-    <string name="post_call_notification_message" msgid="5417476789860590611">"<xliff:g id="NAME">%1$s</xliff:g>: <xliff:g id="MESSAGE">%2$s</xliff:g>"</string>
-    <string name="notification_voicemail_text_format" msgid="1895667520930252897">"Vytočiť číslo <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
-    <string name="notification_voicemail_no_vm_number" msgid="8942821987929495842">"Číslo hlasovej schránky je neznáme"</string>
-    <plurals name="notification_voicemail_title" formatted="false" msgid="1551847434476438657">
-      <item quantity="few"> <xliff:g id="COUNT">%1$d</xliff:g> odkazy v hlasovej schránke </item>
-      <item quantity="many"> <xliff:g id="COUNT">%1$d</xliff:g> odkazu v hlasovej schránke </item>
-      <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> odkazov v hlasovej schránke </item>
-      <item quantity="one">Odkaz v hlasovej schránke</item>
-    </plurals>
-    <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
-    <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"Nová hlasová správa – <xliff:g id="CALLER">%1$s</xliff:g>"</string>
-    <string name="voicemail_playback_error" msgid="4384373852257757295">"Hlasovú schránku sa nepodarilo prehrať"</string>
-    <string name="voicemail_fetching_content" msgid="572320120918636014">"Načítava sa hlasová schránka…"</string>
-    <string name="voicemail_fetching_timout" msgid="2128873915839949783">"Hlasovú schránku sa nepodarilo načítať"</string>
-    <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_playback_speakerphone" msgid="4852027754869750227">"Zapnúť alebo vypnúť reproduktor"</string>
-    <string name="description_playback_seek" msgid="1340910573254132520">"Hľadať pozíciu prehrávania"</string>
-    <string name="action_menu_call_history_description" msgid="8829135306925008546">"História hovorov"</string>
-    <string name="action_menu_overflow_description" msgid="7648679686746517341">"Ďalšie možnosti"</string>
-    <string name="action_menu_dialpad_button" msgid="1970631633457493180">"klávesnica"</string>
-    <string name="dialer_settings_label" msgid="4980176284150290175">"Nastavenia"</string>
-    <string name="simulator_submenu_label" msgid="186156287346615267">"Simulátor"</string>
-    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Vyt. skratku na nové rozhranie"</string>
-    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"Vstupuje sa do režimu hromadných akcií"</string>
-    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"Odišli ste z režimu hromadných akcií"</string>
-    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"Položka <xliff:g id="NAMEORNUMBER">%1$s</xliff:g> bola vybraná"</string>
-    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"Výber položky <xliff:g id="NAMEORNUMBER">%1$s</xliff:g> bol zrušený"</string>
-    <string name="description_contact_details" msgid="3341280873855253464">"Podrobnosti kontaktu pre <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_spam_contact_details" msgid="5592578752881528368">"Podrobnosti kontaktu pri podozrení, že volajúci <xliff:g id="NAMEORNUMBER">%1$s</xliff:g> je šíriteľ spamu"</string>
-    <string name="description_num_calls" msgid="6483594535796216044">"Počet volaní: <xliff:g id="NUMBEROFCALLS">%1$s</xliff:g>."</string>
-    <string name="description_video_call" msgid="3738199365585751727">"Videohovor"</string>
-    <string name="description_start_voice_search" msgid="8380022725973015261">"Spustenie hlasového vyhľadávania"</string>
-    <string name="voicemail" msgid="8899540969000957954">"Hlasová schránka"</string>
-    <string name="description_cancel_multi_select" msgid="3930475950253360461">"Zrušiť režim hromadných akcií"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Odstrániť"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Zrušiť"</string>
-    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"Vybraté: <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
-      <item quantity="few">"<b>"Chcete odstrániť tieto hlasové správy? "</b>"</item>
-      <item quantity="many">"<b>"Chcete odstrániť tieto hlasové správy? "</b>"</item>
-      <item quantity="other">"<b>"Chcete odstrániť tieto hlasové správy? "</b>"</item>
-      <item quantity="one">"<b>"Chcete odstrániť túto hlasovú správu? "</b>"</item>
-    </plurals>
-    <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
-    <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> o <xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
-    <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="voice_search_not_available" msgid="6546240433719732905">"Hlasové vyhľadávanie nie je k dispozícii"</string>
-    <string name="dialer_hint_find_contact" msgid="2023214799381149808">"Hľadať v kontaktoch"</string>
-    <string name="block_number_search_hint" msgid="5377706079015099416">"Pridajte číslo / vyhľadajte v kontaktoch"</string>
-    <string name="call_log_all_empty" msgid="3955572868518162004">"História hovorov je prázdna"</string>
-    <string name="call_log_all_empty_action" msgid="852218280136243014">"Zavolať"</string>
-    <string name="call_log_missed_empty" msgid="7094936030845062214">"Nemáte žiadne zmeškané hovory."</string>
-    <string name="call_log_voicemail_empty" msgid="273623903423275178">"Hlasová schránka je prázdna."</string>
-    <string name="call_log_activity_title" msgid="1275242727244945527">"História hovorov"</string>
-    <string name="call_log_all_title" msgid="6042262422192020327">"Všetky"</string>
-    <string name="call_log_missed_title" msgid="17254005889268015">"Zmeškané"</string>
-    <string name="tab_speed_dial" msgid="6616404752227561075">"Rýchla voľba"</string>
-    <string name="tab_history" msgid="7420269368689503596">"História hovorov"</string>
-    <string name="tab_all_contacts" msgid="5531733977693943015">"Kontakty"</string>
-    <string name="tab_voicemail" msgid="2458548090088316246">"Hlasová schránka"</string>
-    <string name="search_shortcut_call_number" msgid="8847918845036880688">"Volať <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"Vytvoriť nový kontakt"</string>
-    <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"Pridať ku kontaktu"</string>
-    <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"Odoslať SMS"</string>
-    <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"Uskutočniť videohovor"</string>
-    <string name="search_shortcut_block_number" msgid="4587283230665805776">"Blokovať číslo"</string>
-    <string name="speed_dial_empty" msgid="3346406399966039505">"V rýchlej voľbe zatiaľ nemáte žiadny kontakt"</string>
-    <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"Pridať obľúbený kontakt"</string>
-    <string name="remove_contact" msgid="2353580570488923668">"Odstrániť"</string>
-    <string name="select_all" msgid="408601760696146245">"Vybrať všetko"</string>
-    <string name="call_log_action_video_call" msgid="7565549950343850819">"Videohovor"</string>
-    <string name="call_log_action_send_message" msgid="6948727362660115554">"Odoslať správu"</string>
-    <string name="call_log_action_details" msgid="2091370737371449501">"Podrobnosti hovoru"</string>
-    <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"Poslať cez aplikáciu…"</string>
-    <string name="call_log_action_call" msgid="682724094251540583">"Zavolať kontakt <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_incoming_missed_call" msgid="8292535799379230029">"Zmeškaný hovor – kontakt <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_incoming_answered_call" msgid="3920182963103160610">"Prijatý hovor – kontakt <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_unread_voicemail" msgid="145170985013419170">"Neprečítaná správa v hlasovej schránke od <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_read_voicemail" msgid="5585559881573227732">"Správa v hlasovej schránke od <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_outgoing_call" msgid="543952487882919924">"Volanie – kontakt <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="call_log_via_number" msgid="1340307109806397650">"prostredníctvom čísla <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> prostredníctvom čísla <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="description_call_action" msgid="4042796498169106545">"Zavolať kontakt <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_video_call_action" msgid="1237090968588659650">"Spustiť videohovor s kontaktom <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_action" msgid="3290143432403538524">"Vypočuť si správu v hlasovej schránke od používateľa <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_create_new_contact_action" msgid="1928282350281564130">"Vytvoriť kontakt pre <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"Pridať údaj <xliff:g id="NAMEORNUMBER">^1</xliff:g> ku kontaktu"</string>
-    <string name="description_details_action" msgid="2061866409737706174">"Podrobnosti hovoru pre kontakt <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="call_log_header_today" msgid="1576119097475845293">"Dnes"</string>
-    <string name="call_log_header_yesterday" msgid="5616077776205329563">"Včera"</string>
-    <string name="call_log_header_other" msgid="4940676886254217644">"Staršie"</string>
-    <string name="voicemail_speaker_on" msgid="3151333608926996668">"Zapnúť reproduktor"</string>
-    <string name="voicemail_speaker_off" msgid="2530064206962034201">"Vypnúť reproduktor"</string>
-    <string name="voicemail_play_start_pause" msgid="3874823480278334664">"Spustiť alebo pozastaviť prehrávanie"</string>
-    <string name="display_options_title" msgid="3880091801055797975">"Možnosti zobrazenia"</string>
-    <string name="sounds_and_vibration_title" msgid="3075050000721181384">"Zvuky a vibrovanie"</string>
-    <string name="accessibility_settings_title" msgid="3329027650429831820">"Dostupnosť"</string>
-    <string name="ringtone_title" msgid="8377174189894648486">"Tón zvonenia telefónu"</string>
-    <string name="vibrate_on_ring_title" msgid="631441314790960485">"Pri zvonení aj vibrovať"</string>
-    <string name="dtmf_tone_enable_title" msgid="3273762431523939277">"Tóny klávesnice"</string>
-    <string name="dtmf_tone_length_title" msgid="534096029202438539">"Dĺžka tónov klávesnice"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="applicationLabel">Telefón</string>
+  <string name="launcherDialpadActivityLabel">Klávesnica telefónu</string>
+  <string name="callHistoryIconLabel">História hovorov</string>
+  <string name="action_copy_number_text">Kopírovať číslo</string>
+  <string name="copy_transcript_text">Kopírovať prepis</string>
+  <string name="action_edit_number_before_call">Pred volaním upraviť číslo</string>
+  <string name="call_log_delete_all">Vymazať históriu hovorov</string>
+  <string name="call_log_trash_voicemail">Odstrániť hlasovú správu</string>
+  <string name="snackbar_voicemail_deleted">Hlas. schránka odstránená</string>
+  <string name="clearCallLogConfirmation_title">Chcete vymazať históriu hovorov?</string>
+  <string name="clearCallLogConfirmation">Týmto z histórie odstránite všetky hovory.</string>
+  <string name="clearCallLogProgress_title">Vymazáva sa história hovorov...</string>
+  <string name="notification_missedCallTitle">Zmeškaný hovor</string>
+  <string name="notification_missedWorkCallTitle">Zmeškaný pracovný hovor</string>
+  <string name="notification_missedCallsTitle">Zmeškané hovory</string>
+  <string name="notification_missedCallsMsg">Zmeškané hovory: %d</string>
+  <string name="notification_missedCall_call_back">Zavolať</string>
+  <string name="notification_missedCall_message">Správa</string>
+  <string name="post_call_notification_message">%1$s: %2$s</string>
+  <string name="notification_voicemail_text_format">Vytočiť číslo %s</string>
+  <string name="notification_voicemail_no_vm_number">Číslo hlasovej schránky je neznáme</string>
+  <plurals name="notification_voicemail_title">
+    <item quantity="one">Odkaz v hlasovej schránke</item>
+    <item quantity="few"> %1$d odkazy v hlasovej schránke </item>
+    <item quantity="many"> %1$d odkazu v hlasovej schránke </item>
+    <item quantity="other"> %1$d odkazov v hlasovej schránke </item>
+  </plurals>
+  <string name="notification_voicemail_callers_list">%1$s, %2$s</string>
+  <string name="notification_new_voicemail_ticker">Nová hlasová správa – %1$s</string>
+  <string name="voicemail_playback_error">Hlasovú schránku sa nepodarilo prehrať</string>
+  <string name="voicemail_fetching_content">Načítava sa hlasová schránka…</string>
+  <string name="voicemail_fetching_timout">Hlasovú schránku sa nepodarilo načítať</string>
+  <string name="call_log_item_count_and_date">(%1$d) %2$s</string>
+  <string name="description_playback_speakerphone">Zapnúť alebo vypnúť reproduktor</string>
+  <string name="description_playback_seek">Hľadať pozíciu prehrávania</string>
+  <string name="action_menu_call_history_description">História hovorov</string>
+  <string msgid="2295659037509008453" name="action_menu_overflow_description">Ďalšie možnosti</string>
+  <string name="action_menu_dialpad_button">klávesnica</string>
+  <string name="dialer_settings_label">Nastavenia</string>
+  <string name="simulator_submenu_label">Simulátor</string>
+  <string name="new_ui_launcher_shortcut_label">Vyt. skratku na nové rozhranie</string>
+  <string name="description_entering_bulk_action_mode">Vstupuje sa do režimu hromadných akcií</string>
+  <string name="description_leaving_bulk_action_mode">Odišli ste z režimu hromadných akcií</string>
+  <string name="description_selecting_bulk_action_mode">Položka %1$s bola vybraná</string>
+  <string name="description_unselecting_bulk_action_mode">Výber položky %1$s bol zrušený</string>
+  <string name="description_contact_details">Podrobnosti kontaktu pre %1$s</string>
+  <string name="description_spam_contact_details">Podrobnosti kontaktu pri podozrení, že volajúci %1$s je šíriteľ spamu</string>
+  <string name="description_num_calls">Počet volaní: %1$s.</string>
+  <string name="description_video_call">Videohovor</string>
+  <string name="description_start_voice_search">Spustenie hlasového vyhľadávania</string>
+  <string name="voicemail">Hlasová schránka</string>
+  <string name="description_cancel_multi_select">Zrušiť režim hromadných akcií</string>
+  <string name="voicemailMultiSelectDeleteConfirm">Odstrániť</string>
+  <string name="voicemailMultiSelectDeleteCancel">Zrušiť</string>
+  <string name="voicemailMultiSelectActionBarTitle">Vybraté: %1$s</string>
+  <plurals name="delete_voicemails_confirmation_dialog_title">
+    <item quantity="one"><b>Chcete odstrániť túto hlasovú správu? </b></item>
+    <item quantity="few"><b>Chcete odstrániť tieto hlasové správy? </b></item>
+    <item quantity="many"><b>Chcete odstrániť tieto hlasové správy? </b></item>
+    <item quantity="other"><b>Chcete odstrániť tieto hlasové správy? </b></item>
+  </plurals>
+  <string name="voicemailCallLogToday">@string/call_log_header_today</string>
+  <string name="voicemailCallLogDateTimeFormat">%1$s o %2$s</string>
+  <string name="voicemailDurationFormat">%1$02d:%2$02d</string>
+  <string name="voicemailCallLogDateTimeFormatWithDuration">%1$s • %2$s</string>
+  <string name="voice_search_not_available">Hlasové vyhľadávanie nie je k dispozícii</string>
+  <string name="dialer_hint_find_contact">Hľadať v kontaktoch</string>
+  <string name="block_number_search_hint">Pridajte číslo / vyhľadajte v kontaktoch</string>
+  <string name="call_log_all_empty">História hovorov je prázdna</string>
+  <string name="call_log_all_empty_action">Zavolať</string>
+  <string name="call_log_missed_empty">Nemáte žiadne zmeškané hovory.</string>
+  <string name="call_log_voicemail_empty">Hlasová schránka je prázdna.</string>
+  <string name="call_log_activity_title">História hovorov</string>
+  <string name="call_log_all_title">Všetky</string>
+  <string name="call_log_missed_title">Zmeškané</string>
+  <string name="tab_speed_dial">Rýchla voľba</string>
+  <string name="tab_history">História hovorov</string>
+  <string name="tab_all_contacts">Kontakty</string>
+  <string name="tab_voicemail">Hlasová schránka</string>
+  <string name="search_shortcut_call_number">Volať %s</string>
+  <string name="search_shortcut_create_new_contact">Vytvoriť nový kontakt</string>
+  <string name="search_shortcut_add_to_contact">Pridať ku kontaktu</string>
+  <string name="search_shortcut_send_sms_message">Odoslať SMS</string>
+  <string name="search_shortcut_make_video_call">Uskutočniť videohovor</string>
+  <string name="search_shortcut_block_number">Blokovať číslo</string>
+  <string name="speed_dial_empty">V rýchlej voľbe zatiaľ nemáte žiadny kontakt</string>
+  <string name="speed_dial_empty_add_favorite_action">Pridať obľúbený kontakt</string>
+  <string name="remove_contact">Odstrániť</string>
+  <string name="select_all">Vybrať všetko</string>
+  <string name="call_log_action_video_call">Videohovor</string>
+  <string name="call_log_action_set_up_video">Nastaviť videohovory</string>
+  <string name="call_log_action_invite_video">Pozvať na videohovor</string>
+  <string name="call_log_action_send_message">Odoslať správu</string>
+  <string name="call_log_action_details">Podrobnosti hovoru</string>
+  <string name="call_log_action_share_voicemail">Poslať cez aplikáciu…</string>
+  <string name="call_log_action_call">Zavolať kontakt ^1</string>
+  <string name="description_incoming_missed_call">Zmeškaný hovor – kontakt ^1, ^2, ^3, ^4.</string>
+  <string name="description_incoming_answered_call">Prijatý hovor – kontakt ^1, ^2, ^3, ^4.</string>
+  <string name="description_unread_voicemail">Neprečítaná správa v hlasovej schránke od ^1, ^2, ^3, ^4.</string>
+  <string name="description_read_voicemail">Správa v hlasovej schránke od ^1, ^2, ^3, ^4.</string>
+  <string name="description_outgoing_call">Volanie – kontakt ^1, ^2, ^3, ^4.</string>
+  <string name="call_log_via_number">prostredníctvom čísla %1$s</string>
+  <string name="call_log_via_number_phone_account">%1$s prostredníctvom čísla %2$s</string>
+  <string name="description_call_action">Zavolať kontakt ^1</string>
+  <string name="description_video_call_action">Spustiť videohovor s kontaktom ^1</string>
+  <string name="description_voicemail_action">Vypočuť si správu v hlasovej schránke od používateľa ^1</string>
+  <string name="description_create_new_contact_action">Vytvoriť kontakt pre ^1</string>
+  <string name="description_add_to_existing_contact_action">Pridať údaj ^1 ku kontaktu</string>
+  <string name="description_details_action">Podrobnosti hovoru pre kontakt ^1</string>
+  <string name="call_log_header_today">Dnes</string>
+  <string name="call_log_header_yesterday">Včera</string>
+  <string name="call_log_header_other">Staršie</string>
+  <string name="voicemail_speaker_on">Zapnúť reproduktor</string>
+  <string name="voicemail_speaker_off">Vypnúť reproduktor</string>
+  <string name="voicemail_play_start_pause">Spustiť alebo pozastaviť prehrávanie</string>
+  <string name="display_options_title">Možnosti zobrazenia</string>
+  <string name="sounds_and_vibration_title">Zvuky a vibrovanie</string>
+  <string name="accessibility_settings_title">Dostupnosť</string>
+  <string name="ringtone_title">Tón zvonenia telefónu</string>
+  <string name="vibrate_on_ring_title">Pri zvonení aj vibrovať</string>
+  <string name="dtmf_tone_enable_title">Tóny klávesnice</string>
+  <string name="dtmf_tone_length_title">Dĺžka tónov klávesnice</string>
   <string-array name="dtmf_tone_length_entries">
-    <item msgid="3136353015227162823">"Normálne"</item>
-    <item msgid="5376841175538523822">"Dlhé"</item>
+    <item>Normálne</item>
+    <item>Dlhé</item>
   </string-array>
-    <string name="respond_via_sms_setting_title" msgid="8008181606657693452">"Rýchle odpovede"</string>
-    <string name="call_settings_label" msgid="7824611757200960807">"Hovory"</string>
-    <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Blokovanie hovorov"</string>
-    <string name="voicemail_settings_label" msgid="4594299554519920570">"Hlasová schránka"</string>
-    <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Blokovanie hovorov je dočasne vypnuté"</string>
-    <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Pretože ste z tohto telefónu počas posledných 48 hodín volali na tiesňovú linku, blokovanie hovorov bolo vypnuté. Po uplynutí 48 hodín sa automaticky znova zapne."</string>
-    <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Importovať čísla"</string>
-    <string name="blocked_call_settings_import_description" msgid="1819412052545228965">"V minulosti ste niektorých volajúcich označili, aby boli automaticky prepojení do hlasovej schránky prostredníctvom ďalších aplikácií."</string>
-    <string name="blocked_call_settings_view_numbers_button" msgid="3332727948554356704">"Zobraziť čísla"</string>
-    <string name="blocked_call_settings_import_button" msgid="7319111700387470727">"Importovať"</string>
-    <string name="description_blocked_number_list_delete" msgid="2139644216858370740">"Zrušiť blokovanie čísla"</string>
-    <string name="addBlockedNumber" msgid="3053473735238295551">"Pridať číslo"</string>
-    <string name="block_number_footer_message_vvm" msgid="7955326304033982368">"Hovory z týchto čísel budú blokované a hlasové správy budú automaticky odstraňované."</string>
-    <string name="block_number_footer_message_no_vvm" msgid="1152684139070471665">"Hovory z týchto čísel budú blokované, ale volajúci vám budú stále môcť zanechať hlasové správy."</string>
-    <string name="block_list" msgid="4701585783411870782">"Blokované čísla"</string>
-    <string name="alreadyBlocked" msgid="5483253180532475653">"Číslo <xliff:g id="NUMBER">%1$s</xliff:g> je už blokované."</string>
-    <string name="phone_account_settings_label" msgid="8372485478006965920">"Telefónne účty"</string>
-    <string name="permission_no_speeddial" msgid="8487215628510596753">"Ak chcete aktivovať rýchlu voľbu, zapnite povolenie Kontakty."</string>
-    <string name="permission_no_calllog" msgid="4053705651238775784">"Ak si chcete zobraziť denník hovorov, zapnite povolenie Telefón."</string>
-    <string name="permission_no_search" msgid="2424710404207193826">"Ak chcete hľadať kontakty, zapnite povolenie Kontakty."</string>
-    <string name="permission_place_call" msgid="8686908130349369423">"Ak chcete volať, zapnite povolenie Telefón."</string>
-    <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"Telefónna aplikácia nemá povolenie na zápis do nastavení systému."</string>
-    <string name="blocked_number_call_log_label" msgid="4212282846299997693">"Blokované"</string>
-    <string name="call_log_action_block_report_number" msgid="7302636538668696729">"Blokovať / nahlásiť spam"</string>
-    <string name="call_log_action_block_number" msgid="5048188386501998865">"Blokovať číslo"</string>
-    <string name="call_log_action_remove_spam" msgid="2045319806318398403">"Toto nie je spam"</string>
-    <string name="call_log_action_unblock_number" msgid="6100117033288448758">"Zrušiť blokovanie čísla"</string>
-    <string name="spam_number_call_log_label" msgid="2678431398326811131">"Spam"</string>
-    <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> je offline a nedá sa zastihnúť"</string>
-    <string name="about_phone_label" msgid="582991354677973731">"Informácie"</string>
-    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Prepísané Googlom"</string>
-    <string name="voicemail_transcription_in_progress" msgid="2933320969613783210">"Google prepisuje správu…"</string>
-    <string name="voicemail_transcription_failed" msgid="335275303117412706">"Prepis nie je k dispozícii."</string>
-    <string name="voicemail_transcription_failed_language_not_supported" msgid="4210332591050562553">"Prepis nie je k dispozícii. Jazyk nie je podporovaný."</string>
-    <string name="voicemail_transcription_failed_no_speech" msgid="9093372879697874852">"Prepis nie je k dispozícii. Nebola zistená žiadna reč."</string>
-    <string name="view_conversation" msgid="7895904782094119702">"Zobraziť"</string>
-    <string name="ec_data_deleted" msgid="4794880345545827107">"Hovor bol odstránený. Prílohy zdieľané počas neho si môžete pozrieť a odstrániť v aplikácii Správy."</string>
-    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"Hovory boli odstránené. Prílohy zdieľané počas nich si môžete pozrieť a odstrániť v aplikácii Správy."</string>
+  <string name="respond_via_sms_setting_title">Rýchle odpovede</string>
+  <string name="call_settings_label">Hovory</string>
+  <string name="manage_blocked_numbers_label">Blokované čísla</string>
+  <string name="voicemail_settings_label">Hlasová schránka</string>
+  <string name="blocked_numbers_disabled_emergency_header_label">Blokovanie hovorov je dočasne vypnuté</string>
+  <string name="blocked_numbers_disabled_emergency_desc">Pretože ste z tohto telefónu počas posledných 48 hodín volali na tiesňovú linku, blokovanie hovorov bolo vypnuté. Po uplynutí 48 hodín sa automaticky znova zapne.</string>
+  <string name="import_send_to_voicemail_numbers_label">Importovať čísla</string>
+  <string name="blocked_call_settings_import_description">V minulosti ste niektorých volajúcich označili, aby boli automaticky prepojení do hlasovej schránky prostredníctvom ďalších aplikácií.</string>
+  <string name="blocked_call_settings_view_numbers_button">Zobraziť čísla</string>
+  <string name="blocked_call_settings_import_button">Importovať</string>
+  <string name="description_blocked_number_list_delete">Zrušiť blokovanie čísla</string>
+  <string name="addBlockedNumber">Pridať číslo</string>
+  <string name="block_number_footer_message_vvm">Hovory z týchto čísel budú blokované a hlasové správy budú automaticky odstraňované.</string>
+  <string name="block_number_footer_message_no_vvm">Hovory z týchto čísel budú blokované, ale volajúci vám budú stále môcť zanechať hlasové správy.</string>
+  <string name="block_list">Blokované čísla</string>
+  <string name="alreadyBlocked">Číslo %1$s je už blokované.</string>
+  <string name="phone_account_settings_label">Telefónne účty</string>
+  <string name="permission_no_speeddial">Ak chcete aktivovať rýchlu voľbu, zapnite povolenie Kontakty.</string>
+  <string name="permission_no_calllog">Ak si chcete zobraziť denník hovorov, zapnite povolenie Telefón.</string>
+  <string name="permission_no_search">Ak chcete hľadať kontakty, zapnite povolenie Kontakty.</string>
+  <string name="permission_place_call">Ak chcete volať, zapnite povolenie Telefón.</string>
+  <string name="toast_cannot_write_system_settings">Telefónna aplikácia nemá povolenie na zápis do nastavení systému.</string>
+  <string name="blocked_number_call_log_label">Blokované</string>
+  <string name="call_log_action_block_report_number">Blokovať / nahlásiť spam</string>
+  <string name="call_log_action_block_number">Blokovať číslo</string>
+  <string name="call_log_action_remove_spam">Toto nie je spam</string>
+  <string name="call_log_action_unblock_number">Zrušiť blokovanie čísla</string>
+  <string name="spam_number_call_log_label">Spam</string>
+  <string name="call_composer_connection_failed">%1$s je offline a nedá sa zastihnúť</string>
+  <string name="about_phone_label">Informácie</string>
+  <string name="voicemail_transcription_branding_text">Prepísané Googlom</string>
+  <string name="voicemail_transcription_in_progress">Prepisuje sa…</string>
+  <string name="voicemail_transcription_failed">Prepis nie je k dispozícii.</string>
+  <string name="voicemail_transcription_failed_language_not_supported">Prepis nie je k dispozícii. Jazyk nie je podporovaný.</string>
+  <string name="voicemail_transcription_failed_no_speech">Prepis nie je k dispozícii. Nebola zistená žiadna reč.</string>
+  <string name="voicemail_donation_promo_title">Chcete pomôcť so zlepšovaním presnosti prepisov?</string>
+  <string name="voicemail_donation_promo_content">Umožnite Googlu skontrolovať túto a budúce hlasové správy s prepismi. Správy budú ukladané anonymne. Nastavenia môžete kedykoľvek zmeniť. %1$s</string>
+  <string name="voicemail_donation_promo_opt_in">Áno, súhlasím</string>
+  <string name="voicemail_donation_promo_opt_out">Nie, vďaka</string>
+  <string name="voicemail_transcription_rating">Ohodnoťte kvalitu prepisu</string>
+  <string name="voicemail_transcription_rating_thanks">Ďakujeme vám za spätnú väzbu</string>
+  <string name="description_rating_good">Páči sa mi</string>
+  <string name="description_rating_bad">Nepáči sa mi</string>
+  <string name="view_conversation">Zobraziť</string>
+  <string name="ec_data_deleted">Hovor bol odstránený. Prílohy zdieľané počas neho si môžete pozrieť a odstrániť v aplikácii Správy.</string>
+  <string name="multiple_ec_data_deleted">Hovory boli odstránené. Prílohy zdieľané počas nich si môžete pozrieť a odstrániť v aplikácii Správy.</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-sl/strings.xml b/java/com/android/dialer/app/res/values-sl/strings.xml
index 8e97cbd..5b00bd5 100644
--- a/java/com/android/dialer/app/res/values-sl/strings.xml
+++ b/java/com/android/dialer/app/res/values-sl/strings.xml
@@ -1,183 +1,175 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="applicationLabel" msgid="2202739481132958990">"Telefon"</string>
-    <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"Tipkovnica telefona"</string>
-    <string name="callHistoryIconLabel" msgid="7493268743411968630">"Zgodovina klicev"</string>
-    <string name="action_copy_number_text" msgid="832682558551502319">"Kopiranje številke"</string>
-    <string name="copy_transcript_text" msgid="937904189017310829">"Kopiraj prepis"</string>
-    <string name="action_edit_number_before_call" msgid="8017492815878473837">"Urejanje številke pred klicem"</string>
-    <string name="call_log_delete_all" msgid="7852970926906523784">"Izbriši zgodovino klicev"</string>
-    <string name="call_log_trash_voicemail" msgid="6118493534178533972">"Brisanje sporočil iz odzivnika"</string>
-    <string name="snackbar_voicemail_deleted" msgid="7463166543725496307">"Spor. v odziv. izbr."</string>
-    <string name="snackbar_voicemail_deleted_undo" msgid="6959743982796409941">"RAZVELJAVI"</string>
-    <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"Želite izbrisati zgodovino klicev?"</string>
-    <string name="clearCallLogConfirmation" msgid="6844949465815109166">"S tem boste iz zgodovine izbrisali vse klice"</string>
-    <string name="clearCallLogProgress_title" msgid="995004835687361977">"Izbris zgodovine klicev …"</string>
-    <string name="notification_missedCallTitle" msgid="8283366068539898486">"Neodgovorjeni klic"</string>
-    <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"Zgrešen delovni klic"</string>
-    <string name="notification_missedCallsTitle" msgid="3697442015345089802">"Neodgovorjeni klici"</string>
-    <string name="notification_missedCallsMsg" msgid="8176217633929018706">"Št. neodgovorjenih klicev: <xliff:g id="NUM_MISSED_CALLS">%d</xliff:g>"</string>
-    <string name="notification_missedCall_call_back" msgid="3875698110051973965">"Povratni klic"</string>
-    <string name="notification_missedCall_message" msgid="5086910028988305964">"SMS"</string>
-    <string name="post_call_notification_message" msgid="5417476789860590611">"<xliff:g id="NAME">%1$s</xliff:g>: <xliff:g id="MESSAGE">%2$s</xliff:g>"</string>
-    <string name="notification_voicemail_text_format" msgid="1895667520930252897">"Kliči <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
-    <string name="notification_voicemail_no_vm_number" msgid="8942821987929495842">"Neznana številka odzivnika"</string>
-    <plurals name="notification_voicemail_title" formatted="false" msgid="1551847434476438657">
-      <item quantity="one"> <xliff:g id="COUNT">%1$d</xliff:g> sporočilo v odzivniku </item>
-      <item quantity="two"> <xliff:g id="COUNT">%1$d</xliff:g> sporočili v odzivniku </item>
-      <item quantity="few"> <xliff:g id="COUNT">%1$d</xliff:g> sporočila v odzivniku </item>
-      <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> sporočil v odzivniku </item>
-    </plurals>
-    <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g> , <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
-    <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"Nova glasovna pošta od <xliff:g id="CALLER">%1$s</xliff:g>"</string>
-    <string name="voicemail_playback_error" msgid="4384373852257757295">"Sporočil v odzivniku ni mogoče predv."</string>
-    <string name="voicemail_fetching_content" msgid="572320120918636014">"Nalaganje sporočil v odzivniku …"</string>
-    <string name="voicemail_fetching_timout" msgid="2128873915839949783">"Sporočil v odzivniku ni mogoče naložiti"</string>
-    <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_playback_speakerphone" msgid="4852027754869750227">"Vklop ali izklop zvočnika"</string>
-    <string name="description_playback_seek" msgid="1340910573254132520">"Iskanje položaja predvajanja"</string>
-    <string name="action_menu_call_history_description" msgid="8829135306925008546">"Zgodovina klicev"</string>
-    <string name="action_menu_overflow_description" msgid="7648679686746517341">"Več možnosti"</string>
-    <string name="action_menu_dialpad_button" msgid="1970631633457493180">"tipkovnica"</string>
-    <string name="dialer_settings_label" msgid="4980176284150290175">"Nastavitve"</string>
-    <string name="simulator_submenu_label" msgid="186156287346615267">"Simulator"</string>
-    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Ustvari bliž. za novi up. vm."</string>
-    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"Prehod v način množičnega dejanja"</string>
-    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"Prehod iz načina množičnega dejanja"</string>
-    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"Izbrano: <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"Preklican izbor: <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_contact_details" msgid="3341280873855253464">"Podrobnosti stika za <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_spam_contact_details" msgid="5592578752881528368">"Podrobnosti stika za domnevnega neželenega klicatelja <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_num_calls" msgid="6483594535796216044">"Št. klicev: <xliff:g id="NUMBEROFCALLS">%1$s</xliff:g>."</string>
-    <string name="description_video_call" msgid="3738199365585751727">"Videoklic."</string>
-    <string name="description_start_voice_search" msgid="8380022725973015261">"Začni glasovno iskanje"</string>
-    <string name="voicemail" msgid="8899540969000957954">"Glasovna pošta"</string>
-    <string name="description_cancel_multi_select" msgid="3930475950253360461">"Prekliči način množičnega dejanja"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Izbriši"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Prekliči"</string>
-    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"Št. izbranih: <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
-      <item quantity="one">"<b>"Želite izbrisati ta sporočila v odzivniku? "</b>"</item>
-      <item quantity="two">"<b>"Želite izbrisati ta sporočila v odzivniku? "</b>"</item>
-      <item quantity="few">"<b>"Želite izbrisati ta sporočila v odzivniku? "</b>"</item>
-      <item quantity="other">"<b>"Želite izbrisati ta sporočila v odzivniku? "</b>"</item>
-    </plurals>
-    <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
-    <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> ob <xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
-    <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="voice_search_not_available" msgid="6546240433719732905">"Glasovno iskanje ni na voljo"</string>
-    <string name="dialer_hint_find_contact" msgid="2023214799381149808">"Iskanje stikov"</string>
-    <string name="block_number_search_hint" msgid="5377706079015099416">"Dodajte št. ali iščite med st."</string>
-    <string name="call_log_all_empty" msgid="3955572868518162004">"Zgodovina klicev je prazna"</string>
-    <string name="call_log_all_empty_action" msgid="852218280136243014">"Klicanje"</string>
-    <string name="call_log_missed_empty" msgid="7094936030845062214">"Nimate neodgovorjenih klicev."</string>
-    <string name="call_log_voicemail_empty" msgid="273623903423275178">"Vaša mapa s sporočili v odzivniku je prazna."</string>
-    <string name="call_log_activity_title" msgid="1275242727244945527">"Zgodovina klicev"</string>
-    <string name="call_log_all_title" msgid="6042262422192020327">"Vsi"</string>
-    <string name="call_log_missed_title" msgid="17254005889268015">"Neodgovorjeni"</string>
-    <string name="tab_speed_dial" msgid="6616404752227561075">"Hitro izbiranje"</string>
-    <string name="tab_history" msgid="7420269368689503596">"Zgodovina klicev"</string>
-    <string name="tab_all_contacts" msgid="5531733977693943015">"Stiki"</string>
-    <string name="tab_voicemail" msgid="2458548090088316246">"Odzivnik"</string>
-    <string name="search_shortcut_call_number" msgid="8847918845036880688">"Pokliči <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"Ustvari nov stik"</string>
-    <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"Dodaj stiku"</string>
-    <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"Pošlji SMS"</string>
-    <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"Opravi videoklic"</string>
-    <string name="search_shortcut_block_number" msgid="4587283230665805776">"Blokiraj številko"</string>
-    <string name="speed_dial_empty" msgid="3346406399966039505">"Na seznamu za hitro klicanje nimate še nikogar"</string>
-    <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"Dodajte priljubljenega"</string>
-    <string name="remove_contact" msgid="2353580570488923668">"Odstrani"</string>
-    <string name="select_all" msgid="408601760696146245">"Izberi vse"</string>
-    <string name="call_log_action_video_call" msgid="7565549950343850819">"Videoklic"</string>
-    <string name="call_log_action_send_message" msgid="6948727362660115554">"Pošljite sporočilo"</string>
-    <string name="call_log_action_details" msgid="2091370737371449501">"Podrobnosti klica"</string>
-    <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"Pošlji …"</string>
-    <string name="call_log_action_call" msgid="682724094251540583">"Kliči osebo/številko <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_incoming_missed_call" msgid="8292535799379230029">"Neodgovorjen klic od: <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_incoming_answered_call" msgid="3920182963103160610">"Odgovorjen klic od: <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_unread_voicemail" msgid="145170985013419170">"Neprebrano sporočilo v odzivniku za račun <xliff:g id="PHONEACCOUNT">^4</xliff:g> ob <xliff:g id="TIMEOFCALL">^3</xliff:g> od: <xliff:g id="NAMEORNUMBER">^1</xliff:g> – <xliff:g id="TYPEORLOCATION">^2</xliff:g>."</string>
-    <string name="description_read_voicemail" msgid="5585559881573227732">"Sporočilo v odzivniku za račun <xliff:g id="PHONEACCOUNT">^4</xliff:g> ob <xliff:g id="TIMEOFCALL">^3</xliff:g> od: <xliff:g id="NAMEORNUMBER">^1</xliff:g> – <xliff:g id="TYPEORLOCATION">^2</xliff:g>."</string>
-    <string name="description_outgoing_call" msgid="543952487882919924">"Klic za: <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="call_log_via_number" msgid="1340307109806397650">"prek številke <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> prek številke <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="description_call_action" msgid="4042796498169106545">"Klicanje: <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_video_call_action" msgid="1237090968588659650">"Videoklic: <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
-    <string name="description_voicemail_action" msgid="3290143432403538524">"Poslušajte sporočilo v odzivniku od: <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_create_new_contact_action" msgid="1928282350281564130">"Ustvarjanja stika za: <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"Dodajanje tega obstoječemu stiku: <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_details_action" msgid="2061866409737706174">"Podrobnosti klica za: <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="call_log_header_today" msgid="1576119097475845293">"Danes"</string>
-    <string name="call_log_header_yesterday" msgid="5616077776205329563">"Včeraj"</string>
-    <string name="call_log_header_other" msgid="4940676886254217644">"Starejši"</string>
-    <string name="voicemail_speaker_on" msgid="3151333608926996668">"Vklopi zvočnik."</string>
-    <string name="voicemail_speaker_off" msgid="2530064206962034201">"Izklopi zvočnik."</string>
-    <string name="voicemail_play_start_pause" msgid="3874823480278334664">"Začni ali zaustavi predvajanje."</string>
-    <string name="display_options_title" msgid="3880091801055797975">"Možnosti prikaza"</string>
-    <string name="sounds_and_vibration_title" msgid="3075050000721181384">"Zvoki in vibriranje"</string>
-    <string name="accessibility_settings_title" msgid="3329027650429831820">"Funkcije za ljudi s posebnimi potrebami"</string>
-    <string name="ringtone_title" msgid="8377174189894648486">"Ton zvonjenja telefona"</string>
-    <string name="vibrate_on_ring_title" msgid="631441314790960485">"Vibriranje tudi za klice"</string>
-    <string name="dtmf_tone_enable_title" msgid="3273762431523939277">"Toni tipkovnice"</string>
-    <string name="dtmf_tone_length_title" msgid="534096029202438539">"Dolžina tonov tipkovnice"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="applicationLabel">Telefon</string>
+  <string name="launcherDialpadActivityLabel">Tipkovnica telefona</string>
+  <string name="callHistoryIconLabel">Zgodovina klicev</string>
+  <string name="action_copy_number_text">Kopiranje številke</string>
+  <string name="copy_transcript_text">Kopiraj prepis</string>
+  <string name="action_edit_number_before_call">Urejanje številke pred klicem</string>
+  <string name="call_log_delete_all">Izbriši zgodovino klicev</string>
+  <string name="call_log_trash_voicemail">Brisanje sporočil iz odzivnika</string>
+  <string name="snackbar_voicemail_deleted">Spor. v odziv. izbr.</string>
+  <string name="clearCallLogConfirmation_title">Želite izbrisati zgodovino klicev?</string>
+  <string name="clearCallLogConfirmation">S tem boste iz zgodovine izbrisali vse klice</string>
+  <string name="clearCallLogProgress_title">Izbris zgodovine klicev …</string>
+  <string name="notification_missedCallTitle">Neodgovorjeni klic</string>
+  <string name="notification_missedWorkCallTitle">Zgrešen delovni klic</string>
+  <string name="notification_missedCallsTitle">Neodgovorjeni klici</string>
+  <string name="notification_missedCallsMsg">Št. neodgovorjenih klicev: %d</string>
+  <string name="notification_missedCall_call_back">Povratni klic</string>
+  <string name="notification_missedCall_message">SMS</string>
+  <string name="post_call_notification_message">%1$s: %2$s</string>
+  <string name="notification_voicemail_text_format">Kliči %s</string>
+  <string name="notification_voicemail_no_vm_number">Neznana številka odzivnika</string>
+  <plurals name="notification_voicemail_title">
+    <item quantity="one"> %1$d sporočilo v odzivniku </item>
+    <item quantity="two"> %1$d sporočili v odzivniku </item>
+    <item quantity="few"> %1$d sporočila v odzivniku </item>
+    <item quantity="other"> %1$d sporočil v odzivniku </item>
+  </plurals>
+  <string name="notification_voicemail_callers_list">%1$s , %2$s</string>
+  <string name="notification_new_voicemail_ticker">Nova glasovna pošta od %1$s</string>
+  <string name="voicemail_playback_error">Sporočil v odzivniku ni mogoče predv.</string>
+  <string name="voicemail_fetching_content">Nalaganje sporočil v odzivniku …</string>
+  <string name="voicemail_fetching_timout">Sporočil v odzivniku ni mogoče naložiti</string>
+  <string name="call_log_item_count_and_date">(%1$d) %2$s</string>
+  <string name="description_playback_speakerphone">Vklop ali izklop zvočnika</string>
+  <string name="description_playback_seek">Iskanje položaja predvajanja</string>
+  <string name="action_menu_call_history_description">Zgodovina klicev</string>
+  <string msgid="2295659037509008453" name="action_menu_overflow_description">Več možnosti</string>
+  <string name="action_menu_dialpad_button">tipkovnica</string>
+  <string name="dialer_settings_label">Nastavitve</string>
+  <string name="simulator_submenu_label">Simulator</string>
+  <string name="new_ui_launcher_shortcut_label">Ustvari bliž. za novi up. vm.</string>
+  <string name="description_entering_bulk_action_mode">Prehod v način množičnega dejanja</string>
+  <string name="description_leaving_bulk_action_mode">Prehod iz načina množičnega dejanja</string>
+  <string name="description_selecting_bulk_action_mode">Izbrano: %1$s</string>
+  <string name="description_unselecting_bulk_action_mode">Preklican izbor: %1$s</string>
+  <string name="description_contact_details">Podrobnosti stika za %1$s</string>
+  <string name="description_spam_contact_details">Podrobnosti stika za domnevnega neželenega klicatelja %1$s</string>
+  <string name="description_num_calls">Št. klicev: %1$s.</string>
+  <string name="description_video_call">Videoklic.</string>
+  <string name="description_start_voice_search">Začni glasovno iskanje</string>
+  <string name="voicemail">Glasovna pošta</string>
+  <string name="description_cancel_multi_select">Prekliči način množičnega dejanja</string>
+  <string name="voicemailMultiSelectDeleteConfirm">Izbriši</string>
+  <string name="voicemailMultiSelectDeleteCancel">Prekliči</string>
+  <string name="voicemailMultiSelectActionBarTitle">Št. izbranih: %1$s</string>
+  <plurals name="delete_voicemails_confirmation_dialog_title">
+    <item quantity="one"><b>Želite izbrisati ta sporočila v odzivniku? </b></item>
+    <item quantity="two"><b>Želite izbrisati ta sporočila v odzivniku? </b></item>
+    <item quantity="few"><b>Želite izbrisati ta sporočila v odzivniku? </b></item>
+    <item quantity="other"><b>Želite izbrisati ta sporočila v odzivniku? </b></item>
+  </plurals>
+  <string name="voicemailCallLogToday">@string/call_log_header_today</string>
+  <string name="voicemailCallLogDateTimeFormat">%1$s ob %2$s</string>
+  <string name="voicemailDurationFormat">%1$02d:%2$02d</string>
+  <string name="voicemailCallLogDateTimeFormatWithDuration">%1$s • %2$s</string>
+  <string name="voice_search_not_available">Glasovno iskanje ni na voljo</string>
+  <string name="dialer_hint_find_contact">Iskanje stikov</string>
+  <string name="block_number_search_hint">Dodajte št. ali iščite med st.</string>
+  <string name="call_log_all_empty">Zgodovina klicev je prazna</string>
+  <string name="call_log_all_empty_action">Klicanje</string>
+  <string name="call_log_missed_empty">Nimate neodgovorjenih klicev.</string>
+  <string name="call_log_voicemail_empty">Vaša mapa s sporočili v odzivniku je prazna.</string>
+  <string name="call_log_activity_title">Zgodovina klicev</string>
+  <string name="call_log_all_title">Vsi</string>
+  <string name="call_log_missed_title">Neodgovorjeni</string>
+  <string name="tab_speed_dial">Hitro izbiranje</string>
+  <string name="tab_history">Zgodovina klicev</string>
+  <string name="tab_all_contacts">Stiki</string>
+  <string name="tab_voicemail">Odzivnik</string>
+  <string name="search_shortcut_call_number">Pokliči %s</string>
+  <string name="search_shortcut_create_new_contact">Ustvari nov stik</string>
+  <string name="search_shortcut_add_to_contact">Dodaj stiku</string>
+  <string name="search_shortcut_send_sms_message">Pošlji SMS</string>
+  <string name="search_shortcut_make_video_call">Opravi videoklic</string>
+  <string name="search_shortcut_block_number">Blokiraj številko</string>
+  <string name="speed_dial_empty">Na seznamu za hitro klicanje nimate še nikogar</string>
+  <string name="speed_dial_empty_add_favorite_action">Dodajte priljubljenega</string>
+  <string name="remove_contact">Odstrani</string>
+  <string name="select_all">Izberi vse</string>
+  <string name="call_log_action_video_call">Videoklic</string>
+  <string name="call_log_action_set_up_video">Nastavi videoklicanje</string>
+  <string name="call_log_action_invite_video">Povabi v videoklic</string>
+  <string name="call_log_action_send_message">Pošljite sporočilo</string>
+  <string name="call_log_action_details">Podrobnosti klica</string>
+  <string name="call_log_action_share_voicemail">Pošlji …</string>
+  <string name="call_log_action_call">Kliči osebo/številko ^1</string>
+  <string name="description_incoming_missed_call">Neodgovorjen klic od: ^1, ^2, ^3, ^4.</string>
+  <string name="description_incoming_answered_call">Odgovorjen klic od: ^1, ^2, ^3, ^4.</string>
+  <string name="description_unread_voicemail">Neprebrano sporočilo v odzivniku za račun ^4 ob ^3 od: ^1 – ^2.</string>
+  <string name="description_read_voicemail">Sporočilo v odzivniku za račun ^4 ob ^3 od: ^1 – ^2.</string>
+  <string name="description_outgoing_call">Klic za: ^1, ^2, ^3, ^4.</string>
+  <string name="call_log_via_number">prek številke %1$s</string>
+  <string name="call_log_via_number_phone_account">%1$s prek številke %2$s</string>
+  <string name="description_call_action">Klicanje: ^1</string>
+  <string name="description_video_call_action">Videoklic: ^1.</string>
+  <string name="description_voicemail_action">Poslušajte sporočilo v odzivniku od: ^1</string>
+  <string name="description_create_new_contact_action">Ustvarjanja stika za: ^1</string>
+  <string name="description_add_to_existing_contact_action">Dodajanje tega obstoječemu stiku: ^1</string>
+  <string name="description_details_action">Podrobnosti klica za: ^1</string>
+  <string name="call_log_header_today">Danes</string>
+  <string name="call_log_header_yesterday">Včeraj</string>
+  <string name="call_log_header_other">Starejši</string>
+  <string name="voicemail_speaker_on">Vklopi zvočnik.</string>
+  <string name="voicemail_speaker_off">Izklopi zvočnik.</string>
+  <string name="voicemail_play_start_pause">Začni ali zaustavi predvajanje.</string>
+  <string name="display_options_title">Možnosti prikaza</string>
+  <string name="sounds_and_vibration_title">Zvoki in vibriranje</string>
+  <string name="accessibility_settings_title">Funkcije za ljudi s posebnimi potrebami</string>
+  <string name="ringtone_title">Ton zvonjenja telefona</string>
+  <string name="vibrate_on_ring_title">Vibriranje tudi za klice</string>
+  <string name="dtmf_tone_enable_title">Toni tipkovnice</string>
+  <string name="dtmf_tone_length_title">Dolžina tonov tipkovnice</string>
   <string-array name="dtmf_tone_length_entries">
-    <item msgid="3136353015227162823">"Običajno"</item>
-    <item msgid="5376841175538523822">"Dolgo"</item>
+    <item>Običajno</item>
+    <item>Dolgo</item>
   </string-array>
-    <string name="respond_via_sms_setting_title" msgid="8008181606657693452">"Hitri odgovori"</string>
-    <string name="call_settings_label" msgid="7824611757200960807">"Klici"</string>
-    <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Blokiranje klicev"</string>
-    <string name="voicemail_settings_label" msgid="4594299554519920570">"Odzivnik"</string>
-    <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Blokiranje klicev je začasno izklopljeno"</string>
-    <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Blokiranje klicev je onemogočeno, ker ste se v zadnjih 48 urah s tem telefonom obrnili na nujno pomoč. Ko 48-urno obdobje poteče, bo blokiranje klicev samodejno znova omogočeno."</string>
-    <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Uvoz številk"</string>
-    <string name="blocked_call_settings_import_description" msgid="1819412052545228965">"Označili ste, naj nekatere klicatelje druge aplikacije samodejno preusmerijo v odzivnik."</string>
-    <string name="blocked_call_settings_view_numbers_button" msgid="3332727948554356704">"Ogled številk"</string>
-    <string name="blocked_call_settings_import_button" msgid="7319111700387470727">"Uvozi"</string>
-    <string name="description_blocked_number_list_delete" msgid="2139644216858370740">"Odblokiranje telefonske številke"</string>
-    <string name="addBlockedNumber" msgid="3053473735238295551">"Dodaj telefonsko številko"</string>
-    <string name="block_number_footer_message_vvm" msgid="7955326304033982368">"Klici s teh številk bodo blokirani in sporočila v odzivniku bodo samodejno izbrisana."</string>
-    <string name="block_number_footer_message_no_vvm" msgid="1152684139070471665">"Klici s teh številk bodo blokirani, klicatelji pa bodo morda še vedno lahko pustil sporočila v odzivniku."</string>
-    <string name="block_list" msgid="4701585783411870782">"Blokirane številke"</string>
-    <string name="alreadyBlocked" msgid="5483253180532475653">"Telefonska številka <xliff:g id="NUMBER">%1$s</xliff:g> je že blokirana."</string>
-    <string name="phone_account_settings_label" msgid="8372485478006965920">"Računi za klicanje"</string>
-    <string name="permission_no_speeddial" msgid="8487215628510596753">"Če želite omogočiti hitro klicanje, vklopite dovoljenje za stike."</string>
-    <string name="permission_no_calllog" msgid="4053705651238775784">"Če si želite ogledati dnevnik klicev, vklopite dovoljenje za telefon."</string>
-    <string name="permission_no_search" msgid="2424710404207193826">"Če želite iskati po stikih, vklopite dovoljenje za stike."</string>
-    <string name="permission_place_call" msgid="8686908130349369423">"Če želite klicati, vklopite dovoljenje za telefon."</string>
-    <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"Aplikacija Telefon nima dovoljenja za pisanje v sistemske nastavitve."</string>
-    <string name="blocked_number_call_log_label" msgid="4212282846299997693">"Blokirano"</string>
-    <string name="call_log_action_block_report_number" msgid="7302636538668696729">"Blokiraj/prij. než. vsebino"</string>
-    <string name="call_log_action_block_number" msgid="5048188386501998865">"Blokiraj številko"</string>
-    <string name="call_log_action_remove_spam" msgid="2045319806318398403">"Ni neželena vsebina"</string>
-    <string name="call_log_action_unblock_number" msgid="6100117033288448758">"Odblokiranje telefonske številke"</string>
-    <string name="spam_number_call_log_label" msgid="2678431398326811131">"Vsiljena pošta"</string>
-    <string name="call_composer_connection_failed" msgid="6776461585447831242">"Oseba <xliff:g id="NAME">%1$s</xliff:g> nima vzpostavljene povezave in ni dosegljiva"</string>
-    <string name="about_phone_label" msgid="582991354677973731">"Vizitka"</string>
-    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Prepis je zagotovil Google"</string>
-    <string name="voicemail_transcription_in_progress" msgid="2933320969613783210">"Google ustvarja prepis …"</string>
-    <string name="voicemail_transcription_failed" msgid="335275303117412706">"Prepis ni na voljo."</string>
-    <string name="voicemail_transcription_failed_language_not_supported" msgid="4210332591050562553">"Prepis ni na voljo. Jezik ni podprt."</string>
-    <string name="voicemail_transcription_failed_no_speech" msgid="9093372879697874852">"Prepis ni na voljo. Govora ni bilo mogoče zaznati."</string>
-    <string name="view_conversation" msgid="7895904782094119702">"Prikaži"</string>
-    <string name="ec_data_deleted" msgid="4794880345545827107">"Klic je izbrisan. Priloge, ki so bile dane v skupno rabo v tem klicu, si lahko ogledate in izbrišete v aplikaciji Messages."</string>
-    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"Klici so izbrisani. Priloge, ki so bile dane v skupno rabo v teh klicih, si lahko ogledate in izbrišete v aplikaciji Messages."</string>
+  <string name="respond_via_sms_setting_title">Hitri odgovori</string>
+  <string name="call_settings_label">Klici</string>
+  <string name="manage_blocked_numbers_label">Blokirane številke</string>
+  <string name="voicemail_settings_label">Odzivnik</string>
+  <string name="blocked_numbers_disabled_emergency_header_label">Blokiranje klicev je začasno izklopljeno</string>
+  <string name="blocked_numbers_disabled_emergency_desc">Blokiranje klicev je onemogočeno, ker ste se v zadnjih 48 urah s tem telefonom obrnili na nujno pomoč. Ko 48-urno obdobje poteče, bo blokiranje klicev samodejno znova omogočeno.</string>
+  <string name="import_send_to_voicemail_numbers_label">Uvoz številk</string>
+  <string name="blocked_call_settings_import_description">Označili ste, naj nekatere klicatelje druge aplikacije samodejno preusmerijo v odzivnik.</string>
+  <string name="blocked_call_settings_view_numbers_button">Ogled številk</string>
+  <string name="blocked_call_settings_import_button">Uvozi</string>
+  <string name="description_blocked_number_list_delete">Odblokiranje telefonske številke</string>
+  <string name="addBlockedNumber">Dodaj telefonsko številko</string>
+  <string name="block_number_footer_message_vvm">Klici s teh številk bodo blokirani in sporočila v odzivniku bodo samodejno izbrisana.</string>
+  <string name="block_number_footer_message_no_vvm">Klici s teh številk bodo blokirani, klicatelji pa bodo morda še vedno lahko pustil sporočila v odzivniku.</string>
+  <string name="block_list">Blokirane številke</string>
+  <string name="alreadyBlocked">Telefonska številka %1$s je že blokirana.</string>
+  <string name="phone_account_settings_label">Računi za klicanje</string>
+  <string name="permission_no_speeddial">Če želite omogočiti hitro klicanje, vklopite dovoljenje za stike.</string>
+  <string name="permission_no_calllog">Če si želite ogledati dnevnik klicev, vklopite dovoljenje za telefon.</string>
+  <string name="permission_no_search">Če želite iskati po stikih, vklopite dovoljenje za stike.</string>
+  <string name="permission_place_call">Če želite klicati, vklopite dovoljenje za telefon.</string>
+  <string name="toast_cannot_write_system_settings">Aplikacija Telefon nima dovoljenja za pisanje v sistemske nastavitve.</string>
+  <string name="blocked_number_call_log_label">Blokirano</string>
+  <string name="call_log_action_block_report_number">Blokiraj/prij. než. vsebino</string>
+  <string name="call_log_action_block_number">Blokiraj številko</string>
+  <string name="call_log_action_remove_spam">Ni neželena vsebina</string>
+  <string name="call_log_action_unblock_number">Odblokiranje telefonske številke</string>
+  <string name="spam_number_call_log_label">Vsiljena pošta</string>
+  <string name="call_composer_connection_failed">Oseba %1$s nima vzpostavljene povezave in ni dosegljiva</string>
+  <string name="about_phone_label">Vizitka</string>
+  <string name="voicemail_transcription_branding_text">Prepis je zagotovil Google</string>
+  <string name="voicemail_transcription_in_progress">Ustvarjanje prepisa …</string>
+  <string name="voicemail_transcription_failed">Prepis ni na voljo.</string>
+  <string name="voicemail_transcription_failed_language_not_supported">Prepis ni na voljo. Jezik ni podprt.</string>
+  <string name="voicemail_transcription_failed_no_speech">Prepis ni na voljo. Govora ni bilo mogoče zaznati.</string>
+  <string name="voicemail_donation_promo_title">Želite pomagati izboljšati natančnost prepisov?</string>
+  <string name="voicemail_donation_promo_content">Dovolite Googlu, da pregleda ta in prihodnja sporočila v odzivniku s prepisi. Shranjena bodo anonimno. Nastavitve lahko kadar koli spremenite. %1$s</string>
+  <string name="voicemail_donation_promo_opt_in">Da, sem za</string>
+  <string name="voicemail_donation_promo_opt_out">Ne, hvala</string>
+  <string name="voicemail_transcription_rating">Ocenite kakovost prepisa</string>
+  <string name="voicemail_transcription_rating_thanks">Hvala za povratne informacije</string>
+  <string name="description_rating_good">Všeč mi je</string>
+  <string name="description_rating_bad">Ni mi všeč</string>
+  <string name="view_conversation">Prikaži</string>
+  <string name="ec_data_deleted">Klic je izbrisan. Priloge, ki so bile dane v skupno rabo v tem klicu, si lahko ogledate in izbrišete v aplikaciji Messages.</string>
+  <string name="multiple_ec_data_deleted">Klici so izbrisani. Priloge, ki so bile dane v skupno rabo v teh klicih, si lahko ogledate in izbrišete v aplikaciji Messages.</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-sq/strings.xml b/java/com/android/dialer/app/res/values-sq/strings.xml
index f5350b4..cd9e0e0 100644
--- a/java/com/android/dialer/app/res/values-sq/strings.xml
+++ b/java/com/android/dialer/app/res/values-sq/strings.xml
@@ -1,179 +1,171 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="applicationLabel" msgid="2202739481132958990">"Telefoni"</string>
-    <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"Blloku i tasteve i telefonit"</string>
-    <string name="callHistoryIconLabel" msgid="7493268743411968630">"Historiku i telefonatave"</string>
-    <string name="action_copy_number_text" msgid="832682558551502319">"Kopjo numrin"</string>
-    <string name="copy_transcript_text" msgid="937904189017310829">"Kopjo transkriptimin"</string>
-    <string name="action_edit_number_before_call" msgid="8017492815878473837">"Redakto numrin para telefonatës"</string>
-    <string name="call_log_delete_all" msgid="7852970926906523784">"Pastro historikun e telefonatave"</string>
-    <string name="call_log_trash_voicemail" msgid="6118493534178533972">"Fshije postën zanore"</string>
-    <string name="snackbar_voicemail_deleted" msgid="7463166543725496307">"U zbulua posta zanore"</string>
-    <string name="snackbar_voicemail_deleted_undo" msgid="6959743982796409941">"ZHBËJ"</string>
-    <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"Të pastrohet historiku i telefonatave?"</string>
-    <string name="clearCallLogConfirmation" msgid="6844949465815109166">"Kjo do të fshijë të gjitha telefonatat nga historiku yt"</string>
-    <string name="clearCallLogProgress_title" msgid="995004835687361977">"Po pastron historikun e telefonatave…"</string>
-    <string name="notification_missedCallTitle" msgid="8283366068539898486">"Telefonatë e humbur"</string>
-    <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"Telefonatë pune e humbur"</string>
-    <string name="notification_missedCallsTitle" msgid="3697442015345089802">"Telefonata të humbura"</string>
-    <string name="notification_missedCallsMsg" msgid="8176217633929018706">"<xliff:g id="NUM_MISSED_CALLS">%d</xliff:g> telefonata të humbura"</string>
-    <string name="notification_missedCall_call_back" msgid="3875698110051973965">"Telefono"</string>
-    <string name="notification_missedCall_message" msgid="5086910028988305964">"Mesazh"</string>
-    <string name="post_call_notification_message" msgid="5417476789860590611">"<xliff:g id="NAME">%1$s</xliff:g>: <xliff:g id="MESSAGE">%2$s</xliff:g>"</string>
-    <string name="notification_voicemail_text_format" msgid="1895667520930252897">"Formo numrin <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
-    <string name="notification_voicemail_no_vm_number" msgid="8942821987929495842">"Numri i postës zanore është i panjohur"</string>
-    <plurals name="notification_voicemail_title" formatted="false" msgid="1551847434476438657">
-      <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> posta zanore </item>
-      <item quantity="one"> postë zanore</item>
-    </plurals>
-    <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
-    <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"Postë e re zanore nga <xliff:g id="CALLER">%1$s</xliff:g>"</string>
-    <string name="voicemail_playback_error" msgid="4384373852257757295">"Posta zanore nuk mund të luhej"</string>
-    <string name="voicemail_fetching_content" msgid="572320120918636014">"Po ngarkon postën zanore…"</string>
-    <string name="voicemail_fetching_timout" msgid="2128873915839949783">"Posta zanore nuk mund të ngarkohej"</string>
-    <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_playback_speakerphone" msgid="4852027754869750227">"Aktivizo ose çaktivizo altoparlantin"</string>
-    <string name="description_playback_seek" msgid="1340910573254132520">"Kërko pozicionin e luajtjes"</string>
-    <string name="action_menu_call_history_description" msgid="8829135306925008546">"Historiku i telefonatave"</string>
-    <string name="action_menu_overflow_description" msgid="7648679686746517341">"Opsione të tjera"</string>
-    <string name="action_menu_dialpad_button" msgid="1970631633457493180">"blloku i tasteve"</string>
-    <string name="dialer_settings_label" msgid="4980176284150290175">"Cilësimet"</string>
-    <string name="simulator_submenu_label" msgid="186156287346615267">"Simuluesi"</string>
-    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Krijo një shkurtore për ndërfaqen e re të përdoruesit"</string>
-    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"Po hyn në modalitetin e veprimit në masë"</string>
-    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"U largove nga modaliteti i veprimit në masë"</string>
-    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"U zgjodh <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"Zgjedhja e <xliff:g id="NAMEORNUMBER">%1$s</xliff:g> u anulua"</string>
-    <string name="description_contact_details" msgid="3341280873855253464">"Detajet e kontaktit për <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_spam_contact_details" msgid="5592578752881528368">"Detajet e kontaktit për telefonuesin e dyshuar si të padëshiruar <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> telefonata."</string>
-    <string name="description_video_call" msgid="3738199365585751727">"Telefonatë me video."</string>
-    <string name="description_start_voice_search" msgid="8380022725973015261">"Nis kërkimin me zë"</string>
-    <string name="voicemail" msgid="8899540969000957954">"Posta zanore"</string>
-    <string name="description_cancel_multi_select" msgid="3930475950253360461">"Anulo modalitetin e veprimeve në grup"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Fshi"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Anulo"</string>
-    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> të zgjedhura"</string>
-    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
-      <item quantity="other">"<b>"Të fshihen këto posta zanore? "</b>"</item>
-      <item quantity="one">"<b>"Të fshihet kjo postë zanore? "</b>"</item>
-    </plurals>
-    <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
-    <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> në <xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
-    <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="voice_search_not_available" msgid="6546240433719732905">"Kërkimi me zë nuk mundësohet"</string>
-    <string name="dialer_hint_find_contact" msgid="2023214799381149808">"Kërko për kontakte"</string>
-    <string name="block_number_search_hint" msgid="5377706079015099416">"Shto një numër ose kërko te kontaktet"</string>
-    <string name="call_log_all_empty" msgid="3955572868518162004">"Historiku i telefonatave është bosh"</string>
-    <string name="call_log_all_empty_action" msgid="852218280136243014">"Bëj një telefonatë"</string>
-    <string name="call_log_missed_empty" msgid="7094936030845062214">"Nuk ke thirrje të humbura."</string>
-    <string name="call_log_voicemail_empty" msgid="273623903423275178">"Kutia hyrëse e postës tënde zanore është bosh."</string>
-    <string name="call_log_activity_title" msgid="1275242727244945527">"Historiku i telefonatave"</string>
-    <string name="call_log_all_title" msgid="6042262422192020327">"Të gjitha"</string>
-    <string name="call_log_missed_title" msgid="17254005889268015">"Të humbura"</string>
-    <string name="tab_speed_dial" msgid="6616404752227561075">"Telefonatë e shpejtë"</string>
-    <string name="tab_history" msgid="7420269368689503596">"Historiku i telefonatave"</string>
-    <string name="tab_all_contacts" msgid="5531733977693943015">"Kontaktet"</string>
-    <string name="tab_voicemail" msgid="2458548090088316246">"Posta zanore"</string>
-    <string name="search_shortcut_call_number" msgid="8847918845036880688">"Telefono <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"Krijo një kontakt të ri"</string>
-    <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"Shto te një kontakt"</string>
-    <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"Dërgo SMS"</string>
-    <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"Bëj një telefonatë me video"</string>
-    <string name="search_shortcut_block_number" msgid="4587283230665805776">"Blloko numrin"</string>
-    <string name="speed_dial_empty" msgid="3346406399966039505">"Askush nuk është ende në thirrjen tënde të shpejtuar"</string>
-    <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"Shto një të preferuar"</string>
-    <string name="remove_contact" msgid="2353580570488923668">"Hiq"</string>
-    <string name="select_all" msgid="408601760696146245">"Zgjidh të gjitha"</string>
-    <string name="call_log_action_video_call" msgid="7565549950343850819">"Telefonatë me video"</string>
-    <string name="call_log_action_send_message" msgid="6948727362660115554">"Dërgo një mesazh"</string>
-    <string name="call_log_action_details" msgid="2091370737371449501">"Detajet e telefonatës"</string>
-    <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"Dërgo te ..."</string>
-    <string name="call_log_action_call" msgid="682724094251540583">"Telefono <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_incoming_missed_call" msgid="8292535799379230029">"Telefonatë e humbur nga <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_incoming_answered_call" msgid="3920182963103160610">"Telefonatë e përgjigjur nga <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_unread_voicemail" msgid="145170985013419170">"Postë zanore e palexuar nga <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_read_voicemail" msgid="5585559881573227732">"Postë zanore nga <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_outgoing_call" msgid="543952487882919924">"Telefonatë për <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="call_log_via_number" msgid="1340307109806397650">"nëpërmjet <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> nëpërmjet <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="description_call_action" msgid="4042796498169106545">"Telefono <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_video_call_action" msgid="1237090968588659650">"Telefono me video <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
-    <string name="description_voicemail_action" msgid="3290143432403538524">"Dëgjo postën zanore nga <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_create_new_contact_action" msgid="1928282350281564130">"Krijo një kontakt për <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"Shtoje <xliff:g id="NAMEORNUMBER">^1</xliff:g> te një kontakt ekzistues"</string>
-    <string name="description_details_action" msgid="2061866409737706174">"Detajet e telefonatës për <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="call_log_header_today" msgid="1576119097475845293">"Sot"</string>
-    <string name="call_log_header_yesterday" msgid="5616077776205329563">"Dje"</string>
-    <string name="call_log_header_other" msgid="4940676886254217644">"Më të vjetra"</string>
-    <string name="voicemail_speaker_on" msgid="3151333608926996668">"Aktivizo altoparlantin."</string>
-    <string name="voicemail_speaker_off" msgid="2530064206962034201">"Çaktivizo altoparlantin."</string>
-    <string name="voicemail_play_start_pause" msgid="3874823480278334664">"Nis ose ndërprit luajtjen."</string>
-    <string name="display_options_title" msgid="3880091801055797975">"Opsionet e paraqitjes"</string>
-    <string name="sounds_and_vibration_title" msgid="3075050000721181384">"Tingujt dhe dridhjet"</string>
-    <string name="accessibility_settings_title" msgid="3329027650429831820">"Qasshmëria"</string>
-    <string name="ringtone_title" msgid="8377174189894648486">"Zilja e telefonit"</string>
-    <string name="vibrate_on_ring_title" msgid="631441314790960485">"Edhe dridhje për telefonatat"</string>
-    <string name="dtmf_tone_enable_title" msgid="3273762431523939277">"Tonet e bllokut të tasteve"</string>
-    <string name="dtmf_tone_length_title" msgid="534096029202438539">"Gjatësia e toneve të bllokut të tasteve"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="applicationLabel">Telefoni</string>
+  <string name="launcherDialpadActivityLabel">Blloku i tasteve i telefonit</string>
+  <string name="callHistoryIconLabel">Historiku i telefonatave</string>
+  <string name="action_copy_number_text">Kopjo numrin</string>
+  <string name="copy_transcript_text">Kopjo transkriptimin</string>
+  <string name="action_edit_number_before_call">Redakto numrin para telefonatës</string>
+  <string name="call_log_delete_all">Pastro historikun e telefonatave</string>
+  <string name="call_log_trash_voicemail">Fshije postën zanore</string>
+  <string name="snackbar_voicemail_deleted">U zbulua posta zanore</string>
+  <string name="clearCallLogConfirmation_title">Të pastrohet historiku i telefonatave?</string>
+  <string name="clearCallLogConfirmation">Kjo do të fshijë të gjitha telefonatat nga historiku yt</string>
+  <string name="clearCallLogProgress_title">Po pastron historikun e telefonatave…</string>
+  <string name="notification_missedCallTitle">Telefonatë e humbur</string>
+  <string name="notification_missedWorkCallTitle">Telefonatë pune e humbur</string>
+  <string name="notification_missedCallsTitle">Telefonata të humbura</string>
+  <string name="notification_missedCallsMsg">%d telefonata të humbura</string>
+  <string name="notification_missedCall_call_back">Telefono</string>
+  <string name="notification_missedCall_message">Mesazh</string>
+  <string name="post_call_notification_message">%1$s: %2$s</string>
+  <string name="notification_voicemail_text_format">Formo numrin %s</string>
+  <string name="notification_voicemail_no_vm_number">Numri i postës zanore është i panjohur</string>
+  <plurals name="notification_voicemail_title">
+    <item quantity="one"> postë zanore</item>
+    <item quantity="other"> %1$d posta zanore </item>
+  </plurals>
+  <string name="notification_voicemail_callers_list">%1$s, %2$s</string>
+  <string name="notification_new_voicemail_ticker">Postë e re zanore nga %1$s</string>
+  <string name="voicemail_playback_error">Posta zanore nuk mund të luhej</string>
+  <string name="voicemail_fetching_content">Po ngarkon postën zanore…</string>
+  <string name="voicemail_fetching_timout">Posta zanore nuk mund të ngarkohej</string>
+  <string name="call_log_item_count_and_date">(%1$d) %2$s</string>
+  <string name="description_playback_speakerphone">Aktivizo ose çaktivizo altoparlantin</string>
+  <string name="description_playback_seek">Kërko pozicionin e luajtjes</string>
+  <string name="action_menu_call_history_description">Historiku i telefonatave</string>
+  <string msgid="2295659037509008453" name="action_menu_overflow_description">Opsione të tjera</string>
+  <string name="action_menu_dialpad_button">blloku i tasteve</string>
+  <string name="dialer_settings_label">Cilësimet</string>
+  <string name="simulator_submenu_label">Simuluesi</string>
+  <string name="new_ui_launcher_shortcut_label">Krijo një shkurtore për ndërfaqen e re të përdoruesit</string>
+  <string name="description_entering_bulk_action_mode">Po hyn në modalitetin e veprimit në masë</string>
+  <string name="description_leaving_bulk_action_mode">U largove nga modaliteti i veprimit në masë</string>
+  <string name="description_selecting_bulk_action_mode">U zgjodh %1$s</string>
+  <string name="description_unselecting_bulk_action_mode">Zgjedhja e %1$s u anulua</string>
+  <string name="description_contact_details">Detajet e kontaktit për %1$s</string>
+  <string name="description_spam_contact_details">Detajet e kontaktit për telefonuesin e dyshuar si të padëshiruar %1$s</string>
+  <string name="description_num_calls">%1$s telefonata.</string>
+  <string name="description_video_call">Telefonatë me video.</string>
+  <string name="description_start_voice_search">Nis kërkimin me zë</string>
+  <string name="voicemail">Posta zanore</string>
+  <string name="description_cancel_multi_select">Anulo modalitetin e veprimeve në grup</string>
+  <string name="voicemailMultiSelectDeleteConfirm">Fshi</string>
+  <string name="voicemailMultiSelectDeleteCancel">Anulo</string>
+  <string name="voicemailMultiSelectActionBarTitle">%1$s të zgjedhura</string>
+  <plurals name="delete_voicemails_confirmation_dialog_title">
+    <item quantity="one"><b>Të fshihet kjo postë zanore? </b></item>
+    <item quantity="other"><b>Të fshihen këto posta zanore? </b></item>
+  </plurals>
+  <string name="voicemailCallLogToday">@string/call_log_header_today</string>
+  <string name="voicemailCallLogDateTimeFormat">%1$s në %2$s</string>
+  <string name="voicemailDurationFormat">%1$02d:%2$02d</string>
+  <string name="voicemailCallLogDateTimeFormatWithDuration">%1$s • %2$s</string>
+  <string name="voice_search_not_available">Kërkimi me zë nuk mundësohet</string>
+  <string name="dialer_hint_find_contact">Kërko për kontakte</string>
+  <string name="block_number_search_hint">Shto një numër ose kërko te kontaktet</string>
+  <string name="call_log_all_empty">Historiku i telefonatave është bosh</string>
+  <string name="call_log_all_empty_action">Bëj një telefonatë</string>
+  <string name="call_log_missed_empty">Nuk ke thirrje të humbura.</string>
+  <string name="call_log_voicemail_empty">Kutia hyrëse e postës tënde zanore është bosh.</string>
+  <string name="call_log_activity_title">Historiku i telefonatave</string>
+  <string name="call_log_all_title">Të gjitha</string>
+  <string name="call_log_missed_title">Të humbura</string>
+  <string name="tab_speed_dial">Telefonatë e shpejtë</string>
+  <string name="tab_history">Historiku i telefonatave</string>
+  <string name="tab_all_contacts">Kontaktet</string>
+  <string name="tab_voicemail">Posta zanore</string>
+  <string name="search_shortcut_call_number">Telefono %s</string>
+  <string name="search_shortcut_create_new_contact">Krijo një kontakt të ri</string>
+  <string name="search_shortcut_add_to_contact">Shto te një kontakt</string>
+  <string name="search_shortcut_send_sms_message">Dërgo SMS</string>
+  <string name="search_shortcut_make_video_call">Bëj një telefonatë me video</string>
+  <string name="search_shortcut_block_number">Blloko numrin</string>
+  <string name="speed_dial_empty">Askush nuk është ende në thirrjen tënde të shpejtuar</string>
+  <string name="speed_dial_empty_add_favorite_action">Shto një të preferuar</string>
+  <string name="remove_contact">Hiq</string>
+  <string name="select_all">Zgjidh të gjitha</string>
+  <string name="call_log_action_video_call">Telefonatë me video</string>
+  <string name="call_log_action_set_up_video">Konfiguro telefonatat me video</string>
+  <string name="call_log_action_invite_video">Fto në telefonatë me video</string>
+  <string name="call_log_action_send_message">Dërgo një mesazh</string>
+  <string name="call_log_action_details">Detajet e telefonatës</string>
+  <string name="call_log_action_share_voicemail">Dërgo te ...</string>
+  <string name="call_log_action_call">Telefono ^1</string>
+  <string name="description_incoming_missed_call">Telefonatë e humbur nga ^1, ^2, ^3, ^4.</string>
+  <string name="description_incoming_answered_call">Telefonatë e përgjigjur nga ^1, ^2, ^3, ^4.</string>
+  <string name="description_unread_voicemail">Postë zanore e palexuar nga ^1, ^2, ^3, ^4.</string>
+  <string name="description_read_voicemail">Postë zanore nga ^1, ^2, ^3, ^4.</string>
+  <string name="description_outgoing_call">Telefonatë për ^1, ^2, ^3, ^4.</string>
+  <string name="call_log_via_number">nëpërmjet %1$s</string>
+  <string name="call_log_via_number_phone_account">%1$s nëpërmjet %2$s</string>
+  <string name="description_call_action">Telefono ^1</string>
+  <string name="description_video_call_action">Telefono me video ^1.</string>
+  <string name="description_voicemail_action">Dëgjo postën zanore nga ^1</string>
+  <string name="description_create_new_contact_action">Krijo një kontakt për ^1</string>
+  <string name="description_add_to_existing_contact_action">Shtoje ^1 te një kontakt ekzistues</string>
+  <string name="description_details_action">Detajet e telefonatës për ^1</string>
+  <string name="call_log_header_today">Sot</string>
+  <string name="call_log_header_yesterday">Dje</string>
+  <string name="call_log_header_other">Më të vjetra</string>
+  <string name="voicemail_speaker_on">Aktivizo altoparlantin.</string>
+  <string name="voicemail_speaker_off">Çaktivizo altoparlantin.</string>
+  <string name="voicemail_play_start_pause">Nis ose ndërprit luajtjen.</string>
+  <string name="display_options_title">Opsionet e paraqitjes</string>
+  <string name="sounds_and_vibration_title">Tingujt dhe dridhjet</string>
+  <string name="accessibility_settings_title">Qasshmëria</string>
+  <string name="ringtone_title">Zilja e telefonit</string>
+  <string name="vibrate_on_ring_title">Edhe dridhje për telefonatat</string>
+  <string name="dtmf_tone_enable_title">Tonet e bllokut të tasteve</string>
+  <string name="dtmf_tone_length_title">Gjatësia e toneve të bllokut të tasteve</string>
   <string-array name="dtmf_tone_length_entries">
-    <item msgid="3136353015227162823">"Normal"</item>
-    <item msgid="5376841175538523822">"I gjatë"</item>
+    <item>Normal</item>
+    <item>I gjatë</item>
   </string-array>
-    <string name="respond_via_sms_setting_title" msgid="8008181606657693452">"Përgjigje të shpejta"</string>
-    <string name="call_settings_label" msgid="7824611757200960807">"Telefonatat"</string>
-    <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Bllokimi i telefonatave"</string>
-    <string name="voicemail_settings_label" msgid="4594299554519920570">"Posta zanore"</string>
-    <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Bllokimi i telefonatave është përkohësisht joaktiv"</string>
-    <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Bllokimi i telefonatave është çaktivizuar sepse kontaktove me shërbimet e urgjencës nga ky telefon brenda 48 orëve të fundit. Ai do të riaktivizohet automatikisht pas skadimit të periudhës prej 48 orë."</string>
-    <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Importo numrat"</string>
-    <string name="blocked_call_settings_import_description" msgid="1819412052545228965">"Disa telefonues i ke shënuar më parë që të dërgohen automatikisht drejt postës zanore përmes aplikacioneve të tjera."</string>
-    <string name="blocked_call_settings_view_numbers_button" msgid="3332727948554356704">"Shiko numrat"</string>
-    <string name="blocked_call_settings_import_button" msgid="7319111700387470727">"Importo"</string>
-    <string name="description_blocked_number_list_delete" msgid="2139644216858370740">"Zhblloko numrin"</string>
-    <string name="addBlockedNumber" msgid="3053473735238295551">"Shto një numër"</string>
-    <string name="block_number_footer_message_vvm" msgid="7955326304033982368">"Telefonatat nga këta numra do të bllokohen dhe mesazhet zanore do të fshihen automatikisht."</string>
-    <string name="block_number_footer_message_no_vvm" msgid="1152684139070471665">"Telefonatat nga këta numra do të bllokohen, por mund të jenë ende në gjendje të lënë mesazhe zanore."</string>
-    <string name="block_list" msgid="4701585783411870782">"Numrat e bllokuar"</string>
-    <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g> është i bllokuar tashmë."</string>
-    <string name="phone_account_settings_label" msgid="8372485478006965920">"Llogaritë e telefonatave"</string>
-    <string name="permission_no_speeddial" msgid="8487215628510596753">"Për të aktivizuar thirrjen e shpejtuar, aktivizo lejen e Kontakteve."</string>
-    <string name="permission_no_calllog" msgid="4053705651238775784">"Për të parë evidencën e telefonatave, aktivizo lejen e Telefonit."</string>
-    <string name="permission_no_search" msgid="2424710404207193826">"Për të kërkuar kontaktet, aktivizo lejet e Kontakteve"</string>
-    <string name="permission_place_call" msgid="8686908130349369423">"Për të kryer një telefonatë, aktivizo lejen e Telefonit."</string>
-    <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"Aplikacionet e telefonit nuk kanë leje të shkruajnë në cilësimet e sistemit."</string>
-    <string name="blocked_number_call_log_label" msgid="4212282846299997693">"I bllokuar"</string>
-    <string name="call_log_action_block_report_number" msgid="7302636538668696729">"Blloko/raporto të padëshiruar"</string>
-    <string name="call_log_action_block_number" msgid="5048188386501998865">"Blloko numrin"</string>
-    <string name="call_log_action_remove_spam" msgid="2045319806318398403">"Nuk është i padëshiruar"</string>
-    <string name="call_log_action_unblock_number" msgid="6100117033288448758">"Zhblloko numrin"</string>
-    <string name="spam_number_call_log_label" msgid="2678431398326811131">"E bezdisshme"</string>
-    <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> është jashtë linje dhe nuk mund të kontaktohet"</string>
-    <string name="about_phone_label" msgid="582991354677973731">"Rreth"</string>
-    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Transkriptuar nga Google"</string>
-    <string name="voicemail_transcription_in_progress" msgid="2933320969613783210">"Google po transkripton…"</string>
-    <string name="voicemail_transcription_failed" msgid="335275303117412706">"Transkripti nuk ofrohet."</string>
-    <string name="voicemail_transcription_failed_language_not_supported" msgid="4210332591050562553">"Transkripti nuk ofrohet. Gjuha nuk mbështetet."</string>
-    <string name="voicemail_transcription_failed_no_speech" msgid="9093372879697874852">"Transkripti nuk ofrohet. Nuk u zbulua asnjë e folur."</string>
-    <string name="view_conversation" msgid="7895904782094119702">"Shiko"</string>
-    <string name="ec_data_deleted" msgid="4794880345545827107">"Telefonata u fshi. Shiko dhe fshi bashkëngjitjet e ndara gjatë kësaj telefonate te Messages."</string>
-    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"Telefonatat u fshinë. Shiko dhe fshi bashkëngjitjet e ndara gjatë telefonatave te Messages."</string>
+  <string name="respond_via_sms_setting_title">Përgjigje të shpejta</string>
+  <string name="call_settings_label">Telefonatat</string>
+  <string name="manage_blocked_numbers_label">Numrat e bllokuar</string>
+  <string name="voicemail_settings_label">Posta zanore</string>
+  <string name="blocked_numbers_disabled_emergency_header_label">Bllokimi i telefonatave është përkohësisht joaktiv</string>
+  <string name="blocked_numbers_disabled_emergency_desc">Bllokimi i telefonatave është çaktivizuar sepse kontaktove me shërbimet e urgjencës nga ky telefon brenda 48 orëve të fundit. Ai do të riaktivizohet automatikisht pas skadimit të periudhës prej 48 orë.</string>
+  <string name="import_send_to_voicemail_numbers_label">Importo numrat</string>
+  <string name="blocked_call_settings_import_description">Disa telefonues i ke shënuar më parë që të dërgohen automatikisht drejt postës zanore përmes aplikacioneve të tjera.</string>
+  <string name="blocked_call_settings_view_numbers_button">Shiko numrat</string>
+  <string name="blocked_call_settings_import_button">Importo</string>
+  <string name="description_blocked_number_list_delete">Zhblloko numrin</string>
+  <string name="addBlockedNumber">Shto një numër</string>
+  <string name="block_number_footer_message_vvm">Telefonatat nga këta numra do të bllokohen dhe mesazhet zanore do të fshihen automatikisht.</string>
+  <string name="block_number_footer_message_no_vvm">Telefonatat nga këta numra do të bllokohen, por mund të jenë ende në gjendje të lënë mesazhe zanore.</string>
+  <string name="block_list">Numrat e bllokuar</string>
+  <string name="alreadyBlocked">%1$s është i bllokuar tashmë.</string>
+  <string name="phone_account_settings_label">Llogaritë e telefonatave</string>
+  <string name="permission_no_speeddial">Për të aktivizuar thirrjen e shpejtuar, aktivizo lejen e Kontakteve.</string>
+  <string name="permission_no_calllog">Për të parë evidencën e telefonatave, aktivizo lejen e Telefonit.</string>
+  <string name="permission_no_search">Për të kërkuar kontaktet, aktivizo lejet e Kontakteve</string>
+  <string name="permission_place_call">Për të kryer një telefonatë, aktivizo lejen e Telefonit.</string>
+  <string name="toast_cannot_write_system_settings">Aplikacionet e telefonit nuk kanë leje të shkruajnë në cilësimet e sistemit.</string>
+  <string name="blocked_number_call_log_label">I bllokuar</string>
+  <string name="call_log_action_block_report_number">Blloko/raporto të padëshiruar</string>
+  <string name="call_log_action_block_number">Blloko numrin</string>
+  <string name="call_log_action_remove_spam">Nuk është i padëshiruar</string>
+  <string name="call_log_action_unblock_number">Zhblloko numrin</string>
+  <string name="spam_number_call_log_label">E bezdisshme</string>
+  <string name="call_composer_connection_failed">%1$s është jashtë linje dhe nuk mund të kontaktohet</string>
+  <string name="about_phone_label">Rreth</string>
+  <string name="voicemail_transcription_branding_text">Transkriptuar nga Google</string>
+  <string name="voicemail_transcription_in_progress">Po transkriptohet…</string>
+  <string name="voicemail_transcription_failed">Transkripti nuk ofrohet.</string>
+  <string name="voicemail_transcription_failed_language_not_supported">Transkripti nuk ofrohet. Gjuha nuk mbështetet.</string>
+  <string name="voicemail_transcription_failed_no_speech">Transkripti nuk ofrohet. Nuk u zbulua asnjë e folur.</string>
+  <string name="voicemail_donation_promo_title">Do të ndihmosh në përmirësimin e saktësisë së transkriptimit?</string>
+  <string name="voicemail_donation_promo_content">Lejo që Google ta rishikojë këtë dhe mesazhet e ardhshme të postës zanore me transkripte. Ato do të ruhen në mënyrë anonime. Ndrysho \"Cilësimet\" në çdo kohë. %1$s</string>
+  <string name="voicemail_donation_promo_opt_in">Po, jam dakord</string>
+  <string name="voicemail_donation_promo_opt_out">Jo, faleminderit</string>
+  <string name="voicemail_transcription_rating">Vlerëso cilësinë</string>
+  <string name="voicemail_transcription_rating_thanks">Faleminderit për komentin tënd</string>
+  <string name="description_rating_good">Pëlqej</string>
+  <string name="description_rating_bad">Nuk më pëlqen</string>
+  <string name="view_conversation">Shiko</string>
+  <string name="ec_data_deleted">Telefonata u fshi. Shiko dhe fshi bashkëngjitjet e ndara gjatë kësaj telefonate te \"Mesazhet\".</string>
+  <string name="multiple_ec_data_deleted">Telefonatat u fshinë. Shiko dhe fshi bashkëngjitjet e ndara gjatë telefonatave te \"Mesazhet\".</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-sr/strings.xml b/java/com/android/dialer/app/res/values-sr/strings.xml
index 9914899..0814963 100644
--- a/java/com/android/dialer/app/res/values-sr/strings.xml
+++ b/java/com/android/dialer/app/res/values-sr/strings.xml
@@ -1,181 +1,173 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="applicationLabel" msgid="2202739481132958990">"Телефон"</string>
-    <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"Телефонска тастатура"</string>
-    <string name="callHistoryIconLabel" msgid="7493268743411968630">"Историја позива"</string>
-    <string name="action_copy_number_text" msgid="832682558551502319">"Копирај број"</string>
-    <string name="copy_transcript_text" msgid="937904189017310829">"Копирај транскрипцију"</string>
-    <string name="action_edit_number_before_call" msgid="8017492815878473837">"Измени број пре позива"</string>
-    <string name="call_log_delete_all" msgid="7852970926906523784">"Обриши историју позива"</string>
-    <string name="call_log_trash_voicemail" msgid="6118493534178533972">"Избриши говорну поруку"</string>
-    <string name="snackbar_voicemail_deleted" msgid="7463166543725496307">"Гов. пошта је избрисана"</string>
-    <string name="snackbar_voicemail_deleted_undo" msgid="6959743982796409941">"ОПОЗОВИ"</string>
-    <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"Желите да обришете историју позива?"</string>
-    <string name="clearCallLogConfirmation" msgid="6844949465815109166">"Ово ће избрисати све позиве из историје"</string>
-    <string name="clearCallLogProgress_title" msgid="995004835687361977">"Брише се историја позива…"</string>
-    <string name="notification_missedCallTitle" msgid="8283366068539898486">"Пропуштен позив"</string>
-    <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"Пропуштен позив за Work"</string>
-    <string name="notification_missedCallsTitle" msgid="3697442015345089802">"Пропуштени позиви"</string>
-    <string name="notification_missedCallsMsg" msgid="8176217633929018706">"Број пропуштених позива: <xliff:g id="NUM_MISSED_CALLS">%d</xliff:g>"</string>
-    <string name="notification_missedCall_call_back" msgid="3875698110051973965">"Узврати позив"</string>
-    <string name="notification_missedCall_message" msgid="5086910028988305964">"Пошаљи SMS"</string>
-    <string name="post_call_notification_message" msgid="5417476789860590611">"<xliff:g id="NAME">%1$s</xliff:g>: <xliff:g id="MESSAGE">%2$s</xliff:g>"</string>
-    <string name="notification_voicemail_text_format" msgid="1895667520930252897">"Позови <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
-    <string name="notification_voicemail_no_vm_number" msgid="8942821987929495842">"Непознат број говорне поште"</string>
-    <plurals name="notification_voicemail_title" formatted="false" msgid="1551847434476438657">
-      <item quantity="one"> <xliff:g id="COUNT">%1$d</xliff:g> говорна порука </item>
-      <item quantity="few"> <xliff:g id="COUNT">%1$d</xliff:g> говорне поруке </item>
-      <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> говорних порука </item>
-    </plurals>
-    <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
-    <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"Нова говорна порука од <xliff:g id="CALLER">%1$s</xliff:g>"</string>
-    <string name="voicemail_playback_error" msgid="4384373852257757295">"Пуштање говорне поште није успело"</string>
-    <string name="voicemail_fetching_content" msgid="572320120918636014">"Говорна пошта се учитава…"</string>
-    <string name="voicemail_fetching_timout" msgid="2128873915839949783">"Учитавање говорне поште није успело"</string>
-    <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_playback_speakerphone" msgid="4852027754869750227">"Укључивање или искључивање спикерфона"</string>
-    <string name="description_playback_seek" msgid="1340910573254132520">"Тражење позиције у репродукцији"</string>
-    <string name="action_menu_call_history_description" msgid="8829135306925008546">"Историја позива"</string>
-    <string name="action_menu_overflow_description" msgid="7648679686746517341">"Још опција"</string>
-    <string name="action_menu_dialpad_button" msgid="1970631633457493180">"тастатура"</string>
-    <string name="dialer_settings_label" msgid="4980176284150290175">"Подешавања"</string>
-    <string name="simulator_submenu_label" msgid="186156287346615267">"Симулатор"</string>
-    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Направите пречицу за нови UI"</string>
-    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"Улазите у режим групних радњи"</string>
-    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"Изашли сте из режима групних радњи"</string>
-    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"Изабрано је <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"Опозван је избор <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_contact_details" msgid="3341280873855253464">"Детаљи о контакту за <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_spam_contact_details" msgid="5592578752881528368">"Контакт информације потенцијалног непожељног позиваоца <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> позива."</string>
-    <string name="description_video_call" msgid="3738199365585751727">"Видео позив."</string>
-    <string name="description_start_voice_search" msgid="8380022725973015261">"Покретање гласовне претраге"</string>
-    <string name="voicemail" msgid="8899540969000957954">"Говорна пошта"</string>
-    <string name="description_cancel_multi_select" msgid="3930475950253360461">"Откажите режим групних радњи"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Избриши"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Откажи"</string>
-    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"Изабраних: <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
-      <item quantity="one">"<b>"Желите ли да избришете ове говорне поруке? "</b>"</item>
-      <item quantity="few">"<b>"Желите ли да избришете ове говорне поруке? "</b>"</item>
-      <item quantity="other">"<b>"Желите ли да избришете ове говорне поруке? "</b>"</item>
-    </plurals>
-    <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
-    <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> у <xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
-    <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="voice_search_not_available" msgid="6546240433719732905">"Гласовна претрага није доступна"</string>
-    <string name="dialer_hint_find_contact" msgid="2023214799381149808">"Претражи контакте"</string>
-    <string name="block_number_search_hint" msgid="5377706079015099416">"Додајте број или претражите контакте"</string>
-    <string name="call_log_all_empty" msgid="3955572868518162004">"Историја позива је празна"</string>
-    <string name="call_log_all_empty_action" msgid="852218280136243014">"Позови"</string>
-    <string name="call_log_missed_empty" msgid="7094936030845062214">"Немате ниједан пропуштен позив."</string>
-    <string name="call_log_voicemail_empty" msgid="273623903423275178">"Пријемно сандуче говорне поште је празно."</string>
-    <string name="call_log_activity_title" msgid="1275242727244945527">"Историја позива"</string>
-    <string name="call_log_all_title" msgid="6042262422192020327">"Сви"</string>
-    <string name="call_log_missed_title" msgid="17254005889268015">"Пропуштени"</string>
-    <string name="tab_speed_dial" msgid="6616404752227561075">"Брзо бирање"</string>
-    <string name="tab_history" msgid="7420269368689503596">"Историја позива"</string>
-    <string name="tab_all_contacts" msgid="5531733977693943015">"Контакти"</string>
-    <string name="tab_voicemail" msgid="2458548090088316246">"Говорна пошта"</string>
-    <string name="search_shortcut_call_number" msgid="8847918845036880688">"Позови <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"Направи нови контакт"</string>
-    <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"Додај у контакт"</string>
-    <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"Пошаљи SMS"</string>
-    <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"Упути видео позив"</string>
-    <string name="search_shortcut_block_number" msgid="4587283230665805776">"Блокирај број"</string>
-    <string name="speed_dial_empty" msgid="3346406399966039505">"Немате ниједан контакт на брзом бирању"</string>
-    <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"Додај омиљен контакт"</string>
-    <string name="remove_contact" msgid="2353580570488923668">"Уклони"</string>
-    <string name="select_all" msgid="408601760696146245">"Изабери све"</string>
-    <string name="call_log_action_video_call" msgid="7565549950343850819">"Видео позив"</string>
-    <string name="call_log_action_send_message" msgid="6948727362660115554">"Пошаљи поруку"</string>
-    <string name="call_log_action_details" msgid="2091370737371449501">"Детаљи позива"</string>
-    <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"Пошаљи у…"</string>
-    <string name="call_log_action_call" msgid="682724094251540583">"Позови <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_incoming_missed_call" msgid="8292535799379230029">"Пропуштени позив: <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_incoming_answered_call" msgid="3920182963103160610">"Примљени позив: <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_unread_voicemail" msgid="145170985013419170">"Непрочитана говорна порука од <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_read_voicemail" msgid="5585559881573227732">"Говорна порука од <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_outgoing_call" msgid="543952487882919924">"Позвали сте: <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="call_log_via_number" msgid="1340307109806397650">"преко <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> преко <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="description_call_action" msgid="4042796498169106545">"Позови <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_video_call_action" msgid="1237090968588659650">"Упутите видео позив контакту <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
-    <string name="description_voicemail_action" msgid="3290143432403538524">"Пусти говорну пошту од <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_create_new_contact_action" msgid="1928282350281564130">"Направите контакт за <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"Додајте <xliff:g id="NAMEORNUMBER">^1</xliff:g> постојећем контакту"</string>
-    <string name="description_details_action" msgid="2061866409737706174">"Детаљи позива за <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="call_log_header_today" msgid="1576119097475845293">"Данас"</string>
-    <string name="call_log_header_yesterday" msgid="5616077776205329563">"Јуче"</string>
-    <string name="call_log_header_other" msgid="4940676886254217644">"Старији"</string>
-    <string name="voicemail_speaker_on" msgid="3151333608926996668">"Укључите звучник."</string>
-    <string name="voicemail_speaker_off" msgid="2530064206962034201">"Искључите звучник."</string>
-    <string name="voicemail_play_start_pause" msgid="3874823480278334664">"Започните или паузирајте репродукцију."</string>
-    <string name="display_options_title" msgid="3880091801055797975">"Опције приказа"</string>
-    <string name="sounds_and_vibration_title" msgid="3075050000721181384">"Звуци и вибрација"</string>
-    <string name="accessibility_settings_title" msgid="3329027650429831820">"Приступачност"</string>
-    <string name="ringtone_title" msgid="8377174189894648486">"Звук звона телефона"</string>
-    <string name="vibrate_on_ring_title" msgid="631441314790960485">"Вибрирај и за позиве"</string>
-    <string name="dtmf_tone_enable_title" msgid="3273762431523939277">"Тонови тастатуре"</string>
-    <string name="dtmf_tone_length_title" msgid="534096029202438539">"Дужина трајања тона тастатуре"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="applicationLabel">Телефон</string>
+  <string name="launcherDialpadActivityLabel">Телефонска тастатура</string>
+  <string name="callHistoryIconLabel">Историја позива</string>
+  <string name="action_copy_number_text">Копирај број</string>
+  <string name="copy_transcript_text">Копирај транскрипцију</string>
+  <string name="action_edit_number_before_call">Измени број пре позива</string>
+  <string name="call_log_delete_all">Обриши историју позива</string>
+  <string name="call_log_trash_voicemail">Избриши говорну поруку</string>
+  <string name="snackbar_voicemail_deleted">Гов. пошта је избрисана</string>
+  <string name="clearCallLogConfirmation_title">Желите да обришете историју позива?</string>
+  <string name="clearCallLogConfirmation">Ово ће избрисати све позиве из историје</string>
+  <string name="clearCallLogProgress_title">Брише се историја позива…</string>
+  <string name="notification_missedCallTitle">Пропуштен позив</string>
+  <string name="notification_missedWorkCallTitle">Пропуштен позив за Work</string>
+  <string name="notification_missedCallsTitle">Пропуштени позиви</string>
+  <string name="notification_missedCallsMsg">Број пропуштених позива: %d</string>
+  <string name="notification_missedCall_call_back">Узврати позив</string>
+  <string name="notification_missedCall_message">Пошаљи SMS</string>
+  <string name="post_call_notification_message">%1$s: %2$s</string>
+  <string name="notification_voicemail_text_format">Позови %s</string>
+  <string name="notification_voicemail_no_vm_number">Непознат број говорне поште</string>
+  <plurals name="notification_voicemail_title">
+    <item quantity="one"> %1$d говорна порука </item>
+    <item quantity="few"> %1$d говорне поруке </item>
+    <item quantity="other"> %1$d говорних порука </item>
+  </plurals>
+  <string name="notification_voicemail_callers_list">%1$s, %2$s</string>
+  <string name="notification_new_voicemail_ticker">Нова говорна порука од %1$s</string>
+  <string name="voicemail_playback_error">Пуштање говорне поште није успело</string>
+  <string name="voicemail_fetching_content">Говорна пошта се учитава…</string>
+  <string name="voicemail_fetching_timout">Учитавање говорне поште није успело</string>
+  <string name="call_log_item_count_and_date">(%1$d) %2$s</string>
+  <string name="description_playback_speakerphone">Укључивање или искључивање спикерфона</string>
+  <string name="description_playback_seek">Тражење позиције у репродукцији</string>
+  <string name="action_menu_call_history_description">Историја позива</string>
+  <string msgid="2295659037509008453" name="action_menu_overflow_description">Још опција</string>
+  <string name="action_menu_dialpad_button">тастатура</string>
+  <string name="dialer_settings_label">Подешавања</string>
+  <string name="simulator_submenu_label">Симулатор</string>
+  <string name="new_ui_launcher_shortcut_label">Направите пречицу за нови UI</string>
+  <string name="description_entering_bulk_action_mode">Улазите у режим групних радњи</string>
+  <string name="description_leaving_bulk_action_mode">Изашли сте из режима групних радњи</string>
+  <string name="description_selecting_bulk_action_mode">Изабрано је %1$s</string>
+  <string name="description_unselecting_bulk_action_mode">Опозван је избор %1$s</string>
+  <string name="description_contact_details">Детаљи о контакту за %1$s</string>
+  <string name="description_spam_contact_details">Контакт информације потенцијалног непожељног позиваоца %1$s</string>
+  <string name="description_num_calls">%1$s позива.</string>
+  <string name="description_video_call">Видео позив.</string>
+  <string name="description_start_voice_search">Покретање гласовне претраге</string>
+  <string name="voicemail">Говорна пошта</string>
+  <string name="description_cancel_multi_select">Откажите режим групних радњи</string>
+  <string name="voicemailMultiSelectDeleteConfirm">Избриши</string>
+  <string name="voicemailMultiSelectDeleteCancel">Откажи</string>
+  <string name="voicemailMultiSelectActionBarTitle">Изабраних: %1$s</string>
+  <plurals name="delete_voicemails_confirmation_dialog_title">
+    <item quantity="one"><b>Желите ли да избришете ове говорне поруке? </b></item>
+    <item quantity="few"><b>Желите ли да избришете ове говорне поруке? </b></item>
+    <item quantity="other"><b>Желите ли да избришете ове говорне поруке? </b></item>
+  </plurals>
+  <string name="voicemailCallLogToday">@string/call_log_header_today</string>
+  <string name="voicemailCallLogDateTimeFormat">%1$s у %2$s</string>
+  <string name="voicemailDurationFormat">%1$02d:%2$02d</string>
+  <string name="voicemailCallLogDateTimeFormatWithDuration">%1$s • %2$s</string>
+  <string name="voice_search_not_available">Гласовна претрага није доступна</string>
+  <string name="dialer_hint_find_contact">Претражи контакте</string>
+  <string name="block_number_search_hint">Додајте број или претражите контакте</string>
+  <string name="call_log_all_empty">Историја позива је празна</string>
+  <string name="call_log_all_empty_action">Позови</string>
+  <string name="call_log_missed_empty">Немате ниједан пропуштен позив.</string>
+  <string name="call_log_voicemail_empty">Пријемно сандуче говорне поште је празно.</string>
+  <string name="call_log_activity_title">Историја позива</string>
+  <string name="call_log_all_title">Сви</string>
+  <string name="call_log_missed_title">Пропуштени</string>
+  <string name="tab_speed_dial">Брзо бирање</string>
+  <string name="tab_history">Историја позива</string>
+  <string name="tab_all_contacts">Контакти</string>
+  <string name="tab_voicemail">Говорна пошта</string>
+  <string name="search_shortcut_call_number">Позови %s</string>
+  <string name="search_shortcut_create_new_contact">Направи нови контакт</string>
+  <string name="search_shortcut_add_to_contact">Додај у контакт</string>
+  <string name="search_shortcut_send_sms_message">Пошаљи SMS</string>
+  <string name="search_shortcut_make_video_call">Упути видео позив</string>
+  <string name="search_shortcut_block_number">Блокирај број</string>
+  <string name="speed_dial_empty">Немате ниједан контакт на брзом бирању</string>
+  <string name="speed_dial_empty_add_favorite_action">Додај омиљен контакт</string>
+  <string name="remove_contact">Уклони</string>
+  <string name="select_all">Изабери све</string>
+  <string name="call_log_action_video_call">Видео позив</string>
+  <string name="call_log_action_set_up_video">Подеси видео позиве</string>
+  <string name="call_log_action_invite_video">Позови у видео позив</string>
+  <string name="call_log_action_send_message">Пошаљи поруку</string>
+  <string name="call_log_action_details">Детаљи позива</string>
+  <string name="call_log_action_share_voicemail">Пошаљи у…</string>
+  <string name="call_log_action_call">Позови ^1</string>
+  <string name="description_incoming_missed_call">Пропуштени позив: ^1, ^2, ^3, ^4.</string>
+  <string name="description_incoming_answered_call">Примљени позив: ^1, ^2, ^3, ^4.</string>
+  <string name="description_unread_voicemail">Непрочитана говорна порука од ^1, ^2, ^3, ^4.</string>
+  <string name="description_read_voicemail">Говорна порука од ^1, ^2, ^3, ^4.</string>
+  <string name="description_outgoing_call">Позвали сте: ^1, ^2, ^3, ^4.</string>
+  <string name="call_log_via_number">преко %1$s</string>
+  <string name="call_log_via_number_phone_account">%1$s преко %2$s</string>
+  <string name="description_call_action">Позови ^1</string>
+  <string name="description_video_call_action">Упутите видео позив контакту ^1.</string>
+  <string name="description_voicemail_action">Пусти говорну пошту од ^1</string>
+  <string name="description_create_new_contact_action">Направите контакт за ^1</string>
+  <string name="description_add_to_existing_contact_action">Додајте ^1 постојећем контакту</string>
+  <string name="description_details_action">Детаљи позива за ^1</string>
+  <string name="call_log_header_today">Данас</string>
+  <string name="call_log_header_yesterday">Јуче</string>
+  <string name="call_log_header_other">Старији</string>
+  <string name="voicemail_speaker_on">Укључите звучник.</string>
+  <string name="voicemail_speaker_off">Искључите звучник.</string>
+  <string name="voicemail_play_start_pause">Започните или паузирајте репродукцију.</string>
+  <string name="display_options_title">Опције приказа</string>
+  <string name="sounds_and_vibration_title">Звуци и вибрација</string>
+  <string name="accessibility_settings_title">Приступачност</string>
+  <string name="ringtone_title">Звук звона телефона</string>
+  <string name="vibrate_on_ring_title">Вибрирај и за позиве</string>
+  <string name="dtmf_tone_enable_title">Тонови тастатуре</string>
+  <string name="dtmf_tone_length_title">Дужина трајања тона тастатуре</string>
   <string-array name="dtmf_tone_length_entries">
-    <item msgid="3136353015227162823">"Нормално"</item>
-    <item msgid="5376841175538523822">"Дугачак"</item>
+    <item>Нормално</item>
+    <item>Дугачак</item>
   </string-array>
-    <string name="respond_via_sms_setting_title" msgid="8008181606657693452">"Брзи одговори"</string>
-    <string name="call_settings_label" msgid="7824611757200960807">"Позиви"</string>
-    <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Блокирање позива"</string>
-    <string name="voicemail_settings_label" msgid="4594299554519920570">"Говорна пошта"</string>
-    <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Блокирање позива је привремено искључено"</string>
-    <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Блокирање позива је онемогућено зато што сте контактирали службе за помоћ у хитним случајевима са овог телефона у последњих 48 сати. Аутоматски ће бити поново омогућено када истекне период од 48 сати."</string>
-    <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Увези бројеве"</string>
-    <string name="blocked_call_settings_import_description" msgid="1819412052545228965">"Раније сте означили неке позиваоце које аутоматски треба преусмерити на говорну пошту преко других апликација."</string>
-    <string name="blocked_call_settings_view_numbers_button" msgid="3332727948554356704">"Прикажи бројеве"</string>
-    <string name="blocked_call_settings_import_button" msgid="7319111700387470727">"Увeзи"</string>
-    <string name="description_blocked_number_list_delete" msgid="2139644216858370740">"Деблокирај број"</string>
-    <string name="addBlockedNumber" msgid="3053473735238295551">"Додај број"</string>
-    <string name="block_number_footer_message_vvm" msgid="7955326304033982368">"Позиви са ових бројева ће бити блокирани и поруке говорне поште ће се аутоматски брисати."</string>
-    <string name="block_number_footer_message_no_vvm" msgid="1152684139070471665">"Позиви са ових бројева ће бити блокирани, али позиваоци са ових бројева ће и даље моћи да вам остављају поруке говорне поште."</string>
-    <string name="block_list" msgid="4701585783411870782">"Блокирани бројеви"</string>
-    <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g> је већ блокиран."</string>
-    <string name="phone_account_settings_label" msgid="8372485478006965920">"Налози за позивање"</string>
-    <string name="permission_no_speeddial" msgid="8487215628510596753">"Да бисте омогућили брзо бирање, укључите дозволу за Контакте."</string>
-    <string name="permission_no_calllog" msgid="4053705651238775784">"Да бисте видели евиденцију позива, укључите дозволу за Телефон."</string>
-    <string name="permission_no_search" msgid="2424710404207193826">"Да бисте претражили контакте, укључите дозволе за Контакте."</string>
-    <string name="permission_place_call" msgid="8686908130349369423">"Да бисте упутили позив, укључите дозволу за Телефон."</string>
-    <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"Апликација Телефон нема дозволу за уписивање у системска подешавања."</string>
-    <string name="blocked_number_call_log_label" msgid="4212282846299997693">"Блокирано"</string>
-    <string name="call_log_action_block_report_number" msgid="7302636538668696729">"Блокирај/пријави као непожељан"</string>
-    <string name="call_log_action_block_number" msgid="5048188386501998865">"Блокирај број"</string>
-    <string name="call_log_action_remove_spam" msgid="2045319806318398403">"Није непожељан"</string>
-    <string name="call_log_action_unblock_number" msgid="6100117033288448758">"Деблокирај број"</string>
-    <string name="spam_number_call_log_label" msgid="2678431398326811131">"Непожељан"</string>
-    <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> је офлајн и не можете да га/је контактирате"</string>
-    <string name="about_phone_label" msgid="582991354677973731">"Основни подаци"</string>
-    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Транскрипт је направио Google"</string>
-    <string name="voicemail_transcription_in_progress" msgid="2933320969613783210">"Google прави транскрипт…"</string>
-    <string name="voicemail_transcription_failed" msgid="335275303117412706">"Транскрипт није доступан."</string>
-    <string name="voicemail_transcription_failed_language_not_supported" msgid="4210332591050562553">"Транскрипт није доступан. Није подржан језик."</string>
-    <string name="voicemail_transcription_failed_no_speech" msgid="9093372879697874852">"Транскрипт није доступан. Није откривен говор."</string>
-    <string name="view_conversation" msgid="7895904782094119702">"Прикажи"</string>
-    <string name="ec_data_deleted" msgid="4794880345545827107">"Позив је избрисан. Прегледајте и избришите прилоге дељене током овог позива у Messages-у."</string>
-    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"Позиви су избрисани. Прегледајте и избришите прилоге дељене током позива у Messages-у."</string>
+  <string name="respond_via_sms_setting_title">Брзи одговори</string>
+  <string name="call_settings_label">Позиви</string>
+  <string name="manage_blocked_numbers_label">Блокирани бројеви</string>
+  <string name="voicemail_settings_label">Говорна пошта</string>
+  <string name="blocked_numbers_disabled_emergency_header_label">Блокирање позива је привремено искључено</string>
+  <string name="blocked_numbers_disabled_emergency_desc">Блокирање позива је онемогућено зато што сте контактирали службе за помоћ у хитним случајевима са овог телефона у последњих 48 сати. Аутоматски ће бити поново омогућено када истекне период од 48 сати.</string>
+  <string name="import_send_to_voicemail_numbers_label">Увези бројеве</string>
+  <string name="blocked_call_settings_import_description">Раније сте означили неке позиваоце које аутоматски треба преусмерити на говорну пошту преко других апликација.</string>
+  <string name="blocked_call_settings_view_numbers_button">Прикажи бројеве</string>
+  <string name="blocked_call_settings_import_button">Увeзи</string>
+  <string name="description_blocked_number_list_delete">Деблокирај број</string>
+  <string name="addBlockedNumber">Додај број</string>
+  <string name="block_number_footer_message_vvm">Позиви са ових бројева ће бити блокирани и поруке говорне поште ће се аутоматски брисати.</string>
+  <string name="block_number_footer_message_no_vvm">Позиви са ових бројева ће бити блокирани, али позиваоци са ових бројева ће и даље моћи да вам остављају поруке говорне поште.</string>
+  <string name="block_list">Блокирани бројеви</string>
+  <string name="alreadyBlocked">%1$s је већ блокиран.</string>
+  <string name="phone_account_settings_label">Налози за позивање</string>
+  <string name="permission_no_speeddial">Да бисте омогућили брзо бирање, укључите дозволу за Контакте.</string>
+  <string name="permission_no_calllog">Да бисте видели евиденцију позива, укључите дозволу за Телефон.</string>
+  <string name="permission_no_search">Да бисте претражили контакте, укључите дозволе за Контакте.</string>
+  <string name="permission_place_call">Да бисте упутили позив, укључите дозволу за Телефон.</string>
+  <string name="toast_cannot_write_system_settings">Апликација Телефон нема дозволу за уписивање у системска подешавања.</string>
+  <string name="blocked_number_call_log_label">Блокирано</string>
+  <string name="call_log_action_block_report_number">Блокирај/пријави као непожељан</string>
+  <string name="call_log_action_block_number">Блокирај број</string>
+  <string name="call_log_action_remove_spam">Није непожељан</string>
+  <string name="call_log_action_unblock_number">Деблокирај број</string>
+  <string name="spam_number_call_log_label">Непожељан</string>
+  <string name="call_composer_connection_failed">%1$s је офлајн и не можете да га/је контактирате</string>
+  <string name="about_phone_label">Основни подаци</string>
+  <string name="voicemail_transcription_branding_text">Транскрипт је направио Google</string>
+  <string name="voicemail_transcription_in_progress">Транскрибује се…</string>
+  <string name="voicemail_transcription_failed">Транскрипт није доступан.</string>
+  <string name="voicemail_transcription_failed_language_not_supported">Транскрипт није доступан. Није подржан језик.</string>
+  <string name="voicemail_transcription_failed_no_speech">Транскрипт није доступан. Није откривен говор.</string>
+  <string name="voicemail_donation_promo_title">Желите ли да нам помогнете да побољшамо тачност транскрипције?</string>
+  <string name="voicemail_donation_promo_content">Дозволите Google-у да прегледа ову и будуће говорне поруке са транскриптима. Чуваће се анонимно. Подешавања увек можете да промените. %1$s</string>
+  <string name="voicemail_donation_promo_opt_in">Да, омогући</string>
+  <string name="voicemail_donation_promo_opt_out">Не, хвала</string>
+  <string name="voicemail_transcription_rating">Оцените квалитет транскрипције</string>
+  <string name="voicemail_transcription_rating_thanks">Хвала вам на оцени квалитета</string>
+  <string name="description_rating_good">Означите да је добро</string>
+  <string name="description_rating_bad">Означите да је лоше</string>
+  <string name="view_conversation">Прикажи</string>
+  <string name="ec_data_deleted">Позив је избрисан. Прегледајте и избришите прилоге дељене током овог позива у Messages-у.</string>
+  <string name="multiple_ec_data_deleted">Позиви су избрисани. Прегледајте и избришите прилоге дељене током позива у Messages-у.</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-sv/strings.xml b/java/com/android/dialer/app/res/values-sv/strings.xml
index 602670e..eee9af9 100644
--- a/java/com/android/dialer/app/res/values-sv/strings.xml
+++ b/java/com/android/dialer/app/res/values-sv/strings.xml
@@ -1,179 +1,171 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="applicationLabel" msgid="2202739481132958990">"Telefon"</string>
-    <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"Telefonens knappsats"</string>
-    <string name="callHistoryIconLabel" msgid="7493268743411968630">"Samtalshistorik"</string>
-    <string name="action_copy_number_text" msgid="832682558551502319">"Kopiera nummer"</string>
-    <string name="copy_transcript_text" msgid="937904189017310829">"Kopiera transkription"</string>
-    <string name="action_edit_number_before_call" msgid="8017492815878473837">"Redigera nummer före samtal"</string>
-    <string name="call_log_delete_all" msgid="7852970926906523784">"Rensa samtalshistorik"</string>
-    <string name="call_log_trash_voicemail" msgid="6118493534178533972">"Radera röstmeddelande"</string>
-    <string name="snackbar_voicemail_deleted" msgid="7463166543725496307">"Röstbrevlåda raderad"</string>
-    <string name="snackbar_voicemail_deleted_undo" msgid="6959743982796409941">"ÅNGRA"</string>
-    <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"Vill du rensa samtalshistoriken?"</string>
-    <string name="clearCallLogConfirmation" msgid="6844949465815109166">"Alla samtal raderas från historiken"</string>
-    <string name="clearCallLogProgress_title" msgid="995004835687361977">"Rensar samtalshistoriken ..."</string>
-    <string name="notification_missedCallTitle" msgid="8283366068539898486">"Missat samtal"</string>
-    <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"Missat jobbsamtal"</string>
-    <string name="notification_missedCallsTitle" msgid="3697442015345089802">"Missade samtal"</string>
-    <string name="notification_missedCallsMsg" msgid="8176217633929018706">"<xliff:g id="NUM_MISSED_CALLS">%d</xliff:g> missade samtal"</string>
-    <string name="notification_missedCall_call_back" msgid="3875698110051973965">"Ring upp"</string>
-    <string name="notification_missedCall_message" msgid="5086910028988305964">"Meddelande"</string>
-    <string name="post_call_notification_message" msgid="5417476789860590611">"<xliff:g id="NAME">%1$s</xliff:g>: <xliff:g id="MESSAGE">%2$s</xliff:g>"</string>
-    <string name="notification_voicemail_text_format" msgid="1895667520930252897">"Ring <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
-    <string name="notification_voicemail_no_vm_number" msgid="8942821987929495842">"Numret till röstbrevlådan är okänt"</string>
-    <plurals name="notification_voicemail_title" formatted="false" msgid="1551847434476438657">
-      <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> röstmeddelanden </item>
-      <item quantity="one">röstmeddelande</item>
-    </plurals>
-    <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
-    <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"Nytt röstmeddelande från <xliff:g id="CALLER">%1$s</xliff:g>"</string>
-    <string name="voicemail_playback_error" msgid="4384373852257757295">"Det gick inte att spela upp röstmeddelandet"</string>
-    <string name="voicemail_fetching_content" msgid="572320120918636014">"Läser in röstmeddelande ..."</string>
-    <string name="voicemail_fetching_timout" msgid="2128873915839949783">"Det gick inte att läsa in röstmeddelandet"</string>
-    <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_playback_speakerphone" msgid="4852027754869750227">"Slå på eller av högtalartelefon"</string>
-    <string name="description_playback_seek" msgid="1340910573254132520">"Sök uppspelningsläge"</string>
-    <string name="action_menu_call_history_description" msgid="8829135306925008546">"Samtalshistorik"</string>
-    <string name="action_menu_overflow_description" msgid="7648679686746517341">"Fler alternativ"</string>
-    <string name="action_menu_dialpad_button" msgid="1970631633457493180">"knappsats"</string>
-    <string name="dialer_settings_label" msgid="4980176284150290175">"Inställningar"</string>
-    <string name="simulator_submenu_label" msgid="186156287346615267">"Simulator"</string>
-    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Skapa genväg till anv.gränssn."</string>
-    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"Öppnar läget för massåtgärd"</string>
-    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"Stängde läget för massåtgärd"</string>
-    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"Markerade <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"Avmarkerade <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_contact_details" msgid="3341280873855253464">"Kontaktuppgifter för <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_spam_contact_details" msgid="5592578752881528368">"Kontaktuppgifter för misstänkt spamsamtal <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> samtal."</string>
-    <string name="description_video_call" msgid="3738199365585751727">"Videosamtal."</string>
-    <string name="description_start_voice_search" msgid="8380022725973015261">"Starta röstsökning"</string>
-    <string name="voicemail" msgid="8899540969000957954">"Röstbrevlåda"</string>
-    <string name="description_cancel_multi_select" msgid="3930475950253360461">"Avbryt läget för massåtgärd"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Radera"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Avbryt"</string>
-    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> har markerats"</string>
-    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
-      <item quantity="other">"<b>"Vill du ta bort dessa röstmeddelanden? "</b>"</item>
-      <item quantity="one">"<b>"Vill du ta bort det här röstmeddelandet? "</b>"</item>
-    </plurals>
-    <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
-    <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> kl. <xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
-    <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="voice_search_not_available" msgid="6546240433719732905">"Röstsökning är inte tillgänglig"</string>
-    <string name="dialer_hint_find_contact" msgid="2023214799381149808">"Sök efter kontakter"</string>
-    <string name="block_number_search_hint" msgid="5377706079015099416">"Ange nummer eller kontakt"</string>
-    <string name="call_log_all_empty" msgid="3955572868518162004">"Samtalshistoriken är tom"</string>
-    <string name="call_log_all_empty_action" msgid="852218280136243014">"Ring ett samtal"</string>
-    <string name="call_log_missed_empty" msgid="7094936030845062214">"Du har inga missade samtal."</string>
-    <string name="call_log_voicemail_empty" msgid="273623903423275178">"Din röstbrevlåda är tom."</string>
-    <string name="call_log_activity_title" msgid="1275242727244945527">"Samtalshistorik"</string>
-    <string name="call_log_all_title" msgid="6042262422192020327">"Alla"</string>
-    <string name="call_log_missed_title" msgid="17254005889268015">"Missade"</string>
-    <string name="tab_speed_dial" msgid="6616404752227561075">"Kortnummer"</string>
-    <string name="tab_history" msgid="7420269368689503596">"Samtalshistorik"</string>
-    <string name="tab_all_contacts" msgid="5531733977693943015">"Kontakter"</string>
-    <string name="tab_voicemail" msgid="2458548090088316246">"Röstbrevlåda"</string>
-    <string name="search_shortcut_call_number" msgid="8847918845036880688">"Ring <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"Skapa ny kontakt"</string>
-    <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"Lägg till i kontakt"</string>
-    <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"Skicka sms"</string>
-    <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"Ring videosamtal"</string>
-    <string name="search_shortcut_block_number" msgid="4587283230665805776">"Blockera nummer"</string>
-    <string name="speed_dial_empty" msgid="3346406399966039505">"Du har ingen kontakt som snabbval ännu"</string>
-    <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"Lägg till en favorit"</string>
-    <string name="remove_contact" msgid="2353580570488923668">"Ta bort"</string>
-    <string name="select_all" msgid="408601760696146245">"Markera alla"</string>
-    <string name="call_log_action_video_call" msgid="7565549950343850819">"Videosamtal"</string>
-    <string name="call_log_action_send_message" msgid="6948727362660115554">"Skicka ett meddelande"</string>
-    <string name="call_log_action_details" msgid="2091370737371449501">"Samtalsinfo"</string>
-    <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"Skicka till …"</string>
-    <string name="call_log_action_call" msgid="682724094251540583">"Ring <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_incoming_missed_call" msgid="8292535799379230029">"Missat samtal från <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_incoming_answered_call" msgid="3920182963103160610">"Besvarat samtal från <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_unread_voicemail" msgid="145170985013419170">"Nytt röstmeddelande från <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_read_voicemail" msgid="5585559881573227732">"Röstmeddelande från <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_outgoing_call" msgid="543952487882919924">"Ring till <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="call_log_via_number" msgid="1340307109806397650">"med <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> med <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="description_call_action" msgid="4042796498169106545">"Ring <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_video_call_action" msgid="1237090968588659650">"Ring videosamtal till <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
-    <string name="description_voicemail_action" msgid="3290143432403538524">"Lyssna på ett röstmeddelande från <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_create_new_contact_action" msgid="1928282350281564130">"Skapa en kontakt för <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"Lägg till <xliff:g id="NAMEORNUMBER">^1</xliff:g> i befintliga kontakter"</string>
-    <string name="description_details_action" msgid="2061866409737706174">"Samtalsinformation för <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="call_log_header_today" msgid="1576119097475845293">"I dag"</string>
-    <string name="call_log_header_yesterday" msgid="5616077776205329563">"I går"</string>
-    <string name="call_log_header_other" msgid="4940676886254217644">"Äldre"</string>
-    <string name="voicemail_speaker_on" msgid="3151333608926996668">"Slå på högtalaren."</string>
-    <string name="voicemail_speaker_off" msgid="2530064206962034201">"Stäng av högtalaren."</string>
-    <string name="voicemail_play_start_pause" msgid="3874823480278334664">"Starta eller pausa uppspelning."</string>
-    <string name="display_options_title" msgid="3880091801055797975">"Visningsalternativ"</string>
-    <string name="sounds_and_vibration_title" msgid="3075050000721181384">"Ljud och vibration"</string>
-    <string name="accessibility_settings_title" msgid="3329027650429831820">"Tillgänglighet"</string>
-    <string name="ringtone_title" msgid="8377174189894648486">"Ringsignal"</string>
-    <string name="vibrate_on_ring_title" msgid="631441314790960485">"Vibrera också vid samtal"</string>
-    <string name="dtmf_tone_enable_title" msgid="3273762431523939277">"Knappsatsljud"</string>
-    <string name="dtmf_tone_length_title" msgid="534096029202438539">"Knappsatsljudets längd"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="applicationLabel">Telefon</string>
+  <string name="launcherDialpadActivityLabel">Telefonens knappsats</string>
+  <string name="callHistoryIconLabel">Samtalshistorik</string>
+  <string name="action_copy_number_text">Kopiera nummer</string>
+  <string name="copy_transcript_text">Kopiera transkription</string>
+  <string name="action_edit_number_before_call">Redigera nummer före samtal</string>
+  <string name="call_log_delete_all">Rensa samtalshistorik</string>
+  <string name="call_log_trash_voicemail">Radera röstmeddelande</string>
+  <string name="snackbar_voicemail_deleted">Röstbrevlåda raderad</string>
+  <string name="clearCallLogConfirmation_title">Vill du rensa samtalshistoriken?</string>
+  <string name="clearCallLogConfirmation">Alla samtal raderas från historiken</string>
+  <string name="clearCallLogProgress_title">Rensar samtalshistoriken ...</string>
+  <string name="notification_missedCallTitle">Missat samtal</string>
+  <string name="notification_missedWorkCallTitle">Missat jobbsamtal</string>
+  <string name="notification_missedCallsTitle">Missade samtal</string>
+  <string name="notification_missedCallsMsg">%d missade samtal</string>
+  <string name="notification_missedCall_call_back">Ring upp</string>
+  <string name="notification_missedCall_message">Meddelande</string>
+  <string name="post_call_notification_message">%1$s: %2$s</string>
+  <string name="notification_voicemail_text_format">Ring %s</string>
+  <string name="notification_voicemail_no_vm_number">Numret till röstbrevlådan är okänt</string>
+  <plurals name="notification_voicemail_title">
+    <item quantity="one">röstmeddelande</item>
+    <item quantity="other"> %1$d röstmeddelanden </item>
+  </plurals>
+  <string name="notification_voicemail_callers_list">%1$s, %2$s</string>
+  <string name="notification_new_voicemail_ticker">Nytt röstmeddelande från %1$s</string>
+  <string name="voicemail_playback_error">Det gick inte att spela upp röstmeddelandet</string>
+  <string name="voicemail_fetching_content">Läser in röstmeddelande ...</string>
+  <string name="voicemail_fetching_timout">Det gick inte att läsa in röstmeddelandet</string>
+  <string name="call_log_item_count_and_date">(%1$d) %2$s</string>
+  <string name="description_playback_speakerphone">Slå på eller av högtalartelefon</string>
+  <string name="description_playback_seek">Sök uppspelningsläge</string>
+  <string name="action_menu_call_history_description">Samtalshistorik</string>
+  <string msgid="2295659037509008453" name="action_menu_overflow_description">Fler alternativ</string>
+  <string name="action_menu_dialpad_button">knappsats</string>
+  <string name="dialer_settings_label">Inställningar</string>
+  <string name="simulator_submenu_label">Simulator</string>
+  <string name="new_ui_launcher_shortcut_label">Skapa genväg till anv.gränssn.</string>
+  <string name="description_entering_bulk_action_mode">Öppnar läget för massåtgärd</string>
+  <string name="description_leaving_bulk_action_mode">Stängde läget för massåtgärd</string>
+  <string name="description_selecting_bulk_action_mode">Markerade %1$s</string>
+  <string name="description_unselecting_bulk_action_mode">Avmarkerade %1$s</string>
+  <string name="description_contact_details">Kontaktuppgifter för %1$s</string>
+  <string name="description_spam_contact_details">Kontaktuppgifter för misstänkt spamsamtal %1$s</string>
+  <string name="description_num_calls">%1$s samtal.</string>
+  <string name="description_video_call">Videosamtal.</string>
+  <string name="description_start_voice_search">Starta röstsökning</string>
+  <string name="voicemail">Röstbrevlåda</string>
+  <string name="description_cancel_multi_select">Avbryt läget för massåtgärd</string>
+  <string name="voicemailMultiSelectDeleteConfirm">Radera</string>
+  <string name="voicemailMultiSelectDeleteCancel">Avbryt</string>
+  <string name="voicemailMultiSelectActionBarTitle">%1$s har markerats</string>
+  <plurals name="delete_voicemails_confirmation_dialog_title">
+    <item quantity="one"><b>Vill du ta bort det här röstmeddelandet? </b></item>
+    <item quantity="other"><b>Vill du ta bort dessa röstmeddelanden? </b></item>
+  </plurals>
+  <string name="voicemailCallLogToday">@string/call_log_header_today</string>
+  <string name="voicemailCallLogDateTimeFormat">%1$s kl. %2$s</string>
+  <string name="voicemailDurationFormat">%1$02d:%2$02d</string>
+  <string name="voicemailCallLogDateTimeFormatWithDuration">%1$s • %2$s</string>
+  <string name="voice_search_not_available">Röstsökning är inte tillgänglig</string>
+  <string name="dialer_hint_find_contact">Sök efter kontakter</string>
+  <string name="block_number_search_hint">Ange nummer eller kontakt</string>
+  <string name="call_log_all_empty">Samtalshistoriken är tom</string>
+  <string name="call_log_all_empty_action">Ring ett samtal</string>
+  <string name="call_log_missed_empty">Du har inga missade samtal.</string>
+  <string name="call_log_voicemail_empty">Din röstbrevlåda är tom.</string>
+  <string name="call_log_activity_title">Samtalshistorik</string>
+  <string name="call_log_all_title">Alla</string>
+  <string name="call_log_missed_title">Missade</string>
+  <string name="tab_speed_dial">Kortnummer</string>
+  <string name="tab_history">Samtalshistorik</string>
+  <string name="tab_all_contacts">Kontakter</string>
+  <string name="tab_voicemail">Röstbrevlåda</string>
+  <string name="search_shortcut_call_number">Ring %s</string>
+  <string name="search_shortcut_create_new_contact">Skapa ny kontakt</string>
+  <string name="search_shortcut_add_to_contact">Lägg till i kontakt</string>
+  <string name="search_shortcut_send_sms_message">Skicka sms</string>
+  <string name="search_shortcut_make_video_call">Ring videosamtal</string>
+  <string name="search_shortcut_block_number">Blockera nummer</string>
+  <string name="speed_dial_empty">Du har ingen kontakt som snabbval ännu</string>
+  <string name="speed_dial_empty_add_favorite_action">Lägg till en favorit</string>
+  <string name="remove_contact">Ta bort</string>
+  <string name="select_all">Markera alla</string>
+  <string name="call_log_action_video_call">Videosamtal</string>
+  <string name="call_log_action_set_up_video">Konfigurera videosamtal</string>
+  <string name="call_log_action_invite_video">Bjud in till videosamtal</string>
+  <string name="call_log_action_send_message">Skicka ett meddelande</string>
+  <string name="call_log_action_details">Samtalsinfo</string>
+  <string name="call_log_action_share_voicemail">Skicka till …</string>
+  <string name="call_log_action_call">Ring ^1</string>
+  <string name="description_incoming_missed_call">Missat samtal från ^1, ^2, ^3, ^4.</string>
+  <string name="description_incoming_answered_call">Besvarat samtal från ^1, ^2, ^3, ^4.</string>
+  <string name="description_unread_voicemail">Nytt röstmeddelande från ^1, ^2, ^3, ^4.</string>
+  <string name="description_read_voicemail">Röstmeddelande från ^1, ^2, ^3, ^4.</string>
+  <string name="description_outgoing_call">Ring till ^1, ^2, ^3, ^4.</string>
+  <string name="call_log_via_number">med %1$s</string>
+  <string name="call_log_via_number_phone_account">%1$s med %2$s</string>
+  <string name="description_call_action">Ring ^1</string>
+  <string name="description_video_call_action">Ring videosamtal till ^1.</string>
+  <string name="description_voicemail_action">Lyssna på ett röstmeddelande från ^1</string>
+  <string name="description_create_new_contact_action">Skapa en kontakt för ^1</string>
+  <string name="description_add_to_existing_contact_action">Lägg till ^1 i befintliga kontakter</string>
+  <string name="description_details_action">Samtalsinformation för ^1</string>
+  <string name="call_log_header_today">I dag</string>
+  <string name="call_log_header_yesterday">I går</string>
+  <string name="call_log_header_other">Äldre</string>
+  <string name="voicemail_speaker_on">Slå på högtalaren.</string>
+  <string name="voicemail_speaker_off">Stäng av högtalaren.</string>
+  <string name="voicemail_play_start_pause">Starta eller pausa uppspelning.</string>
+  <string name="display_options_title">Visningsalternativ</string>
+  <string name="sounds_and_vibration_title">Ljud och vibration</string>
+  <string name="accessibility_settings_title">Tillgänglighet</string>
+  <string name="ringtone_title">Ringsignal</string>
+  <string name="vibrate_on_ring_title">Vibrera också vid samtal</string>
+  <string name="dtmf_tone_enable_title">Knappsatsljud</string>
+  <string name="dtmf_tone_length_title">Knappsatsljudets längd</string>
   <string-array name="dtmf_tone_length_entries">
-    <item msgid="3136353015227162823">"Normal"</item>
-    <item msgid="5376841175538523822">"Lång"</item>
+    <item>Normal</item>
+    <item>Lång</item>
   </string-array>
-    <string name="respond_via_sms_setting_title" msgid="8008181606657693452">"Snabbsvar"</string>
-    <string name="call_settings_label" msgid="7824611757200960807">"Samtal"</string>
-    <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Samtalsblockering"</string>
-    <string name="voicemail_settings_label" msgid="4594299554519920570">"Röstbrevlåda"</string>
-    <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Blockeringen har inaktiverats tillfälligt"</string>
-    <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Samtalsblockering har inaktiverats eftersom du ringde ett larmnummer från den här mobilen under de senaste 48 timmarna. Blockeringen aktiveras igen när 48 timmar har gått."</string>
-    <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Importera nummer"</string>
-    <string name="blocked_call_settings_import_description" msgid="1819412052545228965">"Du har tidigare angett via andra appar att vissa inkommande samtal ska skickas till röstbrevlådan automatiskt."</string>
-    <string name="blocked_call_settings_view_numbers_button" msgid="3332727948554356704">"Visa telefonnummer"</string>
-    <string name="blocked_call_settings_import_button" msgid="7319111700387470727">"Importera"</string>
-    <string name="description_blocked_number_list_delete" msgid="2139644216858370740">"Häv blockeringen av numret"</string>
-    <string name="addBlockedNumber" msgid="3053473735238295551">"Lägg till telefonnummer"</string>
-    <string name="block_number_footer_message_vvm" msgid="7955326304033982368">"Samtal från de här numren blockeras och röstmeddelanden raderas automatiskt."</string>
-    <string name="block_number_footer_message_no_vvm" msgid="1152684139070471665">"Samtal från de här numren blockeras, men det kan fortfarande gå att lämna ett röstmeddelande."</string>
-    <string name="block_list" msgid="4701585783411870782">"Blockerade nummer"</string>
-    <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g> är redan blockerat."</string>
-    <string name="phone_account_settings_label" msgid="8372485478006965920">"Konton för samtal"</string>
-    <string name="permission_no_speeddial" msgid="8487215628510596753">"Du måste aktivera behörigheten Kontakter för att kunna använda snabbuppringning."</string>
-    <string name="permission_no_calllog" msgid="4053705651238775784">"Du måste aktivera behörigheten Telefon för att kunna visa samtalsloggen."</string>
-    <string name="permission_no_search" msgid="2424710404207193826">"Aktivera behörigheter för Kontakter om du vill söka bland kontakterna."</string>
-    <string name="permission_place_call" msgid="8686908130349369423">"Du måste aktivera behörigheten Telefon för att kunna ringa."</string>
-    <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"Telefonappen har inte skrivbehörighet i systeminställningarna."</string>
-    <string name="blocked_number_call_log_label" msgid="4212282846299997693">"Blockerad"</string>
-    <string name="call_log_action_block_report_number" msgid="7302636538668696729">"Blockera/rapportera spam"</string>
-    <string name="call_log_action_block_number" msgid="5048188386501998865">"Blockera nummer"</string>
-    <string name="call_log_action_remove_spam" msgid="2045319806318398403">"Inte spam"</string>
-    <string name="call_log_action_unblock_number" msgid="6100117033288448758">"Häv blockeringen av numret"</string>
-    <string name="spam_number_call_log_label" msgid="2678431398326811131">"Spam"</string>
-    <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> är offline och går inte att nå"</string>
-    <string name="about_phone_label" msgid="582991354677973731">"Om"</string>
-    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Transkriberat av Google"</string>
-    <string name="voicemail_transcription_in_progress" msgid="2933320969613783210">"Google transkriberar …"</string>
-    <string name="voicemail_transcription_failed" msgid="335275303117412706">"Transkription inte tillgänglig."</string>
-    <string name="voicemail_transcription_failed_language_not_supported" msgid="4210332591050562553">"Transkription inte tillgänglig. Språket stöds inte."</string>
-    <string name="voicemail_transcription_failed_no_speech" msgid="9093372879697874852">"Transkription inte tillgänglig. Inget tal identifierat."</string>
-    <string name="view_conversation" msgid="7895904782094119702">"Visa"</string>
-    <string name="ec_data_deleted" msgid="4794880345545827107">"Samtalet har raderats. Visa och radera bilagor som delats under samtalet i Messages."</string>
-    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"Samtalen har raderats. Visa och radera bilagor som delats under samtal i Messages."</string>
+  <string name="respond_via_sms_setting_title">Snabbsvar</string>
+  <string name="call_settings_label">Samtal</string>
+  <string name="manage_blocked_numbers_label">Blockerade nummer</string>
+  <string name="voicemail_settings_label">Röstbrevlåda</string>
+  <string name="blocked_numbers_disabled_emergency_header_label">Blockeringen har inaktiverats tillfälligt</string>
+  <string name="blocked_numbers_disabled_emergency_desc">Samtalsblockering har inaktiverats eftersom du ringde ett larmnummer från den här mobilen under de senaste 48 timmarna. Blockeringen aktiveras igen när 48 timmar har gått.</string>
+  <string name="import_send_to_voicemail_numbers_label">Importera nummer</string>
+  <string name="blocked_call_settings_import_description">Du har tidigare angett via andra appar att vissa inkommande samtal ska skickas till röstbrevlådan automatiskt.</string>
+  <string name="blocked_call_settings_view_numbers_button">Visa telefonnummer</string>
+  <string name="blocked_call_settings_import_button">Importera</string>
+  <string name="description_blocked_number_list_delete">Häv blockeringen av numret</string>
+  <string name="addBlockedNumber">Lägg till telefonnummer</string>
+  <string name="block_number_footer_message_vvm">Samtal från de här numren blockeras och röstmeddelanden raderas automatiskt.</string>
+  <string name="block_number_footer_message_no_vvm">Samtal från de här numren blockeras, men det kan fortfarande gå att lämna ett röstmeddelande.</string>
+  <string name="block_list">Blockerade nummer</string>
+  <string name="alreadyBlocked">%1$s är redan blockerat.</string>
+  <string name="phone_account_settings_label">Konton för samtal</string>
+  <string name="permission_no_speeddial">Du måste aktivera behörigheten Kontakter för att kunna använda snabbuppringning.</string>
+  <string name="permission_no_calllog">Du måste aktivera behörigheten Telefon för att kunna visa samtalsloggen.</string>
+  <string name="permission_no_search">Aktivera behörigheter för Kontakter om du vill söka bland kontakterna.</string>
+  <string name="permission_place_call">Du måste aktivera behörigheten Telefon för att kunna ringa.</string>
+  <string name="toast_cannot_write_system_settings">Telefonappen har inte skrivbehörighet i systeminställningarna.</string>
+  <string name="blocked_number_call_log_label">Blockerad</string>
+  <string name="call_log_action_block_report_number">Blockera/rapportera spam</string>
+  <string name="call_log_action_block_number">Blockera nummer</string>
+  <string name="call_log_action_remove_spam">Inte spam</string>
+  <string name="call_log_action_unblock_number">Häv blockeringen av numret</string>
+  <string name="spam_number_call_log_label">Spam</string>
+  <string name="call_composer_connection_failed">%1$s är offline och går inte att nå</string>
+  <string name="about_phone_label">Om</string>
+  <string name="voicemail_transcription_branding_text">Transkriberat av Google</string>
+  <string name="voicemail_transcription_in_progress">Transkriberar …</string>
+  <string name="voicemail_transcription_failed">Transkription inte tillgänglig.</string>
+  <string name="voicemail_transcription_failed_language_not_supported">Transkription inte tillgänglig. Språket stöds inte.</string>
+  <string name="voicemail_transcription_failed_no_speech">Transkription inte tillgänglig. Inget tal identifierat.</string>
+  <string name="voicemail_donation_promo_title">Vill du hjälpa till att förbättra transkriptionskvaliteten?</string>
+  <string name="voicemail_donation_promo_content">Låt Google granska denna och framtida röstmeddelanden med transkriptioner. De lagras anonymt. Du kan ändra inställningarna när du vill. %1$s</string>
+  <string name="voicemail_donation_promo_opt_in">OK</string>
+  <string name="voicemail_donation_promo_opt_out">Nej tack</string>
+  <string name="voicemail_transcription_rating">Betygsätt transkriptionskvalitet</string>
+  <string name="voicemail_transcription_rating_thanks">Tack för din feedback</string>
+  <string name="description_rating_good">Gilla</string>
+  <string name="description_rating_bad">Ogilla</string>
+  <string name="view_conversation">Visa</string>
+  <string name="ec_data_deleted">Samtalet har raderats. Visa och radera bilagor som delats under samtalet i Messages.</string>
+  <string name="multiple_ec_data_deleted">Samtalen har raderats. Visa och radera bilagor som delats under samtal i Messages.</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-sw/strings.xml b/java/com/android/dialer/app/res/values-sw/strings.xml
index e25fff3..356a8da 100644
--- a/java/com/android/dialer/app/res/values-sw/strings.xml
+++ b/java/com/android/dialer/app/res/values-sw/strings.xml
@@ -1,179 +1,171 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="applicationLabel" msgid="2202739481132958990">"Simu"</string>
-    <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"Vitufe vya Simu"</string>
-    <string name="callHistoryIconLabel" msgid="7493268743411968630">"Rekodi ya simu zilizopigwa"</string>
-    <string name="action_copy_number_text" msgid="832682558551502319">"Nakili nambari"</string>
-    <string name="copy_transcript_text" msgid="937904189017310829">"Nakili unukuzi"</string>
-    <string name="action_edit_number_before_call" msgid="8017492815878473837">"Badilisha nambari kabla ya kupiga simu"</string>
-    <string name="call_log_delete_all" msgid="7852970926906523784">"Futa rekodi ya simu zilizopigwa"</string>
-    <string name="call_log_trash_voicemail" msgid="6118493534178533972">"Futa ujumbe wa sauti"</string>
-    <string name="snackbar_voicemail_deleted" msgid="7463166543725496307">"Ujumbe wa sauti umefutwa"</string>
-    <string name="snackbar_voicemail_deleted_undo" msgid="6959743982796409941">"TENDUA"</string>
-    <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"Rekodi ya simu zilizopigwa ifutwe?"</string>
-    <string name="clearCallLogConfirmation" msgid="6844949465815109166">"Hatua hii itafuta rekodi yote ya simu"</string>
-    <string name="clearCallLogProgress_title" msgid="995004835687361977">"Inafuta rekodi ya simu zilizopigwa..."</string>
-    <string name="notification_missedCallTitle" msgid="8283366068539898486">"Simu uliyokosa"</string>
-    <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"Simu ya kazini ambayo hukujibu"</string>
-    <string name="notification_missedCallsTitle" msgid="3697442015345089802">"Simu zisizojibiwa"</string>
-    <string name="notification_missedCallsMsg" msgid="8176217633929018706">"Simu <xliff:g id="NUM_MISSED_CALLS">%d</xliff:g> ambazo hazikujibiwa"</string>
-    <string name="notification_missedCall_call_back" msgid="3875698110051973965">"Mpigie"</string>
-    <string name="notification_missedCall_message" msgid="5086910028988305964">"Ujumbe"</string>
-    <string name="post_call_notification_message" msgid="5417476789860590611">"<xliff:g id="NAME">%1$s</xliff:g>: <xliff:g id="MESSAGE">%2$s</xliff:g>"</string>
-    <string name="notification_voicemail_text_format" msgid="1895667520930252897">"Piga <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
-    <string name="notification_voicemail_no_vm_number" msgid="8942821987929495842">"Nambari ya ujumbe wa sauti haijulikani"</string>
-    <plurals name="notification_voicemail_title" formatted="false" msgid="1551847434476438657">
-      <item quantity="other">Ujumbe <xliff:g id="COUNT">%1$d</xliff:g> wa sauti </item>
-      <item quantity="one">Ujumbe wa sauti</item>
-    </plurals>
-    <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
-    <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"Barua mpya ya sauti kutoka <xliff:g id="CALLER">%1$s</xliff:g>"</string>
-    <string name="voicemail_playback_error" msgid="4384373852257757295">"Haikuweza kucheza ujumbe wa sauti"</string>
-    <string name="voicemail_fetching_content" msgid="572320120918636014">"Inapakia ujumbe wa sauti..."</string>
-    <string name="voicemail_fetching_timout" msgid="2128873915839949783">"Haikuweza kupakia ujumbe wa sauti"</string>
-    <string name="call_log_item_count_and_date" msgid="723848797957319181">"( <xliff:g id="COUNT">%1$d</xliff:g> ) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_playback_speakerphone" msgid="4852027754869750227">"Washa au uzime spika ya simu"</string>
-    <string name="description_playback_seek" msgid="1340910573254132520">"Tafuta sehemu ya kucheza ujumbe wa sauti"</string>
-    <string name="action_menu_call_history_description" msgid="8829135306925008546">"Rekodi ya simu zilizopigwa"</string>
-    <string name="action_menu_overflow_description" msgid="7648679686746517341">"Chaguo zaidi"</string>
-    <string name="action_menu_dialpad_button" msgid="1970631633457493180">"vitufe vya simu"</string>
-    <string name="dialer_settings_label" msgid="4980176284150290175">"Mipangilio"</string>
-    <string name="simulator_submenu_label" msgid="186156287346615267">"Kielelezo"</string>
-    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Unda Mkato Mpya wa Kiolesura"</string>
-    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"Unaingia katika hali ya kutekeleza vitendo vingi"</string>
-    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"Umeondoka katika hali ya kutekeleza vitendo vingi"</string>
-    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"Umeteua <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"Umebatilisha uteuzi wa <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_contact_details" msgid="3341280873855253464">"Maelezo ya <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_spam_contact_details" msgid="5592578752881528368">"Maelezo ya mawasiliano ya anayeshukiwa kupiga simu taka <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_num_calls" msgid="6483594535796216044">"Simu <xliff:g id="NUMBEROFCALLS">%1$s</xliff:g>."</string>
-    <string name="description_video_call" msgid="3738199365585751727">"Hangout ya video."</string>
-    <string name="description_start_voice_search" msgid="8380022725973015261">"Anza kutafuta kwa kutamka"</string>
-    <string name="voicemail" msgid="8899540969000957954">"Ujumbe wa sauti"</string>
-    <string name="description_cancel_multi_select" msgid="3930475950253360461">"Ghairi hali ya kutekeleza vitendo vingi"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Futa"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Ghairi"</string>
-    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> zimechaguliwa"</string>
-    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
-      <item quantity="other">"<b>"Je, unataka kufuta kila ujumbe wa sauti ulioonyeshwa? "</b>"</item>
-      <item quantity="one">"<b>"Je, unataka kufuta ujumbe huu wa sauti? "</b>"</item>
-    </plurals>
-    <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
-    <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> saa <xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
-    <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="voice_search_not_available" msgid="6546240433719732905">"Kutafuta kwa kutamka hakupatikani"</string>
-    <string name="dialer_hint_find_contact" msgid="2023214799381149808">"Tafuta anwani"</string>
-    <string name="block_number_search_hint" msgid="5377706079015099416">"Ongeza nambari au utafute anwani"</string>
-    <string name="call_log_all_empty" msgid="3955572868518162004">"Rekodi yako ya simu zilizopigwa haina chochote"</string>
-    <string name="call_log_all_empty_action" msgid="852218280136243014">"Piga simu"</string>
-    <string name="call_log_missed_empty" msgid="7094936030845062214">"Huna simu ulizokosa kupokea"</string>
-    <string name="call_log_voicemail_empty" msgid="273623903423275178">"Kikasha chako cha ujumbe wa sauti hakina ujumbe."</string>
-    <string name="call_log_activity_title" msgid="1275242727244945527">"Historia ya Simu"</string>
-    <string name="call_log_all_title" msgid="6042262422192020327">"Zote"</string>
-    <string name="call_log_missed_title" msgid="17254005889268015">"Ambazo hazikupokewa"</string>
-    <string name="tab_speed_dial" msgid="6616404752227561075">"Unaowasiliana nao zaidi"</string>
-    <string name="tab_history" msgid="7420269368689503596">"Rekodi ya Simu Zilizopigwa"</string>
-    <string name="tab_all_contacts" msgid="5531733977693943015">"Anwani zote"</string>
-    <string name="tab_voicemail" msgid="2458548090088316246">"Ujumbe wa sauti"</string>
-    <string name="search_shortcut_call_number" msgid="8847918845036880688">"Piga simu <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"Ongeza anwani mpya"</string>
-    <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"Ongeza kwenye anwani"</string>
-    <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"Tuma SMS"</string>
-    <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"Piga Hangout ya video"</string>
-    <string name="search_shortcut_block_number" msgid="4587283230665805776">"Zuia nambari"</string>
-    <string name="speed_dial_empty" msgid="3346406399966039505">"Hakuna mtu aliye katika orodha yako ya watu unaowasiliana nao zaidi"</string>
-    <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"Ongeza anwani unazopenda zaidi"</string>
-    <string name="remove_contact" msgid="2353580570488923668">"Ondoa"</string>
-    <string name="select_all" msgid="408601760696146245">"Chagua zote"</string>
-    <string name="call_log_action_video_call" msgid="7565549950343850819">"Hangout ya Video"</string>
-    <string name="call_log_action_send_message" msgid="6948727362660115554">"Tuma SMS"</string>
-    <string name="call_log_action_details" msgid="2091370737371449501">"Maelezo ya simu"</string>
-    <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"Tuma kwenye …"</string>
-    <string name="call_log_action_call" msgid="682724094251540583">"Piga simu kwa <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_incoming_missed_call" msgid="8292535799379230029">"Simu ambayo haikupokelewa kutoka kwa <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_incoming_answered_call" msgid="3920182963103160610">"Simu iliyopokelewa kutoka kwa <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_unread_voicemail" msgid="145170985013419170">"Ujumb wa sauti ambao haujasikilizwa kutoka <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_read_voicemail" msgid="5585559881573227732">"Ujumbe wa sauti kutoka <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_outgoing_call" msgid="543952487882919924">"Simu iliyopigwa kwa <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="call_log_via_number" msgid="1340307109806397650">"kupitia <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> kupitia <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="description_call_action" msgid="4042796498169106545">"Piga simu kwa <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_video_call_action" msgid="1237090968588659650">"Hangout ya video <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
-    <string name="description_voicemail_action" msgid="3290143432403538524">"Sikiliza ujumbe wa sauti kutoka kwa <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_create_new_contact_action" msgid="1928282350281564130">"Unda anwani ya <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"Ongeza <xliff:g id="NAMEORNUMBER">^1</xliff:g> kwenye anwani iliyopo"</string>
-    <string name="description_details_action" msgid="2061866409737706174">"Maelezo ya simu ya <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="call_log_header_today" msgid="1576119097475845293">"Leo"</string>
-    <string name="call_log_header_yesterday" msgid="5616077776205329563">"Jana"</string>
-    <string name="call_log_header_other" msgid="4940676886254217644">"Nzee zaidi"</string>
-    <string name="voicemail_speaker_on" msgid="3151333608926996668">"Washa spika."</string>
-    <string name="voicemail_speaker_off" msgid="2530064206962034201">"Zima spika."</string>
-    <string name="voicemail_play_start_pause" msgid="3874823480278334664">"Anzisha au usitishe kucheza."</string>
-    <string name="display_options_title" msgid="3880091801055797975">"Chaguo za kuonyesha"</string>
-    <string name="sounds_and_vibration_title" msgid="3075050000721181384">"Sauti na mtetemo"</string>
-    <string name="accessibility_settings_title" msgid="3329027650429831820">"Zana za walio na matatizo ya kuona au kusikia"</string>
-    <string name="ringtone_title" msgid="8377174189894648486">"Mlio wa simu"</string>
-    <string name="vibrate_on_ring_title" msgid="631441314790960485">"Pia tetema simu zinapoingia"</string>
-    <string name="dtmf_tone_enable_title" msgid="3273762431523939277">"Milio ya vitufe vya simu"</string>
-    <string name="dtmf_tone_length_title" msgid="534096029202438539">"Muda wa milio ya vitufe vya simu"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="applicationLabel">Simu</string>
+  <string name="launcherDialpadActivityLabel">Vitufe vya Simu</string>
+  <string name="callHistoryIconLabel">Rekodi ya simu zilizopigwa</string>
+  <string name="action_copy_number_text">Nakili nambari</string>
+  <string name="copy_transcript_text">Nakili unukuzi</string>
+  <string name="action_edit_number_before_call">Badilisha nambari kabla ya kupiga simu</string>
+  <string name="call_log_delete_all">Futa rekodi ya simu zilizopigwa</string>
+  <string name="call_log_trash_voicemail">Futa ujumbe wa sauti</string>
+  <string name="snackbar_voicemail_deleted">Ujumbe wa sauti umefutwa</string>
+  <string name="clearCallLogConfirmation_title">Rekodi ya simu zilizopigwa ifutwe?</string>
+  <string name="clearCallLogConfirmation">Hatua hii itafuta rekodi yote ya simu</string>
+  <string name="clearCallLogProgress_title">Inafuta rekodi ya simu zilizopigwa...</string>
+  <string name="notification_missedCallTitle">Simu uliyokosa</string>
+  <string name="notification_missedWorkCallTitle">Simu ya kazini ambayo hukujibu</string>
+  <string name="notification_missedCallsTitle">Simu zisizojibiwa</string>
+  <string name="notification_missedCallsMsg">Simu %d ambazo hazikujibiwa</string>
+  <string name="notification_missedCall_call_back">Mpigie</string>
+  <string name="notification_missedCall_message">Ujumbe</string>
+  <string name="post_call_notification_message">%1$s: %2$s</string>
+  <string name="notification_voicemail_text_format">Piga %s</string>
+  <string name="notification_voicemail_no_vm_number">Nambari ya ujumbe wa sauti haijulikani</string>
+  <plurals name="notification_voicemail_title">
+    <item quantity="one">Ujumbe wa sauti</item>
+    <item quantity="other">Ujumbe %1$d wa sauti </item>
+  </plurals>
+  <string name="notification_voicemail_callers_list">%1$s, %2$s</string>
+  <string name="notification_new_voicemail_ticker">Barua mpya ya sauti kutoka %1$s</string>
+  <string name="voicemail_playback_error">Haikuweza kucheza ujumbe wa sauti</string>
+  <string name="voicemail_fetching_content">Inapakia ujumbe wa sauti...</string>
+  <string name="voicemail_fetching_timout">Haikuweza kupakia ujumbe wa sauti</string>
+  <string name="call_log_item_count_and_date">( %1$d ) %2$s</string>
+  <string name="description_playback_speakerphone">Washa au uzime spika ya simu</string>
+  <string name="description_playback_seek">Tafuta sehemu ya kucheza ujumbe wa sauti</string>
+  <string name="action_menu_call_history_description">Rekodi ya simu zilizopigwa</string>
+  <string msgid="2295659037509008453" name="action_menu_overflow_description">Chaguo zaidi</string>
+  <string name="action_menu_dialpad_button">vitufe vya simu</string>
+  <string name="dialer_settings_label">Mipangilio</string>
+  <string name="simulator_submenu_label">Kielelezo</string>
+  <string name="new_ui_launcher_shortcut_label">Unda Mkato Mpya wa Kiolesura</string>
+  <string name="description_entering_bulk_action_mode">Unaingia katika hali ya kutekeleza vitendo vingi</string>
+  <string name="description_leaving_bulk_action_mode">Umeondoka katika hali ya kutekeleza vitendo vingi</string>
+  <string name="description_selecting_bulk_action_mode">Umeteua %1$s</string>
+  <string name="description_unselecting_bulk_action_mode">Umebatilisha uteuzi wa %1$s</string>
+  <string name="description_contact_details">Maelezo ya %1$s</string>
+  <string name="description_spam_contact_details">Maelezo ya mawasiliano ya anayeshukiwa kupiga simu taka %1$s</string>
+  <string name="description_num_calls">Simu %1$s.</string>
+  <string name="description_video_call">Hangout ya video.</string>
+  <string name="description_start_voice_search">Anza kutafuta kwa kutamka</string>
+  <string name="voicemail">Ujumbe wa sauti</string>
+  <string name="description_cancel_multi_select">Ghairi hali ya kutekeleza vitendo vingi</string>
+  <string name="voicemailMultiSelectDeleteConfirm">Futa</string>
+  <string name="voicemailMultiSelectDeleteCancel">Ghairi</string>
+  <string name="voicemailMultiSelectActionBarTitle">%1$s zimechaguliwa</string>
+  <plurals name="delete_voicemails_confirmation_dialog_title">
+    <item quantity="one"><b>Je, unataka kufuta ujumbe huu wa sauti? </b></item>
+    <item quantity="other"><b>Je, unataka kufuta kila ujumbe wa sauti ulioonyeshwa? </b></item>
+  </plurals>
+  <string name="voicemailCallLogToday">@string/call_log_header_today</string>
+  <string name="voicemailCallLogDateTimeFormat">%1$s saa %2$s</string>
+  <string name="voicemailDurationFormat">%1$02d:%2$02d</string>
+  <string name="voicemailCallLogDateTimeFormatWithDuration">%1$s • %2$s</string>
+  <string name="voice_search_not_available">Kutafuta kwa kutamka hakupatikani</string>
+  <string name="dialer_hint_find_contact">Tafuta anwani</string>
+  <string name="block_number_search_hint">Ongeza nambari au utafute anwani</string>
+  <string name="call_log_all_empty">Rekodi yako ya simu zilizopigwa haina chochote</string>
+  <string name="call_log_all_empty_action">Piga simu</string>
+  <string name="call_log_missed_empty">Huna simu ulizokosa kupokea</string>
+  <string name="call_log_voicemail_empty">Kikasha chako cha ujumbe wa sauti hakina ujumbe.</string>
+  <string name="call_log_activity_title">Historia ya Simu</string>
+  <string name="call_log_all_title">Zote</string>
+  <string name="call_log_missed_title">Ambazo hazikupokewa</string>
+  <string name="tab_speed_dial">Unaowasiliana nao zaidi</string>
+  <string name="tab_history">Rekodi ya Simu Zilizopigwa</string>
+  <string name="tab_all_contacts">Anwani zote</string>
+  <string name="tab_voicemail">Ujumbe wa sauti</string>
+  <string name="search_shortcut_call_number">Piga simu %s</string>
+  <string name="search_shortcut_create_new_contact">Ongeza anwani mpya</string>
+  <string name="search_shortcut_add_to_contact">Ongeza kwenye anwani</string>
+  <string name="search_shortcut_send_sms_message">Tuma SMS</string>
+  <string name="search_shortcut_make_video_call">Piga Hangout ya video</string>
+  <string name="search_shortcut_block_number">Zuia nambari</string>
+  <string name="speed_dial_empty">Hakuna mtu aliye katika orodha yako ya watu unaowasiliana nao zaidi</string>
+  <string name="speed_dial_empty_add_favorite_action">Ongeza anwani unazopenda zaidi</string>
+  <string name="remove_contact">Ondoa</string>
+  <string name="select_all">Chagua zote</string>
+  <string name="call_log_action_video_call">Hangout ya Video</string>
+  <string name="call_log_action_set_up_video">Weka mipangilio ya kupiga simu ya video</string>
+  <string name="call_log_action_invite_video">Alika kwenye simu ya video</string>
+  <string name="call_log_action_send_message">Tuma SMS</string>
+  <string name="call_log_action_details">Maelezo ya simu</string>
+  <string name="call_log_action_share_voicemail">Tuma kwenye …</string>
+  <string name="call_log_action_call">Piga simu kwa ^1</string>
+  <string name="description_incoming_missed_call">Simu ambayo haikupokelewa kutoka kwa ^1, ^2, ^3, ^4.</string>
+  <string name="description_incoming_answered_call">Simu iliyopokelewa kutoka kwa ^1, ^2, ^3, ^4.</string>
+  <string name="description_unread_voicemail">Ujumb wa sauti ambao haujasikilizwa kutoka ^1, ^2, ^3, ^4.</string>
+  <string name="description_read_voicemail">Ujumbe wa sauti kutoka ^1, ^2, ^3, ^4.</string>
+  <string name="description_outgoing_call">Simu iliyopigwa kwa ^1, ^2, ^3, ^4.</string>
+  <string name="call_log_via_number">kupitia %1$s</string>
+  <string name="call_log_via_number_phone_account">%1$s kupitia %2$s</string>
+  <string name="description_call_action">Piga simu kwa ^1</string>
+  <string name="description_video_call_action">Hangout ya video ^1.</string>
+  <string name="description_voicemail_action">Sikiliza ujumbe wa sauti kutoka kwa ^1</string>
+  <string name="description_create_new_contact_action">Unda anwani ya ^1</string>
+  <string name="description_add_to_existing_contact_action">Ongeza ^1 kwenye anwani iliyopo</string>
+  <string name="description_details_action">Maelezo ya simu ya ^1</string>
+  <string name="call_log_header_today">Leo</string>
+  <string name="call_log_header_yesterday">Jana</string>
+  <string name="call_log_header_other">Nzee zaidi</string>
+  <string name="voicemail_speaker_on">Washa spika.</string>
+  <string name="voicemail_speaker_off">Zima spika.</string>
+  <string name="voicemail_play_start_pause">Anzisha au usitishe kucheza.</string>
+  <string name="display_options_title">Chaguo za kuonyesha</string>
+  <string name="sounds_and_vibration_title">Sauti na mtetemo</string>
+  <string name="accessibility_settings_title">Zana za walio na matatizo ya kuona au kusikia</string>
+  <string name="ringtone_title">Mlio wa simu</string>
+  <string name="vibrate_on_ring_title">Pia tetema simu zinapoingia</string>
+  <string name="dtmf_tone_enable_title">Milio ya vitufe vya simu</string>
+  <string name="dtmf_tone_length_title">Muda wa milio ya vitufe vya simu</string>
   <string-array name="dtmf_tone_length_entries">
-    <item msgid="3136353015227162823">"Kawaida"</item>
-    <item msgid="5376841175538523822">"Ndefu"</item>
+    <item>Kawaida</item>
+    <item>Ndefu</item>
   </string-array>
-    <string name="respond_via_sms_setting_title" msgid="8008181606657693452">"Majibu ya haraka"</string>
-    <string name="call_settings_label" msgid="7824611757200960807">"Simu zilizopigwa"</string>
-    <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Kuzuia simu"</string>
-    <string name="voicemail_settings_label" msgid="4594299554519920570">"Ujumbe wa sauti"</string>
-    <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Kuzuia simu kumezimwa kwa muda"</string>
-    <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Kipengele cha kuzuia simu kimezimwa kwa sababu uliwasiliana na huduma za dharura kwenye simu hii ndani ya saa 48 zilizopita. Kipengele hiki kitawashwa kiotomatiki baada ya kipindi cha saa 48 kumalizika."</string>
-    <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Leta nambari"</string>
-    <string name="blocked_call_settings_import_description" msgid="1819412052545228965">"Hapo awali uliwekea alama baadhi ya wanaopiga ili simu zao ziingie kwenye ujumbe wa sauti kiotomatiki kupitia programu nyingine."</string>
-    <string name="blocked_call_settings_view_numbers_button" msgid="3332727948554356704">"Angalia Nambari"</string>
-    <string name="blocked_call_settings_import_button" msgid="7319111700387470727">"Leta"</string>
-    <string name="description_blocked_number_list_delete" msgid="2139644216858370740">"Ondolea nambari kizuizi"</string>
-    <string name="addBlockedNumber" msgid="3053473735238295551">"Ongeza nambari"</string>
-    <string name="block_number_footer_message_vvm" msgid="7955326304033982368">"Simu zinazopigwa kutoka nambari hizi zitazuiwa na ujumbe wa sauti utafutwa kiotomatiki."</string>
-    <string name="block_number_footer_message_no_vvm" msgid="1152684139070471665">"Simu zinazopigwa kutoka nambari hizi zitazuiwa, lakini wapigaji bado wanaweza kukutumia ujumbe wa sauti."</string>
-    <string name="block_list" msgid="4701585783411870782">"Nambari zilizozuiwa"</string>
-    <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g> tayari imezuiwa."</string>
-    <string name="phone_account_settings_label" msgid="8372485478006965920">"Akaunti za simu"</string>
-    <string name="permission_no_speeddial" msgid="8487215628510596753">"Ili kuwasha kipengele cha unaowasiliana nao zaidi, washa ruhusa ya Anwani."</string>
-    <string name="permission_no_calllog" msgid="4053705651238775784">"Ili uone rekodi yako ya nambari za simu, washa ruhusa ya Simu."</string>
-    <string name="permission_no_search" msgid="2424710404207193826">"Ili utafute anwani zako, washa ruhusa za Anwani."</string>
-    <string name="permission_place_call" msgid="8686908130349369423">"Ili upige simu, washa ruhusa ya Simu."</string>
-    <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"Programu ya simu haina ruhusa ya kuandika kwenye mipangilio ya mfumo."</string>
-    <string name="blocked_number_call_log_label" msgid="4212282846299997693">"Imezuiwa"</string>
-    <string name="call_log_action_block_report_number" msgid="7302636538668696729">"Zuia/ripoti taka"</string>
-    <string name="call_log_action_block_number" msgid="5048188386501998865">"Zuia nambari"</string>
-    <string name="call_log_action_remove_spam" msgid="2045319806318398403">"Si taka"</string>
-    <string name="call_log_action_unblock_number" msgid="6100117033288448758">"Ondolea nambari kizuizi"</string>
-    <string name="spam_number_call_log_label" msgid="2678431398326811131">"Taka"</string>
-    <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> hayuko mtandaoni na hapatikani"</string>
-    <string name="about_phone_label" msgid="582991354677973731">"Kuhusu"</string>
-    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Unukuzi umefanywa na Google"</string>
-    <string name="voicemail_transcription_in_progress" msgid="2933320969613783210">"Google inanukuu…"</string>
-    <string name="voicemail_transcription_failed" msgid="335275303117412706">"Nukuu haipatikani."</string>
-    <string name="voicemail_transcription_failed_language_not_supported" msgid="4210332591050562553">"Nukuu haipatikani. Lugha haitumiki."</string>
-    <string name="voicemail_transcription_failed_no_speech" msgid="9093372879697874852">"Nukuu haipatikani. Hakuna sauti iliyogunduliwa."</string>
-    <string name="view_conversation" msgid="7895904782094119702">"Angalia"</string>
-    <string name="ec_data_deleted" msgid="4794880345545827107">"Mazungumzo ya simu yamefutwa. Angalia na ufute viambatisho vilivyoshirikiwa kwenye mazungumzo haya ya simu katika Programu ya Messages."</string>
-    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"Mazungumzo ya simu yamefutwa. Angalia na ufute viambatisho vilivyoshirikiwa kwenye mazungumzo ya simu katika Programu ya Messages."</string>
+  <string name="respond_via_sms_setting_title">Majibu ya haraka</string>
+  <string name="call_settings_label">Simu zilizopigwa</string>
+  <string name="manage_blocked_numbers_label">Nambari zilizozuiwa</string>
+  <string name="voicemail_settings_label">Ujumbe wa sauti</string>
+  <string name="blocked_numbers_disabled_emergency_header_label">Kuzuia simu kumezimwa kwa muda</string>
+  <string name="blocked_numbers_disabled_emergency_desc">Kipengele cha kuzuia simu kimezimwa kwa sababu uliwasiliana na huduma za dharura kwenye simu hii ndani ya saa 48 zilizopita. Kipengele hiki kitawashwa kiotomatiki baada ya kipindi cha saa 48 kumalizika.</string>
+  <string name="import_send_to_voicemail_numbers_label">Leta nambari</string>
+  <string name="blocked_call_settings_import_description">Hapo awali uliwekea alama baadhi ya wanaopiga ili simu zao ziingie kwenye ujumbe wa sauti kiotomatiki kupitia programu nyingine.</string>
+  <string name="blocked_call_settings_view_numbers_button">Angalia Nambari</string>
+  <string name="blocked_call_settings_import_button">Leta</string>
+  <string name="description_blocked_number_list_delete">Ondolea nambari kizuizi</string>
+  <string name="addBlockedNumber">Ongeza nambari</string>
+  <string name="block_number_footer_message_vvm">Simu zinazopigwa kutoka nambari hizi zitazuiwa na ujumbe wa sauti utafutwa kiotomatiki.</string>
+  <string name="block_number_footer_message_no_vvm">Simu zinazopigwa kutoka nambari hizi zitazuiwa, lakini wapigaji bado wanaweza kukutumia ujumbe wa sauti.</string>
+  <string name="block_list">Nambari zilizozuiwa</string>
+  <string name="alreadyBlocked">%1$s tayari imezuiwa.</string>
+  <string name="phone_account_settings_label">Akaunti za simu</string>
+  <string name="permission_no_speeddial">Ili kuwasha kipengele cha unaowasiliana nao zaidi, washa ruhusa ya Anwani.</string>
+  <string name="permission_no_calllog">Ili uone rekodi yako ya nambari za simu, washa ruhusa ya Simu.</string>
+  <string name="permission_no_search">Ili utafute anwani zako, washa ruhusa za Anwani.</string>
+  <string name="permission_place_call">Ili upige simu, washa ruhusa ya Simu.</string>
+  <string name="toast_cannot_write_system_settings">Programu ya simu haina ruhusa ya kuandika kwenye mipangilio ya mfumo.</string>
+  <string name="blocked_number_call_log_label">Imezuiwa</string>
+  <string name="call_log_action_block_report_number">Zuia/ripoti taka</string>
+  <string name="call_log_action_block_number">Zuia nambari</string>
+  <string name="call_log_action_remove_spam">Si taka</string>
+  <string name="call_log_action_unblock_number">Ondolea nambari kizuizi</string>
+  <string name="spam_number_call_log_label">Taka</string>
+  <string name="call_composer_connection_failed">%1$s hayuko mtandaoni na hapatikani</string>
+  <string name="about_phone_label">Kuhusu</string>
+  <string name="voicemail_transcription_branding_text">Unukuzi umefanywa na Google</string>
+  <string name="voicemail_transcription_in_progress">Inanukuu…</string>
+  <string name="voicemail_transcription_failed">Nukuu haipatikani.</string>
+  <string name="voicemail_transcription_failed_language_not_supported">Nukuu haipatikani. Lugha haitumiki.</string>
+  <string name="voicemail_transcription_failed_no_speech">Nukuu haipatikani. Hakuna sauti iliyogunduliwa.</string>
+  <string name="voicemail_donation_promo_title">Je, ungependa kusaidia kuimarisha usahihi wa nukuu?</string>
+  <string name="voicemail_donation_promo_content">Ruhusu Google ikague ujumbe huu wa sauti na mwingine kama huu siku zijazo ulio na manukuu. Ujumbe utahifadhiwa bila kutambulishwa. Badilisha Mipangilio wakati wowote. %1$s</string>
+  <string name="voicemail_donation_promo_opt_in">Ndiyo, ninakubali</string>
+  <string name="voicemail_donation_promo_opt_out">Hapana, asante</string>
+  <string name="voicemail_transcription_rating">Kadiria ubora wa nukuu</string>
+  <string name="voicemail_transcription_rating_thanks">Asante kwa maoni yako</string>
+  <string name="description_rating_good">Imenipendeza</string>
+  <string name="description_rating_bad">Haijanipendeza</string>
+  <string name="view_conversation">Angalia</string>
+  <string name="ec_data_deleted">Mazungumzo ya simu yamefutwa. Angalia na ufute viambatisho vilivyoshirikiwa kwenye mazungumzo haya ya simu katika Programu ya Messages.</string>
+  <string name="multiple_ec_data_deleted">Mazungumzo ya simu yamefutwa. Angalia na ufute viambatisho vilivyoshirikiwa kwenye mazungumzo ya simu katika Programu ya Messages.</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-ta/strings.xml b/java/com/android/dialer/app/res/values-ta/strings.xml
index 9583cbc..bd5382c 100644
--- a/java/com/android/dialer/app/res/values-ta/strings.xml
+++ b/java/com/android/dialer/app/res/values-ta/strings.xml
@@ -1,179 +1,171 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="applicationLabel" msgid="2202739481132958990">"ஃபோன்"</string>
-    <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"ஃபோன் விசைத்தளம்"</string>
-    <string name="callHistoryIconLabel" msgid="7493268743411968630">"அழைப்பு பதிவு"</string>
-    <string name="action_copy_number_text" msgid="832682558551502319">"எண்ணை நகலெடு"</string>
-    <string name="copy_transcript_text" msgid="937904189017310829">"டிரான்ஸ்கிரிப்ஷனை நகலெடு"</string>
-    <string name="action_edit_number_before_call" msgid="8017492815878473837">"அழைக்கும் முன் எண்ணை மாற்று"</string>
-    <string name="call_log_delete_all" msgid="7852970926906523784">"அழைப்பு வரலாற்றை அழி"</string>
-    <string name="call_log_trash_voicemail" msgid="6118493534178533972">"குரலஞ்சலை நீக்கு"</string>
-    <string name="snackbar_voicemail_deleted" msgid="7463166543725496307">"குரலஞ்சல் நீக்கப்பட்டது"</string>
-    <string name="snackbar_voicemail_deleted_undo" msgid="6959743982796409941">"செயல்தவிர்"</string>
-    <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"அழைப்பு பதிவை அழிக்கவா?"</string>
-    <string name="clearCallLogConfirmation" msgid="6844949465815109166">"பதிவிலிருந்து எல்லா அழைப்புகளும் நீக்கப்படும்"</string>
-    <string name="clearCallLogProgress_title" msgid="995004835687361977">"அழைப்பு வரலாற்றை அழிக்கிறது…"</string>
-    <string name="notification_missedCallTitle" msgid="8283366068539898486">"தவறிய அழைப்பு"</string>
-    <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"தவறிய அழைப்பு (பணி)"</string>
-    <string name="notification_missedCallsTitle" msgid="3697442015345089802">"தவறிய அழைப்புகள்"</string>
-    <string name="notification_missedCallsMsg" msgid="8176217633929018706">"<xliff:g id="NUM_MISSED_CALLS">%d</xliff:g> தவறிய அழைப்புகள்"</string>
-    <string name="notification_missedCall_call_back" msgid="3875698110051973965">"அழை"</string>
-    <string name="notification_missedCall_message" msgid="5086910028988305964">"செய்தி அனுப்பு"</string>
-    <string name="post_call_notification_message" msgid="5417476789860590611">"<xliff:g id="NAME">%1$s</xliff:g>: <xliff:g id="MESSAGE">%2$s</xliff:g>"</string>
-    <string name="notification_voicemail_text_format" msgid="1895667520930252897">"<xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g> என்ற எண்ணை அழைக்கவும்"</string>
-    <string name="notification_voicemail_no_vm_number" msgid="8942821987929495842">"குரலஞ்சல் எண் அறியப்படவில்லை"</string>
-    <plurals name="notification_voicemail_title" formatted="false" msgid="1551847434476438657">
-      <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> குரலஞ்சல்கள் </item>
-      <item quantity="one">குரலஞ்சல்</item>
-    </plurals>
-    <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
-    <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"<xliff:g id="CALLER">%1$s</xliff:g> இன் புதிய குரலஞ்சல்"</string>
-    <string name="voicemail_playback_error" msgid="4384373852257757295">"குரலஞ்சலை இயக்க முடியவில்லை"</string>
-    <string name="voicemail_fetching_content" msgid="572320120918636014">"குரலஞ்சலை ஏற்றுகிறது…"</string>
-    <string name="voicemail_fetching_timout" msgid="2128873915839949783">"குரலஞ்சலை ஏற்ற முடியவில்லை"</string>
-    <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_playback_speakerphone" msgid="4852027754869750227">"ஸ்பீக்கர்போனை இயக்கு அல்லது முடக்கு"</string>
-    <string name="description_playback_seek" msgid="1340910573254132520">"பிளேபேக் நிலையைத் தேடு"</string>
-    <string name="action_menu_call_history_description" msgid="8829135306925008546">"அழைப்பு வரலாறு"</string>
-    <string name="action_menu_overflow_description" msgid="7648679686746517341">"மேலும் விருப்பங்கள்"</string>
-    <string name="action_menu_dialpad_button" msgid="1970631633457493180">"விசைத்தளம்"</string>
-    <string name="dialer_settings_label" msgid="4980176284150290175">"அமைப்பு"</string>
-    <string name="simulator_submenu_label" msgid="186156287346615267">"சிமுலேட்டர்"</string>
-    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"புதிய UI குறுக்குவழியை உருவாக்கு"</string>
-    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"மொத்தச் செயல் பயன்முறையில் நுழைகிறீர்கள்"</string>
-    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"மொத்தச் செயல் பயன்முறையிலிருந்து வெளியேறிவிட்டீர்கள்"</string>
-    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"தேர்ந்தெடுத்த <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"தேர்வுநீக்கிய <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_contact_details" msgid="3341280873855253464">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> க்கான தொடர்பு விவரங்கள்"</string>
-    <string name="description_spam_contact_details" msgid="5592578752881528368">"சந்தேகத்திற்குரிய ஸ்பேம் அழைப்பாளர் <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>க்கான தொடர்பு விவரங்கள்"</string>
-    <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> அழைப்புகள்."</string>
-    <string name="description_video_call" msgid="3738199365585751727">"வீடியோ அழைப்பு."</string>
-    <string name="description_start_voice_search" msgid="8380022725973015261">"குரல் தேடலைத் தொடங்கு"</string>
-    <string name="voicemail" msgid="8899540969000957954">"குரலஞ்சல்"</string>
-    <string name="description_cancel_multi_select" msgid="3930475950253360461">"தொகுப்புச் செயல்கள் பயன்முறையை ரத்துசெய்யும்"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"நீக்கு"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"ரத்துசெய்"</string>
-    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> தேர்ந்தெடுக்கப்பட்டன"</string>
-    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
-      <item quantity="other">"<b>"இந்தக் குரலஞ்சல்களை நீக்கவா? "</b>"</item>
-      <item quantity="one">"<b>"இந்தக் குரலஞ்சலை நீக்கவா? "</b>"</item>
-    </plurals>
-    <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
-    <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> அன்று <xliff:g id="TIME">%2$s</xliff:g> மணிக்கு"</string>
-    <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
-    <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="voice_search_not_available" msgid="6546240433719732905">"குரல் தேடல் இல்லை"</string>
-    <string name="dialer_hint_find_contact" msgid="2023214799381149808">"தொடர்புகளைத் தேடு"</string>
-    <string name="block_number_search_hint" msgid="5377706079015099416">"எண்ணைச் சேர்க்கவும் அல்லது தொடர்புகளில் தேடவும்"</string>
-    <string name="call_log_all_empty" msgid="3955572868518162004">"அழைப்பு வரலாறு காலியாக உள்ளது"</string>
-    <string name="call_log_all_empty_action" msgid="852218280136243014">"அழை"</string>
-    <string name="call_log_missed_empty" msgid="7094936030845062214">"தவறிய அழைப்புகள் இல்லை."</string>
-    <string name="call_log_voicemail_empty" msgid="273623903423275178">"குரலஞ்சல் இன்பாக்ஸ் காலியாக உள்ளது."</string>
-    <string name="call_log_activity_title" msgid="1275242727244945527">"அழைப்பு பட்டியல்"</string>
-    <string name="call_log_all_title" msgid="6042262422192020327">"எல்லாம்"</string>
-    <string name="call_log_missed_title" msgid="17254005889268015">"தவறியவை"</string>
-    <string name="tab_speed_dial" msgid="6616404752227561075">"விரைவு டயல்"</string>
-    <string name="tab_history" msgid="7420269368689503596">"அழைப்பு வரலாறு"</string>
-    <string name="tab_all_contacts" msgid="5531733977693943015">"தொடர்புகள்"</string>
-    <string name="tab_voicemail" msgid="2458548090088316246">"குரலஞ்சல்"</string>
-    <string name="search_shortcut_call_number" msgid="8847918845036880688">"<xliff:g id="NUMBER">%s</xliff:g> ஐ அழை"</string>
-    <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"புதிய தொடர்பை உருவாக்கு"</string>
-    <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"தொடர்பில் சேர்"</string>
-    <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"SMS அனுப்பு"</string>
-    <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"வீடியோவில் அழை"</string>
-    <string name="search_shortcut_block_number" msgid="4587283230665805776">"எண்ணைத் தடு"</string>
-    <string name="speed_dial_empty" msgid="3346406399966039505">"இன்னும் விரைவு டயலில் யாரையும் சேர்க்கவில்லை"</string>
-    <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"முக்கியமானவர்களைச் சேர்"</string>
-    <string name="remove_contact" msgid="2353580570488923668">"அகற்று"</string>
-    <string name="select_all" msgid="408601760696146245">"அனைத்தையும் தேர்ந்தெடு"</string>
-    <string name="call_log_action_video_call" msgid="7565549950343850819">"வீடியோ அழைப்பு"</string>
-    <string name="call_log_action_send_message" msgid="6948727362660115554">"செய்தி அனுப்பவும்"</string>
-    <string name="call_log_action_details" msgid="2091370737371449501">"அழைப்பு விவரங்கள்"</string>
-    <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"இதற்கு அனுப்பு …"</string>
-    <string name="call_log_action_call" msgid="682724094251540583">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>ஐ அழை"</string>
-    <string name="description_incoming_missed_call" msgid="8292535799379230029">"தவறிய அழைப்பு: <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_incoming_answered_call" msgid="3920182963103160610">"பேசிய அழைப்பு: <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_unread_voicemail" msgid="145170985013419170">"படிக்காத குரலஞ்சல்: <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_read_voicemail" msgid="5585559881573227732">"குரலஞ்சல்: <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_outgoing_call" msgid="543952487882919924">"அழைத்த அழைப்பு: <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="call_log_via_number" msgid="1340307109806397650">"<xliff:g id="NUMBER">%1$s</xliff:g> மூலமாக"</string>
-    <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="NUMBER">%2$s</xliff:g> மூலமாக <xliff:g id="PHONEACCOUNT">%1$s</xliff:g> இல்"</string>
-    <string name="description_call_action" msgid="4042796498169106545">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>ஐ அழை"</string>
-    <string name="description_video_call_action" msgid="1237090968588659650">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>ஐ வீடியோவில் அழைக்கும்."</string>
-    <string name="description_voicemail_action" msgid="3290143432403538524">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> இன் குரலஞ்சலைக் கேள்"</string>
-    <string name="description_create_new_contact_action" msgid="1928282350281564130">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>க்கான தொடர்பை உருவாக்கும்"</string>
-    <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"இருக்கும் தொடர்பில் <xliff:g id="NAMEORNUMBER">^1</xliff:g>ஐச் சேர்க்கும்"</string>
-    <string name="description_details_action" msgid="2061866409737706174">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> இன் அழைப்பு விவரங்கள்"</string>
-    <string name="call_log_header_today" msgid="1576119097475845293">"இன்று"</string>
-    <string name="call_log_header_yesterday" msgid="5616077776205329563">"நேற்று"</string>
-    <string name="call_log_header_other" msgid="4940676886254217644">"பழையது"</string>
-    <string name="voicemail_speaker_on" msgid="3151333608926996668">"ஸ்பீக்கரை இயக்கு."</string>
-    <string name="voicemail_speaker_off" msgid="2530064206962034201">"ஸ்பீக்கரை முடக்கு."</string>
-    <string name="voicemail_play_start_pause" msgid="3874823480278334664">"பிளேபேக்கைத் தொடங்கு அல்லது இடைநிறுத்து."</string>
-    <string name="display_options_title" msgid="3880091801055797975">"காட்சி விருப்பத்தேர்வு"</string>
-    <string name="sounds_and_vibration_title" msgid="3075050000721181384">"ஒலிகளும் அதிர்வும்"</string>
-    <string name="accessibility_settings_title" msgid="3329027650429831820">"அணுகல் தன்மை"</string>
-    <string name="ringtone_title" msgid="8377174189894648486">"மொபைலின் ரிங்டோன்"</string>
-    <string name="vibrate_on_ring_title" msgid="631441314790960485">"அழைப்பு வருகையில் அதிர்வுறு"</string>
-    <string name="dtmf_tone_enable_title" msgid="3273762431523939277">"விசைத்தள ஒலிகள்"</string>
-    <string name="dtmf_tone_length_title" msgid="534096029202438539">"விசைத்தள ஒலியின் நேரம்"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="applicationLabel">ஃபோன்</string>
+  <string name="launcherDialpadActivityLabel">ஃபோன் விசைத்தளம்</string>
+  <string name="callHistoryIconLabel">அழைப்பு பதிவு</string>
+  <string name="action_copy_number_text">எண்ணை நகலெடு</string>
+  <string name="copy_transcript_text">டிரான்ஸ்கிரிப்ஷனை நகலெடு</string>
+  <string name="action_edit_number_before_call">அழைக்கும் முன் எண்ணை மாற்று</string>
+  <string name="call_log_delete_all">அழைப்பு வரலாற்றை அழி</string>
+  <string name="call_log_trash_voicemail">குரலஞ்சலை நீக்கு</string>
+  <string name="snackbar_voicemail_deleted">குரலஞ்சல் நீக்கப்பட்டது</string>
+  <string name="clearCallLogConfirmation_title">அழைப்பு பதிவை அழிக்கவா?</string>
+  <string name="clearCallLogConfirmation">பதிவிலிருந்து எல்லா அழைப்புகளும் நீக்கப்படும்</string>
+  <string name="clearCallLogProgress_title">அழைப்பு வரலாற்றை அழிக்கிறது…</string>
+  <string name="notification_missedCallTitle">தவறிய அழைப்பு</string>
+  <string name="notification_missedWorkCallTitle">தவறிய அழைப்பு (பணி)</string>
+  <string name="notification_missedCallsTitle">தவறிய அழைப்புகள்</string>
+  <string name="notification_missedCallsMsg">%d தவறிய அழைப்புகள்</string>
+  <string name="notification_missedCall_call_back">அழை</string>
+  <string name="notification_missedCall_message">செய்தி அனுப்பு</string>
+  <string name="post_call_notification_message">%1$s: %2$s</string>
+  <string name="notification_voicemail_text_format">%s என்ற எண்ணை அழைக்கவும்</string>
+  <string name="notification_voicemail_no_vm_number">குரலஞ்சல் எண் அறியப்படவில்லை</string>
+  <plurals name="notification_voicemail_title">
+    <item quantity="one">குரலஞ்சல்</item>
+    <item quantity="other"> %1$d குரலஞ்சல்கள் </item>
+  </plurals>
+  <string name="notification_voicemail_callers_list">%1$s, %2$s</string>
+  <string name="notification_new_voicemail_ticker">%1$s இன் புதிய குரலஞ்சல்</string>
+  <string name="voicemail_playback_error">குரலஞ்சலை இயக்க முடியவில்லை</string>
+  <string name="voicemail_fetching_content">குரலஞ்சலை ஏற்றுகிறது…</string>
+  <string name="voicemail_fetching_timout">குரலஞ்சலை ஏற்ற முடியவில்லை</string>
+  <string name="call_log_item_count_and_date">(%1$d) %2$s</string>
+  <string name="description_playback_speakerphone">ஸ்பீக்கர்போனை இயக்கு அல்லது முடக்கு</string>
+  <string name="description_playback_seek">பிளேபேக் நிலையைத் தேடு</string>
+  <string name="action_menu_call_history_description">அழைப்பு வரலாறு</string>
+  <string msgid="2295659037509008453" name="action_menu_overflow_description">மேலும் விருப்பங்கள்</string>
+  <string name="action_menu_dialpad_button">விசைத்தளம்</string>
+  <string name="dialer_settings_label">அமைப்பு</string>
+  <string name="simulator_submenu_label">சிமுலேட்டர்</string>
+  <string name="new_ui_launcher_shortcut_label">புதிய UI குறுக்குவழியை உருவாக்கு</string>
+  <string name="description_entering_bulk_action_mode">மொத்தச் செயல் பயன்முறையில் நுழைகிறீர்கள்</string>
+  <string name="description_leaving_bulk_action_mode">மொத்தச் செயல் பயன்முறையிலிருந்து வெளியேறிவிட்டீர்கள்</string>
+  <string name="description_selecting_bulk_action_mode">தேர்ந்தெடுத்த %1$s</string>
+  <string name="description_unselecting_bulk_action_mode">தேர்வுநீக்கிய %1$s</string>
+  <string name="description_contact_details">%1$s க்கான தொடர்பு விவரங்கள்</string>
+  <string name="description_spam_contact_details">சந்தேகத்திற்குரிய ஸ்பேம் அழைப்பாளர் %1$sக்கான தொடர்பு விவரங்கள்</string>
+  <string name="description_num_calls">%1$s அழைப்புகள்.</string>
+  <string name="description_video_call">வீடியோ அழைப்பு.</string>
+  <string name="description_start_voice_search">குரல் தேடலைத் தொடங்கு</string>
+  <string name="voicemail">குரலஞ்சல்</string>
+  <string name="description_cancel_multi_select">தொகுப்புச் செயல்கள் பயன்முறையை ரத்துசெய்யும்</string>
+  <string name="voicemailMultiSelectDeleteConfirm">நீக்கு</string>
+  <string name="voicemailMultiSelectDeleteCancel">ரத்துசெய்</string>
+  <string name="voicemailMultiSelectActionBarTitle">%1$s தேர்ந்தெடுக்கப்பட்டன</string>
+  <plurals name="delete_voicemails_confirmation_dialog_title">
+    <item quantity="one"><b>இந்தக் குரலஞ்சலை நீக்கவா? </b></item>
+    <item quantity="other"><b>இந்தக் குரலஞ்சல்களை நீக்கவா? </b></item>
+  </plurals>
+  <string name="voicemailCallLogToday">@string/call_log_header_today</string>
+  <string name="voicemailCallLogDateTimeFormat">%1$s அன்று %2$s மணிக்கு</string>
+  <string name="voicemailDurationFormat">%1$02d:%2$02d</string>
+  <string name="voicemailCallLogDateTimeFormatWithDuration">%1$s • %2$s</string>
+  <string name="voice_search_not_available">குரல் தேடல் இல்லை</string>
+  <string name="dialer_hint_find_contact">தொடர்புகளைத் தேடு</string>
+  <string name="block_number_search_hint">எண்ணைச் சேர்க்கவும் அல்லது தொடர்புகளில் தேடவும்</string>
+  <string name="call_log_all_empty">அழைப்பு வரலாறு காலியாக உள்ளது</string>
+  <string name="call_log_all_empty_action">அழை</string>
+  <string name="call_log_missed_empty">தவறிய அழைப்புகள் இல்லை.</string>
+  <string name="call_log_voicemail_empty">குரலஞ்சல் இன்பாக்ஸ் காலியாக உள்ளது.</string>
+  <string name="call_log_activity_title">அழைப்பு பட்டியல்</string>
+  <string name="call_log_all_title">எல்லாம்</string>
+  <string name="call_log_missed_title">தவறியவை</string>
+  <string name="tab_speed_dial">விரைவு டயல்</string>
+  <string name="tab_history">அழைப்பு வரலாறு</string>
+  <string name="tab_all_contacts">தொடர்புகள்</string>
+  <string name="tab_voicemail">குரலஞ்சல்</string>
+  <string name="search_shortcut_call_number">%s ஐ அழை</string>
+  <string name="search_shortcut_create_new_contact">புதிய தொடர்பை உருவாக்கு</string>
+  <string name="search_shortcut_add_to_contact">தொடர்பில் சேர்</string>
+  <string name="search_shortcut_send_sms_message">SMS அனுப்பு</string>
+  <string name="search_shortcut_make_video_call">வீடியோவில் அழை</string>
+  <string name="search_shortcut_block_number">எண்ணைத் தடு</string>
+  <string name="speed_dial_empty">இன்னும் விரைவு டயலில் யாரையும் சேர்க்கவில்லை</string>
+  <string name="speed_dial_empty_add_favorite_action">முக்கியமானவர்களைச் சேர்</string>
+  <string name="remove_contact">அகற்று</string>
+  <string name="select_all">அனைத்தையும் தேர்ந்தெடு</string>
+  <string name="call_log_action_video_call">வீடியோ அழைப்பு</string>
+  <string name="call_log_action_set_up_video">வீடியோ அழைப்பை அமை</string>
+  <string name="call_log_action_invite_video">வீடியோ அழைப்பிற்கு அழை</string>
+  <string name="call_log_action_send_message">செய்தி அனுப்பவும்</string>
+  <string name="call_log_action_details">அழைப்பு விவரங்கள்</string>
+  <string name="call_log_action_share_voicemail">இதற்கு அனுப்பு …</string>
+  <string name="call_log_action_call">^1ஐ அழை</string>
+  <string name="description_incoming_missed_call">தவறிய அழைப்பு: ^1, ^2, ^3, ^4.</string>
+  <string name="description_incoming_answered_call">பேசிய அழைப்பு: ^1, ^2, ^3, ^4.</string>
+  <string name="description_unread_voicemail">படிக்காத குரலஞ்சல்: ^1, ^2, ^3, ^4.</string>
+  <string name="description_read_voicemail">குரலஞ்சல்: ^1, ^2, ^3, ^4.</string>
+  <string name="description_outgoing_call">அழைத்த அழைப்பு: ^1, ^2, ^3, ^4.</string>
+  <string name="call_log_via_number">%1$s மூலமாக</string>
+  <string name="call_log_via_number_phone_account">%2$s மூலமாக %1$s இல்</string>
+  <string name="description_call_action">^1ஐ அழை</string>
+  <string name="description_video_call_action">^1ஐ வீடியோவில் அழைக்கும்.</string>
+  <string name="description_voicemail_action">^1 இன் குரலஞ்சலைக் கேள்</string>
+  <string name="description_create_new_contact_action">^1க்கான தொடர்பை உருவாக்கும்</string>
+  <string name="description_add_to_existing_contact_action">இருக்கும் தொடர்பில் ^1ஐச் சேர்க்கும்</string>
+  <string name="description_details_action">^1 இன் அழைப்பு விவரங்கள்</string>
+  <string name="call_log_header_today">இன்று</string>
+  <string name="call_log_header_yesterday">நேற்று</string>
+  <string name="call_log_header_other">பழையது</string>
+  <string name="voicemail_speaker_on">ஸ்பீக்கரை இயக்கு.</string>
+  <string name="voicemail_speaker_off">ஸ்பீக்கரை முடக்கு.</string>
+  <string name="voicemail_play_start_pause">பிளேபேக்கைத் தொடங்கு அல்லது இடைநிறுத்து.</string>
+  <string name="display_options_title">காட்சி விருப்பத்தேர்வு</string>
+  <string name="sounds_and_vibration_title">ஒலிகளும் அதிர்வும்</string>
+  <string name="accessibility_settings_title">அணுகல் தன்மை</string>
+  <string name="ringtone_title">மொபைலின் ரிங்டோன்</string>
+  <string name="vibrate_on_ring_title">அழைப்பு வருகையில் அதிர்வுறு</string>
+  <string name="dtmf_tone_enable_title">விசைத்தள ஒலிகள்</string>
+  <string name="dtmf_tone_length_title">விசைத்தள ஒலியின் நேரம்</string>
   <string-array name="dtmf_tone_length_entries">
-    <item msgid="3136353015227162823">"இயல்பு"</item>
-    <item msgid="5376841175538523822">"நீளமானது"</item>
+    <item>இயல்பு</item>
+    <item>நீளமானது</item>
   </string-array>
-    <string name="respond_via_sms_setting_title" msgid="8008181606657693452">"விரைவு பதில்கள்"</string>
-    <string name="call_settings_label" msgid="7824611757200960807">"அழைப்புகள்"</string>
-    <string name="manage_blocked_numbers_label" msgid="16823761991832273">"அழைப்புத் தடுப்பு"</string>
-    <string name="voicemail_settings_label" msgid="4594299554519920570">"குரலஞ்சல்"</string>
-    <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"அழைப்புத் தடுப்பு அம்சம் தற்காலிகமாக முடக்கப்பட்டுள்ளது"</string>
-    <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"கடந்த 48 மணிநேரத்தில், இந்த ஃபோனிலிருந்து அவசர அழைப்பு எண்ணைத் தொடர்புகொண்டதால் அழைப்புத் தடுப்பு அம்சம் முடக்கப்பட்டுள்ளது. 48 மணிநேரம் கழித்து, இந்த அம்சம் தானாகவே மீண்டும் இயக்கப்படும்."</string>
-    <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"எண்களை இறக்கு"</string>
-    <string name="blocked_call_settings_import_description" msgid="1819412052545228965">"பிற பயன்பாடுகளின் மூலம் சில அழைப்பாளர்களின் அழைப்புகளை தானாகவே குரலஞ்சலுக்கு அனுப்புமாறு ஏற்கனவே குறித்துள்ளீர்கள்."</string>
-    <string name="blocked_call_settings_view_numbers_button" msgid="3332727948554356704">"எண்களைக் காட்டு"</string>
-    <string name="blocked_call_settings_import_button" msgid="7319111700387470727">"இறக்கு"</string>
-    <string name="description_blocked_number_list_delete" msgid="2139644216858370740">"எண்ணை அனுமதி"</string>
-    <string name="addBlockedNumber" msgid="3053473735238295551">"எண்ணைச் சேர்"</string>
-    <string name="block_number_footer_message_vvm" msgid="7955326304033982368">"இந்த எண்களின் அழைப்புகள் தடுக்கப்படுவதுடன், அவற்றின் குரலஞ்சல்களும் தானாகவே நீக்கப்படும்."</string>
-    <string name="block_number_footer_message_no_vvm" msgid="1152684139070471665">"இந்த எண்களின் அழைப்புகள் தடுக்கப்படும், ஆனால் அழைப்பாளர்களால் இன்னமும் உங்களுக்குக் குரலஞ்சல்களை அனுப்ப முடியும்."</string>
-    <string name="block_list" msgid="4701585783411870782">"தடுக்கப்பட்ட எண்கள்"</string>
-    <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g> ஏற்கனவே தடுக்கப்பட்டுள்ளது."</string>
-    <string name="phone_account_settings_label" msgid="8372485478006965920">"அழைப்பு கணக்குகள்"</string>
-    <string name="permission_no_speeddial" msgid="8487215628510596753">"விரைவு டயலை இயக்க, தொடர்புகள் அனுமதியை இயக்கவும்."</string>
-    <string name="permission_no_calllog" msgid="4053705651238775784">"அழைப்புப் பதிவைப் பார்க்க, ஃபோன் அனுமதியை இயக்கவும்."</string>
-    <string name="permission_no_search" msgid="2424710404207193826">"தொடர்புகளைத் தேட, தொடர்புகள் அனுமதிகளை இயக்கவும்."</string>
-    <string name="permission_place_call" msgid="8686908130349369423">"அழைக்க, ஃபோன் அனுமதியை இயக்கவும்."</string>
-    <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"முறைமை அமைப்புகளில் எழுதுவதற்கான அனுமதி ஃபோன் பயன்பாட்டுக்கு இல்லை."</string>
-    <string name="blocked_number_call_log_label" msgid="4212282846299997693">"தடுக்கப்பட்டது"</string>
-    <string name="call_log_action_block_report_number" msgid="7302636538668696729">"தடு/ஸ்பேமெனப் புகாரளி"</string>
-    <string name="call_log_action_block_number" msgid="5048188386501998865">"எண்ணைத் தடு"</string>
-    <string name="call_log_action_remove_spam" msgid="2045319806318398403">"ஸ்பேமில்லை"</string>
-    <string name="call_log_action_unblock_number" msgid="6100117033288448758">"எண்ணை அனுமதி"</string>
-    <string name="spam_number_call_log_label" msgid="2678431398326811131">"ஸ்பேம்"</string>
-    <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> ஆஃப்லைனில் உள்ளதால், தொடர்புகொள்ள முடியாது"</string>
-    <string name="about_phone_label" msgid="582991354677973731">"அறிமுகம்"</string>
-    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Google டிரான்ஸ்கிரைப் செய்தது"</string>
-    <string name="voicemail_transcription_in_progress" msgid="2933320969613783210">"Google டிரான்ஸ்கிரைப் செய்கிறது…"</string>
-    <string name="voicemail_transcription_failed" msgid="335275303117412706">"டிரான்ஸ்கிரிப்ட் இல்லை."</string>
-    <string name="voicemail_transcription_failed_language_not_supported" msgid="4210332591050562553">"டிரான்ஸ்கிரிப்ட் இல்லை. மொழி ஆதரிக்கப்படவில்லை."</string>
-    <string name="voicemail_transcription_failed_no_speech" msgid="9093372879697874852">"டிரான்ஸ்கிரிப்ட் இல்லை. பேச்சு எதுவும் கேட்கவில்லை."</string>
-    <string name="view_conversation" msgid="7895904782094119702">"காட்டு"</string>
-    <string name="ec_data_deleted" msgid="4794880345545827107">"அழைப்பு நீக்கப்பட்டது. இந்த அழைப்பின் போது பகிர்ந்த இணைப்புகளை மெசேஜஸ் பயன்பாட்டில் பார்க்கலாம், நீக்கலாம்."</string>
-    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"அழைப்புகள் நீக்கப்பட்டன. அழைப்புகளின் போது பகிர்ந்த இணைப்புகளை மெசேஜஸ் பயன்பாட்டில் பார்க்கலாம், நீக்கலாம்."</string>
+  <string name="respond_via_sms_setting_title">விரைவு பதில்கள்</string>
+  <string name="call_settings_label">அழைப்புகள்</string>
+  <string name="manage_blocked_numbers_label">தடுத்த எண்கள்</string>
+  <string name="voicemail_settings_label">குரலஞ்சல்</string>
+  <string name="blocked_numbers_disabled_emergency_header_label">அழைப்புத் தடுப்பு அம்சம் தற்காலிகமாக முடக்கப்பட்டுள்ளது</string>
+  <string name="blocked_numbers_disabled_emergency_desc">கடந்த 48 மணிநேரத்தில், இந்த ஃபோனிலிருந்து அவசர அழைப்பு எண்ணைத் தொடர்புகொண்டதால் அழைப்புத் தடுப்பு அம்சம் முடக்கப்பட்டுள்ளது. 48 மணிநேரம் கழித்து, இந்த அம்சம் தானாகவே மீண்டும் இயக்கப்படும்.</string>
+  <string name="import_send_to_voicemail_numbers_label">எண்களை இறக்கு</string>
+  <string name="blocked_call_settings_import_description">பிற பயன்பாடுகளின் மூலம் சில அழைப்பாளர்களின் அழைப்புகளை தானாகவே குரலஞ்சலுக்கு அனுப்புமாறு ஏற்கனவே குறித்துள்ளீர்கள்.</string>
+  <string name="blocked_call_settings_view_numbers_button">எண்களைக் காட்டு</string>
+  <string name="blocked_call_settings_import_button">இறக்கு</string>
+  <string name="description_blocked_number_list_delete">எண்ணை அனுமதி</string>
+  <string name="addBlockedNumber">எண்ணைச் சேர்</string>
+  <string name="block_number_footer_message_vvm">இந்த எண்களின் அழைப்புகள் தடுக்கப்படுவதுடன், அவற்றின் குரலஞ்சல்களும் தானாகவே நீக்கப்படும்.</string>
+  <string name="block_number_footer_message_no_vvm">இந்த எண்களின் அழைப்புகள் தடுக்கப்படும், ஆனால் அழைப்பாளர்களால் இன்னமும் உங்களுக்குக் குரலஞ்சல்களை அனுப்ப முடியும்.</string>
+  <string name="block_list">தடுக்கப்பட்ட எண்கள்</string>
+  <string name="alreadyBlocked">%1$s ஏற்கனவே தடுக்கப்பட்டுள்ளது.</string>
+  <string name="phone_account_settings_label">அழைப்பு கணக்குகள்</string>
+  <string name="permission_no_speeddial">விரைவு டயலை இயக்க, தொடர்புகள் அனுமதியை இயக்கவும்.</string>
+  <string name="permission_no_calllog">அழைப்புப் பதிவைப் பார்க்க, ஃபோன் அனுமதியை இயக்கவும்.</string>
+  <string name="permission_no_search">தொடர்புகளைத் தேட, தொடர்புகள் அனுமதிகளை இயக்கவும்.</string>
+  <string name="permission_place_call">அழைக்க, ஃபோன் அனுமதியை இயக்கவும்.</string>
+  <string name="toast_cannot_write_system_settings">முறைமை அமைப்புகளில் எழுதுவதற்கான அனுமதி ஃபோன் பயன்பாட்டுக்கு இல்லை.</string>
+  <string name="blocked_number_call_log_label">தடுக்கப்பட்டது</string>
+  <string name="call_log_action_block_report_number">தடு/ஸ்பேமெனப் புகாரளி</string>
+  <string name="call_log_action_block_number">எண்ணைத் தடு</string>
+  <string name="call_log_action_remove_spam">ஸ்பேமில்லை</string>
+  <string name="call_log_action_unblock_number">எண்ணை அனுமதி</string>
+  <string name="spam_number_call_log_label">ஸ்பேம்</string>
+  <string name="call_composer_connection_failed">%1$s ஆஃப்லைனில் உள்ளதால், தொடர்புகொள்ள முடியாது</string>
+  <string name="about_phone_label">அறிமுகம்</string>
+  <string name="voicemail_transcription_branding_text">Google டிரான்ஸ்கிரைப் செய்தது</string>
+  <string name="voicemail_transcription_in_progress">டிரான்ஸ்கிரைப் செய்கிறது…</string>
+  <string name="voicemail_transcription_failed">டிரான்ஸ்கிரிப்ட் இல்லை.</string>
+  <string name="voicemail_transcription_failed_language_not_supported">டிரான்ஸ்கிரிப்ட் இல்லை. மொழி ஆதரிக்கப்படவில்லை.</string>
+  <string name="voicemail_transcription_failed_no_speech">டிரான்ஸ்கிரிப்ட் இல்லை. பேச்சு எதுவும் கேட்கவில்லை.</string>
+  <string name="voicemail_donation_promo_title">டிரான்ஸ்கிரிப்ஷன் துல்லியத்தை மேம்படுத்த உதவ விருப்பமா?</string>
+  <string name="voicemail_donation_promo_content">இதையும் எதிர்காலக் குரலஞ்சல்கள் செய்திகளையும் டிரான்ஸ்கிரிப்ட்டுகளின் மூலம் மதிப்பாய்வு செய்வதற்கு, Googleஐ அனுமதிக்கவும். அவை பெயரற்ற முறையில் சேமிக்கப்படும். அமைப்புகளை எப்போது வேண்டுமானாலும் மாற்றலாம். %1$s</string>
+  <string name="voicemail_donation_promo_opt_in">ஏற்கிறேன்</string>
+  <string name="voicemail_donation_promo_opt_out">வேண்டாம்</string>
+  <string name="voicemail_transcription_rating">டிரான்ஸ்கிரிப்ஷன் தரத்தை மதிப்பிடுக</string>
+  <string name="voicemail_transcription_rating_thanks">கருத்து தெரிவித்தமைக்கு நன்றி</string>
+  <string name="description_rating_good">விரும்புகிறேன்</string>
+  <string name="description_rating_bad">விரும்பவில்லை</string>
+  <string name="view_conversation">காட்டு</string>
+  <string name="ec_data_deleted">அழைப்பு நீக்கப்பட்டது. இந்த அழைப்பின் போது பகிர்ந்த இணைப்புகளை மெசேஜஸ் பயன்பாட்டில் பார்க்கலாம், நீக்கலாம்.</string>
+  <string name="multiple_ec_data_deleted">அழைப்புகள் நீக்கப்பட்டன. அழைப்புகளின் போது பகிர்ந்த இணைப்புகளை மெசேஜஸ் பயன்பாட்டில் பார்க்கலாம், நீக்கலாம்.</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-te/strings.xml b/java/com/android/dialer/app/res/values-te/strings.xml
index 09fedf9..3b592f7 100644
--- a/java/com/android/dialer/app/res/values-te/strings.xml
+++ b/java/com/android/dialer/app/res/values-te/strings.xml
@@ -1,179 +1,171 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="applicationLabel" msgid="2202739481132958990">"ఫోన్"</string>
-    <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"ఫోన్ కీప్యాడ్"</string>
-    <string name="callHistoryIconLabel" msgid="7493268743411968630">"కాల్ చరిత్ర"</string>
-    <string name="action_copy_number_text" msgid="832682558551502319">"నంబర్‌ను కాపీ చేయి"</string>
-    <string name="copy_transcript_text" msgid="937904189017310829">"లిప్యంతరీకరణను కాపీ చేయి"</string>
-    <string name="action_edit_number_before_call" msgid="8017492815878473837">"కాల్ చేయడానికి ముందు నంబర్‌ను సవరించు"</string>
-    <string name="call_log_delete_all" msgid="7852970926906523784">"కాల్ చరిత్రను క్లియర్ చేయి"</string>
-    <string name="call_log_trash_voicemail" msgid="6118493534178533972">"వాయిస్ మెయిల్‌ను తొలగించు"</string>
-    <string name="snackbar_voicemail_deleted" msgid="7463166543725496307">"వాయిస్‌‍మెయిల్ తొలగించింది"</string>
-    <string name="snackbar_voicemail_deleted_undo" msgid="6959743982796409941">"చర్యరద్దు"</string>
-    <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"కాల్ చరిత్రను తీసివేయాలా?"</string>
-    <string name="clearCallLogConfirmation" msgid="6844949465815109166">"దీని వలన మీ చరిత్ర నుండి అన్ని కాల్‌లు తొలగించబడతాయి"</string>
-    <string name="clearCallLogProgress_title" msgid="995004835687361977">"కాల్ చరిత్రను క్లియర్ చేస్తోంది…"</string>
-    <string name="notification_missedCallTitle" msgid="8283366068539898486">"సమాధానం ఇవ్వని కాల్"</string>
-    <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"మిస్డ్ కార్యాలయ కాల్"</string>
-    <string name="notification_missedCallsTitle" msgid="3697442015345089802">"మిస్డ్ కాల్‌లు"</string>
-    <string name="notification_missedCallsMsg" msgid="8176217633929018706">"<xliff:g id="NUM_MISSED_CALLS">%d</xliff:g> మిస్డ్ కాల్‌లు"</string>
-    <string name="notification_missedCall_call_back" msgid="3875698110051973965">"కాల్ చేయి"</string>
-    <string name="notification_missedCall_message" msgid="5086910028988305964">"సందేశం పంపు"</string>
-    <string name="post_call_notification_message" msgid="5417476789860590611">"<xliff:g id="NAME">%1$s</xliff:g>: <xliff:g id="MESSAGE">%2$s</xliff:g>"</string>
-    <string name="notification_voicemail_text_format" msgid="1895667520930252897">"<xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>కు డయల్ చేయండి"</string>
-    <string name="notification_voicemail_no_vm_number" msgid="8942821987929495842">"వాయిస్ మెయిల్ నంబర్ తెలియదు"</string>
-    <plurals name="notification_voicemail_title" formatted="false" msgid="1551847434476438657">
-      <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> వాయిస్ మెయిల్‌లు </item>
-      <item quantity="one">వాయిస్ మెయిల్</item>
-    </plurals>
-    <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
-    <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"<xliff:g id="CALLER">%1$s</xliff:g> నుండి కొత్త వాయిస్ మెయిల్"</string>
-    <string name="voicemail_playback_error" msgid="4384373852257757295">"వాయిస్ మెయిల్‌ను ప్లే చేయడం సాధ్యపడలేదు"</string>
-    <string name="voicemail_fetching_content" msgid="572320120918636014">"వాయిస్ మెయిల్‌ను లోడ్ చేస్తోంది…"</string>
-    <string name="voicemail_fetching_timout" msgid="2128873915839949783">"వాయిస్ మెయిల్‌ను లోడ్ చేయడం సాధ్యపడలేదు"</string>
-    <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_playback_speakerphone" msgid="4852027754869750227">"స్పీకర్‌ఫోన్‌ను స్విచ్ ఆన్ లేదా స్విచ్ ఆఫ్ చేయి"</string>
-    <string name="description_playback_seek" msgid="1340910573254132520">"ప్లేబ్యాక్ స్థానాన్ని కావాల్సిన చోటుకి జరపండి"</string>
-    <string name="action_menu_call_history_description" msgid="8829135306925008546">"కాల్ చరిత్ర"</string>
-    <string name="action_menu_overflow_description" msgid="7648679686746517341">"మరిన్ని ఎంపికలు"</string>
-    <string name="action_menu_dialpad_button" msgid="1970631633457493180">"కీ ప్యాడ్"</string>
-    <string name="dialer_settings_label" msgid="4980176284150290175">"సెట్టింగ్‌లు"</string>
-    <string name="simulator_submenu_label" msgid="186156287346615267">"సిములేటర్"</string>
-    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"కొత్త UI సత్వరమార్గం సృష్టించు"</string>
-    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"బల్క్ చర్య మోడ్‌లోకి ప్రవేశిస్తున్నారు"</string>
-    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"బల్క్ చర్య మోడ్ నుండి నిష్క్రమించారు"</string>
-    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> ఎంచుకోబడింది"</string>
-    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> ఎంపిక తీసివేయబడింది"</string>
-    <string name="description_contact_details" msgid="3341280873855253464">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> యొక్క సంప్రదింపు వివరాలు"</string>
-    <string name="description_spam_contact_details" msgid="5592578752881528368">"అనుమానాస్పద స్పామ్ కాలర్ <xliff:g id="NAMEORNUMBER">%1$s</xliff:g> సంప్రదింపు వివరాలు"</string>
-    <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> కాల్‌లు."</string>
-    <string name="description_video_call" msgid="3738199365585751727">"వీడియో కాల్."</string>
-    <string name="description_start_voice_search" msgid="8380022725973015261">"వాయిస్ శోధనను ప్రారంభించండి"</string>
-    <string name="voicemail" msgid="8899540969000957954">"వాయిస్ మెయిల్"</string>
-    <string name="description_cancel_multi_select" msgid="3930475950253360461">"సమూహ చర్యల మోడ్‌ను రద్దు చేస్తుంది"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"తొలగించు"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"రద్దు చేయి"</string>
-    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> ఎంచుకోబడ్డాయి"</string>
-    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
-      <item quantity="other">"<b>"ఈ వాయిస్ మెయిల్‌లను తొలగించాలా? "</b>"</item>
-      <item quantity="one">"<b>"ఈ వాయిస్ మెయిల్‌ను తొలగించాలా? "</b>"</item>
-    </plurals>
-    <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
-    <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> <xliff:g id="TIME">%2$s</xliff:g>కి"</string>
-    <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
-    <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="voice_search_not_available" msgid="6546240433719732905">"వాయిస్ శోధన అందుబాటులో లేదు"</string>
-    <string name="dialer_hint_find_contact" msgid="2023214799381149808">"పరిచయాలను శోధించు"</string>
-    <string name="block_number_search_hint" msgid="5377706079015099416">"నంబర్ జోడించండి లేదా పరిచయాల్లో శోధించండి"</string>
-    <string name="call_log_all_empty" msgid="3955572868518162004">"మీ కాల్ చరిత్ర ఖాళీగా ఉంది"</string>
-    <string name="call_log_all_empty_action" msgid="852218280136243014">"కాల్ చేయి"</string>
-    <string name="call_log_missed_empty" msgid="7094936030845062214">"మీరు సమాధానమివ్వని కాల్‌లు ఏవీ కలిగి లేరు."</string>
-    <string name="call_log_voicemail_empty" msgid="273623903423275178">"మీ వాయిస్‌మెయిల్ ఇన్‌బాక్స్ ఖాళీగా ఉంది."</string>
-    <string name="call_log_activity_title" msgid="1275242727244945527">"కాల్ చరిత్ర"</string>
-    <string name="call_log_all_title" msgid="6042262422192020327">"అన్నీ"</string>
-    <string name="call_log_missed_title" msgid="17254005889268015">"సమాధానం ఇవ్వనవి"</string>
-    <string name="tab_speed_dial" msgid="6616404752227561075">"స్పీడ్ డయల్"</string>
-    <string name="tab_history" msgid="7420269368689503596">"కాల్ చరిత్ర"</string>
-    <string name="tab_all_contacts" msgid="5531733977693943015">"పరిచయాలు"</string>
-    <string name="tab_voicemail" msgid="2458548090088316246">"వాయిస్ మెయిల్"</string>
-    <string name="search_shortcut_call_number" msgid="8847918845036880688">"<xliff:g id="NUMBER">%s</xliff:g>కు కాల్ చేయి"</string>
-    <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"కొత్త పరిచయాన్ని సృష్టించు"</string>
-    <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"పరిచయానికి జోడించు"</string>
-    <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"SMS పంపు"</string>
-    <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"వీడియో కాల్ చేయండి"</string>
-    <string name="search_shortcut_block_number" msgid="4587283230665805776">"నంబర్‌ను బ్లాక్ చేయి"</string>
-    <string name="speed_dial_empty" msgid="3346406399966039505">"మీ స్పీడ్ డయల్‌లో ఇంకా ఎవరూ లేరు"</string>
-    <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"ఇష్టమైన వారిని జోడించండి"</string>
-    <string name="remove_contact" msgid="2353580570488923668">"తీసివేయి"</string>
-    <string name="select_all" msgid="408601760696146245">"అన్నీ ఎంచుకోండి"</string>
-    <string name="call_log_action_video_call" msgid="7565549950343850819">"వీడియో కాల్"</string>
-    <string name="call_log_action_send_message" msgid="6948727362660115554">"సందేశాన్ని పంపు"</string>
-    <string name="call_log_action_details" msgid="2091370737371449501">"కాల్ వివరాలు"</string>
-    <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"దీనికి/వీటికి పంపు …"</string>
-    <string name="call_log_action_call" msgid="682724094251540583">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>కి కాల్ చేయి"</string>
-    <string name="description_incoming_missed_call" msgid="8292535799379230029">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g> నుండి <xliff:g id="TIMEOFCALL">^3</xliff:g> <xliff:g id="PHONEACCOUNT">^4</xliff:g>కి మిస్డ్ కాల్ ఇచ్చారు."</string>
-    <string name="description_incoming_answered_call" msgid="3920182963103160610">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g> నుండి <xliff:g id="TIMEOFCALL">^3</xliff:g> <xliff:g id="PHONEACCOUNT">^4</xliff:g>కి చేసిన కాల్‌కి సమాధానం ఇచ్చారు."</string>
-    <string name="description_unread_voicemail" msgid="145170985013419170">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> నుండి చదవని వాయిస్ మెయిల్, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_read_voicemail" msgid="5585559881573227732">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> నుండి వాయిస్ మెయిల్, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_outgoing_call" msgid="543952487882919924">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>కి <xliff:g id="TIMEOFCALL">^3</xliff:g> <xliff:g id="PHONEACCOUNT">^4</xliff:g> నుండి కాల్ చేసారు."</string>
-    <string name="call_log_via_number" msgid="1340307109806397650">"<xliff:g id="NUMBER">%1$s</xliff:g> ద్వారా"</string>
-    <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="NUMBER">%2$s</xliff:g> ద్వారా <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>"</string>
-    <string name="description_call_action" msgid="4042796498169106545">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>కి కాల్ చేయి"</string>
-    <string name="description_video_call_action" msgid="1237090968588659650">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>కి వీడియో కాల్."</string>
-    <string name="description_voicemail_action" msgid="3290143432403538524">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> నుండి వచ్చిన వాయిస్ మెయిల్‌ను వినండి"</string>
-    <string name="description_create_new_contact_action" msgid="1928282350281564130">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> కోసం పరిచయాన్ని సృష్టించండి"</string>
-    <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>ని ఇప్పటికే ఉన్న పరిచయానికి జోడించండి"</string>
-    <string name="description_details_action" msgid="2061866409737706174">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> యొక్క కాల్ వివరాలు"</string>
-    <string name="call_log_header_today" msgid="1576119097475845293">"ఈ రోజు"</string>
-    <string name="call_log_header_yesterday" msgid="5616077776205329563">"నిన్న"</string>
-    <string name="call_log_header_other" msgid="4940676886254217644">"పాతది"</string>
-    <string name="voicemail_speaker_on" msgid="3151333608926996668">"స్పీకర్‌ను ఆన్ చేయి."</string>
-    <string name="voicemail_speaker_off" msgid="2530064206962034201">"స్పీకర్‌ను ఆఫ్ చేయి."</string>
-    <string name="voicemail_play_start_pause" msgid="3874823480278334664">"ప్లేబ్యాక్‌ను ప్రారంభించు లేదా పాజ్ చేయి."</string>
-    <string name="display_options_title" msgid="3880091801055797975">"ప్రదర్శన ఎంపికలు"</string>
-    <string name="sounds_and_vibration_title" msgid="3075050000721181384">"ధ్వనులు మరియు వైబ్రేషన్"</string>
-    <string name="accessibility_settings_title" msgid="3329027650429831820">"ప్రాప్యత సామర్థ్యం"</string>
-    <string name="ringtone_title" msgid="8377174189894648486">"ఫోన్ రింగ్‌టోన్"</string>
-    <string name="vibrate_on_ring_title" msgid="631441314790960485">"కాల్‌ల కోసం వైబ్రేట్ కూడా చేయి"</string>
-    <string name="dtmf_tone_enable_title" msgid="3273762431523939277">"కీప్యాడ్ టోన్‌లు"</string>
-    <string name="dtmf_tone_length_title" msgid="534096029202438539">"కీప్యాడ్ టోన్ వ్యవధి"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="applicationLabel">ఫోన్</string>
+  <string name="launcherDialpadActivityLabel">ఫోన్ కీప్యాడ్</string>
+  <string name="callHistoryIconLabel">కాల్ చరిత్ర</string>
+  <string name="action_copy_number_text">నంబర్‌ను కాపీ చేయి</string>
+  <string name="copy_transcript_text">లిప్యంతరీకరణను కాపీ చేయి</string>
+  <string name="action_edit_number_before_call">కాల్ చేయడానికి ముందు నంబర్‌ను సవరించు</string>
+  <string name="call_log_delete_all">కాల్ చరిత్రను క్లియర్ చేయి</string>
+  <string name="call_log_trash_voicemail">వాయిస్ మెయిల్‌ను తొలగించు</string>
+  <string name="snackbar_voicemail_deleted">వాయిస్‌‍మెయిల్ తొలగించింది</string>
+  <string name="clearCallLogConfirmation_title">కాల్ చరిత్రను తీసివేయాలా?</string>
+  <string name="clearCallLogConfirmation">దీని వలన మీ చరిత్ర నుండి అన్ని కాల్‌లు తొలగించబడతాయి</string>
+  <string name="clearCallLogProgress_title">కాల్ చరిత్రను క్లియర్ చేస్తోంది…</string>
+  <string name="notification_missedCallTitle">సమాధానం ఇవ్వని కాల్</string>
+  <string name="notification_missedWorkCallTitle">మిస్డ్ కార్యాలయ కాల్</string>
+  <string name="notification_missedCallsTitle">మిస్డ్ కాల్‌లు</string>
+  <string name="notification_missedCallsMsg">%d మిస్డ్ కాల్‌లు</string>
+  <string name="notification_missedCall_call_back">కాల్ చేయి</string>
+  <string name="notification_missedCall_message">సందేశం పంపు</string>
+  <string name="post_call_notification_message">%1$s: %2$s</string>
+  <string name="notification_voicemail_text_format">%sకు డయల్ చేయండి</string>
+  <string name="notification_voicemail_no_vm_number">వాయిస్ మెయిల్ నంబర్ తెలియదు</string>
+  <plurals name="notification_voicemail_title">
+    <item quantity="one">వాయిస్ మెయిల్</item>
+    <item quantity="other"> %1$d వాయిస్ మెయిల్‌లు </item>
+  </plurals>
+  <string name="notification_voicemail_callers_list">%1$s, %2$s</string>
+  <string name="notification_new_voicemail_ticker">%1$s నుండి కొత్త వాయిస్ మెయిల్</string>
+  <string name="voicemail_playback_error">వాయిస్ మెయిల్‌ను ప్లే చేయడం సాధ్యపడలేదు</string>
+  <string name="voicemail_fetching_content">వాయిస్ మెయిల్‌ను లోడ్ చేస్తోంది…</string>
+  <string name="voicemail_fetching_timout">వాయిస్ మెయిల్‌ను లోడ్ చేయడం సాధ్యపడలేదు</string>
+  <string name="call_log_item_count_and_date">(%1$d) %2$s</string>
+  <string name="description_playback_speakerphone">స్పీకర్‌ఫోన్‌ను స్విచ్ ఆన్ లేదా స్విచ్ ఆఫ్ చేయి</string>
+  <string name="description_playback_seek">ప్లేబ్యాక్ స్థానాన్ని కావాల్సిన చోటుకి జరపండి</string>
+  <string name="action_menu_call_history_description">కాల్ చరిత్ర</string>
+  <string msgid="2295659037509008453" name="action_menu_overflow_description">మరిన్ని ఎంపికలు</string>
+  <string name="action_menu_dialpad_button">కీ ప్యాడ్</string>
+  <string name="dialer_settings_label">సెట్టింగ్‌లు</string>
+  <string name="simulator_submenu_label">సిములేటర్</string>
+  <string name="new_ui_launcher_shortcut_label">కొత్త UI సత్వరమార్గం సృష్టించు</string>
+  <string name="description_entering_bulk_action_mode">బల్క్ చర్య మోడ్‌లోకి ప్రవేశిస్తున్నారు</string>
+  <string name="description_leaving_bulk_action_mode">బల్క్ చర్య మోడ్ నుండి నిష్క్రమించారు</string>
+  <string name="description_selecting_bulk_action_mode">%1$s ఎంచుకోబడింది</string>
+  <string name="description_unselecting_bulk_action_mode">%1$s ఎంపిక తీసివేయబడింది</string>
+  <string name="description_contact_details">%1$s యొక్క సంప్రదింపు వివరాలు</string>
+  <string name="description_spam_contact_details">అనుమానాస్పద స్పామ్ కాలర్ %1$s సంప్రదింపు వివరాలు</string>
+  <string name="description_num_calls">%1$s కాల్‌లు.</string>
+  <string name="description_video_call">వీడియో కాల్.</string>
+  <string name="description_start_voice_search">వాయిస్ శోధనను ప్రారంభించండి</string>
+  <string name="voicemail">వాయిస్ మెయిల్</string>
+  <string name="description_cancel_multi_select">సమూహ చర్యల మోడ్‌ను రద్దు చేస్తుంది</string>
+  <string name="voicemailMultiSelectDeleteConfirm">తొలగించు</string>
+  <string name="voicemailMultiSelectDeleteCancel">రద్దు చేయి</string>
+  <string name="voicemailMultiSelectActionBarTitle">%1$s ఎంచుకోబడ్డాయి</string>
+  <plurals name="delete_voicemails_confirmation_dialog_title">
+    <item quantity="one"><b>ఈ వాయిస్ మెయిల్‌ను తొలగించాలా? </b></item>
+    <item quantity="other"><b>ఈ వాయిస్ మెయిల్‌లను తొలగించాలా? </b></item>
+  </plurals>
+  <string name="voicemailCallLogToday">@string/call_log_header_today</string>
+  <string name="voicemailCallLogDateTimeFormat">%1$s %2$sకి</string>
+  <string name="voicemailDurationFormat">%1$02d:%2$02d</string>
+  <string name="voicemailCallLogDateTimeFormatWithDuration">%1$s • %2$s</string>
+  <string name="voice_search_not_available">వాయిస్ శోధన అందుబాటులో లేదు</string>
+  <string name="dialer_hint_find_contact">పరిచయాలను శోధించు</string>
+  <string name="block_number_search_hint">నంబర్ జోడించండి లేదా పరిచయాల్లో శోధించండి</string>
+  <string name="call_log_all_empty">మీ కాల్ చరిత్ర ఖాళీగా ఉంది</string>
+  <string name="call_log_all_empty_action">కాల్ చేయి</string>
+  <string name="call_log_missed_empty">మీరు సమాధానమివ్వని కాల్‌లు ఏవీ కలిగి లేరు.</string>
+  <string name="call_log_voicemail_empty">మీ వాయిస్‌మెయిల్ ఇన్‌బాక్స్ ఖాళీగా ఉంది.</string>
+  <string name="call_log_activity_title">కాల్ చరిత్ర</string>
+  <string name="call_log_all_title">అన్నీ</string>
+  <string name="call_log_missed_title">సమాధానం ఇవ్వనవి</string>
+  <string name="tab_speed_dial">స్పీడ్ డయల్</string>
+  <string name="tab_history">కాల్ చరిత్ర</string>
+  <string name="tab_all_contacts">పరిచయాలు</string>
+  <string name="tab_voicemail">వాయిస్ మెయిల్</string>
+  <string name="search_shortcut_call_number">%sకు కాల్ చేయి</string>
+  <string name="search_shortcut_create_new_contact">కొత్త పరిచయాన్ని సృష్టించు</string>
+  <string name="search_shortcut_add_to_contact">పరిచయానికి జోడించు</string>
+  <string name="search_shortcut_send_sms_message">SMS పంపు</string>
+  <string name="search_shortcut_make_video_call">వీడియో కాల్ చేయండి</string>
+  <string name="search_shortcut_block_number">నంబర్‌ను బ్లాక్ చేయి</string>
+  <string name="speed_dial_empty">మీ స్పీడ్ డయల్‌లో ఇంకా ఎవరూ లేరు</string>
+  <string name="speed_dial_empty_add_favorite_action">ఇష్టమైన వారిని జోడించండి</string>
+  <string name="remove_contact">తీసివేయి</string>
+  <string name="select_all">అన్నీ ఎంచుకోండి</string>
+  <string name="call_log_action_video_call">వీడియో కాల్</string>
+  <string name="call_log_action_set_up_video">వీడియో కాలింగ్‌ని సెటప్ చేయి</string>
+  <string name="call_log_action_invite_video">వీడియో కాల్‌కు ఆహ్వానించు</string>
+  <string name="call_log_action_send_message">సందేశాన్ని పంపు</string>
+  <string name="call_log_action_details">కాల్ వివరాలు</string>
+  <string name="call_log_action_share_voicemail">దీనికి/వీటికి పంపు …</string>
+  <string name="call_log_action_call">^1కి కాల్ చేయి</string>
+  <string name="description_incoming_missed_call">^1, ^2 నుండి ^3 ^4కి మిస్డ్ కాల్ ఇచ్చారు.</string>
+  <string name="description_incoming_answered_call">^1, ^2 నుండి ^3 ^4కి చేసిన కాల్‌కి సమాధానం ఇచ్చారు.</string>
+  <string name="description_unread_voicemail">^1 నుండి చదవని వాయిస్ మెయిల్, ^2, ^3, ^4.</string>
+  <string name="description_read_voicemail">^1 నుండి వాయిస్ మెయిల్, ^2, ^3, ^4.</string>
+  <string name="description_outgoing_call">^1, ^2కి ^3 ^4 నుండి కాల్ చేసారు.</string>
+  <string name="call_log_via_number">%1$s ద్వారా</string>
+  <string name="call_log_via_number_phone_account">%2$s ద్వారా %1$s</string>
+  <string name="description_call_action">^1కి కాల్ చేయి</string>
+  <string name="description_video_call_action">^1కి వీడియో కాల్.</string>
+  <string name="description_voicemail_action">^1 నుండి వచ్చిన వాయిస్ మెయిల్‌ను వినండి</string>
+  <string name="description_create_new_contact_action">^1 కోసం పరిచయాన్ని సృష్టించండి</string>
+  <string name="description_add_to_existing_contact_action">^1ని ఇప్పటికే ఉన్న పరిచయానికి జోడించండి</string>
+  <string name="description_details_action">^1 యొక్క కాల్ వివరాలు</string>
+  <string name="call_log_header_today">ఈ రోజు</string>
+  <string name="call_log_header_yesterday">నిన్న</string>
+  <string name="call_log_header_other">పాతది</string>
+  <string name="voicemail_speaker_on">స్పీకర్‌ను ఆన్ చేయి.</string>
+  <string name="voicemail_speaker_off">స్పీకర్‌ను ఆఫ్ చేయి.</string>
+  <string name="voicemail_play_start_pause">ప్లేబ్యాక్‌ను ప్రారంభించు లేదా పాజ్ చేయి.</string>
+  <string name="display_options_title">ప్రదర్శన ఎంపికలు</string>
+  <string name="sounds_and_vibration_title">ధ్వనులు మరియు వైబ్రేషన్</string>
+  <string name="accessibility_settings_title">ప్రాప్యత సామర్థ్యం</string>
+  <string name="ringtone_title">ఫోన్ రింగ్‌టోన్</string>
+  <string name="vibrate_on_ring_title">కాల్‌ల కోసం వైబ్రేట్ కూడా చేయి</string>
+  <string name="dtmf_tone_enable_title">కీప్యాడ్ టోన్‌లు</string>
+  <string name="dtmf_tone_length_title">కీప్యాడ్ టోన్ వ్యవధి</string>
   <string-array name="dtmf_tone_length_entries">
-    <item msgid="3136353015227162823">"సాధారణం"</item>
-    <item msgid="5376841175538523822">"ఎక్కువ నిడివి"</item>
+    <item>సాధారణం</item>
+    <item>ఎక్కువ నిడివి</item>
   </string-array>
-    <string name="respond_via_sms_setting_title" msgid="8008181606657693452">"శీఘ్ర ప్రతిస్పందనలు"</string>
-    <string name="call_settings_label" msgid="7824611757200960807">"కాల్‌లు"</string>
-    <string name="manage_blocked_numbers_label" msgid="16823761991832273">"కాల్ బ్లాక్ చేయడం"</string>
-    <string name="voicemail_settings_label" msgid="4594299554519920570">"వాయిస్ మెయిల్"</string>
-    <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"కాల్ బ్లాకింగ్ తాత్కాలికంగా ఆఫ్ అయ్యింది"</string>
-    <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"మీరు గత 48 గంటల వ్యవధిలో ఈ ఫోన్ నుండి అత్యవసర సేవలను సంప్రదించినందున కాల్ బ్లాకింగ్ నిలిపివేయబడింది. 48 గంటల వ్యవధి ముగిసిన తర్వాత ఇది స్వయంచాలకంగా పునఃప్రారంభించబడుతుంది."</string>
-    <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"నంబర్‌లను దిగుమతి చేయి"</string>
-    <string name="blocked_call_settings_import_description" msgid="1819412052545228965">"మీరు ఇంతకుముందే కొంతమంది కాలర్‌లను స్వయంచాలకంగా ఇతర అనువర్తనాల ద్వారా వాయిస్ మెయిల్‌కి పంపేందుకు గుర్తు పెట్టారు."</string>
-    <string name="blocked_call_settings_view_numbers_button" msgid="3332727948554356704">"నంబర్‌లను వీక్షించండి"</string>
-    <string name="blocked_call_settings_import_button" msgid="7319111700387470727">"దిగుమతి చేయి"</string>
-    <string name="description_blocked_number_list_delete" msgid="2139644216858370740">"నంబర్‌ను అన్‌బ్లాక్ చేయి"</string>
-    <string name="addBlockedNumber" msgid="3053473735238295551">"నంబర్‌ను జోడించండి"</string>
-    <string name="block_number_footer_message_vvm" msgid="7955326304033982368">"ఈ నంబర్‌ల నుండి కాల్‌లు బ్లాక్ చేయబడతాయి మరియు వాయిస్‌మెయిల్‌లు స్వయంచాలకంగా తొలగించబడతాయి."</string>
-    <string name="block_number_footer_message_no_vvm" msgid="1152684139070471665">"ఈ నంబర్‌ల నుండి కాల్‌లు బ్లాక్ చేయబడతాయి, కానీ వాటి నుండి ఇప్పటికీ వాయిస్‌మెయిల్‌లు పంపబడవచ్చు."</string>
-    <string name="block_list" msgid="4701585783411870782">"బ్లాక్ చేయబడిన నంబర్‌లు"</string>
-    <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g> ఇప్పటికే బ్లాక్ చేయబడింది."</string>
-    <string name="phone_account_settings_label" msgid="8372485478006965920">"కాల్ చేసే ఖాతాలు"</string>
-    <string name="permission_no_speeddial" msgid="8487215628510596753">"స్పీడ్ డయల్‌ను ప్రారంభించడానికి, పరిచయాల అనుమతిని ఆన్ చేయండి."</string>
-    <string name="permission_no_calllog" msgid="4053705651238775784">"మీ కాల్ లాగ్‌ను చూడటానికి, ఫోన్ అనుమతిని ఆన్ చేయండి."</string>
-    <string name="permission_no_search" msgid="2424710404207193826">"మీ పరిచయాలను శోధించడానికి, పరిచయాల అనుమతులను ఆన్ చేయండి."</string>
-    <string name="permission_place_call" msgid="8686908130349369423">"కాల్ చేయడానికి, ఫోన్ అనుమతిని ఆన్ చేయండి."</string>
-    <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"సిస్టమ్ సెట్టింగ్‌లకు వ్రాయడం కోసం ఫోన్ అనువర్తనానికి అనుమతి లేదు."</string>
-    <string name="blocked_number_call_log_label" msgid="4212282846299997693">"బ్లాక్ చేయబడింది"</string>
-    <string name="call_log_action_block_report_number" msgid="7302636538668696729">"బ్లాక్ చేయి/స్పామ్‌గానివేదించు"</string>
-    <string name="call_log_action_block_number" msgid="5048188386501998865">"నంబర్‌ను బ్లాక్ చేయి"</string>
-    <string name="call_log_action_remove_spam" msgid="2045319806318398403">"స్పామ్ కాదు"</string>
-    <string name="call_log_action_unblock_number" msgid="6100117033288448758">"నంబర్‌ను అన్‌బ్లాక్ చేయి"</string>
-    <string name="spam_number_call_log_label" msgid="2678431398326811131">"స్పామ్"</string>
-    <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> ఆఫ్‌లైన్‌లో ఉన్నందున వారిని చేరుకోవడం సాధ్యపడదు"</string>
-    <string name="about_phone_label" msgid="582991354677973731">"పరిచయం"</string>
-    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Google లిప్యంతరీకరించింది"</string>
-    <string name="voicemail_transcription_in_progress" msgid="2933320969613783210">"Google లిప్యంతరీకరిస్తోంది…"</string>
-    <string name="voicemail_transcription_failed" msgid="335275303117412706">"లిప్యంతరీకరణ అందుబాటులో లేదు."</string>
-    <string name="voicemail_transcription_failed_language_not_supported" msgid="4210332591050562553">"లిప్యంతరీకరణ అందుబాటులో లేదు. భాషకు మద్దతు లేదు."</string>
-    <string name="voicemail_transcription_failed_no_speech" msgid="9093372879697874852">"లిప్యంతరీకరణ అందుబాటులో లేదు. ప్రసంగం కనుగొనబడలేదు."</string>
-    <string name="view_conversation" msgid="7895904782094119702">"వీక్షించండి"</string>
-    <string name="ec_data_deleted" msgid="4794880345545827107">"కాల్ తొలగించబడింది. ఈ కాల్‌లో భాగస్వామ్యం చేయబడిన జోడింపులను సందేశాల అనువర్తనంలో వీక్షించండి మరియు తొలగించండి."</string>
-    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"కాల్ తొలగించబడింది. కాల్‌ల్లో భాగస్వామ్యం చేయబడిన జోడింపులను సందేశాల అనువర్తనంలో వీక్షించండి మరియు తొలగించండి."</string>
+  <string name="respond_via_sms_setting_title">శీఘ్ర ప్రతిస్పందనలు</string>
+  <string name="call_settings_label">కాల్‌లు</string>
+  <string name="manage_blocked_numbers_label">బ్లాక్ చేయబడిన నంబర్‌లు</string>
+  <string name="voicemail_settings_label">వాయిస్ మెయిల్</string>
+  <string name="blocked_numbers_disabled_emergency_header_label">కాల్ బ్లాకింగ్ తాత్కాలికంగా ఆఫ్ అయ్యింది</string>
+  <string name="blocked_numbers_disabled_emergency_desc">మీరు గత 48 గంటల వ్యవధిలో ఈ ఫోన్ నుండి అత్యవసర సేవలను సంప్రదించినందున కాల్ బ్లాకింగ్ నిలిపివేయబడింది. 48 గంటల వ్యవధి ముగిసిన తర్వాత ఇది స్వయంచాలకంగా పునఃప్రారంభించబడుతుంది.</string>
+  <string name="import_send_to_voicemail_numbers_label">నంబర్‌లను దిగుమతి చేయి</string>
+  <string name="blocked_call_settings_import_description">మీరు ఇంతకుముందే కొంతమంది కాలర్‌లను స్వయంచాలకంగా ఇతర అనువర్తనాల ద్వారా వాయిస్ మెయిల్‌కి పంపేందుకు గుర్తు పెట్టారు.</string>
+  <string name="blocked_call_settings_view_numbers_button">నంబర్‌లను వీక్షించండి</string>
+  <string name="blocked_call_settings_import_button">దిగుమతి చేయి</string>
+  <string name="description_blocked_number_list_delete">నంబర్‌ను అన్‌బ్లాక్ చేయి</string>
+  <string name="addBlockedNumber">నంబర్‌ను జోడించండి</string>
+  <string name="block_number_footer_message_vvm">ఈ నంబర్‌ల నుండి కాల్‌లు బ్లాక్ చేయబడతాయి మరియు వాయిస్‌మెయిల్‌లు స్వయంచాలకంగా తొలగించబడతాయి.</string>
+  <string name="block_number_footer_message_no_vvm">ఈ నంబర్‌ల నుండి కాల్‌లు బ్లాక్ చేయబడతాయి, కానీ వాటి నుండి ఇప్పటికీ వాయిస్‌మెయిల్‌లు పంపబడవచ్చు.</string>
+  <string name="block_list">బ్లాక్ చేయబడిన నంబర్‌లు</string>
+  <string name="alreadyBlocked">%1$s ఇప్పటికే బ్లాక్ చేయబడింది.</string>
+  <string name="phone_account_settings_label">కాల్ చేసే ఖాతాలు</string>
+  <string name="permission_no_speeddial">స్పీడ్ డయల్‌ను ప్రారంభించడానికి, పరిచయాల అనుమతిని ఆన్ చేయండి.</string>
+  <string name="permission_no_calllog">మీ కాల్ లాగ్‌ను చూడటానికి, ఫోన్ అనుమతిని ఆన్ చేయండి.</string>
+  <string name="permission_no_search">మీ పరిచయాలను శోధించడానికి, పరిచయాల అనుమతులను ఆన్ చేయండి.</string>
+  <string name="permission_place_call">కాల్ చేయడానికి, ఫోన్ అనుమతిని ఆన్ చేయండి.</string>
+  <string name="toast_cannot_write_system_settings">సిస్టమ్ సెట్టింగ్‌లకు వ్రాయడం కోసం ఫోన్ అనువర్తనానికి అనుమతి లేదు.</string>
+  <string name="blocked_number_call_log_label">బ్లాక్ చేయబడింది</string>
+  <string name="call_log_action_block_report_number">బ్లాక్ చేయి/స్పామ్‌గానివేదించు</string>
+  <string name="call_log_action_block_number">నంబర్‌ను బ్లాక్ చేయి</string>
+  <string name="call_log_action_remove_spam">స్పామ్ కాదు</string>
+  <string name="call_log_action_unblock_number">నంబర్‌ను అన్‌బ్లాక్ చేయి</string>
+  <string name="spam_number_call_log_label">స్పామ్</string>
+  <string name="call_composer_connection_failed">%1$s ఆఫ్‌లైన్‌లో ఉన్నందున వారిని చేరుకోవడం సాధ్యపడదు</string>
+  <string name="about_phone_label">పరిచయం</string>
+  <string name="voicemail_transcription_branding_text">Google లిప్యంతరీకరించింది</string>
+  <string name="voicemail_transcription_in_progress">లిప్యంతరణం చేస్తోంది…</string>
+  <string name="voicemail_transcription_failed">లిప్యంతరీకరణ అందుబాటులో లేదు.</string>
+  <string name="voicemail_transcription_failed_language_not_supported">లిప్యంతరీకరణ అందుబాటులో లేదు. భాషకు మద్దతు లేదు.</string>
+  <string name="voicemail_transcription_failed_no_speech">లిప్యంతరీకరణ అందుబాటులో లేదు. ప్రసంగం కనుగొనబడలేదు.</string>
+  <string name="voicemail_donation_promo_title">లిపి మార్పు ఖచ్చితత్వాన్ని మెరుగుపరచడంలో సహాయం చేయాలా?</string>
+  <string name="voicemail_donation_promo_content">లిపి మార్పులతో ప్రస్తుత మరియు భవిష్యత్ వాయిస్‌మెయిల్ సందేశాలను సమీక్షించడానికి Googleని అనుమతించండి. అవి అనామకంగా నిల్వ చేయబడతాయి. ఏ సమయంలో అయినా సెట్టింగ్‌లను మార్చండి. %1$s</string>
+  <string name="voicemail_donation_promo_opt_in">సరే, సమ్మతమే</string>
+  <string name="voicemail_donation_promo_opt_out">వద్దు</string>
+  <string name="voicemail_transcription_rating">లిప్యంతరీకరణ నాణ్యతను రేట్ చేయండి</string>
+  <string name="voicemail_transcription_rating_thanks">మీ అభిప్రాయానికి ధన్యవాదాలు</string>
+  <string name="description_rating_good">లైక్</string>
+  <string name="description_rating_bad">డిస్‌లైక్</string>
+  <string name="view_conversation">వీక్షించండి</string>
+  <string name="ec_data_deleted">కాల్ తొలగించబడింది. ఈ కాల్‌లో భాగస్వామ్యం చేయబడిన జోడింపులను సందేశాల అనువర్తనంలో వీక్షించండి మరియు తొలగించండి.</string>
+  <string name="multiple_ec_data_deleted">కాల్ తొలగించబడింది. కాల్‌ల్లో భాగస్వామ్యం చేయబడిన జోడింపులను సందేశాల అనువర్తనంలో వీక్షించండి మరియు తొలగించండి.</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-th/strings.xml b/java/com/android/dialer/app/res/values-th/strings.xml
index a2a8736..6aabd66 100644
--- a/java/com/android/dialer/app/res/values-th/strings.xml
+++ b/java/com/android/dialer/app/res/values-th/strings.xml
@@ -1,179 +1,171 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="applicationLabel" msgid="2202739481132958990">"โทรศัพท์"</string>
-    <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"ปุ่มกดโทรศัพท์"</string>
-    <string name="callHistoryIconLabel" msgid="7493268743411968630">"ประวัติการโทร"</string>
-    <string name="action_copy_number_text" msgid="832682558551502319">"คัดลอกหมายเลข"</string>
-    <string name="copy_transcript_text" msgid="937904189017310829">"คัดลอกการถอดเสียงเป็นคำ"</string>
-    <string name="action_edit_number_before_call" msgid="8017492815878473837">"แก้ไขหมายเลขก่อนโทร"</string>
-    <string name="call_log_delete_all" msgid="7852970926906523784">"ล้างประวัติการโทร"</string>
-    <string name="call_log_trash_voicemail" msgid="6118493534178533972">"ลบข้อความเสียง"</string>
-    <string name="snackbar_voicemail_deleted" msgid="7463166543725496307">"ลบข้อความเสียงแล้ว"</string>
-    <string name="snackbar_voicemail_deleted_undo" msgid="6959743982796409941">"เลิกทำ"</string>
-    <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"ล้างประวัติการโทรไหม"</string>
-    <string name="clearCallLogConfirmation" msgid="6844949465815109166">"การดำเนินการนี้จะลบการโทรทั้งหมดออกจากประวัติของคุณ"</string>
-    <string name="clearCallLogProgress_title" msgid="995004835687361977">"กำลังล้างประวัติการโทร…"</string>
-    <string name="notification_missedCallTitle" msgid="8283366068539898486">"สายที่ไม่ได้รับ"</string>
-    <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"มีสายจากที่ทำงานที่ไม่ได้รับ"</string>
-    <string name="notification_missedCallsTitle" msgid="3697442015345089802">"สายที่ไม่ได้รับ"</string>
-    <string name="notification_missedCallsMsg" msgid="8176217633929018706">"ไม่ได้รับ <xliff:g id="NUM_MISSED_CALLS">%d</xliff:g> สาย"</string>
-    <string name="notification_missedCall_call_back" msgid="3875698110051973965">"โทรกลับ"</string>
-    <string name="notification_missedCall_message" msgid="5086910028988305964">"ข้อความ"</string>
-    <string name="post_call_notification_message" msgid="5417476789860590611">"<xliff:g id="NAME">%1$s</xliff:g>: <xliff:g id="MESSAGE">%2$s</xliff:g>"</string>
-    <string name="notification_voicemail_text_format" msgid="1895667520930252897">"หมุนหมายเลข <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
-    <string name="notification_voicemail_no_vm_number" msgid="8942821987929495842">"ไม่ทราบหมายเลขข้อความเสียง"</string>
-    <plurals name="notification_voicemail_title" formatted="false" msgid="1551847434476438657">
-      <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> ข้อความเสียง </item>
-      <item quantity="one">ข้อความเสียง</item>
-    </plurals>
-    <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
-    <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"ข้อความเสียงใหม่จาก <xliff:g id="CALLER">%1$s</xliff:g>"</string>
-    <string name="voicemail_playback_error" msgid="4384373852257757295">"ไม่สามารถเล่นข้อความเสียงได้"</string>
-    <string name="voicemail_fetching_content" msgid="572320120918636014">"กำลังโหลดข้อความเสียง…"</string>
-    <string name="voicemail_fetching_timout" msgid="2128873915839949783">"ไม่สามารถโหลดข้อความเสียงได้"</string>
-    <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_playback_speakerphone" msgid="4852027754869750227">"เปิดหรือปิดลำโพง"</string>
-    <string name="description_playback_seek" msgid="1340910573254132520">"ค้นหาตำแหน่งการเล่น"</string>
-    <string name="action_menu_call_history_description" msgid="8829135306925008546">"ประวัติการโทร"</string>
-    <string name="action_menu_overflow_description" msgid="7648679686746517341">"ตัวเลือกเพิ่มเติม"</string>
-    <string name="action_menu_dialpad_button" msgid="1970631633457493180">"ปุ่มกด"</string>
-    <string name="dialer_settings_label" msgid="4980176284150290175">"การตั้งค่า"</string>
-    <string name="simulator_submenu_label" msgid="186156287346615267">"เครื่องมือจำลอง"</string>
-    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"สร้างทางลัด UI ใหม่"</string>
-    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"กำลังเข้าสู่โหมดการดำเนินการแบบกลุ่ม"</string>
-    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"ออกจากโหมดการทำงานแบบกลุ่มแล้ว"</string>
-    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"เลือก <xliff:g id="NAMEORNUMBER">%1$s</xliff:g> แล้ว"</string>
-    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"ยกเลิกการเลือก <xliff:g id="NAMEORNUMBER">%1$s</xliff:g> แล้ว"</string>
-    <string name="description_contact_details" msgid="3341280873855253464">"รายละเอียดรายชื่อติดต่อสำหรับ <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_spam_contact_details" msgid="5592578752881528368">"รายละเอียดการติดต่อของผู้โทรที่สงสัยว่าจะเป็นสแปม <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> สาย"</string>
-    <string name="description_video_call" msgid="3738199365585751727">"แฮงเอาท์วิดีโอ"</string>
-    <string name="description_start_voice_search" msgid="8380022725973015261">"เริ่มต้นการค้นหาด้วยเสียง"</string>
-    <string name="voicemail" msgid="8899540969000957954">"ข้อความเสียง"</string>
-    <string name="description_cancel_multi_select" msgid="3930475950253360461">"ยกเลิกโหมดการทำงานแบบกลุ่ม"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"ลบ"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"ยกเลิก"</string>
-    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"เลือกไว้ <xliff:g id="NUMBER">%1$s</xliff:g> รายการ"</string>
-    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
-      <item quantity="other">"<b>"ลบข้อความเสียงเหล่านี้ไหม "</b>"</item>
-      <item quantity="one">"<b>"ลบข้อความเสียงนี้ไหม "</b>"</item>
-    </plurals>
-    <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
-    <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"วันที่ <xliff:g id="DATE">%1$s</xliff:g> เวลา <xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
-    <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="voice_search_not_available" msgid="6546240433719732905">"การค้นหาด้วยเสียงไม่พร้อมใช้งาน"</string>
-    <string name="dialer_hint_find_contact" msgid="2023214799381149808">"ค้นหารายชื่อติดต่อ"</string>
-    <string name="block_number_search_hint" msgid="5377706079015099416">"เพิ่มหมายเลขหรือค้นหาผู้ติดต่อ"</string>
-    <string name="call_log_all_empty" msgid="3955572868518162004">"ประวัติการโทรว่างเปล่า"</string>
-    <string name="call_log_all_empty_action" msgid="852218280136243014">"โทรออก"</string>
-    <string name="call_log_missed_empty" msgid="7094936030845062214">"คุณไม่มีสายที่ไม่ได้รับ"</string>
-    <string name="call_log_voicemail_empty" msgid="273623903423275178">"กล่องข้อความเสียงว่างเปล่า"</string>
-    <string name="call_log_activity_title" msgid="1275242727244945527">"ประวัติการโทร"</string>
-    <string name="call_log_all_title" msgid="6042262422192020327">"ทั้งหมด"</string>
-    <string name="call_log_missed_title" msgid="17254005889268015">"ไม่ได้รับ"</string>
-    <string name="tab_speed_dial" msgid="6616404752227561075">"การโทรด่วน"</string>
-    <string name="tab_history" msgid="7420269368689503596">"ประวัติการโทร"</string>
-    <string name="tab_all_contacts" msgid="5531733977693943015">"รายชื่อติดต่อ"</string>
-    <string name="tab_voicemail" msgid="2458548090088316246">"ข้อความเสียง"</string>
-    <string name="search_shortcut_call_number" msgid="8847918845036880688">"โทร <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"สร้างรายชื่อติดต่อใหม่"</string>
-    <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"เพิ่มในรายชื่อติดต่อ"</string>
-    <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"ส่ง SMS"</string>
-    <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"ใช้แฮงเอาท์วิดีโอ"</string>
-    <string name="search_shortcut_block_number" msgid="4587283230665805776">"บล็อกหมายเลข"</string>
-    <string name="speed_dial_empty" msgid="3346406399966039505">"ยังไม่ได้กำหนดผู้ใดในการโทรด่วน"</string>
-    <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"เพิ่มรายการโปรด"</string>
-    <string name="remove_contact" msgid="2353580570488923668">"ลบ"</string>
-    <string name="select_all" msgid="408601760696146245">"เลือกทั้งหมด"</string>
-    <string name="call_log_action_video_call" msgid="7565549950343850819">"แฮงเอาท์วิดีโอ"</string>
-    <string name="call_log_action_send_message" msgid="6948727362660115554">"ส่งข้อความ"</string>
-    <string name="call_log_action_details" msgid="2091370737371449501">"รายละเอียดการโทร"</string>
-    <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"ส่งไปที่…"</string>
-    <string name="call_log_action_call" msgid="682724094251540583">"โทรไปที่ <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_incoming_missed_call" msgid="8292535799379230029">"ไม่ได้รับสายจาก <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>"</string>
-    <string name="description_incoming_answered_call" msgid="3920182963103160610">"รับสายจาก <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>"</string>
-    <string name="description_unread_voicemail" msgid="145170985013419170">"ข้อความเสียงที่ยังไม่ได้อ่านจาก <xliff:g id="NAMEORNUMBER">^1</xliff:g> ผ่านทาง<xliff:g id="TYPEORLOCATION">^2</xliff:g> เมื่อ <xliff:g id="TIMEOFCALL">^3</xliff:g> <xliff:g id="PHONEACCOUNT">^4</xliff:g>"</string>
-    <string name="description_read_voicemail" msgid="5585559881573227732">"ข้อความเสียงจาก <xliff:g id="NAMEORNUMBER">^1</xliff:g> ผ่านทาง<xliff:g id="TYPEORLOCATION">^2</xliff:g> เมื่อ <xliff:g id="TIMEOFCALL">^3</xliff:g> <xliff:g id="PHONEACCOUNT">^4</xliff:g>"</string>
-    <string name="description_outgoing_call" msgid="543952487882919924">"โทรหา <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>"</string>
-    <string name="call_log_via_number" msgid="1340307109806397650">"ผ่าน <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> ผ่าน <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="description_call_action" msgid="4042796498169106545">"โทรไปที่ <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_video_call_action" msgid="1237090968588659650">"เรียกแฮงเอาท์วิดีโอไปยัง <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_voicemail_action" msgid="3290143432403538524">"ฟังข้อความเสียงจาก <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_create_new_contact_action" msgid="1928282350281564130">"สร้างรายชื่อติดต่อสำหรับ <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"เพิ่ม <xliff:g id="NAMEORNUMBER">^1</xliff:g> ไปยังรายชื่อติดต่อที่มีอยู่"</string>
-    <string name="description_details_action" msgid="2061866409737706174">"รายละเอียดการโทรสำหรับ <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="call_log_header_today" msgid="1576119097475845293">"วันนี้"</string>
-    <string name="call_log_header_yesterday" msgid="5616077776205329563">"เมื่อวานนี้"</string>
-    <string name="call_log_header_other" msgid="4940676886254217644">"เก่ากว่า"</string>
-    <string name="voicemail_speaker_on" msgid="3151333608926996668">"เปิดลำโพง"</string>
-    <string name="voicemail_speaker_off" msgid="2530064206962034201">"ปิดลำโพง"</string>
-    <string name="voicemail_play_start_pause" msgid="3874823480278334664">"เริ่มหรือหยุดเล่นชั่วคราว"</string>
-    <string name="display_options_title" msgid="3880091801055797975">"ตัวเลือกการแสดง"</string>
-    <string name="sounds_and_vibration_title" msgid="3075050000721181384">"เสียงและการสั่น"</string>
-    <string name="accessibility_settings_title" msgid="3329027650429831820">"การเข้าถึง"</string>
-    <string name="ringtone_title" msgid="8377174189894648486">"เสียงเรียกเข้า"</string>
-    <string name="vibrate_on_ring_title" msgid="631441314790960485">"สั่นเมื่อมีสายเรียกเข้าด้วย"</string>
-    <string name="dtmf_tone_enable_title" msgid="3273762431523939277">"เสียงปุ่มกด"</string>
-    <string name="dtmf_tone_length_title" msgid="534096029202438539">"ความยาวของเสียงปุ่มกด"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="applicationLabel">โทรศัพท์</string>
+  <string name="launcherDialpadActivityLabel">ปุ่มกดโทรศัพท์</string>
+  <string name="callHistoryIconLabel">ประวัติการโทร</string>
+  <string name="action_copy_number_text">คัดลอกหมายเลข</string>
+  <string name="copy_transcript_text">คัดลอกการถอดเสียงเป็นคำ</string>
+  <string name="action_edit_number_before_call">แก้ไขหมายเลขก่อนโทร</string>
+  <string name="call_log_delete_all">ล้างประวัติการโทร</string>
+  <string name="call_log_trash_voicemail">ลบข้อความเสียง</string>
+  <string name="snackbar_voicemail_deleted">ลบข้อความเสียงแล้ว</string>
+  <string name="clearCallLogConfirmation_title">ล้างประวัติการโทรไหม</string>
+  <string name="clearCallLogConfirmation">การดำเนินการนี้จะลบการโทรทั้งหมดออกจากประวัติของคุณ</string>
+  <string name="clearCallLogProgress_title">กำลังล้างประวัติการโทร…</string>
+  <string name="notification_missedCallTitle">สายที่ไม่ได้รับ</string>
+  <string name="notification_missedWorkCallTitle">มีสายจากที่ทำงานที่ไม่ได้รับ</string>
+  <string name="notification_missedCallsTitle">สายที่ไม่ได้รับ</string>
+  <string name="notification_missedCallsMsg">ไม่ได้รับ %d สาย</string>
+  <string name="notification_missedCall_call_back">โทรกลับ</string>
+  <string name="notification_missedCall_message">ข้อความ</string>
+  <string name="post_call_notification_message">%1$s: %2$s</string>
+  <string name="notification_voicemail_text_format">หมุนหมายเลข %s</string>
+  <string name="notification_voicemail_no_vm_number">ไม่ทราบหมายเลขข้อความเสียง</string>
+  <plurals name="notification_voicemail_title">
+    <item quantity="one">ข้อความเสียง</item>
+    <item quantity="other"> %1$d ข้อความเสียง </item>
+  </plurals>
+  <string name="notification_voicemail_callers_list">%1$s, %2$s</string>
+  <string name="notification_new_voicemail_ticker">ข้อความเสียงใหม่จาก %1$s</string>
+  <string name="voicemail_playback_error">ไม่สามารถเล่นข้อความเสียงได้</string>
+  <string name="voicemail_fetching_content">กำลังโหลดข้อความเสียง…</string>
+  <string name="voicemail_fetching_timout">ไม่สามารถโหลดข้อความเสียงได้</string>
+  <string name="call_log_item_count_and_date">(%1$d) %2$s</string>
+  <string name="description_playback_speakerphone">เปิดหรือปิดลำโพง</string>
+  <string name="description_playback_seek">ค้นหาตำแหน่งการเล่น</string>
+  <string name="action_menu_call_history_description">ประวัติการโทร</string>
+  <string msgid="2295659037509008453" name="action_menu_overflow_description">ตัวเลือกเพิ่มเติม</string>
+  <string name="action_menu_dialpad_button">ปุ่มกด</string>
+  <string name="dialer_settings_label">การตั้งค่า</string>
+  <string name="simulator_submenu_label">เครื่องมือจำลอง</string>
+  <string name="new_ui_launcher_shortcut_label">สร้างทางลัด UI ใหม่</string>
+  <string name="description_entering_bulk_action_mode">กำลังเข้าสู่โหมดการดำเนินการแบบกลุ่ม</string>
+  <string name="description_leaving_bulk_action_mode">ออกจากโหมดการทำงานแบบกลุ่มแล้ว</string>
+  <string name="description_selecting_bulk_action_mode">เลือก %1$s แล้ว</string>
+  <string name="description_unselecting_bulk_action_mode">ยกเลิกการเลือก %1$s แล้ว</string>
+  <string name="description_contact_details">รายละเอียดรายชื่อติดต่อสำหรับ %1$s</string>
+  <string name="description_spam_contact_details">รายละเอียดการติดต่อของผู้โทรที่สงสัยว่าจะเป็นสแปม %1$s</string>
+  <string name="description_num_calls">%1$s สาย</string>
+  <string name="description_video_call"> Hangouts วิดีโอ</string>
+  <string name="description_start_voice_search">เริ่มต้นการค้นหาด้วยเสียง</string>
+  <string name="voicemail">ข้อความเสียง</string>
+  <string name="description_cancel_multi_select">ยกเลิกโหมดการทำงานแบบกลุ่ม</string>
+  <string name="voicemailMultiSelectDeleteConfirm">ลบ</string>
+  <string name="voicemailMultiSelectDeleteCancel">ยกเลิก</string>
+  <string name="voicemailMultiSelectActionBarTitle">เลือกไว้ %1$s รายการ</string>
+  <plurals name="delete_voicemails_confirmation_dialog_title">
+    <item quantity="one"><b>ลบข้อความเสียงนี้ไหม </b></item>
+    <item quantity="other"><b>ลบข้อความเสียงเหล่านี้ไหม </b></item>
+  </plurals>
+  <string name="voicemailCallLogToday">@string/call_log_header_today</string>
+  <string name="voicemailCallLogDateTimeFormat">วันที่ %1$s เวลา %2$s</string>
+  <string name="voicemailDurationFormat">%1$02d:%2$02d</string>
+  <string name="voicemailCallLogDateTimeFormatWithDuration">%1$s • %2$s</string>
+  <string name="voice_search_not_available">การค้นหาด้วยเสียงไม่พร้อมใช้งาน</string>
+  <string name="dialer_hint_find_contact">ค้นหารายชื่อติดต่อ</string>
+  <string name="block_number_search_hint">เพิ่มหมายเลขหรือค้นหาผู้ติดต่อ</string>
+  <string name="call_log_all_empty">ประวัติการโทรว่างเปล่า</string>
+  <string name="call_log_all_empty_action">โทรออก</string>
+  <string name="call_log_missed_empty">คุณไม่มีสายที่ไม่ได้รับ</string>
+  <string name="call_log_voicemail_empty">กล่องข้อความเสียงว่างเปล่า</string>
+  <string name="call_log_activity_title">ประวัติการโทร</string>
+  <string name="call_log_all_title">ทั้งหมด</string>
+  <string name="call_log_missed_title">ไม่ได้รับ</string>
+  <string name="tab_speed_dial">การโทรด่วน</string>
+  <string name="tab_history">ประวัติการโทร</string>
+  <string name="tab_all_contacts">รายชื่อติดต่อ</string>
+  <string name="tab_voicemail">ข้อความเสียง</string>
+  <string name="search_shortcut_call_number">โทร %s</string>
+  <string name="search_shortcut_create_new_contact">สร้างรายชื่อติดต่อใหม่</string>
+  <string name="search_shortcut_add_to_contact">เพิ่มในรายชื่อติดต่อ</string>
+  <string name="search_shortcut_send_sms_message">ส่ง SMS</string>
+  <string name="search_shortcut_make_video_call">ใช้ Hangouts วิดีโอ</string>
+  <string name="search_shortcut_block_number">บล็อกหมายเลข</string>
+  <string name="speed_dial_empty">ยังไม่ได้กำหนดผู้ใดในการโทรด่วน</string>
+  <string name="speed_dial_empty_add_favorite_action">เพิ่มรายการโปรด</string>
+  <string name="remove_contact">ลบ</string>
+  <string name="select_all">เลือกทั้งหมด</string>
+  <string name="call_log_action_video_call"> Hangouts วิดีโอ</string>
+  <string name="call_log_action_set_up_video">ตั้งค่าวิดีโอคอล</string>
+  <string name="call_log_action_invite_video">เชิญเข้าร่วมวิดีโอคอล</string>
+  <string name="call_log_action_send_message">ส่งข้อความ</string>
+  <string name="call_log_action_details">รายละเอียดการโทร</string>
+  <string name="call_log_action_share_voicemail">ส่งไปที่…</string>
+  <string name="call_log_action_call">โทรไปที่ ^1</string>
+  <string name="description_incoming_missed_call">ไม่ได้รับสายจาก ^1, ^2, ^3, ^4</string>
+  <string name="description_incoming_answered_call">รับสายจาก ^1, ^2, ^3, ^4</string>
+  <string name="description_unread_voicemail">ข้อความเสียงที่ยังไม่ได้อ่านจาก ^1 ผ่านทาง^2 เมื่อ ^3 ^4</string>
+  <string name="description_read_voicemail">ข้อความเสียงจาก ^1 ผ่านทาง^2 เมื่อ ^3 ^4</string>
+  <string name="description_outgoing_call">โทรหา ^1, ^2, ^3, ^4</string>
+  <string name="call_log_via_number">ผ่าน %1$s</string>
+  <string name="call_log_via_number_phone_account">%1$s ผ่าน %2$s</string>
+  <string name="description_call_action">โทรไปที่ ^1</string>
+  <string name="description_video_call_action">เรียก Hangouts วิดีโอไปยัง ^1</string>
+  <string name="description_voicemail_action">ฟังข้อความเสียงจาก ^1</string>
+  <string name="description_create_new_contact_action">สร้างรายชื่อติดต่อสำหรับ ^1</string>
+  <string name="description_add_to_existing_contact_action">เพิ่ม ^1 ไปยังรายชื่อติดต่อที่มีอยู่</string>
+  <string name="description_details_action">รายละเอียดการโทรสำหรับ ^1</string>
+  <string name="call_log_header_today">วันนี้</string>
+  <string name="call_log_header_yesterday">เมื่อวานนี้</string>
+  <string name="call_log_header_other">เก่ากว่า</string>
+  <string name="voicemail_speaker_on">เปิดลำโพง</string>
+  <string name="voicemail_speaker_off">ปิดลำโพง</string>
+  <string name="voicemail_play_start_pause">เริ่มหรือหยุดเล่นชั่วคราว</string>
+  <string name="display_options_title">ตัวเลือกการแสดง</string>
+  <string name="sounds_and_vibration_title">เสียงและการสั่น</string>
+  <string name="accessibility_settings_title">การเข้าถึง</string>
+  <string name="ringtone_title">เสียงเรียกเข้า</string>
+  <string name="vibrate_on_ring_title">สั่นเมื่อมีสายเรียกเข้าด้วย</string>
+  <string name="dtmf_tone_enable_title">เสียงปุ่มกด</string>
+  <string name="dtmf_tone_length_title">ความยาวของเสียงปุ่มกด</string>
   <string-array name="dtmf_tone_length_entries">
-    <item msgid="3136353015227162823">"ปกติ"</item>
-    <item msgid="5376841175538523822">"ยาว"</item>
+    <item>ปกติ</item>
+    <item>ยาว</item>
   </string-array>
-    <string name="respond_via_sms_setting_title" msgid="8008181606657693452">"คำตอบด่วน"</string>
-    <string name="call_settings_label" msgid="7824611757200960807">"การโทร"</string>
-    <string name="manage_blocked_numbers_label" msgid="16823761991832273">"การบล็อกสายเรียกเข้า"</string>
-    <string name="voicemail_settings_label" msgid="4594299554519920570">"ข้อความเสียง"</string>
-    <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"การบล็อกสายเรียกเข้าปิดชั่วคราว"</string>
-    <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"ระบบปิดใช้การบล็อกสายเรียกเข้าเนื่องจากคุณติดต่อบริการฉุกเฉินจากโทรศัพท์เครื่องนี้ภายใน 48 ชั่วโมงที่ผ่านมา ระบบจะเปิดใช้ฟีเจอร์นี้อีกครั้งโดยอัตโนมัติเมื่อครบ 48 ชั่วโมง"</string>
-    <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"นำเข้าหมายเลข"</string>
-    <string name="blocked_call_settings_import_description" msgid="1819412052545228965">"ก่อนหน้านี้คุณได้ทำเครื่องหมายว่าให้ส่งผู้โทรบางคนไปยังข้อความเสียงโดยอัตโนมัติผ่านแอปอื่นๆ"</string>
-    <string name="blocked_call_settings_view_numbers_button" msgid="3332727948554356704">"ดูหมายเลข"</string>
-    <string name="blocked_call_settings_import_button" msgid="7319111700387470727">"นำเข้า"</string>
-    <string name="description_blocked_number_list_delete" msgid="2139644216858370740">"เลิกบล็อกหมายเลข"</string>
-    <string name="addBlockedNumber" msgid="3053473735238295551">"เพิ่มหมายเลข"</string>
-    <string name="block_number_footer_message_vvm" msgid="7955326304033982368">"ระบบจะบล็อกสายเรียกเข้าจากหมายเลขเหล่านี้และลบข้อความเสียงโดยอัตโนมัติ"</string>
-    <string name="block_number_footer_message_no_vvm" msgid="1152684139070471665">"ระบบจะบล็อกสายเรียกเข้าจากหมายเลขเหล่านี้ แต่ผู้โทรอาจยังฝากข้อความเสียงถึงคุณได้อยู่"</string>
-    <string name="block_list" msgid="4701585783411870782">"หมายเลขที่ถูกบล็อก"</string>
-    <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g> ถูกบล็อกอยู่แล้ว"</string>
-    <string name="phone_account_settings_label" msgid="8372485478006965920">"บัญชีการโทร"</string>
-    <string name="permission_no_speeddial" msgid="8487215628510596753">"หากต้องการเปิดใช้การโทรด่วน ให้เปิดสิทธิ์เข้าถึงรายชื่อติดต่อ"</string>
-    <string name="permission_no_calllog" msgid="4053705651238775784">"หากต้องการดูประวัติการโทร ให้เปิดสิทธิ์เข้าถึงโทรศัพท์"</string>
-    <string name="permission_no_search" msgid="2424710404207193826">"หากต้องการค้นหารายชื่อติดต่อ ให้เปิดสิทธิ์เข้าถึงรายชื่อติดต่อ"</string>
-    <string name="permission_place_call" msgid="8686908130349369423">"หากต้องการโทรออก ให้เปิดสิทธิ์เข้าถึงโทรศัพท์"</string>
-    <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"แอปโทรศัพท์ไม่ได้รับอนุญาตให้เขียนไปยังการตั้งค่าระบบ"</string>
-    <string name="blocked_number_call_log_label" msgid="4212282846299997693">"ถูกบล็อก"</string>
-    <string name="call_log_action_block_report_number" msgid="7302636538668696729">"บล็อก/รายงานจดหมายขยะ"</string>
-    <string name="call_log_action_block_number" msgid="5048188386501998865">"บล็อกหมายเลข"</string>
-    <string name="call_log_action_remove_spam" msgid="2045319806318398403">"ไม่ใช่จดหมายขยะ"</string>
-    <string name="call_log_action_unblock_number" msgid="6100117033288448758">"เลิกบล็อกหมายเลข"</string>
-    <string name="spam_number_call_log_label" msgid="2678431398326811131">"สแปม"</string>
-    <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> ออฟไลน์อยู่และไม่สามารถติดต่อได้"</string>
-    <string name="about_phone_label" msgid="582991354677973731">"เกี่ยวกับ"</string>
-    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"ถอดเสียงโดย Google"</string>
-    <string name="voicemail_transcription_in_progress" msgid="2933320969613783210">"Google กำลังถอดเสียง..."</string>
-    <string name="voicemail_transcription_failed" msgid="335275303117412706">"การถอดเสียงไม่พร้อมใช้งาน"</string>
-    <string name="voicemail_transcription_failed_language_not_supported" msgid="4210332591050562553">"การถอดเสียงไม่พร้อมใช้งาน ไม่รองรับภาษานี้"</string>
-    <string name="voicemail_transcription_failed_no_speech" msgid="9093372879697874852">"การถอดเสียงไม่พร้อมใช้งาน ไม่พบเสียง"</string>
-    <string name="view_conversation" msgid="7895904782094119702">"ดู"</string>
-    <string name="ec_data_deleted" msgid="4794880345545827107">"ลบการโทรแล้ว ดูและลบไฟล์แนบที่แชร์ระหว่างการโทรนี้ใน Messages"</string>
-    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"ลบการโทรแล้ว ดูและลบไฟล์แนบที่แชร์ระหว่างการโทรใน Messages"</string>
+  <string name="respond_via_sms_setting_title">คำตอบด่วน</string>
+  <string name="call_settings_label">การโทร</string>
+  <string name="manage_blocked_numbers_label">หมายเลขที่ถูกบล็อก</string>
+  <string name="voicemail_settings_label">ข้อความเสียง</string>
+  <string name="blocked_numbers_disabled_emergency_header_label">การบล็อกสายเรียกเข้าปิดชั่วคราว</string>
+  <string name="blocked_numbers_disabled_emergency_desc">ระบบปิดใช้การบล็อกสายเรียกเข้าเนื่องจากคุณติดต่อบริการฉุกเฉินจากโทรศัพท์เครื่องนี้ภายใน 48 ชั่วโมงที่ผ่านมา ระบบจะเปิดใช้ฟีเจอร์นี้อีกครั้งโดยอัตโนมัติเมื่อครบ 48 ชั่วโมง</string>
+  <string name="import_send_to_voicemail_numbers_label">นำเข้าหมายเลข</string>
+  <string name="blocked_call_settings_import_description">ก่อนหน้านี้คุณได้ทำเครื่องหมายว่าให้ส่งผู้โทรบางคนไปยังข้อความเสียงโดยอัตโนมัติผ่านแอปอื่นๆ</string>
+  <string name="blocked_call_settings_view_numbers_button">ดูหมายเลข</string>
+  <string name="blocked_call_settings_import_button">นำเข้า</string>
+  <string name="description_blocked_number_list_delete">เลิกบล็อกหมายเลข</string>
+  <string name="addBlockedNumber">เพิ่มหมายเลข</string>
+  <string name="block_number_footer_message_vvm">ระบบจะบล็อกสายเรียกเข้าจากหมายเลขเหล่านี้และลบข้อความเสียงโดยอัตโนมัติ</string>
+  <string name="block_number_footer_message_no_vvm">ระบบจะบล็อกสายเรียกเข้าจากหมายเลขเหล่านี้ แต่ผู้โทรอาจยังฝากข้อความเสียงถึงคุณได้อยู่</string>
+  <string name="block_list">หมายเลขที่ถูกบล็อก</string>
+  <string name="alreadyBlocked">%1$s ถูกบล็อกอยู่แล้ว</string>
+  <string name="phone_account_settings_label">บัญชีการโทร</string>
+  <string name="permission_no_speeddial">หากต้องการเปิดใช้การโทรด่วน ให้เปิดสิทธิ์เข้าถึงรายชื่อติดต่อ</string>
+  <string name="permission_no_calllog">หากต้องการดูประวัติการโทร ให้เปิดสิทธิ์เข้าถึงโทรศัพท์</string>
+  <string name="permission_no_search">หากต้องการค้นหารายชื่อติดต่อ ให้เปิดสิทธิ์เข้าถึงรายชื่อติดต่อ</string>
+  <string name="permission_place_call">หากต้องการโทรออก ให้เปิดสิทธิ์เข้าถึงโทรศัพท์</string>
+  <string name="toast_cannot_write_system_settings">แอปโทรศัพท์ไม่ได้รับอนุญาตให้เขียนไปยังการตั้งค่าระบบ</string>
+  <string name="blocked_number_call_log_label">ถูกบล็อก</string>
+  <string name="call_log_action_block_report_number">บล็อก/รายงานจดหมายขยะ</string>
+  <string name="call_log_action_block_number">บล็อกหมายเลข</string>
+  <string name="call_log_action_remove_spam">ไม่ใช่จดหมายขยะ</string>
+  <string name="call_log_action_unblock_number">เลิกบล็อกหมายเลข</string>
+  <string name="spam_number_call_log_label">สแปม</string>
+  <string name="call_composer_connection_failed">%1$s ออฟไลน์อยู่และไม่สามารถติดต่อได้</string>
+  <string name="about_phone_label">เกี่ยวกับ</string>
+  <string name="voicemail_transcription_branding_text">ถอดเสียงโดย Google</string>
+  <string name="voicemail_transcription_in_progress">กำลังถอดเสียง…</string>
+  <string name="voicemail_transcription_failed">การถอดเสียงไม่พร้อมใช้งาน</string>
+  <string name="voicemail_transcription_failed_language_not_supported">การถอดเสียงไม่พร้อมใช้งาน ไม่รองรับภาษานี้</string>
+  <string name="voicemail_transcription_failed_no_speech">การถอดเสียงไม่พร้อมใช้งาน ไม่พบเสียง</string>
+  <string name="voicemail_donation_promo_title">ต้องการช่วยปรับปรุงความถูกต้องของการถอดเสียงใช่ไหม</string>
+  <string name="voicemail_donation_promo_content">ให้ Google ตรวจสอบข้อความเสียงนี้และข้อความอื่นๆ ในอนาคตด้วยการถอดเสียง ระบบจะจัดเก็บข้อมูลไว้โดยไม่ระบุชื่อ ซึ่งคุณสามารถเปลี่ยนแปลงการตั้งค่าได้ทุกเมื่อ%1$s</string>
+  <string name="voicemail_donation_promo_opt_in">ได้สิ ตกลง</string>
+  <string name="voicemail_donation_promo_opt_out">ไม่เป็นไร</string>
+  <string name="voicemail_transcription_rating">ให้คะแนนคุณภาพการถอดเสียง</string>
+  <string name="voicemail_transcription_rating_thanks">ขอขอบคุณสำหรับความคิดเห็นของคุณ</string>
+  <string name="description_rating_good">ชอบ</string>
+  <string name="description_rating_bad">ไม่ชอบ</string>
+  <string name="view_conversation">ดู</string>
+  <string name="ec_data_deleted">ลบการโทรแล้ว ดูและลบไฟล์แนบที่แชร์ระหว่างการโทรนี้ใน Messages</string>
+  <string name="multiple_ec_data_deleted">ลบการโทรแล้ว ดูและลบไฟล์แนบที่แชร์ระหว่างการโทรใน Messages</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-tl/strings.xml b/java/com/android/dialer/app/res/values-tl/strings.xml
index 56dc189..b349c7f 100644
--- a/java/com/android/dialer/app/res/values-tl/strings.xml
+++ b/java/com/android/dialer/app/res/values-tl/strings.xml
@@ -1,179 +1,171 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="applicationLabel" msgid="2202739481132958990">"Telepono"</string>
-    <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"Keypad ng Telepono"</string>
-    <string name="callHistoryIconLabel" msgid="7493268743411968630">"History ng tawag"</string>
-    <string name="action_copy_number_text" msgid="832682558551502319">"Kopyahin ang numero"</string>
-    <string name="copy_transcript_text" msgid="937904189017310829">"Kopyahin ang transkripsyon"</string>
-    <string name="action_edit_number_before_call" msgid="8017492815878473837">"I-edit ang numero bago tumawag"</string>
-    <string name="call_log_delete_all" msgid="7852970926906523784">"I-clear ang history ng tawag"</string>
-    <string name="call_log_trash_voicemail" msgid="6118493534178533972">"I-delete ang voicemail"</string>
-    <string name="snackbar_voicemail_deleted" msgid="7463166543725496307">"Na-delete voicemail"</string>
-    <string name="snackbar_voicemail_deleted_undo" msgid="6959743982796409941">"I-UNDO"</string>
-    <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"I-clear ang history ng tawag?"</string>
-    <string name="clearCallLogConfirmation" msgid="6844949465815109166">"Idi-delete nito ang lahat ng tawag mula sa iyong history"</string>
-    <string name="clearCallLogProgress_title" msgid="995004835687361977">"Kini-clear ang history ng tawag…"</string>
-    <string name="notification_missedCallTitle" msgid="8283366068539898486">"Hindi nasagot na tawag"</string>
-    <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"Hindi nasagot na tawag sa trabaho"</string>
-    <string name="notification_missedCallsTitle" msgid="3697442015345089802">"Mga hindi nasagot na tawag"</string>
-    <string name="notification_missedCallsMsg" msgid="8176217633929018706">"<xliff:g id="NUM_MISSED_CALLS">%d</xliff:g> (na) hindi nasagot na tawag"</string>
-    <string name="notification_missedCall_call_back" msgid="3875698110051973965">"Tawagan"</string>
-    <string name="notification_missedCall_message" msgid="5086910028988305964">"Mensahe"</string>
-    <string name="post_call_notification_message" msgid="5417476789860590611">"<xliff:g id="NAME">%1$s</xliff:g>: <xliff:g id="MESSAGE">%2$s</xliff:g>"</string>
-    <string name="notification_voicemail_text_format" msgid="1895667520930252897">"I-dial ang <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
-    <string name="notification_voicemail_no_vm_number" msgid="8942821987929495842">"Hindi kilala ang numero ng voicemail"</string>
-    <plurals name="notification_voicemail_title" formatted="false" msgid="1551847434476438657">
-      <item quantity="one"> <xliff:g id="COUNT">%1$d</xliff:g> Voicemail </item>
-      <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> na Voicemail </item>
-    </plurals>
-    <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
-    <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"Bagong voicemail mula kay <xliff:g id="CALLER">%1$s</xliff:g>"</string>
-    <string name="voicemail_playback_error" msgid="4384373852257757295">"Hindi ma-play ang voicemail"</string>
-    <string name="voicemail_fetching_content" msgid="572320120918636014">"Nilo-load ang voicemail…"</string>
-    <string name="voicemail_fetching_timout" msgid="2128873915839949783">"Hindi ma-load ang voicemail"</string>
-    <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_playback_speakerphone" msgid="4852027754869750227">"I-on o i-off ang speakerphone"</string>
-    <string name="description_playback_seek" msgid="1340910573254132520">"Hanapin ang posisyon ng playback"</string>
-    <string name="action_menu_call_history_description" msgid="8829135306925008546">"History ng tawag"</string>
-    <string name="action_menu_overflow_description" msgid="7648679686746517341">"Higit pang mga pagpipilian"</string>
-    <string name="action_menu_dialpad_button" msgid="1970631633457493180">"keypad"</string>
-    <string name="dialer_settings_label" msgid="4980176284150290175">"Mga Setting"</string>
-    <string name="simulator_submenu_label" msgid="186156287346615267">"Simulator"</string>
-    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Gawa ng Shortcut ng Bagong UI"</string>
-    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"Pumapasok sa bulk action mode"</string>
-    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"Umalis sa bulk action mode"</string>
-    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"Napili <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"Inalis sa pagkakapili <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_contact_details" msgid="3341280873855253464">"Mga detalye sa pakikipag-ugnayan para kay/sa <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_spam_contact_details" msgid="5592578752881528368">"Mga detalye sa pakikipag-ugnayan para sa pinaghihinalaang spam na tumatawag<xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> (na) tawag."</string>
-    <string name="description_video_call" msgid="3738199365585751727">"Video call."</string>
-    <string name="description_start_voice_search" msgid="8380022725973015261">"Simulan ang paghahanap gamit ang boses"</string>
-    <string name="voicemail" msgid="8899540969000957954">"Voicemail"</string>
-    <string name="description_cancel_multi_select" msgid="3930475950253360461">"Kanselahin ang batch actions mode"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"I-delete"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Kanselahin"</string>
-    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> ang napili"</string>
-    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
-      <item quantity="one">"<b>"I-delete ang mga voicemail na ito? "</b>"</item>
-      <item quantity="other">"<b>"I-delete ang mga voicemail na ito? "</b>"</item>
-    </plurals>
-    <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
-    <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> ng <xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
-    <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="voice_search_not_available" msgid="6546240433719732905">"Hindi available ang paghahanap gamit ang boses"</string>
-    <string name="dialer_hint_find_contact" msgid="2023214799381149808">"Maghanap ng mga contact"</string>
-    <string name="block_number_search_hint" msgid="5377706079015099416">"Magdagdag ng numero, maghanap sa contact"</string>
-    <string name="call_log_all_empty" msgid="3955572868518162004">"Walang laman ang iyong history ng tawag"</string>
-    <string name="call_log_all_empty_action" msgid="852218280136243014">"Tumawag"</string>
-    <string name="call_log_missed_empty" msgid="7094936030845062214">"Wala kang mga hindi nasagot na tawag."</string>
-    <string name="call_log_voicemail_empty" msgid="273623903423275178">"Walang laman ang iyong voicemail inbox."</string>
-    <string name="call_log_activity_title" msgid="1275242727244945527">"History ng Tawag"</string>
-    <string name="call_log_all_title" msgid="6042262422192020327">"Lahat"</string>
-    <string name="call_log_missed_title" msgid="17254005889268015">"Di nasagot"</string>
-    <string name="tab_speed_dial" msgid="6616404752227561075">"Speed dial"</string>
-    <string name="tab_history" msgid="7420269368689503596">"History ng Tawag"</string>
-    <string name="tab_all_contacts" msgid="5531733977693943015">"Mga Contact"</string>
-    <string name="tab_voicemail" msgid="2458548090088316246">"Voicemail"</string>
-    <string name="search_shortcut_call_number" msgid="8847918845036880688">"Tumawag sa <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"Gumawa ng bagong contact"</string>
-    <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"Idagdag sa isang contact"</string>
-    <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"Magpadala ng SMS"</string>
-    <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"Gumawa ng video call"</string>
-    <string name="search_shortcut_block_number" msgid="4587283230665805776">"I-block ang numero"</string>
-    <string name="speed_dial_empty" msgid="3346406399966039505">"Wala pang tao sa iyong speed dial"</string>
-    <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"Magdagdag ng paborito"</string>
-    <string name="remove_contact" msgid="2353580570488923668">"Alisin"</string>
-    <string name="select_all" msgid="408601760696146245">"Piliin lahat"</string>
-    <string name="call_log_action_video_call" msgid="7565549950343850819">"Mag-video call"</string>
-    <string name="call_log_action_send_message" msgid="6948727362660115554">"Magpadala ng mensahe"</string>
-    <string name="call_log_action_details" msgid="2091370737371449501">"Mga detalye ng tawag"</string>
-    <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"Ibahagi sa …"</string>
-    <string name="call_log_action_call" msgid="682724094251540583">"Tawagan ang/si <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_incoming_missed_call" msgid="8292535799379230029">"Hindi nasagot na tawag mula kay/sa <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_incoming_answered_call" msgid="3920182963103160610">"Nasagot na tawag mula kay/sa <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_unread_voicemail" msgid="145170985013419170">"Hindi pa nababasang voicemail mula sa/kay <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_read_voicemail" msgid="5585559881573227732">"Voicemail mula sa/kay <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_outgoing_call" msgid="543952487882919924">"Tawag kay/sa <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="call_log_via_number" msgid="1340307109806397650">"sa pamamagitan ng <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> sa pamamagitan ng <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="description_call_action" msgid="4042796498169106545">"Tawagan ang/si <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_video_call_action" msgid="1237090968588659650">"I-video call si/ang <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
-    <string name="description_voicemail_action" msgid="3290143432403538524">"Makinig sa voicemail mula sa/kay <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_create_new_contact_action" msgid="1928282350281564130">"Gumawa ng contact para kay/sa <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"Idagdag si/ang <xliff:g id="NAMEORNUMBER">^1</xliff:g> sa umiiral nang contact"</string>
-    <string name="description_details_action" msgid="2061866409737706174">"Mga detalye ng tawag para sa/kay <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="call_log_header_today" msgid="1576119097475845293">"Ngayon"</string>
-    <string name="call_log_header_yesterday" msgid="5616077776205329563">"Kahapon"</string>
-    <string name="call_log_header_other" msgid="4940676886254217644">"Mas Luma"</string>
-    <string name="voicemail_speaker_on" msgid="3151333608926996668">"I-on ang speaker."</string>
-    <string name="voicemail_speaker_off" msgid="2530064206962034201">"I-off ang speaker."</string>
-    <string name="voicemail_play_start_pause" msgid="3874823480278334664">"Simulan o i-pause ang pag-playback."</string>
-    <string name="display_options_title" msgid="3880091801055797975">"Mga display option"</string>
-    <string name="sounds_and_vibration_title" msgid="3075050000721181384">"Tunog at pag-vibrate"</string>
-    <string name="accessibility_settings_title" msgid="3329027650429831820">"Pagiging Naa-access"</string>
-    <string name="ringtone_title" msgid="8377174189894648486">"Ringtone ng telepono"</string>
-    <string name="vibrate_on_ring_title" msgid="631441314790960485">"Mag-vibrate din para sa tawag"</string>
-    <string name="dtmf_tone_enable_title" msgid="3273762431523939277">"Mga tunog ng keypad"</string>
-    <string name="dtmf_tone_length_title" msgid="534096029202438539">"Haba ng tunog ng keypad"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="applicationLabel">Telepono</string>
+  <string name="launcherDialpadActivityLabel">Keypad ng Telepono</string>
+  <string name="callHistoryIconLabel">History ng tawag</string>
+  <string name="action_copy_number_text">Kopyahin ang numero</string>
+  <string name="copy_transcript_text">Kopyahin ang transkripsyon</string>
+  <string name="action_edit_number_before_call">I-edit ang numero bago tumawag</string>
+  <string name="call_log_delete_all">I-clear ang history ng tawag</string>
+  <string name="call_log_trash_voicemail">I-delete ang voicemail</string>
+  <string name="snackbar_voicemail_deleted">Na-delete voicemail</string>
+  <string name="clearCallLogConfirmation_title">I-clear ang history ng tawag?</string>
+  <string name="clearCallLogConfirmation">Idi-delete nito ang lahat ng tawag mula sa iyong history</string>
+  <string name="clearCallLogProgress_title">Kini-clear ang history ng tawag…</string>
+  <string name="notification_missedCallTitle">Hindi nasagot na tawag</string>
+  <string name="notification_missedWorkCallTitle">Hindi nasagot na tawag sa trabaho</string>
+  <string name="notification_missedCallsTitle">Mga hindi nasagot na tawag</string>
+  <string name="notification_missedCallsMsg">%d (na) hindi nasagot na tawag</string>
+  <string name="notification_missedCall_call_back">Tawagan</string>
+  <string name="notification_missedCall_message">Mensahe</string>
+  <string name="post_call_notification_message">%1$s: %2$s</string>
+  <string name="notification_voicemail_text_format">I-dial ang %s</string>
+  <string name="notification_voicemail_no_vm_number">Hindi kilala ang numero ng voicemail</string>
+  <plurals name="notification_voicemail_title">
+    <item quantity="one"> %1$d Voicemail </item>
+    <item quantity="other"> %1$d na Voicemail </item>
+  </plurals>
+  <string name="notification_voicemail_callers_list">%1$s, %2$s</string>
+  <string name="notification_new_voicemail_ticker">Bagong voicemail mula kay %1$s</string>
+  <string name="voicemail_playback_error">Hindi ma-play ang voicemail</string>
+  <string name="voicemail_fetching_content">Nilo-load ang voicemail…</string>
+  <string name="voicemail_fetching_timout">Hindi ma-load ang voicemail</string>
+  <string name="call_log_item_count_and_date">(%1$d) %2$s</string>
+  <string name="description_playback_speakerphone">I-on o i-off ang speakerphone</string>
+  <string name="description_playback_seek">Hanapin ang posisyon ng playback</string>
+  <string name="action_menu_call_history_description">History ng tawag</string>
+  <string msgid="2295659037509008453" name="action_menu_overflow_description">Higit pang mga pagpipilian</string>
+  <string name="action_menu_dialpad_button">keypad</string>
+  <string name="dialer_settings_label">Mga Setting</string>
+  <string name="simulator_submenu_label">Simulator</string>
+  <string name="new_ui_launcher_shortcut_label">Gawa ng Shortcut ng Bagong UI</string>
+  <string name="description_entering_bulk_action_mode">Pumapasok sa bulk action mode</string>
+  <string name="description_leaving_bulk_action_mode">Umalis sa bulk action mode</string>
+  <string name="description_selecting_bulk_action_mode">Napili %1$s</string>
+  <string name="description_unselecting_bulk_action_mode">Inalis sa pagkakapili %1$s</string>
+  <string name="description_contact_details">Mga detalye sa pakikipag-ugnayan para kay/sa %1$s</string>
+  <string name="description_spam_contact_details">Mga detalye sa pakikipag-ugnayan para sa pinaghihinalaang spam na tumatawag%1$s</string>
+  <string name="description_num_calls">%1$s (na) tawag.</string>
+  <string name="description_video_call">Video call.</string>
+  <string name="description_start_voice_search">Simulan ang paghahanap gamit ang boses</string>
+  <string name="voicemail">Voicemail</string>
+  <string name="description_cancel_multi_select">Kanselahin ang batch actions mode</string>
+  <string name="voicemailMultiSelectDeleteConfirm">I-delete</string>
+  <string name="voicemailMultiSelectDeleteCancel">Kanselahin</string>
+  <string name="voicemailMultiSelectActionBarTitle">%1$s ang napili</string>
+  <plurals name="delete_voicemails_confirmation_dialog_title">
+    <item quantity="one"><b>I-delete ang mga voicemail na ito? </b></item>
+    <item quantity="other"><b>I-delete ang mga voicemail na ito? </b></item>
+  </plurals>
+  <string name="voicemailCallLogToday">@string/call_log_header_today</string>
+  <string name="voicemailCallLogDateTimeFormat">%1$s ng %2$s</string>
+  <string name="voicemailDurationFormat">%1$02d:%2$02d</string>
+  <string name="voicemailCallLogDateTimeFormatWithDuration">%1$s • %2$s</string>
+  <string name="voice_search_not_available">Hindi available ang paghahanap gamit ang boses</string>
+  <string name="dialer_hint_find_contact">Maghanap ng mga contact</string>
+  <string name="block_number_search_hint">Magdagdag ng numero, maghanap sa contact</string>
+  <string name="call_log_all_empty">Walang laman ang iyong history ng tawag</string>
+  <string name="call_log_all_empty_action">Tumawag</string>
+  <string name="call_log_missed_empty">Wala kang mga hindi nasagot na tawag.</string>
+  <string name="call_log_voicemail_empty">Walang laman ang iyong voicemail inbox.</string>
+  <string name="call_log_activity_title">History ng Tawag</string>
+  <string name="call_log_all_title">Lahat</string>
+  <string name="call_log_missed_title">Di nasagot</string>
+  <string name="tab_speed_dial">Speed dial</string>
+  <string name="tab_history">History ng Tawag</string>
+  <string name="tab_all_contacts">Mga Contact</string>
+  <string name="tab_voicemail">Voicemail</string>
+  <string name="search_shortcut_call_number">Tumawag sa %s</string>
+  <string name="search_shortcut_create_new_contact">Gumawa ng bagong contact</string>
+  <string name="search_shortcut_add_to_contact">Idagdag sa isang contact</string>
+  <string name="search_shortcut_send_sms_message">Magpadala ng SMS</string>
+  <string name="search_shortcut_make_video_call">Gumawa ng video call</string>
+  <string name="search_shortcut_block_number">I-block ang numero</string>
+  <string name="speed_dial_empty">Wala pang tao sa iyong speed dial</string>
+  <string name="speed_dial_empty_add_favorite_action">Magdagdag ng paborito</string>
+  <string name="remove_contact">Alisin</string>
+  <string name="select_all">Piliin lahat</string>
+  <string name="call_log_action_video_call">Mag-video call</string>
+  <string name="call_log_action_set_up_video">Mag-set up ng pag-video call</string>
+  <string name="call_log_action_invite_video">Imbitahan sa video call</string>
+  <string name="call_log_action_send_message">Magpadala ng mensahe</string>
+  <string name="call_log_action_details">Mga detalye ng tawag</string>
+  <string name="call_log_action_share_voicemail">Ibahagi sa …</string>
+  <string name="call_log_action_call">Tawagan ang/si ^1</string>
+  <string name="description_incoming_missed_call">Hindi nasagot na tawag mula kay/sa ^1, ^2, ^3, ^4.</string>
+  <string name="description_incoming_answered_call">Nasagot na tawag mula kay/sa ^1, ^2, ^3, ^4.</string>
+  <string name="description_unread_voicemail">Hindi pa nababasang voicemail mula sa/kay ^1, ^2, ^3, ^4.</string>
+  <string name="description_read_voicemail">Voicemail mula sa/kay ^1, ^2, ^3, ^4.</string>
+  <string name="description_outgoing_call">Tawag kay/sa ^1, ^2, ^3, ^4.</string>
+  <string name="call_log_via_number">sa pamamagitan ng %1$s</string>
+  <string name="call_log_via_number_phone_account">%1$s sa pamamagitan ng %2$s</string>
+  <string name="description_call_action">Tawagan ang/si ^1</string>
+  <string name="description_video_call_action">I-video call si/ang ^1.</string>
+  <string name="description_voicemail_action">Makinig sa voicemail mula sa/kay ^1</string>
+  <string name="description_create_new_contact_action">Gumawa ng contact para kay/sa ^1</string>
+  <string name="description_add_to_existing_contact_action">Idagdag si/ang ^1 sa umiiral nang contact</string>
+  <string name="description_details_action">Mga detalye ng tawag para sa/kay ^1</string>
+  <string name="call_log_header_today">Ngayon</string>
+  <string name="call_log_header_yesterday">Kahapon</string>
+  <string name="call_log_header_other">Mas Luma</string>
+  <string name="voicemail_speaker_on">I-on ang speaker.</string>
+  <string name="voicemail_speaker_off">I-off ang speaker.</string>
+  <string name="voicemail_play_start_pause">Simulan o i-pause ang pag-playback.</string>
+  <string name="display_options_title">Mga display option</string>
+  <string name="sounds_and_vibration_title">Tunog at pag-vibrate</string>
+  <string name="accessibility_settings_title">Pagiging Naa-access</string>
+  <string name="ringtone_title">Ringtone ng telepono</string>
+  <string name="vibrate_on_ring_title">Mag-vibrate din para sa tawag</string>
+  <string name="dtmf_tone_enable_title">Mga tunog ng keypad</string>
+  <string name="dtmf_tone_length_title">Haba ng tunog ng keypad</string>
   <string-array name="dtmf_tone_length_entries">
-    <item msgid="3136353015227162823">"Normal"</item>
-    <item msgid="5376841175538523822">"Mahaba"</item>
+    <item>Normal</item>
+    <item>Mahaba</item>
   </string-array>
-    <string name="respond_via_sms_setting_title" msgid="8008181606657693452">"Mga mabilisang tugon"</string>
-    <string name="call_settings_label" msgid="7824611757200960807">"Mga Tawag"</string>
-    <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Pagba-block ng tawag"</string>
-    <string name="voicemail_settings_label" msgid="4594299554519920570">"Voicemail"</string>
-    <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Pansamantalang na-off ang call blocking"</string>
-    <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Na-disable ang pagba-block ng tawag dahil nakipag-ugnayan ka sa mga pang-emergency na serbisyo mula sa teleponong ito sa nakalipas na 48 oras. Awtomatiko itong muling i-enable kapag nag-expire na ang 48 oras."</string>
-    <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"I-import ang mga numero"</string>
-    <string name="blocked_call_settings_import_description" msgid="1819412052545228965">"Minarkahan mo na dati ang ilang tumatawag na awtomatikong ipadala sa voicemail sa pamamagitan ng iba pang mga app."</string>
-    <string name="blocked_call_settings_view_numbers_button" msgid="3332727948554356704">"Tingnan ang Numero"</string>
-    <string name="blocked_call_settings_import_button" msgid="7319111700387470727">"I-import"</string>
-    <string name="description_blocked_number_list_delete" msgid="2139644216858370740">"Alisin sa pagkaka-block ang numero"</string>
-    <string name="addBlockedNumber" msgid="3053473735238295551">"Magdagdag ng numero"</string>
-    <string name="block_number_footer_message_vvm" msgid="7955326304033982368">"Iba-block ang mga tawag mula sa mga numerong ito at awtomatikong ide-delete ang mga voicemail."</string>
-    <string name="block_number_footer_message_no_vvm" msgid="1152684139070471665">"Iba-block ang mga tawag mula sa numerong ito, ngunit makakapag-iwan pa rin sila sa iyo ng mga voicemail."</string>
-    <string name="block_list" msgid="4701585783411870782">"Mga naka-block na numero"</string>
-    <string name="alreadyBlocked" msgid="5483253180532475653">"Naka-block na ang <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="phone_account_settings_label" msgid="8372485478006965920">"Account sa pagtawag"</string>
-    <string name="permission_no_speeddial" msgid="8487215628510596753">"Upang i-enable ang speed dial, i-on ang pahintulot ng Mga Contact."</string>
-    <string name="permission_no_calllog" msgid="4053705651238775784">"Upang makita ang iyong log ng tawag, i-on ang pahintulot ng Telepono."</string>
-    <string name="permission_no_search" msgid="2424710404207193826">"Upang hanapin ang iyong mga contact, i-on ang mga pahintulot sa Mga Contact."</string>
-    <string name="permission_place_call" msgid="8686908130349369423">"Upang tumawag, i-on ang pahintulot ng Telepono."</string>
-    <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"Walang pahintulot ang app ng Telepono na mag-write sa mga setting ng system."</string>
-    <string name="blocked_number_call_log_label" msgid="4212282846299997693">"Naka-block"</string>
-    <string name="call_log_action_block_report_number" msgid="7302636538668696729">"I-block/iulat ang spam"</string>
-    <string name="call_log_action_block_number" msgid="5048188386501998865">"I-block ang numero"</string>
-    <string name="call_log_action_remove_spam" msgid="2045319806318398403">"Hindi spam"</string>
-    <string name="call_log_action_unblock_number" msgid="6100117033288448758">"Alisin sa pagkaka-block ang numero"</string>
-    <string name="spam_number_call_log_label" msgid="2678431398326811131">"Spam"</string>
-    <string name="call_composer_connection_failed" msgid="6776461585447831242">"Offline si <xliff:g id="NAME">%1$s</xliff:g> at hindi makontak"</string>
-    <string name="about_phone_label" msgid="582991354677973731">"Tungkol dito"</string>
-    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Na-transcribe ng Google"</string>
-    <string name="voicemail_transcription_in_progress" msgid="2933320969613783210">"Nagta-transcribe ang Google…"</string>
-    <string name="voicemail_transcription_failed" msgid="335275303117412706">"Hindi available ang transcript."</string>
-    <string name="voicemail_transcription_failed_language_not_supported" msgid="4210332591050562553">"Hindi available ang transcript. Hindi sinusuportahan ang wika."</string>
-    <string name="voicemail_transcription_failed_no_speech" msgid="9093372879697874852">"Hindi available ang transcript. Walang na-detect na pagsasalita."</string>
-    <string name="view_conversation" msgid="7895904782094119702">"Tingnan"</string>
-    <string name="ec_data_deleted" msgid="4794880345545827107">"Dinelete ang tawag. Tingnan at i-delete ang mga attachment na ibinahagi sa tawag na ito sa Messages."</string>
-    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"Dinelete ang mga tawag. Tingnan at i-delete ang mga attachment na ibinahagi sa mga tawag sa Messages."</string>
+  <string name="respond_via_sms_setting_title">Mga mabilisang tugon</string>
+  <string name="call_settings_label">Mga Tawag</string>
+  <string name="manage_blocked_numbers_label">Mga naka-block na numero</string>
+  <string name="voicemail_settings_label">Voicemail</string>
+  <string name="blocked_numbers_disabled_emergency_header_label">Pansamantalang na-off ang call blocking</string>
+  <string name="blocked_numbers_disabled_emergency_desc">Na-disable ang pagba-block ng tawag dahil nakipag-ugnayan ka sa mga pang-emergency na serbisyo mula sa teleponong ito sa nakalipas na 48 oras. Awtomatiko itong muling i-enable kapag nag-expire na ang 48 oras.</string>
+  <string name="import_send_to_voicemail_numbers_label">I-import ang mga numero</string>
+  <string name="blocked_call_settings_import_description">Minarkahan mo na dati ang ilang tumatawag na awtomatikong ipadala sa voicemail sa pamamagitan ng iba pang mga app.</string>
+  <string name="blocked_call_settings_view_numbers_button">Tingnan ang Numero</string>
+  <string name="blocked_call_settings_import_button">I-import</string>
+  <string name="description_blocked_number_list_delete">I-unblock ang numero</string>
+  <string name="addBlockedNumber">Magdagdag ng numero</string>
+  <string name="block_number_footer_message_vvm">Iba-block ang mga tawag mula sa mga numerong ito at awtomatikong ide-delete ang mga voicemail.</string>
+  <string name="block_number_footer_message_no_vvm">Iba-block ang mga tawag mula sa numerong ito, ngunit makakapag-iwan pa rin sila sa iyo ng mga voicemail.</string>
+  <string name="block_list">Mga naka-block na numero</string>
+  <string name="alreadyBlocked">Naka-block na ang %1$s</string>
+  <string name="phone_account_settings_label">Account sa pagtawag</string>
+  <string name="permission_no_speeddial">Upang i-enable ang speed dial, i-on ang pahintulot ng Mga Contact.</string>
+  <string name="permission_no_calllog">Upang makita ang iyong log ng tawag, i-on ang pahintulot ng Telepono.</string>
+  <string name="permission_no_search">Upang hanapin ang iyong mga contact, i-on ang mga pahintulot sa Mga Contact.</string>
+  <string name="permission_place_call">Upang tumawag, i-on ang pahintulot ng Telepono.</string>
+  <string name="toast_cannot_write_system_settings">Walang pahintulot ang app ng Telepono na mag-write sa mga setting ng system.</string>
+  <string name="blocked_number_call_log_label">Naka-block</string>
+  <string name="call_log_action_block_report_number">I-block/iulat ang spam</string>
+  <string name="call_log_action_block_number">I-block ang numero</string>
+  <string name="call_log_action_remove_spam">Hindi spam</string>
+  <string name="call_log_action_unblock_number">I-unblock ang numero</string>
+  <string name="spam_number_call_log_label">Spam</string>
+  <string name="call_composer_connection_failed">Offline si %1$s at hindi makontak</string>
+  <string name="about_phone_label">Tungkol dito</string>
+  <string name="voicemail_transcription_branding_text">Na-transcribe ng Google</string>
+  <string name="voicemail_transcription_in_progress">Tina-transcribe…</string>
+  <string name="voicemail_transcription_failed">Hindi available ang transcript.</string>
+  <string name="voicemail_transcription_failed_language_not_supported">Hindi available ang transcript. Hindi sinusuportahan ang wika.</string>
+  <string name="voicemail_transcription_failed_no_speech">Hindi available ang transcript. Walang na-detect na pagsasalita.</string>
+  <string name="voicemail_donation_promo_title">Tulungang pagandahin ang katumpakan ng transkripsyon?</string>
+  <string name="voicemail_donation_promo_content">Hayaang suriin ito ng Google at ang mga darating na mensahe sa voicemail na may mga transcript. Ang mga ito ay ii-store nang anonymous. Baguhin ang Mga Setting anumang oras. %1$s</string>
+  <string name="voicemail_donation_promo_opt_in">Oo, sali ako</string>
+  <string name="voicemail_donation_promo_opt_out">Hindi, salamat</string>
+  <string name="voicemail_transcription_rating">I-rate ang transkripsyon</string>
+  <string name="voicemail_transcription_rating_thanks">Salamat sa iyong feedback</string>
+  <string name="description_rating_good">I-like</string>
+  <string name="description_rating_bad">I-dislike</string>
+  <string name="view_conversation">Tingnan</string>
+  <string name="ec_data_deleted">Dinelete ang tawag. Tingnan at i-delete ang mga attachment na ibinahagi sa tawag na ito sa Messages.</string>
+  <string name="multiple_ec_data_deleted">Dinelete ang mga tawag. Tingnan at i-delete ang mga attachment na ibinahagi sa mga tawag sa Messages.</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-tr/strings.xml b/java/com/android/dialer/app/res/values-tr/strings.xml
index 48e293b..a3d0799 100644
--- a/java/com/android/dialer/app/res/values-tr/strings.xml
+++ b/java/com/android/dialer/app/res/values-tr/strings.xml
@@ -1,179 +1,171 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="applicationLabel" msgid="2202739481132958990">"Telefon"</string>
-    <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"Telefon Tuş Takımı"</string>
-    <string name="callHistoryIconLabel" msgid="7493268743411968630">"Çağrı geçmişi"</string>
-    <string name="action_copy_number_text" msgid="832682558551502319">"Numarayı kopyala"</string>
-    <string name="copy_transcript_text" msgid="937904189017310829">"Çeviri yazıyı kopyala"</string>
-    <string name="action_edit_number_before_call" msgid="8017492815878473837">"Telefon etmeden önce numarayı düzenle"</string>
-    <string name="call_log_delete_all" msgid="7852970926906523784">"Çağrı geçmişini temizle"</string>
-    <string name="call_log_trash_voicemail" msgid="6118493534178533972">"Sesli mesajı sil"</string>
-    <string name="snackbar_voicemail_deleted" msgid="7463166543725496307">"Sesli mesaj silindi"</string>
-    <string name="snackbar_voicemail_deleted_undo" msgid="6959743982796409941">"GERİ AL"</string>
-    <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"Çağrı geçmişi temizlensin mi?"</string>
-    <string name="clearCallLogConfirmation" msgid="6844949465815109166">"Bu işlem, geçmişinizdeki tüm çağrıları silecek"</string>
-    <string name="clearCallLogProgress_title" msgid="995004835687361977">"Çağrı geçmişi temizleniyor…"</string>
-    <string name="notification_missedCallTitle" msgid="8283366068539898486">"Cevapsız çağrı"</string>
-    <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"İşle ilgili cevapsız çağrı"</string>
-    <string name="notification_missedCallsTitle" msgid="3697442015345089802">"Cevapsız çağrılar"</string>
-    <string name="notification_missedCallsMsg" msgid="8176217633929018706">"<xliff:g id="NUM_MISSED_CALLS">%d</xliff:g> cevapsız çağrı"</string>
-    <string name="notification_missedCall_call_back" msgid="3875698110051973965">"Geri ara"</string>
-    <string name="notification_missedCall_message" msgid="5086910028988305964">"İleti"</string>
-    <string name="post_call_notification_message" msgid="5417476789860590611">"<xliff:g id="NAME">%1$s</xliff:g>: <xliff:g id="MESSAGE">%2$s</xliff:g>"</string>
-    <string name="notification_voicemail_text_format" msgid="1895667520930252897">"Arayın: <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
-    <string name="notification_voicemail_no_vm_number" msgid="8942821987929495842">"Sesli mesaj numarası bilinmiyor"</string>
-    <plurals name="notification_voicemail_title" formatted="false" msgid="1551847434476438657">
-      <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> Sesli Mesaj </item>
-      <item quantity="one">Sesli Mesaj</item>
-    </plurals>
-    <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
-    <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"Yeni sesli mesj gönderen: <xliff:g id="CALLER">%1$s</xliff:g>"</string>
-    <string name="voicemail_playback_error" msgid="4384373852257757295">"Sesli mesaj oynatılamadı"</string>
-    <string name="voicemail_fetching_content" msgid="572320120918636014">"Sesli mesaj yükleniyor…"</string>
-    <string name="voicemail_fetching_timout" msgid="2128873915839949783">"Sesli mesaj yüklenemedi"</string>
-    <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_playback_speakerphone" msgid="4852027754869750227">"Hoperlörü aç veya kapat"</string>
-    <string name="description_playback_seek" msgid="1340910573254132520">"Oynatma konumunu ayarla"</string>
-    <string name="action_menu_call_history_description" msgid="8829135306925008546">"Çağrı geçmişi"</string>
-    <string name="action_menu_overflow_description" msgid="7648679686746517341">"Diğer seçenekler"</string>
-    <string name="action_menu_dialpad_button" msgid="1970631633457493180">"tuş takımı"</string>
-    <string name="dialer_settings_label" msgid="4980176284150290175">"Ayarlar"</string>
-    <string name="simulator_submenu_label" msgid="186156287346615267">"Simülatör"</string>
-    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Kull. Arayüzü Kısayolu Oluştur"</string>
-    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"Toplu işlem moduna giriliyor"</string>
-    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"Toplu işlem modundan çıkıldı"</string>
-    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"Seçildi: <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"Seçimi kaldırıldı: <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_contact_details" msgid="3341280873855253464">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> için kişi ayrıntıları"</string>
-    <string name="description_spam_contact_details" msgid="5592578752881528368">"Spam olduğundan şüphelenilen arayanın (<xliff:g id="NAMEORNUMBER">%1$s</xliff:g>) kişi ayrıntıları"</string>
-    <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> çağrı."</string>
-    <string name="description_video_call" msgid="3738199365585751727">"Video görüşmesi."</string>
-    <string name="description_start_voice_search" msgid="8380022725973015261">"Sesli arama başlat"</string>
-    <string name="voicemail" msgid="8899540969000957954">"Sesli Mesaj"</string>
-    <string name="description_cancel_multi_select" msgid="3930475950253360461">"Toplu işlemler modu iptal edilir"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Sil"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"İptal"</string>
-    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> öğe seçildi"</string>
-    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
-      <item quantity="other">"<b>"Bu sesli mesajlar silinsin mi? "</b>"</item>
-      <item quantity="one">"<b>"Bu sesli mesaj silinsin mi? "</b>"</item>
-    </plurals>
-    <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
-    <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g>, <xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
-    <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="voice_search_not_available" msgid="6546240433719732905">"Sesli arama kullanılamaz"</string>
-    <string name="dialer_hint_find_contact" msgid="2023214799381149808">"Kişilerde ara"</string>
-    <string name="block_number_search_hint" msgid="5377706079015099416">"Numara ekleyin veya kişi arayın"</string>
-    <string name="call_log_all_empty" msgid="3955572868518162004">"Çağrı geçmişiniz boş"</string>
-    <string name="call_log_all_empty_action" msgid="852218280136243014">"Telefon et"</string>
-    <string name="call_log_missed_empty" msgid="7094936030845062214">"Cevapsız çağrınız yok."</string>
-    <string name="call_log_voicemail_empty" msgid="273623903423275178">"Sesli mesaj gelen kutunuz boş."</string>
-    <string name="call_log_activity_title" msgid="1275242727244945527">"Çağrı Geçmişi"</string>
-    <string name="call_log_all_title" msgid="6042262422192020327">"Tümü"</string>
-    <string name="call_log_missed_title" msgid="17254005889268015">"Cevapsız"</string>
-    <string name="tab_speed_dial" msgid="6616404752227561075">"Hızlı arama"</string>
-    <string name="tab_history" msgid="7420269368689503596">"Çağrı Geçmişi"</string>
-    <string name="tab_all_contacts" msgid="5531733977693943015">"Kişiler"</string>
-    <string name="tab_voicemail" msgid="2458548090088316246">"Sesli mesaj"</string>
-    <string name="search_shortcut_call_number" msgid="8847918845036880688">"Çağrı yap: <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"Yeni kişi oluştur"</string>
-    <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"Bir kişiye ekle"</string>
-    <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"SMS gönder"</string>
-    <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"Video görüşmesi yap"</string>
-    <string name="search_shortcut_block_number" msgid="4587283230665805776">"Numarayı engelle"</string>
-    <string name="speed_dial_empty" msgid="3346406399966039505">"Hızlı arama listenizde henüz kimse yok"</string>
-    <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"Favori ekle"</string>
-    <string name="remove_contact" msgid="2353580570488923668">"Kaldır"</string>
-    <string name="select_all" msgid="408601760696146245">"Tümünü seç"</string>
-    <string name="call_log_action_video_call" msgid="7565549950343850819">"Video görüşmesi"</string>
-    <string name="call_log_action_send_message" msgid="6948727362660115554">"İleti gönder"</string>
-    <string name="call_log_action_details" msgid="2091370737371449501">"Çağrı ayrıntıları"</string>
-    <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"Gönder…"</string>
-    <string name="call_log_action_call" msgid="682724094251540583">"Telefon et: <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_incoming_missed_call" msgid="8292535799379230029">"Cevapsız çağrı: <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_incoming_answered_call" msgid="3920182963103160610">"Cevaplanan çağrı: <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_unread_voicemail" msgid="145170985013419170">"Dinlenmemiş sesli posta: <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_read_voicemail" msgid="5585559881573227732">"Sesli posta: <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>"</string>
-    <string name="description_outgoing_call" msgid="543952487882919924">"Yapılan çağrı: <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="call_log_via_number" msgid="1340307109806397650">"<xliff:g id="NUMBER">%1$s</xliff:g> kullanılarak"</string>
-    <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="NUMBER">%2$s</xliff:g> kullanılarak <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>"</string>
-    <string name="description_call_action" msgid="4042796498169106545">"Telefon et: <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_video_call_action" msgid="1237090968588659650">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> ile video görüşmesi yap."</string>
-    <string name="description_voicemail_action" msgid="3290143432403538524">"Şu numaradan gelen sesli mesajı dinle: <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_create_new_contact_action" msgid="1928282350281564130">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> için kişi oluştur"</string>
-    <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> bilgisini mevcut kişiye ekle"</string>
-    <string name="description_details_action" msgid="2061866409737706174">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> için çağrı ayrıntıları"</string>
-    <string name="call_log_header_today" msgid="1576119097475845293">"Bugün"</string>
-    <string name="call_log_header_yesterday" msgid="5616077776205329563">"Dün"</string>
-    <string name="call_log_header_other" msgid="4940676886254217644">"Daha eski"</string>
-    <string name="voicemail_speaker_on" msgid="3151333608926996668">"Hoparlörü açın."</string>
-    <string name="voicemail_speaker_off" msgid="2530064206962034201">"Hoparlörü kapatın."</string>
-    <string name="voicemail_play_start_pause" msgid="3874823480278334664">"Çalmayı başlatın veya duraklatın."</string>
-    <string name="display_options_title" msgid="3880091801055797975">"Görüntüleme seçenekleri"</string>
-    <string name="sounds_and_vibration_title" msgid="3075050000721181384">"Ses ve titreşim"</string>
-    <string name="accessibility_settings_title" msgid="3329027650429831820">"Erişilebilirlik"</string>
-    <string name="ringtone_title" msgid="8377174189894648486">"Telefon zil sesi"</string>
-    <string name="vibrate_on_ring_title" msgid="631441314790960485">"Çağrılarda ayrıca titret"</string>
-    <string name="dtmf_tone_enable_title" msgid="3273762431523939277">"Tuş takımı sesleri"</string>
-    <string name="dtmf_tone_length_title" msgid="534096029202438539">"Tuş takımı ses uzunluğu"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="applicationLabel">Telefon</string>
+  <string name="launcherDialpadActivityLabel">Telefon Tuş Takımı</string>
+  <string name="callHistoryIconLabel">Çağrı geçmişi</string>
+  <string name="action_copy_number_text">Numarayı kopyala</string>
+  <string name="copy_transcript_text">Çeviri yazıyı kopyala</string>
+  <string name="action_edit_number_before_call">Telefon etmeden önce numarayı düzenle</string>
+  <string name="call_log_delete_all">Çağrı geçmişini temizle</string>
+  <string name="call_log_trash_voicemail">Sesli mesajı sil</string>
+  <string name="snackbar_voicemail_deleted">Sesli mesaj silindi</string>
+  <string name="clearCallLogConfirmation_title">Çağrı geçmişi temizlensin mi?</string>
+  <string name="clearCallLogConfirmation">Bu işlem, geçmişinizdeki tüm çağrıları silecek</string>
+  <string name="clearCallLogProgress_title">Çağrı geçmişi temizleniyor…</string>
+  <string name="notification_missedCallTitle">Cevapsız çağrı</string>
+  <string name="notification_missedWorkCallTitle">İşle ilgili cevapsız çağrı</string>
+  <string name="notification_missedCallsTitle">Cevapsız çağrılar</string>
+  <string name="notification_missedCallsMsg">%d cevapsız çağrı</string>
+  <string name="notification_missedCall_call_back">Geri ara</string>
+  <string name="notification_missedCall_message">İleti</string>
+  <string name="post_call_notification_message">%1$s: %2$s</string>
+  <string name="notification_voicemail_text_format">Arayın: %s</string>
+  <string name="notification_voicemail_no_vm_number">Sesli mesaj numarası bilinmiyor</string>
+  <plurals name="notification_voicemail_title">
+    <item quantity="one">Sesli Mesaj</item>
+    <item quantity="other"> %1$d Sesli Mesaj </item>
+  </plurals>
+  <string name="notification_voicemail_callers_list">%1$s, %2$s</string>
+  <string name="notification_new_voicemail_ticker">Yeni sesli mesj gönderen: %1$s</string>
+  <string name="voicemail_playback_error">Sesli mesaj oynatılamadı</string>
+  <string name="voicemail_fetching_content">Sesli mesaj yükleniyor…</string>
+  <string name="voicemail_fetching_timout">Sesli mesaj yüklenemedi</string>
+  <string name="call_log_item_count_and_date">(%1$d) %2$s</string>
+  <string name="description_playback_speakerphone">Hoperlörü aç veya kapat</string>
+  <string name="description_playback_seek">Oynatma konumunu ayarla</string>
+  <string name="action_menu_call_history_description">Çağrı geçmişi</string>
+  <string msgid="2295659037509008453" name="action_menu_overflow_description">Diğer seçenekler</string>
+  <string name="action_menu_dialpad_button">tuş takımı</string>
+  <string name="dialer_settings_label">Ayarlar</string>
+  <string name="simulator_submenu_label">Simülatör</string>
+  <string name="new_ui_launcher_shortcut_label">Kull. Arayüzü Kısayolu Oluştur</string>
+  <string name="description_entering_bulk_action_mode">Toplu işlem moduna giriliyor</string>
+  <string name="description_leaving_bulk_action_mode">Toplu işlem modundan çıkıldı</string>
+  <string name="description_selecting_bulk_action_mode">Seçildi: %1$s</string>
+  <string name="description_unselecting_bulk_action_mode">Seçimi kaldırıldı: %1$s</string>
+  <string name="description_contact_details">%1$s için kişi ayrıntıları</string>
+  <string name="description_spam_contact_details">Spam olduğundan şüphelenilen arayanın (%1$s) kişi ayrıntıları</string>
+  <string name="description_num_calls">%1$s çağrı.</string>
+  <string name="description_video_call">Video görüşmesi.</string>
+  <string name="description_start_voice_search">Sesli arama başlat</string>
+  <string name="voicemail">Sesli Mesaj</string>
+  <string name="description_cancel_multi_select">Toplu işlemler modu iptal edilir</string>
+  <string name="voicemailMultiSelectDeleteConfirm">Sil</string>
+  <string name="voicemailMultiSelectDeleteCancel">İptal</string>
+  <string name="voicemailMultiSelectActionBarTitle">%1$s öğe seçildi</string>
+  <plurals name="delete_voicemails_confirmation_dialog_title">
+    <item quantity="one"><b>Bu sesli mesaj silinsin mi? </b></item>
+    <item quantity="other"><b>Bu sesli mesajlar silinsin mi? </b></item>
+  </plurals>
+  <string name="voicemailCallLogToday">@string/call_log_header_today</string>
+  <string name="voicemailCallLogDateTimeFormat">%1$s, %2$s</string>
+  <string name="voicemailDurationFormat">%1$02d:%2$02d</string>
+  <string name="voicemailCallLogDateTimeFormatWithDuration">%1$s • %2$s</string>
+  <string name="voice_search_not_available">Sesli arama kullanılamaz</string>
+  <string name="dialer_hint_find_contact">Kişilerde ara</string>
+  <string name="block_number_search_hint">Numara ekleyin veya kişi arayın</string>
+  <string name="call_log_all_empty">Çağrı geçmişiniz boş</string>
+  <string name="call_log_all_empty_action">Telefon et</string>
+  <string name="call_log_missed_empty">Cevapsız çağrınız yok.</string>
+  <string name="call_log_voicemail_empty">Sesli mesaj gelen kutunuz boş.</string>
+  <string name="call_log_activity_title">Çağrı Geçmişi</string>
+  <string name="call_log_all_title">Tümü</string>
+  <string name="call_log_missed_title">Cevapsız</string>
+  <string name="tab_speed_dial">Hızlı arama</string>
+  <string name="tab_history">Çağrı Geçmişi</string>
+  <string name="tab_all_contacts">Kişiler</string>
+  <string name="tab_voicemail">Sesli mesaj</string>
+  <string name="search_shortcut_call_number">Çağrı yap: %s</string>
+  <string name="search_shortcut_create_new_contact">Yeni kişi oluştur</string>
+  <string name="search_shortcut_add_to_contact">Bir kişiye ekle</string>
+  <string name="search_shortcut_send_sms_message">SMS gönder</string>
+  <string name="search_shortcut_make_video_call">Video görüşmesi yap</string>
+  <string name="search_shortcut_block_number">Numarayı engelle</string>
+  <string name="speed_dial_empty">Hızlı arama listenizde henüz kimse yok</string>
+  <string name="speed_dial_empty_add_favorite_action">Favori ekle</string>
+  <string name="remove_contact">Kaldır</string>
+  <string name="select_all">Tümünü seç</string>
+  <string name="call_log_action_video_call">Video görüşmesi</string>
+  <string name="call_log_action_set_up_video">Görüntülü görüşmeyi yapılandır</string>
+  <string name="call_log_action_invite_video">Görüntülü görüşmeye davet et</string>
+  <string name="call_log_action_send_message">İleti gönder</string>
+  <string name="call_log_action_details">Çağrı ayrıntıları</string>
+  <string name="call_log_action_share_voicemail">Gönder…</string>
+  <string name="call_log_action_call">Telefon et: ^1</string>
+  <string name="description_incoming_missed_call">Cevapsız çağrı: ^1, ^2, ^3, ^4.</string>
+  <string name="description_incoming_answered_call">Cevaplanan çağrı: ^1, ^2, ^3, ^4.</string>
+  <string name="description_unread_voicemail">Dinlenmemiş sesli posta: ^1, ^2, ^3, ^4.</string>
+  <string name="description_read_voicemail">Sesli posta: ^1, ^2, ^3, ^4</string>
+  <string name="description_outgoing_call">Yapılan çağrı: ^1, ^2, ^3, ^4.</string>
+  <string name="call_log_via_number">%1$s kullanılarak</string>
+  <string name="call_log_via_number_phone_account">%2$s kullanılarak %1$s</string>
+  <string name="description_call_action">Telefon et: ^1</string>
+  <string name="description_video_call_action">^1 ile video görüşmesi yap.</string>
+  <string name="description_voicemail_action">Şu numaradan gelen sesli mesajı dinle: ^1</string>
+  <string name="description_create_new_contact_action">^1 için kişi oluştur</string>
+  <string name="description_add_to_existing_contact_action">^1 bilgisini mevcut kişiye ekle</string>
+  <string name="description_details_action">^1 için çağrı ayrıntıları</string>
+  <string name="call_log_header_today">Bugün</string>
+  <string name="call_log_header_yesterday">Dün</string>
+  <string name="call_log_header_other">Daha eski</string>
+  <string name="voicemail_speaker_on">Hoparlörü açın.</string>
+  <string name="voicemail_speaker_off">Hoparlörü kapatın.</string>
+  <string name="voicemail_play_start_pause">Çalmayı başlatın veya duraklatın.</string>
+  <string name="display_options_title">Görüntüleme seçenekleri</string>
+  <string name="sounds_and_vibration_title">Ses ve titreşim</string>
+  <string name="accessibility_settings_title">Erişilebilirlik</string>
+  <string name="ringtone_title">Telefon zil sesi</string>
+  <string name="vibrate_on_ring_title">Çağrılarda ayrıca titret</string>
+  <string name="dtmf_tone_enable_title">Tuş takımı sesleri</string>
+  <string name="dtmf_tone_length_title">Tuş takımı ses uzunluğu</string>
   <string-array name="dtmf_tone_length_entries">
-    <item msgid="3136353015227162823">"Normal"</item>
-    <item msgid="5376841175538523822">"Uzun"</item>
+    <item>Normal</item>
+    <item>Uzun</item>
   </string-array>
-    <string name="respond_via_sms_setting_title" msgid="8008181606657693452">"Hızlı yanıtlar"</string>
-    <string name="call_settings_label" msgid="7824611757200960807">"Çağrılar"</string>
-    <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Çağrı engelleme"</string>
-    <string name="voicemail_settings_label" msgid="4594299554519920570">"Sesli mesaj"</string>
-    <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Çağrı engelleme geçici olarak kapalı"</string>
-    <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Son 48 saat içinde bu telefondan acil servislerle iletişimde bulunduğunuz için çağrı engelleme modu devre dışı bırakıldı. 48 saatlik süre dolduktan sonra çağrı engelleme modu otomatik olarak tekrar etkinleştirilecektir."</string>
-    <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Numaraları içe aktar"</string>
-    <string name="blocked_call_settings_import_description" msgid="1819412052545228965">"Bazı arayanları, diğer uygulamalar aracılığıyla otomatik olarak sesli mesaj gönderilmesi için önceden işaretlediniz."</string>
-    <string name="blocked_call_settings_view_numbers_button" msgid="3332727948554356704">"Numaraları Görüntüle"</string>
-    <string name="blocked_call_settings_import_button" msgid="7319111700387470727">"İçe aktar"</string>
-    <string name="description_blocked_number_list_delete" msgid="2139644216858370740">"Numaranın engellemesini kaldır"</string>
-    <string name="addBlockedNumber" msgid="3053473735238295551">"Numara ekle"</string>
-    <string name="block_number_footer_message_vvm" msgid="7955326304033982368">"Bu numaralardan gelen çağrılar engellenecek ve sesli mesajlar otomatik olarak silinecektir."</string>
-    <string name="block_number_footer_message_no_vvm" msgid="1152684139070471665">"Bu numaralardan gelen çağrılar engellenecek, ancak arayan kişiler yine de size sesli mesaj bırakabileceklerdir."</string>
-    <string name="block_list" msgid="4701585783411870782">"Engellenen numaralar"</string>
-    <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g> numaralı telefon zaten engellendi."</string>
-    <string name="phone_account_settings_label" msgid="8372485478006965920">"Çağrı hesapları"</string>
-    <string name="permission_no_speeddial" msgid="8487215628510596753">"Hızlı aramayı etkinleştirmek için Kişiler iznini açın."</string>
-    <string name="permission_no_calllog" msgid="4053705651238775784">"Çağrı günlüğünüzü görmek için Telefon iznini açın."</string>
-    <string name="permission_no_search" msgid="2424710404207193826">"Kişilerinizde arama yapmak için Kişiler izinlerini açın."</string>
-    <string name="permission_place_call" msgid="8686908130349369423">"Telefon etmek için Telefon iznini açın."</string>
-    <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"Telefon uygulamasının sistem ayarlarına yazma izni yok."</string>
-    <string name="blocked_number_call_log_label" msgid="4212282846299997693">"Engellendi"</string>
-    <string name="call_log_action_block_report_number" msgid="7302636538668696729">"Engelle/spam bildir"</string>
-    <string name="call_log_action_block_number" msgid="5048188386501998865">"Numarayı engelle"</string>
-    <string name="call_log_action_remove_spam" msgid="2045319806318398403">"Spam değil"</string>
-    <string name="call_log_action_unblock_number" msgid="6100117033288448758">"Numaranın engellemesini kaldır"</string>
-    <string name="spam_number_call_log_label" msgid="2678431398326811131">"Spam"</string>
-    <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> çevrimdışı olduğundan ulaşılamıyor"</string>
-    <string name="about_phone_label" msgid="582991354677973731">"Hakkında"</string>
-    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Çeviri yazı Google\'a aittir"</string>
-    <string name="voicemail_transcription_in_progress" msgid="2933320969613783210">"Google, çeviri yazı oluşturuyor…"</string>
-    <string name="voicemail_transcription_failed" msgid="335275303117412706">"Çeviri yazı oluşturulamadı."</string>
-    <string name="voicemail_transcription_failed_language_not_supported" msgid="4210332591050562553">"Çeviri yazı oluşturulamadı. Dil desteklenmiyor."</string>
-    <string name="voicemail_transcription_failed_no_speech" msgid="9093372879697874852">"Çeviri yazı oluşturulamadı. Konuşma algılanmadı."</string>
-    <string name="view_conversation" msgid="7895904782094119702">"Göster"</string>
-    <string name="ec_data_deleted" msgid="4794880345545827107">"Çağrı silindi. Bu çağrı sırasında paylaşılan ekleri Mesajlar\'da görebilir ve silebilirsiniz."</string>
-    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"Çağrılar silindi. Çağrılar sırasında paylaşılan ekleri Mesajlar\'da görebilir ve silebilirsiniz."</string>
+  <string name="respond_via_sms_setting_title">Hızlı yanıtlar</string>
+  <string name="call_settings_label">Çağrılar</string>
+  <string name="manage_blocked_numbers_label">Engellenen numaralar</string>
+  <string name="voicemail_settings_label">Sesli mesaj</string>
+  <string name="blocked_numbers_disabled_emergency_header_label">Çağrı engelleme geçici olarak kapalı</string>
+  <string name="blocked_numbers_disabled_emergency_desc">Son 48 saat içinde bu telefondan acil servislerle iletişimde bulunduğunuz için çağrı engelleme modu devre dışı bırakıldı. 48 saatlik süre dolduktan sonra çağrı engelleme modu otomatik olarak tekrar etkinleştirilecektir.</string>
+  <string name="import_send_to_voicemail_numbers_label">Numaraları içe aktar</string>
+  <string name="blocked_call_settings_import_description">Bazı arayanları, diğer uygulamalar aracılığıyla otomatik olarak sesli mesaj gönderilmesi için önceden işaretlediniz.</string>
+  <string name="blocked_call_settings_view_numbers_button">Numaraları Görüntüle</string>
+  <string name="blocked_call_settings_import_button">İçe aktar</string>
+  <string name="description_blocked_number_list_delete">Numaranın engellemesini kaldır</string>
+  <string name="addBlockedNumber">Numara ekle</string>
+  <string name="block_number_footer_message_vvm">Bu numaralardan gelen çağrılar engellenecek ve sesli mesajlar otomatik olarak silinecektir.</string>
+  <string name="block_number_footer_message_no_vvm">Bu numaralardan gelen çağrılar engellenecek, ancak arayan kişiler yine de size sesli mesaj bırakabileceklerdir.</string>
+  <string name="block_list">Engellenen numaralar</string>
+  <string name="alreadyBlocked">%1$s numaralı telefon zaten engellendi.</string>
+  <string name="phone_account_settings_label">Çağrı hesapları</string>
+  <string name="permission_no_speeddial">Hızlı aramayı etkinleştirmek için Kişiler iznini açın.</string>
+  <string name="permission_no_calllog">Çağrı günlüğünüzü görmek için Telefon iznini açın.</string>
+  <string name="permission_no_search">Kişilerinizde arama yapmak için Kişiler izinlerini açın.</string>
+  <string name="permission_place_call">Telefon etmek için Telefon iznini açın.</string>
+  <string name="toast_cannot_write_system_settings">Telefon uygulamasının sistem ayarlarına yazma izni yok.</string>
+  <string name="blocked_number_call_log_label">Engellendi</string>
+  <string name="call_log_action_block_report_number">Engelle/spam bildir</string>
+  <string name="call_log_action_block_number">Numarayı engelle</string>
+  <string name="call_log_action_remove_spam">Spam değil</string>
+  <string name="call_log_action_unblock_number">Numaranın engellemesini kaldır</string>
+  <string name="spam_number_call_log_label">Spam</string>
+  <string name="call_composer_connection_failed">%1$s çevrimdışı olduğundan ulaşılamıyor</string>
+  <string name="about_phone_label">Hakkında</string>
+  <string name="voicemail_transcription_branding_text">Çeviri yazı Google\'a aittir</string>
+  <string name="voicemail_transcription_in_progress">Metne dönüştürülüyor…</string>
+  <string name="voicemail_transcription_failed">Çeviri yazı oluşturulamadı.</string>
+  <string name="voicemail_transcription_failed_language_not_supported">Çeviri yazı oluşturulamadı. Dil desteklenmiyor.</string>
+  <string name="voicemail_transcription_failed_no_speech">Çeviri yazı oluşturulamadı. Konuşma algılanmadı.</string>
+  <string name="voicemail_donation_promo_title">Çeviri yazının iyileştirilmesine yardımcı olmak ister misiniz?</string>
+  <string name="voicemail_donation_promo_content">Google\'ın, bu mesajı ve çeviri yazı içeren diğer sesli mesajları incelemesine izin verin. Mesajlar anonim olarak depolanır. Ayarlar\'da istediğiniz zaman değişiklik yapabilirsiniz. %1$s</string>
+  <string name="voicemail_donation_promo_opt_in">Evet, istiyorum</string>
+  <string name="voicemail_donation_promo_opt_out">Hayır, teşekkürler</string>
+  <string name="voicemail_transcription_rating">Çeviri yazı kalit. değerlend.</string>
+  <string name="voicemail_transcription_rating_thanks">Geri bildirim için teşekkürler</string>
+  <string name="description_rating_good">Beğen</string>
+  <string name="description_rating_bad">Beğenme</string>
+  <string name="view_conversation">Göster</string>
+  <string name="ec_data_deleted">Çağrı silindi. Bu çağrı sırasında paylaşılan ekleri Mesajlar\'da görebilir ve silebilirsiniz.</string>
+  <string name="multiple_ec_data_deleted">Çağrılar silindi. Çağrılar sırasında paylaşılan ekleri Mesajlar\'da görebilir ve silebilirsiniz.</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-uk/strings.xml b/java/com/android/dialer/app/res/values-uk/strings.xml
index 8a6fd89..a470e99 100644
--- a/java/com/android/dialer/app/res/values-uk/strings.xml
+++ b/java/com/android/dialer/app/res/values-uk/strings.xml
@@ -1,183 +1,175 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="applicationLabel" msgid="2202739481132958990">"Телефон"</string>
-    <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"Клавіатура телефона"</string>
-    <string name="callHistoryIconLabel" msgid="7493268743411968630">"Історія дзвінків"</string>
-    <string name="action_copy_number_text" msgid="832682558551502319">"Копіювати номер"</string>
-    <string name="copy_transcript_text" msgid="937904189017310829">"Копіювати транскрипцію"</string>
-    <string name="action_edit_number_before_call" msgid="8017492815878473837">"Редагувати номер перед викликом"</string>
-    <string name="call_log_delete_all" msgid="7852970926906523784">"Очистити історію дзвінків"</string>
-    <string name="call_log_trash_voicemail" msgid="6118493534178533972">"Видалити голосову пошту"</string>
-    <string name="snackbar_voicemail_deleted" msgid="7463166543725496307">"Видалено"</string>
-    <string name="snackbar_voicemail_deleted_undo" msgid="6959743982796409941">"ВІДМІНИТИ"</string>
-    <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"Очистити історію дзвінків?"</string>
-    <string name="clearCallLogConfirmation" msgid="6844949465815109166">"З історії буде видалено всі дзвінки"</string>
-    <string name="clearCallLogProgress_title" msgid="995004835687361977">"Очищення історії дзвінків…"</string>
-    <string name="notification_missedCallTitle" msgid="8283366068539898486">"Пропущений виклик"</string>
-    <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"Пропущений дзвінок на робочий телефон"</string>
-    <string name="notification_missedCallsTitle" msgid="3697442015345089802">"Пропущені виклики"</string>
-    <string name="notification_missedCallsMsg" msgid="8176217633929018706">"Пропущено викликів: <xliff:g id="NUM_MISSED_CALLS">%d</xliff:g>"</string>
-    <string name="notification_missedCall_call_back" msgid="3875698110051973965">"Передзвонити"</string>
-    <string name="notification_missedCall_message" msgid="5086910028988305964">"Повідомлення"</string>
-    <string name="post_call_notification_message" msgid="5417476789860590611">"<xliff:g id="NAME">%1$s</xliff:g>: <xliff:g id="MESSAGE">%2$s</xliff:g>"</string>
-    <string name="notification_voicemail_text_format" msgid="1895667520930252897">"Набрати <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
-    <string name="notification_voicemail_no_vm_number" msgid="8942821987929495842">"Невідомий номер голосової пошти"</string>
-    <plurals name="notification_voicemail_title" formatted="false" msgid="1551847434476438657">
-      <item quantity="one"> <xliff:g id="COUNT">%1$d</xliff:g> голосове повідомлення </item>
-      <item quantity="few"> <xliff:g id="COUNT">%1$d</xliff:g> голосові повідомлення </item>
-      <item quantity="many"> <xliff:g id="COUNT">%1$d</xliff:g> голосових повідомлень </item>
-      <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> голосових повідомлень </item>
-    </plurals>
-    <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
-    <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"Нова голосова пошта від <xliff:g id="CALLER">%1$s</xliff:g>"</string>
-    <string name="voicemail_playback_error" msgid="4384373852257757295">"Не вдалося відтворити голосову пошту"</string>
-    <string name="voicemail_fetching_content" msgid="572320120918636014">"Завантаження голосової пошти…"</string>
-    <string name="voicemail_fetching_timout" msgid="2128873915839949783">"Не вдалося завантажити голосову пошту"</string>
-    <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_playback_speakerphone" msgid="4852027754869750227">"Увімкнути або вимкнути гучний зв’язок"</string>
-    <string name="description_playback_seek" msgid="1340910573254132520">"Шукати місце відтворення"</string>
-    <string name="action_menu_call_history_description" msgid="8829135306925008546">"Історія викликів"</string>
-    <string name="action_menu_overflow_description" msgid="7648679686746517341">"Інші варіанти"</string>
-    <string name="action_menu_dialpad_button" msgid="1970631633457493180">"клавіатура"</string>
-    <string name="dialer_settings_label" msgid="4980176284150290175">"Налаштування"</string>
-    <string name="simulator_submenu_label" msgid="186156287346615267">"Симулятор"</string>
-    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Створити ярлик для нової дії"</string>
-    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"Перехід у режим масових дій"</string>
-    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"Ви вийшли з режиму масових дій"</string>
-    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"Вибрано користувача <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"Скасовано вибір користувача <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_contact_details" msgid="3341280873855253464">"Відомості про контакт <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_spam_contact_details" msgid="5592578752881528368">"Відомості про підозрілого абонента <xliff:g id="NAMEORNUMBER">%1$s</xliff:g> (може бути спамом)"</string>
-    <string name="description_num_calls" msgid="6483594535796216044">"Викликів: <xliff:g id="NUMBEROFCALLS">%1$s</xliff:g>."</string>
-    <string name="description_video_call" msgid="3738199365585751727">"Відеодзвінок."</string>
-    <string name="description_start_voice_search" msgid="8380022725973015261">"Розпочати голосовий пошук"</string>
-    <string name="voicemail" msgid="8899540969000957954">"Голосова пошта"</string>
-    <string name="description_cancel_multi_select" msgid="3930475950253360461">"Скасувати режим масових дій"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Видалити"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Скасувати"</string>
-    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"Вибрано <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
-      <item quantity="one">"<b>"Видалити ці повідомлення голосової пошти? "</b>"</item>
-      <item quantity="few">"<b>"Видалити ці повідомлення голосової пошти? "</b>"</item>
-      <item quantity="many">"<b>"Видалити ці повідомлення голосової пошти? "</b>"</item>
-      <item quantity="other">"<b>"Видалити ці повідомлення голосової пошти? "</b>"</item>
-    </plurals>
-    <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
-    <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> о <xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
-    <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="voice_search_not_available" msgid="6546240433719732905">"Голосовий пошук недоступний"</string>
-    <string name="dialer_hint_find_contact" msgid="2023214799381149808">"Пошук контактів"</string>
-    <string name="block_number_search_hint" msgid="5377706079015099416">"Введіть або знайдіть номер"</string>
-    <string name="call_log_all_empty" msgid="3955572868518162004">"Немає історії дзвінків"</string>
-    <string name="call_log_all_empty_action" msgid="852218280136243014">"Телефонувати"</string>
-    <string name="call_log_missed_empty" msgid="7094936030845062214">"Немає пропущених дзвінків."</string>
-    <string name="call_log_voicemail_empty" msgid="273623903423275178">"Немає голосової пошти."</string>
-    <string name="call_log_activity_title" msgid="1275242727244945527">"Історія викликів"</string>
-    <string name="call_log_all_title" msgid="6042262422192020327">"Усі"</string>
-    <string name="call_log_missed_title" msgid="17254005889268015">"Пропущені"</string>
-    <string name="tab_speed_dial" msgid="6616404752227561075">"Швидкий набір"</string>
-    <string name="tab_history" msgid="7420269368689503596">"Історія дзвінків"</string>
-    <string name="tab_all_contacts" msgid="5531733977693943015">"Контакти"</string>
-    <string name="tab_voicemail" msgid="2458548090088316246">"Голосова пошта"</string>
-    <string name="search_shortcut_call_number" msgid="8847918845036880688">"Подзвонити на <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"Створити контакт"</string>
-    <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"Додати в контакти"</string>
-    <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"Надіслати SMS"</string>
-    <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"Здійснити відеодзвінок"</string>
-    <string name="search_shortcut_block_number" msgid="4587283230665805776">"Заблокувати номер"</string>
-    <string name="speed_dial_empty" msgid="3346406399966039505">"Немає номерів для швидкого набору"</string>
-    <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"Додати номер"</string>
-    <string name="remove_contact" msgid="2353580570488923668">"Видалити"</string>
-    <string name="select_all" msgid="408601760696146245">"Вибрати все"</string>
-    <string name="call_log_action_video_call" msgid="7565549950343850819">"Відеодзвінок"</string>
-    <string name="call_log_action_send_message" msgid="6948727362660115554">"Надіслати повідомлення"</string>
-    <string name="call_log_action_details" msgid="2091370737371449501">"Деталі виклику"</string>
-    <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"Надіслати в…"</string>
-    <string name="call_log_action_call" msgid="682724094251540583">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>: телефонувати"</string>
-    <string name="description_incoming_missed_call" msgid="8292535799379230029">"Пропущений дзвінок: <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_incoming_answered_call" msgid="3920182963103160610">"Прийнятий дзвінок: <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_unread_voicemail" msgid="145170985013419170">"Непрочитане голосове повідомлення: <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_read_voicemail" msgid="5585559881573227732">"Голосове повідомлення: <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_outgoing_call" msgid="543952487882919924">"Вихідний дзвінок: <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="call_log_via_number" msgid="1340307109806397650">"на номер <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> на номер <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="description_call_action" msgid="4042796498169106545">"Телефонувати: <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_video_call_action" msgid="1237090968588659650">"Запросити контакт <xliff:g id="NAMEORNUMBER">^1</xliff:g> на відеодзвінок."</string>
-    <string name="description_voicemail_action" msgid="3290143432403538524">"Слухати голосову пошту: <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_create_new_contact_action" msgid="1928282350281564130">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>: створити контакт"</string>
-    <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>: додати до наявного контакта"</string>
-    <string name="description_details_action" msgid="2061866409737706174">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>: деталі виклику"</string>
-    <string name="call_log_header_today" msgid="1576119097475845293">"Сьогодні"</string>
-    <string name="call_log_header_yesterday" msgid="5616077776205329563">"Учора"</string>
-    <string name="call_log_header_other" msgid="4940676886254217644">"Старіші"</string>
-    <string name="voicemail_speaker_on" msgid="3151333608926996668">"Увімкнути динамік."</string>
-    <string name="voicemail_speaker_off" msgid="2530064206962034201">"Вимкнути динамік."</string>
-    <string name="voicemail_play_start_pause" msgid="3874823480278334664">"Почати або призупинити відтворення."</string>
-    <string name="display_options_title" msgid="3880091801055797975">"Параметри відображення"</string>
-    <string name="sounds_and_vibration_title" msgid="3075050000721181384">"Звуки та вібрація"</string>
-    <string name="accessibility_settings_title" msgid="3329027650429831820">"Спеціальні можливості"</string>
-    <string name="ringtone_title" msgid="8377174189894648486">"Сигнал дзвінка телефона"</string>
-    <string name="vibrate_on_ring_title" msgid="631441314790960485">"Також вібрувати для дзвінків"</string>
-    <string name="dtmf_tone_enable_title" msgid="3273762431523939277">"Звуки клавіатури"</string>
-    <string name="dtmf_tone_length_title" msgid="534096029202438539">"Тривалість звуків клавіатури"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="applicationLabel">Телефон</string>
+  <string name="launcherDialpadActivityLabel">Клавіатура телефона</string>
+  <string name="callHistoryIconLabel">Історія дзвінків</string>
+  <string name="action_copy_number_text">Копіювати номер</string>
+  <string name="copy_transcript_text">Копіювати транскрипцію</string>
+  <string name="action_edit_number_before_call">Редагувати номер перед викликом</string>
+  <string name="call_log_delete_all">Очистити історію дзвінків</string>
+  <string name="call_log_trash_voicemail">Видалити голосову пошту</string>
+  <string name="snackbar_voicemail_deleted">Видалено</string>
+  <string name="clearCallLogConfirmation_title">Очистити історію дзвінків?</string>
+  <string name="clearCallLogConfirmation">З історії буде видалено всі дзвінки</string>
+  <string name="clearCallLogProgress_title">Очищення історії дзвінків…</string>
+  <string name="notification_missedCallTitle">Пропущений виклик</string>
+  <string name="notification_missedWorkCallTitle">Пропущений дзвінок на робочий телефон</string>
+  <string name="notification_missedCallsTitle">Пропущені виклики</string>
+  <string name="notification_missedCallsMsg">Пропущено викликів: %d</string>
+  <string name="notification_missedCall_call_back">Передзвонити</string>
+  <string name="notification_missedCall_message">Повідомлення</string>
+  <string name="post_call_notification_message">%1$s: %2$s</string>
+  <string name="notification_voicemail_text_format">Набрати %s</string>
+  <string name="notification_voicemail_no_vm_number">Невідомий номер голосової пошти</string>
+  <plurals name="notification_voicemail_title">
+    <item quantity="one"> %1$d голосове повідомлення </item>
+    <item quantity="few"> %1$d голосові повідомлення </item>
+    <item quantity="many"> %1$d голосових повідомлень </item>
+    <item quantity="other"> %1$d голосових повідомлень </item>
+  </plurals>
+  <string name="notification_voicemail_callers_list">%1$s, %2$s</string>
+  <string name="notification_new_voicemail_ticker">Нова голосова пошта від %1$s</string>
+  <string name="voicemail_playback_error">Не вдалося відтворити голосову пошту</string>
+  <string name="voicemail_fetching_content">Завантаження голосової пошти…</string>
+  <string name="voicemail_fetching_timout">Не вдалося завантажити голосову пошту</string>
+  <string name="call_log_item_count_and_date">(%1$d) %2$s</string>
+  <string name="description_playback_speakerphone">Увімкнути або вимкнути гучний зв’язок</string>
+  <string name="description_playback_seek">Шукати місце відтворення</string>
+  <string name="action_menu_call_history_description">Історія викликів</string>
+  <string msgid="2295659037509008453" name="action_menu_overflow_description">Інші варіанти</string>
+  <string name="action_menu_dialpad_button">клавіатура</string>
+  <string name="dialer_settings_label">Налаштування</string>
+  <string name="simulator_submenu_label">Симулятор</string>
+  <string name="new_ui_launcher_shortcut_label">Створити ярлик для нової дії</string>
+  <string name="description_entering_bulk_action_mode">Перехід у режим масових дій</string>
+  <string name="description_leaving_bulk_action_mode">Ви вийшли з режиму масових дій</string>
+  <string name="description_selecting_bulk_action_mode">Вибрано користувача %1$s</string>
+  <string name="description_unselecting_bulk_action_mode">Скасовано вибір користувача %1$s</string>
+  <string name="description_contact_details">Відомості про контакт %1$s</string>
+  <string name="description_spam_contact_details">Відомості про підозрілого абонента %1$s (може бути спамом)</string>
+  <string name="description_num_calls">Викликів: %1$s.</string>
+  <string name="description_video_call">Відеодзвінок.</string>
+  <string name="description_start_voice_search">Розпочати голосовий пошук</string>
+  <string name="voicemail">Голосова пошта</string>
+  <string name="description_cancel_multi_select">Скасувати режим масових дій</string>
+  <string name="voicemailMultiSelectDeleteConfirm">Видалити</string>
+  <string name="voicemailMultiSelectDeleteCancel">Скасувати</string>
+  <string name="voicemailMultiSelectActionBarTitle">Вибрано %1$s</string>
+  <plurals name="delete_voicemails_confirmation_dialog_title">
+    <item quantity="one"><b>Видалити ці повідомлення голосової пошти? </b></item>
+    <item quantity="few"><b>Видалити ці повідомлення голосової пошти? </b></item>
+    <item quantity="many"><b>Видалити ці повідомлення голосової пошти? </b></item>
+    <item quantity="other"><b>Видалити ці повідомлення голосової пошти? </b></item>
+  </plurals>
+  <string name="voicemailCallLogToday">@string/call_log_header_today</string>
+  <string name="voicemailCallLogDateTimeFormat">%1$s о %2$s</string>
+  <string name="voicemailDurationFormat">%1$02d:%2$02d</string>
+  <string name="voicemailCallLogDateTimeFormatWithDuration">%1$s • %2$s</string>
+  <string name="voice_search_not_available">Голосовий пошук недоступний</string>
+  <string name="dialer_hint_find_contact">Пошук контактів</string>
+  <string name="block_number_search_hint">Введіть або знайдіть номер</string>
+  <string name="call_log_all_empty">Немає історії дзвінків</string>
+  <string name="call_log_all_empty_action">Телефонувати</string>
+  <string name="call_log_missed_empty">Немає пропущених дзвінків.</string>
+  <string name="call_log_voicemail_empty">Немає голосової пошти.</string>
+  <string name="call_log_activity_title">Історія викликів</string>
+  <string name="call_log_all_title">Усі</string>
+  <string name="call_log_missed_title">Пропущені</string>
+  <string name="tab_speed_dial">Швидкий набір</string>
+  <string name="tab_history">Історія дзвінків</string>
+  <string name="tab_all_contacts">Контакти</string>
+  <string name="tab_voicemail">Голосова пошта</string>
+  <string name="search_shortcut_call_number">Подзвонити на %s</string>
+  <string name="search_shortcut_create_new_contact">Створити контакт</string>
+  <string name="search_shortcut_add_to_contact">Додати в контакти</string>
+  <string name="search_shortcut_send_sms_message">Надіслати SMS</string>
+  <string name="search_shortcut_make_video_call">Здійснити відеодзвінок</string>
+  <string name="search_shortcut_block_number">Заблокувати номер</string>
+  <string name="speed_dial_empty">Немає номерів для швидкого набору</string>
+  <string name="speed_dial_empty_add_favorite_action">Додати номер</string>
+  <string name="remove_contact">Видалити</string>
+  <string name="select_all">Вибрати все</string>
+  <string name="call_log_action_video_call">Відеодзвінок</string>
+  <string name="call_log_action_set_up_video">Налаштувати відеодзвінки</string>
+  <string name="call_log_action_invite_video">Запросити на відеодзвінок</string>
+  <string name="call_log_action_send_message">Надіслати повідомлення</string>
+  <string name="call_log_action_details">Деталі виклику</string>
+  <string name="call_log_action_share_voicemail">Надіслати в…</string>
+  <string name="call_log_action_call">^1: телефонувати</string>
+  <string name="description_incoming_missed_call">Пропущений дзвінок: ^1, ^2, ^3, ^4.</string>
+  <string name="description_incoming_answered_call">Прийнятий дзвінок: ^1, ^2, ^3, ^4.</string>
+  <string name="description_unread_voicemail">Непрочитане голосове повідомлення: ^1, ^2, ^3, ^4.</string>
+  <string name="description_read_voicemail">Голосове повідомлення: ^1, ^2, ^3, ^4.</string>
+  <string name="description_outgoing_call">Вихідний дзвінок: ^1, ^2, ^3, ^4.</string>
+  <string name="call_log_via_number">на номер %1$s</string>
+  <string name="call_log_via_number_phone_account">%1$s на номер %2$s</string>
+  <string name="description_call_action">Телефонувати: ^1</string>
+  <string name="description_video_call_action">Запросити контакт ^1 на відеодзвінок.</string>
+  <string name="description_voicemail_action">Слухати голосову пошту: ^1</string>
+  <string name="description_create_new_contact_action">^1: створити контакт</string>
+  <string name="description_add_to_existing_contact_action">^1: додати до наявного контакта</string>
+  <string name="description_details_action">^1: деталі виклику</string>
+  <string name="call_log_header_today">Сьогодні</string>
+  <string name="call_log_header_yesterday">Учора</string>
+  <string name="call_log_header_other">Старіші</string>
+  <string name="voicemail_speaker_on">Увімкнути динамік.</string>
+  <string name="voicemail_speaker_off">Вимкнути динамік.</string>
+  <string name="voicemail_play_start_pause">Почати або призупинити відтворення.</string>
+  <string name="display_options_title">Параметри відображення</string>
+  <string name="sounds_and_vibration_title">Звуки та вібрація</string>
+  <string name="accessibility_settings_title">Спеціальні можливості</string>
+  <string name="ringtone_title">Сигнал дзвінка телефона</string>
+  <string name="vibrate_on_ring_title">Також вібрувати для дзвінків</string>
+  <string name="dtmf_tone_enable_title">Звуки клавіатури</string>
+  <string name="dtmf_tone_length_title">Тривалість звуків клавіатури</string>
   <string-array name="dtmf_tone_length_entries">
-    <item msgid="3136353015227162823">"Стандартний сигнал"</item>
-    <item msgid="5376841175538523822">"Довгий"</item>
+    <item>Стандартний сигнал</item>
+    <item>Довгий</item>
   </string-array>
-    <string name="respond_via_sms_setting_title" msgid="8008181606657693452">"Швидкі відповіді"</string>
-    <string name="call_settings_label" msgid="7824611757200960807">"Дзвінки"</string>
-    <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Блокування викликів"</string>
-    <string name="voicemail_settings_label" msgid="4594299554519920570">"Голосова пошта"</string>
-    <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Блокування дзвінків тимчасово вимкнено"</string>
-    <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Блокування дзвінків вимкнено, оскільки ви зверталися з цього телефона в екстрені служби протягом останніх 48 годин. Ця функція автоматично ввімкнеться, коли мине 48 годин."</string>
-    <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Імпортувати номери"</string>
-    <string name="blocked_call_settings_import_description" msgid="1819412052545228965">"Ви позначили абонентів, чиї дзвінки мають автоматично спрямовуватися на голосову пошту через інші додатки."</string>
-    <string name="blocked_call_settings_view_numbers_button" msgid="3332727948554356704">"Переглянути номери"</string>
-    <string name="blocked_call_settings_import_button" msgid="7319111700387470727">"Імпортувати"</string>
-    <string name="description_blocked_number_list_delete" msgid="2139644216858370740">"Розблокувати номер"</string>
-    <string name="addBlockedNumber" msgid="3053473735238295551">"Додати номер"</string>
-    <string name="block_number_footer_message_vvm" msgid="7955326304033982368">"Виклики з цих номерів блокуватимуться, а голосові повідомлення автоматично видалятимуться."</string>
-    <string name="block_number_footer_message_no_vvm" msgid="1152684139070471665">"Виклики з цих номерів блокуватимуться, але абоненти зможуть залишати голосові повідомлення."</string>
-    <string name="block_list" msgid="4701585783411870782">"Заблоковані номери"</string>
-    <string name="alreadyBlocked" msgid="5483253180532475653">"Номер <xliff:g id="NUMBER">%1$s</xliff:g> уже заблоковано."</string>
-    <string name="phone_account_settings_label" msgid="8372485478006965920">"Обл. записи для дзвінків"</string>
-    <string name="permission_no_speeddial" msgid="8487215628510596753">"Щоб активувати швидкий набір, увімкніть дозвіл \"Контакти\"."</string>
-    <string name="permission_no_calllog" msgid="4053705651238775784">"Щоб переглянути журнал викликів, увімкніть дозвіл \"Телефон\"."</string>
-    <string name="permission_no_search" msgid="2424710404207193826">"Щоб шукати контакти, увімкніть дозвіл \"Контакти\"."</string>
-    <string name="permission_place_call" msgid="8686908130349369423">"Щоб зателефонувати, увімкніть дозвіл \"Телефон\"."</string>
-    <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"Додаток Телефон не має дозволу змінювати системні налаштування."</string>
-    <string name="blocked_number_call_log_label" msgid="4212282846299997693">"Заблоковано"</string>
-    <string name="call_log_action_block_report_number" msgid="7302636538668696729">"Заблокувати/позначити як спам"</string>
-    <string name="call_log_action_block_number" msgid="5048188386501998865">"Заблокувати номер"</string>
-    <string name="call_log_action_remove_spam" msgid="2045319806318398403">"Не спам"</string>
-    <string name="call_log_action_unblock_number" msgid="6100117033288448758">"Розблокувати номер"</string>
-    <string name="spam_number_call_log_label" msgid="2678431398326811131">"Спам"</string>
-    <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> не в мережі, неможливо встановити зв’язок"</string>
-    <string name="about_phone_label" msgid="582991354677973731">"Про додаток"</string>
-    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Транскрипція від Google"</string>
-    <string name="voicemail_transcription_in_progress" msgid="2933320969613783210">"Google транскрибує…"</string>
-    <string name="voicemail_transcription_failed" msgid="335275303117412706">"Транскрипція недоступна."</string>
-    <string name="voicemail_transcription_failed_language_not_supported" msgid="4210332591050562553">"Транскрипція недоступна. Мова не підтримується."</string>
-    <string name="voicemail_transcription_failed_no_speech" msgid="9093372879697874852">"Транскрипція недоступна. Не виявлено мовлення."</string>
-    <string name="view_conversation" msgid="7895904782094119702">"Переглянути"</string>
-    <string name="ec_data_deleted" msgid="4794880345545827107">"Виклик видалено. Переглянути й видалити файли, надіслані під час цього виклику, можна в Повідомленнях."</string>
-    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"Виклики видалено. Переглянути й видалити файли, надіслані під час цих викликів, можна в Повідомленнях."</string>
+  <string name="respond_via_sms_setting_title">Швидкі відповіді</string>
+  <string name="call_settings_label">Дзвінки</string>
+  <string name="manage_blocked_numbers_label">Заблоковані номери</string>
+  <string name="voicemail_settings_label">Голосова пошта</string>
+  <string name="blocked_numbers_disabled_emergency_header_label">Блокування дзвінків тимчасово вимкнено</string>
+  <string name="blocked_numbers_disabled_emergency_desc">Блокування дзвінків вимкнено, оскільки ви зверталися з цього телефона в екстрені служби протягом останніх 48 годин. Ця функція автоматично ввімкнеться, коли мине 48 годин.</string>
+  <string name="import_send_to_voicemail_numbers_label">Імпортувати номери</string>
+  <string name="blocked_call_settings_import_description">Ви позначили абонентів, чиї дзвінки мають автоматично спрямовуватися на голосову пошту через інші додатки.</string>
+  <string name="blocked_call_settings_view_numbers_button">Переглянути номери</string>
+  <string name="blocked_call_settings_import_button">Імпортувати</string>
+  <string name="description_blocked_number_list_delete">Розблокувати номер</string>
+  <string name="addBlockedNumber">Додати номер</string>
+  <string name="block_number_footer_message_vvm">Виклики з цих номерів блокуватимуться, а голосові повідомлення автоматично видалятимуться.</string>
+  <string name="block_number_footer_message_no_vvm">Виклики з цих номерів блокуватимуться, але абоненти зможуть залишати голосові повідомлення.</string>
+  <string name="block_list">Заблоковані номери</string>
+  <string name="alreadyBlocked">Номер %1$s уже заблоковано.</string>
+  <string name="phone_account_settings_label">Обл. записи для дзвінків</string>
+  <string name="permission_no_speeddial">Щоб активувати швидкий набір, увімкніть дозвіл \"Контакти\".</string>
+  <string name="permission_no_calllog">Щоб переглянути журнал викликів, увімкніть дозвіл \"Телефон\".</string>
+  <string name="permission_no_search">Щоб шукати контакти, увімкніть дозвіл \"Контакти\".</string>
+  <string name="permission_place_call">Щоб зателефонувати, увімкніть дозвіл \"Телефон\".</string>
+  <string name="toast_cannot_write_system_settings">Додаток Телефон не має дозволу змінювати системні налаштування.</string>
+  <string name="blocked_number_call_log_label">Заблоковано</string>
+  <string name="call_log_action_block_report_number">Заблокувати/позначити як спам</string>
+  <string name="call_log_action_block_number">Заблокувати номер</string>
+  <string name="call_log_action_remove_spam">Не спам</string>
+  <string name="call_log_action_unblock_number">Розблокувати номер</string>
+  <string name="spam_number_call_log_label">Спам</string>
+  <string name="call_composer_connection_failed">%1$s не в мережі, неможливо встановити зв’язок</string>
+  <string name="about_phone_label">Про додаток</string>
+  <string name="voicemail_transcription_branding_text">Транскрипція від Google</string>
+  <string name="voicemail_transcription_in_progress">Транскрибування…</string>
+  <string name="voicemail_transcription_failed">Транскрипція недоступна.</string>
+  <string name="voicemail_transcription_failed_language_not_supported">Транскрипція недоступна. Мова не підтримується.</string>
+  <string name="voicemail_transcription_failed_no_speech">Транскрипція недоступна. Не виявлено мовлення.</string>
+  <string name="voicemail_donation_promo_title">Хочете допомогти покращити якість транскрипції?</string>
+  <string name="voicemail_donation_promo_content">Надайте Google доступ до цього й подальших повідомлень голосової пошти з транскрипцією. Повідомлення зберігатимуться анонімно. Ви можете будь-коли змінити налаштування. %1$s</string>
+  <string name="voicemail_donation_promo_opt_in">Погоджуюся</string>
+  <string name="voicemail_donation_promo_opt_out">Ні, дякую</string>
+  <string name="voicemail_transcription_rating">Оцініть якість транскрипції</string>
+  <string name="voicemail_transcription_rating_thanks">Дякуємо за ваш відгук</string>
+  <string name="description_rating_good">Подобається</string>
+  <string name="description_rating_bad">Не подобається</string>
+  <string name="view_conversation">Переглянути</string>
+  <string name="ec_data_deleted">Виклик видалено. Переглянути й видалити файли, надіслані під час цього виклику, можна в Повідомленнях.</string>
+  <string name="multiple_ec_data_deleted">Виклики видалено. Переглянути й видалити файли, надіслані під час цих викликів, можна в Повідомленнях.</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-ur/strings.xml b/java/com/android/dialer/app/res/values-ur/strings.xml
index 2536286..0016d12 100644
--- a/java/com/android/dialer/app/res/values-ur/strings.xml
+++ b/java/com/android/dialer/app/res/values-ur/strings.xml
@@ -1,179 +1,171 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="applicationLabel" msgid="2202739481132958990">"فون"</string>
-    <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"فون کی پیڈ"</string>
-    <string name="callHistoryIconLabel" msgid="7493268743411968630">"کال کی سرگزشت"</string>
-    <string name="action_copy_number_text" msgid="832682558551502319">"نمبر کاپی کریں"</string>
-    <string name="copy_transcript_text" msgid="937904189017310829">"ٹرانسکرپشن کاپی کریں"</string>
-    <string name="action_edit_number_before_call" msgid="8017492815878473837">"کال کرنے سے پہلے نمبر میں ترمیم کریں"</string>
-    <string name="call_log_delete_all" msgid="7852970926906523784">"کال کی سرگزشت صاف کریں"</string>
-    <string name="call_log_trash_voicemail" msgid="6118493534178533972">"صوتی میل حذف کریں"</string>
-    <string name="snackbar_voicemail_deleted" msgid="7463166543725496307">"صوتی میل حذف ہو گئی"</string>
-    <string name="snackbar_voicemail_deleted_undo" msgid="6959743982796409941">"کالعدم کریں"</string>
-    <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"کال کی سرگزشت صاف کریں؟"</string>
-    <string name="clearCallLogConfirmation" msgid="6844949465815109166">"یہ آپ کی سرگزشت سے سبھی کالز کو حذف کر دے گا"</string>
-    <string name="clearCallLogProgress_title" msgid="995004835687361977">"کال کی سرگزشت صاف کی جا رہی ہے…"</string>
-    <string name="notification_missedCallTitle" msgid="8283366068539898486">"چھوٹی ہوئی کال"</string>
-    <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"کام سے متعلق چھوٹی ہوئی کال"</string>
-    <string name="notification_missedCallsTitle" msgid="3697442015345089802">"چھوٹی ہوئی کالیں"</string>
-    <string name="notification_missedCallsMsg" msgid="8176217633929018706">"<xliff:g id="NUM_MISSED_CALLS">%d</xliff:g> چھوٹی ہوئی کالیں"</string>
-    <string name="notification_missedCall_call_back" msgid="3875698110051973965">"واپس کال کریں"</string>
-    <string name="notification_missedCall_message" msgid="5086910028988305964">"پیغام"</string>
-    <string name="post_call_notification_message" msgid="5417476789860590611">"<xliff:g id="NAME">%1$s</xliff:g>: <xliff:g id="MESSAGE">%2$s</xliff:g>"</string>
-    <string name="notification_voicemail_text_format" msgid="1895667520930252897">"<xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g> ڈائل کریں"</string>
-    <string name="notification_voicemail_no_vm_number" msgid="8942821987929495842">"صوتی میل نمبر نامعلوم ہے"</string>
-    <plurals name="notification_voicemail_title" formatted="false" msgid="1551847434476438657">
-      <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> صوتی میلز </item>
-      <item quantity="one">صوتی میل</item>
-    </plurals>
-    <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>، <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
-    <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"<xliff:g id="CALLER">%1$s</xliff:g> کی جانب سے نیا صوتی میل"</string>
-    <string name="voicemail_playback_error" msgid="4384373852257757295">"صوتی میل نہیں چلا سکا"</string>
-    <string name="voicemail_fetching_content" msgid="572320120918636014">"صوتی میل لوڈ ہو رہا ہے…"</string>
-    <string name="voicemail_fetching_timout" msgid="2128873915839949783">"صوتی میل لوڈ نہیں کیا جا سکا"</string>
-    <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_playback_speakerphone" msgid="4852027754869750227">"اسپیکر فون آن یا آف کریں"</string>
-    <string name="description_playback_seek" msgid="1340910573254132520">"پلے بیک پوزیشن طلب کریں"</string>
-    <string name="action_menu_call_history_description" msgid="8829135306925008546">"کال کی سرگزشت"</string>
-    <string name="action_menu_overflow_description" msgid="7648679686746517341">"مزید اختیارات"</string>
-    <string name="action_menu_dialpad_button" msgid="1970631633457493180">"کی پیڈ"</string>
-    <string name="dialer_settings_label" msgid="4980176284150290175">"ترتیبات"</string>
-    <string name="simulator_submenu_label" msgid="186156287346615267">"Simulator"</string>
-    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"‏نیا UI شارٹ کٹ تخلیق کریں"</string>
-    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"بلک کاروائی موڈ میں داخل ہو رہا ہے"</string>
-    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"بلک کاروائی موڈ چھوڑ دیا"</string>
-    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"منتخب کردہ <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"غیر منتخب کردہ <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_contact_details" msgid="3341280873855253464">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> کیلئے رابطہ کی تفصیلات"</string>
-    <string name="description_spam_contact_details" msgid="5592578752881528368">"مشتبہ سپام کالر کی رابطہ تفصیلات <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> کالیں۔"</string>
-    <string name="description_video_call" msgid="3738199365585751727">"ویڈیو کال۔"</string>
-    <string name="description_start_voice_search" msgid="8380022725973015261">"صوتی تلاش شروع کریں"</string>
-    <string name="voicemail" msgid="8899540969000957954">"صوتی میل"</string>
-    <string name="description_cancel_multi_select" msgid="3930475950253360461">"بیچ کاروائی موڈ منسوخ کریں"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"حذف کریں"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"منسوخ کریں"</string>
-    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"<xliff:g id="NUMBER">%1$s</xliff:g> منتخب کردہ"</string>
-    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
-      <item quantity="other">"<b>"ان صوتی میلز کو حذف کریں؟ "</b>"</item>
-      <item quantity="one">"<b>"اس صوتی میل کو حذف کریں؟ "</b>"</item>
-    </plurals>
-    <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
-    <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> بوقت <xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
-    <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="voice_search_not_available" msgid="6546240433719732905">"صوتی تلاش دستیاب نہیں ہے"</string>
-    <string name="dialer_hint_find_contact" msgid="2023214799381149808">"رابطے تلاش کریں"</string>
-    <string name="block_number_search_hint" msgid="5377706079015099416">"نمبر شامل کریں یا رابطے تلاش کریں"</string>
-    <string name="call_log_all_empty" msgid="3955572868518162004">"آپ کی کال کی سرگزشت خالی ہے"</string>
-    <string name="call_log_all_empty_action" msgid="852218280136243014">"ایک کال کریں"</string>
-    <string name="call_log_missed_empty" msgid="7094936030845062214">"آپ کے پاس کوئی چھوٹی ہوئی کالز نہیں ہیں۔"</string>
-    <string name="call_log_voicemail_empty" msgid="273623903423275178">"آپ کا صوتی میل ان باکس خالی ہے۔"</string>
-    <string name="call_log_activity_title" msgid="1275242727244945527">"کال کی سرگزشت"</string>
-    <string name="call_log_all_title" msgid="6042262422192020327">"سبھی"</string>
-    <string name="call_log_missed_title" msgid="17254005889268015">"چھوٹی ہوئی"</string>
-    <string name="tab_speed_dial" msgid="6616404752227561075">"اسپیڈ ڈائل"</string>
-    <string name="tab_history" msgid="7420269368689503596">"کال کی سرگزشت"</string>
-    <string name="tab_all_contacts" msgid="5531733977693943015">"رابطے"</string>
-    <string name="tab_voicemail" msgid="2458548090088316246">"صوتی میل"</string>
-    <string name="search_shortcut_call_number" msgid="8847918845036880688">"<xliff:g id="NUMBER">%s</xliff:g> کو کال کریں"</string>
-    <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"نیا رابطہ بنائیں"</string>
-    <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"رابطے میں شامل کریں"</string>
-    <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"‏SMS بھیجیں"</string>
-    <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"ویڈیو کال کریں"</string>
-    <string name="search_shortcut_block_number" msgid="4587283230665805776">"نمبر مسدود کریں"</string>
-    <string name="speed_dial_empty" msgid="3346406399966039505">"آپ کے اسپیڈ ڈائل پر ابھی تک کوئی نہیں ہے"</string>
-    <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"ایک پسندیدہ شامل کریں"</string>
-    <string name="remove_contact" msgid="2353580570488923668">"ہٹائیں"</string>
-    <string name="select_all" msgid="408601760696146245">"سبھی کو منتخب کریں"</string>
-    <string name="call_log_action_video_call" msgid="7565549950343850819">"ویڈیو کال"</string>
-    <string name="call_log_action_send_message" msgid="6948727362660115554">"پیغام بھیجیں"</string>
-    <string name="call_log_action_details" msgid="2091370737371449501">"کال کی تفصیلات"</string>
-    <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"بھیجیں بنام …"</string>
-    <string name="call_log_action_call" msgid="682724094251540583">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> کو کال کریں"</string>
-    <string name="description_incoming_missed_call" msgid="8292535799379230029">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>، <xliff:g id="TYPEORLOCATION">^2</xliff:g>، <xliff:g id="TIMEOFCALL">^3</xliff:g>، <xliff:g id="PHONEACCOUNT">^4</xliff:g> کی جانب سے چھوٹی ہوئی کال۔"</string>
-    <string name="description_incoming_answered_call" msgid="3920182963103160610">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>، <xliff:g id="TYPEORLOCATION">^2</xliff:g>، <xliff:g id="TIMEOFCALL">^3</xliff:g>، <xliff:g id="PHONEACCOUNT">^4</xliff:g> کی جانب سے جواب دی گئی کال۔"</string>
-    <string name="description_unread_voicemail" msgid="145170985013419170">"بغیر پڑھی گئی صوتی میل منجانب <xliff:g id="NAMEORNUMBER">^1</xliff:g>، <xliff:g id="TYPEORLOCATION">^2</xliff:g>، <xliff:g id="TIMEOFCALL">^3</xliff:g>، <xliff:g id="PHONEACCOUNT">^4</xliff:g>۔"</string>
-    <string name="description_read_voicemail" msgid="5585559881573227732">"صوتی میل منجانب <xliff:g id="NAMEORNUMBER">^1</xliff:g>، <xliff:g id="TYPEORLOCATION">^2</xliff:g>، <xliff:g id="TIMEOFCALL">^3</xliff:g>، <xliff:g id="PHONEACCOUNT">^4</xliff:g>۔"</string>
-    <string name="description_outgoing_call" msgid="543952487882919924">"<xliff:g id="NAMEORNUMBER">^1</xliff:g>، <xliff:g id="TYPEORLOCATION">^2</xliff:g>، <xliff:g id="TIMEOFCALL">^3</xliff:g>، <xliff:g id="PHONEACCOUNT">^4</xliff:g> پر کال کریں۔"</string>
-    <string name="call_log_via_number" msgid="1340307109806397650">"بذریعہ <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> بذریعہ <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="description_call_action" msgid="4042796498169106545">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> کو کال کریں"</string>
-    <string name="description_video_call_action" msgid="1237090968588659650">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> کو ویڈیو کال کریں۔"</string>
-    <string name="description_voicemail_action" msgid="3290143432403538524">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> سے صوتی میل سنیں"</string>
-    <string name="description_create_new_contact_action" msgid="1928282350281564130">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> کیلئے رابطہ بنائیں"</string>
-    <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> کو موجودہ رابطہ میں شامل کریں"</string>
-    <string name="description_details_action" msgid="2061866409737706174">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> کیلئے کال کی تفصیلات"</string>
-    <string name="call_log_header_today" msgid="1576119097475845293">"ﺁﺝ"</string>
-    <string name="call_log_header_yesterday" msgid="5616077776205329563">"گزشتہ کل"</string>
-    <string name="call_log_header_other" msgid="4940676886254217644">"قدیم تر"</string>
-    <string name="voicemail_speaker_on" msgid="3151333608926996668">"اسپیکر کو آن کر دیں۔"</string>
-    <string name="voicemail_speaker_off" msgid="2530064206962034201">"اسپیکر کو آف کر دیں۔"</string>
-    <string name="voicemail_play_start_pause" msgid="3874823480278334664">"پلے بیک شروع یا موقوف کریں۔"</string>
-    <string name="display_options_title" msgid="3880091801055797975">"ڈسپلے کے اختیارات"</string>
-    <string name="sounds_and_vibration_title" msgid="3075050000721181384">"آوازیں اور وائبریشن"</string>
-    <string name="accessibility_settings_title" msgid="3329027650429831820">"ایکسیسبیلٹی"</string>
-    <string name="ringtone_title" msgid="8377174189894648486">"فون رِنگ ٹون"</string>
-    <string name="vibrate_on_ring_title" msgid="631441314790960485">"کالز کیلئے وائبریٹ بھی کرے"</string>
-    <string name="dtmf_tone_enable_title" msgid="3273762431523939277">"کی بیڈ ٹونز"</string>
-    <string name="dtmf_tone_length_title" msgid="534096029202438539">"کی پیڈ ٹون کی طوالت"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="applicationLabel">فون</string>
+  <string name="launcherDialpadActivityLabel">فون کی پیڈ</string>
+  <string name="callHistoryIconLabel">کال کی سرگزشت</string>
+  <string name="action_copy_number_text">نمبر کاپی کریں</string>
+  <string name="copy_transcript_text">ٹرانسکرپشن کاپی کریں</string>
+  <string name="action_edit_number_before_call">کال کرنے سے پہلے نمبر میں ترمیم کریں</string>
+  <string name="call_log_delete_all">کال کی سرگزشت صاف کریں</string>
+  <string name="call_log_trash_voicemail">صوتی میل حذف کریں</string>
+  <string name="snackbar_voicemail_deleted">صوتی میل حذف ہو گئی</string>
+  <string name="clearCallLogConfirmation_title">کال کی سرگزشت صاف کریں؟</string>
+  <string name="clearCallLogConfirmation">یہ آپ کی سرگزشت سے سبھی کالز کو حذف کر دے گا</string>
+  <string name="clearCallLogProgress_title">کال کی سرگزشت صاف کی جا رہی ہے…</string>
+  <string name="notification_missedCallTitle">چھوٹی ہوئی کال</string>
+  <string name="notification_missedWorkCallTitle">کام سے متعلق چھوٹی ہوئی کال</string>
+  <string name="notification_missedCallsTitle">چھوٹی ہوئی کالیں</string>
+  <string name="notification_missedCallsMsg">%d چھوٹی ہوئی کالیں</string>
+  <string name="notification_missedCall_call_back">واپس کال کریں</string>
+  <string name="notification_missedCall_message">پیغام</string>
+  <string name="post_call_notification_message">%1$s: %2$s</string>
+  <string name="notification_voicemail_text_format">%s ڈائل کریں</string>
+  <string name="notification_voicemail_no_vm_number">صوتی میل نمبر نامعلوم ہے</string>
+  <plurals name="notification_voicemail_title">
+    <item quantity="one">صوتی میل</item>
+    <item quantity="other"> %1$d صوتی میلز </item>
+  </plurals>
+  <string name="notification_voicemail_callers_list">%1$s، %2$s</string>
+  <string name="notification_new_voicemail_ticker">%1$s کی جانب سے نیا صوتی میل</string>
+  <string name="voicemail_playback_error">صوتی میل نہیں چلا سکا</string>
+  <string name="voicemail_fetching_content">صوتی میل لوڈ ہو رہا ہے…</string>
+  <string name="voicemail_fetching_timout">صوتی میل لوڈ نہیں کیا جا سکا</string>
+  <string name="call_log_item_count_and_date">(%1$d) %2$s</string>
+  <string name="description_playback_speakerphone">اسپیکر فون آن یا آف کریں</string>
+  <string name="description_playback_seek">پلے بیک پوزیشن طلب کریں</string>
+  <string name="action_menu_call_history_description">کال کی سرگزشت</string>
+  <string msgid="2295659037509008453" name="action_menu_overflow_description">مزید اختیارات</string>
+  <string name="action_menu_dialpad_button">کی پیڈ</string>
+  <string name="dialer_settings_label">ترتیبات</string>
+  <string name="simulator_submenu_label">Simulator</string>
+  <string name="new_ui_launcher_shortcut_label">‏نیا UI شارٹ کٹ تخلیق کریں</string>
+  <string name="description_entering_bulk_action_mode">بلک کاروائی موڈ میں داخل ہو رہا ہے</string>
+  <string name="description_leaving_bulk_action_mode">بلک کاروائی موڈ چھوڑ دیا</string>
+  <string name="description_selecting_bulk_action_mode">منتخب کردہ %1$s</string>
+  <string name="description_unselecting_bulk_action_mode">غیر منتخب کردہ %1$s</string>
+  <string name="description_contact_details">%1$s کیلئے رابطہ کی تفصیلات</string>
+  <string name="description_spam_contact_details">مشتبہ سپام کالر کی رابطہ تفصیلات %1$s</string>
+  <string name="description_num_calls">%1$s کالیں۔</string>
+  <string name="description_video_call">ویڈیو کال۔</string>
+  <string name="description_start_voice_search">صوتی تلاش شروع کریں</string>
+  <string name="voicemail">صوتی میل</string>
+  <string name="description_cancel_multi_select">بیچ کاروائی موڈ منسوخ کریں</string>
+  <string name="voicemailMultiSelectDeleteConfirm">حذف کریں</string>
+  <string name="voicemailMultiSelectDeleteCancel">منسوخ کریں</string>
+  <string name="voicemailMultiSelectActionBarTitle">%1$s منتخب کردہ</string>
+  <plurals name="delete_voicemails_confirmation_dialog_title">
+    <item quantity="one"><b>اس صوتی میل کو حذف کریں؟ </b></item>
+    <item quantity="other"><b>ان صوتی میلز کو حذف کریں؟ </b></item>
+  </plurals>
+  <string name="voicemailCallLogToday">@string/call_log_header_today</string>
+  <string name="voicemailCallLogDateTimeFormat">%1$s بوقت %2$s</string>
+  <string name="voicemailDurationFormat">%1$02d:%2$02d</string>
+  <string name="voicemailCallLogDateTimeFormatWithDuration">%1$s • %2$s</string>
+  <string name="voice_search_not_available">صوتی تلاش دستیاب نہیں ہے</string>
+  <string name="dialer_hint_find_contact">رابطے تلاش کریں</string>
+  <string name="block_number_search_hint">نمبر شامل کریں یا رابطے تلاش کریں</string>
+  <string name="call_log_all_empty">آپ کی کال کی سرگزشت خالی ہے</string>
+  <string name="call_log_all_empty_action">ایک کال کریں</string>
+  <string name="call_log_missed_empty">آپ کے پاس کوئی چھوٹی ہوئی کالز نہیں ہیں۔</string>
+  <string name="call_log_voicemail_empty">آپ کا صوتی میل ان باکس خالی ہے۔</string>
+  <string name="call_log_activity_title">کال کی سرگزشت</string>
+  <string name="call_log_all_title">سبھی</string>
+  <string name="call_log_missed_title">چھوٹی ہوئی</string>
+  <string name="tab_speed_dial">اسپیڈ ڈائل</string>
+  <string name="tab_history">کال کی سرگزشت</string>
+  <string name="tab_all_contacts">رابطے</string>
+  <string name="tab_voicemail">صوتی میل</string>
+  <string name="search_shortcut_call_number">%s کو کال کریں</string>
+  <string name="search_shortcut_create_new_contact">نیا رابطہ بنائیں</string>
+  <string name="search_shortcut_add_to_contact">رابطے میں شامل کریں</string>
+  <string name="search_shortcut_send_sms_message">‏SMS بھیجیں</string>
+  <string name="search_shortcut_make_video_call">ویڈیو کال کریں</string>
+  <string name="search_shortcut_block_number">نمبر مسدود کریں</string>
+  <string name="speed_dial_empty">آپ کے اسپیڈ ڈائل پر ابھی تک کوئی نہیں ہے</string>
+  <string name="speed_dial_empty_add_favorite_action">ایک پسندیدہ شامل کریں</string>
+  <string name="remove_contact">ہٹائیں</string>
+  <string name="select_all">سبھی کو منتخب کریں</string>
+  <string name="call_log_action_video_call">ویڈیو کال</string>
+  <string name="call_log_action_set_up_video">ویڈیو کالنگ سیٹ اپ کریں</string>
+  <string name="call_log_action_invite_video">ویڈیو کال میں مدعو کریں</string>
+  <string name="call_log_action_send_message">پیغام بھیجیں</string>
+  <string name="call_log_action_details">کال کی تفصیلات</string>
+  <string name="call_log_action_share_voicemail">بھیجیں بنام …</string>
+  <string name="call_log_action_call">^1 کو کال کریں</string>
+  <string name="description_incoming_missed_call">^1، ^2، ^3، ^4 کی جانب سے چھوٹی ہوئی کال۔</string>
+  <string name="description_incoming_answered_call">^1، ^2، ^3، ^4 کی جانب سے جواب دی گئی کال۔</string>
+  <string name="description_unread_voicemail">بغیر پڑھی گئی صوتی میل منجانب ^1، ^2، ^3، ^4۔</string>
+  <string name="description_read_voicemail">صوتی میل منجانب ^1، ^2، ^3، ^4۔</string>
+  <string name="description_outgoing_call">^1، ^2، ^3، ^4 پر کال کریں۔</string>
+  <string name="call_log_via_number">بذریعہ %1$s</string>
+  <string name="call_log_via_number_phone_account">%1$s بذریعہ %2$s</string>
+  <string name="description_call_action">^1 کو کال کریں</string>
+  <string name="description_video_call_action">^1 کو ویڈیو کال کریں۔</string>
+  <string name="description_voicemail_action">^1 سے صوتی میل سنیں</string>
+  <string name="description_create_new_contact_action">^1 کیلئے رابطہ بنائیں</string>
+  <string name="description_add_to_existing_contact_action">^1 کو موجودہ رابطہ میں شامل کریں</string>
+  <string name="description_details_action">^1 کیلئے کال کی تفصیلات</string>
+  <string name="call_log_header_today">ﺁﺝ</string>
+  <string name="call_log_header_yesterday">گزشتہ کل</string>
+  <string name="call_log_header_other">قدیم تر</string>
+  <string name="voicemail_speaker_on">اسپیکر کو آن کر دیں۔</string>
+  <string name="voicemail_speaker_off">اسپیکر کو آف کر دیں۔</string>
+  <string name="voicemail_play_start_pause">پلے بیک شروع یا موقوف کریں۔</string>
+  <string name="display_options_title">ڈسپلے کے اختیارات</string>
+  <string name="sounds_and_vibration_title">آوازیں اور وائبریشن</string>
+  <string name="accessibility_settings_title">ایکسیسبیلٹی</string>
+  <string name="ringtone_title">فون رِنگ ٹون</string>
+  <string name="vibrate_on_ring_title">کالز کیلئے وائبریٹ بھی کرے</string>
+  <string name="dtmf_tone_enable_title">کی بیڈ ٹونز</string>
+  <string name="dtmf_tone_length_title">کی پیڈ ٹون کی طوالت</string>
   <string-array name="dtmf_tone_length_entries">
-    <item msgid="3136353015227162823">"حسب معمول"</item>
-    <item msgid="5376841175538523822">"طویل"</item>
+    <item>حسب معمول</item>
+    <item>طویل</item>
   </string-array>
-    <string name="respond_via_sms_setting_title" msgid="8008181606657693452">"فوری جوابات"</string>
-    <string name="call_settings_label" msgid="7824611757200960807">"کالز"</string>
-    <string name="manage_blocked_numbers_label" msgid="16823761991832273">"کال مسدود کرنا"</string>
-    <string name="voicemail_settings_label" msgid="4594299554519920570">"صوتی میل"</string>
-    <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"کال مسدود کرنا عارضی طور پر آف ہے"</string>
-    <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"کال مسدود کرنا غیر فعال کر دیا گیا ہے کیونکہ آپ نے پچھلے 48 گھنٹوں میں اس فون سے ہنگامی سروسز کے ساتھ رابطہ کیا تھا۔ جب 48 گھنٹے کا دورانیہ ختم ہوگا تو یہ خودکار طور پر دوبارہ فعال ہو جائے گا۔"</string>
-    <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"نمبرز درآمد کریں"</string>
-    <string name="blocked_call_settings_import_description" msgid="1819412052545228965">"آپ نے پہلے کچھ کالرز کو خودکار طور پر بذریعہ دیگر ایپس صوتی میل کو بھیجنا نشان زد کیا تھا۔"</string>
-    <string name="blocked_call_settings_view_numbers_button" msgid="3332727948554356704">"نمبرز دیکھیں"</string>
-    <string name="blocked_call_settings_import_button" msgid="7319111700387470727">"درآمد کریں"</string>
-    <string name="description_blocked_number_list_delete" msgid="2139644216858370740">"نمبر غیر مسدود کریں"</string>
-    <string name="addBlockedNumber" msgid="3053473735238295551">"نمبر شامل کریں"</string>
-    <string name="block_number_footer_message_vvm" msgid="7955326304033982368">"ان نمبرز سے کالز مسدود ہوجائیں گی اور صوتی میلز خودبخود جذف ہو جائیں گی۔"</string>
-    <string name="block_number_footer_message_no_vvm" msgid="1152684139070471665">"ان نمبرز سے کالز مسدود ہو جائیں گی گی لیکن ممکن ہے وہ پھر بھی آپ کیلئے صوتی میلز چھوڑ پائیں۔"</string>
-    <string name="block_list" msgid="4701585783411870782">"مسدود کردہ نمبرز"</string>
-    <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g> پہلے ہی مسدود ہے۔"</string>
-    <string name="phone_account_settings_label" msgid="8372485478006965920">"کالنگ اکاؤنٹس"</string>
-    <string name="permission_no_speeddial" msgid="8487215628510596753">"اسپیڈ ڈائل کو فعال کرنے کیلئے رابطوں کی اجازت آن کریں۔"</string>
-    <string name="permission_no_calllog" msgid="4053705651238775784">"اپنا کال لاگ دیکھنے کیلئے فون کی اجازت آن کریں۔"</string>
-    <string name="permission_no_search" msgid="2424710404207193826">"اپنے رابطوں کو تلاش کرنے کیلئے رابطوں کی اجازتیں آن کریں۔"</string>
-    <string name="permission_place_call" msgid="8686908130349369423">"کال کرنے کیلئے فون کی اجازت آن کریں۔"</string>
-    <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"فون ایپ کے پاس سسٹم ترتیبات کو لکھنے کی اجازت نہیں ہے۔"</string>
-    <string name="blocked_number_call_log_label" msgid="4212282846299997693">"مسدود"</string>
-    <string name="call_log_action_block_report_number" msgid="7302636538668696729">"مسدود کریں/سپام کی اطلاع دیں"</string>
-    <string name="call_log_action_block_number" msgid="5048188386501998865">"نمبر مسدود کریں"</string>
-    <string name="call_log_action_remove_spam" msgid="2045319806318398403">"سپام نہیں ہے"</string>
-    <string name="call_log_action_unblock_number" msgid="6100117033288448758">"نمبر غیر مسدود کریں"</string>
-    <string name="spam_number_call_log_label" msgid="2678431398326811131">"سپام"</string>
-    <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> آف لائن ہے اور اس تک پہنچا نہیں جا سکتا"</string>
-    <string name="about_phone_label" msgid="582991354677973731">"تفصیل"</string>
-    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"‏Google کی جانب سے ٹرانسکرائب کردہ"</string>
-    <string name="voicemail_transcription_in_progress" msgid="2933320969613783210">"‏Google نقل حرفی کر رہا ہے…"</string>
-    <string name="voicemail_transcription_failed" msgid="335275303117412706">"ٹرانسکرپٹ دستیاب نہیں ہے۔"</string>
-    <string name="voicemail_transcription_failed_language_not_supported" msgid="4210332591050562553">"ٹرانسکرپٹ دستیاب نہیں ہے۔ زبان تعاون یافتہ نہیں ہے۔"</string>
-    <string name="voicemail_transcription_failed_no_speech" msgid="9093372879697874852">"ٹرانسکرپٹ دستیاب نہیں ہے۔ کسی بھی اسپیچ کا پتا نہیں چلا ہے۔"</string>
-    <string name="view_conversation" msgid="7895904782094119702">"دیکھیں"</string>
-    <string name="ec_data_deleted" msgid="4794880345545827107">"کال حذف ہو گئی۔ اس کال کے دوران اشتراک کردہ منسلکہ جات کو \'پیغامات \' میں ملاحظہ کریں اور حذف کریں۔"</string>
-    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"کالیں حذف ہو گئیں۔ کالوں کے دوران اشتراک کردہ منسلکہ جات کو \'پیغامات \' میں ملاحظہ کریں اور حذف کریں۔"</string>
+  <string name="respond_via_sms_setting_title">فوری جوابات</string>
+  <string name="call_settings_label">کالز</string>
+  <string name="manage_blocked_numbers_label">مسدود کردہ نمبرز</string>
+  <string name="voicemail_settings_label">صوتی میل</string>
+  <string name="blocked_numbers_disabled_emergency_header_label">کال مسدود کرنا عارضی طور پر آف ہے</string>
+  <string name="blocked_numbers_disabled_emergency_desc">کال مسدود کرنا غیر فعال کر دیا گیا ہے کیونکہ آپ نے پچھلے 48 گھنٹوں میں اس فون سے ہنگامی سروسز کے ساتھ رابطہ کیا تھا۔ جب 48 گھنٹے کا دورانیہ ختم ہوگا تو یہ خودکار طور پر دوبارہ فعال ہو جائے گا۔</string>
+  <string name="import_send_to_voicemail_numbers_label">نمبرز درآمد کریں</string>
+  <string name="blocked_call_settings_import_description">آپ نے پہلے کچھ کالرز کو خودکار طور پر بذریعہ دیگر ایپس صوتی میل کو بھیجنا نشان زد کیا تھا۔</string>
+  <string name="blocked_call_settings_view_numbers_button">نمبرز دیکھیں</string>
+  <string name="blocked_call_settings_import_button">درآمد کریں</string>
+  <string name="description_blocked_number_list_delete">نمبر غیر مسدود کریں</string>
+  <string name="addBlockedNumber">نمبر شامل کریں</string>
+  <string name="block_number_footer_message_vvm">ان نمبرز سے کالز مسدود ہوجائیں گی اور صوتی میلز خودبخود جذف ہو جائیں گی۔</string>
+  <string name="block_number_footer_message_no_vvm">ان نمبرز سے کالز مسدود ہو جائیں گی گی لیکن ممکن ہے وہ پھر بھی آپ کیلئے صوتی میلز چھوڑ پائیں۔</string>
+  <string name="block_list">مسدود کردہ نمبرز</string>
+  <string name="alreadyBlocked">%1$s پہلے ہی مسدود ہے۔</string>
+  <string name="phone_account_settings_label">کالنگ اکاؤنٹس</string>
+  <string name="permission_no_speeddial">اسپیڈ ڈائل کو فعال کرنے کیلئے رابطوں کی اجازت آن کریں۔</string>
+  <string name="permission_no_calllog">اپنا کال لاگ دیکھنے کیلئے فون کی اجازت آن کریں۔</string>
+  <string name="permission_no_search">اپنے رابطوں کو تلاش کرنے کیلئے رابطوں کی اجازتیں آن کریں۔</string>
+  <string name="permission_place_call">کال کرنے کیلئے فون کی اجازت آن کریں۔</string>
+  <string name="toast_cannot_write_system_settings">فون ایپ کے پاس سسٹم ترتیبات کو لکھنے کی اجازت نہیں ہے۔</string>
+  <string name="blocked_number_call_log_label">مسدود</string>
+  <string name="call_log_action_block_report_number">مسدود کریں/سپام کی اطلاع دیں</string>
+  <string name="call_log_action_block_number">نمبر مسدود کریں</string>
+  <string name="call_log_action_remove_spam">سپام نہیں ہے</string>
+  <string name="call_log_action_unblock_number">نمبر غیر مسدود کریں</string>
+  <string name="spam_number_call_log_label">سپام</string>
+  <string name="call_composer_connection_failed">%1$s آف لائن ہے اور اس تک پہنچا نہیں جا سکتا</string>
+  <string name="about_phone_label">تفصیل</string>
+  <string name="voicemail_transcription_branding_text">‏Google کی جانب سے ٹرانسکرائب کردہ</string>
+  <string name="voicemail_transcription_in_progress">نقل حرفی ہو رہی ہے…</string>
+  <string name="voicemail_transcription_failed">ٹرانسکرپٹ دستیاب نہیں ہے۔</string>
+  <string name="voicemail_transcription_failed_language_not_supported">ٹرانسکرپٹ دستیاب نہیں ہے۔ زبان تعاون یافتہ نہیں ہے۔</string>
+  <string name="voicemail_transcription_failed_no_speech">ٹرانسکرپٹ دستیاب نہیں ہے۔ کسی بھی اسپیچ کا پتا نہیں چلا ہے۔</string>
+  <string name="voicemail_donation_promo_title">نقل حرفی کی درستگی کو بہتر بنانے میں مدد کریں؟</string>
+  <string name="voicemail_donation_promo_content">‏Google کو ٹرانسکرپٹس کے ساتھ اس کا اور آئندہ کے صوتی میل کے پیغامات کا جائزہ لینے کی اجازت دیں۔ انہیں گمنام طور پر اسٹور کیا جائے گا۔ کسی بھی وقت ترتیبات کو تبدیل کریں۔ %1$s</string>
+  <string name="voicemail_donation_promo_opt_in">ہاں، میں شامل ہوں</string>
+  <string name="voicemail_donation_promo_opt_out">نہیں شکریہ</string>
+  <string name="voicemail_transcription_rating">نقل حرفی کے معیار کی درجہ بندی کریں</string>
+  <string name="voicemail_transcription_rating_thanks">آپ کے تاثرات کا شکریہ</string>
+  <string name="description_rating_good">پسند کریں</string>
+  <string name="description_rating_bad">ناپسند کریں</string>
+  <string name="view_conversation">دیکھیں</string>
+  <string name="ec_data_deleted">کال حذف ہو گئی۔ اس کال کے دوران اشتراک کردہ منسلکہ جات کو \'پیغامات \' میں ملاحظہ کریں اور حذف کریں۔</string>
+  <string name="multiple_ec_data_deleted">کالیں حذف ہو گئیں۔ کالوں کے دوران اشتراک کردہ منسلکہ جات کو \'پیغامات \' میں ملاحظہ کریں اور حذف کریں۔</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-uz/strings.xml b/java/com/android/dialer/app/res/values-uz/strings.xml
index 32110da..2081a5a 100644
--- a/java/com/android/dialer/app/res/values-uz/strings.xml
+++ b/java/com/android/dialer/app/res/values-uz/strings.xml
@@ -1,179 +1,171 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="applicationLabel" msgid="2202739481132958990">"Telefon"</string>
-    <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"Telefon klaviaturasi"</string>
-    <string name="callHistoryIconLabel" msgid="7493268743411968630">"Chaqiruvlar tarixi"</string>
-    <string name="action_copy_number_text" msgid="832682558551502319">"Raqamdan nusxa olish"</string>
-    <string name="copy_transcript_text" msgid="937904189017310829">"Transkripsiyadan nusxa olish"</string>
-    <string name="action_edit_number_before_call" msgid="8017492815878473837">"Tahrirlash va telefon qilish"</string>
-    <string name="call_log_delete_all" msgid="7852970926906523784">"Qo‘ng‘iroqlar tarixini tozalash"</string>
-    <string name="call_log_trash_voicemail" msgid="6118493534178533972">"Ovozli xabarni o‘chirish"</string>
-    <string name="snackbar_voicemail_deleted" msgid="7463166543725496307">"Ovozli pochta o‘chirildi"</string>
-    <string name="snackbar_voicemail_deleted_undo" msgid="6959743982796409941">"QAYTARISH"</string>
-    <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"Qo‘ng‘iroqlar tarixi tozalansinmi?"</string>
-    <string name="clearCallLogConfirmation" msgid="6844949465815109166">"Barcha qo‘ng‘iroqlar tarixi o‘chib ketadi."</string>
-    <string name="clearCallLogProgress_title" msgid="995004835687361977">"Qo‘ng‘iroqlar tarixi tozalanmoqda…"</string>
-    <string name="notification_missedCallTitle" msgid="8283366068539898486">"Javobsiz chaqiruv"</string>
-    <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"Javobsiz chaqiruv (ish)"</string>
-    <string name="notification_missedCallsTitle" msgid="3697442015345089802">"Javobsiz chaqiruvlar"</string>
-    <string name="notification_missedCallsMsg" msgid="8176217633929018706">"<xliff:g id="NUM_MISSED_CALLS">%d</xliff:g> ta javobsiz chaqiruv"</string>
-    <string name="notification_missedCall_call_back" msgid="3875698110051973965">"Telefon"</string>
-    <string name="notification_missedCall_message" msgid="5086910028988305964">"SMS yozish"</string>
-    <string name="post_call_notification_message" msgid="5417476789860590611">"<xliff:g id="NAME">%1$s</xliff:g>: <xliff:g id="MESSAGE">%2$s</xliff:g>"</string>
-    <string name="notification_voicemail_text_format" msgid="1895667520930252897">"Chaqiruv: <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
-    <string name="notification_voicemail_no_vm_number" msgid="8942821987929495842">"Ovozli pochta raqami noma’lum"</string>
-    <plurals name="notification_voicemail_title" formatted="false" msgid="1551847434476438657">
-      <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> ta ovozli xabar </item>
-      <item quantity="one">Ovozli xabar</item>
-    </plurals>
-    <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
-    <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"<xliff:g id="CALLER">%1$s</xliff:g>dan yangi ovozli xabar"</string>
-    <string name="voicemail_playback_error" msgid="4384373852257757295">"Ovozli xabarni eshitib bo‘lmadi"</string>
-    <string name="voicemail_fetching_content" msgid="572320120918636014">"Ovozli xabar yuklanmoqda…"</string>
-    <string name="voicemail_fetching_timout" msgid="2128873915839949783">"Ovozli xabarni yuklab bo‘lmadi"</string>
-    <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_playback_speakerphone" msgid="4852027754869750227">"Karnayni yoqish yoki o‘chirish"</string>
-    <string name="description_playback_seek" msgid="1340910573254132520">"Ijro vaziyatini qidirish"</string>
-    <string name="action_menu_call_history_description" msgid="8829135306925008546">"Chaqiruvlar tarixi"</string>
-    <string name="action_menu_overflow_description" msgid="7648679686746517341">"Boshqa parametrlar"</string>
-    <string name="action_menu_dialpad_button" msgid="1970631633457493180">"klaviatura"</string>
-    <string name="dialer_settings_label" msgid="4980176284150290175">"Sozlamalar"</string>
-    <string name="simulator_submenu_label" msgid="186156287346615267">"Simulyator"</string>
-    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Yangi interfeys uchun yorliq"</string>
-    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"Yoppasiga bajariladigan amallar rejimiga o‘tilmoqda"</string>
-    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"Yoppasiga bajariladigan amallar rejimidan chiqib ketildi"</string>
-    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> tanlandi"</string>
-    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> tanlovi bekor qilindi"</string>
-    <string name="description_contact_details" msgid="3341280873855253464">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> uchun kontakt ma’lumotlari"</string>
-    <string name="description_spam_contact_details" msgid="5592578752881528368">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g> abonentining ma’lumotlari (spam deb taxmin qilinmoqda)"</string>
-    <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> ta qo‘ng‘iroq."</string>
-    <string name="description_video_call" msgid="3738199365585751727">"Video qo‘ng‘iroq."</string>
-    <string name="description_start_voice_search" msgid="8380022725973015261">"Ovozli qidiruvni boshlash"</string>
-    <string name="voicemail" msgid="8899540969000957954">"Ovozli pochta"</string>
-    <string name="description_cancel_multi_select" msgid="3930475950253360461">"Yoppasiga bajariladigan amallar rejimini bekor qilish"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"O‘chirish"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Bekor qilish"</string>
-    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"Tanlandi: <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
-      <item quantity="other">"<b>"Bu ovozli xabarlar o‘chirib tashlansinmi? "</b>"</item>
-      <item quantity="one">"<b>"Bu ovozli xabar o‘chirib tashlansinmi? "</b>"</item>
-    </plurals>
-    <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
-    <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g>, <xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
-    <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="voice_search_not_available" msgid="6546240433719732905">"Ovozli qidiruv mavjud emas"</string>
-    <string name="dialer_hint_find_contact" msgid="2023214799381149808">"Kontaktlar ichidan qidirish"</string>
-    <string name="block_number_search_hint" msgid="5377706079015099416">"Raqam qo‘shish yoki kontaktlardan qidirish"</string>
-    <string name="call_log_all_empty" msgid="3955572868518162004">"Chaqiruvlar tarixida hech narsa yo‘q"</string>
-    <string name="call_log_all_empty_action" msgid="852218280136243014">"Telefon qilish"</string>
-    <string name="call_log_missed_empty" msgid="7094936030845062214">"Hech qanday javobsiz chaqiruv yo‘q."</string>
-    <string name="call_log_voicemail_empty" msgid="273623903423275178">"Sizning ovozli pochta qutingiz bo‘m-bo‘sh."</string>
-    <string name="call_log_activity_title" msgid="1275242727244945527">"Chaqiruvlar tarixi"</string>
-    <string name="call_log_all_title" msgid="6042262422192020327">"Hammasi"</string>
-    <string name="call_log_missed_title" msgid="17254005889268015">"Javobsiz"</string>
-    <string name="tab_speed_dial" msgid="6616404752227561075">"Tezkor terish"</string>
-    <string name="tab_history" msgid="7420269368689503596">"Chaqiruvlar tarixi"</string>
-    <string name="tab_all_contacts" msgid="5531733977693943015">"Kontaktlar"</string>
-    <string name="tab_voicemail" msgid="2458548090088316246">"Ovozli pochta"</string>
-    <string name="search_shortcut_call_number" msgid="8847918845036880688">"Qo‘ng‘iroq: <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"Yangi kontakt yaratish"</string>
-    <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"Mavjud kontaktga saqlash"</string>
-    <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"SMS yuborish"</string>
-    <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"Videoqo‘ng‘iroq qilish"</string>
-    <string name="search_shortcut_block_number" msgid="4587283230665805776">"Raqamni bloklash"</string>
-    <string name="speed_dial_empty" msgid="3346406399966039505">"Tezkor terish uchun hech kim yo‘q"</string>
-    <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"Tezkor raqam terishni sozlang"</string>
-    <string name="remove_contact" msgid="2353580570488923668">"O‘chirish"</string>
-    <string name="select_all" msgid="408601760696146245">"Hammasini tanlash"</string>
-    <string name="call_log_action_video_call" msgid="7565549950343850819">"Video qo‘ng‘iroq"</string>
-    <string name="call_log_action_send_message" msgid="6948727362660115554">"Xabar yuborish"</string>
-    <string name="call_log_action_details" msgid="2091370737371449501">"Chaqiruv tafsilotlari"</string>
-    <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"Yuborish:"</string>
-    <string name="call_log_action_call" msgid="682724094251540583">"Chaqiruv: <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_incoming_missed_call" msgid="8292535799379230029">"Javobsiz chaqiruv: <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_incoming_answered_call" msgid="3920182963103160610">"Qo‘ng‘iroqqa javob berildi: <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_unread_voicemail" msgid="145170985013419170">"O‘qilmagan ovozli xabar (<xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>)."</string>
-    <string name="description_read_voicemail" msgid="5585559881573227732">"Ovozli xabar (<xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>)."</string>
-    <string name="description_outgoing_call" msgid="543952487882919924">"Chaqiruv: <xliff:g id="NAMEORNUMBER">^1</xliff:g>. <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="call_log_via_number" msgid="1340307109806397650">"<xliff:g id="NUMBER">%1$s</xliff:g> raqami orqali"</string>
-    <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, <xliff:g id="NUMBER">%2$s</xliff:g> raqami orqali"</string>
-    <string name="description_call_action" msgid="4042796498169106545">"Chaqiruv: <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_video_call_action" msgid="1237090968588659650">"Video qo‘ng‘iroq qilish: <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
-    <string name="description_voicemail_action" msgid="3290143432403538524">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> kontaktidan kelgan ovozli xabarni tinglash"</string>
-    <string name="description_create_new_contact_action" msgid="1928282350281564130">"Yangi kontakt yaratish: <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"Mavjud kontaktlarga qo‘shish: <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_details_action" msgid="2061866409737706174">"<xliff:g id="NAMEORNUMBER">^1</xliff:g> – qo‘ng‘iroq tafsilotlari"</string>
-    <string name="call_log_header_today" msgid="1576119097475845293">"Bugun"</string>
-    <string name="call_log_header_yesterday" msgid="5616077776205329563">"Kecha"</string>
-    <string name="call_log_header_other" msgid="4940676886254217644">"Eskiroq"</string>
-    <string name="voicemail_speaker_on" msgid="3151333608926996668">"Karnayni yoqish."</string>
-    <string name="voicemail_speaker_off" msgid="2530064206962034201">"Karnayni o‘chirib qo‘yish."</string>
-    <string name="voicemail_play_start_pause" msgid="3874823480278334664">"Ijroni boshlash yoki to‘xtatish"</string>
-    <string name="display_options_title" msgid="3880091801055797975">"Kontaktlarning ko‘rinishi"</string>
-    <string name="sounds_and_vibration_title" msgid="3075050000721181384">"Ovoz va tebranish"</string>
-    <string name="accessibility_settings_title" msgid="3329027650429831820">"Maxsus imkoniyatlar"</string>
-    <string name="ringtone_title" msgid="8377174189894648486">"Telefon ringtoni"</string>
-    <string name="vibrate_on_ring_title" msgid="631441314790960485">"Chaqiruv vaqtida tebranish"</string>
-    <string name="dtmf_tone_enable_title" msgid="3273762431523939277">"Klaviatura ohanglari"</string>
-    <string name="dtmf_tone_length_title" msgid="534096029202438539">"Klaviatura ohanglari uzunligi"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="applicationLabel">Telefon</string>
+  <string name="launcherDialpadActivityLabel">Telefon klaviaturasi</string>
+  <string name="callHistoryIconLabel">Chaqiruvlar tarixi</string>
+  <string name="action_copy_number_text">Raqamdan nusxa olish</string>
+  <string name="copy_transcript_text">Transkripsiyadan nusxa olish</string>
+  <string name="action_edit_number_before_call">Tahrirlash va telefon qilish</string>
+  <string name="call_log_delete_all">Qo‘ng‘iroqlar tarixini tozalash</string>
+  <string name="call_log_trash_voicemail">Ovozli xabarni o‘chirish</string>
+  <string name="snackbar_voicemail_deleted">Ovozli pochta o‘chirildi</string>
+  <string name="clearCallLogConfirmation_title">Qo‘ng‘iroqlar tarixi tozalansinmi?</string>
+  <string name="clearCallLogConfirmation">Barcha qo‘ng‘iroqlar tarixi o‘chib ketadi.</string>
+  <string name="clearCallLogProgress_title">Qo‘ng‘iroqlar tarixi tozalanmoqda…</string>
+  <string name="notification_missedCallTitle">Javobsiz chaqiruv</string>
+  <string name="notification_missedWorkCallTitle">Javobsiz chaqiruv (ish)</string>
+  <string name="notification_missedCallsTitle">Javobsiz chaqiruvlar</string>
+  <string name="notification_missedCallsMsg">%d ta javobsiz chaqiruv</string>
+  <string name="notification_missedCall_call_back">Telefon</string>
+  <string name="notification_missedCall_message">SMS yozish</string>
+  <string name="post_call_notification_message">%1$s: %2$s</string>
+  <string name="notification_voicemail_text_format">Chaqiruv: %s</string>
+  <string name="notification_voicemail_no_vm_number">Ovozli pochta raqami noma’lum</string>
+  <plurals name="notification_voicemail_title">
+    <item quantity="one">Ovozli xabar</item>
+    <item quantity="other"> %1$d ta ovozli xabar </item>
+  </plurals>
+  <string name="notification_voicemail_callers_list">%1$s, %2$s</string>
+  <string name="notification_new_voicemail_ticker">%1$sdan yangi ovozli xabar</string>
+  <string name="voicemail_playback_error">Ovozli xabarni eshitib bo‘lmadi</string>
+  <string name="voicemail_fetching_content">Ovozli xabar yuklanmoqda…</string>
+  <string name="voicemail_fetching_timout">Ovozli xabarni yuklab bo‘lmadi</string>
+  <string name="call_log_item_count_and_date">(%1$d) %2$s</string>
+  <string name="description_playback_speakerphone">Karnayni yoqish yoki o‘chirish</string>
+  <string name="description_playback_seek">Ijro vaziyatini qidirish</string>
+  <string name="action_menu_call_history_description">Chaqiruvlar tarixi</string>
+  <string msgid="2295659037509008453" name="action_menu_overflow_description">Boshqa parametrlar</string>
+  <string name="action_menu_dialpad_button">klaviatura</string>
+  <string name="dialer_settings_label">Sozlamalar</string>
+  <string name="simulator_submenu_label">Simulyator</string>
+  <string name="new_ui_launcher_shortcut_label">Yangi interfeys uchun yorliq</string>
+  <string name="description_entering_bulk_action_mode">Yoppasiga bajariladigan amallar rejimiga o‘tilmoqda</string>
+  <string name="description_leaving_bulk_action_mode">Yoppasiga bajariladigan amallar rejimidan chiqib ketildi</string>
+  <string name="description_selecting_bulk_action_mode">%1$s tanlandi</string>
+  <string name="description_unselecting_bulk_action_mode">%1$s tanlovi bekor qilindi</string>
+  <string name="description_contact_details">%1$s uchun kontakt ma’lumotlari</string>
+  <string name="description_spam_contact_details">%1$s abonentining ma’lumotlari (spam deb taxmin qilinmoqda)</string>
+  <string name="description_num_calls">%1$s ta qo‘ng‘iroq.</string>
+  <string name="description_video_call">Video qo‘ng‘iroq.</string>
+  <string name="description_start_voice_search">Ovozli qidiruvni boshlash</string>
+  <string name="voicemail">Ovozli pochta</string>
+  <string name="description_cancel_multi_select">Yoppasiga bajariladigan amallar rejimini bekor qilish</string>
+  <string name="voicemailMultiSelectDeleteConfirm">O‘chirish</string>
+  <string name="voicemailMultiSelectDeleteCancel">Bekor qilish</string>
+  <string name="voicemailMultiSelectActionBarTitle">Tanlandi: %1$s</string>
+  <plurals name="delete_voicemails_confirmation_dialog_title">
+    <item quantity="one"><b>Bu ovozli xabar o‘chirib tashlansinmi? </b></item>
+    <item quantity="other"><b>Bu ovozli xabarlar o‘chirib tashlansinmi? </b></item>
+  </plurals>
+  <string name="voicemailCallLogToday">@string/call_log_header_today</string>
+  <string name="voicemailCallLogDateTimeFormat">%1$s, %2$s</string>
+  <string name="voicemailDurationFormat">%1$02d:%2$02d</string>
+  <string name="voicemailCallLogDateTimeFormatWithDuration">%1$s • %2$s</string>
+  <string name="voice_search_not_available">Ovozli qidiruv mavjud emas</string>
+  <string name="dialer_hint_find_contact">Kontaktlar ichidan qidirish</string>
+  <string name="block_number_search_hint">Raqam qo‘shish yoki kontaktlardan qidirish</string>
+  <string name="call_log_all_empty">Chaqiruvlar tarixida hech narsa yo‘q</string>
+  <string name="call_log_all_empty_action">Telefon qilish</string>
+  <string name="call_log_missed_empty">Hech qanday javobsiz chaqiruv yo‘q.</string>
+  <string name="call_log_voicemail_empty">Sizning ovozli pochta qutingiz bo‘m-bo‘sh.</string>
+  <string name="call_log_activity_title">Chaqiruvlar tarixi</string>
+  <string name="call_log_all_title">Hammasi</string>
+  <string name="call_log_missed_title">Javobsiz</string>
+  <string name="tab_speed_dial">Tezkor terish</string>
+  <string name="tab_history">Chaqiruvlar tarixi</string>
+  <string name="tab_all_contacts">Kontaktlar</string>
+  <string name="tab_voicemail">Ovozli pochta</string>
+  <string name="search_shortcut_call_number">Qo‘ng‘iroq: %s</string>
+  <string name="search_shortcut_create_new_contact">Yangi kontakt yaratish</string>
+  <string name="search_shortcut_add_to_contact">Mavjud kontaktga saqlash</string>
+  <string name="search_shortcut_send_sms_message">SMS yuborish</string>
+  <string name="search_shortcut_make_video_call">Videoqo‘ng‘iroq qilish</string>
+  <string name="search_shortcut_block_number">Raqamni bloklash</string>
+  <string name="speed_dial_empty">Tezkor terish uchun hech kim yo‘q</string>
+  <string name="speed_dial_empty_add_favorite_action">Tezkor raqam terishni sozlang</string>
+  <string name="remove_contact">O‘chirish</string>
+  <string name="select_all">Hammasini tanlash</string>
+  <string name="call_log_action_video_call">Video qo‘ng‘iroq</string>
+  <string name="call_log_action_set_up_video">Video suhbatni sozlash</string>
+  <string name="call_log_action_invite_video">Video suhbatga taklif qilish</string>
+  <string name="call_log_action_send_message">Xabar yuborish</string>
+  <string name="call_log_action_details">Chaqiruv tafsilotlari</string>
+  <string name="call_log_action_share_voicemail">Yuborish:</string>
+  <string name="call_log_action_call">Chaqiruv: ^1</string>
+  <string name="description_incoming_missed_call">Javobsiz chaqiruv: ^1, ^2, ^3, ^4.</string>
+  <string name="description_incoming_answered_call">Qo‘ng‘iroqqa javob berildi: ^1, ^2, ^3, ^4.</string>
+  <string name="description_unread_voicemail">O‘qilmagan ovozli xabar (^1, ^2, ^3, ^4).</string>
+  <string name="description_read_voicemail">Ovozli xabar (^1, ^2, ^3, ^4).</string>
+  <string name="description_outgoing_call">Chaqiruv: ^1. ^2, ^3, ^4.</string>
+  <string name="call_log_via_number">%1$s raqami orqali</string>
+  <string name="call_log_via_number_phone_account">%1$s, %2$s raqami orqali</string>
+  <string name="description_call_action">Chaqiruv: ^1</string>
+  <string name="description_video_call_action">Video qo‘ng‘iroq qilish: ^1.</string>
+  <string name="description_voicemail_action">^1 kontaktidan kelgan ovozli xabarni tinglash</string>
+  <string name="description_create_new_contact_action">Yangi kontakt yaratish: ^1</string>
+  <string name="description_add_to_existing_contact_action">Mavjud kontaktlarga qo‘shish: ^1</string>
+  <string name="description_details_action">^1 – qo‘ng‘iroq tafsilotlari</string>
+  <string name="call_log_header_today">Bugun</string>
+  <string name="call_log_header_yesterday">Kecha</string>
+  <string name="call_log_header_other">Eskiroq</string>
+  <string name="voicemail_speaker_on">Karnayni yoqish.</string>
+  <string name="voicemail_speaker_off">Karnayni o‘chirib qo‘yish.</string>
+  <string name="voicemail_play_start_pause">Ijroni boshlash yoki to‘xtatish</string>
+  <string name="display_options_title">Kontaktlarning ko‘rinishi</string>
+  <string name="sounds_and_vibration_title">Ovoz va tebranish</string>
+  <string name="accessibility_settings_title">Maxsus imkoniyatlar</string>
+  <string name="ringtone_title">Telefon ringtoni</string>
+  <string name="vibrate_on_ring_title">Chaqiruv vaqtida tebranish</string>
+  <string name="dtmf_tone_enable_title">Klaviatura ohanglari</string>
+  <string name="dtmf_tone_length_title">Klaviatura ohanglari uzunligi</string>
   <string-array name="dtmf_tone_length_entries">
-    <item msgid="3136353015227162823">"Odatiy"</item>
-    <item msgid="5376841175538523822">"Uzun"</item>
+    <item>Odatiy</item>
+    <item>Uzun</item>
   </string-array>
-    <string name="respond_via_sms_setting_title" msgid="8008181606657693452">"Tezkor javoblar"</string>
-    <string name="call_settings_label" msgid="7824611757200960807">"Chaqiruvlar"</string>
-    <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Chaqiruvlarni bloklash"</string>
-    <string name="voicemail_settings_label" msgid="4594299554519920570">"Ovozli pochta"</string>
-    <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Qo‘ng‘iroqlarni bloklash o‘chirilgan"</string>
-    <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Oxirgi 48 soat ichida ushbu telefon orqali favqulodda xizmatlar bilan bog‘lanilganligi uchun qo‘ng‘iroqlarni bloklash o‘chirib qo‘yildi. 48 soatlik muddat tugagandan so‘ng bu avtomatik qayta yoqiladi."</string>
-    <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Raqamlarni import qilish"</string>
-    <string name="blocked_call_settings_import_description" msgid="1819412052545228965">"Ba’zi kiruvchi kontaktlaringiz boshqa ilovalar orqali avtomatik ovozli xabar yo‘llaydigan qilib belgilagansiz."</string>
-    <string name="blocked_call_settings_view_numbers_button" msgid="3332727948554356704">"Sonini ko‘rish"</string>
-    <string name="blocked_call_settings_import_button" msgid="7319111700387470727">"Import qilish"</string>
-    <string name="description_blocked_number_list_delete" msgid="2139644216858370740">"Raqamni blokdan chiqarish"</string>
-    <string name="addBlockedNumber" msgid="3053473735238295551">"Raqam qo‘shish"</string>
-    <string name="block_number_footer_message_vvm" msgid="7955326304033982368">"Bu raqamlardan kelgan qo‘ng‘iroqlar bloklanadi va ovozli xabarlari avtomatik o‘chiriladi."</string>
-    <string name="block_number_footer_message_no_vvm" msgid="1152684139070471665">"Bu raqamlardan kelgan qo‘ng‘iroqlar bloklanadi, lekin raqam egalari sizga ovozli xabar qoldira olishadi."</string>
-    <string name="block_list" msgid="4701585783411870782">"Bloklangan raqamlar"</string>
-    <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g> raqami allaqachon bloklangan."</string>
-    <string name="phone_account_settings_label" msgid="8372485478006965920">"Chaqiruv uchun hisoblar"</string>
-    <string name="permission_no_speeddial" msgid="8487215628510596753">"Tezkor raqam terish uchun “Kontaktlar” ruxsatnomasini yoqing."</string>
-    <string name="permission_no_calllog" msgid="4053705651238775784">"Qo‘ng‘iroqlaringiz ro‘yxatini ko‘rish uchun “Telefon” ruxsatnomasini yoqing."</string>
-    <string name="permission_no_search" msgid="2424710404207193826">"Kontaktlarni qidirish uchun “Kontaktlar” ruxsatnomasini yoqing."</string>
-    <string name="permission_place_call" msgid="8686908130349369423">"Chaqiruv uchun “Telefon” ruxsatnomasini yoqing."</string>
-    <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"Telefon ilovasida tizim sozlamalarini o‘zgartirish uchun ruxsat yo‘q."</string>
-    <string name="blocked_number_call_log_label" msgid="4212282846299997693">"Bloklandi"</string>
-    <string name="call_log_action_block_report_number" msgid="7302636538668696729">"Bloklash/spam deb belgilash"</string>
-    <string name="call_log_action_block_number" msgid="5048188386501998865">"Raqamni bloklash"</string>
-    <string name="call_log_action_remove_spam" msgid="2045319806318398403">"Spam emas"</string>
-    <string name="call_log_action_unblock_number" msgid="6100117033288448758">"Raqamni blokdan chiqarish"</string>
-    <string name="spam_number_call_log_label" msgid="2678431398326811131">"Spam"</string>
-    <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> hozir oflayn va u bilan bog‘lanishning imkoni yo‘q"</string>
-    <string name="about_phone_label" msgid="582991354677973731">"Ilova haqida"</string>
-    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Google tomon. trans-ya qilindi"</string>
-    <string name="voicemail_transcription_in_progress" msgid="2933320969613783210">"Google transkripsiya qilmoqda…"</string>
-    <string name="voicemail_transcription_failed" msgid="335275303117412706">"Transkripsiya qilib bo‘lmadi."</string>
-    <string name="voicemail_transcription_failed_language_not_supported" msgid="4210332591050562553">"Transkripsiya qilib bo‘lmadi. Bu til qo‘llab-quvvatlanmaydi."</string>
-    <string name="voicemail_transcription_failed_no_speech" msgid="9093372879697874852">"Transkripsiya qilib bo‘lmadi. Nutq aniqlanmadi."</string>
-    <string name="view_conversation" msgid="7895904782094119702">"Ko‘rish"</string>
-    <string name="ec_data_deleted" msgid="4794880345545827107">"Chaqiruv o‘chirildi. Android Xabarlar ilovasi orqali bu qo‘ng‘iroq davomida ulashilgan biriktirmalarni ko‘rish va o‘chirsh mumkin."</string>
-    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"Chaqiruvlar o‘chirildi. Android Xabarlar ilovasi orqali bu qo‘ng‘iroqlar davomida ulashilgan biriktirmalarni ko‘rish va o‘chirsh mumkin."</string>
+  <string name="respond_via_sms_setting_title">Tezkor javoblar</string>
+  <string name="call_settings_label">Chaqiruvlar</string>
+  <string name="manage_blocked_numbers_label">Bloklangan raqamlar</string>
+  <string name="voicemail_settings_label">Ovozli pochta</string>
+  <string name="blocked_numbers_disabled_emergency_header_label">Qo‘ng‘iroqlarni bloklash o‘chirilgan</string>
+  <string name="blocked_numbers_disabled_emergency_desc">Oxirgi 48 soat ichida ushbu telefon orqali favqulodda xizmatlar bilan bog‘lanilganligi uchun qo‘ng‘iroqlarni bloklash o‘chirib qo‘yildi. 48 soatlik muddat tugagandan so‘ng bu avtomatik qayta yoqiladi.</string>
+  <string name="import_send_to_voicemail_numbers_label">Raqamlarni import qilish</string>
+  <string name="blocked_call_settings_import_description">Ba’zi kiruvchi kontaktlaringiz boshqa ilovalar orqali avtomatik ovozli xabar yo‘llaydigan qilib belgilagansiz.</string>
+  <string name="blocked_call_settings_view_numbers_button">Sonini ko‘rish</string>
+  <string name="blocked_call_settings_import_button">Import qilish</string>
+  <string name="description_blocked_number_list_delete">Raqamni blokdan chiqarish</string>
+  <string name="addBlockedNumber">Raqam qo‘shish</string>
+  <string name="block_number_footer_message_vvm">Bu raqamlardan kelgan qo‘ng‘iroqlar bloklanadi va ovozli xabarlari avtomatik o‘chiriladi.</string>
+  <string name="block_number_footer_message_no_vvm">Bu raqamlardan kelgan qo‘ng‘iroqlar bloklanadi, lekin raqam egalari sizga ovozli xabar qoldira olishadi.</string>
+  <string name="block_list">Bloklangan raqamlar</string>
+  <string name="alreadyBlocked">%1$s raqami allaqachon bloklangan.</string>
+  <string name="phone_account_settings_label">Chaqiruv uchun hisoblar</string>
+  <string name="permission_no_speeddial">Tezkor raqam terish uchun “Kontaktlar” ruxsatnomasini yoqing.</string>
+  <string name="permission_no_calllog">Qo‘ng‘iroqlaringiz ro‘yxatini ko‘rish uchun “Telefon” ruxsatnomasini yoqing.</string>
+  <string name="permission_no_search">Kontaktlarni qidirish uchun “Kontaktlar” ruxsatnomasini yoqing.</string>
+  <string name="permission_place_call">Chaqiruv uchun “Telefon” ruxsatnomasini yoqing.</string>
+  <string name="toast_cannot_write_system_settings">Telefon ilovasida tizim sozlamalarini o‘zgartirish uchun ruxsat yo‘q.</string>
+  <string name="blocked_number_call_log_label">Bloklandi</string>
+  <string name="call_log_action_block_report_number">Bloklash/spam deb belgilash</string>
+  <string name="call_log_action_block_number">Raqamni bloklash</string>
+  <string name="call_log_action_remove_spam">Spam emas</string>
+  <string name="call_log_action_unblock_number">Raqamni blokdan chiqarish</string>
+  <string name="spam_number_call_log_label">Spam</string>
+  <string name="call_composer_connection_failed">%1$s hozir oflayn va u bilan bog‘lanishning imkoni yo‘q</string>
+  <string name="about_phone_label">Ilova haqida</string>
+  <string name="voicemail_transcription_branding_text">Google tomon. trans-ya qilindi</string>
+  <string name="voicemail_transcription_in_progress">Transkripsiya qilinmoqda…</string>
+  <string name="voicemail_transcription_failed">Transkripsiya qilib bo‘lmadi.</string>
+  <string name="voicemail_transcription_failed_language_not_supported">Transkripsiya qilib bo‘lmadi. Bu til qo‘llab-quvvatlanmaydi.</string>
+  <string name="voicemail_transcription_failed_no_speech">Transkripsiya qilib bo‘lmadi. Nutq aniqlanmadi.</string>
+  <string name="voicemail_donation_promo_title">Transkripsiya sifatini oshirishga yordam berasizmi?</string>
+  <string name="voicemail_donation_promo_content">Google kompaniyasiga ushbu va kelgusi ovozli xabarlaringizni tekshirishiga va ularning transkripsiyalarini tahlil qilishiga ruxsat bering. Xabarlar anonim tarzda saqlanadi. Bu parametrni xohlagan vaqtda Sozlamalardan o‘zgartirish mumkin. %1$s</string>
+  <string name="voicemail_donation_promo_opt_in">OK</string>
+  <string name="voicemail_donation_promo_opt_out">Kerak emas</string>
+  <string name="voicemail_transcription_rating">Transkripsiya sifatini baholang</string>
+  <string name="voicemail_transcription_rating_thanks">Fikr-mulohazangiz u-n rahmat!</string>
+  <string name="description_rating_good">Yoqdi</string>
+  <string name="description_rating_bad">Yoqmadi</string>
+  <string name="view_conversation">Ko‘rish</string>
+  <string name="ec_data_deleted">Chaqiruv o‘chirildi. Android Xabarlar ilovasi orqali bu qo‘ng‘iroq davomida ulashilgan biriktirmalarni ko‘rish va o‘chirsh mumkin.</string>
+  <string name="multiple_ec_data_deleted">Chaqiruvlar o‘chirildi. Android Xabarlar ilovasi orqali bu qo‘ng‘iroqlar davomida ulashilgan biriktirmalarni ko‘rish va o‘chirsh mumkin.</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-v27/styles.xml b/java/com/android/dialer/app/res/values-v27/styles.xml
index 5a946b6..bc9b119 100644
--- a/java/com/android/dialer/app/res/values-v27/styles.xml
+++ b/java/com/android/dialer/app/res/values-v27/styles.xml
@@ -15,9 +15,9 @@
   ~ limitations under the License
   -->
 <resources>
-  <style name="DialtactsTheme" parent="DialtactsThemeBase">
+  <style name="DialtactsTheme" parent="Dialer.ThemeBase.ActionBar">
     <item name="android:windowLightNavigationBar">true</item>
-    <item name="android:navigationBarColor">?android:windowBackground</item>
+    <item name="android:navigationBarColor">?android:attr/windowBackground</item>
     <item name="android:navigationBarDividerColor">#E0E0E0</item>
   </style>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-vi/strings.xml b/java/com/android/dialer/app/res/values-vi/strings.xml
index 6296207..452c9f0 100644
--- a/java/com/android/dialer/app/res/values-vi/strings.xml
+++ b/java/com/android/dialer/app/res/values-vi/strings.xml
@@ -1,179 +1,171 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="applicationLabel" msgid="2202739481132958990">"Điện thoại"</string>
-    <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"Bàn phím điện thoại"</string>
-    <string name="callHistoryIconLabel" msgid="7493268743411968630">"Nhật ký cuộc gọi"</string>
-    <string name="action_copy_number_text" msgid="832682558551502319">"Sao chép số"</string>
-    <string name="copy_transcript_text" msgid="937904189017310829">"Sao chép bản ghi âm"</string>
-    <string name="action_edit_number_before_call" msgid="8017492815878473837">"Chỉnh sửa số trước khi gọi"</string>
-    <string name="call_log_delete_all" msgid="7852970926906523784">"Xóa nhật ký cuộc gọi"</string>
-    <string name="call_log_trash_voicemail" msgid="6118493534178533972">"Xóa thư thoại"</string>
-    <string name="snackbar_voicemail_deleted" msgid="7463166543725496307">"Đã xóa thư thoại"</string>
-    <string name="snackbar_voicemail_deleted_undo" msgid="6959743982796409941">"HOÀN TÁC"</string>
-    <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"Xóa nhật ký cuộc gọi?"</string>
-    <string name="clearCallLogConfirmation" msgid="6844949465815109166">"Thao tác này sẽ xóa tất cả cuộc gọi khỏi nhật ký của bạn"</string>
-    <string name="clearCallLogProgress_title" msgid="995004835687361977">"Đang xóa nhật ký cuộc gọi…"</string>
-    <string name="notification_missedCallTitle" msgid="8283366068539898486">"Cuộc gọi nhỡ"</string>
-    <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"Cuộc gọi nhỡ về công việc"</string>
-    <string name="notification_missedCallsTitle" msgid="3697442015345089802">"Cuộc gọi nhỡ"</string>
-    <string name="notification_missedCallsMsg" msgid="8176217633929018706">"<xliff:g id="NUM_MISSED_CALLS">%d</xliff:g> cuộc gọi nhỡ"</string>
-    <string name="notification_missedCall_call_back" msgid="3875698110051973965">"Gọi lại"</string>
-    <string name="notification_missedCall_message" msgid="5086910028988305964">"Tin nhắn"</string>
-    <string name="post_call_notification_message" msgid="5417476789860590611">"<xliff:g id="NAME">%1$s</xliff:g>: <xliff:g id="MESSAGE">%2$s</xliff:g>"</string>
-    <string name="notification_voicemail_text_format" msgid="1895667520930252897">"Quay số <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
-    <string name="notification_voicemail_no_vm_number" msgid="8942821987929495842">"Số thư thoại không xác định"</string>
-    <plurals name="notification_voicemail_title" formatted="false" msgid="1551847434476438657">
-      <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> Thư thoại </item>
-      <item quantity="one">Thư thoại</item>
-    </plurals>
-    <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
-    <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"Thư thoại mới từ <xliff:g id="CALLER">%1$s</xliff:g>"</string>
-    <string name="voicemail_playback_error" msgid="4384373852257757295">"Không thể phát thư thoại"</string>
-    <string name="voicemail_fetching_content" msgid="572320120918636014">"Đang tải thư thoại…"</string>
-    <string name="voicemail_fetching_timout" msgid="2128873915839949783">"Không thể tải thư thoại"</string>
-    <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_playback_speakerphone" msgid="4852027754869750227">"Bật hoặc tắt loa ngoài"</string>
-    <string name="description_playback_seek" msgid="1340910573254132520">"Tìm kiếm vị trí phát lại"</string>
-    <string name="action_menu_call_history_description" msgid="8829135306925008546">"Nhật ký cuộc gọi"</string>
-    <string name="action_menu_overflow_description" msgid="7648679686746517341">"Tùy chọn khác"</string>
-    <string name="action_menu_dialpad_button" msgid="1970631633457493180">"bàn phím"</string>
-    <string name="dialer_settings_label" msgid="4980176284150290175">"Cài đặt"</string>
-    <string name="simulator_submenu_label" msgid="186156287346615267">"Trình mô phỏng"</string>
-    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Tạo phím tắt giao diện người dùng mới"</string>
-    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"Truy cập chế độ tác vụ hàng loạt"</string>
-    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"Đã rời khỏi chế độ tác vụ hàng loạt"</string>
-    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"Đã chọn <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"Đã bỏ chọn <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_contact_details" msgid="3341280873855253464">"Chi tiết liên lạc cho <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_spam_contact_details" msgid="5592578752881528368">"Chi tiết liên hệ cho người gọi điện spam đáng ngờ <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> cuộc gọi."</string>
-    <string name="description_video_call" msgid="3738199365585751727">"Gọi điện video."</string>
-    <string name="description_start_voice_search" msgid="8380022725973015261">"Bắt đầu tìm kiếm bằng giọng nói"</string>
-    <string name="voicemail" msgid="8899540969000957954">"Thư thoại"</string>
-    <string name="description_cancel_multi_select" msgid="3930475950253360461">"Hủy chế độ tác vụ hàng loạt"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Xóa"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Hủy"</string>
-    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"Đã chọn <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
-      <item quantity="other">"<b>"Xóa các thư thoại này? "</b>"</item>
-      <item quantity="one">"<b>"Xóa thư thoại này? "</b>"</item>
-    </plurals>
-    <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
-    <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> lúc <xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
-    <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="voice_search_not_available" msgid="6546240433719732905">"Không có tính năng tìm kiếm bằng giọng nói"</string>
-    <string name="dialer_hint_find_contact" msgid="2023214799381149808">"Tìm kiếm trong danh bạ"</string>
-    <string name="block_number_search_hint" msgid="5377706079015099416">"Thêm số hoặc tìm kiếm danh bạ"</string>
-    <string name="call_log_all_empty" msgid="3955572868518162004">"Nhật ký cuộc gọi của bạn trống"</string>
-    <string name="call_log_all_empty_action" msgid="852218280136243014">"Gọi điện"</string>
-    <string name="call_log_missed_empty" msgid="7094936030845062214">"Bạn không có cuộc gọi nhỡ nào."</string>
-    <string name="call_log_voicemail_empty" msgid="273623903423275178">"Hộp thư thoại đến của bạn trống."</string>
-    <string name="call_log_activity_title" msgid="1275242727244945527">"Nhật ký cuộc gọi"</string>
-    <string name="call_log_all_title" msgid="6042262422192020327">"Tất cả"</string>
-    <string name="call_log_missed_title" msgid="17254005889268015">"Bị nhỡ"</string>
-    <string name="tab_speed_dial" msgid="6616404752227561075">"Quay số nhanh"</string>
-    <string name="tab_history" msgid="7420269368689503596">"Nhật ký cuộc gọi"</string>
-    <string name="tab_all_contacts" msgid="5531733977693943015">"Danh bạ"</string>
-    <string name="tab_voicemail" msgid="2458548090088316246">"Thư thoại"</string>
-    <string name="search_shortcut_call_number" msgid="8847918845036880688">"Gọi <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"Tạo liên hệ mới"</string>
-    <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"Thêm vào liên hệ"</string>
-    <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"Gửi SMS"</string>
-    <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"Gọi điện video"</string>
-    <string name="search_shortcut_block_number" msgid="4587283230665805776">"Chặn số"</string>
-    <string name="speed_dial_empty" msgid="3346406399966039505">"Chưa có ai trong danh bạ quay số nhanh của bạn"</string>
-    <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"Thêm liên hệ quay số nhanh yêu thích"</string>
-    <string name="remove_contact" msgid="2353580570488923668">"Xóa"</string>
-    <string name="select_all" msgid="408601760696146245">"Chọn tất cả"</string>
-    <string name="call_log_action_video_call" msgid="7565549950343850819">"Cuộc gọi điện video"</string>
-    <string name="call_log_action_send_message" msgid="6948727362660115554">"Gửi tin nhắn"</string>
-    <string name="call_log_action_details" msgid="2091370737371449501">"Chi tiết cuộc gọi"</string>
-    <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"Gửi đến …"</string>
-    <string name="call_log_action_call" msgid="682724094251540583">"Gọi <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_incoming_missed_call" msgid="8292535799379230029">"Cuộc gọi nhỡ từ <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_incoming_answered_call" msgid="3920182963103160610">"Cuộc gọi đã trả lời từ <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_unread_voicemail" msgid="145170985013419170">"Thư thoại chưa đọc từ <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_read_voicemail" msgid="5585559881573227732">"Thư thoại từ <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_outgoing_call" msgid="543952487882919924">"Gọi tới <xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="call_log_via_number" msgid="1340307109806397650">"qua <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> qua <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="description_call_action" msgid="4042796498169106545">"Gọi <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_video_call_action" msgid="1237090968588659650">"Gọi điện video cho <xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
-    <string name="description_voicemail_action" msgid="3290143432403538524">"Nghe thư thoại từ <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_create_new_contact_action" msgid="1928282350281564130">"Tạo địa chỉ liên hệ cho <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"Thêm <xliff:g id="NAMEORNUMBER">^1</xliff:g> vào địa chỉ liên hệ hiện có"</string>
-    <string name="description_details_action" msgid="2061866409737706174">"Chi tiết cuộc gọi cho <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="call_log_header_today" msgid="1576119097475845293">"Hôm nay"</string>
-    <string name="call_log_header_yesterday" msgid="5616077776205329563">"Hôm qua"</string>
-    <string name="call_log_header_other" msgid="4940676886254217644">"Cũ hơn"</string>
-    <string name="voicemail_speaker_on" msgid="3151333608926996668">"Bật loa."</string>
-    <string name="voicemail_speaker_off" msgid="2530064206962034201">"Tắt loa."</string>
-    <string name="voicemail_play_start_pause" msgid="3874823480278334664">"Bắt đầu hoặc tạm dừng phát lại."</string>
-    <string name="display_options_title" msgid="3880091801055797975">"Tùy chọn hiển thị"</string>
-    <string name="sounds_and_vibration_title" msgid="3075050000721181384">"Âm thanh và rung"</string>
-    <string name="accessibility_settings_title" msgid="3329027650429831820">"Trợ năng"</string>
-    <string name="ringtone_title" msgid="8377174189894648486">"Nhạc chuông điện thoại"</string>
-    <string name="vibrate_on_ring_title" msgid="631441314790960485">"Đồng thời rung khi có cuộc gọi"</string>
-    <string name="dtmf_tone_enable_title" msgid="3273762431523939277">"Âm bàn phím"</string>
-    <string name="dtmf_tone_length_title" msgid="534096029202438539">"Độ dài âm bàn phím"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="applicationLabel">Điện thoại</string>
+  <string name="launcherDialpadActivityLabel">Bàn phím điện thoại</string>
+  <string name="callHistoryIconLabel">Nhật ký cuộc gọi</string>
+  <string name="action_copy_number_text">Sao chép số</string>
+  <string name="copy_transcript_text">Sao chép bản ghi âm</string>
+  <string name="action_edit_number_before_call">Chỉnh sửa số trước khi gọi</string>
+  <string name="call_log_delete_all">Xóa nhật ký cuộc gọi</string>
+  <string name="call_log_trash_voicemail">Xóa thư thoại</string>
+  <string name="snackbar_voicemail_deleted">Đã xóa thư thoại</string>
+  <string name="clearCallLogConfirmation_title">Xóa nhật ký cuộc gọi?</string>
+  <string name="clearCallLogConfirmation">Thao tác này sẽ xóa tất cả cuộc gọi khỏi nhật ký của bạn</string>
+  <string name="clearCallLogProgress_title">Đang xóa nhật ký cuộc gọi…</string>
+  <string name="notification_missedCallTitle">Cuộc gọi nhỡ</string>
+  <string name="notification_missedWorkCallTitle">Cuộc gọi nhỡ về công việc</string>
+  <string name="notification_missedCallsTitle">Cuộc gọi nhỡ</string>
+  <string name="notification_missedCallsMsg">%d cuộc gọi nhỡ</string>
+  <string name="notification_missedCall_call_back">Gọi lại</string>
+  <string name="notification_missedCall_message">Tin nhắn</string>
+  <string name="post_call_notification_message">%1$s: %2$s</string>
+  <string name="notification_voicemail_text_format">Quay số %s</string>
+  <string name="notification_voicemail_no_vm_number">Số thư thoại không xác định</string>
+  <plurals name="notification_voicemail_title">
+    <item quantity="one">Thư thoại</item>
+    <item quantity="other"> %1$d Thư thoại </item>
+  </plurals>
+  <string name="notification_voicemail_callers_list">%1$s, %2$s</string>
+  <string name="notification_new_voicemail_ticker">Thư thoại mới từ %1$s</string>
+  <string name="voicemail_playback_error">Không thể phát thư thoại</string>
+  <string name="voicemail_fetching_content">Đang tải thư thoại…</string>
+  <string name="voicemail_fetching_timout">Không thể tải thư thoại</string>
+  <string name="call_log_item_count_and_date">(%1$d) %2$s</string>
+  <string name="description_playback_speakerphone">Bật hoặc tắt loa ngoài</string>
+  <string name="description_playback_seek">Tìm kiếm vị trí phát lại</string>
+  <string name="action_menu_call_history_description">Nhật ký cuộc gọi</string>
+  <string msgid="2295659037509008453" name="action_menu_overflow_description">Tùy chọn khác</string>
+  <string name="action_menu_dialpad_button">bàn phím</string>
+  <string name="dialer_settings_label">Cài đặt</string>
+  <string name="simulator_submenu_label">Trình mô phỏng</string>
+  <string name="new_ui_launcher_shortcut_label">Tạo phím tắt giao diện người dùng mới</string>
+  <string name="description_entering_bulk_action_mode">Truy cập chế độ tác vụ hàng loạt</string>
+  <string name="description_leaving_bulk_action_mode">Đã rời khỏi chế độ tác vụ hàng loạt</string>
+  <string name="description_selecting_bulk_action_mode">Đã chọn %1$s</string>
+  <string name="description_unselecting_bulk_action_mode">Đã bỏ chọn %1$s</string>
+  <string name="description_contact_details">Chi tiết liên lạc cho %1$s</string>
+  <string name="description_spam_contact_details">Chi tiết liên hệ cho người gọi điện spam đáng ngờ %1$s</string>
+  <string name="description_num_calls">%1$s cuộc gọi.</string>
+  <string name="description_video_call">Gọi điện video.</string>
+  <string name="description_start_voice_search">Bắt đầu tìm kiếm bằng giọng nói</string>
+  <string name="voicemail">Thư thoại</string>
+  <string name="description_cancel_multi_select">Hủy chế độ tác vụ hàng loạt</string>
+  <string name="voicemailMultiSelectDeleteConfirm">Xóa</string>
+  <string name="voicemailMultiSelectDeleteCancel">Hủy</string>
+  <string name="voicemailMultiSelectActionBarTitle">Đã chọn %1$s</string>
+  <plurals name="delete_voicemails_confirmation_dialog_title">
+    <item quantity="one"><b>Xóa thư thoại này? </b></item>
+    <item quantity="other"><b>Xóa các thư thoại này? </b></item>
+  </plurals>
+  <string name="voicemailCallLogToday">@string/call_log_header_today</string>
+  <string name="voicemailCallLogDateTimeFormat">%1$s lúc %2$s</string>
+  <string name="voicemailDurationFormat">%1$02d:%2$02d</string>
+  <string name="voicemailCallLogDateTimeFormatWithDuration">%1$s • %2$s</string>
+  <string name="voice_search_not_available">Không có tính năng tìm kiếm bằng giọng nói</string>
+  <string name="dialer_hint_find_contact">Tìm kiếm trong danh bạ</string>
+  <string name="block_number_search_hint">Thêm số hoặc tìm kiếm danh bạ</string>
+  <string name="call_log_all_empty">Nhật ký cuộc gọi của bạn trống</string>
+  <string name="call_log_all_empty_action">Gọi điện</string>
+  <string name="call_log_missed_empty">Bạn không có cuộc gọi nhỡ nào.</string>
+  <string name="call_log_voicemail_empty">Hộp thư thoại đến của bạn trống.</string>
+  <string name="call_log_activity_title">Nhật ký cuộc gọi</string>
+  <string name="call_log_all_title">Tất cả</string>
+  <string name="call_log_missed_title">Bị nhỡ</string>
+  <string name="tab_speed_dial">Quay số nhanh</string>
+  <string name="tab_history">Nhật ký cuộc gọi</string>
+  <string name="tab_all_contacts">Danh bạ</string>
+  <string name="tab_voicemail">Thư thoại</string>
+  <string name="search_shortcut_call_number">Gọi %s</string>
+  <string name="search_shortcut_create_new_contact">Tạo liên hệ mới</string>
+  <string name="search_shortcut_add_to_contact">Thêm vào liên hệ</string>
+  <string name="search_shortcut_send_sms_message">Gửi SMS</string>
+  <string name="search_shortcut_make_video_call">Gọi điện video</string>
+  <string name="search_shortcut_block_number">Chặn số</string>
+  <string name="speed_dial_empty">Chưa có ai trong danh bạ quay số nhanh của bạn</string>
+  <string name="speed_dial_empty_add_favorite_action">Thêm liên hệ quay số nhanh yêu thích</string>
+  <string name="remove_contact">Xóa</string>
+  <string name="select_all">Chọn tất cả</string>
+  <string name="call_log_action_video_call">Cuộc gọi điện video</string>
+  <string name="call_log_action_set_up_video">Thiết lập cuộc gọi video</string>
+  <string name="call_log_action_invite_video">Mời tham gia cuộc gọi video</string>
+  <string name="call_log_action_send_message">Gửi tin nhắn</string>
+  <string name="call_log_action_details">Chi tiết cuộc gọi</string>
+  <string name="call_log_action_share_voicemail">Gửi đến …</string>
+  <string name="call_log_action_call">Gọi ^1</string>
+  <string name="description_incoming_missed_call">Cuộc gọi nhỡ từ ^1, ^2, ^3, ^4.</string>
+  <string name="description_incoming_answered_call">Cuộc gọi đã trả lời từ ^1, ^2, ^3, ^4.</string>
+  <string name="description_unread_voicemail">Thư thoại chưa đọc từ ^1, ^2, ^3, ^4.</string>
+  <string name="description_read_voicemail">Thư thoại từ ^1, ^2, ^3, ^4.</string>
+  <string name="description_outgoing_call">Gọi tới ^1, ^2, ^3, ^4.</string>
+  <string name="call_log_via_number">qua %1$s</string>
+  <string name="call_log_via_number_phone_account">%1$s qua %2$s</string>
+  <string name="description_call_action">Gọi ^1</string>
+  <string name="description_video_call_action">Gọi điện video cho ^1.</string>
+  <string name="description_voicemail_action">Nghe thư thoại từ ^1</string>
+  <string name="description_create_new_contact_action">Tạo địa chỉ liên hệ cho ^1</string>
+  <string name="description_add_to_existing_contact_action">Thêm ^1 vào địa chỉ liên hệ hiện có</string>
+  <string name="description_details_action">Chi tiết cuộc gọi cho ^1</string>
+  <string name="call_log_header_today">Hôm nay</string>
+  <string name="call_log_header_yesterday">Hôm qua</string>
+  <string name="call_log_header_other">Cũ hơn</string>
+  <string name="voicemail_speaker_on">Bật loa.</string>
+  <string name="voicemail_speaker_off">Tắt loa.</string>
+  <string name="voicemail_play_start_pause">Bắt đầu hoặc tạm dừng phát lại.</string>
+  <string name="display_options_title">Tùy chọn hiển thị</string>
+  <string name="sounds_and_vibration_title">Âm thanh và rung</string>
+  <string name="accessibility_settings_title">Trợ năng</string>
+  <string name="ringtone_title">Nhạc chuông điện thoại</string>
+  <string name="vibrate_on_ring_title">Đồng thời rung khi có cuộc gọi</string>
+  <string name="dtmf_tone_enable_title">Âm bàn phím</string>
+  <string name="dtmf_tone_length_title">Độ dài âm bàn phím</string>
   <string-array name="dtmf_tone_length_entries">
-    <item msgid="3136353015227162823">"Thường"</item>
-    <item msgid="5376841175538523822">"Dài"</item>
+    <item>Thường</item>
+    <item>Dài</item>
   </string-array>
-    <string name="respond_via_sms_setting_title" msgid="8008181606657693452">"Trả lời nhanh"</string>
-    <string name="call_settings_label" msgid="7824611757200960807">"Cuộc gọi"</string>
-    <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Chặn cuộc gọi"</string>
-    <string name="voicemail_settings_label" msgid="4594299554519920570">"Thư thoại"</string>
-    <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Tạm thời tắt chặn cuộc gọi"</string>
-    <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Tính năng chặn cuộc gọi đã bị tắt vì bạn đã liên hệ với dịch vụ khẩn cấp từ điện thoại này trong vòng 48 giờ qua. Tính năng này sẽ được bật lại tự động sau khi khoảng thời gian 48 giờ kết thúc."</string>
-    <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Nhập số"</string>
-    <string name="blocked_call_settings_import_description" msgid="1819412052545228965">"Trước đây bạn đã đánh dấu một số người gọi sẽ được tự động gửi tới thư thoại qua các ứng dụng khác."</string>
-    <string name="blocked_call_settings_view_numbers_button" msgid="3332727948554356704">"Xem số"</string>
-    <string name="blocked_call_settings_import_button" msgid="7319111700387470727">"Nhập"</string>
-    <string name="description_blocked_number_list_delete" msgid="2139644216858370740">"Bỏ chặn số"</string>
-    <string name="addBlockedNumber" msgid="3053473735238295551">"Thêm số"</string>
-    <string name="block_number_footer_message_vvm" msgid="7955326304033982368">"Cuộc gọi từ các số này sẽ bị chặn và thư thoại sẽ tự động bị xóa."</string>
-    <string name="block_number_footer_message_no_vvm" msgid="1152684139070471665">"Cuộc gọi từ các số này sẽ bị chặn nhưng họ vẫn có thể để lại thư thoại cho bạn."</string>
-    <string name="block_list" msgid="4701585783411870782">"Số bị chặn"</string>
-    <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g> đã bị chặn."</string>
-    <string name="phone_account_settings_label" msgid="8372485478006965920">"Tài khoản gọi"</string>
-    <string name="permission_no_speeddial" msgid="8487215628510596753">"Để bật quay số nhanh, bật quyền đối với Danh bạ."</string>
-    <string name="permission_no_calllog" msgid="4053705651238775784">"Để xem nhật ký cuộc gọi của bạn, bật quyền đối với Điện thoại."</string>
-    <string name="permission_no_search" msgid="2424710404207193826">"Để tìm kiếm liên hệ của bạn, hãy bật quyền đối với Danh bạ."</string>
-    <string name="permission_place_call" msgid="8686908130349369423">"Để thực hiện cuộc gọi, bật quyền đối với Điện thoại."</string>
-    <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"Ứng dụng Điện thoại không có quyền ghi vào cài đặt hệ thống."</string>
-    <string name="blocked_number_call_log_label" msgid="4212282846299997693">"Đã chặn"</string>
-    <string name="call_log_action_block_report_number" msgid="7302636538668696729">"Chặn/báo cáo spam"</string>
-    <string name="call_log_action_block_number" msgid="5048188386501998865">"Chặn số"</string>
-    <string name="call_log_action_remove_spam" msgid="2045319806318398403">"Không phải là spam"</string>
-    <string name="call_log_action_unblock_number" msgid="6100117033288448758">"Bỏ chặn số"</string>
-    <string name="spam_number_call_log_label" msgid="2678431398326811131">"Spam"</string>
-    <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> ngoại tuyến và không liên hệ được"</string>
-    <string name="about_phone_label" msgid="582991354677973731">"Giới thiệu"</string>
-    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Do Google phiên âm"</string>
-    <string name="voicemail_transcription_in_progress" msgid="2933320969613783210">"Google đang phiên âm…"</string>
-    <string name="voicemail_transcription_failed" msgid="335275303117412706">"Không có bản phiên âm."</string>
-    <string name="voicemail_transcription_failed_language_not_supported" msgid="4210332591050562553">"Không có bản phiên âm. Không hỗ trợ ngôn ngữ."</string>
-    <string name="voicemail_transcription_failed_no_speech" msgid="9093372879697874852">"Không có bản phiên âm. Không tìm thấy giọng nói."</string>
-    <string name="view_conversation" msgid="7895904782094119702">"Xem"</string>
-    <string name="ec_data_deleted" msgid="4794880345545827107">"Đã xóa cuộc gọi. Hãy xem và xóa tệp đính kèm được chia sẻ trong cuộc gọi này trong Messages."</string>
-    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"Đã xóa cuộc gọi. Hãy xem và xóa tệp đính kèm được chia sẻ trong các cuộc gọi này trong Messages."</string>
+  <string name="respond_via_sms_setting_title">Trả lời nhanh</string>
+  <string name="call_settings_label">Cuộc gọi</string>
+  <string name="manage_blocked_numbers_label">Số bị chặn</string>
+  <string name="voicemail_settings_label">Thư thoại</string>
+  <string name="blocked_numbers_disabled_emergency_header_label">Tạm thời tắt chặn cuộc gọi</string>
+  <string name="blocked_numbers_disabled_emergency_desc">Tính năng chặn cuộc gọi đã bị tắt vì bạn đã liên hệ với dịch vụ khẩn cấp từ điện thoại này trong vòng 48 giờ qua. Tính năng này sẽ được bật lại tự động sau khi khoảng thời gian 48 giờ kết thúc.</string>
+  <string name="import_send_to_voicemail_numbers_label">Nhập số</string>
+  <string name="blocked_call_settings_import_description">Trước đây bạn đã đánh dấu một số người gọi sẽ được tự động gửi tới thư thoại qua các ứng dụng khác.</string>
+  <string name="blocked_call_settings_view_numbers_button">Xem số</string>
+  <string name="blocked_call_settings_import_button">Nhập</string>
+  <string name="description_blocked_number_list_delete">Bỏ chặn số</string>
+  <string name="addBlockedNumber">Thêm số</string>
+  <string name="block_number_footer_message_vvm">Cuộc gọi từ các số này sẽ bị chặn và thư thoại sẽ tự động bị xóa.</string>
+  <string name="block_number_footer_message_no_vvm">Cuộc gọi từ các số này sẽ bị chặn nhưng họ vẫn có thể để lại thư thoại cho bạn.</string>
+  <string name="block_list">Số bị chặn</string>
+  <string name="alreadyBlocked">%1$s đã bị chặn.</string>
+  <string name="phone_account_settings_label">Tài khoản gọi</string>
+  <string name="permission_no_speeddial">Để bật quay số nhanh, bật quyền đối với Danh bạ.</string>
+  <string name="permission_no_calllog">Để xem nhật ký cuộc gọi của bạn, bật quyền đối với Điện thoại.</string>
+  <string name="permission_no_search">Để tìm kiếm liên hệ của bạn, hãy bật quyền đối với Danh bạ.</string>
+  <string name="permission_place_call">Để thực hiện cuộc gọi, bật quyền đối với Điện thoại.</string>
+  <string name="toast_cannot_write_system_settings">Ứng dụng Điện thoại không có quyền ghi vào cài đặt hệ thống.</string>
+  <string name="blocked_number_call_log_label">Đã chặn</string>
+  <string name="call_log_action_block_report_number">Chặn/báo cáo spam</string>
+  <string name="call_log_action_block_number">Chặn số</string>
+  <string name="call_log_action_remove_spam">Không phải là spam</string>
+  <string name="call_log_action_unblock_number">Bỏ chặn số</string>
+  <string name="spam_number_call_log_label">Spam</string>
+  <string name="call_composer_connection_failed">%1$s ngoại tuyến và không liên hệ được</string>
+  <string name="about_phone_label">Giới thiệu</string>
+  <string name="voicemail_transcription_branding_text">Do Google phiên âm</string>
+  <string name="voicemail_transcription_in_progress">Đang phiên âm…</string>
+  <string name="voicemail_transcription_failed">Không có bản phiên âm.</string>
+  <string name="voicemail_transcription_failed_language_not_supported">Không có bản phiên âm. Không hỗ trợ ngôn ngữ.</string>
+  <string name="voicemail_transcription_failed_no_speech">Không có bản phiên âm. Không tìm thấy giọng nói.</string>
+  <string name="voicemail_donation_promo_title">Giúp cải thiện độ chính xác của bản chép lời?</string>
+  <string name="voicemail_donation_promo_content">Cho phép Google xem xét thư thoại này và các thư thoại trong tương lai có bản chép lời. Các thư thoại này sẽ được lưu trữ ẩn danh. Bạn có thể thay đổi Cài đặt bất cứ lúc nào. %1$s</string>
+  <string name="voicemail_donation_promo_opt_in">Có, tôi đồng ý</string>
+  <string name="voicemail_donation_promo_opt_out">Không, cảm ơn</string>
+  <string name="voicemail_transcription_rating">Đánh giá chất lượng ghi âm</string>
+  <string name="voicemail_transcription_rating_thanks">Cảm ơn bạn đã phản hồi</string>
+  <string name="description_rating_good">Thích</string>
+  <string name="description_rating_bad">Không thích</string>
+  <string name="view_conversation">Xem</string>
+  <string name="ec_data_deleted">Đã xóa cuộc gọi. Hãy xem và xóa tệp đính kèm được chia sẻ trong cuộc gọi này trong Messages.</string>
+  <string name="multiple_ec_data_deleted">Đã xóa cuộc gọi. Hãy xem và xóa tệp đính kèm được chia sẻ trong các cuộc gọi này trong Messages.</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-zh-rCN/strings.xml b/java/com/android/dialer/app/res/values-zh-rCN/strings.xml
index c05c874..c828654 100644
--- a/java/com/android/dialer/app/res/values-zh-rCN/strings.xml
+++ b/java/com/android/dialer/app/res/values-zh-rCN/strings.xml
@@ -1,179 +1,171 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="applicationLabel" msgid="2202739481132958990">"电话"</string>
-    <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"电话拨号键盘"</string>
-    <string name="callHistoryIconLabel" msgid="7493268743411968630">"通话记录"</string>
-    <string name="action_copy_number_text" msgid="832682558551502319">"复制号码"</string>
-    <string name="copy_transcript_text" msgid="937904189017310829">"复制转录内容"</string>
-    <string name="action_edit_number_before_call" msgid="8017492815878473837">"拨打之前修改号码"</string>
-    <string name="call_log_delete_all" msgid="7852970926906523784">"清除通话记录"</string>
-    <string name="call_log_trash_voicemail" msgid="6118493534178533972">"删除语音邮件"</string>
-    <string name="snackbar_voicemail_deleted" msgid="7463166543725496307">"语音邮件已删除"</string>
-    <string name="snackbar_voicemail_deleted_undo" msgid="6959743982796409941">"撤消"</string>
-    <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"要清除通话记录吗？"</string>
-    <string name="clearCallLogConfirmation" msgid="6844949465815109166">"这会删除您的所有通话记录"</string>
-    <string name="clearCallLogProgress_title" msgid="995004835687361977">"正在清除通话记录…"</string>
-    <string name="notification_missedCallTitle" msgid="8283366068539898486">"未接电话"</string>
-    <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"未接工作来电"</string>
-    <string name="notification_missedCallsTitle" msgid="3697442015345089802">"未接电话"</string>
-    <string name="notification_missedCallsMsg" msgid="8176217633929018706">"<xliff:g id="NUM_MISSED_CALLS">%d</xliff:g> 个未接电话"</string>
-    <string name="notification_missedCall_call_back" msgid="3875698110051973965">"回拨"</string>
-    <string name="notification_missedCall_message" msgid="5086910028988305964">"发短信"</string>
-    <string name="post_call_notification_message" msgid="5417476789860590611">"<xliff:g id="NAME">%1$s</xliff:g>：<xliff:g id="MESSAGE">%2$s</xliff:g>"</string>
-    <string name="notification_voicemail_text_format" msgid="1895667520930252897">"拨打 <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
-    <string name="notification_voicemail_no_vm_number" msgid="8942821987929495842">"语音信箱号码未知"</string>
-    <plurals name="notification_voicemail_title" formatted="false" msgid="1551847434476438657">
-      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> 封语音邮件</item>
-      <item quantity="one">1 封语音邮件</item>
-    </plurals>
-    <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>，<xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
-    <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"来自<xliff:g id="CALLER">%1$s</xliff:g>的新语音邮件"</string>
-    <string name="voicemail_playback_error" msgid="4384373852257757295">"无法播放语音邮件"</string>
-    <string name="voicemail_fetching_content" msgid="572320120918636014">"正在加载语音邮件…"</string>
-    <string name="voicemail_fetching_timout" msgid="2128873915839949783">"无法加载语音邮件"</string>
-    <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_playback_speakerphone" msgid="4852027754869750227">"打开或关闭扬声器"</string>
-    <string name="description_playback_seek" msgid="1340910573254132520">"拖动到播放位置"</string>
-    <string name="action_menu_call_history_description" msgid="8829135306925008546">"通话记录"</string>
-    <string name="action_menu_overflow_description" msgid="7648679686746517341">"更多选项"</string>
-    <string name="action_menu_dialpad_button" msgid="1970631633457493180">"拨号键盘"</string>
-    <string name="dialer_settings_label" msgid="4980176284150290175">"设置"</string>
-    <string name="simulator_submenu_label" msgid="186156287346615267">"模拟器"</string>
-    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"创建可在新界面中使用的快捷键"</string>
-    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"正在进入批量操作模式"</string>
-    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"已退出批量操作模式"</string>
-    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"已选择 <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"已取消选择 <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_contact_details" msgid="3341280873855253464">"<xliff:g id="NAMEORNUMBER">%1$s</xliff:g>的详细联系信息"</string>
-    <string name="description_spam_contact_details" msgid="5592578752881528368">"疑似骚扰电话来电者“<xliff:g id="NAMEORNUMBER">%1$s</xliff:g>”的详细联系信息"</string>
-    <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g>次通话。"</string>
-    <string name="description_video_call" msgid="3738199365585751727">"视频通话。"</string>
-    <string name="description_start_voice_search" msgid="8380022725973015261">"开始语音搜索"</string>
-    <string name="voicemail" msgid="8899540969000957954">"语音信箱"</string>
-    <string name="description_cancel_multi_select" msgid="3930475950253360461">"取消批量操作模式"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"删除"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"取消"</string>
-    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"已选择 <xliff:g id="NUMBER">%1$s</xliff:g> 封"</string>
-    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
-      <item quantity="other">"<b>"要删除这些语音邮件吗？"</b>"</item>
-      <item quantity="one">"<b>"要删除这封语音邮件吗？"</b>"</item>
-    </plurals>
-    <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
-    <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g><xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
-    <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="voice_search_not_available" msgid="6546240433719732905">"无法使用语音搜索"</string>
-    <string name="dialer_hint_find_contact" msgid="2023214799381149808">"搜索联系人"</string>
-    <string name="block_number_search_hint" msgid="5377706079015099416">"添加号码或搜索联系人"</string>
-    <string name="call_log_all_empty" msgid="3955572868518162004">"您没有任何通话记录"</string>
-    <string name="call_log_all_empty_action" msgid="852218280136243014">"拨打电话"</string>
-    <string name="call_log_missed_empty" msgid="7094936030845062214">"您没有任何未接电话。"</string>
-    <string name="call_log_voicemail_empty" msgid="273623903423275178">"您未收到任何语音邮件。"</string>
-    <string name="call_log_activity_title" msgid="1275242727244945527">"通话记录"</string>
-    <string name="call_log_all_title" msgid="6042262422192020327">"全部"</string>
-    <string name="call_log_missed_title" msgid="17254005889268015">"未接电话"</string>
-    <string name="tab_speed_dial" msgid="6616404752227561075">"快速拨号"</string>
-    <string name="tab_history" msgid="7420269368689503596">"通话记录"</string>
-    <string name="tab_all_contacts" msgid="5531733977693943015">"通讯录"</string>
-    <string name="tab_voicemail" msgid="2458548090088316246">"语音邮件"</string>
-    <string name="search_shortcut_call_number" msgid="8847918845036880688">"拨打 <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"新建联系人"</string>
-    <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"添加到联系人"</string>
-    <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"发送短信"</string>
-    <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"发起视频通话"</string>
-    <string name="search_shortcut_block_number" msgid="4587283230665805776">"屏蔽号码"</string>
-    <string name="speed_dial_empty" msgid="3346406399966039505">"尚未给任何联系人设定快速拨号"</string>
-    <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"添加常用联系人"</string>
-    <string name="remove_contact" msgid="2353580570488923668">"移除"</string>
-    <string name="select_all" msgid="408601760696146245">"全选"</string>
-    <string name="call_log_action_video_call" msgid="7565549950343850819">"视频通话"</string>
-    <string name="call_log_action_send_message" msgid="6948727362660115554">"发送短信"</string>
-    <string name="call_log_action_details" msgid="2091370737371449501">"通话详情"</string>
-    <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"发送至…"</string>
-    <string name="call_log_action_call" msgid="682724094251540583">"呼叫<xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_incoming_missed_call" msgid="8292535799379230029">"<xliff:g id="PHONEACCOUNT">^4</xliff:g> 上 <xliff:g id="TIMEOFCALL">^3</xliff:g>来自<xliff:g id="NAMEORNUMBER">^1</xliff:g>（<xliff:g id="TYPEORLOCATION">^2</xliff:g>）的未接电话。"</string>
-    <string name="description_incoming_answered_call" msgid="3920182963103160610">"<xliff:g id="PHONEACCOUNT">^4</xliff:g> 上 <xliff:g id="TIMEOFCALL">^3</xliff:g>来自<xliff:g id="NAMEORNUMBER">^1</xliff:g>（<xliff:g id="TYPEORLOCATION">^2</xliff:g>）的已接电话。"</string>
-    <string name="description_unread_voicemail" msgid="145170985013419170">"<xliff:g id="PHONEACCOUNT">^4</xliff:g> 上 <xliff:g id="TIMEOFCALL">^3</xliff:g>来自<xliff:g id="NAMEORNUMBER">^1</xliff:g>（<xliff:g id="TYPEORLOCATION">^2</xliff:g>）的未读语音邮件。"</string>
-    <string name="description_read_voicemail" msgid="5585559881573227732">"<xliff:g id="PHONEACCOUNT">^4</xliff:g> 上 <xliff:g id="TIMEOFCALL">^3</xliff:g>来自<xliff:g id="NAMEORNUMBER">^1</xliff:g>（<xliff:g id="TYPEORLOCATION">^2</xliff:g>）的语音邮件。"</string>
-    <string name="description_outgoing_call" msgid="543952487882919924">"<xliff:g id="TIMEOFCALL">^3</xliff:g>通过 <xliff:g id="PHONEACCOUNT">^4</xliff:g> 拨打给<xliff:g id="NAMEORNUMBER">^1</xliff:g>（<xliff:g id="TYPEORLOCATION">^2</xliff:g>）的电话。"</string>
-    <string name="call_log_via_number" msgid="1340307109806397650">"通过 <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"帐号：<xliff:g id="PHONEACCOUNT">%1$s</xliff:g>，通过 <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="description_call_action" msgid="4042796498169106545">"呼叫<xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_video_call_action" msgid="1237090968588659650">"与<xliff:g id="NAMEORNUMBER">^1</xliff:g>进行视频通话。"</string>
-    <string name="description_voicemail_action" msgid="3290143432403538524">"听取来自<xliff:g id="NAMEORNUMBER">^1</xliff:g>的语音邮件"</string>
-    <string name="description_create_new_contact_action" msgid="1928282350281564130">"为<xliff:g id="NAMEORNUMBER">^1</xliff:g>创建联系人信息"</string>
-    <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"将<xliff:g id="NAMEORNUMBER">^1</xliff:g>添加到现有联系人"</string>
-    <string name="description_details_action" msgid="2061866409737706174">"与<xliff:g id="NAMEORNUMBER">^1</xliff:g>的通话详情"</string>
-    <string name="call_log_header_today" msgid="1576119097475845293">"今天"</string>
-    <string name="call_log_header_yesterday" msgid="5616077776205329563">"昨天"</string>
-    <string name="call_log_header_other" msgid="4940676886254217644">"更早"</string>
-    <string name="voicemail_speaker_on" msgid="3151333608926996668">"打开扬声器。"</string>
-    <string name="voicemail_speaker_off" msgid="2530064206962034201">"关闭扬声器。"</string>
-    <string name="voicemail_play_start_pause" msgid="3874823480278334664">"开始或暂停播放。"</string>
-    <string name="display_options_title" msgid="3880091801055797975">"显示选项"</string>
-    <string name="sounds_and_vibration_title" msgid="3075050000721181384">"提示音和振动"</string>
-    <string name="accessibility_settings_title" msgid="3329027650429831820">"无障碍功能"</string>
-    <string name="ringtone_title" msgid="8377174189894648486">"手机铃声"</string>
-    <string name="vibrate_on_ring_title" msgid="631441314790960485">"有来电时响铃并振动"</string>
-    <string name="dtmf_tone_enable_title" msgid="3273762431523939277">"拨号键盘提示音"</string>
-    <string name="dtmf_tone_length_title" msgid="534096029202438539">"拨号键盘提示音长度"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="applicationLabel">电话</string>
+  <string name="launcherDialpadActivityLabel">电话拨号键盘</string>
+  <string name="callHistoryIconLabel">通话记录</string>
+  <string name="action_copy_number_text">复制号码</string>
+  <string name="copy_transcript_text">复制转录内容</string>
+  <string name="action_edit_number_before_call">拨打之前修改号码</string>
+  <string name="call_log_delete_all">清除通话记录</string>
+  <string name="call_log_trash_voicemail">删除语音邮件</string>
+  <string name="snackbar_voicemail_deleted">语音邮件已删除</string>
+  <string name="clearCallLogConfirmation_title">要清除通话记录吗？</string>
+  <string name="clearCallLogConfirmation">这会删除您的所有通话记录</string>
+  <string name="clearCallLogProgress_title">正在清除通话记录…</string>
+  <string name="notification_missedCallTitle">未接电话</string>
+  <string name="notification_missedWorkCallTitle">未接工作来电</string>
+  <string name="notification_missedCallsTitle">未接电话</string>
+  <string name="notification_missedCallsMsg">%d 个未接电话</string>
+  <string name="notification_missedCall_call_back">回拨</string>
+  <string name="notification_missedCall_message">发短信</string>
+  <string name="post_call_notification_message">%1$s：%2$s</string>
+  <string name="notification_voicemail_text_format">拨打 %s</string>
+  <string name="notification_voicemail_no_vm_number">语音信箱号码未知</string>
+  <plurals name="notification_voicemail_title">
+    <item quantity="one">1 封语音邮件</item>
+    <item quantity="other">%1$d 封语音邮件</item>
+  </plurals>
+  <string name="notification_voicemail_callers_list">%1$s，%2$s</string>
+  <string name="notification_new_voicemail_ticker">来自%1$s的新语音邮件</string>
+  <string name="voicemail_playback_error">无法播放语音邮件</string>
+  <string name="voicemail_fetching_content">正在加载语音邮件…</string>
+  <string name="voicemail_fetching_timout">无法加载语音邮件</string>
+  <string name="call_log_item_count_and_date">(%1$d) %2$s</string>
+  <string name="description_playback_speakerphone">打开或关闭扬声器</string>
+  <string name="description_playback_seek">拖动到播放位置</string>
+  <string name="action_menu_call_history_description">通话记录</string>
+  <string msgid="2295659037509008453" name="action_menu_overflow_description">更多选项</string>
+  <string name="action_menu_dialpad_button">拨号键盘</string>
+  <string name="dialer_settings_label">设置</string>
+  <string name="simulator_submenu_label">模拟器</string>
+  <string name="new_ui_launcher_shortcut_label">创建可在新界面中使用的快捷键</string>
+  <string name="description_entering_bulk_action_mode">正在进入批量操作模式</string>
+  <string name="description_leaving_bulk_action_mode">已退出批量操作模式</string>
+  <string name="description_selecting_bulk_action_mode">已选择 %1$s</string>
+  <string name="description_unselecting_bulk_action_mode">已取消选择 %1$s</string>
+  <string name="description_contact_details">%1$s的详细联系信息</string>
+  <string name="description_spam_contact_details">疑似骚扰电话来电者“%1$s”的详细联系信息</string>
+  <string name="description_num_calls">%1$s次通话。</string>
+  <string name="description_video_call">视频通话。</string>
+  <string name="description_start_voice_search">开始语音搜索</string>
+  <string name="voicemail">语音信箱</string>
+  <string name="description_cancel_multi_select">取消批量操作模式</string>
+  <string name="voicemailMultiSelectDeleteConfirm">删除</string>
+  <string name="voicemailMultiSelectDeleteCancel">取消</string>
+  <string name="voicemailMultiSelectActionBarTitle">已选择 %1$s 封</string>
+  <plurals name="delete_voicemails_confirmation_dialog_title">
+    <item quantity="one"><b>要删除这封语音邮件吗？</b></item>
+    <item quantity="other"><b>要删除这些语音邮件吗？</b></item>
+  </plurals>
+  <string name="voicemailCallLogToday">@string/call_log_header_today</string>
+  <string name="voicemailCallLogDateTimeFormat">%1$s%2$s</string>
+  <string name="voicemailDurationFormat">%1$02d:%2$02d</string>
+  <string name="voicemailCallLogDateTimeFormatWithDuration">%1$s • %2$s</string>
+  <string name="voice_search_not_available">无法使用语音搜索</string>
+  <string name="dialer_hint_find_contact">搜索联系人</string>
+  <string name="block_number_search_hint">添加号码或搜索联系人</string>
+  <string name="call_log_all_empty">您没有任何通话记录</string>
+  <string name="call_log_all_empty_action">拨打电话</string>
+  <string name="call_log_missed_empty">您没有任何未接电话。</string>
+  <string name="call_log_voicemail_empty">您未收到任何语音邮件。</string>
+  <string name="call_log_activity_title">通话记录</string>
+  <string name="call_log_all_title">全部</string>
+  <string name="call_log_missed_title">未接电话</string>
+  <string name="tab_speed_dial">快速拨号</string>
+  <string name="tab_history">通话记录</string>
+  <string name="tab_all_contacts">通讯录</string>
+  <string name="tab_voicemail">语音邮件</string>
+  <string name="search_shortcut_call_number">拨打 %s</string>
+  <string name="search_shortcut_create_new_contact">新建联系人</string>
+  <string name="search_shortcut_add_to_contact">添加到联系人</string>
+  <string name="search_shortcut_send_sms_message">发送短信</string>
+  <string name="search_shortcut_make_video_call">发起视频通话</string>
+  <string name="search_shortcut_block_number">屏蔽号码</string>
+  <string name="speed_dial_empty">尚未给任何联系人设定快速拨号</string>
+  <string name="speed_dial_empty_add_favorite_action">添加常用联系人</string>
+  <string name="remove_contact">移除</string>
+  <string name="select_all">全选</string>
+  <string name="call_log_action_video_call">视频通话</string>
+  <string name="call_log_action_set_up_video">设置视频通话</string>
+  <string name="call_log_action_invite_video">邀请加入视频通话</string>
+  <string name="call_log_action_send_message">发送短信</string>
+  <string name="call_log_action_details">通话详情</string>
+  <string name="call_log_action_share_voicemail">发送至…</string>
+  <string name="call_log_action_call">呼叫^1</string>
+  <string name="description_incoming_missed_call">^4 上 ^3来自^1（^2）的未接电话。</string>
+  <string name="description_incoming_answered_call">^4 上 ^3来自^1（^2）的已接电话。</string>
+  <string name="description_unread_voicemail">^4 上 ^3来自^1（^2）的未读语音邮件。</string>
+  <string name="description_read_voicemail">^4 上 ^3来自^1（^2）的语音邮件。</string>
+  <string name="description_outgoing_call">^3通过 ^4 拨打给^1（^2）的电话。</string>
+  <string name="call_log_via_number">通过 %1$s</string>
+  <string name="call_log_via_number_phone_account">帐号：%1$s，通过 %2$s</string>
+  <string name="description_call_action">呼叫^1</string>
+  <string name="description_video_call_action">与^1进行视频通话。</string>
+  <string name="description_voicemail_action">听取来自^1的语音邮件</string>
+  <string name="description_create_new_contact_action">为^1创建联系人信息</string>
+  <string name="description_add_to_existing_contact_action">将^1添加到现有联系人</string>
+  <string name="description_details_action">与^1的通话详情</string>
+  <string name="call_log_header_today">今天</string>
+  <string name="call_log_header_yesterday">昨天</string>
+  <string name="call_log_header_other">更早</string>
+  <string name="voicemail_speaker_on">打开扬声器。</string>
+  <string name="voicemail_speaker_off">关闭扬声器。</string>
+  <string name="voicemail_play_start_pause">开始或暂停播放。</string>
+  <string name="display_options_title">显示选项</string>
+  <string name="sounds_and_vibration_title">提示音和振动</string>
+  <string name="accessibility_settings_title">无障碍功能</string>
+  <string name="ringtone_title">手机铃声</string>
+  <string name="vibrate_on_ring_title">有来电时响铃并振动</string>
+  <string name="dtmf_tone_enable_title">拨号键盘提示音</string>
+  <string name="dtmf_tone_length_title">拨号键盘提示音长度</string>
   <string-array name="dtmf_tone_length_entries">
-    <item msgid="3136353015227162823">"标准"</item>
-    <item msgid="5376841175538523822">"长"</item>
+    <item>标准</item>
+    <item>长</item>
   </string-array>
-    <string name="respond_via_sms_setting_title" msgid="8008181606657693452">"快速回复"</string>
-    <string name="call_settings_label" msgid="7824611757200960807">"通话"</string>
-    <string name="manage_blocked_numbers_label" msgid="16823761991832273">"来电屏蔽"</string>
-    <string name="voicemail_settings_label" msgid="4594299554519920570">"语音邮件"</string>
-    <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"来电拦截功能已暂时关闭"</string>
-    <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"来电拦截功能已停用，因为您在过去 48 小时内使用该手机拨打了紧急服务电话。系统会在 48 小时的期限结束后自动重新启用该功能。"</string>
-    <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"导入号码"</string>
-    <string name="blocked_call_settings_import_description" msgid="1819412052545228965">"您曾通过其他应用将某些来电者设为自动转到语音信箱。"</string>
-    <string name="blocked_call_settings_view_numbers_button" msgid="3332727948554356704">"查看号码"</string>
-    <string name="blocked_call_settings_import_button" msgid="7319111700387470727">"导入"</string>
-    <string name="description_blocked_number_list_delete" msgid="2139644216858370740">"取消屏蔽号码"</string>
-    <string name="addBlockedNumber" msgid="3053473735238295551">"添加号码"</string>
-    <string name="block_number_footer_message_vvm" msgid="7955326304033982368">"系统将屏蔽这些号码的来电，并将自动删除这些来电者发送的语音邮件。"</string>
-    <string name="block_number_footer_message_no_vvm" msgid="1152684139070471665">"系统将屏蔽这些号码的来电，但这些来电者可能仍然能够给您发送语音邮件。"</string>
-    <string name="block_list" msgid="4701585783411870782">"已屏蔽的号码"</string>
-    <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g> 已被屏蔽。"</string>
-    <string name="phone_account_settings_label" msgid="8372485478006965920">"通话帐号"</string>
-    <string name="permission_no_speeddial" msgid="8487215628510596753">"要启用快速拨号功能，请开启“通讯录”权限。"</string>
-    <string name="permission_no_calllog" msgid="4053705651238775784">"要查看您的通话记录，请开启“电话”权限。"</string>
-    <string name="permission_no_search" msgid="2424710404207193826">"要搜索您的联系人，请开启“通讯录”权限。"</string>
-    <string name="permission_place_call" msgid="8686908130349369423">"要拨打电话，请开启“电话”权限。"</string>
-    <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"电话应用不具备写入系统设置的权限。"</string>
-    <string name="blocked_number_call_log_label" msgid="4212282846299997693">"已屏蔽"</string>
-    <string name="call_log_action_block_report_number" msgid="7302636538668696729">"屏蔽/举报骚扰电话号码"</string>
-    <string name="call_log_action_block_number" msgid="5048188386501998865">"屏蔽号码"</string>
-    <string name="call_log_action_remove_spam" msgid="2045319806318398403">"非骚扰电话号码"</string>
-    <string name="call_log_action_unblock_number" msgid="6100117033288448758">"取消屏蔽号码"</string>
-    <string name="spam_number_call_log_label" msgid="2678431398326811131">"骚扰电话号码"</string>
-    <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g>不在线，无法接通"</string>
-    <string name="about_phone_label" msgid="582991354677973731">"应用信息"</string>
-    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"由 Google 转录"</string>
-    <string name="voicemail_transcription_in_progress" msgid="2933320969613783210">"Google 正在转录…"</string>
-    <string name="voicemail_transcription_failed" msgid="335275303117412706">"转录失败。"</string>
-    <string name="voicemail_transcription_failed_language_not_supported" msgid="4210332591050562553">"转录失败，语言不受支持。"</string>
-    <string name="voicemail_transcription_failed_no_speech" msgid="9093372879697874852">"转录失败，检测不到语音。"</string>
-    <string name="view_conversation" msgid="7895904782094119702">"查看"</string>
-    <string name="ec_data_deleted" msgid="4794880345545827107">"通话已删除。请前往“信息”应用查看和删除通过此通话分享的附件。"</string>
-    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"通话已删除。请前往“信息”应用查看和删除通过通话分享的附件。"</string>
+  <string name="respond_via_sms_setting_title">快速回复</string>
+  <string name="call_settings_label">通话</string>
+  <string name="manage_blocked_numbers_label">已屏蔽的号码</string>
+  <string name="voicemail_settings_label">语音邮件</string>
+  <string name="blocked_numbers_disabled_emergency_header_label">来电拦截功能已暂时关闭</string>
+  <string name="blocked_numbers_disabled_emergency_desc">来电拦截功能已停用，因为您在过去 48 小时内使用该手机拨打了紧急服务电话。系统会在 48 小时的期限结束后自动重新启用该功能。</string>
+  <string name="import_send_to_voicemail_numbers_label">导入号码</string>
+  <string name="blocked_call_settings_import_description">您曾通过其他应用将某些来电者设为自动转到语音信箱。</string>
+  <string name="blocked_call_settings_view_numbers_button">查看号码</string>
+  <string name="blocked_call_settings_import_button">导入</string>
+  <string name="description_blocked_number_list_delete">取消屏蔽号码</string>
+  <string name="addBlockedNumber">添加号码</string>
+  <string name="block_number_footer_message_vvm">系统将屏蔽这些号码的来电，并将自动删除这些来电者发送的语音邮件。</string>
+  <string name="block_number_footer_message_no_vvm">系统将屏蔽这些号码的来电，但这些来电者可能仍然能够给您发送语音邮件。</string>
+  <string name="block_list">已屏蔽的号码</string>
+  <string name="alreadyBlocked">%1$s 已被屏蔽。</string>
+  <string name="phone_account_settings_label">通话帐号</string>
+  <string name="permission_no_speeddial">要启用快速拨号功能，请开启“通讯录”权限。</string>
+  <string name="permission_no_calllog">要查看您的通话记录，请开启“电话”权限。</string>
+  <string name="permission_no_search">要搜索您的联系人，请开启“通讯录”权限。</string>
+  <string name="permission_place_call">要拨打电话，请开启“电话”权限。</string>
+  <string name="toast_cannot_write_system_settings">电话应用不具备写入系统设置的权限。</string>
+  <string name="blocked_number_call_log_label">已屏蔽</string>
+  <string name="call_log_action_block_report_number">屏蔽/举报骚扰电话号码</string>
+  <string name="call_log_action_block_number">屏蔽号码</string>
+  <string name="call_log_action_remove_spam">非骚扰电话号码</string>
+  <string name="call_log_action_unblock_number">取消屏蔽号码</string>
+  <string name="spam_number_call_log_label">骚扰电话号码</string>
+  <string name="call_composer_connection_failed">%1$s不在线，无法接通</string>
+  <string name="about_phone_label">应用信息</string>
+  <string name="voicemail_transcription_branding_text">由 Google 转录</string>
+  <string name="voicemail_transcription_in_progress">正在转录…</string>
+  <string name="voicemail_transcription_failed">转录失败。</string>
+  <string name="voicemail_transcription_failed_language_not_supported">转录失败，语言不受支持。</string>
+  <string name="voicemail_transcription_failed_no_speech">转录失败，检测不到语音。</string>
+  <string name="voicemail_donation_promo_title">想帮助提高转录的准确性吗？</string>
+  <string name="voicemail_donation_promo_content">允许 Google 查看这条和日后的语音邮件及转录内容。系统会以匿名方式存储这些内容。您随时可以更改设置。%1$s</string>
+  <string name="voicemail_donation_promo_opt_in">立即启用</string>
+  <string name="voicemail_donation_promo_opt_out">不用了，谢谢</string>
+  <string name="voicemail_transcription_rating">为转录质量评分</string>
+  <string name="voicemail_transcription_rating_thanks">感谢您的反馈</string>
+  <string name="description_rating_good">顶</string>
+  <string name="description_rating_bad">踩</string>
+  <string name="view_conversation">查看</string>
+  <string name="ec_data_deleted">通话已删除。请前往“信息”应用查看和删除通过此通话分享的附件。</string>
+  <string name="multiple_ec_data_deleted">通话已删除。请前往“信息”应用查看和删除通过通话分享的附件。</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-zh-rHK/strings.xml b/java/com/android/dialer/app/res/values-zh-rHK/strings.xml
index 19467ab..219ac40 100644
--- a/java/com/android/dialer/app/res/values-zh-rHK/strings.xml
+++ b/java/com/android/dialer/app/res/values-zh-rHK/strings.xml
@@ -1,179 +1,171 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="applicationLabel" msgid="2202739481132958990">"手機"</string>
-    <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"手機小鍵盤"</string>
-    <string name="callHistoryIconLabel" msgid="7493268743411968630">"通話記錄"</string>
-    <string name="action_copy_number_text" msgid="832682558551502319">"複製號碼"</string>
-    <string name="copy_transcript_text" msgid="937904189017310829">"複製內容轉錄"</string>
-    <string name="action_edit_number_before_call" msgid="8017492815878473837">"致電前編輯號碼"</string>
-    <string name="call_log_delete_all" msgid="7852970926906523784">"清除通話記錄"</string>
-    <string name="call_log_trash_voicemail" msgid="6118493534178533972">"刪除留言"</string>
-    <string name="snackbar_voicemail_deleted" msgid="7463166543725496307">"已刪除留言信箱"</string>
-    <string name="snackbar_voicemail_deleted_undo" msgid="6959743982796409941">"復原"</string>
-    <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"要清除通話記錄嗎？"</string>
-    <string name="clearCallLogConfirmation" msgid="6844949465815109166">"這會刪除所有通話記錄"</string>
-    <string name="clearCallLogProgress_title" msgid="995004835687361977">"正在清除通話記錄…"</string>
-    <string name="notification_missedCallTitle" msgid="8283366068539898486">"未接來電"</string>
-    <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"未接工作來電"</string>
-    <string name="notification_missedCallsTitle" msgid="3697442015345089802">"未接來電"</string>
-    <string name="notification_missedCallsMsg" msgid="8176217633929018706">"<xliff:g id="NUM_MISSED_CALLS">%d</xliff:g> 個未接來電"</string>
-    <string name="notification_missedCall_call_back" msgid="3875698110051973965">"回撥"</string>
-    <string name="notification_missedCall_message" msgid="5086910028988305964">"短訊"</string>
-    <string name="post_call_notification_message" msgid="5417476789860590611">"<xliff:g id="NAME">%1$s</xliff:g>：<xliff:g id="MESSAGE">%2$s</xliff:g>"</string>
-    <string name="notification_voicemail_text_format" msgid="1895667520930252897">"撥號 <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
-    <string name="notification_voicemail_no_vm_number" msgid="8942821987929495842">"沒有可用的留言信箱號碼"</string>
-    <plurals name="notification_voicemail_title" formatted="false" msgid="1551847434476438657">
-      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> 個留言</item>
-      <item quantity="one">留言</item>
-    </plurals>
-    <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g> ， <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
-    <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"來自<xliff:g id="CALLER">%1$s</xliff:g>的新語音留言"</string>
-    <string name="voicemail_playback_error" msgid="4384373852257757295">"無法播放留言"</string>
-    <string name="voicemail_fetching_content" msgid="572320120918636014">"正在載入留言…"</string>
-    <string name="voicemail_fetching_timout" msgid="2128873915839949783">"無法載入留言"</string>
-    <string name="call_log_item_count_and_date" msgid="723848797957319181">"（ <xliff:g id="COUNT">%1$d</xliff:g> ） <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_playback_speakerphone" msgid="4852027754869750227">"開啟或關閉揚聲器"</string>
-    <string name="description_playback_seek" msgid="1340910573254132520">"指定播放位置"</string>
-    <string name="action_menu_call_history_description" msgid="8829135306925008546">"通話記錄"</string>
-    <string name="action_menu_overflow_description" msgid="7648679686746517341">"更多選項"</string>
-    <string name="action_menu_dialpad_button" msgid="1970631633457493180">"小鍵盤"</string>
-    <string name="dialer_settings_label" msgid="4980176284150290175">"設定"</string>
-    <string name="simulator_submenu_label" msgid="186156287346615267">"模擬器"</string>
-    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"建立新使用者介面捷徑"</string>
-    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"正在進入大量操作模式"</string>
-    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"已離開大量操作模式"</string>
-    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"已選取<xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"已取消選取<xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_contact_details" msgid="3341280873855253464">"「<xliff:g id="NAMEORNUMBER">%1$s</xliff:g>」的聯絡人詳細資料"</string>
-    <string name="description_spam_contact_details" msgid="5592578752881528368">"疑似垃圾來電者 <xliff:g id="NAMEORNUMBER">%1$s</xliff:g> 的聯絡人詳細資料"</string>
-    <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> 次通話次數。"</string>
-    <string name="description_video_call" msgid="3738199365585751727">"視像通話。"</string>
-    <string name="description_start_voice_search" msgid="8380022725973015261">"開始語音搜尋"</string>
-    <string name="voicemail" msgid="8899540969000957954">"留言"</string>
-    <string name="description_cancel_multi_select" msgid="3930475950253360461">"取消批量操作模式"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"刪除"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"取消"</string>
-    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"已選取 <xliff:g id="NUMBER">%1$s</xliff:g> 個"</string>
-    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
-      <item quantity="other">"<b>"要刪除這些留言嗎？"</b>"</item>
-      <item quantity="one">"<b>"要刪除此留言嗎？"</b>"</item>
-    </plurals>
-    <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
-    <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g><xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
-    <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="voice_search_not_available" msgid="6546240433719732905">"無法使用語音搜尋"</string>
-    <string name="dialer_hint_find_contact" msgid="2023214799381149808">"搜尋聯絡人"</string>
-    <string name="block_number_search_hint" msgid="5377706079015099416">"新增號碼或搜尋聯絡人"</string>
-    <string name="call_log_all_empty" msgid="3955572868518162004">"沒有通話記錄"</string>
-    <string name="call_log_all_empty_action" msgid="852218280136243014">"撥號"</string>
-    <string name="call_log_missed_empty" msgid="7094936030845062214">"您沒有未接來電。"</string>
-    <string name="call_log_voicemail_empty" msgid="273623903423275178">"您的留言信箱沒有留言。"</string>
-    <string name="call_log_activity_title" msgid="1275242727244945527">"通話記錄"</string>
-    <string name="call_log_all_title" msgid="6042262422192020327">"全部"</string>
-    <string name="call_log_missed_title" msgid="17254005889268015">"未接來電"</string>
-    <string name="tab_speed_dial" msgid="6616404752227561075">"快速撥號"</string>
-    <string name="tab_history" msgid="7420269368689503596">"通話記錄"</string>
-    <string name="tab_all_contacts" msgid="5531733977693943015">"聯絡人"</string>
-    <string name="tab_voicemail" msgid="2458548090088316246">"留言信箱"</string>
-    <string name="search_shortcut_call_number" msgid="8847918845036880688">"撥打 <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"建立新聯絡人"</string>
-    <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"加至現有聯絡人資料"</string>
-    <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"傳送短訊"</string>
-    <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"進行視像通話"</string>
-    <string name="search_shortcut_block_number" msgid="4587283230665805776">"封鎖號碼"</string>
-    <string name="speed_dial_empty" msgid="3346406399966039505">"快速撥號名單中沒有聯絡人"</string>
-    <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"新增常用聯絡人"</string>
-    <string name="remove_contact" msgid="2353580570488923668">"移除"</string>
-    <string name="select_all" msgid="408601760696146245">"全選"</string>
-    <string name="call_log_action_video_call" msgid="7565549950343850819">"視像通話"</string>
-    <string name="call_log_action_send_message" msgid="6948727362660115554">"傳送訊息"</string>
-    <string name="call_log_action_details" msgid="2091370737371449501">"通話詳情"</string>
-    <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"傳送至…"</string>
-    <string name="call_log_action_call" msgid="682724094251540583">"致電 <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_incoming_missed_call" msgid="8292535799379230029">"未接聽來電：<xliff:g id="NAMEORNUMBER">^1</xliff:g> (<xliff:g id="TIMEOFCALL">^3</xliff:g>，<xliff:g id="TYPEORLOCATION">^2</xliff:g><xliff:g id="PHONEACCOUNT">^4</xliff:g>)。"</string>
-    <string name="description_incoming_answered_call" msgid="3920182963103160610">"已接聽來電：<xliff:g id="NAMEORNUMBER">^1</xliff:g> (<xliff:g id="TIMEOFCALL">^3</xliff:g>，<xliff:g id="TYPEORLOCATION">^2</xliff:g><xliff:g id="PHONEACCOUNT">^4</xliff:g>)。"</string>
-    <string name="description_unread_voicemail" msgid="145170985013419170">"未收聽的留言來自 <xliff:g id="NAMEORNUMBER">^1</xliff:g> (<xliff:g id="TYPEORLOCATION">^2</xliff:g>)，來電時間：<xliff:g id="TIMEOFCALL">^3</xliff:g>，撥打至 <xliff:g id="PHONEACCOUNT">^4</xliff:g>。"</string>
-    <string name="description_read_voicemail" msgid="5585559881573227732">"留言來自 <xliff:g id="NAMEORNUMBER">^1</xliff:g> (<xliff:g id="TYPEORLOCATION">^2</xliff:g>)，來電時間：<xliff:g id="TIMEOFCALL">^3</xliff:g>，撥打至 <xliff:g id="PHONEACCOUNT">^4</xliff:g>。"</string>
-    <string name="description_outgoing_call" msgid="543952487882919924">"致電：<xliff:g id="NAMEORNUMBER">^1</xliff:g> (<xliff:g id="TIMEOFCALL">^3</xliff:g>，<xliff:g id="TYPEORLOCATION">^2</xliff:g><xliff:g id="PHONEACCOUNT">^4</xliff:g>)。"</string>
-    <string name="call_log_via_number" msgid="1340307109806397650">"透過 <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g>，透過 <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="description_call_action" msgid="4042796498169106545">"致電 <xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_video_call_action" msgid="1237090968588659650">"與<xliff:g id="NAMEORNUMBER">^1</xliff:g>進行視像通話。"</string>
-    <string name="description_voicemail_action" msgid="3290143432403538524">"收聽來自「<xliff:g id="NAMEORNUMBER">^1</xliff:g>」的留言信箱"</string>
-    <string name="description_create_new_contact_action" msgid="1928282350281564130">"為<xliff:g id="NAMEORNUMBER">^1</xliff:g>建立聯絡人"</string>
-    <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"加入<xliff:g id="NAMEORNUMBER">^1</xliff:g>至現有的聯絡人"</string>
-    <string name="description_details_action" msgid="2061866409737706174">"與「<xliff:g id="NAMEORNUMBER">^1</xliff:g>」的通話詳情"</string>
-    <string name="call_log_header_today" msgid="1576119097475845293">"今天"</string>
-    <string name="call_log_header_yesterday" msgid="5616077776205329563">"昨天"</string>
-    <string name="call_log_header_other" msgid="4940676886254217644">"較早"</string>
-    <string name="voicemail_speaker_on" msgid="3151333608926996668">"開啟揚聲器。"</string>
-    <string name="voicemail_speaker_off" msgid="2530064206962034201">"關閉揚聲器。"</string>
-    <string name="voicemail_play_start_pause" msgid="3874823480278334664">"開始或暫停播放。"</string>
-    <string name="display_options_title" msgid="3880091801055797975">"顯示選項"</string>
-    <string name="sounds_and_vibration_title" msgid="3075050000721181384">"聲音和震動"</string>
-    <string name="accessibility_settings_title" msgid="3329027650429831820">"無障礙功能"</string>
-    <string name="ringtone_title" msgid="8377174189894648486">"手機鈴聲"</string>
-    <string name="vibrate_on_ring_title" msgid="631441314790960485">"來電時同時震動"</string>
-    <string name="dtmf_tone_enable_title" msgid="3273762431523939277">"按鍵音"</string>
-    <string name="dtmf_tone_length_title" msgid="534096029202438539">"按鍵音長度"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="applicationLabel">手機</string>
+  <string name="launcherDialpadActivityLabel">手機小鍵盤</string>
+  <string name="callHistoryIconLabel">通話記錄</string>
+  <string name="action_copy_number_text">複製號碼</string>
+  <string name="copy_transcript_text">複製內容轉錄</string>
+  <string name="action_edit_number_before_call">致電前編輯號碼</string>
+  <string name="call_log_delete_all">清除通話記錄</string>
+  <string name="call_log_trash_voicemail">刪除留言</string>
+  <string name="snackbar_voicemail_deleted">已刪除留言信箱</string>
+  <string name="clearCallLogConfirmation_title">要清除通話記錄嗎？</string>
+  <string name="clearCallLogConfirmation">這會刪除所有通話記錄</string>
+  <string name="clearCallLogProgress_title">正在清除通話記錄…</string>
+  <string name="notification_missedCallTitle">未接來電</string>
+  <string name="notification_missedWorkCallTitle">未接工作來電</string>
+  <string name="notification_missedCallsTitle">未接來電</string>
+  <string name="notification_missedCallsMsg">%d 個未接來電</string>
+  <string name="notification_missedCall_call_back">回撥</string>
+  <string name="notification_missedCall_message">短訊</string>
+  <string name="post_call_notification_message">%1$s：%2$s</string>
+  <string name="notification_voicemail_text_format">撥號 %s</string>
+  <string name="notification_voicemail_no_vm_number">沒有可用的留言信箱號碼</string>
+  <plurals name="notification_voicemail_title">
+    <item quantity="one">留言</item>
+    <item quantity="other">%1$d 個留言</item>
+  </plurals>
+  <string name="notification_voicemail_callers_list">%1$s ， %2$s</string>
+  <string name="notification_new_voicemail_ticker">來自%1$s的新語音留言</string>
+  <string name="voicemail_playback_error">無法播放留言</string>
+  <string name="voicemail_fetching_content">正在載入留言…</string>
+  <string name="voicemail_fetching_timout">無法載入留言</string>
+  <string name="call_log_item_count_and_date">（ %1$d ） %2$s</string>
+  <string name="description_playback_speakerphone">開啟或關閉揚聲器</string>
+  <string name="description_playback_seek">指定播放位置</string>
+  <string name="action_menu_call_history_description">通話記錄</string>
+  <string msgid="2295659037509008453" name="action_menu_overflow_description">更多選項</string>
+  <string name="action_menu_dialpad_button">小鍵盤</string>
+  <string name="dialer_settings_label">設定</string>
+  <string name="simulator_submenu_label">模擬器</string>
+  <string name="new_ui_launcher_shortcut_label">建立新使用者介面捷徑</string>
+  <string name="description_entering_bulk_action_mode">正在進入大量操作模式</string>
+  <string name="description_leaving_bulk_action_mode">已離開大量操作模式</string>
+  <string name="description_selecting_bulk_action_mode">已選取%1$s</string>
+  <string name="description_unselecting_bulk_action_mode">已取消選取%1$s</string>
+  <string name="description_contact_details">「%1$s」的聯絡人詳細資料</string>
+  <string name="description_spam_contact_details">疑似垃圾來電者 %1$s 的聯絡人詳細資料</string>
+  <string name="description_num_calls">%1$s 次通話次數。</string>
+  <string name="description_video_call">視像通話。</string>
+  <string name="description_start_voice_search">開始語音搜尋</string>
+  <string name="voicemail">留言</string>
+  <string name="description_cancel_multi_select">取消批量操作模式</string>
+  <string name="voicemailMultiSelectDeleteConfirm">刪除</string>
+  <string name="voicemailMultiSelectDeleteCancel">取消</string>
+  <string name="voicemailMultiSelectActionBarTitle">已選取 %1$s 個</string>
+  <plurals name="delete_voicemails_confirmation_dialog_title">
+    <item quantity="one"><b>要刪除此留言嗎？</b></item>
+    <item quantity="other"><b>要刪除這些留言嗎？</b></item>
+  </plurals>
+  <string name="voicemailCallLogToday">@string/call_log_header_today</string>
+  <string name="voicemailCallLogDateTimeFormat">%1$s%2$s</string>
+  <string name="voicemailDurationFormat">%1$02d:%2$02d</string>
+  <string name="voicemailCallLogDateTimeFormatWithDuration">%1$s • %2$s</string>
+  <string name="voice_search_not_available">無法使用語音搜尋</string>
+  <string name="dialer_hint_find_contact">搜尋聯絡人</string>
+  <string name="block_number_search_hint">新增號碼或搜尋聯絡人</string>
+  <string name="call_log_all_empty">沒有通話記錄</string>
+  <string name="call_log_all_empty_action">撥號</string>
+  <string name="call_log_missed_empty">您沒有未接來電。</string>
+  <string name="call_log_voicemail_empty">您的留言信箱沒有留言。</string>
+  <string name="call_log_activity_title">通話記錄</string>
+  <string name="call_log_all_title">全部</string>
+  <string name="call_log_missed_title">未接來電</string>
+  <string name="tab_speed_dial">快速撥號</string>
+  <string name="tab_history">通話記錄</string>
+  <string name="tab_all_contacts">聯絡人</string>
+  <string name="tab_voicemail">留言信箱</string>
+  <string name="search_shortcut_call_number">撥打 %s</string>
+  <string name="search_shortcut_create_new_contact">建立新聯絡人</string>
+  <string name="search_shortcut_add_to_contact">加至現有聯絡人資料</string>
+  <string name="search_shortcut_send_sms_message">傳送短訊</string>
+  <string name="search_shortcut_make_video_call">進行視像通話</string>
+  <string name="search_shortcut_block_number">封鎖號碼</string>
+  <string name="speed_dial_empty">快速撥號名單中沒有聯絡人</string>
+  <string name="speed_dial_empty_add_favorite_action">新增常用聯絡人</string>
+  <string name="remove_contact">移除</string>
+  <string name="select_all">全選</string>
+  <string name="call_log_action_video_call">視像通話</string>
+  <string name="call_log_action_set_up_video">設定視像通話</string>
+  <string name="call_log_action_invite_video">邀請加入視像通話</string>
+  <string name="call_log_action_send_message">傳送訊息</string>
+  <string name="call_log_action_details">通話詳情</string>
+  <string name="call_log_action_share_voicemail">傳送至…</string>
+  <string name="call_log_action_call">致電 ^1</string>
+  <string name="description_incoming_missed_call">未接聽來電：^1 (^3，^2^4)。</string>
+  <string name="description_incoming_answered_call">已接聽來電：^1 (^3，^2^4)。</string>
+  <string name="description_unread_voicemail">未收聽的留言來自 ^1 (^2)，來電時間：^3，撥打至 ^4。</string>
+  <string name="description_read_voicemail">留言來自 ^1 (^2)，來電時間：^3，撥打至 ^4。</string>
+  <string name="description_outgoing_call">致電：^1 (^3，^2^4)。</string>
+  <string name="call_log_via_number">透過 %1$s</string>
+  <string name="call_log_via_number_phone_account">%1$s，透過 %2$s</string>
+  <string name="description_call_action">致電 ^1</string>
+  <string name="description_video_call_action">與^1進行視像通話。</string>
+  <string name="description_voicemail_action">收聽來自「^1」的留言信箱</string>
+  <string name="description_create_new_contact_action">為^1建立聯絡人</string>
+  <string name="description_add_to_existing_contact_action">加入^1至現有的聯絡人</string>
+  <string name="description_details_action">與「^1」的通話詳情</string>
+  <string name="call_log_header_today">今天</string>
+  <string name="call_log_header_yesterday">昨天</string>
+  <string name="call_log_header_other">較早</string>
+  <string name="voicemail_speaker_on">開啟揚聲器。</string>
+  <string name="voicemail_speaker_off">關閉揚聲器。</string>
+  <string name="voicemail_play_start_pause">開始或暫停播放。</string>
+  <string name="display_options_title">顯示選項</string>
+  <string name="sounds_and_vibration_title">聲音和震動</string>
+  <string name="accessibility_settings_title">無障礙功能</string>
+  <string name="ringtone_title">手機鈴聲</string>
+  <string name="vibrate_on_ring_title">來電時同時震動</string>
+  <string name="dtmf_tone_enable_title">按鍵音</string>
+  <string name="dtmf_tone_length_title">按鍵音長度</string>
   <string-array name="dtmf_tone_length_entries">
-    <item msgid="3136353015227162823">"正常"</item>
-    <item msgid="5376841175538523822">"長"</item>
+    <item>正常</item>
+    <item>長</item>
   </string-array>
-    <string name="respond_via_sms_setting_title" msgid="8008181606657693452">"快速回應"</string>
-    <string name="call_settings_label" msgid="7824611757200960807">"通話"</string>
-    <string name="manage_blocked_numbers_label" msgid="16823761991832273">"來電封鎖"</string>
-    <string name="voicemail_settings_label" msgid="4594299554519920570">"留言"</string>
-    <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"暫時關閉來電封鎖功能"</string>
-    <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"您在過去 48 小時內曾經使用此手機聯絡緊急服務，因此來電封鎖功能已停用。系統會在 48 小時期限結束後自動重新啟用功能。"</string>
-    <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"匯入號碼"</string>
-    <string name="blocked_call_settings_import_description" msgid="1819412052545228965">"您早前透過其他應用程式標記部分來電者，將他們的來電自動轉駁至留言信箱。"</string>
-    <string name="blocked_call_settings_view_numbers_button" msgid="3332727948554356704">"查看電話號碼"</string>
-    <string name="blocked_call_settings_import_button" msgid="7319111700387470727">"匯入"</string>
-    <string name="description_blocked_number_list_delete" msgid="2139644216858370740">"解除封鎖號碼"</string>
-    <string name="addBlockedNumber" msgid="3053473735238295551">"新增電話號碼"</string>
-    <string name="block_number_footer_message_vvm" msgid="7955326304033982368">"將會封鎖這些號碼的來電，而留言將會自動刪除。"</string>
-    <string name="block_number_footer_message_no_vvm" msgid="1152684139070471665">"將會封鎖這些號碼的來電，但來電可能會轉駁至留言信箱。"</string>
-    <string name="block_list" msgid="4701585783411870782">"已封鎖的號碼"</string>
-    <string name="alreadyBlocked" msgid="5483253180532475653">"已封鎖 <xliff:g id="NUMBER">%1$s</xliff:g>。"</string>
-    <string name="phone_account_settings_label" msgid="8372485478006965920">"通話帳戶"</string>
-    <string name="permission_no_speeddial" msgid="8487215628510596753">"如要啟用快速撥號功能，請開放「通訊錄」權限。"</string>
-    <string name="permission_no_calllog" msgid="4053705651238775784">"如要查看通話記錄，請開放「手機」權限。"</string>
-    <string name="permission_no_search" msgid="2424710404207193826">"如要搜尋聯絡人，請開啟「通訊錄」權限。"</string>
-    <string name="permission_place_call" msgid="8686908130349369423">"如要撥打電話，請開放「手機」權限。"</string>
-    <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"手機應用程式沒有系統設定的寫入權限。"</string>
-    <string name="blocked_number_call_log_label" msgid="4212282846299997693">"已封鎖"</string>
-    <string name="call_log_action_block_report_number" msgid="7302636538668696729">"封鎖/舉報為垃圾來電"</string>
-    <string name="call_log_action_block_number" msgid="5048188386501998865">"封鎖號碼"</string>
-    <string name="call_log_action_remove_spam" msgid="2045319806318398403">"非垃圾來電"</string>
-    <string name="call_log_action_unblock_number" msgid="6100117033288448758">"解除封鎖號碼"</string>
-    <string name="spam_number_call_log_label" msgid="2678431398326811131">"垃圾號碼"</string>
-    <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g>已離線，無法取得聯繫"</string>
-    <string name="about_phone_label" msgid="582991354677973731">"關於"</string>
-    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"已由 Google 轉錄"</string>
-    <string name="voicemail_transcription_in_progress" msgid="2933320969613783210">"Google 正在轉錄…"</string>
-    <string name="voicemail_transcription_failed" msgid="335275303117412706">"找不到轉錄文字。"</string>
-    <string name="voicemail_transcription_failed_language_not_supported" msgid="4210332591050562553">"無法轉錄，語言不受支援。"</string>
-    <string name="voicemail_transcription_failed_no_speech" msgid="9093372879697874852">"無法轉錄，偵測不到語音。"</string>
-    <string name="view_conversation" msgid="7895904782094119702">"查看"</string>
-    <string name="ec_data_deleted" msgid="4794880345545827107">"已刪除通話。在「訊息」中查看及刪除此通話期間所分享的附件。"</string>
-    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"已刪除通話。在「訊息」中查看及刪除通話期間所分享的附件。"</string>
+  <string name="respond_via_sms_setting_title">快速回應</string>
+  <string name="call_settings_label">通話</string>
+  <string name="manage_blocked_numbers_label">已封鎖的號碼</string>
+  <string name="voicemail_settings_label">留言</string>
+  <string name="blocked_numbers_disabled_emergency_header_label">暫時關閉來電封鎖功能</string>
+  <string name="blocked_numbers_disabled_emergency_desc">您在過去 48 小時內曾經使用此手機聯絡緊急服務，因此來電封鎖功能已停用。系統會在 48 小時期限結束後自動重新啟用功能。</string>
+  <string name="import_send_to_voicemail_numbers_label">匯入號碼</string>
+  <string name="blocked_call_settings_import_description">您早前透過其他應用程式標記部分來電者，將他們的來電自動轉駁至留言信箱。</string>
+  <string name="blocked_call_settings_view_numbers_button">查看電話號碼</string>
+  <string name="blocked_call_settings_import_button">匯入</string>
+  <string name="description_blocked_number_list_delete">解除封鎖號碼</string>
+  <string name="addBlockedNumber">新增電話號碼</string>
+  <string name="block_number_footer_message_vvm">將會封鎖這些號碼的來電，而留言將會自動刪除。</string>
+  <string name="block_number_footer_message_no_vvm">將會封鎖這些號碼的來電，但來電可能會轉駁至留言信箱。</string>
+  <string name="block_list">已封鎖的號碼</string>
+  <string name="alreadyBlocked">已封鎖 %1$s。</string>
+  <string name="phone_account_settings_label">通話帳戶</string>
+  <string name="permission_no_speeddial">如要啟用快速撥號功能，請開放「通訊錄」權限。</string>
+  <string name="permission_no_calllog">如要查看通話記錄，請開放「手機」權限。</string>
+  <string name="permission_no_search">如要搜尋聯絡人，請開啟「通訊錄」權限。</string>
+  <string name="permission_place_call">如要撥打電話，請開放「手機」權限。</string>
+  <string name="toast_cannot_write_system_settings">手機應用程式沒有系統設定的寫入權限。</string>
+  <string name="blocked_number_call_log_label">已封鎖</string>
+  <string name="call_log_action_block_report_number">封鎖/舉報為垃圾來電</string>
+  <string name="call_log_action_block_number">封鎖號碼</string>
+  <string name="call_log_action_remove_spam">非垃圾來電</string>
+  <string name="call_log_action_unblock_number">解除封鎖號碼</string>
+  <string name="spam_number_call_log_label">垃圾號碼</string>
+  <string name="call_composer_connection_failed">%1$s已離線，無法取得聯繫</string>
+  <string name="about_phone_label">關於</string>
+  <string name="voicemail_transcription_branding_text">已由 Google 轉錄</string>
+  <string name="voicemail_transcription_in_progress">正在轉錄…</string>
+  <string name="voicemail_transcription_failed">找不到轉錄文字。</string>
+  <string name="voicemail_transcription_failed_language_not_supported">無法轉錄，語言不受支援。</string>
+  <string name="voicemail_transcription_failed_no_speech">無法轉錄，偵測不到語音。</string>
+  <string name="voicemail_donation_promo_title">想協助提高轉錄準確度嗎？</string>
+  <string name="voicemail_donation_promo_content">讓 Google 審查這則和日後含有轉錄內容的留言訊息。這些訊息會以匿名方式儲存下來。您可以隨時變更相關設定。%1$s</string>
+  <string name="voicemail_donation_promo_opt_in">是，我要</string>
+  <string name="voicemail_donation_promo_opt_out">不用了，謝謝</string>
+  <string name="voicemail_transcription_rating">為轉錄品質評分</string>
+  <string name="voicemail_transcription_rating_thanks">多謝您提供意見</string>
+  <string name="description_rating_good">喜歡</string>
+  <string name="description_rating_bad">不喜歡</string>
+  <string name="view_conversation">查看</string>
+  <string name="ec_data_deleted">已刪除通話。在「訊息」中查看及刪除此通話期間所分享的附件。</string>
+  <string name="multiple_ec_data_deleted">已刪除通話。在「訊息」中查看及刪除通話期間所分享的附件。</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-zh-rTW/strings.xml b/java/com/android/dialer/app/res/values-zh-rTW/strings.xml
index 5e22d55..6b985ee 100644
--- a/java/com/android/dialer/app/res/values-zh-rTW/strings.xml
+++ b/java/com/android/dialer/app/res/values-zh-rTW/strings.xml
@@ -1,179 +1,171 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="applicationLabel" msgid="2202739481132958990">"電話"</string>
-    <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"電話撥號鍵盤"</string>
-    <string name="callHistoryIconLabel" msgid="7493268743411968630">"通話紀錄"</string>
-    <string name="action_copy_number_text" msgid="832682558551502319">"複製號碼"</string>
-    <string name="copy_transcript_text" msgid="937904189017310829">"複製留言轉錄內容"</string>
-    <string name="action_edit_number_before_call" msgid="8017492815878473837">"撥打前編輯號碼"</string>
-    <string name="call_log_delete_all" msgid="7852970926906523784">"清除通話紀錄"</string>
-    <string name="call_log_trash_voicemail" msgid="6118493534178533972">"刪除語音留言"</string>
-    <string name="snackbar_voicemail_deleted" msgid="7463166543725496307">"已刪除語音留言"</string>
-    <string name="snackbar_voicemail_deleted_undo" msgid="6959743982796409941">"復原"</string>
-    <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"清除通話紀錄？"</string>
-    <string name="clearCallLogConfirmation" msgid="6844949465815109166">"這項操作會將所有通話從您的紀錄中刪除"</string>
-    <string name="clearCallLogProgress_title" msgid="995004835687361977">"正在清除通話紀錄…"</string>
-    <string name="notification_missedCallTitle" msgid="8283366068539898486">"未接來電"</string>
-    <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"未接公司來電"</string>
-    <string name="notification_missedCallsTitle" msgid="3697442015345089802">"未接來電"</string>
-    <string name="notification_missedCallsMsg" msgid="8176217633929018706">"<xliff:g id="NUM_MISSED_CALLS">%d</xliff:g> 通未接來電"</string>
-    <string name="notification_missedCall_call_back" msgid="3875698110051973965">"回撥"</string>
-    <string name="notification_missedCall_message" msgid="5086910028988305964">"傳送簡訊"</string>
-    <string name="post_call_notification_message" msgid="5417476789860590611">"<xliff:g id="NAME">%1$s</xliff:g>：<xliff:g id="MESSAGE">%2$s</xliff:g>"</string>
-    <string name="notification_voicemail_text_format" msgid="1895667520930252897">"撥打 <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
-    <string name="notification_voicemail_no_vm_number" msgid="8942821987929495842">"語音信箱號碼不明"</string>
-    <plurals name="notification_voicemail_title" formatted="false" msgid="1551847434476438657">
-      <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> 則語音留言</item>
-      <item quantity="one">語音留言</item>
-    </plurals>
-    <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>、<xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
-    <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"最新語音留言者：<xliff:g id="CALLER">%1$s</xliff:g>"</string>
-    <string name="voicemail_playback_error" msgid="4384373852257757295">"無法播放語音留言"</string>
-    <string name="voicemail_fetching_content" msgid="572320120918636014">"正在載入語音留言…"</string>
-    <string name="voicemail_fetching_timout" msgid="2128873915839949783">"無法載入語音留言"</string>
-    <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_playback_speakerphone" msgid="4852027754869750227">"切換擴音器開關"</string>
-    <string name="description_playback_seek" msgid="1340910573254132520">"指定播放時間點"</string>
-    <string name="action_menu_call_history_description" msgid="8829135306925008546">"通話紀錄"</string>
-    <string name="action_menu_overflow_description" msgid="7648679686746517341">"更多選項"</string>
-    <string name="action_menu_dialpad_button" msgid="1970631633457493180">"撥號鍵盤"</string>
-    <string name="dialer_settings_label" msgid="4980176284150290175">"設定"</string>
-    <string name="simulator_submenu_label" msgid="186156287346615267">"模擬工具"</string>
-    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"建立新版 UI 捷徑"</string>
-    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"已進入大量操作模式"</string>
-    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"已離開大量操作模式"</string>
-    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"已選取：<xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"已取消選取：<xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_contact_details" msgid="3341280873855253464">"「<xliff:g id="NAMEORNUMBER">%1$s</xliff:g>」的聯絡詳細資料"</string>
-    <string name="description_spam_contact_details" msgid="5592578752881528368">"可疑的騷擾/廣告電話來電者 (<xliff:g id="NAMEORNUMBER">%1$s</xliff:g>) 的聯絡資訊"</string>
-    <string name="description_num_calls" msgid="6483594535796216044">"通話 <xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> 次。"</string>
-    <string name="description_video_call" msgid="3738199365585751727">"視訊通話。"</string>
-    <string name="description_start_voice_search" msgid="8380022725973015261">"開始進行語音搜尋"</string>
-    <string name="voicemail" msgid="8899540969000957954">"語音留言"</string>
-    <string name="description_cancel_multi_select" msgid="3930475950253360461">"取消批次操作模式"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"刪除"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"取消"</string>
-    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"已選取 <xliff:g id="NUMBER">%1$s</xliff:g> 個"</string>
-    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
-      <item quantity="other">"<b>"要刪除這些語音留言嗎？"</b>"</item>
-      <item quantity="one">"<b>"要刪除這則語音留言嗎？"</b>"</item>
-    </plurals>
-    <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
-    <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g><xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
-    <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="voice_search_not_available" msgid="6546240433719732905">"無法使用語音搜尋"</string>
-    <string name="dialer_hint_find_contact" msgid="2023214799381149808">"搜尋聯絡人"</string>
-    <string name="block_number_search_hint" msgid="5377706079015099416">"新增號碼或搜尋聯絡人"</string>
-    <string name="call_log_all_empty" msgid="3955572868518162004">"沒有任何通話紀錄"</string>
-    <string name="call_log_all_empty_action" msgid="852218280136243014">"撥打電話"</string>
-    <string name="call_log_missed_empty" msgid="7094936030845062214">"您沒有任何未接來電。"</string>
-    <string name="call_log_voicemail_empty" msgid="273623903423275178">"您沒有任何語音留言。"</string>
-    <string name="call_log_activity_title" msgid="1275242727244945527">"通話紀錄"</string>
-    <string name="call_log_all_title" msgid="6042262422192020327">"全部"</string>
-    <string name="call_log_missed_title" msgid="17254005889268015">"未接來電"</string>
-    <string name="tab_speed_dial" msgid="6616404752227561075">"快速撥號"</string>
-    <string name="tab_history" msgid="7420269368689503596">"通話紀錄"</string>
-    <string name="tab_all_contacts" msgid="5531733977693943015">"聯絡人"</string>
-    <string name="tab_voicemail" msgid="2458548090088316246">"語音信箱"</string>
-    <string name="search_shortcut_call_number" msgid="8847918845036880688">"撥打 <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"建立新聯絡人"</string>
-    <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"新增至聯絡人"</string>
-    <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"傳送簡訊"</string>
-    <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"進行視訊通話"</string>
-    <string name="search_shortcut_block_number" msgid="4587283230665805776">"封鎖號碼"</string>
-    <string name="speed_dial_empty" msgid="3346406399966039505">"您的快速撥號功能尚未設定任何聯絡人"</string>
-    <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"新增常用聯絡人"</string>
-    <string name="remove_contact" msgid="2353580570488923668">"移除"</string>
-    <string name="select_all" msgid="408601760696146245">"全選"</string>
-    <string name="call_log_action_video_call" msgid="7565549950343850819">"視訊通話"</string>
-    <string name="call_log_action_send_message" msgid="6948727362660115554">"傳送簡訊"</string>
-    <string name="call_log_action_details" msgid="2091370737371449501">"通話詳細資料"</string>
-    <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"傳送至…"</string>
-    <string name="call_log_action_call" msgid="682724094251540583">"撥號給「<xliff:g id="NAMEORNUMBER">^1</xliff:g>」"</string>
-    <string name="description_incoming_missed_call" msgid="8292535799379230029">"未接來電：<xliff:g id="NAMEORNUMBER">^1</xliff:g>/<xliff:g id="TYPEORLOCATION">^2</xliff:g>/<xliff:g id="TIMEOFCALL">^3</xliff:g>/<xliff:g id="PHONEACCOUNT">^4</xliff:g>"</string>
-    <string name="description_incoming_answered_call" msgid="3920182963103160610">"已接來電：<xliff:g id="NAMEORNUMBER">^1</xliff:g>/<xliff:g id="TYPEORLOCATION">^2</xliff:g>/<xliff:g id="TIMEOFCALL">^3</xliff:g>/<xliff:g id="PHONEACCOUNT">^4</xliff:g>"</string>
-    <string name="description_unread_voicemail" msgid="145170985013419170">"您有一則未讀語音留言，來電者：<xliff:g id="NAMEORNUMBER">^1</xliff:g>，<xliff:g id="TYPEORLOCATION">^2</xliff:g>，<xliff:g id="TIMEOFCALL">^3</xliff:g>，<xliff:g id="PHONEACCOUNT">^4</xliff:g>。"</string>
-    <string name="description_read_voicemail" msgid="5585559881573227732">"您有一則語音留言，來電者：<xliff:g id="NAMEORNUMBER">^1</xliff:g>，<xliff:g id="TYPEORLOCATION">^2</xliff:g>，<xliff:g id="TIMEOFCALL">^3</xliff:g>，<xliff:g id="PHONEACCOUNT">^4</xliff:g>。"</string>
-    <string name="description_outgoing_call" msgid="543952487882919924">"撥出通話：<xliff:g id="NAMEORNUMBER">^1</xliff:g>/<xliff:g id="TYPEORLOCATION">^2</xliff:g>/<xliff:g id="TIMEOFCALL">^3</xliff:g>/<xliff:g id="PHONEACCOUNT">^4</xliff:g>"</string>
-    <string name="call_log_via_number" msgid="1340307109806397650">"透過 <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> (透過 <xliff:g id="NUMBER">%2$s</xliff:g>)"</string>
-    <string name="description_call_action" msgid="4042796498169106545">"撥號給「<xliff:g id="NAMEORNUMBER">^1</xliff:g>」"</string>
-    <string name="description_video_call_action" msgid="1237090968588659650">"與「<xliff:g id="NAMEORNUMBER">^1</xliff:g>」視訊通話。"</string>
-    <string name="description_voicemail_action" msgid="3290143432403538524">"聽取「<xliff:g id="NAMEORNUMBER">^1</xliff:g>」的語音留言"</string>
-    <string name="description_create_new_contact_action" msgid="1928282350281564130">"建立「<xliff:g id="NAMEORNUMBER">^1</xliff:g>」的聯絡人資訊"</string>
-    <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"將「<xliff:g id="NAMEORNUMBER">^1</xliff:g>」新增到現有的聯絡人"</string>
-    <string name="description_details_action" msgid="2061866409737706174">"與「<xliff:g id="NAMEORNUMBER">^1</xliff:g>」通話的詳細資料"</string>
-    <string name="call_log_header_today" msgid="1576119097475845293">"今天"</string>
-    <string name="call_log_header_yesterday" msgid="5616077776205329563">"昨天"</string>
-    <string name="call_log_header_other" msgid="4940676886254217644">"較舊"</string>
-    <string name="voicemail_speaker_on" msgid="3151333608926996668">"開啟喇叭。"</string>
-    <string name="voicemail_speaker_off" msgid="2530064206962034201">"關閉喇叭。"</string>
-    <string name="voicemail_play_start_pause" msgid="3874823480278334664">"開始或暫停播放。"</string>
-    <string name="display_options_title" msgid="3880091801055797975">"顯示選項"</string>
-    <string name="sounds_and_vibration_title" msgid="3075050000721181384">"音效與振動"</string>
-    <string name="accessibility_settings_title" msgid="3329027650429831820">"協助工具"</string>
-    <string name="ringtone_title" msgid="8377174189894648486">"手機鈴聲"</string>
-    <string name="vibrate_on_ring_title" msgid="631441314790960485">"來電時同時震動"</string>
-    <string name="dtmf_tone_enable_title" msgid="3273762431523939277">"撥號鍵盤音效"</string>
-    <string name="dtmf_tone_length_title" msgid="534096029202438539">"撥號鍵盤音效長度"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="applicationLabel">電話</string>
+  <string name="launcherDialpadActivityLabel">電話撥號鍵盤</string>
+  <string name="callHistoryIconLabel">通話記錄</string>
+  <string name="action_copy_number_text">複製號碼</string>
+  <string name="copy_transcript_text">複製留言轉錄內容</string>
+  <string name="action_edit_number_before_call">撥打前編輯號碼</string>
+  <string name="call_log_delete_all">清除通話記錄</string>
+  <string name="call_log_trash_voicemail">刪除語音留言</string>
+  <string name="snackbar_voicemail_deleted">已刪除語音留言</string>
+  <string name="clearCallLogConfirmation_title">清除通話記錄？</string>
+  <string name="clearCallLogConfirmation">這項操作會將所有通話從您的記錄中刪除</string>
+  <string name="clearCallLogProgress_title">正在清除通話記錄…</string>
+  <string name="notification_missedCallTitle">未接來電</string>
+  <string name="notification_missedWorkCallTitle">未接公司來電</string>
+  <string name="notification_missedCallsTitle">未接來電</string>
+  <string name="notification_missedCallsMsg">%d 通未接來電</string>
+  <string name="notification_missedCall_call_back">回撥</string>
+  <string name="notification_missedCall_message">傳送簡訊</string>
+  <string name="post_call_notification_message">%1$s：%2$s</string>
+  <string name="notification_voicemail_text_format">撥打 %s</string>
+  <string name="notification_voicemail_no_vm_number">語音信箱號碼不明</string>
+  <plurals name="notification_voicemail_title">
+    <item quantity="one">語音留言</item>
+    <item quantity="other"> %1$d 則語音留言</item>
+  </plurals>
+  <string name="notification_voicemail_callers_list">%1$s、%2$s</string>
+  <string name="notification_new_voicemail_ticker">最新語音留言者：%1$s</string>
+  <string name="voicemail_playback_error">無法播放語音留言</string>
+  <string name="voicemail_fetching_content">正在載入語音留言…</string>
+  <string name="voicemail_fetching_timout">無法載入語音留言</string>
+  <string name="call_log_item_count_and_date">(%1$d) %2$s</string>
+  <string name="description_playback_speakerphone">切換擴音器開關</string>
+  <string name="description_playback_seek">指定播放時間點</string>
+  <string name="action_menu_call_history_description">通話記錄</string>
+  <string msgid="2295659037509008453" name="action_menu_overflow_description">更多選項</string>
+  <string name="action_menu_dialpad_button">撥號鍵盤</string>
+  <string name="dialer_settings_label">設定</string>
+  <string name="simulator_submenu_label">模擬工具</string>
+  <string name="new_ui_launcher_shortcut_label">建立新版 UI 捷徑</string>
+  <string name="description_entering_bulk_action_mode">已進入大量操作模式</string>
+  <string name="description_leaving_bulk_action_mode">已離開大量操作模式</string>
+  <string name="description_selecting_bulk_action_mode">已選取：%1$s</string>
+  <string name="description_unselecting_bulk_action_mode">已取消選取：%1$s</string>
+  <string name="description_contact_details">「%1$s」的聯絡詳細資料</string>
+  <string name="description_spam_contact_details">可疑的騷擾/廣告電話來電者 (%1$s) 的聯絡資訊</string>
+  <string name="description_num_calls">通話 %1$s 次。</string>
+  <string name="description_video_call">視訊通話。</string>
+  <string name="description_start_voice_search">開始進行語音搜尋</string>
+  <string name="voicemail">語音留言</string>
+  <string name="description_cancel_multi_select">取消批次操作模式</string>
+  <string name="voicemailMultiSelectDeleteConfirm">刪除</string>
+  <string name="voicemailMultiSelectDeleteCancel">取消</string>
+  <string name="voicemailMultiSelectActionBarTitle">已選取 %1$s 個</string>
+  <plurals name="delete_voicemails_confirmation_dialog_title">
+    <item quantity="one"><b>要刪除這則語音留言嗎？</b></item>
+    <item quantity="other"><b>要刪除這些語音留言嗎？</b></item>
+  </plurals>
+  <string name="voicemailCallLogToday">@string/call_log_header_today</string>
+  <string name="voicemailCallLogDateTimeFormat">%1$s%2$s</string>
+  <string name="voicemailDurationFormat">%1$02d:%2$02d</string>
+  <string name="voicemailCallLogDateTimeFormatWithDuration">%1$s • %2$s</string>
+  <string name="voice_search_not_available">無法使用語音搜尋</string>
+  <string name="dialer_hint_find_contact">搜尋聯絡人</string>
+  <string name="block_number_search_hint">新增號碼或搜尋聯絡人</string>
+  <string name="call_log_all_empty">沒有任何通話記錄</string>
+  <string name="call_log_all_empty_action">撥打電話</string>
+  <string name="call_log_missed_empty">您沒有任何未接來電。</string>
+  <string name="call_log_voicemail_empty">您沒有任何語音留言。</string>
+  <string name="call_log_activity_title">通話記錄</string>
+  <string name="call_log_all_title">全部</string>
+  <string name="call_log_missed_title">未接來電</string>
+  <string name="tab_speed_dial">快速撥號</string>
+  <string name="tab_history">通話記錄</string>
+  <string name="tab_all_contacts">聯絡人</string>
+  <string name="tab_voicemail">語音信箱</string>
+  <string name="search_shortcut_call_number">撥打 %s</string>
+  <string name="search_shortcut_create_new_contact">建立新聯絡人</string>
+  <string name="search_shortcut_add_to_contact">新增至聯絡人</string>
+  <string name="search_shortcut_send_sms_message">傳送簡訊</string>
+  <string name="search_shortcut_make_video_call">進行視訊通話</string>
+  <string name="search_shortcut_block_number">封鎖號碼</string>
+  <string name="speed_dial_empty">您的快速撥號功能尚未設定任何聯絡人</string>
+  <string name="speed_dial_empty_add_favorite_action">新增常用聯絡人</string>
+  <string name="remove_contact">移除</string>
+  <string name="select_all">全選</string>
+  <string name="call_log_action_video_call">視訊通話</string>
+  <string name="call_log_action_set_up_video">設定視訊通話</string>
+  <string name="call_log_action_invite_video">邀請加入視訊通話</string>
+  <string name="call_log_action_send_message">傳送簡訊</string>
+  <string name="call_log_action_details">通話詳細資料</string>
+  <string name="call_log_action_share_voicemail">傳送至…</string>
+  <string name="call_log_action_call">撥號給「^1」</string>
+  <string name="description_incoming_missed_call">未接來電：^1/^2/^3/^4</string>
+  <string name="description_incoming_answered_call">已接來電：^1/^2/^3/^4</string>
+  <string name="description_unread_voicemail">您有一則未讀語音留言，來電者：^1，^2，^3，^4。</string>
+  <string name="description_read_voicemail">您有一則語音留言，來電者：^1，^2，^3，^4。</string>
+  <string name="description_outgoing_call">撥出通話：^1/^2/^3/^4</string>
+  <string name="call_log_via_number">透過 %1$s</string>
+  <string name="call_log_via_number_phone_account">%1$s (透過 %2$s)</string>
+  <string name="description_call_action">撥號給「^1」</string>
+  <string name="description_video_call_action">與「^1」視訊通話。</string>
+  <string name="description_voicemail_action">聽取「^1」的語音留言</string>
+  <string name="description_create_new_contact_action">建立「^1」的聯絡人資訊</string>
+  <string name="description_add_to_existing_contact_action">將「^1」新增到現有的聯絡人</string>
+  <string name="description_details_action">與「^1」通話的詳細資料</string>
+  <string name="call_log_header_today">今天</string>
+  <string name="call_log_header_yesterday">昨天</string>
+  <string name="call_log_header_other">較舊</string>
+  <string name="voicemail_speaker_on">開啟喇叭。</string>
+  <string name="voicemail_speaker_off">關閉喇叭。</string>
+  <string name="voicemail_play_start_pause">開始或暫停播放。</string>
+  <string name="display_options_title">顯示選項</string>
+  <string name="sounds_and_vibration_title">音效與振動</string>
+  <string name="accessibility_settings_title">協助工具</string>
+  <string name="ringtone_title">手機鈴聲</string>
+  <string name="vibrate_on_ring_title">來電時同時震動</string>
+  <string name="dtmf_tone_enable_title">鍵盤音效</string>
+  <string name="dtmf_tone_length_title">撥號鍵盤音效長度</string>
   <string-array name="dtmf_tone_length_entries">
-    <item msgid="3136353015227162823">"一般"</item>
-    <item msgid="5376841175538523822">"長音"</item>
+    <item>一般</item>
+    <item>長音</item>
   </string-array>
-    <string name="respond_via_sms_setting_title" msgid="8008181606657693452">"快速回應"</string>
-    <string name="call_settings_label" msgid="7824611757200960807">"通話"</string>
-    <string name="manage_blocked_numbers_label" msgid="16823761991832273">"來電封鎖"</string>
-    <string name="voicemail_settings_label" msgid="4594299554519920570">"語音留言"</string>
-    <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"來電封鎖功能已暫時關閉"</string>
-    <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"由於您曾在過去 48 小時內使用這支手機撥打緊急服務電話，因此來電封鎖功能已停用。此功能停用達 48 小時後，將由系統自動重新啟用。"</string>
-    <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"匯入電話號碼"</string>
-    <string name="blocked_call_settings_import_description" msgid="1819412052545228965">"您之前曾將某些來電者標示為自動透過其他應用程式轉到語音信箱。"</string>
-    <string name="blocked_call_settings_view_numbers_button" msgid="3332727948554356704">"查看號碼"</string>
-    <string name="blocked_call_settings_import_button" msgid="7319111700387470727">"匯入"</string>
-    <string name="description_blocked_number_list_delete" msgid="2139644216858370740">"解除封鎖號碼"</string>
-    <string name="addBlockedNumber" msgid="3053473735238295551">"新增號碼"</string>
-    <string name="block_number_footer_message_vvm" msgid="7955326304033982368">"系統會封鎖這些號碼的來電，並自動刪除對方的語音留言。"</string>
-    <string name="block_number_footer_message_no_vvm" msgid="1152684139070471665">"系統會封鎖這些號碼的來電，但對方仍可錄製語音留言給您。"</string>
-    <string name="block_list" msgid="4701585783411870782">"已封鎖的號碼"</string>
-    <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g> 已在封鎖清單中。"</string>
-    <string name="phone_account_settings_label" msgid="8372485478006965920">"通話帳戶"</string>
-    <string name="permission_no_speeddial" msgid="8487215628510596753">"如要啟用快速撥號，請開啟「聯絡人」存取權限。"</string>
-    <string name="permission_no_calllog" msgid="4053705651238775784">"如要查看您的通話紀錄，請開啟「電話」存取權限。"</string>
-    <string name="permission_no_search" msgid="2424710404207193826">"如要搜尋您的聯絡人，請開啟「聯絡人」存取權限。"</string>
-    <string name="permission_place_call" msgid="8686908130349369423">"如要撥打電話，請開啟「電話」存取權限。"</string>
-    <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"電話應用程式的權限不足，無法寫入系統設定。"</string>
-    <string name="blocked_number_call_log_label" msgid="4212282846299997693">"已封鎖"</string>
-    <string name="call_log_action_block_report_number" msgid="7302636538668696729">"封鎖/回報為騷擾/廣告電話"</string>
-    <string name="call_log_action_block_number" msgid="5048188386501998865">"封鎖號碼"</string>
-    <string name="call_log_action_remove_spam" msgid="2045319806318398403">"非騷擾/廣告電話"</string>
-    <string name="call_log_action_unblock_number" msgid="6100117033288448758">"解除封鎖號碼"</string>
-    <string name="spam_number_call_log_label" msgid="2678431398326811131">"騷擾/廣告電話"</string>
-    <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g>已離線，無法接聽來電"</string>
-    <string name="about_phone_label" msgid="582991354677973731">"關於"</string>
-    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"由 Google 轉錄"</string>
-    <string name="voicemail_transcription_in_progress" msgid="2933320969613783210">"Google 正在轉錄…"</string>
-    <string name="voicemail_transcription_failed" msgid="335275303117412706">"無法轉錄留言。"</string>
-    <string name="voicemail_transcription_failed_language_not_supported" msgid="4210332591050562553">"無法轉錄留言。系統不支援這個語言。"</string>
-    <string name="voicemail_transcription_failed_no_speech" msgid="9093372879697874852">"無法轉錄留言。系統未偵測到語音內容。"</string>
-    <string name="view_conversation" msgid="7895904782094119702">"查看"</string>
-    <string name="ec_data_deleted" msgid="4794880345545827107">"已刪除這筆通話紀錄。你可以在「訊息」應用程式中查看及刪除通話期間分享的附件。"</string>
-    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"已刪除這些通話紀錄。你可以在「訊息」應用程式中查看及刪除通話期間分享的附件。"</string>
+  <string name="respond_via_sms_setting_title">應答短訊</string>
+  <string name="call_settings_label">通話</string>
+  <string name="manage_blocked_numbers_label">已封鎖的號碼</string>
+  <string name="voicemail_settings_label">語音留言</string>
+  <string name="blocked_numbers_disabled_emergency_header_label">來電封鎖功能已暫時關閉</string>
+  <string name="blocked_numbers_disabled_emergency_desc">由於您曾在過去 48 小時內使用這支手機撥打緊急服務電話，因此來電封鎖功能已停用。此功能停用達 48 小時後，將由系統自動重新啟用。</string>
+  <string name="import_send_to_voicemail_numbers_label">匯入電話號碼</string>
+  <string name="blocked_call_settings_import_description">您之前曾將某些來電者標示為自動透過其他應用程式轉到語音信箱。</string>
+  <string name="blocked_call_settings_view_numbers_button">查看號碼</string>
+  <string name="blocked_call_settings_import_button">匯入</string>
+  <string name="description_blocked_number_list_delete">解除封鎖號碼</string>
+  <string name="addBlockedNumber">新增號碼</string>
+  <string name="block_number_footer_message_vvm">系統會封鎖這些號碼的來電，並自動刪除對方的語音留言。</string>
+  <string name="block_number_footer_message_no_vvm">系統會封鎖這些號碼的來電，但對方仍可錄製語音留言給您。</string>
+  <string name="block_list">已封鎖的號碼</string>
+  <string name="alreadyBlocked">%1$s 已在封鎖清單中。</string>
+  <string name="phone_account_settings_label">通話帳戶</string>
+  <string name="permission_no_speeddial">如要啟用快速撥號，請開啟「聯絡人」存取權限。</string>
+  <string name="permission_no_calllog">如要查看您的通話記錄，請開啟「電話」存取權限。</string>
+  <string name="permission_no_search">如要搜尋您的聯絡人，請開啟「聯絡人」存取權限。</string>
+  <string name="permission_place_call">如要撥打電話，請開啟「電話」存取權限。</string>
+  <string name="toast_cannot_write_system_settings">電話應用程式的權限不足，無法寫入系統設定。</string>
+  <string name="blocked_number_call_log_label">已封鎖</string>
+  <string name="call_log_action_block_report_number">封鎖/回報為騷擾/廣告電話</string>
+  <string name="call_log_action_block_number">封鎖號碼</string>
+  <string name="call_log_action_remove_spam">非騷擾/廣告電話</string>
+  <string name="call_log_action_unblock_number">解除封鎖號碼</string>
+  <string name="spam_number_call_log_label">騷擾/廣告電話</string>
+  <string name="call_composer_connection_failed">%1$s已離線，無法接聽來電</string>
+  <string name="about_phone_label">關於</string>
+  <string name="voicemail_transcription_branding_text">由 Google 轉錄</string>
+  <string name="voicemail_transcription_in_progress">轉錄中…</string>
+  <string name="voicemail_transcription_failed">無法轉錄留言。</string>
+  <string name="voicemail_transcription_failed_language_not_supported">無法轉錄留言。系統不支援這個語言。</string>
+  <string name="voicemail_transcription_failed_no_speech">無法轉錄留言。系統未偵測到語音內容。</string>
+  <string name="voicemail_donation_promo_title">想要協助改善留言轉錄的精確度嗎？</string>
+  <string name="voicemail_donation_promo_content">允許 Google 聽取這則和日後含有轉錄內容的語音留言。系統會以匿名的方式儲存這些內容。你隨時可以變更這項設定。%1$s</string>
+  <string name="voicemail_donation_promo_opt_in">是，我同意</string>
+  <string name="voicemail_donation_promo_opt_out">不用了，謝謝</string>
+  <string name="voicemail_transcription_rating">為轉錄品質評分</string>
+  <string name="voicemail_transcription_rating_thanks">感謝你提供寶貴意見</string>
+  <string name="description_rating_good">喜歡</string>
+  <string name="description_rating_bad">不喜歡</string>
+  <string name="view_conversation">查看</string>
+  <string name="ec_data_deleted">已刪除這筆通話記錄。你可以在「訊息」應用程式中查看及刪除通話期間分享的附件。</string>
+  <string name="multiple_ec_data_deleted">已刪除這些通話記錄。你可以在「訊息」應用程式中查看及刪除通話期間分享的附件。</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values-zu/strings.xml b/java/com/android/dialer/app/res/values-zu/strings.xml
index 6b71f29..e0cca2c 100644
--- a/java/com/android/dialer/app/res/values-zu/strings.xml
+++ b/java/com/android/dialer/app/res/values-zu/strings.xml
@@ -1,179 +1,171 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="applicationLabel" msgid="2202739481132958990">"Ifoni"</string>
-    <string name="launcherDialpadActivityLabel" msgid="4170587663888307424">"Ikhiphedi yefoni"</string>
-    <string name="callHistoryIconLabel" msgid="7493268743411968630">"Umlando wekholi"</string>
-    <string name="action_copy_number_text" msgid="832682558551502319">"Kopisha inombolo"</string>
-    <string name="copy_transcript_text" msgid="937904189017310829">"Kopisha ukukhiphela"</string>
-    <string name="action_edit_number_before_call" msgid="8017492815878473837">"Hlela inombolo ngaphambi kwekholi"</string>
-    <string name="call_log_delete_all" msgid="7852970926906523784">"Sula umlando wekholi"</string>
-    <string name="call_log_trash_voicemail" msgid="6118493534178533972">"Susa ivoyisimeyili"</string>
-    <string name="snackbar_voicemail_deleted" msgid="7463166543725496307">"Ivoyisimeyili isusiwe"</string>
-    <string name="snackbar_voicemail_deleted_undo" msgid="6959743982796409941">"HLEHLISA"</string>
-    <string name="clearCallLogConfirmation_title" msgid="7051888019546472245">"Sula umlando wekholi?"</string>
-    <string name="clearCallLogConfirmation" msgid="6844949465815109166">"Lokhu kuzosusa wonke amakholi kusukela kumlando wakho"</string>
-    <string name="clearCallLogProgress_title" msgid="995004835687361977">"Isula umlando wekholi…"</string>
-    <string name="notification_missedCallTitle" msgid="8283366068539898486">"Ikholi ekulahlekele"</string>
-    <string name="notification_missedWorkCallTitle" msgid="8831332957103679183">"Ugeje ikholi yomsebenzi"</string>
-    <string name="notification_missedCallsTitle" msgid="3697442015345089802">"Amakholi akuphuthele"</string>
-    <string name="notification_missedCallsMsg" msgid="8176217633929018706">"<xliff:g id="NUM_MISSED_CALLS">%d</xliff:g> amakholi akulahlekele"</string>
-    <string name="notification_missedCall_call_back" msgid="3875698110051973965">"Phinda ushaye"</string>
-    <string name="notification_missedCall_message" msgid="5086910028988305964">"Umlayezo"</string>
-    <string name="post_call_notification_message" msgid="5417476789860590611">"<xliff:g id="NAME">%1$s</xliff:g>: <xliff:g id="MESSAGE">%2$s</xliff:g>"</string>
-    <string name="notification_voicemail_text_format" msgid="1895667520930252897">"Dayela <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
-    <string name="notification_voicemail_no_vm_number" msgid="8942821987929495842">"Inombolo yevoyisimeyili ayaziwa"</string>
-    <plurals name="notification_voicemail_title" formatted="false" msgid="1551847434476438657">
-      <item quantity="one"> <xliff:g id="COUNT">%1$d</xliff:g> Amavoyisimeyili </item>
-      <item quantity="other"> <xliff:g id="COUNT">%1$d</xliff:g> Amavoyisimeyili </item>
-    </plurals>
-    <string name="notification_voicemail_callers_list" msgid="7543659703018479564">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
-    <string name="notification_new_voicemail_ticker" msgid="6547711461667072303">"I-imeyli entsha esuka ku <xliff:g id="CALLER">%1$s</xliff:g>"</string>
-    <string name="voicemail_playback_error" msgid="4384373852257757295">"Ayikwazanga ukudlala ivoyisimeyili"</string>
-    <string name="voicemail_fetching_content" msgid="572320120918636014">"Ilayisha ivoyisimeyili…"</string>
-    <string name="voicemail_fetching_timout" msgid="2128873915839949783">"Ayikwazi ukulayisha ivoyisimeyili"</string>
-    <string name="call_log_item_count_and_date" msgid="723848797957319181">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="description_playback_speakerphone" msgid="4852027754869750227">"Vula noma vala isipikha sefoni"</string>
-    <string name="description_playback_seek" msgid="1340910573254132520">"Funa indawo yokudlala"</string>
-    <string name="action_menu_call_history_description" msgid="8829135306925008546">"Umlando wekholi"</string>
-    <string name="action_menu_overflow_description" msgid="7648679686746517341">"Izinketho eziningi"</string>
-    <string name="action_menu_dialpad_button" msgid="1970631633457493180">"ikhiphedi"</string>
-    <string name="dialer_settings_label" msgid="4980176284150290175">"Izilungiselelo"</string>
-    <string name="simulator_submenu_label" msgid="186156287346615267">"Isilingisi"</string>
-    <string name="new_ui_launcher_shortcut_label" msgid="7195823535703686736">"Dala isinqamuleli esisha se-UI"</string>
-    <string name="description_entering_bulk_action_mode" msgid="6134916000015585401">"Kungenwa kumodi yesenzo senqwaba"</string>
-    <string name="description_leaving_bulk_action_mode" msgid="4355853387639765529">"Ishiye imodi yesenzo senqwaba"</string>
-    <string name="description_selecting_bulk_action_mode" msgid="7228565941043117618">"Kukhethwe i-<xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_unselecting_bulk_action_mode" msgid="6450971299622386060">"Akukhethiwe i-<xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_contact_details" msgid="3341280873855253464">"Imininingwane yokuxhumana ka-<xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_spam_contact_details" msgid="5592578752881528368">"Imininingwane yokuxhumana yofonayo ongugaxekile osolwayo <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string>
-    <string name="description_num_calls" msgid="6483594535796216044">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> amakholi."</string>
-    <string name="description_video_call" msgid="3738199365585751727">"Ikholi yevidiyo."</string>
-    <string name="description_start_voice_search" msgid="8380022725973015261">"Qalisa ukusesha ngezwi"</string>
-    <string name="voicemail" msgid="8899540969000957954">"Ivoyisimeyili"</string>
-    <string name="description_cancel_multi_select" msgid="3930475950253360461">"Khansela imodi lezenzo zeqoqo"</string>
-    <string name="voicemailMultiSelectDeleteConfirm" msgid="5110048580165845200">"Susa"</string>
-    <string name="voicemailMultiSelectDeleteCancel" msgid="4574287102479485528">"Khansela"</string>
-    <string name="voicemailMultiSelectActionBarTitle" msgid="5840745438559612431">"Engu-<xliff:g id="NUMBER">%1$s</xliff:g> ekhethiwe"</string>
-    <plurals name="delete_voicemails_confirmation_dialog_title" formatted="false" msgid="2452264208706783960">
-      <item quantity="one">"<b>"Sula lawa mavoyisimeyili? "</b>"</item>
-      <item quantity="other">"<b>"Sula lawa mavoyisimeyili? "</b>"</item>
-    </plurals>
-    <string name="voicemailCallLogToday" msgid="709034597866788854">@string/call_log_header_today</string>
-    <string name="voicemailCallLogDateTimeFormat" msgid="4998985002074131268">"<xliff:g id="DATE">%1$s</xliff:g> ngo-<xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="voicemailDurationFormat" msgid="5649961568550898382">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
-    <string name="voicemailCallLogDateTimeFormatWithDuration" msgid="7224408726047155205">"<xliff:g id="DATEANDTIME">%1$s</xliff:g> • <xliff:g id="DURATION">%2$s</xliff:g>"</string>
-    <string name="voice_search_not_available" msgid="6546240433719732905">"Usesho lwezwi alutholakali"</string>
-    <string name="dialer_hint_find_contact" msgid="2023214799381149808">"Sesha othintana nabo"</string>
-    <string name="block_number_search_hint" msgid="5377706079015099416">"Engeza inombolo noma useshe oxhumana nabo"</string>
-    <string name="call_log_all_empty" msgid="3955572868518162004">"Umlando wakho wekholi awunalutho"</string>
-    <string name="call_log_all_empty_action" msgid="852218280136243014">"Yenza ikholi"</string>
-    <string name="call_log_missed_empty" msgid="7094936030845062214">"Awunawo amakholi aphuthelwe."</string>
-    <string name="call_log_voicemail_empty" msgid="273623903423275178">"Ibhokisi lokungenayo kwakho levoyisimeyili alinalutho."</string>
-    <string name="call_log_activity_title" msgid="1275242727244945527">"Umlando wekholi"</string>
-    <string name="call_log_all_title" msgid="6042262422192020327">"Konke"</string>
-    <string name="call_log_missed_title" msgid="17254005889268015">"Phuthelwe"</string>
-    <string name="tab_speed_dial" msgid="6616404752227561075">"Ukudayela okusheshayo"</string>
-    <string name="tab_history" msgid="7420269368689503596">"Umlando wekholi"</string>
-    <string name="tab_all_contacts" msgid="5531733977693943015">"Oxhumana nabo"</string>
-    <string name="tab_voicemail" msgid="2458548090088316246">"Ivoyisimeyili"</string>
-    <string name="search_shortcut_call_number" msgid="8847918845036880688">"Shayela <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="search_shortcut_create_new_contact" msgid="2076374262874775425">"Dala oxhumana naye omusha"</string>
-    <string name="search_shortcut_add_to_contact" msgid="701957016267810766">"Engeza koxhumana naye"</string>
-    <string name="search_shortcut_send_sms_message" msgid="1065069206532610854">"Thumela i-SMS"</string>
-    <string name="search_shortcut_make_video_call" msgid="3746207985295802095">"Yenza ikholi yevidiyo"</string>
-    <string name="search_shortcut_block_number" msgid="4587283230665805776">"Vimba inombolo"</string>
-    <string name="speed_dial_empty" msgid="3346406399966039505">"Akekho umuntu osekudayeleni kwakho okusheshayo okwamanje"</string>
-    <string name="speed_dial_empty_add_favorite_action" msgid="3470360584638103033">"Engeza intandokazi"</string>
-    <string name="remove_contact" msgid="2353580570488923668">"Susa"</string>
-    <string name="select_all" msgid="408601760696146245">"Khetha konke"</string>
-    <string name="call_log_action_video_call" msgid="7565549950343850819">"Ikholi yevidiyo"</string>
-    <string name="call_log_action_send_message" msgid="6948727362660115554">"Thumela umlayezo"</string>
-    <string name="call_log_action_details" msgid="2091370737371449501">"Imininingwane yekholi"</string>
-    <string name="call_log_action_share_voicemail" msgid="8888250682433873454">"Thumela ku ..."</string>
-    <string name="call_log_action_call" msgid="682724094251540583">"Shayela ku-<xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_incoming_missed_call" msgid="8292535799379230029">"Ikholi egejiwe kusuka ku-<xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_incoming_answered_call" msgid="3920182963103160610">"Phendula ikholi kusuka ku-<xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_unread_voicemail" msgid="145170985013419170">"Ivoyisimeyili engafundiwe kusukela ku-<xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_read_voicemail" msgid="5585559881573227732">"Ivoyisimeyili esuka ku-<xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="description_outgoing_call" msgid="543952487882919924">"Ikholi eya ku-<xliff:g id="NAMEORNUMBER">^1</xliff:g>, <xliff:g id="TYPEORLOCATION">^2</xliff:g>, <xliff:g id="TIMEOFCALL">^3</xliff:g>, <xliff:g id="PHONEACCOUNT">^4</xliff:g>."</string>
-    <string name="call_log_via_number" msgid="1340307109806397650">"nge-<xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="call_log_via_number_phone_account" msgid="7698459003033083416">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> nge-<xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="description_call_action" msgid="4042796498169106545">"Shayela ku-<xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_video_call_action" msgid="1237090968588659650">"Ikholi yevidiyo ka-<xliff:g id="NAMEORNUMBER">^1</xliff:g>."</string>
-    <string name="description_voicemail_action" msgid="3290143432403538524">"Lalela ivoyisimeyili esuka ku-<xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_create_new_contact_action" msgid="1928282350281564130">"Dalela oxhumana naye u-<xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="description_add_to_existing_contact_action" msgid="5485618682525057684">"Engeza u-<xliff:g id="NAMEORNUMBER">^1</xliff:g> koxhumana naye okhona"</string>
-    <string name="description_details_action" msgid="2061866409737706174">"Imininingwane yekholi ye-<xliff:g id="NAMEORNUMBER">^1</xliff:g>"</string>
-    <string name="call_log_header_today" msgid="1576119097475845293">"Namhlanje"</string>
-    <string name="call_log_header_yesterday" msgid="5616077776205329563">"Izolo"</string>
-    <string name="call_log_header_other" msgid="4940676886254217644">"Okudala"</string>
-    <string name="voicemail_speaker_on" msgid="3151333608926996668">"Vula isipikha."</string>
-    <string name="voicemail_speaker_off" msgid="2530064206962034201">"Vala isipikha."</string>
-    <string name="voicemail_play_start_pause" msgid="3874823480278334664">"Qala noma misa isikhashana ukudlala."</string>
-    <string name="display_options_title" msgid="3880091801055797975">"Izinketho zokubukeka"</string>
-    <string name="sounds_and_vibration_title" msgid="3075050000721181384">"Imisindo nokudlidliza"</string>
-    <string name="accessibility_settings_title" msgid="3329027650429831820">"Ukufinyeleleka"</string>
-    <string name="ringtone_title" msgid="8377174189894648486">"Ithoni yokukhala yefoni"</string>
-    <string name="vibrate_on_ring_title" msgid="631441314790960485">"Iyadlidliza futhi ngamakholi"</string>
-    <string name="dtmf_tone_enable_title" msgid="3273762431523939277">"Amanothi ekhiphedi"</string>
-    <string name="dtmf_tone_length_title" msgid="534096029202438539">"Ubude bethoni yekhiphedi"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="applicationLabel">Ifoni</string>
+  <string name="launcherDialpadActivityLabel">Ikhiphedi yefoni</string>
+  <string name="callHistoryIconLabel">Umlando wekholi</string>
+  <string name="action_copy_number_text">Kopisha inombolo</string>
+  <string name="copy_transcript_text">Kopisha ukukhiphela</string>
+  <string name="action_edit_number_before_call">Hlela inombolo ngaphambi kwekholi</string>
+  <string name="call_log_delete_all">Sula umlando wekholi</string>
+  <string name="call_log_trash_voicemail">Susa ivoyisimeyili</string>
+  <string name="snackbar_voicemail_deleted">Ivoyisimeyili isusiwe</string>
+  <string name="clearCallLogConfirmation_title">Sula umlando wekholi?</string>
+  <string name="clearCallLogConfirmation">Lokhu kuzosusa wonke amakholi kusukela kumlando wakho</string>
+  <string name="clearCallLogProgress_title">Isula umlando wekholi…</string>
+  <string name="notification_missedCallTitle">Ikholi ekulahlekele</string>
+  <string name="notification_missedWorkCallTitle">Ugeje ikholi yomsebenzi</string>
+  <string name="notification_missedCallsTitle">Amakholi akuphuthele</string>
+  <string name="notification_missedCallsMsg">%d amakholi akulahlekele</string>
+  <string name="notification_missedCall_call_back">Phinda ushaye</string>
+  <string name="notification_missedCall_message">Umlayezo</string>
+  <string name="post_call_notification_message">%1$s: %2$s</string>
+  <string name="notification_voicemail_text_format">Dayela %s</string>
+  <string name="notification_voicemail_no_vm_number">Inombolo yevoyisimeyili ayaziwa</string>
+  <plurals name="notification_voicemail_title">
+    <item quantity="one"> %1$d Amavoyisimeyili </item>
+    <item quantity="other"> %1$d Amavoyisimeyili </item>
+  </plurals>
+  <string name="notification_voicemail_callers_list">%1$s, %2$s</string>
+  <string name="notification_new_voicemail_ticker">I-imeyli entsha esuka ku %1$s</string>
+  <string name="voicemail_playback_error">Ayikwazanga ukudlala ivoyisimeyili</string>
+  <string name="voicemail_fetching_content">Ilayisha ivoyisimeyili…</string>
+  <string name="voicemail_fetching_timout">Ayikwazi ukulayisha ivoyisimeyili</string>
+  <string name="call_log_item_count_and_date">(%1$d) %2$s</string>
+  <string name="description_playback_speakerphone">Vula noma vala isipikha sefoni</string>
+  <string name="description_playback_seek">Funa indawo yokudlala</string>
+  <string name="action_menu_call_history_description">Umlando wekholi</string>
+  <string msgid="2295659037509008453" name="action_menu_overflow_description">Izinketho eziningi</string>
+  <string name="action_menu_dialpad_button">ikhiphedi</string>
+  <string name="dialer_settings_label">Izilungiselelo</string>
+  <string name="simulator_submenu_label">Isilingisi</string>
+  <string name="new_ui_launcher_shortcut_label">Dala isinqamuleli esisha se-UI</string>
+  <string name="description_entering_bulk_action_mode">Kungenwa kumodi yesenzo senqwaba</string>
+  <string name="description_leaving_bulk_action_mode">Ishiye imodi yesenzo senqwaba</string>
+  <string name="description_selecting_bulk_action_mode">Kukhethwe i-%1$s</string>
+  <string name="description_unselecting_bulk_action_mode">Akukhethiwe i-%1$s</string>
+  <string name="description_contact_details">Imininingwane yokuxhumana ka-%1$s</string>
+  <string name="description_spam_contact_details">Imininingwane yokuxhumana yofonayo ongugaxekile osolwayo %1$s</string>
+  <string name="description_num_calls">%1$s amakholi.</string>
+  <string name="description_video_call">Ikholi yevidiyo.</string>
+  <string name="description_start_voice_search">Qalisa ukusesha ngezwi</string>
+  <string name="voicemail">Ivoyisimeyili</string>
+  <string name="description_cancel_multi_select">Khansela imodi lezenzo zeqoqo</string>
+  <string name="voicemailMultiSelectDeleteConfirm">Susa</string>
+  <string name="voicemailMultiSelectDeleteCancel">Khansela</string>
+  <string name="voicemailMultiSelectActionBarTitle">Engu-%1$s ekhethiwe</string>
+  <plurals name="delete_voicemails_confirmation_dialog_title">
+    <item quantity="one"><b>Sula lawa mavoyisimeyili? </b></item>
+    <item quantity="other"><b>Sula lawa mavoyisimeyili? </b></item>
+  </plurals>
+  <string name="voicemailCallLogToday">@string/call_log_header_today</string>
+  <string name="voicemailCallLogDateTimeFormat">%1$s ngo-%2$s</string>
+  <string name="voicemailDurationFormat">%1$02d:%2$02d</string>
+  <string name="voicemailCallLogDateTimeFormatWithDuration">%1$s • %2$s</string>
+  <string name="voice_search_not_available">Usesho lwezwi alutholakali</string>
+  <string name="dialer_hint_find_contact">Sesha othintana nabo</string>
+  <string name="block_number_search_hint">Engeza inombolo noma useshe oxhumana nabo</string>
+  <string name="call_log_all_empty">Umlando wakho wekholi awunalutho</string>
+  <string name="call_log_all_empty_action">Yenza ikholi</string>
+  <string name="call_log_missed_empty">Awunawo amakholi aphuthelwe.</string>
+  <string name="call_log_voicemail_empty">Ibhokisi lokungenayo kwakho levoyisimeyili alinalutho.</string>
+  <string name="call_log_activity_title">Umlando wekholi</string>
+  <string name="call_log_all_title">Konke</string>
+  <string name="call_log_missed_title">Phuthelwe</string>
+  <string name="tab_speed_dial">Ukudayela okusheshayo</string>
+  <string name="tab_history">Umlando wekholi</string>
+  <string name="tab_all_contacts">Oxhumana nabo</string>
+  <string name="tab_voicemail">Ivoyisimeyili</string>
+  <string name="search_shortcut_call_number">Shayela %s</string>
+  <string name="search_shortcut_create_new_contact">Dala oxhumana naye omusha</string>
+  <string name="search_shortcut_add_to_contact">Engeza koxhumana naye</string>
+  <string name="search_shortcut_send_sms_message">Thumela i-SMS</string>
+  <string name="search_shortcut_make_video_call">Yenza ikholi yevidiyo</string>
+  <string name="search_shortcut_block_number">Vimba inombolo</string>
+  <string name="speed_dial_empty">Akekho umuntu osekudayeleni kwakho okusheshayo okwamanje</string>
+  <string name="speed_dial_empty_add_favorite_action">Engeza intandokazi</string>
+  <string name="remove_contact">Susa</string>
+  <string name="select_all">Khetha konke</string>
+  <string name="call_log_action_video_call">Ikholi yevidiyo</string>
+  <string name="call_log_action_set_up_video">Setha ikholi yevidiyo</string>
+  <string name="call_log_action_invite_video">Memela kwikholi yevidiyo</string>
+  <string name="call_log_action_send_message">Thumela umlayezo</string>
+  <string name="call_log_action_details">Imininingwane yekholi</string>
+  <string name="call_log_action_share_voicemail">Thumela ku ...</string>
+  <string name="call_log_action_call">Shayela ku-^1</string>
+  <string name="description_incoming_missed_call">Ikholi egejiwe kusuka ku-^1, ^2, ^3, ^4.</string>
+  <string name="description_incoming_answered_call">Phendula ikholi kusuka ku-^1, ^2, ^3, ^4.</string>
+  <string name="description_unread_voicemail">Ivoyisimeyili engafundiwe kusukela ku-^1, ^2, ^3, ^4.</string>
+  <string name="description_read_voicemail">Ivoyisimeyili esuka ku-^1, ^2, ^3, ^4.</string>
+  <string name="description_outgoing_call">Ikholi eya ku-^1, ^2, ^3, ^4.</string>
+  <string name="call_log_via_number">nge-%1$s</string>
+  <string name="call_log_via_number_phone_account">%1$s nge-%2$s</string>
+  <string name="description_call_action">Shayela ku-^1</string>
+  <string name="description_video_call_action">Ikholi yevidiyo ka-^1.</string>
+  <string name="description_voicemail_action">Lalela ivoyisimeyili esuka ku-^1</string>
+  <string name="description_create_new_contact_action">Dalela oxhumana naye u-^1</string>
+  <string name="description_add_to_existing_contact_action">Engeza u-^1 koxhumana naye okhona</string>
+  <string name="description_details_action">Imininingwane yekholi ye-^1</string>
+  <string name="call_log_header_today">Namhlanje</string>
+  <string name="call_log_header_yesterday">Izolo</string>
+  <string name="call_log_header_other">Okudala</string>
+  <string name="voicemail_speaker_on">Vula isipikha.</string>
+  <string name="voicemail_speaker_off">Vala isipikha.</string>
+  <string name="voicemail_play_start_pause">Qala noma misa isikhashana ukudlala.</string>
+  <string name="display_options_title">Izinketho zokubukeka</string>
+  <string name="sounds_and_vibration_title">Imisindo nokudlidliza</string>
+  <string name="accessibility_settings_title">Ukufinyeleleka</string>
+  <string name="ringtone_title">Ithoni yokukhala yefoni</string>
+  <string name="vibrate_on_ring_title">Iyadlidliza futhi ngamakholi</string>
+  <string name="dtmf_tone_enable_title">Amanothi ekhiphedi</string>
+  <string name="dtmf_tone_length_title">Ubude bethoni yekhiphedi</string>
   <string-array name="dtmf_tone_length_entries">
-    <item msgid="3136353015227162823">"Okujwayelekile"</item>
-    <item msgid="5376841175538523822">"Kude"</item>
+    <item>Okujwayelekile</item>
+    <item>Kude</item>
   </string-array>
-    <string name="respond_via_sms_setting_title" msgid="8008181606657693452">"Izimpendulo ezisheshayo"</string>
-    <string name="call_settings_label" msgid="7824611757200960807">"Amakholi"</string>
-    <string name="manage_blocked_numbers_label" msgid="16823761991832273">"Ukuvimbela ikholi"</string>
-    <string name="voicemail_settings_label" msgid="4594299554519920570">"Ivoyisimeyili"</string>
-    <string name="blocked_numbers_disabled_emergency_header_label" msgid="6936696532562923971">"Ukuvimbela ikholi kuvalwe isikhashana"</string>
-    <string name="blocked_numbers_disabled_emergency_desc" msgid="5484785225285297040">"Ukuvimbela ikholi kukhutshaziwe ngoba uxhumane nabosizo oluphuthumayo kusukela kule foni phakathi kwamahora angu-48 wokugcina. Kuzophinda kunikwe amandla ngokuzenzakalela uma sokuphele isikhathi samahora angu-48."</string>
-    <string name="import_send_to_voicemail_numbers_label" msgid="7821890095264297681">"Ngenisa izinombolo"</string>
-    <string name="blocked_call_settings_import_description" msgid="1819412052545228965">"Ngaphambilini umake abanye abashayi ukuthi bathunyelwe ngokuzenzakalelayo kuvoyisimeyili ngezinhlelo zokusebenza."</string>
-    <string name="blocked_call_settings_view_numbers_button" msgid="3332727948554356704">"Buka izinombolo"</string>
-    <string name="blocked_call_settings_import_button" msgid="7319111700387470727">"Ngenisa"</string>
-    <string name="description_blocked_number_list_delete" msgid="2139644216858370740">"Vulela inombolo"</string>
-    <string name="addBlockedNumber" msgid="3053473735238295551">"Engeza inombolo"</string>
-    <string name="block_number_footer_message_vvm" msgid="7955326304033982368">"Amakholi kusuka kulezi lzinombolo azovinjwa futhi amavoyisimeyili azosulwa ngokuzenzakalela."</string>
-    <string name="block_number_footer_message_no_vvm" msgid="1152684139070471665">"Amakholi kusuka kulezi zinombolo azovinjwa, kodwa angakwazi ukushiya amavoyisimeyili."</string>
-    <string name="block_list" msgid="4701585783411870782">"Izinombolo ezivinjiwe"</string>
-    <string name="alreadyBlocked" msgid="5483253180532475653">"<xliff:g id="NUMBER">%1$s</xliff:g> isivinjiwe kakade."</string>
-    <string name="phone_account_settings_label" msgid="8372485478006965920">"Ama-akhawunti wokushaya"</string>
-    <string name="permission_no_speeddial" msgid="8487215628510596753">"Nika amandla ukudayela okusheshayo, vula imvume yoxhumana nabo."</string>
-    <string name="permission_no_calllog" msgid="4053705651238775784">"Ukuze ubone irekhodi lakho lamakholi, vuma imvume yefoni."</string>
-    <string name="permission_no_search" msgid="2424710404207193826">"Ukuze useshe oxhumana nabo, vula izimvume zoxhumana nabo."</string>
-    <string name="permission_place_call" msgid="8686908130349369423">"Ukuze ubeke ikholi, vula imvume yefoni."</string>
-    <string name="toast_cannot_write_system_settings" msgid="1108307781918782515">"Uhlelo lokusebenza lefoni alinayo imvume yokubhalela kuzilungiselelo zesistimu."</string>
-    <string name="blocked_number_call_log_label" msgid="4212282846299997693">"Ivinjelwe"</string>
-    <string name="call_log_action_block_report_number" msgid="7302636538668696729">"Vimba/bika ugaxekile"</string>
-    <string name="call_log_action_block_number" msgid="5048188386501998865">"Vimba inombolo"</string>
-    <string name="call_log_action_remove_spam" msgid="2045319806318398403">"Akusiko okugaxekile"</string>
-    <string name="call_log_action_unblock_number" msgid="6100117033288448758">"Vulela inombolo"</string>
-    <string name="spam_number_call_log_label" msgid="2678431398326811131">"Ugaxekile"</string>
-    <string name="call_composer_connection_failed" msgid="6776461585447831242">"U-<xliff:g id="NAME">%1$s</xliff:g> akaxhunyiwe kwi-inthanethi futhi akakwazi ukufinyelelwa"</string>
-    <string name="about_phone_label" msgid="582991354677973731">"Mayelana"</string>
-    <string name="voicemail_transcription_branding_text" msgid="6285228063793541677">"Kubhalwe ngokuloba i-Google"</string>
-    <string name="voicemail_transcription_in_progress" msgid="2933320969613783210">"I-Google ibhala ngokuloba..."</string>
-    <string name="voicemail_transcription_failed" msgid="335275303117412706">"Ukubhalwa ngokuloba akutholakali."</string>
-    <string name="voicemail_transcription_failed_language_not_supported" msgid="4210332591050562553">"Ukubhalwa ngokuloba akutholakali. Ulimi alusekelwa."</string>
-    <string name="voicemail_transcription_failed_no_speech" msgid="9093372879697874852">"Ukubhalwa ngokuloba akutholakali. Ayikho inkulumo etholakele."</string>
-    <string name="view_conversation" msgid="7895904782094119702">"Buka"</string>
-    <string name="ec_data_deleted" msgid="4794880345545827107">"Ikholi isusiwe. Buka uphinde ususe okunamathiselwe ku-imeyili okwabiwe ngesikhathi sale kholi kumilayezo."</string>
-    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"Amakholi asusiwe. Buka uphinde ususe okunamathiselwe kwi-imeyili okwabiwe ngesikhathi samakholi kumilayezo."</string>
+  <string name="respond_via_sms_setting_title">Izimpendulo ezisheshayo</string>
+  <string name="call_settings_label">Amakholi</string>
+  <string name="manage_blocked_numbers_label">Izinombolo ezivinjiwe</string>
+  <string name="voicemail_settings_label">Ivoyisimeyili</string>
+  <string name="blocked_numbers_disabled_emergency_header_label">Ukuvimbela ikholi kuvalwe isikhashana</string>
+  <string name="blocked_numbers_disabled_emergency_desc">Ukuvimbela ikholi kukhutshaziwe ngoba uxhumane nabosizo oluphuthumayo kusukela kule foni phakathi kwamahora angu-48 wokugcina. Kuzophinda kunikwe amandla ngokuzenzakalela uma sokuphele isikhathi samahora angu-48.</string>
+  <string name="import_send_to_voicemail_numbers_label">Ngenisa izinombolo</string>
+  <string name="blocked_call_settings_import_description">Ngaphambilini umake abanye abashayi ukuthi bathunyelwe ngokuzenzakalelayo kuvoyisimeyili ngezinhlelo zokusebenza.</string>
+  <string name="blocked_call_settings_view_numbers_button">Buka izinombolo</string>
+  <string name="blocked_call_settings_import_button">Ngenisa</string>
+  <string name="description_blocked_number_list_delete">Vulela inombolo</string>
+  <string name="addBlockedNumber">Engeza inombolo</string>
+  <string name="block_number_footer_message_vvm">Amakholi kusuka kulezi lzinombolo azovinjwa futhi amavoyisimeyili azosulwa ngokuzenzakalela.</string>
+  <string name="block_number_footer_message_no_vvm">Amakholi kusuka kulezi zinombolo azovinjwa, kodwa angakwazi ukushiya amavoyisimeyili.</string>
+  <string name="block_list">Izinombolo ezivinjiwe</string>
+  <string name="alreadyBlocked">%1$s isivinjiwe kakade.</string>
+  <string name="phone_account_settings_label">Ama-akhawunti wokushaya</string>
+  <string name="permission_no_speeddial">Nika amandla ukudayela okusheshayo, vula imvume yoxhumana nabo.</string>
+  <string name="permission_no_calllog">Ukuze ubone irekhodi lakho lamakholi, vuma imvume yefoni.</string>
+  <string name="permission_no_search">Ukuze useshe oxhumana nabo, vula izimvume zoxhumana nabo.</string>
+  <string name="permission_place_call">Ukuze ubeke ikholi, vula imvume yefoni.</string>
+  <string name="toast_cannot_write_system_settings">Uhlelo lokusebenza lefoni alinayo imvume yokubhalela kuzilungiselelo zesistimu.</string>
+  <string name="blocked_number_call_log_label">Ivinjelwe</string>
+  <string name="call_log_action_block_report_number">Vimba/bika ugaxekile</string>
+  <string name="call_log_action_block_number">Vimba inombolo</string>
+  <string name="call_log_action_remove_spam">Akusiko okugaxekile</string>
+  <string name="call_log_action_unblock_number">Vulela inombolo</string>
+  <string name="spam_number_call_log_label">Ugaxekile</string>
+  <string name="call_composer_connection_failed">U-%1$s akaxhunyiwe kwi-inthanethi futhi akakwazi ukufinyelelwa</string>
+  <string name="about_phone_label">Mayelana</string>
+  <string name="voicemail_transcription_branding_text">Kubhalwe ngokuloba i-Google</string>
+  <string name="voicemail_transcription_in_progress">Iyaloba...</string>
+  <string name="voicemail_transcription_failed">Ukubhalwa ngokuloba akutholakali.</string>
+  <string name="voicemail_transcription_failed_language_not_supported">Ukubhalwa ngokuloba akutholakali. Ulimi alusekelwa.</string>
+  <string name="voicemail_transcription_failed_no_speech">Ukubhalwa ngokuloba akutholakali. Ayikho inkulumo etholakele.</string>
+  <string name="voicemail_donation_promo_title">Sisize sithuthukise ukunemba kokuloba?</string>
+  <string name="voicemail_donation_promo_content">Vumela i-Google ukuthi ibuyekeze lokhu nemilayezo ezayo yevoyisimeyili ngokulotshiwe. Kuzogcinwa ngokungaziwa. Shintsha izilungiselelo noma kunini. %1$s</string>
+  <string name="voicemail_donation_promo_opt_in">Yebo, ngingenile</string>
+  <string name="voicemail_donation_promo_opt_out">Cha ngiyabonga</string>
+  <string name="voicemail_transcription_rating">Linganisa ikhwalithi yokuloba</string>
+  <string name="voicemail_transcription_rating_thanks">Siyabonga ngempendulo yakho</string>
+  <string name="description_rating_good">Thanda</string>
+  <string name="description_rating_bad">Ukungathandi</string>
+  <string name="view_conversation">Buka</string>
+  <string name="ec_data_deleted">Ikholi isusiwe. Buka uphinde ususe okunamathiselwe ku-imeyili okwabiwe ngesikhathi sale kholi kumilayezo.</string>
+  <string name="multiple_ec_data_deleted">Amakholi asusiwe. Buka uphinde ususe okunamathiselwe kwi-imeyili okwabiwe ngesikhathi samakholi kumilayezo.</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values/colors.xml b/java/com/android/dialer/app/res/values/colors.xml
index e79c5c5..a971347 100644
--- a/java/com/android/dialer/app/res/values/colors.xml
+++ b/java/com/android/dialer/app/res/values/colors.xml
@@ -15,72 +15,12 @@
 -->
 
 <resources>
-  <color name="dialer_flat_button_text_color">@color/dialer_theme_color</color>
-
-  <!-- Color for the setting text. -->
-  <color name="setting_primary_color">@color/dialer_primary_text_color</color>
-  <!-- Color for the setting description text. -->
-  <color name="setting_secondary_color">@color/dialer_secondary_text_color</color>
-  <color name="setting_disabled_color">#aaaaaa</color>
-  <color name="setting_background_color">#ffffff</color>
-
-  <!-- 54% black -->
-  <color name="call_log_icon_tint">#8a000000</color>
-  <!-- 87% black -->
-  <color name="call_log_primary_color">#de000000</color>
-  <!-- 54% black -->
-  <color name="call_log_detail_color">#8a000000</color>
-  <!-- 87% black -->
-  <color name="call_log_voicemail_transcript_color">#de000000</color>
-  <!-- 54% black -->
-  <color name="call_log_voicemail_transcript_branding_color">#8a000000</color>
-  <!-- 100% blue -->
-  <color name="call_log_voicemail_transcript_rating_color">#ff2a56c6</color>
-  <!-- 70% black -->
-  <color name="call_log_action_color">#b3000000</color>
-  <!-- 54% black -->
-  <color name="call_log_day_group_heading_color">#8a000000</color>
-  <!-- 87% black-->
-  <color name="call_log_unread_text_color">#de000000</color>
-  <color name="call_log_list_item_primary_action_icon_tint">@color/call_log_icon_tint</color>
-
-  <color name="voicemail_icon_tint">@color/call_log_icon_tint</color>
   <color name="voicemail_icon_disabled_tint">#80000000</color>
-  <color name="voicemail_playpause_icon_tint">@color/voicemail_icon_tint</color>
-  <!-- Colour of voicemail progress bar to the right of position indicator. -->
-  <color name="voicemail_playback_seek_bar_yet_to_play">#cecece</color>
-  <!-- Colour of voicemail progress bar to the left of position indicator. -->
-  <color name="voicemail_playback_seek_bar_already_played">@color/dialer_theme_color</color>
-
-  <!-- Background color for search results and call details -->
-  <color name="background_dialer_results">#f9f9f9</color>
-
-  <!-- Color of the contact name in favorite tiles -->
-  <color name="contact_tile_name_color">#ffffff</color>
-
-  <color name="contact_list_name_text_color">@color/dialer_primary_text_color</color>
-
-  <color name="remove_text_color">#ffffff</color>
+  <color name="voicemail_playpause_icon_tint">?colorIcon</color>
 
   <!-- Text color for the "Remove" text when a contact is dragged on top of the remove view -->
   <color name="remove_highlighted_text_color">#FF3F3B</color>
 
-  <color name="dialer_dialpad_touch_tint">@color/dialer_theme_color_20pct</color>
-
-  <color name="call_log_action_divider">#eeeeee</color>
-  <color name="divider_line_color">#D8D8D8</color>
-
   <!--  Colors for blocked numbers list -->
-  <color name="blocked_number_primary_text_color">@color/dialer_primary_text_color</color>
-  <color name="blocked_number_secondary_text_color">@color/dialer_secondary_text_color</color>
-  <color name="blocked_number_icon_tint">#616161</color>
-  <color name="blocked_number_background">#FFFFFF</color>
   <color name="blocked_number_block_color">#F44336</color>
-  <color name="blocked_number_header_color">@color/dialer_theme_color</color>
-  <color name="blocked_number_disabled_emergency_background_color">#E0E0E0</color>
-  <color name="add_blocked_number_icon_color">#bdbdbd</color>
-
-  <color name="voicemail_donation_promo_positive_button_text_color">#FF2A56C6</color>
-  <color name="voicemail_donation_promo_negative_button_text_color">#FF757575</color>
-
 </resources>
diff --git a/java/com/android/dialer/app/res/values/strings.xml b/java/com/android/dialer/app/res/values/strings.xml
index 7332c31..e5092f0 100644
--- a/java/com/android/dialer/app/res/values/strings.xml
+++ b/java/com/android/dialer/app/res/values/strings.xml
@@ -51,9 +51,6 @@
   <!-- Text for snackbar to undo a voicemail delete. [CHAR LIMIT=30] -->
   <string name="snackbar_voicemail_deleted">Voicemail deleted</string>
 
-  <!-- Text for undo button in snackbar for voicemail deletion. [CHAR LIMIT=10] -->
-  <string name="snackbar_voicemail_deleted_undo">UNDO</string>
-
   <!-- Title of the confirmation dialog for clearing the call log. [CHAR LIMIT=37]  -->
   <string name="clearCallLogConfirmation_title">Clear call history?</string>
 
@@ -683,12 +680,9 @@
        [CHAR LIMIT=NONE] -->
   <string name="voicemail_donation_promo_content">
     Let Google review this and future voicemail messages with transcripts.
-    They\'ll be stored anonymously. Change Settings any time.
+    They\'ll be stored anonymously. Change Settings any time. <xliff:g example="Learn more">%1$s</xliff:g>
   </string>
 
-  <!-- Text for a 'learn more' link at the end of the voicemail donation promo dialog content -->
-  <string name="voicemail_donation_promo_learn_more">Learn&#160;more</string>
-
   <string translatable="false" name="voicemail_donation_promo_learn_more_url">https://support.google.com/phoneapp/answer/2811844?hl=en%26ref_topic=7539039</string>
 
   <!-- Label for the voicemail donation promo dialog opt-in button
@@ -724,8 +718,4 @@
   <!-- If a user deletes a call that has attachments (photo, message, ect) bundled with it, they need
         to be told that they need to go to the SMS app to delete the attachments. [CHAR LIMIT=NONE] -->
   <string name="multiple_ec_data_deleted">Calls deleted. View and delete attachments shared during calls in Messages.</string>
-
-  <!-- Name of launcher shortcut for the new UI main activity.
-       TODO(38502365): Remove this once we're ready to launch the new UI. -->
-  <string translatable="false" name="nui_shortcut_name">Phone NUI</string>
 </resources>
diff --git a/java/com/android/dialer/app/res/values/styles.xml b/java/com/android/dialer/app/res/values/styles.xml
index 869f127..c2cad31 100644
--- a/java/com/android/dialer/app/res/values/styles.xml
+++ b/java/com/android/dialer/app/res/values/styles.xml
@@ -15,146 +15,32 @@
   ~ limitations under the License
   -->
 <resources>
-
-  <style name="AlertDialogCustom" parent="Theme.AppCompat.Light.Dialog.Alert">
-    <item name="android:colorPrimary">@color/dialtacts_theme_color</item>
-    <item name="android:colorAccent">@color/dialtacts_theme_color</item>
-  </style>
-
-  <style name="DialtactsThemeBase" parent="DialerThemeBase">
-
-    <!-- Styles that require AppCompat compatibility, remember to update both sets -->
-    <item name="android:windowActionBarOverlay">true</item>
-    <item name="windowActionBarOverlay">true</item>
-    <item name="android:windowActionModeOverlay">true</item>
-    <item name="windowActionModeOverlay">true</item>
-    <item name="android:actionBarStyle">@style/DialtactsActionBarStyle</item>
-    <item name="actionBarStyle">@style/DialtactsActionBarStyle</item>
-    <item name="actionModeStyle">@style/ActionModeStyle</item>
-    <item name="android:actionModeStyle">@style/ActionModeStyle</item>
-
-    <item name="android:windowContentOverlay">@null</item>
-    <item name="android:overlapAnchor">true</item>
-
-    <item name="android:listViewStyle">@style/ListViewStyle</item>
-    <item name="list_section_header_height">32dip</item>
-    <item name="list_item_padding_top">7dp</item>
-    <item name="list_item_padding_right">24dp</item>
-    <item name="list_item_padding_bottom">7dp</item>
-    <item name="list_item_padding_left">16dp</item>
-    <item name="list_item_gap_between_image_and_text">
-      @dimen/contact_browser_list_item_gap_between_image_and_text
-    </item>
-    <item name="list_item_gap_between_label_and_data">8dip</item>
-    <item name="list_item_presence_icon_margin">4dip</item>
-    <item name="list_item_presence_icon_size">16dip</item>
-    <item name="list_item_photo_size">@dimen/contact_browser_list_item_photo_size</item>
-    <item name="list_item_profile_photo_size">70dip</item>
-    <item name="list_item_prefix_highlight_color">@color/people_app_theme_color</item>
-    <item name="list_item_background_color">@color/background_dialer_light</item>
-    <item name="list_item_header_text_indent">8dip</item>
-    <item name="list_item_header_text_color">@color/dialer_secondary_text_color</item>
-    <item name="list_item_header_text_size">14sp</item>
-    <item name="list_item_header_height">30dip</item>
-    <item name="list_item_data_width_weight">5</item>
-    <item name="list_item_label_width_weight">3</item>
-    <item name="contact_browser_list_padding_left">0dp</item>
-    <item name="contact_browser_list_padding_right">0dp</item>
-    <item name="contact_browser_background">@color/background_dialer_results</item>
-    <item name="list_item_name_text_color">@color/contact_list_name_text_color</item>
-    <item name="list_item_name_text_size">16sp</item>
-    <item name="list_item_text_indent">@dimen/contact_browser_list_item_text_indent</item>
-    <item name="list_item_text_offset_top">-2dp</item>
-    <!-- Favorites -->
-    <item name="favorites_padding_bottom">?android:attr/actionBarSize</item>
-    <item name="dialpad_key_button_touch_tint">@color/dialer_dialpad_touch_tint</item>
-    <item name="android:textAppearanceButton">@style/DialerButtonTextStyle</item>
-
-    <!-- Video call icon -->
-    <item name="list_item_video_call_icon_size">48dip</item>
-    <item name="list_item_video_call_icon_margin">8dip</item>
-
-    <item name="dialpad_style">@style/Dialpad.Light</item>
-  </style>
-
-  <style name="DialtactsTheme" parent="DialtactsThemeBase">
-  </style>
-
-  <!-- Action bar overflow menu icon.  White with no shadow. -->
-  <style name="DialtactsActionBarOverflowWhite"
-    parent="@android:style/Widget.Material.Light.ActionButton.Overflow">
-    <item name="android:src">@drawable/quantum_ic_more_vert_white_24</item>
+  <style name="DialtactsTheme" parent="Dialer.ThemeBase.ActionBar">
+    <!-- todo(calderwoodra): fill this in with dialpad theme and call log card theme -->
   </style>
 
   <style name="DialpadTheme" parent="DialtactsTheme">
-    <item name="android:textColorPrimary">#FFFFFF</item>
-  </style>
-
-  <style name="DialtactsThemeWithoutActionBarOverlay" parent="DialtactsTheme">
-    <!-- Styles that require AppCompat compatibility, remember to update both sets -->
-    <item name="android:windowActionBarOverlay">false</item>
-    <item name="windowActionBarOverlay">false</item>
-    <item name="android:actionOverflowButtonStyle">@style/DialtactsActionBarOverflowWhite</item>
-    <item name="actionOverflowButtonStyle">@style/DialtactsActionBarOverflowWhite</item>
-  </style>
-
-  <!-- Hide the actionbar title during the activity preview -->
-  <style name="DialtactsActivityTheme" parent="DialtactsTheme">
-    <!-- Styles that require AppCompat compatibility, remember to update both sets -->
-    <item name="android:actionBarStyle">@style/DialtactsActionBarWithoutTitleStyle</item>
-    <item name="actionBarStyle">@style/DialtactsActionBarWithoutTitleStyle</item>
-
-    <item name="android:fastScrollThumbDrawable">@drawable/fastscroll_thumb</item>
-    <item name="android:fastScrollTrackDrawable">@null</item>
-  </style>
-
-  <style name="DialtactsActionBarStyle" parent="DialerActionBarBaseStyle">
-    <!-- Styles that require AppCompat compatibility, remember to update both sets -->
-    <item name="android:background">@color/actionbar_background_color</item>
-    <item name="background">@color/actionbar_background_color</item>
-    <item name="android:titleTextStyle">@style/DialtactsActionBarTitleText</item>
-    <item name="titleTextStyle">@style/DialtactsActionBarTitleText</item>
-    <item name="android:elevation">@dimen/action_bar_elevation</item>
-    <item name="elevation">@dimen/action_bar_elevation</item>
-    <!-- Empty icon -->
-    <item name="android:icon">@android:color/transparent</item>
-    <item name="icon">@android:color/transparent</item>
-    <!-- Shift the title text to the right -->
-    <item name="android:contentInsetStart">@dimen/actionbar_contentInsetStart</item>
-    <item name="contentInsetStart">@dimen/actionbar_contentInsetStart</item>
+    <item name="android:textColorPrimary">?android:attr/textColorPrimaryInverse</item>
   </style>
 
   <style name="ActionModeStyle" parent="Widget.AppCompat.ActionMode">
-    <item name="android:background">@color/actionbar_background_color</item>
-    <item name="background">@color/actionbar_background_color</item>
+    <item name="android:background">?android:attr/colorPrimary</item>
+    <item name="background">?android:attr/colorPrimary</item>
     <item name="closeItemLayout">@layout/action_mode_close_button</item>
   </style>
 
-  <style name="DialtactsActionBarWithoutTitleStyle" parent="DialtactsActionBarStyle">
-    <!-- Styles that require AppCompat compatibility, remember to update both sets -->
-    <item name="android:displayOptions"></item>
-    <item name="displayOptions"></item>
-    <item name="android:height">@dimen/action_bar_height_large</item>
-    <item name="height">@dimen/action_bar_height_large</item>
-    <!-- Override ActionBar title offset to keep search box aligned left -->
-    <item name="android:contentInsetStart">0dp</item>
-    <item name="contentInsetStart">0dp</item>
-    <item name="android:contentInsetEnd">0dp</item>
-    <item name="contentInsetEnd">0dp</item>
-  </style>
-
   <style name="DialtactsSearchBarThemeOverlay" parent="ThemeOverlay.AppCompat.Light"/>
 
   <!-- Text in the action bar at the top of the screen -->
   <style name="DialtactsActionBarTitleText"
     parent="@android:style/TextAppearance.Material.Widget.ActionBar.Title">
-    <item name="android:textColor">@color/actionbar_text_color</item>
+    <item name="android:textColor">?colorTextOnUnthemedDarkBackground</item>
   </style>
 
   <!-- Text style for tabs. -->
   <style name="DialtactsActionBarTabTextStyle"
     parent="android:style/Widget.Material.Light.ActionBar.TabText">
-    <item name="android:textColor">@color/tab_text_color</item>
+    <item name="android:textColor">?colorTextOnUnthemedDarkBackground</item>
     <item name="android:textSize">@dimen/tab_text_size</item>
     <item name="android:fontFamily">"sans-serif-medium"</item>
   </style>
@@ -167,56 +53,64 @@
     <item name="android:gravity">center_vertical</item>
   </style>
 
-  <style name="CallLogActionTextStyle">
+  <style name="CallLogActionTextStyle" parent="Dialer.TextAppearance.Primary.Ellipsize">
     <item name="android:layout_width">match_parent</item>
     <item name="android:layout_height">wrap_content</item>
     <item name="android:paddingStart">@dimen/call_log_action_horizontal_padding</item>
     <item name="android:paddingEnd">@dimen/call_log_action_horizontal_padding</item>
-    <item name="android:textColor">@color/call_log_action_color</item>
-    <item name="android:textSize">@dimen/call_log_primary_text_size</item>
-    <item name="android:fontFamily">"sans-serif"</item>
     <item name="android:focusable">true</item>
-    <item name="android:singleLine">true</item>
     <item name="android:importantForAccessibility">no</item>
   </style>
 
-  <style name="CallLogActionSupportTextStyle" parent="@style/CallLogActionTextStyle">
-    <item name="android:textSize">@dimen/call_log_detail_text_size</item>
-    <item name="android:textColor">@color/call_log_detail_color</item>
+  <style name="CallLogActionSupportTextStyle" parent="Dialer.TextAppearance.Secondary.Ellipsize">
+    <item name="android:layout_width">match_parent</item>
+    <item name="android:layout_height">wrap_content</item>
+    <item name="android:paddingStart">@dimen/call_log_action_horizontal_padding</item>
+    <item name="android:paddingEnd">@dimen/call_log_action_horizontal_padding</item>
+    <item name="android:focusable">true</item>
+    <item name="android:importantForAccessibility">no</item>
   </style>
 
   <style name="CallLogActionIconStyle">
     <item name="android:layout_width">@dimen/call_log_action_icon_dimen</item>
     <item name="android:layout_height">@dimen/call_log_action_icon_dimen</item>
     <item name="android:layout_marginStart">@dimen/call_log_action_icon_margin_start</item>
-    <item name="android:tint">?android:textColorSecondary</item>
+    <item name="android:tint">?colorIcon</item>
     <item name="android:importantForAccessibility">no</item>
   </style>
 
-  <!-- Style applied to the "Settings" screen.  Keep in sync with SettingsLight in Telephony. -->
-  <style name="SettingsStyle" parent="DialtactsThemeWithoutActionBarOverlay">
-    <!-- Setting text. -->
-    <item name="android:textColorPrimary">@color/settings_text_color_primary</item>
-    <!-- Setting description. -->
-    <item name="android:textColorSecondary">@color/settings_text_color_secondary</item>
-    <item name="android:windowBackground">@color/setting_background_color</item>
-    <item name="android:colorAccent">@color/dialtacts_theme_color</item>
-    <item name="android:textColorLink">@color/dialtacts_theme_color</item>
-  </style>
-
   <style name="ManageBlockedNumbersStyle" parent="SettingsStyle">
     <!-- Styles that require AppCompat compatibility, remember to update both sets -->
     <item name="android:windowActionBarOverlay">true</item>
     <item name="windowActionBarOverlay">true</item>
     <item name="android:actionBarStyle">@style/ManageBlockedNumbersActionBarStyle</item>
-    <item name="actionBarStyle">@style/ManageBlockedNumbersActionBarStyle</item>
     <item name="android:fastScrollTrackDrawable">@null</item>
   </style>
 
-  <style name="ManageBlockedNumbersActionBarStyle" parent="DialtactsActionBarWithoutTitleStyle">
+  <style name="ManageBlockedNumbersActionBarStyle" parent="DialerActionBarBaseStyle">
     <!-- Styles that require AppCompat compatibility, remember to update both sets -->
     <item name="android:height">@dimen/action_bar_height</item>
     <item name="height">@dimen/action_bar_height</item>
+
+    <!-- Styles that require AppCompat compatibility, remember to update both sets -->
+    <item name="android:displayOptions"></item>
+    <item name="displayOptions"></item>
+    <!-- Override ActionBar title offset to keep search box aligned left -->
+    <item name="android:contentInsetStart">0dp</item>
+    <item name="contentInsetStart">0dp</item>
+    <item name="android:contentInsetEnd">0dp</item>
+    <item name="contentInsetEnd">0dp</item>
+
+    <!-- Styles that require AppCompat compatibility, remember to update both sets -->
+    <item name="android:background">?android:attr/colorPrimary</item>
+    <item name="background">?android:attr/colorPrimary</item>
+    <item name="android:titleTextStyle">@style/DialtactsActionBarTitleText</item>
+    <item name="titleTextStyle">@style/DialtactsActionBarTitleText</item>
+    <item name="android:elevation">@dimen/action_bar_elevation</item>
+    <item name="elevation">@dimen/action_bar_elevation</item>
+    <!-- Empty icon -->
+    <item name="android:icon">@android:color/transparent</item>
+    <item name="icon">@android:color/transparent</item>
   </style>
 
   <style name="VoicemailPlaybackLayoutButtonStyle">
@@ -230,7 +124,7 @@
     <item name="android:background">?android:attr/selectableItemBackground</item>
     <item name="android:paddingEnd">@dimen/button_horizontal_padding</item>
     <item name="android:paddingStart">@dimen/button_horizontal_padding</item>
-    <item name="android:textColor">@color/dialer_flat_button_text_color</item>
+    <item name="android:textColor">?android:attr/colorPrimary</item>
   </style>
 
   <!-- Style for the 'primary' button in a view. Unlike the DialerFlatButtonStyle, this button -->
@@ -255,9 +149,7 @@
     <item name="android:background">?android:attr/listDivider</item>
   </style>
 
-  <style name="TranscriptionQualityRating">
-    <item name="android:textColor">@color/call_log_voicemail_transcript_branding_color</item>
-    <item name="android:textSize">@dimen/call_log_voicemail_transcription_text_size</item>
+  <style name="TranscriptionQualityRating" parent="Dialer.TextAppearance.Secondary">
     <item name="android:textStyle">italic</item>
     <item name="android:paddingRight">20dp</item>
     <item name="android:minHeight">56dp</item>
@@ -272,8 +164,7 @@
   </style>
 
   <style name="PromoLinkStyle">
-    <item name="android:textColor">@color/dialer_theme_color</item>
+    <item name="android:textColor">?android:attr/colorPrimary</item>
     <item name="android:fontFamily">"sans-serif-medium"</item>
   </style>
-
 </resources>
diff --git a/java/com/android/dialer/app/res/xml/display_options_settings.xml b/java/com/android/dialer/app/res/xml/display_options_settings.xml
index 0b4e11d..f154122 100644
--- a/java/com/android/dialer/app/res/xml/display_options_settings.xml
+++ b/java/com/android/dialer/app/res/xml/display_options_settings.xml
@@ -18,14 +18,22 @@
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
 
-  <com.android.contacts.common.preference.SortOrderPreference
-    android:dialogTitle="@string/display_options_sort_list_by"
-    android:key="sortOrder"
-    android:title="@string/display_options_sort_list_by"/>
+  <ListPreference
+      android:dialogTitle="@string/display_options_sort_list_by"
+      android:key="@string/display_options_sort_list_by_key"
+      android:summary="%s"
+      android:entries="@array/contact_sort_order_entries"
+      android:entryValues="@array/contact_sort_order_values"
+      android:title="@string/display_options_sort_list_by"
+      android:defaultValue="@string/display_options_sort_by_given_name_value"/>
 
-  <com.android.contacts.common.preference.DisplayOrderPreference
-    android:dialogTitle="@string/display_options_view_names_as"
-    android:key="displayOrder"
-    android:title="@string/display_options_view_names_as"/>
+  <ListPreference
+      android:dialogTitle="@string/display_options_view_names_as"
+      android:key="@string/display_options_view_names_as_key"
+      android:summary="%s"
+      android:entries="@array/contact_display_order_entries"
+      android:entryValues="@array/contact_display_order_values"
+      android:title="@string/display_options_view_names_as"
+      android:defaultValue="@string/display_options_view_given_name_first_value"/>
 
 </PreferenceScreen>
diff --git a/java/com/android/dialer/app/settings/DialerSettingsActivity.java b/java/com/android/dialer/app/settings/DialerSettingsActivity.java
index 24e5fe8..d9bcd6b 100644
--- a/java/com/android/dialer/app/settings/DialerSettingsActivity.java
+++ b/java/com/android/dialer/app/settings/DialerSettingsActivity.java
@@ -38,7 +38,7 @@
 import com.android.dialer.blocking.FilteredNumberCompat;
 import com.android.dialer.common.LogUtil;
 import com.android.dialer.compat.telephony.TelephonyManagerCompat;
-import com.android.dialer.configprovider.ConfigProviderBindings;
+import com.android.dialer.configprovider.ConfigProviderComponent;
 import com.android.dialer.proguard.UsedByReflection;
 import com.android.dialer.util.PermissionsUtil;
 import com.android.dialer.voicemail.settings.VoicemailSettingsFragment;
@@ -116,9 +116,7 @@
         (TelephonyManager) getSystemService(Context.TELEPHONY_SERVICE);
 
     // "Call Settings" (full settings) is shown if the current user is primary user and there
-    // is only one SIM. Before N, "Calling accounts" setting is shown if the current user is
-    // primary user and there are multiple SIMs. In N+, "Calling accounts" is shown whenever
-    // "Call Settings" is not shown.
+    // is only one SIM. Otherwise, "Calling accounts" is shown.
     boolean isPrimaryUser = isPrimaryUser();
     if (isPrimaryUser && TelephonyManagerCompat.getPhoneCount(telephonyManager) <= 1) {
       Header callSettingsHeader = new Header();
@@ -128,7 +126,7 @@
       callSettingsHeader.titleRes = R.string.call_settings_label;
       callSettingsHeader.intent = callSettingsIntent;
       target.add(callSettingsHeader);
-    } else if ((VERSION.SDK_INT >= VERSION_CODES.N) || isPrimaryUser) {
+    } else {
       Header phoneAccountSettingsHeader = new Header();
       Intent phoneAccountSettingsIntent = new Intent(TelecomManager.ACTION_CHANGE_PHONE_ACCOUNTS);
       phoneAccountSettingsIntent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
@@ -160,7 +158,7 @@
 
     boolean isAssistedDialingEnabled =
         ConcreteCreator.isAssistedDialingEnabled(
-            ConfigProviderBindings.get(getApplicationContext()));
+            ConfigProviderComponent.get(getApplicationContext()).getConfigProvider());
     LogUtil.i(
         "DialerSettingsActivity.onBuildHeaders",
         "showing assisted dialing header: " + isAssistedDialingEnabled);
@@ -241,6 +239,9 @@
     PhoneAccountHandle result = null;
     for (PhoneAccountHandle phoneAccountHandle : telecomManager.getCallCapablePhoneAccounts()) {
       PhoneAccount phoneAccount = telecomManager.getPhoneAccount(phoneAccountHandle);
+      if (phoneAccount == null) {
+        continue;
+      }
       if (phoneAccount.hasCapabilities(PhoneAccount.CAPABILITY_SIM_SUBSCRIPTION)) {
         LogUtil.i(
             "DialerSettingsActivity.getSoleSimAccount", phoneAccountHandle + " is a SIM account");
diff --git a/java/com/android/dialer/app/voicemail/VoicemailErrorManager.java b/java/com/android/dialer/app/voicemail/VoicemailErrorManager.java
index ffaf16d..a441e79 100644
--- a/java/com/android/dialer/app/voicemail/VoicemailErrorManager.java
+++ b/java/com/android/dialer/app/voicemail/VoicemailErrorManager.java
@@ -86,9 +86,11 @@
     List<VoicemailStatus> statuses = new ArrayList<>();
     while (statusCursor.moveToNext()) {
       VoicemailStatus status = new VoicemailStatus(context, statusCursor);
-      if (status.isActive()) {
+      if (status.isActive(context)) {
         statuses.add(status);
         addServiceStateListener(status);
+      } else {
+        LogUtil.i("VisualVoicemailCallLogFragment.shouldAutoSync", "inactive source ignored");
       }
     }
     alertItem.updateStatus(statuses, this);
diff --git a/java/com/android/dialer/app/voicemail/VoicemailPlaybackLayout.java b/java/com/android/dialer/app/voicemail/VoicemailPlaybackLayout.java
index 010f55f..3a1e196 100644
--- a/java/com/android/dialer/app/voicemail/VoicemailPlaybackLayout.java
+++ b/java/com/android/dialer/app/voicemail/VoicemailPlaybackLayout.java
@@ -114,7 +114,7 @@
                   Snackbar.LENGTH_LONG)
               .setDuration(VOICEMAIL_DELETE_DELAY_MS)
               .setAction(
-                  R.string.snackbar_voicemail_deleted_undo,
+                  R.string.snackbar_undo,
                   new View.OnClickListener() {
                     @Override
                     public void onClick(View view) {
@@ -234,7 +234,7 @@
         getResources().getDrawable(R.drawable.ic_voicemail_seek_handle, context.getTheme());
     voicemailSeekHandleDisabled =
         getResources()
-            .getDrawable(R.drawable.ic_voicemail_seek_handle_disabled, context.getTheme());
+            .getDrawable(R.drawable.old_ic_voicemail_seek_handle_disabled, context.getTheme());
   }
 
   @Override
@@ -276,7 +276,7 @@
   @Override
   public void onSpeakerphoneOn(boolean on) {
     if (on) {
-      playbackSpeakerphone.setImageResource(R.drawable.quantum_ic_volume_up_white_24);
+      playbackSpeakerphone.setImageResource(R.drawable.quantum_ic_volume_up_vd_theme_24);
       // Speaker is now on, tapping button will turn it off.
       playbackSpeakerphone.setContentDescription(context.getString(R.string.voicemail_speaker_off));
     } else {
diff --git a/java/com/android/dialer/app/voicemail/VoicemailPlaybackPresenter.java b/java/com/android/dialer/app/voicemail/VoicemailPlaybackPresenter.java
index 3a77334..95662a1 100644
--- a/java/com/android/dialer/app/voicemail/VoicemailPlaybackPresenter.java
+++ b/java/com/android/dialer/app/voicemail/VoicemailPlaybackPresenter.java
@@ -16,7 +16,6 @@
 
 package com.android.dialer.app.voicemail;
 
-import android.annotation.TargetApi;
 import android.app.Activity;
 import android.content.ContentResolver;
 import android.content.ContentUris;
@@ -24,10 +23,10 @@
 import android.content.Intent;
 import android.database.ContentObserver;
 import android.database.Cursor;
+import android.media.AudioManager;
 import android.media.MediaPlayer;
 import android.net.Uri;
 import android.os.AsyncTask;
-import android.os.Build.VERSION_CODES;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.PowerManager;
@@ -52,7 +51,7 @@
 import com.android.dialer.common.concurrent.AsyncTaskExecutors;
 import com.android.dialer.common.concurrent.DialerExecutor;
 import com.android.dialer.common.concurrent.DialerExecutorComponent;
-import com.android.dialer.configprovider.ConfigProviderBindings;
+import com.android.dialer.configprovider.ConfigProviderComponent;
 import com.android.dialer.constants.Constants;
 import com.android.dialer.logging.DialerImpression;
 import com.android.dialer.logging.Logger;
@@ -89,7 +88,6 @@
  * calls into this class from outside must be done from the main UI thread.
  */
 @NotThreadSafe
-@TargetApi(VERSION_CODES.M)
 public class VoicemailPlaybackPresenter
     implements MediaPlayer.OnPreparedListener,
         MediaPlayer.OnCompletionListener,
@@ -207,6 +205,8 @@
       position = savedInstanceState.getInt(CLIP_POSITION_KEY, 0);
       isPlaying = savedInstanceState.getBoolean(IS_PLAYING_STATE_KEY, false);
       isSpeakerphoneOn = savedInstanceState.getBoolean(IS_SPEAKERPHONE_ON_KEY, false);
+      AudioManager audioManager = activity.getSystemService(AudioManager.class);
+      audioManager.setSpeakerphoneOn(isSpeakerphoneOn);
     }
 
     if (mediaPlayer == null) {
@@ -591,7 +591,6 @@
 
     position = 0;
     isPlaying = false;
-    showShareVoicemailButton(false);
   }
 
   /** After done playing the voicemail clip, reset the clip position to the start. */
@@ -870,7 +869,9 @@
   }
 
   private static boolean isShareVoicemailAllowed(Context context) {
-    return ConfigProviderBindings.get(context).getBoolean(CONFIG_SHARE_VOICEMAIL_ALLOWED, true);
+    return ConfigProviderComponent.get(context)
+        .getConfigProvider()
+        .getBoolean(CONFIG_SHARE_VOICEMAIL_ALLOWED, true);
   }
 
   private static class ShareVoicemailWorker
@@ -960,7 +961,7 @@
       shareIntent.putExtra(Intent.EXTRA_STREAM, voicemailFileUri);
       shareIntent.putExtra(Intent.EXTRA_TEXT, transcription);
       shareIntent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
-      shareIntent.setType("*/*");
+      shareIntent.setType(context.getContentResolver().getType(voicemailFileUri));
     }
 
     return shareIntent;
diff --git a/java/com/android/dialer/assisteddialing/AndroidManifest.xml b/java/com/android/dialer/assisteddialing/AndroidManifest.xml
index a19af3b..3825c50 100644
--- a/java/com/android/dialer/assisteddialing/AndroidManifest.xml
+++ b/java/com/android/dialer/assisteddialing/AndroidManifest.xml
@@ -16,7 +16,7 @@
     package="com.android.dialer.assisteddialing">
 
   <uses-sdk
-      android:minSdkVersion="23"
-      android:targetSdkVersion="27"/>
+      android:minSdkVersion="24"
+      android:targetSdkVersion="28"/>
 
 </manifest>
diff --git a/java/com/android/dialer/assisteddialing/AssistedDialingMediator.java b/java/com/android/dialer/assisteddialing/AssistedDialingMediator.java
index 756fd61..6715e2b 100644
--- a/java/com/android/dialer/assisteddialing/AssistedDialingMediator.java
+++ b/java/com/android/dialer/assisteddialing/AssistedDialingMediator.java
@@ -16,8 +16,6 @@
 
 package com.android.dialer.assisteddialing;
 
-import android.annotation.TargetApi;
-import android.os.Build.VERSION_CODES;
 import android.support.annotation.NonNull;
 import java.util.Optional;
 
@@ -25,14 +23,10 @@
 public interface AssistedDialingMediator {
 
   /** Returns {@code true} if the current client platform supports Assisted Dialing. */
-  public boolean isPlatformEligible();
+  boolean isPlatformEligible();
 
   /** Returns the country code in which the library thinks the user typically resides. */
-  @SuppressWarnings("AndroidApiChecker") // Use of optional
-  @TargetApi(VERSION_CODES.N)
-  public Optional<String> userHomeCountryCode();
+  Optional<String> userHomeCountryCode();
 
-  @SuppressWarnings("AndroidApiChecker") // Use of optional
-  @TargetApi(VERSION_CODES.N)
-  public Optional<TransformationInfo> attemptAssistedDial(@NonNull String numberToTransform);
+  Optional<TransformationInfo> attemptAssistedDial(@NonNull String numberToTransform);
 }
diff --git a/java/com/android/dialer/assisteddialing/AssistedDialingMediatorImpl.java b/java/com/android/dialer/assisteddialing/AssistedDialingMediatorImpl.java
index 7214437..7fdb8da 100644
--- a/java/com/android/dialer/assisteddialing/AssistedDialingMediatorImpl.java
+++ b/java/com/android/dialer/assisteddialing/AssistedDialingMediatorImpl.java
@@ -16,10 +16,7 @@
 
 package com.android.dialer.assisteddialing;
 
-import android.annotation.TargetApi;
-import android.os.Build.VERSION_CODES;
 import android.support.annotation.NonNull;
-import android.support.annotation.RequiresApi;
 import com.android.dialer.common.LogUtil;
 import java.util.Optional;
 
@@ -30,7 +27,6 @@
  * call is eligible for assisted dialing, and performing the transformation of numbers eligible for
  * assisted dialing.
  */
-@RequiresApi(VERSION_CODES.N)
 final class AssistedDialingMediatorImpl implements AssistedDialingMediator {
 
   private final LocationDetector locationDetector;
@@ -58,8 +54,6 @@
 
   /** Returns the country code in which the library thinks the user typically resides. */
   @Override
-  @SuppressWarnings("AndroidApiChecker") // Use of optional
-  @TargetApi(VERSION_CODES.N)
   public Optional<String> userHomeCountryCode() {
     return locationDetector.getUpperCaseUserHomeCountry();
   }
@@ -69,8 +63,6 @@
    * transformed number should be capable of dialing out of the User's current country and
    * successfully connecting with a contact in the User's home country.
    */
-  @SuppressWarnings("AndroidApiChecker") // Use of optional
-  @TargetApi(VERSION_CODES.N)
   @Override
   public Optional<TransformationInfo> attemptAssistedDial(@NonNull String numberToTransform) {
     Optional<String> userHomeCountryCode = locationDetector.getUpperCaseUserHomeCountry();
diff --git a/java/com/android/dialer/assisteddialing/AssistedDialingMediatorStub.java b/java/com/android/dialer/assisteddialing/AssistedDialingMediatorStub.java
index 9a40e05..cb3ca79 100644
--- a/java/com/android/dialer/assisteddialing/AssistedDialingMediatorStub.java
+++ b/java/com/android/dialer/assisteddialing/AssistedDialingMediatorStub.java
@@ -16,8 +16,6 @@
 
 package com.android.dialer.assisteddialing;
 
-import android.annotation.TargetApi;
-import android.os.Build.VERSION_CODES;
 import android.support.annotation.NonNull;
 import java.util.Optional;
 
@@ -26,16 +24,12 @@
 
   /** Always returns an empty Optional. */
   @Override
-  @SuppressWarnings("AndroidApiChecker") // Use of optional
-  @TargetApi(VERSION_CODES.N)
   public Optional<TransformationInfo> attemptAssistedDial(@NonNull String numberToTransform) {
     return Optional.empty();
   }
 
   /** Always returns an empty Optional. */
   @Override
-  @SuppressWarnings("AndroidApiChecker") // Use of optional
-  @TargetApi(VERSION_CODES.N)
   public Optional<String> userHomeCountryCode() {
     return Optional.empty();
   }
diff --git a/java/com/android/dialer/assisteddialing/ConcreteCreator.java b/java/com/android/dialer/assisteddialing/ConcreteCreator.java
index dfd28a6..b4f926d 100644
--- a/java/com/android/dialer/assisteddialing/ConcreteCreator.java
+++ b/java/com/android/dialer/assisteddialing/ConcreteCreator.java
@@ -16,18 +16,15 @@
 
 package com.android.dialer.assisteddialing;
 
-import android.annotation.TargetApi;
 import android.content.Context;
 import android.os.Build;
-import android.os.Build.VERSION_CODES;
 import android.preference.PreferenceManager;
 import android.support.annotation.NonNull;
-import android.support.annotation.VisibleForTesting;
 import android.support.v4.os.UserManagerCompat;
 import android.telephony.TelephonyManager;
 import com.android.dialer.common.LogUtil;
 import com.android.dialer.configprovider.ConfigProvider;
-import com.android.dialer.configprovider.ConfigProviderBindings;
+import com.android.dialer.configprovider.ConfigProviderComponent;
 import com.android.dialer.strictmode.StrictModeUtils;
 
 /**
@@ -36,13 +33,11 @@
  * <p>This helps keep the dependencies required by AssistedDialingMediator for assisted dialing
  * explicit.
  */
-@TargetApi(VERSION_CODES.N)
 public final class ConcreteCreator {
 
-  // Floor set at N due to use of Optional.
-  @VisibleForTesting public static final int BUILD_CODE_FLOOR = Build.VERSION_CODES.N;
-  // Ceiling set at P because this feature will ship as part of the framework in Q.
-  @VisibleForTesting public static final int BUILD_CODE_CEILING = 28;
+  // Ceiling set at P (version code 28) because this feature will ship as part of the framework in
+  // Q.
+  public static final int BUILD_CODE_CEILING = 28;
 
   /**
    * Creates a new AssistedDialingMediator
@@ -55,7 +50,7 @@
   public static AssistedDialingMediator createNewAssistedDialingMediator(
       @NonNull TelephonyManager telephonyManager, @NonNull Context context) {
 
-    ConfigProvider configProvider = ConfigProviderBindings.get(context);
+    ConfigProvider configProvider = ConfigProviderComponent.get(context).getConfigProvider();
 
     if (telephonyManager == null) {
       LogUtil.i(
@@ -105,8 +100,7 @@
       throw new NullPointerException("Provided configProvider was null");
     }
 
-    return (Build.VERSION.SDK_INT >= BUILD_CODE_FLOOR
-            && Build.VERSION.SDK_INT <= BUILD_CODE_CEILING)
+    return Build.VERSION.SDK_INT <= BUILD_CODE_CEILING
         && configProvider.getBoolean("assisted_dialing_enabled", false);
   }
 
diff --git a/java/com/android/dialer/assisteddialing/Constraints.java b/java/com/android/dialer/assisteddialing/Constraints.java
index 788b875..41a3e92 100644
--- a/java/com/android/dialer/assisteddialing/Constraints.java
+++ b/java/com/android/dialer/assisteddialing/Constraints.java
@@ -16,15 +16,14 @@
 
 package com.android.dialer.assisteddialing;
 
-import android.annotation.TargetApi;
 import android.content.Context;
-import android.os.Build.VERSION_CODES;
 import android.support.annotation.NonNull;
 import android.telephony.PhoneNumberUtils;
 import android.text.TextUtils;
 import com.android.dialer.common.LogUtil;
 import com.android.dialer.logging.DialerImpression;
 import com.android.dialer.logging.Logger;
+import com.android.dialer.phonenumberutil.PhoneNumberHelper;
 import com.android.dialer.strictmode.StrictModeUtils;
 import com.google.i18n.phonenumbers.NumberParseException;
 import com.google.i18n.phonenumbers.PhoneNumberUtil;
@@ -34,8 +33,6 @@
 import java.util.Optional;
 
 /** Ensures that a number is eligible for Assisted Dialing */
-@TargetApi(VERSION_CODES.N)
-@SuppressWarnings("AndroidApiChecker") // Use of optional
 final class Constraints {
   private final PhoneNumberUtil phoneNumberUtil;
   private final Context context;
@@ -45,7 +42,7 @@
    * Create a new instance of Constraints.
    *
    * @param context The context used to determine whether or not a number is an emergency number.
-   * @param configProviderCountryCodes A csv of supported country codes, e.g. "US,CA"
+   * @param countryCodeProvider A csv of supported country codes, e.g. "US,CA"
    */
   public Constraints(@NonNull Context context, @NonNull CountryCodeProvider countryCodeProvider) {
     if (context == null) {
@@ -72,7 +69,7 @@
    * @return A boolean indicating whether or not the provided values are eligible for assisted
    *     dialing.
    */
-  public boolean meetsPreconditions(
+  boolean meetsPreconditions(
       @NonNull String numberToCheck,
       @NonNull String userHomeCountryCode,
       @NonNull String userRoamingCountryCode) {
@@ -209,7 +206,7 @@
     // roaming and out of service.
     boolean result =
         !PhoneNumberUtils.isEmergencyNumber(numberToCheck)
-            && !PhoneNumberUtils.isLocalEmergencyNumber(context, numberToCheck);
+            && !PhoneNumberHelper.isLocalEmergencyNumber(context, numberToCheck);
     LogUtil.i("Constraints.isNotEmergencyNumber", String.valueOf(result));
     return result;
   }
diff --git a/java/com/android/dialer/assisteddialing/CountryCodeProvider.java b/java/com/android/dialer/assisteddialing/CountryCodeProvider.java
index 118696e..04b2291 100644
--- a/java/com/android/dialer/assisteddialing/CountryCodeProvider.java
+++ b/java/com/android/dialer/assisteddialing/CountryCodeProvider.java
@@ -16,8 +16,6 @@
 
 package com.android.dialer.assisteddialing;
 
-import android.annotation.TargetApi;
-import android.os.Build.VERSION_CODES;
 import android.support.annotation.VisibleForTesting;
 import android.text.TextUtils;
 import android.util.ArraySet;
@@ -32,8 +30,6 @@
 import java.util.stream.Collectors;
 
 /** A class to provide the appropriate country codes related to assisted dialing. */
-@TargetApi(VERSION_CODES.N)
-@SuppressWarnings("AndroidApiChecker") // Java 8 APIs
 public final class CountryCodeProvider {
 
   // TODO(erfanian): Ensure the below standard is consistent between libphonenumber and the
diff --git a/java/com/android/dialer/assisteddialing/LocationDetector.java b/java/com/android/dialer/assisteddialing/LocationDetector.java
index 8e7535c..9fa9441 100644
--- a/java/com/android/dialer/assisteddialing/LocationDetector.java
+++ b/java/com/android/dialer/assisteddialing/LocationDetector.java
@@ -16,8 +16,6 @@
 
 package com.android.dialer.assisteddialing;
 
-import android.annotation.TargetApi;
-import android.os.Build.VERSION_CODES;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.telephony.TelephonyManager;
@@ -36,7 +34,7 @@
   private final TelephonyManager telephonyManager;
   private final String userProvidedHomeCountry;
 
-  public LocationDetector(
+  LocationDetector(
       @NonNull TelephonyManager telephonyManager, @Nullable String userProvidedHomeCountry) {
     if (telephonyManager == null) {
       throw new NullPointerException("Provided TelephonyManager was null");
@@ -53,9 +51,7 @@
    * Returns what we believe to be the User's home country. This should resolve to
    * PROPERTY_ICC_OPERATOR_ISO_COUNTRY
    */
-  @SuppressWarnings("AndroidApiChecker") // Use of optional
-  @TargetApi(VERSION_CODES.N)
-  public Optional<String> getUpperCaseUserHomeCountry() {
+  Optional<String> getUpperCaseUserHomeCountry() {
 
     if (!TextUtils.isEmpty(userProvidedHomeCountry)) {
       LogUtil.i(
@@ -73,9 +69,7 @@
   }
 
   /** Returns what we believe to be the User's current (roaming) country */
-  @SuppressWarnings("AndroidApiChecker") // Use of optional
-  @TargetApi(VERSION_CODES.N)
-  public Optional<String> getUpperCaseUserRoamingCountry() {
+  Optional<String> getUpperCaseUserRoamingCountry() {
     // TODO Increase coverage of location resolution??
     String networkCountryIso = telephonyManager.getNetworkCountryIso();
     if (networkCountryIso != null) {
diff --git a/java/com/android/dialer/assisteddialing/NumberTransformer.java b/java/com/android/dialer/assisteddialing/NumberTransformer.java
index 8bbad32..eabf856 100644
--- a/java/com/android/dialer/assisteddialing/NumberTransformer.java
+++ b/java/com/android/dialer/assisteddialing/NumberTransformer.java
@@ -16,9 +16,6 @@
 
 package com.android.dialer.assisteddialing;
 
-import android.annotation.TargetApi;
-import android.os.Build.VERSION_CODES;
-import android.support.annotation.NonNull;
 import android.text.TextUtils;
 import com.android.dialer.common.LogUtil;
 import com.android.dialer.strictmode.StrictModeUtils;
@@ -33,21 +30,9 @@
   private final PhoneNumberUtil phoneNumberUtil;
   private final Constraints constraints;
 
-  public NumberTransformer(Constraints constraints) {
+  NumberTransformer(Constraints constraints) {
     this.constraints = constraints;
-    this.phoneNumberUtil = StrictModeUtils.bypass(() -> PhoneNumberUtil.getInstance());
-  }
-
-  /**
-   * Returns a boolean for callers to quickly determine whether or not the AssistedDialingMediator
-   * thinks an attempt at assisted dialing is likely to succeed.
-   */
-  public boolean canDoAssistedDialingTransformation(
-      @NonNull String numberToCheck,
-      @NonNull String userHomeCountryCode,
-      @NonNull String userRoamingCountryCode) {
-    return constraints.meetsPreconditions(
-        numberToCheck, userHomeCountryCode, userRoamingCountryCode);
+    this.phoneNumberUtil = StrictModeUtils.bypass(PhoneNumberUtil::getInstance);
   }
 
   /**
@@ -57,9 +42,7 @@
    * transformation fails, we return an empty optional. The operation can be considered a success
    * when the Optional we return has a value set.
    */
-  @SuppressWarnings("AndroidApiChecker") // Use of optional
-  @TargetApi(VERSION_CODES.N)
-  public Optional<TransformationInfo> doAssistedDialingTransformation(
+  Optional<TransformationInfo> doAssistedDialingTransformation(
       String numbertoTransform, String userHomeCountryCode, String userRoamingCountryCode) {
 
     if (!constraints.meetsPreconditions(
diff --git a/java/com/android/dialer/assisteddialing/res/values-af/strings.xml b/java/com/android/dialer/assisteddialing/res/values-af/strings.xml
new file mode 100644
index 0000000..045e125
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/res/values-af/strings.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/res/values-am/strings.xml b/java/com/android/dialer/assisteddialing/res/values-am/strings.xml
new file mode 100644
index 0000000..045e125
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/res/values-am/strings.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/res/values-ar/strings.xml b/java/com/android/dialer/assisteddialing/res/values-ar/strings.xml
new file mode 100644
index 0000000..045e125
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/res/values-ar/strings.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/res/values-az/strings.xml b/java/com/android/dialer/assisteddialing/res/values-az/strings.xml
new file mode 100644
index 0000000..045e125
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/res/values-az/strings.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/res/values-b+sr+Latn/strings.xml b/java/com/android/dialer/assisteddialing/res/values-b+sr+Latn/strings.xml
new file mode 100644
index 0000000..045e125
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/res/values-b+sr+Latn/strings.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/res/values-be/strings.xml b/java/com/android/dialer/assisteddialing/res/values-be/strings.xml
new file mode 100644
index 0000000..045e125
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/res/values-be/strings.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/res/values-bg/strings.xml b/java/com/android/dialer/assisteddialing/res/values-bg/strings.xml
new file mode 100644
index 0000000..045e125
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/res/values-bg/strings.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/res/values-bn/strings.xml b/java/com/android/dialer/assisteddialing/res/values-bn/strings.xml
new file mode 100644
index 0000000..045e125
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/res/values-bn/strings.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/res/values-bs/strings.xml b/java/com/android/dialer/assisteddialing/res/values-bs/strings.xml
new file mode 100644
index 0000000..045e125
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/res/values-bs/strings.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/res/values-ca/strings.xml b/java/com/android/dialer/assisteddialing/res/values-ca/strings.xml
new file mode 100644
index 0000000..045e125
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/res/values-ca/strings.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/res/values-cs/strings.xml b/java/com/android/dialer/assisteddialing/res/values-cs/strings.xml
new file mode 100644
index 0000000..045e125
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/res/values-cs/strings.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/res/values-da/strings.xml b/java/com/android/dialer/assisteddialing/res/values-da/strings.xml
new file mode 100644
index 0000000..045e125
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/res/values-da/strings.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/res/values-de/strings.xml b/java/com/android/dialer/assisteddialing/res/values-de/strings.xml
new file mode 100644
index 0000000..045e125
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/res/values-de/strings.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/res/values-el/strings.xml b/java/com/android/dialer/assisteddialing/res/values-el/strings.xml
new file mode 100644
index 0000000..045e125
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/res/values-el/strings.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/res/values-en-rAU/strings.xml b/java/com/android/dialer/assisteddialing/res/values-en-rAU/strings.xml
new file mode 100644
index 0000000..045e125
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/res/values-en-rAU/strings.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/res/values-en-rGB/strings.xml b/java/com/android/dialer/assisteddialing/res/values-en-rGB/strings.xml
new file mode 100644
index 0000000..045e125
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/res/values-en-rGB/strings.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/res/values-en-rIN/strings.xml b/java/com/android/dialer/assisteddialing/res/values-en-rIN/strings.xml
new file mode 100644
index 0000000..045e125
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/res/values-en-rIN/strings.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/res/values-es-rUS/strings.xml b/java/com/android/dialer/assisteddialing/res/values-es-rUS/strings.xml
new file mode 100644
index 0000000..045e125
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/res/values-es-rUS/strings.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/res/values-es/strings.xml b/java/com/android/dialer/assisteddialing/res/values-es/strings.xml
new file mode 100644
index 0000000..045e125
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/res/values-es/strings.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/res/values-et/strings.xml b/java/com/android/dialer/assisteddialing/res/values-et/strings.xml
new file mode 100644
index 0000000..045e125
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/res/values-et/strings.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/res/values-eu/strings.xml b/java/com/android/dialer/assisteddialing/res/values-eu/strings.xml
new file mode 100644
index 0000000..045e125
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/res/values-eu/strings.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/res/values-fa/strings.xml b/java/com/android/dialer/assisteddialing/res/values-fa/strings.xml
new file mode 100644
index 0000000..045e125
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/res/values-fa/strings.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/res/values-fi/strings.xml b/java/com/android/dialer/assisteddialing/res/values-fi/strings.xml
new file mode 100644
index 0000000..045e125
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/res/values-fi/strings.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/res/values-fr-rCA/strings.xml b/java/com/android/dialer/assisteddialing/res/values-fr-rCA/strings.xml
new file mode 100644
index 0000000..045e125
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/res/values-fr-rCA/strings.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/res/values-fr/strings.xml b/java/com/android/dialer/assisteddialing/res/values-fr/strings.xml
new file mode 100644
index 0000000..045e125
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/res/values-fr/strings.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/res/values-gl/strings.xml b/java/com/android/dialer/assisteddialing/res/values-gl/strings.xml
new file mode 100644
index 0000000..045e125
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/res/values-gl/strings.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/res/values-gu/strings.xml b/java/com/android/dialer/assisteddialing/res/values-gu/strings.xml
new file mode 100644
index 0000000..045e125
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/res/values-gu/strings.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/res/values-hi/strings.xml b/java/com/android/dialer/assisteddialing/res/values-hi/strings.xml
new file mode 100644
index 0000000..045e125
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/res/values-hi/strings.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/res/values-hr/strings.xml b/java/com/android/dialer/assisteddialing/res/values-hr/strings.xml
new file mode 100644
index 0000000..045e125
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/res/values-hr/strings.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/res/values-hu/strings.xml b/java/com/android/dialer/assisteddialing/res/values-hu/strings.xml
new file mode 100644
index 0000000..045e125
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/res/values-hu/strings.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/res/values-hy/strings.xml b/java/com/android/dialer/assisteddialing/res/values-hy/strings.xml
new file mode 100644
index 0000000..045e125
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/res/values-hy/strings.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/res/values-in/strings.xml b/java/com/android/dialer/assisteddialing/res/values-in/strings.xml
new file mode 100644
index 0000000..045e125
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/res/values-in/strings.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/res/values-is/strings.xml b/java/com/android/dialer/assisteddialing/res/values-is/strings.xml
new file mode 100644
index 0000000..045e125
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/res/values-is/strings.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/res/values-it/strings.xml b/java/com/android/dialer/assisteddialing/res/values-it/strings.xml
new file mode 100644
index 0000000..045e125
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/res/values-it/strings.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/res/values-iw/strings.xml b/java/com/android/dialer/assisteddialing/res/values-iw/strings.xml
new file mode 100644
index 0000000..045e125
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/res/values-iw/strings.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/res/values-ja/strings.xml b/java/com/android/dialer/assisteddialing/res/values-ja/strings.xml
new file mode 100644
index 0000000..045e125
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/res/values-ja/strings.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/res/values-ka/strings.xml b/java/com/android/dialer/assisteddialing/res/values-ka/strings.xml
new file mode 100644
index 0000000..045e125
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/res/values-ka/strings.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/res/values-kk/strings.xml b/java/com/android/dialer/assisteddialing/res/values-kk/strings.xml
new file mode 100644
index 0000000..045e125
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/res/values-kk/strings.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/res/values-km/strings.xml b/java/com/android/dialer/assisteddialing/res/values-km/strings.xml
new file mode 100644
index 0000000..045e125
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/res/values-km/strings.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/res/values-kn/strings.xml b/java/com/android/dialer/assisteddialing/res/values-kn/strings.xml
new file mode 100644
index 0000000..045e125
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/res/values-kn/strings.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/res/values-ko/strings.xml b/java/com/android/dialer/assisteddialing/res/values-ko/strings.xml
new file mode 100644
index 0000000..045e125
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/res/values-ko/strings.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/res/values-ky/strings.xml b/java/com/android/dialer/assisteddialing/res/values-ky/strings.xml
new file mode 100644
index 0000000..045e125
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/res/values-ky/strings.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/res/values-lo/strings.xml b/java/com/android/dialer/assisteddialing/res/values-lo/strings.xml
new file mode 100644
index 0000000..045e125
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/res/values-lo/strings.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/res/values-lt/strings.xml b/java/com/android/dialer/assisteddialing/res/values-lt/strings.xml
new file mode 100644
index 0000000..045e125
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/res/values-lt/strings.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/res/values-lv/strings.xml b/java/com/android/dialer/assisteddialing/res/values-lv/strings.xml
new file mode 100644
index 0000000..045e125
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/res/values-lv/strings.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/res/values-mk/strings.xml b/java/com/android/dialer/assisteddialing/res/values-mk/strings.xml
new file mode 100644
index 0000000..045e125
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/res/values-mk/strings.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/res/values-ml/strings.xml b/java/com/android/dialer/assisteddialing/res/values-ml/strings.xml
new file mode 100644
index 0000000..045e125
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/res/values-ml/strings.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/res/values-mn/strings.xml b/java/com/android/dialer/assisteddialing/res/values-mn/strings.xml
new file mode 100644
index 0000000..045e125
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/res/values-mn/strings.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/res/values-mr/strings.xml b/java/com/android/dialer/assisteddialing/res/values-mr/strings.xml
new file mode 100644
index 0000000..045e125
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/res/values-mr/strings.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/res/values-ms/strings.xml b/java/com/android/dialer/assisteddialing/res/values-ms/strings.xml
new file mode 100644
index 0000000..045e125
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/res/values-ms/strings.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/res/values-my/strings.xml b/java/com/android/dialer/assisteddialing/res/values-my/strings.xml
new file mode 100644
index 0000000..045e125
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/res/values-my/strings.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/res/values-nb/strings.xml b/java/com/android/dialer/assisteddialing/res/values-nb/strings.xml
new file mode 100644
index 0000000..045e125
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/res/values-nb/strings.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/res/values-ne/strings.xml b/java/com/android/dialer/assisteddialing/res/values-ne/strings.xml
new file mode 100644
index 0000000..045e125
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/res/values-ne/strings.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/res/values-nl/strings.xml b/java/com/android/dialer/assisteddialing/res/values-nl/strings.xml
new file mode 100644
index 0000000..045e125
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/res/values-nl/strings.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/res/values-no/strings.xml b/java/com/android/dialer/assisteddialing/res/values-no/strings.xml
new file mode 100644
index 0000000..045e125
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/res/values-no/strings.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/res/values-pa/strings.xml b/java/com/android/dialer/assisteddialing/res/values-pa/strings.xml
new file mode 100644
index 0000000..045e125
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/res/values-pa/strings.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/res/values-pl/strings.xml b/java/com/android/dialer/assisteddialing/res/values-pl/strings.xml
new file mode 100644
index 0000000..045e125
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/res/values-pl/strings.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/res/values-pt-rBR/strings.xml b/java/com/android/dialer/assisteddialing/res/values-pt-rBR/strings.xml
new file mode 100644
index 0000000..045e125
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/res/values-pt-rBR/strings.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/res/values-pt-rPT/strings.xml b/java/com/android/dialer/assisteddialing/res/values-pt-rPT/strings.xml
new file mode 100644
index 0000000..045e125
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/res/values-pt-rPT/strings.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/res/values-pt/strings.xml b/java/com/android/dialer/assisteddialing/res/values-pt/strings.xml
new file mode 100644
index 0000000..045e125
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/res/values-pt/strings.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/res/values-ro/strings.xml b/java/com/android/dialer/assisteddialing/res/values-ro/strings.xml
new file mode 100644
index 0000000..045e125
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/res/values-ro/strings.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/res/values-ru/strings.xml b/java/com/android/dialer/assisteddialing/res/values-ru/strings.xml
new file mode 100644
index 0000000..045e125
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/res/values-ru/strings.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/res/values-si/strings.xml b/java/com/android/dialer/assisteddialing/res/values-si/strings.xml
new file mode 100644
index 0000000..045e125
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/res/values-si/strings.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/res/values-sk/strings.xml b/java/com/android/dialer/assisteddialing/res/values-sk/strings.xml
new file mode 100644
index 0000000..045e125
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/res/values-sk/strings.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/res/values-sl/strings.xml b/java/com/android/dialer/assisteddialing/res/values-sl/strings.xml
new file mode 100644
index 0000000..045e125
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/res/values-sl/strings.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/res/values-sq/strings.xml b/java/com/android/dialer/assisteddialing/res/values-sq/strings.xml
new file mode 100644
index 0000000..045e125
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/res/values-sq/strings.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/res/values-sr/strings.xml b/java/com/android/dialer/assisteddialing/res/values-sr/strings.xml
new file mode 100644
index 0000000..045e125
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/res/values-sr/strings.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/res/values-sv/strings.xml b/java/com/android/dialer/assisteddialing/res/values-sv/strings.xml
new file mode 100644
index 0000000..045e125
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/res/values-sv/strings.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/res/values-sw/strings.xml b/java/com/android/dialer/assisteddialing/res/values-sw/strings.xml
new file mode 100644
index 0000000..045e125
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/res/values-sw/strings.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/res/values-ta/strings.xml b/java/com/android/dialer/assisteddialing/res/values-ta/strings.xml
new file mode 100644
index 0000000..045e125
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/res/values-ta/strings.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/res/values-te/strings.xml b/java/com/android/dialer/assisteddialing/res/values-te/strings.xml
new file mode 100644
index 0000000..045e125
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/res/values-te/strings.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/res/values-th/strings.xml b/java/com/android/dialer/assisteddialing/res/values-th/strings.xml
new file mode 100644
index 0000000..045e125
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/res/values-th/strings.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/res/values-tl/strings.xml b/java/com/android/dialer/assisteddialing/res/values-tl/strings.xml
new file mode 100644
index 0000000..045e125
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/res/values-tl/strings.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/res/values-tr/strings.xml b/java/com/android/dialer/assisteddialing/res/values-tr/strings.xml
new file mode 100644
index 0000000..045e125
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/res/values-tr/strings.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/res/values-uk/strings.xml b/java/com/android/dialer/assisteddialing/res/values-uk/strings.xml
new file mode 100644
index 0000000..045e125
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/res/values-uk/strings.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/res/values-ur/strings.xml b/java/com/android/dialer/assisteddialing/res/values-ur/strings.xml
new file mode 100644
index 0000000..045e125
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/res/values-ur/strings.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/res/values-uz/strings.xml b/java/com/android/dialer/assisteddialing/res/values-uz/strings.xml
new file mode 100644
index 0000000..045e125
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/res/values-uz/strings.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/res/values-vi/strings.xml b/java/com/android/dialer/assisteddialing/res/values-vi/strings.xml
new file mode 100644
index 0000000..045e125
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/res/values-vi/strings.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/res/values-zh-rCN/strings.xml b/java/com/android/dialer/assisteddialing/res/values-zh-rCN/strings.xml
new file mode 100644
index 0000000..045e125
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/res/values-zh-rCN/strings.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/res/values-zh-rHK/strings.xml b/java/com/android/dialer/assisteddialing/res/values-zh-rHK/strings.xml
new file mode 100644
index 0000000..045e125
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/res/values-zh-rHK/strings.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/res/values-zh-rTW/strings.xml b/java/com/android/dialer/assisteddialing/res/values-zh-rTW/strings.xml
new file mode 100644
index 0000000..045e125
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/res/values-zh-rTW/strings.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/res/values-zu/strings.xml b/java/com/android/dialer/assisteddialing/res/values-zu/strings.xml
new file mode 100644
index 0000000..045e125
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/res/values-zu/strings.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/ui/AndroidManifest.xml b/java/com/android/dialer/assisteddialing/ui/AndroidManifest.xml
index 3e79de3..b0a1011 100644
--- a/java/com/android/dialer/assisteddialing/ui/AndroidManifest.xml
+++ b/java/com/android/dialer/assisteddialing/ui/AndroidManifest.xml
@@ -16,8 +16,8 @@
     package="com.android.dialer.assisteddialing.ui">
 
   <uses-sdk
-      android:minSdkVersion="23"
-      android:targetSdkVersion="27"/>
+      android:minSdkVersion="24"
+      android:targetSdkVersion="28"/>
 
   <application>
     <activity
diff --git a/java/com/android/dialer/assisteddialing/ui/AssistedDialingSettingFragment.java b/java/com/android/dialer/assisteddialing/ui/AssistedDialingSettingFragment.java
index f1ea4c9..2da2528 100644
--- a/java/com/android/dialer/assisteddialing/ui/AssistedDialingSettingFragment.java
+++ b/java/com/android/dialer/assisteddialing/ui/AssistedDialingSettingFragment.java
@@ -15,10 +15,8 @@
  */
 package com.android.dialer.assisteddialing.ui;
 
-import android.annotation.TargetApi;
 import android.icu.util.ULocale;
 import android.icu.util.ULocale.Builder;
-import android.os.Build.VERSION_CODES;
 import android.os.Bundle;
 import android.preference.ListPreference;
 import android.preference.Preference;
@@ -29,7 +27,7 @@
 import com.android.dialer.assisteddialing.ConcreteCreator;
 import com.android.dialer.assisteddialing.CountryCodeProvider;
 import com.android.dialer.common.LogUtil;
-import com.android.dialer.configprovider.ConfigProviderBindings;
+import com.android.dialer.configprovider.ConfigProviderComponent;
 import com.android.dialer.logging.DialerImpression;
 import com.android.dialer.logging.Logger;
 import com.google.auto.value.AutoValue;
@@ -38,8 +36,6 @@
 import java.util.Optional;
 
 /** The setting for Assisted Dialing */
-@TargetApi(VERSION_CODES.N)
-@SuppressWarnings("AndroidApiChecker") // Java 8 APIs
 public class AssistedDialingSettingFragment extends PreferenceFragment {
 
   private CountryCodeProvider countryCodeProvider;
@@ -70,7 +66,8 @@
             getContext().getSystemService(TelephonyManager.class), getContext());
 
     countryCodeProvider =
-        ConcreteCreator.getCountryCodeProvider(ConfigProviderBindings.get(getContext()));
+        ConcreteCreator.getCountryCodeProvider(
+            ConfigProviderComponent.get(getContext()).getConfigProvider());
 
     // Load the preferences from an XML resource
     addPreferencesFromResource(R.xml.assisted_dialing_setting);
diff --git a/java/com/android/dialer/assisteddialing/ui/res/values-af/strings.xml b/java/com/android/dialer/assisteddialing/ui/res/values-af/strings.xml
new file mode 100644
index 0000000..9a8ec72
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/ui/res/values-af/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="assisted_dialing_setting_title">Bystandoproep</string>
+  <string name="assisted_dialing_setting_summary">Voorspel en voeg \'n landskode by wanneer jy bel terwyl jy oorsee reis</string>
+  <string name="assisted_dialing_setting_cc_default_summary">Outomaties bespeur • %1$s</string>
+  <string name="assisted_dialing_setting_cc_default_summary_fallback">Outomaties bespeur</string>
+  <string name="assisted_dialing_setting_cc_category_title">Land van herkoms</string>
+  <string name="assisted_dialing_setting_cc_title">Verstek land van herkoms</string>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/ui/res/values-am/strings.xml b/java/com/android/dialer/assisteddialing/ui/res/values-am/strings.xml
new file mode 100644
index 0000000..6cd4039
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/ui/res/values-am/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="assisted_dialing_setting_title">የታገዘ መደወያ</string>
+  <string name="assisted_dialing_setting_summary">ወደ ውጭ አገር ሲጓዙ በሚደውሉ ጊዜ የአገር ኮድን ይተንብዩና ያክሉ</string>
+  <string name="assisted_dialing_setting_cc_default_summary">በራስ-ሰር ተገኝቷል • %1$s</string>
+  <string name="assisted_dialing_setting_cc_default_summary_fallback">በራስ-ሰር ተገኝቷል</string>
+  <string name="assisted_dialing_setting_cc_category_title">የትውልድ አገር</string>
+  <string name="assisted_dialing_setting_cc_title">ነባሪ መኖሪያ አገር</string>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/ui/res/values-ar/strings.xml b/java/com/android/dialer/assisteddialing/ui/res/values-ar/strings.xml
new file mode 100644
index 0000000..e54c0ec
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/ui/res/values-ar/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="assisted_dialing_setting_title">الطلب المساعد</string>
+  <string name="assisted_dialing_setting_summary">توقُع رمز البلد وإضافته عند إجراء مكالمة أثناء السفر خارج البلاد</string>
+  <string name="assisted_dialing_setting_cc_default_summary">تم الكشف تلقائيًا • %1$s</string>
+  <string name="assisted_dialing_setting_cc_default_summary_fallback">تم الكشف تلقائيًا</string>
+  <string name="assisted_dialing_setting_cc_category_title">الموطن</string>
+  <string name="assisted_dialing_setting_cc_title">الموطن التلقائي</string>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/ui/res/values-az/strings.xml b/java/com/android/dialer/assisteddialing/ui/res/values-az/strings.xml
new file mode 100644
index 0000000..2d1afa1
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/ui/res/values-az/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="assisted_dialing_setting_title">Dəstəkli nömrə yığımı</string>
+  <string name="assisted_dialing_setting_summary">Xaricə səyahət edərkən ölkə kodu bildirin və ya əlavə edin</string>
+  <string name="assisted_dialing_setting_cc_default_summary">Avtomatik aşkar edildi • %1$s</string>
+  <string name="assisted_dialing_setting_cc_default_summary_fallback">Avtomatik aşkar edildi</string>
+  <string name="assisted_dialing_setting_cc_category_title">Doğma ölkə</string>
+  <string name="assisted_dialing_setting_cc_title">Defolt doğma ölkə</string>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/ui/res/values-b+sr+Latn/strings.xml b/java/com/android/dialer/assisteddialing/ui/res/values-b+sr+Latn/strings.xml
new file mode 100644
index 0000000..30c5ecb
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/ui/res/values-b+sr+Latn/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="assisted_dialing_setting_title">Potpomognuto biranje</string>
+  <string name="assisted_dialing_setting_summary">Predvidi i dodaj pozivni broj za zemlju kad upućujem pozive iz inostranstva</string>
+  <string name="assisted_dialing_setting_cc_default_summary">Automatski izabrano • %1$s</string>
+  <string name="assisted_dialing_setting_cc_default_summary_fallback">Automatski izabrano</string>
+  <string name="assisted_dialing_setting_cc_category_title">Zemlja boravišta</string>
+  <string name="assisted_dialing_setting_cc_title">Podrazumevana zemlja boravišta</string>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/ui/res/values-be/strings.xml b/java/com/android/dialer/assisteddialing/ui/res/values-be/strings.xml
new file mode 100644
index 0000000..b8b5bd3
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/ui/res/values-be/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="assisted_dialing_setting_title">Памочнік набору</string>
+  <string name="assisted_dialing_setting_summary">Прадказваць і дадаваць код краіны, калі вы робіце выклік падчас падарожжа за мяжой</string>
+  <string name="assisted_dialing_setting_cc_default_summary">Вызначана аўтаматычна • %1$s</string>
+  <string name="assisted_dialing_setting_cc_default_summary_fallback">Вызначана аўтаматычна</string>
+  <string name="assisted_dialing_setting_cc_category_title">Краіна пражывання</string>
+  <string name="assisted_dialing_setting_cc_title">Стандартная краіна пражывання</string>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/ui/res/values-bg/strings.xml b/java/com/android/dialer/assisteddialing/ui/res/values-bg/strings.xml
new file mode 100644
index 0000000..2ee0374
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/ui/res/values-bg/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="assisted_dialing_setting_title">Подпомогнато набиране</string>
+  <string name="assisted_dialing_setting_summary">Предвиждане и добавяне на код на държавата, когато пътувате в чужбина</string>
+  <string name="assisted_dialing_setting_cc_default_summary">Автоматично установена • %1$s</string>
+  <string name="assisted_dialing_setting_cc_default_summary_fallback">Автоматично установена</string>
+  <string name="assisted_dialing_setting_cc_category_title">Родна държава</string>
+  <string name="assisted_dialing_setting_cc_title">Родна държава по подразбиране</string>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/ui/res/values-bn/strings.xml b/java/com/android/dialer/assisteddialing/ui/res/values-bn/strings.xml
new file mode 100644
index 0000000..c87929a
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/ui/res/values-bn/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="assisted_dialing_setting_title">সহায়তা যুক্ত ডায়ালিং</string>
+  <string name="assisted_dialing_setting_summary">আপনি বিদেশে থাকার সময় কল করলে একটি দেশের কোড অনুমান করে সেটি যোগ করুন</string>
+  <string name="assisted_dialing_setting_cc_default_summary">নিজে থেকে শনাক্ত করা হয় • %1$s</string>
+  <string name="assisted_dialing_setting_cc_default_summary_fallback">নিজে থেকে শনাক্ত করা হয়</string>
+  <string name="assisted_dialing_setting_cc_category_title">নিজের দেশ</string>
+  <string name="assisted_dialing_setting_cc_title">ডিফল্ট \'নিজের দেশ\'</string>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/ui/res/values-bs/strings.xml b/java/com/android/dialer/assisteddialing/ui/res/values-bs/strings.xml
new file mode 100644
index 0000000..a1b802e
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/ui/res/values-bs/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="assisted_dialing_setting_title">Potpomognuto biranje</string>
+  <string name="assisted_dialing_setting_summary">Predviđanje i dodavanje pozivnog broja zemlje prilikom pozivanja iz inostranstva</string>
+  <string name="assisted_dialing_setting_cc_default_summary">Automatski prepoznato • %1$s</string>
+  <string name="assisted_dialing_setting_cc_default_summary_fallback">Automatski prepoznato</string>
+  <string name="assisted_dialing_setting_cc_category_title">Matična zemlja</string>
+  <string name="assisted_dialing_setting_cc_title">Zadana matična zemlja</string>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/ui/res/values-ca/strings.xml b/java/com/android/dialer/assisteddialing/ui/res/values-ca/strings.xml
new file mode 100644
index 0000000..fd977b2
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/ui/res/values-ca/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="assisted_dialing_setting_title">Marcatge assistit</string>
+  <string name="assisted_dialing_setting_summary">Predigues i afegeix un codi de país en les trucades des de l\'estranger</string>
+  <string name="assisted_dialing_setting_cc_default_summary">Detectat automàticament • %1$s</string>
+  <string name="assisted_dialing_setting_cc_default_summary_fallback">Detectat automàticament</string>
+  <string name="assisted_dialing_setting_cc_category_title">País de residència</string>
+  <string name="assisted_dialing_setting_cc_title">País de residència predeterminat</string>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/ui/res/values-cs/strings.xml b/java/com/android/dialer/assisteddialing/ui/res/values-cs/strings.xml
new file mode 100644
index 0000000..135e576
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/ui/res/values-cs/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="assisted_dialing_setting_title">Asistované vytáčení</string>
+  <string name="assisted_dialing_setting_summary">Při volání v zahraničí odhadnout a přidat předvolbu země</string>
+  <string name="assisted_dialing_setting_cc_default_summary">Určeno automaticky • %1$s</string>
+  <string name="assisted_dialing_setting_cc_default_summary_fallback">Určeno automaticky</string>
+  <string name="assisted_dialing_setting_cc_category_title">Domovská země</string>
+  <string name="assisted_dialing_setting_cc_title">Výchozí domovská země</string>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/ui/res/values-da/strings.xml b/java/com/android/dialer/assisteddialing/ui/res/values-da/strings.xml
new file mode 100644
index 0000000..91527bb
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/ui/res/values-da/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="assisted_dialing_setting_title">Assisteret opkald</string>
+  <string name="assisted_dialing_setting_summary">Forudsig og tilføj en landekode, når du foretager et opkald, mens du er udenlands</string>
+  <string name="assisted_dialing_setting_cc_default_summary">Fundet automatisk • %1$s</string>
+  <string name="assisted_dialing_setting_cc_default_summary_fallback">Fundet automatisk</string>
+  <string name="assisted_dialing_setting_cc_category_title">Hjemland</string>
+  <string name="assisted_dialing_setting_cc_title">Standardhjemland</string>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/ui/res/values-de/strings.xml b/java/com/android/dialer/assisteddialing/ui/res/values-de/strings.xml
new file mode 100644
index 0000000..a61fb9d
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/ui/res/values-de/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="assisted_dialing_setting_title">Unterstützung für Nummerneingabe</string>
+  <string name="assisted_dialing_setting_summary">Hiermit wird eine Landesvorwahl vorgeschlagen und bei deinen Anrufen hinzugefügt, wenn du im Ausland unterwegs bist</string>
+  <string name="assisted_dialing_setting_cc_default_summary">Automatisch erkannt • %1$s</string>
+  <string name="assisted_dialing_setting_cc_default_summary_fallback">Automatisch erkannt</string>
+  <string name="assisted_dialing_setting_cc_category_title">Heimatland</string>
+  <string name="assisted_dialing_setting_cc_title">Heimatland (Standard)</string>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/ui/res/values-el/strings.xml b/java/com/android/dialer/assisteddialing/ui/res/values-el/strings.xml
new file mode 100644
index 0000000..f75170d
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/ui/res/values-el/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="assisted_dialing_setting_title">Υποβοηθούμενη κλήση</string>
+  <string name="assisted_dialing_setting_summary">Προβλέψτε και προσθέστε έναν κωδικό χώρας όταν καλείτε ενόσω ταξιδεύετε στο εξωτερικό</string>
+  <string name="assisted_dialing_setting_cc_default_summary">Εντοπίστηκε αυτόματα • %1$s</string>
+  <string name="assisted_dialing_setting_cc_default_summary_fallback">Εντοπίστηκε αυτόματα</string>
+  <string name="assisted_dialing_setting_cc_category_title">Χώρα καταγωγής</string>
+  <string name="assisted_dialing_setting_cc_title">Προεπιλεγμένη χώρα καταγωγής</string>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/ui/res/values-en-rAU/strings.xml b/java/com/android/dialer/assisteddialing/ui/res/values-en-rAU/strings.xml
new file mode 100644
index 0000000..778e7fc
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/ui/res/values-en-rAU/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="assisted_dialing_setting_title">Assisted dialling</string>
+  <string name="assisted_dialing_setting_summary">Predict and add a country code when you call while travelling abroad</string>
+  <string name="assisted_dialing_setting_cc_default_summary">Automatically detected • %1$s</string>
+  <string name="assisted_dialing_setting_cc_default_summary_fallback">Automatically detected</string>
+  <string name="assisted_dialing_setting_cc_category_title">Home country</string>
+  <string name="assisted_dialing_setting_cc_title">Default home country</string>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/ui/res/values-en-rGB/strings.xml b/java/com/android/dialer/assisteddialing/ui/res/values-en-rGB/strings.xml
new file mode 100644
index 0000000..778e7fc
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/ui/res/values-en-rGB/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="assisted_dialing_setting_title">Assisted dialling</string>
+  <string name="assisted_dialing_setting_summary">Predict and add a country code when you call while travelling abroad</string>
+  <string name="assisted_dialing_setting_cc_default_summary">Automatically detected • %1$s</string>
+  <string name="assisted_dialing_setting_cc_default_summary_fallback">Automatically detected</string>
+  <string name="assisted_dialing_setting_cc_category_title">Home country</string>
+  <string name="assisted_dialing_setting_cc_title">Default home country</string>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/ui/res/values-en-rIN/strings.xml b/java/com/android/dialer/assisteddialing/ui/res/values-en-rIN/strings.xml
new file mode 100644
index 0000000..778e7fc
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/ui/res/values-en-rIN/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="assisted_dialing_setting_title">Assisted dialling</string>
+  <string name="assisted_dialing_setting_summary">Predict and add a country code when you call while travelling abroad</string>
+  <string name="assisted_dialing_setting_cc_default_summary">Automatically detected • %1$s</string>
+  <string name="assisted_dialing_setting_cc_default_summary_fallback">Automatically detected</string>
+  <string name="assisted_dialing_setting_cc_category_title">Home country</string>
+  <string name="assisted_dialing_setting_cc_title">Default home country</string>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/ui/res/values-es-rUS/strings.xml b/java/com/android/dialer/assisteddialing/ui/res/values-es-rUS/strings.xml
new file mode 100644
index 0000000..cacd852
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/ui/res/values-es-rUS/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="assisted_dialing_setting_title">Marcado asistido</string>
+  <string name="assisted_dialing_setting_summary">Predecir el código del país y agregarlo cuando se realicen llamadas desde el exterior</string>
+  <string name="assisted_dialing_setting_cc_default_summary">Detectado automáticamente • %1$s</string>
+  <string name="assisted_dialing_setting_cc_default_summary_fallback">Detectado automáticamente</string>
+  <string name="assisted_dialing_setting_cc_category_title">País de origen</string>
+  <string name="assisted_dialing_setting_cc_title">País de origen predeterminado</string>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/ui/res/values-es/strings.xml b/java/com/android/dialer/assisteddialing/ui/res/values-es/strings.xml
new file mode 100644
index 0000000..5471e31
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/ui/res/values-es/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="assisted_dialing_setting_title">Marcación asistida</string>
+  <string name="assisted_dialing_setting_summary">Predecir y añadir un código de país al llamar desde el extranjero</string>
+  <string name="assisted_dialing_setting_cc_default_summary">Detectado automáticamente • %1$s</string>
+  <string name="assisted_dialing_setting_cc_default_summary_fallback">Detectado automáticamente</string>
+  <string name="assisted_dialing_setting_cc_category_title">País de origen</string>
+  <string name="assisted_dialing_setting_cc_title">País de origen predeterminado</string>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/ui/res/values-et/strings.xml b/java/com/android/dialer/assisteddialing/ui/res/values-et/strings.xml
new file mode 100644
index 0000000..0997ceb
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/ui/res/values-et/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="assisted_dialing_setting_title">Abistatud helistamine</string>
+  <string name="assisted_dialing_setting_summary">Välismaal reisimise ajal helistades riigikoodi määramine ja lisamine</string>
+  <string name="assisted_dialing_setting_cc_default_summary">Automaatselt tuvastatud • %1$s</string>
+  <string name="assisted_dialing_setting_cc_default_summary_fallback">Automaatselt tuvastatud</string>
+  <string name="assisted_dialing_setting_cc_category_title">Koduriik</string>
+  <string name="assisted_dialing_setting_cc_title">Vaikekoduriik</string>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/ui/res/values-eu/strings.xml b/java/com/android/dialer/assisteddialing/ui/res/values-eu/strings.xml
new file mode 100644
index 0000000..6caf46d
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/ui/res/values-eu/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="assisted_dialing_setting_title">Lagundutako markatzea</string>
+  <string name="assisted_dialing_setting_summary">Iragarri eta gehitu herrialde-kodea atzerrian nagoenean</string>
+  <string name="assisted_dialing_setting_cc_default_summary">Automatikoki detektatu da • %1$s</string>
+  <string name="assisted_dialing_setting_cc_default_summary_fallback">Automatikoki detektatu da</string>
+  <string name="assisted_dialing_setting_cc_category_title">Zure herrialdea</string>
+  <string name="assisted_dialing_setting_cc_title">Herrialde lehenetsia</string>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/ui/res/values-fa/strings.xml b/java/com/android/dialer/assisteddialing/ui/res/values-fa/strings.xml
new file mode 100644
index 0000000..66255fa
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/ui/res/values-fa/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="assisted_dialing_setting_title">شماره‌گیری کمکی</string>
+  <string name="assisted_dialing_setting_summary">پیش‌بینی و افزودن کد کشور وقتی در سفر خارجی تماس برقرار می‌کنید</string>
+  <string name="assisted_dialing_setting_cc_default_summary">به‌صورت خودکار شناسایی شد • %1$s</string>
+  <string name="assisted_dialing_setting_cc_default_summary_fallback">به‌صورت خودکار شناسایی شد</string>
+  <string name="assisted_dialing_setting_cc_category_title">کشور محل سکونت</string>
+  <string name="assisted_dialing_setting_cc_title">کشور محل سکونت پیش‌فرض</string>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/ui/res/values-fi/strings.xml b/java/com/android/dialer/assisteddialing/ui/res/values-fi/strings.xml
new file mode 100644
index 0000000..440642a
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/ui/res/values-fi/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="assisted_dialing_setting_title">Avustettu soittaminen</string>
+  <string name="assisted_dialing_setting_summary">Etsi ja lisää maakoodi ulkomailta soitettavia puheluita varten</string>
+  <string name="assisted_dialing_setting_cc_default_summary">Havaittu automaattisesti • %1$s</string>
+  <string name="assisted_dialing_setting_cc_default_summary_fallback">Havaittu automaattisesti</string>
+  <string name="assisted_dialing_setting_cc_category_title">Kotimaa</string>
+  <string name="assisted_dialing_setting_cc_title">Oletuskotimaa</string>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/ui/res/values-fr-rCA/strings.xml b/java/com/android/dialer/assisteddialing/ui/res/values-fr-rCA/strings.xml
new file mode 100644
index 0000000..81c87aa
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/ui/res/values-fr-rCA/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="assisted_dialing_setting_title">Composition assistée</string>
+  <string name="assisted_dialing_setting_summary">Prédire et ajouter un code de pays lorsque vous faites un appel lors d\'un voyage à l\'étranger</string>
+  <string name="assisted_dialing_setting_cc_default_summary">Pays détecté automatiquement • %1$s</string>
+  <string name="assisted_dialing_setting_cc_default_summary_fallback">Pays détecté automatiquement</string>
+  <string name="assisted_dialing_setting_cc_category_title">Pays d\'origine</string>
+  <string name="assisted_dialing_setting_cc_title">Pays d\'origine par défaut</string>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/ui/res/values-fr/strings.xml b/java/com/android/dialer/assisteddialing/ui/res/values-fr/strings.xml
new file mode 100644
index 0000000..0aad533
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/ui/res/values-fr/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="assisted_dialing_setting_title">Numérotation assistée</string>
+  <string name="assisted_dialing_setting_summary">Depuis l\'étranger, détecter le pays de destination de l\'appel et ajouter l\'indicatif correspondant</string>
+  <string name="assisted_dialing_setting_cc_default_summary">Détecté automatiquement • %1$s</string>
+  <string name="assisted_dialing_setting_cc_default_summary_fallback">Détecté automatiquement</string>
+  <string name="assisted_dialing_setting_cc_category_title">Pays d’origine</string>
+  <string name="assisted_dialing_setting_cc_title">Pays d\'origine par défaut</string>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/ui/res/values-gl/strings.xml b/java/com/android/dialer/assisteddialing/ui/res/values-gl/strings.xml
new file mode 100644
index 0000000..6edaf70
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/ui/res/values-gl/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="assisted_dialing_setting_title">Marcación asistida</string>
+  <string name="assisted_dialing_setting_summary">Cando chames desde o estranxeiro, detectar o país ao que estás chamando e engadir o seu prefixo</string>
+  <string name="assisted_dialing_setting_cc_default_summary">Detectado automaticamente • %1$s</string>
+  <string name="assisted_dialing_setting_cc_default_summary_fallback">Detectado automaticamente</string>
+  <string name="assisted_dialing_setting_cc_category_title">País de orixe</string>
+  <string name="assisted_dialing_setting_cc_title">País de orixe predeterminado</string>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/ui/res/values-gu/strings.xml b/java/com/android/dialer/assisteddialing/ui/res/values-gu/strings.xml
new file mode 100644
index 0000000..1f9a349
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/ui/res/values-gu/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="assisted_dialing_setting_title">સહાયિત ડાયલિંગ</string>
+  <string name="assisted_dialing_setting_summary">વિદેશમાં મુસાફરી કરતી વખતે જ્યારે તમે ફોન કરો, ત્યારે દેશના કોડનો અનુમાન લગાવીને તેને ઉમેરો</string>
+  <string name="assisted_dialing_setting_cc_default_summary">આપમેળે શોધાયેલ • %1$s</string>
+  <string name="assisted_dialing_setting_cc_default_summary_fallback">આપમેળે શોધાયેલ</string>
+  <string name="assisted_dialing_setting_cc_category_title">હોમ દેશ</string>
+  <string name="assisted_dialing_setting_cc_title">ડિફૉલ્ટ હોમ દેશ</string>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/ui/res/values-hi/strings.xml b/java/com/android/dialer/assisteddialing/ui/res/values-hi/strings.xml
new file mode 100644
index 0000000..527fc5b
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/ui/res/values-hi/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="assisted_dialing_setting_title">डायलिंग में सहायता</string>
+  <string name="assisted_dialing_setting_summary">विदेश यात्रा के दौरान कॉल करते समय अनुमान से देश का कोड जोड़ें</string>
+  <string name="assisted_dialing_setting_cc_default_summary">अपने आप पता लगाया गया • %1$s</string>
+  <string name="assisted_dialing_setting_cc_default_summary_fallback">अपने आप पता लगाया गया</string>
+  <string name="assisted_dialing_setting_cc_category_title">अपना देश</string>
+  <string name="assisted_dialing_setting_cc_title">डिफ़ॉल्ट रूप से अपना देश</string>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/ui/res/values-hr/strings.xml b/java/com/android/dialer/assisteddialing/ui/res/values-hr/strings.xml
new file mode 100644
index 0000000..d060a46
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/ui/res/values-hr/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="assisted_dialing_setting_title">Potpomognuto biranje</string>
+  <string name="assisted_dialing_setting_summary">Predvidite i dodajte pozivni broj zemlje kada putujete u inozemstvo.</string>
+  <string name="assisted_dialing_setting_cc_default_summary">Automatski odabrano • %1$s</string>
+  <string name="assisted_dialing_setting_cc_default_summary_fallback">Automatski odabrano</string>
+  <string name="assisted_dialing_setting_cc_category_title">Država</string>
+  <string name="assisted_dialing_setting_cc_title">Zadana država</string>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/ui/res/values-hu/strings.xml b/java/com/android/dialer/assisteddialing/ui/res/values-hu/strings.xml
new file mode 100644
index 0000000..fff78ea
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/ui/res/values-hu/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="assisted_dialing_setting_title">Támogatott tárcsázás</string>
+  <string name="assisted_dialing_setting_summary">Országhívószámok előrejelzése és hozzáadása külföldről indított híváskor</string>
+  <string name="assisted_dialing_setting_cc_default_summary">Automatikusan észlelve • %1$s</string>
+  <string name="assisted_dialing_setting_cc_default_summary_fallback">Automatikus észlelés</string>
+  <string name="assisted_dialing_setting_cc_category_title">Ország</string>
+  <string name="assisted_dialing_setting_cc_title">Alapértelmezett ország</string>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/ui/res/values-hy/strings.xml b/java/com/android/dialer/assisteddialing/ui/res/values-hy/strings.xml
new file mode 100644
index 0000000..cdf8ca9
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/ui/res/values-hy/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="assisted_dialing_setting_title">Օգնություն համարհավաքման ժամանակ</string>
+  <string name="assisted_dialing_setting_summary">Արտասահմանում գտնվելու ժամանակ զանգելիս երկրի կոդի կանխագուշակում և ավելացում</string>
+  <string name="assisted_dialing_setting_cc_default_summary">Ավտոմատ որոշված • %1$s</string>
+  <string name="assisted_dialing_setting_cc_default_summary_fallback">Ավտոմատ որոշված</string>
+  <string name="assisted_dialing_setting_cc_category_title">Բնակության երկիրը</string>
+  <string name="assisted_dialing_setting_cc_title">Բնակության կանխադրված երկիրը</string>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/ui/res/values-in/strings.xml b/java/com/android/dialer/assisteddialing/ui/res/values-in/strings.xml
new file mode 100644
index 0000000..d0b28ac
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/ui/res/values-in/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="assisted_dialing_setting_title">Panggilan Berbantu</string>
+  <string name="assisted_dialing_setting_summary">Memprediksi dan menambahkan kode negara saat menelepon dari luar negeri</string>
+  <string name="assisted_dialing_setting_cc_default_summary">Terdeteksi secara otomatis • %1$s</string>
+  <string name="assisted_dialing_setting_cc_default_summary_fallback">Terdeteksi secara otomatis</string>
+  <string name="assisted_dialing_setting_cc_category_title">Negara asal</string>
+  <string name="assisted_dialing_setting_cc_title">Negara asal default</string>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/ui/res/values-is/strings.xml b/java/com/android/dialer/assisteddialing/ui/res/values-is/strings.xml
new file mode 100644
index 0000000..006fbd2
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/ui/res/values-is/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="assisted_dialing_setting_title">Aðstoð við hringingar</string>
+  <string name="assisted_dialing_setting_summary">Bæta réttum landskóða við hringd símtöl þegar þú ferðast erlendis</string>
+  <string name="assisted_dialing_setting_cc_default_summary">Greint sjálfkrafa • %1$s</string>
+  <string name="assisted_dialing_setting_cc_default_summary_fallback">Greint sjálfkrafa</string>
+  <string name="assisted_dialing_setting_cc_category_title">Heimaland</string>
+  <string name="assisted_dialing_setting_cc_title">Sjálfgefið heimaland</string>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/ui/res/values-it/strings.xml b/java/com/android/dialer/assisteddialing/ui/res/values-it/strings.xml
new file mode 100644
index 0000000..78cdfdf
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/ui/res/values-it/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="assisted_dialing_setting_title">Composizione assistita</string>
+  <string name="assisted_dialing_setting_summary">Riconosci e aggiungi il prefisso internazionale quando chiami mentre ti trovi all\'estero</string>
+  <string name="assisted_dialing_setting_cc_default_summary">Rilevato automaticamente • %1$s</string>
+  <string name="assisted_dialing_setting_cc_default_summary_fallback">Rilevato automaticamente</string>
+  <string name="assisted_dialing_setting_cc_category_title">Paese d\'origine</string>
+  <string name="assisted_dialing_setting_cc_title">Paese d\'origine predefinito</string>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/ui/res/values-iw/strings.xml b/java/com/android/dialer/assisteddialing/ui/res/values-iw/strings.xml
new file mode 100644
index 0000000..a8f577e
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/ui/res/values-iw/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="assisted_dialing_setting_title">עזרה בחיוג</string>
+  <string name="assisted_dialing_setting_summary">חיזוי והוספה של קידומת החיוג למדינה כשמתקשרים מחו\"ל</string>
+  <string name="assisted_dialing_setting_cc_default_summary">זיהוי אוטומטי • %1$s</string>
+  <string name="assisted_dialing_setting_cc_default_summary_fallback">זיהוי אוטומטי</string>
+  <string name="assisted_dialing_setting_cc_category_title">מדינת הבית</string>
+  <string name="assisted_dialing_setting_cc_title">ברירת המחדל למדינת הבית</string>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/ui/res/values-ja/strings.xml b/java/com/android/dialer/assisteddialing/ui/res/values-ja/strings.xml
new file mode 100644
index 0000000..bd7e13f
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/ui/res/values-ja/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="assisted_dialing_setting_title">ダイヤル アシスト</string>
+  <string name="assisted_dialing_setting_summary">渡航先から通話を発信する際に、国コードの候補を自動的に追加</string>
+  <string name="assisted_dialing_setting_cc_default_summary">自動的に検出 • %1$s</string>
+  <string name="assisted_dialing_setting_cc_default_summary_fallback">自動的に検出</string>
+  <string name="assisted_dialing_setting_cc_category_title">居住国</string>
+  <string name="assisted_dialing_setting_cc_title">デフォルトの居住国</string>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/ui/res/values-ka/strings.xml b/java/com/android/dialer/assisteddialing/ui/res/values-ka/strings.xml
new file mode 100644
index 0000000..2aecc8e
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/ui/res/values-ka/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="assisted_dialing_setting_title">დახმარება ნომრის აკრეფაში</string>
+  <string name="assisted_dialing_setting_summary">ქვეყნის კოდის პროგნოზირება და დამატება საზღვარგარეთ მგზავრობის დროს დარეკვისას</string>
+  <string name="assisted_dialing_setting_cc_default_summary">ავტომატურად აღმოჩენილი • %1$s</string>
+  <string name="assisted_dialing_setting_cc_default_summary_fallback">ავტომატურად აღმოჩენილი</string>
+  <string name="assisted_dialing_setting_cc_category_title">მშობლიური ქვეყანა</string>
+  <string name="assisted_dialing_setting_cc_title">ნაგულისხმევი მშობლიური ქვეყანა</string>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/ui/res/values-kk/strings.xml b/java/com/android/dialer/assisteddialing/ui/res/values-kk/strings.xml
new file mode 100644
index 0000000..6a0f473
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/ui/res/values-kk/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="assisted_dialing_setting_title">Көмекпен теру</string>
+  <string name="assisted_dialing_setting_summary">Шетелге сапар барысында қоңырау шалу үшін ел кодын анықтау және қосу</string>
+  <string name="assisted_dialing_setting_cc_default_summary">Aвтоматты түрде анықталады • %1$s</string>
+  <string name="assisted_dialing_setting_cc_default_summary_fallback">Автоматты түрде анықталады</string>
+  <string name="assisted_dialing_setting_cc_category_title">Нөмір тіркелген ел</string>
+  <string name="assisted_dialing_setting_cc_title">Нөмір тіркелген әдепкі ел</string>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/ui/res/values-km/strings.xml b/java/com/android/dialer/assisteddialing/ui/res/values-km/strings.xml
new file mode 100644
index 0000000..36cae79
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/ui/res/values-km/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="assisted_dialing_setting_title">ការហៅទូរសព្ទ​ដោយ​មាន​ជំនួយ</string>
+  <string name="assisted_dialing_setting_summary">ទស្សន៍ទាយ និង​បញ្ចូល​កូដ​ប្រទេស នៅពេល​អ្នក​ហៅ​ទូរសព្ទ ពេល​ធ្វើ​ដំណើរ​ក្រៅ​ប្រទេស</string>
+  <string name="assisted_dialing_setting_cc_default_summary">បាន​រកឃើញ​ដោយ​ស្វ័យប្រវត្តិ • %1$s</string>
+  <string name="assisted_dialing_setting_cc_default_summary_fallback">បាន​រកឃើញ​ដោយស្វ័យប្រវត្តិ</string>
+  <string name="assisted_dialing_setting_cc_category_title">ប្រទេសកំណើត</string>
+  <string name="assisted_dialing_setting_cc_title">ប្រទេស​កំណើត​លំនាំដើម</string>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/ui/res/values-kn/strings.xml b/java/com/android/dialer/assisteddialing/ui/res/values-kn/strings.xml
new file mode 100644
index 0000000..cc61f67
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/ui/res/values-kn/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="assisted_dialing_setting_title">ಸಹಾಯಕ ಡಯಲಿಂಗ್</string>
+  <string name="assisted_dialing_setting_summary">ವಿದೇಶಕ್ಕೆ ಪ್ರಯಾಣಿಸುವ ಸಂದರ್ಭದಲ್ಲಿ ಕರೆ ಮಾಡುವಾಗ ಸಂದರ್ಭದಲ್ಲಿ ದೇಶದ ಕೋಡ್ ಅನ್ನು ಅಂದಾಜಿಸಿ ಮತ್ತು ಅದನ್ನು ಸೇರಿಸಿ</string>
+  <string name="assisted_dialing_setting_cc_default_summary">ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಪತ್ತೆಹಚ್ಚಲಾಗಿದೆ • %1$s</string>
+  <string name="assisted_dialing_setting_cc_default_summary_fallback">ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಪತ್ತೆಮಾಡಲಾಗಿದೆ</string>
+  <string name="assisted_dialing_setting_cc_category_title">ಸ್ವದೇಶ</string>
+  <string name="assisted_dialing_setting_cc_title">ಡೀಫಾಲ್ಟ್ ಮೂಲ ದೇಶ</string>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/ui/res/values-ko/strings.xml b/java/com/android/dialer/assisteddialing/ui/res/values-ko/strings.xml
new file mode 100644
index 0000000..7eace0d
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/ui/res/values-ko/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="assisted_dialing_setting_title">전화번호 도우미</string>
+  <string name="assisted_dialing_setting_summary">해외여행 중 전화를 걸면 국가 코드를 예측하여 추가</string>
+  <string name="assisted_dialing_setting_cc_default_summary">자동으로 감지 • %1$s</string>
+  <string name="assisted_dialing_setting_cc_default_summary_fallback">자동으로 감지</string>
+  <string name="assisted_dialing_setting_cc_category_title">국가</string>
+  <string name="assisted_dialing_setting_cc_title">기본 국가</string>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/ui/res/values-ky/strings.xml b/java/com/android/dialer/assisteddialing/ui/res/values-ky/strings.xml
new file mode 100644
index 0000000..c182ccb
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/ui/res/values-ky/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="assisted_dialing_setting_title">Жардам берилген терүү</string>
+  <string name="assisted_dialing_setting_summary">Чет өлкөдө саякаттап жүрүп, бирөөгө чалканда өлкө кодун алдын ала айтып, кошот</string>
+  <string name="assisted_dialing_setting_cc_default_summary">Автоматтык түрдө аныкталды • %1$s</string>
+  <string name="assisted_dialing_setting_cc_default_summary_fallback">Автоматтык түрдө аныкталат</string>
+  <string name="assisted_dialing_setting_cc_category_title">Мекени</string>
+  <string name="assisted_dialing_setting_cc_title">Демейки мекени</string>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/ui/res/values-lo/strings.xml b/java/com/android/dialer/assisteddialing/ui/res/values-lo/strings.xml
new file mode 100644
index 0000000..1c27ee1
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/ui/res/values-lo/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="assisted_dialing_setting_title">ກ່ອງຂໍ້ຄວາມແບບຊ່ວຍເຫຼືອ</string>
+  <string name="assisted_dialing_setting_summary">ຄາດເດົາ ແລະ ເພີ່ມລະຫັດປະເທດເມື່ອທ່ານໂທໃນລະຫວ່າງເດີນທາງຢູ່ຕ່າງປະເທດ</string>
+  <string name="assisted_dialing_setting_cc_default_summary">ກວດສອບອັດຕະໂນມັດ• %1$s</string>
+  <string name="assisted_dialing_setting_cc_default_summary_fallback">ກວດສອບອັດຕະໂນມັດ</string>
+  <string name="assisted_dialing_setting_cc_category_title">ປະເທດບ້ານເກີດ</string>
+  <string name="assisted_dialing_setting_cc_title">ປະເທດບ້ານເກີດເລີ່ມຕົ້ນ</string>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/ui/res/values-lt/strings.xml b/java/com/android/dialer/assisteddialing/ui/res/values-lt/strings.xml
new file mode 100644
index 0000000..ad6057c
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/ui/res/values-lt/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="assisted_dialing_setting_title">Pagalbinis numerio rinkimas</string>
+  <string name="assisted_dialing_setting_summary">Numatyti ir pridėti šalies kodą, kai skambinama keliaujant užsienyje</string>
+  <string name="assisted_dialing_setting_cc_default_summary">Automatiškai aptikta • %1$s</string>
+  <string name="assisted_dialing_setting_cc_default_summary_fallback">Automatiškai aptikta</string>
+  <string name="assisted_dialing_setting_cc_category_title">Gyvenamoji šalis</string>
+  <string name="assisted_dialing_setting_cc_title">Numatytoji gyvenamoji šalis</string>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/ui/res/values-lv/strings.xml b/java/com/android/dialer/assisteddialing/ui/res/values-lv/strings.xml
new file mode 100644
index 0000000..5840943
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/ui/res/values-lv/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="assisted_dialing_setting_title">Numura sastādīšanas palīdzība</string>
+  <string name="assisted_dialing_setting_summary">Prognozēt un pievienot valsts kodu, kad jūs zvanāt, atrodoties ārzemēs</string>
+  <string name="assisted_dialing_setting_cc_default_summary">Noteikta automātiski • %1$s</string>
+  <string name="assisted_dialing_setting_cc_default_summary_fallback">Noteikta automātiski</string>
+  <string name="assisted_dialing_setting_cc_category_title">Mītnes zeme</string>
+  <string name="assisted_dialing_setting_cc_title">Noklusējuma mītnes zeme</string>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/ui/res/values-mk/strings.xml b/java/com/android/dialer/assisteddialing/ui/res/values-mk/strings.xml
new file mode 100644
index 0000000..75da455
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/ui/res/values-mk/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="assisted_dialing_setting_title">Бирање со помош</string>
+  <string name="assisted_dialing_setting_summary">Предвидете и додајте код на земја кога повикувате додека патувате во странство</string>
+  <string name="assisted_dialing_setting_cc_default_summary">Автоматско откривање • %1$s</string>
+  <string name="assisted_dialing_setting_cc_default_summary_fallback">Автоматско откривање</string>
+  <string name="assisted_dialing_setting_cc_category_title">Земја на живеење</string>
+  <string name="assisted_dialing_setting_cc_title">Стандардна земја на живеење</string>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/ui/res/values-ml/strings.xml b/java/com/android/dialer/assisteddialing/ui/res/values-ml/strings.xml
new file mode 100644
index 0000000..818a178
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/ui/res/values-ml/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="assisted_dialing_setting_title">അസിസ്‌റ്റഡ് ഡയലിംഗ്</string>
+  <string name="assisted_dialing_setting_summary">വിദേശ യാത്രക്കിടയിൽ കോൾ ചെയ്യുമ്പോൾ രാജ്യത്തിന്റെ കോഡ് കണ്ടെത്തി നൽകുക</string>
+  <string name="assisted_dialing_setting_cc_default_summary">സ്വമേധയാ കണ്ടെത്തി • %1$s</string>
+  <string name="assisted_dialing_setting_cc_default_summary_fallback">സ്വമേധയാ കണ്ടെത്തി</string>
+  <string name="assisted_dialing_setting_cc_category_title">മാതൃ രാജ്യം</string>
+  <string name="assisted_dialing_setting_cc_title">ഡിഫോൾട്ട് ആയ മാതൃ രാജ്യം</string>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/ui/res/values-mn/strings.xml b/java/com/android/dialer/assisteddialing/ui/res/values-mn/strings.xml
new file mode 100644
index 0000000..c894c02
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/ui/res/values-mn/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="assisted_dialing_setting_title">Тусламжтай залгах</string>
+  <string name="assisted_dialing_setting_summary">Таныг гадаад оронд аялж байх үед урьдчилан таамаглаж улсын кодыг нэмнэ</string>
+  <string name="assisted_dialing_setting_cc_default_summary">Автоматаар таньсан • %1$s</string>
+  <string name="assisted_dialing_setting_cc_default_summary_fallback">Автоматаар таньсан</string>
+  <string name="assisted_dialing_setting_cc_category_title">Эх орон</string>
+  <string name="assisted_dialing_setting_cc_title">Өгөгдмөл эх орон</string>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/ui/res/values-mr/strings.xml b/java/com/android/dialer/assisteddialing/ui/res/values-mr/strings.xml
new file mode 100644
index 0000000..649c901
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/ui/res/values-mr/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="assisted_dialing_setting_title">साहाय्यक डायलिंग</string>
+  <string name="assisted_dialing_setting_summary">परदेशात प्रवास करत असताना, एखाद्या देशाच्या कोडचा अंदाज लावा आणि तो जोडा</string>
+  <string name="assisted_dialing_setting_cc_default_summary">आपोआप शोधले • %1$s</string>
+  <string name="assisted_dialing_setting_cc_default_summary_fallback">आपोआप शोधले</string>
+  <string name="assisted_dialing_setting_cc_category_title">मूळ देश</string>
+  <string name="assisted_dialing_setting_cc_title">डीफॉल्ट मूळ देश</string>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/ui/res/values-ms/strings.xml b/java/com/android/dialer/assisteddialing/ui/res/values-ms/strings.xml
new file mode 100644
index 0000000..da8fc4d
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/ui/res/values-ms/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="assisted_dialing_setting_title">Pendailan berbantu</string>
+  <string name="assisted_dialing_setting_summary">Ramalkan dan tambahkan kod negara apabila anda membuat panggilan semasa melancong ke luar negara</string>
+  <string name="assisted_dialing_setting_cc_default_summary">Dikesan secara automatik • %1$s</string>
+  <string name="assisted_dialing_setting_cc_default_summary_fallback">Dikesan secara automatik</string>
+  <string name="assisted_dialing_setting_cc_category_title">Negara asal</string>
+  <string name="assisted_dialing_setting_cc_title">Negara asal lalai</string>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/ui/res/values-my/strings.xml b/java/com/android/dialer/assisteddialing/ui/res/values-my/strings.xml
new file mode 100644
index 0000000..da41b12
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/ui/res/values-my/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="assisted_dialing_setting_title">အထောက်အကူပေး ဖုန်းခေါ်ဆိုမှု</string>
+  <string name="assisted_dialing_setting_summary">ပြည်ပခရီးသွားနေစဉ် ဖုန်းခေါ်ဆိုပါက နိုင်ငံကုဒ်ကို ခန့်မှန်းပြီး ထည့်ရန်</string>
+  <string name="assisted_dialing_setting_cc_default_summary">အလိုအလျောက် ရှာတွေ့ထားသည် • %1$s</string>
+  <string name="assisted_dialing_setting_cc_default_summary_fallback">အလိုအလျောက် ရှာတွေ့ထားသည်</string>
+  <string name="assisted_dialing_setting_cc_category_title">ပင်မ နိုင်ငံ</string>
+  <string name="assisted_dialing_setting_cc_title">မူလ ပင်မ နိုင်ငံ</string>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/ui/res/values-nb/strings.xml b/java/com/android/dialer/assisteddialing/ui/res/values-nb/strings.xml
new file mode 100644
index 0000000..23f17d5
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/ui/res/values-nb/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="assisted_dialing_setting_title">Hjelp med å slå numre</string>
+  <string name="assisted_dialing_setting_summary">Forutsi og legg til landkode når du ringer mens du er utenlands</string>
+  <string name="assisted_dialing_setting_cc_default_summary">Identifisert automatisk • %1$s</string>
+  <string name="assisted_dialing_setting_cc_default_summary_fallback">Identifisert automatisk</string>
+  <string name="assisted_dialing_setting_cc_category_title">Hjemland</string>
+  <string name="assisted_dialing_setting_cc_title">Standard hjemland</string>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/ui/res/values-ne/strings.xml b/java/com/android/dialer/assisteddialing/ui/res/values-ne/strings.xml
new file mode 100644
index 0000000..2a100b8
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/ui/res/values-ne/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="assisted_dialing_setting_title">सहायताप्राप्त डायल गर्ने सेवा</string>
+  <string name="assisted_dialing_setting_summary">विदेश यात्राको बेला कल गर्दा पूर्वानुमान सुविधाको प्रयोग गरी कुनै देशको कोड थप्नुहोस्</string>
+  <string name="assisted_dialing_setting_cc_default_summary">स्वत: पत्ता लाग्यो • %1$s</string>
+  <string name="assisted_dialing_setting_cc_default_summary_fallback">स्वत: पत्ता लाग्यो</string>
+  <string name="assisted_dialing_setting_cc_category_title">गृह देश</string>
+  <string name="assisted_dialing_setting_cc_title">पूर्वनिर्धारित गृह देश</string>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/ui/res/values-nl/strings.xml b/java/com/android/dialer/assisteddialing/ui/res/values-nl/strings.xml
new file mode 100644
index 0000000..18ca35d
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/ui/res/values-nl/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="assisted_dialing_setting_title">Ondersteund bellen</string>
+  <string name="assisted_dialing_setting_summary">Een landcode voorspellen en toevoegen wanneer je belt terwijl je in het buitenland bent</string>
+  <string name="assisted_dialing_setting_cc_default_summary">Automatisch gedetecteerd • %1$s</string>
+  <string name="assisted_dialing_setting_cc_default_summary_fallback">Automatisch gedetecteerd</string>
+  <string name="assisted_dialing_setting_cc_category_title">Thuisland</string>
+  <string name="assisted_dialing_setting_cc_title">Standaard thuisland</string>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/ui/res/values-no/strings.xml b/java/com/android/dialer/assisteddialing/ui/res/values-no/strings.xml
new file mode 100644
index 0000000..23f17d5
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/ui/res/values-no/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="assisted_dialing_setting_title">Hjelp med å slå numre</string>
+  <string name="assisted_dialing_setting_summary">Forutsi og legg til landkode når du ringer mens du er utenlands</string>
+  <string name="assisted_dialing_setting_cc_default_summary">Identifisert automatisk • %1$s</string>
+  <string name="assisted_dialing_setting_cc_default_summary_fallback">Identifisert automatisk</string>
+  <string name="assisted_dialing_setting_cc_category_title">Hjemland</string>
+  <string name="assisted_dialing_setting_cc_title">Standard hjemland</string>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/ui/res/values-pa/strings.xml b/java/com/android/dialer/assisteddialing/ui/res/values-pa/strings.xml
new file mode 100644
index 0000000..2292a23
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/ui/res/values-pa/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="assisted_dialing_setting_title">ਸਹਾਇਕ ਡਾਇਲਿੰਗ</string>
+  <string name="assisted_dialing_setting_summary">ਵਿਦੇਸ਼ ਯਾਤਰਾ ਦੌਰਾਨ ਕਾਲ ਕਰਨ ਸਮੇਂ ਅਨੁਮਾਨ ਲਗਾਓ ਅਤੇ ਇੱਕ ਦੇਸ਼ ਕੋਡ ਸ਼ਾਮਲ ਕਰੋ</string>
+  <string name="assisted_dialing_setting_cc_default_summary">ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਪਤਾ ਲਗਾਇਆ ਗਿਆ • %1$s</string>
+  <string name="assisted_dialing_setting_cc_default_summary_fallback">ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਪਤਾ ਲਗਾਇਆ ਗਿਆ</string>
+  <string name="assisted_dialing_setting_cc_category_title">ਮੂਲ ਦੇਸ਼</string>
+  <string name="assisted_dialing_setting_cc_title">ਪੂਰਵ-ਨਿਰਧਾਰਤ ਮੂਲ ਦੇਸ਼</string>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/ui/res/values-pl/strings.xml b/java/com/android/dialer/assisteddialing/ui/res/values-pl/strings.xml
new file mode 100644
index 0000000..a8433de
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/ui/res/values-pl/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="assisted_dialing_setting_title">Asystent wybierania numeru</string>
+  <string name="assisted_dialing_setting_summary">Przewiduj i dodawaj kod kraju, gdy dzwonisz podczas pobytu za granicą</string>
+  <string name="assisted_dialing_setting_cc_default_summary">Wykryty automatycznie • %1$s</string>
+  <string name="assisted_dialing_setting_cc_default_summary_fallback">Wykryty automatycznie</string>
+  <string name="assisted_dialing_setting_cc_category_title">Kraj pochodzenia</string>
+  <string name="assisted_dialing_setting_cc_title">Domyślny kraj pochodzenia</string>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/ui/res/values-pt-rBR/strings.xml b/java/com/android/dialer/assisteddialing/ui/res/values-pt-rBR/strings.xml
new file mode 100644
index 0000000..6e18342
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/ui/res/values-pt-rBR/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="assisted_dialing_setting_title">Discagem assistida</string>
+  <string name="assisted_dialing_setting_summary">Prever e adicionar um código de país nas chamadas feitas no exterior</string>
+  <string name="assisted_dialing_setting_cc_default_summary">Detectado automaticamente • %1$s</string>
+  <string name="assisted_dialing_setting_cc_default_summary_fallback">Detectado automaticamente</string>
+  <string name="assisted_dialing_setting_cc_category_title">País de origem</string>
+  <string name="assisted_dialing_setting_cc_title">País de origem padrão</string>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/ui/res/values-pt-rPT/strings.xml b/java/com/android/dialer/assisteddialing/ui/res/values-pt-rPT/strings.xml
new file mode 100644
index 0000000..ff71559
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/ui/res/values-pt-rPT/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="assisted_dialing_setting_title">Marcação assistida</string>
+  <string name="assisted_dialing_setting_summary">Prever e adicionar um código de país ao efetuar uma chamada durante uma viagem ao estrangeiro</string>
+  <string name="assisted_dialing_setting_cc_default_summary">Detetado automaticamente • %1$s</string>
+  <string name="assisted_dialing_setting_cc_default_summary_fallback">Detetado automaticamente</string>
+  <string name="assisted_dialing_setting_cc_category_title">País de origem</string>
+  <string name="assisted_dialing_setting_cc_title">País de origem predefinido</string>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/ui/res/values-pt/strings.xml b/java/com/android/dialer/assisteddialing/ui/res/values-pt/strings.xml
new file mode 100644
index 0000000..6e18342
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/ui/res/values-pt/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="assisted_dialing_setting_title">Discagem assistida</string>
+  <string name="assisted_dialing_setting_summary">Prever e adicionar um código de país nas chamadas feitas no exterior</string>
+  <string name="assisted_dialing_setting_cc_default_summary">Detectado automaticamente • %1$s</string>
+  <string name="assisted_dialing_setting_cc_default_summary_fallback">Detectado automaticamente</string>
+  <string name="assisted_dialing_setting_cc_category_title">País de origem</string>
+  <string name="assisted_dialing_setting_cc_title">País de origem padrão</string>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/ui/res/values-ro/strings.xml b/java/com/android/dialer/assisteddialing/ui/res/values-ro/strings.xml
new file mode 100644
index 0000000..24942fb
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/ui/res/values-ro/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="assisted_dialing_setting_title">Apelare asistată</string>
+  <string name="assisted_dialing_setting_summary">Sugerați și adăugați un prefix de țară când apelați din străinătate</string>
+  <string name="assisted_dialing_setting_cc_default_summary">Detectată automat • %1$s</string>
+  <string name="assisted_dialing_setting_cc_default_summary_fallback">Detectată automat</string>
+  <string name="assisted_dialing_setting_cc_category_title">Țara de origine</string>
+  <string name="assisted_dialing_setting_cc_title">Țara de origine prestabilită</string>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/ui/res/values-ru/strings.xml b/java/com/android/dialer/assisteddialing/ui/res/values-ru/strings.xml
new file mode 100644
index 0000000..f10af35
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/ui/res/values-ru/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="assisted_dialing_setting_title">Набор номера с подсказками</string>
+  <string name="assisted_dialing_setting_summary">Подсказывать и добавлять код страны при совершении звонков в поездках за границу</string>
+  <string name="assisted_dialing_setting_cc_default_summary">Определена автоматически • %1$s</string>
+  <string name="assisted_dialing_setting_cc_default_summary_fallback">Определена автоматически</string>
+  <string name="assisted_dialing_setting_cc_category_title">Страна проживания</string>
+  <string name="assisted_dialing_setting_cc_title">Страна проживания по умолчанию</string>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/ui/res/values-si/strings.xml b/java/com/android/dialer/assisteddialing/ui/res/values-si/strings.xml
new file mode 100644
index 0000000..0e37559
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/ui/res/values-si/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="assisted_dialing_setting_title">සහායක ඇමතීම</string>
+  <string name="assisted_dialing_setting_summary">ඔබ පිටරට සංචාරය කරන අතරතුර ඇමතීමේදී රටේ කේතය පුරෝකථනය කරන්න සහ එක් කරන්න</string>
+  <string name="assisted_dialing_setting_cc_default_summary">ස්වයංක්‍රියව අනාවරණය කර ගන්නා ලද • %1$s</string>
+  <string name="assisted_dialing_setting_cc_default_summary_fallback">ස්වයංක්‍රියව අනාවරණය කර ගන්නා ලද</string>
+  <string name="assisted_dialing_setting_cc_category_title">මව් රට</string>
+  <string name="assisted_dialing_setting_cc_title">පෙරනිමි මව් රට</string>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/ui/res/values-sk/strings.xml b/java/com/android/dialer/assisteddialing/ui/res/values-sk/strings.xml
new file mode 100644
index 0000000..134f834
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/ui/res/values-sk/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="assisted_dialing_setting_title">Asistované vytáčanie</string>
+  <string name="assisted_dialing_setting_summary">Pri volaní v zahraničí odhadnúť a pridať predvoľbu krajiny</string>
+  <string name="assisted_dialing_setting_cc_default_summary">Automaticky rozpoznané • %1$s</string>
+  <string name="assisted_dialing_setting_cc_default_summary_fallback">Automaticky rozpoznané</string>
+  <string name="assisted_dialing_setting_cc_category_title">Domovská krajina</string>
+  <string name="assisted_dialing_setting_cc_title">Predvolená domovská krajina</string>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/ui/res/values-sl/strings.xml b/java/com/android/dialer/assisteddialing/ui/res/values-sl/strings.xml
new file mode 100644
index 0000000..3a5c9aa
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/ui/res/values-sl/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="assisted_dialing_setting_title">Klicanje s pomočjo</string>
+  <string name="assisted_dialing_setting_summary">Predvidi in dodaj kodo države pri klicih med potovanjem v tujini</string>
+  <string name="assisted_dialing_setting_cc_default_summary">Samodejno zaznano • %1$s</string>
+  <string name="assisted_dialing_setting_cc_default_summary_fallback">Samodejno zaznano</string>
+  <string name="assisted_dialing_setting_cc_category_title">Domača država</string>
+  <string name="assisted_dialing_setting_cc_title">Privzeta domača država</string>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/ui/res/values-sq/strings.xml b/java/com/android/dialer/assisteddialing/ui/res/values-sq/strings.xml
new file mode 100644
index 0000000..17aae0c
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/ui/res/values-sq/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="assisted_dialing_setting_title">Telefonimi i ndihmuar</string>
+  <string name="assisted_dialing_setting_summary">Parashiko dhe shto një kod shteti kur telefonon gjatë udhëtimeve jashtë shtetit</string>
+  <string name="assisted_dialing_setting_cc_default_summary">Zbuluar automatikisht • %1$s</string>
+  <string name="assisted_dialing_setting_cc_default_summary_fallback">Zbuluar automatikisht</string>
+  <string name="assisted_dialing_setting_cc_category_title">Shteti bazë</string>
+  <string name="assisted_dialing_setting_cc_title">Shteti bazë i parazgjedhur</string>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/ui/res/values-sr/strings.xml b/java/com/android/dialer/assisteddialing/ui/res/values-sr/strings.xml
new file mode 100644
index 0000000..b28bd08
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/ui/res/values-sr/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="assisted_dialing_setting_title">Потпомогнуто бирање</string>
+  <string name="assisted_dialing_setting_summary">Предвиди и додај позивни број за земљу кад упућујем позиве из иностранства</string>
+  <string name="assisted_dialing_setting_cc_default_summary">Аутоматски изабрано • %1$s</string>
+  <string name="assisted_dialing_setting_cc_default_summary_fallback">Аутоматски изабрано</string>
+  <string name="assisted_dialing_setting_cc_category_title">Земља боравишта</string>
+  <string name="assisted_dialing_setting_cc_title">Подразумевана земља боравишта</string>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/ui/res/values-sv/strings.xml b/java/com/android/dialer/assisteddialing/ui/res/values-sv/strings.xml
new file mode 100644
index 0000000..fbcbee6
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/ui/res/values-sv/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="assisted_dialing_setting_title">Assisterad uppringning</string>
+  <string name="assisted_dialing_setting_summary">Förutse och lägg till landskod när du ringer utomlands</string>
+  <string name="assisted_dialing_setting_cc_default_summary">Automatiskt identifierat • %1$s</string>
+  <string name="assisted_dialing_setting_cc_default_summary_fallback">Automatiskt identifierat</string>
+  <string name="assisted_dialing_setting_cc_category_title">Hemland</string>
+  <string name="assisted_dialing_setting_cc_title">Standardhemland</string>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/ui/res/values-sw/strings.xml b/java/com/android/dialer/assisteddialing/ui/res/values-sw/strings.xml
new file mode 100644
index 0000000..4f428a1
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/ui/res/values-sw/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="assisted_dialing_setting_title">Upigaji simu unaosaidiwa</string>
+  <string name="assisted_dialing_setting_summary">Tabiri na uongeze nambari ya nchi wakati unapiga simu ukiwa unasafiri nje ya nchi</string>
+  <string name="assisted_dialing_setting_cc_default_summary">Imegunduliwa kiotomatiki • %1$s</string>
+  <string name="assisted_dialing_setting_cc_default_summary_fallback">Imegunduliwa kiotomatiki</string>
+  <string name="assisted_dialing_setting_cc_category_title">Nchi yako</string>
+  <string name="assisted_dialing_setting_cc_title">Nchi yako msingi</string>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/ui/res/values-ta/strings.xml b/java/com/android/dialer/assisteddialing/ui/res/values-ta/strings.xml
new file mode 100644
index 0000000..0157e56
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/ui/res/values-ta/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="assisted_dialing_setting_title">அழைப்பை மேற்கொள்வதற்கான உதவி</string>
+  <string name="assisted_dialing_setting_summary">வெளிநாட்டிற்குப் பயணிக்கும் போது, பிறரை அழைத்தால் அந்த நாட்டின் தேசக் குறியீட்டைக் கணித்து, சேர்க்கும்</string>
+  <string name="assisted_dialing_setting_cc_default_summary">தானாகக் கண்டறியப்பட்டது • %1$s</string>
+  <string name="assisted_dialing_setting_cc_default_summary_fallback">தானாகக் கண்டறியப்பட்டது</string>
+  <string name="assisted_dialing_setting_cc_category_title">சொந்த நாடு</string>
+  <string name="assisted_dialing_setting_cc_title">சொந்த நாடு (இயல்பு)</string>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/ui/res/values-te/strings.xml b/java/com/android/dialer/assisteddialing/ui/res/values-te/strings.xml
new file mode 100644
index 0000000..9bba6b5
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/ui/res/values-te/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="assisted_dialing_setting_title">సహాయక డయలింగ్</string>
+  <string name="assisted_dialing_setting_summary">మీరు విదేశాల్లో ప్రయాణిస్తున్నప్పుడు కాల్ చేసేటప్పుడు దేశం కోడ్‌ని ఊహించి, జోడించండి</string>
+  <string name="assisted_dialing_setting_cc_default_summary">స్వయంచాలకంగా గుర్తించబడింది • %1$s</string>
+  <string name="assisted_dialing_setting_cc_default_summary_fallback">స్వయంచాలకంగా గుర్తించబడింది</string>
+  <string name="assisted_dialing_setting_cc_category_title">స్వదేశం</string>
+  <string name="assisted_dialing_setting_cc_title">డిఫాల్ట్ స్వదేశం</string>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/ui/res/values-th/strings.xml b/java/com/android/dialer/assisteddialing/ui/res/values-th/strings.xml
new file mode 100644
index 0000000..6ff37cd
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/ui/res/values-th/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="assisted_dialing_setting_title">ระบบช่วยโทรออก</string>
+  <string name="assisted_dialing_setting_summary">คาดเดาและเพิ่มรหัสประเทศให้เมื่อคุณโทรศัพท์ขณะอยู่ต่างประเทศ</string>
+  <string name="assisted_dialing_setting_cc_default_summary">ตรวจหาโดยอัตโนมัติ • %1$s</string>
+  <string name="assisted_dialing_setting_cc_default_summary_fallback">ตรวจหาโดยอัตโนมัติ</string>
+  <string name="assisted_dialing_setting_cc_category_title">ประเทศบ้านเกิด</string>
+  <string name="assisted_dialing_setting_cc_title">ประเทศบ้านเกิดที่เป็นค่าเริ่มต้น</string>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/ui/res/values-tl/strings.xml b/java/com/android/dialer/assisteddialing/ui/res/values-tl/strings.xml
new file mode 100644
index 0000000..9de0c98
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/ui/res/values-tl/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="assisted_dialing_setting_title">Tinutulungan na pag-dial</string>
+  <string name="assisted_dialing_setting_summary">Hulaan at magdagdag ng code ng bansa kapag tumatawag ka habang naglalakbay sa ibang bansa</string>
+  <string name="assisted_dialing_setting_cc_default_summary">Awtomatikong nakita • %1$s</string>
+  <string name="assisted_dialing_setting_cc_default_summary_fallback">Awtomatikong nakita</string>
+  <string name="assisted_dialing_setting_cc_category_title">Sariling bansa</string>
+  <string name="assisted_dialing_setting_cc_title">Default na sariling bansa</string>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/ui/res/values-tr/strings.xml b/java/com/android/dialer/assisteddialing/ui/res/values-tr/strings.xml
new file mode 100644
index 0000000..5e66f4f
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/ui/res/values-tr/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="assisted_dialing_setting_title">Yardımlı arama</string>
+  <string name="assisted_dialing_setting_summary">Yurt dışı seyahatiniz sırasında telefon ederken ülke kodu tahmin edilip eklenir</string>
+  <string name="assisted_dialing_setting_cc_default_summary">Otomatik olarak algılandı • %1$s</string>
+  <string name="assisted_dialing_setting_cc_default_summary_fallback">Otomatik olarak algılandı</string>
+  <string name="assisted_dialing_setting_cc_category_title">Ana vatan</string>
+  <string name="assisted_dialing_setting_cc_title">Varsayılan ana vatan</string>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/ui/res/values-uk/strings.xml b/java/com/android/dialer/assisteddialing/ui/res/values-uk/strings.xml
new file mode 100644
index 0000000..775016f
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/ui/res/values-uk/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="assisted_dialing_setting_title">Помічник набору</string>
+  <string name="assisted_dialing_setting_summary">Передбачення й додавання коду країни, коли ви телефонуєте з-за кордону</string>
+  <string name="assisted_dialing_setting_cc_default_summary">Визначено автоматично • %1$s</string>
+  <string name="assisted_dialing_setting_cc_default_summary_fallback">Визначено автоматично</string>
+  <string name="assisted_dialing_setting_cc_category_title">Країна проживання</string>
+  <string name="assisted_dialing_setting_cc_title">Країна проживання за умовчанням</string>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/ui/res/values-ur/strings.xml b/java/com/android/dialer/assisteddialing/ui/res/values-ur/strings.xml
new file mode 100644
index 0000000..def7fa9
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/ui/res/values-ur/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="assisted_dialing_setting_title">معاون ڈائلنگ</string>
+  <string name="assisted_dialing_setting_summary">بیرون ملک سفر کرتے وقت جب آپ کال کریں تو ملکی کوڈ کی پیشنگوئی کریں اور شامل کریں</string>
+  <string name="assisted_dialing_setting_cc_default_summary">خودکار طور منتخب شدہ • %1$s</string>
+  <string name="assisted_dialing_setting_cc_default_summary_fallback">خودکار طور منتخب شدہ</string>
+  <string name="assisted_dialing_setting_cc_category_title">آبائی ملک</string>
+  <string name="assisted_dialing_setting_cc_title">ڈیفالٹ آبائی ملک</string>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/ui/res/values-uz/strings.xml b/java/com/android/dialer/assisteddialing/ui/res/values-uz/strings.xml
new file mode 100644
index 0000000..e50d997
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/ui/res/values-uz/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="assisted_dialing_setting_title">Raqamni maslahatlar bilan terish</string>
+  <string name="assisted_dialing_setting_summary">Chet elda chaqiruvlarni amalga oshirishda mamlakat kodi avtomatik aniqlansin va kiritilsin</string>
+  <string name="assisted_dialing_setting_cc_default_summary">Avtomatik aniqlandi • %1$s</string>
+  <string name="assisted_dialing_setting_cc_default_summary_fallback">Avtomatik aniqlandi</string>
+  <string name="assisted_dialing_setting_cc_category_title">Mamlakatingiz</string>
+  <string name="assisted_dialing_setting_cc_title">Birlamchi mamlakatingiz</string>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/ui/res/values-vi/strings.xml b/java/com/android/dialer/assisteddialing/ui/res/values-vi/strings.xml
new file mode 100644
index 0000000..d779a90
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/ui/res/values-vi/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="assisted_dialing_setting_title">Quay số được hỗ trợ</string>
+  <string name="assisted_dialing_setting_summary">Dự đoán và thêm mã quốc gia khi bạn gọi trong khi đi du lịch nước ngoài</string>
+  <string name="assisted_dialing_setting_cc_default_summary">Được phát hiện tự động • %1$s</string>
+  <string name="assisted_dialing_setting_cc_default_summary_fallback">Được phát hiện tự động</string>
+  <string name="assisted_dialing_setting_cc_category_title">Quốc gia sở tại</string>
+  <string name="assisted_dialing_setting_cc_title">Quốc gia sở tại mặc định</string>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/ui/res/values-zh-rCN/strings.xml b/java/com/android/dialer/assisteddialing/ui/res/values-zh-rCN/strings.xml
new file mode 100644
index 0000000..7a6d70f
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/ui/res/values-zh-rCN/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="assisted_dialing_setting_title">辅助拨号</string>
+  <string name="assisted_dialing_setting_summary">当您在国外的旅途中拨打电话时，预测并添加国家/地区代码。</string>
+  <string name="assisted_dialing_setting_cc_default_summary">自动检测 • %1$s</string>
+  <string name="assisted_dialing_setting_cc_default_summary_fallback">自动检测</string>
+  <string name="assisted_dialing_setting_cc_category_title">居住国家/地区</string>
+  <string name="assisted_dialing_setting_cc_title">默认居住国家/地区</string>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/ui/res/values-zh-rHK/strings.xml b/java/com/android/dialer/assisteddialing/ui/res/values-zh-rHK/strings.xml
new file mode 100644
index 0000000..6340c1d
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/ui/res/values-zh-rHK/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="assisted_dialing_setting_title">輔助撥號</string>
+  <string name="assisted_dialing_setting_summary">在國外撥打電話時預測並新增國家/地區代碼</string>
+  <string name="assisted_dialing_setting_cc_default_summary">自動偵測 • %1$s</string>
+  <string name="assisted_dialing_setting_cc_default_summary_fallback">自動偵測</string>
+  <string name="assisted_dialing_setting_cc_category_title">居住國家/地區</string>
+  <string name="assisted_dialing_setting_cc_title">預設居住國家/地區</string>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/ui/res/values-zh-rTW/strings.xml b/java/com/android/dialer/assisteddialing/ui/res/values-zh-rTW/strings.xml
new file mode 100644
index 0000000..b96e790
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/ui/res/values-zh-rTW/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="assisted_dialing_setting_title">輔助撥號</string>
+  <string name="assisted_dialing_setting_summary">從其他國家/地區打電話時，自動預測並新增國家/地區代碼</string>
+  <string name="assisted_dialing_setting_cc_default_summary">自動偵測 • %1$s</string>
+  <string name="assisted_dialing_setting_cc_default_summary_fallback">自動偵測</string>
+  <string name="assisted_dialing_setting_cc_category_title">居住國家/地區</string>
+  <string name="assisted_dialing_setting_cc_title">預設居住國家/地區</string>
+</resources>
diff --git a/java/com/android/dialer/assisteddialing/ui/res/values-zu/strings.xml b/java/com/android/dialer/assisteddialing/ui/res/values-zu/strings.xml
new file mode 100644
index 0000000..77d9cf2
--- /dev/null
+++ b/java/com/android/dialer/assisteddialing/ui/res/values-zu/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="assisted_dialing_setting_title">Ukushaya okusizwayo</string>
+  <string name="assisted_dialing_setting_summary">Qagela futhi ungeze ikhodi yezwe uma ushaya ngenkathi uya ngaphesheya</string>
+  <string name="assisted_dialing_setting_cc_default_summary">Kutholakele ngokuzenzakalelayo • %1$s</string>
+  <string name="assisted_dialing_setting_cc_default_summary_fallback">Itholwe ngokuzenzakalela</string>
+  <string name="assisted_dialing_setting_cc_category_title">Izwe lasekhaya</string>
+  <string name="assisted_dialing_setting_cc_title">Izwe lasekhaya lokuzenzakalelayo</string>
+</resources>
diff --git a/java/com/android/dialer/binary/aosp/AospDialerRootComponent.java b/java/com/android/dialer/binary/aosp/AospDialerRootComponent.java
index 35f8540..8181e21 100644
--- a/java/com/android/dialer/binary/aosp/AospDialerRootComponent.java
+++ b/java/com/android/dialer/binary/aosp/AospDialerRootComponent.java
@@ -16,11 +16,15 @@
 
 package com.android.dialer.binary.aosp;
 
+import com.android.bubble.stub.StubBubbleModule;
+import com.android.dialer.activecalls.ActiveCallsModule;
 import com.android.dialer.binary.basecomponent.BaseDialerRootComponent;
 import com.android.dialer.calllog.CallLogModule;
+import com.android.dialer.calllog.config.CallLogConfigModule;
 import com.android.dialer.commandline.CommandLineModule;
 import com.android.dialer.common.concurrent.DialerExecutorModule;
 import com.android.dialer.configprovider.SharedPrefConfigProviderModule;
+import com.android.dialer.contacts.ContactsModule;
 import com.android.dialer.duo.stub.StubDuoModule;
 import com.android.dialer.enrichedcall.stub.StubEnrichedCallModule;
 import com.android.dialer.feedback.stub.StubFeedbackModule;
@@ -30,16 +34,18 @@
 import com.android.dialer.phonelookup.PhoneLookupModule;
 import com.android.dialer.phonenumbergeoutil.impl.PhoneNumberGeoUtilModule;
 import com.android.dialer.precall.impl.PreCallModule;
+import com.android.dialer.preferredsim.PreferredSimModule;
 import com.android.dialer.preferredsim.suggestion.stub.StubSimSuggestionModule;
+import com.android.dialer.promotion.impl.PromotionModule;
 import com.android.dialer.simulator.impl.SimulatorModule;
 import com.android.dialer.simulator.stub.StubSimulatorEnrichedCallModule;
-import com.android.dialer.spam.StubSpamModule;
+import com.android.dialer.spam.stub.StubSpamModule;
 import com.android.dialer.storage.StorageModule;
 import com.android.dialer.strictmode.impl.SystemStrictModeModule;
+import com.android.dialer.theme.base.impl.AospThemeModule;
 import com.android.incallui.calllocation.stub.StubCallLocationModule;
 import com.android.incallui.maps.stub.StubMapsModule;
 import com.android.incallui.speakeasy.StubSpeakEasyModule;
-import com.android.newbubble.stub.StubNewBubbleModule;
 import com.android.voicemail.impl.VoicemailModule;
 import dagger.Component;
 import javax.inject.Singleton;
@@ -47,31 +53,36 @@
 /** Root component for the AOSP Dialer application. */
 @Singleton
 @Component(
-  modules = {
-    CallLogModule.class,
-    CommandLineModule.class,
-    ContextModule.class,
-    DialerExecutorModule.class,
-    GlidePhotoManagerModule.class,
-    PhoneLookupModule.class,
-    PhoneNumberGeoUtilModule.class,
-    PreCallModule.class,
-    SharedPrefConfigProviderModule.class,
-    SimulatorModule.class,
-    StubSimulatorEnrichedCallModule.class,
-    StorageModule.class,
-    StubCallLocationModule.class,
-    StubDuoModule.class,
-    StubEnrichedCallModule.class,
-    StubNewBubbleModule.class,
-    StubMetricsModule.class,
-    StubFeedbackModule.class,
-    StubMapsModule.class,
-    StubSimSuggestionModule.class,
-    StubSpamModule.class,
-    StubSpeakEasyModule.class,
-    SystemStrictModeModule.class,
-    VoicemailModule.class,
-  }
-)
+    modules = {
+      ActiveCallsModule.class,
+      CallLogModule.class,
+      CallLogConfigModule.class,
+      CommandLineModule.class,
+      ContactsModule.class,
+      ContextModule.class,
+      DialerExecutorModule.class,
+      GlidePhotoManagerModule.class,
+      PhoneLookupModule.class,
+      PhoneNumberGeoUtilModule.class,
+      PreCallModule.class,
+      PreferredSimModule.class,
+      PromotionModule.class,
+      SharedPrefConfigProviderModule.class,
+      SimulatorModule.class,
+      StubSimulatorEnrichedCallModule.class,
+      StorageModule.class,
+      StubCallLocationModule.class,
+      StubDuoModule.class,
+      StubEnrichedCallModule.class,
+      StubBubbleModule.class,
+      StubMetricsModule.class,
+      StubFeedbackModule.class,
+      StubMapsModule.class,
+      StubSimSuggestionModule.class,
+      StubSpamModule.class,
+      StubSpeakEasyModule.class,
+      SystemStrictModeModule.class,
+      AospThemeModule.class,
+      VoicemailModule.class,
+    })
 public interface AospDialerRootComponent extends BaseDialerRootComponent {}
diff --git a/java/com/android/dialer/binary/basecomponent/BaseDialerRootComponent.java b/java/com/android/dialer/binary/basecomponent/BaseDialerRootComponent.java
index cd95c3e..acf14b1 100644
--- a/java/com/android/dialer/binary/basecomponent/BaseDialerRootComponent.java
+++ b/java/com/android/dialer/binary/basecomponent/BaseDialerRootComponent.java
@@ -16,30 +16,37 @@
 
 package com.android.dialer.binary.basecomponent;
 
+import com.android.bubble.BubbleComponent;
+import com.android.dialer.activecalls.ActiveCallsComponent;
 import com.android.dialer.calllog.CallLogComponent;
+import com.android.dialer.calllog.config.CallLogConfigComponent;
 import com.android.dialer.calllog.database.CallLogDatabaseComponent;
 import com.android.dialer.calllog.ui.CallLogUiComponent;
 import com.android.dialer.commandline.CommandLineComponent;
 import com.android.dialer.common.concurrent.DialerExecutorComponent;
 import com.android.dialer.configprovider.ConfigProviderComponent;
+import com.android.dialer.contacts.ContactsComponent;
 import com.android.dialer.duo.DuoComponent;
 import com.android.dialer.enrichedcall.EnrichedCallComponent;
 import com.android.dialer.feedback.FeedbackComponent;
 import com.android.dialer.glidephotomanager.GlidePhotoManagerComponent;
-import com.android.dialer.main.MainComponent;
 import com.android.dialer.metrics.MetricsComponent;
 import com.android.dialer.phonelookup.PhoneLookupComponent;
+import com.android.dialer.phonelookup.database.PhoneLookupDatabaseComponent;
 import com.android.dialer.phonenumbergeoutil.PhoneNumberGeoUtilComponent;
 import com.android.dialer.precall.PreCallComponent;
+import com.android.dialer.preferredsim.PreferredSimComponent;
 import com.android.dialer.preferredsim.suggestion.SimSuggestionComponent;
+import com.android.dialer.promotion.PromotionComponent;
 import com.android.dialer.simulator.SimulatorComponent;
 import com.android.dialer.spam.SpamComponent;
+import com.android.dialer.speeddial.loader.UiItemLoaderComponent;
 import com.android.dialer.storage.StorageComponent;
 import com.android.dialer.strictmode.StrictModeComponent;
+import com.android.dialer.theme.base.ThemeComponent;
 import com.android.incallui.calllocation.CallLocationComponent;
 import com.android.incallui.maps.MapsComponent;
 import com.android.incallui.speakeasy.SpeakEasyComponent;
-import com.android.newbubble.NewBubbleComponent;
 import com.android.voicemail.VoicemailComponent;
 
 /**
@@ -47,28 +54,35 @@
  * from this component.
  */
 public interface BaseDialerRootComponent
-    extends CallLocationComponent.HasComponent,
+    extends ActiveCallsComponent.HasComponent,
+        BubbleComponent.HasComponent,
+        CallLocationComponent.HasComponent,
         CallLogComponent.HasComponent,
+        CallLogConfigComponent.HasComponent,
         CallLogDatabaseComponent.HasComponent,
         CallLogUiComponent.HasComponent,
         ConfigProviderComponent.HasComponent,
         CommandLineComponent.HasComponent,
+        ContactsComponent.HasComponent,
         DialerExecutorComponent.HasComponent,
         DuoComponent.HasComponent,
         EnrichedCallComponent.HasComponent,
         FeedbackComponent.HasComponent,
         GlidePhotoManagerComponent.HasComponent,
-        MainComponent.HasComponent,
         MapsComponent.HasComponent,
         MetricsComponent.HasComponent,
-        NewBubbleComponent.HasComponent,
         PhoneLookupComponent.HasComponent,
+        PhoneLookupDatabaseComponent.HasComponent,
         PhoneNumberGeoUtilComponent.HasComponent,
         PreCallComponent.HasComponent,
+        PreferredSimComponent.HasComponent,
+        PromotionComponent.HasComponent,
+        UiItemLoaderComponent.HasComponent,
         SimSuggestionComponent.HasComponent,
         SimulatorComponent.HasComponent,
         SpamComponent.HasComponent,
         SpeakEasyComponent.HasComponent,
         StorageComponent.HasComponent,
         StrictModeComponent.HasComponent,
+        ThemeComponent.HasComponent,
         VoicemailComponent.HasComponent {}
diff --git a/java/com/android/dialer/binary/common/DialerApplication.java b/java/com/android/dialer/binary/common/DialerApplication.java
index c239260..31d4d82 100644
--- a/java/com/android/dialer/binary/common/DialerApplication.java
+++ b/java/com/android/dialer/binary/common/DialerApplication.java
@@ -23,14 +23,15 @@
 import com.android.dialer.blocking.BlockedNumbersAutoMigrator;
 import com.android.dialer.blocking.FilteredNumberAsyncQueryHandler;
 import com.android.dialer.calllog.CallLogComponent;
-import com.android.dialer.common.concurrent.DefaultFutureCallback;
+import com.android.dialer.calllog.CallLogFramework;
+import com.android.dialer.calllog.config.CallLogConfig;
+import com.android.dialer.calllog.config.CallLogConfigComponent;
+import com.android.dialer.common.LogUtil;
 import com.android.dialer.common.concurrent.DialerExecutorComponent;
 import com.android.dialer.inject.HasRootComponent;
 import com.android.dialer.notification.NotificationChannelManager;
 import com.android.dialer.persistentlog.PersistentLogger;
 import com.android.dialer.strictmode.StrictModeComponent;
-import com.google.common.util.concurrent.Futures;
-import com.google.common.util.concurrent.MoreExecutors;
 
 /** A common application subclass for all Dialer build variants. */
 public abstract class DialerApplication extends Application implements HasRootComponent {
@@ -41,18 +42,13 @@
   public void onCreate() {
     Trace.beginSection("DialerApplication.onCreate");
     StrictModeComponent.get(this).getDialerStrictMode().onApplicationCreate(this);
-
     super.onCreate();
     new BlockedNumbersAutoMigrator(
             this.getApplicationContext(),
             new FilteredNumberAsyncQueryHandler(this),
             DialerExecutorComponent.get(this).dialerExecutorFactory())
         .asyncAutoMigrate();
-    CallLogComponent.get(this).callLogFramework().registerContentObservers(getApplicationContext());
-    Futures.addCallback(
-        CallLogComponent.get(this).getAnnotatedCallLogMigrator().migrate(),
-        new DefaultFutureCallback<>(),
-        MoreExecutors.directExecutor());
+    initializeAnnotatedCallLog();
     PersistentLogger.initialize(this);
 
     if (BuildCompat.isAtLeastO()) {
@@ -61,6 +57,18 @@
     Trace.endSection();
   }
 
+  private void initializeAnnotatedCallLog() {
+    CallLogConfig callLogConfig = CallLogConfigComponent.get(this).callLogConfig();
+    callLogConfig.schedulePollingJob();
+
+    if (callLogConfig.isCallLogFrameworkEnabled()) {
+      CallLogFramework callLogFramework = CallLogComponent.get(this).callLogFramework();
+      callLogFramework.registerContentObservers();
+    } else {
+      LogUtil.i("DialerApplication.initializeAnnotatedCallLog", "framework not enabled");
+    }
+  }
+
   /**
    * Returns a new instance of the root component for the application. Sub classes should define a
    * root component that extends all the sub components "HasComponent" intefaces. The component
diff --git a/java/com/android/dialer/binary/google/AndroidManifest.xml b/java/com/android/dialer/binary/google/AndroidManifest.xml
index c1f1a59..051556b 100644
--- a/java/com/android/dialer/binary/google/AndroidManifest.xml
+++ b/java/com/android/dialer/binary/google/AndroidManifest.xml
@@ -16,12 +16,12 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
   coreApp="true"
   package="com.google.android.google_stub_dialer"
-  android:versionCode="250000"
-  android:versionName="19.0">
+  android:versionCode="2900000"
+  android:versionName="23.0">
 
   <uses-sdk
-    android:minSdkVersion="23"
-    android:targetSdkVersion="27"/>
+    android:minSdkVersion="24"
+    android:targetSdkVersion="28"/>
 
   <uses-permission android:name="android.permission.CALL_PHONE"/>
   <uses-permission android:name="android.permission.READ_CONTACTS"/>
diff --git a/java/com/android/dialer/binary/google/GoogleStubDialerRootComponent.java b/java/com/android/dialer/binary/google/GoogleStubDialerRootComponent.java
index 497d977..35e7809 100644
--- a/java/com/android/dialer/binary/google/GoogleStubDialerRootComponent.java
+++ b/java/com/android/dialer/binary/google/GoogleStubDialerRootComponent.java
@@ -16,11 +16,15 @@
 
 package com.android.dialer.binary.google;
 
+import com.android.bubble.stub.StubBubbleModule;
+import com.android.dialer.activecalls.ActiveCallsModule;
 import com.android.dialer.binary.basecomponent.BaseDialerRootComponent;
 import com.android.dialer.calllog.CallLogModule;
+import com.android.dialer.calllog.config.CallLogConfigModule;
 import com.android.dialer.commandline.CommandLineModule;
 import com.android.dialer.common.concurrent.DialerExecutorModule;
 import com.android.dialer.configprovider.SharedPrefConfigProviderModule;
+import com.android.dialer.contacts.ContactsModule;
 import com.android.dialer.duo.stub.StubDuoModule;
 import com.android.dialer.enrichedcall.stub.StubEnrichedCallModule;
 import com.android.dialer.feedback.stub.StubFeedbackModule;
@@ -30,16 +34,18 @@
 import com.android.dialer.phonelookup.PhoneLookupModule;
 import com.android.dialer.phonenumbergeoutil.impl.PhoneNumberGeoUtilModule;
 import com.android.dialer.precall.impl.PreCallModule;
+import com.android.dialer.preferredsim.PreferredSimModule;
 import com.android.dialer.preferredsim.suggestion.stub.StubSimSuggestionModule;
+import com.android.dialer.promotion.impl.PromotionModule;
 import com.android.dialer.simulator.impl.SimulatorModule;
 import com.android.dialer.simulator.stub.StubSimulatorEnrichedCallModule;
-import com.android.dialer.spam.StubSpamModule;
+import com.android.dialer.spam.stub.StubSpamModule;
 import com.android.dialer.storage.StorageModule;
 import com.android.dialer.strictmode.impl.SystemStrictModeModule;
+import com.android.dialer.theme.base.impl.AospThemeModule;
 import com.android.incallui.calllocation.impl.CallLocationModule;
 import com.android.incallui.maps.impl.MapsModule;
 import com.android.incallui.speakeasy.StubSpeakEasyModule;
-import com.android.newbubble.stub.StubNewBubbleModule;
 import com.android.voicemail.impl.VoicemailModule;
 import dagger.Component;
 import javax.inject.Singleton;
@@ -50,31 +56,36 @@
  */
 @Singleton
 @Component(
-  modules = {
-    CallLocationModule.class,
-    CallLogModule.class,
-    CommandLineModule.class,
-    ContextModule.class,
-    DialerExecutorModule.class,
-    GlidePhotoManagerModule.class,
-    MapsModule.class,
-    PhoneLookupModule.class, // TODO(zachh): Module which uses APDL?
-    PhoneNumberGeoUtilModule.class,
-    PreCallModule.class,
-    SharedPrefConfigProviderModule.class,
-    SimulatorModule.class,
-    StorageModule.class,
-    StubSimulatorEnrichedCallModule.class,
-    StubDuoModule.class,
-    StubEnrichedCallModule.class,
-    StubFeedbackModule.class,
-    StubMetricsModule.class,
-    StubNewBubbleModule.class,
-    StubSimSuggestionModule.class,
-    StubSpamModule.class,
-    StubSpeakEasyModule.class,
-    SystemStrictModeModule.class,
-    VoicemailModule.class,
-  }
-)
+    modules = {
+      ActiveCallsModule.class,
+      CallLocationModule.class,
+      CallLogModule.class,
+      CallLogConfigModule.class,
+      CommandLineModule.class,
+      ContextModule.class,
+      ContactsModule.class,
+      DialerExecutorModule.class,
+      GlidePhotoManagerModule.class,
+      MapsModule.class,
+      PhoneLookupModule.class, // TODO(zachh): Module which uses APDL?
+      PhoneNumberGeoUtilModule.class,
+      PreCallModule.class,
+      PreferredSimModule.class,
+      PromotionModule.class,
+      SharedPrefConfigProviderModule.class,
+      SimulatorModule.class,
+      StorageModule.class,
+      StubSimulatorEnrichedCallModule.class,
+      StubDuoModule.class,
+      StubEnrichedCallModule.class,
+      StubFeedbackModule.class,
+      StubMetricsModule.class,
+      StubBubbleModule.class,
+      StubSimSuggestionModule.class,
+      StubSpamModule.class,
+      StubSpeakEasyModule.class,
+      SystemStrictModeModule.class,
+      AospThemeModule.class,
+      VoicemailModule.class,
+    })
 public interface GoogleStubDialerRootComponent extends BaseDialerRootComponent {}
diff --git a/java/com/android/dialer/blocking/AndroidManifest.xml b/java/com/android/dialer/blocking/AndroidManifest.xml
index 08d2439..fb811ea 100644
--- a/java/com/android/dialer/blocking/AndroidManifest.xml
+++ b/java/com/android/dialer/blocking/AndroidManifest.xml
@@ -1,9 +1,23 @@
+<!-- Copyright (C) 2018 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
   package="com.android.dialer.blocking">
 
-  <application android:theme="@style/Theme.AppCompat">
+  <application>
 
-    <provider
+  <provider
       android:authorities="com.android.dialer.blocking.filterednumberprovider"
       android:exported="false"
       android:multiprocess="false"
diff --git a/java/com/android/dialer/blocking/BlockNumberDialogFragment.java b/java/com/android/dialer/blocking/BlockNumberDialogFragment.java
index f723a9c..de974cb 100644
--- a/java/com/android/dialer/blocking/BlockNumberDialogFragment.java
+++ b/java/com/android/dialer/blocking/BlockNumberDialogFragment.java
@@ -41,6 +41,7 @@
  * Fragment for confirming and enacting blocking/unblocking a number. Also invokes snackbar
  * providing undo functionality.
  */
+@Deprecated
 public class BlockNumberDialogFragment extends DialogFragment {
 
   private static final String BLOCK_DIALOG_FRAGMENT = "BlockNumberDialog";
@@ -137,7 +138,7 @@
     } else {
       title =
           ContactDisplayUtils.getTtsSpannedPhoneNumber(
-              getResources(), R.string.block_number_confirmation_title, displayNumber);
+              getResources(), R.string.old_block_number_confirmation_title, displayNumber);
       okText = getString(R.string.block_number_ok);
       if (FilteredNumberCompat.useNewFiltering(getContext())) {
         message = getString(R.string.block_number_confirmation_message_new_filtering);
@@ -244,7 +245,7 @@
                 };
 
             Snackbar.make(parentView, message, Snackbar.LENGTH_LONG)
-                .setAction(R.string.block_number_undo, undoListener)
+                .setAction(R.string.snackbar_undo, undoListener)
                 .setActionTextColor(actionTextColor)
                 .show();
 
@@ -295,7 +296,7 @@
                 };
 
             Snackbar.make(parentView, message, Snackbar.LENGTH_LONG)
-                .setAction(R.string.block_number_undo, undoListener)
+                .setAction(R.string.snackbar_undo, undoListener)
                 .setActionTextColor(actionTextColor)
                 .show();
 
diff --git a/java/com/android/dialer/blocking/BlockedNumbersAutoMigrator.java b/java/com/android/dialer/blocking/BlockedNumbersAutoMigrator.java
index 6e9fe13..8a57f29 100644
--- a/java/com/android/dialer/blocking/BlockedNumbersAutoMigrator.java
+++ b/java/com/android/dialer/blocking/BlockedNumbersAutoMigrator.java
@@ -33,6 +33,7 @@
  * android.provider.BlockedNumberContract} blocking. In order for this to happen, the user cannot
  * have any numbers that are blocked in the Dialer solution.
  */
+@Deprecated
 public class BlockedNumbersAutoMigrator {
 
   static final String HAS_CHECKED_AUTO_MIGRATE_KEY = "checkedAutoMigrate";
diff --git a/java/com/android/dialer/blocking/BlockedNumbersMigrator.java b/java/com/android/dialer/blocking/BlockedNumbersMigrator.java
index 88f474a..ef047a0 100644
--- a/java/com/android/dialer/blocking/BlockedNumbersMigrator.java
+++ b/java/com/android/dialer/blocking/BlockedNumbersMigrator.java
@@ -16,15 +16,12 @@
 
 package com.android.dialer.blocking;
 
-import android.annotation.TargetApi;
 import android.content.ContentResolver;
 import android.content.ContentValues;
 import android.content.Context;
 import android.database.Cursor;
 import android.os.AsyncTask;
-import android.os.Build.VERSION_CODES;
 import android.provider.BlockedNumberContract.BlockedNumbers;
-import android.support.annotation.RequiresApi;
 import com.android.dialer.common.LogUtil;
 import com.android.dialer.database.FilteredNumberContract;
 import com.android.dialer.database.FilteredNumberContract.FilteredNumber;
@@ -35,7 +32,7 @@
  * Class which should be used to migrate numbers from {@link FilteredNumberContract} blocking to
  * {@link android.provider.BlockedNumberContract} blocking.
  */
-@TargetApi(VERSION_CODES.M)
+@Deprecated
 public class BlockedNumbersMigrator {
 
   private final Context context;
@@ -48,8 +45,6 @@
     this.context = Objects.requireNonNull(context);
   }
 
-  @RequiresApi(VERSION_CODES.N)
-  @TargetApi(VERSION_CODES.N)
   private static boolean migrateToNewBlockingInBackground(ContentResolver resolver) {
     try (Cursor cursor =
         resolver.query(
@@ -90,8 +85,6 @@
     }
   }
 
-  @RequiresApi(VERSION_CODES.N)
-  @TargetApi(VERSION_CODES.N)
   private static boolean isNumberInNewBlocking(ContentResolver resolver, String originalNumber) {
     try (Cursor cursor =
         resolver.query(
@@ -133,7 +126,6 @@
     void onComplete();
   }
 
-  @TargetApi(VERSION_CODES.N)
   private class MigratorTask extends AsyncTask<Void, Void, Boolean> {
 
     private final Listener listener;
diff --git a/java/com/android/dialer/blocking/Blocking.java b/java/com/android/dialer/blocking/Blocking.java
new file mode 100644
index 0000000..a1d8b4f
--- /dev/null
+++ b/java/com/android/dialer/blocking/Blocking.java
@@ -0,0 +1,194 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.dialer.blocking;
+
+import android.content.ContentProviderOperation;
+import android.content.ContentProviderResult;
+import android.content.ContentResolver;
+import android.content.ContentValues;
+import android.content.Context;
+import android.content.OperationApplicationException;
+import android.database.Cursor;
+import android.os.RemoteException;
+import android.provider.BlockedNumberContract;
+import android.provider.BlockedNumberContract.BlockedNumbers;
+import android.support.annotation.Nullable;
+import android.telephony.PhoneNumberUtils;
+import android.util.ArrayMap;
+import com.android.dialer.common.concurrent.DialerExecutorComponent;
+import com.android.dialer.common.database.Selection;
+import com.google.common.collect.ImmutableCollection;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.util.concurrent.ListenableFuture;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/** Blocks and unblocks number. */
+public final class Blocking {
+
+  private Blocking() {}
+
+  /**
+   * Thrown when blocking cannot be performed because dialer is not the default dialer, or the
+   * current user is not a primary user.
+   *
+   * <p>Blocking is only allowed on the primary user (the first user added). Primary user cannot be
+   * easily checked because {@link
+   * android.provider.BlockedNumberContract#canCurrentUserBlockNumbers(Context)} is a slow IPC, and
+   * UserManager.isPrimaryUser() is a system API. Since secondary users are rare cases this class
+   * choose to ignore the check and let callers handle the failure later.
+   */
+  public static final class BlockingFailedException extends Exception {
+    BlockingFailedException(Throwable cause) {
+      super(cause);
+    }
+  }
+
+  /**
+   * Block a list of numbers.
+   *
+   * @param countryIso the current location used to guess the country code of the number if not
+   *     available. If {@code null} and {@code number} does not have a country code, only the
+   *     original number will be blocked.
+   * @throws BlockingFailedException in the returned future if the operation failed.
+   */
+  public static ListenableFuture<Void> block(
+      Context context, ImmutableCollection<String> numbers, @Nullable String countryIso) {
+    return DialerExecutorComponent.get(context)
+        .backgroundExecutor()
+        .submit(
+            () -> {
+              ArrayList<ContentProviderOperation> operations = new ArrayList<>();
+              for (String number : numbers) {
+                ContentValues values = new ContentValues();
+                values.put(BlockedNumbers.COLUMN_ORIGINAL_NUMBER, number);
+                String e164Number = PhoneNumberUtils.formatNumberToE164(number, countryIso);
+                if (e164Number != null) {
+                  values.put(BlockedNumbers.COLUMN_E164_NUMBER, e164Number);
+                }
+                operations.add(
+                    ContentProviderOperation.newInsert(BlockedNumbers.CONTENT_URI)
+                        .withValues(values)
+                        .build());
+              }
+              applyBatchOps(context.getContentResolver(), operations);
+              return null;
+            });
+  }
+
+  /**
+   * Unblock a list of number.
+   *
+   * @param countryIso the current location used to guess the country code of the number if not
+   *     available. If {@code null} and {@code number} does not have a country code, only the
+   *     original number will be unblocked.
+   * @throws BlockingFailedException in the returned future if the operation failed.
+   */
+  public static ListenableFuture<Void> unblock(
+      Context context, ImmutableCollection<String> numbers, @Nullable String countryIso) {
+    return DialerExecutorComponent.get(context)
+        .backgroundExecutor()
+        .submit(
+            () -> {
+              ArrayList<ContentProviderOperation> operations = new ArrayList<>();
+              for (String number : numbers) {
+                Selection selection =
+                    Selection.column(BlockedNumbers.COLUMN_ORIGINAL_NUMBER).is("=", number);
+                String e164Number = PhoneNumberUtils.formatNumberToE164(number, countryIso);
+                if (e164Number != null) {
+                  selection =
+                      selection
+                          .buildUpon()
+                          .or(
+                              Selection.column(BlockedNumbers.COLUMN_E164_NUMBER)
+                                  .is("=", e164Number))
+                          .build();
+                }
+                operations.add(
+                    ContentProviderOperation.newDelete(BlockedNumbers.CONTENT_URI)
+                        .withSelection(selection.getSelection(), selection.getSelectionArgs())
+                        .build());
+              }
+              applyBatchOps(context.getContentResolver(), operations);
+              return null;
+            });
+  }
+
+  /**
+   * Get blocked numbers from a list of number.
+   *
+   * @param countryIso the current location used to guess the country code of the number if not
+   *     available. If {@code null} and {@code number} does not have a country code, only the
+   *     original number will be used to check blocked status.
+   * @throws BlockingFailedException in the returned future if the operation failed.
+   */
+  public static ListenableFuture<ImmutableMap<String, Boolean>> isBlocked(
+      Context context, ImmutableCollection<String> numbers, @Nullable String countryIso) {
+    return DialerExecutorComponent.get(context)
+        .backgroundExecutor()
+        .submit(
+            () -> {
+              Map<String, Boolean> blockedStatus = new ArrayMap<>();
+              List<String> e164Numbers = new ArrayList<>();
+
+              for (String number : numbers) {
+                // Initialize as unblocked
+                blockedStatus.put(number, false);
+                String e164Number = PhoneNumberUtils.formatNumberToE164(number, countryIso);
+                if (e164Number != null) {
+                  e164Numbers.add(e164Number);
+                }
+              }
+
+              Selection selection =
+                  Selection.builder()
+                      .or(Selection.column(BlockedNumbers.COLUMN_ORIGINAL_NUMBER).in(numbers))
+                      .or(Selection.column(BlockedNumbers.COLUMN_E164_NUMBER).in(e164Numbers))
+                      .build();
+
+              try (Cursor cursor =
+                  context
+                      .getContentResolver()
+                      .query(
+                          BlockedNumbers.CONTENT_URI,
+                          new String[] {BlockedNumbers.COLUMN_ORIGINAL_NUMBER},
+                          selection.getSelection(),
+                          selection.getSelectionArgs(),
+                          null)) {
+                if (cursor == null) {
+                  return ImmutableMap.copyOf(blockedStatus);
+                }
+                while (cursor.moveToNext()) {
+                  // Update blocked status
+                  blockedStatus.put(cursor.getString(0), true);
+                }
+              }
+              return ImmutableMap.copyOf(blockedStatus);
+            });
+  }
+
+  private static ContentProviderResult[] applyBatchOps(
+      ContentResolver resolver, ArrayList<ContentProviderOperation> ops)
+      throws BlockingFailedException {
+    try {
+      return resolver.applyBatch(BlockedNumberContract.AUTHORITY, ops);
+    } catch (RemoteException | OperationApplicationException | SecurityException e) {
+      throw new BlockingFailedException(e);
+    }
+  }
+}
diff --git a/java/com/android/dialer/blocking/FilteredNumberAsyncQueryHandler.java b/java/com/android/dialer/blocking/FilteredNumberAsyncQueryHandler.java
index 09fd5f0..08526ef 100644
--- a/java/com/android/dialer/blocking/FilteredNumberAsyncQueryHandler.java
+++ b/java/com/android/dialer/blocking/FilteredNumberAsyncQueryHandler.java
@@ -16,7 +16,6 @@
 
 package com.android.dialer.blocking;
 
-import android.annotation.TargetApi;
 import android.content.AsyncQueryHandler;
 import android.content.ContentValues;
 import android.content.Context;
@@ -24,7 +23,6 @@
 import android.database.DatabaseUtils;
 import android.database.sqlite.SQLiteDatabaseCorruptException;
 import android.net.Uri;
-import android.os.Build.VERSION_CODES;
 import android.support.annotation.Nullable;
 import android.support.annotation.VisibleForTesting;
 import android.support.v4.os.UserManagerCompat;
@@ -37,6 +35,8 @@
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
+/** TODO(calderwoodra): documentation */
+@Deprecated
 public class FilteredNumberAsyncQueryHandler extends AsyncQueryHandler {
 
   public static final int INVALID_ID = -1;
@@ -199,7 +199,6 @@
    *
    * @return blocked id.
    */
-  @TargetApi(VERSION_CODES.M)
   @Nullable
   public Integer getBlockedIdSynchronous(@Nullable String number, String countryIso) {
     Assert.isWorkerThread();
@@ -382,6 +381,7 @@
         null);
   }
 
+  /** TODO(calderwoodra): documentation */
   public interface OnCheckBlockedListener {
 
     /**
@@ -392,6 +392,7 @@
     void onCheckComplete(Integer id);
   }
 
+  /** TODO(calderwoodra): documentation */
   public interface OnBlockNumberListener {
 
     /**
@@ -402,6 +403,7 @@
     void onBlockComplete(Uri uri);
   }
 
+  /** TODO(calderwoodra): documentation */
   public interface OnUnblockNumberListener {
 
     /**
@@ -413,6 +415,7 @@
     void onUnblockComplete(int rows, ContentValues values);
   }
 
+  /** TODO(calderwoodra): documentation */
   interface OnHasBlockedNumbersListener {
 
     /**
diff --git a/java/com/android/dialer/blocking/FilteredNumberCompat.java b/java/com/android/dialer/blocking/FilteredNumberCompat.java
index bea84e8..71af340 100644
--- a/java/com/android/dialer/blocking/FilteredNumberCompat.java
+++ b/java/com/android/dialer/blocking/FilteredNumberCompat.java
@@ -16,16 +16,12 @@
 
 package com.android.dialer.blocking;
 
-import android.annotation.TargetApi;
 import android.app.FragmentManager;
 import android.content.ContentUris;
 import android.content.ContentValues;
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
-import android.os.Build.VERSION;
-import android.os.Build.VERSION_CODES;
-import android.os.UserManager;
 import android.preference.PreferenceManager;
 import android.provider.BlockedNumberContract;
 import android.provider.BlockedNumberContract.BlockedNumbers;
@@ -34,7 +30,7 @@
 import android.telecom.TelecomManager;
 import android.telephony.PhoneNumberUtils;
 import com.android.dialer.common.LogUtil;
-import com.android.dialer.configprovider.ConfigProviderBindings;
+import com.android.dialer.configprovider.ConfigProviderComponent;
 import com.android.dialer.database.FilteredNumberContract.FilteredNumber;
 import com.android.dialer.database.FilteredNumberContract.FilteredNumberColumns;
 import com.android.dialer.database.FilteredNumberContract.FilteredNumberSources;
@@ -52,6 +48,7 @@
  * referencing columns from either contract class in situations where both blocking solutions may be
  * used.
  */
+@Deprecated
 public class FilteredNumberCompat {
 
   private static Boolean canAttemptBlockOperationsForTest;
@@ -110,7 +107,7 @@
    *     otherwise.
    */
   public static boolean canUseNewFiltering() {
-    return VERSION.SDK_INT >= VERSION_CODES.N;
+    return true;
   }
 
   /**
@@ -118,7 +115,9 @@
    *     migration has been performed, {@code false} otherwise.
    */
   public static boolean useNewFiltering(Context context) {
-    return !ConfigProviderBindings.get(context).getBoolean("debug_force_dialer_filtering", false)
+    return !ConfigProviderComponent.get(context)
+            .getConfigProvider()
+            .getBoolean("debug_force_dialer_filtering", false)
         && canUseNewFiltering()
         && hasMigratedToNewBlocking(context);
   }
@@ -162,16 +161,14 @@
 
   private static Uri getBaseUri(Context context) {
     // Explicit version check to aid static analysis
-    return useNewFiltering(context) && VERSION.SDK_INT >= VERSION_CODES.N
-        ? BlockedNumbers.CONTENT_URI
-        : FilteredNumber.CONTENT_URI;
+    return useNewFiltering(context) ? BlockedNumbers.CONTENT_URI : FilteredNumber.CONTENT_URI;
   }
 
   /**
    * Removes any null column names from the given projection array. This method is intended to be
    * used to strip out any column names that aren't available in every version of number blocking.
    * Example: {@literal getContext().getContentResolver().query( someUri, // Filtering ensures that
-   * no non-existant columns are queried FilteredNumberCompat.filter(new String[]
+   * no non-existent columns are queried FilteredNumberCompat.filter(new String[]
    * {FilteredNumberCompat.getIdColumnName(), FilteredNumberCompat.getTypeColumnName()},
    * FilteredNumberCompat.getE164NumberColumnName() + " = ?", new String[] {e164Number}); }
    *
@@ -249,9 +246,7 @@
    */
   public static Intent createManageBlockedNumbersIntent(Context context) {
     // Explicit version check to aid static analysis
-    if (canUseNewFiltering()
-        && hasMigratedToNewBlocking(context)
-        && VERSION.SDK_INT >= VERSION_CODES.N) {
+    if (canUseNewFiltering() && hasMigratedToNewBlocking(context)) {
       return context.getSystemService(TelecomManager.class).createManageBlockedNumbersIntent();
     }
     Intent intent = new Intent("com.android.dialer.action.BLOCKED_NUMBERS_SETTINGS");
@@ -270,11 +265,6 @@
       return canAttemptBlockOperationsForTest;
     }
 
-    if (VERSION.SDK_INT < VERSION_CODES.N) {
-      // Dialer blocking, must be primary user
-      return context.getSystemService(UserManager.class).isSystemUser();
-    }
-
     // Great Wall blocking, must be primary user and the default or system dialer
     // TODO(maxwelb): check that we're the system Dialer
     return TelecomUtil.isDefaultDialer(context)
@@ -294,10 +284,6 @@
    *     otherwise.
    */
   public static boolean canCurrentUserOpenBlockSettings(Context context) {
-    if (VERSION.SDK_INT < VERSION_CODES.N) {
-      // Dialer blocking, must be primary user
-      return context.getSystemService(UserManager.class).isSystemUser();
-    }
     // BlockedNumberContract blocking, verify through Contract API
     return TelecomUtil.isDefaultDialer(context)
         && safeBlockedNumbersContractCanCurrentUserBlockNumbers(context);
@@ -312,7 +298,6 @@
    * @return the result of BlockedNumberContract#canCurrentUserBlockNumbers, or {@code false} if an
    *     exception was thrown.
    */
-  @TargetApi(VERSION_CODES.N)
   private static boolean safeBlockedNumbersContractCanCurrentUserBlockNumbers(Context context) {
     try {
       return BlockedNumberContract.canCurrentUserBlockNumbers(context);
diff --git a/java/com/android/dialer/blocking/FilteredNumberProvider.java b/java/com/android/dialer/blocking/FilteredNumberProvider.java
index 3fad4e2..547892b 100644
--- a/java/com/android/dialer/blocking/FilteredNumberProvider.java
+++ b/java/com/android/dialer/blocking/FilteredNumberProvider.java
@@ -34,6 +34,7 @@
 import com.android.dialer.location.GeoUtil;
 
 /** Filtered number content provider. */
+@Deprecated
 public class FilteredNumberProvider extends ContentProvider {
 
   private static final int FILTERED_NUMBERS_TABLE = 1;
diff --git a/java/com/android/dialer/blocking/FilteredNumbersUtil.java b/java/com/android/dialer/blocking/FilteredNumbersUtil.java
index 6433355..d839ef5 100644
--- a/java/com/android/dialer/blocking/FilteredNumbersUtil.java
+++ b/java/com/android/dialer/blocking/FilteredNumbersUtil.java
@@ -42,6 +42,7 @@
 import java.util.concurrent.TimeUnit;
 
 /** Utility to help with tasks related to filtered numbers. */
+@Deprecated
 public class FilteredNumbersUtil {
 
   public static final String CALL_BLOCKING_NOTIFICATION_TAG = "call_blocking";
diff --git a/java/com/android/dialer/blocking/MigrateBlockedNumbersDialogFragment.java b/java/com/android/dialer/blocking/MigrateBlockedNumbersDialogFragment.java
index 9b416ff..9a3b647 100644
--- a/java/com/android/dialer/blocking/MigrateBlockedNumbersDialogFragment.java
+++ b/java/com/android/dialer/blocking/MigrateBlockedNumbersDialogFragment.java
@@ -30,6 +30,7 @@
  * Dialog fragment shown to users when they need to migrate to use {@link
  * android.provider.BlockedNumberContract} for blocking.
  */
+@Deprecated
 public class MigrateBlockedNumbersDialogFragment extends DialogFragment {
 
   private BlockedNumbersMigrator blockedNumbersMigrator;
diff --git a/java/com/android/dialer/blocking/res/values-af/strings.xml b/java/com/android/dialer/blocking/res/values-af/strings.xml
index 18f40f6..d1b87d5 100644
--- a/java/com/android/dialer/blocking/res/values-af/strings.xml
+++ b/java/com/android/dialer/blocking/res/values-af/strings.xml
@@ -1,46 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="migrate_blocked_numbers_dialog_title" msgid="7823962296457673809">"Nuwe, vereenvoudigde blokkering"</string>
-    <string name="migrate_blocked_numbers_dialog_message" msgid="8309736147266462485">"Om jou beter te beskerm, moet Phone die manier verander waarop blokkering werk. Jou geblokkeerde nommers sal nou sowel oproepe as SMS\'e keer en kan met ander programme gedeel word."</string>
-    <string name="migrate_blocked_numbers_dialog_allow_button" msgid="5192836471557751367">"Laat toe"</string>
-    <string name="block_number_confirmation_title" msgid="2699521227461376076">"Blokkeer <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="block_number_confirmation_message_vvm" msgid="6501105244172290939">"Oproepe van hierdie nommer af sal geblokkeer word en stemboodskappe sal outomaties uitgevee word."</string>
-    <string name="block_number_confirmation_message_no_vvm" msgid="8236641245709649882">"Oproepe van hierdie nommer af sal geblokkeer word, maar die beller sal dalk steeds vir jou stemboodskappe kan los."</string>
-    <string name="block_number_confirmation_message_new_filtering" msgid="8487449683723062644">"Jy sal nie meer oproepe of SMS\'e van hierdie nommer ontvang nie."</string>
-    <string name="block_number_ok" msgid="739786082788038932">"BLOKKEER"</string>
-    <string name="unblock_number_confirmation_title" msgid="7897778825085659941">"Deblokkeer <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="unblock_number_ok" msgid="5089057152966269355">"DEBLOKKEER"</string>
-    <string name="invalidNumber" msgid="6270918250761754967">"<xliff:g id="NUMBER">%1$s</xliff:g> is ongeldig."</string>
-    <string name="snackbar_number_blocked" msgid="5760234822413921845">"<xliff:g id="NUMBER">%1$s</xliff:g> is geblokkeer"</string>
-    <string name="snackbar_number_unblocked" msgid="7941296274123990585">"<xliff:g id="NUMBER">%1$s</xliff:g> is gedeblokkeer"</string>
-    <string name="block_number_undo" msgid="5158120911892491697">"ONTDOEN"</string>
-    <string name="send_to_voicemail_import_failed" msgid="1012752662074208237">"Kon nie invoer nie"</string>
-    <string name="call_blocking_disabled_notification_title" msgid="7211352205255347489">"Oproepblokkering is vir 48 uur gedeaktiveer"</string>
-    <string name="call_blocking_disabled_notification_text" msgid="141384084865180722">"Gedeaktiveer omdat \'n noodoproep gemaak is."</string>
-    <string name="block_report_number_alert_title" msgid="2740581989824959611">"Blokkeer <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="block_report_number_alert_details" msgid="2652479394593143562">"Jy sal nie meer oproepe vanaf hierdie nommer ontvang nie."</string>
-    <string name="block_number_alert_details" msgid="715942751312046429">"<xliff:g id="TEXT">%1$s</xliff:g> Hierdie oproep sal as strooipos aangegee word."</string>
-    <string name="unblock_number_alert_details" msgid="8696070817026870606">"Hierdie nommer sal gedeblokkeer word en aangegee word as nie strooipos nie. Toekomstige oproepe sal nie as strooipos geïdentifiseer word nie."</string>
-    <string name="unblock_report_number_alert_title" msgid="2221901995393696882">"Deblokkeer <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="report_not_spam_alert_button" msgid="3244953565919894995">"Gee aan"</string>
-    <string name="report_not_spam_alert_title" msgid="395961923213504916">"Gee \'n fout aan?"</string>
-    <string name="report_not_spam_alert_details" msgid="4463730683530824797">"Toekomstige oproepe vanaf <xliff:g id="NUMBER">%1$s</xliff:g> sal nie meer as strooipos geïdentifiseer word nie."</string>
-    <string name="checkbox_report_as_spam_action" msgid="1549159682170273798">"Gee oproep aan as strooipos"</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="migrate_blocked_numbers_dialog_title">Nuwe, vereenvoudigde blokkering</string>
+  <string name="migrate_blocked_numbers_dialog_message">Om jou beter te beskerm, moet Phone die manier verander waarop blokkering werk. Jou geblokkeerde nommers sal nou sowel oproepe as SMS\'e keer en kan met ander programme gedeel word.</string>
+  <string name="migrate_blocked_numbers_dialog_allow_button">Laat toe</string>
+  <string name="old_block_number_confirmation_title">Blokkeer%1$s?</string>
+  <string name="block_number_confirmation_message_vvm">Oproepe van hierdie nommer af sal geblokkeer word en stemboodskappe sal outomaties uitgevee word.</string>
+  <string name="block_number_confirmation_message_no_vvm">Oproepe van hierdie nommer af sal geblokkeer word, maar die beller sal dalk steeds vir jou stemboodskappe kan los.</string>
+  <string name="block_number_confirmation_message_new_filtering">Jy sal nie meer oproepe of SMS\'e van hierdie nommer ontvang nie.</string>
+  <string name="block_number_ok">BLOKKEER</string>
+  <string name="unblock_number_confirmation_title">Deblokkeer%1$s?</string>
+  <string name="unblock_number_ok">DEBLOKKEER</string>
+  <string name="invalidNumber">%1$sis ongeldig.</string>
+  <string name="snackbar_number_blocked">%1$s is geblokkeer</string>
+  <string name="snackbar_number_unblocked">%1$s is gedeblokkeer</string>
+  <string name="send_to_voicemail_import_failed">Kon nie invoer nie</string>
+  <string name="call_blocking_disabled_notification_title">Oproepblokkering is vir 48 uur gedeaktiveer</string>
+  <string name="call_blocking_disabled_notification_text">Gedeaktiveer omdat \'n noodoproep gemaak is.</string>
 </resources>
diff --git a/java/com/android/dialer/blocking/res/values-am/strings.xml b/java/com/android/dialer/blocking/res/values-am/strings.xml
index b7adada..68de90f 100644
--- a/java/com/android/dialer/blocking/res/values-am/strings.xml
+++ b/java/com/android/dialer/blocking/res/values-am/strings.xml
@@ -1,46 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="migrate_blocked_numbers_dialog_title" msgid="7823962296457673809">"አዲስ፣ የተቃለለ ማገድ"</string>
-    <string name="migrate_blocked_numbers_dialog_message" msgid="8309736147266462485">"እርስዎን በተሻለ ሁኔታ መጠበቅ እንዲችል ስልክ ማገድ እንዴት እንደሚሰራ መቀየር አለበት። የታገዱ ቁጥሮችዎ አሁን ጥሪዎችም ጽሑፎችም መላክ ያቆማሉ፣ እና ከሌሎች መተግበሪያዎች ጋር ሊጋሩ ይችላሉ።"</string>
-    <string name="migrate_blocked_numbers_dialog_allow_button" msgid="5192836471557751367">"ፍቀድ"</string>
-    <string name="block_number_confirmation_title" msgid="2699521227461376076">"<xliff:g id="NUMBER">%1$s</xliff:g> ይታገድ?"</string>
-    <string name="block_number_confirmation_message_vvm" msgid="6501105244172290939">"ከዚህ ቁጥር የሚመጡ ጥሪዎች ይታገዳሉ፣ እና የድምጽ መልዕክቶች በራስ-ሰር ይሰረዛሉ።"</string>
-    <string name="block_number_confirmation_message_no_vvm" msgid="8236641245709649882">"ከዚህ ቁጥር የሚመጡ ጥሪዎች ይታገዳሉ፣ ነገር ግን ደዋዩ አሁንም የድምጽ መልዕክቶችን ሊተዉልዎ ይችላል።"</string>
-    <string name="block_number_confirmation_message_new_filtering" msgid="8487449683723062644">"ከአሁን በኋላ ከዚህ ቁጥር የሚመጡ ጥሪዎችን ወይም ጽሑፎችን አይቀበሉም።"</string>
-    <string name="block_number_ok" msgid="739786082788038932">"አግድ"</string>
-    <string name="unblock_number_confirmation_title" msgid="7897778825085659941">"የ<xliff:g id="NUMBER">%1$s</xliff:g> እግድ ይነሳ?"</string>
-    <string name="unblock_number_ok" msgid="5089057152966269355">"እገዳ አንሳ"</string>
-    <string name="invalidNumber" msgid="6270918250761754967">"<xliff:g id="NUMBER">%1$s</xliff:g> ልክ ያልኾነ ነው።"</string>
-    <string name="snackbar_number_blocked" msgid="5760234822413921845">"<xliff:g id="NUMBER">%1$s</xliff:g> ታግዷል"</string>
-    <string name="snackbar_number_unblocked" msgid="7941296274123990585">"የ<xliff:g id="NUMBER">%1$s</xliff:g> እገዳ ተነስቷል"</string>
-    <string name="block_number_undo" msgid="5158120911892491697">"ቀልብስ"</string>
-    <string name="send_to_voicemail_import_failed" msgid="1012752662074208237">"ማስመጣት አልተሳካም"</string>
-    <string name="call_blocking_disabled_notification_title" msgid="7211352205255347489">"የጥሪ እገዳ ለ48 ሰዓቶች ተሰናክሏል።"</string>
-    <string name="call_blocking_disabled_notification_text" msgid="141384084865180722">"የአስቸኳይ አደጋ ጥሪ ስለተደረገ ተሰናክሏል።"</string>
-    <string name="block_report_number_alert_title" msgid="2740581989824959611">"<xliff:g id="NUMBER">%1$s</xliff:g> ይታገድ?"</string>
-    <string name="block_report_number_alert_details" msgid="2652479394593143562">"ከአሁን በኋላ ከዚህ ቁጥር ጥሪዎችን ቅይቀበሉም።"</string>
-    <string name="block_number_alert_details" msgid="715942751312046429">"<xliff:g id="TEXT">%1$s</xliff:g> ይህ ጥሪ እንደ አይፈለጌ ሪፖርት ይደረጋል።"</string>
-    <string name="unblock_number_alert_details" msgid="8696070817026870606">"ይህ ቁጥር እግዱ ይነሳለታል እንዲሁም አይፈለጌ እንዳልሆነ ሪፖርት ይደረጋል። የወደፊት ጥሪዎች እና የድምፅ መልዕክቶች እንደ አይፈለጌ አይቆጠሩም።"</string>
-    <string name="unblock_report_number_alert_title" msgid="2221901995393696882">"የ<xliff:g id="NUMBER">%1$s</xliff:g> እግድ ይነሳ?"</string>
-    <string name="report_not_spam_alert_button" msgid="3244953565919894995">"ሪፖርት"</string>
-    <string name="report_not_spam_alert_title" msgid="395961923213504916">"ስህተት ሪፖርት ይደረግ?"</string>
-    <string name="report_not_spam_alert_details" msgid="4463730683530824797">"ወደፊት ከ<xliff:g id="NUMBER">%1$s</xliff:g> የሚመጡ ጥሪዎች ከአሁን በኋላ እንደ አይፈለጌ አይቆጠሩም።"</string>
-    <string name="checkbox_report_as_spam_action" msgid="1549159682170273798">"ጥሪውን እንደ አይፈለጌ መልዕክት ሪፖርት አድርግ"</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="migrate_blocked_numbers_dialog_title">አዲስ፣ የተቃለለ ማገድ</string>
+  <string name="migrate_blocked_numbers_dialog_message">እርስዎን በተሻለ ሁኔታ መጠበቅ እንዲችል ስልክ ማገድ እንዴት እንደሚሰራ መቀየር አለበት። የታገዱ ቁጥሮችዎ አሁን ጥሪዎችም ጽሑፎችም መላክ ያቆማሉ፣ እና ከሌሎች መተግበሪያዎች ጋር ሊጋሩ ይችላሉ።</string>
+  <string name="migrate_blocked_numbers_dialog_allow_button">ፍቀድ</string>
+  <string name="old_block_number_confirmation_title">%1$sን አግድ?</string>
+  <string name="block_number_confirmation_message_vvm">ከዚህ ቁጥር የሚመጡ ጥሪዎች ይታገዳሉ፣ እና የድምጽ መልዕክቶች በራስ-ሰር ይሰረዛሉ።</string>
+  <string name="block_number_confirmation_message_no_vvm">ከዚህ ቁጥር የሚመጡ ጥሪዎች ይታገዳሉ፣ ነገር ግን ደዋዩ አሁንም የድምጽ መልዕክቶችን ሊተዉልዎ ይችላል።</string>
+  <string name="block_number_confirmation_message_new_filtering">ከአሁን በኋላ ከዚህ ቁጥር የሚመጡ ጥሪዎችን ወይም ጽሑፎችን አይቀበሉም።</string>
+  <string name="block_number_ok">አግድ</string>
+  <string name="unblock_number_confirmation_title">ከ%1$s እግድ ይነሳ?</string>
+  <string name="unblock_number_ok">እገዳ አንሳ</string>
+  <string name="invalidNumber">%1$s ልክ ያልኾነ ነው።</string>
+  <string name="snackbar_number_blocked">%1$s ታግዷል</string>
+  <string name="snackbar_number_unblocked">የ%1$s እገዳ ተነስቷል</string>
+  <string name="send_to_voicemail_import_failed">ማስመጣት አልተሳካም</string>
+  <string name="call_blocking_disabled_notification_title">የጥሪ እገዳ ለ48 ሰዓቶች ተሰናክሏል።</string>
+  <string name="call_blocking_disabled_notification_text">የአስቸኳይ አደጋ ጥሪ ስለተደረገ ተሰናክሏል።</string>
 </resources>
diff --git a/java/com/android/dialer/blocking/res/values-ar/strings.xml b/java/com/android/dialer/blocking/res/values-ar/strings.xml
index d6bbb65..a783e0b 100644
--- a/java/com/android/dialer/blocking/res/values-ar/strings.xml
+++ b/java/com/android/dialer/blocking/res/values-ar/strings.xml
@@ -1,46 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="migrate_blocked_numbers_dialog_title" msgid="7823962296457673809">"حظر جديد ومبسط"</string>
-    <string name="migrate_blocked_numbers_dialog_message" msgid="8309736147266462485">"لحمايتك بشكل أفضل، يحتاج الهاتف إلى تغيير آلية تنفيذ الحظر. تؤدي الآن ميزة حظر الأرقام إلى إيقاف كل من المكالمات والرسائل النصية، كما أن ذلك الحظر يمكن أن يمتد إلى تطبيقات أخرى."</string>
-    <string name="migrate_blocked_numbers_dialog_allow_button" msgid="5192836471557751367">"سماح"</string>
-    <string name="block_number_confirmation_title" msgid="2699521227461376076">"هل تريد حظر الرقم <xliff:g id="NUMBER">%1$s</xliff:g>؟"</string>
-    <string name="block_number_confirmation_message_vvm" msgid="6501105244172290939">"سيتم حظر المكالمات الواردة من هذا الرقم كما سيتم تلقائيًا حذف الرسائل الصوتية."</string>
-    <string name="block_number_confirmation_message_no_vvm" msgid="8236641245709649882">"سيتم حظر المكالمات من هذا الرقم، إلا أنه سيظل بإمكان المتصل ترك رسائل صوتية."</string>
-    <string name="block_number_confirmation_message_new_filtering" msgid="8487449683723062644">"لن تتلقي المكالمات أو المراسلات النصية بعد الآن من هذا الرقم."</string>
-    <string name="block_number_ok" msgid="739786082788038932">"حظر"</string>
-    <string name="unblock_number_confirmation_title" msgid="7897778825085659941">"هل تريد إزالة حظر <xliff:g id="NUMBER">%1$s</xliff:g>؟"</string>
-    <string name="unblock_number_ok" msgid="5089057152966269355">"إلغاء الحظر"</string>
-    <string name="invalidNumber" msgid="6270918250761754967">"<xliff:g id="NUMBER">%1$s</xliff:g> غير صالح."</string>
-    <string name="snackbar_number_blocked" msgid="5760234822413921845">"تم حظر <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="snackbar_number_unblocked" msgid="7941296274123990585">"تم إلغاء حظر <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="block_number_undo" msgid="5158120911892491697">"تراجع"</string>
-    <string name="send_to_voicemail_import_failed" msgid="1012752662074208237">"تعذّر الاستيراد"</string>
-    <string name="call_blocking_disabled_notification_title" msgid="7211352205255347489">"تم تعطيل حظر المكالمات لمدة 48 ساعة."</string>
-    <string name="call_blocking_disabled_notification_text" msgid="141384084865180722">"تم التعطيل نظرًا لإجراء مكالمة طوارئ."</string>
-    <string name="block_report_number_alert_title" msgid="2740581989824959611">"هل تريد حظر الرقم <xliff:g id="NUMBER">%1$s</xliff:g>؟"</string>
-    <string name="block_report_number_alert_details" msgid="2652479394593143562">"لن تتلقى المزيد من المكالمات من هذا الرقم."</string>
-    <string name="block_number_alert_details" msgid="715942751312046429">"<xliff:g id="TEXT">%1$s</xliff:g> سيتم الإبلاغ عن هذه المكالمة باعتبارها غير مرغوب فيها."</string>
-    <string name="unblock_number_alert_details" msgid="8696070817026870606">"سيُزال حظر هذا الرقم دون الإبلاغ عنه كرقم غير مرغوب. لن تصلك المكالمات فيما بعد كغير مرغوب فيها."</string>
-    <string name="unblock_report_number_alert_title" msgid="2221901995393696882">"هل تريد إزالة حظر <xliff:g id="NUMBER">%1$s</xliff:g>؟"</string>
-    <string name="report_not_spam_alert_button" msgid="3244953565919894995">"إبلاغ"</string>
-    <string name="report_not_spam_alert_title" msgid="395961923213504916">"هل تريد الإبلاغ عن خطأ؟"</string>
-    <string name="report_not_spam_alert_details" msgid="4463730683530824797">"المكالمات الواردة من <xliff:g id="NUMBER">%1$s</xliff:g> في المستقبل لن يتم تحديدها على أنها غير مرغوب فيها."</string>
-    <string name="checkbox_report_as_spam_action" msgid="1549159682170273798">"الإبلاغ عن المكالمة كغير مرغوب فيها"</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="migrate_blocked_numbers_dialog_title">حظر جديد ومبسط</string>
+  <string name="migrate_blocked_numbers_dialog_message">لحمايتك بشكل أفضل، يحتاج الهاتف إلى تغيير آلية تنفيذ الحظر. تؤدي الآن ميزة حظر الأرقام إلى إيقاف كل من المكالمات والرسائل النصية، كما أن ذلك الحظر يمكن أن يمتد إلى تطبيقات أخرى.</string>
+  <string name="migrate_blocked_numbers_dialog_allow_button">سماح</string>
+  <string name="old_block_number_confirmation_title">هل تريد حظر %1$s؟</string>
+  <string name="block_number_confirmation_message_vvm">سيتم حظر المكالمات الواردة من هذا الرقم كما سيتم تلقائيًا حذف الرسائل الصوتية.</string>
+  <string name="block_number_confirmation_message_no_vvm">سيتم حظر المكالمات من هذا الرقم، إلا أنه سيظل بإمكان المتصل ترك رسائل صوتية.</string>
+  <string name="block_number_confirmation_message_new_filtering">لن تتلقي المكالمات أو المراسلات النصية بعد الآن من هذا الرقم.</string>
+  <string name="block_number_ok">حظر</string>
+  <string name="unblock_number_confirmation_title">هل تريد إزالة حظر %1$s؟</string>
+  <string name="unblock_number_ok">إلغاء الحظر</string>
+  <string name="invalidNumber">%1$s غير صالح.</string>
+  <string name="snackbar_number_blocked">تم حظر %1$s</string>
+  <string name="snackbar_number_unblocked">تم إلغاء حظر %1$s</string>
+  <string name="send_to_voicemail_import_failed">تعذّر الاستيراد</string>
+  <string name="call_blocking_disabled_notification_title">تم إيقاف حظر المكالمات لمدة 48 ساعة.</string>
+  <string name="call_blocking_disabled_notification_text">تم الإيقاف نظرًا لإجراء مكالمة طوارئ.</string>
 </resources>
diff --git a/java/com/android/dialer/blocking/res/values-az/strings.xml b/java/com/android/dialer/blocking/res/values-az/strings.xml
index f84a219..a72e4e6 100644
--- a/java/com/android/dialer/blocking/res/values-az/strings.xml
+++ b/java/com/android/dialer/blocking/res/values-az/strings.xml
@@ -1,46 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="migrate_blocked_numbers_dialog_title" msgid="7823962296457673809">"Yeni, sadələşdirilmiş bloklama"</string>
-    <string name="migrate_blocked_numbers_dialog_message" msgid="8309736147266462485">"Sizi daha yaxşı qorumaq üçün, Phone blok etmənin işləmə formasını dəyişməlidir. Bloklanmış nömrələriniz indi zəng və mətnləri dayandıracaq və digər tətbiqlər ilə paylaşıla bilər."</string>
-    <string name="migrate_blocked_numbers_dialog_allow_button" msgid="5192836471557751367">"İcazə verin"</string>
-    <string name="block_number_confirmation_title" msgid="2699521227461376076">"<xliff:g id="NUMBER">%1$s</xliff:g> nömrəsi blok edilsin?"</string>
-    <string name="block_number_confirmation_message_vvm" msgid="6501105244172290939">"Bu nömrədən zənglər blok ediləcək və səsli məktublar avtomatik silinəcək."</string>
-    <string name="block_number_confirmation_message_no_vvm" msgid="8236641245709649882">"Bu nömrədən zənglər bağlanacaq, amma zəng edən səsli zəng qoya bilər."</string>
-    <string name="block_number_confirmation_message_new_filtering" msgid="8487449683723062644">"Bu nömrədən daha zəng və ya mesaj almayacaqsınız."</string>
-    <string name="block_number_ok" msgid="739786082788038932">"BLOK"</string>
-    <string name="unblock_number_confirmation_title" msgid="7897778825085659941">"<xliff:g id="NUMBER">%1$s</xliff:g> nömrəsi blokdan çıxarılsın?"</string>
-    <string name="unblock_number_ok" msgid="5089057152966269355">"BLOKDAN ÇIXARIN"</string>
-    <string name="invalidNumber" msgid="6270918250761754967">"<xliff:g id="NUMBER">%1$s</xliff:g> yanlışdır."</string>
-    <string name="snackbar_number_blocked" msgid="5760234822413921845">"<xliff:g id="NUMBER">%1$s</xliff:g> blok edilib"</string>
-    <string name="snackbar_number_unblocked" msgid="7941296274123990585">"<xliff:g id="NUMBER">%1$s</xliff:g> blokdan çıxarılıb"</string>
-    <string name="block_number_undo" msgid="5158120911892491697">"GERİ ALIN"</string>
-    <string name="send_to_voicemail_import_failed" msgid="1012752662074208237">"Import alınmadı"</string>
-    <string name="call_blocking_disabled_notification_title" msgid="7211352205255347489">"Çağrının bloklanması 48 saatlıq deaktiv edildi"</string>
-    <string name="call_blocking_disabled_notification_text" msgid="141384084865180722">"Təcili zəng olduğu üçün deaktiv edildi."</string>
-    <string name="block_report_number_alert_title" msgid="2740581989824959611">"<xliff:g id="NUMBER">%1$s</xliff:g> nömrəsi blok edilsin?"</string>
-    <string name="block_report_number_alert_details" msgid="2652479394593143562">"Bu nömrədən daha zəng qəbul etməyəcəksiniz."</string>
-    <string name="block_number_alert_details" msgid="715942751312046429">"<xliff:g id="TEXT">%1$s</xliff:g> Bu zəng spam kimi qeyd olunacaq."</string>
-    <string name="unblock_number_alert_details" msgid="8696070817026870606">"Bu nömrə blokdan çıxarılacaq və spam kimi qeyd olunmayacaq. Gələcək zənglər spam kimi müəyyən edilməyəcək."</string>
-    <string name="unblock_report_number_alert_title" msgid="2221901995393696882">"<xliff:g id="NUMBER">%1$s</xliff:g> nömrəsi blokdan çıxarılsın?"</string>
-    <string name="report_not_spam_alert_button" msgid="3244953565919894995">"Şikayət edin"</string>
-    <string name="report_not_spam_alert_title" msgid="395961923213504916">"Səhv bildirilsin?"</string>
-    <string name="report_not_spam_alert_details" msgid="4463730683530824797">"<xliff:g id="NUMBER">%1$s</xliff:g> nömrəsindən gələcək zənglər daha spam kimi qeyd olunmayacaq."</string>
-    <string name="checkbox_report_as_spam_action" msgid="1549159682170273798">"Zəngi spam olaraq bildirin"</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="migrate_blocked_numbers_dialog_title">Yeni, sadələşdirilmiş bloklama</string>
+  <string name="migrate_blocked_numbers_dialog_message">Sizi daha yaxşı qorumaq üçün, Phone blok etmənin işləmə formasını dəyişməlidir. Bloklanmış nömrələriniz indi zəng və mətnləri dayandıracaq və digər tətbiqlər ilə paylaşıla bilər.</string>
+  <string name="migrate_blocked_numbers_dialog_allow_button">İcazə verin</string>
+  <string name="old_block_number_confirmation_title">%1$s blok edilsin?</string>
+  <string name="block_number_confirmation_message_vvm">Bu nömrədən zənglər blok ediləcək və səsli məktublar avtomatik silinəcək.</string>
+  <string name="block_number_confirmation_message_no_vvm">Bu nömrədən zənglər bağlanacaq, amma zəng edən səsli zəng qoya bilər.</string>
+  <string name="block_number_confirmation_message_new_filtering">Bu nömrədən daha zəng və ya mesaj almayacaqsınız.</string>
+  <string name="block_number_ok">BLOK</string>
+  <string name="unblock_number_confirmation_title">%1$s blokdan çıxarılsın?</string>
+  <string name="unblock_number_ok">BLOKDAN ÇIXARIN</string>
+  <string name="invalidNumber">%1$s yanlışdır.</string>
+  <string name="snackbar_number_blocked">%1$s blok edilib</string>
+  <string name="snackbar_number_unblocked">%1$s blokdan çıxarılıb</string>
+  <string name="send_to_voicemail_import_failed">Import alınmadı</string>
+  <string name="call_blocking_disabled_notification_title">Çağrının bloklanması 48 saatlıq deaktiv edildi</string>
+  <string name="call_blocking_disabled_notification_text">Təcili zəng olduğu üçün deaktiv edildi.</string>
 </resources>
diff --git a/java/com/android/dialer/blocking/res/values-b+sr+Latn/strings.xml b/java/com/android/dialer/blocking/res/values-b+sr+Latn/strings.xml
index 238dde0..2a3bae8 100644
--- a/java/com/android/dialer/blocking/res/values-b+sr+Latn/strings.xml
+++ b/java/com/android/dialer/blocking/res/values-b+sr+Latn/strings.xml
@@ -1,46 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="migrate_blocked_numbers_dialog_title" msgid="7823962296457673809">"Novo, jednostavnije blokiranje"</string>
-    <string name="migrate_blocked_numbers_dialog_message" msgid="8309736147266462485">"Telefon treba da promeni način na koji blokiranje funkcioniše da bi vam pružio bolju zaštitu. Sa blokiranih brojeva više nećete primati ni pozive ni SMS-ove, ali možete da ih delite sa drugim aplikacijama."</string>
-    <string name="migrate_blocked_numbers_dialog_allow_button" msgid="5192836471557751367">"Dozvoli"</string>
-    <string name="block_number_confirmation_title" msgid="2699521227461376076">"Želite li da blokirate <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="block_number_confirmation_message_vvm" msgid="6501105244172290939">"Pozivi sa ovog broja će biti blokirani i poruke govorne pošte će se automatski brisati."</string>
-    <string name="block_number_confirmation_message_no_vvm" msgid="8236641245709649882">"Pozivi sa ovog broja će biti blokirani, ali pozivalac i dalje može da vam ostavlja poruke govorne pošte."</string>
-    <string name="block_number_confirmation_message_new_filtering" msgid="8487449683723062644">"Više nećete primati pozive ni SMS-ove sa ovog broja."</string>
-    <string name="block_number_ok" msgid="739786082788038932">"BLOKIRAJ"</string>
-    <string name="unblock_number_confirmation_title" msgid="7897778825085659941">"Želite li da deblokirate <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="unblock_number_ok" msgid="5089057152966269355">"DEBLOKIRAJ"</string>
-    <string name="invalidNumber" msgid="6270918250761754967">"<xliff:g id="NUMBER">%1$s</xliff:g> je nevažeći."</string>
-    <string name="snackbar_number_blocked" msgid="5760234822413921845">"<xliff:g id="NUMBER">%1$s</xliff:g> je blokiran"</string>
-    <string name="snackbar_number_unblocked" msgid="7941296274123990585">"<xliff:g id="NUMBER">%1$s</xliff:g> je deblokiran"</string>
-    <string name="block_number_undo" msgid="5158120911892491697">"OPOZOVI"</string>
-    <string name="send_to_voicemail_import_failed" msgid="1012752662074208237">"Uvoz nije uspeo"</string>
-    <string name="call_blocking_disabled_notification_title" msgid="7211352205255347489">"Blokiranje poziva je onemogućeno na 48 sati"</string>
-    <string name="call_blocking_disabled_notification_text" msgid="141384084865180722">"Onemogućeno je zato što je upućen hitan poziv."</string>
-    <string name="block_report_number_alert_title" msgid="2740581989824959611">"Želite li da blokirate <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="block_report_number_alert_details" msgid="2652479394593143562">"Više nećete primati pozive sa ovog broja."</string>
-    <string name="block_number_alert_details" msgid="715942751312046429">"<xliff:g id="TEXT">%1$s</xliff:g> Prijavićemo ovaj poziv kao nepoželjan."</string>
-    <string name="unblock_number_alert_details" msgid="8696070817026870606">"Deblokiraćemo broj i prijaviti da nije nepoželjan. Budući pozivi neće biti označavani kao nepoželjni."</string>
-    <string name="unblock_report_number_alert_title" msgid="2221901995393696882">"Želite li da deblokirate <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="report_not_spam_alert_button" msgid="3244953565919894995">"Prijavi"</string>
-    <string name="report_not_spam_alert_title" msgid="395961923213504916">"Želite da prijavite grešku?"</string>
-    <string name="report_not_spam_alert_details" msgid="4463730683530824797">"Budući pozivi sa <xliff:g id="NUMBER">%1$s</xliff:g> više neće biti označavani kao nepoželjni."</string>
-    <string name="checkbox_report_as_spam_action" msgid="1549159682170273798">"Prijavi poziv kao nepoželjan"</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="migrate_blocked_numbers_dialog_title">Novo, jednostavnije blokiranje</string>
+  <string name="migrate_blocked_numbers_dialog_message">Telefon treba da promeni način na koji blokiranje funkcioniše da bi vam pružio bolju zaštitu. Sa blokiranih brojeva više nećete primati ni pozive ni SMS-ove, ali možete da ih delite sa drugim aplikacijama.</string>
+  <string name="migrate_blocked_numbers_dialog_allow_button">Dozvoli</string>
+  <string name="old_block_number_confirmation_title">Želite li da blokirate %1$s?</string>
+  <string name="block_number_confirmation_message_vvm">Pozivi sa ovog broja će biti blokirani i poruke govorne pošte će se automatski brisati.</string>
+  <string name="block_number_confirmation_message_no_vvm">Pozivi sa ovog broja će biti blokirani, ali pozivalac i dalje može da vam ostavlja poruke govorne pošte.</string>
+  <string name="block_number_confirmation_message_new_filtering">Više nećete primati pozive ni SMS-ove sa ovog broja.</string>
+  <string name="block_number_ok">BLOKIRAJ</string>
+  <string name="unblock_number_confirmation_title">Želite li da deblokirate %1$s?</string>
+  <string name="unblock_number_ok">DEBLOKIRAJ</string>
+  <string name="invalidNumber">%1$s je nevažeći.</string>
+  <string name="snackbar_number_blocked">%1$s je blokiran</string>
+  <string name="snackbar_number_unblocked">%1$s je deblokiran</string>
+  <string name="send_to_voicemail_import_failed">Uvoz nije uspeo</string>
+  <string name="call_blocking_disabled_notification_title">Blokiranje poziva je onemogućeno na 48 sati</string>
+  <string name="call_blocking_disabled_notification_text">Onemogućeno je zato što je upućen hitan poziv.</string>
 </resources>
diff --git a/java/com/android/dialer/blocking/res/values-be/strings.xml b/java/com/android/dialer/blocking/res/values-be/strings.xml
index 62519de..1de602e 100644
--- a/java/com/android/dialer/blocking/res/values-be/strings.xml
+++ b/java/com/android/dialer/blocking/res/values-be/strings.xml
@@ -1,46 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="migrate_blocked_numbers_dialog_title" msgid="7823962296457673809">"Новае спрошчанае блакіраванне"</string>
-    <string name="migrate_blocked_numbers_dialog_message" msgid="8309736147266462485">"Каб лепш вас абараняць, Тэлефон павінен змяніць спосаб блакіроўкі. Зараз вашы заблакіраваныя нумары не могуць выкарыстоўвацца для выклікаў і перадачы тэкставых паведамленняў і могуць выкарыстоўвацца сумесна з іншымі праграмамі."</string>
-    <string name="migrate_blocked_numbers_dialog_allow_button" msgid="5192836471557751367">"Дазволіць"</string>
-    <string name="block_number_confirmation_title" msgid="2699521227461376076">"Заблакіраваць <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="block_number_confirmation_message_vvm" msgid="6501105244172290939">"Выклікі з гэтага нумара будуць блакіравацца, а паведамленні галасавой пошты - аўтаматычна выдаляцца."</string>
-    <string name="block_number_confirmation_message_no_vvm" msgid="8236641245709649882">"Выклікі з гэтага нумара будуць блакіравацца, але абанент усё яшчэ зможа пакінуць вам паведамленне галасавой пошты."</string>
-    <string name="block_number_confirmation_message_new_filtering" msgid="8487449683723062644">"Вы больш не будзеце атрымліваць выклікі або SMS з гэтага нумара."</string>
-    <string name="block_number_ok" msgid="739786082788038932">"БЛАКІРАВАЦЬ"</string>
-    <string name="unblock_number_confirmation_title" msgid="7897778825085659941">"Разблакіраваць <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="unblock_number_ok" msgid="5089057152966269355">"РАЗБЛАКІРАВАЦЬ"</string>
-    <string name="invalidNumber" msgid="6270918250761754967">"<xliff:g id="NUMBER">%1$s</xliff:g> несапраўдны."</string>
-    <string name="snackbar_number_blocked" msgid="5760234822413921845">"<xliff:g id="NUMBER">%1$s</xliff:g> заблакіраваны"</string>
-    <string name="snackbar_number_unblocked" msgid="7941296274123990585">"<xliff:g id="NUMBER">%1$s</xliff:g> разблакіраваны"</string>
-    <string name="block_number_undo" msgid="5158120911892491697">"АДРАБІЦЬ"</string>
-    <string name="send_to_voicemail_import_failed" msgid="1012752662074208237">"Імпарт не ўдаўся"</string>
-    <string name="call_blocking_disabled_notification_title" msgid="7211352205255347489">"Блакіроўка выклікаў адключана на 48 гадзін"</string>
-    <string name="call_blocking_disabled_notification_text" msgid="141384084865180722">"Адключана, таму што быў зроблены экстранны выклік."</string>
-    <string name="block_report_number_alert_title" msgid="2740581989824959611">"Заблакіраваць <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="block_report_number_alert_details" msgid="2652479394593143562">"Вы больш не будзеце атрымліваць выклікі з гэтага нумара."</string>
-    <string name="block_number_alert_details" msgid="715942751312046429">"<xliff:g id="TEXT">%1$s</xliff:g> Гэты выклік будзе заяўлены як спам."</string>
-    <string name="unblock_number_alert_details" msgid="8696070817026870606">"Гэты нумар будзе разблак. і заяўлены як не спам. Буд.выклікі i гал.пошта не будуць вызнач. як спам."</string>
-    <string name="unblock_report_number_alert_title" msgid="2221901995393696882">"Разблакіраваць <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="report_not_spam_alert_button" msgid="3244953565919894995">"Паведаміць"</string>
-    <string name="report_not_spam_alert_title" msgid="395961923213504916">"Паведаміць пра памылку?"</string>
-    <string name="report_not_spam_alert_details" msgid="4463730683530824797">"Будучыя выклікі з нумара <xliff:g id="NUMBER">%1$s</xliff:g> больш не будуць вызначацца як спам."</string>
-    <string name="checkbox_report_as_spam_action" msgid="1549159682170273798">"Заявіць, што выклік з\'яўляецца спамам"</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="migrate_blocked_numbers_dialog_title">Новае спрошчанае блакіраванне</string>
+  <string name="migrate_blocked_numbers_dialog_message">Каб лепш вас абараняць, Тэлефон павінен змяніць спосаб блакіроўкі. Зараз вашы заблакіраваныя нумары не могуць выкарыстоўвацца для выклікаў і перадачы тэкставых паведамленняў і могуць выкарыстоўвацца сумесна з іншымі праграмамі.</string>
+  <string name="migrate_blocked_numbers_dialog_allow_button">Дазволіць</string>
+  <string name="old_block_number_confirmation_title">Заблакіраваць нумар%1$s?</string>
+  <string name="block_number_confirmation_message_vvm">Выклікі з гэтага нумара будуць блакіравацца, а паведамленні галасавой пошты - аўтаматычна выдаляцца.</string>
+  <string name="block_number_confirmation_message_no_vvm">Выклікі з гэтага нумара будуць блакіравацца, але абанент усё яшчэ зможа пакінуць вам паведамленне галасавой пошты.</string>
+  <string name="block_number_confirmation_message_new_filtering">Вы больш не будзеце атрымліваць выклікі або SMS з гэтага нумара.</string>
+  <string name="block_number_ok">БЛАКІРАВАЦЬ</string>
+  <string name="unblock_number_confirmation_title">Разблакіраваць нумар%1$s?</string>
+  <string name="unblock_number_ok">РАЗБЛАКІРАВАЦЬ</string>
+  <string name="invalidNumber">Нумар %1$sнесапраўдны.</string>
+  <string name="snackbar_number_blocked">%1$s заблакіраваны</string>
+  <string name="snackbar_number_unblocked">Нумар %1$sразблакіраваны</string>
+  <string name="send_to_voicemail_import_failed">Імпарт не ўдаўся</string>
+  <string name="call_blocking_disabled_notification_title">Блакіроўка выклікаў адключана на 48 гадзін</string>
+  <string name="call_blocking_disabled_notification_text">Адключана, таму што быў зроблены экстранны выклік.</string>
 </resources>
diff --git a/java/com/android/dialer/blocking/res/values-bg/strings.xml b/java/com/android/dialer/blocking/res/values-bg/strings.xml
index 118cfe3..1809a2f 100644
--- a/java/com/android/dialer/blocking/res/values-bg/strings.xml
+++ b/java/com/android/dialer/blocking/res/values-bg/strings.xml
@@ -1,46 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="migrate_blocked_numbers_dialog_title" msgid="7823962296457673809">"Ново и лесно блокиране"</string>
-    <string name="migrate_blocked_numbers_dialog_message" msgid="8309736147266462485">"За да ви защитава по-добре, Phone трябва да промени начина на работа на функцията за блокиране. Вече няма да получавате обаждания и текстови съобщения от блокираните номера. Възможно е тези номера да бъдат споделени с други приложения."</string>
-    <string name="migrate_blocked_numbers_dialog_allow_button" msgid="5192836471557751367">"Разрешаване"</string>
-    <string name="block_number_confirmation_title" msgid="2699521227461376076">"Да се блокира ли <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="block_number_confirmation_message_vvm" msgid="6501105244172290939">"Обажданията от този номер ще бъдат блокирани, а гласовите съобщения – автоматично изтривани."</string>
-    <string name="block_number_confirmation_message_no_vvm" msgid="8236641245709649882">"Обажданията от този номер ще бъдат блокирани, но обаждащият се пак може да е в състояние да ви оставя гласови съобщения."</string>
-    <string name="block_number_confirmation_message_new_filtering" msgid="8487449683723062644">"Повече няма да получавате обаждания или SMS от този номер."</string>
-    <string name="block_number_ok" msgid="739786082788038932">"БЛОКИРАНЕ"</string>
-    <string name="unblock_number_confirmation_title" msgid="7897778825085659941">"Да се отблокира ли <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="unblock_number_ok" msgid="5089057152966269355">"ОТБЛОКИРАНЕ"</string>
-    <string name="invalidNumber" msgid="6270918250761754967">"Номер <xliff:g id="NUMBER">%1$s</xliff:g> е невалиден."</string>
-    <string name="snackbar_number_blocked" msgid="5760234822413921845">"Блокирахте <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="snackbar_number_unblocked" msgid="7941296274123990585">"Отблокирахте <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="block_number_undo" msgid="5158120911892491697">"ОТМЯНА"</string>
-    <string name="send_to_voicemail_import_failed" msgid="1012752662074208237">"Импортирането не бе успешно"</string>
-    <string name="call_blocking_disabled_notification_title" msgid="7211352205255347489">"Блокирането на обажданията е деактивирано за 48 часа"</string>
-    <string name="call_blocking_disabled_notification_text" msgid="141384084865180722">"Деактивирано, тъй като бе извършено спешно обаждане."</string>
-    <string name="block_report_number_alert_title" msgid="2740581989824959611">"Да се блокира ли <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="block_report_number_alert_details" msgid="2652479394593143562">"Повече няма да получавате обаждания от този номер."</string>
-    <string name="block_number_alert_details" msgid="715942751312046429">"<xliff:g id="TEXT">%1$s</xliff:g> За обаждането ще се подаде сигнал за спам."</string>
-    <string name="unblock_number_alert_details" msgid="8696070817026870606">"Номерът ще бъде отблокиран. Той и бъдещите обаждания от него няма да бъдат спам."</string>
-    <string name="unblock_report_number_alert_title" msgid="2221901995393696882">"Да се отблокира ли <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="report_not_spam_alert_button" msgid="3244953565919894995">"Сигнал"</string>
-    <string name="report_not_spam_alert_title" msgid="395961923213504916">"Подавате сигнал за грешка?"</string>
-    <string name="report_not_spam_alert_details" msgid="4463730683530824797">"Обажданията от <xliff:g id="NUMBER">%1$s</xliff:g> повече няма да се смятат за спам."</string>
-    <string name="checkbox_report_as_spam_action" msgid="1549159682170273798">"Сигнал за спам за обаждането"</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="migrate_blocked_numbers_dialog_title">Ново и лесно блокиране</string>
+  <string name="migrate_blocked_numbers_dialog_message">За да ви защитава по-добре, Phone трябва да промени начина на работа на функцията за блокиране. Вече няма да получавате обаждания и текстови съобщения от блокираните номера. Възможно е тези номера да бъдат споделени с други приложения.</string>
+  <string name="migrate_blocked_numbers_dialog_allow_button">Разрешаване</string>
+  <string name="old_block_number_confirmation_title">Да се блокира ли %1$s?</string>
+  <string name="block_number_confirmation_message_vvm">Обажданията от този номер ще бъдат блокирани, а гласовите съобщения – автоматично изтривани.</string>
+  <string name="block_number_confirmation_message_no_vvm">Обажданията от този номер ще бъдат блокирани, но обаждащият се пак може да е в състояние да ви оставя гласови съобщения.</string>
+  <string name="block_number_confirmation_message_new_filtering">Повече няма да получавате обаждания или SMS от този номер.</string>
+  <string name="block_number_ok">БЛОКИРАНЕ</string>
+  <string name="unblock_number_confirmation_title">Да се отблокира ли %1$s?</string>
+  <string name="unblock_number_ok">ОТБЛОКИРАНЕ</string>
+  <string name="invalidNumber">Номер %1$s е невалиден.</string>
+  <string name="snackbar_number_blocked">Блокирахте %1$s</string>
+  <string name="snackbar_number_unblocked">Отблокирахте %1$s</string>
+  <string name="send_to_voicemail_import_failed">Импортирането не бе успешно</string>
+  <string name="call_blocking_disabled_notification_title">Блокирането на обажданията е деактивирано за 48 часа</string>
+  <string name="call_blocking_disabled_notification_text">Деактивирано, тъй като бе извършено спешно обаждане.</string>
 </resources>
diff --git a/java/com/android/dialer/blocking/res/values-bn/strings.xml b/java/com/android/dialer/blocking/res/values-bn/strings.xml
index 3650ea1..66074b8 100644
--- a/java/com/android/dialer/blocking/res/values-bn/strings.xml
+++ b/java/com/android/dialer/blocking/res/values-bn/strings.xml
@@ -1,46 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="migrate_blocked_numbers_dialog_title" msgid="7823962296457673809">"নতুন, সরলীকৃত অবরুদ্ধ করার ব্যবস্থা"</string>
-    <string name="migrate_blocked_numbers_dialog_message" msgid="8309736147266462485">"আপনাকে আরও ভালো সুরক্ষা দিতে, \'ফোন\' এর ব্লক করার পদ্ধতি পরিবর্তন করতে হবে৷ আপনার ব্লক করা নম্বরগুলি থেকে আসা কলগুলি এবং পাঠ্যবার্তা উভয়ই থামানো হবে এবং অন্যান্য অ্যাপ্লিকেশানের সাথে শেয়ার করা হতে পারে৷"</string>
-    <string name="migrate_blocked_numbers_dialog_allow_button" msgid="5192836471557751367">"অনুমতি দিন"</string>
-    <string name="block_number_confirmation_title" msgid="2699521227461376076">"<xliff:g id="NUMBER">%1$s</xliff:g> অবরোধ করবেন?"</string>
-    <string name="block_number_confirmation_message_vvm" msgid="6501105244172290939">"এই নম্বর থেকে আসা কলগুলি অবরোধ করা হবে এবং ভয়েসমেলগুলি স্বয়ংক্রিয়ভাবে মুছে ফেলা হবে৷"</string>
-    <string name="block_number_confirmation_message_no_vvm" msgid="8236641245709649882">"এই নম্বর থেকে আসা কলগুলি অবরোধ করা হবে, কিন্তু কলার হয়ত এখনও আপনাকে ভয়েসমেলগুলি পাঠাতে পারবে৷"</string>
-    <string name="block_number_confirmation_message_new_filtering" msgid="8487449683723062644">"আপনি এই নম্বর থেকে আর কল বা পাঠ্যবার্তাগুলি পাবেন না৷"</string>
-    <string name="block_number_ok" msgid="739786082788038932">"অবরোধ করুন"</string>
-    <string name="unblock_number_confirmation_title" msgid="7897778825085659941">"<xliff:g id="NUMBER">%1$s</xliff:g> অবরোধ মুক্ত করবেন?"</string>
-    <string name="unblock_number_ok" msgid="5089057152966269355">"অবরোধ মুক্ত করুন"</string>
-    <string name="invalidNumber" msgid="6270918250761754967">"<xliff:g id="NUMBER">%1$s</xliff:g> অবৈধ৷"</string>
-    <string name="snackbar_number_blocked" msgid="5760234822413921845">"<xliff:g id="NUMBER">%1$s</xliff:g> অবরোধ করা হয়েছে"</string>
-    <string name="snackbar_number_unblocked" msgid="7941296274123990585">"<xliff:g id="NUMBER">%1$s</xliff:g> অবরোধ মুক্ত করা হয়েছে"</string>
-    <string name="block_number_undo" msgid="5158120911892491697">"পূর্বাবস্থায় ফিরুন"</string>
-    <string name="send_to_voicemail_import_failed" msgid="1012752662074208237">"আমদানি ব্যর্থ হয়েছে"</string>
-    <string name="call_blocking_disabled_notification_title" msgid="7211352205255347489">"৪৮ ঘন্টার জন্য কল অবরোধ করা অক্ষম করা হয়েছে"</string>
-    <string name="call_blocking_disabled_notification_text" msgid="141384084865180722">"কোনো জরুরি কল করার কারণে অক্ষম করা হয়েছে৷"</string>
-    <string name="block_report_number_alert_title" msgid="2740581989824959611">"<xliff:g id="NUMBER">%1$s</xliff:g> অবরোধ করবেন?"</string>
-    <string name="block_report_number_alert_details" msgid="2652479394593143562">"আপনি এই নম্বর থেকে আর কল পাবেন না৷"</string>
-    <string name="block_number_alert_details" msgid="715942751312046429">"<xliff:g id="TEXT">%1$s</xliff:g> এই কলটিকে স্প্যাম হিসাবে প্রতিবেদন করা হবে৷"</string>
-    <string name="unblock_number_alert_details" msgid="8696070817026870606">"এই নম্বরটিকে অবরোধ মুক্ত করা হবে এবং \'স্প্যাম নয়\' হিসাবে প্রতিবেদ করা হবে৷ এই নম্বর থেকে আসা ভবিষ্যৎ কলকে স্প্যাম হিসাবে সনাক্ত করা হবে না৷"</string>
-    <string name="unblock_report_number_alert_title" msgid="2221901995393696882">"<xliff:g id="NUMBER">%1$s</xliff:g> অবরোধ মুক্ত করবেন?"</string>
-    <string name="report_not_spam_alert_button" msgid="3244953565919894995">"অভিযোগ করুন"</string>
-    <string name="report_not_spam_alert_title" msgid="395961923213504916">"একটি ভুল প্রতিবেদন করেছেন?"</string>
-    <string name="report_not_spam_alert_details" msgid="4463730683530824797">"<xliff:g id="NUMBER">%1$s</xliff:g> থেকে আসা ভবিষ্যৎ কলগুলিকে আর স্প্যাম হিসাবে সনাক্ত করা হবে না৷"</string>
-    <string name="checkbox_report_as_spam_action" msgid="1549159682170273798">"কলটিকে স্প্যাম হিসাবে অভিযোগ করুন"</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="migrate_blocked_numbers_dialog_title">নতুন, সরলীকৃত অবরুদ্ধ করার ব্যবস্থা</string>
+  <string name="migrate_blocked_numbers_dialog_message">আপনাকে আরও ভালো সুরক্ষা দিতে, \'ফোন\' এর ব্লক করার পদ্ধতি পরিবর্তন করতে হবে৷ আপনার ব্লক করা নম্বরগুলি থেকে আসা কলগুলি এবং পাঠ্যবার্তা উভয়ই থামানো হবে এবং অন্যান্য অ্যাপ্লিকেশানের সাথে শেয়ার করা হতে পারে৷</string>
+  <string name="migrate_blocked_numbers_dialog_allow_button">অনুমতি দিন</string>
+  <string name="old_block_number_confirmation_title">%1$s ব্লক করবেন?</string>
+  <string name="block_number_confirmation_message_vvm">এই নম্বর থেকে আসা কলগুলি অবরোধ করা হবে এবং ভয়েসমেলগুলি স্বয়ংক্রিয়ভাবে মুছে ফেলা হবে৷</string>
+  <string name="block_number_confirmation_message_no_vvm">এই নম্বর থেকে আসা কলগুলি অবরোধ করা হবে, কিন্তু কলার হয়ত এখনও আপনাকে ভয়েসমেলগুলি পাঠাতে পারবে৷</string>
+  <string name="block_number_confirmation_message_new_filtering">আপনি এই নম্বর থেকে আর কল বা পাঠ্যবার্তাগুলি পাবেন না৷</string>
+  <string name="block_number_ok">অবরোধ করুন</string>
+  <string name="unblock_number_confirmation_title">%1$s আনব্লক করবেন?</string>
+  <string name="unblock_number_ok">অবরোধ মুক্ত করুন</string>
+  <string name="invalidNumber">%1$s নম্বরটি ভুল।</string>
+  <string name="snackbar_number_blocked">%1$s অবরোধ করা হয়েছে</string>
+  <string name="snackbar_number_unblocked">%1$s আনব্লক করা হয়েছে</string>
+  <string name="send_to_voicemail_import_failed">আমদানি ব্যর্থ হয়েছে</string>
+  <string name="call_blocking_disabled_notification_title">৪৮ ঘন্টার জন্য কল অবরোধ করা অক্ষম করা হয়েছে</string>
+  <string name="call_blocking_disabled_notification_text">কোনো জরুরি কল করার কারণে অক্ষম করা হয়েছে৷</string>
 </resources>
diff --git a/java/com/android/dialer/blocking/res/values-bs/strings.xml b/java/com/android/dialer/blocking/res/values-bs/strings.xml
index 10c32ef..6d2fabc 100644
--- a/java/com/android/dialer/blocking/res/values-bs/strings.xml
+++ b/java/com/android/dialer/blocking/res/values-bs/strings.xml
@@ -1,46 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="migrate_blocked_numbers_dialog_title" msgid="7823962296457673809">"Novo, jednostavnije blokiranje"</string>
-    <string name="migrate_blocked_numbers_dialog_message" msgid="8309736147266462485">"Radi bolje zaštite, Telefon treba promijeniti način rada blokiranja. S blokiranih brojeva od sada nećete primati ni pozive ni tekstualne poruke i blokirani brojevi će se moći dijeliti s drugim aplikacijama."</string>
-    <string name="migrate_blocked_numbers_dialog_allow_button" msgid="5192836471557751367">"Dozvoli"</string>
-    <string name="block_number_confirmation_title" msgid="2699521227461376076">"Blokirati broj <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="block_number_confirmation_message_vvm" msgid="6501105244172290939">"Pozivi s ovog broja će biti blokirani, a govorna pošta će se automatski brisati."</string>
-    <string name="block_number_confirmation_message_no_vvm" msgid="8236641245709649882">"Pozivi s ovog broja će biti blokirani, ali pozivalac će vam moći ostavljati govornu poštu."</string>
-    <string name="block_number_confirmation_message_new_filtering" msgid="8487449683723062644">"Više nećete primati pozive i SMS poruke s ovog broja."</string>
-    <string name="block_number_ok" msgid="739786082788038932">"BLOKIRAJ"</string>
-    <string name="unblock_number_confirmation_title" msgid="7897778825085659941">"Deblokirati broj <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="unblock_number_ok" msgid="5089057152966269355">"DEBLOKIRAJ"</string>
-    <string name="invalidNumber" msgid="6270918250761754967">"<xliff:g id="NUMBER">%1$s</xliff:g> je nevažeći."</string>
-    <string name="snackbar_number_blocked" msgid="5760234822413921845">"<xliff:g id="NUMBER">%1$s</xliff:g> je blokiran"</string>
-    <string name="snackbar_number_unblocked" msgid="7941296274123990585">"<xliff:g id="NUMBER">%1$s</xliff:g> je odblokiran"</string>
-    <string name="block_number_undo" msgid="5158120911892491697">"PONIŠTI"</string>
-    <string name="send_to_voicemail_import_failed" msgid="1012752662074208237">"Uvoz nije uspio"</string>
-    <string name="call_blocking_disabled_notification_title" msgid="7211352205255347489">"Blokiranje poziva je onemogućeno na 48 sati"</string>
-    <string name="call_blocking_disabled_notification_text" msgid="141384084865180722">"Onemogućeno jer je upućen hitni poziv."</string>
-    <string name="block_report_number_alert_title" msgid="2740581989824959611">"Blokirati broj <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="block_report_number_alert_details" msgid="2652479394593143562">"Više nećete primati pozive s ovog broja."</string>
-    <string name="block_number_alert_details" msgid="715942751312046429">"<xliff:g id="TEXT">%1$s</xliff:g> Ovaj poziv će biti prijavljen kao neželjen."</string>
-    <string name="unblock_number_alert_details" msgid="8696070817026870606">"Odblokiraćemo broj i prijaviti da nije neželjen. Budući pozivi neće biti neželjeni."</string>
-    <string name="unblock_report_number_alert_title" msgid="2221901995393696882">"Deblokirati broj <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="report_not_spam_alert_button" msgid="3244953565919894995">"Prijavi"</string>
-    <string name="report_not_spam_alert_title" msgid="395961923213504916">"Prijaviti grešku?"</string>
-    <string name="report_not_spam_alert_details" msgid="4463730683530824797">"Budući pozovi s broja <xliff:g id="NUMBER">%1$s</xliff:g> neće biti neželjeni."</string>
-    <string name="checkbox_report_as_spam_action" msgid="1549159682170273798">"Prijavi poziv kao neželjen"</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="migrate_blocked_numbers_dialog_title">Novo, jednostavnije blokiranje</string>
+  <string name="migrate_blocked_numbers_dialog_message">Radi bolje zaštite, Telefon treba promijeniti način rada blokiranja. S blokiranih brojeva od sada nećete primati ni pozive ni SMS-ove i blokirani brojevi će se moći dijeliti s drugim aplikacijama.</string>
+  <string name="migrate_blocked_numbers_dialog_allow_button">Dozvoli</string>
+  <string name="old_block_number_confirmation_title">Blokirati broj %1$s?</string>
+  <string name="block_number_confirmation_message_vvm">Pozivi s ovog broja će biti blokirani, a govorna pošta će se automatski brisati.</string>
+  <string name="block_number_confirmation_message_no_vvm">Pozivi s ovog broja će biti blokirani, ali pozivalac će vam moći ostavljati govornu poštu.</string>
+  <string name="block_number_confirmation_message_new_filtering">Više nećete primati pozive i SMS poruke s ovog broja.</string>
+  <string name="block_number_ok">BLOKIRAJ</string>
+  <string name="unblock_number_confirmation_title">Deblokirati broj %1$s?</string>
+  <string name="unblock_number_ok">DEBLOKIRAJ</string>
+  <string name="invalidNumber">Broj %1$s je nevažeći.</string>
+  <string name="snackbar_number_blocked">%1$s je blokiran</string>
+  <string name="snackbar_number_unblocked">Broj %1$s je deblokiran</string>
+  <string name="send_to_voicemail_import_failed">Uvoz nije uspio</string>
+  <string name="call_blocking_disabled_notification_title">Blokiranje poziva je onemogućeno na 48 sati</string>
+  <string name="call_blocking_disabled_notification_text">Onemogućeno jer je upućen hitni poziv.</string>
 </resources>
diff --git a/java/com/android/dialer/blocking/res/values-ca/strings.xml b/java/com/android/dialer/blocking/res/values-ca/strings.xml
index 3d32fa9..dbc8e2b 100644
--- a/java/com/android/dialer/blocking/res/values-ca/strings.xml
+++ b/java/com/android/dialer/blocking/res/values-ca/strings.xml
@@ -1,46 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="migrate_blocked_numbers_dialog_title" msgid="7823962296457673809">"Bloqueig nou i simplificat"</string>
-    <string name="migrate_blocked_numbers_dialog_message" msgid="8309736147266462485">"Per protegir-te millor, l\'aplicació Telèfon ha de canviar la manera com funciona el bloqueig. No rebràs trucades ni missatges de text dels números bloquejats, i pot ser que compartim aquests números amb altres aplicacions."</string>
-    <string name="migrate_blocked_numbers_dialog_allow_button" msgid="5192836471557751367">"Permet"</string>
-    <string name="block_number_confirmation_title" msgid="2699521227461376076">"Vols bloquejar el número <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="block_number_confirmation_message_vvm" msgid="6501105244172290939">"Es bloquejaran les trucades d\'aquest número i els missatges de veu se suprimiran automàticament."</string>
-    <string name="block_number_confirmation_message_no_vvm" msgid="8236641245709649882">"Es bloquejaran les trucades d\'aquest número, però és possible que continuïn deixant-te missatges de veu."</string>
-    <string name="block_number_confirmation_message_new_filtering" msgid="8487449683723062644">"Deixaràs de rebre trucades i missatges de text d\'aquest número."</string>
-    <string name="block_number_ok" msgid="739786082788038932">"BLOQUEJA"</string>
-    <string name="unblock_number_confirmation_title" msgid="7897778825085659941">"Vols desbloquejar el número <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="unblock_number_ok" msgid="5089057152966269355">"DESBLOQUEJA"</string>
-    <string name="invalidNumber" msgid="6270918250761754967">"<xliff:g id="NUMBER">%1$s</xliff:g> no és vàlid."</string>
-    <string name="snackbar_number_blocked" msgid="5760234822413921845">"S\'ha bloquejat el número <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="snackbar_number_unblocked" msgid="7941296274123990585">"S\'ha desbloquejat el número <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="block_number_undo" msgid="5158120911892491697">"DESFÉS"</string>
-    <string name="send_to_voicemail_import_failed" msgid="1012752662074208237">"Error en la importació"</string>
-    <string name="call_blocking_disabled_notification_title" msgid="7211352205255347489">"El bloqueig de trucades s\'ha desactivat durant 48 hores"</string>
-    <string name="call_blocking_disabled_notification_text" msgid="141384084865180722">"S\'ha desactivat perquè s\'ha fet una trucada d\'emergència."</string>
-    <string name="block_report_number_alert_title" msgid="2740581989824959611">"Vols bloquejar el número <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="block_report_number_alert_details" msgid="2652479394593143562">"Deixaràs de rebre trucades d\'aquest número."</string>
-    <string name="block_number_alert_details" msgid="715942751312046429">"<xliff:g id="TEXT">%1$s</xliff:g> Aquesta trucada es marcarà com a brossa."</string>
-    <string name="unblock_number_alert_details" msgid="8696070817026870606">"Aquest número es desbloquejarà i no es considerarà brossa; les trucades futures, tampoc."</string>
-    <string name="unblock_report_number_alert_title" msgid="2221901995393696882">"Vols desbloquejar el número <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="report_not_spam_alert_button" msgid="3244953565919894995">"Informa"</string>
-    <string name="report_not_spam_alert_title" msgid="395961923213504916">"Vols informar d\'un error?"</string>
-    <string name="report_not_spam_alert_details" msgid="4463730683530824797">"Les trucades futures del número <xliff:g id="NUMBER">%1$s</xliff:g> ja no es consideraran brossa."</string>
-    <string name="checkbox_report_as_spam_action" msgid="1549159682170273798">"Marca la trucada com a brossa"</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="migrate_blocked_numbers_dialog_title">Bloqueig nou i simplificat</string>
+  <string name="migrate_blocked_numbers_dialog_message">Per protegir-te millor, l\'aplicació Telèfon ha de canviar la manera com funciona el bloqueig. No rebràs trucades ni missatges de text dels números bloquejats, i pot ser que compartim aquests números amb altres aplicacions.</string>
+  <string name="migrate_blocked_numbers_dialog_allow_button">Permet</string>
+  <string name="old_block_number_confirmation_title">Vols bloquejar el número %1$s?</string>
+  <string name="block_number_confirmation_message_vvm">Es bloquejaran les trucades d\'aquest número i els missatges de veu se suprimiran automàticament.</string>
+  <string name="block_number_confirmation_message_no_vvm">Es bloquejaran les trucades d\'aquest número, però és possible que continuïn deixant-te missatges de veu.</string>
+  <string name="block_number_confirmation_message_new_filtering">Deixaràs de rebre trucades i missatges de text d\'aquest número.</string>
+  <string name="block_number_ok">BLOQUEJA</string>
+  <string name="unblock_number_confirmation_title">Vols desbloquejar el número %1$s?</string>
+  <string name="unblock_number_ok">DESBLOQUEJA</string>
+  <string name="invalidNumber">El número %1$s no és vàlid.</string>
+  <string name="snackbar_number_blocked">S\'ha bloquejat el número %1$s</string>
+  <string name="snackbar_number_unblocked">S\'ha desbloquejat el número %1$s</string>
+  <string name="send_to_voicemail_import_failed">Error en la importació</string>
+  <string name="call_blocking_disabled_notification_title">El bloqueig de trucades s\'ha desactivat durant 48 hores</string>
+  <string name="call_blocking_disabled_notification_text">S\'ha desactivat perquè s\'ha fet una trucada d\'emergència.</string>
 </resources>
diff --git a/java/com/android/dialer/blocking/res/values-cs/strings.xml b/java/com/android/dialer/blocking/res/values-cs/strings.xml
index 4b1f529..7744ee1 100644
--- a/java/com/android/dialer/blocking/res/values-cs/strings.xml
+++ b/java/com/android/dialer/blocking/res/values-cs/strings.xml
@@ -1,46 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="migrate_blocked_numbers_dialog_title" msgid="7823962296457673809">"Nové zjednodušené blokování"</string>
-    <string name="migrate_blocked_numbers_dialog_message" msgid="8309736147266462485">"Z důvodu zvýšení zabezpečení potřebuje aplikace Telefon změnit nastavení blokování. Blokovaná čísla vám nyní nebudou moci volat ani psát SMS a mohou být sdílena s dalšími aplikacemi."</string>
-    <string name="migrate_blocked_numbers_dialog_allow_button" msgid="5192836471557751367">"Povolit"</string>
-    <string name="block_number_confirmation_title" msgid="2699521227461376076">"Blokovat číslo <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="block_number_confirmation_message_vvm" msgid="6501105244172290939">"Volání z tohoto čísla budou zablokována. Hlasové zprávy budou automaticky smazány."</string>
-    <string name="block_number_confirmation_message_no_vvm" msgid="8236641245709649882">"Volání z tohoto čísla budou zablokována, avšak volající vám bude moci zanechat hlasovou zprávu."</string>
-    <string name="block_number_confirmation_message_new_filtering" msgid="8487449683723062644">"Z tohoto čísla už nebudete přijímat hovory ani zprávy SMS."</string>
-    <string name="block_number_ok" msgid="739786082788038932">"BLOKOVAT"</string>
-    <string name="unblock_number_confirmation_title" msgid="7897778825085659941">"Odblokovat číslo <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="unblock_number_ok" msgid="5089057152966269355">"ODBLOKOVAT"</string>
-    <string name="invalidNumber" msgid="6270918250761754967">"Číslo <xliff:g id="NUMBER">%1$s</xliff:g> je neplatné."</string>
-    <string name="snackbar_number_blocked" msgid="5760234822413921845">"Číslo <xliff:g id="NUMBER">%1$s</xliff:g> zablokováno"</string>
-    <string name="snackbar_number_unblocked" msgid="7941296274123990585">"Číslo <xliff:g id="NUMBER">%1$s</xliff:g> odblokováno"</string>
-    <string name="block_number_undo" msgid="5158120911892491697">"VRÁTIT"</string>
-    <string name="send_to_voicemail_import_failed" msgid="1012752662074208237">"Import se nezdařil."</string>
-    <string name="call_blocking_disabled_notification_title" msgid="7211352205255347489">"Blokování hovorů je vypnuto na 48 hodin"</string>
-    <string name="call_blocking_disabled_notification_text" msgid="141384084865180722">"Vypnuto z důvodu provedeného tísňového volání"</string>
-    <string name="block_report_number_alert_title" msgid="2740581989824959611">"Blokovat číslo <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="block_report_number_alert_details" msgid="2652479394593143562">"Z tohoto čísla už nebudete přijímat hovory."</string>
-    <string name="block_number_alert_details" msgid="715942751312046429">"<xliff:g id="TEXT">%1$s</xliff:g> Hovor bude nahlášen jako spam."</string>
-    <string name="unblock_number_alert_details" msgid="8696070817026870606">"Toto číslo bude odblokováno a nahlášeno, že není spam. Budoucí hovory nebudou označeny jako spam."</string>
-    <string name="unblock_report_number_alert_title" msgid="2221901995393696882">"Odblokovat číslo <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="report_not_spam_alert_button" msgid="3244953565919894995">"Nahlásit"</string>
-    <string name="report_not_spam_alert_title" msgid="395961923213504916">"Nahlásit omyl?"</string>
-    <string name="report_not_spam_alert_details" msgid="4463730683530824797">"Budoucí hovory z čísla <xliff:g id="NUMBER">%1$s</xliff:g> už nebudou označeny jako spam."</string>
-    <string name="checkbox_report_as_spam_action" msgid="1549159682170273798">"Nahlásit hovor jako spam"</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="migrate_blocked_numbers_dialog_title">Nové zjednodušené blokování</string>
+  <string name="migrate_blocked_numbers_dialog_message">Z důvodu zvýšení zabezpečení potřebuje aplikace Telefon změnit nastavení blokování. Blokovaná čísla vám teď nebudou moci volat ani psát SMS a mohou být sdílena s dalšími aplikacemi.</string>
+  <string name="migrate_blocked_numbers_dialog_allow_button">Povolit</string>
+  <string name="old_block_number_confirmation_title">Blokovat číslo %1$s?</string>
+  <string name="block_number_confirmation_message_vvm">Volání z tohoto čísla budou zablokována. Hlasové zprávy budou automaticky smazány.</string>
+  <string name="block_number_confirmation_message_no_vvm">Volání z tohoto čísla budou zablokována, avšak volající vám bude moci zanechat hlasovou zprávu.</string>
+  <string name="block_number_confirmation_message_new_filtering">Z tohoto čísla už nebudete přijímat hovory ani zprávy SMS.</string>
+  <string name="block_number_ok">BLOKOVAT</string>
+  <string name="unblock_number_confirmation_title">Odblokovat číslo %1$s?</string>
+  <string name="unblock_number_ok">ODBLOKOVAT</string>
+  <string name="invalidNumber">Číslo %1$s je neplatné.</string>
+  <string name="snackbar_number_blocked">Číslo %1$s zablokováno</string>
+  <string name="snackbar_number_unblocked">Číslo %1$s odblokováno</string>
+  <string name="send_to_voicemail_import_failed">Import se nezdařil.</string>
+  <string name="call_blocking_disabled_notification_title">Blokování hovorů je vypnuto na 48 hodin</string>
+  <string name="call_blocking_disabled_notification_text">Vypnuto z důvodu provedeného tísňového volání</string>
 </resources>
diff --git a/java/com/android/dialer/blocking/res/values-da/strings.xml b/java/com/android/dialer/blocking/res/values-da/strings.xml
index 78a7b7b..cf6e809 100644
--- a/java/com/android/dialer/blocking/res/values-da/strings.xml
+++ b/java/com/android/dialer/blocking/res/values-da/strings.xml
@@ -1,46 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="migrate_blocked_numbers_dialog_title" msgid="7823962296457673809">"Ny, forenklet blokering"</string>
-    <string name="migrate_blocked_numbers_dialog_message" msgid="8309736147266462485">"Phone er nødt til at ændre, hvordan blokering fungerer, for bedre at kunne beskytte dig. Dine blokerede numre forhindrer både opkald og sms-beskeder, og de kan muligvis deles med andre apps."</string>
-    <string name="migrate_blocked_numbers_dialog_allow_button" msgid="5192836471557751367">"Tillad"</string>
-    <string name="block_number_confirmation_title" msgid="2699521227461376076">"Vil du blokere <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="block_number_confirmation_message_vvm" msgid="6501105244172290939">"Opkald fra dette nummer blokeres, og beskeder i telefonsvareren slettes automatisk."</string>
-    <string name="block_number_confirmation_message_no_vvm" msgid="8236641245709649882">"Opkald fra dette nummer bliver blokeret, men der kan muligvis stadig lægges beskeder i din telefonsvarer."</string>
-    <string name="block_number_confirmation_message_new_filtering" msgid="8487449683723062644">"Du modtager ikke længere opkald eller sms-beskeder fra dette nummer."</string>
-    <string name="block_number_ok" msgid="739786082788038932">"BLOKER"</string>
-    <string name="unblock_number_confirmation_title" msgid="7897778825085659941">"Vil du fjerne blokeringen af <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="unblock_number_ok" msgid="5089057152966269355">"FJERN BLOKERING"</string>
-    <string name="invalidNumber" msgid="6270918250761754967">"<xliff:g id="NUMBER">%1$s</xliff:g> er ugyldigt."</string>
-    <string name="snackbar_number_blocked" msgid="5760234822413921845">"<xliff:g id="NUMBER">%1$s</xliff:g> er blokeret"</string>
-    <string name="snackbar_number_unblocked" msgid="7941296274123990585">"<xliff:g id="NUMBER">%1$s</xliff:g> er ikke blokeret"</string>
-    <string name="block_number_undo" msgid="5158120911892491697">"FORTRYD"</string>
-    <string name="send_to_voicemail_import_failed" msgid="1012752662074208237">"Importen mislykkedes"</string>
-    <string name="call_blocking_disabled_notification_title" msgid="7211352205255347489">"Opkaldsblokering er blevet deaktiveret i 48 timer"</string>
-    <string name="call_blocking_disabled_notification_text" msgid="141384084865180722">"Deaktiveret, da du har foretaget et nødopkald."</string>
-    <string name="block_report_number_alert_title" msgid="2740581989824959611">"Vil du blokere <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="block_report_number_alert_details" msgid="2652479394593143562">"Du vil ikke længere modtage opkald fra dette nummer."</string>
-    <string name="block_number_alert_details" msgid="715942751312046429">"<xliff:g id="TEXT">%1$s</xliff:g> Dette opkald bliver rapporteret som spam."</string>
-    <string name="unblock_number_alert_details" msgid="8696070817026870606">"Blokeringen af nummeret ophæves, og spam rapporteres ikke. Nye opkald registreres ikke som spam."</string>
-    <string name="unblock_report_number_alert_title" msgid="2221901995393696882">"Vil du fjerne blokeringen af <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="report_not_spam_alert_button" msgid="3244953565919894995">"Rapportér"</string>
-    <string name="report_not_spam_alert_title" msgid="395961923213504916">"Vil du rapportere en fejl?"</string>
-    <string name="report_not_spam_alert_details" msgid="4463730683530824797">"Nye opkald fra <xliff:g id="NUMBER">%1$s</xliff:g> registreres ikke længere som spam."</string>
-    <string name="checkbox_report_as_spam_action" msgid="1549159682170273798">"Rapportér opkaldet som spam"</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="migrate_blocked_numbers_dialog_title">Ny, forenklet blokering</string>
+  <string name="migrate_blocked_numbers_dialog_message">Phone er nødt til at ændre, hvordan blokering fungerer, for bedre at kunne beskytte dig. Dine blokerede numre forhindrer både opkald og sms-beskeder, og de kan muligvis deles med andre apps.</string>
+  <string name="migrate_blocked_numbers_dialog_allow_button">Tillad</string>
+  <string name="old_block_number_confirmation_title">Vil du blokere %1$s?</string>
+  <string name="block_number_confirmation_message_vvm">Opkald fra dette nummer blokeres, og beskeder i telefonsvareren slettes automatisk.</string>
+  <string name="block_number_confirmation_message_no_vvm">Opkald fra dette nummer bliver blokeret, men der kan muligvis stadig lægges beskeder i din telefonsvarer.</string>
+  <string name="block_number_confirmation_message_new_filtering">Du modtager ikke længere opkald eller sms-beskeder fra dette nummer.</string>
+  <string name="block_number_ok">BLOKER</string>
+  <string name="unblock_number_confirmation_title">Vil du fjerne blokering af %1$s?</string>
+  <string name="unblock_number_ok">FJERN BLOKERING</string>
+  <string name="invalidNumber">%1$s er ugyldigt.</string>
+  <string name="snackbar_number_blocked">%1$s er blokeret</string>
+  <string name="snackbar_number_unblocked">Blokeringen af %1$s blev fjernet</string>
+  <string name="send_to_voicemail_import_failed">Importen mislykkedes</string>
+  <string name="call_blocking_disabled_notification_title">Opkaldsblokering er blevet deaktiveret i 48 timer</string>
+  <string name="call_blocking_disabled_notification_text">Deaktiveret, da du har foretaget et nødopkald.</string>
 </resources>
diff --git a/java/com/android/dialer/blocking/res/values-de/strings.xml b/java/com/android/dialer/blocking/res/values-de/strings.xml
index 37507eb..93d309f 100644
--- a/java/com/android/dialer/blocking/res/values-de/strings.xml
+++ b/java/com/android/dialer/blocking/res/values-de/strings.xml
@@ -1,46 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="migrate_blocked_numbers_dialog_title" msgid="7823962296457673809">"Neue einfache Blockierfunktion"</string>
-    <string name="migrate_blocked_numbers_dialog_message" msgid="8309736147266462485">"Um dich besser schützen zu können, müssen die Einstellungen der Blockierung beim Telefon geändert werden. Von blockierten Nummern erhältst du jetzt keine Anrufe und Nachrichten mehr und diese Nummern können auch an andere Apps weitergegeben werden."</string>
-    <string name="migrate_blocked_numbers_dialog_allow_button" msgid="5192836471557751367">"Zulassen"</string>
-    <string name="block_number_confirmation_title" msgid="2699521227461376076">"<xliff:g id="NUMBER">%1$s</xliff:g> blockieren?"</string>
-    <string name="block_number_confirmation_message_vvm" msgid="6501105244172290939">"Anrufe von dieser Nummer werden blockiert und Mailboxnachrichten automatisch gelöscht."</string>
-    <string name="block_number_confirmation_message_no_vvm" msgid="8236641245709649882">"Anrufe von dieser Nummer werden blockiert. Der Anrufer hat aber unter Umständen weiterhin die Möglichkeit, dir Mailboxnachrichten zu hinterlassen."</string>
-    <string name="block_number_confirmation_message_new_filtering" msgid="8487449683723062644">"Du erhältst von dieser Nummer keine Anrufe oder Nachrichten mehr."</string>
-    <string name="block_number_ok" msgid="739786082788038932">"BLOCKIEREN"</string>
-    <string name="unblock_number_confirmation_title" msgid="7897778825085659941">"Blockierung von <xliff:g id="NUMBER">%1$s</xliff:g> aufheben?"</string>
-    <string name="unblock_number_ok" msgid="5089057152966269355">"BLOCKIERUNG AUFHEBEN"</string>
-    <string name="invalidNumber" msgid="6270918250761754967">"<xliff:g id="NUMBER">%1$s</xliff:g> ist ungültig."</string>
-    <string name="snackbar_number_blocked" msgid="5760234822413921845">"<xliff:g id="NUMBER">%1$s</xliff:g> blockiert"</string>
-    <string name="snackbar_number_unblocked" msgid="7941296274123990585">"Blockierung von <xliff:g id="NUMBER">%1$s</xliff:g> aufgehoben"</string>
-    <string name="block_number_undo" msgid="5158120911892491697">"Rückgängig"</string>
-    <string name="send_to_voicemail_import_failed" msgid="1012752662074208237">"Import fehlgeschlagen"</string>
-    <string name="call_blocking_disabled_notification_title" msgid="7211352205255347489">"Anrufblockierung für 48 Stunden deaktiviert"</string>
-    <string name="call_blocking_disabled_notification_text" msgid="141384084865180722">"Deaktiviert, da ein Notruf getätigt wurde."</string>
-    <string name="block_report_number_alert_title" msgid="2740581989824959611">"<xliff:g id="NUMBER">%1$s</xliff:g> blockieren?"</string>
-    <string name="block_report_number_alert_details" msgid="2652479394593143562">"Du erhältst von dieser Nummer keine Anrufe mehr."</string>
-    <string name="block_number_alert_details" msgid="715942751312046429">"<xliff:g id="TEXT">%1$s</xliff:g> Dieser Anruf wird als Spam gemeldet."</string>
-    <string name="unblock_number_alert_details" msgid="8696070817026870606">"Die Nummer wird nicht mehr blockiert und nicht als Spam gemeldet. Zukünftige Anrufe sind kein Spam."</string>
-    <string name="unblock_report_number_alert_title" msgid="2221901995393696882">"Blockierung von <xliff:g id="NUMBER">%1$s</xliff:g> aufheben?"</string>
-    <string name="report_not_spam_alert_button" msgid="3244953565919894995">"Melden"</string>
-    <string name="report_not_spam_alert_title" msgid="395961923213504916">"Fehler melden?"</string>
-    <string name="report_not_spam_alert_details" msgid="4463730683530824797">"Zukünftige Anrufe von <xliff:g id="NUMBER">%1$s</xliff:g> werden nicht als Spam gekennzeichnet."</string>
-    <string name="checkbox_report_as_spam_action" msgid="1549159682170273798">"Anruf als Spam melden"</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="migrate_blocked_numbers_dialog_title">Neue einfache Blockierfunktion</string>
+  <string name="migrate_blocked_numbers_dialog_message">Um dich besser schützen zu können, müssen die Einstellungen der Blockierung beim Telefon geändert werden. Von blockierten Nummern erhältst du jetzt keine Anrufe und Nachrichten mehr und diese Nummern können auch an andere Apps weitergegeben werden.</string>
+  <string name="migrate_blocked_numbers_dialog_allow_button">Zulassen</string>
+  <string name="old_block_number_confirmation_title">%1$s blockieren?</string>
+  <string name="block_number_confirmation_message_vvm">Anrufe von dieser Nummer werden blockiert und Mailboxnachrichten automatisch gelöscht.</string>
+  <string name="block_number_confirmation_message_no_vvm">Anrufe von dieser Nummer werden blockiert. Der Anrufer hat aber unter Umständen weiterhin die Möglichkeit, dir Mailboxnachrichten zu hinterlassen.</string>
+  <string name="block_number_confirmation_message_new_filtering">Du erhältst von dieser Nummer keine Anrufe oder Nachrichten mehr.</string>
+  <string name="block_number_ok">BLOCKIEREN</string>
+  <string name="unblock_number_confirmation_title">Blockierung von %1$s aufheben?</string>
+  <string name="unblock_number_ok">BLOCKIERUNG AUFHEBEN</string>
+  <string name="invalidNumber">%1$s ist ungültig.</string>
+  <string name="snackbar_number_blocked">%1$s blockiert</string>
+  <string name="snackbar_number_unblocked">Blockierung von %1$s aufgehoben</string>
+  <string name="send_to_voicemail_import_failed">Import fehlgeschlagen</string>
+  <string name="call_blocking_disabled_notification_title">Anrufblockierung für 48 Stunden deaktiviert</string>
+  <string name="call_blocking_disabled_notification_text">Deaktiviert, da ein Notruf getätigt wurde.</string>
 </resources>
diff --git a/java/com/android/dialer/blocking/res/values-el/strings.xml b/java/com/android/dialer/blocking/res/values-el/strings.xml
index 6d985db..3284b5e 100644
--- a/java/com/android/dialer/blocking/res/values-el/strings.xml
+++ b/java/com/android/dialer/blocking/res/values-el/strings.xml
@@ -1,46 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="migrate_blocked_numbers_dialog_title" msgid="7823962296457673809">"Νέος, απλούστερος αποκλεισμός"</string>
-    <string name="migrate_blocked_numbers_dialog_message" msgid="8309736147266462485">"Για την καλύτερη δυνατή προστασία σας, το Phone πρέπει να αλλάξει τον τρόπο με τον οποίο λειτουργεί ο αποκλεισμός. Οι αποκλεισμένοι αριθμοί σας δεν θα επιτρέπουν πλέον τη λήψη τόσο κλήσεων όσο και μηνυμάτων κειμένου και μπορεί να κοινοποιηθούν σε άλλες εφαρμογές."</string>
-    <string name="migrate_blocked_numbers_dialog_allow_button" msgid="5192836471557751367">"Αποδοχή"</string>
-    <string name="block_number_confirmation_title" msgid="2699521227461376076">"Να αποκλειστεί ο αριθμός <xliff:g id="NUMBER">%1$s</xliff:g>;"</string>
-    <string name="block_number_confirmation_message_vvm" msgid="6501105244172290939">"Οι μελλοντικές κλήσεις από αυτόν τον αριθμό θα αποκλείονται και τα μηνύματα στον αυτόματο τηλεφωνητή θα διαγράφονται αυτόματα."</string>
-    <string name="block_number_confirmation_message_no_vvm" msgid="8236641245709649882">"Οι κλήσεις από αυτόν τον αριθμό θα αποκλείονται, αλλά ο καλών ενδέχεται να μπορεί να αφήνει μηνύματα στον αυτόματο τηλεφωνητή."</string>
-    <string name="block_number_confirmation_message_new_filtering" msgid="8487449683723062644">"Δεν θα λαμβάνετε πλέον κλήσεις ή μηνύματα κειμένου από αυτόν τον αριθμό."</string>
-    <string name="block_number_ok" msgid="739786082788038932">"ΑΠΟΚΛΕΙΣΜΟΣ"</string>
-    <string name="unblock_number_confirmation_title" msgid="7897778825085659941">"Να καταργηθεί ο αποκλεισμός του αριθμού <xliff:g id="NUMBER">%1$s</xliff:g>;"</string>
-    <string name="unblock_number_ok" msgid="5089057152966269355">"ΚΑΤΑΡΓΗΣΗ ΑΠΟΚΛΕΙΣΜΟΥ"</string>
-    <string name="invalidNumber" msgid="6270918250761754967">"Ο αριθμός <xliff:g id="NUMBER">%1$s</xliff:g> δεν είναι έγκυρος."</string>
-    <string name="snackbar_number_blocked" msgid="5760234822413921845">"Ο αριθμός <xliff:g id="NUMBER">%1$s</xliff:g> αποκλείστηκε"</string>
-    <string name="snackbar_number_unblocked" msgid="7941296274123990585">"Ο αποκλεισμός του αριθμού <xliff:g id="NUMBER">%1$s</xliff:g> καταργήθηκε"</string>
-    <string name="block_number_undo" msgid="5158120911892491697">"ΑΝΑΙΡΕΣΗ"</string>
-    <string name="send_to_voicemail_import_failed" msgid="1012752662074208237">"Αποτυχία εισαγωγής"</string>
-    <string name="call_blocking_disabled_notification_title" msgid="7211352205255347489">"Η φραγή κλήσεων απενεργοποιήθηκε για 48 ώρες"</string>
-    <string name="call_blocking_disabled_notification_text" msgid="141384084865180722">"Απενεργοποιημένο επειδή πραγματοποιήθηκε κλήση έκτακτης ανάγκης."</string>
-    <string name="block_report_number_alert_title" msgid="2740581989824959611">"Να αποκλειστεί ο αριθμός <xliff:g id="NUMBER">%1$s</xliff:g>;"</string>
-    <string name="block_report_number_alert_details" msgid="2652479394593143562">"Δεν θα λαμβάνετε πλέον κλήσεις από αυτόν τον αριθμό."</string>
-    <string name="block_number_alert_details" msgid="715942751312046429">"<xliff:g id="TEXT">%1$s</xliff:g> Η κλήση αυτή θα αναφερθεί ως ανεπιθύμητη."</string>
-    <string name="unblock_number_alert_details" msgid="8696070817026870606">"Ο αποκλ. του αρ. θα καταργηθεί. Θα αναφερθεί ως μη ανεπιθ. Μελλοντικές κλ. δεν θα αναγν. ως ανεπιθ."</string>
-    <string name="unblock_report_number_alert_title" msgid="2221901995393696882">"Να καταργηθεί ο αποκλεισμός του αριθμού <xliff:g id="NUMBER">%1$s</xliff:g>;"</string>
-    <string name="report_not_spam_alert_button" msgid="3244953565919894995">"Αναφορά"</string>
-    <string name="report_not_spam_alert_title" msgid="395961923213504916">"Αναφορά λάθους;"</string>
-    <string name="report_not_spam_alert_details" msgid="4463730683530824797">"Τυχόν μελλοντικές κλήσεις από τον χρήστη <xliff:g id="NUMBER">%1$s</xliff:g> δεν θα αναγνωρίζονται ως ανεπιθύμητες."</string>
-    <string name="checkbox_report_as_spam_action" msgid="1549159682170273798">"Αναφορά κλήσ. ως ανεπιθύμητης;"</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="migrate_blocked_numbers_dialog_title">Νέος, απλούστερος αποκλεισμός</string>
+  <string name="migrate_blocked_numbers_dialog_message">Για την καλύτερη δυνατή προστασία σας, το Phone πρέπει να αλλάξει τον τρόπο με τον οποίο λειτουργεί ο αποκλεισμός. Οι αποκλεισμένοι αριθμοί σας δεν θα επιτρέπουν πλέον τη λήψη τόσο κλήσεων όσο και μηνυμάτων κειμένου και μπορεί να κοινοποιηθούν σε άλλες εφαρμογές.</string>
+  <string name="migrate_blocked_numbers_dialog_allow_button">Αποδοχή</string>
+  <string name="old_block_number_confirmation_title">Αποκλεισμός αριθμού %1$s;</string>
+  <string name="block_number_confirmation_message_vvm">Οι μελλοντικές κλήσεις από αυτόν τον αριθμό θα αποκλείονται και τα μηνύματα στον αυτόματο τηλεφωνητή θα διαγράφονται αυτόματα.</string>
+  <string name="block_number_confirmation_message_no_vvm">Οι κλήσεις από αυτόν τον αριθμό θα αποκλείονται, αλλά ο καλών ενδέχεται να μπορεί να αφήνει μηνύματα στον αυτόματο τηλεφωνητή.</string>
+  <string name="block_number_confirmation_message_new_filtering">Δεν θα λαμβάνετε πλέον κλήσεις ή μηνύματα κειμένου από αυτόν τον αριθμό.</string>
+  <string name="block_number_ok">ΑΠΟΚΛΕΙΣΜΟΣ</string>
+  <string name="unblock_number_confirmation_title">Να καταργηθεί ο αποκλεισμός του αριθμού %1$s;</string>
+  <string name="unblock_number_ok">ΚΑΤΑΡΓΗΣΗ ΑΠΟΚΛΕΙΣΜΟΥ</string>
+  <string name="invalidNumber">Ο αριθμός %1$s δεν είναι έγκυρος.</string>
+  <string name="snackbar_number_blocked">Ο αριθμός %1$s αποκλείστηκε</string>
+  <string name="snackbar_number_unblocked">Ο αποκλεισμός του αριθμού %1$s καταργήθηκε</string>
+  <string name="send_to_voicemail_import_failed">Αποτυχία εισαγωγής</string>
+  <string name="call_blocking_disabled_notification_title">Η φραγή κλήσεων απενεργοποιήθηκε για 48 ώρες</string>
+  <string name="call_blocking_disabled_notification_text">Απενεργοποιημένο επειδή πραγματοποιήθηκε κλήση έκτακτης ανάγκης.</string>
 </resources>
diff --git a/java/com/android/dialer/blocking/res/values-en-rAU/strings.xml b/java/com/android/dialer/blocking/res/values-en-rAU/strings.xml
index 9ff1c71..db19c37 100644
--- a/java/com/android/dialer/blocking/res/values-en-rAU/strings.xml
+++ b/java/com/android/dialer/blocking/res/values-en-rAU/strings.xml
@@ -1,46 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="migrate_blocked_numbers_dialog_title" msgid="7823962296457673809">"New, simplified blocking"</string>
-    <string name="migrate_blocked_numbers_dialog_message" msgid="8309736147266462485">"To protect you better, Phone needs to change how blocking works. Your blocked numbers will now stop both calls and texts and may be shared with other apps."</string>
-    <string name="migrate_blocked_numbers_dialog_allow_button" msgid="5192836471557751367">"Allow"</string>
-    <string name="block_number_confirmation_title" msgid="2699521227461376076">"Block <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="block_number_confirmation_message_vvm" msgid="6501105244172290939">"Calls from this number will be blocked and voicemails will be automatically deleted."</string>
-    <string name="block_number_confirmation_message_no_vvm" msgid="8236641245709649882">"Calls from this number will be blocked, but the caller may still be able to leave you voicemails."</string>
-    <string name="block_number_confirmation_message_new_filtering" msgid="8487449683723062644">"You will no longer receive calls or texts from this number."</string>
-    <string name="block_number_ok" msgid="739786082788038932">"BLOCK"</string>
-    <string name="unblock_number_confirmation_title" msgid="7897778825085659941">"Unblock <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="unblock_number_ok" msgid="5089057152966269355">"UNBLOCK"</string>
-    <string name="invalidNumber" msgid="6270918250761754967">"<xliff:g id="NUMBER">%1$s</xliff:g> is invalid."</string>
-    <string name="snackbar_number_blocked" msgid="5760234822413921845">"<xliff:g id="NUMBER">%1$s</xliff:g> blocked"</string>
-    <string name="snackbar_number_unblocked" msgid="7941296274123990585">"<xliff:g id="NUMBER">%1$s</xliff:g> unblocked"</string>
-    <string name="block_number_undo" msgid="5158120911892491697">"UNDO"</string>
-    <string name="send_to_voicemail_import_failed" msgid="1012752662074208237">"Import failed"</string>
-    <string name="call_blocking_disabled_notification_title" msgid="7211352205255347489">"Call blocking disabled for 48 hours"</string>
-    <string name="call_blocking_disabled_notification_text" msgid="141384084865180722">"Disabled because an emergency call was made."</string>
-    <string name="block_report_number_alert_title" msgid="2740581989824959611">"Block <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="block_report_number_alert_details" msgid="2652479394593143562">"You will no longer receive calls from this number."</string>
-    <string name="block_number_alert_details" msgid="715942751312046429">"<xliff:g id="TEXT">%1$s</xliff:g> This call will be reported as spam."</string>
-    <string name="unblock_number_alert_details" msgid="8696070817026870606">"This number will be unblocked and reported as not spam. Future calls won\'t be identified as spam."</string>
-    <string name="unblock_report_number_alert_title" msgid="2221901995393696882">"Unblock <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="report_not_spam_alert_button" msgid="3244953565919894995">"Report"</string>
-    <string name="report_not_spam_alert_title" msgid="395961923213504916">"Would you like to report a mistake?"</string>
-    <string name="report_not_spam_alert_details" msgid="4463730683530824797">"Future calls from <xliff:g id="NUMBER">%1$s</xliff:g> will no longer be identified as spam."</string>
-    <string name="checkbox_report_as_spam_action" msgid="1549159682170273798">"Report call as spam"</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="migrate_blocked_numbers_dialog_title">New, simplified blocking</string>
+  <string name="migrate_blocked_numbers_dialog_message">To protect you better, Phone needs to change how blocking works. Your blocked numbers will now stop both calls and texts and may be shared with other apps.</string>
+  <string name="migrate_blocked_numbers_dialog_allow_button">Allow</string>
+  <string name="old_block_number_confirmation_title">Block%1$s?</string>
+  <string name="block_number_confirmation_message_vvm">Calls from this number will be blocked and voicemails will be automatically deleted.</string>
+  <string name="block_number_confirmation_message_no_vvm">Calls from this number will be blocked, but the caller may still be able to leave you voicemails.</string>
+  <string name="block_number_confirmation_message_new_filtering">You will no longer receive calls or texts from this number.</string>
+  <string name="block_number_ok">BLOCK</string>
+  <string name="unblock_number_confirmation_title">Unblock%1$s?</string>
+  <string name="unblock_number_ok">UNBLOCK</string>
+  <string name="invalidNumber">%1$sis invalid.</string>
+  <string name="snackbar_number_blocked">%1$s blocked</string>
+  <string name="snackbar_number_unblocked">%1$sunblocked</string>
+  <string name="send_to_voicemail_import_failed">Import failed</string>
+  <string name="call_blocking_disabled_notification_title">Call blocking disabled for 48 hours</string>
+  <string name="call_blocking_disabled_notification_text">Disabled because an emergency call was made.</string>
 </resources>
diff --git a/java/com/android/dialer/blocking/res/values-en-rGB/strings.xml b/java/com/android/dialer/blocking/res/values-en-rGB/strings.xml
index 9ff1c71..db19c37 100644
--- a/java/com/android/dialer/blocking/res/values-en-rGB/strings.xml
+++ b/java/com/android/dialer/blocking/res/values-en-rGB/strings.xml
@@ -1,46 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="migrate_blocked_numbers_dialog_title" msgid="7823962296457673809">"New, simplified blocking"</string>
-    <string name="migrate_blocked_numbers_dialog_message" msgid="8309736147266462485">"To protect you better, Phone needs to change how blocking works. Your blocked numbers will now stop both calls and texts and may be shared with other apps."</string>
-    <string name="migrate_blocked_numbers_dialog_allow_button" msgid="5192836471557751367">"Allow"</string>
-    <string name="block_number_confirmation_title" msgid="2699521227461376076">"Block <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="block_number_confirmation_message_vvm" msgid="6501105244172290939">"Calls from this number will be blocked and voicemails will be automatically deleted."</string>
-    <string name="block_number_confirmation_message_no_vvm" msgid="8236641245709649882">"Calls from this number will be blocked, but the caller may still be able to leave you voicemails."</string>
-    <string name="block_number_confirmation_message_new_filtering" msgid="8487449683723062644">"You will no longer receive calls or texts from this number."</string>
-    <string name="block_number_ok" msgid="739786082788038932">"BLOCK"</string>
-    <string name="unblock_number_confirmation_title" msgid="7897778825085659941">"Unblock <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="unblock_number_ok" msgid="5089057152966269355">"UNBLOCK"</string>
-    <string name="invalidNumber" msgid="6270918250761754967">"<xliff:g id="NUMBER">%1$s</xliff:g> is invalid."</string>
-    <string name="snackbar_number_blocked" msgid="5760234822413921845">"<xliff:g id="NUMBER">%1$s</xliff:g> blocked"</string>
-    <string name="snackbar_number_unblocked" msgid="7941296274123990585">"<xliff:g id="NUMBER">%1$s</xliff:g> unblocked"</string>
-    <string name="block_number_undo" msgid="5158120911892491697">"UNDO"</string>
-    <string name="send_to_voicemail_import_failed" msgid="1012752662074208237">"Import failed"</string>
-    <string name="call_blocking_disabled_notification_title" msgid="7211352205255347489">"Call blocking disabled for 48 hours"</string>
-    <string name="call_blocking_disabled_notification_text" msgid="141384084865180722">"Disabled because an emergency call was made."</string>
-    <string name="block_report_number_alert_title" msgid="2740581989824959611">"Block <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="block_report_number_alert_details" msgid="2652479394593143562">"You will no longer receive calls from this number."</string>
-    <string name="block_number_alert_details" msgid="715942751312046429">"<xliff:g id="TEXT">%1$s</xliff:g> This call will be reported as spam."</string>
-    <string name="unblock_number_alert_details" msgid="8696070817026870606">"This number will be unblocked and reported as not spam. Future calls won\'t be identified as spam."</string>
-    <string name="unblock_report_number_alert_title" msgid="2221901995393696882">"Unblock <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="report_not_spam_alert_button" msgid="3244953565919894995">"Report"</string>
-    <string name="report_not_spam_alert_title" msgid="395961923213504916">"Would you like to report a mistake?"</string>
-    <string name="report_not_spam_alert_details" msgid="4463730683530824797">"Future calls from <xliff:g id="NUMBER">%1$s</xliff:g> will no longer be identified as spam."</string>
-    <string name="checkbox_report_as_spam_action" msgid="1549159682170273798">"Report call as spam"</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="migrate_blocked_numbers_dialog_title">New, simplified blocking</string>
+  <string name="migrate_blocked_numbers_dialog_message">To protect you better, Phone needs to change how blocking works. Your blocked numbers will now stop both calls and texts and may be shared with other apps.</string>
+  <string name="migrate_blocked_numbers_dialog_allow_button">Allow</string>
+  <string name="old_block_number_confirmation_title">Block%1$s?</string>
+  <string name="block_number_confirmation_message_vvm">Calls from this number will be blocked and voicemails will be automatically deleted.</string>
+  <string name="block_number_confirmation_message_no_vvm">Calls from this number will be blocked, but the caller may still be able to leave you voicemails.</string>
+  <string name="block_number_confirmation_message_new_filtering">You will no longer receive calls or texts from this number.</string>
+  <string name="block_number_ok">BLOCK</string>
+  <string name="unblock_number_confirmation_title">Unblock%1$s?</string>
+  <string name="unblock_number_ok">UNBLOCK</string>
+  <string name="invalidNumber">%1$sis invalid.</string>
+  <string name="snackbar_number_blocked">%1$s blocked</string>
+  <string name="snackbar_number_unblocked">%1$sunblocked</string>
+  <string name="send_to_voicemail_import_failed">Import failed</string>
+  <string name="call_blocking_disabled_notification_title">Call blocking disabled for 48 hours</string>
+  <string name="call_blocking_disabled_notification_text">Disabled because an emergency call was made.</string>
 </resources>
diff --git a/java/com/android/dialer/blocking/res/values-en-rIN/strings.xml b/java/com/android/dialer/blocking/res/values-en-rIN/strings.xml
index 9ff1c71..db19c37 100644
--- a/java/com/android/dialer/blocking/res/values-en-rIN/strings.xml
+++ b/java/com/android/dialer/blocking/res/values-en-rIN/strings.xml
@@ -1,46 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="migrate_blocked_numbers_dialog_title" msgid="7823962296457673809">"New, simplified blocking"</string>
-    <string name="migrate_blocked_numbers_dialog_message" msgid="8309736147266462485">"To protect you better, Phone needs to change how blocking works. Your blocked numbers will now stop both calls and texts and may be shared with other apps."</string>
-    <string name="migrate_blocked_numbers_dialog_allow_button" msgid="5192836471557751367">"Allow"</string>
-    <string name="block_number_confirmation_title" msgid="2699521227461376076">"Block <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="block_number_confirmation_message_vvm" msgid="6501105244172290939">"Calls from this number will be blocked and voicemails will be automatically deleted."</string>
-    <string name="block_number_confirmation_message_no_vvm" msgid="8236641245709649882">"Calls from this number will be blocked, but the caller may still be able to leave you voicemails."</string>
-    <string name="block_number_confirmation_message_new_filtering" msgid="8487449683723062644">"You will no longer receive calls or texts from this number."</string>
-    <string name="block_number_ok" msgid="739786082788038932">"BLOCK"</string>
-    <string name="unblock_number_confirmation_title" msgid="7897778825085659941">"Unblock <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="unblock_number_ok" msgid="5089057152966269355">"UNBLOCK"</string>
-    <string name="invalidNumber" msgid="6270918250761754967">"<xliff:g id="NUMBER">%1$s</xliff:g> is invalid."</string>
-    <string name="snackbar_number_blocked" msgid="5760234822413921845">"<xliff:g id="NUMBER">%1$s</xliff:g> blocked"</string>
-    <string name="snackbar_number_unblocked" msgid="7941296274123990585">"<xliff:g id="NUMBER">%1$s</xliff:g> unblocked"</string>
-    <string name="block_number_undo" msgid="5158120911892491697">"UNDO"</string>
-    <string name="send_to_voicemail_import_failed" msgid="1012752662074208237">"Import failed"</string>
-    <string name="call_blocking_disabled_notification_title" msgid="7211352205255347489">"Call blocking disabled for 48 hours"</string>
-    <string name="call_blocking_disabled_notification_text" msgid="141384084865180722">"Disabled because an emergency call was made."</string>
-    <string name="block_report_number_alert_title" msgid="2740581989824959611">"Block <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="block_report_number_alert_details" msgid="2652479394593143562">"You will no longer receive calls from this number."</string>
-    <string name="block_number_alert_details" msgid="715942751312046429">"<xliff:g id="TEXT">%1$s</xliff:g> This call will be reported as spam."</string>
-    <string name="unblock_number_alert_details" msgid="8696070817026870606">"This number will be unblocked and reported as not spam. Future calls won\'t be identified as spam."</string>
-    <string name="unblock_report_number_alert_title" msgid="2221901995393696882">"Unblock <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="report_not_spam_alert_button" msgid="3244953565919894995">"Report"</string>
-    <string name="report_not_spam_alert_title" msgid="395961923213504916">"Would you like to report a mistake?"</string>
-    <string name="report_not_spam_alert_details" msgid="4463730683530824797">"Future calls from <xliff:g id="NUMBER">%1$s</xliff:g> will no longer be identified as spam."</string>
-    <string name="checkbox_report_as_spam_action" msgid="1549159682170273798">"Report call as spam"</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="migrate_blocked_numbers_dialog_title">New, simplified blocking</string>
+  <string name="migrate_blocked_numbers_dialog_message">To protect you better, Phone needs to change how blocking works. Your blocked numbers will now stop both calls and texts and may be shared with other apps.</string>
+  <string name="migrate_blocked_numbers_dialog_allow_button">Allow</string>
+  <string name="old_block_number_confirmation_title">Block%1$s?</string>
+  <string name="block_number_confirmation_message_vvm">Calls from this number will be blocked and voicemails will be automatically deleted.</string>
+  <string name="block_number_confirmation_message_no_vvm">Calls from this number will be blocked, but the caller may still be able to leave you voicemails.</string>
+  <string name="block_number_confirmation_message_new_filtering">You will no longer receive calls or texts from this number.</string>
+  <string name="block_number_ok">BLOCK</string>
+  <string name="unblock_number_confirmation_title">Unblock%1$s?</string>
+  <string name="unblock_number_ok">UNBLOCK</string>
+  <string name="invalidNumber">%1$sis invalid.</string>
+  <string name="snackbar_number_blocked">%1$s blocked</string>
+  <string name="snackbar_number_unblocked">%1$sunblocked</string>
+  <string name="send_to_voicemail_import_failed">Import failed</string>
+  <string name="call_blocking_disabled_notification_title">Call blocking disabled for 48 hours</string>
+  <string name="call_blocking_disabled_notification_text">Disabled because an emergency call was made.</string>
 </resources>
diff --git a/java/com/android/dialer/blocking/res/values-es-rUS/strings.xml b/java/com/android/dialer/blocking/res/values-es-rUS/strings.xml
index 4814bdc..0a9a40d 100644
--- a/java/com/android/dialer/blocking/res/values-es-rUS/strings.xml
+++ b/java/com/android/dialer/blocking/res/values-es-rUS/strings.xml
@@ -1,46 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="migrate_blocked_numbers_dialog_title" msgid="7823962296457673809">"Nuevo bloqueo simplificado"</string>
-    <string name="migrate_blocked_numbers_dialog_message" msgid="8309736147266462485">"Para brindarte mayor protección, el teléfono necesita cambiar el comportamiento de bloqueo. Se detendrán las llamadas y los mensajes de texto de los números bloqueados, y es posible que estos se compartan con otras apps."</string>
-    <string name="migrate_blocked_numbers_dialog_allow_button" msgid="5192836471557751367">"Permitir"</string>
-    <string name="block_number_confirmation_title" msgid="2699521227461376076">"¿Deseas bloquear <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="block_number_confirmation_message_vvm" msgid="6501105244172290939">"Se bloquearán las llamadas que provengan de este número y se borrarán los mensajes del buzón de voz de forma automática."</string>
-    <string name="block_number_confirmation_message_no_vvm" msgid="8236641245709649882">"Se bloquearán las llamadas que provengan de este número, pero es posible que la persona que llama pueda dejar mensajes en el buzón de voz."</string>
-    <string name="block_number_confirmation_message_new_filtering" msgid="8487449683723062644">"Ya no recibirás llamadas o mensajes de textos de este número."</string>
-    <string name="block_number_ok" msgid="739786082788038932">"BLOQUEAR"</string>
-    <string name="unblock_number_confirmation_title" msgid="7897778825085659941">"¿Deseas desbloquear <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="unblock_number_ok" msgid="5089057152966269355">"DESBLOQUEAR"</string>
-    <string name="invalidNumber" msgid="6270918250761754967">"<xliff:g id="NUMBER">%1$s</xliff:g> no es válido."</string>
-    <string name="snackbar_number_blocked" msgid="5760234822413921845">"<xliff:g id="NUMBER">%1$s</xliff:g> bloqueado"</string>
-    <string name="snackbar_number_unblocked" msgid="7941296274123990585">"<xliff:g id="NUMBER">%1$s</xliff:g> desbloqueado"</string>
-    <string name="block_number_undo" msgid="5158120911892491697">"DESHACER"</string>
-    <string name="send_to_voicemail_import_failed" msgid="1012752662074208237">"Error al importar"</string>
-    <string name="call_blocking_disabled_notification_title" msgid="7211352205255347489">"El bloqueo de llamadas se inhabilitó durante 48 horas"</string>
-    <string name="call_blocking_disabled_notification_text" msgid="141384084865180722">"Se inhabilitó porque se realizó una llamada de emergencia."</string>
-    <string name="block_report_number_alert_title" msgid="2740581989824959611">"¿Deseas bloquear <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="block_report_number_alert_details" msgid="2652479394593143562">"Ya no recibirás llamadas de este número."</string>
-    <string name="block_number_alert_details" msgid="715942751312046429">"<xliff:g id="TEXT">%1$s</xliff:g> Esta llamada se marcará como spam."</string>
-    <string name="unblock_number_alert_details" msgid="8696070817026870606">"El número se desbloqueará y no se marcará como spam. Las llamadas futuras no se considerarán spam."</string>
-    <string name="unblock_report_number_alert_title" msgid="2221901995393696882">"¿Deseas desbloquear <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="report_not_spam_alert_button" msgid="3244953565919894995">"Informar"</string>
-    <string name="report_not_spam_alert_title" msgid="395961923213504916">"¿Deseas informar un error?"</string>
-    <string name="report_not_spam_alert_details" msgid="4463730683530824797">"Las llamadas futuras de <xliff:g id="NUMBER">%1$s</xliff:g> ya no se considerarán spam."</string>
-    <string name="checkbox_report_as_spam_action" msgid="1549159682170273798">"Denunciar llamada como spam"</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="migrate_blocked_numbers_dialog_title">Nuevo bloqueo simplificado</string>
+  <string name="migrate_blocked_numbers_dialog_message">Para brindarte mayor protección, el teléfono necesita cambiar el comportamiento de bloqueo. Se detendrán las llamadas y los mensajes de texto de los números bloqueados, y es posible que estos se compartan con otras apps.</string>
+  <string name="migrate_blocked_numbers_dialog_allow_button">Permitir</string>
+  <string name="old_block_number_confirmation_title">¿Deseas bloquear el número %1$s?</string>
+  <string name="block_number_confirmation_message_vvm">Se bloquearán las llamadas que provengan de este número y se borrarán los mensajes del correo de voz de forma automática.</string>
+  <string name="block_number_confirmation_message_no_vvm">Se bloquearán las llamadas que provengan de este número, pero es posible que la persona que llama pueda dejar mensajes en el correo de voz.</string>
+  <string name="block_number_confirmation_message_new_filtering">Ya no recibirás llamadas o mensajes de textos de este número.</string>
+  <string name="block_number_ok">BLOQUEAR</string>
+  <string name="unblock_number_confirmation_title">¿Deseas desbloquear el número %1$s?</string>
+  <string name="unblock_number_ok">DESBLOQUEAR</string>
+  <string name="invalidNumber">%1$s no es válido.</string>
+  <string name="snackbar_number_blocked">%1$s bloqueado</string>
+  <string name="snackbar_number_unblocked">%1$s desbloqueado</string>
+  <string name="send_to_voicemail_import_failed">Error al importar</string>
+  <string name="call_blocking_disabled_notification_title">El bloqueo de llamadas se inhabilitó durante 48 horas</string>
+  <string name="call_blocking_disabled_notification_text">Se inhabilitó porque se realizó una llamada de emergencia.</string>
 </resources>
diff --git a/java/com/android/dialer/blocking/res/values-es/strings.xml b/java/com/android/dialer/blocking/res/values-es/strings.xml
index 70e6e4c..1a39e25 100644
--- a/java/com/android/dialer/blocking/res/values-es/strings.xml
+++ b/java/com/android/dialer/blocking/res/values-es/strings.xml
@@ -1,46 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="migrate_blocked_numbers_dialog_title" msgid="7823962296457673809">"Nuevo bloqueo, más sencillo"</string>
-    <string name="migrate_blocked_numbers_dialog_message" msgid="8309736147266462485">"Para garantizar tu seguridad, Teléfono necesita cambiar cómo funciona el bloqueo. Ya no recibirás llamadas ni SMS de los números bloqueados y es posible que estos se compartan con otras aplicaciones."</string>
-    <string name="migrate_blocked_numbers_dialog_allow_button" msgid="5192836471557751367">"Permitir"</string>
-    <string name="block_number_confirmation_title" msgid="2699521227461376076">"¿Bloquear el número <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="block_number_confirmation_message_vvm" msgid="6501105244172290939">"Se bloquearán las llamadas de este número y se eliminarán los mensajes del buzón de voz automáticamente."</string>
-    <string name="block_number_confirmation_message_no_vvm" msgid="8236641245709649882">"Se bloquearán las llamadas de este número, pero la persona que llame puede seguir dejando mensajes en el buzón de voz."</string>
-    <string name="block_number_confirmation_message_new_filtering" msgid="8487449683723062644">"Ya no recibirás llamadas ni SMS de este número."</string>
-    <string name="block_number_ok" msgid="739786082788038932">"BLOQUEAR"</string>
-    <string name="unblock_number_confirmation_title" msgid="7897778825085659941">"¿Desbloquear el número <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="unblock_number_ok" msgid="5089057152966269355">"DESBLOQUEAR"</string>
-    <string name="invalidNumber" msgid="6270918250761754967">"<xliff:g id="NUMBER">%1$s</xliff:g> no es válido."</string>
-    <string name="snackbar_number_blocked" msgid="5760234822413921845">"<xliff:g id="NUMBER">%1$s</xliff:g> bloqueado"</string>
-    <string name="snackbar_number_unblocked" msgid="7941296274123990585">"<xliff:g id="NUMBER">%1$s</xliff:g> desbloqueado"</string>
-    <string name="block_number_undo" msgid="5158120911892491697">"DESHACER"</string>
-    <string name="send_to_voicemail_import_failed" msgid="1012752662074208237">"Error al importar"</string>
-    <string name="call_blocking_disabled_notification_title" msgid="7211352205255347489">"Bloqueo de llamadas inhabilitado durante 48 horas"</string>
-    <string name="call_blocking_disabled_notification_text" msgid="141384084865180722">"Inhabilitado porque has hecho una llamada de emergencia."</string>
-    <string name="block_report_number_alert_title" msgid="2740581989824959611">"¿Bloquear el número <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="block_report_number_alert_details" msgid="2652479394593143562">"Ya no recibirás llamadas de este número."</string>
-    <string name="block_number_alert_details" msgid="715942751312046429">"<xliff:g id="TEXT">%1$s</xliff:g> Esta llamada se marcará como spam."</string>
-    <string name="unblock_number_alert_details" msgid="8696070817026870606">"El número se desbloqueará y se marcará como No es spam. Las próximas llamadas no se identificarán como spam."</string>
-    <string name="unblock_report_number_alert_title" msgid="2221901995393696882">"¿Desbloquear el número <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="report_not_spam_alert_button" msgid="3244953565919894995">"Informar"</string>
-    <string name="report_not_spam_alert_title" msgid="395961923213504916">"¿Quieres informar de un error?"</string>
-    <string name="report_not_spam_alert_details" msgid="4463730683530824797">"Las próximas llamadas de <xliff:g id="NUMBER">%1$s</xliff:g> no se identificarán como spam."</string>
-    <string name="checkbox_report_as_spam_action" msgid="1549159682170273798">"Marcar la llamada como spam"</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="migrate_blocked_numbers_dialog_title">Nuevo bloqueo, más sencillo</string>
+  <string name="migrate_blocked_numbers_dialog_message">Para garantizar tu seguridad, Teléfono necesita cambiar cómo funciona el bloqueo. Ya no recibirás llamadas ni SMS de los números bloqueados y es posible que estos se compartan con otras aplicaciones.</string>
+  <string name="migrate_blocked_numbers_dialog_allow_button">Permitir</string>
+  <string name="old_block_number_confirmation_title">¿Quieres bloquear el %1$s?</string>
+  <string name="block_number_confirmation_message_vvm">Se bloquearán las llamadas de este número y se eliminarán los mensajes del buzón de voz automáticamente.</string>
+  <string name="block_number_confirmation_message_no_vvm">Se bloquearán las llamadas de este número, pero la persona que llame puede seguir dejando mensajes en el buzón de voz.</string>
+  <string name="block_number_confirmation_message_new_filtering">Ya no recibirás llamadas ni SMS de este número.</string>
+  <string name="block_number_ok">BLOQUEAR</string>
+  <string name="unblock_number_confirmation_title">¿Quieres desbloquear el número %1$s?</string>
+  <string name="unblock_number_ok">DESBLOQUEAR</string>
+  <string name="invalidNumber">El número %1$s no es válido.</string>
+  <string name="snackbar_number_blocked">%1$s bloqueado</string>
+  <string name="snackbar_number_unblocked">Se ha desbloqueado el número %1$s</string>
+  <string name="send_to_voicemail_import_failed">Error al importar</string>
+  <string name="call_blocking_disabled_notification_title">Bloqueo de llamadas inhabilitado durante 48 horas</string>
+  <string name="call_blocking_disabled_notification_text">Inhabilitado porque has hecho una llamada de emergencia.</string>
 </resources>
diff --git a/java/com/android/dialer/blocking/res/values-et/strings.xml b/java/com/android/dialer/blocking/res/values-et/strings.xml
index 5fc0eb6..9493374 100644
--- a/java/com/android/dialer/blocking/res/values-et/strings.xml
+++ b/java/com/android/dialer/blocking/res/values-et/strings.xml
@@ -1,46 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="migrate_blocked_numbers_dialog_title" msgid="7823962296457673809">"Uus lihtsustatud blokeerimine"</string>
-    <string name="migrate_blocked_numbers_dialog_message" msgid="8309736147266462485">"Teie paremaks kaitsmiseks peab rakendus Telefon muutma blokeerimise tööpõhimõtet. Blokeeritud numbrite puhul blokeeritakse nüüd nii helistamine kui ka tekstsõnumid ja blokeeritud numbreid võidakse jagada teiste rakendustega."</string>
-    <string name="migrate_blocked_numbers_dialog_allow_button" msgid="5192836471557751367">"Luba"</string>
-    <string name="block_number_confirmation_title" msgid="2699521227461376076">"Kas soovite blokeerida numbri <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="block_number_confirmation_message_vvm" msgid="6501105244172290939">"Kõned sellelt numbrilt blokeeritakse ja kõnepostisõnumid kustutatakse automaatselt."</string>
-    <string name="block_number_confirmation_message_no_vvm" msgid="8236641245709649882">"Kõned sellelt numbrilt blokeeritakse, kuid helistaja saab võib-olla siiski teile kõnepostisõnumeid jätta."</string>
-    <string name="block_number_confirmation_message_new_filtering" msgid="8487449683723062644">"Te ei saa enam sellelt numbrilt kõnesid ega tekstsõnumeid."</string>
-    <string name="block_number_ok" msgid="739786082788038932">"BLOKEERI"</string>
-    <string name="unblock_number_confirmation_title" msgid="7897778825085659941">"Kas soovite deblokeerida numbri <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="unblock_number_ok" msgid="5089057152966269355">"DEBLOKEERI"</string>
-    <string name="invalidNumber" msgid="6270918250761754967">"<xliff:g id="NUMBER">%1$s</xliff:g> on kehtetu."</string>
-    <string name="snackbar_number_blocked" msgid="5760234822413921845">"Number <xliff:g id="NUMBER">%1$s</xliff:g> on blokeeritud"</string>
-    <string name="snackbar_number_unblocked" msgid="7941296274123990585">"Number <xliff:g id="NUMBER">%1$s</xliff:g> on deblokeeritud"</string>
-    <string name="block_number_undo" msgid="5158120911892491697">"VÕTA TAGASI"</string>
-    <string name="send_to_voicemail_import_failed" msgid="1012752662074208237">"Importimine ebaõnnestus"</string>
-    <string name="call_blocking_disabled_notification_title" msgid="7211352205255347489">"Kõnede blokeerimine on 48 tunniks keelatud"</string>
-    <string name="call_blocking_disabled_notification_text" msgid="141384084865180722">"Keelatud, kuna tehti hädaabikõne."</string>
-    <string name="block_report_number_alert_title" msgid="2740581989824959611">"Kas soovite blokeerida numbri <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="block_report_number_alert_details" msgid="2652479394593143562">"Te ei saa enam sellelt numbrilt kõnesid."</string>
-    <string name="block_number_alert_details" msgid="715942751312046429">"<xliff:g id="TEXT">%1$s</xliff:g> See kõne liigitatakse rämpspostiks."</string>
-    <string name="unblock_number_alert_details" msgid="8696070817026870606">"Number deblokeeritakse ja seda ei liigit. rämpspostiks. Tulevasi kõnesid ei liigitata rämpspostiks."</string>
-    <string name="unblock_report_number_alert_title" msgid="2221901995393696882">"Kas soovite deblokeerida numbri <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="report_not_spam_alert_button" msgid="3244953565919894995">"Teavita"</string>
-    <string name="report_not_spam_alert_title" msgid="395961923213504916">"Kas soovite veast teavitada?"</string>
-    <string name="report_not_spam_alert_details" msgid="4463730683530824797">"Tulevasi kõnesid numbrilt <xliff:g id="NUMBER">%1$s</xliff:g> ei liigitata enam rämpspostiks."</string>
-    <string name="checkbox_report_as_spam_action" msgid="1549159682170273798">"Liigita kõne rämpspostiks"</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="migrate_blocked_numbers_dialog_title">Uus lihtsustatud blokeerimine</string>
+  <string name="migrate_blocked_numbers_dialog_message">Teie paremaks kaitsmiseks peab rakendus Telefon muutma blokeerimise tööpõhimõtet. Blokeeritud numbrite puhul blokeeritakse nüüd nii helistamine kui ka tekstsõnumid ja blokeeritud numbreid võidakse jagada teiste rakendustega.</string>
+  <string name="migrate_blocked_numbers_dialog_allow_button">Luba</string>
+  <string name="old_block_number_confirmation_title">Kas soovite blokeerida numbri %1$s?</string>
+  <string name="block_number_confirmation_message_vvm">Kõned sellelt numbrilt blokeeritakse ja kõnepostisõnumid kustutatakse automaatselt.</string>
+  <string name="block_number_confirmation_message_no_vvm">Kõned sellelt numbrilt blokeeritakse, kuid helistaja saab võib-olla siiski teile kõnepostisõnumeid jätta.</string>
+  <string name="block_number_confirmation_message_new_filtering">Te ei saa enam sellelt numbrilt kõnesid ega tekstsõnumeid.</string>
+  <string name="block_number_ok">BLOKEERI</string>
+  <string name="unblock_number_confirmation_title">Kas soovite deblokeerida numbri %1$s?</string>
+  <string name="unblock_number_ok">DEBLOKEERI</string>
+  <string name="invalidNumber">%1$s on kehtetu.</string>
+  <string name="snackbar_number_blocked">Number %1$s on blokeeritud</string>
+  <string name="snackbar_number_unblocked">Number %1$s on deblokeeritud</string>
+  <string name="send_to_voicemail_import_failed">Importimine ebaõnnestus</string>
+  <string name="call_blocking_disabled_notification_title">Kõnede blokeerimine on 48 tunniks keelatud</string>
+  <string name="call_blocking_disabled_notification_text">Keelatud, kuna tehti hädaabikõne.</string>
 </resources>
diff --git a/java/com/android/dialer/blocking/res/values-eu/strings.xml b/java/com/android/dialer/blocking/res/values-eu/strings.xml
index 688c7c9..62b419f 100644
--- a/java/com/android/dialer/blocking/res/values-eu/strings.xml
+++ b/java/com/android/dialer/blocking/res/values-eu/strings.xml
@@ -1,46 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="migrate_blocked_numbers_dialog_title" msgid="7823962296457673809">"Blokeatzeko aukera berri sinplifikatua"</string>
-    <string name="migrate_blocked_numbers_dialog_message" msgid="8309736147266462485">"Zu hobeto babesteko, blokeatzeko funtzioa aldatu behar du Telefonoa aplikazioak. Aurrerantzean, blokeatutako zenbakien deiak eta testu-mezuak jasotzeari utziko zaio, eta baliteke zenbaki horiek beste aplikazioekin partekatzea."</string>
-    <string name="migrate_blocked_numbers_dialog_allow_button" msgid="5192836471557751367">"Baimendu"</string>
-    <string name="block_number_confirmation_title" msgid="2699521227461376076">"<xliff:g id="NUMBER">%1$s</xliff:g> blokeatu nahi duzu?"</string>
-    <string name="block_number_confirmation_message_vvm" msgid="6501105244172290939">"Zenbaki honetatik jasotzen diren deiak blokeatu egingo dira, eta mezuak automatikoki ezabatuko dira erantzungailutik."</string>
-    <string name="block_number_confirmation_message_no_vvm" msgid="8236641245709649882">"Zenbaki honetatik jasotzen diren deiak blokeatu egingo dira, baina deitzaileak mezuak utzi ahal izango dizkizu erantzungailuan."</string>
-    <string name="block_number_confirmation_message_new_filtering" msgid="8487449683723062644">"Ez duzu deirik edo testu-mezurik jasoko zenbaki horretatik."</string>
-    <string name="block_number_ok" msgid="739786082788038932">"BLOKEATU"</string>
-    <string name="unblock_number_confirmation_title" msgid="7897778825085659941">"<xliff:g id="NUMBER">%1$s</xliff:g> desblokeatu nahi duzu?"</string>
-    <string name="unblock_number_ok" msgid="5089057152966269355">"DESBLOKEATU"</string>
-    <string name="invalidNumber" msgid="6270918250761754967">"<xliff:g id="NUMBER">%1$s</xliff:g> zenbakiak ez du balio."</string>
-    <string name="snackbar_number_blocked" msgid="5760234822413921845">"<xliff:g id="NUMBER">%1$s</xliff:g> blokeatuta"</string>
-    <string name="snackbar_number_unblocked" msgid="7941296274123990585">"<xliff:g id="NUMBER">%1$s</xliff:g> desblokeatuta"</string>
-    <string name="block_number_undo" msgid="5158120911892491697">"DESEGIN"</string>
-    <string name="send_to_voicemail_import_failed" msgid="1012752662074208237">"Ezin izan da inportatu"</string>
-    <string name="call_blocking_disabled_notification_title" msgid="7211352205255347489">"Deiak blokeatzeko aukera desgaituta egongo da 48 orduan"</string>
-    <string name="call_blocking_disabled_notification_text" msgid="141384084865180722">"Desgaituta dago, larrialdi-dei bat egin delako."</string>
-    <string name="block_report_number_alert_title" msgid="2740581989824959611">"<xliff:g id="NUMBER">%1$s</xliff:g> blokeatu nahi duzu?"</string>
-    <string name="block_report_number_alert_details" msgid="2652479394593143562">"honen deirik."</string>
-    <string name="block_number_alert_details" msgid="715942751312046429">"<xliff:g id="TEXT">%1$s</xliff:g> Dei hau spama dela salatuko da."</string>
-    <string name="unblock_number_alert_details" msgid="8696070817026870606">"Desblokeatu egingo da zenbaki hau. Aurrerantzean, deiak ez dira identifikatuko spam gisa."</string>
-    <string name="unblock_report_number_alert_title" msgid="2221901995393696882">"<xliff:g id="NUMBER">%1$s</xliff:g> desblokeatu nahi duzu?"</string>
-    <string name="report_not_spam_alert_button" msgid="3244953565919894995">"Salatu"</string>
-    <string name="report_not_spam_alert_title" msgid="395961923213504916">"Akats baten berri eman nahi duzu?"</string>
-    <string name="report_not_spam_alert_details" msgid="4463730683530824797">"Aurrerantzean, <xliff:g id="NUMBER">%1$s</xliff:g> zenbakiaren deiak ez dira identifikatuko spam gisa."</string>
-    <string name="checkbox_report_as_spam_action" msgid="1549159682170273798">"Salatu deia spama dela"</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="migrate_blocked_numbers_dialog_title">Blokeatzeko aukera berri sinplifikatua</string>
+  <string name="migrate_blocked_numbers_dialog_message">Zu hobeto babesteko, blokeatzeko funtzioa aldatu behar du Telefonoa aplikazioak. Aurrerantzean, blokeatutako zenbakien deiak eta testu-mezuak jasotzeari utziko zaio, eta baliteke zenbaki horiek beste aplikazioekin partekatzea.</string>
+  <string name="migrate_blocked_numbers_dialog_allow_button">Baimendu</string>
+  <string name="old_block_number_confirmation_title">%1$s blokeatu nahi duzu?</string>
+  <string name="block_number_confirmation_message_vvm">Zenbaki honetatik jasotzen diren deiak blokeatu egingo dira, eta mezuak automatikoki ezabatuko dira erantzungailutik.</string>
+  <string name="block_number_confirmation_message_no_vvm">Zenbaki honetatik jasotzen diren deiak blokeatu egingo dira, baina deitzaileak mezuak utzi ahal izango dizkizu erantzungailuan.</string>
+  <string name="block_number_confirmation_message_new_filtering">Ez duzu deirik edo testu-mezurik jasoko zenbaki horretatik.</string>
+  <string name="block_number_ok">BLOKEATU</string>
+  <string name="unblock_number_confirmation_title">%1$s desblokeatu nahi duzu?</string>
+  <string name="unblock_number_ok">DESBLOKEATU</string>
+  <string name="invalidNumber">%1$s zenbakiak ez du balio.</string>
+  <string name="snackbar_number_blocked">%1$s blokeatuta</string>
+  <string name="snackbar_number_unblocked">Desblokeatu da %1$s</string>
+  <string name="send_to_voicemail_import_failed">Ezin izan da inportatu</string>
+  <string name="call_blocking_disabled_notification_title">Deiak blokeatzeko aukera desgaituta egongo da 48 orduan</string>
+  <string name="call_blocking_disabled_notification_text">Desgaituta dago, larrialdi-dei bat egin delako.</string>
 </resources>
diff --git a/java/com/android/dialer/blocking/res/values-fa/strings.xml b/java/com/android/dialer/blocking/res/values-fa/strings.xml
index 91e2b97..718041b 100644
--- a/java/com/android/dialer/blocking/res/values-fa/strings.xml
+++ b/java/com/android/dialer/blocking/res/values-fa/strings.xml
@@ -1,46 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="migrate_blocked_numbers_dialog_title" msgid="7823962296457673809">"مسدود کردن جدید و ساده‌شده"</string>
-    <string name="migrate_blocked_numbers_dialog_message" msgid="8309736147266462485">"برای محافظت بهتر از شما، «تلفن» باید عملکرد مسدود کردن را تغییر دهد. شماره‌های مسدود شده دیگر تماس و پیام نوشتاری ارسال/دریافت نخواهند کرد و ممکن است با برنامه‌های دیگر به اشتراک گذاشته شوند."</string>
-    <string name="migrate_blocked_numbers_dialog_allow_button" msgid="5192836471557751367">"اجازه دادن"</string>
-    <string name="block_number_confirmation_title" msgid="2699521227461376076">"<xliff:g id="NUMBER">%1$s</xliff:g> مسدود شود؟"</string>
-    <string name="block_number_confirmation_message_vvm" msgid="6501105244172290939">"تماس‌‌ها از این شماره مسدود می‌شود و پست‌‌های صوتی به‌طور خودکار حذف می‌شود."</string>
-    <string name="block_number_confirmation_message_no_vvm" msgid="8236641245709649882">"تماس‌ها از این شماره مسدود می‌شود، اما ممکن است تماس‌گیرنده همچنان بتواند برایتان پست صوتی بگذارد."</string>
-    <string name="block_number_confirmation_message_new_filtering" msgid="8487449683723062644">"دیگر از این شماره، تماس یا پیام نوشتاری دریافت نمی‌کنید."</string>
-    <string name="block_number_ok" msgid="739786082788038932">"مسدود کردن"</string>
-    <string name="unblock_number_confirmation_title" msgid="7897778825085659941">"<xliff:g id="NUMBER">%1$s</xliff:g> رفع انسداد شود؟"</string>
-    <string name="unblock_number_ok" msgid="5089057152966269355">"رفع انسداد"</string>
-    <string name="invalidNumber" msgid="6270918250761754967">"<xliff:g id="NUMBER">%1$s</xliff:g> نامعتبر است."</string>
-    <string name="snackbar_number_blocked" msgid="5760234822413921845">"<xliff:g id="NUMBER">%1$s</xliff:g> مسدود شد"</string>
-    <string name="snackbar_number_unblocked" msgid="7941296274123990585">"<xliff:g id="NUMBER">%1$s</xliff:g> گشوده شد"</string>
-    <string name="block_number_undo" msgid="5158120911892491697">"واگرد"</string>
-    <string name="send_to_voicemail_import_failed" msgid="1012752662074208237">"وارد کردن انجام نشد"</string>
-    <string name="call_blocking_disabled_notification_title" msgid="7211352205255347489">"مسدود کردن تماس برای ۴۸ ساعت غیرفعال شد"</string>
-    <string name="call_blocking_disabled_notification_text" msgid="141384084865180722">"به علت برقرار شدن تماس اضطراری، غیرفعال شد."</string>
-    <string name="block_report_number_alert_title" msgid="2740581989824959611">"<xliff:g id="NUMBER">%1$s</xliff:g> مسدود شود؟"</string>
-    <string name="block_report_number_alert_details" msgid="2652479394593143562">"دیگر از این شماره تماس دریافت نمی‌کنید."</string>
-    <string name="block_number_alert_details" msgid="715942751312046429">"<xliff:g id="TEXT">%1$s</xliff:g>این تماس به‌عنوان هرزنامه گزارش خواهد شد."</string>
-    <string name="unblock_number_alert_details" msgid="8696070817026870606">"این شماره گشوده می‌شود و به‌عنوان غیرهرزنامه گزارش می‌شود. تماس‌ها و پست‌های صوتی بعدی به‌عنوان هرزنامه شناسایی نمی‌شوند."</string>
-    <string name="unblock_report_number_alert_title" msgid="2221901995393696882">"<xliff:g id="NUMBER">%1$s</xliff:g> رفع انسداد شود؟"</string>
-    <string name="report_not_spam_alert_button" msgid="3244953565919894995">"گزارش"</string>
-    <string name="report_not_spam_alert_title" msgid="395961923213504916">"مشکلی را گزارش می‌کنید؟"</string>
-    <string name="report_not_spam_alert_details" msgid="4463730683530824797">"تماس‌های بعدی از <xliff:g id="NUMBER">%1$s</xliff:g> دیگر به‌عنوان هرزنامه شناسایی نخواهند شد."</string>
-    <string name="checkbox_report_as_spam_action" msgid="1549159682170273798">"گزارش تماس به‌عنوان هرزنامه"</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="migrate_blocked_numbers_dialog_title">مسدود کردن جدید و ساده‌شده</string>
+  <string name="migrate_blocked_numbers_dialog_message">برای محافظت بهتر از شما، «تلفن» باید عملکرد مسدود کردن را تغییر دهد. شماره‌های مسدود شده دیگر تماس و پیام نوشتاری ارسال/دریافت نخواهند کرد و ممکن است با برنامه‌های دیگر به اشتراک گذاشته شوند.</string>
+  <string name="migrate_blocked_numbers_dialog_allow_button">اجازه دادن</string>
+  <string name="old_block_number_confirmation_title">%1$s مسدود شود؟</string>
+  <string name="block_number_confirmation_message_vvm">تماس‌‌ها از این شماره مسدود می‌شود و پست‌‌های صوتی به‌طور خودکار حذف می‌شود.</string>
+  <string name="block_number_confirmation_message_no_vvm">تماس‌ها از این شماره مسدود می‌شود، اما ممکن است تماس‌گیرنده همچنان بتواند برایتان پست صوتی بگذارد.</string>
+  <string name="block_number_confirmation_message_new_filtering">دیگر از این شماره، تماس یا پیام نوشتاری دریافت نمی‌کنید.</string>
+  <string name="block_number_ok">مسدود کردن</string>
+  <string name="unblock_number_confirmation_title">%1$s رفع انسداد شود؟</string>
+  <string name="unblock_number_ok">رفع انسداد</string>
+  <string name="invalidNumber">%1$s نامعتبر است.</string>
+  <string name="snackbar_number_blocked">%1$s مسدود شد</string>
+  <string name="snackbar_number_unblocked">%1$s رفع انسداد شد</string>
+  <string name="send_to_voicemail_import_failed">وارد کردن انجام نشد</string>
+  <string name="call_blocking_disabled_notification_title">مسدود کردن تماس برای ۴۸ ساعت غیرفعال شد</string>
+  <string name="call_blocking_disabled_notification_text">به علت برقرار شدن تماس اضطراری، غیرفعال شد.</string>
 </resources>
diff --git a/java/com/android/dialer/blocking/res/values-fi/strings.xml b/java/com/android/dialer/blocking/res/values-fi/strings.xml
index 95e397b..ab47254 100644
--- a/java/com/android/dialer/blocking/res/values-fi/strings.xml
+++ b/java/com/android/dialer/blocking/res/values-fi/strings.xml
@@ -1,46 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="migrate_blocked_numbers_dialog_title" msgid="7823962296457673809">"Uusi kätevämpi estotapa"</string>
-    <string name="migrate_blocked_numbers_dialog_message" msgid="8309736147266462485">"Puhelimen on muokattava estoperiaatetta, jotta suojaus toimii paremmin. Nyt estetyistä numeroista saapuvat puhelut ja tekstiviestit estetään, ja estotiedot voidaan jakaa muille sovelluksille."</string>
-    <string name="migrate_blocked_numbers_dialog_allow_button" msgid="5192836471557751367">"Salli"</string>
-    <string name="block_number_confirmation_title" msgid="2699521227461376076">"Estetäänkö <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="block_number_confirmation_message_vvm" msgid="6501105244172290939">"Tästä numerosta tulevat puhelut estetään, ja vastaajaviestit poistetaan automaattisesti."</string>
-    <string name="block_number_confirmation_message_no_vvm" msgid="8236641245709649882">"Tästä numerosta tulevat puhelut estetään, mutta soittaja voi silti mahdollisesti jättää vastaajaviestejä."</string>
-    <string name="block_number_confirmation_message_new_filtering" msgid="8487449683723062644">"Tästä numerosta tulevat puhelut ja tekstiviestit estetään."</string>
-    <string name="block_number_ok" msgid="739786082788038932">"ESTÄ"</string>
-    <string name="unblock_number_confirmation_title" msgid="7897778825085659941">"Kumotaanko numeron <xliff:g id="NUMBER">%1$s</xliff:g> esto?"</string>
-    <string name="unblock_number_ok" msgid="5089057152966269355">"KUMOA ESTO"</string>
-    <string name="invalidNumber" msgid="6270918250761754967">"<xliff:g id="NUMBER">%1$s</xliff:g> on virheellinen."</string>
-    <string name="snackbar_number_blocked" msgid="5760234822413921845">"Numero <xliff:g id="NUMBER">%1$s</xliff:g> estetty"</string>
-    <string name="snackbar_number_unblocked" msgid="7941296274123990585">"Numeron <xliff:g id="NUMBER">%1$s</xliff:g> esto kumottu"</string>
-    <string name="block_number_undo" msgid="5158120911892491697">"KUMOA"</string>
-    <string name="send_to_voicemail_import_failed" msgid="1012752662074208237">"Tuonti epäonnistui."</string>
-    <string name="call_blocking_disabled_notification_title" msgid="7211352205255347489">"Puhelujen esto poistettiin käytöstä 48 tunnin ajaksi"</string>
-    <string name="call_blocking_disabled_notification_text" msgid="141384084865180722">"Toiminto poistettiin käytöstä hätäpuhelun vuoksi."</string>
-    <string name="block_report_number_alert_title" msgid="2740581989824959611">"Estetäänkö <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="block_report_number_alert_details" msgid="2652479394593143562">"Tästä numerosta tulevat puhelut estetään."</string>
-    <string name="block_number_alert_details" msgid="715942751312046429">"<xliff:g id="TEXT">%1$s</xliff:g>. Puhelu ilmoitetaan häirikköpuheluksi."</string>
-    <string name="unblock_number_alert_details" msgid="8696070817026870606">"Numeron esto ja häirikkötila kumotaan. Puhelut tästä numerosta eivät enää ole häirikköpuheluja."</string>
-    <string name="unblock_report_number_alert_title" msgid="2221901995393696882">"Kumotaanko numeron <xliff:g id="NUMBER">%1$s</xliff:g> esto?"</string>
-    <string name="report_not_spam_alert_button" msgid="3244953565919894995">"Ilmoita"</string>
-    <string name="report_not_spam_alert_title" msgid="395961923213504916">"Haluatko ilmoittaa virheestä?"</string>
-    <string name="report_not_spam_alert_details" msgid="4463730683530824797">"Puhelut numerosta <xliff:g id="NUMBER">%1$s</xliff:g> eivät enää jatkossa ole häirikköpuheluja."</string>
-    <string name="checkbox_report_as_spam_action" msgid="1549159682170273798">"Ilmoita häirikköpuheluksi"</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="migrate_blocked_numbers_dialog_title">Uusi kätevämpi estotapa</string>
+  <string name="migrate_blocked_numbers_dialog_message">Puhelimen on muokattava estoperiaatetta, jotta suojaus toimii paremmin. Nyt estetyistä numeroista saapuvat puhelut ja tekstiviestit estetään, ja estotiedot voidaan jakaa muille sovelluksille.</string>
+  <string name="migrate_blocked_numbers_dialog_allow_button">Salli</string>
+  <string name="old_block_number_confirmation_title">Estetäänkö %1$s?</string>
+  <string name="block_number_confirmation_message_vvm">Tästä numerosta tulevat puhelut estetään, ja vastaajaviestit poistetaan automaattisesti.</string>
+  <string name="block_number_confirmation_message_no_vvm">Tästä numerosta tulevat puhelut estetään, mutta soittaja voi silti mahdollisesti jättää vastaajaviestejä.</string>
+  <string name="block_number_confirmation_message_new_filtering">Tästä numerosta tulevat puhelut ja tekstiviestit estetään.</string>
+  <string name="block_number_ok">ESTÄ</string>
+  <string name="unblock_number_confirmation_title">Kumotaanko numeron %1$s esto?</string>
+  <string name="unblock_number_ok">KUMOA ESTO</string>
+  <string name="invalidNumber">%1$s on virheellinen.</string>
+  <string name="snackbar_number_blocked">Numero %1$s estetty</string>
+  <string name="snackbar_number_unblocked">Numeron %1$s esto kumottu</string>
+  <string name="send_to_voicemail_import_failed">Tuonti epäonnistui.</string>
+  <string name="call_blocking_disabled_notification_title">Puhelujen esto poistettiin käytöstä 48 tunnin ajaksi</string>
+  <string name="call_blocking_disabled_notification_text">Toiminto poistettiin käytöstä hätäpuhelun vuoksi.</string>
 </resources>
diff --git a/java/com/android/dialer/blocking/res/values-fr-rCA/strings.xml b/java/com/android/dialer/blocking/res/values-fr-rCA/strings.xml
index f3fca87..8941e70 100644
--- a/java/com/android/dialer/blocking/res/values-fr-rCA/strings.xml
+++ b/java/com/android/dialer/blocking/res/values-fr-rCA/strings.xml
@@ -1,46 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="migrate_blocked_numbers_dialog_title" msgid="7823962296457673809">"Nouveau blocage simplifié"</string>
-    <string name="migrate_blocked_numbers_dialog_message" msgid="8309736147266462485">"Afin de mieux vous protéger, l\'application Téléphone doit modifier la façon dont le blocage fonctionne. Le blocage de numéros s\'appliquera désormais aux appels et aux messages texte et pourra être partagé avec d\'autres applications."</string>
-    <string name="migrate_blocked_numbers_dialog_allow_button" msgid="5192836471557751367">"Autoriser"</string>
-    <string name="block_number_confirmation_title" msgid="2699521227461376076">"Bloquer le numéro <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="block_number_confirmation_message_vvm" msgid="6501105244172290939">"Les appels provenant de ce numéro seront bloqués et les messages vocaux seront automatiquement supprimés."</string>
-    <string name="block_number_confirmation_message_no_vvm" msgid="8236641245709649882">"Les appels provenant de ce numéro seront bloqués, mais il se peut que l\'appelant puisse quand même vous laisser des messages vocaux."</string>
-    <string name="block_number_confirmation_message_new_filtering" msgid="8487449683723062644">"Vous ne recevrez plus d\'appels ni de messages texte de ce numéro."</string>
-    <string name="block_number_ok" msgid="739786082788038932">"BLOQUER"</string>
-    <string name="unblock_number_confirmation_title" msgid="7897778825085659941">"Débloquer le numéro <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="unblock_number_ok" msgid="5089057152966269355">"DÉBLOQUER"</string>
-    <string name="invalidNumber" msgid="6270918250761754967">"Le numéro <xliff:g id="NUMBER">%1$s</xliff:g> n\'est pas valide."</string>
-    <string name="snackbar_number_blocked" msgid="5760234822413921845">"Le numéro « <xliff:g id="NUMBER">%1$s</xliff:g> » est bloqué"</string>
-    <string name="snackbar_number_unblocked" msgid="7941296274123990585">"Le numéro « <xliff:g id="NUMBER">%1$s</xliff:g> » est débloqué"</string>
-    <string name="block_number_undo" msgid="5158120911892491697">"ANNULER"</string>
-    <string name="send_to_voicemail_import_failed" msgid="1012752662074208237">"Échec de l\'importation"</string>
-    <string name="call_blocking_disabled_notification_title" msgid="7211352205255347489">"Blocage des appels désactivé pendant 48 heures"</string>
-    <string name="call_blocking_disabled_notification_text" msgid="141384084865180722">"Désactivé, car un appel d\'urgence a été effectué"</string>
-    <string name="block_report_number_alert_title" msgid="2740581989824959611">"Bloquer le numéro <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="block_report_number_alert_details" msgid="2652479394593143562">"Vous ne recevrez plus d\'appels de ce numéro."</string>
-    <string name="block_number_alert_details" msgid="715942751312046429">"<xliff:g id="TEXT">%1$s</xliff:g> Cet appel sera signalé comme pourriel."</string>
-    <string name="unblock_number_alert_details" msgid="8696070817026870606">"Ce numéro sera débloqué, et les futurs appels ne seront pas signalés comme pourriel."</string>
-    <string name="unblock_report_number_alert_title" msgid="2221901995393696882">"Débloquer le numéro <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="report_not_spam_alert_button" msgid="3244953565919894995">"Signaler"</string>
-    <string name="report_not_spam_alert_title" msgid="395961923213504916">"Signaler une erreur?"</string>
-    <string name="report_not_spam_alert_details" msgid="4463730683530824797">"Les appels de <xliff:g id="NUMBER">%1$s</xliff:g> ne seront plus signalés comme pourriel."</string>
-    <string name="checkbox_report_as_spam_action" msgid="1549159682170273798">"Signaler l\'appel comme pourriel"</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="migrate_blocked_numbers_dialog_title">Nouveau blocage simplifié</string>
+  <string name="migrate_blocked_numbers_dialog_message">Afin de mieux vous protéger, l\'application Téléphone doit modifier la façon dont le blocage fonctionne. Le blocage de numéros s\'appliquera désormais aux appels et aux messages texte et pourra être partagé avec d\'autres applications.</string>
+  <string name="migrate_blocked_numbers_dialog_allow_button">Autoriser</string>
+  <string name="old_block_number_confirmation_title">Bloquer le numéro %1$s?</string>
+  <string name="block_number_confirmation_message_vvm">Les appels provenant de ce numéro seront bloqués et les messages vocaux seront automatiquement supprimés.</string>
+  <string name="block_number_confirmation_message_no_vvm">Les appels provenant de ce numéro seront bloqués, mais il se peut que l\'appelant puisse quand même vous laisser des messages vocaux.</string>
+  <string name="block_number_confirmation_message_new_filtering">Vous ne recevrez plus d\'appels ni de messages texte de ce numéro.</string>
+  <string name="block_number_ok">BLOQUER</string>
+  <string name="unblock_number_confirmation_title">Débloquer le numéro %1$s?</string>
+  <string name="unblock_number_ok">DÉBLOQUER</string>
+  <string name="invalidNumber">Le numéro %1$s est incorrect.</string>
+  <string name="snackbar_number_blocked">Le numéro « %1$s » est bloqué</string>
+  <string name="snackbar_number_unblocked">Le numéro %1$s a été débloqué</string>
+  <string name="send_to_voicemail_import_failed">Échec de l\'importation</string>
+  <string name="call_blocking_disabled_notification_title">Blocage des appels désactivé pendant 48 heures</string>
+  <string name="call_blocking_disabled_notification_text">Désactivé, car un appel d\'urgence a été effectué</string>
 </resources>
diff --git a/java/com/android/dialer/blocking/res/values-fr/strings.xml b/java/com/android/dialer/blocking/res/values-fr/strings.xml
index 00e262b..965f401 100644
--- a/java/com/android/dialer/blocking/res/values-fr/strings.xml
+++ b/java/com/android/dialer/blocking/res/values-fr/strings.xml
@@ -1,46 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="migrate_blocked_numbers_dialog_title" msgid="7823962296457673809">"Nouveau processus de blocage simplifié"</string>
-    <string name="migrate_blocked_numbers_dialog_message" msgid="8309736147266462485">"Afin de mieux vous protéger, la fonctionnalité de blocage de numéros doit être modifiée. Le blocage pourra désormais être appliqué aux appels entrants comme aux SMS entrants, et être étendu à d\'autres applications."</string>
-    <string name="migrate_blocked_numbers_dialog_allow_button" msgid="5192836471557751367">"Autoriser"</string>
-    <string name="block_number_confirmation_title" msgid="2699521227461376076">"Bloquer le numéro \"<xliff:g id="NUMBER">%1$s</xliff:g>\" ?"</string>
-    <string name="block_number_confirmation_message_vvm" msgid="6501105244172290939">"Les appels associés à ce numéro seront bloqués, et les messages vocaux seront automatiquement supprimés."</string>
-    <string name="block_number_confirmation_message_no_vvm" msgid="8236641245709649882">"Les appels associés à ce numéro seront bloqués, mais l\'appelant pourra peut-être toujours vous laisser des messages vocaux."</string>
-    <string name="block_number_confirmation_message_new_filtering" msgid="8487449683723062644">"Vous ne recevrez plus d\'appels ni de SMS provenant de ce numéro."</string>
-    <string name="block_number_ok" msgid="739786082788038932">"BLOQUER"</string>
-    <string name="unblock_number_confirmation_title" msgid="7897778825085659941">"Débloquer le numéro \"<xliff:g id="NUMBER">%1$s</xliff:g>\" ?"</string>
-    <string name="unblock_number_ok" msgid="5089057152966269355">"DÉBLOQUER"</string>
-    <string name="invalidNumber" msgid="6270918250761754967">"Le numéro \"<xliff:g id="NUMBER">%1$s</xliff:g>\" n\'est pas valide."</string>
-    <string name="snackbar_number_blocked" msgid="5760234822413921845">"Le numéro \"<xliff:g id="NUMBER">%1$s</xliff:g>\" est bloqué."</string>
-    <string name="snackbar_number_unblocked" msgid="7941296274123990585">"Le numéro \"<xliff:g id="NUMBER">%1$s</xliff:g>\" est débloqué."</string>
-    <string name="block_number_undo" msgid="5158120911892491697">"ANNULER"</string>
-    <string name="send_to_voicemail_import_failed" msgid="1012752662074208237">"Échec lors de l\'importation."</string>
-    <string name="call_blocking_disabled_notification_title" msgid="7211352205255347489">"Blocage des appels désactivé pendant 48 heures"</string>
-    <string name="call_blocking_disabled_notification_text" msgid="141384084865180722">"Désactivé, car un appel d\'urgence a été effectué"</string>
-    <string name="block_report_number_alert_title" msgid="2740581989824959611">"Bloquer le numéro \"<xliff:g id="NUMBER">%1$s</xliff:g>\" ?"</string>
-    <string name="block_report_number_alert_details" msgid="2652479394593143562">"Vous ne recevrez plus d\'appels de ce numéro."</string>
-    <string name="block_number_alert_details" msgid="715942751312046429">"<xliff:g id="TEXT">%1$s</xliff:g> Cet appel sera signalé comme indésirable."</string>
-    <string name="unblock_number_alert_details" msgid="8696070817026870606">"Ce numéro sera débloqué. Les appels provenant de celui-ci seront acceptés."</string>
-    <string name="unblock_report_number_alert_title" msgid="2221901995393696882">"Débloquer le numéro \"<xliff:g id="NUMBER">%1$s</xliff:g>\" ?"</string>
-    <string name="report_not_spam_alert_button" msgid="3244953565919894995">"Signaler"</string>
-    <string name="report_not_spam_alert_title" msgid="395961923213504916">"Signaler une erreur ?"</string>
-    <string name="report_not_spam_alert_details" msgid="4463730683530824797">"Les appels provenant du <xliff:g id="NUMBER">%1$s</xliff:g> seront désormais acceptés."</string>
-    <string name="checkbox_report_as_spam_action" msgid="1549159682170273798">"Signaler comme indésirable"</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="migrate_blocked_numbers_dialog_title">Nouveau processus de blocage simplifié</string>
+  <string name="migrate_blocked_numbers_dialog_message">Afin de mieux vous protéger, la fonctionnalité de blocage de numéros doit être modifiée. Le blocage pourra désormais être appliqué aux appels entrants comme aux SMS entrants, et être étendu à d\'autres applications.</string>
+  <string name="migrate_blocked_numbers_dialog_allow_button">Autoriser</string>
+  <string name="old_block_number_confirmation_title">Bloquer le %1$s ?</string>
+  <string name="block_number_confirmation_message_vvm">Les appels associés à ce numéro seront bloqués, et les messages vocaux seront automatiquement supprimés.</string>
+  <string name="block_number_confirmation_message_no_vvm">Les appels associés à ce numéro seront bloqués, mais l\'appelant pourra peut-être toujours vous laisser des messages vocaux.</string>
+  <string name="block_number_confirmation_message_new_filtering">Vous ne recevrez plus d\'appels ni de SMS provenant de ce numéro.</string>
+  <string name="block_number_ok">BLOQUER</string>
+  <string name="unblock_number_confirmation_title">Débloquer le %1$s ?</string>
+  <string name="unblock_number_ok">DÉBLOQUER</string>
+  <string name="invalidNumber">Le %1$s n\'est pas un numéro valide.</string>
+  <string name="snackbar_number_blocked">Le numéro \"%1$s\" est bloqué.</string>
+  <string name="snackbar_number_unblocked">Le numéro %1$s a été débloqué.</string>
+  <string name="send_to_voicemail_import_failed">Échec lors de l\'importation.</string>
+  <string name="call_blocking_disabled_notification_title">Blocage des appels désactivé pendant 48 heures</string>
+  <string name="call_blocking_disabled_notification_text">Désactivé, car un appel d\'urgence a été effectué</string>
 </resources>
diff --git a/java/com/android/dialer/blocking/res/values-gl/strings.xml b/java/com/android/dialer/blocking/res/values-gl/strings.xml
index 6c2cc4a..4bcecda 100644
--- a/java/com/android/dialer/blocking/res/values-gl/strings.xml
+++ b/java/com/android/dialer/blocking/res/values-gl/strings.xml
@@ -1,46 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="migrate_blocked_numbers_dialog_title" msgid="7823962296457673809">"Novo bloqueo simplificado"</string>
-    <string name="migrate_blocked_numbers_dialog_message" msgid="8309736147266462485">"Para protexerte mellor, a aplicación do teléfono necesita cambiar o funcionamento do bloqueo. Os teus números bloqueados agora deterán as chamadas e as mensaxes de texto e, ademais, pode que se compartan con outras aplicacións."</string>
-    <string name="migrate_blocked_numbers_dialog_allow_button" msgid="5192836471557751367">"Permitir"</string>
-    <string name="block_number_confirmation_title" msgid="2699521227461376076">"Queres bloquear o <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="block_number_confirmation_message_vvm" msgid="6501105244172290939">"Bloquearanse as chamadas deste número e eliminaranse automaticamente os correos de voz."</string>
-    <string name="block_number_confirmation_message_no_vvm" msgid="8236641245709649882">"Bloquearanse as chamadas deste número, pero é posible que o emisor da chamada aínda poida deixarche correos de voz."</string>
-    <string name="block_number_confirmation_message_new_filtering" msgid="8487449683723062644">"Xa non recibirás máis chamadas nin mensaxes de texto deste número."</string>
-    <string name="block_number_ok" msgid="739786082788038932">"BLOQUEAR"</string>
-    <string name="unblock_number_confirmation_title" msgid="7897778825085659941">"Queres desbloquear o <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="unblock_number_ok" msgid="5089057152966269355">"DESBLOQUEAR"</string>
-    <string name="invalidNumber" msgid="6270918250761754967">"O <xliff:g id="NUMBER">%1$s</xliff:g> non e válido."</string>
-    <string name="snackbar_number_blocked" msgid="5760234822413921845">"Bloqueouse o <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="snackbar_number_unblocked" msgid="7941296274123990585">"Desbloqueouse o <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="block_number_undo" msgid="5158120911892491697">"DESFACER"</string>
-    <string name="send_to_voicemail_import_failed" msgid="1012752662074208237">"Produciuse un erro na importación"</string>
-    <string name="call_blocking_disabled_notification_title" msgid="7211352205255347489">"Desactivouse o bloqueo de chamadas durante 48 horas"</string>
-    <string name="call_blocking_disabled_notification_text" msgid="141384084865180722">"Desactivouse porque se realizou unha chamada de emerxencia."</string>
-    <string name="block_report_number_alert_title" msgid="2740581989824959611">"Queres bloquear o <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="block_report_number_alert_details" msgid="2652479394593143562">"Xa non recibirás máis chamadas deste número."</string>
-    <string name="block_number_alert_details" msgid="715942751312046429">"<xliff:g id="TEXT">%1$s</xliff:g> Informarase de que esta chamada é spam."</string>
-    <string name="unblock_number_alert_details" msgid="8696070817026870606">"Desbloquearase este número e informarase de que non é spam. Aceptaranse as futuras chamadas."</string>
-    <string name="unblock_report_number_alert_title" msgid="2221901995393696882">"Queres desbloquear o <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="report_not_spam_alert_button" msgid="3244953565919894995">"Informar"</string>
-    <string name="report_not_spam_alert_title" msgid="395961923213504916">"Queres informar dun erro?"</string>
-    <string name="report_not_spam_alert_details" msgid="4463730683530824797">"Xa non se definirán como spam as futuras chamadas do <xliff:g id="NUMBER">%1$s</xliff:g>."</string>
-    <string name="checkbox_report_as_spam_action" msgid="1549159682170273798">"Informar de que a chamada é spam"</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="migrate_blocked_numbers_dialog_title">Novo bloqueo simplificado</string>
+  <string name="migrate_blocked_numbers_dialog_message">Para protexerte mellor, a aplicación do teléfono necesita cambiar o funcionamento do bloqueo. Os teus números bloqueados agora deterán as chamadas e as mensaxes de texto e, ademais, pode que se compartan con outras aplicacións.</string>
+  <string name="migrate_blocked_numbers_dialog_allow_button">Permitir</string>
+  <string name="old_block_number_confirmation_title">Queres bloquear o %1$s?</string>
+  <string name="block_number_confirmation_message_vvm">Bloquearanse as chamadas deste número e eliminaranse automaticamente os correos de voz.</string>
+  <string name="block_number_confirmation_message_no_vvm">Bloquearanse as chamadas deste número, pero é posible que o emisor da chamada aínda poida deixarche correos de voz.</string>
+  <string name="block_number_confirmation_message_new_filtering">Xa non recibirás máis chamadas nin mensaxes de texto deste número.</string>
+  <string name="block_number_ok">BLOQUEAR</string>
+  <string name="unblock_number_confirmation_title">Queres desbloquear o %1$s?</string>
+  <string name="unblock_number_ok">DESBLOQUEAR</string>
+  <string name="invalidNumber">O %1$s non e válido.</string>
+  <string name="snackbar_number_blocked">Bloqueouse o %1$s</string>
+  <string name="snackbar_number_unblocked">Desbloqueouse o %1$s</string>
+  <string name="send_to_voicemail_import_failed">Produciuse un erro na importación</string>
+  <string name="call_blocking_disabled_notification_title">Desactivouse o bloqueo de chamadas durante 48 horas</string>
+  <string name="call_blocking_disabled_notification_text">Desactivouse porque se realizou unha chamada de urxencia.</string>
 </resources>
diff --git a/java/com/android/dialer/blocking/res/values-gu/strings.xml b/java/com/android/dialer/blocking/res/values-gu/strings.xml
index 3c17013..5abca88 100644
--- a/java/com/android/dialer/blocking/res/values-gu/strings.xml
+++ b/java/com/android/dialer/blocking/res/values-gu/strings.xml
@@ -1,46 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="migrate_blocked_numbers_dialog_title" msgid="7823962296457673809">"અવરોધિત કરવાની નવી, સરળ રીત"</string>
-    <string name="migrate_blocked_numbers_dialog_message" msgid="8309736147266462485">"તમારી બહેતર સુરક્ષા માટે, ફોનને, અવરોધિત કરવું કેવી રીતે કાર્ય કરે છે તે બદલવાની જરૂર છે. તમારા અવરોધિત નંબર્સ હવે કૉલ્સ અને ટેક્સ્ટ્સ બન્નેને રોકશે અને તે અન્ય ઍપ્લિકેશનો સાથે શેર કરવામાં આવી શકે છે."</string>
-    <string name="migrate_blocked_numbers_dialog_allow_button" msgid="5192836471557751367">"મંજૂરી આપો"</string>
-    <string name="block_number_confirmation_title" msgid="2699521227461376076">"<xliff:g id="NUMBER">%1$s</xliff:g> ને અવરોધિત કરીએ?"</string>
-    <string name="block_number_confirmation_message_vvm" msgid="6501105244172290939">"આ નંબરથી આવનારા કૉલ્સ અવરોધિત કરવામાં આવશે અને વૉઇસમેઇલ્સ આપમેળે કાઢી નાખવામાં આવશે."</string>
-    <string name="block_number_confirmation_message_no_vvm" msgid="8236641245709649882">"આ નંબરથી આવનારા કૉલ્સ અવરોધિત કરવામાં આવશે, પરંતુ કૉલર હજી પણ તમારા માટે વૉઇસમેઇલ્સ મૂકવામાં સમર્થ હોઈ શકે છે."</string>
-    <string name="block_number_confirmation_message_new_filtering" msgid="8487449683723062644">"તમે હવે આ નંબરથી કૉલ્સ અથવા ટેક્સ્ટ પ્રાપ્ત કરશો નહીં."</string>
-    <string name="block_number_ok" msgid="739786082788038932">"અવરોધિત કરો"</string>
-    <string name="unblock_number_confirmation_title" msgid="7897778825085659941">"<xliff:g id="NUMBER">%1$s</xliff:g> ને અનાવરોધિત કરીએ?"</string>
-    <string name="unblock_number_ok" msgid="5089057152966269355">"અનાવરોધિત કરો"</string>
-    <string name="invalidNumber" msgid="6270918250761754967">"<xliff:g id="NUMBER">%1$s</xliff:g> અમાન્ય છે."</string>
-    <string name="snackbar_number_blocked" msgid="5760234822413921845">"<xliff:g id="NUMBER">%1$s</xliff:g> અવરોધિત કર્યો"</string>
-    <string name="snackbar_number_unblocked" msgid="7941296274123990585">"<xliff:g id="NUMBER">%1$s</xliff:g> અનાવરોધિત કર્યો"</string>
-    <string name="block_number_undo" msgid="5158120911892491697">"પૂર્વવત્ કરો"</string>
-    <string name="send_to_voicemail_import_failed" msgid="1012752662074208237">"આયાત નિષ્ફળ થયું"</string>
-    <string name="call_blocking_disabled_notification_title" msgid="7211352205255347489">"કૉલ અવરોધિત કરવાનું 48 કલાક માટે અક્ષમ કરાયું"</string>
-    <string name="call_blocking_disabled_notification_text" msgid="141384084865180722">"અક્ષમ કરાયું કારણ કે એક કટોકટીનો કૉલ કરવામાં આવ્યો હતો."</string>
-    <string name="block_report_number_alert_title" msgid="2740581989824959611">"<xliff:g id="NUMBER">%1$s</xliff:g> ને અવરોધિત કરીએ?"</string>
-    <string name="block_report_number_alert_details" msgid="2652479394593143562">"તમે હવે આ નંબરથી કૉલ્સ પ્રાપ્ત કરશો નહીં."</string>
-    <string name="block_number_alert_details" msgid="715942751312046429">"<xliff:g id="TEXT">%1$s</xliff:g> આ કૉલની સ્પામ તરીકે જાણ કરવામાં આવશે."</string>
-    <string name="unblock_number_alert_details" msgid="8696070817026870606">"આ નંબર અનાવરોધિત કરી અને સ્પામ નથી તરીકે જાણ કરશે. ભાવિ કૉલ્સ સ્પામ તરીકે ઓળખવામાં આવશે નહીં."</string>
-    <string name="unblock_report_number_alert_title" msgid="2221901995393696882">"<xliff:g id="NUMBER">%1$s</xliff:g> ને અનાવરોધિત કરીએ?"</string>
-    <string name="report_not_spam_alert_button" msgid="3244953565919894995">"જાણ કરો"</string>
-    <string name="report_not_spam_alert_title" msgid="395961923213504916">"ભૂલની જાણ કરીએ?"</string>
-    <string name="report_not_spam_alert_details" msgid="4463730683530824797">"<xliff:g id="NUMBER">%1$s</xliff:g> તરફથી ભવિષ્યના કૉલ્સ હવેથી સ્પામ તરીકે ઓળખવામાં આવશે નહીં."</string>
-    <string name="checkbox_report_as_spam_action" msgid="1549159682170273798">"કૉલની સ્પામ તરીકે જાણ કરો"</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="migrate_blocked_numbers_dialog_title">અવરોધિત કરવાની નવી, સરળ રીત</string>
+  <string name="migrate_blocked_numbers_dialog_message">તમારી બહેતર સુરક્ષા માટે, ફોનને, અવરોધિત કરવું કેવી રીતે કાર્ય કરે છે તે બદલવાની જરૂર છે. તમારા અવરોધિત નંબર્સ હવે કૉલ્સ અને ટેક્સ્ટ્સ બન્નેને રોકશે અને તે અન્ય ઍપ્લિકેશનો સાથે શેર કરવામાં આવી શકે છે.</string>
+  <string name="migrate_blocked_numbers_dialog_allow_button">મંજૂરી આપો</string>
+  <string name="old_block_number_confirmation_title">%1$sને બ્લૉક કરીએ?</string>
+  <string name="block_number_confirmation_message_vvm">આ નંબરથી આવનારા કૉલ્સ અવરોધિત કરવામાં આવશે અને વૉઇસમેઇલ્સ આપમેળે કાઢી નાખવામાં આવશે.</string>
+  <string name="block_number_confirmation_message_no_vvm">આ નંબરથી આવનારા કૉલ્સ અવરોધિત કરવામાં આવશે, પરંતુ કૉલર હજી પણ તમારા માટે વૉઇસમેઇલ્સ મૂકવામાં સમર્થ હોઈ શકે છે.</string>
+  <string name="block_number_confirmation_message_new_filtering">તમે હવે આ નંબરથી કૉલ્સ અથવા ટેક્સ્ટ પ્રાપ્ત કરશો નહીં.</string>
+  <string name="block_number_ok">અવરોધિત કરો</string>
+  <string name="unblock_number_confirmation_title">%1$sને અનબ્લૉક કરીએ?</string>
+  <string name="unblock_number_ok">અનાવરોધિત કરો</string>
+  <string name="invalidNumber">%1$s અમાન્ય છે.</string>
+  <string name="snackbar_number_blocked">%1$s અવરોધિત કર્યો</string>
+  <string name="snackbar_number_unblocked">%1$sને અનબ્લૉક કર્યો</string>
+  <string name="send_to_voicemail_import_failed">આયાત નિષ્ફળ થયું</string>
+  <string name="call_blocking_disabled_notification_title">કૉલ અવરોધિત કરવાનું 48 કલાક માટે અક્ષમ કરાયું</string>
+  <string name="call_blocking_disabled_notification_text">અક્ષમ કરાયું કારણ કે એક કટોકટીનો કૉલ કરવામાં આવ્યો હતો.</string>
 </resources>
diff --git a/java/com/android/dialer/blocking/res/values-hi/strings.xml b/java/com/android/dialer/blocking/res/values-hi/strings.xml
index fde8e9d..a4fd6b1 100644
--- a/java/com/android/dialer/blocking/res/values-hi/strings.xml
+++ b/java/com/android/dialer/blocking/res/values-hi/strings.xml
@@ -1,46 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="migrate_blocked_numbers_dialog_title" msgid="7823962296457673809">"नया, सरल अवरोधन"</string>
-    <string name="migrate_blocked_numbers_dialog_message" msgid="8309736147266462485">"आपकी बेहतर सुरक्षा के लिए, फ़ोन के अवरुद्ध करने के तरीके को बदलने की आवश्यकता है. आपके अवरोधित नंबर अब कॉल और लेख संदेश दोनों को रोक देंगे तथा उन्हें अन्य ऐप्लिकेशन के साथ साझा किया जा सकता है."</string>
-    <string name="migrate_blocked_numbers_dialog_allow_button" msgid="5192836471557751367">"अनुमति दें"</string>
-    <string name="block_number_confirmation_title" msgid="2699521227461376076">"<xliff:g id="NUMBER">%1$s</xliff:g> को अवरुद्ध करें?"</string>
-    <string name="block_number_confirmation_message_vvm" msgid="6501105244172290939">"इस नंबर से आने वाले कॉल अवरुद्ध कर दिए जाएंगे और वॉइसमेल अपने आप हटा दिए जाएंगे."</string>
-    <string name="block_number_confirmation_message_no_vvm" msgid="8236641245709649882">"इस नंबर से आने वाले कॉल अवरुद्ध कर दिए जाएंगे, लेकिन कॉलर अब भी आपके लिए वॉइसमेल भेज सकेंगे."</string>
-    <string name="block_number_confirmation_message_new_filtering" msgid="8487449683723062644">"अब आपको इस नंबर से कॉल या लेख संदेश प्राप्त नहीं होंगे."</string>
-    <string name="block_number_ok" msgid="739786082788038932">"अवरुद्ध करें"</string>
-    <string name="unblock_number_confirmation_title" msgid="7897778825085659941">"<xliff:g id="NUMBER">%1$s</xliff:g> को अनवरोधित करें?"</string>
-    <string name="unblock_number_ok" msgid="5089057152966269355">"अनवरोधित करें"</string>
-    <string name="invalidNumber" msgid="6270918250761754967">"<xliff:g id="NUMBER">%1$s</xliff:g> अमान्य है."</string>
-    <string name="snackbar_number_blocked" msgid="5760234822413921845">"<xliff:g id="NUMBER">%1$s</xliff:g> अवरोधित किया गया"</string>
-    <string name="snackbar_number_unblocked" msgid="7941296274123990585">"<xliff:g id="NUMBER">%1$s</xliff:g> अनवरोधित किया गया"</string>
-    <string name="block_number_undo" msgid="5158120911892491697">"वापस लाएं"</string>
-    <string name="send_to_voicemail_import_failed" msgid="1012752662074208237">"आयात करना विफल रहा"</string>
-    <string name="call_blocking_disabled_notification_title" msgid="7211352205255347489">"कॉल अवरुद्ध करना 48 घंटे के लिए अक्षम कर दिया गया"</string>
-    <string name="call_blocking_disabled_notification_text" msgid="141384084865180722">"आपातकालीन कॉल किए जाने के कारण अक्षम कर दिया गया."</string>
-    <string name="block_report_number_alert_title" msgid="2740581989824959611">"<xliff:g id="NUMBER">%1$s</xliff:g> को अवरुद्ध करें?"</string>
-    <string name="block_report_number_alert_details" msgid="2652479394593143562">"अब आपको इस नंबर से कॉल प्राप्त नहीं होंगे."</string>
-    <string name="block_number_alert_details" msgid="715942751312046429">"<xliff:g id="TEXT">%1$s</xliff:g> इस कॉल को स्पैम के रूप में रिपोर्ट किया जाएगा."</string>
-    <string name="unblock_number_alert_details" msgid="8696070817026870606">"नंबर अनवरोधित हो जाएगा व स्पैम के रूप में रिपोर्ट नहीं किया जाएगा. आगे के कॉल स्पैम नहीं माने जाएंगे."</string>
-    <string name="unblock_report_number_alert_title" msgid="2221901995393696882">"<xliff:g id="NUMBER">%1$s</xliff:g> को अनवरोधित करें?"</string>
-    <string name="report_not_spam_alert_button" msgid="3244953565919894995">"रिपोर्ट करें"</string>
-    <string name="report_not_spam_alert_title" msgid="395961923213504916">"गलती की रिपोर्ट करें?"</string>
-    <string name="report_not_spam_alert_details" msgid="4463730683530824797">"<xliff:g id="NUMBER">%1$s</xliff:g> से आने वाले भविष्य के कॉल को अब स्पैम नहीं माना जाएगा."</string>
-    <string name="checkbox_report_as_spam_action" msgid="1549159682170273798">"कॉल को स्पैम रिपोर्ट करें"</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="migrate_blocked_numbers_dialog_title">नया, सरल अवरोधन</string>
+  <string name="migrate_blocked_numbers_dialog_message">आपकी बेहतर सुरक्षा के लिए, फ़ोन के ब्लॉक करने के तरीके को बदलने की ज़रूरत है. आपके ब्लॉक किए गए नंबर अब कॉल और मैसेज दोनों को रोक देंगे और उन्हें दूसरे ऐप्लिकेशन के साथ शेयर किया जा सकता है.</string>
+  <string name="migrate_blocked_numbers_dialog_allow_button">अनुमति दें</string>
+  <string name="old_block_number_confirmation_title">%1$sपर रोक लगाएं?</string>
+  <string name="block_number_confirmation_message_vvm">इस नंबर से आने वाले कॉल ब्लॉक कर दिए जाएंगे और वॉइसमेल अपने आप हटा दिए जाएंगे.</string>
+  <string name="block_number_confirmation_message_no_vvm">इस नंबर से आने वाले कॉल ब्लॉक कर दिए जाएंगे, लेकिन कॉलर अब भी आपके लिए वॉइसमेल भेज सकेंगे.</string>
+  <string name="block_number_confirmation_message_new_filtering">अब आपको इस नंबर से कॉल या लेख संदेश प्राप्त नहीं होंगे.</string>
+  <string name="block_number_ok">अवरुद्ध करें</string>
+  <string name="unblock_number_confirmation_title">%1$sपर से रोक हटाएं?</string>
+  <string name="unblock_number_ok">अनवरोधित करें</string>
+  <string name="invalidNumber">%1$sगलत है.</string>
+  <string name="snackbar_number_blocked">%1$s अवरोधित किया गया</string>
+  <string name="snackbar_number_unblocked">%1$sपर से रोक हटाई गई</string>
+  <string name="send_to_voicemail_import_failed">आयात करना विफल रहा</string>
+  <string name="call_blocking_disabled_notification_title">कॉल अवरुद्ध करना 48 घंटे के लिए अक्षम कर दिया गया</string>
+  <string name="call_blocking_disabled_notification_text">आपातकालीन कॉल किए जाने के कारण अक्षम कर दिया गया.</string>
 </resources>
diff --git a/java/com/android/dialer/blocking/res/values-hr/strings.xml b/java/com/android/dialer/blocking/res/values-hr/strings.xml
index e7d3434..6aa049d 100644
--- a/java/com/android/dialer/blocking/res/values-hr/strings.xml
+++ b/java/com/android/dialer/blocking/res/values-hr/strings.xml
@@ -1,46 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="migrate_blocked_numbers_dialog_title" msgid="7823962296457673809">"Novo, jednostavnije blokiranje"</string>
-    <string name="migrate_blocked_numbers_dialog_message" msgid="8309736147266462485">"Da bi vas bolje zaštitio, Phone mora promijeniti način funkcioniranja blokiranja. S blokiranih brojeva više nećete primati pozive ni SMS poruke. Osim toga, blokirani brojevi moći će se dijeliti s drugim aplikacijama."</string>
-    <string name="migrate_blocked_numbers_dialog_allow_button" msgid="5192836471557751367">"Omogući"</string>
-    <string name="block_number_confirmation_title" msgid="2699521227461376076">"Želite li blokirati <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="block_number_confirmation_message_vvm" msgid="6501105244172290939">"Pozivi s tog broja blokirat će se, a govorna pošta automatski će se brisati."</string>
-    <string name="block_number_confirmation_message_no_vvm" msgid="8236641245709649882">"Pozivi s tog broja blokirat će se, ali pozivatelj će vam moći ostavljati govornu poštu."</string>
-    <string name="block_number_confirmation_message_new_filtering" msgid="8487449683723062644">"Više nećete primati pozive ni poruke s tog broja."</string>
-    <string name="block_number_ok" msgid="739786082788038932">"BLOKIRAJ"</string>
-    <string name="unblock_number_confirmation_title" msgid="7897778825085659941">"Želite li deblokirati <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="unblock_number_ok" msgid="5089057152966269355">"DEBLOKIRAJ"</string>
-    <string name="invalidNumber" msgid="6270918250761754967">"Broj <xliff:g id="NUMBER">%1$s</xliff:g> nije važeći."</string>
-    <string name="snackbar_number_blocked" msgid="5760234822413921845">"<xliff:g id="NUMBER">%1$s</xliff:g> blokiran"</string>
-    <string name="snackbar_number_unblocked" msgid="7941296274123990585">"<xliff:g id="NUMBER">%1$s</xliff:g> deblokiran"</string>
-    <string name="block_number_undo" msgid="5158120911892491697">"PONIŠTI"</string>
-    <string name="send_to_voicemail_import_failed" msgid="1012752662074208237">"Uvoz nije uspio"</string>
-    <string name="call_blocking_disabled_notification_title" msgid="7211352205255347489">"Blokiranje poziva onemogućeno je na 48 sati"</string>
-    <string name="call_blocking_disabled_notification_text" msgid="141384084865180722">"Onemogućeno jer je upućen hitni poziv."</string>
-    <string name="block_report_number_alert_title" msgid="2740581989824959611">"Želite li blokirati <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="block_report_number_alert_details" msgid="2652479394593143562">"Više nećete primati pozive s tog broja."</string>
-    <string name="block_number_alert_details" msgid="715942751312046429">"<xliff:g id="TEXT">%1$s</xliff:g> Taj će se poziv prijaviti kao neželjeni."</string>
-    <string name="unblock_number_alert_details" msgid="8696070817026870606">"Taj će se broj deblokirati i neće biti prijavljen kao neželjeni. Budući pozivi neće se označiti kao neželjeni."</string>
-    <string name="unblock_report_number_alert_title" msgid="2221901995393696882">"Želite li deblokirati <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="report_not_spam_alert_button" msgid="3244953565919894995">"Prijavi"</string>
-    <string name="report_not_spam_alert_title" msgid="395961923213504916">"Želite li prijaviti pogrešku?"</string>
-    <string name="report_not_spam_alert_details" msgid="4463730683530824797">"Budući pozivi s broja <xliff:g id="NUMBER">%1$s</xliff:g> više se neće označivati kao neželjeni."</string>
-    <string name="checkbox_report_as_spam_action" msgid="1549159682170273798">"Prijavite poziv kao neželjeni"</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="migrate_blocked_numbers_dialog_title">Novo, jednostavnije blokiranje</string>
+  <string name="migrate_blocked_numbers_dialog_message">Da bi vas bolje zaštitio, Phone mora promijeniti način funkcioniranja blokiranja. S blokiranih brojeva više nećete primati pozive ni SMS poruke. Osim toga, blokirani brojevi moći će se dijeliti s drugim aplikacijama.</string>
+  <string name="migrate_blocked_numbers_dialog_allow_button">Omogući</string>
+  <string name="old_block_number_confirmation_title">Želite li blokirati broj %1$s?</string>
+  <string name="block_number_confirmation_message_vvm">Pozivi s tog broja blokirat će se, a govorna pošta automatski će se brisati.</string>
+  <string name="block_number_confirmation_message_no_vvm">Pozivi s tog broja blokirat će se, ali pozivatelj će vam moći ostavljati govornu poštu.</string>
+  <string name="block_number_confirmation_message_new_filtering">Više nećete primati pozive ni poruke s tog broja.</string>
+  <string name="block_number_ok">BLOKIRAJ</string>
+  <string name="unblock_number_confirmation_title">Želite li deblokirati broj %1$s?</string>
+  <string name="unblock_number_ok">DEBLOKIRAJ</string>
+  <string name="invalidNumber">Broj %1$s nije važeći.</string>
+  <string name="snackbar_number_blocked">%1$s blokiran</string>
+  <string name="snackbar_number_unblocked">%1$s deblokiran</string>
+  <string name="send_to_voicemail_import_failed">Uvoz nije uspio</string>
+  <string name="call_blocking_disabled_notification_title">Blokiranje poziva onemogućeno je na 48 sati</string>
+  <string name="call_blocking_disabled_notification_text">Onemogućeno jer je upućen hitni poziv.</string>
 </resources>
diff --git a/java/com/android/dialer/blocking/res/values-hu/strings.xml b/java/com/android/dialer/blocking/res/values-hu/strings.xml
index 7981d6c..ed638db 100644
--- a/java/com/android/dialer/blocking/res/values-hu/strings.xml
+++ b/java/com/android/dialer/blocking/res/values-hu/strings.xml
@@ -1,46 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="migrate_blocked_numbers_dialog_title" msgid="7823962296457673809">"Új, egyszerűbb letiltás"</string>
-    <string name="migrate_blocked_numbers_dialog_message" msgid="8309736147266462485">"Az Ön fokozottabb védelme érdekében a telefonnak módosítania kell a tiltás működését. A letiltott számok most már a hívásokat és az SMS-eket is megakadályozzák, és megoszthatók más alkalmazásokkal is."</string>
-    <string name="migrate_blocked_numbers_dialog_allow_button" msgid="5192836471557751367">"Engedélyezés"</string>
-    <string name="block_number_confirmation_title" msgid="2699521227461376076">"Letiltja a következő számot: <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="block_number_confirmation_message_vvm" msgid="6501105244172290939">"Az erről a számról érkező hívásokat a rendszer letiltja, továbbá automatikusan törli az onnan érkező hangpostaüzeneteket is."</string>
-    <string name="block_number_confirmation_message_no_vvm" msgid="8236641245709649882">"Az erről a számról érkező hívásokat letiltja a rendszer, azonban a hívó fél továbbra is hagyhat hangpostaüzeneteket."</string>
-    <string name="block_number_confirmation_message_new_filtering" msgid="8487449683723062644">"A továbbiakban nem fogad hívásokat vagy SMS-eket erről a számról."</string>
-    <string name="block_number_ok" msgid="739786082788038932">"LETILTÁS"</string>
-    <string name="unblock_number_confirmation_title" msgid="7897778825085659941">"Feloldja a következő szám tiltását: <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="unblock_number_ok" msgid="5089057152966269355">"TILTÁS FELOLDÁSA"</string>
-    <string name="invalidNumber" msgid="6270918250761754967">"A(z) <xliff:g id="NUMBER">%1$s</xliff:g> érvénytelen."</string>
-    <string name="snackbar_number_blocked" msgid="5760234822413921845">"A következő szám letiltva: <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="snackbar_number_unblocked" msgid="7941296274123990585">"A következő szám tiltása feloldva: <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="block_number_undo" msgid="5158120911892491697">"VISSZAVONÁS"</string>
-    <string name="send_to_voicemail_import_failed" msgid="1012752662074208237">"Az importálás nem sikerült"</string>
-    <string name="call_blocking_disabled_notification_title" msgid="7211352205255347489">"A hívások tiltása funkció kikapcsolva 48 órára"</string>
-    <string name="call_blocking_disabled_notification_text" msgid="141384084865180722">"Letiltva segélyhívás miatt."</string>
-    <string name="block_report_number_alert_title" msgid="2740581989824959611">"Letiltja a következő számot: <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="block_report_number_alert_details" msgid="2652479394593143562">"A jövőben nem fogad hívásokat erről a számról."</string>
-    <string name="block_number_alert_details" msgid="715942751312046429">"<xliff:g id="TEXT">%1$s</xliff:g> A hívást spamként jelentjük be."</string>
-    <string name="unblock_number_alert_details" msgid="8696070817026870606">"A rendszer feloldja a szám tiltását, és nem spamként jelenti be. A hívások nem spamek."</string>
-    <string name="unblock_report_number_alert_title" msgid="2221901995393696882">"Feloldja a következő szám tiltását: <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="report_not_spam_alert_button" msgid="3244953565919894995">"Bejelentés"</string>
-    <string name="report_not_spam_alert_title" msgid="395961923213504916">"Be szeretne jelenteni egy hibát?"</string>
-    <string name="report_not_spam_alert_details" msgid="4463730683530824797">"A tőle érkező hívásokat a jövőben a rendszer nem azonosítja spamként: <xliff:g id="NUMBER">%1$s</xliff:g>."</string>
-    <string name="checkbox_report_as_spam_action" msgid="1549159682170273798">"Hívás bejelentése spamként"</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="migrate_blocked_numbers_dialog_title">Új, egyszerűbb letiltás</string>
+  <string name="migrate_blocked_numbers_dialog_message">Az Ön fokozottabb védelme érdekében a telefonnak módosítania kell a tiltás működését. A letiltott számok most már a hívásokat és az SMS-eket is megakadályozzák, és megoszthatók más alkalmazásokkal is.</string>
+  <string name="migrate_blocked_numbers_dialog_allow_button">Engedélyezés</string>
+  <string name="old_block_number_confirmation_title">Letiltja a következő számot: %1$s?</string>
+  <string name="block_number_confirmation_message_vvm">Az erről a számról érkező hívásokat a rendszer letiltja, továbbá automatikusan törli az onnan érkező hangpostaüzeneteket is.</string>
+  <string name="block_number_confirmation_message_no_vvm">Az erről a számról érkező hívásokat letiltja a rendszer, azonban a hívó fél továbbra is hagyhat hangpostaüzeneteket.</string>
+  <string name="block_number_confirmation_message_new_filtering">A továbbiakban nem fogad hívásokat vagy SMS-eket erről a számról.</string>
+  <string name="block_number_ok">LETILTÁS</string>
+  <string name="unblock_number_confirmation_title">Feloldja a következő szám tiltását: %1$s?</string>
+  <string name="unblock_number_ok">TILTÁS FELOLDÁSA</string>
+  <string name="invalidNumber">A következő szám érvénytelen: %1$s.</string>
+  <string name="snackbar_number_blocked">A következő szám letiltva: %1$s</string>
+  <string name="snackbar_number_unblocked">A következő szám tiltása feloldva: %1$s</string>
+  <string name="send_to_voicemail_import_failed">Az importálás nem sikerült</string>
+  <string name="call_blocking_disabled_notification_title">A hívások tiltása funkció kikapcsolva 48 órára</string>
+  <string name="call_blocking_disabled_notification_text">Letiltva segélyhívás miatt.</string>
 </resources>
diff --git a/java/com/android/dialer/blocking/res/values-hy/strings.xml b/java/com/android/dialer/blocking/res/values-hy/strings.xml
index 0203b08..3b15177 100644
--- a/java/com/android/dialer/blocking/res/values-hy/strings.xml
+++ b/java/com/android/dialer/blocking/res/values-hy/strings.xml
@@ -1,46 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="migrate_blocked_numbers_dialog_title" msgid="7823962296457673809">"Նոր, պարզեցված արգելափակում"</string>
-    <string name="migrate_blocked_numbers_dialog_message" msgid="8309736147266462485">"Ձեզ ավելի լավ պաշտպանելու նպատակով Հեռախոսին անհրաժեշտ է փոխել արգելափակման կարգավորումները: Արգելափակված համարներից զանգերի և տեքստային հաղորդագրությունների ստացումը կկասեցվի, իսկ այդ համարները կարող են տրամադրվել այլ հավելվածներին:"</string>
-    <string name="migrate_blocked_numbers_dialog_allow_button" msgid="5192836471557751367">"Թույլատրել"</string>
-    <string name="block_number_confirmation_title" msgid="2699521227461376076">"Արգելափակե՞լ <xliff:g id="NUMBER">%1$s</xliff:g> համարը:"</string>
-    <string name="block_number_confirmation_message_vvm" msgid="6501105244172290939">"Այս համարից զանգերը կարգելափակվեն, իսկ ձայնային փոստի հաղորդագրություններն ավտոմատ կերպով կջնջվեն:"</string>
-    <string name="block_number_confirmation_message_no_vvm" msgid="8236641245709649882">"Այս համարից զանգերը կարգելափակվեն, սակայն զանգողը կկարողանա ձեզ համար ձայնային փոստի հաղորդագրություններ թողնել:"</string>
-    <string name="block_number_confirmation_message_new_filtering" msgid="8487449683723062644">"Այս համարից զանգեր և SMS-ներ այլևս չեք ստանա:"</string>
-    <string name="block_number_ok" msgid="739786082788038932">"ԱՐԳԵԼԱՓԱԿԵԼ"</string>
-    <string name="unblock_number_confirmation_title" msgid="7897778825085659941">"Արգելաբացե՞լ <xliff:g id="NUMBER">%1$s</xliff:g> համարը:"</string>
-    <string name="unblock_number_ok" msgid="5089057152966269355">"ԱՐԳԵԼԱԲԱՑԵԼ"</string>
-    <string name="invalidNumber" msgid="6270918250761754967">"<xliff:g id="NUMBER">%1$s</xliff:g> համարը սխալ է:"</string>
-    <string name="snackbar_number_blocked" msgid="5760234822413921845">"Արգելափակվել է <xliff:g id="NUMBER">%1$s</xliff:g> համար"</string>
-    <string name="snackbar_number_unblocked" msgid="7941296274123990585">"Արգելաբացվել է <xliff:g id="NUMBER">%1$s</xliff:g> համար"</string>
-    <string name="block_number_undo" msgid="5158120911892491697">"ՀԵՏԱՐԿԵԼ"</string>
-    <string name="send_to_voicemail_import_failed" msgid="1012752662074208237">"Ներմուծումը չհաջողվեց"</string>
-    <string name="call_blocking_disabled_notification_title" msgid="7211352205255347489">"Զանգերի արգելափակումն անջատվել է 48 ժամով"</string>
-    <string name="call_blocking_disabled_notification_text" msgid="141384084865180722">"Անջատվել է, քանի որ շտապ կանչ է արվել:"</string>
-    <string name="block_report_number_alert_title" msgid="2740581989824959611">"Արգելափակե՞լ <xliff:g id="NUMBER">%1$s</xliff:g> համարը:"</string>
-    <string name="block_report_number_alert_details" msgid="2652479394593143562">"Այս համարից այլևս զանգեր չեք ստանա:"</string>
-    <string name="block_number_alert_details" msgid="715942751312046429">"<xliff:g id="TEXT">%1$s</xliff:g> Այս զանգը կնշվի որպես լցոն:"</string>
-    <string name="unblock_number_alert_details" msgid="8696070817026870606">"Այս համարը կարգելաբացվի և կնշվի որպես ոչ լցոն: Այս համարից եկող զանգերն այլևս չեն նշվի որպես լցոն:"</string>
-    <string name="unblock_report_number_alert_title" msgid="2221901995393696882">"Արգելաբացե՞լ <xliff:g id="NUMBER">%1$s</xliff:g> համարը:"</string>
-    <string name="report_not_spam_alert_button" msgid="3244953565919894995">"Հաղորդել"</string>
-    <string name="report_not_spam_alert_title" msgid="395961923213504916">"Հաղորդե՞լ սխալի մասին:"</string>
-    <string name="report_not_spam_alert_details" msgid="4463730683530824797">"<xliff:g id="NUMBER">%1$s</xliff:g> համարից եկող զանգերն այլևս չեն նշվի որպես լցոն:"</string>
-    <string name="checkbox_report_as_spam_action" msgid="1549159682170273798">"Նշել զանգը որպես լցոն"</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="migrate_blocked_numbers_dialog_title">Նոր, պարզեցված արգելափակում</string>
+  <string name="migrate_blocked_numbers_dialog_message">Ձեզ ավելի լավ պաշտպանելու նպատակով Հեռախոսին անհրաժեշտ է փոխել արգելափակման կարգավորումները: Արգելափակված համարներից զանգերի և տեքստային հաղորդագրությունների ստացումը կկասեցվի, իսկ այդ համարները կարող են տրամադրվել այլ հավելվածներին:</string>
+  <string name="migrate_blocked_numbers_dialog_allow_button">Թույլատրել</string>
+  <string name="old_block_number_confirmation_title">Արգելափակե՞լ %1$s համարը</string>
+  <string name="block_number_confirmation_message_vvm">Այս համարից զանգերը կարգելափակվեն, իսկ ձայնային փոստի հաղորդագրություններն ավտոմատ կերպով կջնջվեն:</string>
+  <string name="block_number_confirmation_message_no_vvm">Այս համարից զանգերը կարգելափակվեն, սակայն զանգողը կկարողանա ձեզ համար ձայնային փոստի հաղորդագրություններ թողնել:</string>
+  <string name="block_number_confirmation_message_new_filtering">Այս համարից զանգեր և SMS-ներ այլևս չեք ստանա:</string>
+  <string name="block_number_ok">ԱՐԳԵԼԱՓԱԿԵԼ</string>
+  <string name="unblock_number_confirmation_title">Արգելաբացե՞լ %1$s համարը:</string>
+  <string name="unblock_number_ok">ԱՐԳԵԼԱԲԱՑԵԼ</string>
+  <string name="invalidNumber">%1$s համարը սխալ է:</string>
+  <string name="snackbar_number_blocked">Արգելափակվել է %1$s համար</string>
+  <string name="snackbar_number_unblocked">%1$s համարն արգելաբացվեց</string>
+  <string name="send_to_voicemail_import_failed">Ներմուծումը չհաջողվեց</string>
+  <string name="call_blocking_disabled_notification_title">Զանգերի արգելափակումն անջատվել է 48 ժամով</string>
+  <string name="call_blocking_disabled_notification_text">Անջատվել է, քանի որ շտապ կանչ է արվել:</string>
 </resources>
diff --git a/java/com/android/dialer/blocking/res/values-in/strings.xml b/java/com/android/dialer/blocking/res/values-in/strings.xml
index 830e3b6..a51b0a3 100644
--- a/java/com/android/dialer/blocking/res/values-in/strings.xml
+++ b/java/com/android/dialer/blocking/res/values-in/strings.xml
@@ -1,46 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="migrate_blocked_numbers_dialog_title" msgid="7823962296457673809">"Pemblokiran baru yang disederhanakan"</string>
-    <string name="migrate_blocked_numbers_dialog_message" msgid="8309736147266462485">"Untuk semakin melindungi Anda, Telepon harus mengubah cara kerja pemblokiran. Sekarang nomor yang diblokir akan menghentikan panggilan telepon dan SMS, dan mungkin dibagikan dengan aplikasi lain."</string>
-    <string name="migrate_blocked_numbers_dialog_allow_button" msgid="5192836471557751367">"Izinkan"</string>
-    <string name="block_number_confirmation_title" msgid="2699521227461376076">"Blokir <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="block_number_confirmation_message_vvm" msgid="6501105244172290939">"Panggilan telepon dari nomor ini akan diblokir dan pesan suara akan dihapus secara otomatis."</string>
-    <string name="block_number_confirmation_message_no_vvm" msgid="8236641245709649882">"Panggilan telepon dari nomor ini akan diblokir, tetapi penelepon mungkin masih dapat meninggalkan pesan suara."</string>
-    <string name="block_number_confirmation_message_new_filtering" msgid="8487449683723062644">"Anda tidak akan menerima telepon atau SMS lagi dari nomor ini."</string>
-    <string name="block_number_ok" msgid="739786082788038932">"BLOKIR"</string>
-    <string name="unblock_number_confirmation_title" msgid="7897778825085659941">"Bebaskan <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="unblock_number_ok" msgid="5089057152966269355">"BEBASKAN"</string>
-    <string name="invalidNumber" msgid="6270918250761754967">"<xliff:g id="NUMBER">%1$s</xliff:g> tidak valid."</string>
-    <string name="snackbar_number_blocked" msgid="5760234822413921845">"<xliff:g id="NUMBER">%1$s</xliff:g> diblokir"</string>
-    <string name="snackbar_number_unblocked" msgid="7941296274123990585">"<xliff:g id="NUMBER">%1$s</xliff:g> dibebaskan"</string>
-    <string name="block_number_undo" msgid="5158120911892491697">"URUNGKAN"</string>
-    <string name="send_to_voicemail_import_failed" msgid="1012752662074208237">"Impor gagal"</string>
-    <string name="call_blocking_disabled_notification_title" msgid="7211352205255347489">"Pemblokiran panggilan dinonaktifkan selama 48 jam"</string>
-    <string name="call_blocking_disabled_notification_text" msgid="141384084865180722">"Dinonaktifkan karena panggilan darurat dilakukan."</string>
-    <string name="block_report_number_alert_title" msgid="2740581989824959611">"Blokir <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="block_report_number_alert_details" msgid="2652479394593143562">"Anda tidak akan menerima telepon dari nomor ini lagi."</string>
-    <string name="block_number_alert_details" msgid="715942751312046429">"<xliff:g id="TEXT">%1$s</xliff:g> Panggilan ini akan dilaporkan sebagai spam."</string>
-    <string name="unblock_number_alert_details" msgid="8696070817026870606">"Nomor akan dibebaskan &amp; dilaporkan bukan spam. Telepon mendatang dari nomor ini dianggap bukan spam."</string>
-    <string name="unblock_report_number_alert_title" msgid="2221901995393696882">"Bebaskan <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="report_not_spam_alert_button" msgid="3244953565919894995">"Laporkan"</string>
-    <string name="report_not_spam_alert_title" msgid="395961923213504916">"Laporkan kesalahan?"</string>
-    <string name="report_not_spam_alert_details" msgid="4463730683530824797">"Telepon mendatang dari <xliff:g id="NUMBER">%1$s</xliff:g> tidak akan dianggap spam lagi."</string>
-    <string name="checkbox_report_as_spam_action" msgid="1549159682170273798">"Laporkan telepon sebagai spam"</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="migrate_blocked_numbers_dialog_title">Pemblokiran baru yang disederhanakan</string>
+  <string name="migrate_blocked_numbers_dialog_message">Untuk semakin melindungi Anda, Telepon harus mengubah cara kerja pemblokiran. Sekarang nomor yang diblokir akan menghentikan panggilan telepon dan SMS, dan mungkin dibagikan dengan aplikasi lain.</string>
+  <string name="migrate_blocked_numbers_dialog_allow_button">Izinkan</string>
+  <string name="old_block_number_confirmation_title">Blokir%1$s?</string>
+  <string name="block_number_confirmation_message_vvm">Panggilan telepon dari nomor ini akan diblokir dan pesan suara akan dihapus secara otomatis.</string>
+  <string name="block_number_confirmation_message_no_vvm">Panggilan telepon dari nomor ini akan diblokir, tetapi penelepon mungkin masih dapat meninggalkan pesan suara.</string>
+  <string name="block_number_confirmation_message_new_filtering">Anda tidak akan menerima telepon atau SMS lagi dari nomor ini.</string>
+  <string name="block_number_ok">BLOKIR</string>
+  <string name="unblock_number_confirmation_title">Batalkan pemblokiran%1$s?</string>
+  <string name="unblock_number_ok">BEBASKAN</string>
+  <string name="invalidNumber">%1$stidak valid.</string>
+  <string name="snackbar_number_blocked">%1$s diblokir</string>
+  <string name="snackbar_number_unblocked">Pemblokiran %1$sdibatalkan</string>
+  <string name="send_to_voicemail_import_failed">Impor gagal</string>
+  <string name="call_blocking_disabled_notification_title">Pemblokiran panggilan dinonaktifkan selama 48 jam</string>
+  <string name="call_blocking_disabled_notification_text">Dinonaktifkan karena panggilan darurat dilakukan.</string>
 </resources>
diff --git a/java/com/android/dialer/blocking/res/values-is/strings.xml b/java/com/android/dialer/blocking/res/values-is/strings.xml
index 3b41c81..0fef2d9 100644
--- a/java/com/android/dialer/blocking/res/values-is/strings.xml
+++ b/java/com/android/dialer/blocking/res/values-is/strings.xml
@@ -1,46 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="migrate_blocked_numbers_dialog_title" msgid="7823962296457673809">"Nýr, einfaldari bannlisti"</string>
-    <string name="migrate_blocked_numbers_dialog_message" msgid="8309736147266462485">"Til að vernda þig enn betur þarf símaforritið að breyta því hvernig farið er með bannlista. Séu númer á bannlista verður bæði lokað fyrir símtöl og skilaboð frá þeim og hugsanlega verður þeim deilt með öðrum forritum."</string>
-    <string name="migrate_blocked_numbers_dialog_allow_button" msgid="5192836471557751367">"Leyfa"</string>
-    <string name="block_number_confirmation_title" msgid="2699521227461376076">"Setja <xliff:g id="NUMBER">%1$s</xliff:g> á bannlista?"</string>
-    <string name="block_number_confirmation_message_vvm" msgid="6501105244172290939">"Lokað verður fyrir símtöl frá þessu númeri og talhólfsskilaboðum sjálfkrafa eytt."</string>
-    <string name="block_number_confirmation_message_no_vvm" msgid="8236641245709649882">"Lokað verður fyrir símtöl frá þessu númeri. Hugsanlegt er að sá sem hringir geti engu að síður sent þér talhólfsskilaboð."</string>
-    <string name="block_number_confirmation_message_new_filtering" msgid="8487449683723062644">"Þú munt ekki lengur fá símtöl eða textaskilaboð úr þessu númeri."</string>
-    <string name="block_number_ok" msgid="739786082788038932">"SETJA Á BANNLISTA"</string>
-    <string name="unblock_number_confirmation_title" msgid="7897778825085659941">"Taka <xliff:g id="NUMBER">%1$s</xliff:g> af bannlista?"</string>
-    <string name="unblock_number_ok" msgid="5089057152966269355">"TAKA AF BANNLISTA"</string>
-    <string name="invalidNumber" msgid="6270918250761754967">"<xliff:g id="NUMBER">%1$s</xliff:g> er ógilt."</string>
-    <string name="snackbar_number_blocked" msgid="5760234822413921845">"Lokað fyrir <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="snackbar_number_unblocked" msgid="7941296274123990585">"<xliff:g id="NUMBER">%1$s</xliff:g> tekið af bannlista"</string>
-    <string name="block_number_undo" msgid="5158120911892491697">"AFTURKALLA"</string>
-    <string name="send_to_voicemail_import_failed" msgid="1012752662074208237">"Innflutningur mistókst"</string>
-    <string name="call_blocking_disabled_notification_title" msgid="7211352205255347489">"Slökkt á lokun símtala í 48 klukkustundir"</string>
-    <string name="call_blocking_disabled_notification_text" msgid="141384084865180722">"Óvirkt vegna þess að neyðarsímtal var hringt."</string>
-    <string name="block_report_number_alert_title" msgid="2740581989824959611">"Setja <xliff:g id="NUMBER">%1$s</xliff:g> á bannlista?"</string>
-    <string name="block_report_number_alert_details" msgid="2652479394593143562">"Þú munt ekki lengur fá símtöl úr þessu númeri."</string>
-    <string name="block_number_alert_details" msgid="715942751312046429">"<xliff:g id="TEXT">%1$s</xliff:g> Þetta símtal verður tilkynnt."</string>
-    <string name="unblock_number_alert_details" msgid="8696070817026870606">"Þetta númer verður tekið af bannlista og ekki tilkynnt sem ruslnúmer. Frekari símtöl verða ekki tilkynnt."</string>
-    <string name="unblock_report_number_alert_title" msgid="2221901995393696882">"Taka <xliff:g id="NUMBER">%1$s</xliff:g> af bannlista?"</string>
-    <string name="report_not_spam_alert_button" msgid="3244953565919894995">"Tilkynna"</string>
-    <string name="report_not_spam_alert_title" msgid="395961923213504916">"Tilkynna mistök?"</string>
-    <string name="report_not_spam_alert_details" msgid="4463730683530824797">"Frekari símtöl frá <xliff:g id="NUMBER">%1$s</xliff:g> verða ekki lengur tilkynnt."</string>
-    <string name="checkbox_report_as_spam_action" msgid="1549159682170273798">"Tilkynna símtal sem ruslefni"</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="migrate_blocked_numbers_dialog_title">Nýr, einfaldari bannlisti</string>
+  <string name="migrate_blocked_numbers_dialog_message">Til að vernda þig enn betur þarf símaforritið að breyta því hvernig farið er með bannlista. Séu númer á bannlista verður bæði lokað fyrir símtöl og skilaboð frá þeim og hugsanlega verður þeim deilt með öðrum forritum.</string>
+  <string name="migrate_blocked_numbers_dialog_allow_button">Leyfa</string>
+  <string name="old_block_number_confirmation_title">Setja %1$s á bannlista?</string>
+  <string name="block_number_confirmation_message_vvm">Lokað verður fyrir símtöl frá þessu númeri og talhólfsskilaboðum sjálfkrafa eytt.</string>
+  <string name="block_number_confirmation_message_no_vvm">Lokað verður fyrir símtöl frá þessu númeri. Hugsanlegt er að sá sem hringir geti engu að síður sent þér talhólfsskilaboð.</string>
+  <string name="block_number_confirmation_message_new_filtering">Þú munt ekki lengur fá símtöl eða textaskilaboð úr þessu númeri.</string>
+  <string name="block_number_ok">SETJA Á BANNLISTA</string>
+  <string name="unblock_number_confirmation_title">Taka%1$s af bannlista?</string>
+  <string name="unblock_number_ok">TAKA AF BANNLISTA</string>
+  <string name="invalidNumber">%1$ser ógilt.</string>
+  <string name="snackbar_number_blocked">Lokað fyrir %1$s</string>
+  <string name="snackbar_number_unblocked">%1$stekið af bannlista</string>
+  <string name="send_to_voicemail_import_failed">Innflutningur mistókst</string>
+  <string name="call_blocking_disabled_notification_title">Slökkt á lokun símtala í 48 klukkustundir</string>
+  <string name="call_blocking_disabled_notification_text">Óvirkt vegna þess að neyðarsímtal var hringt.</string>
 </resources>
diff --git a/java/com/android/dialer/blocking/res/values-it/strings.xml b/java/com/android/dialer/blocking/res/values-it/strings.xml
index b3bf909..9a9ae85 100644
--- a/java/com/android/dialer/blocking/res/values-it/strings.xml
+++ b/java/com/android/dialer/blocking/res/values-it/strings.xml
@@ -1,46 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="migrate_blocked_numbers_dialog_title" msgid="7823962296457673809">"Nuovo blocco semplificato"</string>
-    <string name="migrate_blocked_numbers_dialog_message" msgid="8309736147266462485">"Per una migliore protezione, l\'app Telefono deve modificare il funzionamento del blocco. Ora gli SMS e le chiamate provenienti dai numeri bloccati non verranno ricevuti. I numeri bloccati, inoltre, possono essere condivisi con altre app."</string>
-    <string name="migrate_blocked_numbers_dialog_allow_button" msgid="5192836471557751367">"Consenti"</string>
-    <string name="block_number_confirmation_title" msgid="2699521227461376076">"Bloccare il numero <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="block_number_confirmation_message_vvm" msgid="6501105244172290939">"Le chiamate da questo numero verranno bloccate e i messaggi in segreteria verranno automaticamente eliminati."</string>
-    <string name="block_number_confirmation_message_no_vvm" msgid="8236641245709649882">"Le chiamate da questo numero verranno bloccate, ma il chiamante potrebbe lasciarti messaggi in segreteria."</string>
-    <string name="block_number_confirmation_message_new_filtering" msgid="8487449683723062644">"Non riceverai più chiamate o SMS da questo numero."</string>
-    <string name="block_number_ok" msgid="739786082788038932">"BLOCCA"</string>
-    <string name="unblock_number_confirmation_title" msgid="7897778825085659941">"Sbloccare il numero <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="unblock_number_ok" msgid="5089057152966269355">"SBLOCCA"</string>
-    <string name="invalidNumber" msgid="6270918250761754967">"<xliff:g id="NUMBER">%1$s</xliff:g> non è valido."</string>
-    <string name="snackbar_number_blocked" msgid="5760234822413921845">"<xliff:g id="NUMBER">%1$s</xliff:g> bloccato"</string>
-    <string name="snackbar_number_unblocked" msgid="7941296274123990585">"<xliff:g id="NUMBER">%1$s</xliff:g> sbloccato"</string>
-    <string name="block_number_undo" msgid="5158120911892491697">"ANNULLA"</string>
-    <string name="send_to_voicemail_import_failed" msgid="1012752662074208237">"Importazione non riuscita"</string>
-    <string name="call_blocking_disabled_notification_title" msgid="7211352205255347489">"Il blocco chiamate è stato disattivato per 48 ore"</string>
-    <string name="call_blocking_disabled_notification_text" msgid="141384084865180722">"Funzione disattivata: è stata fatta una chiamata di emergenza."</string>
-    <string name="block_report_number_alert_title" msgid="2740581989824959611">"Bloccare il numero <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="block_report_number_alert_details" msgid="2652479394593143562">"Non riceverai più chiamate da questo numero."</string>
-    <string name="block_number_alert_details" msgid="715942751312046429">"<xliff:g id="TEXT">%1$s</xliff:g> Questa chiamata verrà segnalata come spam."</string>
-    <string name="unblock_number_alert_details" msgid="8696070817026870606">"Il numero verrà sbloccato e segnalato come non spam. In futuro non sarà più considerato spam."</string>
-    <string name="unblock_report_number_alert_title" msgid="2221901995393696882">"Sbloccare il numero <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="report_not_spam_alert_button" msgid="3244953565919894995">"Segnala"</string>
-    <string name="report_not_spam_alert_title" msgid="395961923213504916">"Vuoi segnalare un errore?"</string>
-    <string name="report_not_spam_alert_details" msgid="4463730683530824797">"Le chiamate future da <xliff:g id="NUMBER">%1$s</xliff:g> non verranno più identificate come spam."</string>
-    <string name="checkbox_report_as_spam_action" msgid="1549159682170273798">"Segnala la chiamata come spam"</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="migrate_blocked_numbers_dialog_title">Nuovo blocco semplificato</string>
+  <string name="migrate_blocked_numbers_dialog_message">Per una migliore protezione, l\'app Telefono deve modificare il funzionamento del blocco. Ora gli SMS e le chiamate provenienti dai numeri bloccati non verranno ricevuti. I numeri bloccati, inoltre, possono essere condivisi con altre app.</string>
+  <string name="migrate_blocked_numbers_dialog_allow_button">Consenti</string>
+  <string name="old_block_number_confirmation_title">Bloccare il numero%1$s?</string>
+  <string name="block_number_confirmation_message_vvm">Le chiamate da questo numero verranno bloccate e i messaggi in segreteria verranno automaticamente eliminati.</string>
+  <string name="block_number_confirmation_message_no_vvm">Le chiamate da questo numero verranno bloccate, ma il chiamante potrebbe lasciarti messaggi in segreteria.</string>
+  <string name="block_number_confirmation_message_new_filtering">Non riceverai più chiamate o SMS da questo numero.</string>
+  <string name="block_number_ok">BLOCCA</string>
+  <string name="unblock_number_confirmation_title">Sbloccare il numero%1$s?</string>
+  <string name="unblock_number_ok">SBLOCCA</string>
+  <string name="invalidNumber">%1$snon è valido.</string>
+  <string name="snackbar_number_blocked">%1$s bloccato</string>
+  <string name="snackbar_number_unblocked">%1$ssbloccato</string>
+  <string name="send_to_voicemail_import_failed">Importazione non riuscita</string>
+  <string name="call_blocking_disabled_notification_title">Il blocco chiamate è stato disattivato per 48 ore</string>
+  <string name="call_blocking_disabled_notification_text">Funzione disattivata: è stata fatta una chiamata di emergenza.</string>
 </resources>
diff --git a/java/com/android/dialer/blocking/res/values-iw/strings.xml b/java/com/android/dialer/blocking/res/values-iw/strings.xml
index a8d307c..f5699ca 100644
--- a/java/com/android/dialer/blocking/res/values-iw/strings.xml
+++ b/java/com/android/dialer/blocking/res/values-iw/strings.xml
@@ -1,46 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="migrate_blocked_numbers_dialog_title" msgid="7823962296457673809">"תהליך חסימה חדש ופשוט"</string>
-    <string name="migrate_blocked_numbers_dialog_message" msgid="8309736147266462485">"כדי להגן עליך טוב יותר, הטלפון צריך לשנות את האופן שבו החסימה פועלת. לא תוכל לקבל שיחות והודעות טקסט ממספרים חסומים, וייתכן שהם ישותפו עם אפליקציות אחרות."</string>
-    <string name="migrate_blocked_numbers_dialog_allow_button" msgid="5192836471557751367">"אפשר"</string>
-    <string name="block_number_confirmation_title" msgid="2699521227461376076">"האם לחסום את המספר <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="block_number_confirmation_message_vvm" msgid="6501105244172290939">"שיחות ממספר זה ייחסמו והודעות דואר קולי יימחקו באופן אוטומטי."</string>
-    <string name="block_number_confirmation_message_no_vvm" msgid="8236641245709649882">"שיחות ממספר זה ייחסמו, אבל המתקשר עדיין יוכל להשאיר לך הודעות דואר קולי."</string>
-    <string name="block_number_confirmation_message_new_filtering" msgid="8487449683723062644">"לא יגיעו אליך יותר שיחות או הודעות טקסט מהמספר הזה."</string>
-    <string name="block_number_ok" msgid="739786082788038932">"חסום"</string>
-    <string name="unblock_number_confirmation_title" msgid="7897778825085659941">"האם לבטל את חסימת המספר <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="unblock_number_ok" msgid="5089057152966269355">"ביטול חסימה"</string>
-    <string name="invalidNumber" msgid="6270918250761754967">"<xliff:g id="NUMBER">%1$s</xliff:g> אינו חוקי."</string>
-    <string name="snackbar_number_blocked" msgid="5760234822413921845">"<xliff:g id="NUMBER">%1$s</xliff:g> חסום"</string>
-    <string name="snackbar_number_unblocked" msgid="7941296274123990585">"בוטלה החסימה של <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="block_number_undo" msgid="5158120911892491697">"בטל"</string>
-    <string name="send_to_voicemail_import_failed" msgid="1012752662074208237">"הייבוא נכשל"</string>
-    <string name="call_blocking_disabled_notification_title" msgid="7211352205255347489">"חסימת השיחות הושבתה ל-48 שעות"</string>
-    <string name="call_blocking_disabled_notification_text" msgid="141384084865180722">"מושבתת מפני שבוצעה שיחת חירום."</string>
-    <string name="block_report_number_alert_title" msgid="2740581989824959611">"האם לחסום את המספר <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="block_report_number_alert_details" msgid="2652479394593143562">"לא יגיעו אליך יותר שיחות מהמספר הזה."</string>
-    <string name="block_number_alert_details" msgid="715942751312046429">"<xliff:g id="TEXT">%1$s</xliff:g> השיחה הזו תדווח כספאם."</string>
-    <string name="unblock_number_alert_details" msgid="8696070817026870606">"החסימה של המספר הזה תבוטל וידווח שהוא אינו ספאם. שיחות שיתקבלו ממנו לא יזוהו כספאם."</string>
-    <string name="unblock_report_number_alert_title" msgid="2221901995393696882">"האם לבטל את חסימת המספר <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="report_not_spam_alert_button" msgid="3244953565919894995">"דווח"</string>
-    <string name="report_not_spam_alert_title" msgid="395961923213504916">"תרצה לדווח על טעות?"</string>
-    <string name="report_not_spam_alert_details" msgid="4463730683530824797">"שיחות שיתקבלו מהמספר <xliff:g id="NUMBER">%1$s</xliff:g> לא יזוהו יותר כספאם."</string>
-    <string name="checkbox_report_as_spam_action" msgid="1549159682170273798">"דיווח על השיחה כספאם"</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="migrate_blocked_numbers_dialog_title">תהליך חסימה חדש ופשוט</string>
+  <string name="migrate_blocked_numbers_dialog_message">כדי להגן עליך טוב יותר, הטלפון צריך לשנות את האופן שבו החסימה פועלת. לא תוכל לקבל שיחות והודעות טקסט ממספרים חסומים, וייתכן שהם ישותפו עם אפליקציות אחרות.</string>
+  <string name="migrate_blocked_numbers_dialog_allow_button">אפשר</string>
+  <string name="old_block_number_confirmation_title">לחסום את %1$s?</string>
+  <string name="block_number_confirmation_message_vvm">שיחות ממספר זה ייחסמו והודעות דואר קולי יימחקו באופן אוטומטי.</string>
+  <string name="block_number_confirmation_message_no_vvm">שיחות ממספר זה ייחסמו, אבל המתקשר עדיין יוכל להשאיר לך הודעות דואר קולי.</string>
+  <string name="block_number_confirmation_message_new_filtering">לא יגיעו אליך יותר שיחות או הודעות טקסט מהמספר הזה.</string>
+  <string name="block_number_ok">חסום</string>
+  <string name="unblock_number_confirmation_title">לבטל את החסימה של %1$s?</string>
+  <string name="unblock_number_ok">ביטול חסימה</string>
+  <string name="invalidNumber">המספר %1$s אינו חוקי.</string>
+  <string name="snackbar_number_blocked">%1$s חסום</string>
+  <string name="snackbar_number_unblocked">החסימה של %1$s בוטלה</string>
+  <string name="send_to_voicemail_import_failed">הייבוא נכשל</string>
+  <string name="call_blocking_disabled_notification_title">חסימת השיחות הושבתה ל-48 שעות</string>
+  <string name="call_blocking_disabled_notification_text">מושבתת מפני שבוצעה שיחת חירום.</string>
 </resources>
diff --git a/java/com/android/dialer/blocking/res/values-ja/strings.xml b/java/com/android/dialer/blocking/res/values-ja/strings.xml
index d407d8f..71614b8 100644
--- a/java/com/android/dialer/blocking/res/values-ja/strings.xml
+++ b/java/com/android/dialer/blocking/res/values-ja/strings.xml
@@ -1,46 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="migrate_blocked_numbers_dialog_title" msgid="7823962296457673809">"新しい、簡素化されたブロック"</string>
-    <string name="migrate_blocked_numbers_dialog_message" msgid="8309736147266462485">"セキュリティを強化するため、スマートフォンはブロック動作を変更する必要があります。ブロックされた電話番号からの通話とテキスト メッセージの両方が停止されます。また、ブロックされた電話番号は他のアプリと共有できます。"</string>
-    <string name="migrate_blocked_numbers_dialog_allow_button" msgid="5192836471557751367">"許可"</string>
-    <string name="block_number_confirmation_title" msgid="2699521227461376076">"<xliff:g id="NUMBER">%1$s</xliff:g>をブロックしますか？"</string>
-    <string name="block_number_confirmation_message_vvm" msgid="6501105244172290939">"この番号からの着信はブロックされ、ボイスメールは自動的に削除されます。"</string>
-    <string name="block_number_confirmation_message_no_vvm" msgid="8236641245709649882">"この番号からの着信はブロックされますが、発信者は今後もボイスメールを残すことができます。"</string>
-    <string name="block_number_confirmation_message_new_filtering" msgid="8487449683723062644">"今後はこの番号からの通話やテキスト メッセージは受信しなくなります。"</string>
-    <string name="block_number_ok" msgid="739786082788038932">"ブロック"</string>
-    <string name="unblock_number_confirmation_title" msgid="7897778825085659941">"<xliff:g id="NUMBER">%1$s</xliff:g>のブロックを解除しますか？"</string>
-    <string name="unblock_number_ok" msgid="5089057152966269355">"ブロックを解除"</string>
-    <string name="invalidNumber" msgid="6270918250761754967">"<xliff:g id="NUMBER">%1$s</xliff:g>は無効な番号です。"</string>
-    <string name="snackbar_number_blocked" msgid="5760234822413921845">"<xliff:g id="NUMBER">%1$s</xliff:g>をブロックしました"</string>
-    <string name="snackbar_number_unblocked" msgid="7941296274123990585">"<xliff:g id="NUMBER">%1$s</xliff:g>のブロックを解除しました"</string>
-    <string name="block_number_undo" msgid="5158120911892491697">"元に戻す"</string>
-    <string name="send_to_voicemail_import_failed" msgid="1012752662074208237">"インポートに失敗しました"</string>
-    <string name="call_blocking_disabled_notification_title" msgid="7211352205255347489">"着信のブロックは48時間経過するまで無効になりました"</string>
-    <string name="call_blocking_disabled_notification_text" msgid="141384084865180722">"緊急通報を行ったため無効になりました。"</string>
-    <string name="block_report_number_alert_title" msgid="2740581989824959611">"<xliff:g id="NUMBER">%1$s</xliff:g>をブロックしますか？"</string>
-    <string name="block_report_number_alert_details" msgid="2652479394593143562">"今後はこの番号からの通話は受信しなくなります。"</string>
-    <string name="block_number_alert_details" msgid="715942751312046429">"<xliff:g id="TEXT">%1$s</xliff:g> この通話を迷惑電話として報告します。"</string>
-    <string name="unblock_number_alert_details" msgid="8696070817026870606">"この番号のブロックが解除され、今後、この番号からの通話は迷惑電話とは見なされなくなります。"</string>
-    <string name="unblock_report_number_alert_title" msgid="2221901995393696882">"<xliff:g id="NUMBER">%1$s</xliff:g>のブロックを解除しますか？"</string>
-    <string name="report_not_spam_alert_button" msgid="3244953565919894995">"報告"</string>
-    <string name="report_not_spam_alert_title" msgid="395961923213504916">"誤検知を報告しますか？"</string>
-    <string name="report_not_spam_alert_details" msgid="4463730683530824797">"今後、<xliff:g id="NUMBER">%1$s</xliff:g> からの通話は迷惑電話とは見なされなくなります。"</string>
-    <string name="checkbox_report_as_spam_action" msgid="1549159682170273798">"通話を迷惑電話として報告する"</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="migrate_blocked_numbers_dialog_title">新しい、簡素化されたブロック</string>
+  <string name="migrate_blocked_numbers_dialog_message">セキュリティを強化するため、スマートフォンはブロック動作を変更する必要があります。ブロックされた電話番号からの通話とテキスト メッセージの両方が停止されます。また、ブロックされた電話番号は他のアプリと共有できます。</string>
+  <string name="migrate_blocked_numbers_dialog_allow_button">許可</string>
+  <string name="old_block_number_confirmation_title">%1$s をブロックしますか？</string>
+  <string name="block_number_confirmation_message_vvm">この番号からの着信はブロックされ、ボイスメールは自動的に削除されます。</string>
+  <string name="block_number_confirmation_message_no_vvm">この番号からの着信はブロックされますが、発信者は今後もボイスメールを残すことができます。</string>
+  <string name="block_number_confirmation_message_new_filtering">今後はこの番号からの通話やテキスト メッセージは受信しなくなります。</string>
+  <string name="block_number_ok">ブロック</string>
+  <string name="unblock_number_confirmation_title">%1$s のブロックを解除しますか？</string>
+  <string name="unblock_number_ok">ブロックを解除</string>
+  <string name="invalidNumber">%1$s は無効な番号です。</string>
+  <string name="snackbar_number_blocked">%1$sをブロックしました</string>
+  <string name="snackbar_number_unblocked">%1$s のブロックを解除しました</string>
+  <string name="send_to_voicemail_import_failed">インポートに失敗しました</string>
+  <string name="call_blocking_disabled_notification_title">着信のブロックは48時間経過するまで無効になりました</string>
+  <string name="call_blocking_disabled_notification_text">緊急通報を行ったため無効になりました。</string>
 </resources>
diff --git a/java/com/android/dialer/blocking/res/values-ka/strings.xml b/java/com/android/dialer/blocking/res/values-ka/strings.xml
index 48548ed..c26ff5a 100644
--- a/java/com/android/dialer/blocking/res/values-ka/strings.xml
+++ b/java/com/android/dialer/blocking/res/values-ka/strings.xml
@@ -1,46 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="migrate_blocked_numbers_dialog_title" msgid="7823962296457673809">"დაბლოკვის ახალი, მარტივი ხერხი"</string>
-    <string name="migrate_blocked_numbers_dialog_message" msgid="8309736147266462485">"თქვენი უკეთ დაცვის მიზნით, ტელეფონმა დაბლოკვის წესი უნდა შეცვალოს. თქვენ მიერ დაბლოკილი ნომრებიდან როგორც ზარები, ისე ტექსტური შეტყობინებები შეწყდება და შესაძლოა მოხდეს ამ ნომრების სხვა აპებთან გაზიარება."</string>
-    <string name="migrate_blocked_numbers_dialog_allow_button" msgid="5192836471557751367">"დაშვება"</string>
-    <string name="block_number_confirmation_title" msgid="2699521227461376076">"გსურთ, დაბლოკოთ <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="block_number_confirmation_message_vvm" msgid="6501105244172290939">"ამ ნომრიდან შემოსული ზარები დაიბლოკება, ხოლო ხმოვანი ფოსტა ავტომატურად წაიშლება."</string>
-    <string name="block_number_confirmation_message_no_vvm" msgid="8236641245709649882">"ამ ნომრიდან შემოსული ზარები დაიბლოკება, თუმცა აბონენტს მაინც შეეძლება თქვენთვის ხმოვანი ფოსტის დატოვება."</string>
-    <string name="block_number_confirmation_message_new_filtering" msgid="8487449683723062644">"ამ ნომრიდან ზარებს ან ტექსტურ შეტყობინებებს აღარ მიიღებთ."</string>
-    <string name="block_number_ok" msgid="739786082788038932">"დაბლოკვა"</string>
-    <string name="unblock_number_confirmation_title" msgid="7897778825085659941">"გსურთ, განბლოკოთ <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="unblock_number_ok" msgid="5089057152966269355">"განბლოკვა"</string>
-    <string name="invalidNumber" msgid="6270918250761754967">"<xliff:g id="NUMBER">%1$s</xliff:g> არასწორია."</string>
-    <string name="snackbar_number_blocked" msgid="5760234822413921845">"<xliff:g id="NUMBER">%1$s</xliff:g> დაბლოკილია"</string>
-    <string name="snackbar_number_unblocked" msgid="7941296274123990585">"<xliff:g id="NUMBER">%1$s</xliff:g> განბლოკილია"</string>
-    <string name="block_number_undo" msgid="5158120911892491697">"დაბრუნება"</string>
-    <string name="send_to_voicemail_import_failed" msgid="1012752662074208237">"იმპორტი ვერ მოხერხდა"</string>
-    <string name="call_blocking_disabled_notification_title" msgid="7211352205255347489">"ზარების დაბლოკვა გაითიშა 48 საათით"</string>
-    <string name="call_blocking_disabled_notification_text" msgid="141384084865180722">"გათიშულია, რადგან განხორციელდა საგანგებო ზარი."</string>
-    <string name="block_report_number_alert_title" msgid="2740581989824959611">"გსურთ, დაბლოკოთ <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="block_report_number_alert_details" msgid="2652479394593143562">"ამ ნომრიდან ზარებს აღარ მიიღებთ."</string>
-    <string name="block_number_alert_details" msgid="715942751312046429">"<xliff:g id="TEXT">%1$s</xliff:g> ეს ზარი მოინიშნება სპამად."</string>
-    <string name="unblock_number_alert_details" msgid="8696070817026870606">"ეს ნომერი განიბლოკება და გაიგზავნება სპამის გაუქმ. შეტყობინება. მომავალი ზარები სპამად არ ჩაითვლება."</string>
-    <string name="unblock_report_number_alert_title" msgid="2221901995393696882">"გსურთ, განბლოკოთ <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="report_not_spam_alert_button" msgid="3244953565919894995">"შეტყობინება"</string>
-    <string name="report_not_spam_alert_title" msgid="395961923213504916">"გსურთ, შეგვატყობინოთ შეცდომის შესახებ?"</string>
-    <string name="report_not_spam_alert_details" msgid="4463730683530824797">"მომავალი ზარები <xliff:g id="NUMBER">%1$s</xliff:g>-დან სპამად აღარ ჩაითვლება."</string>
-    <string name="checkbox_report_as_spam_action" msgid="1549159682170273798">"ზარზე სპამის შეტყ. გაგზავნა"</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="migrate_blocked_numbers_dialog_title">დაბლოკვის ახალი, მარტივი ხერხი</string>
+  <string name="migrate_blocked_numbers_dialog_message">თქვენი უკეთ დაცვის მიზნით, ტელეფონმა დაბლოკვის წესი უნდა შეცვალოს. თქვენ მიერ დაბლოკილი ნომრებიდან როგორც ზარები, ისე ტექსტური შეტყობინებები შეწყდება და შესაძლოა მოხდეს ამ ნომრების სხვა აპებთან გაზიარება.</string>
+  <string name="migrate_blocked_numbers_dialog_allow_button">დაშვება</string>
+  <string name="old_block_number_confirmation_title">დაიბლოკოს%1$s?</string>
+  <string name="block_number_confirmation_message_vvm">ამ ნომრიდან შემოსული ზარები დაიბლოკება, ხოლო ხმოვანი ფოსტა ავტომატურად წაიშლება.</string>
+  <string name="block_number_confirmation_message_no_vvm">ამ ნომრიდან შემოსული ზარები დაიბლოკება, თუმცა აბონენტს მაინც შეეძლება თქვენთვის ხმოვანი ფოსტის დატოვება.</string>
+  <string name="block_number_confirmation_message_new_filtering">ამ ნომრიდან ზარებს ან ტექსტურ შეტყობინებებს აღარ მიიღებთ.</string>
+  <string name="block_number_ok">დაბლოკვა</string>
+  <string name="unblock_number_confirmation_title">განიბლოკოს%1$s?</string>
+  <string name="unblock_number_ok">განბლოკვა</string>
+  <string name="invalidNumber">%1$sარასწორია.</string>
+  <string name="snackbar_number_blocked">%1$s დაბლოკილია</string>
+  <string name="snackbar_number_unblocked">%1$sგანბლოკილია</string>
+  <string name="send_to_voicemail_import_failed">იმპორტი ვერ მოხერხდა</string>
+  <string name="call_blocking_disabled_notification_title">ზარების დაბლოკვა გაითიშა 48 საათით</string>
+  <string name="call_blocking_disabled_notification_text">გათიშულია, რადგან განხორციელდა საგანგებო ზარი.</string>
 </resources>
diff --git a/java/com/android/dialer/blocking/res/values-kk/strings.xml b/java/com/android/dialer/blocking/res/values-kk/strings.xml
index 0bafe30..8672ce3 100644
--- a/java/com/android/dialer/blocking/res/values-kk/strings.xml
+++ b/java/com/android/dialer/blocking/res/values-kk/strings.xml
@@ -1,46 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="migrate_blocked_numbers_dialog_title" msgid="7823962296457673809">"Жаңа, қарапайым бөгеу"</string>
-    <string name="migrate_blocked_numbers_dialog_message" msgid="8309736147266462485">"Қорғанысыңызды арттыру үшін телефон бөгеудің қолданылу жолын өзгертуі керек. Бөгелген нөмірлер енді қоңырауларды да, мәтіндік хабарларды да тоқтатып, басқа қолданбаларда көрсетілуі мүмкін."</string>
-    <string name="migrate_blocked_numbers_dialog_allow_button" msgid="5192836471557751367">"Рұқсат беру"</string>
-    <string name="block_number_confirmation_title" msgid="2699521227461376076">"<xliff:g id="NUMBER">%1$s</xliff:g> бөгеу керек пе?"</string>
-    <string name="block_number_confirmation_message_vvm" msgid="6501105244172290939">"Осы нөмірден болашақ қоңыраулар бөгеледі және дауыстық хабарлар автоматты түрде жойылады."</string>
-    <string name="block_number_confirmation_message_no_vvm" msgid="8236641245709649882">"Осы нөмірден қоңыраулар бөгеледі, бірақ қоңырау шалушы әлі де сізге дауыстық хабарлар қалдыра алуы мүмкін."</string>
-    <string name="block_number_confirmation_message_new_filtering" msgid="8487449683723062644">"Бұдан былай осы нөмірден қоңыраулар немесе мәтіндік хабарлар алмайсыз."</string>
-    <string name="block_number_ok" msgid="739786082788038932">"БӨГЕУ"</string>
-    <string name="unblock_number_confirmation_title" msgid="7897778825085659941">"<xliff:g id="NUMBER">%1$s</xliff:g> бөгеуден шығару керек пе?"</string>
-    <string name="unblock_number_ok" msgid="5089057152966269355">"БӨГЕУДЕН ШЫҒАРУ"</string>
-    <string name="invalidNumber" msgid="6270918250761754967">"<xliff:g id="NUMBER">%1$s</xliff:g> жарамсыз."</string>
-    <string name="snackbar_number_blocked" msgid="5760234822413921845">"<xliff:g id="NUMBER">%1$s</xliff:g> бөгелген"</string>
-    <string name="snackbar_number_unblocked" msgid="7941296274123990585">"<xliff:g id="NUMBER">%1$s</xliff:g> бөгеуден шығарылған"</string>
-    <string name="block_number_undo" msgid="5158120911892491697">"КЕРІ ҚАЙТАРУ"</string>
-    <string name="send_to_voicemail_import_failed" msgid="1012752662074208237">"Импорттау сәтсіз аяқталды"</string>
-    <string name="call_blocking_disabled_notification_title" msgid="7211352205255347489">"Қоңырауларға тыйым салу 48 сағат бойы өшірілген"</string>
-    <string name="call_blocking_disabled_notification_text" msgid="141384084865180722">"Өшірілген, өйткені төтенше қоңырау соғылған."</string>
-    <string name="block_report_number_alert_title" msgid="2740581989824959611">"<xliff:g id="NUMBER">%1$s</xliff:g> бөгеу керек пе?"</string>
-    <string name="block_report_number_alert_details" msgid="2652479394593143562">"Бұдан былай осы нөмірден қоңыраулар алмайсыз."</string>
-    <string name="block_number_alert_details" msgid="715942751312046429">"<xliff:g id="TEXT">%1$s</xliff:g> Бұл қоңырау спам деп есеп беріледі."</string>
-    <string name="unblock_number_alert_details" msgid="8696070817026870606">"Бұл нөмір бөгеуден алынып, спам емес деп белгіленеді. Келешек қоңыраулар спам деп анықталмайды."</string>
-    <string name="unblock_report_number_alert_title" msgid="2221901995393696882">"<xliff:g id="NUMBER">%1$s</xliff:g> бөгеуден шығару керек пе?"</string>
-    <string name="report_not_spam_alert_button" msgid="3244953565919894995">"Есеп беру"</string>
-    <string name="report_not_spam_alert_title" msgid="395961923213504916">"Қате туралы есеп беру керек пе?"</string>
-    <string name="report_not_spam_alert_details" msgid="4463730683530824797">"Келетін <xliff:g id="NUMBER">%1$s</xliff:g> қоңыраулары енді спам деп анықталмайды."</string>
-    <string name="checkbox_report_as_spam_action" msgid="1549159682170273798">"Спам деп есеп беру"</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="migrate_blocked_numbers_dialog_title">Жаңа, қарапайым бөгеу</string>
+  <string name="migrate_blocked_numbers_dialog_message">Қорғанысыңызды арттыру үшін телефон бөгеудің қолданылу жолын өзгертуі керек. Бөгелген нөмірлер енді қоңырауларды да, мәтіндік хабарларды да тоқтатып, басқа қолданбаларда көрсетілуі мүмкін.</string>
+  <string name="migrate_blocked_numbers_dialog_allow_button">Рұқсат беру</string>
+  <string name="old_block_number_confirmation_title">%1$s нөмірін бөгеу қажет пе?</string>
+  <string name="block_number_confirmation_message_vvm">Осы нөмірден болашақ қоңыраулар бөгеледі және дауыстық хабарлар автоматты түрде жойылады.</string>
+  <string name="block_number_confirmation_message_no_vvm">Осы нөмірден қоңыраулар бөгеледі, бірақ қоңырау шалушы әлі де сізге дауыстық хабарлар қалдыра алуы мүмкін.</string>
+  <string name="block_number_confirmation_message_new_filtering">Бұдан былай осы нөмірден қоңыраулар немесе мәтіндік хабарлар алмайсыз.</string>
+  <string name="block_number_ok">БӨГЕУ</string>
+  <string name="unblock_number_confirmation_title">%1$s бөгеуін алу қажет пе?</string>
+  <string name="unblock_number_ok">БӨГЕУДЕН ШЫҒАРУ</string>
+  <string name="invalidNumber">%1$s нөмірі жарамсыз.</string>
+  <string name="snackbar_number_blocked">%1$s бөгелген</string>
+  <string name="snackbar_number_unblocked">%1$s бөгеуі алынды</string>
+  <string name="send_to_voicemail_import_failed">Импорттау сәтсіз аяқталды</string>
+  <string name="call_blocking_disabled_notification_title">Қоңырауларға тыйым салу 48 сағат бойы өшірілген</string>
+  <string name="call_blocking_disabled_notification_text">Өшірілген, өйткені төтенше қоңырау соғылған.</string>
 </resources>
diff --git a/java/com/android/dialer/blocking/res/values-km/strings.xml b/java/com/android/dialer/blocking/res/values-km/strings.xml
index 5b16771..a76dde9 100644
--- a/java/com/android/dialer/blocking/res/values-km/strings.xml
+++ b/java/com/android/dialer/blocking/res/values-km/strings.xml
@@ -1,46 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="migrate_blocked_numbers_dialog_title" msgid="7823962296457673809">"ថ្មី ការ​ទប់ស្កាត់​ដែល​ងាយស្រួល"</string>
-    <string name="migrate_blocked_numbers_dialog_message" msgid="8309736147266462485">"ដើម្បីការពារអ្នកឲ្យបានប្រសើរជាងមុន ទូរសព្ទ​ត្រូវធ្វើការផ្លាស់ប្តូររបៀប​​​ដែល​ការ​ទប់ស្កាត់​ដំណើរការ។ លេខដែល​បាន​ទប់ស្កាត់​របស់អ្នក​ឥឡូវ​នឹងបញ្ឈប់​ទាំង​ការហៅ និងការផ្ញើសារ និងអាច​ត្រូវបានចែករំលែកជាមួយកម្មវិធីផ្សេងទៀត។"</string>
-    <string name="migrate_blocked_numbers_dialog_allow_button" msgid="5192836471557751367">"អនុញ្ញាត"</string>
-    <string name="block_number_confirmation_title" msgid="2699521227461376076">"រារាំង <xliff:g id="NUMBER">%1$s</xliff:g> ឬ?"</string>
-    <string name="block_number_confirmation_message_vvm" msgid="6501105244172290939">"ការហៅចេញពីលេខនេះនឹងត្រូវបានរារាំង ហើយសារជាសំឡេងនឹងត្រូវបានលុបដោយស្វ័យប្រវត្តិ។"</string>
-    <string name="block_number_confirmation_message_no_vvm" msgid="8236641245709649882">"ការហៅចេញពីលេខនេះនឹងត្រូវបានរារាំង ប៉ុន្តែអ្នកហៅនៅតែអាចទុកសារជាសំឡេងឲ្យអ្នកបាន។"</string>
-    <string name="block_number_confirmation_message_new_filtering" msgid="8487449683723062644">"អ្នក​នឹង​លែង​ទទួល​​ការ​ហៅ ឬ​​សារ​​អត្ថបទ​ពី​លេខ​នេះ​ទៀត​ហើយ។"</string>
-    <string name="block_number_ok" msgid="739786082788038932">"រារាំង"</string>
-    <string name="unblock_number_confirmation_title" msgid="7897778825085659941">"ឈប់រារាំង <xliff:g id="NUMBER">%1$s</xliff:g> ឬ?"</string>
-    <string name="unblock_number_ok" msgid="5089057152966269355">"ឈប់រារាំង"</string>
-    <string name="invalidNumber" msgid="6270918250761754967">"<xliff:g id="NUMBER">%1$s</xliff:g> មិនត្រឹមត្រូវទេ"</string>
-    <string name="snackbar_number_blocked" msgid="5760234822413921845">"បានរារាំង <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="snackbar_number_unblocked" msgid="7941296274123990585">"បានឈប់រារាំង <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="block_number_undo" msgid="5158120911892491697">"​មិន​ធ្វើវិញ"</string>
-    <string name="send_to_voicemail_import_failed" msgid="1012752662074208237">"ការនាំចូលបានបរាជ័យ"</string>
-    <string name="call_blocking_disabled_notification_title" msgid="7211352205255347489">"ការរារាំងការហៅត្រូវបានបិទដំណើរការរយៈពេល 48 ម៉ោង"</string>
-    <string name="call_blocking_disabled_notification_text" msgid="141384084865180722">"បានបិទដំណើរការពីព្រោះការហៅបន្ទាន់ត្រូវបានធ្វើឡើង"</string>
-    <string name="block_report_number_alert_title" msgid="2740581989824959611">"រារាំង <xliff:g id="NUMBER">%1$s</xliff:g> ឬ?"</string>
-    <string name="block_report_number_alert_details" msgid="2652479394593143562">"អ្នក​នឹង​លែង​ទទួល​បាន​ការ​ហៅ​ពី​លេខ​នេះ​ទៀត​ហើយ។"</string>
-    <string name="block_number_alert_details" msgid="715942751312046429">"<xliff:g id="TEXT">%1$s</xliff:g> ការ​ហៅ​នេះ​នឹង​ត្រូវ​រាយការណ៍​ថា​ជា​សារ​ឥត​បាន​ការ។"</string>
-    <string name="unblock_number_alert_details" msgid="8696070817026870606">"លេខ​នេះ​នឹង​មិន​ត្រូវ​​ឈប់​​ទប់ស្កាត់ និង​រាយការណ៍​​ថា​​មិន​មែន​ជា​សារ​ឥតបានការ​ទេ។ ការ​ហៅ​លើក​ក្រោយៗ​នឹង​មិន​ត្រូវ​បាន​​កំណត់​​ថា​ជា​សារ​​ឥត​បាន​ការ​ទេ។"</string>
-    <string name="unblock_report_number_alert_title" msgid="2221901995393696882">"ឈប់រារាំង <xliff:g id="NUMBER">%1$s</xliff:g> ឬ?"</string>
-    <string name="report_not_spam_alert_button" msgid="3244953565919894995">"រាយការណ៍"</string>
-    <string name="report_not_spam_alert_title" msgid="395961923213504916">"រាយការណ៍កំហុស?"</string>
-    <string name="report_not_spam_alert_details" msgid="4463730683530824797">"ការ​ហៅ​លើក​ក្រោយៗ​​ពី <xliff:g id="NUMBER">%1$s</xliff:g> នឹង​លែង​ត្រូវ​បាន​សម្គាល់​ថា​ជា​សារ​ឥត​បាន​ការ​ទៀត​ហើយ។"</string>
-    <string name="checkbox_report_as_spam_action" msgid="1549159682170273798">"រាយការណ៍​ការ​ហៅ​​ថា​ជា​សារ​ឥត​បាន​ការ"</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="migrate_blocked_numbers_dialog_title">ថ្មី ការ​ទប់ស្កាត់​ដែល​ងាយស្រួល</string>
+  <string name="migrate_blocked_numbers_dialog_message">ដើម្បីការពារអ្នកឲ្យបានប្រសើរជាងមុន ទូរសព្ទ​ត្រូវធ្វើការផ្លាស់ប្តូររបៀប​​​ដែល​ការ​ទប់ស្កាត់​ដំណើរការ។ លេខដែល​បាន​ទប់ស្កាត់​របស់អ្នក​ឥឡូវ​នឹងបញ្ឈប់​ទាំង​ការហៅ និងការផ្ញើសារ និងអាច​ត្រូវបានចែករំលែកជាមួយកម្មវិធីផ្សេងទៀត។</string>
+  <string name="migrate_blocked_numbers_dialog_allow_button">អនុញ្ញាត</string>
+  <string name="old_block_number_confirmation_title">ទប់ស្កាត់ %1$s ឬ?</string>
+  <string name="block_number_confirmation_message_vvm">ការហៅចេញពីលេខនេះនឹងត្រូវបានរារាំង ហើយសារជាសំឡេងនឹងត្រូវបានលុបដោយស្វ័យប្រវត្តិ។</string>
+  <string name="block_number_confirmation_message_no_vvm">ការហៅចេញពីលេខនេះនឹងត្រូវបានរារាំង ប៉ុន្តែអ្នកហៅនៅតែអាចទុកសារជាសំឡេងឲ្យអ្នកបាន។</string>
+  <string name="block_number_confirmation_message_new_filtering">អ្នក​នឹង​លែង​ទទួល​​ការ​ហៅ ឬ​​សារ​​អត្ថបទ​ពី​លេខ​នេះ​ទៀត​ហើយ។</string>
+  <string name="block_number_ok">រារាំង</string>
+  <string name="unblock_number_confirmation_title">ឈប់​ទប់ស្កាត់ %1$s ?</string>
+  <string name="unblock_number_ok">ឈប់រារាំង</string>
+  <string name="invalidNumber">%1$s មិនត្រឹមត្រូវទេ។</string>
+  <string name="snackbar_number_blocked">បានរារាំង %1$s</string>
+  <string name="snackbar_number_unblocked">បាន​ឈប់​ទប់ស្កាត់ %1$s</string>
+  <string name="send_to_voicemail_import_failed">ការនាំចូលបានបរាជ័យ</string>
+  <string name="call_blocking_disabled_notification_title">ការរារាំងការហៅត្រូវបានបិទដំណើរការរយៈពេល 48 ម៉ោង</string>
+  <string name="call_blocking_disabled_notification_text">បានបិទដំណើរការពីព្រោះការហៅបន្ទាន់ត្រូវបានធ្វើឡើង</string>
 </resources>
diff --git a/java/com/android/dialer/blocking/res/values-kn/strings.xml b/java/com/android/dialer/blocking/res/values-kn/strings.xml
index 646ce89..cf80ae0 100644
--- a/java/com/android/dialer/blocking/res/values-kn/strings.xml
+++ b/java/com/android/dialer/blocking/res/values-kn/strings.xml
@@ -1,46 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="migrate_blocked_numbers_dialog_title" msgid="7823962296457673809">"ಹೊಸ, ಸರಳೀಕರಿಸಿದ ನಿರ್ಬಂಧ"</string>
-    <string name="migrate_blocked_numbers_dialog_message" msgid="8309736147266462485">"ನಿಮ್ಮನ್ನು ಉತ್ತಮ ರೀತಿಯಲ್ಲಿ ರಕ್ಷಿಸಲು, ನಿರ್ಬಂಧ ಹೇಗೆ ಕೆಲಸ ಮಾಡುತ್ತದೆ ಎಂದು ಫೋನ್ ಬದಲಾಯಿಸಬೇಕಾಗಿದೆ. ನಿಮ್ಮ ನಿರ್ಬಂಧಿಸಿದ ಸಂಖ್ಯೆಗಳು ಈಗ ಕರೆ ಮತ್ತು ಪಠ್ಯ ಸಂದೇಶಗಳನ್ನು ನಿಲ್ಲಿಸುತ್ತವೆ ಹಾಗೂ ಇತರ ಅಪ್ಲಿಕೇಶನ್‌ಗಳ ಜೊತೆಗೆ ಹಂಚಿಕೊಳ್ಳಬಹುದು."</string>
-    <string name="migrate_blocked_numbers_dialog_allow_button" msgid="5192836471557751367">"ಅನುಮತಿಸಿ"</string>
-    <string name="block_number_confirmation_title" msgid="2699521227461376076">"<xliff:g id="NUMBER">%1$s</xliff:g> ನಿರ್ಬಂಧಿಸುವುದೇ?"</string>
-    <string name="block_number_confirmation_message_vvm" msgid="6501105244172290939">"ಈ ಸಂಖ್ಯೆಗೆ ಕರೆಗಳನ್ನು ನಿರ್ಬಂಧಿಸಲಾಗುತ್ತದೆ ಮತ್ತು ಧ್ವನಿಮೇಲ್‌ಗಳನ್ನು ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಅಳಿಸಲಾಗುತ್ತದೆ."</string>
-    <string name="block_number_confirmation_message_no_vvm" msgid="8236641245709649882">"ಈ ಸಂಖ್ಯೆಗೆ ಕರೆಗಳನ್ನು ನಿರ್ಬಂಧಿಸಲಾಗುವುದು, ಆದರೆ ಕರೆಮಾಡುವವರು ಧ್ವನಿಮೇಲ್‌ಗಳನ್ನು ಈಗಲೂ ನಿಮಗೆ ಕಳುಹಿಸಬಹುದು."</string>
-    <string name="block_number_confirmation_message_new_filtering" msgid="8487449683723062644">"ಈ ಸಂಖ್ಯೆಯಿಂದ ನೀವು ಇನ್ನು ಮುಂದೆ ಕರೆಗಳು ಅಥವಾ ಪಠ್ಯ ಸಂದೇಶಗಳನ್ನು ಸ್ವೀಕರಿಸುವುದಿಲ್ಲ."</string>
-    <string name="block_number_ok" msgid="739786082788038932">"ನಿರ್ಬಂಧಿಸು"</string>
-    <string name="unblock_number_confirmation_title" msgid="7897778825085659941">"<xliff:g id="NUMBER">%1$s</xliff:g> ನಿರ್ಬಂಧ ತೆಗೆಯುವುದೇ?"</string>
-    <string name="unblock_number_ok" msgid="5089057152966269355">"ನಿರ್ಬಂಧ ತೆಗೆ"</string>
-    <string name="invalidNumber" msgid="6270918250761754967">"<xliff:g id="NUMBER">%1$s</xliff:g> ಅಮಾನ್ಯವಾಗಿದೆ."</string>
-    <string name="snackbar_number_blocked" msgid="5760234822413921845">"<xliff:g id="NUMBER">%1$s</xliff:g> ನಿರ್ಬಂಧಿಸಲಾಗಿದೆ"</string>
-    <string name="snackbar_number_unblocked" msgid="7941296274123990585">"<xliff:g id="NUMBER">%1$s</xliff:g> ನಿರ್ಬಂಧ ತೆಗೆಯಲಾಗಿದೆ"</string>
-    <string name="block_number_undo" msgid="5158120911892491697">"ರದ್ದುಮಾಡಿ"</string>
-    <string name="send_to_voicemail_import_failed" msgid="1012752662074208237">"ಆಮದು ವಿಫಲವಾಗಿದೆ"</string>
-    <string name="call_blocking_disabled_notification_title" msgid="7211352205255347489">"ಕರೆ ನಿರ್ಬಂಧಿಸುವಿಕೆ 48 ಗಂಟೆಗಳವರೆಗೆ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ"</string>
-    <string name="call_blocking_disabled_notification_text" msgid="141384084865180722">"ತುರ್ತು ಕರೆಯನ್ನು ಮಾಡಿರುವ ಕಾರಣದಿಂದ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ."</string>
-    <string name="block_report_number_alert_title" msgid="2740581989824959611">"<xliff:g id="NUMBER">%1$s</xliff:g> ನಿರ್ಬಂಧಿಸುವುದೇ?"</string>
-    <string name="block_report_number_alert_details" msgid="2652479394593143562">"ನೀವು ಇನ್ನು ಮುಂದೆ ಈ ಸಂಖ್ಯೆಯಿಂದ ಕರೆಗಳನ್ನು ಸ್ವೀಕರಿಸುವುದಿಲ್ಲ."</string>
-    <string name="block_number_alert_details" msgid="715942751312046429">"<xliff:g id="TEXT">%1$s</xliff:g> ಈ ಕರೆಯನ್ನು ಸ್ಪ್ಯಾಮ್ ಎಂದು ವರದಿ ಮಾಡಲಾಗುತ್ತದೆ."</string>
-    <string name="unblock_number_alert_details" msgid="8696070817026870606">"ಈ ಸಂಖ್ಯೆಗೆ ನಿರ್ಬಂಧ ತೆಗೆಯಲಾಗುತ್ತದೆ ಮತ್ತು ಸ್ಪ್ಯಾಮ್ ಎಂದು ವರದಿ ಮಾಡಲಾಗುವುದಿಲ್ಲ. ಭವಿಷ್ಯದ ಕರೆಗಳನ್ನು ಸ್ಪ್ಯಾಮ್ ಎಂದು ಗುರುತಿಸಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ."</string>
-    <string name="unblock_report_number_alert_title" msgid="2221901995393696882">"<xliff:g id="NUMBER">%1$s</xliff:g> ನಿರ್ಬಂಧ ತೆಗೆಯುವುದೇ?"</string>
-    <string name="report_not_spam_alert_button" msgid="3244953565919894995">"ವರದಿ ಮಾಡು"</string>
-    <string name="report_not_spam_alert_title" msgid="395961923213504916">"ತಪ್ಪನ್ನು ವರದಿಮಾಡುವುದೇ?"</string>
-    <string name="report_not_spam_alert_details" msgid="4463730683530824797">"ಈ <xliff:g id="NUMBER">%1$s</xliff:g> ಯಿಂದ ಭವಿಷ್ಯದ ಕರೆಗಳನ್ನು ಇನ್ನು ಮುಂದೆ ಸ್ಪ್ಯಾಮ್ ಎಂದು ಗುರುತಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ."</string>
-    <string name="checkbox_report_as_spam_action" msgid="1549159682170273798">"ಕರೆ ಸ್ಪ್ಯಾಮ್ ಎಂದು ವರದಿಮಾಡಿ"</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="migrate_blocked_numbers_dialog_title">ಹೊಸ, ಸರಳೀಕರಿಸಿದ ನಿರ್ಬಂಧ</string>
+  <string name="migrate_blocked_numbers_dialog_message">ನಿಮ್ಮನ್ನು ಉತ್ತಮ ರೀತಿಯಲ್ಲಿ ರಕ್ಷಿಸಲು, ನಿರ್ಬಂಧ ಹೇಗೆ ಕೆಲಸ ಮಾಡುತ್ತದೆ ಎಂದು ಫೋನ್ ಬದಲಾಯಿಸಬೇಕಾಗಿದೆ. ನಿಮ್ಮ ನಿರ್ಬಂಧಿಸಿದ ಸಂಖ್ಯೆಗಳು ಈಗ ಕರೆ ಮತ್ತು ಪಠ್ಯ ಸಂದೇಶಗಳನ್ನು ನಿಲ್ಲಿಸುತ್ತವೆ ಹಾಗೂ ಇತರ ಅಪ್ಲಿಕೇಶನ್‌ಗಳ ಜೊತೆಗೆ ಹಂಚಿಕೊಳ್ಳಬಹುದು.</string>
+  <string name="migrate_blocked_numbers_dialog_allow_button">ಅನುಮತಿಸಿ</string>
+  <string name="old_block_number_confirmation_title">%1$sಅನ್ನು ನಿರ್ಬಂಧಿಸಬೇಕೇ?</string>
+  <string name="block_number_confirmation_message_vvm">ಈ ಸಂಖ್ಯೆಗೆ ಕರೆಗಳನ್ನು ನಿರ್ಬಂಧಿಸಲಾಗುತ್ತದೆ ಮತ್ತು ಧ್ವನಿಮೇಲ್‌ಗಳನ್ನು ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಅಳಿಸಲಾಗುತ್ತದೆ.</string>
+  <string name="block_number_confirmation_message_no_vvm">ಈ ಸಂಖ್ಯೆಗೆ ಕರೆಗಳನ್ನು ನಿರ್ಬಂಧಿಸಲಾಗುವುದು, ಆದರೆ ಕರೆಮಾಡುವವರು ಧ್ವನಿಮೇಲ್‌ಗಳನ್ನು ಈಗಲೂ ನಿಮಗೆ ಕಳುಹಿಸಬಹುದು.</string>
+  <string name="block_number_confirmation_message_new_filtering">ಈ ಸಂಖ್ಯೆಯಿಂದ ನೀವು ಇನ್ನು ಮುಂದೆ ಕರೆಗಳು ಅಥವಾ ಪಠ್ಯ ಸಂದೇಶಗಳನ್ನು ಸ್ವೀಕರಿಸುವುದಿಲ್ಲ.</string>
+  <string name="block_number_ok">ನಿರ್ಬಂಧಿಸು</string>
+  <string name="unblock_number_confirmation_title">%1$sನಿರ್ಬಂಧವನ್ನು ತೆಗೆಯುವುದೇ?</string>
+  <string name="unblock_number_ok">ನಿರ್ಬಂಧ ತೆಗೆ</string>
+  <string name="invalidNumber">%1$sಅಮಾನ್ಯವಾಗಿದೆ.</string>
+  <string name="snackbar_number_blocked">%1$s ನಿರ್ಬಂಧಿಸಲಾಗಿದೆ</string>
+  <string name="snackbar_number_unblocked">%1$sನಿರ್ಬಂಧವನ್ನು ತೆಗೆಯಲಾಗಿದೆ</string>
+  <string name="send_to_voicemail_import_failed">ಆಮದು ವಿಫಲವಾಗಿದೆ</string>
+  <string name="call_blocking_disabled_notification_title">ಕರೆ ನಿರ್ಬಂಧಿಸುವಿಕೆ 48 ಗಂಟೆಗಳವರೆಗೆ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ</string>
+  <string name="call_blocking_disabled_notification_text">ತುರ್ತು ಕರೆಯನ್ನು ಮಾಡಿರುವ ಕಾರಣದಿಂದ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ.</string>
 </resources>
diff --git a/java/com/android/dialer/blocking/res/values-ko/strings.xml b/java/com/android/dialer/blocking/res/values-ko/strings.xml
index 31a63da..5d52207 100644
--- a/java/com/android/dialer/blocking/res/values-ko/strings.xml
+++ b/java/com/android/dialer/blocking/res/values-ko/strings.xml
@@ -1,46 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="migrate_blocked_numbers_dialog_title" msgid="7823962296457673809">"새로운 간편 차단 기능"</string>
-    <string name="migrate_blocked_numbers_dialog_message" msgid="8309736147266462485">"사용자를 보호하기 위하여 전화에서 차단 작동 방식을 변경해야 합니다. 차단된 번호에서 발송되는 통화 및 문자 메시지는 수신되지 않으며 다른 앱과 차단 사실이 공유될 수 있습니다."</string>
-    <string name="migrate_blocked_numbers_dialog_allow_button" msgid="5192836471557751367">"허용"</string>
-    <string name="block_number_confirmation_title" msgid="2699521227461376076">"<xliff:g id="NUMBER">%1$s</xliff:g>번을 차단할까요?"</string>
-    <string name="block_number_confirmation_message_vvm" msgid="6501105244172290939">"이 번호에서 걸려오는 전화가 차단되며 음성사서함이 자동으로 삭제됩니다."</string>
-    <string name="block_number_confirmation_message_no_vvm" msgid="8236641245709649882">"이 번호에서 걸려오는 전화가 차단되지만, 발신자가 음성사서함에 메시지를 남길 수는 있습니다."</string>
-    <string name="block_number_confirmation_message_new_filtering" msgid="8487449683723062644">"이 번호로부터 수신되는 전화와 문자를 더 이상 받지 않습니다."</string>
-    <string name="block_number_ok" msgid="739786082788038932">"차단"</string>
-    <string name="unblock_number_confirmation_title" msgid="7897778825085659941">"<xliff:g id="NUMBER">%1$s</xliff:g>번을 차단 해제할까요?"</string>
-    <string name="unblock_number_ok" msgid="5089057152966269355">"차단 해제"</string>
-    <string name="invalidNumber" msgid="6270918250761754967">"<xliff:g id="NUMBER">%1$s</xliff:g>번은 잘못된 번호입니다."</string>
-    <string name="snackbar_number_blocked" msgid="5760234822413921845">"<xliff:g id="NUMBER">%1$s</xliff:g> 차단됨"</string>
-    <string name="snackbar_number_unblocked" msgid="7941296274123990585">"<xliff:g id="NUMBER">%1$s</xliff:g> 차단 해제됨"</string>
-    <string name="block_number_undo" msgid="5158120911892491697">"실행취소"</string>
-    <string name="send_to_voicemail_import_failed" msgid="1012752662074208237">"가져오지 못했습니다."</string>
-    <string name="call_blocking_disabled_notification_title" msgid="7211352205255347489">"통화 차단이 48시간 동안 중지됨"</string>
-    <string name="call_blocking_disabled_notification_text" msgid="141384084865180722">"긴급 통화를 사용했기 때문에 중지되었습니다."</string>
-    <string name="block_report_number_alert_title" msgid="2740581989824959611">"<xliff:g id="NUMBER">%1$s</xliff:g>번을 차단할까요?"</string>
-    <string name="block_report_number_alert_details" msgid="2652479394593143562">"이 번호로부터 수신되는 전화를 더 이상 받지 않습니다."</string>
-    <string name="block_number_alert_details" msgid="715942751312046429">"<xliff:g id="TEXT">%1$s</xliff:g> 이 전화는 스팸으로 신고됩니다."</string>
-    <string name="unblock_number_alert_details" msgid="8696070817026870606">"이 번호는 차단되지 않으며 스팸이 아닌 것으로 신고됩니다. 앞으로 이 번호에서 전화가 오면 스팸으로 인식되지 않습니다."</string>
-    <string name="unblock_report_number_alert_title" msgid="2221901995393696882">"<xliff:g id="NUMBER">%1$s</xliff:g>번을 차단 해제할까요?"</string>
-    <string name="report_not_spam_alert_button" msgid="3244953565919894995">"신고"</string>
-    <string name="report_not_spam_alert_title" msgid="395961923213504916">"실수임을 신고하시겠습니까?"</string>
-    <string name="report_not_spam_alert_details" msgid="4463730683530824797">"앞으로 <xliff:g id="NUMBER">%1$s</xliff:g>에서 전화가 오면 스팸으로 인식되지 않습니다."</string>
-    <string name="checkbox_report_as_spam_action" msgid="1549159682170273798">"전화를 스팸으로 신고"</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="migrate_blocked_numbers_dialog_title">새로운 간편 차단 기능</string>
+  <string name="migrate_blocked_numbers_dialog_message">사용자를 보호하기 위하여 전화에서 차단 작동 방식을 변경해야 합니다. 차단된 번호에서 발송되는 통화 및 문자 메시지는 수신되지 않으며 다른 앱과 차단 사실이 공유될 수 있습니다.</string>
+  <string name="migrate_blocked_numbers_dialog_allow_button">허용</string>
+  <string name="old_block_number_confirmation_title">%1$s번을 차단하시겠습니까?</string>
+  <string name="block_number_confirmation_message_vvm">이 번호에서 걸려오는 전화가 차단되며 음성사서함이 자동으로 삭제됩니다.</string>
+  <string name="block_number_confirmation_message_no_vvm">이 번호에서 걸려오는 전화가 차단되지만, 발신자가 음성사서함에 메시지를 남길 수는 있습니다.</string>
+  <string name="block_number_confirmation_message_new_filtering">이 번호로부터 수신되는 전화와 문자를 더 이상 받지 않습니다.</string>
+  <string name="block_number_ok">차단</string>
+  <string name="unblock_number_confirmation_title">%1$s번을 차단 해제하시겠습니까?</string>
+  <string name="unblock_number_ok">차단 해제</string>
+  <string name="invalidNumber">%1$s번은 잘못된 번호입니다.</string>
+  <string name="snackbar_number_blocked">%1$s 차단됨</string>
+  <string name="snackbar_number_unblocked">%1$s번 차단 해제됨</string>
+  <string name="send_to_voicemail_import_failed">가져오지 못했습니다.</string>
+  <string name="call_blocking_disabled_notification_title">통화 차단이 48시간 동안 중지됨</string>
+  <string name="call_blocking_disabled_notification_text">긴급 통화를 사용했기 때문에 중지되었습니다.</string>
 </resources>
diff --git a/java/com/android/dialer/blocking/res/values-ky/strings.xml b/java/com/android/dialer/blocking/res/values-ky/strings.xml
index 86548cf..4b2e26f 100644
--- a/java/com/android/dialer/blocking/res/values-ky/strings.xml
+++ b/java/com/android/dialer/blocking/res/values-ky/strings.xml
@@ -1,46 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="migrate_blocked_numbers_dialog_title" msgid="7823962296457673809">"Номерлерди жаңы жөнөкөй ыкма менен бөгөттөө"</string>
-    <string name="migrate_blocked_numbers_dialog_message" msgid="8309736147266462485">"Сизди жакшыраак коргоо үчүн, \"Телефон\" колдонмосу бөгөттөө жөндөөлөрүн өзгөртүшү керек. Бөгөттөлгөн номерлерден чалуулар жана билдирүүлөр келбейт жана алар башка колдонмолор менен бөлүшүлүшү мүмкүн."</string>
-    <string name="migrate_blocked_numbers_dialog_allow_button" msgid="5192836471557751367">"Уруксат берүү"</string>
-    <string name="block_number_confirmation_title" msgid="2699521227461376076">"<xliff:g id="NUMBER">%1$s</xliff:g> бөгөттөлсүнбү?"</string>
-    <string name="block_number_confirmation_message_vvm" msgid="6501105244172290939">"Бул номерден келген чалуулар бөгөттөлөт жана үн билдирүүлөрү автоматтык түрдө жок кылынат."</string>
-    <string name="block_number_confirmation_message_no_vvm" msgid="8236641245709649882">"Бул номерден келген чалуулар бөгөттөлөт, бирок чалуучу сизге үн билдирүүлөрүн калтыра берет."</string>
-    <string name="block_number_confirmation_message_new_filtering" msgid="8487449683723062644">"Бул номерден келген чалууларды же SMS билдирүүлөрдү албай каласыз."</string>
-    <string name="block_number_ok" msgid="739786082788038932">"БӨГӨТТӨӨ"</string>
-    <string name="unblock_number_confirmation_title" msgid="7897778825085659941">"<xliff:g id="NUMBER">%1$s</xliff:g> бөгөттөн чыгарылсынбы?"</string>
-    <string name="unblock_number_ok" msgid="5089057152966269355">"БӨГӨТТӨН ЧЫГАРУУ"</string>
-    <string name="invalidNumber" msgid="6270918250761754967">"<xliff:g id="NUMBER">%1$s</xliff:g> - жараксыз."</string>
-    <string name="snackbar_number_blocked" msgid="5760234822413921845">"<xliff:g id="NUMBER">%1$s</xliff:g> бөгөттөлдү"</string>
-    <string name="snackbar_number_unblocked" msgid="7941296274123990585">"<xliff:g id="NUMBER">%1$s</xliff:g> бөгөттөн чыгарылды"</string>
-    <string name="block_number_undo" msgid="5158120911892491697">"КАЙТАРУУ"</string>
-    <string name="send_to_voicemail_import_failed" msgid="1012752662074208237">"Импорттолбой калды"</string>
-    <string name="call_blocking_disabled_notification_title" msgid="7211352205255347489">"Чалууну бөгөттөө 48 саатка өчүрүлгөн"</string>
-    <string name="call_blocking_disabled_notification_text" msgid="141384084865180722">"Шашылыш чалуу аткарылгандыктан өчүрүлгөн."</string>
-    <string name="block_report_number_alert_title" msgid="2740581989824959611">"<xliff:g id="NUMBER">%1$s</xliff:g> бөгөттөлсүнбү?"</string>
-    <string name="block_report_number_alert_details" msgid="2652479394593143562">"Мындан ары бул номерден чалуулар кабыл алынбайт."</string>
-    <string name="block_number_alert_details" msgid="715942751312046429">"<xliff:g id="TEXT">%1$s</xliff:g> Бул чалуу спам деп белгиленет."</string>
-    <string name="unblock_number_alert_details" msgid="8696070817026870606">"Номер бөгөттөн чыгарылып, спам эмес деп белгиленет. Кийинки чалуулар спам деп белгиленбейт."</string>
-    <string name="unblock_report_number_alert_title" msgid="2221901995393696882">"<xliff:g id="NUMBER">%1$s</xliff:g> бөгөттөн чыгарылсынбы?"</string>
-    <string name="report_not_spam_alert_button" msgid="3244953565919894995">"Билдирүү"</string>
-    <string name="report_not_spam_alert_title" msgid="395961923213504916">"Ката деп билдирилсинби?"</string>
-    <string name="report_not_spam_alert_details" msgid="4463730683530824797">"<xliff:g id="NUMBER">%1$s</xliff:g> номеринен келген чалуулар мындан ары спам деп белгиленбейт."</string>
-    <string name="checkbox_report_as_spam_action" msgid="1549159682170273798">"Чалууну спам катары кабарлоо"</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="migrate_blocked_numbers_dialog_title">Номерлерди жаңы жөнөкөй ыкма менен бөгөттөө</string>
+  <string name="migrate_blocked_numbers_dialog_message">Сизди жакшыраак коргоо үчүн, \"Телефон\" колдонмосу бөгөттөө жөндөөлөрүн өзгөртүшү керек. Бөгөттөлгөн номерлерден чалуулар жана билдирүүлөр келбейт жана алар башка колдонмолор менен бөлүшүлүшү мүмкүн.</string>
+  <string name="migrate_blocked_numbers_dialog_allow_button">Уруксат берүү</string>
+  <string name="old_block_number_confirmation_title">%1$s бөгөттөлсүнбү?</string>
+  <string name="block_number_confirmation_message_vvm">Бул номерден келген чалуулар бөгөттөлөт жана үн билдирүүлөрү автоматтык түрдө жок кылынат.</string>
+  <string name="block_number_confirmation_message_no_vvm">Бул номерден келген чалуулар бөгөттөлөт, бирок чалуучу сизге үн билдирүүлөрүн калтыра берет.</string>
+  <string name="block_number_confirmation_message_new_filtering">Бул номерден келген чалууларды же SMS билдирүүлөрдү албай каласыз.</string>
+  <string name="block_number_ok">БӨГӨТТӨӨ</string>
+  <string name="unblock_number_confirmation_title">%1$s бөгөттөн чыгарылсынбы?</string>
+  <string name="unblock_number_ok">БӨГӨТТӨН ЧЫГАРУУ</string>
+  <string name="invalidNumber">%1$s жараксыз.</string>
+  <string name="snackbar_number_blocked">%1$s бөгөттөлдү</string>
+  <string name="snackbar_number_unblocked">%1$s бөгөттөн чыгарылды</string>
+  <string name="send_to_voicemail_import_failed">Импорттолбой калды</string>
+  <string name="call_blocking_disabled_notification_title">Чалууну бөгөттөө 48 саатка өчүрүлгөн</string>
+  <string name="call_blocking_disabled_notification_text">Шашылыш чалуу аткарылгандыктан өчүрүлгөн.</string>
 </resources>
diff --git a/java/com/android/dialer/blocking/res/values-lo/strings.xml b/java/com/android/dialer/blocking/res/values-lo/strings.xml
index 8732269..02bd974 100644
--- a/java/com/android/dialer/blocking/res/values-lo/strings.xml
+++ b/java/com/android/dialer/blocking/res/values-lo/strings.xml
@@ -1,46 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="migrate_blocked_numbers_dialog_title" msgid="7823962296457673809">"ການລັອກແບບໃໝ່ທີ່ງ່າຍດາຍ"</string>
-    <string name="migrate_blocked_numbers_dialog_message" msgid="8309736147266462485">"ເພື່ອປົກປ້ອງທ່ານໄດ້ດີຂຶ້ນ, ແອັບໂທລະສັບຕ້ອງການປ່ຽນວິທີການບລັອກ. ເບີໂທທີ່ທ່ານບລັອກໄວ້ຈະປິດກັ້ນທັງການໂທ ແລະ ຂໍ້ຄວາມ ແລະ ອາດມີການແບ່ງປັນກັບແອັບອື່ນໆນຳ."</string>
-    <string name="migrate_blocked_numbers_dialog_allow_button" msgid="5192836471557751367">"ອະນຸຍາດ"</string>
-    <string name="block_number_confirmation_title" msgid="2699521227461376076">"ບ​ລັອກ <xliff:g id="NUMBER">%1$s</xliff:g> ບໍ?"</string>
-    <string name="block_number_confirmation_message_vvm" msgid="6501105244172290939">"ການໂທຈາກເບີໂທນີ້ຈະຖືກບລັອກໄວ້ ແລະຂໍ້ຄວາມສຽງຈະຖືກລຶບໂດຍອັດຕະໂນມັດ."</string>
-    <string name="block_number_confirmation_message_no_vvm" msgid="8236641245709649882">"ການໂທຈາກເບີນີ້ຈະຖືກບລັອກໄວ້, ແຕ່ຜູ່ໂທອາດຈະຍັງສາມາດຝາກຂໍ້ຄວາມສຽງໃຫ້ທ່ານໄດ້."</string>
-    <string name="block_number_confirmation_message_new_filtering" msgid="8487449683723062644">"ທ່ານຈະບໍ່ໄດ້ຮັບສາຍ ຫຼື ຂໍ້ຄວາມຈາກເບີນີ້ອີກຕໍ່ໄປ."</string>
-    <string name="block_number_ok" msgid="739786082788038932">"ບລັອກ"</string>
-    <string name="unblock_number_confirmation_title" msgid="7897778825085659941">"ປົດ​ບ​ລັອກ <xliff:g id="NUMBER">%1$s</xliff:g> ບ​ໍ?"</string>
-    <string name="unblock_number_ok" msgid="5089057152966269355">"​ປົດ​ບລັອກ"</string>
-    <string name="invalidNumber" msgid="6270918250761754967">"<xliff:g id="NUMBER">%1$s</xliff:g> ບໍ່ຖືກຕ້ອງ."</string>
-    <string name="snackbar_number_blocked" msgid="5760234822413921845">"<xliff:g id="NUMBER">%1$s</xliff:g> ຖືກບ​ລັອກໄວ້​ແລ້ວ"</string>
-    <string name="snackbar_number_unblocked" msgid="7941296274123990585">"<xliff:g id="NUMBER">%1$s</xliff:g> ຖືກບ​ລັອກໄວ້​ແລ້ວ"</string>
-    <string name="block_number_undo" msgid="5158120911892491697">"ບໍ່​ເຮັດ"</string>
-    <string name="send_to_voicemail_import_failed" msgid="1012752662074208237">"ນຳ​ເຂົ້າ​ລົ້ມ​ເຫລວ"</string>
-    <string name="call_blocking_disabled_notification_title" msgid="7211352205255347489">"ການບ​ລັອກ​ສາຍ​ໂທ​ຖືກ​ປິດ​ໃຊ້​ງານ​ແລ້ວ​ເປັນ​ເວ​ລາ 48 ຊົ່​ວ​ໂມງ"</string>
-    <string name="call_blocking_disabled_notification_text" msgid="141384084865180722">"ປິດ​ໃຊ້​ງານ​ແລ້ວ ເພາະ​ວ່າ​ໄດ້​ມີ​ການ​ໂທ​ສຸກ​ເສີນ."</string>
-    <string name="block_report_number_alert_title" msgid="2740581989824959611">"ບ​ລັອກ <xliff:g id="NUMBER">%1$s</xliff:g> ບໍ?"</string>
-    <string name="block_report_number_alert_details" msgid="2652479394593143562">"ທ່ານຈະບໍ່ໄດ້ຮັບສາຍຈາກເບີໂທນີ້ອີກຕໍ່ໄປ."</string>
-    <string name="block_number_alert_details" msgid="715942751312046429">"<xliff:g id="TEXT">%1$s</xliff:g> ການໂທນີ້ຈະຖືກລາຍງານວ່າເປັນສະແປມ."</string>
-    <string name="unblock_number_alert_details" msgid="8696070817026870606">"ເບີໂທນີ້ຈະຖືກປົດບລັອກ ແລະ ລາຍງານວ່າບໍ່ແມ່ນສະແປມ. ການໂທໃນອະນາຄົດຈະບໍ່ຖືກລະບຸວ່າເປັນສະແປມ."</string>
-    <string name="unblock_report_number_alert_title" msgid="2221901995393696882">"ປົດ​ບ​ລັອກ <xliff:g id="NUMBER">%1$s</xliff:g> ບ​ໍ?"</string>
-    <string name="report_not_spam_alert_button" msgid="3244953565919894995">"ລາຍງານ"</string>
-    <string name="report_not_spam_alert_title" msgid="395961923213504916">"ລາຍງານວ່າເປັນຄວາມຜິດພາດບໍ?"</string>
-    <string name="report_not_spam_alert_details" msgid="4463730683530824797">"ການໂທໃນອະນາຄົດຈາກ <xliff:g id="NUMBER">%1$s</xliff:g> ຈະບໍ່ຖືກລະບຸວ່າເປັນສະແປມອີກຕໍ່ໄປ."</string>
-    <string name="checkbox_report_as_spam_action" msgid="1549159682170273798">"ລາຍງານວ່າເປັນສະແປມ"</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="migrate_blocked_numbers_dialog_title">ການລັອກແບບໃໝ່ທີ່ງ່າຍດາຍ</string>
+  <string name="migrate_blocked_numbers_dialog_message">ເພື່ອປົກປ້ອງທ່ານໄດ້ດີຂຶ້ນ, ແອັບໂທລະສັບຕ້ອງການປ່ຽນວິທີການບລັອກ. ເບີໂທທີ່ທ່ານບລັອກໄວ້ຈະປິດກັ້ນທັງການໂທ ແລະ ຂໍ້ຄວາມ ແລະ ອາດມີການແບ່ງປັນກັບແອັບອື່ນໆນຳ.</string>
+  <string name="migrate_blocked_numbers_dialog_allow_button">ອະນຸຍາດ</string>
+  <string name="old_block_number_confirmation_title">ບລັອກເບີ %1$s ບໍ?</string>
+  <string name="block_number_confirmation_message_vvm">ການໂທຈາກເບີໂທນີ້ຈະຖືກບລັອກໄວ້ ແລະຂໍ້ຄວາມສຽງຈະຖືກລຶບໂດຍອັດຕະໂນມັດ.</string>
+  <string name="block_number_confirmation_message_no_vvm">ການໂທຈາກເບີນີ້ຈະຖືກບລັອກໄວ້, ແຕ່ຜູ່ໂທອາດຈະຍັງສາມາດຝາກຂໍ້ຄວາມສຽງໃຫ້ທ່ານໄດ້.</string>
+  <string name="block_number_confirmation_message_new_filtering">ທ່ານຈະບໍ່ໄດ້ຮັບສາຍ ຫຼື ຂໍ້ຄວາມຈາກເບີນີ້ອີກຕໍ່ໄປ.</string>
+  <string name="block_number_ok">ບລັອກ</string>
+  <string name="unblock_number_confirmation_title">ປົດບລັອກເບີ %1$s ບໍ?</string>
+  <string name="unblock_number_ok">​ປົດ​ບລັອກ</string>
+  <string name="invalidNumber">%1$s ບໍ່ຖືກຕ້ອງ.</string>
+  <string name="snackbar_number_blocked">%1$s ຖືກບ​ລັອກໄວ້​ແລ້ວ</string>
+  <string name="snackbar_number_unblocked">%1$s ຖືກປົດບລັອກໄວ້ແລ້ວ</string>
+  <string name="send_to_voicemail_import_failed">ນຳ​ເຂົ້າ​ລົ້ມ​ເຫລວ</string>
+  <string name="call_blocking_disabled_notification_title">ການບ​ລັອກ​ສາຍ​ໂທ​ຖືກ​ປິດ​ໃຊ້​ງານ​ແລ້ວ​ເປັນ​ເວ​ລາ 48 ຊົ່​ວ​ໂມງ</string>
+  <string name="call_blocking_disabled_notification_text">ປິດ​ໃຊ້​ງານ​ແລ້ວ ເພາະ​ວ່າ​ໄດ້​ມີ​ການ​ໂທ​ສຸກ​ເສີນ.</string>
 </resources>
diff --git a/java/com/android/dialer/blocking/res/values-lt/strings.xml b/java/com/android/dialer/blocking/res/values-lt/strings.xml
index 10564e7..2fc7f9b 100644
--- a/java/com/android/dialer/blocking/res/values-lt/strings.xml
+++ b/java/com/android/dialer/blocking/res/values-lt/strings.xml
@@ -1,46 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="migrate_blocked_numbers_dialog_title" msgid="7823962296457673809">"Naujas supaprast. blokavimas"</string>
-    <string name="migrate_blocked_numbers_dialog_message" msgid="8309736147266462485">"Siekiant geriau jus apsaugoti, Telefono programa turi pakeisti blokavimo veikimo būdą. Blokuotų numerių skambučiai ir teksto pranešimai nebus priimami ir jie gali būti bendrinami su kitomis programomis."</string>
-    <string name="migrate_blocked_numbers_dialog_allow_button" msgid="5192836471557751367">"Leisti"</string>
-    <string name="block_number_confirmation_title" msgid="2699521227461376076">"Blokuoti numerį <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="block_number_confirmation_message_vvm" msgid="6501105244172290939">"Skambučiai iš šio numerio bus užblokuoti, o balso pašto pranešimai bus automatiškai ištrinti."</string>
-    <string name="block_number_confirmation_message_no_vvm" msgid="8236641245709649882">"Skambučiai iš šio numerio bus užblokuoti, tačiau skambintojas vis tiek galės palikti jums balso pašto pranešimus."</string>
-    <string name="block_number_confirmation_message_new_filtering" msgid="8487449683723062644">"Nebegausite skambučių ar teksto pranešimų iš šio numerio."</string>
-    <string name="block_number_ok" msgid="739786082788038932">"BLOKUOTI"</string>
-    <string name="unblock_number_confirmation_title" msgid="7897778825085659941">"Panaikinti numerio <xliff:g id="NUMBER">%1$s</xliff:g> blokavimą?"</string>
-    <string name="unblock_number_ok" msgid="5089057152966269355">"PANAIKINTI BLOKAVIMĄ"</string>
-    <string name="invalidNumber" msgid="6270918250761754967">"<xliff:g id="NUMBER">%1$s</xliff:g> yra netinkamas numeris."</string>
-    <string name="snackbar_number_blocked" msgid="5760234822413921845">"<xliff:g id="NUMBER">%1$s</xliff:g> užblokuotas"</string>
-    <string name="snackbar_number_unblocked" msgid="7941296274123990585">"Panaikintas <xliff:g id="NUMBER">%1$s</xliff:g> blokavimas"</string>
-    <string name="block_number_undo" msgid="5158120911892491697">"ANULIUOTI"</string>
-    <string name="send_to_voicemail_import_failed" msgid="1012752662074208237">"Importuoti nepavyko"</string>
-    <string name="call_blocking_disabled_notification_title" msgid="7211352205255347489">"Skambučių blokavimas išjungtas 48 val."</string>
-    <string name="call_blocking_disabled_notification_text" msgid="141384084865180722">"Išjungta, nes skambinta pagalbos numeriu."</string>
-    <string name="block_report_number_alert_title" msgid="2740581989824959611">"Blokuoti numerį <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="block_report_number_alert_details" msgid="2652479394593143562">"Nebegausite skambučių iš šio numerio."</string>
-    <string name="block_number_alert_details" msgid="715942751312046429">"<xliff:g id="TEXT">%1$s</xliff:g> Apie šį skambutį bus pranešta kaip apie šlamštą."</string>
-    <string name="unblock_number_alert_details" msgid="8696070817026870606">"Šio nr. blok. bus pan. ir apie jį bus pran. kaip ne apie šl. siunt. Būs. sk. nebus nust. kaip šl."</string>
-    <string name="unblock_report_number_alert_title" msgid="2221901995393696882">"Panaikinti numerio <xliff:g id="NUMBER">%1$s</xliff:g> blokavimą?"</string>
-    <string name="report_not_spam_alert_button" msgid="3244953565919894995">"Pranešti"</string>
-    <string name="report_not_spam_alert_title" msgid="395961923213504916">"Pranešti apie klaidą?"</string>
-    <string name="report_not_spam_alert_details" msgid="4463730683530824797">"Būsimi skambučiai iš numerio <xliff:g id="NUMBER">%1$s</xliff:g> nebus nustatyti kaip šlamštas."</string>
-    <string name="checkbox_report_as_spam_action" msgid="1549159682170273798">"Pr. apie skamb. kaip apie šl."</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="migrate_blocked_numbers_dialog_title">Naujas supaprast. blokavimas</string>
+  <string name="migrate_blocked_numbers_dialog_message">Siekiant geriau jus apsaugoti, Telefono programa turi pakeisti blokavimo veikimo būdą. Blokuotų numerių skambučiai ir teksto pranešimai nebus priimami ir jie gali būti bendrinami su kitomis programomis.</string>
+  <string name="migrate_blocked_numbers_dialog_allow_button">Leisti</string>
+  <string name="old_block_number_confirmation_title">Blokuoti numerį %1$s?</string>
+  <string name="block_number_confirmation_message_vvm">Skambučiai iš šio numerio bus užblokuoti, o balso pašto pranešimai bus automatiškai ištrinti.</string>
+  <string name="block_number_confirmation_message_no_vvm">Skambučiai iš šio numerio bus užblokuoti, tačiau skambintojas vis tiek galės palikti jums balso pašto pranešimus.</string>
+  <string name="block_number_confirmation_message_new_filtering">Nebegausite skambučių ar teksto pranešimų iš šio numerio.</string>
+  <string name="block_number_ok">BLOKUOTI</string>
+  <string name="unblock_number_confirmation_title">Panaikinti numerio %1$s blokavimą?</string>
+  <string name="unblock_number_ok">PANAIKINTI BLOKAVIMĄ</string>
+  <string name="invalidNumber">%1$s yra netinkamas numeris.</string>
+  <string name="snackbar_number_blocked">%1$s užblokuotas</string>
+  <string name="snackbar_number_unblocked">Panaikintas %1$s blokavimas</string>
+  <string name="send_to_voicemail_import_failed">Importuoti nepavyko</string>
+  <string name="call_blocking_disabled_notification_title">Skambučių blokavimas išjungtas 48 val.</string>
+  <string name="call_blocking_disabled_notification_text">Išjungta, nes skambinta pagalbos numeriu.</string>
 </resources>
diff --git a/java/com/android/dialer/blocking/res/values-lv/strings.xml b/java/com/android/dialer/blocking/res/values-lv/strings.xml
index aea0eba..6c8530a 100644
--- a/java/com/android/dialer/blocking/res/values-lv/strings.xml
+++ b/java/com/android/dialer/blocking/res/values-lv/strings.xml
@@ -1,46 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="migrate_blocked_numbers_dialog_title" msgid="7823962296457673809">"Jauna, vienkāršota bloķēšanas funkcija"</string>
-    <string name="migrate_blocked_numbers_dialog_message" msgid="8309736147266462485">"Lai jūs labāk aizsargātu, lietotnē Tālrunis ir jāmaina bloķēšanas darbība. Turpmāk no bloķētajiem numuriem nevarēs saņemt zvanus un īsziņas, un bloķētos numurus varēs kopīgot ar citām lietotnēm."</string>
-    <string name="migrate_blocked_numbers_dialog_allow_button" msgid="5192836471557751367">"Atļaut"</string>
-    <string name="block_number_confirmation_title" msgid="2699521227461376076">"Vai bloķēt numuru <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="block_number_confirmation_message_vvm" msgid="6501105244172290939">"No šī numura saņemtie zvani tiks bloķēti, un balss pasta ziņojumi tiks automātiski dzēsti."</string>
-    <string name="block_number_confirmation_message_no_vvm" msgid="8236641245709649882">"No šī numura saņemtie zvani tiks bloķēti, taču zvanītājs joprojām varēs jums atstāt balss pasta ziņojumus."</string>
-    <string name="block_number_confirmation_message_new_filtering" msgid="8487449683723062644">"Jūs vairs nesaņemsiet zvanus un īsziņas no šī numura."</string>
-    <string name="block_number_ok" msgid="739786082788038932">"BLOĶĒT"</string>
-    <string name="unblock_number_confirmation_title" msgid="7897778825085659941">"Vai atbloķēt numuru <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="unblock_number_ok" msgid="5089057152966269355">"ATBLOĶĒT"</string>
-    <string name="invalidNumber" msgid="6270918250761754967">"<xliff:g id="NUMBER">%1$s</xliff:g> nav derīgs."</string>
-    <string name="snackbar_number_blocked" msgid="5760234822413921845">"<xliff:g id="NUMBER">%1$s</xliff:g> bloķēts"</string>
-    <string name="snackbar_number_unblocked" msgid="7941296274123990585">"<xliff:g id="NUMBER">%1$s</xliff:g> atbloķēts"</string>
-    <string name="block_number_undo" msgid="5158120911892491697">"ATSAUKT"</string>
-    <string name="send_to_voicemail_import_failed" msgid="1012752662074208237">"Importēšana neizdevās"</string>
-    <string name="call_blocking_disabled_notification_title" msgid="7211352205255347489">"Zvanu bloķēšana atspējota uz 48 stundām"</string>
-    <string name="call_blocking_disabled_notification_text" msgid="141384084865180722">"Zvanu bloķēšana atspējota, jo tika veikts ārkārtas zvans."</string>
-    <string name="block_report_number_alert_title" msgid="2740581989824959611">"Vai bloķēt numuru <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="block_report_number_alert_details" msgid="2652479394593143562">"Jūs vairs nesaņemsiet zvanus no šī numura."</string>
-    <string name="block_number_alert_details" msgid="715942751312046429">"<xliff:g id="TEXT">%1$s</xliff:g> Šis zvans tiks atzīmēts kā nevēlams."</string>
-    <string name="unblock_number_alert_details" msgid="8696070817026870606">"Šis numurs tiks atbloķēts un netiks atzīmēts kā nevēlams. Turpmākie zvani netiks atzīmēti kā nevēlami."</string>
-    <string name="unblock_report_number_alert_title" msgid="2221901995393696882">"Vai atbloķēt numuru <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="report_not_spam_alert_button" msgid="3244953565919894995">"Ziņot"</string>
-    <string name="report_not_spam_alert_title" msgid="395961923213504916">"Vai ziņot par kļūdu?"</string>
-    <string name="report_not_spam_alert_details" msgid="4463730683530824797">"Turpmākie zvani no numura <xliff:g id="NUMBER">%1$s</xliff:g> vairs netiks atzīmēti kā nevēlami."</string>
-    <string name="checkbox_report_as_spam_action" msgid="1549159682170273798">"Atzīmēt zvanu kā nevēlamu"</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="migrate_blocked_numbers_dialog_title">Jauna, vienkāršota bloķēšanas funkcija</string>
+  <string name="migrate_blocked_numbers_dialog_message">Lai jūs labāk aizsargātu, lietotnē Tālrunis ir jāmaina bloķēšanas darbība. Turpmāk no bloķētajiem numuriem nevarēs saņemt zvanus un īsziņas, un bloķētos numurus varēs kopīgot ar citām lietotnēm.</string>
+  <string name="migrate_blocked_numbers_dialog_allow_button">Atļaut</string>
+  <string name="old_block_number_confirmation_title">Vai bloķēt numuru %1$s?</string>
+  <string name="block_number_confirmation_message_vvm">No šī numura saņemtie zvani tiks bloķēti, un balss pasta ziņojumi tiks automātiski dzēsti.</string>
+  <string name="block_number_confirmation_message_no_vvm">No šī numura saņemtie zvani tiks bloķēti, taču zvanītājs joprojām varēs jums atstāt balss pasta ziņojumus.</string>
+  <string name="block_number_confirmation_message_new_filtering">Jūs vairs nesaņemsiet zvanus un īsziņas no šī numura.</string>
+  <string name="block_number_ok">BLOĶĒT</string>
+  <string name="unblock_number_confirmation_title">Vai atbloķēt numuru %1$s?</string>
+  <string name="unblock_number_ok">ATBLOĶĒT</string>
+  <string name="invalidNumber">Numurs %1$s nav derīgs.</string>
+  <string name="snackbar_number_blocked">%1$s bloķēts</string>
+  <string name="snackbar_number_unblocked">Numurs %1$s atbloķēts</string>
+  <string name="send_to_voicemail_import_failed">Importēšana neizdevās</string>
+  <string name="call_blocking_disabled_notification_title">Zvanu bloķēšana atspējota uz 48 stundām</string>
+  <string name="call_blocking_disabled_notification_text">Zvanu bloķēšana atspējota, jo tika veikts ārkārtas zvans.</string>
 </resources>
diff --git a/java/com/android/dialer/blocking/res/values-mk/strings.xml b/java/com/android/dialer/blocking/res/values-mk/strings.xml
index 4115e7f..7204398 100644
--- a/java/com/android/dialer/blocking/res/values-mk/strings.xml
+++ b/java/com/android/dialer/blocking/res/values-mk/strings.xml
@@ -1,46 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="migrate_blocked_numbers_dialog_title" msgid="7823962296457673809">"Ново, поедноставено блокирање"</string>
-    <string name="migrate_blocked_numbers_dialog_message" msgid="8309736147266462485">"За подобра заштита, Телефонот треба да го промени начинот на блокирање. Блокираните броеви сега ќе ги сопрат повиците и текстуалните пораки и ќе може да се споделат со други апликации."</string>
-    <string name="migrate_blocked_numbers_dialog_allow_button" msgid="5192836471557751367">"Дозволи"</string>
-    <string name="block_number_confirmation_title" msgid="2699521227461376076">"Блокирај го <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="block_number_confirmation_message_vvm" msgid="6501105244172290939">"Повиците од овој број ќе се блокираат, а говорната пошта автоматски ќе се брише."</string>
-    <string name="block_number_confirmation_message_no_vvm" msgid="8236641245709649882">"Повиците од овој број ќе се блокираат, но можно е повикувачот сѐ уште да може да ви остава говорна пошта."</string>
-    <string name="block_number_confirmation_message_new_filtering" msgid="8487449683723062644">"Веќе нема да примате повици или текстуални пораки од овој број."</string>
-    <string name="block_number_ok" msgid="739786082788038932">"БЛОКИРАЈ"</string>
-    <string name="unblock_number_confirmation_title" msgid="7897778825085659941">"Одблокирај го <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="unblock_number_ok" msgid="5089057152966269355">"ДЕБЛОКИРАЈ"</string>
-    <string name="invalidNumber" msgid="6270918250761754967">"<xliff:g id="NUMBER">%1$s</xliff:g> не е важечки."</string>
-    <string name="snackbar_number_blocked" msgid="5760234822413921845">"<xliff:g id="NUMBER">%1$s</xliff:g> е блокиран"</string>
-    <string name="snackbar_number_unblocked" msgid="7941296274123990585">"<xliff:g id="NUMBER">%1$s</xliff:g> е деблокиран"</string>
-    <string name="block_number_undo" msgid="5158120911892491697">"ВРАТИ"</string>
-    <string name="send_to_voicemail_import_failed" msgid="1012752662074208237">"Увоз не успеа"</string>
-    <string name="call_blocking_disabled_notification_title" msgid="7211352205255347489">"Блокирањето на повикот е оневозможено 48 часа"</string>
-    <string name="call_blocking_disabled_notification_text" msgid="141384084865180722">"Оневозможено е затоа што беше направен итен повик."</string>
-    <string name="block_report_number_alert_title" msgid="2740581989824959611">"Блокирај го <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="block_report_number_alert_details" msgid="2652479394593143562">"Веќе нема да примате повици од овој број."</string>
-    <string name="block_number_alert_details" msgid="715942751312046429">"<xliff:g id="TEXT">%1$s</xliff:g> Повиков ќе се пријави како спам."</string>
-    <string name="unblock_number_alert_details" msgid="8696070817026870606">"Бројов ќе се деблокира и пријави дека не е спам. Повиците и гов. пошта нема да се гледаат како спам."</string>
-    <string name="unblock_report_number_alert_title" msgid="2221901995393696882">"Одблокирај го <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="report_not_spam_alert_button" msgid="3244953565919894995">"Пријави"</string>
-    <string name="report_not_spam_alert_title" msgid="395961923213504916">"Пријавете грешка?"</string>
-    <string name="report_not_spam_alert_details" msgid="4463730683530824797">"Повиците од <xliff:g id="NUMBER">%1$s</xliff:g> во иднина нема да се гледаат како спам."</string>
-    <string name="checkbox_report_as_spam_action" msgid="1549159682170273798">"Пријавете го повикот како спам"</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="migrate_blocked_numbers_dialog_title">Ново, поедноставено блокирање</string>
+  <string name="migrate_blocked_numbers_dialog_message">За подобра заштита, Телефонот треба да го промени начинот на блокирање. Блокираните броеви сега ќе ги сопрат повиците и текстуалните пораки и ќе може да се споделат со други апликации.</string>
+  <string name="migrate_blocked_numbers_dialog_allow_button">Дозволи</string>
+  <string name="old_block_number_confirmation_title">Да се блокира %1$s?</string>
+  <string name="block_number_confirmation_message_vvm">Повиците од овој број ќе се блокираат, а говорната пошта автоматски ќе се брише.</string>
+  <string name="block_number_confirmation_message_no_vvm">Повиците од овој број ќе се блокираат, но можно е повикувачот сѐ уште да може да ви остава говорна пошта.</string>
+  <string name="block_number_confirmation_message_new_filtering">Веќе нема да примате повици или текстуални пораки од овој број.</string>
+  <string name="block_number_ok">БЛОКИРАЈ</string>
+  <string name="unblock_number_confirmation_title">Да се одблокира %1$s?</string>
+  <string name="unblock_number_ok">ДЕБЛОКИРАЈ</string>
+  <string name="invalidNumber">Бројот %1$s е неважечки.</string>
+  <string name="snackbar_number_blocked">%1$s е блокиран</string>
+  <string name="snackbar_number_unblocked">Бројот %1$s е одблокиран</string>
+  <string name="send_to_voicemail_import_failed">Увоз не успеа</string>
+  <string name="call_blocking_disabled_notification_title">Блокирањето на повикот е оневозможено 48 часа</string>
+  <string name="call_blocking_disabled_notification_text">Оневозможено е затоа што беше направен итен повик.</string>
 </resources>
diff --git a/java/com/android/dialer/blocking/res/values-ml/strings.xml b/java/com/android/dialer/blocking/res/values-ml/strings.xml
index d863104..f6fa394 100644
--- a/java/com/android/dialer/blocking/res/values-ml/strings.xml
+++ b/java/com/android/dialer/blocking/res/values-ml/strings.xml
@@ -1,46 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="migrate_blocked_numbers_dialog_title" msgid="7823962296457673809">"പുതിയ, ലളിതമായ ബ്ലോക്കുചെയ്യൽ"</string>
-    <string name="migrate_blocked_numbers_dialog_message" msgid="8309736147266462485">"നിങ്ങളെ മെച്ചപ്പെട്ട രീതിയിൽ പരിരക്ഷിക്കുന്നതിന്, ഫോണിലെ ബ്ലോക്കുചെയ്യൽ പ്രവർത്തന രീതി മാറ്റേണ്ടതുണ്ട്. നിങ്ങളുടെ ബ്ലോക്കുചെയ്‌ത നമ്പറുകളിൽ നിന്നുള്ള കോൾ, ടെക്‌സ്‌റ്റ് എന്നിവ ഇപ്പോൾ അവസാനിപ്പിക്കും, ഈ വിവരം അത് മറ്റ് ആപ്‌സുമായി പങ്കിടാനുമിടയുണ്ട്."</string>
-    <string name="migrate_blocked_numbers_dialog_allow_button" msgid="5192836471557751367">"അനുവദിക്കുക"</string>
-    <string name="block_number_confirmation_title" msgid="2699521227461376076">"<xliff:g id="NUMBER">%1$s</xliff:g> ബ്ലോക്കുചെയ്യണോ?"</string>
-    <string name="block_number_confirmation_message_vvm" msgid="6501105244172290939">"ഈ നമ്പറിൽ നിന്നുള്ള കോളുകൾ ബ്ലോക്കുചെയ്യും, വോയ്സ്മെയിലുകളെ സ്വയമേവ ഇല്ലാതാക്കും."</string>
-    <string name="block_number_confirmation_message_no_vvm" msgid="8236641245709649882">"ഈ നമ്പറിൽ നിന്നുള്ള കോളുകൾ ബ്ലോക്കുചെയ്യും, എന്നാൽ വിളിക്കുന്നയാൾക്ക് അപ്പോഴും നിങ്ങൾക്ക് വോയ്സ്‌മെയിലുകൾ അയയ്ക്കാൻ കഴിഞ്ഞേക്കാം."</string>
-    <string name="block_number_confirmation_message_new_filtering" msgid="8487449683723062644">"നിങ്ങൾക്ക് ഇനി ഈ നമ്പറിൽ നിന്ന് കോളുകളോ ടെക്‌‌സ്‌റ്റോ ലഭിക്കില്ല."</string>
-    <string name="block_number_ok" msgid="739786082788038932">"ബ്ലോക്കുചെയ്യുക"</string>
-    <string name="unblock_number_confirmation_title" msgid="7897778825085659941">"<xliff:g id="NUMBER">%1$s</xliff:g> അൺബ്ലോക്കുചെയ്യണോ?"</string>
-    <string name="unblock_number_ok" msgid="5089057152966269355">"അൺബ്ലോക്കുചെയ്യുക"</string>
-    <string name="invalidNumber" msgid="6270918250761754967">"<xliff:g id="NUMBER">%1$s</xliff:g> അസാധുവാണ്."</string>
-    <string name="snackbar_number_blocked" msgid="5760234822413921845">"<xliff:g id="NUMBER">%1$s</xliff:g> ബ്ലോക്കുചെയ്തു"</string>
-    <string name="snackbar_number_unblocked" msgid="7941296274123990585">"<xliff:g id="NUMBER">%1$s</xliff:g> അൺബ്ലോക്കുചെയ്തു"</string>
-    <string name="block_number_undo" msgid="5158120911892491697">"പഴയപടിയാക്കുക"</string>
-    <string name="send_to_voicemail_import_failed" msgid="1012752662074208237">"ഇമ്പോർട്ടുചെയ്യൽ പരാജയപ്പെട്ടു"</string>
-    <string name="call_blocking_disabled_notification_title" msgid="7211352205255347489">"48 മണിക്കൂർ നേരത്തേക്ക് കോൾ ബ്ലോക്കുചെയ്യൽ പ്രവർത്തനരഹിതമാക്കി"</string>
-    <string name="call_blocking_disabled_notification_text" msgid="141384084865180722">"എമർജൻസി കോൾ നടത്തിയതിനാൽ പ്രവർത്തനരഹിതമാക്കി."</string>
-    <string name="block_report_number_alert_title" msgid="2740581989824959611">"<xliff:g id="NUMBER">%1$s</xliff:g> ബ്ലോക്കുചെയ്യണോ?"</string>
-    <string name="block_report_number_alert_details" msgid="2652479394593143562">"നിങ്ങൾക്ക് ഇനി ഈ നമ്പറിൽ നിന്ന് കോളുകൾ ലഭിക്കില്ല."</string>
-    <string name="block_number_alert_details" msgid="715942751312046429">"<xliff:g id="TEXT">%1$s</xliff:g> ഈ കോൾ സ്‌പാം ആയി റിപ്പോർട്ട് ചെയ്യും."</string>
-    <string name="unblock_number_alert_details" msgid="8696070817026870606">"ഈ നമ്പർ അൺ‌ബ്ലോക്കുചെയ്‌ത്, സ്‌പാമല്ലെന്ന് റിപ്പോർട്ടുചെയ്യും. ഭാവിയിൽ വരാൻ പോകുന്ന കോളുകളെ സ്‌പാമെന്ന് കണക്കാക്കില്ല."</string>
-    <string name="unblock_report_number_alert_title" msgid="2221901995393696882">"<xliff:g id="NUMBER">%1$s</xliff:g> അൺബ്ലോക്കുചെയ്യണോ?"</string>
-    <string name="report_not_spam_alert_button" msgid="3244953565919894995">"റിപ്പോർട്ടുചെയ്യുക"</string>
-    <string name="report_not_spam_alert_title" msgid="395961923213504916">"ഒരു തെറ്റ് റിപ്പോർട്ട് ചെയ്യണോ?"</string>
-    <string name="report_not_spam_alert_details" msgid="4463730683530824797">"<xliff:g id="NUMBER">%1$s</xliff:g> നമ്പറിൽ നിന്ന് ഭാവിയിൽ വരാൻ പോകുന്ന കോളുകളെ ഇനി സ്‌പാമെന്ന് കണക്കാക്കില്ല."</string>
-    <string name="checkbox_report_as_spam_action" msgid="1549159682170273798">"കോളിനെ സ്‌പാമെന്ന് റിപ്പോർട്ടുചെയ്യുക"</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="migrate_blocked_numbers_dialog_title">പുതിയ, ലളിതമായ ബ്ലോക്കുചെയ്യൽ</string>
+  <string name="migrate_blocked_numbers_dialog_message">നിങ്ങളെ മെച്ചപ്പെട്ട രീതിയിൽ പരിരക്ഷിക്കുന്നതിന്, ഫോണിലെ ബ്ലോക്കുചെയ്യൽ പ്രവർത്തന രീതി മാറ്റേണ്ടതുണ്ട്. നിങ്ങളുടെ ബ്ലോക്കുചെയ്‌ത നമ്പറുകളിൽ നിന്നുള്ള കോൾ, ടെക്‌സ്‌റ്റ് എന്നിവ ഇപ്പോൾ അവസാനിപ്പിക്കും, ഈ വിവരം അത് മറ്റ് ആപ്‌സുമായി പങ്കിടാനുമിടയുണ്ട്.</string>
+  <string name="migrate_blocked_numbers_dialog_allow_button">അനുവദിക്കുക</string>
+  <string name="old_block_number_confirmation_title">%1$s ബ്ലോക്ക് ചെയ്യണോ?</string>
+  <string name="block_number_confirmation_message_vvm">ഈ നമ്പറിൽ നിന്നുള്ള കോളുകൾ ബ്ലോക്കുചെയ്യും, വോയ്സ്മെയിലുകളെ സ്വയമേവ ഇല്ലാതാക്കും.</string>
+  <string name="block_number_confirmation_message_no_vvm">ഈ നമ്പറിൽ നിന്നുള്ള കോളുകൾ ബ്ലോക്കുചെയ്യും, എന്നാൽ വിളിക്കുന്നയാൾക്ക് അപ്പോഴും നിങ്ങൾക്ക് വോയ്സ്‌മെയിലുകൾ അയയ്ക്കാൻ കഴിഞ്ഞേക്കാം.</string>
+  <string name="block_number_confirmation_message_new_filtering">നിങ്ങൾക്ക് ഇനി ഈ നമ്പറിൽ നിന്ന് കോളുകളോ ടെക്‌‌സ്‌റ്റോ ലഭിക്കില്ല.</string>
+  <string name="block_number_ok">ബ്ലോക്കുചെയ്യുക</string>
+  <string name="unblock_number_confirmation_title">%1$s അൺബ്ലോക്ക് ചെയ്യണോ?</string>
+  <string name="unblock_number_ok">അൺബ്ലോക്കുചെയ്യുക</string>
+  <string name="invalidNumber">%1$s അസാധുവാണ്.</string>
+  <string name="snackbar_number_blocked">%1$s ബ്ലോക്കുചെയ്തു</string>
+  <string name="snackbar_number_unblocked">%1$s അൺബ്ലോക്ക് ചെയ്‌തു</string>
+  <string name="send_to_voicemail_import_failed">ഇമ്പോർട്ടുചെയ്യൽ പരാജയപ്പെട്ടു</string>
+  <string name="call_blocking_disabled_notification_title">48 മണിക്കൂർ നേരത്തേക്ക് കോൾ ബ്ലോക്കുചെയ്യൽ പ്രവർത്തനരഹിതമാക്കി</string>
+  <string name="call_blocking_disabled_notification_text">എമർജൻസി കോൾ നടത്തിയതിനാൽ പ്രവർത്തനരഹിതമാക്കി.</string>
 </resources>
diff --git a/java/com/android/dialer/blocking/res/values-mn/strings.xml b/java/com/android/dialer/blocking/res/values-mn/strings.xml
index ebfee4b..b687268 100644
--- a/java/com/android/dialer/blocking/res/values-mn/strings.xml
+++ b/java/com/android/dialer/blocking/res/values-mn/strings.xml
@@ -1,46 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="migrate_blocked_numbers_dialog_title" msgid="7823962296457673809">"Шинэ, хялбаршуулсан хориг"</string>
-    <string name="migrate_blocked_numbers_dialog_message" msgid="8309736147266462485">"Таныг илүү сайн хамгаалахын тулд утасны хоригийн тохиргоог өөрчлөх шаардлагатай. Таны хориглосон дугааруудаас дуудлага, зурвас ирэхгүй бөгөөд тэдгээрийг бусад апп-тай хуваалцаж болзошгүй."</string>
-    <string name="migrate_blocked_numbers_dialog_allow_button" msgid="5192836471557751367">"Зөвшөөрөх"</string>
-    <string name="block_number_confirmation_title" msgid="2699521227461376076">"<xliff:g id="NUMBER">%1$s</xliff:g>-г блоклох уу?"</string>
-    <string name="block_number_confirmation_message_vvm" msgid="6501105244172290939">"Энэ дугаараас ирэх дуудлагыг блоклох бөгөөд дуут шуудан автоматаар устах болно."</string>
-    <string name="block_number_confirmation_message_no_vvm" msgid="8236641245709649882">"Энэ дугаараас ирэх дуудлагыг блоклосон, гэхдээ залгагч танд дуут шуудан илгээх боломжтой."</string>
-    <string name="block_number_confirmation_message_new_filtering" msgid="8487449683723062644">"Та энэ дугаараас цаашид дуудлага буюу мессеж хүлээж авахгүй."</string>
-    <string name="block_number_ok" msgid="739786082788038932">"БЛОКЛОХ"</string>
-    <string name="unblock_number_confirmation_title" msgid="7897778825085659941">"<xliff:g id="NUMBER">%1$s</xliff:g>-г блокоос гаргах уу?"</string>
-    <string name="unblock_number_ok" msgid="5089057152966269355">"БЛОКООС ГАРГАХ"</string>
-    <string name="invalidNumber" msgid="6270918250761754967">"<xliff:g id="NUMBER">%1$s</xliff:g> хүчингүй байна."</string>
-    <string name="snackbar_number_blocked" msgid="5760234822413921845">"<xliff:g id="NUMBER">%1$s</xliff:g>-г блоклосон"</string>
-    <string name="snackbar_number_unblocked" msgid="7941296274123990585">"<xliff:g id="NUMBER">%1$s</xliff:g>-г блокоос гаргасан"</string>
-    <string name="block_number_undo" msgid="5158120911892491697">"БУЦААХ"</string>
-    <string name="send_to_voicemail_import_failed" msgid="1012752662074208237">"Импортолж чадсангүй"</string>
-    <string name="call_blocking_disabled_notification_title" msgid="7211352205255347489">"Дуудлага блоклохыг 48 цагийн турш идэвхгүй болгосон."</string>
-    <string name="call_blocking_disabled_notification_text" msgid="141384084865180722">"Яаралтай дуудлага хийсэн тул идэвхгүй болгосон."</string>
-    <string name="block_report_number_alert_title" msgid="2740581989824959611">"<xliff:g id="NUMBER">%1$s</xliff:g>-г блоклох уу?"</string>
-    <string name="block_report_number_alert_details" msgid="2652479394593143562">"Та энэ дугаараас цаашид дуудлага хүлээж авахгүй."</string>
-    <string name="block_number_alert_details" msgid="715942751312046429">"<xliff:g id="TEXT">%1$s</xliff:g> Энэ дуудлагыг спам гэж мэдээлэх болно."</string>
-    <string name="unblock_number_alert_details" msgid="8696070817026870606">"Энэ дугаарын хоригийг авч, спам биш гэж мэдээлэх болно. Цаашид ирэх дуудлагыг спам гэж үзэхгүй."</string>
-    <string name="unblock_report_number_alert_title" msgid="2221901995393696882">"<xliff:g id="NUMBER">%1$s</xliff:g>-г блокоос гаргах уу?"</string>
-    <string name="report_not_spam_alert_button" msgid="3244953565919894995">"Мэдэгдэх"</string>
-    <string name="report_not_spam_alert_title" msgid="395961923213504916">"Санамсаргүй алдаа юу?"</string>
-    <string name="report_not_spam_alert_details" msgid="4463730683530824797">"<xliff:g id="NUMBER">%1$s</xliff:g>-с цаашид ирэх дуудлагыг спам гэж үзэхгүй."</string>
-    <string name="checkbox_report_as_spam_action" msgid="1549159682170273798">"Дуудлагыг спам гэж мэдээлэх"</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="migrate_blocked_numbers_dialog_title">Шинэ, хялбаршуулсан хориг</string>
+  <string name="migrate_blocked_numbers_dialog_message">Таныг илүү сайн хамгаалахын тулд утасны хоригийн тохиргоог өөрчлөх шаардлагатай. Таны хориглосон дугааруудаас дуудлага, зурвас ирэхгүй бөгөөд тэдгээрийг бусад апп-тай хуваалцаж болзошгүй.</string>
+  <string name="migrate_blocked_numbers_dialog_allow_button">Зөвшөөрөх</string>
+  <string name="old_block_number_confirmation_title">%1$s-г хориглох уу?</string>
+  <string name="block_number_confirmation_message_vvm">Энэ дугаараас ирэх дуудлагыг блоклох бөгөөд дуут шуудан автоматаар устах болно.</string>
+  <string name="block_number_confirmation_message_no_vvm">Энэ дугаараас ирэх дуудлагыг блоклосон, гэхдээ залгагч танд дуут шуудан илгээх боломжтой.</string>
+  <string name="block_number_confirmation_message_new_filtering">Та энэ дугаараас цаашид дуудлага буюу мессеж хүлээж авахгүй.</string>
+  <string name="block_number_ok">БЛОКЛОХ</string>
+  <string name="unblock_number_confirmation_title">%1$s-г хоригоос гаргах уу?</string>
+  <string name="unblock_number_ok">БЛОКООС ГАРГАХ</string>
+  <string name="invalidNumber">%1$s буруу байна.</string>
+  <string name="snackbar_number_blocked">%1$s-г блоклосон</string>
+  <string name="snackbar_number_unblocked">%1$s-г хоригоос гаргасан</string>
+  <string name="send_to_voicemail_import_failed">Импортолж чадсангүй</string>
+  <string name="call_blocking_disabled_notification_title">Дуудлага блоклохыг 48 цагийн турш идэвхгүй болгосон.</string>
+  <string name="call_blocking_disabled_notification_text">Яаралтай дуудлага хийсэн тул идэвхгүй болгосон.</string>
 </resources>
diff --git a/java/com/android/dialer/blocking/res/values-mr/strings.xml b/java/com/android/dialer/blocking/res/values-mr/strings.xml
index d2b191b..05b5bc1 100644
--- a/java/com/android/dialer/blocking/res/values-mr/strings.xml
+++ b/java/com/android/dialer/blocking/res/values-mr/strings.xml
@@ -1,46 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="migrate_blocked_numbers_dialog_title" msgid="7823962296457673809">"नवीन, सरलीकृत अवरोधित करणे"</string>
-    <string name="migrate_blocked_numbers_dialog_message" msgid="8309736147266462485">"आपले अधिक चांगले संरक्षण करण्यासाठी, अवरोधित करणे ज्या पद्धतीने कार्य करते ते बदलण्याची फोनला गरज आहे. आपले अवरोधित केलेले नंबर कॉल आणि मजकूर थांबवतील आणि कदाचित इतर अॅप्ससह सामायिक केले जाऊ शकतील."</string>
-    <string name="migrate_blocked_numbers_dialog_allow_button" msgid="5192836471557751367">"अनुमती द्या"</string>
-    <string name="block_number_confirmation_title" msgid="2699521227461376076">"<xliff:g id="NUMBER">%1$s</xliff:g> अवरोधित करायचा?"</string>
-    <string name="block_number_confirmation_message_vvm" msgid="6501105244172290939">"या नंबर वरून केलेले कॉल अवरोधित केले जातील आणि व्हॉइसमेल स्वयंचलितपणे हटविले जातील."</string>
-    <string name="block_number_confirmation_message_no_vvm" msgid="8236641245709649882">"या नंबर वरून केलेले कॉल अवरोधित केले जातील परंतु कॉलर आपल्‍यासाठी व्हॉइसमेल सोडण्यात अद्याप सक्षम असू शकेल."</string>
-    <string name="block_number_confirmation_message_new_filtering" msgid="8487449683723062644">"आपल्याला या नंबर वरून कॉल किंवा मजकूर प्राप्त होणार नाहीत."</string>
-    <string name="block_number_ok" msgid="739786082788038932">"अवरोधित करा"</string>
-    <string name="unblock_number_confirmation_title" msgid="7897778825085659941">"<xliff:g id="NUMBER">%1$s</xliff:g> ला अनावरोधित करायचे?"</string>
-    <string name="unblock_number_ok" msgid="5089057152966269355">"अनावरोधित करा"</string>
-    <string name="invalidNumber" msgid="6270918250761754967">"<xliff:g id="NUMBER">%1$s</xliff:g> अवैध आहे."</string>
-    <string name="snackbar_number_blocked" msgid="5760234822413921845">"<xliff:g id="NUMBER">%1$s</xliff:g> अवरोधित केला"</string>
-    <string name="snackbar_number_unblocked" msgid="7941296274123990585">"<xliff:g id="NUMBER">%1$s</xliff:g> अनावरोधित केला"</string>
-    <string name="block_number_undo" msgid="5158120911892491697">"पूर्ववत करा"</string>
-    <string name="send_to_voicemail_import_failed" msgid="1012752662074208237">"आयात अयशस्वी झाले"</string>
-    <string name="call_blocking_disabled_notification_title" msgid="7211352205255347489">"कॉल अवरोधित करणे 48 तासांसाठी अक्षम केले"</string>
-    <string name="call_blocking_disabled_notification_text" msgid="141384084865180722">"एक आणीबाणीचा कॉल केल्‍याने अक्षम केले."</string>
-    <string name="block_report_number_alert_title" msgid="2740581989824959611">"<xliff:g id="NUMBER">%1$s</xliff:g> अवरोधित करायचा?"</string>
-    <string name="block_report_number_alert_details" msgid="2652479394593143562">"आपल्याला या नंबर वरून कॉल प्राप्त होणार नाहीत."</string>
-    <string name="block_number_alert_details" msgid="715942751312046429">"<xliff:g id="TEXT">%1$s</xliff:g> या कॉलची स्पॅम म्हणून तक्रार नोंदवली जाईल."</string>
-    <string name="unblock_number_alert_details" msgid="8696070817026870606">"हा नंबर अनावरोधित केला जाईल आणि त्याचा स्पॅम नाही म्हणून अहवाल दिला जाईल. भविष्यातील कॉल स्पॅम म्हणून ओळखले जाणार नाहीत."</string>
-    <string name="unblock_report_number_alert_title" msgid="2221901995393696882">"<xliff:g id="NUMBER">%1$s</xliff:g> ला अनावरोधित करायचे?"</string>
-    <string name="report_not_spam_alert_button" msgid="3244953565919894995">"अहवाल द्या"</string>
-    <string name="report_not_spam_alert_title" msgid="395961923213504916">"चूक झाल्याचा अहवाल द्यायचा?"</string>
-    <string name="report_not_spam_alert_details" msgid="4463730683530824797">"<xliff:g id="NUMBER">%1$s</xliff:g> वरील भविष्यातील कॉल यापुढे स्पॅम म्हणून ओळखले जाणार नाहीत."</string>
-    <string name="checkbox_report_as_spam_action" msgid="1549159682170273798">"कॉलचा स्पॅम म्हणून अहवाल द्या"</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="migrate_blocked_numbers_dialog_title">नवीन, सरलीकृत अवरोधित करणे</string>
+  <string name="migrate_blocked_numbers_dialog_message">आपले अधिक चांगले संरक्षण करण्यासाठी, अवरोधित करणे ज्या पद्धतीने कार्य करते ते बदलण्याची फोनला गरज आहे. आपले अवरोधित केलेले नंबर कॉल आणि मजकूर थांबवतील आणि कदाचित इतर अॅप्ससह सामायिक केले जाऊ शकतील.</string>
+  <string name="migrate_blocked_numbers_dialog_allow_button">अनुमती द्या</string>
+  <string name="old_block_number_confirmation_title">%1$s ब्‍लॉक करायचा?</string>
+  <string name="block_number_confirmation_message_vvm">या नंबर वरून केलेले कॉल अवरोधित केले जातील आणि व्हॉइसमेल स्वयंचलितपणे हटविले जातील.</string>
+  <string name="block_number_confirmation_message_no_vvm">या नंबर वरून केलेले कॉल अवरोधित केले जातील परंतु कॉलर आपल्‍यासाठी व्हॉइसमेल सोडण्यात अद्याप सक्षम असू शकेल.</string>
+  <string name="block_number_confirmation_message_new_filtering">आपल्याला या नंबर वरून कॉल किंवा मजकूर प्राप्त होणार नाहीत.</string>
+  <string name="block_number_ok">अवरोधित करा</string>
+  <string name="unblock_number_confirmation_title">%1$s अनब्‍लॉक करायचा?</string>
+  <string name="unblock_number_ok">अनावरोधित करा</string>
+  <string name="invalidNumber">%1$s चुकीचा आहे.</string>
+  <string name="snackbar_number_blocked">%1$s अवरोधित केला</string>
+  <string name="snackbar_number_unblocked">%1$s अनब्‍लॉक केला</string>
+  <string name="send_to_voicemail_import_failed">आयात अयशस्वी झाले</string>
+  <string name="call_blocking_disabled_notification_title">कॉल अवरोधित करणे 48 तासांसाठी अक्षम केले</string>
+  <string name="call_blocking_disabled_notification_text">एक आणीबाणीचा कॉल केल्‍याने अक्षम केले.</string>
 </resources>
diff --git a/java/com/android/dialer/blocking/res/values-ms/strings.xml b/java/com/android/dialer/blocking/res/values-ms/strings.xml
index 711faf9..7202b58 100644
--- a/java/com/android/dialer/blocking/res/values-ms/strings.xml
+++ b/java/com/android/dialer/blocking/res/values-ms/strings.xml
@@ -1,46 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="migrate_blocked_numbers_dialog_title" msgid="7823962296457673809">"Penyekatan mudah yang baharu"</string>
-    <string name="migrate_blocked_numbers_dialog_message" msgid="8309736147266462485">"Untuk melindungi anda dengan lebih berkesan, Telefon perlu menukar cara penyekatan berfungsi. Nombor yang disekat akan menghentikan panggilan dan teks serta boleh dikongsi dengan apl lain."</string>
-    <string name="migrate_blocked_numbers_dialog_allow_button" msgid="5192836471557751367">"Benarkan"</string>
-    <string name="block_number_confirmation_title" msgid="2699521227461376076">"Sekat <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="block_number_confirmation_message_vvm" msgid="6501105244172290939">"Panggilan daripada nombor ini akan disekat dan mel suara akan dipadamkan secara automatik."</string>
-    <string name="block_number_confirmation_message_no_vvm" msgid="8236641245709649882">"Panggilan daripada nombor ini akan disekat, tetapi pemanggil masih boleh meninggalkan mel suara kepada anda."</string>
-    <string name="block_number_confirmation_message_new_filtering" msgid="8487449683723062644">"Anda tidak akan menerima panggilan atau teks daripada nombor ini lagi."</string>
-    <string name="block_number_ok" msgid="739786082788038932">"SEKAT"</string>
-    <string name="unblock_number_confirmation_title" msgid="7897778825085659941">"Nyahsekat <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="unblock_number_ok" msgid="5089057152966269355">"NYAHSEKAT"</string>
-    <string name="invalidNumber" msgid="6270918250761754967">"<xliff:g id="NUMBER">%1$s</xliff:g> tidak sah."</string>
-    <string name="snackbar_number_blocked" msgid="5760234822413921845">"<xliff:g id="NUMBER">%1$s</xliff:g> disekat"</string>
-    <string name="snackbar_number_unblocked" msgid="7941296274123990585">"<xliff:g id="NUMBER">%1$s</xliff:g> dinyahsekat"</string>
-    <string name="block_number_undo" msgid="5158120911892491697">"BUAT ASAL"</string>
-    <string name="send_to_voicemail_import_failed" msgid="1012752662074208237">"Pengimportan gagal"</string>
-    <string name="call_blocking_disabled_notification_title" msgid="7211352205255347489">"Sekatan panggilan dilumpuhkan selama 48 jam"</string>
-    <string name="call_blocking_disabled_notification_text" msgid="141384084865180722">"Dilumpuhkan kerana panggilan kecemasan telah dibuat."</string>
-    <string name="block_report_number_alert_title" msgid="2740581989824959611">"Sekat <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="block_report_number_alert_details" msgid="2652479394593143562">"Anda tidak akan menerima panggilan daripada nombor ini lagi."</string>
-    <string name="block_number_alert_details" msgid="715942751312046429">"<xliff:g id="TEXT">%1$s</xliff:g> Panggilan ini akan dilaporkan sebagai spam."</string>
-    <string name="unblock_number_alert_details" msgid="8696070817026870606">"Nombor akn dinyahsekat &amp; dilaporkan bkn spam. Panggilan akan datang tdk akn dikenal pasti sbg spam."</string>
-    <string name="unblock_report_number_alert_title" msgid="2221901995393696882">"Nyahsekat <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="report_not_spam_alert_button" msgid="3244953565919894995">"Laporkan"</string>
-    <string name="report_not_spam_alert_title" msgid="395961923213504916">"Laporkan kesilapan?"</string>
-    <string name="report_not_spam_alert_details" msgid="4463730683530824797">"Panggilan masa hadapan daripada <xliff:g id="NUMBER">%1$s</xliff:g> tidak akan dikenal pasti sebagai spam lagi."</string>
-    <string name="checkbox_report_as_spam_action" msgid="1549159682170273798">"Laporkan panggilan sbg spam"</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="migrate_blocked_numbers_dialog_title">Penyekatan mudah yang baharu</string>
+  <string name="migrate_blocked_numbers_dialog_message">Untuk melindungi anda dengan lebih berkesan, Telefon perlu menukar cara penyekatan berfungsi. Nombor yang disekat akan menghentikan panggilan dan teks serta boleh dikongsi dengan apl lain.</string>
+  <string name="migrate_blocked_numbers_dialog_allow_button">Benarkan</string>
+  <string name="old_block_number_confirmation_title">Sekat %1$s?</string>
+  <string name="block_number_confirmation_message_vvm">Panggilan daripada nombor ini akan disekat dan mel suara akan dipadamkan secara automatik.</string>
+  <string name="block_number_confirmation_message_no_vvm">Panggilan daripada nombor ini akan disekat, tetapi pemanggil masih boleh meninggalkan mel suara kepada anda.</string>
+  <string name="block_number_confirmation_message_new_filtering">Anda tidak akan menerima panggilan atau teks daripada nombor ini lagi.</string>
+  <string name="block_number_ok">SEKAT</string>
+  <string name="unblock_number_confirmation_title">Nyahsekat %1$s?</string>
+  <string name="unblock_number_ok">NYAHSEKAT</string>
+  <string name="invalidNumber">%1$s tidak sah.</string>
+  <string name="snackbar_number_blocked">%1$s disekat</string>
+  <string name="snackbar_number_unblocked">%1$s dinyahsekat</string>
+  <string name="send_to_voicemail_import_failed">Pengimportan gagal</string>
+  <string name="call_blocking_disabled_notification_title">Sekatan panggilan dilumpuhkan selama 48 jam</string>
+  <string name="call_blocking_disabled_notification_text">Dilumpuhkan kerana panggilan kecemasan telah dibuat.</string>
 </resources>
diff --git a/java/com/android/dialer/blocking/res/values-my/strings.xml b/java/com/android/dialer/blocking/res/values-my/strings.xml
index 1bc59db..3db73be 100644
--- a/java/com/android/dialer/blocking/res/values-my/strings.xml
+++ b/java/com/android/dialer/blocking/res/values-my/strings.xml
@@ -1,46 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="migrate_blocked_numbers_dialog_title" msgid="7823962296457673809">"အသစ်၊ ရိုးရှင်းသည့် ပိတ်ဆို့မှု"</string>
-    <string name="migrate_blocked_numbers_dialog_message" msgid="8309736147266462485">"သင့်အား ပိုမိုကောင်းမွန်စွာကာကွယ်နိုင်ရန်၊ ဖုန်းသည် ပိတ်ဆို့ခြင်းအလုပ်လုပ်ပုံကို ပြောင်းလဲရန် လိုအပ်ပါသည်။ သင် ပိတ်ဆို့ထားသည့် နံပါတ်များမှ ခေါ်ဆိုခြင်းနှင့် စာပို့ခြင်းများကို ရပ်တန့်လိုက်မည်ဖြစ်ပြီး၊ ၎င်းနံပါတ်များကို အခြားအက်ပ်များဖြင့်လည်း မျှဝေနိုင်ပါသည်။"</string>
-    <string name="migrate_blocked_numbers_dialog_allow_button" msgid="5192836471557751367">"ခွင့်ပြုမည်"</string>
-    <string name="block_number_confirmation_title" msgid="2699521227461376076">"<xliff:g id="NUMBER">%1$s</xliff:g>ကို ပိတ်ဆို့မလား။"</string>
-    <string name="block_number_confirmation_message_vvm" msgid="6501105244172290939">"ဤနံပါတ်မှခေါ်ဆိုမှုများကို ပိတ်ဆို့လိုက်မည်ဖြစ်ပြီး အသံမေးလ်များကို အလိုအလျောက် ဖျက်လိုက်ပါမည်။"</string>
-    <string name="block_number_confirmation_message_no_vvm" msgid="8236641245709649882">"ဤနံပါတ်မှ ခေါ်ဆိုမှုများကို ပိတ်ဆို့လိုက်ပါမည်၊ သို့သော် ၎င်းတို့သည် သင့်ကို အသံမေးလ်ချန်ခဲ့နိုင်ပါသည်။"</string>
-    <string name="block_number_confirmation_message_new_filtering" msgid="8487449683723062644">"ဤနံပါတ်ထံမှ ဖုန်းခေါ်ဆိုမှုများနှင့် စာများကို သင် ထပ်မံရရှိတော့မည် မဟုတ်ပါ။"</string>
-    <string name="block_number_ok" msgid="739786082788038932">"ပိတ်ဆို့ပါ"</string>
-    <string name="unblock_number_confirmation_title" msgid="7897778825085659941">"<xliff:g id="NUMBER">%1$s</xliff:g> အား ပိတ်ဆို့မှု ဖယ်ရှားလိုက်ရမလား။"</string>
-    <string name="unblock_number_ok" msgid="5089057152966269355">"ပိတ်ဆို့ခြင်းမှ ဖယ်ရှားပါ"</string>
-    <string name="invalidNumber" msgid="6270918250761754967">"<xliff:g id="NUMBER">%1$s</xliff:g> သည်တရားမဝင်ပါ။"</string>
-    <string name="snackbar_number_blocked" msgid="5760234822413921845">"<xliff:g id="NUMBER">%1$s</xliff:g> ကိုပိတ်ဆို့လိုက်ပါပြီ"</string>
-    <string name="snackbar_number_unblocked" msgid="7941296274123990585">"<xliff:g id="NUMBER">%1$s</xliff:g> ကိုပိတ်ဆို့ခြင်းမှ ဖယ်ရှားလိုက်ပါပြီ"</string>
-    <string name="block_number_undo" msgid="5158120911892491697">"ပြန်ဖျက်ရန်"</string>
-    <string name="send_to_voicemail_import_failed" msgid="1012752662074208237">"တင်သွင်းမှု မအောင်မြင်ပါ"</string>
-    <string name="call_blocking_disabled_notification_title" msgid="7211352205255347489">"ခေါ်ဆိုမှုပိတ်ဆို့ခြင်းကို ၄၈ နာရီပိတ်ထားသည်"</string>
-    <string name="call_blocking_disabled_notification_text" msgid="141384084865180722">"အရေးပေါ်ခေါ်ဆိုမှု ပြုလုပ်ခဲ့သည့်အတွက် ပိတ်ထားပါသည်။"</string>
-    <string name="block_report_number_alert_title" msgid="2740581989824959611">"<xliff:g id="NUMBER">%1$s</xliff:g>ကို ပိတ်ဆို့မလား။"</string>
-    <string name="block_report_number_alert_details" msgid="2652479394593143562">"သင့်အနေဖြင့် ဤနံပါတ်မှဖုန်းခေါ်ဆိုမှုများကို လက်ခံရရှိတော့မည်မဟုတ်ပါ။"</string>
-    <string name="block_number_alert_details" msgid="715942751312046429">"<xliff:g id="TEXT">%1$s</xliff:g> ဤခေါ်ဆိုမှုကို စပမ်းအဖြစ် သတင်းပို့ပါလိမ့်မည်။"</string>
-    <string name="unblock_number_alert_details" msgid="8696070817026870606">"ဤနံပါတ်ကို ပိတ်ဆို့တော့မည်မဟုတ်ဘဲ စပမ်းမဟုတ်ကြောင်း သတင်းပို့ပါမည်။ နောင်ဝင်လာမည့်ဖုန်းခေါ်ဆိုမှုများနှင့် အသံမေးလ်များကို စပမ်းအဖြစ် သတ်မှတ်တော့မည်မဟုတ်ပါ။"</string>
-    <string name="unblock_report_number_alert_title" msgid="2221901995393696882">"<xliff:g id="NUMBER">%1$s</xliff:g> အား ပိတ်ဆို့မှု ဖယ်ရှားလိုက်ရမလား။"</string>
-    <string name="report_not_spam_alert_button" msgid="3244953565919894995">"သတင်းပို့ပါ"</string>
-    <string name="report_not_spam_alert_title" msgid="395961923213504916">"မှားယွင်းမှုတစ်ခုကို သတင်းပို့မလား။"</string>
-    <string name="report_not_spam_alert_details" msgid="4463730683530824797">"<xliff:g id="NUMBER">%1$s</xliff:g> ထံမှ နောင်ဝင်လာမည့်ဖုန်းခေါ်ဆိုမှုများကို စပမ်းအဖြစ် သတ်မှတ်တော့မည်မဟုတ်ပါ။"</string>
-    <string name="checkbox_report_as_spam_action" msgid="1549159682170273798">"ခေါ်ဆိုမှုကို စပမ်းအဖြစ် သတင်းပို့ပါ"</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="migrate_blocked_numbers_dialog_title">အသစ်၊ ရိုးရှင်းသည့် ပိတ်ဆို့မှု</string>
+  <string name="migrate_blocked_numbers_dialog_message">သင့်အား ပိုမိုကောင်းမွန်စွာကာကွယ်နိုင်ရန်၊ ဖုန်းသည် ပိတ်ဆို့ခြင်းအလုပ်လုပ်ပုံကို ပြောင်းလဲရန် လိုအပ်ပါသည်။ သင် ပိတ်ဆို့ထားသည့် နံပါတ်များမှ ခေါ်ဆိုခြင်းနှင့် စာပို့ခြင်းများကို ရပ်တန့်လိုက်မည်ဖြစ်ပြီး၊ ၎င်းနံပါတ်များကို အခြားအက်ပ်များဖြင့်လည်း မျှဝေနိုင်ပါသည်။</string>
+  <string name="migrate_blocked_numbers_dialog_allow_button">ခွင့်ပြုမည်</string>
+  <string name="old_block_number_confirmation_title">%1$sကို ပိတ်မလား။</string>
+  <string name="block_number_confirmation_message_vvm">ဤနံပါတ်မှခေါ်ဆိုမှုများကို ပိတ်ဆို့လိုက်မည်ဖြစ်ပြီး အသံမေးလ်များကို အလိုအလျောက် ဖျက်လိုက်ပါမည်။</string>
+  <string name="block_number_confirmation_message_no_vvm">ဤနံပါတ်မှ ခေါ်ဆိုမှုများကို ပိတ်ဆို့လိုက်ပါမည်၊ သို့သော် ၎င်းတို့သည် သင့်ကို အသံမေးလ်ချန်ခဲ့နိုင်ပါသည်။</string>
+  <string name="block_number_confirmation_message_new_filtering">ဤနံပါတ်ထံမှ ဖုန်းခေါ်ဆိုမှုများနှင့် စာများကို သင် ထပ်မံရရှိတော့မည် မဟုတ်ပါ။</string>
+  <string name="block_number_ok">ပိတ်ဆို့ပါ</string>
+  <string name="unblock_number_confirmation_title">%1$sကို ပြန်ဖွင့်မလား။</string>
+  <string name="unblock_number_ok">ပိတ်ဆို့ခြင်းမှ ဖယ်ရှားပါ</string>
+  <string name="invalidNumber">%1$sသည် မမှန်ကန်ပါ။</string>
+  <string name="snackbar_number_blocked">%1$s ကိုပိတ်ဆို့လိုက်ပါပြီ</string>
+  <string name="snackbar_number_unblocked">%1$sကို ပြန်ဖွင့်လိုက်ပါပြီ</string>
+  <string name="send_to_voicemail_import_failed">တင်သွင်းမှု မအောင်မြင်ပါ</string>
+  <string name="call_blocking_disabled_notification_title">ခေါ်ဆိုမှုပိတ်ဆို့ခြင်းကို ၄၈ နာရီပိတ်ထားသည်</string>
+  <string name="call_blocking_disabled_notification_text">အရေးပေါ်ခေါ်ဆိုမှု ပြုလုပ်ခဲ့သည့်အတွက် ပိတ်ထားပါသည်။</string>
 </resources>
diff --git a/java/com/android/dialer/blocking/res/values-nb/strings.xml b/java/com/android/dialer/blocking/res/values-nb/strings.xml
index 8f55f40..9ce2a18 100644
--- a/java/com/android/dialer/blocking/res/values-nb/strings.xml
+++ b/java/com/android/dialer/blocking/res/values-nb/strings.xml
@@ -1,46 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="migrate_blocked_numbers_dialog_title" msgid="7823962296457673809">"Ny, forenklet blokkering"</string>
-    <string name="migrate_blocked_numbers_dialog_message" msgid="8309736147266462485">"Telefon-appen endrer innstillingene for blokkering for at du skal være bedre beskyttet. Du mottar verken meldinger eller anrop fra blokkerte numre, og det kan hende at disse numrene blir delt med andre apper."</string>
-    <string name="migrate_blocked_numbers_dialog_allow_button" msgid="5192836471557751367">"Tillat"</string>
-    <string name="block_number_confirmation_title" msgid="2699521227461376076">"Vil du blokkere <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="block_number_confirmation_message_vvm" msgid="6501105244172290939">"Anrop fra dette nummeret blokkeres, og talepost blir automatisk slettet."</string>
-    <string name="block_number_confirmation_message_no_vvm" msgid="8236641245709649882">"Anrop fra dette nummeret blokkeres, men den som ringer kan fortsatt legge igjen beskjeder i talepostkassen din."</string>
-    <string name="block_number_confirmation_message_new_filtering" msgid="8487449683723062644">"Du kommer ikke lenger til å motta anrop eller SMS-er fra dette nummeret."</string>
-    <string name="block_number_ok" msgid="739786082788038932">"BLOKKÉR"</string>
-    <string name="unblock_number_confirmation_title" msgid="7897778825085659941">"Vil du oppheve blokkeringen av <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="unblock_number_ok" msgid="5089057152966269355">"OPPHEV BLOKKERINGEN"</string>
-    <string name="invalidNumber" msgid="6270918250761754967">"<xliff:g id="NUMBER">%1$s</xliff:g> er ugyldig."</string>
-    <string name="snackbar_number_blocked" msgid="5760234822413921845">"<xliff:g id="NUMBER">%1$s</xliff:g> er blokkert"</string>
-    <string name="snackbar_number_unblocked" msgid="7941296274123990585">"Blokkeringen av <xliff:g id="NUMBER">%1$s</xliff:g> er opphevet"</string>
-    <string name="block_number_undo" msgid="5158120911892491697">"ANGRE"</string>
-    <string name="send_to_voicemail_import_failed" msgid="1012752662074208237">"Importeringen mislyktes"</string>
-    <string name="call_blocking_disabled_notification_title" msgid="7211352205255347489">"Anropsblokkering er slått av i 48 timer"</string>
-    <string name="call_blocking_disabled_notification_text" msgid="141384084865180722">"Slått av fordi du foretok et nødanrop."</string>
-    <string name="block_report_number_alert_title" msgid="2740581989824959611">"Vil du blokkere <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="block_report_number_alert_details" msgid="2652479394593143562">"Du kommer ikke lenger til å motta anrop fra dette nummeret."</string>
-    <string name="block_number_alert_details" msgid="715942751312046429">"<xliff:g id="TEXT">%1$s</xliff:g> Dette anropet blir rapportert som useriøst."</string>
-    <string name="unblock_number_alert_details" msgid="8696070817026870606">"Blokkering oppheves og nummer rapporteres som «ikke useriøst». Senere anrop angis ikke som useriøse."</string>
-    <string name="unblock_report_number_alert_title" msgid="2221901995393696882">"Vil du oppheve blokkeringen av <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="report_not_spam_alert_button" msgid="3244953565919894995">"Rapportér"</string>
-    <string name="report_not_spam_alert_title" msgid="395961923213504916">"Vil du rapportere om en feil?"</string>
-    <string name="report_not_spam_alert_details" msgid="4463730683530824797">"Fremtidige anrop fra <xliff:g id="NUMBER">%1$s</xliff:g> blir ikke definert som useriøse."</string>
-    <string name="checkbox_report_as_spam_action" msgid="1549159682170273798">"Rapportér anropet som useriøst"</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="migrate_blocked_numbers_dialog_title">Ny, forenklet blokkering</string>
+  <string name="migrate_blocked_numbers_dialog_message">Telefon-appen endrer innstillingene for blokkering for at du skal være bedre beskyttet. Du mottar verken meldinger eller anrop fra blokkerte numre, og det kan hende at disse numrene blir delt med andre apper.</string>
+  <string name="migrate_blocked_numbers_dialog_allow_button">Tillat</string>
+  <string name="old_block_number_confirmation_title">Vil du blokkere %1$s?</string>
+  <string name="block_number_confirmation_message_vvm">Anrop fra dette nummeret blokkeres, og talepost blir automatisk slettet.</string>
+  <string name="block_number_confirmation_message_no_vvm">Anrop fra dette nummeret blokkeres, men den som ringer kan fortsatt legge igjen beskjeder i talepostkassen din.</string>
+  <string name="block_number_confirmation_message_new_filtering">Du kommer ikke lenger til å motta anrop eller SMS-er fra dette nummeret.</string>
+  <string name="block_number_ok">BLOKKÉR</string>
+  <string name="unblock_number_confirmation_title">Vil du oppheve blokkeringen av %1$s?</string>
+  <string name="unblock_number_ok">OPPHEV BLOKKERINGEN</string>
+  <string name="invalidNumber">%1$s er ugyldig.</string>
+  <string name="snackbar_number_blocked">%1$s er blokkert</string>
+  <string name="snackbar_number_unblocked">Blokkeringen av %1$s er opphevet</string>
+  <string name="send_to_voicemail_import_failed">Importeringen mislyktes</string>
+  <string name="call_blocking_disabled_notification_title">Anropsblokkering er slått av i 48 timer</string>
+  <string name="call_blocking_disabled_notification_text">Slått av fordi du foretok et nødanrop.</string>
 </resources>
diff --git a/java/com/android/dialer/blocking/res/values-ne/strings.xml b/java/com/android/dialer/blocking/res/values-ne/strings.xml
index e23c9aa..4271c81 100644
--- a/java/com/android/dialer/blocking/res/values-ne/strings.xml
+++ b/java/com/android/dialer/blocking/res/values-ne/strings.xml
@@ -1,46 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="migrate_blocked_numbers_dialog_title" msgid="7823962296457673809">"नयाँ, सरलीकृत रोकावट"</string>
-    <string name="migrate_blocked_numbers_dialog_message" msgid="8309736147266462485">"तपाईँको थप सुरक्षाका लागि फोनको रोकावट गर्ने विधिमा परिवर्तन गर्न आवश्यक छ। तपाईँबाट रोकावट गरिएका नम्बरहरूले अब कल र पाठ सन्देशहरूलाई रोक्नेछन् र यी नम्बरहरूलाई अन्य अनुप्रयोगहरूसँग साझेदारी गरिन सक्छ।"</string>
-    <string name="migrate_blocked_numbers_dialog_allow_button" msgid="5192836471557751367">"अनुमति दिनुहोस्"</string>
-    <string name="block_number_confirmation_title" msgid="2699521227461376076">"<xliff:g id="NUMBER">%1$s</xliff:g> माथि रोक लगाउने हो?"</string>
-    <string name="block_number_confirmation_message_vvm" msgid="6501105244172290939">"यो नम्बरबाट सबै कलहरू रोकिनेछन् र भ्वाइसमेलहरू स्वचालित रूपमा मेटिनेछन्।"</string>
-    <string name="block_number_confirmation_message_no_vvm" msgid="8236641245709649882">"यो नम्बरबाट सबै कलहरू रोकिनेछन्। तर कलरले अझै तपाईँलाई भ्वाइस मेलहरू भने छोड्न सक्नेछन्।"</string>
-    <string name="block_number_confirmation_message_new_filtering" msgid="8487449683723062644">"तपाईँले अब उप्रान्त यस नम्बरबाट कल वा पाठ सन्देशहरू प्राप्त गर्नुहुने छैन।"</string>
-    <string name="block_number_ok" msgid="739786082788038932">"रोक्नुहोस्"</string>
-    <string name="unblock_number_confirmation_title" msgid="7897778825085659941">"<xliff:g id="NUMBER">%1$s</xliff:g> माथिको रोक हटाउने हो?"</string>
-    <string name="unblock_number_ok" msgid="5089057152966269355">"रोक हटाउनुहोस्"</string>
-    <string name="invalidNumber" msgid="6270918250761754967">"<xliff:g id="NUMBER">%1$s</xliff:g> अमान्य छ।"</string>
-    <string name="snackbar_number_blocked" msgid="5760234822413921845">"<xliff:g id="NUMBER">%1$s</xliff:g> रोकियो"</string>
-    <string name="snackbar_number_unblocked" msgid="7941296274123990585">"<xliff:g id="NUMBER">%1$s</xliff:g> रोकियो"</string>
-    <string name="block_number_undo" msgid="5158120911892491697">"अनडू गर्नुहोस्"</string>
-    <string name="send_to_voicemail_import_failed" msgid="1012752662074208237">"आयात असफल भयो"</string>
-    <string name="call_blocking_disabled_notification_title" msgid="7211352205255347489">"४८ घण्टाको लागि कल निषेध असक्षम गरियो"</string>
-    <string name="call_blocking_disabled_notification_text" msgid="141384084865180722">"आपत्कालीन कल गरिएको हुनाले असक्षम गरियो।"</string>
-    <string name="block_report_number_alert_title" msgid="2740581989824959611">"<xliff:g id="NUMBER">%1$s</xliff:g> माथि रोक लगाउने हो?"</string>
-    <string name="block_report_number_alert_details" msgid="2652479394593143562">"तपाईँले अबदेखि यस नम्बरबाट कलहरू प्राप्त गर्नुहुने छैन।"</string>
-    <string name="block_number_alert_details" msgid="715942751312046429">"<xliff:g id="TEXT">%1$s</xliff:g> यस कललाई स्प्याम भनी रिपोर्ट गरिनेछ।"</string>
-    <string name="unblock_number_alert_details" msgid="8696070817026870606">"यो नम्बरमाथिको रोक हटाइनेछ र यसलाई स्प्याम होइन भनी रिपोर्ट गरिनेछ। आगामी कलहरूलाई स्प्याम भनी पहिचान गरिने छैन।"</string>
-    <string name="unblock_report_number_alert_title" msgid="2221901995393696882">"<xliff:g id="NUMBER">%1$s</xliff:g> माथिको रोक हटाउने हो?"</string>
-    <string name="report_not_spam_alert_button" msgid="3244953565919894995">"रिपोर्ट गर्नुहोस्"</string>
-    <string name="report_not_spam_alert_title" msgid="395961923213504916">"गल्तीको रिपोर्ट गर्ने हो?"</string>
-    <string name="report_not_spam_alert_details" msgid="4463730683530824797">"<xliff:g id="NUMBER">%1$s</xliff:g> का आगामी कलहरूलाई अबदेखि स्प्याम भनी पहिचान गरिने छैन।"</string>
-    <string name="checkbox_report_as_spam_action" msgid="1549159682170273798">"कललाई स्प्याम भनी रिपोर्ट गर्नुहोस्"</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="migrate_blocked_numbers_dialog_title">नयाँ, सरलीकृत रोकावट</string>
+  <string name="migrate_blocked_numbers_dialog_message">तपाईँको थप सुरक्षाका लागि फोनको रोकावट गर्ने विधिमा परिवर्तन गर्न आवश्यक छ। तपाईँबाट रोकावट गरिएका नम्बरहरूले अब कल र पाठ सन्देशहरूलाई रोक्नेछन् र यी नम्बरहरूलाई अन्य अनुप्रयोगहरूसँग साझेदारी गरिन सक्छ।</string>
+  <string name="migrate_blocked_numbers_dialog_allow_button">अनुमति दिनुहोस्</string>
+  <string name="old_block_number_confirmation_title">%1$s माथि रोक लगाउने हो?</string>
+  <string name="block_number_confirmation_message_vvm">यो नम्बरबाट सबै कलहरू रोकिनेछन् र भ्वाइसमेलहरू स्वचालित रूपमा मेटिनेछन्।</string>
+  <string name="block_number_confirmation_message_no_vvm">यो नम्बरबाट सबै कलहरू रोकिनेछन्। तर कलरले अझै तपाईँलाई भ्वाइस मेलहरू भने छोड्न सक्नेछन्।</string>
+  <string name="block_number_confirmation_message_new_filtering">तपाईँले अब उप्रान्त यस नम्बरबाट कल वा पाठ सन्देशहरू प्राप्त गर्नुहुने छैन।</string>
+  <string name="block_number_ok">रोक्नुहोस्</string>
+  <string name="unblock_number_confirmation_title">%1$s माथिको रोक हटाउने हो?</string>
+  <string name="unblock_number_ok">रोक हटाउनुहोस्</string>
+  <string name="invalidNumber">%1$s अमान्य छ।</string>
+  <string name="snackbar_number_blocked">%1$s रोकियो</string>
+  <string name="snackbar_number_unblocked">%1$s माथिको रोक हटाइयो</string>
+  <string name="send_to_voicemail_import_failed">आयात असफल भयो</string>
+  <string name="call_blocking_disabled_notification_title">४८ घण्टाको लागि कल निषेध असक्षम गरियो</string>
+  <string name="call_blocking_disabled_notification_text">आपत्कालीन कल गरिएको हुनाले असक्षम गरियो।</string>
 </resources>
diff --git a/java/com/android/dialer/blocking/res/values-nl/strings.xml b/java/com/android/dialer/blocking/res/values-nl/strings.xml
index dda7e30..f0272e6 100644
--- a/java/com/android/dialer/blocking/res/values-nl/strings.xml
+++ b/java/com/android/dialer/blocking/res/values-nl/strings.xml
@@ -1,46 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="migrate_blocked_numbers_dialog_title" msgid="7823962296457673809">"Verbeterde blokkeerfunctie"</string>
-    <string name="migrate_blocked_numbers_dialog_message" msgid="8309736147266462485">"Telefoon moet het blokkeergedrag aanpassen om je beter te beschermen. Voor je geblokkeerde nummers worden nu zowel oproepen als sms\'jes geblokkeerd. Deze instelling kan worden gedeeld met andere apps."</string>
-    <string name="migrate_blocked_numbers_dialog_allow_button" msgid="5192836471557751367">"Toestaan"</string>
-    <string name="block_number_confirmation_title" msgid="2699521227461376076">"<xliff:g id="NUMBER">%1$s</xliff:g> blokkeren?"</string>
-    <string name="block_number_confirmation_message_vvm" msgid="6501105244172290939">"Oproepen van dit nummer worden geblokkeerd en voicemails worden automatisch verwijderd."</string>
-    <string name="block_number_confirmation_message_no_vvm" msgid="8236641245709649882">"Oproepen van dit nummer worden geblokkeerd, maar de beller kan nog wel voicemails achterlaten."</string>
-    <string name="block_number_confirmation_message_new_filtering" msgid="8487449683723062644">"Je ontvangt geen oproepen of sms\'jes meer van dit nummer."</string>
-    <string name="block_number_ok" msgid="739786082788038932">"BLOKKEREN"</string>
-    <string name="unblock_number_confirmation_title" msgid="7897778825085659941">"Blokkering van <xliff:g id="NUMBER">%1$s</xliff:g> opheffen?"</string>
-    <string name="unblock_number_ok" msgid="5089057152966269355">"BLOKKERING OPHEFFEN"</string>
-    <string name="invalidNumber" msgid="6270918250761754967">"<xliff:g id="NUMBER">%1$s</xliff:g> is ongeldig."</string>
-    <string name="snackbar_number_blocked" msgid="5760234822413921845">"<xliff:g id="NUMBER">%1$s</xliff:g> geblokkeerd"</string>
-    <string name="snackbar_number_unblocked" msgid="7941296274123990585">"Blokkering van <xliff:g id="NUMBER">%1$s</xliff:g> opgeheven"</string>
-    <string name="block_number_undo" msgid="5158120911892491697">"ONGED. MKN"</string>
-    <string name="send_to_voicemail_import_failed" msgid="1012752662074208237">"Importeren mislukt"</string>
-    <string name="call_blocking_disabled_notification_title" msgid="7211352205255347489">"Oproepblokkering is 48 uur uitgeschakeld"</string>
-    <string name="call_blocking_disabled_notification_text" msgid="141384084865180722">"Uitgeschakeld omdat een noodoproep is geplaatst."</string>
-    <string name="block_report_number_alert_title" msgid="2740581989824959611">"<xliff:g id="NUMBER">%1$s</xliff:g> blokkeren?"</string>
-    <string name="block_report_number_alert_details" msgid="2652479394593143562">"Je ontvangt geen oproepen meer van dit nummer."</string>
-    <string name="block_number_alert_details" msgid="715942751312046429">"<xliff:g id="TEXT">%1$s</xliff:g> Deze oproep wordt gemeld als spam."</string>
-    <string name="unblock_number_alert_details" msgid="8696070817026870606">"Nummerblokkering opgeheven, gemeld als geen spam. Nieuwe oproepen worden niet aangemerkt als spam."</string>
-    <string name="unblock_report_number_alert_title" msgid="2221901995393696882">"Blokkering van <xliff:g id="NUMBER">%1$s</xliff:g> opheffen?"</string>
-    <string name="report_not_spam_alert_button" msgid="3244953565919894995">"Melden"</string>
-    <string name="report_not_spam_alert_title" msgid="395961923213504916">"Een fout melden?"</string>
-    <string name="report_not_spam_alert_details" msgid="4463730683530824797">"Nieuwe oproepen van <xliff:g id="NUMBER">%1$s</xliff:g> worden niet meer aangemerkt als spam."</string>
-    <string name="checkbox_report_as_spam_action" msgid="1549159682170273798">"Oproep melden als spam"</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="migrate_blocked_numbers_dialog_title">Verbeterde blokkeerfunctie</string>
+  <string name="migrate_blocked_numbers_dialog_message">Telefoon moet het blokkeergedrag aanpassen om je beter te beschermen. Voor je geblokkeerde nummers worden nu zowel oproepen als sms\'jes geblokkeerd. Deze instelling kan worden gedeeld met andere apps.</string>
+  <string name="migrate_blocked_numbers_dialog_allow_button">Toestaan</string>
+  <string name="old_block_number_confirmation_title">%1$s blokkeren?</string>
+  <string name="block_number_confirmation_message_vvm">Oproepen van dit nummer worden geblokkeerd en voicemails worden automatisch verwijderd.</string>
+  <string name="block_number_confirmation_message_no_vvm">Oproepen van dit nummer worden geblokkeerd, maar de beller kan nog wel voicemails achterlaten.</string>
+  <string name="block_number_confirmation_message_new_filtering">Je ontvangt geen oproepen of sms\'jes meer van dit nummer.</string>
+  <string name="block_number_ok">BLOKKEREN</string>
+  <string name="unblock_number_confirmation_title">Blokkering van %1$s opheffen?</string>
+  <string name="unblock_number_ok">BLOKKERING OPHEFFEN</string>
+  <string name="invalidNumber">%1$s is ongeldig.</string>
+  <string name="snackbar_number_blocked">%1$s geblokkeerd</string>
+  <string name="snackbar_number_unblocked">Blokkering van %1$s opgeheven</string>
+  <string name="send_to_voicemail_import_failed">Importeren mislukt</string>
+  <string name="call_blocking_disabled_notification_title">Oproepblokkering is 48 uur uitgeschakeld</string>
+  <string name="call_blocking_disabled_notification_text">Uitgeschakeld omdat een noodoproep is geplaatst.</string>
 </resources>
diff --git a/java/com/android/dialer/blocking/res/values-no/strings.xml b/java/com/android/dialer/blocking/res/values-no/strings.xml
index 8f55f40..9ce2a18 100644
--- a/java/com/android/dialer/blocking/res/values-no/strings.xml
+++ b/java/com/android/dialer/blocking/res/values-no/strings.xml
@@ -1,46 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="migrate_blocked_numbers_dialog_title" msgid="7823962296457673809">"Ny, forenklet blokkering"</string>
-    <string name="migrate_blocked_numbers_dialog_message" msgid="8309736147266462485">"Telefon-appen endrer innstillingene for blokkering for at du skal være bedre beskyttet. Du mottar verken meldinger eller anrop fra blokkerte numre, og det kan hende at disse numrene blir delt med andre apper."</string>
-    <string name="migrate_blocked_numbers_dialog_allow_button" msgid="5192836471557751367">"Tillat"</string>
-    <string name="block_number_confirmation_title" msgid="2699521227461376076">"Vil du blokkere <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="block_number_confirmation_message_vvm" msgid="6501105244172290939">"Anrop fra dette nummeret blokkeres, og talepost blir automatisk slettet."</string>
-    <string name="block_number_confirmation_message_no_vvm" msgid="8236641245709649882">"Anrop fra dette nummeret blokkeres, men den som ringer kan fortsatt legge igjen beskjeder i talepostkassen din."</string>
-    <string name="block_number_confirmation_message_new_filtering" msgid="8487449683723062644">"Du kommer ikke lenger til å motta anrop eller SMS-er fra dette nummeret."</string>
-    <string name="block_number_ok" msgid="739786082788038932">"BLOKKÉR"</string>
-    <string name="unblock_number_confirmation_title" msgid="7897778825085659941">"Vil du oppheve blokkeringen av <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="unblock_number_ok" msgid="5089057152966269355">"OPPHEV BLOKKERINGEN"</string>
-    <string name="invalidNumber" msgid="6270918250761754967">"<xliff:g id="NUMBER">%1$s</xliff:g> er ugyldig."</string>
-    <string name="snackbar_number_blocked" msgid="5760234822413921845">"<xliff:g id="NUMBER">%1$s</xliff:g> er blokkert"</string>
-    <string name="snackbar_number_unblocked" msgid="7941296274123990585">"Blokkeringen av <xliff:g id="NUMBER">%1$s</xliff:g> er opphevet"</string>
-    <string name="block_number_undo" msgid="5158120911892491697">"ANGRE"</string>
-    <string name="send_to_voicemail_import_failed" msgid="1012752662074208237">"Importeringen mislyktes"</string>
-    <string name="call_blocking_disabled_notification_title" msgid="7211352205255347489">"Anropsblokkering er slått av i 48 timer"</string>
-    <string name="call_blocking_disabled_notification_text" msgid="141384084865180722">"Slått av fordi du foretok et nødanrop."</string>
-    <string name="block_report_number_alert_title" msgid="2740581989824959611">"Vil du blokkere <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="block_report_number_alert_details" msgid="2652479394593143562">"Du kommer ikke lenger til å motta anrop fra dette nummeret."</string>
-    <string name="block_number_alert_details" msgid="715942751312046429">"<xliff:g id="TEXT">%1$s</xliff:g> Dette anropet blir rapportert som useriøst."</string>
-    <string name="unblock_number_alert_details" msgid="8696070817026870606">"Blokkering oppheves og nummer rapporteres som «ikke useriøst». Senere anrop angis ikke som useriøse."</string>
-    <string name="unblock_report_number_alert_title" msgid="2221901995393696882">"Vil du oppheve blokkeringen av <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="report_not_spam_alert_button" msgid="3244953565919894995">"Rapportér"</string>
-    <string name="report_not_spam_alert_title" msgid="395961923213504916">"Vil du rapportere om en feil?"</string>
-    <string name="report_not_spam_alert_details" msgid="4463730683530824797">"Fremtidige anrop fra <xliff:g id="NUMBER">%1$s</xliff:g> blir ikke definert som useriøse."</string>
-    <string name="checkbox_report_as_spam_action" msgid="1549159682170273798">"Rapportér anropet som useriøst"</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="migrate_blocked_numbers_dialog_title">Ny, forenklet blokkering</string>
+  <string name="migrate_blocked_numbers_dialog_message">Telefon-appen endrer innstillingene for blokkering for at du skal være bedre beskyttet. Du mottar verken meldinger eller anrop fra blokkerte numre, og det kan hende at disse numrene blir delt med andre apper.</string>
+  <string name="migrate_blocked_numbers_dialog_allow_button">Tillat</string>
+  <string name="old_block_number_confirmation_title">Vil du blokkere %1$s?</string>
+  <string name="block_number_confirmation_message_vvm">Anrop fra dette nummeret blokkeres, og talepost blir automatisk slettet.</string>
+  <string name="block_number_confirmation_message_no_vvm">Anrop fra dette nummeret blokkeres, men den som ringer kan fortsatt legge igjen beskjeder i talepostkassen din.</string>
+  <string name="block_number_confirmation_message_new_filtering">Du kommer ikke lenger til å motta anrop eller SMS-er fra dette nummeret.</string>
+  <string name="block_number_ok">BLOKKÉR</string>
+  <string name="unblock_number_confirmation_title">Vil du oppheve blokkeringen av %1$s?</string>
+  <string name="unblock_number_ok">OPPHEV BLOKKERINGEN</string>
+  <string name="invalidNumber">%1$s er ugyldig.</string>
+  <string name="snackbar_number_blocked">%1$s er blokkert</string>
+  <string name="snackbar_number_unblocked">Blokkeringen av %1$s er opphevet</string>
+  <string name="send_to_voicemail_import_failed">Importeringen mislyktes</string>
+  <string name="call_blocking_disabled_notification_title">Anropsblokkering er slått av i 48 timer</string>
+  <string name="call_blocking_disabled_notification_text">Slått av fordi du foretok et nødanrop.</string>
 </resources>
diff --git a/java/com/android/dialer/blocking/res/values-pa/strings.xml b/java/com/android/dialer/blocking/res/values-pa/strings.xml
index 31a6d09..110be23 100644
--- a/java/com/android/dialer/blocking/res/values-pa/strings.xml
+++ b/java/com/android/dialer/blocking/res/values-pa/strings.xml
@@ -1,46 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="migrate_blocked_numbers_dialog_title" msgid="7823962296457673809">"ਨਵੀਂ, ਸਰਲੀਕ੍ਰਿਤ ਬਲੌਕਿੰਗ"</string>
-    <string name="migrate_blocked_numbers_dialog_message" msgid="8309736147266462485">"ਤੁਹਾਡੀ ਬਿਹਤਰ ਢੰਗ ਨਾਲ ਰੱਖਿਆ ਲਈ, ਫੋਨ ਨੂੰ ਬਲੌਕਿੰਗ ਦੇ ਕੰਮ ਕਰਨ ਦੇ ਢੰਗ ਨੂੰ ਬਦਲਣ ਦੀ ਲੋੜ ਹੈ। ਹੁਣ ਤੁਹਾਡੇ ਬਲੌਕ ਕੀਤੇ ਗਏ ਨੰਬਰਾਂ ਤੋਂ ਕਾਲਾਂ ਅਤੇ ਲਿਖਤ ਸੁਨੇਹਿਆਂ ਦੋਵਾਂ ਨੂੰ ਰੋਕ ਦਿੱਤਾ ਜਾਵੇਗਾ ਅਤੇ ਇਹਨਾਂ ਨੂੰ ਹੋਰ ਐਪਾਂ ਨਾਲ ਵੀ ਸਾਂਝਾ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ।"</string>
-    <string name="migrate_blocked_numbers_dialog_allow_button" msgid="5192836471557751367">"ਮਨਜ਼ੂਰੀ ਦਿਓ"</string>
-    <string name="block_number_confirmation_title" msgid="2699521227461376076">"ਕੀ <xliff:g id="NUMBER">%1$s</xliff:g> ਬਲੌਕ ਕਰਨਾ ਹੈ?"</string>
-    <string name="block_number_confirmation_message_vvm" msgid="6501105244172290939">"ਇਸ ਨੰਬਰ ਤੋਂ ਕਾਲਾਂ ਬਲੌਕ ਕੀਤੀਆਂ ਜਾਣਗੀਆਂ ਅਤੇ ਵੌਇਸਮੇਲਾਂ ਆਪਣੇ ਆਪ ਮਿਟਾ ਦਿੱਤੀਆਂ ਜਾਣਗੀਆਂ।"</string>
-    <string name="block_number_confirmation_message_no_vvm" msgid="8236641245709649882">"ਇਸ ਨੰਬਰ ਤੋਂ ਕਾਲਾਂ ਬਲੌਕ ਕੀਤੀਆਂ ਜਾਣਗੀਆਂ, ਪਰ ਕਾਲਰ ਹਾਲੇ ਵੀ ਤੁਹਾਡੇ ਲਈ ਵੌਇਸਮੇਲਾਂ ਛੱਡ ਸਕਦਾ ਹੈ।"</string>
-    <string name="block_number_confirmation_message_new_filtering" msgid="8487449683723062644">"ਤੁਹਾਨੂੰ ਹੁਣ ਇਸ ਨੰਬਰ ਤੋਂ ਕਾਲਾਂ ਜਾਂ ਲਿਖਤ ਸੁਨੇਹੇ ਪ੍ਰਾਪਤ ਨਹੀਂ ਹੋਣਗੇ।"</string>
-    <string name="block_number_ok" msgid="739786082788038932">"ਬਲੌਕ ਕਰੋ"</string>
-    <string name="unblock_number_confirmation_title" msgid="7897778825085659941">"ਕੀ <xliff:g id="NUMBER">%1$s</xliff:g> ਅਣਲਾਕ ਕਰਨਾ ਹੈ?"</string>
-    <string name="unblock_number_ok" msgid="5089057152966269355">"ਅਨਬਲੌਕ ਕਰੋ"</string>
-    <string name="invalidNumber" msgid="6270918250761754967">"<xliff:g id="NUMBER">%1$s</xliff:g> ਅਪ੍ਰਮਾਣਿਕ ਹੈ।"</string>
-    <string name="snackbar_number_blocked" msgid="5760234822413921845">"<xliff:g id="NUMBER">%1$s</xliff:g> ਬਲੌਕ ਕੀਤਾ"</string>
-    <string name="snackbar_number_unblocked" msgid="7941296274123990585">"<xliff:g id="NUMBER">%1$s</xliff:g> ਅਨਬਲੌਕ ਕੀਤਾ"</string>
-    <string name="block_number_undo" msgid="5158120911892491697">"ਪਹਿਲਾਂ ਵਰਗਾ ਕਰੋ"</string>
-    <string name="send_to_voicemail_import_failed" msgid="1012752662074208237">"ਆਯਾਤ ਅਸਫਲ ਹੋਇਆ"</string>
-    <string name="call_blocking_disabled_notification_title" msgid="7211352205255347489">"ਕਾਲ ਬਲੋੌਕਿੰਗ 48 ਘੰਟਿਆਂ ਲਈ ਅਯੋਗ ਕੀਤੀ ਗਈ"</string>
-    <string name="call_blocking_disabled_notification_text" msgid="141384084865180722">"ਆਯੋਗ ਕੀਤਾ ਕਿਉਂਕਿ ਇੱਕ ਸੰਕਟ ਕਾਲ ਕੀਤੀ ਗਈ ਸੀ।"</string>
-    <string name="block_report_number_alert_title" msgid="2740581989824959611">"ਕੀ <xliff:g id="NUMBER">%1$s</xliff:g> ਬਲੌਕ ਕਰਨਾ ਹੈ?"</string>
-    <string name="block_report_number_alert_details" msgid="2652479394593143562">"ਤੁਹਾਨੂੰ ਹੁਣ ਇਸ ਨੰਬਰ ਤੋਂ ਕਾਲਾਂ ਪ੍ਰਾਪਤ ਨਹੀਂ ਹੋਣਗੀਆਂ।"</string>
-    <string name="block_number_alert_details" msgid="715942751312046429">"<xliff:g id="TEXT">%1$s</xliff:g> ਇਸ ਕਾਲ ਨੂੰ ਸਪੈਮ ਵਜੋਂ ਰਿਪੋਰਟ ਕੀਤਾ ਜਾਵੇਗਾ।"</string>
-    <string name="unblock_number_alert_details" msgid="8696070817026870606">"ਇਸ ਨੰਬਰ ਨੂੰ ਅਣਲਾਕ ਕੀਤਾ ਜਾਵੇਗਾ ਅਤੇ ਸਪੈਮ ਨਹੀਂ ਵਜੋਂ ਰਿਪੋਰਟ ਕੀਤਾ ਜਾਵੇਗਾ। ਭਵਿੱਖ ਦੀਆਂ ਕਾਲਾਂ ਨੂੰ ਸਪੈਮ ਵਜੋਂ ਨਹੀਂ ਸਮਝਿਆ ਜਾਵੇਗਾ।"</string>
-    <string name="unblock_report_number_alert_title" msgid="2221901995393696882">"ਕੀ <xliff:g id="NUMBER">%1$s</xliff:g> ਅਣਲਾਕ ਕਰਨਾ ਹੈ?"</string>
-    <string name="report_not_spam_alert_button" msgid="3244953565919894995">"ਰਿਪੋਰਟ ਕਰੋ"</string>
-    <string name="report_not_spam_alert_title" msgid="395961923213504916">"ਕੀ ਕਿਸੇ ਗ਼ਲਤੀ ਦੀ ਰਿਪੋਰਟ ਕਰਨੀ ਹੈ?"</string>
-    <string name="report_not_spam_alert_details" msgid="4463730683530824797">"<xliff:g id="NUMBER">%1$s</xliff:g> ਤੋਂ ਭਵਿੱਖ ਦੀਆਂ ਕਾਲਾਂ ਨੂੰ ਹੁਣ ਸਪੈਮ ਵਜੋਂ ਨਹੀਂ ਸਮਝਿਆ ਜਾਵੇਗਾ।"</string>
-    <string name="checkbox_report_as_spam_action" msgid="1549159682170273798">"ਕਾਲ ਨੂੰ ਸਪੈਮ ਵਜੋਂ ਰਿਪੋਰਟ ਕਰੋ"</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="migrate_blocked_numbers_dialog_title">ਨਵੀਂ, ਸਰਲੀਕ੍ਰਿਤ ਬਲੌਕਿੰਗ</string>
+  <string name="migrate_blocked_numbers_dialog_message">ਤੁਹਾਡੀ ਬਿਹਤਰ ਢੰਗ ਨਾਲ ਰੱਖਿਆ ਲਈ, ਫੋਨ ਨੂੰ ਬਲੌਕਿੰਗ ਦੇ ਕੰਮ ਕਰਨ ਦੇ ਢੰਗ ਨੂੰ ਬਦਲਣ ਦੀ ਲੋੜ ਹੈ। ਹੁਣ ਤੁਹਾਡੇ ਬਲੌਕ ਕੀਤੇ ਗਏ ਨੰਬਰਾਂ ਤੋਂ ਕਾਲਾਂ ਅਤੇ ਲਿਖਤ ਸੁਨੇਹਿਆਂ ਦੋਵਾਂ ਨੂੰ ਰੋਕ ਦਿੱਤਾ ਜਾਵੇਗਾ ਅਤੇ ਇਹਨਾਂ ਨੂੰ ਹੋਰ ਐਪਾਂ ਨਾਲ ਵੀ ਸਾਂਝਾ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ।</string>
+  <string name="migrate_blocked_numbers_dialog_allow_button">ਮਨਜ਼ੂਰੀ ਦਿਓ</string>
+  <string name="old_block_number_confirmation_title">ਕੀ %1$s ਬਲਾਕ ਕਰਨਾ ਹੈ?</string>
+  <string name="block_number_confirmation_message_vvm">ਇਸ ਨੰਬਰ ਤੋਂ ਕਾਲਾਂ ਬਲੌਕ ਕੀਤੀਆਂ ਜਾਣਗੀਆਂ ਅਤੇ ਵੌਇਸਮੇਲਾਂ ਆਪਣੇ ਆਪ ਮਿਟਾ ਦਿੱਤੀਆਂ ਜਾਣਗੀਆਂ।</string>
+  <string name="block_number_confirmation_message_no_vvm">ਇਸ ਨੰਬਰ ਤੋਂ ਕਾਲਾਂ ਬਲੌਕ ਕੀਤੀਆਂ ਜਾਣਗੀਆਂ, ਪਰ ਕਾਲਰ ਹਾਲੇ ਵੀ ਤੁਹਾਡੇ ਲਈ ਵੌਇਸਮੇਲਾਂ ਛੱਡ ਸਕਦਾ ਹੈ।</string>
+  <string name="block_number_confirmation_message_new_filtering">ਤੁਹਾਨੂੰ ਹੁਣ ਇਸ ਨੰਬਰ ਤੋਂ ਕਾਲਾਂ ਜਾਂ ਲਿਖਤ ਸੁਨੇਹੇ ਪ੍ਰਾਪਤ ਨਹੀਂ ਹੋਣਗੇ।</string>
+  <string name="block_number_ok">ਬਲੌਕ ਕਰੋ</string>
+  <string name="unblock_number_confirmation_title">ਕੀ %1$s ਅਣਬਲਾਕ ਕਰਨਾ ਹੈ?</string>
+  <string name="unblock_number_ok">ਅਨਬਲੌਕ ਕਰੋ</string>
+  <string name="invalidNumber">%1$s ਅਵੈਧ ਹੈ।</string>
+  <string name="snackbar_number_blocked">%1$s ਬਲੌਕ ਕੀਤਾ</string>
+  <string name="snackbar_number_unblocked">%1$s ਅਣਬਲਾਕ ਕੀਤਾ ਗਿਆ</string>
+  <string name="send_to_voicemail_import_failed">ਆਯਾਤ ਅਸਫਲ ਹੋਇਆ</string>
+  <string name="call_blocking_disabled_notification_title">ਕਾਲ ਬਲੋੌਕਿੰਗ 48 ਘੰਟਿਆਂ ਲਈ ਅਯੋਗ ਕੀਤੀ ਗਈ</string>
+  <string name="call_blocking_disabled_notification_text">ਆਯੋਗ ਕੀਤਾ ਕਿਉਂਕਿ ਇੱਕ ਸੰਕਟ ਕਾਲ ਕੀਤੀ ਗਈ ਸੀ।</string>
 </resources>
diff --git a/java/com/android/dialer/blocking/res/values-pl/strings.xml b/java/com/android/dialer/blocking/res/values-pl/strings.xml
index 2a807ef..a434a0b 100644
--- a/java/com/android/dialer/blocking/res/values-pl/strings.xml
+++ b/java/com/android/dialer/blocking/res/values-pl/strings.xml
@@ -1,46 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="migrate_blocked_numbers_dialog_title" msgid="7823962296457673809">"Nowe, uproszczone blokowanie"</string>
-    <string name="migrate_blocked_numbers_dialog_message" msgid="8309736147266462485">"Aby lepiej Cię chronić, Telefon musi zmienić działanie związane z blokowaniem. Od teraz nie będziesz już otrzymywać połączeń ani SMS-ów z zablokowanych numerów. Numery te mogą też być udostępniane innym aplikacjom."</string>
-    <string name="migrate_blocked_numbers_dialog_allow_button" msgid="5192836471557751367">"Zezwól"</string>
-    <string name="block_number_confirmation_title" msgid="2699521227461376076">"Zablokować numer <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="block_number_confirmation_message_vvm" msgid="6501105244172290939">"Połączenia z tego numeru będą blokowane, a wiadomości głosowe będą usuwane automatycznie."</string>
-    <string name="block_number_confirmation_message_no_vvm" msgid="8236641245709649882">"Połączenia z tego numeru będą blokowane, ale dzwoniący wciąż będzie mógł zostawiać wiadomości głosowe."</string>
-    <string name="block_number_confirmation_message_new_filtering" msgid="8487449683723062644">"Nie będziesz otrzymywać połączeń ani SMS-ów z tego numeru."</string>
-    <string name="block_number_ok" msgid="739786082788038932">"ZABLOKUJ"</string>
-    <string name="unblock_number_confirmation_title" msgid="7897778825085659941">"Odblokować numer <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="unblock_number_ok" msgid="5089057152966269355">"ODBLOKUJ"</string>
-    <string name="invalidNumber" msgid="6270918250761754967">"Numer <xliff:g id="NUMBER">%1$s</xliff:g> jest nieprawidłowy."</string>
-    <string name="snackbar_number_blocked" msgid="5760234822413921845">"<xliff:g id="NUMBER">%1$s</xliff:g> zablokowany"</string>
-    <string name="snackbar_number_unblocked" msgid="7941296274123990585">"<xliff:g id="NUMBER">%1$s</xliff:g> odblokowany"</string>
-    <string name="block_number_undo" msgid="5158120911892491697">"COFNIJ"</string>
-    <string name="send_to_voicemail_import_failed" msgid="1012752662074208237">"Nie udało się zaimportować"</string>
-    <string name="call_blocking_disabled_notification_title" msgid="7211352205255347489">"Blokada połączeń została wyłączona na 48 godzin"</string>
-    <string name="call_blocking_disabled_notification_text" msgid="141384084865180722">"Wyłączona, ponieważ wykonano połączenie alarmowe."</string>
-    <string name="block_report_number_alert_title" msgid="2740581989824959611">"Zablokować numer <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="block_report_number_alert_details" msgid="2652479394593143562">"Nie będziesz już otrzymywać połączeń z tego numeru."</string>
-    <string name="block_number_alert_details" msgid="715942751312046429">"<xliff:g id="TEXT">%1$s</xliff:g> To połączenie zostanie zgłoszone jako spam."</string>
-    <string name="unblock_number_alert_details" msgid="8696070817026870606">"Ten numer zostanie odblokowany i usunięty z listy nadawców spamu. Połączenia nie będą już blokowane."</string>
-    <string name="unblock_report_number_alert_title" msgid="2221901995393696882">"Odblokować numer <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="report_not_spam_alert_button" msgid="3244953565919894995">"Zgłoś"</string>
-    <string name="report_not_spam_alert_title" msgid="395961923213504916">"Zgłosić pomyłkę?"</string>
-    <string name="report_not_spam_alert_details" msgid="4463730683530824797">"Połączenia z numeru <xliff:g id="NUMBER">%1$s</xliff:g> nie będą już identyfikowane jako spam."</string>
-    <string name="checkbox_report_as_spam_action" msgid="1549159682170273798">"Zgłoś połączenie jako spam"</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="migrate_blocked_numbers_dialog_title">Nowe, uproszczone blokowanie</string>
+  <string name="migrate_blocked_numbers_dialog_message">Aby lepiej Cię chronić, Telefon musi zmienić działanie związane z blokowaniem. Od teraz nie będziesz już otrzymywać połączeń ani SMS-ów z zablokowanych numerów. Numery te mogą też być udostępniane innym aplikacjom.</string>
+  <string name="migrate_blocked_numbers_dialog_allow_button">Zezwól</string>
+  <string name="old_block_number_confirmation_title">Zablokować numer %1$s?</string>
+  <string name="block_number_confirmation_message_vvm">Połączenia z tego numeru będą blokowane, a wiadomości głosowe będą usuwane automatycznie.</string>
+  <string name="block_number_confirmation_message_no_vvm">Połączenia z tego numeru będą blokowane, ale dzwoniący wciąż będzie mógł zostawiać wiadomości głosowe.</string>
+  <string name="block_number_confirmation_message_new_filtering">Nie będziesz otrzymywać połączeń ani SMS-ów z tego numeru.</string>
+  <string name="block_number_ok">ZABLOKUJ</string>
+  <string name="unblock_number_confirmation_title">Odblokować numer %1$s?</string>
+  <string name="unblock_number_ok">ODBLOKUJ</string>
+  <string name="invalidNumber">Numer %1$s jest nieprawidłowy.</string>
+  <string name="snackbar_number_blocked">%1$s zablokowany</string>
+  <string name="snackbar_number_unblocked">Numer %1$s odblokowany</string>
+  <string name="send_to_voicemail_import_failed">Nie udało się zaimportować</string>
+  <string name="call_blocking_disabled_notification_title">Blokada połączeń została wyłączona na 48 godzin</string>
+  <string name="call_blocking_disabled_notification_text">Wyłączona, ponieważ wykonano połączenie alarmowe.</string>
 </resources>
diff --git a/java/com/android/dialer/blocking/res/values-pt-rBR/strings.xml b/java/com/android/dialer/blocking/res/values-pt-rBR/strings.xml
index 16d719f..cfe3dc0 100644
--- a/java/com/android/dialer/blocking/res/values-pt-rBR/strings.xml
+++ b/java/com/android/dialer/blocking/res/values-pt-rBR/strings.xml
@@ -1,46 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="migrate_blocked_numbers_dialog_title" msgid="7823962296457673809">"Novo bloqueio simplificado"</string>
-    <string name="migrate_blocked_numbers_dialog_message" msgid="8309736147266462485">"Para aumentar sua proteção, é preciso alterar o modo como o bloqueio funciona no smartphone. Os números bloqueados agora impedirão chamadas e mensagens de texto, e será possível compartilhá-los com outros apps."</string>
-    <string name="migrate_blocked_numbers_dialog_allow_button" msgid="5192836471557751367">"Permitir"</string>
-    <string name="block_number_confirmation_title" msgid="2699521227461376076">"Bloquear <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="block_number_confirmation_message_vvm" msgid="6501105244172290939">"Chamadas feitas a partir deste número serão bloqueadas. Correios de voz serão excluídos automaticamente."</string>
-    <string name="block_number_confirmation_message_no_vvm" msgid="8236641245709649882">"Chamadas feitas a partir deste número serão bloqueadas, mas é possível que o autor ainda consiga deixar correios de voz para você."</string>
-    <string name="block_number_confirmation_message_new_filtering" msgid="8487449683723062644">"Você não receberá mais chamadas ou mensagens de texto deste número."</string>
-    <string name="block_number_ok" msgid="739786082788038932">"BLOQUEAR"</string>
-    <string name="unblock_number_confirmation_title" msgid="7897778825085659941">"Desbloquear <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="unblock_number_ok" msgid="5089057152966269355">"DESBLOQUEAR"</string>
-    <string name="invalidNumber" msgid="6270918250761754967">"O número <xliff:g id="NUMBER">%1$s</xliff:g> é inválido."</string>
-    <string name="snackbar_number_blocked" msgid="5760234822413921845">"Número <xliff:g id="NUMBER">%1$s</xliff:g> bloqueado"</string>
-    <string name="snackbar_number_unblocked" msgid="7941296274123990585">"Número <xliff:g id="NUMBER">%1$s</xliff:g> desbloqueado"</string>
-    <string name="block_number_undo" msgid="5158120911892491697">"DESFAZER"</string>
-    <string name="send_to_voicemail_import_failed" msgid="1012752662074208237">"Falha na importação"</string>
-    <string name="call_blocking_disabled_notification_title" msgid="7211352205255347489">"Bloqueio de chamadas desativado por 48 horas"</string>
-    <string name="call_blocking_disabled_notification_text" msgid="141384084865180722">"Desativado porque foi feita uma chamada de emergência."</string>
-    <string name="block_report_number_alert_title" msgid="2740581989824959611">"Bloquear <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="block_report_number_alert_details" msgid="2652479394593143562">"Você não receberá mais chamadas deste número."</string>
-    <string name="block_number_alert_details" msgid="715942751312046429">"<xliff:g id="TEXT">%1$s</xliff:g> Esta chamada será denunciada como spam."</string>
-    <string name="unblock_number_alert_details" msgid="8696070817026870606">"O número será desbloqueado e identificado como não sendo spam. As chamadas futuras não serão identificadas como spam."</string>
-    <string name="unblock_report_number_alert_title" msgid="2221901995393696882">"Desbloquear <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="report_not_spam_alert_button" msgid="3244953565919894995">"Informar"</string>
-    <string name="report_not_spam_alert_title" msgid="395961923213504916">"Quer informar um erro?"</string>
-    <string name="report_not_spam_alert_details" msgid="4463730683530824797">"As chamadas futuras de <xliff:g id="NUMBER">%1$s</xliff:g> não serão mais identificadas como spam."</string>
-    <string name="checkbox_report_as_spam_action" msgid="1549159682170273798">"Denunciar chamada como spam"</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="migrate_blocked_numbers_dialog_title">Novo bloqueio simplificado</string>
+  <string name="migrate_blocked_numbers_dialog_message">Para aumentar sua proteção, é preciso alterar o modo como o bloqueio funciona no smartphone. Os números bloqueados agora impedirão chamadas e mensagens de texto, e será possível compartilhá-los com outros apps.</string>
+  <string name="migrate_blocked_numbers_dialog_allow_button">Permitir</string>
+  <string name="old_block_number_confirmation_title">Bloquear %1$s?</string>
+  <string name="block_number_confirmation_message_vvm">Chamadas feitas a partir deste número serão bloqueadas. Correios de voz serão excluídos automaticamente.</string>
+  <string name="block_number_confirmation_message_no_vvm">Chamadas feitas a partir deste número serão bloqueadas, mas é possível que o autor ainda consiga deixar correios de voz para você.</string>
+  <string name="block_number_confirmation_message_new_filtering">Você não receberá mais chamadas ou mensagens de texto deste número.</string>
+  <string name="block_number_ok">BLOQUEAR</string>
+  <string name="unblock_number_confirmation_title">Desbloquear %1$s?</string>
+  <string name="unblock_number_ok">DESBLOQUEAR</string>
+  <string name="invalidNumber">O número %1$s é inválido.</string>
+  <string name="snackbar_number_blocked">Número %1$s bloqueado</string>
+  <string name="snackbar_number_unblocked">O número %1$s foi desbloqueado</string>
+  <string name="send_to_voicemail_import_failed">Falha na importação</string>
+  <string name="call_blocking_disabled_notification_title">Bloqueio de chamadas desativado por 48 horas</string>
+  <string name="call_blocking_disabled_notification_text">Desativado porque foi feita uma chamada de emergência.</string>
 </resources>
diff --git a/java/com/android/dialer/blocking/res/values-pt-rPT/strings.xml b/java/com/android/dialer/blocking/res/values-pt-rPT/strings.xml
index 4e0206d..c12d2c4 100644
--- a/java/com/android/dialer/blocking/res/values-pt-rPT/strings.xml
+++ b/java/com/android/dialer/blocking/res/values-pt-rPT/strings.xml
@@ -1,46 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="migrate_blocked_numbers_dialog_title" msgid="7823962296457673809">"Novo bloqueio simplificado"</string>
-    <string name="migrate_blocked_numbers_dialog_message" msgid="8309736147266462485">"Para o proteger melhor, a aplicação Telemóvel tem de alterar o modo de funcionamento do bloqueio. Deixa de receber chamadas e mensagens de texto dos números bloqueados e estes podem ser partilhados com outras aplicações."</string>
-    <string name="migrate_blocked_numbers_dialog_allow_button" msgid="5192836471557751367">"Permitir"</string>
-    <string name="block_number_confirmation_title" msgid="2699521227461376076">"Pretende bloquear <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="block_number_confirmation_message_vvm" msgid="6501105244172290939">"As chamadas a partir deste número serão bloqueadas e as mensagens de correio de voz serão automaticamente eliminadas."</string>
-    <string name="block_number_confirmation_message_no_vvm" msgid="8236641245709649882">"As chamadas a partir deste número serão bloqueadas, mas o autor da chamada poderá deixar-lhe mensagens de correio de voz."</string>
-    <string name="block_number_confirmation_message_new_filtering" msgid="8487449683723062644">"Deixará de receber chamadas ou mensagens de texto deste número."</string>
-    <string name="block_number_ok" msgid="739786082788038932">"BLOQUEAR"</string>
-    <string name="unblock_number_confirmation_title" msgid="7897778825085659941">"Pretende desbloquear <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="unblock_number_ok" msgid="5089057152966269355">"DESBLOQUEAR"</string>
-    <string name="invalidNumber" msgid="6270918250761754967">"<xliff:g id="NUMBER">%1$s</xliff:g> é inválido."</string>
-    <string name="snackbar_number_blocked" msgid="5760234822413921845">"<xliff:g id="NUMBER">%1$s</xliff:g> bloqueado"</string>
-    <string name="snackbar_number_unblocked" msgid="7941296274123990585">"<xliff:g id="NUMBER">%1$s</xliff:g> desbloqueado"</string>
-    <string name="block_number_undo" msgid="5158120911892491697">"ANULAR"</string>
-    <string name="send_to_voicemail_import_failed" msgid="1012752662074208237">"Falha ao importar"</string>
-    <string name="call_blocking_disabled_notification_title" msgid="7211352205255347489">"Bloqueio de chamadas desativado durante 48 horas"</string>
-    <string name="call_blocking_disabled_notification_text" msgid="141384084865180722">"Desativado porque foi efetuada uma chamada de emergência."</string>
-    <string name="block_report_number_alert_title" msgid="2740581989824959611">"Pretende bloquear <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="block_report_number_alert_details" msgid="2652479394593143562">"Irá deixar de receber chamadas deste número."</string>
-    <string name="block_number_alert_details" msgid="715942751312046429">"<xliff:g id="TEXT">%1$s</xliff:g> Esta chamada será registada como spam."</string>
-    <string name="unblock_number_alert_details" msgid="8696070817026870606">"Este núm. será desbloq. e não será considerado spam. As chamadas não serão identificadas como spam."</string>
-    <string name="unblock_report_number_alert_title" msgid="2221901995393696882">"Pretende desbloquear <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="report_not_spam_alert_button" msgid="3244953565919894995">"Denunciar"</string>
-    <string name="report_not_spam_alert_title" msgid="395961923213504916">"Pretende denunciar um erro?"</string>
-    <string name="report_not_spam_alert_details" msgid="4463730683530824797">"As chamadas de <xliff:g id="NUMBER">%1$s</xliff:g> não serão identificadas como spam."</string>
-    <string name="checkbox_report_as_spam_action" msgid="1549159682170273798">"Registar a chamada como spam"</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="migrate_blocked_numbers_dialog_title">Novo bloqueio simplificado</string>
+  <string name="migrate_blocked_numbers_dialog_message">Para o proteger melhor, a aplicação Telemóvel tem de alterar o modo de funcionamento do bloqueio. Deixa de receber chamadas e mensagens de texto dos números bloqueados e estes podem ser partilhados com outras aplicações.</string>
+  <string name="migrate_blocked_numbers_dialog_allow_button">Permitir</string>
+  <string name="old_block_number_confirmation_title">Pretende bloquear%1$s?</string>
+  <string name="block_number_confirmation_message_vvm">As chamadas a partir deste número serão bloqueadas e as mensagens de correio de voz serão automaticamente eliminadas.</string>
+  <string name="block_number_confirmation_message_no_vvm">As chamadas a partir deste número serão bloqueadas, mas o autor da chamada poderá deixar-lhe mensagens de correio de voz.</string>
+  <string name="block_number_confirmation_message_new_filtering">Deixará de receber chamadas ou mensagens de texto deste número.</string>
+  <string name="block_number_ok">BLOQUEAR</string>
+  <string name="unblock_number_confirmation_title">Pretende desbloquear%1$s?</string>
+  <string name="unblock_number_ok">DESBLOQUEAR</string>
+  <string name="invalidNumber">%1$sé inválido.</string>
+  <string name="snackbar_number_blocked">%1$s bloqueado</string>
+  <string name="snackbar_number_unblocked">%1$sdesbloqueado</string>
+  <string name="send_to_voicemail_import_failed">Falha ao importar</string>
+  <string name="call_blocking_disabled_notification_title">Bloqueio de chamadas desativado durante 48 horas</string>
+  <string name="call_blocking_disabled_notification_text">Desativado porque foi efetuada uma chamada de emergência.</string>
 </resources>
diff --git a/java/com/android/dialer/blocking/res/values-pt/strings.xml b/java/com/android/dialer/blocking/res/values-pt/strings.xml
index 16d719f..cfe3dc0 100644
--- a/java/com/android/dialer/blocking/res/values-pt/strings.xml
+++ b/java/com/android/dialer/blocking/res/values-pt/strings.xml
@@ -1,46 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="migrate_blocked_numbers_dialog_title" msgid="7823962296457673809">"Novo bloqueio simplificado"</string>
-    <string name="migrate_blocked_numbers_dialog_message" msgid="8309736147266462485">"Para aumentar sua proteção, é preciso alterar o modo como o bloqueio funciona no smartphone. Os números bloqueados agora impedirão chamadas e mensagens de texto, e será possível compartilhá-los com outros apps."</string>
-    <string name="migrate_blocked_numbers_dialog_allow_button" msgid="5192836471557751367">"Permitir"</string>
-    <string name="block_number_confirmation_title" msgid="2699521227461376076">"Bloquear <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="block_number_confirmation_message_vvm" msgid="6501105244172290939">"Chamadas feitas a partir deste número serão bloqueadas. Correios de voz serão excluídos automaticamente."</string>
-    <string name="block_number_confirmation_message_no_vvm" msgid="8236641245709649882">"Chamadas feitas a partir deste número serão bloqueadas, mas é possível que o autor ainda consiga deixar correios de voz para você."</string>
-    <string name="block_number_confirmation_message_new_filtering" msgid="8487449683723062644">"Você não receberá mais chamadas ou mensagens de texto deste número."</string>
-    <string name="block_number_ok" msgid="739786082788038932">"BLOQUEAR"</string>
-    <string name="unblock_number_confirmation_title" msgid="7897778825085659941">"Desbloquear <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="unblock_number_ok" msgid="5089057152966269355">"DESBLOQUEAR"</string>
-    <string name="invalidNumber" msgid="6270918250761754967">"O número <xliff:g id="NUMBER">%1$s</xliff:g> é inválido."</string>
-    <string name="snackbar_number_blocked" msgid="5760234822413921845">"Número <xliff:g id="NUMBER">%1$s</xliff:g> bloqueado"</string>
-    <string name="snackbar_number_unblocked" msgid="7941296274123990585">"Número <xliff:g id="NUMBER">%1$s</xliff:g> desbloqueado"</string>
-    <string name="block_number_undo" msgid="5158120911892491697">"DESFAZER"</string>
-    <string name="send_to_voicemail_import_failed" msgid="1012752662074208237">"Falha na importação"</string>
-    <string name="call_blocking_disabled_notification_title" msgid="7211352205255347489">"Bloqueio de chamadas desativado por 48 horas"</string>
-    <string name="call_blocking_disabled_notification_text" msgid="141384084865180722">"Desativado porque foi feita uma chamada de emergência."</string>
-    <string name="block_report_number_alert_title" msgid="2740581989824959611">"Bloquear <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="block_report_number_alert_details" msgid="2652479394593143562">"Você não receberá mais chamadas deste número."</string>
-    <string name="block_number_alert_details" msgid="715942751312046429">"<xliff:g id="TEXT">%1$s</xliff:g> Esta chamada será denunciada como spam."</string>
-    <string name="unblock_number_alert_details" msgid="8696070817026870606">"O número será desbloqueado e identificado como não sendo spam. As chamadas futuras não serão identificadas como spam."</string>
-    <string name="unblock_report_number_alert_title" msgid="2221901995393696882">"Desbloquear <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="report_not_spam_alert_button" msgid="3244953565919894995">"Informar"</string>
-    <string name="report_not_spam_alert_title" msgid="395961923213504916">"Quer informar um erro?"</string>
-    <string name="report_not_spam_alert_details" msgid="4463730683530824797">"As chamadas futuras de <xliff:g id="NUMBER">%1$s</xliff:g> não serão mais identificadas como spam."</string>
-    <string name="checkbox_report_as_spam_action" msgid="1549159682170273798">"Denunciar chamada como spam"</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="migrate_blocked_numbers_dialog_title">Novo bloqueio simplificado</string>
+  <string name="migrate_blocked_numbers_dialog_message">Para aumentar sua proteção, é preciso alterar o modo como o bloqueio funciona no smartphone. Os números bloqueados agora impedirão chamadas e mensagens de texto, e será possível compartilhá-los com outros apps.</string>
+  <string name="migrate_blocked_numbers_dialog_allow_button">Permitir</string>
+  <string name="old_block_number_confirmation_title">Bloquear %1$s?</string>
+  <string name="block_number_confirmation_message_vvm">Chamadas feitas a partir deste número serão bloqueadas. Correios de voz serão excluídos automaticamente.</string>
+  <string name="block_number_confirmation_message_no_vvm">Chamadas feitas a partir deste número serão bloqueadas, mas é possível que o autor ainda consiga deixar correios de voz para você.</string>
+  <string name="block_number_confirmation_message_new_filtering">Você não receberá mais chamadas ou mensagens de texto deste número.</string>
+  <string name="block_number_ok">BLOQUEAR</string>
+  <string name="unblock_number_confirmation_title">Desbloquear %1$s?</string>
+  <string name="unblock_number_ok">DESBLOQUEAR</string>
+  <string name="invalidNumber">O número %1$s é inválido.</string>
+  <string name="snackbar_number_blocked">Número %1$s bloqueado</string>
+  <string name="snackbar_number_unblocked">O número %1$s foi desbloqueado</string>
+  <string name="send_to_voicemail_import_failed">Falha na importação</string>
+  <string name="call_blocking_disabled_notification_title">Bloqueio de chamadas desativado por 48 horas</string>
+  <string name="call_blocking_disabled_notification_text">Desativado porque foi feita uma chamada de emergência.</string>
 </resources>
diff --git a/java/com/android/dialer/blocking/res/values-ro/strings.xml b/java/com/android/dialer/blocking/res/values-ro/strings.xml
index 631090e..bbcb8e7 100644
--- a/java/com/android/dialer/blocking/res/values-ro/strings.xml
+++ b/java/com/android/dialer/blocking/res/values-ro/strings.xml
@@ -1,46 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="migrate_blocked_numbers_dialog_title" msgid="7823962296457673809">"Mod de blocare nou, mai simplu"</string>
-    <string name="migrate_blocked_numbers_dialog_message" msgid="8309736147266462485">"Pentru a vă proteja mai bine, aplicația Telefon trebuie să schimbe modul în care funcționează blocarea. Se vor opri apelurile și mesajele text de la numerele blocate, iar la acestea pot avea acces și alte aplicații."</string>
-    <string name="migrate_blocked_numbers_dialog_allow_button" msgid="5192836471557751367">"Permiteți"</string>
-    <string name="block_number_confirmation_title" msgid="2699521227461376076">"Blocați <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="block_number_confirmation_message_vvm" msgid="6501105244172290939">"Apelurile de la acest număr vor fi blocate, iar mesajele vocale vor fi șterse automat."</string>
-    <string name="block_number_confirmation_message_no_vvm" msgid="8236641245709649882">"Apelurile de la acest număr vor fi blocate, dar apelantul va putea totuși să vă lase mesaje vocale."</string>
-    <string name="block_number_confirmation_message_new_filtering" msgid="8487449683723062644">"Nu veți mai primi apeluri sau mesaje text de la acest număr."</string>
-    <string name="block_number_ok" msgid="739786082788038932">"BLOCAȚI"</string>
-    <string name="unblock_number_confirmation_title" msgid="7897778825085659941">"Deblocați <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="unblock_number_ok" msgid="5089057152966269355">"DEBLOCAȚI"</string>
-    <string name="invalidNumber" msgid="6270918250761754967">"<xliff:g id="NUMBER">%1$s</xliff:g> nu este valid."</string>
-    <string name="snackbar_number_blocked" msgid="5760234822413921845">"<xliff:g id="NUMBER">%1$s</xliff:g> a fost blocat"</string>
-    <string name="snackbar_number_unblocked" msgid="7941296274123990585">"<xliff:g id="NUMBER">%1$s</xliff:g> a fost deblocat"</string>
-    <string name="block_number_undo" msgid="5158120911892491697">"ANULAȚI"</string>
-    <string name="send_to_voicemail_import_failed" msgid="1012752662074208237">"Importul nu a reușit"</string>
-    <string name="call_blocking_disabled_notification_title" msgid="7211352205255347489">"Blocarea apelurilor este dezactivată pentru 48 de ore"</string>
-    <string name="call_blocking_disabled_notification_text" msgid="141384084865180722">"Dezactivată din cauza efectuării unui apel de urgență."</string>
-    <string name="block_report_number_alert_title" msgid="2740581989824959611">"Blocați <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="block_report_number_alert_details" msgid="2652479394593143562">"Nu veți mai primi apeluri de la acest număr."</string>
-    <string name="block_number_alert_details" msgid="715942751312046429">"<xliff:g id="TEXT">%1$s</xliff:g> Acest apel va fi raportat ca spam."</string>
-    <string name="unblock_number_alert_details" msgid="8696070817026870606">"Acest număr va fi deblocat și raportat ca nefiind spam. Apelurile viitoare nu vor fi considerate spam."</string>
-    <string name="unblock_report_number_alert_title" msgid="2221901995393696882">"Deblocați <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="report_not_spam_alert_button" msgid="3244953565919894995">"Raportați"</string>
-    <string name="report_not_spam_alert_title" msgid="395961923213504916">"Raportați o greșeală?"</string>
-    <string name="report_not_spam_alert_details" msgid="4463730683530824797">"Apelurile viitoare de la <xliff:g id="NUMBER">%1$s</xliff:g> nu vor mai fi identificate ca spam."</string>
-    <string name="checkbox_report_as_spam_action" msgid="1549159682170273798">"Raportați apelul ca spam"</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="migrate_blocked_numbers_dialog_title">Mod de blocare nou, mai simplu</string>
+  <string name="migrate_blocked_numbers_dialog_message">Pentru a vă proteja mai bine, aplicația Telefon trebuie să schimbe modul în care funcționează blocarea. Se vor opri apelurile și mesajele text de la numerele blocate, iar la acestea pot avea acces și alte aplicații.</string>
+  <string name="migrate_blocked_numbers_dialog_allow_button">Permiteți</string>
+  <string name="old_block_number_confirmation_title">Blocați %1$s?</string>
+  <string name="block_number_confirmation_message_vvm">Apelurile de la acest număr vor fi blocate, iar mesajele vocale vor fi șterse automat.</string>
+  <string name="block_number_confirmation_message_no_vvm">Apelurile de la acest număr vor fi blocate, dar apelantul va putea totuși să vă lase mesaje vocale.</string>
+  <string name="block_number_confirmation_message_new_filtering">Nu veți mai primi apeluri sau mesaje text de la acest număr.</string>
+  <string name="block_number_ok">BLOCAȚI</string>
+  <string name="unblock_number_confirmation_title">Deblocați %1$s?</string>
+  <string name="unblock_number_ok">DEBLOCAȚI</string>
+  <string name="invalidNumber">%1$s nu este valid.</string>
+  <string name="snackbar_number_blocked">%1$s a fost blocat</string>
+  <string name="snackbar_number_unblocked">%1$s a fost deblocat.</string>
+  <string name="send_to_voicemail_import_failed">Importul nu a reușit</string>
+  <string name="call_blocking_disabled_notification_title">Blocarea apelurilor este dezactivată pentru 48 de ore</string>
+  <string name="call_blocking_disabled_notification_text">Dezactivată din cauza efectuării unui apel de urgență.</string>
 </resources>
diff --git a/java/com/android/dialer/blocking/res/values-ru/strings.xml b/java/com/android/dialer/blocking/res/values-ru/strings.xml
index accf718..94574bd 100644
--- a/java/com/android/dialer/blocking/res/values-ru/strings.xml
+++ b/java/com/android/dialer/blocking/res/values-ru/strings.xml
@@ -1,46 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="migrate_blocked_numbers_dialog_title" msgid="7823962296457673809">"Простая блокировка номеров"</string>
-    <string name="migrate_blocked_numbers_dialog_message" msgid="8309736147266462485">"Для более надежной защиты приложению \"Телефон\" требуется изменить настройки блокировки. С заблокированных номеров теперь не будут приниматься звонки и сообщения, а сами номера могут быть предоставлены другим приложениям."</string>
-    <string name="migrate_blocked_numbers_dialog_allow_button" msgid="5192836471557751367">"Разрешить"</string>
-    <string name="block_number_confirmation_title" msgid="2699521227461376076">"Заблокировать <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="block_number_confirmation_message_vvm" msgid="6501105244172290939">"Вызовы с этого номера будут блокироваться, а голосовые сообщения – автоматически удаляться."</string>
-    <string name="block_number_confirmation_message_no_vvm" msgid="8236641245709649882">"Вызовы с этого номера будут блокироваться, но абонент сможет оставлять вам голосовые сообщения."</string>
-    <string name="block_number_confirmation_message_new_filtering" msgid="8487449683723062644">"Вызовы и сообщения с этого номера будут блокироваться."</string>
-    <string name="block_number_ok" msgid="739786082788038932">"БЛОКИРОВАТЬ"</string>
-    <string name="unblock_number_confirmation_title" msgid="7897778825085659941">"Разблокировать <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="unblock_number_ok" msgid="5089057152966269355">"РАЗБЛОКИРОВАТЬ"</string>
-    <string name="invalidNumber" msgid="6270918250761754967">"Номер <xliff:g id="NUMBER">%1$s</xliff:g> недействителен."</string>
-    <string name="snackbar_number_blocked" msgid="5760234822413921845">"Номер <xliff:g id="NUMBER">%1$s</xliff:g> заблокирован"</string>
-    <string name="snackbar_number_unblocked" msgid="7941296274123990585">"Номер <xliff:g id="NUMBER">%1$s</xliff:g> разблокирован"</string>
-    <string name="block_number_undo" msgid="5158120911892491697">"ОТМЕНИТЬ"</string>
-    <string name="send_to_voicemail_import_failed" msgid="1012752662074208237">"Ошибка импорта"</string>
-    <string name="call_blocking_disabled_notification_title" msgid="7211352205255347489">"Блокировка вызовов отключена на 48 часов"</string>
-    <string name="call_blocking_disabled_notification_text" msgid="141384084865180722">"Блокировка звонков отключена из-за экстренного вызова"</string>
-    <string name="block_report_number_alert_title" msgid="2740581989824959611">"Заблокировать <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="block_report_number_alert_details" msgid="2652479394593143562">"Вызовы с этого номера будут блокироваться."</string>
-    <string name="block_number_alert_details" msgid="715942751312046429">"<xliff:g id="TEXT">%1$s</xliff:g> Вы сообщите об этом вызове как о спаме."</string>
-    <string name="unblock_number_alert_details" msgid="8696070817026870606">"Этот номер будет разблокирован. Вы сообщите, что это не спам. Вызовы не будут считаться спамом."</string>
-    <string name="unblock_report_number_alert_title" msgid="2221901995393696882">"Разблокировать <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="report_not_spam_alert_button" msgid="3244953565919894995">"Сообщить"</string>
-    <string name="report_not_spam_alert_title" msgid="395961923213504916">"Сообщить об ошибке?"</string>
-    <string name="report_not_spam_alert_details" msgid="4463730683530824797">"Вызовы с номера <xliff:g id="NUMBER">%1$s</xliff:g> не будут считаться спамом."</string>
-    <string name="checkbox_report_as_spam_action" msgid="1549159682170273798">"Сообщить о вызове как о спаме"</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="migrate_blocked_numbers_dialog_title">Простая блокировка номеров</string>
+  <string name="migrate_blocked_numbers_dialog_message">Для более надежной защиты приложению \"Телефон\" требуется изменить настройки блокировки. С заблокированных номеров теперь не будут приниматься звонки и сообщения, а сами номера могут быть предоставлены другим приложениям.</string>
+  <string name="migrate_blocked_numbers_dialog_allow_button">Разрешить</string>
+  <string name="old_block_number_confirmation_title">Заблокировать номер %1$s?</string>
+  <string name="block_number_confirmation_message_vvm">Вызовы с этого номера будут блокироваться, а голосовые сообщения – автоматически удаляться.</string>
+  <string name="block_number_confirmation_message_no_vvm">Вызовы с этого номера будут блокироваться, но абонент сможет оставлять вам голосовые сообщения.</string>
+  <string name="block_number_confirmation_message_new_filtering">Вызовы и сообщения с этого номера будут блокироваться.</string>
+  <string name="block_number_ok">БЛОКИРОВАТЬ</string>
+  <string name="unblock_number_confirmation_title">Разблокировать номер %1$s?</string>
+  <string name="unblock_number_ok">РАЗБЛОКИРОВАТЬ</string>
+  <string name="invalidNumber">Номер %1$s недействителен.</string>
+  <string name="snackbar_number_blocked">Номер %1$s заблокирован</string>
+  <string name="snackbar_number_unblocked">Номер %1$s разблокирован</string>
+  <string name="send_to_voicemail_import_failed">Ошибка импорта</string>
+  <string name="call_blocking_disabled_notification_title">Блокировка вызовов отключена на 48 часов</string>
+  <string name="call_blocking_disabled_notification_text">Блокировка звонков отключена из-за экстренного вызова</string>
 </resources>
diff --git a/java/com/android/dialer/blocking/res/values-si/strings.xml b/java/com/android/dialer/blocking/res/values-si/strings.xml
index ea85e96..229e685 100644
--- a/java/com/android/dialer/blocking/res/values-si/strings.xml
+++ b/java/com/android/dialer/blocking/res/values-si/strings.xml
@@ -1,46 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="migrate_blocked_numbers_dialog_title" msgid="7823962296457673809">"නව, සරල අවහිර කිරීම"</string>
-    <string name="migrate_blocked_numbers_dialog_message" msgid="8309736147266462485">"ඔබව වඩාත් හොඳින් ආරක්ෂා කිරීමට, දුරකථනයට අවහිර කිරීම ක්‍රියා කරන ආකාරය වෙනස් කිරීමට අවශ්‍යයි. ඔබේ අවහිර කළ අංක දැන් ඇමතුම් සහ පෙළ පණිවිඩ යන දෙකම නවත්වනු ඇති අතර වෙනත් යෙදුම් සමග බෙදා ගැනීමට හැකිය."</string>
-    <string name="migrate_blocked_numbers_dialog_allow_button" msgid="5192836471557751367">"ඉඩ දෙන්න"</string>
-    <string name="block_number_confirmation_title" msgid="2699521227461376076">"<xliff:g id="NUMBER">%1$s</xliff:g> අවහිර කරන්නද?"</string>
-    <string name="block_number_confirmation_message_vvm" msgid="6501105244172290939">"මෙම අංකය වෙතින් වන ඇමතුම් අවහිර කරනු ඇති අතර හඬ තැපැල් ස්වයංක්‍රියව මකනු ඇත."</string>
-    <string name="block_number_confirmation_message_no_vvm" msgid="8236641245709649882">"මෙම අංකය වෙතින් වන ඇමතුම් අවහිර කරනු ඇති නමුත්, අමතන්නාට තවම ඔබට හඬ තැපැල් තැබීමට හැකිය."</string>
-    <string name="block_number_confirmation_message_new_filtering" msgid="8487449683723062644">"ඔබට මෙම අංකයෙන් තවදුරටත් ඇමතුම් හෝ පෙළ පණිවිඩ නොලැබෙනු ඇත."</string>
-    <string name="block_number_ok" msgid="739786082788038932">"අවහිරයි"</string>
-    <string name="unblock_number_confirmation_title" msgid="7897778825085659941">"<xliff:g id="NUMBER">%1$s</xliff:g> අවහිර නොකරන්නද?"</string>
-    <string name="unblock_number_ok" msgid="5089057152966269355">"අවහිර නොකරන්න"</string>
-    <string name="invalidNumber" msgid="6270918250761754967">"<xliff:g id="NUMBER">%1$s</xliff:g> වලංගු නැත."</string>
-    <string name="snackbar_number_blocked" msgid="5760234822413921845">"<xliff:g id="NUMBER">%1$s</xliff:g> අවහිරයි"</string>
-    <string name="snackbar_number_unblocked" msgid="7941296274123990585">"<xliff:g id="NUMBER">%1$s</xliff:g> අවහිර නැත"</string>
-    <string name="block_number_undo" msgid="5158120911892491697">"අස් කරන්න"</string>
-    <string name="send_to_voicemail_import_failed" msgid="1012752662074208237">"අයාත කිරීම අසාර්ථක විය"</string>
-    <string name="call_blocking_disabled_notification_title" msgid="7211352205255347489">"පැය 48ක් සඳහා ඇමතුම් අවහිර කිරීම අබල කරන ලදී"</string>
-    <string name="call_blocking_disabled_notification_text" msgid="141384084865180722">"හදිසි ඇමතුමක් සිදු කළ නිසා අබල කරන ලදී."</string>
-    <string name="block_report_number_alert_title" msgid="2740581989824959611">"<xliff:g id="NUMBER">%1$s</xliff:g> අවහිර කරන්නද?"</string>
-    <string name="block_report_number_alert_details" msgid="2652479394593143562">"ඔබට මෙම අංකයෙන් තවදුරටත් ඇමතුම් නොලැබෙනු ඇත."</string>
-    <string name="block_number_alert_details" msgid="715942751312046429">"<xliff:g id="TEXT">%1$s</xliff:g> මෙම ඇමතුම අයාචිත තැපෑලක් ලෙස වාර්තා කරනු ඇත."</string>
-    <string name="unblock_number_alert_details" msgid="8696070817026870606">"මෙම අංකය අවහිර නොකර අයාචිත නොවන ලෙස වාර්තා කරනු ඇත. අනාගත ඇමතුම් අයාචිත ලෙස හඳුනා නොගනු ඇත."</string>
-    <string name="unblock_report_number_alert_title" msgid="2221901995393696882">"<xliff:g id="NUMBER">%1$s</xliff:g> අවහිර නොකරන්නද?"</string>
-    <string name="report_not_spam_alert_button" msgid="3244953565919894995">"වාර්තා කරන්න"</string>
-    <string name="report_not_spam_alert_title" msgid="395961923213504916">"අත්වැරැද්දක් වාර්තා කරන්නද?"</string>
-    <string name="report_not_spam_alert_details" msgid="4463730683530824797">"<xliff:g id="NUMBER">%1$s</xliff:g> වෙතින් එන අනාගත ඇමතුම් තවදුරටත් අයාචිත ලෙස හඳුනා නොගනු ඇත."</string>
-    <string name="checkbox_report_as_spam_action" msgid="1549159682170273798">"ඇමතුම අයාචිත ලෙස වාර්තා කරන්න"</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="migrate_blocked_numbers_dialog_title">නව, සරල අවහිර කිරීම</string>
+  <string name="migrate_blocked_numbers_dialog_message">ඔබව වඩාත් හොඳින් ආරක්ෂා කිරීමට, දුරකථනයට අවහිර කිරීම ක්‍රියා කරන ආකාරය වෙනස් කිරීමට අවශ්‍යයි. ඔබේ අවහිර කළ අංක දැන් ඇමතුම් සහ පෙළ පණිවිඩ යන දෙකම නවත්වනු ඇති අතර වෙනත් යෙදුම් සමග බෙදා ගැනීමට හැකිය.</string>
+  <string name="migrate_blocked_numbers_dialog_allow_button">ඉඩ දෙන්න</string>
+  <string name="old_block_number_confirmation_title">%1$s අවහිර කරන්නද?</string>
+  <string name="block_number_confirmation_message_vvm">මෙම අංකය වෙතින් වන ඇමතුම් අවහිර කරනු ඇති අතර හඬ තැපැල් ස්වයංක්‍රියව මකනු ඇත.</string>
+  <string name="block_number_confirmation_message_no_vvm">මෙම අංකය වෙතින් වන ඇමතුම් අවහිර කරනු ඇති නමුත්, අමතන්නාට තවම ඔබට හඬ තැපැල් තැබීමට හැකිය.</string>
+  <string name="block_number_confirmation_message_new_filtering">ඔබට මෙම අංකයෙන් තවදුරටත් ඇමතුම් හෝ පෙළ පණිවිඩ නොලැබෙනු ඇත.</string>
+  <string name="block_number_ok">අවහිරයි</string>
+  <string name="unblock_number_confirmation_title">%1$s අවහිර කිරීමෙන් ඉවත් කරන්නද?</string>
+  <string name="unblock_number_ok">අවහිර නොකරන්න</string>
+  <string name="invalidNumber">%1$s වලංගු නැත.</string>
+  <string name="snackbar_number_blocked">%1$s අවහිරයි</string>
+  <string name="snackbar_number_unblocked">%1$s අවහිර කිරීමෙන් ඉවත් කරන ලදී</string>
+  <string name="send_to_voicemail_import_failed">අයාත කිරීම අසාර්ථක විය</string>
+  <string name="call_blocking_disabled_notification_title">පැය 48ක් සඳහා ඇමතුම් අවහිර කිරීම අබල කරන ලදී</string>
+  <string name="call_blocking_disabled_notification_text">හදිසි ඇමතුමක් සිදු කළ නිසා අබල කරන ලදී.</string>
 </resources>
diff --git a/java/com/android/dialer/blocking/res/values-sk/strings.xml b/java/com/android/dialer/blocking/res/values-sk/strings.xml
index 628acd0..713c1d9 100644
--- a/java/com/android/dialer/blocking/res/values-sk/strings.xml
+++ b/java/com/android/dialer/blocking/res/values-sk/strings.xml
@@ -1,46 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="migrate_blocked_numbers_dialog_title" msgid="7823962296457673809">"Nové zjednodušené blokovanie"</string>
-    <string name="migrate_blocked_numbers_dialog_message" msgid="8309736147266462485">"V telefóne je potrebné zmeniť spôsob fungovania blokovania. Len tak dosiahnete lepšiu ochranu. Blokované čísla budú brániť prijímaniu hovorov aj textových správ a bude ich možné zdieľať s ďalšími aplikáciami."</string>
-    <string name="migrate_blocked_numbers_dialog_allow_button" msgid="5192836471557751367">"Povoliť"</string>
-    <string name="block_number_confirmation_title" msgid="2699521227461376076">"Blokovať číslo <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="block_number_confirmation_message_vvm" msgid="6501105244172290939">"Hovory z tohto čísla budú blokované a hlasové správy budú automaticky odstraňované."</string>
-    <string name="block_number_confirmation_message_no_vvm" msgid="8236641245709649882">"Hovory z tohto čísla budú zablokované, ale volajúci stále môže zanechať hlasové správy."</string>
-    <string name="block_number_confirmation_message_new_filtering" msgid="8487449683723062644">"Z tohto čísla už nebudete prijímať hovory ani textové správy."</string>
-    <string name="block_number_ok" msgid="739786082788038932">"BLOKOVAŤ"</string>
-    <string name="unblock_number_confirmation_title" msgid="7897778825085659941">"Odblokovať číslo <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="unblock_number_ok" msgid="5089057152966269355">"ODBLOKOVAŤ"</string>
-    <string name="invalidNumber" msgid="6270918250761754967">"Číslo <xliff:g id="NUMBER">%1$s</xliff:g> je neplatné."</string>
-    <string name="snackbar_number_blocked" msgid="5760234822413921845">"<xliff:g id="NUMBER">%1$s</xliff:g> – blokované"</string>
-    <string name="snackbar_number_unblocked" msgid="7941296274123990585">"<xliff:g id="NUMBER">%1$s</xliff:g> – odblokované"</string>
-    <string name="block_number_undo" msgid="5158120911892491697">"SPÄŤ"</string>
-    <string name="send_to_voicemail_import_failed" msgid="1012752662074208237">"Import zlyhal"</string>
-    <string name="call_blocking_disabled_notification_title" msgid="7211352205255347489">"Blokovanie hovorov je deaktivované na 48 hodín"</string>
-    <string name="call_blocking_disabled_notification_text" msgid="141384084865180722">"Deaktivované, pretože ste uskutočnili tiesňové volanie"</string>
-    <string name="block_report_number_alert_title" msgid="2740581989824959611">"Blokovať číslo <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="block_report_number_alert_details" msgid="2652479394593143562">"Z tohto čísla už nebudete dostávať hovory."</string>
-    <string name="block_number_alert_details" msgid="715942751312046429">"<xliff:g id="TEXT">%1$s</xliff:g> Tento hovor bude nahlásený ako spam."</string>
-    <string name="unblock_number_alert_details" msgid="8696070817026870606">"Číslo bude odblokované a nahlásené, že nie je spam. Budúce hovory nebudú identifikované ako spam."</string>
-    <string name="unblock_report_number_alert_title" msgid="2221901995393696882">"Odblokovať číslo <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="report_not_spam_alert_button" msgid="3244953565919894995">"Nahlásiť"</string>
-    <string name="report_not_spam_alert_title" msgid="395961923213504916">"Nahlásiť chybu?"</string>
-    <string name="report_not_spam_alert_details" msgid="4463730683530824797">"Budúce hovory z čísla <xliff:g id="NUMBER">%1$s</xliff:g> už nebudú identifikované ako spam."</string>
-    <string name="checkbox_report_as_spam_action" msgid="1549159682170273798">"Nahlásiť hovor ako spam"</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="migrate_blocked_numbers_dialog_title">Nové zjednodušené blokovanie</string>
+  <string name="migrate_blocked_numbers_dialog_message">V telefóne je potrebné zmeniť spôsob fungovania blokovania. Len tak dosiahnete lepšiu ochranu. Blokované čísla budú brániť prijímaniu hovorov aj textových správ a bude ich možné zdieľať s ďalšími aplikáciami.</string>
+  <string name="migrate_blocked_numbers_dialog_allow_button">Povoliť</string>
+  <string name="old_block_number_confirmation_title">Chcete blokovať číslo %1$s?</string>
+  <string name="block_number_confirmation_message_vvm">Hovory z tohto čísla budú blokované a hlasové správy budú automaticky odstraňované.</string>
+  <string name="block_number_confirmation_message_no_vvm">Hovory z tohto čísla budú zablokované, ale volajúci stále môže zanechať hlasové správy.</string>
+  <string name="block_number_confirmation_message_new_filtering">Z tohto čísla už nebudete prijímať hovory ani textové správy.</string>
+  <string name="block_number_ok">BLOKOVAŤ</string>
+  <string name="unblock_number_confirmation_title">Chcete odblokovať číslo %1$s?</string>
+  <string name="unblock_number_ok">ODBLOKOVAŤ</string>
+  <string name="invalidNumber">Číslo %1$s je neplatné.</string>
+  <string name="snackbar_number_blocked">%1$s – blokované</string>
+  <string name="snackbar_number_unblocked">Číslo %1$s bolo odblokované</string>
+  <string name="send_to_voicemail_import_failed">Import zlyhal</string>
+  <string name="call_blocking_disabled_notification_title">Blokovanie hovorov je deaktivované na 48 hodín</string>
+  <string name="call_blocking_disabled_notification_text">Deaktivované, pretože ste uskutočnili tiesňové volanie</string>
 </resources>
diff --git a/java/com/android/dialer/blocking/res/values-sl/strings.xml b/java/com/android/dialer/blocking/res/values-sl/strings.xml
index bdc3b12..76253ca 100644
--- a/java/com/android/dialer/blocking/res/values-sl/strings.xml
+++ b/java/com/android/dialer/blocking/res/values-sl/strings.xml
@@ -1,46 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="migrate_blocked_numbers_dialog_title" msgid="7823962296457673809">"Novo poenostavljeno blokiranje"</string>
-    <string name="migrate_blocked_numbers_dialog_message" msgid="8309736147266462485">"Za večjo varnost je treba v aplikaciji Telefon spremeniti nastavitev načina blokiranja. Tako z blokiranih številk ne boste več prejemali klicev in sporočil, poleg tega pa lahko take številke posredujete tudi v druge aplikacije."</string>
-    <string name="migrate_blocked_numbers_dialog_allow_button" msgid="5192836471557751367">"Dovoli"</string>
-    <string name="block_number_confirmation_title" msgid="2699521227461376076">"Želite blokirati številko <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="block_number_confirmation_message_vvm" msgid="6501105244172290939">"Klici s te številke bodo blokirani in sporočila v odzivniku bodo samodejno izbrisana."</string>
-    <string name="block_number_confirmation_message_no_vvm" msgid="8236641245709649882">"Klici s te številke bodo blokirani, klicatelj pa bo morda še vedno lahko pustil sporočila v odzivniku."</string>
-    <string name="block_number_confirmation_message_new_filtering" msgid="8487449683723062644">"S te številke ne boste več prejemali klicev ali sporočil SMS."</string>
-    <string name="block_number_ok" msgid="739786082788038932">"BLOKIRAJ"</string>
-    <string name="unblock_number_confirmation_title" msgid="7897778825085659941">"Želite odblokirati številko <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="unblock_number_ok" msgid="5089057152966269355">"ODBLOKIRAJ"</string>
-    <string name="invalidNumber" msgid="6270918250761754967">"Telefonska številka <xliff:g id="NUMBER">%1$s</xliff:g> je neveljavna."</string>
-    <string name="snackbar_number_blocked" msgid="5760234822413921845">"Številka <xliff:g id="NUMBER">%1$s</xliff:g> je blokirana"</string>
-    <string name="snackbar_number_unblocked" msgid="7941296274123990585">"Številka <xliff:g id="NUMBER">%1$s</xliff:g> je odblokirana"</string>
-    <string name="block_number_undo" msgid="5158120911892491697">"RAZVELJAVI"</string>
-    <string name="send_to_voicemail_import_failed" msgid="1012752662074208237">"Uvoz ni uspel"</string>
-    <string name="call_blocking_disabled_notification_title" msgid="7211352205255347489">"Blokiranje klicev je onemogočeno za 48 ur"</string>
-    <string name="call_blocking_disabled_notification_text" msgid="141384084865180722">"Onemogočeno zaradi opravljenega klica v sili"</string>
-    <string name="block_report_number_alert_title" msgid="2740581989824959611">"Želite blokirati številko <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="block_report_number_alert_details" msgid="2652479394593143562">"Ne boste več prejemali klicev s te številke."</string>
-    <string name="block_number_alert_details" msgid="715942751312046429">"<xliff:g id="TEXT">%1$s</xliff:g> Ta klic bo prijavljen kot neželen."</string>
-    <string name="unblock_number_alert_details" msgid="8696070817026870606">"Številka bo odblokirana in ne bo obravnavana kot neželena. Klici ne bodo več zaznani kot neželeni."</string>
-    <string name="unblock_report_number_alert_title" msgid="2221901995393696882">"Želite odblokirati številko <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="report_not_spam_alert_button" msgid="3244953565919894995">"Prijavi"</string>
-    <string name="report_not_spam_alert_title" msgid="395961923213504916">"Želite prijaviti napako?"</string>
-    <string name="report_not_spam_alert_details" msgid="4463730683530824797">"Prihodnji klici s številke <xliff:g id="NUMBER">%1$s</xliff:g> ne bodo več prepoznani kot neželeni."</string>
-    <string name="checkbox_report_as_spam_action" msgid="1549159682170273798">"Prijavi kot neželeni klic"</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="migrate_blocked_numbers_dialog_title">Novo poenostavljeno blokiranje</string>
+  <string name="migrate_blocked_numbers_dialog_message">Za večjo varnost je treba v aplikaciji Telefon spremeniti nastavitev načina blokiranja. Tako z blokiranih številk ne boste več prejemali klicev in sporočil, poleg tega pa lahko take številke posredujete tudi v druge aplikacije.</string>
+  <string name="migrate_blocked_numbers_dialog_allow_button">Dovoli</string>
+  <string name="old_block_number_confirmation_title">Želite blokirati številko %1$s?</string>
+  <string name="block_number_confirmation_message_vvm">Klici s te številke bodo blokirani in sporočila v odzivniku bodo samodejno izbrisana.</string>
+  <string name="block_number_confirmation_message_no_vvm">Klici s te številke bodo blokirani, klicatelj pa bo morda še vedno lahko pustil sporočila v odzivniku.</string>
+  <string name="block_number_confirmation_message_new_filtering">S te številke ne boste več prejemali klicev ali sporočil SMS.</string>
+  <string name="block_number_ok">BLOKIRAJ</string>
+  <string name="unblock_number_confirmation_title">Želite odblokirati številko %1$s?</string>
+  <string name="unblock_number_ok">ODBLOKIRAJ</string>
+  <string name="invalidNumber">Številka %1$s je neveljavna.</string>
+  <string name="snackbar_number_blocked">Številka %1$s je blokirana</string>
+  <string name="snackbar_number_unblocked">Številka %1$s je odblokirana</string>
+  <string name="send_to_voicemail_import_failed">Uvoz ni uspel</string>
+  <string name="call_blocking_disabled_notification_title">Blokiranje klicev je onemogočeno za 48 ur</string>
+  <string name="call_blocking_disabled_notification_text">Onemogočeno zaradi opravljenega klica v sili</string>
 </resources>
diff --git a/java/com/android/dialer/blocking/res/values-sq/strings.xml b/java/com/android/dialer/blocking/res/values-sq/strings.xml
index 2a3dbb5..0630303 100644
--- a/java/com/android/dialer/blocking/res/values-sq/strings.xml
+++ b/java/com/android/dialer/blocking/res/values-sq/strings.xml
@@ -1,46 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="migrate_blocked_numbers_dialog_title" msgid="7823962296457673809">"Bllokim i ri i thjeshtëzuar"</string>
-    <string name="migrate_blocked_numbers_dialog_message" msgid="8309736147266462485">"Për të të mbrojtur më mirë, Telefoni ka nevojë të ndryshojë mënyrën se si funksionon bllokimi. Numrat e bllokuar tani do të ndalojnë si telefonatat ashtu edhe mesazhet me tekst dhe mund të ndahen me aplikacione të tjera."</string>
-    <string name="migrate_blocked_numbers_dialog_allow_button" msgid="5192836471557751367">"Lejo"</string>
-    <string name="block_number_confirmation_title" msgid="2699521227461376076">"Blloko <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="block_number_confirmation_message_vvm" msgid="6501105244172290939">"Telefonatat nga ky numër do të bllokohen dhe mesazhet zanore do të fshihen automatikisht."</string>
-    <string name="block_number_confirmation_message_no_vvm" msgid="8236641245709649882">"Telefonatat nga ky numër do të bllokohen, por telefonuesi mund të jetë ende në gjendje të lërë mesazhe zanore."</string>
-    <string name="block_number_confirmation_message_new_filtering" msgid="8487449683723062644">"Nuk do të marrësh më telefonata apo mesazhe me tekst nga ky numër."</string>
-    <string name="block_number_ok" msgid="739786082788038932">"BLLOKO"</string>
-    <string name="unblock_number_confirmation_title" msgid="7897778825085659941">"Zhblloko <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="unblock_number_ok" msgid="5089057152966269355">"ZHBLLOKO"</string>
-    <string name="invalidNumber" msgid="6270918250761754967">"<xliff:g id="NUMBER">%1$s</xliff:g> është i pavlefshëm."</string>
-    <string name="snackbar_number_blocked" msgid="5760234822413921845">"<xliff:g id="NUMBER">%1$s</xliff:g> u bllokua"</string>
-    <string name="snackbar_number_unblocked" msgid="7941296274123990585">"<xliff:g id="NUMBER">%1$s</xliff:g> u zhbllokua"</string>
-    <string name="block_number_undo" msgid="5158120911892491697">"ZHBËJ"</string>
-    <string name="send_to_voicemail_import_failed" msgid="1012752662074208237">"Importimi dështoi"</string>
-    <string name="call_blocking_disabled_notification_title" msgid="7211352205255347489">"Bllokimi i thirrjeve është çaktivizuar për 48 orë"</string>
-    <string name="call_blocking_disabled_notification_text" msgid="141384084865180722">"Është e çaktivizuar për shkak se është kryer një telefonatë urgjence."</string>
-    <string name="block_report_number_alert_title" msgid="2740581989824959611">"Blloko <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="block_report_number_alert_details" msgid="2652479394593143562">"Nuk do të marrësh më telefonata nga ky numër."</string>
-    <string name="block_number_alert_details" msgid="715942751312046429">"<xliff:g id="TEXT">%1$s</xliff:g> Kjo telefonatë do të raportohet si e padëshiruar."</string>
-    <string name="unblock_number_alert_details" msgid="8696070817026870606">"Ky numër do të zhbllokohet dhe nuk do të raportohet si i padëshiruar. Telefonatat në të ardhmen nuk do të identifikohen si të padëshiruara."</string>
-    <string name="unblock_report_number_alert_title" msgid="2221901995393696882">"Zhblloko <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="report_not_spam_alert_button" msgid="3244953565919894995">"Raporto"</string>
-    <string name="report_not_spam_alert_title" msgid="395961923213504916">"Të raportohet një gabim?"</string>
-    <string name="report_not_spam_alert_details" msgid="4463730683530824797">"Telefonatat në të ardhmen nga <xliff:g id="NUMBER">%1$s</xliff:g> nuk do të identifikohen si të padëshiruara."</string>
-    <string name="checkbox_report_as_spam_action" msgid="1549159682170273798">"Raporto thirrjen e padëshiruar"</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="migrate_blocked_numbers_dialog_title">Bllokim i ri i thjeshtëzuar</string>
+  <string name="migrate_blocked_numbers_dialog_message">Për të të mbrojtur më mirë, Telefoni ka nevojë të ndryshojë mënyrën se si funksionon bllokimi. Numrat e bllokuar tani do të ndalojnë si telefonatat ashtu edhe mesazhet me tekst dhe mund të ndahen me aplikacione të tjera.</string>
+  <string name="migrate_blocked_numbers_dialog_allow_button">Lejo</string>
+  <string name="old_block_number_confirmation_title">Të bllokohet %1$s?</string>
+  <string name="block_number_confirmation_message_vvm">Telefonatat nga ky numër do të bllokohen dhe mesazhet zanore do të fshihen automatikisht.</string>
+  <string name="block_number_confirmation_message_no_vvm">Telefonatat nga ky numër do të bllokohen, por telefonuesi mund të jetë ende në gjendje të lërë mesazhe zanore.</string>
+  <string name="block_number_confirmation_message_new_filtering">Nuk do të marrësh më telefonata apo mesazhe me tekst nga ky numër.</string>
+  <string name="block_number_ok">BLLOKO</string>
+  <string name="unblock_number_confirmation_title">Të zhbllokohet %1$s?</string>
+  <string name="unblock_number_ok">ZHBLLOKO</string>
+  <string name="invalidNumber">%1$s është i pavlefshëm.</string>
+  <string name="snackbar_number_blocked">%1$s u bllokua</string>
+  <string name="snackbar_number_unblocked">%1$s u zhbllokua</string>
+  <string name="send_to_voicemail_import_failed">Importimi dështoi</string>
+  <string name="call_blocking_disabled_notification_title">Bllokimi i thirrjeve është çaktivizuar për 48 orë</string>
+  <string name="call_blocking_disabled_notification_text">Është e çaktivizuar për shkak se është kryer një telefonatë urgjence.</string>
 </resources>
diff --git a/java/com/android/dialer/blocking/res/values-sr/strings.xml b/java/com/android/dialer/blocking/res/values-sr/strings.xml
index 6736028..6442412 100644
--- a/java/com/android/dialer/blocking/res/values-sr/strings.xml
+++ b/java/com/android/dialer/blocking/res/values-sr/strings.xml
@@ -1,46 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="migrate_blocked_numbers_dialog_title" msgid="7823962296457673809">"Ново, једноставније блокирање"</string>
-    <string name="migrate_blocked_numbers_dialog_message" msgid="8309736147266462485">"Телефон треба да промени начин на који блокирање функционише да би вам пружио бољу заштиту. Са блокираних бројева више нећете примати ни позиве ни SMS-ове, али можете да их делите са другим апликацијама."</string>
-    <string name="migrate_blocked_numbers_dialog_allow_button" msgid="5192836471557751367">"Дозволи"</string>
-    <string name="block_number_confirmation_title" msgid="2699521227461376076">"Желите ли да блокирате <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="block_number_confirmation_message_vvm" msgid="6501105244172290939">"Позиви са овог броја ће бити блокирани и поруке говорне поште ће се аутоматски брисати."</string>
-    <string name="block_number_confirmation_message_no_vvm" msgid="8236641245709649882">"Позиви са овог броја ће бити блокирани, али позивалац и даље може да вам оставља поруке говорне поште."</string>
-    <string name="block_number_confirmation_message_new_filtering" msgid="8487449683723062644">"Више нећете примати позиве ни SMS-ове са овог броја."</string>
-    <string name="block_number_ok" msgid="739786082788038932">"БЛОКИРАЈ"</string>
-    <string name="unblock_number_confirmation_title" msgid="7897778825085659941">"Желите ли да деблокирате <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="unblock_number_ok" msgid="5089057152966269355">"ДЕБЛОКИРАЈ"</string>
-    <string name="invalidNumber" msgid="6270918250761754967">"<xliff:g id="NUMBER">%1$s</xliff:g> је неважећи."</string>
-    <string name="snackbar_number_blocked" msgid="5760234822413921845">"<xliff:g id="NUMBER">%1$s</xliff:g> је блокиран"</string>
-    <string name="snackbar_number_unblocked" msgid="7941296274123990585">"<xliff:g id="NUMBER">%1$s</xliff:g> је деблокиран"</string>
-    <string name="block_number_undo" msgid="5158120911892491697">"ОПОЗОВИ"</string>
-    <string name="send_to_voicemail_import_failed" msgid="1012752662074208237">"Увоз није успео"</string>
-    <string name="call_blocking_disabled_notification_title" msgid="7211352205255347489">"Блокирање позива је онемогућено на 48 сати"</string>
-    <string name="call_blocking_disabled_notification_text" msgid="141384084865180722">"Онемогућено је зато што је упућен хитан позив."</string>
-    <string name="block_report_number_alert_title" msgid="2740581989824959611">"Желите ли да блокирате <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="block_report_number_alert_details" msgid="2652479394593143562">"Више нећете примати позиве са овог броја."</string>
-    <string name="block_number_alert_details" msgid="715942751312046429">"<xliff:g id="TEXT">%1$s</xliff:g> Пријавићемо овај позив као непожељан."</string>
-    <string name="unblock_number_alert_details" msgid="8696070817026870606">"Деблокираћемо број и пријавити да није непожељан. Bудући позиви неће бити означавани као непожељни."</string>
-    <string name="unblock_report_number_alert_title" msgid="2221901995393696882">"Желите ли да деблокирате <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="report_not_spam_alert_button" msgid="3244953565919894995">"Пријави"</string>
-    <string name="report_not_spam_alert_title" msgid="395961923213504916">"Желите да пријавите грешку?"</string>
-    <string name="report_not_spam_alert_details" msgid="4463730683530824797">"Будући позиви са <xliff:g id="NUMBER">%1$s</xliff:g> више неће бити означавани као непожељни."</string>
-    <string name="checkbox_report_as_spam_action" msgid="1549159682170273798">"Пријави позив као непожељан"</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="migrate_blocked_numbers_dialog_title">Ново, једноставније блокирање</string>
+  <string name="migrate_blocked_numbers_dialog_message">Телефон треба да промени начин на који блокирање функционише да би вам пружио бољу заштиту. Са блокираних бројева више нећете примати ни позиве ни SMS-ове, али можете да их делите са другим апликацијама.</string>
+  <string name="migrate_blocked_numbers_dialog_allow_button">Дозволи</string>
+  <string name="old_block_number_confirmation_title">Желите ли да блокирате %1$s?</string>
+  <string name="block_number_confirmation_message_vvm">Позиви са овог броја ће бити блокирани и поруке говорне поште ће се аутоматски брисати.</string>
+  <string name="block_number_confirmation_message_no_vvm">Позиви са овог броја ће бити блокирани, али позивалац и даље може да вам оставља поруке говорне поште.</string>
+  <string name="block_number_confirmation_message_new_filtering">Више нећете примати позиве ни SMS-ове са овог броја.</string>
+  <string name="block_number_ok">БЛОКИРАЈ</string>
+  <string name="unblock_number_confirmation_title">Желите ли да деблокирате %1$s?</string>
+  <string name="unblock_number_ok">ДЕБЛОКИРАЈ</string>
+  <string name="invalidNumber">%1$s је неважећи.</string>
+  <string name="snackbar_number_blocked">%1$s је блокиран</string>
+  <string name="snackbar_number_unblocked">%1$s је деблокиран</string>
+  <string name="send_to_voicemail_import_failed">Увоз није успео</string>
+  <string name="call_blocking_disabled_notification_title">Блокирање позива је онемогућено на 48 сати</string>
+  <string name="call_blocking_disabled_notification_text">Онемогућено је зато што је упућен хитан позив.</string>
 </resources>
diff --git a/java/com/android/dialer/blocking/res/values-sv/strings.xml b/java/com/android/dialer/blocking/res/values-sv/strings.xml
index d440d68..5cb7229 100644
--- a/java/com/android/dialer/blocking/res/values-sv/strings.xml
+++ b/java/com/android/dialer/blocking/res/values-sv/strings.xml
@@ -1,46 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="migrate_blocked_numbers_dialog_title" msgid="7823962296457673809">"En ny, enklare blockering"</string>
-    <string name="migrate_blocked_numbers_dialog_message" msgid="8309736147266462485">"För bättre skydd måste mobilen ändra blockeringsfunktionen. Samtal eller sms från blockerade nummer stoppas och inställningarna går att dela med andra appar."</string>
-    <string name="migrate_blocked_numbers_dialog_allow_button" msgid="5192836471557751367">"Tillåt"</string>
-    <string name="block_number_confirmation_title" msgid="2699521227461376076">"Vill du blockera <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="block_number_confirmation_message_vvm" msgid="6501105244172290939">"Samtal från det här numret blockeras och röstmeddelanden raderas automatiskt."</string>
-    <string name="block_number_confirmation_message_no_vvm" msgid="8236641245709649882">"Samtal från det här numret blockeras, men det kan fortfarande gå att lämna ett röstmeddelande."</string>
-    <string name="block_number_confirmation_message_new_filtering" msgid="8487449683723062644">"Du får inte längre samtal eller sms från det här numret."</string>
-    <string name="block_number_ok" msgid="739786082788038932">"BLOCKERA"</string>
-    <string name="unblock_number_confirmation_title" msgid="7897778825085659941">"Vill du häva blockeringen av <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="unblock_number_ok" msgid="5089057152966269355">"HÄV BLOCKERINGEN"</string>
-    <string name="invalidNumber" msgid="6270918250761754967">"<xliff:g id="NUMBER">%1$s</xliff:g> är inte giltigt."</string>
-    <string name="snackbar_number_blocked" msgid="5760234822413921845">"<xliff:g id="NUMBER">%1$s</xliff:g> har blockerats"</string>
-    <string name="snackbar_number_unblocked" msgid="7941296274123990585">"Blockeringen av <xliff:g id="NUMBER">%1$s</xliff:g> har hävts"</string>
-    <string name="block_number_undo" msgid="5158120911892491697">"ÅNGRA"</string>
-    <string name="send_to_voicemail_import_failed" msgid="1012752662074208237">"Det gick inte att importera"</string>
-    <string name="call_blocking_disabled_notification_title" msgid="7211352205255347489">"Samtalsblockeringen har inaktiverats i 48 timmar"</string>
-    <string name="call_blocking_disabled_notification_text" msgid="141384084865180722">"Inaktiverades därför att enheten har använts för ett nödsamtal."</string>
-    <string name="block_report_number_alert_title" msgid="2740581989824959611">"Vill du blockera <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="block_report_number_alert_details" msgid="2652479394593143562">"Du får inte längre samtal från det här numret."</string>
-    <string name="block_number_alert_details" msgid="715942751312046429">"<xliff:g id="TEXT">%1$s</xliff:g> Det här samtalet rapporteras som spam."</string>
-    <string name="unblock_number_alert_details" msgid="8696070817026870606">"Numret avblockeras och rapporteras inte som spam. Framtida samtal identifieras inte som spam."</string>
-    <string name="unblock_report_number_alert_title" msgid="2221901995393696882">"Vill du häva blockeringen av <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="report_not_spam_alert_button" msgid="3244953565919894995">"Rapportera"</string>
-    <string name="report_not_spam_alert_title" msgid="395961923213504916">"Rapportera ett misstag?"</string>
-    <string name="report_not_spam_alert_details" msgid="4463730683530824797">"Framtida samtal från <xliff:g id="NUMBER">%1$s</xliff:g> identifieras inte längre som spam."</string>
-    <string name="checkbox_report_as_spam_action" msgid="1549159682170273798">"Rapportera samtal som spam"</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="migrate_blocked_numbers_dialog_title">En ny, enklare blockering</string>
+  <string name="migrate_blocked_numbers_dialog_message">För bättre skydd måste mobilen ändra blockeringsfunktionen. Samtal eller sms från blockerade nummer stoppas och inställningarna går att dela med andra appar.</string>
+  <string name="migrate_blocked_numbers_dialog_allow_button">Tillåt</string>
+  <string name="old_block_number_confirmation_title">Blockera %1$s?</string>
+  <string name="block_number_confirmation_message_vvm">Samtal från det här numret blockeras och röstmeddelanden raderas automatiskt.</string>
+  <string name="block_number_confirmation_message_no_vvm">Samtal från det här numret blockeras, men det kan fortfarande gå att lämna ett röstmeddelande.</string>
+  <string name="block_number_confirmation_message_new_filtering">Du får inte längre samtal eller sms från det här numret.</string>
+  <string name="block_number_ok">BLOCKERA</string>
+  <string name="unblock_number_confirmation_title">Avblockera %1$s?</string>
+  <string name="unblock_number_ok">HÄV BLOCKERINGEN</string>
+  <string name="invalidNumber">%1$s ogiltigt.</string>
+  <string name="snackbar_number_blocked">%1$s har blockerats</string>
+  <string name="snackbar_number_unblocked">%1$s avblockerat</string>
+  <string name="send_to_voicemail_import_failed">Det gick inte att importera</string>
+  <string name="call_blocking_disabled_notification_title">Samtalsblockeringen har inaktiverats i 48 timmar</string>
+  <string name="call_blocking_disabled_notification_text">Inaktiverades därför att enheten har använts för ett nödsamtal.</string>
 </resources>
diff --git a/java/com/android/dialer/blocking/res/values-sw/strings.xml b/java/com/android/dialer/blocking/res/values-sw/strings.xml
index 1d87c8a..8fbd614 100644
--- a/java/com/android/dialer/blocking/res/values-sw/strings.xml
+++ b/java/com/android/dialer/blocking/res/values-sw/strings.xml
@@ -1,46 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="migrate_blocked_numbers_dialog_title" msgid="7823962296457673809">"Njia mpya na rahisi ya kuzuia"</string>
-    <string name="migrate_blocked_numbers_dialog_message" msgid="8309736147266462485">"Ili kukulinda vizuri zaidi, Simu inahitaji kubadilisha mipangilio ya kipengele cha kuzuia. Hutapokea simu wala SMS kutoka nambari ulizozizuia na nambari hizo huenda zikashirikiwa na programu zingine."</string>
-    <string name="migrate_blocked_numbers_dialog_allow_button" msgid="5192836471557751367">"Ruhusu"</string>
-    <string name="block_number_confirmation_title" msgid="2699521227461376076">"Ungependa kuzuia <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="block_number_confirmation_message_vvm" msgid="6501105244172290939">"Simu zinazopigwa kutoka nambari hii zitazuiwa na ujumbe wa sauti utafutwa kiotomatiki."</string>
-    <string name="block_number_confirmation_message_no_vvm" msgid="8236641245709649882">"Simu zinazopigwa kutoka nambari hii zitazuiwa, lakini mpigaji bado anaweza kukutumia ujumbe wa sauti."</string>
-    <string name="block_number_confirmation_message_new_filtering" msgid="8487449683723062644">"Hutapokea simu wala SMS kutoka kwa nambari hii tena."</string>
-    <string name="block_number_ok" msgid="739786082788038932">"ZUIA"</string>
-    <string name="unblock_number_confirmation_title" msgid="7897778825085659941">"Ungependa kuacha kuzuia <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="unblock_number_ok" msgid="5089057152966269355">"ACHA KUZUIA"</string>
-    <string name="invalidNumber" msgid="6270918250761754967">"<xliff:g id="NUMBER">%1$s</xliff:g> si sahihi."</string>
-    <string name="snackbar_number_blocked" msgid="5760234822413921845">"<xliff:g id="NUMBER">%1$s</xliff:g> imezuiwa"</string>
-    <string name="snackbar_number_unblocked" msgid="7941296274123990585">"<xliff:g id="NUMBER">%1$s</xliff:g> imeacha kuzuiwa"</string>
-    <string name="block_number_undo" msgid="5158120911892491697">"TENDUA"</string>
-    <string name="send_to_voicemail_import_failed" msgid="1012752662074208237">"Imeshindwa kuingiza"</string>
-    <string name="call_blocking_disabled_notification_title" msgid="7211352205255347489">"Huduma ya kuzuia simu imezimwa kwa saa 48"</string>
-    <string name="call_blocking_disabled_notification_text" msgid="141384084865180722">"Imezimwa kwa sababu simu ya dharura imepigwa."</string>
-    <string name="block_report_number_alert_title" msgid="2740581989824959611">"Ungependa kuzuia <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="block_report_number_alert_details" msgid="2652479394593143562">"Hutapokea tena simu kutoka kwenye nambari hii."</string>
-    <string name="block_number_alert_details" msgid="715942751312046429">"<xliff:g id="TEXT">%1$s</xliff:g> Simu hii itaripotiwa kuwa ni taka."</string>
-    <string name="unblock_number_alert_details" msgid="8696070817026870606">"Kizuizi kitaondolewa; nambari itaripotiwa kuwa si taka. Simu hazitajumuishwa miongoni mwa taka tena."</string>
-    <string name="unblock_report_number_alert_title" msgid="2221901995393696882">"Ungependa kuacha kuzuia <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="report_not_spam_alert_button" msgid="3244953565919894995">"Ripoti"</string>
-    <string name="report_not_spam_alert_title" msgid="395961923213504916">"Je, ungependa kuripoti tatizo?"</string>
-    <string name="report_not_spam_alert_details" msgid="4463730683530824797">"Simu kutoka <xliff:g id="NUMBER">%1$s</xliff:g> hazitajumuishwa miongoni mwa taka tena."</string>
-    <string name="checkbox_report_as_spam_action" msgid="1549159682170273798">"Ripoti kuwa hii ni simu taka"</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="migrate_blocked_numbers_dialog_title">Njia mpya na rahisi ya kuzuia</string>
+  <string name="migrate_blocked_numbers_dialog_message">Ili kukulinda vizuri zaidi, Simu inahitaji kubadilisha mipangilio ya kipengele cha kuzuia. Hutapokea simu wala SMS kutoka nambari ulizozizuia na nambari hizo huenda zikashirikiwa na programu zingine.</string>
+  <string name="migrate_blocked_numbers_dialog_allow_button">Ruhusu</string>
+  <string name="old_block_number_confirmation_title">Je, ungependa kuzuia %1$s?</string>
+  <string name="block_number_confirmation_message_vvm">Simu zinazopigwa kutoka nambari hii zitazuiwa na ujumbe wa sauti utafutwa kiotomatiki.</string>
+  <string name="block_number_confirmation_message_no_vvm">Simu zinazopigwa kutoka nambari hii zitazuiwa, lakini mpigaji bado anaweza kukutumia ujumbe wa sauti.</string>
+  <string name="block_number_confirmation_message_new_filtering">Hutapokea simu wala SMS kutoka kwa nambari hii tena.</string>
+  <string name="block_number_ok">ZUIA</string>
+  <string name="unblock_number_confirmation_title">Ungependa kuacha kuzuia nambari %1$s?</string>
+  <string name="unblock_number_ok">ACHA KUZUIA</string>
+  <string name="invalidNumber">%1$s si sahihi.</string>
+  <string name="snackbar_number_blocked">%1$s imezuiwa</string>
+  <string name="snackbar_number_unblocked">%1$s imeondolewa kizuizi</string>
+  <string name="send_to_voicemail_import_failed">Imeshindwa kuingiza</string>
+  <string name="call_blocking_disabled_notification_title">Huduma ya kuzuia simu imezimwa kwa saa 48</string>
+  <string name="call_blocking_disabled_notification_text">Imezimwa kwa sababu simu ya dharura imepigwa.</string>
 </resources>
diff --git a/java/com/android/dialer/blocking/res/values-ta/strings.xml b/java/com/android/dialer/blocking/res/values-ta/strings.xml
index 7cd0027..94a4ff3 100644
--- a/java/com/android/dialer/blocking/res/values-ta/strings.xml
+++ b/java/com/android/dialer/blocking/res/values-ta/strings.xml
@@ -1,46 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="migrate_blocked_numbers_dialog_title" msgid="7823962296457673809">"புதிய, எளிதாக்கப்பட்ட தடுத்தல்"</string>
-    <string name="migrate_blocked_numbers_dialog_message" msgid="8309736147266462485">"சிறப்பான பாதுகாப்பை வழங்குவதற்காக, ஃபோனில் தடுத்தல் செயல்படும் விதத்தை மாற்ற வேண்டும். இப்போது தடுத்த எண்களிலிருந்து வரும் அழைப்புகளும் உரைச் செய்திகளும் நிறுத்தப்படுவதோடு, பிற பயன்பாடுகளுடன் பகிரப்பட்டு அவற்றிலும் தடுக்கப்படக்கூடும்."</string>
-    <string name="migrate_blocked_numbers_dialog_allow_button" msgid="5192836471557751367">"அனுமதி"</string>
-    <string name="block_number_confirmation_title" msgid="2699521227461376076">"<xliff:g id="NUMBER">%1$s</xliff:g>ஐத் தடுக்கவா?"</string>
-    <string name="block_number_confirmation_message_vvm" msgid="6501105244172290939">"இந்த எண்ணின் அழைப்புகள் தடுக்கப்படுவதுடன், அதன் குரலஞ்சல்களும் தானாகவே நீக்கப்படும்."</string>
-    <string name="block_number_confirmation_message_no_vvm" msgid="8236641245709649882">"இந்த எண்ணின் அழைப்புகள் தடுக்கப்படும், ஆனால் அழைப்பாளரால் இன்னமும் உங்களுக்குக் குரலஞ்சல்களை அனுப்ப முடியும்."</string>
-    <string name="block_number_confirmation_message_new_filtering" msgid="8487449683723062644">"இந்த எண்ணிலிருந்து இனி அழைப்புகளையோ உரைச் செய்திகளையோ பெறமாட்டீர்கள்."</string>
-    <string name="block_number_ok" msgid="739786082788038932">"தடு"</string>
-    <string name="unblock_number_confirmation_title" msgid="7897778825085659941">"<xliff:g id="NUMBER">%1$s</xliff:g>ஐ அனுமதிக்கவா?"</string>
-    <string name="unblock_number_ok" msgid="5089057152966269355">"அனுமதி"</string>
-    <string name="invalidNumber" msgid="6270918250761754967">"<xliff:g id="NUMBER">%1$s</xliff:g> தவறானது."</string>
-    <string name="snackbar_number_blocked" msgid="5760234822413921845">"<xliff:g id="NUMBER">%1$s</xliff:g> தடுக்கப்பட்டது"</string>
-    <string name="snackbar_number_unblocked" msgid="7941296274123990585">"<xliff:g id="NUMBER">%1$s</xliff:g> அனுமதிக்கப்பட்டது"</string>
-    <string name="block_number_undo" msgid="5158120911892491697">"செயல்தவிர்"</string>
-    <string name="send_to_voicemail_import_failed" msgid="1012752662074208237">"இறக்குவதில் தோல்வி"</string>
-    <string name="call_blocking_disabled_notification_title" msgid="7211352205255347489">"அழைப்புத் தடுப்பு 48 மணிநேரத்திற்கு முடக்கப்பட்டுள்ளது"</string>
-    <string name="call_blocking_disabled_notification_text" msgid="141384084865180722">"அவசர அழைப்பு செய்திருப்பதால், அழைப்புத் தடுப்பு முடக்கப்பட்டது."</string>
-    <string name="block_report_number_alert_title" msgid="2740581989824959611">"<xliff:g id="NUMBER">%1$s</xliff:g>ஐத் தடுக்கவா?"</string>
-    <string name="block_report_number_alert_details" msgid="2652479394593143562">"இந்த எண்ணிலிருந்து இனி அழைப்புகளைப் பெறமாட்டீர்கள்."</string>
-    <string name="block_number_alert_details" msgid="715942751312046429">"<xliff:g id="TEXT">%1$s</xliff:g> இந்த அழைப்பு ஸ்பேம் எனப் புகாரளிக்கப்படும்."</string>
-    <string name="unblock_number_alert_details" msgid="8696070817026870606">"இந்த எண் அனுமதிக்கப்பட்டு, ஸ்பேம் இல்லையென தெரிவிக்கப்படும். இனி அழைப்புகள் ஸ்பேமாக குறிக்கப்படாது."</string>
-    <string name="unblock_report_number_alert_title" msgid="2221901995393696882">"<xliff:g id="NUMBER">%1$s</xliff:g>ஐ அனுமதிக்கவா?"</string>
-    <string name="report_not_spam_alert_button" msgid="3244953565919894995">"ஸ்பேம் இல்லையெனத் தெரிவி"</string>
-    <string name="report_not_spam_alert_title" msgid="395961923213504916">"தவறு எனத் தெரிவிக்கவா?"</string>
-    <string name="report_not_spam_alert_details" msgid="4463730683530824797">"இனி <xliff:g id="NUMBER">%1$s</xliff:g> இன் அழைப்புகள் ஸ்பேமாகக் குறிக்கப்படாது."</string>
-    <string name="checkbox_report_as_spam_action" msgid="1549159682170273798">"அழைப்பை ஸ்பேமாகப் புகாரளி"</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="migrate_blocked_numbers_dialog_title">புதிய, எளிதாக்கப்பட்ட தடுத்தல்</string>
+  <string name="migrate_blocked_numbers_dialog_message">சிறப்பான பாதுகாப்பை வழங்குவதற்காக, ஃபோனில் தடுத்தல் செயல்படும் விதத்தை மாற்ற வேண்டும். இப்போது தடுத்த எண்களிலிருந்து வரும் அழைப்புகளும் உரைச் செய்திகளும் நிறுத்தப்படுவதோடு, பிற பயன்பாடுகளுடன் பகிரப்பட்டு அவற்றிலும் தடுக்கப்படக்கூடும்.</string>
+  <string name="migrate_blocked_numbers_dialog_allow_button">அனுமதி</string>
+  <string name="old_block_number_confirmation_title">%1$sஐத் தடுக்கவா?</string>
+  <string name="block_number_confirmation_message_vvm">இந்த எண்ணின் அழைப்புகள் தடுக்கப்படுவதுடன், அதன் குரலஞ்சல்களும் தானாகவே நீக்கப்படும்.</string>
+  <string name="block_number_confirmation_message_no_vvm">இந்த எண்ணின் அழைப்புகள் தடுக்கப்படும், ஆனால் அழைப்பாளரால் இன்னமும் உங்களுக்குக் குரலஞ்சல்களை அனுப்ப முடியும்.</string>
+  <string name="block_number_confirmation_message_new_filtering">இந்த எண்ணிலிருந்து இனி அழைப்புகளையோ உரைச் செய்திகளையோ பெறமாட்டீர்கள்.</string>
+  <string name="block_number_ok">தடு</string>
+  <string name="unblock_number_confirmation_title">%1$sஐ அனுமதிக்கவா?</string>
+  <string name="unblock_number_ok">அனுமதி</string>
+  <string name="invalidNumber">%1$s தவறானது.</string>
+  <string name="snackbar_number_blocked">%1$s தடுக்கப்பட்டது</string>
+  <string name="snackbar_number_unblocked">%1$s அனுமதிக்கப்பட்டது</string>
+  <string name="send_to_voicemail_import_failed">இறக்குவதில் தோல்வி</string>
+  <string name="call_blocking_disabled_notification_title">அழைப்புத் தடுப்பு 48 மணிநேரத்திற்கு முடக்கப்பட்டுள்ளது</string>
+  <string name="call_blocking_disabled_notification_text">அவசர அழைப்பு செய்திருப்பதால், அழைப்புத் தடுப்பு முடக்கப்பட்டது.</string>
 </resources>
diff --git a/java/com/android/dialer/blocking/res/values-te/strings.xml b/java/com/android/dialer/blocking/res/values-te/strings.xml
index 1feb6df..70956cf 100644
--- a/java/com/android/dialer/blocking/res/values-te/strings.xml
+++ b/java/com/android/dialer/blocking/res/values-te/strings.xml
@@ -1,46 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="migrate_blocked_numbers_dialog_title" msgid="7823962296457673809">"కొత్త, సరళీకృత బ్లాకింగ్"</string>
-    <string name="migrate_blocked_numbers_dialog_message" msgid="8309736147266462485">"మిమ్మల్ని మెరుగైన రీతిలో సంరక్షించడానికి, ఫోన్ బ్లాకింగ్ పని చేసే విధానాన్ని మార్చాలి. అప్పుడు మీరు బ్లాక్ చేసిన నంబర్‌ల నుండి కాల్‌లు మరియు వచన సందేశాలు ఆపివేయబడతాయి మరియు ఆ బ్లాక్ చేయబడిన నంబర్‌లను ఇతర అనువర్తనాలకు కూడా భాగస్వామ్యం చేయవచ్చు."</string>
-    <string name="migrate_blocked_numbers_dialog_allow_button" msgid="5192836471557751367">"అనుమతించు"</string>
-    <string name="block_number_confirmation_title" msgid="2699521227461376076">"<xliff:g id="NUMBER">%1$s</xliff:g>ని బ్లాక్ చేయాలా?"</string>
-    <string name="block_number_confirmation_message_vvm" msgid="6501105244172290939">"ఈ నంబర్ నుండి కాల్‌లు బ్లాక్ చేయబడతాయి మరియు వాయిస్‌మెయిల్‌లు స్వయంచాలకంగా తొలగించబడతాయి."</string>
-    <string name="block_number_confirmation_message_no_vvm" msgid="8236641245709649882">"ఈ నంబర్ నుండి కాల్‌లు బ్లాక్ చేయబడతాయి, కానీ కాలర్ ఇప్పటికీ మీకు వాయిస్‌మెయిల్‌లు పంపగలరు."</string>
-    <string name="block_number_confirmation_message_new_filtering" msgid="8487449683723062644">"మీరు ఇకపై ఈ నంబర్ నుండి కాల్‌లు లేదా వచన సందేశాలను స్వీకరించరు."</string>
-    <string name="block_number_ok" msgid="739786082788038932">"బ్లాక్ చేయి"</string>
-    <string name="unblock_number_confirmation_title" msgid="7897778825085659941">"<xliff:g id="NUMBER">%1$s</xliff:g>ని అన్‌బ్లాక్ చేయాలా?"</string>
-    <string name="unblock_number_ok" msgid="5089057152966269355">"అన్‌బ్లాక్ చేయి"</string>
-    <string name="invalidNumber" msgid="6270918250761754967">"<xliff:g id="NUMBER">%1$s</xliff:g> చెల్లదు."</string>
-    <string name="snackbar_number_blocked" msgid="5760234822413921845">"<xliff:g id="NUMBER">%1$s</xliff:g> బ్లాక్ చేయబడింది"</string>
-    <string name="snackbar_number_unblocked" msgid="7941296274123990585">"<xliff:g id="NUMBER">%1$s</xliff:g> అన్‌బ్లాక్ చేయబడింది"</string>
-    <string name="block_number_undo" msgid="5158120911892491697">"చర్యరద్దు"</string>
-    <string name="send_to_voicemail_import_failed" msgid="1012752662074208237">"దిగుమతి విఫలమైంది"</string>
-    <string name="call_blocking_disabled_notification_title" msgid="7211352205255347489">"48 గంటల పాటు కాల్ బ్లాకింగ్ నిలిపివేయబడింది"</string>
-    <string name="call_blocking_disabled_notification_text" msgid="141384084865180722">"అత్యవసర కాల్ చేసినందున నిలిపివేయబడింది."</string>
-    <string name="block_report_number_alert_title" msgid="2740581989824959611">"<xliff:g id="NUMBER">%1$s</xliff:g>ని బ్లాక్ చేయాలా?"</string>
-    <string name="block_report_number_alert_details" msgid="2652479394593143562">"మీరు ఇకపై ఈ నంబర్ నుండి కాల్‌లు స్వీకరించరు."</string>
-    <string name="block_number_alert_details" msgid="715942751312046429">"<xliff:g id="TEXT">%1$s</xliff:g> ఈ కాల్ స్పామ్ వలె నివేదించబడుతుంది."</string>
-    <string name="unblock_number_alert_details" msgid="8696070817026870606">"ఈ నంబర్ అన్‌బ్లాక్ చేసి, స్పామ్ కాదని నివేదించబడుతుంది. భవిష్యత్తు కాల్‌లు స్పామ్‌గా గుర్తించబడవు."</string>
-    <string name="unblock_report_number_alert_title" msgid="2221901995393696882">"<xliff:g id="NUMBER">%1$s</xliff:g>ని అన్‌బ్లాక్ చేయాలా?"</string>
-    <string name="report_not_spam_alert_button" msgid="3244953565919894995">"నివేదించు"</string>
-    <string name="report_not_spam_alert_title" msgid="395961923213504916">"పొరపాటును నివేదించాలా?"</string>
-    <string name="report_not_spam_alert_details" msgid="4463730683530824797">"ఇకపై <xliff:g id="NUMBER">%1$s</xliff:g> నుండి భావి కాల్‌లు స్పామ్‌గా గుర్తించబడవు."</string>
-    <string name="checkbox_report_as_spam_action" msgid="1549159682170273798">"కాల్‌ను స్పామ్‌గా నివేదించు"</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="migrate_blocked_numbers_dialog_title">కొత్త, సరళీకృత బ్లాకింగ్</string>
+  <string name="migrate_blocked_numbers_dialog_message">మిమ్మల్ని మెరుగైన రీతిలో సంరక్షించడానికి, ఫోన్ బ్లాకింగ్ పని చేసే విధానాన్ని మార్చాలి. అప్పుడు మీరు బ్లాక్ చేసిన నంబర్‌ల నుండి కాల్‌లు మరియు వచన సందేశాలు ఆపివేయబడతాయి మరియు ఆ బ్లాక్ చేయబడిన నంబర్‌లను ఇతర అనువర్తనాలకు కూడా భాగస్వామ్యం చేయవచ్చు.</string>
+  <string name="migrate_blocked_numbers_dialog_allow_button">అనుమతించు</string>
+  <string name="old_block_number_confirmation_title">%1$sని బ్లాక్ చేయాలా?</string>
+  <string name="block_number_confirmation_message_vvm">ఈ నంబర్ నుండి కాల్‌లు బ్లాక్ చేయబడతాయి మరియు వాయిస్‌మెయిల్‌లు స్వయంచాలకంగా తొలగించబడతాయి.</string>
+  <string name="block_number_confirmation_message_no_vvm">ఈ నంబర్ నుండి కాల్‌లు బ్లాక్ చేయబడతాయి, కానీ కాలర్ ఇప్పటికీ మీకు వాయిస్‌మెయిల్‌లు పంపగలరు.</string>
+  <string name="block_number_confirmation_message_new_filtering">మీరు ఇకపై ఈ నంబర్ నుండి కాల్‌లు లేదా వచన సందేశాలను స్వీకరించరు.</string>
+  <string name="block_number_ok">బ్లాక్ చేయి</string>
+  <string name="unblock_number_confirmation_title">%1$sని అన్‌బ్లాక్ చేయాలా?</string>
+  <string name="unblock_number_ok">అన్‌బ్లాక్ చేయి</string>
+  <string name="invalidNumber">%1$s చెల్లదు.</string>
+  <string name="snackbar_number_blocked">%1$s బ్లాక్ చేయబడింది</string>
+  <string name="snackbar_number_unblocked">%1$s అన్‌బ్లాక్ చేయబడింది</string>
+  <string name="send_to_voicemail_import_failed">దిగుమతి విఫలమైంది</string>
+  <string name="call_blocking_disabled_notification_title">48 గంటల పాటు కాల్ బ్లాకింగ్ నిలిపివేయబడింది</string>
+  <string name="call_blocking_disabled_notification_text">అత్యవసర కాల్ చేసినందున నిలిపివేయబడింది.</string>
 </resources>
diff --git a/java/com/android/dialer/blocking/res/values-th/strings.xml b/java/com/android/dialer/blocking/res/values-th/strings.xml
index 5c6df63..6bd661c 100644
--- a/java/com/android/dialer/blocking/res/values-th/strings.xml
+++ b/java/com/android/dialer/blocking/res/values-th/strings.xml
@@ -1,46 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="migrate_blocked_numbers_dialog_title" msgid="7823962296457673809">"การบล็อกแบบใหม่ที่ใช้งานง่าย"</string>
-    <string name="migrate_blocked_numbers_dialog_message" msgid="8309736147266462485">"เพื่อปกป้องคุณได้ดียิ่งขึ้น โทรศัพท์ฺจำเป็นต้องเปลี่ยนลักษณะการทำงานของการบล็อก ขณะนี้คุณจะไม่ได้รับสายเรียกเข้าหรือข้อความจากหมายเลขที่ถูกบล็อกอีกและอาจมีการแชร์หมายเลขนั้นกับแอปอื่น"</string>
-    <string name="migrate_blocked_numbers_dialog_allow_button" msgid="5192836471557751367">"อนุญาต"</string>
-    <string name="block_number_confirmation_title" msgid="2699521227461376076">"บล็อก <xliff:g id="NUMBER">%1$s</xliff:g> ไหม"</string>
-    <string name="block_number_confirmation_message_vvm" msgid="6501105244172290939">"ระบบจะบล็อกสายเรียกเข้าจากหมายเลขนี้และลบข้อความเสียงโดยอัตโนมัติ"</string>
-    <string name="block_number_confirmation_message_no_vvm" msgid="8236641245709649882">"ระบบจะบล็อกสายเรียกเข้าจากหมายเลขนี้ แต่ผู้โทรอาจยังฝากข้อความเสียงถึงคุณได้อยู่"</string>
-    <string name="block_number_confirmation_message_new_filtering" msgid="8487449683723062644">"คุณจะไม่ได้รับสายเรียกเข้าหรือข้อความจากหมายเลขนี้อีก"</string>
-    <string name="block_number_ok" msgid="739786082788038932">"บล็อก"</string>
-    <string name="unblock_number_confirmation_title" msgid="7897778825085659941">"เลิกบล็อก <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="unblock_number_ok" msgid="5089057152966269355">"เลิกบล็อก"</string>
-    <string name="invalidNumber" msgid="6270918250761754967">"<xliff:g id="NUMBER">%1$s</xliff:g> ไม่ถูกต้อง"</string>
-    <string name="snackbar_number_blocked" msgid="5760234822413921845">"บล็อก <xliff:g id="NUMBER">%1$s</xliff:g> แล้ว"</string>
-    <string name="snackbar_number_unblocked" msgid="7941296274123990585">"เลิกบล็อก <xliff:g id="NUMBER">%1$s</xliff:g> แล้ว"</string>
-    <string name="block_number_undo" msgid="5158120911892491697">"เลิกทำ"</string>
-    <string name="send_to_voicemail_import_failed" msgid="1012752662074208237">"การนำเข้าล้มเหลว"</string>
-    <string name="call_blocking_disabled_notification_title" msgid="7211352205255347489">"ปิดการบล็อกสายเรียกเข้า 48 ชั่วโมง"</string>
-    <string name="call_blocking_disabled_notification_text" msgid="141384084865180722">"ปิดใช้งานเนื่องจากมีการโทรเข้าหมายเลขฉุกเฉิน"</string>
-    <string name="block_report_number_alert_title" msgid="2740581989824959611">"บล็อก <xliff:g id="NUMBER">%1$s</xliff:g> ไหม"</string>
-    <string name="block_report_number_alert_details" msgid="2652479394593143562">"คุณจะไม่ได้รับสายจากหมายเลขนี้อีกต่อไป"</string>
-    <string name="block_number_alert_details" msgid="715942751312046429">"<xliff:g id="TEXT">%1$s</xliff:g> ระบบจะรายงานสายนี้ว่าเป็นสแปม"</string>
-    <string name="unblock_number_alert_details" msgid="8696070817026870606">"ระบบจะเลิกบล็อกหมายเลขนี้และรายงานว่าไม่ใช่สแปม การโทรเข้ามาหลังจากนี้จะไม่ถูกระบุว่าเป็นสแปม"</string>
-    <string name="unblock_report_number_alert_title" msgid="2221901995393696882">"เลิกบล็อก <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="report_not_spam_alert_button" msgid="3244953565919894995">"รายงาน"</string>
-    <string name="report_not_spam_alert_title" msgid="395961923213504916">"รายงานข้อผิดพลาดไหม"</string>
-    <string name="report_not_spam_alert_details" msgid="4463730683530824797">"การโทรเข้ามาจาก <xliff:g id="NUMBER">%1$s</xliff:g> หลังจากนี้จะไม่ถูกระบุว่าเป็นสแปม"</string>
-    <string name="checkbox_report_as_spam_action" msgid="1549159682170273798">"รายงานสายนี้ว่าเป็นสแปม"</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="migrate_blocked_numbers_dialog_title">การบล็อกแบบใหม่ที่ใช้งานง่าย</string>
+  <string name="migrate_blocked_numbers_dialog_message">เพื่อปกป้องคุณได้ดียิ่งขึ้น โทรศัพท์ฺจำเป็นต้องเปลี่ยนลักษณะการทำงานของการบล็อก ขณะนี้คุณจะไม่ได้รับสายเรียกเข้าหรือข้อความจากหมายเลขที่ถูกบล็อกอีกและอาจมีการแชร์หมายเลขนั้นกับแอปอื่น</string>
+  <string name="migrate_blocked_numbers_dialog_allow_button">อนุญาต</string>
+  <string name="old_block_number_confirmation_title">บล็อก %1$s ไหม</string>
+  <string name="block_number_confirmation_message_vvm">ระบบจะบล็อกสายเรียกเข้าจากหมายเลขนี้และลบข้อความเสียงโดยอัตโนมัติ</string>
+  <string name="block_number_confirmation_message_no_vvm">ระบบจะบล็อกสายเรียกเข้าจากหมายเลขนี้ แต่ผู้โทรอาจยังฝากข้อความเสียงถึงคุณได้อยู่</string>
+  <string name="block_number_confirmation_message_new_filtering">คุณจะไม่ได้รับสายเรียกเข้าหรือข้อความจากหมายเลขนี้อีก</string>
+  <string name="block_number_ok">บล็อก</string>
+  <string name="unblock_number_confirmation_title">เลิกบล็อก %1$s ไหม</string>
+  <string name="unblock_number_ok">เลิกบล็อก</string>
+  <string name="invalidNumber">%1$s ไม่ถูกต้อง</string>
+  <string name="snackbar_number_blocked">บล็อก %1$s แล้ว</string>
+  <string name="snackbar_number_unblocked">เลิกบล็อก %1$s แล้ว</string>
+  <string name="send_to_voicemail_import_failed">การนำเข้าล้มเหลว</string>
+  <string name="call_blocking_disabled_notification_title">ปิดการบล็อกสายเรียกเข้า 48 ชั่วโมง</string>
+  <string name="call_blocking_disabled_notification_text">ปิดใช้งานเนื่องจากมีการโทรเข้าหมายเลขฉุกเฉิน</string>
 </resources>
diff --git a/java/com/android/dialer/blocking/res/values-tl/strings.xml b/java/com/android/dialer/blocking/res/values-tl/strings.xml
index 2c57d20..631c7bc 100644
--- a/java/com/android/dialer/blocking/res/values-tl/strings.xml
+++ b/java/com/android/dialer/blocking/res/values-tl/strings.xml
@@ -1,46 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="migrate_blocked_numbers_dialog_title" msgid="7823962296457673809">"Bago at pinasimpleng pag-block"</string>
-    <string name="migrate_blocked_numbers_dialog_message" msgid="8309736147266462485">"Upang mas maprotektahan ka, kailangang baguhin ng Telepono ang paggana ng pag-block. Pipigilan na ngayon ng iyong mga naka-block na numero ang mga tawag at text, at maaaring ibahagi ang mga ito sa iba pang mga app."</string>
-    <string name="migrate_blocked_numbers_dialog_allow_button" msgid="5192836471557751367">"Payagan"</string>
-    <string name="block_number_confirmation_title" msgid="2699521227461376076">"Gusto mo bang i-block ang <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="block_number_confirmation_message_vvm" msgid="6501105244172290939">"Iba-block ang mga tawag mula sa numerong ito at awtomatikong ide-delete ang mga voicemail."</string>
-    <string name="block_number_confirmation_message_no_vvm" msgid="8236641245709649882">"Iba-block ang mga tawag mula sa numerong ito, ngunit makakapag-iwan pa rin sa iyo ng mga voicemail ang tumatawag."</string>
-    <string name="block_number_confirmation_message_new_filtering" msgid="8487449683723062644">"Hindi ka na makakatanggap ng mga tawag o text mula sa numerong ito."</string>
-    <string name="block_number_ok" msgid="739786082788038932">"I-BLOCK"</string>
-    <string name="unblock_number_confirmation_title" msgid="7897778825085659941">"Gusto mo bang alisin sa pagkaka-block ang <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="unblock_number_ok" msgid="5089057152966269355">"ALISIN SA PAGKAKA-BLOCK"</string>
-    <string name="invalidNumber" msgid="6270918250761754967">"Hindi wasto ang <xliff:g id="NUMBER">%1$s</xliff:g>."</string>
-    <string name="snackbar_number_blocked" msgid="5760234822413921845">"Na-block ang <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="snackbar_number_unblocked" msgid="7941296274123990585">"Naalis sa pagkaka-block ang <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="block_number_undo" msgid="5158120911892491697">"I-UNDO"</string>
-    <string name="send_to_voicemail_import_failed" msgid="1012752662074208237">"Hindi nakapag-import"</string>
-    <string name="call_blocking_disabled_notification_title" msgid="7211352205255347489">"Na-disable ang pagba-block ng tawag sa loob ng 48 oras"</string>
-    <string name="call_blocking_disabled_notification_text" msgid="141384084865180722">"Na-disable dahil tumawag para sa emergency."</string>
-    <string name="block_report_number_alert_title" msgid="2740581989824959611">"Gusto mo bang i-block ang <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="block_report_number_alert_details" msgid="2652479394593143562">"Hindi ka na makakatanggap ng mga tawag mula sa numerong ito."</string>
-    <string name="block_number_alert_details" msgid="715942751312046429">"<xliff:g id="TEXT">%1$s</xliff:g> Iuulat ang tawag na ito bilang spam."</string>
-    <string name="unblock_number_alert_details" msgid="8696070817026870606">"Aalisin sa pagkaka-block ang numerong ito at iuulat na di spam. Di kikilalaning spam ang darating na tawag."</string>
-    <string name="unblock_report_number_alert_title" msgid="2221901995393696882">"Gusto mo bang alisin sa pagkaka-block ang <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="report_not_spam_alert_button" msgid="3244953565919894995">"Iulat"</string>
-    <string name="report_not_spam_alert_title" msgid="395961923213504916">"I-ulat ang isang pagkakamali?"</string>
-    <string name="report_not_spam_alert_details" msgid="4463730683530824797">"Ang mga tawag sa hinaharap mula sa <xliff:g id="NUMBER">%1$s</xliff:g> ay hindi na kikilalanin bilang spam."</string>
-    <string name="checkbox_report_as_spam_action" msgid="1549159682170273798">"Iulat ang tawag bilang spam"</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="migrate_blocked_numbers_dialog_title">Bago at pinasimpleng pag-block</string>
+  <string name="migrate_blocked_numbers_dialog_message">Upang mas maprotektahan ka, kailangang baguhin ng Telepono ang paggana ng pag-block. Pipigilan na ngayon ng iyong mga naka-block na numero ang mga tawag at text, at maaaring ibahagi ang mga ito sa iba pang mga app.</string>
+  <string name="migrate_blocked_numbers_dialog_allow_button">Payagan</string>
+  <string name="old_block_number_confirmation_title">I-block ang %1$s?</string>
+  <string name="block_number_confirmation_message_vvm">Iba-block ang mga tawag mula sa numerong ito at awtomatikong ide-delete ang mga voicemail.</string>
+  <string name="block_number_confirmation_message_no_vvm">Iba-block ang mga tawag mula sa numerong ito, ngunit makakapag-iwan pa rin sa iyo ng mga voicemail ang tumatawag.</string>
+  <string name="block_number_confirmation_message_new_filtering">Hindi ka na makakatanggap ng mga tawag o text mula sa numerong ito.</string>
+  <string name="block_number_ok">I-BLOCK</string>
+  <string name="unblock_number_confirmation_title">I-unblock ang %1$s?</string>
+  <string name="unblock_number_ok">I-UNBLOCK</string>
+  <string name="invalidNumber">Di-wasto ang %1$s.</string>
+  <string name="snackbar_number_blocked">Na-block ang %1$s</string>
+  <string name="snackbar_number_unblocked">Na-unblock ang %1$s</string>
+  <string name="send_to_voicemail_import_failed">Hindi nakapag-import</string>
+  <string name="call_blocking_disabled_notification_title">Na-disable ang pagba-block ng tawag sa loob ng 48 oras</string>
+  <string name="call_blocking_disabled_notification_text">Na-disable dahil tumawag para sa emergency.</string>
 </resources>
diff --git a/java/com/android/dialer/blocking/res/values-tr/strings.xml b/java/com/android/dialer/blocking/res/values-tr/strings.xml
index 1655637..9634448 100644
--- a/java/com/android/dialer/blocking/res/values-tr/strings.xml
+++ b/java/com/android/dialer/blocking/res/values-tr/strings.xml
@@ -1,46 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="migrate_blocked_numbers_dialog_title" msgid="7823962296457673809">"Yeni, basitleştirlmş engelleme"</string>
-    <string name="migrate_blocked_numbers_dialog_message" msgid="8309736147266462485">"Daha iyi korunmanız için engelleme işlevinin çalışma biçiminin Telefon tarafından değiştirilmesi gerekmektedir. Engellediğiniz numaralardan artık çağrı ve kısa mesaj almayacaksınız. Ayrıca bu numaralar başka uygulamalarla paylaşılabilir."</string>
-    <string name="migrate_blocked_numbers_dialog_allow_button" msgid="5192836471557751367">"İzin ver"</string>
-    <string name="block_number_confirmation_title" msgid="2699521227461376076">"<xliff:g id="NUMBER">%1$s</xliff:g> numaralı telefon engellensin mi?"</string>
-    <string name="block_number_confirmation_message_vvm" msgid="6501105244172290939">"Bu numaradan gelen çağrılar engellenecek ve sesli mesajlar otomatik olarak silinecektir."</string>
-    <string name="block_number_confirmation_message_no_vvm" msgid="8236641245709649882">"Bu numaradan gelen çağrılar engellenecek, ancak arayan kişi yine de size sesli mesaj bırakabilecektir."</string>
-    <string name="block_number_confirmation_message_new_filtering" msgid="8487449683723062644">"Artık bu numaradan sesli arama veya kısa mesaj almayacaksınız."</string>
-    <string name="block_number_ok" msgid="739786082788038932">"ENGELLE"</string>
-    <string name="unblock_number_confirmation_title" msgid="7897778825085659941">"<xliff:g id="NUMBER">%1$s</xliff:g> numaralı telefonun engellemesi kaldırılsın mı?"</string>
-    <string name="unblock_number_ok" msgid="5089057152966269355">"ENGELLEMEYİ KALDIR"</string>
-    <string name="invalidNumber" msgid="6270918250761754967">"<xliff:g id="NUMBER">%1$s</xliff:g> numaralı telefon geçersiz."</string>
-    <string name="snackbar_number_blocked" msgid="5760234822413921845">"<xliff:g id="NUMBER">%1$s</xliff:g> numaralı telefon engellendi"</string>
-    <string name="snackbar_number_unblocked" msgid="7941296274123990585">"<xliff:g id="NUMBER">%1$s</xliff:g> numaralı telefonun engellemesi kaldırıldı"</string>
-    <string name="block_number_undo" msgid="5158120911892491697">"GERİ AL"</string>
-    <string name="send_to_voicemail_import_failed" msgid="1012752662074208237">"İçe aktarma başarısız oldu"</string>
-    <string name="call_blocking_disabled_notification_title" msgid="7211352205255347489">"Çağrı engelleme 48 saat süreyle devre dışı bırakıldı"</string>
-    <string name="call_blocking_disabled_notification_text" msgid="141384084865180722">"Acil durum çağrısı yapıldığından devre dışı bırakıldı."</string>
-    <string name="block_report_number_alert_title" msgid="2740581989824959611">"<xliff:g id="NUMBER">%1$s</xliff:g> numaralı telefon engellensin mi?"</string>
-    <string name="block_report_number_alert_details" msgid="2652479394593143562">"Artık bu numaradan çağrı almayacaksınız."</string>
-    <string name="block_number_alert_details" msgid="715942751312046429">"<xliff:g id="TEXT">%1$s</xliff:g> Bu çağrı spam olarak bildirilecek."</string>
-    <string name="unblock_number_alert_details" msgid="8696070817026870606">"Numaranın engellemesi ve spam durumu kaldırılacak. Gelecekteki çağrılar spam olarak tanımlanmayacak."</string>
-    <string name="unblock_report_number_alert_title" msgid="2221901995393696882">"<xliff:g id="NUMBER">%1$s</xliff:g> numaralı telefonun engellemesi kaldırılsın mı?"</string>
-    <string name="report_not_spam_alert_button" msgid="3244953565919894995">"Bildir"</string>
-    <string name="report_not_spam_alert_title" msgid="395961923213504916">"Yanlışlıkla mı bildirim gönderdiniz?"</string>
-    <string name="report_not_spam_alert_details" msgid="4463730683530824797">"Artık <xliff:g id="NUMBER">%1$s</xliff:g> numarasından gelecek çağrılar spam olarak tanımlanmayacak."</string>
-    <string name="checkbox_report_as_spam_action" msgid="1549159682170273798">"Çağrıyı spam olarak bildir"</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="migrate_blocked_numbers_dialog_title">Yeni, basitleştirlmş engelleme</string>
+  <string name="migrate_blocked_numbers_dialog_message">Daha iyi korunmanız için engelleme işlevinin çalışma biçiminin Telefon tarafından değiştirilmesi gerekmektedir. Engellediğiniz numaralardan artık çağrı ve kısa mesaj almayacaksınız. Ayrıca bu numaralar başka uygulamalarla paylaşılabilir.</string>
+  <string name="migrate_blocked_numbers_dialog_allow_button">İzin ver</string>
+  <string name="old_block_number_confirmation_title">%1$s numaralı telefon engellensin mi?</string>
+  <string name="block_number_confirmation_message_vvm">Bu numaradan gelen çağrılar engellenecek ve sesli mesajlar otomatik olarak silinecektir.</string>
+  <string name="block_number_confirmation_message_no_vvm">Bu numaradan gelen çağrılar engellenecek, ancak arayan kişi yine de size sesli mesaj bırakabilecektir.</string>
+  <string name="block_number_confirmation_message_new_filtering">Artık bu numaradan sesli arama veya kısa mesaj almayacaksınız.</string>
+  <string name="block_number_ok">ENGELLE</string>
+  <string name="unblock_number_confirmation_title">%1$s numaralı telefonun engellemesi kaldırılsın mı?</string>
+  <string name="unblock_number_ok">ENGELLEMEYİ KALDIR</string>
+  <string name="invalidNumber">%1$s numaralı telefon geçersiz.</string>
+  <string name="snackbar_number_blocked">%1$s numaralı telefon engellendi</string>
+  <string name="snackbar_number_unblocked">%1$s numaralı telefonun engellemesi kaldırıldı</string>
+  <string name="send_to_voicemail_import_failed">İçe aktarma başarısız oldu</string>
+  <string name="call_blocking_disabled_notification_title">Çağrı engelleme 48 saat süreyle devre dışı bırakıldı</string>
+  <string name="call_blocking_disabled_notification_text">Acil durum çağrısı yapıldığından devre dışı bırakıldı.</string>
 </resources>
diff --git a/java/com/android/dialer/blocking/res/values-uk/strings.xml b/java/com/android/dialer/blocking/res/values-uk/strings.xml
index 6f4cc24..b7b29e8 100644
--- a/java/com/android/dialer/blocking/res/values-uk/strings.xml
+++ b/java/com/android/dialer/blocking/res/values-uk/strings.xml
@@ -1,46 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="migrate_blocked_numbers_dialog_title" msgid="7823962296457673809">"Нове простіше блокування"</string>
-    <string name="migrate_blocked_numbers_dialog_message" msgid="8309736147266462485">"Задля кращого захисту додаток Телефон має змінити параметри блокування. Із заблокованих номерів не надходитимуть виклики й SMS. Інші додатки також можуть мати доступ до списку цих номерів."</string>
-    <string name="migrate_blocked_numbers_dialog_allow_button" msgid="5192836471557751367">"Дозволити"</string>
-    <string name="block_number_confirmation_title" msgid="2699521227461376076">"Заблокувати номер <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="block_number_confirmation_message_vvm" msgid="6501105244172290939">"Виклики з цього номера блокуватимуться, а голосові повідомлення автоматично видалятимуться."</string>
-    <string name="block_number_confirmation_message_no_vvm" msgid="8236641245709649882">"Виклики з цього номера блокуватимуться, але абонент зможе залишати голосові повідомлення."</string>
-    <string name="block_number_confirmation_message_new_filtering" msgid="8487449683723062644">"Ви більше не отримуватиме виклики й SMS із цього номера."</string>
-    <string name="block_number_ok" msgid="739786082788038932">"БЛОКУВАТИ"</string>
-    <string name="unblock_number_confirmation_title" msgid="7897778825085659941">"Розблокувати номер <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="unblock_number_ok" msgid="5089057152966269355">"РОЗБЛОКУВАТИ"</string>
-    <string name="invalidNumber" msgid="6270918250761754967">"Номер <xliff:g id="NUMBER">%1$s</xliff:g> недісний."</string>
-    <string name="snackbar_number_blocked" msgid="5760234822413921845">"Номер <xliff:g id="NUMBER">%1$s</xliff:g> заблоковано"</string>
-    <string name="snackbar_number_unblocked" msgid="7941296274123990585">"Номер <xliff:g id="NUMBER">%1$s</xliff:g> розблоковано"</string>
-    <string name="block_number_undo" msgid="5158120911892491697">"ВІДМІНИТИ"</string>
-    <string name="send_to_voicemail_import_failed" msgid="1012752662074208237">"Не вдалось імпортувати"</string>
-    <string name="call_blocking_disabled_notification_title" msgid="7211352205255347489">"Блокування викликів вимкнено на 48 годин"</string>
-    <string name="call_blocking_disabled_notification_text" msgid="141384084865180722">"Блокування вимкнено, оскільки ви зробили екстрений виклик."</string>
-    <string name="block_report_number_alert_title" msgid="2740581989824959611">"Заблокувати номер <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="block_report_number_alert_details" msgid="2652479394593143562">"Ви більше не отримуватиме виклики з цього номера."</string>
-    <string name="block_number_alert_details" msgid="715942751312046429">"<xliff:g id="TEXT">%1$s</xliff:g> Цей виклик буде позначено як спам."</string>
-    <string name="unblock_number_alert_details" msgid="8696070817026870606">"Цей номер буде розблоковано. Виклики з нього (і він сам) не позначатимуться як спам."</string>
-    <string name="unblock_report_number_alert_title" msgid="2221901995393696882">"Розблокувати номер <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="report_not_spam_alert_button" msgid="3244953565919894995">"Повідомити"</string>
-    <string name="report_not_spam_alert_title" msgid="395961923213504916">"Повідомити про помилку?"</string>
-    <string name="report_not_spam_alert_details" msgid="4463730683530824797">"Виклики з номера <xliff:g id="NUMBER">%1$s</xliff:g> більше не позначатимуться як спам."</string>
-    <string name="checkbox_report_as_spam_action" msgid="1549159682170273798">"Позначити виклик як спам"</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="migrate_blocked_numbers_dialog_title">Нове простіше блокування</string>
+  <string name="migrate_blocked_numbers_dialog_message">Задля кращого захисту додаток Телефон має змінити параметри блокування. Із заблокованих номерів не надходитимуть виклики й SMS. Інші додатки також можуть мати доступ до списку цих номерів.</string>
+  <string name="migrate_blocked_numbers_dialog_allow_button">Дозволити</string>
+  <string name="old_block_number_confirmation_title">Заблокувати %1$s?</string>
+  <string name="block_number_confirmation_message_vvm">Виклики з цього номера блокуватимуться, а голосові повідомлення автоматично видалятимуться.</string>
+  <string name="block_number_confirmation_message_no_vvm">Виклики з цього номера блокуватимуться, але абонент зможе залишати голосові повідомлення.</string>
+  <string name="block_number_confirmation_message_new_filtering">Ви більше не отримуватиме виклики й SMS із цього номера.</string>
+  <string name="block_number_ok">БЛОКУВАТИ</string>
+  <string name="unblock_number_confirmation_title">Розблокувати %1$s?</string>
+  <string name="unblock_number_ok">РОЗБЛОКУВАТИ</string>
+  <string name="invalidNumber">Номер %1$s недісний.</string>
+  <string name="snackbar_number_blocked">Номер %1$s заблоковано</string>
+  <string name="snackbar_number_unblocked">%1$s розблоковано</string>
+  <string name="send_to_voicemail_import_failed">Не вдалось імпортувати</string>
+  <string name="call_blocking_disabled_notification_title">Блокування викликів вимкнено на 48 годин</string>
+  <string name="call_blocking_disabled_notification_text">Блокування вимкнено, оскільки ви зробили екстрений виклик.</string>
 </resources>
diff --git a/java/com/android/dialer/blocking/res/values-ur/strings.xml b/java/com/android/dialer/blocking/res/values-ur/strings.xml
index 09d7549..80b9489 100644
--- a/java/com/android/dialer/blocking/res/values-ur/strings.xml
+++ b/java/com/android/dialer/blocking/res/values-ur/strings.xml
@@ -1,46 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="migrate_blocked_numbers_dialog_title" msgid="7823962296457673809">"نئی، آسان انسداد"</string>
-    <string name="migrate_blocked_numbers_dialog_message" msgid="8309736147266462485">"آپ کو بہتر طریقے سے حفاظت فراہم کرنے کیلئے فون کو انسداد کے کام کرنے کا طریقہ تبدیل کرنا ہوگا۔ آپ کے مسدود کردہ نمبروں سے کالیں اور متنی پیغامات دونوں مسدود کر دیے جائیں گے اور ممکن ہے ان کا اشتراک دیگر ایپس کے ساتھ کیا جائے۔"</string>
-    <string name="migrate_blocked_numbers_dialog_allow_button" msgid="5192836471557751367">"اجازت دیں"</string>
-    <string name="block_number_confirmation_title" msgid="2699521227461376076">"<xliff:g id="NUMBER">%1$s</xliff:g> مسدود کریں؟"</string>
-    <string name="block_number_confirmation_message_vvm" msgid="6501105244172290939">"اس نمبر سے کالز مسدود ہوجائیں گی اور صوتی میلز خودبخزد جذف ہو جائیں گی۔"</string>
-    <string name="block_number_confirmation_message_no_vvm" msgid="8236641245709649882">"اس نمبر سے کالز مسدود ہو جائیں گی گی لیکن ممکن ہے کالر پھر بھی آپ کیلئے صوتی میلز چھوڑ پائے۔"</string>
-    <string name="block_number_confirmation_message_new_filtering" msgid="8487449683723062644">"آپ کو اب اس نمبر سے مزید کالز یا متنی پیغامات موصول نہیں ہوں گے۔"</string>
-    <string name="block_number_ok" msgid="739786082788038932">"مسدود کریں"</string>
-    <string name="unblock_number_confirmation_title" msgid="7897778825085659941">"<xliff:g id="NUMBER">%1$s</xliff:g> غیر مسدود کریں؟"</string>
-    <string name="unblock_number_ok" msgid="5089057152966269355">"غیر مسدود کریں"</string>
-    <string name="invalidNumber" msgid="6270918250761754967">"<xliff:g id="NUMBER">%1$s</xliff:g> غلط ہے۔"</string>
-    <string name="snackbar_number_blocked" msgid="5760234822413921845">"<xliff:g id="NUMBER">%1$s</xliff:g> مسدود ہو گیا"</string>
-    <string name="snackbar_number_unblocked" msgid="7941296274123990585">"<xliff:g id="NUMBER">%1$s</xliff:g> غیر مسدود ہو گیا"</string>
-    <string name="block_number_undo" msgid="5158120911892491697">"کالعدم کریں"</string>
-    <string name="send_to_voicemail_import_failed" msgid="1012752662074208237">"درآمد کرنا ناکام ہوگیا"</string>
-    <string name="call_blocking_disabled_notification_title" msgid="7211352205255347489">"کال مسدود کرنا 48 گھنٹے کیلئے غیر فعال ہو گیا"</string>
-    <string name="call_blocking_disabled_notification_text" msgid="141384084865180722">"غیر فعال ہو گیا کیونکہ ایک ہنگامی کال کی گئی تھی۔"</string>
-    <string name="block_report_number_alert_title" msgid="2740581989824959611">"<xliff:g id="NUMBER">%1$s</xliff:g> مسدود کریں؟"</string>
-    <string name="block_report_number_alert_details" msgid="2652479394593143562">"آپ کو اس نمبر سے مزید کالز موصول نہیں ہوں گی۔"</string>
-    <string name="block_number_alert_details" msgid="715942751312046429">"<xliff:g id="TEXT">%1$s</xliff:g> اس کال کی بطور سپام اطلاع ہو گی۔"</string>
-    <string name="unblock_number_alert_details" msgid="8696070817026870606">"یہ نمبر غیر مسدود ہو جائے گا اور اس کی اطلاع \'سپام نہیں\' کے بطور ہوگی۔ مستقبل میں کالز کی شناخت بطور سپام نہیں ہوگی۔"</string>
-    <string name="unblock_report_number_alert_title" msgid="2221901995393696882">"<xliff:g id="NUMBER">%1$s</xliff:g> غیر مسدود کریں؟"</string>
-    <string name="report_not_spam_alert_button" msgid="3244953565919894995">"اطلاع دیں"</string>
-    <string name="report_not_spam_alert_title" msgid="395961923213504916">"غلطی کی اطلاع دیں؟"</string>
-    <string name="report_not_spam_alert_details" msgid="4463730683530824797">"مستقبل میں <xliff:g id="NUMBER">%1$s</xliff:g> سے کالز بطور سپام شناخت نہیں ہوں گی۔"</string>
-    <string name="checkbox_report_as_spam_action" msgid="1549159682170273798">"کال کی بطور سپام اطلاع دیں"</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="migrate_blocked_numbers_dialog_title">نئی، آسان انسداد</string>
+  <string name="migrate_blocked_numbers_dialog_message">آپ کو بہتر طریقے سے حفاظت فراہم کرنے کیلئے فون کو انسداد کے کام کرنے کا طریقہ تبدیل کرنا ہوگا۔ آپ کے مسدود کردہ نمبروں سے کالیں اور متنی پیغامات دونوں مسدود کر دیے جائیں گے اور ممکن ہے ان کا اشتراک دیگر ایپس کے ساتھ کیا جائے۔</string>
+  <string name="migrate_blocked_numbers_dialog_allow_button">اجازت دیں</string>
+  <string name="old_block_number_confirmation_title">%1$s مسدود کریں؟</string>
+  <string name="block_number_confirmation_message_vvm">اس نمبر سے کالز مسدود ہوجائیں گی اور صوتی میلز خودبخزد جذف ہو جائیں گی۔</string>
+  <string name="block_number_confirmation_message_no_vvm">اس نمبر سے کالز مسدود ہو جائیں گی گی لیکن ممکن ہے کالر پھر بھی آپ کیلئے صوتی میلز چھوڑ پائے۔</string>
+  <string name="block_number_confirmation_message_new_filtering">آپ کو اب اس نمبر سے مزید کالز یا متنی پیغامات موصول نہیں ہوں گے۔</string>
+  <string name="block_number_ok">مسدود کریں</string>
+  <string name="unblock_number_confirmation_title">%1$s غیر مسدود کریں؟</string>
+  <string name="unblock_number_ok">غیر مسدود کریں</string>
+  <string name="invalidNumber">%1$s غلط ہے۔</string>
+  <string name="snackbar_number_blocked">%1$s مسدود ہو گیا</string>
+  <string name="snackbar_number_unblocked">%1$s غیر مسدود ہو گیا</string>
+  <string name="send_to_voicemail_import_failed">درآمد کرنا ناکام ہوگیا</string>
+  <string name="call_blocking_disabled_notification_title">کال مسدود کرنا 48 گھنٹے کیلئے غیر فعال ہو گیا</string>
+  <string name="call_blocking_disabled_notification_text">غیر فعال ہو گیا کیونکہ ایک ہنگامی کال کی گئی تھی۔</string>
 </resources>
diff --git a/java/com/android/dialer/blocking/res/values-uz/strings.xml b/java/com/android/dialer/blocking/res/values-uz/strings.xml
index 36db124..03d484a 100644
--- a/java/com/android/dialer/blocking/res/values-uz/strings.xml
+++ b/java/com/android/dialer/blocking/res/values-uz/strings.xml
@@ -1,46 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="migrate_blocked_numbers_dialog_title" msgid="7823962296457673809">"Raqamlarni bloklashning sodda usuli"</string>
-    <string name="migrate_blocked_numbers_dialog_message" msgid="8309736147266462485">"Sizni yanada yaxshiroq himoya qilish uchun Telefon ilovasi bloklash tartibini sozlashi lozim. Bloklangan raqamlardan keladigan chaqiruvlar ham, SMS xabarlar ham qabul qilinmaydi. Boshqa ilovalarga ham bunday raqamlardan foydalanishga ruxsat bering."</string>
-    <string name="migrate_blocked_numbers_dialog_allow_button" msgid="5192836471557751367">"Ruxsat berish"</string>
-    <string name="block_number_confirmation_title" msgid="2699521227461376076">"<xliff:g id="NUMBER">%1$s</xliff:g> raqami bloklanilsinmi?"</string>
-    <string name="block_number_confirmation_message_vvm" msgid="6501105244172290939">"Bu raqamdan kelgan qo‘ng‘iroqlar bloklanadi va ovozli xabari avtomatik o‘chiriladi."</string>
-    <string name="block_number_confirmation_message_no_vvm" msgid="8236641245709649882">"Bu raqamdan kelgan qo‘ng‘iroqlar bloklanadi, lekin raqam egasi sizga ovozli xabar qoldira oladi."</string>
-    <string name="block_number_confirmation_message_new_filtering" msgid="8487449683723062644">"Siz endi bu raqamdan qo‘ng‘iroq va SMS qabul qilmaysiz."</string>
-    <string name="block_number_ok" msgid="739786082788038932">"BLOKLASH"</string>
-    <string name="unblock_number_confirmation_title" msgid="7897778825085659941">"<xliff:g id="NUMBER">%1$s</xliff:g> raqami blokdan chiqarilsinmi?"</string>
-    <string name="unblock_number_ok" msgid="5089057152966269355">"BLOKDAN CHIQARISH"</string>
-    <string name="invalidNumber" msgid="6270918250761754967">"Noto‘g‘ri raqam: <xliff:g id="NUMBER">%1$s</xliff:g>."</string>
-    <string name="snackbar_number_blocked" msgid="5760234822413921845">"<xliff:g id="NUMBER">%1$s</xliff:g> raqami bloklandi"</string>
-    <string name="snackbar_number_unblocked" msgid="7941296274123990585">"<xliff:g id="NUMBER">%1$s</xliff:g> raqami blokdan chiqarildi"</string>
-    <string name="block_number_undo" msgid="5158120911892491697">"QAYTARISH"</string>
-    <string name="send_to_voicemail_import_failed" msgid="1012752662074208237">"Import qilib bo‘lmadi"</string>
-    <string name="call_blocking_disabled_notification_title" msgid="7211352205255347489">"Qo‘ng‘iroqlarni bloklash 48 soat muddatga o‘chirildi"</string>
-    <string name="call_blocking_disabled_notification_text" msgid="141384084865180722">"Favqulodda qo‘ng‘iroq amalga oshirilgani uchun o‘chirildi."</string>
-    <string name="block_report_number_alert_title" msgid="2740581989824959611">"<xliff:g id="NUMBER">%1$s</xliff:g> raqami bloklanilsinmi?"</string>
-    <string name="block_report_number_alert_details" msgid="2652479394593143562">"Bu raqamdan qo‘ng‘iroqlar endi bloklanadi."</string>
-    <string name="block_number_alert_details" msgid="715942751312046429">"<xliff:g id="TEXT">%1$s</xliff:g> Bu qo‘ng‘iroq spam deb belgilanadi."</string>
-    <string name="unblock_number_alert_details" msgid="8696070817026870606">"Bu raqam blokdan chiqariladi. Undan keluvchi kelgusi qo‘ng‘iroqlar spam sifatida aniqlanmaydi."</string>
-    <string name="unblock_report_number_alert_title" msgid="2221901995393696882">"<xliff:g id="NUMBER">%1$s</xliff:g> raqami blokdan chiqarilsinmi?"</string>
-    <string name="report_not_spam_alert_button" msgid="3244953565919894995">"Xabar berish"</string>
-    <string name="report_not_spam_alert_title" msgid="395961923213504916">"Xatoga yo‘l qo‘yildi deb xabar berasizmi?"</string>
-    <string name="report_not_spam_alert_details" msgid="4463730683530824797">"<xliff:g id="NUMBER">%1$s</xliff:g> raqamidan keluvchi kelgusi qo‘ng‘iroqlar spam sifatida aniqlanmaydi."</string>
-    <string name="checkbox_report_as_spam_action" msgid="1549159682170273798">"Spam haqida shikoyat qilish"</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="migrate_blocked_numbers_dialog_title">Raqamlarni bloklashning sodda usuli</string>
+  <string name="migrate_blocked_numbers_dialog_message">Sizni yanada yaxshiroq himoya qilish uchun Telefon ilovasi bloklash tartibini sozlashi lozim. Bloklangan raqamlardan keladigan chaqiruvlar ham, SMS xabarlar ham qabul qilinmaydi. Boshqa ilovalarga ham bunday raqamlardan foydalanishga ruxsat bering.</string>
+  <string name="migrate_blocked_numbers_dialog_allow_button">Ruxsat berish</string>
+  <string name="old_block_number_confirmation_title">%1$s bloklansinmi?</string>
+  <string name="block_number_confirmation_message_vvm">Bu raqamdan kelgan qo‘ng‘iroqlar bloklanadi va ovozli xabari avtomatik o‘chiriladi.</string>
+  <string name="block_number_confirmation_message_no_vvm">Bu raqamdan kelgan qo‘ng‘iroqlar bloklanadi, lekin raqam egasi sizga ovozli xabar qoldira oladi.</string>
+  <string name="block_number_confirmation_message_new_filtering">Siz endi bu raqamdan qo‘ng‘iroq va SMS qabul qilmaysiz.</string>
+  <string name="block_number_ok">BLOKLASH</string>
+  <string name="unblock_number_confirmation_title">%1$s raqami blokdan chiqarilsinmi?</string>
+  <string name="unblock_number_ok">BLOKDAN CHIQARISH</string>
+  <string name="invalidNumber">%1$s raqami xato.</string>
+  <string name="snackbar_number_blocked">%1$s raqami bloklandi</string>
+  <string name="snackbar_number_unblocked">%1$s raqami blokdan chiqarildi</string>
+  <string name="send_to_voicemail_import_failed">Import qilib bo‘lmadi</string>
+  <string name="call_blocking_disabled_notification_title">Qo‘ng‘iroqlarni bloklash 48 soat muddatga o‘chirildi</string>
+  <string name="call_blocking_disabled_notification_text">Favqulodda qo‘ng‘iroq amalga oshirilgani uchun o‘chirildi.</string>
 </resources>
diff --git a/java/com/android/dialer/blocking/res/values-vi/strings.xml b/java/com/android/dialer/blocking/res/values-vi/strings.xml
index 35bddd5..d28cd7a 100644
--- a/java/com/android/dialer/blocking/res/values-vi/strings.xml
+++ b/java/com/android/dialer/blocking/res/values-vi/strings.xml
@@ -1,46 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="migrate_blocked_numbers_dialog_title" msgid="7823962296457673809">"Tính năng chặn mới, được đơn giản hóa"</string>
-    <string name="migrate_blocked_numbers_dialog_message" msgid="8309736147266462485">"Để bảo vệ bạn tốt hơn, Điện thoại cần thay đổi cách hoạt động của tính năng chặn. Giờ đây, các số đã chặn của bạn sẽ bị chặn cả cuộc gọi và tin nhắn, đồng thời có thể được chia sẻ với các ứng dụng khác."</string>
-    <string name="migrate_blocked_numbers_dialog_allow_button" msgid="5192836471557751367">"Cho phép"</string>
-    <string name="block_number_confirmation_title" msgid="2699521227461376076">"Chặn <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="block_number_confirmation_message_vvm" msgid="6501105244172290939">"Các cuộc gọi từ số này sẽ bị chặn và thư thoại sẽ tự động bị xóa."</string>
-    <string name="block_number_confirmation_message_no_vvm" msgid="8236641245709649882">"Các cuộc gọi từ số này sẽ bị chặn nhưng người gọi vẫn có thể để lại thư thoại cho bạn."</string>
-    <string name="block_number_confirmation_message_new_filtering" msgid="8487449683723062644">"Bạn sẽ không nhận được các cuộc gọi hoặc tin nhắn từ số này nữa."</string>
-    <string name="block_number_ok" msgid="739786082788038932">"CHẶN"</string>
-    <string name="unblock_number_confirmation_title" msgid="7897778825085659941">"Bỏ chặn <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="unblock_number_ok" msgid="5089057152966269355">"BỎ CHẶN"</string>
-    <string name="invalidNumber" msgid="6270918250761754967">"<xliff:g id="NUMBER">%1$s</xliff:g> không hợp lệ."</string>
-    <string name="snackbar_number_blocked" msgid="5760234822413921845">"Đã chặn <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="snackbar_number_unblocked" msgid="7941296274123990585">"Đã bỏ chặn <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="block_number_undo" msgid="5158120911892491697">"HOÀN TÁC"</string>
-    <string name="send_to_voicemail_import_failed" msgid="1012752662074208237">"Nhập không thành công"</string>
-    <string name="call_blocking_disabled_notification_title" msgid="7211352205255347489">"Đã tắt tính năng chặn cuộc gọi trong 48 giờ"</string>
-    <string name="call_blocking_disabled_notification_text" msgid="141384084865180722">"Bị tắt vì bạn đã thực hiện cuộc gọi khẩn cấp."</string>
-    <string name="block_report_number_alert_title" msgid="2740581989824959611">"Chặn <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="block_report_number_alert_details" msgid="2652479394593143562">"Bạn sẽ không nhận được cuộc gọi từ số này nữa."</string>
-    <string name="block_number_alert_details" msgid="715942751312046429">"<xliff:g id="TEXT">%1$s</xliff:g> Cuộc gọi này sẽ được báo cáo là spam."</string>
-    <string name="unblock_number_alert_details" msgid="8696070817026870606">"Số này sẽ được bỏ chặn và được báo cáo là không phải spam. Các cuộc gọi trong tương lai sẽ không bị coi là spam."</string>
-    <string name="unblock_report_number_alert_title" msgid="2221901995393696882">"Bỏ chặn <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="report_not_spam_alert_button" msgid="3244953565919894995">"Báo cáo"</string>
-    <string name="report_not_spam_alert_title" msgid="395961923213504916">"Báo cáo nhầm lẫn?"</string>
-    <string name="report_not_spam_alert_details" msgid="4463730683530824797">"Cuộc gọi trong tương lai từ <xliff:g id="NUMBER">%1$s</xliff:g> sẽ không bị coi là spam nữa."</string>
-    <string name="checkbox_report_as_spam_action" msgid="1549159682170273798">"Báo cáo cuộc gọi là spam"</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="migrate_blocked_numbers_dialog_title">Tính năng chặn mới, được đơn giản hóa</string>
+  <string name="migrate_blocked_numbers_dialog_message">Để bảo vệ bạn tốt hơn, Điện thoại cần thay đổi cách hoạt động của tính năng chặn. Giờ đây, các số đã chặn của bạn sẽ bị chặn cả cuộc gọi và tin nhắn, đồng thời có thể được chia sẻ với các ứng dụng khác.</string>
+  <string name="migrate_blocked_numbers_dialog_allow_button">Cho phép</string>
+  <string name="old_block_number_confirmation_title">Bạn muốn chặn %1$s?</string>
+  <string name="block_number_confirmation_message_vvm">Các cuộc gọi từ số này sẽ bị chặn và thư thoại sẽ tự động bị xóa.</string>
+  <string name="block_number_confirmation_message_no_vvm">Các cuộc gọi từ số này sẽ bị chặn nhưng người gọi vẫn có thể để lại thư thoại cho bạn.</string>
+  <string name="block_number_confirmation_message_new_filtering">Bạn sẽ không nhận được các cuộc gọi hoặc tin nhắn từ số này nữa.</string>
+  <string name="block_number_ok">CHẶN</string>
+  <string name="unblock_number_confirmation_title">Bỏ chặn %1$s?</string>
+  <string name="unblock_number_ok">BỎ CHẶN</string>
+  <string name="invalidNumber">%1$s không hợp lệ.</string>
+  <string name="snackbar_number_blocked">Đã chặn %1$s</string>
+  <string name="snackbar_number_unblocked">Đã bỏ chặn %1$s</string>
+  <string name="send_to_voicemail_import_failed">Nhập không thành công</string>
+  <string name="call_blocking_disabled_notification_title">Đã tắt tính năng chặn cuộc gọi trong 48 giờ</string>
+  <string name="call_blocking_disabled_notification_text">Bị tắt vì bạn đã thực hiện cuộc gọi khẩn cấp.</string>
 </resources>
diff --git a/java/com/android/dialer/blocking/res/values-zh-rCN/strings.xml b/java/com/android/dialer/blocking/res/values-zh-rCN/strings.xml
index 670c837..c105424 100644
--- a/java/com/android/dialer/blocking/res/values-zh-rCN/strings.xml
+++ b/java/com/android/dialer/blocking/res/values-zh-rCN/strings.xml
@@ -1,46 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="migrate_blocked_numbers_dialog_title" msgid="7823962296457673809">"简单易用的全新屏蔽功能"</string>
-    <string name="migrate_blocked_numbers_dialog_message" msgid="8309736147266462485">"为了向您提供更好的安全保护，“电话”应用需要升级屏蔽方式。您将不会再收到已屏蔽号码的来电和短信，而且系统还可能会将屏蔽号码列表共享给其他应用。"</string>
-    <string name="migrate_blocked_numbers_dialog_allow_button" msgid="5192836471557751367">"允许"</string>
-    <string name="block_number_confirmation_title" msgid="2699521227461376076">"要屏蔽 <xliff:g id="NUMBER">%1$s</xliff:g> 吗？"</string>
-    <string name="block_number_confirmation_message_vvm" msgid="6501105244172290939">"系统将屏蔽该号码的来电，并将自动删除来电者发送的语音邮件。"</string>
-    <string name="block_number_confirmation_message_no_vvm" msgid="8236641245709649882">"系统将屏蔽该号码的来电，但来电者可能仍然能够给您发送语音邮件。"</string>
-    <string name="block_number_confirmation_message_new_filtering" msgid="8487449683723062644">"您将不会再收到此号码的来电或短信。"</string>
-    <string name="block_number_ok" msgid="739786082788038932">"屏蔽"</string>
-    <string name="unblock_number_confirmation_title" msgid="7897778825085659941">"要取消屏蔽 <xliff:g id="NUMBER">%1$s</xliff:g> 吗？"</string>
-    <string name="unblock_number_ok" msgid="5089057152966269355">"取消屏蔽"</string>
-    <string name="invalidNumber" msgid="6270918250761754967">"<xliff:g id="NUMBER">%1$s</xliff:g> 无效。"</string>
-    <string name="snackbar_number_blocked" msgid="5760234822413921845">"已屏蔽 <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="snackbar_number_unblocked" msgid="7941296274123990585">"已取消屏蔽 <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="block_number_undo" msgid="5158120911892491697">"撤消"</string>
-    <string name="send_to_voicemail_import_failed" msgid="1012752662074208237">"导入失败"</string>
-    <string name="call_blocking_disabled_notification_title" msgid="7211352205255347489">"来电拦截功能将停用 48 小时"</string>
-    <string name="call_blocking_disabled_notification_text" msgid="141384084865180722">"此功能已停用，因为您拨打了紧急呼救电话。"</string>
-    <string name="block_report_number_alert_title" msgid="2740581989824959611">"要屏蔽 <xliff:g id="NUMBER">%1$s</xliff:g> 吗？"</string>
-    <string name="block_report_number_alert_details" msgid="2652479394593143562">"您将不会再收到此号码的来电。"</string>
-    <string name="block_number_alert_details" msgid="715942751312046429">"<xliff:g id="TEXT">%1$s</xliff:g>此次来电将被举报为骚扰电话。"</string>
-    <string name="unblock_number_alert_details" msgid="8696070817026870606">"系统将取消屏蔽此号码，并停止将其列为骚扰电话号码。此号码日后的来电不会再被识别为骚扰电话。"</string>
-    <string name="unblock_report_number_alert_title" msgid="2221901995393696882">"要取消屏蔽 <xliff:g id="NUMBER">%1$s</xliff:g> 吗？"</string>
-    <string name="report_not_spam_alert_button" msgid="3244953565919894995">"报告"</string>
-    <string name="report_not_spam_alert_title" msgid="395961923213504916">"要报告错误吗？"</string>
-    <string name="report_not_spam_alert_details" msgid="4463730683530824797">"系统不会再将 <xliff:g id="NUMBER">%1$s</xliff:g> 日后的来电识别为骚扰电话。"</string>
-    <string name="checkbox_report_as_spam_action" msgid="1549159682170273798">"举报为骚扰电话号码"</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="migrate_blocked_numbers_dialog_title">简单易用的全新屏蔽功能</string>
+  <string name="migrate_blocked_numbers_dialog_message">为了向您提供更好的安全保护，“电话”应用需要升级屏蔽方式。您将不会再收到已屏蔽号码的来电和短信，而且系统还可能会将屏蔽号码列表共享给其他应用。</string>
+  <string name="migrate_blocked_numbers_dialog_allow_button">允许</string>
+  <string name="old_block_number_confirmation_title">要屏蔽 %1$s 吗？</string>
+  <string name="block_number_confirmation_message_vvm">系统将屏蔽该号码的来电，并将自动删除来电者发送的语音邮件。</string>
+  <string name="block_number_confirmation_message_no_vvm">系统将屏蔽该号码的来电，但来电者可能仍然能够给您发送语音邮件。</string>
+  <string name="block_number_confirmation_message_new_filtering">您将不会再收到此号码的来电或短信。</string>
+  <string name="block_number_ok">屏蔽</string>
+  <string name="unblock_number_confirmation_title">要取消屏蔽 %1$s 吗？</string>
+  <string name="unblock_number_ok">取消屏蔽</string>
+  <string name="invalidNumber">%1$s 无效。</string>
+  <string name="snackbar_number_blocked">已屏蔽 %1$s</string>
+  <string name="snackbar_number_unblocked">已取消屏蔽 %1$s</string>
+  <string name="send_to_voicemail_import_failed">导入失败</string>
+  <string name="call_blocking_disabled_notification_title">来电拦截功能将停用 48 小时</string>
+  <string name="call_blocking_disabled_notification_text">此功能已停用，因为您拨打了紧急呼救电话。</string>
 </resources>
diff --git a/java/com/android/dialer/blocking/res/values-zh-rHK/strings.xml b/java/com/android/dialer/blocking/res/values-zh-rHK/strings.xml
index 8c650d7..d59f430 100644
--- a/java/com/android/dialer/blocking/res/values-zh-rHK/strings.xml
+++ b/java/com/android/dialer/blocking/res/values-zh-rHK/strings.xml
@@ -1,46 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="migrate_blocked_numbers_dialog_title" msgid="7823962296457673809">"全新、簡單的封鎖功能"</string>
-    <string name="migrate_blocked_numbers_dialog_message" msgid="8309736147266462485">"為更有效保護您的安全，Phone 需要變更封鎖功能的運作方式。系統現在會拒絕已封鎖號碼的來電和短訊，並可能將這些號碼提供給其他應用程式使用。"</string>
-    <string name="migrate_blocked_numbers_dialog_allow_button" msgid="5192836471557751367">"允許"</string>
-    <string name="block_number_confirmation_title" msgid="2699521227461376076">"要封鎖 <xliff:g id="NUMBER">%1$s</xliff:g> 嗎？"</string>
-    <string name="block_number_confirmation_message_vvm" msgid="6501105244172290939">"將會封鎖這個號碼的來電，而留言將會自動刪除。"</string>
-    <string name="block_number_confirmation_message_no_vvm" msgid="8236641245709649882">"將會封鎖這個號碼的來電，但來電可能會轉駁至留言信箱。"</string>
-    <string name="block_number_confirmation_message_new_filtering" msgid="8487449683723062644">"您不會再收到這個號碼的來電和短訊。"</string>
-    <string name="block_number_ok" msgid="739786082788038932">"封鎖"</string>
-    <string name="unblock_number_confirmation_title" msgid="7897778825085659941">"要解除封鎖 <xliff:g id="NUMBER">%1$s</xliff:g> 嗎？"</string>
-    <string name="unblock_number_ok" msgid="5089057152966269355">"解除封鎖"</string>
-    <string name="invalidNumber" msgid="6270918250761754967">"<xliff:g id="NUMBER">%1$s</xliff:g> 無效。"</string>
-    <string name="snackbar_number_blocked" msgid="5760234822413921845">"已封鎖 <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="snackbar_number_unblocked" msgid="7941296274123990585">"已解除封鎖 <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="block_number_undo" msgid="5158120911892491697">"復原"</string>
-    <string name="send_to_voicemail_import_failed" msgid="1012752662074208237">"匯入失敗"</string>
-    <string name="call_blocking_disabled_notification_title" msgid="7211352205255347489">"已停用來電封鎖 (48 小時)"</string>
-    <string name="call_blocking_disabled_notification_text" msgid="141384084865180722">"已撥打緊急電話，已停用來電封鎖功能。"</string>
-    <string name="block_report_number_alert_title" msgid="2740581989824959611">"要封鎖 <xliff:g id="NUMBER">%1$s</xliff:g> 嗎？"</string>
-    <string name="block_report_number_alert_details" msgid="2652479394593143562">"您不會再收到此號碼的來電。"</string>
-    <string name="block_number_alert_details" msgid="715942751312046429">"<xliff:g id="TEXT">%1$s</xliff:g> 此來電將舉報為垃圾來電。"</string>
-    <string name="unblock_number_alert_details" msgid="8696070817026870606">"系統會將此號碼解除封鎖，並舉報為非垃圾號碼。此外，系統不會將日後的來電視為垃圾來電。"</string>
-    <string name="unblock_report_number_alert_title" msgid="2221901995393696882">"要解除封鎖 <xliff:g id="NUMBER">%1$s</xliff:g> 嗎？"</string>
-    <string name="report_not_spam_alert_button" msgid="3244953565919894995">"舉報"</string>
-    <string name="report_not_spam_alert_title" msgid="395961923213504916">"要舉報錯誤嗎？"</string>
-    <string name="report_not_spam_alert_details" msgid="4463730683530824797">"系統不會再將日後 <xliff:g id="NUMBER">%1$s</xliff:g> 的來電視為垃圾來電。"</string>
-    <string name="checkbox_report_as_spam_action" msgid="1549159682170273798">"舉報為垃圾來電"</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="migrate_blocked_numbers_dialog_title">全新、簡單的封鎖功能</string>
+  <string name="migrate_blocked_numbers_dialog_message">為更有效保護您的安全，Phone 需要變更封鎖功能的運作方式。系統現在會拒絕已封鎖號碼的來電和短訊，並可能將這些號碼提供給其他應用程式使用。</string>
+  <string name="migrate_blocked_numbers_dialog_allow_button">允許</string>
+  <string name="old_block_number_confirmation_title">要封鎖 %1$s 嗎？</string>
+  <string name="block_number_confirmation_message_vvm">將會封鎖這個號碼的來電，而留言將會自動刪除。</string>
+  <string name="block_number_confirmation_message_no_vvm">將會封鎖這個號碼的來電，但來電可能會轉駁至留言信箱。</string>
+  <string name="block_number_confirmation_message_new_filtering">您不會再收到這個號碼的來電和短訊。</string>
+  <string name="block_number_ok">封鎖</string>
+  <string name="unblock_number_confirmation_title">要解除封鎖 %1$s 嗎？</string>
+  <string name="unblock_number_ok">解除封鎖</string>
+  <string name="invalidNumber">%1$s 無效。</string>
+  <string name="snackbar_number_blocked">已封鎖 %1$s</string>
+  <string name="snackbar_number_unblocked">已解除封鎖 %1$s</string>
+  <string name="send_to_voicemail_import_failed">匯入失敗</string>
+  <string name="call_blocking_disabled_notification_title">已停用來電封鎖 (48 小時)</string>
+  <string name="call_blocking_disabled_notification_text">已撥打緊急電話，已停用來電封鎖功能。</string>
 </resources>
diff --git a/java/com/android/dialer/blocking/res/values-zh-rTW/strings.xml b/java/com/android/dialer/blocking/res/values-zh-rTW/strings.xml
index 0d9856c..c5f3fa2 100644
--- a/java/com/android/dialer/blocking/res/values-zh-rTW/strings.xml
+++ b/java/com/android/dialer/blocking/res/values-zh-rTW/strings.xml
@@ -1,46 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="migrate_blocked_numbers_dialog_title" msgid="7823962296457673809">"全新、簡易的封鎖功能"</string>
-    <string name="migrate_blocked_numbers_dialog_message" msgid="8309736147266462485">"「電話」應用程式需要變更封鎖功能的運作方式，以進一步保護您的安全。現在開始，系統會拒絕已封鎖號碼的來電和簡訊，還會將這些號碼提供給其他應用程式。"</string>
-    <string name="migrate_blocked_numbers_dialog_allow_button" msgid="5192836471557751367">"允許"</string>
-    <string name="block_number_confirmation_title" msgid="2699521227461376076">"要封鎖 <xliff:g id="NUMBER">%1$s</xliff:g> 嗎？"</string>
-    <string name="block_number_confirmation_message_vvm" msgid="6501105244172290939">"系統會封鎖這組號碼的來電，並自動刪除對方的語音留言。"</string>
-    <string name="block_number_confirmation_message_no_vvm" msgid="8236641245709649882">"系統會封鎖這組號碼的來電，但對方仍可錄製語音留言給您。"</string>
-    <string name="block_number_confirmation_message_new_filtering" msgid="8487449683723062644">"您不會再收到這組號碼的來電或簡訊。"</string>
-    <string name="block_number_ok" msgid="739786082788038932">"封鎖"</string>
-    <string name="unblock_number_confirmation_title" msgid="7897778825085659941">"要解除封鎖 <xliff:g id="NUMBER">%1$s</xliff:g> 嗎？"</string>
-    <string name="unblock_number_ok" msgid="5089057152966269355">"解除封鎖"</string>
-    <string name="invalidNumber" msgid="6270918250761754967">"<xliff:g id="NUMBER">%1$s</xliff:g> 無效。"</string>
-    <string name="snackbar_number_blocked" msgid="5760234822413921845">"已封鎖 <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="snackbar_number_unblocked" msgid="7941296274123990585">"已解除封鎖 <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="block_number_undo" msgid="5158120911892491697">"復原"</string>
-    <string name="send_to_voicemail_import_failed" msgid="1012752662074208237">"匯入失敗"</string>
-    <string name="call_blocking_disabled_notification_title" msgid="7211352205255347489">"來電封鎖功能會停用 48 小時"</string>
-    <string name="call_blocking_disabled_notification_text" msgid="141384084865180722">"由於您曾撥打緊急電話，因此本功能已停用。"</string>
-    <string name="block_report_number_alert_title" msgid="2740581989824959611">"要封鎖 <xliff:g id="NUMBER">%1$s</xliff:g> 嗎？"</string>
-    <string name="block_report_number_alert_details" msgid="2652479394593143562">"您不會再收到這組號碼的來電。"</string>
-    <string name="block_number_alert_details" msgid="715942751312046429">"<xliff:g id="TEXT">%1$s</xliff:g> 系統會將本次來電回報為騷擾/廣告電話。"</string>
-    <string name="unblock_number_alert_details" msgid="8696070817026870606">"系統會解除封鎖這組號碼並回報為非騷擾/廣告電話，該號碼日後的來電不會歸類為騷擾/廣告電話。"</string>
-    <string name="unblock_report_number_alert_title" msgid="2221901995393696882">"要解除封鎖 <xliff:g id="NUMBER">%1$s</xliff:g> 嗎？"</string>
-    <string name="report_not_spam_alert_button" msgid="3244953565919894995">"回報"</string>
-    <string name="report_not_spam_alert_title" msgid="395961923213504916">"要回報錯誤嗎？"</string>
-    <string name="report_not_spam_alert_details" msgid="4463730683530824797">"日後來自 <xliff:g id="NUMBER">%1$s</xliff:g> 的電話不會再歸類為騷擾/廣告電話。"</string>
-    <string name="checkbox_report_as_spam_action" msgid="1549159682170273798">"回報為騷擾/廣告電話"</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="migrate_blocked_numbers_dialog_title">全新、簡易的封鎖功能</string>
+  <string name="migrate_blocked_numbers_dialog_message">「電話」應用程式需要變更封鎖功能的運作方式，以進一步保護您的安全。現在開始，系統會拒絕已封鎖號碼的來電和簡訊，還會將這些號碼提供給其他應用程式。</string>
+  <string name="migrate_blocked_numbers_dialog_allow_button">允許</string>
+  <string name="old_block_number_confirmation_title">要封鎖 %1$s 嗎？</string>
+  <string name="block_number_confirmation_message_vvm">系統會封鎖這組號碼的來電，並自動刪除對方的語音留言。</string>
+  <string name="block_number_confirmation_message_no_vvm">系統會封鎖這組號碼的來電，但對方仍可錄製語音留言給您。</string>
+  <string name="block_number_confirmation_message_new_filtering">您不會再收到這組號碼的來電或簡訊。</string>
+  <string name="block_number_ok">封鎖</string>
+  <string name="unblock_number_confirmation_title">要解除封鎖 %1$s 嗎？</string>
+  <string name="unblock_number_ok">解除封鎖</string>
+  <string name="invalidNumber">%1$s 無效。</string>
+  <string name="snackbar_number_blocked">已封鎖 %1$s</string>
+  <string name="snackbar_number_unblocked">已解除封鎖 %1$s</string>
+  <string name="send_to_voicemail_import_failed">匯入失敗</string>
+  <string name="call_blocking_disabled_notification_title">來電封鎖功能會停用 48 小時</string>
+  <string name="call_blocking_disabled_notification_text">由於您曾撥打緊急電話，因此本功能已停用。</string>
 </resources>
diff --git a/java/com/android/dialer/blocking/res/values-zu/strings.xml b/java/com/android/dialer/blocking/res/values-zu/strings.xml
index 7c500ed..a3e761d 100644
--- a/java/com/android/dialer/blocking/res/values-zu/strings.xml
+++ b/java/com/android/dialer/blocking/res/values-zu/strings.xml
@@ -1,46 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="migrate_blocked_numbers_dialog_title" msgid="7823962296457673809">"Ukuvimbela okusha, okwenziwe lula"</string>
-    <string name="migrate_blocked_numbers_dialog_message" msgid="8309736147266462485">"Ukuze uvikeleke kangcono, ifoni kumele sishintshe indlela okusebenza ngayo ukuvimbela. Izinombolo zakho ezivinjelwe manje zizomisa kokubili amakholi nemibhalo futhi zingabiwa nezinye izinhlelo zokusebenza."</string>
-    <string name="migrate_blocked_numbers_dialog_allow_button" msgid="5192836471557751367">"Vumela"</string>
-    <string name="block_number_confirmation_title" msgid="2699521227461376076">"Vimba <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="block_number_confirmation_message_vvm" msgid="6501105244172290939">"Amakholi wangakusasa kusuka kule nombolo azovinyelwa futhi amavoyisimeyili azosuswa ngokuzenzakalela."</string>
-    <string name="block_number_confirmation_message_no_vvm" msgid="8236641245709649882">"Amakholi kusuka kule nombolo azovinjwa, kodwa inkampani yenenethiwekhi ingakwazi ukukushiyela amavoyisimeyili."</string>
-    <string name="block_number_confirmation_message_new_filtering" msgid="8487449683723062644">"Ngeke usathola amakholi noma imibhalo kusukela kule nombolo."</string>
-    <string name="block_number_ok" msgid="739786082788038932">"VIMBA"</string>
-    <string name="unblock_number_confirmation_title" msgid="7897778825085659941">"Vulela i-<xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="unblock_number_ok" msgid="5089057152966269355">"VULELA"</string>
-    <string name="invalidNumber" msgid="6270918250761754967">"<xliff:g id="NUMBER">%1$s</xliff:g> ayivumelekile."</string>
-    <string name="snackbar_number_blocked" msgid="5760234822413921845">"<xliff:g id="NUMBER">%1$s</xliff:g> ivinjiwe"</string>
-    <string name="snackbar_number_unblocked" msgid="7941296274123990585">"<xliff:g id="NUMBER">%1$s</xliff:g> vulela"</string>
-    <string name="block_number_undo" msgid="5158120911892491697">"HLEHLISA"</string>
-    <string name="send_to_voicemail_import_failed" msgid="1012752662074208237">"Ukulanda akuphumelelanga"</string>
-    <string name="call_blocking_disabled_notification_title" msgid="7211352205255347489">"Ukuvimbela ikholi kukhutshaziwe amahora angu-48"</string>
-    <string name="call_blocking_disabled_notification_text" msgid="141384084865180722">"Kukhutshaziwe ngoba ikholi ephuthumayo yenziwe."</string>
-    <string name="block_report_number_alert_title" msgid="2740581989824959611">"Vimba <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="block_report_number_alert_details" msgid="2652479394593143562">"Ngeke usakwazi ukuthola amakholi kusuka kule nombolo."</string>
-    <string name="block_number_alert_details" msgid="715942751312046429">"<xliff:g id="TEXT">%1$s</xliff:g> Le kholi izobikwa njengogaxekile"</string>
-    <string name="unblock_number_alert_details" msgid="8696070817026870606">"Le nombolo izovulelwa futhi ibikwe njengokungayena ugaxekile. Amakholi namavoyisimeyili wasesikhathini esizayo ngeke ahlonzwe njengogaxekile."</string>
-    <string name="unblock_report_number_alert_title" msgid="2221901995393696882">"Vulela i-<xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="report_not_spam_alert_button" msgid="3244953565919894995">"Umbiko"</string>
-    <string name="report_not_spam_alert_title" msgid="395961923213504916">"Bika iphutha?"</string>
-    <string name="report_not_spam_alert_details" msgid="4463730683530824797">"Amakholi wasesikhathini esizayo asuka ku-<xliff:g id="NUMBER">%1$s</xliff:g> ngeke esahlonzwa njengogaxekile."</string>
-    <string name="checkbox_report_as_spam_action" msgid="1549159682170273798">"Bika njengogaxekile"</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="migrate_blocked_numbers_dialog_title">Ukuvimbela okusha, okwenziwe lula</string>
+  <string name="migrate_blocked_numbers_dialog_message">Ukuze uvikeleke kangcono, ifoni kumele sishintshe indlela okusebenza ngayo ukuvimbela. Izinombolo zakho ezivinjelwe manje zizomisa kokubili amakholi nemibhalo futhi zingabiwa nezinye izinhlelo zokusebenza.</string>
+  <string name="migrate_blocked_numbers_dialog_allow_button">Vumela</string>
+  <string name="old_block_number_confirmation_title">Vimba i-%1$s?</string>
+  <string name="block_number_confirmation_message_vvm">Amakholi wangakusasa kusuka kule nombolo azovinyelwa futhi amavoyisimeyili azosuswa ngokuzenzakalela.</string>
+  <string name="block_number_confirmation_message_no_vvm">Amakholi kusuka kule nombolo azovinjwa, kodwa inkampani yenenethiwekhi ingakwazi ukukushiyela amavoyisimeyili.</string>
+  <string name="block_number_confirmation_message_new_filtering">Ngeke usathola amakholi noma imibhalo kusukela kule nombolo.</string>
+  <string name="block_number_ok">VIMBA</string>
+  <string name="unblock_number_confirmation_title">Vulela i-%1$s?</string>
+  <string name="unblock_number_ok">VULELA</string>
+  <string name="invalidNumber">%1$s ayivumelekile.</string>
+  <string name="snackbar_number_blocked">%1$s ivinjiwe</string>
+  <string name="snackbar_number_unblocked">%1$s vulela</string>
+  <string name="send_to_voicemail_import_failed">Ukulanda akuphumelelanga</string>
+  <string name="call_blocking_disabled_notification_title">Ukuvimbela ikholi kukhutshaziwe amahora angu-48</string>
+  <string name="call_blocking_disabled_notification_text">Kukhutshaziwe ngoba ikholi ephuthumayo yenziwe.</string>
 </resources>
diff --git a/java/com/android/dialer/blocking/res/values/strings.xml b/java/com/android/dialer/blocking/res/values/strings.xml
index a660731..e5f6c80 100644
--- a/java/com/android/dialer/blocking/res/values/strings.xml
+++ b/java/com/android/dialer/blocking/res/values/strings.xml
@@ -29,7 +29,7 @@
   </string>
 
   <!-- Confirmation dialog title for blocking a number. [CHAR LIMIT=NONE] -->
-  <string name="block_number_confirmation_title">
+  <string name="old_block_number_confirmation_title">
     Block<xliff:g example="(555) 555-5555" id="number">%1$s</xliff:g>?
   </string>
 
@@ -78,9 +78,6 @@
     <xliff:g example="(555) 555-5555" id="number">%1$s</xliff:g>unblocked
   </string>
 
-  <!-- Text for undo button in snackbar for blocking/unblocking number. [CHAR LIMIT=10] -->
-  <string name="block_number_undo">UNDO</string>
-
   <!-- Error toast message for when send to voicemail import fails. [CHAR LIMIT=40] -->
   <string name="send_to_voicemail_import_failed">Import failed</string>
 
diff --git a/java/com/android/dialer/blockreportspam/BlockReportSpamDialogs.java b/java/com/android/dialer/blockreportspam/BlockReportSpamDialogs.java
index b75669f..ff2a588 100644
--- a/java/com/android/dialer/blockreportspam/BlockReportSpamDialogs.java
+++ b/java/com/android/dialer/blockreportspam/BlockReportSpamDialogs.java
@@ -17,21 +17,19 @@
 package com.android.dialer.blockreportspam;
 
 import android.app.Activity;
-import android.app.AlertDialog;
 import android.app.Dialog;
-import android.app.DialogFragment;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
+import android.support.v4.app.DialogFragment;
+import android.support.v7.app.AlertDialog;
 import android.view.View;
 import android.widget.CheckBox;
 import android.widget.TextView;
 import com.android.dialer.blocking.FilteredNumberCompat;
 
-/**
- * Helper class for creating dialog fragments to block a number and/or report it as spam/not spam.
- */
+/** Creates dialog fragments to block a number and/or report it as spam/not spam. */
 public final class BlockReportSpamDialogs {
 
   public static final String BLOCK_REPORT_SPAM_DIALOG_TAG = "BlockReportSpamDialog";
@@ -39,10 +37,10 @@
   public static final String UNBLOCK_DIALOG_TAG = "UnblockDialog";
   public static final String NOT_SPAM_DIALOG_TAG = "NotSpamDialog";
 
-  /** Creates a dialog with the default cancel button listener (dismisses dialog). */
+  /** Creates a dialog with the default cancel button listener (which dismisses the dialog). */
   private static AlertDialog.Builder createDialogBuilder(
       Activity activity, final DialogFragment fragment) {
-    return new AlertDialog.Builder(activity, R.style.AlertDialogTheme)
+    return new AlertDialog.Builder(activity)
         .setCancelable(true)
         .setNegativeButton(android.R.string.cancel, (dialog, which) -> fragment.dismiss());
   }
@@ -70,36 +68,36 @@
   }
 
   /**
-   * Listener passed to block/report spam dialog for positive click in {@link
-   * BlockReportSpamDialogFragment}.
+   * Positive listener for the "Block/Report spam" dialog {@link
+   * DialogFragmentForBlockingNumberAndOptionallyReportingAsSpam}.
    */
   public interface OnSpamDialogClickListener {
 
     /**
-     * Called when user clicks on positive button in block/report spam dialog.
+     * Called when the user clicks on the positive button of the "Block/Report spam" dialog.
      *
      * @param isSpamChecked Whether the spam checkbox is checked.
      */
     void onClick(boolean isSpamChecked);
   }
 
-  /** Listener passed to all dialogs except the block/report spam dialog for positive click. */
+  /** Positive listener for dialogs other than the "Block/Report spam" dialog. */
   public interface OnConfirmListener {
 
-    /** Called when user clicks on positive button in the dialog. */
+    /** Called when the user clicks on the positive button of the dialog. */
     void onClick();
   }
 
-  /** Contains the common attributes between all block/unblock/report spam dialog fragments. */
+  /** Contains common attributes shared among all dialog fragments. */
   private abstract static class CommonDialogsFragment extends DialogFragment {
 
     /** The number to display in the dialog title. */
     protected String displayNumber;
 
-    /** Called when dialog positive button is pressed. */
+    /** Listener for the positive button. */
     protected OnConfirmListener positiveListener;
 
-    /** Called when dialog is dismissed. */
+    /** Listener for when the dialog is dismissed. */
     @Nullable protected DialogInterface.OnDismissListener dismissListener;
 
     @Override
@@ -121,8 +119,14 @@
     }
   }
 
-  /** Dialog for block/report spam with the mark as spam checkbox. */
-  public static class BlockReportSpamDialogFragment extends CommonDialogsFragment {
+  /**
+   * Dialog for blocking a number and optionally reporting it as spam.
+   *
+   * <p>This dialog is for a number that is neither blocked nor marked as spam. It has a checkbox
+   * that allows the user to report a number as spam when they block it.
+   */
+  public static class DialogFragmentForBlockingNumberAndOptionallyReportingAsSpam
+      extends CommonDialogsFragment {
 
     /** Called when dialog positive button is pressed. */
     private OnSpamDialogClickListener onSpamDialogClickListener;
@@ -135,7 +139,8 @@
         boolean spamChecked,
         OnSpamDialogClickListener onSpamDialogClickListener,
         @Nullable DialogInterface.OnDismissListener dismissListener) {
-      BlockReportSpamDialogFragment fragment = new BlockReportSpamDialogFragment();
+      DialogFragmentForBlockingNumberAndOptionallyReportingAsSpam fragment =
+          new DialogFragmentForBlockingNumberAndOptionallyReportingAsSpam();
       fragment.spamChecked = spamChecked;
       fragment.displayNumber = displayNumber;
       fragment.onSpamDialogClickListener = onSpamDialogClickListener;
@@ -173,8 +178,14 @@
     }
   }
 
-  /** Dialog for blocking a number. */
-  public static class BlockDialogFragment extends CommonDialogsFragment {
+  /**
+   * Dialog for blocking a number and reporting it as spam.
+   *
+   * <p>This dialog is for the migration of blocked numbers. Its positive action should block a
+   * number, and also marks it as spam if the spam feature is enabled.
+   */
+  public static class DialogFragmentForBlockingNumberAndReportingAsSpam
+      extends CommonDialogsFragment {
 
     private boolean isSpamEnabled;
 
@@ -183,7 +194,8 @@
         boolean isSpamEnabled,
         OnConfirmListener positiveListener,
         @Nullable DialogInterface.OnDismissListener dismissListener) {
-      BlockDialogFragment fragment = new BlockDialogFragment();
+      DialogFragmentForBlockingNumberAndReportingAsSpam fragment =
+          new DialogFragmentForBlockingNumberAndReportingAsSpam();
       fragment.displayNumber = displayNumber;
       fragment.positiveListener = positiveListener;
       fragment.dismissListener = dismissListener;
@@ -212,8 +224,51 @@
     }
   }
 
-  /** Dialog for unblocking a number. */
-  public static class UnblockDialogFragment extends CommonDialogsFragment {
+  /**
+   * Dialog for blocking a number.
+   *
+   * <p>This dialog is for a spam number that hasn't been blocked. For example, if the user receives
+   * a spam call, this dialog will be shown if they would like to block the number.
+   */
+  public static class DialogFragmentForBlockingNumber extends CommonDialogsFragment {
+
+    public static DialogFragment newInstance(
+        String displayNumber,
+        OnConfirmListener positiveListener,
+        @Nullable DialogInterface.OnDismissListener dismissListener) {
+      DialogFragmentForBlockingNumberAndReportingAsSpam fragment =
+          new DialogFragmentForBlockingNumberAndReportingAsSpam();
+      fragment.displayNumber = displayNumber;
+      fragment.positiveListener = positiveListener;
+      fragment.dismissListener = dismissListener;
+      return fragment;
+    }
+
+    @Override
+    public Dialog onCreateDialog(Bundle savedInstanceState) {
+      super.onCreateDialog(savedInstanceState);
+      // Return the newly created dialog
+      AlertDialog.Builder alertDialogBuilder = createDialogBuilder(getActivity(), this);
+      Dialog dialog =
+          alertDialogBuilder
+              .setTitle(getString(R.string.block_number_confirmation_title, displayNumber))
+              .setMessage(getString(R.string.block_report_number_alert_details))
+              .setPositiveButton(
+                  R.string.block_number_ok, createGenericOnClickListener(this, positiveListener))
+              .create();
+      dialog.setCanceledOnTouchOutside(true);
+      return dialog;
+    }
+  }
+
+  /**
+   * Dialog for unblocking a number and marking it as not spam.
+   *
+   * <p>This dialog is used in the old call log, where unblocking a number will also mark it as not
+   * spam.
+   */
+  public static class DialogFragmentForUnblockingNumberAndReportingAsNotSpam
+      extends CommonDialogsFragment {
 
     /** Whether or not the number is spam. */
     private boolean isSpam;
@@ -223,7 +278,8 @@
         boolean isSpam,
         OnConfirmListener positiveListener,
         @Nullable DialogInterface.OnDismissListener dismissListener) {
-      UnblockDialogFragment fragment = new UnblockDialogFragment();
+      DialogFragmentForUnblockingNumberAndReportingAsNotSpam fragment =
+          new DialogFragmentForUnblockingNumberAndReportingAsNotSpam();
       fragment.displayNumber = displayNumber;
       fragment.isSpam = isSpam;
       fragment.positiveListener = positiveListener;
@@ -254,14 +310,51 @@
     }
   }
 
-  /** Dialog for reporting a number as not spam. */
-  public static class ReportNotSpamDialogFragment extends CommonDialogsFragment {
+  /**
+   * Dialog for unblocking a number.
+   *
+   * <p>This dialog is used in the new call log, where unblocking a number will *not* mark it as not
+   * spam.
+   */
+  public static class DialogFragmentForUnblockingNumber extends CommonDialogsFragment {
 
     public static DialogFragment newInstance(
         String displayNumber,
         OnConfirmListener positiveListener,
         @Nullable DialogInterface.OnDismissListener dismissListener) {
-      ReportNotSpamDialogFragment fragment = new ReportNotSpamDialogFragment();
+      DialogFragmentForUnblockingNumberAndReportingAsNotSpam fragment =
+          new DialogFragmentForUnblockingNumberAndReportingAsNotSpam();
+      fragment.displayNumber = displayNumber;
+      fragment.positiveListener = positiveListener;
+      fragment.dismissListener = dismissListener;
+      return fragment;
+    }
+
+    @Override
+    public Dialog onCreateDialog(Bundle savedInstanceState) {
+      super.onCreateDialog(savedInstanceState);
+      // Return the newly created dialog
+      AlertDialog.Builder alertDialogBuilder = createDialogBuilder(getActivity(), this);
+      alertDialogBuilder.setMessage(
+          getString(R.string.unblock_report_number_alert_title, displayNumber));
+      Dialog dialog =
+          alertDialogBuilder
+              .setPositiveButton(
+                  R.string.unblock_number_ok, createGenericOnClickListener(this, positiveListener))
+              .create();
+      dialog.setCanceledOnTouchOutside(true);
+      return dialog;
+    }
+  }
+
+  /** Dialog for reporting a number as not spam. */
+  public static class DialogFragmentForReportingNotSpam extends CommonDialogsFragment {
+
+    public static DialogFragment newInstance(
+        String displayNumber,
+        OnConfirmListener positiveListener,
+        @Nullable DialogInterface.OnDismissListener dismissListener) {
+      DialogFragmentForReportingNotSpam fragment = new DialogFragmentForReportingNotSpam();
       fragment.displayNumber = displayNumber;
       fragment.positiveListener = positiveListener;
       fragment.dismissListener = dismissListener;
diff --git a/java/com/android/dialer/blockreportspam/ShowBlockReportSpamDialogNotifier.java b/java/com/android/dialer/blockreportspam/ShowBlockReportSpamDialogNotifier.java
index 58e1988..b33dc0f 100644
--- a/java/com/android/dialer/blockreportspam/ShowBlockReportSpamDialogNotifier.java
+++ b/java/com/android/dialer/blockreportspam/ShowBlockReportSpamDialogNotifier.java
@@ -47,6 +47,19 @@
     LocalBroadcastManager.getInstance(context).sendBroadcast(intent);
   }
 
+  /** Notifies that a dialog for blocking a number should be shown. */
+  public static void notifyShowDialogToBlockNumber(
+      Context context, BlockReportSpamDialogInfo blockReportSpamDialogInfo) {
+    LogUtil.enterBlock("ShowBlockReportSpamDialogNotifier.notifyShowDialogToBlockNumber");
+
+    Intent intent = new Intent();
+    intent.setAction(ShowBlockReportSpamDialogReceiver.ACTION_SHOW_DIALOG_TO_BLOCK_NUMBER);
+    ProtoParsers.put(
+        intent, ShowBlockReportSpamDialogReceiver.EXTRA_DIALOG_INFO, blockReportSpamDialogInfo);
+
+    LocalBroadcastManager.getInstance(context).sendBroadcast(intent);
+  }
+
   /** Notifies that a dialog for reporting a number as not spam should be shown. */
   public static void notifyShowDialogToReportNotSpam(
       Context context, BlockReportSpamDialogInfo blockReportSpamDialogInfo) {
@@ -59,4 +72,17 @@
 
     LocalBroadcastManager.getInstance(context).sendBroadcast(intent);
   }
+
+  /** Notifies that a dialog for unblocking a number should be shown. */
+  public static void notifyShowDialogToUnblockNumber(
+      Context context, BlockReportSpamDialogInfo blockReportSpamDialogInfo) {
+    LogUtil.enterBlock("ShowBlockReportSpamDialogNotifier.notifyShowDialogToUnblockNumber");
+
+    Intent intent = new Intent();
+    intent.setAction(ShowBlockReportSpamDialogReceiver.ACTION_SHOW_DIALOG_TO_UNBLOCK_NUMBER);
+    ProtoParsers.put(
+        intent, ShowBlockReportSpamDialogReceiver.EXTRA_DIALOG_INFO, blockReportSpamDialogInfo);
+
+    LocalBroadcastManager.getInstance(context).sendBroadcast(intent);
+  }
 }
diff --git a/java/com/android/dialer/blockreportspam/ShowBlockReportSpamDialogReceiver.java b/java/com/android/dialer/blockreportspam/ShowBlockReportSpamDialogReceiver.java
index f24bb1c..28ac7bf 100644
--- a/java/com/android/dialer/blockreportspam/ShowBlockReportSpamDialogReceiver.java
+++ b/java/com/android/dialer/blockreportspam/ShowBlockReportSpamDialogReceiver.java
@@ -16,22 +16,33 @@
 
 package com.android.dialer.blockreportspam;
 
-import android.app.FragmentManager;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.support.v4.app.FragmentManager;
 import android.widget.Toast;
+import com.android.dialer.blocking.Blocking;
+import com.android.dialer.blocking.Blocking.BlockingFailedException;
+import com.android.dialer.blockreportspam.BlockReportSpamDialogs.DialogFragmentForBlockingNumber;
+import com.android.dialer.blockreportspam.BlockReportSpamDialogs.DialogFragmentForBlockingNumberAndOptionallyReportingAsSpam;
+import com.android.dialer.blockreportspam.BlockReportSpamDialogs.DialogFragmentForReportingNotSpam;
+import com.android.dialer.blockreportspam.BlockReportSpamDialogs.DialogFragmentForUnblockingNumber;
 import com.android.dialer.blockreportspam.BlockReportSpamDialogs.OnConfirmListener;
 import com.android.dialer.blockreportspam.BlockReportSpamDialogs.OnSpamDialogClickListener;
 import com.android.dialer.common.Assert;
 import com.android.dialer.common.LogUtil;
+import com.android.dialer.common.concurrent.DialerExecutorComponent;
 import com.android.dialer.logging.DialerImpression;
+import com.android.dialer.logging.DialerImpression.Type;
 import com.android.dialer.logging.Logger;
 import com.android.dialer.protos.ProtoParsers;
 import com.android.dialer.spam.Spam;
 import com.android.dialer.spam.SpamComponent;
-import java.util.Locale;
+import com.android.dialer.spam.SpamSettings;
+import com.google.common.collect.ImmutableList;
+import com.google.common.util.concurrent.FutureCallback;
+import com.google.common.util.concurrent.Futures;
 
 /**
  * A {@link BroadcastReceiver} that shows an appropriate dialog upon receiving notifications from
@@ -39,9 +50,11 @@
  */
 public final class ShowBlockReportSpamDialogReceiver extends BroadcastReceiver {
 
+  static final String ACTION_SHOW_DIALOG_TO_BLOCK_NUMBER = "show_dialog_to_block_number";
   static final String ACTION_SHOW_DIALOG_TO_BLOCK_NUMBER_AND_OPTIONALLY_REPORT_SPAM =
       "show_dialog_to_block_number_and_optionally_report_spam";
   static final String ACTION_SHOW_DIALOG_TO_REPORT_NOT_SPAM = "show_dialog_to_report_not_spam";
+  static final String ACTION_SHOW_DIALOG_TO_UNBLOCK_NUMBER = "show_dialog_to_unblock_number";
   static final String EXTRA_DIALOG_INFO = "dialog_info";
 
   /** {@link FragmentManager} needed to show a {@link android.app.DialogFragment}. */
@@ -51,7 +64,9 @@
   public static IntentFilter getIntentFilter() {
     IntentFilter intentFilter = new IntentFilter();
     intentFilter.addAction(ACTION_SHOW_DIALOG_TO_BLOCK_NUMBER_AND_OPTIONALLY_REPORT_SPAM);
+    intentFilter.addAction(ACTION_SHOW_DIALOG_TO_BLOCK_NUMBER);
     intentFilter.addAction(ACTION_SHOW_DIALOG_TO_REPORT_NOT_SPAM);
+    intentFilter.addAction(ACTION_SHOW_DIALOG_TO_UNBLOCK_NUMBER);
     return intentFilter;
   }
 
@@ -66,12 +81,18 @@
     String action = intent.getAction();
 
     switch (Assert.isNotNull(action)) {
+      case ACTION_SHOW_DIALOG_TO_BLOCK_NUMBER:
+        showDialogToBlockNumber(context, intent);
+        break;
       case ACTION_SHOW_DIALOG_TO_BLOCK_NUMBER_AND_OPTIONALLY_REPORT_SPAM:
         showDialogToBlockNumberAndOptionallyReportSpam(context, intent);
         break;
       case ACTION_SHOW_DIALOG_TO_REPORT_NOT_SPAM:
         showDialogToReportNotSpam(context, intent);
         break;
+      case ACTION_SHOW_DIALOG_TO_UNBLOCK_NUMBER:
+        showDialogToUnblockNumber(context, intent);
+        break;
       default:
         throw new IllegalStateException("Unsupported action: " + action);
     }
@@ -87,6 +108,7 @@
             intent, EXTRA_DIALOG_INFO, BlockReportSpamDialogInfo.getDefaultInstance());
 
     Spam spam = SpamComponent.get(context).spam();
+    SpamSettings spamSettings = SpamComponent.get(context).spamSettings();
 
     // Set up the positive listener for the dialog.
     OnSpamDialogClickListener onSpamDialogClickListener =
@@ -95,7 +117,7 @@
               "ShowBlockReportSpamDialogReceiver.showDialogToBlockNumberAndOptionallyReportSpam",
               "confirmed");
 
-          if (reportSpam && spam.isSpamEnabled()) {
+          if (reportSpam && spamSettings.isSpamEnabled()) {
             LogUtil.i(
                 "ShowBlockReportSpamDialogReceiver.showDialogToBlockNumberAndOptionallyReportSpam",
                 "report spam");
@@ -111,26 +133,39 @@
                 dialogInfo.getContactSource());
           }
 
-          // TODO(a bug): Block the number.
-          Toast.makeText(
-                  context,
-                  String.format(
-                      Locale.ENGLISH,
-                      "TODO: " + "Block number %s.",
-                      dialogInfo.getNormalizedNumber()),
-                  Toast.LENGTH_SHORT)
-              .show();
+          blockNumber(context, dialogInfo);
         };
 
     // Create and show the dialog.
-    BlockReportSpamDialogs.BlockReportSpamDialogFragment.newInstance(
+    DialogFragmentForBlockingNumberAndOptionallyReportingAsSpam.newInstance(
             dialogInfo.getNormalizedNumber(),
-            spam.isDialogReportSpamCheckedByDefault(),
+            spamSettings.isDialogReportSpamCheckedByDefault(),
             onSpamDialogClickListener,
             /* dismissListener = */ null)
         .show(fragmentManager, BlockReportSpamDialogs.BLOCK_REPORT_SPAM_DIALOG_TAG);
   }
 
+  private void showDialogToBlockNumber(Context context, Intent intent) {
+    LogUtil.enterBlock("ShowBlockReportSpamDialogReceiver.showDialogToBlockNumber");
+
+    Assert.checkArgument(intent.hasExtra(EXTRA_DIALOG_INFO));
+    BlockReportSpamDialogInfo dialogInfo =
+        ProtoParsers.getTrusted(
+            intent, EXTRA_DIALOG_INFO, BlockReportSpamDialogInfo.getDefaultInstance());
+
+    // Set up the positive listener for the dialog.
+    OnConfirmListener onConfirmListener =
+        () -> {
+          LogUtil.i("ShowBlockReportSpamDialogReceiver.showDialogToBlockNumber", "block number");
+          blockNumber(context, dialogInfo);
+        };
+
+    // Create and show the dialog.
+    DialogFragmentForBlockingNumber.newInstance(
+            dialogInfo.getNormalizedNumber(), onConfirmListener, /* dismissListener = */ null)
+        .show(fragmentManager, BlockReportSpamDialogs.BLOCK_DIALOG_TAG);
+  }
+
   private void showDialogToReportNotSpam(Context context, Intent intent) {
     LogUtil.enterBlock("ShowBlockReportSpamDialogReceiver.showDialogToReportNotSpam");
 
@@ -144,22 +179,98 @@
         () -> {
           LogUtil.i("ShowBlockReportSpamDialogReceiver.showDialogToReportNotSpam", "confirmed");
 
-          Spam spam = SpamComponent.get(context).spam();
-          if (spam.isSpamEnabled()) {
+          if (SpamComponent.get(context).spamSettings().isSpamEnabled()) {
             Logger.get(context)
                 .logImpression(DialerImpression.Type.DIALOG_ACTION_CONFIRM_NUMBER_NOT_SPAM);
-            spam.reportNotSpamFromCallHistory(
-                dialogInfo.getNormalizedNumber(),
-                dialogInfo.getCountryIso(),
-                dialogInfo.getCallType(),
-                dialogInfo.getReportingLocation(),
-                dialogInfo.getContactSource());
+            SpamComponent.get(context)
+                .spam()
+                .reportNotSpamFromCallHistory(
+                    dialogInfo.getNormalizedNumber(),
+                    dialogInfo.getCountryIso(),
+                    dialogInfo.getCallType(),
+                    dialogInfo.getReportingLocation(),
+                    dialogInfo.getContactSource());
           }
         };
 
     // Create & show the dialog.
-    BlockReportSpamDialogs.ReportNotSpamDialogFragment.newInstance(
+    DialogFragmentForReportingNotSpam.newInstance(
             dialogInfo.getNormalizedNumber(), onConfirmListener, /* dismissListener = */ null)
         .show(fragmentManager, BlockReportSpamDialogs.NOT_SPAM_DIALOG_TAG);
   }
+
+  private void showDialogToUnblockNumber(Context context, Intent intent) {
+    LogUtil.enterBlock("ShowBlockReportSpamDialogReceiver.showDialogToUnblockNumber");
+
+    Assert.checkArgument(intent.hasExtra(EXTRA_DIALOG_INFO));
+    BlockReportSpamDialogInfo dialogInfo =
+        ProtoParsers.getTrusted(
+            intent, EXTRA_DIALOG_INFO, BlockReportSpamDialogInfo.getDefaultInstance());
+
+    // Set up the positive listener for the dialog.
+    OnConfirmListener onConfirmListener =
+        () -> {
+          LogUtil.i("ShowBlockReportSpamDialogReceiver.showDialogToUnblockNumber", "confirmed");
+
+          unblockNumber(context, dialogInfo);
+        };
+
+    // Create & show the dialog.
+    DialogFragmentForUnblockingNumber.newInstance(
+            dialogInfo.getNormalizedNumber(), onConfirmListener, /* dismissListener = */ null)
+        .show(fragmentManager, BlockReportSpamDialogs.UNBLOCK_DIALOG_TAG);
+  }
+
+  private static void blockNumber(Context context, BlockReportSpamDialogInfo dialogInfo) {
+    Logger.get(context).logImpression(Type.USER_ACTION_BLOCKED_NUMBER);
+    Futures.addCallback(
+        Blocking.block(
+            context,
+            ImmutableList.of(dialogInfo.getNormalizedNumber()),
+            dialogInfo.getCountryIso()),
+        new FutureCallback<Void>() {
+          @Override
+          public void onSuccess(Void unused) {
+            // Do nothing
+          }
+
+          @Override
+          public void onFailure(Throwable throwable) {
+            if (throwable instanceof BlockingFailedException) {
+              Logger.get(context).logImpression(Type.USER_ACTION_BLOCK_NUMBER_FAILED);
+              Toast.makeText(context, R.string.block_number_failed_toast, Toast.LENGTH_LONG).show();
+            } else {
+              throw new RuntimeException(throwable);
+            }
+          }
+        },
+        DialerExecutorComponent.get(context).uiExecutor());
+  }
+
+  private static void unblockNumber(Context context, BlockReportSpamDialogInfo dialogInfo) {
+    Logger.get(context).logImpression(Type.USER_ACTION_UNBLOCKED_NUMBER);
+    Futures.addCallback(
+        Blocking.unblock(
+            context,
+            ImmutableList.of(dialogInfo.getNormalizedNumber()),
+            dialogInfo.getCountryIso()),
+        new FutureCallback<Void>() {
+          @Override
+          public void onSuccess(Void unused) {
+            // Do nothing
+          }
+
+          @Override
+          public void onFailure(Throwable throwable) {
+            if (throwable instanceof BlockingFailedException) {
+              Logger.get(context).logImpression(Type.USER_ACTION_UNBLOCK_NUMBER_FAILED);
+              Toast.makeText(context, R.string.unblock_number_failed_toast, Toast.LENGTH_LONG)
+                  .show();
+            } else {
+              throw new RuntimeException(throwable);
+            }
+          }
+        },
+        DialerExecutorComponent.get(context).uiExecutor());
+  }
 }
diff --git a/java/com/android/dialer/blockreportspam/res/layout/block_report_spam_dialog.xml b/java/com/android/dialer/blockreportspam/res/layout/block_report_spam_dialog.xml
index 82e8d80..af89ab7 100644
--- a/java/com/android/dialer/blockreportspam/res/layout/block_report_spam_dialog.xml
+++ b/java/com/android/dialer/blockreportspam/res/layout/block_report_spam_dialog.xml
@@ -16,7 +16,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
   android:layout_width="wrap_content"
   android:layout_height="wrap_content"
-  android:padding="25dp"
+  android:padding="24dp"
   android:orientation="vertical">
   <TextView
     android:id="@+id/block_details"
@@ -24,13 +24,13 @@
     android:layout_height="wrap_content"
     android:layout_marginBottom="10dp"
     android:text="@string/block_report_number_alert_details"
-    android:textColor="@color/block_report_spam_primary_text_color"
-    android:textSize="@dimen/blocked_report_spam_primary_text_size"/>
+    style="@style/Dialer.TextAppearance.Secondary"/>
 
   <CheckBox
     android:id="@+id/report_number_as_spam_action"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:text="@string/checkbox_report_as_spam_action"
-    android:textSize="@dimen/blocked_report_spam_primary_text_size"/>
+    android:textSize="@dimen/blocked_report_spam_primary_text_size"
+    style="@style/DialerCheckboxStyle"/>
 </LinearLayout>
diff --git a/java/com/android/dialer/blockreportspam/res/values-af/strings.xml b/java/com/android/dialer/blockreportspam/res/values-af/strings.xml
new file mode 100644
index 0000000..35640d9
--- /dev/null
+++ b/java/com/android/dialer/blockreportspam/res/values-af/strings.xml
@@ -0,0 +1,17 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="block_number_confirmation_title">Blokkeer %1$s?</string>
+  <string name="block_number_confirmation_message_new_filtering">Jy sal nie meer oproepe of SMS\'e van hierdie nommer ontvang nie.</string>
+  <string name="block_number_ok">BLOKKEER</string>
+  <string name="unblock_number_ok">DEBLOKKEER</string>
+  <string name="block_report_number_alert_title">Blokkeer %1$s?</string>
+  <string name="block_report_number_alert_details">Jy sal nie meer oproepe vanaf hierdie nommer ontvang nie.</string>
+  <string name="block_number_alert_details">%1$s Hierdie oproep sal as strooipos aangegee word.</string>
+  <string name="unblock_number_alert_details">Hierdie nommer sal gedeblokkeer word en aangegee word as nie strooipos nie. Toekomstige oproepe sal nie as strooipos geïdentifiseer word nie.</string>
+  <string name="unblock_report_number_alert_title">Deblokkeer %1$s?</string>
+  <string name="report_not_spam_alert_button">Gee aan</string>
+  <string name="report_not_spam_alert_title">Gee \'n fout aan?</string>
+  <string name="report_not_spam_alert_details">Toekomstige oproepe vanaf %1$s sal nie meer as strooipos geïdentifiseer word nie.</string>
+  <string name="checkbox_report_as_spam_action">Gee oproep aan as strooipos</string>
+  <string name="block_number_failed_toast">Sukkel om hierdie nommer te blokkeer</string>
+  <string name="unblock_number_failed_toast">Sukkel om hierdie nommer te deblokkeer</string>
+</resources>
diff --git a/java/com/android/dialer/blockreportspam/res/values-am/strings.xml b/java/com/android/dialer/blockreportspam/res/values-am/strings.xml
new file mode 100644
index 0000000..3840290
--- /dev/null
+++ b/java/com/android/dialer/blockreportspam/res/values-am/strings.xml
@@ -0,0 +1,17 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="block_number_confirmation_title">%1$s አግድ?</string>
+  <string name="block_number_confirmation_message_new_filtering">ከአሁን በኋላ ከዚህ ቁጥር የሚመጡ ጥሪዎችን ወይም ጽሑፎችን አይቀበሉም።</string>
+  <string name="block_number_ok">አግድ</string>
+  <string name="unblock_number_ok">እገዳ አንሳ</string>
+  <string name="block_report_number_alert_title">%1$s ይታገድ?</string>
+  <string name="block_report_number_alert_details">ከአሁን በኋላ ከዚህ ቁጥር ጥሪዎችን ቅይቀበሉም።</string>
+  <string name="block_number_alert_details">%1$s ይህ ጥሪ እንደ አይፈለጌ ሪፖርት ይደረጋል።</string>
+  <string name="unblock_number_alert_details">ይህ ቁጥር እግዱ ይነሳለታል እንዲሁም አይፈለጌ እንዳልሆነ ሪፖርት ይደረጋል። የወደፊት ጥሪዎች እና የድምፅ መልዕክቶች እንደ አይፈለጌ አይቆጠሩም።</string>
+  <string name="unblock_report_number_alert_title">ከ%1$s እግድ ይነሳ?</string>
+  <string name="report_not_spam_alert_button">ሪፖርት አድርግ</string>
+  <string name="report_not_spam_alert_title">ስህተት ሪፖርት ይደረግ?</string>
+  <string name="report_not_spam_alert_details">ወደፊት ከ%1$s የሚመጡ ጥሪዎች ከአሁን በኋላ እንደ አይፈለጌ አይቆጠሩም።</string>
+  <string name="checkbox_report_as_spam_action">ጥሪውን እንደ አይፈለጌ መልዕክት ሪፖርት አድርግ</string>
+  <string name="block_number_failed_toast">ይህን ቁጥር ለማገድ ችግር</string>
+  <string name="unblock_number_failed_toast">ከዚህ ቁጥር እገዳ ለማንሳት ችግር</string>
+</resources>
diff --git a/java/com/android/dialer/blockreportspam/res/values-ar/strings.xml b/java/com/android/dialer/blockreportspam/res/values-ar/strings.xml
new file mode 100644
index 0000000..2e88ca4
--- /dev/null
+++ b/java/com/android/dialer/blockreportspam/res/values-ar/strings.xml
@@ -0,0 +1,17 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="block_number_confirmation_title">هل تريد حظر %1$s؟</string>
+  <string name="block_number_confirmation_message_new_filtering">لن تتلقي المكالمات أو المراسلات النصية بعد الآن من هذا الرقم.</string>
+  <string name="block_number_ok">حظر</string>
+  <string name="unblock_number_ok">إلغاء الحظر</string>
+  <string name="block_report_number_alert_title">هل تريد حظر %1$s؟</string>
+  <string name="block_report_number_alert_details">لن تتلقى المزيد من المكالمات من هذا الرقم.</string>
+  <string name="block_number_alert_details">%1$s سيتم الإبلاغ عن هذه المكالمة باعتبارها غير مرغوب فيها.</string>
+  <string name="unblock_number_alert_details">سيُزال حظر هذا الرقم والإبلاغ عنه أنه ليس رقمًا غير مرغوب فيه. لن يتم تحديد المكالمات كغير مرغوب فيها في ما بعد.</string>
+  <string name="unblock_report_number_alert_title">هل تريد إزالة حظر %1$s؟</string>
+  <string name="report_not_spam_alert_button">إبلاغ</string>
+  <string name="report_not_spam_alert_title">هل تريد الإبلاغ عن خطأ؟</string>
+  <string name="report_not_spam_alert_details">المكالمات الواردة من %1$s في المستقبل لن يتم تحديدها على أنها غير مرغوب فيها.</string>
+  <string name="checkbox_report_as_spam_action">الإبلاغ عن المكالمة كغير مرغوب فيها</string>
+  <string name="block_number_failed_toast">حدثت مشكلة أثناء حظر هذا الرقم</string>
+  <string name="unblock_number_failed_toast">حدثت مشكلة أثناء إلغاء حظر هذا الرقم</string>
+</resources>
diff --git a/java/com/android/dialer/blockreportspam/res/values-az/strings.xml b/java/com/android/dialer/blockreportspam/res/values-az/strings.xml
new file mode 100644
index 0000000..17037c3
--- /dev/null
+++ b/java/com/android/dialer/blockreportspam/res/values-az/strings.xml
@@ -0,0 +1,17 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="block_number_confirmation_title">%1$s blok edilsin?</string>
+  <string name="block_number_confirmation_message_new_filtering">Bu nömrədən daha zəng və ya mesaj almayacaqsınız.</string>
+  <string name="block_number_ok">BLOK</string>
+  <string name="unblock_number_ok">BLOKDAN ÇIXARIN</string>
+  <string name="block_report_number_alert_title">%1$s blok edilsin?</string>
+  <string name="block_report_number_alert_details">Bu nömrədən daha zəng almayacaqsınız.</string>
+  <string name="block_number_alert_details">%1$s Bu zəng spam kimi qeyd olunacaq.</string>
+  <string name="unblock_number_alert_details">Bu nömrə blokdan çıxarılacaq və spam kimi qeyd olunmayacaq. Gələcək zənglər spam kimi göstərilməyəcək.</string>
+  <string name="unblock_report_number_alert_title">%1$s blokdan çıxarılsın?</string>
+  <string name="report_not_spam_alert_button">Bildirin</string>
+  <string name="report_not_spam_alert_title">Səhv bildirilsin?</string>
+  <string name="report_not_spam_alert_details">%1$s nömrəsindən gələcək zənglər daha spam kimi qeyd olunmayacaq.</string>
+  <string name="checkbox_report_as_spam_action">Zəngi spam olaraq bildirin</string>
+  <string name="block_number_failed_toast">Bu nömrə blok edilərkən xəta baş verdi</string>
+  <string name="unblock_number_failed_toast">Bu nömrə blokdan çıxarılarkən xəta baş verdi</string>
+</resources>
diff --git a/java/com/android/dialer/blockreportspam/res/values-b+sr+Latn/strings.xml b/java/com/android/dialer/blockreportspam/res/values-b+sr+Latn/strings.xml
new file mode 100644
index 0000000..e2fcc90
--- /dev/null
+++ b/java/com/android/dialer/blockreportspam/res/values-b+sr+Latn/strings.xml
@@ -0,0 +1,17 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="block_number_confirmation_title">Želite li da blokirate %1$s?</string>
+  <string name="block_number_confirmation_message_new_filtering">Više nećete primati pozive ni SMS-ove sa ovog broja.</string>
+  <string name="block_number_ok">BLOKIRAJ</string>
+  <string name="unblock_number_ok">DEBLOKIRAJ</string>
+  <string name="block_report_number_alert_title">Želite li da blokirate %1$s?</string>
+  <string name="block_report_number_alert_details">Više nećete primati pozive sa ovog broja.</string>
+  <string name="block_number_alert_details">%1$s Prijavićemo ovaj poziv kao nepoželjan.</string>
+  <string name="unblock_number_alert_details">Deblokiraćemo broj i prijaviti da nije nepoželjan. Budući pozivi neće biti označavani kao nepoželjni.</string>
+  <string name="unblock_report_number_alert_title">Želite li da deblokirate %1$s?</string>
+  <string name="report_not_spam_alert_button">Prijavi</string>
+  <string name="report_not_spam_alert_title">Želite da prijavite grešku?</string>
+  <string name="report_not_spam_alert_details">Budući pozivi sa %1$s više neće biti označavani kao nepoželjni.</string>
+  <string name="checkbox_report_as_spam_action">Prijavi poziv kao nepoželjan</string>
+  <string name="block_number_failed_toast">Problem pri blokiranju ovog broja</string>
+  <string name="unblock_number_failed_toast">Problem pri odblokiravanju ovog broja</string>
+</resources>
diff --git a/java/com/android/dialer/blockreportspam/res/values-be/strings.xml b/java/com/android/dialer/blockreportspam/res/values-be/strings.xml
new file mode 100644
index 0000000..4fdaa6f
--- /dev/null
+++ b/java/com/android/dialer/blockreportspam/res/values-be/strings.xml
@@ -0,0 +1,17 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="block_number_confirmation_title">Заблакіраваць нумар %1$s?</string>
+  <string name="block_number_confirmation_message_new_filtering">Вы больш не будзеце атрымліваць выклікі або SMS з гэтага нумара.</string>
+  <string name="block_number_ok">БЛАКІРАВАЦЬ</string>
+  <string name="unblock_number_ok">РАЗБЛАКІРАВАЦЬ</string>
+  <string name="block_report_number_alert_title">Заблакіраваць нумар %1$s?</string>
+  <string name="block_report_number_alert_details">Вы больш не будзеце атрымліваць выклікі з гэтага нумара.</string>
+  <string name="block_number_alert_details">%1$s Гэты выклік будзе заяўлены як спам.</string>
+  <string name="unblock_number_alert_details">Гэты нумар будзе разблакіраваны і заяўлены як не спам. Будучыя выклікі не будуць вызначацца як спам.</string>
+  <string name="unblock_report_number_alert_title">Разблакіраваць нумар %1$s?</string>
+  <string name="report_not_spam_alert_button">Паведаміць</string>
+  <string name="report_not_spam_alert_title">Паведаміць пра памылку?</string>
+  <string name="report_not_spam_alert_details">Будучыя выклікі з нумара %1$s больш не будуць вызначацца як спам.</string>
+  <string name="checkbox_report_as_spam_action">Заявіць выклік як спамерскі</string>
+  <string name="block_number_failed_toast">Праблема з блакіроўкай нумара</string>
+  <string name="unblock_number_failed_toast">Праблема з разблакіроўкай нумара</string>
+</resources>
diff --git a/java/com/android/dialer/blockreportspam/res/values-bg/strings.xml b/java/com/android/dialer/blockreportspam/res/values-bg/strings.xml
new file mode 100644
index 0000000..d576b9c
--- /dev/null
+++ b/java/com/android/dialer/blockreportspam/res/values-bg/strings.xml
@@ -0,0 +1,17 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="block_number_confirmation_title">Да се блокира ли %1$s?</string>
+  <string name="block_number_confirmation_message_new_filtering">Повече няма да получавате обаждания или SMS от този номер.</string>
+  <string name="block_number_ok">БЛОКИРАНЕ</string>
+  <string name="unblock_number_ok">ОТБЛОКИРАНЕ</string>
+  <string name="block_report_number_alert_title">Да се блокира ли %1$s?</string>
+  <string name="block_report_number_alert_details">Повече няма да получавате обаждания от този номер.</string>
+  <string name="block_number_alert_details">%1$s За обаждането ще се подаде сигнал за спам.</string>
+  <string name="unblock_number_alert_details">Номерът ще бъде отблокиран. Той и бъдещите обаждания от него няма да бъдат спам.</string>
+  <string name="unblock_report_number_alert_title">Да се отблокира ли %1$s?</string>
+  <string name="report_not_spam_alert_button">Подаване на сигнал</string>
+  <string name="report_not_spam_alert_title">Подавате сигнал за грешка?</string>
+  <string name="report_not_spam_alert_details">Обажданията от %1$s повече няма да се смятат за спам.</string>
+  <string name="checkbox_report_as_spam_action">Сигнал за спам за обаждането</string>
+  <string name="block_number_failed_toast">При блокирането на номера възникна проблем</string>
+  <string name="unblock_number_failed_toast">При отблокирането на номера възникна проблем</string>
+</resources>
diff --git a/java/com/android/dialer/blockreportspam/res/values-bn/strings.xml b/java/com/android/dialer/blockreportspam/res/values-bn/strings.xml
new file mode 100644
index 0000000..e9640b9
--- /dev/null
+++ b/java/com/android/dialer/blockreportspam/res/values-bn/strings.xml
@@ -0,0 +1,17 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="block_number_confirmation_title">%1$s ব্লক করবেন?</string>
+  <string name="block_number_confirmation_message_new_filtering">আপনি এই নম্বর থেকে আর কল বা পাঠ্যবার্তাগুলি পাবেন না৷</string>
+  <string name="block_number_ok">অবরোধ করুন</string>
+  <string name="unblock_number_ok">অবরোধ মুক্ত করুন</string>
+  <string name="block_report_number_alert_title">%1$s ব্লক করবেন?</string>
+  <string name="block_report_number_alert_details">এই নম্বর থেকে আপনার কাছে আর কল আসবে না।</string>
+  <string name="block_number_alert_details">%1$s এই কলটিকে স্প্যাম হিসেবে অভিযোগ করা হবে।</string>
+  <string name="unblock_number_alert_details">এই নম্বরটিকে আনব্লক করা হবে এবং \'স্প্যাম নয়\' হিসেবে জানিয়ে দেওয়া হবে। ভবিষ্যতে এই নম্বর থেকে আসা কোনও কলকে স্প্যাম হিসেবে শনাক্ত করা হবে না।</string>
+  <string name="unblock_report_number_alert_title">%1$s আনব্লক করবেন?</string>
+  <string name="report_not_spam_alert_button">অভিযোগ জানান</string>
+  <string name="report_not_spam_alert_title">কোনও ভুলের বিষয়ে জানাবেন?</string>
+  <string name="report_not_spam_alert_details">ভবিষ্যতে %1$s থেকে আসা কোনও কলকে স্প্যাম হিসেবে শনাক্ত করা হবে না।</string>
+  <string name="checkbox_report_as_spam_action">কলটিকে স্প্যাম হিসেবে অভিযোগ করুন</string>
+  <string name="block_number_failed_toast">এই নম্বরটি ব্লক করতে সমস্যা হচ্ছে</string>
+  <string name="unblock_number_failed_toast">এই নম্বরটি আনব্লক করতে সমস্যা হচ্ছে</string>
+</resources>
diff --git a/java/com/android/dialer/blockreportspam/res/values-bs/strings.xml b/java/com/android/dialer/blockreportspam/res/values-bs/strings.xml
new file mode 100644
index 0000000..6b02797
--- /dev/null
+++ b/java/com/android/dialer/blockreportspam/res/values-bs/strings.xml
@@ -0,0 +1,17 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="block_number_confirmation_title">Blokirati broj %1$s?</string>
+  <string name="block_number_confirmation_message_new_filtering">Više nećete primati pozive i SMS poruke s ovog broja.</string>
+  <string name="block_number_ok">BLOKIRAJ</string>
+  <string name="unblock_number_ok">DEBLOKIRAJ</string>
+  <string name="block_report_number_alert_title">Blokirati broj %1$s?</string>
+  <string name="block_report_number_alert_details">Više nećete primati pozive s ovog broja.</string>
+  <string name="block_number_alert_details">%1$s Ovaj poziv će biti prijavljen kao neželjen.</string>
+  <string name="unblock_number_alert_details">Deblokirat ćemo broj i prijaviti da nije neželjen. Budući pozivi neće biti neželjeni.</string>
+  <string name="unblock_report_number_alert_title">Deblokirati broj %1$s?</string>
+  <string name="report_not_spam_alert_button">Prijavi</string>
+  <string name="report_not_spam_alert_title">Prijaviti grešku?</string>
+  <string name="report_not_spam_alert_details">Budući pozovi s broja %1$s neće biti neželjeni.</string>
+  <string name="checkbox_report_as_spam_action">Prijavi poziv kao neželjen</string>
+  <string name="block_number_failed_toast">Došlo je do problema prilikom blokiranja ovog broja</string>
+  <string name="unblock_number_failed_toast">Došlo je do problema prilikom deblokiranja ovog broja</string>
+</resources>
diff --git a/java/com/android/dialer/blockreportspam/res/values-ca/strings.xml b/java/com/android/dialer/blockreportspam/res/values-ca/strings.xml
new file mode 100644
index 0000000..b38a982
--- /dev/null
+++ b/java/com/android/dialer/blockreportspam/res/values-ca/strings.xml
@@ -0,0 +1,17 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="block_number_confirmation_title">Vols bloquejar el número %1$s?</string>
+  <string name="block_number_confirmation_message_new_filtering">Deixaràs de rebre trucades i missatges de text d\'aquest número.</string>
+  <string name="block_number_ok">BLOQUEJA</string>
+  <string name="unblock_number_ok">DESBLOQUEJA</string>
+  <string name="block_report_number_alert_title">Vols bloquejar el número %1$s?</string>
+  <string name="block_report_number_alert_details">Deixaràs de rebre trucades d\'aquest número.</string>
+  <string name="block_number_alert_details">%1$s Aquesta trucada es marcarà com a brossa.</string>
+  <string name="unblock_number_alert_details">El número es desbloquejarà i s\'indicarà que aquesta trucada (i les properes) no són brossa.</string>
+  <string name="unblock_report_number_alert_title">Vols desbloquejar el número %1$s?</string>
+  <string name="report_not_spam_alert_button">Informa</string>
+  <string name="report_not_spam_alert_title">Vols informar d\'un error?</string>
+  <string name="report_not_spam_alert_details">Les trucades futures del número %1$s ja no es consideraran brossa.</string>
+  <string name="checkbox_report_as_spam_action">Marca la trucada com a brossa</string>
+  <string name="block_number_failed_toast">S\'ha produït un problema en bloquejar aquest número</string>
+  <string name="unblock_number_failed_toast">S\'ha produït un problema en desbloquejar aquest número</string>
+</resources>
diff --git a/java/com/android/dialer/blockreportspam/res/values-cs/strings.xml b/java/com/android/dialer/blockreportspam/res/values-cs/strings.xml
new file mode 100644
index 0000000..27c4319
--- /dev/null
+++ b/java/com/android/dialer/blockreportspam/res/values-cs/strings.xml
@@ -0,0 +1,17 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="block_number_confirmation_title">Blokovat číslo %1$s?</string>
+  <string name="block_number_confirmation_message_new_filtering">Z tohoto čísla už nebudete přijímat hovory ani zprávy SMS.</string>
+  <string name="block_number_ok">BLOKOVAT</string>
+  <string name="unblock_number_ok">ODBLOKOVAT</string>
+  <string name="block_report_number_alert_title">Blokovat číslo %1$s?</string>
+  <string name="block_report_number_alert_details">Z tohoto čísla už nebudete přijímat hovory.</string>
+  <string name="block_number_alert_details">%1$s Hovor bude nahlášen jako spam.</string>
+  <string name="unblock_number_alert_details">Toto číslo bude odblokováno a bude nahlášeno, že se nejedná o spam. Budoucí hovory nebudou označeny jako spam.</string>
+  <string name="unblock_report_number_alert_title">Odblokovat číslo %1$s?</string>
+  <string name="report_not_spam_alert_button">Nahlásit</string>
+  <string name="report_not_spam_alert_title">Nahlásit omyl?</string>
+  <string name="report_not_spam_alert_details">Budoucí hovory z čísla %1$s už nebudou označeny jako spam.</string>
+  <string name="checkbox_report_as_spam_action">Nahlásit hovor jako spam</string>
+  <string name="block_number_failed_toast">Toto číslo se nepodařilo zablokovat</string>
+  <string name="unblock_number_failed_toast">Toto číslo se nepodařilo odblokovat</string>
+</resources>
diff --git a/java/com/android/dialer/blockreportspam/res/values-da/strings.xml b/java/com/android/dialer/blockreportspam/res/values-da/strings.xml
new file mode 100644
index 0000000..86ffeb4
--- /dev/null
+++ b/java/com/android/dialer/blockreportspam/res/values-da/strings.xml
@@ -0,0 +1,17 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="block_number_confirmation_title">Vil du blokere %1$s?</string>
+  <string name="block_number_confirmation_message_new_filtering">Du modtager ikke længere opkald eller sms-beskeder fra dette nummer.</string>
+  <string name="block_number_ok">BLOKER</string>
+  <string name="unblock_number_ok">FJERN BLOKERING</string>
+  <string name="block_report_number_alert_title">Vil du blokere %1$s?</string>
+  <string name="block_report_number_alert_details">Du modtager ikke længere opkald fra dette nummer.</string>
+  <string name="block_number_alert_details">%1$s Dette opkald rapporteres som spam.</string>
+  <string name="unblock_number_alert_details">Blokeringen af nummeret ophæves, og spam rapporteres ikke. Nye opkald registreres ikke som spam.</string>
+  <string name="unblock_report_number_alert_title">Vil du fjerne blokeringen af %1$s?</string>
+  <string name="report_not_spam_alert_button">Rapportér</string>
+  <string name="report_not_spam_alert_title">Vil du rapportere en fejl?</string>
+  <string name="report_not_spam_alert_details">Nye opkald fra %1$s registreres ikke længere som spam.</string>
+  <string name="checkbox_report_as_spam_action">Rapportér opkaldet som spam</string>
+  <string name="block_number_failed_toast">Der opstod et problem, da dette nummer skulle blokeres</string>
+  <string name="unblock_number_failed_toast">Der opstod et problem, da blokeringen af dette nummer skulle fjernes</string>
+</resources>
diff --git a/java/com/android/dialer/blockreportspam/res/values-de/strings.xml b/java/com/android/dialer/blockreportspam/res/values-de/strings.xml
new file mode 100644
index 0000000..d1a8420
--- /dev/null
+++ b/java/com/android/dialer/blockreportspam/res/values-de/strings.xml
@@ -0,0 +1,17 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="block_number_confirmation_title">%1$s blockieren?</string>
+  <string name="block_number_confirmation_message_new_filtering">Du erhältst von dieser Nummer keine Anrufe oder Nachrichten mehr.</string>
+  <string name="block_number_ok">BLOCKIEREN</string>
+  <string name="unblock_number_ok">BLOCKIERUNG AUFHEBEN</string>
+  <string name="block_report_number_alert_title">%1$s blockieren?</string>
+  <string name="block_report_number_alert_details">Du erhältst von dieser Nummer keine Anrufe mehr.</string>
+  <string name="block_number_alert_details">%1$s Dieser Anruf wird als Spam gemeldet.</string>
+  <string name="unblock_number_alert_details">Die Nummer wird nicht mehr blockiert und nicht als Spam gemeldet. Zukünftige Anrufe sind kein Spam.</string>
+  <string name="unblock_report_number_alert_title">Blockierung von %1$s aufheben?</string>
+  <string name="report_not_spam_alert_button">Melden</string>
+  <string name="report_not_spam_alert_title">Fehler melden?</string>
+  <string name="report_not_spam_alert_details">Zukünftige Anrufe von %1$s werden nicht als Spam gekennzeichnet.</string>
+  <string name="checkbox_report_as_spam_action">Anruf als Spam melden</string>
+  <string name="block_number_failed_toast">Beim Blockieren dieser Nummer ist ein Problem aufgetreten</string>
+  <string name="unblock_number_failed_toast">Beim Aufheben der Blockierung dieser Nummer ist ein Problem aufgetreten</string>
+</resources>
diff --git a/java/com/android/dialer/blockreportspam/res/values-el/strings.xml b/java/com/android/dialer/blockreportspam/res/values-el/strings.xml
new file mode 100644
index 0000000..530e9ba
--- /dev/null
+++ b/java/com/android/dialer/blockreportspam/res/values-el/strings.xml
@@ -0,0 +1,17 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="block_number_confirmation_title">Να αποκλειστεί ο αριθμός %1$s;</string>
+  <string name="block_number_confirmation_message_new_filtering">Δεν θα λαμβάνετε πλέον κλήσεις ή μηνύματα κειμένου από αυτόν τον αριθμό.</string>
+  <string name="block_number_ok">ΑΠΟΚΛΕΙΣΜΟΣ</string>
+  <string name="unblock_number_ok">ΚΑΤΑΡΓΗΣΗ ΑΠΟΚΛΕΙΣΜΟΥ</string>
+  <string name="block_report_number_alert_title">Να αποκλειστεί ο αριθμός %1$s;</string>
+  <string name="block_report_number_alert_details">Δεν θα λαμβάνετε πλέον κλήσεις από αυτόν τον αριθμό.</string>
+  <string name="block_number_alert_details">%1$s Η κλήση αυτή θα αναφερθεί ως ανεπιθύμητη.</string>
+  <string name="unblock_number_alert_details">Ο αποκλ. του αρ. θα καταργηθεί. Θα αναφερθεί ως μη ανεπιθ. Μελλοντικές κλ. δεν θα αναγν. ως ανεπιθ.</string>
+  <string name="unblock_report_number_alert_title">Να καταργηθεί ο αποκλεισμός του αριθμού %1$s;</string>
+  <string name="report_not_spam_alert_button">Αναφορά</string>
+  <string name="report_not_spam_alert_title">Αναφορά λάθους;</string>
+  <string name="report_not_spam_alert_details">Τυχόν μελλοντικές κλήσεις από τον χρήστη %1$s δεν θα αναγνωρίζονται ως ανεπιθύμητες.</string>
+  <string name="checkbox_report_as_spam_action">Αναφορά κλήσ. ως ανεπιθύμητης;</string>
+  <string name="block_number_failed_toast">Παρουσιάστηκε πρόβλημα κατά τον αποκλεισμό αυτού του αριθμού</string>
+  <string name="unblock_number_failed_toast">Παρουσιάστηκε πρόβλημα κατά την κατάργηση αποκλεισμού αυτού του αριθμού</string>
+</resources>
diff --git a/java/com/android/dialer/blockreportspam/res/values-en-rAU/strings.xml b/java/com/android/dialer/blockreportspam/res/values-en-rAU/strings.xml
new file mode 100644
index 0000000..ef0af56
--- /dev/null
+++ b/java/com/android/dialer/blockreportspam/res/values-en-rAU/strings.xml
@@ -0,0 +1,17 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="block_number_confirmation_title">Block %1$s?</string>
+  <string name="block_number_confirmation_message_new_filtering">You will no longer receive calls or texts from this number.</string>
+  <string name="block_number_ok">BLOCK</string>
+  <string name="unblock_number_ok">UNBLOCK</string>
+  <string name="block_report_number_alert_title">Block %1$s?</string>
+  <string name="block_report_number_alert_details">You will no longer receive calls from this number.</string>
+  <string name="block_number_alert_details">%1$s This call will be reported as spam.</string>
+  <string name="unblock_number_alert_details">This number will be unblocked and reported as not being spam. Future calls won\'t be identified as spam.</string>
+  <string name="unblock_report_number_alert_title">Unblock %1$s?</string>
+  <string name="report_not_spam_alert_button">Report</string>
+  <string name="report_not_spam_alert_title">Would you like to report a mistake?</string>
+  <string name="report_not_spam_alert_details">Future calls from %1$s will no longer be identified as spam.</string>
+  <string name="checkbox_report_as_spam_action">Report call as spam</string>
+  <string name="block_number_failed_toast">Problem blocking this number</string>
+  <string name="unblock_number_failed_toast">Problem unblocking this number</string>
+</resources>
diff --git a/java/com/android/dialer/blockreportspam/res/values-en-rGB/strings.xml b/java/com/android/dialer/blockreportspam/res/values-en-rGB/strings.xml
new file mode 100644
index 0000000..ef0af56
--- /dev/null
+++ b/java/com/android/dialer/blockreportspam/res/values-en-rGB/strings.xml
@@ -0,0 +1,17 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="block_number_confirmation_title">Block %1$s?</string>
+  <string name="block_number_confirmation_message_new_filtering">You will no longer receive calls or texts from this number.</string>
+  <string name="block_number_ok">BLOCK</string>
+  <string name="unblock_number_ok">UNBLOCK</string>
+  <string name="block_report_number_alert_title">Block %1$s?</string>
+  <string name="block_report_number_alert_details">You will no longer receive calls from this number.</string>
+  <string name="block_number_alert_details">%1$s This call will be reported as spam.</string>
+  <string name="unblock_number_alert_details">This number will be unblocked and reported as not being spam. Future calls won\'t be identified as spam.</string>
+  <string name="unblock_report_number_alert_title">Unblock %1$s?</string>
+  <string name="report_not_spam_alert_button">Report</string>
+  <string name="report_not_spam_alert_title">Would you like to report a mistake?</string>
+  <string name="report_not_spam_alert_details">Future calls from %1$s will no longer be identified as spam.</string>
+  <string name="checkbox_report_as_spam_action">Report call as spam</string>
+  <string name="block_number_failed_toast">Problem blocking this number</string>
+  <string name="unblock_number_failed_toast">Problem unblocking this number</string>
+</resources>
diff --git a/java/com/android/dialer/blockreportspam/res/values-en-rIN/strings.xml b/java/com/android/dialer/blockreportspam/res/values-en-rIN/strings.xml
new file mode 100644
index 0000000..ef0af56
--- /dev/null
+++ b/java/com/android/dialer/blockreportspam/res/values-en-rIN/strings.xml
@@ -0,0 +1,17 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="block_number_confirmation_title">Block %1$s?</string>
+  <string name="block_number_confirmation_message_new_filtering">You will no longer receive calls or texts from this number.</string>
+  <string name="block_number_ok">BLOCK</string>
+  <string name="unblock_number_ok">UNBLOCK</string>
+  <string name="block_report_number_alert_title">Block %1$s?</string>
+  <string name="block_report_number_alert_details">You will no longer receive calls from this number.</string>
+  <string name="block_number_alert_details">%1$s This call will be reported as spam.</string>
+  <string name="unblock_number_alert_details">This number will be unblocked and reported as not being spam. Future calls won\'t be identified as spam.</string>
+  <string name="unblock_report_number_alert_title">Unblock %1$s?</string>
+  <string name="report_not_spam_alert_button">Report</string>
+  <string name="report_not_spam_alert_title">Would you like to report a mistake?</string>
+  <string name="report_not_spam_alert_details">Future calls from %1$s will no longer be identified as spam.</string>
+  <string name="checkbox_report_as_spam_action">Report call as spam</string>
+  <string name="block_number_failed_toast">Problem blocking this number</string>
+  <string name="unblock_number_failed_toast">Problem unblocking this number</string>
+</resources>
diff --git a/java/com/android/dialer/blockreportspam/res/values-es-rUS/strings.xml b/java/com/android/dialer/blockreportspam/res/values-es-rUS/strings.xml
new file mode 100644
index 0000000..0169f4b
--- /dev/null
+++ b/java/com/android/dialer/blockreportspam/res/values-es-rUS/strings.xml
@@ -0,0 +1,17 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="block_number_confirmation_title">¿Quieres bloquear el número %1$s?</string>
+  <string name="block_number_confirmation_message_new_filtering">Ya no recibirás llamadas o mensajes de textos de este número.</string>
+  <string name="block_number_ok">BLOQUEAR</string>
+  <string name="unblock_number_ok">DESBLOQUEAR</string>
+  <string name="block_report_number_alert_title">¿Deseas bloquear el número %1$s?</string>
+  <string name="block_report_number_alert_details">Ya no recibirás llamadas de este número.</string>
+  <string name="block_number_alert_details">%1$s Esta llamada se marcará como spam.</string>
+  <string name="unblock_number_alert_details">El número se desbloqueará y no se marcará como spam. Las llamadas futuras no se considerarán spam.</string>
+  <string name="unblock_report_number_alert_title">¿Deseas desbloquear el número %1$s?</string>
+  <string name="report_not_spam_alert_button">Informar</string>
+  <string name="report_not_spam_alert_title">¿Deseas informar un error?</string>
+  <string name="report_not_spam_alert_details">Las llamadas futuras de %1$s ya no se considerarán spam.</string>
+  <string name="checkbox_report_as_spam_action">Denunciar llamada como spam</string>
+  <string name="block_number_failed_toast">Hubo un problema al bloquear este número</string>
+  <string name="unblock_number_failed_toast">Hubo un problema al desbloquear este número</string>
+</resources>
diff --git a/java/com/android/dialer/blockreportspam/res/values-es/strings.xml b/java/com/android/dialer/blockreportspam/res/values-es/strings.xml
new file mode 100644
index 0000000..25baadc
--- /dev/null
+++ b/java/com/android/dialer/blockreportspam/res/values-es/strings.xml
@@ -0,0 +1,17 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="block_number_confirmation_title">¿Quieres bloquear el %1$s?</string>
+  <string name="block_number_confirmation_message_new_filtering">Ya no recibirás llamadas ni SMS de este número.</string>
+  <string name="block_number_ok">BLOQUEAR</string>
+  <string name="unblock_number_ok">DESBLOQUEAR</string>
+  <string name="block_report_number_alert_title">¿Quieres bloquear el número %1$s?</string>
+  <string name="block_report_number_alert_details">Ya no recibirás llamadas de este número.</string>
+  <string name="block_number_alert_details">%1$s Esta llamada se marcará como spam.</string>
+  <string name="unblock_number_alert_details">El número se desbloqueará y marcará como No es spam. Las llamadas futuras no se reconocerán como spam.</string>
+  <string name="unblock_report_number_alert_title">¿Quieres desbloquear el número %1$s?</string>
+  <string name="report_not_spam_alert_button">Informar</string>
+  <string name="report_not_spam_alert_title">¿Quieres informar de un error?</string>
+  <string name="report_not_spam_alert_details">Las próximas llamadas de %1$s no se identificarán como spam.</string>
+  <string name="checkbox_report_as_spam_action">Marcar la llamada como spam</string>
+  <string name="block_number_failed_toast">No se ha podido bloquear este número</string>
+  <string name="unblock_number_failed_toast">No se ha podido desbloquear este número</string>
+</resources>
diff --git a/java/com/android/dialer/blockreportspam/res/values-et/strings.xml b/java/com/android/dialer/blockreportspam/res/values-et/strings.xml
new file mode 100644
index 0000000..3495ceb
--- /dev/null
+++ b/java/com/android/dialer/blockreportspam/res/values-et/strings.xml
@@ -0,0 +1,17 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="block_number_confirmation_title">Kas soovite blokeerida numbri %1$s?</string>
+  <string name="block_number_confirmation_message_new_filtering">Te ei saa enam sellelt numbrilt kõnesid ega tekstsõnumeid.</string>
+  <string name="block_number_ok">BLOKEERI</string>
+  <string name="unblock_number_ok">DEBLOKEERI</string>
+  <string name="block_report_number_alert_title">Kas soovite blokeerida numbri %1$s?</string>
+  <string name="block_report_number_alert_details">Te ei saa enam sellelt numbrilt kõnesid.</string>
+  <string name="block_number_alert_details">%1$s See kõne liigitatakse rämpspostiks.</string>
+  <string name="unblock_number_alert_details">Number deblokeeritakse ja seda ei liigit. rämpspostiks. Tulevasi kõnesid ei liigitata rämpspostiks.</string>
+  <string name="unblock_report_number_alert_title">Kas soovite deblokeerida numbri %1$s?</string>
+  <string name="report_not_spam_alert_button">Teavita</string>
+  <string name="report_not_spam_alert_title">Kas soovite veast teavitada?</string>
+  <string name="report_not_spam_alert_details">Tulevasi kõnesid numbrilt %1$s ei liigitata enam rämpspostiks.</string>
+  <string name="checkbox_report_as_spam_action">Liigita kõne rämpspostiks</string>
+  <string name="block_number_failed_toast">Probleem selle numbri blokeerimisega</string>
+  <string name="unblock_number_failed_toast">Probleem selle numbri deblokeerimisega</string>
+</resources>
diff --git a/java/com/android/dialer/blockreportspam/res/values-eu/strings.xml b/java/com/android/dialer/blockreportspam/res/values-eu/strings.xml
new file mode 100644
index 0000000..acb1130
--- /dev/null
+++ b/java/com/android/dialer/blockreportspam/res/values-eu/strings.xml
@@ -0,0 +1,17 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="block_number_confirmation_title">%1$s blokeatu nahi duzu?</string>
+  <string name="block_number_confirmation_message_new_filtering">Ez duzu deirik edo testu-mezurik jasoko zenbaki horretatik.</string>
+  <string name="block_number_ok">BLOKEATU</string>
+  <string name="unblock_number_ok">DESBLOKEATU</string>
+  <string name="block_report_number_alert_title">%1$s blokeatu nahi duzu?</string>
+  <string name="block_report_number_alert_details">Aurrerantzean, ez duzu jasoko zenbaki horren deirik.</string>
+  <string name="block_number_alert_details">%1$s Dei hau spama dela salatuko da.</string>
+  <string name="unblock_number_alert_details">Desblokeatu egingo da zenbakia. Aurrerantzean, deiak ez dira identifikatuko spam gisa.</string>
+  <string name="unblock_report_number_alert_title">%1$s desblokeatu nahi duzu?</string>
+  <string name="report_not_spam_alert_button">Salatu</string>
+  <string name="report_not_spam_alert_title">Akats baten berri eman nahi duzu?</string>
+  <string name="report_not_spam_alert_details">Aurrerantzean, %1$s zenbakiaren deiak ez dira identifikatuko spam gisa.</string>
+  <string name="checkbox_report_as_spam_action">Salatu deia spama dela</string>
+  <string name="block_number_failed_toast">Arazo bat izan da zenbakia blokeatzean</string>
+  <string name="unblock_number_failed_toast">Arazo bat izan da zenbakia desblokeatzean</string>
+</resources>
diff --git a/java/com/android/dialer/blockreportspam/res/values-fa/strings.xml b/java/com/android/dialer/blockreportspam/res/values-fa/strings.xml
new file mode 100644
index 0000000..9f155c5
--- /dev/null
+++ b/java/com/android/dialer/blockreportspam/res/values-fa/strings.xml
@@ -0,0 +1,17 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="block_number_confirmation_title">%1$s مسدود شود؟</string>
+  <string name="block_number_confirmation_message_new_filtering">دیگر از این شماره، تماس یا پیام نوشتاری دریافت نمی‌کنید.</string>
+  <string name="block_number_ok">مسدود کردن</string>
+  <string name="unblock_number_ok">رفع انسداد</string>
+  <string name="block_report_number_alert_title">%1$s مسدود شود؟</string>
+  <string name="block_report_number_alert_details">دیگر از این شماره تماس دریافت نمی‌کنید.</string>
+  <string name="block_number_alert_details">%1$sاین تماس به‌عنوان هرزنامه گزارش خواهد شد.</string>
+  <string name="unblock_number_alert_details">این شماره لغو انسداد می‌شود و به‌عنوان غیرهرزنامه گزارش می‌شود. تماس‌ها و پست‌های صوتی بعدی به‌عنوان هرزنامه شناسایی نمی‌شود.</string>
+  <string name="unblock_report_number_alert_title">%1$s لغو انسداد شود؟</string>
+  <string name="report_not_spam_alert_button">گزارش</string>
+  <string name="report_not_spam_alert_title">اشتباهی را گزارش می‌کنید؟</string>
+  <string name="report_not_spam_alert_details">تماس‌های بعدی از %1$s دیگر به‌عنوان هرزنامه شناسایی نخواهد شد.</string>
+  <string name="checkbox_report_as_spam_action">گزارش تماس به‌عنوان هرزنامه</string>
+  <string name="block_number_failed_toast">مشکل در مسدود کردن این شماره</string>
+  <string name="unblock_number_failed_toast">مشکل در لغو انسداد این شماره</string>
+</resources>
diff --git a/java/com/android/dialer/blockreportspam/res/values-fi/strings.xml b/java/com/android/dialer/blockreportspam/res/values-fi/strings.xml
new file mode 100644
index 0000000..0efd591
--- /dev/null
+++ b/java/com/android/dialer/blockreportspam/res/values-fi/strings.xml
@@ -0,0 +1,17 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="block_number_confirmation_title">Estetäänkö %1$s?</string>
+  <string name="block_number_confirmation_message_new_filtering">Tästä numerosta tulevat puhelut ja tekstiviestit estetään.</string>
+  <string name="block_number_ok">ESTÄ</string>
+  <string name="unblock_number_ok">KUMOA ESTO</string>
+  <string name="block_report_number_alert_title">Estetäänkö %1$s?</string>
+  <string name="block_report_number_alert_details">Tästä numerosta tulevat puhelut estetään.</string>
+  <string name="block_number_alert_details">%1$s. Puhelu ilmoitetaan häirikköpuheluksi.</string>
+  <string name="unblock_number_alert_details">Numeron esto ja häirikkötila kumotaan. Puhelut tästä numerosta eivät enää ole häirikköpuheluja.</string>
+  <string name="unblock_report_number_alert_title">Kumotaanko numeron %1$s esto?</string>
+  <string name="report_not_spam_alert_button">Ilmoita</string>
+  <string name="report_not_spam_alert_title">Haluatko ilmoittaa virheestä?</string>
+  <string name="report_not_spam_alert_details">Puhelut numerosta %1$s eivät enää jatkossa ole häirikköpuheluja.</string>
+  <string name="checkbox_report_as_spam_action">Ilmoita häirikköpuheluksi</string>
+  <string name="block_number_failed_toast">Numeron estäminen epäonnistui.</string>
+  <string name="unblock_number_failed_toast">Numeron eston kumoaminen epäonnistui.</string>
+</resources>
diff --git a/java/com/android/dialer/blockreportspam/res/values-fr-rCA/strings.xml b/java/com/android/dialer/blockreportspam/res/values-fr-rCA/strings.xml
new file mode 100644
index 0000000..d666b35
--- /dev/null
+++ b/java/com/android/dialer/blockreportspam/res/values-fr-rCA/strings.xml
@@ -0,0 +1,17 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="block_number_confirmation_title">Bloquer le numéro %1$s?</string>
+  <string name="block_number_confirmation_message_new_filtering">Vous ne recevrez plus d\'appels ni de messages texte de ce numéro.</string>
+  <string name="block_number_ok">BLOQUER</string>
+  <string name="unblock_number_ok">DÉBLOQUER</string>
+  <string name="block_report_number_alert_title">Bloquer le numéro %1$s?</string>
+  <string name="block_report_number_alert_details">Vous ne recevrez plus d\'appels de ce numéro.</string>
+  <string name="block_number_alert_details">%1$s Cet appel sera signalé comme importun.</string>
+  <string name="unblock_number_alert_details">Ce numéro sera débloqué, et les futurs appels ne seront pas signalés comme importuns.</string>
+  <string name="unblock_report_number_alert_title">Débloquer le numéro %1$s?</string>
+  <string name="report_not_spam_alert_button">Signaler</string>
+  <string name="report_not_spam_alert_title">Signaler une erreur?</string>
+  <string name="report_not_spam_alert_details">Les appels provenant du numéro %1$s ne seront plus signalés comme importuns.</string>
+  <string name="checkbox_report_as_spam_action">Signaler l\'appel comme importun</string>
+  <string name="block_number_failed_toast">Problème lors du blocage de ce numéro</string>
+  <string name="unblock_number_failed_toast">Problème lors du déblocage de ce numéro</string>
+</resources>
diff --git a/java/com/android/dialer/blockreportspam/res/values-fr/strings.xml b/java/com/android/dialer/blockreportspam/res/values-fr/strings.xml
new file mode 100644
index 0000000..fff49f5
--- /dev/null
+++ b/java/com/android/dialer/blockreportspam/res/values-fr/strings.xml
@@ -0,0 +1,17 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="block_number_confirmation_title">Bloquer le %1$s ?</string>
+  <string name="block_number_confirmation_message_new_filtering">Vous ne recevrez plus d\'appels ni de SMS provenant de ce numéro.</string>
+  <string name="block_number_ok">BLOQUER</string>
+  <string name="unblock_number_ok">DÉBLOQUER</string>
+  <string name="block_report_number_alert_title">Bloquer le %1$s ?</string>
+  <string name="block_report_number_alert_details">Vous ne recevrez plus d\'appels de ce numéro.</string>
+  <string name="block_number_alert_details">%1$s Cet appel sera signalé comme indésirable.</string>
+  <string name="unblock_number_alert_details">Ce numéro sera débloqué et considéré comme fiable. Les prochains appels provenant de celui-ci ne seront plus considérés comme indésirables.</string>
+  <string name="unblock_report_number_alert_title">Débloquer le %1$s ?</string>
+  <string name="report_not_spam_alert_button">Rapport</string>
+  <string name="report_not_spam_alert_title">Signaler une erreur ?</string>
+  <string name="report_not_spam_alert_details">Les appels provenant du %1$s ne seront plus considérés comme indésirables.</string>
+  <string name="checkbox_report_as_spam_action">Signaler comme indésirable</string>
+  <string name="block_number_failed_toast">Problème lors du blocage de ce numéro</string>
+  <string name="unblock_number_failed_toast">Problème lors du déblocage de ce numéro</string>
+</resources>
diff --git a/java/com/android/dialer/blockreportspam/res/values-gl/strings.xml b/java/com/android/dialer/blockreportspam/res/values-gl/strings.xml
new file mode 100644
index 0000000..ec2a118
--- /dev/null
+++ b/java/com/android/dialer/blockreportspam/res/values-gl/strings.xml
@@ -0,0 +1,17 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="block_number_confirmation_title">Queres bloquear o %1$s?</string>
+  <string name="block_number_confirmation_message_new_filtering">Xa non recibirás máis chamadas nin mensaxes de texto deste número.</string>
+  <string name="block_number_ok">BLOQUEAR</string>
+  <string name="unblock_number_ok">DESBLOQUEAR</string>
+  <string name="block_report_number_alert_title">Queres bloquear o %1$s?</string>
+  <string name="block_report_number_alert_details">Xa non recibirás máis chamadas deste número.</string>
+  <string name="block_number_alert_details">%1$s Informarase de que esta chamada é spam.</string>
+  <string name="unblock_number_alert_details">Desbloquearase este número e informarase de que non é spam. Aceptaranse as futuras chamadas.</string>
+  <string name="unblock_report_number_alert_title">Queres desbloquear o %1$s?</string>
+  <string name="report_not_spam_alert_button">Informar</string>
+  <string name="report_not_spam_alert_title">Queres informar dun erro?</string>
+  <string name="report_not_spam_alert_details">Xa non se definirán como spam as futuras chamadas do %1$s.</string>
+  <string name="checkbox_report_as_spam_action">Informar: a chamada é spam</string>
+  <string name="block_number_failed_toast">Produciuse un problema ao bloquear este número</string>
+  <string name="unblock_number_failed_toast">Produciuse un problema ao desbloquear este número</string>
+</resources>
diff --git a/java/com/android/dialer/blockreportspam/res/values-gu/strings.xml b/java/com/android/dialer/blockreportspam/res/values-gu/strings.xml
new file mode 100644
index 0000000..4e90e9e
--- /dev/null
+++ b/java/com/android/dialer/blockreportspam/res/values-gu/strings.xml
@@ -0,0 +1,17 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="block_number_confirmation_title">%1$sને બ્લૉક કરીએ?</string>
+  <string name="block_number_confirmation_message_new_filtering">તમે હવે આ નંબરથી કૉલ્સ અથવા ટેક્સ્ટ પ્રાપ્ત કરશો નહીં.</string>
+  <string name="block_number_ok">અવરોધિત કરો</string>
+  <string name="unblock_number_ok">અનાવરોધિત કરો</string>
+  <string name="block_report_number_alert_title">%1$sને બ્લૉક કરીએ?</string>
+  <string name="block_report_number_alert_details">હવેથી તમે આ નંબર પરથી કૉલ પ્રાપ્ત કરશો નહીં.</string>
+  <string name="block_number_alert_details">%1$s આ કૉલની સ્પામ તરીકે જાણ કરવામાં આવશે.</string>
+  <string name="unblock_number_alert_details">આ નંબરને અનબ્લૉક કરીને સ્પામ નથી તરીકે જાણ કરાશે. ભાવિ કૉલ સ્પામ તરીકે ઓળખવામાં આવશે નહીં.</string>
+  <string name="unblock_report_number_alert_title">%1$s ને અનબ્લૉક કરીએ?</string>
+  <string name="report_not_spam_alert_button">જાણ કરો</string>
+  <string name="report_not_spam_alert_title">ભૂલની જાણ કરીએ?</string>
+  <string name="report_not_spam_alert_details">%1$s તરફથી ભાવિ કૉલ હવેથી સ્પામ તરીકે ઓળખવામાં આવશે નહીં.</string>
+  <string name="checkbox_report_as_spam_action">કૉલની સ્પામ તરીકે જાણ કરો</string>
+  <string name="block_number_failed_toast">આ નંબર બ્લૉક કરવામાં સમસ્યા આવી રહી છે</string>
+  <string name="unblock_number_failed_toast">આ નંબર અનબ્લૉક કરવામાં સમસ્યા આવી રહી છે</string>
+</resources>
diff --git a/java/com/android/dialer/blockreportspam/res/values-hi/strings.xml b/java/com/android/dialer/blockreportspam/res/values-hi/strings.xml
new file mode 100644
index 0000000..fd29ace
--- /dev/null
+++ b/java/com/android/dialer/blockreportspam/res/values-hi/strings.xml
@@ -0,0 +1,17 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="block_number_confirmation_title">%1$s पर रोक लगाएं?</string>
+  <string name="block_number_confirmation_message_new_filtering">अब आपको इस नंबर से कॉल या लेख संदेश प्राप्त नहीं होंगे.</string>
+  <string name="block_number_ok">अवरुद्ध करें</string>
+  <string name="unblock_number_ok">अनवरोधित करें</string>
+  <string name="block_report_number_alert_title">%1$s पर रोक लगाएं?</string>
+  <string name="block_report_number_alert_details">अब आपको इस नंबर से कॉल नहीं आएंगे.</string>
+  <string name="block_number_alert_details">%1$s इस कॉल को स्पैम के रूप में रिपोर्ट किया जाएगा.</string>
+  <string name="unblock_number_alert_details">इस नंबर पर से रोक हटा दी जाएगी और इसे स्पैम नहीं माना जाएगा. इससे आने वाले कॉल स्पैम नहीं माने जाएंगे.</string>
+  <string name="unblock_report_number_alert_title">%1$s पर से रोक हटाएं?</string>
+  <string name="report_not_spam_alert_button">रिपोर्ट करें</string>
+  <string name="report_not_spam_alert_title">गलती की रिपोर्ट करें?</string>
+  <string name="report_not_spam_alert_details">आगे से %1$s से आने वाले कॉल स्पैम नहीं माने जाएंगे.</string>
+  <string name="checkbox_report_as_spam_action">कॉल को स्पैम रिपोर्ट करें</string>
+  <string name="block_number_failed_toast">इस नंबर पर रोक लगाने में समस्या आई</string>
+  <string name="unblock_number_failed_toast">इस नंबर से रोक हटाने में समस्या आई</string>
+</resources>
diff --git a/java/com/android/dialer/blockreportspam/res/values-hr/strings.xml b/java/com/android/dialer/blockreportspam/res/values-hr/strings.xml
new file mode 100644
index 0000000..cfcba1f
--- /dev/null
+++ b/java/com/android/dialer/blockreportspam/res/values-hr/strings.xml
@@ -0,0 +1,17 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="block_number_confirmation_title">Želite li blokirati %1$s?</string>
+  <string name="block_number_confirmation_message_new_filtering">Više nećete primati pozive ni poruke s tog broja.</string>
+  <string name="block_number_ok">BLOKIRAJ</string>
+  <string name="unblock_number_ok">DEBLOKIRAJ</string>
+  <string name="block_report_number_alert_title">Želite li blokirati %1$s?</string>
+  <string name="block_report_number_alert_details">Više nećete primati pozive s tog broja.</string>
+  <string name="block_number_alert_details">%1$s Taj će se poziv prijaviti kao neželjeni.</string>
+  <string name="unblock_number_alert_details">Taj će se broj deblokirati i neće biti prijavljen kao neželjeni. Budući pozivi neće se označiti kao neželjeni.</string>
+  <string name="unblock_report_number_alert_title">Želite li deblokirati broj %1$s?</string>
+  <string name="report_not_spam_alert_button">Prijavi</string>
+  <string name="report_not_spam_alert_title">Želite li prijaviti pogrešku?</string>
+  <string name="report_not_spam_alert_details">Budući pozivi s broja %1$s više se neće označivati kao neželjeni.</string>
+  <string name="checkbox_report_as_spam_action">Prijavite poziv kao neželjeni</string>
+  <string name="block_number_failed_toast">Poteškoće pri blokiranju ovog broja</string>
+  <string name="unblock_number_failed_toast">Poteškoće pri deblokiranju ovog broja</string>
+</resources>
diff --git a/java/com/android/dialer/blockreportspam/res/values-hu/strings.xml b/java/com/android/dialer/blockreportspam/res/values-hu/strings.xml
new file mode 100644
index 0000000..7c4a1f1
--- /dev/null
+++ b/java/com/android/dialer/blockreportspam/res/values-hu/strings.xml
@@ -0,0 +1,17 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="block_number_confirmation_title">Letiltja a következő számot: %1$s?</string>
+  <string name="block_number_confirmation_message_new_filtering">A továbbiakban nem fogad hívásokat vagy SMS-eket erről a számról.</string>
+  <string name="block_number_ok">LETILTÁS</string>
+  <string name="unblock_number_ok">TILTÁS FELOLDÁSA</string>
+  <string name="block_report_number_alert_title">Letiltja a következő számot: %1$s?</string>
+  <string name="block_report_number_alert_details">A jövőben nem fogad hívásokat erről a számról.</string>
+  <string name="block_number_alert_details">%1$s A hívást spamként jelentjük be.</string>
+  <string name="unblock_number_alert_details">A rendszer feloldja a szám tiltását, és nem spamként jelenti be. A hívások nem spamek.</string>
+  <string name="unblock_report_number_alert_title">Feloldja a következő szám tiltását: %1$s?</string>
+  <string name="report_not_spam_alert_button">Bejelentés</string>
+  <string name="report_not_spam_alert_title">Be szeretne jelenteni egy hibát?</string>
+  <string name="report_not_spam_alert_details">A tőle érkező hívásokat a jövőben a rendszer nem azonosítja spamként: %1$s.</string>
+  <string name="checkbox_report_as_spam_action">Hívás bejelentése spamként</string>
+  <string name="block_number_failed_toast">Hiba történt a szám letiltásakor</string>
+  <string name="unblock_number_failed_toast">Hiba történt a szám tiltásának feloldásakor</string>
+</resources>
diff --git a/java/com/android/dialer/blockreportspam/res/values-hy/strings.xml b/java/com/android/dialer/blockreportspam/res/values-hy/strings.xml
new file mode 100644
index 0000000..ef3f4b7
--- /dev/null
+++ b/java/com/android/dialer/blockreportspam/res/values-hy/strings.xml
@@ -0,0 +1,17 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="block_number_confirmation_title">Արգելափակե՞լ %1$s համարը</string>
+  <string name="block_number_confirmation_message_new_filtering">Այս համարից զանգեր և SMS-ներ այլևս չեք ստանա:</string>
+  <string name="block_number_ok">ԱՐԳԵԼԱՓԱԿԵԼ</string>
+  <string name="unblock_number_ok">ԱՐԳԵԼԱԲԱՑԵԼ</string>
+  <string name="block_report_number_alert_title">Արգելափակե՞լ %1$s համարը</string>
+  <string name="block_report_number_alert_details">Այս համարից այլևս զանգեր չեք ստանա:</string>
+  <string name="block_number_alert_details">%1$s Այս զանգը կնշվի որպես սպամ:</string>
+  <string name="unblock_number_alert_details">Այս համարը կարգելաբացվի և կնշվի որպես ոչ սպամ: Այս համարից եկող զանգերն այլևս չեն նշվի որպես սպամ:</string>
+  <string name="unblock_report_number_alert_title">Արգելաբացե՞լ %1$s համարը</string>
+  <string name="report_not_spam_alert_button">Բողոքել</string>
+  <string name="report_not_spam_alert_title">Հաղորդե՞լ սխալի մասին</string>
+  <string name="report_not_spam_alert_details">%1$s համարից եկող զանգերն այլևս չեն նշվի որպես սպամ:</string>
+  <string name="checkbox_report_as_spam_action">Նշել զանգը որպես սպամ</string>
+  <string name="block_number_failed_toast">Չհաջողվեց արգելափակել այս համարը</string>
+  <string name="unblock_number_failed_toast">Չհաջողվեց արգելաբացել այս համարը</string>
+</resources>
diff --git a/java/com/android/dialer/blockreportspam/res/values-in/strings.xml b/java/com/android/dialer/blockreportspam/res/values-in/strings.xml
new file mode 100644
index 0000000..48a0e9a
--- /dev/null
+++ b/java/com/android/dialer/blockreportspam/res/values-in/strings.xml
@@ -0,0 +1,17 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="block_number_confirmation_title">Blokir %1$s?</string>
+  <string name="block_number_confirmation_message_new_filtering">Anda tidak akan menerima telepon atau SMS lagi dari nomor ini.</string>
+  <string name="block_number_ok">BLOKIR</string>
+  <string name="unblock_number_ok">BEBASKAN</string>
+  <string name="block_report_number_alert_title">Blokir %1$s?</string>
+  <string name="block_report_number_alert_details">Anda tidak akan menerima telepon dari nomor ini lagi.</string>
+  <string name="block_number_alert_details">%1$s Panggilan ini akan dilaporkan sebagai spam.</string>
+  <string name="unblock_number_alert_details">Nomor akan dibebaskan &amp; dilaporkan bukan spam. Telepon mendatang dari nomor ini dianggap bukan spam.</string>
+  <string name="unblock_report_number_alert_title">Batalkan pemblokiran %1$s?</string>
+  <string name="report_not_spam_alert_button">Laporan</string>
+  <string name="report_not_spam_alert_title">Laporkan kesalahan?</string>
+  <string name="report_not_spam_alert_details">Telepon mendatang dari %1$s tidak akan dianggap spam lagi.</string>
+  <string name="checkbox_report_as_spam_action">Laporkan telepon sebagai spam</string>
+  <string name="block_number_failed_toast">Terjadi masalah saat memblokir nomor ini</string>
+  <string name="unblock_number_failed_toast">Terjadi masalah saat membatalkan pemblokiran nomor ini</string>
+</resources>
diff --git a/java/com/android/dialer/blockreportspam/res/values-is/strings.xml b/java/com/android/dialer/blockreportspam/res/values-is/strings.xml
new file mode 100644
index 0000000..36e465b
--- /dev/null
+++ b/java/com/android/dialer/blockreportspam/res/values-is/strings.xml
@@ -0,0 +1,17 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="block_number_confirmation_title">Setja %1$s á bannlista?</string>
+  <string name="block_number_confirmation_message_new_filtering">Þú munt ekki lengur fá símtöl eða textaskilaboð úr þessu númeri.</string>
+  <string name="block_number_ok">SETJA Á BANNLISTA</string>
+  <string name="unblock_number_ok">TAKA AF BANNLISTA</string>
+  <string name="block_report_number_alert_title">Setja %1$s á bannlista?</string>
+  <string name="block_report_number_alert_details">Þú munt ekki lengur fá símtöl úr þessu númeri.</string>
+  <string name="block_number_alert_details">%1$s Þetta símtal verður tilkynnt sem úr ruslnúmeri.</string>
+  <string name="unblock_number_alert_details">Þetta númer verður tekið af bannlista og ekki tilkynnt sem ruslnúmer. Ekki er lokað á símtöl.</string>
+  <string name="unblock_report_number_alert_title">Taka %1$s af bannlista?</string>
+  <string name="report_not_spam_alert_button">Tilkynna</string>
+  <string name="report_not_spam_alert_title">Tilkynna mistök?</string>
+  <string name="report_not_spam_alert_details">Frekari símtöl frá %1$s verða ekki lengur tilkynnt sem úr ruslnúmeri.</string>
+  <string name="checkbox_report_as_spam_action">Tilkynna símtal sem úr ruslnúmeri</string>
+  <string name="block_number_failed_toast">Vandamál kom upp við að setja þetta númer á bannlista</string>
+  <string name="unblock_number_failed_toast">Vandamál kom upp við að taka þetta númer af bannlista</string>
+</resources>
diff --git a/java/com/android/dialer/blockreportspam/res/values-it/strings.xml b/java/com/android/dialer/blockreportspam/res/values-it/strings.xml
new file mode 100644
index 0000000..862ba20
--- /dev/null
+++ b/java/com/android/dialer/blockreportspam/res/values-it/strings.xml
@@ -0,0 +1,17 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="block_number_confirmation_title">Bloccare il numero %1$s?</string>
+  <string name="block_number_confirmation_message_new_filtering">Non riceverai più chiamate o SMS da questo numero.</string>
+  <string name="block_number_ok">BLOCCA</string>
+  <string name="unblock_number_ok">SBLOCCA</string>
+  <string name="block_report_number_alert_title">Bloccare il numero %1$s?</string>
+  <string name="block_report_number_alert_details">Non riceverai più chiamate da questo numero.</string>
+  <string name="block_number_alert_details">%1$s Questa chiamata verrà segnalata come spam.</string>
+  <string name="unblock_number_alert_details">Il numero verrà sbloccato e segnalato come non spam. In futuro non sarà più considerato spam.</string>
+  <string name="unblock_report_number_alert_title">Sbloccare il numero %1$s?</string>
+  <string name="report_not_spam_alert_button">Segnala</string>
+  <string name="report_not_spam_alert_title">Vuoi segnalare un errore?</string>
+  <string name="report_not_spam_alert_details">Le chiamate future da %1$s non verranno più identificate come spam.</string>
+  <string name="checkbox_report_as_spam_action">Segnala la chiamata come spam</string>
+  <string name="block_number_failed_toast">Errore durante il blocco del numero</string>
+  <string name="unblock_number_failed_toast">Errore durante lo sblocco del numero</string>
+</resources>
diff --git a/java/com/android/dialer/blockreportspam/res/values-iw/strings.xml b/java/com/android/dialer/blockreportspam/res/values-iw/strings.xml
new file mode 100644
index 0000000..101e43c
--- /dev/null
+++ b/java/com/android/dialer/blockreportspam/res/values-iw/strings.xml
@@ -0,0 +1,17 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="block_number_confirmation_title">לחסום את %1$s?</string>
+  <string name="block_number_confirmation_message_new_filtering">לא יגיעו אליך יותר שיחות או הודעות טקסט מהמספר הזה.</string>
+  <string name="block_number_ok">חסום</string>
+  <string name="unblock_number_ok">ביטול חסימה</string>
+  <string name="block_report_number_alert_title">לחסום את %1$s?</string>
+  <string name="block_report_number_alert_details">לא יגיעו אליך יותר שיחות מהמספר הזה.</string>
+  <string name="block_number_alert_details">%1$s השיחה הזו תדווח כספאם.</string>
+  <string name="unblock_number_alert_details">החסימה של המספר הזה תבוטל וידווח שהוא אינו ספאם. שיחות שיתקבלו ממנו לא יזוהו כספאם.</string>
+  <string name="unblock_report_number_alert_title">לבטל את החסימה של %1$s?</string>
+  <string name="report_not_spam_alert_button">דיווח</string>
+  <string name="report_not_spam_alert_title">טעינו? רוצה לדווח על זה?</string>
+  <string name="report_not_spam_alert_details">שיחות שיתקבלו מהמספר %1$s לא יזוהו יותר כספאם.</string>
+  <string name="checkbox_report_as_spam_action">דיווח על השיחה כספאם</string>
+  <string name="block_number_failed_toast">לא ניתן היה לחסום את המספר הזה</string>
+  <string name="unblock_number_failed_toast">לא ניתן היה לבטל את החסימה של המספר הזה</string>
+</resources>
diff --git a/java/com/android/dialer/blockreportspam/res/values-ja/strings.xml b/java/com/android/dialer/blockreportspam/res/values-ja/strings.xml
new file mode 100644
index 0000000..899d4cd
--- /dev/null
+++ b/java/com/android/dialer/blockreportspam/res/values-ja/strings.xml
@@ -0,0 +1,17 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="block_number_confirmation_title">%1$s をブロックしますか？</string>
+  <string name="block_number_confirmation_message_new_filtering">今後はこの番号からの通話やテキスト メッセージは受信しなくなります。</string>
+  <string name="block_number_ok">ブロック</string>
+  <string name="unblock_number_ok">ブロックを解除</string>
+  <string name="block_report_number_alert_title">%1$s をブロックしますか？</string>
+  <string name="block_report_number_alert_details">今後この番号から通話を受信することはなくなります。</string>
+  <string name="block_number_alert_details">%1$sこの通話は迷惑電話として報告されます。</string>
+  <string name="unblock_number_alert_details">この番号のブロックが解除され、迷惑電話ではないと報告されます（迷惑電話として識別されなくなります）。</string>
+  <string name="unblock_report_number_alert_title">%1$s のブロックを解除しますか？</string>
+  <string name="report_not_spam_alert_button">報告</string>
+  <string name="report_not_spam_alert_title">誤りを報告しますか？</string>
+  <string name="report_not_spam_alert_details">今後、%1$s からの通話は迷惑電話として識別されなくなります。</string>
+  <string name="checkbox_report_as_spam_action">通話を迷惑電話として報告する</string>
+  <string name="block_number_failed_toast">この電話番号をブロックできませんでした</string>
+  <string name="unblock_number_failed_toast">この電話番号のブロックを解除できませんでした</string>
+</resources>
diff --git a/java/com/android/dialer/blockreportspam/res/values-ka/strings.xml b/java/com/android/dialer/blockreportspam/res/values-ka/strings.xml
new file mode 100644
index 0000000..f0b6515
--- /dev/null
+++ b/java/com/android/dialer/blockreportspam/res/values-ka/strings.xml
@@ -0,0 +1,17 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="block_number_confirmation_title">გსურთ, დაბლოკოთ %1$s?</string>
+  <string name="block_number_confirmation_message_new_filtering">ამ ნომრიდან ზარებს ან ტექსტურ შეტყობინებებს აღარ მიიღებთ.</string>
+  <string name="block_number_ok">დაბლოკვა</string>
+  <string name="unblock_number_ok">განბლოკვა</string>
+  <string name="block_report_number_alert_title">გსურთ, დაბლოკოთ %1$s?</string>
+  <string name="block_report_number_alert_details">ამ ნომრიდან ზარებს აღარ მიიღებთ.</string>
+  <string name="block_number_alert_details">%1$s ეს ზარი მოინიშნება სპამად.</string>
+  <string name="unblock_number_alert_details">ეს ნომერი განიბლოკება და გაიგზავნება სპამის გაუქმ. შეტყობინება. მომავალი ზარები სპამად არ ჩაითვლება.</string>
+  <string name="unblock_report_number_alert_title">გსურთ, განბლოკოთ %1$s?</string>
+  <string name="report_not_spam_alert_button">ანგარიში</string>
+  <string name="report_not_spam_alert_title">გსურთ, შეგვატყობინოთ შეცდომის შესახებ?</string>
+  <string name="report_not_spam_alert_details">მომავალი ზარები %1$s-დან სპამად აღარ ჩაითვლება.</string>
+  <string name="checkbox_report_as_spam_action">ზარზე სპამის შეტყ. გაგზავნა</string>
+  <string name="block_number_failed_toast">ამ ნომრის დაბლოკვა ვერ ხერხდება</string>
+  <string name="unblock_number_failed_toast">ამ ნომრის განბლოკვა ვერ ხერხდება</string>
+</resources>
diff --git a/java/com/android/dialer/blockreportspam/res/values-kk/strings.xml b/java/com/android/dialer/blockreportspam/res/values-kk/strings.xml
new file mode 100644
index 0000000..9aa364e
--- /dev/null
+++ b/java/com/android/dialer/blockreportspam/res/values-kk/strings.xml
@@ -0,0 +1,17 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="block_number_confirmation_title">%1$s нөмірін бөгеу қажет пе?</string>
+  <string name="block_number_confirmation_message_new_filtering">Бұдан былай осы нөмірден қоңыраулар немесе мәтіндік хабарлар алмайсыз.</string>
+  <string name="block_number_ok">БӨГЕУ</string>
+  <string name="unblock_number_ok">БӨГЕУДЕН ШЫҒАРУ</string>
+  <string name="block_report_number_alert_title">%1$s нөмірін бөгеу қажет пе?</string>
+  <string name="block_report_number_alert_details">Бұдан былай бұл нөмірден қоңыраулар алмайтын боласыз.</string>
+  <string name="block_number_alert_details">%1$s Бұл қоңырау \"спам\" деп хабарланады.</string>
+  <string name="unblock_number_alert_details">Бұл нөмірдің бөгеуі жойылып, \"спам емес\" деп белгіленеді. Алдағы қоңыраулар спам қалтасына жіберілмейді.</string>
+  <string name="unblock_report_number_alert_title">%1$s бөгеуін алу қажет пе?</string>
+  <string name="report_not_spam_alert_button">Хабарлау</string>
+  <string name="report_not_spam_alert_title">\"Қате\" деп хабарлау қажет пе?</string>
+  <string name="report_not_spam_alert_details">Алдағы %1$s қоңыраулары енді спам қалтасына жіберілмейді.</string>
+  <string name="checkbox_report_as_spam_action">\"Спам\" деп хабарлау</string>
+  <string name="block_number_failed_toast">Бұл нөмір бөгелмеді</string>
+  <string name="unblock_number_failed_toast">Бұл нөмірдің бөгеуін алу мүмкін болмады</string>
+</resources>
diff --git a/java/com/android/dialer/blockreportspam/res/values-km/strings.xml b/java/com/android/dialer/blockreportspam/res/values-km/strings.xml
new file mode 100644
index 0000000..c7366f5
--- /dev/null
+++ b/java/com/android/dialer/blockreportspam/res/values-km/strings.xml
@@ -0,0 +1,17 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="block_number_confirmation_title">ទប់ស្កាត់ %1$s ?</string>
+  <string name="block_number_confirmation_message_new_filtering">អ្នក​នឹង​លែង​ទទួល​​ការ​ហៅ ឬ​​សារ​​អត្ថបទ​ពី​លេខ​នេះ​ទៀត​ហើយ។</string>
+  <string name="block_number_ok">រារាំង</string>
+  <string name="unblock_number_ok">ឈប់រារាំង</string>
+  <string name="block_report_number_alert_title">ទប់ស្កាត់ %1$s ?</string>
+  <string name="block_report_number_alert_details">អ្នក​នឹង​លែង​ទទួល​បាន​ការ​ហៅ​ពី​លេខ​នេះ​ទៀត​ហើយ។</string>
+  <string name="block_number_alert_details">%1$s ការ​ហៅ​នេះ​នឹង​ត្រូវ​រាយការណ៍​ថា​ជា​សារ​ឥត​បាន​ការ។</string>
+  <string name="unblock_number_alert_details">លេខ​នេះ​នឹង​ត្រូវ​​បាន​ឈប់​​ទប់ស្កាត់ និង​រាយការណ៍​​ថា​​មិន​មែន​ជា​សារ​ឥតបានការ​ទេ។ ការ​ហៅ​លើក​ក្រោយៗ​នឹង​មិន​ត្រូវ​បាន​​កំណត់​​ថា​ជា​សារ​​ឥត​បាន​ការ​ទេ។</string>
+  <string name="unblock_report_number_alert_title">ឈប់​ទប់ស្កាត់ %1$s ?</string>
+  <string name="report_not_spam_alert_button">រាយការណ៍</string>
+  <string name="report_not_spam_alert_title">រាយការណ៍​បញ្ហា?</string>
+  <string name="report_not_spam_alert_details">ការ​ហៅ​លើក​ក្រោយៗ​​ពី %1$s នឹង​លែង​ត្រូវ​បាន​សម្គាល់​ថា​ជា​សារ​ឥត​បាន​ការ​ទៀត​ហើយ។</string>
+  <string name="checkbox_report_as_spam_action">រាយការណ៍​ការ​ហៅ​​ថា​ជា​សារ​ឥត​បាន​ការ</string>
+  <string name="block_number_failed_toast">មាន​បញ្ហា​ក្នុង​ការ​ទប់ស្កាត់​​លេខ​នេះ</string>
+  <string name="unblock_number_failed_toast">មាន​បញ្ហា​ក្នុង​ការ​អនុញ្ញាត​លេខ​នេះ</string>
+</resources>
diff --git a/java/com/android/dialer/blockreportspam/res/values-kn/strings.xml b/java/com/android/dialer/blockreportspam/res/values-kn/strings.xml
new file mode 100644
index 0000000..5859a6c
--- /dev/null
+++ b/java/com/android/dialer/blockreportspam/res/values-kn/strings.xml
@@ -0,0 +1,17 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="block_number_confirmation_title">%1$s ನಿರ್ಬಂಧಿಸುವುದೇ?</string>
+  <string name="block_number_confirmation_message_new_filtering">ಈ ಸಂಖ್ಯೆಯಿಂದ ನೀವು ಇನ್ನು ಮುಂದೆ ಕರೆಗಳು ಅಥವಾ ಪಠ್ಯ ಸಂದೇಶಗಳನ್ನು ಸ್ವೀಕರಿಸುವುದಿಲ್ಲ.</string>
+  <string name="block_number_ok">ನಿರ್ಬಂಧಿಸು</string>
+  <string name="unblock_number_ok">ನಿರ್ಬಂಧ ತೆಗೆ</string>
+  <string name="block_report_number_alert_title">%1$s ನಿರ್ಬಂಧಿಸುವುದೇ?</string>
+  <string name="block_report_number_alert_details">ನೀವು ಇನ್ನು ಮುಂದೆ ಈ ಸಂಖ್ಯೆಯಿಂದ ಕರೆಗಳನ್ನು ಸ್ವೀಕರಿಸುವುದಿಲ್ಲ.</string>
+  <string name="block_number_alert_details">%1$s ಈ ಕರೆಯನ್ನು ಸ್ಪ್ಯಾಮ್ ಎಂದು ವರದಿ ಮಾಡಲಾಗುತ್ತದೆ.</string>
+  <string name="unblock_number_alert_details">ಈ ಸಂಖ್ಯೆಗೆ ನಿರ್ಬಂಧ ತೆಗೆಯಲಾಗುತ್ತದೆ ಮತ್ತು ಸ್ಪ್ಯಾಮ್ ಎಂದು ವರದಿ ಮಾಡಲಾಗುವುದಿಲ್ಲ. ಭವಿಷ್ಯದ ಕರೆಗಳನ್ನು ಸ್ಪ್ಯಾಮ್ ಎಂದು ಗುರುತಿಸಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ.</string>
+  <string name="unblock_report_number_alert_title">%1$s ನಿರ್ಬಂಧವನ್ನು ತೆಗೆಯುವುದೇ?</string>
+  <string name="report_not_spam_alert_button">ವರದಿ</string>
+  <string name="report_not_spam_alert_title">ತಪ್ಪನ್ನು ವರದಿಮಾಡುವುದೇ?</string>
+  <string name="report_not_spam_alert_details">ಈ %1$s ಯಿಂದ ಭವಿಷ್ಯದ ಕರೆಗಳನ್ನು ಇನ್ನು ಮುಂದೆ ಸ್ಪ್ಯಾಮ್ ಎಂದು ಗುರುತಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ.</string>
+  <string name="checkbox_report_as_spam_action">ಕರೆ ಸ್ಪ್ಯಾಮ್ ಎಂದು ವರದಿಮಾಡಿ</string>
+  <string name="block_number_failed_toast">ಈ ಸಂಖ್ಯೆಯನ್ನು ನಿರ್ಬಂಧಿಸುವಲ್ಲಿ ಸಮಸ್ಯೆ</string>
+  <string name="unblock_number_failed_toast">ಈ ಸಂಖ್ಯೆಯನ್ನು ನಿರ್ಬಂಧವನ್ನು ತೆಗೆದುಹಾಕುವಲ್ಲಿ ಸಮಸ್ಯೆ</string>
+</resources>
diff --git a/java/com/android/dialer/blockreportspam/res/values-ko/strings.xml b/java/com/android/dialer/blockreportspam/res/values-ko/strings.xml
new file mode 100644
index 0000000..539eb8e
--- /dev/null
+++ b/java/com/android/dialer/blockreportspam/res/values-ko/strings.xml
@@ -0,0 +1,17 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="block_number_confirmation_title">%1$s번을 차단하시겠습니까?</string>
+  <string name="block_number_confirmation_message_new_filtering">이 번호로부터 수신되는 전화와 문자를 더 이상 받지 않습니다.</string>
+  <string name="block_number_ok">차단</string>
+  <string name="unblock_number_ok">차단 해제</string>
+  <string name="block_report_number_alert_title">%1$s번을 차단하시겠습니까?</string>
+  <string name="block_report_number_alert_details">이 번호로부터 수신되는 전화를 더 이상 받지 않습니다.</string>
+  <string name="block_number_alert_details">%1$s 이 전화는 스팸으로 신고됩니다.</string>
+  <string name="unblock_number_alert_details">이 번호는 차단되지 않으며 스팸이 아닌 것으로 신고됩니다. 앞으로 이 번호에서 전화가 오면 스팸으로 인식되지 않습니다.</string>
+  <string name="unblock_report_number_alert_title">%1$s번을 차단 해제하시겠습니까?</string>
+  <string name="report_not_spam_alert_button">신고</string>
+  <string name="report_not_spam_alert_title">실수임을 신고하시겠습니까?</string>
+  <string name="report_not_spam_alert_details">앞으로 %1$s에서 전화가 오면 스팸으로 인식되지 않습니다.</string>
+  <string name="checkbox_report_as_spam_action">전화를 스팸으로 신고</string>
+  <string name="block_number_failed_toast">이 번호를 차단하는 중에 문제가 발생했습니다.</string>
+  <string name="unblock_number_failed_toast">이 번호를 차단 해제하는 중에 문제가 발생했습니다.</string>
+</resources>
diff --git a/java/com/android/dialer/blockreportspam/res/values-ky/strings.xml b/java/com/android/dialer/blockreportspam/res/values-ky/strings.xml
new file mode 100644
index 0000000..19c16d4
--- /dev/null
+++ b/java/com/android/dialer/blockreportspam/res/values-ky/strings.xml
@@ -0,0 +1,17 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="block_number_confirmation_title">%1$s бөгөттөлсүнбү?</string>
+  <string name="block_number_confirmation_message_new_filtering">Бул номерден келген чалууларды же SMS билдирүүлөрдү албай каласыз.</string>
+  <string name="block_number_ok">БӨГӨТТӨӨ</string>
+  <string name="unblock_number_ok">БӨГӨТТӨН ЧЫГАРУУ</string>
+  <string name="block_report_number_alert_title">%1$s бөгөттөлсүнбү?</string>
+  <string name="block_report_number_alert_details">Мындан ары бул номерден келген чалуулар кабыл алынбайт.</string>
+  <string name="block_number_alert_details">%1$s Бул чалуу спам деп белгиленет.</string>
+  <string name="unblock_number_alert_details">Номер бөгөттөн чыгарылып, спам эмес деп белгиленет. Кийинки чалуулар спам деп белгиленбейт.</string>
+  <string name="unblock_report_number_alert_title">%1$s бөгөттөн чыгарылсынбы?</string>
+  <string name="report_not_spam_alert_button">Арыздануу</string>
+  <string name="report_not_spam_alert_title">Ката деп билдирилсинби?</string>
+  <string name="report_not_spam_alert_details">%1$s номеринен келген чалуулар мындан ары спам деп белгиленбейт.</string>
+  <string name="checkbox_report_as_spam_action">Чалууну спам катары кабарлоо</string>
+  <string name="block_number_failed_toast">Бул номерди бөгөттөөдө көйгөй чыкты</string>
+  <string name="unblock_number_failed_toast">Бул номерди бөгөттөн чыгарууда көйгөй чыкты</string>
+</resources>
diff --git a/java/com/android/dialer/blockreportspam/res/values-lo/strings.xml b/java/com/android/dialer/blockreportspam/res/values-lo/strings.xml
new file mode 100644
index 0000000..4154c93
--- /dev/null
+++ b/java/com/android/dialer/blockreportspam/res/values-lo/strings.xml
@@ -0,0 +1,17 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="block_number_confirmation_title">ບລັອກ %1$s ບໍ?</string>
+  <string name="block_number_confirmation_message_new_filtering">ທ່ານຈະບໍ່ໄດ້ຮັບສາຍ ຫຼື ຂໍ້ຄວາມຈາກເບີນີ້ອີກຕໍ່ໄປ.</string>
+  <string name="block_number_ok">ບລັອກ</string>
+  <string name="unblock_number_ok">​ປົດ​ບລັອກ</string>
+  <string name="block_report_number_alert_title">ບລັອກ %1$s ບໍ?</string>
+  <string name="block_report_number_alert_details">ທ່ານຈະບໍ່ໄດ້ຮັບສາຍຈາກເບີໂທນີ້ອີກຕໍ່ໄປ.</string>
+  <string name="block_number_alert_details">%1$s ການໂທນີ້ຈະຖືກລາຍງານວ່າເປັນສະແປມ.</string>
+  <string name="unblock_number_alert_details">ເບີໂທນີ້ຈະຖືກປົດບລັອກ ແລະ ລາຍງານວ່າບໍ່ແມ່ນສະແປມ. ການໂທໃນອະນາຄົດຈະບໍ່ຖືກລະບຸວ່າເປັນສະແປມ.</string>
+  <string name="unblock_report_number_alert_title">ປົດບລັອກ %1$s ບໍ?</string>
+  <string name="report_not_spam_alert_button">ລາຍງານ</string>
+  <string name="report_not_spam_alert_title">ລາຍງານວ່າເປັນຄວາມຜິດພາດບໍ?</string>
+  <string name="report_not_spam_alert_details">ການໂທໃນອະນາຄົດຈາກ %1$s ຈະບໍ່ຖືກລະບຸວ່າເປັນສະແປມອີກຕໍ່ໄປ.</string>
+  <string name="checkbox_report_as_spam_action">ລາຍງານວ່າເປັນສະແປມ</string>
+  <string name="block_number_failed_toast">ເກີດບັນຫາໃນການບລັອກເບີໂທນີ້</string>
+  <string name="unblock_number_failed_toast">ເກີດບັນຫາໃນການປົດບລັອກເບີໂທນີ້</string>
+</resources>
diff --git a/java/com/android/dialer/blockreportspam/res/values-lt/strings.xml b/java/com/android/dialer/blockreportspam/res/values-lt/strings.xml
new file mode 100644
index 0000000..7dcc7eb
--- /dev/null
+++ b/java/com/android/dialer/blockreportspam/res/values-lt/strings.xml
@@ -0,0 +1,17 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="block_number_confirmation_title">Blokuoti numerį %1$s?</string>
+  <string name="block_number_confirmation_message_new_filtering">Nebegausite skambučių ar teksto pranešimų iš šio numerio.</string>
+  <string name="block_number_ok">BLOKUOTI</string>
+  <string name="unblock_number_ok">PANAIKINTI BLOKAVIMĄ</string>
+  <string name="block_report_number_alert_title">Blokuoti numerį %1$s?</string>
+  <string name="block_report_number_alert_details">Nebegausite skambučių iš šio numerio.</string>
+  <string name="block_number_alert_details">%1$s Apie šį skambutį bus pranešta kaip apie šlamštą.</string>
+  <string name="unblock_number_alert_details">Šio nr. blok. bus pan. ir apie jį bus pran. kaip ne apie šl. siunt. Būs. sk. nebus nust. kaip šl.</string>
+  <string name="unblock_report_number_alert_title">Panaikinti numerio %1$s blokavimą?</string>
+  <string name="report_not_spam_alert_button">Pranešti</string>
+  <string name="report_not_spam_alert_title">Pranešti apie klaidą?</string>
+  <string name="report_not_spam_alert_details">Būsimi skambučiai iš numerio %1$s nebus nustatyti kaip šlamštas.</string>
+  <string name="checkbox_report_as_spam_action">Pr. apie skamb. kaip apie šl.</string>
+  <string name="block_number_failed_toast">Nepavyko užblokuoti šio numerio</string>
+  <string name="unblock_number_failed_toast">Nepavyko atblokuoti šio numerio</string>
+</resources>
diff --git a/java/com/android/dialer/blockreportspam/res/values-lv/strings.xml b/java/com/android/dialer/blockreportspam/res/values-lv/strings.xml
new file mode 100644
index 0000000..bdfcb0a
--- /dev/null
+++ b/java/com/android/dialer/blockreportspam/res/values-lv/strings.xml
@@ -0,0 +1,17 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="block_number_confirmation_title">Vai bloķēt numuru %1$s?</string>
+  <string name="block_number_confirmation_message_new_filtering">Jūs vairs nesaņemsiet zvanus un īsziņas no šī numura.</string>
+  <string name="block_number_ok">BLOĶĒT</string>
+  <string name="unblock_number_ok">ATBLOĶĒT</string>
+  <string name="block_report_number_alert_title">Vai bloķēt numuru %1$s?</string>
+  <string name="block_report_number_alert_details">Jūs vairs nesaņemsiet zvanus no šī numura.</string>
+  <string name="block_number_alert_details">%1$s Šis zvans tiks atzīmēts kā nevēlams.</string>
+  <string name="unblock_number_alert_details">Numurs tiks atbloķēts un netiks atzīmēts kā nevēlams. Turpmākie zvani netiks atzīmēti kā nevēlami.</string>
+  <string name="unblock_report_number_alert_title">Vai atbloķēt numuru %1$s?</string>
+  <string name="report_not_spam_alert_button">Ziņot</string>
+  <string name="report_not_spam_alert_title">Vai ziņot par kļūdu?</string>
+  <string name="report_not_spam_alert_details">Turpmākie zvani no numura %1$s vairs netiks atzīmēti kā nevēlami.</string>
+  <string name="checkbox_report_as_spam_action">Atzīmēt zvanu kā nevēlamu</string>
+  <string name="block_number_failed_toast">Problēma ar šī numura bloķēšanu</string>
+  <string name="unblock_number_failed_toast">Problēma ar šī numura atbloķēšanu</string>
+</resources>
diff --git a/java/com/android/dialer/blockreportspam/res/values-mk/strings.xml b/java/com/android/dialer/blockreportspam/res/values-mk/strings.xml
new file mode 100644
index 0000000..1fe8951
--- /dev/null
+++ b/java/com/android/dialer/blockreportspam/res/values-mk/strings.xml
@@ -0,0 +1,17 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="block_number_confirmation_title">Да се блокира %1$s?</string>
+  <string name="block_number_confirmation_message_new_filtering">Веќе нема да примате повици или текстуални пораки од овој број.</string>
+  <string name="block_number_ok">БЛОКИРАЈ</string>
+  <string name="unblock_number_ok">ДЕБЛОКИРАЈ</string>
+  <string name="block_report_number_alert_title">Да се блокира %1$s?</string>
+  <string name="block_report_number_alert_details">Веќе нема да примате повици од бројов.</string>
+  <string name="block_number_alert_details">%1$s Повиков ќе се пријави како спам.</string>
+  <string name="unblock_number_alert_details">Бројов ќе се одблокира и пријави дека не е спам. Повиците и гов. пошта нема да се гледаат како спам.</string>
+  <string name="unblock_report_number_alert_title">Да се одблокира %1$s?</string>
+  <string name="report_not_spam_alert_button">Пријави</string>
+  <string name="report_not_spam_alert_title">Да се пријави грешка?</string>
+  <string name="report_not_spam_alert_details">Повиците од %1$s во иднина нема да се гледаат како спам.</string>
+  <string name="checkbox_report_as_spam_action">Пријавете го повикот како спам</string>
+  <string name="block_number_failed_toast">Проблем при блокирање на бројов</string>
+  <string name="unblock_number_failed_toast">Проблем при одблокирање на бројов</string>
+</resources>
diff --git a/java/com/android/dialer/blockreportspam/res/values-ml/strings.xml b/java/com/android/dialer/blockreportspam/res/values-ml/strings.xml
new file mode 100644
index 0000000..a674877
--- /dev/null
+++ b/java/com/android/dialer/blockreportspam/res/values-ml/strings.xml
@@ -0,0 +1,17 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="block_number_confirmation_title">%1$s ബ്ലോക്ക് ചെയ്യണോ?</string>
+  <string name="block_number_confirmation_message_new_filtering">നിങ്ങൾക്ക് ഇനി ഈ നമ്പറിൽ നിന്ന് കോളുകളോ ടെക്‌‌സ്‌റ്റോ ലഭിക്കില്ല.</string>
+  <string name="block_number_ok">ബ്ലോക്കുചെയ്യുക</string>
+  <string name="unblock_number_ok">അൺബ്ലോക്കുചെയ്യുക</string>
+  <string name="block_report_number_alert_title">%1$s ബ്ലോക്ക് ചെയ്യണോ?</string>
+  <string name="block_report_number_alert_details">നിങ്ങൾക്ക് ഇനി ഈ നമ്പറിൽ നിന്ന് കോളുകൾ ലഭിക്കില്ല.</string>
+  <string name="block_number_alert_details">%1$s ഈ കോൾ സ്‌പാം ആയി റിപ്പോർട്ട് ചെയ്യും.</string>
+  <string name="unblock_number_alert_details">ഈ നമ്പർ അൺ‌ബ്ലോക്ക് ചെയ്‌ത്, സ്‌പാമല്ലെന്ന് റിപ്പോർട്ട് ചെയ്യും. ഭാവിയിൽ വരാൻ പോകുന്ന കോളുകളെ സ്‌പാം ആയി കണക്കാക്കപ്പെടില്ല.</string>
+  <string name="unblock_report_number_alert_title">%1$s അൺബ്ലോക്ക് ചെയ്യണോ?</string>
+  <string name="report_not_spam_alert_button">റിപ്പോര്‍ട്ട് ചെയ്യുക</string>
+  <string name="report_not_spam_alert_title">ഒരു തെറ്റ് റിപ്പോർട്ട് ചെയ്യണോ?</string>
+  <string name="report_not_spam_alert_details">%1$s നമ്പറിൽ നിന്ന് ഭാവിയിൽ വരാൻ പോകുന്ന കോളുകളെ ഇനി സ്‌പാമെന്ന് കണക്കാക്കില്ല.</string>
+  <string name="checkbox_report_as_spam_action">കോൾ സ്‌പാം ആണെന്ന് റിപ്പോർട്ട് ചെയ്യുക</string>
+  <string name="block_number_failed_toast">ഈ നമ്പർ ബ്ലോക്ക് ചെയ്യുന്നതിൽ പ്രശ്‌നം</string>
+  <string name="unblock_number_failed_toast">ഈ നമ്പർ അൺബ്ലോക്ക് ചെയ്യുന്നതിൽ പ്രശ്‌നം</string>
+</resources>
diff --git a/java/com/android/dialer/blockreportspam/res/values-mn/strings.xml b/java/com/android/dialer/blockreportspam/res/values-mn/strings.xml
new file mode 100644
index 0000000..ed8579a
--- /dev/null
+++ b/java/com/android/dialer/blockreportspam/res/values-mn/strings.xml
@@ -0,0 +1,17 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="block_number_confirmation_title">%1$s-г хориглох уу?</string>
+  <string name="block_number_confirmation_message_new_filtering">Та энэ дугаараас цаашид дуудлага буюу мессеж хүлээж авахгүй.</string>
+  <string name="block_number_ok">БЛОКЛОХ</string>
+  <string name="unblock_number_ok">БЛОКООС ГАРГАХ</string>
+  <string name="block_report_number_alert_title">%1$s-г хориглох уу?</string>
+  <string name="block_report_number_alert_details">Та энэ дугаараас цаашид дуудлага хүлээж авахгүй.</string>
+  <string name="block_number_alert_details">%1$s Энэ дуудлагыг спам гэж мэдээлэх болно.</string>
+  <string name="unblock_number_alert_details">Энэ дугаарын хоригийг авч, спам биш гэж мэдээлэх болно. Цаашид ирэх дуудлагыг спам гэж үзэхгүй.</string>
+  <string name="unblock_report_number_alert_title">%1$s-г хоригоос гаргах уу?</string>
+  <string name="report_not_spam_alert_button">Мэдэгдэх</string>
+  <string name="report_not_spam_alert_title">Алдааг мэдээлэх үү?</string>
+  <string name="report_not_spam_alert_details">%1$s-с цаашид ирэх дуудлагыг спам гэж үзэхгүй.</string>
+  <string name="checkbox_report_as_spam_action">Дуудлагыг спам гэж мэдээлэх</string>
+  <string name="block_number_failed_toast">Энэ дугаарыг хориглоход асуудал гарсан</string>
+  <string name="unblock_number_failed_toast">Энэ дугаарын хоригийг авахад асуудал гарсан</string>
+</resources>
diff --git a/java/com/android/dialer/blockreportspam/res/values-mr/strings.xml b/java/com/android/dialer/blockreportspam/res/values-mr/strings.xml
new file mode 100644
index 0000000..d596cc4
--- /dev/null
+++ b/java/com/android/dialer/blockreportspam/res/values-mr/strings.xml
@@ -0,0 +1,17 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="block_number_confirmation_title">%1$s ब्‍लॉक करायचा?</string>
+  <string name="block_number_confirmation_message_new_filtering">आपल्याला या नंबर वरून कॉल किंवा मजकूर प्राप्त होणार नाहीत.</string>
+  <string name="block_number_ok">अवरोधित करा</string>
+  <string name="unblock_number_ok">अनावरोधित करा</string>
+  <string name="block_report_number_alert_title">%1$s ब्‍लॉक करायचा?</string>
+  <string name="block_report_number_alert_details">तुम्‍ही या नंबरवरून कॉल घेऊ शकणार नाही.</string>
+  <string name="block_number_alert_details">%1$s या कॉलची स्पॅम म्हणून तक्रार नोंदवली जाईल.</string>
+  <string name="unblock_number_alert_details">हा नंबर अनब्‍लॉक केला जाईल आणि त्याचा स्पॅम नाही म्हणून अहवाल दिला जाईल. भविष्यातील कॉल स्पॅम म्हणून ओळखले जाणार नाहीत.</string>
+  <string name="unblock_report_number_alert_title">%1$s अनब्‍लॉक करायचा?</string>
+  <string name="report_not_spam_alert_button">नोंदवा</string>
+  <string name="report_not_spam_alert_title">चूक झाल्याची तक्रार करायची?</string>
+  <string name="report_not_spam_alert_details">%1$s वरील भविष्यातील कॉल यापुढे स्पॅम म्हणून ओळखले जाणार नाहीत.</string>
+  <string name="checkbox_report_as_spam_action">कॉलची स्पॅम म्हणून तक्रार करा</string>
+  <string name="block_number_failed_toast">हा नंबर ब्‍लॉक करण्‍यात समस्‍या</string>
+  <string name="unblock_number_failed_toast">हा नंबर अनब्‍लॉक करण्‍यात समस्‍या</string>
+</resources>
diff --git a/java/com/android/dialer/blockreportspam/res/values-ms/strings.xml b/java/com/android/dialer/blockreportspam/res/values-ms/strings.xml
new file mode 100644
index 0000000..e7bd0d4
--- /dev/null
+++ b/java/com/android/dialer/blockreportspam/res/values-ms/strings.xml
@@ -0,0 +1,17 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="block_number_confirmation_title">Sekat %1$s?</string>
+  <string name="block_number_confirmation_message_new_filtering">Anda tidak akan menerima panggilan atau teks daripada nombor ini lagi.</string>
+  <string name="block_number_ok">SEKAT</string>
+  <string name="unblock_number_ok">NYAHSEKAT</string>
+  <string name="block_report_number_alert_title">Sekat %1$s?</string>
+  <string name="block_report_number_alert_details">Anda tidak akan menerima panggilan daripada nombor ini lagi.</string>
+  <string name="block_number_alert_details">%1$s Panggilan ini akan dilaporkan sebagai spam.</string>
+  <string name="unblock_number_alert_details">Nombor akn dinyahsekat &amp; dilaporkan bkn spam. Panggilan akan datang tdk akn dikenal pasti sbg spam.</string>
+  <string name="unblock_report_number_alert_title">Nyahsekat %1$s?</string>
+  <string name="report_not_spam_alert_button">Lapor</string>
+  <string name="report_not_spam_alert_title">Laporkan kesilapan?</string>
+  <string name="report_not_spam_alert_details">Panggilan masa hadapan daripada %1$s tidak akan dikenal pasti sebagai spam lagi.</string>
+  <string name="checkbox_report_as_spam_action">Laporkan panggilan sbg spam</string>
+  <string name="block_number_failed_toast">Terdapat masalah semasa menyekat nombor ini</string>
+  <string name="unblock_number_failed_toast">Terdapat masalah semasa menyahsekat nombor ini</string>
+</resources>
diff --git a/java/com/android/dialer/blockreportspam/res/values-my/strings.xml b/java/com/android/dialer/blockreportspam/res/values-my/strings.xml
new file mode 100644
index 0000000..b743a2c
--- /dev/null
+++ b/java/com/android/dialer/blockreportspam/res/values-my/strings.xml
@@ -0,0 +1,17 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="block_number_confirmation_title">%1$s ကို ပိတ်မလား။</string>
+  <string name="block_number_confirmation_message_new_filtering">ဤနံပါတ်ထံမှ ဖုန်းခေါ်ဆိုမှုများနှင့် စာများကို သင် ထပ်မံရရှိတော့မည် မဟုတ်ပါ။</string>
+  <string name="block_number_ok">ပိတ်ဆို့ပါ</string>
+  <string name="unblock_number_ok">ပိတ်ဆို့ခြင်းမှ ဖယ်ရှားပါ</string>
+  <string name="block_report_number_alert_title">%1$sကို ပိတ်မလား။</string>
+  <string name="block_report_number_alert_details">ဤနံပါတ်ထံမှ ဖုန်းခေါ်ဆိုမှုများကို သင်လက်ခံရရှိတော့မည် မဟုတ်ပါ။</string>
+  <string name="block_number_alert_details">%1$s ဤခေါ်ဆိုမှုကို စပမ်းဖြစ်ကြောင်း သတင်းပို့ပါမည်။</string>
+  <string name="unblock_number_alert_details">ဤနံပါတ်ကို ပြန်ဖွင့်၍ စပမ်းမဟုတ်ကြောင်း သတင်းပို့မည်။ နောင်ခေါ်ဆိုမှုများကို စပမ်းအဖြစ် မသတ်မှတ်ပါ။</string>
+  <string name="unblock_report_number_alert_title">%1$s ကို ပြန်ဖွင့်မလား။</string>
+  <string name="report_not_spam_alert_button">သတင်းပို့ရန်</string>
+  <string name="report_not_spam_alert_title">မှားယွင်းမှုကို သတင်းပို့မလား။</string>
+  <string name="report_not_spam_alert_details">%1$s ထံမှ နောင်ဝင်လာမည့် ဖုန်းခေါ်ဆိုမှုများကို စပမ်းအဖြစ် သတ်မှတ်တော့မည် မဟုတ်ပါ။</string>
+  <string name="checkbox_report_as_spam_action">စပမ်းခေါ်ဆိုမှုဟု သတင်းပို့ရန်</string>
+  <string name="block_number_failed_toast">ဤနံပါတ်ကို ပိတ်ရာတွင် လွဲချော်မှုရှိပါသည်</string>
+  <string name="unblock_number_failed_toast">ဤနံပါတ်ကို ပြန်ဖွင့်ရာတွင် လွဲချော်မှုရှိပါသည်</string>
+</resources>
diff --git a/java/com/android/dialer/blockreportspam/res/values-nb/strings.xml b/java/com/android/dialer/blockreportspam/res/values-nb/strings.xml
new file mode 100644
index 0000000..efc1600
--- /dev/null
+++ b/java/com/android/dialer/blockreportspam/res/values-nb/strings.xml
@@ -0,0 +1,17 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="block_number_confirmation_title">Vil du blokkere %1$s?</string>
+  <string name="block_number_confirmation_message_new_filtering">Du kommer ikke lenger til å motta anrop eller SMS-er fra dette nummeret.</string>
+  <string name="block_number_ok">BLOKKÉR</string>
+  <string name="unblock_number_ok">OPPHEV BLOKKERINGEN</string>
+  <string name="block_report_number_alert_title">Vil du blokkere %1$s?</string>
+  <string name="block_report_number_alert_details">Du får ingen flere anrop eller meldinger fra dette telefonnummeret.</string>
+  <string name="block_number_alert_details">%1$s Dette anropet blir rapportert som useriøst.</string>
+  <string name="unblock_number_alert_details">Blokkeringen oppheves, og nummeret rapporteres som «ikke useriøst». Fremtidige anrop blir ikke identifisert som useriøse.</string>
+  <string name="unblock_report_number_alert_title">Vil du oppheve blokkeringen av %1$s?</string>
+  <string name="report_not_spam_alert_button">Rapport</string>
+  <string name="report_not_spam_alert_title">Vil du rapportere en feil?</string>
+  <string name="report_not_spam_alert_details">Fremtidige anrop fra %1$s blir ikke definert som useriøse.</string>
+  <string name="checkbox_report_as_spam_action">Rapportér anropet som useriøst</string>
+  <string name="block_number_failed_toast">Kunne ikke blokkere dette nummeret</string>
+  <string name="unblock_number_failed_toast">Kunne ikke oppheve blokkeringen av dette nummeret</string>
+</resources>
diff --git a/java/com/android/dialer/blockreportspam/res/values-ne/strings.xml b/java/com/android/dialer/blockreportspam/res/values-ne/strings.xml
new file mode 100644
index 0000000..dca535b
--- /dev/null
+++ b/java/com/android/dialer/blockreportspam/res/values-ne/strings.xml
@@ -0,0 +1,17 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="block_number_confirmation_title">%1$s माथि रोक लगाउने हो?</string>
+  <string name="block_number_confirmation_message_new_filtering">तपाईँले अब उप्रान्त यस नम्बरबाट कल वा पाठ सन्देशहरू प्राप्त गर्नुहुने छैन।</string>
+  <string name="block_number_ok">रोक्नुहोस्</string>
+  <string name="unblock_number_ok">रोक हटाउनुहोस्</string>
+  <string name="block_report_number_alert_title">%1$s माथि रोक लगाउने हो?</string>
+  <string name="block_report_number_alert_details">तपाईं अब उप्रान्त यस नम्बरबाट कलहरू प्राप्त गर्नु हुने छैन।</string>
+  <string name="block_number_alert_details">%1$s यस कललाई स्प्याम भनी रिपोर्ट गरिने छ।</string>
+  <string name="unblock_number_alert_details">यो नम्बरमाथिको रोक हटाइने छ र यसलाई स्प्याम होइन भनी रिपोर्ट गरिने छ। आगामी कलहरूलाई स्प्याम भनी पहिचान गरिने छैन।</string>
+  <string name="unblock_report_number_alert_title">%1$s माथिको रोक हटाउने हो?</string>
+  <string name="report_not_spam_alert_button">रिपोर्ट गर्नुहोस्</string>
+  <string name="report_not_spam_alert_title">गल्तीबारे रिपोर्ट गर्ने हो?</string>
+  <string name="report_not_spam_alert_details">%1$s का आगामी कलहरूलाई अब उप्रान्त स्प्याम भनी पहिचान गरिने छैन।</string>
+  <string name="checkbox_report_as_spam_action">कललाई स्प्याम भनी रिपोर्ट गर्नु…</string>
+  <string name="block_number_failed_toast">यो नम्बरमाथि रोक लगाउने क्रममा समस्या भयो</string>
+  <string name="unblock_number_failed_toast">यो नम्बरमाथिको रोक हटाउने क्रममा समस्या भयो</string>
+</resources>
diff --git a/java/com/android/dialer/blockreportspam/res/values-nl/strings.xml b/java/com/android/dialer/blockreportspam/res/values-nl/strings.xml
new file mode 100644
index 0000000..2047563
--- /dev/null
+++ b/java/com/android/dialer/blockreportspam/res/values-nl/strings.xml
@@ -0,0 +1,17 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="block_number_confirmation_title">%1$s blokkeren?</string>
+  <string name="block_number_confirmation_message_new_filtering">Je ontvangt geen oproepen of sms\'jes meer van dit nummer.</string>
+  <string name="block_number_ok">BLOKKEREN</string>
+  <string name="unblock_number_ok">BLOKKERING OPHEFFEN</string>
+  <string name="block_report_number_alert_title">%1$s blokkeren?</string>
+  <string name="block_report_number_alert_details">Je ontvangt geen oproepen meer van dit nummer.</string>
+  <string name="block_number_alert_details">%1$s Deze oproep wordt gemeld als spam.</string>
+  <string name="unblock_number_alert_details">Nummerblokkering opgeheven, gemeld als geen spam. Nieuwe oproepen worden niet aangemerkt als spam.</string>
+  <string name="unblock_report_number_alert_title">Blokkering van %1$s opheffen?</string>
+  <string name="report_not_spam_alert_button">Melden</string>
+  <string name="report_not_spam_alert_title">Een fout melden?</string>
+  <string name="report_not_spam_alert_details">Nieuwe oproepen van %1$s worden niet meer aangemerkt als spam.</string>
+  <string name="checkbox_report_as_spam_action">Oproep melden als spam</string>
+  <string name="block_number_failed_toast">Er is een probleem opgetreden bij het blokkeren van dit nummer</string>
+  <string name="unblock_number_failed_toast">Er is een probleem opgetreden bij het opheffen van de blokkering voor dit nummer</string>
+</resources>
diff --git a/java/com/android/dialer/blockreportspam/res/values-no/strings.xml b/java/com/android/dialer/blockreportspam/res/values-no/strings.xml
new file mode 100644
index 0000000..efc1600
--- /dev/null
+++ b/java/com/android/dialer/blockreportspam/res/values-no/strings.xml
@@ -0,0 +1,17 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="block_number_confirmation_title">Vil du blokkere %1$s?</string>
+  <string name="block_number_confirmation_message_new_filtering">Du kommer ikke lenger til å motta anrop eller SMS-er fra dette nummeret.</string>
+  <string name="block_number_ok">BLOKKÉR</string>
+  <string name="unblock_number_ok">OPPHEV BLOKKERINGEN</string>
+  <string name="block_report_number_alert_title">Vil du blokkere %1$s?</string>
+  <string name="block_report_number_alert_details">Du får ingen flere anrop eller meldinger fra dette telefonnummeret.</string>
+  <string name="block_number_alert_details">%1$s Dette anropet blir rapportert som useriøst.</string>
+  <string name="unblock_number_alert_details">Blokkeringen oppheves, og nummeret rapporteres som «ikke useriøst». Fremtidige anrop blir ikke identifisert som useriøse.</string>
+  <string name="unblock_report_number_alert_title">Vil du oppheve blokkeringen av %1$s?</string>
+  <string name="report_not_spam_alert_button">Rapport</string>
+  <string name="report_not_spam_alert_title">Vil du rapportere en feil?</string>
+  <string name="report_not_spam_alert_details">Fremtidige anrop fra %1$s blir ikke definert som useriøse.</string>
+  <string name="checkbox_report_as_spam_action">Rapportér anropet som useriøst</string>
+  <string name="block_number_failed_toast">Kunne ikke blokkere dette nummeret</string>
+  <string name="unblock_number_failed_toast">Kunne ikke oppheve blokkeringen av dette nummeret</string>
+</resources>
diff --git a/java/com/android/dialer/blockreportspam/res/values-pa/strings.xml b/java/com/android/dialer/blockreportspam/res/values-pa/strings.xml
new file mode 100644
index 0000000..784941c
--- /dev/null
+++ b/java/com/android/dialer/blockreportspam/res/values-pa/strings.xml
@@ -0,0 +1,17 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="block_number_confirmation_title">ਕੀ %1$s ਨੂੰ ਬਲਾਕ ਕਰਨਾ ਹੈ?</string>
+  <string name="block_number_confirmation_message_new_filtering">ਤੁਹਾਨੂੰ ਹੁਣ ਇਸ ਨੰਬਰ ਤੋਂ ਕਾਲਾਂ ਜਾਂ ਲਿਖਤ ਸੁਨੇਹੇ ਪ੍ਰਾਪਤ ਨਹੀਂ ਹੋਣਗੇ।</string>
+  <string name="block_number_ok">ਬਲੌਕ ਕਰੋ</string>
+  <string name="unblock_number_ok">ਅਨਬਲੌਕ ਕਰੋ</string>
+  <string name="block_report_number_alert_title">ਕੀ %1$s ਬਲਾਕ ਕਰਨਾ ਹੈ?</string>
+  <string name="block_report_number_alert_details">ਹੁਣ ਤੁਹਾਨੂੰ ਇਸ ਨੰਬਰ ਤੋਂ ਕਾਲਾਂ ਪ੍ਰਾਪਤ ਨਹੀਂ ਹੋਣਗੀਆਂ।</string>
+  <string name="block_number_alert_details">%1$s ਇਸ ਕਾਲ ਨੂੰ ਸਪੈਮ ਵਜੋਂ ਰਿਪੋਰਟ ਕੀਤਾ ਜਾਵੇਗਾ।</string>
+  <string name="unblock_number_alert_details">ਇਹ ਨੰਬਰ ਅਣਬਲਾਕ ਕਰਕੇ \'ਸਪੈਮ ਨਹੀਂ\' ਵਜੋਂ ਰਿਪੋਰਟ ਕੀਤਾ ਜਾਵੇਗਾ। ਭਵਿੱਖੀ ਕਾਲਾਂ ਨੂੰ \'ਸਪੈਮ ਨਹੀਂ\' ਸਮਝਿਆ ਜਾਵੇਗਾ।</string>
+  <string name="unblock_report_number_alert_title">ਕੀ %1$s ਅਣਬਲਾਕ ਕਰਨਾ ਹੈ?</string>
+  <string name="report_not_spam_alert_button">ਰਿਪੋਰਟ ਕਰੋ</string>
+  <string name="report_not_spam_alert_title">ਕੀ ਕਿਸੇ ਗਲਤੀ ਦੀ ਰਿਪੋਰਟ ਕਰਨੀ ਹੈ?</string>
+  <string name="report_not_spam_alert_details">%1$s ਤੋਂ ਭਵਿੱਖੀ ਕਾਲਾਂ ਨੂੰ ਹੁਣ \'ਸਪੈਮ ਨਹੀਂ\' ਸਮਝਿਆ ਜਾਵੇਗਾ।</string>
+  <string name="checkbox_report_as_spam_action">ਕਾਲ ਨੂੰ ਸਪੈਮ ਵਜੋਂ ਰਿਪੋਰਟ ਕਰੋ</string>
+  <string name="block_number_failed_toast">ਇਹ ਨੰਬਰ ਬਲਾਕ ਕਰਨ ਵਿੱਚ ਸਮੱਸਿਆ ਆਈ</string>
+  <string name="unblock_number_failed_toast">ਇਹ ਨੰਬਰ ਅਣਬਲਾਕ ਕਰਨ ਵਿੱਚ ਸਮੱਸਿਆ ਆਈ</string>
+</resources>
diff --git a/java/com/android/dialer/blockreportspam/res/values-pl/strings.xml b/java/com/android/dialer/blockreportspam/res/values-pl/strings.xml
new file mode 100644
index 0000000..2241026
--- /dev/null
+++ b/java/com/android/dialer/blockreportspam/res/values-pl/strings.xml
@@ -0,0 +1,17 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="block_number_confirmation_title">Zablokować numer %1$s?</string>
+  <string name="block_number_confirmation_message_new_filtering">Nie będziesz otrzymywać połączeń ani SMS-ów z tego numeru.</string>
+  <string name="block_number_ok">ZABLOKUJ</string>
+  <string name="unblock_number_ok">ODBLOKUJ</string>
+  <string name="block_report_number_alert_title">Zablokować numer %1$s?</string>
+  <string name="block_report_number_alert_details">Nie będziesz już otrzymywać połączeń z tego numeru.</string>
+  <string name="block_number_alert_details">%1$s To połączenie zostanie zgłoszone jako spam.</string>
+  <string name="unblock_number_alert_details">Ten numer zostanie odblokowany i usunięty z listy nadawców spamu. Połączenia nie będą już blokowane.</string>
+  <string name="unblock_report_number_alert_title">Odblokować numer %1$s?</string>
+  <string name="report_not_spam_alert_button">Zgłoś</string>
+  <string name="report_not_spam_alert_title">Zgłosić pomyłkę?</string>
+  <string name="report_not_spam_alert_details">Połączenia z numeru %1$s nie będą już identyfikowane jako spam.</string>
+  <string name="checkbox_report_as_spam_action">Zgłoś połączenie jako spam</string>
+  <string name="block_number_failed_toast">Nie udało się zablokować tego numeru</string>
+  <string name="unblock_number_failed_toast">Nie udało się odblokować tego numeru</string>
+</resources>
diff --git a/java/com/android/dialer/blockreportspam/res/values-pt-rBR/strings.xml b/java/com/android/dialer/blockreportspam/res/values-pt-rBR/strings.xml
new file mode 100644
index 0000000..f7dbb7d
--- /dev/null
+++ b/java/com/android/dialer/blockreportspam/res/values-pt-rBR/strings.xml
@@ -0,0 +1,17 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="block_number_confirmation_title">Bloquear %1$s?</string>
+  <string name="block_number_confirmation_message_new_filtering">Você não receberá mais chamadas ou mensagens de texto deste número.</string>
+  <string name="block_number_ok">BLOQUEAR</string>
+  <string name="unblock_number_ok">DESBLOQUEAR</string>
+  <string name="block_report_number_alert_title">Bloquear %1$s?</string>
+  <string name="block_report_number_alert_details">Você não receberá mais chamadas deste número.</string>
+  <string name="block_number_alert_details">%1$s Esta chamada será denunciada como spam.</string>
+  <string name="unblock_number_alert_details">O número será desbloqueado/marcado como não spam. As chamadas futuras não serão tratadas como spam.</string>
+  <string name="unblock_report_number_alert_title">Desbloquear %1$s?</string>
+  <string name="report_not_spam_alert_button">Denunciar</string>
+  <string name="report_not_spam_alert_title">Quer informar um erro?</string>
+  <string name="report_not_spam_alert_details">As chamadas futuras do número %1$s não serão mais identificadas como spam.</string>
+  <string name="checkbox_report_as_spam_action">Denunciar chamada como spam</string>
+  <string name="block_number_failed_toast">Ocorreu um problema ao bloquear este número</string>
+  <string name="unblock_number_failed_toast">Ocorreu um problema ao desbloquear este número</string>
+</resources>
diff --git a/java/com/android/dialer/blockreportspam/res/values-pt-rPT/strings.xml b/java/com/android/dialer/blockreportspam/res/values-pt-rPT/strings.xml
new file mode 100644
index 0000000..adb73c1
--- /dev/null
+++ b/java/com/android/dialer/blockreportspam/res/values-pt-rPT/strings.xml
@@ -0,0 +1,17 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="block_number_confirmation_title">Pretende bloquear %1$s?</string>
+  <string name="block_number_confirmation_message_new_filtering">Deixará de receber chamadas ou mensagens de texto deste número.</string>
+  <string name="block_number_ok">BLOQUEAR</string>
+  <string name="unblock_number_ok">DESBLOQUEAR</string>
+  <string name="block_report_number_alert_title">Pretende bloquear %1$s?</string>
+  <string name="block_report_number_alert_details">Irá deixar de receber chamadas deste número.</string>
+  <string name="block_number_alert_details">%1$s Esta chamada será registada como spam.</string>
+  <string name="unblock_number_alert_details">Este núm. será desbloq. e não será considerado spam. As chamadas não serão identificadas como spam.</string>
+  <string name="unblock_report_number_alert_title">Pretende desbloquear %1$s?</string>
+  <string name="report_not_spam_alert_button">Comunicar</string>
+  <string name="report_not_spam_alert_title">Pretende comunicar um erro?</string>
+  <string name="report_not_spam_alert_details">As chamadas de %1$s não serão identificadas como spam.</string>
+  <string name="checkbox_report_as_spam_action">Denunciar a chamada como spam</string>
+  <string name="block_number_failed_toast">Problema ao bloquear este número</string>
+  <string name="unblock_number_failed_toast">Problema ao desbloquear este número</string>
+</resources>
diff --git a/java/com/android/dialer/blockreportspam/res/values-pt/strings.xml b/java/com/android/dialer/blockreportspam/res/values-pt/strings.xml
new file mode 100644
index 0000000..f7dbb7d
--- /dev/null
+++ b/java/com/android/dialer/blockreportspam/res/values-pt/strings.xml
@@ -0,0 +1,17 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="block_number_confirmation_title">Bloquear %1$s?</string>
+  <string name="block_number_confirmation_message_new_filtering">Você não receberá mais chamadas ou mensagens de texto deste número.</string>
+  <string name="block_number_ok">BLOQUEAR</string>
+  <string name="unblock_number_ok">DESBLOQUEAR</string>
+  <string name="block_report_number_alert_title">Bloquear %1$s?</string>
+  <string name="block_report_number_alert_details">Você não receberá mais chamadas deste número.</string>
+  <string name="block_number_alert_details">%1$s Esta chamada será denunciada como spam.</string>
+  <string name="unblock_number_alert_details">O número será desbloqueado/marcado como não spam. As chamadas futuras não serão tratadas como spam.</string>
+  <string name="unblock_report_number_alert_title">Desbloquear %1$s?</string>
+  <string name="report_not_spam_alert_button">Denunciar</string>
+  <string name="report_not_spam_alert_title">Quer informar um erro?</string>
+  <string name="report_not_spam_alert_details">As chamadas futuras do número %1$s não serão mais identificadas como spam.</string>
+  <string name="checkbox_report_as_spam_action">Denunciar chamada como spam</string>
+  <string name="block_number_failed_toast">Ocorreu um problema ao bloquear este número</string>
+  <string name="unblock_number_failed_toast">Ocorreu um problema ao desbloquear este número</string>
+</resources>
diff --git a/java/com/android/dialer/blockreportspam/res/values-ro/strings.xml b/java/com/android/dialer/blockreportspam/res/values-ro/strings.xml
new file mode 100644
index 0000000..8557252
--- /dev/null
+++ b/java/com/android/dialer/blockreportspam/res/values-ro/strings.xml
@@ -0,0 +1,17 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="block_number_confirmation_title">Blocați %1$s?</string>
+  <string name="block_number_confirmation_message_new_filtering">Nu veți mai primi apeluri sau mesaje text de la acest număr.</string>
+  <string name="block_number_ok">BLOCAȚI</string>
+  <string name="unblock_number_ok">DEBLOCAȚI</string>
+  <string name="block_report_number_alert_title">Blocați %1$s?</string>
+  <string name="block_report_number_alert_details">Nu veți mai primi apeluri de la acest număr.</string>
+  <string name="block_number_alert_details">%1$s Acest apel va fi raportat ca spam.</string>
+  <string name="unblock_number_alert_details">Acest număr va fi deblocat și raportat ca nefiind spam. Apelurile viitoare nu sunt considerate spam.</string>
+  <string name="unblock_report_number_alert_title">Deblocați %1$s?</string>
+  <string name="report_not_spam_alert_button">Raportați</string>
+  <string name="report_not_spam_alert_title">Raportați o greșeală?</string>
+  <string name="report_not_spam_alert_details">Apelurile viitoare de la %1$s nu vor mai fi identificate ca spam.</string>
+  <string name="checkbox_report_as_spam_action">Raportați apelul ca spam</string>
+  <string name="block_number_failed_toast">Eroare la blocarea numărului</string>
+  <string name="unblock_number_failed_toast">Eroare la deblocarea numărului</string>
+</resources>
diff --git a/java/com/android/dialer/blockreportspam/res/values-ru/strings.xml b/java/com/android/dialer/blockreportspam/res/values-ru/strings.xml
new file mode 100644
index 0000000..ae4875c
--- /dev/null
+++ b/java/com/android/dialer/blockreportspam/res/values-ru/strings.xml
@@ -0,0 +1,17 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="block_number_confirmation_title">Заблокировать номер %1$s?</string>
+  <string name="block_number_confirmation_message_new_filtering">Вызовы и сообщения с этого номера будут блокироваться.</string>
+  <string name="block_number_ok">БЛОКИРОВАТЬ</string>
+  <string name="unblock_number_ok">РАЗБЛОКИРОВАТЬ</string>
+  <string name="block_report_number_alert_title">Заблокировать номер %1$s?</string>
+  <string name="block_report_number_alert_details">Вы больше не будете получать вызовы с этого номера.</string>
+  <string name="block_number_alert_details">%1$s Вы сообщите об этом вызове как о спаме.</string>
+  <string name="unblock_number_alert_details">Этот номер будет разблокирован. Вы сообщите, что это не спам. Вызовы не будут считаться спамом.</string>
+  <string name="unblock_report_number_alert_title">Разблокировать номер %1$s?</string>
+  <string name="report_not_spam_alert_button">Сообщить</string>
+  <string name="report_not_spam_alert_title">Сообщить об ошибке?</string>
+  <string name="report_not_spam_alert_details">Вызовы с номера %1$s больше не будут считаться спамом.</string>
+  <string name="checkbox_report_as_spam_action">Сообщить о вызове как о спаме</string>
+  <string name="block_number_failed_toast">Не удалось заблокировать этот номер</string>
+  <string name="unblock_number_failed_toast">Не удалось разблокировать этот номер</string>
+</resources>
diff --git a/java/com/android/dialer/blockreportspam/res/values-si/strings.xml b/java/com/android/dialer/blockreportspam/res/values-si/strings.xml
new file mode 100644
index 0000000..16ecdc0
--- /dev/null
+++ b/java/com/android/dialer/blockreportspam/res/values-si/strings.xml
@@ -0,0 +1,17 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="block_number_confirmation_title">%1$s අවහිර කරන්නද?</string>
+  <string name="block_number_confirmation_message_new_filtering">ඔබට මෙම අංකයෙන් තවදුරටත් ඇමතුම් හෝ පෙළ පණිවිඩ නොලැබෙනු ඇත.</string>
+  <string name="block_number_ok">අවහිරයි</string>
+  <string name="unblock_number_ok">අවහිර නොකරන්න</string>
+  <string name="block_report_number_alert_title">%1$s අවහිර කරන්නද?</string>
+  <string name="block_report_number_alert_details">ඔබට මෙම අංකයෙන් තවදුරටත් ඇමතුම් නොලැබෙනු ඇත.</string>
+  <string name="block_number_alert_details">%1$s මෙම ඇමතුම අයාචිත තැපෑලක් ලෙස වාර්තා කරනු ඇත.</string>
+  <string name="unblock_number_alert_details">මෙම අංකය අවහිර කිරීම ඉවත් කර අයාචිත නොවන ලෙස වාර්තා කරනු ඇත. අනාගත ඇමතුම් අයාචිත ලෙස හඳුනා නොගනු ඇත.</string>
+  <string name="unblock_report_number_alert_title">%1$s අවහිර කිරීමෙන් ඉවත් කරන්නද?</string>
+  <string name="report_not_spam_alert_button">වාර්තා කරන්න</string>
+  <string name="report_not_spam_alert_title">අත්වැරැද්දක් වාර්තා කරන්නද?</string>
+  <string name="report_not_spam_alert_details">%1$s වෙතින් එන අනාගත ඇමතුම් තවදුරටත් අයාචිත ලෙස හඳුනා නොගනු ඇත.</string>
+  <string name="checkbox_report_as_spam_action">ඇමතුම අයාචිත ලෙස වාර්තා කරන්න</string>
+  <string name="block_number_failed_toast">මෙම අංක අවහිර කිරීමේ ගැටලුවකි</string>
+  <string name="unblock_number_failed_toast">මෙම අංකය අගුලු හැරීමේ ගැටලුවකි</string>
+</resources>
diff --git a/java/com/android/dialer/blockreportspam/res/values-sk/strings.xml b/java/com/android/dialer/blockreportspam/res/values-sk/strings.xml
new file mode 100644
index 0000000..51c0826
--- /dev/null
+++ b/java/com/android/dialer/blockreportspam/res/values-sk/strings.xml
@@ -0,0 +1,17 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="block_number_confirmation_title">Chcete blokovať číslo %1$s?</string>
+  <string name="block_number_confirmation_message_new_filtering">Z tohto čísla už nebudete prijímať hovory ani textové správy.</string>
+  <string name="block_number_ok">BLOKOVAŤ</string>
+  <string name="unblock_number_ok">ODBLOKOVAŤ</string>
+  <string name="block_report_number_alert_title">Chcete blokovať číslo %1$s?</string>
+  <string name="block_report_number_alert_details">Z tohto čísla už nebudete dostávať hovory.</string>
+  <string name="block_number_alert_details">%1$s Tento hovor bude nahlásený ako spam.</string>
+  <string name="unblock_number_alert_details">Číslo bude odblokované a nahlásené, že nie je spam. Budúce hovory nebudú identifikované ako spam.</string>
+  <string name="unblock_report_number_alert_title">Chcete odblokovať číslo %1$s?</string>
+  <string name="report_not_spam_alert_button">Nahlásiť</string>
+  <string name="report_not_spam_alert_title">Chcete nahlásiť chybu?</string>
+  <string name="report_not_spam_alert_details">Budúce hovory z čísla %1$s už nebudú identifikované ako spam.</string>
+  <string name="checkbox_report_as_spam_action">Nahlásiť hovor ako spam</string>
+  <string name="block_number_failed_toast">Pri blokovaní tohto čísla sa vyskytla chyba</string>
+  <string name="unblock_number_failed_toast">Pri odblokovaní tohto čísla sa vyskytla chyba</string>
+</resources>
diff --git a/java/com/android/dialer/blockreportspam/res/values-sl/strings.xml b/java/com/android/dialer/blockreportspam/res/values-sl/strings.xml
new file mode 100644
index 0000000..5dc065d
--- /dev/null
+++ b/java/com/android/dialer/blockreportspam/res/values-sl/strings.xml
@@ -0,0 +1,17 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="block_number_confirmation_title">Želite blokirati številko %1$s?</string>
+  <string name="block_number_confirmation_message_new_filtering">S te številke ne boste več prejemali klicev ali sporočil SMS.</string>
+  <string name="block_number_ok">BLOKIRAJ</string>
+  <string name="unblock_number_ok">ODBLOKIRAJ</string>
+  <string name="block_report_number_alert_title">Želite blokirati številko %1$s?</string>
+  <string name="block_report_number_alert_details">Ne boste več prejemali klicev s te številke.</string>
+  <string name="block_number_alert_details">%1$s Ta klic bo prijavljen kot neželen.</string>
+  <string name="unblock_number_alert_details">Številka bo odblokirana in ne bo obravnavana kot neželena. Klici ne bodo več zaznani kot neželeni.</string>
+  <string name="unblock_report_number_alert_title">Želite odblokirati številko %1$s?</string>
+  <string name="report_not_spam_alert_button">Prijavi</string>
+  <string name="report_not_spam_alert_title">Želite prijaviti napako?</string>
+  <string name="report_not_spam_alert_details">Prihodnji klici s številke %1$s ne bodo več prepoznani kot neželeni.</string>
+  <string name="checkbox_report_as_spam_action">Prijavi kot neželeni klic</string>
+  <string name="block_number_failed_toast">Težava pri blokiranju te številke</string>
+  <string name="unblock_number_failed_toast">Težava pri odblokiranju te številke</string>
+</resources>
diff --git a/java/com/android/dialer/blockreportspam/res/values-sq/strings.xml b/java/com/android/dialer/blockreportspam/res/values-sq/strings.xml
new file mode 100644
index 0000000..2611a32
--- /dev/null
+++ b/java/com/android/dialer/blockreportspam/res/values-sq/strings.xml
@@ -0,0 +1,17 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="block_number_confirmation_title">Të bllokohet %1$s?</string>
+  <string name="block_number_confirmation_message_new_filtering">Nuk do të marrësh më telefonata apo mesazhe me tekst nga ky numër.</string>
+  <string name="block_number_ok">BLLOKO</string>
+  <string name="unblock_number_ok">ZHBLLOKO</string>
+  <string name="block_report_number_alert_title">Të bllokohet %1$s?</string>
+  <string name="block_report_number_alert_details">Nuk do të marrësh më telefonata nga ky numër.</string>
+  <string name="block_number_alert_details">%1$s Kjo telefonatë do të raportohet si e padëshiruar.</string>
+  <string name="unblock_number_alert_details">Ky numër do të zhbllokohet dhe nuk do të raportohet si i padëshiruar. Telefonatat në të ardhmen nuk do të identifikohen si të padëshiruara.</string>
+  <string name="unblock_report_number_alert_title">Të zhbllokohet %1$s?</string>
+  <string name="report_not_spam_alert_button">Raporto</string>
+  <string name="report_not_spam_alert_title">Do të raportosh një gabim?</string>
+  <string name="report_not_spam_alert_details">Telefonatat në të ardhmen nga %1$s nuk do të identifikohen si të padëshiruara.</string>
+  <string name="checkbox_report_as_spam_action">Raporto thirrjen si të padëshiruar</string>
+  <string name="block_number_failed_toast">Problem me bllokimin e këtij numri</string>
+  <string name="unblock_number_failed_toast">Problem me zhbllokimin e këtij numri</string>
+</resources>
diff --git a/java/com/android/dialer/blockreportspam/res/values-sr/strings.xml b/java/com/android/dialer/blockreportspam/res/values-sr/strings.xml
new file mode 100644
index 0000000..68d013e
--- /dev/null
+++ b/java/com/android/dialer/blockreportspam/res/values-sr/strings.xml
@@ -0,0 +1,17 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="block_number_confirmation_title">Желите ли да блокирате %1$s?</string>
+  <string name="block_number_confirmation_message_new_filtering">Више нећете примати позиве ни SMS-ове са овог броја.</string>
+  <string name="block_number_ok">БЛОКИРАЈ</string>
+  <string name="unblock_number_ok">ДЕБЛОКИРАЈ</string>
+  <string name="block_report_number_alert_title">Желите ли да блокирате %1$s?</string>
+  <string name="block_report_number_alert_details">Више нећете примати позиве са овог броја.</string>
+  <string name="block_number_alert_details">%1$s Пријавићемо овај позив као непожељан.</string>
+  <string name="unblock_number_alert_details">Деблокираћемо број и пријавити да није непожељан. Будући позиви неће бити означавани као непожељни.</string>
+  <string name="unblock_report_number_alert_title">Желите ли да деблокирате %1$s?</string>
+  <string name="report_not_spam_alert_button">Пријави</string>
+  <string name="report_not_spam_alert_title">Желите да пријавите грешку?</string>
+  <string name="report_not_spam_alert_details">Будући позиви са %1$s више неће бити означавани као непожељни.</string>
+  <string name="checkbox_report_as_spam_action">Пријави позив као непожељан</string>
+  <string name="block_number_failed_toast">Проблем при блокирању овог броја</string>
+  <string name="unblock_number_failed_toast">Проблем при одблокиравању овог броја</string>
+</resources>
diff --git a/java/com/android/dialer/blockreportspam/res/values-sv/strings.xml b/java/com/android/dialer/blockreportspam/res/values-sv/strings.xml
new file mode 100644
index 0000000..da688e2
--- /dev/null
+++ b/java/com/android/dialer/blockreportspam/res/values-sv/strings.xml
@@ -0,0 +1,17 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="block_number_confirmation_title">Vill du blockera %1$s?</string>
+  <string name="block_number_confirmation_message_new_filtering">Du får inte längre samtal eller sms från det här numret.</string>
+  <string name="block_number_ok">BLOCKERA</string>
+  <string name="unblock_number_ok">HÄV BLOCKERINGEN</string>
+  <string name="block_report_number_alert_title">Blockera %1$s?</string>
+  <string name="block_report_number_alert_details">Du får inte längre samtal från det här numret.</string>
+  <string name="block_number_alert_details">%1$s Det här samtalet rapporteras som spam.</string>
+  <string name="unblock_number_alert_details">Numret avblockeras och rapporteras inte som spam. Framtida samtal identifieras inte som spam.</string>
+  <string name="unblock_report_number_alert_title">Avblockera %1$s?</string>
+  <string name="report_not_spam_alert_button">Rapport</string>
+  <string name="report_not_spam_alert_title">Rapportera ett misstag?</string>
+  <string name="report_not_spam_alert_details">Framtida samtal från %1$s identifieras inte längre som spam.</string>
+  <string name="checkbox_report_as_spam_action">Rapportera samtal som spam</string>
+  <string name="block_number_failed_toast">Numret gick inte att blockera</string>
+  <string name="unblock_number_failed_toast">Numret gick inte att återaktivera</string>
+</resources>
diff --git a/java/com/android/dialer/blockreportspam/res/values-sw/strings.xml b/java/com/android/dialer/blockreportspam/res/values-sw/strings.xml
new file mode 100644
index 0000000..c558606
--- /dev/null
+++ b/java/com/android/dialer/blockreportspam/res/values-sw/strings.xml
@@ -0,0 +1,17 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="block_number_confirmation_title">Ungependa kuzuia nambari %1$s?</string>
+  <string name="block_number_confirmation_message_new_filtering">Hutapokea simu wala SMS kutoka kwa nambari hii tena.</string>
+  <string name="block_number_ok">ZUIA</string>
+  <string name="unblock_number_ok">ACHA KUZUIA</string>
+  <string name="block_report_number_alert_title">Ungependa kuzuia nambari %1$s?</string>
+  <string name="block_report_number_alert_details">Hutapokea tena simu kutoka kwenye nambari hii.</string>
+  <string name="block_number_alert_details">%1$s Simu hii itaripotiwa kuwa ni taka.</string>
+  <string name="unblock_number_alert_details">Kizuizi kitaondolewa; nambari itaripotiwa kuwa si taka. Simu hazitajumuishwa miongoni mwa taka tena.</string>
+  <string name="unblock_report_number_alert_title">Ungependa kuacha kuzuia nambari %1$s?</string>
+  <string name="report_not_spam_alert_button">Ripoti</string>
+  <string name="report_not_spam_alert_title">Je, ungependa kuripoti tatizo?</string>
+  <string name="report_not_spam_alert_details">Simu kutoka %1$s hazitajumuishwa miongoni mwa taka tena.</string>
+  <string name="checkbox_report_as_spam_action">Ripoti kuwa hii ni simu taka</string>
+  <string name="block_number_failed_toast">Hitilafu imetokea wakati wa kuzuia nambari hii</string>
+  <string name="unblock_number_failed_toast">Hitilafu imetokea wakati wa kuondolea nambari hii kizuizi</string>
+</resources>
diff --git a/java/com/android/dialer/blockreportspam/res/values-ta/strings.xml b/java/com/android/dialer/blockreportspam/res/values-ta/strings.xml
new file mode 100644
index 0000000..46a31f5
--- /dev/null
+++ b/java/com/android/dialer/blockreportspam/res/values-ta/strings.xml
@@ -0,0 +1,17 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="block_number_confirmation_title">%1$sஐத் தடுக்கவா?</string>
+  <string name="block_number_confirmation_message_new_filtering">இந்த எண்ணிலிருந்து இனி அழைப்புகளையோ உரைச் செய்திகளையோ பெறமாட்டீர்கள்.</string>
+  <string name="block_number_ok">தடு</string>
+  <string name="unblock_number_ok">அனுமதி</string>
+  <string name="block_report_number_alert_title">%1$sஐத் தடுக்கவா?</string>
+  <string name="block_report_number_alert_details">இந்த எண்ணிலிருந்து இனி அழைப்புகளைப் பெறமாட்டீர்கள்.</string>
+  <string name="block_number_alert_details">%1$s இந்த அழைப்பு ஸ்பேம் எனப் புகாரளிக்கப்படும்.</string>
+  <string name="unblock_number_alert_details">இந்த எண் அனுமதிக்கப்பட்டு, ஸ்பேம் இல்லையென தெரிவிக்கப்படும். இனி அழைப்புகள் ஸ்பேமாக குறிக்கப்படாது.</string>
+  <string name="unblock_report_number_alert_title">%1$sஐ அனுமதிக்கவா?</string>
+  <string name="report_not_spam_alert_button">புகாரளி</string>
+  <string name="report_not_spam_alert_title">தவறு எனத் தெரிவிக்கவா?</string>
+  <string name="report_not_spam_alert_details">இனி %1$s இன் அழைப்புகள் ஸ்பேமாகக் குறிக்கப்படாது.</string>
+  <string name="checkbox_report_as_spam_action">அழைப்பை ஸ்பேம் எனப் புகாரளி</string>
+  <string name="block_number_failed_toast">இந்த எண்ணைத் தடுப்பதில் சிக்கல்</string>
+  <string name="unblock_number_failed_toast">இந்த எண்ணை அனுமதிக்கவும்</string>
+</resources>
diff --git a/java/com/android/dialer/blockreportspam/res/values-te/strings.xml b/java/com/android/dialer/blockreportspam/res/values-te/strings.xml
new file mode 100644
index 0000000..4f358d3
--- /dev/null
+++ b/java/com/android/dialer/blockreportspam/res/values-te/strings.xml
@@ -0,0 +1,17 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="block_number_confirmation_title">%1$sని బ్లాక్ చేయాలా?</string>
+  <string name="block_number_confirmation_message_new_filtering">మీరు ఇకపై ఈ నంబర్ నుండి కాల్‌లు లేదా వచన సందేశాలను స్వీకరించరు.</string>
+  <string name="block_number_ok">బ్లాక్ చేయి</string>
+  <string name="unblock_number_ok">అన్‌బ్లాక్ చేయి</string>
+  <string name="block_report_number_alert_title">%1$sని బ్లాక్ చేయాలా?</string>
+  <string name="block_report_number_alert_details">మీరు ఇకపై ఈ నంబర్ నుండి కాల్‌లు స్వీకరించరు.</string>
+  <string name="block_number_alert_details">%1$s ఈ కాల్ స్పామ్ వలె నివేదించబడుతుంది.</string>
+  <string name="unblock_number_alert_details">ఈ నంబర్ అన్‌బ్లాక్ చేయబడుతుంది మరియు ఇది స్పామ్ కాదని నివేదించబడుతుంది. భవిష్యత్తు కాల్‌లు స్పామ్‌గా గుర్తించబడవు.</string>
+  <string name="unblock_report_number_alert_title">%1$sని అన్‌బ్లాక్ చేయాలా?</string>
+  <string name="report_not_spam_alert_button">నివేదించు</string>
+  <string name="report_not_spam_alert_title">పొరపాటును నివేదించాలా?</string>
+  <string name="report_not_spam_alert_details">ఇప్పటి నుండి %1$s నుండి వచ్చే కాల్‌లు స్పామ్‌గా గుర్తించబడవు.</string>
+  <string name="checkbox_report_as_spam_action">కాల్‌ను స్పామ్‌గా నివేదించు</string>
+  <string name="block_number_failed_toast">ఈ నంబర్‌ని బ్లాక్ చేస్తున్నప్పుడు సమస్య ఏర్పడింది</string>
+  <string name="unblock_number_failed_toast">ఈ నంబర్‌ని అన్‌బ్లాక్ చేస్తున్నప్పుడు సమస్య ఏర్పడింది</string>
+</resources>
diff --git a/java/com/android/dialer/blockreportspam/res/values-th/strings.xml b/java/com/android/dialer/blockreportspam/res/values-th/strings.xml
new file mode 100644
index 0000000..c3a2b3d
--- /dev/null
+++ b/java/com/android/dialer/blockreportspam/res/values-th/strings.xml
@@ -0,0 +1,17 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="block_number_confirmation_title">บล็อก %1$s ไหม</string>
+  <string name="block_number_confirmation_message_new_filtering">คุณจะไม่ได้รับสายเรียกเข้าหรือข้อความจากหมายเลขนี้อีก</string>
+  <string name="block_number_ok">บล็อก</string>
+  <string name="unblock_number_ok">เลิกบล็อก</string>
+  <string name="block_report_number_alert_title">บล็อก %1$s ไหม</string>
+  <string name="block_report_number_alert_details">คุณจะไม่ได้รับสายจากหมายเลขนี้อีกต่อไป</string>
+  <string name="block_number_alert_details">%1$s ระบบจะรายงานสายนี้ว่าเป็นสแปม</string>
+  <string name="unblock_number_alert_details">ระบบจะเลิกบล็อกหมายเลขนี้และรายงานว่าไม่ใช่สแปม การโทรเข้ามาหลังจากนี้จะไม่ถูกระบุว่าเป็นสแปม</string>
+  <string name="unblock_report_number_alert_title">เลิกบล็อก %1$s ไหม</string>
+  <string name="report_not_spam_alert_button">รายงาน</string>
+  <string name="report_not_spam_alert_title">รายงานข้อผิดพลาดไหม</string>
+  <string name="report_not_spam_alert_details">สายที่โทรเข้าจาก %1$s จะไม่ถูกระบุว่าเป็นสแปมหลังจากนี้</string>
+  <string name="checkbox_report_as_spam_action">รายงานสายนี้ว่าเป็นสแปม</string>
+  <string name="block_number_failed_toast">เกิดปัญหาในการบล็อกหมายเลขนี้</string>
+  <string name="unblock_number_failed_toast">เกิดปัญหาในการเลิกบล็อกหมายเลขนี้</string>
+</resources>
diff --git a/java/com/android/dialer/blockreportspam/res/values-tl/strings.xml b/java/com/android/dialer/blockreportspam/res/values-tl/strings.xml
new file mode 100644
index 0000000..f1f5dd7
--- /dev/null
+++ b/java/com/android/dialer/blockreportspam/res/values-tl/strings.xml
@@ -0,0 +1,17 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="block_number_confirmation_title">I-block ang %1$s?</string>
+  <string name="block_number_confirmation_message_new_filtering">Hindi ka na makakatanggap ng mga tawag o text mula sa numerong ito.</string>
+  <string name="block_number_ok">I-BLOCK</string>
+  <string name="unblock_number_ok">I-UNBLOCK</string>
+  <string name="block_report_number_alert_title">I-block ang %1$s?</string>
+  <string name="block_report_number_alert_details">Hindi ka na makakatanggap ng mga tawag mula sa numerong ito.</string>
+  <string name="block_number_alert_details">%1$s Iuulat ang tawag na ito bilang spam.</string>
+  <string name="unblock_number_alert_details">Ia-unblock ang numerong ito at iuulat na di spam. Di kikilalaning spam ang darating na tawag.</string>
+  <string name="unblock_report_number_alert_title">I-unblock ang %1$s?</string>
+  <string name="report_not_spam_alert_button">Iulat</string>
+  <string name="report_not_spam_alert_title">Iulat ang isang pagkakamali?</string>
+  <string name="report_not_spam_alert_details">Ang mga tawag sa hinaharap mula sa %1$s ay hindi na kikilalanin bilang spam.</string>
+  <string name="checkbox_report_as_spam_action">Iulat ang tawag bilang spam</string>
+  <string name="block_number_failed_toast">Nagkakaproblema sa pag-block ng numerong ito</string>
+  <string name="unblock_number_failed_toast">Nagkakaproblema sa pag-unblock ng numerong ito</string>
+</resources>
diff --git a/java/com/android/dialer/blockreportspam/res/values-tr/strings.xml b/java/com/android/dialer/blockreportspam/res/values-tr/strings.xml
new file mode 100644
index 0000000..5ac29ec
--- /dev/null
+++ b/java/com/android/dialer/blockreportspam/res/values-tr/strings.xml
@@ -0,0 +1,17 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="block_number_confirmation_title">%1$s engellensin mi?</string>
+  <string name="block_number_confirmation_message_new_filtering">Artık bu numaradan sesli arama veya kısa mesaj almayacaksınız.</string>
+  <string name="block_number_ok">ENGELLE</string>
+  <string name="unblock_number_ok">ENGELLEMEYİ KALDIR</string>
+  <string name="block_report_number_alert_title">%1$s engellensin mi?</string>
+  <string name="block_report_number_alert_details">Artık bu numaradan çağrı almayacaksınız.</string>
+  <string name="block_number_alert_details">%1$s Bu çağrı spam olarak bildirilecek.</string>
+  <string name="unblock_number_alert_details">Numaranın engellemesi ve spam durumu kaldırılacak. Gelecekteki çağrılar spam olarak tanımlanmayacak.</string>
+  <string name="unblock_report_number_alert_title">%1$s numaralı telefonun engellemesi kaldırılsın mı?</string>
+  <string name="report_not_spam_alert_button">Bildir</string>
+  <string name="report_not_spam_alert_title">Yanlışlıkla mı bildirim gönderdiniz?</string>
+  <string name="report_not_spam_alert_details">Artık %1$s numarasından gelecek çağrılar spam olarak tanımlanmayacak.</string>
+  <string name="checkbox_report_as_spam_action">Çağrıyı spam olarak bildir</string>
+  <string name="block_number_failed_toast">Bu numara engellenirken sorun oluştu</string>
+  <string name="unblock_number_failed_toast">Bu numaranın engellemesi kaldırılırken sorun oluştu</string>
+</resources>
diff --git a/java/com/android/dialer/blockreportspam/res/values-uk/strings.xml b/java/com/android/dialer/blockreportspam/res/values-uk/strings.xml
new file mode 100644
index 0000000..76b825e
--- /dev/null
+++ b/java/com/android/dialer/blockreportspam/res/values-uk/strings.xml
@@ -0,0 +1,17 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="block_number_confirmation_title">Заблокувати %1$s?</string>
+  <string name="block_number_confirmation_message_new_filtering">Ви більше не отримуватиме виклики й SMS із цього номера.</string>
+  <string name="block_number_ok">БЛОКУВАТИ</string>
+  <string name="unblock_number_ok">РОЗБЛОКУВАТИ</string>
+  <string name="block_report_number_alert_title">Заблокувати %1$s?</string>
+  <string name="block_report_number_alert_details">Ви більше не отримуватимете виклики з цього номера.</string>
+  <string name="block_number_alert_details">%1$s Цей виклик буде позначено як спам.</string>
+  <string name="unblock_number_alert_details">Цей номер буде розблоковано. Виклики з нього (і він сам) не позначатимуться як спам.</string>
+  <string name="unblock_report_number_alert_title">Розблокувати %1$s?</string>
+  <string name="report_not_spam_alert_button">Повідомити</string>
+  <string name="report_not_spam_alert_title">Повідомити про помилку?</string>
+  <string name="report_not_spam_alert_details">Виклики з номера %1$s більше не позначатимуться як спам.</string>
+  <string name="checkbox_report_as_spam_action">Позначити виклик як спам</string>
+  <string name="block_number_failed_toast">Не вдалося заблокувати цей номер</string>
+  <string name="unblock_number_failed_toast">Не вдалося розблокувати цей номер</string>
+</resources>
diff --git a/java/com/android/dialer/blockreportspam/res/values-ur/strings.xml b/java/com/android/dialer/blockreportspam/res/values-ur/strings.xml
new file mode 100644
index 0000000..d165f37
--- /dev/null
+++ b/java/com/android/dialer/blockreportspam/res/values-ur/strings.xml
@@ -0,0 +1,17 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="block_number_confirmation_title">%1$s مسدود کریں؟</string>
+  <string name="block_number_confirmation_message_new_filtering">آپ کو اب اس نمبر سے مزید کالز یا متنی پیغامات موصول نہیں ہوں گے۔</string>
+  <string name="block_number_ok">مسدود کریں</string>
+  <string name="unblock_number_ok">غیر مسدود کریں</string>
+  <string name="block_report_number_alert_title">%1$s مسدود کریں؟</string>
+  <string name="block_report_number_alert_details">آپ کو اس نمبر سے مزید کالز موصول نہیں ہوں گی۔</string>
+  <string name="block_number_alert_details">%1$s اس کال کی بطور سپام اطلاع دی جائے گی۔</string>
+  <string name="unblock_number_alert_details">یہ نمبر غیر مسدود ہو جائے گا اور اس کی \'سپام نہیں\' کے بطور اطلاع دی جائے گی۔ مستقبل میں کالز کی شناخت بطور سپام نہیں کی جائے گی۔</string>
+  <string name="unblock_report_number_alert_title">%1$s غیر مسدود کریں؟</string>
+  <string name="report_not_spam_alert_button">اطلاع دیں</string>
+  <string name="report_not_spam_alert_title">غلطی کی اطلاع دیں؟</string>
+  <string name="report_not_spam_alert_details">مستقبل میں %1$s سے موصول ہونے والی کالز کی بطور سپام شناخت نہیں ہوگی۔</string>
+  <string name="checkbox_report_as_spam_action">کال کی بطور سپام اطلاع دیں</string>
+  <string name="block_number_failed_toast">اس نمبر کو مسدود کرنے میں مسئلہ</string>
+  <string name="unblock_number_failed_toast">اس نمبر کو غیر مسدود کرنے میں مسئلہ</string>
+</resources>
diff --git a/java/com/android/dialer/blockreportspam/res/values-uz/strings.xml b/java/com/android/dialer/blockreportspam/res/values-uz/strings.xml
new file mode 100644
index 0000000..ea13456
--- /dev/null
+++ b/java/com/android/dialer/blockreportspam/res/values-uz/strings.xml
@@ -0,0 +1,17 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="block_number_confirmation_title">%1$s bloklansinmi?</string>
+  <string name="block_number_confirmation_message_new_filtering">Siz endi bu raqamdan qo‘ng‘iroq va SMS qabul qilmaysiz.</string>
+  <string name="block_number_ok">BLOKLASH</string>
+  <string name="unblock_number_ok">BLOKDAN CHIQARISH</string>
+  <string name="block_report_number_alert_title">%1$s raqami bloklansinmi?</string>
+  <string name="block_report_number_alert_details">Sizga bu raqamdan endi chaqiruv kelmaydi.</string>
+  <string name="block_number_alert_details">%1$s Bu spam chaqiruv deb xabar beriladi.</string>
+  <string name="unblock_number_alert_details">Bu raqam blokdan chiqariladi va undan keluvchi chaqiruvlar spam emas deb aniqlanadi.</string>
+  <string name="unblock_report_number_alert_title">%1$s raqami blokdan chiqarilsinmi?</string>
+  <string name="report_not_spam_alert_button">Xabar berish</string>
+  <string name="report_not_spam_alert_title">Xato haqida xabar berilsinmi?</string>
+  <string name="report_not_spam_alert_details">%1$s raqamidan kiruvchi chaqiruvlar endi spam emas deb aniqlanadi.</string>
+  <string name="checkbox_report_as_spam_action">Spam chaqiruv deb xabar berish</string>
+  <string name="block_number_failed_toast">Raqam bloklanmadi</string>
+  <string name="unblock_number_failed_toast">Raqam blokdan chiqarilmadi</string>
+</resources>
diff --git a/java/com/android/dialer/blockreportspam/res/values-vi/strings.xml b/java/com/android/dialer/blockreportspam/res/values-vi/strings.xml
new file mode 100644
index 0000000..343bb25
--- /dev/null
+++ b/java/com/android/dialer/blockreportspam/res/values-vi/strings.xml
@@ -0,0 +1,17 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="block_number_confirmation_title">Chặn %1$s?</string>
+  <string name="block_number_confirmation_message_new_filtering">Bạn sẽ không nhận được các cuộc gọi hoặc tin nhắn từ số này nữa.</string>
+  <string name="block_number_ok">CHẶN</string>
+  <string name="unblock_number_ok">BỎ CHẶN</string>
+  <string name="block_report_number_alert_title">Chặn %1$s?</string>
+  <string name="block_report_number_alert_details">Bạn sẽ không nhận được cuộc gọi từ số này nữa.</string>
+  <string name="block_number_alert_details">%1$s Cuộc gọi này sẽ được báo cáo là spam.</string>
+  <string name="unblock_number_alert_details">Sẽ bỏ chặn số này và báo cáo không phải spam. Các cuộc gọi trong tương lai sẽ không bị coi là spam.</string>
+  <string name="unblock_report_number_alert_title">Bỏ chặn %1$s?</string>
+  <string name="report_not_spam_alert_button">Báo cáo</string>
+  <string name="report_not_spam_alert_title">Báo cáo nhầm lẫn?</string>
+  <string name="report_not_spam_alert_details">Cuộc gọi trong tương lai từ %1$s sẽ không bị coi là spam nữa.</string>
+  <string name="checkbox_report_as_spam_action">Báo cáo cuộc gọi là spam</string>
+  <string name="block_number_failed_toast">Sự cố khi chặn số này</string>
+  <string name="unblock_number_failed_toast">Sự cố khi bỏ chặn số này</string>
+</resources>
diff --git a/java/com/android/dialer/blockreportspam/res/values-zh-rCN/strings.xml b/java/com/android/dialer/blockreportspam/res/values-zh-rCN/strings.xml
new file mode 100644
index 0000000..3ac5c43
--- /dev/null
+++ b/java/com/android/dialer/blockreportspam/res/values-zh-rCN/strings.xml
@@ -0,0 +1,17 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="block_number_confirmation_title">要屏蔽 %1$s 吗？</string>
+  <string name="block_number_confirmation_message_new_filtering">您将不会再收到此号码的来电或短信。</string>
+  <string name="block_number_ok">屏蔽</string>
+  <string name="unblock_number_ok">取消屏蔽</string>
+  <string name="block_report_number_alert_title">要屏蔽 %1$s 吗？</string>
+  <string name="block_report_number_alert_details">您将不会再收到此号码的来电。</string>
+  <string name="block_number_alert_details">%1$s此次来电将被举报为骚扰电话。</string>
+  <string name="unblock_number_alert_details">系统将取消屏蔽此号码，并停止将其列为骚扰电话号码。此号码日后的来电不会再被识别为骚扰电话。</string>
+  <string name="unblock_report_number_alert_title">要取消屏蔽 %1$s 吗？</string>
+  <string name="report_not_spam_alert_button">报告</string>
+  <string name="report_not_spam_alert_title">要报告错误吗？</string>
+  <string name="report_not_spam_alert_details">系统不会再将 %1$s 日后的来电识别为骚扰电话。</string>
+  <string name="checkbox_report_as_spam_action">举报为骚扰电话号码</string>
+  <string name="block_number_failed_toast">屏蔽此号码时出现问题</string>
+  <string name="unblock_number_failed_toast">取消屏蔽此号码时出现问题</string>
+</resources>
diff --git a/java/com/android/dialer/blockreportspam/res/values-zh-rHK/strings.xml b/java/com/android/dialer/blockreportspam/res/values-zh-rHK/strings.xml
new file mode 100644
index 0000000..f8d0db7
--- /dev/null
+++ b/java/com/android/dialer/blockreportspam/res/values-zh-rHK/strings.xml
@@ -0,0 +1,17 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="block_number_confirmation_title">要封鎖 %1$s 嗎？</string>
+  <string name="block_number_confirmation_message_new_filtering">您不會再收到這個號碼的來電和短訊。</string>
+  <string name="block_number_ok">封鎖</string>
+  <string name="unblock_number_ok">解除封鎖</string>
+  <string name="block_report_number_alert_title">要封鎖 %1$s 嗎？</string>
+  <string name="block_report_number_alert_details">您不會再收到此號碼的來電。</string>
+  <string name="block_number_alert_details">%1$s 此來電將舉報為垃圾來電。</string>
+  <string name="unblock_number_alert_details">系統會將此號碼解除封鎖，並舉報為非垃圾號碼。此外，系統不會將日後的來電視為垃圾來電。</string>
+  <string name="unblock_report_number_alert_title">要解除封鎖 %1$s 嗎？</string>
+  <string name="report_not_spam_alert_button">舉報</string>
+  <string name="report_not_spam_alert_title">要舉報錯誤嗎？</string>
+  <string name="report_not_spam_alert_details">系統不會再將日後 %1$s 的來電視為垃圾來電。</string>
+  <string name="checkbox_report_as_spam_action">舉報為垃圾來電</string>
+  <string name="block_number_failed_toast">封鎖此號碼時發生問題</string>
+  <string name="unblock_number_failed_toast">解除封鎖此號碼時發生問題</string>
+</resources>
diff --git a/java/com/android/dialer/blockreportspam/res/values-zh-rTW/strings.xml b/java/com/android/dialer/blockreportspam/res/values-zh-rTW/strings.xml
new file mode 100644
index 0000000..a308a40
--- /dev/null
+++ b/java/com/android/dialer/blockreportspam/res/values-zh-rTW/strings.xml
@@ -0,0 +1,17 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="block_number_confirmation_title">要封鎖 %1$s 嗎？</string>
+  <string name="block_number_confirmation_message_new_filtering">您不會再收到這組號碼的來電或簡訊。</string>
+  <string name="block_number_ok">封鎖</string>
+  <string name="unblock_number_ok">解除封鎖</string>
+  <string name="block_report_number_alert_title">要封鎖 %1$s 嗎？</string>
+  <string name="block_report_number_alert_details">你不會再收到這組號碼的來電。</string>
+  <string name="block_number_alert_details">%1$s系統會將本次來電回報為騷擾/廣告電話。</string>
+  <string name="unblock_number_alert_details">系統會解除封鎖這組號碼並回報為非騷擾/廣告電話，該號碼日後的來電不會歸類為騷擾/廣告電話。</string>
+  <string name="unblock_report_number_alert_title">要解除封鎖 %1$s 嗎？</string>
+  <string name="report_not_spam_alert_button">回報</string>
+  <string name="report_not_spam_alert_title">要回報錯誤嗎？</string>
+  <string name="report_not_spam_alert_details">日後來自 %1$s 的電話不會再歸類為騷擾/廣告電話。</string>
+  <string name="checkbox_report_as_spam_action">回報為騷擾/廣告電話</string>
+  <string name="block_number_failed_toast">無法封鎖這個號碼</string>
+  <string name="unblock_number_failed_toast">無法解除封鎖這個號碼</string>
+</resources>
diff --git a/java/com/android/dialer/blockreportspam/res/values-zu/strings.xml b/java/com/android/dialer/blockreportspam/res/values-zu/strings.xml
new file mode 100644
index 0000000..3c5b813
--- /dev/null
+++ b/java/com/android/dialer/blockreportspam/res/values-zu/strings.xml
@@ -0,0 +1,17 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="block_number_confirmation_title">Vimba %1$s?</string>
+  <string name="block_number_confirmation_message_new_filtering">Ngeke usathola amakholi noma imibhalo kusukela kule nombolo.</string>
+  <string name="block_number_ok">VIMBA</string>
+  <string name="unblock_number_ok">VULELA</string>
+  <string name="block_report_number_alert_title">Vimba %1$s?</string>
+  <string name="block_report_number_alert_details">Ngeke usakwazi ukuthola amakholi kusuka kule nombolo.</string>
+  <string name="block_number_alert_details">%1$s Le kholi izobikwa njengogaxekile</string>
+  <string name="unblock_number_alert_details">Le nombolo izovulelwa futhi ibikwe njengokungayena ugaxekile. Amakholi namavoyisimeyili wasesikhathini esizayo ngeke ahlonzwe njengogaxekile.</string>
+  <string name="unblock_report_number_alert_title">Vulela i-%1$s?</string>
+  <string name="report_not_spam_alert_button">Bika</string>
+  <string name="report_not_spam_alert_title">Bika iphutha?</string>
+  <string name="report_not_spam_alert_details">Amakholi wasesikhathini esizayo asuka ku-%1$s ngeke esahlonzwa njengogaxekile.</string>
+  <string name="checkbox_report_as_spam_action">Bika njengogaxekile</string>
+  <string name="block_number_failed_toast">Inkinga ngokuvimbela le nombolo</string>
+  <string name="unblock_number_failed_toast">Inkinga ngokuvulela le nombolo</string>
+</resources>
diff --git a/java/com/android/dialer/blockreportspam/res/values/strings.xml b/java/com/android/dialer/blockreportspam/res/values/strings.xml
index e803a16..1537c23 100644
--- a/java/com/android/dialer/blockreportspam/res/values/strings.xml
+++ b/java/com/android/dialer/blockreportspam/res/values/strings.xml
@@ -18,7 +18,7 @@
 
   <!-- Confirmation dialog title for blocking a number. [CHAR LIMIT=NONE] -->
   <string name="block_number_confirmation_title">
-    Block<xliff:g example="(555) 555-5555" id="number">%1$s</xliff:g>?
+    Block <xliff:g example="(555) 555-5555" id="number">%1$s</xliff:g>?
   </string>
 
   <!-- Confirmation dialog message for blocking a number with new filtering enabled.
@@ -60,4 +60,9 @@
   <!-- Label for checkbox in the Alert dialog to allow the user to report the number as spam as well.  [CHAR LIMIT=30] -->
   <string name="checkbox_report_as_spam_action">Report call as spam</string>
 
+  <!-- Toast if the user clicked the block button but it failed. [CHAR LIMIT=100] -->
+  <string name="block_number_failed_toast">Problem blocking this number</string>
+
+  <!-- Toast if the user clicked the unblock button but it failed. [CHAR LIMIT=100] -->
+  <string name="unblock_number_failed_toast">Problem unblocking this number</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/AndroidManifest.xml b/java/com/android/dialer/callcomposer/AndroidManifest.xml
index cce7110..369db6f 100644
--- a/java/com/android/dialer/callcomposer/AndroidManifest.xml
+++ b/java/com/android/dialer/callcomposer/AndroidManifest.xml
@@ -17,7 +17,7 @@
   xmlns:android="http://schemas.android.com/apk/res/android"
   package="com.android.dialer.callcomposer">
 
-  <application android:theme="@style/Theme.AppCompat">
+  <application>
     <activity
       android:name="com.android.dialer.callcomposer.CallComposerActivity"
       android:exported="true"
diff --git a/java/com/android/dialer/callcomposer/CallComposerActivity.java b/java/com/android/dialer/callcomposer/CallComposerActivity.java
index ce3f7f2..fc5cb22 100644
--- a/java/com/android/dialer/callcomposer/CallComposerActivity.java
+++ b/java/com/android/dialer/callcomposer/CallComposerActivity.java
@@ -60,7 +60,7 @@
 import com.android.dialer.common.concurrent.DialerExecutor;
 import com.android.dialer.common.concurrent.DialerExecutorComponent;
 import com.android.dialer.common.concurrent.ThreadUtil;
-import com.android.dialer.configprovider.ConfigProviderBindings;
+import com.android.dialer.configprovider.ConfigProviderComponent;
 import com.android.dialer.constants.Constants;
 import com.android.dialer.contactphoto.ContactPhotoManager;
 import com.android.dialer.dialercontact.DialerContact;
@@ -78,6 +78,7 @@
 import com.android.dialer.telecom.TelecomUtil;
 import com.android.dialer.util.UriUtils;
 import com.android.dialer.util.ViewUtil;
+import com.android.dialer.widget.BidiTextView;
 import com.android.dialer.widget.DialerToolbar;
 import com.android.dialer.widget.LockableViewPager;
 import com.android.incallui.callpending.CallPendingActivity;
@@ -135,7 +136,7 @@
   private Long sessionId = Session.NO_SESSION_ID;
 
   private TextView nameView;
-  private TextView numberView;
+  private BidiTextView numberView;
   private QuickContactBadge contactPhoto;
   private RelativeLayout contactContainer;
   private DialerToolbar toolbar;
@@ -345,7 +346,9 @@
 
   @VisibleForTesting
   public long getSessionStartedTimeoutMillis() {
-    return ConfigProviderBindings.get(this).getLong("ec_session_started_timeout", 10_000);
+    return ConfigProviderComponent.get(this)
+        .getConfigProvider()
+        .getLong("ec_session_started_timeout", 10_000);
   }
 
   @Override
@@ -441,7 +444,9 @@
     getEnrichedCallManager().sendCallComposerData(sessionId, data);
     maybeShowPrivacyToast(data);
     if (data.hasImageData()
-        && ConfigProviderBindings.get(this).getBoolean("enable_delayed_ec_images", true)
+        && ConfigProviderComponent.get(this)
+            .getConfigProvider()
+            .getBoolean("enable_delayed_ec_images", true)
         && !TelecomUtil.isInManagedCall(this)) {
       timeoutHandler.postDelayed(placeTelecomCallRunnable, getRCSTimeoutMillis());
       startActivity(
@@ -476,7 +481,9 @@
 
   @VisibleForTesting
   public long getRCSTimeoutMillis() {
-    return ConfigProviderBindings.get(this).getLong("ec_image_upload_timeout", 15_000);
+    return ConfigProviderComponent.get(this)
+        .getConfigProvider()
+        .getLong("ec_image_upload_timeout", 15_000);
   }
 
   private void placeTelecomCall() {
@@ -604,7 +611,7 @@
           TextUtils.isEmpty(contact.getNumberLabel())
               ? contact.getDisplayNumber()
               : getString(
-                  com.android.contacts.common.R.string.call_subject_type_and_number,
+                  com.android.dialer.contacts.resources.R.string.call_subject_type_and_number,
                   contact.getNumberLabel(),
                   contact.getDisplayNumber());
       numberView.setText(secondaryInfo);
diff --git a/java/com/android/dialer/callcomposer/CameraComposerFragment.java b/java/com/android/dialer/callcomposer/CameraComposerFragment.java
index a5c65fd..4881220 100644
--- a/java/com/android/dialer/callcomposer/CameraComposerFragment.java
+++ b/java/com/android/dialer/callcomposer/CameraComposerFragment.java
@@ -26,7 +26,6 @@
 import android.provider.Settings;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
-import android.support.v4.content.ContextCompat;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View.OnClickListener;
@@ -49,6 +48,7 @@
 import com.android.dialer.common.LogUtil;
 import com.android.dialer.logging.DialerImpression;
 import com.android.dialer.logging.Logger;
+import com.android.dialer.theme.base.ThemeComponent;
 import com.android.dialer.util.PermissionsUtil;
 
 /** Fragment used to compose call with image from the user's camera. */
@@ -117,8 +117,7 @@
       allowPermission.setOnClickListener(this);
       permissionText.setText(R.string.camera_permission_text);
       permissionImage.setImageResource(R.drawable.quantum_ic_camera_alt_white_48);
-      permissionImage.setColorFilter(
-          ContextCompat.getColor(getContext(), R.color.dialer_theme_color));
+      permissionImage.setColorFilter(ThemeComponent.get(getContext()).theme().getColorPrimary());
       permissionView.setVisibility(View.VISIBLE);
     } else {
       if (bundle != null) {
diff --git a/java/com/android/dialer/callcomposer/CopyAndResizeImageWorker.java b/java/com/android/dialer/callcomposer/CopyAndResizeImageWorker.java
index 725cea7..540ef0f 100644
--- a/java/com/android/dialer/callcomposer/CopyAndResizeImageWorker.java
+++ b/java/com/android/dialer/callcomposer/CopyAndResizeImageWorker.java
@@ -16,14 +16,12 @@
 
 package com.android.dialer.callcomposer;
 
-import android.annotation.TargetApi;
 import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.Bitmap.CompressFormat;
 import android.graphics.BitmapFactory;
 import android.media.ExifInterface;
 import android.net.Uri;
-import android.os.Build.VERSION_CODES;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v4.util.Pair;
@@ -37,7 +35,6 @@
 import java.io.OutputStream;
 
 /** Task for copying and resizing images to be shared with RCS process. */
-@TargetApi(VERSION_CODES.M)
 class CopyAndResizeImageWorker implements Worker<Uri, Pair<File, String>> {
   private static final String MIME_TYPE = "image/jpeg";
 
diff --git a/java/com/android/dialer/callcomposer/GalleryComposerFragment.java b/java/com/android/dialer/callcomposer/GalleryComposerFragment.java
index e604ec1..6265308 100644
--- a/java/com/android/dialer/callcomposer/GalleryComposerFragment.java
+++ b/java/com/android/dialer/callcomposer/GalleryComposerFragment.java
@@ -29,7 +29,6 @@
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v4.app.LoaderManager.LoaderCallbacks;
-import android.support.v4.content.ContextCompat;
 import android.support.v4.content.CursorLoader;
 import android.support.v4.content.Loader;
 import android.view.LayoutInflater;
@@ -44,6 +43,7 @@
 import com.android.dialer.common.concurrent.DialerExecutorComponent;
 import com.android.dialer.logging.DialerImpression;
 import com.android.dialer.logging.Logger;
+import com.android.dialer.theme.base.ThemeComponent;
 import com.android.dialer.util.PermissionsUtil;
 import java.util.ArrayList;
 import java.util.List;
@@ -94,8 +94,7 @@
       allowPermission.setOnClickListener(this);
       permissionText.setText(R.string.gallery_permission_text);
       permissionImage.setImageResource(R.drawable.quantum_ic_photo_white_48);
-      permissionImage.setColorFilter(
-          ContextCompat.getColor(getContext(), R.color.dialer_theme_color));
+      permissionImage.setColorFilter(ThemeComponent.get(getContext()).theme().getColorPrimary());
       permissionView.setVisibility(View.VISIBLE);
     } else {
       if (bundle != null) {
diff --git a/java/com/android/dialer/callcomposer/camera/ImagePersistWorker.java b/java/com/android/dialer/callcomposer/camera/ImagePersistWorker.java
index 69f5469..27ad068 100644
--- a/java/com/android/dialer/callcomposer/camera/ImagePersistWorker.java
+++ b/java/com/android/dialer/callcomposer/camera/ImagePersistWorker.java
@@ -16,12 +16,10 @@
 
 package com.android.dialer.callcomposer.camera;
 
-import android.annotation.TargetApi;
 import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.net.Uri;
-import android.os.Build.VERSION_CODES;
 import android.support.annotation.NonNull;
 import android.support.v4.content.FileProvider;
 import com.android.dialer.callcomposer.camera.ImagePersistWorker.Result;
@@ -38,7 +36,6 @@
 import java.io.OutputStream;
 
 /** Persisting image routine. */
-@TargetApi(VERSION_CODES.M)
 public class ImagePersistWorker implements Worker<Void, Result> {
   private int width;
   private int height;
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/drawable-xhdpi/ic_capture.png b/java/com/android/dialer/callcomposer/cameraui/res/drawable-xhdpi/ic_capture.png
index 4ec9f75..66f9f05 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/drawable-xhdpi/ic_capture.png
+++ b/java/com/android/dialer/callcomposer/cameraui/res/drawable-xhdpi/ic_capture.png
Binary files differ
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/drawable-xxhdpi/ic_capture.png b/java/com/android/dialer/callcomposer/cameraui/res/drawable-xxhdpi/ic_capture.png
index e2345dc..4308def 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/drawable-xxhdpi/ic_capture.png
+++ b/java/com/android/dialer/callcomposer/cameraui/res/drawable-xxhdpi/ic_capture.png
Binary files differ
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/drawable-xxxhdpi/ic_capture.png b/java/com/android/dialer/callcomposer/cameraui/res/drawable-xxxhdpi/ic_capture.png
index 3bab009..53a2f11 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/drawable-xxxhdpi/ic_capture.png
+++ b/java/com/android/dialer/callcomposer/cameraui/res/drawable-xxxhdpi/ic_capture.png
Binary files differ
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/layout/camera_view.xml b/java/com/android/dialer/callcomposer/cameraui/res/layout/camera_view.xml
index 8169a3d..d588511 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/layout/camera_view.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/layout/camera_view.xml
@@ -71,7 +71,7 @@
         android:layout_marginEnd="@dimen/camera_view_button_margin"
         android:layout_marginBottom="@dimen/camera_view_button_margin"
         android:src="@drawable/quantum_ic_fullscreen_white_48"
-        android:background="?android:selectableItemBackgroundBorderless"
+        android:background="?android:attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/description_camera_switch_full_screen"/>
 
       <ImageButton
@@ -83,7 +83,7 @@
         android:layout_marginBottom="@dimen/camera_view_button_margin"
         android:src="@drawable/quantum_ic_fullscreen_exit_white_48"
         android:visibility="gone"
-        android:background="?android:selectableItemBackgroundBorderless"
+        android:background="?android:attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/description_camera_switch_preview_screen"/>
 
       <ImageButton
@@ -92,7 +92,7 @@
         android:layout_height="@dimen/capture_button_size"
         android:layout_gravity="bottom|center_horizontal"
         android:layout_marginBottom="@dimen/capture_button_bottom_margin"
-        android:background="?android:selectableItemBackgroundBorderless"
+        android:background="?android:attr/selectableItemBackgroundBorderless"
         android:src="@drawable/ic_capture"
         android:scaleType="fitXY"
         android:contentDescription="@string/description_camera_take_picture"/>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-af/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-af/strings.xml
index f6326c1..baca0b9 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-af/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-af/strings.xml
@@ -1,26 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2016 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Skakel oor na volskerm-kamera"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Skakel oor na kameravoorskou"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Skakel oor na voorste kamera"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Skakel oor na agterste kamera"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"Neem foto"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Neem foto weer"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">Skakel oor na volskerm-kamera</string>
+  <string name="description_camera_switch_preview_screen">Skakel oor na kameravoorskou</string>
+  <string name="description_camera_switch_camera_facing">Skakel oor na voorste kamera</string>
+  <string name="description_camera_switch_camera_rear">Skakel oor na agterste kamera</string>
+  <string name="description_camera_take_picture">Neem foto</string>
+  <string name="description_camera_cancel_photo">Neem foto weer</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-am/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-am/strings.xml
index 87c70c7..f862cd9 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-am/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-am/strings.xml
@@ -1,26 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2016 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"ወደ ሙሉ ማያ ገጽ ካሜራ ይቀይሩ"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"ወደ ካሜራ ቅድመ ዕይታ ይቀይሩ"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"ወደ የፊት ካሜራ ይቀይሩ"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"ወደ የኋላ ካሜራ ይቀይሩ"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"ፎቶ ያንሱ"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"ፎቶ በድጋሚ ያንሱ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">ወደ ሙሉ ማያ ገጽ ካሜራ ይቀይሩ</string>
+  <string name="description_camera_switch_preview_screen">ወደ ካሜራ ቅድመ ዕይታ ይቀይሩ</string>
+  <string name="description_camera_switch_camera_facing">ወደ የፊት ካሜራ ይቀይሩ</string>
+  <string name="description_camera_switch_camera_rear">ወደ የኋላ ካሜራ ይቀይሩ</string>
+  <string name="description_camera_take_picture">ፎቶ ያንሱ</string>
+  <string name="description_camera_cancel_photo">ፎቶ በድጋሚ ያንሱ</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-ar/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-ar/strings.xml
index fa27db7..f0e6d89 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-ar/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-ar/strings.xml
@@ -1,26 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2016 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"التبديل إلى الكاميرا بملء الشاشة"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"التبديل إلى معاينة الكاميرا"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"تبديل إلى الكاميرا الأمامية"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"تبديل مرة أخرى إلى الكاميرا الأمامية"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"التقاط صورة"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"إعادة التقاط الصورة"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">التبديل إلى الكاميرا بملء الشاشة</string>
+  <string name="description_camera_switch_preview_screen">التبديل إلى معاينة الكاميرا</string>
+  <string name="description_camera_switch_camera_facing">تبديل إلى الكاميرا الأمامية</string>
+  <string name="description_camera_switch_camera_rear">تبديل مرة أخرى إلى الكاميرا الأمامية</string>
+  <string name="description_camera_take_picture">التقاط صورة</string>
+  <string name="description_camera_cancel_photo">إعادة التقاط الصورة</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-az/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-az/strings.xml
index bfbf204..36f52cf 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-az/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-az/strings.xml
@@ -1,26 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2016 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Tam ekranlı kameraya keçin"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Kamera önizləməsinə keçin"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Ön kameraya keçin"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Arxa kameraya keçin"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"Foto çəkin"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Fotonu yenidən çəkin"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">Tam ekranlı kameraya keçin</string>
+  <string name="description_camera_switch_preview_screen">Kamera önizləməsinə keçin</string>
+  <string name="description_camera_switch_camera_facing">Ön kameraya keçin</string>
+  <string name="description_camera_switch_camera_rear">Arxa kameraya keçin</string>
+  <string name="description_camera_take_picture">Foto çəkin</string>
+  <string name="description_camera_cancel_photo">Fotonu yenidən çəkin</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-b+sr+Latn/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-b+sr+Latn/strings.xml
index 565b188..3d96e0c 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-b+sr+Latn/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-b+sr+Latn/strings.xml
@@ -1,26 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2016 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Prebacite na prikaz kamere preko celog ekrana"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Prebacite na pregled kamere"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Prebacite na prednju kameru"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Prebacite na zadnju kameru"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"Snimite sliku"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Ponovo snimite sliku"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">Prebacite na prikaz kamere preko celog ekrana</string>
+  <string name="description_camera_switch_preview_screen">Prebacite na pregled kamere</string>
+  <string name="description_camera_switch_camera_facing">Prebacite na prednju kameru</string>
+  <string name="description_camera_switch_camera_rear">Prebacite na zadnju kameru</string>
+  <string name="description_camera_take_picture">Snimite sliku</string>
+  <string name="description_camera_cancel_photo">Ponovo snimite sliku</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-be/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-be/strings.xml
index f15bbb9..d42f095 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-be/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-be/strings.xml
@@ -1,26 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2016 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Пераключыцца на поўнаэкранную камеру"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Пераключыцца ў рэжым перадпрагляду камеры"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Пераключыцца на пярэднюю камеру"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Пераключыцца на заднюю камеру"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"Зрабіць фота"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Зрабіць фота яшчэ раз"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">Пераключыцца на поўнаэкранную камеру</string>
+  <string name="description_camera_switch_preview_screen">Пераключыцца ў рэжым перадпрагляду камеры</string>
+  <string name="description_camera_switch_camera_facing">Пераключыцца на пярэднюю камеру</string>
+  <string name="description_camera_switch_camera_rear">Пераключыцца на заднюю камеру</string>
+  <string name="description_camera_take_picture">Зрабіць фота</string>
+  <string name="description_camera_cancel_photo">Зрабіць фота яшчэ раз</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-bg/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-bg/strings.xml
index 92352ff..4f2b601 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-bg/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-bg/strings.xml
@@ -1,26 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2016 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Превключване към камера на цял екран"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Превключване към визуализация на камерата"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Превключване към предната камера"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Превключване към задната камера."</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"Снимане"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Повторно снимане"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">Превключване към камера на цял екран</string>
+  <string name="description_camera_switch_preview_screen">Превключване към визуализация на камерата</string>
+  <string name="description_camera_switch_camera_facing">Превключване към предната камера</string>
+  <string name="description_camera_switch_camera_rear">Превключване към задната камера.</string>
+  <string name="description_camera_take_picture">Снимане</string>
+  <string name="description_camera_cancel_photo">Повторно снимане</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-bn/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-bn/strings.xml
index 83774c7..e7ac59e 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-bn/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-bn/strings.xml
@@ -1,26 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2016 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"সম্পূর্ণ স্ক্রীন জুড়ে ক্যামেরা খুলুন"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"ক্যামেরার পূর্বরূপ মোডে পাল্টান"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"সামনের ক্যামেরাতে পাল্টান"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"পিছনের ক্যামেরাতে পাল্টান"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"ফটো তুলুন"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"আবার ফটো তুলুন"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">সম্পূর্ণ স্ক্রিন জুড়ে ক্যামেরা খুলুন</string>
+  <string name="description_camera_switch_preview_screen">ক্যামেরার পূর্বরূপ মোডে পাল্টান</string>
+  <string name="description_camera_switch_camera_facing">সামনের ক্যামেরাতে পাল্টান</string>
+  <string name="description_camera_switch_camera_rear">পিছনের ক্যামেরাতে পাল্টান</string>
+  <string name="description_camera_take_picture">ফটো তুলুন</string>
+  <string name="description_camera_cancel_photo">আবার ফটো তুলুন</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-bs/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-bs/strings.xml
index c77a5de..896cad1 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-bs/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-bs/strings.xml
@@ -1,26 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2016 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Prebaci na kameru preko cijelog ekrana"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Prebaci na pregled kamere"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Prebaci na prednju kameru"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Prebaci na stražnju kameru"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"Snimi fotografiju"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Ponovo snimi fotografiju"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">Prebaci na kameru preko cijelog ekrana</string>
+  <string name="description_camera_switch_preview_screen">Prebaci na pregled kamere</string>
+  <string name="description_camera_switch_camera_facing">Prebaci na prednju kameru</string>
+  <string name="description_camera_switch_camera_rear">Prebaci na zadnju kameru</string>
+  <string name="description_camera_take_picture">Snimi fotografiju</string>
+  <string name="description_camera_cancel_photo">Ponovo snimi fotografiju</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-ca/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-ca/strings.xml
index 39c069b..acef5a8 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-ca/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-ca/strings.xml
@@ -1,26 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2016 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Canvia a la càmera en pantalla completa"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Canvia a la previsualització de la càmera"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Canvia a la càmera frontal"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Canvia a la càmera posterior"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"Fes una foto"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Torna a fer la foto"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">Canvia a la càmera en pantalla completa</string>
+  <string name="description_camera_switch_preview_screen">Canvia a la previsualització de la càmera</string>
+  <string name="description_camera_switch_camera_facing">Canvia a la càmera frontal</string>
+  <string name="description_camera_switch_camera_rear">Canvia a la càmera posterior</string>
+  <string name="description_camera_take_picture">Fes una foto</string>
+  <string name="description_camera_cancel_photo">Torna a fer la foto</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-cs/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-cs/strings.xml
index 222eb81..e29825c 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-cs/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-cs/strings.xml
@@ -1,26 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2016 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Přepnout na fotoaparát na celou obrazovku"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Přepnout na náhled fotoaparátu"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Přepnout na přední fotoaparát"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Přepnout na zadní fotoaparát"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"Vyfotit"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Znovu vyfotit"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">Přepnout na fotoaparát na celou obrazovku</string>
+  <string name="description_camera_switch_preview_screen">Přepnout na náhled fotoaparátu</string>
+  <string name="description_camera_switch_camera_facing">Přepnout na přední fotoaparát</string>
+  <string name="description_camera_switch_camera_rear">Přepnout na zadní fotoaparát</string>
+  <string name="description_camera_take_picture">Vyfotit</string>
+  <string name="description_camera_cancel_photo">Znovu vyfotit</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-da/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-da/strings.xml
index 0de7e08..0f1dda4 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-da/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-da/strings.xml
@@ -1,26 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2016 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Skift til kamera i fuld skærm"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Skift til forhåndsvisning af kamera"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Skift til kamera på forsiden"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Skift til kamera på bagsiden"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"Tag billede"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Tag billedet om"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">Skift til kamera i fuld skærm</string>
+  <string name="description_camera_switch_preview_screen">Skift til forhåndsvisning af kamera</string>
+  <string name="description_camera_switch_camera_facing">Skift til kamera på forsiden</string>
+  <string name="description_camera_switch_camera_rear">Skift til kamera på bagsiden</string>
+  <string name="description_camera_take_picture">Tag billede</string>
+  <string name="description_camera_cancel_photo">Tag billedet om</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-de/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-de/strings.xml
index 1b0d639..576b963 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-de/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-de/strings.xml
@@ -1,26 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2016 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Zur Vollbildkamera wechseln"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Zur Kameravorschau wechseln"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Zur Frontkamera wechseln"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Zur Rückkamera wechseln"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"Foto aufnehmen"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Foto neu aufnehmen"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">Zur Vollbildkamera wechseln</string>
+  <string name="description_camera_switch_preview_screen">Zur Kameravorschau wechseln</string>
+  <string name="description_camera_switch_camera_facing">Zur Frontkamera wechseln</string>
+  <string name="description_camera_switch_camera_rear">Zur Rückkamera wechseln</string>
+  <string name="description_camera_take_picture">Foto aufnehmen</string>
+  <string name="description_camera_cancel_photo">Foto neu aufnehmen</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-el/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-el/strings.xml
index d657f93..aadf7ce 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-el/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-el/strings.xml
@@ -1,26 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2016 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Εναλλαγή σε κάμερα πλήρους οθόνης"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Εναλλαγή σε προεπισκόπηση κάμερας"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Εναλλαγή σε κάμερα πρόσοψης"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Εναλλαγή σε πίσω κάμερα"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"Λήψη φωτογραφίας"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Επανάληψη λήψης φωτογραφίας"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">Εναλλαγή σε κάμερα πλήρους οθόνης</string>
+  <string name="description_camera_switch_preview_screen">Εναλλαγή σε προεπισκόπηση κάμερας</string>
+  <string name="description_camera_switch_camera_facing">Εναλλαγή σε κάμερα πρόσοψης</string>
+  <string name="description_camera_switch_camera_rear">Εναλλαγή σε πίσω κάμερα</string>
+  <string name="description_camera_take_picture">Λήψη φωτογραφίας</string>
+  <string name="description_camera_cancel_photo">Επανάληψη λήψης φωτογραφίας</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-en-rAU/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-en-rAU/strings.xml
index 9e76a69..0447b9b 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-en-rAU/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-en-rAU/strings.xml
@@ -1,26 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2016 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Switch to full-screen camera"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Switch to camera preview"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Switch to front-facing camera"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Switch to rear-facing camera"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"Take photo"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Retake photo"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">Switch to full-screen camera</string>
+  <string name="description_camera_switch_preview_screen">Switch to camera preview</string>
+  <string name="description_camera_switch_camera_facing">Switch to front-facing camera</string>
+  <string name="description_camera_switch_camera_rear">Switch to rear-facing camera</string>
+  <string name="description_camera_take_picture">Take photo</string>
+  <string name="description_camera_cancel_photo">Retake photo</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-en-rGB/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-en-rGB/strings.xml
index 9e76a69..0447b9b 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-en-rGB/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-en-rGB/strings.xml
@@ -1,26 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2016 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Switch to full-screen camera"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Switch to camera preview"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Switch to front-facing camera"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Switch to rear-facing camera"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"Take photo"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Retake photo"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">Switch to full-screen camera</string>
+  <string name="description_camera_switch_preview_screen">Switch to camera preview</string>
+  <string name="description_camera_switch_camera_facing">Switch to front-facing camera</string>
+  <string name="description_camera_switch_camera_rear">Switch to rear-facing camera</string>
+  <string name="description_camera_take_picture">Take photo</string>
+  <string name="description_camera_cancel_photo">Retake photo</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-en-rIN/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-en-rIN/strings.xml
index 9e76a69..0447b9b 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-en-rIN/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-en-rIN/strings.xml
@@ -1,26 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2016 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Switch to full-screen camera"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Switch to camera preview"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Switch to front-facing camera"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Switch to rear-facing camera"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"Take photo"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Retake photo"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">Switch to full-screen camera</string>
+  <string name="description_camera_switch_preview_screen">Switch to camera preview</string>
+  <string name="description_camera_switch_camera_facing">Switch to front-facing camera</string>
+  <string name="description_camera_switch_camera_rear">Switch to rear-facing camera</string>
+  <string name="description_camera_take_picture">Take photo</string>
+  <string name="description_camera_cancel_photo">Retake photo</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-es-rUS/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-es-rUS/strings.xml
index f103564..8076261 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-es-rUS/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-es-rUS/strings.xml
@@ -1,26 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2016 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Cambiar a cámara en pantalla completa"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Cambiar a vista previa de la cámara"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Cambiar a cámara frontal"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Cambiar a cámara trasera"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"Tomar foto"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Volver a tomar foto"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">Cambiar a cámara en pantalla completa</string>
+  <string name="description_camera_switch_preview_screen">Cambiar a vista previa de la cámara</string>
+  <string name="description_camera_switch_camera_facing">Cambiar a cámara frontal</string>
+  <string name="description_camera_switch_camera_rear">Cambiar a cámara trasera</string>
+  <string name="description_camera_take_picture">Tomar foto</string>
+  <string name="description_camera_cancel_photo">Volver a tomar foto</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-es/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-es/strings.xml
index 5afb8c8..1911b55 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-es/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-es/strings.xml
@@ -1,26 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2016 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Cambiar a la cámara en pantalla completa"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Cambiar a la vista previa de la cámara"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Cambiar a la cámara frontal"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Cambiar a la cámara trasera"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"Hacer una foto"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Repetir la foto"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">Cambiar a la cámara en pantalla completa</string>
+  <string name="description_camera_switch_preview_screen">Cambiar a la vista previa de la cámara</string>
+  <string name="description_camera_switch_camera_facing">Cambiar a la cámara frontal</string>
+  <string name="description_camera_switch_camera_rear">Cambiar a la cámara trasera</string>
+  <string name="description_camera_take_picture">Hacer una foto</string>
+  <string name="description_camera_cancel_photo">Repetir la foto</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-et/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-et/strings.xml
index d4c37fe..e85de24 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-et/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-et/strings.xml
@@ -1,26 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2016 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Täisekraaniga kaamerale lülitumine"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Kaamera eelvaatele lülitumine"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Esikaamerale lülitumine"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Tagakaamerale lülitumine"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"Foto jäädvustamine"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Foto uuesti jäädvustamine"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">Täisekraaniga kaamerale lülitumine</string>
+  <string name="description_camera_switch_preview_screen">Kaamera eelvaatele lülitumine</string>
+  <string name="description_camera_switch_camera_facing">Esikaamerale lülitumine</string>
+  <string name="description_camera_switch_camera_rear">Tagakaamerale lülitumine</string>
+  <string name="description_camera_take_picture">Foto jäädvustamine</string>
+  <string name="description_camera_cancel_photo">Foto uuesti jäädvustamine</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-eu/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-eu/strings.xml
index 4271983..1ce1d8c 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-eu/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-eu/strings.xml
@@ -1,26 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2016 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Erabili pantaila osoko kamera"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Erabili kameraren aurrebista"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Erabili aurreko kamera"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Erabili atzeko kamera"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"Atera argazkia"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Atera berriro argazkia"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">Erabili pantaila osoko kamera</string>
+  <string name="description_camera_switch_preview_screen">Erabili kameraren aurrebista</string>
+  <string name="description_camera_switch_camera_facing">Erabili aurreko kamera</string>
+  <string name="description_camera_switch_camera_rear">Erabili atzeko kamera</string>
+  <string name="description_camera_take_picture">Atera argazkia</string>
+  <string name="description_camera_cancel_photo">Atera berriro argazkia</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-fa/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-fa/strings.xml
index 5d58771..157beef 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-fa/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-fa/strings.xml
@@ -1,26 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2016 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"رفتن به دوربین تمام صفحه"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"رفتن به پیش‌نمایش دوربین"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"رفتن به دوربین جلو"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"رفتن به دوربین عقب"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"عکس گرفتن"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"عکس گرفتن مجدد"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">رفتن به دوربین تمام صفحه</string>
+  <string name="description_camera_switch_preview_screen">رفتن به پیش‌نمایش دوربین</string>
+  <string name="description_camera_switch_camera_facing">رفتن به دوربین جلو</string>
+  <string name="description_camera_switch_camera_rear">رفتن به دوربین عقب</string>
+  <string name="description_camera_take_picture">عکس گرفتن</string>
+  <string name="description_camera_cancel_photo">عکس گرفتن مجدد</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-fi/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-fi/strings.xml
index 9d7cb09..9469524 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-fi/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-fi/strings.xml
@@ -1,26 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2016 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Siirry koko näytön kameraan"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Siirry kameran esikatseluun"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Vaihda etukameraan"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Vaihda takakameraan"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"Ota kuva"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Ota kuva uudelleen"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">Siirry koko näytön kameraan</string>
+  <string name="description_camera_switch_preview_screen">Siirry kameran esikatseluun</string>
+  <string name="description_camera_switch_camera_facing">Vaihda etukameraan</string>
+  <string name="description_camera_switch_camera_rear">Vaihda takakameraan</string>
+  <string name="description_camera_take_picture">Ota kuva</string>
+  <string name="description_camera_cancel_photo">Ota kuva uudelleen</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-fr-rCA/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-fr-rCA/strings.xml
index b202840..a2f10bc 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-fr-rCA/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-fr-rCA/strings.xml
@@ -1,26 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2016 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Passer au mode Plein écran de l\'appareil photo"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Passer au mode Aperçu de l\'appareil photo"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Passer à l\'appareil photo avant"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Passer à l\'appareil photo arrière"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"Prendre une photo"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Reprendre la photo"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">Passer au mode Plein écran de l\'appareil photo</string>
+  <string name="description_camera_switch_preview_screen">Passer au mode Aperçu de l\'appareil photo</string>
+  <string name="description_camera_switch_camera_facing">Passer à l\'appareil photo avant</string>
+  <string name="description_camera_switch_camera_rear">Passer à l\'appareil photo arrière</string>
+  <string name="description_camera_take_picture">Prendre une photo</string>
+  <string name="description_camera_cancel_photo">Reprendre la photo</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-fr/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-fr/strings.xml
index a9cfe71..50df31b 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-fr/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-fr/strings.xml
@@ -1,26 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2016 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Passer en mode plein écran"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Passer en mode aperçu"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Utiliser la caméra avant"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Utiliser la caméra arrière"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"Prendre une photo"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Reprendre la photo"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">Passer en mode plein écran</string>
+  <string name="description_camera_switch_preview_screen">Passer en mode aperçu</string>
+  <string name="description_camera_switch_camera_facing">Utiliser la caméra avant</string>
+  <string name="description_camera_switch_camera_rear">Utiliser la caméra arrière</string>
+  <string name="description_camera_take_picture">Prendre une photo</string>
+  <string name="description_camera_cancel_photo">Reprendre la photo</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-gl/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-gl/strings.xml
index 3568a0f..b9be419 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-gl/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-gl/strings.xml
@@ -1,26 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2016 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Cambia á cámara de pantalla completa"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Cambia á vista previa da cámara"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Cambia á cámara frontal"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Cambia á cámara traseira"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"Tira unha foto"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Repite a foto"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">Cambia á cámara de pantalla completa</string>
+  <string name="description_camera_switch_preview_screen">Cambia á vista previa da cámara</string>
+  <string name="description_camera_switch_camera_facing">Cambia á cámara frontal</string>
+  <string name="description_camera_switch_camera_rear">Cambia á cámara traseira</string>
+  <string name="description_camera_take_picture">Tira unha foto</string>
+  <string name="description_camera_cancel_photo">Repite a foto</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-gu/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-gu/strings.xml
index 88037b5..6e752d9 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-gu/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-gu/strings.xml
@@ -1,26 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2016 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"પૂર્ણ સ્ક્રીન કૅમેરા પર સ્વિચ કરો"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"કૅમેરા પૂર્વાવલોકન પર સ્વીચ કરો"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"ફ્ર્ન્ટ ફેસિંગ કૅમેરા પર સ્વિચ કરો"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"પાછળના કૅમેરા પર સ્વિચ કરો"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"ફોટો લો"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"ફોટો ફરીથી લો"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">પૂર્ણ સ્ક્રીન કૅમેરા પર સ્વિચ કરો</string>
+  <string name="description_camera_switch_preview_screen">કૅમેરા પૂર્વાવલોકન પર સ્વીચ કરો</string>
+  <string name="description_camera_switch_camera_facing">ફ્ર્ન્ટ ફેસિંગ કૅમેરા પર સ્વિચ કરો</string>
+  <string name="description_camera_switch_camera_rear">પાછળના કૅમેરા પર સ્વિચ કરો</string>
+  <string name="description_camera_take_picture">ફોટો લો</string>
+  <string name="description_camera_cancel_photo">ફોટો ફરીથી લો</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-hi/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-hi/strings.xml
index 09a441f..52973b6 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-hi/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-hi/strings.xml
@@ -1,26 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2016 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"पूर्ण स्क्रीन कैमरे में बदलें"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"कैमरा पूर्वावलोकन में बदलें"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"सामने वाले कैमरे में बदलें"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"पीछे वाले कैमरे में बदलें"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"फ़ोटो लें"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"फि‍र से फ़ोटो लें"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">पूर्ण स्क्रीन कैमरे में बदलें</string>
+  <string name="description_camera_switch_preview_screen">कैमरा पूर्वावलोकन में बदलें</string>
+  <string name="description_camera_switch_camera_facing">सामने वाले कैमरे में बदलें</string>
+  <string name="description_camera_switch_camera_rear">पीछे वाले कैमरे में बदलें</string>
+  <string name="description_camera_take_picture">फ़ोटो लें</string>
+  <string name="description_camera_cancel_photo">फि‍र से फ़ोटो लें</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-hr/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-hr/strings.xml
index 2dca9bd..3db2875 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-hr/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-hr/strings.xml
@@ -1,26 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2016 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Prebaci na prikaz fotoaparata preko cijelog zaslona"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Prebaci na pregled fotoaparata"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Prebaci na prednji fotoaparat"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Prebaci na stražnji fotoaparat"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"Snimi fotografiju"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Ponovno snimi fotografiju"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">Prebaci na prikaz fotoaparata preko cijelog zaslona</string>
+  <string name="description_camera_switch_preview_screen">Prebaci na pregled fotoaparata</string>
+  <string name="description_camera_switch_camera_facing">Prebaci na prednji fotoaparat</string>
+  <string name="description_camera_switch_camera_rear">Prebaci na stražnji fotoaparat</string>
+  <string name="description_camera_take_picture">Snimi fotografiju</string>
+  <string name="description_camera_cancel_photo">Ponovno snimi fotografiju</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-hu/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-hu/strings.xml
index 5007b3f..a32d4ee 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-hu/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-hu/strings.xml
@@ -1,26 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2016 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Váltás teljes képernyős kameranézetre"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Váltás kamera-előnézetre"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Váltás az első kamerára"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Váltás a hátsó kamerára"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"Fotó készítése"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Új felvétel"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">Váltás teljes képernyős kameranézetre</string>
+  <string name="description_camera_switch_preview_screen">Váltás kamera-előnézetre</string>
+  <string name="description_camera_switch_camera_facing">Váltás az első kamerára</string>
+  <string name="description_camera_switch_camera_rear">Váltás a hátsó kamerára</string>
+  <string name="description_camera_take_picture">Fotó készítése</string>
+  <string name="description_camera_cancel_photo">Új felvétel</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-hy/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-hy/strings.xml
index 2c1bd79..ef133c2 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-hy/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-hy/strings.xml
@@ -1,26 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2016 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Միացնել լիաէկրան ռեժիմը"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Միացնել նախադիտման ռեժիմը"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Միացնել առջևի տեսախցիկը"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Միացնել հետևի տեսախցիկը"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"Լուսանկարել"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Նորից լուսանկարել"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">Միացնել լիաէկրան ռեժիմը</string>
+  <string name="description_camera_switch_preview_screen">Միացնել նախադիտման ռեժիմը</string>
+  <string name="description_camera_switch_camera_facing">Միացնել առջևի տեսախցիկը</string>
+  <string name="description_camera_switch_camera_rear">Միացնել հետևի տեսախցիկը</string>
+  <string name="description_camera_take_picture">Լուսանկարել</string>
+  <string name="description_camera_cancel_photo">Նորից լուսանկարել</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-in/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-in/strings.xml
index 4c922cd..d238778 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-in/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-in/strings.xml
@@ -1,26 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2016 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Beralih ke kamera layar penuh"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Beralih ke pratinjau kamera"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Beralih ke kamera depan"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Beralih ke kamera belakang"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"Ambil foto"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Ambil ulang foto"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">Beralih ke kamera layar penuh</string>
+  <string name="description_camera_switch_preview_screen">Beralih ke pratinjau kamera</string>
+  <string name="description_camera_switch_camera_facing">Beralih ke kamera depan</string>
+  <string name="description_camera_switch_camera_rear">Beralih ke kamera belakang</string>
+  <string name="description_camera_take_picture">Ambil foto</string>
+  <string name="description_camera_cancel_photo">Ambil ulang foto</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-is/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-is/strings.xml
index c796d22..b01e643 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-is/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-is/strings.xml
@@ -1,26 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2016 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Skipta yfir í myndavél á öllum skjánum"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Skipta yfir í forskoðun á myndavél"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Skipta yfir í fremri myndavél"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Skipta yfir í aftari myndavél"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"Taka mynd"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Taka mynd aftur"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">Skipta yfir í myndavél á öllum skjánum</string>
+  <string name="description_camera_switch_preview_screen">Skipta yfir í forskoðun á myndavél</string>
+  <string name="description_camera_switch_camera_facing">Skipta yfir í fremri myndavél</string>
+  <string name="description_camera_switch_camera_rear">Skipta yfir í aftari myndavél</string>
+  <string name="description_camera_take_picture">Taka mynd</string>
+  <string name="description_camera_cancel_photo">Taka mynd aftur</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-it/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-it/strings.xml
index abf5d3f..0c4a56e 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-it/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-it/strings.xml
@@ -1,26 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2016 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Passa alla fotocamera a schermo intero"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Passa all\'anteprima della fotocamera"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Passa alla fotocamera anteriore"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Passa alla fotocamera posteriore"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"Scatta foto"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Scatta foto di nuovo"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">Passa alla fotocamera a schermo intero</string>
+  <string name="description_camera_switch_preview_screen">Passa all\'anteprima della fotocamera</string>
+  <string name="description_camera_switch_camera_facing">Passa alla fotocamera anteriore</string>
+  <string name="description_camera_switch_camera_rear">Passa alla fotocamera posteriore</string>
+  <string name="description_camera_take_picture">Scatta foto</string>
+  <string name="description_camera_cancel_photo">Scatta foto di nuovo</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-iw/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-iw/strings.xml
index e6aed2e..67bc889 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-iw/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-iw/strings.xml
@@ -1,26 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2016 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"מעבר למצלמה במסך מלא"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"מעבר לתצוגה מקדימה של המצלמה"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"מעבר למצלמה הקדמית"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"מעבר למצלמה האחורית"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"צילום תמונה"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"צילום מחדש של התמונה"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">מעבר למצלמה במסך מלא</string>
+  <string name="description_camera_switch_preview_screen">מעבר לתצוגה מקדימה של המצלמה</string>
+  <string name="description_camera_switch_camera_facing">מעבר למצלמה הקדמית</string>
+  <string name="description_camera_switch_camera_rear">מעבר למצלמה האחורית</string>
+  <string name="description_camera_take_picture">צילום תמונה</string>
+  <string name="description_camera_cancel_photo">צילום מחדש של התמונה</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-ja/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-ja/strings.xml
index 85ef3c8..d903388 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-ja/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-ja/strings.xml
@@ -1,26 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2016 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"全画面カメラに切り替えます"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"カメラのプレビューに切り替えます"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"前面カメラに切り替えます"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"背面カメラに切り替えます"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"写真を撮影します"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"写真を撮り直します"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">全画面カメラに切り替えます</string>
+  <string name="description_camera_switch_preview_screen">カメラのプレビューに切り替えます</string>
+  <string name="description_camera_switch_camera_facing">前面カメラに切り替えます</string>
+  <string name="description_camera_switch_camera_rear">背面カメラに切り替えます</string>
+  <string name="description_camera_take_picture">写真を撮影します</string>
+  <string name="description_camera_cancel_photo">写真を撮り直します</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-ka/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-ka/strings.xml
index edaf33f..ccb6484 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-ka/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-ka/strings.xml
@@ -1,26 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2016 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"სრულეკრანიან კამერაზე გადართვა"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"კამერის წინასწარ ხედზე გადართვა"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"წინა კამერაზე გადართვა"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"უკანა კამერაზე გადართვა"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"ფოტოს გადაღება"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"ფოტოს ხელახლა გადაღება"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">სრულეკრანიან კამერაზე გადართვა</string>
+  <string name="description_camera_switch_preview_screen">კამერის წინასწარ ხედზე გადართვა</string>
+  <string name="description_camera_switch_camera_facing">წინა კამერაზე გადართვა</string>
+  <string name="description_camera_switch_camera_rear">უკანა კამერაზე გადართვა</string>
+  <string name="description_camera_take_picture">ფოტოს გადაღება</string>
+  <string name="description_camera_cancel_photo">ფოტოს ხელახლა გადაღება</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-kk/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-kk/strings.xml
index 795a063..11c91c6 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-kk/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-kk/strings.xml
@@ -1,26 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2016 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Толық экранды камераға ауысу"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Камераның алдын ала көру режиміне ауысу"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Камераның анфас режиміне ауысу"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Камераның қалыпты режиміне ауысу"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"Суретке түсіру"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Суретке қайта түсіру"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">Толық экранды камераға ауысу</string>
+  <string name="description_camera_switch_preview_screen">Камераның алдын ала көру режиміне ауысу</string>
+  <string name="description_camera_switch_camera_facing">Камераның анфас режиміне ауысу</string>
+  <string name="description_camera_switch_camera_rear">Камераның қалыпты режиміне ауысу</string>
+  <string name="description_camera_take_picture">Суретке түсіру</string>
+  <string name="description_camera_cancel_photo">Суретке қайта түсіру</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-km/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-km/strings.xml
index 377f885..dfb2781 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-km/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-km/strings.xml
@@ -1,26 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2016 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"ប្ដូរ​ទៅ​កាមេរ៉ា​ពេញ​អេក្រង់"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"ប្ដូរ​ទៅ​ការមើល​កាមេរ៉ា​សាកល្បង"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"ប្ដូរ​ទៅ​កាមេរ៉ា​ខាង​មុខ"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"ប្តូរទៅកាមេរ៉ាខាងក្រោយ"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"ថតរូប"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"ថតរូប​ឡើងវិញ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">ប្ដូរ​ទៅ​កាមេរ៉ា​ពេញ​អេក្រង់</string>
+  <string name="description_camera_switch_preview_screen">ប្ដូរ​ទៅ​ការមើល​កាមេរ៉ា​សាកល្បង</string>
+  <string name="description_camera_switch_camera_facing">ប្ដូរ​ទៅ​កាមេរ៉ា​ខាង​មុខ</string>
+  <string name="description_camera_switch_camera_rear">ប្តូរទៅកាមេរ៉ាខាងក្រោយ</string>
+  <string name="description_camera_take_picture">ថតរូប</string>
+  <string name="description_camera_cancel_photo">ថតរូប​ឡើងវិញ</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-kn/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-kn/strings.xml
index 1f5d1ea..b95e118 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-kn/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-kn/strings.xml
@@ -1,26 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2016 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"ಪೂರ್ಣ ಪರದೆ ಕ್ಯಾಮರಾಗೆ ಬದಲಿಸಿ"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"ಕ್ಯಾಮರಾ ಪೂರ್ವವೀಕ್ಷಣೆಗೆ ಬದಲಾಯಿಸಿ"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"ಮುಂಬದಿಯ ಕ್ಯಾಮರಾಗೆ ಬದಲಾಯಿಸಿ"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"ಹಿಂಬದಿಯ ಕ್ಯಾಮರಾಗೆ ಬದಲಾಯಿಸಿ"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"ಫೋಟೋ ತೆಗೆಯಿರಿ"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"ಫೋಟೋವನ್ನು ಮರುಸೆರೆಹಿಡಿಯಿರಿ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">ಪೂರ್ಣ ಪರದೆ ಕ್ಯಾಮರಾಗೆ ಬದಲಿಸಿ</string>
+  <string name="description_camera_switch_preview_screen">ಕ್ಯಾಮರಾ ಪೂರ್ವವೀಕ್ಷಣೆಗೆ ಬದಲಾಯಿಸಿ</string>
+  <string name="description_camera_switch_camera_facing">ಮುಂಬದಿಯ ಕ್ಯಾಮರಾಗೆ ಬದಲಾಯಿಸಿ</string>
+  <string name="description_camera_switch_camera_rear">ಹಿಂಬದಿಯ ಕ್ಯಾಮರಾಗೆ ಬದಲಾಯಿಸಿ</string>
+  <string name="description_camera_take_picture">ಫೋಟೋ ತೆಗೆಯಿರಿ</string>
+  <string name="description_camera_cancel_photo">ಫೋಟೋವನ್ನು ಮರುಸೆರೆಹಿಡಿಯಿರಿ</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-ko/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-ko/strings.xml
index 1b675e7..d296950 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-ko/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-ko/strings.xml
@@ -1,26 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2016 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"전체화면 카메라로 전환"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"카메라 미리보기로 전환"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"전면 카메라로 전환"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"후면 카메라로 전환"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"사진 찍기"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"사진 다시 찍기"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">전체화면 카메라로 전환</string>
+  <string name="description_camera_switch_preview_screen">카메라 미리보기로 전환</string>
+  <string name="description_camera_switch_camera_facing">전면 카메라로 전환</string>
+  <string name="description_camera_switch_camera_rear">후면 카메라로 전환</string>
+  <string name="description_camera_take_picture">사진 찍기</string>
+  <string name="description_camera_cancel_photo">사진 다시 찍기</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-ky/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-ky/strings.xml
index 771f576..f471412 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-ky/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-ky/strings.xml
@@ -1,26 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2016 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Камераны толук экранга которуу"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Камераны алдын ала көрүү режимине которуу"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Маңдайкы камерага которуу"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Арткы камерага которуу"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"Сүрөткө тартуу"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Кайра сүрөткө тартуу"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">Камераны толук экранга которуу</string>
+  <string name="description_camera_switch_preview_screen">Камераны алдын ала көрүү режимине которуу</string>
+  <string name="description_camera_switch_camera_facing">Маңдайкы камерага которуу</string>
+  <string name="description_camera_switch_camera_rear">Арткы камерага которуу</string>
+  <string name="description_camera_take_picture">Сүрөткө тартуу</string>
+  <string name="description_camera_cancel_photo">Кайра сүрөткө тартуу</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-lo/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-lo/strings.xml
index 6bfdf4e..fa8261c 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-lo/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-lo/strings.xml
@@ -1,26 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2016 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"ສະຫຼັບໄປໃຊ້ກ້ອງແບບເຕັມຈໍ"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"ສະຫຼັບໄປໃຊ້ຕົວຢ່າງກ້ອງ"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"ສະຫຼັບໄປໃຊ້ກ້ອງໜ້າ"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"ສະຫຼັບໄປໃຊ້ກ້ອງຫຼັງ"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"ຖ່າຍຮູບ"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"ຖ່າຍຮູບໃໝ່"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">ສະຫຼັບໄປໃຊ້ກ້ອງແບບເຕັມຈໍ</string>
+  <string name="description_camera_switch_preview_screen">ສະຫຼັບໄປໃຊ້ຕົວຢ່າງກ້ອງ</string>
+  <string name="description_camera_switch_camera_facing">ສະຫຼັບໄປໃຊ້ກ້ອງໜ້າ</string>
+  <string name="description_camera_switch_camera_rear">ສະຫຼັບໄປໃຊ້ກ້ອງຫຼັງ</string>
+  <string name="description_camera_take_picture">ຖ່າຍຮູບ</string>
+  <string name="description_camera_cancel_photo">ຖ່າຍຮູບໃໝ່</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-lt/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-lt/strings.xml
index 6ff3b0d..783878f 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-lt/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-lt/strings.xml
@@ -1,26 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2016 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Perjungti į viso ekrano režimu veikiantį fotoaparatą"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Perjungti į fotoaparato peržiūrą"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Perjungti į priekinį fotoaparatą"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Perjungti į užpakalinį fotoaparatą"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"Fotografuoti"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Fotografuoti iš naujo"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">Perjungti į viso ekrano režimu veikiantį fotoaparatą</string>
+  <string name="description_camera_switch_preview_screen">Perjungti į fotoaparato peržiūrą</string>
+  <string name="description_camera_switch_camera_facing">Perjungti į priekinį fotoaparatą</string>
+  <string name="description_camera_switch_camera_rear">Perjungti į užpakalinį fotoaparatą</string>
+  <string name="description_camera_take_picture">Fotografuoti</string>
+  <string name="description_camera_cancel_photo">Fotografuoti iš naujo</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-lv/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-lv/strings.xml
index d6d4782..bca0cdd 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-lv/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-lv/strings.xml
@@ -1,26 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2016 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Pārslēgt uz pilnekrāna kameru"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Pārslēgt uz kameras priekšskatījumu"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Pārslēgt uz priekšējo kameru"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Pārslēgt uz aizmugurējo kameru"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"Uzņemt fotoattēlu"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Atkārtoti uzņemt fotoattēlu"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">Pārslēgt uz pilnekrāna kameru</string>
+  <string name="description_camera_switch_preview_screen">Pārslēgt uz kameras priekšskatījumu</string>
+  <string name="description_camera_switch_camera_facing">Pārslēgt uz priekšējo kameru</string>
+  <string name="description_camera_switch_camera_rear">Pārslēgt uz aizmugurējo kameru</string>
+  <string name="description_camera_take_picture">Uzņemt fotoattēlu</string>
+  <string name="description_camera_cancel_photo">Atkārtoti uzņemt fotoattēlu</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-mk/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-mk/strings.xml
index a0f84a0..c620fb9 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-mk/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-mk/strings.xml
@@ -1,26 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2016 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Префрлете на камера на цел екран"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Префрлете на преглед на камера"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Префрлете на предна камера"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Префрлете на задна камера"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"Фотографирај"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Фотографирај пак"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">Префрлете на камера на цел екран</string>
+  <string name="description_camera_switch_preview_screen">Префрлете на преглед на камера</string>
+  <string name="description_camera_switch_camera_facing">Префрлете на предна камера</string>
+  <string name="description_camera_switch_camera_rear">Префрлете на задна камера</string>
+  <string name="description_camera_take_picture">Фотографирај</string>
+  <string name="description_camera_cancel_photo">Фотографирај пак</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-ml/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-ml/strings.xml
index 77c0a4f..b666f51 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-ml/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-ml/strings.xml
@@ -1,26 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2016 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"പൂർണ്ണസ്ക്രീൻ ക്യാമറയിലേക്ക് മാറുക"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"ക്യാമറ പ്രിവ്യൂവിലേക്ക് മാറുക"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"മുൻ ക്യാമറയിലേക്ക് മാറുക"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"പിൻ ക്യാമറയിലേക്ക് മാറുക"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"ഫോട്ടോ എടുക്കുക"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"ഫോട്ടോ വീണ്ടുമെടുക്കുക"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">പൂർണ്ണസ്ക്രീൻ ക്യാമറയിലേക്ക് മാറുക</string>
+  <string name="description_camera_switch_preview_screen">ക്യാമറ പ്രിവ്യൂവിലേക്ക് മാറുക</string>
+  <string name="description_camera_switch_camera_facing">മുൻ ക്യാമറയിലേക്ക് മാറുക</string>
+  <string name="description_camera_switch_camera_rear">പിൻ ക്യാമറയിലേക്ക് മാറുക</string>
+  <string name="description_camera_take_picture">ഫോട്ടോ എടുക്കുക</string>
+  <string name="description_camera_cancel_photo">ഫോട്ടോ വീണ്ടുമെടുക്കുക</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-mn/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-mn/strings.xml
index 1894634..d31d155 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-mn/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-mn/strings.xml
@@ -1,26 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2016 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Бүтэн дэлгэцийн камер руу сэлгэх"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Камерын урьдчилан үзэх рүү сэлгэх"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Урд талын камер руу сэлгэх"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Ар талын камер руу сэлгэх"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"Зураг авах"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Зураг дахин авах"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">Бүтэн дэлгэцийн камер руу сэлгэх</string>
+  <string name="description_camera_switch_preview_screen">Камерын урьдчилан үзэх рүү сэлгэх</string>
+  <string name="description_camera_switch_camera_facing">Урд талын камер руу сэлгэх</string>
+  <string name="description_camera_switch_camera_rear">Ар талын камер руу сэлгэх</string>
+  <string name="description_camera_take_picture">Зураг авах</string>
+  <string name="description_camera_cancel_photo">Зураг дахин авах</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-mr/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-mr/strings.xml
index 24c1931..24861da 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-mr/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-mr/strings.xml
@@ -1,26 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2016 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"पूर्ण स्क्रीन कॅमेर्‍यावर स्विच करा"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"कॅमेरा पूर्वावलोकनावर स्विच करा"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"समोरील कॅमऱ्यावर स्विच करा"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"मागील कॅमेर्‍यावर स्‍विच करा"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"फोटो घ्‍या"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"फोटो पुन्हा घ्या"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">पूर्ण स्क्रीन कॅमेर्‍यावर स्विच करा</string>
+  <string name="description_camera_switch_preview_screen">कॅमेरा पूर्वावलोकनावर स्विच करा</string>
+  <string name="description_camera_switch_camera_facing">समोरील कॅमऱ्यावर स्विच करा</string>
+  <string name="description_camera_switch_camera_rear">मागील कॅमेर्‍यावर स्‍विच करा</string>
+  <string name="description_camera_take_picture">फोटो घ्‍या</string>
+  <string name="description_camera_cancel_photo">फोटो पुन्हा घ्या</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-ms/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-ms/strings.xml
index 44806f5..8e20330 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-ms/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-ms/strings.xml
@@ -1,26 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2016 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Beralih ke kamera skrin penuh"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Beralih ke pratonton kamera"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Beralih ke kamera menghadap depan"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Beralih ke kamera menghadap belakang"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"Ambil foto"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Ambil semula foto"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">Beralih ke kamera skrin penuh</string>
+  <string name="description_camera_switch_preview_screen">Beralih ke pratonton kamera</string>
+  <string name="description_camera_switch_camera_facing">Beralih ke kamera menghadap depan</string>
+  <string name="description_camera_switch_camera_rear">Beralih ke kamera menghadap belakang</string>
+  <string name="description_camera_take_picture">Ambil foto</string>
+  <string name="description_camera_cancel_photo">Ambil semula foto</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-my/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-my/strings.xml
index 7112abc..8ea803e 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-my/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-my/strings.xml
@@ -1,26 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2016 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"မျက်နှာပြင်အပြည့်ကင်မရာသို့ ပြောင်းရန်"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"ကင်မရာအစမ်းကြည့်ရှုမှုသို့ ပြောင်းရန်"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"အရှေ့ကင်မရာသို့ ပြောင်းရန်"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"အနောက်ကင်မရာသို့ ပြောင်းရန်"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"ဓာတ်ပုံရိုက်ရန်"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"ဓာတ်ပုံပြန်ရိုက်ရန်"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">မျက်နှာပြင်အပြည့်ကင်မရာသို့ ပြောင်းရန်</string>
+  <string name="description_camera_switch_preview_screen">ကင်မရာအစမ်းကြည့်ရှုမှုသို့ ပြောင်းရန်</string>
+  <string name="description_camera_switch_camera_facing">အရှေ့ကင်မရာသို့ ပြောင်းရန်</string>
+  <string name="description_camera_switch_camera_rear">အနောက်ကင်မရာသို့ ပြောင်းရန်</string>
+  <string name="description_camera_take_picture">ဓာတ်ပုံရိုက်ရန်</string>
+  <string name="description_camera_cancel_photo">ဓာတ်ပုံပြန်ရိုက်ရန်</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-nb/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-nb/strings.xml
index 5e5fb60..3292345 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-nb/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-nb/strings.xml
@@ -1,26 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2016 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Bytt til fullskjermkamera"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Bytt til forhåndsvisning for kamera"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Bytt til frontkamera"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Bytt til bakovervendt kamera"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"Ta bilde"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Ta bilde på nytt"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">Bytt til fullskjermkamera</string>
+  <string name="description_camera_switch_preview_screen">Bytt til forhåndsvisning for kamera</string>
+  <string name="description_camera_switch_camera_facing">Bytt til frontkamera</string>
+  <string name="description_camera_switch_camera_rear">Bytt til bakovervendt kamera</string>
+  <string name="description_camera_take_picture">Ta bilde</string>
+  <string name="description_camera_cancel_photo">Ta bilde på nytt</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-ne/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-ne/strings.xml
index d8ea795..f124b4d 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-ne/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-ne/strings.xml
@@ -1,26 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2016 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"पूर्ण स्क्रिन क्यामेरामा बदल्नुहोस्"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"क्यामेराको पूर्वावलोकन मोडमा बदल्नुहोस्"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"अगाडिपट्टिको क्यामेरामा बदल्नुहोस्"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"पछाडिपट्टिको क्यामेरामा बदल्नुहोस्"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"तस्बिर खिच्नुहोस्"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"पुन: तस्बिर खिच्नुहोस्"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">पूर्ण स्क्रिन क्यामेरामा बदल्नुहोस्</string>
+  <string name="description_camera_switch_preview_screen">क्यामेराको पूर्वावलोकन मोडमा बदल्नुहोस्</string>
+  <string name="description_camera_switch_camera_facing">अगाडिपट्टिको क्यामेरामा बदल्नुहोस्</string>
+  <string name="description_camera_switch_camera_rear">पछाडिपट्टिको क्यामेरामा बदल्नुहोस्</string>
+  <string name="description_camera_take_picture">तस्बिर खिच्नुहोस्</string>
+  <string name="description_camera_cancel_photo">पुन: तस्बिर खिच्नुहोस्</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-nl/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-nl/strings.xml
index 0369fed..69d9a73 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-nl/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-nl/strings.xml
@@ -1,26 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2016 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Overschakelen naar camera op volledig scherm"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Overschakelen naar cameravoorbeeld"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Overschakelen naar camera aan voorzijde"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Overschakelen naar camera aan achterzijde"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"Foto maken"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Foto opnieuw maken"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">Overschakelen naar camera op volledig scherm</string>
+  <string name="description_camera_switch_preview_screen">Overschakelen naar cameravoorbeeld</string>
+  <string name="description_camera_switch_camera_facing">Overschakelen naar camera aan voorzijde</string>
+  <string name="description_camera_switch_camera_rear">Overschakelen naar camera aan achterzijde</string>
+  <string name="description_camera_take_picture">Foto maken</string>
+  <string name="description_camera_cancel_photo">Foto opnieuw maken</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-no/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-no/strings.xml
index 5e5fb60..3292345 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-no/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-no/strings.xml
@@ -1,26 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2016 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Bytt til fullskjermkamera"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Bytt til forhåndsvisning for kamera"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Bytt til frontkamera"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Bytt til bakovervendt kamera"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"Ta bilde"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Ta bilde på nytt"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">Bytt til fullskjermkamera</string>
+  <string name="description_camera_switch_preview_screen">Bytt til forhåndsvisning for kamera</string>
+  <string name="description_camera_switch_camera_facing">Bytt til frontkamera</string>
+  <string name="description_camera_switch_camera_rear">Bytt til bakovervendt kamera</string>
+  <string name="description_camera_take_picture">Ta bilde</string>
+  <string name="description_camera_cancel_photo">Ta bilde på nytt</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-pa/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-pa/strings.xml
index e1247e0..6ed0529 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-pa/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-pa/strings.xml
@@ -1,26 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2016 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"ਬਦਲੀ ਕਰਕੇ ਸੰਪੂਰਨ ਸਕ੍ਰੀਨ ਕੈਮਰੇ \'ਤੇ ਜਾਓ"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"ਬਦਲੀ ਕਰਕੇ ਕੈਮਰਾ ਪੂਰਵ-ਝਲਕ \'ਤੇ ਜਾਓ"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"ਬਦਲੀ ਕਰਕੇ ਮੂਹਰਲੇ ਕੈਮਰੇ \'ਤੇ ਜਾਓ"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"ਬਦਲੀ ਕਰਕੇ ਪਿਛਲੇ ਕੈਮਰੇ \'ਤੇ ਜਾਓ"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"ਫ਼ੋਟੋ ਖਿੱਚੋ"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"ਫ਼ੋਟੋ ਮੁੜ-ਖਿੱਚੋ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">ਬਦਲੀ ਕਰਕੇ ਸੰਪੂਰਨ ਸਕ੍ਰੀਨ ਕੈਮਰੇ \'ਤੇ ਜਾਓ</string>
+  <string name="description_camera_switch_preview_screen">ਬਦਲੀ ਕਰਕੇ ਕੈਮਰਾ ਪੂਰਵ-ਝਲਕ \'ਤੇ ਜਾਓ</string>
+  <string name="description_camera_switch_camera_facing">ਬਦਲੀ ਕਰਕੇ ਮੂਹਰਲੇ ਕੈਮਰੇ \'ਤੇ ਜਾਓ</string>
+  <string name="description_camera_switch_camera_rear">ਬਦਲੀ ਕਰਕੇ ਪਿਛਲੇ ਕੈਮਰੇ \'ਤੇ ਜਾਓ</string>
+  <string name="description_camera_take_picture">ਫ਼ੋਟੋ ਖਿੱਚੋ</string>
+  <string name="description_camera_cancel_photo">ਫ਼ੋਟੋ ਮੁੜ-ਖਿੱਚੋ</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-pl/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-pl/strings.xml
index b85afa6..f9922a3 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-pl/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-pl/strings.xml
@@ -1,26 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2016 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Przełącz na aparat pełnoekranowy"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Przełącz na podgląd aparatu"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Przełącz na przedni aparat"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Przełącz na tylny aparat"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"Zrób zdjęcie"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Zrób nowe zdjęcie"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">Przełącz na aparat pełnoekranowy</string>
+  <string name="description_camera_switch_preview_screen">Przełącz na podgląd aparatu</string>
+  <string name="description_camera_switch_camera_facing">Przełącz na przedni aparat</string>
+  <string name="description_camera_switch_camera_rear">Przełącz na tylny aparat</string>
+  <string name="description_camera_take_picture">Zrób zdjęcie</string>
+  <string name="description_camera_cancel_photo">Zrób nowe zdjęcie</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-pt-rBR/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-pt-rBR/strings.xml
index 59f457c..6f26785 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-pt-rBR/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-pt-rBR/strings.xml
@@ -1,26 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2016 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Alternar para câmera em tela cheia"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Alternar para visualização da câmera"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Alternar para câmera frontal"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Alternar para câmera traseira"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"Tirar foto"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Tirar foto novamente"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">Alternar para câmera em tela cheia</string>
+  <string name="description_camera_switch_preview_screen">Alternar para visualização da câmera</string>
+  <string name="description_camera_switch_camera_facing">Alternar para câmera frontal</string>
+  <string name="description_camera_switch_camera_rear">Alternar para câmera traseira</string>
+  <string name="description_camera_take_picture">Tirar foto</string>
+  <string name="description_camera_cancel_photo">Tirar foto novamente</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-pt-rPT/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-pt-rPT/strings.xml
index 71f651d..252d0c0 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-pt-rPT/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-pt-rPT/strings.xml
@@ -1,26 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2016 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Mudar para a câmara de ecrã completo"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Mudar para a pré-visualização da câmara"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Mudar para a câmara frontal"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Mudar para a câmara traseira"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"Tirar foto"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Tirar nova foto"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">Mudar para a câmara de ecrã completo</string>
+  <string name="description_camera_switch_preview_screen">Mudar para a pré-visualização da câmara</string>
+  <string name="description_camera_switch_camera_facing">Mudar para a câmara frontal</string>
+  <string name="description_camera_switch_camera_rear">Mudar para a câmara traseira</string>
+  <string name="description_camera_take_picture">Tirar foto</string>
+  <string name="description_camera_cancel_photo">Tirar nova foto</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-pt/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-pt/strings.xml
index 59f457c..6f26785 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-pt/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-pt/strings.xml
@@ -1,26 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2016 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Alternar para câmera em tela cheia"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Alternar para visualização da câmera"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Alternar para câmera frontal"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Alternar para câmera traseira"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"Tirar foto"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Tirar foto novamente"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">Alternar para câmera em tela cheia</string>
+  <string name="description_camera_switch_preview_screen">Alternar para visualização da câmera</string>
+  <string name="description_camera_switch_camera_facing">Alternar para câmera frontal</string>
+  <string name="description_camera_switch_camera_rear">Alternar para câmera traseira</string>
+  <string name="description_camera_take_picture">Tirar foto</string>
+  <string name="description_camera_cancel_photo">Tirar foto novamente</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-ro/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-ro/strings.xml
index f491f28..31f7f39 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-ro/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-ro/strings.xml
@@ -1,26 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2016 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Comutați la camera pe ecran complet"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Comutați la previzualizarea camerei"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Comutați la camera frontală"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Comutați la camera posterioară"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"Fotografiați"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Refaceți fotografia"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">Comutați la camera pe ecran complet</string>
+  <string name="description_camera_switch_preview_screen">Comutați la previzualizarea camerei</string>
+  <string name="description_camera_switch_camera_facing">Comutați la camera frontală</string>
+  <string name="description_camera_switch_camera_rear">Comutați la camera posterioară</string>
+  <string name="description_camera_take_picture">Fotografiați</string>
+  <string name="description_camera_cancel_photo">Refaceți fotografia</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-ru/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-ru/strings.xml
index 9de3cab..a165b72 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-ru/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-ru/strings.xml
@@ -1,26 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2016 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Переключиться в полноэкранный режим"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Переключиться в режим предварительного просмотра"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Переключиться на фронтальную камеру"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Переключиться на основную камеру"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"Сделать снимок"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Новый снимок"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">Переключиться в полноэкранный режим</string>
+  <string name="description_camera_switch_preview_screen">Переключиться в режим предварительного просмотра</string>
+  <string name="description_camera_switch_camera_facing">Переключиться на фронтальную камеру</string>
+  <string name="description_camera_switch_camera_rear">Переключиться на основную камеру</string>
+  <string name="description_camera_take_picture">Сделать снимок</string>
+  <string name="description_camera_cancel_photo">Новый снимок</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-si/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-si/strings.xml
index 1747d1a..9df3f72 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-si/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-si/strings.xml
@@ -1,26 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2016 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"පූර්ණ තිර කැමරාව වෙත මාරුවීම"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"කැමරා පෙරදසුන වෙත මාරුවීම"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"ඉදිරිපසට මුහුණලා ඇති කැමරාව වෙත මාරුවීම"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"පසුපසට මුහුණලා ඇති කැමරාව වෙත මාරුවීම"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"ඡායාරූපය ගැනීම"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"ඡායාරූපය නැවත ගැනීම"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">පූර්ණ තිර කැමරාව වෙත මාරුවීම</string>
+  <string name="description_camera_switch_preview_screen">කැමරා පෙරදසුන වෙත මාරුවීම</string>
+  <string name="description_camera_switch_camera_facing">ඉදිරිපසට මුහුණලා ඇති කැමරාව වෙත මාරුවීම</string>
+  <string name="description_camera_switch_camera_rear">පසුපසට මුහුණලා ඇති කැමරාව වෙත මාරුවීම</string>
+  <string name="description_camera_take_picture">ඡායාරූපය ගැනීම</string>
+  <string name="description_camera_cancel_photo">ඡායාරූපය නැවත ගැනීම</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-sk/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-sk/strings.xml
index a053e2f..f22e973 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-sk/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-sk/strings.xml
@@ -1,26 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2016 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Prepnúť na fotoaparát na celej obrazovke"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Prepnúť na ukážku z fotoaparátu"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Prepnúť na predný fotoaparát"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Prepnúť na zadný fotoaparát"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"Odfotiť"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Znova odfotiť"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">Prepnúť na fotoaparát na celej obrazovke</string>
+  <string name="description_camera_switch_preview_screen">Prepnúť na ukážku z fotoaparátu</string>
+  <string name="description_camera_switch_camera_facing">Prepnúť na predný fotoaparát</string>
+  <string name="description_camera_switch_camera_rear">Prepnúť na zadný fotoaparát</string>
+  <string name="description_camera_take_picture">Odfotiť</string>
+  <string name="description_camera_cancel_photo">Znova odfotiť</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-sl/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-sl/strings.xml
index b50aaae..8c48877 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-sl/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-sl/strings.xml
@@ -1,26 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2016 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Preklopi v celozaslonski način fotoaparata"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Preklopi v predogled fotoaparata"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Preklopi na fotoaparat na sprednji strani"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Preklopi na fotoaparat na zadnji strani"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"Posnemi fotografijo"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Znova posnemi fotografijo"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">Preklopi v celozaslonski način fotoaparata</string>
+  <string name="description_camera_switch_preview_screen">Preklopi v predogled fotoaparata</string>
+  <string name="description_camera_switch_camera_facing">Preklopi na fotoaparat na sprednji strani</string>
+  <string name="description_camera_switch_camera_rear">Preklopi na fotoaparat na zadnji strani</string>
+  <string name="description_camera_take_picture">Posnemi fotografijo</string>
+  <string name="description_camera_cancel_photo">Znova posnemi fotografijo</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-sq/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-sq/strings.xml
index 4be0317..e5c7e84 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-sq/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-sq/strings.xml
@@ -1,26 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2016 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Kalo në kamerën me ekran të plotë"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Kalo te pamja paraprake e kamerës"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Kalo te kamera e përparme"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Kalo te kamera e pasme"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"Bëj një fotografi"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Bëje përsëri fotografinë"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">Kalo në kamerën me ekran të plotë</string>
+  <string name="description_camera_switch_preview_screen">Kalo te pamja paraprake e kamerës</string>
+  <string name="description_camera_switch_camera_facing">Kalo te kamera e përparme</string>
+  <string name="description_camera_switch_camera_rear">Kalo te kamera e pasme</string>
+  <string name="description_camera_take_picture">Bëj një fotografi</string>
+  <string name="description_camera_cancel_photo">Bëje përsëri fotografinë</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-sr/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-sr/strings.xml
index 4afcbe9..d592070 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-sr/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-sr/strings.xml
@@ -1,26 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2016 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Пребаците на приказ камере преко целог екрана"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Пребаците на преглед камере"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Пребаците на предњу камеру"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Пребаците на задњу камеру"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"Снимите слику"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Поново снимите слику"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">Пребаците на приказ камере преко целог екрана</string>
+  <string name="description_camera_switch_preview_screen">Пребаците на преглед камере</string>
+  <string name="description_camera_switch_camera_facing">Пребаците на предњу камеру</string>
+  <string name="description_camera_switch_camera_rear">Пребаците на задњу камеру</string>
+  <string name="description_camera_take_picture">Снимите слику</string>
+  <string name="description_camera_cancel_photo">Поново снимите слику</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-sv/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-sv/strings.xml
index 8bd00cc..b65d9f7 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-sv/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-sv/strings.xml
@@ -1,26 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2016 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Växla till helskärmskamera"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Växla till förhandsgranskning i kameran"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Växla till den framåtvända kameran"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Växla till den bakåtvända kameran"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"Ta en bild"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Ta en ny bild"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">Växla till helskärmskamera</string>
+  <string name="description_camera_switch_preview_screen">Växla till förhandsgranskning i kameran</string>
+  <string name="description_camera_switch_camera_facing">Växla till den framåtvända kameran</string>
+  <string name="description_camera_switch_camera_rear">Växla till den bakåtvända kameran</string>
+  <string name="description_camera_take_picture">Ta en bild</string>
+  <string name="description_camera_cancel_photo">Ta en ny bild</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-sw/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-sw/strings.xml
index c951ac6..cb2a3f7 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-sw/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-sw/strings.xml
@@ -1,26 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2016 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Badili utumie kamera ya skrini nzima"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Badili utumie onyesha la kuchungulia la kamera"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Badili utumie kamera ya mbele"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Badili utumie kamera ya nyuma"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"Piga picha"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Piga picha tena"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">Badili utumie kamera ya skrini nzima</string>
+  <string name="description_camera_switch_preview_screen">Badili utumie onyesha la kuchungulia la kamera</string>
+  <string name="description_camera_switch_camera_facing">Badili utumie kamera ya mbele</string>
+  <string name="description_camera_switch_camera_rear">Badili utumie kamera ya nyuma</string>
+  <string name="description_camera_take_picture">Piga picha</string>
+  <string name="description_camera_cancel_photo">Piga picha tena</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-ta/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-ta/strings.xml
index 374cfcf..84b281d 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-ta/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-ta/strings.xml
@@ -1,26 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2016 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"முழுத் திரை கேமராவிற்கு மாறும் பொத்தான்"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"கேமரா மாதிரிக்காட்சிக்கு மாறும் பொத்தான்"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"முன்பக்க கேமராவிற்கு மாறும் பொத்தான்"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"பின்பக்க கேமராவிற்கு மாறும் பொத்தான்"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"படமெடுக்கும் பொத்தான்"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"மீண்டும் படமெடுக்கும் பொத்தான்"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">முழுத் திரை கேமராவிற்கு மாறும் பொத்தான்</string>
+  <string name="description_camera_switch_preview_screen">கேமரா மாதிரிக்காட்சிக்கு மாறும் பொத்தான்</string>
+  <string name="description_camera_switch_camera_facing">முன்பக்க கேமராவிற்கு மாறும் பொத்தான்</string>
+  <string name="description_camera_switch_camera_rear">பின்பக்க கேமராவிற்கு மாறும் பொத்தான்</string>
+  <string name="description_camera_take_picture">படமெடுக்கும் பொத்தான்</string>
+  <string name="description_camera_cancel_photo">மீண்டும் படமெடுக்கும் பொத்தான்</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-te/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-te/strings.xml
index 099fa67..0890b16 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-te/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-te/strings.xml
@@ -1,26 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2016 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"పూర్తి స్క్రీన్ కెమెరాకు మారుస్తుంది"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"కెమెరా పరిదృశ్యానికి మారుస్తుంది"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"ముందువైపు కెమెరాకు మారుస్తుంది"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"వెనుకవైపు కెమెరాకు మారుస్తుంది"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"ఫోటో తీస్తుంది"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"ఫోటోను మళ్లీ తీస్తుంది"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">పూర్తి స్క్రీన్ కెమెరాకు మారుస్తుంది</string>
+  <string name="description_camera_switch_preview_screen">కెమెరా పరిదృశ్యానికి మారుస్తుంది</string>
+  <string name="description_camera_switch_camera_facing">ముందువైపు కెమెరాకు మారుస్తుంది</string>
+  <string name="description_camera_switch_camera_rear">వెనుకవైపు కెమెరాకు మారుస్తుంది</string>
+  <string name="description_camera_take_picture">ఫోటో తీస్తుంది</string>
+  <string name="description_camera_cancel_photo">ఫోటోను మళ్లీ తీస్తుంది</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-th/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-th/strings.xml
index 62c69a3..f86dc9e 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-th/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-th/strings.xml
@@ -1,26 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2016 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"เปลี่ยนเป็นกล้องแบบเต็มหน้าจอ"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"เปลี่ยนเป็นการแสดงตัวอย่างจากกล้อง"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"เปลี่ยนเป็นกล้องหน้า"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"เปลี่ยนเป็นกล้องหลัง"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"ถ่ายภาพ"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"ถ่ายภาพอีกครั้ง"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">เปลี่ยนเป็นกล้องแบบเต็มหน้าจอ</string>
+  <string name="description_camera_switch_preview_screen">เปลี่ยนเป็นการแสดงตัวอย่างจากกล้อง</string>
+  <string name="description_camera_switch_camera_facing">เปลี่ยนเป็นกล้องหน้า</string>
+  <string name="description_camera_switch_camera_rear">เปลี่ยนเป็นกล้องหลัง</string>
+  <string name="description_camera_take_picture">ถ่ายภาพ</string>
+  <string name="description_camera_cancel_photo">ถ่ายภาพอีกครั้ง</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-tl/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-tl/strings.xml
index 2f6fb83..bce0d0a 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-tl/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-tl/strings.xml
@@ -1,26 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2016 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Lumipat sa camera na full screen"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Lumipat sa preview ng camera"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Lumipat sa camera na nasa harap"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Lumipat sa camera na nasa likod"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"Kumuha ng larawan"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Kunang muli"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">Lumipat sa camera na full screen</string>
+  <string name="description_camera_switch_preview_screen">Lumipat sa preview ng camera</string>
+  <string name="description_camera_switch_camera_facing">Lumipat sa camera na nasa harap</string>
+  <string name="description_camera_switch_camera_rear">Lumipat sa camera na nasa likod</string>
+  <string name="description_camera_take_picture">Kumuha ng larawan</string>
+  <string name="description_camera_cancel_photo">Kunang muli</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-tr/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-tr/strings.xml
index da54ac8..80aee30 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-tr/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-tr/strings.xml
@@ -1,26 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2016 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Tam ekran kameraya geçer"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Kamera önizlemesine geçer"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Ön kameraya geçer"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Arka kameraya geçer"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"Fotoğraf çeker"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Fotoğrafı yeniden çeker"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">Tam ekran kameraya geçer</string>
+  <string name="description_camera_switch_preview_screen">Kamera önizlemesine geçer</string>
+  <string name="description_camera_switch_camera_facing">Ön kameraya geçer</string>
+  <string name="description_camera_switch_camera_rear">Arka kameraya geçer</string>
+  <string name="description_camera_take_picture">Fotoğraf çeker</string>
+  <string name="description_camera_cancel_photo">Fotoğrafı yeniden çeker</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-uk/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-uk/strings.xml
index cea540a..2c22eac 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-uk/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-uk/strings.xml
@@ -1,26 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2016 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Показ зображення з камери на весь екран"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Попередній перегляд зображення з камери"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Перейти до фронтальної камери"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Перейти до задньої камери"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"Зробити фото"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Зробити фото ще раз"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">Показ зображення з камери на весь екран</string>
+  <string name="description_camera_switch_preview_screen">Попередній перегляд зображення з камери</string>
+  <string name="description_camera_switch_camera_facing">Перейти до фронтальної камери</string>
+  <string name="description_camera_switch_camera_rear">Перейти до задньої камери</string>
+  <string name="description_camera_take_picture">Зробити фото</string>
+  <string name="description_camera_cancel_photo">Зробити фото ще раз</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-ur/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-ur/strings.xml
index 585a55a..5c96d6a 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-ur/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-ur/strings.xml
@@ -1,26 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2016 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"پوری اسکرین کے کیمرہ پر سوئچ کریں"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"کیمرہ پیش منظر پر سوئچ کریں"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"فرنٹ والے کیمرے پر سوئچ کریں"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"عقب والے کیمرے پر سوئچ کریں"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"تصویر لیں"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"دوبارہ تصویر لیں"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">پوری اسکرین کے کیمرہ پر سوئچ کریں</string>
+  <string name="description_camera_switch_preview_screen">کیمرہ پیش منظر پر سوئچ کریں</string>
+  <string name="description_camera_switch_camera_facing">فرنٹ والے کیمرے پر سوئچ کریں</string>
+  <string name="description_camera_switch_camera_rear">عقب والے کیمرے پر سوئچ کریں</string>
+  <string name="description_camera_take_picture">تصویر لیں</string>
+  <string name="description_camera_cancel_photo">دوبارہ تصویر لیں</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-uz/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-uz/strings.xml
index 8441d88..4341ae5 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-uz/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-uz/strings.xml
@@ -1,26 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2016 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"To‘liq ekranli rejimga o‘tish"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Oldindan ko‘rish rejimiga o‘tish"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Old kamerani yoqish"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Orqa kamerani yoqish"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"Rasmga olish"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Yangi rasmga olish"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">To‘liq ekranli rejimga o‘tish</string>
+  <string name="description_camera_switch_preview_screen">Razm solish rejimiga o‘tish</string>
+  <string name="description_camera_switch_camera_facing">Old kamerani yoqish</string>
+  <string name="description_camera_switch_camera_rear">Orqa kamerani yoqish</string>
+  <string name="description_camera_take_picture">Rasmga olish</string>
+  <string name="description_camera_cancel_photo">Yangi rasmga olish</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-vi/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-vi/strings.xml
index 0546664..9c89d8b 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-vi/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-vi/strings.xml
@@ -1,26 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2016 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Chuyển sang máy ảnh toàn màn hình"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Chuyển sang chế độ xem trước máy ảnh"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Chuyển sang máy ảnh mặt trước"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Chuyển sang máy ảnh mặt sau"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"Chụp ảnh"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Chụp lại ảnh"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">Chuyển sang máy ảnh toàn màn hình</string>
+  <string name="description_camera_switch_preview_screen">Chuyển sang chế độ xem trước máy ảnh</string>
+  <string name="description_camera_switch_camera_facing">Chuyển sang máy ảnh mặt trước</string>
+  <string name="description_camera_switch_camera_rear">Chuyển sang máy ảnh mặt sau</string>
+  <string name="description_camera_take_picture">Chụp ảnh</string>
+  <string name="description_camera_cancel_photo">Chụp lại ảnh</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-zh-rCN/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-zh-rCN/strings.xml
index 24e9c1a..b44f430 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-zh-rCN/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-zh-rCN/strings.xml
@@ -1,26 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2016 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"切换到全屏相机模式"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"切换到相机预览模式"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"切换到前置摄像头"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"切换到后置摄像头"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"拍照"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"重拍照片"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">切换到全屏相机模式</string>
+  <string name="description_camera_switch_preview_screen">切换到相机预览模式</string>
+  <string name="description_camera_switch_camera_facing">切换到前置摄像头</string>
+  <string name="description_camera_switch_camera_rear">切换到后置摄像头</string>
+  <string name="description_camera_take_picture">拍照</string>
+  <string name="description_camera_cancel_photo">重拍照片</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-zh-rHK/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-zh-rHK/strings.xml
index 0310b10..393c45f 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-zh-rHK/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-zh-rHK/strings.xml
@@ -1,26 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2016 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"切換至全螢幕相機"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"切換至相機預覽"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"切換至前置鏡頭"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"切換至後置鏡頭"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"拍照"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"重新拍照"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">切換至全螢幕相機</string>
+  <string name="description_camera_switch_preview_screen">切換至相機預覽</string>
+  <string name="description_camera_switch_camera_facing">切換至前置鏡頭</string>
+  <string name="description_camera_switch_camera_rear">切換至後置鏡頭</string>
+  <string name="description_camera_take_picture">拍照</string>
+  <string name="description_camera_cancel_photo">重新拍照</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-zh-rTW/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-zh-rTW/strings.xml
index d41ddda..5cd51ee 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-zh-rTW/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-zh-rTW/strings.xml
@@ -1,26 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2016 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"切換至全螢幕相機"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"切換至相機預覽畫面"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"切換至前置鏡頭"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"切換至後置鏡頭"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"拍照"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"重新拍照"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">切換至全螢幕相機</string>
+  <string name="description_camera_switch_preview_screen">切換至相機預覽畫面</string>
+  <string name="description_camera_switch_camera_facing">切換至前置鏡頭</string>
+  <string name="description_camera_switch_camera_rear">切換至後置鏡頭</string>
+  <string name="description_camera_take_picture">拍照</string>
+  <string name="description_camera_cancel_photo">重新拍照</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-zu/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-zu/strings.xml
index 6e147b7..0c6dafc 100644
--- a/java/com/android/dialer/callcomposer/cameraui/res/values-zu/strings.xml
+++ b/java/com/android/dialer/callcomposer/cameraui/res/values-zu/strings.xml
@@ -1,26 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2016 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_camera_switch_full_screen" msgid="835509743097428216">"Shintshela kukhamera yesikrini esigcwele"</string>
-    <string name="description_camera_switch_preview_screen" msgid="2575355782470181047">"Shintshela ekuhloleni kuqala kwekhamera"</string>
-    <string name="description_camera_switch_camera_facing" msgid="6831946148788764412">"Shintshela kwikhamera yangaphambili"</string>
-    <string name="description_camera_switch_camera_rear" msgid="644854053851698293">"Shintshela kwikhamera ebheke emuva"</string>
-    <string name="description_camera_take_picture" msgid="3953639532118936286">"Thatha isithombe"</string>
-    <string name="description_camera_cancel_photo" msgid="2759593421176396701">"Thatha kabusha isithombe"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="description_camera_switch_full_screen">Shintshela kukhamera yesikrini esigcwele</string>
+  <string name="description_camera_switch_preview_screen">Shintshela ekuhloleni kuqala kwekhamera</string>
+  <string name="description_camera_switch_camera_facing">Shintshela kwikhamera yangaphambili</string>
+  <string name="description_camera_switch_camera_rear">Shintshela kwikhamera ebheke emuva</string>
+  <string name="description_camera_take_picture">Thatha isithombe</string>
+  <string name="description_camera_cancel_photo">Thatha kabusha isithombe</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/drawable/call_composer_contact_border.xml b/java/com/android/dialer/callcomposer/res/drawable/call_composer_contact_border.xml
index b3c36e9..16afed4 100644
--- a/java/com/android/dialer/callcomposer/res/drawable/call_composer_contact_border.xml
+++ b/java/com/android/dialer/callcomposer/res/drawable/call_composer_contact_border.xml
@@ -20,7 +20,7 @@
 
   <stroke
     android:width="@dimen/call_composer_contact_photo_border_thickness"
-    android:color="@color/background_dialer_white"/>
+    android:color="?android:attr/colorBackground"/>
 
   <padding
     android:bottom="@dimen/call_composer_contact_photo_border_thickness"
diff --git a/java/com/android/dialer/callcomposer/res/drawable/gallery_grid_item_view_background.xml b/java/com/android/dialer/callcomposer/res/drawable/gallery_grid_item_view_background.xml
index bbae1a8..f571608 100644
--- a/java/com/android/dialer/callcomposer/res/drawable/gallery_grid_item_view_background.xml
+++ b/java/com/android/dialer/callcomposer/res/drawable/gallery_grid_item_view_background.xml
@@ -18,5 +18,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
   android:shape="rectangle">
   <corners android:radius="@dimen/gallery_item_corner_radius"/>
-  <solid android:color="@color/background_dialer_white"/>
+  <solid android:color="?android:attr/colorBackground"/>
 </shape>
diff --git a/java/com/android/dialer/callcomposer/res/drawable/gallery_item_selected_drawable.xml b/java/com/android/dialer/callcomposer/res/drawable/gallery_item_selected_drawable.xml
index 5050407..6e726c8 100644
--- a/java/com/android/dialer/callcomposer/res/drawable/gallery_item_selected_drawable.xml
+++ b/java/com/android/dialer/callcomposer/res/drawable/gallery_item_selected_drawable.xml
@@ -20,9 +20,9 @@
       android:shape="oval">
       <stroke
         android:width="1dp"
-        android:color="@color/dialer_theme_color"/>
+        android:color="?android:attr/colorPrimary"/>
       <solid
-        android:color="@color/background_dialer_white"/>
+        android:color="?android:attr/colorBackground"/>
       <size
         android:height="@dimen/gallery_check_size"
         android:width="@dimen/gallery_check_size"/>
@@ -32,6 +32,6 @@
     <bitmap
       android:gravity="center"
       android:src="@drawable/quantum_ic_check_black_24"
-      android:tint="@color/dialer_theme_color"/>
+      android:tint="?android:attr/colorPrimary"/>
   </item>
 </layer-list>
\ No newline at end of file
diff --git a/java/com/android/dialer/callcomposer/res/layout/call_composer_activity.xml b/java/com/android/dialer/callcomposer/res/layout/call_composer_activity.xml
index 48d6368..8b982b9 100644
--- a/java/com/android/dialer/callcomposer/res/layout/call_composer_activity.xml
+++ b/java/com/android/dialer/callcomposer/res/layout/call_composer_activity.xml
@@ -45,7 +45,7 @@
         android:paddingBottom="@dimen/call_composer_contact_container_padding_bottom"
         android:paddingStart="16dp"
         android:paddingEnd="16dp"
-        android:background="@color/dialer_theme_color">
+        android:background="?android:attr/colorPrimary">
 
         <TextView
           android:id="@+id/contact_name"
@@ -54,18 +54,16 @@
           android:gravity="center"
           android:maxLines="1"
           android:ellipsize="end"
-          android:textColor="@color/background_dialer_white"
+          android:textColor="?android:attr/textColorPrimaryInverse"
           android:textSize="@dimen/call_composer_name_text_size"/>
 
-        <TextView
+        <com.android.dialer.widget.BidiTextView
           android:id="@+id/phone_number"
           android:layout_width="match_parent"
           android:layout_height="wrap_content"
           android:gravity="center"
-          android:maxLines="1"
-          android:ellipsize="end"
-          android:textColor="@color/background_dialer_white"
-          android:textSize="@dimen/call_composer_number_text_size"/>
+          android:textColor="?android:attr/textColorPrimaryInverse"
+          style="@style/Dialer.TextAppearance.Primary"/>
       </LinearLayout>
 
       <QuickContactBadge
@@ -105,7 +103,7 @@
         android:layout_height="@dimen/call_composer_media_bar_height"
         android:orientation="horizontal"
         android:gravity="center_horizontal"
-        android:background="@color/dialer_theme_color_dark"
+        android:background="?android:attr/colorPrimaryDark"
         android:clickable="true">
 
       <ImageView
@@ -151,9 +149,8 @@
           android:drawablePadding="@dimen/send_and_call_drawable_padding"
           android:textAllCaps="true"
           android:text="@string/share_and_call"
-          android:textSize="@dimen/send_and_call_text_size"
-          android:fontFamily="sans-serif-medium"
-          android:textColor="@color/background_dialer_white"/>
+          style="@style/Dialer.TextAppearance.Header2"
+          android:textColor="?android:attr/textColorPrimaryInverse"/>
     </FrameLayout>
   </FrameLayout>
 
diff --git a/java/com/android/dialer/callcomposer/res/layout/fragment_gallery_composer.xml b/java/com/android/dialer/callcomposer/res/layout/fragment_gallery_composer.xml
index 6cd6418..72b9fa6 100644
--- a/java/com/android/dialer/callcomposer/res/layout/fragment_gallery_composer.xml
+++ b/java/com/android/dialer/callcomposer/res/layout/fragment_gallery_composer.xml
@@ -18,7 +18,7 @@
   xmlns:android="http://schemas.android.com/apk/res/android"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
-  android:background="@color/background_dialer_white"
+  android:background="?android:attr/colorBackground"
   android:paddingBottom="@dimen/call_composer_media_bar_height">
 
   <GridView
diff --git a/java/com/android/dialer/callcomposer/res/layout/fragment_message_composer.xml b/java/com/android/dialer/callcomposer/res/layout/fragment_message_composer.xml
index 39c2d0d..6255e72 100644
--- a/java/com/android/dialer/callcomposer/res/layout/fragment_message_composer.xml
+++ b/java/com/android/dialer/callcomposer/res/layout/fragment_message_composer.xml
@@ -20,7 +20,7 @@
     android:layout_height="@dimen/call_composer_view_pager_height"
     android:orientation="vertical"
     android:gravity="bottom"
-    android:background="@color/background_dialer_white">
+    android:background="?android:attr/colorBackground">
 
   <TextView
       android:id="@+id/message_urgent"
@@ -64,9 +64,9 @@
       android:paddingBottom="64dp"
       android:textSize="@dimen/message_compose_item_text_size"
       android:hint="@string/message_composer_custom_message_hint"
-      android:textColor="@color/dialer_primary_text_color"
-      android:textColorHint="@color/dialer_edit_text_hint_color"
-      android:background="@color/background_dialer_white"
+      android:textColor="?android:attr/textColorPrimary"
+      android:textColorHint="?android:attr/textColorHint"
+      android:background="?android:attr/colorBackground"
       android:textCursorDrawable="@drawable/searchedittext_custom_cursor"
       android:layout_toStartOf="@+id/remaining_characters"
       android:inputType="textShortMessage|textCapSentences"
@@ -81,6 +81,6 @@
         android:layout_alignParentEnd="true"
         android:layout_centerVertical="true"
         android:textSize="@dimen/message_compose_remaining_char_text_size"
-        android:textColor="@color/dialer_edit_text_hint_color"/>
+        android:textColor="?android:attr/textColorHint"/>
   </RelativeLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/java/com/android/dialer/callcomposer/res/layout/permission_view.xml b/java/com/android/dialer/callcomposer/res/layout/permission_view.xml
index 4daa11d..4248046 100644
--- a/java/com/android/dialer/callcomposer/res/layout/permission_view.xml
+++ b/java/com/android/dialer/callcomposer/res/layout/permission_view.xml
@@ -20,7 +20,7 @@
   android:layout_height="match_parent"
   android:gravity="center"
   android:clickable="true"
-  android:background="@color/background_dialer_white">
+  android:background="?android:attr/colorBackground">
 
   <ImageView
     android:id="@+id/permission_icon"
@@ -33,7 +33,7 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_marginTop="@dimen/permission_item_margin"
-    style="@style/TextAppearanceMedium"/>
+    style="@style/Dialer.TextAppearance.Header2"/>
 
   <TextView
     android:id="@+id/allow"
@@ -45,7 +45,7 @@
     android:text="@string/allow"
     android:textAllCaps="true"
     android:textSize="@dimen/allow_permission_text_size"
-    android:textColor="@color/dialer_theme_color"
+    android:textColor="?android:attr/colorPrimary"
     android:background="?android:attr/selectableItemBackground"
     android:padding="@dimen/permission_allow_padding"
     android:theme="@style/Theme.AppCompat.Light"/>
diff --git a/java/com/android/dialer/callcomposer/res/values-af/strings.xml b/java/com/android/dialer/callcomposer/res/values-af/strings.xml
index fd7cd5b..ad84a0b 100644
--- a/java/com/android/dialer/callcomposer/res/values-af/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-af/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="urgent" msgid="5271653973625093934">"Dringend! Antwoord asseblief!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"Wil jy klets?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"Vinnige vragie …"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"Skryf \'n gepasmaakte boodskap"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"Stuur en bel"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"Deel en bel"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"prent <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"prent"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"Kon nie kameraprent laai nie"</string>
-    <string name="allow" msgid="8637148297403066623">"Laat toe"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"Verleen toegang tot kamera om \'n foto te neem"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"Verleen toegang tot media om \'n prent te deel"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"Neem \'n foto"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"Kies \'n foto"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"Stuur \'n boodskap"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"Foto is via Boodskappe gestuur"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"Boodskap is via Boodskappe gestuur"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Stuur tans prent …"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">Dringend! Antwoord asseblief!</string>
+  <string name="want_to_chat">Wil jy klets?</string>
+  <string name="quick_question">Vinnige vragie …</string>
+  <string name="message_composer_custom_message_hint">Skryf \'n gepasmaakte boodskap</string>
+  <string name="send_and_call">Stuur en bel</string>
+  <string name="share_and_call">Deel en bel</string>
+  <string name="gallery_item_description">prent %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">prent</string>
+  <string name="camera_media_failure">Kon nie kameraprent laai nie</string>
+  <string name="allow">Laat toe</string>
+  <string name="camera_permission_text">Verleen toegang tot kamera om \'n foto te neem</string>
+  <string name="gallery_permission_text">Verleen toegang tot media om \'n prent te deel</string>
+  <string name="description_call_composer_camera">Neem \'n foto</string>
+  <string name="description_call_composer_photo">Kies \'n foto</string>
+  <string name="description_call_composer_message">Stuur \'n boodskap</string>
+  <string name="image_sent_messages">Foto is via Boodskappe gestuur</string>
+  <string name="message_sent_messages">Boodskap is via Boodskappe gestuur</string>
+  <string name="call_composer_image_uploading">Stuur tans prent …</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-am/strings.xml b/java/com/android/dialer/callcomposer/res/values-am/strings.xml
index b412109..2e76b6e 100644
--- a/java/com/android/dialer/callcomposer/res/values-am/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-am/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="urgent" msgid="5271653973625093934">"አስቸኳይ! እባክዎ ያንሱ!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"ለመወያየት ይፈልጋሉ?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"ፈጣን ጥያቄ…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"ብጁ መልዕክት ይጻፉ"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"ይላኩ እንዲሁም ይደውሉ"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"ያጋሩ እና ይደውሉ"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"ምስል <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"ምስል"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"የካሜራ ምስልን መጫን አልተቻለም"</string>
-    <string name="allow" msgid="8637148297403066623">"ፍቀድ"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"ፎቶ ያንሱ፣ ለካሜራ መዳረሻ ይስጡ"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"አንድ ምስል ለማጋራት ለማህደረ መረጃ መዳረሻ ይስጡ"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"ፎቶ ያንሱ"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"ፎቶ ይምረጡ"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"መልዕክት ይላኩ"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"ፎቶ በመልዕክቶች በኩል ተልኳል"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"መልዕክት በመልዕክቶች በኩል ተልኳል"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"ምስል በመላክ ላይ…"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">አስቸኳይ! እባክዎ ያንሱ!</string>
+  <string name="want_to_chat">ለመወያየት ይፈልጋሉ?</string>
+  <string name="quick_question">ፈጣን ጥያቄ…</string>
+  <string name="message_composer_custom_message_hint">ብጁ መልዕክት ይጻፉ</string>
+  <string name="send_and_call">ይላኩ እንዲሁም ይደውሉ</string>
+  <string name="share_and_call">ያጋሩ እና ይደውሉ</string>
+  <string name="gallery_item_description">ምስል %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">ምስል</string>
+  <string name="camera_media_failure">የካሜራ ምስልን መጫን አልተቻለም</string>
+  <string name="allow">ፍቀድ</string>
+  <string name="camera_permission_text">ፎቶ ያንሱ፣ ለካሜራ መዳረሻ ይስጡ</string>
+  <string name="gallery_permission_text">አንድ ምስል ለማጋራት ለማህደረ መረጃ መዳረሻ ይስጡ</string>
+  <string name="description_call_composer_camera">ፎቶ ያንሱ</string>
+  <string name="description_call_composer_photo">ፎቶ ይምረጡ</string>
+  <string name="description_call_composer_message">መልዕክት ይላኩ</string>
+  <string name="image_sent_messages">ፎቶ በመልዕክቶች በኩል ተልኳል</string>
+  <string name="message_sent_messages">መልዕክት በመልዕክቶች በኩል ተልኳል</string>
+  <string name="call_composer_image_uploading">ምስል በመላክ ላይ…</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-ar/strings.xml b/java/com/android/dialer/callcomposer/res/values-ar/strings.xml
index ee811bd..bff15c5 100644
--- a/java/com/android/dialer/callcomposer/res/values-ar/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-ar/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="urgent" msgid="5271653973625093934">"عاجل! يُرجى الرد!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"هل تريد الدردشة؟"</string>
-    <string name="quick_question" msgid="3501160802390214092">"سؤال سريع…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"كتابة رسالة مخصصة"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"الإرسال والاتصال"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"المشاركة والاتصال"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"الصورة <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"صورة"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"يتعذر تحميل صورة الكاميرا"</string>
-    <string name="allow" msgid="8637148297403066623">"سماح"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"لالتقاط صورة، يجب منح إذن بالدخول إلى الكاميرا"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"لمشاركة صورة، يجب منح إذن بالدخول إلى الوسائط"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"التقاط صورة"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"اختيار صورة"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"إرسال رسالة"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"‏صورة مرسلة عبر Messages"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"‏رسالة مرسلة عبر Messages"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"جارٍ إرسال الصورة..."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">عاجل! يُرجى الرد!</string>
+  <string name="want_to_chat">هل تريد المحادثة؟</string>
+  <string name="quick_question">سؤال سريع…</string>
+  <string name="message_composer_custom_message_hint">كتابة رسالة مخصصة</string>
+  <string name="send_and_call">الإرسال والاتصال</string>
+  <string name="share_and_call">المشاركة والاتصال</string>
+  <string name="gallery_item_description">الصورة %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">صورة</string>
+  <string name="camera_media_failure">يتعذر تحميل صورة الكاميرا</string>
+  <string name="allow">سماح</string>
+  <string name="camera_permission_text">لالتقاط صورة، يجب منح إذن بالدخول إلى الكاميرا</string>
+  <string name="gallery_permission_text">لمشاركة صورة، يجب منح إذن بالدخول إلى الوسائط</string>
+  <string name="description_call_composer_camera">التقاط صورة</string>
+  <string name="description_call_composer_photo">اختيار صورة</string>
+  <string name="description_call_composer_message">إرسال رسالة</string>
+  <string name="image_sent_messages">‏صورة مرسلة عبر Messages</string>
+  <string name="message_sent_messages">‏رسالة مرسلة عبر Messages</string>
+  <string name="call_composer_image_uploading">جارٍ إرسال الصورة...</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-az/strings.xml b/java/com/android/dialer/callcomposer/res/values-az/strings.xml
index 2d1a26c..d1629a4 100644
--- a/java/com/android/dialer/callcomposer/res/values-az/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-az/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="urgent" msgid="5271653973625093934">"Təcili! Lütfən, götürün!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"Söhbət etmək istəyirsiniz?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"Tez sual..."</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"Fərdi mesaj yazın"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"Göndərin və zəng edin"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"Paylaşın və zəng edin"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"şəkil <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"şəkil"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"Kamera şəklini yükləmək olmur"</string>
-    <string name="allow" msgid="8637148297403066623">"İcazə verin"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"Şəkil çəkmək üçün kameraya giriş icazəsi verin"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"Şəkli paylaşmaq üçün Mediaya giriş icazəsi verin"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"Şəkil çəkin"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"Foto seçin"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"Mesaj göndərin"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"Foto Mesajlaşma tətbiqi vasitəsilə göndərildi"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"Mesaj Mesajlaşma tətbiqi vasitəsilə göndərildi"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Şəkil göndərilir..."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">Təcili! Lütfən, götürün!</string>
+  <string name="want_to_chat">Söhbət etmək istəyirsiniz?</string>
+  <string name="quick_question">Tez sual...</string>
+  <string name="message_composer_custom_message_hint">Fərdi mesaj yazın</string>
+  <string name="send_and_call">Göndərin və zəng edin</string>
+  <string name="share_and_call">Paylaşın və zəng edin</string>
+  <string name="gallery_item_description">şəkil %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">şəkil</string>
+  <string name="camera_media_failure">Kamera şəklini yükləmək olmur</string>
+  <string name="allow">İcazə verin</string>
+  <string name="camera_permission_text">Şəkil çəkmək üçün kameraya giriş icazəsi verin</string>
+  <string name="gallery_permission_text">Şəkli paylaşmaq üçün Mediaya giriş icazəsi verin</string>
+  <string name="description_call_composer_camera">Şəkil çəkin</string>
+  <string name="description_call_composer_photo">Foto seçin</string>
+  <string name="description_call_composer_message">Mesaj göndərin</string>
+  <string name="image_sent_messages">Foto Mesajlaşma tətbiqi vasitəsilə göndərildi</string>
+  <string name="message_sent_messages">Mesaj Mesajlaşma tətbiqi vasitəsilə göndərildi</string>
+  <string name="call_composer_image_uploading">Şəkil göndərilir...</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-b+sr+Latn/strings.xml b/java/com/android/dialer/callcomposer/res/values-b+sr+Latn/strings.xml
index fbe93d2..cb251602 100644
--- a/java/com/android/dialer/callcomposer/res/values-b+sr+Latn/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-b+sr+Latn/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="urgent" msgid="5271653973625093934">"Hitno je! Javi se!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"Želiš da ćaskaš?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"Kratko pitanje…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"Napišite prilagođenu poruku"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"Pošalji i pozovi"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"Deli i pozovi"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"slika, <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"slika"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"Učitavanje slike sa kamere nije uspelo"</string>
-    <string name="allow" msgid="8637148297403066623">"Dozvoli"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"Odobrite pristup Kameri da biste snimili sliku"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"Odobrite pristup Medijima da biste delili sliku"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"Slikajte"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"Izaberite sliku"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"Pošaljite poruku"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"Slika je poslata preko Messages-a"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"Poruka je poslata preko Messages-a"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Šalje se slika…"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">Hitno je! Javi se!</string>
+  <string name="want_to_chat">Želiš da ćaskaš?</string>
+  <string name="quick_question">Kratko pitanje…</string>
+  <string name="message_composer_custom_message_hint">Napišite prilagođenu poruku</string>
+  <string name="send_and_call">Pošalji i pozovi</string>
+  <string name="share_and_call">Deli i pozovi</string>
+  <string name="gallery_item_description">slika, %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">slika</string>
+  <string name="camera_media_failure">Učitavanje slike sa kamere nije uspelo</string>
+  <string name="allow">Dozvoli</string>
+  <string name="camera_permission_text">Odobrite pristup Kameri da biste snimili sliku</string>
+  <string name="gallery_permission_text">Odobrite pristup Medijima da biste delili sliku</string>
+  <string name="description_call_composer_camera">Slikajte</string>
+  <string name="description_call_composer_photo">Izaberite sliku</string>
+  <string name="description_call_composer_message">Pošaljite poruku</string>
+  <string name="image_sent_messages">Slika je poslata preko Messages-a</string>
+  <string name="message_sent_messages">Poruka je poslata preko Messages-a</string>
+  <string name="call_composer_image_uploading">Šalje se slika…</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-be/strings.xml b/java/com/android/dialer/callcomposer/res/values-be/strings.xml
index 5197f71..2abe02b 100644
--- a/java/com/android/dialer/callcomposer/res/values-be/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-be/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="urgent" msgid="5271653973625093934">"Тэрмінова! Падніміце слухаўку!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"Хочаце паразмаўляць у чаце?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"Хуткае пытанне…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"Напісаць карыстальніцкае паведамленне"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"Адправіць і пазваніць"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"Абагуліць і выклікаць"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"відарыс <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"відарыс"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"Не ўдалося загрузіць відарыс з камеры"</string>
-    <string name="allow" msgid="8637148297403066623">"Дазволіць"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"Каб зрабіць фота, адкрыйце доступ да Камеры"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"Каб абагуліць відарыс, адкрыйце доступ да медыяфайлаў"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"Зрабіць фота"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"Выбраць фота"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"Адправіць паведамленне"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"Фота адпраўлена праз праграму \"Паведамленні\""</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"Паведамленне адпраўлена праз праграму \"Паведамленні\""</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Адпраўка відарыса..."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">Тэрмінова! Падніміце слухаўку!</string>
+  <string name="want_to_chat">Хочаце паразмаўляць у чаце?</string>
+  <string name="quick_question">Хуткае пытанне…</string>
+  <string name="message_composer_custom_message_hint">Напісаць карыстальніцкае паведамленне</string>
+  <string name="send_and_call">Адправіць і пазваніць</string>
+  <string name="share_and_call">Абагуліць і выклікаць</string>
+  <string name="gallery_item_description">відарыс %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">відарыс</string>
+  <string name="camera_media_failure">Не ўдалося загрузіць відарыс з камеры</string>
+  <string name="allow">Дазволіць</string>
+  <string name="camera_permission_text">Каб зрабіць фота, адкрыйце доступ да Камеры</string>
+  <string name="gallery_permission_text">Каб абагуліць відарыс, адкрыйце доступ да медыяфайлаў</string>
+  <string name="description_call_composer_camera">Зрабіць фота</string>
+  <string name="description_call_composer_photo">Выбраць фота</string>
+  <string name="description_call_composer_message">Адправіць паведамленне</string>
+  <string name="image_sent_messages">Фота адпраўлена праз праграму \"Паведамленні\"</string>
+  <string name="message_sent_messages">Паведамленне адпраўлена праз праграму \"Паведамленні\"</string>
+  <string name="call_composer_image_uploading">Адпраўка відарыса...</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-bg/strings.xml b/java/com/android/dialer/callcomposer/res/values-bg/strings.xml
index 7b431ce..c79e534 100644
--- a/java/com/android/dialer/callcomposer/res/values-bg/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-bg/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="urgent" msgid="5271653973625093934">"Спешно! Моля, вдигнете!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"Искате да разговаряте?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"Кратък въпрос…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"Напишете свое съобщение"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"Изпращане и обаждане"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"Споделяне и обаждане"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"изображение от <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"изображение"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"Изображението от камерата не можа да се зареди"</string>
-    <string name="allow" msgid="8637148297403066623">"Разрешаване"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"За да направите снимка, разрешете достъп до Камера"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"За да споделите изображение, разрешете достъп до Медии"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"Правене на снимка"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"Избиране на снимка"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"Изпращане на съобщение"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"Снимката е изпратена чрез Messages"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"Съобщението е изпратено чрез Messages"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Изображението се изпраща…"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">Спешно! Моля, вдигнете!</string>
+  <string name="want_to_chat">Искате да разговаряте?</string>
+  <string name="quick_question">Кратък въпрос…</string>
+  <string name="message_composer_custom_message_hint">Напишете свое съобщение</string>
+  <string name="send_and_call">Изпращане и обаждане</string>
+  <string name="share_and_call">Споделяне и обаждане</string>
+  <string name="gallery_item_description">изображение от %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">изображение</string>
+  <string name="camera_media_failure">Изображението от камерата не можа да се зареди</string>
+  <string name="allow">Разрешаване</string>
+  <string name="camera_permission_text">За да направите снимка, разрешете достъп до Камера</string>
+  <string name="gallery_permission_text">За да споделите изображение, разрешете достъп до Медии</string>
+  <string name="description_call_composer_camera">Правене на снимка</string>
+  <string name="description_call_composer_photo">Избиране на снимка</string>
+  <string name="description_call_composer_message">Изпращане на съобщение</string>
+  <string name="image_sent_messages">Снимката е изпратена чрез Messages</string>
+  <string name="message_sent_messages">Съобщението е изпратено чрез Messages</string>
+  <string name="call_composer_image_uploading">Изображението се изпраща…</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-bn/strings.xml b/java/com/android/dialer/callcomposer/res/values-bn/strings.xml
index 17559b4..5855304 100644
--- a/java/com/android/dialer/callcomposer/res/values-bn/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-bn/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="urgent" msgid="5271653973625093934">"জরুরী! অনুগ্রহ করে কলটি ধরুন!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"চ্যাট করতে চান?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"দ্রুত প্রশ্ন…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"একটি কাস্টম বার্তা লিখুন"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"পাঠান এবং কল করুন"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"শেয়ার এবং কল করুন"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"ছবি <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"ছবি"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"ক্যামেরার ছবি লোড করা গেল না"</string>
-    <string name="allow" msgid="8637148297403066623">"অনুমতি দিন"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"একটি ফটো নিতে, ক্যামেরাতে অ্যাক্সেস দিন"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"কোনো ছবি শেয়ার করতে, মিডিয়াতে অ্যাক্সেস দিন"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"একটি ছবি তুলুন"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"একটি ফটো বেছে নিন"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"একটি বার্তা পাঠান"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"Messages এর সাহায্যে ফটো পাঠানো হয়েছে"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"Messages-এর সাহায্যে বার্তা পাঠানো হয়েছে"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"ফটো পাঠানো হচ্ছে…"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">জরুরী! অনুগ্রহ করে কলটি ধরুন!</string>
+  <string name="want_to_chat">চ্যাট করতে চান?</string>
+  <string name="quick_question">দ্রুত প্রশ্ন…</string>
+  <string name="message_composer_custom_message_hint">একটি কাস্টম বার্তা লিখুন</string>
+  <string name="send_and_call">পাঠান এবং কল করুন</string>
+  <string name="share_and_call">শেয়ার এবং কল করুন</string>
+  <string name="gallery_item_description">ছবি %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">ছবি</string>
+  <string name="camera_media_failure">ক্যামেরার ছবি লোড করা গেল না</string>
+  <string name="allow">অনুমতি দিন</string>
+  <string name="camera_permission_text">একটি ফটো নিতে, ক্যামেরাতে অ্যাক্সেস দিন</string>
+  <string name="gallery_permission_text">কোনো ছবি শেয়ার করতে, মিডিয়াতে অ্যাক্সেস দিন</string>
+  <string name="description_call_composer_camera">একটি ছবি তুলুন</string>
+  <string name="description_call_composer_photo">একটি ফটো বেছে নিন</string>
+  <string name="description_call_composer_message">একটি বার্তা পাঠান</string>
+  <string name="image_sent_messages">Messages এর সাহায্যে ফটো পাঠানো হয়েছে</string>
+  <string name="message_sent_messages">Messages-এর সাহায্যে বার্তা পাঠানো হয়েছে</string>
+  <string name="call_composer_image_uploading">ফটো পাঠানো হচ্ছে…</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-bs/strings.xml b/java/com/android/dialer/callcomposer/res/values-bs/strings.xml
index d486f94..bb8d1d7 100644
--- a/java/com/android/dialer/callcomposer/res/values-bs/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-bs/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="urgent" msgid="5271653973625093934">"Hitno! Javite se!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"Želite li razgovarati?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"Kratko pitanje…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"Napišite prilagođenu poruku"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"Pošalji i pozovi"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"Podijeli i pozovi"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"slika <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"slika"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"Nije moguće učitati sliku s kamere"</string>
-    <string name="allow" msgid="8637148297403066623">"Dozvoli"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"Da snimite fotografiju, dajte pristup Kameri"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"Da podijelite sliku, dozvolite pristup Medijima"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"Uslikaj"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"Odaberi fotografiju"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"Pošalji poruku"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"Fotografija je poslana putem aplikacije Messages"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"Poruka je poslana putem aplikacije Messages"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Slanje slike…"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">Hitno! Javite se!</string>
+  <string name="want_to_chat">Želite li razgovarati?</string>
+  <string name="quick_question">Kratko pitanje…</string>
+  <string name="message_composer_custom_message_hint">Napišite prilagođenu poruku</string>
+  <string name="send_and_call">Pošalji i pozovi</string>
+  <string name="share_and_call">Dijeli i pozovi</string>
+  <string name="gallery_item_description">slika %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">slika</string>
+  <string name="camera_media_failure">Nije moguće učitati sliku s kamere</string>
+  <string name="allow">Dozvoli</string>
+  <string name="camera_permission_text">Da snimite fotografiju, dajte pristup Kameri</string>
+  <string name="gallery_permission_text">Da podijelite sliku, dozvolite pristup Medijima</string>
+  <string name="description_call_composer_camera">Snimi fotografiju</string>
+  <string name="description_call_composer_photo">Odaberi fotografiju</string>
+  <string name="description_call_composer_message">Pošalji poruku</string>
+  <string name="image_sent_messages">Fotografija je poslana putem aplikacije Messages</string>
+  <string name="message_sent_messages">Poruka je poslana putem aplikacije Messages</string>
+  <string name="call_composer_image_uploading">Slanje slike…</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-ca/strings.xml b/java/com/android/dialer/callcomposer/res/values-ca/strings.xml
index 6b77b18..7ee0b86 100644
--- a/java/com/android/dialer/callcomposer/res/values-ca/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-ca/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="urgent" msgid="5271653973625093934">"És urgent! Respon!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"Vols xatejar?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"Una pregunta ràpida…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"Escriu un miss. personalitzat"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"Envia i truca"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"Comparteix i truca"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"imatge del dia <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"imatge"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"No s\'ha pogut carregar la imatge de la càmera"</string>
-    <string name="allow" msgid="8637148297403066623">"Permet"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"Per fer una foto, dona accés a la càmera"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"Per compartir una imatge, dona accés al contingut multimèdia"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"Fes una foto"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"Tria una foto"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"Envia un missatge"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"Foto enviada mitjançant Missatges"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"Missatge enviat mitjançant Missatges"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"S\'està enviant la imatge…"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">És urgent! Respon!</string>
+  <string name="want_to_chat">Vols xatejar?</string>
+  <string name="quick_question">Una pregunta ràpida…</string>
+  <string name="message_composer_custom_message_hint">Escriu un miss. personalitzat</string>
+  <string name="send_and_call">Envia i truca</string>
+  <string name="share_and_call">Comparteix i truca</string>
+  <string name="gallery_item_description">imatge del dia %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">imatge</string>
+  <string name="camera_media_failure">No s\'ha pogut carregar la imatge de la càmera</string>
+  <string name="allow">Permet</string>
+  <string name="camera_permission_text">Per fer una foto, dona accés a la càmera</string>
+  <string name="gallery_permission_text">Per compartir una imatge, dona accés al contingut multimèdia</string>
+  <string name="description_call_composer_camera">Fes una foto</string>
+  <string name="description_call_composer_photo">Tria una foto</string>
+  <string name="description_call_composer_message">Envia un missatge</string>
+  <string name="image_sent_messages">Foto enviada mitjançant Missatges</string>
+  <string name="message_sent_messages">Missatge enviat mitjançant Missatges</string>
+  <string name="call_composer_image_uploading">S\'està enviant la imatge…</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-cs/strings.xml b/java/com/android/dialer/callcomposer/res/values-cs/strings.xml
index 9169537..77ecb08 100644
--- a/java/com/android/dialer/callcomposer/res/values-cs/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-cs/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="urgent" msgid="5271653973625093934">"Zvedni to prosím, je to naléhavé!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"Nechceš si popovídat?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"Chci se jen na něco rychle zeptat…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"Napište vlastní zprávu"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"Poslat a zavolat"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"Sdílet a zavolat"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"obrázek <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"obrázek"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"Obrázek z fotoaparátu se nepodařilo načíst"</string>
-    <string name="allow" msgid="8637148297403066623">"Povolit"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"Chcete-li pořídit fotku, povolte přístup k fotoaparátu"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"Pokud chcete sdílet fotku, povolte přístup k mediálním souborům"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"Vyfotit"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"Vybrat fotku"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"Poslat zprávu"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"Fotka poslaná v aplikaci Zprávy"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"Zpráva poslaná v aplikaci Zprávy"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Odesílání obrázku…"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">Zvedni to prosím, je to naléhavé!</string>
+  <string name="want_to_chat">Nechceš si popovídat?</string>
+  <string name="quick_question">Chci se jen na něco rychle zeptat…</string>
+  <string name="message_composer_custom_message_hint">Napište vlastní zprávu</string>
+  <string name="send_and_call">Poslat a zavolat</string>
+  <string name="share_and_call">Sdílet a zavolat</string>
+  <string name="gallery_item_description">obrázek %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">obrázek</string>
+  <string name="camera_media_failure">Obrázek z fotoaparátu se nepodařilo načíst</string>
+  <string name="allow">Povolit</string>
+  <string name="camera_permission_text">Chcete-li pořídit fotku, povolte přístup k fotoaparátu</string>
+  <string name="gallery_permission_text">Pokud chcete sdílet fotku, povolte přístup k mediálním souborům</string>
+  <string name="description_call_composer_camera">Vyfotit</string>
+  <string name="description_call_composer_photo">Vybrat fotku</string>
+  <string name="description_call_composer_message">Poslat zprávu</string>
+  <string name="image_sent_messages">Fotka poslaná v aplikaci Zprávy</string>
+  <string name="message_sent_messages">Zpráva poslaná v aplikaci Zprávy</string>
+  <string name="call_composer_image_uploading">Odesílání obrázku…</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-da/strings.xml b/java/com/android/dialer/callcomposer/res/values-da/strings.xml
index f720d59..3299ee8 100644
--- a/java/com/android/dialer/callcomposer/res/values-da/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-da/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="urgent" msgid="5271653973625093934">"Det haster. Besvar opkaldet!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"Har du lyst til at chatte?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"Et hurtigt spørgsmål…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"Skriv en tilpasset besked"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"Send og ring"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"Del og ring"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"billede <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"billede"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"Kamerabilledet kan ikke indlæses"</string>
-    <string name="allow" msgid="8637148297403066623">"Tillad"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"Du skal give adgang til kameraet for at tage et billede"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"Du skal give adgang til medier for at dele et billede"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"Tag et billede"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"Vælg et billede"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"Send en sms"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"Fotoet blev sendt via Beskeder"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"Beskeden blev sendt via Beskeder"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Billedet sendes…"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">Det haster. Besvar opkaldet!</string>
+  <string name="want_to_chat">Har du lyst til at chatte?</string>
+  <string name="quick_question">Et hurtigt spørgsmål…</string>
+  <string name="message_composer_custom_message_hint">Skriv en tilpasset besked</string>
+  <string name="send_and_call">Send og ring</string>
+  <string name="share_and_call">Del og ring</string>
+  <string name="gallery_item_description">billede %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">billede</string>
+  <string name="camera_media_failure">Kamerabilledet kan ikke indlæses</string>
+  <string name="allow">Tillad</string>
+  <string name="camera_permission_text">Du skal give adgang til kameraet for at tage et billede</string>
+  <string name="gallery_permission_text">Du skal give adgang til medier for at dele et billede</string>
+  <string name="description_call_composer_camera">Tag et billede</string>
+  <string name="description_call_composer_photo">Vælg et billede</string>
+  <string name="description_call_composer_message">Send en sms</string>
+  <string name="image_sent_messages">Fotoet blev sendt via Beskeder</string>
+  <string name="message_sent_messages">Beskeden blev sendt via Beskeder</string>
+  <string name="call_composer_image_uploading">Billedet sendes…</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-de/strings.xml b/java/com/android/dialer/callcomposer/res/values-de/strings.xml
index 3f3767e..16f7f5b 100644
--- a/java/com/android/dialer/callcomposer/res/values-de/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-de/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="urgent" msgid="5271653973625093934">"Dringend! Bitte annehmen!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"Möchtest du chatten?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"Kurze Frage…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"Eigene Nachricht schreiben"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"Senden und anrufen"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"Teilen und anrufen"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"Bild: <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"Bild"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"Kamerabild konnte nicht geladen werden"</string>
-    <string name="allow" msgid="8637148297403066623">"Zulassen"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"Um ein Foto aufzunehmen, musst du den Zugriff auf die Kamera erlauben."</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"Um ein Bild zu teilen, musst du den Zugriff auf deine Medien erlauben."</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"Bild aufnehmen"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"Foto auswählen"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"Nachricht senden"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"Foto über Messages gesendet"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"Nachricht über Messages gesendet."</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Bild wird gesendet…"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">Dringend! Bitte annehmen!</string>
+  <string name="want_to_chat">Möchtest du chatten?</string>
+  <string name="quick_question">Kurze Frage…</string>
+  <string name="message_composer_custom_message_hint">Eigene Nachricht schreiben</string>
+  <string name="send_and_call">Senden und anrufen</string>
+  <string name="share_and_call">Teilen und anrufen</string>
+  <string name="gallery_item_description">Bild: %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">Bild</string>
+  <string name="camera_media_failure">Kamerabild konnte nicht geladen werden</string>
+  <string name="allow">Zulassen</string>
+  <string name="camera_permission_text">Um ein Foto aufzunehmen, musst du den Zugriff auf die Kamera erlauben.</string>
+  <string name="gallery_permission_text">Um ein Bild zu teilen, musst du den Zugriff auf deine Medien erlauben.</string>
+  <string name="description_call_composer_camera">Bild aufnehmen</string>
+  <string name="description_call_composer_photo">Foto auswählen</string>
+  <string name="description_call_composer_message">Nachricht senden</string>
+  <string name="image_sent_messages">Foto über Messages gesendet</string>
+  <string name="message_sent_messages">Nachricht über Messages gesendet.</string>
+  <string name="call_composer_image_uploading">Bild wird gesendet…</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-el/strings.xml b/java/com/android/dialer/callcomposer/res/values-el/strings.xml
index 9a8ed5d..fcd658e 100644
--- a/java/com/android/dialer/callcomposer/res/values-el/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-el/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="urgent" msgid="5271653973625093934">"Επείγον! Παρακαλώ απαντήστε!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"Θέλετε να συζητήσετε;"</string>
-    <string name="quick_question" msgid="3501160802390214092">"Γρήγορη ερώτηση…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"Γράψτε ένα προσαρμ. μήνυμα"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"Αποστολή και κλήση"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"Κοινοποίηση και κλήση"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"εικόνα <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"εικόνα"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"Δεν ήταν δυνατή η φόρτωση της εικόνας φωτογραφικής μηχανής"</string>
-    <string name="allow" msgid="8637148297403066623">"Να επιτρέπεται"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"Για να τραβήξετε μια φωτογραφία, παραχωρήστε πρόσβαση στην κάμερα"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"Για να μοιραστείτε μια εικόνα, παραχωρήστε πρόσβαση στα πολυμέσα"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"Λήψη φωτογραφίας"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"Επιλογή φωτογραφίας"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"Αποστολή μηνύματος"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"Η φωτογραφία στάλθηκε μέσω του Messages"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"Το μήνυμα στάλθηκε μέσω του Messages"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Αποστολή εικόνας…"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">Επείγον! Παρακαλώ απαντήστε!</string>
+  <string name="want_to_chat">Θέλετε να συζητήσετε;</string>
+  <string name="quick_question">Γρήγορη ερώτηση…</string>
+  <string name="message_composer_custom_message_hint">Γράψτε ένα προσαρμ. μήνυμα</string>
+  <string name="send_and_call">Αποστολή και κλήση</string>
+  <string name="share_and_call">Κοινοποίηση και κλήση</string>
+  <string name="gallery_item_description">εικόνα %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">εικόνα</string>
+  <string name="camera_media_failure">Δεν ήταν δυνατή η φόρτωση της εικόνας φωτογραφικής μηχανής</string>
+  <string name="allow">Να επιτρέπεται</string>
+  <string name="camera_permission_text">Για να τραβήξετε μια φωτογραφία, παραχωρήστε πρόσβαση στην κάμερα</string>
+  <string name="gallery_permission_text">Για να μοιραστείτε μια εικόνα, παραχωρήστε πρόσβαση στα πολυμέσα</string>
+  <string name="description_call_composer_camera">Λήψη φωτογραφίας</string>
+  <string name="description_call_composer_photo">Επιλογή φωτογραφίας</string>
+  <string name="description_call_composer_message">Αποστολή μηνύματος</string>
+  <string name="image_sent_messages">Η φωτογραφία στάλθηκε μέσω του Messages</string>
+  <string name="message_sent_messages">Το μήνυμα στάλθηκε μέσω του Messages</string>
+  <string name="call_composer_image_uploading">Αποστολή εικόνας…</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-en-rAU/strings.xml b/java/com/android/dialer/callcomposer/res/values-en-rAU/strings.xml
index 4e4edcf..d800742 100644
--- a/java/com/android/dialer/callcomposer/res/values-en-rAU/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-en-rAU/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="urgent" msgid="5271653973625093934">"Urgent! Please answer!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"Want to chat?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"Quick question…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"Write a custom message"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"Send and call"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"Share and call"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"image <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"image"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"Couldn\'t load camera image"</string>
-    <string name="allow" msgid="8637148297403066623">"Allow"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"To take a photo, give access to Camera"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"To share an image, give access to Media"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"Take a picture"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"Choose a photo"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"Sending a message"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"Photo sent via Messages"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"Message sent via Messages"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Sending image…"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">Urgent! Please answer!</string>
+  <string name="want_to_chat">Want to chat?</string>
+  <string name="quick_question">Quick question…</string>
+  <string name="message_composer_custom_message_hint">Write a custom message</string>
+  <string name="send_and_call">Send and call</string>
+  <string name="share_and_call">Share and call</string>
+  <string name="gallery_item_description">image %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">image</string>
+  <string name="camera_media_failure">Couldn\'t load camera image</string>
+  <string name="allow">Allow</string>
+  <string name="camera_permission_text">To take a photo, give access to Camera</string>
+  <string name="gallery_permission_text">To share an image, give access to Media</string>
+  <string name="description_call_composer_camera">Take a picture</string>
+  <string name="description_call_composer_photo">Choose a photo</string>
+  <string name="description_call_composer_message">Sending a message</string>
+  <string name="image_sent_messages">Photo sent via Messages</string>
+  <string name="message_sent_messages">Message sent via Messages</string>
+  <string name="call_composer_image_uploading">Sending image…</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-en-rGB/strings.xml b/java/com/android/dialer/callcomposer/res/values-en-rGB/strings.xml
index 4e4edcf..d800742 100644
--- a/java/com/android/dialer/callcomposer/res/values-en-rGB/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-en-rGB/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="urgent" msgid="5271653973625093934">"Urgent! Please answer!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"Want to chat?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"Quick question…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"Write a custom message"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"Send and call"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"Share and call"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"image <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"image"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"Couldn\'t load camera image"</string>
-    <string name="allow" msgid="8637148297403066623">"Allow"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"To take a photo, give access to Camera"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"To share an image, give access to Media"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"Take a picture"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"Choose a photo"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"Sending a message"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"Photo sent via Messages"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"Message sent via Messages"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Sending image…"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">Urgent! Please answer!</string>
+  <string name="want_to_chat">Want to chat?</string>
+  <string name="quick_question">Quick question…</string>
+  <string name="message_composer_custom_message_hint">Write a custom message</string>
+  <string name="send_and_call">Send and call</string>
+  <string name="share_and_call">Share and call</string>
+  <string name="gallery_item_description">image %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">image</string>
+  <string name="camera_media_failure">Couldn\'t load camera image</string>
+  <string name="allow">Allow</string>
+  <string name="camera_permission_text">To take a photo, give access to Camera</string>
+  <string name="gallery_permission_text">To share an image, give access to Media</string>
+  <string name="description_call_composer_camera">Take a picture</string>
+  <string name="description_call_composer_photo">Choose a photo</string>
+  <string name="description_call_composer_message">Sending a message</string>
+  <string name="image_sent_messages">Photo sent via Messages</string>
+  <string name="message_sent_messages">Message sent via Messages</string>
+  <string name="call_composer_image_uploading">Sending image…</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-en-rIN/strings.xml b/java/com/android/dialer/callcomposer/res/values-en-rIN/strings.xml
index 4e4edcf..d800742 100644
--- a/java/com/android/dialer/callcomposer/res/values-en-rIN/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-en-rIN/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="urgent" msgid="5271653973625093934">"Urgent! Please answer!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"Want to chat?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"Quick question…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"Write a custom message"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"Send and call"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"Share and call"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"image <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"image"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"Couldn\'t load camera image"</string>
-    <string name="allow" msgid="8637148297403066623">"Allow"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"To take a photo, give access to Camera"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"To share an image, give access to Media"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"Take a picture"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"Choose a photo"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"Sending a message"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"Photo sent via Messages"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"Message sent via Messages"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Sending image…"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">Urgent! Please answer!</string>
+  <string name="want_to_chat">Want to chat?</string>
+  <string name="quick_question">Quick question…</string>
+  <string name="message_composer_custom_message_hint">Write a custom message</string>
+  <string name="send_and_call">Send and call</string>
+  <string name="share_and_call">Share and call</string>
+  <string name="gallery_item_description">image %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">image</string>
+  <string name="camera_media_failure">Couldn\'t load camera image</string>
+  <string name="allow">Allow</string>
+  <string name="camera_permission_text">To take a photo, give access to Camera</string>
+  <string name="gallery_permission_text">To share an image, give access to Media</string>
+  <string name="description_call_composer_camera">Take a picture</string>
+  <string name="description_call_composer_photo">Choose a photo</string>
+  <string name="description_call_composer_message">Sending a message</string>
+  <string name="image_sent_messages">Photo sent via Messages</string>
+  <string name="message_sent_messages">Message sent via Messages</string>
+  <string name="call_composer_image_uploading">Sending image…</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-es-rUS/strings.xml b/java/com/android/dialer/callcomposer/res/values-es-rUS/strings.xml
index f06f5f0..9918be8 100644
--- a/java/com/android/dialer/callcomposer/res/values-es-rUS/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-es-rUS/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="urgent" msgid="5271653973625093934">"¡Es urgente! ¡Contesta!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"¿Quieres chatear?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"Pregunta rápida…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"Escribe tu propio mensaje"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"Enviar y llamar"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"Compartir y llamar"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"imagen del <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"imagen"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"No se pudo cargar la imagen de la cámara"</string>
-    <string name="allow" msgid="8637148297403066623">"Permitir"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"Para tomar una foto, permite el acceso a la cámara"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"Para compartir una imagen, permite el acceso al contenido multimedia"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"Tomar una foto"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"Elegir una foto"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"Enviar un mensaje"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"Foto enviada por Mensajes"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"Mensaje de texto enviado por Mensajes"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Enviando imagen…"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">¡Es urgente! ¡Contesta!</string>
+  <string name="want_to_chat">¿Quieres chatear?</string>
+  <string name="quick_question">Pregunta rápida…</string>
+  <string name="message_composer_custom_message_hint">Escribe tu propio mensaje</string>
+  <string name="send_and_call">Enviar y llamar</string>
+  <string name="share_and_call">Compartir y llamar</string>
+  <string name="gallery_item_description">imagen del %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">imagen</string>
+  <string name="camera_media_failure">No se pudo cargar la imagen de la cámara</string>
+  <string name="allow">Permitir</string>
+  <string name="camera_permission_text">Para tomar una foto, permite el acceso a la cámara</string>
+  <string name="gallery_permission_text">Para compartir una imagen, permite el acceso al contenido multimedia</string>
+  <string name="description_call_composer_camera">Tomar una foto</string>
+  <string name="description_call_composer_photo">Elegir una foto</string>
+  <string name="description_call_composer_message">Enviar un mensaje</string>
+  <string name="image_sent_messages">Foto enviada por Mensajes</string>
+  <string name="message_sent_messages">Mensaje de texto enviado por Mensajes</string>
+  <string name="call_composer_image_uploading">Enviando imagen…</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-es/strings.xml b/java/com/android/dialer/callcomposer/res/values-es/strings.xml
index a8b9195..d9f2444 100644
--- a/java/com/android/dialer/callcomposer/res/values-es/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-es/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="urgent" msgid="5271653973625093934">"Por favor, contesta. ¡Es urgente!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"¿Quieres chatear?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"Una pregunta rápida…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"Mensaje personalizado"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"Enviar y llamar"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"Compartir y llamar"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"imagen del <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"imagen"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"No se ha podido cargar la imagen de la cámara"</string>
-    <string name="allow" msgid="8637148297403066623">"Permitir"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"Para hacer una foto, permite el acceso a la cámara"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"Para compartir una imagen, permite el acceso al contenido multimedia"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"Hacer una foto"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"Elegir una foto"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"Enviar un mensaje"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"Foto enviada a través de Mensajes"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"Mensaje enviado a través de Mensajes"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Enviando la imagen…"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">Por favor, contesta. ¡Es urgente!</string>
+  <string name="want_to_chat">¿Quieres chatear?</string>
+  <string name="quick_question">Una pregunta rápida…</string>
+  <string name="message_composer_custom_message_hint">Mensaje personalizado</string>
+  <string name="send_and_call">Enviar y llamar</string>
+  <string name="share_and_call">Compartir y llamar</string>
+  <string name="gallery_item_description">imagen del %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">imagen</string>
+  <string name="camera_media_failure">No se ha podido cargar la imagen de la cámara</string>
+  <string name="allow">Permitir</string>
+  <string name="camera_permission_text">Para hacer una foto, permite el acceso a la cámara</string>
+  <string name="gallery_permission_text">Para compartir una imagen, permite el acceso al contenido multimedia</string>
+  <string name="description_call_composer_camera">Hacer una foto</string>
+  <string name="description_call_composer_photo">Elegir una foto</string>
+  <string name="description_call_composer_message">Enviar un mensaje</string>
+  <string name="image_sent_messages">Foto enviada a través de Mensajes</string>
+  <string name="message_sent_messages">Mensaje enviado a través de Mensajes</string>
+  <string name="call_composer_image_uploading">Enviando la imagen…</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-et/strings.xml b/java/com/android/dialer/callcomposer/res/values-et/strings.xml
index 24548fb..29c908e 100644
--- a/java/com/android/dialer/callcomposer/res/values-et/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-et/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="urgent" msgid="5271653973625093934">"Kiire! Võtke vastu!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"Kas soovite vestelda?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"Kiire küsimus …"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"Kirjutage kohandatud sõnum"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"Saatmine ja helistamine"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"Jaga ja helista"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"pilt: <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"pilt"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"Kaamera kujutist ei õnnestunud laadida"</string>
-    <string name="allow" msgid="8637148297403066623">"Luba"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"Foto jäädvustamiseks lubage juurdepääs kaamerale"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"Pildi jagamiseks lubage juurdepääs meediale"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"Pildistamine"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"Foto valimine"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"Sõnumi saatmine"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"Foto saadeti rakenduse Messages kaudu"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"Sõnum saadeti rakenduse Messages kaudu"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Kujutise saatmine …"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">Kiire! Võtke vastu!</string>
+  <string name="want_to_chat">Kas soovite vestelda?</string>
+  <string name="quick_question">Kiire küsimus …</string>
+  <string name="message_composer_custom_message_hint">Kirjutage kohandatud sõnum</string>
+  <string name="send_and_call">Saatmine ja helistamine</string>
+  <string name="share_and_call">Jaga ja helista</string>
+  <string name="gallery_item_description">pilt: %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">pilt</string>
+  <string name="camera_media_failure">Kaamera kujutist ei õnnestunud laadida</string>
+  <string name="allow">Luba</string>
+  <string name="camera_permission_text">Foto jäädvustamiseks lubage juurdepääs kaamerale</string>
+  <string name="gallery_permission_text">Pildi jagamiseks lubage juurdepääs meediale</string>
+  <string name="description_call_composer_camera">Pildistamine</string>
+  <string name="description_call_composer_photo">Foto valimine</string>
+  <string name="description_call_composer_message">Sõnumi saatmine</string>
+  <string name="image_sent_messages">Foto saadeti rakenduse Messages kaudu</string>
+  <string name="message_sent_messages">Sõnum saadeti rakenduse Messages kaudu</string>
+  <string name="call_composer_image_uploading">Kujutise saatmine …</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-eu/strings.xml b/java/com/android/dialer/callcomposer/res/values-eu/strings.xml
index 012c62c..7ff937c 100644
--- a/java/com/android/dialer/callcomposer/res/values-eu/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-eu/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="urgent" msgid="5271653973625093934">"Premiazkoa! Erantzun ezazu!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"Txateatu nahi duzu?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"Galdera bizkorra…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"Idatzi mezu bat"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"Bidali eta deitu"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"Partekatu eta deitu"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"irudiaren data: <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"irudia"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"Ezin izan da kargatu kamerako irudia"</string>
-    <string name="allow" msgid="8637148297403066623">"Baimendu"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"Argazkiak ateratzeko, eman kamera atzitzeko baimena"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"Irudiak partekatzeko, eman multimedia-edukirako sarbidea"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"Atera argazki bat"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"Aukeratu argazki bat"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"Bidali mezu bat"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"Mezuak aplikazioaren bidez bidali da argazkia"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"Mezuak aplikazioaren bidez bidali da mezua"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Irudia bidaltzen…"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">Premiazkoa! Erantzun ezazu!</string>
+  <string name="want_to_chat">Txateatu nahi duzu?</string>
+  <string name="quick_question">Galdera bizkorra…</string>
+  <string name="message_composer_custom_message_hint">Idatzi mezu bat</string>
+  <string name="send_and_call">Bidali eta deitu</string>
+  <string name="share_and_call">Partekatu eta deitu</string>
+  <string name="gallery_item_description">irudiaren data: %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">irudia</string>
+  <string name="camera_media_failure">Ezin izan da kargatu kamerako irudia</string>
+  <string name="allow">Baimendu</string>
+  <string name="camera_permission_text">Argazkiak ateratzeko, eman kamera atzitzeko baimena</string>
+  <string name="gallery_permission_text">Irudiak partekatzeko, eman multimedia-edukirako sarbidea</string>
+  <string name="description_call_composer_camera">Atera argazki bat</string>
+  <string name="description_call_composer_photo">Aukeratu argazki bat</string>
+  <string name="description_call_composer_message">Bidali mezu bat</string>
+  <string name="image_sent_messages">Mezuak aplikazioaren bidez bidali da argazkia</string>
+  <string name="message_sent_messages">Mezuak aplikazioaren bidez bidali da mezua</string>
+  <string name="call_composer_image_uploading">Irudia bidaltzen…</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-fa/strings.xml b/java/com/android/dialer/callcomposer/res/values-fa/strings.xml
index eb97796..a7d74f4 100644
--- a/java/com/android/dialer/callcomposer/res/values-fa/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-fa/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="urgent" msgid="5271653973625093934">"فوری! لطفاً بردارید!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"می‌خواهید گپ بزنید؟"</string>
-    <string name="quick_question" msgid="3501160802390214092">"سؤال سریع..."</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"پیام سفارشی بنویسید"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"ارسال و تماس"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"اشتراک‌گذاری و تماس"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"تصویر <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"تصویر"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"تصویر دوربین بار نشد"</string>
-    <string name="allow" msgid="8637148297403066623">"مجاز است"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"برای عکس گرفتن، به دوربین اجازه دسترسی بدهید"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"برای اشتراک‌گذاری تصویر، به رسانه اجازه دسترسی بدهید"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"عکس گرفتن"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"انتخاب عکس"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"ارسال پیام"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"عکس ارسال‌شده ازطریق «پیام‌ها»"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"پیام ارسال‌شده ازطریق «پیام‌ها»"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"درحال ارسال تصویر…"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">فوری! لطفاً بردارید!</string>
+  <string name="want_to_chat">می‌خواهید گپ بزنید؟</string>
+  <string name="quick_question">سؤال سریع...</string>
+  <string name="message_composer_custom_message_hint">پیام سفارشی بنویسید</string>
+  <string name="send_and_call">ارسال و تماس</string>
+  <string name="share_and_call">اشتراک‌گذاری و تماس</string>
+  <string name="gallery_item_description">تصویر %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">تصویر</string>
+  <string name="camera_media_failure">تصویر دوربین بار نشد</string>
+  <string name="allow">مجاز است</string>
+  <string name="camera_permission_text">برای عکس گرفتن، به دوربین اجازه دسترسی بدهید</string>
+  <string name="gallery_permission_text">برای اشتراک‌گذاری تصویر، به رسانه اجازه دسترسی بدهید</string>
+  <string name="description_call_composer_camera">عکس گرفتن</string>
+  <string name="description_call_composer_photo">انتخاب عکس</string>
+  <string name="description_call_composer_message">ارسال پیام</string>
+  <string name="image_sent_messages">عکس ارسال‌شده ازطریق «پیام‌ها»</string>
+  <string name="message_sent_messages">پیام ارسال‌شده ازطریق «پیام‌ها»</string>
+  <string name="call_composer_image_uploading">درحال ارسال تصویر…</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-fi/strings.xml b/java/com/android/dialer/callcomposer/res/values-fi/strings.xml
index 892bd96..5dbe619 100644
--- a/java/com/android/dialer/callcomposer/res/values-fi/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-fi/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="urgent" msgid="5271653973625093934">"Tärkeää, vastaa!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"Haluatko jutella?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"Nopea kysymys…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"Kirjoita oma viesti"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"Lähetä ja soita"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"Jaa ja soita"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"kuva (<xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>)"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"kuva"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"Kamerakuvan lataus epäonnistui."</string>
-    <string name="allow" msgid="8637148297403066623">"Salli"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"Jos haluat ottaa valokuvan, salli kameran käyttö."</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"Jos haluat jakaa kuvan, salli kuvien käyttö."</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"Ota kuva"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"Valitse kuva"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"Lähetä viesti"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"Kuva lähetettiin Messages-sovelluksen kautta"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"Viesti lähetettiin Messages-sovelluksen kautta"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Lähetetään kuvaa…"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">Tärkeää, vastaa!</string>
+  <string name="want_to_chat">Haluatko jutella?</string>
+  <string name="quick_question">Nopea kysymys…</string>
+  <string name="message_composer_custom_message_hint">Kirjoita oma viesti</string>
+  <string name="send_and_call">Lähetä ja soita</string>
+  <string name="share_and_call">Jaa ja soita</string>
+  <string name="gallery_item_description">kuva (%1$tB %1$te %1$tY %1$tl %1$tM %1$tp)</string>
+  <string name="gallery_item_description_no_date">kuva</string>
+  <string name="camera_media_failure">Kamerakuvan lataus epäonnistui.</string>
+  <string name="allow">Salli</string>
+  <string name="camera_permission_text">Jos haluat ottaa valokuvan, salli kameran käyttö.</string>
+  <string name="gallery_permission_text">Jos haluat jakaa kuvan, salli kuvien käyttö.</string>
+  <string name="description_call_composer_camera">Ota kuva</string>
+  <string name="description_call_composer_photo">Valitse kuva</string>
+  <string name="description_call_composer_message">Lähetä viesti</string>
+  <string name="image_sent_messages">Kuva lähetettiin Messages-sovelluksen kautta</string>
+  <string name="message_sent_messages">Viesti lähetettiin Messages-sovelluksen kautta</string>
+  <string name="call_composer_image_uploading">Lähetetään kuvaa…</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-fr-rCA/strings.xml b/java/com/android/dialer/callcomposer/res/values-fr-rCA/strings.xml
index 000d6eb..cc1adb1 100644
--- a/java/com/android/dialer/callcomposer/res/values-fr-rCA/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-fr-rCA/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="urgent" msgid="5271653973625093934">"Urgent! Veuillez répondre à l\'appel!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"Vous voulez clavarder?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"Petite question…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"Rédiger message personnalisé"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"Envoyer et appeler"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"Partager et appeler"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"image : <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"image"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"Impossible de charger l\'image de l\'appareil photo"</string>
-    <string name="allow" msgid="8637148297403066623">"Autoriser"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"Pour prendre une photo, autorisez l\'accès à l\'appareil photo"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"Pour partager une image, autorisez l\'accès au contenu multimédia"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"Prendre une photo"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"Choisir une photo"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"Envoyer un message"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"Photo envoyée au moyen de l\'application Messages"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"Message envoyé au moyen de l\'application Messages"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Envoi de l\'image en cours…"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">Urgent! Veuillez répondre à l\'appel!</string>
+  <string name="want_to_chat">Vous voulez clavarder?</string>
+  <string name="quick_question">Petite question…</string>
+  <string name="message_composer_custom_message_hint">Rédiger message personnalisé</string>
+  <string name="send_and_call">Envoyer et appeler</string>
+  <string name="share_and_call">Partager et appeler</string>
+  <string name="gallery_item_description">image : %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">image</string>
+  <string name="camera_media_failure">Impossible de charger l\'image de l\'appareil photo</string>
+  <string name="allow">Autoriser</string>
+  <string name="camera_permission_text">Pour prendre une photo, autorisez l\'accès à l\'appareil photo</string>
+  <string name="gallery_permission_text">Pour partager une image, autorisez l\'accès au contenu multimédia</string>
+  <string name="description_call_composer_camera">Prendre une photo</string>
+  <string name="description_call_composer_photo">Choisir une photo</string>
+  <string name="description_call_composer_message">Envoyer un message</string>
+  <string name="image_sent_messages">Photo envoyée au moyen de l\'application Messages</string>
+  <string name="message_sent_messages">Message envoyé au moyen de l\'application Messages</string>
+  <string name="call_composer_image_uploading">Envoi de l\'image en cours…</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-fr/strings.xml b/java/com/android/dialer/callcomposer/res/values-fr/strings.xml
index 40b89a3..1e6093c 100644
--- a/java/com/android/dialer/callcomposer/res/values-fr/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-fr/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="urgent" msgid="5271653973625093934">"Urgent ! Veuillez décrocher, s\'il vous plaît !"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"Vous souhaitez participer au chat ?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"Petite question…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"Écrire mon propre message"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"Envoyer et appeler"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"Partager et appeler"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"image <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"image"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"Impossible de charger l\'image de la caméra"</string>
-    <string name="allow" msgid="8637148297403066623">"Autoriser"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"Pour prendre une photo, accordez l\'accès à l\'appareil photo."</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"Pour partager une image, accordez l\'accès aux fichiers multimédia."</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"Prendre une photo"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"Choisir une photo"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"Envoyer un message"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"Photo envoyée via l\'application Messages"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"Message envoyé via l\'application Messages"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Envoi de l\'image…"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">Urgent ! Veuillez décrocher, s\'il vous plaît !</string>
+  <string name="want_to_chat">Vous souhaitez participer au chat ?</string>
+  <string name="quick_question">Petite question…</string>
+  <string name="message_composer_custom_message_hint">Écrire mon propre message</string>
+  <string name="send_and_call">Envoyer et appeler</string>
+  <string name="share_and_call">Partager et appeler</string>
+  <string name="gallery_item_description">image %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">image</string>
+  <string name="camera_media_failure">Impossible de charger l\'image de la caméra</string>
+  <string name="allow">Autoriser</string>
+  <string name="camera_permission_text">Pour prendre une photo, accordez l\'accès à l\'appareil photo.</string>
+  <string name="gallery_permission_text">Pour partager une image, accordez l\'accès aux fichiers multimédia.</string>
+  <string name="description_call_composer_camera">Prendre une photo</string>
+  <string name="description_call_composer_photo">Choisir une photo</string>
+  <string name="description_call_composer_message">Envoyer un message</string>
+  <string name="image_sent_messages">Photo envoyée via l\'application Messages</string>
+  <string name="message_sent_messages">Message envoyé via l\'application Messages</string>
+  <string name="call_composer_image_uploading">Envoi de l\'image…</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-gl/strings.xml b/java/com/android/dialer/callcomposer/res/values-gl/strings.xml
index 55bf5aa..dc034f2 100644
--- a/java/com/android/dialer/callcomposer/res/values-gl/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-gl/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="urgent" msgid="5271653973625093934">"É urxente! Responde!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"Queres chatear?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"Unha pregunta rápida…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"Escribe unha mensaxe personalizada"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"Enviar e chamar"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"Compartir e chamar"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"Imaxe do <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"Imaxe"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"Non se puido cargar a imaxe da cámara"</string>
-    <string name="allow" msgid="8637148297403066623">"Permitir"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"Para sacar unha foto, concede permiso de acceso á cámara"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"Para compartir unha imaxe, concede permiso de acceso aos ficheiros multimedia"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"Tira unha foto"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"Escolle unha foto"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"Envía unha mensaxe"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"Foto enviada a través de Mensaxes"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"Mensaxe enviada a través de Mensaxes"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Enviando imaxe…"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">É urxente! Responde!</string>
+  <string name="want_to_chat">Queres chatear?</string>
+  <string name="quick_question">Unha pregunta rápida…</string>
+  <string name="message_composer_custom_message_hint">Escribe unha mensaxe personalizada</string>
+  <string name="send_and_call">Enviar e chamar</string>
+  <string name="share_and_call">Compartir e chamar</string>
+  <string name="gallery_item_description">Imaxe do %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">Imaxe</string>
+  <string name="camera_media_failure">Non se puido cargar a imaxe da cámara</string>
+  <string name="allow">Permitir</string>
+  <string name="camera_permission_text">Para sacar unha foto, concede permiso de acceso á cámara</string>
+  <string name="gallery_permission_text">Para compartir unha imaxe, concede permiso de acceso aos ficheiros multimedia</string>
+  <string name="description_call_composer_camera">Tira unha foto</string>
+  <string name="description_call_composer_photo">Escolle unha foto</string>
+  <string name="description_call_composer_message">Envía unha mensaxe</string>
+  <string name="image_sent_messages">Foto enviada a través de Mensaxes</string>
+  <string name="message_sent_messages">Mensaxe enviada a través de Mensaxes</string>
+  <string name="call_composer_image_uploading">Enviando imaxe…</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-gu/strings.xml b/java/com/android/dialer/callcomposer/res/values-gu/strings.xml
index 13f4c84..0855cd9 100644
--- a/java/com/android/dialer/callcomposer/res/values-gu/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-gu/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="urgent" msgid="5271653973625093934">"તાત્કાલિક! કૃપા કરીને ફોન ઉપાડો!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"ચૅટ કરવી છે?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"ઝડપી પ્રશ્ન…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"એક કસ્ટમ સંદેશ લખો"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"મોકલો અને કૉલ કરો"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"શેર કરો અને કૉલ કરો"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"છબી <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"છબી"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"કૅમેરા છબી લોડ કરી શકાઈ નથી"</string>
-    <string name="allow" msgid="8637148297403066623">"મંજૂરી આપો"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"ફોટો લેવા માટે, કૅમેરાની ઍક્સેસ આપો"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"છબી શેર કરવા, મીડિયાની ઍક્સેસ આપો"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"એક ચિત્ર લો"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"ફોટો પસંદ કરો"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"એક સંદેશ મોકલો"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"Messages મારફતે ફોટો મોકલ્યો"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"Messages મારફતે સંદેશ મોકલ્યો"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"છબી મોકલી રહ્યાં છીએ..."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">તાત્કાલિક! કૃપા કરીને ફોન ઉપાડો!</string>
+  <string name="want_to_chat">ચૅટ કરવી છે?</string>
+  <string name="quick_question">ઝડપી પ્રશ્ન…</string>
+  <string name="message_composer_custom_message_hint">એક કસ્ટમ સંદેશ લખો</string>
+  <string name="send_and_call">મોકલો અને કૉલ કરો</string>
+  <string name="share_and_call">શેર કરો અને કૉલ કરો</string>
+  <string name="gallery_item_description">છબી %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">છબી</string>
+  <string name="camera_media_failure">કૅમેરા છબી લોડ કરી શકાઈ નથી</string>
+  <string name="allow">મંજૂરી આપો</string>
+  <string name="camera_permission_text">ફોટો લેવા માટે, કૅમેરાની ઍક્સેસ આપો</string>
+  <string name="gallery_permission_text">છબી શેર કરવા, મીડિયાની ઍક્સેસ આપો</string>
+  <string name="description_call_composer_camera">એક ચિત્ર લો</string>
+  <string name="description_call_composer_photo">ફોટો પસંદ કરો</string>
+  <string name="description_call_composer_message">એક સંદેશ મોકલો</string>
+  <string name="image_sent_messages">Messages મારફતે ફોટો મોકલ્યો</string>
+  <string name="message_sent_messages">Messages મારફતે સંદેશ મોકલ્યો</string>
+  <string name="call_composer_image_uploading">છબી મોકલી રહ્યાં છીએ...</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-hi/strings.xml b/java/com/android/dialer/callcomposer/res/values-hi/strings.xml
index 5d39d03..9da5df9 100644
--- a/java/com/android/dialer/callcomposer/res/values-hi/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-hi/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="urgent" msgid="5271653973625093934">"अत्यावश्यक! कृपया जवाब दें!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"क्या आप चैट करना चाहते हैं?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"झटपट प्रश्न…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"कोई कस्टम संदेश लिखें"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"भेजें और कॉल करें"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"साझा करें और कॉल करें"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"चित्र <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"चित्र"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"कैमरे का चित्र लोड नहीं किया जा सका"</string>
-    <string name="allow" msgid="8637148297403066623">"अनुमति दें"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"फ़ोटो लेने के लिए, कैमरे की ऐक्सेस दें"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"चित्र साझा करने के लिए, मीडिया की ऐक्सेस दें"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"चित्र लें"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"एक फ़ोटो चुनें"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"संदेश भेजें"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"संदेश ऐप्लिकेशन के ज़रिए फ़ोटो भेजा गया"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"संदेश ऐप्लिकेशन के ज़रिए संदेश भेजा गया"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"चित्र भेजा जा रहा है…"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">अत्यावश्यक! कृपया जवाब दें!</string>
+  <string name="want_to_chat">क्या आप चैट करना चाहते हैं?</string>
+  <string name="quick_question">झटपट प्रश्न…</string>
+  <string name="message_composer_custom_message_hint">कोई कस्टम संदेश लिखें</string>
+  <string name="send_and_call">भेजें और कॉल करें</string>
+  <string name="share_and_call">शेयर करें और कॉल करें</string>
+  <string name="gallery_item_description">चित्र %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">चित्र</string>
+  <string name="camera_media_failure">कैमरे का चित्र लोड नहीं किया जा सका</string>
+  <string name="allow">अनुमति दें</string>
+  <string name="camera_permission_text">फ़ोटो लेने के लिए, कैमरे की ऐक्सेस दें</string>
+  <string name="gallery_permission_text">चित्र शेयर करने के लिए, मीडिया की ऐक्सेस दें</string>
+  <string name="description_call_composer_camera">चित्र लें</string>
+  <string name="description_call_composer_photo">एक फ़ोटो चुनें</string>
+  <string name="description_call_composer_message">संदेश भेजें</string>
+  <string name="image_sent_messages">संदेश ऐप्लिकेशन के ज़रिए फ़ोटो भेजा गया</string>
+  <string name="message_sent_messages">संदेश ऐप्लिकेशन के ज़रिए संदेश भेजा गया</string>
+  <string name="call_composer_image_uploading">चित्र भेजा जा रहा है…</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-hr/strings.xml b/java/com/android/dialer/callcomposer/res/values-hr/strings.xml
index 5514388..4247244 100644
--- a/java/com/android/dialer/callcomposer/res/values-hr/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-hr/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="urgent" msgid="5271653973625093934">"Hitno! Javite se!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"Želite li se uključiti u chat?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"Brzo pitanje…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"Napišite prilagođenu poruku"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"Slanje i pozivanje"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"Dijeli i pozovi"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"slika <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"slika"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"Slika se ne može učitati"</string>
-    <string name="allow" msgid="8637148297403066623">"Omogući"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"Da biste snimili fotografiju, dopustite pristup Fotoaparatu"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"Za dijeljenje slike dopustite pristup Medijima"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"Snimi fotografiju"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"Odaberi fotografiju"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"Pošalji poruku"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"Fotografija poslana putem Poruka"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"Poruka poslana putem Poruka"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Slanje slike..."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">Hitno! Javite se!</string>
+  <string name="want_to_chat">Želite li se uključiti u chat?</string>
+  <string name="quick_question">Brzo pitanje…</string>
+  <string name="message_composer_custom_message_hint">Napišite prilagođenu poruku</string>
+  <string name="send_and_call">Slanje i pozivanje</string>
+  <string name="share_and_call">Dijeli i pozovi</string>
+  <string name="gallery_item_description">slika %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">slika</string>
+  <string name="camera_media_failure">Slika se ne može učitati</string>
+  <string name="allow">Omogući</string>
+  <string name="camera_permission_text">Da biste snimili fotografiju, dopustite pristup Fotoaparatu</string>
+  <string name="gallery_permission_text">Za dijeljenje slike dopustite pristup Medijima</string>
+  <string name="description_call_composer_camera">Snimi fotografiju</string>
+  <string name="description_call_composer_photo">Odaberi fotografiju</string>
+  <string name="description_call_composer_message">Pošalji poruku</string>
+  <string name="image_sent_messages">Fotografija poslana putem Poruka</string>
+  <string name="message_sent_messages">Poruka poslana putem Poruka</string>
+  <string name="call_composer_image_uploading">Slanje slike...</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-hu/strings.xml b/java/com/android/dialer/callcomposer/res/values-hu/strings.xml
index caf7577..503795b 100644
--- a/java/com/android/dialer/callcomposer/res/values-hu/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-hu/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="urgent" msgid="5271653973625093934">"Sürgős! Kérlek, vedd fel!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"Szeretnél beszélgetni?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"Gyors kérdés…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"Egyéni üzenet írása"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"Küldés és hívás"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"Megosztás és hívás"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"kép: <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"kép"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"Nem lehetett betölteni a kamera képét"</string>
-    <string name="allow" msgid="8637148297403066623">"Engedélyezés"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"Fotó készítéséhez adjon hozzáférést a fényképezőgéphez"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"Kép megosztásához adjon hozzáférést a médiafájlokhoz"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"Kép készítése"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"Fotó kiválasztása"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"Üzenet küldése"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"Fotó elküldve a Messages alkalmazásban"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"Üzenet elküldve a Messages alkalmazásban"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Kép küldése…"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">Sürgős! Kérlek, vedd fel!</string>
+  <string name="want_to_chat">Szeretnél beszélgetni?</string>
+  <string name="quick_question">Gyors kérdés…</string>
+  <string name="message_composer_custom_message_hint">Egyéni üzenet írása</string>
+  <string name="send_and_call">Küldés és hívás</string>
+  <string name="share_and_call">Megosztás és hívás</string>
+  <string name="gallery_item_description">kép: %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">kép</string>
+  <string name="camera_media_failure">Nem lehetett betölteni a kamera képét</string>
+  <string name="allow">Engedélyezés</string>
+  <string name="camera_permission_text">Fotó készítéséhez adjon hozzáférést a fényképezőgéphez</string>
+  <string name="gallery_permission_text">Kép megosztásához adjon hozzáférést a médiafájlokhoz</string>
+  <string name="description_call_composer_camera">Kép készítése</string>
+  <string name="description_call_composer_photo">Fotó kiválasztása</string>
+  <string name="description_call_composer_message">Üzenet küldése</string>
+  <string name="image_sent_messages">Fotó elküldve a Messages alkalmazásban</string>
+  <string name="message_sent_messages">Üzenet elküldve a Messages alkalmazásban</string>
+  <string name="call_composer_image_uploading">Kép küldése…</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-hy/strings.xml b/java/com/android/dialer/callcomposer/res/values-hy/strings.xml
index ae7e6ad..5dc7015 100644
--- a/java/com/android/dialer/callcomposer/res/values-hy/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-hy/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="urgent" msgid="5271653973625093934">"Շտա՛պ է: Խնդրում եմ պատասխանել:"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"Ուզո՞ւմ եք զրուցել:"</string>
-    <string name="quick_question" msgid="3501160802390214092">"Արագ հարց…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"Գրել տեքստն ինքնուրույն"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"Ուղարկել և զանգել"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"Կիսվել և զանգել"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"պատկեր <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"պատկեր"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"Չհաջողվեց բեռնել տեսախցիկի պատկերը"</string>
-    <string name="allow" msgid="8637148297403066623">"Թույլատրել"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"Լուսանկարելու համար տրամադրեք Խցիկն օգտագործելու հնարավորություն"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"Որևէ պատկերով կիսվելու համար տրամադրեք մեդիանյութերն օգտագործելու հնարավորություն"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"Լուսանկարել"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"Ընտրել լուսանկար"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"Ուղարկել հաղորդագրություն"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"Լուսանկարն ուղարկվել է Messages-ի միջոցով"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"Հաղորդագրությունն ուղարկվել է Messages-ի միջոցով"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Պատկերի ուղարկում…"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">Շտա՛պ է: Խնդրում եմ պատասխանել:</string>
+  <string name="want_to_chat">Ուզո՞ւմ եք զրուցել:</string>
+  <string name="quick_question">Արագ հարց…</string>
+  <string name="message_composer_custom_message_hint">Գրել տեքստն ինքնուրույն</string>
+  <string name="send_and_call">Ուղարկել և զանգել</string>
+  <string name="share_and_call">Կիսվել և զանգել</string>
+  <string name="gallery_item_description">պատկեր %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">պատկեր</string>
+  <string name="camera_media_failure">Չհաջողվեց բեռնել տեսախցիկի պատկերը</string>
+  <string name="allow">Թույլատրել</string>
+  <string name="camera_permission_text">Լուսանկարելու համար տրամադրեք Խցիկն օգտագործելու հնարավորություն</string>
+  <string name="gallery_permission_text">Որևէ պատկերով կիսվելու համար տրամադրեք մեդիանյութերն օգտագործելու հնարավորություն</string>
+  <string name="description_call_composer_camera">Լուսանկարել</string>
+  <string name="description_call_composer_photo">Ընտրել լուսանկար</string>
+  <string name="description_call_composer_message">Ուղարկել հաղորդագրություն</string>
+  <string name="image_sent_messages">Լուսանկարն ուղարկվել է Messages-ի միջոցով</string>
+  <string name="message_sent_messages">Հաղորդագրությունն ուղարկվել է Messages-ի միջոցով</string>
+  <string name="call_composer_image_uploading">Պատկերի ուղարկում…</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-in/strings.xml b/java/com/android/dialer/callcomposer/res/values-in/strings.xml
index 3d3cba7..c59c2e6 100644
--- a/java/com/android/dialer/callcomposer/res/values-in/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-in/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="urgent" msgid="5271653973625093934">"Penting! Angkat teleponnya!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"Ingin chat?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"Pertanyaan cepat…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"Tulis pesan khusus"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"Kirim dan telepon"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"Bagikan dan telepon"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"gambar <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"gambar"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"Tidak dapat memuat gambar kamera"</string>
-    <string name="allow" msgid="8637148297403066623">"Izinkan"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"Untuk mengambil foto, berikan akses ke Kamera"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"Untuk membagikan gambar, berikan akses ke Media"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"Jepret"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"Pilih foto"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"Mengirim pesan"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"Foto dikirim lewat Message"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"Pesan dikirim lewat Message"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Mengirim gambar…"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">Penting! Angkat teleponnya!</string>
+  <string name="want_to_chat">Ingin chat?</string>
+  <string name="quick_question">Pertanyaan cepat…</string>
+  <string name="message_composer_custom_message_hint">Tulis pesan khusus</string>
+  <string name="send_and_call">Kirim dan telepon</string>
+  <string name="share_and_call">Bagikan dan telepon</string>
+  <string name="gallery_item_description">gambar %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">gambar</string>
+  <string name="camera_media_failure">Tidak dapat memuat gambar kamera</string>
+  <string name="allow">Izinkan</string>
+  <string name="camera_permission_text">Untuk mengambil foto, berikan akses ke Kamera</string>
+  <string name="gallery_permission_text">Untuk membagikan gambar, berikan akses ke Media</string>
+  <string name="description_call_composer_camera">Jepret</string>
+  <string name="description_call_composer_photo">Pilih foto</string>
+  <string name="description_call_composer_message">Mengirim pesan</string>
+  <string name="image_sent_messages">Foto dikirim lewat Message</string>
+  <string name="message_sent_messages">Pesan dikirim lewat Message</string>
+  <string name="call_composer_image_uploading">Mengirim gambar…</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-is/strings.xml b/java/com/android/dialer/callcomposer/res/values-is/strings.xml
index ae3e123..be63f0c 100644
--- a/java/com/android/dialer/callcomposer/res/values-is/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-is/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="urgent" msgid="5271653973625093934">"Áríðandi! Svaraðu endilega!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"Viltu spjalla?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"Snögg spurning..."</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"Skrifa sérsniðin skilaboð"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"Senda og hringja"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"Deila og hringja"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"mynd <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"mynd"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"Ekki var hægt að hlaða mynd frá myndavél"</string>
-    <string name="allow" msgid="8637148297403066623">"Leyfa"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"Til að taka mynd skaltu veita myndavélinni aðgang"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"Til að deila mynd skaltu veita margmiðlunarefni aðgang"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"Taka mynd"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"Velja mynd"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"Senda skilaboð"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"Mynd send með Messages"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"Skilaboð send með Messages"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Sendir mynd…"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">Áríðandi! Svaraðu endilega!</string>
+  <string name="want_to_chat">Viltu spjalla?</string>
+  <string name="quick_question">Snögg spurning...</string>
+  <string name="message_composer_custom_message_hint">Skrifa sérsniðin skilaboð</string>
+  <string name="send_and_call">Senda og hringja</string>
+  <string name="share_and_call">Deila og hringja</string>
+  <string name="gallery_item_description">mynd %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">mynd</string>
+  <string name="camera_media_failure">Ekki var hægt að hlaða mynd frá myndavél</string>
+  <string name="allow">Leyfa</string>
+  <string name="camera_permission_text">Til að taka mynd skaltu veita myndavélinni aðgang</string>
+  <string name="gallery_permission_text">Til að deila mynd skaltu veita margmiðlunarefni aðgang</string>
+  <string name="description_call_composer_camera">Taka mynd</string>
+  <string name="description_call_composer_photo">Velja mynd</string>
+  <string name="description_call_composer_message">Senda skilaboð</string>
+  <string name="image_sent_messages">Mynd send með Messages</string>
+  <string name="message_sent_messages">Skilaboð send með Messages</string>
+  <string name="call_composer_image_uploading">Sendir mynd…</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-it/strings.xml b/java/com/android/dialer/callcomposer/res/values-it/strings.xml
index f06b0d8..5607038 100644
--- a/java/com/android/dialer/callcomposer/res/values-it/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-it/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="urgent" msgid="5271653973625093934">"È urgente, per favore rispondi!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"Vuoi chattare?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"Domanda rapida…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"Scrivi un messaggio personalizzato"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"Invia e chiama"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"Condividi e chiama"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"immagine: <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"immagine"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"Impossibile caricare l\'immagine della fotocamera"</string>
-    <string name="allow" msgid="8637148297403066623">"Consenti"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"Per poter scattare una foto devi concedere l\'accesso alla fotocamera"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"Per condividere un\'immagine, devi concedere l\'accesso ai contenuti multimediali"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"Scatta una foto"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"Scegli una foto"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"Invia un messaggio"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"Foto inviata tramite Messaggi"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"Messaggio inviato tramite Messaggi"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Invio dell\'immagine…"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">È urgente, per favore rispondi!</string>
+  <string name="want_to_chat">Vuoi chattare?</string>
+  <string name="quick_question">Domanda rapida…</string>
+  <string name="message_composer_custom_message_hint">Scrivi un messaggio personalizzato</string>
+  <string name="send_and_call">Invia e chiama</string>
+  <string name="share_and_call">Condividi e chiama</string>
+  <string name="gallery_item_description">immagine: %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">immagine</string>
+  <string name="camera_media_failure">Impossibile caricare l\'immagine della fotocamera</string>
+  <string name="allow">Consenti</string>
+  <string name="camera_permission_text">Per poter scattare una foto devi concedere l\'accesso alla fotocamera</string>
+  <string name="gallery_permission_text">Per condividere un\'immagine, devi concedere l\'accesso ai contenuti multimediali</string>
+  <string name="description_call_composer_camera">Scatta una foto</string>
+  <string name="description_call_composer_photo">Scegli una foto</string>
+  <string name="description_call_composer_message">Invia un messaggio</string>
+  <string name="image_sent_messages">Foto inviata tramite Messaggi</string>
+  <string name="message_sent_messages">Messaggio inviato tramite Messaggi</string>
+  <string name="call_composer_image_uploading">Invio dell\'immagine…</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-iw/strings.xml b/java/com/android/dialer/callcomposer/res/values-iw/strings.xml
index 8ed808b..fa1f873 100644
--- a/java/com/android/dialer/callcomposer/res/values-iw/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-iw/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="urgent" msgid="5271653973625093934">"זה דחוף! ענה בבקשה!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"רוצה לשוחח בצ\'אט?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"שאלה קצרה…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"כתוב הודעה מותאמת אישית"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"שלח והתקשר"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"שתף והתקשר"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"תמונה <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"תמונה"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"לא ניתן לטעון את התמונה מהמצלמה"</string>
-    <string name="allow" msgid="8637148297403066623">"אפשר"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"כדי שתוכל לצלם תמונות עליך להעניק לאפליקציה גישה למצלמה"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"כדי שתוכל לשתף תמונות עליך להעניק לאפליקציה גישה למדיה"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"צילום תמונה"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"בחירת תמונה"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"שליחת הודעה"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"‏התמונה נשלחה דרך אפליקציית Messages"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"‏ההודעה נשלחה דרך אפליקציית Messages"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"התמונה נשלחת…"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">זה דחוף! ענה בבקשה!</string>
+  <string name="want_to_chat">רוצה לשוחח בצ\'אט?</string>
+  <string name="quick_question">שאלה קצרה…</string>
+  <string name="message_composer_custom_message_hint">כתוב הודעה מותאמת אישית</string>
+  <string name="send_and_call">שלח והתקשר</string>
+  <string name="share_and_call">שתף והתקשר</string>
+  <string name="gallery_item_description">תמונה %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">תמונה</string>
+  <string name="camera_media_failure">לא ניתן לטעון את התמונה מהמצלמה</string>
+  <string name="allow">אפשר</string>
+  <string name="camera_permission_text">כדי שתוכל לצלם תמונות עליך להעניק לאפליקציה גישה למצלמה</string>
+  <string name="gallery_permission_text">כדי שתוכל לשתף תמונות עליך להעניק לאפליקציה גישה למדיה</string>
+  <string name="description_call_composer_camera">צילום תמונה</string>
+  <string name="description_call_composer_photo">בחירת תמונה</string>
+  <string name="description_call_composer_message">שליחת הודעה</string>
+  <string name="image_sent_messages">‏התמונה נשלחה דרך אפליקציית Messages</string>
+  <string name="message_sent_messages">‏ההודעה נשלחה דרך אפליקציית Messages</string>
+  <string name="call_composer_image_uploading">התמונה נשלחת…</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-ja/strings.xml b/java/com/android/dialer/callcomposer/res/values-ja/strings.xml
index 61ad0ce..265ca84 100644
--- a/java/com/android/dialer/callcomposer/res/values-ja/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-ja/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="urgent" msgid="5271653973625093934">"至急応答してください。"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"チャットしましょうか？"</string>
-    <string name="quick_question" msgid="3501160802390214092">"聞きたいことがあります…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"カスタム メッセージを入力"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"送信して発信"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"共有して発信"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"画像（<xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>）"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"画像"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"カメラ内の画像を読み込めませんでした"</string>
-    <string name="allow" msgid="8637148297403066623">"許可"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"写真を撮るには、まずカメラへのアクセスを許可してください"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"画像を共有するには、まずメディアへのアクセスを許可してください"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"画像を撮影します"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"写真を選択します"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"メッセージを送信します"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"Android メッセージで写真が送信されました"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"Android メッセージでメッセージが送信されました"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"画像を送信しています…"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">至急応答してください。</string>
+  <string name="want_to_chat">チャットしましょうか？</string>
+  <string name="quick_question">聞きたいことがあります…</string>
+  <string name="message_composer_custom_message_hint">カスタム メッセージを入力</string>
+  <string name="send_and_call">送信して発信</string>
+  <string name="share_and_call">共有して発信</string>
+  <string name="gallery_item_description">画像（%1$tB %1$te %1$tY %1$tl %1$tM %1$tp）</string>
+  <string name="gallery_item_description_no_date">画像</string>
+  <string name="camera_media_failure">カメラ内の画像を読み込めませんでした</string>
+  <string name="allow">許可</string>
+  <string name="camera_permission_text">写真を撮るには、まずカメラへのアクセスを許可してください</string>
+  <string name="gallery_permission_text">画像を共有するには、まずメディアへのアクセスを許可してください</string>
+  <string name="description_call_composer_camera">画像を撮影します</string>
+  <string name="description_call_composer_photo">写真を選択します</string>
+  <string name="description_call_composer_message">メッセージを送信します</string>
+  <string name="image_sent_messages">Android メッセージで写真が送信されました</string>
+  <string name="message_sent_messages">Android メッセージでメッセージが送信されました</string>
+  <string name="call_composer_image_uploading">画像を送信しています…</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-ka/strings.xml b/java/com/android/dialer/callcomposer/res/values-ka/strings.xml
index 4d65fa3..cacdf0e 100644
--- a/java/com/android/dialer/callcomposer/res/values-ka/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-ka/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="urgent" msgid="5271653973625093934">"სასწრაფოა! გთხოვთ, აიღოთ ყურმილი!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"გსურთ ჩეთი?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"სწრაფი შეკითხვა…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"დაწერეთ მორგებ. შეტყობინება"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"გაგზავნა და დარეკვა"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"გაზიარება და დარეკვა"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"სურათი, <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"სურათი"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"კამერის სურათი ვერ ჩაიტვირთა"</string>
-    <string name="allow" msgid="8637148297403066623">"ნების დართვა"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"ფოტოს გადასაღებად მიეცით კამერაზე წვდომა"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"სურათის გასაზიარებლად მიეცით მედიაზე წვდომა"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"სურათის გადაღება"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"ფოტოს არჩევა"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"შეტყობინების გაგზავნა"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"ფოტო გაიგზავნა Messages აპიდან"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"შეტყობინება გაიგზავნა Messages აპიდან"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"მიმდინარეობს სურათის გაგზავნა…"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">სასწრაფოა! გთხოვთ, აიღოთ ყურმილი!</string>
+  <string name="want_to_chat">გსურთ ჩეთი?</string>
+  <string name="quick_question">სწრაფი შეკითხვა…</string>
+  <string name="message_composer_custom_message_hint">დაწერეთ მორგებ. შეტყობინება</string>
+  <string name="send_and_call">გაგზავნა და დარეკვა</string>
+  <string name="share_and_call">გაზიარება და დარეკვა</string>
+  <string name="gallery_item_description">სურათი, %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">სურათი</string>
+  <string name="camera_media_failure">კამერის სურათი ვერ ჩაიტვირთა</string>
+  <string name="allow">ნების დართვა</string>
+  <string name="camera_permission_text">ფოტოს გადასაღებად მიეცით კამერაზე წვდომა</string>
+  <string name="gallery_permission_text">სურათის გასაზიარებლად მიეცით მედიაზე წვდომა</string>
+  <string name="description_call_composer_camera">სურათის გადაღება</string>
+  <string name="description_call_composer_photo">ფოტოს არჩევა</string>
+  <string name="description_call_composer_message">შეტყობინების გაგზავნა</string>
+  <string name="image_sent_messages">ფოტო გაიგზავნა Messages აპიდან</string>
+  <string name="message_sent_messages">შეტყობინება გაიგზავნა Messages აპიდან</string>
+  <string name="call_composer_image_uploading">მიმდინარეობს სურათის გაგზავნა…</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-kk/strings.xml b/java/com/android/dialer/callcomposer/res/values-kk/strings.xml
index 80f9caa..40de609 100644
--- a/java/com/android/dialer/callcomposer/res/values-kk/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-kk/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="urgent" msgid="5271653973625093934">"Шұғыл! Телефонды алыңыз!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"Чаттасқыңыз келе ме?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"Жылдам сұрақ..."</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"Арнаулы хабар жазу"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"Жіберу және қоңырау шалу"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"Бөлісу және қоңырау шалу"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"сурет, <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"сурет"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"Камера суреті жүктелмеді"</string>
-    <string name="allow" msgid="8637148297403066623">"Рұқсат беру"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"Суретке түсіру үшін камераға кіруге рұқсат беріңіз"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"Суретті жіберу үшін медиафайлға кіруге рұқсат беріңіз"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"Суретке түсіру"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"Суретті таңдау"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"Хабар жіберу"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"Сурет Messages арқылы жіберілді"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"Хабар Messages арқылы жіберілді"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Сурет жіберілуде..."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">Шұғыл! Телефонды алыңыз!</string>
+  <string name="want_to_chat">Чаттасқыңыз келе ме?</string>
+  <string name="quick_question">Жылдам сұрақ...</string>
+  <string name="message_composer_custom_message_hint">Арнаулы хабар жазу</string>
+  <string name="send_and_call">Жіберу және қоңырау шалу</string>
+  <string name="share_and_call">Бөлісу және қоңырау шалу</string>
+  <string name="gallery_item_description">сурет, %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">сурет</string>
+  <string name="camera_media_failure">Камера суреті жүктелмеді</string>
+  <string name="allow">Рұқсат беру</string>
+  <string name="camera_permission_text">Суретке түсіру үшін камераға кіруге рұқсат беріңіз</string>
+  <string name="gallery_permission_text">Суретті жіберу үшін медиафайлға кіруге рұқсат беріңіз</string>
+  <string name="description_call_composer_camera">Суретке түсіру</string>
+  <string name="description_call_composer_photo">Суретті таңдау</string>
+  <string name="description_call_composer_message">Хабар жіберу</string>
+  <string name="image_sent_messages">Сурет Messages арқылы жіберілді</string>
+  <string name="message_sent_messages">Хабар Messages арқылы жіберілді</string>
+  <string name="call_composer_image_uploading">Сурет жіберілуде...</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-km/strings.xml b/java/com/android/dialer/callcomposer/res/values-km/strings.xml
index b16534c..68383e7 100644
--- a/java/com/android/dialer/callcomposer/res/values-km/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-km/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="urgent" msgid="5271653973625093934">"បន្ទាន់! សូម​ជ្រើសយក!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"តើ​ចង់​ជជែក?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"សំណួរ​រហ័ស…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"សរសេរ​សារ​ផ្ទាល់ខ្លួន"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"ផ្ញើ និង​ហៅ"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"ចែករំលែក និង​ហៅ​ទូរសព្ទ"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"រូបភាព <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"រូបភាព"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"មិន​អាច​ផ្ទុក​រូបភាព​​​ពី​កាមេរ៉ា​បាន​ទេ"</string>
-    <string name="allow" msgid="8637148297403066623">"អនុញ្ញាត"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"ដើម្បីថតរូប សូមអនុញ្ញាត​ឲ្យចូលប្រើប្រាស់​កាមេរ៉ា"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"ដើម្បីចែករំលែករូបភាព សូមអនុញ្ញាត​ឲ្យចូលប្រើប្រាស់​មេឌៀ"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"ថតរូប"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"ជ្រើសរើស​រូបថត"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"ផ្ញើសារ"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"រូបថត​ដែល​បាន​ផ្ញើ​តាមរយៈ Messages"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"សារ​ដែល​បាន​ផ្ញើ​តាមរយៈ Messages"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"កំពុង​ផ្ញើ​រូបភាព..."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">បន្ទាន់! សូម​ជ្រើសយក!</string>
+  <string name="want_to_chat">តើ​ចង់​ជជែក?</string>
+  <string name="quick_question">សំណួរ​រហ័ស…</string>
+  <string name="message_composer_custom_message_hint">សរសេរ​សារ​ផ្ទាល់ខ្លួន</string>
+  <string name="send_and_call">ផ្ញើ និង​ហៅ</string>
+  <string name="share_and_call">ចែករំលែក និង​ហៅ​ទូរសព្ទ</string>
+  <string name="gallery_item_description">រូបភាព %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">រូបភាព</string>
+  <string name="camera_media_failure">មិន​អាច​ផ្ទុក​រូបភាព​​​ពី​កាមេរ៉ា​បាន​ទេ</string>
+  <string name="allow">អនុញ្ញាត</string>
+  <string name="camera_permission_text">ដើម្បីថតរូប សូមអនុញ្ញាត​ឲ្យចូលប្រើប្រាស់​កាមេរ៉ា</string>
+  <string name="gallery_permission_text">ដើម្បីចែករំលែករូបភាព សូមអនុញ្ញាត​ឲ្យចូលប្រើប្រាស់​មេឌៀ</string>
+  <string name="description_call_composer_camera">ថតរូប</string>
+  <string name="description_call_composer_photo">ជ្រើសរើស​រូបថត</string>
+  <string name="description_call_composer_message">ផ្ញើសារ</string>
+  <string name="image_sent_messages">រូបថត​ដែល​បាន​ផ្ញើ​តាមរយៈ Messages</string>
+  <string name="message_sent_messages">សារ​ដែល​បាន​ផ្ញើ​តាមរយៈ Messages</string>
+  <string name="call_composer_image_uploading">កំពុង​ផ្ញើ​រូបភាព...</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-kn/strings.xml b/java/com/android/dialer/callcomposer/res/values-kn/strings.xml
index 59de5e7..ca69d3c 100644
--- a/java/com/android/dialer/callcomposer/res/values-kn/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-kn/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="urgent" msgid="5271653973625093934">"ತುರ್ತು! ದಯವಿಟ್ಟು ಆಯ್ಕೆಮಾಡಿ!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"ಚಾಟ್ ಮಾಡಲು ಬಯಸುವಿರಾ?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"ತ್ವರಿತ ಪ್ರಶ್ನೆ…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"ಕಸ್ಟಮ್ ಸಂದೇಶವನ್ನು ಬರೆಯಿರಿ"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"ಕಳುಹಿಸಿ ಮತ್ತು ಕರೆ ಮಾಡಿ"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"ಹಂಚಿಕೊಳ್ಳಿ ಮತ್ತು ಕರೆ ಮಾಡಿ"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"ಚಿತ್ರ <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"ಚಿತ್ರ"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"ಕ್ಯಾಮರಾ ಚಿತ್ರವನ್ನು ಲೋಡ್ ಮಾಡಲಾಗಲಿಲ್ಲ"</string>
-    <string name="allow" msgid="8637148297403066623">"ಅನುಮತಿಸಿ"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"ಫೋಟೋ ತೆಗೆಯಲು, ಕ್ಯಾಮರಾಗೆ ಪ್ರವೇಶ ನೀಡಿ"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"ಚಿತ್ರವನ್ನು ಹಂಚಿಕೊಳ್ಳಲು, ಮಾಧ್ಯಮಕ್ಕೆ ಪ್ರವೇಶವನ್ನು ನೀಡಿ"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"ಚಿತ್ರ ತೆಗೆದುಕೊಳ್ಳಿ"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"ಒಂದು ಫೋಟೋ ಆಯ್ಕೆಮಾಡಿ"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"ಸಂದೇಶ ಕಳುಹಿಸಿ"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"ಸಂದೇಶಗಳ ಮೂಲಕ ಕಳುಹಿಸಲಾದ ಫೋಟೋ"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"ಸಂದೇಶಗಳ ಮೂಲಕ ಕಳುಹಿಸಲಾದ ಸಂದೇಶ"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"ಚಿತ್ರ ಕಳುಹಿಸಲಾಗುತ್ತಿದೆ…"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">ತುರ್ತು! ದಯವಿಟ್ಟು ಆಯ್ಕೆಮಾಡಿ!</string>
+  <string name="want_to_chat">ಚಾಟ್ ಮಾಡಲು ಬಯಸುವಿರಾ?</string>
+  <string name="quick_question">ತ್ವರಿತ ಪ್ರಶ್ನೆ…</string>
+  <string name="message_composer_custom_message_hint">ಕಸ್ಟಮ್ ಸಂದೇಶವನ್ನು ಬರೆಯಿರಿ</string>
+  <string name="send_and_call">ಕಳುಹಿಸಿ ಮತ್ತು ಕರೆ ಮಾಡಿ</string>
+  <string name="share_and_call">ಹಂಚಿಕೊಳ್ಳಿ ಮತ್ತು ಕರೆ ಮಾಡಿ</string>
+  <string name="gallery_item_description">ಚಿತ್ರ %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">ಚಿತ್ರ</string>
+  <string name="camera_media_failure">ಕ್ಯಾಮರಾ ಚಿತ್ರವನ್ನು ಲೋಡ್ ಮಾಡಲಾಗಲಿಲ್ಲ</string>
+  <string name="allow">ಅನುಮತಿಸಿ</string>
+  <string name="camera_permission_text">ಫೋಟೋ ತೆಗೆಯಲು, ಕ್ಯಾಮರಾಗೆ ಪ್ರವೇಶ ನೀಡಿ</string>
+  <string name="gallery_permission_text">ಚಿತ್ರವನ್ನು ಹಂಚಿಕೊಳ್ಳಲು, ಮಾಧ್ಯಮಕ್ಕೆ ಪ್ರವೇಶವನ್ನು ನೀಡಿ</string>
+  <string name="description_call_composer_camera">ಚಿತ್ರ ತೆಗೆದುಕೊಳ್ಳಿ</string>
+  <string name="description_call_composer_photo">ಒಂದು ಫೋಟೋ ಆಯ್ಕೆಮಾಡಿ</string>
+  <string name="description_call_composer_message">ಸಂದೇಶ ಕಳುಹಿಸಿ</string>
+  <string name="image_sent_messages">ಸಂದೇಶಗಳ ಮೂಲಕ ಕಳುಹಿಸಲಾದ ಫೋಟೋ</string>
+  <string name="message_sent_messages">ಸಂದೇಶಗಳ ಮೂಲಕ ಕಳುಹಿಸಲಾದ ಸಂದೇಶ</string>
+  <string name="call_composer_image_uploading">ಚಿತ್ರ ಕಳುಹಿಸಲಾಗುತ್ತಿದೆ…</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-ko/strings.xml b/java/com/android/dialer/callcomposer/res/values-ko/strings.xml
index 7df4a70..5261805 100644
--- a/java/com/android/dialer/callcomposer/res/values-ko/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-ko/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="urgent" msgid="5271653973625093934">"긴급! 선택해 주세요."</string>
-    <string name="want_to_chat" msgid="847333669248949914">"채팅에 참여하고 싶으신가요?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"빠른 질문…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"맞춤 메시지를 작성하세요."</string>
-    <string name="send_and_call" msgid="3749091015058610762">"보내기 및 전화 걸기"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"공유 및 전화 걸기"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"이미지 <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"이미지"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"카메라 이미지를 로드할 수 없습니다."</string>
-    <string name="allow" msgid="8637148297403066623">"허용"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"사진을 찍으려면 카메라에 액세스할 수 있도록 허용하세요."</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"이미지를 공유하려면 미디어에 액세스할 수 있도록 허용하세요."</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"사진 촬영"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"사진 선택"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"메시지 보내기"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"메시지를 통해 전송된 사진"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"메시지를 통해 전송된 메시지"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"이미지 전송 중…"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">긴급! 선택해 주세요.</string>
+  <string name="want_to_chat">채팅에 참여하고 싶으신가요?</string>
+  <string name="quick_question">빠른 질문…</string>
+  <string name="message_composer_custom_message_hint">맞춤 메시지를 작성하세요.</string>
+  <string name="send_and_call">보내기 및 전화 걸기</string>
+  <string name="share_and_call">공유 및 전화 걸기</string>
+  <string name="gallery_item_description">이미지 %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">이미지</string>
+  <string name="camera_media_failure">카메라 이미지를 로드할 수 없습니다.</string>
+  <string name="allow">허용</string>
+  <string name="camera_permission_text">사진을 찍으려면 카메라에 액세스할 수 있도록 허용하세요.</string>
+  <string name="gallery_permission_text">이미지를 공유하려면 미디어에 액세스할 수 있도록 허용하세요.</string>
+  <string name="description_call_composer_camera">사진 촬영</string>
+  <string name="description_call_composer_photo">사진 선택</string>
+  <string name="description_call_composer_message">메시지 보내기</string>
+  <string name="image_sent_messages">메시지를 통해 전송된 사진</string>
+  <string name="message_sent_messages">메시지를 통해 전송된 메시지</string>
+  <string name="call_composer_image_uploading">이미지 전송 중…</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-ky/strings.xml b/java/com/android/dialer/callcomposer/res/values-ky/strings.xml
index 1a8a395..b11a058 100644
--- a/java/com/android/dialer/callcomposer/res/values-ky/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-ky/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="urgent" msgid="5271653973625093934">"Шашылыш! Телефонду алыңыз!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"Маектешесизби?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"Тез суроо…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"Башка билдирүүнү жазыңыз"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"Жөнөтүп, анан чалуу"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"Бөлүшүү жана чалуу"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"сүрөт, <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"сүрөт"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"Камерадан сүрөт жүктөлгөн жок"</string>
-    <string name="allow" msgid="8637148297403066623">"Уруксат берүү"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"Сүрөткө тартуу үчүн, колдонмого камераны пайдаланууга уруксат бериңиз"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"Сүрөттү бөлүшүү үчүн мультимедиага кирүүгө уруксат бериңиз"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"Сүрөткө тартуу"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"Сүрөттү тандоо"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"Билдирүү жөнөтүү"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"Сүрөт Android жазышуулары колдонмосу аркылуу жөнөтүлдү"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"Билдирүү Android жазышуулары колдонмосу аркылуу жөнөтүлдү"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Сүрөт жөнөтүлүүдө..."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">Шашылыш! Телефонду алыңыз!</string>
+  <string name="want_to_chat">Маектешесизби?</string>
+  <string name="quick_question">Тез суроо…</string>
+  <string name="message_composer_custom_message_hint">Башка билдирүүнү жазыңыз</string>
+  <string name="send_and_call">Жөнөтүп, анан чалуу</string>
+  <string name="share_and_call">Бөлүшүү жана чалуу</string>
+  <string name="gallery_item_description">сүрөт, %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">сүрөт</string>
+  <string name="camera_media_failure">Камерадан сүрөт жүктөлгөн жок</string>
+  <string name="allow">Уруксат берүү</string>
+  <string name="camera_permission_text">Сүрөткө тартуу үчүн, колдонмого камераны пайдаланууга уруксат бериңиз</string>
+  <string name="gallery_permission_text">Сүрөттү бөлүшүү үчүн мультимедиага кирүүгө уруксат бериңиз</string>
+  <string name="description_call_composer_camera">Сүрөткө тартуу</string>
+  <string name="description_call_composer_photo">Сүрөттү тандоо</string>
+  <string name="description_call_composer_message">Билдирүү жөнөтүү</string>
+  <string name="image_sent_messages">Сүрөт Android жазышуулары колдонмосу аркылуу жөнөтүлдү</string>
+  <string name="message_sent_messages">Билдирүү Android жазышуулары колдонмосу аркылуу жөнөтүлдү</string>
+  <string name="call_composer_image_uploading">Сүрөт жөнөтүлүүдө...</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-lo/strings.xml b/java/com/android/dialer/callcomposer/res/values-lo/strings.xml
index 42ae0f1..b4f0473 100644
--- a/java/com/android/dialer/callcomposer/res/values-lo/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-lo/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="urgent" msgid="5271653973625093934">"ດ່ວນ! ຮັບສາຍແດ່!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"ຢາກລົມບໍ?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"ມີເລື່ອງຖາມໜ້ອຍໜຶ່ງ…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"ຂຽນຂໍ້ຄວາມດ້ວຍຕົນເອງ"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"ສົ່ງ ແລະ ໂທ"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"ແບ່ງປັນ ແລະ ໂທ"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"ຮູບ <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"ຮູບ"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"ບໍ່ສາມາດໂຫລດຮູບຈາກກ້ອງໄດ້"</string>
-    <string name="allow" msgid="8637148297403066623">"ອະນຸຍາດ"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"ເພື່ອຖ່າຍຮູບ, ໃຫ້ອະນຸຍາດການເຂົ້າຫາກ້ອງຖ່າຍຮູບກ່ອນ"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"ເພື່ອແບ່ງປັນຮູບພາບໃດໜຶ່ງ, ໃຫ້ອະນຸຍາດການເຂົ້າຫາມີເດຍກ່ອນ"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"ຖ່າຍຮູບ"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"ເລືອກຮູບພາບ..."</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"ສົ່ງຂໍ້ຄວາມ"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"ສົ່ງຮູບຜ່ານ Messages ແລ້ວ"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"ສົ່ງຮູບຜ່ານ Messages ແລ້ວ"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"ກຳລັງສົ່ງຮູບພາບ..."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">ດ່ວນ! ຮັບສາຍແດ່!</string>
+  <string name="want_to_chat">ຢາກລົມບໍ?</string>
+  <string name="quick_question">ມີເລື່ອງຖາມໜ້ອຍໜຶ່ງ…</string>
+  <string name="message_composer_custom_message_hint">ຂຽນຂໍ້ຄວາມດ້ວຍຕົນເອງ</string>
+  <string name="send_and_call">ສົ່ງ ແລະ ໂທ</string>
+  <string name="share_and_call">ແບ່ງປັນ ແລະ ໂທ</string>
+  <string name="gallery_item_description">ຮູບ %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">ຮູບ</string>
+  <string name="camera_media_failure">ບໍ່ສາມາດໂຫລດຮູບຈາກກ້ອງໄດ້</string>
+  <string name="allow">ອະນຸຍາດ</string>
+  <string name="camera_permission_text">ເພື່ອຖ່າຍຮູບ, ໃຫ້ອະນຸຍາດການເຂົ້າຫາກ້ອງຖ່າຍຮູບກ່ອນ</string>
+  <string name="gallery_permission_text">ເພື່ອແບ່ງປັນຮູບພາບໃດໜຶ່ງ, ໃຫ້ອະນຸຍາດການເຂົ້າຫາມີເດຍກ່ອນ</string>
+  <string name="description_call_composer_camera">ຖ່າຍຮູບ</string>
+  <string name="description_call_composer_photo">ເລືອກຮູບພາບ...</string>
+  <string name="description_call_composer_message">ສົ່ງຂໍ້ຄວາມ</string>
+  <string name="image_sent_messages">ສົ່ງຮູບຜ່ານ Messages ແລ້ວ</string>
+  <string name="message_sent_messages">ສົ່ງຮູບຜ່ານ Messages ແລ້ວ</string>
+  <string name="call_composer_image_uploading">ກຳລັງສົ່ງຮູບພາບ...</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-lt/strings.xml b/java/com/android/dialer/callcomposer/res/values-lt/strings.xml
index 59112d3..20506fa 100644
--- a/java/com/android/dialer/callcomposer/res/values-lt/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-lt/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="urgent" msgid="5271653973625093934">"Skubu! Atsiliepkite!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"Norite kalbėtis?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"Trumpas klausimas…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"Parašykite tinkintą praneš."</string>
-    <string name="send_and_call" msgid="3749091015058610762">"Siųsti ir skambinti"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"Bendrinti ir skambinti"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"vaizdas (<xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>)"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"vaizdas"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"Nepavyko įkelti fotoaparato vaizdo"</string>
-    <string name="allow" msgid="8637148297403066623">"Leisti"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"Kad galėtumėte fotografuoti, leiskite pasiekti fotoaparatą"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"Kad galėtumėte bendrinti vaizdą, leiskite pasiekti mediją"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"Fotografuoti"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"Pasirinkti nuotrauką"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"Siųsti pranešimą"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"Nuotrauka išsiųsta naudojant „Messages“"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"Pranešimas išsiųstas naudojant „Messages“"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Siunčiamas vaizdas..."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">Skubu! Atsiliepkite!</string>
+  <string name="want_to_chat">Norite kalbėtis?</string>
+  <string name="quick_question">Trumpas klausimas…</string>
+  <string name="message_composer_custom_message_hint">Parašykite tinkintą praneš.</string>
+  <string name="send_and_call">Siųsti ir skambinti</string>
+  <string name="share_and_call">Bendrinti ir skambinti</string>
+  <string name="gallery_item_description">vaizdas (%1$tB %1$te %1$tY %1$tl %1$tM %1$tp)</string>
+  <string name="gallery_item_description_no_date">vaizdas</string>
+  <string name="camera_media_failure">Nepavyko įkelti fotoaparato vaizdo</string>
+  <string name="allow">Leisti</string>
+  <string name="camera_permission_text">Kad galėtumėte fotografuoti, leiskite pasiekti fotoaparatą</string>
+  <string name="gallery_permission_text">Kad galėtumėte bendrinti vaizdą, leiskite pasiekti mediją</string>
+  <string name="description_call_composer_camera">Fotografuoti</string>
+  <string name="description_call_composer_photo">Pasirinkti nuotrauką</string>
+  <string name="description_call_composer_message">Siųsti pranešimą</string>
+  <string name="image_sent_messages">Nuotrauka išsiųsta naudojant „Messages“</string>
+  <string name="message_sent_messages">Pranešimas išsiųstas naudojant „Messages“</string>
+  <string name="call_composer_image_uploading">Siunčiamas vaizdas...</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-lv/strings.xml b/java/com/android/dialer/callcomposer/res/values-lv/strings.xml
index 8aa9540..af5fb2e 100644
--- a/java/com/android/dialer/callcomposer/res/values-lv/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-lv/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="urgent" msgid="5271653973625093934">"Tas ir svarīgi. Lūdzu, atbildiet!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"Vai vēlaties tērzēt?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"Ātrs jautājums…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"Rakstīt pielāgotu ziņojumu"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"Sūtīt un zvanīt"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"Kopīgot un zvanīt"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"attēls, <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"attēls"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"Nevarēja ielādēt kameras attēlu."</string>
-    <string name="allow" msgid="8637148297403066623">"Atļaut"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"Lai uzņemtu fotoattēlu, piešķiriet piekļuvi kamerai."</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"Lai kopīgotu attēlu, piešķiriet piekļuvi multivides saturam."</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"Uzņemt attēlu"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"Izvēlēties fotoattēlu"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"Sūtīt ziņojumu"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"Fotoattēls nosūtīts, izmantojot lietotni Ziņojumi"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"Ziņojums nosūtīts, izmantojot lietotni Ziņojumi"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Tiek sūtīts attēls…"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">Tas ir svarīgi. Lūdzu, atbildiet!</string>
+  <string name="want_to_chat">Vai vēlaties tērzēt?</string>
+  <string name="quick_question">Ātrs jautājums…</string>
+  <string name="message_composer_custom_message_hint">Rakstīt pielāgotu ziņojumu</string>
+  <string name="send_and_call">Sūtīt un zvanīt</string>
+  <string name="share_and_call">Kopīgot un zvanīt</string>
+  <string name="gallery_item_description">attēls, %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">attēls</string>
+  <string name="camera_media_failure">Nevarēja ielādēt kameras attēlu.</string>
+  <string name="allow">Atļaut</string>
+  <string name="camera_permission_text">Lai uzņemtu fotoattēlu, piešķiriet piekļuvi kamerai.</string>
+  <string name="gallery_permission_text">Lai kopīgotu attēlu, piešķiriet piekļuvi multivides saturam.</string>
+  <string name="description_call_composer_camera">Uzņemt attēlu</string>
+  <string name="description_call_composer_photo">Izvēlēties fotoattēlu</string>
+  <string name="description_call_composer_message">Sūtīt ziņojumu</string>
+  <string name="image_sent_messages">Fotoattēls nosūtīts, izmantojot lietotni Ziņojumi</string>
+  <string name="message_sent_messages">Ziņojums nosūtīts, izmantojot lietotni Ziņojumi</string>
+  <string name="call_composer_image_uploading">Tiek sūtīts attēls…</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-mk/strings.xml b/java/com/android/dialer/callcomposer/res/values-mk/strings.xml
index 126b44c..4aed43a 100644
--- a/java/com/android/dialer/callcomposer/res/values-mk/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-mk/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="urgent" msgid="5271653973625093934">"Итно! Јавете се!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"Сакате да разговарате?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"Кратко прашање…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"Напиши приспособена порака"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"Испратете и повикајте"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"Сподели и повикај"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"слика од <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"слика"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"Не можеше да се вчита слика од камерата"</string>
-    <string name="allow" msgid="8637148297403066623">"Дозволете"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"За да фотографирате, дозволете пристап до „Камера“"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"За да споделите слика, дозволете пристап до Media"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"Фотографирајте"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"Изберете фотографија"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"Испратете порака"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"Фотографијата е испратена преку Messages"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"Пораката е испратена преку Messages"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Се испраќа слика…"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">Итно! Јавете се!</string>
+  <string name="want_to_chat">Сакате да разговарате?</string>
+  <string name="quick_question">Кратко прашање…</string>
+  <string name="message_composer_custom_message_hint">Напиши приспособена порака</string>
+  <string name="send_and_call">Испратете и повикајте</string>
+  <string name="share_and_call">Сподели и повикај</string>
+  <string name="gallery_item_description">слика од %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">слика</string>
+  <string name="camera_media_failure">Не можеше да се вчита слика од камерата</string>
+  <string name="allow">Дозволете</string>
+  <string name="camera_permission_text">За да фотографирате, дозволете пристап до „Камера“</string>
+  <string name="gallery_permission_text">За да споделите слика, дозволете пристап до Media</string>
+  <string name="description_call_composer_camera">Фотографирајте</string>
+  <string name="description_call_composer_photo">Изберете фотографија</string>
+  <string name="description_call_composer_message">Испратете порака</string>
+  <string name="image_sent_messages">Фотографијата е испратена преку Messages</string>
+  <string name="message_sent_messages">Пораката е испратена преку Messages</string>
+  <string name="call_composer_image_uploading">Се испраќа слика…</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-ml/strings.xml b/java/com/android/dialer/callcomposer/res/values-ml/strings.xml
index 67175cc..332442a 100644
--- a/java/com/android/dialer/callcomposer/res/values-ml/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-ml/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="urgent" msgid="5271653973625093934">"അടിയന്തരാവശ്യം! കോളെടുക്കൂ!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"ചാറ്റ് ചെയ്യണോ?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"അടിയന്തര ചോദ്യം…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"ഒരു ഇ‌ഷ്‌ടാനുസൃത സന്ദേശം രചിക്കൂ"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"അയച്ചശേഷം കോൾ ചെയ്യുക"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"പങ്കിടുക, കോൾ ചെയ്യുക"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"ചിത്രം <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"ചിത്രം"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"ക്യാമറ ചിത്രം ലോഡുചെയ്യാനായില്ല"</string>
-    <string name="allow" msgid="8637148297403066623">"അനുവദിക്കുക"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"ഫോട്ടോ എടുക്കുന്നതിന്, ക്യാമറയ്ക്ക് ആക്സസ് നൽകുക"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"ഫോട്ടോ പങ്കിടുന്നതിന്, മീഡിയയ്ക്ക് ആക്സസ് നൽകുക"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"ഒരു ചിത്രമെടുക്കുക"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"ഒരു ഫോട്ടോ തിരഞ്ഞെടുക്കുക"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"ഒരു സന്ദേശം അയയ്‌ക്കുക"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"മെസേജ് വഴി ഫോട്ടോ അയച്ചു"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"മെസേജ് വഴി സന്ദേശം അയച്ചു"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"ചിത്രം അയയ്‌ക്കുന്നു..."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">അടിയന്തരാവശ്യം! കോളെടുക്കൂ!</string>
+  <string name="want_to_chat">ചാറ്റ് ചെയ്യണോ?</string>
+  <string name="quick_question">അടിയന്തര ചോദ്യം…</string>
+  <string name="message_composer_custom_message_hint">ഒരു ഇ‌ഷ്‌ടാനുസൃത സന്ദേശം രചിക്കൂ</string>
+  <string name="send_and_call">അയച്ചശേഷം കോൾ ചെയ്യുക</string>
+  <string name="share_and_call">പങ്കിടുക, കോൾ ചെയ്യുക</string>
+  <string name="gallery_item_description">ചിത്രം %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">ചിത്രം</string>
+  <string name="camera_media_failure">ക്യാമറ ചിത്രം ലോഡുചെയ്യാനായില്ല</string>
+  <string name="allow">അനുവദിക്കുക</string>
+  <string name="camera_permission_text">ഫോട്ടോ എടുക്കുന്നതിന്, ക്യാമറയ്ക്ക് ആക്സസ് നൽകുക</string>
+  <string name="gallery_permission_text">ഫോട്ടോ പങ്കിടുന്നതിന്, മീഡിയയ്ക്ക് ആക്സസ് നൽകുക</string>
+  <string name="description_call_composer_camera">ഒരു ചിത്രമെടുക്കുക</string>
+  <string name="description_call_composer_photo">ഒരു ഫോട്ടോ തിരഞ്ഞെടുക്കുക</string>
+  <string name="description_call_composer_message">ഒരു സന്ദേശം അയയ്‌ക്കുക</string>
+  <string name="image_sent_messages">മെസേജ് വഴി ഫോട്ടോ അയച്ചു</string>
+  <string name="message_sent_messages">മെസേജ് വഴി സന്ദേശം അയച്ചു</string>
+  <string name="call_composer_image_uploading">ചിത്രം അയയ്‌ക്കുന്നു...</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-mn/strings.xml b/java/com/android/dialer/callcomposer/res/values-mn/strings.xml
index 1de1f11..1387a7c 100644
--- a/java/com/android/dialer/callcomposer/res/values-mn/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-mn/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="urgent" msgid="5271653973625093934">"Яаралтай! Утсаа авна уу!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"Чатлахыг хүсэж байна уу?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"Шуурхай асуулт…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"Тусгай зурвас бичих"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"Илгээгээд залгах"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"Хуваалцаад залгах"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"зураг <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"зураг"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"Камерын дүрсийг ачаалж чадсангүй"</string>
-    <string name="allow" msgid="8637148297403066623">"Зөвшөөрөх"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"Зураг авахын тулд камерт хандах зөвшөөрөл олгох шаардлагатай"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"Зураг хуваалцахын тулд медиад хандах зөвшөөрөл олгох шаардлагатай"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"Зураг авах"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"Зураг сонгоно уу"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"Зурвас илгээх"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"Зургийг Зурвасаар дамжуулан илгээсэн"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"Зурвасыг Зурвасаар дамжуулан илгээсэн"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Зураг илгээж байна..."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">Яаралтай! Утсаа авна уу!</string>
+  <string name="want_to_chat">Чатлахыг хүсэж байна уу?</string>
+  <string name="quick_question">Шуурхай асуулт…</string>
+  <string name="message_composer_custom_message_hint">Тусгай зурвас бичих</string>
+  <string name="send_and_call">Илгээгээд залгах</string>
+  <string name="share_and_call">Хуваалцаад залгах</string>
+  <string name="gallery_item_description">зураг %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">зураг</string>
+  <string name="camera_media_failure">Камерын дүрсийг ачаалж чадсангүй</string>
+  <string name="allow">Зөвшөөрөх</string>
+  <string name="camera_permission_text">Зураг авахын тулд камерт хандах зөвшөөрөл олгох шаардлагатай</string>
+  <string name="gallery_permission_text">Зураг хуваалцахын тулд медиад хандах зөвшөөрөл олгох шаардлагатай</string>
+  <string name="description_call_composer_camera">Зураг авах</string>
+  <string name="description_call_composer_photo">Зураг сонгоно уу</string>
+  <string name="description_call_composer_message">Зурвас илгээх</string>
+  <string name="image_sent_messages">Зургийг Зурвасаар дамжуулан илгээсэн</string>
+  <string name="message_sent_messages">Зурвасыг Зурвасаар дамжуулан илгээсэн</string>
+  <string name="call_composer_image_uploading">Зураг илгээж байна...</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-mr/strings.xml b/java/com/android/dialer/callcomposer/res/values-mr/strings.xml
index 40a794d..d624624 100644
--- a/java/com/android/dialer/callcomposer/res/values-mr/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-mr/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="urgent" msgid="5271653973625093934">"तातडीचे! कृपया घ्या!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"चॅट करू इच्छिता?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"द्रुत प्रश्न…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"एक सानुकूल संदेश लिहा"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"पाठवा आणि कॉल करा"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"सामायिक करा आणि कॉल करा"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"प्रतिमा <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"प्रतिमा"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"कॅमेरा प्रतिमा लोड करणे शक्य झाले नाही"</string>
-    <string name="allow" msgid="8637148297403066623">"अनुमती द्या"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"एक फोटो घेण्यासाठी, कॅमेर्‍यामध्ये प्रवेश द्या"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"एखादी प्रतिमा सामायिक करण्यासाठी मीडियामध्ये प्रवेश द्या"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"एक फोटो घ्या"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"फोटो निवडा"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"एक संदेश पाठवा"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"Messages द्वारे फोटो पाठविला"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"Messages द्वारे संदेश पाठविला"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"इमेज पाठवत आहे…"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">तातडीचे! कृपया घ्या!</string>
+  <string name="want_to_chat">चॅट करू इच्छिता?</string>
+  <string name="quick_question">द्रुत प्रश्न…</string>
+  <string name="message_composer_custom_message_hint">एक सानुकूल मेसेज लिहा</string>
+  <string name="send_and_call">पाठवा आणि कॉल करा</string>
+  <string name="share_and_call">शेअर करा आणि कॉल करा</string>
+  <string name="gallery_item_description">इमेज %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">इमेज</string>
+  <string name="camera_media_failure">कॅमेरा इमेज लोड करणे शक्य झाले नाही</string>
+  <string name="allow">अनुमती द्या</string>
+  <string name="camera_permission_text">एक फोटो घेण्यासाठी, कॅमेर्‍यामध्ये प्रवेश द्या</string>
+  <string name="gallery_permission_text">एखादी इमेज सामायिक करण्यासाठी मीडियामध्ये प्रवेश द्या</string>
+  <string name="description_call_composer_camera">एक फोटो घ्या</string>
+  <string name="description_call_composer_photo">फोटो निवडा</string>
+  <string name="description_call_composer_message">एक मेसेज पाठवा</string>
+  <string name="image_sent_messages">Messages द्वारे फोटो पाठविला</string>
+  <string name="message_sent_messages">Messages द्वारे मेसेज पाठविला</string>
+  <string name="call_composer_image_uploading">इमेज पाठवत आहे…</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-ms/strings.xml b/java/com/android/dialer/callcomposer/res/values-ms/strings.xml
index 1f37e15..56445e6 100644
--- a/java/com/android/dialer/callcomposer/res/values-ms/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-ms/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="urgent" msgid="5271653973625093934">"Penting! Sila jawab!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"Ingin bersembang?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"Soalan pantas…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"Tulis mesej tersuai"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"Hantar dan panggil"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"Kongsi dan hubungi"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"imej <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"imej"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"Tidak dapat memuatkan imej kamera"</string>
-    <string name="allow" msgid="8637148297403066623">"Benarkan"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"Untuk mengambil foto, berikan akses kepada Kamera"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"Untuk berkongsi imej, berikan akses kepada Media"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"Ambil gambar"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"Pilih foto"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"Hantar mesej"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"Photo dihantar melalui Mesej"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"Mesej dihantar melalui Mesej"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Menghantar imej…"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">Penting! Sila jawab!</string>
+  <string name="want_to_chat">Ingin bersembang?</string>
+  <string name="quick_question">Soalan pantas…</string>
+  <string name="message_composer_custom_message_hint">Tulis mesej tersuai</string>
+  <string name="send_and_call">Hantar dan panggil</string>
+  <string name="share_and_call">Kongsi dan hubungi</string>
+  <string name="gallery_item_description">imej %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">imej</string>
+  <string name="camera_media_failure">Tidak dapat memuatkan imej kamera</string>
+  <string name="allow">Benarkan</string>
+  <string name="camera_permission_text">Untuk mengambil foto, berikan akses kepada Kamera</string>
+  <string name="gallery_permission_text">Untuk berkongsi imej, berikan akses kepada Media</string>
+  <string name="description_call_composer_camera">Ambil gambar</string>
+  <string name="description_call_composer_photo">Pilih foto</string>
+  <string name="description_call_composer_message">Hantar mesej</string>
+  <string name="image_sent_messages">Photo dihantar melalui Mesej</string>
+  <string name="message_sent_messages">Mesej dihantar melalui Mesej</string>
+  <string name="call_composer_image_uploading">Menghantar imej…</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-my/strings.xml b/java/com/android/dialer/callcomposer/res/values-my/strings.xml
index 5f8de84..b86d029 100644
--- a/java/com/android/dialer/callcomposer/res/values-my/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-my/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="urgent" msgid="5271653973625093934">"အရေးကြီးသည်။ ဖုန်းကိုင်ပါ။"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"ချတ်လုပ်လိုပါသလား။"</string>
-    <string name="quick_question" msgid="3501160802390214092">"အမြန်မေးခွန်း…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"စိတ်ကြိုက် မက်ဆေ့ဂျ်တစ်ခု ရေးပါ"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"ပို့ပြီး ဖုန်းခေါ်ရန်"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"မျှဝေပြီး ခေါ်ဆိုရန်"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"ပုံ <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"ပုံ"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"ကင်မရာမှပုံကို မရယူနိုင်ပါ"</string>
-    <string name="allow" msgid="8637148297403066623">"ခွင့်ပြုရန်"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"ဓာတ်ပုံရိုက်ရန် ကင်မရာသို့ ဝင်သုံးခွင့်ပေးပါ"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"ပုံမျှဝေရန် မီဒီယာသို့ ဝင်သုံးခွင့်ပေးပါ"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"ဓာတ်ပုံတစ်ပုံ ရိုက်ရန်"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"ဓာတ်ပုံတစ်ပုံ ရွေးရန်"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"မက်ဆေ့ဂျ်ပို့ရန်"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"မက်ဆေ့ဂျ်များမှတစ်ဆင့် ဓာတ်ပုံပို့ပြီးပါပြီ"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"မက်ဆေ့ဂျ်များမှတစ်ဆင့် မက်ဆေ့ဂျ်ပို့ပြီးပါပြီ"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"ပုံပို့နေသည်…"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">အရေးကြီးသည်။ ဖုန်းကိုင်ပါ။</string>
+  <string name="want_to_chat">ချတ်လုပ်လိုပါသလား။</string>
+  <string name="quick_question">အမြန်မေးခွန်း…</string>
+  <string name="message_composer_custom_message_hint">စိတ်ကြိုက် မက်ဆေ့ဂျ်တစ်ခု ရေးပါ</string>
+  <string name="send_and_call">ပို့ပြီး ဖုန်းခေါ်ရန်</string>
+  <string name="share_and_call">မျှဝေပြီး ခေါ်ဆိုရန်</string>
+  <string name="gallery_item_description">ပုံ %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">ပုံ</string>
+  <string name="camera_media_failure">ကင်မရာမှပုံကို မရယူနိုင်ပါ</string>
+  <string name="allow">ခွင့်ပြုရန်</string>
+  <string name="camera_permission_text">ဓာတ်ပုံရိုက်ရန် ကင်မရာသို့ ဝင်သုံးခွင့်ပေးပါ</string>
+  <string name="gallery_permission_text">ပုံမျှဝေရန် မီဒီယာသို့ ဝင်သုံးခွင့်ပေးပါ</string>
+  <string name="description_call_composer_camera">ဓာတ်ပုံတစ်ပုံ ရိုက်ရန်</string>
+  <string name="description_call_composer_photo">ဓာတ်ပုံတစ်ပုံ ရွေးရန်</string>
+  <string name="description_call_composer_message">မက်ဆေ့ဂျ်ပို့ရန်</string>
+  <string name="image_sent_messages">မက်ဆေ့ဂျ်များမှတစ်ဆင့် ဓာတ်ပုံပို့ပြီးပါပြီ</string>
+  <string name="message_sent_messages">မက်ဆေ့ဂျ်များမှတစ်ဆင့် မက်ဆေ့ဂျ်ပို့ပြီးပါပြီ</string>
+  <string name="call_composer_image_uploading">ပုံပို့နေသည်…</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-nb/strings.xml b/java/com/android/dialer/callcomposer/res/values-nb/strings.xml
index c9e1296..134969b 100644
--- a/java/com/android/dialer/callcomposer/res/values-nb/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-nb/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="urgent" msgid="5271653973625093934">"Haster! Vennligst svar."</string>
-    <string name="want_to_chat" msgid="847333669248949914">"Vil du chatte?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"Et kjapt spørsmål …"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"Skriv egendefinert melding"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"Sende og ringe"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"Del og ring"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"bilde <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"bilde"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"Kunne ikke laste inn kamerabilde"</string>
-    <string name="allow" msgid="8637148297403066623">"Tillat"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"Gi tilgang til kameraet for å ta bilder"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"Gi Media tilgang for å dele bilder"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"Ta et bilde"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"Velg et bilde"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"Send en melding"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"Bildet er sendt via Messages"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"Meldingen er sendt via Messages"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Sender bildet …"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">Haster! Vennligst svar.</string>
+  <string name="want_to_chat">Vil du chatte?</string>
+  <string name="quick_question">Et kjapt spørsmål …</string>
+  <string name="message_composer_custom_message_hint">Skriv egendefinert melding</string>
+  <string name="send_and_call">Sende og ringe</string>
+  <string name="share_and_call">Del og ring</string>
+  <string name="gallery_item_description">bilde %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">bilde</string>
+  <string name="camera_media_failure">Kunne ikke laste inn kamerabilde</string>
+  <string name="allow">Tillat</string>
+  <string name="camera_permission_text">Gi tilgang til kameraet for å ta bilder</string>
+  <string name="gallery_permission_text">Gi Media tilgang for å dele bilder</string>
+  <string name="description_call_composer_camera">Ta et bilde</string>
+  <string name="description_call_composer_photo">Velg et bilde</string>
+  <string name="description_call_composer_message">Send en melding</string>
+  <string name="image_sent_messages">Bildet er sendt via Messages</string>
+  <string name="message_sent_messages">Meldingen er sendt via Messages</string>
+  <string name="call_composer_image_uploading">Sender bildet …</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-ne/strings.xml b/java/com/android/dialer/callcomposer/res/values-ne/strings.xml
index 71d40a6..f89e8c2 100644
--- a/java/com/android/dialer/callcomposer/res/values-ne/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-ne/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="urgent" msgid="5271653973625093934">"अत्यन्त जरुरी! कृपया उठाउनुहोस्!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"कुराकानी गर्न चाहनुहुन्छ?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"द्रुत प्रश्नहरू…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"आफू अनुकूल सन्देश लेख्‍ने"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"कल पठाउनुहोस्"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"आदान-प्रदान र कल गर्नुहोस्"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"छवि <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"छवि"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"क्यामेराको छवि लोड गर्न सकिएन"</string>
-    <string name="allow" msgid="8637148297403066623">"अनुमति दिनुहोस्"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"तस्बिर खिच्न, क्यामेरामाथि पहुँच दिनुहोस्"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"छवि आदान-प्रदान गर्न, मिडियामाथि पहुँच दिनुहोस्"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"तस्बिर खिच्नुहोस्"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"तस्बिर छनौट गर्नुहोस्"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"सन्देश पठाउनुहोस्"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"Messages मार्फत पठाइएको तस्बिर"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"Messages मार्फत पठाइएको सन्देश"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"छवि पठाइँदै…"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">अत्यन्त जरुरी! कृपया उठाउनुहोस्!</string>
+  <string name="want_to_chat">कुराकानी गर्न चाहनुहुन्छ?</string>
+  <string name="quick_question">द्रुत प्रश्नहरू…</string>
+  <string name="message_composer_custom_message_hint">आफू अनुकूल सन्देश लेख्‍ने</string>
+  <string name="send_and_call">कल पठाउनुहोस्</string>
+  <string name="share_and_call">आदान प्रदान र कल गर्नुहोस्</string>
+  <string name="gallery_item_description">छवि %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">छवि</string>
+  <string name="camera_media_failure">क्यामेराको छवि लोड गर्न सकिएन</string>
+  <string name="allow">अनुमति दिनुहोस्</string>
+  <string name="camera_permission_text">तस्बिर खिच्न, क्यामेरामाथि पहुँच दिनुहोस्</string>
+  <string name="gallery_permission_text">छवि आदान प्रदान गर्न, मिडियामाथि पहुँच दिनुहोस्</string>
+  <string name="description_call_composer_camera">तस्बिर खिच्नुहोस्</string>
+  <string name="description_call_composer_photo">तस्बिर छनौट गर्नुहोस्</string>
+  <string name="description_call_composer_message">सन्देश पठाउनुहोस्</string>
+  <string name="image_sent_messages">Messages मार्फत पठाइएको तस्बिर</string>
+  <string name="message_sent_messages">Messages मार्फत पठाइएको सन्देश</string>
+  <string name="call_composer_image_uploading">छवि पठाइँदै…</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-nl/strings.xml b/java/com/android/dialer/callcomposer/res/values-nl/strings.xml
index 59c09a3..e4b3444 100644
--- a/java/com/android/dialer/callcomposer/res/values-nl/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-nl/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="urgent" msgid="5271653973625093934">"Dit is dringend! Neem alsjeblieft op."</string>
-    <string name="want_to_chat" msgid="847333669248949914">"Wil je chatten?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"Snelle vraag…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"Schrijf zelf een bericht"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"Verzenden en bellen"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"Delen en bellen"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"afbeelding van <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"afbeelding"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"Kan camera-afbeelding niet laden"</string>
-    <string name="allow" msgid="8637148297403066623">"Toestaan"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"Verleen toegang tot Camera om een foto te maken"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"Verleen toegang tot Media om een afbeelding te delen"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"Een foto nemen"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"Een foto kiezen"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"Een bericht verzenden"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"Foto verzonden via Berichten"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"Bericht verzonden via Berichten"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Afbeelding verzenden…"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">Dit is dringend! Neem alsjeblieft op.</string>
+  <string name="want_to_chat">Wil je chatten?</string>
+  <string name="quick_question">Snelle vraag…</string>
+  <string name="message_composer_custom_message_hint">Schrijf zelf een bericht</string>
+  <string name="send_and_call">Verzenden en bellen</string>
+  <string name="share_and_call">Delen en bellen</string>
+  <string name="gallery_item_description">afbeelding van %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">afbeelding</string>
+  <string name="camera_media_failure">Kan camera-afbeelding niet laden</string>
+  <string name="allow">Toestaan</string>
+  <string name="camera_permission_text">Verleen toegang tot Camera om een foto te maken</string>
+  <string name="gallery_permission_text">Verleen toegang tot Media om een afbeelding te delen</string>
+  <string name="description_call_composer_camera">Een foto nemen</string>
+  <string name="description_call_composer_photo">Een foto kiezen</string>
+  <string name="description_call_composer_message">Een bericht verzenden</string>
+  <string name="image_sent_messages">Foto verzonden via Berichten</string>
+  <string name="message_sent_messages">Bericht verzonden via Berichten</string>
+  <string name="call_composer_image_uploading">Afbeelding verzenden…</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-no/strings.xml b/java/com/android/dialer/callcomposer/res/values-no/strings.xml
index c9e1296..134969b 100644
--- a/java/com/android/dialer/callcomposer/res/values-no/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-no/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="urgent" msgid="5271653973625093934">"Haster! Vennligst svar."</string>
-    <string name="want_to_chat" msgid="847333669248949914">"Vil du chatte?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"Et kjapt spørsmål …"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"Skriv egendefinert melding"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"Sende og ringe"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"Del og ring"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"bilde <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"bilde"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"Kunne ikke laste inn kamerabilde"</string>
-    <string name="allow" msgid="8637148297403066623">"Tillat"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"Gi tilgang til kameraet for å ta bilder"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"Gi Media tilgang for å dele bilder"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"Ta et bilde"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"Velg et bilde"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"Send en melding"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"Bildet er sendt via Messages"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"Meldingen er sendt via Messages"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Sender bildet …"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">Haster! Vennligst svar.</string>
+  <string name="want_to_chat">Vil du chatte?</string>
+  <string name="quick_question">Et kjapt spørsmål …</string>
+  <string name="message_composer_custom_message_hint">Skriv egendefinert melding</string>
+  <string name="send_and_call">Sende og ringe</string>
+  <string name="share_and_call">Del og ring</string>
+  <string name="gallery_item_description">bilde %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">bilde</string>
+  <string name="camera_media_failure">Kunne ikke laste inn kamerabilde</string>
+  <string name="allow">Tillat</string>
+  <string name="camera_permission_text">Gi tilgang til kameraet for å ta bilder</string>
+  <string name="gallery_permission_text">Gi Media tilgang for å dele bilder</string>
+  <string name="description_call_composer_camera">Ta et bilde</string>
+  <string name="description_call_composer_photo">Velg et bilde</string>
+  <string name="description_call_composer_message">Send en melding</string>
+  <string name="image_sent_messages">Bildet er sendt via Messages</string>
+  <string name="message_sent_messages">Meldingen er sendt via Messages</string>
+  <string name="call_composer_image_uploading">Sender bildet …</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-pa/strings.xml b/java/com/android/dialer/callcomposer/res/values-pa/strings.xml
index 0a51a63..0173ffa 100644
--- a/java/com/android/dialer/callcomposer/res/values-pa/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-pa/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="urgent" msgid="5271653973625093934">"ਬਹੁਤ ਜ਼ਰੂਰੀ ਹੈ! ਕਿਰਪਾ ਕਰਕੇ ਚੁੱਕੋ!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"ਕੀ ਚੈਟ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"ਤਤਕਾਲ ਸਵਾਲ…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"ਵਿਸ਼ੇਸ਼-ਵਿਉਂਤਬੱਧ ਸੁਨੇਹਾ ਲਿਖੋ"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"ਭੇਜੋ ਅਤੇ ਕਾਲ ਕਰੋ"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"ਸਾਂਝਾ ਕਰੋ ਅਤੇ ਕਾਲ ਕਰੋ"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"ਚਿੱਤਰ <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"ਚਿੱਤਰ"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"ਕੈਮਰਾ ਚਿੱਤਰ ਲੋਡ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ"</string>
-    <string name="allow" msgid="8637148297403066623">"ਇਜਾਜ਼ਤ ਦਿਓ"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"ਫ਼ੋਟੋ ਖਿੱਚਣ ਲਈ, ਕੈਮਰੇ ਤੱਕ ਪਹੁੰਚ ਦਿਓ"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"ਚਿੱਤਰ ਸਾਂਝਾ ਕਰਨ ਲਈ, ਮੀਡੀਆ ਤੱਕ ਪਹੁੰਚ ਦਿਓ"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"ਇੱਕ ਤਸਵੀਰ ਖਿੱਚੋ"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"ਇੱਕ ਫ਼ੋਟੋ ਚੁਣੋ"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"ਇੱਕ ਸੁਨੇਹਾ ਭੇਜੋ"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"ਫ਼ੋਟੋ &amp;quot;ਸੁਨੇਹੇ&amp;quot; ਐਪ ਰਾਹੀਂ ਭੇਜੀ ਗਈ"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"ਸੁਨੇਹਾ &amp;quot;ਸੁਨੇਹੇ&amp;quot; ਐਪ ਰਾਹੀਂ ਭੇਜਿਆ ਗਿਆ"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"ਚਿੱਤਰ ਭੇਜਿਆ ਜਾ ਰਿਹਾ ਹੈ…"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">ਬਹੁਤ ਜ਼ਰੂਰੀ ਹੈ! ਕਿਰਪਾ ਕਰਕੇ ਚੁੱਕੋ!</string>
+  <string name="want_to_chat">ਕੀ ਚੈਟ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?</string>
+  <string name="quick_question">ਤਤਕਾਲ ਸਵਾਲ…</string>
+  <string name="message_composer_custom_message_hint">ਵਿਸ਼ੇਸ਼-ਵਿਉਂਤਬੱਧ ਸੁਨੇਹਾ ਲਿਖੋ</string>
+  <string name="send_and_call">ਭੇਜੋ ਅਤੇ ਕਾਲ ਕਰੋ</string>
+  <string name="share_and_call">ਸਾਂਝਾ ਕਰੋ ਅਤੇ ਕਾਲ ਕਰੋ</string>
+  <string name="gallery_item_description">ਚਿੱਤਰ %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">ਚਿੱਤਰ</string>
+  <string name="camera_media_failure">ਕੈਮਰਾ ਚਿੱਤਰ ਲੋਡ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ</string>
+  <string name="allow">ਇਜਾਜ਼ਤ ਦਿਓ</string>
+  <string name="camera_permission_text">ਫ਼ੋਟੋ ਖਿੱਚਣ ਲਈ, ਕੈਮਰੇ ਤੱਕ ਪਹੁੰਚ ਦਿਓ</string>
+  <string name="gallery_permission_text">ਚਿੱਤਰ ਸਾਂਝਾ ਕਰਨ ਲਈ, ਮੀਡੀਆ ਤੱਕ ਪਹੁੰਚ ਦਿਓ</string>
+  <string name="description_call_composer_camera">ਇੱਕ ਤਸਵੀਰ ਖਿੱਚੋ</string>
+  <string name="description_call_composer_photo">ਇੱਕ ਫ਼ੋਟੋ ਚੁਣੋ</string>
+  <string name="description_call_composer_message">ਇੱਕ ਸੁਨੇਹਾ ਭੇਜੋ</string>
+  <string name="image_sent_messages">ਫ਼ੋਟੋ &quot;ਸੁਨੇਹੇ&quot; ਐਪ ਰਾਹੀਂ ਭੇਜੀ ਗਈ</string>
+  <string name="message_sent_messages">ਸੁਨੇਹਾ &quot;ਸੁਨੇਹੇ&quot; ਐਪ ਰਾਹੀਂ ਭੇਜਿਆ ਗਿਆ</string>
+  <string name="call_composer_image_uploading">ਚਿੱਤਰ ਭੇਜਿਆ ਜਾ ਰਿਹਾ ਹੈ…</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-pl/strings.xml b/java/com/android/dialer/callcomposer/res/values-pl/strings.xml
index 130dd8c..64b2135 100644
--- a/java/com/android/dialer/callcomposer/res/values-pl/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-pl/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="urgent" msgid="5271653973625093934">"To ważne! Odbierz!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"Chcesz porozmawiać na czacie?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"Szybkie pytanie…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"Wpisz wiadomość"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"Wyślij i zadzwoń"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"Udostępnij i zadzwoń"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"zdjęcie – <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"zdjęcie"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"Nie udało się wczytać zdjęcia z aparatu"</string>
-    <string name="allow" msgid="8637148297403066623">"Zezwól"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"Aby zrobić zdjęcie, zezwól na dostęp do aparatu"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"Aby udostępnić zdjęcie, zezwól na dostęp do multimediów"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"Zrób zdjęcie"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"Wybierz zdjęcie"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"Wyślij wiadomość"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"Zdjęcie zostało wysłane przez Wiadomości"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"Tekst został wysłany przez Wiadomości"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Wysyłam obraz…"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">To ważne! Odbierz!</string>
+  <string name="want_to_chat">Chcesz porozmawiać na czacie?</string>
+  <string name="quick_question">Szybkie pytanie…</string>
+  <string name="message_composer_custom_message_hint">Wpisz wiadomość</string>
+  <string name="send_and_call">Wyślij i zadzwoń</string>
+  <string name="share_and_call">Udostępnij i zadzwoń</string>
+  <string name="gallery_item_description">zdjęcie – %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">zdjęcie</string>
+  <string name="camera_media_failure">Nie udało się wczytać zdjęcia z aparatu</string>
+  <string name="allow">Zezwól</string>
+  <string name="camera_permission_text">Aby zrobić zdjęcie, zezwól na dostęp do aparatu</string>
+  <string name="gallery_permission_text">Aby udostępnić zdjęcie, zezwól na dostęp do multimediów</string>
+  <string name="description_call_composer_camera">Zrób zdjęcie</string>
+  <string name="description_call_composer_photo">Wybierz zdjęcie</string>
+  <string name="description_call_composer_message">Wyślij wiadomość</string>
+  <string name="image_sent_messages">Zdjęcie zostało wysłane przez Wiadomości</string>
+  <string name="message_sent_messages">Tekst został wysłany przez Wiadomości</string>
+  <string name="call_composer_image_uploading">Wysyłam obraz…</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-pt-rBR/strings.xml b/java/com/android/dialer/callcomposer/res/values-pt-rBR/strings.xml
index a090d15..1fea485 100644
--- a/java/com/android/dialer/callcomposer/res/values-pt-rBR/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-pt-rBR/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="urgent" msgid="5271653973625093934">"É urgente, atenda!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"Quer bater papo?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"Pergunta rápida…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"Escreva sua mensagem"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"Enviar e ligar"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"Compartilhar e ligar"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"imagem de <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"imagem"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"Falha ao carregar a imagem da câmera"</string>
-    <string name="allow" msgid="8637148297403066623">"Permitir"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"Para tirar uma foto, permita o acesso à câmera"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"Para compartilhar uma imagem, permita o acesso à mídia"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"Tirar uma foto"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"Escolher uma foto"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"Enviar uma mensagem"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"Foto enviada pelo Mensagens"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"Mensagem enviada pelo Mensagens"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Enviando imagem..."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">É urgente, atenda!</string>
+  <string name="want_to_chat">Quer bater papo?</string>
+  <string name="quick_question">Pergunta rápida…</string>
+  <string name="message_composer_custom_message_hint">Escreva sua mensagem</string>
+  <string name="send_and_call">Enviar e ligar</string>
+  <string name="share_and_call">Compartilhar e ligar</string>
+  <string name="gallery_item_description">imagem de %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">imagem</string>
+  <string name="camera_media_failure">Falha ao carregar a imagem da câmera</string>
+  <string name="allow">Permitir</string>
+  <string name="camera_permission_text">Para tirar uma foto, permita o acesso à câmera</string>
+  <string name="gallery_permission_text">Para compartilhar uma imagem, permita o acesso à mídia</string>
+  <string name="description_call_composer_camera">Tirar uma foto</string>
+  <string name="description_call_composer_photo">Escolher uma foto</string>
+  <string name="description_call_composer_message">Enviar uma mensagem</string>
+  <string name="image_sent_messages">Foto enviada pelo Mensagens</string>
+  <string name="message_sent_messages">Mensagem enviada pelo Mensagens</string>
+  <string name="call_composer_image_uploading">Enviando imagem...</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-pt-rPT/strings.xml b/java/com/android/dialer/callcomposer/res/values-pt-rPT/strings.xml
index 34b3a96..44a8c5b 100644
--- a/java/com/android/dialer/callcomposer/res/values-pt-rPT/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-pt-rPT/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="urgent" msgid="5271653973625093934">"Urgente! Atenda!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"Quer conversar no chat?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"Uma pergunta rápida…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"Escreva uma mensagem personalizada"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"Enviar e ligar"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"Partilhar e ligar"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"imagem de <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"imagem"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"Não foi possível carregar a imagem da câmara"</string>
-    <string name="allow" msgid="8637148297403066623">"Permitir"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"Para tirar uma foto, conceda acesso à Câmara"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"Para partilhar uma imagem, conceda acesso a Multimédia"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"Tirar uma foto"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"Selecionar foto"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"Enviar uma mensagem"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"Foto enviada através da aplicação Mensagens"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"Mensagem enviada através da aplicação Mensagens"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"A enviar imagem…"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">Urgente! Atenda!</string>
+  <string name="want_to_chat">Quer conversar no chat?</string>
+  <string name="quick_question">Uma pergunta rápida…</string>
+  <string name="message_composer_custom_message_hint">Escreva uma mensagem personalizada</string>
+  <string name="send_and_call">Enviar e ligar</string>
+  <string name="share_and_call">Partilhar e ligar</string>
+  <string name="gallery_item_description">imagem de %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">imagem</string>
+  <string name="camera_media_failure">Não foi possível carregar a imagem da câmara</string>
+  <string name="allow">Permitir</string>
+  <string name="camera_permission_text">Para tirar uma foto, conceda acesso à Câmara</string>
+  <string name="gallery_permission_text">Para partilhar uma imagem, conceda acesso a Multimédia</string>
+  <string name="description_call_composer_camera">Tirar uma foto</string>
+  <string name="description_call_composer_photo">Selecionar foto</string>
+  <string name="description_call_composer_message">Enviar uma mensagem</string>
+  <string name="image_sent_messages">Foto enviada através da aplicação Mensagens</string>
+  <string name="message_sent_messages">Mensagem enviada através da aplicação Mensagens</string>
+  <string name="call_composer_image_uploading">A enviar imagem…</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-pt/strings.xml b/java/com/android/dialer/callcomposer/res/values-pt/strings.xml
index a090d15..1fea485 100644
--- a/java/com/android/dialer/callcomposer/res/values-pt/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-pt/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="urgent" msgid="5271653973625093934">"É urgente, atenda!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"Quer bater papo?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"Pergunta rápida…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"Escreva sua mensagem"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"Enviar e ligar"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"Compartilhar e ligar"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"imagem de <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"imagem"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"Falha ao carregar a imagem da câmera"</string>
-    <string name="allow" msgid="8637148297403066623">"Permitir"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"Para tirar uma foto, permita o acesso à câmera"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"Para compartilhar uma imagem, permita o acesso à mídia"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"Tirar uma foto"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"Escolher uma foto"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"Enviar uma mensagem"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"Foto enviada pelo Mensagens"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"Mensagem enviada pelo Mensagens"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Enviando imagem..."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">É urgente, atenda!</string>
+  <string name="want_to_chat">Quer bater papo?</string>
+  <string name="quick_question">Pergunta rápida…</string>
+  <string name="message_composer_custom_message_hint">Escreva sua mensagem</string>
+  <string name="send_and_call">Enviar e ligar</string>
+  <string name="share_and_call">Compartilhar e ligar</string>
+  <string name="gallery_item_description">imagem de %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">imagem</string>
+  <string name="camera_media_failure">Falha ao carregar a imagem da câmera</string>
+  <string name="allow">Permitir</string>
+  <string name="camera_permission_text">Para tirar uma foto, permita o acesso à câmera</string>
+  <string name="gallery_permission_text">Para compartilhar uma imagem, permita o acesso à mídia</string>
+  <string name="description_call_composer_camera">Tirar uma foto</string>
+  <string name="description_call_composer_photo">Escolher uma foto</string>
+  <string name="description_call_composer_message">Enviar uma mensagem</string>
+  <string name="image_sent_messages">Foto enviada pelo Mensagens</string>
+  <string name="message_sent_messages">Mensagem enviada pelo Mensagens</string>
+  <string name="call_composer_image_uploading">Enviando imagem...</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-ro/strings.xml b/java/com/android/dialer/callcomposer/res/values-ro/strings.xml
index 29de0ed..f1a6598 100644
--- a/java/com/android/dialer/callcomposer/res/values-ro/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-ro/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="urgent" msgid="5271653973625093934">"E urgent! Te rog să răspunzi!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"Vrei să conversezi prin chat?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"Întrebare rapidă…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"Scrieți mesaj personalizat"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"Trimiteți și apelați"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"Trimiteți și apelați"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"imagine din <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"imagine"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"Nu s-a putut încărca imaginea de la camera foto"</string>
-    <string name="allow" msgid="8637148297403066623">"Permiteți"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"Pentru a fotografia, permiteți accesul la Camera foto"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"Pentru a trimite o imagine, permiteți accesul la Conținutul media"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"Fotografiați"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"Alegeți o fotografie"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"Trimiteți un mesaj"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"Fotografie trimisă prin Messages"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"Mesaj trimis prin Messages"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Se trimite imaginea…"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">E urgent! Te rog să răspunzi!</string>
+  <string name="want_to_chat">Vrei să conversezi prin chat?</string>
+  <string name="quick_question">Întrebare rapidă…</string>
+  <string name="message_composer_custom_message_hint">Scrieți mesaj personalizat</string>
+  <string name="send_and_call">Trimiteți și apelați</string>
+  <string name="share_and_call">Trimiteți și apelați</string>
+  <string name="gallery_item_description">imagine din %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">imagine</string>
+  <string name="camera_media_failure">Nu s-a putut încărca imaginea de la camera foto</string>
+  <string name="allow">Permiteți</string>
+  <string name="camera_permission_text">Pentru a fotografia, permiteți accesul la Camera foto</string>
+  <string name="gallery_permission_text">Pentru a trimite o imagine, permiteți accesul la Conținutul media</string>
+  <string name="description_call_composer_camera">Fotografiați</string>
+  <string name="description_call_composer_photo">Alegeți o fotografie</string>
+  <string name="description_call_composer_message">Trimiteți un mesaj</string>
+  <string name="image_sent_messages">Fotografie trimisă prin Messages</string>
+  <string name="message_sent_messages">Mesaj trimis prin Messages</string>
+  <string name="call_composer_image_uploading">Se trimite imaginea…</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-ru/strings.xml b/java/com/android/dialer/callcomposer/res/values-ru/strings.xml
index ffdfb29..1dffce2 100644
--- a/java/com/android/dialer/callcomposer/res/values-ru/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-ru/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="urgent" msgid="5271653973625093934">"Срочно! Пожалуйста, возьмите трубку!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"Хотите пообщаться в чате?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"Небольшой вопрос…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"Добавьте свой текст"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"Отправить и позвонить"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"Поделиться и позвонить"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"изображение, <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"изображение"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"Не удалось загрузить изображение с камеры"</string>
-    <string name="allow" msgid="8637148297403066623">"Разрешить"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"Чтобы сделать снимок, предоставьте доступ к камере"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"Чтобы поделиться изображением, предоставьте доступ к мультимедиа"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"Сделать фото"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"Выбрать фото"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"Отправить сообщение"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"Фото отправлено через Android Сообщения"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"Сообщение отправлено через Android Сообщения"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Отправка изображения…"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">Срочно! Пожалуйста, возьмите трубку!</string>
+  <string name="want_to_chat">Хотите пообщаться в чате?</string>
+  <string name="quick_question">Небольшой вопрос…</string>
+  <string name="message_composer_custom_message_hint">Добавьте свой текст</string>
+  <string name="send_and_call">Отправить и позвонить</string>
+  <string name="share_and_call">Поделиться и позвонить</string>
+  <string name="gallery_item_description">изображение, %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">изображение</string>
+  <string name="camera_media_failure">Не удалось загрузить изображение с камеры</string>
+  <string name="allow">Разрешить</string>
+  <string name="camera_permission_text">Чтобы сделать снимок, предоставьте доступ к камере</string>
+  <string name="gallery_permission_text">Чтобы поделиться изображением, предоставьте доступ к мультимедиа</string>
+  <string name="description_call_composer_camera">Сделать фото</string>
+  <string name="description_call_composer_photo">Выбрать фото</string>
+  <string name="description_call_composer_message">Отправить сообщение</string>
+  <string name="image_sent_messages">Фото отправлено через Android Сообщения</string>
+  <string name="message_sent_messages">Сообщение отправлено через Android Сообщения</string>
+  <string name="call_composer_image_uploading">Отправка изображения…</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-si/strings.xml b/java/com/android/dialer/callcomposer/res/values-si/strings.xml
index cdea197..2d7ce24 100644
--- a/java/com/android/dialer/callcomposer/res/values-si/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-si/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="urgent" msgid="5271653973625093934">"හදිසියි! කරුණාකර ගන්න!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"කතාබස් කිරීමට අවශ්‍යද?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"ඉක්මන් ප්‍රශ්නය…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"අභිරුචි පණිවිඩයක් ලියන්න"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"යවන්න සහ අමතන්න"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"බෙදා ගෙන අමතන්න"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"රූපය <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"රූපය"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"කැමරා රූපය පූරණය කළ නොහැකි විය"</string>
-    <string name="allow" msgid="8637148297403066623">"ඉඩ දෙන්න"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"ඡායාරූපයක් ගැනීමට, කැමරාවට ප්‍රවේශය දෙන්න"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"රූපයක් බෙදා ගැනීමට, මාධ්‍යයට ප්‍රවේශය දෙන්න"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"පින්තුරයක් ගැනීම"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"ඡායාරූපයක් තේරීම"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"පණිවිඩයක් යැවීම"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"Messages හරහා ඡායාරූපය යවන ලදී"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"Messages හරහා පණිවිඩය යවන ලදී"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"රූපය යවමින්..."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">හදිසියි! කරුණාකර ගන්න!</string>
+  <string name="want_to_chat">කතාබස් කිරීමට අවශ්‍යද?</string>
+  <string name="quick_question">ඉක්මන් ප්‍රශ්නය…</string>
+  <string name="message_composer_custom_message_hint">අභිරුචි පණිවිඩයක් ලියන්න</string>
+  <string name="send_and_call">යවන්න සහ අමතන්න</string>
+  <string name="share_and_call">බෙදා ගෙන අමතන්න</string>
+  <string name="gallery_item_description">රූපය %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">රූපය</string>
+  <string name="camera_media_failure">කැමරා රූපය පූරණය කළ නොහැකි විය</string>
+  <string name="allow">ඉඩ දෙන්න</string>
+  <string name="camera_permission_text">ඡායාරූපයක් ගැනීමට, කැමරාවට ප්‍රවේශය දෙන්න</string>
+  <string name="gallery_permission_text">රූපයක් බෙදා ගැනීමට, මාධ්‍යයට ප්‍රවේශය දෙන්න</string>
+  <string name="description_call_composer_camera">පින්තුරයක් ගැනීම</string>
+  <string name="description_call_composer_photo">ඡායාරූපයක් තේරීම</string>
+  <string name="description_call_composer_message">පණිවිඩයක් යැවීම</string>
+  <string name="image_sent_messages">Messages හරහා ඡායාරූපය යවන ලදී</string>
+  <string name="message_sent_messages">Messages හරහා පණිවිඩය යවන ලදී</string>
+  <string name="call_composer_image_uploading">රූපය යවමින්...</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-sk/strings.xml b/java/com/android/dialer/callcomposer/res/values-sk/strings.xml
index e478e63..f6675f1 100644
--- a/java/com/android/dialer/callcomposer/res/values-sk/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-sk/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="urgent" msgid="5271653973625093934">"Súrne! Zodvihnite, prosím."</string>
-    <string name="want_to_chat" msgid="847333669248949914">"Chcete četovať?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"Rýchla otázka…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"Napíšte vlastnú správu"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"Odoslať a zavolať"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"Zdieľať a volať"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"obrázok – <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"obrázok"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"Obrázok z fotoaparátu sa nepodarilo načítať"</string>
-    <string name="allow" msgid="8637148297403066623">"Povoliť"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"Ak chcete fotiť, povoľte prístup k fotoaparátu"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"Ak chcete zdieľať obrázok, povoľte prístup k médiám"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"Odfotiť"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"Vybrať fotku"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"Odoslať správu"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"Fotka bola odoslaná prostredníctvom Správ"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"Správa bola odoslaná prostredníctvom Správ"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Odosiela sa obrázok…"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">Súrne! Zodvihnite, prosím.</string>
+  <string name="want_to_chat">Chcete četovať?</string>
+  <string name="quick_question">Rýchla otázka…</string>
+  <string name="message_composer_custom_message_hint">Napíšte vlastnú správu</string>
+  <string name="send_and_call">Odoslať a zavolať</string>
+  <string name="share_and_call">Zdieľať a volať</string>
+  <string name="gallery_item_description">obrázok – %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">obrázok</string>
+  <string name="camera_media_failure">Obrázok z fotoaparátu sa nepodarilo načítať</string>
+  <string name="allow">Povoliť</string>
+  <string name="camera_permission_text">Ak chcete fotiť, povoľte prístup k fotoaparátu</string>
+  <string name="gallery_permission_text">Ak chcete zdieľať obrázok, povoľte prístup k médiám</string>
+  <string name="description_call_composer_camera">Odfotiť</string>
+  <string name="description_call_composer_photo">Vybrať fotku</string>
+  <string name="description_call_composer_message">Odoslať správu</string>
+  <string name="image_sent_messages">Fotka bola odoslaná prostredníctvom Správ</string>
+  <string name="message_sent_messages">Správa bola odoslaná prostredníctvom Správ</string>
+  <string name="call_composer_image_uploading">Odosiela sa obrázok…</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-sl/strings.xml b/java/com/android/dialer/callcomposer/res/values-sl/strings.xml
index 85dd23d..86d734d 100644
--- a/java/com/android/dialer/callcomposer/res/values-sl/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-sl/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="urgent" msgid="5271653973625093934">"Nujno. Prosim, sprejmi."</string>
-    <string name="want_to_chat" msgid="847333669248949914">"Želite klepetati?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"Kratko vprašanje …"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"Napišite sporočilo po meri"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"Pošlji in pokliči"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"Klic s skupno rabo"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"slika <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"slika"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"Slike fotoaparata ni bilo mogoče naložiti"</string>
-    <string name="allow" msgid="8637148297403066623">"Dovoli"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"Če želite posneti fotografijo, omogočite dostop do fotoaparata"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"Če želite deliti sliko z drugimi, omogočite dostop do predstavnosti"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"Posnemi fotografijo"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"Izberi fotografijo"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"Pošlji sporočilo"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"Fotografija je bila poslana prek aplikacije Messages"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"Sporočilo je bila poslano prek aplikacije Messages"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Pošiljanje slike …"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">Nujno. Prosim, sprejmi.</string>
+  <string name="want_to_chat">Želite klepetati?</string>
+  <string name="quick_question">Kratko vprašanje …</string>
+  <string name="message_composer_custom_message_hint">Napišite sporočilo po meri</string>
+  <string name="send_and_call">Pošlji in pokliči</string>
+  <string name="share_and_call">Klic s skupno rabo</string>
+  <string name="gallery_item_description">slika %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">slika</string>
+  <string name="camera_media_failure">Slike fotoaparata ni bilo mogoče naložiti</string>
+  <string name="allow">Dovoli</string>
+  <string name="camera_permission_text">Če želite posneti fotografijo, omogočite dostop do fotoaparata</string>
+  <string name="gallery_permission_text">Če želite deliti sliko z drugimi, omogočite dostop do predstavnosti</string>
+  <string name="description_call_composer_camera">Posnemi fotografijo</string>
+  <string name="description_call_composer_photo">Izberi fotografijo</string>
+  <string name="description_call_composer_message">Pošlji sporočilo</string>
+  <string name="image_sent_messages">Fotografija je bila poslana prek aplikacije Messages</string>
+  <string name="message_sent_messages">Sporočilo je bila poslano prek aplikacije Messages</string>
+  <string name="call_composer_image_uploading">Pošiljanje slike …</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-sq/strings.xml b/java/com/android/dialer/callcomposer/res/values-sq/strings.xml
index aba7c81..d82a440 100644
--- a/java/com/android/dialer/callcomposer/res/values-sq/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-sq/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="urgent" msgid="5271653973625093934">"Urgjente! Përgjigju!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"Dëshiron të bisedosh?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"Një pyetje e shpejtë…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"Shkruaj mesazh të person."</string>
-    <string name="send_and_call" msgid="3749091015058610762">"Dërgo dhe telefono"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"Ndaj dhe telefono"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"imazh <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"imazh"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"Imazhi i kamerës nuk mund të ngarkohej"</string>
-    <string name="allow" msgid="8637148297403066623">"Lejo"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"Për të shkrepur një fotografi, jep qasjen te Kamera"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"Për të ndarë një imazh, jep qasjen te Media"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"Bëj një fotografi"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"Zgjidh një fotografi"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"Dërgo një mesazh"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"Fotografia u dërgua nëpërmjet \"Mesazheve\""</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"Mesazhi u dërgua nëpërmjet \"Mesazheve\""</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Imazhi po dërgohet..."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">Urgjente! Përgjigju!</string>
+  <string name="want_to_chat">Dëshiron të bisedosh?</string>
+  <string name="quick_question">Një pyetje e shpejtë…</string>
+  <string name="message_composer_custom_message_hint">Shkruaj mesazh të person.</string>
+  <string name="send_and_call">Dërgo dhe telefono</string>
+  <string name="share_and_call">Ndaj dhe telefono</string>
+  <string name="gallery_item_description">imazh %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">imazh</string>
+  <string name="camera_media_failure">Imazhi i kamerës nuk mund të ngarkohej</string>
+  <string name="allow">Lejo</string>
+  <string name="camera_permission_text">Për të shkrepur një fotografi, jep qasjen te Kamera</string>
+  <string name="gallery_permission_text">Për të ndarë një imazh, jep qasjen te Media</string>
+  <string name="description_call_composer_camera">Bëj një fotografi</string>
+  <string name="description_call_composer_photo">Zgjidh një fotografi</string>
+  <string name="description_call_composer_message">Dërgo një mesazh</string>
+  <string name="image_sent_messages">Fotografia u dërgua nëpërmjet \"Mesazheve\"</string>
+  <string name="message_sent_messages">Mesazhi u dërgua nëpërmjet \"Mesazheve\"</string>
+  <string name="call_composer_image_uploading">Imazhi po dërgohet...</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-sr/strings.xml b/java/com/android/dialer/callcomposer/res/values-sr/strings.xml
index ead04fc..1280859 100644
--- a/java/com/android/dialer/callcomposer/res/values-sr/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-sr/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="urgent" msgid="5271653973625093934">"Хитно је! Јави се!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"Желиш да ћаскаш?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"Кратко питање…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"Напишите прилагођену поруку"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"Пошаљи и позови"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"Дели и позови"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"слика, <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"слика"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"Учитавање слике са камере није успело"</string>
-    <string name="allow" msgid="8637148297403066623">"Дозволи"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"Одобрите приступ Камери да бисте снимили слику"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"Одобрите приступ Медијима да бисте делили слику"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"Сликајте"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"Изаберите слику"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"Пошаљите поруку"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"Слика је послата преко Messages-а"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"Порука је послата преко Messages-а"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Шаље се слика…"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">Хитно је! Јави се!</string>
+  <string name="want_to_chat">Желиш да ћаскаш?</string>
+  <string name="quick_question">Кратко питање…</string>
+  <string name="message_composer_custom_message_hint">Напишите прилагођену поруку</string>
+  <string name="send_and_call">Пошаљи и позови</string>
+  <string name="share_and_call">Дели и позови</string>
+  <string name="gallery_item_description">слика, %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">слика</string>
+  <string name="camera_media_failure">Учитавање слике са камере није успело</string>
+  <string name="allow">Дозволи</string>
+  <string name="camera_permission_text">Одобрите приступ Камери да бисте снимили слику</string>
+  <string name="gallery_permission_text">Одобрите приступ Медијима да бисте делили слику</string>
+  <string name="description_call_composer_camera">Сликајте</string>
+  <string name="description_call_composer_photo">Изаберите слику</string>
+  <string name="description_call_composer_message">Пошаљите поруку</string>
+  <string name="image_sent_messages">Слика је послата преко Messages-а</string>
+  <string name="message_sent_messages">Порука је послата преко Messages-а</string>
+  <string name="call_composer_image_uploading">Шаље се слика…</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-sv/strings.xml b/java/com/android/dialer/callcomposer/res/values-sv/strings.xml
index 0e37b29..14f3c4b 100644
--- a/java/com/android/dialer/callcomposer/res/values-sv/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-sv/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="urgent" msgid="5271653973625093934">"Viktig! Svara!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"Vill du chatta?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"Snabb fråga …"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"Skriv anpassat meddelande"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"Skicka och ring"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"Dela och ring"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"bild den <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"bild"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"Det gick inte att läsa in kamerabild"</string>
-    <string name="allow" msgid="8637148297403066623">"Tillåt"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"Bevilja åtkomst till Kamera om du vill ta ett foto"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"Bevilja åtkomst till Media om du vill dela en bild"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"Ta en bild"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"Välj ett foto"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"Skicka ett meddelande"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"Fotot har skickats via Messages"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"Meddelandet har skickats via Messages"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Skickar bild …"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">Viktig! Svara!</string>
+  <string name="want_to_chat">Vill du chatta?</string>
+  <string name="quick_question">Snabb fråga …</string>
+  <string name="message_composer_custom_message_hint">Skriv anpassat meddelande</string>
+  <string name="send_and_call">Skicka och ring</string>
+  <string name="share_and_call">Dela och ring</string>
+  <string name="gallery_item_description">bild den %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">bild</string>
+  <string name="camera_media_failure">Det gick inte att läsa in kamerabild</string>
+  <string name="allow">Tillåt</string>
+  <string name="camera_permission_text">Bevilja åtkomst till Kamera om du vill ta ett foto</string>
+  <string name="gallery_permission_text">Bevilja åtkomst till Media om du vill dela en bild</string>
+  <string name="description_call_composer_camera">Ta en bild</string>
+  <string name="description_call_composer_photo">Välj ett foto</string>
+  <string name="description_call_composer_message">Skicka ett meddelande</string>
+  <string name="image_sent_messages">Fotot har skickats via Messages</string>
+  <string name="message_sent_messages">Meddelandet har skickats via Messages</string>
+  <string name="call_composer_image_uploading">Skickar bild …</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-sw/strings.xml b/java/com/android/dialer/callcomposer/res/values-sw/strings.xml
index 03a7eac..fe7d336 100644
--- a/java/com/android/dialer/callcomposer/res/values-sw/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-sw/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="urgent" msgid="5271653973625093934">"Ni muhimu! Chukua simu tafadhali!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"Unataka kupiga gumzo?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"Hebu nikuulize…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"Andika ujumbe maalum"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"Tuma na umpigie"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"Shiriki na upige simu"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"picha <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"picha"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"Imeshindwa kupakia picha ya kamera"</string>
-    <string name="allow" msgid="8637148297403066623">"Ruhusu"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"Ruhusu programu ifikie Kamera ili uweze kupiga picha"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"Ruhusu programu ifikie hifadhi ili uweze kushiriki picha"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"Piga picha"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"Chagua picha"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"Tuma ujumbe"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"Picha imetumwa kupitia Programu ya Messages"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"Ujumbe umetumwa kupitia Programu ya Messages"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Inatuma picha…"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">Ni muhimu! Chukua simu tafadhali!</string>
+  <string name="want_to_chat">Unataka kupiga gumzo?</string>
+  <string name="quick_question">Hebu nikuulize…</string>
+  <string name="message_composer_custom_message_hint">Andika ujumbe maalum</string>
+  <string name="send_and_call">Tuma na umpigie</string>
+  <string name="share_and_call">Shiriki na upige simu</string>
+  <string name="gallery_item_description">picha %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">picha</string>
+  <string name="camera_media_failure">Imeshindwa kupakia picha ya kamera</string>
+  <string name="allow">Ruhusu</string>
+  <string name="camera_permission_text">Ruhusu programu ifikie Kamera ili uweze kupiga picha</string>
+  <string name="gallery_permission_text">Ruhusu programu ifikie hifadhi ili uweze kushiriki picha</string>
+  <string name="description_call_composer_camera">Piga picha</string>
+  <string name="description_call_composer_photo">Chagua picha</string>
+  <string name="description_call_composer_message">Tuma ujumbe</string>
+  <string name="image_sent_messages">Picha imetumwa kupitia Programu ya Messages</string>
+  <string name="message_sent_messages">Ujumbe umetumwa kupitia Programu ya Messages</string>
+  <string name="call_composer_image_uploading">Inatuma picha…</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-ta/strings.xml b/java/com/android/dialer/callcomposer/res/values-ta/strings.xml
index e006ff9..ae90e45 100644
--- a/java/com/android/dialer/callcomposer/res/values-ta/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-ta/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="urgent" msgid="5271653973625093934">"அவசரம்! அழைப்பை எடுக்கவும்!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"அரட்டை அடிக்க வேண்டுமா?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"விரைவுக் கேள்வி…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"தனிப்பயன் செய்தியை எழுதவும்"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"அனுப்பி, அழை"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"பகிர்ந்து அழை"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"படம், <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"படம்"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"கேமரா படத்தை ஏற்ற முடியவில்லை"</string>
-    <string name="allow" msgid="8637148297403066623">"அனுமதி"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"படமெடுக்க, கேமராவிற்கு அணுகல் வழங்கவும்"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"படத்தைப் பகிர, மீடியாவிற்கு அணுகல் வழங்கவும்"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"படமெடுக்கவும்"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"புகைப்படத்தைத் தேர்வு செய்யும்"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"செய்தியை அனுப்பும்"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"மெசேஜஸ் மூலம் படம் அனுப்பப்பட்டது"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"மெசேஜஸ் மூலம் செய்தி அனுப்பப்பட்டது"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"படத்தை அனுப்புகிறது…"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">அவசரம்! அழைப்பை எடுக்கவும்!</string>
+  <string name="want_to_chat">அரட்டை அடிக்க வேண்டுமா?</string>
+  <string name="quick_question">விரைவுக் கேள்வி…</string>
+  <string name="message_composer_custom_message_hint">தனிப்பயன் செய்தியை எழுதவும்</string>
+  <string name="send_and_call">அனுப்பி, அழை</string>
+  <string name="share_and_call">பகிர்ந்து அழை</string>
+  <string name="gallery_item_description">படம், %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">படம்</string>
+  <string name="camera_media_failure">கேமரா படத்தை ஏற்ற முடியவில்லை</string>
+  <string name="allow">அனுமதி</string>
+  <string name="camera_permission_text">படமெடுக்க, கேமராவிற்கு அணுகல் வழங்கவும்</string>
+  <string name="gallery_permission_text">படத்தைப் பகிர, மீடியாவிற்கு அணுகல் வழங்கவும்</string>
+  <string name="description_call_composer_camera">படமெடுக்கவும்</string>
+  <string name="description_call_composer_photo">புகைப்படத்தைத் தேர்வு செய்யும்</string>
+  <string name="description_call_composer_message">செய்தியை அனுப்பும்</string>
+  <string name="image_sent_messages">மெசேஜஸ் மூலம் படம் அனுப்பப்பட்டது</string>
+  <string name="message_sent_messages">மெசேஜஸ் மூலம் செய்தி அனுப்பப்பட்டது</string>
+  <string name="call_composer_image_uploading">படத்தை அனுப்புகிறது…</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-te/strings.xml b/java/com/android/dialer/callcomposer/res/values-te/strings.xml
index b3f4666..22282bc 100644
--- a/java/com/android/dialer/callcomposer/res/values-te/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-te/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="urgent" msgid="5271653973625093934">"అత్యవసరం! దయచేసి కాల్ ఎత్తండి!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"చాట్ చేయాలనుకుంటున్నారా?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"త్వరిత ప్రశ్న…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"అనుకూల సందేశాన్ని వ్రాయండి"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"పంపి, కాల్ చేయి"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"భాగస్వా. చేసి, కాల్ చేయి"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"చిత్రం <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"చిత్రం"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"కెమెరా చిత్రాన్ని లోడ్ చేయడం సాధ్యపడలేదు"</string>
-    <string name="allow" msgid="8637148297403066623">"అనుమతించు"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"ఫోటోను తీయడానికి, కెమెరాకు ప్రాప్యతను అందించండి"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"చిత్రాన్ని భాగస్వామ్యం చేయడానికి, మీడియాకు ప్రాప్యతను అందించండి"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"చిత్రాన్ని తీస్తుంది"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"ఫోటోను ఎంచుకోండి"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"సందేశాన్ని పంపుతుంది"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"సందేశాల అనువర్తనం ద్వారా ఫోటోను పంపాము"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"సందేశాల అనువర్తనం ద్వారా సందేశాన్ని పంపాము"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"చిత్రాన్ని పంపుతోంది…"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">అత్యవసరం! దయచేసి కాల్ ఎత్తండి!</string>
+  <string name="want_to_chat">చాట్ చేయాలనుకుంటున్నారా?</string>
+  <string name="quick_question">త్వరిత ప్రశ్న…</string>
+  <string name="message_composer_custom_message_hint">అనుకూల సందేశాన్ని వ్రాయండి</string>
+  <string name="send_and_call">పంపి, కాల్ చేయి</string>
+  <string name="share_and_call">భాగస్వా. చేసి, కాల్ చేయి</string>
+  <string name="gallery_item_description">చిత్రం %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">చిత్రం</string>
+  <string name="camera_media_failure">కెమెరా చిత్రాన్ని లోడ్ చేయడం సాధ్యపడలేదు</string>
+  <string name="allow">అనుమతించు</string>
+  <string name="camera_permission_text">ఫోటోను తీయడానికి, కెమెరాకు ప్రాప్యతను అందించండి</string>
+  <string name="gallery_permission_text">చిత్రాన్ని భాగస్వామ్యం చేయడానికి, మీడియాకు ప్రాప్యతను అందించండి</string>
+  <string name="description_call_composer_camera">చిత్రాన్ని తీస్తుంది</string>
+  <string name="description_call_composer_photo">ఫోటోను ఎంచుకోండి</string>
+  <string name="description_call_composer_message">సందేశాన్ని పంపుతుంది</string>
+  <string name="image_sent_messages">సందేశాల అనువర్తనం ద్వారా ఫోటోను పంపాము</string>
+  <string name="message_sent_messages">సందేశాల అనువర్తనం ద్వారా సందేశాన్ని పంపాము</string>
+  <string name="call_composer_image_uploading">చిత్రాన్ని పంపుతోంది…</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-th/strings.xml b/java/com/android/dialer/callcomposer/res/values-th/strings.xml
index 125a24b..180a7a7 100644
--- a/java/com/android/dialer/callcomposer/res/values-th/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-th/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="urgent" msgid="5271653973625093934">"โปรดรับสายด่วน!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"ต้องการแชทใช่ไหม"</string>
-    <string name="quick_question" msgid="3501160802390214092">"ขอถามอะไรหน่อย…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"เขียนข้อความที่กำหนดเอง"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"ส่งและโทร"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"แชร์และโทร"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"รูปภาพเมื่อวันที่ <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"รูปภาพ"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"ไม่สามารถโหลดภาพจากกล้องได้"</string>
-    <string name="allow" msgid="8637148297403066623">"อนุญาต"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"หากต้องการถ่ายภาพ โปรดให้สิทธิ์การเข้าถึงกล้อง"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"หากต้องการแชร์รูปภาพ โปรดให้สิทธิ์การเข้าถึงสื่อ"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"ถ่ายภาพ"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"เลือกรูปภาพ"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"ส่งข้อความ"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"ส่งรูปภาพผ่าน Messages แล้ว"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"ส่งข้อความผ่าน Messages แล้ว"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"กำลังส่งรูปภาพ..."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">โปรดรับสายด่วน!</string>
+  <string name="want_to_chat">ต้องการแชทใช่ไหม</string>
+  <string name="quick_question">ขอถามอะไรหน่อย…</string>
+  <string name="message_composer_custom_message_hint">เขียนข้อความที่กำหนดเอง</string>
+  <string name="send_and_call">ส่งและโทร</string>
+  <string name="share_and_call">แชร์และโทร</string>
+  <string name="gallery_item_description">รูปภาพเมื่อวันที่ %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">รูปภาพ</string>
+  <string name="camera_media_failure">ไม่สามารถโหลดภาพจากกล้องได้</string>
+  <string name="allow">อนุญาต</string>
+  <string name="camera_permission_text">หากต้องการถ่ายภาพ โปรดให้สิทธิ์การเข้าถึงกล้อง</string>
+  <string name="gallery_permission_text">หากต้องการแชร์รูปภาพ โปรดให้สิทธิ์การเข้าถึงสื่อ</string>
+  <string name="description_call_composer_camera">ถ่ายภาพ</string>
+  <string name="description_call_composer_photo">เลือกรูปภาพ</string>
+  <string name="description_call_composer_message">ส่งข้อความ</string>
+  <string name="image_sent_messages">ส่งรูปภาพผ่าน Messages แล้ว</string>
+  <string name="message_sent_messages">ส่งข้อความผ่าน Messages แล้ว</string>
+  <string name="call_composer_image_uploading">กำลังส่งรูปภาพ...</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-tl/strings.xml b/java/com/android/dialer/callcomposer/res/values-tl/strings.xml
index 7e7dac6..b96f93c 100644
--- a/java/com/android/dialer/callcomposer/res/values-tl/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-tl/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="urgent" msgid="5271653973625093934">"Apurahan! Pakisagot!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"Gusto mo bang makipag-chat?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"Maikling tanong…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"Sumulat ng custom na mensahe"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"Ipadala at tumawag"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"Ibahagi at tumawag"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"larawan <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"larawan"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"Hindi mai-load ang larawan ng camera"</string>
-    <string name="allow" msgid="8637148297403066623">"Payagan"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"Upang kumuha ng larawan, magbigay ng access sa Camera"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"Upang magbahagi ng imahe, magbigay ng access sa Media"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"Kumuha ng larawan"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"Pumili ng larawan"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"Magpadala ng mensahe"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"Larawang ipinadala sa pamamagitan ng Messages"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"Mensaheng ipinadala sa pamamagitan ng Messages"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Ipinapadala ang larawan…"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">Apurahan! Pakisagot!</string>
+  <string name="want_to_chat">Gusto mo bang makipag-chat?</string>
+  <string name="quick_question">Maikling tanong…</string>
+  <string name="message_composer_custom_message_hint">Sumulat ng custom na mensahe</string>
+  <string name="send_and_call">Ipadala at tumawag</string>
+  <string name="share_and_call">Ibahagi at tumawag</string>
+  <string name="gallery_item_description">larawan %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">larawan</string>
+  <string name="camera_media_failure">Hindi mai-load ang larawan ng camera</string>
+  <string name="allow">Payagan</string>
+  <string name="camera_permission_text">Upang kumuha ng larawan, magbigay ng access sa Camera</string>
+  <string name="gallery_permission_text">Upang magbahagi ng imahe, magbigay ng access sa Media</string>
+  <string name="description_call_composer_camera">Kumuha ng larawan</string>
+  <string name="description_call_composer_photo">Pumili ng larawan</string>
+  <string name="description_call_composer_message">Magpadala ng mensahe</string>
+  <string name="image_sent_messages">Larawang ipinadala sa pamamagitan ng Messages</string>
+  <string name="message_sent_messages">Mensaheng ipinadala sa pamamagitan ng Messages</string>
+  <string name="call_composer_image_uploading">Ipinapadala ang larawan…</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-tr/strings.xml b/java/com/android/dialer/callcomposer/res/values-tr/strings.xml
index 99523d5..aabd2ef 100644
--- a/java/com/android/dialer/callcomposer/res/values-tr/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-tr/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="urgent" msgid="5271653973625093934">"Acil! Lütfen telefona cevap verin!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"Sohbet etmek mi istiyorsunuz?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"Kısa soru…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"Özel bir mesaj yazın"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"Gönder ve telefon et"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"Paylaş ve telefon et"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"resim <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"resim"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"Kamera görüntüsü yüklenemedi"</string>
-    <string name="allow" msgid="8637148297403066623">"İzin ver"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"Fotoğraf çekmek için Kamera\'ya erişim izni verin"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"Resim paylaşmak için Medya\'ya erişim izni verin"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"Resim çeker"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"Fotoğraf seçilmesini sağlar"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"Mesaj gönderir"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"Fotoğraf, Mesajlar uygulaması üzerinden gönderildi"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"Mesaj, Mesajlar uygulaması üzerinden gönderildi"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Resim gönderiliyor…"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">Acil! Lütfen telefona cevap verin!</string>
+  <string name="want_to_chat">Sohbet etmek mi istiyorsunuz?</string>
+  <string name="quick_question">Kısa soru…</string>
+  <string name="message_composer_custom_message_hint">Özel bir mesaj yazın</string>
+  <string name="send_and_call">Gönder ve telefon et</string>
+  <string name="share_and_call">Paylaş ve telefon et</string>
+  <string name="gallery_item_description">resim %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">resim</string>
+  <string name="camera_media_failure">Kamera görüntüsü yüklenemedi</string>
+  <string name="allow">İzin ver</string>
+  <string name="camera_permission_text">Fotoğraf çekmek için Kamera\'ya erişim izni verin</string>
+  <string name="gallery_permission_text">Resim paylaşmak için Medya\'ya erişim izni verin</string>
+  <string name="description_call_composer_camera">Resim çeker</string>
+  <string name="description_call_composer_photo">Fotoğraf seçilmesini sağlar</string>
+  <string name="description_call_composer_message">Mesaj gönderir</string>
+  <string name="image_sent_messages">Fotoğraf, Mesajlar uygulaması üzerinden gönderildi</string>
+  <string name="message_sent_messages">Mesaj, Mesajlar uygulaması üzerinden gönderildi</string>
+  <string name="call_composer_image_uploading">Resim gönderiliyor…</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-uk/strings.xml b/java/com/android/dialer/callcomposer/res/values-uk/strings.xml
index fa57d3d..9ec82a6 100644
--- a/java/com/android/dialer/callcomposer/res/values-uk/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-uk/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="urgent" msgid="5271653973625093934">"Терміново! Візьміть слухавку!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"Хочете поспілкуватися?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"Швидке запитання…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"Ваше власне повідомлення"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"Надіслати й зателефонувати"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"Надіслати й зателефонувати"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"зображення <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"зображення"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"Не вдалося завантажити зображення з камери"</string>
-    <string name="allow" msgid="8637148297403066623">"Дозволити"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"Щоб сфотографувати, надайте доступ до камери"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"Щоб поділитися зображенням, надайте доступ до медіа-вмісту"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"Зробити знімок"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"Вибрати фотографію"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"Надіслати повідомлення"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"Фотографію надіслано через додаток Повідомлення"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"Текст надіслано через додаток Повідомлення"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Надсилання зображення…"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">Терміново! Візьміть слухавку!</string>
+  <string name="want_to_chat">Хочете поспілкуватися?</string>
+  <string name="quick_question">Швидке запитання…</string>
+  <string name="message_composer_custom_message_hint">Ваше власне повідомлення</string>
+  <string name="send_and_call">Надіслати й зателефонувати</string>
+  <string name="share_and_call">Надіслати й зателефонувати</string>
+  <string name="gallery_item_description">зображення %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">зображення</string>
+  <string name="camera_media_failure">Не вдалося завантажити зображення з камери</string>
+  <string name="allow">Дозволити</string>
+  <string name="camera_permission_text">Щоб сфотографувати, надайте доступ до камери</string>
+  <string name="gallery_permission_text">Щоб поділитися зображенням, надайте доступ до медіа-вмісту</string>
+  <string name="description_call_composer_camera">Зробити знімок</string>
+  <string name="description_call_composer_photo">Вибрати фотографію</string>
+  <string name="description_call_composer_message">Надіслати повідомлення</string>
+  <string name="image_sent_messages">Фотографію надіслано через додаток Повідомлення</string>
+  <string name="message_sent_messages">Текст надіслано через додаток Повідомлення</string>
+  <string name="call_composer_image_uploading">Надсилання зображення…</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-ur/strings.xml b/java/com/android/dialer/callcomposer/res/values-ur/strings.xml
index 2677bd2..e075a2d 100644
--- a/java/com/android/dialer/callcomposer/res/values-ur/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-ur/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="urgent" msgid="5271653973625093934">"ارجنٹ! براہ کرم فون اٹھائیں!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"چیٹ کرنا چاہتے ہیں؟"</string>
-    <string name="quick_question" msgid="3501160802390214092">"فوری سوال…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"ایک حسب ضرورت پیغام لکھیں"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"بھیجیں اور کال کریں"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"اشتراک کریں اور کال کریں"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"تصویر <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"تصویر"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"کیمرے کی تصویر لوڈ نہیں ہو سکی"</string>
-    <string name="allow" msgid="8637148297403066623">"اجازت دیں"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"تصویر لینے کیلئے کیمرا کو رسائی دیں"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"تصویر کا اشتراک کرنے کیلئے میڈیا تک رسائی دیں"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"تصویر لیں"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"ایک تصویر چنیں"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"پیغام بھیجیں"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"تصویر پیغامات کے ذریعے بھیجی گئی"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"پیغام پیغامات کے ذریعے بھیجا گیا"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"تصویر بھیجی جا رہی ہے…"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">ارجنٹ! براہ کرم فون اٹھائیں!</string>
+  <string name="want_to_chat">چیٹ کرنا چاہتے ہیں؟</string>
+  <string name="quick_question">فوری سوال…</string>
+  <string name="message_composer_custom_message_hint">ایک حسب ضرورت پیغام لکھیں</string>
+  <string name="send_and_call">بھیجیں اور کال کریں</string>
+  <string name="share_and_call">اشتراک کریں اور کال کریں</string>
+  <string name="gallery_item_description">تصویر %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">تصویر</string>
+  <string name="camera_media_failure">کیمرے کی تصویر لوڈ نہیں ہو سکی</string>
+  <string name="allow">اجازت دیں</string>
+  <string name="camera_permission_text">تصویر لینے کیلئے کیمرا کو رسائی دیں</string>
+  <string name="gallery_permission_text">تصویر کا اشتراک کرنے کیلئے میڈیا تک رسائی دیں</string>
+  <string name="description_call_composer_camera">تصویر لیں</string>
+  <string name="description_call_composer_photo">ایک تصویر چنیں</string>
+  <string name="description_call_composer_message">پیغام بھیجیں</string>
+  <string name="image_sent_messages">تصویر پیغامات کے ذریعے بھیجی گئی</string>
+  <string name="message_sent_messages">پیغام پیغامات کے ذریعے بھیجا گیا</string>
+  <string name="call_composer_image_uploading">تصویر بھیجی جا رہی ہے…</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-uz/strings.xml b/java/com/android/dialer/callcomposer/res/values-uz/strings.xml
index 79152b5..abe2f4f 100644
--- a/java/com/android/dialer/callcomposer/res/values-uz/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-uz/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="urgent" msgid="5271653973625093934">"Juda shoshilinch! Iltimos, go‘shakni ko‘taring!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"Chatda suhbatlashasizmi?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"Bir kichik savol…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"Boshqa xabar yozing"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"Yuborish va qo‘ng‘iroq qilish"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"Ulashish va chaqirish"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"tasvir, <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"tasvir"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"Kamera orqali olingan suratni yuklab bo‘lmadi"</string>
-    <string name="allow" msgid="8637148297403066623">"Ruxsat berish"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"Suratga olish uchun kameraga kirshga ruxsat bering"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"Rasmni baham ko‘rish uchun media fayllarga kirishga ruxsat bering"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"Rasmga olish"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"Rasm tanlash"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"Xabar yuborish"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"Rasm Android Xabarlar orqali yuborildi"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"Xabar Android Xabarlar orqali yuborildi"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Tasvir yuborilmoqda…"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">Juda shoshilinch! Iltimos, go‘shakni ko‘taring!</string>
+  <string name="want_to_chat">Chatda suhbatlashasizmi?</string>
+  <string name="quick_question">Bir kichik savol…</string>
+  <string name="message_composer_custom_message_hint">Boshqa xabar yozing</string>
+  <string name="send_and_call">Yuborish va qo‘ng‘iroq qilish</string>
+  <string name="share_and_call">Ulashish va chaqirish</string>
+  <string name="gallery_item_description">tasvir, %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">tasvir</string>
+  <string name="camera_media_failure">Kamera orqali olingan suratni yuklab bo‘lmadi</string>
+  <string name="allow">Ruxsat berish</string>
+  <string name="camera_permission_text">Suratga olish uchun kameraga kirshga ruxsat bering</string>
+  <string name="gallery_permission_text">Rasmni baham ko‘rish uchun media fayllarga kirishga ruxsat bering</string>
+  <string name="description_call_composer_camera">Rasmga olish</string>
+  <string name="description_call_composer_photo">Rasm tanlash</string>
+  <string name="description_call_composer_message">Xabar yuborish</string>
+  <string name="image_sent_messages">Rasm Android Xabarlar orqali yuborildi</string>
+  <string name="message_sent_messages">Xabar Android Xabarlar orqali yuborildi</string>
+  <string name="call_composer_image_uploading">Tasvir yuborilmoqda…</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-vi/strings.xml b/java/com/android/dialer/callcomposer/res/values-vi/strings.xml
index f065f17..56e9736 100644
--- a/java/com/android/dialer/callcomposer/res/values-vi/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-vi/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="urgent" msgid="5271653973625093934">"Khẩn cấp! Vui lòng chọn!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"Bạn muốn trò chuyện?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"Câu hỏi nhanh…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"Viết tin nhắn tùy chỉnh"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"Gửi và gọi"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"Chia sẻ và gọi"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"hình ảnh <xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"hình ảnh"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"Không thể tải hình ảnh trong máy ảnh"</string>
-    <string name="allow" msgid="8637148297403066623">"Cho phép"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"Để chụp ảnh, hãy cấp quyền truy cập vào Máy ảnh"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"Để chia sẻ ảnh, hãy cấp quyền truy cập vào Phương tiện"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"Chụp ảnh"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"Chọn ảnh"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"Gửi tin nhắn"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"Đã gửi ảnh qua Messages"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"Đã gửi tin nhắn qua Messages"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Đang gửi hình ảnh..."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">Khẩn cấp! Vui lòng chọn!</string>
+  <string name="want_to_chat">Bạn muốn trò chuyện?</string>
+  <string name="quick_question">Câu hỏi nhanh…</string>
+  <string name="message_composer_custom_message_hint">Viết tin nhắn tùy chỉnh</string>
+  <string name="send_and_call">Gửi và gọi</string>
+  <string name="share_and_call">Chia sẻ và gọi</string>
+  <string name="gallery_item_description">hình ảnh %1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">hình ảnh</string>
+  <string name="camera_media_failure">Không thể tải hình ảnh trong máy ảnh</string>
+  <string name="allow">Cho phép</string>
+  <string name="camera_permission_text">Để chụp ảnh, hãy cấp quyền truy cập vào Máy ảnh</string>
+  <string name="gallery_permission_text">Để chia sẻ ảnh, hãy cấp quyền truy cập vào Phương tiện</string>
+  <string name="description_call_composer_camera">Chụp ảnh</string>
+  <string name="description_call_composer_photo">Chọn ảnh</string>
+  <string name="description_call_composer_message">Gửi tin nhắn</string>
+  <string name="image_sent_messages">Đã gửi ảnh qua Messages</string>
+  <string name="message_sent_messages">Đã gửi tin nhắn qua Messages</string>
+  <string name="call_composer_image_uploading">Đang gửi hình ảnh...</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-zh-rCN/strings.xml b/java/com/android/dialer/callcomposer/res/values-zh-rCN/strings.xml
index 0bb323f..09b9597 100644
--- a/java/com/android/dialer/callcomposer/res/values-zh-rCN/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-zh-rCN/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="urgent" msgid="5271653973625093934">"紧急！请接听！"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"想要聊天？"</string>
-    <string name="quick_question" msgid="3501160802390214092">"快速提问…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"自行撰写信息"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"发送信息并拨打电话"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"分享并拨打电话"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"图片（<xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>）"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"图片"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"无法加载相机图片"</string>
-    <string name="allow" msgid="8637148297403066623">"允许"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"要拍摄照片，请授予相机使用权限"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"要分享图片，请授予媒体访问权限"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"拍照"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"选择一张照片"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"发送信息"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"已通过“信息”应用发送照片"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"已通过“信息”应用发送短信"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"正在发送图片…"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">紧急！请接听！</string>
+  <string name="want_to_chat">想要聊天？</string>
+  <string name="quick_question">快速提问…</string>
+  <string name="message_composer_custom_message_hint">自行撰写信息</string>
+  <string name="send_and_call">发送信息并拨打电话</string>
+  <string name="share_and_call">分享并拨打电话</string>
+  <string name="gallery_item_description">图片（%1$tB %1$te %1$tY %1$tl %1$tM %1$tp）</string>
+  <string name="gallery_item_description_no_date">图片</string>
+  <string name="camera_media_failure">无法加载相机图片</string>
+  <string name="allow">允许</string>
+  <string name="camera_permission_text">要拍摄照片，请授予相机使用权限</string>
+  <string name="gallery_permission_text">要分享图片，请授予媒体访问权限</string>
+  <string name="description_call_composer_camera">拍照</string>
+  <string name="description_call_composer_photo">选择一张照片</string>
+  <string name="description_call_composer_message">发送信息</string>
+  <string name="image_sent_messages">已通过“信息”应用发送照片</string>
+  <string name="message_sent_messages">已通过“信息”应用发送短信</string>
+  <string name="call_composer_image_uploading">正在发送图片…</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-zh-rHK/strings.xml b/java/com/android/dialer/callcomposer/res/values-zh-rHK/strings.xml
index 5b70bbc..9f88ab0 100644
--- a/java/com/android/dialer/callcomposer/res/values-zh-rHK/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-zh-rHK/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="urgent" msgid="5271653973625093934">"緊急來電，請接起！"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"想使用即時通訊？"</string>
-    <string name="quick_question" msgid="3501160802390214092">"簡短問題…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"撰寫自訂訊息"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"傳送並致電"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"分享並通話"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"圖片：<xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"圖片"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"無法載入相機圖片"</string>
-    <string name="allow" msgid="8637148297403066623">"允許"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"如要拍照，請授予「相機」存取權"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"如要分享圖片，請授予「媒體」存取權"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"拍照"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"選擇相片"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"傳送訊息"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"已透過「訊息」傳送相片"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"已透過「訊息」傳送訊息"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"正在傳送圖片…"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">緊急來電，請接起！</string>
+  <string name="want_to_chat">想使用即時通訊？</string>
+  <string name="quick_question">簡短問題…</string>
+  <string name="message_composer_custom_message_hint">撰寫自訂訊息</string>
+  <string name="send_and_call">傳送並致電</string>
+  <string name="share_and_call">分享並通話</string>
+  <string name="gallery_item_description">圖片：%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">圖片</string>
+  <string name="camera_media_failure">無法載入相機圖片</string>
+  <string name="allow">允許</string>
+  <string name="camera_permission_text">如要拍照，請授予「相機」存取權</string>
+  <string name="gallery_permission_text">如要分享圖片，請授予「媒體」存取權</string>
+  <string name="description_call_composer_camera">拍照</string>
+  <string name="description_call_composer_photo">選擇相片</string>
+  <string name="description_call_composer_message">傳送訊息</string>
+  <string name="image_sent_messages">已透過「訊息」傳送相片</string>
+  <string name="message_sent_messages">已透過「訊息」傳送訊息</string>
+  <string name="call_composer_image_uploading">正在傳送圖片…</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-zh-rTW/strings.xml b/java/com/android/dialer/callcomposer/res/values-zh-rTW/strings.xml
index 3f1eaf0..9e13aee 100644
--- a/java/com/android/dialer/callcomposer/res/values-zh-rTW/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-zh-rTW/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="urgent" msgid="5271653973625093934">"緊急！請接聽來電！"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"想聊聊天嗎？"</string>
-    <string name="quick_question" msgid="3501160802390214092">"簡單的問題…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"撰寫自訂訊息"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"傳送並撥號"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"分享及撥號"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"圖片：<xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"圖片"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"無法載入相機圖片"</string>
-    <string name="allow" msgid="8637148297403066623">"允許"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"如要拍照，請授予相機存取權"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"如要分享圖片，請授予媒體存取權"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"拍攝相片"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"選擇相片"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"傳送訊息"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"透過訊息應用程式傳送的相片"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"透過訊息應用程式傳送的訊息"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"正在傳送圖片…"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">緊急！請接聽來電！</string>
+  <string name="want_to_chat">想聊聊天嗎？</string>
+  <string name="quick_question">簡單的問題…</string>
+  <string name="message_composer_custom_message_hint">撰寫自訂訊息</string>
+  <string name="send_and_call">傳送並撥號</string>
+  <string name="share_and_call">分享及撥號</string>
+  <string name="gallery_item_description">圖片：%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">圖片</string>
+  <string name="camera_media_failure">無法載入相機圖片</string>
+  <string name="allow">允許</string>
+  <string name="camera_permission_text">如要拍照，請授予相機存取權</string>
+  <string name="gallery_permission_text">如要分享圖片，請授予媒體存取權</string>
+  <string name="description_call_composer_camera">拍攝相片</string>
+  <string name="description_call_composer_photo">選擇相片</string>
+  <string name="description_call_composer_message">傳送訊息</string>
+  <string name="image_sent_messages">透過訊息應用程式傳送的相片</string>
+  <string name="message_sent_messages">透過訊息應用程式傳送的訊息</string>
+  <string name="call_composer_image_uploading">正在傳送圖片…</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values-zu/strings.xml b/java/com/android/dialer/callcomposer/res/values-zu/strings.xml
index 682febc..b4df24f 100644
--- a/java/com/android/dialer/callcomposer/res/values-zu/strings.xml
+++ b/java/com/android/dialer/callcomposer/res/values-zu/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="urgent" msgid="5271653973625093934">"Kuyashesha! Sicela ukhethe!"</string>
-    <string name="want_to_chat" msgid="847333669248949914">"Ufuna ukuxoxa?"</string>
-    <string name="quick_question" msgid="3501160802390214092">"Umbuzo osheshayo…"</string>
-    <string name="message_composer_custom_message_hint" msgid="2061100708804604835">"Bhala umlayezo wangokwezifiso"</string>
-    <string name="send_and_call" msgid="3749091015058610762">"Thumela ushayele"</string>
-    <string name="share_and_call" msgid="8934144481838868674">"Yabelana uphinde ushaye"</string>
-    <string name="gallery_item_description" msgid="7600601724204579471">"isithombe sangomhla ka-<xliff:g id="DATE">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g>"</string>
-    <string name="gallery_item_description_no_date" msgid="2059198895441426838">"isithombe"</string>
-    <string name="camera_media_failure" msgid="8979549551450965882">"Ayikwazanga ukulayisha isithombe sekhamera"</string>
-    <string name="allow" msgid="8637148297403066623">"Vumela"</string>
-    <string name="camera_permission_text" msgid="7863231776480341614">"Ukuze uthathe isithombe, nika ukufinyelela kukhamera"</string>
-    <string name="gallery_permission_text" msgid="4102566850658919346">"Ukuze wabelane ngesithombe, nika ukufinyelela kumidiya"</string>
-    <string name="description_call_composer_camera" msgid="388088245837924914">"Thatha isithombe"</string>
-    <string name="description_call_composer_photo" msgid="6449208314952246454">"Khetha isithombe"</string>
-    <string name="description_call_composer_message" msgid="9132362446000908550">"Thumela umlayezo"</string>
-    <string name="image_sent_messages" msgid="6520870555040566229">"Isithombe sithunyelwe ngemilayezo"</string>
-    <string name="message_sent_messages" msgid="6286576951151541098">"Umlayezo uthunyelwe ngemilayezo"</string>
-    <string name="call_composer_image_uploading" msgid="8812901858144330630">"Ithumela isithombe..."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="urgent">Kuyashesha! Sicela ukhethe!</string>
+  <string name="want_to_chat">Ufuna ukuxoxa?</string>
+  <string name="quick_question">Umbuzo osheshayo…</string>
+  <string name="message_composer_custom_message_hint">Bhala umlayezo wangokwezifiso</string>
+  <string name="send_and_call">Thumela ushayele</string>
+  <string name="share_and_call">Yabelana uphinde ushaye</string>
+  <string name="gallery_item_description">isithombe sangomhla ka-%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</string>
+  <string name="gallery_item_description_no_date">isithombe</string>
+  <string name="camera_media_failure">Ayikwazanga ukulayisha isithombe sekhamera</string>
+  <string name="allow">Vumela</string>
+  <string name="camera_permission_text">Ukuze uthathe isithombe, nika ukufinyelela kukhamera</string>
+  <string name="gallery_permission_text">Ukuze wabelane ngesithombe, nika ukufinyelela kumidiya</string>
+  <string name="description_call_composer_camera">Thatha isithombe</string>
+  <string name="description_call_composer_photo">Khetha isithombe</string>
+  <string name="description_call_composer_message">Thumela umlayezo</string>
+  <string name="image_sent_messages">Isithombe sithunyelwe ngemilayezo</string>
+  <string name="message_sent_messages">Umlayezo uthunyelwe ngemilayezo</string>
+  <string name="call_composer_image_uploading">Ithumela isithombe...</string>
 </resources>
diff --git a/java/com/android/dialer/callcomposer/res/values/styles.xml b/java/com/android/dialer/callcomposer/res/values/styles.xml
index a03ee48..cc0cc90 100644
--- a/java/com/android/dialer/callcomposer/res/values/styles.xml
+++ b/java/com/android/dialer/callcomposer/res/values/styles.xml
@@ -15,8 +15,7 @@
   ~ limitations under the License
   -->
 <resources>
-  <style name="Theme.AppCompat.CallComposer" parent="DialerThemeBase.NoActionBar">
-    <item name="android:colorPrimaryDark">@color/dialer_theme_color_dark</item>
+  <style name="Theme.AppCompat.CallComposer" parent="Dialer.ThemeBase.NoActionBar">
     <item name="android:windowBackground">@android:color/transparent</item>
     <item name="android:colorBackgroundCacheHint">@null</item>
     <item name="android:windowFrame">@null</item>
@@ -31,12 +30,10 @@
     <item name="android:actionBarItemBackground">@drawable/item_background_material_borderless_dark</item>
   </style>
 
-  <style name="message_composer_textview">
-    <item name="android:textSize">@dimen/message_compose_item_text_size</item>
-    <item name="android:textColor">@color/dialer_primary_text_color</item>
+  <style name="message_composer_textview" parent="Dialer.TextAppearance.Primary">
     <item name="android:paddingStart">@dimen/message_composer_item_padding</item>
     <item name="android:paddingEnd">@dimen/message_composer_item_padding</item>
-    <item name="android:background">@drawable/item_background_material_light</item>
+    <item name="android:background">?android:attr/selectableItemBackground</item>
     <item name="android:gravity">center_vertical</item>
   </style>
 </resources>
\ No newline at end of file
diff --git a/java/com/android/dialer/calldetails/AndroidManifest.xml b/java/com/android/dialer/calldetails/AndroidManifest.xml
index 9cf656e..cea106a 100644
--- a/java/com/android/dialer/calldetails/AndroidManifest.xml
+++ b/java/com/android/dialer/calldetails/AndroidManifest.xml
@@ -16,12 +16,16 @@
 <manifest
   xmlns:android="http://schemas.android.com/apk/res/android"
   package="com.android.dialer.calldetails">
-  <application android:theme="@style/Theme.AppCompat">
+  <application>
     <activity
       android:label="@string/call_details"
       android:exported="false"
-      android:name="com.android.dialer.calldetails.CallDetailsActivity"
-      android:theme="@style/DialerThemeBase.NoActionBar">
+      android:name="com.android.dialer.calldetails.OldCallDetailsActivity">
+    </activity>
+    <activity
+        android:label="@string/call_details"
+        android:exported="false"
+        android:name="com.android.dialer.calldetails.CallDetailsActivity">
     </activity>
   </application>
 </manifest>
diff --git a/java/com/android/dialer/calldetails/CallDetailsActivity.java b/java/com/android/dialer/calldetails/CallDetailsActivity.java
index ec124df..36b8308 100644
--- a/java/com/android/dialer/calldetails/CallDetailsActivity.java
+++ b/java/com/android/dialer/calldetails/CallDetailsActivity.java
@@ -16,231 +16,97 @@
 
 package com.android.dialer.calldetails;
 
-import android.Manifest.permission;
-import android.annotation.SuppressLint;
-import android.app.Activity;
 import android.app.LoaderManager.LoaderCallbacks;
-import android.content.ActivityNotFoundException;
 import android.content.Context;
 import android.content.Intent;
 import android.content.Loader;
 import android.database.Cursor;
-import android.os.AsyncTask;
 import android.os.Bundle;
-import android.provider.CallLog;
-import android.provider.CallLog.Calls;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.RequiresPermission;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.Toolbar;
-import android.view.View;
-import android.widget.Toast;
 import com.android.dialer.CoalescedIds;
-import com.android.dialer.assisteddialing.ui.AssistedDialingSettingActivity;
-import com.android.dialer.calldetails.CallDetailsEntries.CallDetailsEntry;
-import com.android.dialer.callintent.CallInitiationType;
-import com.android.dialer.callintent.CallIntentBuilder;
+import com.android.dialer.calldetails.CallDetailsEntryViewHolder.CallDetailsEntryListener;
+import com.android.dialer.calldetails.CallDetailsFooterViewHolder.DeleteCallDetailsListener;
+import com.android.dialer.calldetails.CallDetailsFooterViewHolder.ReportCallIdListener;
+import com.android.dialer.calldetails.CallDetailsHeaderViewHolder.CallDetailsHeaderListener;
 import com.android.dialer.calllog.database.contract.AnnotatedCallLogContract.AnnotatedCallLog;
 import com.android.dialer.common.Assert;
-import com.android.dialer.common.LogUtil;
-import com.android.dialer.common.concurrent.AsyncTaskExecutors;
-import com.android.dialer.common.concurrent.DialerExecutor.FailureListener;
-import com.android.dialer.common.concurrent.DialerExecutor.SuccessListener;
-import com.android.dialer.common.concurrent.DialerExecutor.Worker;
-import com.android.dialer.common.concurrent.DialerExecutorComponent;
-import com.android.dialer.constants.ActivityRequestCodes;
-import com.android.dialer.dialercontact.DialerContact;
-import com.android.dialer.duo.Duo;
-import com.android.dialer.duo.DuoComponent;
 import com.android.dialer.enrichedcall.EnrichedCallComponent;
-import com.android.dialer.enrichedcall.EnrichedCallManager;
-import com.android.dialer.enrichedcall.historyquery.proto.HistoryResult;
-import com.android.dialer.logging.DialerImpression;
-import com.android.dialer.logging.Logger;
-import com.android.dialer.logging.UiAction;
-import com.android.dialer.performancereport.PerformanceReport;
-import com.android.dialer.postcall.PostCall;
-import com.android.dialer.precall.PreCall;
 import com.android.dialer.protos.ProtoParsers;
-import com.google.common.base.Optional;
-import com.google.common.base.Preconditions;
-import com.google.i18n.phonenumbers.NumberParseException;
-import com.google.i18n.phonenumbers.PhoneNumberUtil;
-import com.google.i18n.phonenumbers.Phonenumber.PhoneNumber;
-import java.lang.ref.WeakReference;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
 
-/** Displays the details of a specific call log entry. */
-public class CallDetailsActivity extends AppCompatActivity {
+/**
+ * Displays the details of a specific call log entry.
+ *
+ * <p>This activity is for the new call log.
+ *
+ * <p>See {@link CallDetailsAdapterCommon} for logic shared between this activity and the one for
+ * the old call log.
+ */
+public final class CallDetailsActivity extends CallDetailsActivityCommon {
+  public static final String EXTRA_COALESCED_CALL_LOG_IDS = "coalesced_call_log_ids";
+  public static final String EXTRA_HEADER_INFO = "header_info";
+
   private static final int CALL_DETAILS_LOADER_ID = 0;
 
-  public static final String EXTRA_PHONE_NUMBER = "phone_number";
-  public static final String EXTRA_HAS_ENRICHED_CALL_DATA = "has_enriched_call_data";
-  public static final String EXTRA_CALL_DETAILS_ENTRIES = "call_details_entries";
-  public static final String EXTRA_COALESCED_CALL_LOG_IDS = "coalesced_call_log_ids";
-  public static final String EXTRA_CONTACT = "contact";
-  public static final String EXTRA_CAN_REPORT_CALLER_ID = "can_report_caller_id";
-  public static final String EXTRA_CAN_SUPPORT_ASSISTED_DIALING = "can_support_assisted_dialing";
+  /** IDs of call log entries, used to retrieve them from the annotated call log. */
+  private CoalescedIds coalescedCallLogIds;
 
-  private final CallDetailsHeaderViewHolder.CallDetailsHeaderListener callDetailsHeaderListener =
-      new CallDetailsHeaderListener(this);
-  private final CallDetailsFooterViewHolder.DeleteCallDetailsListener deleteCallDetailsListener =
-      new DeleteCallDetailsListener(this);
-  private final CallDetailsFooterViewHolder.ReportCallIdListener reportCallIdListener =
-      new ReportCallIdListener(this);
-  private final EnrichedCallManager.HistoricalDataChangedListener
-      enrichedCallHistoricalDataChangedListener =
-          new EnrichedCallHistoricalDataChangedListener(this);
+  /** Info to be shown in the header. */
+  private CallDetailsHeaderInfo headerInfo;
 
-  private CallDetailsEntries entries;
-  private DialerContact contact;
-  private CallDetailsAdapter adapter;
-
-  // This will be present only when the activity is launched from the new call log UI, i.e., a list
-  // of coalesced annotated call log IDs is included in the intent.
-  private Optional<CoalescedIds> coalescedCallLogIds = Optional.absent();
-
-  public static boolean isLaunchIntent(Intent intent) {
-    return intent.getComponent() != null
-        && CallDetailsActivity.class.getName().equals(intent.getComponent().getClassName());
-  }
-
-  /**
-   * Returns an {@link Intent} for launching the {@link CallDetailsActivity} from the old call log
-   * UI.
-   */
-  public static Intent newInstance(
-      Context context,
-      CallDetailsEntries details,
-      DialerContact contact,
-      boolean canReportCallerId,
-      boolean canSupportAssistedDialing) {
-    Intent intent = new Intent(context, CallDetailsActivity.class);
-    ProtoParsers.put(intent, EXTRA_CONTACT, Assert.isNotNull(contact));
-    ProtoParsers.put(intent, EXTRA_CALL_DETAILS_ENTRIES, Assert.isNotNull(details));
-    intent.putExtra(EXTRA_CAN_REPORT_CALLER_ID, canReportCallerId);
-    intent.putExtra(EXTRA_CAN_SUPPORT_ASSISTED_DIALING, canSupportAssistedDialing);
-    return intent;
-  }
-
-  /**
-   * Returns an {@link Intent} for launching the {@link CallDetailsActivity} from the new call log
-   * UI.
-   */
+  /** Returns an {@link Intent} to launch this activity. */
   public static Intent newInstance(
       Context context,
       CoalescedIds coalescedAnnotatedCallLogIds,
-      DialerContact contact,
+      CallDetailsHeaderInfo callDetailsHeaderInfo,
       boolean canReportCallerId,
       boolean canSupportAssistedDialing) {
     Intent intent = new Intent(context, CallDetailsActivity.class);
-    ProtoParsers.put(intent, EXTRA_CONTACT, Assert.isNotNull(contact));
     ProtoParsers.put(
         intent, EXTRA_COALESCED_CALL_LOG_IDS, Assert.isNotNull(coalescedAnnotatedCallLogIds));
+    ProtoParsers.put(intent, EXTRA_HEADER_INFO, Assert.isNotNull(callDetailsHeaderInfo));
     intent.putExtra(EXTRA_CAN_REPORT_CALLER_ID, canReportCallerId);
     intent.putExtra(EXTRA_CAN_SUPPORT_ASSISTED_DIALING, canSupportAssistedDialing);
     return intent;
   }
 
   @Override
-  protected void onCreate(Bundle savedInstanceState) {
-    super.onCreate(savedInstanceState);
-    setContentView(R.layout.call_details_activity);
-    Toolbar toolbar = findViewById(R.id.toolbar);
-    toolbar.setTitle(R.string.call_details);
-    toolbar.setNavigationOnClickListener(
-        v -> {
-          PerformanceReport.recordClick(UiAction.Type.CLOSE_CALL_DETAIL_WITH_CANCEL_BUTTON);
-          finish();
-        });
-    onHandleIntent(getIntent());
+  protected void handleIntent(Intent intent) {
+    Assert.checkArgument(intent.hasExtra(EXTRA_COALESCED_CALL_LOG_IDS));
+    Assert.checkArgument(intent.hasExtra(EXTRA_HEADER_INFO));
+    Assert.checkArgument(intent.hasExtra(EXTRA_CAN_REPORT_CALLER_ID));
+    Assert.checkArgument(intent.hasExtra(EXTRA_CAN_SUPPORT_ASSISTED_DIALING));
+
+    setCallDetailsEntries(CallDetailsEntries.getDefaultInstance());
+    coalescedCallLogIds =
+        ProtoParsers.getTrusted(
+            intent, EXTRA_COALESCED_CALL_LOG_IDS, CoalescedIds.getDefaultInstance());
+    headerInfo =
+        ProtoParsers.getTrusted(
+            intent, EXTRA_HEADER_INFO, CallDetailsHeaderInfo.getDefaultInstance());
+
+    getLoaderManager()
+        .initLoader(
+            CALL_DETAILS_LOADER_ID, /* args = */ null, new CallDetailsLoaderCallbacks(this));
   }
 
   @Override
-  protected void onResume() {
-    super.onResume();
-
-    // Some calls may not be recorded (eg. from quick contact),
-    // so we should restart recording after these calls. (Recorded call is stopped)
-    PostCall.restartPerformanceRecordingIfARecentCallExist(this);
-    if (!PerformanceReport.isRecording()) {
-      PerformanceReport.startRecording();
-    }
-
-    PostCall.promptUserForMessageIfNecessary(this, findViewById(R.id.recycler_view));
-
-    EnrichedCallComponent.get(this)
-        .getEnrichedCallManager()
-        .registerHistoricalDataChangedListener(enrichedCallHistoricalDataChangedListener);
-    EnrichedCallComponent.get(this)
-        .getEnrichedCallManager()
-        .requestAllHistoricalData(contact.getNumber(), entries);
+  protected CallDetailsAdapterCommon createAdapter(
+      CallDetailsEntryListener callDetailsEntryListener,
+      CallDetailsHeaderListener callDetailsHeaderListener,
+      ReportCallIdListener reportCallIdListener,
+      DeleteCallDetailsListener deleteCallDetailsListener) {
+    return new CallDetailsAdapter(
+        this,
+        headerInfo,
+        getCallDetailsEntries(),
+        callDetailsEntryListener,
+        callDetailsHeaderListener,
+        reportCallIdListener,
+        deleteCallDetailsListener);
   }
 
   @Override
-  protected void onPause() {
-    super.onPause();
-
-    EnrichedCallComponent.get(this)
-        .getEnrichedCallManager()
-        .unregisterHistoricalDataChangedListener(enrichedCallHistoricalDataChangedListener);
-  }
-
-  @Override
-  protected void onNewIntent(Intent intent) {
-    super.onNewIntent(intent);
-    onHandleIntent(intent);
-  }
-
-  private void onHandleIntent(Intent intent) {
-    boolean hasCallDetailsEntries = intent.hasExtra(EXTRA_CALL_DETAILS_ENTRIES);
-    boolean hasCoalescedCallLogIds = intent.hasExtra(EXTRA_COALESCED_CALL_LOG_IDS);
-    Assert.checkArgument(
-        (hasCallDetailsEntries && !hasCoalescedCallLogIds)
-            || (!hasCallDetailsEntries && hasCoalescedCallLogIds),
-        "One and only one of EXTRA_CALL_DETAILS_ENTRIES and EXTRA_COALESCED_CALL_LOG_IDS "
-            + "can be included in the intent.");
-
-    contact = ProtoParsers.getTrusted(intent, EXTRA_CONTACT, DialerContact.getDefaultInstance());
-    if (hasCallDetailsEntries) {
-      entries =
-          ProtoParsers.getTrusted(
-              intent, EXTRA_CALL_DETAILS_ENTRIES, CallDetailsEntries.getDefaultInstance());
-    } else {
-      entries = CallDetailsEntries.getDefaultInstance();
-      coalescedCallLogIds =
-          Optional.of(
-              ProtoParsers.getTrusted(
-                  intent, EXTRA_COALESCED_CALL_LOG_IDS, CoalescedIds.getDefaultInstance()));
-      getLoaderManager()
-          .initLoader(
-              CALL_DETAILS_LOADER_ID, /* args = */ null, new CallDetailsLoaderCallbacks(this));
-    }
-
-    adapter =
-        new CallDetailsAdapter(
-            this /* context */,
-            contact,
-            entries.getEntriesList(),
-            callDetailsHeaderListener,
-            reportCallIdListener,
-            deleteCallDetailsListener);
-
-    RecyclerView recyclerView = findViewById(R.id.recycler_view);
-    recyclerView.setLayoutManager(new LinearLayoutManager(this));
-    recyclerView.setAdapter(adapter);
-    PerformanceReport.logOnScrollStateChange(recyclerView);
-  }
-
-  @Override
-  public void onBackPressed() {
-    PerformanceReport.recordClick(UiAction.Type.PRESS_ANDROID_BACK_BUTTON);
-    super.onBackPressed();
+  protected String getNumber() {
+    return headerInfo.getDialerPhoneNumber().getNormalizedNumber();
   }
 
   /**
@@ -256,14 +122,13 @@
 
     @Override
     public Loader<Cursor> onCreateLoader(int id, Bundle args) {
-      Assert.checkState(activity.coalescedCallLogIds.isPresent());
-
-      return new CallDetailsCursorLoader(activity, activity.coalescedCallLogIds.get());
+      return new CallDetailsCursorLoader(activity, Assert.isNotNull(activity.coalescedCallLogIds));
     }
 
     @Override
     public void onLoadFinished(Loader<Cursor> loader, Cursor data) {
-      updateCallDetailsEntries(CallDetailsCursorLoader.toCallDetailsEntries(data));
+      updateCallDetailsEntries(CallDetailsCursorLoader.toCallDetailsEntries(activity, data));
+      activity.loadRttTranscriptAvailability();
     }
 
     @Override
@@ -272,290 +137,10 @@
     }
 
     private void updateCallDetailsEntries(CallDetailsEntries newEntries) {
-      activity.entries = newEntries;
-      activity.adapter.updateCallDetailsEntries(newEntries.getEntriesList());
+      activity.setCallDetailsEntries(newEntries);
       EnrichedCallComponent.get(activity)
           .getEnrichedCallManager()
-          .requestAllHistoricalData(activity.contact.getNumber(), newEntries);
-    }
-  }
-
-  /** Delete specified calls from the call log. */
-  private static class DeleteCallsTask extends AsyncTask<Void, Void, Void> {
-    // Use a weak reference to hold the Activity so that there is no memory leak.
-    private final WeakReference<Activity> activityWeakReference;
-
-    private final DialerContact contact;
-    private final CallDetailsEntries callDetailsEntries;
-    private final String callIds;
-
-    DeleteCallsTask(
-        Activity activity, DialerContact contact, CallDetailsEntries callDetailsEntries) {
-      this.activityWeakReference = new WeakReference<>(activity);
-      this.contact = contact;
-      this.callDetailsEntries = callDetailsEntries;
-
-      StringBuilder callIds = new StringBuilder();
-      for (CallDetailsEntry entry : callDetailsEntries.getEntriesList()) {
-        if (callIds.length() != 0) {
-          callIds.append(",");
-        }
-        callIds.append(entry.getCallId());
-      }
-      this.callIds = callIds.toString();
-    }
-
-    @Override
-    // Suppress the lint check here as the user will not be able to see call log entries if
-    // permission.WRITE_CALL_LOG is not granted.
-    @SuppressLint("MissingPermission")
-    @RequiresPermission(value = permission.WRITE_CALL_LOG)
-    protected Void doInBackground(Void... params) {
-      Activity activity = activityWeakReference.get();
-      if (activity == null) {
-        return null;
-      }
-
-      activity
-          .getContentResolver()
-          .delete(
-              Calls.CONTENT_URI,
-              CallLog.Calls._ID + " IN (" + callIds + ")" /* where */,
-              null /* selectionArgs */);
-      return null;
-    }
-
-    @Override
-    public void onPostExecute(Void result) {
-      Activity activity = activityWeakReference.get();
-      if (activity == null) {
-        return;
-      }
-
-      Intent data = new Intent();
-      data.putExtra(EXTRA_PHONE_NUMBER, contact.getNumber());
-      for (CallDetailsEntry entry : callDetailsEntries.getEntriesList()) {
-        if (entry.getHistoryResultsCount() > 0) {
-          data.putExtra(EXTRA_HAS_ENRICHED_CALL_DATA, true);
-          break;
-        }
-      }
-
-      activity.setResult(RESULT_OK, data);
-      activity.finish();
-    }
-  }
-
-  private static final class CallDetailsHeaderListener
-      implements CallDetailsHeaderViewHolder.CallDetailsHeaderListener {
-    private final WeakReference<CallDetailsActivity> activityWeakReference;
-
-    CallDetailsHeaderListener(CallDetailsActivity activity) {
-      this.activityWeakReference = new WeakReference<>(activity);
-    }
-
-    @Override
-    public void placeImsVideoCall(String phoneNumber) {
-      Logger.get(getActivity())
-          .logImpression(DialerImpression.Type.CALL_DETAILS_IMS_VIDEO_CALL_BACK);
-      PreCall.start(
-          getActivity(),
-          new CallIntentBuilder(phoneNumber, CallInitiationType.Type.CALL_DETAILS)
-              .setIsVideoCall(true));
-    }
-
-    @Override
-    public void placeDuoVideoCall(String phoneNumber) {
-      Logger.get(getActivity())
-          .logImpression(DialerImpression.Type.CALL_DETAILS_LIGHTBRINGER_CALL_BACK);
-      Duo duo = DuoComponent.get(getActivity()).getDuo();
-      if (!duo.isReachable(getActivity(), phoneNumber)) {
-        placeImsVideoCall(phoneNumber);
-        return;
-      }
-
-      try {
-        getActivity()
-            .startActivityForResult(
-                duo.getIntent(getActivity(), phoneNumber), ActivityRequestCodes.DIALTACTS_DUO);
-      } catch (ActivityNotFoundException e) {
-        Toast.makeText(getActivity(), R.string.activity_not_available, Toast.LENGTH_SHORT).show();
-      }
-    }
-
-    @Override
-    public void placeVoiceCall(String phoneNumber, String postDialDigits) {
-      Logger.get(getActivity()).logImpression(DialerImpression.Type.CALL_DETAILS_VOICE_CALL_BACK);
-
-      boolean canSupportedAssistedDialing =
-          getActivity()
-              .getIntent()
-              .getExtras()
-              .getBoolean(EXTRA_CAN_SUPPORT_ASSISTED_DIALING, false);
-      CallIntentBuilder callIntentBuilder =
-          new CallIntentBuilder(phoneNumber + postDialDigits, CallInitiationType.Type.CALL_DETAILS);
-      if (canSupportedAssistedDialing) {
-        callIntentBuilder.setAllowAssistedDial(true);
-      }
-
-      PreCall.start(getActivity(), callIntentBuilder);
-    }
-
-    private CallDetailsActivity getActivity() {
-      return Preconditions.checkNotNull(activityWeakReference.get());
-    }
-
-    @Override
-    public void openAssistedDialingSettings(View unused) {
-        Intent intent = new Intent(getActivity(), AssistedDialingSettingActivity.class);
-        getActivity().startActivity(intent);
-    }
-
-    @Override
-    public void createAssistedDialerNumberParserTask(
-        AssistedDialingNumberParseWorker worker,
-        SuccessListener<Integer> successListener,
-        FailureListener failureListener) {
-      DialerExecutorComponent.get(getActivity().getApplicationContext())
-          .dialerExecutorFactory()
-          .createUiTaskBuilder(
-              getActivity().getFragmentManager(),
-              "CallDetailsActivity.createAssistedDialerNumberParserTask",
-              new AssistedDialingNumberParseWorker())
-          .onSuccess(successListener)
-          .onFailure(failureListener)
-          .build()
-          .executeParallel(getActivity().contact.getNumber());
-    }
-  }
-
-  static class AssistedDialingNumberParseWorker implements Worker<String, Integer> {
-
-    @Override
-    public Integer doInBackground(@NonNull String phoneNumber) {
-      PhoneNumber parsedNumber = null;
-      try {
-        parsedNumber = PhoneNumberUtil.getInstance().parse(phoneNumber, null);
-      } catch (NumberParseException e) {
-        LogUtil.w(
-            "AssistedDialingNumberParseWorker.doInBackground",
-            "couldn't parse phone number: " + LogUtil.sanitizePii(phoneNumber),
-            e);
-        return 0;
-      }
-      return parsedNumber.getCountryCode();
-    }
-  }
-
-  private static final class DeleteCallDetailsListener
-      implements CallDetailsFooterViewHolder.DeleteCallDetailsListener {
-    private static final String ASYNC_TASK_ID = "task_delete";
-
-    private final WeakReference<CallDetailsActivity> activityWeakReference;
-
-    DeleteCallDetailsListener(CallDetailsActivity activity) {
-      this.activityWeakReference = new WeakReference<>(activity);
-    }
-
-    @Override
-    public void delete() {
-      AsyncTaskExecutors.createAsyncTaskExecutor()
-          .submit(
-              ASYNC_TASK_ID,
-              new DeleteCallsTask(getActivity(), getActivity().contact, getActivity().entries));
-    }
-
-    private CallDetailsActivity getActivity() {
-      return Preconditions.checkNotNull(activityWeakReference.get());
-    }
-  }
-
-  private static final class ReportCallIdListener
-      implements CallDetailsFooterViewHolder.ReportCallIdListener {
-    private final WeakReference<Activity> activityWeakReference;
-
-    ReportCallIdListener(Activity activity) {
-      this.activityWeakReference = new WeakReference<>(activity);
-    }
-
-    @Override
-    public void reportCallId(String number) {
-      ReportDialogFragment.newInstance(number)
-          .show(getActivity().getFragmentManager(), null /* tag */);
-    }
-
-    @Override
-    public boolean canReportCallerId(String number) {
-      return getActivity().getIntent().getExtras().getBoolean(EXTRA_CAN_REPORT_CALLER_ID, false);
-    }
-
-    private Activity getActivity() {
-      return Preconditions.checkNotNull(activityWeakReference.get());
-    }
-  }
-
-  private static final class EnrichedCallHistoricalDataChangedListener
-      implements EnrichedCallManager.HistoricalDataChangedListener {
-    private final WeakReference<CallDetailsActivity> activityWeakReference;
-
-    EnrichedCallHistoricalDataChangedListener(CallDetailsActivity activity) {
-      this.activityWeakReference = new WeakReference<>(activity);
-    }
-
-    @Override
-    public void onHistoricalDataChanged() {
-      CallDetailsActivity activity = getActivity();
-      Map<CallDetailsEntry, List<HistoryResult>> mappedResults =
-          getAllHistoricalData(activity.contact.getNumber(), activity.entries);
-
-      activity.adapter.updateCallDetailsEntries(
-          generateAndMapNewCallDetailsEntriesHistoryResults(
-                  activity.contact.getNumber(), activity.entries, mappedResults)
-              .getEntriesList());
-    }
-
-    private CallDetailsActivity getActivity() {
-      return Preconditions.checkNotNull(activityWeakReference.get());
-    }
-
-    @NonNull
-    private Map<CallDetailsEntry, List<HistoryResult>> getAllHistoricalData(
-        @Nullable String number, @NonNull CallDetailsEntries entries) {
-      if (number == null) {
-        return Collections.emptyMap();
-      }
-
-      Map<CallDetailsEntry, List<HistoryResult>> historicalData =
-          EnrichedCallComponent.get(getActivity())
-              .getEnrichedCallManager()
-              .getAllHistoricalData(number, entries);
-      if (historicalData == null) {
-        return Collections.emptyMap();
-      }
-      return historicalData;
-    }
-
-    private static CallDetailsEntries generateAndMapNewCallDetailsEntriesHistoryResults(
-        @Nullable String number,
-        @NonNull CallDetailsEntries callDetailsEntries,
-        @NonNull Map<CallDetailsEntry, List<HistoryResult>> mappedResults) {
-      if (number == null) {
-        return callDetailsEntries;
-      }
-      CallDetailsEntries.Builder mutableCallDetailsEntries = CallDetailsEntries.newBuilder();
-      for (CallDetailsEntry entry : callDetailsEntries.getEntriesList()) {
-        CallDetailsEntry.Builder newEntry = CallDetailsEntry.newBuilder().mergeFrom(entry);
-        List<HistoryResult> results = mappedResults.get(entry);
-        if (results != null) {
-          newEntry.addAllHistoryResults(mappedResults.get(entry));
-          LogUtil.v(
-              "CallDetailsActivity.generateAndMapNewCallDetailsEntriesHistoryResults",
-              "mapped %d results",
-              newEntry.getHistoryResultsList().size());
-        }
-        mutableCallDetailsEntries.addEntries(newEntry.build());
-      }
-      return mutableCallDetailsEntries.build();
+          .requestAllHistoricalData(activity.getNumber(), newEntries);
     }
   }
 }
diff --git a/java/com/android/dialer/calldetails/CallDetailsActivityCommon.java b/java/com/android/dialer/calldetails/CallDetailsActivityCommon.java
new file mode 100644
index 0000000..a26f322
--- /dev/null
+++ b/java/com/android/dialer/calldetails/CallDetailsActivityCommon.java
@@ -0,0 +1,523 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.dialer.calldetails;
+
+import android.Manifest.permission;
+import android.annotation.SuppressLint;
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.provider.CallLog;
+import android.provider.CallLog.Calls;
+import android.support.annotation.CallSuper;
+import android.support.annotation.MainThread;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.annotation.RequiresPermission;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.support.v7.widget.Toolbar;
+import android.view.View;
+import com.android.dialer.assisteddialing.ui.AssistedDialingSettingActivity;
+import com.android.dialer.calldetails.CallDetailsEntries.CallDetailsEntry;
+import com.android.dialer.callintent.CallInitiationType;
+import com.android.dialer.callintent.CallIntentBuilder;
+import com.android.dialer.common.Assert;
+import com.android.dialer.common.LogUtil;
+import com.android.dialer.common.concurrent.DialerExecutor.FailureListener;
+import com.android.dialer.common.concurrent.DialerExecutor.SuccessListener;
+import com.android.dialer.common.concurrent.DialerExecutor.Worker;
+import com.android.dialer.common.concurrent.DialerExecutorComponent;
+import com.android.dialer.common.concurrent.UiListener;
+import com.android.dialer.common.database.Selection;
+import com.android.dialer.enrichedcall.EnrichedCallComponent;
+import com.android.dialer.enrichedcall.EnrichedCallManager;
+import com.android.dialer.enrichedcall.historyquery.proto.HistoryResult;
+import com.android.dialer.glidephotomanager.PhotoInfo;
+import com.android.dialer.logging.DialerImpression;
+import com.android.dialer.logging.Logger;
+import com.android.dialer.logging.UiAction;
+import com.android.dialer.performancereport.PerformanceReport;
+import com.android.dialer.postcall.PostCall;
+import com.android.dialer.precall.PreCall;
+import com.android.dialer.rtt.RttTranscriptActivity;
+import com.android.dialer.rtt.RttTranscriptUtil;
+import com.android.dialer.theme.base.ThemeComponent;
+import com.google.common.base.Preconditions;
+import com.google.common.collect.ImmutableSet;
+import com.google.i18n.phonenumbers.NumberParseException;
+import com.google.i18n.phonenumbers.PhoneNumberUtil;
+import com.google.i18n.phonenumbers.Phonenumber.PhoneNumber;
+import java.lang.ref.WeakReference;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Contains common logic shared between {@link OldCallDetailsActivity} and {@link
+ * CallDetailsActivity}.
+ */
+abstract class CallDetailsActivityCommon extends AppCompatActivity {
+
+  public static final String EXTRA_PHONE_NUMBER = "phone_number";
+  public static final String EXTRA_HAS_ENRICHED_CALL_DATA = "has_enriched_call_data";
+  public static final String EXTRA_CAN_REPORT_CALLER_ID = "can_report_caller_id";
+  public static final String EXTRA_CAN_SUPPORT_ASSISTED_DIALING = "can_support_assisted_dialing";
+
+  private final CallDetailsEntryViewHolder.CallDetailsEntryListener callDetailsEntryListener =
+      new CallDetailsEntryListener(this);
+  private final CallDetailsHeaderViewHolder.CallDetailsHeaderListener callDetailsHeaderListener =
+      new CallDetailsHeaderListener(this);
+  private final CallDetailsFooterViewHolder.DeleteCallDetailsListener deleteCallDetailsListener =
+      new DeleteCallDetailsListener(this);
+  private final CallDetailsFooterViewHolder.ReportCallIdListener reportCallIdListener =
+      new ReportCallIdListener(this);
+  private final EnrichedCallManager.HistoricalDataChangedListener
+      enrichedCallHistoricalDataChangedListener =
+          new EnrichedCallHistoricalDataChangedListener(this);
+
+  private CallDetailsAdapterCommon adapter;
+  private CallDetailsEntries callDetailsEntries;
+  private UiListener<ImmutableSet<String>> checkRttTranscriptAvailabilityListener;
+
+  /**
+   * Handles the intent that launches {@link OldCallDetailsActivity} or {@link CallDetailsActivity},
+   * e.g., extract data from intent extras, start loading data, etc.
+   */
+  protected abstract void handleIntent(Intent intent);
+
+  /** Creates an adapter for {@link OldCallDetailsActivity} or {@link CallDetailsActivity}. */
+  protected abstract CallDetailsAdapterCommon createAdapter(
+      CallDetailsEntryViewHolder.CallDetailsEntryListener callDetailsEntryListener,
+      CallDetailsHeaderViewHolder.CallDetailsHeaderListener callDetailsHeaderListener,
+      CallDetailsFooterViewHolder.ReportCallIdListener reportCallIdListener,
+      CallDetailsFooterViewHolder.DeleteCallDetailsListener deleteCallDetailsListener);
+
+  /** Returns the phone number of the call details. */
+  protected abstract String getNumber();
+
+  @Override
+  @CallSuper
+  protected void onCreate(Bundle savedInstanceState) {
+    super.onCreate(savedInstanceState);
+    setTheme(ThemeComponent.get(this).theme().getApplicationThemeRes());
+    setContentView(R.layout.call_details_activity);
+    Toolbar toolbar = findViewById(R.id.toolbar);
+    toolbar.setTitle(R.string.call_details);
+    toolbar.setNavigationOnClickListener(
+        v -> {
+          PerformanceReport.recordClick(UiAction.Type.CLOSE_CALL_DETAIL_WITH_CANCEL_BUTTON);
+          finish();
+        });
+    checkRttTranscriptAvailabilityListener =
+        DialerExecutorComponent.get(this)
+            .createUiListener(getFragmentManager(), "Query RTT transcript availability");
+    handleIntent(getIntent());
+    setupRecyclerViewForEntries();
+  }
+
+  @Override
+  @CallSuper
+  protected void onResume() {
+    super.onResume();
+
+    // Some calls may not be recorded (eg. from quick contact),
+    // so we should restart recording after these calls. (Recorded call is stopped)
+    PostCall.restartPerformanceRecordingIfARecentCallExist(this);
+    if (!PerformanceReport.isRecording()) {
+      PerformanceReport.startRecording();
+    }
+
+    PostCall.promptUserForMessageIfNecessary(this, findViewById(R.id.recycler_view));
+
+    EnrichedCallComponent.get(this)
+        .getEnrichedCallManager()
+        .registerHistoricalDataChangedListener(enrichedCallHistoricalDataChangedListener);
+    EnrichedCallComponent.get(this)
+        .getEnrichedCallManager()
+        .requestAllHistoricalData(getNumber(), callDetailsEntries);
+  }
+
+  protected void loadRttTranscriptAvailability() {
+    ImmutableSet.Builder<String> builder = ImmutableSet.builder();
+    for (CallDetailsEntry entry : callDetailsEntries.getEntriesList()) {
+      builder.add(entry.getCallMappingId());
+    }
+    checkRttTranscriptAvailabilityListener.listen(
+        this,
+        RttTranscriptUtil.getAvailableRttTranscriptIds(this, builder.build()),
+        this::updateCallDetailsEntriesWithRttTranscriptAvailability,
+        throwable -> {
+          throw new RuntimeException(throwable);
+        });
+  }
+
+  private void updateCallDetailsEntriesWithRttTranscriptAvailability(
+      ImmutableSet<String> availableTranscripIds) {
+    CallDetailsEntries.Builder mutableCallDetailsEntries = CallDetailsEntries.newBuilder();
+    for (CallDetailsEntry entry : callDetailsEntries.getEntriesList()) {
+      CallDetailsEntry.Builder newEntry = CallDetailsEntry.newBuilder().mergeFrom(entry);
+      newEntry.setHasRttTranscript(availableTranscripIds.contains(entry.getCallMappingId()));
+      mutableCallDetailsEntries.addEntries(newEntry.build());
+    }
+    setCallDetailsEntries(mutableCallDetailsEntries.build());
+  }
+
+  @Override
+  @CallSuper
+  protected void onPause() {
+    super.onPause();
+
+    EnrichedCallComponent.get(this)
+        .getEnrichedCallManager()
+        .unregisterHistoricalDataChangedListener(enrichedCallHistoricalDataChangedListener);
+  }
+
+  @Override
+  @CallSuper
+  protected void onNewIntent(Intent intent) {
+    super.onNewIntent(intent);
+
+    handleIntent(intent);
+    setupRecyclerViewForEntries();
+  }
+
+  private void setupRecyclerViewForEntries() {
+    adapter =
+        createAdapter(
+            callDetailsEntryListener,
+            callDetailsHeaderListener,
+            reportCallIdListener,
+            deleteCallDetailsListener);
+
+    RecyclerView recyclerView = findViewById(R.id.recycler_view);
+    recyclerView.setLayoutManager(new LinearLayoutManager(this));
+    recyclerView.setAdapter(adapter);
+    PerformanceReport.logOnScrollStateChange(recyclerView);
+  }
+
+  final CallDetailsAdapterCommon getAdapter() {
+    return adapter;
+  }
+
+  @Override
+  @CallSuper
+  public void onBackPressed() {
+    PerformanceReport.recordClick(UiAction.Type.PRESS_ANDROID_BACK_BUTTON);
+    super.onBackPressed();
+  }
+
+  @MainThread
+  protected final void setCallDetailsEntries(CallDetailsEntries entries) {
+    Assert.isMainThread();
+    this.callDetailsEntries = entries;
+    if (adapter != null) {
+      adapter.updateCallDetailsEntries(entries);
+    }
+  }
+
+  protected final CallDetailsEntries getCallDetailsEntries() {
+    return callDetailsEntries;
+  }
+
+  /** A {@link Worker} that deletes specified entries from the call log. */
+  private static final class DeleteCallsWorker implements Worker<CallDetailsEntries, Void> {
+    // Use a weak reference to hold the Activity so that there is no memory leak.
+    private final WeakReference<Context> contextWeakReference;
+
+    DeleteCallsWorker(Context context) {
+      this.contextWeakReference = new WeakReference<>(context);
+    }
+
+    @Override
+    // Suppress the lint check here as the user will not be able to see call log entries if
+    // permission.WRITE_CALL_LOG is not granted.
+    @SuppressLint("MissingPermission")
+    @RequiresPermission(value = permission.WRITE_CALL_LOG)
+    public Void doInBackground(CallDetailsEntries callDetailsEntries) {
+      Context context = contextWeakReference.get();
+      if (context == null) {
+        return null;
+      }
+
+      Selection selection =
+          Selection.builder()
+              .and(Selection.column(CallLog.Calls._ID).in(getCallLogIdList(callDetailsEntries)))
+              .build();
+
+      context
+          .getContentResolver()
+          .delete(Calls.CONTENT_URI, selection.getSelection(), selection.getSelectionArgs());
+      return null;
+    }
+
+    private static List<String> getCallLogIdList(CallDetailsEntries callDetailsEntries) {
+      Assert.checkArgument(callDetailsEntries.getEntriesCount() > 0);
+
+      List<String> idStrings = new ArrayList<>(callDetailsEntries.getEntriesCount());
+
+      for (CallDetailsEntry entry : callDetailsEntries.getEntriesList()) {
+        idStrings.add(String.valueOf(entry.getCallId()));
+      }
+
+      return idStrings;
+    }
+  }
+
+  private static final class CallDetailsEntryListener
+      implements CallDetailsEntryViewHolder.CallDetailsEntryListener {
+    private final WeakReference<CallDetailsActivityCommon> activityWeakReference;
+
+    CallDetailsEntryListener(CallDetailsActivityCommon activity) {
+      this.activityWeakReference = new WeakReference<>(activity);
+    }
+
+    @Override
+    public void showRttTranscript(String transcriptId, String primaryText, PhotoInfo photoInfo) {
+      getActivity()
+          .startActivity(
+              RttTranscriptActivity.getIntent(getActivity(), transcriptId, primaryText, photoInfo));
+    }
+
+    private CallDetailsActivityCommon getActivity() {
+      return Preconditions.checkNotNull(activityWeakReference.get());
+    }
+  }
+
+  private static final class CallDetailsHeaderListener
+      implements CallDetailsHeaderViewHolder.CallDetailsHeaderListener {
+    private final WeakReference<CallDetailsActivityCommon> activityWeakReference;
+
+    CallDetailsHeaderListener(CallDetailsActivityCommon activity) {
+      this.activityWeakReference = new WeakReference<>(activity);
+    }
+
+    @Override
+    public void placeImsVideoCall(String phoneNumber) {
+      Logger.get(getActivity())
+          .logImpression(DialerImpression.Type.CALL_DETAILS_IMS_VIDEO_CALL_BACK);
+      PreCall.start(
+          getActivity(),
+          new CallIntentBuilder(phoneNumber, CallInitiationType.Type.CALL_DETAILS)
+              .setIsVideoCall(true));
+    }
+
+    @Override
+    public void placeDuoVideoCall(String phoneNumber) {
+      Logger.get(getActivity())
+          .logImpression(DialerImpression.Type.CALL_DETAILS_LIGHTBRINGER_CALL_BACK);
+      PreCall.start(
+          getActivity(),
+          new CallIntentBuilder(phoneNumber, CallInitiationType.Type.CALL_DETAILS)
+              .setIsDuoCall(true)
+              .setIsVideoCall(true));
+    }
+
+    @Override
+    public void placeVoiceCall(String phoneNumber, String postDialDigits) {
+      Logger.get(getActivity()).logImpression(DialerImpression.Type.CALL_DETAILS_VOICE_CALL_BACK);
+
+      boolean canSupportedAssistedDialing =
+          getActivity()
+              .getIntent()
+              .getExtras()
+              .getBoolean(EXTRA_CAN_SUPPORT_ASSISTED_DIALING, false);
+      CallIntentBuilder callIntentBuilder =
+          new CallIntentBuilder(phoneNumber + postDialDigits, CallInitiationType.Type.CALL_DETAILS);
+      if (canSupportedAssistedDialing) {
+        callIntentBuilder.setAllowAssistedDial(true);
+      }
+
+      PreCall.start(getActivity(), callIntentBuilder);
+    }
+
+    private CallDetailsActivityCommon getActivity() {
+      return Preconditions.checkNotNull(activityWeakReference.get());
+    }
+
+    @Override
+    public void openAssistedDialingSettings(View unused) {
+      Intent intent = new Intent(getActivity(), AssistedDialingSettingActivity.class);
+      getActivity().startActivity(intent);
+    }
+
+    @Override
+    public void createAssistedDialerNumberParserTask(
+        AssistedDialingNumberParseWorker worker,
+        SuccessListener<Integer> successListener,
+        FailureListener failureListener) {
+      DialerExecutorComponent.get(getActivity().getApplicationContext())
+          .dialerExecutorFactory()
+          .createUiTaskBuilder(
+              getActivity().getFragmentManager(),
+              "CallDetailsActivityCommon.createAssistedDialerNumberParserTask",
+              new AssistedDialingNumberParseWorker())
+          .onSuccess(successListener)
+          .onFailure(failureListener)
+          .build()
+          .executeParallel(getActivity().getNumber());
+    }
+  }
+
+  static final class AssistedDialingNumberParseWorker implements Worker<String, Integer> {
+
+    @Override
+    public Integer doInBackground(@NonNull String phoneNumber) {
+      PhoneNumber parsedNumber;
+      try {
+        parsedNumber = PhoneNumberUtil.getInstance().parse(phoneNumber, null);
+      } catch (NumberParseException e) {
+        LogUtil.w(
+            "AssistedDialingNumberParseWorker.doInBackground",
+            "couldn't parse phone number: " + LogUtil.sanitizePii(phoneNumber),
+            e);
+        return 0;
+      }
+      return parsedNumber.getCountryCode();
+    }
+  }
+
+  private static final class DeleteCallDetailsListener
+      implements CallDetailsFooterViewHolder.DeleteCallDetailsListener {
+
+    private final WeakReference<CallDetailsActivityCommon> activityWeakReference;
+
+    DeleteCallDetailsListener(CallDetailsActivityCommon activity) {
+      this.activityWeakReference = new WeakReference<>(activity);
+    }
+
+    @Override
+    public void delete() {
+      CallDetailsActivityCommon activity = getActivity();
+      Logger.get(activity).logImpression(DialerImpression.Type.USER_DELETED_CALL_LOG_ITEM);
+      DialerExecutorComponent.get(activity)
+          .dialerExecutorFactory()
+          .createNonUiTaskBuilder(new DeleteCallsWorker(activity))
+          .onSuccess(
+              unused -> {
+                Intent data = new Intent();
+                data.putExtra(EXTRA_PHONE_NUMBER, activity.getNumber());
+                for (CallDetailsEntry entry : activity.getCallDetailsEntries().getEntriesList()) {
+                  if (entry.getHistoryResultsCount() > 0) {
+                    data.putExtra(EXTRA_HAS_ENRICHED_CALL_DATA, true);
+                    break;
+                  }
+                }
+
+                activity.setResult(RESULT_OK, data);
+                activity.finish();
+              })
+          .build()
+          .executeSerial(activity.getCallDetailsEntries());
+    }
+
+    private CallDetailsActivityCommon getActivity() {
+      return Preconditions.checkNotNull(activityWeakReference.get());
+    }
+  }
+
+  private static final class ReportCallIdListener
+      implements CallDetailsFooterViewHolder.ReportCallIdListener {
+    private final WeakReference<Activity> activityWeakReference;
+
+    ReportCallIdListener(Activity activity) {
+      this.activityWeakReference = new WeakReference<>(activity);
+    }
+
+    @Override
+    public void reportCallId(String number) {
+      ReportDialogFragment.newInstance(number)
+          .show(getActivity().getFragmentManager(), null /* tag */);
+    }
+
+    @Override
+    public boolean canReportCallerId(String number) {
+      return getActivity().getIntent().getExtras().getBoolean(EXTRA_CAN_REPORT_CALLER_ID, false);
+    }
+
+    private Activity getActivity() {
+      return Preconditions.checkNotNull(activityWeakReference.get());
+    }
+  }
+
+  private static final class EnrichedCallHistoricalDataChangedListener
+      implements EnrichedCallManager.HistoricalDataChangedListener {
+    private final WeakReference<CallDetailsActivityCommon> activityWeakReference;
+
+    EnrichedCallHistoricalDataChangedListener(CallDetailsActivityCommon activity) {
+      this.activityWeakReference = new WeakReference<>(activity);
+    }
+
+    @Override
+    public void onHistoricalDataChanged() {
+      CallDetailsActivityCommon activity = getActivity();
+      Map<CallDetailsEntry, List<HistoryResult>> mappedResults =
+          getAllHistoricalData(activity.getNumber(), activity.callDetailsEntries);
+
+      activity.setCallDetailsEntries(
+          generateAndMapNewCallDetailsEntriesHistoryResults(
+              activity.getNumber(), activity.callDetailsEntries, mappedResults));
+    }
+
+    private CallDetailsActivityCommon getActivity() {
+      return Preconditions.checkNotNull(activityWeakReference.get());
+    }
+
+    @NonNull
+    private Map<CallDetailsEntry, List<HistoryResult>> getAllHistoricalData(
+        @Nullable String number, @NonNull CallDetailsEntries entries) {
+      if (number == null) {
+        return Collections.emptyMap();
+      }
+
+      Map<CallDetailsEntry, List<HistoryResult>> historicalData =
+          EnrichedCallComponent.get(getActivity())
+              .getEnrichedCallManager()
+              .getAllHistoricalData(number, entries);
+      if (historicalData == null) {
+        return Collections.emptyMap();
+      }
+      return historicalData;
+    }
+
+    private static CallDetailsEntries generateAndMapNewCallDetailsEntriesHistoryResults(
+        @Nullable String number,
+        @NonNull CallDetailsEntries callDetailsEntries,
+        @NonNull Map<CallDetailsEntry, List<HistoryResult>> mappedResults) {
+      if (number == null) {
+        return callDetailsEntries;
+      }
+      CallDetailsEntries.Builder mutableCallDetailsEntries = CallDetailsEntries.newBuilder();
+      for (CallDetailsEntry entry : callDetailsEntries.getEntriesList()) {
+        CallDetailsEntry.Builder newEntry = CallDetailsEntry.newBuilder().mergeFrom(entry);
+        List<HistoryResult> results = mappedResults.get(entry);
+        if (results != null) {
+          newEntry.addAllHistoryResults(mappedResults.get(entry));
+          LogUtil.v(
+              "CallDetailsActivityCommon.generateAndMapNewCallDetailsEntriesHistoryResults",
+              "mapped %d results",
+              newEntry.getHistoryResultsList().size());
+        }
+        mutableCallDetailsEntries.addEntries(newEntry.build());
+      }
+      return mutableCallDetailsEntries.build();
+    }
+  }
+}
diff --git a/java/com/android/dialer/calldetails/CallDetailsAdapter.java b/java/com/android/dialer/calldetails/CallDetailsAdapter.java
index 030366e..40d856f 100644
--- a/java/com/android/dialer/calldetails/CallDetailsAdapter.java
+++ b/java/com/android/dialer/calldetails/CallDetailsAdapter.java
@@ -16,120 +16,74 @@
 
 package com.android.dialer.calldetails;
 
+
 import android.content.Context;
-import android.support.annotation.NonNull;
 import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.RecyclerView.ViewHolder;
-import android.view.LayoutInflater;
-import android.view.ViewGroup;
-import com.android.dialer.calldetails.CallDetailsEntries.CallDetailsEntry;
+import android.view.View;
+import com.android.dialer.calldetails.CallDetailsEntryViewHolder.CallDetailsEntryListener;
 import com.android.dialer.calldetails.CallDetailsFooterViewHolder.DeleteCallDetailsListener;
 import com.android.dialer.calldetails.CallDetailsHeaderViewHolder.CallDetailsHeaderListener;
-import com.android.dialer.calllogutils.CallTypeHelper;
-import com.android.dialer.calllogutils.CallbackActionHelper;
-import com.android.dialer.calllogutils.CallbackActionHelper.CallbackAction;
-import com.android.dialer.common.Assert;
-import com.android.dialer.dialercontact.DialerContact;
-import com.android.dialer.duo.DuoComponent;
-import java.util.List;
+import com.android.dialer.glidephotomanager.PhotoInfo;
 
-/** Adapter for RecyclerView in {@link CallDetailsActivity}. */
-final class CallDetailsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
+/**
+ * A {@link RecyclerView.Adapter} for {@link CallDetailsActivity}.
+ *
+ * <p>See {@link CallDetailsAdapterCommon} for logic shared between this adapter and {@link
+ * OldCallDetailsAdapter}.
+ */
+final class CallDetailsAdapter extends CallDetailsAdapterCommon {
 
-  private static final int HEADER_VIEW_TYPE = 1;
-  private static final int CALL_ENTRY_VIEW_TYPE = 2;
-  private static final int FOOTER_VIEW_TYPE = 3;
-
-  private final DialerContact contact;
-  private final CallDetailsHeaderListener callDetailsHeaderListener;
-  private final CallDetailsFooterViewHolder.ReportCallIdListener reportCallIdListener;
-  private final DeleteCallDetailsListener deleteCallDetailsListener;
-  private final CallTypeHelper callTypeHelper;
-  private List<CallDetailsEntry> callDetailsEntries;
+  /** Info to be shown in the header. */
+  private final CallDetailsHeaderInfo headerInfo;
 
   CallDetailsAdapter(
       Context context,
-      @NonNull DialerContact contact,
-      @NonNull List<CallDetailsEntry> callDetailsEntries,
+      CallDetailsHeaderInfo calldetailsHeaderInfo,
+      CallDetailsEntries callDetailsEntries,
+      CallDetailsEntryListener callDetailsEntryListener,
       CallDetailsHeaderListener callDetailsHeaderListener,
       CallDetailsFooterViewHolder.ReportCallIdListener reportCallIdListener,
       DeleteCallDetailsListener deleteCallDetailsListener) {
-    this.contact = Assert.isNotNull(contact);
-    this.callDetailsEntries = callDetailsEntries;
-    this.callDetailsHeaderListener = callDetailsHeaderListener;
-    this.reportCallIdListener = reportCallIdListener;
-    this.deleteCallDetailsListener = deleteCallDetailsListener;
-    callTypeHelper = new CallTypeHelper(context.getResources(), DuoComponent.get(context).getDuo());
+    super(
+        context,
+        callDetailsEntries,
+        callDetailsEntryListener,
+        callDetailsHeaderListener,
+        reportCallIdListener,
+        deleteCallDetailsListener);
+    this.headerInfo = calldetailsHeaderInfo;
   }
 
   @Override
-  public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
-    LayoutInflater inflater = LayoutInflater.from(parent.getContext());
-    switch (viewType) {
-      case HEADER_VIEW_TYPE:
-        return new CallDetailsHeaderViewHolder(
-            inflater.inflate(R.layout.contact_container, parent, false), callDetailsHeaderListener);
-      case CALL_ENTRY_VIEW_TYPE:
-        return new CallDetailsEntryViewHolder(
-            inflater.inflate(R.layout.call_details_entry, parent, false));
-      case FOOTER_VIEW_TYPE:
-        return new CallDetailsFooterViewHolder(
-            inflater.inflate(R.layout.call_details_footer, parent, false),
-            reportCallIdListener,
-            deleteCallDetailsListener);
-      default:
-        throw Assert.createIllegalStateFailException(
-            "No ViewHolder available for viewType: " + viewType);
-    }
+  protected CallDetailsHeaderViewHolder createCallDetailsHeaderViewHolder(
+      View container, CallDetailsHeaderListener callDetailsHeaderListener) {
+    return new CallDetailsHeaderViewHolder(
+        container,
+        headerInfo.getDialerPhoneNumber().getNormalizedNumber(),
+        headerInfo.getDialerPhoneNumber().getPostDialPortion(),
+        callDetailsHeaderListener);
   }
 
   @Override
-  public void onBindViewHolder(ViewHolder holder, int position) {
-    if (position == 0) { // Header
-      ((CallDetailsHeaderViewHolder) holder).updateContactInfo(contact, getCallbackAction());
-      ((CallDetailsHeaderViewHolder) holder)
-          .updateAssistedDialingInfo(callDetailsEntries.get(position));
-    } else if (position == getItemCount() - 1) {
-      ((CallDetailsFooterViewHolder) holder).setPhoneNumber(contact.getNumber());
-    } else {
-      CallDetailsEntryViewHolder viewHolder = (CallDetailsEntryViewHolder) holder;
-      CallDetailsEntry entry = callDetailsEntries.get(position - 1);
-      viewHolder.setCallDetails(
-          contact.getNumber(),
-          entry,
-          callTypeHelper,
-          !entry.getHistoryResultsList().isEmpty() && position != getItemCount() - 2);
-    }
+  protected void bindCallDetailsHeaderViewHolder(
+      CallDetailsHeaderViewHolder callDetailsHeaderViewHolder, int position) {
+    callDetailsHeaderViewHolder.updateContactInfo(headerInfo, getCallbackAction());
+    callDetailsHeaderViewHolder.updateAssistedDialingInfo(
+        getCallDetailsEntries().getEntries(position));
   }
 
   @Override
-  public int getItemViewType(int position) {
-    if (position == 0) { // Header
-      return HEADER_VIEW_TYPE;
-    } else if (position == getItemCount() - 1) {
-      return FOOTER_VIEW_TYPE;
-    } else {
-      return CALL_ENTRY_VIEW_TYPE;
-    }
+  protected String getNumber() {
+    return headerInfo.getDialerPhoneNumber().getNormalizedNumber();
   }
 
   @Override
-  public int getItemCount() {
-    return callDetailsEntries.isEmpty()
-        ? 0
-        : callDetailsEntries.size() + 2; // plus header and footer
+  protected String getPrimaryText() {
+    return headerInfo.getPrimaryText();
   }
 
-  void updateCallDetailsEntries(List<CallDetailsEntry> entries) {
-    callDetailsEntries = entries;
-    notifyDataSetChanged();
-  }
-
-  private @CallbackAction int getCallbackAction() {
-    Assert.checkState(!callDetailsEntries.isEmpty());
-
-    CallDetailsEntry entry = callDetailsEntries.get(0);
-    return CallbackActionHelper.getCallbackAction(
-        contact.getNumber(), entry.getFeatures(), entry.getIsDuoCall());
+  @Override
+  protected PhotoInfo getPhotoInfo() {
+    return headerInfo.getPhotoInfo();
   }
 }
diff --git a/java/com/android/dialer/calldetails/CallDetailsAdapterCommon.java b/java/com/android/dialer/calldetails/CallDetailsAdapterCommon.java
new file mode 100644
index 0000000..ec9263f
--- /dev/null
+++ b/java/com/android/dialer/calldetails/CallDetailsAdapterCommon.java
@@ -0,0 +1,168 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.dialer.calldetails;
+
+import android.content.Context;
+import android.support.annotation.CallSuper;
+import android.support.annotation.MainThread;
+import android.support.v7.widget.RecyclerView;
+import android.support.v7.widget.RecyclerView.ViewHolder;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import com.android.dialer.calldetails.CallDetailsEntries.CallDetailsEntry;
+import com.android.dialer.calldetails.CallDetailsEntryViewHolder.CallDetailsEntryListener;
+import com.android.dialer.calldetails.CallDetailsFooterViewHolder.DeleteCallDetailsListener;
+import com.android.dialer.calldetails.CallDetailsFooterViewHolder.ReportCallIdListener;
+import com.android.dialer.calldetails.CallDetailsHeaderViewHolder.CallDetailsHeaderListener;
+import com.android.dialer.calllogutils.CallTypeHelper;
+import com.android.dialer.calllogutils.CallbackActionHelper;
+import com.android.dialer.calllogutils.CallbackActionHelper.CallbackAction;
+import com.android.dialer.common.Assert;
+import com.android.dialer.duo.DuoComponent;
+import com.android.dialer.glidephotomanager.PhotoInfo;
+
+/**
+ * Contains common logic shared between {@link OldCallDetailsAdapter} and {@link
+ * CallDetailsAdapter}.
+ */
+abstract class CallDetailsAdapterCommon extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
+
+  private static final int HEADER_VIEW_TYPE = 1;
+  private static final int CALL_ENTRY_VIEW_TYPE = 2;
+  private static final int FOOTER_VIEW_TYPE = 3;
+
+  private final CallDetailsEntryListener callDetailsEntryListener;
+  private final CallDetailsHeaderListener callDetailsHeaderListener;
+  private final ReportCallIdListener reportCallIdListener;
+  private final DeleteCallDetailsListener deleteCallDetailsListener;
+  private final CallTypeHelper callTypeHelper;
+
+  private CallDetailsEntries callDetailsEntries;
+
+  protected abstract void bindCallDetailsHeaderViewHolder(
+      CallDetailsHeaderViewHolder viewHolder, int position);
+
+  protected abstract CallDetailsHeaderViewHolder createCallDetailsHeaderViewHolder(
+      View container, CallDetailsHeaderListener callDetailsHeaderListener);
+
+  /** Returns the phone number of the call details. */
+  protected abstract String getNumber();
+
+  /** Returns the primary text shown on call details toolbar, usually contact name or number. */
+  protected abstract String getPrimaryText();
+
+  /** Returns {@link PhotoInfo} of the contact. */
+  protected abstract PhotoInfo getPhotoInfo();
+
+  CallDetailsAdapterCommon(
+      Context context,
+      CallDetailsEntries callDetailsEntries,
+      CallDetailsEntryListener callDetailsEntryListener,
+      CallDetailsHeaderListener callDetailsHeaderListener,
+      ReportCallIdListener reportCallIdListener,
+      DeleteCallDetailsListener deleteCallDetailsListener) {
+    this.callDetailsEntries = callDetailsEntries;
+    this.callDetailsEntryListener = callDetailsEntryListener;
+    this.callDetailsHeaderListener = callDetailsHeaderListener;
+    this.reportCallIdListener = reportCallIdListener;
+    this.deleteCallDetailsListener = deleteCallDetailsListener;
+    this.callTypeHelper =
+        new CallTypeHelper(context.getResources(), DuoComponent.get(context).getDuo());
+  }
+
+  @Override
+  @CallSuper
+  public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+    LayoutInflater inflater = LayoutInflater.from(parent.getContext());
+    switch (viewType) {
+      case HEADER_VIEW_TYPE:
+        return createCallDetailsHeaderViewHolder(
+            inflater.inflate(R.layout.contact_container, parent, false), callDetailsHeaderListener);
+      case CALL_ENTRY_VIEW_TYPE:
+        return new CallDetailsEntryViewHolder(
+            inflater.inflate(R.layout.call_details_entry, parent, false), callDetailsEntryListener);
+      case FOOTER_VIEW_TYPE:
+        return new CallDetailsFooterViewHolder(
+            inflater.inflate(R.layout.call_details_footer, parent, false),
+            reportCallIdListener,
+            deleteCallDetailsListener);
+      default:
+        throw Assert.createIllegalStateFailException(
+            "No ViewHolder available for viewType: " + viewType);
+    }
+  }
+
+  @Override
+  @CallSuper
+  public void onBindViewHolder(ViewHolder holder, int position) {
+    if (position == 0) { // Header
+      bindCallDetailsHeaderViewHolder((CallDetailsHeaderViewHolder) holder, position);
+    } else if (position == getItemCount() - 1) {
+      ((CallDetailsFooterViewHolder) holder).setPhoneNumber(getNumber());
+    } else {
+      CallDetailsEntryViewHolder viewHolder = (CallDetailsEntryViewHolder) holder;
+      CallDetailsEntry entry = callDetailsEntries.getEntries(position - 1);
+      viewHolder.setCallDetails(
+          getNumber(),
+          getPrimaryText(),
+          getPhotoInfo(),
+          entry,
+          callTypeHelper,
+          !entry.getHistoryResultsList().isEmpty() && position != getItemCount() - 2);
+    }
+  }
+
+  @Override
+  @CallSuper
+  public int getItemViewType(int position) {
+    if (position == 0) { // Header
+      return HEADER_VIEW_TYPE;
+    } else if (position == getItemCount() - 1) {
+      return FOOTER_VIEW_TYPE;
+    } else {
+      return CALL_ENTRY_VIEW_TYPE;
+    }
+  }
+
+  @Override
+  @CallSuper
+  public int getItemCount() {
+    return callDetailsEntries.getEntriesCount() == 0
+        ? 0
+        : callDetailsEntries.getEntriesCount() + 2; // plus header and footer
+  }
+
+  final CallDetailsEntries getCallDetailsEntries() {
+    return callDetailsEntries;
+  }
+
+  @MainThread
+  final void updateCallDetailsEntries(CallDetailsEntries entries) {
+    Assert.isMainThread();
+    callDetailsEntries = entries;
+    notifyDataSetChanged();
+  }
+
+  final @CallbackAction int getCallbackAction() {
+    Assert.checkState(!callDetailsEntries.getEntriesList().isEmpty());
+
+    CallDetailsEntry entry = callDetailsEntries.getEntries(0);
+    return CallbackActionHelper.getCallbackAction(
+        getNumber(), entry.getFeatures(), entry.getIsDuoCall());
+  }
+}
diff --git a/java/com/android/dialer/calldetails/CallDetailsCursorLoader.java b/java/com/android/dialer/calldetails/CallDetailsCursorLoader.java
index 15c64c9..9d55b9f 100644
--- a/java/com/android/dialer/calldetails/CallDetailsCursorLoader.java
+++ b/java/com/android/dialer/calldetails/CallDetailsCursorLoader.java
@@ -23,7 +23,7 @@
 import com.android.dialer.calldetails.CallDetailsEntries.CallDetailsEntry;
 import com.android.dialer.calllog.database.contract.AnnotatedCallLogContract.AnnotatedCallLog;
 import com.android.dialer.common.Assert;
-import com.android.dialer.duo.DuoConstants;
+import com.android.dialer.duo.DuoComponent;
 
 /**
  * A {@link CursorLoader} that loads call detail entries from {@link AnnotatedCallLog} for {@link
@@ -42,7 +42,8 @@
         AnnotatedCallLog.TIMESTAMP,
         AnnotatedCallLog.DURATION,
         AnnotatedCallLog.DATA_USAGE,
-        AnnotatedCallLog.PHONE_ACCOUNT_COMPONENT_NAME
+        AnnotatedCallLog.PHONE_ACCOUNT_COMPONENT_NAME,
+        AnnotatedCallLog.CALL_MAPPING_ID
       };
 
   // Indexes for COLUMNS_FOR_CALL_DETAILS
@@ -53,6 +54,7 @@
   private static final int DURATION = 4;
   private static final int DATA_USAGE = 5;
   private static final int PHONE_ACCOUNT_COMPONENT_NAME = 6;
+  private static final int CALL_MAPPING_ID = 7;
 
   CallDetailsCursorLoader(Context context, CoalescedIds coalescedIds) {
     super(
@@ -73,8 +75,8 @@
     // the data loading but no data can be fetched and we want to ensure the data set is not empty
     // when building CallDetailsEntries proto (see toCallDetailsEntries(Cursor)).
     //
-    // CallDetailsActivity doesn't respond to underlying data changes when launched from the old
-    // call log and we decided to keep it that way when launched from the new call log.
+    // OldCallDetailsActivity doesn't respond to underlying data changes and we decided to keep it
+    // that way in CallDetailsActivity.
   }
 
   /**
@@ -117,21 +119,21 @@
    *     the cursor is not null and the data set it points to is not empty.
    * @return A {@link CallDetailsEntries} proto.
    */
-  static CallDetailsEntries toCallDetailsEntries(Cursor cursor) {
+  static CallDetailsEntries toCallDetailsEntries(Context context, Cursor cursor) {
     Assert.isNotNull(cursor);
     Assert.checkArgument(cursor.moveToFirst());
 
     CallDetailsEntries.Builder entries = CallDetailsEntries.newBuilder();
 
     do {
-      entries.addEntries(toCallDetailsEntry(cursor));
+      entries.addEntries(toCallDetailsEntry(context, cursor));
     } while (cursor.moveToNext());
 
     return entries.build();
   }
 
   /** Creates a new {@link CallDetailsEntry} from the provided cursor using its current position. */
-  private static CallDetailsEntry toCallDetailsEntry(Cursor cursor) {
+  private static CallDetailsEntry toCallDetailsEntry(Context context, Cursor cursor) {
     CallDetailsEntry.Builder entry = CallDetailsEntry.newBuilder();
     entry
         .setCallId(cursor.getLong(ID))
@@ -139,13 +141,11 @@
         .setFeatures(cursor.getInt(FEATURES))
         .setDate(cursor.getLong(TIMESTAMP))
         .setDuration(cursor.getLong(DURATION))
-        .setDataUsage(cursor.getLong(DATA_USAGE));
+        .setDataUsage(cursor.getLong(DATA_USAGE))
+        .setCallMappingId(cursor.getString(CALL_MAPPING_ID));
 
     String phoneAccountComponentName = cursor.getString(PHONE_ACCOUNT_COMPONENT_NAME);
-    entry.setIsDuoCall(
-        DuoConstants.PHONE_ACCOUNT_COMPONENT_NAME
-            .flattenToString()
-            .equals(phoneAccountComponentName));
+    entry.setIsDuoCall(DuoComponent.get(context).getDuo().isDuoAccount(phoneAccountComponentName));
 
     return entry.build();
   }
diff --git a/java/com/android/dialer/calldetails/CallDetailsEntryViewHolder.java b/java/com/android/dialer/calldetails/CallDetailsEntryViewHolder.java
index c65bb91..05957ae 100644
--- a/java/com/android/dialer/calldetails/CallDetailsEntryViewHolder.java
+++ b/java/com/android/dialer/calldetails/CallDetailsEntryViewHolder.java
@@ -22,6 +22,7 @@
 import android.support.annotation.ColorInt;
 import android.support.annotation.NonNull;
 import android.support.v4.content.ContextCompat;
+import android.support.v4.os.BuildCompat;
 import android.support.v7.widget.RecyclerView.ViewHolder;
 import android.text.TextUtils;
 import android.view.View;
@@ -33,16 +34,24 @@
 import com.android.dialer.calllogutils.CallTypeHelper;
 import com.android.dialer.calllogutils.CallTypeIconsView;
 import com.android.dialer.common.LogUtil;
-import com.android.dialer.compat.AppCompatConstants;
 import com.android.dialer.enrichedcall.historyquery.proto.HistoryResult;
 import com.android.dialer.enrichedcall.historyquery.proto.HistoryResult.Type;
+import com.android.dialer.glidephotomanager.PhotoInfo;
 import com.android.dialer.oem.MotorolaUtils;
 import com.android.dialer.util.DialerUtils;
 import com.android.dialer.util.IntentUtil;
 
-/** ViewHolder for call entries in {@link CallDetailsActivity}. */
+/** ViewHolder for call entries in {@link OldCallDetailsActivity} or {@link CallDetailsActivity}. */
 public class CallDetailsEntryViewHolder extends ViewHolder {
 
+  /** Listener for the call details header */
+  interface CallDetailsEntryListener {
+    /** Shows RTT transcript. */
+    void showRttTranscript(String transcriptId, String primaryText, PhotoInfo photoInfo);
+  }
+
+  private final CallDetailsEntryListener callDetailsEntryListener;
+
   private final CallTypeIconsView callTypeIcon;
   private final TextView callTypeText;
   private final TextView callTime;
@@ -54,6 +63,7 @@
 
   private final TextView multimediaDetails;
   private final TextView postCallNote;
+  private final TextView rttTranscript;
 
   private final ImageView multimediaImage;
 
@@ -63,7 +73,8 @@
 
   private final Context context;
 
-  public CallDetailsEntryViewHolder(View container) {
+  public CallDetailsEntryViewHolder(
+      View container, CallDetailsEntryListener callDetailsEntryListener) {
     super(container);
     context = container.getContext();
 
@@ -80,10 +91,14 @@
     multimediaImage = (ImageView) container.findViewById(R.id.multimedia_image);
     multimediaAttachmentsNumber =
         (TextView) container.findViewById(R.id.multimedia_attachments_number);
+    rttTranscript = container.findViewById(R.id.rtt_transcript);
+    this.callDetailsEntryListener = callDetailsEntryListener;
   }
 
   void setCallDetails(
       String number,
+      String primaryText,
+      PhotoInfo photoInfo,
       CallDetailsEntry entry,
       CallTypeHelper callTypeHelper,
       boolean showMultimediaDivider) {
@@ -93,6 +108,9 @@
         (entry.getFeatures() & Calls.FEATURES_PULLED_EXTERNALLY)
             == Calls.FEATURES_PULLED_EXTERNALLY;
     boolean isDuoCall = entry.getIsDuoCall();
+    boolean isRttCall =
+        BuildCompat.isAtLeastP()
+            && (entry.getFeatures() & Calls.FEATURES_RTT) == Calls.FEATURES_RTT;
 
     callTime.setTextColor(getColorForCallType(context, callType));
     callTypeIcon.clear();
@@ -102,6 +120,9 @@
         (entry.getFeatures() & Calls.FEATURES_HD_CALL) == Calls.FEATURES_HD_CALL);
     callTypeIcon.setShowWifi(
         MotorolaUtils.shouldShowWifiIconInCallLog(context, entry.getFeatures()));
+    if (BuildCompat.isAtLeastP()) {
+      callTypeIcon.setShowRtt((entry.getFeatures() & Calls.FEATURES_RTT) == Calls.FEATURES_RTT);
+    }
 
     callTypeText.setText(
         callTypeHelper.getCallTypeText(callType, isVideoCall, isPulledCall, isDuoCall));
@@ -119,6 +140,24 @@
               context, entry.getDuration(), entry.getDataUsage()));
     }
     setMultimediaDetails(number, entry, showMultimediaDivider);
+    if (isRttCall) {
+      if (entry.getHasRttTranscript()) {
+        rttTranscript.setText(R.string.rtt_transcript_link);
+        rttTranscript.setTextAppearance(R.style.RttTranscriptLink);
+        rttTranscript.setClickable(true);
+        rttTranscript.setOnClickListener(
+            v ->
+                callDetailsEntryListener.showRttTranscript(
+                    entry.getCallMappingId(), primaryText, photoInfo));
+      } else {
+        rttTranscript.setText(R.string.rtt_transcript_not_available);
+        rttTranscript.setTextAppearance(R.style.RttTranscriptMessage);
+        rttTranscript.setClickable(false);
+      }
+      rttTranscript.setVisibility(View.VISIBLE);
+    } else {
+      rttTranscript.setVisibility(View.GONE);
+    }
   }
 
   private void setMultimediaDetails(String number, CallDetailsEntry entry, boolean showDivider) {
@@ -177,20 +216,20 @@
 
   private static @ColorInt int getColorForCallType(Context context, int callType) {
     switch (callType) {
-      case AppCompatConstants.CALLS_OUTGOING_TYPE:
-      case AppCompatConstants.CALLS_VOICEMAIL_TYPE:
-      case AppCompatConstants.CALLS_BLOCKED_TYPE:
-      case AppCompatConstants.CALLS_INCOMING_TYPE:
-      case AppCompatConstants.CALLS_ANSWERED_EXTERNALLY_TYPE:
-      case AppCompatConstants.CALLS_REJECTED_TYPE:
+      case Calls.OUTGOING_TYPE:
+      case Calls.VOICEMAIL_TYPE:
+      case Calls.BLOCKED_TYPE:
+      case Calls.INCOMING_TYPE:
+      case Calls.ANSWERED_EXTERNALLY_TYPE:
+      case Calls.REJECTED_TYPE:
         return ContextCompat.getColor(context, R.color.dialer_secondary_text_color);
-      case AppCompatConstants.CALLS_MISSED_TYPE:
+      case Calls.MISSED_TYPE:
       default:
         // It is possible for users to end up with calls with unknown call types in their
         // call history, possibly due to 3rd party call log implementations (e.g. to
         // distinguish between rejected and missed calls). Instead of crashing, just
         // assume that all unknown call types are missed calls.
-        return ContextCompat.getColor(context, R.color.missed_call);
+        return ContextCompat.getColor(context, R.color.dialer_red);
     }
   }
 }
diff --git a/java/com/android/dialer/calldetails/CallDetailsFooterViewHolder.java b/java/com/android/dialer/calldetails/CallDetailsFooterViewHolder.java
index 30b28d8..d6e6dbe 100644
--- a/java/com/android/dialer/calldetails/CallDetailsFooterViewHolder.java
+++ b/java/com/android/dialer/calldetails/CallDetailsFooterViewHolder.java
@@ -31,7 +31,7 @@
 import com.android.dialer.util.CallUtil;
 import com.android.dialer.util.DialerUtils;
 
-/** ViewHolder container for {@link CallDetailsActivity} footer. */
+/** ViewHolder for the footer in {@link OldCallDetailsActivity} or {@link CallDetailsActivity}. */
 final class CallDetailsFooterViewHolder extends RecyclerView.ViewHolder implements OnClickListener {
 
   private final ReportCallIdListener reportCallIdListener;
@@ -91,7 +91,8 @@
     } else if (view == delete) {
       deleteCallDetailsListener.delete();
     } else {
-      Assert.fail("View on click not implemented: " + view);
+      throw Assert.createUnsupportedOperationFailException(
+          "View on click not implemented: " + view);
     }
   }
 
diff --git a/java/com/android/dialer/calldetails/CallDetailsHeaderViewHolder.java b/java/com/android/dialer/calldetails/CallDetailsHeaderViewHolder.java
index 647c6ed..f678061 100644
--- a/java/com/android/dialer/calldetails/CallDetailsHeaderViewHolder.java
+++ b/java/com/android/dialer/calldetails/CallDetailsHeaderViewHolder.java
@@ -27,7 +27,7 @@
 import android.widget.QuickContactBadge;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
-import com.android.dialer.calldetails.CallDetailsActivity.AssistedDialingNumberParseWorker;
+import com.android.dialer.calldetails.CallDetailsActivityCommon.AssistedDialingNumberParseWorker;
 import com.android.dialer.calldetails.CallDetailsEntries.CallDetailsEntry;
 import com.android.dialer.calllogutils.CallbackActionHelper.CallbackAction;
 import com.android.dialer.common.Assert;
@@ -37,27 +37,40 @@
 import com.android.dialer.compat.telephony.TelephonyManagerCompat;
 import com.android.dialer.contactphoto.ContactPhotoManager;
 import com.android.dialer.dialercontact.DialerContact;
+import com.android.dialer.glidephotomanager.GlidePhotoManagerComponent;
 import com.android.dialer.logging.InteractionEvent;
 import com.android.dialer.logging.Logger;
+import com.android.dialer.phonenumberutil.PhoneNumberHelper;
+import com.android.dialer.widget.BidiTextView;
 
-/** ViewHolder for Header/Contact in {@link CallDetailsActivity}. */
+/**
+ * ViewHolder for the header in {@link OldCallDetailsActivity} or {@link CallDetailsActivity}.
+ *
+ * <p>The header contains contact info and the primary callback button.
+ */
 public class CallDetailsHeaderViewHolder extends RecyclerView.ViewHolder
     implements OnClickListener, FailureListener {
 
   private final CallDetailsHeaderListener callDetailsHeaderListener;
   private final ImageView callbackButton;
-  private final TextView nameView;
-  private final TextView numberView;
+  private final BidiTextView nameView;
+  private final BidiTextView numberView;
   private final TextView networkView;
   private final QuickContactBadge contactPhoto;
   private final Context context;
   private final TextView assistedDialingInternationalDirectDialCodeAndCountryCodeText;
   private final RelativeLayout assistedDialingContainer;
 
-  private DialerContact contact;
+  private final String number;
+  private final String postDialDigits;
+
   private @CallbackAction int callbackAction;
 
-  CallDetailsHeaderViewHolder(View container, CallDetailsHeaderListener callDetailsHeaderListener) {
+  CallDetailsHeaderViewHolder(
+      View container,
+      String number,
+      String postDialDigits,
+      CallDetailsHeaderListener callDetailsHeaderListener) {
     super(container);
     context = container.getContext();
     callbackButton = container.findViewById(R.id.call_back_button);
@@ -73,7 +86,11 @@
         callDetailsHeaderListener::openAssistedDialingSettings);
 
     callbackButton.setOnClickListener(this);
+
+    this.number = number;
+    this.postDialDigits = postDialDigits;
     this.callDetailsHeaderListener = callDetailsHeaderListener;
+
     Logger.get(context)
         .logQuickContactOnTouch(
             contactPhoto, InteractionEvent.Type.OPEN_QUICK_CONTACT_FROM_CALL_DETAILS, true);
@@ -89,7 +106,7 @@
     if (callDetailsEntry != null && hasAssistedDialingFeature(callDetailsEntry.getFeatures())) {
       showAssistedDialingContainer(true);
       callDetailsHeaderListener.createAssistedDialerNumberParserTask(
-          new CallDetailsActivity.AssistedDialingNumberParseWorker(),
+          new CallDetailsActivityCommon.AssistedDialingNumberParseWorker(),
           this::updateAssistedDialingText,
           this::onFailure);
 
@@ -132,7 +149,6 @@
 
   /** Populates the contact info fields based on the current contact information. */
   void updateContactInfo(DialerContact contact, @CallbackAction int callbackAction) {
-    this.contact = contact;
     ContactPhotoManager.getInstance(context)
         .loadDialerThumbnailOrPhoto(
             contactPhoto,
@@ -142,20 +158,26 @@
             contact.getNameOrNumber(),
             contact.getContactType());
 
-    nameView.setText(contact.getNameOrNumber());
-    if (!TextUtils.isEmpty(contact.getDisplayNumber())) {
-      numberView.setVisibility(View.VISIBLE);
-      String secondaryInfo =
-          TextUtils.isEmpty(contact.getNumberLabel())
-              ? contact.getDisplayNumber()
-              : context.getString(
-                  com.android.contacts.common.R.string.call_subject_type_and_number,
-                  contact.getNumberLabel(),
-                  contact.getDisplayNumber());
-      numberView.setText(secondaryInfo);
+    // Hide the secondary text of the header by default.
+    // We will show it if needed (see below).
+    numberView.setVisibility(View.GONE);
+    numberView.setText(null);
+
+    if (PhoneNumberHelper.isLocalEmergencyNumber(context, contact.getNumber())) {
+      nameView.setText(context.getResources().getString(R.string.emergency_number));
     } else {
-      numberView.setVisibility(View.GONE);
-      numberView.setText(null);
+      nameView.setText(contact.getNameOrNumber());
+      if (!TextUtils.isEmpty(contact.getDisplayNumber())) {
+        numberView.setVisibility(View.VISIBLE);
+        String secondaryInfo =
+            TextUtils.isEmpty(contact.getNumberLabel())
+                ? contact.getDisplayNumber()
+                : context.getString(
+                    com.android.dialer.contacts.resources.R.string.call_subject_type_and_number,
+                    contact.getNumberLabel(),
+                    contact.getDisplayNumber());
+        numberView.setText(secondaryInfo);
+      }
     }
 
     if (!TextUtils.isEmpty(contact.getSimDetails().getNetwork())) {
@@ -169,6 +191,23 @@
     setCallbackAction(callbackAction);
   }
 
+  void updateContactInfo(CallDetailsHeaderInfo headerInfo, @CallbackAction int callbackAction) {
+    GlidePhotoManagerComponent.get(context)
+        .glidePhotoManager()
+        .loadQuickContactBadge(contactPhoto, headerInfo.getPhotoInfo());
+
+    nameView.setText(headerInfo.getPrimaryText());
+    if (!headerInfo.getSecondaryText().isEmpty()) {
+      numberView.setVisibility(View.VISIBLE);
+      numberView.setText(headerInfo.getSecondaryText());
+    } else {
+      numberView.setVisibility(View.GONE);
+      numberView.setText(null);
+    }
+
+    setCallbackAction(callbackAction);
+  }
+
   private void setCallbackAction(@CallbackAction int callbackAction) {
     this.callbackAction = callbackAction;
     switch (callbackAction) {
@@ -194,14 +233,13 @@
     if (view == callbackButton) {
       switch (callbackAction) {
         case CallbackAction.IMS_VIDEO:
-          callDetailsHeaderListener.placeImsVideoCall(contact.getNumber());
+          callDetailsHeaderListener.placeImsVideoCall(number);
           break;
         case CallbackAction.DUO:
-          callDetailsHeaderListener.placeDuoVideoCall(contact.getNumber());
+          callDetailsHeaderListener.placeDuoVideoCall(number);
           break;
         case CallbackAction.VOICE:
-          callDetailsHeaderListener.placeVoiceCall(
-              contact.getNumber(), contact.getPostDialDigits());
+          callDetailsHeaderListener.placeVoiceCall(number, postDialDigits);
           break;
         case CallbackAction.NONE:
         default:
diff --git a/java/com/android/dialer/calldetails/OldCallDetailsActivity.java b/java/com/android/dialer/calldetails/OldCallDetailsActivity.java
new file mode 100644
index 0000000..26217ab
--- /dev/null
+++ b/java/com/android/dialer/calldetails/OldCallDetailsActivity.java
@@ -0,0 +1,98 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.dialer.calldetails;
+
+import android.content.Context;
+import android.content.Intent;
+import com.android.dialer.calldetails.CallDetailsEntryViewHolder.CallDetailsEntryListener;
+import com.android.dialer.calldetails.CallDetailsFooterViewHolder.DeleteCallDetailsListener;
+import com.android.dialer.calldetails.CallDetailsFooterViewHolder.ReportCallIdListener;
+import com.android.dialer.calldetails.CallDetailsHeaderViewHolder.CallDetailsHeaderListener;
+import com.android.dialer.common.Assert;
+import com.android.dialer.dialercontact.DialerContact;
+import com.android.dialer.protos.ProtoParsers;
+
+/**
+ * Displays the details of a specific call log entry.
+ *
+ * <p>This activity is for the old call log.
+ *
+ * <p>See {@link CallDetailsAdapterCommon} for logic shared between this activity and the one for
+ * the new call log.
+ */
+public final class OldCallDetailsActivity extends CallDetailsActivityCommon {
+  public static final String EXTRA_CALL_DETAILS_ENTRIES = "call_details_entries";
+  public static final String EXTRA_CONTACT = "contact";
+
+  /** Contains info to be shown in the header. */
+  private DialerContact contact;
+
+  public static boolean isLaunchIntent(Intent intent) {
+    return intent.getComponent() != null
+        && OldCallDetailsActivity.class.getName().equals(intent.getComponent().getClassName());
+  }
+
+  /** Returns an {@link Intent} to launch this activity. */
+  public static Intent newInstance(
+      Context context,
+      CallDetailsEntries details,
+      DialerContact contact,
+      boolean canReportCallerId,
+      boolean canSupportAssistedDialing) {
+    Intent intent = new Intent(context, OldCallDetailsActivity.class);
+    ProtoParsers.put(intent, EXTRA_CONTACT, Assert.isNotNull(contact));
+    ProtoParsers.put(intent, EXTRA_CALL_DETAILS_ENTRIES, Assert.isNotNull(details));
+    intent.putExtra(EXTRA_CAN_REPORT_CALLER_ID, canReportCallerId);
+    intent.putExtra(EXTRA_CAN_SUPPORT_ASSISTED_DIALING, canSupportAssistedDialing);
+    return intent;
+  }
+
+  @Override
+  protected void handleIntent(Intent intent) {
+    Assert.checkArgument(intent.hasExtra(EXTRA_CONTACT));
+    Assert.checkArgument(intent.hasExtra(EXTRA_CALL_DETAILS_ENTRIES));
+    Assert.checkArgument(intent.hasExtra(EXTRA_CAN_REPORT_CALLER_ID));
+    Assert.checkArgument(intent.hasExtra(EXTRA_CAN_SUPPORT_ASSISTED_DIALING));
+
+    contact = ProtoParsers.getTrusted(intent, EXTRA_CONTACT, DialerContact.getDefaultInstance());
+    setCallDetailsEntries(
+        ProtoParsers.getTrusted(
+            intent, EXTRA_CALL_DETAILS_ENTRIES, CallDetailsEntries.getDefaultInstance()));
+    loadRttTranscriptAvailability();
+  }
+
+  @Override
+  protected CallDetailsAdapterCommon createAdapter(
+      CallDetailsEntryListener callDetailsEntryListener,
+      CallDetailsHeaderListener callDetailsHeaderListener,
+      ReportCallIdListener reportCallIdListener,
+      DeleteCallDetailsListener deleteCallDetailsListener) {
+    return new OldCallDetailsAdapter(
+        /* context = */ this,
+        contact,
+        getCallDetailsEntries(),
+        callDetailsEntryListener,
+        callDetailsHeaderListener,
+        reportCallIdListener,
+        deleteCallDetailsListener);
+  }
+
+  @Override
+  protected String getNumber() {
+    return contact.getNumber();
+  }
+}
diff --git a/java/com/android/dialer/calldetails/OldCallDetailsAdapter.java b/java/com/android/dialer/calldetails/OldCallDetailsAdapter.java
new file mode 100644
index 0000000..878803c
--- /dev/null
+++ b/java/com/android/dialer/calldetails/OldCallDetailsAdapter.java
@@ -0,0 +1,106 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.dialer.calldetails;
+
+
+import android.content.Context;
+import android.support.v7.widget.RecyclerView;
+import android.view.View;
+import com.android.dialer.calldetails.CallDetailsEntryViewHolder.CallDetailsEntryListener;
+import com.android.dialer.calldetails.CallDetailsFooterViewHolder.DeleteCallDetailsListener;
+import com.android.dialer.calldetails.CallDetailsHeaderViewHolder.CallDetailsHeaderListener;
+import com.android.dialer.dialercontact.DialerContact;
+import com.android.dialer.glidephotomanager.PhotoInfo;
+import com.android.dialer.lettertile.LetterTileDrawable;
+
+/**
+ * A {@link RecyclerView.Adapter} for {@link OldCallDetailsActivity}.
+ *
+ * <p>See {@link CallDetailsAdapterCommon} for logic shared between this adapter and {@link
+ * CallDetailsAdapter}.
+ */
+final class OldCallDetailsAdapter extends CallDetailsAdapterCommon {
+
+  /** Contains info to be shown in the header. */
+  private final DialerContact contact;
+
+  OldCallDetailsAdapter(
+      Context context,
+      DialerContact contact,
+      CallDetailsEntries callDetailsEntries,
+      CallDetailsEntryListener callDetailsEntryListener,
+      CallDetailsHeaderListener callDetailsHeaderListener,
+      CallDetailsFooterViewHolder.ReportCallIdListener reportCallIdListener,
+      DeleteCallDetailsListener deleteCallDetailsListener) {
+    super(
+        context,
+        callDetailsEntries,
+        callDetailsEntryListener,
+        callDetailsHeaderListener,
+        reportCallIdListener,
+        deleteCallDetailsListener);
+    this.contact = contact;
+  }
+
+  @Override
+  protected CallDetailsHeaderViewHolder createCallDetailsHeaderViewHolder(
+      View container, CallDetailsHeaderListener callDetailsHeaderListener) {
+    return new CallDetailsHeaderViewHolder(
+        container, contact.getNumber(), contact.getPostDialDigits(), callDetailsHeaderListener);
+  }
+
+  @Override
+  protected void bindCallDetailsHeaderViewHolder(
+      CallDetailsHeaderViewHolder callDetailsHeaderViewHolder, int position) {
+    callDetailsHeaderViewHolder.updateContactInfo(contact, getCallbackAction());
+    callDetailsHeaderViewHolder.updateAssistedDialingInfo(
+        getCallDetailsEntries().getEntries(position));
+  }
+
+  @Override
+  protected String getNumber() {
+    return contact.getNumber();
+  }
+
+  @Override
+  protected String getPrimaryText() {
+    return contact.getNameOrNumber();
+  }
+
+  @Override
+  protected PhotoInfo getPhotoInfo() {
+    PhotoInfo.Builder builder =
+        PhotoInfo.newBuilder()
+            .setPhotoUri(contact.getPhotoUri())
+            .setPhotoId(contact.getPhotoId())
+            .setName(contact.getNameOrNumber())
+            .setLookupUri(contact.getContactUri());
+    switch (contact.getContactType()) {
+      case LetterTileDrawable.TYPE_VOICEMAIL:
+        builder.setIsVoicemail(true);
+        break;
+      case LetterTileDrawable.TYPE_BUSINESS:
+        builder.setIsBusiness(true);
+        break;
+      case LetterTileDrawable.TYPE_SPAM:
+        builder.setIsSpam(true);
+        break;
+      default: // fall out
+    }
+    return builder.build();
+  }
+}
diff --git a/java/com/android/dialer/calldetails/ReportDialogFragment.java b/java/com/android/dialer/calldetails/ReportDialogFragment.java
index 0861c9d..e1c0e9d 100644
--- a/java/com/android/dialer/calldetails/ReportDialogFragment.java
+++ b/java/com/android/dialer/calldetails/ReportDialogFragment.java
@@ -37,8 +37,9 @@
 import com.android.dialer.phonenumbercache.CachedNumberLookupService;
 import com.android.dialer.phonenumbercache.CachedNumberLookupService.CachedContactInfo;
 import com.android.dialer.phonenumbercache.PhoneNumberCache;
+import com.android.dialer.theme.base.ThemeComponent;
 
-/** Dialog for reporting an inaccurate caller id information in {@link CallDetailsActivity}. */
+/** Dialog for reporting an inaccurate caller id information. */
 public class ReportDialogFragment extends DialogFragment {
 
   private static final String KEY_NUMBER = "number";
@@ -92,7 +93,7 @@
   }
 
   private static void onShow(Context context, AlertDialog dialog) {
-    int buttonTextColor = context.getColor(R.color.dialer_theme_color);
+    int buttonTextColor = ThemeComponent.get(context).theme().getColorPrimary();
     dialog.getButton(AlertDialog.BUTTON_POSITIVE).setTextColor(buttonTextColor);
     dialog.getButton(AlertDialog.BUTTON_NEGATIVE).setTextColor(buttonTextColor);
   }
diff --git a/java/com/android/dialer/calldetails/proto/call_details_entries.proto b/java/com/android/dialer/calldetails/proto/call_details_entries.proto
index 7a5700b..0f11b53 100644
--- a/java/com/android/dialer/calldetails/proto/call_details_entries.proto
+++ b/java/com/android/dialer/calldetails/proto/call_details_entries.proto
@@ -19,6 +19,15 @@
     optional int64 data_usage = 6;
     repeated enrichedcall.historyquery.proto.HistoryResult history_results = 7;
     optional bool is_duo_call = 8;
+    optional bool has_rtt_transcript = 9;
+    // A unique ID that could be used to map a call log entry to a {@link
+    // android.telecom.Call}. This is different from call_id which is id of call
+    // log entry.
+    // On pre-Q this will be {@link android.provider.CallLog.Calls#DATE} which
+    // is same as {@link com.android.telecom.Call#getCreationTimeMillis()}.
+    // Starting from Q this will be a call UUID generated by system to associate
+    // a call log to a telecom call.
+    optional string call_mapping_id = 10;
   }
 
   repeated CallDetailsEntry entries = 1;
diff --git a/java/com/android/dialer/calldetails/proto/call_details_header_info.proto b/java/com/android/dialer/calldetails/proto/call_details_header_info.proto
new file mode 100644
index 0000000..e2532d5
--- /dev/null
+++ b/java/com/android/dialer/calldetails/proto/call_details_header_info.proto
@@ -0,0 +1,34 @@
+syntax = "proto2";
+
+option java_package = "com.android.dialer.calldetails";
+option java_multiple_files = true;
+option optimize_for = LITE_RUNTIME;
+
+
+import "java/com/android/dialer/phonenumberproto/dialer_phone_number.proto";
+import "java/com/android/dialer/glidephotomanager/photo_info.proto";
+
+package com.android.dialer.calldetails;
+
+// Contains information for the header in CallDetailsActivity
+// Next ID: 5
+message CallDetailsHeaderInfo {
+  // The number of all call detail entries.
+  optional com.android.dialer.DialerPhoneNumber dialer_phone_number = 1;
+
+  // Information used to load the contact photo.
+  optional com.android.dialer.glidephotomanager.PhotoInfo photo_info = 2;
+
+  // Primary text of the header, which can be
+  // (1) a presentation name (e.g., "Restricted", "Unknown", etc.),
+  // (2) the contact name, or
+  // (3) the formatted number.
+  optional string primary_text = 3;
+
+  // Secondary test of the header, which describes the number.
+  // Some examples are:
+  //   "Mobile • 555-1234",
+  //   "Blocked • Mobile • 555-1234", and
+  //   "Spam • Mobile • 555-1234".
+  optional string secondary_text = 4;
+}
\ No newline at end of file
diff --git a/java/com/android/dialer/calldetails/res/layout/call_details_activity.xml b/java/com/android/dialer/calldetails/res/layout/call_details_activity.xml
index 10927af..950867d 100644
--- a/java/com/android/dialer/calldetails/res/layout/call_details_activity.xml
+++ b/java/com/android/dialer/calldetails/res/layout/call_details_activity.xml
@@ -29,5 +29,5 @@
       android:id="@+id/recycler_view"
       android:layout_width="match_parent"
       android:layout_height="match_parent"
-      android:background="@color/background_dialer_white"/>
+      android:background="?android:attr/colorBackground"/>
 </LinearLayout>
\ No newline at end of file
diff --git a/java/com/android/dialer/calldetails/res/layout/call_details_entry.xml b/java/com/android/dialer/calldetails/res/layout/call_details_entry.xml
index 3d4750d..bfbb4f8 100644
--- a/java/com/android/dialer/calldetails/res/layout/call_details_entry.xml
+++ b/java/com/android/dialer/calldetails/res/layout/call_details_entry.xml
@@ -30,60 +30,71 @@
 
   <TextView
       android:id="@+id/call_type"
+      style="@style/Dialer.TextAppearance.Primary"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
       android:layout_marginStart="@dimen/call_entry_text_left_margin"
       android:layout_marginEnd="16dp"
       android:layout_toStartOf="@+id/call_duration"
-      android:gravity="start"
-      android:maxLines="100"
-      style="@style/PrimaryText"/>
+      android:gravity="start"/>
 
   <TextView
       android:id="@+id/call_time"
+      style="@style/Dialer.TextAppearance.Secondary"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:layout_marginStart="@dimen/call_entry_text_left_margin"
-      android:layout_below="@+id/call_type"
       android:layout_marginBottom="@dimen/call_entry_bottom_padding"
-      style="@style/SecondaryText"/>
+      android:layout_marginStart="@dimen/call_entry_text_left_margin"
+      android:layout_marginEnd="16dp"
+      android:layout_below="@+id/call_type"/>
 
   <TextView
       android:id="@+id/call_duration"
+      style="@style/Dialer.TextAppearance.Primary.Ellipsize"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:layout_alignParentEnd="true"
       android:layout_marginEnd="@dimen/call_entry_padding"
-      style="@style/PrimaryText"/>
+      android:layout_alignParentEnd="true"/>
 
   <include
-      layout="@layout/ec_data_container"
       android:id="@+id/ec_container"
-      android:layout_height="@dimen/ec_container_height"
+      layout="@layout/ec_data_container"
       android:layout_width="match_parent"
+      android:layout_height="@dimen/ec_container_height"
       android:layout_below="@+id/call_time"
       android:visibility="gone"/>
 
   <TextView
       android:id="@+id/post_call_note"
+      style="@style/Dialer.TextAppearance.Secondary.Ellipsize"
       android:layout_width="match_parent"
       android:layout_height="@dimen/ec_container_height"
       android:layout_below="@+id/ec_container"
       android:paddingStart="@dimen/call_entry_text_left_margin"
+      android:background="?attr/selectableItemBackground"
       android:gravity="center_vertical"
       android:maxLines="2"
-      android:visibility="gone"
-      android:background="?attr/selectableItemBackground"
-      style="@style/SecondaryText"/>
+      android:visibility="gone"/>
+  <TextView
+      android:id="@+id/rtt_transcript"
+      style="@style/Dialer.TextAppearance.Secondary.Ellipsize"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:layout_marginBottom="@dimen/call_entry_bottom_padding"
+      android:layout_marginStart="@dimen/call_entry_text_left_margin"
+      android:layout_marginEnd="@dimen/call_entry_padding"
+      android:layout_below="@id/post_call_note"
+      android:maxLines="2"
+      android:visibility="gone"/>
 
   <View
       android:id="@+id/divider"
       android:layout_width="match_parent"
       android:layout_height="1dp"
-      android:layout_below="@id/post_call_note"
       android:layout_marginTop="@dimen/ec_divider_top_bottom_margin"
       android:layout_marginBottom="@dimen/ec_divider_top_bottom_margin"
       android:layout_marginStart="@dimen/call_entry_text_left_margin"
-      android:background="#12000000"
+      android:layout_below="@id/rtt_transcript"
+      android:background="@color/dialer_divider_line_color"
       android:visibility="gone"/>
 </RelativeLayout>
\ No newline at end of file
diff --git a/java/com/android/dialer/calldetails/res/layout/call_details_footer.xml b/java/com/android/dialer/calldetails/res/layout/call_details_footer.xml
index dddb451..0029038 100644
--- a/java/com/android/dialer/calldetails/res/layout/call_details_footer.xml
+++ b/java/com/android/dialer/calldetails/res/layout/call_details_footer.xml
@@ -24,7 +24,7 @@
       android:layout_height="1dp"
       android:layout_marginTop="@dimen/ec_divider_top_bottom_margin"
       android:layout_marginBottom="@dimen/ec_divider_top_bottom_margin"
-      android:background="#12000000"/>
+      android:background="@color/dialer_divider_line_color"/>
 
   <TextView
       android:id="@+id/call_detail_action_copy"
@@ -32,6 +32,7 @@
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
       android:drawableStart="@drawable/quantum_ic_content_copy_grey600_24"
+      android:tint="?colorIcon"
       android:text="@string/call_details_copy_number"/>
 
   <TextView
@@ -40,6 +41,7 @@
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
       android:drawableStart="@drawable/quantum_ic_edit_grey600_24"
+      android:tint="?colorIcon"
       android:text="@string/call_details_edit_number"/>
 
   <TextView
@@ -49,6 +51,7 @@
       android:layout_height="wrap_content"
       android:drawableStart="@drawable/quantum_ic_report_grey600_24"
       android:text="@string/call_details_report_call_id"
+      android:tint="?colorIcon"
       android:visibility="gone"/>
 
   <TextView
@@ -57,6 +60,6 @@
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
       android:drawableStart="@drawable/quantum_ic_delete_vd_theme_24"
-      android:tint="@color/dialer_secondary_text_color"
+      android:tint="?colorIcon"
       android:text="@string/delete"/>
 </LinearLayout>
diff --git a/java/com/android/dialer/calldetails/res/layout/caller_id_report_dialog.xml b/java/com/android/dialer/calldetails/res/layout/caller_id_report_dialog.xml
index 09d3c2b..0fd163f 100644
--- a/java/com/android/dialer/calldetails/res/layout/caller_id_report_dialog.xml
+++ b/java/com/android/dialer/calldetails/res/layout/caller_id_report_dialog.xml
@@ -24,12 +24,12 @@
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_marginStart="24dp"
-      android:textAppearance="?android:attr/textAppearanceMedium"/>
+      android:textAppearance="@style/Dialer.TextAppearance.Header2"/>
 
   <TextView
       android:id="@+id/number"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_marginStart="24dp"
-      android:textAppearance="?android:attr/textAppearanceMedium"/>
+      android:textAppearance="@style/Dialer.TextAppearance.Header2"/>
 </LinearLayout>
\ No newline at end of file
diff --git a/java/com/android/dialer/calldetails/res/layout/contact_container.xml b/java/com/android/dialer/calldetails/res/layout/contact_container.xml
old mode 100644
new mode 100755
index 5f531ab..4df81f1
--- a/java/com/android/dialer/calldetails/res/layout/contact_container.xml
+++ b/java/com/android/dialer/calldetails/res/layout/contact_container.xml
@@ -44,23 +44,23 @@
       android:minHeight="@dimen/call_details_contact_photo_size"
       android:orientation="vertical">
 
-    <TextView
+    <com.android.dialer.widget.BidiTextView
         android:id="@+id/contact_name"
-        style="@style/PrimaryText"
+        style="@style/Dialer.TextAppearance.Primary"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/photo_text_margin"/>
 
-    <TextView
+    <com.android.dialer.widget.BidiTextView
         android:id="@+id/phone_number"
-        style="@style/SecondaryText"
+        style="@style/Dialer.TextAppearance.Secondary.Ellipsize"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/photo_text_margin"/>
 
     <TextView
         android:id="@+id/network"
-        style="@style/SecondaryText"
+        style="@style/Dialer.TextAppearance.Secondary.Ellipsize"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/photo_text_margin"
@@ -78,7 +78,7 @@
       android:contentDescription="@string/call"
       android:scaleType="center"
       android:src="@drawable/quantum_ic_call_white_24"
-      android:tint="@color/secondary_text_color"/>
+      android:tint="?colorIcon"/>
 
 
   <RelativeLayout
@@ -97,11 +97,11 @@
         android:layout_marginStart="@dimen/ad_icon_margin_start_offset"
         android:scaleType="fitCenter"
         android:src="@drawable/quantum_ic_language_vd_theme_24"
-        android:tint="@color/secondary_text_color"/>
+        android:tint="?colorIcon"/>
 
     <TextView
         android:id="@+id/assisted_dialing_text"
-        style="@style/SecondaryText"
+        style="@style/Dialer.TextAppearance.Secondary.Ellipsize"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/ad_text_margin_start"
diff --git a/java/com/android/dialer/calldetails/res/layout/ec_data_container.xml b/java/com/android/dialer/calldetails/res/layout/ec_data_container.xml
index fec3126..18a7c28 100644
--- a/java/com/android/dialer/calldetails/res/layout/ec_data_container.xml
+++ b/java/com/android/dialer/calldetails/res/layout/ec_data_container.xml
@@ -1,4 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2018 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
 <RelativeLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
@@ -14,7 +29,7 @@
       android:layout_centerVertical="true"
       android:layout_marginStart="1dp"
       android:maxLines="2"
-      style="@style/SecondaryText"/>
+      style="@style/Dialer.TextAppearance.Secondary.Ellipsize"/>
 
   <FrameLayout
       android:id="@+id/multimedia_image_container"
@@ -39,10 +54,9 @@
       android:id="@+id/multimedia_attachments_number"
       android:layout_width="match_parent"
       android:layout_height="match_parent"
-      android:textColor="@color/background_dialer_white"
+      android:textColor="?android:attr/textColorPrimaryInverse"
       android:textSize="20sp"
-      android:fontFamily="sans-serif-medium"
-      android:background="#80000000"
+      style="@style/Dialer.TextAppearance.Header2"
       android:gravity="center"
       android:visibility="gone"/>
   </FrameLayout>
diff --git a/java/com/android/dialer/calldetails/res/values-af/strings.xml b/java/com/android/dialer/calldetails/res/values-af/strings.xml
index 3d15e5b..e7d3a1e 100644
--- a/java/com/android/dialer/calldetails/res/values-af/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-af/strings.xml
@@ -1,31 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_details" msgid="5063658079729839605">"Oproepbesonderhede"</string>
-    <string name="delete" msgid="2141020674108406737">"Vee uit"</string>
-    <string name="call_details_copy_number" msgid="4265479408878990796">"Kopieer nommer"</string>
-    <string name="call_details_edit_number" msgid="8718476514903513624">"Wysig nommer voordat jy bel"</string>
-    <string name="call_details_report_call_id" msgid="8857541295264421217">"Gee foutiewe nommer aan"</string>
-    <string name="sent_a_photo" msgid="3978670717462979502">"Het \'n foto gestuur"</string>
-    <string name="received_a_photo" msgid="3528953225576480505">"Het \'n foto ontvang"</string>
-    <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Gee verkeerde nommer aan"</string>
-    <string name="report_caller_id_failed" msgid="1471904930106125702">"Kon nie nommer aangee nie"</string>
-    <string name="report_caller_id_toast" msgid="5494870403429969932">"Nommer is aangegee"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_details">Oproepbesonderhede</string>
+  <string name="delete">Vee uit</string>
+  <string name="call_details_copy_number">Kopieer nommer</string>
+  <string name="call_details_edit_number">Wysig nommer voordat jy bel</string>
+  <string name="call_details_report_call_id">Gee foutiewe nommer aan</string>
+  <string name="sent_a_photo">Het \'n foto gestuur</string>
+  <string name="received_a_photo">Het \'n foto ontvang</string>
+  <string name="message_in_quotes">\"%1$s\"</string>
+  <string name="report_caller_id_dialog_title">Gee verkeerde nommer aan</string>
+  <string name="report_caller_id_failed">Kon nie nommer aangee nie</string>
+  <string name="report_caller_id_toast">Nommer is aangegee</string>
+  <string name="assisted_dialing_country_code_entry">Bystandoproep: Het die volgende landskode gebruik +%1$s</string>
+  <string name="assisted_dialing_country_code_entry_failure">Bystandoproep is gebruik</string>
+  <string name="rtt_transcript_not_available">Transkripsie is slegs beskikbaar vir oproepe met boodskappe</string>
+  <string name="rtt_transcript_link">Sien transkripsie</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-am/strings.xml b/java/com/android/dialer/calldetails/res/values-am/strings.xml
index 2103353..0d26119 100644
--- a/java/com/android/dialer/calldetails/res/values-am/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-am/strings.xml
@@ -1,31 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_details" msgid="5063658079729839605">"የጥሪ ዝርዝሮች"</string>
-    <string name="delete" msgid="2141020674108406737">"ሰርዝ"</string>
-    <string name="call_details_copy_number" msgid="4265479408878990796">"ቁጥር ቅዳ"</string>
-    <string name="call_details_edit_number" msgid="8718476514903513624">"ከመደወል በፊት ቁጥር አርትዕ ያድርጉ"</string>
-    <string name="call_details_report_call_id" msgid="8857541295264421217">"ትክክለኛ ያልሆነ ቁጥርን ሪፓርት አድርግ"</string>
-    <string name="sent_a_photo" msgid="3978670717462979502">"አንድ ፎቶ ተልኳል"</string>
-    <string name="received_a_photo" msgid="3528953225576480505">"አንድ ፎቶ ደርሷል"</string>
-    <string name="message_in_quotes" msgid="3270574830115828365">"«<xliff:g id="MESSAGE">%1$s</xliff:g>»"</string>
-    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"የተሳሳተ ቁጥርን ሪፖርት ያድርጉ"</string>
-    <string name="report_caller_id_failed" msgid="1471904930106125702">"ቁጥሩን ሪፖርት ማድረግ አልተቻለም"</string>
-    <string name="report_caller_id_toast" msgid="5494870403429969932">"ቁጥሩ ሪፖርት ተደርጓል"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_details">የጥሪ ዝርዝሮች</string>
+  <string name="delete">ሰርዝ</string>
+  <string name="call_details_copy_number">ቁጥር ቅዳ</string>
+  <string name="call_details_edit_number">ከመደወል በፊት ቁጥር አርትዕ ያድርጉ</string>
+  <string name="call_details_report_call_id">ትክክለኛ ያልሆነ ቁጥርን ሪፓርት አድርግ</string>
+  <string name="sent_a_photo">አንድ ፎቶ ተልኳል</string>
+  <string name="received_a_photo">አንድ ፎቶ ደርሷል</string>
+  <string name="message_in_quotes">«%1$s»</string>
+  <string name="report_caller_id_dialog_title">የተሳሳተ ቁጥርን ሪፖርት ያድርጉ</string>
+  <string name="report_caller_id_failed">ቁጥሩን ሪፖርት ማድረግ አልተቻለም</string>
+  <string name="report_caller_id_toast">ቁጥሩ ሪፖርት ተደርጓል</string>
+  <string name="assisted_dialing_country_code_entry">የታገዘ መደወያ፦ ጥቅም ላይ የዋለ የአገር ኮድ +%1$s</string>
+  <string name="assisted_dialing_country_code_entry_failure">የታገዘ መደወያ ጥቅም ላይ ውሏል</string>
+  <string name="rtt_transcript_not_available">ወደ ጽሁፍ ግልባጭ የሚኖረው መልዕክት አላላክ ላላቸው ጥሪዎች ብቻ ነው</string>
+  <string name="rtt_transcript_link">ወደ ጽሁፍ ገልብጥ ተመልከት</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-ar/strings.xml b/java/com/android/dialer/calldetails/res/values-ar/strings.xml
index 066b89c..03ff6eb 100644
--- a/java/com/android/dialer/calldetails/res/values-ar/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-ar/strings.xml
@@ -1,31 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_details" msgid="5063658079729839605">"تفاصيل المكالمة"</string>
-    <string name="delete" msgid="2141020674108406737">"حذف"</string>
-    <string name="call_details_copy_number" msgid="4265479408878990796">"نسخ الرقم"</string>
-    <string name="call_details_edit_number" msgid="8718476514903513624">"تعديل الرقم قبل الاتصال"</string>
-    <string name="call_details_report_call_id" msgid="8857541295264421217">"الإبلاغ عن رقم غير دقيق"</string>
-    <string name="sent_a_photo" msgid="3978670717462979502">"تم إرسال صورة"</string>
-    <string name="received_a_photo" msgid="3528953225576480505">"تم تلقي صورة"</string>
-    <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"الإبلاغ عن رقم غير صحيح"</string>
-    <string name="report_caller_id_failed" msgid="1471904930106125702">"تعذر الإبلاغ عن الرقم"</string>
-    <string name="report_caller_id_toast" msgid="5494870403429969932">"تم الإبلاغ عن الرقم"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_details">تفاصيل المكالمة</string>
+  <string name="delete">حذف</string>
+  <string name="call_details_copy_number">نسخ الرقم</string>
+  <string name="call_details_edit_number">تعديل الرقم قبل الاتصال</string>
+  <string name="call_details_report_call_id">الإبلاغ عن رقم غير دقيق</string>
+  <string name="sent_a_photo">تم إرسال صورة</string>
+  <string name="received_a_photo">تم تلقي صورة</string>
+  <string name="message_in_quotes">\"%1$s\"</string>
+  <string name="report_caller_id_dialog_title">الإبلاغ عن رقم غير صحيح</string>
+  <string name="report_caller_id_failed">تعذر الإبلاغ عن الرقم</string>
+  <string name="report_caller_id_toast">تم الإبلاغ عن الرقم</string>
+  <string name="assisted_dialing_country_code_entry">الطلب المساعد: رمز البلد المستخدم +%1$s</string>
+  <string name="assisted_dialing_country_code_entry_failure">تم استخدام الطلب المساعد</string>
+  <string name="rtt_transcript_not_available">تتوفر خدمة تحويل الصوت إلى نص فقط في المكالمات التي تحتوي على رسائل</string>
+  <string name="rtt_transcript_link">مشاهدة النص</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-az/strings.xml b/java/com/android/dialer/calldetails/res/values-az/strings.xml
index e9aaf14..0a6d35c 100644
--- a/java/com/android/dialer/calldetails/res/values-az/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-az/strings.xml
@@ -1,31 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_details" msgid="5063658079729839605">"Zəng detalları"</string>
-    <string name="delete" msgid="2141020674108406737">"Silin"</string>
-    <string name="call_details_copy_number" msgid="4265479408878990796">"Nömrəni kopyalayın"</string>
-    <string name="call_details_edit_number" msgid="8718476514903513624">"Zəng etmədən öncə nömrəyə düzəliş edin"</string>
-    <string name="call_details_report_call_id" msgid="8857541295264421217">"Qeyri-dəqiq nömrəni bildirin"</string>
-    <string name="sent_a_photo" msgid="3978670717462979502">"Foto göndərildi"</string>
-    <string name="received_a_photo" msgid="3528953225576480505">"Foto alındı"</string>
-    <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Yanlış nömrəni bildirin"</string>
-    <string name="report_caller_id_failed" msgid="1471904930106125702">"Nömrəni bildirmək mümkün olmadı"</string>
-    <string name="report_caller_id_toast" msgid="5494870403429969932">"Nömrə bildirildi"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_details">Zəng detalları</string>
+  <string name="delete">Silin</string>
+  <string name="call_details_copy_number">Nömrəni kopyalayın</string>
+  <string name="call_details_edit_number">Zəng etmədən öncə nömrəyə düzəliş edin</string>
+  <string name="call_details_report_call_id">Qeyri-dəqiq nömrəni bildirin</string>
+  <string name="sent_a_photo">Foto göndərildi</string>
+  <string name="received_a_photo">Foto alındı</string>
+  <string name="message_in_quotes">\"%1$s\"</string>
+  <string name="report_caller_id_dialog_title">Yanlış nömrəni bildirin</string>
+  <string name="report_caller_id_failed">Nömrəni bildirmək mümkün olmadı</string>
+  <string name="report_caller_id_toast">Nömrə bildirildi</string>
+  <string name="assisted_dialing_country_code_entry">Dəstəkli nömrə yığımı: İstifadə edilən ölkə kodu +%1$s</string>
+  <string name="assisted_dialing_country_code_entry_failure">Dəstəkli nömrə yığımı istifadə edildi</string>
+  <string name="rtt_transcript_not_available">Transkripsiya yalnız mesajlaşma ilə edilən zənglər üçün əlçatandır</string>
+  <string name="rtt_transcript_link">Transkripsiyaya baxın</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-b+sr+Latn/strings.xml b/java/com/android/dialer/calldetails/res/values-b+sr+Latn/strings.xml
index 780e674..ccc1170 100644
--- a/java/com/android/dialer/calldetails/res/values-b+sr+Latn/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-b+sr+Latn/strings.xml
@@ -1,31 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_details" msgid="5063658079729839605">"Detalji poziva"</string>
-    <string name="delete" msgid="2141020674108406737">"Izbriši"</string>
-    <string name="call_details_copy_number" msgid="4265479408878990796">"Kopiraj broj"</string>
-    <string name="call_details_edit_number" msgid="8718476514903513624">"Izmenite broj pre poziva"</string>
-    <string name="call_details_report_call_id" msgid="8857541295264421217">"Prijavi netačan broj"</string>
-    <string name="sent_a_photo" msgid="3978670717462979502">"Slika je poslata"</string>
-    <string name="received_a_photo" msgid="3528953225576480505">"Slika je primljena"</string>
-    <string name="message_in_quotes" msgid="3270574830115828365">"„<xliff:g id="MESSAGE">%1$s</xliff:g>“"</string>
-    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Prijavite netačan broj"</string>
-    <string name="report_caller_id_failed" msgid="1471904930106125702">"Prijavljivanje broja nije uspelo"</string>
-    <string name="report_caller_id_toast" msgid="5494870403429969932">"Broj je prijavljen"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_details">Detalji poziva</string>
+  <string name="delete">Izbriši</string>
+  <string name="call_details_copy_number">Kopiraj broj</string>
+  <string name="call_details_edit_number">Izmenite broj pre poziva</string>
+  <string name="call_details_report_call_id">Prijavi netačan broj</string>
+  <string name="sent_a_photo">Slika je poslata</string>
+  <string name="received_a_photo">Slika je primljena</string>
+  <string name="message_in_quotes">„%1$s“</string>
+  <string name="report_caller_id_dialog_title">Prijavite netačan broj</string>
+  <string name="report_caller_id_failed">Prijavljivanje broja nije uspelo</string>
+  <string name="report_caller_id_toast">Broj je prijavljen</string>
+  <string name="assisted_dialing_country_code_entry">Potpomognuto biranje: koristili smo pozivni broj za zemlju +%1$s</string>
+  <string name="assisted_dialing_country_code_entry_failure">Koristili ste potpomognuto biranje</string>
+  <string name="rtt_transcript_not_available">Transkript je dostupan samo za pozive sa razmenom poruka</string>
+  <string name="rtt_transcript_link">Prikaži transkript</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-be/strings.xml b/java/com/android/dialer/calldetails/res/values-be/strings.xml
index 6c6724c..fa11b02 100644
--- a/java/com/android/dialer/calldetails/res/values-be/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-be/strings.xml
@@ -1,31 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_details" msgid="5063658079729839605">"Падрабязнасці выкліку"</string>
-    <string name="delete" msgid="2141020674108406737">"Выдаліць"</string>
-    <string name="call_details_copy_number" msgid="4265479408878990796">"Скапіраваць нумар"</string>
-    <string name="call_details_edit_number" msgid="8718476514903513624">"Рэдагаваць нумар перад выклікам"</string>
-    <string name="call_details_report_call_id" msgid="8857541295264421217">"Падаць заяву аб недакладным нумары"</string>
-    <string name="sent_a_photo" msgid="3978670717462979502">"Адпраўлена фота"</string>
-    <string name="received_a_photo" msgid="3528953225576480505">"Атрымана фота"</string>
-    <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Падаць заяву аб няправільным нумары"</string>
-    <string name="report_caller_id_failed" msgid="1471904930106125702">"Не ўдалося падаць заяву аб нумары"</string>
-    <string name="report_caller_id_toast" msgid="5494870403429969932">"Аб нумары пададзена заява"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_details">Падрабязнасці выкліку</string>
+  <string name="delete">Выдаліць</string>
+  <string name="call_details_copy_number">Скапіраваць нумар</string>
+  <string name="call_details_edit_number">Рэдагаваць нумар перад выклікам</string>
+  <string name="call_details_report_call_id">Падаць заяву аб недакладным нумары</string>
+  <string name="sent_a_photo">Адпраўлена фота</string>
+  <string name="received_a_photo">Атрымана фота</string>
+  <string name="message_in_quotes">\"%1$s\"</string>
+  <string name="report_caller_id_dialog_title">Падаць заяву аб няправільным нумары</string>
+  <string name="report_caller_id_failed">Не ўдалося падаць заяву аб нумары</string>
+  <string name="report_caller_id_toast">Аб нумары пададзена заява</string>
+  <string name="assisted_dialing_country_code_entry">Памочнік набору: выкарыстаны код краіны +%1$s</string>
+  <string name="assisted_dialing_country_code_entry_failure">Быў выкарыстаны памочнік набору</string>
+  <string name="rtt_transcript_not_available">Расшыфроўка даступная толькі для выклікаў з магчымасцю абмену паведамленнямі</string>
+  <string name="rtt_transcript_link">Глядзіце расшыфроўку</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-bg/strings.xml b/java/com/android/dialer/calldetails/res/values-bg/strings.xml
index 547fdbb..9dfb62e 100644
--- a/java/com/android/dialer/calldetails/res/values-bg/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-bg/strings.xml
@@ -1,31 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_details" msgid="5063658079729839605">"Подробности за обаждането"</string>
-    <string name="delete" msgid="2141020674108406737">"Изтриване"</string>
-    <string name="call_details_copy_number" msgid="4265479408878990796">"Копиране на номера"</string>
-    <string name="call_details_edit_number" msgid="8718476514903513624">"Редактиране на номера преди обаждане"</string>
-    <string name="call_details_report_call_id" msgid="8857541295264421217">"Подаване на сигнал за неточен номер"</string>
-    <string name="sent_a_photo" msgid="3978670717462979502">"Изпратена бе снимка"</string>
-    <string name="received_a_photo" msgid="3528953225576480505">"Получена бе снимка"</string>
-    <string name="message_in_quotes" msgid="3270574830115828365">"„<xliff:g id="MESSAGE">%1$s</xliff:g>“"</string>
-    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Подаване на сигнал за неправилен номер"</string>
-    <string name="report_caller_id_failed" msgid="1471904930106125702">"Сигналът за номера не можа да бъде подаден"</string>
-    <string name="report_caller_id_toast" msgid="5494870403429969932">"За номера бе подаден сигнал"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_details">Подробности за обаждането</string>
+  <string name="delete">Изтриване</string>
+  <string name="call_details_copy_number">Копиране на номера</string>
+  <string name="call_details_edit_number">Редактиране на номера преди обаждане</string>
+  <string name="call_details_report_call_id">Подаване на сигнал за неточен номер</string>
+  <string name="sent_a_photo">Изпратена бе снимка</string>
+  <string name="received_a_photo">Получена бе снимка</string>
+  <string name="message_in_quotes">„%1$s“</string>
+  <string name="report_caller_id_dialog_title">Подаване на сигнал за неправилен номер</string>
+  <string name="report_caller_id_failed">Сигналът за номера не можа да бъде подаден</string>
+  <string name="report_caller_id_toast">За номера бе подаден сигнал</string>
+  <string name="assisted_dialing_country_code_entry">Подпомогнато набиране: Използван код на държавата – +%1$s</string>
+  <string name="assisted_dialing_country_code_entry_failure">Използвано бе подпомогнато набиране</string>
+  <string name="rtt_transcript_not_available">Преписът е налице само за обаждания със съобщения</string>
+  <string name="rtt_transcript_link">Преглед на преписа</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-bn/strings.xml b/java/com/android/dialer/calldetails/res/values-bn/strings.xml
index 65798f5..3702238 100644
--- a/java/com/android/dialer/calldetails/res/values-bn/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-bn/strings.xml
@@ -1,31 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_details" msgid="5063658079729839605">"কলের বিশদ বিবরণ"</string>
-    <string name="delete" msgid="2141020674108406737">"মুছুন"</string>
-    <string name="call_details_copy_number" msgid="4265479408878990796">"নম্বর কপি করুন"</string>
-    <string name="call_details_edit_number" msgid="8718476514903513624">"কল করার আগে নম্বর সম্পাদন করুন"</string>
-    <string name="call_details_report_call_id" msgid="8857541295264421217">"ভুল নম্বর প্রতিবেদন করুন"</string>
-    <string name="sent_a_photo" msgid="3978670717462979502">"একটি ফটো পাঠিয়েছেন"</string>
-    <string name="received_a_photo" msgid="3528953225576480505">"একটি ফটো পেয়েছেন"</string>
-    <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"ভুল নম্বর প্রতিবেদন করুন"</string>
-    <string name="report_caller_id_failed" msgid="1471904930106125702">"নম্বরটির প্রতিবেদন করা যায়নি"</string>
-    <string name="report_caller_id_toast" msgid="5494870403429969932">"নম্বরটির প্রতিবেদন করা হয়েছে"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_details">কলের বিশদ বিবরণ</string>
+  <string name="delete">মুছুন</string>
+  <string name="call_details_copy_number">নম্বর কপি করুন</string>
+  <string name="call_details_edit_number">কল করার আগে নম্বর সম্পাদন করুন</string>
+  <string name="call_details_report_call_id">ভুল নম্বর প্রতিবেদন করুন</string>
+  <string name="sent_a_photo">একটি ফটো পাঠিয়েছেন</string>
+  <string name="received_a_photo">একটি ফটো পেয়েছেন</string>
+  <string name="message_in_quotes">\"%1$s\"</string>
+  <string name="report_caller_id_dialog_title">ভুল নম্বর প্রতিবেদন করুন</string>
+  <string name="report_caller_id_failed">নম্বরটির প্রতিবেদন করা যায়নি</string>
+  <string name="report_caller_id_toast">নম্বরটির প্রতিবেদন করা হয়েছে</string>
+  <string name="assisted_dialing_country_code_entry">সহায়তাযুক্ত ডায়ালিং: দেশের কোডটি %1$s ব্যবহার করুন</string>
+  <string name="assisted_dialing_country_code_entry_failure">সহায়তাযুক্ত ডায়ালিং ব্যবহার করা হয়েছিল</string>
+  <string name="rtt_transcript_not_available">যে সমস্ত কলে মেসেজের সুবিধাটি চালু করা থাকবে, শুধু সেগুলিরই ট্রান্সক্রিপশন পাওয়া যাবে</string>
+  <string name="rtt_transcript_link">ট্রান্সক্রিপশন দেখুন</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-bs/strings.xml b/java/com/android/dialer/calldetails/res/values-bs/strings.xml
index 10ef7aa..e44ccae 100644
--- a/java/com/android/dialer/calldetails/res/values-bs/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-bs/strings.xml
@@ -1,31 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_details" msgid="5063658079729839605">"Detalji o pozivu"</string>
-    <string name="delete" msgid="2141020674108406737">"Izbriši"</string>
-    <string name="call_details_copy_number" msgid="4265479408878990796">"Kopiraj broj"</string>
-    <string name="call_details_edit_number" msgid="8718476514903513624">"Uredi broj prije poziva"</string>
-    <string name="call_details_report_call_id" msgid="8857541295264421217">"Prijavite nevažeći broj"</string>
-    <string name="sent_a_photo" msgid="3978670717462979502">"Fotografija poslana"</string>
-    <string name="received_a_photo" msgid="3528953225576480505">"Fotografija primljena"</string>
-    <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Prijava pogrešnog broja"</string>
-    <string name="report_caller_id_failed" msgid="1471904930106125702">"Prijava broja nije moguća"</string>
-    <string name="report_caller_id_toast" msgid="5494870403429969932">"Broj je prijavljen"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_details">Detalji o pozivu</string>
+  <string name="delete">Izbriši</string>
+  <string name="call_details_copy_number">Kopiraj broj</string>
+  <string name="call_details_edit_number">Uredi broj prije poziva</string>
+  <string name="call_details_report_call_id">Prijavite nevažeći broj</string>
+  <string name="sent_a_photo">Fotografija poslana</string>
+  <string name="received_a_photo">Fotografija primljena</string>
+  <string name="message_in_quotes">\"%1$s\"</string>
+  <string name="report_caller_id_dialog_title">Prijava pogrešnog broja</string>
+  <string name="report_caller_id_failed">Prijava broja nije moguća</string>
+  <string name="report_caller_id_toast">Broj je prijavljen</string>
+  <string name="assisted_dialing_country_code_entry">Potpomognuto biranje: korišten je pozivni broj zemlje +%1$s</string>
+  <string name="assisted_dialing_country_code_entry_failure">Korišteno je potpomognuto biranje</string>
+  <string name="rtt_transcript_not_available">Transkript je dostupan samo za pozive s porukama</string>
+  <string name="rtt_transcript_link">Pogledajte transkript</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-ca/strings.xml b/java/com/android/dialer/calldetails/res/values-ca/strings.xml
index 59bd297..d62bff9 100644
--- a/java/com/android/dialer/calldetails/res/values-ca/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-ca/strings.xml
@@ -1,31 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_details" msgid="5063658079729839605">"Detalls de la trucada"</string>
-    <string name="delete" msgid="2141020674108406737">"Suprimeix"</string>
-    <string name="call_details_copy_number" msgid="4265479408878990796">"Copia el número"</string>
-    <string name="call_details_edit_number" msgid="8718476514903513624">"Edita el número abans de trucar"</string>
-    <string name="call_details_report_call_id" msgid="8857541295264421217">"Informa d\'un número incorrecte"</string>
-    <string name="sent_a_photo" msgid="3978670717462979502">"S\'ha enviat una foto"</string>
-    <string name="received_a_photo" msgid="3528953225576480505">"S\'ha rebut una foto"</string>
-    <string name="message_in_quotes" msgid="3270574830115828365">"<xliff:g id="MESSAGE">%1$s</xliff:g>"</string>
-    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Informa d\'un número incorrecte"</string>
-    <string name="report_caller_id_failed" msgid="1471904930106125702">"No s\'ha pogut informar del número"</string>
-    <string name="report_caller_id_toast" msgid="5494870403429969932">"S\'ha informat del número"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_details">Detalls de trucada</string>
+  <string name="delete">Suprimeix</string>
+  <string name="call_details_copy_number">Copia el número</string>
+  <string name="call_details_edit_number">Edita el número abans de trucar</string>
+  <string name="call_details_report_call_id">Informa d\'un número incorrecte</string>
+  <string name="sent_a_photo">S\'ha enviat una foto</string>
+  <string name="received_a_photo">S\'ha rebut una foto</string>
+  <string name="message_in_quotes">%1$s</string>
+  <string name="report_caller_id_dialog_title">Informa d\'un número incorrecte</string>
+  <string name="report_caller_id_failed">No s\'ha pogut informar del número</string>
+  <string name="report_caller_id_toast">S\'ha informat del número</string>
+  <string name="assisted_dialing_country_code_entry">Marcatge assistit: s\'ha fet servir el codi de país +%1$s</string>
+  <string name="assisted_dialing_country_code_entry_failure">S\'ha fet servir el marcatge assistit</string>
+  <string name="rtt_transcript_not_available">La transcripció només està disponible per a les trucades amb missatges</string>
+  <string name="rtt_transcript_link">Mostra la transcripció</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-cs/strings.xml b/java/com/android/dialer/calldetails/res/values-cs/strings.xml
index d4748fc..e2e63f4 100644
--- a/java/com/android/dialer/calldetails/res/values-cs/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-cs/strings.xml
@@ -1,31 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_details" msgid="5063658079729839605">"Podrobnosti hovoru"</string>
-    <string name="delete" msgid="2141020674108406737">"Smazat"</string>
-    <string name="call_details_copy_number" msgid="4265479408878990796">"Kopírovat číslo"</string>
-    <string name="call_details_edit_number" msgid="8718476514903513624">"Před voláním upravit číslo"</string>
-    <string name="call_details_report_call_id" msgid="8857541295264421217">"Nahlásit nesprávné číslo"</string>
-    <string name="sent_a_photo" msgid="3978670717462979502">"Byla poslána fotka"</string>
-    <string name="received_a_photo" msgid="3528953225576480505">"Byla přijata fotka"</string>
-    <string name="message_in_quotes" msgid="3270574830115828365">"„<xliff:g id="MESSAGE">%1$s</xliff:g>“"</string>
-    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Nahlásit nesprávné číslo"</string>
-    <string name="report_caller_id_failed" msgid="1471904930106125702">"Číslo se nepodařilo nahlásit"</string>
-    <string name="report_caller_id_toast" msgid="5494870403429969932">"Číslo bylo nahlášeno"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_details">Podrobnosti hovoru</string>
+  <string name="delete">Smazat</string>
+  <string name="call_details_copy_number">Kopírovat číslo</string>
+  <string name="call_details_edit_number">Před voláním upravit číslo</string>
+  <string name="call_details_report_call_id">Nahlásit nesprávné číslo</string>
+  <string name="sent_a_photo">Byla poslána fotka</string>
+  <string name="received_a_photo">Byla přijata fotka</string>
+  <string name="message_in_quotes">„%1$s“</string>
+  <string name="report_caller_id_dialog_title">Nahlásit nesprávné číslo</string>
+  <string name="report_caller_id_failed">Číslo se nepodařilo nahlásit</string>
+  <string name="report_caller_id_toast">Číslo bylo nahlášeno</string>
+  <string name="assisted_dialing_country_code_entry">Asistované vytáčení: Byla použita předvolba země +%1$s</string>
+  <string name="assisted_dialing_country_code_entry_failure">Bylo použito asistované vytáčení</string>
+  <string name="rtt_transcript_not_available">Přepisy jsou k dispozici jen u hovorů s posíláním zpráv</string>
+  <string name="rtt_transcript_link">Zobrazit přepis</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-da/strings.xml b/java/com/android/dialer/calldetails/res/values-da/strings.xml
index 5de4486..86db8cc 100644
--- a/java/com/android/dialer/calldetails/res/values-da/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-da/strings.xml
@@ -1,31 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_details" msgid="5063658079729839605">"Opkaldsinfo"</string>
-    <string name="delete" msgid="2141020674108406737">"Slet"</string>
-    <string name="call_details_copy_number" msgid="4265479408878990796">"Kopiér nummer"</string>
-    <string name="call_details_edit_number" msgid="8718476514903513624">"Rediger nummer før opkald"</string>
-    <string name="call_details_report_call_id" msgid="8857541295264421217">"Rapportér et forkert nummer"</string>
-    <string name="sent_a_photo" msgid="3978670717462979502">"Der blev sendt et billede"</string>
-    <string name="received_a_photo" msgid="3528953225576480505">"Der blev modtaget et billede"</string>
-    <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Rapportér forkert nummer"</string>
-    <string name="report_caller_id_failed" msgid="1471904930106125702">"Det forkerte nummer kunne ikke rapporteres"</string>
-    <string name="report_caller_id_toast" msgid="5494870403429969932">"Nummeret blev rapporteret"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_details">Opkaldsinfo</string>
+  <string name="delete">Slet</string>
+  <string name="call_details_copy_number">Kopiér nummer</string>
+  <string name="call_details_edit_number">Rediger nummer før opkald</string>
+  <string name="call_details_report_call_id">Rapportér et forkert nummer</string>
+  <string name="sent_a_photo">Der blev sendt et billede</string>
+  <string name="received_a_photo">Der blev modtaget et billede</string>
+  <string name="message_in_quotes">\"%1$s\"</string>
+  <string name="report_caller_id_dialog_title">Rapportér forkert nummer</string>
+  <string name="report_caller_id_failed">Det forkerte nummer kunne ikke rapporteres</string>
+  <string name="report_caller_id_toast">Nummeret blev rapporteret</string>
+  <string name="assisted_dialing_country_code_entry">Assisteret opkald: Brugt landekode: +%1$s</string>
+  <string name="assisted_dialing_country_code_entry_failure">Assisteret opkald blev brugt</string>
+  <string name="rtt_transcript_not_available">Transskription er kun tilgængelige for opkald med beskeder</string>
+  <string name="rtt_transcript_link">Se transskription</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-de/strings.xml b/java/com/android/dialer/calldetails/res/values-de/strings.xml
index 3c30d8e..6d667d8 100644
--- a/java/com/android/dialer/calldetails/res/values-de/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-de/strings.xml
@@ -1,31 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_details" msgid="5063658079729839605">"Anrufdetails"</string>
-    <string name="delete" msgid="2141020674108406737">"Löschen"</string>
-    <string name="call_details_copy_number" msgid="4265479408878990796">"Nummer kopieren"</string>
-    <string name="call_details_edit_number" msgid="8718476514903513624">"Nummer vor Anruf bearbeiten"</string>
-    <string name="call_details_report_call_id" msgid="8857541295264421217">"Falsche Nummer melden"</string>
-    <string name="sent_a_photo" msgid="3978670717462979502">"Hat ein Foto gesendet"</string>
-    <string name="received_a_photo" msgid="3528953225576480505">"Hat ein Foto empfangen"</string>
-    <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Falsche Nummer melden"</string>
-    <string name="report_caller_id_failed" msgid="1471904930106125702">"Nummer konnte nicht gemeldet werden"</string>
-    <string name="report_caller_id_toast" msgid="5494870403429969932">"Nummer gemeldet"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_details">Anrufdetails</string>
+  <string name="delete">Löschen</string>
+  <string name="call_details_copy_number">Nummer kopieren</string>
+  <string name="call_details_edit_number">Nummer vor Anruf bearbeiten</string>
+  <string name="call_details_report_call_id">Falsche Nummer melden</string>
+  <string name="sent_a_photo">Hat ein Foto gesendet</string>
+  <string name="received_a_photo">Hat ein Foto empfangen</string>
+  <string name="message_in_quotes">\"%1$s\"</string>
+  <string name="report_caller_id_dialog_title">Falsche Nummer melden</string>
+  <string name="report_caller_id_failed">Nummer konnte nicht gemeldet werden</string>
+  <string name="report_caller_id_toast">Nummer gemeldet</string>
+  <string name="assisted_dialing_country_code_entry">Unterstützung für Nummerneingabe. Verwendete Landesvorwahl: +%1$s</string>
+  <string name="assisted_dialing_country_code_entry_failure">Unterstützung für Nummerneingabe wurde verwendet</string>
+  <string name="rtt_transcript_not_available">Transkript nur für Anrufe mit Nachrichten verfügbar</string>
+  <string name="rtt_transcript_link">Transkript ansehen</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-el/strings.xml b/java/com/android/dialer/calldetails/res/values-el/strings.xml
index e5097d1..c1703b4 100644
--- a/java/com/android/dialer/calldetails/res/values-el/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-el/strings.xml
@@ -1,31 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_details" msgid="5063658079729839605">"Λεπτομέρειες κλήσης"</string>
-    <string name="delete" msgid="2141020674108406737">"Διαγραφή"</string>
-    <string name="call_details_copy_number" msgid="4265479408878990796">"Αντιγραφή αριθμού"</string>
-    <string name="call_details_edit_number" msgid="8718476514903513624">"Επεξεργασία αριθμού πριν από την κλήση"</string>
-    <string name="call_details_report_call_id" msgid="8857541295264421217">"Αναφορά ανακριβούς αριθμού"</string>
-    <string name="sent_a_photo" msgid="3978670717462979502">"Έγινε αποστολή φωτογραφίας"</string>
-    <string name="received_a_photo" msgid="3528953225576480505">"Έγινε λήψη φωτογραφίας"</string>
-    <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Αναφορά λανθασμένου αριθμού"</string>
-    <string name="report_caller_id_failed" msgid="1471904930106125702">"Δεν ήταν δυνατή η αναφορά του αριθμού"</string>
-    <string name="report_caller_id_toast" msgid="5494870403429969932">"Υποβλήθηκε αναφορά για τον αριθμό"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_details">Λεπτομέρειες κλήσης</string>
+  <string name="delete">Διαγραφή</string>
+  <string name="call_details_copy_number">Αντιγραφή αριθμού</string>
+  <string name="call_details_edit_number">Επεξεργασία αριθμού πριν από την κλήση</string>
+  <string name="call_details_report_call_id">Αναφορά ανακριβούς αριθμού</string>
+  <string name="sent_a_photo">Έγινε αποστολή φωτογραφίας</string>
+  <string name="received_a_photo">Έγινε λήψη φωτογραφίας</string>
+  <string name="message_in_quotes">\"%1$s\"</string>
+  <string name="report_caller_id_dialog_title">Αναφορά λανθασμένου αριθμού</string>
+  <string name="report_caller_id_failed">Δεν ήταν δυνατή η αναφορά του αριθμού</string>
+  <string name="report_caller_id_toast">Υποβλήθηκε αναφορά για τον αριθμό</string>
+  <string name="assisted_dialing_country_code_entry">Υποβοηθούμενη κλήση: Χρησιμοποιήθηκε ο κωδικός χώρας +%1$s</string>
+  <string name="assisted_dialing_country_code_entry_failure">Χρησιμοποιήθηκε η υποβοηθούμενη κλήση</string>
+  <string name="rtt_transcript_not_available">Η μεταγραφή είναι διαθέσιμη μόνο για κλήσεις με μηνύματα</string>
+  <string name="rtt_transcript_link">Εμφάνιση μεταγραφής</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-en-rAU/strings.xml b/java/com/android/dialer/calldetails/res/values-en-rAU/strings.xml
index 45deb49..2d7c8d9 100644
--- a/java/com/android/dialer/calldetails/res/values-en-rAU/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-en-rAU/strings.xml
@@ -1,31 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_details" msgid="5063658079729839605">"Call details"</string>
-    <string name="delete" msgid="2141020674108406737">"Delete"</string>
-    <string name="call_details_copy_number" msgid="4265479408878990796">"Copy number"</string>
-    <string name="call_details_edit_number" msgid="8718476514903513624">"Edit number before call"</string>
-    <string name="call_details_report_call_id" msgid="8857541295264421217">"Report inaccurate number"</string>
-    <string name="sent_a_photo" msgid="3978670717462979502">"Sent a photo"</string>
-    <string name="received_a_photo" msgid="3528953225576480505">"Received a photo"</string>
-    <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Report incorrect number"</string>
-    <string name="report_caller_id_failed" msgid="1471904930106125702">"Couldn\'t report number"</string>
-    <string name="report_caller_id_toast" msgid="5494870403429969932">"Number reported"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_details">Call details</string>
+  <string name="delete">Delete</string>
+  <string name="call_details_copy_number">Copy number</string>
+  <string name="call_details_edit_number">Edit number before call</string>
+  <string name="call_details_report_call_id">Report inaccurate number</string>
+  <string name="sent_a_photo">Sent a photo</string>
+  <string name="received_a_photo">Received a photo</string>
+  <string name="message_in_quotes">\"%1$s\"</string>
+  <string name="report_caller_id_dialog_title">Report incorrect number</string>
+  <string name="report_caller_id_failed">Couldn\'t report number</string>
+  <string name="report_caller_id_toast">Number reported</string>
+  <string name="assisted_dialing_country_code_entry">Assisted dialling: Used country code +%1$s</string>
+  <string name="assisted_dialing_country_code_entry_failure">Assisted dialling was used</string>
+  <string name="rtt_transcript_not_available">Transcript available only for calls with messaging</string>
+  <string name="rtt_transcript_link">See transcript</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-en-rGB/strings.xml b/java/com/android/dialer/calldetails/res/values-en-rGB/strings.xml
index 45deb49..2d7c8d9 100644
--- a/java/com/android/dialer/calldetails/res/values-en-rGB/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-en-rGB/strings.xml
@@ -1,31 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_details" msgid="5063658079729839605">"Call details"</string>
-    <string name="delete" msgid="2141020674108406737">"Delete"</string>
-    <string name="call_details_copy_number" msgid="4265479408878990796">"Copy number"</string>
-    <string name="call_details_edit_number" msgid="8718476514903513624">"Edit number before call"</string>
-    <string name="call_details_report_call_id" msgid="8857541295264421217">"Report inaccurate number"</string>
-    <string name="sent_a_photo" msgid="3978670717462979502">"Sent a photo"</string>
-    <string name="received_a_photo" msgid="3528953225576480505">"Received a photo"</string>
-    <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Report incorrect number"</string>
-    <string name="report_caller_id_failed" msgid="1471904930106125702">"Couldn\'t report number"</string>
-    <string name="report_caller_id_toast" msgid="5494870403429969932">"Number reported"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_details">Call details</string>
+  <string name="delete">Delete</string>
+  <string name="call_details_copy_number">Copy number</string>
+  <string name="call_details_edit_number">Edit number before call</string>
+  <string name="call_details_report_call_id">Report inaccurate number</string>
+  <string name="sent_a_photo">Sent a photo</string>
+  <string name="received_a_photo">Received a photo</string>
+  <string name="message_in_quotes">\"%1$s\"</string>
+  <string name="report_caller_id_dialog_title">Report incorrect number</string>
+  <string name="report_caller_id_failed">Couldn\'t report number</string>
+  <string name="report_caller_id_toast">Number reported</string>
+  <string name="assisted_dialing_country_code_entry">Assisted dialling: Used country code +%1$s</string>
+  <string name="assisted_dialing_country_code_entry_failure">Assisted dialling was used</string>
+  <string name="rtt_transcript_not_available">Transcript available only for calls with messaging</string>
+  <string name="rtt_transcript_link">See transcript</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-en-rIN/strings.xml b/java/com/android/dialer/calldetails/res/values-en-rIN/strings.xml
index 45deb49..2d7c8d9 100644
--- a/java/com/android/dialer/calldetails/res/values-en-rIN/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-en-rIN/strings.xml
@@ -1,31 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_details" msgid="5063658079729839605">"Call details"</string>
-    <string name="delete" msgid="2141020674108406737">"Delete"</string>
-    <string name="call_details_copy_number" msgid="4265479408878990796">"Copy number"</string>
-    <string name="call_details_edit_number" msgid="8718476514903513624">"Edit number before call"</string>
-    <string name="call_details_report_call_id" msgid="8857541295264421217">"Report inaccurate number"</string>
-    <string name="sent_a_photo" msgid="3978670717462979502">"Sent a photo"</string>
-    <string name="received_a_photo" msgid="3528953225576480505">"Received a photo"</string>
-    <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Report incorrect number"</string>
-    <string name="report_caller_id_failed" msgid="1471904930106125702">"Couldn\'t report number"</string>
-    <string name="report_caller_id_toast" msgid="5494870403429969932">"Number reported"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_details">Call details</string>
+  <string name="delete">Delete</string>
+  <string name="call_details_copy_number">Copy number</string>
+  <string name="call_details_edit_number">Edit number before call</string>
+  <string name="call_details_report_call_id">Report inaccurate number</string>
+  <string name="sent_a_photo">Sent a photo</string>
+  <string name="received_a_photo">Received a photo</string>
+  <string name="message_in_quotes">\"%1$s\"</string>
+  <string name="report_caller_id_dialog_title">Report incorrect number</string>
+  <string name="report_caller_id_failed">Couldn\'t report number</string>
+  <string name="report_caller_id_toast">Number reported</string>
+  <string name="assisted_dialing_country_code_entry">Assisted dialling: Used country code +%1$s</string>
+  <string name="assisted_dialing_country_code_entry_failure">Assisted dialling was used</string>
+  <string name="rtt_transcript_not_available">Transcript available only for calls with messaging</string>
+  <string name="rtt_transcript_link">See transcript</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-es-rUS/strings.xml b/java/com/android/dialer/calldetails/res/values-es-rUS/strings.xml
index 778868e..33be5dc 100644
--- a/java/com/android/dialer/calldetails/res/values-es-rUS/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-es-rUS/strings.xml
@@ -1,31 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_details" msgid="5063658079729839605">"Detalles de la llamada"</string>
-    <string name="delete" msgid="2141020674108406737">"Borrar"</string>
-    <string name="call_details_copy_number" msgid="4265479408878990796">"Copiar número"</string>
-    <string name="call_details_edit_number" msgid="8718476514903513624">"Editar número antes de llamar"</string>
-    <string name="call_details_report_call_id" msgid="8857541295264421217">"Informar número incorrecto"</string>
-    <string name="sent_a_photo" msgid="3978670717462979502">"Enviaste una foto"</string>
-    <string name="received_a_photo" msgid="3528953225576480505">"Recibiste una foto"</string>
-    <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Informar número incorrecto"</string>
-    <string name="report_caller_id_failed" msgid="1471904930106125702">"No se pudo informar el número."</string>
-    <string name="report_caller_id_toast" msgid="5494870403429969932">"Número informado"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_details">Detalles de la llamada</string>
+  <string name="delete">Borrar</string>
+  <string name="call_details_copy_number">Copiar número</string>
+  <string name="call_details_edit_number">Editar número antes de llamar</string>
+  <string name="call_details_report_call_id">Informar número incorrecto</string>
+  <string name="sent_a_photo">Enviaste una foto</string>
+  <string name="received_a_photo">Recibiste una foto</string>
+  <string name="message_in_quotes">\"%1$s\"</string>
+  <string name="report_caller_id_dialog_title">Informar número incorrecto</string>
+  <string name="report_caller_id_failed">No se pudo informar el número.</string>
+  <string name="report_caller_id_toast">Número informado</string>
+  <string name="assisted_dialing_country_code_entry">Marcado asistido: Se utilizó el código de país +%1$s</string>
+  <string name="assisted_dialing_country_code_entry_failure">Se utilizó el marcado asistido</string>
+  <string name="rtt_transcript_not_available">Las transcripciones están disponibles solo para las llamadas que admiten la mensajería</string>
+  <string name="rtt_transcript_link">Ver la transcripción</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-es/strings.xml b/java/com/android/dialer/calldetails/res/values-es/strings.xml
index 5cecffa..3476a6a 100644
--- a/java/com/android/dialer/calldetails/res/values-es/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-es/strings.xml
@@ -1,31 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_details" msgid="5063658079729839605">"Detalles de la llamada"</string>
-    <string name="delete" msgid="2141020674108406737">"Eliminar"</string>
-    <string name="call_details_copy_number" msgid="4265479408878990796">"Copiar número"</string>
-    <string name="call_details_edit_number" msgid="8718476514903513624">"Editar número antes de llamar"</string>
-    <string name="call_details_report_call_id" msgid="8857541295264421217">"Notificar un número incorrecto"</string>
-    <string name="sent_a_photo" msgid="3978670717462979502">"Se ha enviado una foto"</string>
-    <string name="received_a_photo" msgid="3528953225576480505">"Se ha recibido una foto"</string>
-    <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Notificar un número incorrecto"</string>
-    <string name="report_caller_id_failed" msgid="1471904930106125702">"No se ha podido notificar el número"</string>
-    <string name="report_caller_id_toast" msgid="5494870403429969932">"Número notificado"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_details">Detalles de la llamada</string>
+  <string name="delete">Eliminar</string>
+  <string name="call_details_copy_number">Copiar número</string>
+  <string name="call_details_edit_number">Editar número antes de llamar</string>
+  <string name="call_details_report_call_id">Notificar un número incorrecto</string>
+  <string name="sent_a_photo">Se ha enviado una foto</string>
+  <string name="received_a_photo">Se ha recibido una foto</string>
+  <string name="message_in_quotes">\"%1$s\"</string>
+  <string name="report_caller_id_dialog_title">Notificar un número incorrecto</string>
+  <string name="report_caller_id_failed">No se ha podido notificar el número</string>
+  <string name="report_caller_id_toast">Número notificado</string>
+  <string name="assisted_dialing_country_code_entry">Marcación asistida: código de país utilizado +%1$s</string>
+  <string name="assisted_dialing_country_code_entry_failure">Se ha utilizado la marcación asistida</string>
+  <string name="rtt_transcript_not_available">Solo se pueden hacer transcripciones de llamadas con mensajes</string>
+  <string name="rtt_transcript_link">Ver transcripción</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-et/strings.xml b/java/com/android/dialer/calldetails/res/values-et/strings.xml
index c8f52ae..96578a6 100644
--- a/java/com/android/dialer/calldetails/res/values-et/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-et/strings.xml
@@ -1,31 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_details" msgid="5063658079729839605">"Kõne üksikasjad"</string>
-    <string name="delete" msgid="2141020674108406737">"Kustuta"</string>
-    <string name="call_details_copy_number" msgid="4265479408878990796">"Kopeeri number"</string>
-    <string name="call_details_edit_number" msgid="8718476514903513624">"Muuda numbrit enne helistamist"</string>
-    <string name="call_details_report_call_id" msgid="8857541295264421217">"Valest numbrist teavitamine"</string>
-    <string name="sent_a_photo" msgid="3978670717462979502">"Saatis foto"</string>
-    <string name="received_a_photo" msgid="3528953225576480505">"Sai foto"</string>
-    <string name="message_in_quotes" msgid="3270574830115828365">"„<xliff:g id="MESSAGE">%1$s</xliff:g>”"</string>
-    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Valest numbrist teavitamine"</string>
-    <string name="report_caller_id_failed" msgid="1471904930106125702">"Numbrist ei õnnestunud teavitada"</string>
-    <string name="report_caller_id_toast" msgid="5494870403429969932">"Numbrist teavitati"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_details">Kõne üksikasjad</string>
+  <string name="delete">Kustuta</string>
+  <string name="call_details_copy_number">Kopeeri number</string>
+  <string name="call_details_edit_number">Muuda numbrit enne helistamist</string>
+  <string name="call_details_report_call_id">Valest numbrist teavitamine</string>
+  <string name="sent_a_photo">Saatis foto</string>
+  <string name="received_a_photo">Sai foto</string>
+  <string name="message_in_quotes">„%1$s”</string>
+  <string name="report_caller_id_dialog_title">Valest numbrist teavitamine</string>
+  <string name="report_caller_id_failed">Numbrist ei õnnestunud teavitada</string>
+  <string name="report_caller_id_toast">Numbrist teavitati</string>
+  <string name="assisted_dialing_country_code_entry">Abistatud helistamine: kasutati riigikoodi +%1$s</string>
+  <string name="assisted_dialing_country_code_entry_failure">Kasutati abistatud helistamist</string>
+  <string name="rtt_transcript_not_available">Transkribeerimine on saadaval ainult sõnumsidega kõnede puhul</string>
+  <string name="rtt_transcript_link">Kuva transkriptsioon</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-eu/strings.xml b/java/com/android/dialer/calldetails/res/values-eu/strings.xml
index 5184e64..9bb776f 100644
--- a/java/com/android/dialer/calldetails/res/values-eu/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-eu/strings.xml
@@ -1,31 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_details" msgid="5063658079729839605">"Deiaren xehetasunak"</string>
-    <string name="delete" msgid="2141020674108406737">"Ezabatu"</string>
-    <string name="call_details_copy_number" msgid="4265479408878990796">"Kopiatu zenbakia"</string>
-    <string name="call_details_edit_number" msgid="8718476514903513624">"Editatu zenbakia deitu aurretik"</string>
-    <string name="call_details_report_call_id" msgid="8857541295264421217">"Jakinarazi zenbakiaren informazioa okerra dela"</string>
-    <string name="sent_a_photo" msgid="3978670717462979502">"Argazki bat bidali duzu"</string>
-    <string name="received_a_photo" msgid="3528953225576480505">"Argazki bat jaso duzu"</string>
-    <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Jakinarazi zenbakia okerra dela"</string>
-    <string name="report_caller_id_failed" msgid="1471904930106125702">"Ezin izan da bidali jakinarazpena"</string>
-    <string name="report_caller_id_toast" msgid="5494870403429969932">"Bidali da jakinarazpena"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_details">Deiaren xehetasunak</string>
+  <string name="delete">Ezabatu</string>
+  <string name="call_details_copy_number">Kopiatu zenbakia</string>
+  <string name="call_details_edit_number">Editatu zenbakia deitu aurretik</string>
+  <string name="call_details_report_call_id">Jakinarazi zenbakiaren informazioa okerra dela</string>
+  <string name="sent_a_photo">Argazki bat bidali duzu</string>
+  <string name="received_a_photo">Argazki bat jaso duzu</string>
+  <string name="message_in_quotes">\"%1$s\"</string>
+  <string name="report_caller_id_dialog_title">Jakinarazi zenbakia okerra dela</string>
+  <string name="report_caller_id_failed">Ezin izan da bidali jakinarazpena</string>
+  <string name="report_caller_id_toast">Bidali da jakinarazpena</string>
+  <string name="assisted_dialing_country_code_entry">Lagundutako markatzea: +%1$s herrialde-kodea erabili da</string>
+  <string name="assisted_dialing_country_code_entry_failure">Lagundutako markatzea erabili da</string>
+  <string name="rtt_transcript_not_available">Mezuak dituzten deietan bakarrik daude erabilgarri transkripzioak</string>
+  <string name="rtt_transcript_link">Ikusi transkripzioa</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-fa/strings.xml b/java/com/android/dialer/calldetails/res/values-fa/strings.xml
index b37b2b5..88a9da0 100644
--- a/java/com/android/dialer/calldetails/res/values-fa/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-fa/strings.xml
@@ -1,31 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_details" msgid="5063658079729839605">"جزئیات تماس"</string>
-    <string name="delete" msgid="2141020674108406737">"حذف"</string>
-    <string name="call_details_copy_number" msgid="4265479408878990796">"کپی کردن شماره"</string>
-    <string name="call_details_edit_number" msgid="8718476514903513624">"ویرایش شماره قبل از تماس"</string>
-    <string name="call_details_report_call_id" msgid="8857541295264421217">"گزارش شماره نادرست"</string>
-    <string name="sent_a_photo" msgid="3978670717462979502">"عکسی ارسال کرد"</string>
-    <string name="received_a_photo" msgid="3528953225576480505">"عکسی دریافت کرد"</string>
-    <string name="message_in_quotes" msgid="3270574830115828365">"«<xliff:g id="MESSAGE">%1$s</xliff:g>»"</string>
-    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"گزارش شماره نادرست"</string>
-    <string name="report_caller_id_failed" msgid="1471904930106125702">"شماره گزارش نشد"</string>
-    <string name="report_caller_id_toast" msgid="5494870403429969932">"شماره گزارش شد"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_details">جزئیات تماس</string>
+  <string name="delete">حذف</string>
+  <string name="call_details_copy_number">کپی کردن شماره</string>
+  <string name="call_details_edit_number">ویرایش شماره قبل از تماس</string>
+  <string name="call_details_report_call_id">گزارش شماره نادرست</string>
+  <string name="sent_a_photo">عکسی ارسال کرد</string>
+  <string name="received_a_photo">عکسی دریافت کرد</string>
+  <string name="message_in_quotes">«%1$s»</string>
+  <string name="report_caller_id_dialog_title">گزارش شماره نادرست</string>
+  <string name="report_caller_id_failed">شماره گزارش نشد</string>
+  <string name="report_caller_id_toast">شماره گزارش شد</string>
+  <string name="assisted_dialing_country_code_entry">شماره‌گیری کمکی: کد کشور %1$s+ استفاده شد</string>
+  <string name="assisted_dialing_country_code_entry_failure">شماره‌گیری کمکی استفاده شد</string>
+  <string name="rtt_transcript_not_available">ترانویسی فقط برای تماس‌های دارای پیام در دسترس است</string>
+  <string name="rtt_transcript_link">مشاهده ترانویسی</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-fi/strings.xml b/java/com/android/dialer/calldetails/res/values-fi/strings.xml
index ead2c6a..1342e33 100644
--- a/java/com/android/dialer/calldetails/res/values-fi/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-fi/strings.xml
@@ -1,31 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_details" msgid="5063658079729839605">"Puhelun tiedot"</string>
-    <string name="delete" msgid="2141020674108406737">"Poista"</string>
-    <string name="call_details_copy_number" msgid="4265479408878990796">"Kopioi numero"</string>
-    <string name="call_details_edit_number" msgid="8718476514903513624">"Muokkaa numeroa ennen puhelua"</string>
-    <string name="call_details_report_call_id" msgid="8857541295264421217">"Ilmoita epätarkasta numerosta"</string>
-    <string name="sent_a_photo" msgid="3978670717462979502">"Lähetetty kuva"</string>
-    <string name="received_a_photo" msgid="3528953225576480505">"Vastaanotettu kuva"</string>
-    <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Ilmoita väärästä numerosta"</string>
-    <string name="report_caller_id_failed" msgid="1471904930106125702">"Numerosta ilmoittaminen epäonnistui."</string>
-    <string name="report_caller_id_toast" msgid="5494870403429969932">"Numeroa koskeva ilmoitus lähetettiin."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_details">Puhelun tiedot</string>
+  <string name="delete">Poista</string>
+  <string name="call_details_copy_number">Kopioi numero</string>
+  <string name="call_details_edit_number">Muokkaa numeroa ennen puhelua</string>
+  <string name="call_details_report_call_id">Ilmoita epätarkasta numerosta</string>
+  <string name="sent_a_photo">Lähetetty kuva</string>
+  <string name="received_a_photo">Vastaanotettu kuva</string>
+  <string name="message_in_quotes">\"%1$s\"</string>
+  <string name="report_caller_id_dialog_title">Ilmoita väärästä numerosta</string>
+  <string name="report_caller_id_failed">Numerosta ilmoittaminen epäonnistui.</string>
+  <string name="report_caller_id_toast">Numeroa koskeva ilmoitus lähetettiin.</string>
+  <string name="assisted_dialing_country_code_entry">Avustettu soittaminen: käytetty maakoodi +%1$s</string>
+  <string name="assisted_dialing_country_code_entry_failure">Käytettiin avustettua soittamista</string>
+  <string name="rtt_transcript_not_available">Transkriptiot ovat käytettävissä ainoastaan puheluissa, joissa on myös viestiominaisuus</string>
+  <string name="rtt_transcript_link">Katso transkriptio</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-fr-rCA/strings.xml b/java/com/android/dialer/calldetails/res/values-fr-rCA/strings.xml
index 714fb7b..b2d69fe 100644
--- a/java/com/android/dialer/calldetails/res/values-fr-rCA/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-fr-rCA/strings.xml
@@ -1,31 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_details" msgid="5063658079729839605">"Détails sur l\'appel"</string>
-    <string name="delete" msgid="2141020674108406737">"Supprimer"</string>
-    <string name="call_details_copy_number" msgid="4265479408878990796">"Copier le numéro"</string>
-    <string name="call_details_edit_number" msgid="8718476514903513624">"Modifier le numéro avant de passer l\'appel"</string>
-    <string name="call_details_report_call_id" msgid="8857541295264421217">"Signaler un numéro inexact"</string>
-    <string name="sent_a_photo" msgid="3978670717462979502">"Photo envoyée"</string>
-    <string name="received_a_photo" msgid="3528953225576480505">"Photo reçue"</string>
-    <string name="message_in_quotes" msgid="3270574830115828365">"« <xliff:g id="MESSAGE">%1$s</xliff:g> »"</string>
-    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Signaler un numéro incorrect"</string>
-    <string name="report_caller_id_failed" msgid="1471904930106125702">"Impossible de signaler le numéro"</string>
-    <string name="report_caller_id_toast" msgid="5494870403429969932">"Numéro signalé"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_details">Détails sur l\'appel</string>
+  <string name="delete">Supprimer</string>
+  <string name="call_details_copy_number">Copier le numéro</string>
+  <string name="call_details_edit_number">Modifier le numéro avant de passer l\'appel</string>
+  <string name="call_details_report_call_id">Signaler un numéro inexact</string>
+  <string name="sent_a_photo">Photo envoyée</string>
+  <string name="received_a_photo">Photo reçue</string>
+  <string name="message_in_quotes">« %1$s »</string>
+  <string name="report_caller_id_dialog_title">Signaler un numéro incorrect</string>
+  <string name="report_caller_id_failed">Impossible de signaler le numéro</string>
+  <string name="report_caller_id_toast">Numéro signalé</string>
+  <string name="assisted_dialing_country_code_entry">Numérotation assistée : code de pays +%1$s utilisé</string>
+  <string name="assisted_dialing_country_code_entry_failure">La numérotation assistée a été utilisée</string>
+  <string name="rtt_transcript_not_available">Le service de transcription n\'est disponible que pour les appels avec messagerie</string>
+  <string name="rtt_transcript_link">Voir la transcription</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-fr/strings.xml b/java/com/android/dialer/calldetails/res/values-fr/strings.xml
index f612341..53f3ec0 100644
--- a/java/com/android/dialer/calldetails/res/values-fr/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-fr/strings.xml
@@ -1,31 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_details" msgid="5063658079729839605">"Détails de l\'appel"</string>
-    <string name="delete" msgid="2141020674108406737">"Supprimer"</string>
-    <string name="call_details_copy_number" msgid="4265479408878990796">"Copier le numéro"</string>
-    <string name="call_details_edit_number" msgid="8718476514903513624">"Modifier le numéro avant d\'appeler"</string>
-    <string name="call_details_report_call_id" msgid="8857541295264421217">"Signaler un numéro incorrect"</string>
-    <string name="sent_a_photo" msgid="3978670717462979502">"Envoi d\'une photo"</string>
-    <string name="received_a_photo" msgid="3528953225576480505">"Réception d\'une photo"</string>
-    <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Signaler un numéro incorrect"</string>
-    <string name="report_caller_id_failed" msgid="1471904930106125702">"Impossible de signaler le numéro"</string>
-    <string name="report_caller_id_toast" msgid="5494870403429969932">"Signalement du numéro effectué"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_details">Détails de l\'appel</string>
+  <string name="delete">Supprimer</string>
+  <string name="call_details_copy_number">Copier le numéro</string>
+  <string name="call_details_edit_number">Modifier le numéro avant d\'appeler</string>
+  <string name="call_details_report_call_id">Signaler un numéro incorrect</string>
+  <string name="sent_a_photo">Envoi d\'une photo</string>
+  <string name="received_a_photo">Réception d\'une photo</string>
+  <string name="message_in_quotes">\"%1$s\"</string>
+  <string name="report_caller_id_dialog_title">Signaler un numéro incorrect</string>
+  <string name="report_caller_id_failed">Impossible de signaler le numéro</string>
+  <string name="report_caller_id_toast">Signalement du numéro effectué</string>
+  <string name="assisted_dialing_country_code_entry">Numérotation assistée : indicatif pays utilisé +%1$s</string>
+  <string name="assisted_dialing_country_code_entry_failure">La numérotation assistée a été utilisée</string>
+  <string name="rtt_transcript_not_available">La transcription n\'est disponible que pour les appels avec messagerie</string>
+  <string name="rtt_transcript_link">Voir la transcription</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-gl/strings.xml b/java/com/android/dialer/calldetails/res/values-gl/strings.xml
index 7f79834..6ce21f7 100644
--- a/java/com/android/dialer/calldetails/res/values-gl/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-gl/strings.xml
@@ -1,31 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_details" msgid="5063658079729839605">"Detalles da chamada"</string>
-    <string name="delete" msgid="2141020674108406737">"Eliminar"</string>
-    <string name="call_details_copy_number" msgid="4265479408878990796">"Copiar número"</string>
-    <string name="call_details_edit_number" msgid="8718476514903513624">"Editar número antes de chamar"</string>
-    <string name="call_details_report_call_id" msgid="8857541295264421217">"Informar dun número impreciso"</string>
-    <string name="sent_a_photo" msgid="3978670717462979502">"Enviouse unha foto"</string>
-    <string name="received_a_photo" msgid="3528953225576480505">"Recibiuse unha foto"</string>
-    <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Informar dun número incorrecto"</string>
-    <string name="report_caller_id_failed" msgid="1471904930106125702">"Non se puido marcar o número como inadecuado"</string>
-    <string name="report_caller_id_toast" msgid="5494870403429969932">"Marcouse o número como inadecuado"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_details">Detalles da chamada</string>
+  <string name="delete">Eliminar</string>
+  <string name="call_details_copy_number">Copiar número</string>
+  <string name="call_details_edit_number">Editar número antes de chamar</string>
+  <string name="call_details_report_call_id">Informar dun número impreciso</string>
+  <string name="sent_a_photo">Enviouse unha foto</string>
+  <string name="received_a_photo">Recibiuse unha foto</string>
+  <string name="message_in_quotes">\"%1$s\"</string>
+  <string name="report_caller_id_dialog_title">Informar dun número incorrecto</string>
+  <string name="report_caller_id_failed">Non se puido marcar o número como inadecuado</string>
+  <string name="report_caller_id_toast">Marcouse o número como inadecuado</string>
+  <string name="assisted_dialing_country_code_entry">Marcación asistida: utilizouse o prefixo de país +%1$s</string>
+  <string name="assisted_dialing_country_code_entry_failure">Utilizouse a marcación asistida</string>
+  <string name="rtt_transcript_not_available">A función de transcrición só está dispoñible para as chamadas con mensaxes</string>
+  <string name="rtt_transcript_link">Ver transcrición</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-gu/strings.xml b/java/com/android/dialer/calldetails/res/values-gu/strings.xml
index 9299705..160c848 100644
--- a/java/com/android/dialer/calldetails/res/values-gu/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-gu/strings.xml
@@ -1,31 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_details" msgid="5063658079729839605">"કૉલની વિગતો"</string>
-    <string name="delete" msgid="2141020674108406737">"કાઢી નાખો"</string>
-    <string name="call_details_copy_number" msgid="4265479408878990796">"નંબર કૉપિ કરો"</string>
-    <string name="call_details_edit_number" msgid="8718476514903513624">"કૉલ કરતાં પહેલાં નંબર સંપાદિત કરો"</string>
-    <string name="call_details_report_call_id" msgid="8857541295264421217">"અચોક્કસ નંબરની જાણ કરો"</string>
-    <string name="sent_a_photo" msgid="3978670717462979502">"એક ફોટો મોકલ્યો"</string>
-    <string name="received_a_photo" msgid="3528953225576480505">"એક ફોટો પ્રાપ્ત કર્યો"</string>
-    <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"ખોટા નંબરની જાણ કરો"</string>
-    <string name="report_caller_id_failed" msgid="1471904930106125702">"નંબરની જાણ કરી શકાઈ નથી"</string>
-    <string name="report_caller_id_toast" msgid="5494870403429969932">"નંબરની જાણ કરી"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_details">કૉલની વિગતો</string>
+  <string name="delete">કાઢી નાખો</string>
+  <string name="call_details_copy_number">નંબર કૉપિ કરો</string>
+  <string name="call_details_edit_number">કૉલ કરતાં પહેલાં નંબર સંપાદિત કરો</string>
+  <string name="call_details_report_call_id">અચોક્કસ નંબરની જાણ કરો</string>
+  <string name="sent_a_photo">એક ફોટો મોકલ્યો</string>
+  <string name="received_a_photo">એક ફોટો પ્રાપ્ત કર્યો</string>
+  <string name="message_in_quotes">\"%1$s\"</string>
+  <string name="report_caller_id_dialog_title">ખોટા નંબરની જાણ કરો</string>
+  <string name="report_caller_id_failed">નંબરની જાણ કરી શકાઈ નથી</string>
+  <string name="report_caller_id_toast">નંબરની જાણ કરી</string>
+  <string name="assisted_dialing_country_code_entry">સહાયિત ડાયલિંગ: ઉપયોગ કરેલ દેશ કોડ +%1$s</string>
+  <string name="assisted_dialing_country_code_entry_failure">સહાયિત ડાયલિંગનો ઉપયોગ થયો હતો</string>
+  <string name="rtt_transcript_not_available">માત્ર મેસેજિંગ સાથેના કૉલ માટે જ ટ્રાન્સક્રિપ્ટ ઉપલબ્ધ રહે છે</string>
+  <string name="rtt_transcript_link">ટ્રાન્સક્રિપ્ટ જુઓ</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-hi/strings.xml b/java/com/android/dialer/calldetails/res/values-hi/strings.xml
index 08099fe..87f6fd5 100644
--- a/java/com/android/dialer/calldetails/res/values-hi/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-hi/strings.xml
@@ -1,31 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_details" msgid="5063658079729839605">"कॉल विवरण"</string>
-    <string name="delete" msgid="2141020674108406737">"हटाएं"</string>
-    <string name="call_details_copy_number" msgid="4265479408878990796">"नंबर कॉपी करें"</string>
-    <string name="call_details_edit_number" msgid="8718476514903513624">"कॉल करने से पहले नंबर संपादित करें"</string>
-    <string name="call_details_report_call_id" msgid="8857541295264421217">"गलत जानकारी देने वाले नंबर की रिपोर्ट करें"</string>
-    <string name="sent_a_photo" msgid="3978670717462979502">"फ़ोटो भेजी गई"</string>
-    <string name="received_a_photo" msgid="3528953225576480505">"फ़ोटो मिली"</string>
-    <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"गलत नंबर की रिपोर्ट करें"</string>
-    <string name="report_caller_id_failed" msgid="1471904930106125702">"नंबर की रिपोर्ट नहीं की जा सकी"</string>
-    <string name="report_caller_id_toast" msgid="5494870403429969932">"नंबर की रिपोर्ट की गई"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_details">कॉल विवरण</string>
+  <string name="delete">हटाएं</string>
+  <string name="call_details_copy_number">नंबर कॉपी करें</string>
+  <string name="call_details_edit_number">कॉल करने से पहले नंबर संपादित करें</string>
+  <string name="call_details_report_call_id">गलत जानकारी देने वाले नंबर की रिपोर्ट करें</string>
+  <string name="sent_a_photo">फ़ोटो भेजी गई</string>
+  <string name="received_a_photo">फ़ोटो मिली</string>
+  <string name="message_in_quotes">\"%1$s\"</string>
+  <string name="report_caller_id_dialog_title">गलत नंबर की रिपोर्ट करें</string>
+  <string name="report_caller_id_failed">नंबर की रिपोर्ट नहीं की जा सकी</string>
+  <string name="report_caller_id_toast">नंबर की रिपोर्ट की गई</string>
+  <string name="assisted_dialing_country_code_entry">डायलिंग सहायता: उपयोग किया गया देश कोड +%1$s</string>
+  <string name="assisted_dialing_country_code_entry_failure">डायलिंग सहायता का उपयोग किया गया</string>
+  <string name="rtt_transcript_not_available">सिर्फ़ मैसेज वाले कॉल ही लेख में बदले जा सकते हैं</string>
+  <string name="rtt_transcript_link">मैसेज को लेख के रूप में देखें</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-hr/strings.xml b/java/com/android/dialer/calldetails/res/values-hr/strings.xml
index 6537181..3c12d28 100644
--- a/java/com/android/dialer/calldetails/res/values-hr/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-hr/strings.xml
@@ -1,31 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_details" msgid="5063658079729839605">"Pojedinosti poziva"</string>
-    <string name="delete" msgid="2141020674108406737">"Brisanje"</string>
-    <string name="call_details_copy_number" msgid="4265479408878990796">"Kopiranje broja"</string>
-    <string name="call_details_edit_number" msgid="8718476514903513624">"Uređivanje broja prije poziva"</string>
-    <string name="call_details_report_call_id" msgid="8857541295264421217">"Prijava netočnog broja"</string>
-    <string name="sent_a_photo" msgid="3978670717462979502">"Šalje fotografiju"</string>
-    <string name="received_a_photo" msgid="3528953225576480505">"Prima fotografiju"</string>
-    <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Prijava netočnog broja"</string>
-    <string name="report_caller_id_failed" msgid="1471904930106125702">"Prijava broja nije moguća"</string>
-    <string name="report_caller_id_toast" msgid="5494870403429969932">"Broj je prijavljen"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_details">Pojedinosti poziva</string>
+  <string name="delete">Brisanje</string>
+  <string name="call_details_copy_number">Kopiranje broja</string>
+  <string name="call_details_edit_number">Uređivanje broja prije poziva</string>
+  <string name="call_details_report_call_id">Prijava netočnog broja</string>
+  <string name="sent_a_photo">Šalje fotografiju</string>
+  <string name="received_a_photo">Prima fotografiju</string>
+  <string name="message_in_quotes">\"%1$s\"</string>
+  <string name="report_caller_id_dialog_title">Prijava netočnog broja</string>
+  <string name="report_caller_id_failed">Prijava broja nije moguća</string>
+  <string name="report_caller_id_toast">Broj je prijavljen</string>
+  <string name="assisted_dialing_country_code_entry">Potpomognuto biranje: korišteni pozivni broj zemlje +%1$s</string>
+  <string name="assisted_dialing_country_code_entry_failure">Korišteno je potpomognuto biranje</string>
+  <string name="rtt_transcript_not_available">Prijepis je dostupan samo za pozive s porukama</string>
+  <string name="rtt_transcript_link">Pregled prijepisa</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-hu/strings.xml b/java/com/android/dialer/calldetails/res/values-hu/strings.xml
index 43afbe3..94a50b9 100644
--- a/java/com/android/dialer/calldetails/res/values-hu/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-hu/strings.xml
@@ -1,31 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_details" msgid="5063658079729839605">"Hívás adatai"</string>
-    <string name="delete" msgid="2141020674108406737">"Törlés"</string>
-    <string name="call_details_copy_number" msgid="4265479408878990796">"Szám másolása"</string>
-    <string name="call_details_edit_number" msgid="8718476514903513624">"Szám szerkesztése hívás előtt"</string>
-    <string name="call_details_report_call_id" msgid="8857541295264421217">"Pontatlan szám bejelentése"</string>
-    <string name="sent_a_photo" msgid="3978670717462979502">"Küldött egy fotót"</string>
-    <string name="received_a_photo" msgid="3528953225576480505">"Kapott egy fotót"</string>
-    <string name="message_in_quotes" msgid="3270574830115828365">"„<xliff:g id="MESSAGE">%1$s</xliff:g>”"</string>
-    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Helytelen szám bejelentése"</string>
-    <string name="report_caller_id_failed" msgid="1471904930106125702">"Nem sikerült bejelenteni a számot"</string>
-    <string name="report_caller_id_toast" msgid="5494870403429969932">"Szám bejelentve"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_details">Hívás adatai</string>
+  <string name="delete">Törlés</string>
+  <string name="call_details_copy_number">Szám másolása</string>
+  <string name="call_details_edit_number">Szám szerkesztése hívás előtt</string>
+  <string name="call_details_report_call_id">Pontatlan szám bejelentése</string>
+  <string name="sent_a_photo">Küldött egy fotót</string>
+  <string name="received_a_photo">Kapott egy fotót</string>
+  <string name="message_in_quotes">„%1$s”</string>
+  <string name="report_caller_id_dialog_title">Helytelen szám bejelentése</string>
+  <string name="report_caller_id_failed">Nem sikerült bejelenteni a számot</string>
+  <string name="report_caller_id_toast">Szám bejelentve</string>
+  <string name="assisted_dialing_country_code_entry">Támogatott tárcsázás: Használt országhívószám +%1$s</string>
+  <string name="assisted_dialing_country_code_entry_failure">A támogatott tárcsázás aktív volt</string>
+  <string name="rtt_transcript_not_available">Az átiratok csak az üzenetküldési funkciót is használó hívások esetén állnak rendelkezésre</string>
+  <string name="rtt_transcript_link">Átirat megtekintése</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-hy/strings.xml b/java/com/android/dialer/calldetails/res/values-hy/strings.xml
index 05022ca..1b1a3f2 100644
--- a/java/com/android/dialer/calldetails/res/values-hy/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-hy/strings.xml
@@ -1,31 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_details" msgid="5063658079729839605">"Զանգի մանրամասները"</string>
-    <string name="delete" msgid="2141020674108406737">"Ջնջել"</string>
-    <string name="call_details_copy_number" msgid="4265479408878990796">"Պատճենել համարը"</string>
-    <string name="call_details_edit_number" msgid="8718476514903513624">"Փոփոխել համարը զանգելուց առաջ"</string>
-    <string name="call_details_report_call_id" msgid="8857541295264421217">"Հաղորդել սխալ համարի մասին"</string>
-    <string name="sent_a_photo" msgid="3978670717462979502">"Ուղարկվել է լուսանկար"</string>
-    <string name="received_a_photo" msgid="3528953225576480505">"Ստացվել է լուսանկար"</string>
-    <string name="message_in_quotes" msgid="3270574830115828365">"«<xliff:g id="MESSAGE">%1$s</xliff:g>»"</string>
-    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Հաղորդում սխալ համարի մասին"</string>
-    <string name="report_caller_id_failed" msgid="1471904930106125702">"Չհաջողվեց ուղարկել հաղորդումը"</string>
-    <string name="report_caller_id_toast" msgid="5494870403429969932">"Հաղորդումն ուղարկվեց"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_details">Զանգի մանրամասները</string>
+  <string name="delete">Ջնջել</string>
+  <string name="call_details_copy_number">Պատճենել համարը</string>
+  <string name="call_details_edit_number">Փոփոխել համարը զանգելուց առաջ</string>
+  <string name="call_details_report_call_id">Հաղորդել սխալ համարի մասին</string>
+  <string name="sent_a_photo">Ուղարկվել է լուսանկար</string>
+  <string name="received_a_photo">Ստացվել է լուսանկար</string>
+  <string name="message_in_quotes">«%1$s»</string>
+  <string name="report_caller_id_dialog_title">Հաղորդում սխալ համարի մասին</string>
+  <string name="report_caller_id_failed">Չհաջողվեց ուղարկել հաղորդումը</string>
+  <string name="report_caller_id_toast">Հաղորդումն ուղարկվեց</string>
+  <string name="assisted_dialing_country_code_entry">Օգնություն համարհավաքման ժամանակ. օգտագործվող կոդը՝ +%1$s</string>
+  <string name="assisted_dialing_country_code_entry_failure">Օգտագործվեց օգնությունը համարհավաքման ժամանակ</string>
+  <string name="rtt_transcript_not_available">Տառադրումը հասանելի է միայն հաղորդագրություններով զանգերի համար</string>
+  <string name="rtt_transcript_link">Տեսնել տառադրումը</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-in/strings.xml b/java/com/android/dialer/calldetails/res/values-in/strings.xml
index eaeb273..3f236dd 100644
--- a/java/com/android/dialer/calldetails/res/values-in/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-in/strings.xml
@@ -1,31 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_details" msgid="5063658079729839605">"Detail panggilan"</string>
-    <string name="delete" msgid="2141020674108406737">"Hapus"</string>
-    <string name="call_details_copy_number" msgid="4265479408878990796">"Salin nomor"</string>
-    <string name="call_details_edit_number" msgid="8718476514903513624">"Edit nomor sebelum menelepon"</string>
-    <string name="call_details_report_call_id" msgid="8857541295264421217">"Laporkan nomor yang tidak akurat"</string>
-    <string name="sent_a_photo" msgid="3978670717462979502">"Mengirim foto"</string>
-    <string name="received_a_photo" msgid="3528953225576480505">"Menerima foto"</string>
-    <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Laporkan nomor yang salah"</string>
-    <string name="report_caller_id_failed" msgid="1471904930106125702">"Tidak dapat melaporkan nomor"</string>
-    <string name="report_caller_id_toast" msgid="5494870403429969932">"Nomor dilaporkan"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_details">Detail panggilan</string>
+  <string name="delete">Hapus</string>
+  <string name="call_details_copy_number">Salin nomor</string>
+  <string name="call_details_edit_number">Edit nomor sebelum menelepon</string>
+  <string name="call_details_report_call_id">Laporkan nomor yang tidak akurat</string>
+  <string name="sent_a_photo">Mengirim foto</string>
+  <string name="received_a_photo">Menerima foto</string>
+  <string name="message_in_quotes">\"%1$s\"</string>
+  <string name="report_caller_id_dialog_title">Laporkan nomor yang salah</string>
+  <string name="report_caller_id_failed">Tidak dapat melaporkan nomor</string>
+  <string name="report_caller_id_toast">Nomor dilaporkan</string>
+  <string name="assisted_dialing_country_code_entry">Bantuan panggilan: Kode negara yang digunakan +%1$s</string>
+  <string name="assisted_dialing_country_code_entry_failure">Bantuan panggilan digunakan</string>
+  <string name="rtt_transcript_not_available">Transkripsi hanya tersedia untuk panggilan dengan messaging</string>
+  <string name="rtt_transcript_link">Lihat transkripsi</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-is/strings.xml b/java/com/android/dialer/calldetails/res/values-is/strings.xml
index ac522d5..b11984e 100644
--- a/java/com/android/dialer/calldetails/res/values-is/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-is/strings.xml
@@ -1,31 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_details" msgid="5063658079729839605">"Símtalsupplýsingar"</string>
-    <string name="delete" msgid="2141020674108406737">"Eyða"</string>
-    <string name="call_details_copy_number" msgid="4265479408878990796">"Afrita númer"</string>
-    <string name="call_details_edit_number" msgid="8718476514903513624">"Breyta númeri áður en hringt er"</string>
-    <string name="call_details_report_call_id" msgid="8857541295264421217">"Tilkynna rangt númer"</string>
-    <string name="sent_a_photo" msgid="3978670717462979502">"Sendi mynd"</string>
-    <string name="received_a_photo" msgid="3528953225576480505">"Tók á móti mynd"</string>
-    <string name="message_in_quotes" msgid="3270574830115828365">"„<xliff:g id="MESSAGE">%1$s</xliff:g>“"</string>
-    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Tilkynna rangt númer"</string>
-    <string name="report_caller_id_failed" msgid="1471904930106125702">"Ekki tókst að tilkynna númerið"</string>
-    <string name="report_caller_id_toast" msgid="5494870403429969932">"Númer tilkynnt"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_details">Símtalsupplýsingar</string>
+  <string name="delete">Eyða</string>
+  <string name="call_details_copy_number">Afrita númer</string>
+  <string name="call_details_edit_number">Breyta númeri áður en hringt er</string>
+  <string name="call_details_report_call_id">Tilkynna rangt númer</string>
+  <string name="sent_a_photo">Sendi mynd</string>
+  <string name="received_a_photo">Tók á móti mynd</string>
+  <string name="message_in_quotes">„%1$s“</string>
+  <string name="report_caller_id_dialog_title">Tilkynna rangt númer</string>
+  <string name="report_caller_id_failed">Ekki tókst að tilkynna númerið</string>
+  <string name="report_caller_id_toast">Númer tilkynnt</string>
+  <string name="assisted_dialing_country_code_entry">Aðstoð við hringingar: Landskóði notaður: +%1$s</string>
+  <string name="assisted_dialing_country_code_entry_failure">Aðstoð við hringingar var notuð</string>
+  <string name="rtt_transcript_not_available">Textauppskrift er aðeins í boði fyrir símtöl með skilaboðum</string>
+  <string name="rtt_transcript_link">Sjá textauppskrift</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-it/strings.xml b/java/com/android/dialer/calldetails/res/values-it/strings.xml
index 40c2245..51954de 100644
--- a/java/com/android/dialer/calldetails/res/values-it/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-it/strings.xml
@@ -1,31 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_details" msgid="5063658079729839605">"Dettagli chiamata"</string>
-    <string name="delete" msgid="2141020674108406737">"Elimina"</string>
-    <string name="call_details_copy_number" msgid="4265479408878990796">"Copia numero"</string>
-    <string name="call_details_edit_number" msgid="8718476514903513624">"Modifica numero prima di chiamare"</string>
-    <string name="call_details_report_call_id" msgid="8857541295264421217">"Segnala numero sbagliato"</string>
-    <string name="sent_a_photo" msgid="3978670717462979502">"Foto inviata"</string>
-    <string name="received_a_photo" msgid="3528953225576480505">"Foto ricevuta"</string>
-    <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Segnala numero errato"</string>
-    <string name="report_caller_id_failed" msgid="1471904930106125702">"Impossibile segnalare il numero"</string>
-    <string name="report_caller_id_toast" msgid="5494870403429969932">"Numero segnalato"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_details">Dettagli chiamata</string>
+  <string name="delete">Elimina</string>
+  <string name="call_details_copy_number">Copia numero</string>
+  <string name="call_details_edit_number">Modifica numero prima di chiamare</string>
+  <string name="call_details_report_call_id">Segnala numero sbagliato</string>
+  <string name="sent_a_photo">Foto inviata</string>
+  <string name="received_a_photo">Foto ricevuta</string>
+  <string name="message_in_quotes">\"%1$s\"</string>
+  <string name="report_caller_id_dialog_title">Segnala numero errato</string>
+  <string name="report_caller_id_failed">Impossibile segnalare il numero</string>
+  <string name="report_caller_id_toast">Numero segnalato</string>
+  <string name="assisted_dialing_country_code_entry">Composizione assistita: prefisso internazionale utilizzato +%1$s</string>
+  <string name="assisted_dialing_country_code_entry_failure">È stata utilizzata la composizione assistita</string>
+  <string name="rtt_transcript_not_available">Trascrizione disponibile solo per le chiamate con messaggi</string>
+  <string name="rtt_transcript_link">Visualizza trascrizione</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-iw/strings.xml b/java/com/android/dialer/calldetails/res/values-iw/strings.xml
index ffc4d47..bac2bd1 100644
--- a/java/com/android/dialer/calldetails/res/values-iw/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-iw/strings.xml
@@ -1,31 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_details" msgid="5063658079729839605">"פרטי השיחה"</string>
-    <string name="delete" msgid="2141020674108406737">"מחק"</string>
-    <string name="call_details_copy_number" msgid="4265479408878990796">"העתק את המספר"</string>
-    <string name="call_details_edit_number" msgid="8718476514903513624">"ערוך את המספר לפני השיחה"</string>
-    <string name="call_details_report_call_id" msgid="8857541295264421217">"דיווח על מספר לא מדויק"</string>
-    <string name="sent_a_photo" msgid="3978670717462979502">"נשלחה תמונה"</string>
-    <string name="received_a_photo" msgid="3528953225576480505">"התקבלה תמונה"</string>
-    <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"דיווח על מספר שגוי"</string>
-    <string name="report_caller_id_failed" msgid="1471904930106125702">"לא ניתן היה לדווח על המספר"</string>
-    <string name="report_caller_id_toast" msgid="5494870403429969932">"המספר דווח"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_details">פרטי השיחה</string>
+  <string name="delete">מחק</string>
+  <string name="call_details_copy_number">העתק את המספר</string>
+  <string name="call_details_edit_number">ערוך את המספר לפני השיחה</string>
+  <string name="call_details_report_call_id">דיווח על מספר לא מדויק</string>
+  <string name="sent_a_photo">נשלחה תמונה</string>
+  <string name="received_a_photo">התקבלה תמונה</string>
+  <string name="message_in_quotes">\"%1$s\"</string>
+  <string name="report_caller_id_dialog_title">דיווח על מספר שגוי</string>
+  <string name="report_caller_id_failed">לא ניתן היה לדווח על המספר</string>
+  <string name="report_caller_id_toast">המספר דיווח</string>
+  <string name="assisted_dialing_country_code_entry">עזרה בחיוג: שימוש בקידומת החיוג %1$s+</string>
+  <string name="assisted_dialing_country_code_entry_failure">השתמשת בעזרה בחיוג</string>
+  <string name="rtt_transcript_not_available">התמלול מבוצע רק לשיחות עם הודעות</string>
+  <string name="rtt_transcript_link">הצגת התמליל</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-ja/strings.xml b/java/com/android/dialer/calldetails/res/values-ja/strings.xml
index 24fcf2c..7efcd4f 100644
--- a/java/com/android/dialer/calldetails/res/values-ja/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-ja/strings.xml
@@ -1,31 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_details" msgid="5063658079729839605">"通話の詳細"</string>
-    <string name="delete" msgid="2141020674108406737">"削除"</string>
-    <string name="call_details_copy_number" msgid="4265479408878990796">"電話番号をコピー"</string>
-    <string name="call_details_edit_number" msgid="8718476514903513624">"発信前に電話番号を編集"</string>
-    <string name="call_details_report_call_id" msgid="8857541295264421217">"情報が間違っている番号を報告"</string>
-    <string name="sent_a_photo" msgid="3978670717462979502">"写真を送信しました"</string>
-    <string name="received_a_photo" msgid="3528953225576480505">"写真を受信しました"</string>
-    <string name="message_in_quotes" msgid="3270574830115828365">"「<xliff:g id="MESSAGE">%1$s</xliff:g>」"</string>
-    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"間違った番号の報告"</string>
-    <string name="report_caller_id_failed" msgid="1471904930106125702">"番号を報告できませんでした"</string>
-    <string name="report_caller_id_toast" msgid="5494870403429969932">"番号を報告しました"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_details">通話の詳細</string>
+  <string name="delete">削除</string>
+  <string name="call_details_copy_number">電話番号をコピー</string>
+  <string name="call_details_edit_number">発信前に電話番号を編集</string>
+  <string name="call_details_report_call_id">情報が間違っている番号を報告</string>
+  <string name="sent_a_photo">写真を送信しました</string>
+  <string name="received_a_photo">写真を受信しました</string>
+  <string name="message_in_quotes">「%1$s」</string>
+  <string name="report_caller_id_dialog_title">間違った番号の報告</string>
+  <string name="report_caller_id_failed">番号を報告できませんでした</string>
+  <string name="report_caller_id_toast">番号を報告しました</string>
+  <string name="assisted_dialing_country_code_entry">ダイヤル アシスト: 国コード +%1$s を使用しました</string>
+  <string name="assisted_dialing_country_code_entry_failure">ダイヤル アシストを使用しました</string>
+  <string name="rtt_transcript_not_available">音声を文字に変換する機能は、通話音声のテキスト化に対応している通話でのみご利用いただけます</string>
+  <string name="rtt_transcript_link">音声を文字に変換する</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-ka/strings.xml b/java/com/android/dialer/calldetails/res/values-ka/strings.xml
index 3d92f61..a58e7e6 100644
--- a/java/com/android/dialer/calldetails/res/values-ka/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-ka/strings.xml
@@ -1,31 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_details" msgid="5063658079729839605">"ზარის დეტალები"</string>
-    <string name="delete" msgid="2141020674108406737">"წაშლა"</string>
-    <string name="call_details_copy_number" msgid="4265479408878990796">"ნომრის კოპირება"</string>
-    <string name="call_details_edit_number" msgid="8718476514903513624">"ნომრის რედაქტირება დარეკვამდე"</string>
-    <string name="call_details_report_call_id" msgid="8857541295264421217">"არაზუსტი ნომრის შეტყობინება"</string>
-    <string name="sent_a_photo" msgid="3978670717462979502">"ფოტო გაიგზავნა"</string>
-    <string name="received_a_photo" msgid="3528953225576480505">"მიღებულია ფოტო"</string>
-    <string name="message_in_quotes" msgid="3270574830115828365">"„<xliff:g id="MESSAGE">%1$s</xliff:g>“"</string>
-    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"არასწორი ნომრის შეტყობინება"</string>
-    <string name="report_caller_id_failed" msgid="1471904930106125702">"ნომრის შეტყობინება ვერ მოხერხდა"</string>
-    <string name="report_caller_id_toast" msgid="5494870403429969932">"ნომერი შეტყობინებულია"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_details">ზარის დეტალები</string>
+  <string name="delete">წაშლა</string>
+  <string name="call_details_copy_number">ნომრის კოპირება</string>
+  <string name="call_details_edit_number">ნომრის რედაქტირება დარეკვამდე</string>
+  <string name="call_details_report_call_id">არაზუსტი ნომრის შეტყობინება</string>
+  <string name="sent_a_photo">ფოტო გაიგზავნა</string>
+  <string name="received_a_photo">მიღებულია ფოტო</string>
+  <string name="message_in_quotes">„%1$s“</string>
+  <string name="report_caller_id_dialog_title">არასწორი ნომრის შეტყობინება</string>
+  <string name="report_caller_id_failed">ნომრის შეტყობინება ვერ მოხერხდა</string>
+  <string name="report_caller_id_toast">ნომერი შეტყობინებულია</string>
+  <string name="assisted_dialing_country_code_entry">აკრეფის დახმარება: გამოყენებულია ქვეყნის კოდი +%1$s</string>
+  <string name="assisted_dialing_country_code_entry_failure">გამოყენებულია აკრეფის დახმარება</string>
+  <string name="rtt_transcript_not_available">ტრანსკრიპტები ხელმისაწვდომია მხოლოდ ზარებისთვის შეტყობინებებით</string>
+  <string name="rtt_transcript_link">ტრანსკრიპტის ნახვა</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-kk/strings.xml b/java/com/android/dialer/calldetails/res/values-kk/strings.xml
index c29daeb..b6c12af 100644
--- a/java/com/android/dialer/calldetails/res/values-kk/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-kk/strings.xml
@@ -1,31 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_details" msgid="5063658079729839605">"Қоңырау деректері"</string>
-    <string name="delete" msgid="2141020674108406737">"Жою"</string>
-    <string name="call_details_copy_number" msgid="4265479408878990796">"Нөмірді көшіру"</string>
-    <string name="call_details_edit_number" msgid="8718476514903513624">"Нөмірді қоңырау шалуға дейін өзгерту"</string>
-    <string name="call_details_report_call_id" msgid="8857541295264421217">"Қате нөмір туралы хабарлау"</string>
-    <string name="sent_a_photo" msgid="3978670717462979502">"Сурет жіберілді"</string>
-    <string name="received_a_photo" msgid="3528953225576480505">"Сурет қабылданды"</string>
-    <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Қате нөмір туралы хабарлау"</string>
-    <string name="report_caller_id_failed" msgid="1471904930106125702">"Нөмір туралы хабар жіберілмеді"</string>
-    <string name="report_caller_id_toast" msgid="5494870403429969932">"Нөмір туралы хабар жіберілді"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_details">Қоңырау деректері</string>
+  <string name="delete">Жою</string>
+  <string name="call_details_copy_number">Нөмірді көшіру</string>
+  <string name="call_details_edit_number">Нөмірді қоңырау шалуға дейін өзгерту</string>
+  <string name="call_details_report_call_id">Қате нөмір туралы хабарлау</string>
+  <string name="sent_a_photo">Сурет жіберілді</string>
+  <string name="received_a_photo">Сурет қабылданды</string>
+  <string name="message_in_quotes">\"%1$s\"</string>
+  <string name="report_caller_id_dialog_title">Қате нөмір туралы хабарлау</string>
+  <string name="report_caller_id_failed">Нөмір туралы хабар жіберілмеді</string>
+  <string name="report_caller_id_toast">Нөмір туралы хабар жіберілді</string>
+  <string name="assisted_dialing_country_code_entry">Жылдам теру: ел коды +%1$s қолданылады</string>
+  <string name="assisted_dialing_country_code_entry_failure">Жылдам теру қолданылды</string>
+  <string name="rtt_transcript_not_available">Tранскрипция тек қана хабар жіберу қызметі бар қоңырауларда қолданылады</string>
+  <string name="rtt_transcript_link">Транскрипцияны көру</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-km/strings.xml b/java/com/android/dialer/calldetails/res/values-km/strings.xml
index d5ea830..0ca70bf 100644
--- a/java/com/android/dialer/calldetails/res/values-km/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-km/strings.xml
@@ -1,31 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_details" msgid="5063658079729839605">"ព័ត៌មាន​លម្អិត​អំពី​ការ​ហៅ"</string>
-    <string name="delete" msgid="2141020674108406737">"លុប"</string>
-    <string name="call_details_copy_number" msgid="4265479408878990796">"ថតចម្លងលេខទូរសព្ទ"</string>
-    <string name="call_details_edit_number" msgid="8718476514903513624">"កែ​លេខ​ មុន​ពេល​ហៅទូរសព្ទ"</string>
-    <string name="call_details_report_call_id" msgid="8857541295264421217">"រាយការណ៍លេខមិនត្រឹមត្រូវ"</string>
-    <string name="sent_a_photo" msgid="3978670717462979502">"បានផ្ញើរូបថត"</string>
-    <string name="received_a_photo" msgid="3528953225576480505">"បាន​ទទួល​រូបថត"</string>
-    <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"រាយការណ៍​លេខ​មិន​ត្រឹមត្រូវ"</string>
-    <string name="report_caller_id_failed" msgid="1471904930106125702">"មិន​អាច​រាយការណ៍​លេខ​បាន​ទេ"</string>
-    <string name="report_caller_id_toast" msgid="5494870403429969932">"បាន​រាយការណ៍​លេខ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_details">ព័ត៌មាន​លម្អិត​អំពី​ការ​ហៅ</string>
+  <string name="delete">លុប</string>
+  <string name="call_details_copy_number">ថតចម្លងលេខទូរសព្ទ</string>
+  <string name="call_details_edit_number">កែ​លេខ​ មុន​ពេល​ហៅទូរសព្ទ</string>
+  <string name="call_details_report_call_id">រាយការណ៍លេខមិនត្រឹមត្រូវ</string>
+  <string name="sent_a_photo">បានផ្ញើរូបថត</string>
+  <string name="received_a_photo">បាន​ទទួល​រូបថត</string>
+  <string name="message_in_quotes">\"%1$s\"</string>
+  <string name="report_caller_id_dialog_title">រាយការណ៍​លេខ​មិន​ត្រឹមត្រូវ</string>
+  <string name="report_caller_id_failed">មិន​អាច​រាយការណ៍​លេខ​បាន​ទេ</string>
+  <string name="report_caller_id_toast">បាន​រាយការណ៍​លេខ</string>
+  <string name="assisted_dialing_country_code_entry">ការចុច​ហៅ​ដែល​មាន​ជំនួយ៖ កូដ​ប្រទេស​ដែល​បាន​ប្រើ +%1$s</string>
+  <string name="assisted_dialing_country_code_entry_failure">ការចុច​ហៅ​​ដែល​មាន​ជំនួយ​ត្រូវបាន​ប្រើ</string>
+  <string name="rtt_transcript_not_available">ប្រតិចារឹក​​មាន​តែ​នៅពេល​ហៅ​ទូរសព្ទ​ជាមួយ​ការផ្ញើ​សារ​ប៉ុណ្ណោះ</string>
+  <string name="rtt_transcript_link">មើល​ប្រតិចារឹក</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-kn/strings.xml b/java/com/android/dialer/calldetails/res/values-kn/strings.xml
index aeff715..b37a4ec 100644
--- a/java/com/android/dialer/calldetails/res/values-kn/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-kn/strings.xml
@@ -1,31 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_details" msgid="5063658079729839605">"ಕರೆಯ ವಿವರಗಳು"</string>
-    <string name="delete" msgid="2141020674108406737">"ಅಳಿಸಿ"</string>
-    <string name="call_details_copy_number" msgid="4265479408878990796">"ಸಂಖ್ಯೆಯನ್ನು ನಕಲಿಸಿ"</string>
-    <string name="call_details_edit_number" msgid="8718476514903513624">"ಕರೆ ಮಾಡುವ ಮೊದಲು ಸಂಖ್ಯೆಯನ್ನು ಎಡಿಟ್ ಮಾಡಿ"</string>
-    <string name="call_details_report_call_id" msgid="8857541295264421217">"ನಿಖರವಾಗಿಲ್ಲದ ಸಂಖ್ಯೆಯನ್ನು ವರದಿಮಾಡಿ"</string>
-    <string name="sent_a_photo" msgid="3978670717462979502">"ಫೋಟೋ ಕಳುಹಿಸಲಾಗಿದೆ"</string>
-    <string name="received_a_photo" msgid="3528953225576480505">"ಫೋಟೋ ಸ್ವೀಕರಿಸಲಾಗಿದೆ"</string>
-    <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"ತಪ್ಪಾದ ಸಂಖ್ಯೆಯನ್ನು ವರದಿಮಾಡಿ"</string>
-    <string name="report_caller_id_failed" msgid="1471904930106125702">"ಸಂಖ್ಯೆಯನ್ನು ವರದಿ ಮಾಡಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ"</string>
-    <string name="report_caller_id_toast" msgid="5494870403429969932">"ವರದಿ ಮಾಡಲಾದ ಸಂಖ್ಯೆ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_details">ಕರೆಯ ವಿವರಗಳು</string>
+  <string name="delete">ಅಳಿಸಿ</string>
+  <string name="call_details_copy_number">ಸಂಖ್ಯೆಯನ್ನು ನಕಲಿಸಿ</string>
+  <string name="call_details_edit_number">ಕರೆ ಮಾಡುವ ಮೊದಲು ಸಂಖ್ಯೆಯನ್ನು ಎಡಿಟ್ ಮಾಡಿ</string>
+  <string name="call_details_report_call_id">ನಿಖರವಾಗಿಲ್ಲದ ಸಂಖ್ಯೆಯನ್ನು ವರದಿಮಾಡಿ</string>
+  <string name="sent_a_photo">ಫೋಟೋ ಕಳುಹಿಸಲಾಗಿದೆ</string>
+  <string name="received_a_photo">ಫೋಟೋ ಸ್ವೀಕರಿಸಲಾಗಿದೆ</string>
+  <string name="message_in_quotes">\"%1$s\"</string>
+  <string name="report_caller_id_dialog_title">ತಪ್ಪಾದ ಸಂಖ್ಯೆಯನ್ನು ವರದಿಮಾಡಿ</string>
+  <string name="report_caller_id_failed">ಸಂಖ್ಯೆಯನ್ನು ವರದಿ ಮಾಡಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ</string>
+  <string name="report_caller_id_toast">ವರದಿ ಮಾಡಲಾದ ಸಂಖ್ಯೆ</string>
+  <string name="assisted_dialing_country_code_entry">ಸಹಾಯಕ ಡಯಲಿಂಗ್: ದೇಶದ ಕೋಡ್ +%1$s ಬಳಸಲಾಗಿದೆ</string>
+  <string name="assisted_dialing_country_code_entry_failure">ಸಹಾಯಕ ಡಯಲಿಂಗ್ ಅನ್ನು ಬಳಸಲಾಗಿದೆ</string>
+  <string name="rtt_transcript_not_available">ಪ್ರತಿಲೇಖನವು ಸಂದೇಶದೊಂದಿಗೆ ಕರೆಗಳಿಗೆ ಮಾತ್ರ ಲಭ್ಯವಿದೆ</string>
+  <string name="rtt_transcript_link">ಪ್ರತಿಲೇಖನವನ್ನು ನೋಡಿ</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-ko/strings.xml b/java/com/android/dialer/calldetails/res/values-ko/strings.xml
index f45d712..62fc453 100644
--- a/java/com/android/dialer/calldetails/res/values-ko/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-ko/strings.xml
@@ -1,31 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_details" msgid="5063658079729839605">"통화 세부정보"</string>
-    <string name="delete" msgid="2141020674108406737">"삭제"</string>
-    <string name="call_details_copy_number" msgid="4265479408878990796">"전화번호 복사"</string>
-    <string name="call_details_edit_number" msgid="8718476514903513624">"통화하기 전에 번호 수정"</string>
-    <string name="call_details_report_call_id" msgid="8857541295264421217">"잘못된 번호 신고하기"</string>
-    <string name="sent_a_photo" msgid="3978670717462979502">"사진 전송됨"</string>
-    <string name="received_a_photo" msgid="3528953225576480505">"사진 수신됨"</string>
-    <string name="message_in_quotes" msgid="3270574830115828365">"\'<xliff:g id="MESSAGE">%1$s</xliff:g>\'"</string>
-    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"잘못된 번호 신고"</string>
-    <string name="report_caller_id_failed" msgid="1471904930106125702">"번호를 신고할 수 없습니다."</string>
-    <string name="report_caller_id_toast" msgid="5494870403429969932">"번호가 신고되었습니다."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_details">통화 세부정보</string>
+  <string name="delete">삭제</string>
+  <string name="call_details_copy_number">전화번호 복사</string>
+  <string name="call_details_edit_number">통화하기 전에 번호 수정</string>
+  <string name="call_details_report_call_id">잘못된 번호 신고하기</string>
+  <string name="sent_a_photo">사진 전송됨</string>
+  <string name="received_a_photo">사진 수신됨</string>
+  <string name="message_in_quotes">\'%1$s\'</string>
+  <string name="report_caller_id_dialog_title">잘못된 번호 신고</string>
+  <string name="report_caller_id_failed">번호를 신고할 수 없습니다.</string>
+  <string name="report_caller_id_toast">번호가 신고되었습니다.</string>
+  <string name="assisted_dialing_country_code_entry">전화번호 도우미: 국가 코드 +%1$s 사용</string>
+  <string name="assisted_dialing_country_code_entry_failure">전화번호 도우미가 사용됨</string>
+  <string name="rtt_transcript_not_available">텍스트 변환 기능은 메시지가 있는 통화에만 사용할 수 있습니다.</string>
+  <string name="rtt_transcript_link">스크립트 보기</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-ky/strings.xml b/java/com/android/dialer/calldetails/res/values-ky/strings.xml
index 9735abc..a403961 100644
--- a/java/com/android/dialer/calldetails/res/values-ky/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-ky/strings.xml
@@ -1,31 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_details" msgid="5063658079729839605">"Чалуу тууралуу"</string>
-    <string name="delete" msgid="2141020674108406737">"Жок кылуу"</string>
-    <string name="call_details_copy_number" msgid="4265479408878990796">"Номерди көчүрүү"</string>
-    <string name="call_details_edit_number" msgid="8718476514903513624">"Чалуудан мурун номерди түзөтүү"</string>
-    <string name="call_details_report_call_id" msgid="8857541295264421217">"Номердеги ката жөнүндө кабар берүү"</string>
-    <string name="sent_a_photo" msgid="3978670717462979502">"Сүрөт жөнөтүлдү"</string>
-    <string name="received_a_photo" msgid="3528953225576480505">"Сүрөт алынды"</string>
-    <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Туура эмес номер жөнүндө кабарлоо"</string>
-    <string name="report_caller_id_failed" msgid="1471904930106125702">"Туура эмес номер жөнүндө кабар жөнөтүлбөй койду"</string>
-    <string name="report_caller_id_toast" msgid="5494870403429969932">"Туура эмес номер жөнүндө кабар берүү"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_details">Чалуу тууралуу</string>
+  <string name="delete">Жок кылуу</string>
+  <string name="call_details_copy_number">Номерди көчүрүү</string>
+  <string name="call_details_edit_number">Чалуудан мурун номерди түзөтүү</string>
+  <string name="call_details_report_call_id">Номердеги ката жөнүндө кабар берүү</string>
+  <string name="sent_a_photo">Сүрөт жөнөтүлдү</string>
+  <string name="received_a_photo">Сүрөт алынды</string>
+  <string name="message_in_quotes">\"%1$s\"</string>
+  <string name="report_caller_id_dialog_title">Туура эмес номер жөнүндө кабарлоо</string>
+  <string name="report_caller_id_failed">Туура эмес номер жөнүндө кабар жөнөтүлбөй койду</string>
+  <string name="report_caller_id_toast">Туура эмес номер жөнүндө кабар берүү</string>
+  <string name="assisted_dialing_country_code_entry">Жардам берилген терүү: Өлкө коду +%1$s</string>
+  <string name="assisted_dialing_country_code_entry_failure">Жардам берилген терүү колдонулду</string>
+  <string name="rtt_transcript_not_available">Транскрипция SMS / MMS жазышуу менен чалууларда гана көрсөтүлөт</string>
+  <string name="rtt_transcript_link">Транскрипцияны көрүү</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-lo/strings.xml b/java/com/android/dialer/calldetails/res/values-lo/strings.xml
index 880510e..f7c856e 100644
--- a/java/com/android/dialer/calldetails/res/values-lo/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-lo/strings.xml
@@ -1,31 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_details" msgid="5063658079729839605">"ລາຍລະອຽດ​ການໂທ"</string>
-    <string name="delete" msgid="2141020674108406737">"​ລຶບ"</string>
-    <string name="call_details_copy_number" msgid="4265479408878990796">"ສຳເນົາເບີໂທ"</string>
-    <string name="call_details_edit_number" msgid="8718476514903513624">"ແກ້ໄຂເບີກ່ອນໂທ"</string>
-    <string name="call_details_report_call_id" msgid="8857541295264421217">"ລາຍງານເບີໂທທີ່ບໍ່ຖືກຕ້ອງ"</string>
-    <string name="sent_a_photo" msgid="3978670717462979502">"ສົ່ງຮູບພາບ"</string>
-    <string name="received_a_photo" msgid="3528953225576480505">"ໄດ້ຮັບຮູບພາບແລ້ວ"</string>
-    <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"​ລາຍ​ງານ​ເບີ​ໂທບໍ່​ຖືກ​ຕ້ອງ"</string>
-    <string name="report_caller_id_failed" msgid="1471904930106125702">"ບໍ່ສາມາດລາຍງານເບີໂທໄດ້"</string>
-    <string name="report_caller_id_toast" msgid="5494870403429969932">"ລາຍງານເບີໂທແລ້ວ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_details">ລາຍລະອຽດ​ການໂທ</string>
+  <string name="delete">​ລຶບ</string>
+  <string name="call_details_copy_number">ສຳເນົາເບີໂທ</string>
+  <string name="call_details_edit_number">ແກ້ໄຂເບີກ່ອນໂທ</string>
+  <string name="call_details_report_call_id">ລາຍງານເບີໂທທີ່ບໍ່ຖືກຕ້ອງ</string>
+  <string name="sent_a_photo">ສົ່ງຮູບພາບ</string>
+  <string name="received_a_photo">ໄດ້ຮັບຮູບພາບແລ້ວ</string>
+  <string name="message_in_quotes">\"%1$s\"</string>
+  <string name="report_caller_id_dialog_title">​ລາຍ​ງານ​ເບີ​ໂທບໍ່​ຖືກ​ຕ້ອງ</string>
+  <string name="report_caller_id_failed">ບໍ່ສາມາດລາຍງານເບີໂທໄດ້</string>
+  <string name="report_caller_id_toast">ລາຍງານເບີໂທແລ້ວ</string>
+  <string name="assisted_dialing_country_code_entry">ການໂທແບບຊ່ວຍເຫຼືອ: ໃຊ້ລະຫັດປະເທດ +%1$s</string>
+  <string name="assisted_dialing_country_code_entry_failure">ໃຊ້ການການແບບຊ່ວຍເຫຼືອ</string>
+  <string name="rtt_transcript_not_available">ການຖອດຂໍ້ຄວາມສາມາດໃຊ້ໄດ້ກັບການໂທທີ່ມີຂໍ້ຄວາມເທົ່ານັ້ນ</string>
+  <string name="rtt_transcript_link">ເບິ່ງການຖອດຂໍ້ຄວາມ</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-lt/strings.xml b/java/com/android/dialer/calldetails/res/values-lt/strings.xml
index 2f195de..a3c169d 100644
--- a/java/com/android/dialer/calldetails/res/values-lt/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-lt/strings.xml
@@ -1,31 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_details" msgid="5063658079729839605">"Išsami skambučio informacija"</string>
-    <string name="delete" msgid="2141020674108406737">"Ištrinti"</string>
-    <string name="call_details_copy_number" msgid="4265479408878990796">"Kopijuoti numerį"</string>
-    <string name="call_details_edit_number" msgid="8718476514903513624">"Redaguoti numerį prieš skambinant"</string>
-    <string name="call_details_report_call_id" msgid="8857541295264421217">"Pranešti apie netikslų numerį"</string>
-    <string name="sent_a_photo" msgid="3978670717462979502">"Išsiuntė nuotrauką"</string>
-    <string name="received_a_photo" msgid="3528953225576480505">"Gavo nuotrauką"</string>
-    <string name="message_in_quotes" msgid="3270574830115828365">"„<xliff:g id="MESSAGE">%1$s</xliff:g>“"</string>
-    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Pranešimas apie netinkamą numerį"</string>
-    <string name="report_caller_id_failed" msgid="1471904930106125702">"Nepavyko pranešti apie numerį"</string>
-    <string name="report_caller_id_toast" msgid="5494870403429969932">"Apie numerį pranešta"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_details">Išsami skambučio informacija</string>
+  <string name="delete">Ištrinti</string>
+  <string name="call_details_copy_number">Kopijuoti numerį</string>
+  <string name="call_details_edit_number">Redaguoti numerį prieš skambinant</string>
+  <string name="call_details_report_call_id">Pranešti apie netikslų numerį</string>
+  <string name="sent_a_photo">Išsiuntė nuotrauką</string>
+  <string name="received_a_photo">Gavo nuotrauką</string>
+  <string name="message_in_quotes">„%1$s“</string>
+  <string name="report_caller_id_dialog_title">Pranešimas apie netinkamą numerį</string>
+  <string name="report_caller_id_failed">Nepavyko pranešti apie numerį</string>
+  <string name="report_caller_id_toast">Apie numerį pranešta</string>
+  <string name="assisted_dialing_country_code_entry">Pagalbinis numerio rinkimas: naudotas šalies kodas +%1$s</string>
+  <string name="assisted_dialing_country_code_entry_failure">Buvo naudojamas pagalbinis numerio rinkimas</string>
+  <string name="rtt_transcript_not_available">Nuorašai galimi, tik kai skambučiai atliekami naudojant susirašinėjimo funkciją</string>
+  <string name="rtt_transcript_link">Žr. nuorašą</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-lv/strings.xml b/java/com/android/dialer/calldetails/res/values-lv/strings.xml
index e119b12..c174f04 100644
--- a/java/com/android/dialer/calldetails/res/values-lv/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-lv/strings.xml
@@ -1,31 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_details" msgid="5063658079729839605">"Detalizēta informācija par zvanu"</string>
-    <string name="delete" msgid="2141020674108406737">"Dzēst"</string>
-    <string name="call_details_copy_number" msgid="4265479408878990796">"Kopēt numuru"</string>
-    <string name="call_details_edit_number" msgid="8718476514903513624">"Rediģēt numuru pirms zvanīšanas"</string>
-    <string name="call_details_report_call_id" msgid="8857541295264421217">"Ziņot par neprecīzu numuru"</string>
-    <string name="sent_a_photo" msgid="3978670717462979502">"Nosūtīja fotoattēlu"</string>
-    <string name="received_a_photo" msgid="3528953225576480505">"Saņēma fotoattēlu"</string>
-    <string name="message_in_quotes" msgid="3270574830115828365">"“<xliff:g id="MESSAGE">%1$s</xliff:g>”"</string>
-    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Ziņošana par nepareizu numuru"</string>
-    <string name="report_caller_id_failed" msgid="1471904930106125702">"Nevarēja nosūtīt ziņojumu par numuru"</string>
-    <string name="report_caller_id_toast" msgid="5494870403429969932">"Ziņojums par numuru nosūtīts"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_details">Detalizēta informācija par zvanu</string>
+  <string name="delete">Dzēst</string>
+  <string name="call_details_copy_number">Kopēt numuru</string>
+  <string name="call_details_edit_number">Rediģēt numuru pirms zvanīšanas</string>
+  <string name="call_details_report_call_id">Ziņot par neprecīzu numuru</string>
+  <string name="sent_a_photo">Nosūtīja fotoattēlu</string>
+  <string name="received_a_photo">Saņēma fotoattēlu</string>
+  <string name="message_in_quotes">“%1$s”</string>
+  <string name="report_caller_id_dialog_title">Ziņošana par nepareizu numuru</string>
+  <string name="report_caller_id_failed">Nevarēja nosūtīt ziņojumu par numuru</string>
+  <string name="report_caller_id_toast">Ziņojums par numuru nosūtīts</string>
+  <string name="assisted_dialing_country_code_entry">Numura sastādīšanas palīdzība: izmantots valsts kods +%1$s</string>
+  <string name="assisted_dialing_country_code_entry_failure">Tika izmantota numura sastādīšanas palīdzība</string>
+  <string name="rtt_transcript_not_available">Transkripcija ir pieejama tikai zvaniem ar ziņojumapmaiņu.</string>
+  <string name="rtt_transcript_link">Skatīt transkripciju</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-mk/strings.xml b/java/com/android/dialer/calldetails/res/values-mk/strings.xml
index 2458e08..7ac74e8 100644
--- a/java/com/android/dialer/calldetails/res/values-mk/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-mk/strings.xml
@@ -1,31 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_details" msgid="5063658079729839605">"Детали на повик"</string>
-    <string name="delete" msgid="2141020674108406737">"Избриши"</string>
-    <string name="call_details_copy_number" msgid="4265479408878990796">"Копирај го бројот"</string>
-    <string name="call_details_edit_number" msgid="8718476514903513624">"Измени го бројот пред повикот"</string>
-    <string name="call_details_report_call_id" msgid="8857541295264421217">"Пријавете погрешен број"</string>
-    <string name="sent_a_photo" msgid="3978670717462979502">"Испрати фотографија"</string>
-    <string name="received_a_photo" msgid="3528953225576480505">"Прими фотографија"</string>
-    <string name="message_in_quotes" msgid="3270574830115828365">"„<xliff:g id="MESSAGE">%1$s</xliff:g>“"</string>
-    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Пријавете неточен број"</string>
-    <string name="report_caller_id_failed" msgid="1471904930106125702">"Не можеше да пријави бројот"</string>
-    <string name="report_caller_id_toast" msgid="5494870403429969932">"Бројот е пријавен"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_details">Детали на повик</string>
+  <string name="delete">Избриши</string>
+  <string name="call_details_copy_number">Копирај го бројот</string>
+  <string name="call_details_edit_number">Измени го бројот пред повикот</string>
+  <string name="call_details_report_call_id">Пријавете погрешен број</string>
+  <string name="sent_a_photo">Испрати фотографија</string>
+  <string name="received_a_photo">Прими фотографија</string>
+  <string name="message_in_quotes">„%1$s“</string>
+  <string name="report_caller_id_dialog_title">Пријавете неточен број</string>
+  <string name="report_caller_id_failed">Не можеше да пријави бројот</string>
+  <string name="report_caller_id_toast">Бројот е пријавен</string>
+  <string name="assisted_dialing_country_code_entry">Бирање со помош: употребен код на земја +%1$s</string>
+  <string name="assisted_dialing_country_code_entry_failure">Користено е бирање со помош</string>
+  <string name="rtt_transcript_not_available">Препис е достапен само за повици со пораки</string>
+  <string name="rtt_transcript_link">Видете препис</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-ml/strings.xml b/java/com/android/dialer/calldetails/res/values-ml/strings.xml
index 8164a21..40291d5 100644
--- a/java/com/android/dialer/calldetails/res/values-ml/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-ml/strings.xml
@@ -1,31 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_details" msgid="5063658079729839605">"കോൾ വിശദാംശങ്ങൾ"</string>
-    <string name="delete" msgid="2141020674108406737">"ഇല്ലാതാക്കുക"</string>
-    <string name="call_details_copy_number" msgid="4265479408878990796">"നമ്പർ പകർത്തുക"</string>
-    <string name="call_details_edit_number" msgid="8718476514903513624">"കോൾ ചെയ്യുന്നതിന് മുമ്പായി നമ്പർ എഡിറ്റുചെയ്യുക"</string>
-    <string name="call_details_report_call_id" msgid="8857541295264421217">"കൃത്യമല്ലാത്ത നമ്പർ റിപ്പോർട്ടുചെയ്യുക"</string>
-    <string name="sent_a_photo" msgid="3978670717462979502">"ഒരു ഫോട്ടോ അയച്ചു"</string>
-    <string name="received_a_photo" msgid="3528953225576480505">"ഒരു ഫോട്ടോ ലഭിച്ചു"</string>
-    <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"തെറ്റായ നമ്പർ റിപ്പോർട്ടുചെയ്യുക"</string>
-    <string name="report_caller_id_failed" msgid="1471904930106125702">"നമ്പർ റിപ്പോർട്ടുചെയ്യാനായില്ല"</string>
-    <string name="report_caller_id_toast" msgid="5494870403429969932">"നമ്പർ റിപ്പോർട്ടുചെയ്‌തു"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_details">കോൾ വിശദാംശങ്ങൾ</string>
+  <string name="delete">ഇല്ലാതാക്കുക</string>
+  <string name="call_details_copy_number">നമ്പർ പകർത്തുക</string>
+  <string name="call_details_edit_number">കോൾ ചെയ്യുന്നതിന് മുമ്പായി നമ്പർ എഡിറ്റുചെയ്യുക</string>
+  <string name="call_details_report_call_id">കൃത്യമല്ലാത്ത നമ്പർ റിപ്പോർട്ടുചെയ്യുക</string>
+  <string name="sent_a_photo">ഒരു ഫോട്ടോ അയച്ചു</string>
+  <string name="received_a_photo">ഒരു ഫോട്ടോ ലഭിച്ചു</string>
+  <string name="message_in_quotes">\"%1$s\"</string>
+  <string name="report_caller_id_dialog_title">തെറ്റായ നമ്പർ റിപ്പോർട്ടുചെയ്യുക</string>
+  <string name="report_caller_id_failed">നമ്പർ റിപ്പോർട്ടുചെയ്യാനായില്ല</string>
+  <string name="report_caller_id_toast">നമ്പർ റിപ്പോർട്ടുചെയ്‌തു</string>
+  <string name="assisted_dialing_country_code_entry">അസിസ്‌റ്റഡ് ഡയലിംഗ്: +%1$s എന്ന രാജ്യ കോഡ് ഉപയോഗിച്ചു</string>
+  <string name="assisted_dialing_country_code_entry_failure">അസിസ്‌റ്റഡ് ഡയലിംഗ് ഉപയോഗിച്ചു</string>
+  <string name="rtt_transcript_not_available">സന്ദേശമയയ്‌ക്കലിന് ഒപ്പമുള്ള കോളുകൾക്ക് മാത്രം ട്രാൻസ്‌ക്രിപ്റ്റ് ലഭ്യം</string>
+  <string name="rtt_transcript_link">ട്രാൻസ്ക്രിപ്റ്റ് കാണുക</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-mn/strings.xml b/java/com/android/dialer/calldetails/res/values-mn/strings.xml
index 242f6ab..5ced0ff 100644
--- a/java/com/android/dialer/calldetails/res/values-mn/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-mn/strings.xml
@@ -1,31 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_details" msgid="5063658079729839605">"Дуудлагын мэдээлэл"</string>
-    <string name="delete" msgid="2141020674108406737">"Устгах"</string>
-    <string name="call_details_copy_number" msgid="4265479408878990796">"Дугаар хуулах"</string>
-    <string name="call_details_edit_number" msgid="8718476514903513624">"Залгахын өмнө дугаар засах"</string>
-    <string name="call_details_report_call_id" msgid="8857541295264421217">"Тодорхой бус дугаарыг мэдээлэх"</string>
-    <string name="sent_a_photo" msgid="3978670717462979502">"Зураг илгээсэн"</string>
-    <string name="received_a_photo" msgid="3528953225576480505">"Зураг хүлээн авсан"</string>
-    <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Буруу дугаарыг мэдээлэх"</string>
-    <string name="report_caller_id_failed" msgid="1471904930106125702">"Дугаарыг мэдээлж чадсангүй"</string>
-    <string name="report_caller_id_toast" msgid="5494870403429969932">"Дугаарыг мэдээлсэн"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_details">Дуудлагын мэдээлэл</string>
+  <string name="delete">Устгах</string>
+  <string name="call_details_copy_number">Дугаар хуулах</string>
+  <string name="call_details_edit_number">Залгахын өмнө дугаар засах</string>
+  <string name="call_details_report_call_id">Тодорхой бус дугаарыг мэдээлэх</string>
+  <string name="sent_a_photo">Зураг илгээсэн</string>
+  <string name="received_a_photo">Зураг хүлээн авсан</string>
+  <string name="message_in_quotes">\"%1$s\"</string>
+  <string name="report_caller_id_dialog_title">Буруу дугаарыг мэдээлэх</string>
+  <string name="report_caller_id_failed">Дугаарыг мэдээлж чадсангүй</string>
+  <string name="report_caller_id_toast">Дугаарыг мэдээлсэн</string>
+  <string name="assisted_dialing_country_code_entry">Дэмжлэгтэй залгах: Ашигласан улсын код +%1$s</string>
+  <string name="assisted_dialing_country_code_entry_failure">Дэмжлэгтэй залгахыг ашигласан</string>
+  <string name="rtt_transcript_not_available">Зөвхөн зурвастай дуудлагын хувьд сийрүүлэг ашиглах боломжтой</string>
+  <string name="rtt_transcript_link">Сийрүүлгийг үзэх</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-mr/strings.xml b/java/com/android/dialer/calldetails/res/values-mr/strings.xml
index d869e13..cc03788 100644
--- a/java/com/android/dialer/calldetails/res/values-mr/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-mr/strings.xml
@@ -1,31 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_details" msgid="5063658079729839605">"कॉल तपशील"</string>
-    <string name="delete" msgid="2141020674108406737">"हटवा"</string>
-    <string name="call_details_copy_number" msgid="4265479408878990796">"नंबर कॉपी करा"</string>
-    <string name="call_details_edit_number" msgid="8718476514903513624">"कॉल करण्यापूर्वी नंबर संपादित करा"</string>
-    <string name="call_details_report_call_id" msgid="8857541295264421217">"चुकीच्या नंबरचा अहवाल द्या"</string>
-    <string name="sent_a_photo" msgid="3978670717462979502">"एक फोटो पाठविला"</string>
-    <string name="received_a_photo" msgid="3528953225576480505">"एक फोटो प्राप्त झाला"</string>
-    <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"चुकीच्या नंबरचा अहवाल द्या"</string>
-    <string name="report_caller_id_failed" msgid="1471904930106125702">"नंबरचा अहवाल देऊ शकलो नाही"</string>
-    <string name="report_caller_id_toast" msgid="5494870403429969932">"नंबरचा अहवाल दिला"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_details">कॉल तपशील</string>
+  <string name="delete">हटवा</string>
+  <string name="call_details_copy_number">नंबर कॉपी करा</string>
+  <string name="call_details_edit_number">कॉल करण्यापूर्वी नंबर संपादित करा</string>
+  <string name="call_details_report_call_id">चुकीच्या नंबरचा अहवाल द्या</string>
+  <string name="sent_a_photo">एक फोटो पाठविला</string>
+  <string name="received_a_photo">एक फोटो प्राप्त झाला</string>
+  <string name="message_in_quotes">\"%1$s\"</string>
+  <string name="report_caller_id_dialog_title">चुकीच्या नंबरचा अहवाल द्या</string>
+  <string name="report_caller_id_failed">नंबरचा अहवाल देऊ शकलो नाही</string>
+  <string name="report_caller_id_toast">नंबरचा अहवाल दिला</string>
+  <string name="assisted_dialing_country_code_entry">साहाय्यकारी डायलिंग: वापरलेला देशाचा कोड +%1$s</string>
+  <string name="assisted_dialing_country_code_entry_failure">साहाय्यकारी डायलिंग वापरले गेले</string>
+  <string name="rtt_transcript_not_available">मेसेजिंगने केलेल्‍या कॉलसाठी फक्‍त प्रतिलेखन उपलब्‍ध आहे</string>
+  <string name="rtt_transcript_link">प्रतिलेखन पाहा</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-ms/strings.xml b/java/com/android/dialer/calldetails/res/values-ms/strings.xml
index 7c0bfdd..5e4f93a 100644
--- a/java/com/android/dialer/calldetails/res/values-ms/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-ms/strings.xml
@@ -1,31 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_details" msgid="5063658079729839605">"Butiran panggilan"</string>
-    <string name="delete" msgid="2141020674108406737">"Padam"</string>
-    <string name="call_details_copy_number" msgid="4265479408878990796">"Salin nombor"</string>
-    <string name="call_details_edit_number" msgid="8718476514903513624">"Edit nombor sebelum panggilan"</string>
-    <string name="call_details_report_call_id" msgid="8857541295264421217">"Laporkan nombor yang tidak tepat"</string>
-    <string name="sent_a_photo" msgid="3978670717462979502">"Menghantar foto"</string>
-    <string name="received_a_photo" msgid="3528953225576480505">"Foto diterima"</string>
-    <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Laporkan nombor yang tidak betul"</string>
-    <string name="report_caller_id_failed" msgid="1471904930106125702">"Tidak dapat melaporkan nombor"</string>
-    <string name="report_caller_id_toast" msgid="5494870403429969932">"Nombor dilaporkan"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_details">Butiran panggilan</string>
+  <string name="delete">Padam</string>
+  <string name="call_details_copy_number">Salin nombor</string>
+  <string name="call_details_edit_number">Edit nombor sebelum panggilan</string>
+  <string name="call_details_report_call_id">Laporkan nombor yang tidak tepat</string>
+  <string name="sent_a_photo">Menghantar foto</string>
+  <string name="received_a_photo">Foto diterima</string>
+  <string name="message_in_quotes">\"%1$s\"</string>
+  <string name="report_caller_id_dialog_title">Laporkan nombor yang tidak betul</string>
+  <string name="report_caller_id_failed">Tidak dapat melaporkan nombor</string>
+  <string name="report_caller_id_toast">Nombor dilaporkan</string>
+  <string name="assisted_dialing_country_code_entry">Pendailan berbantu : Kod negara +%1$s digunakan</string>
+  <string name="assisted_dialing_country_code_entry_failure">Pendailan berbantu digunakan</string>
+  <string name="rtt_transcript_not_available">Transkrip tersedia hanya untuk panggilan dengan pemesejan</string>
+  <string name="rtt_transcript_link">Lihat transkrip</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-my/strings.xml b/java/com/android/dialer/calldetails/res/values-my/strings.xml
index 34a57d5..94d91a1 100644
--- a/java/com/android/dialer/calldetails/res/values-my/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-my/strings.xml
@@ -1,31 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_details" msgid="5063658079729839605">"ခေါ်ဆိုမှုအသေးစိတ်"</string>
-    <string name="delete" msgid="2141020674108406737">"ဖျက်ရန်"</string>
-    <string name="call_details_copy_number" msgid="4265479408878990796">"နံပါတ်ကိုကူးယူရန်"</string>
-    <string name="call_details_edit_number" msgid="8718476514903513624">"မခေါ်ဆိုမီ နံပါတ်ကိုပြင်ဆင်ရန်"</string>
-    <string name="call_details_report_call_id" msgid="8857541295264421217">"မတိကျသော နံပါတ်ကို တိုင်ကြားရန်"</string>
-    <string name="sent_a_photo" msgid="3978670717462979502">"ဓာတ်ပုံ ပို့လိုက်သည်"</string>
-    <string name="received_a_photo" msgid="3528953225576480505">"ဓာတ်ပုံ လက်ခံရရှိသည်"</string>
-    <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"မမှန်ကန်သည့် နံပါတ်ကို တိုင်ကြားရန်"</string>
-    <string name="report_caller_id_failed" msgid="1471904930106125702">"နံပါတ်ကို မတိုင်ကြားနိုင်ပါ"</string>
-    <string name="report_caller_id_toast" msgid="5494870403429969932">"နံပါတ်ကို တိုင်ကြားပြီးပါပြီ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_details">ခေါ်ဆိုမှုအသေးစိတ်</string>
+  <string name="delete">ဖျက်ရန်</string>
+  <string name="call_details_copy_number">နံပါတ်ကိုကူးယူရန်</string>
+  <string name="call_details_edit_number">မခေါ်ဆိုမီ နံပါတ်ကိုပြင်ဆင်ရန်</string>
+  <string name="call_details_report_call_id">မတိကျသော နံပါတ်ကို တိုင်ကြားရန်</string>
+  <string name="sent_a_photo">ဓာတ်ပုံ ပို့လိုက်သည်</string>
+  <string name="received_a_photo">ဓာတ်ပုံ လက်ခံရရှိသည်</string>
+  <string name="message_in_quotes">\"%1$s\"</string>
+  <string name="report_caller_id_dialog_title">မမှန်ကန်သည့် နံပါတ်ကို တိုင်ကြားရန်</string>
+  <string name="report_caller_id_failed">နံပါတ်ကို မတိုင်ကြားနိုင်ပါ</string>
+  <string name="report_caller_id_toast">နံပါတ်ကို တိုင်ကြားပြီးပါပြီ</string>
+  <string name="assisted_dialing_country_code_entry">အထောက်အကူပြု ဖုန်းခေါ်ဆိုခြင်း - နိုင်ငံကုဒ် +%1$s ကို အသုံးပြုထားသည်</string>
+  <string name="assisted_dialing_country_code_entry_failure">အထောက်အကူပြု ဖုန်းခေါ်ဆိုခြင်းကို အသုံးပြုထားသည်</string>
+  <string name="rtt_transcript_not_available">စာပို့ခြင်း ပါဝင်သည့် ဖုန်းခေါ်ဆိုမှုများအတွက်သာ စာသားမှတ်တမ်းကို ရနိုင်ပါသည်</string>
+  <string name="rtt_transcript_link">စာသားမှတ်တမ်း ကြည့်ရန်</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-nb/strings.xml b/java/com/android/dialer/calldetails/res/values-nb/strings.xml
index 53ffd3a..44001b7 100644
--- a/java/com/android/dialer/calldetails/res/values-nb/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-nb/strings.xml
@@ -1,31 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_details" msgid="5063658079729839605">"Samtaleinformasjon"</string>
-    <string name="delete" msgid="2141020674108406737">"Slett"</string>
-    <string name="call_details_copy_number" msgid="4265479408878990796">"Kopiér nummeret"</string>
-    <string name="call_details_edit_number" msgid="8718476514903513624">"Rediger nummeret før du ringer"</string>
-    <string name="call_details_report_call_id" msgid="8857541295264421217">"Rapportér feil nummer"</string>
-    <string name="sent_a_photo" msgid="3978670717462979502">"Et bilde ble sendt"</string>
-    <string name="received_a_photo" msgid="3528953225576480505">"Et bilde ble mottatt"</string>
-    <string name="message_in_quotes" msgid="3270574830115828365">"«<xliff:g id="MESSAGE">%1$s</xliff:g>»"</string>
-    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Rapportér feil nummer"</string>
-    <string name="report_caller_id_failed" msgid="1471904930106125702">"Kunne ikke rapportere nummeret"</string>
-    <string name="report_caller_id_toast" msgid="5494870403429969932">"Nummeret er rapportert"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_details">Samtaleinformasjon</string>
+  <string name="delete">Slett</string>
+  <string name="call_details_copy_number">Kopiér nummeret</string>
+  <string name="call_details_edit_number">Rediger nummeret før du ringer</string>
+  <string name="call_details_report_call_id">Rapportér feil nummer</string>
+  <string name="sent_a_photo">Et bilde ble sendt</string>
+  <string name="received_a_photo">Et bilde ble mottatt</string>
+  <string name="message_in_quotes">«%1$s»</string>
+  <string name="report_caller_id_dialog_title">Rapportér feil nummer</string>
+  <string name="report_caller_id_failed">Kunne ikke rapportere nummeret</string>
+  <string name="report_caller_id_toast">Nummeret er rapportert</string>
+  <string name="assisted_dialing_country_code_entry">Oppringningsassistanse: Brukte landkoden +%1$s</string>
+  <string name="assisted_dialing_country_code_entry_failure">Oppringningsassistanse ble brukt</string>
+  <string name="rtt_transcript_not_available">Transkripsjoner er bare tilgjengelige for anrop med meldinger</string>
+  <string name="rtt_transcript_link">Se transkripsjonen</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-ne/strings.xml b/java/com/android/dialer/calldetails/res/values-ne/strings.xml
index f8e10ca..35889bd 100644
--- a/java/com/android/dialer/calldetails/res/values-ne/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-ne/strings.xml
@@ -1,31 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_details" msgid="5063658079729839605">"कलका विवरणहरू"</string>
-    <string name="delete" msgid="2141020674108406737">"मेट्नुहोस्"</string>
-    <string name="call_details_copy_number" msgid="4265479408878990796">"नम्बर प्रतिलिपि गर्नुहोस्"</string>
-    <string name="call_details_edit_number" msgid="8718476514903513624">"कल गर्नु अघि नम्बर सम्पादन गर्नुहोस्"</string>
-    <string name="call_details_report_call_id" msgid="8857541295264421217">"गलत नम्बरको रिपोर्ट गर्नुहोस्"</string>
-    <string name="sent_a_photo" msgid="3978670717462979502">"एउटा तस्बिर पठाइयो"</string>
-    <string name="received_a_photo" msgid="3528953225576480505">"एउटा तस्बिर प्राप्त भयो"</string>
-    <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"गलत नम्बरको रिपोर्ट गर्नुहोस्"</string>
-    <string name="report_caller_id_failed" msgid="1471904930106125702">"नम्बरको रिपोर्ट गर्न सकिएन"</string>
-    <string name="report_caller_id_toast" msgid="5494870403429969932">"नम्बरको रिपोर्ट गरियो"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_details">कलका विवरणहरू</string>
+  <string name="delete">मेट्नुहोस्</string>
+  <string name="call_details_copy_number">नम्बर प्रतिलिपि गर्नुहोस्</string>
+  <string name="call_details_edit_number">कल गर्नु अघि नम्बर सम्पादन गर्नुहोस्</string>
+  <string name="call_details_report_call_id">गलत नम्बरको रिपोर्ट गर्नुहोस्</string>
+  <string name="sent_a_photo">एउटा तस्बिर पठाइयो</string>
+  <string name="received_a_photo">एउटा तस्बिर प्राप्त भयो</string>
+  <string name="message_in_quotes">\"%1$s\"</string>
+  <string name="report_caller_id_dialog_title">गलत नम्बरको रिपोर्ट गर्नुहोस्</string>
+  <string name="report_caller_id_failed">नम्बरको रिपोर्ट गर्न सकिएन</string>
+  <string name="report_caller_id_toast">नम्बरको रिपोर्ट गरियो</string>
+  <string name="assisted_dialing_country_code_entry">स्वतः दिइने सुझावमार्फत डायलिङ: प्रयोग गरिएको देशको कोड +%1$s</string>
+  <string name="assisted_dialing_country_code_entry_failure">स्वतः दिइने सुझावमार्फत डायलिङ प्रयोग गरियो</string>
+  <string name="rtt_transcript_not_available">सन्देश प्रवाहको सुविधा भएका कलहरूमा मात्र ट्रान्सक्रिप्ट उपलब्ध छ</string>
+  <string name="rtt_transcript_link">ट्रान्सक्रिप्ट हेर्नुहोस्</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-nl/strings.xml b/java/com/android/dialer/calldetails/res/values-nl/strings.xml
index b8cb7fe..e284b31 100644
--- a/java/com/android/dialer/calldetails/res/values-nl/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-nl/strings.xml
@@ -1,31 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_details" msgid="5063658079729839605">"Gespreksgegevens"</string>
-    <string name="delete" msgid="2141020674108406737">"Verwijderen"</string>
-    <string name="call_details_copy_number" msgid="4265479408878990796">"Nummer kopiëren"</string>
-    <string name="call_details_edit_number" msgid="8718476514903513624">"Nummer bewerken vóór bellen"</string>
-    <string name="call_details_report_call_id" msgid="8857541295264421217">"Onjuist nummer melden"</string>
-    <string name="sent_a_photo" msgid="3978670717462979502">"Foto verzonden"</string>
-    <string name="received_a_photo" msgid="3528953225576480505">"Foto ontvangen"</string>
-    <string name="message_in_quotes" msgid="3270574830115828365">"\'<xliff:g id="MESSAGE">%1$s</xliff:g>\'"</string>
-    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Incorrect nummer melden"</string>
-    <string name="report_caller_id_failed" msgid="1471904930106125702">"Kan nummer niet melden"</string>
-    <string name="report_caller_id_toast" msgid="5494870403429969932">"Nummer gemeld"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_details">Gespreksgegevens</string>
+  <string name="delete">Verwijderen</string>
+  <string name="call_details_copy_number">Nummer kopiëren</string>
+  <string name="call_details_edit_number">Nummer bewerken vóór bellen</string>
+  <string name="call_details_report_call_id">Onjuist nummer melden</string>
+  <string name="sent_a_photo">Foto verzonden</string>
+  <string name="received_a_photo">Foto ontvangen</string>
+  <string name="message_in_quotes">\'%1$s\'</string>
+  <string name="report_caller_id_dialog_title">Incorrect nummer melden</string>
+  <string name="report_caller_id_failed">Kan nummer niet melden</string>
+  <string name="report_caller_id_toast">Nummer gemeld</string>
+  <string name="assisted_dialing_country_code_entry">Ondersteund bellen: landcode +%1$s gebruikt</string>
+  <string name="assisted_dialing_country_code_entry_failure">Ondersteund bellen is gebruikt</string>
+  <string name="rtt_transcript_not_available">Transcript alleen beschikbaar voor oproepen met berichten</string>
+  <string name="rtt_transcript_link">Transcript weergeven</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-no/strings.xml b/java/com/android/dialer/calldetails/res/values-no/strings.xml
index 53ffd3a..44001b7 100644
--- a/java/com/android/dialer/calldetails/res/values-no/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-no/strings.xml
@@ -1,31 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_details" msgid="5063658079729839605">"Samtaleinformasjon"</string>
-    <string name="delete" msgid="2141020674108406737">"Slett"</string>
-    <string name="call_details_copy_number" msgid="4265479408878990796">"Kopiér nummeret"</string>
-    <string name="call_details_edit_number" msgid="8718476514903513624">"Rediger nummeret før du ringer"</string>
-    <string name="call_details_report_call_id" msgid="8857541295264421217">"Rapportér feil nummer"</string>
-    <string name="sent_a_photo" msgid="3978670717462979502">"Et bilde ble sendt"</string>
-    <string name="received_a_photo" msgid="3528953225576480505">"Et bilde ble mottatt"</string>
-    <string name="message_in_quotes" msgid="3270574830115828365">"«<xliff:g id="MESSAGE">%1$s</xliff:g>»"</string>
-    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Rapportér feil nummer"</string>
-    <string name="report_caller_id_failed" msgid="1471904930106125702">"Kunne ikke rapportere nummeret"</string>
-    <string name="report_caller_id_toast" msgid="5494870403429969932">"Nummeret er rapportert"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_details">Samtaleinformasjon</string>
+  <string name="delete">Slett</string>
+  <string name="call_details_copy_number">Kopiér nummeret</string>
+  <string name="call_details_edit_number">Rediger nummeret før du ringer</string>
+  <string name="call_details_report_call_id">Rapportér feil nummer</string>
+  <string name="sent_a_photo">Et bilde ble sendt</string>
+  <string name="received_a_photo">Et bilde ble mottatt</string>
+  <string name="message_in_quotes">«%1$s»</string>
+  <string name="report_caller_id_dialog_title">Rapportér feil nummer</string>
+  <string name="report_caller_id_failed">Kunne ikke rapportere nummeret</string>
+  <string name="report_caller_id_toast">Nummeret er rapportert</string>
+  <string name="assisted_dialing_country_code_entry">Oppringningsassistanse: Brukte landkoden +%1$s</string>
+  <string name="assisted_dialing_country_code_entry_failure">Oppringningsassistanse ble brukt</string>
+  <string name="rtt_transcript_not_available">Transkripsjoner er bare tilgjengelige for anrop med meldinger</string>
+  <string name="rtt_transcript_link">Se transkripsjonen</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-pa/strings.xml b/java/com/android/dialer/calldetails/res/values-pa/strings.xml
index b488d53..8c59293 100644
--- a/java/com/android/dialer/calldetails/res/values-pa/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-pa/strings.xml
@@ -1,31 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_details" msgid="5063658079729839605">"ਕਾਲ ਵੇਰਵੇ"</string>
-    <string name="delete" msgid="2141020674108406737">"ਮਿਟਾਓ"</string>
-    <string name="call_details_copy_number" msgid="4265479408878990796">"ਨੰਬਰ ਕਾਪੀ ਕਰੋ"</string>
-    <string name="call_details_edit_number" msgid="8718476514903513624">"ਕਾਲ ਤੋਂ ਪਹਿਲਾਂ ਨੰਬਰ ਸੰਪਾਦਿਤ ਕਰੋ"</string>
-    <string name="call_details_report_call_id" msgid="8857541295264421217">"ਗਲਤ ਨੰਬਰ ਦੀ ਰਿਪੋਰਟ ਕਰੋ"</string>
-    <string name="sent_a_photo" msgid="3978670717462979502">"ਇੱਕ ਫ਼ੋਟੋ ਭੇਜੀ ਗਈ"</string>
-    <string name="received_a_photo" msgid="3528953225576480505">"ਇੱਕ ਫ਼ੋਟੋ ਪ੍ਰਾਪਤ ਹੋਈ"</string>
-    <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"ਗਲਤ ਨੰਬਰ ਦੀ ਰਿਪੋਰਟ ਕਰੋ"</string>
-    <string name="report_caller_id_failed" msgid="1471904930106125702">"ਨੰਬਰ ਦੀ ਰਿਪੋਰਟ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕੀ"</string>
-    <string name="report_caller_id_toast" msgid="5494870403429969932">"ਨੰਬਰ ਦੀ ਰਿਪੋਰਟ ਕੀਤੀ ਗਈ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_details">ਕਾਲ ਵੇਰਵੇ</string>
+  <string name="delete">ਮਿਟਾਓ</string>
+  <string name="call_details_copy_number">ਨੰਬਰ ਕਾਪੀ ਕਰੋ</string>
+  <string name="call_details_edit_number">ਕਾਲ ਤੋਂ ਪਹਿਲਾਂ ਨੰਬਰ ਸੰਪਾਦਿਤ ਕਰੋ</string>
+  <string name="call_details_report_call_id">ਗਲਤ ਨੰਬਰ ਦੀ ਰਿਪੋਰਟ ਕਰੋ</string>
+  <string name="sent_a_photo">ਇੱਕ ਫ਼ੋਟੋ ਭੇਜੀ ਗਈ</string>
+  <string name="received_a_photo">ਇੱਕ ਫ਼ੋਟੋ ਪ੍ਰਾਪਤ ਹੋਈ</string>
+  <string name="message_in_quotes">\"%1$s\"</string>
+  <string name="report_caller_id_dialog_title">ਗਲਤ ਨੰਬਰ ਦੀ ਰਿਪੋਰਟ ਕਰੋ</string>
+  <string name="report_caller_id_failed">ਨੰਬਰ ਦੀ ਰਿਪੋਰਟ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕੀ</string>
+  <string name="report_caller_id_toast">ਨੰਬਰ ਦੀ ਰਿਪੋਰਟ ਕੀਤੀ ਗਈ</string>
+  <string name="assisted_dialing_country_code_entry">ਸਹਾਇਤਾ ਪ੍ਰਾਪਤ ਡਾਇਲਿੰਗ: ਵਰਤੋਂ ਕੀਤਾ ਗਿਆ ਦੇਸ਼ ਕੋਡ +%1$s</string>
+  <string name="assisted_dialing_country_code_entry_failure">ਸਹਾਇਤਾ ਪ੍ਰਾਪਤ ਡਾਇਲਿੰਗ ਵਰਤੋਂ ਕੀਤੀ ਗਈ ਸੀ</string>
+  <string name="rtt_transcript_not_available">ਪ੍ਰਤੀਲਿਪੀ ਸਿਰਫ਼ ਸੁਨੇਹੇ ਵਾਲੀਆਂ ਕਾਲਾਂ ਲਈ ਉਪਲਬਧ ਹੈ</string>
+  <string name="rtt_transcript_link">ਪ੍ਰਤੀਲਿਪੀ ਦੇਖੋ</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-pl/strings.xml b/java/com/android/dialer/calldetails/res/values-pl/strings.xml
index 790dade..a9b1ae4 100644
--- a/java/com/android/dialer/calldetails/res/values-pl/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-pl/strings.xml
@@ -1,31 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_details" msgid="5063658079729839605">"Szczegóły połączenia"</string>
-    <string name="delete" msgid="2141020674108406737">"Usuń"</string>
-    <string name="call_details_copy_number" msgid="4265479408878990796">"Kopiuj numer"</string>
-    <string name="call_details_edit_number" msgid="8718476514903513624">"Edytuj numer, zanim zadzwonisz"</string>
-    <string name="call_details_report_call_id" msgid="8857541295264421217">"Zgłoś niedokładny numer"</string>
-    <string name="sent_a_photo" msgid="3978670717462979502">"Wysłano zdjęcie"</string>
-    <string name="received_a_photo" msgid="3528953225576480505">"Odebrano zdjęcie"</string>
-    <string name="message_in_quotes" msgid="3270574830115828365">"„<xliff:g id="MESSAGE">%1$s</xliff:g>”"</string>
-    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Zgłoś nieprawidłowy numer"</string>
-    <string name="report_caller_id_failed" msgid="1471904930106125702">"Nie udało się zgłosić numeru"</string>
-    <string name="report_caller_id_toast" msgid="5494870403429969932">"Numer został zgłoszony"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_details">Szczegóły połączenia</string>
+  <string name="delete">Usuń</string>
+  <string name="call_details_copy_number">Kopiuj numer</string>
+  <string name="call_details_edit_number">Edytuj numer, zanim zadzwonisz</string>
+  <string name="call_details_report_call_id">Zgłoś niedokładny numer</string>
+  <string name="sent_a_photo">Wysłano zdjęcie</string>
+  <string name="received_a_photo">Odebrano zdjęcie</string>
+  <string name="message_in_quotes">„%1$s”</string>
+  <string name="report_caller_id_dialog_title">Zgłoś nieprawidłowy numer</string>
+  <string name="report_caller_id_failed">Nie udało się zgłosić numeru</string>
+  <string name="report_caller_id_toast">Numer został zgłoszony</string>
+  <string name="assisted_dialing_country_code_entry">Asystent wybierania numeru: użyto kodu kraju +%1$s</string>
+  <string name="assisted_dialing_country_code_entry_failure">Użyto asystenta wybierania numeru</string>
+  <string name="rtt_transcript_not_available">Transkrypcja jest dostępna tylko w przypadku połączeń z włączonym czatem</string>
+  <string name="rtt_transcript_link">Zobacz transkrypcję</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-pt-rBR/strings.xml b/java/com/android/dialer/calldetails/res/values-pt-rBR/strings.xml
index 7cd3282..5668789 100644
--- a/java/com/android/dialer/calldetails/res/values-pt-rBR/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-pt-rBR/strings.xml
@@ -1,31 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_details" msgid="5063658079729839605">"Detalhes da chamada"</string>
-    <string name="delete" msgid="2141020674108406737">"Excluir"</string>
-    <string name="call_details_copy_number" msgid="4265479408878990796">"Copiar número"</string>
-    <string name="call_details_edit_number" msgid="8718476514903513624">"Editar número antes de ligar"</string>
-    <string name="call_details_report_call_id" msgid="8857541295264421217">"Informar número inválido"</string>
-    <string name="sent_a_photo" msgid="3978670717462979502">"Enviou uma foto"</string>
-    <string name="received_a_photo" msgid="3528953225576480505">"Recebeu uma foto"</string>
-    <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Informar número incorreto"</string>
-    <string name="report_caller_id_failed" msgid="1471904930106125702">"Não foi possível informar o número"</string>
-    <string name="report_caller_id_toast" msgid="5494870403429969932">"Número informado"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_details">Detalhes da chamada</string>
+  <string name="delete">Excluir</string>
+  <string name="call_details_copy_number">Copiar número</string>
+  <string name="call_details_edit_number">Editar número antes de ligar</string>
+  <string name="call_details_report_call_id">Informar número inválido</string>
+  <string name="sent_a_photo">Enviou uma foto</string>
+  <string name="received_a_photo">Recebeu uma foto</string>
+  <string name="message_in_quotes">\"%1$s\"</string>
+  <string name="report_caller_id_dialog_title">Informar número incorreto</string>
+  <string name="report_caller_id_failed">Não foi possível informar o número</string>
+  <string name="report_caller_id_toast">Número informado</string>
+  <string name="assisted_dialing_country_code_entry">Discagem assistida: o código do país usado é +%1$s</string>
+  <string name="assisted_dialing_country_code_entry_failure">A discagem assistida foi usada</string>
+  <string name="rtt_transcript_not_available">A transcrição só está disponível nas chamadas com mensagem de texto</string>
+  <string name="rtt_transcript_link">Ver transcrição</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-pt-rPT/strings.xml b/java/com/android/dialer/calldetails/res/values-pt-rPT/strings.xml
index 5749ebb..12b7263 100644
--- a/java/com/android/dialer/calldetails/res/values-pt-rPT/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-pt-rPT/strings.xml
@@ -1,31 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_details" msgid="5063658079729839605">"Detalhes da chamada"</string>
-    <string name="delete" msgid="2141020674108406737">"Eliminar"</string>
-    <string name="call_details_copy_number" msgid="4265479408878990796">"Copiar número"</string>
-    <string name="call_details_edit_number" msgid="8718476514903513624">"Editar o número antes de efetuar a chamada"</string>
-    <string name="call_details_report_call_id" msgid="8857541295264421217">"Denunciar número incorreto"</string>
-    <string name="sent_a_photo" msgid="3978670717462979502">"Enviou uma foto"</string>
-    <string name="received_a_photo" msgid="3528953225576480505">"Recebeu uma foto"</string>
-    <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Denunciar número incorreto"</string>
-    <string name="report_caller_id_failed" msgid="1471904930106125702">"Não foi possível denunciar o número."</string>
-    <string name="report_caller_id_toast" msgid="5494870403429969932">"Número denunciado"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_details">Detalhes da chamada</string>
+  <string name="delete">Eliminar</string>
+  <string name="call_details_copy_number">Copiar número</string>
+  <string name="call_details_edit_number">Editar o número antes de efetuar a chamada</string>
+  <string name="call_details_report_call_id">Denunciar número incorreto</string>
+  <string name="sent_a_photo">Enviou uma foto</string>
+  <string name="received_a_photo">Recebeu uma foto</string>
+  <string name="message_in_quotes">\"%1$s\"</string>
+  <string name="report_caller_id_dialog_title">Denunciar número incorreto</string>
+  <string name="report_caller_id_failed">Não foi possível denunciar o número.</string>
+  <string name="report_caller_id_toast">Número denunciado</string>
+  <string name="assisted_dialing_country_code_entry">Marcação assistida: foi utilizado o código de país +%1$s</string>
+  <string name="assisted_dialing_country_code_entry_failure">A marcação assistida foi utilizada</string>
+  <string name="rtt_transcript_not_available">A transcrição está disponível apenas para chamadas com mensagens de texto</string>
+  <string name="rtt_transcript_link">Ver transcrição</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-pt/strings.xml b/java/com/android/dialer/calldetails/res/values-pt/strings.xml
index 7cd3282..5668789 100644
--- a/java/com/android/dialer/calldetails/res/values-pt/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-pt/strings.xml
@@ -1,31 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_details" msgid="5063658079729839605">"Detalhes da chamada"</string>
-    <string name="delete" msgid="2141020674108406737">"Excluir"</string>
-    <string name="call_details_copy_number" msgid="4265479408878990796">"Copiar número"</string>
-    <string name="call_details_edit_number" msgid="8718476514903513624">"Editar número antes de ligar"</string>
-    <string name="call_details_report_call_id" msgid="8857541295264421217">"Informar número inválido"</string>
-    <string name="sent_a_photo" msgid="3978670717462979502">"Enviou uma foto"</string>
-    <string name="received_a_photo" msgid="3528953225576480505">"Recebeu uma foto"</string>
-    <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Informar número incorreto"</string>
-    <string name="report_caller_id_failed" msgid="1471904930106125702">"Não foi possível informar o número"</string>
-    <string name="report_caller_id_toast" msgid="5494870403429969932">"Número informado"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_details">Detalhes da chamada</string>
+  <string name="delete">Excluir</string>
+  <string name="call_details_copy_number">Copiar número</string>
+  <string name="call_details_edit_number">Editar número antes de ligar</string>
+  <string name="call_details_report_call_id">Informar número inválido</string>
+  <string name="sent_a_photo">Enviou uma foto</string>
+  <string name="received_a_photo">Recebeu uma foto</string>
+  <string name="message_in_quotes">\"%1$s\"</string>
+  <string name="report_caller_id_dialog_title">Informar número incorreto</string>
+  <string name="report_caller_id_failed">Não foi possível informar o número</string>
+  <string name="report_caller_id_toast">Número informado</string>
+  <string name="assisted_dialing_country_code_entry">Discagem assistida: o código do país usado é +%1$s</string>
+  <string name="assisted_dialing_country_code_entry_failure">A discagem assistida foi usada</string>
+  <string name="rtt_transcript_not_available">A transcrição só está disponível nas chamadas com mensagem de texto</string>
+  <string name="rtt_transcript_link">Ver transcrição</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-ro/strings.xml b/java/com/android/dialer/calldetails/res/values-ro/strings.xml
index 00ab0a3..3c45c62 100644
--- a/java/com/android/dialer/calldetails/res/values-ro/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-ro/strings.xml
@@ -1,31 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_details" msgid="5063658079729839605">"Detaliile apelului"</string>
-    <string name="delete" msgid="2141020674108406737">"Ștergeți"</string>
-    <string name="call_details_copy_number" msgid="4265479408878990796">"Copiați numărul"</string>
-    <string name="call_details_edit_number" msgid="8718476514903513624">"Modificați numărul înainte de apelare"</string>
-    <string name="call_details_report_call_id" msgid="8857541295264421217">"Raportați numărul ca incorect"</string>
-    <string name="sent_a_photo" msgid="3978670717462979502">"A fost trimisă o fotografie."</string>
-    <string name="received_a_photo" msgid="3528953225576480505">"A fost primită o fotografie."</string>
-    <string name="message_in_quotes" msgid="3270574830115828365">"„<xliff:g id="MESSAGE">%1$s</xliff:g>”"</string>
-    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Raportați un număr incorect"</string>
-    <string name="report_caller_id_failed" msgid="1471904930106125702">"Numărul nu a putut fi raportat."</string>
-    <string name="report_caller_id_toast" msgid="5494870403429969932">"Numărul a fost raportat."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_details">Detaliile apelului</string>
+  <string name="delete">Ștergeți</string>
+  <string name="call_details_copy_number">Copiați numărul</string>
+  <string name="call_details_edit_number">Modificați numărul înainte de apelare</string>
+  <string name="call_details_report_call_id">Raportați numărul ca incorect</string>
+  <string name="sent_a_photo">A fost trimisă o fotografie.</string>
+  <string name="received_a_photo">A fost primită o fotografie.</string>
+  <string name="message_in_quotes">„%1$s”</string>
+  <string name="report_caller_id_dialog_title">Raportați un număr incorect</string>
+  <string name="report_caller_id_failed">Numărul nu a putut fi raportat.</string>
+  <string name="report_caller_id_toast">Numărul a fost raportat.</string>
+  <string name="assisted_dialing_country_code_entry">Apelare asistată: prefix de țară folosit +%1$s</string>
+  <string name="assisted_dialing_country_code_entry_failure">S-a folosit apelarea asistată.</string>
+  <string name="rtt_transcript_not_available">Transcrierea este disponibilă numai pentru apeluri cu mesagerie</string>
+  <string name="rtt_transcript_link">Vedeți transcrierea</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-ru/strings.xml b/java/com/android/dialer/calldetails/res/values-ru/strings.xml
index b31b832..6226631 100644
--- a/java/com/android/dialer/calldetails/res/values-ru/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-ru/strings.xml
@@ -1,31 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_details" msgid="5063658079729839605">"Сведения о вызове"</string>
-    <string name="delete" msgid="2141020674108406737">"Удалить"</string>
-    <string name="call_details_copy_number" msgid="4265479408878990796">"Скопировать номер"</string>
-    <string name="call_details_edit_number" msgid="8718476514903513624">"Изменить номер перед вызовом"</string>
-    <string name="call_details_report_call_id" msgid="8857541295264421217">"Сообщить об ошибке в номере"</string>
-    <string name="sent_a_photo" msgid="3978670717462979502">"Отправлена фотография"</string>
-    <string name="received_a_photo" msgid="3528953225576480505">"Получена фотография"</string>
-    <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Неверный номер"</string>
-    <string name="report_caller_id_failed" msgid="1471904930106125702">"Не удалось отправить отчет о неверном номере"</string>
-    <string name="report_caller_id_toast" msgid="5494870403429969932">"Отчет о неверном номере отправлен"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_details">Сведения о вызове</string>
+  <string name="delete">Удалить</string>
+  <string name="call_details_copy_number">Скопировать номер</string>
+  <string name="call_details_edit_number">Изменить номер перед вызовом</string>
+  <string name="call_details_report_call_id">Сообщить об ошибке в номере</string>
+  <string name="sent_a_photo">Отправлена фотография</string>
+  <string name="received_a_photo">Получена фотография</string>
+  <string name="message_in_quotes">\"%1$s\"</string>
+  <string name="report_caller_id_dialog_title">Неверный номер</string>
+  <string name="report_caller_id_failed">Не удалось отправить отчет о неверном номере</string>
+  <string name="report_caller_id_toast">Отчет о неверном номере отправлен</string>
+  <string name="assisted_dialing_country_code_entry">Набор номера с подсказками: использовался код страны +%1$s</string>
+  <string name="assisted_dialing_country_code_entry_failure">Использовался набор номера с подсказками</string>
+  <string name="rtt_transcript_not_available">Транскрипции доступны только для вызовов с сообщениями</string>
+  <string name="rtt_transcript_link">Посмотреть транскрипцию</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-si/strings.xml b/java/com/android/dialer/calldetails/res/values-si/strings.xml
index 62968ab..6154950 100644
--- a/java/com/android/dialer/calldetails/res/values-si/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-si/strings.xml
@@ -1,31 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_details" msgid="5063658079729839605">"ඇමතුම් විස්තර"</string>
-    <string name="delete" msgid="2141020674108406737">"මකන්න"</string>
-    <string name="call_details_copy_number" msgid="4265479408878990796">"අංකය පිටපත් කරන්න"</string>
-    <string name="call_details_edit_number" msgid="8718476514903513624">"ඇමතුමට පෙර අංකය සංස්කරණය කරන්න"</string>
-    <string name="call_details_report_call_id" msgid="8857541295264421217">"වැරදි අංකය වාර්තා කරන්න"</string>
-    <string name="sent_a_photo" msgid="3978670717462979502">"ඡායාරූපයක් යැවිණි"</string>
-    <string name="received_a_photo" msgid="3528953225576480505">"ඡායාරූපයක් ලැබිණි"</string>
-    <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"වැරදි අංකය වාර්තා කරන්න"</string>
-    <string name="report_caller_id_failed" msgid="1471904930106125702">"අංකය වාර්තා කිරීමට නොහැකි විය"</string>
-    <string name="report_caller_id_toast" msgid="5494870403429969932">"අංකය වාර්තා කරන ලදී"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_details">ඇමතුම් විස්තර</string>
+  <string name="delete">මකන්න</string>
+  <string name="call_details_copy_number">අංකය පිටපත් කරන්න</string>
+  <string name="call_details_edit_number">ඇමතුමට පෙර අංකය සංස්කරණය කරන්න</string>
+  <string name="call_details_report_call_id">වැරදි අංකය වාර්තා කරන්න</string>
+  <string name="sent_a_photo">ඡායාරූපයක් යැවිණි</string>
+  <string name="received_a_photo">ඡායාරූපයක් ලැබිණි</string>
+  <string name="message_in_quotes">\"%1$s\"</string>
+  <string name="report_caller_id_dialog_title">වැරදි අංකය වාර්තා කරන්න</string>
+  <string name="report_caller_id_failed">අංකය වාර්තා කිරීමට නොහැකි විය</string>
+  <string name="report_caller_id_toast">අංකය වාර්තා කරන ලදී</string>
+  <string name="assisted_dialing_country_code_entry">සහායක ඇමතීම: රටේ කේතය +%1$s භාවිත කර</string>
+  <string name="assisted_dialing_country_code_entry_failure">සහායක ඇමතුම් භාවිත කරන ලදී</string>
+  <string name="rtt_transcript_not_available">පණිවිඩකරණය සහිත ඇමතුම් සඳහා පමණක් පිටපත ලබා ගත හැකිය</string>
+  <string name="rtt_transcript_link">පිටපත බලන්න</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-sk/strings.xml b/java/com/android/dialer/calldetails/res/values-sk/strings.xml
index ee62cbd..e70a59f 100644
--- a/java/com/android/dialer/calldetails/res/values-sk/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-sk/strings.xml
@@ -1,31 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_details" msgid="5063658079729839605">"Podrobnosti hovoru"</string>
-    <string name="delete" msgid="2141020674108406737">"Odstrániť"</string>
-    <string name="call_details_copy_number" msgid="4265479408878990796">"Kopírovať číslo"</string>
-    <string name="call_details_edit_number" msgid="8718476514903513624">"Pred volaním upraviť číslo"</string>
-    <string name="call_details_report_call_id" msgid="8857541295264421217">"Nahlásiť nesprávne číslo"</string>
-    <string name="sent_a_photo" msgid="3978670717462979502">"Bola odoslaná fotka"</string>
-    <string name="received_a_photo" msgid="3528953225576480505">"Bola prijatá fotka"</string>
-    <string name="message_in_quotes" msgid="3270574830115828365">"„<xliff:g id="MESSAGE">%1$s</xliff:g>“"</string>
-    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Nahlásenie nesprávneho čísla"</string>
-    <string name="report_caller_id_failed" msgid="1471904930106125702">"Číslo sa nepodarilo nahlásiť"</string>
-    <string name="report_caller_id_toast" msgid="5494870403429969932">"Číslo bolo nahlásené"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_details">Podrobnosti hovoru</string>
+  <string name="delete">Odstrániť</string>
+  <string name="call_details_copy_number">Kopírovať číslo</string>
+  <string name="call_details_edit_number">Pred volaním upraviť číslo</string>
+  <string name="call_details_report_call_id">Nahlásiť nesprávne číslo</string>
+  <string name="sent_a_photo">Bola odoslaná fotka</string>
+  <string name="received_a_photo">Bola prijatá fotka</string>
+  <string name="message_in_quotes">„%1$s“</string>
+  <string name="report_caller_id_dialog_title">Nahlásenie nesprávneho čísla</string>
+  <string name="report_caller_id_failed">Číslo sa nepodarilo nahlásiť</string>
+  <string name="report_caller_id_toast">Číslo bolo nahlásené</string>
+  <string name="assisted_dialing_country_code_entry">Asistované vytáčanie: bola použitá predvoľba krajiny +%1$s</string>
+  <string name="assisted_dialing_country_code_entry_failure">Bolo použité asistované vytáčanie</string>
+  <string name="rtt_transcript_not_available">Prepisy sú k dispozícii len pri hovoroch s odosielaním správ</string>
+  <string name="rtt_transcript_link">Zobraziť prepis</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-sl/strings.xml b/java/com/android/dialer/calldetails/res/values-sl/strings.xml
index 70b0e59..5a2bd1e 100644
--- a/java/com/android/dialer/calldetails/res/values-sl/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-sl/strings.xml
@@ -1,31 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_details" msgid="5063658079729839605">"Podrobnosti klica"</string>
-    <string name="delete" msgid="2141020674108406737">"Izbriši"</string>
-    <string name="call_details_copy_number" msgid="4265479408878990796">"Kopiraj številko"</string>
-    <string name="call_details_edit_number" msgid="8718476514903513624">"Pred klicanjem uredi številko"</string>
-    <string name="call_details_report_call_id" msgid="8857541295264421217">"Prijavi netočno številko"</string>
-    <string name="sent_a_photo" msgid="3978670717462979502">"Poslana fotografija"</string>
-    <string name="received_a_photo" msgid="3528953225576480505">"Prejeta fotografija"</string>
-    <string name="message_in_quotes" msgid="3270574830115828365">"»<xliff:g id="MESSAGE">%1$s</xliff:g>«"</string>
-    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Prijava napačne številke"</string>
-    <string name="report_caller_id_failed" msgid="1471904930106125702">"Številke ni bilo mogoče prijaviti"</string>
-    <string name="report_caller_id_toast" msgid="5494870403429969932">"Številka je prijavljena"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_details">Podrobnosti klica</string>
+  <string name="delete">Izbriši</string>
+  <string name="call_details_copy_number">Kopiraj številko</string>
+  <string name="call_details_edit_number">Pred klicanjem uredi številko</string>
+  <string name="call_details_report_call_id">Prijavi netočno številko</string>
+  <string name="sent_a_photo">Poslana fotografija</string>
+  <string name="received_a_photo">Prejeta fotografija</string>
+  <string name="message_in_quotes">»%1$s«</string>
+  <string name="report_caller_id_dialog_title">Prijava napačne številke</string>
+  <string name="report_caller_id_failed">Številke ni bilo mogoče prijaviti</string>
+  <string name="report_caller_id_toast">Številka je prijavljena</string>
+  <string name="assisted_dialing_country_code_entry">Klicanje s pomočjo: uporabljena koda države +%1$s</string>
+  <string name="assisted_dialing_country_code_entry_failure">Uporabljeno je bilo klicanje s pomočjo</string>
+  <string name="rtt_transcript_not_available">Prepis je na voljo samo za klice z možnostjo sporočil</string>
+  <string name="rtt_transcript_link">Prikaži prepis</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-sq/strings.xml b/java/com/android/dialer/calldetails/res/values-sq/strings.xml
index a3de4f1..607710c 100644
--- a/java/com/android/dialer/calldetails/res/values-sq/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-sq/strings.xml
@@ -1,31 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_details" msgid="5063658079729839605">"Detajet e telefonatës"</string>
-    <string name="delete" msgid="2141020674108406737">"Fshi"</string>
-    <string name="call_details_copy_number" msgid="4265479408878990796">"Kopjo numrin"</string>
-    <string name="call_details_edit_number" msgid="8718476514903513624">"Redakto numrin para telefonatës"</string>
-    <string name="call_details_report_call_id" msgid="8857541295264421217">"Raporto numrin e pasaktë"</string>
-    <string name="sent_a_photo" msgid="3978670717462979502">"U dërgua një fotografi"</string>
-    <string name="received_a_photo" msgid="3528953225576480505">"U mor një fotografi"</string>
-    <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Raporto numrin e pasaktë"</string>
-    <string name="report_caller_id_failed" msgid="1471904930106125702">"Numri nuk mund të raportohej"</string>
-    <string name="report_caller_id_toast" msgid="5494870403429969932">"Numri u raportua"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_details">Detajet e telefonatës</string>
+  <string name="delete">Fshi</string>
+  <string name="call_details_copy_number">Kopjo numrin</string>
+  <string name="call_details_edit_number">Redakto numrin para telefonatës</string>
+  <string name="call_details_report_call_id">Raporto numrin e pasaktë</string>
+  <string name="sent_a_photo">U dërgua një fotografi</string>
+  <string name="received_a_photo">U mor një fotografi</string>
+  <string name="message_in_quotes">\"%1$s\"</string>
+  <string name="report_caller_id_dialog_title">Raporto numrin e pasaktë</string>
+  <string name="report_caller_id_failed">Numri nuk mund të raportohej</string>
+  <string name="report_caller_id_toast">Numri u raportua</string>
+  <string name="assisted_dialing_country_code_entry">Telefonimi i ndihmuar: kodi i shtetit i përdorur +%1$s</string>
+  <string name="assisted_dialing_country_code_entry_failure">Është përdorur telefonimi i ndihmuar</string>
+  <string name="rtt_transcript_not_available">Transkripti ofrohet vetëm për telefonatat me mesazhe</string>
+  <string name="rtt_transcript_link">Shiko transkriptin</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-sr/strings.xml b/java/com/android/dialer/calldetails/res/values-sr/strings.xml
index 54c1550..8940871 100644
--- a/java/com/android/dialer/calldetails/res/values-sr/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-sr/strings.xml
@@ -1,31 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_details" msgid="5063658079729839605">"Детаљи позива"</string>
-    <string name="delete" msgid="2141020674108406737">"Избриши"</string>
-    <string name="call_details_copy_number" msgid="4265479408878990796">"Копирај број"</string>
-    <string name="call_details_edit_number" msgid="8718476514903513624">"Измените број пре позива"</string>
-    <string name="call_details_report_call_id" msgid="8857541295264421217">"Пријави нетачан број"</string>
-    <string name="sent_a_photo" msgid="3978670717462979502">"Слика је послата"</string>
-    <string name="received_a_photo" msgid="3528953225576480505">"Слика је примљена"</string>
-    <string name="message_in_quotes" msgid="3270574830115828365">"„<xliff:g id="MESSAGE">%1$s</xliff:g>“"</string>
-    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Пријавите нетачан број"</string>
-    <string name="report_caller_id_failed" msgid="1471904930106125702">"Пријављивање броја није успело"</string>
-    <string name="report_caller_id_toast" msgid="5494870403429969932">"Број је пријављен"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_details">Детаљи позива</string>
+  <string name="delete">Избриши</string>
+  <string name="call_details_copy_number">Копирај број</string>
+  <string name="call_details_edit_number">Измените број пре позива</string>
+  <string name="call_details_report_call_id">Пријави нетачан број</string>
+  <string name="sent_a_photo">Слика је послата</string>
+  <string name="received_a_photo">Слика је примљена</string>
+  <string name="message_in_quotes">„%1$s“</string>
+  <string name="report_caller_id_dialog_title">Пријавите нетачан број</string>
+  <string name="report_caller_id_failed">Пријављивање броја није успело</string>
+  <string name="report_caller_id_toast">Број је пријављен</string>
+  <string name="assisted_dialing_country_code_entry">Потпомогнуто бирање: користили смо позивни број за земљу +%1$s</string>
+  <string name="assisted_dialing_country_code_entry_failure">Користили сте потпомогнуто бирање</string>
+  <string name="rtt_transcript_not_available">Транскрипт је доступан само за позиве са разменом порука</string>
+  <string name="rtt_transcript_link">Прикажи транскрипт</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-sv/strings.xml b/java/com/android/dialer/calldetails/res/values-sv/strings.xml
index a7e1c12..1b2cfbe 100644
--- a/java/com/android/dialer/calldetails/res/values-sv/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-sv/strings.xml
@@ -1,31 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_details" msgid="5063658079729839605">"Samtalsinformation"</string>
-    <string name="delete" msgid="2141020674108406737">"Radera"</string>
-    <string name="call_details_copy_number" msgid="4265479408878990796">"Kopiera nummer"</string>
-    <string name="call_details_edit_number" msgid="8718476514903513624">"Redigera nummer före samtal"</string>
-    <string name="call_details_report_call_id" msgid="8857541295264421217">"Rapportera felaktigt nummer"</string>
-    <string name="sent_a_photo" msgid="3978670717462979502">"Skickade ett foto"</string>
-    <string name="received_a_photo" msgid="3528953225576480505">"Tog emot ett foto"</string>
-    <string name="message_in_quotes" msgid="3270574830115828365">"<xliff:g id="MESSAGE">%1$s</xliff:g>"</string>
-    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Rapportera felaktigt nummer"</string>
-    <string name="report_caller_id_failed" msgid="1471904930106125702">"Det gick inte att rapportera nummer"</string>
-    <string name="report_caller_id_toast" msgid="5494870403429969932">"Nummer rapporterat"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_details">Samtalsinformation</string>
+  <string name="delete">Radera</string>
+  <string name="call_details_copy_number">Kopiera nummer</string>
+  <string name="call_details_edit_number">Redigera nummer före samtal</string>
+  <string name="call_details_report_call_id">Rapportera felaktigt nummer</string>
+  <string name="sent_a_photo">Skickade ett foto</string>
+  <string name="received_a_photo">Tog emot ett foto</string>
+  <string name="message_in_quotes">%1$s</string>
+  <string name="report_caller_id_dialog_title">Rapportera felaktigt nummer</string>
+  <string name="report_caller_id_failed">Det gick inte att rapportera nummer</string>
+  <string name="report_caller_id_toast">Nummer rapporterat</string>
+  <string name="assisted_dialing_country_code_entry">Assisterad uppringning: använd landskod +%1$s</string>
+  <string name="assisted_dialing_country_code_entry_failure">Assisterad uppringning användes</string>
+  <string name="rtt_transcript_not_available">Transkription finns endast för samtal med meddelanden</string>
+  <string name="rtt_transcript_link">Visa transkription</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-sw/strings.xml b/java/com/android/dialer/calldetails/res/values-sw/strings.xml
index f19fb7b..e2c6cb5 100644
--- a/java/com/android/dialer/calldetails/res/values-sw/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-sw/strings.xml
@@ -1,31 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_details" msgid="5063658079729839605">"Maelezo ya simu"</string>
-    <string name="delete" msgid="2141020674108406737">"Futa"</string>
-    <string name="call_details_copy_number" msgid="4265479408878990796">"Nakili nambari"</string>
-    <string name="call_details_edit_number" msgid="8718476514903513624">"Hariri nambari kabla ya kupiga"</string>
-    <string name="call_details_report_call_id" msgid="8857541295264421217">"Ripoti nambari isiyo sahihi"</string>
-    <string name="sent_a_photo" msgid="3978670717462979502">"Picha imetumwa"</string>
-    <string name="received_a_photo" msgid="3528953225576480505">"Picha imepokelewa"</string>
-    <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Ripoti nambari isiyosahihi"</string>
-    <string name="report_caller_id_failed" msgid="1471904930106125702">"Imeshindwa kuripoti nambari"</string>
-    <string name="report_caller_id_toast" msgid="5494870403429969932">"Nambari imeripotiwa"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_details">Maelezo ya simu</string>
+  <string name="delete">Futa</string>
+  <string name="call_details_copy_number">Nakili nambari</string>
+  <string name="call_details_edit_number">Hariri nambari kabla ya kupiga</string>
+  <string name="call_details_report_call_id">Ripoti nambari isiyo sahihi</string>
+  <string name="sent_a_photo">Picha imetumwa</string>
+  <string name="received_a_photo">Picha imepokelewa</string>
+  <string name="message_in_quotes">\"%1$s\"</string>
+  <string name="report_caller_id_dialog_title">Ripoti nambari isiyosahihi</string>
+  <string name="report_caller_id_failed">Imeshindwa kuripoti nambari</string>
+  <string name="report_caller_id_toast">Nambari imeripotiwa</string>
+  <string name="assisted_dialing_country_code_entry">Usaidizi wa kupiga simu: Msimbo wa nchi uliotumiwa ni +%1$s</string>
+  <string name="assisted_dialing_country_code_entry_failure">Kipengele cha usaidizi wa kupiga simu kilitumika</string>
+  <string name="rtt_transcript_not_available">Nukuu hupatikana tu kwa simu zinazopigwa na ujumbe kutumwa</string>
+  <string name="rtt_transcript_link">Angalia nukuu</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-ta/strings.xml b/java/com/android/dialer/calldetails/res/values-ta/strings.xml
index 7f625f8..3603db1 100644
--- a/java/com/android/dialer/calldetails/res/values-ta/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-ta/strings.xml
@@ -1,31 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_details" msgid="5063658079729839605">"அழைப்பு விவரங்கள்"</string>
-    <string name="delete" msgid="2141020674108406737">"நீக்கு"</string>
-    <string name="call_details_copy_number" msgid="4265479408878990796">"எண்ணை நகலெடு"</string>
-    <string name="call_details_edit_number" msgid="8718476514903513624">"அழைப்பதற்கு முன் எண்ணைத் திருத்து"</string>
-    <string name="call_details_report_call_id" msgid="8857541295264421217">"துல்லியமற்ற எண் எனப் புகாரளி"</string>
-    <string name="sent_a_photo" msgid="3978670717462979502">"படம் அனுப்பப்பட்டது"</string>
-    <string name="received_a_photo" msgid="3528953225576480505">"படம் பெறப்பட்டது"</string>
-    <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"தவறான எண் எனப் புகாரளி"</string>
-    <string name="report_caller_id_failed" msgid="1471904930106125702">"எண்ணைப் புகாரளிக்க முடியவில்லை"</string>
-    <string name="report_caller_id_toast" msgid="5494870403429969932">"எண் புகாரளிக்கப்பட்டது"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_details">அழைப்பு விவரங்கள்</string>
+  <string name="delete">நீக்கு</string>
+  <string name="call_details_copy_number">எண்ணை நகலெடு</string>
+  <string name="call_details_edit_number">அழைப்பதற்கு முன் எண்ணைத் திருத்து</string>
+  <string name="call_details_report_call_id">துல்லியமற்ற எண் எனப் புகாரளி</string>
+  <string name="sent_a_photo">படம் அனுப்பப்பட்டது</string>
+  <string name="received_a_photo">படம் பெறப்பட்டது</string>
+  <string name="message_in_quotes">\"%1$s\"</string>
+  <string name="report_caller_id_dialog_title">தவறான எண் எனப் புகாரளி</string>
+  <string name="report_caller_id_failed">எண்ணைப் புகாரளிக்க முடியவில்லை</string>
+  <string name="report_caller_id_toast">எண் புகாரளிக்கப்பட்டது</string>
+  <string name="assisted_dialing_country_code_entry">அழைப்பை மேற்கொள்வதற்கான உதவி: பயன்படுத்திய நாட்டின் குறியீடு +%1$s</string>
+  <string name="assisted_dialing_country_code_entry_failure">அழைப்பை மேற்கொள்வதற்கான உதவி பயன்படுத்தப்பட்டது</string>
+  <string name="rtt_transcript_not_available">செய்தியிடல் வசதியுள்ள அழைப்புகளுக்கு மட்டுமே டிரான்ஸ்கிரிப்ட் கிடைக்கும்</string>
+  <string name="rtt_transcript_link">டிரான்ஸ்கிரிப்ட்டைக் காட்டு</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-te/strings.xml b/java/com/android/dialer/calldetails/res/values-te/strings.xml
index d6fc792..49c08d9 100644
--- a/java/com/android/dialer/calldetails/res/values-te/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-te/strings.xml
@@ -1,31 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_details" msgid="5063658079729839605">"కాల్ వివరాలు"</string>
-    <string name="delete" msgid="2141020674108406737">"తొలగించు"</string>
-    <string name="call_details_copy_number" msgid="4265479408878990796">"నంబర్‌ను కాపీ చేయి"</string>
-    <string name="call_details_edit_number" msgid="8718476514903513624">"కాల్ చేసే ముందు నంబర్‌ను సవరించు"</string>
-    <string name="call_details_report_call_id" msgid="8857541295264421217">"అనిర్దిష్టంగా ఉండే నంబర్‌ను నివేదించు"</string>
-    <string name="sent_a_photo" msgid="3978670717462979502">"ఫోటో పంపబడింది"</string>
-    <string name="received_a_photo" msgid="3528953225576480505">"ఫోటో స్వీకరించబడింది"</string>
-    <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"చెల్లని నంబర్‌ను నివేదించండి"</string>
-    <string name="report_caller_id_failed" msgid="1471904930106125702">"నంబర్‌ను నివేదించడం సాధ్యపడలేదు"</string>
-    <string name="report_caller_id_toast" msgid="5494870403429969932">"నంబర్ నివేదించబడింది"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_details">కాల్ వివరాలు</string>
+  <string name="delete">తొలగించు</string>
+  <string name="call_details_copy_number">నంబర్‌ను కాపీ చేయి</string>
+  <string name="call_details_edit_number">కాల్ చేసే ముందు నంబర్‌ను సవరించు</string>
+  <string name="call_details_report_call_id">అనిర్దిష్టంగా ఉండే నంబర్‌ను నివేదించు</string>
+  <string name="sent_a_photo">ఫోటో పంపబడింది</string>
+  <string name="received_a_photo">ఫోటో స్వీకరించబడింది</string>
+  <string name="message_in_quotes">\"%1$s\"</string>
+  <string name="report_caller_id_dialog_title">చెల్లని నంబర్‌ను నివేదించండి</string>
+  <string name="report_caller_id_failed">నంబర్‌ను నివేదించడం సాధ్యపడలేదు</string>
+  <string name="report_caller_id_toast">నంబర్ నివేదించబడింది</string>
+  <string name="assisted_dialing_country_code_entry">సహాయక డయలింగ్: ఉపయోగించిన దేశం కోడ్ +%1$s</string>
+  <string name="assisted_dialing_country_code_entry_failure">సహాయక డయలింగ్ ఉపయోగించబడింది</string>
+  <string name="rtt_transcript_not_available">లిపి మార్పు సందేశంతో కూడిన కాల్‌లకు మాత్రమే అందుబాటులో ఉంది</string>
+  <string name="rtt_transcript_link">లిపి మార్పును చూడండి</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-th/strings.xml b/java/com/android/dialer/calldetails/res/values-th/strings.xml
index 7bbcd12..6a43143 100644
--- a/java/com/android/dialer/calldetails/res/values-th/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-th/strings.xml
@@ -1,31 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_details" msgid="5063658079729839605">"รายละเอียดการโทร"</string>
-    <string name="delete" msgid="2141020674108406737">"ลบ"</string>
-    <string name="call_details_copy_number" msgid="4265479408878990796">"คัดลอกหมายเลข"</string>
-    <string name="call_details_edit_number" msgid="8718476514903513624">"แก้ไขหมายเลขก่อนโทร"</string>
-    <string name="call_details_report_call_id" msgid="8857541295264421217">"รายงานหมายเลขที่ผิดพลาด"</string>
-    <string name="sent_a_photo" msgid="3978670717462979502">"ส่งรูปภาพแล้ว"</string>
-    <string name="received_a_photo" msgid="3528953225576480505">"ได้รับรูปภาพแล้ว"</string>
-    <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"รายงานหมายเลขที่ไม่ถูกต้อง"</string>
-    <string name="report_caller_id_failed" msgid="1471904930106125702">"ไม่สามารถรายงานหมายเลข"</string>
-    <string name="report_caller_id_toast" msgid="5494870403429969932">"รายงานหมายเลขแล้ว"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_details">รายละเอียดการโทร</string>
+  <string name="delete">ลบ</string>
+  <string name="call_details_copy_number">คัดลอกหมายเลข</string>
+  <string name="call_details_edit_number">แก้ไขหมายเลขก่อนโทร</string>
+  <string name="call_details_report_call_id">รายงานหมายเลขที่ผิดพลาด</string>
+  <string name="sent_a_photo">ส่งรูปภาพแล้ว</string>
+  <string name="received_a_photo">ได้รับรูปภาพแล้ว</string>
+  <string name="message_in_quotes">\"%1$s\"</string>
+  <string name="report_caller_id_dialog_title">รายงานหมายเลขที่ไม่ถูกต้อง</string>
+  <string name="report_caller_id_failed">ไม่สามารถรายงานหมายเลข</string>
+  <string name="report_caller_id_toast">รายงานหมายเลขแล้ว</string>
+  <string name="assisted_dialing_country_code_entry">ระบบช่วยโทร: ใช้รหัสประเทศ +%1$s</string>
+  <string name="assisted_dialing_country_code_entry_failure">ใช้ระบบช่วยโทรแล้ว</string>
+  <string name="rtt_transcript_not_available">การถอดเสียงใช้ได้กับการโทรผ่านแชทเท่านั้น</string>
+  <string name="rtt_transcript_link">ดูการถอดเสียง</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-tl/strings.xml b/java/com/android/dialer/calldetails/res/values-tl/strings.xml
index 969a33a..cac5d06 100644
--- a/java/com/android/dialer/calldetails/res/values-tl/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-tl/strings.xml
@@ -1,31 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_details" msgid="5063658079729839605">"Mga detalye ng tawag"</string>
-    <string name="delete" msgid="2141020674108406737">"I-delete"</string>
-    <string name="call_details_copy_number" msgid="4265479408878990796">"Kopyahin ang numero"</string>
-    <string name="call_details_edit_number" msgid="8718476514903513624">"I-edit ang numero bago tumawag"</string>
-    <string name="call_details_report_call_id" msgid="8857541295264421217">"Iulat ang hindi wastong numero"</string>
-    <string name="sent_a_photo" msgid="3978670717462979502">"Nagpadala ng larawan"</string>
-    <string name="received_a_photo" msgid="3528953225576480505">"Nakatanggap ng larawan"</string>
-    <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Iulat ang hindi tamang numero"</string>
-    <string name="report_caller_id_failed" msgid="1471904930106125702">"Hindi maiulat ang numero"</string>
-    <string name="report_caller_id_toast" msgid="5494870403429969932">"Inulat ang numero"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_details">Mga detalye ng tawag</string>
+  <string name="delete">I-delete</string>
+  <string name="call_details_copy_number">Kopyahin ang numero</string>
+  <string name="call_details_edit_number">I-edit ang numero bago tumawag</string>
+  <string name="call_details_report_call_id">Iulat ang hindi wastong numero</string>
+  <string name="sent_a_photo">Nagpadala ng larawan</string>
+  <string name="received_a_photo">Nakatanggap ng larawan</string>
+  <string name="message_in_quotes">\"%1$s\"</string>
+  <string name="report_caller_id_dialog_title">Iulat ang hindi tamang numero</string>
+  <string name="report_caller_id_failed">Hindi maiulat ang numero</string>
+  <string name="report_caller_id_toast">Inulat ang numero</string>
+  <string name="assisted_dialing_country_code_entry">May tulong na pag-dial: Ginamit ang code ng bansa na +%1$s</string>
+  <string name="assisted_dialing_country_code_entry_failure">Gumamit ng may tulong na pag-dial</string>
+  <string name="rtt_transcript_not_available">Available lang ang transcript para sa mag tawag na may pagmemensahe</string>
+  <string name="rtt_transcript_link">Tingnan ang transcript</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-tr/strings.xml b/java/com/android/dialer/calldetails/res/values-tr/strings.xml
index 9976312..8a1b54d 100644
--- a/java/com/android/dialer/calldetails/res/values-tr/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-tr/strings.xml
@@ -1,31 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_details" msgid="5063658079729839605">"Çağrı ayrıntıları"</string>
-    <string name="delete" msgid="2141020674108406737">"Sil"</string>
-    <string name="call_details_copy_number" msgid="4265479408878990796">"Numarayı kopyala"</string>
-    <string name="call_details_edit_number" msgid="8718476514903513624">"Telefon etmeden önce numarayı düzenleyin"</string>
-    <string name="call_details_report_call_id" msgid="8857541295264421217">"Hatalı numarayı bildir"</string>
-    <string name="sent_a_photo" msgid="3978670717462979502">"Bir fotoğraf gönderildi"</string>
-    <string name="received_a_photo" msgid="3528953225576480505">"Bir fotoğraf alındı"</string>
-    <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Yanlış numarayı bildir"</string>
-    <string name="report_caller_id_failed" msgid="1471904930106125702">"Numara bildirilemedi"</string>
-    <string name="report_caller_id_toast" msgid="5494870403429969932">"Numara bildirildi"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_details">Çağrı ayrıntıları</string>
+  <string name="delete">Sil</string>
+  <string name="call_details_copy_number">Numarayı kopyala</string>
+  <string name="call_details_edit_number">Telefon etmeden önce numarayı düzenleyin</string>
+  <string name="call_details_report_call_id">Hatalı numarayı bildir</string>
+  <string name="sent_a_photo">Bir fotoğraf gönderildi</string>
+  <string name="received_a_photo">Bir fotoğraf alındı</string>
+  <string name="message_in_quotes">\"%1$s\"</string>
+  <string name="report_caller_id_dialog_title">Yanlış numarayı bildir</string>
+  <string name="report_caller_id_failed">Numara bildirilemedi</string>
+  <string name="report_caller_id_toast">Numara bildirildi</string>
+  <string name="assisted_dialing_country_code_entry">Yardımlı arama: Kullanılan ülke kodu +%1$s</string>
+  <string name="assisted_dialing_country_code_entry_failure">Yardımlı arama kullanıldı</string>
+  <string name="rtt_transcript_not_available">Çeviri yazı yalnızca mesajlaşma özelliğini destekleyen çağrılarda kullanılabilir</string>
+  <string name="rtt_transcript_link">Çeviri yazıyı görüntüleyin</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-uk/strings.xml b/java/com/android/dialer/calldetails/res/values-uk/strings.xml
index d37a54e..7489201 100644
--- a/java/com/android/dialer/calldetails/res/values-uk/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-uk/strings.xml
@@ -1,31 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_details" msgid="5063658079729839605">"Деталі виклику"</string>
-    <string name="delete" msgid="2141020674108406737">"Видалити"</string>
-    <string name="call_details_copy_number" msgid="4265479408878990796">"Копіювати номер"</string>
-    <string name="call_details_edit_number" msgid="8718476514903513624">"Редагувати номер перед дзвінком"</string>
-    <string name="call_details_report_call_id" msgid="8857541295264421217">"Повідомити про неправильний номер"</string>
-    <string name="sent_a_photo" msgid="3978670717462979502">"Надіслано фотографію"</string>
-    <string name="received_a_photo" msgid="3528953225576480505">"Отримано фотографію"</string>
-    <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Повідомити про неправильний номер"</string>
-    <string name="report_caller_id_failed" msgid="1471904930106125702">"Не вдалося повідомити про неправильний номер"</string>
-    <string name="report_caller_id_toast" msgid="5494870403429969932">"Ви повідомили про неправильний номер"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_details">Деталі виклику</string>
+  <string name="delete">Видалити</string>
+  <string name="call_details_copy_number">Копіювати номер</string>
+  <string name="call_details_edit_number">Редагувати номер перед дзвінком</string>
+  <string name="call_details_report_call_id">Повідомити про неправильний номер</string>
+  <string name="sent_a_photo">Надіслано фотографію</string>
+  <string name="received_a_photo">Отримано фотографію</string>
+  <string name="message_in_quotes">\"%1$s\"</string>
+  <string name="report_caller_id_dialog_title">Повідомити про неправильний номер</string>
+  <string name="report_caller_id_failed">Не вдалося повідомити про неправильний номер</string>
+  <string name="report_caller_id_toast">Ви повідомили про неправильний номер</string>
+  <string name="assisted_dialing_country_code_entry">Допомога з набором: використано код країни +%1$s</string>
+  <string name="assisted_dialing_country_code_entry_failure">Використано допомогу з набором</string>
+  <string name="rtt_transcript_not_available">Транскрипція доступна лише для викликів із повідомленнями</string>
+  <string name="rtt_transcript_link">Переглянути транскрипцію</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-ur/strings.xml b/java/com/android/dialer/calldetails/res/values-ur/strings.xml
index 960bef4..cfda536 100644
--- a/java/com/android/dialer/calldetails/res/values-ur/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-ur/strings.xml
@@ -1,31 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_details" msgid="5063658079729839605">"کال کی تفصیلات"</string>
-    <string name="delete" msgid="2141020674108406737">"حذف کریں"</string>
-    <string name="call_details_copy_number" msgid="4265479408878990796">"نمبر کاپی کریں"</string>
-    <string name="call_details_edit_number" msgid="8718476514903513624">"کال کرنے سے پہلے نمبر میں ترمیم کریں"</string>
-    <string name="call_details_report_call_id" msgid="8857541295264421217">"غلط نمبر کی رپورٹ کریں"</string>
-    <string name="sent_a_photo" msgid="3978670717462979502">"ایک تصویر بھیجی"</string>
-    <string name="received_a_photo" msgid="3528953225576480505">"ایک تصویر موصول ہوئی"</string>
-    <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"غلط نمبر کی اطلاع دیں"</string>
-    <string name="report_caller_id_failed" msgid="1471904930106125702">"نمبر کی اطلاع نہیں دی جا سکی"</string>
-    <string name="report_caller_id_toast" msgid="5494870403429969932">"نمبر کی اطلاع دے دی گئی"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_details">کال کی تفصیلات</string>
+  <string name="delete">حذف کریں</string>
+  <string name="call_details_copy_number">نمبر کاپی کریں</string>
+  <string name="call_details_edit_number">کال کرنے سے پہلے نمبر میں ترمیم کریں</string>
+  <string name="call_details_report_call_id">غلط نمبر کی رپورٹ کریں</string>
+  <string name="sent_a_photo">ایک تصویر بھیجی</string>
+  <string name="received_a_photo">ایک تصویر موصول ہوئی</string>
+  <string name="message_in_quotes">\"%1$s\"</string>
+  <string name="report_caller_id_dialog_title">غلط نمبر کی اطلاع دیں</string>
+  <string name="report_caller_id_failed">نمبر کی اطلاع نہیں دی جا سکی</string>
+  <string name="report_caller_id_toast">نمبر کی اطلاع دے دی گئی</string>
+  <string name="assisted_dialing_country_code_entry">‏مدد یافتہ ڈائلنگ: استعمال شدہ ملکی کوڈ ‎+%1$s‎‎</string>
+  <string name="assisted_dialing_country_code_entry_failure">مدد یافتہ ڈائلنگ کا استعمال کیا گیا</string>
+  <string name="rtt_transcript_not_available">ٹرانسکرپٹ صرف پیغام والی کالز کے لئے دستیاب ہے</string>
+  <string name="rtt_transcript_link">ٹرانسکرپٹ دیکھیں</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-uz/strings.xml b/java/com/android/dialer/calldetails/res/values-uz/strings.xml
index 57f0526..22850de 100644
--- a/java/com/android/dialer/calldetails/res/values-uz/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-uz/strings.xml
@@ -1,31 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_details" msgid="5063658079729839605">"Chaqiruv tafsilotlari"</string>
-    <string name="delete" msgid="2141020674108406737">"O‘chirib tashlash"</string>
-    <string name="call_details_copy_number" msgid="4265479408878990796">"Raqamni nusxalash"</string>
-    <string name="call_details_edit_number" msgid="8718476514903513624">"Chaqiruvdan oldin raqamni tahrirlash"</string>
-    <string name="call_details_report_call_id" msgid="8857541295264421217">"Raqamdagi xatolik haqida xabar berish"</string>
-    <string name="sent_a_photo" msgid="3978670717462979502">"Rasm yuborildi"</string>
-    <string name="received_a_photo" msgid="3528953225576480505">"Rasm qabul qilindi"</string>
-    <string name="message_in_quotes" msgid="3270574830115828365">"“<xliff:g id="MESSAGE">%1$s</xliff:g>”"</string>
-    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Noto‘g‘ri raqam"</string>
-    <string name="report_caller_id_failed" msgid="1471904930106125702">"Raqamdagi xatolik haqida xabar yuborib bo‘lmadi"</string>
-    <string name="report_caller_id_toast" msgid="5494870403429969932">"Raqamdagi xatolik haqida xabar yuborildi"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_details">Chaqiruv tafsilotlari</string>
+  <string name="delete">O‘chirib tashlash</string>
+  <string name="call_details_copy_number">Raqamni nusxalash</string>
+  <string name="call_details_edit_number">Chaqiruvdan oldin raqamni tahrirlash</string>
+  <string name="call_details_report_call_id">Raqamdagi xatolik haqida xabar berish</string>
+  <string name="sent_a_photo">Rasm yuborildi</string>
+  <string name="received_a_photo">Rasm qabul qilindi</string>
+  <string name="message_in_quotes">“%1$s”</string>
+  <string name="report_caller_id_dialog_title">Noto‘g‘ri raqam</string>
+  <string name="report_caller_id_failed">Raqamdagi xatolik haqida xabar yuborib bo‘lmadi</string>
+  <string name="report_caller_id_toast">Raqamdagi xatolik haqida xabar yuborildi</string>
+  <string name="assisted_dialing_country_code_entry">Bildirgi asosida raqam terish: +%1$s mamlakat kodi ishlatildi</string>
+  <string name="assisted_dialing_country_code_entry_failure">Bildirgi asosida raqam terildi</string>
+  <string name="rtt_transcript_not_available">Transkripsiya faqat xabar almashinuv funksiyasi yoqilgan chaqiruvlar uchun mavjud</string>
+  <string name="rtt_transcript_link">Transkripsiyani ko‘rish</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-vi/strings.xml b/java/com/android/dialer/calldetails/res/values-vi/strings.xml
index 6adae2b..e9bd002 100644
--- a/java/com/android/dialer/calldetails/res/values-vi/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-vi/strings.xml
@@ -1,31 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_details" msgid="5063658079729839605">"Chi tiết cuộc gọi"</string>
-    <string name="delete" msgid="2141020674108406737">"Xóa"</string>
-    <string name="call_details_copy_number" msgid="4265479408878990796">"Sao chép số"</string>
-    <string name="call_details_edit_number" msgid="8718476514903513624">"Chỉnh sửa số trước khi gọi"</string>
-    <string name="call_details_report_call_id" msgid="8857541295264421217">"Báo cáo số không chính xác"</string>
-    <string name="sent_a_photo" msgid="3978670717462979502">"Đã gửi một ảnh"</string>
-    <string name="received_a_photo" msgid="3528953225576480505">"Đã nhận một ảnh"</string>
-    <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Báo cáo số không chính xác"</string>
-    <string name="report_caller_id_failed" msgid="1471904930106125702">"Không thể báo cáo số"</string>
-    <string name="report_caller_id_toast" msgid="5494870403429969932">"Đã báo cáo số"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_details">Chi tiết cuộc gọi</string>
+  <string name="delete">Xóa</string>
+  <string name="call_details_copy_number">Sao chép số</string>
+  <string name="call_details_edit_number">Chỉnh sửa số trước khi gọi</string>
+  <string name="call_details_report_call_id">Báo cáo số không chính xác</string>
+  <string name="sent_a_photo">Đã gửi một ảnh</string>
+  <string name="received_a_photo">Đã nhận một ảnh</string>
+  <string name="message_in_quotes">\"%1$s\"</string>
+  <string name="report_caller_id_dialog_title">Báo cáo số không chính xác</string>
+  <string name="report_caller_id_failed">Không thể báo cáo số</string>
+  <string name="report_caller_id_toast">Đã báo cáo số</string>
+  <string name="assisted_dialing_country_code_entry">Quay số có trợ giúp: Mã quốc gia đã sử dụng +%1$s</string>
+  <string name="assisted_dialing_country_code_entry_failure">Quay số có trợ giúp đã được sử dụng</string>
+  <string name="rtt_transcript_not_available">Bản ghi chỉ có sẵn cho các cuộc gọi hỗ trợ tính năng nhắn tin</string>
+  <string name="rtt_transcript_link">Xem bản ghi</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-zh-rCN/strings.xml b/java/com/android/dialer/calldetails/res/values-zh-rCN/strings.xml
index 1edb5e1..da52b45 100644
--- a/java/com/android/dialer/calldetails/res/values-zh-rCN/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-zh-rCN/strings.xml
@@ -1,31 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_details" msgid="5063658079729839605">"通话详情"</string>
-    <string name="delete" msgid="2141020674108406737">"删除"</string>
-    <string name="call_details_copy_number" msgid="4265479408878990796">"复制号码"</string>
-    <string name="call_details_edit_number" msgid="8718476514903513624">"拨打电话之前修改号码"</string>
-    <string name="call_details_report_call_id" msgid="8857541295264421217">"报告错误的号码"</string>
-    <string name="sent_a_photo" msgid="3978670717462979502">"发送了一张照片"</string>
-    <string name="received_a_photo" msgid="3528953225576480505">"收到了一张照片"</string>
-    <string name="message_in_quotes" msgid="3270574830115828365">"“<xliff:g id="MESSAGE">%1$s</xliff:g>”"</string>
-    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"报告错误号码"</string>
-    <string name="report_caller_id_failed" msgid="1471904930106125702">"无法报告错误的号码"</string>
-    <string name="report_caller_id_toast" msgid="5494870403429969932">"已报告错误的号码"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_details">通话详情</string>
+  <string name="delete">删除</string>
+  <string name="call_details_copy_number">复制号码</string>
+  <string name="call_details_edit_number">拨打电话之前修改号码</string>
+  <string name="call_details_report_call_id">报告错误的号码</string>
+  <string name="sent_a_photo">发送了一张照片</string>
+  <string name="received_a_photo">收到了一张照片</string>
+  <string name="message_in_quotes">“%1$s”</string>
+  <string name="report_caller_id_dialog_title">报告错误号码</string>
+  <string name="report_caller_id_failed">无法报告错误的号码</string>
+  <string name="report_caller_id_toast">已报告错误的号码</string>
+  <string name="assisted_dialing_country_code_entry">辅助拨号：已使用国家/地区代码 +%1$s</string>
+  <string name="assisted_dialing_country_code_entry_failure">已使用辅助拨号功能</string>
+  <string name="rtt_transcript_not_available">只有支持实时文本通信功能的通话才能提供转录内容</string>
+  <string name="rtt_transcript_link">查看转录内容</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-zh-rHK/strings.xml b/java/com/android/dialer/calldetails/res/values-zh-rHK/strings.xml
index a82e070..08c9a36 100644
--- a/java/com/android/dialer/calldetails/res/values-zh-rHK/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-zh-rHK/strings.xml
@@ -1,31 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_details" msgid="5063658079729839605">"通話詳細資料"</string>
-    <string name="delete" msgid="2141020674108406737">"刪除"</string>
-    <string name="call_details_copy_number" msgid="4265479408878990796">"複製號碼"</string>
-    <string name="call_details_edit_number" msgid="8718476514903513624">"在撥打前編輯號碼"</string>
-    <string name="call_details_report_call_id" msgid="8857541295264421217">"報告錯誤號碼"</string>
-    <string name="sent_a_photo" msgid="3978670717462979502">"已傳送相片"</string>
-    <string name="received_a_photo" msgid="3528953225576480505">"已收到相片"</string>
-    <string name="message_in_quotes" msgid="3270574830115828365">"「<xliff:g id="MESSAGE">%1$s</xliff:g>」"</string>
-    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"報告不正確的號碼"</string>
-    <string name="report_caller_id_failed" msgid="1471904930106125702">"無法報告號碼"</string>
-    <string name="report_caller_id_toast" msgid="5494870403429969932">"已報告號碼"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_details">通話詳細資料</string>
+  <string name="delete">刪除</string>
+  <string name="call_details_copy_number">複製號碼</string>
+  <string name="call_details_edit_number">在撥打前編輯號碼</string>
+  <string name="call_details_report_call_id">報告錯誤號碼</string>
+  <string name="sent_a_photo">已傳送相片</string>
+  <string name="received_a_photo">已收到相片</string>
+  <string name="message_in_quotes">「%1$s」</string>
+  <string name="report_caller_id_dialog_title">報告不正確的號碼</string>
+  <string name="report_caller_id_failed">無法報告號碼</string>
+  <string name="report_caller_id_toast">已報告號碼</string>
+  <string name="assisted_dialing_country_code_entry">輔助撥號：使用過的國家/地區代碼 +%1$s</string>
+  <string name="assisted_dialing_country_code_entry_failure">已使用輔助撥號</string>
+  <string name="rtt_transcript_not_available">轉錄功能僅適用於短訊通話</string>
+  <string name="rtt_transcript_link">查看轉錄內容</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-zh-rTW/strings.xml b/java/com/android/dialer/calldetails/res/values-zh-rTW/strings.xml
index 3b9dd56..71825bc 100644
--- a/java/com/android/dialer/calldetails/res/values-zh-rTW/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-zh-rTW/strings.xml
@@ -1,31 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_details" msgid="5063658079729839605">"通話詳細資料"</string>
-    <string name="delete" msgid="2141020674108406737">"刪除"</string>
-    <string name="call_details_copy_number" msgid="4265479408878990796">"複製號碼"</string>
-    <string name="call_details_edit_number" msgid="8718476514903513624">"撥打電話前編輯號碼"</string>
-    <string name="call_details_report_call_id" msgid="8857541295264421217">"回報號碼錯誤"</string>
-    <string name="sent_a_photo" msgid="3978670717462979502">"傳送了 1 張相片"</string>
-    <string name="received_a_photo" msgid="3528953225576480505">"收到了 1 張相片"</string>
-    <string name="message_in_quotes" msgid="3270574830115828365">"「<xliff:g id="MESSAGE">%1$s</xliff:g>」"</string>
-    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"回報不正確的號碼"</string>
-    <string name="report_caller_id_failed" msgid="1471904930106125702">"無法回報號碼"</string>
-    <string name="report_caller_id_toast" msgid="5494870403429969932">"已回報號碼"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_details">通話詳細資料</string>
+  <string name="delete">刪除</string>
+  <string name="call_details_copy_number">複製號碼</string>
+  <string name="call_details_edit_number">撥打電話前編輯號碼</string>
+  <string name="call_details_report_call_id">回報號碼錯誤</string>
+  <string name="sent_a_photo">傳送了 1 張相片</string>
+  <string name="received_a_photo">收到了 1 張相片</string>
+  <string name="message_in_quotes">「%1$s」</string>
+  <string name="report_caller_id_dialog_title">回報不正確的號碼</string>
+  <string name="report_caller_id_failed">無法回報號碼</string>
+  <string name="report_caller_id_toast">已回報號碼</string>
+  <string name="assisted_dialing_country_code_entry">輔助撥號：已使用國家/地區代碼 +%1$s</string>
+  <string name="assisted_dialing_country_code_entry_failure">已使用輔助撥號</string>
+  <string name="rtt_transcript_not_available">只有支援訊息功能的通話才能轉錄留言</string>
+  <string name="rtt_transcript_link">查看轉錄內容</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values-zu/strings.xml b/java/com/android/dialer/calldetails/res/values-zu/strings.xml
index 25e0cea..13ecc25 100644
--- a/java/com/android/dialer/calldetails/res/values-zu/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values-zu/strings.xml
@@ -1,31 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_details" msgid="5063658079729839605">"Imininingwane yekholi"</string>
-    <string name="delete" msgid="2141020674108406737">"Susa"</string>
-    <string name="call_details_copy_number" msgid="4265479408878990796">"Kopisha inombolo"</string>
-    <string name="call_details_edit_number" msgid="8718476514903513624">"Hlela inombolo ngaphambi kokushaya ucingo"</string>
-    <string name="call_details_report_call_id" msgid="8857541295264421217">"Bika inombolo engalungile"</string>
-    <string name="sent_a_photo" msgid="3978670717462979502">"Uthumele isithombe"</string>
-    <string name="received_a_photo" msgid="3528953225576480505">"Uthole isithombe"</string>
-    <string name="message_in_quotes" msgid="3270574830115828365">"\"<xliff:g id="MESSAGE">%1$s</xliff:g>\""</string>
-    <string name="report_caller_id_dialog_title" msgid="145323726250371695">"Bika inombolo engalungile"</string>
-    <string name="report_caller_id_failed" msgid="1471904930106125702">"Ayikwazanga ukubika inombolo"</string>
-    <string name="report_caller_id_toast" msgid="5494870403429969932">"Inombolo ibikiwe"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="call_details">Imininingwane yekholi</string>
+  <string name="delete">Susa</string>
+  <string name="call_details_copy_number">Kopisha inombolo</string>
+  <string name="call_details_edit_number">Hlela inombolo ngaphambi kokushaya ucingo</string>
+  <string name="call_details_report_call_id">Bika inombolo engalungile</string>
+  <string name="sent_a_photo">Uthumele isithombe</string>
+  <string name="received_a_photo">Uthole isithombe</string>
+  <string name="message_in_quotes">\"%1$s\"</string>
+  <string name="report_caller_id_dialog_title">Bika inombolo engalungile</string>
+  <string name="report_caller_id_failed">Ayikwazanga ukubika inombolo</string>
+  <string name="report_caller_id_toast">Inombolo ibikiwe</string>
+  <string name="assisted_dialing_country_code_entry">Ukudayela okusizwayo: Ikhodi yezwe esetshenzisiwe +%1$s</string>
+  <string name="assisted_dialing_country_code_entry_failure">Ukudayela okusizwayo kusetshenzisiwe</string>
+  <string name="rtt_transcript_not_available">Umbhalo olotshiwe utholakala kuphela kumakholi anokulayeza</string>
+  <string name="rtt_transcript_link">Bona umbhalo olotshiwe</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values/strings.xml b/java/com/android/dialer/calldetails/res/values/strings.xml
index f816960..c3fff20 100644
--- a/java/com/android/dialer/calldetails/res/values/strings.xml
+++ b/java/com/android/dialer/calldetails/res/values/strings.xml
@@ -55,4 +55,10 @@
 
   <!-- A fallback string for the assisted dialing header incase parsing failes.. [CHAR LIMIT=NONE] -->
   <string name="assisted_dialing_country_code_entry_failure">Assisted dialing was used</string>
+
+  <!-- String shown when RTT transcript is not available for any reason. [CHAR LIMIT=NONE] -->
+  <string name="rtt_transcript_not_available">Transcript available only for calls with messaging</string>
+
+  <!-- String shown when RTT transcript is available. [CHAR LIMIT=NONE] -->
+  <string name="rtt_transcript_link">See transcript</string>
 </resources>
diff --git a/java/com/android/dialer/calldetails/res/values/styles.xml b/java/com/android/dialer/calldetails/res/values/styles.xml
index 1a2b529..4b861f5 100644
--- a/java/com/android/dialer/calldetails/res/values/styles.xml
+++ b/java/com/android/dialer/calldetails/res/values/styles.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
   -->
 <resources>
-  <style name="CallDetailsActionItemStyle">
+  <style name="CallDetailsActionItemStyle" parent="Dialer.TextAppearance.Secondary.Ellipsize">
     <item name="android:foreground">?android:attr/selectableItemBackground</item>
     <item name="android:clickable">true</item>
     <item name="android:drawablePadding">28dp</item>
@@ -24,7 +24,18 @@
     <item name="android:paddingEnd">28dp</item>
     <item name="android:paddingTop">16dp</item>
     <item name="android:paddingBottom">16dp</item>
-    <item name="android:textColor">#8A000000</item>
-    <item name="android:textSize">14sp</item>
+  </style>
+
+  <style name="RttTranscriptLink">
+    <item name="android:fontFamily">sans-serif-medium</item>
+    <item name="android:textColor">@color/dialer_link_color</item>
+    <item name="android:textAllCaps">true</item>
+    <item name="textAllCaps">true</item>
+  </style>
+
+  <style name="RttTranscriptMessage" parent="Dialer.TextAppearance.Secondary">
+    <item name="android:fontFamily">sans-serif</item>
+    <item name="android:textAllCaps">false</item>
+    <item name="textAllCaps">false</item>
   </style>
 </resources>
\ No newline at end of file
diff --git a/java/com/android/dialer/callintent/CallIntent.java b/java/com/android/dialer/callintent/CallIntent.java
new file mode 100644
index 0000000..ef7aff6
--- /dev/null
+++ b/java/com/android/dialer/callintent/CallIntent.java
@@ -0,0 +1,311 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.dialer.callintent;
+
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Bundle;
+import android.os.Parcel;
+import android.os.Parcelable;
+import android.os.SystemClock;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.annotation.VisibleForTesting;
+import android.telecom.PhoneAccount;
+import android.telecom.PhoneAccountHandle;
+import android.telecom.TelecomManager;
+import android.telecom.VideoProfile;
+import android.text.TextUtils;
+import com.android.dialer.common.Assert;
+import com.android.dialer.performancereport.PerformanceReport;
+import com.android.dialer.util.CallUtil;
+import com.google.auto.value.AutoValue;
+import com.google.common.collect.ImmutableMap;
+import com.google.protobuf.InvalidProtocolBufferException;
+
+/** Creates an intent to start a new outgoing call. */
+@AutoValue
+public abstract class CallIntent implements Parcelable {
+  private static int lightbringerButtonAppearInExpandedCallLogItemCount = 0;
+  private static int lightbringerButtonAppearInCollapsedCallLogItemCount = 0;
+  private static int lightbringerButtonAppearInSearchCount = 0;
+
+  abstract Uri number();
+
+  abstract CallSpecificAppData callSpecificAppData();
+
+  @Nullable
+  abstract PhoneAccountHandle phoneAccountHandle();
+
+  abstract boolean isVideoCall();
+
+  @Nullable
+  abstract String callSubject();
+
+  abstract boolean allowAssistedDial();
+
+  abstract ImmutableMap<String, String> stringInCallUiIntentExtras();
+
+  abstract ImmutableMap<String, Long> longInCallUiIntentExtras();
+
+  abstract ImmutableMap<String, String> stringPlaceCallExtras();
+
+  abstract ImmutableMap<String, Long> longPlaceCallExtras();
+
+  public static Builder builder() {
+    return new AutoValue_CallIntent.Builder().setIsVideoCall(false).setAllowAssistedDial(false);
+  }
+
+  public abstract Builder toBuilder();
+
+  /** Builder class for CallIntent info. */
+  @AutoValue.Builder
+  public abstract static class Builder {
+    public Builder setTelNumber(String number) {
+      return setNumber(CallUtil.getCallUri(Assert.isNotNull(number)));
+    }
+
+    public Builder setVoicemailNumber(@Nullable PhoneAccountHandle phoneAccountHandle) {
+      return setNumber(Uri.fromParts(PhoneAccount.SCHEME_VOICEMAIL, "", null))
+          .setPhoneAccountHandle(phoneAccountHandle);
+    }
+
+    public abstract Builder setNumber(@NonNull Uri number);
+
+    public Builder setCallInitiationType(CallInitiationType.Type callInitiationType) {
+      return setCallSpecificAppData(
+          CallSpecificAppData.newBuilder().setCallInitiationType(callInitiationType).build());
+    }
+
+    abstract CallSpecificAppData callSpecificAppData();
+
+    public abstract Builder setCallSpecificAppData(
+        @NonNull CallSpecificAppData callSpecificAppData);
+
+    public abstract Builder setPhoneAccountHandle(PhoneAccountHandle phoneAccountHandle);
+
+    public abstract Builder setIsVideoCall(boolean isVideoCall);
+
+    public abstract Builder setCallSubject(String callSubject);
+
+    public abstract Builder setAllowAssistedDial(boolean allowAssistedDial);
+
+    abstract ImmutableMap.Builder<String, String> stringInCallUiIntentExtrasBuilder();
+
+    abstract ImmutableMap.Builder<String, Long> longInCallUiIntentExtrasBuilder();
+
+    public Builder addInCallUiIntentExtra(String key, String value) {
+      stringInCallUiIntentExtrasBuilder().put(key, value);
+      return this;
+    }
+
+    public Builder addInCallUiIntentExtra(String key, Long value) {
+      longInCallUiIntentExtrasBuilder().put(key, value);
+      return this;
+    }
+
+    abstract ImmutableMap.Builder<String, String> stringPlaceCallExtrasBuilder();
+
+    abstract ImmutableMap.Builder<String, Long> longPlaceCallExtrasBuilder();
+
+    public Builder addPlaceCallExtra(String key, String value) {
+      stringPlaceCallExtrasBuilder().put(key, value);
+      return this;
+    }
+
+    public Builder addPlaceCallExtra(String key, Long value) {
+      longPlaceCallExtrasBuilder().put(key, value);
+      return this;
+    }
+
+    abstract CallIntent autoBuild();
+
+    public Intent build() {
+      CallSpecificAppData.Builder builder =
+          CallSpecificAppData.newBuilder(callSpecificAppData())
+              .setLightbringerButtonAppearInExpandedCallLogItemCount(
+                  lightbringerButtonAppearInExpandedCallLogItemCount)
+              .setLightbringerButtonAppearInCollapsedCallLogItemCount(
+                  lightbringerButtonAppearInCollapsedCallLogItemCount)
+              .setLightbringerButtonAppearInSearchCount(lightbringerButtonAppearInSearchCount);
+      lightbringerButtonAppearInExpandedCallLogItemCount = 0;
+      lightbringerButtonAppearInCollapsedCallLogItemCount = 0;
+      lightbringerButtonAppearInSearchCount = 0;
+
+      if (PerformanceReport.isRecording()) {
+        builder
+            .setTimeSinceAppLaunch(PerformanceReport.getTimeSinceAppLaunch())
+            .setTimeSinceFirstClick(PerformanceReport.getTimeSinceFirstClick())
+            .addAllUiActionsSinceAppLaunch(PerformanceReport.getActions())
+            .addAllUiActionTimestampsSinceAppLaunch(PerformanceReport.getActionTimestamps())
+            .setStartingTabIndex(PerformanceReport.getStartingTabIndex())
+            .build();
+        PerformanceReport.stopRecording();
+      }
+
+      setCallSpecificAppData(builder.build());
+
+      // Validate CallIntent.
+      CallIntent callIntent = autoBuild();
+      Assert.isNotNull(callIntent.number());
+      Assert.isNotNull(callIntent.callSpecificAppData());
+      Assert.checkArgument(
+          callIntent.callSpecificAppData().getCallInitiationType()
+              != CallInitiationType.Type.UNKNOWN_INITIATION);
+
+      return autoBuild().newIntent();
+    }
+  }
+
+  // Creates the intent which can start a call
+  private Intent newIntent() {
+    Intent intent = new Intent(Intent.ACTION_CALL, number());
+
+    intent.putExtra(
+        TelecomManager.EXTRA_START_CALL_WITH_VIDEO_STATE,
+        isVideoCall() ? VideoProfile.STATE_BIDIRECTIONAL : VideoProfile.STATE_AUDIO_ONLY);
+
+    Bundle inCallUiIntentExtras = createInCallUiIntentExtras();
+    inCallUiIntentExtras.putLong(
+        Constants.EXTRA_CALL_CREATED_TIME_MILLIS, SystemClock.elapsedRealtime());
+
+    intent.putExtra(TelecomManager.EXTRA_OUTGOING_CALL_EXTRAS, inCallUiIntentExtras);
+
+    if (phoneAccountHandle() != null) {
+      intent.putExtra(TelecomManager.EXTRA_PHONE_ACCOUNT_HANDLE, phoneAccountHandle());
+    }
+
+    if (!TextUtils.isEmpty(callSubject())) {
+      intent.putExtra(TelecomManager.EXTRA_CALL_SUBJECT, callSubject());
+    }
+
+    intent.putExtras(createPlaceCallExtras());
+
+    return intent;
+  }
+
+  private Bundle createInCallUiIntentExtras() {
+    Bundle bundle = new Bundle();
+    stringInCallUiIntentExtras().forEach(bundle::putString);
+    longInCallUiIntentExtras().forEach(bundle::putLong);
+    CallIntentParser.putCallSpecificAppData(bundle, callSpecificAppData());
+    return bundle;
+  }
+
+  private Bundle createPlaceCallExtras() {
+    Bundle bundle = new Bundle();
+    stringPlaceCallExtras().forEach(bundle::putString);
+    longPlaceCallExtras().forEach(bundle::putLong);
+    CallIntentParser.putCallSpecificAppData(bundle, callSpecificAppData());
+    return bundle;
+  }
+
+  public static void increaseLightbringerCallButtonAppearInExpandedCallLogItemCount() {
+    CallIntent.lightbringerButtonAppearInExpandedCallLogItemCount++;
+  }
+
+  public static void increaseLightbringerCallButtonAppearInCollapsedCallLogItemCount() {
+    CallIntent.lightbringerButtonAppearInCollapsedCallLogItemCount++;
+  }
+
+  public static void increaseLightbringerCallButtonAppearInSearchCount() {
+    CallIntent.lightbringerButtonAppearInSearchCount++;
+  }
+
+  @VisibleForTesting
+  public static int getLightbringerButtonAppearInExpandedCallLogItemCount() {
+    return lightbringerButtonAppearInExpandedCallLogItemCount;
+  }
+
+  @VisibleForTesting
+  public static int getLightbringerButtonAppearInCollapsedCallLogItemCount() {
+    return lightbringerButtonAppearInCollapsedCallLogItemCount;
+  }
+
+  @VisibleForTesting
+  public static int getLightbringerButtonAppearInSearchCount() {
+    return lightbringerButtonAppearInSearchCount;
+  }
+
+  @VisibleForTesting(otherwise = VisibleForTesting.NONE)
+  public static void clearLightbringerCounts() {
+    lightbringerButtonAppearInCollapsedCallLogItemCount = 0;
+    lightbringerButtonAppearInExpandedCallLogItemCount = 0;
+    lightbringerButtonAppearInSearchCount = 0;
+  }
+
+  @Override
+  public int describeContents() {
+    return 0;
+  }
+
+  @Override
+  public void writeToParcel(Parcel dest, int flags) {
+    dest.writeParcelable(number(), flags);
+    dest.writeByteArray(callSpecificAppData().toByteArray());
+    dest.writeParcelable(phoneAccountHandle(), flags);
+    dest.writeInt(isVideoCall() ? 1 : 0);
+    dest.writeString(callSubject());
+    dest.writeInt(allowAssistedDial() ? 1 : 0);
+    Bundle stringInCallUiIntentExtrasBundle = new Bundle();
+    stringInCallUiIntentExtras().forEach(stringInCallUiIntentExtrasBundle::putString);
+    dest.writeBundle(stringInCallUiIntentExtrasBundle);
+    Bundle longInCallUiIntentExtrasBundle = new Bundle();
+    longInCallUiIntentExtras().forEach(longInCallUiIntentExtrasBundle::putLong);
+    dest.writeBundle(longInCallUiIntentExtrasBundle);
+  }
+
+  // @TODO(justinmcclain): Investigate deleting the parcelable logic and instead switching
+  // to using an internal proto for serialization.
+  public static final Creator<CallIntent> CREATOR =
+      new Creator<CallIntent>() {
+        @Override
+        public CallIntent createFromParcel(Parcel source) {
+          CallIntent.Builder callIntentBuilder = builder();
+          ClassLoader classLoader = CallIntent.class.getClassLoader();
+          callIntentBuilder.setNumber(source.readParcelable(classLoader));
+          CallSpecificAppData data;
+          try {
+            data = CallSpecificAppData.parseFrom(source.createByteArray());
+          } catch (InvalidProtocolBufferException e) {
+            data = CallSpecificAppData.getDefaultInstance();
+          }
+          callIntentBuilder
+              .setCallSpecificAppData(data)
+              .setPhoneAccountHandle(source.readParcelable(classLoader))
+              .setIsVideoCall(source.readInt() != 0)
+              .setCallSubject(source.readString())
+              .setAllowAssistedDial(source.readInt() != 0);
+          Bundle stringInCallUiIntentExtrasBundle = source.readBundle(classLoader);
+          for (String key : stringInCallUiIntentExtrasBundle.keySet()) {
+            callIntentBuilder.addInCallUiIntentExtra(
+                key, stringInCallUiIntentExtrasBundle.getString(key));
+          }
+          Bundle longInCallUiIntentExtrasBundle = source.readBundle(classLoader);
+          for (String key : longInCallUiIntentExtrasBundle.keySet()) {
+            callIntentBuilder.addInCallUiIntentExtra(
+                key, longInCallUiIntentExtrasBundle.getLong(key));
+          }
+          return callIntentBuilder.autoBuild();
+        }
+
+        @Override
+        public CallIntent[] newArray(int size) {
+          return new CallIntent[0];
+        }
+      };
+}
diff --git a/java/com/android/dialer/callintent/CallIntentBuilder.java b/java/com/android/dialer/callintent/CallIntentBuilder.java
index ff490c2..613fdf6 100644
--- a/java/com/android/dialer/callintent/CallIntentBuilder.java
+++ b/java/com/android/dialer/callintent/CallIntentBuilder.java
@@ -25,6 +25,7 @@
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.annotation.VisibleForTesting;
+import android.telecom.Call.Details;
 import android.telecom.PhoneAccount;
 import android.telecom.PhoneAccountHandle;
 import android.telecom.TelecomManager;
@@ -42,10 +43,12 @@
   private final CallSpecificAppData callSpecificAppData;
   @Nullable private PhoneAccountHandle phoneAccountHandle;
   private boolean isVideoCall;
+  private boolean isDuoCall;
   private String callSubject;
   private boolean allowAssistedDial;
 
-  private final Bundle outgoingCallExtras = new Bundle();
+  private final Bundle inCallUiIntentExtras = new Bundle();
+  private final Bundle placeCallExtras = new Bundle();
 
   private static int lightbringerButtonAppearInExpandedCallLogItemCount = 0;
   private static int lightbringerButtonAppearInCollapsedCallLogItemCount = 0;
@@ -107,9 +110,10 @@
     callSpecificAppData = data;
     phoneAccountHandle = parcel.readParcelable(classLoader);
     isVideoCall = parcel.readInt() != 0;
+    isDuoCall = parcel.readInt() != 0;
     callSubject = parcel.readString();
     allowAssistedDial = parcel.readInt() != 0;
-    outgoingCallExtras.putAll(parcel.readBundle(classLoader));
+    inCallUiIntentExtras.putAll(parcel.readBundle(classLoader));
   }
 
   public static CallIntentBuilder forVoicemail(
@@ -150,6 +154,16 @@
     return isVideoCall;
   }
 
+  public CallIntentBuilder setIsDuoCall(boolean isDuoCall) {
+    this.isDuoCall = isDuoCall;
+    return this;
+  }
+
+  public boolean isDuoCall() {
+    return isDuoCall;
+  }
+
+  /** Default false. Should only be set to true if the number has a lookup URI. */
   public CallIntentBuilder setAllowAssistedDial(boolean allowAssistedDial) {
     this.allowAssistedDial = allowAssistedDial;
     return this;
@@ -168,8 +182,17 @@
     return callSubject;
   }
 
-  public Bundle getOutgoingCallExtras() {
-    return outgoingCallExtras;
+  /** Additional data the in call UI can read with {@link Details#getIntentExtras()} */
+  public Bundle getInCallUiIntentExtras() {
+    return inCallUiIntentExtras;
+  }
+
+  /**
+   * Other extras that should be used with {@link TelecomManager#placeCall(Uri, Bundle)}. This will
+   * override everything set by the CallIntentBuilder
+   */
+  public Bundle getPlaceCallExtras() {
+    return placeCallExtras;
   }
 
   /**
@@ -184,11 +207,11 @@
         TelecomManager.EXTRA_START_CALL_WITH_VIDEO_STATE,
         isVideoCall ? VideoProfile.STATE_BIDIRECTIONAL : VideoProfile.STATE_AUDIO_ONLY);
 
-    outgoingCallExtras.putLong(
+    inCallUiIntentExtras.putLong(
         Constants.EXTRA_CALL_CREATED_TIME_MILLIS, SystemClock.elapsedRealtime());
-    CallIntentParser.putCallSpecificAppData(outgoingCallExtras, callSpecificAppData);
+    CallIntentParser.putCallSpecificAppData(inCallUiIntentExtras, callSpecificAppData);
 
-    intent.putExtra(TelecomManager.EXTRA_OUTGOING_CALL_EXTRAS, outgoingCallExtras);
+    intent.putExtra(TelecomManager.EXTRA_OUTGOING_CALL_EXTRAS, inCallUiIntentExtras);
 
     if (phoneAccountHandle != null) {
       intent.putExtra(TelecomManager.EXTRA_PHONE_ACCOUNT_HANDLE, phoneAccountHandle);
@@ -198,6 +221,8 @@
       intent.putExtra(TelecomManager.EXTRA_CALL_SUBJECT, callSubject);
     }
 
+    intent.putExtras(placeCallExtras);
+
     return intent;
   }
 
@@ -253,9 +278,10 @@
     dest.writeByteArray(callSpecificAppData.toByteArray());
     dest.writeParcelable(phoneAccountHandle, flags);
     dest.writeInt(isVideoCall ? 1 : 0);
+    dest.writeInt(isDuoCall ? 1 : 0);
     dest.writeString(callSubject);
     dest.writeInt(allowAssistedDial ? 1 : 0);
-    dest.writeBundle(outgoingCallExtras);
+    dest.writeBundle(inCallUiIntentExtras);
   }
 
   public static final Creator<CallIntentBuilder> CREATOR =
diff --git a/java/com/android/dialer/callintent/call_initiation_type.proto b/java/com/android/dialer/callintent/call_initiation_type.proto
index 27d4461..3823e49 100644
--- a/java/com/android/dialer/callintent/call_initiation_type.proto
+++ b/java/com/android/dialer/callintent/call_initiation_type.proto
@@ -21,6 +21,7 @@
     DIALPAD = 2;
 
     SPEED_DIAL = 3;
+    SPEED_DIAL_DISAMBIG_DIALOG = 20;
 
     REMOTE_DIRECTORY = 4;
 
diff --git a/java/com/android/dialer/calllog/AndroidManifest.xml b/java/com/android/dialer/calllog/AndroidManifest.xml
new file mode 100644
index 0000000..27e11a0
--- /dev/null
+++ b/java/com/android/dialer/calllog/AndroidManifest.xml
@@ -0,0 +1,32 @@
+<!--
+  ~ Copyright (C) 2018 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.dialer.calllog">
+
+  <uses-sdk
+      android:minSdkVersion="24"
+      android:targetSdkVersion="28"/>
+
+  <application>
+
+    <service
+        android:exported="false"
+        android:name=".CallLogConfig$PollingJob"
+        android:permission="android.permission.BIND_JOB_SERVICE"/>
+
+  </application>
+
+</manifest>
diff --git a/java/com/android/dialer/calllog/AnnotatedCallLogMigrator.java b/java/com/android/dialer/calllog/AnnotatedCallLogMigrator.java
index e2e112c..71bfb75 100644
--- a/java/com/android/dialer/calllog/AnnotatedCallLogMigrator.java
+++ b/java/com/android/dialer/calllog/AnnotatedCallLogMigrator.java
@@ -16,12 +16,9 @@
 
 package com.android.dialer.calllog;
 
-import android.content.Context;
 import android.content.SharedPreferences;
 import com.android.dialer.common.LogUtil;
 import com.android.dialer.common.concurrent.Annotations.BackgroundExecutor;
-import com.android.dialer.configprovider.ConfigProviderBindings;
-import com.android.dialer.inject.ApplicationContext;
 import com.android.dialer.storage.Unencrypted;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
@@ -37,18 +34,15 @@
 
   private static final String PREF_MIGRATED = "annotatedCallLogMigratorMigrated";
 
-  private final Context appContext;
   private final SharedPreferences sharedPreferences;
   private final RefreshAnnotatedCallLogWorker refreshAnnotatedCallLogWorker;
   private final ListeningExecutorService backgroundExecutor;
 
   @Inject
   AnnotatedCallLogMigrator(
-      @ApplicationContext Context appContext,
       @Unencrypted SharedPreferences sharedPreferences,
       @BackgroundExecutor ListeningExecutorService backgroundExecutor,
       RefreshAnnotatedCallLogWorker refreshAnnotatedCallLogWorker) {
-    this.appContext = appContext;
     this.sharedPreferences = sharedPreferences;
     this.backgroundExecutor = backgroundExecutor;
     this.refreshAnnotatedCallLogWorker = refreshAnnotatedCallLogWorker;
@@ -78,16 +72,19 @@
   }
 
   private ListenableFuture<Boolean> shouldMigrate() {
+    return backgroundExecutor.submit(() -> !sharedPreferences.getBoolean(PREF_MIGRATED, false));
+  }
+
+  /**
+   * Clears data that indicates if migration happened or not. This is necessary if migration needs
+   * to happen again, for example because the call log framework was disabled via flags due to a
+   * problem.
+   */
+  ListenableFuture<Void> clearData() {
     return backgroundExecutor.submit(
         () -> {
-          if (!(ConfigProviderBindings.get(appContext)
-              .getBoolean("is_nui_shortcut_enabled", false))) {
-            return false;
-          }
-          if (sharedPreferences.getBoolean(PREF_MIGRATED, false)) {
-            return false;
-          }
-          return true;
+          sharedPreferences.edit().remove(PREF_MIGRATED).apply();
+          return null;
         });
   }
 }
diff --git a/java/com/android/dialer/calllog/CallLogCacheUpdater.java b/java/com/android/dialer/calllog/CallLogCacheUpdater.java
new file mode 100644
index 0000000..008e2cc
--- /dev/null
+++ b/java/com/android/dialer/calllog/CallLogCacheUpdater.java
@@ -0,0 +1,150 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.dialer.calllog;
+
+import android.content.ContentProviderOperation;
+import android.content.ContentUris;
+import android.content.ContentValues;
+import android.content.Context;
+import android.content.OperationApplicationException;
+import android.os.RemoteException;
+import android.provider.CallLog;
+import android.provider.CallLog.Calls;
+import android.provider.ContactsContract.CommonDataKinds.Phone;
+import android.support.annotation.VisibleForTesting;
+import com.android.dialer.DialerPhoneNumber;
+import com.android.dialer.NumberAttributes;
+import com.android.dialer.calllog.database.contract.AnnotatedCallLogContract.AnnotatedCallLog;
+import com.android.dialer.calllog.datasources.CallLogMutations;
+import com.android.dialer.common.LogUtil;
+import com.android.dialer.common.concurrent.Annotations.BackgroundExecutor;
+import com.android.dialer.inject.ApplicationContext;
+import com.android.dialer.protos.ProtoParsers;
+import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.ListenableFuture;
+import com.google.common.util.concurrent.ListeningExecutorService;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.stream.Stream;
+import javax.inject.Inject;
+
+/**
+ * Update {@link Calls#CACHED_NAME} and other cached columns after the annotated call log has been
+ * updated. Dialer does not read these columns but other apps relies on it.
+ */
+public final class CallLogCacheUpdater {
+
+  private final Context appContext;
+  private final ListeningExecutorService backgroundExecutor;
+  private final CallLogState callLogState;
+
+  /**
+   * Maximum numbers of operations the updater can do. Each transaction to the system call log will
+   * trigger a call log refresh, so the updater can only do a single batch. If there are more
+   * operations it will be truncated. Under normal circumstances there will only be 1 operation
+   */
+  @VisibleForTesting static final int CACHE_UPDATE_LIMIT = 100;
+
+  @Inject
+  CallLogCacheUpdater(
+      @ApplicationContext Context appContext,
+      @BackgroundExecutor ListeningExecutorService backgroundExecutor,
+      CallLogState callLogState) {
+    this.appContext = appContext;
+    this.backgroundExecutor = backgroundExecutor;
+    this.callLogState = callLogState;
+  }
+
+  /**
+   * Extracts inserts and updates from {@code mutations} to update the 'cached' columns in the
+   * system call log.
+   *
+   * <p>If the cached columns are non-empty, it will only be updated if {@link Calls#CACHED_NAME}
+   * has changed
+   */
+  public ListenableFuture<Void> updateCache(CallLogMutations mutations) {
+    return Futures.transform(
+        callLogState.isBuilt(),
+        isBuilt -> {
+          if (!isBuilt) {
+            // Initial build might need to update 1000 caches, which may overflow the batch
+            // operation limit. The initial data was already built with the cache, there's no need
+            // to update it.
+            LogUtil.i("CallLogCacheUpdater.updateCache", "not updating cache for initial build");
+            return null;
+          }
+          updateCacheInternal(mutations);
+          return null;
+        },
+        backgroundExecutor);
+  }
+
+  private void updateCacheInternal(CallLogMutations mutations) {
+    ArrayList<ContentProviderOperation> operations = new ArrayList<>();
+    Stream.concat(
+            mutations.getInserts().entrySet().stream(), mutations.getUpdates().entrySet().stream())
+        .limit(CACHE_UPDATE_LIMIT)
+        .forEach(
+            entry -> {
+              ContentValues values = entry.getValue();
+              if (!values.containsKey(AnnotatedCallLog.NUMBER_ATTRIBUTES)
+                  || !values.containsKey(AnnotatedCallLog.NUMBER)) {
+                return;
+              }
+              DialerPhoneNumber dialerPhoneNumber =
+                  ProtoParsers.getTrusted(
+                      values, AnnotatedCallLog.NUMBER, DialerPhoneNumber.getDefaultInstance());
+              NumberAttributes numberAttributes =
+                  ProtoParsers.getTrusted(
+                      values,
+                      AnnotatedCallLog.NUMBER_ATTRIBUTES,
+                      NumberAttributes.getDefaultInstance());
+              operations.add(
+                  ContentProviderOperation.newUpdate(
+                          ContentUris.withAppendedId(Calls.CONTENT_URI, entry.getKey()))
+                      .withValue(
+                          Calls.CACHED_FORMATTED_NUMBER,
+                          values.getAsString(AnnotatedCallLog.FORMATTED_NUMBER))
+                      .withValue(Calls.CACHED_LOOKUP_URI, numberAttributes.getLookupUri())
+                      // Calls.CACHED_MATCHED_NUMBER is not available.
+                      .withValue(Calls.CACHED_NAME, numberAttributes.getName())
+                      .withValue(
+                          Calls.CACHED_NORMALIZED_NUMBER, dialerPhoneNumber.getNormalizedNumber())
+                      .withValue(Calls.CACHED_NUMBER_LABEL, numberAttributes.getNumberTypeLabel())
+                      // NUMBER_TYPE is lost in NumberAttributes when it is converted to a string
+                      // label, Use TYPE_CUSTOM so the label will be displayed.
+                      .withValue(Calls.CACHED_NUMBER_TYPE, Phone.TYPE_CUSTOM)
+                      .withValue(Calls.CACHED_PHOTO_ID, numberAttributes.getPhotoId())
+                      .withValue(Calls.CACHED_PHOTO_URI, numberAttributes.getPhotoUri())
+                      // Avoid writing to the call log for insignificant changes to avoid triggering
+                      // other content observers such as the voicemail client.
+                      .withSelection(
+                          Calls.CACHED_NAME + " IS NOT ?",
+                          new String[] {numberAttributes.getName()})
+                      .build());
+            });
+    try {
+      int count =
+          Arrays.stream(appContext.getContentResolver().applyBatch(CallLog.AUTHORITY, operations))
+              .mapToInt(result -> result.count)
+              .sum();
+      LogUtil.i("CallLogCacheUpdater.updateCache", "updated %d rows", count);
+    } catch (OperationApplicationException | RemoteException e) {
+      throw new IllegalStateException(e);
+    }
+  }
+}
diff --git a/java/com/android/dialer/calllog/CallLogComponent.java b/java/com/android/dialer/calllog/CallLogComponent.java
index a2a5084..4f147f1 100644
--- a/java/com/android/dialer/calllog/CallLogComponent.java
+++ b/java/com/android/dialer/calllog/CallLogComponent.java
@@ -30,8 +30,6 @@
 
   public abstract RefreshAnnotatedCallLogWorker getRefreshAnnotatedCallLogWorker();
 
-  public abstract AnnotatedCallLogMigrator getAnnotatedCallLogMigrator();
-
   public abstract ClearMissedCalls getClearMissedCalls();
 
   public static CallLogComponent get(Context context) {
diff --git a/java/com/android/dialer/calllog/CallLogFramework.java b/java/com/android/dialer/calllog/CallLogFramework.java
index 7da8d9c..be4db06 100644
--- a/java/com/android/dialer/calllog/CallLogFramework.java
+++ b/java/com/android/dialer/calllog/CallLogFramework.java
@@ -17,10 +17,19 @@
 package com.android.dialer.calllog;
 
 import android.content.Context;
+import android.content.Intent;
+import android.support.v4.content.LocalBroadcastManager;
 import com.android.dialer.calllog.datasources.CallLogDataSource;
 import com.android.dialer.calllog.datasources.DataSources;
 import com.android.dialer.common.LogUtil;
-import com.android.dialer.configprovider.ConfigProviderBindings;
+import com.android.dialer.common.concurrent.Annotations.Ui;
+import com.android.dialer.inject.ApplicationContext;
+import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.ListenableFuture;
+import com.google.common.util.concurrent.ListeningExecutorService;
+import com.google.common.util.concurrent.MoreExecutors;
+import java.util.ArrayList;
+import java.util.List;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
@@ -32,27 +41,75 @@
 @Singleton
 public final class CallLogFramework {
 
+  private final Context appContext;
   private final DataSources dataSources;
+  private final AnnotatedCallLogMigrator annotatedCallLogMigrator;
+  private final ListeningExecutorService uiExecutor;
+  private final CallLogState callLogState;
 
   @Inject
-  CallLogFramework(DataSources dataSources) {
+  CallLogFramework(
+      @ApplicationContext Context appContext,
+      DataSources dataSources,
+      AnnotatedCallLogMigrator annotatedCallLogMigrator,
+      @Ui ListeningExecutorService uiExecutor,
+      CallLogState callLogState) {
+    this.appContext = appContext;
     this.dataSources = dataSources;
+    this.annotatedCallLogMigrator = annotatedCallLogMigrator;
+    this.uiExecutor = uiExecutor;
+    this.callLogState = callLogState;
   }
 
   /** Registers the content observers for all data sources. */
-  public void registerContentObservers(Context appContext) {
+  public void registerContentObservers() {
     LogUtil.enterBlock("CallLogFramework.registerContentObservers");
-
-    // This is the same condition used in MainImpl#isNewUiEnabled. It means that bugfood/debug
-    // users will have "new call log" content observers firing. These observers usually do simple
-    // things like writing shared preferences.
-    // TODO(zachh): Find a way to access Main#isNewUiEnabled without creating a circular dependency.
-    if (ConfigProviderBindings.get(appContext).getBoolean("is_nui_shortcut_enabled", false)) {
-      for (CallLogDataSource dataSource : dataSources.getDataSourcesIncludingSystemCallLog()) {
-        dataSource.registerContentObservers(appContext);
-      }
-    } else {
-      LogUtil.i("CallLogFramework.registerContentObservers", "not registering content observers");
+    for (CallLogDataSource dataSource : dataSources.getDataSourcesIncludingSystemCallLog()) {
+      dataSource.registerContentObservers();
     }
   }
+
+  /** Enables the framework. */
+  public ListenableFuture<Void> enable() {
+    registerContentObservers();
+    return annotatedCallLogMigrator.migrate();
+  }
+
+  /** Disables the framework. */
+  public ListenableFuture<Void> disable() {
+    return Futures.transform(
+        Futures.allAsList(disableDataSources(), annotatedCallLogMigrator.clearData()),
+        unused -> null,
+        MoreExecutors.directExecutor());
+  }
+
+  private ListenableFuture<Void> disableDataSources() {
+    LogUtil.enterBlock("CallLogFramework.disableDataSources");
+
+    for (CallLogDataSource dataSource : dataSources.getDataSourcesIncludingSystemCallLog()) {
+      dataSource.unregisterContentObservers();
+    }
+
+    callLogState.clearData();
+
+    // Clear data only after all content observers have been disabled.
+    List<ListenableFuture<Void>> allFutures = new ArrayList<>();
+    for (CallLogDataSource dataSource : dataSources.getDataSourcesIncludingSystemCallLog()) {
+      allFutures.add(dataSource.clearData());
+    }
+
+    return Futures.transform(
+        Futures.allAsList(allFutures),
+        unused -> {
+          // Send a broadcast to the OldMainActivityPeer to remove the NewCallLogFragment and
+          // NewVoicemailFragment if it is currently attached. If this is not done, user interaction
+          // with the fragment could cause call log framework state to be unexpectedly written. For
+          // example scrolling could cause the AnnotatedCallLog to be read (which would trigger
+          // database creation).
+          LocalBroadcastManager.getInstance(appContext)
+              .sendBroadcastSync(new Intent("disableCallLogFramework"));
+          return null;
+        },
+        uiExecutor);
+  }
 }
diff --git a/java/com/android/dialer/calllog/CallLogModule.java b/java/com/android/dialer/calllog/CallLogModule.java
index 6c85fd6..0e3a3be 100644
--- a/java/com/android/dialer/calllog/CallLogModule.java
+++ b/java/com/android/dialer/calllog/CallLogModule.java
@@ -16,25 +16,31 @@
 
 package com.android.dialer.calllog;
 
+import com.android.dialer.calllog.database.CallLogDatabaseModule;
 import com.android.dialer.calllog.datasources.CallLogDataSource;
 import com.android.dialer.calllog.datasources.DataSources;
 import com.android.dialer.calllog.datasources.phonelookup.PhoneLookupDataSource;
 import com.android.dialer.calllog.datasources.systemcalllog.SystemCallLogDataSource;
+import com.android.dialer.calllog.datasources.voicemail.VoicemailDataSource;
+import com.android.dialer.inject.DialerVariant;
+import com.android.dialer.inject.InstallIn;
 import com.google.common.collect.ImmutableList;
 import dagger.Module;
 import dagger.Provides;
 
 /** Dagger module which satisfies call log dependencies. */
-@Module
+@InstallIn(variants = {DialerVariant.DIALER_TEST})
+@Module(includes = CallLogDatabaseModule.class)
 public abstract class CallLogModule {
 
   @Provides
   static DataSources provideCallLogDataSources(
       SystemCallLogDataSource systemCallLogDataSource,
-      PhoneLookupDataSource phoneLookupDataSource) {
+      PhoneLookupDataSource phoneLookupDataSource,
+      VoicemailDataSource voicemailDataSource) {
     // System call log must be first, see getDataSourcesExcludingSystemCallLog below.
     ImmutableList<CallLogDataSource> allDataSources =
-        ImmutableList.of(systemCallLogDataSource, phoneLookupDataSource);
+        ImmutableList.of(systemCallLogDataSource, phoneLookupDataSource, voicemailDataSource);
     return new DataSources() {
       @Override
       public SystemCallLogDataSource getSystemCallLogDataSource() {
diff --git a/java/com/android/dialer/calllog/CallLogState.java b/java/com/android/dialer/calllog/CallLogState.java
index bdb30a7..6d2ec1e 100644
--- a/java/com/android/dialer/calllog/CallLogState.java
+++ b/java/com/android/dialer/calllog/CallLogState.java
@@ -54,6 +54,15 @@
   }
 
   /**
+   * Clear the call log state. This is useful for example if the annotated call log needs to be
+   * disabled because there was a problem.
+   */
+  @AnyThread
+  public void clearData() {
+    sharedPreferences.edit().remove(ANNOTATED_CALL_LOG_BUILT_PREF).apply();
+  }
+
+  /**
    * Returns true if the annotated call log has been built at least once.
    *
    * <p>It may not yet have been built if the user was just upgraded to the new call log, or they
diff --git a/java/com/android/dialer/calllog/ClearMissedCalls.java b/java/com/android/dialer/calllog/ClearMissedCalls.java
index d216e7b..56c8e57 100644
--- a/java/com/android/dialer/calllog/ClearMissedCalls.java
+++ b/java/com/android/dialer/calllog/ClearMissedCalls.java
@@ -38,8 +38,8 @@
 import javax.inject.Inject;
 
 /**
- * Clears missed calls. This includes cancelling notifications and updating the "NEW" status in the
- * system call log.
+ * Clears missed calls. This includes cancelling notifications and updating the "IS_READ" status in
+ * the system call log.
  */
 public final class ClearMissedCalls {
 
@@ -58,11 +58,11 @@
   }
 
   /**
-   * Cancels all missed call notifications and marks all "new" missed calls in the system call log
-   * as "not new".
+   * Cancels all missed call notifications and marks all "unread" missed calls in the system call
+   * log as "read".
    */
   public ListenableFuture<Void> clearAll() {
-    ListenableFuture<Void> markNewFuture = markNotNew(ImmutableSet.of());
+    ListenableFuture<Void> markReadFuture = markRead(ImmutableSet.of());
     ListenableFuture<Void> cancelNotificationsFuture =
         uiThreadExecutor.submit(
             () -> {
@@ -73,11 +73,11 @@
     // Note on this usage of whenAllComplete:
     //   -The returned future completes when all sub-futures complete (whether they fail or not)
     //   -The returned future fails if any sub-future fails
-    return Futures.whenAllComplete(markNewFuture, cancelNotificationsFuture)
+    return Futures.whenAllComplete(markReadFuture, cancelNotificationsFuture)
         .call(
             () -> {
               // Calling get() is necessary to propagate failures.
-              markNewFuture.get();
+              markReadFuture.get();
               cancelNotificationsFuture.get();
               return null;
             },
@@ -86,12 +86,12 @@
 
   /**
    * For the provided set of IDs from the system call log, cancels their missed call notifications
-   * and marks them "not new".
+   * and marks them "read".
    *
    * @param ids IDs from the system call log (see {@link Calls#_ID}}.
    */
   public ListenableFuture<Void> clearBySystemCallLogId(Collection<Long> ids) {
-    ListenableFuture<Void> markNewFuture = markNotNew(ids);
+    ListenableFuture<Void> markReadFuture = markRead(ids);
     ListenableFuture<Void> cancelNotificationsFuture =
         uiThreadExecutor.submit(
             () -> {
@@ -105,11 +105,11 @@
     // Note on this usage of whenAllComplete:
     //   -The returned future completes when all sub-futures complete (whether they fail or not)
     //   -The returned future fails if any sub-future fails
-    return Futures.whenAllComplete(markNewFuture, cancelNotificationsFuture)
+    return Futures.whenAllComplete(markReadFuture, cancelNotificationsFuture)
         .call(
             () -> {
               // Calling get() is necessary to propagate failures.
-              markNewFuture.get();
+              markReadFuture.get();
               cancelNotificationsFuture.get();
               return null;
             },
@@ -117,28 +117,33 @@
   }
 
   /**
-   * Marks all provided system call log IDs as not new, or if the provided collection is empty,
-   * marks all calls as not new.
+   * Marks all provided system call log IDs as read, or if the provided collection is empty, marks
+   * all calls as read.
    */
   @SuppressLint("MissingPermission")
-  private ListenableFuture<Void> markNotNew(Collection<Long> ids) {
+  private ListenableFuture<Void> markRead(Collection<Long> ids) {
     return backgroundExecutor.submit(
         () -> {
           if (!UserManagerCompat.isUserUnlocked(appContext)) {
-            LogUtil.e("ClearMissedCalls.markNotNew", "locked");
+            LogUtil.e("ClearMissedCalls.markRead", "locked");
             return null;
           }
           if (!PermissionsUtil.hasCallLogWritePermissions(appContext)) {
-            LogUtil.e("ClearMissedCalls.markNotNew", "no permission");
+            LogUtil.e("ClearMissedCalls.markRead", "no permission");
             return null;
           }
 
           ContentValues values = new ContentValues();
-          values.put(Calls.NEW, 0);
+          values.put(Calls.IS_READ, 1);
 
           Selection.Builder selectionBuilder =
               Selection.builder()
-                  .and(Selection.column(Calls.NEW).is("=", 1))
+                  .and(
+                      Selection.column(Calls.IS_READ)
+                          .is("=", 0)
+                          .buildUpon()
+                          .or(Selection.column(Calls.IS_READ).is("IS NULL"))
+                          .build())
                   .and(Selection.column(Calls.TYPE).is("=", Calls.MISSED_TYPE));
           if (!ids.isEmpty()) {
             selectionBuilder.and(Selection.column(Calls._ID).in(toStrings(ids)));
diff --git a/java/com/android/dialer/calllog/RefreshAnnotatedCallLogWorker.java b/java/com/android/dialer/calllog/RefreshAnnotatedCallLogWorker.java
index c399b05..7d6a000 100644
--- a/java/com/android/dialer/calllog/RefreshAnnotatedCallLogWorker.java
+++ b/java/com/android/dialer/calllog/RefreshAnnotatedCallLogWorker.java
@@ -26,6 +26,7 @@
 import com.android.dialer.common.LogUtil;
 import com.android.dialer.common.concurrent.Annotations.BackgroundExecutor;
 import com.android.dialer.common.concurrent.Annotations.LightweightExecutor;
+import com.android.dialer.common.concurrent.DefaultFutureCallback;
 import com.android.dialer.common.concurrent.DialerFutureSerializer;
 import com.android.dialer.common.concurrent.DialerFutures;
 import com.android.dialer.inject.ApplicationContext;
@@ -53,6 +54,7 @@
   private final MutationApplier mutationApplier;
   private final FutureTimer futureTimer;
   private final CallLogState callLogState;
+  private final CallLogCacheUpdater callLogCacheUpdater;
   private final ListeningExecutorService backgroundExecutorService;
   private final ListeningExecutorService lightweightExecutorService;
   // Used to ensure that only one refresh flow runs at a time. (Note that
@@ -67,6 +69,7 @@
       MutationApplier mutationApplier,
       FutureTimer futureTimer,
       CallLogState callLogState,
+      CallLogCacheUpdater callLogCacheUpdater,
       @BackgroundExecutor ListeningExecutorService backgroundExecutorService,
       @LightweightExecutor ListeningExecutorService lightweightExecutorService) {
     this.appContext = appContext;
@@ -75,6 +78,7 @@
     this.mutationApplier = mutationApplier;
     this.futureTimer = futureTimer;
     this.callLogState = callLogState;
+    this.callLogCacheUpdater = callLogCacheUpdater;
     this.backgroundExecutorService = backgroundExecutorService;
     this.lightweightExecutorService = lightweightExecutorService;
   }
@@ -154,10 +158,9 @@
   private ListenableFuture<Boolean> isDirty() {
     List<ListenableFuture<Boolean>> isDirtyFutures = new ArrayList<>();
     for (CallLogDataSource dataSource : dataSources.getDataSourcesIncludingSystemCallLog()) {
-      ListenableFuture<Boolean> dataSourceDirty = dataSource.isDirty(appContext);
+      ListenableFuture<Boolean> dataSourceDirty = dataSource.isDirty();
       isDirtyFutures.add(dataSourceDirty);
-      String eventName =
-          String.format(Metrics.IS_DIRTY_TEMPLATE, dataSource.getClass().getSimpleName());
+      String eventName = String.format(Metrics.IS_DIRTY_TEMPLATE, dataSource.getLoggingName());
       futureTimer.applyTiming(dataSourceDirty, eventName, LogCatMode.LOG_VALUES);
     }
     // Simultaneously invokes isDirty on all data sources, returning as soon as one returns true.
@@ -172,7 +175,7 @@
 
     // Start by filling the data sources--the system call log data source must go first!
     CallLogDataSource systemCallLogDataSource = dataSources.getSystemCallLogDataSource();
-    ListenableFuture<Void> fillFuture = systemCallLogDataSource.fill(appContext, mutations);
+    ListenableFuture<Void> fillFuture = systemCallLogDataSource.fill(mutations);
     String systemEventName = eventNameForFill(systemCallLogDataSource, isBuilt);
     futureTimer.applyTiming(fillFuture, systemEventName);
 
@@ -184,7 +187,7 @@
           Futures.transformAsync(
               fillFuture,
               unused -> {
-                ListenableFuture<Void> dataSourceFuture = dataSource.fill(appContext, mutations);
+                ListenableFuture<Void> dataSourceFuture = dataSource.fill(mutations);
                 String eventName = eventNameForFill(dataSource, isBuilt);
                 futureTimer.applyTiming(dataSourceFuture, eventName);
                 return dataSourceFuture;
@@ -207,6 +210,14 @@
             },
             lightweightExecutorService);
 
+    Futures.addCallback(
+        Futures.transformAsync(
+            applyMutationsFuture,
+            unused -> callLogCacheUpdater.updateCache(mutations),
+            MoreExecutors.directExecutor()),
+        new DefaultFutureCallback<>(),
+        MoreExecutors.directExecutor());
+
     // After mutations applied, call onSuccessfulFill for each data source (in parallel).
     ListenableFuture<List<Void>> onSuccessfulFillFuture =
         Futures.transformAsync(
@@ -215,7 +226,7 @@
               List<ListenableFuture<Void>> onSuccessfulFillFutures = new ArrayList<>();
               for (CallLogDataSource dataSource :
                   dataSources.getDataSourcesIncludingSystemCallLog()) {
-                ListenableFuture<Void> dataSourceFuture = dataSource.onSuccessfulFill(appContext);
+                ListenableFuture<Void> dataSourceFuture = dataSource.onSuccessfulFill();
                 onSuccessfulFillFutures.add(dataSourceFuture);
                 String eventName = eventNameForOnSuccessfulFill(dataSource, isBuilt);
                 futureTimer.applyTiming(dataSourceFuture, eventName);
@@ -242,7 +253,7 @@
   private static String eventNameForFill(CallLogDataSource dataSource, boolean isBuilt) {
     return String.format(
         !isBuilt ? Metrics.INITIAL_FILL_TEMPLATE : Metrics.FILL_TEMPLATE,
-        dataSource.getClass().getSimpleName());
+        dataSource.getLoggingName());
   }
 
   private static String eventNameForOverallFill(boolean isBuilt) {
@@ -255,7 +266,7 @@
         !isBuilt
             ? Metrics.INITIAL_ON_SUCCESSFUL_FILL_TEMPLATE
             : Metrics.ON_SUCCESSFUL_FILL_TEMPLATE,
-        dataSource.getClass().getSimpleName());
+        dataSource.getLoggingName());
   }
 
   private static String eventNameForOverallOnSuccessfulFill(boolean isBuilt) {
diff --git a/java/com/android/dialer/calllog/config/AndroidManifest.xml b/java/com/android/dialer/calllog/config/AndroidManifest.xml
new file mode 100644
index 0000000..2d447af
--- /dev/null
+++ b/java/com/android/dialer/calllog/config/AndroidManifest.xml
@@ -0,0 +1,32 @@
+<!--
+  ~ Copyright (C) 2018 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.dialer.calllog.config">
+
+  <uses-sdk
+      android:minSdkVersion="24"
+      android:targetSdkVersion="28"/>
+
+  <application>
+
+    <service
+        android:exported="false"
+        android:name=".CallLogConfigImpl$PollingJob"
+        android:permission="android.permission.BIND_JOB_SERVICE"/>
+
+  </application>
+
+</manifest>
diff --git a/java/com/android/dialer/calllog/config/CallLogConfig.java b/java/com/android/dialer/calllog/config/CallLogConfig.java
new file mode 100644
index 0000000..15fd5c1
--- /dev/null
+++ b/java/com/android/dialer/calllog/config/CallLogConfig.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.dialer.calllog.config;
+
+import com.google.common.util.concurrent.ListenableFuture;
+
+/** Determines if new call log components are enabled. */
+public interface CallLogConfig {
+
+  /**
+   * Updates the config values. This may kick off a lot of work so should be done infrequently, for
+   * example by a scheduled job or broadcast receiver which rarely fires.
+   */
+  ListenableFuture<Void> update();
+
+  boolean isNewCallLogFragmentEnabled();
+
+  boolean isNewVoicemailFragmentEnabled();
+
+  boolean isNewPeerEnabled();
+
+  boolean isCallLogFrameworkEnabled();
+
+  /** Schedules a job to periodically update the config. */
+  void schedulePollingJob();
+}
diff --git a/java/com/android/dialer/calllog/config/CallLogConfigComponent.java b/java/com/android/dialer/calllog/config/CallLogConfigComponent.java
new file mode 100644
index 0000000..7aaf638
--- /dev/null
+++ b/java/com/android/dialer/calllog/config/CallLogConfigComponent.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+package com.android.dialer.calllog.config;
+
+import android.content.Context;
+import com.android.dialer.inject.HasRootComponent;
+import com.android.dialer.inject.IncludeInDialerRoot;
+import dagger.Subcomponent;
+
+/** Dagger component for the call log config. */
+@Subcomponent
+public abstract class CallLogConfigComponent {
+
+  public abstract CallLogConfig callLogConfig();
+
+  public static CallLogConfigComponent get(Context context) {
+    return ((HasComponent) ((HasRootComponent) context.getApplicationContext()).component())
+        .callLogConfigComponent();
+  }
+
+  /** Used to refer to the root application component. */
+  @IncludeInDialerRoot
+  public interface HasComponent {
+    CallLogConfigComponent callLogConfigComponent();
+  }
+}
diff --git a/java/com/android/dialer/calllog/config/CallLogConfigImpl.java b/java/com/android/dialer/calllog/config/CallLogConfigImpl.java
new file mode 100644
index 0000000..9c7f472
--- /dev/null
+++ b/java/com/android/dialer/calllog/config/CallLogConfigImpl.java
@@ -0,0 +1,236 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.dialer.calllog.config;
+
+import android.annotation.SuppressLint;
+import android.app.job.JobInfo;
+import android.app.job.JobParameters;
+import android.app.job.JobScheduler;
+import android.app.job.JobService;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.support.v4.os.UserManagerCompat;
+import com.android.dialer.calllog.CallLogFramework;
+import com.android.dialer.common.Assert;
+import com.android.dialer.common.LogUtil;
+import com.android.dialer.common.concurrent.Annotations.BackgroundExecutor;
+import com.android.dialer.common.concurrent.ThreadUtil;
+import com.android.dialer.configprovider.ConfigProvider;
+import com.android.dialer.constants.ScheduledJobIds;
+import com.android.dialer.inject.ApplicationContext;
+import com.android.dialer.storage.Unencrypted;
+import com.google.common.util.concurrent.FutureCallback;
+import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.ListenableFuture;
+import com.google.common.util.concurrent.ListeningExecutorService;
+import com.google.common.util.concurrent.MoreExecutors;
+import java.util.concurrent.TimeUnit;
+import javax.inject.Inject;
+
+/**
+ * Determines if new call log components are enabled.
+ *
+ * <p>When the underlying flag values from the {@link ConfigProvider} changes, it is necessary to do
+ * work such as registering/unregistering content observers, and this class is responsible for
+ * coordinating that work.
+ *
+ * <p>New UI application components should use this class instead of reading flags directly from the
+ * {@link ConfigProvider}.
+ */
+public final class CallLogConfigImpl implements CallLogConfig {
+
+  private static final String NEW_CALL_LOG_FRAGMENT_ENABLED_PREF_KEY = "newCallLogFragmentEnabled";
+  private static final String NEW_VOICEMAIL_FRAGMENT_ENABLED_PREF_KEY =
+      "newVoicemailFragmentEnabled";
+  private static final String NEW_PEER_ENABLED_PREF_KEY = "newPeerEnabled";
+  private static final String NEW_CALL_LOG_FRAMEWORK_ENABLED_PREF_KEY =
+      "newCallLogFrameworkEnabled";
+
+  private final Context appContext;
+  private final CallLogFramework callLogFramework;
+  private final SharedPreferences sharedPreferences;
+  private final ConfigProvider configProvider;
+  private final ListeningExecutorService backgroundExecutor;
+
+  @Inject
+  public CallLogConfigImpl(
+      @ApplicationContext Context appContext,
+      CallLogFramework callLogFramework,
+      @Unencrypted SharedPreferences sharedPreferences,
+      ConfigProvider configProvider,
+      @BackgroundExecutor ListeningExecutorService backgroundExecutor) {
+    this.appContext = appContext;
+    this.callLogFramework = callLogFramework;
+    this.sharedPreferences = sharedPreferences;
+    this.configProvider = configProvider;
+    this.backgroundExecutor = backgroundExecutor;
+  }
+
+  @Override
+  public ListenableFuture<Void> update() {
+    boolean newCallLogFragmentEnabledInConfigProvider =
+        configProvider.getBoolean("new_call_log_fragment_enabled", false);
+    boolean newVoicemailFragmentEnabledInConfigProvider =
+        configProvider.getBoolean("new_voicemail_fragment_enabled", false);
+    boolean newPeerEnabledInConfigProvider = configProvider.getBoolean("nui_peer_enabled", false);
+
+    boolean isCallLogFrameworkEnabled = isCallLogFrameworkEnabled();
+    boolean callLogFrameworkShouldBeEnabled =
+        newCallLogFragmentEnabledInConfigProvider
+            || newVoicemailFragmentEnabledInConfigProvider
+            || newPeerEnabledInConfigProvider;
+
+    if (callLogFrameworkShouldBeEnabled && !isCallLogFrameworkEnabled) {
+      return Futures.transform(
+          callLogFramework.enable(),
+          unused -> {
+            // Reflect the flag changes only after the framework is enabled.
+            sharedPreferences
+                .edit()
+                .putBoolean(
+                    NEW_CALL_LOG_FRAGMENT_ENABLED_PREF_KEY,
+                    newCallLogFragmentEnabledInConfigProvider)
+                .putBoolean(
+                    NEW_VOICEMAIL_FRAGMENT_ENABLED_PREF_KEY,
+                    newVoicemailFragmentEnabledInConfigProvider)
+                .putBoolean(NEW_PEER_ENABLED_PREF_KEY, newPeerEnabledInConfigProvider)
+                .putBoolean(NEW_CALL_LOG_FRAMEWORK_ENABLED_PREF_KEY, true)
+                .apply();
+            return null;
+          },
+          backgroundExecutor);
+    } else if (!callLogFrameworkShouldBeEnabled && isCallLogFrameworkEnabled) {
+      // Reflect the flag changes before disabling the framework.
+      ListenableFuture<Void> writeSharedPrefsFuture =
+          backgroundExecutor.submit(
+              () -> {
+                sharedPreferences
+                    .edit()
+                    .putBoolean(NEW_CALL_LOG_FRAGMENT_ENABLED_PREF_KEY, false)
+                    .putBoolean(NEW_VOICEMAIL_FRAGMENT_ENABLED_PREF_KEY, false)
+                    .putBoolean(NEW_PEER_ENABLED_PREF_KEY, false)
+                    .putBoolean(NEW_CALL_LOG_FRAMEWORK_ENABLED_PREF_KEY, false)
+                    .apply();
+                return null;
+              });
+      return Futures.transformAsync(
+          writeSharedPrefsFuture,
+          unused -> callLogFramework.disable(),
+          MoreExecutors.directExecutor());
+    } else {
+      // We didn't need to enable/disable the framework, but we still need to update the
+      // individual flags.
+      return backgroundExecutor.submit(
+          () -> {
+            sharedPreferences
+                .edit()
+                .putBoolean(
+                    NEW_CALL_LOG_FRAGMENT_ENABLED_PREF_KEY,
+                    newCallLogFragmentEnabledInConfigProvider)
+                .putBoolean(
+                    NEW_VOICEMAIL_FRAGMENT_ENABLED_PREF_KEY,
+                    newVoicemailFragmentEnabledInConfigProvider)
+                .putBoolean(NEW_PEER_ENABLED_PREF_KEY, newPeerEnabledInConfigProvider)
+                .apply();
+            return null;
+          });
+    }
+  }
+
+  @Override
+  public boolean isNewCallLogFragmentEnabled() {
+    return sharedPreferences.getBoolean(NEW_CALL_LOG_FRAGMENT_ENABLED_PREF_KEY, false);
+  }
+
+  @Override
+  public boolean isNewVoicemailFragmentEnabled() {
+    return sharedPreferences.getBoolean(NEW_VOICEMAIL_FRAGMENT_ENABLED_PREF_KEY, false);
+  }
+
+  @Override
+  public boolean isNewPeerEnabled() {
+    return sharedPreferences.getBoolean(NEW_PEER_ENABLED_PREF_KEY, false);
+  }
+
+  /**
+   * Returns true if the new call log framework is enabled, meaning that content observers are
+   * firing and PhoneLookupHistory is being populated, etc.
+   */
+  @Override
+  public boolean isCallLogFrameworkEnabled() {
+    return sharedPreferences.getBoolean(NEW_CALL_LOG_FRAMEWORK_ENABLED_PREF_KEY, false);
+  }
+
+  @Override
+  public void schedulePollingJob() {
+    if (UserManagerCompat.isUserUnlocked(appContext)) {
+      JobScheduler jobScheduler = Assert.isNotNull(appContext.getSystemService(JobScheduler.class));
+      @SuppressLint("MissingPermission") // Dialer has RECEIVE_BOOT permission
+      JobInfo jobInfo =
+          new JobInfo.Builder(
+                  ScheduledJobIds.CALL_LOG_CONFIG_POLLING_JOB,
+                  new ComponentName(appContext, PollingJob.class))
+              .setPeriodic(TimeUnit.HOURS.toMillis(24))
+              .setPersisted(true)
+              .setRequiresCharging(true)
+              .setRequiresDeviceIdle(true)
+              .build();
+      LogUtil.i("CallLogConfigImpl.schedulePollingJob", "scheduling");
+      jobScheduler.schedule(jobInfo);
+    }
+  }
+
+  /**
+   * Job which periodically force updates the {@link CallLogConfig}. This job is necessary to
+   * support {@link ConfigProvider ConfigProviders} which do not provide a reliable mechanism for
+   * listening to changes and calling {@link CallLogConfig#update()} directly, such as the {@link
+   * com.android.dialer.configprovider.SharedPrefConfigProvider}.
+   */
+  public static final class PollingJob extends JobService {
+
+    @Override
+    public boolean onStartJob(JobParameters params) {
+      LogUtil.enterBlock("PollingJob.onStartJob");
+      Futures.addCallback(
+          CallLogConfigComponent.get(getApplicationContext()).callLogConfig().update(),
+          new FutureCallback<Void>() {
+            @Override
+            public void onSuccess(Void unused) {
+              jobFinished(params, false /* needsReschedule */);
+            }
+
+            @Override
+            public void onFailure(Throwable throwable) {
+              ThreadUtil.getUiThreadHandler()
+                  .post(
+                      () -> {
+                        throw new RuntimeException(throwable);
+                      });
+              jobFinished(params, false /* needsReschedule */);
+            }
+          },
+          MoreExecutors.directExecutor());
+      return true;
+    }
+
+    @Override
+    public boolean onStopJob(JobParameters params) {
+      return false;
+    }
+  }
+}
diff --git a/java/com/android/dialer/calllog/config/CallLogConfigModule.java b/java/com/android/dialer/calllog/config/CallLogConfigModule.java
new file mode 100644
index 0000000..d982e2b
--- /dev/null
+++ b/java/com/android/dialer/calllog/config/CallLogConfigModule.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.dialer.calllog.config;
+
+import dagger.Binds;
+import dagger.Module;
+
+/** Binds {@link CallLogConfigImpl}. */
+@Module
+public abstract class CallLogConfigModule {
+  @Binds
+  abstract CallLogConfig to(CallLogConfigImpl impl);
+}
diff --git a/java/com/android/dialer/calllog/database/AnnotatedCallLogConstraints.java b/java/com/android/dialer/calllog/database/AnnotatedCallLogConstraints.java
new file mode 100644
index 0000000..3dc8514
--- /dev/null
+++ b/java/com/android/dialer/calllog/database/AnnotatedCallLogConstraints.java
@@ -0,0 +1,117 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.dialer.calllog.database;
+
+import android.content.ContentValues;
+import android.provider.CallLog.Calls;
+import android.support.annotation.IntDef;
+import com.android.dialer.calllog.database.contract.AnnotatedCallLogContract.AnnotatedCallLog;
+import com.android.dialer.common.Assert;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.util.function.Predicate;
+
+/** Constraints for columns in the {@link AnnotatedCallLog}. */
+final class AnnotatedCallLogConstraints {
+
+  /** Type of operation the {@link ContentValues} to be checked is used for. */
+  @Retention(RetentionPolicy.SOURCE)
+  @IntDef({Operation.INSERT, Operation.UPDATE})
+  @interface Operation {
+    int INSERT = 1;
+    int UPDATE = 2;
+  }
+
+  private AnnotatedCallLogConstraints() {}
+
+  /**
+   * Checks if the given {@link ContentValues} meets the constraints defined in this class. An
+   * {@link IllegalArgumentException} will be thrown if it doesn't.
+   */
+  public static void check(ContentValues contentValues, @Operation int operationType) {
+    checkBooleanColumn(AnnotatedCallLog.IS_READ, contentValues, operationType);
+    checkBooleanColumn(AnnotatedCallLog.NEW, contentValues, operationType);
+    checkBooleanColumn(AnnotatedCallLog.IS_VOICEMAIL_CALL, contentValues, operationType);
+    checkCallTypeColumn(contentValues, operationType);
+  }
+
+  /**
+   * Checks a boolean column.
+   *
+   * <p>Constraints: the value must be either 0 or 1 (SQLite database has no boolean type, so the
+   * value has to be an integer).
+   */
+  private static void checkBooleanColumn(
+      String columnName, ContentValues contentValues, @Operation int operationType) {
+    checkColumn(
+        columnName,
+        contentValues,
+        operationType,
+        contentValuesToCheck -> {
+          Integer value = contentValuesToCheck.getAsInteger(columnName);
+          return value != null && (value == 0 || value == 1);
+        });
+  }
+
+  /**
+   * Checks column {@link AnnotatedCallLog#CALL_TYPE}.
+   *
+   * <p>Constraints: the value must be one of {@link android.provider.CallLog.Calls#TYPE}.
+   */
+  private static void checkCallTypeColumn(
+      ContentValues contentValues, @Operation int operationType) {
+    checkColumn(
+        AnnotatedCallLog.CALL_TYPE,
+        contentValues,
+        operationType,
+        contentValuesToCheck -> {
+          Integer callType = contentValuesToCheck.getAsInteger(AnnotatedCallLog.CALL_TYPE);
+          return callType != null
+              && (callType == Calls.INCOMING_TYPE
+                  || callType == Calls.OUTGOING_TYPE
+                  || callType == Calls.MISSED_TYPE
+                  || callType == Calls.VOICEMAIL_TYPE
+                  || callType == Calls.REJECTED_TYPE
+                  || callType == Calls.BLOCKED_TYPE
+                  || callType == Calls.ANSWERED_EXTERNALLY_TYPE);
+        });
+  }
+
+  private static void checkColumn(
+      String columnName,
+      ContentValues contentValues,
+      @Operation int operationType,
+      Predicate<ContentValues> predicate) {
+    switch (operationType) {
+      case Operation.UPDATE:
+        if (!contentValues.containsKey(columnName)) {
+          return;
+        }
+        // fall through
+      case Operation.INSERT:
+        Assert.checkArgument(
+            predicate.test(contentValues),
+            "Column %s contains invalid value: %s",
+            columnName,
+            contentValues.get(columnName));
+        return;
+      default:
+        throw Assert.createUnsupportedOperationFailException(
+            String.format("Unsupported operation: %s", operationType));
+    }
+  }
+}
diff --git a/java/com/android/dialer/calllog/database/AnnotatedCallLogContentProvider.java b/java/com/android/dialer/calllog/database/AnnotatedCallLogContentProvider.java
index 6972273..ce41a2a 100644
--- a/java/com/android/dialer/calllog/database/AnnotatedCallLogContentProvider.java
+++ b/java/com/android/dialer/calllog/database/AnnotatedCallLogContentProvider.java
@@ -16,7 +16,6 @@
 
 package com.android.dialer.calllog.database;
 
-import android.annotation.TargetApi;
 import android.content.ContentProvider;
 import android.content.ContentProviderOperation;
 import android.content.ContentProviderResult;
@@ -28,34 +27,22 @@
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteQueryBuilder;
 import android.net.Uri;
-import android.os.Build;
-import android.provider.CallLog.Calls;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+import com.android.dialer.calllog.database.AnnotatedCallLogConstraints.Operation;
 import com.android.dialer.calllog.database.contract.AnnotatedCallLogContract;
 import com.android.dialer.calllog.database.contract.AnnotatedCallLogContract.AnnotatedCallLog;
-import com.android.dialer.calllog.database.contract.AnnotatedCallLogContract.CoalescedAnnotatedCallLog;
 import com.android.dialer.common.Assert;
 import com.android.dialer.common.LogUtil;
-import com.android.dialer.metrics.Metrics;
-import com.android.dialer.metrics.MetricsComponent;
 import java.util.ArrayList;
 import java.util.Arrays;
 
 /** {@link ContentProvider} for the annotated call log. */
 public class AnnotatedCallLogContentProvider extends ContentProvider {
 
-  /**
-   * We sometimes run queries where we potentially pass every ID into a where clause using the
-   * (?,?,?,...) syntax. The maximum number of host parameters is 999, so that's the maximum size
-   * this table can be. See https://www.sqlite.org/limits.html for more details.
-   */
-  private static final int MAX_ROWS = 999;
-
   private static final int ANNOTATED_CALL_LOG_TABLE_CODE = 1;
   private static final int ANNOTATED_CALL_LOG_TABLE_ID_CODE = 2;
   private static final int ANNOTATED_CALL_LOG_TABLE_DISTINCT_NUMBER_CODE = 3;
-  private static final int COALESCED_ANNOTATED_CALL_LOG_TABLE_CODE = 4;
 
   private static final UriMatcher uriMatcher = new UriMatcher(UriMatcher.NO_MATCH);
 
@@ -70,10 +57,6 @@
         AnnotatedCallLogContract.AUTHORITY,
         AnnotatedCallLog.DISTINCT_PHONE_NUMBERS,
         ANNOTATED_CALL_LOG_TABLE_DISTINCT_NUMBER_CODE);
-    uriMatcher.addURI(
-        AnnotatedCallLogContract.AUTHORITY,
-        CoalescedAnnotatedCallLog.TABLE,
-        COALESCED_ANNOTATED_CALL_LOG_TABLE_CODE);
   }
 
   private AnnotatedCallLogDatabaseHelper databaseHelper;
@@ -87,7 +70,7 @@
 
   @Override
   public boolean onCreate() {
-    databaseHelper = new AnnotatedCallLogDatabaseHelper(getContext(), MAX_ROWS);
+    databaseHelper = CallLogDatabaseComponent.get(getContext()).annotatedCallLogDatabaseHelper();
 
     // Note: As this method is called before Application#onCreate, we must *not* initialize objects
     // that require preparation work done in Application#onCreate.
@@ -97,7 +80,6 @@
     return true;
   }
 
-  @TargetApi(Build.VERSION_CODES.M) // Uses try-with-resources
   @Nullable
   @Override
   public Cursor query(
@@ -147,33 +129,6 @@
           LogUtil.w("AnnotatedCallLogContentProvider.query", "cursor was null");
         }
         return cursor;
-      case COALESCED_ANNOTATED_CALL_LOG_TABLE_CODE:
-        Assert.checkArgument(
-            projection == CoalescedAnnotatedCallLog.ALL_COLUMNS,
-            "only ALL_COLUMNS projection supported for coalesced call log");
-        Assert.checkArgument(selection == null, "selection not supported for coalesced call log");
-        Assert.checkArgument(
-            selectionArgs == null, "selection args not supported for coalesced call log");
-        Assert.checkArgument(sortOrder == null, "sort order not supported for coalesced call log");
-        MetricsComponent.get(getContext()).metrics().startTimer(Metrics.NEW_CALL_LOG_COALESCE);
-        try (Cursor allAnnotatedCallLogRows =
-            queryBuilder.query(
-                db,
-                null,
-                String.format("%s != ?", CoalescedAnnotatedCallLog.CALL_TYPE),
-                new String[] {Integer.toString(Calls.VOICEMAIL_TYPE)},
-                null,
-                null,
-                AnnotatedCallLog.TIMESTAMP + " DESC")) {
-          Cursor coalescedRows =
-              CallLogDatabaseComponent.get(getContext())
-                  .coalescer()
-                  .coalesce(allAnnotatedCallLogRows);
-          coalescedRows.setNotificationUri(
-              getContext().getContentResolver(), CoalescedAnnotatedCallLog.CONTENT_URI);
-          MetricsComponent.get(getContext()).metrics().stopTimer(Metrics.NEW_CALL_LOG_COALESCE);
-          return coalescedRows;
-        }
       default:
         throw new IllegalArgumentException("Unknown uri: " + uri);
     }
@@ -191,6 +146,8 @@
     // Javadoc states values is not nullable, even though it is annotated as such (a bug)!
     Assert.checkArgument(values != null);
 
+    AnnotatedCallLogConstraints.check(values, Operation.INSERT);
+
     SQLiteDatabase database = databaseHelper.getWritableDatabase();
     int match = uriMatcher.match(uri);
     switch (match) {
@@ -212,8 +169,6 @@
         break;
       case ANNOTATED_CALL_LOG_TABLE_DISTINCT_NUMBER_CODE:
         throw new UnsupportedOperationException();
-      case COALESCED_ANNOTATED_CALL_LOG_TABLE_CODE:
-        throw new UnsupportedOperationException("coalesced call log does not support inserting");
       default:
         throw new IllegalArgumentException("Unknown uri: " + uri);
     }
@@ -250,8 +205,6 @@
         break;
       case ANNOTATED_CALL_LOG_TABLE_DISTINCT_NUMBER_CODE:
         throw new UnsupportedOperationException();
-      case COALESCED_ANNOTATED_CALL_LOG_TABLE_CODE:
-        throw new UnsupportedOperationException("coalesced call log does not support deleting");
       default:
         throw new IllegalArgumentException("Unknown uri: " + uri);
     }
@@ -275,6 +228,8 @@
     // Javadoc states values is not nullable, even though it is annotated as such (a bug)!
     Assert.checkArgument(values != null);
 
+    AnnotatedCallLogConstraints.check(values, Operation.UPDATE);
+
     SQLiteDatabase database = databaseHelper.getWritableDatabase();
     int match = uriMatcher.match(uri);
     switch (match) {
@@ -305,7 +260,6 @@
         }
         return rows;
       case ANNOTATED_CALL_LOG_TABLE_DISTINCT_NUMBER_CODE:
-      case COALESCED_ANNOTATED_CALL_LOG_TABLE_CODE:
         throw new UnsupportedOperationException();
       default:
         throw new IllegalArgumentException("Unknown uri: " + uri);
@@ -341,9 +295,6 @@
             break;
           case ANNOTATED_CALL_LOG_TABLE_DISTINCT_NUMBER_CODE:
             throw new UnsupportedOperationException();
-          case COALESCED_ANNOTATED_CALL_LOG_TABLE_CODE:
-            throw new UnsupportedOperationException(
-                "coalesced call log does not support applyBatch");
           default:
             throw new IllegalArgumentException("Unknown uri: " + operation.getUri());
         }
@@ -385,10 +336,6 @@
   }
 
   private void notifyChange(Uri uri) {
-    getContext().getContentResolver().notifyChange(uri, null);
-    // Any time the annotated call log changes, we need to also notify observers of the
-    // CoalescedAnnotatedCallLog, since that is just a massaged in-memory view of the real annotated
-    // call log table.
-    getContext().getContentResolver().notifyChange(CoalescedAnnotatedCallLog.CONTENT_URI, null);
+    getContext().getContentResolver().notifyChange(uri, /* observer = */ null);
   }
 }
diff --git a/java/com/android/dialer/calllog/database/AnnotatedCallLogDatabaseHelper.java b/java/com/android/dialer/calllog/database/AnnotatedCallLogDatabaseHelper.java
index c838737..0693c79 100644
--- a/java/com/android/dialer/calllog/database/AnnotatedCallLogDatabaseHelper.java
+++ b/java/com/android/dialer/calllog/database/AnnotatedCallLogDatabaseHelper.java
@@ -20,19 +20,53 @@
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteOpenHelper;
 import android.provider.CallLog.Calls;
+import android.support.annotation.VisibleForTesting;
 import com.android.dialer.calllog.database.contract.AnnotatedCallLogContract.AnnotatedCallLog;
 import com.android.dialer.common.LogUtil;
+import com.android.dialer.common.concurrent.Annotations.BackgroundExecutor;
+import com.android.dialer.inject.ApplicationContext;
+import com.google.common.util.concurrent.ListenableFuture;
+import com.google.common.util.concurrent.ListeningExecutorService;
 import java.util.Locale;
+import javax.inject.Inject;
+import javax.inject.Singleton;
 
 /** {@link SQLiteOpenHelper} for the AnnotatedCallLog database. */
-class AnnotatedCallLogDatabaseHelper extends SQLiteOpenHelper {
-  private final int maxRows;
+@Singleton
+public class AnnotatedCallLogDatabaseHelper extends SQLiteOpenHelper {
 
-  AnnotatedCallLogDatabaseHelper(Context appContext, int maxRows) {
-    super(appContext, "annotated_call_log.db", null, 1);
+  @VisibleForTesting static final int VERSION = 4;
+
+  private static final String FILENAME = "annotated_call_log.db";
+
+  private final Context appContext;
+  private final int maxRows;
+  private final ListeningExecutorService backgroundExecutor;
+
+  @Inject
+  public AnnotatedCallLogDatabaseHelper(
+      @ApplicationContext Context appContext,
+      @AnnotatedCallLogMaxRows int maxRows,
+      @BackgroundExecutor ListeningExecutorService backgroundExecutor) {
+    super(appContext, FILENAME, null, VERSION);
+
+    this.appContext = appContext;
     this.maxRows = maxRows;
+    this.backgroundExecutor = backgroundExecutor;
   }
 
+  /**
+   * Important note:
+   *
+   * <p>Do NOT modify/delete columns (e.g., adding constraints, changing column type, etc).
+   *
+   * <p>As SQLite's "ALTER TABLE" statement doesn't support such operations, doing so requires
+   * complex, expensive, and error-prone operations to upgrade the database (see
+   * https://www.sqlite.org/lang_altertable.html "Making Other Kinds Of Table Schema Changes").
+   *
+   * <p>All column constraints are enforced when data are inserted/updated via
+   * AnnotatedCallLogContentProvider. See AnnotatedCallLogConstraints for details.
+   */
   private static final String CREATE_TABLE_SQL =
       "create table if not exists "
           + AnnotatedCallLog.TABLE
@@ -49,14 +83,15 @@
           + (AnnotatedCallLog.GEOCODED_LOCATION + " text, ")
           + (AnnotatedCallLog.PHONE_ACCOUNT_COMPONENT_NAME + " text, ")
           + (AnnotatedCallLog.PHONE_ACCOUNT_ID + " text, ")
-          + (AnnotatedCallLog.PHONE_ACCOUNT_LABEL + " text, ")
-          + (AnnotatedCallLog.PHONE_ACCOUNT_COLOR + " integer, ")
           + (AnnotatedCallLog.FEATURES + " integer, ")
           + (AnnotatedCallLog.TRANSCRIPTION + " integer, ")
           + (AnnotatedCallLog.VOICEMAIL_URI + " text, ")
-          + (AnnotatedCallLog.CALL_TYPE + " integer not null, ")
+          + (AnnotatedCallLog.CALL_TYPE + " integer, ")
           + (AnnotatedCallLog.NUMBER_ATTRIBUTES + " blob, ")
-          + (AnnotatedCallLog.TRANSCRIPTION_STATE + " integer")
+          + (AnnotatedCallLog.IS_VOICEMAIL_CALL + " integer, ")
+          + (AnnotatedCallLog.VOICEMAIL_CALL_TAG + " text, ")
+          + (AnnotatedCallLog.TRANSCRIPTION_STATE + " integer, ")
+          + (AnnotatedCallLog.CALL_MAPPING_ID + " text")
           + ");";
 
   /**
@@ -124,5 +159,67 @@
   }
 
   @Override
-  public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {}
+  public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
+    if (oldVersion < 2) {
+      upgradeToV2(db);
+    }
+
+    // Version 3 upgrade was buggy and didn't make any schema changes.
+    // So we go directly to version 4.
+    if (oldVersion < 4) {
+      upgradeToV4(db);
+    }
+  }
+
+  private static void upgradeToV2(SQLiteDatabase db) {
+    db.execSQL(
+        "alter table "
+            + AnnotatedCallLog.TABLE
+            + " add column "
+            + AnnotatedCallLog.CALL_MAPPING_ID
+            + " text;");
+    db.execSQL(
+        "update "
+            + AnnotatedCallLog.TABLE
+            + " set "
+            + AnnotatedCallLog.CALL_MAPPING_ID
+            + " = "
+            + AnnotatedCallLog.TIMESTAMP);
+  }
+
+  private static void upgradeToV4(SQLiteDatabase db) {
+    // Starting from v4, we will enforce column constraints in the AnnotatedCallLogContentProvider
+    // instead of on the database level.
+    // The constraints are as follows (see AnnotatedCallLogConstraints for details).
+    //   IS_READ:           not null, must be 0 or 1;
+    //   NEW:               not null, must be 0 or 1;
+    //   IS_VOICEMAIL_CALL: not null, must be 0 or 1; and
+    //   CALL_TYPE:         not null, must be one of android.provider.CallLog.Calls#TYPE.
+    //
+    // There is no need to update the old schema as the constraints above are more strict than
+    // those in the old schema.
+    //
+    // Version 3 schema defaulted column IS_VOICEMAIL_CALL to 0 but we didn't update the schema in
+    // onUpgrade. As a result, null values can still be inserted if the user has an older version of
+    // the database. For version 4, we need to set all null values to 0.
+    db.execSQL(
+        "update "
+            + AnnotatedCallLog.TABLE
+            + " set "
+            + AnnotatedCallLog.IS_VOICEMAIL_CALL
+            + " = 0 "
+            + "where "
+            + AnnotatedCallLog.IS_VOICEMAIL_CALL
+            + " is null");
+  }
+
+  /** Closes the database and deletes it. */
+  public ListenableFuture<Void> delete() {
+    return backgroundExecutor.submit(
+        () -> {
+          close();
+          appContext.deleteDatabase(FILENAME);
+          return null;
+        });
+  }
 }
diff --git a/java/com/android/dialer/calllog/database/AnnotatedCallLogMaxRows.java b/java/com/android/dialer/calllog/database/AnnotatedCallLogMaxRows.java
new file mode 100644
index 0000000..5542d66
--- /dev/null
+++ b/java/com/android/dialer/calllog/database/AnnotatedCallLogMaxRows.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+package com.android.dialer.calllog.database;
+
+import javax.inject.Qualifier;
+
+/** Annotation for the max number of rows in the AnnotatedCallLog. */
+@Qualifier
+public @interface AnnotatedCallLogMaxRows {}
diff --git a/java/com/android/dialer/calllog/database/CallLogDatabaseComponent.java b/java/com/android/dialer/calllog/database/CallLogDatabaseComponent.java
index 9912374..09e291e 100644
--- a/java/com/android/dialer/calllog/database/CallLogDatabaseComponent.java
+++ b/java/com/android/dialer/calllog/database/CallLogDatabaseComponent.java
@@ -25,6 +25,8 @@
 
   public abstract Coalescer coalescer();
 
+  public abstract AnnotatedCallLogDatabaseHelper annotatedCallLogDatabaseHelper();
+
   public static CallLogDatabaseComponent get(Context context) {
     return ((CallLogDatabaseComponent.HasComponent)
             ((HasRootComponent) context.getApplicationContext()).component())
diff --git a/java/com/android/dialer/calllog/database/CallLogDatabaseModule.java b/java/com/android/dialer/calllog/database/CallLogDatabaseModule.java
new file mode 100644
index 0000000..eef3fb5
--- /dev/null
+++ b/java/com/android/dialer/calllog/database/CallLogDatabaseModule.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.dialer.calllog.database;
+
+import dagger.Module;
+import dagger.Provides;
+
+/** Binds database dependencies. */
+@Module
+public class CallLogDatabaseModule {
+
+  @Provides
+  @AnnotatedCallLogMaxRows
+  static int provideMaxRows() {
+    /*
+     * We sometimes run queries where we potentially pass every ID into a where clause using the
+     * (?,?,?,...) syntax. The maximum number of host parameters is 999, so that's the maximum size
+     * this table can be. See https://www.sqlite.org/limits.html for more details.
+     */
+    return 999;
+  }
+}
diff --git a/java/com/android/dialer/calllog/database/Coalescer.java b/java/com/android/dialer/calllog/database/Coalescer.java
index ed09eea..fd751e7 100644
--- a/java/com/android/dialer/calllog/database/Coalescer.java
+++ b/java/com/android/dialer/calllog/database/Coalescer.java
@@ -15,233 +15,372 @@
  */
 package com.android.dialer.calllog.database;
 
-import android.content.ContentValues;
 import android.database.Cursor;
-import android.database.MatrixCursor;
+import android.database.StaleDataException;
+import android.provider.CallLog.Calls;
 import android.support.annotation.NonNull;
 import android.support.annotation.WorkerThread;
 import android.telecom.PhoneAccountHandle;
+import android.text.TextUtils;
 import com.android.dialer.CoalescedIds;
 import com.android.dialer.DialerPhoneNumber;
+import com.android.dialer.NumberAttributes;
 import com.android.dialer.calllog.database.contract.AnnotatedCallLogContract.AnnotatedCallLog;
-import com.android.dialer.calllog.database.contract.AnnotatedCallLogContract.CoalescedAnnotatedCallLog;
-import com.android.dialer.calllog.datasources.CallLogDataSource;
-import com.android.dialer.calllog.datasources.DataSources;
+import com.android.dialer.calllog.model.CoalescedRow;
 import com.android.dialer.common.Assert;
+import com.android.dialer.common.concurrent.Annotations.BackgroundExecutor;
 import com.android.dialer.compat.telephony.TelephonyManagerCompat;
+import com.android.dialer.metrics.FutureTimer;
+import com.android.dialer.metrics.Metrics;
 import com.android.dialer.phonenumberproto.DialerPhoneNumberUtil;
 import com.android.dialer.telecom.TelecomUtil;
-import com.google.common.base.Preconditions;
-import com.google.i18n.phonenumbers.PhoneNumberUtil;
+import com.google.common.collect.ImmutableList;
+import com.google.common.util.concurrent.ListenableFuture;
+import com.google.common.util.concurrent.ListeningExecutorService;
 import com.google.protobuf.InvalidProtocolBufferException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
 import java.util.Objects;
 import javax.inject.Inject;
 
-/**
- * Coalesces call log rows by combining some adjacent rows.
- *
- * <p>Applies the logic that determines which adjacent rows should be coalesced, and then delegates
- * to each data source to determine how individual columns should be aggregated.
- */
+/** Combines adjacent rows in {@link AnnotatedCallLog}. */
 public class Coalescer {
-  private final DataSources dataSources;
+
+  private final FutureTimer futureTimer;
+  private final ListeningExecutorService backgroundExecutorService;
 
   @Inject
-  Coalescer(DataSources dataSources) {
-    this.dataSources = dataSources;
+  Coalescer(
+      @BackgroundExecutor ListeningExecutorService backgroundExecutorService,
+      FutureTimer futureTimer) {
+    this.backgroundExecutorService = backgroundExecutorService;
+    this.futureTimer = futureTimer;
   }
 
   /**
-   * Reads the entire {@link AnnotatedCallLog} database into memory from the provided {@code
-   * allAnnotatedCallLog} parameter and then builds and returns a new {@link MatrixCursor} which is
-   * the result of combining adjacent rows which should be collapsed for display purposes.
+   * Given rows from {@link AnnotatedCallLog}, combine adjacent ones which should be collapsed for
+   * display purposes.
    *
-   * @param allAnnotatedCallLogRowsSortedByTimestampDesc all {@link AnnotatedCallLog} rows, sorted
-   *     by timestamp descending
-   * @return a new {@link MatrixCursor} containing the {@link CoalescedAnnotatedCallLog} rows to
-   *     display
+   * @param allAnnotatedCallLogRowsSortedByTimestampDesc {@link AnnotatedCallLog} rows sorted in
+   *     descending order of timestamp.
+   * @return a future of a list of {@link CoalescedRow coalesced rows}, which will be used to
+   *     display call log entries.
+   */
+  public ListenableFuture<ImmutableList<CoalescedRow>> coalesce(
+      @NonNull Cursor allAnnotatedCallLogRowsSortedByTimestampDesc) {
+    ListenableFuture<ImmutableList<CoalescedRow>> coalescingFuture =
+        backgroundExecutorService.submit(
+            () -> coalesceInternal(Assert.isNotNull(allAnnotatedCallLogRowsSortedByTimestampDesc)));
+    futureTimer.applyTiming(coalescingFuture, Metrics.NEW_CALL_LOG_COALESCE);
+    return coalescingFuture;
+  }
+
+  /**
+   * Reads the entire {@link AnnotatedCallLog} into memory from the provided cursor and then builds
+   * and returns a list of {@link CoalescedRow coalesced rows}, which is the result of combining
+   * adjacent rows which should be collapsed for display purposes.
+   *
+   * @param allAnnotatedCallLogRowsSortedByTimestampDesc {@link AnnotatedCallLog} rows sorted in
+   *     descending order of timestamp.
+   * @return a list of {@link CoalescedRow coalesced rows}, which will be used to display call log
+   *     entries.
    */
   @WorkerThread
   @NonNull
-  Cursor coalesce(@NonNull Cursor allAnnotatedCallLogRowsSortedByTimestampDesc) {
+  private ImmutableList<CoalescedRow> coalesceInternal(
+      Cursor allAnnotatedCallLogRowsSortedByTimestampDesc) throws ExpectedCoalescerException {
     Assert.isWorkerThread();
 
-    // Note: This method relies on rowsShouldBeCombined to determine which rows should be combined,
-    // but delegates to data sources to actually aggregate column values.
+    ImmutableList.Builder<CoalescedRow> coalescedRowListBuilder = new ImmutableList.Builder<>();
 
-    DialerPhoneNumberUtil dialerPhoneNumberUtil =
-        new DialerPhoneNumberUtil(PhoneNumberUtil.getInstance());
+    try {
+      if (!allAnnotatedCallLogRowsSortedByTimestampDesc.moveToFirst()) {
+        return ImmutableList.of();
+      }
 
-    MatrixCursor allCoalescedRowsMatrixCursor =
-        new MatrixCursor(
-            CoalescedAnnotatedCallLog.ALL_COLUMNS,
-            Assert.isNotNull(allAnnotatedCallLogRowsSortedByTimestampDesc).getCount());
+      RowCombiner rowCombiner = new RowCombiner(allAnnotatedCallLogRowsSortedByTimestampDesc);
+      rowCombiner.startNewGroup();
 
-    if (!allAnnotatedCallLogRowsSortedByTimestampDesc.moveToFirst()) {
-      return allCoalescedRowsMatrixCursor;
-    }
+      long coalescedRowId = 0;
+      do {
+        boolean isRowMerged = rowCombiner.mergeRow(allAnnotatedCallLogRowsSortedByTimestampDesc);
 
-    int coalescedRowId = 0;
-    List<ContentValues> currentRowGroup = new ArrayList<>();
-
-    ContentValues firstRow = cursorRowToContentValues(allAnnotatedCallLogRowsSortedByTimestampDesc);
-    currentRowGroup.add(firstRow);
-
-    while (!currentRowGroup.isEmpty()) {
-      // Group consecutive rows
-      ContentValues firstRowInGroup = currentRowGroup.get(0);
-      ContentValues currentRow = null;
-      while (allAnnotatedCallLogRowsSortedByTimestampDesc.moveToNext()) {
-        currentRow = cursorRowToContentValues(allAnnotatedCallLogRowsSortedByTimestampDesc);
-
-        if (!rowsShouldBeCombined(dialerPhoneNumberUtil, firstRowInGroup, currentRow)) {
-          break;
+        if (isRowMerged) {
+          allAnnotatedCallLogRowsSortedByTimestampDesc.moveToNext();
         }
 
-        currentRowGroup.add(currentRow);
+        if (!isRowMerged || allAnnotatedCallLogRowsSortedByTimestampDesc.isAfterLast()) {
+          coalescedRowListBuilder.add(
+              rowCombiner.combine().toBuilder().setId(coalescedRowId++).build());
+          rowCombiner.startNewGroup();
+        }
+      } while (!allAnnotatedCallLogRowsSortedByTimestampDesc.isAfterLast());
+
+      return coalescedRowListBuilder.build();
+
+    } catch (Exception exception) {
+      // Coalescing can fail if cursor "allAnnotatedCallLogRowsSortedByTimestampDesc" is closed by
+      // its loader while the work is still in progress.
+      //
+      // This can happen when the loader restarts and finishes loading data before the coalescing
+      // work is completed.
+      //
+      // This kind of failure doesn't have to crash the app as coalescing will be restarted on the
+      // latest data obtained by the loader. Therefore, we inspect the exception here and throw an
+      // ExpectedCoalescerException if it is the case described above.
+      //
+      // The type of expected exception depends on whether AbstractWindowedCursor#checkPosition() is
+      // called when the cursor is closed.
+      //   (1) If it is called before the cursor is closed, we will get IllegalStateException thrown
+      //       by SQLiteClosable when it attempts to acquire a reference to the database.
+      //   (2) Otherwise, we will get StaleDataException thrown by AbstractWindowedCursor's
+      //       checkPosition() method.
+      //
+      // Note that it would be more accurate to inspect the stack trace to locate the origin of the
+      // exception. However, according to the documentation on Throwable#getStackTrace, "some
+      // virtual machines may, under some circumstances, omit one or more stack frames from the
+      // stack trace". "In the extreme case, a virtual machine that has no stack trace information
+      // concerning this throwable is permitted to return a zero-length array from this method."
+      // Therefore, the best we can do is to inspect the message in the exception.
+      // TODO(linyuh): try to avoid the expected failure.
+      String message = exception.getMessage();
+      if (message != null
+          && ((exception instanceof StaleDataException
+                  && message.startsWith("Attempting to access a closed CursorWindow"))
+              || (exception instanceof IllegalStateException
+                  && message.startsWith("attempt to re-open an already-closed object")))) {
+        throw new ExpectedCoalescerException(exception);
       }
 
-      // Coalesce the group into a single row
-      ContentValues coalescedRow = coalesceRowsForAllDataSources(currentRowGroup);
-      coalescedRow.put(
-          CoalescedAnnotatedCallLog.COALESCED_IDS, getCoalescedIds(currentRowGroup).toByteArray());
-      addContentValuesToMatrixCursor(coalescedRow, allCoalescedRowsMatrixCursor, coalescedRowId++);
-
-      // Clear the current group after the rows are coalesced.
-      currentRowGroup.clear();
-
-      // Add the first of the remaining rows to the current group.
-      if (!allAnnotatedCallLogRowsSortedByTimestampDesc.isAfterLast()) {
-        currentRowGroup.add(currentRow);
-      }
+      throw exception;
     }
-
-    return allCoalescedRowsMatrixCursor;
   }
 
-  private static ContentValues cursorRowToContentValues(Cursor cursor) {
-    ContentValues values = new ContentValues();
-    String[] columns = cursor.getColumnNames();
-    int length = columns.length;
-    for (int i = 0; i < length; i++) {
-      if (cursor.getType(i) == Cursor.FIELD_TYPE_BLOB) {
-        values.put(columns[i], cursor.getBlob(i));
-      } else {
-        values.put(columns[i], cursor.getString(i));
-      }
-    }
-    return values;
-  }
+  /** Combines rows from {@link AnnotatedCallLog} into a {@link CoalescedRow}. */
+  private static final class RowCombiner {
+    private final CoalescedRow.Builder coalescedRowBuilder = CoalescedRow.newBuilder();
+    private final CoalescedIds.Builder coalescedIdsBuilder = CoalescedIds.newBuilder();
 
-  /**
-   * @param row1 a row from {@link AnnotatedCallLog}
-   * @param row2 a row from {@link AnnotatedCallLog}
-   */
-  private static boolean rowsShouldBeCombined(
-      DialerPhoneNumberUtil dialerPhoneNumberUtil, ContentValues row1, ContentValues row2) {
-    // Don't combine rows which don't use the same phone account.
-    PhoneAccountHandle phoneAccount1 =
-        TelecomUtil.composePhoneAccountHandle(
-            row1.getAsString(AnnotatedCallLog.PHONE_ACCOUNT_COMPONENT_NAME),
-            row1.getAsString(AnnotatedCallLog.PHONE_ACCOUNT_ID));
-    PhoneAccountHandle phoneAccount2 =
-        TelecomUtil.composePhoneAccountHandle(
-            row2.getAsString(AnnotatedCallLog.PHONE_ACCOUNT_COMPONENT_NAME),
-            row2.getAsString(AnnotatedCallLog.PHONE_ACCOUNT_ID));
+    // Indexes for columns in AnnotatedCallLog
+    private final int idColumn;
+    private final int timestampColumn;
+    private final int numberColumn;
+    private final int formattedNumberColumn;
+    private final int numberPresentationColumn;
+    private final int isReadColumn;
+    private final int isNewColumn;
+    private final int geocodedLocationColumn;
+    private final int phoneAccountComponentNameColumn;
+    private final int phoneAccountIdColumn;
+    private final int featuresColumn;
+    private final int numberAttributesColumn;
+    private final int isVoicemailCallColumn;
+    private final int voicemailCallTagColumn;
+    private final int callTypeColumn;
 
-    if (!Objects.equals(phoneAccount1, phoneAccount2)) {
-      return false;
+    // DialerPhoneNumberUtil will be created lazily as its instantiation is expensive.
+    private DialerPhoneNumberUtil dialerPhoneNumberUtil = null;
+
+    RowCombiner(Cursor annotatedCallLogRow) {
+      idColumn = annotatedCallLogRow.getColumnIndexOrThrow(AnnotatedCallLog._ID);
+      timestampColumn = annotatedCallLogRow.getColumnIndexOrThrow(AnnotatedCallLog.TIMESTAMP);
+      numberColumn = annotatedCallLogRow.getColumnIndexOrThrow(AnnotatedCallLog.NUMBER);
+      formattedNumberColumn =
+          annotatedCallLogRow.getColumnIndexOrThrow(AnnotatedCallLog.FORMATTED_NUMBER);
+      numberPresentationColumn =
+          annotatedCallLogRow.getColumnIndexOrThrow(AnnotatedCallLog.NUMBER_PRESENTATION);
+      isReadColumn = annotatedCallLogRow.getColumnIndexOrThrow(AnnotatedCallLog.IS_READ);
+      isNewColumn = annotatedCallLogRow.getColumnIndexOrThrow(AnnotatedCallLog.NEW);
+      geocodedLocationColumn =
+          annotatedCallLogRow.getColumnIndexOrThrow(AnnotatedCallLog.GEOCODED_LOCATION);
+      phoneAccountComponentNameColumn =
+          annotatedCallLogRow.getColumnIndexOrThrow(AnnotatedCallLog.PHONE_ACCOUNT_COMPONENT_NAME);
+      phoneAccountIdColumn =
+          annotatedCallLogRow.getColumnIndexOrThrow(AnnotatedCallLog.PHONE_ACCOUNT_ID);
+      featuresColumn = annotatedCallLogRow.getColumnIndexOrThrow(AnnotatedCallLog.FEATURES);
+      numberAttributesColumn =
+          annotatedCallLogRow.getColumnIndexOrThrow(AnnotatedCallLog.NUMBER_ATTRIBUTES);
+      isVoicemailCallColumn =
+          annotatedCallLogRow.getColumnIndexOrThrow(AnnotatedCallLog.IS_VOICEMAIL_CALL);
+      voicemailCallTagColumn =
+          annotatedCallLogRow.getColumnIndexOrThrow(AnnotatedCallLog.VOICEMAIL_CALL_TAG);
+      callTypeColumn = annotatedCallLogRow.getColumnIndexOrThrow(AnnotatedCallLog.CALL_TYPE);
     }
 
-    if (!row1.getAsInteger(AnnotatedCallLog.NUMBER_PRESENTATION)
-        .equals(row2.getAsInteger(AnnotatedCallLog.NUMBER_PRESENTATION))) {
-      return false;
+    /**
+     * Prepares {@link RowCombiner} for building a new group of rows by clearing information on all
+     * previously merged rows.
+     */
+    void startNewGroup() {
+      coalescedRowBuilder.clear();
+      coalescedIdsBuilder.clear();
     }
 
-    if (!meetsAssistedDialingCriteria(row1, row2)) {
-      return false;
-    }
+    /**
+     * Merge the given {@link AnnotatedCallLog} row into the current group.
+     *
+     * @return true if the given row is merged.
+     */
+    boolean mergeRow(Cursor annotatedCallLogRow) {
+      Assert.checkArgument(annotatedCallLogRow.getInt(callTypeColumn) != Calls.VOICEMAIL_TYPE);
 
-    DialerPhoneNumber number1;
-    DialerPhoneNumber number2;
-    try {
-      byte[] number1Bytes = row1.getAsByteArray(AnnotatedCallLog.NUMBER);
-      byte[] number2Bytes = row2.getAsByteArray(AnnotatedCallLog.NUMBER);
-
-      if (number1Bytes == null || number2Bytes == null) {
-        // Empty numbers should not be combined.
+      if (!canMergeRow(annotatedCallLogRow)) {
         return false;
       }
 
-      number1 = DialerPhoneNumber.parseFrom(number1Bytes);
-      number2 = DialerPhoneNumber.parseFrom(number2Bytes);
-    } catch (InvalidProtocolBufferException e) {
-      throw Assert.createAssertionFailException("error parsing DialerPhoneNumber proto", e);
-    }
-    return dialerPhoneNumberUtil.isMatch(number1, number2);
-  }
+      // Set fields that don't use the most recent value.
+      //
+      // Currently there is only one such field: "features".
+      // If any call in a group includes a feature (like Wifi/HD), consider the group to have
+      // the feature.
+      coalescedRowBuilder.setFeatures(
+          coalescedRowBuilder.getFeatures() | annotatedCallLogRow.getInt(featuresColumn));
 
-  /**
-   * Returns a boolean indicating whether or not FEATURES_ASSISTED_DIALING is mutually exclusive
-   * between two rows.
-   */
-  private static boolean meetsAssistedDialingCriteria(ContentValues row1, ContentValues row2) {
-    int row1Assisted =
-        row1.getAsInteger(AnnotatedCallLog.FEATURES)
-            & TelephonyManagerCompat.FEATURES_ASSISTED_DIALING;
-    int row2Assisted =
-        row2.getAsInteger(AnnotatedCallLog.FEATURES)
-            & TelephonyManagerCompat.FEATURES_ASSISTED_DIALING;
+      // Set fields that use the most recent value.
+      // Rows passed to Coalescer are already sorted in descending order of timestamp. If the
+      // coalesced ID list is not empty, it means RowCombiner has merged the most recent row in a
+      // group and there is no need to continue as we only set fields that use the most recent value
+      // from this point forward.
+      if (!coalescedIdsBuilder.getCoalescedIdList().isEmpty()) {
+        coalescedIdsBuilder.addCoalescedId(annotatedCallLogRow.getInt(idColumn));
+        return true;
+      }
 
-    // FEATURES_ASSISTED_DIALING should not be combined with calls that are
-    // !FEATURES_ASSISTED_DIALING
-    return row1Assisted == row2Assisted;
-  }
+      coalescedRowBuilder
+          .setTimestamp(annotatedCallLogRow.getLong(timestampColumn))
+          .setNumberPresentation(annotatedCallLogRow.getInt(numberPresentationColumn))
+          .setIsRead(annotatedCallLogRow.getInt(isReadColumn) == 1)
+          .setIsNew(annotatedCallLogRow.getInt(isNewColumn) == 1)
+          .setIsVoicemailCall(annotatedCallLogRow.getInt(isVoicemailCallColumn) == 1)
+          .setCallType(annotatedCallLogRow.getInt(callTypeColumn));
 
-  /**
-   * Delegates to data sources to aggregate individual columns to create a new coalesced row.
-   *
-   * @param individualRows {@link AnnotatedCallLog} rows sorted by timestamp descending
-   * @return a {@link CoalescedAnnotatedCallLog} row
-   */
-  private ContentValues coalesceRowsForAllDataSources(List<ContentValues> individualRows) {
-    ContentValues coalescedValues = new ContentValues();
-    for (CallLogDataSource dataSource : dataSources.getDataSourcesIncludingSystemCallLog()) {
-      coalescedValues.putAll(dataSource.coalesce(individualRows));
-    }
-    return coalescedValues;
-  }
+      // Two different DialerPhoneNumbers could be combined if they are different but considered
+      // to be a match by libphonenumber; in this case we arbitrarily select the most recent one.
+      try {
+        coalescedRowBuilder.setNumber(
+            DialerPhoneNumber.parseFrom(annotatedCallLogRow.getBlob(numberColumn)));
+      } catch (InvalidProtocolBufferException e) {
+        throw Assert.createAssertionFailException("Unable to parse DialerPhoneNumber bytes", e);
+      }
 
-  /**
-   * Build a {@link CoalescedIds} proto that contains IDs of the rows in {@link AnnotatedCallLog}
-   * that are coalesced into one row in {@link CoalescedAnnotatedCallLog}.
-   *
-   * @param individualRows {@link AnnotatedCallLog} rows sorted by timestamp descending
-   * @return A {@link CoalescedIds} proto containing IDs of {@code individualRows}.
-   */
-  private CoalescedIds getCoalescedIds(List<ContentValues> individualRows) {
-    CoalescedIds.Builder coalescedIds = CoalescedIds.newBuilder();
+      String formattedNumber = annotatedCallLogRow.getString(formattedNumberColumn);
+      if (!TextUtils.isEmpty(formattedNumber)) {
+        coalescedRowBuilder.setFormattedNumber(formattedNumber);
+      }
 
-    for (ContentValues row : individualRows) {
-      coalescedIds.addCoalescedId(Preconditions.checkNotNull(row.getAsLong(AnnotatedCallLog._ID)));
+      String geocodedLocation = annotatedCallLogRow.getString(geocodedLocationColumn);
+      if (!TextUtils.isEmpty(geocodedLocation)) {
+        coalescedRowBuilder.setGeocodedLocation(geocodedLocation);
+      }
+
+      String phoneAccountComponentName =
+          annotatedCallLogRow.getString(phoneAccountComponentNameColumn);
+      if (!TextUtils.isEmpty(phoneAccountComponentName)) {
+        coalescedRowBuilder.setPhoneAccountComponentName(phoneAccountComponentName);
+      }
+
+      String phoneAccountId = annotatedCallLogRow.getString(phoneAccountIdColumn);
+      if (!TextUtils.isEmpty(phoneAccountId)) {
+        coalescedRowBuilder.setPhoneAccountId(phoneAccountId);
+      }
+
+      try {
+        coalescedRowBuilder.setNumberAttributes(
+            NumberAttributes.parseFrom(annotatedCallLogRow.getBlob(numberAttributesColumn)));
+      } catch (InvalidProtocolBufferException e) {
+        throw Assert.createAssertionFailException("Unable to parse NumberAttributes bytes", e);
+      }
+
+      String voicemailCallTag = annotatedCallLogRow.getString(voicemailCallTagColumn);
+      if (!TextUtils.isEmpty(voicemailCallTag)) {
+        coalescedRowBuilder.setVoicemailCallTag(voicemailCallTag);
+      }
+
+      coalescedIdsBuilder.addCoalescedId(annotatedCallLogRow.getInt(idColumn));
+      return true;
     }
 
-    return coalescedIds.build();
+    /** Builds a {@link CoalescedRow} based on all rows merged into the current group. */
+    CoalescedRow combine() {
+      return coalescedRowBuilder.setCoalescedIds(coalescedIdsBuilder.build()).build();
+    }
+
+    /**
+     * Returns true if the given {@link AnnotatedCallLog} row can be merged into the current group.
+     */
+    private boolean canMergeRow(Cursor annotatedCallLogRow) {
+      return coalescedIdsBuilder.getCoalescedIdList().isEmpty()
+          || (samePhoneAccount(annotatedCallLogRow)
+              && sameNumberPresentation(annotatedCallLogRow)
+              && meetsCallFeatureCriteria(annotatedCallLogRow)
+              && meetsDialerPhoneNumberCriteria(annotatedCallLogRow));
+    }
+
+    private boolean samePhoneAccount(Cursor annotatedCallLogRow) {
+      PhoneAccountHandle groupPhoneAccountHandle =
+          TelecomUtil.composePhoneAccountHandle(
+              coalescedRowBuilder.getPhoneAccountComponentName(),
+              coalescedRowBuilder.getPhoneAccountId());
+      PhoneAccountHandle rowPhoneAccountHandle =
+          TelecomUtil.composePhoneAccountHandle(
+              annotatedCallLogRow.getString(phoneAccountComponentNameColumn),
+              annotatedCallLogRow.getString(phoneAccountIdColumn));
+
+      return Objects.equals(groupPhoneAccountHandle, rowPhoneAccountHandle);
+    }
+
+    private boolean sameNumberPresentation(Cursor annotatedCallLogRow) {
+      return coalescedRowBuilder.getNumberPresentation()
+          == annotatedCallLogRow.getInt(numberPresentationColumn);
+    }
+
+    private boolean meetsCallFeatureCriteria(Cursor annotatedCallLogRow) {
+      int groupFeatures = coalescedRowBuilder.getFeatures();
+      int rowFeatures = annotatedCallLogRow.getInt(featuresColumn);
+
+      // A row with FEATURES_ASSISTED_DIALING should not be combined with one without it.
+      if ((groupFeatures & TelephonyManagerCompat.FEATURES_ASSISTED_DIALING)
+          != (rowFeatures & TelephonyManagerCompat.FEATURES_ASSISTED_DIALING)) {
+        return false;
+      }
+
+      // A video call should not be combined with one that is not a video call.
+      if ((groupFeatures & Calls.FEATURES_VIDEO) != (rowFeatures & Calls.FEATURES_VIDEO)) {
+        return false;
+      }
+
+      // A RTT call should not be combined with one that is not a RTT call.
+      if ((groupFeatures & Calls.FEATURES_RTT) != (rowFeatures & Calls.FEATURES_RTT)) {
+        return false;
+      }
+
+      return true;
+    }
+
+    private boolean meetsDialerPhoneNumberCriteria(Cursor annotatedCallLogRow) {
+      DialerPhoneNumber groupPhoneNumber = coalescedRowBuilder.getNumber();
+
+      DialerPhoneNumber rowPhoneNumber;
+      try {
+        byte[] rowPhoneNumberBytes = annotatedCallLogRow.getBlob(numberColumn);
+        if (rowPhoneNumberBytes == null) {
+          return false; // Empty numbers should not be combined.
+        }
+        rowPhoneNumber = DialerPhoneNumber.parseFrom(rowPhoneNumberBytes);
+      } catch (InvalidProtocolBufferException e) {
+        throw Assert.createAssertionFailException("Unable to parse DialerPhoneNumber bytes", e);
+      }
+
+      if (dialerPhoneNumberUtil == null) {
+        dialerPhoneNumberUtil = new DialerPhoneNumberUtil();
+      }
+
+      return dialerPhoneNumberUtil.isMatch(groupPhoneNumber, rowPhoneNumber);
+    }
   }
 
-  /**
-   * @param contentValues a {@link CoalescedAnnotatedCallLog} row
-   * @param matrixCursor represents {@link CoalescedAnnotatedCallLog}
-   */
-  private static void addContentValuesToMatrixCursor(
-      ContentValues contentValues, MatrixCursor matrixCursor, int rowId) {
-    MatrixCursor.RowBuilder rowBuilder = matrixCursor.newRow();
-    rowBuilder.add(CoalescedAnnotatedCallLog._ID, rowId);
-    for (Map.Entry<String, Object> entry : contentValues.valueSet()) {
-      rowBuilder.add(entry.getKey(), entry.getValue());
+  /** A checked exception thrown when expected failure happens when coalescing is in progress. */
+  public static final class ExpectedCoalescerException extends Exception {
+    ExpectedCoalescerException(Throwable throwable) {
+      super("Expected coalescing exception", throwable);
     }
   }
 }
diff --git a/java/com/android/dialer/calllog/database/contract/AnnotatedCallLogContract.java b/java/com/android/dialer/calllog/database/contract/AnnotatedCallLogContract.java
index c181d75..1fdf38a 100644
--- a/java/com/android/dialer/calllog/database/contract/AnnotatedCallLogContract.java
+++ b/java/com/android/dialer/calllog/database/contract/AnnotatedCallLogContract.java
@@ -21,7 +21,6 @@
 import android.provider.BaseColumns;
 import com.android.dialer.compat.android.provider.VoicemailCompat;
 import com.android.dialer.constants.Constants;
-import java.util.Arrays;
 
 /** Contract for the AnnotatedCallLog content provider. */
 public class AnnotatedCallLogContract {
@@ -29,142 +28,8 @@
 
   public static final Uri CONTENT_URI = Uri.parse("content://" + AUTHORITY);
 
-  /**
-   * Columns shared by {@link AnnotatedCallLog} and {@link CoalescedAnnotatedCallLog}.
-   *
-   * <p>When adding columns be sure to update {@link #ALL_COMMON_COLUMNS}.
-   */
-  interface CommonColumns extends BaseColumns {
-
-    /**
-     * Timestamp of the entry, in milliseconds.
-     *
-     * <p>Type: INTEGER (long)
-     */
-    String TIMESTAMP = "timestamp";
-
-    /**
-     * The phone number called or number the call came from, encoded as a {@link
-     * com.android.dialer.DialerPhoneNumber} proto. The number may be empty if it was an incoming
-     * call and the number was unknown.
-     *
-     * <p>Type: BLOB
-     */
-    String NUMBER = "number";
-
-    /**
-     * The number formatted as it should be displayed to the user. Note that it may not always be
-     * displayed, for example if the number has a corresponding person or business name.
-     *
-     * <p>Type: TEXT
-     */
-    String FORMATTED_NUMBER = "formatted_number";
-
-    /**
-     * See {@link android.provider.CallLog.Calls#NUMBER_PRESENTATION}.
-     *
-     * <p>Type: INTEGER (int)
-     */
-    String NUMBER_PRESENTATION = "presentation";
-
-    /**
-     * See {@link android.provider.CallLog.Calls#IS_READ}.
-     *
-     * <p>TYPE: INTEGER (boolean)
-     */
-    String IS_READ = "is_read";
-
-    /**
-     * See {@link android.provider.CallLog.Calls#NEW}.
-     *
-     * <p>Type: INTEGER (boolean)
-     */
-    String NEW = "new";
-
-    /**
-     * See {@link android.provider.CallLog.Calls#GEOCODED_LOCATION}.
-     *
-     * <p>TYPE: TEXT
-     */
-    String GEOCODED_LOCATION = "geocoded_location";
-
-    /**
-     * See {@link android.provider.CallLog.Calls#PHONE_ACCOUNT_COMPONENT_NAME}.
-     *
-     * <p>TYPE: TEXT
-     */
-    String PHONE_ACCOUNT_COMPONENT_NAME = "phone_account_component_name";
-
-    /**
-     * See {@link android.provider.CallLog.Calls#PHONE_ACCOUNT_ID}.
-     *
-     * <p>TYPE: TEXT
-     */
-    String PHONE_ACCOUNT_ID = "phone_account_id";
-
-    /**
-     * String suitable for display which indicates the phone account used to make the call.
-     *
-     * <p>TYPE: TEXT
-     */
-    String PHONE_ACCOUNT_LABEL = "phone_account_label";
-
-    /**
-     * The color int for the phone account.
-     *
-     * <p>TYPE: INTEGER (int)
-     */
-    String PHONE_ACCOUNT_COLOR = "phone_account_color";
-
-    /**
-     * See {@link android.provider.CallLog.Calls#FEATURES}.
-     *
-     * <p>TYPE: INTEGER (int)
-     */
-    String FEATURES = "features";
-
-    /**
-     * Additional attributes about the number.
-     *
-     * <p>TYPE: BLOB
-     *
-     * @see com.android.dialer.NumberAttributes
-     */
-    String NUMBER_ATTRIBUTES = "number_attributes";
-
-    /**
-     * Copied from {@link android.provider.CallLog.Calls#TYPE}.
-     *
-     * <p>Type: INTEGER (int)
-     */
-    String CALL_TYPE = "call_type";
-
-    String[] ALL_COMMON_COLUMNS =
-        new String[] {
-          _ID,
-          TIMESTAMP,
-          NUMBER,
-          FORMATTED_NUMBER,
-          NUMBER_PRESENTATION,
-          IS_READ,
-          NEW,
-          GEOCODED_LOCATION,
-          PHONE_ACCOUNT_COMPONENT_NAME,
-          PHONE_ACCOUNT_ID,
-          PHONE_ACCOUNT_LABEL,
-          PHONE_ACCOUNT_COLOR,
-          FEATURES,
-          NUMBER_ATTRIBUTES,
-          CALL_TYPE
-        };
-  }
-
-  /**
-   * AnnotatedCallLog table.
-   *
-   * <p>This contains all of the non-coalesced call log entries.
-   */
-  public static final class AnnotatedCallLog implements CommonColumns {
+  /** AnnotatedCallLog table. */
+  public static final class AnnotatedCallLog implements BaseColumns {
 
     public static final String TABLE = "AnnotatedCallLog";
     public static final String DISTINCT_PHONE_NUMBERS = "DistinctPhoneNumbers";
@@ -181,6 +46,114 @@
     public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/annotated_call_log";
 
     /**
+     * Timestamp of the entry, in milliseconds.
+     *
+     * <p>Type: INTEGER (long)
+     */
+    public static final String TIMESTAMP = "timestamp";
+
+    /**
+     * The phone number called or number the call came from, encoded as a {@link
+     * com.android.dialer.DialerPhoneNumber} proto. The number may be empty if it was an incoming
+     * call and the number was unknown.
+     *
+     * <p>Type: BLOB
+     */
+    public static final String NUMBER = "number";
+
+    /**
+     * The number formatted as it should be displayed to the user. Note that it may not always be
+     * displayed, for example if the number has a corresponding person or business name.
+     *
+     * <p>Type: TEXT
+     */
+    public static final String FORMATTED_NUMBER = "formatted_number";
+
+    /**
+     * See {@link android.provider.CallLog.Calls#NUMBER_PRESENTATION}.
+     *
+     * <p>Type: INTEGER (int)
+     */
+    public static final String NUMBER_PRESENTATION = "presentation";
+
+    /**
+     * See {@link android.provider.CallLog.Calls#IS_READ}.
+     *
+     * <p>TYPE: INTEGER (boolean)
+     */
+    public static final String IS_READ = "is_read";
+
+    /**
+     * See {@link android.provider.CallLog.Calls#NEW}.
+     *
+     * <p>Type: INTEGER (boolean)
+     */
+    public static final String NEW = "new";
+
+    /**
+     * See {@link android.provider.CallLog.Calls#GEOCODED_LOCATION}.
+     *
+     * <p>TYPE: TEXT
+     */
+    public static final String GEOCODED_LOCATION = "geocoded_location";
+
+    /**
+     * See {@link android.provider.CallLog.Calls#PHONE_ACCOUNT_COMPONENT_NAME}.
+     *
+     * <p>TYPE: TEXT
+     */
+    public static final String PHONE_ACCOUNT_COMPONENT_NAME = "phone_account_component_name";
+
+    /**
+     * See {@link android.provider.CallLog.Calls#PHONE_ACCOUNT_ID}.
+     *
+     * <p>TYPE: TEXT
+     */
+    public static final String PHONE_ACCOUNT_ID = "phone_account_id";
+
+    /**
+     * See {@link android.provider.CallLog.Calls#FEATURES}.
+     *
+     * <p>TYPE: INTEGER (int)
+     */
+    public static final String FEATURES = "features";
+
+    /**
+     * Additional attributes about the number.
+     *
+     * <p>TYPE: BLOB
+     *
+     * @see com.android.dialer.NumberAttributes
+     */
+    public static final String NUMBER_ATTRIBUTES = "number_attributes";
+
+    /**
+     * Whether the call is to the voicemail inbox.
+     *
+     * <p>TYPE: INTEGER (boolean)
+     *
+     * @see android.telecom.TelecomManager#isVoiceMailNumber(android.telecom.PhoneAccountHandle,
+     *     String)
+     */
+    public static final String IS_VOICEMAIL_CALL = "is_voicemail_call";
+
+    /**
+     * The "name" of the voicemail inbox. This is provided by the SIM to show as the caller ID
+     *
+     * <p>TYPE: TEXT
+     *
+     * @see android.telephony.TelephonyManager#getVoiceMailAlphaTag()
+     */
+    public static final String VOICEMAIL_CALL_TAG = "voicemail_call_tag";
+
+    /**
+     * Copied from {@link android.provider.CallLog.Calls#TYPE}.
+     *
+     * <p>Type: INTEGER (int)
+     */
+    public static final String CALL_TYPE = "call_type";
+
+    /**
      * See {@link android.provider.CallLog.Calls#DATA_USAGE}.
      *
      * <p>Type: INTEGER (long)
@@ -202,9 +175,9 @@
     public static final String TRANSCRIPTION = "transcription";
 
     /**
-     * See {@link VoicemailCompat.TRANSCRIPTION_STATE}
+     * See {@link VoicemailCompat#TRANSCRIPTION_STATE}
      *
-     * <p>Only populated in {@link Build.VERSION_CODES.O} and above
+     * <p>Only populated in {@link Build.VERSION_CODES#O} and above
      *
      * <p>TYPE: INTEGER
      */
@@ -216,50 +189,16 @@
      * <p>TYPE: TEXT
      */
     public static final String VOICEMAIL_URI = "voicemail_uri";
-  }
-
-  /**
-   * Coalesced view of the AnnotatedCallLog table.
-   *
-   * <p>This is an in-memory view of the {@link AnnotatedCallLog} with some adjacent entries
-   * collapsed.
-   *
-   * <p>When adding columns be sure to update {@link #COLUMNS_ONLY_IN_COALESCED_CALL_LOG}.
-   */
-  public static final class CoalescedAnnotatedCallLog implements CommonColumns {
-
-    public static final String TABLE = "CoalescedAnnotatedCallLog";
-
-    /** The content URI for this table. */
-    public static final Uri CONTENT_URI =
-        Uri.withAppendedPath(AnnotatedCallLogContract.CONTENT_URI, TABLE);
-
-    /** The MIME type of a {@link android.content.ContentProvider#getType(Uri)} single entry. */
-    public static final String CONTENT_ITEM_TYPE =
-        "vnd.android.cursor.item/coalesced_annotated_call_log";
 
     /**
-     * IDs of rows in {@link AnnotatedCallLog} that are coalesced into one row in {@link
-     * CoalescedAnnotatedCallLog}, encoded as a {@link com.android.dialer.CoalescedIds} proto.
+     * An unique id to associate this call log row to a {@link android.telecom.Call}.
      *
-     * <p>Type: BLOB
+     * <p>For pre-Q device, this is same as {@link #TIMESTAMP}.
+     *
+     * <p>For Q+ device, this will be copied from {@link android.provider.CallLog.Calls}.
+     *
+     * <p>Type: TEXT
      */
-    public static final String COALESCED_IDS = "coalesced_ids";
-
-    /**
-     * Columns that are only in the {@link CoalescedAnnotatedCallLog} but not the {@link
-     * AnnotatedCallLog}.
-     */
-    private static final String[] COLUMNS_ONLY_IN_COALESCED_CALL_LOG = new String[] {COALESCED_IDS};
-
-    /** All columns in the {@link CoalescedAnnotatedCallLog}. */
-    public static final String[] ALL_COLUMNS =
-        concat(ALL_COMMON_COLUMNS, COLUMNS_ONLY_IN_COALESCED_CALL_LOG);
-  }
-
-  private static String[] concat(String[] first, String[] second) {
-    String[] result = Arrays.copyOf(first, first.length + second.length);
-    System.arraycopy(second, 0, result, first.length, second.length);
-    return result;
+    public static final String CALL_MAPPING_ID = "call_mapping_id";
   }
 }
diff --git a/java/com/android/dialer/calllog/database/contract/number_attributes.proto b/java/com/android/dialer/calllog/database/contract/number_attributes.proto
index e24f393..2c46d1b 100644
--- a/java/com/android/dialer/calllog/database/contract/number_attributes.proto
+++ b/java/com/android/dialer/calllog/database/contract/number_attributes.proto
@@ -24,7 +24,7 @@
 import "java/com/android/dialer/logging/contact_source.proto";
 
 // Information related to the phone number of the call.
-// Next ID: 13
+// Next ID: 15
 message NumberAttributes {
   // The name (which may be a person's name or business name, but not a number)
   // formatted exactly as it should appear to the user. If the user's locale or
@@ -52,22 +52,29 @@
   // The number is a call to a business from nearby places lookup.
   optional bool is_business = 6;
 
-  // The number is a call to the voicemail inbox.
-  optional bool is_voicemail = 7;
-
   // Can the number be reported as invalid through People API
-  optional bool can_report_as_invalid_number = 8;
+  optional bool can_report_as_invalid_number = 7;
 
   // True if the CP2 information is incomplete and needs to be queried at
   // display time.
-  optional bool is_cp2_info_incomplete = 9;
+  optional bool is_cp2_info_incomplete = 8;
 
   // Whether the number is blocked.
-  optional bool is_blocked = 10;
+  optional bool is_blocked = 9;
 
   // Whether the number is spam.
-  optional bool is_spam = 11;
+  optional bool is_spam = 10;
 
   // Source of the contact associated with the number.
-  optional com.android.dialer.logging.ContactSource.Type contact_source = 12;
+  optional com.android.dialer.logging.ContactSource.Type contact_source = 11;
+
+  // Whether the number can be reached via a carrier video call.
+  optional bool can_support_carrier_video_call = 12;
+
+  // Description of the number's geolocation (e.g., "Mountain View, CA").
+  // This string is for display purpose only.
+  optional string geolocation = 13;
+
+  // Whether the number is an emergency number.
+  optional bool is_emergency_number = 14;
 }
\ No newline at end of file
diff --git a/java/com/android/dialer/calllog/datasources/CallLogDataSource.java b/java/com/android/dialer/calllog/datasources/CallLogDataSource.java
index dbed1d8..72676a2 100644
--- a/java/com/android/dialer/calllog/datasources/CallLogDataSource.java
+++ b/java/com/android/dialer/calllog/datasources/CallLogDataSource.java
@@ -16,13 +16,8 @@
 
 package com.android.dialer.calllog.datasources;
 
-import android.content.ContentValues;
-import android.content.Context;
 import android.support.annotation.MainThread;
-import android.support.annotation.WorkerThread;
-import com.android.dialer.calllog.database.contract.AnnotatedCallLogContract;
 import com.google.common.util.concurrent.ListenableFuture;
-import java.util.List;
 
 /**
  * A source of data for one or more columns in the annotated call log.
@@ -32,23 +27,20 @@
  * always invoked.
  *
  * <ol>
- *   <li>{@link #isDirty(Context)}: Invoked only if the framework doesn't yet know if a rebuild is
+ *   <li>{@link #isDirty()}: Invoked only if the framework doesn't yet know if a rebuild is
  *       necessary.
- *   <li>{@link #fill(Context, CallLogMutations)}: Invoked only if the framework determined a
- *       rebuild is necessary.
- *   <li>{@link #onSuccessfulFill(Context)}: Invoked if and only if fill was previously called and
- *       the mutations provided by the previous fill operation succeeded in being applied.
+ *   <li>{@link #fill(CallLogMutations)}: Invoked only if the framework determined a rebuild is
+ *       necessary.
+ *   <li>{@link #onSuccessfulFill()}: Invoked if and only if fill was previously called and the
+ *       mutations provided by the previous fill operation succeeded in being applied.
  * </ol>
  *
- * <p>Because {@link #isDirty(Context)} is not always invoked, {@link #fill(Context,
- * CallLogMutations)} shouldn't rely on any state saved during {@link #isDirty(Context)}. It
- * <em>is</em> safe to assume that {@link #onSuccessfulFill(Context)} refers to the previous fill
- * operation.
+ * <p>Because {@link #isDirty()} is not always invoked, {@link #fill(CallLogMutations)} shouldn't
+ * rely on any state saved during {@link #isDirty()}. It <em>is</em> safe to assume that {@link
+ * #onSuccessfulFill()} refers to the previous fill operation.
  *
  * <p>The same data source objects may be reused across multiple checkDirtyAndRebuild cycles, so
  * implementors should take care to clear any internal state at the start of a new cycle.
- *
- * <p>{@link #coalesce(List)} may be called from any worker thread at any time.
  */
 public interface CallLogDataSource {
 
@@ -65,7 +57,7 @@
    *
    * @see CallLogDataSource class doc for complete lifecyle information
    */
-  ListenableFuture<Boolean> isDirty(Context appContext);
+  ListenableFuture<Boolean> isDirty();
 
   /**
    * Computes the set of mutations necessary to update the annotated call log with respect to this
@@ -76,7 +68,7 @@
    *     contain inserts from the system call log, and these inserts should be modified by each data
    *     source.
    */
-  ListenableFuture<Void> fill(Context appContext, CallLogMutations mutations);
+  ListenableFuture<Void> fill(CallLogMutations mutations);
 
   /**
    * Called after database mutations have been applied to all data sources. This is useful for
@@ -85,24 +77,25 @@
    *
    * @see CallLogDataSource class doc for complete lifecyle information
    */
-  ListenableFuture<Void> onSuccessfulFill(Context appContext);
-
-  /**
-   * Combines raw annotated call log rows into a single coalesced row.
-   *
-   * <p>May be called by any worker thread at any time so implementations should take care to be
-   * threadsafe. (Ideally no state should be required to implement this.)
-   *
-   * @param individualRowsSortedByTimestampDesc group of fully populated rows from {@link
-   *     AnnotatedCallLogContract.AnnotatedCallLog} which need to be combined for display purposes.
-   *     This method should not modify this list.
-   * @return a partial {@link AnnotatedCallLogContract.CoalescedAnnotatedCallLog} row containing
-   *     only columns which this data source is responsible for, which is the result of aggregating
-   *     {@code individualRowsSortedByTimestampDesc}.
-   */
-  @WorkerThread
-  ContentValues coalesce(List<ContentValues> individualRowsSortedByTimestampDesc);
+  ListenableFuture<Void> onSuccessfulFill();
 
   @MainThread
-  void registerContentObservers(Context appContext);
+  void registerContentObservers();
+
+  @MainThread
+  void unregisterContentObservers();
+
+  /**
+   * Clear any data written by this data source. This is called when the new call log framework has
+   * been disabled (because for example there was a problem with it).
+   */
+  @MainThread
+  ListenableFuture<Void> clearData();
+
+  /**
+   * The name of this daa source for logging purposes. This is generally the same as the class name
+   * (but should not use methods from {@link Class} because the class names are generally obfuscated
+   * by Proguard.
+   */
+  String getLoggingName();
 }
diff --git a/java/com/android/dialer/calllog/datasources/phonelookup/PhoneLookupDataSource.java b/java/com/android/dialer/calllog/datasources/phonelookup/PhoneLookupDataSource.java
index ff8c931..a805212 100644
--- a/java/com/android/dialer/calllog/datasources/phonelookup/PhoneLookupDataSource.java
+++ b/java/com/android/dialer/calllog/datasources/phonelookup/PhoneLookupDataSource.java
@@ -31,15 +31,16 @@
 import com.android.dialer.calllog.database.contract.AnnotatedCallLogContract.AnnotatedCallLog;
 import com.android.dialer.calllog.datasources.CallLogDataSource;
 import com.android.dialer.calllog.datasources.CallLogMutations;
-import com.android.dialer.calllog.datasources.util.RowCombiner;
-import com.android.dialer.calllogutils.NumberAttributesConverter;
+import com.android.dialer.calllogutils.NumberAttributesBuilder;
 import com.android.dialer.common.Assert;
 import com.android.dialer.common.LogUtil;
 import com.android.dialer.common.concurrent.Annotations.BackgroundExecutor;
 import com.android.dialer.common.concurrent.Annotations.LightweightExecutor;
+import com.android.dialer.inject.ApplicationContext;
 import com.android.dialer.phonelookup.PhoneLookup;
 import com.android.dialer.phonelookup.PhoneLookupInfo;
 import com.android.dialer.phonelookup.composite.CompositePhoneLookup;
+import com.android.dialer.phonelookup.database.PhoneLookupHistoryDatabaseHelper;
 import com.android.dialer.phonelookup.database.contract.PhoneLookupHistoryContract;
 import com.android.dialer.phonelookup.database.contract.PhoneLookupHistoryContract.PhoneLookupHistory;
 import com.google.common.collect.ImmutableMap;
@@ -48,10 +49,10 @@
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.ListeningExecutorService;
+import com.google.common.util.concurrent.MoreExecutors;
 import com.google.protobuf.InvalidProtocolBufferException;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
@@ -64,6 +65,7 @@
  */
 public final class PhoneLookupDataSource implements CallLogDataSource {
 
+  private final Context appContext;
   private final CompositePhoneLookup compositePhoneLookup;
   private final ListeningExecutorService backgroundExecutorService;
   private final ListeningExecutorService lightweightExecutorService;
@@ -71,8 +73,8 @@
   /**
    * Keyed by normalized number (the primary key for PhoneLookupHistory).
    *
-   * <p>This is state saved between the {@link #fill(Context, CallLogMutations)} and {@link
-   * #onSuccessfulFill(Context)} operations.
+   * <p>This is state saved between the {@link CallLogDataSource#fill(CallLogMutations)} and {@link
+   * CallLogDataSource#onSuccessfulFill()} operations.
    */
   private final Map<String, PhoneLookupInfo> phoneLookupHistoryRowsToUpdate = new ArrayMap<>();
 
@@ -80,23 +82,29 @@
    * Normalized numbers (the primary key for PhoneLookupHistory) which should be deleted from
    * PhoneLookupHistory.
    *
-   * <p>This is state saved between the {@link #fill(Context, CallLogMutations)} and {@link
-   * #onSuccessfulFill(Context)} operations.
+   * <p>This is state saved between the {@link CallLogDataSource#fill(CallLogMutations)} and {@link
+   * CallLogDataSource#onSuccessfulFill()} operations.
    */
   private final Set<String> phoneLookupHistoryRowsToDelete = new ArraySet<>();
 
+  private final PhoneLookupHistoryDatabaseHelper phoneLookupHistoryDatabaseHelper;
+
   @Inject
   PhoneLookupDataSource(
+      @ApplicationContext Context appContext,
       CompositePhoneLookup compositePhoneLookup,
       @BackgroundExecutor ListeningExecutorService backgroundExecutorService,
-      @LightweightExecutor ListeningExecutorService lightweightExecutorService) {
+      @LightweightExecutor ListeningExecutorService lightweightExecutorService,
+      PhoneLookupHistoryDatabaseHelper phoneLookupHistoryDatabaseHelper) {
+    this.appContext = appContext;
     this.compositePhoneLookup = compositePhoneLookup;
     this.backgroundExecutorService = backgroundExecutorService;
     this.lightweightExecutorService = lightweightExecutorService;
+    this.phoneLookupHistoryDatabaseHelper = phoneLookupHistoryDatabaseHelper;
   }
 
   @Override
-  public ListenableFuture<Boolean> isDirty(Context appContext) {
+  public ListenableFuture<Boolean> isDirty() {
     ListenableFuture<ImmutableSet<DialerPhoneNumber>> phoneNumbers =
         backgroundExecutorService.submit(
             () -> queryDistinctDialerPhoneNumbersFromAnnotatedCallLog(appContext));
@@ -133,7 +141,7 @@
    * </ul>
    */
   @Override
-  public ListenableFuture<Void> fill(Context appContext, CallLogMutations mutations) {
+  public ListenableFuture<Void> fill(CallLogMutations mutations) {
     LogUtil.v(
         "PhoneLookupDataSource.fill",
         "processing mutations (inserts: %d, updates: %d, deletes: %d)",
@@ -237,7 +245,7 @@
   }
 
   @Override
-  public ListenableFuture<Void> onSuccessfulFill(Context appContext) {
+  public ListenableFuture<Void> onSuccessfulFill() {
     // First update and/or delete the appropriate rows in PhoneLookupHistory.
     ListenableFuture<Void> writePhoneLookupHistory =
         backgroundExecutorService.submit(() -> writePhoneLookupHistory(appContext));
@@ -280,18 +288,31 @@
     return null;
   }
 
-  @WorkerThread
-  @Override
-  public ContentValues coalesce(List<ContentValues> individualRowsSortedByTimestampDesc) {
-    return new RowCombiner(individualRowsSortedByTimestampDesc)
-        .useMostRecentBlob(AnnotatedCallLog.NUMBER_ATTRIBUTES)
-        .combine();
-  }
-
   @MainThread
   @Override
-  public void registerContentObservers(Context appContext) {
-    compositePhoneLookup.registerContentObservers(appContext);
+  public void registerContentObservers() {
+    compositePhoneLookup.registerContentObservers();
+  }
+
+  @Override
+  public void unregisterContentObservers() {
+    compositePhoneLookup.unregisterContentObservers();
+  }
+
+  @Override
+  public ListenableFuture<Void> clearData() {
+    ListenableFuture<Void> clearDataFuture = compositePhoneLookup.clearData();
+    ListenableFuture<Void> deleteDatabaseFuture = phoneLookupHistoryDatabaseHelper.delete();
+
+    return Futures.transform(
+        Futures.allAsList(clearDataFuture, deleteDatabaseFuture),
+        unused -> null,
+        MoreExecutors.directExecutor());
+  }
+
+  @Override
+  public String getLoggingName() {
+    return "PhoneLookupDataSource";
   }
 
   private static ImmutableSet<DialerPhoneNumber>
@@ -567,6 +588,6 @@
   private void updateContentValues(ContentValues contentValues, PhoneLookupInfo phoneLookupInfo) {
     contentValues.put(
         AnnotatedCallLog.NUMBER_ATTRIBUTES,
-        NumberAttributesConverter.fromPhoneLookupInfo(phoneLookupInfo).build().toByteArray());
+        NumberAttributesBuilder.fromPhoneLookupInfo(phoneLookupInfo).build().toByteArray());
   }
 }
diff --git a/java/com/android/dialer/calllog/datasources/systemcalllog/SystemCallLogDataSource.java b/java/com/android/dialer/calllog/datasources/systemcalllog/SystemCallLogDataSource.java
index 6daa5e7..3e123c9 100644
--- a/java/com/android/dialer/calllog/datasources/systemcalllog/SystemCallLogDataSource.java
+++ b/java/com/android/dialer/calllog/datasources/systemcalllog/SystemCallLogDataSource.java
@@ -17,89 +17,95 @@
 package com.android.dialer.calllog.datasources.systemcalllog;
 
 import android.Manifest.permission;
-import android.annotation.TargetApi;
 import android.content.ContentValues;
 import android.content.Context;
+import android.content.SharedPreferences;
 import android.database.Cursor;
-import android.os.Build;
 import android.os.Build.VERSION;
 import android.os.Build.VERSION_CODES;
 import android.provider.CallLog;
 import android.provider.CallLog.Calls;
 import android.provider.VoicemailContract;
 import android.provider.VoicemailContract.Voicemails;
-import android.support.annotation.ColorInt;
-import android.support.annotation.MainThread;
 import android.support.annotation.Nullable;
 import android.support.annotation.RequiresApi;
 import android.support.annotation.VisibleForTesting;
 import android.support.annotation.WorkerThread;
-import android.telecom.PhoneAccount;
-import android.telecom.PhoneAccountHandle;
 import android.telephony.PhoneNumberUtils;
 import android.text.TextUtils;
 import android.util.ArraySet;
 import com.android.dialer.DialerPhoneNumber;
+import com.android.dialer.calllog.database.AnnotatedCallLogDatabaseHelper;
 import com.android.dialer.calllog.database.contract.AnnotatedCallLogContract.AnnotatedCallLog;
 import com.android.dialer.calllog.datasources.CallLogDataSource;
 import com.android.dialer.calllog.datasources.CallLogMutations;
-import com.android.dialer.calllog.datasources.util.RowCombiner;
 import com.android.dialer.calllog.observer.MarkDirtyObserver;
-import com.android.dialer.calllogutils.PhoneAccountUtils;
 import com.android.dialer.common.Assert;
 import com.android.dialer.common.LogUtil;
 import com.android.dialer.common.concurrent.Annotations.BackgroundExecutor;
 import com.android.dialer.compat.android.provider.VoicemailCompat;
+import com.android.dialer.duo.Duo;
+import com.android.dialer.inject.ApplicationContext;
 import com.android.dialer.phonenumberproto.DialerPhoneNumberUtil;
-import com.android.dialer.storage.StorageComponent;
-import com.android.dialer.telecom.TelecomUtil;
-import com.android.dialer.theme.R;
+import com.android.dialer.storage.Unencrypted;
 import com.android.dialer.util.PermissionsUtil;
 import com.google.common.collect.Iterables;
+import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.ListeningExecutorService;
-import com.google.i18n.phonenumbers.PhoneNumberUtil;
+import com.google.common.util.concurrent.MoreExecutors;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Set;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 
 /**
  * Responsible for defining the rows in the annotated call log and maintaining the columns in it
  * which are derived from the system call log.
  */
+@Singleton
 @SuppressWarnings("MissingPermission")
 public class SystemCallLogDataSource implements CallLogDataSource {
 
   @VisibleForTesting
   static final String PREF_LAST_TIMESTAMP_PROCESSED = "systemCallLogLastTimestampProcessed";
 
+  private final Context appContext;
   private final ListeningExecutorService backgroundExecutorService;
   private final MarkDirtyObserver markDirtyObserver;
+  private final SharedPreferences sharedPreferences;
+  private final AnnotatedCallLogDatabaseHelper annotatedCallLogDatabaseHelper;
+  private final Duo duo;
 
   @Nullable private Long lastTimestampProcessed;
+  private boolean isCallLogContentObserverRegistered = false;
 
   @Inject
   SystemCallLogDataSource(
+      @ApplicationContext Context appContext,
       @BackgroundExecutor ListeningExecutorService backgroundExecutorService,
-      MarkDirtyObserver markDirtyObserver) {
+      MarkDirtyObserver markDirtyObserver,
+      @Unencrypted SharedPreferences sharedPreferences,
+      AnnotatedCallLogDatabaseHelper annotatedCallLogDatabaseHelper,
+      Duo duo) {
+    this.appContext = appContext;
     this.backgroundExecutorService = backgroundExecutorService;
     this.markDirtyObserver = markDirtyObserver;
+    this.sharedPreferences = sharedPreferences;
+    this.annotatedCallLogDatabaseHelper = annotatedCallLogDatabaseHelper;
+    this.duo = duo;
   }
 
-  @MainThread
   @Override
-  public void registerContentObservers(Context appContext) {
-    Assert.isMainThread();
-
+  public void registerContentObservers() {
     LogUtil.enterBlock("SystemCallLogDataSource.registerContentObservers");
 
     if (!PermissionsUtil.hasCallLogReadPermissions(appContext)) {
       LogUtil.i("SystemCallLogDataSource.registerContentObservers", "no call log permissions");
       return;
     }
-    // TODO(zachh): Need to somehow register observers if user enables permission after launch?
 
     // The system call log has a last updated timestamp, but deletes are physical (the "deleted"
     // column is unused). This means that we can't detect deletes without scanning the entire table,
@@ -108,6 +114,7 @@
     appContext
         .getContentResolver()
         .registerContentObserver(CallLog.Calls.CONTENT_URI_WITH_VOICEMAIL, true, markDirtyObserver);
+    isCallLogContentObserverRegistered = true;
 
     if (!PermissionsUtil.hasAddVoicemailPermissions(appContext)) {
       LogUtil.i("SystemCallLogDataSource.registerContentObservers", "no add voicemail permissions");
@@ -120,22 +127,56 @@
   }
 
   @Override
-  public ListenableFuture<Boolean> isDirty(Context appContext) {
-    return backgroundExecutorService.submit(() -> isDirtyInternal(appContext));
+  public void unregisterContentObservers() {
+    appContext.getContentResolver().unregisterContentObserver(markDirtyObserver);
+    isCallLogContentObserverRegistered = false;
   }
 
   @Override
-  public ListenableFuture<Void> fill(Context appContext, CallLogMutations mutations) {
-    return backgroundExecutorService.submit(() -> fillInternal(appContext, mutations));
+  public ListenableFuture<Void> clearData() {
+    ListenableFuture<Void> deleteSharedPref =
+        backgroundExecutorService.submit(
+            () -> {
+              sharedPreferences.edit().remove(PREF_LAST_TIMESTAMP_PROCESSED).apply();
+              return null;
+            });
+
+    return Futures.transform(
+        Futures.allAsList(deleteSharedPref, annotatedCallLogDatabaseHelper.delete()),
+        unused -> null,
+        MoreExecutors.directExecutor());
   }
 
   @Override
-  public ListenableFuture<Void> onSuccessfulFill(Context appContext) {
-    return backgroundExecutorService.submit(() -> onSuccessfulFillInternal(appContext));
+  public String getLoggingName() {
+    return "SystemCallLogDataSource";
+  }
+
+  @Override
+  public ListenableFuture<Boolean> isDirty() {
+    // This can happen if the call log permission is enabled after the application is started.
+    if (!isCallLogContentObserverRegistered
+        && PermissionsUtil.hasCallLogReadPermissions(appContext)) {
+      registerContentObservers();
+      // Consider the data source dirty because calls could have been missed while the content
+      // observer wasn't registered.
+      return Futures.immediateFuture(true);
+    }
+    return backgroundExecutorService.submit(this::isDirtyInternal);
+  }
+
+  @Override
+  public ListenableFuture<Void> fill(CallLogMutations mutations) {
+    return backgroundExecutorService.submit(() -> fillInternal(mutations));
+  }
+
+  @Override
+  public ListenableFuture<Void> onSuccessfulFill() {
+    return backgroundExecutorService.submit(this::onSuccessfulFillInternal);
   }
 
   @WorkerThread
-  private boolean isDirtyInternal(Context appContext) {
+  private boolean isDirtyInternal() {
     Assert.isWorkerThread();
 
     /*
@@ -146,13 +187,11 @@
      *
      * Just return false unless the table has never been written to.
      */
-    return !StorageComponent.get(appContext)
-        .unencryptedSharedPrefs()
-        .contains(PREF_LAST_TIMESTAMP_PROCESSED);
+    return !sharedPreferences.contains(PREF_LAST_TIMESTAMP_PROCESSED);
   }
 
   @WorkerThread
-  private Void fillInternal(Context appContext, CallLogMutations mutations) {
+  private Void fillInternal(CallLogMutations mutations) {
     Assert.isWorkerThread();
 
     lastTimestampProcessed = null;
@@ -178,11 +217,10 @@
   }
 
   @WorkerThread
-  private Void onSuccessfulFillInternal(Context appContext) {
+  private Void onSuccessfulFillInternal() {
     // If a fill operation was a no-op, lastTimestampProcessed could still be null.
     if (lastTimestampProcessed != null) {
-      StorageComponent.get(appContext)
-          .unencryptedSharedPrefs()
+      sharedPreferences
           .edit()
           .putLong(PREF_LAST_TIMESTAMP_PROCESSED, lastTimestampProcessed)
           .apply();
@@ -190,50 +228,11 @@
     return null;
   }
 
-  @Override
-  public ContentValues coalesce(List<ContentValues> individualRowsSortedByTimestampDesc) {
-    assertNoVoicemailsInRows(individualRowsSortedByTimestampDesc);
-
-    return new RowCombiner(individualRowsSortedByTimestampDesc)
-        .useMostRecentLong(AnnotatedCallLog.TIMESTAMP)
-        .useMostRecentLong(AnnotatedCallLog.NEW)
-        // Two different DialerPhoneNumbers could be combined if they are different but considered
-        // to be an "exact match" by libphonenumber; in this case we arbitrarily select the most
-        // recent one.
-        .useMostRecentBlob(AnnotatedCallLog.NUMBER)
-        .useMostRecentString(AnnotatedCallLog.FORMATTED_NUMBER)
-        .useSingleValueInt(AnnotatedCallLog.NUMBER_PRESENTATION)
-        .useMostRecentString(AnnotatedCallLog.GEOCODED_LOCATION)
-        .useSingleValueString(AnnotatedCallLog.PHONE_ACCOUNT_COMPONENT_NAME)
-        .useSingleValueString(AnnotatedCallLog.PHONE_ACCOUNT_ID)
-        .useSingleValueString(AnnotatedCallLog.PHONE_ACCOUNT_LABEL)
-        .useSingleValueLong(AnnotatedCallLog.PHONE_ACCOUNT_COLOR)
-        .useMostRecentLong(AnnotatedCallLog.CALL_TYPE)
-        // If any call in a group includes a feature (like Wifi/HD), consider the group to have the
-        // feature.
-        .bitwiseOr(AnnotatedCallLog.FEATURES)
-        .combine();
-  }
-
-  private void assertNoVoicemailsInRows(List<ContentValues> individualRowsSortedByTimestampDesc) {
-    for (ContentValues contentValue : individualRowsSortedByTimestampDesc) {
-      if (contentValue.getAsLong(AnnotatedCallLog.CALL_TYPE) != null) {
-        Assert.checkArgument(
-            contentValue.getAsLong(AnnotatedCallLog.CALL_TYPE) != Calls.VOICEMAIL_TYPE);
-      }
-    }
-  }
-
-  @TargetApi(Build.VERSION_CODES.M) // Uses try-with-resources
   private void handleInsertsAndUpdates(
       Context appContext, CallLogMutations mutations, Set<Long> existingAnnotatedCallLogIds) {
-    long previousTimestampProcessed =
-        StorageComponent.get(appContext)
-            .unencryptedSharedPrefs()
-            .getLong(PREF_LAST_TIMESTAMP_PROCESSED, 0L);
+    long previousTimestampProcessed = sharedPreferences.getLong(PREF_LAST_TIMESTAMP_PROCESSED, 0L);
 
-    DialerPhoneNumberUtil dialerPhoneNumberUtil =
-        new DialerPhoneNumberUtil(PhoneNumberUtil.getInstance());
+    DialerPhoneNumberUtil dialerPhoneNumberUtil = new DialerPhoneNumberUtil();
 
     // TODO(zachh): Really should be getting last 1000 by timestamp, not by last modified.
     try (Cursor cursor =
@@ -242,7 +241,6 @@
             .query(
                 Calls.CONTENT_URI_WITH_VOICEMAIL,
                 getProjection(),
-                // TODO(a bug): LAST_MODIFIED not available on M
                 Calls.LAST_MODIFIED + " > ? AND " + Voicemails.DELETED + " = 0",
                 new String[] {String.valueOf(previousTimestampProcessed)},
                 Calls.LAST_MODIFIED + " DESC LIMIT 1000")) {
@@ -252,111 +250,137 @@
         return;
       }
 
+      if (!cursor.moveToFirst()) {
+        LogUtil.i("SystemCallLogDataSource.handleInsertsAndUpdates", "no entries to insert/update");
+        return;
+      }
+
       LogUtil.i(
           "SystemCallLogDataSource.handleInsertsAndUpdates",
           "found %d entries to insert/update",
           cursor.getCount());
 
-      if (cursor.moveToFirst()) {
-        int idColumn = cursor.getColumnIndexOrThrow(Calls._ID);
-        int dateColumn = cursor.getColumnIndexOrThrow(Calls.DATE);
-        int lastModifiedColumn = cursor.getColumnIndexOrThrow(Calls.LAST_MODIFIED);
-        int numberColumn = cursor.getColumnIndexOrThrow(Calls.NUMBER);
-        int presentationColumn = cursor.getColumnIndexOrThrow(Calls.NUMBER_PRESENTATION);
-        int typeColumn = cursor.getColumnIndexOrThrow(Calls.TYPE);
-        int countryIsoColumn = cursor.getColumnIndexOrThrow(Calls.COUNTRY_ISO);
-        int durationsColumn = cursor.getColumnIndexOrThrow(Calls.DURATION);
-        int dataUsageColumn = cursor.getColumnIndexOrThrow(Calls.DATA_USAGE);
-        int transcriptionColumn = cursor.getColumnIndexOrThrow(Calls.TRANSCRIPTION);
-        int voicemailUriColumn = cursor.getColumnIndexOrThrow(Calls.VOICEMAIL_URI);
-        int isReadColumn = cursor.getColumnIndexOrThrow(Calls.IS_READ);
-        int newColumn = cursor.getColumnIndexOrThrow(Calls.NEW);
-        int geocodedLocationColumn = cursor.getColumnIndexOrThrow(Calls.GEOCODED_LOCATION);
-        int phoneAccountComponentColumn =
-            cursor.getColumnIndexOrThrow(Calls.PHONE_ACCOUNT_COMPONENT_NAME);
-        int phoneAccountIdColumn = cursor.getColumnIndexOrThrow(Calls.PHONE_ACCOUNT_ID);
-        int featuresColumn = cursor.getColumnIndexOrThrow(Calls.FEATURES);
-        int postDialDigitsColumn = cursor.getColumnIndexOrThrow(Calls.POST_DIAL_DIGITS);
+      int idColumn = cursor.getColumnIndexOrThrow(Calls._ID);
+      int dateColumn = cursor.getColumnIndexOrThrow(Calls.DATE);
+      int lastModifiedColumn = cursor.getColumnIndexOrThrow(Calls.LAST_MODIFIED);
+      int numberColumn = cursor.getColumnIndexOrThrow(Calls.NUMBER);
+      int presentationColumn = cursor.getColumnIndexOrThrow(Calls.NUMBER_PRESENTATION);
+      int typeColumn = cursor.getColumnIndexOrThrow(Calls.TYPE);
+      int countryIsoColumn = cursor.getColumnIndexOrThrow(Calls.COUNTRY_ISO);
+      int durationsColumn = cursor.getColumnIndexOrThrow(Calls.DURATION);
+      int dataUsageColumn = cursor.getColumnIndexOrThrow(Calls.DATA_USAGE);
+      int transcriptionColumn = cursor.getColumnIndexOrThrow(Calls.TRANSCRIPTION);
+      int voicemailUriColumn = cursor.getColumnIndexOrThrow(Calls.VOICEMAIL_URI);
+      int isReadColumn = cursor.getColumnIndexOrThrow(Calls.IS_READ);
+      int newColumn = cursor.getColumnIndexOrThrow(Calls.NEW);
+      int geocodedLocationColumn = cursor.getColumnIndexOrThrow(Calls.GEOCODED_LOCATION);
+      int phoneAccountComponentColumn =
+          cursor.getColumnIndexOrThrow(Calls.PHONE_ACCOUNT_COMPONENT_NAME);
+      int phoneAccountIdColumn = cursor.getColumnIndexOrThrow(Calls.PHONE_ACCOUNT_ID);
+      int featuresColumn = cursor.getColumnIndexOrThrow(Calls.FEATURES);
+      int postDialDigitsColumn = cursor.getColumnIndexOrThrow(Calls.POST_DIAL_DIGITS);
 
-        // The cursor orders by LAST_MODIFIED DESC, so the first result is the most recent timestamp
-        // processed.
-        lastTimestampProcessed = cursor.getLong(lastModifiedColumn);
-        do {
-          long id = cursor.getLong(idColumn);
-          long date = cursor.getLong(dateColumn);
-          String numberAsStr = cursor.getString(numberColumn);
-          int type;
-          if (cursor.isNull(typeColumn) || (type = cursor.getInt(typeColumn)) == 0) {
-            // CallLog.Calls#TYPE lists the allowed values, which are non-null and non-zero.
-            throw new IllegalStateException("call type is missing");
+      // The cursor orders by LAST_MODIFIED DESC, so the first result is the most recent timestamp
+      // processed.
+      lastTimestampProcessed = cursor.getLong(lastModifiedColumn);
+      do {
+        long id = cursor.getLong(idColumn);
+        long date = cursor.getLong(dateColumn);
+        String numberAsStr = cursor.getString(numberColumn);
+        int type;
+        if (cursor.isNull(typeColumn) || (type = cursor.getInt(typeColumn)) == 0) {
+          // CallLog.Calls#TYPE lists the allowed values, which are non-null and non-zero.
+          throw new IllegalStateException("call type is missing");
+        }
+        int presentation;
+        if (cursor.isNull(presentationColumn)
+            || (presentation = cursor.getInt(presentationColumn)) == 0) {
+          // CallLog.Calls#NUMBER_PRESENTATION lists the allowed values, which are non-null and
+          // non-zero.
+          throw new IllegalStateException("presentation is missing");
+        }
+        String countryIso = cursor.getString(countryIsoColumn);
+        int duration = cursor.getInt(durationsColumn);
+        int dataUsage = cursor.getInt(dataUsageColumn);
+        String transcription = cursor.getString(transcriptionColumn);
+        String voicemailUri = cursor.getString(voicemailUriColumn);
+        int isRead = cursor.getInt(isReadColumn);
+        int isNew = cursor.getInt(newColumn);
+        String geocodedLocation = cursor.getString(geocodedLocationColumn);
+        String phoneAccountComponentName = cursor.getString(phoneAccountComponentColumn);
+        String phoneAccountId = cursor.getString(phoneAccountIdColumn);
+        int features = cursor.getInt(featuresColumn);
+        String postDialDigits = cursor.getString(postDialDigitsColumn);
+
+        // Exclude Duo audio calls.
+        if (isDuoAudioCall(phoneAccountComponentName, features)) {
+          continue;
+        }
+
+        ContentValues contentValues = new ContentValues();
+        contentValues.put(AnnotatedCallLog.TIMESTAMP, date);
+
+        if (!TextUtils.isEmpty(numberAsStr)) {
+          String numberWithPostDialDigits =
+              postDialDigits == null ? numberAsStr : numberAsStr + postDialDigits;
+          DialerPhoneNumber dialerPhoneNumber =
+              dialerPhoneNumberUtil.parse(numberWithPostDialDigits, countryIso);
+
+          contentValues.put(AnnotatedCallLog.NUMBER, dialerPhoneNumber.toByteArray());
+          String formattedNumber =
+              PhoneNumberUtils.formatNumber(numberWithPostDialDigits, countryIso);
+          if (formattedNumber == null) {
+            formattedNumber = numberWithPostDialDigits;
           }
-          int presentation;
-          if (cursor.isNull(presentationColumn)
-              || (presentation = cursor.getInt(presentationColumn)) == 0) {
-            // CallLog.Calls#NUMBER_PRESENTATION lists the allowed values, which are non-null and
-            // non-zero.
-            throw new IllegalStateException("presentation is missing");
-          }
-          String countryIso = cursor.getString(countryIsoColumn);
-          int duration = cursor.getInt(durationsColumn);
-          int dataUsage = cursor.getInt(dataUsageColumn);
-          String transcription = cursor.getString(transcriptionColumn);
-          String voicemailUri = cursor.getString(voicemailUriColumn);
-          int isRead = cursor.getInt(isReadColumn);
-          int isNew = cursor.getInt(newColumn);
-          String geocodedLocation = cursor.getString(geocodedLocationColumn);
-          String phoneAccountComponentName = cursor.getString(phoneAccountComponentColumn);
-          String phoneAccountId = cursor.getString(phoneAccountIdColumn);
-          int features = cursor.getInt(featuresColumn);
-          String postDialDigits = cursor.getString(postDialDigitsColumn);
-
-          ContentValues contentValues = new ContentValues();
-          contentValues.put(AnnotatedCallLog.TIMESTAMP, date);
-
-          if (!TextUtils.isEmpty(numberAsStr)) {
-            String numberWithPostDialDigits =
-                postDialDigits == null ? numberAsStr : numberAsStr + postDialDigits;
-            DialerPhoneNumber dialerPhoneNumber =
-                dialerPhoneNumberUtil.parse(numberWithPostDialDigits, countryIso);
-
-            contentValues.put(AnnotatedCallLog.NUMBER, dialerPhoneNumber.toByteArray());
-            String formattedNumber =
-                PhoneNumberUtils.formatNumber(numberWithPostDialDigits, countryIso);
-            if (formattedNumber == null) {
-              formattedNumber = numberWithPostDialDigits;
-            }
-            contentValues.put(AnnotatedCallLog.FORMATTED_NUMBER, formattedNumber);
-          } else {
-            contentValues.put(
-                AnnotatedCallLog.NUMBER, DialerPhoneNumber.getDefaultInstance().toByteArray());
-          }
-          contentValues.put(AnnotatedCallLog.NUMBER_PRESENTATION, presentation);
-          contentValues.put(AnnotatedCallLog.CALL_TYPE, type);
-          contentValues.put(AnnotatedCallLog.IS_READ, isRead);
-          contentValues.put(AnnotatedCallLog.NEW, isNew);
-          contentValues.put(AnnotatedCallLog.GEOCODED_LOCATION, geocodedLocation);
+          contentValues.put(AnnotatedCallLog.FORMATTED_NUMBER, formattedNumber);
+        } else {
           contentValues.put(
-              AnnotatedCallLog.PHONE_ACCOUNT_COMPONENT_NAME, phoneAccountComponentName);
-          contentValues.put(AnnotatedCallLog.PHONE_ACCOUNT_ID, phoneAccountId);
-          populatePhoneAccountLabelAndColor(
-              appContext, contentValues, phoneAccountComponentName, phoneAccountId);
-          contentValues.put(AnnotatedCallLog.FEATURES, features);
-          contentValues.put(AnnotatedCallLog.DURATION, duration);
-          contentValues.put(AnnotatedCallLog.DATA_USAGE, dataUsage);
-          contentValues.put(AnnotatedCallLog.TRANSCRIPTION, transcription);
-          contentValues.put(AnnotatedCallLog.VOICEMAIL_URI, voicemailUri);
-          setTranscriptionState(cursor, contentValues);
+              AnnotatedCallLog.NUMBER, DialerPhoneNumber.getDefaultInstance().toByteArray());
+        }
+        contentValues.put(AnnotatedCallLog.NUMBER_PRESENTATION, presentation);
+        contentValues.put(AnnotatedCallLog.CALL_TYPE, type);
+        contentValues.put(AnnotatedCallLog.IS_READ, isRead);
+        contentValues.put(AnnotatedCallLog.NEW, isNew);
+        contentValues.put(AnnotatedCallLog.GEOCODED_LOCATION, geocodedLocation);
+        contentValues.put(AnnotatedCallLog.PHONE_ACCOUNT_COMPONENT_NAME, phoneAccountComponentName);
+        contentValues.put(AnnotatedCallLog.PHONE_ACCOUNT_ID, phoneAccountId);
+        contentValues.put(AnnotatedCallLog.FEATURES, features);
+        contentValues.put(AnnotatedCallLog.DURATION, duration);
+        contentValues.put(AnnotatedCallLog.DATA_USAGE, dataUsage);
+        contentValues.put(AnnotatedCallLog.TRANSCRIPTION, transcription);
+        contentValues.put(AnnotatedCallLog.VOICEMAIL_URI, voicemailUri);
 
-          if (existingAnnotatedCallLogIds.contains(id)) {
-            mutations.update(id, contentValues);
-          } else {
-            mutations.insert(id, contentValues);
-          }
-        } while (cursor.moveToNext());
-      } // else no new results, do nothing.
+        contentValues.put(AnnotatedCallLog.CALL_MAPPING_ID, String.valueOf(date));
+
+        setTranscriptionState(cursor, contentValues);
+
+        if (existingAnnotatedCallLogIds.contains(id)) {
+          mutations.update(id, contentValues);
+        } else {
+          mutations.insert(id, contentValues);
+        }
+      } while (cursor.moveToNext());
     }
   }
 
+  /**
+   * Returns true if the phone account component name and the features belong to a Duo audio call.
+   *
+   * <p>Characteristics of a Duo audio call are as follows.
+   *
+   * <ul>
+   *   <li>The phone account is {@link Duo#isDuoAccount(String)}; and
+   *   <li>The features don't include {@link Calls#FEATURES_VIDEO}.
+   * </ul>
+   *
+   * <p>It is the caller's responsibility to ensure the phone account component name and the
+   * features come from the same call log entry.
+   */
+  private boolean isDuoAudioCall(@Nullable String phoneAccountComponentName, int features) {
+    return duo.isDuoAccount(phoneAccountComponentName)
+        && ((features & Calls.FEATURES_VIDEO) != Calls.FEATURES_VIDEO);
+  }
+
   private void setTranscriptionState(Cursor cursor, ContentValues contentValues) {
     if (VERSION.SDK_INT >= VERSION_CODES.O) {
       int transcriptionStateColumn =
@@ -370,7 +394,7 @@
       new String[] {
         Calls._ID,
         Calls.DATE,
-        Calls.LAST_MODIFIED, // TODO(a bug): Not available in M
+        Calls.LAST_MODIFIED,
         Calls.NUMBER,
         Calls.NUMBER_PRESENTATION,
         Calls.TYPE,
@@ -385,7 +409,7 @@
         Calls.PHONE_ACCOUNT_COMPONENT_NAME,
         Calls.PHONE_ACCOUNT_ID,
         Calls.FEATURES,
-        Calls.POST_DIAL_DIGITS // TODO(a bug): Not available in M
+        Calls.POST_DIAL_DIGITS
       };
 
   @RequiresApi(VERSION_CODES.O)
@@ -404,32 +428,6 @@
     return PROJECTION_PRE_O;
   }
 
-  private void populatePhoneAccountLabelAndColor(
-      Context appContext,
-      ContentValues contentValues,
-      String phoneAccountComponentName,
-      String phoneAccountId) {
-    PhoneAccountHandle phoneAccountHandle =
-        TelecomUtil.composePhoneAccountHandle(phoneAccountComponentName, phoneAccountId);
-    if (phoneAccountHandle == null) {
-      return;
-    }
-    String label = PhoneAccountUtils.getAccountLabel(appContext, phoneAccountHandle);
-    if (TextUtils.isEmpty(label)) {
-      return;
-    }
-    contentValues.put(AnnotatedCallLog.PHONE_ACCOUNT_LABEL, label);
-
-    @ColorInt int color = PhoneAccountUtils.getAccountColor(appContext, phoneAccountHandle);
-    if (color == PhoneAccount.NO_HIGHLIGHT_COLOR) {
-      color =
-          appContext
-              .getResources()
-              .getColor(R.color.dialer_secondary_text_color, appContext.getTheme());
-    }
-    contentValues.put(AnnotatedCallLog.PHONE_ACCOUNT_COLOR, color);
-  }
-
   private static void handleDeletes(
       Context appContext, Set<Long> existingAnnotatedCallLogIds, CallLogMutations mutations) {
     Set<Long> systemCallLogIds =
@@ -452,7 +450,6 @@
     }
   }
 
-  @TargetApi(Build.VERSION_CODES.M) // Uses try-with-resources
   private static Set<Long> getAnnotatedCallLogIds(Context appContext) {
     ArraySet<Long> ids = new ArraySet<>();
 
@@ -481,7 +478,6 @@
     return ids;
   }
 
-  @TargetApi(Build.VERSION_CODES.M) // Uses try-with-resources
   private static Set<Long> getIdsFromSystemCallLogThatMatch(
       Context appContext, Set<Long> matchingIds) {
     ArraySet<Long> ids = new ArraySet<>();
diff --git a/java/com/android/dialer/calllog/datasources/util/RowCombiner.java b/java/com/android/dialer/calllog/datasources/util/RowCombiner.java
deleted file mode 100644
index 2bb65cc..0000000
--- a/java/com/android/dialer/calllog/datasources/util/RowCombiner.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-package com.android.dialer.calllog.datasources.util;
-
-import android.content.ContentValues;
-import com.android.dialer.common.Assert;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Objects;
-
-/** Convenience class for aggregating row values. */
-public class RowCombiner {
-  private final List<ContentValues> individualRowsSortedByTimestampDesc;
-  private final ContentValues combinedRow = new ContentValues();
-
-  public RowCombiner(List<ContentValues> individualRowsSortedByTimestampDesc) {
-    Assert.checkArgument(!individualRowsSortedByTimestampDesc.isEmpty());
-    this.individualRowsSortedByTimestampDesc = individualRowsSortedByTimestampDesc;
-  }
-
-  /** Use the most recent value for the specified column. */
-  public RowCombiner useMostRecentInt(String columnName) {
-    combinedRow.put(
-        columnName, individualRowsSortedByTimestampDesc.get(0).getAsInteger(columnName));
-    return this;
-  }
-
-  /** Use the most recent value for the specified column. */
-  public RowCombiner useMostRecentLong(String columnName) {
-    combinedRow.put(columnName, individualRowsSortedByTimestampDesc.get(0).getAsLong(columnName));
-    return this;
-  }
-
-  /** Use the most recent value for the specified column. */
-  public RowCombiner useMostRecentString(String columnName) {
-    combinedRow.put(columnName, individualRowsSortedByTimestampDesc.get(0).getAsString(columnName));
-    return this;
-  }
-
-  public RowCombiner useMostRecentBlob(String columnName) {
-    combinedRow.put(
-        columnName, individualRowsSortedByTimestampDesc.get(0).getAsByteArray(columnName));
-    return this;
-  }
-
-  /** Asserts that all column values for the given column name are the same, and uses it. */
-  public RowCombiner useSingleValueString(String columnName) {
-    Iterator<ContentValues> iterator = individualRowsSortedByTimestampDesc.iterator();
-    String singleValue = iterator.next().getAsString(columnName);
-    while (iterator.hasNext()) {
-      String current = iterator.next().getAsString(columnName);
-      Assert.checkState(Objects.equals(singleValue, current), "Values different for " + columnName);
-    }
-    combinedRow.put(columnName, singleValue);
-    return this;
-  }
-
-  /** Asserts that all column values for the given column name are the same, and uses it. */
-  public RowCombiner useSingleValueLong(String columnName) {
-    Iterator<ContentValues> iterator = individualRowsSortedByTimestampDesc.iterator();
-    Long singleValue = iterator.next().getAsLong(columnName);
-    while (iterator.hasNext()) {
-      Long current = iterator.next().getAsLong(columnName);
-      Assert.checkState(Objects.equals(singleValue, current), "Values different for " + columnName);
-    }
-    combinedRow.put(columnName, singleValue);
-    return this;
-  }
-
-  /** Asserts that all column values for the given column name are the same, and uses it. */
-  public RowCombiner useSingleValueInt(String columnName) {
-    Iterator<ContentValues> iterator = individualRowsSortedByTimestampDesc.iterator();
-    Integer singleValue = iterator.next().getAsInteger(columnName);
-    while (iterator.hasNext()) {
-      Integer current = iterator.next().getAsInteger(columnName);
-      Assert.checkState(Objects.equals(singleValue, current), "Values different for " + columnName);
-    }
-    combinedRow.put(columnName, singleValue);
-    return this;
-  }
-
-  /** Performs a bitwise OR on the specified column and yields the result. */
-  public RowCombiner bitwiseOr(String columnName) {
-    int combinedValue = 0;
-    for (ContentValues val : individualRowsSortedByTimestampDesc) {
-      combinedValue |= val.getAsInteger(columnName);
-    }
-    combinedRow.put(columnName, combinedValue);
-    return this;
-  }
-
-  public ContentValues combine() {
-    return combinedRow;
-  }
-}
diff --git a/java/com/android/dialer/calllog/datasources/voicemail/VoicemailDataSource.java b/java/com/android/dialer/calllog/datasources/voicemail/VoicemailDataSource.java
new file mode 100644
index 0000000..8d9cae2
--- /dev/null
+++ b/java/com/android/dialer/calllog/datasources/voicemail/VoicemailDataSource.java
@@ -0,0 +1,125 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.dialer.calllog.datasources.voicemail;
+
+import android.content.ContentValues;
+import android.content.Context;
+import android.telecom.PhoneAccountHandle;
+import android.telecom.TelecomManager;
+import android.telephony.TelephonyManager;
+import com.android.dialer.DialerPhoneNumber;
+import com.android.dialer.calllog.database.contract.AnnotatedCallLogContract.AnnotatedCallLog;
+import com.android.dialer.calllog.datasources.CallLogDataSource;
+import com.android.dialer.calllog.datasources.CallLogMutations;
+import com.android.dialer.common.concurrent.Annotations.BackgroundExecutor;
+import com.android.dialer.compat.telephony.TelephonyManagerCompat;
+import com.android.dialer.inject.ApplicationContext;
+import com.android.dialer.telecom.TelecomUtil;
+import com.android.dialer.util.PermissionsUtil;
+import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.ListenableFuture;
+import com.google.common.util.concurrent.ListeningExecutorService;
+import com.google.protobuf.InvalidProtocolBufferException;
+import java.util.Map.Entry;
+import javax.inject.Inject;
+
+/** Provide information for whether the call is a call to the voicemail inbox. */
+public class VoicemailDataSource implements CallLogDataSource {
+
+  private final Context appContext;
+  private final ListeningExecutorService backgroundExecutor;
+
+  @Inject
+  VoicemailDataSource(
+      @ApplicationContext Context appContext,
+      @BackgroundExecutor ListeningExecutorService backgroundExecutor) {
+    this.appContext = appContext;
+    this.backgroundExecutor = backgroundExecutor;
+  }
+
+  @Override
+  public ListenableFuture<Boolean> isDirty() {
+    // The isVoicemail status is immutable and permanent. The call will always show as "Voicemail"
+    // even if the SIM is swapped. Dialing the row will result in some unexpected number after a SIM
+    // swap but this is deemed acceptable.
+    return Futures.immediateFuture(false);
+  }
+
+  @Override
+  @SuppressWarnings("missingPermission")
+  public ListenableFuture<Void> fill(CallLogMutations mutations) {
+    if (!PermissionsUtil.hasReadPhoneStatePermissions(appContext)) {
+      for (Entry<Long, ContentValues> insert : mutations.getInserts().entrySet()) {
+        insert.getValue().put(AnnotatedCallLog.IS_VOICEMAIL_CALL, 0);
+      }
+      return Futures.immediateFuture(null);
+    }
+
+    return backgroundExecutor.submit(
+        () -> {
+          TelecomManager telecomManager = appContext.getSystemService(TelecomManager.class);
+          for (Entry<Long, ContentValues> insert : mutations.getInserts().entrySet()) {
+            ContentValues values = insert.getValue();
+            PhoneAccountHandle phoneAccountHandle =
+                TelecomUtil.composePhoneAccountHandle(
+                    values.getAsString(AnnotatedCallLog.PHONE_ACCOUNT_COMPONENT_NAME),
+                    values.getAsString(AnnotatedCallLog.PHONE_ACCOUNT_ID));
+            DialerPhoneNumber dialerPhoneNumber;
+            try {
+              dialerPhoneNumber =
+                  DialerPhoneNumber.parseFrom(values.getAsByteArray(AnnotatedCallLog.NUMBER));
+            } catch (InvalidProtocolBufferException e) {
+              throw new IllegalStateException(e);
+            }
+
+            if (telecomManager.isVoiceMailNumber(
+                phoneAccountHandle, dialerPhoneNumber.getNormalizedNumber())) {
+              values.put(AnnotatedCallLog.IS_VOICEMAIL_CALL, 1);
+              TelephonyManager telephonyManager =
+                  TelephonyManagerCompat.getTelephonyManagerForPhoneAccountHandle(
+                      appContext, phoneAccountHandle);
+              values.put(
+                  AnnotatedCallLog.VOICEMAIL_CALL_TAG, telephonyManager.getVoiceMailAlphaTag());
+            } else {
+              values.put(AnnotatedCallLog.IS_VOICEMAIL_CALL, 0);
+            }
+          }
+          return null;
+        });
+  }
+
+  @Override
+  public ListenableFuture<Void> onSuccessfulFill() {
+    return Futures.immediateFuture(null);
+  }
+
+  @Override
+  public void registerContentObservers() {}
+
+  @Override
+  public void unregisterContentObservers() {}
+
+  @Override
+  public ListenableFuture<Void> clearData() {
+    return Futures.immediateFuture(null);
+  }
+
+  @Override
+  public String getLoggingName() {
+    return "VoicemailDataSource";
+  }
+}
diff --git a/java/com/android/dialer/calllog/model/CoalescedRow.java b/java/com/android/dialer/calllog/model/CoalescedRow.java
deleted file mode 100644
index 2b6db97..0000000
--- a/java/com/android/dialer/calllog/model/CoalescedRow.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.dialer.calllog.model;
-
-import android.support.annotation.ColorInt;
-import android.support.annotation.Nullable;
-import com.android.dialer.CoalescedIds;
-import com.android.dialer.DialerPhoneNumber;
-import com.android.dialer.NumberAttributes;
-import com.google.auto.value.AutoValue;
-
-/** Data class containing the contents of a row from the CoalescedAnnotatedCallLog. */
-@AutoValue
-public abstract class CoalescedRow {
-
-  public static Builder builder() {
-    return new AutoValue_CoalescedRow.Builder()
-        .setId(0)
-        .setTimestamp(0)
-        .setNumber(DialerPhoneNumber.getDefaultInstance())
-        .setNumberPresentation(0)
-        .setIsRead(false)
-        .setIsNew(false)
-        .setPhoneAccountColor(0)
-        .setFeatures(0)
-        .setCallType(0)
-        .setNumberAttributes(NumberAttributes.getDefaultInstance())
-        .setCoalescedIds(CoalescedIds.getDefaultInstance());
-  }
-
-  public abstract Builder toBuilder();
-
-  public abstract int id();
-
-  public abstract long timestamp();
-
-  public abstract DialerPhoneNumber number();
-
-  @Nullable
-  public abstract String formattedNumber();
-
-  public abstract int numberPresentation();
-
-  public abstract boolean isRead();
-
-  public abstract boolean isNew();
-
-  @Nullable
-  public abstract String geocodedLocation();
-
-  @Nullable
-  public abstract String phoneAccountComponentName();
-
-  @Nullable
-  public abstract String phoneAccountId();
-
-  @Nullable
-  public abstract String phoneAccountLabel();
-
-  @ColorInt
-  public abstract int phoneAccountColor();
-
-  public abstract int features();
-
-  public abstract int callType();
-
-  public abstract NumberAttributes numberAttributes();
-
-  public abstract CoalescedIds coalescedIds();
-
-  /** Builder for {@link CoalescedRow}. */
-  @AutoValue.Builder
-  public abstract static class Builder {
-
-    public abstract Builder setId(int id);
-
-    public abstract Builder setTimestamp(long timestamp);
-
-    public abstract Builder setNumber(DialerPhoneNumber number);
-
-    public abstract Builder setFormattedNumber(@Nullable String formattedNumber);
-
-    public abstract Builder setNumberPresentation(int presentation);
-
-    public abstract Builder setIsRead(boolean isRead);
-
-    public abstract Builder setIsNew(boolean isNew);
-
-    public abstract Builder setGeocodedLocation(@Nullable String geocodedLocation);
-
-    public abstract Builder setPhoneAccountComponentName(
-        @Nullable String phoneAccountComponentName);
-
-    public abstract Builder setPhoneAccountId(@Nullable String phoneAccountId);
-
-    public abstract Builder setPhoneAccountLabel(@Nullable String phoneAccountLabel);
-
-    public abstract Builder setPhoneAccountColor(@ColorInt int phoneAccountColor);
-
-    public abstract Builder setFeatures(int features);
-
-    public abstract Builder setCallType(int callType);
-
-    public abstract Builder setNumberAttributes(NumberAttributes numberAttributes);
-
-    public abstract Builder setCoalescedIds(CoalescedIds coalescedIds);
-
-    public abstract CoalescedRow build();
-  }
-}
diff --git a/java/com/android/dialer/calllog/model/coalesced_row.proto b/java/com/android/dialer/calllog/model/coalesced_row.proto
new file mode 100644
index 0000000..913f072
--- /dev/null
+++ b/java/com/android/dialer/calllog/model/coalesced_row.proto
@@ -0,0 +1,64 @@
+syntax = "proto2";
+
+option java_package = "com.android.dialer.calllog.model";
+option java_multiple_files = true;
+option optimize_for = LITE_RUNTIME;
+
+
+package com.android.dialer.calllog.model;
+
+import "java/com/android/dialer/calllog/database/contract/coalesced_ids.proto";
+import "java/com/android/dialer/calllog/database/contract/number_attributes.proto";
+import "java/com/android/dialer/phonenumberproto/dialer_phone_number.proto";
+
+// Contains the contents of a row from the CoalescedAnnotatedCallLog.
+// Next ID: 17
+message CoalescedRow {
+  // Value in column CoalescedAnnotatedCallLog._ID
+  optional int64 id = 1;
+
+  // Value in column CoalescedAnnotatedCallLog.TIMESTAMP
+  optional int64 timestamp = 2;
+
+  // Value in column CoalescedAnnotatedCallLog.NUMBER
+  optional com.android.dialer.DialerPhoneNumber number = 3;
+
+  // Value in column CoalescedAnnotatedCallLog.FORMATTED_NUMBER
+  optional string formatted_number = 4;
+
+  // Value in column CoalescedAnnotatedCallLog.NUMBER_PRESENTATION
+  optional int32 number_presentation = 5;
+
+  // Value in column CoalescedAnnotatedCallLog.IS_READ
+  optional bool is_read = 6;
+
+  // Value in column CoalescedAnnotatedCallLog.NEW
+  optional bool is_new = 7;
+
+  // Value in column CoalescedAnnotatedCallLog.GEOCODED_LOCATION
+  optional string geocoded_location = 8;
+
+  // Value in column CoalescedAnnotatedCallLog.PHONE_ACCOUNT_COMPONENT_NAME
+  optional string phone_account_component_name = 9;
+
+  // Value in column CoalescedAnnotatedCallLog.PHONE_ACCOUNT_ID
+  optional string phone_account_id = 10;
+
+  // Value in column CoalescedAnnotatedCallLog.FEATURES
+  optional int32 features = 11;
+
+  // Value in column CoalescedAnnotatedCallLog.CALL_TYPE
+  optional int32 call_type = 12;
+
+  // Value in column CoalescedAnnotatedCallLog.NUMBER_ATTRIBUTES
+  optional com.android.dialer.NumberAttributes number_attributes = 13;
+
+  // Value in column CoalescedAnnotatedCallLog.IS_VOICEMAIL_CALL
+  optional bool is_voicemail_call = 14;
+
+  // Value in column CoalescedAnnotatedCallLog.VOICEMAIL_CALL_TAG
+  optional string voicemail_call_tag = 15;
+
+  // Value in column CoalescedAnnotatedCallLog.COALESCED_IDS
+  optional com.android.dialer.CoalescedIds coalesced_ids = 16;
+}
diff --git a/java/com/android/dialer/calllog/ui/AnnotatedCallLogCursorLoader.java b/java/com/android/dialer/calllog/ui/AnnotatedCallLogCursorLoader.java
new file mode 100644
index 0000000..6111cd8
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/AnnotatedCallLogCursorLoader.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.dialer.calllog.ui;
+
+import android.content.Context;
+import android.provider.CallLog.Calls;
+import android.support.v4.content.CursorLoader;
+import com.android.dialer.calllog.database.contract.AnnotatedCallLogContract.AnnotatedCallLog;
+
+/** Cursor loader for {@link AnnotatedCallLog}. */
+final class AnnotatedCallLogCursorLoader extends CursorLoader {
+
+  AnnotatedCallLogCursorLoader(Context context) {
+    super(
+        context,
+        AnnotatedCallLog.CONTENT_URI,
+        /* projection = */ null,
+        /* selection = */ AnnotatedCallLog.CALL_TYPE + " != ?",
+        /* selectionArgs = */ new String[] {Integer.toString(Calls.VOICEMAIL_TYPE)},
+        /* sortOrder = */ AnnotatedCallLog.TIMESTAMP + " DESC");
+  }
+}
diff --git a/java/com/android/dialer/calllog/ui/CoalescedAnnotatedCallLogCursorLoader.java b/java/com/android/dialer/calllog/ui/CoalescedAnnotatedCallLogCursorLoader.java
deleted file mode 100644
index 0b1c6c9..0000000
--- a/java/com/android/dialer/calllog/ui/CoalescedAnnotatedCallLogCursorLoader.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.dialer.calllog.ui;
-
-import android.content.Context;
-import android.database.Cursor;
-import android.support.v4.content.CursorLoader;
-import com.android.dialer.CoalescedIds;
-import com.android.dialer.DialerPhoneNumber;
-import com.android.dialer.NumberAttributes;
-import com.android.dialer.calllog.database.contract.AnnotatedCallLogContract.CoalescedAnnotatedCallLog;
-import com.android.dialer.calllog.model.CoalescedRow;
-import com.google.protobuf.InvalidProtocolBufferException;
-
-/** CursorLoader for the coalesced annotated call log. */
-final class CoalescedAnnotatedCallLogCursorLoader extends CursorLoader {
-
-  // Indexes for CoalescedAnnotatedCallLog.ALL_COLUMNS
-  private static final int ID = 0;
-  private static final int TIMESTAMP = 1;
-  private static final int NUMBER = 2;
-  private static final int FORMATTED_NUMBER = 3;
-  private static final int NUMBER_PRESENTATION = 4;
-  private static final int IS_READ = 5;
-  private static final int NEW = 6;
-  private static final int GEOCODED_LOCATION = 7;
-  private static final int PHONE_ACCOUNT_COMPONENT_NAME = 8;
-  private static final int PHONE_ACCOUNT_ID = 9;
-  private static final int PHONE_ACCOUNT_LABEL = 10;
-  private static final int PHONE_ACCOUNT_COLOR = 11;
-  private static final int FEATURES = 12;
-  private static final int NUMBER_ATTRIBUTES = 13;
-  private static final int CALL_TYPE = 14;
-  private static final int COALESCED_IDS = 15;
-
-  CoalescedAnnotatedCallLogCursorLoader(Context context) {
-    // CoalescedAnnotatedCallLog requires that PROJECTION be ALL_COLUMNS and the following params be
-    // null.
-    super(
-        context,
-        CoalescedAnnotatedCallLog.CONTENT_URI,
-        CoalescedAnnotatedCallLog.ALL_COLUMNS,
-        null,
-        null,
-        null);
-  }
-
-  /** Creates a new {@link CoalescedRow} from the provided cursor using the current position. */
-  static CoalescedRow toRow(Cursor cursor) {
-    DialerPhoneNumber number;
-    try {
-      number = DialerPhoneNumber.parseFrom(cursor.getBlob(NUMBER));
-    } catch (InvalidProtocolBufferException e) {
-      throw new IllegalStateException("Couldn't parse DialerPhoneNumber bytes");
-    }
-
-    CoalescedIds coalescedIds;
-    try {
-      coalescedIds = CoalescedIds.parseFrom(cursor.getBlob(COALESCED_IDS));
-    } catch (InvalidProtocolBufferException e) {
-      throw new IllegalStateException("Couldn't parse CoalescedIds bytes");
-    }
-
-    NumberAttributes numberAttributes;
-    try {
-      numberAttributes = NumberAttributes.parseFrom(cursor.getBlob(NUMBER_ATTRIBUTES));
-    } catch (InvalidProtocolBufferException e) {
-      throw new IllegalStateException("Couldn't parse NumberAttributes bytes");
-    }
-
-    return CoalescedRow.builder()
-        .setId(cursor.getInt(ID))
-        .setTimestamp(cursor.getLong(TIMESTAMP))
-        .setNumber(number)
-        .setFormattedNumber(cursor.getString(FORMATTED_NUMBER))
-        .setNumberPresentation(cursor.getInt(NUMBER_PRESENTATION))
-        .setIsRead(cursor.getInt(IS_READ) == 1)
-        .setIsNew(cursor.getInt(NEW) == 1)
-        .setGeocodedLocation(cursor.getString(GEOCODED_LOCATION))
-        .setPhoneAccountComponentName(cursor.getString(PHONE_ACCOUNT_COMPONENT_NAME))
-        .setPhoneAccountId(cursor.getString(PHONE_ACCOUNT_ID))
-        .setPhoneAccountLabel(cursor.getString(PHONE_ACCOUNT_LABEL))
-        .setPhoneAccountColor(cursor.getInt(PHONE_ACCOUNT_COLOR))
-        .setFeatures(cursor.getInt(FEATURES))
-        .setCallType(cursor.getInt(CALL_TYPE))
-        .setNumberAttributes(numberAttributes)
-        .setCoalescedIds(coalescedIds)
-        .build();
-  }
-
-  static long getTimestamp(Cursor cursor) {
-    return cursor.getLong(TIMESTAMP);
-  }
-}
diff --git a/java/com/android/dialer/calllog/ui/NewCallLogAdapter.java b/java/com/android/dialer/calllog/ui/NewCallLogAdapter.java
index f7ba9ef..185a93e 100644
--- a/java/com/android/dialer/calllog/ui/NewCallLogAdapter.java
+++ b/java/com/android/dialer/calllog/ui/NewCallLogAdapter.java
@@ -15,19 +15,21 @@
  */
 package com.android.dialer.calllog.ui;
 
+import android.app.Activity;
 import android.content.Context;
-import android.database.Cursor;
 import android.support.annotation.IntDef;
 import android.support.annotation.Nullable;
 import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.RecyclerView.ViewHolder;
 import android.view.LayoutInflater;
 import android.view.ViewGroup;
+import com.android.dialer.calllog.model.CoalescedRow;
 import com.android.dialer.calllogutils.CallLogDates;
 import com.android.dialer.common.Assert;
-import com.android.dialer.glidephotomanager.GlidePhotoManager;
-import com.android.dialer.glidephotomanager.GlidePhotoManagerComponent;
+import com.android.dialer.logging.Logger;
+import com.android.dialer.promotion.Promotion;
 import com.android.dialer.time.Clock;
+import com.google.common.collect.ImmutableList;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
@@ -37,27 +39,39 @@
   /** IntDef for the different types of rows that can be shown in the call log. */
   @Retention(RetentionPolicy.SOURCE)
   @IntDef({
+    RowType.PROMOTION_CARD,
     RowType.HEADER_TODAY,
     RowType.HEADER_YESTERDAY,
     RowType.HEADER_OLDER,
     RowType.CALL_LOG_ENTRY
   })
   @interface RowType {
+    /** The promotion card. */
+    int PROMOTION_CARD = 1;
+
     /** Header that displays "Today". */
-    int HEADER_TODAY = 1;
+    int HEADER_TODAY = 2;
+
     /** Header that displays "Yesterday". */
-    int HEADER_YESTERDAY = 2;
+    int HEADER_YESTERDAY = 3;
+
     /** Header that displays "Older". */
-    int HEADER_OLDER = 3;
+    int HEADER_OLDER = 4;
+
     /** A row representing a call log entry (which could represent one or more calls). */
-    int CALL_LOG_ENTRY = 4;
+    int CALL_LOG_ENTRY = 5;
   }
 
   private final Clock clock;
+  private final Activity activity;
   private final RealtimeRowProcessor realtimeRowProcessor;
-  private final GlidePhotoManager glidePhotoManager;
+  private final PopCounts popCounts = new PopCounts();
+  @Nullable private final Promotion promotion;
 
-  private Cursor cursor;
+  private ImmutableList<CoalescedRow> coalescedRows;
+
+  /** Position of the promotion card. Null when it should not be displayed. */
+  @Nullable private Integer promotionCardPosition;
 
   /** Position of the "Today" header. Null when it should not be displayed. */
   @Nullable private Integer todayHeaderPosition;
@@ -68,20 +82,26 @@
   /** Position of the "Older" header. Null when it should not be displayed. */
   @Nullable private Integer olderHeaderPosition;
 
-  NewCallLogAdapter(Context context, Cursor cursor, Clock clock) {
-    this.cursor = cursor;
+  NewCallLogAdapter(
+      Activity activity,
+      ImmutableList<CoalescedRow> coalescedRows,
+      Clock clock,
+      @Nullable Promotion promotion) {
+    this.activity = activity;
+    this.coalescedRows = coalescedRows;
     this.clock = clock;
-    this.realtimeRowProcessor = CallLogUiComponent.get(context).realtimeRowProcessor();
-    this.glidePhotoManager = GlidePhotoManagerComponent.get(context).glidePhotoManager();
+    this.realtimeRowProcessor = CallLogUiComponent.get(activity).realtimeRowProcessor();
+    this.promotion = promotion;
 
-    setHeaderPositions();
+    setCardAndHeaderPositions();
   }
 
-  void updateCursor(Cursor updatedCursor) {
-    this.cursor = updatedCursor;
+  void updateRows(ImmutableList<CoalescedRow> coalescedRows) {
+    this.coalescedRows = coalescedRows;
     this.realtimeRowProcessor.clearCache();
+    this.popCounts.reset();
 
-    setHeaderPositions();
+    setCardAndHeaderPositions();
     notifyDataSetChanged();
   }
 
@@ -89,30 +109,45 @@
     this.realtimeRowProcessor.clearCache();
   }
 
-  private void setHeaderPositions() {
+  void logMetrics(Context context) {
+    Logger.get(context).logAnnotatedCallLogMetrics(popCounts.popped, popCounts.didNotPop);
+  }
+
+  private void setCardAndHeaderPositions() {
+    // Set the position for the promotion card if it should be shown.
+    promotionCardPosition = null;
+    int numCards = 0;
+    if (promotion != null && promotion.isEligibleToBeShown()) {
+      promotionCardPosition = 0;
+      numCards++;
+    }
+
     // If there are no rows to display, set all header positions to null.
-    if (!cursor.moveToFirst()) {
+    if (coalescedRows.isEmpty()) {
       todayHeaderPosition = null;
       yesterdayHeaderPosition = null;
       olderHeaderPosition = null;
       return;
     }
 
+    // Calculate positions for headers.
     long currentTimeMillis = clock.currentTimeMillis();
 
     int numItemsInToday = 0;
     int numItemsInYesterday = 0;
-    do {
-      long timestamp = CoalescedAnnotatedCallLogCursorLoader.getTimestamp(cursor);
+    int numItemsInOlder = 0;
+    for (CoalescedRow coalescedRow : coalescedRows) {
+      long timestamp = coalescedRow.getTimestamp();
       long dayDifference = CallLogDates.getDayDifference(currentTimeMillis, timestamp);
       if (dayDifference == 0) {
         numItemsInToday++;
       } else if (dayDifference == 1) {
         numItemsInYesterday++;
       } else {
+        numItemsInOlder = coalescedRows.size() - numItemsInToday - numItemsInYesterday;
         break;
       }
-    } while (cursor.moveToNext());
+    }
 
     if (numItemsInToday > 0) {
       numItemsInToday++; // including the "Today" header;
@@ -120,30 +155,52 @@
     if (numItemsInYesterday > 0) {
       numItemsInYesterday++; // including the "Yesterday" header;
     }
+    if (numItemsInOlder > 0) {
+      numItemsInOlder++; // include the "Older" header;
+    }
 
     // Set all header positions.
     // A header position will be null if there is no item to be displayed under that header.
-    todayHeaderPosition = numItemsInToday > 0 ? 0 : null;
-    yesterdayHeaderPosition = numItemsInYesterday > 0 ? numItemsInToday : null;
-    olderHeaderPosition = !cursor.isAfterLast() ? numItemsInToday + numItemsInYesterday : null;
+    todayHeaderPosition = numItemsInToday > 0 ? numCards : null;
+    yesterdayHeaderPosition = numItemsInYesterday > 0 ? numItemsInToday + numCards : null;
+    olderHeaderPosition =
+        numItemsInOlder > 0 ? numItemsInToday + numItemsInYesterday + numCards : null;
+  }
+
+  @Override
+  public void onAttachedToRecyclerView(RecyclerView recyclerView) {
+    super.onAttachedToRecyclerView(recyclerView);
+
+    // Register a OnScrollListener that records when the promotion is viewed.
+    if (promotion != null && promotion.isEligibleToBeShown()) {
+      recyclerView.addOnScrollListener(
+          new OnScrollListenerForRecordingPromotionCardFirstViewTime(promotion));
+    }
   }
 
   @Override
   public ViewHolder onCreateViewHolder(ViewGroup viewGroup, @RowType int viewType) {
     switch (viewType) {
+      case RowType.PROMOTION_CARD:
+        return new PromotionCardViewHolder(
+            LayoutInflater.from(activity)
+                .inflate(
+                    R.layout.new_call_log_promotion_card, viewGroup, /* attachToRoot = */ false),
+            promotion);
       case RowType.HEADER_TODAY:
       case RowType.HEADER_YESTERDAY:
       case RowType.HEADER_OLDER:
         return new HeaderViewHolder(
-            LayoutInflater.from(viewGroup.getContext())
-                .inflate(R.layout.new_call_log_header, viewGroup, false));
+            LayoutInflater.from(activity)
+                .inflate(R.layout.new_call_log_header, viewGroup, /* attachToRoot = */ false));
       case RowType.CALL_LOG_ENTRY:
         return new NewCallLogViewHolder(
-            LayoutInflater.from(viewGroup.getContext())
-                .inflate(R.layout.new_call_log_entry, viewGroup, false),
+            activity,
+            LayoutInflater.from(activity)
+                .inflate(R.layout.new_call_log_entry, viewGroup, /* attachToRoot = */ false),
             clock,
             realtimeRowProcessor,
-            glidePhotoManager);
+            popCounts);
       default:
         throw Assert.createUnsupportedOperationFailException("Unsupported view type: " + viewType);
     }
@@ -153,6 +210,14 @@
   public void onBindViewHolder(ViewHolder viewHolder, int position) {
     @RowType int viewType = getItemViewType(position);
     switch (viewType) {
+      case RowType.PROMOTION_CARD:
+        ((PromotionCardViewHolder) viewHolder)
+            .setDismissListener(
+                () -> {
+                  notifyItemRemoved(promotionCardPosition);
+                  setCardAndHeaderPositions();
+                });
+        break;
       case RowType.HEADER_TODAY:
         ((HeaderViewHolder) viewHolder).setHeader(R.string.new_call_log_header_today);
         break;
@@ -164,18 +229,20 @@
         break;
       case RowType.CALL_LOG_ENTRY:
         NewCallLogViewHolder newCallLogViewHolder = (NewCallLogViewHolder) viewHolder;
-        int previousHeaders = 0;
+        int previousCardAndHeaders = 0;
+        if (promotionCardPosition != null && position > promotionCardPosition) {
+          previousCardAndHeaders++;
+        }
         if (todayHeaderPosition != null && position > todayHeaderPosition) {
-          previousHeaders++;
+          previousCardAndHeaders++;
         }
         if (yesterdayHeaderPosition != null && position > yesterdayHeaderPosition) {
-          previousHeaders++;
+          previousCardAndHeaders++;
         }
         if (olderHeaderPosition != null && position > olderHeaderPosition) {
-          previousHeaders++;
+          previousCardAndHeaders++;
         }
-        cursor.moveToPosition(position - previousHeaders);
-        newCallLogViewHolder.bind(cursor);
+        newCallLogViewHolder.bind(coalescedRows.get(position - previousCardAndHeaders));
         break;
       default:
         throw Assert.createIllegalStateFailException(
@@ -186,6 +253,9 @@
   @Override
   @RowType
   public int getItemViewType(int position) {
+    if (promotionCardPosition != null && position == promotionCardPosition) {
+      return RowType.PROMOTION_CARD;
+    }
     if (todayHeaderPosition != null && position == todayHeaderPosition) {
       return RowType.HEADER_TODAY;
     }
@@ -200,7 +270,12 @@
 
   @Override
   public int getItemCount() {
+    int numberOfCards = 0;
     int numberOfHeaders = 0;
+
+    if (promotionCardPosition != null) {
+      numberOfCards++;
+    }
     if (todayHeaderPosition != null) {
       numberOfHeaders++;
     }
@@ -210,6 +285,46 @@
     if (olderHeaderPosition != null) {
       numberOfHeaders++;
     }
-    return cursor.getCount() + numberOfHeaders;
+    return coalescedRows.size() + numberOfHeaders + numberOfCards;
+  }
+
+  /**
+   * A {@link RecyclerView.OnScrollListener} that records the timestamp at which the promotion card
+   * is first viewed.
+   *
+   * <p>We consider the card as viewed if the user scrolls the containing RecyclerView since such
+   * action is a strong proof.
+   */
+  private static final class OnScrollListenerForRecordingPromotionCardFirstViewTime
+      extends RecyclerView.OnScrollListener {
+
+    private final Promotion promotion;
+
+    OnScrollListenerForRecordingPromotionCardFirstViewTime(Promotion promotion) {
+      this.promotion = promotion;
+    }
+
+    @Override
+    public void onScrollStateChanged(RecyclerView recyclerView, int newState) {
+      if (newState == RecyclerView.SCROLL_STATE_SETTLING) {
+        promotion.onViewed();
+
+        // Recording promotion is viewed is this listener's sole responsibility.
+        // We can remove it from the containing RecyclerView after the job is done.
+        recyclerView.removeOnScrollListener(this);
+      }
+
+      super.onScrollStateChanged(recyclerView, newState);
+    }
+  }
+
+  static class PopCounts {
+    int popped;
+    int didNotPop;
+
+    private void reset() {
+      popped = 0;
+      didNotPop = 0;
+    }
   }
 }
diff --git a/java/com/android/dialer/calllog/ui/NewCallLogFragment.java b/java/com/android/dialer/calllog/ui/NewCallLogFragment.java
index bb1a730..62f99b6 100644
--- a/java/com/android/dialer/calllog/ui/NewCallLogFragment.java
+++ b/java/com/android/dialer/calllog/ui/NewCallLogFragment.java
@@ -15,11 +15,13 @@
  */
 package com.android.dialer.calllog.ui;
 
+import android.app.Activity;
 import android.database.Cursor;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.annotation.VisibleForTesting;
 import android.support.v4.app.Fragment;
+import android.support.v4.app.LoaderManager;
 import android.support.v4.app.LoaderManager.LoaderCallbacks;
 import android.support.v4.content.Loader;
 import android.support.v4.content.LocalBroadcastManager;
@@ -30,24 +32,43 @@
 import android.view.ViewGroup;
 import com.android.dialer.calllog.CallLogComponent;
 import com.android.dialer.calllog.RefreshAnnotatedCallLogReceiver;
+import com.android.dialer.calllog.database.CallLogDatabaseComponent;
+import com.android.dialer.calllog.database.Coalescer;
+import com.android.dialer.calllog.model.CoalescedRow;
+import com.android.dialer.common.Assert;
 import com.android.dialer.common.LogUtil;
 import com.android.dialer.common.concurrent.DefaultFutureCallback;
+import com.android.dialer.common.concurrent.DialerExecutorComponent;
+import com.android.dialer.common.concurrent.SupportUiListener;
 import com.android.dialer.common.concurrent.ThreadUtil;
 import com.android.dialer.metrics.Metrics;
 import com.android.dialer.metrics.MetricsComponent;
 import com.android.dialer.metrics.jank.RecyclerViewJankLogger;
+import com.android.dialer.promotion.Promotion.PromotionType;
+import com.android.dialer.promotion.PromotionComponent;
+import com.android.dialer.util.PermissionsUtil;
+import com.android.dialer.widget.EmptyContentView;
+import com.android.dialer.widget.EmptyContentView.OnEmptyViewActionButtonClickedListener;
+import com.google.common.collect.ImmutableList;
 import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.MoreExecutors;
+import java.util.Arrays;
 import java.util.concurrent.TimeUnit;
 
 /** The "new" call log fragment implementation, which is built on top of the annotated call log. */
 public final class NewCallLogFragment extends Fragment implements LoaderCallbacks<Cursor> {
 
+  private static final int PHONE_PERMISSIONS_REQUEST_CODE = 1;
+  private static final int LOADER_ID = 0;
+
   @VisibleForTesting
   static final long MARK_ALL_CALLS_READ_WAIT_MILLIS = TimeUnit.SECONDS.toMillis(3);
 
-  private RefreshAnnotatedCallLogReceiver refreshAnnotatedCallLogReceiver;
   private RecyclerView recyclerView;
+  private EmptyContentView emptyContentView;
+  private RefreshAnnotatedCallLogReceiver refreshAnnotatedCallLogReceiver;
+  private SupportUiListener<ImmutableList<CoalescedRow>> coalesingAnnotatedCallLogListener;
 
   private boolean shouldMarkCallsRead = false;
   private final Runnable setShouldMarkCallsReadTrue = () -> shouldMarkCallsRead = true;
@@ -89,6 +110,15 @@
   }
 
   @Override
+  public void onStop() {
+    super.onStop();
+
+    if (recyclerView.getAdapter() != null) {
+      ((NewCallLogAdapter) recyclerView.getAdapter()).logMetrics(getContext());
+    }
+  }
+
+  @Override
   public void onPause() {
     super.onPause();
     LogUtil.enterBlock("NewCallLogFragment.onPause");
@@ -117,6 +147,22 @@
    * will be called but it is not visible.
    */
   private void onFragmentShown() {
+    LoaderManager loaderManager = getLoaderManager();
+    if (!PermissionsUtil.hasCallLogReadPermissions(getContext())) {
+      recyclerView.setVisibility(View.GONE);
+      emptyContentView.setVisibility(View.VISIBLE);
+      loaderManager.destroyLoader(LOADER_ID);
+      return;
+    }
+
+    recyclerView.setVisibility(View.VISIBLE);
+    emptyContentView.setVisibility(View.GONE);
+
+    // This can happen if permissions were not enabled when the fragment was created.
+    if (loaderManager.getLoader(LOADER_ID) == null) {
+      loaderManager.restartLoader(LOADER_ID, null, this);
+    }
+
     registerRefreshAnnotatedCallLogReceiver();
 
     CallLogComponent.get(getContext())
@@ -177,11 +223,52 @@
         new RecyclerViewJankLogger(
             MetricsComponent.get(getContext()).metrics(), Metrics.NEW_CALL_LOG_JANK_EVENT_NAME));
 
-    getLoaderManager().restartLoader(0, null, this);
+    emptyContentView = view.findViewById(R.id.new_call_log_empty_content_view);
+    configureEmptyContentView();
+
+    coalesingAnnotatedCallLogListener =
+        DialerExecutorComponent.get(getContext())
+            .createUiListener(
+                getChildFragmentManager(),
+                /* taskId = */ "NewCallLogFragment.coalescingAnnotatedCallLog");
+
+    if (PermissionsUtil.hasCallLogReadPermissions(getContext())) {
+      getLoaderManager().restartLoader(LOADER_ID, null, this);
+    }
 
     return view;
   }
 
+  private void configureEmptyContentView() {
+    emptyContentView.setImage(R.drawable.quantum_ic_query_builder_vd_theme_24);
+    emptyContentView.setDescription(R.string.new_call_log_permission_no_calllog);
+    emptyContentView.setActionLabel(com.android.dialer.widget.R.string.permission_single_turn_on);
+    emptyContentView.setActionClickedListener(new TurnOnPhonePermissions());
+  }
+
+  private class TurnOnPhonePermissions implements OnEmptyViewActionButtonClickedListener {
+
+    @Override
+    public void onEmptyViewActionButtonClicked() {
+      if (getContext() == null) {
+        LogUtil.w("TurnOnPhonePermissions.onEmptyViewActionButtonClicked", "no context");
+        return;
+      }
+      String[] deniedPermissions =
+          PermissionsUtil.getPermissionsCurrentlyDenied(
+              getContext(), PermissionsUtil.allPhoneGroupPermissionsUsedInDialer);
+      if (deniedPermissions.length > 0) {
+        LogUtil.i(
+            "TurnOnPhonePermissions.onEmptyViewActionButtonClicked",
+            "requesting permissions: %s",
+            Arrays.toString(deniedPermissions));
+        // Don't implement onRequestPermissionsResult; instead rely on views being updated in
+        // #onFragmentShown.
+        requestPermissions(deniedPermissions, PHONE_PERMISSIONS_REQUEST_CODE);
+      }
+    }
+  }
+
   private void registerRefreshAnnotatedCallLogReceiver() {
     LogUtil.enterBlock("NewCallLogFragment.registerRefreshAnnotatedCallLogReceiver");
 
@@ -203,7 +290,7 @@
   @Override
   public Loader<Cursor> onCreateLoader(int id, Bundle args) {
     LogUtil.enterBlock("NewCallLogFragment.onCreateLoader");
-    return new CoalescedAnnotatedCallLogCursorLoader(getContext());
+    return new AnnotatedCallLogCursorLoader(Assert.isNotNull(getContext()));
   }
 
   @Override
@@ -217,14 +304,48 @@
       return;
     }
 
-    // TODO(zachh): Handle empty cursor by showing empty view.
-    if (recyclerView.getAdapter() == null) {
-      recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
-      recyclerView.setAdapter(
-          new NewCallLogAdapter(getContext(), newCursor, System::currentTimeMillis));
-    } else {
-      ((NewCallLogAdapter) recyclerView.getAdapter()).updateCursor(newCursor);
-    }
+    // Start combining adjacent rows which should be collapsed for display purposes.
+    // This is a time-consuming process so we will do it in the background.
+    ListenableFuture<ImmutableList<CoalescedRow>> coalescedRowsFuture =
+        CallLogDatabaseComponent.get(getContext()).coalescer().coalesce(newCursor);
+
+    coalesingAnnotatedCallLogListener.listen(
+        getContext(),
+        coalescedRowsFuture,
+        coalescedRows -> {
+          LogUtil.i("NewCallLogFragment.onLoadFinished", "coalescing succeeded");
+
+          // TODO(zachh): Handle empty cursor by showing empty view.
+          if (recyclerView.getAdapter() == null) {
+            recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
+            // Note: It's not clear if this callback can be invoked when there's no associated
+            // activity, but if crashes are observed here it may be possible to use getContext()
+            // instead.
+            Activity activity = Assert.isNotNull(getActivity());
+            recyclerView.setAdapter(
+                new NewCallLogAdapter(
+                    activity,
+                    coalescedRows,
+                    System::currentTimeMillis,
+                    PromotionComponent.get(getContext())
+                        .promotionManager()
+                        .getHighestPriorityPromotion(PromotionType.CARD)
+                        .orElse(null)));
+          } else {
+            ((NewCallLogAdapter) recyclerView.getAdapter()).updateRows(coalescedRows);
+          }
+        },
+        throwable -> {
+          // Coalescing can fail if the cursor passed to Coalescer is closed by the loader while
+          // the work is still in progress.
+          // This can happen when the loader restarts and finishes loading data before the
+          // coalescing work is completed.
+          // This failure is identified by ExpectedCoalescerException and doesn't need to be
+          // thrown as coalescing will be restarted on the latest data obtained by the loader.
+          if (!(throwable instanceof Coalescer.ExpectedCoalescerException)) {
+            throw new AssertionError(throwable);
+          }
+        });
   }
 
   @Override
diff --git a/java/com/android/dialer/calllog/ui/NewCallLogViewHolder.java b/java/com/android/dialer/calllog/ui/NewCallLogViewHolder.java
index cf01608..a6e3c99 100644
--- a/java/com/android/dialer/calllog/ui/NewCallLogViewHolder.java
+++ b/java/com/android/dialer/calllog/ui/NewCallLogViewHolder.java
@@ -15,28 +15,36 @@
  */
 package com.android.dialer.calllog.ui;
 
-import android.content.Context;
-import android.content.Intent;
+import android.app.Activity;
 import android.content.res.ColorStateList;
-import android.database.Cursor;
 import android.provider.CallLog.Calls;
+import android.support.annotation.ColorInt;
 import android.support.annotation.DrawableRes;
 import android.support.v7.widget.RecyclerView;
+import android.telecom.PhoneAccount;
+import android.telecom.PhoneAccountHandle;
+import android.text.TextUtils;
 import android.view.View;
+import android.view.View.AccessibilityDelegate;
+import android.view.accessibility.AccessibilityNodeInfo;
+import android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction;
 import android.widget.ImageView;
-import android.widget.QuickContactBadge;
 import android.widget.TextView;
 import com.android.dialer.calllog.model.CoalescedRow;
+import com.android.dialer.calllog.ui.NewCallLogAdapter.PopCounts;
 import com.android.dialer.calllog.ui.menu.NewCallLogMenu;
+import com.android.dialer.calllogutils.CallLogEntryDescriptions;
 import com.android.dialer.calllogutils.CallLogEntryText;
-import com.android.dialer.calllogutils.CallLogIntents;
-import com.android.dialer.calllogutils.NumberAttributesConverter;
+import com.android.dialer.calllogutils.CallLogRowActions;
+import com.android.dialer.calllogutils.PhoneAccountUtils;
+import com.android.dialer.calllogutils.PhotoInfoBuilder;
 import com.android.dialer.common.concurrent.DialerExecutorComponent;
-import com.android.dialer.compat.AppCompatConstants;
 import com.android.dialer.compat.telephony.TelephonyManagerCompat;
-import com.android.dialer.glidephotomanager.GlidePhotoManager;
 import com.android.dialer.oem.MotorolaUtils;
+import com.android.dialer.phonenumberutil.PhoneNumberHelper;
+import com.android.dialer.telecom.TelecomUtil;
 import com.android.dialer.time.Clock;
+import com.android.dialer.widget.ContactPhotoView;
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
 import java.util.Locale;
@@ -45,78 +53,80 @@
 /** {@link RecyclerView.ViewHolder} for the new call log. */
 final class NewCallLogViewHolder extends RecyclerView.ViewHolder {
 
-  private final Context context;
+  private final Activity activity;
+  private final ContactPhotoView contactPhotoView;
   private final TextView primaryTextView;
   private final TextView callCountTextView;
   private final TextView secondaryTextView;
-  private final QuickContactBadge quickContactBadge;
   private final ImageView callTypeIcon;
   private final ImageView hdIcon;
   private final ImageView wifiIcon;
   private final ImageView assistedDialIcon;
   private final TextView phoneAccountView;
-  private final ImageView menuButton;
+  private final ImageView callButton;
+  private final View callLogEntryRootView;
 
   private final Clock clock;
   private final RealtimeRowProcessor realtimeRowProcessor;
   private final ExecutorService uiExecutorService;
+  private final PopCounts popCounts;
 
-  private final GlidePhotoManager glidePhotoManager;
-
-  private int currentRowId;
+  private long currentRowId;
 
   NewCallLogViewHolder(
+      Activity activity,
       View view,
       Clock clock,
       RealtimeRowProcessor realtimeRowProcessor,
-      GlidePhotoManager glidePhotoManager) {
+      PopCounts popCounts) {
     super(view);
-    this.context = view.getContext();
+    this.activity = activity;
+    callLogEntryRootView = view;
+    contactPhotoView = view.findViewById(R.id.contact_photo_view);
     primaryTextView = view.findViewById(R.id.primary_text);
     callCountTextView = view.findViewById(R.id.call_count);
     secondaryTextView = view.findViewById(R.id.secondary_text);
-    quickContactBadge = view.findViewById(R.id.quick_contact_photo);
     callTypeIcon = view.findViewById(R.id.call_type_icon);
     hdIcon = view.findViewById(R.id.hd_icon);
     wifiIcon = view.findViewById(R.id.wifi_icon);
     assistedDialIcon = view.findViewById(R.id.assisted_dial_icon);
     phoneAccountView = view.findViewById(R.id.phone_account);
-    menuButton = view.findViewById(R.id.menu_button);
+    callButton = view.findViewById(R.id.call_button);
 
     this.clock = clock;
     this.realtimeRowProcessor = realtimeRowProcessor;
-    this.glidePhotoManager = glidePhotoManager;
-    uiExecutorService = DialerExecutorComponent.get(context).uiExecutor();
+    this.popCounts = popCounts;
+    uiExecutorService = DialerExecutorComponent.get(activity).uiExecutor();
   }
 
-  /** @param cursor a cursor from {@link CoalescedAnnotatedCallLogCursorLoader}. */
-  void bind(Cursor cursor) {
-    CoalescedRow row = CoalescedAnnotatedCallLogCursorLoader.toRow(cursor);
-    currentRowId = row.id(); // Used to make sure async updates are applied to the correct views
+  void bind(CoalescedRow coalescedRow) {
+    // The row ID is used to make sure async updates are applied to the correct views.
+    currentRowId = coalescedRow.getId();
 
     // Even if there is additional real time processing necessary, we still want to immediately show
     // what information we have, rather than an empty card. For example, if CP2 information needs to
     // be queried on the fly, we can still show the phone number until the contact name loads.
-    displayRow(row);
+    displayRow(coalescedRow);
+    configA11yForRow(coalescedRow);
 
     // Note: This leaks the view holder via the callback (which is an inner class), but this is OK
     // because we only create ~10 of them (and they'll be collected assuming all jobs finish).
     Futures.addCallback(
-        realtimeRowProcessor.applyRealtimeProcessing(row),
-        new RealtimeRowFutureCallback(row),
+        realtimeRowProcessor.applyRealtimeProcessing(coalescedRow),
+        new RealtimeRowFutureCallback(coalescedRow),
         uiExecutorService);
   }
 
   private void displayRow(CoalescedRow row) {
     // TODO(zachh): Handle RTL properly.
-    primaryTextView.setText(CallLogEntryText.buildPrimaryText(context, row));
-    secondaryTextView.setText(CallLogEntryText.buildSecondaryTextForEntries(context, clock, row));
+    primaryTextView.setText(CallLogEntryText.buildPrimaryText(activity, row));
+    secondaryTextView.setText(CallLogEntryText.buildSecondaryTextForEntries(activity, clock, row));
 
-    if (isNewMissedCall(row)) {
-      primaryTextView.setTextAppearance(R.style.primary_textview_new_call);
-      callCountTextView.setTextAppearance(R.style.primary_textview_new_call);
-      secondaryTextView.setTextAppearance(R.style.secondary_textview_new_call);
-      phoneAccountView.setTextAppearance(R.style.phoneaccount_textview_new_call);
+    if (isUnreadMissedCall(row)) {
+      primaryTextView.setTextAppearance(R.style.primary_textview_unread_call);
+      callCountTextView.setTextAppearance(R.style.primary_textview_unread_call);
+      secondaryTextView.setTextAppearance(R.style.secondary_textview_unread_call);
+      phoneAccountView.setTextAppearance(R.style.phoneaccount_textview_unread_call);
     } else {
       primaryTextView.setTextAppearance(R.style.primary_textview);
       callCountTextView.setTextAppearance(R.style.primary_textview);
@@ -129,12 +139,35 @@
     setFeatureIcons(row);
     setCallTypeIcon(row);
     setPhoneAccounts(row);
-    setOnClickListenerForRow(row);
-    setOnClickListenerForMenuButon(row);
+    setCallButon(row);
+
+    itemView.setOnClickListener(NewCallLogMenu.createOnClickListener(activity, row));
+  }
+
+  private void configA11yForRow(CoalescedRow row) {
+    callLogEntryRootView.setContentDescription(
+        CallLogEntryDescriptions.buildDescriptionForEntry(activity, clock, row));
+
+    // Inform a11y users that double tapping an entry now makes a call.
+    // This will instruct TalkBack to say "double tap to call" instead of
+    // "double tap to activate".
+    callLogEntryRootView.setAccessibilityDelegate(
+        new AccessibilityDelegate() {
+          @Override
+          public void onInitializeAccessibilityNodeInfo(View host, AccessibilityNodeInfo info) {
+            super.onInitializeAccessibilityNodeInfo(host, info);
+            info.addAction(
+                new AccessibilityAction(
+                    AccessibilityNodeInfo.ACTION_CLICK,
+                    activity
+                        .getResources()
+                        .getString(R.string.a11y_new_call_log_entry_tap_action)));
+          }
+        });
   }
 
   private void setNumberCalls(CoalescedRow row) {
-    int numberCalls = row.coalescedIds().getCoalescedIdCount();
+    int numberCalls = row.getCoalescedIds().getCoalescedIdCount();
     if (numberCalls > 1) {
       callCountTextView.setText(String.format(Locale.getDefault(), "(%d)", numberCalls));
       callCountTextView.setVisibility(View.VISIBLE);
@@ -143,30 +176,27 @@
     }
   }
 
-  private boolean isNewMissedCall(CoalescedRow row) {
+  private boolean isUnreadMissedCall(CoalescedRow row) {
     // Show missed call styling if the most recent call in the group was missed and it is still
-    // marked as NEW. It is not clear what IS_READ should be used for and it is currently not used.
-    return row.callType() == Calls.MISSED_TYPE && row.isNew();
+    // marked as not read. The "NEW" column is presumably used for notifications and voicemails
+    // only.
+    return row.getCallType() == Calls.MISSED_TYPE && !row.getIsRead();
   }
 
   private void setPhoto(CoalescedRow row) {
-    glidePhotoManager.loadQuickContactBadge(
-        quickContactBadge,
-        NumberAttributesConverter.toPhotoInfoBuilder(row.numberAttributes())
-            .setFormattedNumber(row.formattedNumber())
-            .build());
+    contactPhotoView.setPhoto(PhotoInfoBuilder.fromCoalescedRow(activity, row).build());
   }
 
   private void setFeatureIcons(CoalescedRow row) {
     ColorStateList colorStateList =
         ColorStateList.valueOf(
-            context.getColor(
-                isNewMissedCall(row)
+            activity.getColor(
+                isUnreadMissedCall(row)
                     ? R.color.feature_icon_unread_color
                     : R.color.feature_icon_read_color));
 
     // Handle HD Icon
-    if ((row.features() & Calls.FEATURES_HD_CALL) == Calls.FEATURES_HD_CALL) {
+    if ((row.getFeatures() & Calls.FEATURES_HD_CALL) == Calls.FEATURES_HD_CALL) {
       hdIcon.setVisibility(View.VISIBLE);
       hdIcon.setImageTintList(colorStateList);
     } else {
@@ -174,7 +204,7 @@
     }
 
     // Handle Wifi Icon
-    if (MotorolaUtils.shouldShowWifiIconInCallLog(context, row.features())) {
+    if (MotorolaUtils.shouldShowWifiIconInCallLog(activity, row.getFeatures())) {
       wifiIcon.setVisibility(View.VISIBLE);
       wifiIcon.setImageTintList(colorStateList);
     } else {
@@ -182,7 +212,7 @@
     }
 
     // Handle Assisted Dialing Icon
-    if ((row.features() & TelephonyManagerCompat.FEATURES_ASSISTED_DIALING)
+    if ((row.getFeatures() & TelephonyManagerCompat.FEATURES_ASSISTED_DIALING)
         == TelephonyManagerCompat.FEATURES_ASSISTED_DIALING) {
       assistedDialIcon.setVisibility(View.VISIBLE);
       assistedDialIcon.setImageTintList(colorStateList);
@@ -193,20 +223,20 @@
 
   private void setCallTypeIcon(CoalescedRow row) {
     @DrawableRes int resId;
-    switch (row.callType()) {
-      case AppCompatConstants.CALLS_INCOMING_TYPE:
-      case AppCompatConstants.CALLS_ANSWERED_EXTERNALLY_TYPE:
+    switch (row.getCallType()) {
+      case Calls.INCOMING_TYPE:
+      case Calls.ANSWERED_EXTERNALLY_TYPE:
         resId = R.drawable.quantum_ic_call_received_vd_theme_24;
         break;
-      case AppCompatConstants.CALLS_OUTGOING_TYPE:
+      case Calls.OUTGOING_TYPE:
         resId = R.drawable.quantum_ic_call_made_vd_theme_24;
         break;
-      case AppCompatConstants.CALLS_MISSED_TYPE:
+      case Calls.MISSED_TYPE:
         resId = R.drawable.quantum_ic_call_missed_vd_theme_24;
         break;
-      case AppCompatConstants.CALLS_VOICEMAIL_TYPE:
+      case Calls.VOICEMAIL_TYPE:
         throw new IllegalStateException("Voicemails not expected in call log");
-      case AppCompatConstants.CALLS_BLOCKED_TYPE:
+      case Calls.BLOCKED_TYPE:
         resId = R.drawable.quantum_ic_block_vd_theme_24;
         break;
       default:
@@ -219,38 +249,67 @@
     }
     callTypeIcon.setImageResource(resId);
 
-    if (isNewMissedCall(row)) {
+    if (isUnreadMissedCall(row)) {
       callTypeIcon.setImageTintList(
-          ColorStateList.valueOf(context.getColor(R.color.call_type_icon_unread_color)));
+          ColorStateList.valueOf(activity.getColor(R.color.call_type_icon_unread_color)));
     } else {
       callTypeIcon.setImageTintList(
-          ColorStateList.valueOf(context.getColor(R.color.call_type_icon_read_color)));
+          ColorStateList.valueOf(activity.getColor(R.color.call_type_icon_read_color)));
     }
   }
 
   private void setPhoneAccounts(CoalescedRow row) {
-    if (row.phoneAccountLabel() != null) {
-      phoneAccountView.setText(row.phoneAccountLabel());
-      phoneAccountView.setTextColor(row.phoneAccountColor());
-      phoneAccountView.setVisibility(View.VISIBLE);
-    } else {
+    PhoneAccountHandle phoneAccountHandle =
+        TelecomUtil.composePhoneAccountHandle(
+            row.getPhoneAccountComponentName(), row.getPhoneAccountId());
+    if (phoneAccountHandle == null) {
       phoneAccountView.setVisibility(View.GONE);
+      return;
     }
+
+    String phoneAccountLabel = PhoneAccountUtils.getAccountLabel(activity, phoneAccountHandle);
+    if (TextUtils.isEmpty(phoneAccountLabel)) {
+      phoneAccountView.setVisibility(View.GONE);
+      return;
+    }
+
+    @ColorInt
+    int phoneAccountColor = PhoneAccountUtils.getAccountColor(activity, phoneAccountHandle);
+    if (phoneAccountColor == PhoneAccount.NO_HIGHLIGHT_COLOR) {
+      phoneAccountColor =
+          activity
+              .getResources()
+              .getColor(R.color.dialer_secondary_text_color, activity.getTheme());
+    }
+
+    phoneAccountView.setText(phoneAccountLabel);
+    phoneAccountView.setTextColor(phoneAccountColor);
+    phoneAccountView.setVisibility(View.VISIBLE);
   }
 
-  private void setOnClickListenerForRow(CoalescedRow row) {
-    itemView.setOnClickListener(
-        (view) -> {
-          Intent callbackIntent = CallLogIntents.getCallBackIntent(context, row);
-          if (callbackIntent != null) {
-            context.startActivity(callbackIntent);
-          }
-        });
-  }
+  private void setCallButon(CoalescedRow row) {
+    if (!PhoneNumberHelper.canPlaceCallsTo(
+        row.getNumber().getNormalizedNumber(), row.getNumberPresentation())) {
+      callButton.setVisibility(View.GONE);
+      return;
+    }
 
-  private void setOnClickListenerForMenuButon(CoalescedRow row) {
-    menuButton.setOnClickListener(
-        NewCallLogMenu.createOnClickListener(context, row, glidePhotoManager));
+    callButton.setVisibility(View.VISIBLE);
+    if ((row.getFeatures() & Calls.FEATURES_VIDEO) == Calls.FEATURES_VIDEO) {
+      callButton.setImageResource(R.drawable.quantum_ic_videocam_vd_theme_24);
+      callButton.setContentDescription(
+          TextUtils.expandTemplate(
+              activity.getResources().getText(R.string.a11y_new_call_log_entry_video_call),
+              CallLogEntryText.buildPrimaryText(activity, row)));
+    } else {
+      callButton.setImageResource(R.drawable.quantum_ic_call_vd_theme_24);
+      callButton.setContentDescription(
+          TextUtils.expandTemplate(
+              activity.getResources().getText(R.string.a11y_new_call_log_entry_voice_call),
+              CallLogEntryText.buildPrimaryText(activity, row)));
+    }
+
+    callButton.setOnClickListener(view -> CallLogRowActions.startCallForRow(activity, row));
   }
 
   private class RealtimeRowFutureCallback implements FutureCallback<CoalescedRow> {
@@ -264,14 +323,18 @@
     public void onSuccess(CoalescedRow updatedRow) {
       // If the user scrolled then this ViewHolder may not correspond to the completed task and
       // there's nothing to do.
-      if (originalRow.id() != currentRowId) {
+      if (originalRow.getId() != currentRowId) {
+        popCounts.didNotPop++;
         return;
       }
       // Only update the UI if the updated row differs from the original row (which has already
       // been displayed).
       if (!updatedRow.equals(originalRow)) {
         displayRow(updatedRow);
+        popCounts.popped++;
+        return;
       }
+      popCounts.didNotPop++;
     }
 
     @Override
diff --git a/java/com/android/dialer/calllog/ui/PromotionCardViewHolder.java b/java/com/android/dialer/calllog/ui/PromotionCardViewHolder.java
new file mode 100644
index 0000000..c7d62ba
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/PromotionCardViewHolder.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.dialer.calllog.ui;
+
+import android.support.v7.widget.RecyclerView.ViewHolder;
+import android.text.method.LinkMovementMethod;
+import android.view.View;
+import android.widget.Button;
+import android.widget.ImageView;
+import android.widget.TextView;
+import com.android.dialer.promotion.Promotion;
+
+/** ViewHolder for {@link NewCallLogAdapter} to display the Duo disclosure card. */
+public class PromotionCardViewHolder extends ViewHolder {
+
+  /** Listener to be called when promotion card is dismissed. */
+  interface DismissListener {
+    void onDismiss();
+  }
+
+  private final Button okButton;
+  private final Promotion promotion;
+
+  PromotionCardViewHolder(View itemView, Promotion promotion) {
+    super(itemView);
+    this.promotion = promotion;
+
+    ImageView iconView = itemView.findViewById(R.id.new_call_log_promotion_card_icon);
+    iconView.setImageResource(promotion.getIconRes());
+
+    TextView cardTitleView = itemView.findViewById(R.id.new_call_log_promotion_card_title);
+    cardTitleView.setText(promotion.getTitle());
+
+    TextView cardDetailsView = itemView.findViewById(R.id.new_call_log_promotion_card_details);
+    cardDetailsView.setText(promotion.getDetails());
+    cardDetailsView.setMovementMethod(LinkMovementMethod.getInstance()); // make the link clickable
+
+    // Obtain a reference to the "OK, got it" button.
+    okButton = itemView.findViewById(R.id.new_call_log_promotion_card_ok);
+  }
+
+  void setDismissListener(DismissListener listener) {
+    okButton.setOnClickListener(
+        v -> {
+          promotion.dismiss();
+          listener.onDismiss();
+        });
+  }
+}
diff --git a/java/com/android/dialer/calllog/ui/RealtimeRowProcessor.java b/java/com/android/dialer/calllog/ui/RealtimeRowProcessor.java
index b7cb6d7..df5270d 100644
--- a/java/com/android/dialer/calllog/ui/RealtimeRowProcessor.java
+++ b/java/com/android/dialer/calllog/ui/RealtimeRowProcessor.java
@@ -24,7 +24,7 @@
 import android.util.ArrayMap;
 import com.android.dialer.DialerPhoneNumber;
 import com.android.dialer.calllog.model.CoalescedRow;
-import com.android.dialer.calllogutils.NumberAttributesConverter;
+import com.android.dialer.calllogutils.NumberAttributesBuilder;
 import com.android.dialer.common.Assert;
 import com.android.dialer.common.LogUtil;
 import com.android.dialer.common.concurrent.Annotations.BackgroundExecutor;
@@ -97,22 +97,22 @@
   @MainThread
   ListenableFuture<CoalescedRow> applyRealtimeProcessing(final CoalescedRow row) {
     // Cp2DefaultDirectoryPhoneLookup can not always efficiently process all rows.
-    if (!row.numberAttributes().getIsCp2InfoIncomplete()) {
+    if (!row.getNumberAttributes().getIsCp2InfoIncomplete()) {
       return Futures.immediateFuture(row);
     }
 
-    PhoneLookupInfo cachedPhoneLookupInfo = cache.get(row.number());
+    PhoneLookupInfo cachedPhoneLookupInfo = cache.get(row.getNumber());
     if (cachedPhoneLookupInfo != null) {
       return Futures.immediateFuture(applyPhoneLookupInfoToRow(cachedPhoneLookupInfo, row));
     }
 
     ListenableFuture<PhoneLookupInfo> phoneLookupInfoFuture =
-        compositePhoneLookup.lookup(row.number());
+        compositePhoneLookup.lookup(row.getNumber());
     return Futures.transform(
         phoneLookupInfoFuture,
         phoneLookupInfo -> {
-          queuePhoneLookupHistoryWrite(row.number(), phoneLookupInfo);
-          cache.put(row.number(), phoneLookupInfo);
+          queuePhoneLookupHistoryWrite(row.getNumber(), phoneLookupInfo);
+          cache.put(row.getNumber(), phoneLookupInfo);
           return applyPhoneLookupInfoToRow(phoneLookupInfo, row);
         },
         uiExecutor /* ensures the cache is updated on a single thread */);
@@ -198,8 +198,14 @@
 
   private CoalescedRow applyPhoneLookupInfoToRow(
       PhoneLookupInfo phoneLookupInfo, CoalescedRow row) {
+    // Force the "cp2_info_incomplete" value to the original value so that it is not used when
+    // comparing the original row to the updated row.
+    // TODO(linyuh): Improve the comparison instead.
     return row.toBuilder()
-        .setNumberAttributes(NumberAttributesConverter.fromPhoneLookupInfo(phoneLookupInfo).build())
+        .setNumberAttributes(
+            NumberAttributesBuilder.fromPhoneLookupInfo(phoneLookupInfo)
+                .setIsCp2InfoIncomplete(row.getNumberAttributes().getIsCp2InfoIncomplete())
+                .build())
         .build();
   }
 }
diff --git a/java/com/android/dialer/calllog/ui/menu/BottomSheetHeader.java b/java/com/android/dialer/calllog/ui/menu/BottomSheetHeader.java
new file mode 100644
index 0000000..6d0b795
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/menu/BottomSheetHeader.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.dialer.calllog.ui.menu;
+
+import android.content.Context;
+import com.android.dialer.calllog.model.CoalescedRow;
+import com.android.dialer.calllogutils.CallLogEntryText;
+import com.android.dialer.calllogutils.PhotoInfoBuilder;
+import com.android.dialer.historyitemactions.HistoryItemBottomSheetHeaderInfo;
+
+/** Configures the top row in the bottom sheet. */
+final class BottomSheetHeader {
+
+  static HistoryItemBottomSheetHeaderInfo fromRow(Context context, CoalescedRow row) {
+    return HistoryItemBottomSheetHeaderInfo.newBuilder()
+        .setNumber(row.getNumber())
+        .setPhotoInfo(PhotoInfoBuilder.fromCoalescedRow(context, row))
+        .setPrimaryText(CallLogEntryText.buildPrimaryText(context, row).toString())
+        .setSecondaryText(
+            CallLogEntryText.buildSecondaryTextForBottomSheet(context, row).toString())
+        .build();
+  }
+}
diff --git a/java/com/android/dialer/calllog/ui/menu/DeleteCallLogItemModule.java b/java/com/android/dialer/calllog/ui/menu/DeleteCallLogItemModule.java
index ad5671e..a929961 100644
--- a/java/com/android/dialer/calllog/ui/menu/DeleteCallLogItemModule.java
+++ b/java/com/android/dialer/calllog/ui/menu/DeleteCallLogItemModule.java
@@ -29,18 +29,20 @@
 import com.android.dialer.common.concurrent.DialerExecutorComponent;
 import com.android.dialer.common.database.Selection;
 import com.android.dialer.historyitemactions.HistoryItemActionModule;
+import com.android.dialer.logging.DialerImpression;
+import com.android.dialer.logging.Logger;
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
 import java.util.List;
 
 /** {@link HistoryItemActionModule} for deleting a call log item in the new call log. */
-public final class DeleteCallLogItemModule implements HistoryItemActionModule {
+final class DeleteCallLogItemModule implements HistoryItemActionModule {
   private static final String TAG = DeleteCallLogItemModule.class.getName();
 
   private final Context context;
   private final CoalescedIds coalescedIds;
 
-  public DeleteCallLogItemModule(Context context, CoalescedIds coalescedIds) {
+  DeleteCallLogItemModule(Context context, CoalescedIds coalescedIds) {
     this.context = context;
     this.coalescedIds = coalescedIds;
   }
@@ -62,6 +64,8 @@
         .createNonUiTaskBuilder(new CallLogItemDeletionWorker(context))
         .build()
         .executeSerial(coalescedIds);
+
+    Logger.get(context).logImpression(DialerImpression.Type.USER_DELETED_CALL_LOG_ITEM);
     return true;
   }
 
diff --git a/java/com/android/dialer/calllog/ui/menu/Modules.java b/java/com/android/dialer/calllog/ui/menu/Modules.java
index 184f7ab..7c6c65c 100644
--- a/java/com/android/dialer/calllog/ui/menu/Modules.java
+++ b/java/com/android/dialer/calllog/ui/menu/Modules.java
@@ -17,182 +17,106 @@
 package com.android.dialer.calllog.ui.menu;
 
 import android.content.Context;
-import android.provider.CallLog.Calls;
-import android.telecom.PhoneAccountHandle;
 import android.text.TextUtils;
-import com.android.dialer.blockreportspam.BlockReportSpamDialogInfo;
 import com.android.dialer.calldetails.CallDetailsActivity;
-import com.android.dialer.callintent.CallInitiationType;
+import com.android.dialer.calldetails.CallDetailsHeaderInfo;
 import com.android.dialer.calllog.model.CoalescedRow;
-import com.android.dialer.calllogutils.CallLogContactTypes;
-import com.android.dialer.calllogutils.PhoneNumberDisplayUtil;
-import com.android.dialer.dialercontact.DialerContact;
-import com.android.dialer.historyitemactions.DividerModule;
+import com.android.dialer.calllogutils.CallLogEntryText;
+import com.android.dialer.calllogutils.PhotoInfoBuilder;
 import com.android.dialer.historyitemactions.HistoryItemActionModule;
+import com.android.dialer.historyitemactions.HistoryItemActionModuleInfo;
+import com.android.dialer.historyitemactions.HistoryItemActionModulesBuilder;
 import com.android.dialer.historyitemactions.IntentModule;
-import com.android.dialer.historyitemactions.SharedModules;
-import com.android.dialer.logging.ReportingLocation;
 import com.android.dialer.phonenumberutil.PhoneNumberHelper;
-import com.android.dialer.telecom.TelecomUtil;
-import com.google.common.base.Optional;
-import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 
 /**
- * Configures the modules for the bottom sheet; these are the rows below the top row (primary
- * action) in the bottom sheet.
+ * Configures the modules for the bottom sheet; these are the rows below the top row (contact info)
+ * in the bottom sheet.
  */
-@SuppressWarnings("Guava")
 final class Modules {
 
+  /**
+   * Returns a list of {@link HistoryItemActionModule HistoryItemActionModules}, which are items in
+   * the bottom sheet.
+   */
   static List<HistoryItemActionModule> fromRow(Context context, CoalescedRow row) {
-    // Conditionally add each module, which are items in the bottom sheet's menu.
-    List<HistoryItemActionModule> modules = new ArrayList<>();
-
-    String normalizedNumber = row.number().getNormalizedNumber();
-    boolean canPlaceCalls =
-        PhoneNumberHelper.canPlaceCallsTo(normalizedNumber, row.numberPresentation());
-
-    if (canPlaceCalls) {
-      modules.addAll(createModulesForCalls(context, row, normalizedNumber));
-      Optional<HistoryItemActionModule> moduleForSendingTextMessage =
-          SharedModules.createModuleForSendingTextMessage(
-              context, normalizedNumber, row.numberAttributes().getIsBlocked());
-      if (moduleForSendingTextMessage.isPresent()) {
-        modules.add(moduleForSendingTextMessage.get());
-      }
-    }
-
-    if (!modules.isEmpty()) {
-      modules.add(new DividerModule());
-    }
+    HistoryItemActionModulesBuilder modulesBuilder =
+        new HistoryItemActionModulesBuilder(context, buildModuleInfo(row));
 
 
     // TODO(zachh): Module for CallComposer.
 
-    if (canPlaceCalls) {
-      Optional<HistoryItemActionModule> moduleForAddingToContacts =
-          SharedModules.createModuleForAddingToContacts(
-              context,
-              row.number(),
-              row.numberAttributes().getName(),
-              row.numberAttributes().getLookupUri(),
-              row.numberAttributes().getIsBlocked(),
-              row.numberAttributes().getIsSpam());
-      if (moduleForAddingToContacts.isPresent()) {
-        modules.add(moduleForAddingToContacts.get());
-      }
-
-      BlockReportSpamDialogInfo blockReportSpamDialogInfo =
-          BlockReportSpamDialogInfo.newBuilder()
-              .setNormalizedNumber(row.number().getNormalizedNumber())
-              .setCountryIso(row.number().getCountryIso())
-              .setCallType(row.callType())
-              .setReportingLocation(ReportingLocation.Type.CALL_LOG_HISTORY)
-              .setContactSource(row.numberAttributes().getContactSource())
-              .build();
-      modules.addAll(
-          SharedModules.createModulesHandlingBlockedOrSpamNumber(
-              context,
-              blockReportSpamDialogInfo,
-              row.numberAttributes().getIsBlocked(),
-              row.numberAttributes().getIsSpam()));
-
-      Optional<HistoryItemActionModule> moduleForCopyingNumber =
-          SharedModules.createModuleForCopyingNumber(context, normalizedNumber);
-      if (moduleForCopyingNumber.isPresent()) {
-        modules.add(moduleForCopyingNumber.get());
-      }
+    if (PhoneNumberHelper.canPlaceCallsTo(
+        row.getNumber().getNormalizedNumber(), row.getNumberPresentation())) {
+      modulesBuilder
+          .addModuleForVoiceCall()
+          .addModuleForVideoCall()
+          .addModuleForSendingTextMessage()
+          .addModuleForDivider()
+          .addModuleForAddingToContacts()
+          .addModuleForBlockedOrSpamNumber()
+          .addModuleForCopyingNumber();
     }
 
-    // TODO(zachh): Revisit if DialerContact is the best thing to pass to CallDetails; could
-    // it use a HistoryItemPrimaryActionInfo instead?
+    List<HistoryItemActionModule> modules = modulesBuilder.build();
+
+    // Add modules only available in the call log.
     modules.add(createModuleForAccessingCallDetails(context, row));
-
-    modules.add(new DeleteCallLogItemModule(context, row.coalescedIds()));
-
-    return modules;
-  }
-
-  private static List<HistoryItemActionModule> createModulesForCalls(
-      Context context, CoalescedRow row, String normalizedNumber) {
-    // Don't add call options if a number is blocked.
-    if (row.numberAttributes().getIsBlocked()) {
-      return Collections.emptyList();
-    }
-
-    List<HistoryItemActionModule> modules = new ArrayList<>();
-    PhoneAccountHandle phoneAccountHandle =
-        TelecomUtil.composePhoneAccountHandle(
-            row.phoneAccountComponentName(), row.phoneAccountId());
-
-    // Add an audio call item
-    modules.add(
-        IntentModule.newCallModule(
-            context, normalizedNumber, phoneAccountHandle, CallInitiationType.Type.CALL_LOG));
-
-    // Add a video item if (1) the call log entry is for a video call, and (2) the call is not spam.
-    if ((row.features() & Calls.FEATURES_VIDEO) == Calls.FEATURES_VIDEO
-        && !row.numberAttributes().getIsSpam()) {
-      modules.add(
-          IntentModule.newVideoCallModule(
-              context, normalizedNumber, phoneAccountHandle, CallInitiationType.Type.CALL_LOG));
-    }
-
-    // TODO(zachh): Also show video option if the call log entry is for an audio call but video
-    // capabilities are present?
-
+    modules.add(new DeleteCallLogItemModule(context, row.getCoalescedIds()));
     return modules;
   }
 
   private static HistoryItemActionModule createModuleForAccessingCallDetails(
       Context context, CoalescedRow row) {
-    boolean canReportAsInvalidNumber = row.numberAttributes().getCanReportAsInvalidNumber();
-    boolean canSupportAssistedDialing = !TextUtils.isEmpty(row.numberAttributes().getLookupUri());
+    boolean canReportAsInvalidNumber =
+        !row.getIsVoicemailCall() && row.getNumberAttributes().getCanReportAsInvalidNumber();
 
     return new IntentModule(
         context,
         CallDetailsActivity.newInstance(
             context,
-            row.coalescedIds(),
-            createDialerContactFromRow(context, row),
+            row.getCoalescedIds(),
+            createCallDetailsHeaderInfoFromRow(context, row),
             canReportAsInvalidNumber,
-            canSupportAssistedDialing),
+            canSupportAssistedDialing(row)),
         R.string.call_details_menu_label,
         R.drawable.quantum_ic_info_outline_vd_theme_24);
   }
 
-  private static DialerContact createDialerContactFromRow(Context context, CoalescedRow row) {
-    Optional<String> presentationName =
-        PhoneNumberDisplayUtil.getNameForPresentation(context, row.numberPresentation());
-    if (presentationName.isPresent()) {
-      return DialerContact.newBuilder()
-          .setNameOrNumber(presentationName.get())
-          .setContactType(CallLogContactTypes.getContactType(row))
-          .build();
-    }
+  private static CallDetailsHeaderInfo createCallDetailsHeaderInfoFromRow(
+      Context context, CoalescedRow row) {
+    return CallDetailsHeaderInfo.newBuilder()
+        .setDialerPhoneNumber(row.getNumber())
+        .setPhotoInfo(PhotoInfoBuilder.fromCoalescedRow(context, row))
+        .setPrimaryText(CallLogEntryText.buildPrimaryText(context, row).toString())
+        .setSecondaryText(
+            CallLogEntryText.buildSecondaryTextForBottomSheet(context, row).toString())
+        .build();
+  }
 
-    String normalizedNumber = row.number().getNormalizedNumber();
-    DialerContact.Builder dialerContactBuilder =
-        DialerContact.newBuilder()
-            .setNumber(normalizedNumber)
-            .setContactType(CallLogContactTypes.getContactType(row))
-            .setPhotoId(row.numberAttributes().getPhotoId());
+  private static boolean canSupportAssistedDialing(CoalescedRow row) {
+    return !TextUtils.isEmpty(row.getNumberAttributes().getLookupUri());
+  }
 
-    if (!row.numberAttributes().getName().isEmpty()) {
-      dialerContactBuilder.setNameOrNumber(row.numberAttributes().getName());
-      if (row.formattedNumber() != null) {
-        dialerContactBuilder.setDisplayNumber(row.formattedNumber());
-      }
-    } else if (!TextUtils.isEmpty(row.formattedNumber())) {
-      dialerContactBuilder.setNameOrNumber(row.formattedNumber());
-    }
-
-    dialerContactBuilder.setNumberLabel(row.numberAttributes().getNumberTypeLabel());
-    dialerContactBuilder.setPhotoUri(row.numberAttributes().getPhotoUri());
-    dialerContactBuilder.setContactUri(row.numberAttributes().getLookupUri());
-
-    return dialerContactBuilder.build();
+  private static HistoryItemActionModuleInfo buildModuleInfo(CoalescedRow row) {
+    return HistoryItemActionModuleInfo.newBuilder()
+        .setNormalizedNumber(row.getNumber().getNormalizedNumber())
+        .setCountryIso(row.getNumber().getCountryIso())
+        .setName(row.getNumberAttributes().getName())
+        .setCallType(row.getCallType())
+        .setFeatures(row.getFeatures())
+        .setLookupUri(row.getNumberAttributes().getLookupUri())
+        .setPhoneAccountComponentName(row.getPhoneAccountComponentName())
+        .setCanReportAsInvalidNumber(row.getNumberAttributes().getCanReportAsInvalidNumber())
+        .setCanSupportAssistedDialing(canSupportAssistedDialing(row))
+        .setCanSupportCarrierVideoCall(row.getNumberAttributes().getCanSupportCarrierVideoCall())
+        .setIsBlocked(row.getNumberAttributes().getIsBlocked())
+        .setIsEmergencyNumber(row.getNumberAttributes().getIsEmergencyNumber())
+        .setIsSpam(row.getNumberAttributes().getIsSpam())
+        .setIsVoicemailCall(row.getIsVoicemailCall())
+        .setContactSource(row.getNumberAttributes().getContactSource())
+        .setHost(HistoryItemActionModuleInfo.Host.CALL_LOG)
+        .build();
   }
 }
diff --git a/java/com/android/dialer/calllog/ui/menu/NewCallLogMenu.java b/java/com/android/dialer/calllog/ui/menu/NewCallLogMenu.java
index 9efe907..3869e78 100644
--- a/java/com/android/dialer/calllog/ui/menu/NewCallLogMenu.java
+++ b/java/com/android/dialer/calllog/ui/menu/NewCallLogMenu.java
@@ -22,7 +22,6 @@
 import com.android.dialer.calllog.CallLogComponent;
 import com.android.dialer.calllog.model.CoalescedRow;
 import com.android.dialer.common.concurrent.DefaultFutureCallback;
-import com.android.dialer.glidephotomanager.GlidePhotoManager;
 import com.android.dialer.historyitemactions.HistoryItemActionBottomSheet;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.MoreExecutors;
@@ -31,22 +30,18 @@
 public final class NewCallLogMenu {
 
   /** Creates and returns the OnClickListener which opens the menu for the provided row. */
-  public static View.OnClickListener createOnClickListener(
-      Context context, CoalescedRow row, GlidePhotoManager glidePhotoManager) {
+  public static View.OnClickListener createOnClickListener(Context context, CoalescedRow row) {
     return view -> {
       HistoryItemActionBottomSheet.show(
-          context,
-          PrimaryAction.fromRow(context, row),
-          Modules.fromRow(context, row),
-          glidePhotoManager);
+          context, BottomSheetHeader.fromRow(context, row), Modules.fromRow(context, row));
 
-      // If the user opens the bottom sheet for a new call, clear the notifications and make the row
-      // not bold immediately. To do this, mark all of the calls in group as not new.
-      if (row.isNew() && row.callType() == Calls.MISSED_TYPE) {
+      // If the user opens the bottom sheet for an unread call, clear the notifications and make the
+      // row not bold immediately. To do this, mark all of the calls in group as read.
+      if (!row.getIsRead() && row.getCallType() == Calls.MISSED_TYPE) {
         Futures.addCallback(
             CallLogComponent.get(context)
                 .getClearMissedCalls()
-                .clearBySystemCallLogId(row.coalescedIds().getCoalescedIdList()),
+                .clearBySystemCallLogId(row.getCoalescedIds().getCoalescedIdList()),
             new DefaultFutureCallback<>(),
             MoreExecutors.directExecutor());
       }
diff --git a/java/com/android/dialer/calllog/ui/menu/PrimaryAction.java b/java/com/android/dialer/calllog/ui/menu/PrimaryAction.java
deleted file mode 100644
index de4a70c..0000000
--- a/java/com/android/dialer/calllog/ui/menu/PrimaryAction.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.dialer.calllog.ui.menu;
-
-import android.content.Context;
-import android.provider.CallLog.Calls;
-import com.android.dialer.calllog.model.CoalescedRow;
-import com.android.dialer.calllogutils.CallLogEntryText;
-import com.android.dialer.calllogutils.CallLogIntents;
-import com.android.dialer.calllogutils.NumberAttributesConverter;
-import com.android.dialer.historyitemactions.HistoryItemPrimaryActionInfo;
-
-/** Configures the primary action row (top row) for the bottom sheet. */
-final class PrimaryAction {
-
-  static HistoryItemPrimaryActionInfo fromRow(Context context, CoalescedRow row) {
-    CharSequence primaryText = CallLogEntryText.buildPrimaryText(context, row);
-    return HistoryItemPrimaryActionInfo.builder()
-        .setNumber(row.number())
-        .setPhotoInfo(
-            NumberAttributesConverter.toPhotoInfoBuilder(row.numberAttributes())
-                .setFormattedNumber(row.formattedNumber())
-                .setIsVideo((row.features() & Calls.FEATURES_VIDEO) == Calls.FEATURES_VIDEO)
-                .build())
-        .setPrimaryText(primaryText)
-        .setSecondaryText(CallLogEntryText.buildSecondaryTextForBottomSheet(context, row))
-        .setIntent(CallLogIntents.getCallBackIntent(context, row))
-        .build();
-  }
-}
diff --git a/java/com/android/dialer/calllog/ui/menu/res/values-af/strings.xml b/java/com/android/dialer/calllog/ui/menu/res/values-af/strings.xml
new file mode 100644
index 0000000..401f163
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/menu/res/values-af/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_details_menu_label">Oproepbesonderhede</string>
+  <string name="delete">Vee uit</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/menu/res/values-am/strings.xml b/java/com/android/dialer/calllog/ui/menu/res/values-am/strings.xml
new file mode 100644
index 0000000..70f2c66
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/menu/res/values-am/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_details_menu_label">የጥሪ ዝርዝሮች</string>
+  <string name="delete">ሰርዝ</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/menu/res/values-ar/strings.xml b/java/com/android/dialer/calllog/ui/menu/res/values-ar/strings.xml
new file mode 100644
index 0000000..a82d31b
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/menu/res/values-ar/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_details_menu_label">تفاصيل المكالمة</string>
+  <string name="delete">حذف</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/menu/res/values-az/strings.xml b/java/com/android/dialer/calllog/ui/menu/res/values-az/strings.xml
new file mode 100644
index 0000000..d1c7f24
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/menu/res/values-az/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_details_menu_label">Zəng detalları</string>
+  <string name="delete">Silin</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/menu/res/values-b+sr+Latn/strings.xml b/java/com/android/dialer/calllog/ui/menu/res/values-b+sr+Latn/strings.xml
new file mode 100644
index 0000000..7e50828
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/menu/res/values-b+sr+Latn/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_details_menu_label">Detalji poziva</string>
+  <string name="delete">Izbriši</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/menu/res/values-be/strings.xml b/java/com/android/dialer/calllog/ui/menu/res/values-be/strings.xml
new file mode 100644
index 0000000..1710df8
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/menu/res/values-be/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_details_menu_label">Падрабязнасці выкліку</string>
+  <string name="delete">Выдаліць</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/menu/res/values-bg/strings.xml b/java/com/android/dialer/calllog/ui/menu/res/values-bg/strings.xml
new file mode 100644
index 0000000..d5f6fcf
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/menu/res/values-bg/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_details_menu_label">Подробности за обаждането</string>
+  <string name="delete">Изтриване</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/menu/res/values-bn/strings.xml b/java/com/android/dialer/calllog/ui/menu/res/values-bn/strings.xml
new file mode 100644
index 0000000..c0818e7
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/menu/res/values-bn/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_details_menu_label">কলের বিশদ বিবরণ</string>
+  <string name="delete">মুছুন</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/menu/res/values-bs/strings.xml b/java/com/android/dialer/calllog/ui/menu/res/values-bs/strings.xml
new file mode 100644
index 0000000..c272b2f
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/menu/res/values-bs/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_details_menu_label">Detalji o pozivu</string>
+  <string name="delete">Izbriši</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/menu/res/values-ca/strings.xml b/java/com/android/dialer/calllog/ui/menu/res/values-ca/strings.xml
new file mode 100644
index 0000000..d9e7680
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/menu/res/values-ca/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_details_menu_label">Dades de trucada</string>
+  <string name="delete">Suprimeix</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/menu/res/values-cs/strings.xml b/java/com/android/dialer/calllog/ui/menu/res/values-cs/strings.xml
new file mode 100644
index 0000000..e29c193
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/menu/res/values-cs/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_details_menu_label">Podrobnosti hovoru</string>
+  <string name="delete">Smazat</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/menu/res/values-da/strings.xml b/java/com/android/dialer/calllog/ui/menu/res/values-da/strings.xml
new file mode 100644
index 0000000..8f54cc1
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/menu/res/values-da/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_details_menu_label">Opkaldsinfo</string>
+  <string name="delete">Slet</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/menu/res/values-de/strings.xml b/java/com/android/dialer/calllog/ui/menu/res/values-de/strings.xml
new file mode 100644
index 0000000..9b2367f
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/menu/res/values-de/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_details_menu_label">Anrufdetails</string>
+  <string name="delete">Löschen</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/menu/res/values-el/strings.xml b/java/com/android/dialer/calllog/ui/menu/res/values-el/strings.xml
new file mode 100644
index 0000000..d0ee283
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/menu/res/values-el/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_details_menu_label">Λεπτομέρειες κλήσης</string>
+  <string name="delete">Διαγραφή</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/menu/res/values-en-rAU/strings.xml b/java/com/android/dialer/calllog/ui/menu/res/values-en-rAU/strings.xml
new file mode 100644
index 0000000..17ea313
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/menu/res/values-en-rAU/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_details_menu_label">Call details</string>
+  <string name="delete">Delete</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/menu/res/values-en-rGB/strings.xml b/java/com/android/dialer/calllog/ui/menu/res/values-en-rGB/strings.xml
new file mode 100644
index 0000000..17ea313
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/menu/res/values-en-rGB/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_details_menu_label">Call details</string>
+  <string name="delete">Delete</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/menu/res/values-en-rIN/strings.xml b/java/com/android/dialer/calllog/ui/menu/res/values-en-rIN/strings.xml
new file mode 100644
index 0000000..17ea313
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/menu/res/values-en-rIN/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_details_menu_label">Call details</string>
+  <string name="delete">Delete</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/menu/res/values-es-rUS/strings.xml b/java/com/android/dialer/calllog/ui/menu/res/values-es-rUS/strings.xml
new file mode 100644
index 0000000..bd7f420
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/menu/res/values-es-rUS/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_details_menu_label">Detalles de la llamada</string>
+  <string name="delete">Borrar</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/menu/res/values-es/strings.xml b/java/com/android/dialer/calllog/ui/menu/res/values-es/strings.xml
new file mode 100644
index 0000000..8137b81
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/menu/res/values-es/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_details_menu_label">Detalles de la llamada</string>
+  <string name="delete">Eliminar</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/menu/res/values-et/strings.xml b/java/com/android/dialer/calllog/ui/menu/res/values-et/strings.xml
new file mode 100644
index 0000000..ac079ed
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/menu/res/values-et/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_details_menu_label">Kõne üksikasjad</string>
+  <string name="delete">Kustuta</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/menu/res/values-eu/strings.xml b/java/com/android/dialer/calllog/ui/menu/res/values-eu/strings.xml
new file mode 100644
index 0000000..f7d747b
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/menu/res/values-eu/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_details_menu_label">Deiaren xehetasunak</string>
+  <string name="delete">Ezabatu</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/menu/res/values-fa/strings.xml b/java/com/android/dialer/calllog/ui/menu/res/values-fa/strings.xml
new file mode 100644
index 0000000..84944ea
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/menu/res/values-fa/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_details_menu_label">جزئیات تماس</string>
+  <string name="delete">حذف</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/menu/res/values-fi/strings.xml b/java/com/android/dialer/calllog/ui/menu/res/values-fi/strings.xml
new file mode 100644
index 0000000..6c4268b
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/menu/res/values-fi/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_details_menu_label">Puhelun tiedot</string>
+  <string name="delete">Poista</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/menu/res/values-fr-rCA/strings.xml b/java/com/android/dialer/calllog/ui/menu/res/values-fr-rCA/strings.xml
new file mode 100644
index 0000000..9d0cf4e
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/menu/res/values-fr-rCA/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_details_menu_label">Détails sur l\'appel</string>
+  <string name="delete">Supprimer</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/menu/res/values-fr/strings.xml b/java/com/android/dialer/calllog/ui/menu/res/values-fr/strings.xml
new file mode 100644
index 0000000..f9f35c3
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/menu/res/values-fr/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_details_menu_label">Détails de l\'appel</string>
+  <string name="delete">Supprimer</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/menu/res/values-gl/strings.xml b/java/com/android/dialer/calllog/ui/menu/res/values-gl/strings.xml
new file mode 100644
index 0000000..f322f2e
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/menu/res/values-gl/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_details_menu_label">Detalles da chamada</string>
+  <string name="delete">Eliminar</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/menu/res/values-gu/strings.xml b/java/com/android/dialer/calllog/ui/menu/res/values-gu/strings.xml
new file mode 100644
index 0000000..a3c7118
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/menu/res/values-gu/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_details_menu_label">કૉલની વિગતો</string>
+  <string name="delete">કાઢી નાખો</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/menu/res/values-hi/strings.xml b/java/com/android/dialer/calllog/ui/menu/res/values-hi/strings.xml
new file mode 100644
index 0000000..e91c6a7
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/menu/res/values-hi/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_details_menu_label">कॉल विवरण</string>
+  <string name="delete">हटाएं</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/menu/res/values-hr/strings.xml b/java/com/android/dialer/calllog/ui/menu/res/values-hr/strings.xml
new file mode 100644
index 0000000..ca30f0f
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/menu/res/values-hr/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_details_menu_label">Pojedinosti poziva</string>
+  <string name="delete">Brisanje</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/menu/res/values-hu/strings.xml b/java/com/android/dialer/calllog/ui/menu/res/values-hu/strings.xml
new file mode 100644
index 0000000..3e2abd0
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/menu/res/values-hu/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_details_menu_label">Hívás adatai</string>
+  <string name="delete">Törlés</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/menu/res/values-hy/strings.xml b/java/com/android/dialer/calllog/ui/menu/res/values-hy/strings.xml
new file mode 100644
index 0000000..ec4a886
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/menu/res/values-hy/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_details_menu_label">Զանգի մանրամասները</string>
+  <string name="delete">Ջնջել</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/menu/res/values-in/strings.xml b/java/com/android/dialer/calllog/ui/menu/res/values-in/strings.xml
new file mode 100644
index 0000000..593da28
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/menu/res/values-in/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_details_menu_label">Detail panggilan</string>
+  <string name="delete">Hapus</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/menu/res/values-is/strings.xml b/java/com/android/dialer/calllog/ui/menu/res/values-is/strings.xml
new file mode 100644
index 0000000..6e25e63
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/menu/res/values-is/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_details_menu_label">Símtalsupplýsingar</string>
+  <string name="delete">Eyða</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/menu/res/values-it/strings.xml b/java/com/android/dialer/calllog/ui/menu/res/values-it/strings.xml
new file mode 100644
index 0000000..96b9144
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/menu/res/values-it/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_details_menu_label">Dettagli chiamata</string>
+  <string name="delete">Elimina</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/menu/res/values-iw/strings.xml b/java/com/android/dialer/calllog/ui/menu/res/values-iw/strings.xml
new file mode 100644
index 0000000..248502e
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/menu/res/values-iw/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_details_menu_label">פרטי השיחה</string>
+  <string name="delete">מחק</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/menu/res/values-ja/strings.xml b/java/com/android/dialer/calllog/ui/menu/res/values-ja/strings.xml
new file mode 100644
index 0000000..4469e2f
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/menu/res/values-ja/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_details_menu_label">通話の詳細</string>
+  <string name="delete">削除</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/menu/res/values-ka/strings.xml b/java/com/android/dialer/calllog/ui/menu/res/values-ka/strings.xml
new file mode 100644
index 0000000..90117e5
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/menu/res/values-ka/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_details_menu_label">ზარის დეტალები</string>
+  <string name="delete">წაშლა</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/menu/res/values-kk/strings.xml b/java/com/android/dialer/calllog/ui/menu/res/values-kk/strings.xml
new file mode 100644
index 0000000..7c8ee8a
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/menu/res/values-kk/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_details_menu_label">Қоңырау деректері</string>
+  <string name="delete">Жою</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/menu/res/values-km/strings.xml b/java/com/android/dialer/calllog/ui/menu/res/values-km/strings.xml
new file mode 100644
index 0000000..17dc6f8
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/menu/res/values-km/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_details_menu_label">ព័ត៌មាន​លម្អិត​អំពី​ការហៅ​ទូរសព្ទ</string>
+  <string name="delete">លុប</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/menu/res/values-kn/strings.xml b/java/com/android/dialer/calllog/ui/menu/res/values-kn/strings.xml
new file mode 100644
index 0000000..572b455
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/menu/res/values-kn/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_details_menu_label">ಕರೆಯ ವಿವರಗಳು</string>
+  <string name="delete">ಅಳಿಸಿ</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/menu/res/values-ko/strings.xml b/java/com/android/dialer/calllog/ui/menu/res/values-ko/strings.xml
new file mode 100644
index 0000000..ff2ecad
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/menu/res/values-ko/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_details_menu_label">통화 세부정보</string>
+  <string name="delete">삭제</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/menu/res/values-ky/strings.xml b/java/com/android/dialer/calllog/ui/menu/res/values-ky/strings.xml
new file mode 100644
index 0000000..f4d20ac
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/menu/res/values-ky/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_details_menu_label">Чалуу тууралуу</string>
+  <string name="delete">Жок кылуу</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/menu/res/values-lo/strings.xml b/java/com/android/dialer/calllog/ui/menu/res/values-lo/strings.xml
new file mode 100644
index 0000000..b9e3956
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/menu/res/values-lo/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_details_menu_label">ລາຍລະອຽດ​ການໂທ</string>
+  <string name="delete">​ລຶບ</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/menu/res/values-lt/strings.xml b/java/com/android/dialer/calllog/ui/menu/res/values-lt/strings.xml
new file mode 100644
index 0000000..955df91
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/menu/res/values-lt/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_details_menu_label">Išsami skambučio informacija</string>
+  <string name="delete">Ištrinti</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/menu/res/values-lv/strings.xml b/java/com/android/dialer/calllog/ui/menu/res/values-lv/strings.xml
new file mode 100644
index 0000000..b1a8b5c
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/menu/res/values-lv/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_details_menu_label">Informācija par zvanu</string>
+  <string name="delete">Dzēst</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/menu/res/values-mk/strings.xml b/java/com/android/dialer/calllog/ui/menu/res/values-mk/strings.xml
new file mode 100644
index 0000000..0ee79f3
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/menu/res/values-mk/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_details_menu_label">Детали на повик</string>
+  <string name="delete">Избриши</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/menu/res/values-ml/strings.xml b/java/com/android/dialer/calllog/ui/menu/res/values-ml/strings.xml
new file mode 100644
index 0000000..684125d
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/menu/res/values-ml/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_details_menu_label">കോൾ വിശദാംശങ്ങൾ</string>
+  <string name="delete">ഇല്ലാതാക്കുക</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/menu/res/values-mn/strings.xml b/java/com/android/dialer/calllog/ui/menu/res/values-mn/strings.xml
new file mode 100644
index 0000000..e7541a9
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/menu/res/values-mn/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_details_menu_label">Дуудлагын мэдээлэл</string>
+  <string name="delete">Устгах</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/menu/res/values-mr/strings.xml b/java/com/android/dialer/calllog/ui/menu/res/values-mr/strings.xml
new file mode 100644
index 0000000..2465ceb
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/menu/res/values-mr/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_details_menu_label">कॉल तपशील</string>
+  <string name="delete">हटवा</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/menu/res/values-ms/strings.xml b/java/com/android/dialer/calllog/ui/menu/res/values-ms/strings.xml
new file mode 100644
index 0000000..b1e31e7
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/menu/res/values-ms/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_details_menu_label">Butiran panggilan</string>
+  <string name="delete">Padam</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/menu/res/values-my/strings.xml b/java/com/android/dialer/calllog/ui/menu/res/values-my/strings.xml
new file mode 100644
index 0000000..1f402aa
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/menu/res/values-my/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_details_menu_label">ခေါ်ဆိုမှု အသေးစိတ်</string>
+  <string name="delete">ဖျက်ရန်</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/menu/res/values-nb/strings.xml b/java/com/android/dialer/calllog/ui/menu/res/values-nb/strings.xml
new file mode 100644
index 0000000..481d0da
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/menu/res/values-nb/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_details_menu_label">Anropsinformasjon</string>
+  <string name="delete">Slett</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/menu/res/values-ne/strings.xml b/java/com/android/dialer/calllog/ui/menu/res/values-ne/strings.xml
new file mode 100644
index 0000000..88979c6
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/menu/res/values-ne/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_details_menu_label">कलका विवरणहरू</string>
+  <string name="delete">मेट्नुहोस्</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/menu/res/values-nl/strings.xml b/java/com/android/dialer/calllog/ui/menu/res/values-nl/strings.xml
new file mode 100644
index 0000000..1f8126f
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/menu/res/values-nl/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_details_menu_label">Gespreksgegevens</string>
+  <string name="delete">Verwijderen</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/menu/res/values-no/strings.xml b/java/com/android/dialer/calllog/ui/menu/res/values-no/strings.xml
new file mode 100644
index 0000000..481d0da
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/menu/res/values-no/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_details_menu_label">Anropsinformasjon</string>
+  <string name="delete">Slett</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/menu/res/values-pa/strings.xml b/java/com/android/dialer/calllog/ui/menu/res/values-pa/strings.xml
new file mode 100644
index 0000000..b44743d
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/menu/res/values-pa/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_details_menu_label">ਕਾਲ ਵੇਰਵੇ</string>
+  <string name="delete">ਮਿਟਾਓ</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/menu/res/values-pl/strings.xml b/java/com/android/dialer/calllog/ui/menu/res/values-pl/strings.xml
new file mode 100644
index 0000000..ddf3508
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/menu/res/values-pl/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_details_menu_label">Szczegóły połączenia</string>
+  <string name="delete">Usuń</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/menu/res/values-pt-rBR/strings.xml b/java/com/android/dialer/calllog/ui/menu/res/values-pt-rBR/strings.xml
new file mode 100644
index 0000000..e8a12ed
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/menu/res/values-pt-rBR/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_details_menu_label">Detalhes da chamada</string>
+  <string name="delete">Excluir</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/menu/res/values-pt-rPT/strings.xml b/java/com/android/dialer/calllog/ui/menu/res/values-pt-rPT/strings.xml
new file mode 100644
index 0000000..f2ff894
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/menu/res/values-pt-rPT/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_details_menu_label">Detalhes da chamada</string>
+  <string name="delete">Eliminar</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/menu/res/values-pt/strings.xml b/java/com/android/dialer/calllog/ui/menu/res/values-pt/strings.xml
new file mode 100644
index 0000000..e8a12ed
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/menu/res/values-pt/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_details_menu_label">Detalhes da chamada</string>
+  <string name="delete">Excluir</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/menu/res/values-ro/strings.xml b/java/com/android/dialer/calllog/ui/menu/res/values-ro/strings.xml
new file mode 100644
index 0000000..1b46e27
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/menu/res/values-ro/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_details_menu_label">Detaliile apelului</string>
+  <string name="delete">Ștergeți</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/menu/res/values-ru/strings.xml b/java/com/android/dialer/calllog/ui/menu/res/values-ru/strings.xml
new file mode 100644
index 0000000..051fb42
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/menu/res/values-ru/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_details_menu_label">Сведения о вызове</string>
+  <string name="delete">Удалить</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/menu/res/values-si/strings.xml b/java/com/android/dialer/calllog/ui/menu/res/values-si/strings.xml
new file mode 100644
index 0000000..c3a6408
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/menu/res/values-si/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_details_menu_label">ඇමතුම් විස්තර</string>
+  <string name="delete">මකන්න</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/menu/res/values-sk/strings.xml b/java/com/android/dialer/calllog/ui/menu/res/values-sk/strings.xml
new file mode 100644
index 0000000..d742bda
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/menu/res/values-sk/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_details_menu_label">Podrobnosti hovoru</string>
+  <string name="delete">Odstrániť</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/menu/res/values-sl/strings.xml b/java/com/android/dialer/calllog/ui/menu/res/values-sl/strings.xml
new file mode 100644
index 0000000..2cf5348
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/menu/res/values-sl/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_details_menu_label">Podrobnosti klica</string>
+  <string name="delete">Izbriši</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/menu/res/values-sq/strings.xml b/java/com/android/dialer/calllog/ui/menu/res/values-sq/strings.xml
new file mode 100644
index 0000000..cbbb950
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/menu/res/values-sq/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_details_menu_label">Detajet e telefonatës</string>
+  <string name="delete">Fshi</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/menu/res/values-sr/strings.xml b/java/com/android/dialer/calllog/ui/menu/res/values-sr/strings.xml
new file mode 100644
index 0000000..867bae4
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/menu/res/values-sr/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_details_menu_label">Детаљи позива</string>
+  <string name="delete">Избриши</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/menu/res/values-sv/strings.xml b/java/com/android/dialer/calllog/ui/menu/res/values-sv/strings.xml
new file mode 100644
index 0000000..dfccb94
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/menu/res/values-sv/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_details_menu_label">Samtalsinformation</string>
+  <string name="delete">Radera</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/menu/res/values-sw/strings.xml b/java/com/android/dialer/calllog/ui/menu/res/values-sw/strings.xml
new file mode 100644
index 0000000..ec0e92c
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/menu/res/values-sw/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_details_menu_label">Maelezo ya simu</string>
+  <string name="delete">Futa</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/menu/res/values-ta/strings.xml b/java/com/android/dialer/calllog/ui/menu/res/values-ta/strings.xml
new file mode 100644
index 0000000..b33ffe8
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/menu/res/values-ta/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_details_menu_label">அழைப்பு விவரங்கள்</string>
+  <string name="delete">நீக்கு</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/menu/res/values-te/strings.xml b/java/com/android/dialer/calllog/ui/menu/res/values-te/strings.xml
new file mode 100644
index 0000000..0051640
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/menu/res/values-te/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_details_menu_label">కాల్ వివరాలు</string>
+  <string name="delete">తొలగించు</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/menu/res/values-th/strings.xml b/java/com/android/dialer/calllog/ui/menu/res/values-th/strings.xml
new file mode 100644
index 0000000..a80cb11
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/menu/res/values-th/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_details_menu_label">รายละเอียดการโทร</string>
+  <string name="delete">ลบ</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/menu/res/values-tl/strings.xml b/java/com/android/dialer/calllog/ui/menu/res/values-tl/strings.xml
new file mode 100644
index 0000000..1a0c8fb
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/menu/res/values-tl/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_details_menu_label">Mga detalye ng tawag</string>
+  <string name="delete">I-delete</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/menu/res/values-tr/strings.xml b/java/com/android/dialer/calllog/ui/menu/res/values-tr/strings.xml
new file mode 100644
index 0000000..7884254
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/menu/res/values-tr/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_details_menu_label">Çağrı ayrıntıları</string>
+  <string name="delete">Sil</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/menu/res/values-uk/strings.xml b/java/com/android/dialer/calllog/ui/menu/res/values-uk/strings.xml
new file mode 100644
index 0000000..dc31202
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/menu/res/values-uk/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_details_menu_label">Деталі виклику</string>
+  <string name="delete">Видалити</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/menu/res/values-ur/strings.xml b/java/com/android/dialer/calllog/ui/menu/res/values-ur/strings.xml
new file mode 100644
index 0000000..8c98047
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/menu/res/values-ur/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_details_menu_label">کال کی تفصیلات</string>
+  <string name="delete">حذف کریں</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/menu/res/values-uz/strings.xml b/java/com/android/dialer/calllog/ui/menu/res/values-uz/strings.xml
new file mode 100644
index 0000000..7bcba09
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/menu/res/values-uz/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_details_menu_label">Chaqiruv tafsilotlari</string>
+  <string name="delete">O‘chirib tashlash</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/menu/res/values-vi/strings.xml b/java/com/android/dialer/calllog/ui/menu/res/values-vi/strings.xml
new file mode 100644
index 0000000..a7afa53
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/menu/res/values-vi/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_details_menu_label">Chi tiết cuộc gọi</string>
+  <string name="delete">Xóa</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/menu/res/values-zh-rCN/strings.xml b/java/com/android/dialer/calllog/ui/menu/res/values-zh-rCN/strings.xml
new file mode 100644
index 0000000..b59fe00
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/menu/res/values-zh-rCN/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_details_menu_label">通话详情</string>
+  <string name="delete">删除</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/menu/res/values-zh-rHK/strings.xml b/java/com/android/dialer/calllog/ui/menu/res/values-zh-rHK/strings.xml
new file mode 100644
index 0000000..dff5407
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/menu/res/values-zh-rHK/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_details_menu_label">通話詳細資料</string>
+  <string name="delete">刪除</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/menu/res/values-zh-rTW/strings.xml b/java/com/android/dialer/calllog/ui/menu/res/values-zh-rTW/strings.xml
new file mode 100644
index 0000000..dff5407
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/menu/res/values-zh-rTW/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_details_menu_label">通話詳細資料</string>
+  <string name="delete">刪除</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/menu/res/values-zu/strings.xml b/java/com/android/dialer/calllog/ui/menu/res/values-zu/strings.xml
new file mode 100644
index 0000000..1a03cd5
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/menu/res/values-zu/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_details_menu_label">Imininingwane yekholi</string>
+  <string name="delete">Susa</string>
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/res/layout/new_call_log_entry.xml b/java/com/android/dialer/calllog/ui/res/layout/new_call_log_entry.xml
index 093f866..dba859f 100644
--- a/java/com/android/dialer/calllog/ui/res/layout/new_call_log_entry.xml
+++ b/java/com/android/dialer/calllog/ui/res/layout/new_call_log_entry.xml
@@ -17,131 +17,143 @@
 
 <RelativeLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/new_call_log_entry_root"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:minHeight="72dp">
+    android:minHeight="72dp"
+    android:background="?android:attr/selectableItemBackground">
 
-  <QuickContactBadge
-      android:id="@+id/quick_contact_photo"
-      android:layout_width="40dp"
-      android:layout_height="40dp"
-      android:layout_marginStart="16dp"
-      android:layout_marginEnd="16dp"
-      android:layout_centerVertical="true"
-      android:focusable="true"/>
-
-  <!-- The frame layout is necessary to avoid clipping the icons and ellipsize the text when the
-       content is too wide to fit.
-   -->
-  <FrameLayout
-      android:id="@+id/primary_row"
+  <com.android.dialer.widget.ContactPhotoView
+      android:id="@+id/contact_photo_view"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:layout_toEndOf="@+id/quick_contact_photo"
-      android:layout_toStartOf="@+id/menu_button">
+      android:layout_marginStart="8dp"
+      android:layout_marginEnd="8dp"
+      android:layout_centerVertical="true"/>
 
+  <!--
+    A vertical linear layout of three rows: primary info, secondary info, and phone account info.
+    It is marked as not important for a11y as we will set a more user-friendly content description
+    for the entire entry view in Java code.
+  -->
+  <LinearLayout
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_centerVertical="true"
+      android:layout_toEndOf="@+id/contact_photo_view"
+      android:layout_toStartOf="@+id/call_button"
+      android:orientation="vertical"
+      android:importantForAccessibility="noHideDescendants">
+
+    <!-- 1st row: primary info -->
     <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="14dp"
         android:orientation="horizontal">
 
-      <TextView
+      <!--
+          Important note:
+
+          The following BidiTextView is the only widget that defines a weight in the containing
+          LinearLayout, of which the purpose is to avoid pushing the widgets after it out of the
+          boundary when the text is too long.
+
+          Generally it is more efficient to assign a width/height of 0dp so that the BidiTextView
+          does not have to measure its own size since it will absorb all the remaining space anyway.
+
+          However, as the BidiTextView is part of an entry in the call log's RecyclerView, we must
+          set layout_width to "wrap_content" so that the TextView can adjust its size when recycled
+          for text of different lengths.
+      -->
+      <com.android.dialer.widget.BidiTextView
           android:id="@+id/primary_text"
-          style="@style/PrimaryText"
+          style="@style/Dialer.TextAppearance.Primary.Ellipsize"
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"
           android:layout_weight="1"
           android:layout_marginEnd="6dp"
-          android:ellipsize="end"
           android:lineSpacingMultiplier="1.5"
-          android:singleLine="true"/>
-
+          tools:ignore="InefficientWeight"/>
 
       <ImageView
           android:id="@+id/hd_icon"
           android:layout_width="wrap_content"
           android:layout_height="18dp"
           android:layout_gravity="center_vertical"
-          android:src="@drawable/quantum_ic_hd_vd_theme_24"
-          />
+          android:importantForAccessibility="no"
+          android:src="@drawable/quantum_ic_hd_vd_theme_24"/>
 
       <ImageView
           android:id="@+id/wifi_icon"
           android:layout_width="wrap_content"
           android:layout_height="18dp"
           android:layout_gravity="center_vertical"
-          android:src="@drawable/quantum_ic_signal_wifi_4_bar_vd_theme_24"
-          />
+          android:importantForAccessibility="no"
+          android:src="@drawable/quantum_ic_signal_wifi_4_bar_vd_theme_24"/>
 
       <ImageView
           android:id="@+id/assisted_dial_icon"
           android:layout_width="wrap_content"
           android:layout_height="18dp"
           android:layout_gravity="center_vertical"
-          android:src="@drawable/quantum_ic_language_vd_theme_24"
-          />
+          android:importantForAccessibility="no"
+          android:src="@drawable/quantum_ic_language_vd_theme_24"/>
 
       <TextView
           android:id="@+id/call_count"
-          style="@style/PrimaryText"
+          style="@style/Dialer.TextAppearance.Primary"
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"
           android:layout_marginEnd="6dp"
           android:lineSpacingMultiplier="1.5"/>
 
     </LinearLayout>
-  </FrameLayout>
 
-  <LinearLayout
-      android:id="@+id/secondary_row"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:layout_below="@+id/primary_row"
-      android:layout_toEndOf="@+id/quick_contact_photo"
-      android:orientation="horizontal">
-
-    <ImageView
-        android:id="@+id/call_type_icon"
-        android:layout_width="wrap_content"
-        android:layout_height="18dp"
-        android:layout_gravity="center_vertical"
-        />
-
-    <TextView
-        android:id="@+id/secondary_text"
-        style="@style/SecondaryText"
+    <!-- 2nd row: secondary info -->
+    <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:ellipsize="end"
-        android:lineSpacingMultiplier="1.4"
-        android:singleLine="true"/>
+        android:orientation="horizontal"
+        tools:ignore="UseCompoundDrawables">
+
+      <ImageView
+          android:id="@+id/call_type_icon"
+          android:layout_width="wrap_content"
+          android:layout_height="18dp"
+          android:layout_gravity="center_vertical"
+          android:importantForAccessibility="no"/>
+
+      <TextView
+          android:id="@+id/secondary_text"
+          style="@style/Dialer.TextAppearance.Secondary.Ellipsize"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:lineSpacingMultiplier="1.4"/>
+
+    </LinearLayout>
+
+    <!-- 3rd row: phone account info -->
+    <TextView
+        android:id="@+id/phone_account"
+        style="@style/Dialer.TextAppearance.Secondary.Ellipsize"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
+
   </LinearLayout>
 
-  <TextView
-      android:id="@+id/phone_account"
-      style="@style/SecondaryText"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:layout_below="@+id/secondary_row"
-      android:layout_toEndOf="@+id/quick_contact_photo"
-      android:ellipsize="end"
-      android:singleLine="true"
-      android:visibility="gone"/>
-
+  <!--
+    The button to make a call.
+    Its content description is set in Java code.
+  -->
   <ImageView
-      android:id="@+id/menu_button"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:layout_marginTop="12dp"
-      android:layout_marginBottom="12dp"
-      android:layout_marginStart="4dp"
-      android:layout_marginEnd="4dp"
+      android:id="@+id/call_button"
+      android:layout_width="56dp"
+      android:layout_height="72dp"
       android:layout_alignParentEnd="true"
       android:layout_centerVertical="true"
-      android:padding="12dp"
       android:background="?android:attr/selectableItemBackgroundBorderless"
       android:scaleType="center"
-      android:src="@drawable/quantum_ic_more_vert_vd_theme_24"
-      android:tint="@color/dialer_secondary_text_color"/>
+      android:tint="?colorIcon"
+      tools:ignore="ContentDescription"/>
 </RelativeLayout>
diff --git a/java/com/android/dialer/calllog/ui/res/layout/new_call_log_fragment.xml b/java/com/android/dialer/calllog/ui/res/layout/new_call_log_fragment.xml
index 1a3a08b..3275cc0 100644
--- a/java/com/android/dialer/calllog/ui/res/layout/new_call_log_fragment.xml
+++ b/java/com/android/dialer/calllog/ui/res/layout/new_call_log_fragment.xml
@@ -15,11 +15,26 @@
   ~ limitations under the License
   -->
 
-<android.support.v7.widget.RecyclerView
+<FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/new_call_log_recycler_view"
-    android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/background_dialer_light"
-    android:paddingBottom="@dimen/floating_action_button_list_bottom_padding"
-    android:clipToPadding="false"/>
+    android:layout_width="match_parent">
+
+  <android.support.v7.widget.RecyclerView
+      android:id="@+id/new_call_log_recycler_view"
+      android:layout_width="match_parent"
+      android:layout_height="match_parent"
+      android:paddingBottom="@dimen/floating_action_button_list_bottom_padding"
+      android:background="?android:attr/colorBackground"
+      android:clipToPadding="false"/>
+
+  <com.android.dialer.widget.EmptyContentView
+      android:gravity="center_vertical"
+      android:id="@+id/new_call_log_empty_content_view"
+      android:background="?android:attr/colorBackground"
+      android:layout_gravity="center"
+      android:layout_height="match_parent"
+      android:layout_width="match_parent"
+      android:visibility="gone"/>
+
+</FrameLayout>
diff --git a/java/com/android/dialer/calllog/ui/res/layout/new_call_log_header.xml b/java/com/android/dialer/calllog/ui/res/layout/new_call_log_header.xml
index e86ece5..a6d1f61 100644
--- a/java/com/android/dialer/calllog/ui/res/layout/new_call_log_header.xml
+++ b/java/com/android/dialer/calllog/ui/res/layout/new_call_log_header.xml
@@ -21,7 +21,7 @@
     android:layout_height="wrap_content">
   <TextView
       android:id="@+id/new_call_log_header_text"
-      style="@style/SubHeader"
+      style="@style/Dialer.TextAppearance.Secondary"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_marginStart="16dp"
diff --git a/java/com/android/dialer/calllog/ui/res/layout/new_call_log_promotion_card.xml b/java/com/android/dialer/calllog/ui/res/layout/new_call_log_promotion_card.xml
new file mode 100644
index 0000000..fade6c7
--- /dev/null
+++ b/java/com/android/dialer/calllog/ui/res/layout/new_call_log_promotion_card.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2018 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?android:attr/colorBackground"
+    android:orientation="vertical">
+
+  <LinearLayout
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:paddingTop="16dp"
+      android:paddingStart="16dp"
+      android:paddingEnd="24dp"
+      android:clipChildren="false"
+      android:clipToPadding="false"
+      android:orientation="horizontal">
+
+    <ImageView
+        android:id="@+id/new_call_log_promotion_card_icon"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:layout_marginEnd="16dp"
+        android:importantForAccessibility="no"/>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:orientation="vertical">
+
+      <TextView
+          android:id="@+id/new_call_log_promotion_card_title"
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+          android:layout_marginBottom="12dp"
+          style="@style/Dialer.TextAppearance.Header2"/>
+      <TextView
+          android:id="@+id/new_call_log_promotion_card_details"
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+          android:layout_marginBottom="16dp"
+          android:lineSpacingExtra="8dp"
+          style="@style/Dialer.TextAppearance.Secondary"/>
+      <Button
+          android:id="@+id/new_call_log_promotion_card_ok"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_marginTop="6dp"
+          android:layout_marginBottom="2dp"
+          android:layout_gravity="end"
+          android:paddingLeft="14dp"
+          android:paddingRight="14dp"
+          android:text="@string/ok_got_it"
+          android:textSize="14sp"/>
+    </LinearLayout>
+  </LinearLayout>
+
+  <!-- The boundary line at the bottom -->
+  <View
+      android:layout_width="match_parent"
+      android:layout_height="1dp"
+      android:layout_marginTop="8dp"
+      android:background="#DBDBDB"/>
+</LinearLayout>
diff --git a/java/com/android/dialer/calllog/ui/res/values-af/strings.xml b/java/com/android/dialer/calllog/ui/res/values-af/strings.xml
index c6b69b5..a5c88e3 100644
--- a/java/com/android/dialer/calllog/ui/res/values-af/strings.xml
+++ b/java/com/android/dialer/calllog/ui/res/values-af/strings.xml
@@ -1,24 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_call_log_video" msgid="8414984483082880050">"Video"</string>
-    <string name="new_call_log_unknown" msgid="7873134340045098010">"Onbekend"</string>
-    <string name="new_call_log_header_today" msgid="3849627842127894230">"Vandag"</string>
-    <string name="new_call_log_header_older" msgid="5879512250610285872">"Ouer"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_new_call_log_entry_tap_action">expand menu</string>
+  <string name="a11y_new_call_log_entry_voice_call">call ^1</string>
+  <string name="a11y_new_call_log_entry_video_call">make a video call to ^1</string>
+  <string name="new_call_log_header_today">Vandag</string>
+  <string name="new_call_log_header_yesterday">Gister</string>
+  <string name="new_call_log_header_older">Ouer</string>
+  <string name="new_call_log_permission_no_calllog">Skakel die foontoestemming aan om jou oproeprekord te sien.</string>
 </resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-am/strings.xml b/java/com/android/dialer/calllog/ui/res/values-am/strings.xml
index adde37b..ca21cf4 100644
--- a/java/com/android/dialer/calllog/ui/res/values-am/strings.xml
+++ b/java/com/android/dialer/calllog/ui/res/values-am/strings.xml
@@ -1,24 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_call_log_video" msgid="8414984483082880050">"ቪዲዮ"</string>
-    <string name="new_call_log_unknown" msgid="7873134340045098010">"ያልታወቀ"</string>
-    <string name="new_call_log_header_today" msgid="3849627842127894230">"ዛሬ"</string>
-    <string name="new_call_log_header_older" msgid="5879512250610285872">"የቆዩ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_new_call_log_entry_tap_action">expand menu</string>
+  <string name="a11y_new_call_log_entry_voice_call">call ^1</string>
+  <string name="a11y_new_call_log_entry_video_call">make a video call to ^1</string>
+  <string name="new_call_log_header_today">ዛሬ</string>
+  <string name="new_call_log_header_yesterday">ትላንት</string>
+  <string name="new_call_log_header_older">የቆዩ</string>
+  <string name="new_call_log_permission_no_calllog">የጥሪ ምዝግብ ማስታወሻዎን ለማየት የስልክ ፍቃዱን ያብሩ።</string>
 </resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-ar/strings.xml b/java/com/android/dialer/calllog/ui/res/values-ar/strings.xml
index 492ee42..75906d0 100644
--- a/java/com/android/dialer/calllog/ui/res/values-ar/strings.xml
+++ b/java/com/android/dialer/calllog/ui/res/values-ar/strings.xml
@@ -1,24 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_call_log_video" msgid="8414984483082880050">"فيديو"</string>
-    <string name="new_call_log_unknown" msgid="7873134340045098010">"غير معروف"</string>
-    <string name="new_call_log_header_today" msgid="3849627842127894230">"اليوم"</string>
-    <string name="new_call_log_header_older" msgid="5879512250610285872">"أقدم"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_new_call_log_entry_tap_action">expand menu</string>
+  <string name="a11y_new_call_log_entry_voice_call">call ^1</string>
+  <string name="a11y_new_call_log_entry_video_call">make a video call to ^1</string>
+  <string name="new_call_log_header_today">اليوم</string>
+  <string name="new_call_log_header_yesterday">أمس</string>
+  <string name="new_call_log_header_older">أقدم</string>
+  <string name="new_call_log_permission_no_calllog">للاطلاع على سجل المكالمات، شغِّل إذن الهاتف.</string>
 </resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-az/strings.xml b/java/com/android/dialer/calllog/ui/res/values-az/strings.xml
index 1e7e57b..ba9723a 100644
--- a/java/com/android/dialer/calllog/ui/res/values-az/strings.xml
+++ b/java/com/android/dialer/calllog/ui/res/values-az/strings.xml
@@ -1,24 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_call_log_video" msgid="8414984483082880050">"Video"</string>
-    <string name="new_call_log_unknown" msgid="7873134340045098010">"Naməlum"</string>
-    <string name="new_call_log_header_today" msgid="3849627842127894230">"Bu gün"</string>
-    <string name="new_call_log_header_older" msgid="5879512250610285872">"Keçmiş"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_new_call_log_entry_tap_action">expand menu</string>
+  <string name="a11y_new_call_log_entry_voice_call">call ^1</string>
+  <string name="a11y_new_call_log_entry_video_call">make a video call to ^1</string>
+  <string name="new_call_log_header_today">Bu gün</string>
+  <string name="new_call_log_header_yesterday">Dünən</string>
+  <string name="new_call_log_header_older">Keçmiş</string>
+  <string name="new_call_log_permission_no_calllog">Zəng jurnalınızı görmək üçün Telefon icazəsini aktiv edin.</string>
 </resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-b+sr+Latn/strings.xml b/java/com/android/dialer/calllog/ui/res/values-b+sr+Latn/strings.xml
index e60fa61..9f0c8ac 100644
--- a/java/com/android/dialer/calllog/ui/res/values-b+sr+Latn/strings.xml
+++ b/java/com/android/dialer/calllog/ui/res/values-b+sr+Latn/strings.xml
@@ -1,24 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_call_log_video" msgid="8414984483082880050">"Video poziv"</string>
-    <string name="new_call_log_unknown" msgid="7873134340045098010">"Nepoznat broj"</string>
-    <string name="new_call_log_header_today" msgid="3849627842127894230">"Danas"</string>
-    <string name="new_call_log_header_older" msgid="5879512250610285872">"Ranije"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_new_call_log_entry_tap_action">expand menu</string>
+  <string name="a11y_new_call_log_entry_voice_call">call ^1</string>
+  <string name="a11y_new_call_log_entry_video_call">make a video call to ^1</string>
+  <string name="new_call_log_header_today">Danas</string>
+  <string name="new_call_log_header_yesterday">Juče</string>
+  <string name="new_call_log_header_older">Ranije</string>
+  <string name="new_call_log_permission_no_calllog">Da biste videli evidenciju poziva, uključite dozvolu za Telefon.</string>
 </resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-be/strings.xml b/java/com/android/dialer/calllog/ui/res/values-be/strings.xml
index c4e80c1..b473805 100644
--- a/java/com/android/dialer/calllog/ui/res/values-be/strings.xml
+++ b/java/com/android/dialer/calllog/ui/res/values-be/strings.xml
@@ -1,24 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_call_log_video" msgid="8414984483082880050">"Відэа"</string>
-    <string name="new_call_log_unknown" msgid="7873134340045098010">"Невядома"</string>
-    <string name="new_call_log_header_today" msgid="3849627842127894230">"Сёння"</string>
-    <string name="new_call_log_header_older" msgid="5879512250610285872">"Больш старыя"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_new_call_log_entry_tap_action">expand menu</string>
+  <string name="a11y_new_call_log_entry_voice_call">call ^1</string>
+  <string name="a11y_new_call_log_entry_video_call">make a video call to ^1</string>
+  <string name="new_call_log_header_today">Сёння</string>
+  <string name="new_call_log_header_yesterday">Учора</string>
+  <string name="new_call_log_header_older">Больш старыя</string>
+  <string name="new_call_log_permission_no_calllog">Каб прагледзець журнал выклікаў, дазвольце доступ да Тэлефона.</string>
 </resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-bg/strings.xml b/java/com/android/dialer/calllog/ui/res/values-bg/strings.xml
index 8806cc1..a855bb1 100644
--- a/java/com/android/dialer/calllog/ui/res/values-bg/strings.xml
+++ b/java/com/android/dialer/calllog/ui/res/values-bg/strings.xml
@@ -1,24 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_call_log_video" msgid="8414984483082880050">"Видеообаждане"</string>
-    <string name="new_call_log_unknown" msgid="7873134340045098010">"Неизвестен"</string>
-    <string name="new_call_log_header_today" msgid="3849627842127894230">"Днес"</string>
-    <string name="new_call_log_header_older" msgid="5879512250610285872">"По-стари"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_new_call_log_entry_tap_action">expand menu</string>
+  <string name="a11y_new_call_log_entry_voice_call">call ^1</string>
+  <string name="a11y_new_call_log_entry_video_call">make a video call to ^1</string>
+  <string name="new_call_log_header_today">Днес</string>
+  <string name="new_call_log_header_yesterday">Вчера</string>
+  <string name="new_call_log_header_older">По-стари</string>
+  <string name="new_call_log_permission_no_calllog">За да видите списъка с обажданията си, включете разрешението за Телефон.</string>
 </resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-bn/strings.xml b/java/com/android/dialer/calllog/ui/res/values-bn/strings.xml
index 5c374d1..e34c1e8 100644
--- a/java/com/android/dialer/calllog/ui/res/values-bn/strings.xml
+++ b/java/com/android/dialer/calllog/ui/res/values-bn/strings.xml
@@ -1,24 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_call_log_video" msgid="8414984483082880050">"ভিডিও"</string>
-    <string name="new_call_log_unknown" msgid="7873134340045098010">"অজানা"</string>
-    <string name="new_call_log_header_today" msgid="3849627842127894230">"আজ"</string>
-    <string name="new_call_log_header_older" msgid="5879512250610285872">"পুরনো"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_new_call_log_entry_tap_action">expand menu</string>
+  <string name="a11y_new_call_log_entry_voice_call">call ^1</string>
+  <string name="a11y_new_call_log_entry_video_call">make a video call to ^1</string>
+  <string name="new_call_log_header_today">আজ</string>
+  <string name="new_call_log_header_yesterday">গতকাল</string>
+  <string name="new_call_log_header_older">পুরনো</string>
+  <string name="new_call_log_permission_no_calllog">কল লগ দেখতে ফোনের অনুমতি চালু করুন।</string>
 </resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-bs/strings.xml b/java/com/android/dialer/calllog/ui/res/values-bs/strings.xml
index 3d1b302..c4e47fd 100644
--- a/java/com/android/dialer/calllog/ui/res/values-bs/strings.xml
+++ b/java/com/android/dialer/calllog/ui/res/values-bs/strings.xml
@@ -1,24 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_call_log_video" msgid="8414984483082880050">"Videozapis"</string>
-    <string name="new_call_log_unknown" msgid="7873134340045098010">"Nepoznato"</string>
-    <string name="new_call_log_header_today" msgid="3849627842127894230">"Danas"</string>
-    <string name="new_call_log_header_older" msgid="5879512250610285872">"Starije"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_new_call_log_entry_tap_action">expand menu</string>
+  <string name="a11y_new_call_log_entry_voice_call">call ^1</string>
+  <string name="a11y_new_call_log_entry_video_call">make a video call to ^1</string>
+  <string name="new_call_log_header_today">Danas</string>
+  <string name="new_call_log_header_yesterday">Jučer</string>
+  <string name="new_call_log_header_older">Starije</string>
+  <string name="new_call_log_permission_no_calllog">Da vidite popis poziva, uključite odobrenje za Telefon.</string>
 </resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-ca/strings.xml b/java/com/android/dialer/calllog/ui/res/values-ca/strings.xml
index 54d07f5..52030a2 100644
--- a/java/com/android/dialer/calllog/ui/res/values-ca/strings.xml
+++ b/java/com/android/dialer/calllog/ui/res/values-ca/strings.xml
@@ -1,24 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_call_log_video" msgid="8414984483082880050">"Vídeo"</string>
-    <string name="new_call_log_unknown" msgid="7873134340045098010">"Desconeguts"</string>
-    <string name="new_call_log_header_today" msgid="3849627842127894230">"Avui"</string>
-    <string name="new_call_log_header_older" msgid="5879512250610285872">"Anteriors"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_new_call_log_entry_tap_action">expand menu</string>
+  <string name="a11y_new_call_log_entry_voice_call">call ^1</string>
+  <string name="a11y_new_call_log_entry_video_call">make a video call to ^1</string>
+  <string name="new_call_log_header_today">Avui</string>
+  <string name="new_call_log_header_yesterday">Ahir</string>
+  <string name="new_call_log_header_older">Anteriors</string>
+  <string name="new_call_log_permission_no_calllog">Activa el permís Telèfon per veure el teu registre de trucades.</string>
 </resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-cs/strings.xml b/java/com/android/dialer/calllog/ui/res/values-cs/strings.xml
index 40a9cb1..57e82f8 100644
--- a/java/com/android/dialer/calllog/ui/res/values-cs/strings.xml
+++ b/java/com/android/dialer/calllog/ui/res/values-cs/strings.xml
@@ -1,24 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_call_log_video" msgid="8414984483082880050">"Video"</string>
-    <string name="new_call_log_unknown" msgid="7873134340045098010">"Neznámý volající"</string>
-    <string name="new_call_log_header_today" msgid="3849627842127894230">"Dnes"</string>
-    <string name="new_call_log_header_older" msgid="5879512250610285872">"Starší"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_new_call_log_entry_tap_action">expand menu</string>
+  <string name="a11y_new_call_log_entry_voice_call">call ^1</string>
+  <string name="a11y_new_call_log_entry_video_call">make a video call to ^1</string>
+  <string name="new_call_log_header_today">Dnes</string>
+  <string name="new_call_log_header_yesterday">Včera</string>
+  <string name="new_call_log_header_older">Starší</string>
+  <string name="new_call_log_permission_no_calllog">Pokud chcete zobrazit seznam hovorů, zapněte oprávnění Telefon.</string>
 </resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-da/strings.xml b/java/com/android/dialer/calllog/ui/res/values-da/strings.xml
index 46a87a4..aab0f16 100644
--- a/java/com/android/dialer/calllog/ui/res/values-da/strings.xml
+++ b/java/com/android/dialer/calllog/ui/res/values-da/strings.xml
@@ -1,24 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_call_log_video" msgid="8414984483082880050">"Video"</string>
-    <string name="new_call_log_unknown" msgid="7873134340045098010">"Ukendt"</string>
-    <string name="new_call_log_header_today" msgid="3849627842127894230">"I dag"</string>
-    <string name="new_call_log_header_older" msgid="5879512250610285872">"Ældre"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_new_call_log_entry_tap_action">expand menu</string>
+  <string name="a11y_new_call_log_entry_voice_call">call ^1</string>
+  <string name="a11y_new_call_log_entry_video_call">make a video call to ^1</string>
+  <string name="new_call_log_header_today">I dag</string>
+  <string name="new_call_log_header_yesterday">I går</string>
+  <string name="new_call_log_header_older">Ældre</string>
+  <string name="new_call_log_permission_no_calllog">Slå tilladelsen Telefon til for at se din opkaldsliste.</string>
 </resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-de/strings.xml b/java/com/android/dialer/calllog/ui/res/values-de/strings.xml
index e587bb3..5367161 100644
--- a/java/com/android/dialer/calllog/ui/res/values-de/strings.xml
+++ b/java/com/android/dialer/calllog/ui/res/values-de/strings.xml
@@ -1,24 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_call_log_video" msgid="8414984483082880050">"Video"</string>
-    <string name="new_call_log_unknown" msgid="7873134340045098010">"Unbekannt"</string>
-    <string name="new_call_log_header_today" msgid="3849627842127894230">"Heute"</string>
-    <string name="new_call_log_header_older" msgid="5879512250610285872">"Ältere"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_new_call_log_entry_tap_action">expand menu</string>
+  <string name="a11y_new_call_log_entry_voice_call">call ^1</string>
+  <string name="a11y_new_call_log_entry_video_call">make a video call to ^1</string>
+  <string name="new_call_log_header_today">Heute</string>
+  <string name="new_call_log_header_yesterday">Gestern</string>
+  <string name="new_call_log_header_older">Ältere</string>
+  <string name="new_call_log_permission_no_calllog">Aktiviere die Berechtigung \"Telefon\", um dein Anrufprotokoll abzurufen.</string>
 </resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-el/strings.xml b/java/com/android/dialer/calllog/ui/res/values-el/strings.xml
index 9f40423..3063ce9 100644
--- a/java/com/android/dialer/calllog/ui/res/values-el/strings.xml
+++ b/java/com/android/dialer/calllog/ui/res/values-el/strings.xml
@@ -1,24 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_call_log_video" msgid="8414984483082880050">"Βίντεο"</string>
-    <string name="new_call_log_unknown" msgid="7873134340045098010">"Άγνωστος"</string>
-    <string name="new_call_log_header_today" msgid="3849627842127894230">"Σήμερα"</string>
-    <string name="new_call_log_header_older" msgid="5879512250610285872">"Παλαιότερες"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_new_call_log_entry_tap_action">expand menu</string>
+  <string name="a11y_new_call_log_entry_voice_call">call ^1</string>
+  <string name="a11y_new_call_log_entry_video_call">make a video call to ^1</string>
+  <string name="new_call_log_header_today">Σήμερα</string>
+  <string name="new_call_log_header_yesterday">Χθες</string>
+  <string name="new_call_log_header_older">Παλαιότερες</string>
+  <string name="new_call_log_permission_no_calllog">Για να δείτε το αρχείο καταγραφής κλήσεών σας, ενεργοποιήστε την άδεια τηλεφώνου.</string>
 </resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-en-rAU/strings.xml b/java/com/android/dialer/calllog/ui/res/values-en-rAU/strings.xml
index b442d5a..6789a06 100644
--- a/java/com/android/dialer/calllog/ui/res/values-en-rAU/strings.xml
+++ b/java/com/android/dialer/calllog/ui/res/values-en-rAU/strings.xml
@@ -1,24 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_call_log_video" msgid="8414984483082880050">"Video"</string>
-    <string name="new_call_log_unknown" msgid="7873134340045098010">"Unknown"</string>
-    <string name="new_call_log_header_today" msgid="3849627842127894230">"Today"</string>
-    <string name="new_call_log_header_older" msgid="5879512250610285872">"Older"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_new_call_log_entry_tap_action">expand menu</string>
+  <string name="a11y_new_call_log_entry_voice_call">call ^1</string>
+  <string name="a11y_new_call_log_entry_video_call">make a video call to ^1</string>
+  <string name="new_call_log_header_today">Today</string>
+  <string name="new_call_log_header_yesterday">Yesterday</string>
+  <string name="new_call_log_header_older">Older</string>
+  <string name="new_call_log_permission_no_calllog">To see your call log, turn on the Phone permission.</string>
 </resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-en-rGB/strings.xml b/java/com/android/dialer/calllog/ui/res/values-en-rGB/strings.xml
index b442d5a..6789a06 100644
--- a/java/com/android/dialer/calllog/ui/res/values-en-rGB/strings.xml
+++ b/java/com/android/dialer/calllog/ui/res/values-en-rGB/strings.xml
@@ -1,24 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_call_log_video" msgid="8414984483082880050">"Video"</string>
-    <string name="new_call_log_unknown" msgid="7873134340045098010">"Unknown"</string>
-    <string name="new_call_log_header_today" msgid="3849627842127894230">"Today"</string>
-    <string name="new_call_log_header_older" msgid="5879512250610285872">"Older"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_new_call_log_entry_tap_action">expand menu</string>
+  <string name="a11y_new_call_log_entry_voice_call">call ^1</string>
+  <string name="a11y_new_call_log_entry_video_call">make a video call to ^1</string>
+  <string name="new_call_log_header_today">Today</string>
+  <string name="new_call_log_header_yesterday">Yesterday</string>
+  <string name="new_call_log_header_older">Older</string>
+  <string name="new_call_log_permission_no_calllog">To see your call log, turn on the Phone permission.</string>
 </resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-en-rIN/strings.xml b/java/com/android/dialer/calllog/ui/res/values-en-rIN/strings.xml
index b442d5a..6789a06 100644
--- a/java/com/android/dialer/calllog/ui/res/values-en-rIN/strings.xml
+++ b/java/com/android/dialer/calllog/ui/res/values-en-rIN/strings.xml
@@ -1,24 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_call_log_video" msgid="8414984483082880050">"Video"</string>
-    <string name="new_call_log_unknown" msgid="7873134340045098010">"Unknown"</string>
-    <string name="new_call_log_header_today" msgid="3849627842127894230">"Today"</string>
-    <string name="new_call_log_header_older" msgid="5879512250610285872">"Older"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_new_call_log_entry_tap_action">expand menu</string>
+  <string name="a11y_new_call_log_entry_voice_call">call ^1</string>
+  <string name="a11y_new_call_log_entry_video_call">make a video call to ^1</string>
+  <string name="new_call_log_header_today">Today</string>
+  <string name="new_call_log_header_yesterday">Yesterday</string>
+  <string name="new_call_log_header_older">Older</string>
+  <string name="new_call_log_permission_no_calllog">To see your call log, turn on the Phone permission.</string>
 </resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-es-rUS/strings.xml b/java/com/android/dialer/calllog/ui/res/values-es-rUS/strings.xml
index 5cfdae7..370874c 100644
--- a/java/com/android/dialer/calllog/ui/res/values-es-rUS/strings.xml
+++ b/java/com/android/dialer/calllog/ui/res/values-es-rUS/strings.xml
@@ -1,24 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_call_log_video" msgid="8414984483082880050">"Video"</string>
-    <string name="new_call_log_unknown" msgid="7873134340045098010">"Desconocido"</string>
-    <string name="new_call_log_header_today" msgid="3849627842127894230">"Hoy"</string>
-    <string name="new_call_log_header_older" msgid="5879512250610285872">"Anterior"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_new_call_log_entry_tap_action">expand menu</string>
+  <string name="a11y_new_call_log_entry_voice_call">call ^1</string>
+  <string name="a11y_new_call_log_entry_video_call">make a video call to ^1</string>
+  <string name="new_call_log_header_today">Hoy</string>
+  <string name="new_call_log_header_yesterday">Ayer</string>
+  <string name="new_call_log_header_older">Anterior</string>
+  <string name="new_call_log_permission_no_calllog">Para ver el registro de llamadas, activa el permiso Teléfono.</string>
 </resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-es/strings.xml b/java/com/android/dialer/calllog/ui/res/values-es/strings.xml
index c23e7cf..7560e00 100644
--- a/java/com/android/dialer/calllog/ui/res/values-es/strings.xml
+++ b/java/com/android/dialer/calllog/ui/res/values-es/strings.xml
@@ -1,24 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_call_log_video" msgid="8414984483082880050">"Vídeo"</string>
-    <string name="new_call_log_unknown" msgid="7873134340045098010">"Desconocidas"</string>
-    <string name="new_call_log_header_today" msgid="3849627842127894230">"Hoy"</string>
-    <string name="new_call_log_header_older" msgid="5879512250610285872">"Anteriores"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_new_call_log_entry_tap_action">expand menu</string>
+  <string name="a11y_new_call_log_entry_voice_call">call ^1</string>
+  <string name="a11y_new_call_log_entry_video_call">make a video call to ^1</string>
+  <string name="new_call_log_header_today">Hoy</string>
+  <string name="new_call_log_header_yesterday">Ayer</string>
+  <string name="new_call_log_header_older">Anteriores</string>
+  <string name="new_call_log_permission_no_calllog">Para ver el registro de llamadas, habilita el permiso de teléfono.</string>
 </resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-et/strings.xml b/java/com/android/dialer/calllog/ui/res/values-et/strings.xml
index 0199758..b885b34 100644
--- a/java/com/android/dialer/calllog/ui/res/values-et/strings.xml
+++ b/java/com/android/dialer/calllog/ui/res/values-et/strings.xml
@@ -1,24 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_call_log_video" msgid="8414984483082880050">"Video"</string>
-    <string name="new_call_log_unknown" msgid="7873134340045098010">"Tundmatu"</string>
-    <string name="new_call_log_header_today" msgid="3849627842127894230">"Täna"</string>
-    <string name="new_call_log_header_older" msgid="5879512250610285872">"Vanem"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_new_call_log_entry_tap_action">expand menu</string>
+  <string name="a11y_new_call_log_entry_voice_call">call ^1</string>
+  <string name="a11y_new_call_log_entry_video_call">make a video call to ^1</string>
+  <string name="new_call_log_header_today">Täna</string>
+  <string name="new_call_log_header_yesterday">Eile</string>
+  <string name="new_call_log_header_older">Vanem</string>
+  <string name="new_call_log_permission_no_calllog">Kõnelogi vaatamiseks lülitage sisse telefoniluba.</string>
 </resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-eu/strings.xml b/java/com/android/dialer/calllog/ui/res/values-eu/strings.xml
index eea5b78..f91d180 100644
--- a/java/com/android/dialer/calllog/ui/res/values-eu/strings.xml
+++ b/java/com/android/dialer/calllog/ui/res/values-eu/strings.xml
@@ -1,24 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_call_log_video" msgid="8414984483082880050">"Bideoa"</string>
-    <string name="new_call_log_unknown" msgid="7873134340045098010">"Ezezagunak"</string>
-    <string name="new_call_log_header_today" msgid="3849627842127894230">"Gaurkoak"</string>
-    <string name="new_call_log_header_older" msgid="5879512250610285872">"Zaharragoak"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_new_call_log_entry_tap_action">expand menu</string>
+  <string name="a11y_new_call_log_entry_voice_call">call ^1</string>
+  <string name="a11y_new_call_log_entry_video_call">make a video call to ^1</string>
+  <string name="new_call_log_header_today">Gaurkoak</string>
+  <string name="new_call_log_header_yesterday">Atzo</string>
+  <string name="new_call_log_header_older">Zaharragoak</string>
+  <string name="new_call_log_permission_no_calllog">Deien erregistroa ikusteko, aktibatu telefonoa erabiltzeko baimena.</string>
 </resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-fa/strings.xml b/java/com/android/dialer/calllog/ui/res/values-fa/strings.xml
index 0b9b19f..1e14791 100644
--- a/java/com/android/dialer/calllog/ui/res/values-fa/strings.xml
+++ b/java/com/android/dialer/calllog/ui/res/values-fa/strings.xml
@@ -1,24 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_call_log_video" msgid="8414984483082880050">"ویدیو"</string>
-    <string name="new_call_log_unknown" msgid="7873134340045098010">"نامشخص"</string>
-    <string name="new_call_log_header_today" msgid="3849627842127894230">"امروز"</string>
-    <string name="new_call_log_header_older" msgid="5879512250610285872">"قدیمی‌تر"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_new_call_log_entry_tap_action">expand menu</string>
+  <string name="a11y_new_call_log_entry_voice_call">call ^1</string>
+  <string name="a11y_new_call_log_entry_video_call">make a video call to ^1</string>
+  <string name="new_call_log_header_today">امروز</string>
+  <string name="new_call_log_header_yesterday">دیروز</string>
+  <string name="new_call_log_header_older">قدیمی‌تر</string>
+  <string name="new_call_log_permission_no_calllog">برای دیدن گزارش تماستان، مجوز «تلفن» را روشن کنید.</string>
 </resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-fi/strings.xml b/java/com/android/dialer/calllog/ui/res/values-fi/strings.xml
index 2954882..634c456 100644
--- a/java/com/android/dialer/calllog/ui/res/values-fi/strings.xml
+++ b/java/com/android/dialer/calllog/ui/res/values-fi/strings.xml
@@ -1,24 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_call_log_video" msgid="8414984483082880050">"Videopuhelu"</string>
-    <string name="new_call_log_unknown" msgid="7873134340045098010">"Tuntematon"</string>
-    <string name="new_call_log_header_today" msgid="3849627842127894230">"Tänään"</string>
-    <string name="new_call_log_header_older" msgid="5879512250610285872">"Vanhemmat"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_new_call_log_entry_tap_action">expand menu</string>
+  <string name="a11y_new_call_log_entry_voice_call">call ^1</string>
+  <string name="a11y_new_call_log_entry_video_call">make a video call to ^1</string>
+  <string name="new_call_log_header_today">Tänään</string>
+  <string name="new_call_log_header_yesterday">Eilen</string>
+  <string name="new_call_log_header_older">Vanhemmat</string>
+  <string name="new_call_log_permission_no_calllog">Jos haluat katsella puhelulokiasi, ota Puhelin-käyttöoikeus käyttöön.</string>
 </resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-fr-rCA/strings.xml b/java/com/android/dialer/calllog/ui/res/values-fr-rCA/strings.xml
index dd1a34c..a49f60c 100644
--- a/java/com/android/dialer/calllog/ui/res/values-fr-rCA/strings.xml
+++ b/java/com/android/dialer/calllog/ui/res/values-fr-rCA/strings.xml
@@ -1,24 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_call_log_video" msgid="8414984483082880050">"Vidéo"</string>
-    <string name="new_call_log_unknown" msgid="7873134340045098010">"Inconnu"</string>
-    <string name="new_call_log_header_today" msgid="3849627842127894230">"Aujourd\'hui"</string>
-    <string name="new_call_log_header_older" msgid="5879512250610285872">"Plus anciens"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_new_call_log_entry_tap_action">expand menu</string>
+  <string name="a11y_new_call_log_entry_voice_call">call ^1</string>
+  <string name="a11y_new_call_log_entry_video_call">make a video call to ^1</string>
+  <string name="new_call_log_header_today">Aujourd\'hui</string>
+  <string name="new_call_log_header_yesterday">Hier</string>
+  <string name="new_call_log_header_older">Plus anciens</string>
+  <string name="new_call_log_permission_no_calllog">Pour consulter votre journal d\'appels, activez l\'autorisation Téléphone.</string>
 </resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-fr/strings.xml b/java/com/android/dialer/calllog/ui/res/values-fr/strings.xml
index ddeaf19..a49f60c 100644
--- a/java/com/android/dialer/calllog/ui/res/values-fr/strings.xml
+++ b/java/com/android/dialer/calllog/ui/res/values-fr/strings.xml
@@ -1,24 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_call_log_video" msgid="8414984483082880050">"Vidéo"</string>
-    <string name="new_call_log_unknown" msgid="7873134340045098010">"Numéro inconnu"</string>
-    <string name="new_call_log_header_today" msgid="3849627842127894230">"Aujourd\'hui"</string>
-    <string name="new_call_log_header_older" msgid="5879512250610285872">"Plus anciens"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_new_call_log_entry_tap_action">expand menu</string>
+  <string name="a11y_new_call_log_entry_voice_call">call ^1</string>
+  <string name="a11y_new_call_log_entry_video_call">make a video call to ^1</string>
+  <string name="new_call_log_header_today">Aujourd\'hui</string>
+  <string name="new_call_log_header_yesterday">Hier</string>
+  <string name="new_call_log_header_older">Plus anciens</string>
+  <string name="new_call_log_permission_no_calllog">Pour consulter votre journal d\'appels, activez l\'autorisation Téléphone.</string>
 </resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-gl/strings.xml b/java/com/android/dialer/calllog/ui/res/values-gl/strings.xml
index 2486119..3f1673e 100644
--- a/java/com/android/dialer/calllog/ui/res/values-gl/strings.xml
+++ b/java/com/android/dialer/calllog/ui/res/values-gl/strings.xml
@@ -1,24 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_call_log_video" msgid="8414984483082880050">"Vídeo"</string>
-    <string name="new_call_log_unknown" msgid="7873134340045098010">"Descoñecidos"</string>
-    <string name="new_call_log_header_today" msgid="3849627842127894230">"Hoxe"</string>
-    <string name="new_call_log_header_older" msgid="5879512250610285872">"Anteriores"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_new_call_log_entry_tap_action">expand menu</string>
+  <string name="a11y_new_call_log_entry_voice_call">call ^1</string>
+  <string name="a11y_new_call_log_entry_video_call">make a video call to ^1</string>
+  <string name="new_call_log_header_today">Hoxe</string>
+  <string name="new_call_log_header_yesterday">Onte</string>
+  <string name="new_call_log_header_older">Anteriores</string>
+  <string name="new_call_log_permission_no_calllog">Para ver o teu rexistro de chamadas, activa o permiso de Teléfono.</string>
 </resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-gu/strings.xml b/java/com/android/dialer/calllog/ui/res/values-gu/strings.xml
index 6235641..5cd519a 100644
--- a/java/com/android/dialer/calllog/ui/res/values-gu/strings.xml
+++ b/java/com/android/dialer/calllog/ui/res/values-gu/strings.xml
@@ -1,24 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_call_log_video" msgid="8414984483082880050">"વીડિઓ"</string>
-    <string name="new_call_log_unknown" msgid="7873134340045098010">"અજાણ"</string>
-    <string name="new_call_log_header_today" msgid="3849627842127894230">"આજે"</string>
-    <string name="new_call_log_header_older" msgid="5879512250610285872">"જૂનું"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_new_call_log_entry_tap_action">expand menu</string>
+  <string name="a11y_new_call_log_entry_voice_call">call ^1</string>
+  <string name="a11y_new_call_log_entry_video_call">make a video call to ^1</string>
+  <string name="new_call_log_header_today">આજે</string>
+  <string name="new_call_log_header_yesterday">ગઈકાલે</string>
+  <string name="new_call_log_header_older">જૂનું</string>
+  <string name="new_call_log_permission_no_calllog">તમારો કૉલ લૉગ જોવા માટે, ફોનની પરવાનગી ચાલુ કરો.</string>
 </resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-hi/strings.xml b/java/com/android/dialer/calllog/ui/res/values-hi/strings.xml
index 3c3ccc8..1a85103 100644
--- a/java/com/android/dialer/calllog/ui/res/values-hi/strings.xml
+++ b/java/com/android/dialer/calllog/ui/res/values-hi/strings.xml
@@ -1,24 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_call_log_video" msgid="8414984483082880050">"वीडियो"</string>
-    <string name="new_call_log_unknown" msgid="7873134340045098010">"अज्ञात"</string>
-    <string name="new_call_log_header_today" msgid="3849627842127894230">"आज"</string>
-    <string name="new_call_log_header_older" msgid="5879512250610285872">"पुराना"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_new_call_log_entry_tap_action">expand menu</string>
+  <string name="a11y_new_call_log_entry_voice_call">call ^1</string>
+  <string name="a11y_new_call_log_entry_video_call">make a video call to ^1</string>
+  <string name="new_call_log_header_today">आज</string>
+  <string name="new_call_log_header_yesterday">बीता हुआ कल</string>
+  <string name="new_call_log_header_older">पुराना</string>
+  <string name="new_call_log_permission_no_calllog">अपना कॉल लॉग देखने के लिए, फ़ोन अनुमति चालू करें.</string>
 </resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-hr/strings.xml b/java/com/android/dialer/calllog/ui/res/values-hr/strings.xml
index 614f46c..4c63413 100644
--- a/java/com/android/dialer/calllog/ui/res/values-hr/strings.xml
+++ b/java/com/android/dialer/calllog/ui/res/values-hr/strings.xml
@@ -1,24 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_call_log_video" msgid="8414984483082880050">"Videopoziv"</string>
-    <string name="new_call_log_unknown" msgid="7873134340045098010">"Nepoznato"</string>
-    <string name="new_call_log_header_today" msgid="3849627842127894230">"Danas"</string>
-    <string name="new_call_log_header_older" msgid="5879512250610285872">"Stariji"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_new_call_log_entry_tap_action">expand menu</string>
+  <string name="a11y_new_call_log_entry_voice_call">call ^1</string>
+  <string name="a11y_new_call_log_entry_video_call">make a video call to ^1</string>
+  <string name="new_call_log_header_today">Danas</string>
+  <string name="new_call_log_header_yesterday">Jučer</string>
+  <string name="new_call_log_header_older">Stariji</string>
+  <string name="new_call_log_permission_no_calllog">Da biste vidjeli zapisnik poziva, uključite dopuštenje za telefon.</string>
 </resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-hu/strings.xml b/java/com/android/dialer/calllog/ui/res/values-hu/strings.xml
index 0dc4e92..2ee5b26 100644
--- a/java/com/android/dialer/calllog/ui/res/values-hu/strings.xml
+++ b/java/com/android/dialer/calllog/ui/res/values-hu/strings.xml
@@ -1,24 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_call_log_video" msgid="8414984483082880050">"Videó"</string>
-    <string name="new_call_log_unknown" msgid="7873134340045098010">"Ismeretlen"</string>
-    <string name="new_call_log_header_today" msgid="3849627842127894230">"Ma"</string>
-    <string name="new_call_log_header_older" msgid="5879512250610285872">"Korábbi"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_new_call_log_entry_tap_action">expand menu</string>
+  <string name="a11y_new_call_log_entry_voice_call">call ^1</string>
+  <string name="a11y_new_call_log_entry_video_call">make a video call to ^1</string>
+  <string name="new_call_log_header_today">Ma</string>
+  <string name="new_call_log_header_yesterday">Tegnap</string>
+  <string name="new_call_log_header_older">Korábbi</string>
+  <string name="new_call_log_permission_no_calllog">A hívásnapló megtekintéséhez kapcsolja be a Telefon engedélyt.</string>
 </resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-hy/strings.xml b/java/com/android/dialer/calllog/ui/res/values-hy/strings.xml
index 6c13619..0f69ee7 100644
--- a/java/com/android/dialer/calllog/ui/res/values-hy/strings.xml
+++ b/java/com/android/dialer/calllog/ui/res/values-hy/strings.xml
@@ -1,24 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_call_log_video" msgid="8414984483082880050">"Տեսանյութ"</string>
-    <string name="new_call_log_unknown" msgid="7873134340045098010">"Անհայտ"</string>
-    <string name="new_call_log_header_today" msgid="3849627842127894230">"Այսօր"</string>
-    <string name="new_call_log_header_older" msgid="5879512250610285872">"Ավելի հին"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_new_call_log_entry_tap_action">expand menu</string>
+  <string name="a11y_new_call_log_entry_voice_call">call ^1</string>
+  <string name="a11y_new_call_log_entry_video_call">make a video call to ^1</string>
+  <string name="new_call_log_header_today">Այսօր</string>
+  <string name="new_call_log_header_yesterday">Երեկ</string>
+  <string name="new_call_log_header_older">Ավելի հին</string>
+  <string name="new_call_log_permission_no_calllog">Ձեր զանգերի մատյանը տեսնելու համար միացրեք Հեռախոսի թույլտվությունը:</string>
 </resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-in/strings.xml b/java/com/android/dialer/calllog/ui/res/values-in/strings.xml
index ee18199..3c4b1b5 100644
--- a/java/com/android/dialer/calllog/ui/res/values-in/strings.xml
+++ b/java/com/android/dialer/calllog/ui/res/values-in/strings.xml
@@ -1,24 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_call_log_video" msgid="8414984483082880050">"Video"</string>
-    <string name="new_call_log_unknown" msgid="7873134340045098010">"Tidak diketahui"</string>
-    <string name="new_call_log_header_today" msgid="3849627842127894230">"Hari ini"</string>
-    <string name="new_call_log_header_older" msgid="5879512250610285872">"Lebih lama"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_new_call_log_entry_tap_action">expand menu</string>
+  <string name="a11y_new_call_log_entry_voice_call">call ^1</string>
+  <string name="a11y_new_call_log_entry_video_call">make a video call to ^1</string>
+  <string name="new_call_log_header_today">Hari ini</string>
+  <string name="new_call_log_header_yesterday">Kemarin</string>
+  <string name="new_call_log_header_older">Lebih lama</string>
+  <string name="new_call_log_permission_no_calllog">Untuk melihat log panggilan, aktifkan izin Telepon.</string>
 </resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-is/strings.xml b/java/com/android/dialer/calllog/ui/res/values-is/strings.xml
index 80cf17e..640c9d5 100644
--- a/java/com/android/dialer/calllog/ui/res/values-is/strings.xml
+++ b/java/com/android/dialer/calllog/ui/res/values-is/strings.xml
@@ -1,24 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_call_log_video" msgid="8414984483082880050">"Myndsímtal"</string>
-    <string name="new_call_log_unknown" msgid="7873134340045098010">"Óþekkt"</string>
-    <string name="new_call_log_header_today" msgid="3849627842127894230">"Í dag"</string>
-    <string name="new_call_log_header_older" msgid="5879512250610285872">"Eldra"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_new_call_log_entry_tap_action">expand menu</string>
+  <string name="a11y_new_call_log_entry_voice_call">call ^1</string>
+  <string name="a11y_new_call_log_entry_video_call">make a video call to ^1</string>
+  <string name="new_call_log_header_today">Í dag</string>
+  <string name="new_call_log_header_yesterday">Í gær</string>
+  <string name="new_call_log_header_older">Eldra</string>
+  <string name="new_call_log_permission_no_calllog">Kveiktu á heimild símaforritsins til að sjá símtalaskrána þína.</string>
 </resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-it/strings.xml b/java/com/android/dialer/calllog/ui/res/values-it/strings.xml
index 039081e..b663ce5 100644
--- a/java/com/android/dialer/calllog/ui/res/values-it/strings.xml
+++ b/java/com/android/dialer/calllog/ui/res/values-it/strings.xml
@@ -1,24 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_call_log_video" msgid="8414984483082880050">"Video"</string>
-    <string name="new_call_log_unknown" msgid="7873134340045098010">"Sconosciuto"</string>
-    <string name="new_call_log_header_today" msgid="3849627842127894230">"Oggi"</string>
-    <string name="new_call_log_header_older" msgid="5879512250610285872">"Meno recenti"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_new_call_log_entry_tap_action">expand menu</string>
+  <string name="a11y_new_call_log_entry_voice_call">call ^1</string>
+  <string name="a11y_new_call_log_entry_video_call">make a video call to ^1</string>
+  <string name="new_call_log_header_today">Oggi</string>
+  <string name="new_call_log_header_yesterday">Ieri</string>
+  <string name="new_call_log_header_older">Meno recenti</string>
+  <string name="new_call_log_permission_no_calllog">Per accedere al registro chiamate, attiva l\'autorizzazione sul telefono.</string>
 </resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-iw/strings.xml b/java/com/android/dialer/calllog/ui/res/values-iw/strings.xml
index 4d906ed..9979e60 100644
--- a/java/com/android/dialer/calllog/ui/res/values-iw/strings.xml
+++ b/java/com/android/dialer/calllog/ui/res/values-iw/strings.xml
@@ -1,24 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_call_log_video" msgid="8414984483082880050">"וידאו"</string>
-    <string name="new_call_log_unknown" msgid="7873134340045098010">"לא ידוע"</string>
-    <string name="new_call_log_header_today" msgid="3849627842127894230">"היום"</string>
-    <string name="new_call_log_header_older" msgid="5879512250610285872">"ישנות יותר"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_new_call_log_entry_tap_action">expand menu</string>
+  <string name="a11y_new_call_log_entry_voice_call">call ^1</string>
+  <string name="a11y_new_call_log_entry_video_call">make a video call to ^1</string>
+  <string name="new_call_log_header_today">היום</string>
+  <string name="new_call_log_header_yesterday">אתמול</string>
+  <string name="new_call_log_header_older">ישנות יותר</string>
+  <string name="new_call_log_permission_no_calllog">כדי להציג את יומן השיחות, צריך להפעיל את ההרשאה \'טלפון\'.</string>
 </resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-ja/strings.xml b/java/com/android/dialer/calllog/ui/res/values-ja/strings.xml
index 660392d..520a25d 100644
--- a/java/com/android/dialer/calllog/ui/res/values-ja/strings.xml
+++ b/java/com/android/dialer/calllog/ui/res/values-ja/strings.xml
@@ -1,24 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_call_log_video" msgid="8414984483082880050">"ビデオ"</string>
-    <string name="new_call_log_unknown" msgid="7873134340045098010">"不明"</string>
-    <string name="new_call_log_header_today" msgid="3849627842127894230">"今日"</string>
-    <string name="new_call_log_header_older" msgid="5879512250610285872">"昨日以前"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_new_call_log_entry_tap_action">expand menu</string>
+  <string name="a11y_new_call_log_entry_voice_call">call ^1</string>
+  <string name="a11y_new_call_log_entry_video_call">make a video call to ^1</string>
+  <string name="new_call_log_header_today">今日</string>
+  <string name="new_call_log_header_yesterday">昨日</string>
+  <string name="new_call_log_header_older">昨日以前</string>
+  <string name="new_call_log_permission_no_calllog">通話履歴を表示するには、電話権限をONにしてください。</string>
 </resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-ka/strings.xml b/java/com/android/dialer/calllog/ui/res/values-ka/strings.xml
index a678783..2848f00 100644
--- a/java/com/android/dialer/calllog/ui/res/values-ka/strings.xml
+++ b/java/com/android/dialer/calllog/ui/res/values-ka/strings.xml
@@ -1,24 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_call_log_video" msgid="8414984483082880050">"ვიდეო"</string>
-    <string name="new_call_log_unknown" msgid="7873134340045098010">"უცნობი"</string>
-    <string name="new_call_log_header_today" msgid="3849627842127894230">"დღეს"</string>
-    <string name="new_call_log_header_older" msgid="5879512250610285872">"უფრო ძველი"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_new_call_log_entry_tap_action">expand menu</string>
+  <string name="a11y_new_call_log_entry_voice_call">call ^1</string>
+  <string name="a11y_new_call_log_entry_video_call">make a video call to ^1</string>
+  <string name="new_call_log_header_today">დღეს</string>
+  <string name="new_call_log_header_yesterday">გუშინ</string>
+  <string name="new_call_log_header_older">უფრო ძველი</string>
+  <string name="new_call_log_permission_no_calllog">ზარების ჟურნალის სანახავად ჩართეთ ტელეფონის ნებართვა.</string>
 </resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-kk/strings.xml b/java/com/android/dialer/calllog/ui/res/values-kk/strings.xml
index 8302859..f6411d8 100644
--- a/java/com/android/dialer/calllog/ui/res/values-kk/strings.xml
+++ b/java/com/android/dialer/calllog/ui/res/values-kk/strings.xml
@@ -1,24 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_call_log_video" msgid="8414984483082880050">"Бейне"</string>
-    <string name="new_call_log_unknown" msgid="7873134340045098010">"Белгісіз"</string>
-    <string name="new_call_log_header_today" msgid="3849627842127894230">"Бүгін"</string>
-    <string name="new_call_log_header_older" msgid="5879512250610285872">"Ескілеу"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_new_call_log_entry_tap_action">expand menu</string>
+  <string name="a11y_new_call_log_entry_voice_call">call ^1</string>
+  <string name="a11y_new_call_log_entry_video_call">make a video call to ^1</string>
+  <string name="new_call_log_header_today">Бүгін</string>
+  <string name="new_call_log_header_yesterday">Кеше</string>
+  <string name="new_call_log_header_older">Ескілеу</string>
+  <string name="new_call_log_permission_no_calllog">Тіркелген қоңырауларды көру үшін \"Телефон\" рұқсатын қосыңыз.</string>
 </resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-km/strings.xml b/java/com/android/dialer/calllog/ui/res/values-km/strings.xml
index dfaca9a..ebf85ad 100644
--- a/java/com/android/dialer/calllog/ui/res/values-km/strings.xml
+++ b/java/com/android/dialer/calllog/ui/res/values-km/strings.xml
@@ -1,24 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_call_log_video" msgid="8414984483082880050">"វីដេអូ"</string>
-    <string name="new_call_log_unknown" msgid="7873134340045098010">"មិន​ស្គាល់"</string>
-    <string name="new_call_log_header_today" msgid="3849627842127894230">"ថ្ងៃនេះ"</string>
-    <string name="new_call_log_header_older" msgid="5879512250610285872">"ចាស់ៗ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_new_call_log_entry_tap_action">expand menu</string>
+  <string name="a11y_new_call_log_entry_voice_call">call ^1</string>
+  <string name="a11y_new_call_log_entry_video_call">make a video call to ^1</string>
+  <string name="new_call_log_header_today">ថ្ងៃនេះ</string>
+  <string name="new_call_log_header_yesterday">ម្សិលមិញ</string>
+  <string name="new_call_log_header_older">ចាស់ៗ</string>
+  <string name="new_call_log_permission_no_calllog">ដើម្បីមើលកំណត់ហេតុហៅទូរសព្ទរបស់អ្នក សូមបើកការអនុញ្ញាតទូរសព្ទ។</string>
 </resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-kn/strings.xml b/java/com/android/dialer/calllog/ui/res/values-kn/strings.xml
index 5c764a2..81d6b9e 100644
--- a/java/com/android/dialer/calllog/ui/res/values-kn/strings.xml
+++ b/java/com/android/dialer/calllog/ui/res/values-kn/strings.xml
@@ -1,24 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_call_log_video" msgid="8414984483082880050">"ವೀಡಿಯೊ"</string>
-    <string name="new_call_log_unknown" msgid="7873134340045098010">"ಅಪರಿಚಿತ"</string>
-    <string name="new_call_log_header_today" msgid="3849627842127894230">"ಇಂದು"</string>
-    <string name="new_call_log_header_older" msgid="5879512250610285872">"ಹಳೆಯದು"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_new_call_log_entry_tap_action">expand menu</string>
+  <string name="a11y_new_call_log_entry_voice_call">call ^1</string>
+  <string name="a11y_new_call_log_entry_video_call">make a video call to ^1</string>
+  <string name="new_call_log_header_today">ಇಂದು</string>
+  <string name="new_call_log_header_yesterday">ನಿನ್ನೆ</string>
+  <string name="new_call_log_header_older">ಹಳೆಯದು</string>
+  <string name="new_call_log_permission_no_calllog">ನಿಮ್ಮ ಕರೆಯ ಲಾಗ್ ಅನ್ನು ವೀಕ್ಷಿಸಲು, ಫೋನ್ ಅನುಮತಿಯನ್ನು ಆನ್ ಮಾಡಿ.</string>
 </resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-ko/strings.xml b/java/com/android/dialer/calllog/ui/res/values-ko/strings.xml
index 094c3d9..8d87d05 100644
--- a/java/com/android/dialer/calllog/ui/res/values-ko/strings.xml
+++ b/java/com/android/dialer/calllog/ui/res/values-ko/strings.xml
@@ -1,24 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_call_log_video" msgid="8414984483082880050">"동영상"</string>
-    <string name="new_call_log_unknown" msgid="7873134340045098010">"알 수 없음"</string>
-    <string name="new_call_log_header_today" msgid="3849627842127894230">"오늘"</string>
-    <string name="new_call_log_header_older" msgid="5879512250610285872">"이전"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_new_call_log_entry_tap_action">expand menu</string>
+  <string name="a11y_new_call_log_entry_voice_call">call ^1</string>
+  <string name="a11y_new_call_log_entry_video_call">make a video call to ^1</string>
+  <string name="new_call_log_header_today">오늘</string>
+  <string name="new_call_log_header_yesterday">어제</string>
+  <string name="new_call_log_header_older">이전</string>
+  <string name="new_call_log_permission_no_calllog">통화 기록을 보려면 전화 권한을 사용 설정하세요.</string>
 </resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-ky/strings.xml b/java/com/android/dialer/calllog/ui/res/values-ky/strings.xml
index d15a2b2..0eca0d8 100644
--- a/java/com/android/dialer/calllog/ui/res/values-ky/strings.xml
+++ b/java/com/android/dialer/calllog/ui/res/values-ky/strings.xml
@@ -1,24 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_call_log_video" msgid="8414984483082880050">"Видео"</string>
-    <string name="new_call_log_unknown" msgid="7873134340045098010">"Белгисиз"</string>
-    <string name="new_call_log_header_today" msgid="3849627842127894230">"Бүгүн"</string>
-    <string name="new_call_log_header_older" msgid="5879512250610285872">"Мурункураак"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_new_call_log_entry_tap_action">expand menu</string>
+  <string name="a11y_new_call_log_entry_voice_call">call ^1</string>
+  <string name="a11y_new_call_log_entry_video_call">make a video call to ^1</string>
+  <string name="new_call_log_header_today">Бүгүн</string>
+  <string name="new_call_log_header_yesterday">Кечээ</string>
+  <string name="new_call_log_header_older">Мурункураак</string>
+  <string name="new_call_log_permission_no_calllog">Чалуулар таржымалыңызды көрүү үчүн, \"Телефон\" колдонмосуна уруксат бериңиз.</string>
 </resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-lo/strings.xml b/java/com/android/dialer/calllog/ui/res/values-lo/strings.xml
index b869bbd..61972af 100644
--- a/java/com/android/dialer/calllog/ui/res/values-lo/strings.xml
+++ b/java/com/android/dialer/calllog/ui/res/values-lo/strings.xml
@@ -1,24 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_call_log_video" msgid="8414984483082880050">"ວິດີໂອ"</string>
-    <string name="new_call_log_unknown" msgid="7873134340045098010">"ບໍ່ຮູ້ຈັກ"</string>
-    <string name="new_call_log_header_today" msgid="3849627842127894230">"ມື້ນີ້"</string>
-    <string name="new_call_log_header_older" msgid="5879512250610285872">"ເກົ່າກວ່າ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_new_call_log_entry_tap_action">expand menu</string>
+  <string name="a11y_new_call_log_entry_voice_call">call ^1</string>
+  <string name="a11y_new_call_log_entry_video_call">make a video call to ^1</string>
+  <string name="new_call_log_header_today">ມື້ນີ້</string>
+  <string name="new_call_log_header_yesterday">ມື້ວານນີ້</string>
+  <string name="new_call_log_header_older">ເກົ່າກວ່າ</string>
+  <string name="new_call_log_permission_no_calllog">ເພື່ອເບິ່ງບັນທຶກການໂທຂອງທ່ານ, ກະລຸນາເປີດການອະນຸຍາດໂທລະສັບກ່ອນ.</string>
 </resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-lt/strings.xml b/java/com/android/dialer/calllog/ui/res/values-lt/strings.xml
index 1701fa2..d58b228 100644
--- a/java/com/android/dialer/calllog/ui/res/values-lt/strings.xml
+++ b/java/com/android/dialer/calllog/ui/res/values-lt/strings.xml
@@ -1,24 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_call_log_video" msgid="8414984483082880050">"Vaizdo įrašas"</string>
-    <string name="new_call_log_unknown" msgid="7873134340045098010">"Nežinoma"</string>
-    <string name="new_call_log_header_today" msgid="3849627842127894230">"Šiandien"</string>
-    <string name="new_call_log_header_older" msgid="5879512250610285872">"Senesni"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_new_call_log_entry_tap_action">expand menu</string>
+  <string name="a11y_new_call_log_entry_voice_call">call ^1</string>
+  <string name="a11y_new_call_log_entry_video_call">make a video call to ^1</string>
+  <string name="new_call_log_header_today">Šiandien</string>
+  <string name="new_call_log_header_yesterday">Vakar</string>
+  <string name="new_call_log_header_older">Senesni</string>
+  <string name="new_call_log_permission_no_calllog">Jei norite peržiūrėti skambučių žurnalą, įjunkite Telefono programos leidimą.</string>
 </resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-lv/strings.xml b/java/com/android/dialer/calllog/ui/res/values-lv/strings.xml
index adce799..a14f771 100644
--- a/java/com/android/dialer/calllog/ui/res/values-lv/strings.xml
+++ b/java/com/android/dialer/calllog/ui/res/values-lv/strings.xml
@@ -1,24 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_call_log_video" msgid="8414984483082880050">"Videozvans"</string>
-    <string name="new_call_log_unknown" msgid="7873134340045098010">"Nezināmi"</string>
-    <string name="new_call_log_header_today" msgid="3849627842127894230">"Šodien"</string>
-    <string name="new_call_log_header_older" msgid="5879512250610285872">"Vecāki zvani"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_new_call_log_entry_tap_action">expand menu</string>
+  <string name="a11y_new_call_log_entry_voice_call">call ^1</string>
+  <string name="a11y_new_call_log_entry_video_call">make a video call to ^1</string>
+  <string name="new_call_log_header_today">Šodien</string>
+  <string name="new_call_log_header_yesterday">Vakar</string>
+  <string name="new_call_log_header_older">Vecāki zvani</string>
+  <string name="new_call_log_permission_no_calllog">Lai skatītu savu zvanu žurnālu, ieslēdziet atļauju Tālrunis.</string>
 </resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-mk/strings.xml b/java/com/android/dialer/calllog/ui/res/values-mk/strings.xml
index e347f1a..6e79429 100644
--- a/java/com/android/dialer/calllog/ui/res/values-mk/strings.xml
+++ b/java/com/android/dialer/calllog/ui/res/values-mk/strings.xml
@@ -1,24 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_call_log_video" msgid="8414984483082880050">"Видео"</string>
-    <string name="new_call_log_unknown" msgid="7873134340045098010">"Непознато"</string>
-    <string name="new_call_log_header_today" msgid="3849627842127894230">"Денес"</string>
-    <string name="new_call_log_header_older" msgid="5879512250610285872">"Постари"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_new_call_log_entry_tap_action">expand menu</string>
+  <string name="a11y_new_call_log_entry_voice_call">call ^1</string>
+  <string name="a11y_new_call_log_entry_video_call">make a video call to ^1</string>
+  <string name="new_call_log_header_today">Денес</string>
+  <string name="new_call_log_header_yesterday">Вчера</string>
+  <string name="new_call_log_header_older">Постари</string>
+  <string name="new_call_log_permission_no_calllog">За да ја видите евиденцијата на повици, вклучете ја дозволата за телефон.</string>
 </resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-ml/strings.xml b/java/com/android/dialer/calllog/ui/res/values-ml/strings.xml
index 7d1fcd1..e864159 100644
--- a/java/com/android/dialer/calllog/ui/res/values-ml/strings.xml
+++ b/java/com/android/dialer/calllog/ui/res/values-ml/strings.xml
@@ -1,24 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_call_log_video" msgid="8414984483082880050">"വീഡിയോ"</string>
-    <string name="new_call_log_unknown" msgid="7873134340045098010">"അജ്ഞാതം"</string>
-    <string name="new_call_log_header_today" msgid="3849627842127894230">"ഇന്ന്"</string>
-    <string name="new_call_log_header_older" msgid="5879512250610285872">"പഴയത്"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_new_call_log_entry_tap_action">expand menu</string>
+  <string name="a11y_new_call_log_entry_voice_call">call ^1</string>
+  <string name="a11y_new_call_log_entry_video_call">make a video call to ^1</string>
+  <string name="new_call_log_header_today">ഇന്ന്</string>
+  <string name="new_call_log_header_yesterday">ഇന്നലെ</string>
+  <string name="new_call_log_header_older">പഴയത്</string>
+  <string name="new_call_log_permission_no_calllog">നിങ്ങളുടെ കോൾ ലോഗ് കാണുന്നതിന്, \'ഫോൺ\' അനുമതി ഓണാക്കുക.</string>
 </resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-mn/strings.xml b/java/com/android/dialer/calllog/ui/res/values-mn/strings.xml
index bdaf835..dae63f3 100644
--- a/java/com/android/dialer/calllog/ui/res/values-mn/strings.xml
+++ b/java/com/android/dialer/calllog/ui/res/values-mn/strings.xml
@@ -1,24 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_call_log_video" msgid="8414984483082880050">"Видео"</string>
-    <string name="new_call_log_unknown" msgid="7873134340045098010">"Тодорхойгүй"</string>
-    <string name="new_call_log_header_today" msgid="3849627842127894230">"Өнөөдөр"</string>
-    <string name="new_call_log_header_older" msgid="5879512250610285872">"Хуучин"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_new_call_log_entry_tap_action">expand menu</string>
+  <string name="a11y_new_call_log_entry_voice_call">call ^1</string>
+  <string name="a11y_new_call_log_entry_video_call">make a video call to ^1</string>
+  <string name="new_call_log_header_today">Өнөөдөр</string>
+  <string name="new_call_log_header_yesterday">Өчигдөр</string>
+  <string name="new_call_log_header_older">Хуучин</string>
+  <string name="new_call_log_permission_no_calllog">Дуудлагын жагсаалтаа харахын тулд Утасны зөвшөөрлийг идэвхжүүлнэ үү.</string>
 </resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-mr/strings.xml b/java/com/android/dialer/calllog/ui/res/values-mr/strings.xml
index 5c348d1..784e973 100644
--- a/java/com/android/dialer/calllog/ui/res/values-mr/strings.xml
+++ b/java/com/android/dialer/calllog/ui/res/values-mr/strings.xml
@@ -1,24 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_call_log_video" msgid="8414984483082880050">"व्हिडिओ"</string>
-    <string name="new_call_log_unknown" msgid="7873134340045098010">"अज्ञात"</string>
-    <string name="new_call_log_header_today" msgid="3849627842127894230">"आज"</string>
-    <string name="new_call_log_header_older" msgid="5879512250610285872">"अधिक जुने"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_new_call_log_entry_tap_action">expand menu</string>
+  <string name="a11y_new_call_log_entry_voice_call">call ^1</string>
+  <string name="a11y_new_call_log_entry_video_call">make a video call to ^1</string>
+  <string name="new_call_log_header_today">आज</string>
+  <string name="new_call_log_header_yesterday">काल</string>
+  <string name="new_call_log_header_older">अधिक जुने</string>
+  <string name="new_call_log_permission_no_calllog">तुमचा कॉल लॉग पाहण्‍यासाठी, फोन परवानगी सुरू करा.</string>
 </resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-ms/strings.xml b/java/com/android/dialer/calllog/ui/res/values-ms/strings.xml
index ee18199..278a945 100644
--- a/java/com/android/dialer/calllog/ui/res/values-ms/strings.xml
+++ b/java/com/android/dialer/calllog/ui/res/values-ms/strings.xml
@@ -1,24 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_call_log_video" msgid="8414984483082880050">"Video"</string>
-    <string name="new_call_log_unknown" msgid="7873134340045098010">"Tidak diketahui"</string>
-    <string name="new_call_log_header_today" msgid="3849627842127894230">"Hari ini"</string>
-    <string name="new_call_log_header_older" msgid="5879512250610285872">"Lebih lama"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_new_call_log_entry_tap_action">expand menu</string>
+  <string name="a11y_new_call_log_entry_voice_call">call ^1</string>
+  <string name="a11y_new_call_log_entry_video_call">make a video call to ^1</string>
+  <string name="new_call_log_header_today">Hari ini</string>
+  <string name="new_call_log_header_yesterday">Semalam</string>
+  <string name="new_call_log_header_older">Lebih lama</string>
+  <string name="new_call_log_permission_no_calllog">Untuk melihat log panggilan anda, hidupkan kebenaran Telefon.</string>
 </resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-my/strings.xml b/java/com/android/dialer/calllog/ui/res/values-my/strings.xml
index f841bd5..1e0fb4d 100644
--- a/java/com/android/dialer/calllog/ui/res/values-my/strings.xml
+++ b/java/com/android/dialer/calllog/ui/res/values-my/strings.xml
@@ -1,24 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_call_log_video" msgid="8414984483082880050">"ဗီဒီယို"</string>
-    <string name="new_call_log_unknown" msgid="7873134340045098010">"အမည်မသိ"</string>
-    <string name="new_call_log_header_today" msgid="3849627842127894230">"ယနေ့"</string>
-    <string name="new_call_log_header_older" msgid="5879512250610285872">"ယခင်နေ့များက"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_new_call_log_entry_tap_action">expand menu</string>
+  <string name="a11y_new_call_log_entry_voice_call">call ^1</string>
+  <string name="a11y_new_call_log_entry_video_call">make a video call to ^1</string>
+  <string name="new_call_log_header_today">ယနေ့</string>
+  <string name="new_call_log_header_yesterday">မနေ့က</string>
+  <string name="new_call_log_header_older">ယခင်နေ့များက</string>
+  <string name="new_call_log_permission_no_calllog">ခေါ်ဆိုမှုမှတ်တမ်းကို ကြည့်ရန်၊ ဖုန်းခွင့်ပြုချက်ကို ဖွင့်ပါ။</string>
 </resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-nb/strings.xml b/java/com/android/dialer/calllog/ui/res/values-nb/strings.xml
index 9cf3273..01642a5 100644
--- a/java/com/android/dialer/calllog/ui/res/values-nb/strings.xml
+++ b/java/com/android/dialer/calllog/ui/res/values-nb/strings.xml
@@ -1,24 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_call_log_video" msgid="8414984483082880050">"Video"</string>
-    <string name="new_call_log_unknown" msgid="7873134340045098010">"Ukjent"</string>
-    <string name="new_call_log_header_today" msgid="3849627842127894230">"I dag"</string>
-    <string name="new_call_log_header_older" msgid="5879512250610285872">"Eldre"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_new_call_log_entry_tap_action">expand menu</string>
+  <string name="a11y_new_call_log_entry_voice_call">call ^1</string>
+  <string name="a11y_new_call_log_entry_video_call">make a video call to ^1</string>
+  <string name="new_call_log_header_today">I dag</string>
+  <string name="new_call_log_header_yesterday">I går</string>
+  <string name="new_call_log_header_older">Eldre</string>
+  <string name="new_call_log_permission_no_calllog">Slå på Telefon-tillatelsen for å se anropsloggen din.</string>
 </resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-ne/strings.xml b/java/com/android/dialer/calllog/ui/res/values-ne/strings.xml
index dc1c617..5c51a91 100644
--- a/java/com/android/dialer/calllog/ui/res/values-ne/strings.xml
+++ b/java/com/android/dialer/calllog/ui/res/values-ne/strings.xml
@@ -1,24 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_call_log_video" msgid="8414984483082880050">"भिडियो कल"</string>
-    <string name="new_call_log_unknown" msgid="7873134340045098010">"अज्ञात कल"</string>
-    <string name="new_call_log_header_today" msgid="3849627842127894230">"आज"</string>
-    <string name="new_call_log_header_older" msgid="5879512250610285872">"अझ पुरानो"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_new_call_log_entry_tap_action">expand menu</string>
+  <string name="a11y_new_call_log_entry_voice_call">call ^1</string>
+  <string name="a11y_new_call_log_entry_video_call">make a video call to ^1</string>
+  <string name="new_call_log_header_today">आज</string>
+  <string name="new_call_log_header_yesterday">हिजो</string>
+  <string name="new_call_log_header_older">अझ पुरानो</string>
+  <string name="new_call_log_permission_no_calllog">आफ्नो कल लग हेर्न, फोन अनुमति सक्रिय गर्नुहोस्।</string>
 </resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-nl/strings.xml b/java/com/android/dialer/calllog/ui/res/values-nl/strings.xml
index 9653187..c0e7857 100644
--- a/java/com/android/dialer/calllog/ui/res/values-nl/strings.xml
+++ b/java/com/android/dialer/calllog/ui/res/values-nl/strings.xml
@@ -1,24 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_call_log_video" msgid="8414984483082880050">"Video"</string>
-    <string name="new_call_log_unknown" msgid="7873134340045098010">"Onbekend"</string>
-    <string name="new_call_log_header_today" msgid="3849627842127894230">"Vandaag"</string>
-    <string name="new_call_log_header_older" msgid="5879512250610285872">"Ouder"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_new_call_log_entry_tap_action">expand menu</string>
+  <string name="a11y_new_call_log_entry_voice_call">call ^1</string>
+  <string name="a11y_new_call_log_entry_video_call">make a video call to ^1</string>
+  <string name="new_call_log_header_today">Vandaag</string>
+  <string name="new_call_log_header_yesterday">Gisteren</string>
+  <string name="new_call_log_header_older">Ouder</string>
+  <string name="new_call_log_permission_no_calllog">Als je je gesprekkenlijst wilt bekijken, schakel je de machtiging voor Telefoon in.</string>
 </resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-no/strings.xml b/java/com/android/dialer/calllog/ui/res/values-no/strings.xml
index 9cf3273..01642a5 100644
--- a/java/com/android/dialer/calllog/ui/res/values-no/strings.xml
+++ b/java/com/android/dialer/calllog/ui/res/values-no/strings.xml
@@ -1,24 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_call_log_video" msgid="8414984483082880050">"Video"</string>
-    <string name="new_call_log_unknown" msgid="7873134340045098010">"Ukjent"</string>
-    <string name="new_call_log_header_today" msgid="3849627842127894230">"I dag"</string>
-    <string name="new_call_log_header_older" msgid="5879512250610285872">"Eldre"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_new_call_log_entry_tap_action">expand menu</string>
+  <string name="a11y_new_call_log_entry_voice_call">call ^1</string>
+  <string name="a11y_new_call_log_entry_video_call">make a video call to ^1</string>
+  <string name="new_call_log_header_today">I dag</string>
+  <string name="new_call_log_header_yesterday">I går</string>
+  <string name="new_call_log_header_older">Eldre</string>
+  <string name="new_call_log_permission_no_calllog">Slå på Telefon-tillatelsen for å se anropsloggen din.</string>
 </resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-pa/strings.xml b/java/com/android/dialer/calllog/ui/res/values-pa/strings.xml
index 797b55e..3c62996 100644
--- a/java/com/android/dialer/calllog/ui/res/values-pa/strings.xml
+++ b/java/com/android/dialer/calllog/ui/res/values-pa/strings.xml
@@ -1,24 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_call_log_video" msgid="8414984483082880050">"ਵੀਡੀਓ"</string>
-    <string name="new_call_log_unknown" msgid="7873134340045098010">"ਅਗਿਆਤ"</string>
-    <string name="new_call_log_header_today" msgid="3849627842127894230">"ਅੱਜ"</string>
-    <string name="new_call_log_header_older" msgid="5879512250610285872">"ਵਧੇਰੇ ਪੁਰਾਣਾ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_new_call_log_entry_tap_action">expand menu</string>
+  <string name="a11y_new_call_log_entry_voice_call">call ^1</string>
+  <string name="a11y_new_call_log_entry_video_call">make a video call to ^1</string>
+  <string name="new_call_log_header_today">ਅੱਜ</string>
+  <string name="new_call_log_header_yesterday">ਕੱਲ੍ਹ</string>
+  <string name="new_call_log_header_older">ਵਧੇਰੇ ਪੁਰਾਣਾ</string>
+  <string name="new_call_log_permission_no_calllog">ਆਪਣਾ ਕਾਲ ਲੌਗ ਦੇਖਣ ਲਈ, ਫ਼ੋਨ ਇਜਾਜ਼ਤ ਚਾਲੂ ਕਰੋ।</string>
 </resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-pl/strings.xml b/java/com/android/dialer/calllog/ui/res/values-pl/strings.xml
index 3c60028..df6cc5a 100644
--- a/java/com/android/dialer/calllog/ui/res/values-pl/strings.xml
+++ b/java/com/android/dialer/calllog/ui/res/values-pl/strings.xml
@@ -1,24 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_call_log_video" msgid="8414984483082880050">"Rozmowa wideo"</string>
-    <string name="new_call_log_unknown" msgid="7873134340045098010">"Nieznany"</string>
-    <string name="new_call_log_header_today" msgid="3849627842127894230">"Dzisiaj"</string>
-    <string name="new_call_log_header_older" msgid="5879512250610285872">"Starsze"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_new_call_log_entry_tap_action">expand menu</string>
+  <string name="a11y_new_call_log_entry_voice_call">call ^1</string>
+  <string name="a11y_new_call_log_entry_video_call">make a video call to ^1</string>
+  <string name="new_call_log_header_today">Dzisiaj</string>
+  <string name="new_call_log_header_yesterday">Wczoraj</string>
+  <string name="new_call_log_header_older">Starsze</string>
+  <string name="new_call_log_permission_no_calllog">Aby zobaczyć swój rejestr połączeń, włącz uprawnienia Telefon.</string>
 </resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-pt-rBR/strings.xml b/java/com/android/dialer/calllog/ui/res/values-pt-rBR/strings.xml
index 7b65f3a..f91e3e5 100644
--- a/java/com/android/dialer/calllog/ui/res/values-pt-rBR/strings.xml
+++ b/java/com/android/dialer/calllog/ui/res/values-pt-rBR/strings.xml
@@ -1,24 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_call_log_video" msgid="8414984483082880050">"Vídeo"</string>
-    <string name="new_call_log_unknown" msgid="7873134340045098010">"Número desconhecido"</string>
-    <string name="new_call_log_header_today" msgid="3849627842127894230">"Hoje"</string>
-    <string name="new_call_log_header_older" msgid="5879512250610285872">"Mais antigas"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_new_call_log_entry_tap_action">expand menu</string>
+  <string name="a11y_new_call_log_entry_voice_call">call ^1</string>
+  <string name="a11y_new_call_log_entry_video_call">make a video call to ^1</string>
+  <string name="new_call_log_header_today">Hoje</string>
+  <string name="new_call_log_header_yesterday">Ontem</string>
+  <string name="new_call_log_header_older">Mais antigas</string>
+  <string name="new_call_log_permission_no_calllog">Para ver seu registro de chamadas, ative a permissão para o app Telefone.</string>
 </resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-pt-rPT/strings.xml b/java/com/android/dialer/calllog/ui/res/values-pt-rPT/strings.xml
index f7491b9..7906a53 100644
--- a/java/com/android/dialer/calllog/ui/res/values-pt-rPT/strings.xml
+++ b/java/com/android/dialer/calllog/ui/res/values-pt-rPT/strings.xml
@@ -1,24 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_call_log_video" msgid="8414984483082880050">"Vídeo"</string>
-    <string name="new_call_log_unknown" msgid="7873134340045098010">"Desconhecido"</string>
-    <string name="new_call_log_header_today" msgid="3849627842127894230">"Hoje"</string>
-    <string name="new_call_log_header_older" msgid="5879512250610285872">"Mais antigas"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_new_call_log_entry_tap_action">expand menu</string>
+  <string name="a11y_new_call_log_entry_voice_call">call ^1</string>
+  <string name="a11y_new_call_log_entry_video_call">make a video call to ^1</string>
+  <string name="new_call_log_header_today">Hoje</string>
+  <string name="new_call_log_header_yesterday">Ontem</string>
+  <string name="new_call_log_header_older">Mais antigas</string>
+  <string name="new_call_log_permission_no_calllog">Para ver o registo de chamadas, ative a autorização Telemóvel.</string>
 </resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-pt/strings.xml b/java/com/android/dialer/calllog/ui/res/values-pt/strings.xml
index 7b65f3a..f91e3e5 100644
--- a/java/com/android/dialer/calllog/ui/res/values-pt/strings.xml
+++ b/java/com/android/dialer/calllog/ui/res/values-pt/strings.xml
@@ -1,24 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_call_log_video" msgid="8414984483082880050">"Vídeo"</string>
-    <string name="new_call_log_unknown" msgid="7873134340045098010">"Número desconhecido"</string>
-    <string name="new_call_log_header_today" msgid="3849627842127894230">"Hoje"</string>
-    <string name="new_call_log_header_older" msgid="5879512250610285872">"Mais antigas"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_new_call_log_entry_tap_action">expand menu</string>
+  <string name="a11y_new_call_log_entry_voice_call">call ^1</string>
+  <string name="a11y_new_call_log_entry_video_call">make a video call to ^1</string>
+  <string name="new_call_log_header_today">Hoje</string>
+  <string name="new_call_log_header_yesterday">Ontem</string>
+  <string name="new_call_log_header_older">Mais antigas</string>
+  <string name="new_call_log_permission_no_calllog">Para ver seu registro de chamadas, ative a permissão para o app Telefone.</string>
 </resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-ro/strings.xml b/java/com/android/dialer/calllog/ui/res/values-ro/strings.xml
index 5446a71..5d7c566 100644
--- a/java/com/android/dialer/calllog/ui/res/values-ro/strings.xml
+++ b/java/com/android/dialer/calllog/ui/res/values-ro/strings.xml
@@ -1,24 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_call_log_video" msgid="8414984483082880050">"Video"</string>
-    <string name="new_call_log_unknown" msgid="7873134340045098010">"Necunoscut"</string>
-    <string name="new_call_log_header_today" msgid="3849627842127894230">"Astăzi"</string>
-    <string name="new_call_log_header_older" msgid="5879512250610285872">"Mai vechi"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_new_call_log_entry_tap_action">expand menu</string>
+  <string name="a11y_new_call_log_entry_voice_call">call ^1</string>
+  <string name="a11y_new_call_log_entry_video_call">make a video call to ^1</string>
+  <string name="new_call_log_header_today">Astăzi</string>
+  <string name="new_call_log_header_yesterday">Ieri</string>
+  <string name="new_call_log_header_older">Mai vechi</string>
+  <string name="new_call_log_permission_no_calllog">Pentru a vedea jurnalul de apeluri, activați permisiunea pentru Telefon.</string>
 </resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-ru/strings.xml b/java/com/android/dialer/calllog/ui/res/values-ru/strings.xml
index b8d85e9..2281707 100644
--- a/java/com/android/dialer/calllog/ui/res/values-ru/strings.xml
+++ b/java/com/android/dialer/calllog/ui/res/values-ru/strings.xml
@@ -1,24 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_call_log_video" msgid="8414984483082880050">"Видеовызов"</string>
-    <string name="new_call_log_unknown" msgid="7873134340045098010">"Неизвестно"</string>
-    <string name="new_call_log_header_today" msgid="3849627842127894230">"Сегодня"</string>
-    <string name="new_call_log_header_older" msgid="5879512250610285872">"Раньше"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_new_call_log_entry_tap_action">expand menu</string>
+  <string name="a11y_new_call_log_entry_voice_call">call ^1</string>
+  <string name="a11y_new_call_log_entry_video_call">make a video call to ^1</string>
+  <string name="new_call_log_header_today">Сегодня</string>
+  <string name="new_call_log_header_yesterday">Вчера</string>
+  <string name="new_call_log_header_older">Раньше</string>
+  <string name="new_call_log_permission_no_calllog">Чтобы открыть журнал вызовов, предоставьте приложению разрешение \"Телефон\".</string>
 </resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-si/strings.xml b/java/com/android/dialer/calllog/ui/res/values-si/strings.xml
index 0aad640..385ef35 100644
--- a/java/com/android/dialer/calllog/ui/res/values-si/strings.xml
+++ b/java/com/android/dialer/calllog/ui/res/values-si/strings.xml
@@ -1,24 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_call_log_video" msgid="8414984483082880050">"වීඩියෝ"</string>
-    <string name="new_call_log_unknown" msgid="7873134340045098010">"නොදන්නා"</string>
-    <string name="new_call_log_header_today" msgid="3849627842127894230">"අද"</string>
-    <string name="new_call_log_header_older" msgid="5879512250610285872">"වඩා පරණ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_new_call_log_entry_tap_action">expand menu</string>
+  <string name="a11y_new_call_log_entry_voice_call">call ^1</string>
+  <string name="a11y_new_call_log_entry_video_call">make a video call to ^1</string>
+  <string name="new_call_log_header_today">අද</string>
+  <string name="new_call_log_header_yesterday">ඊයේ</string>
+  <string name="new_call_log_header_older">වඩා පරණ</string>
+  <string name="new_call_log_permission_no_calllog">ඔබේ ඇමතුම් ලොගය බැලීමට, දුරකථන අවසරය ක්‍රියාත්මක කරන්න.</string>
 </resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-sk/strings.xml b/java/com/android/dialer/calllog/ui/res/values-sk/strings.xml
index 083fad4..837aed8 100644
--- a/java/com/android/dialer/calllog/ui/res/values-sk/strings.xml
+++ b/java/com/android/dialer/calllog/ui/res/values-sk/strings.xml
@@ -1,24 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_call_log_video" msgid="8414984483082880050">"Video"</string>
-    <string name="new_call_log_unknown" msgid="7873134340045098010">"Neznáme"</string>
-    <string name="new_call_log_header_today" msgid="3849627842127894230">"Dnes"</string>
-    <string name="new_call_log_header_older" msgid="5879512250610285872">"Staršie"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_new_call_log_entry_tap_action">expand menu</string>
+  <string name="a11y_new_call_log_entry_voice_call">call ^1</string>
+  <string name="a11y_new_call_log_entry_video_call">make a video call to ^1</string>
+  <string name="new_call_log_header_today">Dnes</string>
+  <string name="new_call_log_header_yesterday">Včera</string>
+  <string name="new_call_log_header_older">Staršie</string>
+  <string name="new_call_log_permission_no_calllog">Ak si chcete zobraziť denník hovorov, zapnite povolenie Telefón.</string>
 </resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-sl/strings.xml b/java/com/android/dialer/calllog/ui/res/values-sl/strings.xml
index 38b651e..17c3b74 100644
--- a/java/com/android/dialer/calllog/ui/res/values-sl/strings.xml
+++ b/java/com/android/dialer/calllog/ui/res/values-sl/strings.xml
@@ -1,24 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_call_log_video" msgid="8414984483082880050">"Video"</string>
-    <string name="new_call_log_unknown" msgid="7873134340045098010">"Neznano"</string>
-    <string name="new_call_log_header_today" msgid="3849627842127894230">"Danes"</string>
-    <string name="new_call_log_header_older" msgid="5879512250610285872">"Starejše"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_new_call_log_entry_tap_action">expand menu</string>
+  <string name="a11y_new_call_log_entry_voice_call">call ^1</string>
+  <string name="a11y_new_call_log_entry_video_call">make a video call to ^1</string>
+  <string name="new_call_log_header_today">Danes</string>
+  <string name="new_call_log_header_yesterday">Včeraj</string>
+  <string name="new_call_log_header_older">Starejše</string>
+  <string name="new_call_log_permission_no_calllog">Če si želite ogledati dnevnik klicev, vklopite dovoljenje za telefon.</string>
 </resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-sq/strings.xml b/java/com/android/dialer/calllog/ui/res/values-sq/strings.xml
index f5659af..2321219 100644
--- a/java/com/android/dialer/calllog/ui/res/values-sq/strings.xml
+++ b/java/com/android/dialer/calllog/ui/res/values-sq/strings.xml
@@ -1,24 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_call_log_video" msgid="8414984483082880050">"Video"</string>
-    <string name="new_call_log_unknown" msgid="7873134340045098010">"I panjohur"</string>
-    <string name="new_call_log_header_today" msgid="3849627842127894230">"Sot"</string>
-    <string name="new_call_log_header_older" msgid="5879512250610285872">"Më të vjetra"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_new_call_log_entry_tap_action">expand menu</string>
+  <string name="a11y_new_call_log_entry_voice_call">call ^1</string>
+  <string name="a11y_new_call_log_entry_video_call">make a video call to ^1</string>
+  <string name="new_call_log_header_today">Sot</string>
+  <string name="new_call_log_header_yesterday">Dje</string>
+  <string name="new_call_log_header_older">Më të vjetra</string>
+  <string name="new_call_log_permission_no_calllog">Për të parë evidencën e telefonatave, aktivizo lejen e \"Telefonit\".</string>
 </resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-sr/strings.xml b/java/com/android/dialer/calllog/ui/res/values-sr/strings.xml
index dfae733..0353257 100644
--- a/java/com/android/dialer/calllog/ui/res/values-sr/strings.xml
+++ b/java/com/android/dialer/calllog/ui/res/values-sr/strings.xml
@@ -1,24 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_call_log_video" msgid="8414984483082880050">"Видео позив"</string>
-    <string name="new_call_log_unknown" msgid="7873134340045098010">"Непознат број"</string>
-    <string name="new_call_log_header_today" msgid="3849627842127894230">"Данас"</string>
-    <string name="new_call_log_header_older" msgid="5879512250610285872">"Раније"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_new_call_log_entry_tap_action">expand menu</string>
+  <string name="a11y_new_call_log_entry_voice_call">call ^1</string>
+  <string name="a11y_new_call_log_entry_video_call">make a video call to ^1</string>
+  <string name="new_call_log_header_today">Данас</string>
+  <string name="new_call_log_header_yesterday">Јуче</string>
+  <string name="new_call_log_header_older">Раније</string>
+  <string name="new_call_log_permission_no_calllog">Да бисте видели евиденцију позива, укључите дозволу за Телефон.</string>
 </resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-sv/strings.xml b/java/com/android/dialer/calllog/ui/res/values-sv/strings.xml
index 20c2fda..8ed4830 100644
--- a/java/com/android/dialer/calllog/ui/res/values-sv/strings.xml
+++ b/java/com/android/dialer/calllog/ui/res/values-sv/strings.xml
@@ -1,24 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_call_log_video" msgid="8414984483082880050">"Video"</string>
-    <string name="new_call_log_unknown" msgid="7873134340045098010">"Okänd"</string>
-    <string name="new_call_log_header_today" msgid="3849627842127894230">"I dag"</string>
-    <string name="new_call_log_header_older" msgid="5879512250610285872">"Äldre"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_new_call_log_entry_tap_action">expand menu</string>
+  <string name="a11y_new_call_log_entry_voice_call">call ^1</string>
+  <string name="a11y_new_call_log_entry_video_call">make a video call to ^1</string>
+  <string name="new_call_log_header_today">I dag</string>
+  <string name="new_call_log_header_yesterday">Igår</string>
+  <string name="new_call_log_header_older">Äldre</string>
+  <string name="new_call_log_permission_no_calllog">Du måste aktivera behörigheten Telefon för att kunna visa samtalsloggen.</string>
 </resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-sw/strings.xml b/java/com/android/dialer/calllog/ui/res/values-sw/strings.xml
index 0439061..869a5de 100644
--- a/java/com/android/dialer/calllog/ui/res/values-sw/strings.xml
+++ b/java/com/android/dialer/calllog/ui/res/values-sw/strings.xml
@@ -1,24 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_call_log_video" msgid="8414984483082880050">"Video"</string>
-    <string name="new_call_log_unknown" msgid="7873134340045098010">"Haijulikani"</string>
-    <string name="new_call_log_header_today" msgid="3849627842127894230">"Leo"</string>
-    <string name="new_call_log_header_older" msgid="5879512250610285872">"Za zamani"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_new_call_log_entry_tap_action">expand menu</string>
+  <string name="a11y_new_call_log_entry_voice_call">call ^1</string>
+  <string name="a11y_new_call_log_entry_video_call">make a video call to ^1</string>
+  <string name="new_call_log_header_today">Leo</string>
+  <string name="new_call_log_header_yesterday">Jana</string>
+  <string name="new_call_log_header_older">Za zamani</string>
+  <string name="new_call_log_permission_no_calllog">Ili uone rekodi yako ya nambari za simu, washa ruhusa ya Simu.</string>
 </resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-ta/strings.xml b/java/com/android/dialer/calllog/ui/res/values-ta/strings.xml
index f883fec..5a4ee26 100644
--- a/java/com/android/dialer/calllog/ui/res/values-ta/strings.xml
+++ b/java/com/android/dialer/calllog/ui/res/values-ta/strings.xml
@@ -1,24 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_call_log_video" msgid="8414984483082880050">"வீடியோ"</string>
-    <string name="new_call_log_unknown" msgid="7873134340045098010">"தெரியாத எண்கள்"</string>
-    <string name="new_call_log_header_today" msgid="3849627842127894230">"இன்று"</string>
-    <string name="new_call_log_header_older" msgid="5879512250610285872">"பழையவை"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_new_call_log_entry_tap_action">expand menu</string>
+  <string name="a11y_new_call_log_entry_voice_call">call ^1</string>
+  <string name="a11y_new_call_log_entry_video_call">make a video call to ^1</string>
+  <string name="new_call_log_header_today">இன்று</string>
+  <string name="new_call_log_header_yesterday">நேற்று</string>
+  <string name="new_call_log_header_older">பழையவை</string>
+  <string name="new_call_log_permission_no_calllog">அழைப்புப் பதிவைப் பார்க்க, மொபைலுக்கான அனுமதியை இயக்கவும்.</string>
 </resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-te/strings.xml b/java/com/android/dialer/calllog/ui/res/values-te/strings.xml
index 6c3bd44..8662197 100644
--- a/java/com/android/dialer/calllog/ui/res/values-te/strings.xml
+++ b/java/com/android/dialer/calllog/ui/res/values-te/strings.xml
@@ -1,24 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_call_log_video" msgid="8414984483082880050">"వీడియో"</string>
-    <string name="new_call_log_unknown" msgid="7873134340045098010">"తెలియదు"</string>
-    <string name="new_call_log_header_today" msgid="3849627842127894230">"ఈ రోజు"</string>
-    <string name="new_call_log_header_older" msgid="5879512250610285872">"పాతది"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_new_call_log_entry_tap_action">expand menu</string>
+  <string name="a11y_new_call_log_entry_voice_call">call ^1</string>
+  <string name="a11y_new_call_log_entry_video_call">make a video call to ^1</string>
+  <string name="new_call_log_header_today">ఈ రోజు</string>
+  <string name="new_call_log_header_yesterday">నిన్న</string>
+  <string name="new_call_log_header_older">పాతది</string>
+  <string name="new_call_log_permission_no_calllog">మీ కాల్ లాగ్‌ను చూడటానికి, ఫోన్ అనుమతిని ఆన్ చేయండి.</string>
 </resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-th/strings.xml b/java/com/android/dialer/calllog/ui/res/values-th/strings.xml
index 8afc82a..d8a3fe2 100644
--- a/java/com/android/dialer/calllog/ui/res/values-th/strings.xml
+++ b/java/com/android/dialer/calllog/ui/res/values-th/strings.xml
@@ -1,24 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_call_log_video" msgid="8414984483082880050">"วิดีโอ"</string>
-    <string name="new_call_log_unknown" msgid="7873134340045098010">"ไม่ทราบ"</string>
-    <string name="new_call_log_header_today" msgid="3849627842127894230">"วันนี้"</string>
-    <string name="new_call_log_header_older" msgid="5879512250610285872">"เก่ากว่า"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_new_call_log_entry_tap_action">expand menu</string>
+  <string name="a11y_new_call_log_entry_voice_call">call ^1</string>
+  <string name="a11y_new_call_log_entry_video_call">make a video call to ^1</string>
+  <string name="new_call_log_header_today">วันนี้</string>
+  <string name="new_call_log_header_yesterday">เมื่อวานนี้</string>
+  <string name="new_call_log_header_older">เก่ากว่า</string>
+  <string name="new_call_log_permission_no_calllog">หากต้องการดูประวัติการโทร ให้เปิดสิทธิ์เข้าถึงโทรศัพท์</string>
 </resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-tl/strings.xml b/java/com/android/dialer/calllog/ui/res/values-tl/strings.xml
index 34d6f2c..c36cb4c 100644
--- a/java/com/android/dialer/calllog/ui/res/values-tl/strings.xml
+++ b/java/com/android/dialer/calllog/ui/res/values-tl/strings.xml
@@ -1,24 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_call_log_video" msgid="8414984483082880050">"Video"</string>
-    <string name="new_call_log_unknown" msgid="7873134340045098010">"Hindi Alam"</string>
-    <string name="new_call_log_header_today" msgid="3849627842127894230">"Ngayong araw"</string>
-    <string name="new_call_log_header_older" msgid="5879512250610285872">"Mas Luma"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_new_call_log_entry_tap_action">expand menu</string>
+  <string name="a11y_new_call_log_entry_voice_call">call ^1</string>
+  <string name="a11y_new_call_log_entry_video_call">make a video call to ^1</string>
+  <string name="new_call_log_header_today">Ngayong araw</string>
+  <string name="new_call_log_header_yesterday">Kahapon</string>
+  <string name="new_call_log_header_older">Mas Luma</string>
+  <string name="new_call_log_permission_no_calllog">Para makita ang iyong log ng tawag, i-on ang pahintulot ng Telepono.</string>
 </resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-tr/strings.xml b/java/com/android/dialer/calllog/ui/res/values-tr/strings.xml
index e7ada3d..2938cc6 100644
--- a/java/com/android/dialer/calllog/ui/res/values-tr/strings.xml
+++ b/java/com/android/dialer/calllog/ui/res/values-tr/strings.xml
@@ -1,24 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_call_log_video" msgid="8414984483082880050">"Görünt. görüşme"</string>
-    <string name="new_call_log_unknown" msgid="7873134340045098010">"Bilinmiyor"</string>
-    <string name="new_call_log_header_today" msgid="3849627842127894230">"Bugün"</string>
-    <string name="new_call_log_header_older" msgid="5879512250610285872">"Eski"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_new_call_log_entry_tap_action">expand menu</string>
+  <string name="a11y_new_call_log_entry_voice_call">call ^1</string>
+  <string name="a11y_new_call_log_entry_video_call">make a video call to ^1</string>
+  <string name="new_call_log_header_today">Bugün</string>
+  <string name="new_call_log_header_yesterday">Dün</string>
+  <string name="new_call_log_header_older">Eski</string>
+  <string name="new_call_log_permission_no_calllog">Çağrı kaydınızı görmek için Telefon iznini etkinleştirin.</string>
 </resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-uk/strings.xml b/java/com/android/dialer/calllog/ui/res/values-uk/strings.xml
index 0de770d..5667a37 100644
--- a/java/com/android/dialer/calllog/ui/res/values-uk/strings.xml
+++ b/java/com/android/dialer/calllog/ui/res/values-uk/strings.xml
@@ -1,24 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_call_log_video" msgid="8414984483082880050">"Відео"</string>
-    <string name="new_call_log_unknown" msgid="7873134340045098010">"Невідомо"</string>
-    <string name="new_call_log_header_today" msgid="3849627842127894230">"Сьогодні"</string>
-    <string name="new_call_log_header_older" msgid="5879512250610285872">"Старіші"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_new_call_log_entry_tap_action">expand menu</string>
+  <string name="a11y_new_call_log_entry_voice_call">call ^1</string>
+  <string name="a11y_new_call_log_entry_video_call">make a video call to ^1</string>
+  <string name="new_call_log_header_today">Сьогодні</string>
+  <string name="new_call_log_header_yesterday">Учора</string>
+  <string name="new_call_log_header_older">Старіші</string>
+  <string name="new_call_log_permission_no_calllog">Щоб переглянути журнал викликів, увімкніть дозвіл \"Телефон\".</string>
 </resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-ur/strings.xml b/java/com/android/dialer/calllog/ui/res/values-ur/strings.xml
index 16ae08a..a0653af 100644
--- a/java/com/android/dialer/calllog/ui/res/values-ur/strings.xml
+++ b/java/com/android/dialer/calllog/ui/res/values-ur/strings.xml
@@ -1,24 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_call_log_video" msgid="8414984483082880050">"ویڈیو"</string>
-    <string name="new_call_log_unknown" msgid="7873134340045098010">"نامعلوم"</string>
-    <string name="new_call_log_header_today" msgid="3849627842127894230">"آج"</string>
-    <string name="new_call_log_header_older" msgid="5879512250610285872">"قدیم تر"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_new_call_log_entry_tap_action">expand menu</string>
+  <string name="a11y_new_call_log_entry_voice_call">call ^1</string>
+  <string name="a11y_new_call_log_entry_video_call">make a video call to ^1</string>
+  <string name="new_call_log_header_today">آج</string>
+  <string name="new_call_log_header_yesterday">گزشتہ کل</string>
+  <string name="new_call_log_header_older">قدیم تر</string>
+  <string name="new_call_log_permission_no_calllog">اپنا کال لاگ دیکھنے کیلئے فون کی اجازت آن کریں۔</string>
 </resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-uz/strings.xml b/java/com/android/dialer/calllog/ui/res/values-uz/strings.xml
index 22e4d18..14ceca4 100644
--- a/java/com/android/dialer/calllog/ui/res/values-uz/strings.xml
+++ b/java/com/android/dialer/calllog/ui/res/values-uz/strings.xml
@@ -1,24 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_call_log_video" msgid="8414984483082880050">"Video suhbat"</string>
-    <string name="new_call_log_unknown" msgid="7873134340045098010">"Noma’lum"</string>
-    <string name="new_call_log_header_today" msgid="3849627842127894230">"Bugun"</string>
-    <string name="new_call_log_header_older" msgid="5879512250610285872">"Eskiroq"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_new_call_log_entry_tap_action">expand menu</string>
+  <string name="a11y_new_call_log_entry_voice_call">call ^1</string>
+  <string name="a11y_new_call_log_entry_video_call">make a video call to ^1</string>
+  <string name="new_call_log_header_today">Bugun</string>
+  <string name="new_call_log_header_yesterday">Kecha</string>
+  <string name="new_call_log_header_older">Eskiroq</string>
+  <string name="new_call_log_permission_no_calllog">Chaqiruvlar jurnalini ko‘rish uchun ilovaga Telefon ruxsatnomasini bering.</string>
 </resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-vi/strings.xml b/java/com/android/dialer/calllog/ui/res/values-vi/strings.xml
index a70de21..d7d5f67 100644
--- a/java/com/android/dialer/calllog/ui/res/values-vi/strings.xml
+++ b/java/com/android/dialer/calllog/ui/res/values-vi/strings.xml
@@ -1,24 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_call_log_video" msgid="8414984483082880050">"Video"</string>
-    <string name="new_call_log_unknown" msgid="7873134340045098010">"Không xác định"</string>
-    <string name="new_call_log_header_today" msgid="3849627842127894230">"Hôm nay"</string>
-    <string name="new_call_log_header_older" msgid="5879512250610285872">"Cũ hơn"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_new_call_log_entry_tap_action">expand menu</string>
+  <string name="a11y_new_call_log_entry_voice_call">call ^1</string>
+  <string name="a11y_new_call_log_entry_video_call">make a video call to ^1</string>
+  <string name="new_call_log_header_today">Hôm nay</string>
+  <string name="new_call_log_header_yesterday">Hôm qua</string>
+  <string name="new_call_log_header_older">Cũ hơn</string>
+  <string name="new_call_log_permission_no_calllog">Để xem nhật ký cuộc gọi, hãy bật quyền truy cập vào Điện thoại.</string>
 </resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-zh-rCN/strings.xml b/java/com/android/dialer/calllog/ui/res/values-zh-rCN/strings.xml
index ae4c645..2f3cb5a 100644
--- a/java/com/android/dialer/calllog/ui/res/values-zh-rCN/strings.xml
+++ b/java/com/android/dialer/calllog/ui/res/values-zh-rCN/strings.xml
@@ -1,24 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_call_log_video" msgid="8414984483082880050">"视频通话"</string>
-    <string name="new_call_log_unknown" msgid="7873134340045098010">"未知"</string>
-    <string name="new_call_log_header_today" msgid="3849627842127894230">"今天"</string>
-    <string name="new_call_log_header_older" msgid="5879512250610285872">"更早"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_new_call_log_entry_tap_action">expand menu</string>
+  <string name="a11y_new_call_log_entry_voice_call">call ^1</string>
+  <string name="a11y_new_call_log_entry_video_call">make a video call to ^1</string>
+  <string name="new_call_log_header_today">今天</string>
+  <string name="new_call_log_header_yesterday">昨天</string>
+  <string name="new_call_log_header_older">更早</string>
+  <string name="new_call_log_permission_no_calllog">要查看您的通话记录，请开启“电话”权限。</string>
 </resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-zh-rHK/strings.xml b/java/com/android/dialer/calllog/ui/res/values-zh-rHK/strings.xml
index 4e78292..c17d039 100644
--- a/java/com/android/dialer/calllog/ui/res/values-zh-rHK/strings.xml
+++ b/java/com/android/dialer/calllog/ui/res/values-zh-rHK/strings.xml
@@ -1,24 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_call_log_video" msgid="8414984483082880050">"影片"</string>
-    <string name="new_call_log_unknown" msgid="7873134340045098010">"不明"</string>
-    <string name="new_call_log_header_today" msgid="3849627842127894230">"今天"</string>
-    <string name="new_call_log_header_older" msgid="5879512250610285872">"較舊"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_new_call_log_entry_tap_action">expand menu</string>
+  <string name="a11y_new_call_log_entry_voice_call">call ^1</string>
+  <string name="a11y_new_call_log_entry_video_call">make a video call to ^1</string>
+  <string name="new_call_log_header_today">今天</string>
+  <string name="new_call_log_header_yesterday">昨天</string>
+  <string name="new_call_log_header_older">較舊</string>
+  <string name="new_call_log_permission_no_calllog">如要查看通話記錄，請開放「手機」權限。</string>
 </resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-zh-rTW/strings.xml b/java/com/android/dialer/calllog/ui/res/values-zh-rTW/strings.xml
index 4b6b736..602c203 100644
--- a/java/com/android/dialer/calllog/ui/res/values-zh-rTW/strings.xml
+++ b/java/com/android/dialer/calllog/ui/res/values-zh-rTW/strings.xml
@@ -1,24 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_call_log_video" msgid="8414984483082880050">"視訊通話"</string>
-    <string name="new_call_log_unknown" msgid="7873134340045098010">"不明"</string>
-    <string name="new_call_log_header_today" msgid="3849627842127894230">"今天"</string>
-    <string name="new_call_log_header_older" msgid="5879512250610285872">"較舊"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_new_call_log_entry_tap_action">expand menu</string>
+  <string name="a11y_new_call_log_entry_voice_call">call ^1</string>
+  <string name="a11y_new_call_log_entry_video_call">make a video call to ^1</string>
+  <string name="new_call_log_header_today">今天</string>
+  <string name="new_call_log_header_yesterday">昨天</string>
+  <string name="new_call_log_header_older">較舊</string>
+  <string name="new_call_log_permission_no_calllog">如要查看你的通話記錄，請開啟「電話」存取權限。</string>
 </resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values-zu/strings.xml b/java/com/android/dialer/calllog/ui/res/values-zu/strings.xml
index 675e632..07dbb83 100644
--- a/java/com/android/dialer/calllog/ui/res/values-zu/strings.xml
+++ b/java/com/android/dialer/calllog/ui/res/values-zu/strings.xml
@@ -1,24 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_call_log_video" msgid="8414984483082880050">"Ividiyo"</string>
-    <string name="new_call_log_unknown" msgid="7873134340045098010">"Akwaziwa"</string>
-    <string name="new_call_log_header_today" msgid="3849627842127894230">"Namhlanje"</string>
-    <string name="new_call_log_header_older" msgid="5879512250610285872">"Okudala"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_new_call_log_entry_tap_action">expand menu</string>
+  <string name="a11y_new_call_log_entry_voice_call">call ^1</string>
+  <string name="a11y_new_call_log_entry_video_call">make a video call to ^1</string>
+  <string name="new_call_log_header_today">Namhlanje</string>
+  <string name="new_call_log_header_yesterday">Izolo</string>
+  <string name="new_call_log_header_older">Okudala</string>
+  <string name="new_call_log_permission_no_calllog">Ukuze ubone irekhodi lakho lamakholi, vuma imvume yefoni.</string>
 </resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values/colors.xml b/java/com/android/dialer/calllog/ui/res/values/colors.xml
index 0a6d512..27a821e 100644
--- a/java/com/android/dialer/calllog/ui/res/values/colors.xml
+++ b/java/com/android/dialer/calllog/ui/res/values/colors.xml
@@ -16,6 +16,7 @@
   -->
 
 <resources>
+  <!-- TODO(a bug): remove these? -->
   <color name="feature_icon_read_color">#9E9E9E</color>
   <color name="feature_icon_unread_color">#474747</color>
 
diff --git a/java/com/android/dialer/calllog/ui/res/values/strings.xml b/java/com/android/dialer/calllog/ui/res/values/strings.xml
index ebddc35..87d6a19 100644
--- a/java/com/android/dialer/calllog/ui/res/values/strings.xml
+++ b/java/com/android/dialer/calllog/ui/res/values/strings.xml
@@ -15,7 +15,32 @@
   ~ limitations under the License
   -->
 
-<resources>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
+  <!--
+    A string informing a11y users that activating a call log entry will expand the menu
+    (a bottom sheet) for it.
+    [CHAR LIMIT=NONE]
+  -->
+  <string name="a11y_new_call_log_entry_tap_action">expand menu</string>
+
+  <!--
+    A string describing the call button of a call log entry for a11y users.
+    An example will be read as "call Jane Smith".
+    [CHAR LIMIT=NONE]
+  -->
+  <string name="a11y_new_call_log_entry_voice_call">
+    call <xliff:g example="Jane Smith" id="primaryTextForEntry">^1</xliff:g>
+  </string>
+
+  <!--
+    A string describing the call button of a call log entry for a11y users.
+    An example will be read as "make a video call to Jane Smith".
+    [CHAR LIMIT=NONE]
+  -->
+  <string name="a11y_new_call_log_entry_video_call">
+    make a video call to <xliff:g example="Jane Smith" id="primaryTextForEntry">^1</xliff:g>
+  </string>
 
   <!-- Header in call log to group calls from the current day.  [CHAR LIMIT=30] -->
   <string name="new_call_log_header_today">Today</string>
@@ -26,4 +51,7 @@
   <!-- Header in call log to group calls from before yesterday.  [CHAR LIMIT=30] -->
   <string name="new_call_log_header_older">Older</string>
 
-</resources>
\ No newline at end of file
+  <!-- Shown as a prompt to turn on the phone permission to enable the call log [CHAR LIMIT=NONE]-->
+  <string name="new_call_log_permission_no_calllog">To see your call log, turn on the Phone permission.</string>
+
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values/styles.xml b/java/com/android/dialer/calllog/ui/res/values/styles.xml
index d521fee..3a02eb2 100644
--- a/java/com/android/dialer/calllog/ui/res/values/styles.xml
+++ b/java/com/android/dialer/calllog/ui/res/values/styles.xml
@@ -16,32 +16,19 @@
   -->
 <resources>
 
-  <style name="primary_textview">
-    <item name="android:textColor">@color/primary_text_color</item>
-    <item name="android:fontFamily">sans-serif</item>
+  <style name="primary_textview" parent="Dialer.TextAppearance.Primary"/>
+
+  <style name="primary_textview_unread_call" parent="Dialer.TextAppearance.Header2"/>
+
+  <style name="secondary_textview" parent="Dialer.TextAppearance.Secondary"/>
+
+  <style name="phoneaccount_textview"/>
+
+  <style name="secondary_textview_unread_call" parent="Dialer.TextAppearance.Header2">
+    <item name="android:textColor">@color/dialer_red</item>
   </style>
 
-  <style name="primary_textview_new_call">
-    <item name="android:textColor">@color/primary_text_color</item>
+  <style name="phoneaccount_textview_unread_call">
     <item name="android:fontFamily">sans-serif-medium</item>
   </style>
-
-  <style name="secondary_textview">
-    <item name="android:textColor">@color/secondary_text_color</item>
-    <item name="android:fontFamily">sans-serif</item>
-  </style>
-
-  <style name="phoneaccount_textview">
-    <item name="android:fontFamily">sans-serif</item>
-  </style>
-
-  <style name="secondary_textview_new_call">
-    <item name="android:textColor">@color/missed_call</item>
-    <item name="android:fontFamily">sans-serif-medium</item>
-  </style>
-
-  <style name="phoneaccount_textview_new_call">
-    <item name="android:fontFamily">sans-serif-medium</item>
-  </style>
-
 </resources>
\ No newline at end of file
diff --git a/java/com/android/dialer/calllogutils/CallLogContactTypes.java b/java/com/android/dialer/calllogutils/CallLogContactTypes.java
deleted file mode 100644
index 5865156..0000000
--- a/java/com/android/dialer/calllogutils/CallLogContactTypes.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.dialer.calllogutils;
-
-import com.android.dialer.calllog.model.CoalescedRow;
-import com.android.dialer.lettertile.LetterTileDrawable;
-
-/** Determines the {@link LetterTileDrawable.ContactType} for a {@link CoalescedRow}. */
-public class CallLogContactTypes {
-
-  /** Determines the {@link LetterTileDrawable.ContactType} for a {@link CoalescedRow}. */
-  @LetterTileDrawable.ContactType
-  public static int getContactType(CoalescedRow row) {
-    // TODO(zachh): Set these fields correctly.
-    boolean isVoicemail = false;
-    boolean isSpam = false;
-    boolean isBusiness = false;
-    int numberPresentation = row.numberPresentation();
-    boolean isConference = false;
-
-    return LetterTileDrawable.getContactTypeFromPrimitives(
-        isVoicemail, isSpam, isBusiness, numberPresentation, isConference);
-  }
-}
diff --git a/java/com/android/dialer/calllogutils/CallLogDates.java b/java/com/android/dialer/calllogutils/CallLogDates.java
index fe3c0c3..9c04c05 100644
--- a/java/com/android/dialer/calllogutils/CallLogDates.java
+++ b/java/com/android/dialer/calllogutils/CallLogDates.java
@@ -19,8 +19,6 @@
 import android.content.Context;
 import android.icu.lang.UCharacter;
 import android.icu.text.BreakIterator;
-import android.os.Build.VERSION;
-import android.os.Build.VERSION_CODES;
 import android.text.format.DateUtils;
 import java.util.Calendar;
 import java.util.Locale;
@@ -38,13 +36,16 @@
    *   if < 1 minute ago: "Just now";
    *   else if < 1 hour ago: time relative to now (e.g., "8 min ago");
    *   else if today: time (e.g., "12:15 PM");
-   *   else if < 7 days: abbreviated day of week (e.g., "Wed");
-   *   else if < 1 year: date with abbreviated month, day, but no year (e.g., "Jan 15");
-   *   else: date with abbreviated month, day, and year (e.g., "Jan 15, 2018").
+   *   else if < 7 days: day of week (e.g., "Wed");
+   *   else if < 1 year: date with month, day, but no year (e.g., "Jan 15");
+   *   else: date with month, day, and year (e.g., "Jan 15, 2018").
    * </pre>
+   *
+   * <p>Callers can decide whether to abbreviate date/time by specifying flag {@code
+   * abbreviateDateTime}.
    */
   public static CharSequence newCallLogTimestampLabel(
-      Context context, long nowMillis, long timestampMillis) {
+      Context context, long nowMillis, long timestampMillis, boolean abbreviateDateTime) {
     // For calls logged less than 1 minute ago, display "Just now".
     if (nowMillis - timestampMillis < TimeUnit.MINUTES.toMillis(1)) {
       return context.getString(R.string.just_now);
@@ -52,16 +53,19 @@
 
     // For calls logged less than 1 hour ago, display time relative to now (e.g., "8 min ago").
     if (nowMillis - timestampMillis < TimeUnit.HOURS.toMillis(1)) {
-      return DateUtils.getRelativeTimeSpanString(
-              timestampMillis,
-              nowMillis,
-              DateUtils.MINUTE_IN_MILLIS,
-              DateUtils.FORMAT_ABBREV_RELATIVE)
-          .toString()
-          // The platform method DateUtils#getRelativeTimeSpanString adds a dot ('.') after the
-          // abbreviated time unit for some languages (e.g., "8 min. ago") but we prefer not to have
-          // the dot.
-          .replace(".", "");
+      return abbreviateDateTime
+          ? DateUtils.getRelativeTimeSpanString(
+                  timestampMillis,
+                  nowMillis,
+                  DateUtils.MINUTE_IN_MILLIS,
+                  DateUtils.FORMAT_ABBREV_RELATIVE)
+              .toString()
+              // The platform method DateUtils#getRelativeTimeSpanString adds a dot ('.') after the
+              // abbreviated time unit for some languages (e.g., "8 min. ago") but we prefer not to
+              // have the dot.
+              .replace(".", "")
+          : DateUtils.getRelativeTimeSpanString(
+              timestampMillis, nowMillis, DateUtils.MINUTE_IN_MILLIS);
     }
 
     int dayDifference = getDayDifference(nowMillis, timestampMillis);
@@ -71,19 +75,19 @@
       return DateUtils.formatDateTime(context, timestampMillis, DateUtils.FORMAT_SHOW_TIME);
     }
 
-    // For calls logged within a week, display the abbreviated day of week (e.g., "Wed").
+    // For calls logged within a week, display the day of week (e.g., "Wed").
     if (dayDifference < 7) {
-      return formatDayOfWeek(context, timestampMillis);
+      return formatDayOfWeek(context, timestampMillis, abbreviateDateTime);
     }
 
-    // For calls logged within a year, display abbreviated month, day, but no year (e.g., "Jan 15").
+    // For calls logged within a year, display month, day, but no year (e.g., "Jan 15").
     if (isWithinOneYear(nowMillis, timestampMillis)) {
-      return formatAbbreviatedDate(context, timestampMillis, /* showYear = */ false);
+      return formatDate(context, timestampMillis, /* showYear = */ false, abbreviateDateTime);
     }
 
-    // For calls logged no less than one year ago, display abbreviated month, day, and year
+    // For calls logged no less than one year ago, display month, day, and year
     // (e.g., "Jan 15, 2018").
-    return formatAbbreviatedDate(context, timestampMillis, /* showYear = */ true);
+    return formatDate(context, timestampMillis, /* showYear = */ true, abbreviateDateTime);
   }
 
   /**
@@ -108,36 +112,41 @@
   }
 
   /**
-   * Formats the provided timestamp (in milliseconds) into abbreviated day of week.
-   *
-   * <p>For example, returns a string like "Wed" or "Chor".
-   *
-   * <p>For pre-N devices, the returned value may not start with a capital if the local convention
-   * is to not capitalize day names. On N+ devices, the returned value is always capitalized.
-   */
-  private static CharSequence formatDayOfWeek(Context context, long timestamp) {
-    return toTitleCase(
-        DateUtils.formatDateTime(
-            context, timestamp, DateUtils.FORMAT_SHOW_WEEKDAY | DateUtils.FORMAT_ABBREV_WEEKDAY));
-  }
-
-  /**
-   * Formats the provided timestamp (in milliseconds) into the month abbreviation, day, and
-   * optionally, year.
+   * Formats the provided timestamp (in milliseconds) into the month, day, and optionally, year.
    *
    * <p>For example, returns a string like "Jan 15" or "Jan 15, 2018".
    *
    * <p>For pre-N devices, the returned value may not start with a capital if the local convention
    * is to not capitalize day names. On N+ devices, the returned value is always capitalized.
    */
-  private static CharSequence formatAbbreviatedDate(
-      Context context, long timestamp, boolean showYear) {
-    int flags = DateUtils.FORMAT_ABBREV_MONTH;
+  private static CharSequence formatDate(
+      Context context, long timestamp, boolean showYear, boolean abbreviateDateTime) {
+    int formatFlags = 0;
+    if (abbreviateDateTime) {
+      formatFlags |= DateUtils.FORMAT_ABBREV_MONTH;
+    }
     if (!showYear) {
-      flags |= DateUtils.FORMAT_NO_YEAR;
+      formatFlags |= DateUtils.FORMAT_NO_YEAR;
     }
 
-    return toTitleCase(DateUtils.formatDateTime(context, timestamp, flags));
+    return toTitleCase(DateUtils.formatDateTime(context, timestamp, formatFlags));
+  }
+
+  /**
+   * Formats the provided timestamp (in milliseconds) into day of week.
+   *
+   * <p>For example, returns a string like "Wed" or "Chor".
+   *
+   * <p>For pre-N devices, the returned value may not start with a capital if the local convention
+   * is to not capitalize day names. On N+ devices, the returned value is always capitalized.
+   */
+  private static CharSequence formatDayOfWeek(
+      Context context, long timestamp, boolean abbreviateDateTime) {
+    int formatFlags =
+        abbreviateDateTime
+            ? (DateUtils.FORMAT_SHOW_WEEKDAY | DateUtils.FORMAT_ABBREV_WEEKDAY)
+            : DateUtils.FORMAT_SHOW_WEEKDAY;
+    return toTitleCase(DateUtils.formatDateTime(context, timestamp, formatFlags));
   }
 
   private static CharSequence toTitleCase(CharSequence value) {
@@ -145,12 +154,6 @@
     // of the string is not usually capitalized. For example, "Wednesdsay" in Uzbek is "chorshanba”
     // (not capitalized). To handle this issue we apply title casing to the start of the sentence so
     // that "chorshanba, 2016 may 25,20:02" becomes "Chorshanba, 2016 may 25,20:02".
-    //
-    // The ICU library was not available in Android until N, so we can only do this in N+ devices.
-    // Pre-N devices will still see incorrect capitalization in some languages.
-    if (VERSION.SDK_INT < VERSION_CODES.N) {
-      return value;
-    }
 
     // Using the ICU library is safer than just applying toUpperCase() on the first letter of the
     // word because in some languages, there can be multiple starting characters which should be
@@ -202,6 +205,7 @@
     startOfReferenceDay.add(Calendar.HOUR_OF_DAY, -startOfReferenceDay.get(Calendar.HOUR_OF_DAY));
     startOfReferenceDay.add(Calendar.MINUTE, -startOfReferenceDay.get(Calendar.MINUTE));
     startOfReferenceDay.add(Calendar.SECOND, -startOfReferenceDay.get(Calendar.SECOND));
+    startOfReferenceDay.add(Calendar.MILLISECOND, -startOfReferenceDay.get(Calendar.MILLISECOND));
 
     Calendar other = Calendar.getInstance();
     other.setTimeInMillis(firstTimestamp);
diff --git a/java/com/android/dialer/calllogutils/CallLogEntryDescriptions.java b/java/com/android/dialer/calllogutils/CallLogEntryDescriptions.java
new file mode 100644
index 0000000..52f0cfd
--- /dev/null
+++ b/java/com/android/dialer/calllogutils/CallLogEntryDescriptions.java
@@ -0,0 +1,155 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.dialer.calllogutils;
+
+import android.content.Context;
+import android.provider.CallLog.Calls;
+import android.support.annotation.PluralsRes;
+import android.telecom.PhoneAccountHandle;
+import android.telephony.PhoneNumberUtils;
+import android.text.TextUtils;
+import com.android.dialer.calllog.model.CoalescedRow;
+import com.android.dialer.telecom.TelecomUtil;
+import com.android.dialer.time.Clock;
+import com.google.common.collect.Collections2;
+import java.util.List;
+
+/** Builds descriptions of call log entries for accessibility users. */
+public final class CallLogEntryDescriptions {
+
+  private CallLogEntryDescriptions() {}
+
+  /**
+   * Builds the content description for a call log entry.
+   *
+   * <p>The description is of format<br>
+   * {primary description}, {secondary description}, {phone account description}.
+   *
+   * <ul>
+   *   <li>The primary description depends on the number of calls in the entry. For example:<br>
+   *       "1 answered call from Jane Smith", or<br>
+   *       "2 calls, the latest is an answered call from Jane Smith".
+   *   <li>The secondary description is the same as the secondary text for the call log entry,
+   *       except that date/time is not abbreviated. For example:<br>
+   *       "mobile, 11 minutes ago".
+   *   <li>The phone account description is of format "on {phone_account_label}, via {number}". For
+   *       example:<br>
+   *       "on SIM 1, via 6502531234".<br>
+   *       Note that the phone account description will be empty if the device has only one SIM.
+   * </ul>
+   *
+   * <p>An example of the full description can be:<br>
+   * "2 calls, the latest is an answered call from Jane Smith, mobile, 11 minutes ago, on SIM 1, via
+   * 6502531234".
+   */
+  public static CharSequence buildDescriptionForEntry(
+      Context context, Clock clock, CoalescedRow row) {
+
+    // Build the primary description.
+    // Examples:
+    //   (1) For an entry containing only 1 call:
+    //         "1 missed call from James Smith".
+    //   (2) For entries containing multiple calls:
+    //         "2 calls, the latest is a missed call from Jame Smith".
+    CharSequence primaryDescription =
+        TextUtils.expandTemplate(
+            context
+                .getResources()
+                .getQuantityString(
+                    getPrimaryDescriptionResIdForCallType(row),
+                    row.getCoalescedIds().getCoalescedIdCount()),
+            String.valueOf(row.getCoalescedIds().getCoalescedIdCount()),
+            CallLogEntryText.buildPrimaryText(context, row));
+
+    // Build the secondary description.
+    // An example: "mobile, 11 minutes ago".
+    CharSequence secondaryDescription =
+        joinSecondaryTextComponents(
+            CallLogEntryText.buildSecondaryTextListForEntries(
+                context, clock, row, /* abbreviateDateTime = */ false));
+
+    // Build the phone account description.
+    // Note that this description can be an empty string.
+    CharSequence phoneAccountDescription = buildPhoneAccountDescription(context, row);
+
+    return TextUtils.isEmpty(phoneAccountDescription)
+        ? TextUtils.expandTemplate(
+            context
+                .getResources()
+                .getText(
+                    R.string.a11y_new_call_log_entry_full_description_without_phone_account_info),
+            primaryDescription,
+            secondaryDescription)
+        : TextUtils.expandTemplate(
+            context
+                .getResources()
+                .getText(R.string.a11y_new_call_log_entry_full_description_with_phone_account_info),
+            primaryDescription,
+            secondaryDescription,
+            phoneAccountDescription);
+  }
+
+  private static @PluralsRes int getPrimaryDescriptionResIdForCallType(CoalescedRow row) {
+    switch (row.getCallType()) {
+      case Calls.INCOMING_TYPE:
+      case Calls.ANSWERED_EXTERNALLY_TYPE:
+        return R.plurals.a11y_new_call_log_entry_answered_call;
+      case Calls.OUTGOING_TYPE:
+        return R.plurals.a11y_new_call_log_entry_outgoing_call;
+      case Calls.MISSED_TYPE:
+        return R.plurals.a11y_new_call_log_entry_missed_call;
+      case Calls.VOICEMAIL_TYPE:
+        throw new IllegalStateException("Voicemails not expected in call log");
+      case Calls.BLOCKED_TYPE:
+        return R.plurals.a11y_new_call_log_entry_blocked_call;
+      default:
+        // It is possible for users to end up with calls with unknown call types in their
+        // call history, possibly due to 3rd party call log implementations (e.g. to
+        // distinguish between rejected and missed calls). Instead of crashing, just
+        // assume that all unknown call types are missed calls.
+        return R.plurals.a11y_new_call_log_entry_missed_call;
+    }
+  }
+
+  private static CharSequence buildPhoneAccountDescription(Context context, CoalescedRow row) {
+    PhoneAccountHandle phoneAccountHandle =
+        TelecomUtil.composePhoneAccountHandle(
+            row.getPhoneAccountComponentName(), row.getPhoneAccountId());
+    if (phoneAccountHandle == null) {
+      return "";
+    }
+
+    String phoneAccountLabel = PhoneAccountUtils.getAccountLabel(context, phoneAccountHandle);
+    if (TextUtils.isEmpty(phoneAccountLabel)) {
+      return "";
+    }
+
+    if (TextUtils.isEmpty(row.getNumber().getNormalizedNumber())) {
+      return "";
+    }
+
+    return TextUtils.expandTemplate(
+        context.getResources().getText(R.string.a11y_new_call_log_entry_phone_account),
+        phoneAccountLabel,
+        PhoneNumberUtils.createTtsSpannable(row.getNumber().getNormalizedNumber()));
+  }
+
+  private static CharSequence joinSecondaryTextComponents(List<CharSequence> components) {
+    return TextUtils.join(
+        ", ", Collections2.filter(components, (text) -> !TextUtils.isEmpty(text)));
+  }
+}
diff --git a/java/com/android/dialer/calllogutils/CallLogEntryText.java b/java/com/android/dialer/calllogutils/CallLogEntryText.java
index ab851cb..1ec172f 100644
--- a/java/com/android/dialer/calllogutils/CallLogEntryText.java
+++ b/java/com/android/dialer/calllogutils/CallLogEntryText.java
@@ -18,12 +18,16 @@
 
 import android.content.Context;
 import android.provider.CallLog.Calls;
+import android.telephony.PhoneNumberUtils;
 import android.text.TextUtils;
 import com.android.dialer.calllog.model.CoalescedRow;
+import com.android.dialer.duo.DuoComponent;
+import com.android.dialer.spam.Spam;
 import com.android.dialer.time.Clock;
 import com.google.common.base.Optional;
 import com.google.common.collect.Collections2;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -41,72 +45,119 @@
    * following the primary text.)
    */
   public static CharSequence buildPrimaryText(Context context, CoalescedRow row) {
-    // Always prefer the presentation name, like "Restricted".
+    // Calls to emergency services should be shown as "Emergency number".
+    if (row.getNumberAttributes().getIsEmergencyNumber()) {
+      return context.getText(R.string.emergency_number);
+    }
+
+    // Otherwise, follow the following order of preferences.
+    // 1st preference: the presentation name, like "Restricted".
     Optional<String> presentationName =
-        PhoneNumberDisplayUtil.getNameForPresentation(context, row.numberPresentation());
+        PhoneNumberDisplayUtil.getNameForPresentation(context, row.getNumberPresentation());
     if (presentationName.isPresent()) {
       return presentationName.get();
     }
 
-    // Otherwise prefer the name.
-    if (!TextUtils.isEmpty(row.numberAttributes().getName())) {
-      return row.numberAttributes().getName();
+    // 2nd preference: the voicemail tag if the call is one made to a voicemail box.
+    if (row.getIsVoicemailCall() && !TextUtils.isEmpty(row.getVoicemailCallTag())) {
+      return row.getVoicemailCallTag();
     }
 
-    // Otherwise prefer the formatted number.
-    if (!TextUtils.isEmpty(row.formattedNumber())) {
-      return row.formattedNumber();
+    // 3rd preference: the name associated with the number.
+    if (!TextUtils.isEmpty(row.getNumberAttributes().getName())) {
+      return row.getNumberAttributes().getName();
     }
 
-    // If there's no formatted number, just return "Unknown".
+    // 4th preference: the formatted number.
+    if (!TextUtils.isEmpty(row.getFormattedNumber())) {
+      return PhoneNumberUtils.createTtsSpannable(row.getFormattedNumber());
+    }
+
+    // Last resort: show "Unknown".
     return context.getText(R.string.new_call_log_unknown);
   }
 
   /**
-   * The secondary text to show in the main call log entry list.
+   * The secondary text to be shown in the main call log entry list.
+   *
+   * <p>This method first obtains a list of strings to be shown in order and then concatenates them
+   * with " • ".
+   *
+   * <p>Examples:
+   *
+   * <ul>
+   *   <li>Mobile, Duo video • 10 min ago
+   *   <li>Spam • Mobile • Now
+   *   <li>Blocked • Spam • Mobile • Now
+   * </ul>
+   *
+   * @see #buildSecondaryTextListForEntries(Context, Clock, CoalescedRow, boolean) for details.
+   */
+  public static CharSequence buildSecondaryTextForEntries(
+      Context context, Clock clock, CoalescedRow row) {
+    return joinSecondaryTextComponents(
+        buildSecondaryTextListForEntries(context, clock, row, /* abbreviateDateTime = */ true));
+  }
+
+  /**
+   * Returns a list of strings to be shown in order as the main call log entry's secondary text.
    *
    * <p>Rules:
    *
    * <ul>
-   *   <li>For numbers that are not spam or blocked: (Duo video, )?$Label|$Location • Date
-   *   <li>For blocked non-spam numbers: Blocked • (Duo video, )?$Label|$Location • Date
-   *   <li>For spam but not blocked numbers: Spam • (Duo video, )?$Label • Date
-   *   <li>For blocked spam numbers: Blocked • Spam • (Duo video, )?$Label • Date
+   *   <li>An emergency number: [{Date}]
+   *   <li>Number - not blocked, call - not spam:
+   *       <p>[{$Label(, Duo video|Carrier video)?|$Location}, {Date}]
+   *   <li>Number - blocked, call - not spam:
+   *       <p>["Blocked", {$Label(, Duo video|Carrier video)?|$Location}, {Date}]
+   *   <li>Number - not blocked, call - spam:
+   *       <p>["Spam", {$Label(, Duo video|Carrier video)?}, {Date}]
+   *   <li>Number - blocked, call - spam:
+   *       <p>["Blocked, Spam", {$Label(, Duo video|Carrier video)?}, {Date}]
    * </ul>
    *
    * <p>Examples:
    *
    * <ul>
-   *   <li>Duo Video, Mobile • Now
-   *   <li>Duo Video • 10 min ago
-   *   <li>Mobile • 11:45 PM
-   *   <li>Mobile • Sun
-   *   <li>Blocked • Duo Video, Mobile • Now
-   *   <li>Blocked • Brooklyn, NJ • 10 min ago
-   *   <li>Spam • Mobile • Now
-   *   <li>Spam • Now
-   *   <li>Blocked • Spam • Mobile • Now
-   *   <li>Brooklyn, NJ • Jan 15
+   *   <li>["Mobile, Duo video", "Now"]
+   *   <li>["Duo video", "10 min ago"]
+   *   <li>["Mobile", "11:45 PM"]
+   *   <li>["Mobile", "Sun"]
+   *   <li>["Blocked", "Mobile, Duo video", "Now"]
+   *   <li>["Blocked", "Brooklyn, NJ", "10 min ago"]
+   *   <li>["Spam", "Mobile", "Now"]
+   *   <li>["Spam", "Now"]
+   *   <li>["Blocked", "Spam", "Mobile", "Now"]
+   *   <li>["Brooklyn, NJ", "Jan 15"]
    * </ul>
    *
-   * <p>See {@link CallLogDates#newCallLogTimestampLabel(Context, long, long)} for date rules.
+   * <p>See {@link CallLogDates#newCallLogTimestampLabel(Context, long, long, boolean)} for date
+   * rules.
    */
-  public static CharSequence buildSecondaryTextForEntries(
-      Context context, Clock clock, CoalescedRow row) {
+  static List<CharSequence> buildSecondaryTextListForEntries(
+      Context context, Clock clock, CoalescedRow row, boolean abbreviateDateTime) {
+    // For emergency numbers, the secondary text should contain only the timestamp.
+    if (row.getNumberAttributes().getIsEmergencyNumber()) {
+      return Collections.singletonList(
+          CallLogDates.newCallLogTimestampLabel(
+              context, clock.currentTimeMillis(), row.getTimestamp(), abbreviateDateTime));
+    }
+
     List<CharSequence> components = new ArrayList<>();
 
-    if (row.numberAttributes().getIsBlocked()) {
+    if (row.getNumberAttributes().getIsBlocked()) {
       components.add(context.getText(R.string.new_call_log_secondary_blocked));
     }
-    if (row.numberAttributes().getIsSpam()) {
+    if (Spam.shouldShowAsSpam(row.getNumberAttributes().getIsSpam(), row.getCallType())) {
       components.add(context.getText(R.string.new_call_log_secondary_spam));
     }
 
     components.add(getNumberTypeLabel(context, row));
 
     components.add(
-        CallLogDates.newCallLogTimestampLabel(context, clock.currentTimeMillis(), row.timestamp()));
-    return joinSecondaryTextComponents(components);
+        CallLogDates.newCallLogTimestampLabel(
+            context, clock.currentTimeMillis(), row.getTimestamp(), abbreviateDateTime));
+    return components;
   }
 
   /**
@@ -119,21 +170,23 @@
   public static CharSequence buildSecondaryTextForBottomSheet(Context context, CoalescedRow row) {
     /*
      * Rules:
-     *   For numbers that are not spam or blocked:
-     *     (Duo video, )?$Label|$Location [• NumberIfNoName]?
-     *   For blocked non-spam numbers:
-     *     Blocked • (Duo video, )?$Label|$Location [• NumberIfNoName]?
-     *   For spam but not blocked numbers:
-     *     Spam • (Duo video, )?$Label [• NumberIfNoName]?
-     *   For blocked spam numbers:
-     *     Blocked • Spam • (Duo video, )?$Label [• NumberIfNoName]?
+     *   For an emergency number:
+     *     Number
+     *   Number - not blocked, call - not spam:
+     *     $Label(, Duo video|Carrier video)?|$Location [• NumberIfNoName]?
+     *   Number - blocked, call - not spam:
+     *     Blocked • $Label(, Duo video|Carrier video)?|$Location [• NumberIfNoName]?
+     *   Number - not blocked, call - spam:
+     *     Spam • $Label(, Duo video|Carrier video)? [• NumberIfNoName]?
+     *   Number - blocked, call - spam:
+     *     Blocked • Spam • $Label(, Duo video|Carrier video)? [• NumberIfNoName]?
      *
      * The number is shown at the end if there is no name for the entry. (It is shown in primary
      * text otherwise.)
      *
      * Examples:
-     *   Duo Video, Mobile • 555-1234
-     *   Duo Video • 555-1234
+     *   Mobile, Duo video • 555-1234
+     *   Duo video • 555-1234
      *   Mobile • 555-1234
      *   Blocked • Mobile • 555-1234
      *   Blocked • Brooklyn, NJ • 555-1234
@@ -141,12 +194,20 @@
      *   Mobile • 555-1234
      *   Brooklyn, NJ
      */
+
+    // For emergency numbers, the secondary text should contain only the number.
+    if (row.getNumberAttributes().getIsEmergencyNumber()) {
+      return !row.getFormattedNumber().isEmpty()
+          ? row.getFormattedNumber()
+          : row.getNumber().getNormalizedNumber();
+    }
+
     List<CharSequence> components = new ArrayList<>();
 
-    if (row.numberAttributes().getIsBlocked()) {
+    if (row.getNumberAttributes().getIsBlocked()) {
       components.add(context.getText(R.string.new_call_log_secondary_blocked));
     }
-    if (row.numberAttributes().getIsSpam()) {
+    if (Spam.shouldShowAsSpam(row.getNumberAttributes().getIsSpam(), row.getCallType())) {
       components.add(context.getText(R.string.new_call_log_secondary_spam));
     }
 
@@ -155,25 +216,25 @@
     // If there's a presentation name, we showed it in the primary text and shouldn't show any name
     // or number here.
     Optional<String> presentationName =
-        PhoneNumberDisplayUtil.getNameForPresentation(context, row.numberPresentation());
+        PhoneNumberDisplayUtil.getNameForPresentation(context, row.getNumberPresentation());
     if (presentationName.isPresent()) {
       return joinSecondaryTextComponents(components);
     }
 
-    if (TextUtils.isEmpty(row.numberAttributes().getName())) {
+    if (TextUtils.isEmpty(row.getNumberAttributes().getName())) {
       // If the name is empty the number is shown as the primary text and there's nothing to add.
       return joinSecondaryTextComponents(components);
     }
-    if (TextUtils.isEmpty(row.formattedNumber())) {
+    if (TextUtils.isEmpty(row.getFormattedNumber())) {
       // If there's no number, don't append anything.
       return joinSecondaryTextComponents(components);
     }
-    components.add(row.formattedNumber());
+    components.add(row.getFormattedNumber());
     return joinSecondaryTextComponents(components);
   }
 
   /**
-   * Returns a value such as "Duo Video, Mobile" without the time of the call or formatted number
+   * Returns a value such as "Mobile, Duo video" without the time of the call or formatted number
    * appended.
    *
    * <p>When the secondary text is shown in call log entry list, this prefix is suffixed with the
@@ -182,19 +243,35 @@
    */
   private static CharSequence getNumberTypeLabel(Context context, CoalescedRow row) {
     StringBuilder secondaryText = new StringBuilder();
-    if ((row.features() & Calls.FEATURES_VIDEO) == Calls.FEATURES_VIDEO) {
-      // TODO(zachh): Add "Duo" prefix?
-      secondaryText.append(context.getText(R.string.new_call_log_video));
-    }
-    String numberTypeLabel = row.numberAttributes().getNumberTypeLabel();
-    if (!TextUtils.isEmpty(numberTypeLabel)) {
+
+    // The number type label comes first (e.g., "Mobile", "Work", "Home", etc).
+    String numberTypeLabel = row.getNumberAttributes().getNumberTypeLabel();
+    secondaryText.append(numberTypeLabel);
+
+    // Add video call info if applicable.
+    if ((row.getFeatures() & Calls.FEATURES_VIDEO) == Calls.FEATURES_VIDEO) {
       if (secondaryText.length() > 0) {
         secondaryText.append(", ");
       }
-      secondaryText.append(numberTypeLabel);
-    } else if (!row.numberAttributes().getIsSpam()) {
-      // Don't show the location if there's a number type label or the number is spam.
-      String location = row.geocodedLocation();
+
+      boolean isDuoCall =
+          DuoComponent.get(context).getDuo().isDuoAccount(row.getPhoneAccountComponentName());
+      secondaryText.append(
+          context.getText(
+              isDuoCall ? R.string.new_call_log_duo_video : R.string.new_call_log_carrier_video));
+    }
+
+    // Show the location if
+    // (1) there is no number type label, and
+    // (2) the call should not be shown as spam.
+    if (TextUtils.isEmpty(numberTypeLabel)
+        && !Spam.shouldShowAsSpam(row.getNumberAttributes().getIsSpam(), row.getCallType())) {
+      // If number attributes contain a location (obtained from a PhoneLookup), use it instead
+      // of the one from the annotated call log.
+      String location =
+          !TextUtils.isEmpty(row.getNumberAttributes().getGeolocation())
+              ? row.getNumberAttributes().getGeolocation()
+              : row.getGeocodedLocation();
       if (!TextUtils.isEmpty(location)) {
         if (secondaryText.length() > 0) {
           secondaryText.append(", ");
@@ -202,6 +279,7 @@
         secondaryText.append(location);
       }
     }
+
     return secondaryText;
   }
 
diff --git a/java/com/android/dialer/calllogutils/CallLogIntents.java b/java/com/android/dialer/calllogutils/CallLogIntents.java
deleted file mode 100644
index 64fb33d..0000000
--- a/java/com/android/dialer/calllogutils/CallLogIntents.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.dialer.calllogutils;
-
-import android.content.Context;
-import android.content.Intent;
-import android.provider.CallLog.Calls;
-import android.support.annotation.Nullable;
-import com.android.dialer.callintent.CallInitiationType;
-import com.android.dialer.callintent.CallIntentBuilder;
-import com.android.dialer.calllog.model.CoalescedRow;
-import com.android.dialer.phonenumberutil.PhoneNumberHelper;
-import com.android.dialer.precall.PreCall;
-import com.android.dialer.telecom.TelecomUtil;
-
-/** Provides intents related to call log entries. */
-public final class CallLogIntents {
-
-  /**
-   * Returns an intent which can be used to call back for the provided row.
-   *
-   * <p>If the call was a video call, a video call will be placed, and if the call was an audio
-   * call, an audio call will be placed.
-   *
-   * @return null if the provided {@code row} doesn't have a number
-   */
-  @Nullable
-  public static Intent getCallBackIntent(Context context, CoalescedRow row) {
-    String normalizedNumber = row.number().getNormalizedNumber();
-    if (!PhoneNumberHelper.canPlaceCallsTo(normalizedNumber, row.numberPresentation())) {
-      return null;
-    }
-
-    // TODO(zachh): More granular logging?
-    return PreCall.getIntent(
-        context,
-        new CallIntentBuilder(normalizedNumber, CallInitiationType.Type.CALL_LOG)
-            .setPhoneAccountHandle(
-                TelecomUtil.composePhoneAccountHandle(
-                    row.phoneAccountComponentName(), row.phoneAccountId()))
-            .setIsVideoCall((row.features() & Calls.FEATURES_VIDEO) == Calls.FEATURES_VIDEO));
-  }
-}
diff --git a/java/com/android/dialer/calllogutils/CallLogRowActions.java b/java/com/android/dialer/calllogutils/CallLogRowActions.java
new file mode 100644
index 0000000..65f3c5f
--- /dev/null
+++ b/java/com/android/dialer/calllogutils/CallLogRowActions.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.dialer.calllogutils;
+
+import android.app.Activity;
+import android.provider.CallLog.Calls;
+import com.android.dialer.callintent.CallInitiationType;
+import com.android.dialer.callintent.CallIntentBuilder;
+import com.android.dialer.calllog.model.CoalescedRow;
+import com.android.dialer.duo.DuoComponent;
+import com.android.dialer.precall.PreCall;
+
+/** Actions which can be performed on a call log row. */
+public final class CallLogRowActions {
+
+  /**
+   * Places a call to the number in the provided {@link CoalescedRow}.
+   *
+   * <p>If the call was a video call, a video call will be placed, and if the call was an audio
+   * call, an audio call will be placed. The phone account corresponding to the row is used.
+   */
+  public static void startCallForRow(Activity activity, CoalescedRow row) {
+    // TODO(zachh): More granular logging?
+    PreCall.start(
+        activity,
+        new CallIntentBuilder(
+                row.getNumber().getNormalizedNumber(), CallInitiationType.Type.CALL_LOG)
+            .setIsVideoCall((row.getFeatures() & Calls.FEATURES_VIDEO) == Calls.FEATURES_VIDEO)
+            .setIsDuoCall(
+                DuoComponent.get(activity)
+                    .getDuo()
+                    .isDuoAccount(row.getPhoneAccountComponentName())));
+  }
+}
diff --git a/java/com/android/dialer/calllogutils/CallTypeHelper.java b/java/com/android/dialer/calllogutils/CallTypeHelper.java
index 6feaeb9..1bcaa31 100644
--- a/java/com/android/dialer/calllogutils/CallTypeHelper.java
+++ b/java/com/android/dialer/calllogutils/CallTypeHelper.java
@@ -17,7 +17,7 @@
 package com.android.dialer.calllogutils;
 
 import android.content.res.Resources;
-import com.android.dialer.compat.AppCompatConstants;
+import android.provider.CallLog.Calls;
 import com.android.dialer.duo.Duo;
 
 /** Helper class to perform operations related to call types. */
@@ -87,17 +87,17 @@
   }
 
   public static boolean isMissedCallType(int callType) {
-    return (callType != AppCompatConstants.CALLS_INCOMING_TYPE
-        && callType != AppCompatConstants.CALLS_OUTGOING_TYPE
-        && callType != AppCompatConstants.CALLS_VOICEMAIL_TYPE
-        && callType != AppCompatConstants.CALLS_ANSWERED_EXTERNALLY_TYPE);
+    return (callType != Calls.INCOMING_TYPE
+        && callType != Calls.OUTGOING_TYPE
+        && callType != Calls.VOICEMAIL_TYPE
+        && callType != Calls.ANSWERED_EXTERNALLY_TYPE);
   }
 
   /** Returns the text used to represent the given call type. */
   public CharSequence getCallTypeText(
       int callType, boolean isVideoCall, boolean isPulledCall, boolean isDuoCall) {
     switch (callType) {
-      case AppCompatConstants.CALLS_INCOMING_TYPE:
+      case Calls.INCOMING_TYPE:
         if (isVideoCall) {
           if (isPulledCall) {
             return incomingVideoPulledName;
@@ -115,7 +115,7 @@
           }
         }
 
-      case AppCompatConstants.CALLS_OUTGOING_TYPE:
+      case Calls.OUTGOING_TYPE:
         if (isVideoCall) {
           if (isPulledCall) {
             return outgoingVideoPulledName;
@@ -133,23 +133,23 @@
           }
         }
 
-      case AppCompatConstants.CALLS_MISSED_TYPE:
+      case Calls.MISSED_TYPE:
         if (isVideoCall) {
           return missedVideoName;
         } else {
           return missedName;
         }
 
-      case AppCompatConstants.CALLS_VOICEMAIL_TYPE:
+      case Calls.VOICEMAIL_TYPE:
         return voicemailName;
 
-      case AppCompatConstants.CALLS_REJECTED_TYPE:
+      case Calls.REJECTED_TYPE:
         return rejectedName;
 
-      case AppCompatConstants.CALLS_BLOCKED_TYPE:
+      case Calls.BLOCKED_TYPE:
         return blockedName;
 
-      case AppCompatConstants.CALLS_ANSWERED_EXTERNALLY_TYPE:
+      case Calls.ANSWERED_EXTERNALLY_TYPE:
         return answeredElsewhereName;
 
       default:
diff --git a/java/com/android/dialer/calllogutils/CallTypeIconsView.java b/java/com/android/dialer/calllogutils/CallTypeIconsView.java
index 3d2b561..19c30c5 100644
--- a/java/com/android/dialer/calllogutils/CallTypeIconsView.java
+++ b/java/com/android/dialer/calllogutils/CallTypeIconsView.java
@@ -19,15 +19,16 @@
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
 import android.graphics.Canvas;
 import android.graphics.PorterDuff;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
+import android.provider.CallLog.Calls;
 import android.support.annotation.VisibleForTesting;
 import android.util.AttributeSet;
 import android.view.View;
-import com.android.dialer.compat.AppCompatConstants;
+import com.android.dialer.theme.base.Theme;
+import com.android.dialer.theme.base.ThemeComponent;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -50,6 +51,7 @@
   private boolean showHd;
   private boolean showWifi;
   private boolean showAssistedDialed;
+  private boolean showRtt;
   private int width;
   private int height;
 
@@ -146,6 +148,15 @@
     }
   }
 
+  public void setShowRtt(boolean showRtt) {
+    this.showRtt = showRtt;
+    if (showRtt) {
+      width += resources.rttCall.getIntrinsicWidth() + resources.iconMargin;
+      height = Math.max(height, resources.rttCall.getIntrinsicHeight());
+      invalidate();
+    }
+  }
+
   public int getCount() {
     return callTypes.size();
   }
@@ -157,16 +168,16 @@
   private Drawable getCallTypeDrawable(int callType) {
     Resources resources = useLargeIcons ? largeResouces : CallTypeIconsView.resources;
     switch (callType) {
-      case AppCompatConstants.CALLS_INCOMING_TYPE:
-      case AppCompatConstants.CALLS_ANSWERED_EXTERNALLY_TYPE:
+      case Calls.INCOMING_TYPE:
+      case Calls.ANSWERED_EXTERNALLY_TYPE:
         return resources.incoming;
-      case AppCompatConstants.CALLS_OUTGOING_TYPE:
+      case Calls.OUTGOING_TYPE:
         return resources.outgoing;
-      case AppCompatConstants.CALLS_MISSED_TYPE:
+      case Calls.MISSED_TYPE:
         return resources.missed;
-      case AppCompatConstants.CALLS_VOICEMAIL_TYPE:
+      case Calls.VOICEMAIL_TYPE:
         return resources.voicemail;
-      case AppCompatConstants.CALLS_BLOCKED_TYPE:
+      case Calls.BLOCKED_TYPE:
         return resources.blocked;
       default:
         // It is possible for users to end up with calls with unknown call types in their
@@ -189,7 +200,7 @@
     // If we are using large icons, we should only show one icon (video, hd or call type) with
     // priority give to HD or Video. So we skip the call type icon if we plan to show them.
 
-    if (!useLargeIcons || !(showHd || showVideo || showWifi || showAssistedDialed)) {
+    if (!useLargeIcons || !(showHd || showVideo || showWifi || showAssistedDialed || showRtt)) {
       for (Integer callType : callTypes) {
         final Drawable drawable = getCallTypeDrawable(callType);
         final int right = left + drawable.getIntrinsicWidth();
@@ -215,6 +226,10 @@
     if (showAssistedDialed) {
       left = addDrawable(canvas, resources.assistedDialedCall, left) + resources.iconMargin;
     }
+    // If showing RTT call icon, draw it scaled appropriately.
+    if (showRtt) {
+      left = addDrawable(canvas, resources.rttCall, left) + resources.iconMargin;
+    }
   }
 
   private int addDrawable(Canvas canvas, Drawable drawable, int left) {
@@ -253,6 +268,9 @@
     // Drawable representing an assisted dialed call.
     final Drawable assistedDialedCall;
 
+    // Drawable representing a RTT call.
+    final Drawable rttCall;
+
     /** The margin to use for icons. */
     final int iconMargin;
 
@@ -272,51 +290,56 @@
       int iconId = R.drawable.quantum_ic_call_received_white_24;
       Drawable drawable = largeIcons ? r.getDrawable(iconId) : getScaledBitmap(context, iconId);
       incoming = drawable.mutate();
-      incoming.setColorFilter(r.getColor(R.color.answered_call), PorterDuff.Mode.MULTIPLY);
+      incoming.setColorFilter(r.getColor(R.color.dialer_call_green), PorterDuff.Mode.MULTIPLY);
 
       // Create a rotated instance of the call arrow for outgoing calls.
       iconId = R.drawable.quantum_ic_call_made_white_24;
       drawable = largeIcons ? r.getDrawable(iconId) : getScaledBitmap(context, iconId);
       outgoing = drawable.mutate();
-      outgoing.setColorFilter(r.getColor(R.color.answered_call), PorterDuff.Mode.MULTIPLY);
+      outgoing.setColorFilter(r.getColor(R.color.dialer_call_green), PorterDuff.Mode.MULTIPLY);
 
       // Need to make a copy of the arrow drawable, otherwise the same instance colored
       // above will be recolored here.
       iconId = R.drawable.quantum_ic_call_missed_white_24;
       drawable = largeIcons ? r.getDrawable(iconId) : getScaledBitmap(context, iconId);
       missed = drawable.mutate();
-      missed.setColorFilter(r.getColor(R.color.missed_call), PorterDuff.Mode.MULTIPLY);
+      missed.setColorFilter(r.getColor(R.color.dialer_red), PorterDuff.Mode.MULTIPLY);
 
+      Theme theme = ThemeComponent.get(context).theme();
       iconId = R.drawable.quantum_ic_voicemail_white_24;
       drawable = largeIcons ? r.getDrawable(iconId) : getScaledBitmap(context, iconId);
       voicemail = drawable.mutate();
-      voicemail.setColorFilter(r.getColor(R.color.icon_color_grey), PorterDuff.Mode.MULTIPLY);
+      voicemail.setColorFilter(theme.getColorIcon(), PorterDuff.Mode.MULTIPLY);
 
       iconId = R.drawable.quantum_ic_block_white_24;
       drawable = largeIcons ? r.getDrawable(iconId) : getScaledBitmap(context, iconId);
       blocked = drawable.mutate();
-      blocked.setColorFilter(r.getColor(R.color.blocked_call), PorterDuff.Mode.MULTIPLY);
+      blocked.setColorFilter(theme.getColorIcon(), PorterDuff.Mode.MULTIPLY);
 
-      iconId = R.drawable.quantum_ic_videocam_white_24;
+      iconId = R.drawable.quantum_ic_videocam_vd_white_24;
       drawable = largeIcons ? r.getDrawable(iconId) : getScaledBitmap(context, iconId);
       videoCall = drawable.mutate();
-      videoCall.setColorFilter(r.getColor(R.color.icon_color_grey), PorterDuff.Mode.MULTIPLY);
+      videoCall.setColorFilter(theme.getColorIcon(), PorterDuff.Mode.MULTIPLY);
 
       iconId = R.drawable.quantum_ic_hd_white_24;
       drawable = largeIcons ? r.getDrawable(iconId) : getScaledBitmap(context, iconId);
       hdCall = drawable.mutate();
-      hdCall.setColorFilter(r.getColor(R.color.icon_color_grey), PorterDuff.Mode.MULTIPLY);
+      hdCall.setColorFilter(theme.getColorIcon(), PorterDuff.Mode.MULTIPLY);
 
       iconId = R.drawable.quantum_ic_signal_wifi_4_bar_white_24;
       drawable = largeIcons ? r.getDrawable(iconId) : getScaledBitmap(context, iconId);
       wifiCall = drawable.mutate();
-      wifiCall.setColorFilter(r.getColor(R.color.icon_color_grey), PorterDuff.Mode.MULTIPLY);
+      wifiCall.setColorFilter(theme.getColorIcon(), PorterDuff.Mode.MULTIPLY);
 
       iconId = R.drawable.quantum_ic_language_white_24;
       drawable = largeIcons ? r.getDrawable(iconId) : getScaledBitmap(context, iconId);
       assistedDialedCall = drawable.mutate();
-      assistedDialedCall.setColorFilter(
-          r.getColor(R.color.icon_color_grey), PorterDuff.Mode.MULTIPLY);
+      assistedDialedCall.setColorFilter(theme.getColorIcon(), PorterDuff.Mode.MULTIPLY);
+
+      iconId = R.drawable.quantum_ic_rtt_vd_theme_24;
+      drawable = largeIcons ? r.getDrawable(iconId, null) : getScaledBitmap(context, iconId);
+      rttCall = drawable.mutate();
+      rttCall.setColorFilter(theme.getColorIcon(), PorterDuff.Mode.MULTIPLY);
 
       iconMargin = largeIcons ? 0 : r.getDimensionPixelSize(R.dimen.call_log_icon_margin);
     }
@@ -324,12 +347,20 @@
     // Gets the icon, scaled to the height of the call type icons. This helps display all the
     // icons to be the same height, while preserving their width aspect ratio.
     private Drawable getScaledBitmap(Context context, int resourceId) {
-      Bitmap icon = BitmapFactory.decodeResource(context.getResources(), resourceId);
+      Drawable drawable = context.getDrawable(resourceId);
+
       int scaledHeight = context.getResources().getDimensionPixelSize(R.dimen.call_type_icon_size);
       int scaledWidth =
-          (int) ((float) icon.getWidth() * ((float) scaledHeight / (float) icon.getHeight()));
-      Bitmap scaledIcon = Bitmap.createScaledBitmap(icon, scaledWidth, scaledHeight, false);
-      return new BitmapDrawable(context.getResources(), scaledIcon);
+          (int)
+              ((float) drawable.getIntrinsicWidth()
+                  * ((float) scaledHeight / (float) drawable.getIntrinsicHeight()));
+
+      Bitmap icon = Bitmap.createBitmap(scaledWidth, scaledHeight, Bitmap.Config.ARGB_8888);
+      Canvas canvas = new Canvas(icon);
+      drawable.setBounds(0, 0, canvas.getWidth(), canvas.getHeight());
+      drawable.draw(canvas);
+
+      return new BitmapDrawable(context.getResources(), icon);
     }
   }
 }
diff --git a/java/com/android/dialer/calllogutils/CallbackActionHelper.java b/java/com/android/dialer/calllogutils/CallbackActionHelper.java
index 1e219f1..838bc4f 100644
--- a/java/com/android/dialer/calllogutils/CallbackActionHelper.java
+++ b/java/com/android/dialer/calllogutils/CallbackActionHelper.java
@@ -16,10 +16,11 @@
 
 package com.android.dialer.calllogutils;
 
+import android.content.Context;
 import android.provider.CallLog.Calls;
 import android.support.annotation.IntDef;
 import android.text.TextUtils;
-import com.android.dialer.duo.DuoConstants;
+import com.android.dialer.duo.DuoComponent;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
@@ -46,8 +47,8 @@
    * @return One of the values in {@link CallbackAction}
    */
   public static @CallbackAction int getCallbackAction(
-      String number, int features, String phoneAccountComponentName) {
-    return getCallbackAction(number, features, isDuoCall(phoneAccountComponentName));
+      Context context, String number, int features, String phoneAccountComponentName) {
+    return getCallbackAction(number, features, isDuoCall(context, phoneAccountComponentName));
   }
 
   /**
@@ -75,9 +76,7 @@
     return CallbackAction.VOICE;
   }
 
-  private static boolean isDuoCall(String phoneAccountComponentName) {
-    return DuoConstants.PHONE_ACCOUNT_COMPONENT_NAME
-        .flattenToString()
-        .equals(phoneAccountComponentName);
+  private static boolean isDuoCall(Context context, String phoneAccountComponentName) {
+    return DuoComponent.get(context).getDuo().isDuoAccount(phoneAccountComponentName);
   }
 }
diff --git a/java/com/android/dialer/calllogutils/NumberAttributesBuilder.java b/java/com/android/dialer/calllogutils/NumberAttributesBuilder.java
new file mode 100644
index 0000000..015d59f
--- /dev/null
+++ b/java/com/android/dialer/calllogutils/NumberAttributesBuilder.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.dialer.calllogutils;
+
+import android.text.TextUtils;
+import com.android.dialer.NumberAttributes;
+import com.android.dialer.phonelookup.PhoneLookupInfo;
+import com.android.dialer.phonelookup.consolidator.PhoneLookupInfoConsolidator;
+
+/** Builds {@link NumberAttributes} from other data types. */
+public final class NumberAttributesBuilder {
+
+  /** Returns a {@link NumberAttributes.Builder} with info from {@link PhoneLookupInfo}. */
+  public static NumberAttributes.Builder fromPhoneLookupInfo(PhoneLookupInfo phoneLookupInfo) {
+    PhoneLookupInfoConsolidator phoneLookupInfoConsolidator =
+        new PhoneLookupInfoConsolidator(phoneLookupInfo);
+    return NumberAttributes.newBuilder()
+        .setName(phoneLookupInfoConsolidator.getName())
+        .setPhotoUri(
+            !TextUtils.isEmpty(phoneLookupInfoConsolidator.getPhotoThumbnailUri())
+                ? phoneLookupInfoConsolidator.getPhotoThumbnailUri()
+                : phoneLookupInfoConsolidator.getPhotoUri())
+        .setPhotoId(phoneLookupInfoConsolidator.getPhotoId())
+        .setLookupUri(phoneLookupInfoConsolidator.getLookupUri())
+        .setNumberTypeLabel(phoneLookupInfoConsolidator.getNumberLabel())
+        .setIsBusiness(phoneLookupInfoConsolidator.isBusiness())
+        .setIsBlocked(phoneLookupInfoConsolidator.isBlocked())
+        .setIsSpam(phoneLookupInfoConsolidator.isSpam())
+        .setCanReportAsInvalidNumber(phoneLookupInfoConsolidator.canReportAsInvalidNumber())
+        .setIsCp2InfoIncomplete(phoneLookupInfoConsolidator.isDefaultCp2InfoIncomplete())
+        .setContactSource(phoneLookupInfoConsolidator.getContactSource())
+        .setCanSupportCarrierVideoCall(phoneLookupInfoConsolidator.canSupportCarrierVideoCall())
+        .setGeolocation(phoneLookupInfoConsolidator.getGeolocation())
+        .setIsEmergencyNumber(phoneLookupInfoConsolidator.isEmergencyNumber());
+  }
+}
diff --git a/java/com/android/dialer/calllogutils/NumberAttributesConverter.java b/java/com/android/dialer/calllogutils/NumberAttributesConverter.java
deleted file mode 100644
index a9376bb..0000000
--- a/java/com/android/dialer/calllogutils/NumberAttributesConverter.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.dialer.calllogutils;
-
-import android.text.TextUtils;
-import com.android.dialer.NumberAttributes;
-import com.android.dialer.glidephotomanager.PhotoInfo;
-import com.android.dialer.phonelookup.PhoneLookupInfo;
-import com.android.dialer.phonelookup.consolidator.PhoneLookupInfoConsolidator;
-
-/** Converts {@link NumberAttributes} to {@link PhotoInfo} */
-public final class NumberAttributesConverter {
-
-  /** Converts {@link NumberAttributes} to {@link PhotoInfo.Builder} */
-  public static PhotoInfo.Builder toPhotoInfoBuilder(NumberAttributes numberAttributes) {
-    return PhotoInfo.builder()
-        .setName(numberAttributes.getName())
-        .setPhotoUri(numberAttributes.getPhotoUri())
-        .setPhotoId(numberAttributes.getPhotoId())
-        .setLookupUri(numberAttributes.getLookupUri())
-        .setIsBusiness(numberAttributes.getIsBusiness())
-        .setIsSpam(numberAttributes.getIsSpam())
-        .setIsVoicemail(numberAttributes.getIsVoicemail())
-        .setIsBlocked(numberAttributes.getIsBlocked());
-  }
-
-  /** Converts {@link PhoneLookupInfo} to {@link NumberAttributes.Builder} */
-  public static NumberAttributes.Builder fromPhoneLookupInfo(PhoneLookupInfo phoneLookupInfo) {
-    PhoneLookupInfoConsolidator phoneLookupInfoConsolidator =
-        new PhoneLookupInfoConsolidator(phoneLookupInfo);
-    return NumberAttributes.newBuilder()
-        .setName(phoneLookupInfoConsolidator.getName())
-        .setPhotoUri(
-            !TextUtils.isEmpty(phoneLookupInfoConsolidator.getPhotoThumbnailUri())
-                ? phoneLookupInfoConsolidator.getPhotoThumbnailUri()
-                : phoneLookupInfoConsolidator.getPhotoUri())
-        .setPhotoId(phoneLookupInfoConsolidator.getPhotoId())
-        .setLookupUri(phoneLookupInfoConsolidator.getLookupUri())
-        .setNumberTypeLabel(phoneLookupInfoConsolidator.getNumberLabel())
-        .setIsBusiness(phoneLookupInfoConsolidator.isBusiness())
-        .setIsVoicemail(phoneLookupInfoConsolidator.isVoicemail())
-        .setIsBlocked(phoneLookupInfoConsolidator.isBlocked())
-        .setIsSpam(phoneLookupInfoConsolidator.isSpam())
-        .setCanReportAsInvalidNumber(phoneLookupInfoConsolidator.canReportAsInvalidNumber())
-        .setIsCp2InfoIncomplete(phoneLookupInfoConsolidator.isDefaultCp2InfoIncomplete())
-        .setContactSource(phoneLookupInfoConsolidator.getContactSource());
-  }
-}
diff --git a/java/com/android/dialer/calllogutils/PhoneCallDetails.java b/java/com/android/dialer/calllogutils/PhoneCallDetails.java
index fe8bfde..7212fa9 100644
--- a/java/com/android/dialer/calllogutils/PhoneCallDetails.java
+++ b/java/com/android/dialer/calllogutils/PhoneCallDetails.java
@@ -25,8 +25,8 @@
 import android.telecom.PhoneAccountHandle;
 import android.text.TextUtils;
 import com.android.contacts.common.ContactsUtils.UserType;
-import com.android.contacts.common.preference.ContactsPreferences;
 import com.android.contacts.common.util.ContactDisplayUtils;
+import com.android.dialer.contacts.displaypreference.ContactDisplayPreferences.DisplayOrder;
 import com.android.dialer.logging.ContactSource;
 import com.android.dialer.phonenumbercache.ContactInfo;
 
@@ -65,7 +65,7 @@
    * The user's preference on name display order, last name first or first time first. {@see
    * ContactsPreferences}
    */
-  public int nameDisplayOrder;
+  public DisplayOrder nameDisplayOrder;
   // The type of phone, e.g., {@link Phone#TYPE_HOME}, 0 if not available.
   public int numberType;
   // The custom label associated with the phone number in the contact, or the empty string.
@@ -183,8 +183,7 @@
    * @return the preferred name
    */
   public CharSequence getPreferredName() {
-    if (nameDisplayOrder == ContactsPreferences.DISPLAY_ORDER_PRIMARY
-        || TextUtils.isEmpty(nameAlternative)) {
+    if (nameDisplayOrder == DisplayOrder.PRIMARY || TextUtils.isEmpty(nameAlternative)) {
       return namePrimary;
     }
     return nameAlternative;
diff --git a/java/com/android/dialer/calllogutils/PhotoInfoBuilder.java b/java/com/android/dialer/calllogutils/PhotoInfoBuilder.java
new file mode 100644
index 0000000..2e2e4ab
--- /dev/null
+++ b/java/com/android/dialer/calllogutils/PhotoInfoBuilder.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.dialer.calllogutils;
+
+import android.content.Context;
+import android.provider.CallLog.Calls;
+import android.support.v4.os.BuildCompat;
+import com.android.dialer.NumberAttributes;
+import com.android.dialer.calllog.model.CoalescedRow;
+import com.android.dialer.glidephotomanager.PhotoInfo;
+import com.android.dialer.spam.Spam;
+import com.android.dialer.voicemail.model.VoicemailEntry;
+
+/** Builds {@link PhotoInfo} from other data types. */
+public final class PhotoInfoBuilder {
+
+  /** Returns a {@link PhotoInfo.Builder} with info from {@link CoalescedRow}. */
+  public static PhotoInfo.Builder fromCoalescedRow(Context context, CoalescedRow coalescedRow) {
+    return fromNumberAttributes(coalescedRow.getNumberAttributes())
+        .setName(CallLogEntryText.buildPrimaryText(context, coalescedRow).toString())
+        .setFormattedNumber(coalescedRow.getFormattedNumber())
+        .setIsVoicemail(coalescedRow.getIsVoicemailCall())
+        .setIsSpam(
+            Spam.shouldShowAsSpam(
+                coalescedRow.getNumberAttributes().getIsSpam(), coalescedRow.getCallType()))
+        .setIsVideo((coalescedRow.getFeatures() & Calls.FEATURES_VIDEO) == Calls.FEATURES_VIDEO)
+        .setIsRtt(
+            BuildCompat.isAtLeastP()
+                && (coalescedRow.getFeatures() & Calls.FEATURES_RTT) == Calls.FEATURES_RTT);
+  }
+
+  /** Returns a {@link PhotoInfo.Builder} with info from {@link VoicemailEntry}. */
+  public static PhotoInfo.Builder fromVoicemailEntry(VoicemailEntry voicemailEntry) {
+    return fromNumberAttributes(voicemailEntry.getNumberAttributes())
+        .setFormattedNumber(voicemailEntry.getFormattedNumber())
+        .setIsSpam(
+            Spam.shouldShowAsSpam(
+                voicemailEntry.getNumberAttributes().getIsSpam(), voicemailEntry.getCallType()));
+  }
+
+  /** Returns a {@link PhotoInfo.Builder} with info from {@link NumberAttributes}. */
+  private static PhotoInfo.Builder fromNumberAttributes(NumberAttributes numberAttributes) {
+    return PhotoInfo.newBuilder()
+        .setName(numberAttributes.getName())
+        .setPhotoUri(numberAttributes.getPhotoUri())
+        .setPhotoId(numberAttributes.getPhotoId())
+        .setLookupUri(numberAttributes.getLookupUri())
+        .setIsBusiness(numberAttributes.getIsBusiness())
+        .setIsBlocked(numberAttributes.getIsBlocked());
+  }
+}
diff --git a/java/com/android/dialer/calllogutils/res/values-af/strings.xml b/java/com/android/dialer/calllogutils/res/values-af/strings.xml
index 557532d..c4ed362 100644
--- a/java/com/android/dialer/calllogutils/res/values-af/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-af/strings.xml
@@ -1,53 +1,61 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2017 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="type_incoming" msgid="5727636795656199810">"Inkomende oproep"</string>
-    <string name="type_incoming_pulled" msgid="8434723359163965796">"Inkomende oproep is na \'n ander toestel deurgeskakel"</string>
-    <string name="type_outgoing" msgid="764896746073942963">"Uitgaande oproep"</string>
-    <string name="type_outgoing_pulled" msgid="1648517538371704193">"Uitgaande oproep is na \'n ander toestel deurgeskakel"</string>
-    <string name="type_missed" msgid="2997043831022028176">"Gemiste oproep"</string>
-    <string name="type_incoming_video" msgid="7507180294202642554">"Inkomende video-oproep"</string>
-    <string name="type_incoming_video_pulled" msgid="7879031598844023977">"Inkomende video-oproep is na \'n ander toestel deurgeskakel"</string>
-    <string name="type_outgoing_video" msgid="309370072333983910">"Uitgaande video-oproep"</string>
-    <string name="type_outgoing_video_pulled" msgid="3924450629684331345">"Uitgaande video-oproep is na \'n ander toestel deurgeskakel"</string>
-    <string name="type_missed_video" msgid="4350107016317603785">"Gemiste video-oproep"</string>
-    <string name="type_voicemail" msgid="1877524395253846684">"Stemboodskap"</string>
-    <string name="type_rejected" msgid="5632107438472996198">"Afgekeurde oproep"</string>
-    <string name="type_blocked" msgid="9177237294052244929">"Geblokkeerde oproep"</string>
-    <string name="call_details_minutes_abbreviation" msgid="7899774555556720560">"min."</string>
-    <string name="call_details_seconds_abbreviation" msgid="5893806826648947126">"s."</string>
-    <string name="a11y_call_duration_format" msgid="2905525933361674470">"<xliff:g id="MINUTES_0">%d</xliff:g> <xliff:g id="MINUTES_TRANSLATION">%s</xliff:g> <xliff:g id="SECONDS_1">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="a11y_call_duration_short_format" msgid="5908875871251062453">"<xliff:g id="SECONDS_0">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <plurals name="a11y_seconds" formatted="false" msgid="6695730844760611970">
-      <item quantity="other">sekondes</item>
-      <item quantity="one">sekonde</item>
-    </plurals>
-    <plurals name="a11y_minutes" formatted="false" msgid="6377010096698624038">
-      <item quantity="other">minute</item>
-      <item quantity="one">minuut</item>
-    </plurals>
-    <string name="type_answered_elsewhere" msgid="411958582555881640">"Oproep is op \'n ander toestel geantwoord"</string>
-    <string name="description_phone_account" msgid="4382951172691362244">"op <xliff:g id="PHONEACCOUNT">^1</xliff:g>"</string>
-    <string name="description_via_number" msgid="7682575124846343076">"via <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="description_via_number_phone_account" msgid="4345445677508018830">"op <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, via <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="voicemail_string" msgid="6029775151483803006">"Stemboodskap"</string>
-    <string name="now" msgid="2599778506439006806">"Nou"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="type_incoming">Inkomende oproep</string>
+  <string name="type_incoming_pulled">Inkomende oproep is na \'n ander toestel deurgeskakel</string>
+  <string name="type_outgoing">Uitgaande oproep</string>
+  <string name="type_outgoing_pulled">Uitgaande oproep is na \'n ander toestel deurgeskakel</string>
+  <string name="type_missed">Gemiste oproep</string>
+  <string name="type_incoming_video">Inkomende video-oproep</string>
+  <string name="type_incoming_video_pulled">Inkomende video-oproep is na \'n ander toestel deurgeskakel</string>
+  <string name="type_outgoing_video">Uitgaande video-oproep</string>
+  <string name="type_outgoing_video_pulled">Uitgaande video-oproep is na \'n ander toestel deurgeskakel</string>
+  <string name="type_missed_video">Gemiste video-oproep</string>
+  <string name="type_voicemail">Stemboodskap</string>
+  <string name="type_rejected">Afgekeurde oproep</string>
+  <string name="type_blocked">Geblokkeerde oproep</string>
+  <string name="call_details_minutes_abbreviation">min.</string>
+  <string name="call_details_seconds_abbreviation">s.</string>
+  <string name="a11y_call_duration_format">%1$d %2$s %3$d %4$s</string>
+  <string name="a11y_call_duration_short_format">%1$d %2$s</string>
+  <string name="call_duration_format_pattern">%1$s\'%2$s\' %3$s\'%4$s\'</string>
+  <string name="call_duration_short_format_pattern">%1$s\'%2$s\'</string>
+  <plurals name="a11y_seconds">
+    <item quantity="one">sekonde</item>
+    <item quantity="other">sekondes</item>
+  </plurals>
+  <plurals name="a11y_minutes">
+    <item quantity="one">minuut</item>
+    <item quantity="other">minute</item>
+  </plurals>
+  <string name="type_answered_elsewhere">Oproep is op \'n ander toestel geantwoord</string>
+  <string name="description_phone_account">op ^1</string>
+  <string name="description_via_number">via %1$s</string>
+  <string name="description_via_number_phone_account">op %1$s, via %2$s</string>
+  <string name="voicemail_string">Stemboodskap</string>
+  <string name="just_now">Sopas</string>
+  <string name="new_call_log_carrier_video">Diensverskaffervideo</string>
+  <string name="new_call_log_duo_video">Duo-video</string>
+  <string name="new_call_log_unknown">Onbekend</string>
+  <string name="new_call_log_secondary_blocked">Geblokkeer</string>
+  <string name="new_call_log_secondary_spam">Strooipos</string>
+  <plurals name="a11y_new_call_log_entry_missed_call">
+    <item quantity="one">^1 gemiste oproep van ^2</item>
+    <item quantity="other">^1 oproepe, die nuutste is ’n gemiste oproep van ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_answered_call">
+    <item quantity="one">^1 het oproep van ^2 geantwoord</item>
+    <item quantity="other">^1 oproepe, die nuutste is ’n geantwoorde oproep van ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_outgoing_call">
+    <item quantity="one">^1 uitgaande oproep aan ^2</item>
+    <item quantity="other">^1 oproepe, die nuutste is ’n uitgaande oproep aan ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_blocked_call">
+    <item quantity="one">^1 geblokkeerde oproep van ^2</item>
+    <item quantity="other">^1 oproepe, die nuutste is ’n geblokkeerde oproep van ^2</item>
+  </plurals>
+  <string name="a11y_new_call_log_entry_phone_account">op ^1,
+    via ^2</string>
+  <string name="a11y_new_call_log_entry_full_description_without_phone_account_info">^1, ^2.</string>
+  <string name="a11y_new_call_log_entry_full_description_with_phone_account_info">^1, ^2, ^3.</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-am/strings.xml b/java/com/android/dialer/calllogutils/res/values-am/strings.xml
index fec0691..1eb0be2 100644
--- a/java/com/android/dialer/calllogutils/res/values-am/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-am/strings.xml
@@ -1,53 +1,60 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2017 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="type_incoming" msgid="5727636795656199810">"ገቢ ጥሪ"</string>
-    <string name="type_incoming_pulled" msgid="8434723359163965796">"ገቢ ጥሪ ወደ ሌላ መሣሪያ ተዘዋውሯል።"</string>
-    <string name="type_outgoing" msgid="764896746073942963">"ወጪ ጥሪ"</string>
-    <string name="type_outgoing_pulled" msgid="1648517538371704193">"ወጪ ጥሪ ወደ ሌላ መሣሪያ ተዘዋውሯል"</string>
-    <string name="type_missed" msgid="2997043831022028176">"መልስ ያልተሰጠው ጥሪ"</string>
-    <string name="type_incoming_video" msgid="7507180294202642554">"ገቢ የቪዲዮ ጥሪ"</string>
-    <string name="type_incoming_video_pulled" msgid="7879031598844023977">"ገቢ የቪዲዮ ጥሪ ወደ ሌላ መሣሪያ ተዘዋውሯል"</string>
-    <string name="type_outgoing_video" msgid="309370072333983910">"ወጪ የቪዲዮ ጥሪ"</string>
-    <string name="type_outgoing_video_pulled" msgid="3924450629684331345">"ወጪ የቪዲዮ ጥሪ ወደ ሌላ መሣሪያ ተዘዋውሯል"</string>
-    <string name="type_missed_video" msgid="4350107016317603785">"ያመለጠ የቪዲዮ ጥሪ"</string>
-    <string name="type_voicemail" msgid="1877524395253846684">"የድምፅ መልዕክት"</string>
-    <string name="type_rejected" msgid="5632107438472996198">"ያልተነሳ ጥሪ"</string>
-    <string name="type_blocked" msgid="9177237294052244929">"የታገደ ጥሪ"</string>
-    <string name="call_details_minutes_abbreviation" msgid="7899774555556720560">"ደ"</string>
-    <string name="call_details_seconds_abbreviation" msgid="5893806826648947126">"ሰ"</string>
-    <string name="a11y_call_duration_format" msgid="2905525933361674470">"<xliff:g id="MINUTES_0">%d</xliff:g> <xliff:g id="MINUTES_TRANSLATION">%s</xliff:g> <xliff:g id="SECONDS_1">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="a11y_call_duration_short_format" msgid="5908875871251062453">"<xliff:g id="SECONDS_0">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <plurals name="a11y_seconds" formatted="false" msgid="6695730844760611970">
-      <item quantity="one">ሰከንዶች</item>
-      <item quantity="other">ሰከንዶች</item>
-    </plurals>
-    <plurals name="a11y_minutes" formatted="false" msgid="6377010096698624038">
-      <item quantity="one">ደቂቃዎች</item>
-      <item quantity="other">ደቂቃዎች</item>
-    </plurals>
-    <string name="type_answered_elsewhere" msgid="411958582555881640">"ጥሪው በሌላ መሣሪያ ላይ ተመልሷል"</string>
-    <string name="description_phone_account" msgid="4382951172691362244">"በ<xliff:g id="PHONEACCOUNT">^1</xliff:g> ላይ"</string>
-    <string name="description_via_number" msgid="7682575124846343076">"በ <xliff:g id="NUMBER">%1$s</xliff:g> በኩል"</string>
-    <string name="description_via_number_phone_account" msgid="4345445677508018830">"በ <xliff:g id="PHONEACCOUNT">%1$s</xliff:g> ላይ፣ በ <xliff:g id="NUMBER">%2$s</xliff:g> በኩል"</string>
-    <string name="voicemail_string" msgid="6029775151483803006">"የድምፅ መልዕክት"</string>
-    <string name="now" msgid="2599778506439006806">"አሁን"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="type_incoming">ገቢ ጥሪ</string>
+  <string name="type_incoming_pulled">ገቢ ጥሪ ወደ ሌላ መሣሪያ ተዘዋውሯል።</string>
+  <string name="type_outgoing">ወጪ ጥሪ</string>
+  <string name="type_outgoing_pulled">ወጪ ጥሪ ወደ ሌላ መሣሪያ ተዘዋውሯል</string>
+  <string name="type_missed">መልስ ያልተሰጠው ጥሪ</string>
+  <string name="type_incoming_video">ገቢ የቪዲዮ ጥሪ</string>
+  <string name="type_incoming_video_pulled">ገቢ የቪዲዮ ጥሪ ወደ ሌላ መሣሪያ ተዘዋውሯል</string>
+  <string name="type_outgoing_video">ወጪ የቪዲዮ ጥሪ</string>
+  <string name="type_outgoing_video_pulled">ወጪ የቪዲዮ ጥሪ ወደ ሌላ መሣሪያ ተዘዋውሯል</string>
+  <string name="type_missed_video">ያመለጠ የቪዲዮ ጥሪ</string>
+  <string name="type_voicemail">የድምፅ መልዕክት</string>
+  <string name="type_rejected">ያልተነሳ ጥሪ</string>
+  <string name="type_blocked">የታገደ ጥሪ</string>
+  <string name="call_details_minutes_abbreviation">ደ</string>
+  <string name="call_details_seconds_abbreviation">ሰ</string>
+  <string name="a11y_call_duration_format">%1$d %2$s %3$d %4$s</string>
+  <string name="a11y_call_duration_short_format">%1$d %2$s</string>
+  <string name="call_duration_format_pattern">%1$s \'%2$s\' %3$s \'%4$s\'</string>
+  <string name="call_duration_short_format_pattern">%1$s \'%2$s\'</string>
+  <plurals name="a11y_seconds">
+    <item quantity="one">ሰከንዶች</item>
+    <item quantity="other">ሰከንዶች</item>
+  </plurals>
+  <plurals name="a11y_minutes">
+    <item quantity="one">ደቂቃዎች</item>
+    <item quantity="other">ደቂቃዎች</item>
+  </plurals>
+  <string name="type_answered_elsewhere">ጥሪው በሌላ መሣሪያ ላይ ተመልሷል</string>
+  <string name="description_phone_account">በ^1 ላይ</string>
+  <string name="description_via_number">በ %1$s በኩል</string>
+  <string name="description_via_number_phone_account">በ %1$s ላይ፣ በ %2$s በኩል</string>
+  <string name="voicemail_string">የድምፅ መልዕክት</string>
+  <string name="just_now">ልክ አሁን</string>
+  <string name="new_call_log_carrier_video">የአገልግሎት አቅራቢ ቪዲዮ</string>
+  <string name="new_call_log_duo_video">Duo ቪዲዮ</string>
+  <string name="new_call_log_unknown">ያልታወቀ</string>
+  <string name="new_call_log_secondary_blocked">የታገደ</string>
+  <string name="new_call_log_secondary_spam">አይፈለጌ መልዕክት</string>
+  <plurals name="a11y_new_call_log_entry_missed_call">
+    <item quantity="one">^1 ጥሪዎች፣ የቅርብ ጊዜው ከ ^2 ያመለጠ ጥሪ ነው</item>
+    <item quantity="other">^1 ጥሪዎች፣ የቅርብ ጊዜ ከ^2 ያመለጠ ጥሪ ነው</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_answered_call">
+    <item quantity="one">^1 ጥሪዎች፣ የቅርብ ጊዜው ከ ^2 የተመለሰ ጥሪ ነው</item>
+    <item quantity="other">^1 ጥሪዎች፣ የቅርብ ጊዜው ከ ^2 የተመለሰ ጥሪ ነው</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_outgoing_call">
+    <item quantity="one">^1 ጥሪዎች፣ የቅርብ ጊዜው ወጪ ጥሪ ወደ ^2 ነው</item>
+    <item quantity="other">^1 ጥሪዎች፣ የቅርብ ጊዜው ወጪ ጥሪ ወደ ^2 ነው</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_blocked_call">
+    <item quantity="one">^1 ጥሪዎች፣ የቅርብ ጊዜው የታገደ ጥሪ ከ ^2 ነው</item>
+    <item quantity="other">^1 ጥሪዎች፣ የቅርብ ጊዜው የታገደ ጥሪ ከ ^2 ነው</item>
+  </plurals>
+  <string name="a11y_new_call_log_entry_phone_account">በ ^1 ላይ፣ በ ^2 በኩል</string>
+  <string name="a11y_new_call_log_entry_full_description_without_phone_account_info">^1፣ ^2።</string>
+  <string name="a11y_new_call_log_entry_full_description_with_phone_account_info">^1፣ ^2፣ ^3።</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-ar/strings.xml b/java/com/android/dialer/calllogutils/res/values-ar/strings.xml
index 101eb2c..ab2a749 100644
--- a/java/com/android/dialer/calllogutils/res/values-ar/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-ar/strings.xml
@@ -1,61 +1,85 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2017 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="type_incoming" msgid="5727636795656199810">"مكالمة واردة"</string>
-    <string name="type_incoming_pulled" msgid="8434723359163965796">"تم تحويل مكالمة واردة إلى جهاز آخر"</string>
-    <string name="type_outgoing" msgid="764896746073942963">"مكالمة صادرة"</string>
-    <string name="type_outgoing_pulled" msgid="1648517538371704193">"تم تحويل مكالمة صادرة إلى جهاز آخر"</string>
-    <string name="type_missed" msgid="2997043831022028176">"مكالمة فائتة"</string>
-    <string name="type_incoming_video" msgid="7507180294202642554">"مكالمة فيديو واردة"</string>
-    <string name="type_incoming_video_pulled" msgid="7879031598844023977">"تم تحويل مكالمة فيديو واردة إلى جهاز آخر"</string>
-    <string name="type_outgoing_video" msgid="309370072333983910">"مكالمة فيديو صادرة"</string>
-    <string name="type_outgoing_video_pulled" msgid="3924450629684331345">"تم تحويل مكالمة فيديو صادرة إلى جهاز آخر"</string>
-    <string name="type_missed_video" msgid="4350107016317603785">"مكالمة فيديو فائتة"</string>
-    <string name="type_voicemail" msgid="1877524395253846684">"البريد الصوتي"</string>
-    <string name="type_rejected" msgid="5632107438472996198">"مكالمة مرفوضة"</string>
-    <string name="type_blocked" msgid="9177237294052244929">"مكالمة محظورة"</string>
-    <string name="call_details_minutes_abbreviation" msgid="7899774555556720560">"د"</string>
-    <string name="call_details_seconds_abbreviation" msgid="5893806826648947126">"ث"</string>
-    <string name="a11y_call_duration_format" msgid="2905525933361674470">"<xliff:g id="MINUTES_0">%d</xliff:g> <xliff:g id="MINUTES_TRANSLATION">%s</xliff:g> <xliff:g id="SECONDS_1">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="a11y_call_duration_short_format" msgid="5908875871251062453">"<xliff:g id="SECONDS_0">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <plurals name="a11y_seconds" formatted="false" msgid="6695730844760611970">
-      <item quantity="zero">ثوان</item>
-      <item quantity="two">ثانيتان</item>
-      <item quantity="few">ثوان</item>
-      <item quantity="many">ثانية</item>
-      <item quantity="other">ثانية</item>
-      <item quantity="one">ثانية واحدة</item>
-    </plurals>
-    <plurals name="a11y_minutes" formatted="false" msgid="6377010096698624038">
-      <item quantity="zero">دقيقة</item>
-      <item quantity="two">دقيقتان</item>
-      <item quantity="few">دقائق</item>
-      <item quantity="many">دقيقة</item>
-      <item quantity="other">دقيقة</item>
-      <item quantity="one">دقيقة</item>
-    </plurals>
-    <string name="type_answered_elsewhere" msgid="411958582555881640">"تم الرد على المكالمة على جهاز آخر"</string>
-    <string name="description_phone_account" msgid="4382951172691362244">"من <xliff:g id="PHONEACCOUNT">^1</xliff:g>"</string>
-    <string name="description_via_number" msgid="7682575124846343076">"من خلال <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="description_via_number_phone_account" msgid="4345445677508018830">"على <xliff:g id="PHONEACCOUNT">%1$s</xliff:g> من خلال <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="voicemail_string" msgid="6029775151483803006">"البريد الصوتي"</string>
-    <string name="now" msgid="2599778506439006806">"الآن"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="type_incoming">مكالمة واردة</string>
+  <string name="type_incoming_pulled">تم تحويل مكالمة واردة إلى جهاز آخر</string>
+  <string name="type_outgoing">مكالمة صادرة</string>
+  <string name="type_outgoing_pulled">تم تحويل مكالمة صادرة إلى جهاز آخر</string>
+  <string name="type_missed">مكالمة فائتة</string>
+  <string name="type_incoming_video">مكالمة فيديو واردة</string>
+  <string name="type_incoming_video_pulled">تم تحويل مكالمة فيديو واردة إلى جهاز آخر</string>
+  <string name="type_outgoing_video">مكالمة فيديو صادرة</string>
+  <string name="type_outgoing_video_pulled">تم تحويل مكالمة فيديو صادرة إلى جهاز آخر</string>
+  <string name="type_missed_video">مكالمة فيديو فائتة</string>
+  <string name="type_voicemail">البريد الصوتي</string>
+  <string name="type_rejected">مكالمة مرفوضة</string>
+  <string name="type_blocked">مكالمة محظورة</string>
+  <string name="call_details_minutes_abbreviation">د</string>
+  <string name="call_details_seconds_abbreviation">ث</string>
+  <string name="a11y_call_duration_format">%1$d %2$s %3$d %4$s</string>
+  <string name="a11y_call_duration_short_format">%1$d %2$s</string>
+  <string name="call_duration_format_pattern">%1$s\'%2$s\' %3$s\'%4$s\'</string>
+  <string name="call_duration_short_format_pattern">%1$s\'%2$s\'</string>
+  <plurals name="a11y_seconds">
+    <item quantity="zero">ثوان</item>
+    <item quantity="one">ثانية واحدة</item>
+    <item quantity="two">ثانيتان</item>
+    <item quantity="few">ثوان</item>
+    <item quantity="many">ثانية</item>
+    <item quantity="other">ثانية</item>
+  </plurals>
+  <plurals name="a11y_minutes">
+    <item quantity="zero">دقيقة</item>
+    <item quantity="one">دقيقة</item>
+    <item quantity="two">دقيقتان</item>
+    <item quantity="few">دقائق</item>
+    <item quantity="many">دقيقة</item>
+    <item quantity="other">دقيقة</item>
+  </plurals>
+  <string name="type_answered_elsewhere">تم الرد على المكالمة على جهاز آخر</string>
+  <string name="description_phone_account">من ^1</string>
+  <string name="description_via_number">من خلال %1$s</string>
+  <string name="description_via_number_phone_account">على %1$s من خلال %2$s</string>
+  <string name="voicemail_string">البريد الصوتي</string>
+  <string name="just_now">للتو</string>
+  <string name="new_call_log_carrier_video">فيديو عن طريق مشغل شبكة الجوال</string>
+  <string name="new_call_log_duo_video">‏فيديو Duo</string>
+  <string name="new_call_log_unknown">غير معروف</string>
+  <string name="new_call_log_secondary_blocked">محظورة</string>
+  <string name="new_call_log_secondary_spam">المحتوى غير المرغوب فيه</string>
+  <plurals name="a11y_new_call_log_entry_missed_call">
+    <item quantity="zero">^1 مكالمات، الأخيرة هي مكالمة فائتة من ^2</item>
+    <item quantity="one">^1 مكالمة فائتة من ^2</item>
+    <item quantity="two">مكالمتان ^1، الأخيرة هي مكالمة فائتة من ^2</item>
+    <item quantity="few">^1 مكالمات، الأخيرة هي مكالمة فائتة من ^2</item>
+    <item quantity="many">^1 مكالمة، الأخيرة هي مكالمة فائتة من ^2</item>
+    <item quantity="other">^1 مكالمة، الأخيرة هي مكالمة فائتة من ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_answered_call">
+    <item quantity="zero">^1 مكالمات، الأخيرة هي مكالمة تم الرد عليها من قِبل ^2</item>
+    <item quantity="one">^1 مكالمة تم الرد عليها من قِبل ^2</item>
+    <item quantity="two">مكالمتان ^1، الأخيرة هي مكالمة تم الرد عليها من قِبل ^2</item>
+    <item quantity="few">^1 مكالمات، الأخيرة هي مكالمة تم الرد عليها من قِبل ^2</item>
+    <item quantity="many">^1 مكالمة، الأخيرة هي مكالمة تم الرد عليها من قِبل ^2</item>
+    <item quantity="other">^1 مكالمة، الأخيرة هي مكالمة تم الرد عليها من قِبل ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_outgoing_call">
+    <item quantity="zero">^1 مكالمات، الأخيرة هي مكالمة صادرة إلى ^2</item>
+    <item quantity="one">^1 مكالمة صادرة إلى ^2</item>
+    <item quantity="two">مكالمتان ^1، الأخيرة هي مكالمة صادرة إلى ^2</item>
+    <item quantity="few">^1 مكالمات، الأخيرة هي مكالمة صادرة إلى ^2</item>
+    <item quantity="many">^1 مكالمة، الأخيرة هي مكالمة صادرة إلى ^2</item>
+    <item quantity="other">^1 مكالمة، الأخيرة هي مكالمة صادرة إلى ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_blocked_call">
+    <item quantity="zero">^1 مكالمات، الأخيرة هي مكالمة محظورة من ^2</item>
+    <item quantity="one">^1 مكالمة محظورة من ^2</item>
+    <item quantity="two">مكالمتان ^1، الأخيرة هي مكالمة محظورة من ^2</item>
+    <item quantity="few">^1 مكالمات، الأخيرة هي مكالمة محظورة من ^2</item>
+    <item quantity="many">^1 مكالمة، الأخيرة هي مكالمة محظورة من ^2</item>
+    <item quantity="other">^1 مكالمة، الأخيرة هي مكالمة محظورة من ^2</item>
+  </plurals>
+  <string name="a11y_new_call_log_entry_phone_account">على ^1،
+    من خلال ^2</string>
+  <string name="a11y_new_call_log_entry_full_description_without_phone_account_info">^1، ^2.</string>
+  <string name="a11y_new_call_log_entry_full_description_with_phone_account_info">^1، ^2، ^3.</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-az/strings.xml b/java/com/android/dialer/calllogutils/res/values-az/strings.xml
index 938d2d6..20e1448 100644
--- a/java/com/android/dialer/calllogutils/res/values-az/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-az/strings.xml
@@ -1,53 +1,60 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2017 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="type_incoming" msgid="5727636795656199810">"Gələn zəng"</string>
-    <string name="type_incoming_pulled" msgid="8434723359163965796">"Gələn zəng başqa cihaza yönləndirildi"</string>
-    <string name="type_outgoing" msgid="764896746073942963">"Gedən zəng"</string>
-    <string name="type_outgoing_pulled" msgid="1648517538371704193">"Gedən zəng başqa cihaza yönləndirildi"</string>
-    <string name="type_missed" msgid="2997043831022028176">"Buraxılmış zəng"</string>
-    <string name="type_incoming_video" msgid="7507180294202642554">"Gələn video zəng"</string>
-    <string name="type_incoming_video_pulled" msgid="7879031598844023977">"Gələn video zəng başqa cihaza yönləndirildi"</string>
-    <string name="type_outgoing_video" msgid="309370072333983910">"Gedən video zəng"</string>
-    <string name="type_outgoing_video_pulled" msgid="3924450629684331345">"Gedən video zəng başqa cihaza yönləndirildi"</string>
-    <string name="type_missed_video" msgid="4350107016317603785">"Buraxılmış video zəng"</string>
-    <string name="type_voicemail" msgid="1877524395253846684">"Səsli e-məktub"</string>
-    <string name="type_rejected" msgid="5632107438472996198">"Rədd edilmiş zəng"</string>
-    <string name="type_blocked" msgid="9177237294052244929">"Blok edilmiş zəng"</string>
-    <string name="call_details_minutes_abbreviation" msgid="7899774555556720560">"dəq"</string>
-    <string name="call_details_seconds_abbreviation" msgid="5893806826648947126">"san"</string>
-    <string name="a11y_call_duration_format" msgid="2905525933361674470">"<xliff:g id="MINUTES_0">%d</xliff:g> <xliff:g id="MINUTES_TRANSLATION">%s</xliff:g> <xliff:g id="SECONDS_1">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="a11y_call_duration_short_format" msgid="5908875871251062453">"<xliff:g id="SECONDS_0">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <plurals name="a11y_seconds" formatted="false" msgid="6695730844760611970">
-      <item quantity="other">saniyə</item>
-      <item quantity="one">saniyə</item>
-    </plurals>
-    <plurals name="a11y_minutes" formatted="false" msgid="6377010096698624038">
-      <item quantity="other">dəqiqə</item>
-      <item quantity="one">dəqiqə</item>
-    </plurals>
-    <string name="type_answered_elsewhere" msgid="411958582555881640">"Zəngə başqa cihazda cavab verildi"</string>
-    <string name="description_phone_account" msgid="4382951172691362244">"<xliff:g id="PHONEACCOUNT">^1</xliff:g> hesabında"</string>
-    <string name="description_via_number" msgid="7682575124846343076">"<xliff:g id="NUMBER">%1$s</xliff:g> vasitəsilə"</string>
-    <string name="description_via_number_phone_account" msgid="4345445677508018830">"<xliff:g id="NUMBER">%2$s</xliff:g> vasitəsilə <xliff:g id="PHONEACCOUNT">%1$s</xliff:g> hesabında"</string>
-    <string name="voicemail_string" msgid="6029775151483803006">"Səsli e-məktub"</string>
-    <string name="now" msgid="2599778506439006806">"İndi"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="type_incoming">Gələn zəng</string>
+  <string name="type_incoming_pulled">Gələn zəng başqa cihaza yönləndirildi</string>
+  <string name="type_outgoing">Gedən zəng</string>
+  <string name="type_outgoing_pulled">Gedən zəng başqa cihaza yönləndirildi</string>
+  <string name="type_missed">Buraxılmış zəng</string>
+  <string name="type_incoming_video">Gələn video zəng</string>
+  <string name="type_incoming_video_pulled">Gələn video zəng başqa cihaza yönləndirildi</string>
+  <string name="type_outgoing_video">Gedən video zəng</string>
+  <string name="type_outgoing_video_pulled">Gedən video zəng başqa cihaza yönləndirildi</string>
+  <string name="type_missed_video">Buraxılmış video zəng</string>
+  <string name="type_voicemail">Səsli e-məktub</string>
+  <string name="type_rejected">Rədd edilmiş zəng</string>
+  <string name="type_blocked">Blok edilmiş zəng</string>
+  <string name="call_details_minutes_abbreviation">dəq</string>
+  <string name="call_details_seconds_abbreviation">san</string>
+  <string name="a11y_call_duration_format">%1$d %2$s %3$d %4$s</string>
+  <string name="a11y_call_duration_short_format">%1$d %2$s</string>
+  <string name="call_duration_format_pattern">%1$s\'%2$s\' %3$s\'%4$s\'</string>
+  <string name="call_duration_short_format_pattern">%1$s\'%2$s\'</string>
+  <plurals name="a11y_seconds">
+    <item quantity="one">saniyə</item>
+    <item quantity="other">saniyə</item>
+  </plurals>
+  <plurals name="a11y_minutes">
+    <item quantity="one">dəqiqə</item>
+    <item quantity="other">dəqiqə</item>
+  </plurals>
+  <string name="type_answered_elsewhere">Zəngə başqa cihazda cavab verildi</string>
+  <string name="description_phone_account">^1 hesabında</string>
+  <string name="description_via_number">%1$s vasitəsilə</string>
+  <string name="description_via_number_phone_account">%2$s vasitəsilə %1$s hesabında</string>
+  <string name="voicemail_string">Səsli e-məktub</string>
+  <string name="just_now">İndicə</string>
+  <string name="new_call_log_carrier_video">Operator video</string>
+  <string name="new_call_log_duo_video">Duo video</string>
+  <string name="new_call_log_unknown">Naməlum</string>
+  <string name="new_call_log_secondary_blocked">Blok edilib</string>
+  <string name="new_call_log_secondary_spam">Spam</string>
+  <plurals name="a11y_new_call_log_entry_missed_call">
+    <item quantity="one">^1 buraxılmış zəng: ^2</item>
+    <item quantity="other">Sonuncu, ^2 adlı istifadəçidən buraxılmış zəng olmaqla, ^1 zəng</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_answered_call">
+    <item quantity="one">^2 tərəfindən ^1 cavab verilmiş zəng</item>
+    <item quantity="other">Sonuncu, ^2 tərəfindən cavab verilmiş zəng olmaqla, ^1 zəng</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_outgoing_call">
+    <item quantity="one">^1 ^2 adlı istifadəçiyə gedən zəng</item>
+    <item quantity="other">Sonuncu, ^2 adlı istifadəçiyə gedən zəng olmaqla, ^1 zəng</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_blocked_call">
+    <item quantity="one">^2 tərəfindən ^1 blok edilmiş zəng</item>
+    <item quantity="other">Sonuncu, ^2 tərəfindən blok edilmiş zəng olmaqla, ^1 zəng</item>
+  </plurals>
+  <string name="a11y_new_call_log_entry_phone_account">^2 vasitəsilə ^1 hesabında</string>
+  <string name="a11y_new_call_log_entry_full_description_without_phone_account_info">^1, ^2.</string>
+  <string name="a11y_new_call_log_entry_full_description_with_phone_account_info">^1, ^2, ^3.</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-b+sr+Latn/strings.xml b/java/com/android/dialer/calllogutils/res/values-b+sr+Latn/strings.xml
index 0bf6a62..3e451b6 100644
--- a/java/com/android/dialer/calllogutils/res/values-b+sr+Latn/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-b+sr+Latn/strings.xml
@@ -1,55 +1,67 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2017 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="type_incoming" msgid="5727636795656199810">"Dolazni poziv"</string>
-    <string name="type_incoming_pulled" msgid="8434723359163965796">"Dolazni poziv je prenet na drugi uređaj"</string>
-    <string name="type_outgoing" msgid="764896746073942963">"Odlazni poziv"</string>
-    <string name="type_outgoing_pulled" msgid="1648517538371704193">"Odlazni poziv je prenet na drugi uređaj"</string>
-    <string name="type_missed" msgid="2997043831022028176">"Propušten poziv"</string>
-    <string name="type_incoming_video" msgid="7507180294202642554">"Dolazni video poziv"</string>
-    <string name="type_incoming_video_pulled" msgid="7879031598844023977">"Dolazni video poziv je prenet na drugi uređaj"</string>
-    <string name="type_outgoing_video" msgid="309370072333983910">"Odlazni video poziv"</string>
-    <string name="type_outgoing_video_pulled" msgid="3924450629684331345">"Odlazni video poziv je prenet na drugi uređaj"</string>
-    <string name="type_missed_video" msgid="4350107016317603785">"Propušten video poziv"</string>
-    <string name="type_voicemail" msgid="1877524395253846684">"Govorna pošta"</string>
-    <string name="type_rejected" msgid="5632107438472996198">"Odbijen poziv"</string>
-    <string name="type_blocked" msgid="9177237294052244929">"Blokiran poziv"</string>
-    <string name="call_details_minutes_abbreviation" msgid="7899774555556720560">"min"</string>
-    <string name="call_details_seconds_abbreviation" msgid="5893806826648947126">"sek"</string>
-    <string name="a11y_call_duration_format" msgid="2905525933361674470">"<xliff:g id="MINUTES_0">%d</xliff:g> <xliff:g id="MINUTES_TRANSLATION">%s</xliff:g> <xliff:g id="SECONDS_1">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="a11y_call_duration_short_format" msgid="5908875871251062453">"<xliff:g id="SECONDS_0">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <plurals name="a11y_seconds" formatted="false" msgid="6695730844760611970">
-      <item quantity="one">sekunda</item>
-      <item quantity="few">sekunde</item>
-      <item quantity="other">sekundi</item>
-    </plurals>
-    <plurals name="a11y_minutes" formatted="false" msgid="6377010096698624038">
-      <item quantity="one">minut</item>
-      <item quantity="few">minuta</item>
-      <item quantity="other">minuta</item>
-    </plurals>
-    <string name="type_answered_elsewhere" msgid="411958582555881640">"Poziv je prihvaćen na drugom uređaju"</string>
-    <string name="description_phone_account" msgid="4382951172691362244">"na <xliff:g id="PHONEACCOUNT">^1</xliff:g>"</string>
-    <string name="description_via_number" msgid="7682575124846343076">"preko <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="description_via_number_phone_account" msgid="4345445677508018830">"na <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, preko <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="voicemail_string" msgid="6029775151483803006">"Govorna pošta"</string>
-    <string name="now" msgid="2599778506439006806">"Sada"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="type_incoming">Dolazni poziv</string>
+  <string name="type_incoming_pulled">Dolazni poziv je prenet na drugi uređaj</string>
+  <string name="type_outgoing">Odlazni poziv</string>
+  <string name="type_outgoing_pulled">Odlazni poziv je prenet na drugi uređaj</string>
+  <string name="type_missed">Propušten poziv</string>
+  <string name="type_incoming_video">Dolazni video poziv</string>
+  <string name="type_incoming_video_pulled">Dolazni video poziv je prenet na drugi uređaj</string>
+  <string name="type_outgoing_video">Odlazni video poziv</string>
+  <string name="type_outgoing_video_pulled">Odlazni video poziv je prenet na drugi uređaj</string>
+  <string name="type_missed_video">Propušten video poziv</string>
+  <string name="type_voicemail">Govorna pošta</string>
+  <string name="type_rejected">Odbijen poziv</string>
+  <string name="type_blocked">Blokiran poziv</string>
+  <string name="call_details_minutes_abbreviation">min</string>
+  <string name="call_details_seconds_abbreviation">sek</string>
+  <string name="a11y_call_duration_format">%1$d %2$s %3$d %4$s</string>
+  <string name="a11y_call_duration_short_format">%1$d %2$s</string>
+  <string name="call_duration_format_pattern">%1$s \'%2$s\' %3$s \'%4$s\'</string>
+  <string name="call_duration_short_format_pattern">%1$s \'%2$s\'</string>
+  <plurals name="a11y_seconds">
+    <item quantity="one">sekunda</item>
+    <item quantity="few">sekunde</item>
+    <item quantity="other">sekundi</item>
+  </plurals>
+  <plurals name="a11y_minutes">
+    <item quantity="one">minut</item>
+    <item quantity="few">minuta</item>
+    <item quantity="other">minuta</item>
+  </plurals>
+  <string name="type_answered_elsewhere">Poziv je prihvaćen na drugom uređaju</string>
+  <string name="description_phone_account">na ^1</string>
+  <string name="description_via_number">preko %1$s</string>
+  <string name="description_via_number_phone_account">na %1$s, preko %2$s</string>
+  <string name="voicemail_string">Govorna pošta</string>
+  <string name="just_now">Malopre</string>
+  <string name="new_call_log_carrier_video">Video poziv preko operatera</string>
+  <string name="new_call_log_duo_video">Duo video poziv</string>
+  <string name="new_call_log_unknown">Nepoznati brojevi</string>
+  <string name="new_call_log_secondary_blocked">Blokirani</string>
+  <string name="new_call_log_secondary_spam">Nepoželjno</string>
+  <plurals name="a11y_new_call_log_entry_missed_call">
+    <item quantity="one">^1 poziv, poslednji je propušteni poziv od: ^2</item>
+    <item quantity="few">^1 poziva, poslednji je propušteni poziv od: ^2</item>
+    <item quantity="other">^1 poziva, poslednji je propušteni poziv od: ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_answered_call">
+    <item quantity="one">^1 poziv, poslednji je prihvaćeni poziv od: ^2</item>
+    <item quantity="few">^1 poziva, poslednji je prihvaćeni poziv od: ^2</item>
+    <item quantity="other">^1 poziva, poslednji je prihvaćeni poziv od: ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_outgoing_call">
+    <item quantity="one">^1 poziv, poslednji je odlazni poziv za: ^2</item>
+    <item quantity="few">^1 poziva, poslednji je odlazni poziv za: ^2</item>
+    <item quantity="other">^1 poziva, poslednji je odlazni poziv za: ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_blocked_call">
+    <item quantity="one">^1 poziv, poslednji je blokirani poziv od: ^2</item>
+    <item quantity="few">^1 poziva, poslednji je blokirani poziv od: ^2</item>
+    <item quantity="other">^1 poziva, poslednji je blokirani poziv od: ^2</item>
+  </plurals>
+  <string name="a11y_new_call_log_entry_phone_account">na ^1,
+    preko ^2</string>
+  <string name="a11y_new_call_log_entry_full_description_without_phone_account_info">^1, ^2.</string>
+  <string name="a11y_new_call_log_entry_full_description_with_phone_account_info">^1, ^2, ^3.</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-be/strings.xml b/java/com/android/dialer/calllogutils/res/values-be/strings.xml
index d7b74ab..4c77043 100644
--- a/java/com/android/dialer/calllogutils/res/values-be/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-be/strings.xml
@@ -1,57 +1,73 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2017 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="type_incoming" msgid="5727636795656199810">"Уваходны выклік"</string>
-    <string name="type_incoming_pulled" msgid="8434723359163965796">"Уваходны выклік пераведзены на іншую прыладу"</string>
-    <string name="type_outgoing" msgid="764896746073942963">"Выходны выклік"</string>
-    <string name="type_outgoing_pulled" msgid="1648517538371704193">"Выходны выклік пераведзены на іншую прыладу"</string>
-    <string name="type_missed" msgid="2997043831022028176">"Прапушчаны выклік"</string>
-    <string name="type_incoming_video" msgid="7507180294202642554">"Уваходны відэавыклік"</string>
-    <string name="type_incoming_video_pulled" msgid="7879031598844023977">"Уваходны відэавыклік пераведзены на іншую прыладу"</string>
-    <string name="type_outgoing_video" msgid="309370072333983910">"Выходны відэавыклік"</string>
-    <string name="type_outgoing_video_pulled" msgid="3924450629684331345">"Выходны відэавыклік пераведзены на іншую прыладу"</string>
-    <string name="type_missed_video" msgid="4350107016317603785">"Прапушчаны відэавыклік"</string>
-    <string name="type_voicemail" msgid="1877524395253846684">"Галасавая пошта"</string>
-    <string name="type_rejected" msgid="5632107438472996198">"Адхілены выклік"</string>
-    <string name="type_blocked" msgid="9177237294052244929">"Заблакіраваны выклік"</string>
-    <string name="call_details_minutes_abbreviation" msgid="7899774555556720560">"хв"</string>
-    <string name="call_details_seconds_abbreviation" msgid="5893806826648947126">"с"</string>
-    <string name="a11y_call_duration_format" msgid="2905525933361674470">"<xliff:g id="MINUTES_0">%d</xliff:g> <xliff:g id="MINUTES_TRANSLATION">%s</xliff:g> <xliff:g id="SECONDS_1">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="a11y_call_duration_short_format" msgid="5908875871251062453">"<xliff:g id="SECONDS_0">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <plurals name="a11y_seconds" formatted="false" msgid="6695730844760611970">
-      <item quantity="one">секунда</item>
-      <item quantity="few">секунды</item>
-      <item quantity="many">секунд</item>
-      <item quantity="other">секунды</item>
-    </plurals>
-    <plurals name="a11y_minutes" formatted="false" msgid="6377010096698624038">
-      <item quantity="one">хвіліна</item>
-      <item quantity="few">хвіліны</item>
-      <item quantity="many">хвілін</item>
-      <item quantity="other">хвіліны</item>
-    </plurals>
-    <string name="type_answered_elsewhere" msgid="411958582555881640">"Выклік прыняты на іншай прыладзе"</string>
-    <string name="description_phone_account" msgid="4382951172691362244">"на <xliff:g id="PHONEACCOUNT">^1</xliff:g>"</string>
-    <string name="description_via_number" msgid="7682575124846343076">"праз <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="description_via_number_phone_account" msgid="4345445677508018830">"на <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, праз <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="voicemail_string" msgid="6029775151483803006">"Галасавая пошта"</string>
-    <string name="now" msgid="2599778506439006806">"Зараз"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="type_incoming">Уваходны выклік</string>
+  <string name="type_incoming_pulled">Уваходны выклік пераведзены на іншую прыладу</string>
+  <string name="type_outgoing">Выходны выклік</string>
+  <string name="type_outgoing_pulled">Выходны выклік пераведзены на іншую прыладу</string>
+  <string name="type_missed">Прапушчаны выклік</string>
+  <string name="type_incoming_video">Уваходны відэавыклік</string>
+  <string name="type_incoming_video_pulled">Уваходны відэавыклік пераведзены на іншую прыладу</string>
+  <string name="type_outgoing_video">Выходны відэавыклік</string>
+  <string name="type_outgoing_video_pulled">Выходны відэавыклік пераведзены на іншую прыладу</string>
+  <string name="type_missed_video">Прапушчаны відэавыклік</string>
+  <string name="type_voicemail">Галасавая пошта</string>
+  <string name="type_rejected">Адхілены выклік</string>
+  <string name="type_blocked">Заблакіраваны выклік</string>
+  <string name="call_details_minutes_abbreviation">хв</string>
+  <string name="call_details_seconds_abbreviation">с</string>
+  <string name="a11y_call_duration_format">%1$d %2$s %3$d %4$s</string>
+  <string name="a11y_call_duration_short_format">%1$d %2$s</string>
+  <string name="call_duration_format_pattern">%1$s\'%2$s\' %3$s\'%4$s\'</string>
+  <string name="call_duration_short_format_pattern">%1$s\'%2$s\'</string>
+  <plurals name="a11y_seconds">
+    <item quantity="one">секунда</item>
+    <item quantity="few">секунды</item>
+    <item quantity="many">секунд</item>
+    <item quantity="other">секунды</item>
+  </plurals>
+  <plurals name="a11y_minutes">
+    <item quantity="one">хвіліна</item>
+    <item quantity="few">хвіліны</item>
+    <item quantity="many">хвілін</item>
+    <item quantity="other">хвіліны</item>
+  </plurals>
+  <string name="type_answered_elsewhere">Выклік прыняты на іншай прыладзе</string>
+  <string name="description_phone_account">на ^1</string>
+  <string name="description_via_number">праз %1$s</string>
+  <string name="description_via_number_phone_account">на %1$s, праз %2$s</string>
+  <string name="voicemail_string">Галасавая пошта</string>
+  <string name="just_now">Зараз</string>
+  <string name="new_call_log_carrier_video">Відэавыклік праз аператара</string>
+  <string name="new_call_log_duo_video">Відэавыклік Duo</string>
+  <string name="new_call_log_unknown">Невядома</string>
+  <string name="new_call_log_secondary_blocked">Заблакіравана</string>
+  <string name="new_call_log_secondary_spam">Спам</string>
+  <plurals name="a11y_new_call_log_entry_missed_call">
+    <item quantity="one">^1 выклік, апошні – прапушчаны выклік ад абанента ^2</item>
+    <item quantity="few">^1 выклікі, апошні – прапушчаны выклік ад абанента ^2</item>
+    <item quantity="many">^1 выклікаў, апошні – прапушчаны выклік ад абанента ^2</item>
+    <item quantity="other">^1 выкліку, апошні – прапушчаны выклік ад абанента ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_answered_call">
+    <item quantity="one">^1 выклік, апошні – прыняты выклік ад абанента ^2</item>
+    <item quantity="few">^1 выклікі, апошні – прыняты выклік ад абанента ^2</item>
+    <item quantity="many">^1 выклікаў, апошні – прыняты выклік ад абанента ^2</item>
+    <item quantity="other">^1 выкліку, апошні – прыняты выклік ад абанента ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_outgoing_call">
+    <item quantity="one">^1 выклік, апошні – выходны выклік абаненту ^2</item>
+    <item quantity="few">^1 выклікі, апошні – выходны выклік абаненту ^2</item>
+    <item quantity="many">^1 выклікаў, апошні – выходны выклік абаненту ^2</item>
+    <item quantity="other">^1 выкліку, апошні – выходны выклік абаненту ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_blocked_call">
+    <item quantity="one">^1 выклік, апошні – заблакіраваны выклік ад абанента ^2</item>
+    <item quantity="few">^1 выклікі, апошні – заблакіраваны выклік ад абанента ^2</item>
+    <item quantity="many">^1 выклікаў, апошні – заблакіраваны выклік ад абанента ^2</item>
+    <item quantity="other">^1 выкліку, апошні – заблакіраваны выклік ад абанента ^2</item>
+  </plurals>
+  <string name="a11y_new_call_log_entry_phone_account">^1,
+    нумар ^2</string>
+  <string name="a11y_new_call_log_entry_full_description_without_phone_account_info">^1, ^2.</string>
+  <string name="a11y_new_call_log_entry_full_description_with_phone_account_info">^1, ^2, ^3.</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-bg/strings.xml b/java/com/android/dialer/calllogutils/res/values-bg/strings.xml
index cb1dc72..e1e363c 100644
--- a/java/com/android/dialer/calllogutils/res/values-bg/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-bg/strings.xml
@@ -1,53 +1,60 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2017 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="type_incoming" msgid="5727636795656199810">"Входящо обаждане"</string>
-    <string name="type_incoming_pulled" msgid="8434723359163965796">"Входящото обаждане бе прехвърлено към друго устройство"</string>
-    <string name="type_outgoing" msgid="764896746073942963">"Изходящо обаждане"</string>
-    <string name="type_outgoing_pulled" msgid="1648517538371704193">"Изходящото обаждане бе прехвърлено към друго устройство"</string>
-    <string name="type_missed" msgid="2997043831022028176">"Пропуснато обаждане"</string>
-    <string name="type_incoming_video" msgid="7507180294202642554">"Входящо видеообаждане"</string>
-    <string name="type_incoming_video_pulled" msgid="7879031598844023977">"Входящото видеообаждане бе прехвърлено към друго устройство"</string>
-    <string name="type_outgoing_video" msgid="309370072333983910">"Изходящо видеообаждане"</string>
-    <string name="type_outgoing_video_pulled" msgid="3924450629684331345">"Изходящото видеообаждане бе прехвърлено към друго устройство"</string>
-    <string name="type_missed_video" msgid="4350107016317603785">"Пропуснато видеообаждане"</string>
-    <string name="type_voicemail" msgid="1877524395253846684">"Гласова поща"</string>
-    <string name="type_rejected" msgid="5632107438472996198">"Отхвърлено обаждане"</string>
-    <string name="type_blocked" msgid="9177237294052244929">"Блокирано обаждане"</string>
-    <string name="call_details_minutes_abbreviation" msgid="7899774555556720560">"мин"</string>
-    <string name="call_details_seconds_abbreviation" msgid="5893806826648947126">"сек"</string>
-    <string name="a11y_call_duration_format" msgid="2905525933361674470">"<xliff:g id="MINUTES_0">%d</xliff:g> <xliff:g id="MINUTES_TRANSLATION">%s</xliff:g> <xliff:g id="SECONDS_1">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="a11y_call_duration_short_format" msgid="5908875871251062453">"<xliff:g id="SECONDS_0">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <plurals name="a11y_seconds" formatted="false" msgid="6695730844760611970">
-      <item quantity="other">секунди</item>
-      <item quantity="one">секунда</item>
-    </plurals>
-    <plurals name="a11y_minutes" formatted="false" msgid="6377010096698624038">
-      <item quantity="other">минути</item>
-      <item quantity="one">минута</item>
-    </plurals>
-    <string name="type_answered_elsewhere" msgid="411958582555881640">"На обаждането бе отговорено на друго устройство"</string>
-    <string name="description_phone_account" msgid="4382951172691362244">"в/ъв <xliff:g id="PHONEACCOUNT">^1</xliff:g>"</string>
-    <string name="description_via_number" msgid="7682575124846343076">"през <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="description_via_number_phone_account" msgid="4345445677508018830">"в/ъв <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, през <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="voicemail_string" msgid="6029775151483803006">"Гласова поща"</string>
-    <string name="now" msgid="2599778506439006806">"Сега"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="type_incoming">Входящо обаждане</string>
+  <string name="type_incoming_pulled">Входящото обаждане бе прехвърлено към друго устройство</string>
+  <string name="type_outgoing">Изходящо обаждане</string>
+  <string name="type_outgoing_pulled">Изходящото обаждане бе прехвърлено към друго устройство</string>
+  <string name="type_missed">Пропуснато обаждане</string>
+  <string name="type_incoming_video">Входящо видеообаждане</string>
+  <string name="type_incoming_video_pulled">Входящото видеообаждане бе прехвърлено към друго устройство</string>
+  <string name="type_outgoing_video">Изходящо видеообаждане</string>
+  <string name="type_outgoing_video_pulled">Изходящото видеообаждане бе прехвърлено към друго устройство</string>
+  <string name="type_missed_video">Пропуснато видеообаждане</string>
+  <string name="type_voicemail">Гласова поща</string>
+  <string name="type_rejected">Отхвърлено обаждане</string>
+  <string name="type_blocked">Блокирано обаждане</string>
+  <string name="call_details_minutes_abbreviation">мин</string>
+  <string name="call_details_seconds_abbreviation">сек</string>
+  <string name="a11y_call_duration_format">%1$d %2$s %3$d %4$s</string>
+  <string name="a11y_call_duration_short_format">%1$d %2$s</string>
+  <string name="call_duration_format_pattern">%1$s \'%2$s\' %3$s \'%4$s\'</string>
+  <string name="call_duration_short_format_pattern">%1$s \'%2$s\'</string>
+  <plurals name="a11y_seconds">
+    <item quantity="one">секунда</item>
+    <item quantity="other">секунди</item>
+  </plurals>
+  <plurals name="a11y_minutes">
+    <item quantity="one">минута</item>
+    <item quantity="other">минути</item>
+  </plurals>
+  <string name="type_answered_elsewhere">На обаждането бе отговорено на друго устройство</string>
+  <string name="description_phone_account">в/ъв ^1</string>
+  <string name="description_via_number">през %1$s</string>
+  <string name="description_via_number_phone_account">в/ъв %1$s, през %2$s</string>
+  <string name="voicemail_string">Гласова поща</string>
+  <string name="just_now">Току-що</string>
+  <string name="new_call_log_carrier_video">Видеообаждане през оператора</string>
+  <string name="new_call_log_duo_video">Видеообаждане през Duo</string>
+  <string name="new_call_log_unknown">Неизвестно</string>
+  <string name="new_call_log_secondary_blocked">Блокиран</string>
+  <string name="new_call_log_secondary_spam">Спам</string>
+  <plurals name="a11y_new_call_log_entry_missed_call">
+    <item quantity="one">^1 пропуснато обаждане от ^2</item>
+    <item quantity="other">^1 обаждания, последното е пропуснато обаждане от ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_answered_call">
+    <item quantity="one">^1 отговорено обаждане от ^2</item>
+    <item quantity="other">^1 обаждания, последното е отговорено обаждане от ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_outgoing_call">
+    <item quantity="one">^1 изходящо обаждане до ^2</item>
+    <item quantity="other">^1 обаждания, последното е изходящо обаждане до ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_blocked_call">
+    <item quantity="one">^1 блокирано обаждане от ^2</item>
+    <item quantity="other">^1 обаждания, последното е блокирано обаждане от ^2</item>
+  </plurals>
+  <string name="a11y_new_call_log_entry_phone_account">в/ъв ^1 през ^2</string>
+  <string name="a11y_new_call_log_entry_full_description_without_phone_account_info">^1, ^2.</string>
+  <string name="a11y_new_call_log_entry_full_description_with_phone_account_info">^1, ^2, ^3.</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-bn/strings.xml b/java/com/android/dialer/calllogutils/res/values-bn/strings.xml
index 11f475f..3e050ae 100644
--- a/java/com/android/dialer/calllogutils/res/values-bn/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-bn/strings.xml
@@ -1,53 +1,61 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2017 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="type_incoming" msgid="5727636795656199810">"ইনকামিং কল"</string>
-    <string name="type_incoming_pulled" msgid="8434723359163965796">"ইনকামিং কলটিকে অন্য ডিভাইসে স্থানান্তর করা হয়েছে"</string>
-    <string name="type_outgoing" msgid="764896746073942963">"আউটগোয়িং কল"</string>
-    <string name="type_outgoing_pulled" msgid="1648517538371704193">"আউটগোয়িং কলটিকে অন্য ডিভাইসে স্থানান্তর করা হয়েছে"</string>
-    <string name="type_missed" msgid="2997043831022028176">"মিসড কল"</string>
-    <string name="type_incoming_video" msgid="7507180294202642554">"আগত ভিডিও কল"</string>
-    <string name="type_incoming_video_pulled" msgid="7879031598844023977">"ইনকামিং ভিডিও কলটিকে অন্য ডিভাইসে স্থানান্তর করা হয়েছে"</string>
-    <string name="type_outgoing_video" msgid="309370072333983910">"আউটগোয়িং ভিডিও কল"</string>
-    <string name="type_outgoing_video_pulled" msgid="3924450629684331345">"আউটগোয়িং ভিডিও কলটিকে অন্য ডিভাইসে স্থানান্তর করা হয়েছে"</string>
-    <string name="type_missed_video" msgid="4350107016317603785">"মিস করা ভিডিও কল"</string>
-    <string name="type_voicemail" msgid="1877524395253846684">"ভয়েসমেল"</string>
-    <string name="type_rejected" msgid="5632107438472996198">"অস্বীকৃত কল"</string>
-    <string name="type_blocked" msgid="9177237294052244929">"অবরুদ্ধ কল"</string>
-    <string name="call_details_minutes_abbreviation" msgid="7899774555556720560">"মি."</string>
-    <string name="call_details_seconds_abbreviation" msgid="5893806826648947126">"সে."</string>
-    <string name="a11y_call_duration_format" msgid="2905525933361674470">"<xliff:g id="MINUTES_0">%d</xliff:g> <xliff:g id="MINUTES_TRANSLATION">%s</xliff:g> <xliff:g id="SECONDS_1">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="a11y_call_duration_short_format" msgid="5908875871251062453">"<xliff:g id="SECONDS_0">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <plurals name="a11y_seconds" formatted="false" msgid="6695730844760611970">
-      <item quantity="one">সেকেন্ড</item>
-      <item quantity="other">সেকেন্ড</item>
-    </plurals>
-    <plurals name="a11y_minutes" formatted="false" msgid="6377010096698624038">
-      <item quantity="one">মিনিট</item>
-      <item quantity="other">মিনিট</item>
-    </plurals>
-    <string name="type_answered_elsewhere" msgid="411958582555881640">"অন্য ডিভাইসে কলটির উত্তর দেওয়া হয়েছে"</string>
-    <string name="description_phone_account" msgid="4382951172691362244">"<xliff:g id="PHONEACCOUNT">^1</xliff:g> এ"</string>
-    <string name="description_via_number" msgid="7682575124846343076">"<xliff:g id="NUMBER">%1$s</xliff:g> এর মাধ্যমে"</string>
-    <string name="description_via_number_phone_account" msgid="4345445677508018830">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> এ, <xliff:g id="NUMBER">%2$s</xliff:g> এর মাধ্যমে"</string>
-    <string name="voicemail_string" msgid="6029775151483803006">"ভয়েসমেল"</string>
-    <string name="now" msgid="2599778506439006806">"এখনই"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="type_incoming">ইনকামিং কল</string>
+  <string name="type_incoming_pulled">ইনকামিং কলটিকে অন্য ডিভাইসে স্থানান্তর করা হয়েছে</string>
+  <string name="type_outgoing">আউটগোয়িং কল</string>
+  <string name="type_outgoing_pulled">আউটগোয়িং কলটিকে অন্য ডিভাইসে স্থানান্তর করা হয়েছে</string>
+  <string name="type_missed">মিসড কল</string>
+  <string name="type_incoming_video">আগত ভিডিও কল</string>
+  <string name="type_incoming_video_pulled">ইনকামিং ভিডিও কলটিকে অন্য ডিভাইসে স্থানান্তর করা হয়েছে</string>
+  <string name="type_outgoing_video">আউটগোয়িং ভিডিও কল</string>
+  <string name="type_outgoing_video_pulled">আউটগোয়িং ভিডিও কলটিকে অন্য ডিভাইসে স্থানান্তর করা হয়েছে</string>
+  <string name="type_missed_video">মিস করা ভিডিও কল</string>
+  <string name="type_voicemail">ভয়েসমেল</string>
+  <string name="type_rejected">অস্বীকৃত কল</string>
+  <string name="type_blocked">অবরুদ্ধ কল</string>
+  <string name="call_details_minutes_abbreviation">মি.</string>
+  <string name="call_details_seconds_abbreviation">সে.</string>
+  <string name="a11y_call_duration_format">%1$d %2$s %3$d %4$s</string>
+  <string name="a11y_call_duration_short_format">%1$d %2$s</string>
+  <string name="call_duration_format_pattern">%1$s\'%2$s\' %3$s\'%4$s\'</string>
+  <string name="call_duration_short_format_pattern">%1$s\'%2$s\'</string>
+  <plurals name="a11y_seconds">
+    <item quantity="one">সেকেন্ড</item>
+    <item quantity="other">সেকেন্ড</item>
+  </plurals>
+  <plurals name="a11y_minutes">
+    <item quantity="one">মিনিট</item>
+    <item quantity="other">মিনিট</item>
+  </plurals>
+  <string name="type_answered_elsewhere">অন্য ডিভাইসে কলটির উত্তর দেওয়া হয়েছে</string>
+  <string name="description_phone_account">^1 এ</string>
+  <string name="description_via_number">%1$s এর মাধ্যমে</string>
+  <string name="description_via_number_phone_account">%1$s এ, %2$s এর মাধ্যমে</string>
+  <string name="voicemail_string">ভয়েসমেল</string>
+  <string name="just_now">এখনই</string>
+  <string name="new_call_log_carrier_video">পরিষেবা প্রদানকারীতে ভিডিও</string>
+  <string name="new_call_log_duo_video">Duo ভিডিও</string>
+  <string name="new_call_log_unknown">অজানা</string>
+  <string name="new_call_log_secondary_blocked">ব্লক করা নম্বর</string>
+  <string name="new_call_log_secondary_spam">স্প্যাম</string>
+  <plurals name="a11y_new_call_log_entry_missed_call">
+    <item quantity="one">^1টি কল, শেষ কলটি ^2-এর, যেটি মিস করেছেন</item>
+    <item quantity="other">^1টি কল, শেষ কলটি ^2-এর, যেটি মিস করেছেন</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_answered_call">
+    <item quantity="one">^1টি কল, শেষ কলটি ^2-এর, যেটির উত্তর দিয়েছেন</item>
+    <item quantity="other">^1টি কল, শেষ কলটি ^2-এর, যেটির উত্তর দিয়েছেন</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_outgoing_call">
+    <item quantity="one">^1টি কল করেছেন, শেষ কলটি ^2-কে</item>
+    <item quantity="other">^1টি কল করেছেন, শেষ কলটি ^2-কে</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_blocked_call">
+    <item quantity="one">^1টি কল, শেষ কলটি ^2-এর, যেটি আপনি ব্লক করেছেন</item>
+    <item quantity="other">^1টি কল, শেষ কলটি ^2-এর, যেটি আপনি ব্লক করেছেন</item>
+  </plurals>
+  <string name="a11y_new_call_log_entry_phone_account">^1-এ,
+    ^2-এর মাধ্যমে</string>
+  <string name="a11y_new_call_log_entry_full_description_without_phone_account_info">^1, ^2।</string>
+  <string name="a11y_new_call_log_entry_full_description_with_phone_account_info">^1, ^2, ^3।</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-bs/strings.xml b/java/com/android/dialer/calllogutils/res/values-bs/strings.xml
index 7526ef4..84be2ba 100644
--- a/java/com/android/dialer/calllogutils/res/values-bs/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-bs/strings.xml
@@ -1,55 +1,67 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2017 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="type_incoming" msgid="5727636795656199810">"Dolazni poziv"</string>
-    <string name="type_incoming_pulled" msgid="8434723359163965796">"Dolazni poziv je prebačen na drugi uređaj"</string>
-    <string name="type_outgoing" msgid="764896746073942963">"Odlazni poziv"</string>
-    <string name="type_outgoing_pulled" msgid="1648517538371704193">"Odlazni poziv je prebačen na drugi uređaj"</string>
-    <string name="type_missed" msgid="2997043831022028176">"Propušteni poziv"</string>
-    <string name="type_incoming_video" msgid="7507180294202642554">"Dolazni videopoziv"</string>
-    <string name="type_incoming_video_pulled" msgid="7879031598844023977">"Dolazni videopoziv je prebačen na drugi uređaj"</string>
-    <string name="type_outgoing_video" msgid="309370072333983910">"Odlazni videopoziv"</string>
-    <string name="type_outgoing_video_pulled" msgid="3924450629684331345">"Odlazni videopoziv je prebačen na drugi uređaj"</string>
-    <string name="type_missed_video" msgid="4350107016317603785">"Propušteni videopoziv"</string>
-    <string name="type_voicemail" msgid="1877524395253846684">"Govorna pošta"</string>
-    <string name="type_rejected" msgid="5632107438472996198">"Odbijeni poziv"</string>
-    <string name="type_blocked" msgid="9177237294052244929">"Blokirani poziv"</string>
-    <string name="call_details_minutes_abbreviation" msgid="7899774555556720560">"min"</string>
-    <string name="call_details_seconds_abbreviation" msgid="5893806826648947126">"s"</string>
-    <string name="a11y_call_duration_format" msgid="2905525933361674470">"<xliff:g id="MINUTES_0">%d</xliff:g> <xliff:g id="MINUTES_TRANSLATION">%s</xliff:g> <xliff:g id="SECONDS_1">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="a11y_call_duration_short_format" msgid="5908875871251062453">"<xliff:g id="SECONDS_0">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <plurals name="a11y_seconds" formatted="false" msgid="6695730844760611970">
-      <item quantity="one">sekunda</item>
-      <item quantity="few">sekunde</item>
-      <item quantity="other">sekundi</item>
-    </plurals>
-    <plurals name="a11y_minutes" formatted="false" msgid="6377010096698624038">
-      <item quantity="one">minuta</item>
-      <item quantity="few">minute</item>
-      <item quantity="other">minuta</item>
-    </plurals>
-    <string name="type_answered_elsewhere" msgid="411958582555881640">"Poziv je primljen na drugom uređaju"</string>
-    <string name="description_phone_account" msgid="4382951172691362244">"na <xliff:g id="PHONEACCOUNT">^1</xliff:g>"</string>
-    <string name="description_via_number" msgid="7682575124846343076">"preko <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="description_via_number_phone_account" msgid="4345445677508018830">"na <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, preko <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="voicemail_string" msgid="6029775151483803006">"Govorna pošta"</string>
-    <string name="now" msgid="2599778506439006806">"Sada"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="type_incoming">Dolazni poziv</string>
+  <string name="type_incoming_pulled">Dolazni poziv je prebačen na drugi uređaj</string>
+  <string name="type_outgoing">Odlazni poziv</string>
+  <string name="type_outgoing_pulled">Odlazni poziv je prebačen na drugi uređaj</string>
+  <string name="type_missed">Propušteni poziv</string>
+  <string name="type_incoming_video">Dolazni video poziv</string>
+  <string name="type_incoming_video_pulled">Dolazni video poziv je prebačen na drugi uređaj</string>
+  <string name="type_outgoing_video">Odlazni video poziv</string>
+  <string name="type_outgoing_video_pulled">Odlazni video poziv je prebačen na drugi uređaj</string>
+  <string name="type_missed_video">Propušteni video poziv</string>
+  <string name="type_voicemail">Govorna pošta</string>
+  <string name="type_rejected">Odbijeni poziv</string>
+  <string name="type_blocked">Blokirani poziv</string>
+  <string name="call_details_minutes_abbreviation">min</string>
+  <string name="call_details_seconds_abbreviation">s</string>
+  <string name="a11y_call_duration_format">%1$d %2$s %3$d %4$s</string>
+  <string name="a11y_call_duration_short_format">%1$d %2$s</string>
+  <string name="call_duration_format_pattern">%1$s \'%2$s\' %3$s \'%4$s\'</string>
+  <string name="call_duration_short_format_pattern">%1$s \'%2$s\'</string>
+  <plurals name="a11y_seconds">
+    <item quantity="one">sekunda</item>
+    <item quantity="few">sekunde</item>
+    <item quantity="other">sekundi</item>
+  </plurals>
+  <plurals name="a11y_minutes">
+    <item quantity="one">minuta</item>
+    <item quantity="few">minute</item>
+    <item quantity="other">minuta</item>
+  </plurals>
+  <string name="type_answered_elsewhere">Poziv je primljen na drugom uređaju</string>
+  <string name="description_phone_account">na ^1</string>
+  <string name="description_via_number">preko %1$s</string>
+  <string name="description_via_number_phone_account">na %1$s, preko %2$s</string>
+  <string name="voicemail_string">Govorna pošta</string>
+  <string name="just_now">Upravo</string>
+  <string name="new_call_log_carrier_video">Video poziv putem operatera</string>
+  <string name="new_call_log_duo_video">Duo video poziv</string>
+  <string name="new_call_log_unknown">Nepoznato</string>
+  <string name="new_call_log_secondary_blocked">Blokirano</string>
+  <string name="new_call_log_secondary_spam">Neželjena pošta</string>
+  <plurals name="a11y_new_call_log_entry_missed_call">
+    <item quantity="one">^1 poziv. Posljednji poziv je propušteni poziv od osobe ^2</item>
+    <item quantity="few">^1 poziva. Posljednji poziv je propušteni poziv od osobe ^2</item>
+    <item quantity="other">^1 poziva. Posljednji poziv je propušteni poziv od osobe ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_answered_call">
+    <item quantity="one">^1 poziv. Posljednji poziv je prihvaćeni poziv od osobe ^2</item>
+    <item quantity="few">^1 poziva. Posljednji poziv je prihvaćeni poziv od osobe ^2</item>
+    <item quantity="other">^1 poziva. Posljednji poziv je prihvaćeni poziv od osobe ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_outgoing_call">
+    <item quantity="one">^1 poziv. Posljednji poziv je odlazni poziv upućen osobi ^2</item>
+    <item quantity="few">^1 poziva. Posljednji poziv je odlazni poziv upućen osobi ^2</item>
+    <item quantity="other">^1 poziva. Posljednji poziv je odlazni poziv upućen osobi ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_blocked_call">
+    <item quantity="one">^1 poziv. Posljednji poziv je blokirani poziv od osobe ^2</item>
+    <item quantity="few">^1 poziva. Posljednji poziv je blokirani poziv od osobe ^2</item>
+    <item quantity="other">^1 poziva. Posljednji poziv je blokirani poziv od osobe ^2</item>
+  </plurals>
+  <string name="a11y_new_call_log_entry_phone_account">na računu ^1,
+    putem broja ^2</string>
+  <string name="a11y_new_call_log_entry_full_description_without_phone_account_info">^1, ^2.</string>
+  <string name="a11y_new_call_log_entry_full_description_with_phone_account_info">^1, ^2, ^3.</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-ca/strings.xml b/java/com/android/dialer/calllogutils/res/values-ca/strings.xml
index 6441b44..56f6ada 100644
--- a/java/com/android/dialer/calllogutils/res/values-ca/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-ca/strings.xml
@@ -1,53 +1,61 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2017 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="type_incoming" msgid="5727636795656199810">"Trucada entrant"</string>
-    <string name="type_incoming_pulled" msgid="8434723359163965796">"La trucada entrant s\'ha transferit a un altre dispositiu"</string>
-    <string name="type_outgoing" msgid="764896746073942963">"Trucada sortint"</string>
-    <string name="type_outgoing_pulled" msgid="1648517538371704193">"La trucada sortint s\'ha transferit a un altre dispositiu"</string>
-    <string name="type_missed" msgid="2997043831022028176">"Trucada perduda"</string>
-    <string name="type_incoming_video" msgid="7507180294202642554">"Videotrucada entrant"</string>
-    <string name="type_incoming_video_pulled" msgid="7879031598844023977">"La videotrucada entrant s\'ha transferit a un altre dispositiu"</string>
-    <string name="type_outgoing_video" msgid="309370072333983910">"Videotrucada sortint"</string>
-    <string name="type_outgoing_video_pulled" msgid="3924450629684331345">"La videotrucada sortint s\'ha transferit a un altre dispositiu"</string>
-    <string name="type_missed_video" msgid="4350107016317603785">"Videotrucada perduda"</string>
-    <string name="type_voicemail" msgid="1877524395253846684">"Missatge de veu"</string>
-    <string name="type_rejected" msgid="5632107438472996198">"Trucada rebutjada"</string>
-    <string name="type_blocked" msgid="9177237294052244929">"Trucada bloquejada"</string>
-    <string name="call_details_minutes_abbreviation" msgid="7899774555556720560">"min"</string>
-    <string name="call_details_seconds_abbreviation" msgid="5893806826648947126">"s"</string>
-    <string name="a11y_call_duration_format" msgid="2905525933361674470">"<xliff:g id="MINUTES_0">%d</xliff:g> <xliff:g id="MINUTES_TRANSLATION">%s</xliff:g> <xliff:g id="SECONDS_1">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="a11y_call_duration_short_format" msgid="5908875871251062453">"<xliff:g id="SECONDS_0">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <plurals name="a11y_seconds" formatted="false" msgid="6695730844760611970">
-      <item quantity="other">segons</item>
-      <item quantity="one">segon</item>
-    </plurals>
-    <plurals name="a11y_minutes" formatted="false" msgid="6377010096698624038">
-      <item quantity="other">minuts</item>
-      <item quantity="one">minut</item>
-    </plurals>
-    <string name="type_answered_elsewhere" msgid="411958582555881640">"S\'ha respost a la trucada en un altre dispositiu"</string>
-    <string name="description_phone_account" msgid="4382951172691362244">"a <xliff:g id="PHONEACCOUNT">^1</xliff:g>"</string>
-    <string name="description_via_number" msgid="7682575124846343076">"al número <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="description_via_number_phone_account" msgid="4345445677508018830">"a <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, al número <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="voicemail_string" msgid="6029775151483803006">"Bústia de veu"</string>
-    <string name="now" msgid="2599778506439006806">"Ara"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="type_incoming">Trucada entrant</string>
+  <string name="type_incoming_pulled">La trucada entrant s\'ha transferit a un altre dispositiu</string>
+  <string name="type_outgoing">Trucada sortint</string>
+  <string name="type_outgoing_pulled">La trucada sortint s\'ha transferit a un altre dispositiu</string>
+  <string name="type_missed">Trucada perduda</string>
+  <string name="type_incoming_video">Videotrucada entrant</string>
+  <string name="type_incoming_video_pulled">La videotrucada entrant s\'ha transferit a un altre dispositiu</string>
+  <string name="type_outgoing_video">Videotrucada sortint</string>
+  <string name="type_outgoing_video_pulled">La videotrucada sortint s\'ha transferit a un altre dispositiu</string>
+  <string name="type_missed_video">Videotrucada perduda</string>
+  <string name="type_voicemail">Missatge de veu</string>
+  <string name="type_rejected">Trucada rebutjada</string>
+  <string name="type_blocked">Trucada bloquejada</string>
+  <string name="call_details_minutes_abbreviation">min</string>
+  <string name="call_details_seconds_abbreviation">s</string>
+  <string name="a11y_call_duration_format">%1$d %2$s %3$d %4$s</string>
+  <string name="a11y_call_duration_short_format">%1$d %2$s</string>
+  <string name="call_duration_format_pattern">%1$s \'%2$s\' %3$s \'%4$s\'</string>
+  <string name="call_duration_short_format_pattern">%1$s \'%2$s\'</string>
+  <plurals name="a11y_seconds">
+    <item quantity="one">segon</item>
+    <item quantity="other">segons</item>
+  </plurals>
+  <plurals name="a11y_minutes">
+    <item quantity="one">minut</item>
+    <item quantity="other">minuts</item>
+  </plurals>
+  <string name="type_answered_elsewhere">S\'ha respost a la trucada en un altre dispositiu</string>
+  <string name="description_phone_account">a ^1</string>
+  <string name="description_via_number">al número %1$s</string>
+  <string name="description_via_number_phone_account">a %1$s, al número %2$s</string>
+  <string name="voicemail_string">Bústia de veu</string>
+  <string name="just_now">Ara mateix</string>
+  <string name="new_call_log_carrier_video">Videotruc. operador tel. mòbil</string>
+  <string name="new_call_log_duo_video">Videotrucada de Duo</string>
+  <string name="new_call_log_unknown">Desconegut</string>
+  <string name="new_call_log_secondary_blocked">Bloquejats</string>
+  <string name="new_call_log_secondary_spam">Trucades brossa</string>
+  <plurals name="a11y_new_call_log_entry_missed_call">
+    <item quantity="one">^1 trucada perduda de: ^2</item>
+    <item quantity="other">^1 trucades; l\'última és una trucada perduda de: ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_answered_call">
+    <item quantity="one">^1 trucada resposta de: ^2</item>
+    <item quantity="other">^1 trucades; l\'última és una trucada resposta de: ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_outgoing_call">
+    <item quantity="one">^1 trucada sortint feta a ^2</item>
+    <item quantity="other">^1 trucades; l\'última és una trucada sortint feta a ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_blocked_call">
+    <item quantity="one">^1 trucada bloquejada de: ^2</item>
+    <item quantity="other">^1 trucades; l\'última és una trucada bloquejada de: ^2</item>
+  </plurals>
+  <string name="a11y_new_call_log_entry_phone_account">a ^1,
+    al número ^2</string>
+  <string name="a11y_new_call_log_entry_full_description_without_phone_account_info">^1, ^2.</string>
+  <string name="a11y_new_call_log_entry_full_description_with_phone_account_info">^1, ^2, ^3.</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-cs/strings.xml b/java/com/android/dialer/calllogutils/res/values-cs/strings.xml
index 9e0fb0e..c5a3a9a 100644
--- a/java/com/android/dialer/calllogutils/res/values-cs/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-cs/strings.xml
@@ -1,57 +1,73 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2017 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="type_incoming" msgid="5727636795656199810">"Příchozí hovor"</string>
-    <string name="type_incoming_pulled" msgid="8434723359163965796">"Příchozí hovor byl přesměrován na jiné zařízení"</string>
-    <string name="type_outgoing" msgid="764896746073942963">"Odchozí hovor"</string>
-    <string name="type_outgoing_pulled" msgid="1648517538371704193">"Odchozí hovor byl přesměrován na jiné zařízení"</string>
-    <string name="type_missed" msgid="2997043831022028176">"Zmeškaný hovor"</string>
-    <string name="type_incoming_video" msgid="7507180294202642554">"Příchozí videohovor"</string>
-    <string name="type_incoming_video_pulled" msgid="7879031598844023977">"Příchozí videohovor byl přesměrován na jiné zařízení"</string>
-    <string name="type_outgoing_video" msgid="309370072333983910">"Odchozí videohovor"</string>
-    <string name="type_outgoing_video_pulled" msgid="3924450629684331345">"Odchozí videohovor byl přesměrován na jiné zařízení"</string>
-    <string name="type_missed_video" msgid="4350107016317603785">"Zmeškaný videohovor"</string>
-    <string name="type_voicemail" msgid="1877524395253846684">"Hlasová schránka"</string>
-    <string name="type_rejected" msgid="5632107438472996198">"Odmítnutý hovor"</string>
-    <string name="type_blocked" msgid="9177237294052244929">"Zablokovaný hovor"</string>
-    <string name="call_details_minutes_abbreviation" msgid="7899774555556720560">"min"</string>
-    <string name="call_details_seconds_abbreviation" msgid="5893806826648947126">"s"</string>
-    <string name="a11y_call_duration_format" msgid="2905525933361674470">"<xliff:g id="MINUTES_0">%d</xliff:g> <xliff:g id="MINUTES_TRANSLATION">%s</xliff:g> <xliff:g id="SECONDS_1">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="a11y_call_duration_short_format" msgid="5908875871251062453">"<xliff:g id="SECONDS_0">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <plurals name="a11y_seconds" formatted="false" msgid="6695730844760611970">
-      <item quantity="few">sekundy</item>
-      <item quantity="many">sekundy</item>
-      <item quantity="other">sekund</item>
-      <item quantity="one">sekunda</item>
-    </plurals>
-    <plurals name="a11y_minutes" formatted="false" msgid="6377010096698624038">
-      <item quantity="few">minuty</item>
-      <item quantity="many">minuty</item>
-      <item quantity="other">minut</item>
-      <item quantity="one">minuta</item>
-    </plurals>
-    <string name="type_answered_elsewhere" msgid="411958582555881640">"Hovor byl přijat na jiném zařízení"</string>
-    <string name="description_phone_account" msgid="4382951172691362244">"na účet <xliff:g id="PHONEACCOUNT">^1</xliff:g>"</string>
-    <string name="description_via_number" msgid="7682575124846343076">"z čísla <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="description_via_number_phone_account" msgid="4345445677508018830">"na účet <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, z čísla <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="voicemail_string" msgid="6029775151483803006">"Hlasová schránka"</string>
-    <string name="now" msgid="2599778506439006806">"Právě teď"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="type_incoming">Příchozí hovor</string>
+  <string name="type_incoming_pulled">Příchozí hovor byl přesměrován na jiné zařízení</string>
+  <string name="type_outgoing">Odchozí hovor</string>
+  <string name="type_outgoing_pulled">Odchozí hovor byl přesměrován na jiné zařízení</string>
+  <string name="type_missed">Zmeškaný hovor</string>
+  <string name="type_incoming_video">Příchozí videohovor</string>
+  <string name="type_incoming_video_pulled">Příchozí videohovor byl přesměrován na jiné zařízení</string>
+  <string name="type_outgoing_video">Odchozí videohovor</string>
+  <string name="type_outgoing_video_pulled">Odchozí videohovor byl přesměrován na jiné zařízení</string>
+  <string name="type_missed_video">Zmeškaný videohovor</string>
+  <string name="type_voicemail">Hlasová schránka</string>
+  <string name="type_rejected">Odmítnutý hovor</string>
+  <string name="type_blocked">Zablokovaný hovor</string>
+  <string name="call_details_minutes_abbreviation">min</string>
+  <string name="call_details_seconds_abbreviation">s</string>
+  <string name="a11y_call_duration_format">%1$d %2$s %3$d %4$s</string>
+  <string name="a11y_call_duration_short_format">%1$d %2$s</string>
+  <string name="call_duration_format_pattern">%1$s \'%2$s\' %3$s \'%4$s\'</string>
+  <string name="call_duration_short_format_pattern">%1$s \'%2$s\'</string>
+  <plurals name="a11y_seconds">
+    <item quantity="one">sekunda</item>
+    <item quantity="few">sekundy</item>
+    <item quantity="many">sekundy</item>
+    <item quantity="other">sekund</item>
+  </plurals>
+  <plurals name="a11y_minutes">
+    <item quantity="one">minuta</item>
+    <item quantity="few">minuty</item>
+    <item quantity="many">minuty</item>
+    <item quantity="other">minut</item>
+  </plurals>
+  <string name="type_answered_elsewhere">Hovor byl přijat na jiném zařízení</string>
+  <string name="description_phone_account">na účet ^1</string>
+  <string name="description_via_number">z čísla %1$s</string>
+  <string name="description_via_number_phone_account">na účet %1$s, z čísla %2$s</string>
+  <string name="voicemail_string">Hlasová schránka</string>
+  <string name="just_now">Právě teď</string>
+  <string name="new_call_log_carrier_video">Videohovor přes operátora</string>
+  <string name="new_call_log_duo_video">Videohovor Duo</string>
+  <string name="new_call_log_unknown">Neznámé</string>
+  <string name="new_call_log_secondary_blocked">Blokované</string>
+  <string name="new_call_log_secondary_spam">Spam</string>
+  <plurals name="a11y_new_call_log_entry_missed_call">
+    <item quantity="one">^1 zmeškaný hovor od kontaktu ^2</item>
+    <item quantity="few">^1 hovory, poslední je zmeškaný hovor od kontaktu ^2</item>
+    <item quantity="many">^1 hovoru, poslední je zmeškaný hovor od kontaktu ^2</item>
+    <item quantity="other">^1 hovorů, poslední je zmeškaný hovor od kontaktu ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_answered_call">
+    <item quantity="one">^1 přijatý hovor od kontaktu ^2</item>
+    <item quantity="few">^1 hovory, poslední je přijatý hovor od kontaktu ^2</item>
+    <item quantity="many">^1 hovoru, poslední je přijatý hovor od kontaktu ^2</item>
+    <item quantity="other">^1 hovorů, poslední je přijatý hovor od kontaktu ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_outgoing_call">
+    <item quantity="one">^1 odchozí hovor s kontaktem ^2</item>
+    <item quantity="few">^1 hovory, poslední je odchozí hovor s kontaktem ^2</item>
+    <item quantity="many">^1 hovoru, poslední je odchozí hovor s kontaktem ^2</item>
+    <item quantity="other">^1 hovorů, poslední je odchozí hovor s kontaktem ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_blocked_call">
+    <item quantity="one">^1 zablokovaný hovor od kontaktu ^2</item>
+    <item quantity="few">^1 hovory, poslední je zablokovaný hovor od kontaktu ^2</item>
+    <item quantity="many">^1 hovoru, poslední je zablokovaný hovor od kontaktu ^2</item>
+    <item quantity="other">^1 hovorů, poslední je zablokovaný hovor od kontaktu ^2</item>
+  </plurals>
+  <string name="a11y_new_call_log_entry_phone_account">na účet ^1,
+    z čísla ^2</string>
+  <string name="a11y_new_call_log_entry_full_description_without_phone_account_info">^1, ^2.</string>
+  <string name="a11y_new_call_log_entry_full_description_with_phone_account_info">^1, ^2, ^3.</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-da/strings.xml b/java/com/android/dialer/calllogutils/res/values-da/strings.xml
index 9032f81..472c931 100644
--- a/java/com/android/dialer/calllogutils/res/values-da/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-da/strings.xml
@@ -1,53 +1,61 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2017 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="type_incoming" msgid="5727636795656199810">"Indgående opkald"</string>
-    <string name="type_incoming_pulled" msgid="8434723359163965796">"Det indgående opkald blev viderestillet til en anden enhed"</string>
-    <string name="type_outgoing" msgid="764896746073942963">"Udgående opkald"</string>
-    <string name="type_outgoing_pulled" msgid="1648517538371704193">"Det udgående opkald blev viderestillet til en anden enhed"</string>
-    <string name="type_missed" msgid="2997043831022028176">"Ubesvarede opkald"</string>
-    <string name="type_incoming_video" msgid="7507180294202642554">"Indgående videoopkald"</string>
-    <string name="type_incoming_video_pulled" msgid="7879031598844023977">"Det indgående videoopkald blev viderestillet til anden enhed"</string>
-    <string name="type_outgoing_video" msgid="309370072333983910">"Udgående videoopkald"</string>
-    <string name="type_outgoing_video_pulled" msgid="3924450629684331345">"Det udgående videoopkald blev viderestillet til anden enhed"</string>
-    <string name="type_missed_video" msgid="4350107016317603785">"Ubesvaret videoopkald"</string>
-    <string name="type_voicemail" msgid="1877524395253846684">"Telefonsvarer"</string>
-    <string name="type_rejected" msgid="5632107438472996198">"Afvist opkald"</string>
-    <string name="type_blocked" msgid="9177237294052244929">"Blokeret opkald"</string>
-    <string name="call_details_minutes_abbreviation" msgid="7899774555556720560">"min."</string>
-    <string name="call_details_seconds_abbreviation" msgid="5893806826648947126">"sek."</string>
-    <string name="a11y_call_duration_format" msgid="2905525933361674470">"<xliff:g id="MINUTES_0">%d</xliff:g> <xliff:g id="MINUTES_TRANSLATION">%s</xliff:g> <xliff:g id="SECONDS_1">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="a11y_call_duration_short_format" msgid="5908875871251062453">"<xliff:g id="SECONDS_0">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <plurals name="a11y_seconds" formatted="false" msgid="6695730844760611970">
-      <item quantity="one">sekund</item>
-      <item quantity="other">sekunder</item>
-    </plurals>
-    <plurals name="a11y_minutes" formatted="false" msgid="6377010096698624038">
-      <item quantity="one">minut</item>
-      <item quantity="other">minutter</item>
-    </plurals>
-    <string name="type_answered_elsewhere" msgid="411958582555881640">"Opkaldet blev besvaret på en anden enhed"</string>
-    <string name="description_phone_account" msgid="4382951172691362244">"på <xliff:g id="PHONEACCOUNT">^1</xliff:g>"</string>
-    <string name="description_via_number" msgid="7682575124846343076">"via <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="description_via_number_phone_account" msgid="4345445677508018830">"til <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, via <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="voicemail_string" msgid="6029775151483803006">"Telefonsvarer"</string>
-    <string name="now" msgid="2599778506439006806">"Nu"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="type_incoming">Indgående opkald</string>
+  <string name="type_incoming_pulled">Det indgående opkald blev viderestillet til en anden enhed</string>
+  <string name="type_outgoing">Udgående opkald</string>
+  <string name="type_outgoing_pulled">Det udgående opkald blev viderestillet til en anden enhed</string>
+  <string name="type_missed">Ubesvarede opkald</string>
+  <string name="type_incoming_video">Indgående videoopkald</string>
+  <string name="type_incoming_video_pulled">Det indgående videoopkald blev viderestillet til anden enhed</string>
+  <string name="type_outgoing_video">Udgående videoopkald</string>
+  <string name="type_outgoing_video_pulled">Det udgående videoopkald blev viderestillet til anden enhed</string>
+  <string name="type_missed_video">Ubesvaret videoopkald</string>
+  <string name="type_voicemail">Telefonsvarer</string>
+  <string name="type_rejected">Afvist opkald</string>
+  <string name="type_blocked">Blokeret opkald</string>
+  <string name="call_details_minutes_abbreviation">min.</string>
+  <string name="call_details_seconds_abbreviation">sek.</string>
+  <string name="a11y_call_duration_format">%1$d %2$s %3$d %4$s</string>
+  <string name="a11y_call_duration_short_format">%1$d %2$s</string>
+  <string name="call_duration_format_pattern">%1$s \'%2$s\' %3$s \'%4$s\'</string>
+  <string name="call_duration_short_format_pattern">%1$s \'%2$s\'</string>
+  <plurals name="a11y_seconds">
+    <item quantity="one">sekund</item>
+    <item quantity="other">sekunder</item>
+  </plurals>
+  <plurals name="a11y_minutes">
+    <item quantity="one">minut</item>
+    <item quantity="other">minutter</item>
+  </plurals>
+  <string name="type_answered_elsewhere">Opkaldet blev besvaret på en anden enhed</string>
+  <string name="description_phone_account">på ^1</string>
+  <string name="description_via_number">via %1$s</string>
+  <string name="description_via_number_phone_account">til %1$s, via %2$s</string>
+  <string name="voicemail_string">Telefonsvarer</string>
+  <string name="just_now">Lige nu</string>
+  <string name="new_call_log_carrier_video">Video via mobilselskab</string>
+  <string name="new_call_log_duo_video">Video via Duo</string>
+  <string name="new_call_log_unknown">Ukendt</string>
+  <string name="new_call_log_secondary_blocked">Blokeret</string>
+  <string name="new_call_log_secondary_spam">Spam</string>
+  <plurals name="a11y_new_call_log_entry_missed_call">
+    <item quantity="one">^1 opkald, og det seneste er et ubesvaret opkald fra ^2</item>
+    <item quantity="other">^1 opkald, og det seneste er et ubesvaret opkald fra ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_answered_call">
+    <item quantity="one">^1 opkald, og det seneste er et besvaret opkald fra ^2</item>
+    <item quantity="other">^1 opkald, og det seneste er et besvaret opkald fra ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_outgoing_call">
+    <item quantity="one">^1 opkald, og det seneste er et udgået opkald til ^2</item>
+    <item quantity="other">^1 opkald, og det seneste er et udgået opkald til ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_blocked_call">
+    <item quantity="one">^1 opkald, og det seneste er et blokeret opkald fra ^2</item>
+    <item quantity="other">^1 opkald, og det seneste er et blokeret opkald fra ^2</item>
+  </plurals>
+  <string name="a11y_new_call_log_entry_phone_account">på ^1,
+    via ^2</string>
+  <string name="a11y_new_call_log_entry_full_description_without_phone_account_info">^1, ^2.</string>
+  <string name="a11y_new_call_log_entry_full_description_with_phone_account_info">^1, ^2, ^3.</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-de/strings.xml b/java/com/android/dialer/calllogutils/res/values-de/strings.xml
index 7980d97..4f11b80 100644
--- a/java/com/android/dialer/calllogutils/res/values-de/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-de/strings.xml
@@ -1,53 +1,61 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2017 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="type_incoming" msgid="5727636795656199810">"Eingehender Anruf"</string>
-    <string name="type_incoming_pulled" msgid="8434723359163965796">"Der eingehende Anruf wurde an ein anderes Gerät übergeben"</string>
-    <string name="type_outgoing" msgid="764896746073942963">"Ausgehender Anruf"</string>
-    <string name="type_outgoing_pulled" msgid="1648517538371704193">"Der ausgehende Anruf wurde an ein anderes Gerät übergeben"</string>
-    <string name="type_missed" msgid="2997043831022028176">"Entgangener Anruf"</string>
-    <string name="type_incoming_video" msgid="7507180294202642554">"Eingehender Videoanruf"</string>
-    <string name="type_incoming_video_pulled" msgid="7879031598844023977">"Eingehender Videoanruf wurde an ein anderes Gerät übergeben"</string>
-    <string name="type_outgoing_video" msgid="309370072333983910">"Ausgehender Videoanruf"</string>
-    <string name="type_outgoing_video_pulled" msgid="3924450629684331345">"Ausgehender Videoanruf wurde an ein anderes Gerät übergeben"</string>
-    <string name="type_missed_video" msgid="4350107016317603785">"Entgangener Videoanruf"</string>
-    <string name="type_voicemail" msgid="1877524395253846684">"Mailbox"</string>
-    <string name="type_rejected" msgid="5632107438472996198">"Abgelehnter Anruf"</string>
-    <string name="type_blocked" msgid="9177237294052244929">"Blockierter Anruf"</string>
-    <string name="call_details_minutes_abbreviation" msgid="7899774555556720560">"min"</string>
-    <string name="call_details_seconds_abbreviation" msgid="5893806826648947126">"s"</string>
-    <string name="a11y_call_duration_format" msgid="2905525933361674470">"<xliff:g id="MINUTES_0">%d</xliff:g> <xliff:g id="MINUTES_TRANSLATION">%s</xliff:g> <xliff:g id="SECONDS_1">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="a11y_call_duration_short_format" msgid="5908875871251062453">"<xliff:g id="SECONDS_0">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <plurals name="a11y_seconds" formatted="false" msgid="6695730844760611970">
-      <item quantity="other"> Sekunden</item>
-      <item quantity="one"> Sekunde</item>
-    </plurals>
-    <plurals name="a11y_minutes" formatted="false" msgid="6377010096698624038">
-      <item quantity="other"> Minuten</item>
-      <item quantity="one"> Minute</item>
-    </plurals>
-    <string name="type_answered_elsewhere" msgid="411958582555881640">"Der Anruf wurde auf einem anderen Gerät angenommen"</string>
-    <string name="description_phone_account" msgid="4382951172691362244">"mit <xliff:g id="PHONEACCOUNT">^1</xliff:g>"</string>
-    <string name="description_via_number" msgid="7682575124846343076">"über <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="description_via_number_phone_account" msgid="4345445677508018830">"mit <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, über <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="voicemail_string" msgid="6029775151483803006">"Mailbox"</string>
-    <string name="now" msgid="2599778506439006806">"Jetzt"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="type_incoming">Eingehender Anruf</string>
+  <string name="type_incoming_pulled">Der eingehende Anruf wurde an ein anderes Gerät übergeben</string>
+  <string name="type_outgoing">Ausgehender Anruf</string>
+  <string name="type_outgoing_pulled">Der ausgehende Anruf wurde an ein anderes Gerät übergeben</string>
+  <string name="type_missed">Entgangener Anruf</string>
+  <string name="type_incoming_video">Eingehender Videoanruf</string>
+  <string name="type_incoming_video_pulled">Eingehender Videoanruf wurde an ein anderes Gerät übergeben</string>
+  <string name="type_outgoing_video">Ausgehender Videoanruf</string>
+  <string name="type_outgoing_video_pulled">Ausgehender Videoanruf wurde an ein anderes Gerät übergeben</string>
+  <string name="type_missed_video">Entgangener Videoanruf</string>
+  <string name="type_voicemail">Mailbox</string>
+  <string name="type_rejected">Abgelehnter Anruf</string>
+  <string name="type_blocked">Blockierter Anruf</string>
+  <string name="call_details_minutes_abbreviation">min</string>
+  <string name="call_details_seconds_abbreviation">s</string>
+  <string name="a11y_call_duration_format">%1$d %2$s %3$d %4$s</string>
+  <string name="a11y_call_duration_short_format">%1$d %2$s</string>
+  <string name="call_duration_format_pattern">%1$s \'%2$s\' %3$s \'%4$s\'</string>
+  <string name="call_duration_short_format_pattern">%1$s \'%2$s\'</string>
+  <plurals name="a11y_seconds">
+    <item quantity="one"> Sekunde</item>
+    <item quantity="other"> Sekunden</item>
+  </plurals>
+  <plurals name="a11y_minutes">
+    <item quantity="one"> Minute</item>
+    <item quantity="other"> Minuten</item>
+  </plurals>
+  <string name="type_answered_elsewhere">Der Anruf wurde auf einem anderen Gerät angenommen</string>
+  <string name="description_phone_account">mit ^1</string>
+  <string name="description_via_number">über %1$s</string>
+  <string name="description_via_number_phone_account">mit %1$s, über %2$s</string>
+  <string name="voicemail_string">Mailbox</string>
+  <string name="just_now">Gerade eben</string>
+  <string name="new_call_log_carrier_video">Video über Mobilfunkanbieter</string>
+  <string name="new_call_log_duo_video">Duo-Video</string>
+  <string name="new_call_log_unknown">Unbekannt</string>
+  <string name="new_call_log_secondary_blocked">Gesperrt</string>
+  <string name="new_call_log_secondary_spam">Spam</string>
+  <plurals name="a11y_new_call_log_entry_missed_call">
+    <item quantity="one">^1 verpasster Anruf von ^2</item>
+    <item quantity="other">^1 Anrufe, der letzte ist ein verpasster Anruf von ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_answered_call">
+    <item quantity="one">^1 angenommener Anruf von ^2</item>
+    <item quantity="other">^1 Anrufe, der letzte ist ein verpasster Anruf von ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_outgoing_call">
+    <item quantity="one">^1 ausgehender Anruf an ^2</item>
+    <item quantity="other">^1 Anrufe, der letzte ist ein ausgehender Anruf an ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_blocked_call">
+    <item quantity="one">^1 blockierter Anruf von ^2</item>
+    <item quantity="other">^1 Anrufe, der letzte ist ein blockierter Anruf von ^2</item>
+  </plurals>
+  <string name="a11y_new_call_log_entry_phone_account">mit ^1,
+    über ^2</string>
+  <string name="a11y_new_call_log_entry_full_description_without_phone_account_info">^1, ^2.</string>
+  <string name="a11y_new_call_log_entry_full_description_with_phone_account_info">^1, ^2, ^3.</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-el/strings.xml b/java/com/android/dialer/calllogutils/res/values-el/strings.xml
index 20abded..9fad893 100644
--- a/java/com/android/dialer/calllogutils/res/values-el/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-el/strings.xml
@@ -1,53 +1,61 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2017 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="type_incoming" msgid="5727636795656199810">"Εισερχόμενη κλήση"</string>
-    <string name="type_incoming_pulled" msgid="8434723359163965796">"Η εισερχόμενη κλήση έχει μεταφερθεί σε άλλη συσκευή"</string>
-    <string name="type_outgoing" msgid="764896746073942963">"Εξερχόμενη κλήση"</string>
-    <string name="type_outgoing_pulled" msgid="1648517538371704193">"Η εξερχόμενη κλήση έχει μεταφερθεί σε άλλη συσκευή"</string>
-    <string name="type_missed" msgid="2997043831022028176">"Αναπάντητη κλήση"</string>
-    <string name="type_incoming_video" msgid="7507180294202642554">"Εισερχόμενη βιντεοκλήση"</string>
-    <string name="type_incoming_video_pulled" msgid="7879031598844023977">"Η εισερχόμενη βιντεοκλήση έχει μεταφερθεί σε άλλη συσκευή"</string>
-    <string name="type_outgoing_video" msgid="309370072333983910">"Εξερχόμενη βιντεοκλήση"</string>
-    <string name="type_outgoing_video_pulled" msgid="3924450629684331345">"Η εξερχόμενη βιντεοκλήση έχει μεταφερθεί σε άλλη συσκευή"</string>
-    <string name="type_missed_video" msgid="4350107016317603785">"Αναπάντητη βιντεοκλήση"</string>
-    <string name="type_voicemail" msgid="1877524395253846684">"Αυτόματος τηλεφωνητής"</string>
-    <string name="type_rejected" msgid="5632107438472996198">"Απορριφθείσα κλήση"</string>
-    <string name="type_blocked" msgid="9177237294052244929">"Αποκλεισμένη κλήση"</string>
-    <string name="call_details_minutes_abbreviation" msgid="7899774555556720560">"λ"</string>
-    <string name="call_details_seconds_abbreviation" msgid="5893806826648947126">"δ"</string>
-    <string name="a11y_call_duration_format" msgid="2905525933361674470">"<xliff:g id="MINUTES_0">%d</xliff:g> <xliff:g id="MINUTES_TRANSLATION">%s</xliff:g> <xliff:g id="SECONDS_1">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="a11y_call_duration_short_format" msgid="5908875871251062453">"<xliff:g id="SECONDS_0">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <plurals name="a11y_seconds" formatted="false" msgid="6695730844760611970">
-      <item quantity="other">δευτερόλεπτα</item>
-      <item quantity="one">δευτερόλεπτο</item>
-    </plurals>
-    <plurals name="a11y_minutes" formatted="false" msgid="6377010096698624038">
-      <item quantity="other">λεπτά</item>
-      <item quantity="one">λεπτό</item>
-    </plurals>
-    <string name="type_answered_elsewhere" msgid="411958582555881640">"Η κλήση απαντήθηκε από άλλη συσκευή"</string>
-    <string name="description_phone_account" msgid="4382951172691362244">"σε <xliff:g id="PHONEACCOUNT">^1</xliff:g>"</string>
-    <string name="description_via_number" msgid="7682575124846343076">"μέσω <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="description_via_number_phone_account" msgid="4345445677508018830">"στον λογαριασμό <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, μέσω <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="voicemail_string" msgid="6029775151483803006">"Αυτόματος τηλεφωνητής"</string>
-    <string name="now" msgid="2599778506439006806">"Τώρα"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="type_incoming">Εισερχόμενη κλήση</string>
+  <string name="type_incoming_pulled">Η εισερχόμενη κλήση έχει μεταφερθεί σε άλλη συσκευή</string>
+  <string name="type_outgoing">Εξερχόμενη κλήση</string>
+  <string name="type_outgoing_pulled">Η εξερχόμενη κλήση έχει μεταφερθεί σε άλλη συσκευή</string>
+  <string name="type_missed">Αναπάντητη κλήση</string>
+  <string name="type_incoming_video">Εισερχόμενη βιντεοκλήση</string>
+  <string name="type_incoming_video_pulled">Η εισερχόμενη βιντεοκλήση έχει μεταφερθεί σε άλλη συσκευή</string>
+  <string name="type_outgoing_video">Εξερχόμενη βιντεοκλήση</string>
+  <string name="type_outgoing_video_pulled">Η εξερχόμενη βιντεοκλήση έχει μεταφερθεί σε άλλη συσκευή</string>
+  <string name="type_missed_video">Αναπάντητη βιντεοκλήση</string>
+  <string name="type_voicemail">Αυτόματος τηλεφωνητής</string>
+  <string name="type_rejected">Απορριφθείσα κλήση</string>
+  <string name="type_blocked">Αποκλεισμένη κλήση</string>
+  <string name="call_details_minutes_abbreviation">λ</string>
+  <string name="call_details_seconds_abbreviation">δ</string>
+  <string name="a11y_call_duration_format">%1$d %2$s %3$d %4$s</string>
+  <string name="a11y_call_duration_short_format">%1$d %2$s</string>
+  <string name="call_duration_format_pattern">%1$s\'%2$s\' %3$s\'%4$s\'</string>
+  <string name="call_duration_short_format_pattern">%1$s\'%2$s\'</string>
+  <plurals name="a11y_seconds">
+    <item quantity="one">δευτερόλεπτο</item>
+    <item quantity="other">δευτερόλεπτα</item>
+  </plurals>
+  <plurals name="a11y_minutes">
+    <item quantity="one">λεπτό</item>
+    <item quantity="other">λεπτά</item>
+  </plurals>
+  <string name="type_answered_elsewhere">Η κλήση απαντήθηκε από άλλη συσκευή</string>
+  <string name="description_phone_account">σε ^1</string>
+  <string name="description_via_number">μέσω %1$s</string>
+  <string name="description_via_number_phone_account">στον λογαριασμό %1$s, μέσω %2$s</string>
+  <string name="voicemail_string">Αυτόματος τηλεφωνητής</string>
+  <string name="just_now">Μόλις τώρα</string>
+  <string name="new_call_log_carrier_video">Βιντεοκλ. μέσω εταιρ. κινητής</string>
+  <string name="new_call_log_duo_video">Βιντεοκλήση Duo</string>
+  <string name="new_call_log_unknown">Άγνωστος</string>
+  <string name="new_call_log_secondary_blocked">Αποκλεισμένοι</string>
+  <string name="new_call_log_secondary_spam">Ανεπιθύμητα μηνύματα</string>
+  <plurals name="a11y_new_call_log_entry_missed_call">
+    <item quantity="one">^1 αναπάντητη κλήση από ^2</item>
+    <item quantity="other">^1 κλήσεις, η πιο πρόσφατη είναι αναπάντητη από ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_answered_call">
+    <item quantity="one">^1 απαντημένη κλήση από ^2</item>
+    <item quantity="other">^1 κλήσεις, η πιο πρόσφατη είναι απαντημένη που έγινε από ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_outgoing_call">
+    <item quantity="one">^1 εξερχόμενη κλήση προς ^2</item>
+    <item quantity="other">^1 κλήση, η πιο πρόσφατη είναι εξερχόμενη προς ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_blocked_call">
+    <item quantity="one">^1 αποκλεισμένη κλήση από ^2</item>
+    <item quantity="other">^1 κλήσεις, η πιο πρόσφατη είναι αποκλεισμένη που έγινε από ^2</item>
+  </plurals>
+  <string name="a11y_new_call_log_entry_phone_account">στον λογαριασμό ^1,
+    μέσω ^2</string>
+  <string name="a11y_new_call_log_entry_full_description_without_phone_account_info">^1, ^2.</string>
+  <string name="a11y_new_call_log_entry_full_description_with_phone_account_info">^1, ^2, ^3.</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-en-rAU/strings.xml b/java/com/android/dialer/calllogutils/res/values-en-rAU/strings.xml
index 51c5215..42e8923 100644
--- a/java/com/android/dialer/calllogutils/res/values-en-rAU/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-en-rAU/strings.xml
@@ -1,53 +1,61 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2017 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="type_incoming" msgid="5727636795656199810">"Incoming call"</string>
-    <string name="type_incoming_pulled" msgid="8434723359163965796">"Incoming call transferred to another device"</string>
-    <string name="type_outgoing" msgid="764896746073942963">"Outgoing call"</string>
-    <string name="type_outgoing_pulled" msgid="1648517538371704193">"Outgoing call transferred to another device"</string>
-    <string name="type_missed" msgid="2997043831022028176">"Missed call"</string>
-    <string name="type_incoming_video" msgid="7507180294202642554">"Incoming video call"</string>
-    <string name="type_incoming_video_pulled" msgid="7879031598844023977">"Incoming video call transferred to another device"</string>
-    <string name="type_outgoing_video" msgid="309370072333983910">"Outgoing video call"</string>
-    <string name="type_outgoing_video_pulled" msgid="3924450629684331345">"Outgoing video call transferred to another device"</string>
-    <string name="type_missed_video" msgid="4350107016317603785">"Missed video call"</string>
-    <string name="type_voicemail" msgid="1877524395253846684">"Voicemail"</string>
-    <string name="type_rejected" msgid="5632107438472996198">"Declined call"</string>
-    <string name="type_blocked" msgid="9177237294052244929">"Blocked call"</string>
-    <string name="call_details_minutes_abbreviation" msgid="7899774555556720560">"m"</string>
-    <string name="call_details_seconds_abbreviation" msgid="5893806826648947126">"s"</string>
-    <string name="a11y_call_duration_format" msgid="2905525933361674470">"<xliff:g id="MINUTES_0">%d</xliff:g> <xliff:g id="MINUTES_TRANSLATION">%s</xliff:g> <xliff:g id="SECONDS_1">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="a11y_call_duration_short_format" msgid="5908875871251062453">"<xliff:g id="SECONDS_0">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <plurals name="a11y_seconds" formatted="false" msgid="6695730844760611970">
-      <item quantity="other">seconds</item>
-      <item quantity="one">second</item>
-    </plurals>
-    <plurals name="a11y_minutes" formatted="false" msgid="6377010096698624038">
-      <item quantity="other">minutes</item>
-      <item quantity="one">minute</item>
-    </plurals>
-    <string name="type_answered_elsewhere" msgid="411958582555881640">"Call answered on another device"</string>
-    <string name="description_phone_account" msgid="4382951172691362244">"on <xliff:g id="PHONEACCOUNT">^1</xliff:g>"</string>
-    <string name="description_via_number" msgid="7682575124846343076">"via <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="description_via_number_phone_account" msgid="4345445677508018830">"on <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, via <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="voicemail_string" msgid="6029775151483803006">"Voicemail"</string>
-    <string name="now" msgid="2599778506439006806">"Now"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="type_incoming">Incoming call</string>
+  <string name="type_incoming_pulled">Incoming call transferred to another device</string>
+  <string name="type_outgoing">Outgoing call</string>
+  <string name="type_outgoing_pulled">Outgoing call transferred to another device</string>
+  <string name="type_missed">Missed call</string>
+  <string name="type_incoming_video">Incoming video call</string>
+  <string name="type_incoming_video_pulled">Incoming video call transferred to another device</string>
+  <string name="type_outgoing_video">Outgoing video call</string>
+  <string name="type_outgoing_video_pulled">Outgoing video call transferred to another device</string>
+  <string name="type_missed_video">Missed video call</string>
+  <string name="type_voicemail">Voicemail</string>
+  <string name="type_rejected">Declined call</string>
+  <string name="type_blocked">Blocked call</string>
+  <string name="call_details_minutes_abbreviation">m</string>
+  <string name="call_details_seconds_abbreviation">s</string>
+  <string name="a11y_call_duration_format">%1$d %2$s %3$d %4$s</string>
+  <string name="a11y_call_duration_short_format">%1$d %2$s</string>
+  <string name="call_duration_format_pattern">%1$s\'%2$s\' %3$s\'%4$s\'</string>
+  <string name="call_duration_short_format_pattern">%1$s\'%2$s\'</string>
+  <plurals name="a11y_seconds">
+    <item quantity="one">second</item>
+    <item quantity="other">seconds</item>
+  </plurals>
+  <plurals name="a11y_minutes">
+    <item quantity="one">minute</item>
+    <item quantity="other">minutes</item>
+  </plurals>
+  <string name="type_answered_elsewhere">Call answered on another device</string>
+  <string name="description_phone_account">on ^1</string>
+  <string name="description_via_number">via %1$s</string>
+  <string name="description_via_number_phone_account">on %1$s, via %2$s</string>
+  <string name="voicemail_string">Voicemail</string>
+  <string name="just_now">Just now</string>
+  <string name="new_call_log_carrier_video">Operator video</string>
+  <string name="new_call_log_duo_video">Duo video</string>
+  <string name="new_call_log_unknown">Unknown</string>
+  <string name="new_call_log_secondary_blocked">Blocked</string>
+  <string name="new_call_log_secondary_spam">Spam</string>
+  <plurals name="a11y_new_call_log_entry_missed_call">
+    <item quantity="one">^1 missed call from ^2</item>
+    <item quantity="other">^1 calls, the latest of which is a missed call from ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_answered_call">
+    <item quantity="one">^1 answered call from ^2</item>
+    <item quantity="other">^1 calls, the latest of which is an answered call from ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_outgoing_call">
+    <item quantity="one">^1 outgoing call to ^2</item>
+    <item quantity="other">^1 calls, the latest of which is an outgoing call to ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_blocked_call">
+    <item quantity="one">^1 blocked call from ^2</item>
+    <item quantity="other">^1 calls, the latest of which is a blocked call from ^2</item>
+  </plurals>
+  <string name="a11y_new_call_log_entry_phone_account">on ^1,
+    via ^2</string>
+  <string name="a11y_new_call_log_entry_full_description_without_phone_account_info">^1, ^2.</string>
+  <string name="a11y_new_call_log_entry_full_description_with_phone_account_info">^1, ^2, ^3.</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-en-rGB/strings.xml b/java/com/android/dialer/calllogutils/res/values-en-rGB/strings.xml
index 51c5215..42e8923 100644
--- a/java/com/android/dialer/calllogutils/res/values-en-rGB/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-en-rGB/strings.xml
@@ -1,53 +1,61 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2017 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="type_incoming" msgid="5727636795656199810">"Incoming call"</string>
-    <string name="type_incoming_pulled" msgid="8434723359163965796">"Incoming call transferred to another device"</string>
-    <string name="type_outgoing" msgid="764896746073942963">"Outgoing call"</string>
-    <string name="type_outgoing_pulled" msgid="1648517538371704193">"Outgoing call transferred to another device"</string>
-    <string name="type_missed" msgid="2997043831022028176">"Missed call"</string>
-    <string name="type_incoming_video" msgid="7507180294202642554">"Incoming video call"</string>
-    <string name="type_incoming_video_pulled" msgid="7879031598844023977">"Incoming video call transferred to another device"</string>
-    <string name="type_outgoing_video" msgid="309370072333983910">"Outgoing video call"</string>
-    <string name="type_outgoing_video_pulled" msgid="3924450629684331345">"Outgoing video call transferred to another device"</string>
-    <string name="type_missed_video" msgid="4350107016317603785">"Missed video call"</string>
-    <string name="type_voicemail" msgid="1877524395253846684">"Voicemail"</string>
-    <string name="type_rejected" msgid="5632107438472996198">"Declined call"</string>
-    <string name="type_blocked" msgid="9177237294052244929">"Blocked call"</string>
-    <string name="call_details_minutes_abbreviation" msgid="7899774555556720560">"m"</string>
-    <string name="call_details_seconds_abbreviation" msgid="5893806826648947126">"s"</string>
-    <string name="a11y_call_duration_format" msgid="2905525933361674470">"<xliff:g id="MINUTES_0">%d</xliff:g> <xliff:g id="MINUTES_TRANSLATION">%s</xliff:g> <xliff:g id="SECONDS_1">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="a11y_call_duration_short_format" msgid="5908875871251062453">"<xliff:g id="SECONDS_0">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <plurals name="a11y_seconds" formatted="false" msgid="6695730844760611970">
-      <item quantity="other">seconds</item>
-      <item quantity="one">second</item>
-    </plurals>
-    <plurals name="a11y_minutes" formatted="false" msgid="6377010096698624038">
-      <item quantity="other">minutes</item>
-      <item quantity="one">minute</item>
-    </plurals>
-    <string name="type_answered_elsewhere" msgid="411958582555881640">"Call answered on another device"</string>
-    <string name="description_phone_account" msgid="4382951172691362244">"on <xliff:g id="PHONEACCOUNT">^1</xliff:g>"</string>
-    <string name="description_via_number" msgid="7682575124846343076">"via <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="description_via_number_phone_account" msgid="4345445677508018830">"on <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, via <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="voicemail_string" msgid="6029775151483803006">"Voicemail"</string>
-    <string name="now" msgid="2599778506439006806">"Now"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="type_incoming">Incoming call</string>
+  <string name="type_incoming_pulled">Incoming call transferred to another device</string>
+  <string name="type_outgoing">Outgoing call</string>
+  <string name="type_outgoing_pulled">Outgoing call transferred to another device</string>
+  <string name="type_missed">Missed call</string>
+  <string name="type_incoming_video">Incoming video call</string>
+  <string name="type_incoming_video_pulled">Incoming video call transferred to another device</string>
+  <string name="type_outgoing_video">Outgoing video call</string>
+  <string name="type_outgoing_video_pulled">Outgoing video call transferred to another device</string>
+  <string name="type_missed_video">Missed video call</string>
+  <string name="type_voicemail">Voicemail</string>
+  <string name="type_rejected">Declined call</string>
+  <string name="type_blocked">Blocked call</string>
+  <string name="call_details_minutes_abbreviation">m</string>
+  <string name="call_details_seconds_abbreviation">s</string>
+  <string name="a11y_call_duration_format">%1$d %2$s %3$d %4$s</string>
+  <string name="a11y_call_duration_short_format">%1$d %2$s</string>
+  <string name="call_duration_format_pattern">%1$s\'%2$s\' %3$s\'%4$s\'</string>
+  <string name="call_duration_short_format_pattern">%1$s\'%2$s\'</string>
+  <plurals name="a11y_seconds">
+    <item quantity="one">second</item>
+    <item quantity="other">seconds</item>
+  </plurals>
+  <plurals name="a11y_minutes">
+    <item quantity="one">minute</item>
+    <item quantity="other">minutes</item>
+  </plurals>
+  <string name="type_answered_elsewhere">Call answered on another device</string>
+  <string name="description_phone_account">on ^1</string>
+  <string name="description_via_number">via %1$s</string>
+  <string name="description_via_number_phone_account">on %1$s, via %2$s</string>
+  <string name="voicemail_string">Voicemail</string>
+  <string name="just_now">Just now</string>
+  <string name="new_call_log_carrier_video">Operator video</string>
+  <string name="new_call_log_duo_video">Duo video</string>
+  <string name="new_call_log_unknown">Unknown</string>
+  <string name="new_call_log_secondary_blocked">Blocked</string>
+  <string name="new_call_log_secondary_spam">Spam</string>
+  <plurals name="a11y_new_call_log_entry_missed_call">
+    <item quantity="one">^1 missed call from ^2</item>
+    <item quantity="other">^1 calls, the latest of which is a missed call from ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_answered_call">
+    <item quantity="one">^1 answered call from ^2</item>
+    <item quantity="other">^1 calls, the latest of which is an answered call from ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_outgoing_call">
+    <item quantity="one">^1 outgoing call to ^2</item>
+    <item quantity="other">^1 calls, the latest of which is an outgoing call to ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_blocked_call">
+    <item quantity="one">^1 blocked call from ^2</item>
+    <item quantity="other">^1 calls, the latest of which is a blocked call from ^2</item>
+  </plurals>
+  <string name="a11y_new_call_log_entry_phone_account">on ^1,
+    via ^2</string>
+  <string name="a11y_new_call_log_entry_full_description_without_phone_account_info">^1, ^2.</string>
+  <string name="a11y_new_call_log_entry_full_description_with_phone_account_info">^1, ^2, ^3.</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-en-rIN/strings.xml b/java/com/android/dialer/calllogutils/res/values-en-rIN/strings.xml
index 51c5215..42e8923 100644
--- a/java/com/android/dialer/calllogutils/res/values-en-rIN/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-en-rIN/strings.xml
@@ -1,53 +1,61 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2017 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="type_incoming" msgid="5727636795656199810">"Incoming call"</string>
-    <string name="type_incoming_pulled" msgid="8434723359163965796">"Incoming call transferred to another device"</string>
-    <string name="type_outgoing" msgid="764896746073942963">"Outgoing call"</string>
-    <string name="type_outgoing_pulled" msgid="1648517538371704193">"Outgoing call transferred to another device"</string>
-    <string name="type_missed" msgid="2997043831022028176">"Missed call"</string>
-    <string name="type_incoming_video" msgid="7507180294202642554">"Incoming video call"</string>
-    <string name="type_incoming_video_pulled" msgid="7879031598844023977">"Incoming video call transferred to another device"</string>
-    <string name="type_outgoing_video" msgid="309370072333983910">"Outgoing video call"</string>
-    <string name="type_outgoing_video_pulled" msgid="3924450629684331345">"Outgoing video call transferred to another device"</string>
-    <string name="type_missed_video" msgid="4350107016317603785">"Missed video call"</string>
-    <string name="type_voicemail" msgid="1877524395253846684">"Voicemail"</string>
-    <string name="type_rejected" msgid="5632107438472996198">"Declined call"</string>
-    <string name="type_blocked" msgid="9177237294052244929">"Blocked call"</string>
-    <string name="call_details_minutes_abbreviation" msgid="7899774555556720560">"m"</string>
-    <string name="call_details_seconds_abbreviation" msgid="5893806826648947126">"s"</string>
-    <string name="a11y_call_duration_format" msgid="2905525933361674470">"<xliff:g id="MINUTES_0">%d</xliff:g> <xliff:g id="MINUTES_TRANSLATION">%s</xliff:g> <xliff:g id="SECONDS_1">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="a11y_call_duration_short_format" msgid="5908875871251062453">"<xliff:g id="SECONDS_0">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <plurals name="a11y_seconds" formatted="false" msgid="6695730844760611970">
-      <item quantity="other">seconds</item>
-      <item quantity="one">second</item>
-    </plurals>
-    <plurals name="a11y_minutes" formatted="false" msgid="6377010096698624038">
-      <item quantity="other">minutes</item>
-      <item quantity="one">minute</item>
-    </plurals>
-    <string name="type_answered_elsewhere" msgid="411958582555881640">"Call answered on another device"</string>
-    <string name="description_phone_account" msgid="4382951172691362244">"on <xliff:g id="PHONEACCOUNT">^1</xliff:g>"</string>
-    <string name="description_via_number" msgid="7682575124846343076">"via <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="description_via_number_phone_account" msgid="4345445677508018830">"on <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, via <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="voicemail_string" msgid="6029775151483803006">"Voicemail"</string>
-    <string name="now" msgid="2599778506439006806">"Now"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="type_incoming">Incoming call</string>
+  <string name="type_incoming_pulled">Incoming call transferred to another device</string>
+  <string name="type_outgoing">Outgoing call</string>
+  <string name="type_outgoing_pulled">Outgoing call transferred to another device</string>
+  <string name="type_missed">Missed call</string>
+  <string name="type_incoming_video">Incoming video call</string>
+  <string name="type_incoming_video_pulled">Incoming video call transferred to another device</string>
+  <string name="type_outgoing_video">Outgoing video call</string>
+  <string name="type_outgoing_video_pulled">Outgoing video call transferred to another device</string>
+  <string name="type_missed_video">Missed video call</string>
+  <string name="type_voicemail">Voicemail</string>
+  <string name="type_rejected">Declined call</string>
+  <string name="type_blocked">Blocked call</string>
+  <string name="call_details_minutes_abbreviation">m</string>
+  <string name="call_details_seconds_abbreviation">s</string>
+  <string name="a11y_call_duration_format">%1$d %2$s %3$d %4$s</string>
+  <string name="a11y_call_duration_short_format">%1$d %2$s</string>
+  <string name="call_duration_format_pattern">%1$s\'%2$s\' %3$s\'%4$s\'</string>
+  <string name="call_duration_short_format_pattern">%1$s\'%2$s\'</string>
+  <plurals name="a11y_seconds">
+    <item quantity="one">second</item>
+    <item quantity="other">seconds</item>
+  </plurals>
+  <plurals name="a11y_minutes">
+    <item quantity="one">minute</item>
+    <item quantity="other">minutes</item>
+  </plurals>
+  <string name="type_answered_elsewhere">Call answered on another device</string>
+  <string name="description_phone_account">on ^1</string>
+  <string name="description_via_number">via %1$s</string>
+  <string name="description_via_number_phone_account">on %1$s, via %2$s</string>
+  <string name="voicemail_string">Voicemail</string>
+  <string name="just_now">Just now</string>
+  <string name="new_call_log_carrier_video">Operator video</string>
+  <string name="new_call_log_duo_video">Duo video</string>
+  <string name="new_call_log_unknown">Unknown</string>
+  <string name="new_call_log_secondary_blocked">Blocked</string>
+  <string name="new_call_log_secondary_spam">Spam</string>
+  <plurals name="a11y_new_call_log_entry_missed_call">
+    <item quantity="one">^1 missed call from ^2</item>
+    <item quantity="other">^1 calls, the latest of which is a missed call from ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_answered_call">
+    <item quantity="one">^1 answered call from ^2</item>
+    <item quantity="other">^1 calls, the latest of which is an answered call from ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_outgoing_call">
+    <item quantity="one">^1 outgoing call to ^2</item>
+    <item quantity="other">^1 calls, the latest of which is an outgoing call to ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_blocked_call">
+    <item quantity="one">^1 blocked call from ^2</item>
+    <item quantity="other">^1 calls, the latest of which is a blocked call from ^2</item>
+  </plurals>
+  <string name="a11y_new_call_log_entry_phone_account">on ^1,
+    via ^2</string>
+  <string name="a11y_new_call_log_entry_full_description_without_phone_account_info">^1, ^2.</string>
+  <string name="a11y_new_call_log_entry_full_description_with_phone_account_info">^1, ^2, ^3.</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-es-rUS/strings.xml b/java/com/android/dialer/calllogutils/res/values-es-rUS/strings.xml
index 5deb0a2..933e72f 100644
--- a/java/com/android/dialer/calllogutils/res/values-es-rUS/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-es-rUS/strings.xml
@@ -1,53 +1,61 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2017 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="type_incoming" msgid="5727636795656199810">"Llamada entrante"</string>
-    <string name="type_incoming_pulled" msgid="8434723359163965796">"La llamada entrante se transfirió a otro dispositivo"</string>
-    <string name="type_outgoing" msgid="764896746073942963">"Llamada saliente"</string>
-    <string name="type_outgoing_pulled" msgid="1648517538371704193">"La llamada saliente se transfirió a otro dispositivo"</string>
-    <string name="type_missed" msgid="2997043831022028176">"Llamada perdida"</string>
-    <string name="type_incoming_video" msgid="7507180294202642554">"Videollamada entrante"</string>
-    <string name="type_incoming_video_pulled" msgid="7879031598844023977">"La videollamada entrante se transfirió a otro dispositivo"</string>
-    <string name="type_outgoing_video" msgid="309370072333983910">"Videollamada saliente"</string>
-    <string name="type_outgoing_video_pulled" msgid="3924450629684331345">"La videollamada saliente se transfirió a otro dispositivo"</string>
-    <string name="type_missed_video" msgid="4350107016317603785">"Videollamada perdida"</string>
-    <string name="type_voicemail" msgid="1877524395253846684">"Buzón de voz"</string>
-    <string name="type_rejected" msgid="5632107438472996198">"Llamada rechazada"</string>
-    <string name="type_blocked" msgid="9177237294052244929">"Llamada bloqueada"</string>
-    <string name="call_details_minutes_abbreviation" msgid="7899774555556720560">"min"</string>
-    <string name="call_details_seconds_abbreviation" msgid="5893806826648947126">"s"</string>
-    <string name="a11y_call_duration_format" msgid="2905525933361674470">"<xliff:g id="MINUTES_0">%d</xliff:g> <xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>, <xliff:g id="SECONDS_1">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="a11y_call_duration_short_format" msgid="5908875871251062453">"<xliff:g id="SECONDS_0">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\', <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <plurals name="a11y_seconds" formatted="false" msgid="6695730844760611970">
-      <item quantity="other">segundos</item>
-      <item quantity="one">segundo</item>
-    </plurals>
-    <plurals name="a11y_minutes" formatted="false" msgid="6377010096698624038">
-      <item quantity="other">minutos</item>
-      <item quantity="one">minuto</item>
-    </plurals>
-    <string name="type_answered_elsewhere" msgid="411958582555881640">"La llamada se respondió en otro dispositivo"</string>
-    <string name="description_phone_account" msgid="4382951172691362244">"en <xliff:g id="PHONEACCOUNT">^1</xliff:g>"</string>
-    <string name="description_via_number" msgid="7682575124846343076">"por medio de <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="description_via_number_phone_account" msgid="4345445677508018830">"en <xliff:g id="PHONEACCOUNT">%1$s</xliff:g> por medio de <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="voicemail_string" msgid="6029775151483803006">"Buzón de voz"</string>
-    <string name="now" msgid="2599778506439006806">"Ahora"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="type_incoming">Llamada entrante</string>
+  <string name="type_incoming_pulled">La llamada entrante se transfirió a otro dispositivo</string>
+  <string name="type_outgoing">Llamada saliente</string>
+  <string name="type_outgoing_pulled">La llamada saliente se transfirió a otro dispositivo</string>
+  <string name="type_missed">Llamada perdida</string>
+  <string name="type_incoming_video">Videollamada entrante</string>
+  <string name="type_incoming_video_pulled">La videollamada entrante se transfirió a otro dispositivo</string>
+  <string name="type_outgoing_video">Videollamada saliente</string>
+  <string name="type_outgoing_video_pulled">La videollamada saliente se transfirió a otro dispositivo</string>
+  <string name="type_missed_video">Videollamada perdida</string>
+  <string name="type_voicemail">Correo de voz</string>
+  <string name="type_rejected">Llamada rechazada</string>
+  <string name="type_blocked">Llamada bloqueada</string>
+  <string name="call_details_minutes_abbreviation">min</string>
+  <string name="call_details_seconds_abbreviation">s</string>
+  <string name="a11y_call_duration_format">%1$d %2$s %3$d %4$s</string>
+  <string name="a11y_call_duration_short_format">%1$d %2$s</string>
+  <string name="call_duration_format_pattern">%1$s \'%2$s\', %3$s \'%4$s\'</string>
+  <string name="call_duration_short_format_pattern">%1$s \'%2$s\'</string>
+  <plurals name="a11y_seconds">
+    <item quantity="one">segundo</item>
+    <item quantity="other">segundos</item>
+  </plurals>
+  <plurals name="a11y_minutes">
+    <item quantity="one">minuto</item>
+    <item quantity="other">minutos</item>
+  </plurals>
+  <string name="type_answered_elsewhere">La llamada se respondió en otro dispositivo</string>
+  <string name="description_phone_account">en ^1</string>
+  <string name="description_via_number">por medio de %1$s</string>
+  <string name="description_via_number_phone_account">en %1$s por medio de %2$s</string>
+  <string name="voicemail_string">Correo de voz</string>
+  <string name="just_now">Recién</string>
+  <string name="new_call_log_carrier_video">Video del proveedor</string>
+  <string name="new_call_log_duo_video">Video de Duo</string>
+  <string name="new_call_log_unknown">Desconocido</string>
+  <string name="new_call_log_secondary_blocked">Bloqueada</string>
+  <string name="new_call_log_secondary_spam">Spam</string>
+  <plurals name="a11y_new_call_log_entry_missed_call">
+    <item quantity="one">^1 llamada perdida de ^2</item>
+    <item quantity="other">^1 llamadas. La última es una llamada perdida de ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_answered_call">
+    <item quantity="one">^1 llamada respondida de ^2</item>
+    <item quantity="other">^1 llamadas. La última es una llamada respondida de ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_outgoing_call">
+    <item quantity="one">^1 llamada saliente a ^2</item>
+    <item quantity="other">^1 llamadas. La última es una llamada saliente a ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_blocked_call">
+    <item quantity="one">^1 llamada bloqueada de ^2</item>
+    <item quantity="other">^1 llamadas. La última es una llamada bloqueada de ^2</item>
+  </plurals>
+  <string name="a11y_new_call_log_entry_phone_account">en ^1,
+    por medio de ^2</string>
+  <string name="a11y_new_call_log_entry_full_description_without_phone_account_info">^1, ^2.</string>
+  <string name="a11y_new_call_log_entry_full_description_with_phone_account_info">^1, ^2, ^3.</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-es/strings.xml b/java/com/android/dialer/calllogutils/res/values-es/strings.xml
index ac8992c..c3b67e0 100644
--- a/java/com/android/dialer/calllogutils/res/values-es/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-es/strings.xml
@@ -1,53 +1,61 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2017 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="type_incoming" msgid="5727636795656199810">"Llamada entrante"</string>
-    <string name="type_incoming_pulled" msgid="8434723359163965796">"Llamada entrante transferida a otro dispositivo"</string>
-    <string name="type_outgoing" msgid="764896746073942963">"Llamada realizada"</string>
-    <string name="type_outgoing_pulled" msgid="1648517538371704193">"Llamada realizada transferida a otro dispositivo"</string>
-    <string name="type_missed" msgid="2997043831022028176">"Llamada perdida"</string>
-    <string name="type_incoming_video" msgid="7507180294202642554">"Videollamada entrante"</string>
-    <string name="type_incoming_video_pulled" msgid="7879031598844023977">"Videollamada entrante transferida a otro dispositivo"</string>
-    <string name="type_outgoing_video" msgid="309370072333983910">"Videollamada realizada"</string>
-    <string name="type_outgoing_video_pulled" msgid="3924450629684331345">"Videollamada realizada transferida a otro dispositivo"</string>
-    <string name="type_missed_video" msgid="4350107016317603785">"Videollamada perdida"</string>
-    <string name="type_voicemail" msgid="1877524395253846684">"Mensaje de voz"</string>
-    <string name="type_rejected" msgid="5632107438472996198">"Llamada rechazada"</string>
-    <string name="type_blocked" msgid="9177237294052244929">"Llamada bloqueada"</string>
-    <string name="call_details_minutes_abbreviation" msgid="7899774555556720560">"min"</string>
-    <string name="call_details_seconds_abbreviation" msgid="5893806826648947126">"s"</string>
-    <string name="a11y_call_duration_format" msgid="2905525933361674470">"<xliff:g id="MINUTES_0">%d</xliff:g> <xliff:g id="MINUTES_TRANSLATION">%s</xliff:g> <xliff:g id="SECONDS_1">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="a11y_call_duration_short_format" msgid="5908875871251062453">"<xliff:g id="SECONDS_0">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <plurals name="a11y_seconds" formatted="false" msgid="6695730844760611970">
-      <item quantity="other">segundos</item>
-      <item quantity="one">segundo</item>
-    </plurals>
-    <plurals name="a11y_minutes" formatted="false" msgid="6377010096698624038">
-      <item quantity="other">minutos</item>
-      <item quantity="one">minuto</item>
-    </plurals>
-    <string name="type_answered_elsewhere" msgid="411958582555881640">"Llamada contestada en otro dispositivo"</string>
-    <string name="description_phone_account" msgid="4382951172691362244">"en <xliff:g id="PHONEACCOUNT">^1</xliff:g>"</string>
-    <string name="description_via_number" msgid="7682575124846343076">"a través del <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="description_via_number_phone_account" msgid="4345445677508018830">"en <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, a través del <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="voicemail_string" msgid="6029775151483803006">"Buzón de voz"</string>
-    <string name="now" msgid="2599778506439006806">"Ahora"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="type_incoming">Llamada entrante</string>
+  <string name="type_incoming_pulled">Llamada entrante transferida a otro dispositivo</string>
+  <string name="type_outgoing">Llamada realizada</string>
+  <string name="type_outgoing_pulled">Llamada realizada transferida a otro dispositivo</string>
+  <string name="type_missed">Llamada perdida</string>
+  <string name="type_incoming_video">Videollamada entrante</string>
+  <string name="type_incoming_video_pulled">Videollamada entrante transferida a otro dispositivo</string>
+  <string name="type_outgoing_video">Videollamada realizada</string>
+  <string name="type_outgoing_video_pulled">Videollamada realizada transferida a otro dispositivo</string>
+  <string name="type_missed_video">Videollamada perdida</string>
+  <string name="type_voicemail">Mensaje de voz</string>
+  <string name="type_rejected">Llamada rechazada</string>
+  <string name="type_blocked">Llamada bloqueada</string>
+  <string name="call_details_minutes_abbreviation">min</string>
+  <string name="call_details_seconds_abbreviation">s</string>
+  <string name="a11y_call_duration_format">%1$d %2$s %3$d %4$s</string>
+  <string name="a11y_call_duration_short_format">%1$d %2$s</string>
+  <string name="call_duration_format_pattern">%1$s \'%2$s\' %3$s \'%4$s\'</string>
+  <string name="call_duration_short_format_pattern">%1$s \'%2$s\'</string>
+  <plurals name="a11y_seconds">
+    <item quantity="one">segundo</item>
+    <item quantity="other">segundos</item>
+  </plurals>
+  <plurals name="a11y_minutes">
+    <item quantity="one">minuto</item>
+    <item quantity="other">minutos</item>
+  </plurals>
+  <string name="type_answered_elsewhere">Llamada contestada en otro dispositivo</string>
+  <string name="description_phone_account">en ^1</string>
+  <string name="description_via_number">a través del %1$s</string>
+  <string name="description_via_number_phone_account">en %1$s, a través del %2$s</string>
+  <string name="voicemail_string">Buzón de voz</string>
+  <string name="just_now">Ahora mismo</string>
+  <string name="new_call_log_carrier_video">Vídeo a través del operador</string>
+  <string name="new_call_log_duo_video">Vídeo a través de Duo</string>
+  <string name="new_call_log_unknown">Desconocido</string>
+  <string name="new_call_log_secondary_blocked">Bloqueado</string>
+  <string name="new_call_log_secondary_spam">Spam</string>
+  <plurals name="a11y_new_call_log_entry_missed_call">
+    <item quantity="one">^1 llamada perdida de ^2</item>
+    <item quantity="other">^1 llamadas; la última es una llamada perdida de ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_answered_call">
+    <item quantity="one">^1 llamada respondida de ^2</item>
+    <item quantity="other">^1 llamadas; la última es una llamada respondida de ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_outgoing_call">
+    <item quantity="one">^1 llamada realizada a ^2</item>
+    <item quantity="other">^1 llamadas; la última es una llamada realizada a ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_blocked_call">
+    <item quantity="one">^1 llamada bloqueada de ^2</item>
+    <item quantity="other">^1 llamadas; la última es una llamada bloqueada de ^2</item>
+  </plurals>
+  <string name="a11y_new_call_log_entry_phone_account">en ^1,
+    a través del ^2</string>
+  <string name="a11y_new_call_log_entry_full_description_without_phone_account_info">^1, ^2.</string>
+  <string name="a11y_new_call_log_entry_full_description_with_phone_account_info">^1, ^2, ^3.</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-et/strings.xml b/java/com/android/dialer/calllogutils/res/values-et/strings.xml
index e52f580..81b325e 100644
--- a/java/com/android/dialer/calllogutils/res/values-et/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-et/strings.xml
@@ -1,53 +1,61 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2017 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="type_incoming" msgid="5727636795656199810">"Sissetulev kõne"</string>
-    <string name="type_incoming_pulled" msgid="8434723359163965796">"Sissetulev kõne viidi üle teise seadmesse"</string>
-    <string name="type_outgoing" msgid="764896746073942963">"Väljuv kõne"</string>
-    <string name="type_outgoing_pulled" msgid="1648517538371704193">"Väljuv kõne viidi üle teise seadmesse"</string>
-    <string name="type_missed" msgid="2997043831022028176">"Vastamata kõne"</string>
-    <string name="type_incoming_video" msgid="7507180294202642554">"Sissetulev videokõne"</string>
-    <string name="type_incoming_video_pulled" msgid="7879031598844023977">"Sissetulev videokõne viidi üle teise seadmesse"</string>
-    <string name="type_outgoing_video" msgid="309370072333983910">"Väljuv videokõne"</string>
-    <string name="type_outgoing_video_pulled" msgid="3924450629684331345">"Väljuv videokõne viidi üle teise seadmesse"</string>
-    <string name="type_missed_video" msgid="4350107016317603785">"Vastamata videokõne"</string>
-    <string name="type_voicemail" msgid="1877524395253846684">"Kõnepost"</string>
-    <string name="type_rejected" msgid="5632107438472996198">"Keeldutud kõne"</string>
-    <string name="type_blocked" msgid="9177237294052244929">"Blokeeritud kõne"</string>
-    <string name="call_details_minutes_abbreviation" msgid="7899774555556720560">"min"</string>
-    <string name="call_details_seconds_abbreviation" msgid="5893806826648947126">"s"</string>
-    <string name="a11y_call_duration_format" msgid="2905525933361674470">"<xliff:g id="MINUTES_0">%d</xliff:g> <xliff:g id="MINUTES_TRANSLATION">%s</xliff:g> <xliff:g id="SECONDS_1">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="a11y_call_duration_short_format" msgid="5908875871251062453">"<xliff:g id="SECONDS_0">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <plurals name="a11y_seconds" formatted="false" msgid="6695730844760611970">
-      <item quantity="other"> sekundit</item>
-      <item quantity="one"> sekund</item>
-    </plurals>
-    <plurals name="a11y_minutes" formatted="false" msgid="6377010096698624038">
-      <item quantity="other"> minutit</item>
-      <item quantity="one"> minut</item>
-    </plurals>
-    <string name="type_answered_elsewhere" msgid="411958582555881640">"Kõnele vastati teises seadmes"</string>
-    <string name="description_phone_account" msgid="4382951172691362244">"kontol <xliff:g id="PHONEACCOUNT">^1</xliff:g>"</string>
-    <string name="description_via_number" msgid="7682575124846343076">"numbri <xliff:g id="NUMBER">%1$s</xliff:g> kaudu"</string>
-    <string name="description_via_number_phone_account" msgid="4345445677508018830">"kontol <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, numbri <xliff:g id="NUMBER">%2$s</xliff:g> kaudu"</string>
-    <string name="voicemail_string" msgid="6029775151483803006">"Kõnepost"</string>
-    <string name="now" msgid="2599778506439006806">"Praegu"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="type_incoming">Sissetulev kõne</string>
+  <string name="type_incoming_pulled">Sissetulev kõne viidi üle teise seadmesse</string>
+  <string name="type_outgoing">Väljuv kõne</string>
+  <string name="type_outgoing_pulled">Väljuv kõne viidi üle teise seadmesse</string>
+  <string name="type_missed">Vastamata kõne</string>
+  <string name="type_incoming_video">Sissetulev videokõne</string>
+  <string name="type_incoming_video_pulled">Sissetulev videokõne viidi üle teise seadmesse</string>
+  <string name="type_outgoing_video">Väljuv videokõne</string>
+  <string name="type_outgoing_video_pulled">Väljuv videokõne viidi üle teise seadmesse</string>
+  <string name="type_missed_video">Vastamata videokõne</string>
+  <string name="type_voicemail">Kõnepost</string>
+  <string name="type_rejected">Keeldutud kõne</string>
+  <string name="type_blocked">Blokeeritud kõne</string>
+  <string name="call_details_minutes_abbreviation">min</string>
+  <string name="call_details_seconds_abbreviation">s</string>
+  <string name="a11y_call_duration_format">%1$d %2$s %3$d %4$s</string>
+  <string name="a11y_call_duration_short_format">%1$d %2$s</string>
+  <string name="call_duration_format_pattern">%1$s\'%2$s\' %3$s\'%4$s\'</string>
+  <string name="call_duration_short_format_pattern">%1$s\'%2$s\'</string>
+  <plurals name="a11y_seconds">
+    <item quantity="one"> sekund</item>
+    <item quantity="other"> sekundit</item>
+  </plurals>
+  <plurals name="a11y_minutes">
+    <item quantity="one"> minut</item>
+    <item quantity="other"> minutit</item>
+  </plurals>
+  <string name="type_answered_elsewhere">Kõnele vastati teises seadmes</string>
+  <string name="description_phone_account">kontol ^1</string>
+  <string name="description_via_number">numbri %1$s kaudu</string>
+  <string name="description_via_number_phone_account">kontol %1$s, numbri %2$s kaudu</string>
+  <string name="voicemail_string">Kõnepost</string>
+  <string name="just_now">Äsja</string>
+  <string name="new_call_log_carrier_video">Operaatori video</string>
+  <string name="new_call_log_duo_video">Duo video</string>
+  <string name="new_call_log_unknown">Tundmatu</string>
+  <string name="new_call_log_secondary_blocked">Blokeeritud</string>
+  <string name="new_call_log_secondary_spam">Rämpskõned</string>
+  <plurals name="a11y_new_call_log_entry_missed_call">
+    <item quantity="one">^1 vastamata kõne kasutajalt ^2</item>
+    <item quantity="other">^1 kõnet, viimane on vastamata kõne kasutajalt ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_answered_call">
+    <item quantity="one">^1 vastatud kõne kasutajalt ^2</item>
+    <item quantity="other">^1 kõnet, viimane on vastatud kõne kasutajalt ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_outgoing_call">
+    <item quantity="one">^1 väljuv kõne kasutajale ^2</item>
+    <item quantity="other">^1 kõnet, viimane on väljuv kõne kasutajale ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_blocked_call">
+    <item quantity="one">^1 blokeeritud kõne kasutajalt ^2</item>
+    <item quantity="other">^1 kõnet, viimane on blokeeritud kõne kasutajalt ^2</item>
+  </plurals>
+  <string name="a11y_new_call_log_entry_phone_account">kontol ^1,
+    numbri ^2 kaudu</string>
+  <string name="a11y_new_call_log_entry_full_description_without_phone_account_info">^1, ^2.</string>
+  <string name="a11y_new_call_log_entry_full_description_with_phone_account_info">^1, ^2, ^3.</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-eu/strings.xml b/java/com/android/dialer/calllogutils/res/values-eu/strings.xml
index 6aa2aa6..e535914 100644
--- a/java/com/android/dialer/calllogutils/res/values-eu/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-eu/strings.xml
@@ -1,53 +1,61 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2017 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="type_incoming" msgid="5727636795656199810">"Jasotako deia"</string>
-    <string name="type_incoming_pulled" msgid="8434723359163965796">"Beste gailu batera transferitu da jasotako deia"</string>
-    <string name="type_outgoing" msgid="764896746073942963">"Egindako deia"</string>
-    <string name="type_outgoing_pulled" msgid="1648517538371704193">"Beste gailu batera transferitu da egindako deia"</string>
-    <string name="type_missed" msgid="2997043831022028176">"Dei galdua"</string>
-    <string name="type_incoming_video" msgid="7507180294202642554">"Jasotako bideo-deia"</string>
-    <string name="type_incoming_video_pulled" msgid="7879031598844023977">"Beste gailu batera transferitu da jasotako bideo-deia"</string>
-    <string name="type_outgoing_video" msgid="309370072333983910">"Egindako bideo-deia"</string>
-    <string name="type_outgoing_video_pulled" msgid="3924450629684331345">"Beste gailu batera transferitu da egindako bideo-deia"</string>
-    <string name="type_missed_video" msgid="4350107016317603785">"Bideo-dei galdua"</string>
-    <string name="type_voicemail" msgid="1877524395253846684">"Erantzungailua"</string>
-    <string name="type_rejected" msgid="5632107438472996198">"Baztertutako deia"</string>
-    <string name="type_blocked" msgid="9177237294052244929">"Blokeatutako deia"</string>
-    <string name="call_details_minutes_abbreviation" msgid="7899774555556720560">"min"</string>
-    <string name="call_details_seconds_abbreviation" msgid="5893806826648947126">"s"</string>
-    <string name="a11y_call_duration_format" msgid="2905525933361674470">"<xliff:g id="MINUTES_0">%d</xliff:g> <xliff:g id="MINUTES_TRANSLATION">%s</xliff:g> eta <xliff:g id="SECONDS_1">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="a11y_call_duration_short_format" msgid="5908875871251062453">"<xliff:g id="SECONDS_0">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' \'eta\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <plurals name="a11y_seconds" formatted="false" msgid="6695730844760611970">
-      <item quantity="other">segundo</item>
-      <item quantity="one">segundo</item>
-    </plurals>
-    <plurals name="a11y_minutes" formatted="false" msgid="6377010096698624038">
-      <item quantity="other">minutu</item>
-      <item quantity="one">minutu</item>
-    </plurals>
-    <string name="type_answered_elsewhere" msgid="411958582555881640">"Beste gailu batean erantzun zaio deiari"</string>
-    <string name="description_phone_account" msgid="4382951172691362244">"<xliff:g id="PHONEACCOUNT">^1</xliff:g> kontuan"</string>
-    <string name="description_via_number" msgid="7682575124846343076">"<xliff:g id="NUMBER">%1$s</xliff:g> bidez"</string>
-    <string name="description_via_number_phone_account" msgid="4345445677508018830">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> kontuan, <xliff:g id="NUMBER">%2$s</xliff:g> bidez"</string>
-    <string name="voicemail_string" msgid="6029775151483803006">"Erantzungailua"</string>
-    <string name="now" msgid="2599778506439006806">"Oraintxe bertan"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="type_incoming">Jasotako deia</string>
+  <string name="type_incoming_pulled">Beste gailu batera transferitu da jasotako deia</string>
+  <string name="type_outgoing">Egindako deia</string>
+  <string name="type_outgoing_pulled">Beste gailu batera transferitu da egindako deia</string>
+  <string name="type_missed">Dei galdua</string>
+  <string name="type_incoming_video">Jasotako bideo-deia</string>
+  <string name="type_incoming_video_pulled">Beste gailu batera transferitu da jasotako bideo-deia</string>
+  <string name="type_outgoing_video">Egindako bideo-deia</string>
+  <string name="type_outgoing_video_pulled">Beste gailu batera transferitu da egindako bideo-deia</string>
+  <string name="type_missed_video">Bideo-dei galdua</string>
+  <string name="type_voicemail">Erantzungailua</string>
+  <string name="type_rejected">Baztertutako deia</string>
+  <string name="type_blocked">Blokeatutako deia</string>
+  <string name="call_details_minutes_abbreviation">min</string>
+  <string name="call_details_seconds_abbreviation">s</string>
+  <string name="a11y_call_duration_format">%1$d %2$s %3$d %4$s</string>
+  <string name="a11y_call_duration_short_format">%1$d %2$s</string>
+  <string name="call_duration_format_pattern">%1$s \'%2$s\' \'eta\' %3$s \'%4$s\'</string>
+  <string name="call_duration_short_format_pattern">%1$s \'%2$s\'</string>
+  <plurals name="a11y_seconds">
+    <item quantity="one">segundo</item>
+    <item quantity="other">segundo</item>
+  </plurals>
+  <plurals name="a11y_minutes">
+    <item quantity="one">minutu</item>
+    <item quantity="other">minutu</item>
+  </plurals>
+  <string name="type_answered_elsewhere">Beste gailu batean erantzun zaio deiari</string>
+  <string name="description_phone_account">^1 kontuan</string>
+  <string name="description_via_number">%1$s bidez</string>
+  <string name="description_via_number_phone_account">%1$s kontuan, %2$s bidez</string>
+  <string name="voicemail_string">Erantzungailua</string>
+  <string name="just_now">Oraintxe</string>
+  <string name="new_call_log_carrier_video">Operadorearen bideo-deia</string>
+  <string name="new_call_log_duo_video">Duo bideo-deia</string>
+  <string name="new_call_log_unknown">Ezezaguna</string>
+  <string name="new_call_log_secondary_blocked">Blokeatutakoak</string>
+  <string name="new_call_log_secondary_spam">Spama</string>
+  <plurals name="a11y_new_call_log_entry_missed_call">
+    <item quantity="one">^1 dei galdu (^2)</item>
+    <item quantity="other">^1 dei (azken deia ^2 erabiltzailearen dei galdua da)</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_answered_call">
+    <item quantity="one">Erantzundako ^1 dei (^2)</item>
+    <item quantity="other">^1 dei (azken deia ^2 erabiltzaileari erantzundako deia da)</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_outgoing_call">
+    <item quantity="one">Egindako ^1 dei (^2)</item>
+    <item quantity="other">^1 dei (azken deia ^2 erabiltzaileari egindako deia da)</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_blocked_call">
+    <item quantity="one">Blokeatutako ^1 dei (^2)</item>
+    <item quantity="other">^1 dei (azken deia ^2 erabiltzailearen blokeatutako deia da)</item>
+  </plurals>
+  <string name="a11y_new_call_log_entry_phone_account">^1 txartela,
+    ^2 zenbakiaren bidez</string>
+  <string name="a11y_new_call_log_entry_full_description_without_phone_account_info">^1, ^2.</string>
+  <string name="a11y_new_call_log_entry_full_description_with_phone_account_info">^1, ^2, ^3.</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-fa/strings.xml b/java/com/android/dialer/calllogutils/res/values-fa/strings.xml
index 4439ca4..4f8b794 100644
--- a/java/com/android/dialer/calllogutils/res/values-fa/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-fa/strings.xml
@@ -1,53 +1,61 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2017 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="type_incoming" msgid="5727636795656199810">"تماس ورودی"</string>
-    <string name="type_incoming_pulled" msgid="8434723359163965796">"تماس ورودی به دستگاه دیگری منتقل شد"</string>
-    <string name="type_outgoing" msgid="764896746073942963">"تماس خروجی"</string>
-    <string name="type_outgoing_pulled" msgid="1648517538371704193">"تماس خروجی به دستگاه دیگری منتقل شد"</string>
-    <string name="type_missed" msgid="2997043831022028176">"تماس بی‌پاسخ"</string>
-    <string name="type_incoming_video" msgid="7507180294202642554">"تماس ویدیویی ورودی"</string>
-    <string name="type_incoming_video_pulled" msgid="7879031598844023977">"تماس ویدیویی ورودی به دستگاه دیگری منتقل شد"</string>
-    <string name="type_outgoing_video" msgid="309370072333983910">"تماس ویدیویی خروجی"</string>
-    <string name="type_outgoing_video_pulled" msgid="3924450629684331345">"تماس ویدیویی خروجی به دستگاه دیگری منتقل شد"</string>
-    <string name="type_missed_video" msgid="4350107016317603785">"تماس ویدیویی بی‌پاسخ"</string>
-    <string name="type_voicemail" msgid="1877524395253846684">"پست صوتی"</string>
-    <string name="type_rejected" msgid="5632107438472996198">"تماس ردشده"</string>
-    <string name="type_blocked" msgid="9177237294052244929">"تماس مسدودشده"</string>
-    <string name="call_details_minutes_abbreviation" msgid="7899774555556720560">"د"</string>
-    <string name="call_details_seconds_abbreviation" msgid="5893806826648947126">"ث"</string>
-    <string name="a11y_call_duration_format" msgid="2905525933361674470">"<xliff:g id="MINUTES_0">%d</xliff:g> <xliff:g id="MINUTES_TRANSLATION">%s</xliff:g> <xliff:g id="SECONDS_1">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="a11y_call_duration_short_format" msgid="5908875871251062453">"<xliff:g id="SECONDS_0">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <plurals name="a11y_seconds" formatted="false" msgid="6695730844760611970">
-      <item quantity="one">ثانیه</item>
-      <item quantity="other">ثانیه</item>
-    </plurals>
-    <plurals name="a11y_minutes" formatted="false" msgid="6377010096698624038">
-      <item quantity="one">دقیقه</item>
-      <item quantity="other">دقیقه</item>
-    </plurals>
-    <string name="type_answered_elsewhere" msgid="411958582555881640">"تماس در دستگاه دیگری پاسخ داده شد"</string>
-    <string name="description_phone_account" msgid="4382951172691362244">"در <xliff:g id="PHONEACCOUNT">^1</xliff:g>"</string>
-    <string name="description_via_number" msgid="7682575124846343076">"ازطریق <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="description_via_number_phone_account" msgid="4345445677508018830">"در <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>، ازطریق <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="voicemail_string" msgid="6029775151483803006">"پست صوتی"</string>
-    <string name="now" msgid="2599778506439006806">"اکنون"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="type_incoming">تماس ورودی</string>
+  <string name="type_incoming_pulled">تماس ورودی به دستگاه دیگری منتقل شد</string>
+  <string name="type_outgoing">تماس خروجی</string>
+  <string name="type_outgoing_pulled">تماس خروجی به دستگاه دیگری منتقل شد</string>
+  <string name="type_missed">تماس بی‌پاسخ</string>
+  <string name="type_incoming_video">تماس ویدیویی ورودی</string>
+  <string name="type_incoming_video_pulled">تماس ویدیویی ورودی به دستگاه دیگری منتقل شد</string>
+  <string name="type_outgoing_video">تماس ویدیویی خروجی</string>
+  <string name="type_outgoing_video_pulled">تماس ویدیویی خروجی به دستگاه دیگری منتقل شد</string>
+  <string name="type_missed_video">تماس ویدیویی بی‌پاسخ</string>
+  <string name="type_voicemail">پست صوتی</string>
+  <string name="type_rejected">تماس ردشده</string>
+  <string name="type_blocked">تماس مسدودشده</string>
+  <string name="call_details_minutes_abbreviation">د</string>
+  <string name="call_details_seconds_abbreviation">ث</string>
+  <string name="a11y_call_duration_format">%1$d %2$s %3$d %4$s</string>
+  <string name="a11y_call_duration_short_format">%1$d %2$s</string>
+  <string name="call_duration_format_pattern">%1$s \'%2$s\' %3$s \'%4$s\'</string>
+  <string name="call_duration_short_format_pattern">%1$s \'%2$s\'</string>
+  <plurals name="a11y_seconds">
+    <item quantity="one">ثانیه</item>
+    <item quantity="other">ثانیه</item>
+  </plurals>
+  <plurals name="a11y_minutes">
+    <item quantity="one">دقیقه</item>
+    <item quantity="other">دقیقه</item>
+  </plurals>
+  <string name="type_answered_elsewhere">تماس در دستگاه دیگری پاسخ داده شد</string>
+  <string name="description_phone_account">در ^1</string>
+  <string name="description_via_number">ازطریق %1$s</string>
+  <string name="description_via_number_phone_account">در %1$s، ازطریق %2$s</string>
+  <string name="voicemail_string">پست صوتی</string>
+  <string name="just_now">لحظاتی پیش</string>
+  <string name="new_call_log_carrier_video">تماس ویدیویی با شرکت مخابراتی</string>
+  <string name="new_call_log_duo_video">‏تماس ویدیویی Duo</string>
+  <string name="new_call_log_unknown">نامشخص</string>
+  <string name="new_call_log_secondary_blocked">مسدودشده</string>
+  <string name="new_call_log_secondary_spam">هرزنامه</string>
+  <plurals name="a11y_new_call_log_entry_missed_call">
+    <item quantity="one">^1 تماس، آخرین مورد تماس بی‌پاسخی از ^2 است</item>
+    <item quantity="other">^1 تماس، آخرین مورد تماس بی‌پاسخی از ^2 است</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_answered_call">
+    <item quantity="one">^1 تماس، آخرین مورد تماس پاسخ داده شده‌ای از ^2 است</item>
+    <item quantity="other">^1 تماس، آخرین مورد تماس پاسخ داده شده‌ای از ^2 است</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_outgoing_call">
+    <item quantity="one">^1 تماس، آخرین مورد تماسی خروجی با ^2 است</item>
+    <item quantity="other">^1 تماس، آخرین مورد تماسی خروجی با ^2 است</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_blocked_call">
+    <item quantity="one">^1 تماس، آخرین مورد تماس مسدودشده‌ای از ^2 است</item>
+    <item quantity="other">^1 تماس، آخرین مورد تماس مسدودشده‌ای از ^2 است</item>
+  </plurals>
+  <string name="a11y_new_call_log_entry_phone_account">در ^1،
+    ازطریق ^2</string>
+  <string name="a11y_new_call_log_entry_full_description_without_phone_account_info">^1، ^2.</string>
+  <string name="a11y_new_call_log_entry_full_description_with_phone_account_info">^1، ^2، ^3.</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-fi/strings.xml b/java/com/android/dialer/calllogutils/res/values-fi/strings.xml
index 41ff582..9c6bd71 100644
--- a/java/com/android/dialer/calllogutils/res/values-fi/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-fi/strings.xml
@@ -1,53 +1,61 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2017 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="type_incoming" msgid="5727636795656199810">"Saapuva puhelu"</string>
-    <string name="type_incoming_pulled" msgid="8434723359163965796">"Saapuva puhelu siirrettiin toiselle laitteelle."</string>
-    <string name="type_outgoing" msgid="764896746073942963">"Lähtevä puhelu"</string>
-    <string name="type_outgoing_pulled" msgid="1648517538371704193">"Lähtevä puhelu siirrettiin toiselle laitteelle."</string>
-    <string name="type_missed" msgid="2997043831022028176">"Vastaamaton puhelu"</string>
-    <string name="type_incoming_video" msgid="7507180294202642554">"Saapuva videopuhelu"</string>
-    <string name="type_incoming_video_pulled" msgid="7879031598844023977">"Saapuva videopuhelu siirrettiin toiselle laitteelle."</string>
-    <string name="type_outgoing_video" msgid="309370072333983910">"Lähtevä videopuhelu"</string>
-    <string name="type_outgoing_video_pulled" msgid="3924450629684331345">"Lähtevä videopuhelu siirrettiin toiselle laitteelle."</string>
-    <string name="type_missed_video" msgid="4350107016317603785">"Vastaamaton videopuhelu"</string>
-    <string name="type_voicemail" msgid="1877524395253846684">"Vastaaja"</string>
-    <string name="type_rejected" msgid="5632107438472996198">"Hylätty puhelu"</string>
-    <string name="type_blocked" msgid="9177237294052244929">"Estetty puhelu"</string>
-    <string name="call_details_minutes_abbreviation" msgid="7899774555556720560">"min"</string>
-    <string name="call_details_seconds_abbreviation" msgid="5893806826648947126">"s"</string>
-    <string name="a11y_call_duration_format" msgid="2905525933361674470">"<xliff:g id="MINUTES_0">%d</xliff:g> <xliff:g id="MINUTES_TRANSLATION">%s</xliff:g> <xliff:g id="SECONDS_1">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="a11y_call_duration_short_format" msgid="5908875871251062453">"<xliff:g id="SECONDS_0">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <plurals name="a11y_seconds" formatted="false" msgid="6695730844760611970">
-      <item quantity="other">sekuntia</item>
-      <item quantity="one">sekunti</item>
-    </plurals>
-    <plurals name="a11y_minutes" formatted="false" msgid="6377010096698624038">
-      <item quantity="other">minuuttia</item>
-      <item quantity="one">minuutti</item>
-    </plurals>
-    <string name="type_answered_elsewhere" msgid="411958582555881640">"Puheluun vastattiin toisella laitteella."</string>
-    <string name="description_phone_account" msgid="4382951172691362244">"<xliff:g id="PHONEACCOUNT">^1</xliff:g>"</string>
-    <string name="description_via_number" msgid="7682575124846343076">"numerosta <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="description_via_number_phone_account" msgid="4345445677508018830">"tililtä <xliff:g id="PHONEACCOUNT">%1$s</xliff:g> numerosta <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="voicemail_string" msgid="6029775151483803006">"Vastaaja"</string>
-    <string name="now" msgid="2599778506439006806">"Nyt"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="type_incoming">Saapuva puhelu</string>
+  <string name="type_incoming_pulled">Saapuva puhelu siirrettiin toiselle laitteelle.</string>
+  <string name="type_outgoing">Lähtevä puhelu</string>
+  <string name="type_outgoing_pulled">Lähtevä puhelu siirrettiin toiselle laitteelle.</string>
+  <string name="type_missed">Vastaamaton puhelu</string>
+  <string name="type_incoming_video">Saapuva videopuhelu</string>
+  <string name="type_incoming_video_pulled">Saapuva videopuhelu siirrettiin toiselle laitteelle.</string>
+  <string name="type_outgoing_video">Lähtevä videopuhelu</string>
+  <string name="type_outgoing_video_pulled">Lähtevä videopuhelu siirrettiin toiselle laitteelle.</string>
+  <string name="type_missed_video">Vastaamaton videopuhelu</string>
+  <string name="type_voicemail">Vastaaja</string>
+  <string name="type_rejected">Hylätty puhelu</string>
+  <string name="type_blocked">Estetty puhelu</string>
+  <string name="call_details_minutes_abbreviation">min</string>
+  <string name="call_details_seconds_abbreviation">s</string>
+  <string name="a11y_call_duration_format">%1$d %2$s %3$d %4$s</string>
+  <string name="a11y_call_duration_short_format">%1$d %2$s</string>
+  <string name="call_duration_format_pattern">%1$s \'%2$s\' %3$s \'%4$s\'</string>
+  <string name="call_duration_short_format_pattern">%1$s \'%2$s\'</string>
+  <plurals name="a11y_seconds">
+    <item quantity="one">sekunti</item>
+    <item quantity="other">sekuntia</item>
+  </plurals>
+  <plurals name="a11y_minutes">
+    <item quantity="one">minuutti</item>
+    <item quantity="other">minuuttia</item>
+  </plurals>
+  <string name="type_answered_elsewhere">Puheluun vastattiin toisella laitteella.</string>
+  <string name="description_phone_account">^1</string>
+  <string name="description_via_number">numerosta %1$s</string>
+  <string name="description_via_number_phone_account">tililtä %1$s numerosta %2$s</string>
+  <string name="voicemail_string">Vastaaja</string>
+  <string name="just_now">Juuri äsken</string>
+  <string name="new_call_log_carrier_video">Videopuhelu (puhelinliittymä)</string>
+  <string name="new_call_log_duo_video">Duo-videopuhelu</string>
+  <string name="new_call_log_unknown">Tuntematon</string>
+  <string name="new_call_log_secondary_blocked">Estetyt</string>
+  <string name="new_call_log_secondary_spam">Häirikköpuhelut</string>
+  <plurals name="a11y_new_call_log_entry_missed_call">
+    <item quantity="one">^1 vastaamaton puhelu, jonka soitti ^2</item>
+    <item quantity="other">^1 vastaamatonta puhelua, joista viimeisimmän soitti ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_answered_call">
+    <item quantity="one">^1 vastattu puhelu, jonka soitti ^2</item>
+    <item quantity="other">^1 vastattua puhelua, joista viimeisimmän soitti ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_outgoing_call">
+    <item quantity="one">^1 lähtevä puhelu, jonka vastaanottaja oli ^2</item>
+    <item quantity="other">^1 lähtevää puhelua, joista viimeisimmän vastaanottaja oli ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_blocked_call">
+    <item quantity="one">^1 estetty puhelu, jonka soitti ^2</item>
+    <item quantity="other">^1 estettyä puhelua, joista viimeisimmän soitti ^2</item>
+  </plurals>
+  <string name="a11y_new_call_log_entry_phone_account">tililtä ^1,
+numerosta ^2</string>
+  <string name="a11y_new_call_log_entry_full_description_without_phone_account_info">^1, ^2.</string>
+  <string name="a11y_new_call_log_entry_full_description_with_phone_account_info">^1, ^2, ^3.</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-fr-rCA/strings.xml b/java/com/android/dialer/calllogutils/res/values-fr-rCA/strings.xml
index 0c82893..bf96dec 100644
--- a/java/com/android/dialer/calllogutils/res/values-fr-rCA/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-fr-rCA/strings.xml
@@ -1,53 +1,61 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2017 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="type_incoming" msgid="5727636795656199810">"Appel entrant"</string>
-    <string name="type_incoming_pulled" msgid="8434723359163965796">"Appel entrant transféré à un autre appareil"</string>
-    <string name="type_outgoing" msgid="764896746073942963">"Appel sortant"</string>
-    <string name="type_outgoing_pulled" msgid="1648517538371704193">"Appel sortant transféré à un autre appareil"</string>
-    <string name="type_missed" msgid="2997043831022028176">"Appel manqué"</string>
-    <string name="type_incoming_video" msgid="7507180294202642554">"Appel vidéo entrant"</string>
-    <string name="type_incoming_video_pulled" msgid="7879031598844023977">"Appel vidéo entrant transféré à un autre appareil"</string>
-    <string name="type_outgoing_video" msgid="309370072333983910">"Appel vidéo sortant"</string>
-    <string name="type_outgoing_video_pulled" msgid="3924450629684331345">"Appel vidéo sortant transféré à un autre appareil"</string>
-    <string name="type_missed_video" msgid="4350107016317603785">"Appel vidéo manqué"</string>
-    <string name="type_voicemail" msgid="1877524395253846684">"Messagerie vocale"</string>
-    <string name="type_rejected" msgid="5632107438472996198">"Appel refusé"</string>
-    <string name="type_blocked" msgid="9177237294052244929">"Appel bloqué"</string>
-    <string name="call_details_minutes_abbreviation" msgid="7899774555556720560">"min"</string>
-    <string name="call_details_seconds_abbreviation" msgid="5893806826648947126">"s"</string>
-    <string name="a11y_call_duration_format" msgid="2905525933361674470">"<xliff:g id="MINUTES_0">%d</xliff:g> <xliff:g id="MINUTES_TRANSLATION">%s</xliff:g> <xliff:g id="SECONDS_1">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="a11y_call_duration_short_format" msgid="5908875871251062453">"<xliff:g id="SECONDS_0">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <plurals name="a11y_seconds" formatted="false" msgid="6695730844760611970">
-      <item quantity="one">seconde</item>
-      <item quantity="other">secondes</item>
-    </plurals>
-    <plurals name="a11y_minutes" formatted="false" msgid="6377010096698624038">
-      <item quantity="one">minute</item>
-      <item quantity="other">minutes</item>
-    </plurals>
-    <string name="type_answered_elsewhere" msgid="411958582555881640">"Appel reçu sur un autre appareil"</string>
-    <string name="description_phone_account" msgid="4382951172691362244">"sur <xliff:g id="PHONEACCOUNT">^1</xliff:g>"</string>
-    <string name="description_via_number" msgid="7682575124846343076">"au <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="description_via_number_phone_account" msgid="4345445677508018830">"sur <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, au <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="voicemail_string" msgid="6029775151483803006">"Messagerie vocale"</string>
-    <string name="now" msgid="2599778506439006806">"Maintenant"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="type_incoming">Appel entrant</string>
+  <string name="type_incoming_pulled">Appel entrant transféré à un autre appareil</string>
+  <string name="type_outgoing">Appel sortant</string>
+  <string name="type_outgoing_pulled">Appel sortant transféré à un autre appareil</string>
+  <string name="type_missed">Appel manqué</string>
+  <string name="type_incoming_video">Appel vidéo entrant</string>
+  <string name="type_incoming_video_pulled">Appel vidéo entrant transféré à un autre appareil</string>
+  <string name="type_outgoing_video">Appel vidéo sortant</string>
+  <string name="type_outgoing_video_pulled">Appel vidéo sortant transféré à un autre appareil</string>
+  <string name="type_missed_video">Appel vidéo manqué</string>
+  <string name="type_voicemail">Messagerie vocale</string>
+  <string name="type_rejected">Appel refusé</string>
+  <string name="type_blocked">Appel bloqué</string>
+  <string name="call_details_minutes_abbreviation">min</string>
+  <string name="call_details_seconds_abbreviation">s</string>
+  <string name="a11y_call_duration_format">%1$d %2$s %3$d %4$s</string>
+  <string name="a11y_call_duration_short_format">%1$d %2$s</string>
+  <string name="call_duration_format_pattern">%1$s \'%2$s\' %3$s \'%4$s\'</string>
+  <string name="call_duration_short_format_pattern">%1$s \'%2$s\'</string>
+  <plurals name="a11y_seconds">
+    <item quantity="one">seconde</item>
+    <item quantity="other">secondes</item>
+  </plurals>
+  <plurals name="a11y_minutes">
+    <item quantity="one">minute</item>
+    <item quantity="other">minutes</item>
+  </plurals>
+  <string name="type_answered_elsewhere">Appel reçu sur un autre appareil</string>
+  <string name="description_phone_account">sur ^1</string>
+  <string name="description_via_number">au %1$s</string>
+  <string name="description_via_number_phone_account">sur %1$s, au %2$s</string>
+  <string name="voicemail_string">Messagerie vocale</string>
+  <string name="just_now">À l\'instant</string>
+  <string name="new_call_log_carrier_video">Appel vidéo par le fournisseur</string>
+  <string name="new_call_log_duo_video">Appel vidéo Duo</string>
+  <string name="new_call_log_unknown">Inconnu</string>
+  <string name="new_call_log_secondary_blocked">Appels bloqués</string>
+  <string name="new_call_log_secondary_spam">Appels importuns</string>
+  <plurals name="a11y_new_call_log_entry_missed_call">
+    <item quantity="one">^1 appel manqué de ^2</item>
+    <item quantity="other">^1 appels, dont le dernier est un appel manqué de ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_answered_call">
+    <item quantity="one">^1 appel accepté de ^2</item>
+    <item quantity="other">^1 appels, dont le dernier est un appel accepté de ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_outgoing_call">
+    <item quantity="one">^1 appel sortant à ^2</item>
+    <item quantity="other">^1 appels, dont le dernier est un appel sortant à ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_blocked_call">
+    <item quantity="one">^1 appel bloqué de ^2</item>
+    <item quantity="other">^1 appels, dont le dernier est un appel bloqué de ^2</item>
+  </plurals>
+  <string name="a11y_new_call_log_entry_phone_account">sur le compte ^1,
+    au numéro ^2</string>
+  <string name="a11y_new_call_log_entry_full_description_without_phone_account_info">^1, ^2.</string>
+  <string name="a11y_new_call_log_entry_full_description_with_phone_account_info">^1, ^2, ^3.</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-fr/strings.xml b/java/com/android/dialer/calllogutils/res/values-fr/strings.xml
index c1b9ea6..adb816c 100644
--- a/java/com/android/dialer/calllogutils/res/values-fr/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-fr/strings.xml
@@ -1,53 +1,61 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2017 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="type_incoming" msgid="5727636795656199810">"Appel entrant"</string>
-    <string name="type_incoming_pulled" msgid="8434723359163965796">"Appel entrant transféré vers un autre appareil"</string>
-    <string name="type_outgoing" msgid="764896746073942963">"Appel sortant"</string>
-    <string name="type_outgoing_pulled" msgid="1648517538371704193">"Appel sortant transféré vers un autre appareil"</string>
-    <string name="type_missed" msgid="2997043831022028176">"Appel manqué"</string>
-    <string name="type_incoming_video" msgid="7507180294202642554">"Appel vidéo entrant"</string>
-    <string name="type_incoming_video_pulled" msgid="7879031598844023977">"Appel vidéo entrant transféré vers un autre appareil"</string>
-    <string name="type_outgoing_video" msgid="309370072333983910">"Appel vidéo sortant"</string>
-    <string name="type_outgoing_video_pulled" msgid="3924450629684331345">"Appel vidéo sortant transféré vers un autre appareil"</string>
-    <string name="type_missed_video" msgid="4350107016317603785">"Appel vidéo manqué"</string>
-    <string name="type_voicemail" msgid="1877524395253846684">"Messagerie vocale"</string>
-    <string name="type_rejected" msgid="5632107438472996198">"Appel refusé"</string>
-    <string name="type_blocked" msgid="9177237294052244929">"Appel bloqué"</string>
-    <string name="call_details_minutes_abbreviation" msgid="7899774555556720560">"min"</string>
-    <string name="call_details_seconds_abbreviation" msgid="5893806826648947126">"s"</string>
-    <string name="a11y_call_duration_format" msgid="2905525933361674470">"<xliff:g id="MINUTES_0">%d</xliff:g> <xliff:g id="MINUTES_TRANSLATION">%s</xliff:g> et <xliff:g id="SECONDS_1">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="a11y_call_duration_short_format" msgid="5908875871251062453">"<xliff:g id="SECONDS_0">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <plurals name="a11y_seconds" formatted="false" msgid="6695730844760611970">
-      <item quantity="one">seconde</item>
-      <item quantity="other">secondes</item>
-    </plurals>
-    <plurals name="a11y_minutes" formatted="false" msgid="6377010096698624038">
-      <item quantity="one">minute</item>
-      <item quantity="other">minutes</item>
-    </plurals>
-    <string name="type_answered_elsewhere" msgid="411958582555881640">"Appel pris sur un autre appareil"</string>
-    <string name="description_phone_account" msgid="4382951172691362244">"sur <xliff:g id="PHONEACCOUNT">^1</xliff:g>"</string>
-    <string name="description_via_number" msgid="7682575124846343076">"au <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="description_via_number_phone_account" msgid="4345445677508018830">"sur <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, au <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="voicemail_string" msgid="6029775151483803006">"Messagerie vocale"</string>
-    <string name="now" msgid="2599778506439006806">"À l\'instant"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="type_incoming">Appel entrant</string>
+  <string name="type_incoming_pulled">Appel entrant transféré vers un autre appareil</string>
+  <string name="type_outgoing">Appel sortant</string>
+  <string name="type_outgoing_pulled">Appel sortant transféré vers un autre appareil</string>
+  <string name="type_missed">Appel manqué</string>
+  <string name="type_incoming_video">Appel vidéo entrant</string>
+  <string name="type_incoming_video_pulled">Appel vidéo entrant transféré vers un autre appareil</string>
+  <string name="type_outgoing_video">Appel vidéo sortant</string>
+  <string name="type_outgoing_video_pulled">Appel vidéo sortant transféré vers un autre appareil</string>
+  <string name="type_missed_video">Appel vidéo manqué</string>
+  <string name="type_voicemail">Messagerie vocale</string>
+  <string name="type_rejected">Appel refusé</string>
+  <string name="type_blocked">Appel bloqué</string>
+  <string name="call_details_minutes_abbreviation">min</string>
+  <string name="call_details_seconds_abbreviation">s</string>
+  <string name="a11y_call_duration_format">%1$d %2$s %3$d %4$s</string>
+  <string name="a11y_call_duration_short_format">%1$d %2$s</string>
+  <string name="call_duration_format_pattern">%1$s\'%2$s\' %3$s\'%4$s\'</string>
+  <string name="call_duration_short_format_pattern">%1$s\'%2$s\'</string>
+  <plurals name="a11y_seconds">
+    <item quantity="one">seconde</item>
+    <item quantity="other">secondes</item>
+  </plurals>
+  <plurals name="a11y_minutes">
+    <item quantity="one">minute</item>
+    <item quantity="other">minutes</item>
+  </plurals>
+  <string name="type_answered_elsewhere">Appel pris sur un autre appareil</string>
+  <string name="description_phone_account">sur ^1</string>
+  <string name="description_via_number">au %1$s</string>
+  <string name="description_via_number_phone_account">sur %1$s, au %2$s</string>
+  <string name="voicemail_string">Messagerie vocale</string>
+  <string name="just_now">À l\'instant</string>
+  <string name="new_call_log_carrier_video">Vidéo via l\'opérateur</string>
+  <string name="new_call_log_duo_video">Vidéo Duo</string>
+  <string name="new_call_log_unknown">Numéro inconnu</string>
+  <string name="new_call_log_secondary_blocked">Appels bloqués</string>
+  <string name="new_call_log_secondary_spam">Indésirables</string>
+  <plurals name="a11y_new_call_log_entry_missed_call">
+    <item quantity="one">^1 appel manqué de ^2</item>
+    <item quantity="other">^1 appels manqués de ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_answered_call">
+    <item quantity="one">^1 appel, le dernier provenait de ^2 et a bien été reçu</item>
+    <item quantity="other">^1 appels, le dernier provenait de ^2 et a bien été reçu</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_outgoing_call">
+    <item quantity="one">^1 appel, le dernier est un appel sortant vers ^2</item>
+    <item quantity="other">^1 appels, le dernier est un appel sortant vers ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_blocked_call">
+    <item quantity="one">^1 appel, le dernier est un appel bloqué de ^2</item>
+    <item quantity="other">^1 appels, le dernier est un appel bloqué de ^2</item>
+  </plurals>
+  <string name="a11y_new_call_log_entry_phone_account">dans le compte ^1,
+    avec le numéro ^2</string>
+  <string name="a11y_new_call_log_entry_full_description_without_phone_account_info">^1, ^2.</string>
+  <string name="a11y_new_call_log_entry_full_description_with_phone_account_info">^1, ^2, ^3.</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-gl/strings.xml b/java/com/android/dialer/calllogutils/res/values-gl/strings.xml
index bbf75e2..7a6839f 100644
--- a/java/com/android/dialer/calllogutils/res/values-gl/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-gl/strings.xml
@@ -1,53 +1,61 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2017 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="type_incoming" msgid="5727636795656199810">"Chamada entrante"</string>
-    <string name="type_incoming_pulled" msgid="8434723359163965796">"A chamada entrante transferiuse a outro dispositivo"</string>
-    <string name="type_outgoing" msgid="764896746073942963">"Chamada saínte"</string>
-    <string name="type_outgoing_pulled" msgid="1648517538371704193">"A chamada saínte transferiuse a outro dispositivo"</string>
-    <string name="type_missed" msgid="2997043831022028176">"Chamada perdida"</string>
-    <string name="type_incoming_video" msgid="7507180294202642554">"Videochamada entrante"</string>
-    <string name="type_incoming_video_pulled" msgid="7879031598844023977">"A videochamada entrante transferiuse a outro dispositivo"</string>
-    <string name="type_outgoing_video" msgid="309370072333983910">"Videochamada saínte"</string>
-    <string name="type_outgoing_video_pulled" msgid="3924450629684331345">"A videochamada saínte transferiuse a outro dispositivo"</string>
-    <string name="type_missed_video" msgid="4350107016317603785">"Videochamada perdida"</string>
-    <string name="type_voicemail" msgid="1877524395253846684">"Correo de voz"</string>
-    <string name="type_rejected" msgid="5632107438472996198">"Chamada rexeitada"</string>
-    <string name="type_blocked" msgid="9177237294052244929">"Chamada bloqueada"</string>
-    <string name="call_details_minutes_abbreviation" msgid="7899774555556720560">"min"</string>
-    <string name="call_details_seconds_abbreviation" msgid="5893806826648947126">"s"</string>
-    <string name="a11y_call_duration_format" msgid="2905525933361674470">"<xliff:g id="MINUTES_0">%d</xliff:g> <xliff:g id="MINUTES_TRANSLATION">%s</xliff:g> <xliff:g id="SECONDS_1">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="a11y_call_duration_short_format" msgid="5908875871251062453">"<xliff:g id="SECONDS_0">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <plurals name="a11y_seconds" formatted="false" msgid="6695730844760611970">
-      <item quantity="other">segundos</item>
-      <item quantity="one">segundo</item>
-    </plurals>
-    <plurals name="a11y_minutes" formatted="false" msgid="6377010096698624038">
-      <item quantity="other">minutos</item>
-      <item quantity="one">minuto</item>
-    </plurals>
-    <string name="type_answered_elsewhere" msgid="411958582555881640">"A chamada respondeuse noutro dispositivo"</string>
-    <string name="description_phone_account" msgid="4382951172691362244">"en <xliff:g id="PHONEACCOUNT">^1</xliff:g>"</string>
-    <string name="description_via_number" msgid="7682575124846343076">"a través do <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="description_via_number_phone_account" msgid="4345445677508018830">"en <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, a través do <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="voicemail_string" msgid="6029775151483803006">"Correo de voz"</string>
-    <string name="now" msgid="2599778506439006806">"Agora"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="type_incoming">Chamada entrante</string>
+  <string name="type_incoming_pulled">A chamada entrante transferiuse a outro dispositivo</string>
+  <string name="type_outgoing">Chamada saínte</string>
+  <string name="type_outgoing_pulled">A chamada saínte transferiuse a outro dispositivo</string>
+  <string name="type_missed">Chamada perdida</string>
+  <string name="type_incoming_video">Videochamada entrante</string>
+  <string name="type_incoming_video_pulled">A videochamada entrante transferiuse a outro dispositivo</string>
+  <string name="type_outgoing_video">Videochamada saínte</string>
+  <string name="type_outgoing_video_pulled">A videochamada saínte transferiuse a outro dispositivo</string>
+  <string name="type_missed_video">Videochamada perdida</string>
+  <string name="type_voicemail">Correo de voz</string>
+  <string name="type_rejected">Chamada rexeitada</string>
+  <string name="type_blocked">Chamada bloqueada</string>
+  <string name="call_details_minutes_abbreviation">min</string>
+  <string name="call_details_seconds_abbreviation">s</string>
+  <string name="a11y_call_duration_format">%1$d %2$s %3$d %4$s</string>
+  <string name="a11y_call_duration_short_format">%1$d %2$s</string>
+  <string name="call_duration_format_pattern">%1$s \'%2$s\' %3$s \'%4$s\'</string>
+  <string name="call_duration_short_format_pattern">%1$s \'%2$s\'</string>
+  <plurals name="a11y_seconds">
+    <item quantity="one">segundo</item>
+    <item quantity="other">segundos</item>
+  </plurals>
+  <plurals name="a11y_minutes">
+    <item quantity="one">minuto</item>
+    <item quantity="other">minutos</item>
+  </plurals>
+  <string name="type_answered_elsewhere">A chamada respondeuse noutro dispositivo</string>
+  <string name="description_phone_account">en ^1</string>
+  <string name="description_via_number">a través do %1$s</string>
+  <string name="description_via_number_phone_account">en %1$s, a través do %2$s</string>
+  <string name="voicemail_string">Correo de voz</string>
+  <string name="just_now">Agora mesmo</string>
+  <string name="new_call_log_carrier_video">Vídeo do operador</string>
+  <string name="new_call_log_duo_video">Vídeo de Duo</string>
+  <string name="new_call_log_unknown">Descoñecidos</string>
+  <string name="new_call_log_secondary_blocked">Bloqueada</string>
+  <string name="new_call_log_secondary_spam">Spam</string>
+  <plurals name="a11y_new_call_log_entry_missed_call">
+    <item quantity="one">^1 chamada perdida de ^2</item>
+    <item quantity="other">^1 chamadas. A última é unha chamada perdida de ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_answered_call">
+    <item quantity="one">^1 chamada respondida de ^2</item>
+    <item quantity="other">^1 chamadas. A última é unha chamada respondida de ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_outgoing_call">
+    <item quantity="one">^1 chamada saínte a ^2</item>
+    <item quantity="other">^1 chamadas. A última é unha chamada saínte a ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_blocked_call">
+    <item quantity="one">^1 chamada bloqueada de ^2</item>
+    <item quantity="other">^1 chamadas. A última é unha chamada bloqueada de ^2</item>
+  </plurals>
+  <string name="a11y_new_call_log_entry_phone_account">en ^1,
+    a través do ^2</string>
+  <string name="a11y_new_call_log_entry_full_description_without_phone_account_info">^1, ^2.</string>
+  <string name="a11y_new_call_log_entry_full_description_with_phone_account_info">^1, ^2, ^3.</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-gu/strings.xml b/java/com/android/dialer/calllogutils/res/values-gu/strings.xml
index 37c8551..f378de1 100644
--- a/java/com/android/dialer/calllogutils/res/values-gu/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-gu/strings.xml
@@ -1,53 +1,61 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2017 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="type_incoming" msgid="5727636795656199810">"ઇનકમિંગ કૉલ"</string>
-    <string name="type_incoming_pulled" msgid="8434723359163965796">"ઇનકમિંગ કૉલ બીજા ઉપકરણ પર સ્થાનાંતરિત કર્યો"</string>
-    <string name="type_outgoing" msgid="764896746073942963">"આઉટગોઇંગ કૉલ"</string>
-    <string name="type_outgoing_pulled" msgid="1648517538371704193">"આઉટગોઇંગ કૉલ બીજા ઉપકરણ પર સ્થાનાંતરિત કર્યો"</string>
-    <string name="type_missed" msgid="2997043831022028176">"ચૂકી ગયેલ કૉલ"</string>
-    <string name="type_incoming_video" msgid="7507180294202642554">"ઇનકમિંગ વિડિઓ કૉલ"</string>
-    <string name="type_incoming_video_pulled" msgid="7879031598844023977">"ઇનકમિંગ વિડિઓ કૉલ બીજા ઉપકરણ પર સ્થાનાંતરિત કર્યો"</string>
-    <string name="type_outgoing_video" msgid="309370072333983910">"આઉટગોઇંગ વિડિઓ કૉલ"</string>
-    <string name="type_outgoing_video_pulled" msgid="3924450629684331345">"આઉટગોઇંગ વિડિઓ કૉલ બીજા ઉપકરણ પર સ્થાનાંતરિત કર્યો"</string>
-    <string name="type_missed_video" msgid="4350107016317603785">"ચૂકી ગયેલ વિડિઓ કૉલ"</string>
-    <string name="type_voicemail" msgid="1877524395253846684">"વૉઇસમેઇલ"</string>
-    <string name="type_rejected" msgid="5632107438472996198">"નકારેલો કૉલ"</string>
-    <string name="type_blocked" msgid="9177237294052244929">"અવરોધિત કૉલ"</string>
-    <string name="call_details_minutes_abbreviation" msgid="7899774555556720560">"મિ"</string>
-    <string name="call_details_seconds_abbreviation" msgid="5893806826648947126">"સે"</string>
-    <string name="a11y_call_duration_format" msgid="2905525933361674470">"<xliff:g id="MINUTES_0">%d</xliff:g> <xliff:g id="MINUTES_TRANSLATION">%s</xliff:g> <xliff:g id="SECONDS_1">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="a11y_call_duration_short_format" msgid="5908875871251062453">"<xliff:g id="SECONDS_0">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <plurals name="a11y_seconds" formatted="false" msgid="6695730844760611970">
-      <item quantity="one">સેકન્ડ</item>
-      <item quantity="other">સેકન્ડ</item>
-    </plurals>
-    <plurals name="a11y_minutes" formatted="false" msgid="6377010096698624038">
-      <item quantity="one">મિનિટ</item>
-      <item quantity="other">મિનિટ</item>
-    </plurals>
-    <string name="type_answered_elsewhere" msgid="411958582555881640">"બીજા ઉપકરણ પર કૉલનો જવાબ આપ્યો"</string>
-    <string name="description_phone_account" msgid="4382951172691362244">"<xliff:g id="PHONEACCOUNT">^1</xliff:g> પર"</string>
-    <string name="description_via_number" msgid="7682575124846343076">"<xliff:g id="NUMBER">%1$s</xliff:g> મારફતે"</string>
-    <string name="description_via_number_phone_account" msgid="4345445677508018830">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> પર, <xliff:g id="NUMBER">%2$s</xliff:g> મારફતે"</string>
-    <string name="voicemail_string" msgid="6029775151483803006">"વૉઇસમેઇલ"</string>
-    <string name="now" msgid="2599778506439006806">"હમણાં"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="type_incoming">ઇનકમિંગ કૉલ</string>
+  <string name="type_incoming_pulled">ઇનકમિંગ કૉલ બીજા ઉપકરણ પર સ્થાનાંતરિત કર્યો</string>
+  <string name="type_outgoing">આઉટગોઇંગ કૉલ</string>
+  <string name="type_outgoing_pulled">આઉટગોઇંગ કૉલ બીજા ઉપકરણ પર સ્થાનાંતરિત કર્યો</string>
+  <string name="type_missed">ચૂકી ગયેલ કૉલ</string>
+  <string name="type_incoming_video">ઇનકમિંગ વિડિઓ કૉલ</string>
+  <string name="type_incoming_video_pulled">ઇનકમિંગ વિડિઓ કૉલ બીજા ઉપકરણ પર સ્થાનાંતરિત કર્યો</string>
+  <string name="type_outgoing_video">આઉટગોઇંગ વિડિઓ કૉલ</string>
+  <string name="type_outgoing_video_pulled">આઉટગોઇંગ વિડિઓ કૉલ બીજા ઉપકરણ પર સ્થાનાંતરિત કર્યો</string>
+  <string name="type_missed_video">ચૂકી ગયેલ વિડિઓ કૉલ</string>
+  <string name="type_voicemail">વૉઇસમેઇલ</string>
+  <string name="type_rejected">નકારેલો કૉલ</string>
+  <string name="type_blocked">અવરોધિત કૉલ</string>
+  <string name="call_details_minutes_abbreviation">મિ</string>
+  <string name="call_details_seconds_abbreviation">સે</string>
+  <string name="a11y_call_duration_format">%1$d %2$s %3$d %4$s</string>
+  <string name="a11y_call_duration_short_format">%1$d %2$s</string>
+  <string name="call_duration_format_pattern">%1$s\'%2$s\' %3$s\'%4$s\'</string>
+  <string name="call_duration_short_format_pattern">%1$s\'%2$s\'</string>
+  <plurals name="a11y_seconds">
+    <item quantity="one">સેકન્ડ</item>
+    <item quantity="other">સેકન્ડ</item>
+  </plurals>
+  <plurals name="a11y_minutes">
+    <item quantity="one">મિનિટ</item>
+    <item quantity="other">મિનિટ</item>
+  </plurals>
+  <string name="type_answered_elsewhere">બીજા ઉપકરણ પર કૉલનો જવાબ આપ્યો</string>
+  <string name="description_phone_account">^1 પર</string>
+  <string name="description_via_number">%1$s મારફતે</string>
+  <string name="description_via_number_phone_account">%1$s પર, %2$s મારફતે</string>
+  <string name="voicemail_string">વૉઇસમેઇલ</string>
+  <string name="just_now">હમણાં જ</string>
+  <string name="new_call_log_carrier_video">કૅરિઅર વીડિઓ કૉલ</string>
+  <string name="new_call_log_duo_video">Duo વીડિઓ</string>
+  <string name="new_call_log_unknown">અજ્ઞાત</string>
+  <string name="new_call_log_secondary_blocked">બ્લૉક કરેલ</string>
+  <string name="new_call_log_secondary_spam">સ્પામ</string>
+  <plurals name="a11y_new_call_log_entry_missed_call">
+    <item quantity="one">^1 કૉલ, હાલમાં ^2નો ચૂકી ગયેલ કૉલ છે</item>
+    <item quantity="other">^1 કૉલ, હાલમાં ^2નો ચૂકી ગયેલ કૉલ છે</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_answered_call">
+    <item quantity="one">^1 કૉલ, હાલમાં ^2નો જવાબી કૉલ છે</item>
+    <item quantity="other">^1 કૉલ, હાલમાં ^2નો જવાબી કૉલ છે</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_outgoing_call">
+    <item quantity="one">^1 કૉલ, હાલમાં ^2 માટે આઉટગોઇંગ કૉલ છે</item>
+    <item quantity="other">^1 કૉલ, હાલમાં ^2 માટે આઉટગોઇંગ કૉલ છે</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_blocked_call">
+    <item quantity="one">^1 કૉલ, હાલમાં ^2નો બ્લૉક કરેલ કૉલ</item>
+    <item quantity="other">^1 કૉલ, હાલમાં ^2નો બ્લૉક કરેલ કૉલ</item>
+  </plurals>
+  <string name="a11y_new_call_log_entry_phone_account">^1 પર,
+    ^2 મારફતે</string>
+  <string name="a11y_new_call_log_entry_full_description_without_phone_account_info">^1, ^2.</string>
+  <string name="a11y_new_call_log_entry_full_description_with_phone_account_info">^1, ^2, ^3.</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-hi/strings.xml b/java/com/android/dialer/calllogutils/res/values-hi/strings.xml
index 44e9b90..518c45a 100644
--- a/java/com/android/dialer/calllogutils/res/values-hi/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-hi/strings.xml
@@ -1,53 +1,61 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2017 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="type_incoming" msgid="5727636795656199810">"इनकमिंग कॉल"</string>
-    <string name="type_incoming_pulled" msgid="8434723359163965796">"इनकमिंग कॉल दूसरे डिवाइस पर स्थानान्तरित किया गया"</string>
-    <string name="type_outgoing" msgid="764896746073942963">"आउटगोइंग कॉल"</string>
-    <string name="type_outgoing_pulled" msgid="1648517538371704193">"आउटगोइंग कॉल दूसरे डिवाइस पर स्थानान्तरित किया गया"</string>
-    <string name="type_missed" msgid="2997043831022028176">"छूटा कॉल"</string>
-    <string name="type_incoming_video" msgid="7507180294202642554">"इनकमिंग वीडियो कॉल"</string>
-    <string name="type_incoming_video_pulled" msgid="7879031598844023977">"इनकमिंग वीडियो कॉल दूसरे डिवाइस पर स्थानान्तरित किया गया"</string>
-    <string name="type_outgoing_video" msgid="309370072333983910">"आउटगोइंग वीडियो कॉल"</string>
-    <string name="type_outgoing_video_pulled" msgid="3924450629684331345">"आउटगोइंग वीडियो कॉल दूसरे डिवाइस पर स्थानान्तरित किया गया"</string>
-    <string name="type_missed_video" msgid="4350107016317603785">"छूटा वीडियो कॉल"</string>
-    <string name="type_voicemail" msgid="1877524395253846684">"वॉइसमेल"</string>
-    <string name="type_rejected" msgid="5632107438472996198">"अस्वीकार किया गया कॉल"</string>
-    <string name="type_blocked" msgid="9177237294052244929">"अवरोधित किया गया कॉल"</string>
-    <string name="call_details_minutes_abbreviation" msgid="7899774555556720560">"मि."</string>
-    <string name="call_details_seconds_abbreviation" msgid="5893806826648947126">"से."</string>
-    <string name="a11y_call_duration_format" msgid="2905525933361674470">"<xliff:g id="MINUTES_0">%d</xliff:g> <xliff:g id="MINUTES_TRANSLATION">%s</xliff:g> <xliff:g id="SECONDS_1">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="a11y_call_duration_short_format" msgid="5908875871251062453">"<xliff:g id="SECONDS_0">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <plurals name="a11y_seconds" formatted="false" msgid="6695730844760611970">
-      <item quantity="one">सेकंड</item>
-      <item quantity="other">सेकंड</item>
-    </plurals>
-    <plurals name="a11y_minutes" formatted="false" msgid="6377010096698624038">
-      <item quantity="one">मिनट</item>
-      <item quantity="other">मिनट</item>
-    </plurals>
-    <string name="type_answered_elsewhere" msgid="411958582555881640">"दूसरे डिवाइस पर कॉल का जवाब दिया गया"</string>
-    <string name="description_phone_account" msgid="4382951172691362244">"<xliff:g id="PHONEACCOUNT">^1</xliff:g> पर"</string>
-    <string name="description_via_number" msgid="7682575124846343076">"<xliff:g id="NUMBER">%1$s</xliff:g> से"</string>
-    <string name="description_via_number_phone_account" msgid="4345445677508018830">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> पर, <xliff:g id="NUMBER">%2$s</xliff:g> से"</string>
-    <string name="voicemail_string" msgid="6029775151483803006">"वॉइसमेल"</string>
-    <string name="now" msgid="2599778506439006806">"अभी"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="type_incoming">इनकमिंग कॉल</string>
+  <string name="type_incoming_pulled">इनकमिंग कॉल दूसरे डिवाइस पर स्थानान्तरित किया गया</string>
+  <string name="type_outgoing">आउटगोइंग कॉल</string>
+  <string name="type_outgoing_pulled">आउटगोइंग कॉल दूसरे डिवाइस पर स्थानान्तरित किया गया</string>
+  <string name="type_missed">छूटा कॉल</string>
+  <string name="type_incoming_video">इनकमिंग वीडियो कॉल</string>
+  <string name="type_incoming_video_pulled">इनकमिंग वीडियो कॉल दूसरे डिवाइस पर स्थानान्तरित किया गया</string>
+  <string name="type_outgoing_video">आउटगोइंग वीडियो कॉल</string>
+  <string name="type_outgoing_video_pulled">आउटगोइंग वीडियो कॉल दूसरे डिवाइस पर स्थानान्तरित किया गया</string>
+  <string name="type_missed_video">छूटा वीडियो कॉल</string>
+  <string name="type_voicemail">वॉइसमेल</string>
+  <string name="type_rejected">अस्वीकार किया गया कॉल</string>
+  <string name="type_blocked">अवरोधित किया गया कॉल</string>
+  <string name="call_details_minutes_abbreviation">मि.</string>
+  <string name="call_details_seconds_abbreviation">से.</string>
+  <string name="a11y_call_duration_format">%1$d %2$s %3$d %4$s</string>
+  <string name="a11y_call_duration_short_format">%1$d %2$s</string>
+  <string name="call_duration_format_pattern">%1$s \'%2$s\' %3$s \'%4$s\'</string>
+  <string name="call_duration_short_format_pattern">%1$s \'%2$s\'</string>
+  <plurals name="a11y_seconds">
+    <item quantity="one">सेकंड</item>
+    <item quantity="other">सेकंड</item>
+  </plurals>
+  <plurals name="a11y_minutes">
+    <item quantity="one">मिनट</item>
+    <item quantity="other">मिनट</item>
+  </plurals>
+  <string name="type_answered_elsewhere">दूसरे डिवाइस पर कॉल का जवाब दिया गया</string>
+  <string name="description_phone_account">^1 पर</string>
+  <string name="description_via_number">%1$s से</string>
+  <string name="description_via_number_phone_account">%1$s पर, %2$s से</string>
+  <string name="voicemail_string">वॉइसमेल</string>
+  <string name="just_now">अभी-अभी</string>
+  <string name="new_call_log_carrier_video">वाहक वीडियो</string>
+  <string name="new_call_log_duo_video">Duo वीडियो</string>
+  <string name="new_call_log_unknown">अज्ञात</string>
+  <string name="new_call_log_secondary_blocked">ब्लॉक किए गए</string>
+  <string name="new_call_log_secondary_spam">स्पैम</string>
+  <plurals name="a11y_new_call_log_entry_missed_call">
+    <item quantity="one">^1 कॉल, सबसे नया वाला ^2 का छूटा कॉल है</item>
+    <item quantity="other">^1 कॉल, सबसे नया वाला ^2 का छूटा कॉल है</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_answered_call">
+    <item quantity="one">^1 कॉल, सबसे नया वाला ^2 का कॉल है, जिसका जवाब दिया गया था.</item>
+    <item quantity="other">^1 कॉल, सबसे नया वाला ^2 का कॉल है, जिसका जवाब दिया गया था.</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_outgoing_call">
+    <item quantity="one">^1 कॉल, सबसे नया वाला ^2 को किया गया आउटगोइंग कॉल है</item>
+    <item quantity="other">^1 कॉल, सबसे नया वाला ^2 को किया गया आउटगोइंग कॉल है</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_blocked_call">
+    <item quantity="one">^1 कॉल, सबसे नया वाला ^2 का कॉल है, जिसे रोक दिया गया था</item>
+    <item quantity="other">^1 कॉल, सबसे नया वाला ^2 का कॉल है, जिसे रोक दिया गया था</item>
+  </plurals>
+  <string name="a11y_new_call_log_entry_phone_account">^1 पर,
+    ^2 के ज़रिए</string>
+  <string name="a11y_new_call_log_entry_full_description_without_phone_account_info">^1, ^2.</string>
+  <string name="a11y_new_call_log_entry_full_description_with_phone_account_info">^1, ^2, ^3.</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-hr/strings.xml b/java/com/android/dialer/calllogutils/res/values-hr/strings.xml
index 560e8e5..6e1b458 100644
--- a/java/com/android/dialer/calllogutils/res/values-hr/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-hr/strings.xml
@@ -1,55 +1,67 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2017 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="type_incoming" msgid="5727636795656199810">"Dolazni poziv"</string>
-    <string name="type_incoming_pulled" msgid="8434723359163965796">"Dolazni poziv prenesen je na drugi uređaj"</string>
-    <string name="type_outgoing" msgid="764896746073942963">"Odlazni poziv"</string>
-    <string name="type_outgoing_pulled" msgid="1648517538371704193">"Odlazni poziv prenesen je na drugi uređaj"</string>
-    <string name="type_missed" msgid="2997043831022028176">"Propušteni poziv"</string>
-    <string name="type_incoming_video" msgid="7507180294202642554">"Dolazni videopoziv"</string>
-    <string name="type_incoming_video_pulled" msgid="7879031598844023977">"Dolazni videopoziv prenesen je na drugi uređaj"</string>
-    <string name="type_outgoing_video" msgid="309370072333983910">"Odlazni videopoziv"</string>
-    <string name="type_outgoing_video_pulled" msgid="3924450629684331345">"Odlazni videopoziv prenesen je na drugi uređaj"</string>
-    <string name="type_missed_video" msgid="4350107016317603785">"Propušten videopoziv"</string>
-    <string name="type_voicemail" msgid="1877524395253846684">"Govorna pošta"</string>
-    <string name="type_rejected" msgid="5632107438472996198">"Odbijeni poziv"</string>
-    <string name="type_blocked" msgid="9177237294052244929">"Blokirani poziv"</string>
-    <string name="call_details_minutes_abbreviation" msgid="7899774555556720560">"min"</string>
-    <string name="call_details_seconds_abbreviation" msgid="5893806826648947126">"s"</string>
-    <string name="a11y_call_duration_format" msgid="2905525933361674470">"<xliff:g id="MINUTES_0">%d</xliff:g> <xliff:g id="MINUTES_TRANSLATION">%s</xliff:g> <xliff:g id="SECONDS_1">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="a11y_call_duration_short_format" msgid="5908875871251062453">"<xliff:g id="SECONDS_0">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <plurals name="a11y_seconds" formatted="false" msgid="6695730844760611970">
-      <item quantity="one">sekunda</item>
-      <item quantity="few">sekunde</item>
-      <item quantity="other">sekunda</item>
-    </plurals>
-    <plurals name="a11y_minutes" formatted="false" msgid="6377010096698624038">
-      <item quantity="one">minuta</item>
-      <item quantity="few">minute</item>
-      <item quantity="other">minuta</item>
-    </plurals>
-    <string name="type_answered_elsewhere" msgid="411958582555881640">"Na poziv je odgovoreno na drugom uređaju"</string>
-    <string name="description_phone_account" msgid="4382951172691362244">"na računu <xliff:g id="PHONEACCOUNT">^1</xliff:g>"</string>
-    <string name="description_via_number" msgid="7682575124846343076">"putem broja <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="description_via_number_phone_account" msgid="4345445677508018830">"na računu <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, putem broja <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="voicemail_string" msgid="6029775151483803006">"Govorna pošta"</string>
-    <string name="now" msgid="2599778506439006806">"Sad"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="type_incoming">Dolazni poziv</string>
+  <string name="type_incoming_pulled">Dolazni poziv prenesen je na drugi uređaj</string>
+  <string name="type_outgoing">Odlazni poziv</string>
+  <string name="type_outgoing_pulled">Odlazni poziv prenesen je na drugi uređaj</string>
+  <string name="type_missed">Propušteni poziv</string>
+  <string name="type_incoming_video">Dolazni videopoziv</string>
+  <string name="type_incoming_video_pulled">Dolazni videopoziv prenesen je na drugi uređaj</string>
+  <string name="type_outgoing_video">Odlazni videopoziv</string>
+  <string name="type_outgoing_video_pulled">Odlazni videopoziv prenesen je na drugi uređaj</string>
+  <string name="type_missed_video">Propušten videopoziv</string>
+  <string name="type_voicemail">Govorna pošta</string>
+  <string name="type_rejected">Odbijeni poziv</string>
+  <string name="type_blocked">Blokirani poziv</string>
+  <string name="call_details_minutes_abbreviation">min</string>
+  <string name="call_details_seconds_abbreviation">s</string>
+  <string name="a11y_call_duration_format">%1$d %2$s %3$d %4$s</string>
+  <string name="a11y_call_duration_short_format">%1$d %2$s</string>
+  <string name="call_duration_format_pattern">%1$s\'%2$s\' %3$s\'%4$s\'</string>
+  <string name="call_duration_short_format_pattern">%1$s\'%2$s\'</string>
+  <plurals name="a11y_seconds">
+    <item quantity="one">sekunda</item>
+    <item quantity="few">sekunde</item>
+    <item quantity="other">sekunda</item>
+  </plurals>
+  <plurals name="a11y_minutes">
+    <item quantity="one">minuta</item>
+    <item quantity="few">minute</item>
+    <item quantity="other">minuta</item>
+  </plurals>
+  <string name="type_answered_elsewhere">Na poziv je odgovoreno na drugom uređaju</string>
+  <string name="description_phone_account">na računu ^1</string>
+  <string name="description_via_number">putem broja %1$s</string>
+  <string name="description_via_number_phone_account">na računu %1$s, putem broja %2$s</string>
+  <string name="voicemail_string">Govorna pošta</string>
+  <string name="just_now">Upravo sad</string>
+  <string name="new_call_log_carrier_video">Videopoziv putem operatera</string>
+  <string name="new_call_log_duo_video">Videopoziv u aplikaciji Duo</string>
+  <string name="new_call_log_unknown">Nepoznato</string>
+  <string name="new_call_log_secondary_blocked">Blokirano</string>
+  <string name="new_call_log_secondary_spam">Neželjeni sadržaj</string>
+  <plurals name="a11y_new_call_log_entry_missed_call">
+    <item quantity="one">^1 poziv, posljednji je propušteni poziv od kontakta ^2</item>
+    <item quantity="few">^1 poziva, posljednji je propušteni poziv od kontakta ^2</item>
+    <item quantity="other">^1 poziva, posljednji je propušteni poziv od kontakta ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_answered_call">
+    <item quantity="one">^1 poziv, posljednji je odgovoreni poziv od kontakta ^2</item>
+    <item quantity="few">^1 poziva, posljednji je odgovoreni poziv od kontakta ^2</item>
+    <item quantity="other">^1 poziva, posljednji je odgovoreni poziv od kontakta ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_outgoing_call">
+    <item quantity="one">^1 poziv, posljednji je odlazni poziv upućen kontaktu ^2</item>
+    <item quantity="few">^1 poziva, posljednji je odlazni poziv upućen kontaktu ^2</item>
+    <item quantity="other">^1 poziva, posljednji je odlazni poziv upućen kontaktu ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_blocked_call">
+    <item quantity="one">^1 poziv, posljednji je blokirani poziv od kontakta ^2</item>
+    <item quantity="few">^1 poziva, posljednji je blokirani poziv od kontakta ^2</item>
+    <item quantity="other">^1 poziva, posljednji je blokirani poziv od kontakta ^2</item>
+  </plurals>
+  <string name="a11y_new_call_log_entry_phone_account">na računu ^1,
+    putem broja ^2</string>
+  <string name="a11y_new_call_log_entry_full_description_without_phone_account_info">^1, ^2.</string>
+  <string name="a11y_new_call_log_entry_full_description_with_phone_account_info">^1, ^2, ^3.</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-hu/strings.xml b/java/com/android/dialer/calllogutils/res/values-hu/strings.xml
index f2bdd24..064ac78 100644
--- a/java/com/android/dialer/calllogutils/res/values-hu/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-hu/strings.xml
@@ -1,53 +1,61 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2017 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="type_incoming" msgid="5727636795656199810">"Bejövő hívás"</string>
-    <string name="type_incoming_pulled" msgid="8434723359163965796">"Bejövő hívás átirányítva egy másik eszközre"</string>
-    <string name="type_outgoing" msgid="764896746073942963">"Kimenő hívás"</string>
-    <string name="type_outgoing_pulled" msgid="1648517538371704193">"Kimenő hívás átirányítva egy másik eszközre."</string>
-    <string name="type_missed" msgid="2997043831022028176">"Nem fogadott hívás"</string>
-    <string name="type_incoming_video" msgid="7507180294202642554">"Bejövő videohívás"</string>
-    <string name="type_incoming_video_pulled" msgid="7879031598844023977">"Bejövő videohívás átirányítva egy másik eszközre"</string>
-    <string name="type_outgoing_video" msgid="309370072333983910">"Kimenő videohívás"</string>
-    <string name="type_outgoing_video_pulled" msgid="3924450629684331345">"Kimenő videohívás átirányítva egy másik eszközre"</string>
-    <string name="type_missed_video" msgid="4350107016317603785">"Nem fogadott videohívás"</string>
-    <string name="type_voicemail" msgid="1877524395253846684">"Hangposta"</string>
-    <string name="type_rejected" msgid="5632107438472996198">"Elutasított hívás"</string>
-    <string name="type_blocked" msgid="9177237294052244929">"Letiltott hívás"</string>
-    <string name="call_details_minutes_abbreviation" msgid="7899774555556720560">"p"</string>
-    <string name="call_details_seconds_abbreviation" msgid="5893806826648947126">"m"</string>
-    <string name="a11y_call_duration_format" msgid="2905525933361674470">"<xliff:g id="MINUTES_0">%d</xliff:g> <xliff:g id="MINUTES_TRANSLATION">%s</xliff:g> <xliff:g id="SECONDS_1">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="a11y_call_duration_short_format" msgid="5908875871251062453">"<xliff:g id="SECONDS_0">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <plurals name="a11y_seconds" formatted="false" msgid="6695730844760611970">
-      <item quantity="other">másodperc</item>
-      <item quantity="one">másodperc</item>
-    </plurals>
-    <plurals name="a11y_minutes" formatted="false" msgid="6377010096698624038">
-      <item quantity="other">perc</item>
-      <item quantity="one">perc</item>
-    </plurals>
-    <string name="type_answered_elsewhere" msgid="411958582555881640">"Hívás felvéve egy másik eszközön"</string>
-    <string name="description_phone_account" msgid="4382951172691362244">"<xliff:g id="PHONEACCOUNT">^1</xliff:g>"</string>
-    <string name="description_via_number" msgid="7682575124846343076">"szám: <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="description_via_number_phone_account" msgid="4345445677508018830">"fiók: <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, szám: <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="voicemail_string" msgid="6029775151483803006">"Hangposta"</string>
-    <string name="now" msgid="2599778506439006806">"Most"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="type_incoming">Bejövő hívás</string>
+  <string name="type_incoming_pulled">Bejövő hívás átirányítva egy másik eszközre</string>
+  <string name="type_outgoing">Kimenő hívás</string>
+  <string name="type_outgoing_pulled">Kimenő hívás átirányítva egy másik eszközre.</string>
+  <string name="type_missed">Nem fogadott hívás</string>
+  <string name="type_incoming_video">Bejövő videohívás</string>
+  <string name="type_incoming_video_pulled">Bejövő videohívás átirányítva egy másik eszközre</string>
+  <string name="type_outgoing_video">Kimenő videohívás</string>
+  <string name="type_outgoing_video_pulled">Kimenő videohívás átirányítva egy másik eszközre</string>
+  <string name="type_missed_video">Nem fogadott videohívás</string>
+  <string name="type_voicemail">Hangposta</string>
+  <string name="type_rejected">Elutasított hívás</string>
+  <string name="type_blocked">Letiltott hívás</string>
+  <string name="call_details_minutes_abbreviation">p</string>
+  <string name="call_details_seconds_abbreviation">m</string>
+  <string name="a11y_call_duration_format">%1$d %2$s %3$d %4$s</string>
+  <string name="a11y_call_duration_short_format">%1$d %2$s</string>
+  <string name="call_duration_format_pattern">%1$s\'%2$s\' %3$s\'%4$s\'</string>
+  <string name="call_duration_short_format_pattern">%1$s\'%2$s\'</string>
+  <plurals name="a11y_seconds">
+    <item quantity="one">másodperc</item>
+    <item quantity="other">másodperc</item>
+  </plurals>
+  <plurals name="a11y_minutes">
+    <item quantity="one">perc</item>
+    <item quantity="other">perc</item>
+  </plurals>
+  <string name="type_answered_elsewhere">Hívás felvéve egy másik eszközön</string>
+  <string name="description_phone_account">^1</string>
+  <string name="description_via_number">szám: %1$s</string>
+  <string name="description_via_number_phone_account">fiók: %1$s, szám: %2$s</string>
+  <string name="voicemail_string">Hangposta</string>
+  <string name="just_now">Éppen most</string>
+  <string name="new_call_log_carrier_video">Szolgáltatói videohívás</string>
+  <string name="new_call_log_duo_video">Duo-videohívás</string>
+  <string name="new_call_log_unknown">Ismeretlen</string>
+  <string name="new_call_log_secondary_blocked">Letiltva</string>
+  <string name="new_call_log_secondary_spam">Spam</string>
+  <plurals name="a11y_new_call_log_entry_missed_call">
+    <item quantity="one">^1 nem fogadott hívás a következőtől: ^2</item>
+    <item quantity="other">^1 hívás, a legutóbbi egy nem fogadott hívás a következőtől: ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_answered_call">
+    <item quantity="one">^1 fogadott hívás a következőtől: ^2</item>
+    <item quantity="other">^1 hívás, a legutóbbi egy fogadott hívás a következőtől: ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_outgoing_call">
+    <item quantity="one">^1 kimenő hívás a következőnek: ^2</item>
+    <item quantity="other">^1 hívás, a legutóbbi egy kimenő hívás a következőnek: ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_blocked_call">
+    <item quantity="one">^1 letiltott hívás a következőtől: ^2</item>
+    <item quantity="other">^1 hívás, a legutóbbi egy letiltott hívás a következőtől: ^2</item>
+  </plurals>
+  <string name="a11y_new_call_log_entry_phone_account">fiók: ^1,
+    szám: ^2</string>
+  <string name="a11y_new_call_log_entry_full_description_without_phone_account_info">^1, ^2.</string>
+  <string name="a11y_new_call_log_entry_full_description_with_phone_account_info">^1, ^2, ^3.</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-hy/strings.xml b/java/com/android/dialer/calllogutils/res/values-hy/strings.xml
index 04f02d7..3ad4d33 100644
--- a/java/com/android/dialer/calllogutils/res/values-hy/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-hy/strings.xml
@@ -1,53 +1,60 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2017 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="type_incoming" msgid="5727636795656199810">"Մուտքային զանգ"</string>
-    <string name="type_incoming_pulled" msgid="8434723359163965796">"Մուտքային զանգը փոխանցվեց մեկ այլ սարքի"</string>
-    <string name="type_outgoing" msgid="764896746073942963">"Ելքային զանգ"</string>
-    <string name="type_outgoing_pulled" msgid="1648517538371704193">"Ելքային զանգը փոխանցվեց մեկ այլ սարքի"</string>
-    <string name="type_missed" msgid="2997043831022028176">"Բաց թողնված զանգ"</string>
-    <string name="type_incoming_video" msgid="7507180294202642554">"Մուտքային տեսազանգ"</string>
-    <string name="type_incoming_video_pulled" msgid="7879031598844023977">"Մուտքային տեսազանգը փոխանցվեց մեկ այլ սարքի"</string>
-    <string name="type_outgoing_video" msgid="309370072333983910">"Ելքային տեսազանգ"</string>
-    <string name="type_outgoing_video_pulled" msgid="3924450629684331345">"Ելքային տեսազանգը փոխանցվեց մեկ այլ սարքի"</string>
-    <string name="type_missed_video" msgid="4350107016317603785">"Բաց թողնված տեսազանգ"</string>
-    <string name="type_voicemail" msgid="1877524395253846684">"Ձայնային փոստ"</string>
-    <string name="type_rejected" msgid="5632107438472996198">"Մերժված զանգ"</string>
-    <string name="type_blocked" msgid="9177237294052244929">"Արգելափակված զանգ"</string>
-    <string name="call_details_minutes_abbreviation" msgid="7899774555556720560">"ր"</string>
-    <string name="call_details_seconds_abbreviation" msgid="5893806826648947126">"վ"</string>
-    <string name="a11y_call_duration_format" msgid="2905525933361674470">"<xliff:g id="MINUTES_0">%d</xliff:g> <xliff:g id="MINUTES_TRANSLATION">%s</xliff:g> <xliff:g id="SECONDS_1">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="a11y_call_duration_short_format" msgid="5908875871251062453">"<xliff:g id="SECONDS_0">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <plurals name="a11y_seconds" formatted="false" msgid="6695730844760611970">
-      <item quantity="one">seconds</item>
-      <item quantity="other">վայրկյան</item>
-    </plurals>
-    <plurals name="a11y_minutes" formatted="false" msgid="6377010096698624038">
-      <item quantity="one">minutes</item>
-      <item quantity="other">րոպե</item>
-    </plurals>
-    <string name="type_answered_elsewhere" msgid="411958582555881640">"Զանգն ընդունվեց մեկ այլ սարքով"</string>
-    <string name="description_phone_account" msgid="4382951172691362244">"<xliff:g id="PHONEACCOUNT">^1</xliff:g>-ին"</string>
-    <string name="description_via_number" msgid="7682575124846343076">"<xliff:g id="NUMBER">%1$s</xliff:g> համարից"</string>
-    <string name="description_via_number_phone_account" msgid="4345445677508018830">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g>-ին <xliff:g id="NUMBER">%2$s</xliff:g> համարից"</string>
-    <string name="voicemail_string" msgid="6029775151483803006">"Ձայնային փոստ"</string>
-    <string name="now" msgid="2599778506439006806">"Հիմա"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="type_incoming">Մուտքային զանգ</string>
+  <string name="type_incoming_pulled">Մուտքային զանգը փոխանցվեց մեկ այլ սարքի</string>
+  <string name="type_outgoing">Ելքային զանգ</string>
+  <string name="type_outgoing_pulled">Ելքային զանգը փոխանցվեց մեկ այլ սարքի</string>
+  <string name="type_missed">Բաց թողնված զանգ</string>
+  <string name="type_incoming_video">Մուտքային տեսազանգ</string>
+  <string name="type_incoming_video_pulled">Մուտքային տեսազանգը փոխանցվեց մեկ այլ սարքի</string>
+  <string name="type_outgoing_video">Ելքային տեսազանգ</string>
+  <string name="type_outgoing_video_pulled">Ելքային տեսազանգը փոխանցվեց մեկ այլ սարքի</string>
+  <string name="type_missed_video">Բաց թողնված տեսազանգ</string>
+  <string name="type_voicemail">Ձայնային փոստ</string>
+  <string name="type_rejected">Մերժված զանգ</string>
+  <string name="type_blocked">Արգելափակված զանգ</string>
+  <string name="call_details_minutes_abbreviation">ր</string>
+  <string name="call_details_seconds_abbreviation">վ</string>
+  <string name="a11y_call_duration_format">%1$d %2$s %3$d %4$s</string>
+  <string name="a11y_call_duration_short_format">%1$d %2$s</string>
+  <string name="call_duration_format_pattern">%1$s\'%2$s\' %3$s\'%4$s\'</string>
+  <string name="call_duration_short_format_pattern">%1$s\'%2$s\'</string>
+  <plurals name="a11y_seconds">
+    <item quantity="one">seconds</item>
+    <item quantity="other">վայրկյան</item>
+  </plurals>
+  <plurals name="a11y_minutes">
+    <item quantity="one">minutes</item>
+    <item quantity="other">րոպե</item>
+  </plurals>
+  <string name="type_answered_elsewhere">Զանգն ընդունվեց մեկ այլ սարքով</string>
+  <string name="description_phone_account">^1-ին</string>
+  <string name="description_via_number">%1$s համարից</string>
+  <string name="description_via_number_phone_account">%1$s-ին %2$s համարից</string>
+  <string name="voicemail_string">Ձայնային փոստ</string>
+  <string name="just_now">Հենց նոր</string>
+  <string name="new_call_log_carrier_video">Տեսազանգ բջջային ցանցով</string>
+  <string name="new_call_log_duo_video">Duo տեսազանգ</string>
+  <string name="new_call_log_unknown">Անհայտ</string>
+  <string name="new_call_log_secondary_blocked">Արգելափակված</string>
+  <string name="new_call_log_secondary_spam">Սպամ</string>
+  <plurals name="a11y_new_call_log_entry_missed_call">
+    <item quantity="one">^1 բաց թողնված զանգ ^2-ից</item>
+    <item quantity="other">^1 զանգ, որոնցից վերջինը բաց թողնված զանգ է ^2-ից</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_answered_call">
+    <item quantity="one">^1 ընդունված զանգ ^2-ից</item>
+    <item quantity="other">^1 զանգ, որոնցից վերջինը ընդունված զանգ է ^2-ից</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_outgoing_call">
+    <item quantity="one">^1 ելքային զանգ ^2-ին</item>
+    <item quantity="other">^1 զանգ, որոնցից վերջինը ելքային զանգ է ^2-ին</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_blocked_call">
+    <item quantity="one">^1 արգելափակված զանգ ^2-ից</item>
+    <item quantity="other">^1 զանգ, որոնցից վերջինը արգելափակված զանգ է ^2-ից</item>
+  </plurals>
+  <string name="a11y_new_call_log_entry_phone_account">^1, համարը՝ ^2</string>
+  <string name="a11y_new_call_log_entry_full_description_without_phone_account_info">^1, ^2:</string>
+  <string name="a11y_new_call_log_entry_full_description_with_phone_account_info">^1, ^2, ^3:</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-in/strings.xml b/java/com/android/dialer/calllogutils/res/values-in/strings.xml
index 83367ac..0bbc61a 100644
--- a/java/com/android/dialer/calllogutils/res/values-in/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-in/strings.xml
@@ -1,53 +1,61 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2017 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="type_incoming" msgid="5727636795656199810">"Panggilan masuk"</string>
-    <string name="type_incoming_pulled" msgid="8434723359163965796">"Panggilan masuk ditransfer ke perangkat lain"</string>
-    <string name="type_outgoing" msgid="764896746073942963">"Panggilan keluar"</string>
-    <string name="type_outgoing_pulled" msgid="1648517538371704193">"Panggilan keluar ditransfer ke perangkat lain"</string>
-    <string name="type_missed" msgid="2997043831022028176">"Panggilan tak terjawab"</string>
-    <string name="type_incoming_video" msgid="7507180294202642554">"Video call masuk"</string>
-    <string name="type_incoming_video_pulled" msgid="7879031598844023977">"Video call masuk ditransfer ke perangkat lain"</string>
-    <string name="type_outgoing_video" msgid="309370072333983910">"Video call keluar"</string>
-    <string name="type_outgoing_video_pulled" msgid="3924450629684331345">"Video call keluar ditransfer ke perangkat lain"</string>
-    <string name="type_missed_video" msgid="4350107016317603785">"Video call tak terjawab"</string>
-    <string name="type_voicemail" msgid="1877524395253846684">"Pesan suara"</string>
-    <string name="type_rejected" msgid="5632107438472996198">"Panggilan ditolak"</string>
-    <string name="type_blocked" msgid="9177237294052244929">"Panggilan diblokir"</string>
-    <string name="call_details_minutes_abbreviation" msgid="7899774555556720560">"mnt"</string>
-    <string name="call_details_seconds_abbreviation" msgid="5893806826648947126">"d"</string>
-    <string name="a11y_call_duration_format" msgid="2905525933361674470">"<xliff:g id="MINUTES_0">%d</xliff:g> <xliff:g id="MINUTES_TRANSLATION">%s</xliff:g> <xliff:g id="SECONDS_1">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="a11y_call_duration_short_format" msgid="5908875871251062453">"<xliff:g id="SECONDS_0">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <plurals name="a11y_seconds" formatted="false" msgid="6695730844760611970">
-      <item quantity="other">detik</item>
-      <item quantity="one">detik</item>
-    </plurals>
-    <plurals name="a11y_minutes" formatted="false" msgid="6377010096698624038">
-      <item quantity="other">menit</item>
-      <item quantity="one">menit</item>
-    </plurals>
-    <string name="type_answered_elsewhere" msgid="411958582555881640">"Panggilan dijawab pada perangkat lain"</string>
-    <string name="description_phone_account" msgid="4382951172691362244">"di <xliff:g id="PHONEACCOUNT">^1</xliff:g>"</string>
-    <string name="description_via_number" msgid="7682575124846343076">"melalui <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="description_via_number_phone_account" msgid="4345445677508018830">"di <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, melalui <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="voicemail_string" msgid="6029775151483803006">"Pesan suara"</string>
-    <string name="now" msgid="2599778506439006806">"Sekarang"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="type_incoming">Panggilan masuk</string>
+  <string name="type_incoming_pulled">Panggilan masuk ditransfer ke perangkat lain</string>
+  <string name="type_outgoing">Panggilan keluar</string>
+  <string name="type_outgoing_pulled">Panggilan keluar ditransfer ke perangkat lain</string>
+  <string name="type_missed">Panggilan tak terjawab</string>
+  <string name="type_incoming_video">Video call masuk</string>
+  <string name="type_incoming_video_pulled">Video call masuk ditransfer ke perangkat lain</string>
+  <string name="type_outgoing_video">Video call keluar</string>
+  <string name="type_outgoing_video_pulled">Video call keluar ditransfer ke perangkat lain</string>
+  <string name="type_missed_video">Video call tak terjawab</string>
+  <string name="type_voicemail">Pesan suara</string>
+  <string name="type_rejected">Panggilan ditolak</string>
+  <string name="type_blocked">Panggilan diblokir</string>
+  <string name="call_details_minutes_abbreviation">mnt</string>
+  <string name="call_details_seconds_abbreviation">d</string>
+  <string name="a11y_call_duration_format">%1$d %2$s %3$d %4$s</string>
+  <string name="a11y_call_duration_short_format">%1$d %2$s</string>
+  <string name="call_duration_format_pattern">%1$s\'%2$s\' %3$s\'%4$s\'</string>
+  <string name="call_duration_short_format_pattern">%1$s\'%2$s\'</string>
+  <plurals name="a11y_seconds">
+    <item quantity="one">detik</item>
+    <item quantity="other">detik</item>
+  </plurals>
+  <plurals name="a11y_minutes">
+    <item quantity="one">menit</item>
+    <item quantity="other">menit</item>
+  </plurals>
+  <string name="type_answered_elsewhere">Panggilan dijawab pada perangkat lain</string>
+  <string name="description_phone_account">di ^1</string>
+  <string name="description_via_number">melalui %1$s</string>
+  <string name="description_via_number_phone_account">di %1$s, melalui %2$s</string>
+  <string name="voicemail_string">Pesan suara</string>
+  <string name="just_now">Baru saja</string>
+  <string name="new_call_log_carrier_video">Video operator</string>
+  <string name="new_call_log_duo_video">Video duo</string>
+  <string name="new_call_log_unknown">Tidak dikenal</string>
+  <string name="new_call_log_secondary_blocked">Diblokir</string>
+  <string name="new_call_log_secondary_spam">Spam</string>
+  <plurals name="a11y_new_call_log_entry_missed_call">
+    <item quantity="one">^1 panggilan tak terjawab dari ^2</item>
+    <item quantity="other">^1 panggilan, yang terakhir panggilan tak terjawab dari ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_answered_call">
+    <item quantity="one">^1 panggilan terjawab dari ^2</item>
+    <item quantity="other">^1 panggilan, yang terakhir panggilan terjawab dari ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_outgoing_call">
+    <item quantity="one">^1 panggilan keluar ke ^2</item>
+    <item quantity="other">^1 panggilan, yang terakhir panggilan keluar ke ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_blocked_call">
+    <item quantity="one">^1 panggilan yang diblokir dari ^2</item>
+    <item quantity="other">^1 panggilan, yang terakhir panggilan diblokir dari ^2</item>
+  </plurals>
+  <string name="a11y_new_call_log_entry_phone_account">di ^1,
+    melalui ^2</string>
+  <string name="a11y_new_call_log_entry_full_description_without_phone_account_info">^1, ^2.</string>
+  <string name="a11y_new_call_log_entry_full_description_with_phone_account_info">^1, ^2, ^3.</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-is/strings.xml b/java/com/android/dialer/calllogutils/res/values-is/strings.xml
index 639881d..c1edcc9 100644
--- a/java/com/android/dialer/calllogutils/res/values-is/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-is/strings.xml
@@ -1,53 +1,61 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2017 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="type_incoming" msgid="5727636795656199810">"Móttekið símtal"</string>
-    <string name="type_incoming_pulled" msgid="8434723359163965796">"Móttekið símtal flutt í annað tæki"</string>
-    <string name="type_outgoing" msgid="764896746073942963">"Hringt símtal"</string>
-    <string name="type_outgoing_pulled" msgid="1648517538371704193">"Hringt símtal flutt í annað tæki"</string>
-    <string name="type_missed" msgid="2997043831022028176">"Ósvarað símtal"</string>
-    <string name="type_incoming_video" msgid="7507180294202642554">"Myndsímtal berst"</string>
-    <string name="type_incoming_video_pulled" msgid="7879031598844023977">"Móttekið myndsímtal flutt í annað tæki"</string>
-    <string name="type_outgoing_video" msgid="309370072333983910">"Myndsímtal hringt"</string>
-    <string name="type_outgoing_video_pulled" msgid="3924450629684331345">"Hringt myndsímtal flutt í annað tæki"</string>
-    <string name="type_missed_video" msgid="4350107016317603785">"Ósvarað myndsímtal"</string>
-    <string name="type_voicemail" msgid="1877524395253846684">"Talhólf"</string>
-    <string name="type_rejected" msgid="5632107438472996198">"Símtali hafnað"</string>
-    <string name="type_blocked" msgid="9177237294052244929">"Símtal á bannlista"</string>
-    <string name="call_details_minutes_abbreviation" msgid="7899774555556720560">"mín."</string>
-    <string name="call_details_seconds_abbreviation" msgid="5893806826648947126">"sek."</string>
-    <string name="a11y_call_duration_format" msgid="2905525933361674470">"<xliff:g id="MINUTES_0">%d</xliff:g> <xliff:g id="MINUTES_TRANSLATION">%s</xliff:g> <xliff:g id="SECONDS_1">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="a11y_call_duration_short_format" msgid="5908875871251062453">"<xliff:g id="SECONDS_0">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <plurals name="a11y_seconds" formatted="false" msgid="6695730844760611970">
-      <item quantity="one">sekúnda</item>
-      <item quantity="other">sekúndur</item>
-    </plurals>
-    <plurals name="a11y_minutes" formatted="false" msgid="6377010096698624038">
-      <item quantity="one">mínúta</item>
-      <item quantity="other">mínútur</item>
-    </plurals>
-    <string name="type_answered_elsewhere" msgid="411958582555881640">"Símtali svarað í öðru tæki"</string>
-    <string name="description_phone_account" msgid="4382951172691362244">"í gegnum <xliff:g id="PHONEACCOUNT">^1</xliff:g>"</string>
-    <string name="description_via_number" msgid="7682575124846343076">"í gegnum <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="description_via_number_phone_account" msgid="4345445677508018830">"á <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, í gegnum <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="voicemail_string" msgid="6029775151483803006">"Talhólf"</string>
-    <string name="now" msgid="2599778506439006806">"Núna"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="type_incoming">Móttekið símtal</string>
+  <string name="type_incoming_pulled">Móttekið símtal flutt í annað tæki</string>
+  <string name="type_outgoing">Hringt símtal</string>
+  <string name="type_outgoing_pulled">Hringt símtal flutt í annað tæki</string>
+  <string name="type_missed">Ósvarað símtal</string>
+  <string name="type_incoming_video">Myndsímtal berst</string>
+  <string name="type_incoming_video_pulled">Móttekið myndsímtal flutt í annað tæki</string>
+  <string name="type_outgoing_video">Myndsímtal hringt</string>
+  <string name="type_outgoing_video_pulled">Hringt myndsímtal flutt í annað tæki</string>
+  <string name="type_missed_video">Ósvarað myndsímtal</string>
+  <string name="type_voicemail">Talhólf</string>
+  <string name="type_rejected">Símtali hafnað</string>
+  <string name="type_blocked">Símtal á bannlista</string>
+  <string name="call_details_minutes_abbreviation">mín.</string>
+  <string name="call_details_seconds_abbreviation">sek.</string>
+  <string name="a11y_call_duration_format">%1$d %2$s %3$d %4$s</string>
+  <string name="a11y_call_duration_short_format">%1$d %2$s</string>
+  <string name="call_duration_format_pattern">%1$s\'%2$s\' %3$s\'%4$s\'</string>
+  <string name="call_duration_short_format_pattern">%1$s\'%2$s\'</string>
+  <plurals name="a11y_seconds">
+    <item quantity="one">sekúnda</item>
+    <item quantity="other">sekúndur</item>
+  </plurals>
+  <plurals name="a11y_minutes">
+    <item quantity="one">mínúta</item>
+    <item quantity="other">mínútur</item>
+  </plurals>
+  <string name="type_answered_elsewhere">Símtali svarað í öðru tæki</string>
+  <string name="description_phone_account">í gegnum ^1</string>
+  <string name="description_via_number">í gegnum %1$s</string>
+  <string name="description_via_number_phone_account">á %1$s, í gegnum %2$s</string>
+  <string name="voicemail_string">Talhólf</string>
+  <string name="just_now">Rétt í þessu</string>
+  <string name="new_call_log_carrier_video">Myndsímtal símafyrirtækis</string>
+  <string name="new_call_log_duo_video">Myndsímtal Duo</string>
+  <string name="new_call_log_unknown">Óþekkt</string>
+  <string name="new_call_log_secondary_blocked">Á bannlista</string>
+  <string name="new_call_log_secondary_spam">Ruslefni</string>
+  <plurals name="a11y_new_call_log_entry_missed_call">
+    <item quantity="one">^1 símtal, það nýjasta er ósvarað símtal frá ^2</item>
+    <item quantity="other">^1 símtöl, það nýjasta er ósvarað símtal frá ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_answered_call">
+    <item quantity="one">^1 símtal, það nýjasta er ósvarað símtal frá ^2</item>
+    <item quantity="other">^1 símtöl, það nýjasta er svarað símtal frá ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_outgoing_call">
+    <item quantity="one">^1 símtal, það nýjasta er hringt símtal til ^2</item>
+    <item quantity="other">^1 símtöl, það nýjasta er hringt símtal til ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_blocked_call">
+    <item quantity="one">^1 símtal, það nýjasta er símtal frá ^2 sem lokað var á</item>
+    <item quantity="other">^1 símtöl, það nýjasta er símtal frá ^2 sem lokað var á</item>
+  </plurals>
+  <string name="a11y_new_call_log_entry_phone_account">í ^1,
+    með ^2</string>
+  <string name="a11y_new_call_log_entry_full_description_without_phone_account_info">^1, ^2.</string>
+  <string name="a11y_new_call_log_entry_full_description_with_phone_account_info">^1, ^2, ^3.</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-it/strings.xml b/java/com/android/dialer/calllogutils/res/values-it/strings.xml
index e40a846..1377c4e 100644
--- a/java/com/android/dialer/calllogutils/res/values-it/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-it/strings.xml
@@ -1,53 +1,61 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2017 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="type_incoming" msgid="5727636795656199810">"Chiamata in arrivo"</string>
-    <string name="type_incoming_pulled" msgid="8434723359163965796">"Chiamata in arrivo trasferita a un altro dispositivo"</string>
-    <string name="type_outgoing" msgid="764896746073942963">"Chiamata in uscita"</string>
-    <string name="type_outgoing_pulled" msgid="1648517538371704193">"Chiamata in uscita trasferita a un altro dispositivo"</string>
-    <string name="type_missed" msgid="2997043831022028176">"Chiamata persa"</string>
-    <string name="type_incoming_video" msgid="7507180294202642554">"Videochiamata in arrivo"</string>
-    <string name="type_incoming_video_pulled" msgid="7879031598844023977">"Videochiamata in arrivo trasferita a un altro dispositivo"</string>
-    <string name="type_outgoing_video" msgid="309370072333983910">"Videochiamata in uscita"</string>
-    <string name="type_outgoing_video_pulled" msgid="3924450629684331345">"Videochiamata in uscita trasferita a un altro dispositivo."</string>
-    <string name="type_missed_video" msgid="4350107016317603785">"Videochiamata persa"</string>
-    <string name="type_voicemail" msgid="1877524395253846684">"Messaggi vocali"</string>
-    <string name="type_rejected" msgid="5632107438472996198">"Chiamata rifiutata"</string>
-    <string name="type_blocked" msgid="9177237294052244929">"Chiamata bloccata"</string>
-    <string name="call_details_minutes_abbreviation" msgid="7899774555556720560">"min"</string>
-    <string name="call_details_seconds_abbreviation" msgid="5893806826648947126">"sec"</string>
-    <string name="a11y_call_duration_format" msgid="2905525933361674470">"<xliff:g id="MINUTES_0">%d</xliff:g> <xliff:g id="MINUTES_TRANSLATION">%s</xliff:g> <xliff:g id="SECONDS_1">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="a11y_call_duration_short_format" msgid="5908875871251062453">"<xliff:g id="SECONDS_0">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <plurals name="a11y_seconds" formatted="false" msgid="6695730844760611970">
-      <item quantity="other">secondi</item>
-      <item quantity="one">secondo</item>
-    </plurals>
-    <plurals name="a11y_minutes" formatted="false" msgid="6377010096698624038">
-      <item quantity="other">minuti</item>
-      <item quantity="one">minuto</item>
-    </plurals>
-    <string name="type_answered_elsewhere" msgid="411958582555881640">"Si è risposto alla chiamata su un altro dispositivo"</string>
-    <string name="description_phone_account" msgid="4382951172691362244">"da o verso <xliff:g id="PHONEACCOUNT">^1</xliff:g>"</string>
-    <string name="description_via_number" msgid="7682575124846343076">"tramite <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="description_via_number_phone_account" msgid="4345445677508018830">"su <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, tramite <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="voicemail_string" msgid="6029775151483803006">"Messaggi vocali"</string>
-    <string name="now" msgid="2599778506439006806">"Ora"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="type_incoming">Chiamata in arrivo</string>
+  <string name="type_incoming_pulled">Chiamata in arrivo trasferita a un altro dispositivo</string>
+  <string name="type_outgoing">Chiamata in uscita</string>
+  <string name="type_outgoing_pulled">Chiamata in uscita trasferita a un altro dispositivo</string>
+  <string name="type_missed">Chiamata persa</string>
+  <string name="type_incoming_video">Videochiamata in arrivo</string>
+  <string name="type_incoming_video_pulled">Videochiamata in arrivo trasferita a un altro dispositivo</string>
+  <string name="type_outgoing_video">Videochiamata in uscita</string>
+  <string name="type_outgoing_video_pulled">Videochiamata in uscita trasferita a un altro dispositivo.</string>
+  <string name="type_missed_video">Videochiamata persa</string>
+  <string name="type_voicemail">Messaggi vocali</string>
+  <string name="type_rejected">Chiamata rifiutata</string>
+  <string name="type_blocked">Chiamata bloccata</string>
+  <string name="call_details_minutes_abbreviation">min</string>
+  <string name="call_details_seconds_abbreviation">sec</string>
+  <string name="a11y_call_duration_format">%1$d %2$s %3$d %4$s</string>
+  <string name="a11y_call_duration_short_format">%1$d %2$s</string>
+  <string name="call_duration_format_pattern">%1$s \'%2$s\' %3$s \'%4$s\'</string>
+  <string name="call_duration_short_format_pattern">%1$s \'%2$s\'</string>
+  <plurals name="a11y_seconds">
+    <item quantity="one">secondo</item>
+    <item quantity="other">secondi</item>
+  </plurals>
+  <plurals name="a11y_minutes">
+    <item quantity="one">minuto</item>
+    <item quantity="other">minuti</item>
+  </plurals>
+  <string name="type_answered_elsewhere">Si è risposto alla chiamata su un altro dispositivo</string>
+  <string name="description_phone_account">da o verso ^1</string>
+  <string name="description_via_number">tramite %1$s</string>
+  <string name="description_via_number_phone_account">su %1$s, tramite %2$s</string>
+  <string name="voicemail_string">Messaggi vocali</string>
+  <string name="just_now">Adesso</string>
+  <string name="new_call_log_carrier_video">Videochiamata operatore</string>
+  <string name="new_call_log_duo_video">Videochiamata Duo</string>
+  <string name="new_call_log_unknown">Sconosciuto</string>
+  <string name="new_call_log_secondary_blocked">Bloccate</string>
+  <string name="new_call_log_secondary_spam">Spam</string>
+  <plurals name="a11y_new_call_log_entry_missed_call">
+    <item quantity="one">^1 chiamata senza risposta da ^2</item>
+    <item quantity="other">^1 chiamate, l\'ultima è una chiamata senza risposta da ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_answered_call">
+    <item quantity="one">^1 risposta a una chiamata di ^2</item>
+    <item quantity="other">^1 chiamate, l\'ultima è una risposta a una chiamata di ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_outgoing_call">
+    <item quantity="one">^1 chiamata in uscita a ^2</item>
+    <item quantity="other">^1 chiamate, l\'ultima è una chiamata in uscita a ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_blocked_call">
+    <item quantity="one">^1 chiamata bloccata da ^2</item>
+    <item quantity="other">^1 chiamate, l\'ultima è una chiamata bloccata da ^2</item>
+  </plurals>
+  <string name="a11y_new_call_log_entry_phone_account">su ^1,
+    tramite ^2</string>
+  <string name="a11y_new_call_log_entry_full_description_without_phone_account_info">^1, ^2.</string>
+  <string name="a11y_new_call_log_entry_full_description_with_phone_account_info">^1, ^2, ^3.</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-iw/strings.xml b/java/com/android/dialer/calllogutils/res/values-iw/strings.xml
index 82dbd85..a827f69 100644
--- a/java/com/android/dialer/calllogutils/res/values-iw/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-iw/strings.xml
@@ -1,57 +1,73 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2017 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="type_incoming" msgid="5727636795656199810">"שיחה נכנסת"</string>
-    <string name="type_incoming_pulled" msgid="8434723359163965796">"השיחה הנכנסת הועברה למכשיר אחר"</string>
-    <string name="type_outgoing" msgid="764896746073942963">"שיחה יוצאת"</string>
-    <string name="type_outgoing_pulled" msgid="1648517538371704193">"השיחה היוצאת הועברה למכשיר אחר"</string>
-    <string name="type_missed" msgid="2997043831022028176">"שיחה שלא נענתה"</string>
-    <string name="type_incoming_video" msgid="7507180294202642554">"שיחת וידאו נכנסת"</string>
-    <string name="type_incoming_video_pulled" msgid="7879031598844023977">"שיחת הווידאו הנכנסת הועברה למכשיר אחר"</string>
-    <string name="type_outgoing_video" msgid="309370072333983910">"שיחת וידאו יוצאת"</string>
-    <string name="type_outgoing_video_pulled" msgid="3924450629684331345">"שיחת הווידאו היוצאת הועברה למכשיר אחר"</string>
-    <string name="type_missed_video" msgid="4350107016317603785">"שיחת וידאו שלא נענתה"</string>
-    <string name="type_voicemail" msgid="1877524395253846684">"דואר קולי"</string>
-    <string name="type_rejected" msgid="5632107438472996198">"שיחה שנדחתה"</string>
-    <string name="type_blocked" msgid="9177237294052244929">"שיחה שנחסמה"</string>
-    <string name="call_details_minutes_abbreviation" msgid="7899774555556720560">"דק\'"</string>
-    <string name="call_details_seconds_abbreviation" msgid="5893806826648947126">"שנ\'"</string>
-    <string name="a11y_call_duration_format" msgid="2905525933361674470">"<xliff:g id="MINUTES_0">%d</xliff:g> <xliff:g id="MINUTES_TRANSLATION">%s</xliff:g> ו-<xliff:g id="SECONDS_1">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="a11y_call_duration_short_format" msgid="5908875871251062453">"<xliff:g id="SECONDS_0">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <plurals name="a11y_seconds" formatted="false" msgid="6695730844760611970">
-      <item quantity="two">שניות</item>
-      <item quantity="many">שניות</item>
-      <item quantity="other">שניות</item>
-      <item quantity="one">שנייה</item>
-    </plurals>
-    <plurals name="a11y_minutes" formatted="false" msgid="6377010096698624038">
-      <item quantity="two">דקות</item>
-      <item quantity="many">דקות</item>
-      <item quantity="other">דקות</item>
-      <item quantity="one">דקה</item>
-    </plurals>
-    <string name="type_answered_elsewhere" msgid="411958582555881640">"השיחה נענתה במכשיר אחר"</string>
-    <string name="description_phone_account" msgid="4382951172691362244">"בחשבון <xliff:g id="PHONEACCOUNT">^1</xliff:g>"</string>
-    <string name="description_via_number" msgid="7682575124846343076">"דרך <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="description_via_number_phone_account" msgid="4345445677508018830">"בחשבון <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, דרך <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="voicemail_string" msgid="6029775151483803006">"דואר קולי"</string>
-    <string name="now" msgid="2599778506439006806">"עכשיו"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="type_incoming">שיחה נכנסת</string>
+  <string name="type_incoming_pulled">השיחה הנכנסת הועברה למכשיר אחר</string>
+  <string name="type_outgoing">שיחה יוצאת</string>
+  <string name="type_outgoing_pulled">השיחה היוצאת הועברה למכשיר אחר</string>
+  <string name="type_missed">שיחה שלא נענתה</string>
+  <string name="type_incoming_video">שיחת וידאו נכנסת</string>
+  <string name="type_incoming_video_pulled">שיחת הווידאו הנכנסת הועברה למכשיר אחר</string>
+  <string name="type_outgoing_video">שיחת וידאו יוצאת</string>
+  <string name="type_outgoing_video_pulled">שיחת הווידאו היוצאת הועברה למכשיר אחר</string>
+  <string name="type_missed_video">שיחת וידאו שלא נענתה</string>
+  <string name="type_voicemail">דואר קולי</string>
+  <string name="type_rejected">שיחה שנדחתה</string>
+  <string name="type_blocked">שיחה שנחסמה</string>
+  <string name="call_details_minutes_abbreviation">דק\'</string>
+  <string name="call_details_seconds_abbreviation">שנ\'</string>
+  <string name="a11y_call_duration_format">%1$d %2$s %3$d %4$s</string>
+  <string name="a11y_call_duration_short_format">%1$d %2$s</string>
+  <string name="call_duration_format_pattern">%1$s\'%2$s\' %3$s\'%4$s\'</string>
+  <string name="call_duration_short_format_pattern">%1$s\'%2$s\'</string>
+  <plurals name="a11y_seconds">
+    <item quantity="one">שנייה</item>
+    <item quantity="two">שניות</item>
+    <item quantity="many">שניות</item>
+    <item quantity="other">שניות</item>
+  </plurals>
+  <plurals name="a11y_minutes">
+    <item quantity="one">דקה</item>
+    <item quantity="two">דקות</item>
+    <item quantity="many">דקות</item>
+    <item quantity="other">דקות</item>
+  </plurals>
+  <string name="type_answered_elsewhere">השיחה נענתה במכשיר אחר</string>
+  <string name="description_phone_account">בחשבון ^1</string>
+  <string name="description_via_number">דרך %1$s</string>
+  <string name="description_via_number_phone_account">בחשבון %1$s, דרך %2$s</string>
+  <string name="voicemail_string">דואר קולי</string>
+  <string name="just_now">הרגע</string>
+  <string name="new_call_log_carrier_video">שיחות וידאו דרך הספק הסלולרי</string>
+  <string name="new_call_log_duo_video">‏שיחות וידאו דרך Duo</string>
+  <string name="new_call_log_unknown">לא ידוע</string>
+  <string name="new_call_log_secondary_blocked">חסום</string>
+  <string name="new_call_log_secondary_spam">ספאם</string>
+  <plurals name="a11y_new_call_log_entry_missed_call">
+    <item quantity="one">שיחה אחת (^1) לא נענתה. מקור השיחה: ^2</item>
+    <item quantity="two">^1 שיחות. השיחה האחרונה לא נענתה. מקור השיחה: ^2</item>
+    <item quantity="many">^1 שיחות. השיחה האחרונה לא נענתה. מקור השיחה: ^2</item>
+    <item quantity="other">^1 שיחות. השיחה האחרונה לא נענתה. מקור השיחה: ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_answered_call">
+    <item quantity="one">שיחה אחת (^1) נענתה. מקור השיחה: ^2</item>
+    <item quantity="two">^1 שיחות. השיחה האחרונה נענתה. מקור השיחה: ^2</item>
+    <item quantity="many">^1 שיחות. השיחה האחרונה נענתה. מקור השיחה: ^2</item>
+    <item quantity="other">^1 שיחות. השיחה האחרונה נענתה. מקור השיחה: ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_outgoing_call">
+    <item quantity="one">שיחה יוצאת אחת (^1). יעד השיחה: ^2</item>
+    <item quantity="two">^1 שיחות. השיחה האחרונה הייתה שיחה יוצאת. יעד השיחה: ^2</item>
+    <item quantity="many">^1 שיחות. השיחה האחרונה הייתה שיחה יוצאת. יעד השיחה: ^2</item>
+    <item quantity="other">^1 שיחות. השיחה האחרונה הייתה שיחה יוצאת. יעד השיחה: ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_blocked_call">
+    <item quantity="one">שיחה אחת (^1) נחסמה. מקור השיחה: ^2</item>
+    <item quantity="two">^1 שיחות. השיחה האחרונה נחסמה. מקור השיחה: ^2</item>
+    <item quantity="many">^1 שיחות. השיחה האחרונה נחסמה. מקור השיחה: ^2</item>
+    <item quantity="other">^1 שיחות. השיחה האחרונה נחסמה. מקור השיחה: ^2</item>
+  </plurals>
+  <string name="a11y_new_call_log_entry_phone_account">בחשבון ^1,
+    דרך ^2</string>
+  <string name="a11y_new_call_log_entry_full_description_without_phone_account_info">^1, ^2.</string>
+  <string name="a11y_new_call_log_entry_full_description_with_phone_account_info">^1, ^2, ^3.</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-ja/strings.xml b/java/com/android/dialer/calllogutils/res/values-ja/strings.xml
index 4cfd617..6f4eb84 100644
--- a/java/com/android/dialer/calllogutils/res/values-ja/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-ja/strings.xml
@@ -1,53 +1,61 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2017 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="type_incoming" msgid="5727636795656199810">"通話着信"</string>
-    <string name="type_incoming_pulled" msgid="8434723359163965796">"別の端末に転送された通話着信"</string>
-    <string name="type_outgoing" msgid="764896746073942963">"通話発信"</string>
-    <string name="type_outgoing_pulled" msgid="1648517538371704193">"別の端末に転送された通話発信"</string>
-    <string name="type_missed" msgid="2997043831022028176">"不在着信"</string>
-    <string name="type_incoming_video" msgid="7507180294202642554">"ビデオ通話の着信"</string>
-    <string name="type_incoming_video_pulled" msgid="7879031598844023977">"別の端末に転送されたビデオ通話の着信"</string>
-    <string name="type_outgoing_video" msgid="309370072333983910">"ビデオ通話の発信"</string>
-    <string name="type_outgoing_video_pulled" msgid="3924450629684331345">"別の端末に転送されたビデオ通話の発信"</string>
-    <string name="type_missed_video" msgid="4350107016317603785">"ビデオ通話の不在着信"</string>
-    <string name="type_voicemail" msgid="1877524395253846684">"ボイスメール"</string>
-    <string name="type_rejected" msgid="5632107438472996198">"拒否された通話"</string>
-    <string name="type_blocked" msgid="9177237294052244929">"ブロックされた通話"</string>
-    <string name="call_details_minutes_abbreviation" msgid="7899774555556720560">"分"</string>
-    <string name="call_details_seconds_abbreviation" msgid="5893806826648947126">"秒"</string>
-    <string name="a11y_call_duration_format" msgid="2905525933361674470">"<xliff:g id="MINUTES_0">%d</xliff:g><xliff:g id="MINUTES_TRANSLATION">%s</xliff:g><xliff:g id="SECONDS_1">%d</xliff:g><xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="a11y_call_duration_short_format" msgid="5908875871251062453">"<xliff:g id="SECONDS_0">%d</xliff:g><xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\'<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <plurals name="a11y_seconds" formatted="false" msgid="6695730844760611970">
-      <item quantity="other">秒</item>
-      <item quantity="one">秒</item>
-    </plurals>
-    <plurals name="a11y_minutes" formatted="false" msgid="6377010096698624038">
-      <item quantity="other">分</item>
-      <item quantity="one">分</item>
-    </plurals>
-    <string name="type_answered_elsewhere" msgid="411958582555881640">"別の端末で応答した通話"</string>
-    <string name="description_phone_account" msgid="4382951172691362244">"<xliff:g id="PHONEACCOUNT">^1</xliff:g>"</string>
-    <string name="description_via_number" msgid="7682575124846343076">"<xliff:g id="NUMBER">%1$s</xliff:g> で受信"</string>
-    <string name="description_via_number_phone_account" msgid="4345445677508018830">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g>（<xliff:g id="NUMBER">%2$s</xliff:g>）で受信"</string>
-    <string name="voicemail_string" msgid="6029775151483803006">"ボイスメール"</string>
-    <string name="now" msgid="2599778506439006806">"たった今"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="type_incoming">通話着信</string>
+  <string name="type_incoming_pulled">別の端末に転送された通話着信</string>
+  <string name="type_outgoing">通話発信</string>
+  <string name="type_outgoing_pulled">別の端末に転送された通話発信</string>
+  <string name="type_missed">不在着信</string>
+  <string name="type_incoming_video">ビデオ通話の着信</string>
+  <string name="type_incoming_video_pulled">別の端末に転送されたビデオ通話の着信</string>
+  <string name="type_outgoing_video">ビデオ通話の発信</string>
+  <string name="type_outgoing_video_pulled">別の端末に転送されたビデオ通話の発信</string>
+  <string name="type_missed_video">ビデオ通話の不在着信</string>
+  <string name="type_voicemail">ボイスメール</string>
+  <string name="type_rejected">拒否された通話</string>
+  <string name="type_blocked">ブロックされた通話</string>
+  <string name="call_details_minutes_abbreviation">分</string>
+  <string name="call_details_seconds_abbreviation">秒</string>
+  <string name="a11y_call_duration_format">%1$d %2$s %3$d %4$s</string>
+  <string name="a11y_call_duration_short_format">%1$d %2$s</string>
+  <string name="call_duration_format_pattern">%1$s\'%2$s\'%3$s\'%4$s\'</string>
+  <string name="call_duration_short_format_pattern">%1$s\'%2$s\'</string>
+  <plurals name="a11y_seconds">
+    <item quantity="one">秒</item>
+    <item quantity="other">秒</item>
+  </plurals>
+  <plurals name="a11y_minutes">
+    <item quantity="one">分</item>
+    <item quantity="other">分</item>
+  </plurals>
+  <string name="type_answered_elsewhere">別の端末で応答した通話</string>
+  <string name="description_phone_account">^1</string>
+  <string name="description_via_number">%1$s で受信</string>
+  <string name="description_via_number_phone_account">%1$s（%2$s）で受信</string>
+  <string name="voicemail_string">ボイスメール</string>
+  <string name="just_now">たった今</string>
+  <string name="new_call_log_carrier_video">携帯通信会社経由のビデオ通話</string>
+  <string name="new_call_log_duo_video">Duo のビデオ通話</string>
+  <string name="new_call_log_unknown">不明</string>
+  <string name="new_call_log_secondary_blocked">ブロック中</string>
+  <string name="new_call_log_secondary_spam">迷惑電話</string>
+  <plurals name="a11y_new_call_log_entry_missed_call">
+    <item quantity="one">^2 さんからの ^1 件の不在着信</item>
+    <item quantity="other">^1 件の通話、最後の通話は ^2 さんからの不在着信</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_answered_call">
+    <item quantity="one">^2 さんからの ^1 件の着信</item>
+    <item quantity="other">^1 件の通話、最後の通話は ^2 さんからの着信</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_outgoing_call">
+    <item quantity="one">^2 さん宛の ^1 件の発信</item>
+    <item quantity="other">^1 件の通話、最後の通話は ^2 さん宛の発信</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_blocked_call">
+    <item quantity="one">^2 さんから発信されてブロックされた ^1 件の着信</item>
+    <item quantity="other">^1 件の通話、最後の通話は ^2 さんから発信されてブロックされた着信</item>
+  </plurals>
+  <string name="a11y_new_call_log_entry_phone_account">^1 を使用、
+    ^2 経由</string>
+  <string name="a11y_new_call_log_entry_full_description_without_phone_account_info">^1、^2。</string>
+  <string name="a11y_new_call_log_entry_full_description_with_phone_account_info">^1、^2、^3。</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-ka/strings.xml b/java/com/android/dialer/calllogutils/res/values-ka/strings.xml
index 62f72ad..ce60cdc 100644
--- a/java/com/android/dialer/calllogutils/res/values-ka/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-ka/strings.xml
@@ -1,53 +1,61 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2017 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="type_incoming" msgid="5727636795656199810">"შემომავალი ზარი"</string>
-    <string name="type_incoming_pulled" msgid="8434723359163965796">"შემომავალი ზარი სხვა მოწყობილობას გადაეცა"</string>
-    <string name="type_outgoing" msgid="764896746073942963">"გამავალი ზარი"</string>
-    <string name="type_outgoing_pulled" msgid="1648517538371704193">"გამავალი ზარი სხვა მოწყობილობას გადაეცა"</string>
-    <string name="type_missed" msgid="2997043831022028176">"გამოტოვებული ზარი"</string>
-    <string name="type_incoming_video" msgid="7507180294202642554">"შემომავალი ვიდეოზარი"</string>
-    <string name="type_incoming_video_pulled" msgid="7879031598844023977">"შემომავალი ვიდეოზარი სხვა მოწყობილობას გადაეცა"</string>
-    <string name="type_outgoing_video" msgid="309370072333983910">"გამავალი ვიდეოზარი"</string>
-    <string name="type_outgoing_video_pulled" msgid="3924450629684331345">"გამავალი ვიდეოზარი სხვა მოწყობილობას გადაეცა"</string>
-    <string name="type_missed_video" msgid="4350107016317603785">"გამოტოვებული ვიდეოზარი"</string>
-    <string name="type_voicemail" msgid="1877524395253846684">"ხმოვანი ფოსტა"</string>
-    <string name="type_rejected" msgid="5632107438472996198">"უარყოფილი ზარი"</string>
-    <string name="type_blocked" msgid="9177237294052244929">"დაბლოკილი ზარი"</string>
-    <string name="call_details_minutes_abbreviation" msgid="7899774555556720560">"წთ."</string>
-    <string name="call_details_seconds_abbreviation" msgid="5893806826648947126">"წმ."</string>
-    <string name="a11y_call_duration_format" msgid="2905525933361674470">"<xliff:g id="MINUTES_0">%d</xliff:g> <xliff:g id="MINUTES_TRANSLATION">%s</xliff:g> <xliff:g id="SECONDS_1">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="a11y_call_duration_short_format" msgid="5908875871251062453">"<xliff:g id="SECONDS_0">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <plurals name="a11y_seconds" formatted="false" msgid="6695730844760611970">
-      <item quantity="other">წამი</item>
-      <item quantity="one">წამი</item>
-    </plurals>
-    <plurals name="a11y_minutes" formatted="false" msgid="6377010096698624038">
-      <item quantity="other">წუთი</item>
-      <item quantity="one">წუთი</item>
-    </plurals>
-    <string name="type_answered_elsewhere" msgid="411958582555881640">"ზარს პასუხი გაეცა სხვა მოწყობილობაზე"</string>
-    <string name="description_phone_account" msgid="4382951172691362244">"<xliff:g id="PHONEACCOUNT">^1</xliff:g>-ზე"</string>
-    <string name="description_via_number" msgid="7682575124846343076">"<xliff:g id="NUMBER">%1$s</xliff:g>-ის მეშვეობით"</string>
-    <string name="description_via_number_phone_account" msgid="4345445677508018830">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g>-ზე, <xliff:g id="NUMBER">%2$s</xliff:g>-ის მეშვეობით"</string>
-    <string name="voicemail_string" msgid="6029775151483803006">"ხმოვანი ფოსტა"</string>
-    <string name="now" msgid="2599778506439006806">"ახლა"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="type_incoming">შემომავალი ზარი</string>
+  <string name="type_incoming_pulled">შემომავალი ზარი სხვა მოწყობილობას გადაეცა</string>
+  <string name="type_outgoing">გამავალი ზარი</string>
+  <string name="type_outgoing_pulled">გამავალი ზარი სხვა მოწყობილობას გადაეცა</string>
+  <string name="type_missed">გამოტოვებული ზარი</string>
+  <string name="type_incoming_video">შემომავალი ვიდეოზარი</string>
+  <string name="type_incoming_video_pulled">შემომავალი ვიდეოზარი სხვა მოწყობილობას გადაეცა</string>
+  <string name="type_outgoing_video">გამავალი ვიდეოზარი</string>
+  <string name="type_outgoing_video_pulled">გამავალი ვიდეოზარი სხვა მოწყობილობას გადაეცა</string>
+  <string name="type_missed_video">გამოტოვებული ვიდეოზარი</string>
+  <string name="type_voicemail">ხმოვანი ფოსტა</string>
+  <string name="type_rejected">უარყოფილი ზარი</string>
+  <string name="type_blocked">დაბლოკილი ზარი</string>
+  <string name="call_details_minutes_abbreviation">წთ.</string>
+  <string name="call_details_seconds_abbreviation">წმ.</string>
+  <string name="a11y_call_duration_format">%1$d %2$s %3$d %4$s</string>
+  <string name="a11y_call_duration_short_format">%1$d %2$s</string>
+  <string name="call_duration_format_pattern">%1$s\'%2$s\' %3$s\'%4$s\'</string>
+  <string name="call_duration_short_format_pattern">%1$s\'%2$s\'</string>
+  <plurals name="a11y_seconds">
+    <item quantity="one">წამი</item>
+    <item quantity="other">წამი</item>
+  </plurals>
+  <plurals name="a11y_minutes">
+    <item quantity="one">წუთი</item>
+    <item quantity="other">წუთი</item>
+  </plurals>
+  <string name="type_answered_elsewhere">ზარს პასუხი გაეცა სხვა მოწყობილობაზე</string>
+  <string name="description_phone_account">^1-ზე</string>
+  <string name="description_via_number">%1$s-ის მეშვეობით</string>
+  <string name="description_via_number_phone_account">%1$s-ზე, %2$s-ის მეშვეობით</string>
+  <string name="voicemail_string">ხმოვანი ფოსტა</string>
+  <string name="just_now">ახლახან</string>
+  <string name="new_call_log_carrier_video">ოპერატორის ვიდეო</string>
+  <string name="new_call_log_duo_video">Duo-ს ვიდეო</string>
+  <string name="new_call_log_unknown">უცნობი</string>
+  <string name="new_call_log_secondary_blocked">დაბლოკილი</string>
+  <string name="new_call_log_secondary_spam">სპამი</string>
+  <plurals name="a11y_new_call_log_entry_missed_call">
+    <item quantity="one">^1 გამოტოვებული ზარი ^2-ისგან</item>
+    <item quantity="other">^1 ზარი, ბოლო არის გამოტოვებული ზარი ^2-ისგან</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_answered_call">
+    <item quantity="one">^1 პასუხგაცემული ზარი ^2-ისგან</item>
+    <item quantity="other">^1 ზარი, ბოლო არის პასუხგაცემული ზარი ^2-ისგან</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_outgoing_call">
+    <item quantity="one">^1 გამავალი ზარი ^2-თან</item>
+    <item quantity="other">^1 ზარი, ბოლო არის გამავალი ზარი ^2-თან</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_blocked_call">
+    <item quantity="one">^1 დაბლოკილი ზარი ^2-ისგან</item>
+    <item quantity="other">^1 ზარი, ბოლო არის დაბლოკილი ზარი ^2-ისგან</item>
+  </plurals>
+  <string name="a11y_new_call_log_entry_phone_account">^1-ზე,
+   ^2-ით</string>
+  <string name="a11y_new_call_log_entry_full_description_without_phone_account_info">^1, ^2.</string>
+  <string name="a11y_new_call_log_entry_full_description_with_phone_account_info">^1, ^2, ^3.</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-kk/strings.xml b/java/com/android/dialer/calllogutils/res/values-kk/strings.xml
index 3025979..7f16788 100644
--- a/java/com/android/dialer/calllogutils/res/values-kk/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-kk/strings.xml
@@ -1,53 +1,61 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2017 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="type_incoming" msgid="5727636795656199810">"Кіріс қоңырау"</string>
-    <string name="type_incoming_pulled" msgid="8434723359163965796">"Кіріс қоңырау басқа құрылғыға жіберілді"</string>
-    <string name="type_outgoing" msgid="764896746073942963">"Шығыс қоңырау"</string>
-    <string name="type_outgoing_pulled" msgid="1648517538371704193">"Шығыс қоңырау басқа құрылғыға жіберілді"</string>
-    <string name="type_missed" msgid="2997043831022028176">"Жіберіп алған қоңырау"</string>
-    <string name="type_incoming_video" msgid="7507180294202642554">"Кіріс бейне қоңырау"</string>
-    <string name="type_incoming_video_pulled" msgid="7879031598844023977">"Кіріс бейне қоңырау басқа құрылғыға жіберілді"</string>
-    <string name="type_outgoing_video" msgid="309370072333983910">"Шығыс бейне қоңырау"</string>
-    <string name="type_outgoing_video_pulled" msgid="3924450629684331345">"Шығыс бейне қоңырау басқа құрылғыға жіберілді"</string>
-    <string name="type_missed_video" msgid="4350107016317603785">"Жіберіп алған бейне қоңырау"</string>
-    <string name="type_voicemail" msgid="1877524395253846684">"Дауыстық хабар"</string>
-    <string name="type_rejected" msgid="5632107438472996198">"Қабылданбаған қоңырау"</string>
-    <string name="type_blocked" msgid="9177237294052244929">"Бөгелген қоңырау"</string>
-    <string name="call_details_minutes_abbreviation" msgid="7899774555556720560">"мин"</string>
-    <string name="call_details_seconds_abbreviation" msgid="5893806826648947126">"сек"</string>
-    <string name="a11y_call_duration_format" msgid="2905525933361674470">"<xliff:g id="MINUTES_0">%d</xliff:g> <xliff:g id="MINUTES_TRANSLATION">%s</xliff:g> <xliff:g id="SECONDS_1">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="a11y_call_duration_short_format" msgid="5908875871251062453">"<xliff:g id="SECONDS_0">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <plurals name="a11y_seconds" formatted="false" msgid="6695730844760611970">
-      <item quantity="other">секунд</item>
-      <item quantity="one">секунд</item>
-    </plurals>
-    <plurals name="a11y_minutes" formatted="false" msgid="6377010096698624038">
-      <item quantity="other">минут</item>
-      <item quantity="one">минут</item>
-    </plurals>
-    <string name="type_answered_elsewhere" msgid="411958582555881640">"Қоңырау басқа құрылғыдан қабылданды"</string>
-    <string name="description_phone_account" msgid="4382951172691362244">"<xliff:g id="PHONEACCOUNT">^1</xliff:g>"</string>
-    <string name="description_via_number" msgid="7682575124846343076">"<xliff:g id="NUMBER">%1$s</xliff:g> арқылы"</string>
-    <string name="description_via_number_phone_account" msgid="4345445677508018830">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, <xliff:g id="NUMBER">%2$s</xliff:g> арқылы"</string>
-    <string name="voicemail_string" msgid="6029775151483803006">"Дауыстық хабар"</string>
-    <string name="now" msgid="2599778506439006806">"Қазір"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="type_incoming">Кіріс қоңырау</string>
+  <string name="type_incoming_pulled">Кіріс қоңырау басқа құрылғыға жіберілді</string>
+  <string name="type_outgoing">Шығыс қоңырау</string>
+  <string name="type_outgoing_pulled">Шығыс қоңырау басқа құрылғыға жіберілді</string>
+  <string name="type_missed">Жіберіп алған қоңырау</string>
+  <string name="type_incoming_video">Кіріс бейне қоңырау</string>
+  <string name="type_incoming_video_pulled">Кіріс бейне қоңырау басқа құрылғыға жіберілді</string>
+  <string name="type_outgoing_video">Шығыс бейне қоңырау</string>
+  <string name="type_outgoing_video_pulled">Шығыс бейне қоңырау басқа құрылғыға жіберілді</string>
+  <string name="type_missed_video">Жіберіп алған бейне қоңырау</string>
+  <string name="type_voicemail">Дауыстық хабар</string>
+  <string name="type_rejected">Қабылданбаған қоңырау</string>
+  <string name="type_blocked">Бөгелген қоңырау</string>
+  <string name="call_details_minutes_abbreviation">мин</string>
+  <string name="call_details_seconds_abbreviation">сек</string>
+  <string name="a11y_call_duration_format">%1$d %2$s %3$d %4$s</string>
+  <string name="a11y_call_duration_short_format">%1$d %2$s</string>
+  <string name="call_duration_format_pattern">%1$s\'%2$s\' %3$s\'%4$s\'</string>
+  <string name="call_duration_short_format_pattern">%1$s\'%2$s\'</string>
+  <plurals name="a11y_seconds">
+    <item quantity="one">секунд</item>
+    <item quantity="other">секунд</item>
+  </plurals>
+  <plurals name="a11y_minutes">
+    <item quantity="one">минут</item>
+    <item quantity="other">минут</item>
+  </plurals>
+  <string name="type_answered_elsewhere">Қоңырау басқа құрылғыдан қабылданды</string>
+  <string name="description_phone_account">^1</string>
+  <string name="description_via_number">%1$s арқылы</string>
+  <string name="description_via_number_phone_account">%1$s, %2$s арқылы</string>
+  <string name="voicemail_string">Дауыстық хабар</string>
+  <string name="just_now">Қазір ғана</string>
+  <string name="new_call_log_carrier_video">Оператор бейне қоңырауы</string>
+  <string name="new_call_log_duo_video">Duo бейне қоңырауы</string>
+  <string name="new_call_log_unknown">Белгісіз</string>
+  <string name="new_call_log_secondary_blocked">Бөгелді</string>
+  <string name="new_call_log_secondary_spam">Спам</string>
+  <plurals name="a11y_new_call_log_entry_missed_call">
+    <item quantity="one">^2 шалған ^1 қоңырау</item>
+    <item quantity="other">^1 қоңырау, соңғы ^2 шалған қоңырау қабылданбаған</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_answered_call">
+    <item quantity="one">^2 шалған ^1 қоңырауға жауап берілген</item>
+    <item quantity="other">^1 қоңырау, соңғы ^2 шалған қоңырауға жауап берілген</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_outgoing_call">
+    <item quantity="one">^1 шығыс қоңырауын қабылдаушы: ^2</item>
+    <item quantity="other">^1 қоңырау, соңғы шығыс қоңырауын қабылдаушы: ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_blocked_call">
+    <item quantity="one">^2 шалған ^1 қоңырау бөгелген</item>
+    <item quantity="other">^1 қоңырау, соңғы ^2 шалған қоңырау бөгелген</item>
+  </plurals>
+  <string name="a11y_new_call_log_entry_phone_account">^1,
+    нөмірі: ^2</string>
+  <string name="a11y_new_call_log_entry_full_description_without_phone_account_info">^1, ^2.</string>
+  <string name="a11y_new_call_log_entry_full_description_with_phone_account_info">^1, ^2, ^3.</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-km/strings.xml b/java/com/android/dialer/calllogutils/res/values-km/strings.xml
index 650d4b8..9b0d08f 100644
--- a/java/com/android/dialer/calllogutils/res/values-km/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-km/strings.xml
@@ -1,53 +1,61 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2017 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="type_incoming" msgid="5727636795656199810">"ការ​ហៅ​ចូល"</string>
-    <string name="type_incoming_pulled" msgid="8434723359163965796">"ការ​ហៅ​ចូល​ត្រូវ​បាន​បញ្ជូន​ទៅ​ឧបករណ៍​ផ្សេង"</string>
-    <string name="type_outgoing" msgid="764896746073942963">"ការ​ហៅ​ចេញ"</string>
-    <string name="type_outgoing_pulled" msgid="1648517538371704193">"ការ​ហៅ​ចេញ​ត្រូវ​បាន​បញ្ជូន​ទៅ​ឧបករណ៍​ផ្សេង"</string>
-    <string name="type_missed" msgid="2997043831022028176">"ខកខាន​ទទួល"</string>
-    <string name="type_incoming_video" msgid="7507180294202642554">"ការ​ហៅចូល​តាម​​វីដេអូ​"</string>
-    <string name="type_incoming_video_pulled" msgid="7879031598844023977">"ការ​ហៅ​ចូល​ត្រូវ​បាន​បញ្ជូន​ទៅ​ឧបករណ៍​ផ្សេង"</string>
-    <string name="type_outgoing_video" msgid="309370072333983910">"ការ​ហៅចេញ​​​តាម​វីដេអូ"</string>
-    <string name="type_outgoing_video_pulled" msgid="3924450629684331345">"ការ​ហៅ​ចេញ​ត្រូវ​បាន​បញ្ជូន​ទៅ​ឧបករណ៍​ផ្សេង"</string>
-    <string name="type_missed_video" msgid="4350107016317603785">"ការ​ហៅ​តាម​វីដេអូ​ដែល​បាន​ខកខាន"</string>
-    <string name="type_voicemail" msgid="1877524395253846684">"សារ​ជា​សំឡេង"</string>
-    <string name="type_rejected" msgid="5632107438472996198">"ការហៅដែលបានបដិសេធ"</string>
-    <string name="type_blocked" msgid="9177237294052244929">"ការហៅដែលបានទប់ស្កាត់"</string>
-    <string name="call_details_minutes_abbreviation" msgid="7899774555556720560">"នាទី"</string>
-    <string name="call_details_seconds_abbreviation" msgid="5893806826648947126">"វិនាទី"</string>
-    <string name="a11y_call_duration_format" msgid="2905525933361674470">"<xliff:g id="MINUTES_0">%d</xliff:g> <xliff:g id="MINUTES_TRANSLATION">%s</xliff:g> <xliff:g id="SECONDS_1">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="a11y_call_duration_short_format" msgid="5908875871251062453">"<xliff:g id="SECONDS_0">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <plurals name="a11y_seconds" formatted="false" msgid="6695730844760611970">
-      <item quantity="other">វិនាទី</item>
-      <item quantity="one">វិនាទី</item>
-    </plurals>
-    <plurals name="a11y_minutes" formatted="false" msgid="6377010096698624038">
-      <item quantity="other">នាទី</item>
-      <item quantity="one">នាទី</item>
-    </plurals>
-    <string name="type_answered_elsewhere" msgid="411958582555881640">"បាន​ឆ្លើយ​ការ​ហៅ​នៅ​លើ​ឧបករណ៍​ផ្សេង​ទៀត"</string>
-    <string name="description_phone_account" msgid="4382951172691362244">"នៅ <xliff:g id="PHONEACCOUNT">^1</xliff:g>"</string>
-    <string name="description_via_number" msgid="7682575124846343076">"តាមរយៈ <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="description_via_number_phone_account" msgid="4345445677508018830">"នៅ​លើ <xliff:g id="PHONEACCOUNT">%1$s</xliff:g> តាមរយៈ <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="voicemail_string" msgid="6029775151483803006">"សារ​ជា​សំឡេង"</string>
-    <string name="now" msgid="2599778506439006806">"ឥឡូវនេះ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="type_incoming">ការ​ហៅ​ចូល</string>
+  <string name="type_incoming_pulled">ការ​ហៅ​ចូល​ត្រូវ​បាន​បញ្ជូន​ទៅ​ឧបករណ៍​ផ្សេង</string>
+  <string name="type_outgoing">ការ​ហៅ​ចេញ</string>
+  <string name="type_outgoing_pulled">ការ​ហៅ​ចេញ​ត្រូវ​បាន​បញ្ជូន​ទៅ​ឧបករណ៍​ផ្សេង</string>
+  <string name="type_missed">ខកខាន​ទទួល</string>
+  <string name="type_incoming_video">ការ​ហៅចូល​តាម​​វីដេអូ​</string>
+  <string name="type_incoming_video_pulled">ការ​ហៅ​ចូល​ត្រូវ​បាន​បញ្ជូន​ទៅ​ឧបករណ៍​ផ្សេង</string>
+  <string name="type_outgoing_video">ការ​ហៅចេញ​​​តាម​វីដេអូ</string>
+  <string name="type_outgoing_video_pulled">ការ​ហៅ​ចេញ​ត្រូវ​បាន​បញ្ជូន​ទៅ​ឧបករណ៍​ផ្សេង</string>
+  <string name="type_missed_video">ការ​ហៅ​តាម​វីដេអូ​ដែល​បាន​ខកខាន</string>
+  <string name="type_voicemail">សារ​ជា​សំឡេង</string>
+  <string name="type_rejected">ការហៅដែលបានបដិសេធ</string>
+  <string name="type_blocked">ការហៅដែលបានទប់ស្កាត់</string>
+  <string name="call_details_minutes_abbreviation">នាទី</string>
+  <string name="call_details_seconds_abbreviation">វិនាទី</string>
+  <string name="a11y_call_duration_format">%1$d %2$s %3$d %4$s</string>
+  <string name="a11y_call_duration_short_format">%1$d %2$s</string>
+  <string name="call_duration_format_pattern">%1$s\'%2$s\' %3$s\'%4$s\'</string>
+  <string name="call_duration_short_format_pattern">%1$s\'%2$s\'</string>
+  <plurals name="a11y_seconds">
+    <item quantity="one">វិនាទី</item>
+    <item quantity="other">វិនាទី</item>
+  </plurals>
+  <plurals name="a11y_minutes">
+    <item quantity="one">នាទី</item>
+    <item quantity="other">នាទី</item>
+  </plurals>
+  <string name="type_answered_elsewhere">បាន​ឆ្លើយ​ការ​ហៅ​នៅ​លើ​ឧបករណ៍​ផ្សេង​ទៀត</string>
+  <string name="description_phone_account">នៅ ^1</string>
+  <string name="description_via_number">តាមរយៈ %1$s</string>
+  <string name="description_via_number_phone_account">នៅ​លើ %1$s តាមរយៈ %2$s</string>
+  <string name="voicemail_string">សារ​ជា​សំឡេង</string>
+  <string name="just_now">អម្បាញ់មិញ</string>
+  <string name="new_call_log_carrier_video">វីដេអូ​តាម​ក្រុមហ៊ុន​សេវា​ទូរសព្ទ</string>
+  <string name="new_call_log_duo_video">វីដេអូ​តាម Duo</string>
+  <string name="new_call_log_unknown">មិន​ស្គាល់</string>
+  <string name="new_call_log_secondary_blocked">បាន​ទប់ស្កាត់</string>
+  <string name="new_call_log_secondary_spam">សារ​ឥត​បាន​ការ</string>
+  <plurals name="a11y_new_call_log_entry_missed_call">
+    <item quantity="one">ខកខាន​ទទួលការហៅទូរសព្ទ ^1 ដងពី ^2</item>
+    <item quantity="other">ការហៅ​ទូរសព្ទ ^1 ដង ចុងក្រោយ​បំផុត គឺ​ការហៅ​ដែល​ខកខាន​ពី ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_answered_call">
+    <item quantity="one">ការហៅ​​បាន​ឆ្លើយ ^1 ដងពី ^2</item>
+    <item quantity="other">ការហៅ​ទូរសព្ទ ^1 ដង ចុងក្រោយ​បំផុត គឺ​ការហៅ​ដែល​បាន​ឆ្លើយ​ពី ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_outgoing_call">
+    <item quantity="one">ការហៅ​ចេញ ^1 ទៅ​កាន់ ^2</item>
+    <item quantity="other">ការហៅ​ទូរសព្ទ ^1 ដង ចុងក្រោយ​បំផុត គឺ​ជា​ការហៅ​ចេញ​ទៅ​កាន់ ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_blocked_call">
+    <item quantity="one">ការហៅ​បាន​ទប់ស្កាត់ ^1 ដងពី ^2</item>
+    <item quantity="other">ការហៅ​ទូរសព្ទ ^1 ដង ចុងក្រោយ​បំផុត គឺ​ជា​ការហៅ​ដែល​បាន​ទប់ស្កាត់​ពី ^2</item>
+  </plurals>
+  <string name="a11y_new_call_log_entry_phone_account">នៅ​លើ ^1
+    តាមរយៈ ^2</string>
+  <string name="a11y_new_call_log_entry_full_description_without_phone_account_info">^1, ^2 ។</string>
+  <string name="a11y_new_call_log_entry_full_description_with_phone_account_info">^1, ^2, ^3 ។</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-kn/strings.xml b/java/com/android/dialer/calllogutils/res/values-kn/strings.xml
index 07efc0b..6202957 100644
--- a/java/com/android/dialer/calllogutils/res/values-kn/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-kn/strings.xml
@@ -1,53 +1,60 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2017 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="type_incoming" msgid="5727636795656199810">"ಒಳಬರುವ ಕರೆ"</string>
-    <string name="type_incoming_pulled" msgid="8434723359163965796">"ಒಳಬರುವ ಕರೆಯನ್ನು ಮತ್ತೊಂದು ಸಾಧನಕ್ಕೆ ವರ್ಗಾಯಿಸಲಾಗಿದೆ"</string>
-    <string name="type_outgoing" msgid="764896746073942963">"ಹೊರಹೋಗುವ ಕರೆ"</string>
-    <string name="type_outgoing_pulled" msgid="1648517538371704193">"ಹೊರಹೋಗುವ ಕರೆಯನ್ನು ಮತ್ತೊಂದು ಸಾಧನಕ್ಕೆ ವರ್ಗಾಯಿಸಲಾಗಿದೆ"</string>
-    <string name="type_missed" msgid="2997043831022028176">"ಮಿಸ್ಡ್‌ ಕಾಲ್‌"</string>
-    <string name="type_incoming_video" msgid="7507180294202642554">"ಒಳಬರುವ ವೀಡಿಯೊ ಕರೆ"</string>
-    <string name="type_incoming_video_pulled" msgid="7879031598844023977">"ಒಳಬರುವ ವೀಡಿಯೊ ಕರೆಯನ್ನು ಮತ್ತೊಂದು ಸಾಧನಕ್ಕೆ ವರ್ಗಾಯಿಸಲಾಗಿದೆ"</string>
-    <string name="type_outgoing_video" msgid="309370072333983910">"ಹೊರಹೋಗುವ ವೀಡಿಯೊ ಕರೆ"</string>
-    <string name="type_outgoing_video_pulled" msgid="3924450629684331345">"ಹೊರಹೋಗುವ ವೀಡಿಯೊ ಕರೆಯನ್ನು ಮತ್ತೊಂದು ಸಾಧನಕ್ಕೆ ವರ್ಗಾಯಿಸಲಾಗಿದೆ"</string>
-    <string name="type_missed_video" msgid="4350107016317603785">"ಮಿಸ್ಡ್‌ ವೀಡಿಯೊ ಕಾಲ್‌"</string>
-    <string name="type_voicemail" msgid="1877524395253846684">"ಧ್ವನಿಮೇಲ್"</string>
-    <string name="type_rejected" msgid="5632107438472996198">"ನಿರಾಕರಿಸಿದ ಕರೆ"</string>
-    <string name="type_blocked" msgid="9177237294052244929">"ನಿರ್ಬಂಧಿಸಿದ ಕರೆ"</string>
-    <string name="call_details_minutes_abbreviation" msgid="7899774555556720560">"ನಿ"</string>
-    <string name="call_details_seconds_abbreviation" msgid="5893806826648947126">"ಸೆ"</string>
-    <string name="a11y_call_duration_format" msgid="2905525933361674470">"<xliff:g id="MINUTES_0">%d</xliff:g> <xliff:g id="MINUTES_TRANSLATION">%s</xliff:g> <xliff:g id="SECONDS_1">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="a11y_call_duration_short_format" msgid="5908875871251062453">"<xliff:g id="SECONDS_0">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <plurals name="a11y_seconds" formatted="false" msgid="6695730844760611970">
-      <item quantity="one">ಸೆಕೆಂಡ್‌ಗಳು</item>
-      <item quantity="other">ಸೆಕೆಂಡ್‌ಗಳು</item>
-    </plurals>
-    <plurals name="a11y_minutes" formatted="false" msgid="6377010096698624038">
-      <item quantity="one">ನಿಮಿಷಗಳು</item>
-      <item quantity="other">ನಿಮಿಷಗಳು</item>
-    </plurals>
-    <string name="type_answered_elsewhere" msgid="411958582555881640">"ಮತ್ತೊಂದು ಸಾಧನದಲ್ಲಿ ಕರೆಗೆ ಉತ್ತರಿಸಲಾಗಿದೆ"</string>
-    <string name="description_phone_account" msgid="4382951172691362244">"<xliff:g id="PHONEACCOUNT">^1</xliff:g> ನಲ್ಲಿ"</string>
-    <string name="description_via_number" msgid="7682575124846343076">"<xliff:g id="NUMBER">%1$s</xliff:g> ಮೂಲಕ"</string>
-    <string name="description_via_number_phone_account" msgid="4345445677508018830">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> ರಲ್ಲಿ, <xliff:g id="NUMBER">%2$s</xliff:g> ಮೂಲಕ"</string>
-    <string name="voicemail_string" msgid="6029775151483803006">"ಧ್ವನಿಮೇಲ್"</string>
-    <string name="now" msgid="2599778506439006806">"ಈಗ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="type_incoming">ಒಳಬರುವ ಕರೆ</string>
+  <string name="type_incoming_pulled">ಒಳಬರುವ ಕರೆಯನ್ನು ಮತ್ತೊಂದು ಸಾಧನಕ್ಕೆ ವರ್ಗಾಯಿಸಲಾಗಿದೆ</string>
+  <string name="type_outgoing">ಹೊರಹೋಗುವ ಕರೆ</string>
+  <string name="type_outgoing_pulled">ಹೊರಹೋಗುವ ಕರೆಯನ್ನು ಮತ್ತೊಂದು ಸಾಧನಕ್ಕೆ ವರ್ಗಾಯಿಸಲಾಗಿದೆ</string>
+  <string name="type_missed">ಮಿಸ್ಡ್‌ ಕಾಲ್‌</string>
+  <string name="type_incoming_video">ಒಳಬರುವ ವೀಡಿಯೊ ಕರೆ</string>
+  <string name="type_incoming_video_pulled">ಒಳಬರುವ ವೀಡಿಯೊ ಕರೆಯನ್ನು ಮತ್ತೊಂದು ಸಾಧನಕ್ಕೆ ವರ್ಗಾಯಿಸಲಾಗಿದೆ</string>
+  <string name="type_outgoing_video">ಹೊರಹೋಗುವ ವೀಡಿಯೊ ಕರೆ</string>
+  <string name="type_outgoing_video_pulled">ಹೊರಹೋಗುವ ವೀಡಿಯೊ ಕರೆಯನ್ನು ಮತ್ತೊಂದು ಸಾಧನಕ್ಕೆ ವರ್ಗಾಯಿಸಲಾಗಿದೆ</string>
+  <string name="type_missed_video">ಮಿಸ್ಡ್‌ ವೀಡಿಯೊ ಕಾಲ್‌</string>
+  <string name="type_voicemail">ಧ್ವನಿಮೇಲ್</string>
+  <string name="type_rejected">ನಿರಾಕರಿಸಿದ ಕರೆ</string>
+  <string name="type_blocked">ನಿರ್ಬಂಧಿಸಿದ ಕರೆ</string>
+  <string name="call_details_minutes_abbreviation">ನಿ</string>
+  <string name="call_details_seconds_abbreviation">ಸೆ</string>
+  <string name="a11y_call_duration_format">%1$d %2$s %3$d %4$s</string>
+  <string name="a11y_call_duration_short_format">%1$d %2$s</string>
+  <string name="call_duration_format_pattern">%1$s\'%2$s\' %3$s\'%4$s\'</string>
+  <string name="call_duration_short_format_pattern">%1$s\'%2$s\'</string>
+  <plurals name="a11y_seconds">
+    <item quantity="one">ಸೆಕೆಂಡ್‌ಗಳು</item>
+    <item quantity="other">ಸೆಕೆಂಡ್‌ಗಳು</item>
+  </plurals>
+  <plurals name="a11y_minutes">
+    <item quantity="one">ನಿಮಿಷಗಳು</item>
+    <item quantity="other">ನಿಮಿಷಗಳು</item>
+  </plurals>
+  <string name="type_answered_elsewhere">ಮತ್ತೊಂದು ಸಾಧನದಲ್ಲಿ ಕರೆಗೆ ಉತ್ತರಿಸಲಾಗಿದೆ</string>
+  <string name="description_phone_account">^1 ನಲ್ಲಿ</string>
+  <string name="description_via_number">%1$s ಮೂಲಕ</string>
+  <string name="description_via_number_phone_account">%1$s ರಲ್ಲಿ, %2$s ಮೂಲಕ</string>
+  <string name="voicemail_string">ಧ್ವನಿಮೇಲ್</string>
+  <string name="just_now">ಇದೀಗ</string>
+  <string name="new_call_log_carrier_video">ವಾಹಕ ವೀಡಿಯೊ</string>
+  <string name="new_call_log_duo_video">Duo ವೀಡಿಯೊ</string>
+  <string name="new_call_log_unknown">ಅಪರಿಚಿತ</string>
+  <string name="new_call_log_secondary_blocked">ನಿರ್ಬಂಧಿಸಲಾಗಿದೆ</string>
+  <string name="new_call_log_secondary_spam">ಸ್ಪ್ಯಾಮ್</string>
+  <plurals name="a11y_new_call_log_entry_missed_call">
+    <item quantity="one">^1 ಕರೆಗಳು, ^2 ಅವರಿಂದ ಇತ್ತೀಚಿನ ಮಿಸ್ಡ್‌ ಕಾಲ್‌</item>
+    <item quantity="other">^1 ಕರೆಗಳು, ^2 ಅವರಿಂದ ಇತ್ತೀಚಿನ ಮಿಸ್ಡ್‌ ಕಾಲ್‌</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_answered_call">
+    <item quantity="one">^1 ಕರೆಗಳು, ^2 ಅವರಿಂದ ಇತ್ತೀಚೆಗೆ ಉತ್ತರಿಸಲಾಗಿದೆ</item>
+    <item quantity="other">^1 ಕರೆಗಳು, ^2 ಅವರಿಂದ ಇತ್ತೀಚೆಗೆ ಉತ್ತರಿಸಲಾಗಿದೆ</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_outgoing_call">
+    <item quantity="one">^1 ಕರೆಗಳು, ^2 ಅವರಿಗೆ ಇತ್ತೀಚೆಗೆ ಹೋರಹೋಗುವ ಕರೆಯಾಗಿವೆ</item>
+    <item quantity="other">^1 ಕರೆಗಳು, ^2 ಅವರಿಗೆ ಇತ್ತೀಚೆಗೆ ಹೋರಹೋಗುವ ಕರೆಯಾಗಿವೆ</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_blocked_call">
+    <item quantity="one">^1 ಕರೆಗಳು, ^2 ಅವರಿಂದ ಇತ್ತೀಚೆಗೆ ನಿರ್ಬಂಧಿಸಲಾಗಿದೆ</item>
+    <item quantity="other">^1 ಕರೆಗಳು, ^2 ಅವರಿಂದ ಇತ್ತೀಚೆಗೆ ನಿರ್ಬಂಧಿಸಲಾಗಿದೆ</item>
+  </plurals>
+  <string name="a11y_new_call_log_entry_phone_account">^1 ರಲ್ಲಿ, ^2 ಮೂಲಕ</string>
+  <string name="a11y_new_call_log_entry_full_description_without_phone_account_info">^1, ^2.</string>
+  <string name="a11y_new_call_log_entry_full_description_with_phone_account_info">^1, ^2, ^3.</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-ko/strings.xml b/java/com/android/dialer/calllogutils/res/values-ko/strings.xml
index b372e23..df4f0c4 100644
--- a/java/com/android/dialer/calllogutils/res/values-ko/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-ko/strings.xml
@@ -1,53 +1,61 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2017 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="type_incoming" msgid="5727636795656199810">"수신 전화"</string>
-    <string name="type_incoming_pulled" msgid="8434723359163965796">"수신 전화가 다른 기기로 전환됨"</string>
-    <string name="type_outgoing" msgid="764896746073942963">"발신 전화"</string>
-    <string name="type_outgoing_pulled" msgid="1648517538371704193">"발신 전화가 다른 기기로 전환됨"</string>
-    <string name="type_missed" msgid="2997043831022028176">"부재중 전화"</string>
-    <string name="type_incoming_video" msgid="7507180294202642554">"수신 화상 통화"</string>
-    <string name="type_incoming_video_pulled" msgid="7879031598844023977">"수신 화상 통화가 다른 기기로 전환됨"</string>
-    <string name="type_outgoing_video" msgid="309370072333983910">"발신 화상 통화"</string>
-    <string name="type_outgoing_video_pulled" msgid="3924450629684331345">"발신 화상 통화가 다른 기기로 전환됨"</string>
-    <string name="type_missed_video" msgid="4350107016317603785">"부재중 화상 통화"</string>
-    <string name="type_voicemail" msgid="1877524395253846684">"음성사서함"</string>
-    <string name="type_rejected" msgid="5632107438472996198">"거부된 통화"</string>
-    <string name="type_blocked" msgid="9177237294052244929">"차단된 통화"</string>
-    <string name="call_details_minutes_abbreviation" msgid="7899774555556720560">"분"</string>
-    <string name="call_details_seconds_abbreviation" msgid="5893806826648947126">"초"</string>
-    <string name="a11y_call_duration_format" msgid="2905525933361674470">"<xliff:g id="MINUTES_0">%d</xliff:g><xliff:g id="MINUTES_TRANSLATION">%s</xliff:g> <xliff:g id="SECONDS_1">%d</xliff:g><xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="a11y_call_duration_short_format" msgid="5908875871251062453">"<xliff:g id="SECONDS_0">%d</xliff:g><xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <plurals name="a11y_seconds" formatted="false" msgid="6695730844760611970">
-      <item quantity="other">초</item>
-      <item quantity="one">초</item>
-    </plurals>
-    <plurals name="a11y_minutes" formatted="false" msgid="6377010096698624038">
-      <item quantity="other">분</item>
-      <item quantity="one">분</item>
-    </plurals>
-    <string name="type_answered_elsewhere" msgid="411958582555881640">"다른 기기에서 전화를 받음"</string>
-    <string name="description_phone_account" msgid="4382951172691362244">"<xliff:g id="PHONEACCOUNT">^1</xliff:g> 계정"</string>
-    <string name="description_via_number" msgid="7682575124846343076">"<xliff:g id="NUMBER">%1$s</xliff:g>번으로 수신"</string>
-    <string name="description_via_number_phone_account" msgid="4345445677508018830">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g>에서 <xliff:g id="NUMBER">%2$s</xliff:g>번으로 수신"</string>
-    <string name="voicemail_string" msgid="6029775151483803006">"음성사서함"</string>
-    <string name="now" msgid="2599778506439006806">"조금 전"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="type_incoming">수신 전화</string>
+  <string name="type_incoming_pulled">수신 전화가 다른 기기로 전환됨</string>
+  <string name="type_outgoing">발신 전화</string>
+  <string name="type_outgoing_pulled">발신 전화가 다른 기기로 전환됨</string>
+  <string name="type_missed">부재중 전화</string>
+  <string name="type_incoming_video">수신 화상 통화</string>
+  <string name="type_incoming_video_pulled">수신 화상 통화가 다른 기기로 전환됨</string>
+  <string name="type_outgoing_video">발신 화상 통화</string>
+  <string name="type_outgoing_video_pulled">발신 화상 통화가 다른 기기로 전환됨</string>
+  <string name="type_missed_video">부재중 화상 통화</string>
+  <string name="type_voicemail">음성사서함</string>
+  <string name="type_rejected">거부된 통화</string>
+  <string name="type_blocked">차단된 통화</string>
+  <string name="call_details_minutes_abbreviation">분</string>
+  <string name="call_details_seconds_abbreviation">초</string>
+  <string name="a11y_call_duration_format">%1$d %2$s %3$d %4$s</string>
+  <string name="a11y_call_duration_short_format">%1$d %2$s</string>
+  <string name="call_duration_format_pattern">%1$s\'%2$s\' %3$s\'%4$s\'</string>
+  <string name="call_duration_short_format_pattern">%1$s\'%2$s\'</string>
+  <plurals name="a11y_seconds">
+    <item quantity="one">초</item>
+    <item quantity="other">초</item>
+  </plurals>
+  <plurals name="a11y_minutes">
+    <item quantity="one">분</item>
+    <item quantity="other">분</item>
+  </plurals>
+  <string name="type_answered_elsewhere">다른 기기에서 전화를 받음</string>
+  <string name="description_phone_account">^1 계정</string>
+  <string name="description_via_number">%1$s번으로 수신</string>
+  <string name="description_via_number_phone_account">%1$s에서 %2$s번으로 수신</string>
+  <string name="voicemail_string">음성사서함</string>
+  <string name="just_now">조금 전</string>
+  <string name="new_call_log_carrier_video">이동통신사 동영상</string>
+  <string name="new_call_log_duo_video">Duo 동영상</string>
+  <string name="new_call_log_unknown">알 수 없음</string>
+  <string name="new_call_log_secondary_blocked">차단됨</string>
+  <string name="new_call_log_secondary_spam">스팸</string>
+  <plurals name="a11y_new_call_log_entry_missed_call">
+    <item quantity="one">^2님의 부재중 전화가 ^1건 있습니다</item>
+    <item quantity="other">전화 ^1건 중 최근 전화는 ^2님의 부재중 전화입니다</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_answered_call">
+    <item quantity="one">^2님이 걸어서 받은 전화가 ^1건 있습니다</item>
+    <item quantity="other">전화 ^1건 중 최근 전화는 ^2님이 걸어서 받은 전화입니다</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_outgoing_call">
+    <item quantity="one">^2님에게 건 전화가 ^1건 있습니다</item>
+    <item quantity="other">전화 ^1건 중 최근 전화는 ^2님에게 건 전화입니다</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_blocked_call">
+    <item quantity="one">^2님이 걸었지만 차단된 전화가 ^1건 있습니다</item>
+    <item quantity="other">전화 ^1건 중 최근 전화는 ^2님이 걸었지만 차단된 전화입니다</item>
+  </plurals>
+  <string name="a11y_new_call_log_entry_phone_account">전화 계정: ^1,
+    전화번호: ^2</string>
+  <string name="a11y_new_call_log_entry_full_description_without_phone_account_info">^1, ^2.</string>
+  <string name="a11y_new_call_log_entry_full_description_with_phone_account_info">^1, ^2, ^3.</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-ky/strings.xml b/java/com/android/dialer/calllogutils/res/values-ky/strings.xml
index 633bbae..9b9b7c5 100644
--- a/java/com/android/dialer/calllogutils/res/values-ky/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-ky/strings.xml
@@ -1,53 +1,61 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2017 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="type_incoming" msgid="5727636795656199810">"Кирүүчү чалуу"</string>
-    <string name="type_incoming_pulled" msgid="8434723359163965796">"Келип жаткан чалуу башка түзмөккө өткөрүлдү"</string>
-    <string name="type_outgoing" msgid="764896746073942963">"Чыгуучу чалуу"</string>
-    <string name="type_outgoing_pulled" msgid="1648517538371704193">"Чыгуучу чалуулар башка түзмөккө өткөрүлдү"</string>
-    <string name="type_missed" msgid="2997043831022028176">"Жооп берилбеген чалуу"</string>
-    <string name="type_incoming_video" msgid="7507180294202642554">"Келип жаткан видео чалуу"</string>
-    <string name="type_incoming_video_pulled" msgid="7879031598844023977">"Келип жаткан видео чалуу башка түзмөккө өткөрүлдү"</string>
-    <string name="type_outgoing_video" msgid="309370072333983910">"Чыгуучу видео чалуу"</string>
-    <string name="type_outgoing_video_pulled" msgid="3924450629684331345">"Чыгуучу видео чалуу башка түзмөккө өткөрүлдү"</string>
-    <string name="type_missed_video" msgid="4350107016317603785">"Кабыл алынбаган видео чалуу"</string>
-    <string name="type_voicemail" msgid="1877524395253846684">"Үн почтасы"</string>
-    <string name="type_rejected" msgid="5632107438472996198">"Четке кагылган чалуу"</string>
-    <string name="type_blocked" msgid="9177237294052244929">"Бөгөттөлгөн чалуу"</string>
-    <string name="call_details_minutes_abbreviation" msgid="7899774555556720560">"м"</string>
-    <string name="call_details_seconds_abbreviation" msgid="5893806826648947126">"сек"</string>
-    <string name="a11y_call_duration_format" msgid="2905525933361674470">"<xliff:g id="MINUTES_0">%d</xliff:g> <xliff:g id="MINUTES_TRANSLATION">%s</xliff:g> <xliff:g id="SECONDS_1">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="a11y_call_duration_short_format" msgid="5908875871251062453">"<xliff:g id="SECONDS_0">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <plurals name="a11y_seconds" formatted="false" msgid="6695730844760611970">
-      <item quantity="other">секундалар</item>
-      <item quantity="one">секунда</item>
-    </plurals>
-    <plurals name="a11y_minutes" formatted="false" msgid="6377010096698624038">
-      <item quantity="other">мүнөттөр</item>
-      <item quantity="one">мүнөт</item>
-    </plurals>
-    <string name="type_answered_elsewhere" msgid="411958582555881640">"Чалууга башка түзмөктөн жооп берилди"</string>
-    <string name="description_phone_account" msgid="4382951172691362244">"<xliff:g id="PHONEACCOUNT">^1</xliff:g> боюнча"</string>
-    <string name="description_via_number" msgid="7682575124846343076">"<xliff:g id="NUMBER">%1$s</xliff:g> аркылуу"</string>
-    <string name="description_via_number_phone_account" msgid="4345445677508018830">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> боюнча <xliff:g id="NUMBER">%2$s</xliff:g> аркылуу"</string>
-    <string name="voicemail_string" msgid="6029775151483803006">"Үн почтасы"</string>
-    <string name="now" msgid="2599778506439006806">"Учурда"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="type_incoming">Кирүүчү чалуу</string>
+  <string name="type_incoming_pulled">Келип жаткан чалуу башка түзмөккө өткөрүлдү</string>
+  <string name="type_outgoing">Чыгуучу чалуу</string>
+  <string name="type_outgoing_pulled">Чыгуучу чалуулар башка түзмөккө өткөрүлдү</string>
+  <string name="type_missed">Жооп берилбеген чалуу</string>
+  <string name="type_incoming_video">Келип жаткан видео чалуу</string>
+  <string name="type_incoming_video_pulled">Келип жаткан видео чалуу башка түзмөккө өткөрүлдү</string>
+  <string name="type_outgoing_video">Чыгуучу видео чалуу</string>
+  <string name="type_outgoing_video_pulled">Чыгуучу видео чалуу башка түзмөккө өткөрүлдү</string>
+  <string name="type_missed_video">Кабыл алынбаган видео чалуу</string>
+  <string name="type_voicemail">Үн почтасы</string>
+  <string name="type_rejected">Четке кагылган чалуу</string>
+  <string name="type_blocked">Бөгөттөлгөн чалуу</string>
+  <string name="call_details_minutes_abbreviation">м</string>
+  <string name="call_details_seconds_abbreviation">сек</string>
+  <string name="a11y_call_duration_format">%1$d %2$s %3$d %4$s</string>
+  <string name="a11y_call_duration_short_format">%1$d %2$s</string>
+  <string name="call_duration_format_pattern">%1$s\'%2$s\' %3$s\'%4$s\'</string>
+  <string name="call_duration_short_format_pattern">%1$s \'%2$s\'</string>
+  <plurals name="a11y_seconds">
+    <item quantity="one">секунда</item>
+    <item quantity="other">секундалар</item>
+  </plurals>
+  <plurals name="a11y_minutes">
+    <item quantity="one">мүнөт</item>
+    <item quantity="other">мүнөттөр</item>
+  </plurals>
+  <string name="type_answered_elsewhere">Чалууга башка түзмөктөн жооп берилди</string>
+  <string name="description_phone_account">^1 боюнча</string>
+  <string name="description_via_number">%1$s аркылуу</string>
+  <string name="description_via_number_phone_account">%1$s боюнча %2$s аркылуу</string>
+  <string name="voicemail_string">Үн почтасы</string>
+  <string name="just_now">Азыр эле</string>
+  <string name="new_call_log_carrier_video">Видео чалуу</string>
+  <string name="new_call_log_duo_video">Duo видео чалуусу</string>
+  <string name="new_call_log_unknown">Белгисиз</string>
+  <string name="new_call_log_secondary_blocked">Бөгөттөлдү</string>
+  <string name="new_call_log_secondary_spam">Спам</string>
+  <plurals name="a11y_new_call_log_entry_missed_call">
+    <item quantity="one">^2 абонентинен ^1 чалууга жооп берилген жок</item>
+    <item quantity="other">^1 чалуу, акыркы жолу ^2 чалганда жооп берилген жок</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_answered_call">
+    <item quantity="one">^2 абонентинен ^1 чалууга жооп берилди</item>
+    <item quantity="other">^1 чалуу, акыркы жооп берилген чалуу: ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_outgoing_call">
+    <item quantity="one">^1 чыгуучу чалуу: ^2</item>
+    <item quantity="other">^1 чалуу, акыркы чыгуучу чалуу: ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_blocked_call">
+    <item quantity="one">^1 бөгөттөлгөн чалуу: ^2</item>
+    <item quantity="other">^1 чалуу, акыркы бөгөттөлгөн чалуу: ^2</item>
+  </plurals>
+  <string name="a11y_new_call_log_entry_phone_account">^1 боюнча,
+    ^2 аркылуу</string>
+  <string name="a11y_new_call_log_entry_full_description_without_phone_account_info">^1, ^2.</string>
+  <string name="a11y_new_call_log_entry_full_description_with_phone_account_info">^1, ^2, ^3.</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-lo/strings.xml b/java/com/android/dialer/calllogutils/res/values-lo/strings.xml
index 7a7a869..7bba2e7 100644
--- a/java/com/android/dialer/calllogutils/res/values-lo/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-lo/strings.xml
@@ -1,53 +1,61 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2017 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="type_incoming" msgid="5727636795656199810">"​ສາຍ​ໂທ​ເຂົ້າ"</string>
-    <string name="type_incoming_pulled" msgid="8434723359163965796">"ສາຍໂທເຂົ້າຖືກໂອນໄປອຸປະກອນອື່ນແລ້ວ"</string>
-    <string name="type_outgoing" msgid="764896746073942963">"​ສາຍ​ໂທ​ອອກ"</string>
-    <string name="type_outgoing_pulled" msgid="1648517538371704193">"ສາຍໂທອອກຖືກໂອນໄປອຸປະກອນອື່ນແລ້ວ"</string>
-    <string name="type_missed" msgid="2997043831022028176">"​ສາຍບໍ່​ໄດ້​ຮັບ"</string>
-    <string name="type_incoming_video" msgid="7507180294202642554">"ສາຍໂທ​ວິດີໂອ​ເຂົ້າ"</string>
-    <string name="type_incoming_video_pulled" msgid="7879031598844023977">"ສາຍວິດີໂອໂທເຂົ້າຖືກໂອນໄປອຸປະກອນອື່ນແລ້ວ"</string>
-    <string name="type_outgoing_video" msgid="309370072333983910">"ສາຍ​ໂທ​ອອກ​ດ້ວຍ​ວິດີໂອ"</string>
-    <string name="type_outgoing_video_pulled" msgid="3924450629684331345">"ສາຍວິດີໂອໂທອອກຖືກໂອນໄປອຸປະກອນອື່ນແລ້ວ"</string>
-    <string name="type_missed_video" msgid="4350107016317603785">"ສາຍ​ວິດີໂອ​ທີ່​ບໍ່​ໄດ້​ຮັບ"</string>
-    <string name="type_voicemail" msgid="1877524395253846684">"ຂໍ້ຄວາມສຽງ"</string>
-    <string name="type_rejected" msgid="5632107438472996198">"ສາຍ​ໂທ​ທີ່​ຖືກ​ປະ​ຕິ​ເສດ"</string>
-    <string name="type_blocked" msgid="9177237294052244929">"ສາຍ​ໂທ​ທີ່​ຖືກບ​ລັອກ"</string>
-    <string name="call_details_minutes_abbreviation" msgid="7899774555556720560">"ມ"</string>
-    <string name="call_details_seconds_abbreviation" msgid="5893806826648947126">"ວິ"</string>
-    <string name="a11y_call_duration_format" msgid="2905525933361674470">"<xliff:g id="MINUTES_0">%d</xliff:g> <xliff:g id="MINUTES_TRANSLATION">%s</xliff:g> <xliff:g id="SECONDS_1">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="a11y_call_duration_short_format" msgid="5908875871251062453">"<xliff:g id="SECONDS_0">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <plurals name="a11y_seconds" formatted="false" msgid="6695730844760611970">
-      <item quantity="other">ວິນາທີ</item>
-      <item quantity="one">ວິນາທີ</item>
-    </plurals>
-    <plurals name="a11y_minutes" formatted="false" msgid="6377010096698624038">
-      <item quantity="other">ນາທີ</item>
-      <item quantity="one">ນາ​ທີ</item>
-    </plurals>
-    <string name="type_answered_elsewhere" msgid="411958582555881640">"ຮັບສາຍໃນອຸປະກອນອື່ນແລ້ວ"</string>
-    <string name="description_phone_account" msgid="4382951172691362244">"ຢູ່​ <xliff:g id="PHONEACCOUNT">^1</xliff:g>"</string>
-    <string name="description_via_number" msgid="7682575124846343076">"ຜ່ານ <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="description_via_number_phone_account" msgid="4345445677508018830">"ຢູ່ <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, ຜ່ານ <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="voicemail_string" msgid="6029775151483803006">"ຂໍ້ຄວາມສຽງ"</string>
-    <string name="now" msgid="2599778506439006806">"ຕອນນີ້"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="type_incoming">​ສາຍ​ໂທ​ເຂົ້າ</string>
+  <string name="type_incoming_pulled">ສາຍໂທເຂົ້າຖືກໂອນໄປອຸປະກອນອື່ນແລ້ວ</string>
+  <string name="type_outgoing">​ສາຍ​ໂທ​ອອກ</string>
+  <string name="type_outgoing_pulled">ສາຍໂທອອກຖືກໂອນໄປອຸປະກອນອື່ນແລ້ວ</string>
+  <string name="type_missed">​ສາຍບໍ່​ໄດ້​ຮັບ</string>
+  <string name="type_incoming_video">ສາຍໂທ​ວິດີໂອ​ເຂົ້າ</string>
+  <string name="type_incoming_video_pulled">ສາຍວິດີໂອໂທເຂົ້າຖືກໂອນໄປອຸປະກອນອື່ນແລ້ວ</string>
+  <string name="type_outgoing_video">ສາຍ​ໂທ​ອອກ​ດ້ວຍ​ວິດີໂອ</string>
+  <string name="type_outgoing_video_pulled">ສາຍວິດີໂອໂທອອກຖືກໂອນໄປອຸປະກອນອື່ນແລ້ວ</string>
+  <string name="type_missed_video">ສາຍ​ວິດີໂອ​ທີ່​ບໍ່​ໄດ້​ຮັບ</string>
+  <string name="type_voicemail">ຂໍ້ຄວາມສຽງ</string>
+  <string name="type_rejected">ສາຍ​ໂທ​ທີ່​ຖືກ​ປະ​ຕິ​ເສດ</string>
+  <string name="type_blocked">ສາຍ​ໂທ​ທີ່​ຖືກບ​ລັອກ</string>
+  <string name="call_details_minutes_abbreviation">ມ</string>
+  <string name="call_details_seconds_abbreviation">ວິ</string>
+  <string name="a11y_call_duration_format">%1$d %2$s %3$d %4$s</string>
+  <string name="a11y_call_duration_short_format">%1$d %2$s</string>
+  <string name="call_duration_format_pattern">%1$s\'%2$s\' %3$s\'%4$s\'</string>
+  <string name="call_duration_short_format_pattern">%1$s\'%2$s\'</string>
+  <plurals name="a11y_seconds">
+    <item quantity="one">ວິນາທີ</item>
+    <item quantity="other">ວິນາທີ</item>
+  </plurals>
+  <plurals name="a11y_minutes">
+    <item quantity="one">ນາ​ທີ</item>
+    <item quantity="other">ນາທີ</item>
+  </plurals>
+  <string name="type_answered_elsewhere">ຮັບສາຍໃນອຸປະກອນອື່ນແລ້ວ</string>
+  <string name="description_phone_account">ຢູ່​ ^1</string>
+  <string name="description_via_number">ຜ່ານ %1$s</string>
+  <string name="description_via_number_phone_account">ຢູ່ %1$s, ຜ່ານ %2$s</string>
+  <string name="voicemail_string">ຂໍ້ຄວາມສຽງ</string>
+  <string name="just_now">ຕອນນີ້</string>
+  <string name="new_call_log_carrier_video">ວິດີໂອຜູ້ໃຫ້ບໍລິການ</string>
+  <string name="new_call_log_duo_video">ວິດີໂອ Duo</string>
+  <string name="new_call_log_unknown">ບໍ່ຮູ້ຈັກ</string>
+  <string name="new_call_log_secondary_blocked">ບລັອກແລ້ວ</string>
+  <string name="new_call_log_secondary_spam">ສະແປມ</string>
+  <plurals name="a11y_new_call_log_entry_missed_call">
+    <item quantity="one">^1 ສາຍບໍ່ໄດ້ຮັບຈາກ ^2</item>
+    <item quantity="other">^1 ສາຍ, ສາຍຫຼ້າສຸດແມ່ນສາຍບໍ່ໄດ້ຮັບຈາກ ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_answered_call">
+    <item quantity="one">^1 ສາຍທີ່ຮັບຈາກ ^2</item>
+    <item quantity="other">^1 ສາຍ, ສາຍຫຼ້າສຸດແມ່ນສາຍທີ່ຮັບຈາກ ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_outgoing_call">
+    <item quantity="one">^1 ສາຍໂທອອກຫາ ^2</item>
+    <item quantity="other">^1 ສາຍ, ສາຍຫຼ້າສຸດແມ່ນສາຍທີ່ໂທອອກຫາ ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_blocked_call">
+    <item quantity="one">^1 ສາຍທີ່ບລັອກຈາກ ^2</item>
+    <item quantity="other">^1 ສາຍ, ສາຍຫຼ້າສຸດແມ່ນສາຍທີ່ບລັອກຈາກ ^2</item>
+  </plurals>
+  <string name="a11y_new_call_log_entry_phone_account">ຢູ່ ^1,
+    ຜ່ານ ^2</string>
+  <string name="a11y_new_call_log_entry_full_description_without_phone_account_info">^1, ^2.</string>
+  <string name="a11y_new_call_log_entry_full_description_with_phone_account_info">^1, ^2, ^3.</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-lt/strings.xml b/java/com/android/dialer/calllogutils/res/values-lt/strings.xml
index eca5ea3..2dd55cc 100644
--- a/java/com/android/dialer/calllogutils/res/values-lt/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-lt/strings.xml
@@ -1,57 +1,73 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2017 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="type_incoming" msgid="5727636795656199810">"Gaunamasis skambutis"</string>
-    <string name="type_incoming_pulled" msgid="8434723359163965796">"Gaunamasis skambutis perkeltas į kitą įrenginį"</string>
-    <string name="type_outgoing" msgid="764896746073942963">"Siunčiamasis skambutis"</string>
-    <string name="type_outgoing_pulled" msgid="1648517538371704193">"Siunčiamasis skambutis perkeltas į kitą įrenginį"</string>
-    <string name="type_missed" msgid="2997043831022028176">"Praleistas skambutis"</string>
-    <string name="type_incoming_video" msgid="7507180294202642554">"Gaunamasis vaizdo skambutis"</string>
-    <string name="type_incoming_video_pulled" msgid="7879031598844023977">"Gaunamasis vaizdo skambutis perkeltas į kitą įrenginį"</string>
-    <string name="type_outgoing_video" msgid="309370072333983910">"Siunčiamasis vaizdo skambutis"</string>
-    <string name="type_outgoing_video_pulled" msgid="3924450629684331345">"Siunčiamasis vaizdo skambutis perkeltas į kitą įrenginį"</string>
-    <string name="type_missed_video" msgid="4350107016317603785">"Praleistas vaizdo skambutis"</string>
-    <string name="type_voicemail" msgid="1877524395253846684">"Balso paštas"</string>
-    <string name="type_rejected" msgid="5632107438472996198">"Atmestas skambutis"</string>
-    <string name="type_blocked" msgid="9177237294052244929">"Užblokuotas skambutis"</string>
-    <string name="call_details_minutes_abbreviation" msgid="7899774555556720560">"min."</string>
-    <string name="call_details_seconds_abbreviation" msgid="5893806826648947126">"sek."</string>
-    <string name="a11y_call_duration_format" msgid="2905525933361674470">"<xliff:g id="MINUTES_0">%d</xliff:g> <xliff:g id="MINUTES_TRANSLATION">%s</xliff:g> <xliff:g id="SECONDS_1">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="a11y_call_duration_short_format" msgid="5908875871251062453">"<xliff:g id="SECONDS_0">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <plurals name="a11y_seconds" formatted="false" msgid="6695730844760611970">
-      <item quantity="one">sekundė</item>
-      <item quantity="few">sekundės</item>
-      <item quantity="many">sekundės</item>
-      <item quantity="other">sekundžių</item>
-    </plurals>
-    <plurals name="a11y_minutes" formatted="false" msgid="6377010096698624038">
-      <item quantity="one">minutė</item>
-      <item quantity="few">minutės</item>
-      <item quantity="many">minutės</item>
-      <item quantity="other">minučių</item>
-    </plurals>
-    <string name="type_answered_elsewhere" msgid="411958582555881640">"Į skambutį atsakyta kitame įrenginyje"</string>
-    <string name="description_phone_account" msgid="4382951172691362244">"<xliff:g id="PHONEACCOUNT">^1</xliff:g>"</string>
-    <string name="description_via_number" msgid="7682575124846343076">"numeriu <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="description_via_number_phone_account" msgid="4345445677508018830">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, numeriu <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="voicemail_string" msgid="6029775151483803006">"Balso paštas"</string>
-    <string name="now" msgid="2599778506439006806">"Dabar"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="type_incoming">Gaunamasis skambutis</string>
+  <string name="type_incoming_pulled">Gaunamasis skambutis perkeltas į kitą įrenginį</string>
+  <string name="type_outgoing">Siunčiamasis skambutis</string>
+  <string name="type_outgoing_pulled">Siunčiamasis skambutis perkeltas į kitą įrenginį</string>
+  <string name="type_missed">Praleistas skambutis</string>
+  <string name="type_incoming_video">Gaunamasis vaizdo skambutis</string>
+  <string name="type_incoming_video_pulled">Gaunamasis vaizdo skambutis perkeltas į kitą įrenginį</string>
+  <string name="type_outgoing_video">Siunčiamasis vaizdo skambutis</string>
+  <string name="type_outgoing_video_pulled">Siunčiamasis vaizdo skambutis perkeltas į kitą įrenginį</string>
+  <string name="type_missed_video">Praleistas vaizdo skambutis</string>
+  <string name="type_voicemail">Balso paštas</string>
+  <string name="type_rejected">Atmestas skambutis</string>
+  <string name="type_blocked">Užblokuotas skambutis</string>
+  <string name="call_details_minutes_abbreviation">min.</string>
+  <string name="call_details_seconds_abbreviation">sek.</string>
+  <string name="a11y_call_duration_format">%1$d %2$s %3$d %4$s</string>
+  <string name="a11y_call_duration_short_format">%1$d %2$s</string>
+  <string name="call_duration_format_pattern">%1$s \'%2$s\' %3$s \'%4$s\'</string>
+  <string name="call_duration_short_format_pattern">%1$s \'%2$s\'</string>
+  <plurals name="a11y_seconds">
+    <item quantity="one">sekundė</item>
+    <item quantity="few">sekundės</item>
+    <item quantity="many">sekundės</item>
+    <item quantity="other">sekundžių</item>
+  </plurals>
+  <plurals name="a11y_minutes">
+    <item quantity="one">minutė</item>
+    <item quantity="few">minutės</item>
+    <item quantity="many">minutės</item>
+    <item quantity="other">minučių</item>
+  </plurals>
+  <string name="type_answered_elsewhere">Į skambutį atsakyta kitame įrenginyje</string>
+  <string name="description_phone_account">^1</string>
+  <string name="description_via_number">numeriu %1$s</string>
+  <string name="description_via_number_phone_account">%1$s, numeriu %2$s</string>
+  <string name="voicemail_string">Balso paštas</string>
+  <string name="just_now">Ką tik</string>
+  <string name="new_call_log_carrier_video">Operatoriaus vaizdo skambučiai</string>
+  <string name="new_call_log_duo_video">„Duo“ vaizdo skambučiai</string>
+  <string name="new_call_log_unknown">Nežinoma</string>
+  <string name="new_call_log_secondary_blocked">Užblokuota</string>
+  <string name="new_call_log_secondary_spam">Šlamštas</string>
+  <plurals name="a11y_new_call_log_entry_missed_call">
+    <item quantity="one">^1 skambutis, paskutinis yra praleistas skambutis nuo ^2</item>
+    <item quantity="few">^1 skambučiai, paskutinis yra praleistas skambutis nuo ^2</item>
+    <item quantity="many">^1 skambučio, paskutinis yra praleistas skambutis nuo ^2</item>
+    <item quantity="other">^1 skambučių, paskutinis yra praleistas skambutis nuo ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_answered_call">
+    <item quantity="one">^1 skambutis, paskutinis yra atsakytas skambutis nuo ^2</item>
+    <item quantity="few">^1 skambučiai, paskutinis yra atsakytas skambutis nuo ^2</item>
+    <item quantity="many">^1 skambučio, paskutinis yra atsakytas skambutis nuo ^2</item>
+    <item quantity="other">^1 skambučių, paskutinis yra atsakytas skambutis nuo ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_outgoing_call">
+    <item quantity="one">^1 skambutis, paskutinis yra siunčiamasis skambutis, skirtas ^2</item>
+    <item quantity="few">^1 skambučiai, paskutinis yra siunčiamasis skambutis, skirtas ^2</item>
+    <item quantity="many">^1 skambučio, paskutinis yra siunčiamasis skambutis, skirtas ^2</item>
+    <item quantity="other">^1 skambučių, paskutinis yra siunčiamasis skambutis, skirtas ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_blocked_call">
+    <item quantity="one">^1 skambutis, paskutinis yra užblokuotas skambutis nuo ^2</item>
+    <item quantity="few">^1 skambučiai, paskutinis yra užblokuotas skambutis nuo ^2</item>
+    <item quantity="many">^1 skambučio, paskutinis yra užblokuotas skambutis nuo ^2</item>
+    <item quantity="other">^1 skambučių, paskutinis yra užblokuotas skambutis nuo ^2</item>
+  </plurals>
+  <string name="a11y_new_call_log_entry_phone_account">^1,
+    numeriu ^2</string>
+  <string name="a11y_new_call_log_entry_full_description_without_phone_account_info">^1, ^2.</string>
+  <string name="a11y_new_call_log_entry_full_description_with_phone_account_info">^1, ^2, ^3.</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-lv/strings.xml b/java/com/android/dialer/calllogutils/res/values-lv/strings.xml
index 5b469a5..0c32f9b 100644
--- a/java/com/android/dialer/calllogutils/res/values-lv/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-lv/strings.xml
@@ -1,55 +1,67 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2017 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="type_incoming" msgid="5727636795656199810">"Ienākošs zvans"</string>
-    <string name="type_incoming_pulled" msgid="8434723359163965796">"Ienākošais zvans tika pāradresēts uz citu ierīci"</string>
-    <string name="type_outgoing" msgid="764896746073942963">"Izejošs zvans"</string>
-    <string name="type_outgoing_pulled" msgid="1648517538371704193">"Izejošais zvans tika pāradresēts uz citu ierīci"</string>
-    <string name="type_missed" msgid="2997043831022028176">"Neatbildēts zvans"</string>
-    <string name="type_incoming_video" msgid="7507180294202642554">"Ienākošs videozvans"</string>
-    <string name="type_incoming_video_pulled" msgid="7879031598844023977">"Ienākošais videozvans tika pāradresēts uz citu ierīci"</string>
-    <string name="type_outgoing_video" msgid="309370072333983910">"Izejošs videozvans"</string>
-    <string name="type_outgoing_video_pulled" msgid="3924450629684331345">"Izejošais videozvans tika pāradresēts uz citu ierīci"</string>
-    <string name="type_missed_video" msgid="4350107016317603785">"Neatbildēts videozvans"</string>
-    <string name="type_voicemail" msgid="1877524395253846684">"Balss pasta ziņojums"</string>
-    <string name="type_rejected" msgid="5632107438472996198">"Noraidīts zvans"</string>
-    <string name="type_blocked" msgid="9177237294052244929">"Bloķēts zvans"</string>
-    <string name="call_details_minutes_abbreviation" msgid="7899774555556720560">"min"</string>
-    <string name="call_details_seconds_abbreviation" msgid="5893806826648947126">"s"</string>
-    <string name="a11y_call_duration_format" msgid="2905525933361674470">"<xliff:g id="MINUTES_0">%d</xliff:g> <xliff:g id="MINUTES_TRANSLATION">%s</xliff:g> <xliff:g id="SECONDS_1">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="a11y_call_duration_short_format" msgid="5908875871251062453">"<xliff:g id="SECONDS_0">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <plurals name="a11y_seconds" formatted="false" msgid="6695730844760611970">
-      <item quantity="zero">sekunžu</item>
-      <item quantity="one">sekunde</item>
-      <item quantity="other">sekundes</item>
-    </plurals>
-    <plurals name="a11y_minutes" formatted="false" msgid="6377010096698624038">
-      <item quantity="zero">minūšu</item>
-      <item quantity="one">minūte</item>
-      <item quantity="other">minūtes</item>
-    </plurals>
-    <string name="type_answered_elsewhere" msgid="411958582555881640">"Uz zvanu tika atbildēts citā ierīcē"</string>
-    <string name="description_phone_account" msgid="4382951172691362244">"kontā <xliff:g id="PHONEACCOUNT">^1</xliff:g>"</string>
-    <string name="description_via_number" msgid="7682575124846343076">"izmantojot numuru <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="description_via_number_phone_account" msgid="4345445677508018830">"kontā <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, izmantojot numuru <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="voicemail_string" msgid="6029775151483803006">"Balss pasts"</string>
-    <string name="now" msgid="2599778506439006806">"Tikko"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="type_incoming">Ienākošs zvans</string>
+  <string name="type_incoming_pulled">Ienākošais zvans tika pāradresēts uz citu ierīci</string>
+  <string name="type_outgoing">Izejošs zvans</string>
+  <string name="type_outgoing_pulled">Izejošais zvans tika pāradresēts uz citu ierīci</string>
+  <string name="type_missed">Neatbildēts zvans</string>
+  <string name="type_incoming_video">Ienākošs videozvans</string>
+  <string name="type_incoming_video_pulled">Ienākošais videozvans tika pāradresēts uz citu ierīci</string>
+  <string name="type_outgoing_video">Izejošs videozvans</string>
+  <string name="type_outgoing_video_pulled">Izejošais videozvans tika pāradresēts uz citu ierīci</string>
+  <string name="type_missed_video">Neatbildēts videozvans</string>
+  <string name="type_voicemail">Balss pasta ziņojums</string>
+  <string name="type_rejected">Noraidīts zvans</string>
+  <string name="type_blocked">Bloķēts zvans</string>
+  <string name="call_details_minutes_abbreviation">min</string>
+  <string name="call_details_seconds_abbreviation">s</string>
+  <string name="a11y_call_duration_format">%1$d %2$s %3$d %4$s</string>
+  <string name="a11y_call_duration_short_format">%1$d %2$s</string>
+  <string name="call_duration_format_pattern">%1$s \'%2$s\' %3$s \'%4$s\'</string>
+  <string name="call_duration_short_format_pattern">%1$s\'%2$s\'</string>
+  <plurals name="a11y_seconds">
+    <item quantity="zero">sekunžu</item>
+    <item quantity="one">sekunde</item>
+    <item quantity="other">sekundes</item>
+  </plurals>
+  <plurals name="a11y_minutes">
+    <item quantity="zero">minūšu</item>
+    <item quantity="one">minūte</item>
+    <item quantity="other">minūtes</item>
+  </plurals>
+  <string name="type_answered_elsewhere">Uz zvanu tika atbildēts citā ierīcē</string>
+  <string name="description_phone_account">kontā ^1</string>
+  <string name="description_via_number">izmantojot numuru %1$s</string>
+  <string name="description_via_number_phone_account">kontā %1$s, izmantojot numuru %2$s</string>
+  <string name="voicemail_string">Balss pasts</string>
+  <string name="just_now">Tikko</string>
+  <string name="new_call_log_carrier_video">Mobilo sakaru operatora video</string>
+  <string name="new_call_log_duo_video">Duo video</string>
+  <string name="new_call_log_unknown">Nezināms</string>
+  <string name="new_call_log_secondary_blocked">Bloķēti</string>
+  <string name="new_call_log_secondary_spam">Nevēlami zvani</string>
+  <plurals name="a11y_new_call_log_entry_missed_call">
+    <item quantity="zero">^1 zvanu; pēdējais zvans ir neatbildēts zvans no lietotāja ^2</item>
+    <item quantity="one">^1 zvans; pēdējais zvans ir neatbildēts zvans no lietotāja ^2</item>
+    <item quantity="other">^1 zvani; pēdējais zvans ir neatbildēts zvans no lietotāja ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_answered_call">
+    <item quantity="zero">^1 zvanu; pēdējais zvans ir atbildēts zvans no lietotāja ^2</item>
+    <item quantity="one">^1 zvans; pēdējais zvans ir atbildēts zvans no lietotāja ^2</item>
+    <item quantity="other">^1 zvani; pēdējais zvans ir atbildēts zvans no lietotāja ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_outgoing_call">
+    <item quantity="zero">^1 zvanu; pēdējais zvans ir izejošs zvans lietotājam ^2</item>
+    <item quantity="one">^1 zvans; pēdējais zvans ir izejošs zvans lietotājam ^2</item>
+    <item quantity="other">^1 zvani; pēdējais zvans ir izejošs zvans lietotājam ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_blocked_call">
+    <item quantity="zero">^1 zvanu; pēdējais zvans ir bloķēts zvans no lietotāja ^2</item>
+    <item quantity="one">^1 zvans; pēdējais zvans ir bloķēts zvans no lietotāja ^2</item>
+    <item quantity="other">^1 zvani; pēdējais zvans ir bloķēts zvans no lietotāja ^2</item>
+  </plurals>
+  <string name="a11y_new_call_log_entry_phone_account">kontā ^1,
+    izmantojot numuru ^2</string>
+  <string name="a11y_new_call_log_entry_full_description_without_phone_account_info">^1, ^2.</string>
+  <string name="a11y_new_call_log_entry_full_description_with_phone_account_info">^1, ^2, ^3.</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-mk/strings.xml b/java/com/android/dialer/calllogutils/res/values-mk/strings.xml
index 72dfc07..bce7164 100644
--- a/java/com/android/dialer/calllogutils/res/values-mk/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-mk/strings.xml
@@ -1,53 +1,61 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2017 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="type_incoming" msgid="5727636795656199810">"Дојдовен повик"</string>
-    <string name="type_incoming_pulled" msgid="8434723359163965796">"Дојдовниот повик е префрлен на друг уред"</string>
-    <string name="type_outgoing" msgid="764896746073942963">"Појдовен повик"</string>
-    <string name="type_outgoing_pulled" msgid="1648517538371704193">"Појдовниот повик е префрлен на друг уред"</string>
-    <string name="type_missed" msgid="2997043831022028176">"Пропуштен повик"</string>
-    <string name="type_incoming_video" msgid="7507180294202642554">"Дојдовен видеоповик"</string>
-    <string name="type_incoming_video_pulled" msgid="7879031598844023977">"Дојдовниот видеоповик е префрлен на друг уред"</string>
-    <string name="type_outgoing_video" msgid="309370072333983910">"Појдовен видеоповик"</string>
-    <string name="type_outgoing_video_pulled" msgid="3924450629684331345">"Појдовниот видеоповик е префрлен на друг уред"</string>
-    <string name="type_missed_video" msgid="4350107016317603785">"Пропуштен видеоповик"</string>
-    <string name="type_voicemail" msgid="1877524395253846684">"Говорна пошта"</string>
-    <string name="type_rejected" msgid="5632107438472996198">"Одбиен повик"</string>
-    <string name="type_blocked" msgid="9177237294052244929">"Блокиран повик"</string>
-    <string name="call_details_minutes_abbreviation" msgid="7899774555556720560">"мин."</string>
-    <string name="call_details_seconds_abbreviation" msgid="5893806826648947126">"сек."</string>
-    <string name="a11y_call_duration_format" msgid="2905525933361674470">"<xliff:g id="MINUTES_0">%d</xliff:g> <xliff:g id="MINUTES_TRANSLATION">%s</xliff:g> <xliff:g id="SECONDS_1">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="a11y_call_duration_short_format" msgid="5908875871251062453">"<xliff:g id="SECONDS_0">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <plurals name="a11y_seconds" formatted="false" msgid="6695730844760611970">
-      <item quantity="one">секунди</item>
-      <item quantity="other">секунди</item>
-    </plurals>
-    <plurals name="a11y_minutes" formatted="false" msgid="6377010096698624038">
-      <item quantity="one">минути</item>
-      <item quantity="other">минути</item>
-    </plurals>
-    <string name="type_answered_elsewhere" msgid="411958582555881640">"Повикот е одговорен на друг уред"</string>
-    <string name="description_phone_account" msgid="4382951172691362244">"на <xliff:g id="PHONEACCOUNT">^1</xliff:g>"</string>
-    <string name="description_via_number" msgid="7682575124846343076">"на <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="description_via_number_phone_account" msgid="4345445677508018830">"на <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, на <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="voicemail_string" msgid="6029775151483803006">"Говорна пошта"</string>
-    <string name="now" msgid="2599778506439006806">"Сега"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="type_incoming">Дојдовен повик</string>
+  <string name="type_incoming_pulled">Дојдовниот повик е префрлен на друг уред</string>
+  <string name="type_outgoing">Појдовен повик</string>
+  <string name="type_outgoing_pulled">Појдовниот повик е префрлен на друг уред</string>
+  <string name="type_missed">Пропуштен повик</string>
+  <string name="type_incoming_video">Дојдовен видеоповик</string>
+  <string name="type_incoming_video_pulled">Дојдовниот видеоповик е префрлен на друг уред</string>
+  <string name="type_outgoing_video">Појдовен видеоповик</string>
+  <string name="type_outgoing_video_pulled">Појдовниот видеоповик е префрлен на друг уред</string>
+  <string name="type_missed_video">Пропуштен видеоповик</string>
+  <string name="type_voicemail">Говорна пошта</string>
+  <string name="type_rejected">Одбиен повик</string>
+  <string name="type_blocked">Блокиран повик</string>
+  <string name="call_details_minutes_abbreviation">мин.</string>
+  <string name="call_details_seconds_abbreviation">сек.</string>
+  <string name="a11y_call_duration_format">%1$d %2$s %3$d %4$s</string>
+  <string name="a11y_call_duration_short_format">%1$d %2$s</string>
+  <string name="call_duration_format_pattern">%1$s\'%2$s\' %3$s\'%4$s\'</string>
+  <string name="call_duration_short_format_pattern">%1$s\'%2$s\'</string>
+  <plurals name="a11y_seconds">
+    <item quantity="one">секунди</item>
+    <item quantity="other">секунди</item>
+  </plurals>
+  <plurals name="a11y_minutes">
+    <item quantity="one">минути</item>
+    <item quantity="other">минути</item>
+  </plurals>
+  <string name="type_answered_elsewhere">Повикот е одговорен на друг уред</string>
+  <string name="description_phone_account">на ^1</string>
+  <string name="description_via_number">на %1$s</string>
+  <string name="description_via_number_phone_account">на %1$s, на %2$s</string>
+  <string name="voicemail_string">Говорна пошта</string>
+  <string name="just_now">Пред малку</string>
+  <string name="new_call_log_carrier_video">Видеоповик преку оператор</string>
+  <string name="new_call_log_duo_video">Видеоповик на Duo</string>
+  <string name="new_call_log_unknown">Непознато</string>
+  <string name="new_call_log_secondary_blocked">Блокирано</string>
+  <string name="new_call_log_secondary_spam">Спам</string>
+  <plurals name="a11y_new_call_log_entry_missed_call">
+    <item quantity="one">^1 повик. Последниот е пропуштен повик од ^2</item>
+    <item quantity="other">^1 повици. Последниот е пропуштен повик од ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_answered_call">
+    <item quantity="one">^1 повик. Последниот е одговорен повик од ^2</item>
+    <item quantity="other">^1 повици. Последниот е одговорен повик од ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_outgoing_call">
+    <item quantity="one">^1 повик. Последниот е појдовен повик до ^2</item>
+    <item quantity="other">^1 повици. Последниот е појдовен повик до ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_blocked_call">
+    <item quantity="one">^1 повик. Последниот е блокиран повик од ^2</item>
+    <item quantity="other">^1 повици. Последниот е блокиран повик од ^2</item>
+  </plurals>
+  <string name="a11y_new_call_log_entry_phone_account">на ^1,
+    на ^2</string>
+  <string name="a11y_new_call_log_entry_full_description_without_phone_account_info">^1, ^2.</string>
+  <string name="a11y_new_call_log_entry_full_description_with_phone_account_info">^1, ^2, ^3.</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-ml/strings.xml b/java/com/android/dialer/calllogutils/res/values-ml/strings.xml
index 7a819e9..4131c11 100644
--- a/java/com/android/dialer/calllogutils/res/values-ml/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-ml/strings.xml
@@ -1,53 +1,61 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2017 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="type_incoming" msgid="5727636795656199810">"ഇന്‍‌കമിംഗ് കോള്‍"</string>
-    <string name="type_incoming_pulled" msgid="8434723359163965796">"മറ്റൊരു ഉപകരണത്തിലേക്ക് ഇൻകമിംഗ് കോൾ കൈമാറി"</string>
-    <string name="type_outgoing" msgid="764896746073942963">"വിളിച്ച കോൾ"</string>
-    <string name="type_outgoing_pulled" msgid="1648517538371704193">"മറ്റൊരു ഉപകരണത്തിലേക്ക് ഔട്ട്‌ഗോയിംഗ് കോൾ കൈമാറി"</string>
-    <string name="type_missed" msgid="2997043831022028176">"മിസ്ഡ് കോള്‍"</string>
-    <string name="type_incoming_video" msgid="7507180294202642554">"ഇൻകമിംഗ് വീഡിയോ കോൾ"</string>
-    <string name="type_incoming_video_pulled" msgid="7879031598844023977">"മറ്റൊരു ഉപകരണത്തിലേക്ക് ഇൻകമിംഗ് വീഡിയോ കോൾ കൈമാറി"</string>
-    <string name="type_outgoing_video" msgid="309370072333983910">"വിളിച്ച വീഡിയോ കോൾ"</string>
-    <string name="type_outgoing_video_pulled" msgid="3924450629684331345">"മറ്റൊരു ഉപകരണത്തിലേക്ക് ഔട്ട്‌ഗോയിംഗ് വീഡിയോ കോൾ കൈമാറി"</string>
-    <string name="type_missed_video" msgid="4350107016317603785">"വീഡിയോ കോൾ നഷ്‌ടമായി"</string>
-    <string name="type_voicemail" msgid="1877524395253846684">"വോയ്‌സ്‌മെയിൽ"</string>
-    <string name="type_rejected" msgid="5632107438472996198">"നിരസിച്ച കോൾ"</string>
-    <string name="type_blocked" msgid="9177237294052244929">"ബ്ലോക്കുചെയ്ത കോൾ"</string>
-    <string name="call_details_minutes_abbreviation" msgid="7899774555556720560">"മി."</string>
-    <string name="call_details_seconds_abbreviation" msgid="5893806826648947126">"സെ."</string>
-    <string name="a11y_call_duration_format" msgid="2905525933361674470">"<xliff:g id="MINUTES_0">%d</xliff:g> <xliff:g id="MINUTES_TRANSLATION">%s</xliff:g> <xliff:g id="SECONDS_1">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="a11y_call_duration_short_format" msgid="5908875871251062453">"<xliff:g id="SECONDS_0">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <plurals name="a11y_seconds" formatted="false" msgid="6695730844760611970">
-      <item quantity="other">സെക്കൻഡ്</item>
-      <item quantity="one">സെക്കൻഡ്</item>
-    </plurals>
-    <plurals name="a11y_minutes" formatted="false" msgid="6377010096698624038">
-      <item quantity="other">മിനിറ്റ്</item>
-      <item quantity="one">മിനിറ്റ്</item>
-    </plurals>
-    <string name="type_answered_elsewhere" msgid="411958582555881640">"മറ്റൊരു ഉപകരണത്തിൽ കോളിന് മറുപടി നൽകി"</string>
-    <string name="description_phone_account" msgid="4382951172691362244">"<xliff:g id="PHONEACCOUNT">^1</xliff:g> എന്നതിൽ"</string>
-    <string name="description_via_number" msgid="7682575124846343076">"<xliff:g id="NUMBER">%1$s</xliff:g> നമ്പർ വഴി"</string>
-    <string name="description_via_number_phone_account" msgid="4345445677508018830">"<xliff:g id="NUMBER">%2$s</xliff:g> നമ്പർ വഴി, <xliff:g id="PHONEACCOUNT">%1$s</xliff:g> അക്കൗണ്ടിൽ"</string>
-    <string name="voicemail_string" msgid="6029775151483803006">"വോയ്‌സ്‌മെയിൽ"</string>
-    <string name="now" msgid="2599778506439006806">"ഇപ്പോൾ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="type_incoming">ഇന്‍‌കമിംഗ് കോള്‍</string>
+  <string name="type_incoming_pulled">മറ്റൊരു ഉപകരണത്തിലേക്ക് ഇൻകമിംഗ് കോൾ കൈമാറി</string>
+  <string name="type_outgoing">വിളിച്ച കോൾ</string>
+  <string name="type_outgoing_pulled">മറ്റൊരു ഉപകരണത്തിലേക്ക് ഔട്ട്‌ഗോയിംഗ് കോൾ കൈമാറി</string>
+  <string name="type_missed">മിസ്ഡ് കോള്‍</string>
+  <string name="type_incoming_video">ഇൻകമിംഗ് വീഡിയോ കോൾ</string>
+  <string name="type_incoming_video_pulled">മറ്റൊരു ഉപകരണത്തിലേക്ക് ഇൻകമിംഗ് വീഡിയോ കോൾ കൈമാറി</string>
+  <string name="type_outgoing_video">വിളിച്ച വീഡിയോ കോൾ</string>
+  <string name="type_outgoing_video_pulled">മറ്റൊരു ഉപകരണത്തിലേക്ക് ഔട്ട്‌ഗോയിംഗ് വീഡിയോ കോൾ കൈമാറി</string>
+  <string name="type_missed_video">വീഡിയോ കോൾ നഷ്‌ടമായി</string>
+  <string name="type_voicemail">വോയ്‌സ്‌മെയിൽ</string>
+  <string name="type_rejected">നിരസിച്ച കോൾ</string>
+  <string name="type_blocked">ബ്ലോക്കുചെയ്ത കോൾ</string>
+  <string name="call_details_minutes_abbreviation">മി.</string>
+  <string name="call_details_seconds_abbreviation">സെ.</string>
+  <string name="a11y_call_duration_format">%1$d %2$s %3$d %4$s</string>
+  <string name="a11y_call_duration_short_format">%1$d %2$s</string>
+  <string name="call_duration_format_pattern">%1$s\'%2$s\' %3$s\'%4$s\'</string>
+  <string name="call_duration_short_format_pattern">%1$s \'%2$s\'</string>
+  <plurals name="a11y_seconds">
+    <item quantity="one">സെക്കൻഡ്</item>
+    <item quantity="other">സെക്കൻഡ്</item>
+  </plurals>
+  <plurals name="a11y_minutes">
+    <item quantity="one">മിനിറ്റ്</item>
+    <item quantity="other">മിനിറ്റ്</item>
+  </plurals>
+  <string name="type_answered_elsewhere">മറ്റൊരു ഉപകരണത്തിൽ കോളിന് മറുപടി നൽകി</string>
+  <string name="description_phone_account">^1 എന്നതിൽ</string>
+  <string name="description_via_number">%1$s നമ്പർ വഴി</string>
+  <string name="description_via_number_phone_account">%2$s നമ്പർ വഴി, %1$s അക്കൗണ്ടിൽ</string>
+  <string name="voicemail_string">വോയ്‌സ്‌മെയിൽ</string>
+  <string name="just_now">ഇപ്പോൾ</string>
+  <string name="new_call_log_carrier_video">കാരിയർ വീഡിയോ</string>
+  <string name="new_call_log_duo_video">Duo വീഡിയോ</string>
+  <string name="new_call_log_unknown">അജ്ഞാതം</string>
+  <string name="new_call_log_secondary_blocked">ബ്ലോക്ക് ചെയ്‌തു</string>
+  <string name="new_call_log_secondary_spam">സ്‌പാം</string>
+  <plurals name="a11y_new_call_log_entry_missed_call">
+    <item quantity="one">^2-ൽ നിന്ന് ^1 മിസ്‌ഡ് കോൾ</item>
+    <item quantity="other">^1 കോളുകൾ, ഏറ്റവും പുതിയത് ^2-ൽ നിന്നുള്ള മിസ്‌ഡ് കോളാണ്</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_answered_call">
+    <item quantity="one">^2-ൽ നിന്ന് ^1 മറുപടി നൽകിയ കോൾ</item>
+    <item quantity="other">^1 കോളുകൾ, ഏറ്റവും പുതിയത് ^2-ൽ നിന്ന് മറുപടി നൽകിയ കോളാണ്</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_outgoing_call">
+    <item quantity="one">^2-ലേക്ക് ^1 ഔട്ട്‌ഗോയിംഗ് കോൾ</item>
+    <item quantity="other">^1 കോളുകൾ, ഏറ്റവും പുതിയത് ^2-ലേക്കുള്ള ഔട്ട്‌ഗോയിംഗ് കോളാണ്</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_blocked_call">
+    <item quantity="one">^2-ൽ നിന്നുള്ള ^1 ബ്ലോക്ക് ചെയ്‌ത കോൾ</item>
+    <item quantity="other">^1 കോളുകൾ, ഏറ്റവും പുതിയത് ^2-ൽ നിന്നുള്ള ബ്ലോക്ക് ചെയ്‌ത കോൾ</item>
+  </plurals>
+  <string name="a11y_new_call_log_entry_phone_account">^1 നമ്പർ വഴി,
+    ^2 അക്കൗണ്ടിൽ</string>
+  <string name="a11y_new_call_log_entry_full_description_without_phone_account_info">^1, ^2.</string>
+  <string name="a11y_new_call_log_entry_full_description_with_phone_account_info">^1, ^2, ^3.</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-mn/strings.xml b/java/com/android/dialer/calllogutils/res/values-mn/strings.xml
index 77f0340..b725550 100644
--- a/java/com/android/dialer/calllogutils/res/values-mn/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-mn/strings.xml
@@ -1,53 +1,60 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2017 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="type_incoming" msgid="5727636795656199810">"Орж ирсэн дуудлага"</string>
-    <string name="type_incoming_pulled" msgid="8434723359163965796">"Орж ирсэн дуудлагыг өөр төхөөрөмж рүү шилжүүлсэн"</string>
-    <string name="type_outgoing" msgid="764896746073942963">"Залгасан дуудлага"</string>
-    <string name="type_outgoing_pulled" msgid="1648517538371704193">"Залгасан дуудлагыг өөр төхөөрөмж рүү шилжүүлсэн"</string>
-    <string name="type_missed" msgid="2997043831022028176">"Аваагүй дуудлага"</string>
-    <string name="type_incoming_video" msgid="7507180294202642554">"Орж ирсэн видео дуудлага"</string>
-    <string name="type_incoming_video_pulled" msgid="7879031598844023977">"Орж ирсэн видео дуудлагыг өөр төхөөрөмж рүү шилжүүлсэн"</string>
-    <string name="type_outgoing_video" msgid="309370072333983910">"Залгасан видео дуудлага"</string>
-    <string name="type_outgoing_video_pulled" msgid="3924450629684331345">"Залгасан видео дуудлагыг өөр төхөөрөмж рүү шилжүүлсэн"</string>
-    <string name="type_missed_video" msgid="4350107016317603785">"Аваагүй видео дуудлага"</string>
-    <string name="type_voicemail" msgid="1877524395253846684">"Дуут шуудан"</string>
-    <string name="type_rejected" msgid="5632107438472996198">"Татгалзсан дуудлага"</string>
-    <string name="type_blocked" msgid="9177237294052244929">"Хориглосон дуудлага"</string>
-    <string name="call_details_minutes_abbreviation" msgid="7899774555556720560">"м"</string>
-    <string name="call_details_seconds_abbreviation" msgid="5893806826648947126">"с"</string>
-    <string name="a11y_call_duration_format" msgid="2905525933361674470">"<xliff:g id="MINUTES_0">%d</xliff:g> <xliff:g id="MINUTES_TRANSLATION">%s</xliff:g> <xliff:g id="SECONDS_1">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="a11y_call_duration_short_format" msgid="5908875871251062453">"<xliff:g id="SECONDS_0">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <plurals name="a11y_seconds" formatted="false" msgid="6695730844760611970">
-      <item quantity="other">секунд</item>
-      <item quantity="one">секунд</item>
-    </plurals>
-    <plurals name="a11y_minutes" formatted="false" msgid="6377010096698624038">
-      <item quantity="other">минут</item>
-      <item quantity="one">минут</item>
-    </plurals>
-    <string name="type_answered_elsewhere" msgid="411958582555881640">"Дуудлагад өөр төхөөрөмж дээрээс хариулсан"</string>
-    <string name="description_phone_account" msgid="4382951172691362244">"<xliff:g id="PHONEACCOUNT">^1</xliff:g> дээр"</string>
-    <string name="description_via_number" msgid="7682575124846343076">"<xliff:g id="NUMBER">%1$s</xliff:g>-р"</string>
-    <string name="description_via_number_phone_account" msgid="4345445677508018830">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> дээр, <xliff:g id="NUMBER">%2$s</xliff:g>-р"</string>
-    <string name="voicemail_string" msgid="6029775151483803006">"Дуут шуудан"</string>
-    <string name="now" msgid="2599778506439006806">"Одоо"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="type_incoming">Орж ирсэн дуудлага</string>
+  <string name="type_incoming_pulled">Орж ирсэн дуудлагыг өөр төхөөрөмж рүү шилжүүлсэн</string>
+  <string name="type_outgoing">Залгасан дуудлага</string>
+  <string name="type_outgoing_pulled">Залгасан дуудлагыг өөр төхөөрөмж рүү шилжүүлсэн</string>
+  <string name="type_missed">Аваагүй дуудлага</string>
+  <string name="type_incoming_video">Орж ирсэн видео дуудлага</string>
+  <string name="type_incoming_video_pulled">Орж ирсэн видео дуудлагыг өөр төхөөрөмж рүү шилжүүлсэн</string>
+  <string name="type_outgoing_video">Залгасан видео дуудлага</string>
+  <string name="type_outgoing_video_pulled">Залгасан видео дуудлагыг өөр төхөөрөмж рүү шилжүүлсэн</string>
+  <string name="type_missed_video">Аваагүй видео дуудлага</string>
+  <string name="type_voicemail">Дуут шуудан</string>
+  <string name="type_rejected">Татгалзсан дуудлага</string>
+  <string name="type_blocked">Хориглосон дуудлага</string>
+  <string name="call_details_minutes_abbreviation">м</string>
+  <string name="call_details_seconds_abbreviation">с</string>
+  <string name="a11y_call_duration_format">%1$d %2$s %3$d %4$s</string>
+  <string name="a11y_call_duration_short_format">%1$d %2$s</string>
+  <string name="call_duration_format_pattern">%1$s\'%2$s\' %3$s\'%4$s\'</string>
+  <string name="call_duration_short_format_pattern">%1$s\'%2$s\'</string>
+  <plurals name="a11y_seconds">
+    <item quantity="one">секунд</item>
+    <item quantity="other">секунд</item>
+  </plurals>
+  <plurals name="a11y_minutes">
+    <item quantity="one">минут</item>
+    <item quantity="other">минут</item>
+  </plurals>
+  <string name="type_answered_elsewhere">Дуудлагад өөр төхөөрөмж дээрээс хариулсан</string>
+  <string name="description_phone_account">^1 дээр</string>
+  <string name="description_via_number">%1$s-р</string>
+  <string name="description_via_number_phone_account">%1$s дээр, %2$s-р</string>
+  <string name="voicemail_string">Дуут шуудан</string>
+  <string name="just_now">Дөнгөж сая</string>
+  <string name="new_call_log_carrier_video">Үүрэн холбооны компанийн видео</string>
+  <string name="new_call_log_duo_video">Duo видео</string>
+  <string name="new_call_log_unknown">Тодорхойгүй</string>
+  <string name="new_call_log_secondary_blocked">Хориглосон</string>
+  <string name="new_call_log_secondary_spam">Спам</string>
+  <plurals name="a11y_new_call_log_entry_missed_call">
+    <item quantity="one">^2-с ирсэн аваагүй ^1 дуудлага</item>
+    <item quantity="other">^1 дуудлага, хамгийн сүүлийнх нь ^2-с ирсэн аваагүй дуудлага</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_answered_call">
+    <item quantity="one">^2-с ирсэн авсан ^1 дуудлага</item>
+    <item quantity="other">^1 дуудлага, хамгийн сүүлийнх нь ^2-с ирсэн авсан дуудлага</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_outgoing_call">
+    <item quantity="one">^2 руу залгасан ^1 дуудлага</item>
+    <item quantity="other">^1 дуудлага, хамгийн сүүлийнх нь ^2 руу залгасан дуудлага</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_blocked_call">
+    <item quantity="one">^2-с ирсэн блоклосон ^1 дуудлага</item>
+    <item quantity="other">^1 дуудлага, хамгийн сүүлийнх нь ^2-с ирсэн блоклосон дуудлага</item>
+  </plurals>
+  <string name="a11y_new_call_log_entry_phone_account">^1 дээр ^2-р</string>
+  <string name="a11y_new_call_log_entry_full_description_without_phone_account_info">^1, ^2.</string>
+  <string name="a11y_new_call_log_entry_full_description_with_phone_account_info">^1, ^2, ^3.</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-mr/strings.xml b/java/com/android/dialer/calllogutils/res/values-mr/strings.xml
index 3329b1c..caad700 100644
--- a/java/com/android/dialer/calllogutils/res/values-mr/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-mr/strings.xml
@@ -1,53 +1,60 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2017 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="type_incoming" msgid="5727636795656199810">"येणारा कॉल"</string>
-    <string name="type_incoming_pulled" msgid="8434723359163965796">"येणारा कॉल दुसर्‍या डिव्हाइसवर स्थानां‍तरित केला"</string>
-    <string name="type_outgoing" msgid="764896746073942963">"केला जाणारा कॉल"</string>
-    <string name="type_outgoing_pulled" msgid="1648517538371704193">"केला जाणारा कॉल दुसर्‍या डिव्हाइसवर स्थानांतरित केला"</string>
-    <string name="type_missed" msgid="2997043831022028176">"सुटलेला कॉल"</string>
-    <string name="type_incoming_video" msgid="7507180294202642554">"येणारा व्हिडिओ कॉल"</string>
-    <string name="type_incoming_video_pulled" msgid="7879031598844023977">"येणारा व्हिडिओ कॉल दुसर्‍या डिव्हाइसवर स्थानांतरित केला"</string>
-    <string name="type_outgoing_video" msgid="309370072333983910">"केला जाणारा व्हिडिओ कॉल"</string>
-    <string name="type_outgoing_video_pulled" msgid="3924450629684331345">"केला जाणारा व्हिडिओ कॉल दुसर्‍या डिव्हाइसवर स्थानांतरित केला"</string>
-    <string name="type_missed_video" msgid="4350107016317603785">"सुटलेला व्हिडिओ कॉल"</string>
-    <string name="type_voicemail" msgid="1877524395253846684">"व्हॉइसमेल"</string>
-    <string name="type_rejected" msgid="5632107438472996198">"नाकारलेला कॉल"</string>
-    <string name="type_blocked" msgid="9177237294052244929">"अवरोधित केलेला कॉल"</string>
-    <string name="call_details_minutes_abbreviation" msgid="7899774555556720560">"मि"</string>
-    <string name="call_details_seconds_abbreviation" msgid="5893806826648947126">"से"</string>
-    <string name="a11y_call_duration_format" msgid="2905525933361674470">"<xliff:g id="MINUTES_0">%d</xliff:g> <xliff:g id="MINUTES_TRANSLATION">%s</xliff:g> <xliff:g id="SECONDS_1">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="a11y_call_duration_short_format" msgid="5908875871251062453">"<xliff:g id="SECONDS_0">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <plurals name="a11y_seconds" formatted="false" msgid="6695730844760611970">
-      <item quantity="one">सेकंद</item>
-      <item quantity="other">सेकंद</item>
-    </plurals>
-    <plurals name="a11y_minutes" formatted="false" msgid="6377010096698624038">
-      <item quantity="one">मिनिट</item>
-      <item quantity="other">मिनिटे</item>
-    </plurals>
-    <string name="type_answered_elsewhere" msgid="411958582555881640">"कॉलला दुसर्‍या डिव्हाइसवर उत्तर दिले"</string>
-    <string name="description_phone_account" msgid="4382951172691362244">"<xliff:g id="PHONEACCOUNT">^1</xliff:g> वर"</string>
-    <string name="description_via_number" msgid="7682575124846343076">"<xliff:g id="NUMBER">%1$s</xliff:g> द्वारे"</string>
-    <string name="description_via_number_phone_account" msgid="4345445677508018830">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> वर, <xliff:g id="NUMBER">%2$s</xliff:g> द्वारे"</string>
-    <string name="voicemail_string" msgid="6029775151483803006">"व्हॉइसमेल"</string>
-    <string name="now" msgid="2599778506439006806">"आत्ता"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="type_incoming">येणारा कॉल</string>
+  <string name="type_incoming_pulled">येणारा कॉल दुसर्‍या डिव्हाइसवर स्थानां‍तरित केला</string>
+  <string name="type_outgoing">केला जाणारा कॉल</string>
+  <string name="type_outgoing_pulled">केला जाणारा कॉल दुसर्‍या डिव्हाइसवर स्थानांतरित केला</string>
+  <string name="type_missed">सुटलेला कॉल</string>
+  <string name="type_incoming_video">येणारा व्हिडिओ कॉल</string>
+  <string name="type_incoming_video_pulled">येणारा व्हिडिओ कॉल दुसर्‍या डिव्हाइसवर स्थानांतरित केला</string>
+  <string name="type_outgoing_video">केला जाणारा व्हिडिओ कॉल</string>
+  <string name="type_outgoing_video_pulled">केला जाणारा व्हिडिओ कॉल दुसर्‍या डिव्हाइसवर स्थानांतरित केला</string>
+  <string name="type_missed_video">सुटलेला व्हिडिओ कॉल</string>
+  <string name="type_voicemail">व्हॉइसमेल</string>
+  <string name="type_rejected">नाकारलेला कॉल</string>
+  <string name="type_blocked">अवरोधित केलेला कॉल</string>
+  <string name="call_details_minutes_abbreviation">मि</string>
+  <string name="call_details_seconds_abbreviation">से</string>
+  <string name="a11y_call_duration_format">%1$d %2$s %3$d %4$s</string>
+  <string name="a11y_call_duration_short_format">%1$d %2$s</string>
+  <string name="call_duration_format_pattern">%1$s \'%2$s\' %3$s \'%4$s\'</string>
+  <string name="call_duration_short_format_pattern">%1$s \'%2$s\'</string>
+  <plurals name="a11y_seconds">
+    <item quantity="one">सेकंद</item>
+    <item quantity="other">सेकंद</item>
+  </plurals>
+  <plurals name="a11y_minutes">
+    <item quantity="one">मिनिट</item>
+    <item quantity="other">मिनिटे</item>
+  </plurals>
+  <string name="type_answered_elsewhere">कॉलला दुसर्‍या डिव्हाइसवर उत्तर दिले</string>
+  <string name="description_phone_account">^1 वर</string>
+  <string name="description_via_number">%1$s द्वारे</string>
+  <string name="description_via_number_phone_account">%1$s वर, %2$s द्वारे</string>
+  <string name="voicemail_string">व्हॉइसमेल</string>
+  <string name="just_now">आत्ताच</string>
+  <string name="new_call_log_carrier_video">वाहक व्हिडिओ</string>
+  <string name="new_call_log_duo_video">Duo व्हिडिओ</string>
+  <string name="new_call_log_unknown">अज्ञात</string>
+  <string name="new_call_log_secondary_blocked">ब्लॉक केला</string>
+  <string name="new_call_log_secondary_spam">स्पॅम</string>
+  <plurals name="a11y_new_call_log_entry_missed_call">
+    <item quantity="one">^1 कॉल, सर्वात नवीन ^2 चा सुटलेला कॉल आहे</item>
+    <item quantity="other">^1 कॉल, सर्वात नवीन ^2 चा सुटलेला कॉल आहे</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_answered_call">
+    <item quantity="one">^1 कॉल, सर्वात नवीन ^2 चा उत्तर दिलेला कॉल</item>
+    <item quantity="other">^1 कॉल, सर्वात नवीन ^2 चा उत्तर दिलेला कॉल</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_outgoing_call">
+    <item quantity="one">^1 कॉल, सर्वात नवीन ^2 ला केलेला आउटगोइंग कॉल</item>
+    <item quantity="other">^1 कॉल, सर्वात नवीन ^2 ला केलेला आउटगोइंग कॉल</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_blocked_call">
+    <item quantity="one">^1 कॉल, सर्वात नवीन ^2 चा ब्लॉक केलेला कॉल</item>
+    <item quantity="other">^1 कॉल, आत्ता ^2 चे ब्लॉक केलेले कॉल</item>
+  </plurals>
+  <string name="a11y_new_call_log_entry_phone_account">^1 वर, ^2 द्वारे</string>
+  <string name="a11y_new_call_log_entry_full_description_without_phone_account_info">^1, ^2.</string>
+  <string name="a11y_new_call_log_entry_full_description_with_phone_account_info">^1, ^2, ^3.</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-ms/strings.xml b/java/com/android/dialer/calllogutils/res/values-ms/strings.xml
index 76ada6c..c56cfe6 100644
--- a/java/com/android/dialer/calllogutils/res/values-ms/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-ms/strings.xml
@@ -1,53 +1,60 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2017 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="type_incoming" msgid="5727636795656199810">"Panggilan masuk"</string>
-    <string name="type_incoming_pulled" msgid="8434723359163965796">"Panggilan masuk dipindahkan ke peranti lain"</string>
-    <string name="type_outgoing" msgid="764896746073942963">"Panggilan keluar"</string>
-    <string name="type_outgoing_pulled" msgid="1648517538371704193">"Panggilan keluar dipindahkan ke peranti lain"</string>
-    <string name="type_missed" msgid="2997043831022028176">"Panggilan terlepas"</string>
-    <string name="type_incoming_video" msgid="7507180294202642554">"Panggilan video masuk"</string>
-    <string name="type_incoming_video_pulled" msgid="7879031598844023977">"Panggilan video masuk dipindahkan ke peranti lain"</string>
-    <string name="type_outgoing_video" msgid="309370072333983910">"Panggilan video keluar"</string>
-    <string name="type_outgoing_video_pulled" msgid="3924450629684331345">"Panggilan video keluar dipindahkan ke peranti lain"</string>
-    <string name="type_missed_video" msgid="4350107016317603785">"Telah terlepas panggilan video"</string>
-    <string name="type_voicemail" msgid="1877524395253846684">"Mel suara"</string>
-    <string name="type_rejected" msgid="5632107438472996198">"Panggilan yang ditolak"</string>
-    <string name="type_blocked" msgid="9177237294052244929">"Panggilan yang disekat"</string>
-    <string name="call_details_minutes_abbreviation" msgid="7899774555556720560">"m"</string>
-    <string name="call_details_seconds_abbreviation" msgid="5893806826648947126">"s"</string>
-    <string name="a11y_call_duration_format" msgid="2905525933361674470">"<xliff:g id="MINUTES_0">%d</xliff:g> <xliff:g id="MINUTES_TRANSLATION">%s</xliff:g> <xliff:g id="SECONDS_1">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="a11y_call_duration_short_format" msgid="5908875871251062453">"<xliff:g id="SECONDS_0">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <plurals name="a11y_seconds" formatted="false" msgid="6695730844760611970">
-      <item quantity="other">saat</item>
-      <item quantity="one">saat</item>
-    </plurals>
-    <plurals name="a11y_minutes" formatted="false" msgid="6377010096698624038">
-      <item quantity="other">minit</item>
-      <item quantity="one">minit</item>
-    </plurals>
-    <string name="type_answered_elsewhere" msgid="411958582555881640">"Panggilan dijawab pada peranti lain"</string>
-    <string name="description_phone_account" msgid="4382951172691362244">"pada <xliff:g id="PHONEACCOUNT">^1</xliff:g>"</string>
-    <string name="description_via_number" msgid="7682575124846343076">"melalui <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="description_via_number_phone_account" msgid="4345445677508018830">"pada <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, melalui <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="voicemail_string" msgid="6029775151483803006">"Mel suara"</string>
-    <string name="now" msgid="2599778506439006806">"Sekarang"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="type_incoming">Panggilan masuk</string>
+  <string name="type_incoming_pulled">Panggilan masuk dipindahkan ke peranti lain</string>
+  <string name="type_outgoing">Panggilan keluar</string>
+  <string name="type_outgoing_pulled">Panggilan keluar dipindahkan ke peranti lain</string>
+  <string name="type_missed">Panggilan terlepas</string>
+  <string name="type_incoming_video">Panggilan video masuk</string>
+  <string name="type_incoming_video_pulled">Panggilan video masuk dipindahkan ke peranti lain</string>
+  <string name="type_outgoing_video">Panggilan video keluar</string>
+  <string name="type_outgoing_video_pulled">Panggilan video keluar dipindahkan ke peranti lain</string>
+  <string name="type_missed_video">Telah terlepas panggilan video</string>
+  <string name="type_voicemail">Mel suara</string>
+  <string name="type_rejected">Panggilan yang ditolak</string>
+  <string name="type_blocked">Panggilan yang disekat</string>
+  <string name="call_details_minutes_abbreviation">m</string>
+  <string name="call_details_seconds_abbreviation">s</string>
+  <string name="a11y_call_duration_format">%1$d %2$s %3$d %4$s</string>
+  <string name="a11y_call_duration_short_format">%1$d %2$s</string>
+  <string name="call_duration_format_pattern">%1$s\'%2$s\' %3$s\'%4$s\'</string>
+  <string name="call_duration_short_format_pattern">%1$s\'%2$s\'</string>
+  <plurals name="a11y_seconds">
+    <item quantity="one">saat</item>
+    <item quantity="other">saat</item>
+  </plurals>
+  <plurals name="a11y_minutes">
+    <item quantity="one">minit</item>
+    <item quantity="other">minit</item>
+  </plurals>
+  <string name="type_answered_elsewhere">Panggilan dijawab pada peranti lain</string>
+  <string name="description_phone_account">pada ^1</string>
+  <string name="description_via_number">melalui %1$s</string>
+  <string name="description_via_number_phone_account">pada %1$s, melalui %2$s</string>
+  <string name="voicemail_string">Mel suara</string>
+  <string name="just_now">Sebentar tadi</string>
+  <string name="new_call_log_carrier_video">Video pembawa</string>
+  <string name="new_call_log_duo_video">Video Duo</string>
+  <string name="new_call_log_unknown">Tidak diketahui</string>
+  <string name="new_call_log_secondary_blocked">Disekat</string>
+  <string name="new_call_log_secondary_spam">Spam</string>
+  <plurals name="a11y_new_call_log_entry_missed_call">
+    <item quantity="one">^1 panggilan terlepas daripada ^2</item>
+    <item quantity="other">^1 panggilan, yang terbaharu ialah panggilan terlepas daripada ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_answered_call">
+    <item quantity="one">^1 panggilan dijawab daripada ^2</item>
+    <item quantity="other">^1 panggilan, yang terbaharu ialah panggilan dijawab daripada ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_outgoing_call">
+    <item quantity="one">^1 panggilan keluar kepada ^2</item>
+    <item quantity="other">^1 panggilan, yang terbaharu ialah panggilan keluar kepada ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_blocked_call">
+    <item quantity="one">^1 panggilan disekat daripada ^2</item>
+    <item quantity="other">^1 panggilan, yang terbaharu ialah panggilan disekat daripada ^2</item>
+  </plurals>
+  <string name="a11y_new_call_log_entry_phone_account">pada ^1, melalui ^2</string>
+  <string name="a11y_new_call_log_entry_full_description_without_phone_account_info">^1, ^2.</string>
+  <string name="a11y_new_call_log_entry_full_description_with_phone_account_info">^1, ^2, ^3.</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-my/strings.xml b/java/com/android/dialer/calllogutils/res/values-my/strings.xml
index 5744c2b..700ee23 100644
--- a/java/com/android/dialer/calllogutils/res/values-my/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-my/strings.xml
@@ -1,53 +1,60 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2017 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="type_incoming" msgid="5727636795656199810">"အဝင်ခေါ်ဆိုမှု"</string>
-    <string name="type_incoming_pulled" msgid="8434723359163965796">"အဝင်ခေါ်ဆိုမှုကို အခြားကိရိယာသို့ လွှဲပြောင်းလိုက်သည်"</string>
-    <string name="type_outgoing" msgid="764896746073942963">"အထွက်ခေါ်ဆိုမှု"</string>
-    <string name="type_outgoing_pulled" msgid="1648517538371704193">"အထွက်ခေါ်ဆိုမှုကို အခြားကိရိယာသို့ လွှဲပြောင်းလိုက်သည်"</string>
-    <string name="type_missed" msgid="2997043831022028176">"လွတ်သွားသော ခေါ်ဆိုမှု"</string>
-    <string name="type_incoming_video" msgid="7507180294202642554">"အဝင်ဗီဒီယိုခေါ်ဆိုမှု"</string>
-    <string name="type_incoming_video_pulled" msgid="7879031598844023977">"အဝင်ဗီဒီယိုခေါ်ဆိုမှုကို အခြားကိရိယာသို့ လွှဲပြောင်းလိုက်သည်"</string>
-    <string name="type_outgoing_video" msgid="309370072333983910">"အထွက်ဗီဒီယိုခေါ်ဆိုမှု"</string>
-    <string name="type_outgoing_video_pulled" msgid="3924450629684331345">"အထွက်ဗီဒီယိုခေါ်ဆိုမှုကို အခြားကိရိယာသို့ လွှဲလိုက်သည်"</string>
-    <string name="type_missed_video" msgid="4350107016317603785">"လွတ်သွားသော ဗီဒီယိုခေါ်ဆိုမှု"</string>
-    <string name="type_voicemail" msgid="1877524395253846684">"အသံမေးလ်"</string>
-    <string name="type_rejected" msgid="5632107438472996198">"ငြင်းပယ်ထားသော ခေါ်ဆိုမှု"</string>
-    <string name="type_blocked" msgid="9177237294052244929">"ခေါ်ဆိုမှုကို ပိတ်ဆို့ထားပါသည်"</string>
-    <string name="call_details_minutes_abbreviation" msgid="7899774555556720560">"မိနစ်"</string>
-    <string name="call_details_seconds_abbreviation" msgid="5893806826648947126">"စက္ကန့်"</string>
-    <string name="a11y_call_duration_format" msgid="2905525933361674470">"<xliff:g id="MINUTES_0">%d</xliff:g> <xliff:g id="MINUTES_TRANSLATION">%s</xliff:g> <xliff:g id="SECONDS_1">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="a11y_call_duration_short_format" msgid="5908875871251062453">"<xliff:g id="SECONDS_0">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <plurals name="a11y_seconds" formatted="false" msgid="6695730844760611970">
-      <item quantity="other">စက္ကန့်</item>
-      <item quantity="one">စက္ကန့်</item>
-    </plurals>
-    <plurals name="a11y_minutes" formatted="false" msgid="6377010096698624038">
-      <item quantity="other">မိနစ်</item>
-      <item quantity="one">မိနစ်</item>
-    </plurals>
-    <string name="type_answered_elsewhere" msgid="411958582555881640">"ခေါ်ဆိုမှုကို အခြားကိရိယာတွင် ဖြေကြားထားပါသည်"</string>
-    <string name="description_phone_account" msgid="4382951172691362244">"<xliff:g id="PHONEACCOUNT">^1</xliff:g> တွင်"</string>
-    <string name="description_via_number" msgid="7682575124846343076">"<xliff:g id="NUMBER">%1$s</xliff:g> မှတစ်ဆင့်"</string>
-    <string name="description_via_number_phone_account" msgid="4345445677508018830">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> တွင်၊ <xliff:g id="NUMBER">%2$s</xliff:g> မှတစ်ဆင့်"</string>
-    <string name="voicemail_string" msgid="6029775151483803006">"အသံမေးလ်"</string>
-    <string name="now" msgid="2599778506439006806">"ယခု"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="type_incoming">အဝင်ခေါ်ဆိုမှု</string>
+  <string name="type_incoming_pulled">အဝင်ခေါ်ဆိုမှုကို အခြားကိရိယာသို့ လွှဲပြောင်းလိုက်သည်</string>
+  <string name="type_outgoing">အထွက်ခေါ်ဆိုမှု</string>
+  <string name="type_outgoing_pulled">အထွက်ခေါ်ဆိုမှုကို အခြားကိရိယာသို့ လွှဲပြောင်းလိုက်သည်</string>
+  <string name="type_missed">လွတ်သွားသော ခေါ်ဆိုမှု</string>
+  <string name="type_incoming_video">အဝင်ဗီဒီယိုခေါ်ဆိုမှု</string>
+  <string name="type_incoming_video_pulled">အဝင်ဗီဒီယိုခေါ်ဆိုမှုကို အခြားကိရိယာသို့ လွှဲပြောင်းလိုက်သည်</string>
+  <string name="type_outgoing_video">အထွက်ဗီဒီယိုခေါ်ဆိုမှု</string>
+  <string name="type_outgoing_video_pulled">အထွက်ဗီဒီယိုခေါ်ဆိုမှုကို အခြားကိရိယာသို့ လွှဲလိုက်သည်</string>
+  <string name="type_missed_video">လွတ်သွားသော ဗီဒီယိုခေါ်ဆိုမှု</string>
+  <string name="type_voicemail">အသံမေးလ်</string>
+  <string name="type_rejected">ငြင်းပယ်ထားသော ခေါ်ဆိုမှု</string>
+  <string name="type_blocked">ခေါ်ဆိုမှုကို ပိတ်ဆို့ထားပါသည်</string>
+  <string name="call_details_minutes_abbreviation">မိနစ်</string>
+  <string name="call_details_seconds_abbreviation">စက္ကန့်</string>
+  <string name="a11y_call_duration_format">%1$d %2$s %3$d %4$s</string>
+  <string name="a11y_call_duration_short_format">%1$d %2$s</string>
+  <string name="call_duration_format_pattern">%1$s\'%2$s\' %3$s\'%4$s\'</string>
+  <string name="call_duration_short_format_pattern">%1$s\'%2$s\'</string>
+  <plurals name="a11y_seconds">
+    <item quantity="one">စက္ကန့်</item>
+    <item quantity="other">စက္ကန့်</item>
+  </plurals>
+  <plurals name="a11y_minutes">
+    <item quantity="one">မိနစ်</item>
+    <item quantity="other">မိနစ်</item>
+  </plurals>
+  <string name="type_answered_elsewhere">ခေါ်ဆိုမှုကို အခြားကိရိယာတွင် ဖြေကြားထားပါသည်</string>
+  <string name="description_phone_account">^1 တွင်</string>
+  <string name="description_via_number">%1$s မှတစ်ဆင့်</string>
+  <string name="description_via_number_phone_account">%1$s တွင်၊ %2$s မှတစ်ဆင့်</string>
+  <string name="voicemail_string">အသံမေးလ်</string>
+  <string name="just_now">ယခုလေးတင်</string>
+  <string name="new_call_log_carrier_video">ဖုန်းလိုင်း ဗီဒီယို</string>
+  <string name="new_call_log_duo_video">Duo ဗီဒီယို</string>
+  <string name="new_call_log_unknown">အမည်မသိ</string>
+  <string name="new_call_log_secondary_blocked">ပိတ်ထားသည်များ</string>
+  <string name="new_call_log_secondary_spam">စပမ်း</string>
+  <plurals name="a11y_new_call_log_entry_missed_call">
+    <item quantity="one">^2 ထံမှ လွတ်သွား ခေါ်ဆိုမှု ^1 ခု</item>
+    <item quantity="other">ခေါ်ဆိုမှု ^1 ခု၊ နောက်ဆုံးတစ်ခုသည် ^2 ထံမှ လွတ်သွားသောခေါ်ဆိုမှုဖြစ်သည်</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_answered_call">
+    <item quantity="one">^2 ၏ ခေါ်ဆိုမှုကို ဖြေကြားမှု ^1 ခု</item>
+    <item quantity="other">ခေါ်ဆိုမှု ^1 ခု၊ နောက်ဆုံးတစ်ခုသည် ^2 ၏ ခေါ်ဆိုချက်ကို ဖြေကြားထားခြင်း ဖြစ်သည်</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_outgoing_call">
+    <item quantity="one">^2 သို့ အထွက်ခေါ်ဆိုမှု ^1 ခု</item>
+    <item quantity="other">ခေါ်ဆိုမှု ^1 ခု၊ နောက်ဆုံးတစ်ခုသည် ^2 သို့ အထွက်ခေါ်ဆိုမှုဖြစ်သည်</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_blocked_call">
+    <item quantity="one">^2 ထံမှ ပိတ်ထားသော ခေါ်ဆိုမှု ^1 ခု</item>
+    <item quantity="other">ခေါ်ဆိုမှု ^1ခု၊ နောက်ဆုံးတစ်ခုသည် ^2 ထံမှ ပိတ်ထားသောခေါ်ဆိုမှု ဖြစ်သည်</item>
+  </plurals>
+  <string name="a11y_new_call_log_entry_phone_account">^1 တွင်၊ ^2 မှတစ်ဆင့်</string>
+  <string name="a11y_new_call_log_entry_full_description_without_phone_account_info">^1၊ ^2။</string>
+  <string name="a11y_new_call_log_entry_full_description_with_phone_account_info">^1၊ ^2၊ ^3။</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-nb/strings.xml b/java/com/android/dialer/calllogutils/res/values-nb/strings.xml
index 7a989d4..f5a74f5 100644
--- a/java/com/android/dialer/calllogutils/res/values-nb/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-nb/strings.xml
@@ -1,53 +1,60 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2017 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="type_incoming" msgid="5727636795656199810">"Innkommende anrop"</string>
-    <string name="type_incoming_pulled" msgid="8434723359163965796">"Det innkommende anropet ble overført til en annen enhet"</string>
-    <string name="type_outgoing" msgid="764896746073942963">"Utgående anrop"</string>
-    <string name="type_outgoing_pulled" msgid="1648517538371704193">"Det utgående anropet ble overført til en annen enhet"</string>
-    <string name="type_missed" msgid="2997043831022028176">"Tapt anrop"</string>
-    <string name="type_incoming_video" msgid="7507180294202642554">"Innkommende videoanrop"</string>
-    <string name="type_incoming_video_pulled" msgid="7879031598844023977">"Det innkommende videoanropet ble overført til en annen enhet"</string>
-    <string name="type_outgoing_video" msgid="309370072333983910">"Utgående videoanrop"</string>
-    <string name="type_outgoing_video_pulled" msgid="3924450629684331345">"Det utgående videoanropet ble overført til en annen enhet"</string>
-    <string name="type_missed_video" msgid="4350107016317603785">"Ubesvart videoanrop"</string>
-    <string name="type_voicemail" msgid="1877524395253846684">"Talepost"</string>
-    <string name="type_rejected" msgid="5632107438472996198">"Avvist anrop"</string>
-    <string name="type_blocked" msgid="9177237294052244929">"Blokkert anrop"</string>
-    <string name="call_details_minutes_abbreviation" msgid="7899774555556720560">"min."</string>
-    <string name="call_details_seconds_abbreviation" msgid="5893806826648947126">"sek."</string>
-    <string name="a11y_call_duration_format" msgid="2905525933361674470">"<xliff:g id="MINUTES_0">%d</xliff:g> <xliff:g id="MINUTES_TRANSLATION">%s</xliff:g> <xliff:g id="SECONDS_1">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="a11y_call_duration_short_format" msgid="5908875871251062453">"<xliff:g id="SECONDS_0">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <plurals name="a11y_seconds" formatted="false" msgid="6695730844760611970">
-      <item quantity="other">sekunder</item>
-      <item quantity="one">sekund</item>
-    </plurals>
-    <plurals name="a11y_minutes" formatted="false" msgid="6377010096698624038">
-      <item quantity="other">minutter</item>
-      <item quantity="one">minutt</item>
-    </plurals>
-    <string name="type_answered_elsewhere" msgid="411958582555881640">"Anropet ble besvart på en annen enhet"</string>
-    <string name="description_phone_account" msgid="4382951172691362244">"på <xliff:g id="PHONEACCOUNT">^1</xliff:g>"</string>
-    <string name="description_via_number" msgid="7682575124846343076">"via <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="description_via_number_phone_account" msgid="4345445677508018830">"på <xliff:g id="PHONEACCOUNT">%1$s</xliff:g> via <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="voicemail_string" msgid="6029775151483803006">"Talepost"</string>
-    <string name="now" msgid="2599778506439006806">"Nå"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="type_incoming">Innkommende anrop</string>
+  <string name="type_incoming_pulled">Det innkommende anropet ble overført til en annen enhet</string>
+  <string name="type_outgoing">Utgående anrop</string>
+  <string name="type_outgoing_pulled">Det utgående anropet ble overført til en annen enhet</string>
+  <string name="type_missed">Tapt anrop</string>
+  <string name="type_incoming_video">Innkommende videoanrop</string>
+  <string name="type_incoming_video_pulled">Det innkommende videoanropet ble overført til en annen enhet</string>
+  <string name="type_outgoing_video">Utgående videoanrop</string>
+  <string name="type_outgoing_video_pulled">Det utgående videoanropet ble overført til en annen enhet</string>
+  <string name="type_missed_video">Ubesvart videoanrop</string>
+  <string name="type_voicemail">Talepost</string>
+  <string name="type_rejected">Avvist anrop</string>
+  <string name="type_blocked">Blokkert anrop</string>
+  <string name="call_details_minutes_abbreviation">min.</string>
+  <string name="call_details_seconds_abbreviation">sek.</string>
+  <string name="a11y_call_duration_format">%1$d %2$s %3$d %4$s</string>
+  <string name="a11y_call_duration_short_format">%1$d %2$s</string>
+  <string name="call_duration_format_pattern">%1$s \'%2$s\' %3$s \'%4$s\'</string>
+  <string name="call_duration_short_format_pattern">%1$s \'%2$s\'</string>
+  <plurals name="a11y_seconds">
+    <item quantity="one">sekund</item>
+    <item quantity="other">sekunder</item>
+  </plurals>
+  <plurals name="a11y_minutes">
+    <item quantity="one">minutt</item>
+    <item quantity="other">minutter</item>
+  </plurals>
+  <string name="type_answered_elsewhere">Anropet ble besvart på en annen enhet</string>
+  <string name="description_phone_account">på ^1</string>
+  <string name="description_via_number">via %1$s</string>
+  <string name="description_via_number_phone_account">på %1$s via %2$s</string>
+  <string name="voicemail_string">Talepost</string>
+  <string name="just_now">Nå nettopp</string>
+  <string name="new_call_log_carrier_video">Video via mobiloperatør</string>
+  <string name="new_call_log_duo_video">Video via Duo</string>
+  <string name="new_call_log_unknown">Ukjent</string>
+  <string name="new_call_log_secondary_blocked">Blokkert</string>
+  <string name="new_call_log_secondary_spam">Nettsøppel</string>
+  <plurals name="a11y_new_call_log_entry_missed_call">
+    <item quantity="one">^1 tapt anrop fra ^2</item>
+    <item quantity="other">^1 anrop, det nyeste er et tapt anrop fra ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_answered_call">
+    <item quantity="one">^1 besvart anrop fra ^2</item>
+    <item quantity="other">^1 anrop, det nyeste er et besvart anrop fra ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_outgoing_call">
+    <item quantity="one">^1 utgående anrop til ^2</item>
+    <item quantity="other">^1 anrop, det nyeste er et utgående anrop til ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_blocked_call">
+    <item quantity="one">^1 blokkert anrop fra ^2</item>
+    <item quantity="other">^1 anrop, det nyeste er et blokkert anrop fra ^2</item>
+  </plurals>
+  <string name="a11y_new_call_log_entry_phone_account">på ^1 via ^2</string>
+  <string name="a11y_new_call_log_entry_full_description_without_phone_account_info">^1, ^2.</string>
+  <string name="a11y_new_call_log_entry_full_description_with_phone_account_info">^1, ^2, ^3.</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-ne/strings.xml b/java/com/android/dialer/calllogutils/res/values-ne/strings.xml
index bb1b25c..29395cb 100644
--- a/java/com/android/dialer/calllogutils/res/values-ne/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-ne/strings.xml
@@ -1,53 +1,60 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2017 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="type_incoming" msgid="5727636795656199810">"आगमन कल"</string>
-    <string name="type_incoming_pulled" msgid="8434723359163965796">"आगमन कललाई अर्को यन्त्रमा स्थानान्तरण गरियो"</string>
-    <string name="type_outgoing" msgid="764896746073942963">"बहिर्गमन कल"</string>
-    <string name="type_outgoing_pulled" msgid="1648517538371704193">"बहिर्गमन कललाई अर्को यन्त्रमा स्थानान्तरण गरियो"</string>
-    <string name="type_missed" msgid="2997043831022028176">"छुटेको कल"</string>
-    <string name="type_incoming_video" msgid="7507180294202642554">"आगमन भिडियो कल"</string>
-    <string name="type_incoming_video_pulled" msgid="7879031598844023977">"आगमन भिडियो कललाई अर्को यन्त्रमा हस्तान्तरण गरियो"</string>
-    <string name="type_outgoing_video" msgid="309370072333983910">"बहिर्गमन भिडियो कल"</string>
-    <string name="type_outgoing_video_pulled" msgid="3924450629684331345">"बहिर्गमन भिडियो कललाई अर्को यन्त्रमा हस्तान्तरण गरियो"</string>
-    <string name="type_missed_video" msgid="4350107016317603785">"छुटेको भिडियो कल"</string>
-    <string name="type_voicemail" msgid="1877524395253846684">"भ्वाइस मेल"</string>
-    <string name="type_rejected" msgid="5632107438472996198">"अस्वीकार गरिएको कल"</string>
-    <string name="type_blocked" msgid="9177237294052244929">"रोक्का गरिएको कल"</string>
-    <string name="call_details_minutes_abbreviation" msgid="7899774555556720560">"मिनेट"</string>
-    <string name="call_details_seconds_abbreviation" msgid="5893806826648947126">"सेकेन्ड"</string>
-    <string name="a11y_call_duration_format" msgid="2905525933361674470">"<xliff:g id="MINUTES_0">%d</xliff:g> <xliff:g id="MINUTES_TRANSLATION">%s</xliff:g> <xliff:g id="SECONDS_1">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="a11y_call_duration_short_format" msgid="5908875871251062453">"<xliff:g id="SECONDS_0">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <plurals name="a11y_seconds" formatted="false" msgid="6695730844760611970">
-      <item quantity="other">सेकेन्ड</item>
-      <item quantity="one">सेकेन्ड</item>
-    </plurals>
-    <plurals name="a11y_minutes" formatted="false" msgid="6377010096698624038">
-      <item quantity="other">मिनेट</item>
-      <item quantity="one">मिनेट</item>
-    </plurals>
-    <string name="type_answered_elsewhere" msgid="411958582555881640">"कलको जवाफ अर्को यन्त्रमा फर्काइयो"</string>
-    <string name="description_phone_account" msgid="4382951172691362244">"<xliff:g id="PHONEACCOUNT">^1</xliff:g> मा"</string>
-    <string name="description_via_number" msgid="7682575124846343076">"<xliff:g id="NUMBER">%1$s</xliff:g> मार्फत"</string>
-    <string name="description_via_number_phone_account" msgid="4345445677508018830">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> मा, <xliff:g id="NUMBER">%2$s</xliff:g> मार्फत"</string>
-    <string name="voicemail_string" msgid="6029775151483803006">"भ्वाइस मेल"</string>
-    <string name="now" msgid="2599778506439006806">"अहिले भर्खरै"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="type_incoming">आगमन कल</string>
+  <string name="type_incoming_pulled">आगमन कललाई अर्को यन्त्रमा स्थानान्तरण गरियो</string>
+  <string name="type_outgoing">बहिर्गमन कल</string>
+  <string name="type_outgoing_pulled">बहिर्गमन कललाई अर्को यन्त्रमा स्थानान्तरण गरियो</string>
+  <string name="type_missed">छुटेको कल</string>
+  <string name="type_incoming_video">आगमन भिडियो कल</string>
+  <string name="type_incoming_video_pulled">आगमन भिडियो कललाई अर्को यन्त्रमा हस्तान्तरण गरियो</string>
+  <string name="type_outgoing_video">बहिर्गमन भिडियो कल</string>
+  <string name="type_outgoing_video_pulled">बहिर्गमन भिडियो कललाई अर्को यन्त्रमा हस्तान्तरण गरियो</string>
+  <string name="type_missed_video">छुटेको भिडियो कल</string>
+  <string name="type_voicemail">भ्वाइस मेल</string>
+  <string name="type_rejected">अस्वीकार गरिएको कल</string>
+  <string name="type_blocked">रोक्का गरिएको कल</string>
+  <string name="call_details_minutes_abbreviation">मिनेट</string>
+  <string name="call_details_seconds_abbreviation">सेकेन्ड</string>
+  <string name="a11y_call_duration_format">%1$d %2$s %3$d %4$s</string>
+  <string name="a11y_call_duration_short_format">%1$d %2$s</string>
+  <string name="call_duration_format_pattern">%1$s\'%2$s\' %3$s\'%4$s\'</string>
+  <string name="call_duration_short_format_pattern">%1$s\'%2$s\'</string>
+  <plurals name="a11y_seconds">
+    <item quantity="one">सेकेन्ड</item>
+    <item quantity="other">सेकेन्ड</item>
+  </plurals>
+  <plurals name="a11y_minutes">
+    <item quantity="one">मिनेट</item>
+    <item quantity="other">मिनेट</item>
+  </plurals>
+  <string name="type_answered_elsewhere">कलको जवाफ अर्को यन्त्रमा फर्काइयो</string>
+  <string name="description_phone_account">^1 मा</string>
+  <string name="description_via_number">%1$s मार्फत</string>
+  <string name="description_via_number_phone_account">%1$s मा, %2$s मार्फत</string>
+  <string name="voicemail_string">भ्वाइस मेल</string>
+  <string name="just_now">भर्खरै</string>
+  <string name="new_call_log_carrier_video">सेवा प्रदायकको भिडियो कल</string>
+  <string name="new_call_log_duo_video">Duo को भिडियो कल</string>
+  <string name="new_call_log_unknown">अज्ञात</string>
+  <string name="new_call_log_secondary_blocked">रोक लगाइएको नम्बर</string>
+  <string name="new_call_log_secondary_spam">स्प्याम</string>
+  <plurals name="a11y_new_call_log_entry_missed_call">
+    <item quantity="one">^2 को ^1 छुटेको कल</item>
+    <item quantity="other">^1 कलहरू, पछिल्लो कल ^2 को छुटेको कल हो</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_answered_call">
+    <item quantity="one">^2 को जवाफस्वरूप दिइएको ^1 कल</item>
+    <item quantity="other">^1 कलहरू, पछिल्लो कल ^2 को जवाफस्वरूप दिइएको कल हो</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_outgoing_call">
+    <item quantity="one"> ^2 ले गरेको ^1 बहिर्गमन कल</item>
+    <item quantity="other">^1 कलहरू, पछिल्लो कल ^2 ले गरेको बहिर्गमन कल हो</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_blocked_call">
+    <item quantity="one">^2 ले रोक लगाएको ^1 कल</item>
+    <item quantity="other">^1 कलहरू, पछिल्लो कल ^2 ले रोक लगाएको कल हो</item>
+  </plurals>
+  <string name="a11y_new_call_log_entry_phone_account">^1 मा, ^2 मार्फत</string>
+  <string name="a11y_new_call_log_entry_full_description_without_phone_account_info">^1, ^2।</string>
+  <string name="a11y_new_call_log_entry_full_description_with_phone_account_info">^1, ^2, ^3।</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-nl/strings.xml b/java/com/android/dialer/calllogutils/res/values-nl/strings.xml
index 9b28f6f..089e611 100644
--- a/java/com/android/dialer/calllogutils/res/values-nl/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-nl/strings.xml
@@ -1,53 +1,61 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2017 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="type_incoming" msgid="5727636795656199810">"Inkomende oproep"</string>
-    <string name="type_incoming_pulled" msgid="8434723359163965796">"Inkomende oproep doorgeschakeld naar een ander apparaat"</string>
-    <string name="type_outgoing" msgid="764896746073942963">"Uitgaande oproep"</string>
-    <string name="type_outgoing_pulled" msgid="1648517538371704193">"Uitgaande oproep doorgeschakeld naar een ander apparaat"</string>
-    <string name="type_missed" msgid="2997043831022028176">"Gemiste oproep"</string>
-    <string name="type_incoming_video" msgid="7507180294202642554">"Inkomend videogesprek"</string>
-    <string name="type_incoming_video_pulled" msgid="7879031598844023977">"Inkomend videogesprek doorgeschakeld naar een ander apparaat"</string>
-    <string name="type_outgoing_video" msgid="309370072333983910">"Uitgaand videogesprek"</string>
-    <string name="type_outgoing_video_pulled" msgid="3924450629684331345">"Uitgaand videogesprek doorgeschakeld naar een ander apparaat"</string>
-    <string name="type_missed_video" msgid="4350107016317603785">"Gemist videogesprek"</string>
-    <string name="type_voicemail" msgid="1877524395253846684">"Voicemail"</string>
-    <string name="type_rejected" msgid="5632107438472996198">"Geweigerde oproep"</string>
-    <string name="type_blocked" msgid="9177237294052244929">"Geblokkeerde oproep"</string>
-    <string name="call_details_minutes_abbreviation" msgid="7899774555556720560">"m"</string>
-    <string name="call_details_seconds_abbreviation" msgid="5893806826648947126">"s"</string>
-    <string name="a11y_call_duration_format" msgid="2905525933361674470">"<xliff:g id="MINUTES_0">%d</xliff:g> <xliff:g id="MINUTES_TRANSLATION">%s</xliff:g> <xliff:g id="SECONDS_1">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="a11y_call_duration_short_format" msgid="5908875871251062453">"<xliff:g id="SECONDS_0">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <plurals name="a11y_seconds" formatted="false" msgid="6695730844760611970">
-      <item quantity="other">seconden</item>
-      <item quantity="one">seconde</item>
-    </plurals>
-    <plurals name="a11y_minutes" formatted="false" msgid="6377010096698624038">
-      <item quantity="other">minuten</item>
-      <item quantity="one">minuut</item>
-    </plurals>
-    <string name="type_answered_elsewhere" msgid="411958582555881640">"Oproep beantwoord op een ander apparaat"</string>
-    <string name="description_phone_account" msgid="4382951172691362244">"in <xliff:g id="PHONEACCOUNT">^1</xliff:g>"</string>
-    <string name="description_via_number" msgid="7682575124846343076">"via <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="description_via_number_phone_account" msgid="4345445677508018830">"op <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, via <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="voicemail_string" msgid="6029775151483803006">"Voicemail"</string>
-    <string name="now" msgid="2599778506439006806">"Nu"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="type_incoming">Inkomende oproep</string>
+  <string name="type_incoming_pulled">Inkomende oproep doorgeschakeld naar een ander apparaat</string>
+  <string name="type_outgoing">Uitgaande oproep</string>
+  <string name="type_outgoing_pulled">Uitgaande oproep doorgeschakeld naar een ander apparaat</string>
+  <string name="type_missed">Gemiste oproep</string>
+  <string name="type_incoming_video">Inkomend videogesprek</string>
+  <string name="type_incoming_video_pulled">Inkomend videogesprek doorgeschakeld naar een ander apparaat</string>
+  <string name="type_outgoing_video">Uitgaand videogesprek</string>
+  <string name="type_outgoing_video_pulled">Uitgaand videogesprek doorgeschakeld naar een ander apparaat</string>
+  <string name="type_missed_video">Gemist videogesprek</string>
+  <string name="type_voicemail">Voicemail</string>
+  <string name="type_rejected">Geweigerde oproep</string>
+  <string name="type_blocked">Geblokkeerde oproep</string>
+  <string name="call_details_minutes_abbreviation">m</string>
+  <string name="call_details_seconds_abbreviation">s</string>
+  <string name="a11y_call_duration_format">%1$d %2$s %3$d %4$s</string>
+  <string name="a11y_call_duration_short_format">%1$d %2$s</string>
+  <string name="call_duration_format_pattern">%1$s \'%2$s\' %3$s \'%4$s\'</string>
+  <string name="call_duration_short_format_pattern">%1$s \'%2$s\'</string>
+  <plurals name="a11y_seconds">
+    <item quantity="one">seconde</item>
+    <item quantity="other">seconden</item>
+  </plurals>
+  <plurals name="a11y_minutes">
+    <item quantity="one">minuut</item>
+    <item quantity="other">minuten</item>
+  </plurals>
+  <string name="type_answered_elsewhere">Oproep beantwoord op een ander apparaat</string>
+  <string name="description_phone_account">in ^1</string>
+  <string name="description_via_number">via %1$s</string>
+  <string name="description_via_number_phone_account">op %1$s, via %2$s</string>
+  <string name="voicemail_string">Voicemail</string>
+  <string name="just_now">Zojuist</string>
+  <string name="new_call_log_carrier_video">Video via provider</string>
+  <string name="new_call_log_duo_video">Duo-video</string>
+  <string name="new_call_log_unknown">Onbekend</string>
+  <string name="new_call_log_secondary_blocked">Geblokkeerd</string>
+  <string name="new_call_log_secondary_spam">Spam</string>
+  <plurals name="a11y_new_call_log_entry_missed_call">
+    <item quantity="one">^1 gemiste oproep van ^2</item>
+    <item quantity="other">^1 oproepen, de laatste is een gemiste oproep van ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_answered_call">
+    <item quantity="one">^1 beantwoorde oproep van ^2</item>
+    <item quantity="other">^1 oproepen, de laatste is een beantwoorde oproep van ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_outgoing_call">
+    <item quantity="one">^1 uitgaande oproep naar ^2</item>
+    <item quantity="other">^1 oproepen, de laatste is een uitgaande oproep naar ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_blocked_call">
+    <item quantity="one">^1 geblokkeerde oproep van ^2</item>
+    <item quantity="other">^1 oproepen, de laatste is een geblokkeerde oproep van ^2</item>
+  </plurals>
+  <string name="a11y_new_call_log_entry_phone_account">op ^1,
+    via ^2</string>
+  <string name="a11y_new_call_log_entry_full_description_without_phone_account_info">^1, ^2.</string>
+  <string name="a11y_new_call_log_entry_full_description_with_phone_account_info">^1, ^2, ^3.</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-no/strings.xml b/java/com/android/dialer/calllogutils/res/values-no/strings.xml
index 7a989d4..f5a74f5 100644
--- a/java/com/android/dialer/calllogutils/res/values-no/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-no/strings.xml
@@ -1,53 +1,60 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2017 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="type_incoming" msgid="5727636795656199810">"Innkommende anrop"</string>
-    <string name="type_incoming_pulled" msgid="8434723359163965796">"Det innkommende anropet ble overført til en annen enhet"</string>
-    <string name="type_outgoing" msgid="764896746073942963">"Utgående anrop"</string>
-    <string name="type_outgoing_pulled" msgid="1648517538371704193">"Det utgående anropet ble overført til en annen enhet"</string>
-    <string name="type_missed" msgid="2997043831022028176">"Tapt anrop"</string>
-    <string name="type_incoming_video" msgid="7507180294202642554">"Innkommende videoanrop"</string>
-    <string name="type_incoming_video_pulled" msgid="7879031598844023977">"Det innkommende videoanropet ble overført til en annen enhet"</string>
-    <string name="type_outgoing_video" msgid="309370072333983910">"Utgående videoanrop"</string>
-    <string name="type_outgoing_video_pulled" msgid="3924450629684331345">"Det utgående videoanropet ble overført til en annen enhet"</string>
-    <string name="type_missed_video" msgid="4350107016317603785">"Ubesvart videoanrop"</string>
-    <string name="type_voicemail" msgid="1877524395253846684">"Talepost"</string>
-    <string name="type_rejected" msgid="5632107438472996198">"Avvist anrop"</string>
-    <string name="type_blocked" msgid="9177237294052244929">"Blokkert anrop"</string>
-    <string name="call_details_minutes_abbreviation" msgid="7899774555556720560">"min."</string>
-    <string name="call_details_seconds_abbreviation" msgid="5893806826648947126">"sek."</string>
-    <string name="a11y_call_duration_format" msgid="2905525933361674470">"<xliff:g id="MINUTES_0">%d</xliff:g> <xliff:g id="MINUTES_TRANSLATION">%s</xliff:g> <xliff:g id="SECONDS_1">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="a11y_call_duration_short_format" msgid="5908875871251062453">"<xliff:g id="SECONDS_0">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <plurals name="a11y_seconds" formatted="false" msgid="6695730844760611970">
-      <item quantity="other">sekunder</item>
-      <item quantity="one">sekund</item>
-    </plurals>
-    <plurals name="a11y_minutes" formatted="false" msgid="6377010096698624038">
-      <item quantity="other">minutter</item>
-      <item quantity="one">minutt</item>
-    </plurals>
-    <string name="type_answered_elsewhere" msgid="411958582555881640">"Anropet ble besvart på en annen enhet"</string>
-    <string name="description_phone_account" msgid="4382951172691362244">"på <xliff:g id="PHONEACCOUNT">^1</xliff:g>"</string>
-    <string name="description_via_number" msgid="7682575124846343076">"via <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="description_via_number_phone_account" msgid="4345445677508018830">"på <xliff:g id="PHONEACCOUNT">%1$s</xliff:g> via <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="voicemail_string" msgid="6029775151483803006">"Talepost"</string>
-    <string name="now" msgid="2599778506439006806">"Nå"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="type_incoming">Innkommende anrop</string>
+  <string name="type_incoming_pulled">Det innkommende anropet ble overført til en annen enhet</string>
+  <string name="type_outgoing">Utgående anrop</string>
+  <string name="type_outgoing_pulled">Det utgående anropet ble overført til en annen enhet</string>
+  <string name="type_missed">Tapt anrop</string>
+  <string name="type_incoming_video">Innkommende videoanrop</string>
+  <string name="type_incoming_video_pulled">Det innkommende videoanropet ble overført til en annen enhet</string>
+  <string name="type_outgoing_video">Utgående videoanrop</string>
+  <string name="type_outgoing_video_pulled">Det utgående videoanropet ble overført til en annen enhet</string>
+  <string name="type_missed_video">Ubesvart videoanrop</string>
+  <string name="type_voicemail">Talepost</string>
+  <string name="type_rejected">Avvist anrop</string>
+  <string name="type_blocked">Blokkert anrop</string>
+  <string name="call_details_minutes_abbreviation">min.</string>
+  <string name="call_details_seconds_abbreviation">sek.</string>
+  <string name="a11y_call_duration_format">%1$d %2$s %3$d %4$s</string>
+  <string name="a11y_call_duration_short_format">%1$d %2$s</string>
+  <string name="call_duration_format_pattern">%1$s \'%2$s\' %3$s \'%4$s\'</string>
+  <string name="call_duration_short_format_pattern">%1$s \'%2$s\'</string>
+  <plurals name="a11y_seconds">
+    <item quantity="one">sekund</item>
+    <item quantity="other">sekunder</item>
+  </plurals>
+  <plurals name="a11y_minutes">
+    <item quantity="one">minutt</item>
+    <item quantity="other">minutter</item>
+  </plurals>
+  <string name="type_answered_elsewhere">Anropet ble besvart på en annen enhet</string>
+  <string name="description_phone_account">på ^1</string>
+  <string name="description_via_number">via %1$s</string>
+  <string name="description_via_number_phone_account">på %1$s via %2$s</string>
+  <string name="voicemail_string">Talepost</string>
+  <string name="just_now">Nå nettopp</string>
+  <string name="new_call_log_carrier_video">Video via mobiloperatør</string>
+  <string name="new_call_log_duo_video">Video via Duo</string>
+  <string name="new_call_log_unknown">Ukjent</string>
+  <string name="new_call_log_secondary_blocked">Blokkert</string>
+  <string name="new_call_log_secondary_spam">Nettsøppel</string>
+  <plurals name="a11y_new_call_log_entry_missed_call">
+    <item quantity="one">^1 tapt anrop fra ^2</item>
+    <item quantity="other">^1 anrop, det nyeste er et tapt anrop fra ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_answered_call">
+    <item quantity="one">^1 besvart anrop fra ^2</item>
+    <item quantity="other">^1 anrop, det nyeste er et besvart anrop fra ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_outgoing_call">
+    <item quantity="one">^1 utgående anrop til ^2</item>
+    <item quantity="other">^1 anrop, det nyeste er et utgående anrop til ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_blocked_call">
+    <item quantity="one">^1 blokkert anrop fra ^2</item>
+    <item quantity="other">^1 anrop, det nyeste er et blokkert anrop fra ^2</item>
+  </plurals>
+  <string name="a11y_new_call_log_entry_phone_account">på ^1 via ^2</string>
+  <string name="a11y_new_call_log_entry_full_description_without_phone_account_info">^1, ^2.</string>
+  <string name="a11y_new_call_log_entry_full_description_with_phone_account_info">^1, ^2, ^3.</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-pa/strings.xml b/java/com/android/dialer/calllogutils/res/values-pa/strings.xml
index 6e2c137..e7cc5db 100644
--- a/java/com/android/dialer/calllogutils/res/values-pa/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-pa/strings.xml
@@ -1,53 +1,60 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2017 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="type_incoming" msgid="5727636795656199810">"ਇਨਕਮਿੰਗ ਕਾਲ"</string>
-    <string name="type_incoming_pulled" msgid="8434723359163965796">"ਇਨਕਮਿੰਗ ਕਾਲ ਕਿਸੇ ਹੋਰ ਡੀਵਾਈਸ \'ਤੇ ਤਬਦੀਲ ਕੀਤੀ ਗਈ"</string>
-    <string name="type_outgoing" msgid="764896746073942963">"ਆਊਟਗੋਇੰਗ ਕਾਲ"</string>
-    <string name="type_outgoing_pulled" msgid="1648517538371704193">"ਆਊਟਗੋਇੰਗ ਕਾਲ ਕਿਸੇ ਹੋਰ ਡੀਵਾਈਸ \'ਤੇ ਤਬਦੀਲ ਕੀਤੀ ਗਈ"</string>
-    <string name="type_missed" msgid="2997043831022028176">"ਖੁੰਝੀ ਹੋਈ ਕਾਲ"</string>
-    <string name="type_incoming_video" msgid="7507180294202642554">"ਇਨਕਮਿੰਗ ਵੀਡੀਓ ਕਾਲ"</string>
-    <string name="type_incoming_video_pulled" msgid="7879031598844023977">"ਇਨਕਮਿੰਗ ਵੀਡੀਓ ਕਾਲ ਕਿਸੇ ਹੋਰ ਡੀਵਾਈਸ \'ਤੇ ਤਬਦੀਲ ਕੀਤੀ ਗਈ"</string>
-    <string name="type_outgoing_video" msgid="309370072333983910">"ਆਊਟਗੋਇੰਗ ਵੀਡੀਓ ਕਾਲ"</string>
-    <string name="type_outgoing_video_pulled" msgid="3924450629684331345">"ਆਊਟਗੋਇੰਗ ਵੀਡੀਓ ਕਾਲ ਕਿਸੇ ਹੋਰ ਡੀਵਾਈਸ \'ਤੇ ਤਬਦੀਲ ਕੀਤੀ ਗਈ"</string>
-    <string name="type_missed_video" msgid="4350107016317603785">"ਖੁੰਝੀ ਹੋਈ ਵੀਡੀਓ ਕਾਲ"</string>
-    <string name="type_voicemail" msgid="1877524395253846684">"ਵੌਇਸਮੇਲ"</string>
-    <string name="type_rejected" msgid="5632107438472996198">"ਅਸਵੀਕਾਰ ਕੀਤੀ ਕਾਲ"</string>
-    <string name="type_blocked" msgid="9177237294052244929">"ਬਲੌਕ ਕੀਤੀ ਕਾਲ"</string>
-    <string name="call_details_minutes_abbreviation" msgid="7899774555556720560">"ਮਿੰ"</string>
-    <string name="call_details_seconds_abbreviation" msgid="5893806826648947126">"ਸਕਿੰ"</string>
-    <string name="a11y_call_duration_format" msgid="2905525933361674470">"<xliff:g id="MINUTES_0">%d</xliff:g> <xliff:g id="MINUTES_TRANSLATION">%s</xliff:g> <xliff:g id="SECONDS_1">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="a11y_call_duration_short_format" msgid="5908875871251062453">"<xliff:g id="SECONDS_0">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <plurals name="a11y_seconds" formatted="false" msgid="6695730844760611970">
-      <item quantity="one">ਸਕਿੰਟ</item>
-      <item quantity="other">ਸਕਿੰਟ</item>
-    </plurals>
-    <plurals name="a11y_minutes" formatted="false" msgid="6377010096698624038">
-      <item quantity="one">ਮਿੰਟ</item>
-      <item quantity="other">ਮਿੰਟ</item>
-    </plurals>
-    <string name="type_answered_elsewhere" msgid="411958582555881640">"ਕਾਲ ਦਾ ਕਿਸੇ ਹੋਰ ਡੀਵਾਈਸ \'ਤੇ ਜਵਾਬ ਦਿੱਤਾ ਗਿਆ"</string>
-    <string name="description_phone_account" msgid="4382951172691362244">"<xliff:g id="PHONEACCOUNT">^1</xliff:g> \'ਤੇ"</string>
-    <string name="description_via_number" msgid="7682575124846343076">"<xliff:g id="NUMBER">%1$s</xliff:g> ਰਾਹੀਂ"</string>
-    <string name="description_via_number_phone_account" msgid="4345445677508018830">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> \'ਤੇ, <xliff:g id="NUMBER">%2$s</xliff:g> ਰਾਹੀਂ"</string>
-    <string name="voicemail_string" msgid="6029775151483803006">"ਵੌਇਸਮੇਲ"</string>
-    <string name="now" msgid="2599778506439006806">"ਹੁਣੇ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="type_incoming">ਇਨਕਮਿੰਗ ਕਾਲ</string>
+  <string name="type_incoming_pulled">ਇਨਕਮਿੰਗ ਕਾਲ ਕਿਸੇ ਹੋਰ ਡੀਵਾਈਸ \'ਤੇ ਤਬਦੀਲ ਕੀਤੀ ਗਈ</string>
+  <string name="type_outgoing">ਆਊਟਗੋਇੰਗ ਕਾਲ</string>
+  <string name="type_outgoing_pulled">ਆਊਟਗੋਇੰਗ ਕਾਲ ਕਿਸੇ ਹੋਰ ਡੀਵਾਈਸ \'ਤੇ ਤਬਦੀਲ ਕੀਤੀ ਗਈ</string>
+  <string name="type_missed">ਖੁੰਝੀ ਹੋਈ ਕਾਲ</string>
+  <string name="type_incoming_video">ਇਨਕਮਿੰਗ ਵੀਡੀਓ ਕਾਲ</string>
+  <string name="type_incoming_video_pulled">ਇਨਕਮਿੰਗ ਵੀਡੀਓ ਕਾਲ ਕਿਸੇ ਹੋਰ ਡੀਵਾਈਸ \'ਤੇ ਤਬਦੀਲ ਕੀਤੀ ਗਈ</string>
+  <string name="type_outgoing_video">ਆਊਟਗੋਇੰਗ ਵੀਡੀਓ ਕਾਲ</string>
+  <string name="type_outgoing_video_pulled">ਆਊਟਗੋਇੰਗ ਵੀਡੀਓ ਕਾਲ ਕਿਸੇ ਹੋਰ ਡੀਵਾਈਸ \'ਤੇ ਤਬਦੀਲ ਕੀਤੀ ਗਈ</string>
+  <string name="type_missed_video">ਖੁੰਝੀ ਹੋਈ ਵੀਡੀਓ ਕਾਲ</string>
+  <string name="type_voicemail">ਵੌਇਸਮੇਲ</string>
+  <string name="type_rejected">ਅਸਵੀਕਾਰ ਕੀਤੀ ਕਾਲ</string>
+  <string name="type_blocked">ਬਲੌਕ ਕੀਤੀ ਕਾਲ</string>
+  <string name="call_details_minutes_abbreviation">ਮਿੰ</string>
+  <string name="call_details_seconds_abbreviation">ਸਕਿੰ</string>
+  <string name="a11y_call_duration_format">%1$d %2$s %3$d %4$s</string>
+  <string name="a11y_call_duration_short_format">%1$d %2$s</string>
+  <string name="call_duration_format_pattern">%1$s\'%2$s\' %3$s\'%4$s\'</string>
+  <string name="call_duration_short_format_pattern">%1$s\'%2$s\'</string>
+  <plurals name="a11y_seconds">
+    <item quantity="one">ਸਕਿੰਟ</item>
+    <item quantity="other">ਸਕਿੰਟ</item>
+  </plurals>
+  <plurals name="a11y_minutes">
+    <item quantity="one">ਮਿੰਟ</item>
+    <item quantity="other">ਮਿੰਟ</item>
+  </plurals>
+  <string name="type_answered_elsewhere">ਕਾਲ ਦਾ ਕਿਸੇ ਹੋਰ ਡੀਵਾਈਸ \'ਤੇ ਜਵਾਬ ਦਿੱਤਾ ਗਿਆ</string>
+  <string name="description_phone_account">^1 \'ਤੇ</string>
+  <string name="description_via_number">%1$s ਰਾਹੀਂ</string>
+  <string name="description_via_number_phone_account">%1$s \'ਤੇ, %2$s ਰਾਹੀਂ</string>
+  <string name="voicemail_string">ਵੌਇਸਮੇਲ</string>
+  <string name="just_now">ਹੁਣੇ ਹੀ</string>
+  <string name="new_call_log_carrier_video">ਕੈਰੀਅਰ ਵੀਡੀਓ ਕਾਲ</string>
+  <string name="new_call_log_duo_video">Duo ਵੀਡੀਓ ਕਾਲ</string>
+  <string name="new_call_log_unknown">ਅਗਿਆਤ</string>
+  <string name="new_call_log_secondary_blocked">ਬਲਾਕ ਕੀਤਾ ਗਿਆ</string>
+  <string name="new_call_log_secondary_spam">ਸਪੈਮ</string>
+  <plurals name="a11y_new_call_log_entry_missed_call">
+    <item quantity="one">^1 ਕਾਲ, ਨਵੀਨਤਮ ਵਾਲੀ ^2 ਦੀ ਇੱਕ ਖੁੰਝੀ ਹੋਈ ਕਾਲ ਹੈ</item>
+    <item quantity="other">^1 ਕਾਲਾਂ, ਨਵੀਨਤਮ ਵਾਲੀ ^2 ਦੀ ਇੱਕ ਖੁੰਝੀ ਹੋਈ ਕਾਲ ਹੈ</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_answered_call">
+    <item quantity="one">^1 ਕਾਲ, ਨਵੀਨਤਮ ਵਾਲੀ ^2 ਦੀ ਇੱਕ ਕਾਲ ਦਾ ਜਵਾਬ ਦਿੱਤਾ ਗਿਆ</item>
+    <item quantity="other">^1 ਕਾਲਾਂ, ਨਵੀਨਤਮ ਵਾਲੀ ^2 ਦੀ ਇੱਕ ਕਾਲ ਦਾ ਜਵਾਬ ਦਿੱਤਾ ਗਿਆ</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_outgoing_call">
+    <item quantity="one">^1 ਕਾਲ, ਨਵੀਨਤਮ ਵਾਲੀ ^2 ਨੂੰ ਇੱਕ ਆਊਟਗੋਇੰਗ ਕਾਲ ਕੀਤੀ ਗਈ</item>
+    <item quantity="other">^1 ਕਾਲਾਂ, ਨਵੀਨਤਮ ਵਾਲੀ ^2 ਨੂੰ ਇੱਕ ਆਊਟਗੋਇੰਗ ਕਾਲ ਕੀਤੀ ਗਈ</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_blocked_call">
+    <item quantity="one">^1 ਕਾਲ, ਨਵੀਨਤਮ ਵਾਲੀ ^2 ਦੀ ਇੱਕ ਕਾਲ ਬਲਾਕ ਕੀਤੀ ਗਈ</item>
+    <item quantity="other">^1 ਕਾਲਾਂ, ਨਵੀਨਤਮ ਵਾਲੀ ^2 ਦੀ ਇੱਕ ਕਾਲ ਬਲਾਕ ਕੀਤੀ ਗਈ</item>
+  </plurals>
+  <string name="a11y_new_call_log_entry_phone_account">^1 \'ਤੇ, ^2 ਰਾਹੀਂ</string>
+  <string name="a11y_new_call_log_entry_full_description_without_phone_account_info">^1, ^2।</string>
+  <string name="a11y_new_call_log_entry_full_description_with_phone_account_info">^1, ^2, ^3.</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-pl/strings.xml b/java/com/android/dialer/calllogutils/res/values-pl/strings.xml
index b30171f..4f237ec 100644
--- a/java/com/android/dialer/calllogutils/res/values-pl/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-pl/strings.xml
@@ -1,57 +1,72 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2017 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="type_incoming" msgid="5727636795656199810">"Połączenie przychodzące"</string>
-    <string name="type_incoming_pulled" msgid="8434723359163965796">"Połączenie przychodzące przekazane na inne urządzenie"</string>
-    <string name="type_outgoing" msgid="764896746073942963">"Połączenie wychodzące"</string>
-    <string name="type_outgoing_pulled" msgid="1648517538371704193">"Połączenie wychodzące przekazane na inne urządzenie"</string>
-    <string name="type_missed" msgid="2997043831022028176">"Nieodebrane połączenie"</string>
-    <string name="type_incoming_video" msgid="7507180294202642554">"Przychodząca rozmowa wideo"</string>
-    <string name="type_incoming_video_pulled" msgid="7879031598844023977">"Przychodząca rozmowa wideo przekazana na inne urządzenie"</string>
-    <string name="type_outgoing_video" msgid="309370072333983910">"Wychodząca rozmowa wideo"</string>
-    <string name="type_outgoing_video_pulled" msgid="3924450629684331345">"Wychodząca rozmowa wideo przekazana na inne urządzenie"</string>
-    <string name="type_missed_video" msgid="4350107016317603785">"Nieodebrana rozmowa wideo"</string>
-    <string name="type_voicemail" msgid="1877524395253846684">"Poczta głosowa"</string>
-    <string name="type_rejected" msgid="5632107438472996198">"Odrzucone połączenie"</string>
-    <string name="type_blocked" msgid="9177237294052244929">"Zablokowane połączenie"</string>
-    <string name="call_details_minutes_abbreviation" msgid="7899774555556720560">"min"</string>
-    <string name="call_details_seconds_abbreviation" msgid="5893806826648947126">"s"</string>
-    <string name="a11y_call_duration_format" msgid="2905525933361674470">"<xliff:g id="MINUTES_0">%d</xliff:g> <xliff:g id="MINUTES_TRANSLATION">%s</xliff:g> <xliff:g id="SECONDS_1">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="a11y_call_duration_short_format" msgid="5908875871251062453">"<xliff:g id="SECONDS_0">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <plurals name="a11y_seconds" formatted="false" msgid="6695730844760611970">
-      <item quantity="few">sekundy</item>
-      <item quantity="many">sekund</item>
-      <item quantity="other">sekundy</item>
-      <item quantity="one">sekunda</item>
-    </plurals>
-    <plurals name="a11y_minutes" formatted="false" msgid="6377010096698624038">
-      <item quantity="few">minuty</item>
-      <item quantity="many">minut</item>
-      <item quantity="other">minuty</item>
-      <item quantity="one">minuta</item>
-    </plurals>
-    <string name="type_answered_elsewhere" msgid="411958582555881640">"Połączenie zostało odebrane na innym urządzeniu"</string>
-    <string name="description_phone_account" msgid="4382951172691362244">"na koncie <xliff:g id="PHONEACCOUNT">^1</xliff:g>"</string>
-    <string name="description_via_number" msgid="7682575124846343076">"przez <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="description_via_number_phone_account" msgid="4345445677508018830">"na koncie <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, przez <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="voicemail_string" msgid="6029775151483803006">"Poczta głosowa"</string>
-    <string name="now" msgid="2599778506439006806">"Przed chwilą"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="type_incoming">Połączenie przychodzące</string>
+  <string name="type_incoming_pulled">Połączenie przychodzące przekazane na inne urządzenie</string>
+  <string name="type_outgoing">Połączenie wychodzące</string>
+  <string name="type_outgoing_pulled">Połączenie wychodzące przekazane na inne urządzenie</string>
+  <string name="type_missed">Nieodebrane połączenie</string>
+  <string name="type_incoming_video">Przychodząca rozmowa wideo</string>
+  <string name="type_incoming_video_pulled">Przychodząca rozmowa wideo przekazana na inne urządzenie</string>
+  <string name="type_outgoing_video">Wychodząca rozmowa wideo</string>
+  <string name="type_outgoing_video_pulled">Wychodząca rozmowa wideo przekazana na inne urządzenie</string>
+  <string name="type_missed_video">Nieodebrana rozmowa wideo</string>
+  <string name="type_voicemail">Poczta głosowa</string>
+  <string name="type_rejected">Odrzucone połączenie</string>
+  <string name="type_blocked">Zablokowane połączenie</string>
+  <string name="call_details_minutes_abbreviation">min</string>
+  <string name="call_details_seconds_abbreviation">s</string>
+  <string name="a11y_call_duration_format">%1$d %2$s %3$d %4$s</string>
+  <string name="a11y_call_duration_short_format">%1$d %2$s</string>
+  <string name="call_duration_format_pattern">%1$s \'%2$s\' %3$s \'%4$s\'</string>
+  <string name="call_duration_short_format_pattern">%1$s \'%2$s\'</string>
+  <plurals name="a11y_seconds">
+    <item quantity="one">sekunda</item>
+    <item quantity="few">sekundy</item>
+    <item quantity="many">sekund</item>
+    <item quantity="other">sekundy</item>
+  </plurals>
+  <plurals name="a11y_minutes">
+    <item quantity="one">minuta</item>
+    <item quantity="few">minuty</item>
+    <item quantity="many">minut</item>
+    <item quantity="other">minuty</item>
+  </plurals>
+  <string name="type_answered_elsewhere">Połączenie zostało odebrane na innym urządzeniu</string>
+  <string name="description_phone_account">na koncie ^1</string>
+  <string name="description_via_number">przez %1$s</string>
+  <string name="description_via_number_phone_account">na koncie %1$s, przez %2$s</string>
+  <string name="voicemail_string">Poczta głosowa</string>
+  <string name="just_now">Przed chwilą</string>
+  <string name="new_call_log_carrier_video">Rozmowa wideo w sieci operatora</string>
+  <string name="new_call_log_duo_video">Rozmowa wideo w Duo</string>
+  <string name="new_call_log_unknown">Nieznany</string>
+  <string name="new_call_log_secondary_blocked">Zablokowany</string>
+  <string name="new_call_log_secondary_spam">Spam</string>
+  <plurals name="a11y_new_call_log_entry_missed_call">
+    <item quantity="one">^1 nieodebrane połączenie od: ^2</item>
+    <item quantity="few">^1 nieodebrane połączenia od: ^2</item>
+    <item quantity="many">^1 nieodebranych połączeń od: ^2</item>
+    <item quantity="other">^1 nieodebranego połączenia od: ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_answered_call">
+    <item quantity="one">^1 odebrane połączenie od: ^2</item>
+    <item quantity="few">^1 połączenia – ostatnie to odebrane połączenie od: ^2</item>
+    <item quantity="many">^1 połączeń – ostatnie to odebrane połączenie od: ^2</item>
+    <item quantity="other">^1 połączenia – ostatnie to odebrane połączenie od: ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_outgoing_call">
+    <item quantity="one">^1 połączenie wychodzące z: ^2</item>
+    <item quantity="few">^1 połączenia – ostatnie to połączenie wychodzące z: ^2</item>
+    <item quantity="many">^1 połączeń – ostatnie to połączenie wychodzące z: ^2</item>
+    <item quantity="other">^1 połączenia – ostatnie to połączenie wychodzące z: ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_blocked_call">
+    <item quantity="one">^1 zablokowane połączenie od: ^2</item>
+    <item quantity="few">^1 połączenia – ostatnie to zablokowane połączenie od: ^2</item>
+    <item quantity="many">^1 połączeń – ostatnie to zablokowane połączenie od: ^2</item>
+    <item quantity="other">^1 połączenia – ostatnie to zablokowane połączenie od: ^2</item>
+  </plurals>
+  <string name="a11y_new_call_log_entry_phone_account">na koncie ^1, przez ^2</string>
+  <string name="a11y_new_call_log_entry_full_description_without_phone_account_info">^1, ^2.</string>
+  <string name="a11y_new_call_log_entry_full_description_with_phone_account_info">^1, ^2, ^3.</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-pt-rBR/strings.xml b/java/com/android/dialer/calllogutils/res/values-pt-rBR/strings.xml
index 4d64d22..a308729 100644
--- a/java/com/android/dialer/calllogutils/res/values-pt-rBR/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-pt-rBR/strings.xml
@@ -1,53 +1,60 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2017 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="type_incoming" msgid="5727636795656199810">"Chamada recebida"</string>
-    <string name="type_incoming_pulled" msgid="8434723359163965796">"Chamada recebida transferida para outro dispositivo"</string>
-    <string name="type_outgoing" msgid="764896746073942963">"Chamada realizada"</string>
-    <string name="type_outgoing_pulled" msgid="1648517538371704193">"Chamada realizada transferida para outro dispositivo"</string>
-    <string name="type_missed" msgid="2997043831022028176">"Chamada perdida"</string>
-    <string name="type_incoming_video" msgid="7507180294202642554">"Videochamada recebida"</string>
-    <string name="type_incoming_video_pulled" msgid="7879031598844023977">"Videochamada recebida transferida para outro dispositivo"</string>
-    <string name="type_outgoing_video" msgid="309370072333983910">"Videochamada realizada"</string>
-    <string name="type_outgoing_video_pulled" msgid="3924450629684331345">"Videochamada realizada transferida para outro dispositivo"</string>
-    <string name="type_missed_video" msgid="4350107016317603785">"Videochamada perdida"</string>
-    <string name="type_voicemail" msgid="1877524395253846684">"Correio de voz"</string>
-    <string name="type_rejected" msgid="5632107438472996198">"Chamada recusada"</string>
-    <string name="type_blocked" msgid="9177237294052244929">"Chamada bloqueada"</string>
-    <string name="call_details_minutes_abbreviation" msgid="7899774555556720560">"min"</string>
-    <string name="call_details_seconds_abbreviation" msgid="5893806826648947126">"s"</string>
-    <string name="a11y_call_duration_format" msgid="2905525933361674470">"<xliff:g id="MINUTES_0">%d</xliff:g> <xliff:g id="MINUTES_TRANSLATION">%s</xliff:g> <xliff:g id="SECONDS_1">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="a11y_call_duration_short_format" msgid="5908875871251062453">"<xliff:g id="SECONDS_0">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <plurals name="a11y_seconds" formatted="false" msgid="6695730844760611970">
-      <item quantity="one"> segundo</item>
-      <item quantity="other"> segundos</item>
-    </plurals>
-    <plurals name="a11y_minutes" formatted="false" msgid="6377010096698624038">
-      <item quantity="one">minuto</item>
-      <item quantity="other">minutos</item>
-    </plurals>
-    <string name="type_answered_elsewhere" msgid="411958582555881640">"Chamada atendida em outro dispositivo"</string>
-    <string name="description_phone_account" msgid="4382951172691362244">"em <xliff:g id="PHONEACCOUNT">^1</xliff:g>"</string>
-    <string name="description_via_number" msgid="7682575124846343076">"pelo número <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="description_via_number_phone_account" msgid="4345445677508018830">"em <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, pelo número <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="voicemail_string" msgid="6029775151483803006">"Correio de voz"</string>
-    <string name="now" msgid="2599778506439006806">"Agora"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="type_incoming">Chamada recebida</string>
+  <string name="type_incoming_pulled">Chamada recebida transferida para outro dispositivo</string>
+  <string name="type_outgoing">Chamada realizada</string>
+  <string name="type_outgoing_pulled">Chamada realizada transferida para outro dispositivo</string>
+  <string name="type_missed">Chamada perdida</string>
+  <string name="type_incoming_video">Videochamada recebida</string>
+  <string name="type_incoming_video_pulled">Videochamada recebida transferida para outro dispositivo</string>
+  <string name="type_outgoing_video">Videochamada realizada</string>
+  <string name="type_outgoing_video_pulled">Videochamada realizada transferida para outro dispositivo</string>
+  <string name="type_missed_video">Videochamada perdida</string>
+  <string name="type_voicemail">Correio de voz</string>
+  <string name="type_rejected">Chamada recusada</string>
+  <string name="type_blocked">Chamada bloqueada</string>
+  <string name="call_details_minutes_abbreviation">min</string>
+  <string name="call_details_seconds_abbreviation">s</string>
+  <string name="a11y_call_duration_format">%1$d %2$s %3$d %4$s</string>
+  <string name="a11y_call_duration_short_format">%1$d %2$s</string>
+  <string name="call_duration_format_pattern">%1$s \'%2$s\' %3$s \'%4$s\'</string>
+  <string name="call_duration_short_format_pattern">%1$s \'%2$s\'</string>
+  <plurals name="a11y_seconds">
+    <item quantity="one"> segundo</item>
+    <item quantity="other"> segundos</item>
+  </plurals>
+  <plurals name="a11y_minutes">
+    <item quantity="one">minuto</item>
+    <item quantity="other">minutos</item>
+  </plurals>
+  <string name="type_answered_elsewhere">Chamada atendida em outro dispositivo</string>
+  <string name="description_phone_account">em ^1</string>
+  <string name="description_via_number">pelo número %1$s</string>
+  <string name="description_via_number_phone_account">em %1$s, pelo número %2$s</string>
+  <string name="voicemail_string">Correio de voz</string>
+  <string name="just_now">Agora</string>
+  <string name="new_call_log_carrier_video">Videochamadas via operadora</string>
+  <string name="new_call_log_duo_video">Videochamadas do Duo</string>
+  <string name="new_call_log_unknown">Desconhecidos</string>
+  <string name="new_call_log_secondary_blocked">Bloqueados</string>
+  <string name="new_call_log_secondary_spam">Spam</string>
+  <plurals name="a11y_new_call_log_entry_missed_call">
+    <item quantity="one">^1 chamada perdida de ^2</item>
+    <item quantity="other">^1 chamadas, 1 perdida de ^2 (a última)</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_answered_call">
+    <item quantity="one">^1 chamada atendida de ^2</item>
+    <item quantity="other">^1 chamadas, 1 atendida de ^2 (a última)</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_outgoing_call">
+    <item quantity="one">^1 chamada realizada para ^2</item>
+    <item quantity="other">^1 chamadas, 1 realizada para ^2 (a última)</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_blocked_call">
+    <item quantity="one">^1 chamada bloqueada de ^2</item>
+    <item quantity="other">^1 chamadas, 1 bloqueada de ^2 (a última)</item>
+  </plurals>
+  <string name="a11y_new_call_log_entry_phone_account">em ^1, pelo número ^2</string>
+  <string name="a11y_new_call_log_entry_full_description_without_phone_account_info">^1, ^2.</string>
+  <string name="a11y_new_call_log_entry_full_description_with_phone_account_info">^1, ^2, ^3.</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-pt-rPT/strings.xml b/java/com/android/dialer/calllogutils/res/values-pt-rPT/strings.xml
index c10be92..a5caba3 100644
--- a/java/com/android/dialer/calllogutils/res/values-pt-rPT/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-pt-rPT/strings.xml
@@ -1,53 +1,61 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2017 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="type_incoming" msgid="5727636795656199810">"Chamada recebida"</string>
-    <string name="type_incoming_pulled" msgid="8434723359163965796">"Chamada recebida transferida para outro dispositivo"</string>
-    <string name="type_outgoing" msgid="764896746073942963">"Chamada efetuada"</string>
-    <string name="type_outgoing_pulled" msgid="1648517538371704193">"Chamada efetuada transferida para outro dispositivo"</string>
-    <string name="type_missed" msgid="2997043831022028176">"Chamada não atendida"</string>
-    <string name="type_incoming_video" msgid="7507180294202642554">"Videochamada recebida"</string>
-    <string name="type_incoming_video_pulled" msgid="7879031598844023977">"Videochamada recebida transferida para outro dispositivo"</string>
-    <string name="type_outgoing_video" msgid="309370072333983910">"Videochamada efetuada"</string>
-    <string name="type_outgoing_video_pulled" msgid="3924450629684331345">"Videochamada efetuada transferida para outro dispositivo"</string>
-    <string name="type_missed_video" msgid="4350107016317603785">"Videochamada não atendida"</string>
-    <string name="type_voicemail" msgid="1877524395253846684">"Correio de voz"</string>
-    <string name="type_rejected" msgid="5632107438472996198">"Chamada recusada"</string>
-    <string name="type_blocked" msgid="9177237294052244929">"Chamada bloqueada"</string>
-    <string name="call_details_minutes_abbreviation" msgid="7899774555556720560">"min"</string>
-    <string name="call_details_seconds_abbreviation" msgid="5893806826648947126">"seg"</string>
-    <string name="a11y_call_duration_format" msgid="2905525933361674470">"<xliff:g id="MINUTES_0">%d</xliff:g> <xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>, <xliff:g id="SECONDS_1">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="a11y_call_duration_short_format" msgid="5908875871251062453">"<xliff:g id="SECONDS_0">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\', <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <plurals name="a11y_seconds" formatted="false" msgid="6695730844760611970">
-      <item quantity="one">segundo</item>
-      <item quantity="other">segundos</item>
-    </plurals>
-    <plurals name="a11y_minutes" formatted="false" msgid="6377010096698624038">
-      <item quantity="one">minuto</item>
-      <item quantity="other">minutos</item>
-    </plurals>
-    <string name="type_answered_elsewhere" msgid="411958582555881640">"Chamada atendida noutro dispositivo"</string>
-    <string name="description_phone_account" msgid="4382951172691362244">"em <xliff:g id="PHONEACCOUNT">^1</xliff:g>"</string>
-    <string name="description_via_number" msgid="7682575124846343076">"através do número <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="description_via_number_phone_account" msgid="4345445677508018830">"em <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, através do número <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="voicemail_string" msgid="6029775151483803006">"Correio de voz"</string>
-    <string name="now" msgid="2599778506439006806">"Agora"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="type_incoming">Chamada recebida</string>
+  <string name="type_incoming_pulled">Chamada recebida transferida para outro dispositivo</string>
+  <string name="type_outgoing">Chamada efetuada</string>
+  <string name="type_outgoing_pulled">Chamada efetuada transferida para outro dispositivo</string>
+  <string name="type_missed">Chamada não atendida</string>
+  <string name="type_incoming_video">Videochamada recebida</string>
+  <string name="type_incoming_video_pulled">Videochamada recebida transferida para outro dispositivo</string>
+  <string name="type_outgoing_video">Videochamada efetuada</string>
+  <string name="type_outgoing_video_pulled">Videochamada efetuada transferida para outro dispositivo</string>
+  <string name="type_missed_video">Videochamada não atendida</string>
+  <string name="type_voicemail">Correio de voz</string>
+  <string name="type_rejected">Chamada recusada</string>
+  <string name="type_blocked">Chamada bloqueada</string>
+  <string name="call_details_minutes_abbreviation">min</string>
+  <string name="call_details_seconds_abbreviation">seg</string>
+  <string name="a11y_call_duration_format">%1$d %2$s %3$d %4$s</string>
+  <string name="a11y_call_duration_short_format">%1$d %2$s</string>
+  <string name="call_duration_format_pattern">%1$s\'%2$s\', %3$s\'%4$s\'</string>
+  <string name="call_duration_short_format_pattern">%1$s \'%2$s\'</string>
+  <plurals name="a11y_seconds">
+    <item quantity="one">segundo</item>
+    <item quantity="other">segundos</item>
+  </plurals>
+  <plurals name="a11y_minutes">
+    <item quantity="one">minuto</item>
+    <item quantity="other">minutos</item>
+  </plurals>
+  <string name="type_answered_elsewhere">Chamada atendida noutro dispositivo</string>
+  <string name="description_phone_account">em ^1</string>
+  <string name="description_via_number">através do número %1$s</string>
+  <string name="description_via_number_phone_account">em %1$s, através do número %2$s</string>
+  <string name="voicemail_string">Correio de voz</string>
+  <string name="just_now">Agora mesmo</string>
+  <string name="new_call_log_carrier_video">Vídeo do operador</string>
+  <string name="new_call_log_duo_video">Vídeo do Duo</string>
+  <string name="new_call_log_unknown">Desconhecido</string>
+  <string name="new_call_log_secondary_blocked">Bloqueado</string>
+  <string name="new_call_log_secondary_spam">Spam</string>
+  <plurals name="a11y_new_call_log_entry_missed_call">
+    <item quantity="one">^1 chamada não atendida de ^2</item>
+    <item quantity="other">^1 chamadas, a mais recente é uma chamada não atendida de ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_answered_call">
+    <item quantity="one">^1 chamada atendida de ^2</item>
+    <item quantity="other">^1 chamadas, a mais recente é uma chamada atendida de ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_outgoing_call">
+    <item quantity="one">^1 chamada efetuada para ^2</item>
+    <item quantity="other">^1 chamadas, a mais recente é uma chamada efetuada para ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_blocked_call">
+    <item quantity="one">^1 chamada bloqueada de ^2</item>
+    <item quantity="other">^1 chamadas, a mais recente é uma chamada bloqueada de ^2</item>
+  </plurals>
+  <string name="a11y_new_call_log_entry_phone_account">em ^1,
+    através de ^2</string>
+  <string name="a11y_new_call_log_entry_full_description_without_phone_account_info">^1, ^2.</string>
+  <string name="a11y_new_call_log_entry_full_description_with_phone_account_info">^1, ^2, ^3.</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-pt/strings.xml b/java/com/android/dialer/calllogutils/res/values-pt/strings.xml
index 4d64d22..a308729 100644
--- a/java/com/android/dialer/calllogutils/res/values-pt/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-pt/strings.xml
@@ -1,53 +1,60 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2017 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="type_incoming" msgid="5727636795656199810">"Chamada recebida"</string>
-    <string name="type_incoming_pulled" msgid="8434723359163965796">"Chamada recebida transferida para outro dispositivo"</string>
-    <string name="type_outgoing" msgid="764896746073942963">"Chamada realizada"</string>
-    <string name="type_outgoing_pulled" msgid="1648517538371704193">"Chamada realizada transferida para outro dispositivo"</string>
-    <string name="type_missed" msgid="2997043831022028176">"Chamada perdida"</string>
-    <string name="type_incoming_video" msgid="7507180294202642554">"Videochamada recebida"</string>
-    <string name="type_incoming_video_pulled" msgid="7879031598844023977">"Videochamada recebida transferida para outro dispositivo"</string>
-    <string name="type_outgoing_video" msgid="309370072333983910">"Videochamada realizada"</string>
-    <string name="type_outgoing_video_pulled" msgid="3924450629684331345">"Videochamada realizada transferida para outro dispositivo"</string>
-    <string name="type_missed_video" msgid="4350107016317603785">"Videochamada perdida"</string>
-    <string name="type_voicemail" msgid="1877524395253846684">"Correio de voz"</string>
-    <string name="type_rejected" msgid="5632107438472996198">"Chamada recusada"</string>
-    <string name="type_blocked" msgid="9177237294052244929">"Chamada bloqueada"</string>
-    <string name="call_details_minutes_abbreviation" msgid="7899774555556720560">"min"</string>
-    <string name="call_details_seconds_abbreviation" msgid="5893806826648947126">"s"</string>
-    <string name="a11y_call_duration_format" msgid="2905525933361674470">"<xliff:g id="MINUTES_0">%d</xliff:g> <xliff:g id="MINUTES_TRANSLATION">%s</xliff:g> <xliff:g id="SECONDS_1">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="a11y_call_duration_short_format" msgid="5908875871251062453">"<xliff:g id="SECONDS_0">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <plurals name="a11y_seconds" formatted="false" msgid="6695730844760611970">
-      <item quantity="one"> segundo</item>
-      <item quantity="other"> segundos</item>
-    </plurals>
-    <plurals name="a11y_minutes" formatted="false" msgid="6377010096698624038">
-      <item quantity="one">minuto</item>
-      <item quantity="other">minutos</item>
-    </plurals>
-    <string name="type_answered_elsewhere" msgid="411958582555881640">"Chamada atendida em outro dispositivo"</string>
-    <string name="description_phone_account" msgid="4382951172691362244">"em <xliff:g id="PHONEACCOUNT">^1</xliff:g>"</string>
-    <string name="description_via_number" msgid="7682575124846343076">"pelo número <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="description_via_number_phone_account" msgid="4345445677508018830">"em <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, pelo número <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="voicemail_string" msgid="6029775151483803006">"Correio de voz"</string>
-    <string name="now" msgid="2599778506439006806">"Agora"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="type_incoming">Chamada recebida</string>
+  <string name="type_incoming_pulled">Chamada recebida transferida para outro dispositivo</string>
+  <string name="type_outgoing">Chamada realizada</string>
+  <string name="type_outgoing_pulled">Chamada realizada transferida para outro dispositivo</string>
+  <string name="type_missed">Chamada perdida</string>
+  <string name="type_incoming_video">Videochamada recebida</string>
+  <string name="type_incoming_video_pulled">Videochamada recebida transferida para outro dispositivo</string>
+  <string name="type_outgoing_video">Videochamada realizada</string>
+  <string name="type_outgoing_video_pulled">Videochamada realizada transferida para outro dispositivo</string>
+  <string name="type_missed_video">Videochamada perdida</string>
+  <string name="type_voicemail">Correio de voz</string>
+  <string name="type_rejected">Chamada recusada</string>
+  <string name="type_blocked">Chamada bloqueada</string>
+  <string name="call_details_minutes_abbreviation">min</string>
+  <string name="call_details_seconds_abbreviation">s</string>
+  <string name="a11y_call_duration_format">%1$d %2$s %3$d %4$s</string>
+  <string name="a11y_call_duration_short_format">%1$d %2$s</string>
+  <string name="call_duration_format_pattern">%1$s \'%2$s\' %3$s \'%4$s\'</string>
+  <string name="call_duration_short_format_pattern">%1$s \'%2$s\'</string>
+  <plurals name="a11y_seconds">
+    <item quantity="one"> segundo</item>
+    <item quantity="other"> segundos</item>
+  </plurals>
+  <plurals name="a11y_minutes">
+    <item quantity="one">minuto</item>
+    <item quantity="other">minutos</item>
+  </plurals>
+  <string name="type_answered_elsewhere">Chamada atendida em outro dispositivo</string>
+  <string name="description_phone_account">em ^1</string>
+  <string name="description_via_number">pelo número %1$s</string>
+  <string name="description_via_number_phone_account">em %1$s, pelo número %2$s</string>
+  <string name="voicemail_string">Correio de voz</string>
+  <string name="just_now">Agora</string>
+  <string name="new_call_log_carrier_video">Videochamadas via operadora</string>
+  <string name="new_call_log_duo_video">Videochamadas do Duo</string>
+  <string name="new_call_log_unknown">Desconhecidos</string>
+  <string name="new_call_log_secondary_blocked">Bloqueados</string>
+  <string name="new_call_log_secondary_spam">Spam</string>
+  <plurals name="a11y_new_call_log_entry_missed_call">
+    <item quantity="one">^1 chamada perdida de ^2</item>
+    <item quantity="other">^1 chamadas, 1 perdida de ^2 (a última)</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_answered_call">
+    <item quantity="one">^1 chamada atendida de ^2</item>
+    <item quantity="other">^1 chamadas, 1 atendida de ^2 (a última)</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_outgoing_call">
+    <item quantity="one">^1 chamada realizada para ^2</item>
+    <item quantity="other">^1 chamadas, 1 realizada para ^2 (a última)</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_blocked_call">
+    <item quantity="one">^1 chamada bloqueada de ^2</item>
+    <item quantity="other">^1 chamadas, 1 bloqueada de ^2 (a última)</item>
+  </plurals>
+  <string name="a11y_new_call_log_entry_phone_account">em ^1, pelo número ^2</string>
+  <string name="a11y_new_call_log_entry_full_description_without_phone_account_info">^1, ^2.</string>
+  <string name="a11y_new_call_log_entry_full_description_with_phone_account_info">^1, ^2, ^3.</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-ro/strings.xml b/java/com/android/dialer/calllogutils/res/values-ro/strings.xml
index 791bf4e..a09a3fb 100644
--- a/java/com/android/dialer/calllogutils/res/values-ro/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-ro/strings.xml
@@ -1,55 +1,67 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2017 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="type_incoming" msgid="5727636795656199810">"Apel primit"</string>
-    <string name="type_incoming_pulled" msgid="8434723359163965796">"Apel primit transferat către alt dispozitiv"</string>
-    <string name="type_outgoing" msgid="764896746073942963">"Apel efectuat"</string>
-    <string name="type_outgoing_pulled" msgid="1648517538371704193">"Apel efectuat transferat către alt dispozitiv"</string>
-    <string name="type_missed" msgid="2997043831022028176">"Apel nepreluat"</string>
-    <string name="type_incoming_video" msgid="7507180294202642554">"Apel video primit"</string>
-    <string name="type_incoming_video_pulled" msgid="7879031598844023977">"Apel video primit transferat către alt dispozitiv"</string>
-    <string name="type_outgoing_video" msgid="309370072333983910">"Apel video efectuat"</string>
-    <string name="type_outgoing_video_pulled" msgid="3924450629684331345">"Apel video efectuat transferat către alt dispozitiv"</string>
-    <string name="type_missed_video" msgid="4350107016317603785">"Apel video nepreluat"</string>
-    <string name="type_voicemail" msgid="1877524395253846684">"Mesagerie vocală"</string>
-    <string name="type_rejected" msgid="5632107438472996198">"Apel respins"</string>
-    <string name="type_blocked" msgid="9177237294052244929">"Apel blocat"</string>
-    <string name="call_details_minutes_abbreviation" msgid="7899774555556720560">"min."</string>
-    <string name="call_details_seconds_abbreviation" msgid="5893806826648947126">"sec."</string>
-    <string name="a11y_call_duration_format" msgid="2905525933361674470">"<xliff:g id="MINUTES_0">%d</xliff:g> <xliff:g id="MINUTES_TRANSLATION">%s</xliff:g> <xliff:g id="SECONDS_1">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="a11y_call_duration_short_format" msgid="5908875871251062453">"<xliff:g id="SECONDS_0">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <plurals name="a11y_seconds" formatted="false" msgid="6695730844760611970">
-      <item quantity="few">secunde</item>
-      <item quantity="other">de secunde</item>
-      <item quantity="one">secundă</item>
-    </plurals>
-    <plurals name="a11y_minutes" formatted="false" msgid="6377010096698624038">
-      <item quantity="few">minute</item>
-      <item quantity="other">de minute</item>
-      <item quantity="one">minut</item>
-    </plurals>
-    <string name="type_answered_elsewhere" msgid="411958582555881640">"Apel preluat pe alt dispozitiv"</string>
-    <string name="description_phone_account" msgid="4382951172691362244">"pe <xliff:g id="PHONEACCOUNT">^1</xliff:g>"</string>
-    <string name="description_via_number" msgid="7682575124846343076">"prin <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="description_via_number_phone_account" msgid="4345445677508018830">"pe <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, prin <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="voicemail_string" msgid="6029775151483803006">"Mesagerie vocală"</string>
-    <string name="now" msgid="2599778506439006806">"Acum"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="type_incoming">Apel primit</string>
+  <string name="type_incoming_pulled">Apel primit transferat către alt dispozitiv</string>
+  <string name="type_outgoing">Apel efectuat</string>
+  <string name="type_outgoing_pulled">Apel efectuat transferat către alt dispozitiv</string>
+  <string name="type_missed">Apel nepreluat</string>
+  <string name="type_incoming_video">Apel video primit</string>
+  <string name="type_incoming_video_pulled">Apel video primit transferat către alt dispozitiv</string>
+  <string name="type_outgoing_video">Apel video efectuat</string>
+  <string name="type_outgoing_video_pulled">Apel video efectuat transferat către alt dispozitiv</string>
+  <string name="type_missed_video">Apel video nepreluat</string>
+  <string name="type_voicemail">Mesagerie vocală</string>
+  <string name="type_rejected">Apel respins</string>
+  <string name="type_blocked">Apel blocat</string>
+  <string name="call_details_minutes_abbreviation">min.</string>
+  <string name="call_details_seconds_abbreviation">sec.</string>
+  <string name="a11y_call_duration_format">%1$d %2$s %3$d %4$s</string>
+  <string name="a11y_call_duration_short_format">%1$d %2$s</string>
+  <string name="call_duration_format_pattern">%1$s\'%2$s\' %3$s\'%4$s\'</string>
+  <string name="call_duration_short_format_pattern">%1$s\'%2$s\'</string>
+  <plurals name="a11y_seconds">
+    <item quantity="one">secundă</item>
+    <item quantity="few">secunde</item>
+    <item quantity="other">de secunde</item>
+  </plurals>
+  <plurals name="a11y_minutes">
+    <item quantity="one">minut</item>
+    <item quantity="few">minute</item>
+    <item quantity="other">de minute</item>
+  </plurals>
+  <string name="type_answered_elsewhere">Apel preluat pe alt dispozitiv</string>
+  <string name="description_phone_account">pe ^1</string>
+  <string name="description_via_number">prin %1$s</string>
+  <string name="description_via_number_phone_account">pe %1$s, prin %2$s</string>
+  <string name="voicemail_string">Mesagerie vocală</string>
+  <string name="just_now">Adineauri</string>
+  <string name="new_call_log_carrier_video">Apel video prin operator</string>
+  <string name="new_call_log_duo_video">Apel video Duo</string>
+  <string name="new_call_log_unknown">Necunoscut</string>
+  <string name="new_call_log_secondary_blocked">Blocate</string>
+  <string name="new_call_log_secondary_spam">Spam</string>
+  <plurals name="a11y_new_call_log_entry_missed_call">
+    <item quantity="one">^1 apel nepreluat de la ^2</item>
+    <item quantity="few">^1 apeluri. Ultimul este un apel nepreluat de la ^2</item>
+    <item quantity="other">^1 de apeluri. Ultimul este un apel nepreluat de la ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_answered_call">
+    <item quantity="one">^1 apel preluat de la ^2</item>
+    <item quantity="few">^1 apeluri. Ultimul este un apel preluat de la ^2</item>
+    <item quantity="other">^1 de apeluri. Ultimul este un apel preluat de la ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_outgoing_call">
+    <item quantity="one">^1 apel efectuat către ^2</item>
+    <item quantity="few">^1 apeluri. Ultimul este un apel efectuat către ^2</item>
+    <item quantity="other">^1 de apeluri. Ultimul este un apel efectuat către ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_blocked_call">
+    <item quantity="one">^1 apel blocat de la ^2</item>
+    <item quantity="few">^1 apeluri. Ultimul este un apel blocat de la ^2</item>
+    <item quantity="other">^1 de apeluri. Ultimul este un apel blocat de la ^2</item>
+  </plurals>
+  <string name="a11y_new_call_log_entry_phone_account">în ^1,
+    prin ^2</string>
+  <string name="a11y_new_call_log_entry_full_description_without_phone_account_info">^1, ^2.</string>
+  <string name="a11y_new_call_log_entry_full_description_with_phone_account_info">^1, ^2, ^3.</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-ru/strings.xml b/java/com/android/dialer/calllogutils/res/values-ru/strings.xml
index 378dc41..f54150f 100644
--- a/java/com/android/dialer/calllogutils/res/values-ru/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-ru/strings.xml
@@ -1,57 +1,73 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2017 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="type_incoming" msgid="5727636795656199810">"Входящий вызов"</string>
-    <string name="type_incoming_pulled" msgid="8434723359163965796">"Входящий вызов переведен на другое устройство"</string>
-    <string name="type_outgoing" msgid="764896746073942963">"Исходящий вызов"</string>
-    <string name="type_outgoing_pulled" msgid="1648517538371704193">"Исходящий вызов переведен на другое устройство"</string>
-    <string name="type_missed" msgid="2997043831022028176">"Пропущенный вызов"</string>
-    <string name="type_incoming_video" msgid="7507180294202642554">"Входящий видеовызов"</string>
-    <string name="type_incoming_video_pulled" msgid="7879031598844023977">"Входящий видеовызов переведен на другое устройство"</string>
-    <string name="type_outgoing_video" msgid="309370072333983910">"Исходящий видеовызов"</string>
-    <string name="type_outgoing_video_pulled" msgid="3924450629684331345">"Исходящий видеовызов переведен на другое устройство"</string>
-    <string name="type_missed_video" msgid="4350107016317603785">"Пропущенный видеовызов"</string>
-    <string name="type_voicemail" msgid="1877524395253846684">"Голосовая почта"</string>
-    <string name="type_rejected" msgid="5632107438472996198">"Отклоненный вызов"</string>
-    <string name="type_blocked" msgid="9177237294052244929">"Заблокированный вызов"</string>
-    <string name="call_details_minutes_abbreviation" msgid="7899774555556720560">"мин."</string>
-    <string name="call_details_seconds_abbreviation" msgid="5893806826648947126">"сек."</string>
-    <string name="a11y_call_duration_format" msgid="2905525933361674470">"<xliff:g id="MINUTES_0">%d</xliff:g> <xliff:g id="MINUTES_TRANSLATION">%s</xliff:g> <xliff:g id="SECONDS_1">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="a11y_call_duration_short_format" msgid="5908875871251062453">"<xliff:g id="SECONDS_0">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <plurals name="a11y_seconds" formatted="false" msgid="6695730844760611970">
-      <item quantity="one">секунда</item>
-      <item quantity="few">секунды</item>
-      <item quantity="many">секунд</item>
-      <item quantity="other">секунды</item>
-    </plurals>
-    <plurals name="a11y_minutes" formatted="false" msgid="6377010096698624038">
-      <item quantity="one">минута</item>
-      <item quantity="few">минуты</item>
-      <item quantity="many">минут</item>
-      <item quantity="other">минуты</item>
-    </plurals>
-    <string name="type_answered_elsewhere" msgid="411958582555881640">"Вызов принят на другом устройстве"</string>
-    <string name="description_phone_account" msgid="4382951172691362244">"<xliff:g id="PHONEACCOUNT">^1</xliff:g>"</string>
-    <string name="description_via_number" msgid="7682575124846343076">"Номер <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="description_via_number_phone_account" msgid="4345445677508018830">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, номер <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="voicemail_string" msgid="6029775151483803006">"Голосовая почта"</string>
-    <string name="now" msgid="2599778506439006806">"Только что"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="type_incoming">Входящий вызов</string>
+  <string name="type_incoming_pulled">Входящий вызов переведен на другое устройство</string>
+  <string name="type_outgoing">Исходящий вызов</string>
+  <string name="type_outgoing_pulled">Исходящий вызов переведен на другое устройство</string>
+  <string name="type_missed">Пропущенный вызов</string>
+  <string name="type_incoming_video">Входящий видеовызов</string>
+  <string name="type_incoming_video_pulled">Входящий видеовызов переведен на другое устройство</string>
+  <string name="type_outgoing_video">Исходящий видеовызов</string>
+  <string name="type_outgoing_video_pulled">Исходящий видеовызов переведен на другое устройство</string>
+  <string name="type_missed_video">Пропущенный видеовызов</string>
+  <string name="type_voicemail">Голосовая почта</string>
+  <string name="type_rejected">Отклоненный вызов</string>
+  <string name="type_blocked">Заблокированный вызов</string>
+  <string name="call_details_minutes_abbreviation">мин.</string>
+  <string name="call_details_seconds_abbreviation">сек.</string>
+  <string name="a11y_call_duration_format">%1$d %2$s %3$d %4$s</string>
+  <string name="a11y_call_duration_short_format">%1$d %2$s</string>
+  <string name="call_duration_format_pattern">%1$s \'%2$s\' %3$s \'%4$s\'</string>
+  <string name="call_duration_short_format_pattern">%1$s \'%2$s\'</string>
+  <plurals name="a11y_seconds">
+    <item quantity="one">секунда</item>
+    <item quantity="few">секунды</item>
+    <item quantity="many">секунд</item>
+    <item quantity="other">секунды</item>
+  </plurals>
+  <plurals name="a11y_minutes">
+    <item quantity="one">минута</item>
+    <item quantity="few">минуты</item>
+    <item quantity="many">минут</item>
+    <item quantity="other">минуты</item>
+  </plurals>
+  <string name="type_answered_elsewhere">Вызов принят на другом устройстве</string>
+  <string name="description_phone_account">^1</string>
+  <string name="description_via_number">Номер %1$s</string>
+  <string name="description_via_number_phone_account">%1$s, номер %2$s</string>
+  <string name="voicemail_string">Голосовая почта</string>
+  <string name="just_now">Только что</string>
+  <string name="new_call_log_carrier_video">Видеовызов</string>
+  <string name="new_call_log_duo_video">Видеовызов с помощью Duo</string>
+  <string name="new_call_log_unknown">Неизвестный номер</string>
+  <string name="new_call_log_secondary_blocked">Заблокированные</string>
+  <string name="new_call_log_secondary_spam">Спам</string>
+  <plurals name="a11y_new_call_log_entry_missed_call">
+    <item quantity="one">^1 вызов. Последний пропущенный – от абонента ^2.</item>
+    <item quantity="few">^1 вызова. Последний пропущенный – от абонента ^2.</item>
+    <item quantity="many">^1 вызовов. Последний пропущенный – от абонента ^2.</item>
+    <item quantity="other">^1 вызова. Последний пропущенный – от абонента ^2.</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_answered_call">
+    <item quantity="one">^1 вызов. Последний принятый – от абонента ^2.</item>
+    <item quantity="few">^1 вызова. Последний принятый – от абонента ^2.</item>
+    <item quantity="many">^1 вызовов. Последний принятый – от абонента ^2.</item>
+    <item quantity="other">^1 вызова. Последний принятый – от абонента ^2.</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_outgoing_call">
+    <item quantity="one">^1 вызов. Последний исходящий – абоненту ^2.</item>
+    <item quantity="few">^1 вызова. Последний исходящий – абоненту ^2.</item>
+    <item quantity="many">^1 вызовов. Последний исходящий – абоненту ^2.</item>
+    <item quantity="other">^1 вызова. Последний исходящий – абоненту ^2.</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_blocked_call">
+    <item quantity="one">^1 вызов. Последний заблокированный – от абонента ^2.</item>
+    <item quantity="few">^1 вызова. Последний заблокированный – от абонента ^2.</item>
+    <item quantity="many">^1 вызовов. Последний заблокированный – от абонента ^2.</item>
+    <item quantity="other">^1 вызова. Последний заблокированный – от абонента ^2.</item>
+  </plurals>
+  <string name="a11y_new_call_log_entry_phone_account">^1,
+    номер ^2</string>
+  <string name="a11y_new_call_log_entry_full_description_without_phone_account_info">^1, ^2.</string>
+  <string name="a11y_new_call_log_entry_full_description_with_phone_account_info">^1, ^2, ^3.</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-si/strings.xml b/java/com/android/dialer/calllogutils/res/values-si/strings.xml
index 1e17d18..7f66477 100644
--- a/java/com/android/dialer/calllogutils/res/values-si/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-si/strings.xml
@@ -1,53 +1,60 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2017 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="type_incoming" msgid="5727636795656199810">"එන ඇමතුම"</string>
-    <string name="type_incoming_pulled" msgid="8434723359163965796">"එන ඇමතුම තවත් උපාංගයකට මාරු කෙරිණි"</string>
-    <string name="type_outgoing" msgid="764896746073942963">"යන ඇමතුම"</string>
-    <string name="type_outgoing_pulled" msgid="1648517538371704193">"යන ඇමතුම තවත් උපාංගයකට මාරු කෙරිණි"</string>
-    <string name="type_missed" msgid="2997043831022028176">"මඟ හැරුණු ඇමතුම"</string>
-    <string name="type_incoming_video" msgid="7507180294202642554">"එන වීඩියෝ ඇමතුම"</string>
-    <string name="type_incoming_video_pulled" msgid="7879031598844023977">"එන වීඩියෝ ඇමතුම තවත් උපාංගයකට මාරු කෙරිණි"</string>
-    <string name="type_outgoing_video" msgid="309370072333983910">"යන වීඩියෝ ඇමතුම"</string>
-    <string name="type_outgoing_video_pulled" msgid="3924450629684331345">"යන වීඩියෝ ඇමතුම තවත් උපාංගයකට මාරු කෙරිණි"</string>
-    <string name="type_missed_video" msgid="4350107016317603785">"මගහැරුණු වීඩියෝ ඇමතුම"</string>
-    <string name="type_voicemail" msgid="1877524395253846684">"හඬ තැපෑල"</string>
-    <string name="type_rejected" msgid="5632107438472996198">"ප්‍රතික්ෂේප කළ ඇමතුම"</string>
-    <string name="type_blocked" msgid="9177237294052244929">"අවහිර කළ ඇමතුම"</string>
-    <string name="call_details_minutes_abbreviation" msgid="7899774555556720560">"මි"</string>
-    <string name="call_details_seconds_abbreviation" msgid="5893806826648947126">"ත"</string>
-    <string name="a11y_call_duration_format" msgid="2905525933361674470">"<xliff:g id="MINUTES_0">%d</xliff:g> <xliff:g id="MINUTES_TRANSLATION">%s</xliff:g> <xliff:g id="SECONDS_1">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="a11y_call_duration_short_format" msgid="5908875871251062453">"<xliff:g id="SECONDS_0">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <plurals name="a11y_seconds" formatted="false" msgid="6695730844760611970">
-      <item quantity="one">තත්පර</item>
-      <item quantity="other">තත්පර</item>
-    </plurals>
-    <plurals name="a11y_minutes" formatted="false" msgid="6377010096698624038">
-      <item quantity="one">මිනිත්තු</item>
-      <item quantity="other">මිනිත්තු</item>
-    </plurals>
-    <string name="type_answered_elsewhere" msgid="411958582555881640">"ඇමතුමට වෙනත් උපාංගයකදී පිළිතුරු දෙන ලදී"</string>
-    <string name="description_phone_account" msgid="4382951172691362244">"<xliff:g id="PHONEACCOUNT">^1</xliff:g> මත"</string>
-    <string name="description_via_number" msgid="7682575124846343076">"<xliff:g id="NUMBER">%1$s</xliff:g> හරහා"</string>
-    <string name="description_via_number_phone_account" msgid="4345445677508018830">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> මත, <xliff:g id="NUMBER">%2$s</xliff:g> හරහා"</string>
-    <string name="voicemail_string" msgid="6029775151483803006">"හඬ තැපෑල"</string>
-    <string name="now" msgid="2599778506439006806">"දැන්"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="type_incoming">එන ඇමතුම</string>
+  <string name="type_incoming_pulled">එන ඇමතුම තවත් උපාංගයකට මාරු කෙරිණි</string>
+  <string name="type_outgoing">යන ඇමතුම</string>
+  <string name="type_outgoing_pulled">යන ඇමතුම තවත් උපාංගයකට මාරු කෙරිණි</string>
+  <string name="type_missed">මඟ හැරුණු ඇමතුම</string>
+  <string name="type_incoming_video">එන වීඩියෝ ඇමතුම</string>
+  <string name="type_incoming_video_pulled">එන වීඩියෝ ඇමතුම තවත් උපාංගයකට මාරු කෙරිණි</string>
+  <string name="type_outgoing_video">යන වීඩියෝ ඇමතුම</string>
+  <string name="type_outgoing_video_pulled">යන වීඩියෝ ඇමතුම තවත් උපාංගයකට මාරු කෙරිණි</string>
+  <string name="type_missed_video">මගහැරුණු වීඩියෝ ඇමතුම</string>
+  <string name="type_voicemail">හඬ තැපෑල</string>
+  <string name="type_rejected">ප්‍රතික්ෂේප කළ ඇමතුම</string>
+  <string name="type_blocked">අවහිර කළ ඇමතුම</string>
+  <string name="call_details_minutes_abbreviation">මි</string>
+  <string name="call_details_seconds_abbreviation">ත</string>
+  <string name="a11y_call_duration_format">%1$d %2$s %3$d %4$s</string>
+  <string name="a11y_call_duration_short_format">%1$d %2$s</string>
+  <string name="call_duration_format_pattern">%1$s\'%2$s\' %3$s\'%4$s\'</string>
+  <string name="call_duration_short_format_pattern">%1$s\'%2$s\'</string>
+  <plurals name="a11y_seconds">
+    <item quantity="one">තත්පර</item>
+    <item quantity="other">තත්පර</item>
+  </plurals>
+  <plurals name="a11y_minutes">
+    <item quantity="one">මිනිත්තු</item>
+    <item quantity="other">මිනිත්තු</item>
+  </plurals>
+  <string name="type_answered_elsewhere">ඇමතුමට වෙනත් උපාංගයකදී පිළිතුරු දෙන ලදී</string>
+  <string name="description_phone_account">^1 මත</string>
+  <string name="description_via_number">%1$s හරහා</string>
+  <string name="description_via_number_phone_account">%1$s මත, %2$s හරහා</string>
+  <string name="voicemail_string">හඬ තැපෑල</string>
+  <string name="just_now">මේ දැන්</string>
+  <string name="new_call_log_carrier_video">වාහක වීඩියෝව</string>
+  <string name="new_call_log_duo_video">Duo වීඩියෝව</string>
+  <string name="new_call_log_unknown">නොදන්නා</string>
+  <string name="new_call_log_secondary_blocked">අවහිර කරන ලදි</string>
+  <string name="new_call_log_secondary_spam">අයාචිත</string>
+  <plurals name="a11y_new_call_log_entry_missed_call">
+    <item quantity="one">ඇමතුම් ^1කි, නවතම එක වන්නේ ^2 වෙතින් මගහැරුණු ඇමතුමකි</item>
+    <item quantity="other">ඇමතුම් ^1කි, නවතම එක වන්නේ ^2 වෙතින් මගහැරුණු ඇමතුමකි</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_answered_call">
+    <item quantity="one">ඇමතුම් ^1කි, නවතම එක වන්නේ ^2 වෙතින් පිළිතුරු දුන් ඇමතුමකි</item>
+    <item quantity="other">ඇමතුම් ^1කි, නවතම එක වන්නේ ^2 වෙතින් පිළිතුරු දුන් ඇමතුමකි</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_outgoing_call">
+    <item quantity="one">ඇමතුම් ^1කි, නවතම එක වන්නේ ^2 වෙත යන ඇමතුමකි</item>
+    <item quantity="other">ඇමතුම් ^1කි, නවතම එක වන්නේ ^2 වෙත යන ඇමතුමකි</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_blocked_call">
+    <item quantity="one">ඇමතුම් ^1කි, නවතම එක වන්නේ ^2 වෙතින් අවහිර කළ ඇමතුමකි</item>
+    <item quantity="other">ඇමතුම් ^1කි, නවතම එක වන්නේ ^2 වෙතින් අවහිර කළ ඇමතුමකි</item>
+  </plurals>
+  <string name="a11y_new_call_log_entry_phone_account">^1 මත, ^2 හරහා</string>
+  <string name="a11y_new_call_log_entry_full_description_without_phone_account_info">^1, ^2.</string>
+  <string name="a11y_new_call_log_entry_full_description_with_phone_account_info">^1, ^2, ^3.</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-sk/strings.xml b/java/com/android/dialer/calllogutils/res/values-sk/strings.xml
index 7abfafc..9d24c86 100644
--- a/java/com/android/dialer/calllogutils/res/values-sk/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-sk/strings.xml
@@ -1,57 +1,73 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2017 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="type_incoming" msgid="5727636795656199810">"Prichádzajúci hovor"</string>
-    <string name="type_incoming_pulled" msgid="8434723359163965796">"Prichádzajúci hovor bol presmerovaný na iné zariadenie"</string>
-    <string name="type_outgoing" msgid="764896746073942963">"Odchádzajúci hovor"</string>
-    <string name="type_outgoing_pulled" msgid="1648517538371704193">"Odchádzajúci hovor bol presmerovaný na iné zariadenie"</string>
-    <string name="type_missed" msgid="2997043831022028176">"Zmeškaný hovor"</string>
-    <string name="type_incoming_video" msgid="7507180294202642554">"Prichádzajúci videohovor"</string>
-    <string name="type_incoming_video_pulled" msgid="7879031598844023977">"Prichádzajúci videohovor bol presmerovaný na iné zariadenie"</string>
-    <string name="type_outgoing_video" msgid="309370072333983910">"Odchádzajúci videohovor"</string>
-    <string name="type_outgoing_video_pulled" msgid="3924450629684331345">"Odchádzajúci videohovor bol presmerovaný na iné zariadenie"</string>
-    <string name="type_missed_video" msgid="4350107016317603785">"Zmeškaný videohovor"</string>
-    <string name="type_voicemail" msgid="1877524395253846684">"Hlasová schránka"</string>
-    <string name="type_rejected" msgid="5632107438472996198">"Odmietnutý hovor"</string>
-    <string name="type_blocked" msgid="9177237294052244929">"Blokovaný hovor"</string>
-    <string name="call_details_minutes_abbreviation" msgid="7899774555556720560">"min"</string>
-    <string name="call_details_seconds_abbreviation" msgid="5893806826648947126">"s"</string>
-    <string name="a11y_call_duration_format" msgid="2905525933361674470">"<xliff:g id="MINUTES_0">%d</xliff:g> <xliff:g id="MINUTES_TRANSLATION">%s</xliff:g> <xliff:g id="SECONDS_1">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="a11y_call_duration_short_format" msgid="5908875871251062453">"<xliff:g id="SECONDS_0">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <plurals name="a11y_seconds" formatted="false" msgid="6695730844760611970">
-      <item quantity="few">sekundy</item>
-      <item quantity="many">sekundy</item>
-      <item quantity="other">sekúnd</item>
-      <item quantity="one">sekunda</item>
-    </plurals>
-    <plurals name="a11y_minutes" formatted="false" msgid="6377010096698624038">
-      <item quantity="few">minúty</item>
-      <item quantity="many">minúty</item>
-      <item quantity="other">minút</item>
-      <item quantity="one">minúta</item>
-    </plurals>
-    <string name="type_answered_elsewhere" msgid="411958582555881640">"Hovor bol prijatý v inom zariadení"</string>
-    <string name="description_phone_account" msgid="4382951172691362244">"v účte <xliff:g id="PHONEACCOUNT">^1</xliff:g>"</string>
-    <string name="description_via_number" msgid="7682575124846343076">"prostredníctvom čísla <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="description_via_number_phone_account" msgid="4345445677508018830">"v účte <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, prostredníctvom čísla <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="voicemail_string" msgid="6029775151483803006">"Hlasová schránka"</string>
-    <string name="now" msgid="2599778506439006806">"Teraz"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="type_incoming">Prichádzajúci hovor</string>
+  <string name="type_incoming_pulled">Prichádzajúci hovor bol presmerovaný na iné zariadenie</string>
+  <string name="type_outgoing">Odchádzajúci hovor</string>
+  <string name="type_outgoing_pulled">Odchádzajúci hovor bol presmerovaný na iné zariadenie</string>
+  <string name="type_missed">Zmeškaný hovor</string>
+  <string name="type_incoming_video">Prichádzajúci videohovor</string>
+  <string name="type_incoming_video_pulled">Prichádzajúci videohovor bol presmerovaný na iné zariadenie</string>
+  <string name="type_outgoing_video">Odchádzajúci videohovor</string>
+  <string name="type_outgoing_video_pulled">Odchádzajúci videohovor bol presmerovaný na iné zariadenie</string>
+  <string name="type_missed_video">Zmeškaný videohovor</string>
+  <string name="type_voicemail">Hlasová schránka</string>
+  <string name="type_rejected">Odmietnutý hovor</string>
+  <string name="type_blocked">Blokovaný hovor</string>
+  <string name="call_details_minutes_abbreviation">min</string>
+  <string name="call_details_seconds_abbreviation">s</string>
+  <string name="a11y_call_duration_format">%1$d %2$s %3$d %4$s</string>
+  <string name="a11y_call_duration_short_format">%1$d %2$s</string>
+  <string name="call_duration_format_pattern">%1$s \'%2$s\' %3$s \'%4$s\'</string>
+  <string name="call_duration_short_format_pattern">%1$s \'%2$s\'</string>
+  <plurals name="a11y_seconds">
+    <item quantity="one">sekunda</item>
+    <item quantity="few">sekundy</item>
+    <item quantity="many">sekundy</item>
+    <item quantity="other">sekúnd</item>
+  </plurals>
+  <plurals name="a11y_minutes">
+    <item quantity="one">minúta</item>
+    <item quantity="few">minúty</item>
+    <item quantity="many">minúty</item>
+    <item quantity="other">minút</item>
+  </plurals>
+  <string name="type_answered_elsewhere">Hovor bol prijatý v inom zariadení</string>
+  <string name="description_phone_account">v účte ^1</string>
+  <string name="description_via_number">prostredníctvom čísla %1$s</string>
+  <string name="description_via_number_phone_account">v účte %1$s, prostredníctvom čísla %2$s</string>
+  <string name="voicemail_string">Hlasová schránka</string>
+  <string name="just_now">Teraz</string>
+  <string name="new_call_log_carrier_video">Video operátora</string>
+  <string name="new_call_log_duo_video">Video služby Duo</string>
+  <string name="new_call_log_unknown">Neznáme</string>
+  <string name="new_call_log_secondary_blocked">Blokované</string>
+  <string name="new_call_log_secondary_spam">Spam</string>
+  <plurals name="a11y_new_call_log_entry_missed_call">
+    <item quantity="one">^1 zmeškaný hovor od kontaktu ^2</item>
+    <item quantity="few">^1 hovory, posledný je zmeškaný hovor od kontaktu ^2</item>
+    <item quantity="many">^1 calls, the latest is a missed call from ^2</item>
+    <item quantity="other">^1 hovorov, posledný je zmeškaný hovor od kontaktu ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_answered_call">
+    <item quantity="one">^1 prijatý hovor od kontaktu ^2</item>
+    <item quantity="few">^1 hovory, posledný je prijatý hovor od kontaktu ^2</item>
+    <item quantity="many">^1 calls, the latest is an answered call from ^2</item>
+    <item quantity="other">^1 hovorov, posledný je prijatý hovor od kontaktu ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_outgoing_call">
+    <item quantity="one">^1 odchádzajúci hovor s kontaktom ^2</item>
+    <item quantity="few">^1 hovory, posledný je odchádzajúci hovor s kontaktom ^2</item>
+    <item quantity="many">^1 calls, the latest is an outgoing call to ^2</item>
+    <item quantity="other">^1 hovorov, posledný je odchádzajúci hovor s kontaktom ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_blocked_call">
+    <item quantity="one">^1 blokovaný hovor od kontaktu ^2</item>
+    <item quantity="few">^1 hovory, posledný je blokovaný hovor od kontaktu ^2</item>
+    <item quantity="many">^1 calls, the latest is a blocked call from ^2</item>
+    <item quantity="other">^1 hovorov, posledný je blokovaný hovor od kontaktu ^2</item>
+  </plurals>
+  <string name="a11y_new_call_log_entry_phone_account">v účte ^1,
+    prostredníctvom čísla ^2</string>
+  <string name="a11y_new_call_log_entry_full_description_without_phone_account_info">^1, ^2.</string>
+  <string name="a11y_new_call_log_entry_full_description_with_phone_account_info">^1, ^2, ^3.</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-sl/strings.xml b/java/com/android/dialer/calllogutils/res/values-sl/strings.xml
index 21c1177..d1a22d1 100644
--- a/java/com/android/dialer/calllogutils/res/values-sl/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-sl/strings.xml
@@ -1,57 +1,73 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2017 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="type_incoming" msgid="5727636795656199810">"Dohodni klic"</string>
-    <string name="type_incoming_pulled" msgid="8434723359163965796">"Dohodni klic je bil prenesen v drugo napravo"</string>
-    <string name="type_outgoing" msgid="764896746073942963">"Odhodni klic"</string>
-    <string name="type_outgoing_pulled" msgid="1648517538371704193">"Odhodni klic je bil prenesen v drugo napravo"</string>
-    <string name="type_missed" msgid="2997043831022028176">"Neodgovorjeni klic"</string>
-    <string name="type_incoming_video" msgid="7507180294202642554">"Dohodni videoklic"</string>
-    <string name="type_incoming_video_pulled" msgid="7879031598844023977">"Dohodni videoklic je bil prenesen v drugo napravo"</string>
-    <string name="type_outgoing_video" msgid="309370072333983910">"Odhodni videoklic"</string>
-    <string name="type_outgoing_video_pulled" msgid="3924450629684331345">"Odhodni videoklic je bil prenesen v drugo napravo"</string>
-    <string name="type_missed_video" msgid="4350107016317603785">"Nedogovorjeni videoklic"</string>
-    <string name="type_voicemail" msgid="1877524395253846684">"Odzivnik"</string>
-    <string name="type_rejected" msgid="5632107438472996198">"Zavrnjen klic"</string>
-    <string name="type_blocked" msgid="9177237294052244929">"Blokiran klic"</string>
-    <string name="call_details_minutes_abbreviation" msgid="7899774555556720560">"min"</string>
-    <string name="call_details_seconds_abbreviation" msgid="5893806826648947126">"s"</string>
-    <string name="a11y_call_duration_format" msgid="2905525933361674470">"<xliff:g id="MINUTES_0">%d</xliff:g> <xliff:g id="MINUTES_TRANSLATION">%s</xliff:g> <xliff:g id="SECONDS_1">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="a11y_call_duration_short_format" msgid="5908875871251062453">"<xliff:g id="SECONDS_0">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <plurals name="a11y_seconds" formatted="false" msgid="6695730844760611970">
-      <item quantity="one">sekunde</item>
-      <item quantity="two">sekunde</item>
-      <item quantity="few">sekunde</item>
-      <item quantity="other">sekunde</item>
-    </plurals>
-    <plurals name="a11y_minutes" formatted="false" msgid="6377010096698624038">
-      <item quantity="one">minute</item>
-      <item quantity="two">minute</item>
-      <item quantity="few">minute</item>
-      <item quantity="other">minute</item>
-    </plurals>
-    <string name="type_answered_elsewhere" msgid="411958582555881640">"Klic je bil sprejet v drugi napravi"</string>
-    <string name="description_phone_account" msgid="4382951172691362244">"v računu <xliff:g id="PHONEACCOUNT">^1</xliff:g>"</string>
-    <string name="description_via_number" msgid="7682575124846343076">"prek številke <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="description_via_number_phone_account" msgid="4345445677508018830">"v računu <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, prek številke <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="voicemail_string" msgid="6029775151483803006">"Odzivnik"</string>
-    <string name="now" msgid="2599778506439006806">"Zdaj"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="type_incoming">Dohodni klic</string>
+  <string name="type_incoming_pulled">Dohodni klic je bil prenesen v drugo napravo</string>
+  <string name="type_outgoing">Odhodni klic</string>
+  <string name="type_outgoing_pulled">Odhodni klic je bil prenesen v drugo napravo</string>
+  <string name="type_missed">Neodgovorjeni klic</string>
+  <string name="type_incoming_video">Dohodni videoklic</string>
+  <string name="type_incoming_video_pulled">Dohodni videoklic je bil prenesen v drugo napravo</string>
+  <string name="type_outgoing_video">Odhodni videoklic</string>
+  <string name="type_outgoing_video_pulled">Odhodni videoklic je bil prenesen v drugo napravo</string>
+  <string name="type_missed_video">Nedogovorjeni videoklic</string>
+  <string name="type_voicemail">Odzivnik</string>
+  <string name="type_rejected">Zavrnjen klic</string>
+  <string name="type_blocked">Blokiran klic</string>
+  <string name="call_details_minutes_abbreviation">min</string>
+  <string name="call_details_seconds_abbreviation">s</string>
+  <string name="a11y_call_duration_format">%1$d %2$s %3$d %4$s</string>
+  <string name="a11y_call_duration_short_format">%1$d %2$s</string>
+  <string name="call_duration_format_pattern">%1$s \'%2$s\' %3$s \'%4$s\'</string>
+  <string name="call_duration_short_format_pattern">%1$s \'%2$s\'</string>
+  <plurals name="a11y_seconds">
+    <item quantity="one">sekunde</item>
+    <item quantity="two">sekunde</item>
+    <item quantity="few">sekunde</item>
+    <item quantity="other">sekunde</item>
+  </plurals>
+  <plurals name="a11y_minutes">
+    <item quantity="one">minute</item>
+    <item quantity="two">minute</item>
+    <item quantity="few">minute</item>
+    <item quantity="other">minute</item>
+  </plurals>
+  <string name="type_answered_elsewhere">Klic je bil sprejet v drugi napravi</string>
+  <string name="description_phone_account">v računu ^1</string>
+  <string name="description_via_number">prek številke %1$s</string>
+  <string name="description_via_number_phone_account">v računu %1$s, prek številke %2$s</string>
+  <string name="voicemail_string">Odzivnik</string>
+  <string name="just_now">Pravkar</string>
+  <string name="new_call_log_carrier_video">Videoklic prek operaterja</string>
+  <string name="new_call_log_duo_video">Videoklic Duo</string>
+  <string name="new_call_log_unknown">Neznano</string>
+  <string name="new_call_log_secondary_blocked">Blokirano</string>
+  <string name="new_call_log_secondary_spam">Neželeno</string>
+  <plurals name="a11y_new_call_log_entry_missed_call">
+    <item quantity="one">^1 klic, zadnji od njih je neodgovorjen dohodni klic stika ^2</item>
+    <item quantity="two">^1 klica, zadnji od njih je neodgovorjen dohodni klic stika ^2</item>
+    <item quantity="few">^1 klici, zadnji od njih je neodgovorjen dohodni klic stika ^2</item>
+    <item quantity="other">^1 klicev, zadnji od njih je neodgovorjen dohodni klic stika ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_answered_call">
+    <item quantity="one">^1 klic, zadnji od njih je sprejet dohodni klic stika ^2</item>
+    <item quantity="two">^1 klica, zadnji od njih je sprejet dohodni klic stika ^2</item>
+    <item quantity="few">^1 klici, zadnji od njih je sprejet dohodni klic stika ^2</item>
+    <item quantity="other">^1 klicev, zadnji od njih je sprejet dohodni klic stika ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_outgoing_call">
+    <item quantity="one">^1 klic, zadnji od njih je odhodni klic stika ^2</item>
+    <item quantity="two">^1 klica, zadnji od njih je odhodni klic stika ^2</item>
+    <item quantity="few">^1 klici, zadnji od njih je odhodni klic stika ^2</item>
+    <item quantity="other">^1 klicev, zadnji od njih je odhodni klic stika ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_blocked_call">
+    <item quantity="one">^1 klic, zadnji od njih je blokiran dohodni klic stika ^2</item>
+    <item quantity="two">^1 klica, zadnji od njih je blokiran dohodni klic stika ^2</item>
+    <item quantity="few">^1 klici, zadnji od njih je blokiran dohodni klic stika ^2</item>
+    <item quantity="other">^1 klicev, zadnji od njih je blokiran dohodni klic stika ^2</item>
+  </plurals>
+  <string name="a11y_new_call_log_entry_phone_account">v računu ^1,
+    prek številke ^2</string>
+  <string name="a11y_new_call_log_entry_full_description_without_phone_account_info">^1, ^2.</string>
+  <string name="a11y_new_call_log_entry_full_description_with_phone_account_info">^1, ^2, ^3.</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-sq/strings.xml b/java/com/android/dialer/calllogutils/res/values-sq/strings.xml
index 1124ffa..b4dc544 100644
--- a/java/com/android/dialer/calllogutils/res/values-sq/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-sq/strings.xml
@@ -1,53 +1,60 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2017 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="type_incoming" msgid="5727636795656199810">"Telefonatë hyrëse"</string>
-    <string name="type_incoming_pulled" msgid="8434723359163965796">"Telefonata hyrëse u transferua te një pajisje tjetër"</string>
-    <string name="type_outgoing" msgid="764896746073942963">"Telefonatë dalëse"</string>
-    <string name="type_outgoing_pulled" msgid="1648517538371704193">"Telefonata dalëse u transferua te një pajisje tjetër"</string>
-    <string name="type_missed" msgid="2997043831022028176">"Telefonatë e humbur"</string>
-    <string name="type_incoming_video" msgid="7507180294202642554">"Telefonatë hyrëse me video"</string>
-    <string name="type_incoming_video_pulled" msgid="7879031598844023977">"Telefonata hyrëse me video u transferua te një pajisje tjetër"</string>
-    <string name="type_outgoing_video" msgid="309370072333983910">"Telefonatë dalëse me video"</string>
-    <string name="type_outgoing_video_pulled" msgid="3924450629684331345">"Telefonata dalëse me video u transferua te pajisje tjetër"</string>
-    <string name="type_missed_video" msgid="4350107016317603785">"Telefonatë me video e humbur"</string>
-    <string name="type_voicemail" msgid="1877524395253846684">"Posta zanore"</string>
-    <string name="type_rejected" msgid="5632107438472996198">"Telefonatë e refuzuar"</string>
-    <string name="type_blocked" msgid="9177237294052244929">"Telefonatë e bllokuar"</string>
-    <string name="call_details_minutes_abbreviation" msgid="7899774555556720560">"min."</string>
-    <string name="call_details_seconds_abbreviation" msgid="5893806826648947126">"sek."</string>
-    <string name="a11y_call_duration_format" msgid="2905525933361674470">"<xliff:g id="MINUTES_0">%d</xliff:g> <xliff:g id="MINUTES_TRANSLATION">%s</xliff:g> <xliff:g id="SECONDS_1">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="a11y_call_duration_short_format" msgid="5908875871251062453">"<xliff:g id="SECONDS_0">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <plurals name="a11y_seconds" formatted="false" msgid="6695730844760611970">
-      <item quantity="other">sekonda</item>
-      <item quantity="one">sekondë</item>
-    </plurals>
-    <plurals name="a11y_minutes" formatted="false" msgid="6377010096698624038">
-      <item quantity="other">minuta</item>
-      <item quantity="one">minutë</item>
-    </plurals>
-    <string name="type_answered_elsewhere" msgid="411958582555881640">"Telefonata mori përgjigje në një pajisje tjetër"</string>
-    <string name="description_phone_account" msgid="4382951172691362244">"në <xliff:g id="PHONEACCOUNT">^1</xliff:g>"</string>
-    <string name="description_via_number" msgid="7682575124846343076">"nëpërmjet <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="description_via_number_phone_account" msgid="4345445677508018830">"në <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, nëpërmjet <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="voicemail_string" msgid="6029775151483803006">"Posta zanore"</string>
-    <string name="now" msgid="2599778506439006806">"Tani"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="type_incoming">Telefonatë hyrëse</string>
+  <string name="type_incoming_pulled">Telefonata hyrëse u transferua te një pajisje tjetër</string>
+  <string name="type_outgoing">Telefonatë dalëse</string>
+  <string name="type_outgoing_pulled">Telefonata dalëse u transferua te një pajisje tjetër</string>
+  <string name="type_missed">Telefonatë e humbur</string>
+  <string name="type_incoming_video">Telefonatë hyrëse me video</string>
+  <string name="type_incoming_video_pulled">Telefonata hyrëse me video u transferua te një pajisje tjetër</string>
+  <string name="type_outgoing_video">Telefonatë dalëse me video</string>
+  <string name="type_outgoing_video_pulled">Telefonata dalëse me video u transferua te pajisje tjetër</string>
+  <string name="type_missed_video">Telefonatë me video e humbur</string>
+  <string name="type_voicemail">Posta zanore</string>
+  <string name="type_rejected">Telefonatë e refuzuar</string>
+  <string name="type_blocked">Telefonatë e bllokuar</string>
+  <string name="call_details_minutes_abbreviation">min.</string>
+  <string name="call_details_seconds_abbreviation">sek.</string>
+  <string name="a11y_call_duration_format">%1$d %2$s %3$d %4$s</string>
+  <string name="a11y_call_duration_short_format">%1$d %2$s</string>
+  <string name="call_duration_format_pattern">%1$s\'%2$s\' %3$s\'%4$s\'</string>
+  <string name="call_duration_short_format_pattern">%1$s\'%2$s\'</string>
+  <plurals name="a11y_seconds">
+    <item quantity="one">sekondë</item>
+    <item quantity="other">sekonda</item>
+  </plurals>
+  <plurals name="a11y_minutes">
+    <item quantity="one">minutë</item>
+    <item quantity="other">minuta</item>
+  </plurals>
+  <string name="type_answered_elsewhere">Telefonata mori përgjigje në një pajisje tjetër</string>
+  <string name="description_phone_account">në ^1</string>
+  <string name="description_via_number">nëpërmjet %1$s</string>
+  <string name="description_via_number_phone_account">në %1$s, nëpërmjet %2$s</string>
+  <string name="voicemail_string">Posta zanore</string>
+  <string name="just_now">Pikërisht tani</string>
+  <string name="new_call_log_carrier_video">Video e operatorit celular</string>
+  <string name="new_call_log_duo_video">Video e Duo</string>
+  <string name="new_call_log_unknown">I panjohur</string>
+  <string name="new_call_log_secondary_blocked">Bllokuar</string>
+  <string name="new_call_log_secondary_spam">Postë e bezdisshme</string>
+  <plurals name="a11y_new_call_log_entry_missed_call">
+    <item quantity="one">^1 telefonatë e humbur nga ^2</item>
+    <item quantity="other">^1 telefonata, e fundit është një telefonatë e humbur nga ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_answered_call">
+    <item quantity="one">^1 telefonatë e përgjigjur nga ^2</item>
+    <item quantity="other">^1 telefonata, e fundit është një telefonatë e përgjigjur nga ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_outgoing_call">
+    <item quantity="one">^1 telefonatë dalëse për ^2</item>
+    <item quantity="other">^1 telefonata, e fundit është një telefonatë dalëse për ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_blocked_call">
+    <item quantity="one">^1 telefonatë e bllokuar nga ^2</item>
+    <item quantity="other">^1 telefonata, e fundit është një telefonatë e bllokuar nga ^2</item>
+  </plurals>
+  <string name="a11y_new_call_log_entry_phone_account">në ^1, nëpërmjet ^2</string>
+  <string name="a11y_new_call_log_entry_full_description_without_phone_account_info">^1, ^2.</string>
+  <string name="a11y_new_call_log_entry_full_description_with_phone_account_info">^1, ^2, ^3.</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-sr/strings.xml b/java/com/android/dialer/calllogutils/res/values-sr/strings.xml
index 5653dae..471deb5 100644
--- a/java/com/android/dialer/calllogutils/res/values-sr/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-sr/strings.xml
@@ -1,55 +1,67 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2017 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="type_incoming" msgid="5727636795656199810">"Долазни позив"</string>
-    <string name="type_incoming_pulled" msgid="8434723359163965796">"Долазни позив је пренет на други уређај"</string>
-    <string name="type_outgoing" msgid="764896746073942963">"Одлазни позив"</string>
-    <string name="type_outgoing_pulled" msgid="1648517538371704193">"Одлазни позив је пренет на други уређај"</string>
-    <string name="type_missed" msgid="2997043831022028176">"Пропуштен позив"</string>
-    <string name="type_incoming_video" msgid="7507180294202642554">"Долазни видео позив"</string>
-    <string name="type_incoming_video_pulled" msgid="7879031598844023977">"Долазни видео позив је пренет на други уређај"</string>
-    <string name="type_outgoing_video" msgid="309370072333983910">"Одлазни видео позив"</string>
-    <string name="type_outgoing_video_pulled" msgid="3924450629684331345">"Одлазни видео позив је пренет на други уређај"</string>
-    <string name="type_missed_video" msgid="4350107016317603785">"Пропуштен видео позив"</string>
-    <string name="type_voicemail" msgid="1877524395253846684">"Говорна пошта"</string>
-    <string name="type_rejected" msgid="5632107438472996198">"Одбијен позив"</string>
-    <string name="type_blocked" msgid="9177237294052244929">"Блокиран позив"</string>
-    <string name="call_details_minutes_abbreviation" msgid="7899774555556720560">"мин"</string>
-    <string name="call_details_seconds_abbreviation" msgid="5893806826648947126">"сек"</string>
-    <string name="a11y_call_duration_format" msgid="2905525933361674470">"<xliff:g id="MINUTES_0">%d</xliff:g> <xliff:g id="MINUTES_TRANSLATION">%s</xliff:g> <xliff:g id="SECONDS_1">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="a11y_call_duration_short_format" msgid="5908875871251062453">"<xliff:g id="SECONDS_0">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <plurals name="a11y_seconds" formatted="false" msgid="6695730844760611970">
-      <item quantity="one">секунда</item>
-      <item quantity="few">секунде</item>
-      <item quantity="other">секунди</item>
-    </plurals>
-    <plurals name="a11y_minutes" formatted="false" msgid="6377010096698624038">
-      <item quantity="one">минут</item>
-      <item quantity="few">минута</item>
-      <item quantity="other">минута</item>
-    </plurals>
-    <string name="type_answered_elsewhere" msgid="411958582555881640">"Позив је прихваћен на другом уређају"</string>
-    <string name="description_phone_account" msgid="4382951172691362244">"на <xliff:g id="PHONEACCOUNT">^1</xliff:g>"</string>
-    <string name="description_via_number" msgid="7682575124846343076">"преко <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="description_via_number_phone_account" msgid="4345445677508018830">"на <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, преко <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="voicemail_string" msgid="6029775151483803006">"Говорна пошта"</string>
-    <string name="now" msgid="2599778506439006806">"Сада"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="type_incoming">Долазни позив</string>
+  <string name="type_incoming_pulled">Долазни позив је пренет на други уређај</string>
+  <string name="type_outgoing">Одлазни позив</string>
+  <string name="type_outgoing_pulled">Одлазни позив је пренет на други уређај</string>
+  <string name="type_missed">Пропуштен позив</string>
+  <string name="type_incoming_video">Долазни видео позив</string>
+  <string name="type_incoming_video_pulled">Долазни видео позив је пренет на други уређај</string>
+  <string name="type_outgoing_video">Одлазни видео позив</string>
+  <string name="type_outgoing_video_pulled">Одлазни видео позив је пренет на други уређај</string>
+  <string name="type_missed_video">Пропуштен видео позив</string>
+  <string name="type_voicemail">Говорна пошта</string>
+  <string name="type_rejected">Одбијен позив</string>
+  <string name="type_blocked">Блокиран позив</string>
+  <string name="call_details_minutes_abbreviation">мин</string>
+  <string name="call_details_seconds_abbreviation">сек</string>
+  <string name="a11y_call_duration_format">%1$d %2$s %3$d %4$s</string>
+  <string name="a11y_call_duration_short_format">%1$d %2$s</string>
+  <string name="call_duration_format_pattern">%1$s \'%2$s\' %3$s \'%4$s\'</string>
+  <string name="call_duration_short_format_pattern">%1$s \'%2$s\'</string>
+  <plurals name="a11y_seconds">
+    <item quantity="one">секунда</item>
+    <item quantity="few">секунде</item>
+    <item quantity="other">секунди</item>
+  </plurals>
+  <plurals name="a11y_minutes">
+    <item quantity="one">минут</item>
+    <item quantity="few">минута</item>
+    <item quantity="other">минута</item>
+  </plurals>
+  <string name="type_answered_elsewhere">Позив је прихваћен на другом уређају</string>
+  <string name="description_phone_account">на ^1</string>
+  <string name="description_via_number">преко %1$s</string>
+  <string name="description_via_number_phone_account">на %1$s, преко %2$s</string>
+  <string name="voicemail_string">Говорна пошта</string>
+  <string name="just_now">Малопре</string>
+  <string name="new_call_log_carrier_video">Видео позив преко оператера</string>
+  <string name="new_call_log_duo_video">Duo видео позив</string>
+  <string name="new_call_log_unknown">Непознати бројеви</string>
+  <string name="new_call_log_secondary_blocked">Блокирани</string>
+  <string name="new_call_log_secondary_spam">Непожељно</string>
+  <plurals name="a11y_new_call_log_entry_missed_call">
+    <item quantity="one">^1 позив, последњи је пропуштени позив од: ^2</item>
+    <item quantity="few">^1 позива, последњи је пропуштени позив од: ^2</item>
+    <item quantity="other">^1 позива, последњи је пропуштени позив од: ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_answered_call">
+    <item quantity="one">^1 позив, последњи је прихваћени позив од: ^2</item>
+    <item quantity="few">^1 позива, последњи је прихваћени позив од: ^2</item>
+    <item quantity="other">^1 позива, последњи је прихваћени позив од: ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_outgoing_call">
+    <item quantity="one">^1 позив, последњи је одлазни позив за: ^2</item>
+    <item quantity="few">^1 позива, последњи је одлазни позив за: ^2</item>
+    <item quantity="other">^1 позива, последњи је одлазни позив за: ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_blocked_call">
+    <item quantity="one">^1 позив, последњи је блокирани позив од: ^2</item>
+    <item quantity="few">^1 позива, последњи је блокирани позив од: ^2</item>
+    <item quantity="other">^1 позива, последњи је блокирани позив од: ^2</item>
+  </plurals>
+  <string name="a11y_new_call_log_entry_phone_account">на ^1,
+    преко ^2</string>
+  <string name="a11y_new_call_log_entry_full_description_without_phone_account_info">^1, ^2.</string>
+  <string name="a11y_new_call_log_entry_full_description_with_phone_account_info">^1, ^2, ^3.</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-sv/strings.xml b/java/com/android/dialer/calllogutils/res/values-sv/strings.xml
index 1902132..a18d008 100644
--- a/java/com/android/dialer/calllogutils/res/values-sv/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-sv/strings.xml
@@ -1,53 +1,61 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2017 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="type_incoming" msgid="5727636795656199810">"Inkommande samtal"</string>
-    <string name="type_incoming_pulled" msgid="8434723359163965796">"Inkommande samtal överfört till en annan enhet"</string>
-    <string name="type_outgoing" msgid="764896746073942963">"Utgående samtal"</string>
-    <string name="type_outgoing_pulled" msgid="1648517538371704193">"Utgående samtal överfört till en annan enhet"</string>
-    <string name="type_missed" msgid="2997043831022028176">"Missat samtal"</string>
-    <string name="type_incoming_video" msgid="7507180294202642554">"Inkommande videosamtal"</string>
-    <string name="type_incoming_video_pulled" msgid="7879031598844023977">"Inkommande videosamtal överfört till en annan enhet"</string>
-    <string name="type_outgoing_video" msgid="309370072333983910">"Utgående videosamtal"</string>
-    <string name="type_outgoing_video_pulled" msgid="3924450629684331345">"Utgående videosamtal överfört till en annan enhet"</string>
-    <string name="type_missed_video" msgid="4350107016317603785">"Missat videosamtal"</string>
-    <string name="type_voicemail" msgid="1877524395253846684">"Röstbrevlåda"</string>
-    <string name="type_rejected" msgid="5632107438472996198">"Avvisat samtal"</string>
-    <string name="type_blocked" msgid="9177237294052244929">"Blockerat samtal"</string>
-    <string name="call_details_minutes_abbreviation" msgid="7899774555556720560">"min."</string>
-    <string name="call_details_seconds_abbreviation" msgid="5893806826648947126">"s"</string>
-    <string name="a11y_call_duration_format" msgid="2905525933361674470">"<xliff:g id="MINUTES_0">%d</xliff:g> <xliff:g id="MINUTES_TRANSLATION">%s</xliff:g> <xliff:g id="SECONDS_1">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="a11y_call_duration_short_format" msgid="5908875871251062453">"<xliff:g id="SECONDS_0">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <plurals name="a11y_seconds" formatted="false" msgid="6695730844760611970">
-      <item quantity="other"> sekunder</item>
-      <item quantity="one"> sekund</item>
-    </plurals>
-    <plurals name="a11y_minutes" formatted="false" msgid="6377010096698624038">
-      <item quantity="other"> minuter</item>
-      <item quantity="one"> minut</item>
-    </plurals>
-    <string name="type_answered_elsewhere" msgid="411958582555881640">"Svarade på en annan enhet"</string>
-    <string name="description_phone_account" msgid="4382951172691362244">"på <xliff:g id="PHONEACCOUNT">^1</xliff:g>"</string>
-    <string name="description_via_number" msgid="7682575124846343076">"med <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="description_via_number_phone_account" msgid="4345445677508018830">"på <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, med <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="voicemail_string" msgid="6029775151483803006">"Röstbrevlåda"</string>
-    <string name="now" msgid="2599778506439006806">"Nu"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="type_incoming">Inkommande samtal</string>
+  <string name="type_incoming_pulled">Inkommande samtal överfört till en annan enhet</string>
+  <string name="type_outgoing">Utgående samtal</string>
+  <string name="type_outgoing_pulled">Utgående samtal överfört till en annan enhet</string>
+  <string name="type_missed">Missat samtal</string>
+  <string name="type_incoming_video">Inkommande videosamtal</string>
+  <string name="type_incoming_video_pulled">Inkommande videosamtal överfört till en annan enhet</string>
+  <string name="type_outgoing_video">Utgående videosamtal</string>
+  <string name="type_outgoing_video_pulled">Utgående videosamtal överfört till en annan enhet</string>
+  <string name="type_missed_video">Missat videosamtal</string>
+  <string name="type_voicemail">Röstbrevlåda</string>
+  <string name="type_rejected">Avvisat samtal</string>
+  <string name="type_blocked">Blockerat samtal</string>
+  <string name="call_details_minutes_abbreviation">min.</string>
+  <string name="call_details_seconds_abbreviation">s</string>
+  <string name="a11y_call_duration_format">%1$d %2$s %3$d %4$s</string>
+  <string name="a11y_call_duration_short_format">%1$d %2$s</string>
+  <string name="call_duration_format_pattern">%1$s \'%2$s\' %3$s \'%4$s\'</string>
+  <string name="call_duration_short_format_pattern">%1$s \'%2$s\'</string>
+  <plurals name="a11y_seconds">
+    <item quantity="one"> sekund</item>
+    <item quantity="other"> sekunder</item>
+  </plurals>
+  <plurals name="a11y_minutes">
+    <item quantity="one"> minut</item>
+    <item quantity="other"> minuter</item>
+  </plurals>
+  <string name="type_answered_elsewhere">Svarade på en annan enhet</string>
+  <string name="description_phone_account">på ^1</string>
+  <string name="description_via_number">med %1$s</string>
+  <string name="description_via_number_phone_account">på %1$s, med %2$s</string>
+  <string name="voicemail_string">Röstbrevlåda</string>
+  <string name="just_now">Nyss</string>
+  <string name="new_call_log_carrier_video">Operatörsvideo</string>
+  <string name="new_call_log_duo_video">Duo-video</string>
+  <string name="new_call_log_unknown">Okänd</string>
+  <string name="new_call_log_secondary_blocked">Blockerad</string>
+  <string name="new_call_log_secondary_spam">Spam</string>
+  <plurals name="a11y_new_call_log_entry_missed_call">
+    <item quantity="one">^1 missat samtal från ^2</item>
+    <item quantity="other">^1 samtal, det senaste är ett missat samtal från ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_answered_call">
+    <item quantity="one">^1 besvarat samtal från ^2</item>
+    <item quantity="other">^1 samtal, det senaste är ett besvarat samtal från ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_outgoing_call">
+    <item quantity="one">^1 utgående samtal till ^2</item>
+    <item quantity="other">^1 samtal, det senaste är ett utgående samtal till ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_blocked_call">
+    <item quantity="one">^1 blockerat samtal från ^2</item>
+    <item quantity="other">^1 samtal, det senaste är ett blockerat samtal från ^2</item>
+  </plurals>
+  <string name="a11y_new_call_log_entry_phone_account">med ^1,
+    på ^2</string>
+  <string name="a11y_new_call_log_entry_full_description_without_phone_account_info">^1, ^2.</string>
+  <string name="a11y_new_call_log_entry_full_description_with_phone_account_info">^1, ^2, ^3.</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-sw/strings.xml b/java/com/android/dialer/calllogutils/res/values-sw/strings.xml
index 57eb4eb..39b7d83 100644
--- a/java/com/android/dialer/calllogutils/res/values-sw/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-sw/strings.xml
@@ -1,53 +1,60 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2017 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="type_incoming" msgid="5727636795656199810">"Simu inayoingia"</string>
-    <string name="type_incoming_pulled" msgid="8434723359163965796">"Simu inayoingia imeelekezwa kwenye kifaa kingine"</string>
-    <string name="type_outgoing" msgid="764896746073942963">"Simu uliyopiga"</string>
-    <string name="type_outgoing_pulled" msgid="1648517538371704193">"Simu unayopiga imeelekezwa kwenye kifaa kingine"</string>
-    <string name="type_missed" msgid="2997043831022028176">"Simu ambayo hukupokea"</string>
-    <string name="type_incoming_video" msgid="7507180294202642554">"Simu ya video inayoingia"</string>
-    <string name="type_incoming_video_pulled" msgid="7879031598844023977">"Simu ya video inayoingia imeelekezwa kwenye kifaa kingine"</string>
-    <string name="type_outgoing_video" msgid="309370072333983910">"Simu ya video uliyopiga"</string>
-    <string name="type_outgoing_video_pulled" msgid="3924450629684331345">"Simu ya video unayopiga imeelekezwa kwenye kifaa kingine"</string>
-    <string name="type_missed_video" msgid="4350107016317603785">"Simu ya video ambayo hukupokea"</string>
-    <string name="type_voicemail" msgid="1877524395253846684">"Ujumbe wa sauti"</string>
-    <string name="type_rejected" msgid="5632107438472996198">"Simu iliyokataliwa"</string>
-    <string name="type_blocked" msgid="9177237294052244929">"Simu iliyozuiwa"</string>
-    <string name="call_details_minutes_abbreviation" msgid="7899774555556720560">"dak"</string>
-    <string name="call_details_seconds_abbreviation" msgid="5893806826648947126">"sek"</string>
-    <string name="a11y_call_duration_format" msgid="2905525933361674470">"<xliff:g id="MINUTES_0">%d</xliff:g> <xliff:g id="MINUTES_TRANSLATION">%s</xliff:g> <xliff:g id="SECONDS_1">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="a11y_call_duration_short_format" msgid="5908875871251062453">"<xliff:g id="SECONDS_0">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="call_duration_format_pattern" msgid="7566375153243313914">"\'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\'<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>"</string>
-    <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>"</string>
-    <plurals name="a11y_seconds" formatted="false" msgid="6695730844760611970">
-      <item quantity="other">Sekunde</item>
-      <item quantity="one">Sekunde</item>
-    </plurals>
-    <plurals name="a11y_minutes" formatted="false" msgid="6377010096698624038">
-      <item quantity="other">Dakika</item>
-      <item quantity="one">Dakika</item>
-    </plurals>
-    <string name="type_answered_elsewhere" msgid="411958582555881640">"Simu uliyojibu kwenye kifaa kingine"</string>
-    <string name="description_phone_account" msgid="4382951172691362244">"kwenye <xliff:g id="PHONEACCOUNT">^1</xliff:g>"</string>
-    <string name="description_via_number" msgid="7682575124846343076">"kupitia <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="description_via_number_phone_account" msgid="4345445677508018830">"kwenye <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, kupitia <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="voicemail_string" msgid="6029775151483803006">"Ujumbe wa sauti"</string>
-    <string name="now" msgid="2599778506439006806">"Sasa"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="type_incoming">Simu inayoingia</string>
+  <string name="type_incoming_pulled">Simu inayoingia imeelekezwa kwenye kifaa kingine</string>
+  <string name="type_outgoing">Simu uliyopiga</string>
+  <string name="type_outgoing_pulled">Simu unayopiga imeelekezwa kwenye kifaa kingine</string>
+  <string name="type_missed">Simu ambayo hukupokea</string>
+  <string name="type_incoming_video">Simu ya video inayoingia</string>
+  <string name="type_incoming_video_pulled">Simu ya video inayoingia imeelekezwa kwenye kifaa kingine</string>
+  <string name="type_outgoing_video">Simu ya video uliyopiga</string>
+  <string name="type_outgoing_video_pulled">Simu ya video unayopiga imeelekezwa kwenye kifaa kingine</string>
+  <string name="type_missed_video">Simu ya video ambayo hukupokea</string>
+  <string name="type_voicemail">Ujumbe wa sauti</string>
+  <string name="type_rejected">Simu iliyokataliwa</string>
+  <string name="type_blocked">Simu iliyozuiwa</string>
+  <string name="call_details_minutes_abbreviation">dak</string>
+  <string name="call_details_seconds_abbreviation">sek</string>
+  <string name="a11y_call_duration_format">%1$d %2$s %3$d %4$s</string>
+  <string name="a11y_call_duration_short_format">%1$d %2$s</string>
+  <string name="call_duration_format_pattern">\'%2$s\'%1$s \'%4$s\'%3$s</string>
+  <string name="call_duration_short_format_pattern">\'%2$s\'%1$s</string>
+  <plurals name="a11y_seconds">
+    <item quantity="one">Sekunde</item>
+    <item quantity="other">Sekunde</item>
+  </plurals>
+  <plurals name="a11y_minutes">
+    <item quantity="one">Dakika</item>
+    <item quantity="other">Dakika</item>
+  </plurals>
+  <string name="type_answered_elsewhere">Simu uliyojibu kwenye kifaa kingine</string>
+  <string name="description_phone_account">kwenye ^1</string>
+  <string name="description_via_number">kupitia %1$s</string>
+  <string name="description_via_number_phone_account">kwenye %1$s, kupitia %2$s</string>
+  <string name="voicemail_string">Ujumbe wa sauti</string>
+  <string name="just_now">Sasa hivi</string>
+  <string name="new_call_log_carrier_video">Video kupitia mtoa huduma</string>
+  <string name="new_call_log_duo_video">Simu ya video ya Duo</string>
+  <string name="new_call_log_unknown">Haijulikani</string>
+  <string name="new_call_log_secondary_blocked">Zilizozuiwa</string>
+  <string name="new_call_log_secondary_spam">Taka</string>
+  <plurals name="a11y_new_call_log_entry_missed_call">
+    <item quantity="one">Simu ^1 kutoka kwa ^2 haikujibiwa</item>
+    <item quantity="other">Simu ^1, ya hivi punde ni simu kutoka kwa ^2 ambayo haikujibiwa</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_answered_call">
+    <item quantity="one">Simu ^1 kutoka kwa ^2 ilijibiwa</item>
+    <item quantity="other">Simu ^1, ya hivi punde ni simu kutoka kwa ^2 ambayo ilijibiwa</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_outgoing_call">
+    <item quantity="one">Simu ^1 aliyopigiwa ^2</item>
+    <item quantity="other">Simu ^1, ya hivi punde ni simu aliyopigiwa ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_blocked_call">
+    <item quantity="one">Simu ^1 iliyozuiwa kutoka kwa ^2</item>
+    <item quantity="other">Simu ^1, ya hivi punde ni simu kutoka kwa ^2 ambayo imezuiwa</item>
+  </plurals>
+  <string name="a11y_new_call_log_entry_phone_account">kwenye ^1, kupitia ^2</string>
+  <string name="a11y_new_call_log_entry_full_description_without_phone_account_info">^1, ^2.</string>
+  <string name="a11y_new_call_log_entry_full_description_with_phone_account_info">^1, ^2, ^3.</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-ta/strings.xml b/java/com/android/dialer/calllogutils/res/values-ta/strings.xml
index 481e4a9..ceb5070 100644
--- a/java/com/android/dialer/calllogutils/res/values-ta/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-ta/strings.xml
@@ -1,53 +1,61 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2017 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="type_incoming" msgid="5727636795656199810">"உள்வரும் அழைப்பு"</string>
-    <string name="type_incoming_pulled" msgid="8434723359163965796">"உள்வரும் அழைப்பு மற்றொரு சாதனத்திற்கு மாற்றப்பட்டது"</string>
-    <string name="type_outgoing" msgid="764896746073942963">"வெளிச்செல்லும் அழைப்பு"</string>
-    <string name="type_outgoing_pulled" msgid="1648517538371704193">"வெளிச்செல்லும் அழைப்பு மற்றொரு சாதனத்திற்கு மாற்றப்பட்டது"</string>
-    <string name="type_missed" msgid="2997043831022028176">"தவறிய அழைப்பு"</string>
-    <string name="type_incoming_video" msgid="7507180294202642554">"உள்வரும் வீடியோ அழைப்பு"</string>
-    <string name="type_incoming_video_pulled" msgid="7879031598844023977">"உள்வரும் வீடியோ அழைப்பு மற்றொரு சாதனத்திற்கு மாற்றப்பட்டது"</string>
-    <string name="type_outgoing_video" msgid="309370072333983910">"வெளிச்செல்லும் வீடியோ அழைப்பு"</string>
-    <string name="type_outgoing_video_pulled" msgid="3924450629684331345">"வெளிச்செல்லும் வீடியோ அழைப்பு மற்றொரு சாதனத்திற்கு மாற்றப்பட்டது"</string>
-    <string name="type_missed_video" msgid="4350107016317603785">"தவறிய வீடியோ அழைப்பு"</string>
-    <string name="type_voicemail" msgid="1877524395253846684">"குரலஞ்சல்"</string>
-    <string name="type_rejected" msgid="5632107438472996198">"நிராகரித்த அழைப்பு"</string>
-    <string name="type_blocked" msgid="9177237294052244929">"தடுத்த அழைப்பு"</string>
-    <string name="call_details_minutes_abbreviation" msgid="7899774555556720560">"நி"</string>
-    <string name="call_details_seconds_abbreviation" msgid="5893806826648947126">"வி"</string>
-    <string name="a11y_call_duration_format" msgid="2905525933361674470">"<xliff:g id="MINUTES_0">%d</xliff:g> <xliff:g id="MINUTES_TRANSLATION">%s</xliff:g> <xliff:g id="SECONDS_1">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="a11y_call_duration_short_format" msgid="5908875871251062453">"<xliff:g id="SECONDS_0">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <plurals name="a11y_seconds" formatted="false" msgid="6695730844760611970">
-      <item quantity="other">வினாடிகள்</item>
-      <item quantity="one">வினாடி</item>
-    </plurals>
-    <plurals name="a11y_minutes" formatted="false" msgid="6377010096698624038">
-      <item quantity="other">நிமிடங்கள்</item>
-      <item quantity="one">நிமிடம்</item>
-    </plurals>
-    <string name="type_answered_elsewhere" msgid="411958582555881640">"மற்றொரு சாதனத்திலிருந்து அழைப்பிற்குப் பதிலளித்தீர்கள்"</string>
-    <string name="description_phone_account" msgid="4382951172691362244">"<xliff:g id="PHONEACCOUNT">^1</xliff:g> இல்"</string>
-    <string name="description_via_number" msgid="7682575124846343076">"<xliff:g id="NUMBER">%1$s</xliff:g> மூலம்"</string>
-    <string name="description_via_number_phone_account" msgid="4345445677508018830">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> இல் <xliff:g id="NUMBER">%2$s</xliff:g> மூலம்"</string>
-    <string name="voicemail_string" msgid="6029775151483803006">"குரலஞ்சல்"</string>
-    <string name="now" msgid="2599778506439006806">"இப்போது"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="type_incoming">உள்வரும் அழைப்பு</string>
+  <string name="type_incoming_pulled">உள்வரும் அழைப்பு மற்றொரு சாதனத்திற்கு மாற்றப்பட்டது</string>
+  <string name="type_outgoing">வெளிச்செல்லும் அழைப்பு</string>
+  <string name="type_outgoing_pulled">வெளிச்செல்லும் அழைப்பு மற்றொரு சாதனத்திற்கு மாற்றப்பட்டது</string>
+  <string name="type_missed">தவறிய அழைப்பு</string>
+  <string name="type_incoming_video">உள்வரும் வீடியோ அழைப்பு</string>
+  <string name="type_incoming_video_pulled">உள்வரும் வீடியோ அழைப்பு மற்றொரு சாதனத்திற்கு மாற்றப்பட்டது</string>
+  <string name="type_outgoing_video">வெளிச்செல்லும் வீடியோ அழைப்பு</string>
+  <string name="type_outgoing_video_pulled">வெளிச்செல்லும் வீடியோ அழைப்பு மற்றொரு சாதனத்திற்கு மாற்றப்பட்டது</string>
+  <string name="type_missed_video">தவறிய வீடியோ அழைப்பு</string>
+  <string name="type_voicemail">குரலஞ்சல்</string>
+  <string name="type_rejected">நிராகரித்த அழைப்பு</string>
+  <string name="type_blocked">தடுத்த அழைப்பு</string>
+  <string name="call_details_minutes_abbreviation">நி</string>
+  <string name="call_details_seconds_abbreviation">வி</string>
+  <string name="a11y_call_duration_format">%1$d %2$s %3$d %4$s</string>
+  <string name="a11y_call_duration_short_format">%1$d %2$s</string>
+  <string name="call_duration_format_pattern">%1$s\'%2$s\' %3$s\'%4$s\'</string>
+  <string name="call_duration_short_format_pattern">%1$s\'%2$s\'</string>
+  <plurals name="a11y_seconds">
+    <item quantity="one">வினாடி</item>
+    <item quantity="other">வினாடிகள்</item>
+  </plurals>
+  <plurals name="a11y_minutes">
+    <item quantity="one">நிமிடம்</item>
+    <item quantity="other">நிமிடங்கள்</item>
+  </plurals>
+  <string name="type_answered_elsewhere">மற்றொரு சாதனத்திலிருந்து அழைப்பிற்குப் பதிலளித்தீர்கள்</string>
+  <string name="description_phone_account">^1 இல்</string>
+  <string name="description_via_number">%1$s மூலம்</string>
+  <string name="description_via_number_phone_account">%1$s இல் %2$s மூலம்</string>
+  <string name="voicemail_string">குரலஞ்சல்</string>
+  <string name="just_now">சற்றுமுன்</string>
+  <string name="new_call_log_carrier_video">தொலைத்தொடர்பு நிறுவன வீடியோ</string>
+  <string name="new_call_log_duo_video">Duo வீடியோ</string>
+  <string name="new_call_log_unknown">தெரியாத எண்கள்</string>
+  <string name="new_call_log_secondary_blocked">தடுக்கப்பட்டது</string>
+  <string name="new_call_log_secondary_spam">ஸ்பேம்</string>
+  <plurals name="a11y_new_call_log_entry_missed_call">
+    <item quantity="one">^2 இடமிருந்து வந்த ^1 தவறிய அழைப்பு</item>
+    <item quantity="other">^1 தவறிய அழைப்புகள், ^2 இடமிருந்து வந்த சமீபத்திய தவறிய அழைப்பு</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_answered_call">
+    <item quantity="one">^2 இடமிருந்து வந்த ^1 பதிலளித்த அழைப்பு</item>
+    <item quantity="other">^1 அழைப்புகள், சமீபத்திய அழைப்பானது ^2 இடமிருந்து வந்த பதிலளித்த அழைப்பு</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_outgoing_call">
+    <item quantity="one">^2க்கான ^1 வெளிச்செல்லும் அழைப்பு</item>
+    <item quantity="other">^1 அழைப்புகள், சமீபத்திய அழைப்பானது ^2க்கான வெளிச்செல்லும் அழைப்பு</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_blocked_call">
+    <item quantity="one">^2 இடமிருந்து வந்த ^1 தடுக்கப்பட்ட அழைப்பு</item>
+    <item quantity="other">^1 அழைப்புகள், சமீபத்திய அழைப்பானது ^2 இடமிருந்து தடுக்கப்பட்ட அழைப்பு</item>
+  </plurals>
+  <string name="a11y_new_call_log_entry_phone_account">^1 இல்,
+    ^2 மூலம்</string>
+  <string name="a11y_new_call_log_entry_full_description_without_phone_account_info">^1, ^2.</string>
+  <string name="a11y_new_call_log_entry_full_description_with_phone_account_info">^1, ^2, ^3.</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-te/strings.xml b/java/com/android/dialer/calllogutils/res/values-te/strings.xml
index bbea73b..c451432 100644
--- a/java/com/android/dialer/calllogutils/res/values-te/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-te/strings.xml
@@ -1,53 +1,61 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2017 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="type_incoming" msgid="5727636795656199810">"ఇన్‌కమింగ్ కాల్"</string>
-    <string name="type_incoming_pulled" msgid="8434723359163965796">"ఇన్‌కమింగ్ కాల్ మరొక పరికరానికి బదిలీ చేయబడింది"</string>
-    <string name="type_outgoing" msgid="764896746073942963">"అవుట్‌గోయింగ్ కాల్"</string>
-    <string name="type_outgoing_pulled" msgid="1648517538371704193">"అవుట్‌గోయింగ్ కాల్ మరొక పరికరానికి బదిలీ చేయబడింది"</string>
-    <string name="type_missed" msgid="2997043831022028176">"సమాధానమివ్వని కాల్"</string>
-    <string name="type_incoming_video" msgid="7507180294202642554">"ఇన్‌కమింగ్ వీడియో కాల్"</string>
-    <string name="type_incoming_video_pulled" msgid="7879031598844023977">"ఇన్‌కమింగ్ వీడియో కాల్ మరొక పరికరానికి బదిలీ చేయబడింది"</string>
-    <string name="type_outgoing_video" msgid="309370072333983910">"అవుట్‌గోయింగ్ వీడియో కాల్"</string>
-    <string name="type_outgoing_video_pulled" msgid="3924450629684331345">"అవుట్‌గోయింగ్ వీడియో కాల్ మరొక పరికరానికి బదిలీ చేయబడింది"</string>
-    <string name="type_missed_video" msgid="4350107016317603785">"సమాధానమివ్వని వీడియో కాల్‌"</string>
-    <string name="type_voicemail" msgid="1877524395253846684">"వాయిస్ మెయిల్"</string>
-    <string name="type_rejected" msgid="5632107438472996198">"నిరాకరించిన కాల్"</string>
-    <string name="type_blocked" msgid="9177237294052244929">"బ్లాక్ చేసిన కాల్"</string>
-    <string name="call_details_minutes_abbreviation" msgid="7899774555556720560">"ని"</string>
-    <string name="call_details_seconds_abbreviation" msgid="5893806826648947126">"సె"</string>
-    <string name="a11y_call_duration_format" msgid="2905525933361674470">"<xliff:g id="MINUTES_0">%d</xliff:g> <xliff:g id="MINUTES_TRANSLATION">%s</xliff:g> <xliff:g id="SECONDS_1">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="a11y_call_duration_short_format" msgid="5908875871251062453">"<xliff:g id="SECONDS_0">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <plurals name="a11y_seconds" formatted="false" msgid="6695730844760611970">
-      <item quantity="other">సెకన్లు</item>
-      <item quantity="one">సెకను</item>
-    </plurals>
-    <plurals name="a11y_minutes" formatted="false" msgid="6377010096698624038">
-      <item quantity="other">నిమిషాలు</item>
-      <item quantity="one">నిమిషం</item>
-    </plurals>
-    <string name="type_answered_elsewhere" msgid="411958582555881640">"కాల్‌కి మరొక పరికరంలో సమాధానం ఇవ్వబడింది"</string>
-    <string name="description_phone_account" msgid="4382951172691362244">"<xliff:g id="PHONEACCOUNT">^1</xliff:g>లో"</string>
-    <string name="description_via_number" msgid="7682575124846343076">"<xliff:g id="NUMBER">%1$s</xliff:g> ద్వారా"</string>
-    <string name="description_via_number_phone_account" msgid="4345445677508018830">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g>లో, <xliff:g id="NUMBER">%2$s</xliff:g> ద్వారా"</string>
-    <string name="voicemail_string" msgid="6029775151483803006">"వాయిస్ మెయిల్"</string>
-    <string name="now" msgid="2599778506439006806">"ఇప్పుడు"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="type_incoming">ఇన్‌కమింగ్ కాల్</string>
+  <string name="type_incoming_pulled">ఇన్‌కమింగ్ కాల్ మరొక పరికరానికి బదిలీ చేయబడింది</string>
+  <string name="type_outgoing">అవుట్‌గోయింగ్ కాల్</string>
+  <string name="type_outgoing_pulled">అవుట్‌గోయింగ్ కాల్ మరొక పరికరానికి బదిలీ చేయబడింది</string>
+  <string name="type_missed">సమాధానమివ్వని కాల్</string>
+  <string name="type_incoming_video">ఇన్‌కమింగ్ వీడియో కాల్</string>
+  <string name="type_incoming_video_pulled">ఇన్‌కమింగ్ వీడియో కాల్ మరొక పరికరానికి బదిలీ చేయబడింది</string>
+  <string name="type_outgoing_video">అవుట్‌గోయింగ్ వీడియో కాల్</string>
+  <string name="type_outgoing_video_pulled">అవుట్‌గోయింగ్ వీడియో కాల్ మరొక పరికరానికి బదిలీ చేయబడింది</string>
+  <string name="type_missed_video">సమాధానమివ్వని వీడియో కాల్‌</string>
+  <string name="type_voicemail">వాయిస్ మెయిల్</string>
+  <string name="type_rejected">నిరాకరించిన కాల్</string>
+  <string name="type_blocked">బ్లాక్ చేసిన కాల్</string>
+  <string name="call_details_minutes_abbreviation">ని</string>
+  <string name="call_details_seconds_abbreviation">సె</string>
+  <string name="a11y_call_duration_format">%1$d %2$s %3$d %4$s</string>
+  <string name="a11y_call_duration_short_format">%1$d %2$s</string>
+  <string name="call_duration_format_pattern">%1$s\'%2$s\' %3$s\'%4$s\'</string>
+  <string name="call_duration_short_format_pattern">%1$s\'%2$s\'</string>
+  <plurals name="a11y_seconds">
+    <item quantity="one">సెకను</item>
+    <item quantity="other">సెకన్లు</item>
+  </plurals>
+  <plurals name="a11y_minutes">
+    <item quantity="one">నిమిషం</item>
+    <item quantity="other">నిమిషాలు</item>
+  </plurals>
+  <string name="type_answered_elsewhere">కాల్‌కి మరొక పరికరంలో సమాధానం ఇవ్వబడింది</string>
+  <string name="description_phone_account">^1లో</string>
+  <string name="description_via_number">%1$s ద్వారా</string>
+  <string name="description_via_number_phone_account">%1$sలో, %2$s ద్వారా</string>
+  <string name="voicemail_string">వాయిస్ మెయిల్</string>
+  <string name="just_now">ఇప్పుడే</string>
+  <string name="new_call_log_carrier_video">క్యారియర్ వీడియో</string>
+  <string name="new_call_log_duo_video">Duo వీడియో</string>
+  <string name="new_call_log_unknown">తెలియదు</string>
+  <string name="new_call_log_secondary_blocked">బ్లాక్ చేయబడింది</string>
+  <string name="new_call_log_secondary_spam">స్పామ్</string>
+  <plurals name="a11y_new_call_log_entry_missed_call">
+    <item quantity="one">^2 నుండి ^1 మిస్డ్ కాల్</item>
+    <item quantity="other">^2 నుండి ^1 కాల్‌లు, తాజాది మిస్డ్ కాల్</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_answered_call">
+    <item quantity="one">^2 నుండి ^1 సమాధానం ఇచ్చిన కాల్</item>
+    <item quantity="other">^2 నుండి ^1 కాల్‌లు, తాజాది సమాధానం ఇచ్చిన కాల్</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_outgoing_call">
+    <item quantity="one">^2కు ^1 అవుట్‌గోయింగ్ కాల్</item>
+    <item quantity="other">^2కు ^1 కాల్‌లు, తాజాది అవుట్‌గోయింగ్ కాల్‌లు</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_blocked_call">
+    <item quantity="one">^2 నుండి ^1 బ్లాక్ చేయబడిన కాల్</item>
+    <item quantity="other">^2 నుండి ^1 కాల్‌లు, తాజాది బ్లాక్ చేయబడిన కాల్</item>
+  </plurals>
+  <string name="a11y_new_call_log_entry_phone_account">^1లో,
+    ^2 ద్వారా</string>
+  <string name="a11y_new_call_log_entry_full_description_without_phone_account_info">^1, ^2.</string>
+  <string name="a11y_new_call_log_entry_full_description_with_phone_account_info">^1, ^2, ^3.</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-th/strings.xml b/java/com/android/dialer/calllogutils/res/values-th/strings.xml
index 184cb26..b44fb87 100644
--- a/java/com/android/dialer/calllogutils/res/values-th/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-th/strings.xml
@@ -1,53 +1,60 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2017 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="type_incoming" msgid="5727636795656199810">"สายเรียกเข้า"</string>
-    <string name="type_incoming_pulled" msgid="8434723359163965796">"โอนสายเรียกเข้าไปยังอุปกรณ์เครื่องอื่นแล้ว"</string>
-    <string name="type_outgoing" msgid="764896746073942963">"สายโทรออก"</string>
-    <string name="type_outgoing_pulled" msgid="1648517538371704193">"โอนสายโทรออกไปยังอุปกรณ์เครื่องอื่นแล้ว"</string>
-    <string name="type_missed" msgid="2997043831022028176">"สายที่ไม่ได้รับ"</string>
-    <string name="type_incoming_video" msgid="7507180294202642554">"แฮงเอาท์วิดีโอเรียกเข้า"</string>
-    <string name="type_incoming_video_pulled" msgid="7879031598844023977">"โอนสายโทรเข้าแฮงเอาท์วิดีโอไปยังอุปกรณ์เครื่องอื่นแล้ว"</string>
-    <string name="type_outgoing_video" msgid="309370072333983910">"สายโทรออกแฮงเอาท์วิดีโอ"</string>
-    <string name="type_outgoing_video_pulled" msgid="3924450629684331345">"โอนสายโทรออกแฮงเอาท์วิดีโอไปยังอุปกรณ์เครื่องอื่นแล้ว"</string>
-    <string name="type_missed_video" msgid="4350107016317603785">"แฮงเอาท์วิดีโอที่ไม่ได้รับ"</string>
-    <string name="type_voicemail" msgid="1877524395253846684">"ข้อความเสียง"</string>
-    <string name="type_rejected" msgid="5632107438472996198">"สายที่ปฏิเสธ"</string>
-    <string name="type_blocked" msgid="9177237294052244929">"สายที่บล็อก"</string>
-    <string name="call_details_minutes_abbreviation" msgid="7899774555556720560">"น."</string>
-    <string name="call_details_seconds_abbreviation" msgid="5893806826648947126">"วิ"</string>
-    <string name="a11y_call_duration_format" msgid="2905525933361674470">"<xliff:g id="MINUTES_0">%d</xliff:g> <xliff:g id="MINUTES_TRANSLATION">%s</xliff:g> <xliff:g id="SECONDS_1">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="a11y_call_duration_short_format" msgid="5908875871251062453">"<xliff:g id="SECONDS_0">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <plurals name="a11y_seconds" formatted="false" msgid="6695730844760611970">
-      <item quantity="other">วินาที</item>
-      <item quantity="one">วินาที</item>
-    </plurals>
-    <plurals name="a11y_minutes" formatted="false" msgid="6377010096698624038">
-      <item quantity="other">นาที</item>
-      <item quantity="one">นาที</item>
-    </plurals>
-    <string name="type_answered_elsewhere" msgid="411958582555881640">"รับสายบนอุปกรณ์เครื่องอื่นแล้ว"</string>
-    <string name="description_phone_account" msgid="4382951172691362244">"ใน <xliff:g id="PHONEACCOUNT">^1</xliff:g>"</string>
-    <string name="description_via_number" msgid="7682575124846343076">"ผ่าน <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="description_via_number_phone_account" msgid="4345445677508018830">"ใน <xliff:g id="PHONEACCOUNT">%1$s</xliff:g> ผ่าน <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="voicemail_string" msgid="6029775151483803006">"ข้อความเสียง"</string>
-    <string name="now" msgid="2599778506439006806">"ตอนนี้"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="type_incoming">สายเรียกเข้า</string>
+  <string name="type_incoming_pulled">โอนสายเรียกเข้าไปยังอุปกรณ์เครื่องอื่นแล้ว</string>
+  <string name="type_outgoing">สายโทรออก</string>
+  <string name="type_outgoing_pulled">โอนสายโทรออกไปยังอุปกรณ์เครื่องอื่นแล้ว</string>
+  <string name="type_missed">สายที่ไม่ได้รับ</string>
+  <string name="type_incoming_video"> Hangouts วิดีโอเรียกเข้า</string>
+  <string name="type_incoming_video_pulled">โอนสายโทรเข้า Hangouts วิดีโอไปยังอุปกรณ์เครื่องอื่นแล้ว</string>
+  <string name="type_outgoing_video">สายโทรออก Hangouts วิดีโอ</string>
+  <string name="type_outgoing_video_pulled">โอนสายโทรออก Hangouts วิดีโอไปยังอุปกรณ์เครื่องอื่นแล้ว</string>
+  <string name="type_missed_video"> Hangouts วิดีโอที่ไม่ได้รับ</string>
+  <string name="type_voicemail">ข้อความเสียง</string>
+  <string name="type_rejected">สายที่ปฏิเสธ</string>
+  <string name="type_blocked">สายที่บล็อก</string>
+  <string name="call_details_minutes_abbreviation">น.</string>
+  <string name="call_details_seconds_abbreviation">วิ</string>
+  <string name="a11y_call_duration_format">%1$d %2$s %3$d %4$s</string>
+  <string name="a11y_call_duration_short_format">%1$d %2$s</string>
+  <string name="call_duration_format_pattern">%1$s\'%2$s\' %3$s\'%4$s\'</string>
+  <string name="call_duration_short_format_pattern">%1$s\'%2$s\'</string>
+  <plurals name="a11y_seconds">
+    <item quantity="one">วินาที</item>
+    <item quantity="other">วินาที</item>
+  </plurals>
+  <plurals name="a11y_minutes">
+    <item quantity="one">นาที</item>
+    <item quantity="other">นาที</item>
+  </plurals>
+  <string name="type_answered_elsewhere">รับสายบนอุปกรณ์เครื่องอื่นแล้ว</string>
+  <string name="description_phone_account">ใน ^1</string>
+  <string name="description_via_number">ผ่าน %1$s</string>
+  <string name="description_via_number_phone_account">ใน %1$s ผ่าน %2$s</string>
+  <string name="voicemail_string">ข้อความเสียง</string>
+  <string name="just_now">เมื่อสักครู่</string>
+  <string name="new_call_log_carrier_video">การโทรวิดีโอผ่านผู้ให้บริการ</string>
+  <string name="new_call_log_duo_video">วิดีโอคอลผ่าน Duo</string>
+  <string name="new_call_log_unknown">ไม่ทราบ</string>
+  <string name="new_call_log_secondary_blocked">ถูกบล็อก</string>
+  <string name="new_call_log_secondary_spam">สแปม</string>
+  <plurals name="a11y_new_call_log_entry_missed_call">
+    <item quantity="one">^1 สายที่ไม่ได้รับจาก ^2</item>
+    <item quantity="other">^1 สาย และสายที่ไม่ได้รับล่าสุดคือสายจาก ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_answered_call">
+    <item quantity="one">^1 สายที่ได้รับจาก ^2</item>
+    <item quantity="other">^1 สาย และสายที่ได้รับล่าสุดคือสายจาก ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_outgoing_call">
+    <item quantity="one">^1 สายโทรออกไปยัง ^2</item>
+    <item quantity="other">^1 สาย และสายที่โทรออกล่าสุดคือสายจาก ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_blocked_call">
+    <item quantity="one">^1 สายที่บล็อกจาก ^2</item>
+    <item quantity="other">^1 สาย และสายที่บล็อกล่าสุดคือสายจาก ^2</item>
+  </plurals>
+  <string name="a11y_new_call_log_entry_phone_account">ใน ^1 ผ่าน ^2</string>
+  <string name="a11y_new_call_log_entry_full_description_without_phone_account_info">^1, ^2</string>
+  <string name="a11y_new_call_log_entry_full_description_with_phone_account_info">^1, ^2, ^3</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-tl/strings.xml b/java/com/android/dialer/calllogutils/res/values-tl/strings.xml
index 19660a6..e655f1e 100644
--- a/java/com/android/dialer/calllogutils/res/values-tl/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-tl/strings.xml
@@ -1,53 +1,61 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2017 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="type_incoming" msgid="5727636795656199810">"Papasok na tawag"</string>
-    <string name="type_incoming_pulled" msgid="8434723359163965796">"Inilipat ang papasok na tawag sa isa pang device"</string>
-    <string name="type_outgoing" msgid="764896746073942963">"Papalabas na tawag"</string>
-    <string name="type_outgoing_pulled" msgid="1648517538371704193">"Inilipat ang papalabas na tawag sa isa pang device"</string>
-    <string name="type_missed" msgid="2997043831022028176">"Hindi nasagot na tawag"</string>
-    <string name="type_incoming_video" msgid="7507180294202642554">"Papasok na video call"</string>
-    <string name="type_incoming_video_pulled" msgid="7879031598844023977">"Inilipat ang papasok na video call sa isa pang device"</string>
-    <string name="type_outgoing_video" msgid="309370072333983910">"Papalabas na video call"</string>
-    <string name="type_outgoing_video_pulled" msgid="3924450629684331345">"Inilipat ang papalabas na video call sa isa pang device"</string>
-    <string name="type_missed_video" msgid="4350107016317603785">"Hindi nasagot na video call"</string>
-    <string name="type_voicemail" msgid="1877524395253846684">"Voicemail"</string>
-    <string name="type_rejected" msgid="5632107438472996198">"Tinanggihang tawag"</string>
-    <string name="type_blocked" msgid="9177237294052244929">"Naka-block na tawag"</string>
-    <string name="call_details_minutes_abbreviation" msgid="7899774555556720560">"m"</string>
-    <string name="call_details_seconds_abbreviation" msgid="5893806826648947126">"s"</string>
-    <string name="a11y_call_duration_format" msgid="2905525933361674470">"<xliff:g id="MINUTES_0">%d</xliff:g> <xliff:g id="MINUTES_TRANSLATION">%s</xliff:g> <xliff:g id="SECONDS_1">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="a11y_call_duration_short_format" msgid="5908875871251062453">"<xliff:g id="SECONDS_0">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <plurals name="a11y_seconds" formatted="false" msgid="6695730844760611970">
-      <item quantity="one">segundo</item>
-      <item quantity="other">na segundo</item>
-    </plurals>
-    <plurals name="a11y_minutes" formatted="false" msgid="6377010096698624038">
-      <item quantity="one">minuto</item>
-      <item quantity="other">na minuto</item>
-    </plurals>
-    <string name="type_answered_elsewhere" msgid="411958582555881640">"Sinagot ang tawag sa isa pang device"</string>
-    <string name="description_phone_account" msgid="4382951172691362244">"sa <xliff:g id="PHONEACCOUNT">^1</xliff:g>"</string>
-    <string name="description_via_number" msgid="7682575124846343076">"sa pamamagitan ng <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="description_via_number_phone_account" msgid="4345445677508018830">"sa <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, sa pamamagitan ng <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="voicemail_string" msgid="6029775151483803006">"Voicemail"</string>
-    <string name="now" msgid="2599778506439006806">"Ngayon"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="type_incoming">Papasok na tawag</string>
+  <string name="type_incoming_pulled">Inilipat ang papasok na tawag sa isa pang device</string>
+  <string name="type_outgoing">Papalabas na tawag</string>
+  <string name="type_outgoing_pulled">Inilipat ang papalabas na tawag sa isa pang device</string>
+  <string name="type_missed">Hindi nasagot na tawag</string>
+  <string name="type_incoming_video">Papasok na video call</string>
+  <string name="type_incoming_video_pulled">Inilipat ang papasok na video call sa isa pang device</string>
+  <string name="type_outgoing_video">Papalabas na video call</string>
+  <string name="type_outgoing_video_pulled">Inilipat ang papalabas na video call sa isa pang device</string>
+  <string name="type_missed_video">Hindi nasagot na video call</string>
+  <string name="type_voicemail">Voicemail</string>
+  <string name="type_rejected">Tinanggihang tawag</string>
+  <string name="type_blocked">Naka-block na tawag</string>
+  <string name="call_details_minutes_abbreviation">m</string>
+  <string name="call_details_seconds_abbreviation">s</string>
+  <string name="a11y_call_duration_format">%1$d %2$s %3$d %4$s</string>
+  <string name="a11y_call_duration_short_format">%1$d %2$s</string>
+  <string name="call_duration_format_pattern">%1$s\'%2$s\' %3$s\'%4$s\'</string>
+  <string name="call_duration_short_format_pattern">%1$s\'%2$s\'</string>
+  <plurals name="a11y_seconds">
+    <item quantity="one">segundo</item>
+    <item quantity="other">na segundo</item>
+  </plurals>
+  <plurals name="a11y_minutes">
+    <item quantity="one">minuto</item>
+    <item quantity="other">na minuto</item>
+  </plurals>
+  <string name="type_answered_elsewhere">Sinagot ang tawag sa isa pang device</string>
+  <string name="description_phone_account">sa ^1</string>
+  <string name="description_via_number">sa pamamagitan ng %1$s</string>
+  <string name="description_via_number_phone_account">sa %1$s, sa pamamagitan ng %2$s</string>
+  <string name="voicemail_string">Voicemail</string>
+  <string name="just_now">Ngayon lang</string>
+  <string name="new_call_log_carrier_video">Video call sa carrier</string>
+  <string name="new_call_log_duo_video">Video call sa Duo</string>
+  <string name="new_call_log_unknown">Hindi alam</string>
+  <string name="new_call_log_secondary_blocked">Naka-block</string>
+  <string name="new_call_log_secondary_spam">Spam</string>
+  <plurals name="a11y_new_call_log_entry_missed_call">
+    <item quantity="one">^1 tawag, ang pinakabago ay isang hindi nasagot na tawag mula kay ^2</item>
+    <item quantity="other">^1 na tawag, ang pinakabago ay isang hindi nasagot na tawag mula kay ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_answered_call">
+    <item quantity="one">^1 tawag, ang pinakabago ay isang nasagot na tawag mula kay ^2</item>
+    <item quantity="other">^1 na tawag, ang pinakabago ay isang nasagot na tawag mula kay ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_outgoing_call">
+    <item quantity="one">^1 tawag, ang pinakabago ay isang papalabas na tawag kay ^2</item>
+    <item quantity="other">^1 na tawag, ang pinakabago ay isang papalabas na tawag kay ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_blocked_call">
+    <item quantity="one">^1 tawag, ang pinakabago ay isang na-block na tawag mula kay ^2</item>
+    <item quantity="other">^1 na tawag, ang pinakabago ay isang na-block na tawag mula kay ^2</item>
+  </plurals>
+  <string name="a11y_new_call_log_entry_phone_account">sa ^1,
+    sa pamamagitan ng ^2</string>
+  <string name="a11y_new_call_log_entry_full_description_without_phone_account_info">^1, ^2.</string>
+  <string name="a11y_new_call_log_entry_full_description_with_phone_account_info">^1, ^2, ^3.</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-tr/strings.xml b/java/com/android/dialer/calllogutils/res/values-tr/strings.xml
index 6a6a1f7..1eea437 100644
--- a/java/com/android/dialer/calllogutils/res/values-tr/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-tr/strings.xml
@@ -1,53 +1,61 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2017 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="type_incoming" msgid="5727636795656199810">"Gelen çağrı"</string>
-    <string name="type_incoming_pulled" msgid="8434723359163965796">"Gelen çağrı başka bir cihaza aktarıldı"</string>
-    <string name="type_outgoing" msgid="764896746073942963">"Giden çağrı"</string>
-    <string name="type_outgoing_pulled" msgid="1648517538371704193">"Giden çağrı başka bir cihaza aktarıldı"</string>
-    <string name="type_missed" msgid="2997043831022028176">"Cevapsız çağrı"</string>
-    <string name="type_incoming_video" msgid="7507180294202642554">"Gelen görüntülü görüşme isteği"</string>
-    <string name="type_incoming_video_pulled" msgid="7879031598844023977">"Gelen görüntülü görüşme isteği başka bir cihaza aktarıldı"</string>
-    <string name="type_outgoing_video" msgid="309370072333983910">"Giden görüntülü görüşme isteği"</string>
-    <string name="type_outgoing_video_pulled" msgid="3924450629684331345">"Giden görüntülü görüşme isteği başka bir cihaza aktarıldı"</string>
-    <string name="type_missed_video" msgid="4350107016317603785">"Cevapsız görüntülü görüşme isteği"</string>
-    <string name="type_voicemail" msgid="1877524395253846684">"Sesli mesaj"</string>
-    <string name="type_rejected" msgid="5632107438472996198">"Reddedilen çağrı"</string>
-    <string name="type_blocked" msgid="9177237294052244929">"Engellenen çağrı"</string>
-    <string name="call_details_minutes_abbreviation" msgid="7899774555556720560">"dk."</string>
-    <string name="call_details_seconds_abbreviation" msgid="5893806826648947126">"sn."</string>
-    <string name="a11y_call_duration_format" msgid="2905525933361674470">"<xliff:g id="MINUTES_0">%d</xliff:g> <xliff:g id="MINUTES_TRANSLATION">%s</xliff:g> <xliff:g id="SECONDS_1">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="a11y_call_duration_short_format" msgid="5908875871251062453">"<xliff:g id="SECONDS_0">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <plurals name="a11y_seconds" formatted="false" msgid="6695730844760611970">
-      <item quantity="other">saniye</item>
-      <item quantity="one">saniye</item>
-    </plurals>
-    <plurals name="a11y_minutes" formatted="false" msgid="6377010096698624038">
-      <item quantity="other">dakika</item>
-      <item quantity="one">dakika</item>
-    </plurals>
-    <string name="type_answered_elsewhere" msgid="411958582555881640">"Çağrı başka bir cihazda cevaplandı"</string>
-    <string name="description_phone_account" msgid="4382951172691362244">"<xliff:g id="PHONEACCOUNT">^1</xliff:g> hesabında"</string>
-    <string name="description_via_number" msgid="7682575124846343076">"<xliff:g id="NUMBER">%1$s</xliff:g> kullanılarak"</string>
-    <string name="description_via_number_phone_account" msgid="4345445677508018830">"<xliff:g id="NUMBER">%2$s</xliff:g> kullanılarak <xliff:g id="PHONEACCOUNT">%1$s</xliff:g> hesabında"</string>
-    <string name="voicemail_string" msgid="6029775151483803006">"Sesli mesaj"</string>
-    <string name="now" msgid="2599778506439006806">"Şimdi"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="type_incoming">Gelen çağrı</string>
+  <string name="type_incoming_pulled">Gelen çağrı başka bir cihaza aktarıldı</string>
+  <string name="type_outgoing">Giden çağrı</string>
+  <string name="type_outgoing_pulled">Giden çağrı başka bir cihaza aktarıldı</string>
+  <string name="type_missed">Cevapsız çağrı</string>
+  <string name="type_incoming_video">Gelen görüntülü görüşme isteği</string>
+  <string name="type_incoming_video_pulled">Gelen görüntülü görüşme isteği başka bir cihaza aktarıldı</string>
+  <string name="type_outgoing_video">Giden görüntülü görüşme isteği</string>
+  <string name="type_outgoing_video_pulled">Giden görüntülü görüşme isteği başka bir cihaza aktarıldı</string>
+  <string name="type_missed_video">Cevapsız görüntülü görüşme isteği</string>
+  <string name="type_voicemail">Sesli mesaj</string>
+  <string name="type_rejected">Reddedilen çağrı</string>
+  <string name="type_blocked">Engellenen çağrı</string>
+  <string name="call_details_minutes_abbreviation">dk.</string>
+  <string name="call_details_seconds_abbreviation">sn.</string>
+  <string name="a11y_call_duration_format">%1$d %2$s %3$d %4$s</string>
+  <string name="a11y_call_duration_short_format">%1$d %2$s</string>
+  <string name="call_duration_format_pattern">%1$s \'%2$s\' %3$s \'%4$s\'</string>
+  <string name="call_duration_short_format_pattern">%1$s \'%2$s\'</string>
+  <plurals name="a11y_seconds">
+    <item quantity="one">saniye</item>
+    <item quantity="other">saniye</item>
+  </plurals>
+  <plurals name="a11y_minutes">
+    <item quantity="one">dakika</item>
+    <item quantity="other">dakika</item>
+  </plurals>
+  <string name="type_answered_elsewhere">Çağrı başka bir cihazda cevaplandı</string>
+  <string name="description_phone_account">^1 hesabında</string>
+  <string name="description_via_number">%1$s kullanılarak</string>
+  <string name="description_via_number_phone_account">%2$s kullanılarak %1$s hesabında</string>
+  <string name="voicemail_string">Sesli mesaj</string>
+  <string name="just_now">Az önce</string>
+  <string name="new_call_log_carrier_video">Operatör görüntülü görüşmesi</string>
+  <string name="new_call_log_duo_video">Duo görüntülü görüşmesi</string>
+  <string name="new_call_log_unknown">Bilinmeyen</string>
+  <string name="new_call_log_secondary_blocked">Engellenmiş</string>
+  <string name="new_call_log_secondary_spam">Spam</string>
+  <plurals name="a11y_new_call_log_entry_missed_call">
+    <item quantity="one">^1 cevapsız arama, arayan: ^2</item>
+    <item quantity="other">^1 arama, son cevapsız arama: ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_answered_call">
+    <item quantity="one">^1 cevaplanmış arama, arayan: ^2</item>
+    <item quantity="other">^1 arama, son cevaplanmış arama: ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_outgoing_call">
+    <item quantity="one">^1 giden arama, aranan: ^2</item>
+    <item quantity="other">^1 arama, son giden arama: ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_blocked_call">
+    <item quantity="one">^1 engellenmiş arama, arayan: ^2</item>
+    <item quantity="other">^1 arama, son engellenmiş arama: ^2</item>
+  </plurals>
+  <string name="a11y_new_call_log_entry_phone_account">^2 kullanılarak
+    ^1 hesabında</string>
+  <string name="a11y_new_call_log_entry_full_description_without_phone_account_info">^1, ^2.</string>
+  <string name="a11y_new_call_log_entry_full_description_with_phone_account_info">^1, ^2, ^3.</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-uk/strings.xml b/java/com/android/dialer/calllogutils/res/values-uk/strings.xml
index b2026c8..d616c32 100644
--- a/java/com/android/dialer/calllogutils/res/values-uk/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-uk/strings.xml
@@ -1,57 +1,73 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2017 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="type_incoming" msgid="5727636795656199810">"Вхідний дзвінок"</string>
-    <string name="type_incoming_pulled" msgid="8434723359163965796">"Вхідний дзвінок перенесено на інший пристрій"</string>
-    <string name="type_outgoing" msgid="764896746073942963">"Вихідний дзвінок"</string>
-    <string name="type_outgoing_pulled" msgid="1648517538371704193">"Вихідний дзвінок перенесено на інший пристрій"</string>
-    <string name="type_missed" msgid="2997043831022028176">"Пропущений дзвінок"</string>
-    <string name="type_incoming_video" msgid="7507180294202642554">"Вхідний відеодзвінок"</string>
-    <string name="type_incoming_video_pulled" msgid="7879031598844023977">"Вхідний відеодзвінок перенесено на інший пристрій"</string>
-    <string name="type_outgoing_video" msgid="309370072333983910">"Вихідний відеодзвінок"</string>
-    <string name="type_outgoing_video_pulled" msgid="3924450629684331345">"Вихідний відеодзвінок перенесено на інший пристрій"</string>
-    <string name="type_missed_video" msgid="4350107016317603785">"Пропущений відеодзвінок"</string>
-    <string name="type_voicemail" msgid="1877524395253846684">"Голосова пошта"</string>
-    <string name="type_rejected" msgid="5632107438472996198">"Відхилений дзвінок"</string>
-    <string name="type_blocked" msgid="9177237294052244929">"Заблокований дзвінок"</string>
-    <string name="call_details_minutes_abbreviation" msgid="7899774555556720560">"хв"</string>
-    <string name="call_details_seconds_abbreviation" msgid="5893806826648947126">"с"</string>
-    <string name="a11y_call_duration_format" msgid="2905525933361674470">"<xliff:g id="MINUTES_0">%d</xliff:g> <xliff:g id="MINUTES_TRANSLATION">%s</xliff:g> <xliff:g id="SECONDS_1">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="a11y_call_duration_short_format" msgid="5908875871251062453">"<xliff:g id="SECONDS_0">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <plurals name="a11y_seconds" formatted="false" msgid="6695730844760611970">
-      <item quantity="one">секунда</item>
-      <item quantity="few">секунди</item>
-      <item quantity="many">секунд</item>
-      <item quantity="other">секунди</item>
-    </plurals>
-    <plurals name="a11y_minutes" formatted="false" msgid="6377010096698624038">
-      <item quantity="one">хвилина</item>
-      <item quantity="few">хвилини</item>
-      <item quantity="many">хвилин</item>
-      <item quantity="other">хвилини</item>
-    </plurals>
-    <string name="type_answered_elsewhere" msgid="411958582555881640">"Виклик прийнято на іншому пристрої"</string>
-    <string name="description_phone_account" msgid="4382951172691362244">"на <xliff:g id="PHONEACCOUNT">^1</xliff:g>"</string>
-    <string name="description_via_number" msgid="7682575124846343076">"на номер <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="description_via_number_phone_account" msgid="4345445677508018830">"на <xliff:g id="PHONEACCOUNT">%1$s</xliff:g> на номер <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="voicemail_string" msgid="6029775151483803006">"Голосова пошта"</string>
-    <string name="now" msgid="2599778506439006806">"Зараз"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="type_incoming">Вхідний дзвінок</string>
+  <string name="type_incoming_pulled">Вхідний дзвінок перенесено на інший пристрій</string>
+  <string name="type_outgoing">Вихідний дзвінок</string>
+  <string name="type_outgoing_pulled">Вихідний дзвінок перенесено на інший пристрій</string>
+  <string name="type_missed">Пропущений дзвінок</string>
+  <string name="type_incoming_video">Вхідний відеодзвінок</string>
+  <string name="type_incoming_video_pulled">Вхідний відеодзвінок перенесено на інший пристрій</string>
+  <string name="type_outgoing_video">Вихідний відеодзвінок</string>
+  <string name="type_outgoing_video_pulled">Вихідний відеодзвінок перенесено на інший пристрій</string>
+  <string name="type_missed_video">Пропущений відеодзвінок</string>
+  <string name="type_voicemail">Голосова пошта</string>
+  <string name="type_rejected">Відхилений дзвінок</string>
+  <string name="type_blocked">Заблокований дзвінок</string>
+  <string name="call_details_minutes_abbreviation">хв</string>
+  <string name="call_details_seconds_abbreviation">с</string>
+  <string name="a11y_call_duration_format">%1$d %2$s %3$d %4$s</string>
+  <string name="a11y_call_duration_short_format">%1$d %2$s</string>
+  <string name="call_duration_format_pattern">%1$s\'%2$s\' %3$s\'%4$s\'</string>
+  <string name="call_duration_short_format_pattern">%1$s\'%2$s\'</string>
+  <plurals name="a11y_seconds">
+    <item quantity="one">секунда</item>
+    <item quantity="few">секунди</item>
+    <item quantity="many">секунд</item>
+    <item quantity="other">секунди</item>
+  </plurals>
+  <plurals name="a11y_minutes">
+    <item quantity="one">хвилина</item>
+    <item quantity="few">хвилини</item>
+    <item quantity="many">хвилин</item>
+    <item quantity="other">хвилини</item>
+  </plurals>
+  <string name="type_answered_elsewhere">Виклик прийнято на іншому пристрої</string>
+  <string name="description_phone_account">на ^1</string>
+  <string name="description_via_number">на номер %1$s</string>
+  <string name="description_via_number_phone_account">на %1$s на номер %2$s</string>
+  <string name="voicemail_string">Голосова пошта</string>
+  <string name="just_now">Щойно</string>
+  <string name="new_call_log_carrier_video">Відеодзвінок через оператора</string>
+  <string name="new_call_log_duo_video">Відеодзвінок Duo</string>
+  <string name="new_call_log_unknown">Невідомо</string>
+  <string name="new_call_log_secondary_blocked">Заблоковані</string>
+  <string name="new_call_log_secondary_spam">Спам</string>
+  <plurals name="a11y_new_call_log_entry_missed_call">
+    <item quantity="one">^1 виклик, останній – пропущений дзвінок від користувача ^2</item>
+    <item quantity="few">^1 виклики, останній – пропущений дзвінок від користувача ^2</item>
+    <item quantity="many">^1 викликів, останній – пропущений дзвінок від користувача ^2</item>
+    <item quantity="other">^1 виклику, останній – пропущений дзвінок від користувача ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_answered_call">
+    <item quantity="one">^1 виклик, останній – прийнятий дзвінок від користувача ^2</item>
+    <item quantity="few">^1 виклики, останній – прийнятий дзвінок від користувача ^2</item>
+    <item quantity="many">^1 викликів, останній – прийнятий дзвінок від користувача ^2</item>
+    <item quantity="other">^1 виклику, останній – прийнятий дзвінок від користувача ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_outgoing_call">
+    <item quantity="one">^1 виклик, останній – вихідний дзвінок користувачу ^2</item>
+    <item quantity="few">^1 виклики, останній – вихідний дзвінок користувачу ^2</item>
+    <item quantity="many">^1 викликів, останній – вихідний дзвінок користувачу ^2</item>
+    <item quantity="other">^1 виклику, останній – вихідний дзвінок користувачу ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_blocked_call">
+    <item quantity="one">^1 виклик, останній – заблокований дзвінок від користувача ^2</item>
+    <item quantity="few">^1 виклики, останній – заблокований дзвінок від користувача ^2</item>
+    <item quantity="many">^1 викликів, останній – заблокований дзвінок від користувача ^2</item>
+    <item quantity="other">^1 виклику, останній – заблокований дзвінок від користувача ^2</item>
+  </plurals>
+  <string name="a11y_new_call_log_entry_phone_account">обліковий запис: ^1,
+    номер: ^2</string>
+  <string name="a11y_new_call_log_entry_full_description_without_phone_account_info">^1, ^2.</string>
+  <string name="a11y_new_call_log_entry_full_description_with_phone_account_info">^1, ^2, ^3.</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-ur/strings.xml b/java/com/android/dialer/calllogutils/res/values-ur/strings.xml
index d110d22..99981b2 100644
--- a/java/com/android/dialer/calllogutils/res/values-ur/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-ur/strings.xml
@@ -1,53 +1,61 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2017 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="type_incoming" msgid="5727636795656199810">"آنے والی کال"</string>
-    <string name="type_incoming_pulled" msgid="8434723359163965796">"آنے والی کال ایک اور آلہ پر منتقل ہو گئی"</string>
-    <string name="type_outgoing" msgid="764896746073942963">"باہر جانے والی کال"</string>
-    <string name="type_outgoing_pulled" msgid="1648517538371704193">"جانے والی کال ایک اور آلہ پر منتقل ہو گئی"</string>
-    <string name="type_missed" msgid="2997043831022028176">"چھوٹی ہوئی کال"</string>
-    <string name="type_incoming_video" msgid="7507180294202642554">"آنے والی ویڈیو کال"</string>
-    <string name="type_incoming_video_pulled" msgid="7879031598844023977">"آنے والی ویڈیو کال ایک اور آلہ پر منتقل ہو گئی"</string>
-    <string name="type_outgoing_video" msgid="309370072333983910">"جانے والی ویڈیو کال"</string>
-    <string name="type_outgoing_video_pulled" msgid="3924450629684331345">"جانے والی ویڈیو کال ایک اور آلہ پر منتقل ہو گئی"</string>
-    <string name="type_missed_video" msgid="4350107016317603785">"چھوٹی ہوئی ویڈیو کال"</string>
-    <string name="type_voicemail" msgid="1877524395253846684">"صوتی میل"</string>
-    <string name="type_rejected" msgid="5632107438472996198">"مسترد شدہ کال"</string>
-    <string name="type_blocked" msgid="9177237294052244929">"مسدود شدہ کال"</string>
-    <string name="call_details_minutes_abbreviation" msgid="7899774555556720560">"منٹ"</string>
-    <string name="call_details_seconds_abbreviation" msgid="5893806826648947126">"سیکنڈ"</string>
-    <string name="a11y_call_duration_format" msgid="2905525933361674470">"<xliff:g id="MINUTES_0">%d</xliff:g> <xliff:g id="MINUTES_TRANSLATION">%s</xliff:g> <xliff:g id="SECONDS_1">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="a11y_call_duration_short_format" msgid="5908875871251062453">"<xliff:g id="SECONDS_0">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'‎"</string>
-    <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'‎"</string>
-    <plurals name="a11y_seconds" formatted="false" msgid="6695730844760611970">
-      <item quantity="other">سیکنڈز</item>
-      <item quantity="one">سیکنڈ</item>
-    </plurals>
-    <plurals name="a11y_minutes" formatted="false" msgid="6377010096698624038">
-      <item quantity="other">منٹس</item>
-      <item quantity="one">منٹ</item>
-    </plurals>
-    <string name="type_answered_elsewhere" msgid="411958582555881640">"کال کا جواب ایک اور آلہ پر دیا گیا"</string>
-    <string name="description_phone_account" msgid="4382951172691362244">"<xliff:g id="PHONEACCOUNT">^1</xliff:g> پر"</string>
-    <string name="description_via_number" msgid="7682575124846343076">"بذریعہ <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="description_via_number_phone_account" msgid="4345445677508018830">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g> پر، بذریعہ <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="voicemail_string" msgid="6029775151483803006">"صوتی میل"</string>
-    <string name="now" msgid="2599778506439006806">"ابھی"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="type_incoming">آنے والی کال</string>
+  <string name="type_incoming_pulled">آنے والی کال ایک اور آلہ پر منتقل ہو گئی</string>
+  <string name="type_outgoing">باہر جانے والی کال</string>
+  <string name="type_outgoing_pulled">جانے والی کال ایک اور آلہ پر منتقل ہو گئی</string>
+  <string name="type_missed">چھوٹی ہوئی کال</string>
+  <string name="type_incoming_video">آنے والی ویڈیو کال</string>
+  <string name="type_incoming_video_pulled">آنے والی ویڈیو کال ایک اور آلہ پر منتقل ہو گئی</string>
+  <string name="type_outgoing_video">جانے والی ویڈیو کال</string>
+  <string name="type_outgoing_video_pulled">جانے والی ویڈیو کال ایک اور آلہ پر منتقل ہو گئی</string>
+  <string name="type_missed_video">چھوٹی ہوئی ویڈیو کال</string>
+  <string name="type_voicemail">صوتی میل</string>
+  <string name="type_rejected">مسترد شدہ کال</string>
+  <string name="type_blocked">مسدود شدہ کال</string>
+  <string name="call_details_minutes_abbreviation">منٹ</string>
+  <string name="call_details_seconds_abbreviation">سیکنڈ</string>
+  <string name="a11y_call_duration_format">%1$d %2$s %3$d %4$s</string>
+  <string name="a11y_call_duration_short_format">%1$d %2$s</string>
+  <string name="call_duration_format_pattern">%1$s \'%2$s\' %3$s \'%4$s\'‎</string>
+  <string name="call_duration_short_format_pattern">%1$s \'%2$s\'‎</string>
+  <plurals name="a11y_seconds">
+    <item quantity="one">سیکنڈ</item>
+    <item quantity="other">سیکنڈز</item>
+  </plurals>
+  <plurals name="a11y_minutes">
+    <item quantity="one">منٹ</item>
+    <item quantity="other">منٹس</item>
+  </plurals>
+  <string name="type_answered_elsewhere">کال کا جواب ایک اور آلہ پر دیا گیا</string>
+  <string name="description_phone_account">^1 پر</string>
+  <string name="description_via_number">بذریعہ %1$s</string>
+  <string name="description_via_number_phone_account">%1$s پر، بذریعہ %2$s</string>
+  <string name="voicemail_string">صوتی میل</string>
+  <string name="just_now">ابھی ابھی</string>
+  <string name="new_call_log_carrier_video">کیرئیر ویڈیو</string>
+  <string name="new_call_log_duo_video">‏Duo ویڈیو</string>
+  <string name="new_call_log_unknown">نامعلوم</string>
+  <string name="new_call_log_secondary_blocked">مسدود</string>
+  <string name="new_call_log_secondary_spam">اسپام</string>
+  <plurals name="a11y_new_call_log_entry_missed_call">
+    <item quantity="one">^2 کی جانب سے ^1 چھوٹی ہوئی کال</item>
+    <item quantity="other">^1 کالز، تازہ ترین ^2 کی جانب سے چھوٹی ہوئی کال ہے</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_answered_call">
+    <item quantity="one">^2 کی جانب سے ^1 جواب دی گئی کالز</item>
+    <item quantity="other">^1 کالز، تازہ ترین ^2 کی جانب سے جواب دی گئی کال ہے</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_outgoing_call">
+    <item quantity="one">^2 کو باہر جانے والی ^1 کال</item>
+    <item quantity="other">^1 کالز، تازہ ترین ^2 کو باہر جانے والی کال ہے</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_blocked_call">
+    <item quantity="one">^2 کی جانب سے ^1 مسدود کردہ کال</item>
+    <item quantity="other">^1 کالز، تازہ ترین ^2 کی جانب سے مسدود کردہ کال ہے</item>
+  </plurals>
+  <string name="a11y_new_call_log_entry_phone_account">^1 پر،
+    بذریعہ ^2</string>
+  <string name="a11y_new_call_log_entry_full_description_without_phone_account_info">^1، ^2۔</string>
+  <string name="a11y_new_call_log_entry_full_description_with_phone_account_info">^1، ^2، ^3۔</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-uz/strings.xml b/java/com/android/dialer/calllogutils/res/values-uz/strings.xml
index dec5060..fb5191f 100644
--- a/java/com/android/dialer/calllogutils/res/values-uz/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-uz/strings.xml
@@ -1,53 +1,60 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2017 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="type_incoming" msgid="5727636795656199810">"Kiruvchi chaqiruv"</string>
-    <string name="type_incoming_pulled" msgid="8434723359163965796">"Kiruvchi chaqiruv boshqa qurilmaga o‘tkazildi"</string>
-    <string name="type_outgoing" msgid="764896746073942963">"Chiquvchi chaqiruv"</string>
-    <string name="type_outgoing_pulled" msgid="1648517538371704193">"Chiquvchi chaqiruv boshqa qurilmaga o‘tkazildi"</string>
-    <string name="type_missed" msgid="2997043831022028176">"Javobsiz chaqiruv"</string>
-    <string name="type_incoming_video" msgid="7507180294202642554">"Kiruvchi videochaqiruv"</string>
-    <string name="type_incoming_video_pulled" msgid="7879031598844023977">"Kiruvchi videochaqiruv boshqa qurilmaga o‘tkazildi"</string>
-    <string name="type_outgoing_video" msgid="309370072333983910">"Chiquvchi videochaqiruv"</string>
-    <string name="type_outgoing_video_pulled" msgid="3924450629684331345">"Chiquvchi videochaqiruv boshqa qurilmaga o‘tkazildi"</string>
-    <string name="type_missed_video" msgid="4350107016317603785">"Javobsiz video chaqiruv"</string>
-    <string name="type_voicemail" msgid="1877524395253846684">"Ovozli pochta"</string>
-    <string name="type_rejected" msgid="5632107438472996198">"Rad etilgan chaqiruv"</string>
-    <string name="type_blocked" msgid="9177237294052244929">"Bloklangan chaqiruv"</string>
-    <string name="call_details_minutes_abbreviation" msgid="7899774555556720560">"daq."</string>
-    <string name="call_details_seconds_abbreviation" msgid="5893806826648947126">"son."</string>
-    <string name="a11y_call_duration_format" msgid="2905525933361674470">"<xliff:g id="MINUTES_0">%d</xliff:g> <xliff:g id="MINUTES_TRANSLATION">%s</xliff:g> <xliff:g id="SECONDS_1">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="a11y_call_duration_short_format" msgid="5908875871251062453">"<xliff:g id="SECONDS_0">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <plurals name="a11y_seconds" formatted="false" msgid="6695730844760611970">
-      <item quantity="other">soniya</item>
-      <item quantity="one">soniya</item>
-    </plurals>
-    <plurals name="a11y_minutes" formatted="false" msgid="6377010096698624038">
-      <item quantity="other">daqiqa</item>
-      <item quantity="one">daqiqa</item>
-    </plurals>
-    <string name="type_answered_elsewhere" msgid="411958582555881640">"Chaqiruvga boshqa qurilmadan javob berildi"</string>
-    <string name="description_phone_account" msgid="4382951172691362244">"<xliff:g id="PHONEACCOUNT">^1</xliff:g> orqali"</string>
-    <string name="description_via_number" msgid="7682575124846343076">"<xliff:g id="NUMBER">%1$s</xliff:g> raqami orqali"</string>
-    <string name="description_via_number_phone_account" msgid="4345445677508018830">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, <xliff:g id="NUMBER">%2$s</xliff:g> raqami orqali"</string>
-    <string name="voicemail_string" msgid="6029775151483803006">"Ovozli pochta"</string>
-    <string name="now" msgid="2599778506439006806">"Hozir"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="type_incoming">Kiruvchi chaqiruv</string>
+  <string name="type_incoming_pulled">Kiruvchi chaqiruv boshqa qurilmaga o‘tkazildi</string>
+  <string name="type_outgoing">Chiquvchi chaqiruv</string>
+  <string name="type_outgoing_pulled">Chiquvchi chaqiruv boshqa qurilmaga o‘tkazildi</string>
+  <string name="type_missed">Javobsiz chaqiruv</string>
+  <string name="type_incoming_video">Kiruvchi videochaqiruv</string>
+  <string name="type_incoming_video_pulled">Kiruvchi videochaqiruv boshqa qurilmaga o‘tkazildi</string>
+  <string name="type_outgoing_video">Chiquvchi videochaqiruv</string>
+  <string name="type_outgoing_video_pulled">Chiquvchi videochaqiruv boshqa qurilmaga o‘tkazildi</string>
+  <string name="type_missed_video">Javobsiz video chaqiruv</string>
+  <string name="type_voicemail">Ovozli pochta</string>
+  <string name="type_rejected">Rad etilgan chaqiruv</string>
+  <string name="type_blocked">Bloklangan chaqiruv</string>
+  <string name="call_details_minutes_abbreviation">daq.</string>
+  <string name="call_details_seconds_abbreviation">son.</string>
+  <string name="a11y_call_duration_format">%1$d %2$s %3$d %4$s</string>
+  <string name="a11y_call_duration_short_format">%1$d %2$s</string>
+  <string name="call_duration_format_pattern">%1$s\'%2$s\' %3$s\'%4$s\'</string>
+  <string name="call_duration_short_format_pattern">%1$s\'%2$s\'</string>
+  <plurals name="a11y_seconds">
+    <item quantity="one">soniya</item>
+    <item quantity="other">soniya</item>
+  </plurals>
+  <plurals name="a11y_minutes">
+    <item quantity="one">daqiqa</item>
+    <item quantity="other">daqiqa</item>
+  </plurals>
+  <string name="type_answered_elsewhere">Chaqiruvga boshqa qurilmadan javob berildi</string>
+  <string name="description_phone_account">^1 orqali</string>
+  <string name="description_via_number">%1$s raqami orqali</string>
+  <string name="description_via_number_phone_account">%1$s, %2$s raqami orqali</string>
+  <string name="voicemail_string">Ovozli pochta</string>
+  <string name="just_now">Hozirgina</string>
+  <string name="new_call_log_carrier_video">Operator orqali video chaqiruv</string>
+  <string name="new_call_log_duo_video">Duo orqali video chaqiruv</string>
+  <string name="new_call_log_unknown">Noma’lum raqam</string>
+  <string name="new_call_log_secondary_blocked">Bloklanganlar</string>
+  <string name="new_call_log_secondary_spam">Spam</string>
+  <plurals name="a11y_new_call_log_entry_missed_call">
+    <item quantity="one">^2: ^1 ta javobsiz chaqiruv</item>
+    <item quantity="other">^2: ^1 ta chaqiruv. Oxirgisi javobsiz.</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_answered_call">
+    <item quantity="one">^2: ^1 ta javob berilgan chaqiruv</item>
+    <item quantity="other">^2: ^1 ta chaqiruv. Oxirgisiga javob berildi.</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_outgoing_call">
+    <item quantity="one">^2: ^1 ta chiquvchi chaqiruv</item>
+    <item quantity="other">^2: ^1 ta chaqiruv. Oxirigisi chiquvchi.</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_blocked_call">
+    <item quantity="one">^2: ^1 ta bloklangan chaqiruv</item>
+    <item quantity="other">^2: ^1 ta chaqiruv. Oxirgisi bloklandi.</item>
+  </plurals>
+  <string name="a11y_new_call_log_entry_phone_account">^1, ^2 raqami orqali</string>
+  <string name="a11y_new_call_log_entry_full_description_without_phone_account_info">^1, ^2.</string>
+  <string name="a11y_new_call_log_entry_full_description_with_phone_account_info">^1, ^2, ^3.</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-vi/strings.xml b/java/com/android/dialer/calllogutils/res/values-vi/strings.xml
index 14d9695..5a77c96 100644
--- a/java/com/android/dialer/calllogutils/res/values-vi/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-vi/strings.xml
@@ -1,53 +1,61 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2017 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="type_incoming" msgid="5727636795656199810">"Cuộc gọi đến"</string>
-    <string name="type_incoming_pulled" msgid="8434723359163965796">"Đã chuyển cuộc gọi đến tới thiết bị khác"</string>
-    <string name="type_outgoing" msgid="764896746073942963">"Cuộc gọi đi"</string>
-    <string name="type_outgoing_pulled" msgid="1648517538371704193">"Đã chuyển cuộc gọi đi tới thiết bị khác"</string>
-    <string name="type_missed" msgid="2997043831022028176">"Cuộc gọi nhỡ"</string>
-    <string name="type_incoming_video" msgid="7507180294202642554">"Cuộc gọi điện video đến"</string>
-    <string name="type_incoming_video_pulled" msgid="7879031598844023977">"Đã chuyển cuộc gọi điện video đến tới thiết bị khác"</string>
-    <string name="type_outgoing_video" msgid="309370072333983910">"Cuộc gọi điện video đi"</string>
-    <string name="type_outgoing_video_pulled" msgid="3924450629684331345">"Đã chuyển cuộc gọi điện video đi tới thiết bị khác"</string>
-    <string name="type_missed_video" msgid="4350107016317603785">"Cuộc gọi điện video bị nhỡ"</string>
-    <string name="type_voicemail" msgid="1877524395253846684">"Thư thoại"</string>
-    <string name="type_rejected" msgid="5632107438472996198">"Cuộc gọi bị từ chối"</string>
-    <string name="type_blocked" msgid="9177237294052244929">"Cuộc gọi bị chặn"</string>
-    <string name="call_details_minutes_abbreviation" msgid="7899774555556720560">"phút"</string>
-    <string name="call_details_seconds_abbreviation" msgid="5893806826648947126">"giây"</string>
-    <string name="a11y_call_duration_format" msgid="2905525933361674470">"<xliff:g id="MINUTES_0">%d</xliff:g> <xliff:g id="MINUTES_TRANSLATION">%s</xliff:g> <xliff:g id="SECONDS_1">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="a11y_call_duration_short_format" msgid="5908875871251062453">"<xliff:g id="SECONDS_0">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <plurals name="a11y_seconds" formatted="false" msgid="6695730844760611970">
-      <item quantity="other">giây</item>
-      <item quantity="one">giây</item>
-    </plurals>
-    <plurals name="a11y_minutes" formatted="false" msgid="6377010096698624038">
-      <item quantity="other">phút</item>
-      <item quantity="one">phút</item>
-    </plurals>
-    <string name="type_answered_elsewhere" msgid="411958582555881640">"Đã trả lời cuộc gọi trên thiết bị khác"</string>
-    <string name="description_phone_account" msgid="4382951172691362244">"trên <xliff:g id="PHONEACCOUNT">^1</xliff:g>"</string>
-    <string name="description_via_number" msgid="7682575124846343076">"qua <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="description_via_number_phone_account" msgid="4345445677508018830">"trên <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, qua <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="voicemail_string" msgid="6029775151483803006">"Thư thoại"</string>
-    <string name="now" msgid="2599778506439006806">"Bây giờ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="type_incoming">Cuộc gọi đến</string>
+  <string name="type_incoming_pulled">Đã chuyển cuộc gọi đến tới thiết bị khác</string>
+  <string name="type_outgoing">Cuộc gọi đi</string>
+  <string name="type_outgoing_pulled">Đã chuyển cuộc gọi đi tới thiết bị khác</string>
+  <string name="type_missed">Cuộc gọi nhỡ</string>
+  <string name="type_incoming_video">Cuộc gọi điện video đến</string>
+  <string name="type_incoming_video_pulled">Đã chuyển cuộc gọi điện video đến tới thiết bị khác</string>
+  <string name="type_outgoing_video">Cuộc gọi điện video đi</string>
+  <string name="type_outgoing_video_pulled">Đã chuyển cuộc gọi điện video đi tới thiết bị khác</string>
+  <string name="type_missed_video">Cuộc gọi điện video bị nhỡ</string>
+  <string name="type_voicemail">Thư thoại</string>
+  <string name="type_rejected">Cuộc gọi bị từ chối</string>
+  <string name="type_blocked">Cuộc gọi bị chặn</string>
+  <string name="call_details_minutes_abbreviation">phút</string>
+  <string name="call_details_seconds_abbreviation">giây</string>
+  <string name="a11y_call_duration_format">%1$d %2$s %3$d %4$s</string>
+  <string name="a11y_call_duration_short_format">%1$d %2$s</string>
+  <string name="call_duration_format_pattern">%1$s\'%2$s\' %3$s\'%4$s\'</string>
+  <string name="call_duration_short_format_pattern">%1$s\'%2$s\'</string>
+  <plurals name="a11y_seconds">
+    <item quantity="one">giây</item>
+    <item quantity="other">giây</item>
+  </plurals>
+  <plurals name="a11y_minutes">
+    <item quantity="one">phút</item>
+    <item quantity="other">phút</item>
+  </plurals>
+  <string name="type_answered_elsewhere">Đã trả lời cuộc gọi trên thiết bị khác</string>
+  <string name="description_phone_account">trên ^1</string>
+  <string name="description_via_number">qua %1$s</string>
+  <string name="description_via_number_phone_account">trên %1$s, qua %2$s</string>
+  <string name="voicemail_string">Thư thoại</string>
+  <string name="just_now">Vừa xong</string>
+  <string name="new_call_log_carrier_video">Cuộc gọi video của nhà mạng</string>
+  <string name="new_call_log_duo_video">Cuộc gọi video Duo</string>
+  <string name="new_call_log_unknown">Không xác định</string>
+  <string name="new_call_log_secondary_blocked">Bị chặn</string>
+  <string name="new_call_log_secondary_spam">Spam</string>
+  <plurals name="a11y_new_call_log_entry_missed_call">
+    <item quantity="one">^1 cuộc gọi nhỡ từ ^2</item>
+    <item quantity="other">^1 cuộc gọi, cuộc gọi gần đây nhất là cuộc gọi nhỡ từ ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_answered_call">
+    <item quantity="one">^1 cuộc gọi đã nhận từ ^2</item>
+    <item quantity="other">^1 cuộc gọi, cuộc gọi gần đây nhất là cuộc gọi đã nhận từ ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_outgoing_call">
+    <item quantity="one">^1 cuộc gọi đi tới ^2</item>
+    <item quantity="other">^1 cuộc gọi, cuộc gọi gần đây nhất là cuộc gọi đi tới ^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_blocked_call">
+    <item quantity="one">^1 cuộc gọi đã chặn từ ^2</item>
+    <item quantity="other">^1 cuộc gọi, cuộc gọi gần đây nhất là cuộc gọi đã chặn từ ^2</item>
+  </plurals>
+  <string name="a11y_new_call_log_entry_phone_account">trên ^1,
+    qua số ^2</string>
+  <string name="a11y_new_call_log_entry_full_description_without_phone_account_info">^1, ^2.</string>
+  <string name="a11y_new_call_log_entry_full_description_with_phone_account_info">^1, ^2, ^3.</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-zh-rCN/strings.xml b/java/com/android/dialer/calllogutils/res/values-zh-rCN/strings.xml
index b9aca90..6629299 100644
--- a/java/com/android/dialer/calllogutils/res/values-zh-rCN/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-zh-rCN/strings.xml
@@ -1,53 +1,60 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2017 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="type_incoming" msgid="5727636795656199810">"来电"</string>
-    <string name="type_incoming_pulled" msgid="8434723359163965796">"已转接至其他设备的来电"</string>
-    <string name="type_outgoing" msgid="764896746073942963">"去电"</string>
-    <string name="type_outgoing_pulled" msgid="1648517538371704193">"已转接至其他设备的去电"</string>
-    <string name="type_missed" msgid="2997043831022028176">"未接电话"</string>
-    <string name="type_incoming_video" msgid="7507180294202642554">"视频通话来电"</string>
-    <string name="type_incoming_video_pulled" msgid="7879031598844023977">"已转接至其他设备的视频通话来电"</string>
-    <string name="type_outgoing_video" msgid="309370072333983910">"拨出的视频通话"</string>
-    <string name="type_outgoing_video_pulled" msgid="3924450629684331345">"已转接至其他设备的外拨视频通话"</string>
-    <string name="type_missed_video" msgid="4350107016317603785">"错过的视频通话"</string>
-    <string name="type_voicemail" msgid="1877524395253846684">"语音邮件"</string>
-    <string name="type_rejected" msgid="5632107438472996198">"拒接的来电"</string>
-    <string name="type_blocked" msgid="9177237294052244929">"屏蔽的来电"</string>
-    <string name="call_details_minutes_abbreviation" msgid="7899774555556720560">"分"</string>
-    <string name="call_details_seconds_abbreviation" msgid="5893806826648947126">"秒"</string>
-    <string name="a11y_call_duration_format" msgid="2905525933361674470">"<xliff:g id="MINUTES_0">%d</xliff:g> <xliff:g id="MINUTES_TRANSLATION">%s</xliff:g> <xliff:g id="SECONDS_1">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="a11y_call_duration_short_format" msgid="5908875871251062453">"<xliff:g id="SECONDS_0">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <plurals name="a11y_seconds" formatted="false" msgid="6695730844760611970">
-      <item quantity="other">秒</item>
-      <item quantity="one">秒</item>
-    </plurals>
-    <plurals name="a11y_minutes" formatted="false" msgid="6377010096698624038">
-      <item quantity="other">分钟</item>
-      <item quantity="one">分钟</item>
-    </plurals>
-    <string name="type_answered_elsewhere" msgid="411958582555881640">"已在其他设备上接听的来电"</string>
-    <string name="description_phone_account" msgid="4382951172691362244">"通过 <xliff:g id="PHONEACCOUNT">^1</xliff:g>"</string>
-    <string name="description_via_number" msgid="7682575124846343076">"通过 <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="description_via_number_phone_account" msgid="4345445677508018830">"帐号：<xliff:g id="PHONEACCOUNT">%1$s</xliff:g>，通过 <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="voicemail_string" msgid="6029775151483803006">"语音邮件"</string>
-    <string name="now" msgid="2599778506439006806">"现在"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="type_incoming">来电</string>
+  <string name="type_incoming_pulled">已转接至其他设备的来电</string>
+  <string name="type_outgoing">去电</string>
+  <string name="type_outgoing_pulled">已转接至其他设备的去电</string>
+  <string name="type_missed">未接电话</string>
+  <string name="type_incoming_video">视频通话来电</string>
+  <string name="type_incoming_video_pulled">已转接至其他设备的视频通话来电</string>
+  <string name="type_outgoing_video">拨出的视频通话</string>
+  <string name="type_outgoing_video_pulled">已转接至其他设备的外拨视频通话</string>
+  <string name="type_missed_video">错过的视频通话</string>
+  <string name="type_voicemail">语音邮件</string>
+  <string name="type_rejected">拒接的来电</string>
+  <string name="type_blocked">屏蔽的来电</string>
+  <string name="call_details_minutes_abbreviation">分</string>
+  <string name="call_details_seconds_abbreviation">秒</string>
+  <string name="a11y_call_duration_format">%1$d %2$s %3$d %4$s</string>
+  <string name="a11y_call_duration_short_format">%1$d %2$s</string>
+  <string name="call_duration_format_pattern">%1$s \'%2$s\' %3$s \'%4$s\'</string>
+  <string name="call_duration_short_format_pattern">%1$s \'%2$s\'</string>
+  <plurals name="a11y_seconds">
+    <item quantity="one">秒</item>
+    <item quantity="other">秒</item>
+  </plurals>
+  <plurals name="a11y_minutes">
+    <item quantity="one">分钟</item>
+    <item quantity="other">分钟</item>
+  </plurals>
+  <string name="type_answered_elsewhere">已在其他设备上接听的来电</string>
+  <string name="description_phone_account">通过 ^1</string>
+  <string name="description_via_number">通过 %1$s</string>
+  <string name="description_via_number_phone_account">帐号：%1$s，通过 %2$s</string>
+  <string name="voicemail_string">语音邮件</string>
+  <string name="just_now">刚刚</string>
+  <string name="new_call_log_carrier_video">运营商视频通话</string>
+  <string name="new_call_log_duo_video">Duo 视频通话</string>
+  <string name="new_call_log_unknown">未知</string>
+  <string name="new_call_log_secondary_blocked">已屏蔽</string>
+  <string name="new_call_log_secondary_spam">骚扰电话号码</string>
+  <plurals name="a11y_new_call_log_entry_missed_call">
+    <item quantity="one">^1 通来自^2的未接电话</item>
+    <item quantity="other">^1 通电话，最近一通是来自^2的未接电话</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_answered_call">
+    <item quantity="one">^1 通来自^2的已接电话</item>
+    <item quantity="other">^1 通电话，最近一通是来自^2的已接电话</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_outgoing_call">
+    <item quantity="one">^1 通打给^2的电话</item>
+    <item quantity="other">^1 通电话，最近一通是打给^2的</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_blocked_call">
+    <item quantity="one">^1 通来自^2的已屏蔽电话</item>
+    <item quantity="other">^1 通电话，最近一通是来自^2的已屏蔽电话</item>
+  </plurals>
+  <string name="a11y_new_call_log_entry_phone_account">帐号：^1，通过 ^2</string>
+  <string name="a11y_new_call_log_entry_full_description_without_phone_account_info">^1，^2。</string>
+  <string name="a11y_new_call_log_entry_full_description_with_phone_account_info">^1，^2，^3</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-zh-rHK/strings.xml b/java/com/android/dialer/calllogutils/res/values-zh-rHK/strings.xml
index 97fc21d..6146e63 100644
--- a/java/com/android/dialer/calllogutils/res/values-zh-rHK/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-zh-rHK/strings.xml
@@ -1,53 +1,61 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2017 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="type_incoming" msgid="5727636795656199810">"來電"</string>
-    <string name="type_incoming_pulled" msgid="8434723359163965796">"來電已轉接至另一部裝置"</string>
-    <string name="type_outgoing" msgid="764896746073942963">"撥出電話"</string>
-    <string name="type_outgoing_pulled" msgid="1648517538371704193">"撥出的通話已轉接至另一部裝置"</string>
-    <string name="type_missed" msgid="2997043831022028176">"未接來電"</string>
-    <string name="type_incoming_video" msgid="7507180294202642554">"視像通話來電"</string>
-    <string name="type_incoming_video_pulled" msgid="7879031598844023977">"視像通話來電已轉接至另一部裝置"</string>
-    <string name="type_outgoing_video" msgid="309370072333983910">"撥出的視像通話"</string>
-    <string name="type_outgoing_video_pulled" msgid="3924450629684331345">"撥出的視像通話已轉接至另一部裝置"</string>
-    <string name="type_missed_video" msgid="4350107016317603785">"未接視像通話"</string>
-    <string name="type_voicemail" msgid="1877524395253846684">"留言"</string>
-    <string name="type_rejected" msgid="5632107438472996198">"被拒來電"</string>
-    <string name="type_blocked" msgid="9177237294052244929">"被封鎖的來電"</string>
-    <string name="call_details_minutes_abbreviation" msgid="7899774555556720560">"分鐘"</string>
-    <string name="call_details_seconds_abbreviation" msgid="5893806826648947126">"秒"</string>
-    <string name="a11y_call_duration_format" msgid="2905525933361674470">"<xliff:g id="MINUTES_0">%d</xliff:g> <xliff:g id="MINUTES_TRANSLATION">%s</xliff:g> <xliff:g id="SECONDS_1">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="a11y_call_duration_short_format" msgid="5908875871251062453">"<xliff:g id="SECONDS_0">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <plurals name="a11y_seconds" formatted="false" msgid="6695730844760611970">
-      <item quantity="other">秒</item>
-      <item quantity="one">秒</item>
-    </plurals>
-    <plurals name="a11y_minutes" formatted="false" msgid="6377010096698624038">
-      <item quantity="other">分鐘</item>
-      <item quantity="one">分鐘</item>
-    </plurals>
-    <string name="type_answered_elsewhere" msgid="411958582555881640">"來電已在另一部裝置上接聽"</string>
-    <string name="description_phone_account" msgid="4382951172691362244">"使用 <xliff:g id="PHONEACCOUNT">^1</xliff:g>"</string>
-    <string name="description_via_number" msgid="7682575124846343076">"透過 <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="description_via_number_phone_account" msgid="4345445677508018830">"在 <xliff:g id="PHONEACCOUNT">%1$s</xliff:g> 上透過 <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="voicemail_string" msgid="6029775151483803006">"留言"</string>
-    <string name="now" msgid="2599778506439006806">"現在"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="type_incoming">來電</string>
+  <string name="type_incoming_pulled">來電已轉接至另一部裝置</string>
+  <string name="type_outgoing">撥出電話</string>
+  <string name="type_outgoing_pulled">撥出的通話已轉接至另一部裝置</string>
+  <string name="type_missed">未接來電</string>
+  <string name="type_incoming_video">視像通話來電</string>
+  <string name="type_incoming_video_pulled">視像通話來電已轉接至另一部裝置</string>
+  <string name="type_outgoing_video">撥出的視像通話</string>
+  <string name="type_outgoing_video_pulled">撥出的視像通話已轉接至另一部裝置</string>
+  <string name="type_missed_video">未接視像通話</string>
+  <string name="type_voicemail">留言</string>
+  <string name="type_rejected">被拒來電</string>
+  <string name="type_blocked">被封鎖的來電</string>
+  <string name="call_details_minutes_abbreviation">分鐘</string>
+  <string name="call_details_seconds_abbreviation">秒</string>
+  <string name="a11y_call_duration_format">%1$d %2$s %3$d %4$s</string>
+  <string name="a11y_call_duration_short_format">%1$d %2$s</string>
+  <string name="call_duration_format_pattern">%1$s\'%2$s\' %3$s\'%4$s\'</string>
+  <string name="call_duration_short_format_pattern">%1$s\'%2$s\'</string>
+  <plurals name="a11y_seconds">
+    <item quantity="one">秒</item>
+    <item quantity="other">秒</item>
+  </plurals>
+  <plurals name="a11y_minutes">
+    <item quantity="one">分鐘</item>
+    <item quantity="other">分鐘</item>
+  </plurals>
+  <string name="type_answered_elsewhere">來電已在另一部裝置上接聽</string>
+  <string name="description_phone_account">使用 ^1</string>
+  <string name="description_via_number">透過 %1$s</string>
+  <string name="description_via_number_phone_account">在 %1$s 上透過 %2$s</string>
+  <string name="voicemail_string">留言</string>
+  <string name="just_now">剛剛</string>
+  <string name="new_call_log_carrier_video">流動網絡供應商視像</string>
+  <string name="new_call_log_duo_video">Duo 視像</string>
+  <string name="new_call_log_unknown">不明</string>
+  <string name="new_call_log_secondary_blocked">已封鎖</string>
+  <string name="new_call_log_secondary_spam">垃圾號碼</string>
+  <plurals name="a11y_new_call_log_entry_missed_call">
+    <item quantity="one">來自^2的 ^1 通未接來電</item>
+    <item quantity="other">^1 通來電，最新的一通是來自^2的未接來電</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_answered_call">
+    <item quantity="one">來自^2 ^1 通已接來電</item>
+    <item quantity="other">^1 通來電，最新的一通是來自^2的已接來電</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_outgoing_call">
+    <item quantity="one">撥給^2的 ^1 通電話</item>
+    <item quantity="other">^1 通電話，最新的一通是撥給^2的電話</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_blocked_call">
+    <item quantity="one">來自^2的 ^1 通已封鎖來電</item>
+    <item quantity="other">^1 通來電，最新的一通是來自^2的已封鎖來電</item>
+  </plurals>
+  <string name="a11y_new_call_log_entry_phone_account">在 ^1 上
+    透過 ^2</string>
+  <string name="a11y_new_call_log_entry_full_description_without_phone_account_info">^1，^2。</string>
+  <string name="a11y_new_call_log_entry_full_description_with_phone_account_info">^1，^2，^3。</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-zh-rTW/strings.xml b/java/com/android/dialer/calllogutils/res/values-zh-rTW/strings.xml
index d65f3c0..e161e3e 100644
--- a/java/com/android/dialer/calllogutils/res/values-zh-rTW/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-zh-rTW/strings.xml
@@ -1,53 +1,60 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2017 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="type_incoming" msgid="5727636795656199810">"來電"</string>
-    <string name="type_incoming_pulled" msgid="8434723359163965796">"來電已轉移到其他裝置"</string>
-    <string name="type_outgoing" msgid="764896746073942963">"去電"</string>
-    <string name="type_outgoing_pulled" msgid="1648517538371704193">"去電已轉移到其他裝置"</string>
-    <string name="type_missed" msgid="2997043831022028176">"未接來電"</string>
-    <string name="type_incoming_video" msgid="7507180294202642554">"視訊來電"</string>
-    <string name="type_incoming_video_pulled" msgid="7879031598844023977">"視訊來電已轉移到其他裝置"</string>
-    <string name="type_outgoing_video" msgid="309370072333983910">"視訊去電"</string>
-    <string name="type_outgoing_video_pulled" msgid="3924450629684331345">"視訊去電已轉移到其他裝置"</string>
-    <string name="type_missed_video" msgid="4350107016317603785">"未接視訊來電"</string>
-    <string name="type_voicemail" msgid="1877524395253846684">"語音留言"</string>
-    <string name="type_rejected" msgid="5632107438472996198">"拒接的來電"</string>
-    <string name="type_blocked" msgid="9177237294052244929">"封鎖的來電"</string>
-    <string name="call_details_minutes_abbreviation" msgid="7899774555556720560">"分鐘"</string>
-    <string name="call_details_seconds_abbreviation" msgid="5893806826648947126">"秒"</string>
-    <string name="a11y_call_duration_format" msgid="2905525933361674470">"<xliff:g id="MINUTES_0">%d</xliff:g> <xliff:g id="MINUTES_TRANSLATION">%s</xliff:g> <xliff:g id="SECONDS_1">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="a11y_call_duration_short_format" msgid="5908875871251062453">"<xliff:g id="SECONDS_0">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g> \'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <plurals name="a11y_seconds" formatted="false" msgid="6695730844760611970">
-      <item quantity="other">秒</item>
-      <item quantity="one">秒</item>
-    </plurals>
-    <plurals name="a11y_minutes" formatted="false" msgid="6377010096698624038">
-      <item quantity="other">分鐘</item>
-      <item quantity="one">分鐘</item>
-    </plurals>
-    <string name="type_answered_elsewhere" msgid="411958582555881640">"已透過其他裝置接聽來電"</string>
-    <string name="description_phone_account" msgid="4382951172691362244">"透過 <xliff:g id="PHONEACCOUNT">^1</xliff:g>"</string>
-    <string name="description_via_number" msgid="7682575124846343076">"透過 <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="description_via_number_phone_account" msgid="4345445677508018830">"<xliff:g id="PHONEACCOUNT">%1$s</xliff:g>，透過 <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="voicemail_string" msgid="6029775151483803006">"語音留言"</string>
-    <string name="now" msgid="2599778506439006806">"剛剛"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="type_incoming">來電</string>
+  <string name="type_incoming_pulled">來電已轉移到其他裝置</string>
+  <string name="type_outgoing">去電</string>
+  <string name="type_outgoing_pulled">去電已轉移到其他裝置</string>
+  <string name="type_missed">未接來電</string>
+  <string name="type_incoming_video">視訊來電</string>
+  <string name="type_incoming_video_pulled">視訊來電已轉移到其他裝置</string>
+  <string name="type_outgoing_video">視訊去電</string>
+  <string name="type_outgoing_video_pulled">視訊去電已轉移到其他裝置</string>
+  <string name="type_missed_video">未接視訊來電</string>
+  <string name="type_voicemail">語音留言</string>
+  <string name="type_rejected">拒接的來電</string>
+  <string name="type_blocked">封鎖的來電</string>
+  <string name="call_details_minutes_abbreviation">分鐘</string>
+  <string name="call_details_seconds_abbreviation">秒</string>
+  <string name="a11y_call_duration_format">%1$d %2$s %3$d %4$s</string>
+  <string name="a11y_call_duration_short_format">%1$d %2$s</string>
+  <string name="call_duration_format_pattern">%1$s \'%2$s\' %3$s \'%4$s\'</string>
+  <string name="call_duration_short_format_pattern">%1$s \'%2$s\'</string>
+  <plurals name="a11y_seconds">
+    <item quantity="one">秒</item>
+    <item quantity="other">秒</item>
+  </plurals>
+  <plurals name="a11y_minutes">
+    <item quantity="one">分鐘</item>
+    <item quantity="other">分鐘</item>
+  </plurals>
+  <string name="type_answered_elsewhere">已透過其他裝置接聽來電</string>
+  <string name="description_phone_account">透過 ^1</string>
+  <string name="description_via_number">透過 %1$s</string>
+  <string name="description_via_number_phone_account">%1$s，透過 %2$s</string>
+  <string name="voicemail_string">語音留言</string>
+  <string name="just_now">剛剛</string>
+  <string name="new_call_log_carrier_video">電信業者視訊通話</string>
+  <string name="new_call_log_duo_video">Duo 視訊通話</string>
+  <string name="new_call_log_unknown">不明</string>
+  <string name="new_call_log_secondary_blocked">已封鎖</string>
+  <string name="new_call_log_secondary_spam">騷擾/廣告電話</string>
+  <plurals name="a11y_new_call_log_entry_missed_call">
+    <item quantity="one">^1 通來自^2的未接來電</item>
+    <item quantity="other">^1 通電話，最近一通是來自^2的未接來電</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_answered_call">
+    <item quantity="one">^1 通來自^2的已接來電</item>
+    <item quantity="other">^1 通電話，最近一通是來自^2的已接來電</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_outgoing_call">
+    <item quantity="one">^1 通撥出給^2的電話</item>
+    <item quantity="other">^1 通電話，最近一通是撥出給^2的電話</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_blocked_call">
+    <item quantity="one">^1 通來自^2的已封鎖來電</item>
+    <item quantity="other">^1 通電話，最近一通是來自^2的已封鎖來電</item>
+  </plurals>
+  <string name="a11y_new_call_log_entry_phone_account">使用 ^1，透過 ^2</string>
+  <string name="a11y_new_call_log_entry_full_description_without_phone_account_info">^1，^2。</string>
+  <string name="a11y_new_call_log_entry_full_description_with_phone_account_info">^1，^2，^3。</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values-zu/strings.xml b/java/com/android/dialer/calllogutils/res/values-zu/strings.xml
index 90a80f0..4872e80 100644
--- a/java/com/android/dialer/calllogutils/res/values-zu/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values-zu/strings.xml
@@ -1,53 +1,61 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- ~ Copyright (C) 2017 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
-  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="type_incoming" msgid="5727636795656199810">"Ikholi engenayo"</string>
-    <string name="type_incoming_pulled" msgid="8434723359163965796">"Ikholi engenayo idluliselwe kwenye idivayisi"</string>
-    <string name="type_outgoing" msgid="764896746073942963">"Ikholi ephumayo"</string>
-    <string name="type_outgoing_pulled" msgid="1648517538371704193">"Ikholi ephumayo idluliselwe kwenye idivayisi"</string>
-    <string name="type_missed" msgid="2997043831022028176">"Ikholi ephuthiwe"</string>
-    <string name="type_incoming_video" msgid="7507180294202642554">"Ikholi yevidiyo engenayo"</string>
-    <string name="type_incoming_video_pulled" msgid="7879031598844023977">"Ikholi yevidiyo engenayo idluliselwe kwenye idivayisi"</string>
-    <string name="type_outgoing_video" msgid="309370072333983910">"Ikholi yevidiyo ephumayo"</string>
-    <string name="type_outgoing_video_pulled" msgid="3924450629684331345">"Ikholi yevidiyo ephumayo idluliselwe kwenye idivayisi"</string>
-    <string name="type_missed_video" msgid="4350107016317603785">"Ikholi yevidiyo ephuthiwe"</string>
-    <string name="type_voicemail" msgid="1877524395253846684">"Ivoyisimeyili"</string>
-    <string name="type_rejected" msgid="5632107438472996198">"Ikholi enqatshelwe"</string>
-    <string name="type_blocked" msgid="9177237294052244929">"Ikholi evinjiwe"</string>
-    <string name="call_details_minutes_abbreviation" msgid="7899774555556720560">"m"</string>
-    <string name="call_details_seconds_abbreviation" msgid="5893806826648947126">"s"</string>
-    <string name="a11y_call_duration_format" msgid="2905525933361674470">"<xliff:g id="MINUTES_0">%d</xliff:g> <xliff:g id="MINUTES_TRANSLATION">%s</xliff:g> <xliff:g id="SECONDS_1">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="a11y_call_duration_short_format" msgid="5908875871251062453">"<xliff:g id="SECONDS_0">%d</xliff:g> <xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>"</string>
-    <string name="call_duration_format_pattern" msgid="7566375153243313914">"<xliff:g id="MINUTES_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="MINUTES_TRANSLATION">%s</xliff:g>\' <xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <string name="call_duration_short_format_pattern" msgid="1713177000235994790">"<xliff:g id="SECONDS_SPECIAL_CHARACTER">%s</xliff:g>\'<xliff:g id="SECONDS_TRANSLATION">%s</xliff:g>\'"</string>
-    <plurals name="a11y_seconds" formatted="false" msgid="6695730844760611970">
-      <item quantity="one">amasekhondi</item>
-      <item quantity="other">amasekhondi</item>
-    </plurals>
-    <plurals name="a11y_minutes" formatted="false" msgid="6377010096698624038">
-      <item quantity="one">amaminithi</item>
-      <item quantity="other">amaminithi</item>
-    </plurals>
-    <string name="type_answered_elsewhere" msgid="411958582555881640">"Ikholi iphendulwe kwenye idivayisi"</string>
-    <string name="description_phone_account" msgid="4382951172691362244">"ku-<xliff:g id="PHONEACCOUNT">^1</xliff:g>"</string>
-    <string name="description_via_number" msgid="7682575124846343076">"nge-<xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="description_via_number_phone_account" msgid="4345445677508018830">"ku-<xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, nge-<xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="voicemail_string" msgid="6029775151483803006">"Ivoyisimeyili"</string>
-    <string name="now" msgid="2599778506439006806">"Manje"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="type_incoming">Ikholi engenayo</string>
+  <string name="type_incoming_pulled">Ikholi engenayo idluliselwe kwenye idivayisi</string>
+  <string name="type_outgoing">Ikholi ephumayo</string>
+  <string name="type_outgoing_pulled">Ikholi ephumayo idluliselwe kwenye idivayisi</string>
+  <string name="type_missed">Ikholi ephuthiwe</string>
+  <string name="type_incoming_video">Ikholi yevidiyo engenayo</string>
+  <string name="type_incoming_video_pulled">Ikholi yevidiyo engenayo idluliselwe kwenye idivayisi</string>
+  <string name="type_outgoing_video">Ikholi yevidiyo ephumayo</string>
+  <string name="type_outgoing_video_pulled">Ikholi yevidiyo ephumayo idluliselwe kwenye idivayisi</string>
+  <string name="type_missed_video">Ikholi yevidiyo ephuthiwe</string>
+  <string name="type_voicemail">Ivoyisimeyili</string>
+  <string name="type_rejected">Ikholi enqatshelwe</string>
+  <string name="type_blocked">Ikholi evinjiwe</string>
+  <string name="call_details_minutes_abbreviation">m</string>
+  <string name="call_details_seconds_abbreviation">s</string>
+  <string name="a11y_call_duration_format">%1$d %2$s %3$d %4$s</string>
+  <string name="a11y_call_duration_short_format">%1$d %2$s</string>
+  <string name="call_duration_format_pattern">%1$s\'%2$s\' %3$s\'%4$s\'</string>
+  <string name="call_duration_short_format_pattern">%1$s\'%2$s\'</string>
+  <plurals name="a11y_seconds">
+    <item quantity="one">amasekhondi</item>
+    <item quantity="other">amasekhondi</item>
+  </plurals>
+  <plurals name="a11y_minutes">
+    <item quantity="one">amaminithi</item>
+    <item quantity="other">amaminithi</item>
+  </plurals>
+  <string name="type_answered_elsewhere">Ikholi iphendulwe kwenye idivayisi</string>
+  <string name="description_phone_account">ku-^1</string>
+  <string name="description_via_number">nge-%1$s</string>
+  <string name="description_via_number_phone_account">ku-%1$s, nge-%2$s</string>
+  <string name="voicemail_string">Ivoyisimeyili</string>
+  <string name="just_now">Khona manje</string>
+  <string name="new_call_log_carrier_video">Ividiyo yenkampani yenethiwekhi</string>
+  <string name="new_call_log_duo_video">Ividiyo ye-Duo</string>
+  <string name="new_call_log_unknown">Akwaziwa</string>
+  <string name="new_call_log_secondary_blocked">Ivinjiwe</string>
+  <string name="new_call_log_secondary_spam">Ugaxekile</string>
+  <plurals name="a11y_new_call_log_entry_missed_call">
+    <item quantity="one">^1 amakholi, okwakamuva ikholi ekuphuthile kusukela ku-^2</item>
+    <item quantity="other">^1 amakholi, okwakamuva ikholi ekuphuthile kusukela ku-^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_answered_call">
+    <item quantity="one">^1 amakholi, okwakamuva ikholi ephenduliwe kusukela ku-^2</item>
+    <item quantity="other">^1 amakholi, okwakamuva ikholi ephenduliwe kusukela ku-^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_outgoing_call">
+    <item quantity="one">^1 amakholi, okwakamuva ikholi ephumayo eya ku-^2</item>
+    <item quantity="other">^1 amakholi, okwakamuva ikholi ephumayo eya ku-^2</item>
+  </plurals>
+  <plurals name="a11y_new_call_log_entry_blocked_call">
+    <item quantity="one">^1 amakholi, okwakamuva ikholi evinjelwe kusukela ku-^2</item>
+    <item quantity="other">^1 amakholi, okwakamuva ikholi evinjelwe kusukela ku-^2</item>
+  </plurals>
+  <string name="a11y_new_call_log_entry_phone_account">ku-^1,
+    nge-^2</string>
+  <string name="a11y_new_call_log_entry_full_description_without_phone_account_info">^1, ^2.</string>
+  <string name="a11y_new_call_log_entry_full_description_with_phone_account_info">^1, ^2, ^3.</string>
 </resources>
diff --git a/java/com/android/dialer/calllogutils/res/values/colors.xml b/java/com/android/dialer/calllogutils/res/values/colors.xml
index e0e6fb2..3a9e3ae 100644
--- a/java/com/android/dialer/calllogutils/res/values/colors.xml
+++ b/java/com/android/dialer/calllogutils/res/values/colors.xml
@@ -15,10 +15,4 @@
  ~ limitations under the License
  -->
 <resources>
-  <!-- Color for missed call icons. -->
-  <color name="missed_call">#C53929</color>
-  <!-- Color for answered or outgoing call icons. -->
-  <color name="answered_call">#00c853</color>
-  <!-- Color for blocked call icons. -->
-  <color name="blocked_call">@color/dialer_secondary_text_color</color>
 </resources>
\ No newline at end of file
diff --git a/java/com/android/dialer/calllogutils/res/values/strings.xml b/java/com/android/dialer/calllogutils/res/values/strings.xml
index f536ca6..3fbfb44 100644
--- a/java/com/android/dialer/calllogutils/res/values/strings.xml
+++ b/java/com/android/dialer/calllogutils/res/values/strings.xml
@@ -66,28 +66,28 @@
        This translation may require the variables to be rearranged for grammars different than
        english. [CHAR LIMIT=NONE] -->
   <string name="a11y_call_duration_format">
-    <xliff:g id="minutes">%d</xliff:g> <xliff:g id="minutes_translation">%s</xliff:g> <xliff:g id="seconds">%d</xliff:g> <xliff:g id="seconds_translation">%s</xliff:g>
+    <xliff:g id="minutes">%1$d</xliff:g> <xliff:g id="minutes_translation">%2$s</xliff:g> <xliff:g id="seconds">%3$d</xliff:g> <xliff:g id="seconds_translation">%4$s</xliff:g>
   </string>
 
   <!-- A string to announce a call duration. For example, in english might say 15 seconds.
        This translation may require the variables to be rearranged for grammars different than
        english. [CHAR LIMIT=NONE] -->
   <string name="a11y_call_duration_short_format">
-    <xliff:g id="seconds">%d</xliff:g> <xliff:g id="seconds_translation">%s</xliff:g>
+    <xliff:g id="seconds">%1$d</xliff:g> <xliff:g id="seconds_translation">%2$s</xliff:g>
   </string>
 
   <!-- A pattern to define the layout of a call duration string. for example, in english might
         say 2m 15s. Translation should only rearrange the inputs. minutes_translation and
         seconds_translation should remain in \'quotes\'. [CHAR LIMIT=NONE] -->
   <string name="call_duration_format_pattern">
-    <xliff:g id="minutes_special_character">%s</xliff:g>\'<xliff:g id="minutes_translation">%s</xliff:g>\' <xliff:g id="seconds_special_character">%s</xliff:g>\'<xliff:g id="seconds_translation">%s</xliff:g>\'
+    <xliff:g id="minutes_special_character">%1$s</xliff:g>\'<xliff:g id="minutes_translation">%2$s</xliff:g>\' <xliff:g id="seconds_special_character">%3$s</xliff:g>\'<xliff:g id="seconds_translation">%4$s</xliff:g>\'
   </string>
 
   <!-- A pattern to define the layout of a call duration string. for example, in english might
         say 2m 15s. Translation should only rearrange the inputs. seconds_translation should
         remain in \'quotes\'. [CHAR LIMIT=NONE] -->
   <string name="call_duration_short_format_pattern">
-    <xliff:g id="seconds_special_character">%s</xliff:g>\'<xliff:g id="seconds_translation">%s</xliff:g>\'
+    <xliff:g id="seconds_special_character">%1$s</xliff:g>\'<xliff:g id="seconds_translation">%2$s</xliff:g>\'
   </string>
 
   <!-- A full string for seconds (time). [CHAR LIMIT=NONE] -->
@@ -131,8 +131,11 @@
   <!-- String to be displayed to indicate in the call log that a call just now occurred. -->
   <string name="just_now">Just now</string>
 
-  <!-- Text to show in call log for a video call. [CHAR LIMIT=16] -->
-  <string name="new_call_log_video">Video</string>
+  <!-- Text to show in call log for a carrier video call. [CHAR LIMIT=31] -->
+  <string name="new_call_log_carrier_video">Carrier video</string>
+
+  <!-- Text to show in call log for a duo video call. [CHAR LIMIT=30] -->
+  <string name="new_call_log_duo_video">Duo video</string>
 
   <!-- String used to display calls from unknown numbers in the call log.  [CHAR LIMIT=30] -->
   <string name="new_call_log_unknown">Unknown</string>
@@ -142,4 +145,67 @@
 
   <!-- String used to display calls from spam numbers in the call log.   [CHAR LIMIT=30] -->
   <string name="new_call_log_secondary_spam">Spam</string>
-</resources>
\ No newline at end of file
+
+  <!--
+    String introducing to a11y users a call log entry in which the latest call is a missed call.
+    [CHAR LIMIT=NONE]
+  -->
+  <plurals name="a11y_new_call_log_entry_missed_call">
+    <item quantity="one"><xliff:g example="1" id="count">^1</xliff:g> missed call from <xliff:g example="Jane Smith" id="primaryInfoForEntry">^2</xliff:g></item>
+    <item quantity="other"><xliff:g example="2" id="count">^1</xliff:g> calls, the latest is a missed call from <xliff:g example="Jane Smith" id="primaryInfoForEntry">^2</xliff:g></item>
+  </plurals>
+
+  <!--
+    String introducing to a11y users a call log entry in which the latest call is an answered call.
+    [CHAR LIMIT=NONE]
+  -->
+  <plurals name="a11y_new_call_log_entry_answered_call">
+    <item quantity="one"><xliff:g example="1" id="count">^1</xliff:g> answered call from <xliff:g example="Jane Smith" id="primaryInfoForEntry">^2</xliff:g></item>
+    <item quantity="other"><xliff:g example="2" id="count">^1</xliff:g> calls, the latest is an answered call from <xliff:g example="Jane Smith" id="primaryInfoForEntry">^2</xliff:g></item>
+  </plurals>
+
+  <!--
+    String introducing to a11y users a call log entry in which the latest call is an outgoing call.
+    [CHAR LIMIT=NONE]
+  -->
+  <plurals name="a11y_new_call_log_entry_outgoing_call">
+    <item quantity="one"><xliff:g example="1" id="count">^1</xliff:g> outgoing call to <xliff:g example="Jane Smith" id="primaryInfoForEntry">^2</xliff:g></item>
+    <item quantity="other"><xliff:g example="2" id="count">^1</xliff:g> calls, the latest is an outgoing call to <xliff:g example="Jane Smith" id="primaryInfoForEntry">^2</xliff:g></item>
+  </plurals>
+
+  <!--
+    String introducing to a11y users a call log entry in which the latest call is a blocked call.
+    [CHAR LIMIT=NONE]
+  -->
+  <plurals name="a11y_new_call_log_entry_blocked_call">
+    <item quantity="one"><xliff:g example="1" id="count">^1</xliff:g> blocked call from <xliff:g example="Jane Smith" id="primaryInfoForEntry">^2</xliff:g></item>
+    <item quantity="other"><xliff:g example="2" id="count">^1</xliff:g> calls, the latest is a blocked call from <xliff:g example="Jane Smith" id="primaryInfoForEntry">^2</xliff:g></item>
+  </plurals>
+
+
+  <!--
+    String describing to a11y users the phone account used to make/receive the latest call in a call
+    log entry.
+    [CHAR LIMIT=NONE]
+  -->
+  <string name="a11y_new_call_log_entry_phone_account">
+    on <xliff:g example="SIM 1" id="phoneAccount">^1</xliff:g>,
+    via <xliff:g example="(555) 555-5555" id="number">^2</xliff:g>
+  </string>
+
+  <!--
+    String template describing to a11y users a call log entry without phone account info.
+    [CHAR LIMIT=NONE]
+  -->
+  <string name="a11y_new_call_log_entry_full_description_without_phone_account_info">
+    <xliff:g example="A missed call from Jane Smith" id="primaryDescriptionForEntry">^1</xliff:g>, <xliff:g example="mobile, 30 minutes ago" id="secondaryDescriptionForEntry">^2</xliff:g>.
+  </string>
+
+  <!--
+    String template describing to a11y users a call log entry with phone account info.
+    [CHAR LIMIT=NONE]
+  -->
+  <string name="a11y_new_call_log_entry_full_description_with_phone_account_info">
+    <xliff:g example="A missed call from Jane Smith" id="primaryDescriptionForEntry">^1</xliff:g>, <xliff:g example="mobile, 30 minutes ago" id="secondaryDescriptionForEntry">^2</xliff:g>, <xliff:g example="on SIM 1, via (555) 555-5555">^3</xliff:g>.
+  </string>
+</resources>
diff --git a/java/com/android/dialer/clipboard/res/values-af/strings.xml b/java/com/android/dialer/clipboard/res/values-af/strings.xml
new file mode 100644
index 0000000..bcbc8b7
--- /dev/null
+++ b/java/com/android/dialer/clipboard/res/values-af/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="toast_text_copied">Teks gekopieer</string>
+</resources>
diff --git a/java/com/android/dialer/clipboard/res/values-am/strings.xml b/java/com/android/dialer/clipboard/res/values-am/strings.xml
new file mode 100644
index 0000000..8053854
--- /dev/null
+++ b/java/com/android/dialer/clipboard/res/values-am/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="toast_text_copied">ፅሁፍ ተገልብጧል</string>
+</resources>
diff --git a/java/com/android/dialer/clipboard/res/values-ar/strings.xml b/java/com/android/dialer/clipboard/res/values-ar/strings.xml
new file mode 100644
index 0000000..90a472b
--- /dev/null
+++ b/java/com/android/dialer/clipboard/res/values-ar/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="toast_text_copied">تم نسخ النص</string>
+</resources>
diff --git a/java/com/android/dialer/clipboard/res/values-az/strings.xml b/java/com/android/dialer/clipboard/res/values-az/strings.xml
new file mode 100644
index 0000000..8f9a401
--- /dev/null
+++ b/java/com/android/dialer/clipboard/res/values-az/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="toast_text_copied">Mətn kopyalandı</string>
+</resources>
diff --git a/java/com/android/dialer/clipboard/res/values-b+sr+Latn/strings.xml b/java/com/android/dialer/clipboard/res/values-b+sr+Latn/strings.xml
new file mode 100644
index 0000000..74404f6
--- /dev/null
+++ b/java/com/android/dialer/clipboard/res/values-b+sr+Latn/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="toast_text_copied">Tekst je kopiran</string>
+</resources>
diff --git a/java/com/android/dialer/clipboard/res/values-be/strings.xml b/java/com/android/dialer/clipboard/res/values-be/strings.xml
new file mode 100644
index 0000000..5a1484a
--- /dev/null
+++ b/java/com/android/dialer/clipboard/res/values-be/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="toast_text_copied">Тэкст скапіраваны</string>
+</resources>
diff --git a/java/com/android/dialer/clipboard/res/values-bg/strings.xml b/java/com/android/dialer/clipboard/res/values-bg/strings.xml
new file mode 100644
index 0000000..9ea61f1
--- /dev/null
+++ b/java/com/android/dialer/clipboard/res/values-bg/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="toast_text_copied">Текстът бе копиран</string>
+</resources>
diff --git a/java/com/android/dialer/clipboard/res/values-bn/strings.xml b/java/com/android/dialer/clipboard/res/values-bn/strings.xml
new file mode 100644
index 0000000..97a987d
--- /dev/null
+++ b/java/com/android/dialer/clipboard/res/values-bn/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="toast_text_copied">টেক্সট কপি করা হয়েছে</string>
+</resources>
diff --git a/java/com/android/dialer/clipboard/res/values-bs/strings.xml b/java/com/android/dialer/clipboard/res/values-bs/strings.xml
new file mode 100644
index 0000000..74404f6
--- /dev/null
+++ b/java/com/android/dialer/clipboard/res/values-bs/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="toast_text_copied">Tekst je kopiran</string>
+</resources>
diff --git a/java/com/android/dialer/clipboard/res/values-ca/strings.xml b/java/com/android/dialer/clipboard/res/values-ca/strings.xml
new file mode 100644
index 0000000..a11d230
--- /dev/null
+++ b/java/com/android/dialer/clipboard/res/values-ca/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="toast_text_copied">El text s\'ha copiat</string>
+</resources>
diff --git a/java/com/android/dialer/clipboard/res/values-cs/strings.xml b/java/com/android/dialer/clipboard/res/values-cs/strings.xml
new file mode 100644
index 0000000..311cfbb
--- /dev/null
+++ b/java/com/android/dialer/clipboard/res/values-cs/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="toast_text_copied">Text byl zkopírován</string>
+</resources>
diff --git a/java/com/android/dialer/clipboard/res/values-da/strings.xml b/java/com/android/dialer/clipboard/res/values-da/strings.xml
new file mode 100644
index 0000000..6434f60
--- /dev/null
+++ b/java/com/android/dialer/clipboard/res/values-da/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="toast_text_copied">Teksten blev kopieret</string>
+</resources>
diff --git a/java/com/android/dialer/clipboard/res/values-de/strings.xml b/java/com/android/dialer/clipboard/res/values-de/strings.xml
new file mode 100644
index 0000000..aaa9b34
--- /dev/null
+++ b/java/com/android/dialer/clipboard/res/values-de/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="toast_text_copied">Text kopiert</string>
+</resources>
diff --git a/java/com/android/dialer/clipboard/res/values-el/strings.xml b/java/com/android/dialer/clipboard/res/values-el/strings.xml
new file mode 100644
index 0000000..ca3ec6e
--- /dev/null
+++ b/java/com/android/dialer/clipboard/res/values-el/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="toast_text_copied">Το κείμενο αντιγράφηκε</string>
+</resources>
diff --git a/java/com/android/dialer/clipboard/res/values-en-rAU/strings.xml b/java/com/android/dialer/clipboard/res/values-en-rAU/strings.xml
new file mode 100644
index 0000000..2c29631
--- /dev/null
+++ b/java/com/android/dialer/clipboard/res/values-en-rAU/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="toast_text_copied">Text copied</string>
+</resources>
diff --git a/java/com/android/dialer/clipboard/res/values-en-rGB/strings.xml b/java/com/android/dialer/clipboard/res/values-en-rGB/strings.xml
new file mode 100644
index 0000000..2c29631
--- /dev/null
+++ b/java/com/android/dialer/clipboard/res/values-en-rGB/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="toast_text_copied">Text copied</string>
+</resources>
diff --git a/java/com/android/dialer/clipboard/res/values-en-rIN/strings.xml b/java/com/android/dialer/clipboard/res/values-en-rIN/strings.xml
new file mode 100644
index 0000000..2c29631
--- /dev/null
+++ b/java/com/android/dialer/clipboard/res/values-en-rIN/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="toast_text_copied">Text copied</string>
+</resources>
diff --git a/java/com/android/dialer/clipboard/res/values-es-rUS/strings.xml b/java/com/android/dialer/clipboard/res/values-es-rUS/strings.xml
new file mode 100644
index 0000000..2459380
--- /dev/null
+++ b/java/com/android/dialer/clipboard/res/values-es-rUS/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="toast_text_copied">Texto copiado</string>
+</resources>
diff --git a/java/com/android/dialer/clipboard/res/values-es/strings.xml b/java/com/android/dialer/clipboard/res/values-es/strings.xml
new file mode 100644
index 0000000..32c6591
--- /dev/null
+++ b/java/com/android/dialer/clipboard/res/values-es/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="toast_text_copied">Se ha copiado el texto</string>
+</resources>
diff --git a/java/com/android/dialer/clipboard/res/values-et/strings.xml b/java/com/android/dialer/clipboard/res/values-et/strings.xml
new file mode 100644
index 0000000..90472e1
--- /dev/null
+++ b/java/com/android/dialer/clipboard/res/values-et/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="toast_text_copied">Tekst on kopeeritud</string>
+</resources>
diff --git a/java/com/android/dialer/clipboard/res/values-eu/strings.xml b/java/com/android/dialer/clipboard/res/values-eu/strings.xml
new file mode 100644
index 0000000..bbc4b37
--- /dev/null
+++ b/java/com/android/dialer/clipboard/res/values-eu/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="toast_text_copied">Kopiatu da testua</string>
+</resources>
diff --git a/java/com/android/dialer/clipboard/res/values-fa/strings.xml b/java/com/android/dialer/clipboard/res/values-fa/strings.xml
new file mode 100644
index 0000000..8542659
--- /dev/null
+++ b/java/com/android/dialer/clipboard/res/values-fa/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="toast_text_copied">نوشتار کپی شد</string>
+</resources>
diff --git a/java/com/android/dialer/clipboard/res/values-fi/strings.xml b/java/com/android/dialer/clipboard/res/values-fi/strings.xml
new file mode 100644
index 0000000..3775df6
--- /dev/null
+++ b/java/com/android/dialer/clipboard/res/values-fi/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="toast_text_copied">Teksti kopioitiin.</string>
+</resources>
diff --git a/java/com/android/dialer/clipboard/res/values-fr-rCA/strings.xml b/java/com/android/dialer/clipboard/res/values-fr-rCA/strings.xml
new file mode 100644
index 0000000..f046d9c
--- /dev/null
+++ b/java/com/android/dialer/clipboard/res/values-fr-rCA/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="toast_text_copied">Texte copié</string>
+</resources>
diff --git a/java/com/android/dialer/clipboard/res/values-fr/strings.xml b/java/com/android/dialer/clipboard/res/values-fr/strings.xml
new file mode 100644
index 0000000..f046d9c
--- /dev/null
+++ b/java/com/android/dialer/clipboard/res/values-fr/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="toast_text_copied">Texte copié</string>
+</resources>
diff --git a/java/com/android/dialer/clipboard/res/values-gl/strings.xml b/java/com/android/dialer/clipboard/res/values-gl/strings.xml
new file mode 100644
index 0000000..2459380
--- /dev/null
+++ b/java/com/android/dialer/clipboard/res/values-gl/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="toast_text_copied">Texto copiado</string>
+</resources>
diff --git a/java/com/android/dialer/clipboard/res/values-gu/strings.xml b/java/com/android/dialer/clipboard/res/values-gu/strings.xml
new file mode 100644
index 0000000..949b167
--- /dev/null
+++ b/java/com/android/dialer/clipboard/res/values-gu/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="toast_text_copied">ટેક્સ્ટ કૉપિ કરી</string>
+</resources>
diff --git a/java/com/android/dialer/clipboard/res/values-hi/strings.xml b/java/com/android/dialer/clipboard/res/values-hi/strings.xml
new file mode 100644
index 0000000..97a7dd8
--- /dev/null
+++ b/java/com/android/dialer/clipboard/res/values-hi/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="toast_text_copied">लेख कॉपी किया गया</string>
+</resources>
diff --git a/java/com/android/dialer/clipboard/res/values-hr/strings.xml b/java/com/android/dialer/clipboard/res/values-hr/strings.xml
new file mode 100644
index 0000000..a922504
--- /dev/null
+++ b/java/com/android/dialer/clipboard/res/values-hr/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="toast_text_copied">Tekst kopiran</string>
+</resources>
diff --git a/java/com/android/dialer/clipboard/res/values-hu/strings.xml b/java/com/android/dialer/clipboard/res/values-hu/strings.xml
new file mode 100644
index 0000000..7dd826e
--- /dev/null
+++ b/java/com/android/dialer/clipboard/res/values-hu/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="toast_text_copied">Másolt szöveg</string>
+</resources>
diff --git a/java/com/android/dialer/clipboard/res/values-hy/strings.xml b/java/com/android/dialer/clipboard/res/values-hy/strings.xml
new file mode 100644
index 0000000..a810df7
--- /dev/null
+++ b/java/com/android/dialer/clipboard/res/values-hy/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="toast_text_copied">Տեքստը պատճենվեց</string>
+</resources>
diff --git a/java/com/android/dialer/clipboard/res/values-in/strings.xml b/java/com/android/dialer/clipboard/res/values-in/strings.xml
new file mode 100644
index 0000000..472935d
--- /dev/null
+++ b/java/com/android/dialer/clipboard/res/values-in/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="toast_text_copied">Teks disalin</string>
+</resources>
diff --git a/java/com/android/dialer/clipboard/res/values-is/strings.xml b/java/com/android/dialer/clipboard/res/values-is/strings.xml
new file mode 100644
index 0000000..9514d0a
--- /dev/null
+++ b/java/com/android/dialer/clipboard/res/values-is/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="toast_text_copied">Texti afritaður</string>
+</resources>
diff --git a/java/com/android/dialer/clipboard/res/values-it/strings.xml b/java/com/android/dialer/clipboard/res/values-it/strings.xml
new file mode 100644
index 0000000..317b517
--- /dev/null
+++ b/java/com/android/dialer/clipboard/res/values-it/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="toast_text_copied">Testo copiato</string>
+</resources>
diff --git a/java/com/android/dialer/clipboard/res/values-iw/strings.xml b/java/com/android/dialer/clipboard/res/values-iw/strings.xml
new file mode 100644
index 0000000..ff3c426
--- /dev/null
+++ b/java/com/android/dialer/clipboard/res/values-iw/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="toast_text_copied">הטקסט הועתק</string>
+</resources>
diff --git a/java/com/android/dialer/clipboard/res/values-ja/strings.xml b/java/com/android/dialer/clipboard/res/values-ja/strings.xml
new file mode 100644
index 0000000..9b945d6
--- /dev/null
+++ b/java/com/android/dialer/clipboard/res/values-ja/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="toast_text_copied">テキストをコピーしました</string>
+</resources>
diff --git a/java/com/android/dialer/clipboard/res/values-ka/strings.xml b/java/com/android/dialer/clipboard/res/values-ka/strings.xml
new file mode 100644
index 0000000..5dc10ad
--- /dev/null
+++ b/java/com/android/dialer/clipboard/res/values-ka/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="toast_text_copied">ტექსტი კოპირებულია</string>
+</resources>
diff --git a/java/com/android/dialer/clipboard/res/values-kk/strings.xml b/java/com/android/dialer/clipboard/res/values-kk/strings.xml
new file mode 100644
index 0000000..7ca77c0
--- /dev/null
+++ b/java/com/android/dialer/clipboard/res/values-kk/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="toast_text_copied">Мәтін көшірілді</string>
+</resources>
diff --git a/java/com/android/dialer/clipboard/res/values-km/strings.xml b/java/com/android/dialer/clipboard/res/values-km/strings.xml
new file mode 100644
index 0000000..c0cb041
--- /dev/null
+++ b/java/com/android/dialer/clipboard/res/values-km/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="toast_text_copied">បាន​ចម្លង​អត្ថបទ</string>
+</resources>
diff --git a/java/com/android/dialer/clipboard/res/values-kn/strings.xml b/java/com/android/dialer/clipboard/res/values-kn/strings.xml
new file mode 100644
index 0000000..22af0b1
--- /dev/null
+++ b/java/com/android/dialer/clipboard/res/values-kn/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="toast_text_copied">ಪಠ್ಯವನ್ನು ನಕಲಿಸಲಾಗಿದೆ</string>
+</resources>
diff --git a/java/com/android/dialer/clipboard/res/values-ko/strings.xml b/java/com/android/dialer/clipboard/res/values-ko/strings.xml
new file mode 100644
index 0000000..00c0901
--- /dev/null
+++ b/java/com/android/dialer/clipboard/res/values-ko/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="toast_text_copied">텍스트 복사됨</string>
+</resources>
diff --git a/java/com/android/dialer/clipboard/res/values-ky/strings.xml b/java/com/android/dialer/clipboard/res/values-ky/strings.xml
new file mode 100644
index 0000000..8c11bd2
--- /dev/null
+++ b/java/com/android/dialer/clipboard/res/values-ky/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="toast_text_copied">Текст көчүрүлдү</string>
+</resources>
diff --git a/java/com/android/dialer/clipboard/res/values-lo/strings.xml b/java/com/android/dialer/clipboard/res/values-lo/strings.xml
new file mode 100644
index 0000000..926ae39
--- /dev/null
+++ b/java/com/android/dialer/clipboard/res/values-lo/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="toast_text_copied">ສຳເນົາຂໍ້ຄວາມແລ້ວ</string>
+</resources>
diff --git a/java/com/android/dialer/clipboard/res/values-lt/strings.xml b/java/com/android/dialer/clipboard/res/values-lt/strings.xml
new file mode 100644
index 0000000..a5b71d6
--- /dev/null
+++ b/java/com/android/dialer/clipboard/res/values-lt/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="toast_text_copied">Tekstas nukopijuotas</string>
+</resources>
diff --git a/java/com/android/dialer/clipboard/res/values-lv/strings.xml b/java/com/android/dialer/clipboard/res/values-lv/strings.xml
new file mode 100644
index 0000000..119221d
--- /dev/null
+++ b/java/com/android/dialer/clipboard/res/values-lv/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="toast_text_copied">Teksts ir nokopēts</string>
+</resources>
diff --git a/java/com/android/dialer/clipboard/res/values-mk/strings.xml b/java/com/android/dialer/clipboard/res/values-mk/strings.xml
new file mode 100644
index 0000000..01b916d
--- /dev/null
+++ b/java/com/android/dialer/clipboard/res/values-mk/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="toast_text_copied">Текстот е копиран</string>
+</resources>
diff --git a/java/com/android/dialer/clipboard/res/values-ml/strings.xml b/java/com/android/dialer/clipboard/res/values-ml/strings.xml
new file mode 100644
index 0000000..e1cbce9
--- /dev/null
+++ b/java/com/android/dialer/clipboard/res/values-ml/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="toast_text_copied">വാചകം പകർത്തി</string>
+</resources>
diff --git a/java/com/android/dialer/clipboard/res/values-mn/strings.xml b/java/com/android/dialer/clipboard/res/values-mn/strings.xml
new file mode 100644
index 0000000..2b3da44
--- /dev/null
+++ b/java/com/android/dialer/clipboard/res/values-mn/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="toast_text_copied">Текстийг хуулсан</string>
+</resources>
diff --git a/java/com/android/dialer/clipboard/res/values-mr/strings.xml b/java/com/android/dialer/clipboard/res/values-mr/strings.xml
new file mode 100644
index 0000000..2777a67
--- /dev/null
+++ b/java/com/android/dialer/clipboard/res/values-mr/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="toast_text_copied">मजकूर कॉपी केला</string>
+</resources>
diff --git a/java/com/android/dialer/clipboard/res/values-ms/strings.xml b/java/com/android/dialer/clipboard/res/values-ms/strings.xml
new file mode 100644
index 0000000..472935d
--- /dev/null
+++ b/java/com/android/dialer/clipboard/res/values-ms/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="toast_text_copied">Teks disalin</string>
+</resources>
diff --git a/java/com/android/dialer/clipboard/res/values-my/strings.xml b/java/com/android/dialer/clipboard/res/values-my/strings.xml
new file mode 100644
index 0000000..13ab01f
--- /dev/null
+++ b/java/com/android/dialer/clipboard/res/values-my/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="toast_text_copied">စာသားကူးယူပြီးပါပြီ</string>
+</resources>
diff --git a/java/com/android/dialer/clipboard/res/values-nb/strings.xml b/java/com/android/dialer/clipboard/res/values-nb/strings.xml
new file mode 100644
index 0000000..b450197
--- /dev/null
+++ b/java/com/android/dialer/clipboard/res/values-nb/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="toast_text_copied">Teksten er kopiert</string>
+</resources>
diff --git a/java/com/android/dialer/clipboard/res/values-ne/strings.xml b/java/com/android/dialer/clipboard/res/values-ne/strings.xml
new file mode 100644
index 0000000..ffcbda8
--- /dev/null
+++ b/java/com/android/dialer/clipboard/res/values-ne/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="toast_text_copied">पाठ प्रतिलिपि गरियो</string>
+</resources>
diff --git a/java/com/android/dialer/clipboard/res/values-nl/strings.xml b/java/com/android/dialer/clipboard/res/values-nl/strings.xml
new file mode 100644
index 0000000..e2ef805
--- /dev/null
+++ b/java/com/android/dialer/clipboard/res/values-nl/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="toast_text_copied">Tekst gekopieerd</string>
+</resources>
diff --git a/java/com/android/dialer/clipboard/res/values-no/strings.xml b/java/com/android/dialer/clipboard/res/values-no/strings.xml
new file mode 100644
index 0000000..b450197
--- /dev/null
+++ b/java/com/android/dialer/clipboard/res/values-no/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="toast_text_copied">Teksten er kopiert</string>
+</resources>
diff --git a/java/com/android/dialer/clipboard/res/values-pa/strings.xml b/java/com/android/dialer/clipboard/res/values-pa/strings.xml
new file mode 100644
index 0000000..92c2ad7
--- /dev/null
+++ b/java/com/android/dialer/clipboard/res/values-pa/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="toast_text_copied">ਲਿਖਤ ਕਾਪੀ ਕੀਤੀ ਗਈ</string>
+</resources>
diff --git a/java/com/android/dialer/clipboard/res/values-pl/strings.xml b/java/com/android/dialer/clipboard/res/values-pl/strings.xml
new file mode 100644
index 0000000..e17211e
--- /dev/null
+++ b/java/com/android/dialer/clipboard/res/values-pl/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="toast_text_copied">Tekst skopiowany</string>
+</resources>
diff --git a/java/com/android/dialer/clipboard/res/values-pt-rBR/strings.xml b/java/com/android/dialer/clipboard/res/values-pt-rBR/strings.xml
new file mode 100644
index 0000000..2459380
--- /dev/null
+++ b/java/com/android/dialer/clipboard/res/values-pt-rBR/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="toast_text_copied">Texto copiado</string>
+</resources>
diff --git a/java/com/android/dialer/clipboard/res/values-pt-rPT/strings.xml b/java/com/android/dialer/clipboard/res/values-pt-rPT/strings.xml
new file mode 100644
index 0000000..2459380
--- /dev/null
+++ b/java/com/android/dialer/clipboard/res/values-pt-rPT/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="toast_text_copied">Texto copiado</string>
+</resources>
diff --git a/java/com/android/dialer/clipboard/res/values-pt/strings.xml b/java/com/android/dialer/clipboard/res/values-pt/strings.xml
new file mode 100644
index 0000000..2459380
--- /dev/null
+++ b/java/com/android/dialer/clipboard/res/values-pt/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="toast_text_copied">Texto copiado</string>
+</resources>
diff --git a/java/com/android/dialer/clipboard/res/values-ro/strings.xml b/java/com/android/dialer/clipboard/res/values-ro/strings.xml
new file mode 100644
index 0000000..e1f1262
--- /dev/null
+++ b/java/com/android/dialer/clipboard/res/values-ro/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="toast_text_copied">Text copiat</string>
+</resources>
diff --git a/java/com/android/dialer/clipboard/res/values-ru/strings.xml b/java/com/android/dialer/clipboard/res/values-ru/strings.xml
new file mode 100644
index 0000000..021fa4b
--- /dev/null
+++ b/java/com/android/dialer/clipboard/res/values-ru/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="toast_text_copied">Текст скопирован</string>
+</resources>
diff --git a/java/com/android/dialer/clipboard/res/values-si/strings.xml b/java/com/android/dialer/clipboard/res/values-si/strings.xml
new file mode 100644
index 0000000..6e2d4c6
--- /dev/null
+++ b/java/com/android/dialer/clipboard/res/values-si/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="toast_text_copied">පෙළ පිටපත් කරන ලදී</string>
+</resources>
diff --git a/java/com/android/dialer/clipboard/res/values-sk/strings.xml b/java/com/android/dialer/clipboard/res/values-sk/strings.xml
new file mode 100644
index 0000000..0c8b004
--- /dev/null
+++ b/java/com/android/dialer/clipboard/res/values-sk/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="toast_text_copied">Text bol skopírovaný</string>
+</resources>
diff --git a/java/com/android/dialer/clipboard/res/values-sl/strings.xml b/java/com/android/dialer/clipboard/res/values-sl/strings.xml
new file mode 100644
index 0000000..51ec0f4
--- /dev/null
+++ b/java/com/android/dialer/clipboard/res/values-sl/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="toast_text_copied">Besedilo je kopirano</string>
+</resources>
diff --git a/java/com/android/dialer/clipboard/res/values-sq/strings.xml b/java/com/android/dialer/clipboard/res/values-sq/strings.xml
new file mode 100644
index 0000000..09e0bcd
--- /dev/null
+++ b/java/com/android/dialer/clipboard/res/values-sq/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="toast_text_copied">Teksti u kopjua</string>
+</resources>
diff --git a/java/com/android/dialer/clipboard/res/values-sr/strings.xml b/java/com/android/dialer/clipboard/res/values-sr/strings.xml
new file mode 100644
index 0000000..4ad6bf0
--- /dev/null
+++ b/java/com/android/dialer/clipboard/res/values-sr/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="toast_text_copied">Текст је копиран</string>
+</resources>
diff --git a/java/com/android/dialer/clipboard/res/values-sv/strings.xml b/java/com/android/dialer/clipboard/res/values-sv/strings.xml
new file mode 100644
index 0000000..d8fcdb7
--- /dev/null
+++ b/java/com/android/dialer/clipboard/res/values-sv/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="toast_text_copied">Texten kopierad</string>
+</resources>
diff --git a/java/com/android/dialer/clipboard/res/values-sw/strings.xml b/java/com/android/dialer/clipboard/res/values-sw/strings.xml
new file mode 100644
index 0000000..02208d9
--- /dev/null
+++ b/java/com/android/dialer/clipboard/res/values-sw/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="toast_text_copied">Maandishi yamenakiliwa</string>
+</resources>
diff --git a/java/com/android/dialer/clipboard/res/values-ta/strings.xml b/java/com/android/dialer/clipboard/res/values-ta/strings.xml
new file mode 100644
index 0000000..f7fe967
--- /dev/null
+++ b/java/com/android/dialer/clipboard/res/values-ta/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="toast_text_copied">உரை நகலெடுக்கப்பட்டது</string>
+</resources>
diff --git a/java/com/android/dialer/clipboard/res/values-te/strings.xml b/java/com/android/dialer/clipboard/res/values-te/strings.xml
new file mode 100644
index 0000000..8564e0a
--- /dev/null
+++ b/java/com/android/dialer/clipboard/res/values-te/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="toast_text_copied">వచనం కాపీ చేయబడింది</string>
+</resources>
diff --git a/java/com/android/dialer/clipboard/res/values-th/strings.xml b/java/com/android/dialer/clipboard/res/values-th/strings.xml
new file mode 100644
index 0000000..791818e
--- /dev/null
+++ b/java/com/android/dialer/clipboard/res/values-th/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="toast_text_copied">คัดลอกข้อความแล้ว</string>
+</resources>
diff --git a/java/com/android/dialer/clipboard/res/values-tl/strings.xml b/java/com/android/dialer/clipboard/res/values-tl/strings.xml
new file mode 100644
index 0000000..49d42f2
--- /dev/null
+++ b/java/com/android/dialer/clipboard/res/values-tl/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="toast_text_copied">Kinopya ang text</string>
+</resources>
diff --git a/java/com/android/dialer/clipboard/res/values-tr/strings.xml b/java/com/android/dialer/clipboard/res/values-tr/strings.xml
new file mode 100644
index 0000000..2e829af
--- /dev/null
+++ b/java/com/android/dialer/clipboard/res/values-tr/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="toast_text_copied">Metin kopyalandı</string>
+</resources>
diff --git a/java/com/android/dialer/clipboard/res/values-uk/strings.xml b/java/com/android/dialer/clipboard/res/values-uk/strings.xml
new file mode 100644
index 0000000..d4b00b9
--- /dev/null
+++ b/java/com/android/dialer/clipboard/res/values-uk/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="toast_text_copied">Текст скопійовано</string>
+</resources>
diff --git a/java/com/android/dialer/clipboard/res/values-ur/strings.xml b/java/com/android/dialer/clipboard/res/values-ur/strings.xml
new file mode 100644
index 0000000..f8f0c2f
--- /dev/null
+++ b/java/com/android/dialer/clipboard/res/values-ur/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="toast_text_copied">متن کاپی ہو گیا</string>
+</resources>
diff --git a/java/com/android/dialer/clipboard/res/values-uz/strings.xml b/java/com/android/dialer/clipboard/res/values-uz/strings.xml
new file mode 100644
index 0000000..dfcff2a
--- /dev/null
+++ b/java/com/android/dialer/clipboard/res/values-uz/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="toast_text_copied">Matn nusxalandi</string>
+</resources>
diff --git a/java/com/android/dialer/clipboard/res/values-vi/strings.xml b/java/com/android/dialer/clipboard/res/values-vi/strings.xml
new file mode 100644
index 0000000..c661708
--- /dev/null
+++ b/java/com/android/dialer/clipboard/res/values-vi/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="toast_text_copied">Đã sao chép văn bản</string>
+</resources>
diff --git a/java/com/android/dialer/clipboard/res/values-zh-rCN/strings.xml b/java/com/android/dialer/clipboard/res/values-zh-rCN/strings.xml
new file mode 100644
index 0000000..bec9ab1
--- /dev/null
+++ b/java/com/android/dialer/clipboard/res/values-zh-rCN/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="toast_text_copied">文本已复制</string>
+</resources>
diff --git a/java/com/android/dialer/clipboard/res/values-zh-rHK/strings.xml b/java/com/android/dialer/clipboard/res/values-zh-rHK/strings.xml
new file mode 100644
index 0000000..6127a52
--- /dev/null
+++ b/java/com/android/dialer/clipboard/res/values-zh-rHK/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="toast_text_copied">文字已複製</string>
+</resources>
diff --git a/java/com/android/dialer/clipboard/res/values-zh-rTW/strings.xml b/java/com/android/dialer/clipboard/res/values-zh-rTW/strings.xml
new file mode 100644
index 0000000..3a98f57
--- /dev/null
+++ b/java/com/android/dialer/clipboard/res/values-zh-rTW/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="toast_text_copied">已複製文字</string>
+</resources>
diff --git a/java/com/android/dialer/clipboard/res/values-zu/strings.xml b/java/com/android/dialer/clipboard/res/values-zu/strings.xml
new file mode 100644
index 0000000..16ed572
--- /dev/null
+++ b/java/com/android/dialer/clipboard/res/values-zu/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="toast_text_copied">Umbhalo okopishiwe</string>
+</resources>
diff --git a/java/com/android/dialer/commandline/CommandLineComponent.java b/java/com/android/dialer/commandline/CommandLineComponent.java
index c9abc53..50a1ff2 100644
--- a/java/com/android/dialer/commandline/CommandLineComponent.java
+++ b/java/com/android/dialer/commandline/CommandLineComponent.java
@@ -19,6 +19,7 @@
 import android.content.Context;
 import com.android.dialer.function.Supplier;
 import com.android.dialer.inject.HasRootComponent;
+import com.android.dialer.inject.IncludeInDialerRoot;
 import com.google.common.collect.ImmutableMap;
 import dagger.Subcomponent;
 
@@ -34,6 +35,7 @@
   }
 
   /** Used to refer to the root application component. */
+  @IncludeInDialerRoot
   public interface HasComponent {
     CommandLineComponent commandLineComponent();
   }
diff --git a/java/com/android/dialer/commandline/CommandLineModule.java b/java/com/android/dialer/commandline/CommandLineModule.java
index 9022d6c..c3b58d1 100644
--- a/java/com/android/dialer/commandline/CommandLineModule.java
+++ b/java/com/android/dialer/commandline/CommandLineModule.java
@@ -16,17 +16,22 @@
 
 package com.android.dialer.commandline;
 
-import com.android.dialer.commandline.impl.Blocking;
+import com.android.dialer.commandline.impl.ActiveCallsCommand;
+import com.android.dialer.commandline.impl.BlockingCommand;
+import com.android.dialer.commandline.impl.CallCommand;
 import com.android.dialer.commandline.impl.Echo;
 import com.android.dialer.commandline.impl.Help;
 import com.android.dialer.commandline.impl.Version;
 import com.android.dialer.function.Supplier;
+import com.android.dialer.inject.DialerVariant;
+import com.android.dialer.inject.InstallIn;
 import com.google.common.collect.ImmutableMap;
 import dagger.Module;
 import dagger.Provides;
 import javax.inject.Inject;
 
 /** Provides {@link Command} */
+@InstallIn(variants = {DialerVariant.DIALER_TEST})
 @Module
 public abstract class CommandLineModule {
 
@@ -42,21 +47,33 @@
     private final Help help;
     private final Version version;
     private final Echo echo;
-    private final Blocking blocking;
+    private final BlockingCommand blockingCommand;
+    private final CallCommand callCommand;
+    private final ActiveCallsCommand activeCallsCommand;
 
     @Inject
-    AospCommandInjector(Help help, Version version, Echo echo, Blocking blocking) {
+    AospCommandInjector(
+        Help help,
+        Version version,
+        Echo echo,
+        BlockingCommand blockingCommand,
+        CallCommand callCommand,
+        ActiveCallsCommand activeCallsCommand) {
       this.help = help;
       this.version = version;
       this.echo = echo;
-      this.blocking = blocking;
+      this.blockingCommand = blockingCommand;
+      this.callCommand = callCommand;
+      this.activeCallsCommand = activeCallsCommand;
     }
 
     public CommandSupplier.Builder inject(CommandSupplier.Builder builder) {
       builder.addCommand("help", help);
       builder.addCommand("version", version);
       builder.addCommand("echo", echo);
-      builder.addCommand("blocking", blocking);
+      builder.addCommand("blocking", blockingCommand);
+      builder.addCommand("call", callCommand);
+      builder.addCommand("activecalls", activeCallsCommand);
       return builder;
     }
   }
diff --git a/java/com/android/dialer/commandline/impl/ActiveCallsCommand.java b/java/com/android/dialer/commandline/impl/ActiveCallsCommand.java
new file mode 100644
index 0000000..81641ed
--- /dev/null
+++ b/java/com/android/dialer/commandline/impl/ActiveCallsCommand.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.dialer.commandline.impl;
+
+import android.content.Context;
+import android.support.annotation.NonNull;
+import com.android.dialer.activecalls.ActiveCallsComponent;
+import com.android.dialer.commandline.Arguments;
+import com.android.dialer.commandline.Command;
+import com.android.dialer.inject.ApplicationContext;
+import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.ListenableFuture;
+import javax.inject.Inject;
+
+/** Manipulates {@link com.android.dialer.activecalls.ActiveCalls} */
+public class ActiveCallsCommand implements Command {
+
+  private final Context appContext;
+
+  @Inject
+  ActiveCallsCommand(@ApplicationContext Context appContext) {
+    this.appContext = appContext;
+  }
+
+  @NonNull
+  @Override
+  public String getShortDescription() {
+    return "manipulate active calls";
+  }
+
+  @NonNull
+  @Override
+  public String getUsage() {
+    return "activecalls list";
+  }
+
+  @Override
+  public ListenableFuture<String> run(Arguments args) throws IllegalCommandLineArgumentException {
+    if (args.getPositionals().isEmpty()) {
+      return Futures.immediateFuture(getUsage());
+    }
+
+    String command = args.getPositionals().get(0);
+
+    switch (command) {
+      case "list":
+        return Futures.immediateFuture(
+            ActiveCallsComponent.get(appContext).activeCalls().getActiveCalls().toString());
+      default:
+        throw new IllegalCommandLineArgumentException("unknown command " + command);
+    }
+  }
+}
diff --git a/java/com/android/dialer/commandline/impl/Blocking.java b/java/com/android/dialer/commandline/impl/Blocking.java
deleted file mode 100644
index 2afd165..0000000
--- a/java/com/android/dialer/commandline/impl/Blocking.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.dialer.commandline.impl;
-
-import android.content.Context;
-import android.support.annotation.NonNull;
-import com.android.dialer.blocking.FilteredNumberAsyncQueryHandler;
-import com.android.dialer.commandline.Arguments;
-import com.android.dialer.commandline.Command;
-import com.android.dialer.common.concurrent.Annotations.BackgroundExecutor;
-import com.android.dialer.inject.ApplicationContext;
-import com.google.common.util.concurrent.ListenableFuture;
-import com.google.common.util.concurrent.ListeningExecutorService;
-import javax.inject.Inject;
-
-/** Block or unblock a number. */
-public class Blocking implements Command {
-
-  @NonNull
-  @Override
-  public String getShortDescription() {
-    return "block or unblock numbers";
-  }
-
-  @NonNull
-  @Override
-  public String getUsage() {
-    return "blocking block|unblock|isblocked number\n\n" + "number should be e.164 formatted";
-  }
-
-  private final Context appContext;
-  private final ListeningExecutorService executorService;
-
-  @Inject
-  Blocking(
-      @ApplicationContext Context context,
-      @BackgroundExecutor ListeningExecutorService executorService) {
-    this.appContext = context;
-    this.executorService = executorService;
-  }
-
-  @Override
-  public ListenableFuture<String> run(Arguments args) throws IllegalCommandLineArgumentException {
-    // AsyncQueryHandler must be created on a thread with looper.
-    // TODO(a bug): Use blocking version
-    FilteredNumberAsyncQueryHandler asyncQueryHandler =
-        new FilteredNumberAsyncQueryHandler(appContext);
-    return executorService.submit(() -> doInBackground(args, asyncQueryHandler));
-  }
-
-  private String doInBackground(Arguments args, FilteredNumberAsyncQueryHandler asyncQueryHandler) {
-    if (args.getPositionals().isEmpty()) {
-      return getUsage();
-    }
-
-    String command = args.getPositionals().get(0);
-
-    if ("block".equals(command)) {
-      String number = args.getPositionals().get(1);
-      asyncQueryHandler.blockNumber((unused) -> {}, number, null);
-      return "blocked " + number;
-    }
-
-    if ("unblock".equals(command)) {
-      String number = args.getPositionals().get(1);
-      Integer id = asyncQueryHandler.getBlockedIdSynchronous(number, null);
-      if (id == null) {
-        return number + " is not blocked";
-      }
-      asyncQueryHandler.unblock((unusedRows, unusedValues) -> {}, id);
-      return "unblocked " + number;
-    }
-
-    if ("isblocked".equals(command)) {
-      String number = args.getPositionals().get(1);
-      Integer id = asyncQueryHandler.getBlockedIdSynchronous(number, null);
-      return id == null ? "false" : "true";
-    }
-
-    return getUsage();
-  }
-}
diff --git a/java/com/android/dialer/commandline/impl/BlockingCommand.java b/java/com/android/dialer/commandline/impl/BlockingCommand.java
new file mode 100644
index 0000000..d064505
--- /dev/null
+++ b/java/com/android/dialer/commandline/impl/BlockingCommand.java
@@ -0,0 +1,110 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.dialer.commandline.impl;
+
+import android.content.Context;
+import android.support.annotation.NonNull;
+import com.android.dialer.DialerPhoneNumber;
+import com.android.dialer.blocking.Blocking;
+import com.android.dialer.commandline.Arguments;
+import com.android.dialer.commandline.Command;
+import com.android.dialer.common.concurrent.Annotations.BackgroundExecutor;
+import com.android.dialer.inject.ApplicationContext;
+import com.android.dialer.phonelookup.PhoneLookupComponent;
+import com.android.dialer.phonelookup.PhoneLookupInfo;
+import com.android.dialer.phonelookup.consolidator.PhoneLookupInfoConsolidator;
+import com.android.dialer.phonenumberproto.DialerPhoneNumberUtil;
+import com.google.common.collect.ImmutableList;
+import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.ListenableFuture;
+import com.google.common.util.concurrent.ListeningExecutorService;
+import com.google.common.util.concurrent.MoreExecutors;
+import javax.inject.Inject;
+
+/** Block or unblock a number. */
+public class BlockingCommand implements Command {
+
+  @NonNull
+  @Override
+  public String getShortDescription() {
+    return "block or unblock numbers";
+  }
+
+  @NonNull
+  @Override
+  public String getUsage() {
+    return "blocking block|unblock|isblocked number\n\n" + "number should be e.164 formatted";
+  }
+
+  private final Context appContext;
+  private final ListeningExecutorService executorService;
+
+  @Inject
+  BlockingCommand(
+      @ApplicationContext Context context,
+      @BackgroundExecutor ListeningExecutorService executorService) {
+    this.appContext = context;
+    this.executorService = executorService;
+  }
+
+  @Override
+  public ListenableFuture<String> run(Arguments args) throws IllegalCommandLineArgumentException {
+    if (args.getPositionals().isEmpty()) {
+      return Futures.immediateFuture(getUsage());
+    }
+
+    String command = args.getPositionals().get(0);
+
+    if ("block".equals(command)) {
+      String number = args.getPositionals().get(1);
+      return Futures.transform(
+          Blocking.block(appContext, ImmutableList.of(number), null),
+          (unused) -> "blocked " + number,
+          MoreExecutors.directExecutor());
+    }
+
+    if ("unblock".equals(command)) {
+      String number = args.getPositionals().get(1);
+      return Futures.transform(
+          Blocking.unblock(appContext, ImmutableList.of(number), null),
+          (unused) -> "unblocked " + number,
+          MoreExecutors.directExecutor());
+    }
+
+    if ("isblocked".equals(command)) {
+      String number = args.getPositionals().get(1);
+      ListenableFuture<DialerPhoneNumber> dialerPhoneNumberFuture =
+          executorService.submit(() -> new DialerPhoneNumberUtil().parse(number, null));
+
+      ListenableFuture<PhoneLookupInfo> lookupFuture =
+          Futures.transformAsync(
+              dialerPhoneNumberFuture,
+              (dialerPhoneNumber) ->
+                  PhoneLookupComponent.get(appContext)
+                      .compositePhoneLookup()
+                      .lookup(dialerPhoneNumber),
+              executorService);
+
+      return Futures.transform(
+          lookupFuture,
+          (info) -> new PhoneLookupInfoConsolidator(info).isBlocked() ? "true" : "false",
+          MoreExecutors.directExecutor());
+    }
+
+    return Futures.immediateFuture(getUsage());
+  }
+}
diff --git a/java/com/android/dialer/commandline/impl/CallCommand.java b/java/com/android/dialer/commandline/impl/CallCommand.java
new file mode 100644
index 0000000..b3ea860
--- /dev/null
+++ b/java/com/android/dialer/commandline/impl/CallCommand.java
@@ -0,0 +1,91 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.dialer.commandline.impl;
+
+import android.content.Context;
+import android.content.Intent;
+import android.support.annotation.NonNull;
+import android.telecom.PhoneAccount;
+import android.telecom.PhoneAccountHandle;
+import android.telecom.TelecomManager;
+import com.android.dialer.buildtype.BuildType;
+import com.android.dialer.buildtype.BuildType.Type;
+import com.android.dialer.callintent.CallInitiationType;
+import com.android.dialer.callintent.CallIntentBuilder;
+import com.android.dialer.commandline.Arguments;
+import com.android.dialer.commandline.Command;
+import com.android.dialer.inject.ApplicationContext;
+import com.android.dialer.precall.PreCall;
+import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.ListenableFuture;
+import javax.inject.Inject;
+
+/** Make calls. Requires bugfood build. */
+public class CallCommand implements Command {
+
+  private final Context appContext;
+
+  @Inject
+  CallCommand(@ApplicationContext Context appContext) {
+    this.appContext = appContext;
+  }
+
+  @NonNull
+  @Override
+  public String getShortDescription() {
+    return "make a call";
+  }
+
+  @NonNull
+  @Override
+  public String getUsage() {
+    return "call [flags --] number\n"
+        + "\nuse 'voicemail' to call voicemail"
+        + "\n\nflags:"
+        + "\n--direct send intent to telecom instead of pre call";
+  }
+
+  @Override
+  @SuppressWarnings("missingPermission")
+  public ListenableFuture<String> run(Arguments args) throws IllegalCommandLineArgumentException {
+    if (BuildType.get() != Type.BUGFOOD) {
+      throw new SecurityException("Bugfood only command");
+    }
+    String number = args.expectPositional(0, "number");
+    TelecomManager telecomManager = appContext.getSystemService(TelecomManager.class);
+    PhoneAccountHandle phoneAccountHandle =
+        telecomManager.getDefaultOutgoingPhoneAccount(PhoneAccount.SCHEME_TEL);
+    CallIntentBuilder callIntentBuilder;
+    if ("voicemail".equals(number)) {
+      callIntentBuilder =
+          CallIntentBuilder.forVoicemail(phoneAccountHandle, CallInitiationType.Type.DIALPAD);
+    } else {
+      callIntentBuilder = new CallIntentBuilder(number, CallInitiationType.Type.DIALPAD);
+    }
+    if (args.getBoolean("direct", false)) {
+      Intent intent = callIntentBuilder.build();
+      appContext
+          .getSystemService(TelecomManager.class)
+          .placeCall(intent.getData(), intent.getExtras());
+    } else {
+      Intent intent = PreCall.getIntent(appContext, callIntentBuilder);
+      intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+      appContext.startActivity(intent);
+    }
+    return Futures.immediateFuture("Calling " + number);
+  }
+}
diff --git a/java/com/android/dialer/common/FragmentUtils.java b/java/com/android/dialer/common/FragmentUtils.java
index c07d9a7..aa4441e 100644
--- a/java/com/android/dialer/common/FragmentUtils.java
+++ b/java/com/android/dialer/common/FragmentUtils.java
@@ -59,6 +59,11 @@
       @SuppressWarnings("unchecked") // Casts are checked using runtime methods
       T parent = ((FragmentUtilListener) fragment.getActivity()).getImpl(callbackInterface);
       return parent;
+    } else if (fragment.getActivity() instanceof MainActivityPeer.PeerSupplier) {
+      MainActivityPeer peer = ((MainActivityPeer.PeerSupplier) fragment.getActivity()).getPeer();
+      if (peer instanceof FragmentUtilListener) {
+        return ((FragmentUtilListener) peer).getImpl(callbackInterface);
+      }
     }
     return null;
   }
diff --git a/java/com/android/dialer/common/UiUtil.java b/java/com/android/dialer/common/UiUtil.java
index 4c4ebea..20c93e1 100644
--- a/java/com/android/dialer/common/UiUtil.java
+++ b/java/com/android/dialer/common/UiUtil.java
@@ -32,7 +32,14 @@
   }
 
   /** Opens the android keyboard. */
-  public static void openKeyboardFrom(Context context, View view) {
+  public static void showKeyboardFrom(Context context, View view) {
+    InputMethodManager inputMethodManager =
+        (InputMethodManager) context.getSystemService(Context.INPUT_METHOD_SERVICE);
+    inputMethodManager.showSoftInput(view, 0);
+  }
+
+  /** Force open the android keyboard. */
+  public static void forceOpenKeyboardFrom(Context context, View view) {
     InputMethodManager inputMethodManager =
         (InputMethodManager) context.getSystemService(Context.INPUT_METHOD_SERVICE);
     inputMethodManager.toggleSoftInputFromWindow(
diff --git a/java/com/android/dialer/common/concurrent/DialerExecutorComponent.java b/java/com/android/dialer/common/concurrent/DialerExecutorComponent.java
index 7348914..6a22174 100644
--- a/java/com/android/dialer/common/concurrent/DialerExecutorComponent.java
+++ b/java/com/android/dialer/common/concurrent/DialerExecutorComponent.java
@@ -23,6 +23,7 @@
 import com.android.dialer.common.concurrent.Annotations.NonUiParallel;
 import com.android.dialer.common.concurrent.Annotations.Ui;
 import com.android.dialer.inject.HasRootComponent;
+import com.android.dialer.inject.IncludeInDialerRoot;
 import com.google.common.util.concurrent.ListeningExecutorService;
 import dagger.Subcomponent;
 import java.util.concurrent.ExecutorService;
@@ -50,6 +51,15 @@
     return UiListener.create(fragmentManager, taskId);
   }
 
+  /**
+   * Version of {@link #createUiListener(FragmentManager, String)} that accepts support fragment
+   * manager.
+   */
+  public <OutputT> SupportUiListener<OutputT> createUiListener(
+      android.support.v4.app.FragmentManager fragmentManager, String taskId) {
+    return SupportUiListener.create(fragmentManager, taskId);
+  }
+
   public static DialerExecutorComponent get(Context context) {
     return ((DialerExecutorComponent.HasComponent)
             ((HasRootComponent) context.getApplicationContext()).component())
@@ -57,6 +67,7 @@
   }
 
   /** Used to refer to the root application component. */
+  @IncludeInDialerRoot
   public interface HasComponent {
     DialerExecutorComponent dialerExecutorComponent();
   }
diff --git a/java/com/android/dialer/common/concurrent/SupportUiListener.java b/java/com/android/dialer/common/concurrent/SupportUiListener.java
new file mode 100644
index 0000000..5e39586
--- /dev/null
+++ b/java/com/android/dialer/common/concurrent/SupportUiListener.java
@@ -0,0 +1,154 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.dialer.common.concurrent;
+
+import android.content.Context;
+import android.os.Bundle;
+import android.support.annotation.MainThread;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentManager;
+import com.android.dialer.common.Assert;
+import com.android.dialer.common.LogUtil;
+import com.android.dialer.common.concurrent.DialerExecutor.FailureListener;
+import com.android.dialer.common.concurrent.DialerExecutor.SuccessListener;
+import com.google.common.util.concurrent.FutureCallback;
+import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.ListenableFuture;
+
+
+/**
+ * A headless fragment for use in UI components that interact with ListenableFutures.
+ *
+ * <p>Callbacks are only executed if the UI component is still alive.
+ *
+ * <p>Example usage: <code><pre>
+ * public class MyActivity extends AppCompatActivity {
+ *
+ *   private SupportUiListener&lt;MyOutputType&gt uiListener;
+ *
+ *   public void onCreate(Bundle bundle) {
+ *     super.onCreate(bundle);
+ *
+ *     // Must be called in onCreate!
+ *     uiListener = DialerExecutorComponent.get(context).createUiListener(fragmentManager, taskId);
+ *   }
+ *
+ *   private void onSuccess(MyOutputType output) { ... }
+ *   private void onFailure(Throwable throwable) { ... }
+ *
+ *   private void userDidSomething() {
+ *     ListenableFuture&lt;MyOutputType&gt; future = callSomeMethodReturningListenableFuture(input);
+ *     uiListener.listen(this, future, this::onSuccess, this::onFailure);
+ *   }
+ * }
+ * </pre></code>
+ */
+public class SupportUiListener<OutputT> extends Fragment {
+
+  private CallbackWrapper<OutputT> callbackWrapper;
+
+  @MainThread
+  static <OutputT> SupportUiListener<OutputT> create(
+      FragmentManager fragmentManager, String taskId) {
+    @SuppressWarnings("unchecked")
+    SupportUiListener<OutputT> uiListener =
+        (SupportUiListener<OutputT>) fragmentManager.findFragmentByTag(taskId);
+
+    if (uiListener == null) {
+      LogUtil.i("SupportUiListener.create", "creating new SupportUiListener for " + taskId);
+      uiListener = new SupportUiListener<>();
+      // When launching an activity with the screen off, its onSaveInstanceState() is called before
+      // its fragments are created, which means we can't use commit() and need to use
+      // commitAllowingStateLoss(). This is not a problem for SupportUiListener which saves no
+      // state.
+      fragmentManager.beginTransaction().add(uiListener, taskId).commitAllowingStateLoss();
+    }
+    return uiListener;
+  }
+
+  /**
+   * Adds the specified listeners to the provided future.
+   *
+   * <p>The listeners are not called if the UI component this {@link SupportUiListener} is declared
+   * in is dead.
+   */
+  @MainThread
+  public void listen(
+      Context context,
+      @NonNull ListenableFuture<OutputT> future,
+      @NonNull SuccessListener<OutputT> successListener,
+      @NonNull FailureListener failureListener) {
+    callbackWrapper =
+        new CallbackWrapper<>(Assert.isNotNull(successListener), Assert.isNotNull(failureListener));
+    Futures.addCallback(
+        Assert.isNotNull(future),
+        callbackWrapper,
+        DialerExecutorComponent.get(context).uiExecutor());
+  }
+
+  private static class CallbackWrapper<OutputT> implements FutureCallback<OutputT> {
+    private SuccessListener<OutputT> successListener;
+    private FailureListener failureListener;
+
+    private CallbackWrapper(
+        SuccessListener<OutputT> successListener, FailureListener failureListener) {
+      this.successListener = successListener;
+      this.failureListener = failureListener;
+    }
+
+    @Override
+    public void onSuccess(@Nullable OutputT output) {
+      if (successListener == null) {
+        LogUtil.i("SupportUiListener.runTask", "task succeeded but UI is dead");
+      } else {
+        successListener.onSuccess(output);
+      }
+    }
+
+    @Override
+    public void onFailure(Throwable throwable) {
+      LogUtil.e("SupportUiListener.runTask", "task failed", throwable);
+      if (failureListener == null) {
+        LogUtil.i("SupportUiListener.runTask", "task failed but UI is dead");
+      } else {
+        failureListener.onFailure(throwable);
+      }
+    }
+  }
+
+  @Override
+  public void onCreate(Bundle savedInstanceState) {
+    super.onCreate(savedInstanceState);
+    setRetainInstance(true);
+    // Note: We use commitAllowingStateLoss when attaching the fragment so it may not be safe to
+    // read savedInstanceState in all situations. (But it's not anticipated that this fragment
+    // should need to rely on saved state.)
+  }
+
+  @Override
+  public void onDetach() {
+    super.onDetach();
+    LogUtil.enterBlock("SupportUiListener.onDetach");
+    if (callbackWrapper != null) {
+      callbackWrapper.successListener = null;
+      callbackWrapper.failureListener = null;
+    }
+  }
+}
+
diff --git a/java/com/android/dialer/common/concurrent/UiListener.java b/java/com/android/dialer/common/concurrent/UiListener.java
index b5922f9..a2d976f 100644
--- a/java/com/android/dialer/common/concurrent/UiListener.java
+++ b/java/com/android/dialer/common/concurrent/UiListener.java
@@ -31,6 +31,7 @@
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 
+
 /**
  * A headless fragment for use in UI components that interact with ListenableFutures.
  *
@@ -148,3 +149,4 @@
     }
   }
 }
+
diff --git a/java/com/android/dialer/common/cp2/DirectoryCompat.java b/java/com/android/dialer/common/cp2/DirectoryCompat.java
deleted file mode 100644
index 3e33394..0000000
--- a/java/com/android/dialer/common/cp2/DirectoryCompat.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.dialer.common.cp2;
-
-import android.net.Uri;
-import android.os.Build.VERSION;
-import android.os.Build.VERSION_CODES;
-import android.provider.ContactsContract.Directory;
-
-/** Compatibility utility for {@link Directory}. */
-public class DirectoryCompat {
-
-  public static Uri getContentUri() {
-    if (VERSION.SDK_INT >= VERSION_CODES.N) {
-      return Directory.ENTERPRISE_CONTENT_URI;
-    }
-    return Directory.CONTENT_URI;
-  }
-
-  public static boolean isInvisibleDirectory(long directoryId) {
-    if (VERSION.SDK_INT >= VERSION_CODES.N) {
-      return (directoryId == Directory.LOCAL_INVISIBLE
-          || directoryId == Directory.ENTERPRISE_LOCAL_INVISIBLE);
-    }
-    return directoryId == Directory.LOCAL_INVISIBLE;
-  }
-
-  public static boolean isRemoteDirectoryId(long directoryId) {
-    if (VERSION.SDK_INT >= VERSION_CODES.N) {
-      return Directory.isRemoteDirectoryId(directoryId);
-    }
-    return directoryId != Directory.DEFAULT && directoryId != Directory.LOCAL_INVISIBLE;
-  }
-
-  public static boolean isEnterpriseDirectoryId(long directoryId) {
-    return VERSION.SDK_INT >= VERSION_CODES.N && Directory.isEnterpriseDirectoryId(directoryId);
-  }
-
-  public static boolean isOnlyEnterpriseDirectoryId(long directoryId) {
-    return isEnterpriseDirectoryId(directoryId) && !isRemoteDirectoryId(directoryId);
-  }
-}
diff --git a/java/com/android/dialer/common/cp2/DirectoryUtils.java b/java/com/android/dialer/common/cp2/DirectoryUtils.java
new file mode 100644
index 0000000..fa5a226
--- /dev/null
+++ b/java/com/android/dialer/common/cp2/DirectoryUtils.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.dialer.common.cp2;
+
+import android.provider.ContactsContract.Directory;
+
+/** Utilities for {@link Directory}. */
+public class DirectoryUtils {
+
+  /** Returns true if the given ID belongs to an invisible directory. */
+  public static boolean isInvisibleDirectoryId(long directoryId) {
+    return directoryId == Directory.LOCAL_INVISIBLE
+        || directoryId == Directory.ENTERPRISE_LOCAL_INVISIBLE;
+  }
+
+  /** Returns true if the given ID belongs to a local enterprise directory. */
+  public static boolean isLocalEnterpriseDirectoryId(long directoryId) {
+    return Directory.isEnterpriseDirectoryId(directoryId)
+        && !Directory.isRemoteDirectoryId(directoryId);
+  }
+}
diff --git a/java/com/android/dialer/common/preference/AndroidManifest.xml b/java/com/android/dialer/common/preference/AndroidManifest.xml
new file mode 100644
index 0000000..3e80622
--- /dev/null
+++ b/java/com/android/dialer/common/preference/AndroidManifest.xml
@@ -0,0 +1,18 @@
+<!--
+  ~ Copyright (C) 2018 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+<manifest
+  package="com.android.dialer.common.preference">
+</manifest>
diff --git a/java/com/android/dialer/common/preference/SwitchPreferenceWithClickableSummary.java b/java/com/android/dialer/common/preference/SwitchPreferenceWithClickableSummary.java
new file mode 100644
index 0000000..7b3564d
--- /dev/null
+++ b/java/com/android/dialer/common/preference/SwitchPreferenceWithClickableSummary.java
@@ -0,0 +1,104 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.dialer.common.preference;
+
+import static android.support.v4.content.ContextCompat.startActivity;
+
+import android.content.Context;
+import android.content.Intent;
+import android.content.res.TypedArray;
+import android.net.Uri;
+import android.preference.SwitchPreference;
+import android.util.AttributeSet;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.ViewGroup;
+import com.android.dialer.common.Assert;
+
+/**
+ * Utility to allow the summary of a {@link SwitchPreference} to be clicked and opened via a browser
+ * to the specified {@link urlToOpen} attribute while maintaining all other aspects of a {@link
+ * SwitchPreference}.
+ *
+ * <p>Example usage:
+ *
+ * <pre>
+ *   <com.android.dialer.common.preference.SwitchPreferenceWithClickableSummary
+ *          android:dependency="...."
+ *          android:key="...."
+ *          android:title="...."
+ *          app:urlToOpen="...."/>
+ * </pre>
+ */
+public class SwitchPreferenceWithClickableSummary extends SwitchPreference {
+  private final String urlToOpen;
+
+  public SwitchPreferenceWithClickableSummary(
+      Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+    super(context, attrs, defStyleAttr, defStyleRes);
+    TypedArray typedArray =
+        context.obtainStyledAttributes(attrs, R.styleable.SwitchPreferenceWithClickableSummary);
+    urlToOpen =
+        String.valueOf(
+            typedArray.getText(R.styleable.SwitchPreferenceWithClickableSummary_urlToOpen));
+  }
+
+  public SwitchPreferenceWithClickableSummary(
+      Context context, AttributeSet attrs, int defStyleAttr) {
+    super(context, attrs, defStyleAttr, defStyleAttr);
+    TypedArray typedArray =
+        context.obtainStyledAttributes(attrs, R.styleable.SwitchPreferenceWithClickableSummary);
+    urlToOpen =
+        String.valueOf(
+            typedArray.getText(R.styleable.SwitchPreferenceWithClickableSummary_urlToOpen));
+  }
+
+  public SwitchPreferenceWithClickableSummary(Context context, AttributeSet attrs) {
+    super(context, attrs);
+    TypedArray typedArray =
+        context.obtainStyledAttributes(attrs, R.styleable.SwitchPreferenceWithClickableSummary);
+    urlToOpen =
+        String.valueOf(
+            typedArray.getText(R.styleable.SwitchPreferenceWithClickableSummary_urlToOpen));
+  }
+
+  public SwitchPreferenceWithClickableSummary(Context context) {
+    this(context, null);
+  }
+
+  @Override
+  protected View onCreateView(ViewGroup parent) {
+    return super.onCreateView(parent);
+  }
+
+  @Override
+  protected void onBindView(View view) {
+    super.onBindView(view);
+    Assert.checkArgument(
+        urlToOpen != null,
+        "must have a urlToOpen attribute when using SwitchPreferenceWithClickableSummary");
+    view.findViewById(android.R.id.summary)
+        .setOnClickListener(
+            new OnClickListener() {
+              @Override
+              public void onClick(View v) {
+                Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(urlToOpen));
+                startActivity(view.getContext(), intent, null);
+              }
+            });
+  }
+}
diff --git a/java/com/android/dialer/common/preference/res/values/attrs.xml b/java/com/android/dialer/common/preference/res/values/attrs.xml
new file mode 100644
index 0000000..c1d1de0
--- /dev/null
+++ b/java/com/android/dialer/common/preference/res/values/attrs.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2018 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+<resources>
+  <declare-styleable name="SwitchPreferenceWithClickableSummary">
+    <attr name="urlToOpen" format="string"/>
+  </declare-styleable>
+</resources>
+
diff --git a/java/com/android/dialer/common/res/values-af/strings.xml b/java/com/android/dialer/common/res/values-af/strings.xml
index 2ddb36c..f960d61 100644
--- a/java/com/android/dialer/common/res/values-af/strings.xml
+++ b/java/com/android/dialer/common/res/values-af/strings.xml
@@ -1,22 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="network_name_wifi" msgid="3026388992566895417">"Wi-Fi"</string>
-    <string name="network_name_mobile" msgid="7655711935020766459">"Mobiel"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="network_name_wifi">Wi-Fi</string>
+  <string name="network_name_mobile">Mobiel</string>
+  <string name="content_description_overflow">Nog opsies</string>
+  <string name="snackbar_undo">ONTDOEN</string>
+  <string name="ok_got_it">OK, het dit</string>
 </resources>
diff --git a/java/com/android/dialer/common/res/values-am/strings.xml b/java/com/android/dialer/common/res/values-am/strings.xml
index 57f54d3..225ba8d 100644
--- a/java/com/android/dialer/common/res/values-am/strings.xml
+++ b/java/com/android/dialer/common/res/values-am/strings.xml
@@ -1,22 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="network_name_wifi" msgid="3026388992566895417">"ዋይፋይ"</string>
-    <string name="network_name_mobile" msgid="7655711935020766459">"ሞባይል"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="network_name_wifi">ዋይፋይ</string>
+  <string name="network_name_mobile">ሞባይል</string>
+  <string name="content_description_overflow">ተጨማሪ አማራጮች</string>
+  <string name="snackbar_undo">ቀልብስ</string>
+  <string name="ok_got_it">እሺ፣ ገብቶኛል</string>
 </resources>
diff --git a/java/com/android/dialer/common/res/values-ar/strings.xml b/java/com/android/dialer/common/res/values-ar/strings.xml
index 8d62e39..f5f32c3 100644
--- a/java/com/android/dialer/common/res/values-ar/strings.xml
+++ b/java/com/android/dialer/common/res/values-ar/strings.xml
@@ -1,22 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="network_name_wifi" msgid="3026388992566895417">"Wifi"</string>
-    <string name="network_name_mobile" msgid="7655711935020766459">"الجوال"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="network_name_wifi">Wifi</string>
+  <string name="network_name_mobile">الجوّال</string>
+  <string name="content_description_overflow">خيارات أكثر</string>
+  <string name="snackbar_undo">تراجع</string>
+  <string name="ok_got_it">موافق، حسنًا</string>
 </resources>
diff --git a/java/com/android/dialer/common/res/values-az/strings.xml b/java/com/android/dialer/common/res/values-az/strings.xml
index 29c9cce..2400f9c 100644
--- a/java/com/android/dialer/common/res/values-az/strings.xml
+++ b/java/com/android/dialer/common/res/values-az/strings.xml
@@ -1,22 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="network_name_wifi" msgid="3026388992566895417">"Wifi"</string>
-    <string name="network_name_mobile" msgid="7655711935020766459">"Mobil"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="network_name_wifi">Wifi</string>
+  <string name="network_name_mobile">Mobil</string>
+  <string name="content_description_overflow">Əlavə seçimlər</string>
+  <string name="snackbar_undo">LƏĞV EDİN</string>
+  <string name="ok_got_it">Ok, anladım</string>
 </resources>
diff --git a/java/com/android/dialer/common/res/values-b+sr+Latn/strings.xml b/java/com/android/dialer/common/res/values-b+sr+Latn/strings.xml
index c2e7e6b..938c4ce 100644
--- a/java/com/android/dialer/common/res/values-b+sr+Latn/strings.xml
+++ b/java/com/android/dialer/common/res/values-b+sr+Latn/strings.xml
@@ -1,22 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="network_name_wifi" msgid="3026388992566895417">"Wi-Fi"</string>
-    <string name="network_name_mobile" msgid="7655711935020766459">"Mobilni uređaji"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="network_name_wifi">Wi-Fi</string>
+  <string name="network_name_mobile">Mobilni uređaji</string>
+  <string name="content_description_overflow">Još opcija</string>
+  <string name="snackbar_undo">OPOZOVI</string>
+  <string name="ok_got_it">Važi</string>
 </resources>
diff --git a/java/com/android/dialer/common/res/values-be/strings.xml b/java/com/android/dialer/common/res/values-be/strings.xml
index 35a482f..6b3cf3b 100644
--- a/java/com/android/dialer/common/res/values-be/strings.xml
+++ b/java/com/android/dialer/common/res/values-be/strings.xml
@@ -1,22 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="network_name_wifi" msgid="3026388992566895417">"Wi-Fi"</string>
-    <string name="network_name_mobile" msgid="7655711935020766459">"Мабільны тэлефон"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="network_name_wifi">Wi-Fi</string>
+  <string name="network_name_mobile">Мабільны тэлефон</string>
+  <string name="content_description_overflow">Дадатковыя параметры</string>
+  <string name="snackbar_undo">АДРАБІЦЬ</string>
+  <string name="ok_got_it">Добра, зразумела</string>
 </resources>
diff --git a/java/com/android/dialer/common/res/values-bg/strings.xml b/java/com/android/dialer/common/res/values-bg/strings.xml
index b598488..bcdaa4b 100644
--- a/java/com/android/dialer/common/res/values-bg/strings.xml
+++ b/java/com/android/dialer/common/res/values-bg/strings.xml
@@ -1,22 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="network_name_wifi" msgid="3026388992566895417">"Wi-Fi"</string>
-    <string name="network_name_mobile" msgid="7655711935020766459">"Мобилна"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="network_name_wifi">Wi-Fi</string>
+  <string name="network_name_mobile">Мобилна</string>
+  <string name="content_description_overflow">Още опции</string>
+  <string name="snackbar_undo">ОТМЯНА</string>
+  <string name="ok_got_it">Добре, разбрах</string>
 </resources>
diff --git a/java/com/android/dialer/common/res/values-bn/strings.xml b/java/com/android/dialer/common/res/values-bn/strings.xml
index a1e52ac..6fc46fb 100644
--- a/java/com/android/dialer/common/res/values-bn/strings.xml
+++ b/java/com/android/dialer/common/res/values-bn/strings.xml
@@ -1,22 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="network_name_wifi" msgid="3026388992566895417">"ওয়াই ফাই"</string>
-    <string name="network_name_mobile" msgid="7655711935020766459">"মোবাইল"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="network_name_wifi">ওয়াই ফাই</string>
+  <string name="network_name_mobile">মোবাইল</string>
+  <string name="content_description_overflow">আরও বিকল্প</string>
+  <string name="snackbar_undo">পূর্বাবস্থায় ফিরুন</string>
+  <string name="ok_got_it">ঠিক আছে, বুঝেছি</string>
 </resources>
diff --git a/java/com/android/dialer/common/res/values-bs/strings.xml b/java/com/android/dialer/common/res/values-bs/strings.xml
index 85f48b8..63a6366 100644
--- a/java/com/android/dialer/common/res/values-bs/strings.xml
+++ b/java/com/android/dialer/common/res/values-bs/strings.xml
@@ -1,22 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="network_name_wifi" msgid="3026388992566895417">"Wifi"</string>
-    <string name="network_name_mobile" msgid="7655711935020766459">"Mobilni"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="network_name_wifi">Wifi</string>
+  <string name="network_name_mobile">Mobilni</string>
+  <string name="content_description_overflow">Više opcija</string>
+  <string name="snackbar_undo">OPOZOVI</string>
+  <string name="ok_got_it">Uredu, razumijem</string>
 </resources>
diff --git a/java/com/android/dialer/common/res/values-ca/strings.xml b/java/com/android/dialer/common/res/values-ca/strings.xml
index cffdbea..de2dc85 100644
--- a/java/com/android/dialer/common/res/values-ca/strings.xml
+++ b/java/com/android/dialer/common/res/values-ca/strings.xml
@@ -1,22 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="network_name_wifi" msgid="3026388992566895417">"Wi-Fi"</string>
-    <string name="network_name_mobile" msgid="7655711935020766459">"Mòbil"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="network_name_wifi">Wi-Fi</string>
+  <string name="network_name_mobile">Mòbil</string>
+  <string name="content_description_overflow">Més opcions</string>
+  <string name="snackbar_undo">DESFÉS</string>
+  <string name="ok_got_it">D\'acord</string>
 </resources>
diff --git a/java/com/android/dialer/common/res/values-cs/strings.xml b/java/com/android/dialer/common/res/values-cs/strings.xml
index f8eeeec..68babdd 100644
--- a/java/com/android/dialer/common/res/values-cs/strings.xml
+++ b/java/com/android/dialer/common/res/values-cs/strings.xml
@@ -1,22 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="network_name_wifi" msgid="3026388992566895417">"Wi-Fi"</string>
-    <string name="network_name_mobile" msgid="7655711935020766459">"Mobilní"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="network_name_wifi">Wi-Fi</string>
+  <string name="network_name_mobile">Mobilní</string>
+  <string name="content_description_overflow">Další možnosti</string>
+  <string name="snackbar_undo">VRÁTIT</string>
+  <string name="ok_got_it">OK, rozumím</string>
 </resources>
diff --git a/java/com/android/dialer/common/res/values-da/strings.xml b/java/com/android/dialer/common/res/values-da/strings.xml
index 57e6e0b..324205c 100644
--- a/java/com/android/dialer/common/res/values-da/strings.xml
+++ b/java/com/android/dialer/common/res/values-da/strings.xml
@@ -1,22 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="network_name_wifi" msgid="3026388992566895417">"Wi-Fi"</string>
-    <string name="network_name_mobile" msgid="7655711935020766459">"Mobil"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="network_name_wifi">Wi-Fi</string>
+  <string name="network_name_mobile">Mobil</string>
+  <string name="content_description_overflow">Flere valgmuligheder</string>
+  <string name="snackbar_undo">FORTRYD</string>
+  <string name="ok_got_it">OK</string>
 </resources>
diff --git a/java/com/android/dialer/common/res/values-de/strings.xml b/java/com/android/dialer/common/res/values-de/strings.xml
index 6761594..748ca2e 100644
--- a/java/com/android/dialer/common/res/values-de/strings.xml
+++ b/java/com/android/dialer/common/res/values-de/strings.xml
@@ -1,22 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="network_name_wifi" msgid="3026388992566895417">"WLAN"</string>
-    <string name="network_name_mobile" msgid="7655711935020766459">"Mobil"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="network_name_wifi">WLAN</string>
+  <string name="network_name_mobile">Mobil</string>
+  <string name="content_description_overflow">Weitere Optionen</string>
+  <string name="snackbar_undo">RÜCKGÄNGIG</string>
+  <string name="ok_got_it">OK</string>
 </resources>
diff --git a/java/com/android/dialer/common/res/values-el/strings.xml b/java/com/android/dialer/common/res/values-el/strings.xml
index 4896004..2f29684 100644
--- a/java/com/android/dialer/common/res/values-el/strings.xml
+++ b/java/com/android/dialer/common/res/values-el/strings.xml
@@ -1,22 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="network_name_wifi" msgid="3026388992566895417">"Wifi"</string>
-    <string name="network_name_mobile" msgid="7655711935020766459">"Κινητής τηλεφωνίας"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="network_name_wifi">Wifi</string>
+  <string name="network_name_mobile">Κινητής τηλεφωνίας</string>
+  <string name="content_description_overflow">Περισσότερες επιλογές</string>
+  <string name="snackbar_undo">ΑΝΑΙΡΕΣΗ</string>
+  <string name="ok_got_it">OK, το κατάλαβα.</string>
 </resources>
diff --git a/java/com/android/dialer/common/res/values-en-rAU/strings.xml b/java/com/android/dialer/common/res/values-en-rAU/strings.xml
index 29ff1e1..b4c9fd1 100644
--- a/java/com/android/dialer/common/res/values-en-rAU/strings.xml
+++ b/java/com/android/dialer/common/res/values-en-rAU/strings.xml
@@ -1,22 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="network_name_wifi" msgid="3026388992566895417">"Wi-Fi"</string>
-    <string name="network_name_mobile" msgid="7655711935020766459">"Mobile"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="network_name_wifi">Wi-Fi</string>
+  <string name="network_name_mobile">Mobile</string>
+  <string name="content_description_overflow">More options</string>
+  <string name="snackbar_undo">UNDO</string>
+  <string name="ok_got_it">OK, got it</string>
 </resources>
diff --git a/java/com/android/dialer/common/res/values-en-rGB/strings.xml b/java/com/android/dialer/common/res/values-en-rGB/strings.xml
index 29ff1e1..b4c9fd1 100644
--- a/java/com/android/dialer/common/res/values-en-rGB/strings.xml
+++ b/java/com/android/dialer/common/res/values-en-rGB/strings.xml
@@ -1,22 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="network_name_wifi" msgid="3026388992566895417">"Wi-Fi"</string>
-    <string name="network_name_mobile" msgid="7655711935020766459">"Mobile"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="network_name_wifi">Wi-Fi</string>
+  <string name="network_name_mobile">Mobile</string>
+  <string name="content_description_overflow">More options</string>
+  <string name="snackbar_undo">UNDO</string>
+  <string name="ok_got_it">OK, got it</string>
 </resources>
diff --git a/java/com/android/dialer/common/res/values-en-rIN/strings.xml b/java/com/android/dialer/common/res/values-en-rIN/strings.xml
index 29ff1e1..b4c9fd1 100644
--- a/java/com/android/dialer/common/res/values-en-rIN/strings.xml
+++ b/java/com/android/dialer/common/res/values-en-rIN/strings.xml
@@ -1,22 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="network_name_wifi" msgid="3026388992566895417">"Wi-Fi"</string>
-    <string name="network_name_mobile" msgid="7655711935020766459">"Mobile"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="network_name_wifi">Wi-Fi</string>
+  <string name="network_name_mobile">Mobile</string>
+  <string name="content_description_overflow">More options</string>
+  <string name="snackbar_undo">UNDO</string>
+  <string name="ok_got_it">OK, got it</string>
 </resources>
diff --git a/java/com/android/dialer/common/res/values-es-rUS/strings.xml b/java/com/android/dialer/common/res/values-es-rUS/strings.xml
index 15bd5f6..b7a3af5 100644
--- a/java/com/android/dialer/common/res/values-es-rUS/strings.xml
+++ b/java/com/android/dialer/common/res/values-es-rUS/strings.xml
@@ -1,22 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="network_name_wifi" msgid="3026388992566895417">"Wi-Fi"</string>
-    <string name="network_name_mobile" msgid="7655711935020766459">"Celular"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="network_name_wifi">Wi-Fi</string>
+  <string name="network_name_mobile">Celular</string>
+  <string name="content_description_overflow">Más opciones</string>
+  <string name="snackbar_undo">DESHACER</string>
+  <string name="ok_got_it">Entendido</string>
 </resources>
diff --git a/java/com/android/dialer/common/res/values-es/strings.xml b/java/com/android/dialer/common/res/values-es/strings.xml
index 154aa13..1240cb7 100644
--- a/java/com/android/dialer/common/res/values-es/strings.xml
+++ b/java/com/android/dialer/common/res/values-es/strings.xml
@@ -1,22 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="network_name_wifi" msgid="3026388992566895417">"Wi-Fi"</string>
-    <string name="network_name_mobile" msgid="7655711935020766459">"Móvil"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="network_name_wifi">Wi-Fi</string>
+  <string name="network_name_mobile">Móvil</string>
+  <string name="content_description_overflow">Más opciones</string>
+  <string name="snackbar_undo">DESHACER</string>
+  <string name="ok_got_it">Entendido</string>
 </resources>
diff --git a/java/com/android/dialer/common/res/values-et/strings.xml b/java/com/android/dialer/common/res/values-et/strings.xml
index af6dd6a..7d6f24b 100644
--- a/java/com/android/dialer/common/res/values-et/strings.xml
+++ b/java/com/android/dialer/common/res/values-et/strings.xml
@@ -1,22 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="network_name_wifi" msgid="3026388992566895417">"WiFi"</string>
-    <string name="network_name_mobile" msgid="7655711935020766459">"Mobiil"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="network_name_wifi">WiFi</string>
+  <string name="network_name_mobile">Mobiil</string>
+  <string name="content_description_overflow">Rohkem valikuid</string>
+  <string name="snackbar_undo">VÕTA TAG.</string>
+  <string name="ok_got_it">OK, selge</string>
 </resources>
diff --git a/java/com/android/dialer/common/res/values-eu/strings.xml b/java/com/android/dialer/common/res/values-eu/strings.xml
index d4c3cd8..018165b 100644
--- a/java/com/android/dialer/common/res/values-eu/strings.xml
+++ b/java/com/android/dialer/common/res/values-eu/strings.xml
@@ -1,22 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="network_name_wifi" msgid="3026388992566895417">"Wi-Fi"</string>
-    <string name="network_name_mobile" msgid="7655711935020766459">"Mugikorra"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="network_name_wifi">Wi-Fi</string>
+  <string name="network_name_mobile">Mugikorra</string>
+  <string name="content_description_overflow">Aukera gehiago</string>
+  <string name="snackbar_undo">DESEGIN</string>
+  <string name="ok_got_it">Ados</string>
 </resources>
diff --git a/java/com/android/dialer/common/res/values-fa/strings.xml b/java/com/android/dialer/common/res/values-fa/strings.xml
index a9d798e..27fe4fc 100644
--- a/java/com/android/dialer/common/res/values-fa/strings.xml
+++ b/java/com/android/dialer/common/res/values-fa/strings.xml
@@ -1,22 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="network_name_wifi" msgid="3026388992566895417">"Wifi"</string>
-    <string name="network_name_mobile" msgid="7655711935020766459">"دستگاه همراه"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="network_name_wifi">Wifi</string>
+  <string name="network_name_mobile">دستگاه همراه</string>
+  <string name="content_description_overflow">گزینه‌های بیشتر</string>
+  <string name="snackbar_undo">واگرد</string>
+  <string name="ok_got_it">بله، متوجه شدم</string>
 </resources>
diff --git a/java/com/android/dialer/common/res/values-fi/strings.xml b/java/com/android/dialer/common/res/values-fi/strings.xml
index 8ff088c..550434b 100644
--- a/java/com/android/dialer/common/res/values-fi/strings.xml
+++ b/java/com/android/dialer/common/res/values-fi/strings.xml
@@ -1,22 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="network_name_wifi" msgid="3026388992566895417">"Wi‑Fi"</string>
-    <string name="network_name_mobile" msgid="7655711935020766459">"Mobiililaite"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="network_name_wifi">Wi‑Fi</string>
+  <string name="network_name_mobile">Mobiililaite</string>
+  <string name="content_description_overflow">Lisäasetukset</string>
+  <string name="snackbar_undo">KUMOA</string>
+  <string name="ok_got_it">OK</string>
 </resources>
diff --git a/java/com/android/dialer/common/res/values-fr-rCA/strings.xml b/java/com/android/dialer/common/res/values-fr-rCA/strings.xml
index 46172f8..9aa08e3 100644
--- a/java/com/android/dialer/common/res/values-fr-rCA/strings.xml
+++ b/java/com/android/dialer/common/res/values-fr-rCA/strings.xml
@@ -1,22 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="network_name_wifi" msgid="3026388992566895417">"Wi-Fi"</string>
-    <string name="network_name_mobile" msgid="7655711935020766459">"Appareil mobile"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="network_name_wifi">Wi-Fi</string>
+  <string name="network_name_mobile">Appareil mobile</string>
+  <string name="content_description_overflow">Plus d\'options</string>
+  <string name="snackbar_undo">ANNULER</string>
+  <string name="ok_got_it">OK</string>
 </resources>
diff --git a/java/com/android/dialer/common/res/values-fr/strings.xml b/java/com/android/dialer/common/res/values-fr/strings.xml
index 29ff1e1..a9bc43e 100644
--- a/java/com/android/dialer/common/res/values-fr/strings.xml
+++ b/java/com/android/dialer/common/res/values-fr/strings.xml
@@ -1,22 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="network_name_wifi" msgid="3026388992566895417">"Wi-Fi"</string>
-    <string name="network_name_mobile" msgid="7655711935020766459">"Mobile"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="network_name_wifi">Wi-Fi</string>
+  <string name="network_name_mobile">Mobile</string>
+  <string name="content_description_overflow">Plus d\'options</string>
+  <string name="snackbar_undo">ANNULER</string>
+  <string name="ok_got_it">OK</string>
 </resources>
diff --git a/java/com/android/dialer/common/res/values-gl/strings.xml b/java/com/android/dialer/common/res/values-gl/strings.xml
index 6a287e5..5293611 100644
--- a/java/com/android/dialer/common/res/values-gl/strings.xml
+++ b/java/com/android/dialer/common/res/values-gl/strings.xml
@@ -1,22 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="network_name_wifi" msgid="3026388992566895417">"Wifi"</string>
-    <string name="network_name_mobile" msgid="7655711935020766459">"Móbil"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="network_name_wifi">Wifi</string>
+  <string name="network_name_mobile">Móbil</string>
+  <string name="content_description_overflow">Máis opcións</string>
+  <string name="snackbar_undo">DESFACER</string>
+  <string name="ok_got_it">Entendido</string>
 </resources>
diff --git a/java/com/android/dialer/common/res/values-gu/strings.xml b/java/com/android/dialer/common/res/values-gu/strings.xml
index 9a565eb..3a123da 100644
--- a/java/com/android/dialer/common/res/values-gu/strings.xml
+++ b/java/com/android/dialer/common/res/values-gu/strings.xml
@@ -1,22 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="network_name_wifi" msgid="3026388992566895417">"Wifi"</string>
-    <string name="network_name_mobile" msgid="7655711935020766459">"મોબાઇલ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="network_name_wifi">Wifi</string>
+  <string name="network_name_mobile">મોબાઇલ</string>
+  <string name="content_description_overflow">વધુ વિકલ્પો</string>
+  <string name="snackbar_undo">રદ કરો</string>
+  <string name="ok_got_it">બરાબર, સમજાઈ ગયું</string>
 </resources>
diff --git a/java/com/android/dialer/common/res/values-hi/strings.xml b/java/com/android/dialer/common/res/values-hi/strings.xml
index 1983869..a7bb578 100644
--- a/java/com/android/dialer/common/res/values-hi/strings.xml
+++ b/java/com/android/dialer/common/res/values-hi/strings.xml
@@ -1,22 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="network_name_wifi" msgid="3026388992566895417">"वाई-फ़ाई"</string>
-    <string name="network_name_mobile" msgid="7655711935020766459">"मोबाइल"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="network_name_wifi">वाई-फ़ाई</string>
+  <string name="network_name_mobile">मोबाइल</string>
+  <string name="content_description_overflow">ज़्यादा विकल्प</string>
+  <string name="snackbar_undo">पहले जैसा</string>
+  <string name="ok_got_it">ठीक है</string>
 </resources>
diff --git a/java/com/android/dialer/common/res/values-hr/strings.xml b/java/com/android/dialer/common/res/values-hr/strings.xml
index 94c2664..5ee64f5 100644
--- a/java/com/android/dialer/common/res/values-hr/strings.xml
+++ b/java/com/android/dialer/common/res/values-hr/strings.xml
@@ -1,22 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="network_name_wifi" msgid="3026388992566895417">"Wi-Fi"</string>
-    <string name="network_name_mobile" msgid="7655711935020766459">"Mobilni"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="network_name_wifi">Wi-Fi</string>
+  <string name="network_name_mobile">Mobilni</string>
+  <string name="content_description_overflow">Više opcija</string>
+  <string name="snackbar_undo">PONIŠTI</string>
+  <string name="ok_got_it">U redu, shvaćam</string>
 </resources>
diff --git a/java/com/android/dialer/common/res/values-hu/strings.xml b/java/com/android/dialer/common/res/values-hu/strings.xml
index 57e6e0b..1b44e68 100644
--- a/java/com/android/dialer/common/res/values-hu/strings.xml
+++ b/java/com/android/dialer/common/res/values-hu/strings.xml
@@ -1,22 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="network_name_wifi" msgid="3026388992566895417">"Wi-Fi"</string>
-    <string name="network_name_mobile" msgid="7655711935020766459">"Mobil"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="network_name_wifi">Wi-Fi</string>
+  <string name="network_name_mobile">Mobil</string>
+  <string name="content_description_overflow">További opciók</string>
+  <string name="snackbar_undo">VISSZAVON.</string>
+  <string name="ok_got_it">Rendben, értem</string>
 </resources>
diff --git a/java/com/android/dialer/common/res/values-hy/strings.xml b/java/com/android/dialer/common/res/values-hy/strings.xml
index 6e78fe8..2faa7de 100644
--- a/java/com/android/dialer/common/res/values-hy/strings.xml
+++ b/java/com/android/dialer/common/res/values-hy/strings.xml
@@ -1,22 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="network_name_wifi" msgid="3026388992566895417">"Wifi"</string>
-    <string name="network_name_mobile" msgid="7655711935020766459">"Բջջային"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="network_name_wifi">Wifi</string>
+  <string name="network_name_mobile">Բջջային</string>
+  <string name="content_description_overflow">Այլ ընտրանքներ</string>
+  <string name="snackbar_undo">ՀԵՏԱՐԿԵԼ</string>
+  <string name="ok_got_it">Պարզ է</string>
 </resources>
diff --git a/java/com/android/dialer/common/res/values-in/strings.xml b/java/com/android/dialer/common/res/values-in/strings.xml
index 85df717..4c5aa65 100644
--- a/java/com/android/dialer/common/res/values-in/strings.xml
+++ b/java/com/android/dialer/common/res/values-in/strings.xml
@@ -1,22 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="network_name_wifi" msgid="3026388992566895417">"Wi-Fi"</string>
-    <string name="network_name_mobile" msgid="7655711935020766459">"Ponsel"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="network_name_wifi">Wi-Fi</string>
+  <string name="network_name_mobile">Ponsel</string>
+  <string name="content_description_overflow">Opsi lain</string>
+  <string name="snackbar_undo">URUNGKAN</string>
+  <string name="ok_got_it">Oke, paham</string>
 </resources>
diff --git a/java/com/android/dialer/common/res/values-is/strings.xml b/java/com/android/dialer/common/res/values-is/strings.xml
index 987becc..12987fe 100644
--- a/java/com/android/dialer/common/res/values-is/strings.xml
+++ b/java/com/android/dialer/common/res/values-is/strings.xml
@@ -1,22 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="network_name_wifi" msgid="3026388992566895417">"WiFi"</string>
-    <string name="network_name_mobile" msgid="7655711935020766459">"Farsími"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="network_name_wifi">WiFi</string>
+  <string name="network_name_mobile">Farsími</string>
+  <string name="content_description_overflow">Fleiri valkostir</string>
+  <string name="snackbar_undo">AFTURKALLA</string>
+  <string name="ok_got_it">Ég skil</string>
 </resources>
diff --git a/java/com/android/dialer/common/res/values-it/strings.xml b/java/com/android/dialer/common/res/values-it/strings.xml
index 8166c39..aa16fb0 100644
--- a/java/com/android/dialer/common/res/values-it/strings.xml
+++ b/java/com/android/dialer/common/res/values-it/strings.xml
@@ -1,22 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="network_name_wifi" msgid="3026388992566895417">"Wi-Fi"</string>
-    <string name="network_name_mobile" msgid="7655711935020766459">"Cellulare"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="network_name_wifi">Wi-Fi</string>
+  <string name="network_name_mobile">Cellulare</string>
+  <string name="content_description_overflow">Altre opzioni</string>
+  <string name="snackbar_undo">ANNULLA</string>
+  <string name="ok_got_it">Ok</string>
 </resources>
diff --git a/java/com/android/dialer/common/res/values-iw/strings.xml b/java/com/android/dialer/common/res/values-iw/strings.xml
index 6190045..6a3d5c6 100644
--- a/java/com/android/dialer/common/res/values-iw/strings.xml
+++ b/java/com/android/dialer/common/res/values-iw/strings.xml
@@ -1,22 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="network_name_wifi" msgid="3026388992566895417">"Wi-Fi"</string>
-    <string name="network_name_mobile" msgid="7655711935020766459">"נייד"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="network_name_wifi">Wi-Fi</string>
+  <string name="network_name_mobile">נייד</string>
+  <string name="content_description_overflow">אפשרויות נוספות</string>
+  <string name="snackbar_undo">ביטול</string>
+  <string name="ok_got_it">הבנתי</string>
 </resources>
diff --git a/java/com/android/dialer/common/res/values-ja/strings.xml b/java/com/android/dialer/common/res/values-ja/strings.xml
index 3a883cc..e6cd11a 100644
--- a/java/com/android/dialer/common/res/values-ja/strings.xml
+++ b/java/com/android/dialer/common/res/values-ja/strings.xml
@@ -1,22 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="network_name_wifi" msgid="3026388992566895417">"Wi-Fi"</string>
-    <string name="network_name_mobile" msgid="7655711935020766459">"モバイル"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="network_name_wifi">Wi-Fi</string>
+  <string name="network_name_mobile">モバイル</string>
+  <string name="content_description_overflow">その他のオプション</string>
+  <string name="snackbar_undo">元に戻す</string>
+  <string name="ok_got_it">OK</string>
 </resources>
diff --git a/java/com/android/dialer/common/res/values-ka/strings.xml b/java/com/android/dialer/common/res/values-ka/strings.xml
index 65acee5..9e2221f 100644
--- a/java/com/android/dialer/common/res/values-ka/strings.xml
+++ b/java/com/android/dialer/common/res/values-ka/strings.xml
@@ -1,22 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="network_name_wifi" msgid="3026388992566895417">"Wi-Fi"</string>
-    <string name="network_name_mobile" msgid="7655711935020766459">"მობილური"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="network_name_wifi">Wi-Fi</string>
+  <string name="network_name_mobile">მობილური</string>
+  <string name="content_description_overflow">სხვა ვარიანტები</string>
+  <string name="snackbar_undo">მოქმედების გაუქმება</string>
+  <string name="ok_got_it">კარგი, გასაგებია</string>
 </resources>
diff --git a/java/com/android/dialer/common/res/values-kk/strings.xml b/java/com/android/dialer/common/res/values-kk/strings.xml
index 57bd245..86523fd 100644
--- a/java/com/android/dialer/common/res/values-kk/strings.xml
+++ b/java/com/android/dialer/common/res/values-kk/strings.xml
@@ -1,22 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="network_name_wifi" msgid="3026388992566895417">"Wifi"</string>
-    <string name="network_name_mobile" msgid="7655711935020766459">"Ұялы телефон"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="network_name_wifi">Wifi</string>
+  <string name="network_name_mobile">Ұялы телефон</string>
+  <string name="content_description_overflow">Қосымша опциялар</string>
+  <string name="snackbar_undo">ҚАЙТАРУ</string>
+  <string name="ok_got_it">Жарайды, түсіндім</string>
 </resources>
diff --git a/java/com/android/dialer/common/res/values-km/strings.xml b/java/com/android/dialer/common/res/values-km/strings.xml
index 0788d94..87b36b6 100644
--- a/java/com/android/dialer/common/res/values-km/strings.xml
+++ b/java/com/android/dialer/common/res/values-km/strings.xml
@@ -1,22 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="network_name_wifi" msgid="3026388992566895417">"វ៉ាយហ្វាយ"</string>
-    <string name="network_name_mobile" msgid="7655711935020766459">"ចល័ត"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="network_name_wifi">វ៉ាយហ្វាយ</string>
+  <string name="network_name_mobile">ចល័ត</string>
+  <string name="content_description_overflow">ជម្រើស​ច្រើនទៀត</string>
+  <string name="snackbar_undo">ត្រឡប់​វិញ</string>
+  <string name="ok_got_it">យល់ព្រម យល់ហើយ</string>
 </resources>
diff --git a/java/com/android/dialer/common/res/values-kn/strings.xml b/java/com/android/dialer/common/res/values-kn/strings.xml
index c854b0a..9659619 100644
--- a/java/com/android/dialer/common/res/values-kn/strings.xml
+++ b/java/com/android/dialer/common/res/values-kn/strings.xml
@@ -1,22 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="network_name_wifi" msgid="3026388992566895417">"ವೈಫೈ"</string>
-    <string name="network_name_mobile" msgid="7655711935020766459">"ಮೊಬೈಲ್"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="network_name_wifi">ವೈಫೈ</string>
+  <string name="network_name_mobile">ಮೊಬೈಲ್</string>
+  <string name="content_description_overflow">ಇನ್ನಷ್ಟು ಆಯ್ಕೆಗಳು</string>
+  <string name="snackbar_undo">ರದ್ದುಮಾಡಿ</string>
+  <string name="ok_got_it">ಸರಿ, ಅರ್ಥವಾಯಿತು</string>
 </resources>
diff --git a/java/com/android/dialer/common/res/values-ko/strings.xml b/java/com/android/dialer/common/res/values-ko/strings.xml
index bbe7c8f..3f6ed44 100644
--- a/java/com/android/dialer/common/res/values-ko/strings.xml
+++ b/java/com/android/dialer/common/res/values-ko/strings.xml
@@ -1,22 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="network_name_wifi" msgid="3026388992566895417">"Wi-Fi"</string>
-    <string name="network_name_mobile" msgid="7655711935020766459">"모바일"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="network_name_wifi">Wi-Fi</string>
+  <string name="network_name_mobile">모바일</string>
+  <string name="content_description_overflow">추가 옵션</string>
+  <string name="snackbar_undo">실행취소</string>
+  <string name="ok_got_it">확인</string>
 </resources>
diff --git a/java/com/android/dialer/common/res/values-ky/strings.xml b/java/com/android/dialer/common/res/values-ky/strings.xml
index f2f5279..aae8901 100644
--- a/java/com/android/dialer/common/res/values-ky/strings.xml
+++ b/java/com/android/dialer/common/res/values-ky/strings.xml
@@ -1,22 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="network_name_wifi" msgid="3026388992566895417">"Wi‑Fi"</string>
-    <string name="network_name_mobile" msgid="7655711935020766459">"Мобилдик"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="network_name_wifi">Wi‑Fi</string>
+  <string name="network_name_mobile">Мобилдик</string>
+  <string name="content_description_overflow">Дагы параметрлер</string>
+  <string name="snackbar_undo">КАЙТАРУУ</string>
+  <string name="ok_got_it">Жарайт, түшүндүм</string>
 </resources>
diff --git a/java/com/android/dialer/common/res/values-lo/strings.xml b/java/com/android/dialer/common/res/values-lo/strings.xml
index 5433ce8..051ef1e 100644
--- a/java/com/android/dialer/common/res/values-lo/strings.xml
+++ b/java/com/android/dialer/common/res/values-lo/strings.xml
@@ -1,22 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="network_name_wifi" msgid="3026388992566895417">"Wifi"</string>
-    <string name="network_name_mobile" msgid="7655711935020766459">"ມືຖື"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="network_name_wifi">Wifi</string>
+  <string name="network_name_mobile">ມືຖື</string>
+  <string name="content_description_overflow">ຕົວເລືອກເພີ່ມເຕີມ</string>
+  <string name="snackbar_undo">ຍົກເລີກ</string>
+  <string name="ok_got_it">ຕົກລົງ, ເຂົ້າໃຈແລ້ວ</string>
 </resources>
diff --git a/java/com/android/dialer/common/res/values-lt/strings.xml b/java/com/android/dialer/common/res/values-lt/strings.xml
index 78e0934..c85b7b1 100644
--- a/java/com/android/dialer/common/res/values-lt/strings.xml
+++ b/java/com/android/dialer/common/res/values-lt/strings.xml
@@ -1,22 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="network_name_wifi" msgid="3026388992566895417">"Wi-Fi"</string>
-    <string name="network_name_mobile" msgid="7655711935020766459">"Mobilusis"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="network_name_wifi">Wi-Fi</string>
+  <string name="network_name_mobile">Mobilusis</string>
+  <string name="content_description_overflow">Daugiau parinkčių</string>
+  <string name="snackbar_undo">ANULIUOTI</string>
+  <string name="ok_got_it">Gerai, supratau</string>
 </resources>
diff --git a/java/com/android/dialer/common/res/values-lv/strings.xml b/java/com/android/dialer/common/res/values-lv/strings.xml
index e857929..73ca39d 100644
--- a/java/com/android/dialer/common/res/values-lv/strings.xml
+++ b/java/com/android/dialer/common/res/values-lv/strings.xml
@@ -1,22 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="network_name_wifi" msgid="3026388992566895417">"Wi-Fi"</string>
-    <string name="network_name_mobile" msgid="7655711935020766459">"Mobilais tīkls"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="network_name_wifi">Wi-Fi</string>
+  <string name="network_name_mobile">Mobilais tīkls</string>
+  <string name="content_description_overflow">Citas opcijas</string>
+  <string name="snackbar_undo">ATSAUKT</string>
+  <string name="ok_got_it">Labi</string>
 </resources>
diff --git a/java/com/android/dialer/common/res/values-mk/strings.xml b/java/com/android/dialer/common/res/values-mk/strings.xml
index 4ccf6bb..6d84b99 100644
--- a/java/com/android/dialer/common/res/values-mk/strings.xml
+++ b/java/com/android/dialer/common/res/values-mk/strings.xml
@@ -1,22 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="network_name_wifi" msgid="3026388992566895417">"Wi-Fi"</string>
-    <string name="network_name_mobile" msgid="7655711935020766459">"Мобилен"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="network_name_wifi">Wi-Fi</string>
+  <string name="network_name_mobile">Мобилен</string>
+  <string name="content_description_overflow">Повеќе опции</string>
+  <string name="snackbar_undo">ВРАТИ</string>
+  <string name="ok_got_it">Во ред, сфатив</string>
 </resources>
diff --git a/java/com/android/dialer/common/res/values-ml/strings.xml b/java/com/android/dialer/common/res/values-ml/strings.xml
index 0f10d38..4f4de21 100644
--- a/java/com/android/dialer/common/res/values-ml/strings.xml
+++ b/java/com/android/dialer/common/res/values-ml/strings.xml
@@ -1,22 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="network_name_wifi" msgid="3026388992566895417">"Wifi"</string>
-    <string name="network_name_mobile" msgid="7655711935020766459">"മൊബൈല്‍"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="network_name_wifi">Wifi</string>
+  <string name="network_name_mobile">മൊബൈല്‍</string>
+  <string name="content_description_overflow">കൂടുതൽ ഓപ്‌ഷനുകൾ</string>
+  <string name="snackbar_undo">പഴയപടിയാക്കുക</string>
+  <string name="ok_got_it">മനസിലായി</string>
 </resources>
diff --git a/java/com/android/dialer/common/res/values-mn/strings.xml b/java/com/android/dialer/common/res/values-mn/strings.xml
index 1ac0f00..b92dd5d 100644
--- a/java/com/android/dialer/common/res/values-mn/strings.xml
+++ b/java/com/android/dialer/common/res/values-mn/strings.xml
@@ -1,22 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="network_name_wifi" msgid="3026388992566895417">"WiFi"</string>
-    <string name="network_name_mobile" msgid="7655711935020766459">"Мобайл"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="network_name_wifi">WiFi</string>
+  <string name="network_name_mobile">Мобайл</string>
+  <string name="content_description_overflow">Бусад сонголт</string>
+  <string name="snackbar_undo">БУЦААХ</string>
+  <string name="ok_got_it">За, ойлголоо</string>
 </resources>
diff --git a/java/com/android/dialer/common/res/values-mr/strings.xml b/java/com/android/dialer/common/res/values-mr/strings.xml
index 491f0c0..30aa451 100644
--- a/java/com/android/dialer/common/res/values-mr/strings.xml
+++ b/java/com/android/dialer/common/res/values-mr/strings.xml
@@ -1,22 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="network_name_wifi" msgid="3026388992566895417">"वायफाय"</string>
-    <string name="network_name_mobile" msgid="7655711935020766459">"मोबाईल"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="network_name_wifi">वायफाय</string>
+  <string name="network_name_mobile">मोबाईल</string>
+  <string name="content_description_overflow">आणखी पर्याय</string>
+  <string name="snackbar_undo">पहिल्यासारखे करा</string>
+  <string name="ok_got_it">ओके, समजले</string>
 </resources>
diff --git a/java/com/android/dialer/common/res/values-ms/strings.xml b/java/com/android/dialer/common/res/values-ms/strings.xml
index 3ef6055..496f980 100644
--- a/java/com/android/dialer/common/res/values-ms/strings.xml
+++ b/java/com/android/dialer/common/res/values-ms/strings.xml
@@ -1,22 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="network_name_wifi" msgid="3026388992566895417">"Wi-Fi"</string>
-    <string name="network_name_mobile" msgid="7655711935020766459">"Mudah Alih"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="network_name_wifi">Wi-Fi</string>
+  <string name="network_name_mobile">Mudah Alih</string>
+  <string name="content_description_overflow">Lagi pilihan</string>
+  <string name="snackbar_undo">BUAT ASAL</string>
+  <string name="ok_got_it">OK</string>
 </resources>
diff --git a/java/com/android/dialer/common/res/values-my/strings.xml b/java/com/android/dialer/common/res/values-my/strings.xml
index c211122..1f9bc2a 100644
--- a/java/com/android/dialer/common/res/values-my/strings.xml
+++ b/java/com/android/dialer/common/res/values-my/strings.xml
@@ -1,22 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="network_name_wifi" msgid="3026388992566895417">"Wifi"</string>
-    <string name="network_name_mobile" msgid="7655711935020766459">"မိုဘိုင်း"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="network_name_wifi">Wifi</string>
+  <string name="network_name_mobile">မိုဘိုင်း</string>
+  <string name="content_description_overflow">နောက်ထပ် ရွေးစရာများ</string>
+  <string name="snackbar_undo">မလုပ်တော့</string>
+  <string name="ok_got_it">ရပါပြီ</string>
 </resources>
diff --git a/java/com/android/dialer/common/res/values-nb/strings.xml b/java/com/android/dialer/common/res/values-nb/strings.xml
index 57e6e0b..ac8eb81 100644
--- a/java/com/android/dialer/common/res/values-nb/strings.xml
+++ b/java/com/android/dialer/common/res/values-nb/strings.xml
@@ -1,22 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="network_name_wifi" msgid="3026388992566895417">"Wi-Fi"</string>
-    <string name="network_name_mobile" msgid="7655711935020766459">"Mobil"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="network_name_wifi">Wi-Fi</string>
+  <string name="network_name_mobile">Mobil</string>
+  <string name="content_description_overflow">Flere alternativer</string>
+  <string name="snackbar_undo">ANGRE</string>
+  <string name="ok_got_it">Greit</string>
 </resources>
diff --git a/java/com/android/dialer/common/res/values-ne/strings.xml b/java/com/android/dialer/common/res/values-ne/strings.xml
index 103f81f..f60ebf6 100644
--- a/java/com/android/dialer/common/res/values-ne/strings.xml
+++ b/java/com/android/dialer/common/res/values-ne/strings.xml
@@ -1,22 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="network_name_wifi" msgid="3026388992566895417">"Wifi"</string>
-    <string name="network_name_mobile" msgid="7655711935020766459">"मोबाइल"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="network_name_wifi">Wifi</string>
+  <string name="network_name_mobile">मोबाइल</string>
+  <string name="content_description_overflow">थप विकल्पहरू</string>
+  <string name="snackbar_undo">अन्डू गर्नुहोस्</string>
+  <string name="ok_got_it">ठिक छ, बुझेँ</string>
 </resources>
diff --git a/java/com/android/dialer/common/res/values-nl/strings.xml b/java/com/android/dialer/common/res/values-nl/strings.xml
index 7b9745e..2ff76c3 100644
--- a/java/com/android/dialer/common/res/values-nl/strings.xml
+++ b/java/com/android/dialer/common/res/values-nl/strings.xml
@@ -1,22 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="network_name_wifi" msgid="3026388992566895417">"Wifi"</string>
-    <string name="network_name_mobile" msgid="7655711935020766459">"Mobiel"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="network_name_wifi">Wifi</string>
+  <string name="network_name_mobile">Mobiel</string>
+  <string name="content_description_overflow">Meer opties</string>
+  <string name="snackbar_undo">HERSTELLEN</string>
+  <string name="ok_got_it">OK</string>
 </resources>
diff --git a/java/com/android/dialer/common/res/values-no/strings.xml b/java/com/android/dialer/common/res/values-no/strings.xml
index 57e6e0b..ac8eb81 100644
--- a/java/com/android/dialer/common/res/values-no/strings.xml
+++ b/java/com/android/dialer/common/res/values-no/strings.xml
@@ -1,22 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="network_name_wifi" msgid="3026388992566895417">"Wi-Fi"</string>
-    <string name="network_name_mobile" msgid="7655711935020766459">"Mobil"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="network_name_wifi">Wi-Fi</string>
+  <string name="network_name_mobile">Mobil</string>
+  <string name="content_description_overflow">Flere alternativer</string>
+  <string name="snackbar_undo">ANGRE</string>
+  <string name="ok_got_it">Greit</string>
 </resources>
diff --git a/java/com/android/dialer/common/res/values-pa/strings.xml b/java/com/android/dialer/common/res/values-pa/strings.xml
index b656d19..71fd869 100644
--- a/java/com/android/dialer/common/res/values-pa/strings.xml
+++ b/java/com/android/dialer/common/res/values-pa/strings.xml
@@ -1,22 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="network_name_wifi" msgid="3026388992566895417">"Wifi"</string>
-    <string name="network_name_mobile" msgid="7655711935020766459">"ਮੋਬਾਈਲ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="network_name_wifi">Wifi</string>
+  <string name="network_name_mobile">ਮੋਬਾਈਲ</string>
+  <string name="content_description_overflow">ਹੋਰ ਵਿਕਲਪ</string>
+  <string name="snackbar_undo">ਅਣਕੀਤਾ ਕਰੋ</string>
+  <string name="ok_got_it">ਠੀਕ ਹੈ, ਸਮਝ ਲਿਆ</string>
 </resources>
diff --git a/java/com/android/dialer/common/res/values-pl/strings.xml b/java/com/android/dialer/common/res/values-pl/strings.xml
index b6f4eb4..c79ba09 100644
--- a/java/com/android/dialer/common/res/values-pl/strings.xml
+++ b/java/com/android/dialer/common/res/values-pl/strings.xml
@@ -1,22 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="network_name_wifi" msgid="3026388992566895417">"Wi-Fi"</string>
-    <string name="network_name_mobile" msgid="7655711935020766459">"Komórka"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="network_name_wifi">Wi-Fi</string>
+  <string name="network_name_mobile">Komórka</string>
+  <string name="content_description_overflow">Więcej opcji</string>
+  <string name="snackbar_undo">COFNIJ</string>
+  <string name="ok_got_it">OK</string>
 </resources>
diff --git a/java/com/android/dialer/common/res/values-pt-rBR/strings.xml b/java/com/android/dialer/common/res/values-pt-rBR/strings.xml
index 08e0644..be8e551 100644
--- a/java/com/android/dialer/common/res/values-pt-rBR/strings.xml
+++ b/java/com/android/dialer/common/res/values-pt-rBR/strings.xml
@@ -1,22 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="network_name_wifi" msgid="3026388992566895417">"Wi-Fi"</string>
-    <string name="network_name_mobile" msgid="7655711935020766459">"Dispositivo móvel"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="network_name_wifi">Wi-Fi</string>
+  <string name="network_name_mobile">Dispositivo móvel</string>
+  <string name="content_description_overflow">Mais opções</string>
+  <string name="snackbar_undo">DESFAZER</string>
+  <string name="ok_got_it">Ok</string>
 </resources>
diff --git a/java/com/android/dialer/common/res/values-pt-rPT/strings.xml b/java/com/android/dialer/common/res/values-pt-rPT/strings.xml
index a876565..4ad8980 100644
--- a/java/com/android/dialer/common/res/values-pt-rPT/strings.xml
+++ b/java/com/android/dialer/common/res/values-pt-rPT/strings.xml
@@ -1,22 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="network_name_wifi" msgid="3026388992566895417">"Wi-Fi"</string>
-    <string name="network_name_mobile" msgid="7655711935020766459">"Telemóvel"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="network_name_wifi">Wi-Fi</string>
+  <string name="network_name_mobile">Telemóvel</string>
+  <string name="content_description_overflow">Mais opções</string>
+  <string name="snackbar_undo">ANULAR</string>
+  <string name="ok_got_it">OK, compreendi</string>
 </resources>
diff --git a/java/com/android/dialer/common/res/values-pt/strings.xml b/java/com/android/dialer/common/res/values-pt/strings.xml
index 08e0644..be8e551 100644
--- a/java/com/android/dialer/common/res/values-pt/strings.xml
+++ b/java/com/android/dialer/common/res/values-pt/strings.xml
@@ -1,22 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="network_name_wifi" msgid="3026388992566895417">"Wi-Fi"</string>
-    <string name="network_name_mobile" msgid="7655711935020766459">"Dispositivo móvel"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="network_name_wifi">Wi-Fi</string>
+  <string name="network_name_mobile">Dispositivo móvel</string>
+  <string name="content_description_overflow">Mais opções</string>
+  <string name="snackbar_undo">DESFAZER</string>
+  <string name="ok_got_it">Ok</string>
 </resources>
diff --git a/java/com/android/dialer/common/res/values-ro/strings.xml b/java/com/android/dialer/common/res/values-ro/strings.xml
index 57e6e0b..a777cbc 100644
--- a/java/com/android/dialer/common/res/values-ro/strings.xml
+++ b/java/com/android/dialer/common/res/values-ro/strings.xml
@@ -1,22 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="network_name_wifi" msgid="3026388992566895417">"Wi-Fi"</string>
-    <string name="network_name_mobile" msgid="7655711935020766459">"Mobil"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="network_name_wifi">Wi-Fi</string>
+  <string name="network_name_mobile">Mobil</string>
+  <string name="content_description_overflow">Mai multe opțiuni</string>
+  <string name="snackbar_undo">ANULAȚI</string>
+  <string name="ok_got_it">OK, am înțeles</string>
 </resources>
diff --git a/java/com/android/dialer/common/res/values-ru/strings.xml b/java/com/android/dialer/common/res/values-ru/strings.xml
index 2b5a0d1..f2cc59b 100644
--- a/java/com/android/dialer/common/res/values-ru/strings.xml
+++ b/java/com/android/dialer/common/res/values-ru/strings.xml
@@ -1,22 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="network_name_wifi" msgid="3026388992566895417">"Wi-Fi"</string>
-    <string name="network_name_mobile" msgid="7655711935020766459">"Моб."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="network_name_wifi">Wi-Fi</string>
+  <string name="network_name_mobile">Моб.</string>
+  <string name="content_description_overflow">Ещё</string>
+  <string name="snackbar_undo">ОТМЕНИТЬ</string>
+  <string name="ok_got_it">ОК</string>
 </resources>
diff --git a/java/com/android/dialer/common/res/values-si/strings.xml b/java/com/android/dialer/common/res/values-si/strings.xml
index 4df629d..f40d1a5 100644
--- a/java/com/android/dialer/common/res/values-si/strings.xml
+++ b/java/com/android/dialer/common/res/values-si/strings.xml
@@ -1,22 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="network_name_wifi" msgid="3026388992566895417">"WiFi"</string>
-    <string name="network_name_mobile" msgid="7655711935020766459">"ජංගම"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="network_name_wifi">WiFi</string>
+  <string name="network_name_mobile">ජංගම</string>
+  <string name="content_description_overflow">තව විකල්ප</string>
+  <string name="snackbar_undo">පසුගමනය ක.</string>
+  <string name="ok_got_it">හරි, තේරුණා</string>
 </resources>
diff --git a/java/com/android/dialer/common/res/values-sk/strings.xml b/java/com/android/dialer/common/res/values-sk/strings.xml
index 613d54a..3514d41 100644
--- a/java/com/android/dialer/common/res/values-sk/strings.xml
+++ b/java/com/android/dialer/common/res/values-sk/strings.xml
@@ -1,22 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="network_name_wifi" msgid="3026388992566895417">"Wi‑Fi"</string>
-    <string name="network_name_mobile" msgid="7655711935020766459">"Mobil"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="network_name_wifi">Wi‑Fi</string>
+  <string name="network_name_mobile">Mobil</string>
+  <string name="content_description_overflow">Ďalšie možnosti</string>
+  <string name="snackbar_undo">SPÄŤ</string>
+  <string name="ok_got_it">Dobre</string>
 </resources>
diff --git a/java/com/android/dialer/common/res/values-sl/strings.xml b/java/com/android/dialer/common/res/values-sl/strings.xml
index 5a2203a..4832a25 100644
--- a/java/com/android/dialer/common/res/values-sl/strings.xml
+++ b/java/com/android/dialer/common/res/values-sl/strings.xml
@@ -1,22 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="network_name_wifi" msgid="3026388992566895417">"Wi-Fi"</string>
-    <string name="network_name_mobile" msgid="7655711935020766459">"Mobilni telefon"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="network_name_wifi">Wi-Fi</string>
+  <string name="network_name_mobile">Mobilni telefon</string>
+  <string name="content_description_overflow">Več možnosti</string>
+  <string name="snackbar_undo">RAZVELJAVI</string>
+  <string name="ok_got_it">V redu, razumem</string>
 </resources>
diff --git a/java/com/android/dialer/common/res/values-sq/strings.xml b/java/com/android/dialer/common/res/values-sq/strings.xml
index 82ed739..8133c95 100644
--- a/java/com/android/dialer/common/res/values-sq/strings.xml
+++ b/java/com/android/dialer/common/res/values-sq/strings.xml
@@ -1,22 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="network_name_wifi" msgid="3026388992566895417">"Wifi"</string>
-    <string name="network_name_mobile" msgid="7655711935020766459">"Celulari"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="network_name_wifi">Wifi</string>
+  <string name="network_name_mobile">Celulari</string>
+  <string name="content_description_overflow">Më shumë opsione</string>
+  <string name="snackbar_undo">ZHBËJ</string>
+  <string name="ok_got_it">Në rregull, e kuptova</string>
 </resources>
diff --git a/java/com/android/dialer/common/res/values-sr/strings.xml b/java/com/android/dialer/common/res/values-sr/strings.xml
index 4c164f4..7af444d 100644
--- a/java/com/android/dialer/common/res/values-sr/strings.xml
+++ b/java/com/android/dialer/common/res/values-sr/strings.xml
@@ -1,22 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="network_name_wifi" msgid="3026388992566895417">"Wi-Fi"</string>
-    <string name="network_name_mobile" msgid="7655711935020766459">"Мобилни уређаји"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="network_name_wifi">Wi-Fi</string>
+  <string name="network_name_mobile">Мобилни уређаји</string>
+  <string name="content_description_overflow">Још опција</string>
+  <string name="snackbar_undo">ОПОЗОВИ</string>
+  <string name="ok_got_it">Важи</string>
 </resources>
diff --git a/java/com/android/dialer/common/res/values-sv/strings.xml b/java/com/android/dialer/common/res/values-sv/strings.xml
index 57e6e0b..5b71634 100644
--- a/java/com/android/dialer/common/res/values-sv/strings.xml
+++ b/java/com/android/dialer/common/res/values-sv/strings.xml
@@ -1,22 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="network_name_wifi" msgid="3026388992566895417">"Wi-Fi"</string>
-    <string name="network_name_mobile" msgid="7655711935020766459">"Mobil"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="network_name_wifi">Wi-Fi</string>
+  <string name="network_name_mobile">Mobil</string>
+  <string name="content_description_overflow">Fler alternativ</string>
+  <string name="snackbar_undo">ÅNGRA</string>
+  <string name="ok_got_it">OK</string>
 </resources>
diff --git a/java/com/android/dialer/common/res/values-sw/strings.xml b/java/com/android/dialer/common/res/values-sw/strings.xml
index 48d0b35..e615c73 100644
--- a/java/com/android/dialer/common/res/values-sw/strings.xml
+++ b/java/com/android/dialer/common/res/values-sw/strings.xml
@@ -1,22 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="network_name_wifi" msgid="3026388992566895417">"Wi-Fi"</string>
-    <string name="network_name_mobile" msgid="7655711935020766459">"Simu ya mkononi"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="network_name_wifi">Wi-Fi</string>
+  <string name="network_name_mobile">Simu ya mkononi</string>
+  <string name="content_description_overflow">Chaguo zaidi</string>
+  <string name="snackbar_undo">TENDUA</string>
+  <string name="ok_got_it">Sawa, nimeelewa</string>
 </resources>
diff --git a/java/com/android/dialer/common/res/values-ta/strings.xml b/java/com/android/dialer/common/res/values-ta/strings.xml
index b3b5e32..c97f233 100644
--- a/java/com/android/dialer/common/res/values-ta/strings.xml
+++ b/java/com/android/dialer/common/res/values-ta/strings.xml
@@ -1,22 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="network_name_wifi" msgid="3026388992566895417">"வைஃபை"</string>
-    <string name="network_name_mobile" msgid="7655711935020766459">"மொபைல்"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="network_name_wifi">வைஃபை</string>
+  <string name="network_name_mobile">மொபைல்</string>
+  <string name="content_description_overflow">மேலும் விருப்பங்கள்</string>
+  <string name="snackbar_undo">செயல்தவிர்</string>
+  <string name="ok_got_it">சரி</string>
 </resources>
diff --git a/java/com/android/dialer/common/res/values-te/strings.xml b/java/com/android/dialer/common/res/values-te/strings.xml
index aafec37..066601f 100644
--- a/java/com/android/dialer/common/res/values-te/strings.xml
+++ b/java/com/android/dialer/common/res/values-te/strings.xml
@@ -1,22 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="network_name_wifi" msgid="3026388992566895417">"Wifi"</string>
-    <string name="network_name_mobile" msgid="7655711935020766459">"మొబైల్"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="network_name_wifi">Wifi</string>
+  <string name="network_name_mobile">మొబైల్</string>
+  <string name="content_description_overflow">మరిన్ని ఎంపికలు</string>
+  <string name="snackbar_undo">చర్యరద్దు</string>
+  <string name="ok_got_it">సరే, అర్థమైంది</string>
 </resources>
diff --git a/java/com/android/dialer/common/res/values-th/strings.xml b/java/com/android/dialer/common/res/values-th/strings.xml
index 38c5f83..29b5571 100644
--- a/java/com/android/dialer/common/res/values-th/strings.xml
+++ b/java/com/android/dialer/common/res/values-th/strings.xml
@@ -1,22 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="network_name_wifi" msgid="3026388992566895417">"Wifi"</string>
-    <string name="network_name_mobile" msgid="7655711935020766459">"อุปกรณ์เคลื่อนที่"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="network_name_wifi">Wifi</string>
+  <string name="network_name_mobile">อุปกรณ์เคลื่อนที่</string>
+  <string name="content_description_overflow">ตัวเลือกเพิ่มเติม</string>
+  <string name="snackbar_undo">เลิกทำ</string>
+  <string name="ok_got_it">รับทราบ</string>
 </resources>
diff --git a/java/com/android/dialer/common/res/values-tl/strings.xml b/java/com/android/dialer/common/res/values-tl/strings.xml
index a11c8ee..252f7b5 100644
--- a/java/com/android/dialer/common/res/values-tl/strings.xml
+++ b/java/com/android/dialer/common/res/values-tl/strings.xml
@@ -1,22 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="network_name_wifi" msgid="3026388992566895417">"Wifi"</string>
-    <string name="network_name_mobile" msgid="7655711935020766459">"Mobile"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="network_name_wifi">Wifi</string>
+  <string name="network_name_mobile">Mobile</string>
+  <string name="content_description_overflow">Higit pang opsyon</string>
+  <string name="snackbar_undo">I-UNDO</string>
+  <string name="ok_got_it">OK</string>
 </resources>
diff --git a/java/com/android/dialer/common/res/values-tr/strings.xml b/java/com/android/dialer/common/res/values-tr/strings.xml
index 14dd781..68e194c 100644
--- a/java/com/android/dialer/common/res/values-tr/strings.xml
+++ b/java/com/android/dialer/common/res/values-tr/strings.xml
@@ -1,22 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="network_name_wifi" msgid="3026388992566895417">"Kablosuz"</string>
-    <string name="network_name_mobile" msgid="7655711935020766459">"Mobil"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="network_name_wifi">Kablosuz</string>
+  <string name="network_name_mobile">Mobil</string>
+  <string name="content_description_overflow">Diğer seçenekler</string>
+  <string name="snackbar_undo">GERİ AL</string>
+  <string name="ok_got_it">Tamam, anladım</string>
 </resources>
diff --git a/java/com/android/dialer/common/res/values-uk/strings.xml b/java/com/android/dialer/common/res/values-uk/strings.xml
index d44b19a..fee1e37 100644
--- a/java/com/android/dialer/common/res/values-uk/strings.xml
+++ b/java/com/android/dialer/common/res/values-uk/strings.xml
@@ -1,22 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="network_name_wifi" msgid="3026388992566895417">"Wi-Fi"</string>
-    <string name="network_name_mobile" msgid="7655711935020766459">"Мобільний"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="network_name_wifi">Wi-Fi</string>
+  <string name="network_name_mobile">Мобільний</string>
+  <string name="content_description_overflow">Інші опції</string>
+  <string name="snackbar_undo">ВІДМІНИТИ</string>
+  <string name="ok_got_it">OK</string>
 </resources>
diff --git a/java/com/android/dialer/common/res/values-ur/strings.xml b/java/com/android/dialer/common/res/values-ur/strings.xml
index 6774991..41e3e86 100644
--- a/java/com/android/dialer/common/res/values-ur/strings.xml
+++ b/java/com/android/dialer/common/res/values-ur/strings.xml
@@ -1,22 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="network_name_wifi" msgid="3026388992566895417">"Wifi"</string>
-    <string name="network_name_mobile" msgid="7655711935020766459">"موبائل"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="network_name_wifi">Wifi</string>
+  <string name="network_name_mobile">موبائل</string>
+  <string name="content_description_overflow">مزید اختیارات</string>
+  <string name="snackbar_undo">کالعدم کریں</string>
+  <string name="ok_got_it">ٹھیک ہے، سمجھ آگئی</string>
 </resources>
diff --git a/java/com/android/dialer/common/res/values-uz/strings.xml b/java/com/android/dialer/common/res/values-uz/strings.xml
index 6865409..5538188 100644
--- a/java/com/android/dialer/common/res/values-uz/strings.xml
+++ b/java/com/android/dialer/common/res/values-uz/strings.xml
@@ -1,22 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="network_name_wifi" msgid="3026388992566895417">"WI-FI"</string>
-    <string name="network_name_mobile" msgid="7655711935020766459">"Mobil"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="network_name_wifi">WI-FI</string>
+  <string name="network_name_mobile">Mobil</string>
+  <string name="content_description_overflow">Boshqa parametrlar</string>
+  <string name="snackbar_undo">BEKOR QILISH</string>
+  <string name="ok_got_it">OK</string>
 </resources>
diff --git a/java/com/android/dialer/common/res/values-vi/strings.xml b/java/com/android/dialer/common/res/values-vi/strings.xml
index 469ee85..f997293 100644
--- a/java/com/android/dialer/common/res/values-vi/strings.xml
+++ b/java/com/android/dialer/common/res/values-vi/strings.xml
@@ -1,22 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="network_name_wifi" msgid="3026388992566895417">"Wi-Fi"</string>
-    <string name="network_name_mobile" msgid="7655711935020766459">"Thiết bị di động"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="network_name_wifi">Wi-Fi</string>
+  <string name="network_name_mobile">Thiết bị di động</string>
+  <string name="content_description_overflow">Tùy chọn khác</string>
+  <string name="snackbar_undo">HOÀN TÁC</string>
+  <string name="ok_got_it">Ok, đã hiểu</string>
 </resources>
diff --git a/java/com/android/dialer/common/res/values-zh-rCN/strings.xml b/java/com/android/dialer/common/res/values-zh-rCN/strings.xml
index 0b7e64a..288d52f 100644
--- a/java/com/android/dialer/common/res/values-zh-rCN/strings.xml
+++ b/java/com/android/dialer/common/res/values-zh-rCN/strings.xml
@@ -1,22 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="network_name_wifi" msgid="3026388992566895417">"WLAN"</string>
-    <string name="network_name_mobile" msgid="7655711935020766459">"移动网络"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="network_name_wifi">WLAN</string>
+  <string name="network_name_mobile">移动网络</string>
+  <string name="content_description_overflow">更多选项</string>
+  <string name="snackbar_undo">撤消</string>
+  <string name="ok_got_it">知道了</string>
 </resources>
diff --git a/java/com/android/dialer/common/res/values-zh-rHK/strings.xml b/java/com/android/dialer/common/res/values-zh-rHK/strings.xml
index 789cb1c..902a698 100644
--- a/java/com/android/dialer/common/res/values-zh-rHK/strings.xml
+++ b/java/com/android/dialer/common/res/values-zh-rHK/strings.xml
@@ -1,22 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="network_name_wifi" msgid="3026388992566895417">"Wi-Fi"</string>
-    <string name="network_name_mobile" msgid="7655711935020766459">"流動"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="network_name_wifi">Wi-Fi</string>
+  <string name="network_name_mobile">流動</string>
+  <string name="content_description_overflow">更多選項</string>
+  <string name="snackbar_undo">復原</string>
+  <string name="ok_got_it">好，知道了</string>
 </resources>
diff --git a/java/com/android/dialer/common/res/values-zh-rTW/strings.xml b/java/com/android/dialer/common/res/values-zh-rTW/strings.xml
index 6da96b5..d0fcf87 100644
--- a/java/com/android/dialer/common/res/values-zh-rTW/strings.xml
+++ b/java/com/android/dialer/common/res/values-zh-rTW/strings.xml
@@ -1,22 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="network_name_wifi" msgid="3026388992566895417">"Wi-Fi"</string>
-    <string name="network_name_mobile" msgid="7655711935020766459">"行動網路"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="network_name_wifi">Wi-Fi</string>
+  <string name="network_name_mobile">行動網路</string>
+  <string name="content_description_overflow">更多選項</string>
+  <string name="snackbar_undo">復原</string>
+  <string name="ok_got_it">好，我知道了</string>
 </resources>
diff --git a/java/com/android/dialer/common/res/values-zu/strings.xml b/java/com/android/dialer/common/res/values-zu/strings.xml
index a953ab0..a015501 100644
--- a/java/com/android/dialer/common/res/values-zu/strings.xml
+++ b/java/com/android/dialer/common/res/values-zu/strings.xml
@@ -1,22 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="network_name_wifi" msgid="3026388992566895417">"I-Wi-Fi"</string>
-    <string name="network_name_mobile" msgid="7655711935020766459">"Iselula"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="network_name_wifi">I-Wi-Fi</string>
+  <string name="network_name_mobile">Iselula</string>
+  <string name="content_description_overflow">Ezinye izinketho</string>
+  <string name="snackbar_undo">HLEHLISA</string>
+  <string name="ok_got_it">KULUNGILE, ngiyezwa</string>
 </resources>
diff --git a/java/com/android/dialer/common/res/values/strings.xml b/java/com/android/dialer/common/res/values/strings.xml
index 53a2b56..3bd21d5 100644
--- a/java/com/android/dialer/common/res/values/strings.xml
+++ b/java/com/android/dialer/common/res/values/strings.xml
@@ -19,4 +19,8 @@
   <string name="network_name_mobile">Mobile</string>
   <!-- Content description for the overflow menu button. [CHAR LIMIT=NONE] -->
   <string name="content_description_overflow">More options</string>
+  <!-- Text for undo button in snackbar for voicemail deletion/blocking/unblocking number. [CHAR LIMIT=10] -->
+  <string name="snackbar_undo">UNDO</string>
+  <!-- Text on button of "OK, got it". [CHAR_LIMIT=30] -->
+  <string name="ok_got_it">OK, got it</string>
 </resources>
diff --git a/java/com/android/dialer/compat/ActivityCompat.java b/java/com/android/dialer/compat/ActivityCompat.java
deleted file mode 100644
index e59b115..0000000
--- a/java/com/android/dialer/compat/ActivityCompat.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.dialer.compat;
-
-import android.app.Activity;
-import android.os.Build.VERSION;
-import android.os.Build.VERSION_CODES;
-
-/** Utility for calling methods introduced after Marshmallow for Activities. */
-public class ActivityCompat {
-
-  public static boolean isInMultiWindowMode(Activity activity) {
-    return VERSION.SDK_INT >= VERSION_CODES.N && activity.isInMultiWindowMode();
-  }
-}
diff --git a/java/com/android/dialer/compat/AppCompatConstants.java b/java/com/android/dialer/compat/AppCompatConstants.java
deleted file mode 100644
index 4a51d3f..0000000
--- a/java/com/android/dialer/compat/AppCompatConstants.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.dialer.compat;
-
-import android.provider.CallLog.Calls;
-
-public final class AppCompatConstants {
-
-  public static final int CALLS_INCOMING_TYPE = Calls.INCOMING_TYPE;
-  public static final int CALLS_OUTGOING_TYPE = Calls.OUTGOING_TYPE;
-  public static final int CALLS_MISSED_TYPE = Calls.MISSED_TYPE;
-  public static final int CALLS_VOICEMAIL_TYPE = Calls.VOICEMAIL_TYPE;
-  // Added to android.provider.CallLog.Calls in N+.
-  public static final int CALLS_REJECTED_TYPE = 5;
-  // Added to android.provider.CallLog.Calls in N+.
-  public static final int CALLS_BLOCKED_TYPE = 6;
-  // Added to android.provider.CallLog.Calls in N+.
-  public static final int CALLS_ANSWERED_EXTERNALLY_TYPE = Calls.ANSWERED_EXTERNALLY_TYPE;
-}
diff --git a/java/com/android/dialer/compat/CompatUtils.java b/java/com/android/dialer/compat/CompatUtils.java
deleted file mode 100644
index 584f205..0000000
--- a/java/com/android/dialer/compat/CompatUtils.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.dialer.compat;
-
-import android.content.Context;
-import android.os.Build;
-import android.os.Build.VERSION;
-import android.os.Build.VERSION_CODES;
-import android.os.LocaleList;
-import java.util.Locale;
-
-public final class CompatUtils {
-
-  /** PrioritizedMimeType is added in API level 23. */
-  public static boolean hasPrioritizedMimeType() {
-    return SdkVersionOverride.getSdkVersion(Build.VERSION_CODES.M) >= Build.VERSION_CODES.M;
-  }
-
-  /**
-   * Determines if this version is compatible with multi-SIM and the phone account APIs. Can also
-   * force the version to be lower through SdkVersionOverride.
-   *
-   * @return {@code true} if multi-SIM capability is available, {@code false} otherwise.
-   */
-  public static boolean isMSIMCompatible() {
-    return SdkVersionOverride.getSdkVersion(Build.VERSION_CODES.LOLLIPOP)
-        >= Build.VERSION_CODES.LOLLIPOP_MR1;
-  }
-
-  /**
-   * Determines if this version is compatible with video calling. Can also force the version to be
-   * lower through SdkVersionOverride.
-   *
-   * @return {@code true} if video calling is allowed, {@code false} otherwise.
-   */
-  public static boolean isVideoCompatible() {
-    return SdkVersionOverride.getSdkVersion(Build.VERSION_CODES.LOLLIPOP) >= Build.VERSION_CODES.M;
-  }
-
-  /**
-   * Determines if this version is capable of using presence checking for video calling. Support for
-   * video call presence indication is added in SDK 24.
-   *
-   * @return {@code true} if video presence checking is allowed, {@code false} otherwise.
-   */
-  public static boolean isVideoPresenceCompatible() {
-    return SdkVersionOverride.getSdkVersion(Build.VERSION_CODES.M) > Build.VERSION_CODES.M;
-  }
-
-  /**
-   * Determines if this version is compatible with call subject. Can also force the version to be
-   * lower through SdkVersionOverride.
-   *
-   * @return {@code true} if call subject is a feature on this device, {@code false} otherwise.
-   */
-  public static boolean isCallSubjectCompatible() {
-    return SdkVersionOverride.getSdkVersion(Build.VERSION_CODES.LOLLIPOP) >= Build.VERSION_CODES.M;
-  }
-
-  /** Returns locale of the device. */
-  public static Locale getLocale(Context context) {
-    if (VERSION.SDK_INT >= VERSION_CODES.N) {
-      LocaleList localList = context.getResources().getConfiguration().getLocales();
-      if (!localList.isEmpty()) {
-        return localList.get(0);
-      }
-      return Locale.getDefault();
-    } else {
-      return context.getResources().getConfiguration().locale;
-    }
-  }
-}
diff --git a/java/com/android/dialer/compat/PathInterpolatorCompat.java b/java/com/android/dialer/compat/PathInterpolatorCompat.java
deleted file mode 100644
index d0d410d..0000000
--- a/java/com/android/dialer/compat/PathInterpolatorCompat.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.dialer.compat;
-
-import android.graphics.Path;
-import android.graphics.PathMeasure;
-import android.os.Build;
-import android.view.animation.Interpolator;
-import android.view.animation.PathInterpolator;
-
-public class PathInterpolatorCompat {
-
-  public static Interpolator create(
-      float controlX1, float controlY1, float controlX2, float controlY2) {
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-      return new PathInterpolator(controlX1, controlY1, controlX2, controlY2);
-    }
-    return new PathInterpolatorBase(controlX1, controlY1, controlX2, controlY2);
-  }
-
-  private static class PathInterpolatorBase implements Interpolator {
-
-    /** Governs the accuracy of the approximation of the {@link Path}. */
-    private static final float PRECISION = 0.002f;
-
-    private final float[] x;
-    private final float[] y;
-
-    public PathInterpolatorBase(Path path) {
-      final PathMeasure pathMeasure = new PathMeasure(path, false /* forceClosed */);
-
-      final float pathLength = pathMeasure.getLength();
-      final int numPoints = (int) (pathLength / PRECISION) + 1;
-
-      x = new float[numPoints];
-      y = new float[numPoints];
-
-      final float[] position = new float[2];
-      for (int i = 0; i < numPoints; ++i) {
-        final float distance = (i * pathLength) / (numPoints - 1);
-        pathMeasure.getPosTan(distance, position, null /* tangent */);
-
-        x[i] = position[0];
-        y[i] = position[1];
-      }
-    }
-
-    public PathInterpolatorBase(float controlX, float controlY) {
-      this(createQuad(controlX, controlY));
-    }
-
-    public PathInterpolatorBase(
-        float controlX1, float controlY1, float controlX2, float controlY2) {
-      this(createCubic(controlX1, controlY1, controlX2, controlY2));
-    }
-
-    private static Path createQuad(float controlX, float controlY) {
-      final Path path = new Path();
-      path.moveTo(0.0f, 0.0f);
-      path.quadTo(controlX, controlY, 1.0f, 1.0f);
-      return path;
-    }
-
-    private static Path createCubic(
-        float controlX1, float controlY1, float controlX2, float controlY2) {
-      final Path path = new Path();
-      path.moveTo(0.0f, 0.0f);
-      path.cubicTo(controlX1, controlY1, controlX2, controlY2, 1.0f, 1.0f);
-      return path;
-    }
-
-    @Override
-    public float getInterpolation(float t) {
-      if (t <= 0.0f) {
-        return 0.0f;
-      } else if (t >= 1.0f) {
-        return 1.0f;
-      }
-
-      // Do a binary search for the correct x to interpolate between.
-      int startIndex = 0;
-      int endIndex = x.length - 1;
-      while (endIndex - startIndex > 1) {
-        int midIndex = (startIndex + endIndex) / 2;
-        if (t < x[midIndex]) {
-          endIndex = midIndex;
-        } else {
-          startIndex = midIndex;
-        }
-      }
-
-      final float xRange = x[endIndex] - x[startIndex];
-      if (xRange == 0) {
-        return y[startIndex];
-      }
-
-      final float tInRange = t - x[startIndex];
-      final float fraction = tInRange / xRange;
-
-      final float startY = y[startIndex];
-      final float endY = y[endIndex];
-
-      return startY + (fraction * (endY - startY));
-    }
-  }
-}
diff --git a/java/com/android/dialer/compat/SdkVersionOverride.java b/java/com/android/dialer/compat/SdkVersionOverride.java
deleted file mode 100644
index 1d253a3..0000000
--- a/java/com/android/dialer/compat/SdkVersionOverride.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.dialer.compat;
-
-import android.os.Build.VERSION;
-
-/**
- * Class used to override the current sdk version to test specific branches of compatibility logic.
- * When such branching occurs, use {@link #getSdkVersion(int)} rather than explicitly calling {@link
- * VERSION#SDK_INT}. This allows the sdk version to be forced to a specific value.
- */
-public class SdkVersionOverride {
-
-  /** Flag used to determine if override sdk versions are returned. */
-  private static final boolean ALLOW_OVERRIDE_VERSION = false;
-
-  private SdkVersionOverride() {}
-
-  /**
-   * Gets the sdk version
-   *
-   * @param overrideVersion the version to attempt using
-   * @return overrideVersion if the {@link #ALLOW_OVERRIDE_VERSION} flag is set to {@code true},
-   *     otherwise the current version
-   */
-  public static int getSdkVersion(int overrideVersion) {
-    return ALLOW_OVERRIDE_VERSION ? overrideVersion : VERSION.SDK_INT;
-  }
-}
diff --git a/java/com/android/dialer/compat/android/support/design/bottomsheet/BottomSheetStateCompat.java b/java/com/android/dialer/compat/android/support/design/bottomsheet/BottomSheetStateCompat.java
new file mode 100644
index 0000000..d7079d4
--- /dev/null
+++ b/java/com/android/dialer/compat/android/support/design/bottomsheet/BottomSheetStateCompat.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.dialer.compat.android.support.design.bottomsheet;
+
+import android.support.design.widget.BottomSheetBehavior;
+
+/** Provides access to bottom sheet states. */
+public final class BottomSheetStateCompat {
+
+  /** The bottom sheet is dragging. */
+  public static final int STATE_DRAGGING = BottomSheetBehavior.STATE_DRAGGING;
+
+  /** The bottom sheet is settling. */
+  public static final int STATE_SETTLING = BottomSheetBehavior.STATE_SETTLING;
+
+  /** The bottom sheet is expanded. */
+  public static final int STATE_EXPANDED = BottomSheetBehavior.STATE_EXPANDED;
+
+  /** The bottom sheet is collapsed. */
+  public static final int STATE_COLLAPSED = BottomSheetBehavior.STATE_COLLAPSED;
+
+  /** The bottom sheet is hidden. */
+  public static final int STATE_HIDDEN = BottomSheetBehavior.STATE_HIDDEN;
+
+  /** The bottom sheet is half-expanded (not public yet). */
+  public static final int STATE_HALF_EXPANDED = 6;
+
+  private BottomSheetStateCompat() {}
+}
diff --git a/java/com/android/dialer/compat/telephony/TelephonyManagerCompat.java b/java/com/android/dialer/compat/telephony/TelephonyManagerCompat.java
index 236f779..41e5be2 100644
--- a/java/com/android/dialer/compat/telephony/TelephonyManagerCompat.java
+++ b/java/com/android/dialer/compat/telephony/TelephonyManagerCompat.java
@@ -25,7 +25,6 @@
 import android.support.v4.os.BuildCompat;
 import android.telecom.PhoneAccountHandle;
 import android.telephony.TelephonyManager;
-import com.android.dialer.common.Assert;
 import com.android.dialer.common.LogUtil;
 import com.android.dialer.telecom.TelecomUtil;
 import java.lang.reflect.InvocationTargetException;
@@ -36,6 +35,8 @@
   // TODO(maxwelb): Use public API for these constants when available
   public static final String EVENT_HANDOVER_VIDEO_FROM_WIFI_TO_LTE =
       "android.telephony.event.EVENT_HANDOVER_VIDEO_FROM_WIFI_TO_LTE";
+  public static final String EVENT_HANDOVER_VIDEO_FROM_LTE_TO_WIFI =
+      "android.telephony.event.EVENT_HANDOVER_VIDEO_FROM_LTE_TO_WIFI";
   public static final String EVENT_HANDOVER_TO_WIFI_FAILED =
       "android.telephony.event.EVENT_HANDOVER_TO_WIFI_FAILED";
   public static final String EVENT_CALL_REMOTELY_HELD = "android.telecom.event.CALL_REMOTELY_HELD";
@@ -78,6 +79,13 @@
   public static final Integer FEATURES_ASSISTED_DIALING = 1 << 4;
 
   /**
+   * Flag specifying whether to show an alert dialog for video call charges. By default this value
+   * is {@code false}. TODO(a bug): Replace with public API for these constants when available.
+   */
+  public static final String CARRIER_CONFIG_KEY_SHOW_VIDEO_CALL_CHARGES_ALERT_DIALOG_BOOL =
+      "show_video_call_charges_alert_dialog_bool";
+
+  /**
    * Returns the number of phones available. Returns 1 for Single standby mode (Single SIM
    * functionality) Returns 2 for Dual standby mode.(Dual SIM functionality)
    *
@@ -126,9 +134,6 @@
   @Nullable
   public static Uri getVoicemailRingtoneUri(
       TelephonyManager telephonyManager, PhoneAccountHandle accountHandle) {
-    if (VERSION.SDK_INT < VERSION_CODES.N) {
-      return null;
-    }
     return telephonyManager.getVoicemailRingtoneUri(accountHandle);
   }
 
@@ -142,8 +147,7 @@
    */
   public static boolean isVoicemailVibrationEnabled(
       TelephonyManager telephonyManager, PhoneAccountHandle accountHandle) {
-    return VERSION.SDK_INT < VERSION_CODES.N
-        || telephonyManager.isVoicemailVibrationEnabled(accountHandle);
+    return telephonyManager.isVoicemailVibrationEnabled(accountHandle);
   }
 
   /**
@@ -152,9 +156,6 @@
    */
   public static void setVisualVoicemailEnabled(
       TelephonyManager telephonyManager, PhoneAccountHandle handle, boolean enabled) {
-    if (VERSION.SDK_INT < VERSION_CODES.N_MR1) {
-      Assert.fail("setVisualVoicemailEnabled called on pre-NMR1");
-    }
     try {
       TelephonyManager.class
           .getMethod("setVisualVoicemailEnabled", PhoneAccountHandle.class, boolean.class)
@@ -170,9 +171,6 @@
    */
   public static boolean isVisualVoicemailEnabled(
       TelephonyManager telephonyManager, PhoneAccountHandle handle) {
-    if (VERSION.SDK_INT < VERSION_CODES.N_MR1) {
-      Assert.fail("isVisualVoicemailEnabled called on pre-NMR1");
-    }
     try {
       return (boolean)
           TelephonyManager.class
diff --git a/java/com/android/dialer/configprovider/ConfigProviderBindings.java b/java/com/android/dialer/configprovider/ConfigProviderBindings.java
deleted file mode 100644
index 0bf0e75..0000000
--- a/java/com/android/dialer/configprovider/ConfigProviderBindings.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.dialer.configprovider;
-
-import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.VisibleForTesting;
-import android.support.v4.os.UserManagerCompat;
-import com.android.dialer.common.Assert;
-
-/** Accessor for getting a {@link ConfigProvider}. */
-public class ConfigProviderBindings {
-
-  private static ConfigProvider configProvider;
-  private static ConfigProvider configProviderStub;
-
-  public static ConfigProvider get(@NonNull Context context) {
-    Assert.isNotNull(context);
-    if (configProvider != null) {
-      return configProvider;
-    }
-    if (!UserManagerCompat.isUserUnlocked(context)) {
-      if (configProviderStub == null) {
-        configProviderStub = new ConfigProviderStub();
-      }
-      return configProviderStub;
-    }
-    configProvider = ConfigProviderComponent.get(context).getConfigProvider();
-    return configProvider;
-  }
-
-  @VisibleForTesting
-  public static void setForTesting(@Nullable ConfigProvider configProviderForTesting) {
-    configProvider = configProviderForTesting;
-  }
-
-  private static class ConfigProviderStub implements ConfigProvider {
-    @Override
-    public String getString(String key, String defaultValue) {
-      return defaultValue;
-    }
-
-    @Override
-    public long getLong(String key, long defaultValue) {
-      return defaultValue;
-    }
-
-    @Override
-    public boolean getBoolean(String key, boolean defaultValue) {
-      return defaultValue;
-    }
-  }
-}
diff --git a/java/com/android/dialer/configprovider/ConfigProviderComponent.java b/java/com/android/dialer/configprovider/ConfigProviderComponent.java
index 10d52e7..5b5afd7 100644
--- a/java/com/android/dialer/configprovider/ConfigProviderComponent.java
+++ b/java/com/android/dialer/configprovider/ConfigProviderComponent.java
@@ -19,6 +19,7 @@
 import android.content.Context;
 import android.support.annotation.NonNull;
 import com.android.dialer.inject.HasRootComponent;
+import com.android.dialer.inject.IncludeInDialerRoot;
 import dagger.Subcomponent;
 
 /** Dagger component to provide a {@link ConfigProvider}. */
@@ -26,7 +27,6 @@
 public abstract class ConfigProviderComponent {
 
   @NonNull
-  @Deprecated // Use ConfigProviderBindings instead
   public abstract ConfigProvider getConfigProvider();
 
   public static ConfigProviderComponent get(Context context) {
@@ -36,6 +36,7 @@
   }
 
   /** Used to refer to the root application component. */
+  @IncludeInDialerRoot
   public interface HasComponent {
     ConfigProviderComponent configProviderComponent();
   }
diff --git a/java/com/android/dialer/configprovider/SharedPrefConfigProvider.java b/java/com/android/dialer/configprovider/SharedPrefConfigProvider.java
index d700fb6..c68312f 100644
--- a/java/com/android/dialer/configprovider/SharedPrefConfigProvider.java
+++ b/java/com/android/dialer/configprovider/SharedPrefConfigProvider.java
@@ -23,8 +23,8 @@
 import android.support.annotation.Nullable;
 import com.android.dialer.common.Assert;
 import com.android.dialer.common.LogUtil;
-import com.android.dialer.inject.ApplicationContext;
 import com.android.dialer.storage.StorageComponent;
+import com.android.dialer.storage.Unencrypted;
 import com.android.dialer.strictmode.StrictModeUtils;
 import javax.inject.Inject;
 
@@ -49,14 +49,14 @@
  *     /data/user_de/0/com.android.dialer/shared_prefs/com.android.dialer_preferences.xml
  * </pre>
  */
-class SharedPrefConfigProvider implements ConfigProvider {
+public class SharedPrefConfigProvider implements ConfigProvider {
   private static final String PREF_PREFIX = "config_provider_prefs_";
 
-  private final Context appContext;
+  private final SharedPreferences sharedPreferences;
 
   @Inject
-  SharedPrefConfigProvider(@ApplicationContext Context appContext) {
-    this.appContext = appContext;
+  SharedPrefConfigProvider(@Unencrypted SharedPreferences sharedPreferences) {
+    this.sharedPreferences = sharedPreferences;
   }
 
   /** Service to write values into {@link SharedPrefConfigProvider} using adb. */
@@ -93,25 +93,37 @@
     }
   }
 
+  /** Set a boolean config value. */
+  public void putBoolean(String key, boolean value) {
+    sharedPreferences.edit().putBoolean(PREF_PREFIX + key, value).apply();
+  }
+
+  public void putLong(String key, long value) {
+    sharedPreferences.edit().putLong(PREF_PREFIX + key, value).apply();
+  }
+
+  public void putString(String key, String value) {
+    sharedPreferences.edit().putString(PREF_PREFIX + key, value).apply();
+  }
+
   @Override
   public String getString(String key, String defaultValue) {
     // Reading shared prefs on the main thread is generally safe since a single instance is cached.
     return StrictModeUtils.bypass(
-        () -> getSharedPrefs(appContext).getString(PREF_PREFIX + key, defaultValue));
+        () -> sharedPreferences.getString(PREF_PREFIX + key, defaultValue));
   }
 
   @Override
   public long getLong(String key, long defaultValue) {
     // Reading shared prefs on the main thread is generally safe since a single instance is cached.
-    return StrictModeUtils.bypass(
-        () -> getSharedPrefs(appContext).getLong(PREF_PREFIX + key, defaultValue));
+    return StrictModeUtils.bypass(() -> sharedPreferences.getLong(PREF_PREFIX + key, defaultValue));
   }
 
   @Override
   public boolean getBoolean(String key, boolean defaultValue) {
     // Reading shared prefs on the main thread is generally safe since a single instance is cached.
     return StrictModeUtils.bypass(
-        () -> getSharedPrefs(appContext).getBoolean(PREF_PREFIX + key, defaultValue));
+        () -> sharedPreferences.getBoolean(PREF_PREFIX + key, defaultValue));
   }
 
   private static SharedPreferences getSharedPrefs(Context appContext) {
diff --git a/java/com/android/dialer/configprovider/SharedPrefConfigProviderModule.java b/java/com/android/dialer/configprovider/SharedPrefConfigProviderModule.java
index fe1c908..81bed19 100644
--- a/java/com/android/dialer/configprovider/SharedPrefConfigProviderModule.java
+++ b/java/com/android/dialer/configprovider/SharedPrefConfigProviderModule.java
@@ -16,14 +16,20 @@
 
 package com.android.dialer.configprovider;
 
+import com.android.dialer.inject.DialerVariant;
+import com.android.dialer.inject.InstallIn;
+import com.android.dialer.storage.StorageModule;
 import dagger.Binds;
 import dagger.Module;
 import javax.inject.Singleton;
 
 /** Dagger module providing {@link ConfigProvider} based on shared preferences. */
-@Module
+@InstallIn(variants = {DialerVariant.DIALER_TEST})
+@Module(includes = StorageModule.class)
 public abstract class SharedPrefConfigProviderModule {
 
+  private SharedPrefConfigProviderModule() {}
+
   @Binds
   @Singleton
   abstract ConfigProvider to(SharedPrefConfigProvider impl);
diff --git a/java/com/android/dialer/constants/ActivityRequestCodes.java b/java/com/android/dialer/constants/ActivityRequestCodes.java
index 4fe3e29..9945080 100644
--- a/java/com/android/dialer/constants/ActivityRequestCodes.java
+++ b/java/com/android/dialer/constants/ActivityRequestCodes.java
@@ -16,8 +16,6 @@
 
 package com.android.dialer.constants;
 
-import com.android.dialer.duo.Duo;
-
 /**
  * Class containing {@link android.app.Activity#onActivityResult(int, int, android.content.Intent)}
  * request codes.
@@ -32,9 +30,14 @@
   /** Request code for {@link com.android.dialer.callcomposer.CallComposerActivity} intent. */
   public static final int DIALTACTS_CALL_COMPOSER = 2;
 
-  /** Request code for {@link Duo#getIntent(android.content.Context, String)}. */
+  /** Request code for {@link com.android.dialer.duo.Duo#getCallIntent(String)}. */
   public static final int DIALTACTS_DUO = 3;
 
-  /** Request code for {@link com.android.dialer.calldetails.CallDetailsActivity} intent. */
+  /** Request code for {@link com.android.dialer.calldetails.OldCallDetailsActivity} intent. */
   public static final int DIALTACTS_CALL_DETAILS = 4;
+
+  /**
+   * Request code for {@link com.android.dialer.speeddial.SpeedDialFragment} contact picker intent.
+   */
+  public static final int SPEED_DIAL_ADD_FAVORITE = 5;
 }
diff --git a/java/com/android/dialer/constants/ScheduledJobIds.java b/java/com/android/dialer/constants/ScheduledJobIds.java
index 1a852d0..7ffd2da 100644
--- a/java/com/android/dialer/constants/ScheduledJobIds.java
+++ b/java/com/android/dialer/constants/ScheduledJobIds.java
@@ -50,6 +50,8 @@
 
   public static final int VOIP_REGISTRATION = 300;
 
+  public static final int CALL_LOG_CONFIG_POLLING_JOB = 400;
+
   // Job Ids from 10_000 to 10_100 should be reserved for proto upload jobs.
   public static final int PROTO_UPLOAD_JOB_MIN_ID = 10_000;
   public static final int PROTO_UPLOAD_JOB_MAX_ID = 10_100;
diff --git a/java/com/android/dialer/contactphoto/res/values-af/strings.xml b/java/com/android/dialer/contactphoto/res/values-af/strings.xml
index c3d5f78..784c439 100644
--- a/java/com/android/dialer/contactphoto/res/values-af/strings.xml
+++ b/java/com/android/dialer/contactphoto/res/values-af/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_quick_contact_for" msgid="6701611505635096879">"Vinnige kontak vir <xliff:g id="NAME">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_quick_contact_for">Vinnige kontak vir %1$s</string>
 </resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-am/strings.xml b/java/com/android/dialer/contactphoto/res/values-am/strings.xml
index 949a018..2106d86 100644
--- a/java/com/android/dialer/contactphoto/res/values-am/strings.xml
+++ b/java/com/android/dialer/contactphoto/res/values-am/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_quick_contact_for" msgid="6701611505635096879">"ለ<xliff:g id="NAME">%1$s</xliff:g> ፈጣን ዕውቂያ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_quick_contact_for">ለ%1$s ፈጣን ዕውቂያ</string>
 </resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-ar/strings.xml b/java/com/android/dialer/contactphoto/res/values-ar/strings.xml
index a11eeea..38c988d 100644
--- a/java/com/android/dialer/contactphoto/res/values-ar/strings.xml
+++ b/java/com/android/dialer/contactphoto/res/values-ar/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_quick_contact_for" msgid="6701611505635096879">"اتصال سريع لـ <xliff:g id="NAME">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_quick_contact_for">اتصال سريع لـ %1$s</string>
 </resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-az/strings.xml b/java/com/android/dialer/contactphoto/res/values-az/strings.xml
index 3559951..20139e6 100644
--- a/java/com/android/dialer/contactphoto/res/values-az/strings.xml
+++ b/java/com/android/dialer/contactphoto/res/values-az/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_quick_contact_for" msgid="6701611505635096879">"<xliff:g id="NAME">%1$s</xliff:g> üçün cəld kontakt"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_quick_contact_for">%1$s üçün cəld kontakt</string>
 </resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-b+sr+Latn/strings.xml b/java/com/android/dialer/contactphoto/res/values-b+sr+Latn/strings.xml
index 8932e55..21eed3d 100644
--- a/java/com/android/dialer/contactphoto/res/values-b+sr+Latn/strings.xml
+++ b/java/com/android/dialer/contactphoto/res/values-b+sr+Latn/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_quick_contact_for" msgid="6701611505635096879">"Brzi kontakt za: <xliff:g id="NAME">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_quick_contact_for">Brzi kontakt za: %1$s</string>
 </resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-be/strings.xml b/java/com/android/dialer/contactphoto/res/values-be/strings.xml
index 70eb91b..a3862b6 100644
--- a/java/com/android/dialer/contactphoto/res/values-be/strings.xml
+++ b/java/com/android/dialer/contactphoto/res/values-be/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_quick_contact_for" msgid="6701611505635096879">"Хуткі кантакт для карыстальніка <xliff:g id="NAME">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_quick_contact_for">Хуткі кантакт для карыстальніка %1$s</string>
 </resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-bg/strings.xml b/java/com/android/dialer/contactphoto/res/values-bg/strings.xml
index 4c15cec..26258af 100644
--- a/java/com/android/dialer/contactphoto/res/values-bg/strings.xml
+++ b/java/com/android/dialer/contactphoto/res/values-bg/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_quick_contact_for" msgid="6701611505635096879">"Бърз контакт за <xliff:g id="NAME">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_quick_contact_for">Бърз контакт за %1$s</string>
 </resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-bn/strings.xml b/java/com/android/dialer/contactphoto/res/values-bn/strings.xml
index 62a7ddb..124a9d8 100644
--- a/java/com/android/dialer/contactphoto/res/values-bn/strings.xml
+++ b/java/com/android/dialer/contactphoto/res/values-bn/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_quick_contact_for" msgid="6701611505635096879">"<xliff:g id="NAME">%1$s</xliff:g> এর জন্য দ্রুত পরিচিতি"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_quick_contact_for">%1$s এর জন্য দ্রুত পরিচিতি</string>
 </resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-bs/strings.xml b/java/com/android/dialer/contactphoto/res/values-bs/strings.xml
index de9e970..9b108ca 100644
--- a/java/com/android/dialer/contactphoto/res/values-bs/strings.xml
+++ b/java/com/android/dialer/contactphoto/res/values-bs/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_quick_contact_for" msgid="6701611505635096879">"Brzi kontakt za <xliff:g id="NAME">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_quick_contact_for">Brzi kontakt za %1$s</string>
 </resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-ca/strings.xml b/java/com/android/dialer/contactphoto/res/values-ca/strings.xml
index c6276fb..9dfa013 100644
--- a/java/com/android/dialer/contactphoto/res/values-ca/strings.xml
+++ b/java/com/android/dialer/contactphoto/res/values-ca/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_quick_contact_for" msgid="6701611505635096879">"Contacte ràpid per a <xliff:g id="NAME">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_quick_contact_for">Contacte ràpid per a %1$s</string>
 </resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-cs/strings.xml b/java/com/android/dialer/contactphoto/res/values-cs/strings.xml
index 2a37e59..95bfe9a 100644
--- a/java/com/android/dialer/contactphoto/res/values-cs/strings.xml
+++ b/java/com/android/dialer/contactphoto/res/values-cs/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_quick_contact_for" msgid="6701611505635096879">"Rychlý kontakt <xliff:g id="NAME">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_quick_contact_for">Rychlý kontakt %1$s</string>
 </resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-da/strings.xml b/java/com/android/dialer/contactphoto/res/values-da/strings.xml
index 3df1386..54fca53 100644
--- a/java/com/android/dialer/contactphoto/res/values-da/strings.xml
+++ b/java/com/android/dialer/contactphoto/res/values-da/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_quick_contact_for" msgid="6701611505635096879">"Hurtigkontakt for <xliff:g id="NAME">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_quick_contact_for">Hurtigkontakt for %1$s</string>
 </resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-de/strings.xml b/java/com/android/dialer/contactphoto/res/values-de/strings.xml
index e182ea5..57d0149 100644
--- a/java/com/android/dialer/contactphoto/res/values-de/strings.xml
+++ b/java/com/android/dialer/contactphoto/res/values-de/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_quick_contact_for" msgid="6701611505635096879">"Schnellkontakt für <xliff:g id="NAME">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_quick_contact_for">Schnellkontakt für %1$s</string>
 </resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-el/strings.xml b/java/com/android/dialer/contactphoto/res/values-el/strings.xml
index 537f41e..1960113 100644
--- a/java/com/android/dialer/contactphoto/res/values-el/strings.xml
+++ b/java/com/android/dialer/contactphoto/res/values-el/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_quick_contact_for" msgid="6701611505635096879">"Γρήγορη επαφή για <xliff:g id="NAME">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_quick_contact_for">Γρήγορη επαφή για %1$s</string>
 </resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-en-rAU/strings.xml b/java/com/android/dialer/contactphoto/res/values-en-rAU/strings.xml
index 9ce88e7..e536688 100644
--- a/java/com/android/dialer/contactphoto/res/values-en-rAU/strings.xml
+++ b/java/com/android/dialer/contactphoto/res/values-en-rAU/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_quick_contact_for" msgid="6701611505635096879">"Quick contact for <xliff:g id="NAME">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_quick_contact_for">Quick contact for %1$s</string>
 </resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-en-rGB/strings.xml b/java/com/android/dialer/contactphoto/res/values-en-rGB/strings.xml
index 9ce88e7..e536688 100644
--- a/java/com/android/dialer/contactphoto/res/values-en-rGB/strings.xml
+++ b/java/com/android/dialer/contactphoto/res/values-en-rGB/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_quick_contact_for" msgid="6701611505635096879">"Quick contact for <xliff:g id="NAME">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_quick_contact_for">Quick contact for %1$s</string>
 </resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-en-rIN/strings.xml b/java/com/android/dialer/contactphoto/res/values-en-rIN/strings.xml
index 9ce88e7..e536688 100644
--- a/java/com/android/dialer/contactphoto/res/values-en-rIN/strings.xml
+++ b/java/com/android/dialer/contactphoto/res/values-en-rIN/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_quick_contact_for" msgid="6701611505635096879">"Quick contact for <xliff:g id="NAME">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_quick_contact_for">Quick contact for %1$s</string>
 </resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-es-rUS/strings.xml b/java/com/android/dialer/contactphoto/res/values-es-rUS/strings.xml
index 315978e..425ba6b 100644
--- a/java/com/android/dialer/contactphoto/res/values-es-rUS/strings.xml
+++ b/java/com/android/dialer/contactphoto/res/values-es-rUS/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_quick_contact_for" msgid="6701611505635096879">"Contacto rápido de <xliff:g id="NAME">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_quick_contact_for">Contacto rápido de %1$s</string>
 </resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-es/strings.xml b/java/com/android/dialer/contactphoto/res/values-es/strings.xml
index 315978e..425ba6b 100644
--- a/java/com/android/dialer/contactphoto/res/values-es/strings.xml
+++ b/java/com/android/dialer/contactphoto/res/values-es/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_quick_contact_for" msgid="6701611505635096879">"Contacto rápido de <xliff:g id="NAME">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_quick_contact_for">Contacto rápido de %1$s</string>
 </resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-et/strings.xml b/java/com/android/dialer/contactphoto/res/values-et/strings.xml
index 1db8d75..72c8d16 100644
--- a/java/com/android/dialer/contactphoto/res/values-et/strings.xml
+++ b/java/com/android/dialer/contactphoto/res/values-et/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_quick_contact_for" msgid="6701611505635096879">"Kiirkontakt: <xliff:g id="NAME">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_quick_contact_for">Kiirkontakt: %1$s</string>
 </resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-eu/strings.xml b/java/com/android/dialer/contactphoto/res/values-eu/strings.xml
index 4be6d83..6ba950d 100644
--- a/java/com/android/dialer/contactphoto/res/values-eu/strings.xml
+++ b/java/com/android/dialer/contactphoto/res/values-eu/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_quick_contact_for" msgid="6701611505635096879">"<xliff:g id="NAME">%1$s</xliff:g> erabiltzailearen kontaktu bizkorra"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_quick_contact_for">%1$s erabiltzailearen kontaktu bizkorra</string>
 </resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-fa/strings.xml b/java/com/android/dialer/contactphoto/res/values-fa/strings.xml
index 63fc2cb..4e42ff5 100644
--- a/java/com/android/dialer/contactphoto/res/values-fa/strings.xml
+++ b/java/com/android/dialer/contactphoto/res/values-fa/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_quick_contact_for" msgid="6701611505635096879">"تماس سریع برای <xliff:g id="NAME">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_quick_contact_for">تماس سریع برای %1$s</string>
 </resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-fi/strings.xml b/java/com/android/dialer/contactphoto/res/values-fi/strings.xml
index 6109e86..b54e9de 100644
--- a/java/com/android/dialer/contactphoto/res/values-fi/strings.xml
+++ b/java/com/android/dialer/contactphoto/res/values-fi/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_quick_contact_for" msgid="6701611505635096879">"Pikayhteys henkilöön <xliff:g id="NAME">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_quick_contact_for">Pikayhteys henkilöön %1$s</string>
 </resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-fr-rCA/strings.xml b/java/com/android/dialer/contactphoto/res/values-fr-rCA/strings.xml
index 353920e..6cac132 100644
--- a/java/com/android/dialer/contactphoto/res/values-fr-rCA/strings.xml
+++ b/java/com/android/dialer/contactphoto/res/values-fr-rCA/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_quick_contact_for" msgid="6701611505635096879">"Lien rapide vers <xliff:g id="NAME">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_quick_contact_for">Lien rapide vers %1$s</string>
 </resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-fr/strings.xml b/java/com/android/dialer/contactphoto/res/values-fr/strings.xml
index 353920e..6cac132 100644
--- a/java/com/android/dialer/contactphoto/res/values-fr/strings.xml
+++ b/java/com/android/dialer/contactphoto/res/values-fr/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_quick_contact_for" msgid="6701611505635096879">"Lien rapide vers <xliff:g id="NAME">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_quick_contact_for">Lien rapide vers %1$s</string>
 </resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-gl/strings.xml b/java/com/android/dialer/contactphoto/res/values-gl/strings.xml
index f65800d..5fb2638 100644
--- a/java/com/android/dialer/contactphoto/res/values-gl/strings.xml
+++ b/java/com/android/dialer/contactphoto/res/values-gl/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_quick_contact_for" msgid="6701611505635096879">"Contacto rápido para <xliff:g id="NAME">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_quick_contact_for">Contacto rápido para %1$s</string>
 </resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-gu/strings.xml b/java/com/android/dialer/contactphoto/res/values-gu/strings.xml
index 323b74f..fefd31e 100644
--- a/java/com/android/dialer/contactphoto/res/values-gu/strings.xml
+++ b/java/com/android/dialer/contactphoto/res/values-gu/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_quick_contact_for" msgid="6701611505635096879">"<xliff:g id="NAME">%1$s</xliff:g> માટે ઝડપી સંપર્ક"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_quick_contact_for">%1$s માટે ઝડપી સંપર્ક</string>
 </resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-hi/strings.xml b/java/com/android/dialer/contactphoto/res/values-hi/strings.xml
index 08b2322..9bbbfec 100644
--- a/java/com/android/dialer/contactphoto/res/values-hi/strings.xml
+++ b/java/com/android/dialer/contactphoto/res/values-hi/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_quick_contact_for" msgid="6701611505635096879">"<xliff:g id="NAME">%1$s</xliff:g> के लिए झटपट संपर्क"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_quick_contact_for">%1$s के लिए झटपट संपर्क</string>
 </resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-hr/strings.xml b/java/com/android/dialer/contactphoto/res/values-hr/strings.xml
index 36b97f5..69d44e8 100644
--- a/java/com/android/dialer/contactphoto/res/values-hr/strings.xml
+++ b/java/com/android/dialer/contactphoto/res/values-hr/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_quick_contact_for" msgid="6701611505635096879">"Brzi kontakt za korisnika <xliff:g id="NAME">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_quick_contact_for">Brzi kontakt za korisnika %1$s</string>
 </resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-hu/strings.xml b/java/com/android/dialer/contactphoto/res/values-hu/strings.xml
index 70223a3..0b2ec9e 100644
--- a/java/com/android/dialer/contactphoto/res/values-hu/strings.xml
+++ b/java/com/android/dialer/contactphoto/res/values-hu/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_quick_contact_for" msgid="6701611505635096879">"<xliff:g id="NAME">%1$s</xliff:g> gyors elérése"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_quick_contact_for">%1$s gyors elérése</string>
 </resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-hy/strings.xml b/java/com/android/dialer/contactphoto/res/values-hy/strings.xml
index af84ef3..db40854 100644
--- a/java/com/android/dialer/contactphoto/res/values-hy/strings.xml
+++ b/java/com/android/dialer/contactphoto/res/values-hy/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_quick_contact_for" msgid="6701611505635096879">"Արագ հաղորդակցում <xliff:g id="NAME">%1$s</xliff:g>-ի հետ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_quick_contact_for">Արագ հաղորդակցում %1$s-ի հետ</string>
 </resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-in/strings.xml b/java/com/android/dialer/contactphoto/res/values-in/strings.xml
index 0295a30..7dfcb99 100644
--- a/java/com/android/dialer/contactphoto/res/values-in/strings.xml
+++ b/java/com/android/dialer/contactphoto/res/values-in/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_quick_contact_for" msgid="6701611505635096879">"Kontak kilat untuk <xliff:g id="NAME">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_quick_contact_for">Kontak kilat untuk %1$s</string>
 </resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-is/strings.xml b/java/com/android/dialer/contactphoto/res/values-is/strings.xml
index 8b6a988..43b6686 100644
--- a/java/com/android/dialer/contactphoto/res/values-is/strings.xml
+++ b/java/com/android/dialer/contactphoto/res/values-is/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_quick_contact_for" msgid="6701611505635096879">"Flýtitengiliður fyrir <xliff:g id="NAME">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_quick_contact_for">Flýtitengiliður fyrir %1$s</string>
 </resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-it/strings.xml b/java/com/android/dialer/contactphoto/res/values-it/strings.xml
index 4abc81e..5029039 100644
--- a/java/com/android/dialer/contactphoto/res/values-it/strings.xml
+++ b/java/com/android/dialer/contactphoto/res/values-it/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_quick_contact_for" msgid="6701611505635096879">"Contatto rapido per <xliff:g id="NAME">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_quick_contact_for">Contatto rapido per %1$s</string>
 </resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-iw/strings.xml b/java/com/android/dialer/contactphoto/res/values-iw/strings.xml
index bae1c28..e5d87eb 100644
--- a/java/com/android/dialer/contactphoto/res/values-iw/strings.xml
+++ b/java/com/android/dialer/contactphoto/res/values-iw/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_quick_contact_for" msgid="6701611505635096879">"קשר מהיר עבור <xliff:g id="NAME">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_quick_contact_for">קשר מהיר עבור %1$s</string>
 </resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-ja/strings.xml b/java/com/android/dialer/contactphoto/res/values-ja/strings.xml
index f1aae7e..a898336 100644
--- a/java/com/android/dialer/contactphoto/res/values-ja/strings.xml
+++ b/java/com/android/dialer/contactphoto/res/values-ja/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_quick_contact_for" msgid="6701611505635096879">"<xliff:g id="NAME">%1$s</xliff:g> さんのクイックコンタクト"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_quick_contact_for">%1$s さんのクイックコンタクト</string>
 </resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-ka/strings.xml b/java/com/android/dialer/contactphoto/res/values-ka/strings.xml
index 48c5203..33ff862 100644
--- a/java/com/android/dialer/contactphoto/res/values-ka/strings.xml
+++ b/java/com/android/dialer/contactphoto/res/values-ka/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_quick_contact_for" msgid="6701611505635096879">"სწრაფი კონტაქტი <xliff:g id="NAME">%1$s</xliff:g>-თან"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_quick_contact_for">სწრაფი კონტაქტი %1$s-თან</string>
 </resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-kk/strings.xml b/java/com/android/dialer/contactphoto/res/values-kk/strings.xml
index 1253006..14d8520 100644
--- a/java/com/android/dialer/contactphoto/res/values-kk/strings.xml
+++ b/java/com/android/dialer/contactphoto/res/values-kk/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_quick_contact_for" msgid="6701611505635096879">"<xliff:g id="NAME">%1$s</xliff:g> үшін жылдам байланыс"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_quick_contact_for">%1$s үшін жылдам байланыс</string>
 </resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-km/strings.xml b/java/com/android/dialer/contactphoto/res/values-km/strings.xml
index 16c71bd..882a706 100644
--- a/java/com/android/dialer/contactphoto/res/values-km/strings.xml
+++ b/java/com/android/dialer/contactphoto/res/values-km/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_quick_contact_for" msgid="6701611505635096879">"ទំនាក់ទំនង​រហ័ស​សម្រាប់ <xliff:g id="NAME">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_quick_contact_for">ទំនាក់ទំនង​រហ័ស​សម្រាប់ %1$s</string>
 </resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-kn/strings.xml b/java/com/android/dialer/contactphoto/res/values-kn/strings.xml
index 3ed2bd0..61551a1 100644
--- a/java/com/android/dialer/contactphoto/res/values-kn/strings.xml
+++ b/java/com/android/dialer/contactphoto/res/values-kn/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_quick_contact_for" msgid="6701611505635096879">"<xliff:g id="NAME">%1$s</xliff:g> ಅವರಿಗೆ ತ್ವರಿತ ಸಂಪರ್ಕ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_quick_contact_for">%1$s ಅವರಿಗೆ ತ್ವರಿತ ಸಂಪರ್ಕ</string>
 </resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-ko/strings.xml b/java/com/android/dialer/contactphoto/res/values-ko/strings.xml
index 512c2d8..3706670 100644
--- a/java/com/android/dialer/contactphoto/res/values-ko/strings.xml
+++ b/java/com/android/dialer/contactphoto/res/values-ko/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_quick_contact_for" msgid="6701611505635096879">"<xliff:g id="NAME">%1$s</xliff:g>님의 빠른 주소록"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_quick_contact_for">%1$s님의 빠른 주소록</string>
 </resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-ky/strings.xml b/java/com/android/dialer/contactphoto/res/values-ky/strings.xml
index 7ea4196..d292f80 100644
--- a/java/com/android/dialer/contactphoto/res/values-ky/strings.xml
+++ b/java/com/android/dialer/contactphoto/res/values-ky/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_quick_contact_for" msgid="6701611505635096879">"<xliff:g id="NAME">%1$s</xliff:g> үчүн тез байланышуу"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_quick_contact_for">%1$s үчүн тез байланышуу</string>
 </resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-lo/strings.xml b/java/com/android/dialer/contactphoto/res/values-lo/strings.xml
index 0b9d624..374d324 100644
--- a/java/com/android/dialer/contactphoto/res/values-lo/strings.xml
+++ b/java/com/android/dialer/contactphoto/res/values-lo/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_quick_contact_for" msgid="6701611505635096879">"ຂໍ້ມູນຕິດຕໍ່ດ່ວນສຳລັບ <xliff:g id="NAME">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_quick_contact_for">ຂໍ້ມູນຕິດຕໍ່ດ່ວນສຳລັບ %1$s</string>
 </resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-lt/strings.xml b/java/com/android/dialer/contactphoto/res/values-lt/strings.xml
index 4d5d86e..7805743 100644
--- a/java/com/android/dialer/contactphoto/res/values-lt/strings.xml
+++ b/java/com/android/dialer/contactphoto/res/values-lt/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_quick_contact_for" msgid="6701611505635096879">"Spartusis <xliff:g id="NAME">%1$s</xliff:g> kontaktas"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_quick_contact_for">Spartusis %1$s kontaktas</string>
 </resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-lv/strings.xml b/java/com/android/dialer/contactphoto/res/values-lv/strings.xml
index 1fc1457..1c2ca2e 100644
--- a/java/com/android/dialer/contactphoto/res/values-lv/strings.xml
+++ b/java/com/android/dialer/contactphoto/res/values-lv/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_quick_contact_for" msgid="6701611505635096879">"Ātrā saziņa ar kontaktpersonu <xliff:g id="NAME">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_quick_contact_for">Ātrā saziņa ar kontaktpersonu %1$s</string>
 </resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-mk/strings.xml b/java/com/android/dialer/contactphoto/res/values-mk/strings.xml
index 0d84df8..fa282f9 100644
--- a/java/com/android/dialer/contactphoto/res/values-mk/strings.xml
+++ b/java/com/android/dialer/contactphoto/res/values-mk/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_quick_contact_for" msgid="6701611505635096879">"Брз контакт за <xliff:g id="NAME">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_quick_contact_for">Брз контакт за %1$s</string>
 </resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-ml/strings.xml b/java/com/android/dialer/contactphoto/res/values-ml/strings.xml
index 695917b..aa49f13 100644
--- a/java/com/android/dialer/contactphoto/res/values-ml/strings.xml
+++ b/java/com/android/dialer/contactphoto/res/values-ml/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_quick_contact_for" msgid="6701611505635096879">"<xliff:g id="NAME">%1$s</xliff:g> എന്നയാളുടെ ദ്രുത കോൺടാക്റ്റ്"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_quick_contact_for">%1$s എന്നയാളുടെ ദ്രുത കോൺടാക്റ്റ്</string>
 </resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-mn/strings.xml b/java/com/android/dialer/contactphoto/res/values-mn/strings.xml
index bf28c8b..526f063 100644
--- a/java/com/android/dialer/contactphoto/res/values-mn/strings.xml
+++ b/java/com/android/dialer/contactphoto/res/values-mn/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_quick_contact_for" msgid="6701611505635096879">"<xliff:g id="NAME">%1$s</xliff:g>-н Шуурхай хаяг"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_quick_contact_for">%1$s-н Шуурхай хаяг</string>
 </resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-mr/strings.xml b/java/com/android/dialer/contactphoto/res/values-mr/strings.xml
index a7cba8d..3e39fd6 100644
--- a/java/com/android/dialer/contactphoto/res/values-mr/strings.xml
+++ b/java/com/android/dialer/contactphoto/res/values-mr/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_quick_contact_for" msgid="6701611505635096879">"<xliff:g id="NAME">%1$s</xliff:g> साठी जलद संपर्क"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_quick_contact_for">%1$s साठी जलद संपर्क</string>
 </resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-ms/strings.xml b/java/com/android/dialer/contactphoto/res/values-ms/strings.xml
index e6b74d2..090e5f7 100644
--- a/java/com/android/dialer/contactphoto/res/values-ms/strings.xml
+++ b/java/com/android/dialer/contactphoto/res/values-ms/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_quick_contact_for" msgid="6701611505635096879">"Kenalan cepat untuk <xliff:g id="NAME">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_quick_contact_for">Kenalan cepat untuk %1$s</string>
 </resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-my/strings.xml b/java/com/android/dialer/contactphoto/res/values-my/strings.xml
index 05965d1..6b3a5ce 100644
--- a/java/com/android/dialer/contactphoto/res/values-my/strings.xml
+++ b/java/com/android/dialer/contactphoto/res/values-my/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_quick_contact_for" msgid="6701611505635096879">"<xliff:g id="NAME">%1$s</xliff:g> အတွက် အမြန်အဆက်အသွယ်"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_quick_contact_for">%1$s အတွက် အမြန်အဆက်အသွယ်</string>
 </resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-nb/strings.xml b/java/com/android/dialer/contactphoto/res/values-nb/strings.xml
index 3df1386..54fca53 100644
--- a/java/com/android/dialer/contactphoto/res/values-nb/strings.xml
+++ b/java/com/android/dialer/contactphoto/res/values-nb/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_quick_contact_for" msgid="6701611505635096879">"Hurtigkontakt for <xliff:g id="NAME">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_quick_contact_for">Hurtigkontakt for %1$s</string>
 </resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-ne/strings.xml b/java/com/android/dialer/contactphoto/res/values-ne/strings.xml
index 906dffe..9423d2e 100644
--- a/java/com/android/dialer/contactphoto/res/values-ne/strings.xml
+++ b/java/com/android/dialer/contactphoto/res/values-ne/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_quick_contact_for" msgid="6701611505635096879">"<xliff:g id="NAME">%1$s</xliff:g>को छिटो सम्पर्क"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_quick_contact_for">%1$sको छिटो सम्पर्क</string>
 </resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-nl/strings.xml b/java/com/android/dialer/contactphoto/res/values-nl/strings.xml
index a7046e5..ded6dd1 100644
--- a/java/com/android/dialer/contactphoto/res/values-nl/strings.xml
+++ b/java/com/android/dialer/contactphoto/res/values-nl/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_quick_contact_for" msgid="6701611505635096879">"Snelcontact voor <xliff:g id="NAME">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_quick_contact_for">Snelcontact voor %1$s</string>
 </resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-no/strings.xml b/java/com/android/dialer/contactphoto/res/values-no/strings.xml
index 3df1386..54fca53 100644
--- a/java/com/android/dialer/contactphoto/res/values-no/strings.xml
+++ b/java/com/android/dialer/contactphoto/res/values-no/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_quick_contact_for" msgid="6701611505635096879">"Hurtigkontakt for <xliff:g id="NAME">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_quick_contact_for">Hurtigkontakt for %1$s</string>
 </resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-pa/strings.xml b/java/com/android/dialer/contactphoto/res/values-pa/strings.xml
index b94a4d5..3bf1a47 100644
--- a/java/com/android/dialer/contactphoto/res/values-pa/strings.xml
+++ b/java/com/android/dialer/contactphoto/res/values-pa/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_quick_contact_for" msgid="6701611505635096879">"<xliff:g id="NAME">%1$s</xliff:g> ਲਈ ਤਤਕਾਲ ਸੰਪਰਕ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_quick_contact_for">%1$s ਲਈ ਤਤਕਾਲ ਸੰਪਰਕ</string>
 </resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-pl/strings.xml b/java/com/android/dialer/contactphoto/res/values-pl/strings.xml
index 91a4c22..828d7c5 100644
--- a/java/com/android/dialer/contactphoto/res/values-pl/strings.xml
+++ b/java/com/android/dialer/contactphoto/res/values-pl/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_quick_contact_for" msgid="6701611505635096879">"Szybki kontakt: <xliff:g id="NAME">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_quick_contact_for">Szybki kontakt: %1$s</string>
 </resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-pt-rBR/strings.xml b/java/com/android/dialer/contactphoto/res/values-pt-rBR/strings.xml
index 8cd0996..6f441e0 100644
--- a/java/com/android/dialer/contactphoto/res/values-pt-rBR/strings.xml
+++ b/java/com/android/dialer/contactphoto/res/values-pt-rBR/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_quick_contact_for" msgid="6701611505635096879">"Contato rápido de <xliff:g id="NAME">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_quick_contact_for">Contato rápido de %1$s</string>
 </resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-pt-rPT/strings.xml b/java/com/android/dialer/contactphoto/res/values-pt-rPT/strings.xml
index fdb5cf7..a5b731b 100644
--- a/java/com/android/dialer/contactphoto/res/values-pt-rPT/strings.xml
+++ b/java/com/android/dialer/contactphoto/res/values-pt-rPT/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_quick_contact_for" msgid="6701611505635096879">"Contactos rápidos para <xliff:g id="NAME">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_quick_contact_for">Contactos rápidos para %1$s</string>
 </resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-pt/strings.xml b/java/com/android/dialer/contactphoto/res/values-pt/strings.xml
index 8cd0996..6f441e0 100644
--- a/java/com/android/dialer/contactphoto/res/values-pt/strings.xml
+++ b/java/com/android/dialer/contactphoto/res/values-pt/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_quick_contact_for" msgid="6701611505635096879">"Contato rápido de <xliff:g id="NAME">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_quick_contact_for">Contato rápido de %1$s</string>
 </resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-ro/strings.xml b/java/com/android/dialer/contactphoto/res/values-ro/strings.xml
index 5872c36..ca79c03 100644
--- a/java/com/android/dialer/contactphoto/res/values-ro/strings.xml
+++ b/java/com/android/dialer/contactphoto/res/values-ro/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_quick_contact_for" msgid="6701611505635096879">"Contact rapid pentru <xliff:g id="NAME">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_quick_contact_for">Contact rapid pentru %1$s</string>
 </resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-ru/strings.xml b/java/com/android/dialer/contactphoto/res/values-ru/strings.xml
index efb1cc4..56a1c1e 100644
--- a/java/com/android/dialer/contactphoto/res/values-ru/strings.xml
+++ b/java/com/android/dialer/contactphoto/res/values-ru/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_quick_contact_for" msgid="6701611505635096879">"Быстрый вызов, контакт: <xliff:g id="NAME">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_quick_contact_for">Быстрый вызов, контакт: %1$s</string>
 </resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-si/strings.xml b/java/com/android/dialer/contactphoto/res/values-si/strings.xml
index 7abbdbe..af2b62e 100644
--- a/java/com/android/dialer/contactphoto/res/values-si/strings.xml
+++ b/java/com/android/dialer/contactphoto/res/values-si/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_quick_contact_for" msgid="6701611505635096879">"<xliff:g id="NAME">%1$s</xliff:g> සඳහා ඉක්මන් සම්බන්ධතාව"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_quick_contact_for">%1$s සඳහා ඉක්මන් සම්බන්ධතාව</string>
 </resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-sk/strings.xml b/java/com/android/dialer/contactphoto/res/values-sk/strings.xml
index 2abf26a..4bd81e6 100644
--- a/java/com/android/dialer/contactphoto/res/values-sk/strings.xml
+++ b/java/com/android/dialer/contactphoto/res/values-sk/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_quick_contact_for" msgid="6701611505635096879">"Rýchly kontakt pre osobu <xliff:g id="NAME">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_quick_contact_for">Rýchly kontakt pre osobu %1$s</string>
 </resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-sl/strings.xml b/java/com/android/dialer/contactphoto/res/values-sl/strings.xml
index c3f1207..16fa4e9 100644
--- a/java/com/android/dialer/contactphoto/res/values-sl/strings.xml
+++ b/java/com/android/dialer/contactphoto/res/values-sl/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_quick_contact_for" msgid="6701611505635096879">"Hitri stik za <xliff:g id="NAME">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_quick_contact_for">Hitri stik za %1$s</string>
 </resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-sq/strings.xml b/java/com/android/dialer/contactphoto/res/values-sq/strings.xml
index 96a83e7..cb969b8 100644
--- a/java/com/android/dialer/contactphoto/res/values-sq/strings.xml
+++ b/java/com/android/dialer/contactphoto/res/values-sq/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_quick_contact_for" msgid="6701611505635096879">"Kontakti i shpejtë për <xliff:g id="NAME">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_quick_contact_for">Kontakti i shpejtë për %1$s</string>
 </resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-sr/strings.xml b/java/com/android/dialer/contactphoto/res/values-sr/strings.xml
index 16df264..0455447 100644
--- a/java/com/android/dialer/contactphoto/res/values-sr/strings.xml
+++ b/java/com/android/dialer/contactphoto/res/values-sr/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_quick_contact_for" msgid="6701611505635096879">"Брзи контакт за: <xliff:g id="NAME">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_quick_contact_for">Брзи контакт за: %1$s</string>
 </resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-sv/strings.xml b/java/com/android/dialer/contactphoto/res/values-sv/strings.xml
index 217230f..d472457 100644
--- a/java/com/android/dialer/contactphoto/res/values-sv/strings.xml
+++ b/java/com/android/dialer/contactphoto/res/values-sv/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_quick_contact_for" msgid="6701611505635096879">"Snabbkontakt för <xliff:g id="NAME">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_quick_contact_for">Snabbkontakt för %1$s</string>
 </resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-sw/strings.xml b/java/com/android/dialer/contactphoto/res/values-sw/strings.xml
index 8127e25..f6b33fe 100644
--- a/java/com/android/dialer/contactphoto/res/values-sw/strings.xml
+++ b/java/com/android/dialer/contactphoto/res/values-sw/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_quick_contact_for" msgid="6701611505635096879">"Wasiliana kwa haraka na <xliff:g id="NAME">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_quick_contact_for">Wasiliana kwa haraka na %1$s</string>
 </resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-ta/strings.xml b/java/com/android/dialer/contactphoto/res/values-ta/strings.xml
index 4e488fd..1e00396 100644
--- a/java/com/android/dialer/contactphoto/res/values-ta/strings.xml
+++ b/java/com/android/dialer/contactphoto/res/values-ta/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_quick_contact_for" msgid="6701611505635096879">"<xliff:g id="NAME">%1$s</xliff:g>க்கான விரைவுத் தொடர்பு"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_quick_contact_for">%1$sக்கான விரைவுத் தொடர்பு</string>
 </resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-te/strings.xml b/java/com/android/dialer/contactphoto/res/values-te/strings.xml
index 0bcf37a..f493651 100644
--- a/java/com/android/dialer/contactphoto/res/values-te/strings.xml
+++ b/java/com/android/dialer/contactphoto/res/values-te/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_quick_contact_for" msgid="6701611505635096879">"<xliff:g id="NAME">%1$s</xliff:g> కోసం త్వరిత సంప్రదింపు"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_quick_contact_for">%1$s కోసం త్వరిత సంప్రదింపు</string>
 </resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-th/strings.xml b/java/com/android/dialer/contactphoto/res/values-th/strings.xml
index 02470c4..f9049ff 100644
--- a/java/com/android/dialer/contactphoto/res/values-th/strings.xml
+++ b/java/com/android/dialer/contactphoto/res/values-th/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_quick_contact_for" msgid="6701611505635096879">"สมุดโทรศัพท์ด่วนสำหรับ <xliff:g id="NAME">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_quick_contact_for">สมุดโทรศัพท์ด่วนสำหรับ %1$s</string>
 </resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-tl/strings.xml b/java/com/android/dialer/contactphoto/res/values-tl/strings.xml
index 9a1de36..7620470 100644
--- a/java/com/android/dialer/contactphoto/res/values-tl/strings.xml
+++ b/java/com/android/dialer/contactphoto/res/values-tl/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_quick_contact_for" msgid="6701611505635096879">"Mabilisan na contact para kay <xliff:g id="NAME">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_quick_contact_for">Mabilisan na contact para kay %1$s</string>
 </resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-tr/strings.xml b/java/com/android/dialer/contactphoto/res/values-tr/strings.xml
index 310233f..ac3c3f6 100644
--- a/java/com/android/dialer/contactphoto/res/values-tr/strings.xml
+++ b/java/com/android/dialer/contactphoto/res/values-tr/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_quick_contact_for" msgid="6701611505635096879">"<xliff:g id="NAME">%1$s</xliff:g> için hızlı iletişim"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_quick_contact_for">%1$s için hızlı iletişim</string>
 </resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-uk/strings.xml b/java/com/android/dialer/contactphoto/res/values-uk/strings.xml
index 5eceb6f..f6fe443 100644
--- a/java/com/android/dialer/contactphoto/res/values-uk/strings.xml
+++ b/java/com/android/dialer/contactphoto/res/values-uk/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_quick_contact_for" msgid="6701611505635096879">"Швидкий контакт із користувачем <xliff:g id="NAME">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_quick_contact_for">Швидкий контакт із користувачем %1$s</string>
 </resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-ur/strings.xml b/java/com/android/dialer/contactphoto/res/values-ur/strings.xml
index fa7221c..188d96d 100644
--- a/java/com/android/dialer/contactphoto/res/values-ur/strings.xml
+++ b/java/com/android/dialer/contactphoto/res/values-ur/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_quick_contact_for" msgid="6701611505635096879">"<xliff:g id="NAME">%1$s</xliff:g> کیلئے فوری رابطہ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_quick_contact_for">%1$s کیلئے فوری رابطہ</string>
 </resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-uz/strings.xml b/java/com/android/dialer/contactphoto/res/values-uz/strings.xml
index 6eb28ee..0b41706 100644
--- a/java/com/android/dialer/contactphoto/res/values-uz/strings.xml
+++ b/java/com/android/dialer/contactphoto/res/values-uz/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_quick_contact_for" msgid="6701611505635096879">"Tezkor chaqiruv, kontakt: <xliff:g id="NAME">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_quick_contact_for">Tezkor chaqiruv, kontakt: %1$s</string>
 </resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-vi/strings.xml b/java/com/android/dialer/contactphoto/res/values-vi/strings.xml
index f10ea2f..55c2597 100644
--- a/java/com/android/dialer/contactphoto/res/values-vi/strings.xml
+++ b/java/com/android/dialer/contactphoto/res/values-vi/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_quick_contact_for" msgid="6701611505635096879">"Liên hệ nhanh cho <xliff:g id="NAME">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_quick_contact_for">Liên hệ nhanh cho %1$s</string>
 </resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-zh-rCN/strings.xml b/java/com/android/dialer/contactphoto/res/values-zh-rCN/strings.xml
index 1739077..37828e6 100644
--- a/java/com/android/dialer/contactphoto/res/values-zh-rCN/strings.xml
+++ b/java/com/android/dialer/contactphoto/res/values-zh-rCN/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_quick_contact_for" msgid="6701611505635096879">"<xliff:g id="NAME">%1$s</xliff:g>的快捷联系方式"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_quick_contact_for">%1$s的快捷联系方式</string>
 </resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-zh-rHK/strings.xml b/java/com/android/dialer/contactphoto/res/values-zh-rHK/strings.xml
index 53f6fdd..597719c 100644
--- a/java/com/android/dialer/contactphoto/res/values-zh-rHK/strings.xml
+++ b/java/com/android/dialer/contactphoto/res/values-zh-rHK/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_quick_contact_for" msgid="6701611505635096879">"快速聯絡<xliff:g id="NAME">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_quick_contact_for">快速聯絡%1$s</string>
 </resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-zh-rTW/strings.xml b/java/com/android/dialer/contactphoto/res/values-zh-rTW/strings.xml
index a4eca1e..2cc0753 100644
--- a/java/com/android/dialer/contactphoto/res/values-zh-rTW/strings.xml
+++ b/java/com/android/dialer/contactphoto/res/values-zh-rTW/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_quick_contact_for" msgid="6701611505635096879">"<xliff:g id="NAME">%1$s</xliff:g>的快速聯絡人相片"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_quick_contact_for">%1$s的快速聯絡人相片</string>
 </resources>
diff --git a/java/com/android/dialer/contactphoto/res/values-zu/strings.xml b/java/com/android/dialer/contactphoto/res/values-zu/strings.xml
index f8cf074..1559400 100644
--- a/java/com/android/dialer/contactphoto/res/values-zu/strings.xml
+++ b/java/com/android/dialer/contactphoto/res/values-zu/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_quick_contact_for" msgid="6701611505635096879">"Oxhumene naye ngokushesha ku <xliff:g id="NAME">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_quick_contact_for">Oxhumene naye ngokushesha ku %1$s</string>
 </resources>
diff --git a/java/com/android/dialer/contacts/ContactsComponent.java b/java/com/android/dialer/contacts/ContactsComponent.java
new file mode 100644
index 0000000..9c67737
--- /dev/null
+++ b/java/com/android/dialer/contacts/ContactsComponent.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.dialer.contacts;
+
+import android.content.Context;
+import com.android.dialer.contacts.displaypreference.ContactDisplayPreferences;
+import com.android.dialer.contacts.hiresphoto.HighResolutionPhotoRequester;
+import com.android.dialer.inject.HasRootComponent;
+import com.android.dialer.inject.IncludeInDialerRoot;
+import dagger.Subcomponent;
+
+/** Component for contacts related utilities */
+@Subcomponent
+public abstract class ContactsComponent {
+
+  public abstract ContactDisplayPreferences contactDisplayPreferences();
+
+  public abstract HighResolutionPhotoRequester highResolutionPhotoLoader();
+
+  public static ContactsComponent get(Context context) {
+    return ((HasComponent) ((HasRootComponent) context.getApplicationContext()).component())
+        .contactsComponent();
+  }
+
+  /** Used to refer to the root application component. */
+  @IncludeInDialerRoot
+  public interface HasComponent {
+    ContactsComponent contactsComponent();
+  }
+}
diff --git a/java/com/android/dialer/contacts/ContactsModule.java b/java/com/android/dialer/contacts/ContactsModule.java
new file mode 100644
index 0000000..2a27b76
--- /dev/null
+++ b/java/com/android/dialer/contacts/ContactsModule.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.dialer.contacts;
+
+import android.content.Context;
+import android.os.UserManager;
+import com.android.dialer.contacts.displaypreference.ContactDisplayPreferences;
+import com.android.dialer.contacts.displaypreference.ContactDisplayPreferencesImpl;
+import com.android.dialer.contacts.displaypreference.ContactDisplayPreferencesStub;
+import com.android.dialer.contacts.hiresphoto.HighResolutionPhotoRequester;
+import com.android.dialer.contacts.hiresphoto.HighResolutionPhotoRequesterImpl;
+import com.android.dialer.inject.ApplicationContext;
+import com.android.dialer.inject.DialerVariant;
+import com.android.dialer.inject.InstallIn;
+import dagger.Binds;
+import dagger.Lazy;
+import dagger.Module;
+import dagger.Provides;
+
+/** Module for standard {@link ContactsComponent} */
+@InstallIn(variants = {DialerVariant.DIALER_TEST})
+@Module
+public abstract class ContactsModule {
+  @Provides
+  public static ContactDisplayPreferences provideContactDisplayPreferences(
+      @ApplicationContext Context appContext,
+      Lazy<ContactDisplayPreferencesImpl> impl,
+      ContactDisplayPreferencesStub stub) {
+    if (appContext.getSystemService(UserManager.class).isUserUnlocked()) {
+      return impl.get();
+    }
+    return stub;
+  }
+
+  @Binds
+  public abstract HighResolutionPhotoRequester toHighResolutionPhotoRequesterImpl(
+      HighResolutionPhotoRequesterImpl impl);
+}
diff --git a/java/com/android/dialer/contacts/displaypreference/AndroidManifest.xml b/java/com/android/dialer/contacts/displaypreference/AndroidManifest.xml
new file mode 100644
index 0000000..2751461
--- /dev/null
+++ b/java/com/android/dialer/contacts/displaypreference/AndroidManifest.xml
@@ -0,0 +1,18 @@
+<!--
+  ~ Copyright (C) 2018 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+<manifest
+    package="com.android.dialer.contacts.displaypreference">
+</manifest>
\ No newline at end of file
diff --git a/java/com/android/dialer/contacts/displaypreference/ContactDisplayPreferences.java b/java/com/android/dialer/contacts/displaypreference/ContactDisplayPreferences.java
new file mode 100644
index 0000000..dca466e
--- /dev/null
+++ b/java/com/android/dialer/contacts/displaypreference/ContactDisplayPreferences.java
@@ -0,0 +1,162 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.dialer.contacts.displaypreference;
+
+import android.content.Context;
+import android.support.annotation.Nullable;
+import android.support.annotation.StringRes;
+import android.text.TextUtils;
+import java.util.Arrays;
+
+/** Handles name ordering of a contact (Given name first or family name first.) */
+public interface ContactDisplayPreferences {
+
+  /**
+   * A enum whose value is a String from a Android string resource which can only be resolved at run
+   * time.
+   */
+  interface StringResEnum {
+
+    @StringRes
+    int getStringRes();
+
+    default String getValue(Context context) {
+      return context.getString(getStringRes());
+    }
+
+    static <T extends Enum<T> & StringResEnum> T fromValue(
+        Context context, T[] values, String value) {
+      return Arrays.stream(values)
+          .filter(enumValue -> TextUtils.equals(enumValue.getValue(context), value))
+          // MoreCollectors.onlyElement() is not available to android guava.
+          .reduce(
+              (a, b) -> {
+                throw new AssertionError("multiple result");
+              })
+          .get();
+    }
+  }
+
+  /** Order when displaying the name; */
+  enum DisplayOrder implements StringResEnum {
+
+    /**
+     * The default display order of a name. For western names it will be "Given Family". For
+     * unstructured names like east asian this will be the only order.
+     *
+     * @see android.provider.ContactsContract.Contacts#DISPLAY_NAME_PRIMARY
+     */
+    PRIMARY(R.string.display_options_view_given_name_first_value),
+    /**
+     * The alternative display order of a name. For western names it will be "Family, Given". For
+     * unstructured names like east asian this order will be ignored and treated as primary.
+     *
+     * @see android.provider.ContactsContract.Contacts#DISPLAY_NAME_ALTERNATIVE
+     */
+    ALTERNATIVE(R.string.display_options_view_family_name_first_value);
+
+    @StringRes private final int value;
+
+    DisplayOrder(@StringRes int value) {
+      this.value = value;
+    }
+
+    @Override
+    @StringRes
+    public int getStringRes() {
+      return value;
+    }
+
+    static DisplayOrder fromValue(Context context, String value) {
+      return StringResEnum.fromValue(context, DisplayOrder.values(), value);
+    }
+  }
+
+  /**
+   * Order when sorting the name. In some conventions, names are displayed as given name first, but
+   * sorted by family name.
+   */
+  enum SortOrder implements StringResEnum {
+    /**
+     * Sort by the default display order of a name. For western names it will be "Given Family". For
+     * unstructured names like east asian this will be the only order.
+     *
+     * @see android.provider.ContactsContract.Contacts#DISPLAY_NAME_PRIMARY
+     */
+    BY_PRIMARY(R.string.display_options_sort_by_given_name_value),
+    /**
+     * Sort by the alternative display order of a name. For western names it will be "Family,
+     * Given". For unstructured names like east asian this order will be ignored and treated as
+     * primary.
+     *
+     * @see android.provider.ContactsContract.Contacts#DISPLAY_NAME_ALTERNATIVE
+     */
+    BY_ALTERNATIVE(R.string.display_options_sort_by_family_name_value);
+
+    @StringRes private final int value;
+
+    SortOrder(@StringRes int value) {
+      this.value = value;
+    }
+
+    @Override
+    @StringRes
+    public int getStringRes() {
+      return value;
+    }
+
+    static SortOrder fromValue(Context context, String value) {
+      return StringResEnum.fromValue(context, SortOrder.values(), value);
+    }
+  }
+
+  DisplayOrder getDisplayOrder();
+
+  void setDisplayOrder(DisplayOrder displayOrder);
+
+  SortOrder getSortOrder();
+
+  void setSortOrder(SortOrder sortOrder);
+
+  /** Selects display name based on {@link DisplayOrder} */
+  default String getDisplayName(@Nullable String primaryName, @Nullable String alternativeName) {
+    if (TextUtils.isEmpty(alternativeName)) {
+      return primaryName;
+    }
+    switch (getDisplayOrder()) {
+      case PRIMARY:
+        return primaryName;
+      case ALTERNATIVE:
+        return alternativeName;
+    }
+    throw new AssertionError("exhaustive switch");
+  }
+
+  /** Selects sort name based on {@link SortOrder} */
+  default String getSortName(@Nullable String primaryName, @Nullable String alternativeName) {
+    if (TextUtils.isEmpty(alternativeName)) {
+      return primaryName;
+    }
+    switch (getSortOrder()) {
+      case BY_PRIMARY:
+        return primaryName;
+      case BY_ALTERNATIVE:
+        return alternativeName;
+    }
+    throw new AssertionError("exhaustive switch");
+  }
+}
diff --git a/java/com/android/dialer/contacts/displaypreference/ContactDisplayPreferencesImpl.java b/java/com/android/dialer/contacts/displaypreference/ContactDisplayPreferencesImpl.java
new file mode 100644
index 0000000..4f67b17
--- /dev/null
+++ b/java/com/android/dialer/contacts/displaypreference/ContactDisplayPreferencesImpl.java
@@ -0,0 +1,118 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.dialer.contacts.displaypreference;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.os.UserManager;
+import android.preference.PreferenceManager;
+import com.android.dialer.inject.ApplicationContext;
+import javax.inject.Inject;
+
+/**
+ * Implementation of {@link ContactDisplayPreferences} backed by a {@link SharedPreferences}. Can
+ * only be instantiated when the device is unlocked.
+ */
+public final class ContactDisplayPreferencesImpl implements ContactDisplayPreferences {
+
+  private final Context appContext;
+  private final SharedPreferences sharedPreferences;
+  private final String displayOrderKey;
+  private final String sortOrderKey;
+
+  @Inject
+  ContactDisplayPreferencesImpl(@ApplicationContext Context appContext) {
+    this.appContext = appContext;
+    // @Unencrypted preference would be a better choice, but Android Preference only supports the
+    // default file. Stub should be used instead when device is locked.
+    this.sharedPreferences = PreferenceManager.getDefaultSharedPreferences(appContext);
+    displayOrderKey = appContext.getString(R.string.display_options_view_names_as_key);
+    sortOrderKey = appContext.getString(R.string.display_options_sort_list_by_key);
+  }
+
+  @Override
+  public DisplayOrder getDisplayOrder() {
+    migrate();
+    if (!sharedPreferences.contains(displayOrderKey)) {
+      return DisplayOrder.PRIMARY;
+    }
+    return DisplayOrder.fromValue(appContext, sharedPreferences.getString(displayOrderKey, null));
+  }
+
+  @Override
+  public void setDisplayOrder(DisplayOrder displayOrder) {
+    sharedPreferences.edit().putString(displayOrderKey, displayOrder.getValue(appContext)).apply();
+  }
+
+  @Override
+  public SortOrder getSortOrder() {
+    migrate();
+    if (!sharedPreferences.contains(sortOrderKey)) {
+      return SortOrder.BY_PRIMARY;
+    }
+    return SortOrder.fromValue(appContext, sharedPreferences.getString(sortOrderKey, null));
+  }
+
+  @Override
+  public void setSortOrder(SortOrder sortOrder) {
+    sharedPreferences.edit().putString(sortOrderKey, sortOrder.getValue(appContext)).apply();
+  }
+
+  /**
+   * Moves the stored values to the standard location.
+   *
+   * <p>Usually preferences are stored in {@code package.name_preferences.xml}. However the old
+   * com.android.contacts.common.preference.ContactsPreferences stored it in {@code
+   * package.name.xml} which is incompatible with the regular {@link android.preference.Preference}
+   * widgets.
+   */
+  private void migrate() {
+    if (!appContext.getSystemService(UserManager.class).isUserUnlocked()) {
+      return;
+    }
+    SharedPreferences oldPreference =
+        appContext.getSharedPreferences(appContext.getPackageName(), Context.MODE_PRIVATE);
+    if (oldPreference.contains(displayOrderKey) || oldPreference.contains(sortOrderKey)) {
+      sharedPreferences
+          .edit()
+          .putString(
+              displayOrderKey,
+              translateLegacyDisplayOrder(oldPreference.getInt(displayOrderKey, 1)))
+          .putString(sortOrderKey, translateLegacySortOrder(oldPreference.getInt(sortOrderKey, 1)))
+          .apply();
+      oldPreference.edit().remove(displayOrderKey).remove(sortOrderKey).apply();
+    }
+  }
+
+  private String translateLegacyDisplayOrder(int legacyValue) {
+    switch (legacyValue) {
+      case 2:
+        return DisplayOrder.ALTERNATIVE.getValue(appContext);
+      default:
+        return DisplayOrder.PRIMARY.getValue(appContext);
+    }
+  }
+
+  private String translateLegacySortOrder(int legacyValue) {
+    switch (legacyValue) {
+      case 2:
+        return SortOrder.BY_ALTERNATIVE.getValue(appContext);
+      default:
+        return SortOrder.BY_PRIMARY.getValue(appContext);
+    }
+  }
+}
diff --git a/java/com/android/dialer/contacts/displaypreference/ContactDisplayPreferencesStub.java b/java/com/android/dialer/contacts/displaypreference/ContactDisplayPreferencesStub.java
new file mode 100644
index 0000000..a42a94b
--- /dev/null
+++ b/java/com/android/dialer/contacts/displaypreference/ContactDisplayPreferencesStub.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.dialer.contacts.displaypreference;
+
+import javax.inject.Inject;
+
+/**
+ * Stub implementation of {@link ContactDisplayPreferences} that always returns primary. Used when
+ * the device is locked and regular storage is not available.
+ */
+public final class ContactDisplayPreferencesStub implements ContactDisplayPreferences {
+
+  @Inject
+  ContactDisplayPreferencesStub() {}
+
+  @Override
+  public DisplayOrder getDisplayOrder() {
+    return DisplayOrder.PRIMARY;
+  }
+
+  @Override
+  public void setDisplayOrder(DisplayOrder displayOrder) {
+    // Do nothing
+  }
+
+  @Override
+  public SortOrder getSortOrder() {
+    return SortOrder.BY_PRIMARY;
+  }
+
+  @Override
+  public void setSortOrder(SortOrder sortOrder) {
+    // Do nothing
+  }
+}
diff --git a/java/com/android/dialer/contacts/displaypreference/res/values/display_preference.xml b/java/com/android/dialer/contacts/displaypreference/res/values/display_preference.xml
new file mode 100644
index 0000000..b74b8b9
--- /dev/null
+++ b/java/com/android/dialer/contacts/displaypreference/res/values/display_preference.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (C) 2018 The Android Open Source Project
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<resources>
+  <string-array name="contact_display_order_entries">
+    <item>@string/display_options_view_given_name_first</item>
+    <item>@string/display_options_view_family_name_first</item>
+  </string-array>
+
+  <string-array name="contact_display_order_values">
+    <item>@string/display_options_view_given_name_first_value</item>
+    <item>@string/display_options_view_family_name_first_value</item>
+  </string-array>
+
+  <string-array name="contact_sort_order_entries">
+    <item>@string/display_options_sort_by_given_name</item>
+    <item>@string/display_options_sort_by_family_name</item>
+  </string-array>
+
+  <string-array name="contact_sort_order_values">
+    <item>@string/display_options_sort_by_given_name_value</item>
+    <item>@string/display_options_sort_by_family_name_value</item>
+  </string-array>
+</resources>
\ No newline at end of file
diff --git a/java/com/android/dialer/contacts/displaypreference/res/values/strings.xml b/java/com/android/dialer/contacts/displaypreference/res/values/strings.xml
new file mode 100644
index 0000000..8914ddf
--- /dev/null
+++ b/java/com/android/dialer/contacts/displaypreference/res/values/strings.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2018 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Contact preferences related strings -->
+
+  <!-- Label of the "sort by" display option -->
+  <string name="display_options_sort_list_by">Sort by</string>
+
+  <string translatable="false" name="display_options_sort_list_by_key">android.contacts.SORT_ORDER</string>
+
+  <!-- An allowable value for the "sort list by" contact display option  -->
+  <string name="display_options_sort_by_given_name">First name</string>
+
+  <string translatable="false" name="display_options_sort_by_given_name_value">sort_by_given_name</string>
+
+  <!-- An allowable value for the "sort list by" contact display option  -->
+  <string name="display_options_sort_by_family_name">Last name</string>
+
+  <string translatable="false" name="display_options_sort_by_family_name_value">sort_by_family_name</string>
+
+  <!-- Label of the "name format" display option [CHAR LIMIT=64]-->
+  <string name="display_options_view_names_as">Name format</string>
+  <string translatable="false" name="display_options_view_names_as_key">android.contacts.DISPLAY_ORDER</string>
+
+  <!-- An allowable value for the "view names as" contact display option  -->
+  <string name="display_options_view_given_name_first">First name first</string>
+
+  <string translatable="false" name="display_options_view_given_name_first_value">view_given_name_first</string>
+
+  <!-- An allowable value for the "view names as" contact display option  -->
+  <string name="display_options_view_family_name_first">Last name first</string>
+
+  <string translatable="false" name="display_options_view_family_name_first_value">view_family_name_first</string>
+</resources>
diff --git a/java/com/android/dialer/contacts/hiresphoto/HighResolutionPhotoRequester.java b/java/com/android/dialer/contacts/hiresphoto/HighResolutionPhotoRequester.java
new file mode 100644
index 0000000..1075ec1
--- /dev/null
+++ b/java/com/android/dialer/contacts/hiresphoto/HighResolutionPhotoRequester.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.dialer.contacts.hiresphoto;
+
+import android.net.Uri;
+import com.google.common.util.concurrent.ListenableFuture;
+
+/**
+ * Requests the contacts sync adapter to load a high resolution photo for the contact, typically
+ * when we will try to show the contact in a larger view (favorites, incall UI, etc.). If a high
+ * resolution photo is synced, the uri will be notified.
+ */
+public interface HighResolutionPhotoRequester {
+
+  ListenableFuture<Void> request(Uri contactUri);
+}
diff --git a/java/com/android/dialer/contacts/hiresphoto/HighResolutionPhotoRequesterImpl.java b/java/com/android/dialer/contacts/hiresphoto/HighResolutionPhotoRequesterImpl.java
new file mode 100644
index 0000000..9201604
--- /dev/null
+++ b/java/com/android/dialer/contacts/hiresphoto/HighResolutionPhotoRequesterImpl.java
@@ -0,0 +1,137 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.dialer.contacts.hiresphoto;
+
+import android.content.ComponentName;
+import android.content.ContentUris;
+import android.content.Context;
+import android.content.Intent;
+import android.database.Cursor;
+import android.net.Uri;
+import android.provider.ContactsContract.Contacts;
+import android.provider.ContactsContract.RawContacts;
+import android.support.annotation.VisibleForTesting;
+import com.android.dialer.common.LogUtil;
+import com.android.dialer.common.concurrent.Annotations.BackgroundExecutor;
+import com.android.dialer.common.database.Selection;
+import com.android.dialer.inject.ApplicationContext;
+import com.google.common.util.concurrent.ListenableFuture;
+import com.google.common.util.concurrent.ListeningExecutorService;
+import java.util.ArrayList;
+import java.util.List;
+import javax.inject.Inject;
+
+/** Use the contacts sync adapter to load high resolution photos for a Google account. */
+public class HighResolutionPhotoRequesterImpl implements HighResolutionPhotoRequester {
+
+  private static class RequestFailedException extends Exception {
+    RequestFailedException(String message) {
+      super(message);
+    }
+
+    RequestFailedException(String message, Throwable cause) {
+      super(message, cause);
+    }
+  }
+
+  @VisibleForTesting
+  static final ComponentName SYNC_HIGH_RESOLUTION_PHOTO_SERVICE =
+      new ComponentName(
+          "com.google.android.syncadapters.contacts",
+          "com.google.android.syncadapters.contacts.SyncHighResPhotoIntentService");
+
+  private final Context appContext;
+  private final ListeningExecutorService backgroundExecutor;
+
+  @Inject
+  HighResolutionPhotoRequesterImpl(
+      @ApplicationContext Context appContext,
+      @BackgroundExecutor ListeningExecutorService backgroundExecutor) {
+    this.appContext = appContext;
+    this.backgroundExecutor = backgroundExecutor;
+  }
+
+  @Override
+  public ListenableFuture<Void> request(Uri contactUri) {
+    return backgroundExecutor.submit(
+        () -> {
+          try {
+            requestInternal(contactUri);
+          } catch (RequestFailedException e) {
+            LogUtil.e("HighResolutionPhotoRequesterImpl.request", "request failed", e);
+          }
+          return null;
+        });
+  }
+
+  private void requestInternal(Uri contactUri) throws RequestFailedException {
+    for (Long rawContactId : getGoogleRawContactIds(getContactId(contactUri))) {
+      Uri rawContactUri = ContentUris.withAppendedId(RawContacts.CONTENT_URI, rawContactId);
+      Intent intent = new Intent(Intent.ACTION_VIEW);
+      intent.setComponent(SYNC_HIGH_RESOLUTION_PHOTO_SERVICE);
+      intent.setDataAndType(rawContactUri, RawContacts.CONTENT_ITEM_TYPE);
+      intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
+      try {
+        LogUtil.i(
+            "HighResolutionPhotoRequesterImpl.requestInternal",
+            "requesting photo for " + rawContactUri);
+        appContext.startService(intent);
+      } catch (IllegalStateException | SecurityException e) {
+        throw new RequestFailedException("unable to start sync adapter", e);
+      }
+    }
+  }
+
+  private long getContactId(Uri contactUri) throws RequestFailedException {
+    try (Cursor cursor =
+        appContext
+            .getContentResolver()
+            .query(contactUri, new String[] {Contacts._ID}, null, null, null)) {
+      if (cursor == null || !cursor.moveToFirst()) {
+        throw new RequestFailedException("cannot get contact ID");
+      }
+      return cursor.getLong(0);
+    }
+  }
+
+  private List<Long> getGoogleRawContactIds(long contactId) throws RequestFailedException {
+    List<Long> result = new ArrayList<>();
+    Selection selection =
+        Selection.column(RawContacts.CONTACT_ID)
+            .is("=", contactId)
+            .buildUpon()
+            .and(Selection.column(RawContacts.ACCOUNT_TYPE).is("=", "com.google"))
+            .build();
+    try (Cursor cursor =
+        appContext
+            .getContentResolver()
+            .query(
+                RawContacts.CONTENT_URI,
+                new String[] {RawContacts._ID, RawContacts.ACCOUNT_TYPE},
+                selection.getSelection(),
+                selection.getSelectionArgs(),
+                null)) {
+      if (cursor == null) {
+        throw new RequestFailedException("null cursor from raw contact IDs");
+      }
+      for (cursor.moveToFirst(); !cursor.isAfterLast(); cursor.moveToNext()) {
+        result.add(cursor.getLong(0));
+      }
+    }
+    return result;
+  }
+}
diff --git a/java/com/android/dialer/contacts/resources/AndroidManifest.xml b/java/com/android/dialer/contacts/resources/AndroidManifest.xml
new file mode 100644
index 0000000..a1222ae
--- /dev/null
+++ b/java/com/android/dialer/contacts/resources/AndroidManifest.xml
@@ -0,0 +1,16 @@
+<!--
+ ~ Copyright (C) 2018 The Android Open Source Project
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~      http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License
+ -->
+<manifest  package="com.android.dialer.contacts.resources"/>
diff --git a/java/com/android/dialer/contacts/resources/res/drawable-hdpi/ic_call_note_white_24dp.png b/java/com/android/dialer/contacts/resources/res/drawable-hdpi/ic_call_note_white_24dp.png
new file mode 100644
index 0000000..0064349
--- /dev/null
+++ b/java/com/android/dialer/contacts/resources/res/drawable-hdpi/ic_call_note_white_24dp.png
Binary files differ
diff --git a/java/com/android/dialer/contacts/resources/res/drawable-hdpi/ic_phone_attach.png b/java/com/android/dialer/contacts/resources/res/drawable-hdpi/ic_phone_attach.png
new file mode 100644
index 0000000..0137d75
--- /dev/null
+++ b/java/com/android/dialer/contacts/resources/res/drawable-hdpi/ic_phone_attach.png
Binary files differ
diff --git a/java/com/android/dialer/contacts/resources/res/drawable-hdpi/ic_scroll_handle.png b/java/com/android/dialer/contacts/resources/res/drawable-hdpi/ic_scroll_handle.png
new file mode 100644
index 0000000..edc8aa2
--- /dev/null
+++ b/java/com/android/dialer/contacts/resources/res/drawable-hdpi/ic_scroll_handle.png
Binary files differ
diff --git a/java/com/android/dialer/contacts/resources/res/drawable-mdpi/ic_call_note_white_24dp.png b/java/com/android/dialer/contacts/resources/res/drawable-mdpi/ic_call_note_white_24dp.png
new file mode 100644
index 0000000..104983d
--- /dev/null
+++ b/java/com/android/dialer/contacts/resources/res/drawable-mdpi/ic_call_note_white_24dp.png
Binary files differ
diff --git a/java/com/android/dialer/contacts/resources/res/drawable-mdpi/ic_phone_attach.png b/java/com/android/dialer/contacts/resources/res/drawable-mdpi/ic_phone_attach.png
new file mode 100644
index 0000000..b023799
--- /dev/null
+++ b/java/com/android/dialer/contacts/resources/res/drawable-mdpi/ic_phone_attach.png
Binary files differ
diff --git a/java/com/android/dialer/contacts/resources/res/drawable-mdpi/ic_scroll_handle.png b/java/com/android/dialer/contacts/resources/res/drawable-mdpi/ic_scroll_handle.png
new file mode 100644
index 0000000..0724e2a
--- /dev/null
+++ b/java/com/android/dialer/contacts/resources/res/drawable-mdpi/ic_scroll_handle.png
Binary files differ
diff --git a/java/com/android/dialer/contacts/resources/res/drawable-xhdpi/ic_call_note_white_24dp.png b/java/com/android/dialer/contacts/resources/res/drawable-xhdpi/ic_call_note_white_24dp.png
new file mode 100644
index 0000000..a91205b
--- /dev/null
+++ b/java/com/android/dialer/contacts/resources/res/drawable-xhdpi/ic_call_note_white_24dp.png
Binary files differ
diff --git a/java/com/android/dialer/contacts/resources/res/drawable-xhdpi/ic_phone_attach.png b/java/com/android/dialer/contacts/resources/res/drawable-xhdpi/ic_phone_attach.png
new file mode 100644
index 0000000..6bd3237
--- /dev/null
+++ b/java/com/android/dialer/contacts/resources/res/drawable-xhdpi/ic_phone_attach.png
Binary files differ
diff --git a/java/com/android/dialer/contacts/resources/res/drawable-xhdpi/ic_scroll_handle.png b/java/com/android/dialer/contacts/resources/res/drawable-xhdpi/ic_scroll_handle.png
new file mode 100644
index 0000000..e0adfbb
--- /dev/null
+++ b/java/com/android/dialer/contacts/resources/res/drawable-xhdpi/ic_scroll_handle.png
Binary files differ
diff --git a/java/com/android/dialer/contacts/resources/res/drawable-xxhdpi/ic_call_note_white_24dp.png b/java/com/android/dialer/contacts/resources/res/drawable-xxhdpi/ic_call_note_white_24dp.png
new file mode 100644
index 0000000..6822d70
--- /dev/null
+++ b/java/com/android/dialer/contacts/resources/res/drawable-xxhdpi/ic_call_note_white_24dp.png
Binary files differ
diff --git a/java/com/android/dialer/contacts/resources/res/drawable-xxhdpi/ic_phone_attach.png b/java/com/android/dialer/contacts/resources/res/drawable-xxhdpi/ic_phone_attach.png
new file mode 100644
index 0000000..dd58d1c
--- /dev/null
+++ b/java/com/android/dialer/contacts/resources/res/drawable-xxhdpi/ic_phone_attach.png
Binary files differ
diff --git a/java/com/android/dialer/contacts/resources/res/drawable-xxhdpi/ic_scroll_handle.png b/java/com/android/dialer/contacts/resources/res/drawable-xxhdpi/ic_scroll_handle.png
new file mode 100644
index 0000000..37e041c
--- /dev/null
+++ b/java/com/android/dialer/contacts/resources/res/drawable-xxhdpi/ic_scroll_handle.png
Binary files differ
diff --git a/java/com/android/dialer/contacts/resources/res/drawable-xxxhdpi/ic_call_note_white_24dp.png b/java/com/android/dialer/contacts/resources/res/drawable-xxxhdpi/ic_call_note_white_24dp.png
new file mode 100644
index 0000000..4b7ebc9
--- /dev/null
+++ b/java/com/android/dialer/contacts/resources/res/drawable-xxxhdpi/ic_call_note_white_24dp.png
Binary files differ
diff --git a/java/com/android/dialer/contacts/resources/res/drawable-xxxhdpi/ic_phone_attach.png b/java/com/android/dialer/contacts/resources/res/drawable-xxxhdpi/ic_phone_attach.png
new file mode 100644
index 0000000..e238c99
--- /dev/null
+++ b/java/com/android/dialer/contacts/resources/res/drawable-xxxhdpi/ic_phone_attach.png
Binary files differ
diff --git a/java/com/android/dialer/contacts/resources/res/drawable-xxxhdpi/ic_scroll_handle.png b/java/com/android/dialer/contacts/resources/res/drawable-xxxhdpi/ic_scroll_handle.png
new file mode 100644
index 0000000..d725ce1
--- /dev/null
+++ b/java/com/android/dialer/contacts/resources/res/drawable-xxxhdpi/ic_scroll_handle.png
Binary files differ
diff --git a/java/com/android/contacts/common/res/drawable/back_arrow.xml b/java/com/android/dialer/contacts/resources/res/drawable/back_arrow.xml
similarity index 100%
rename from java/com/android/contacts/common/res/drawable/back_arrow.xml
rename to java/com/android/dialer/contacts/resources/res/drawable/back_arrow.xml
diff --git a/java/com/android/dialer/contacts/resources/res/drawable/dialog_background_material.xml b/java/com/android/dialer/contacts/resources/res/drawable/dialog_background_material.xml
new file mode 100644
index 0000000..c93d43e
--- /dev/null
+++ b/java/com/android/dialer/contacts/resources/res/drawable/dialog_background_material.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<inset xmlns:android="http://schemas.android.com/apk/res/android"
+  android:inset="16dp">
+  <shape android:shape="rectangle">
+    <corners android:radius="2dp"/>
+    <solid android:color="?android:attr/colorBackground"/>
+  </shape>
+</inset>
diff --git a/java/com/android/contacts/common/res/drawable/fastscroll_thumb.xml b/java/com/android/dialer/contacts/resources/res/drawable/fastscroll_thumb.xml
similarity index 100%
rename from java/com/android/contacts/common/res/drawable/fastscroll_thumb.xml
rename to java/com/android/dialer/contacts/resources/res/drawable/fastscroll_thumb.xml
diff --git a/java/com/android/dialer/contacts/resources/res/drawable/ic_scroll_handle_default.xml b/java/com/android/dialer/contacts/resources/res/drawable/ic_scroll_handle_default.xml
new file mode 100644
index 0000000..9164ab1
--- /dev/null
+++ b/java/com/android/dialer/contacts/resources/res/drawable/ic_scroll_handle_default.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+  android:src="@drawable/ic_scroll_handle"
+  android:tint="?colorIcon"/>
diff --git a/java/com/android/dialer/contacts/resources/res/drawable/ic_scroll_handle_pressed.xml b/java/com/android/dialer/contacts/resources/res/drawable/ic_scroll_handle_pressed.xml
new file mode 100644
index 0000000..c9b93d9
--- /dev/null
+++ b/java/com/android/dialer/contacts/resources/res/drawable/ic_scroll_handle_pressed.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+  android:src="@drawable/ic_scroll_handle"
+  android:tint="?android:attr/colorPrimary"/>
\ No newline at end of file
diff --git a/java/com/android/contacts/common/res/drawable/ic_work_profile.xml b/java/com/android/dialer/contacts/resources/res/drawable/ic_work_profile.xml
similarity index 100%
rename from java/com/android/contacts/common/res/drawable/ic_work_profile.xml
rename to java/com/android/dialer/contacts/resources/res/drawable/ic_work_profile.xml
diff --git a/java/com/android/dialer/contacts/resources/res/drawable/searchedittext_custom_cursor.xml b/java/com/android/dialer/contacts/resources/res/drawable/searchedittext_custom_cursor.xml
new file mode 100644
index 0000000..51e984c
--- /dev/null
+++ b/java/com/android/dialer/contacts/resources/res/drawable/searchedittext_custom_cursor.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2018 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+  <size android:width="2dp"/>
+  <solid android:color="?android:attr/colorPrimary"/>
+</shape>
\ No newline at end of file
diff --git a/java/com/android/dialer/contacts/resources/res/drawable/unread_count_background.xml b/java/com/android/dialer/contacts/resources/res/drawable/unread_count_background.xml
new file mode 100644
index 0000000..b58baef
--- /dev/null
+++ b/java/com/android/dialer/contacts/resources/res/drawable/unread_count_background.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<shape
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  android:shape="rectangle">
+  <corners android:radius="@dimen/tab_unread_count_background_radius"/>
+  <solid android:color="?android:attr/colorPrimaryDark"/>
+</shape>
diff --git a/java/com/android/dialer/contacts/resources/res/layout-ldrtl/unread_count_tab.xml b/java/com/android/dialer/contacts/resources/res/layout-ldrtl/unread_count_tab.xml
new file mode 100644
index 0000000..51d56bb
--- /dev/null
+++ b/java/com/android/dialer/contacts/resources/res/layout-ldrtl/unread_count_tab.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<!-- layoutDirection set to ltr as a workaround to a framework bug (a bug) causing view with
+     layout_centerInParent inside a RelativeLayout to expand to screen width when RTL is active -->
+<RelativeLayout
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  android:layout_width="match_parent"
+  android:layout_height="match_parent"
+  android:background="@drawable/item_background_material_borderless_dark"
+  android:layoutDirection="ltr">
+  <!-- The tab icon -->
+  <ImageView
+    android:id="@+id/icon"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_centerInParent="true"/>
+  <TextView
+    android:id="@+id/count"
+    android:layout_width="wrap_content"
+    android:layout_height="@dimen/tab_unread_count_background_size"
+    android:layout_marginTop="@dimen/tab_unread_count_margin_top"
+    android:layout_marginStart="@dimen/tab_unread_count_margin_left"
+    android:layout_toStartOf="@id/icon"
+    android:paddingLeft="@dimen/tab_unread_count_text_padding"
+    android:paddingRight="@dimen/tab_unread_count_text_padding"
+    android:background="@drawable/unread_count_background"
+    android:fontFamily="sans-serif-medium"
+    android:importantForAccessibility="no"
+    android:layoutDirection="locale"
+    android:minWidth="@dimen/tab_unread_count_background_size"
+    android:textAlignment="center"
+    android:textColor="?android:attr/colorAccent"
+    android:textSize="@dimen/tab_unread_count_text_size"/>
+</RelativeLayout>
+
diff --git a/java/com/android/dialer/contacts/resources/res/layout/account_filter_header.xml b/java/com/android/dialer/contacts/resources/res/layout/account_filter_header.xml
new file mode 100644
index 0000000..592c240
--- /dev/null
+++ b/java/com/android/dialer/contacts/resources/res/layout/account_filter_header.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- Layout showing the type of account filter
+     (e.g. All contacts filter, custom filter, etc.),
+     which is the header of all contact lists. -->
+
+<!-- Solely used to set a background color -->
+<FrameLayout
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  android:layout_width="match_parent"
+  android:layout_height="wrap_content"
+  android:background="?android:attr/colorBackground">
+  <!-- Used to show the touch feedback -->
+  <FrameLayout
+    android:id="@+id/account_filter_header_container"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginStart="@dimen/contact_browser_list_header_left_margin"
+    android:layout_marginEnd="@dimen/contact_browser_list_header_right_margin"
+    android:paddingTop="@dimen/list_header_extra_top_padding"
+    android:background="?android:attr/selectableItemBackground"
+    android:visibility="gone">
+    <!-- Shows the text and underlining -->
+    <TextView
+      android:id="@+id/account_filter_header"
+      style="@style/ContactListSeparatorTextViewStyle"
+      android:paddingStart="@dimen/contact_browser_list_item_text_indent"
+      android:paddingLeft="@dimen/contact_browser_list_item_text_indent"/>
+  </FrameLayout>
+</FrameLayout>
diff --git a/java/com/android/dialer/contacts/resources/res/layout/call_subject_history_list_item.xml b/java/com/android/dialer/contacts/resources/res/layout/call_subject_history_list_item.xml
new file mode 100644
index 0000000..c08327c
--- /dev/null
+++ b/java/com/android/dialer/contacts/resources/res/layout/call_subject_history_list_item.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2015 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+  android:id="@android:id/text1"
+  android:layout_width="match_parent"
+  android:layout_height="wrap_content"
+  android:paddingTop="@dimen/call_subject_history_item_padding"
+  android:paddingBottom="@dimen/call_subject_history_item_padding"
+  android:paddingStart="@dimen/call_subject_dialog_margin"
+  android:paddingEnd="@dimen/call_subject_dialog_margin"
+  android:gravity="center_vertical"
+  android:singleLine="true"
+  android:textColor="?android:attr/textColorPrimary"
+  android:textSize="@dimen/call_subject_dialog_primary_text_size"/>
diff --git a/java/com/android/contacts/common/res/layout/contact_detail_list_padding.xml b/java/com/android/dialer/contacts/resources/res/layout/contact_detail_list_padding.xml
similarity index 100%
rename from java/com/android/contacts/common/res/layout/contact_detail_list_padding.xml
rename to java/com/android/dialer/contacts/resources/res/layout/contact_detail_list_padding.xml
diff --git a/java/com/android/dialer/contacts/resources/res/layout/contact_list_card.xml b/java/com/android/dialer/contacts/resources/res/layout/contact_list_card.xml
new file mode 100644
index 0000000..37bb8ea
--- /dev/null
+++ b/java/com/android/dialer/contacts/resources/res/layout/contact_list_card.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<LinearLayout
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  android:id="@+id/list_card"
+  android:layout_width="match_parent"
+  android:layout_height="match_parent"
+  android:orientation="horizontal"
+  android:visibility="invisible">
+  <View
+    android:layout_width="0dp"
+    android:layout_height="match_parent"
+    android:layout_weight="@integer/contact_list_space_layout_weight"
+    android:background="?android:attr/colorBackground"/>
+  <View
+    android:layout_width="0dp"
+    android:layout_height="match_parent"
+    android:layout_weight="@integer/contact_list_card_layout_weight"
+    android:background="?android:attr/colorBackground"
+    android:elevation="@dimen/contact_list_card_elevation"/>
+  <View
+    android:layout_width="0dp"
+    android:layout_height="match_parent"
+    android:layout_weight="@integer/contact_list_space_layout_weight"
+    android:background="?android:attr/colorBackground"/>
+</LinearLayout>
diff --git a/java/com/android/contacts/common/res/layout/contact_list_content.xml b/java/com/android/dialer/contacts/resources/res/layout/contact_list_content.xml
similarity index 100%
rename from java/com/android/contacts/common/res/layout/contact_list_content.xml
rename to java/com/android/dialer/contacts/resources/res/layout/contact_list_content.xml
diff --git a/java/com/android/dialer/contacts/resources/res/layout/default_account_checkbox.xml b/java/com/android/dialer/contacts/resources/res/layout/default_account_checkbox.xml
new file mode 100644
index 0000000..9110983
--- /dev/null
+++ b/java/com/android/dialer/contacts/resources/res/layout/default_account_checkbox.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/default_account_checkbox_layout"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:padding="4dp"
+    android:paddingStart="0dp"
+    android:paddingEnd="24dp"
+    android:gravity="center"
+    android:minHeight="56dp"
+    android:orientation="horizontal"
+    android:focusable="true">
+  <FrameLayout
+      android:layout_width="72dp"
+      android:layout_height="wrap_content">
+    <CheckBox
+        android:id="@+id/default_account_checkbox_view"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:checked="false"/>
+    />
+  </FrameLayout>
+  <TextView
+      android:id="@+id/default_account_checkbox_text"
+      android:layout_width="0dp"
+      android:layout_height="wrap_content"
+      android:layout_weight="1"
+      android:text="@string/set_default_account"
+      android:textAlignment="viewStart"
+      android:textAppearance="?android:attr/textAppearanceSmall"
+      android:textColor="?android:attr/textColorSecondary"
+      />
+
+</LinearLayout>
diff --git a/java/com/android/dialer/contacts/resources/res/layout/dialog_call_subject.xml b/java/com/android/dialer/contacts/resources/res/layout/dialog_call_subject.xml
new file mode 100644
index 0000000..d20aa3b
--- /dev/null
+++ b/java/com/android/dialer/contacts/resources/res/layout/dialog_call_subject.xml
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2015 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+
+<LinearLayout
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  android:id="@+id/call_subject_dialog"
+  android:layout_width="match_parent"
+  android:layout_height="match_parent"
+  android:background="@android:color/transparent"
+  android:orientation="vertical">
+
+  <RelativeLayout
+    android:layout_width="match_parent"
+    android:layout_height="0dp"
+    android:layout_weight="1">
+
+    <!-- The call subject dialog will be centered in the space above the subject list. -->
+    <LinearLayout
+      android:id="@+id/dialog_view"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:layout_centerInParent="true"
+      android:background="@drawable/dialog_background_material"
+      android:clickable="true"
+      android:elevation="16dp"
+      android:orientation="vertical"
+      android:theme="@android:style/Theme.Material.Light.Dialog">
+
+      <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/call_subject_dialog_margin"
+        android:layout_marginStart="@dimen/call_subject_dialog_margin"
+        android:layout_marginEnd="@dimen/call_subject_dialog_margin"
+        android:orientation="horizontal">
+
+        <QuickContactBadge
+          android:id="@+id/contact_photo"
+          android:layout_width="@dimen/call_subject_dialog_contact_photo_size"
+          android:layout_height="@dimen/call_subject_dialog_contact_photo_size"
+          android:layout_marginEnd="@dimen/call_subject_dialog_margin"
+          android:layout_gravity="top"
+          android:focusable="true"/>
+
+        <LinearLayout
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+          android:gravity="center_vertical"
+          android:orientation="vertical">
+
+          <TextView
+            android:id="@+id/name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:singleLine="true"
+            android:textColor="?android:attr/textColorPrimary"
+            android:textSize="@dimen/call_subject_dialog_secondary_text_size"/>
+
+          <TextView
+            android:id="@+id/number"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/call_subject_dialog_between_line_margin"
+            android:layout_gravity="center_vertical"
+            android:singleLine="true"
+            android:textColor="?android:attr/textColorSecondary"
+            android:textSize="@dimen/call_subject_dialog_secondary_text_size"/>
+        </LinearLayout>
+      </LinearLayout>
+
+      <EditText
+        android:id="@+id/call_subject"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:layout_marginTop="@dimen/call_subject_dialog_edit_spacing"
+        android:layout_marginStart="@dimen/call_subject_dialog_margin"
+        android:layout_marginEnd="@dimen/call_subject_dialog_margin"
+        android:layout_gravity="top"
+        android:background="@null"
+        android:gravity="top"
+        android:hint="@string/call_subject_hint"
+        android:textColor="?android:attr/textColorSecondary"
+        android:textSize="@dimen/call_subject_dialog_secondary_text_size"
+        />
+
+      <TextView
+        android:id="@+id/character_limit"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/call_subject_dialog_margin"
+        android:layout_marginBottom="@dimen/call_subject_dialog_margin"
+        android:layout_marginStart="@dimen/call_subject_dialog_margin"
+        android:layout_marginEnd="@dimen/call_subject_dialog_margin"
+        android:singleLine="true"
+        android:textColor="?android:attr/textColorSecondary"
+        android:textSize="@dimen/call_subject_dialog_secondary_text_size"/>
+
+      <View
+        android:layout_width="fill_parent"
+        android:layout_height="1dp"
+        android:background="@color/call_subject_divider"/>
+
+      <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/call_subject_dialog_margin"
+        android:layout_marginBottom="@dimen/call_subject_dialog_margin"
+        android:layout_marginStart="@dimen/call_subject_dialog_margin"
+        android:layout_marginEnd="@dimen/call_subject_dialog_margin">
+
+        <ImageView
+          android:id="@+id/history_button"
+          android:layout_width="25dp"
+          android:layout_height="25dp"
+          android:layout_alignParentStart="true"
+          android:layout_centerVertical="true"
+          android:src="@drawable/quantum_ic_history_vd_theme_24"
+          android:tint="?colorIcon"/>
+
+        <TextView
+          android:id="@+id/send_and_call_button"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_alignParentEnd="true"
+          android:layout_centerVertical="true"
+          android:singleLine="true"
+          android:text="@string/send_and_call_button"
+          android:textColor="@color/call_subject_button"
+          android:textSize="@dimen/call_subject_dialog_secondary_text_size"/>
+
+      </RelativeLayout>
+    </LinearLayout>
+  </RelativeLayout>
+  <!-- The subject list is pinned to the bottom of the screen. -->
+  <ListView
+    android:id="@+id/subject_list"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_below="@id/dialog_view"
+    android:background="?android:attr/colorBackground"
+    android:divider="@null"
+    android:elevation="8dp"/>
+
+</LinearLayout>
diff --git a/java/com/android/contacts/common/res/layout/directory_header.xml b/java/com/android/dialer/contacts/resources/res/layout/directory_header.xml
similarity index 100%
rename from java/com/android/contacts/common/res/layout/directory_header.xml
rename to java/com/android/dialer/contacts/resources/res/layout/directory_header.xml
diff --git a/java/com/android/dialer/contacts/resources/res/layout/search_bar_expanded.xml b/java/com/android/dialer/contacts/resources/res/layout/search_bar_expanded.xml
new file mode 100644
index 0000000..c9ab6a9
--- /dev/null
+++ b/java/com/android/dialer/contacts/resources/res/layout/search_bar_expanded.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<RelativeLayout
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  android:id="@+id/search_box_expanded"
+  android:layout_width="match_parent"
+  android:layout_height="match_parent"
+  android:visibility="gone">
+
+  <ImageButton
+    android:id="@+id/search_back_button"
+    android:layout_width="@dimen/search_box_icon_size"
+    android:layout_height="@dimen/search_box_icon_size"
+    android:layout_marginStart="16dp"
+    android:layout_centerVertical="true"
+    android:background="?attr/selectableItemBackgroundBorderless"
+    android:contentDescription="@string/action_menu_back_from_search"
+    android:src="@drawable/back_arrow"
+    android:tint="?colorTextOnUnthemedDarkBackground"/>
+
+  <EditText
+    android:id="@+id/search_view"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_toEndOf="@+id/search_back_button"
+    android:layout_toStartOf="@+id/search_close_button"
+    android:layout_centerVertical="true"
+    android:layout_marginStart="8dp"
+    android:background="@null"
+    android:fontFamily="@string/search_font_family"
+    android:imeOptions="flagNoExtractUi"
+    android:inputType="textFilter"
+    android:maxLines="1"
+    android:textColor="?android:attr/textColorPrimary"
+    android:textColorHint="?android:attr/textColorHint"
+    android:textCursorDrawable="@drawable/searchedittext_custom_cursor"
+    android:textSize="@dimen/search_text_size"/>
+
+  <ImageView
+    android:id="@+id/search_close_button"
+    android:layout_width="@dimen/search_box_close_icon_size"
+    android:layout_height="@dimen/search_box_close_icon_size"
+    android:layout_alignParentEnd="true"
+    android:layout_centerVertical="true"
+    android:padding="@dimen/search_box_close_icon_padding"
+    android:background="?attr/selectableItemBackgroundBorderless"
+    android:clickable="true"
+    android:contentDescription="@string/description_clear_search"
+    android:src="@drawable/quantum_ic_close_vd_theme_24"
+    android:tint="?colorIcon"/>
+</RelativeLayout>
diff --git a/java/com/android/dialer/contacts/resources/res/layout/select_account_list_item.xml b/java/com/android/dialer/contacts/resources/res/layout/select_account_list_item.xml
new file mode 100644
index 0000000..e77c53c
--- /dev/null
+++ b/java/com/android/dialer/contacts/resources/res/layout/select_account_list_item.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- Layout of a single item in the InCallUI Account Chooser Dialog. -->
+<com.android.contacts.common.widget.ActivityTouchLinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:minHeight="64dp"
+    android:padding="8dp"
+    android:paddingStart="24dp"
+    android:paddingEnd="24dp"
+    android:orientation="horizontal"
+    android:gravity="center">
+
+  <ImageView
+      android:id="@+id/icon"
+      android:layout_width="24dp"
+      android:layout_height="24dp"
+      android:scaleType="center"/>
+
+  <LinearLayout
+      android:id="@+id/text"
+      android:layout_width="0dp"
+      android:layout_height="wrap_content"
+      android:layout_weight="1"
+      android:paddingStart="24dp"
+      android:gravity="start|center_vertical"
+      android:orientation="vertical">
+    <TextView
+        android:id="@+id/label"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:includeFontPadding="false"
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:textColor="?android:attr/textColorPrimary"/>
+    <TextView
+        android:id="@+id/number"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:includeFontPadding="false"
+        android:maxLines="1"
+        android:textAppearance="?android:attr/textAppearanceSmall"
+        android:textColor="?android:attr/textColorSecondary"
+        android:visibility="gone"/>
+    <TextView
+        android:id="@+id/hint"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:includeFontPadding="false"
+        android:textAppearance="?android:attr/textAppearanceSmall"
+        android:textColor="?android:attr/textColorSecondary"
+        android:visibility="gone"/>
+  </LinearLayout>
+
+</com.android.contacts.common.widget.ActivityTouchLinearLayout>
diff --git a/java/com/android/dialer/contacts/resources/res/layout/unread_count_tab.xml b/java/com/android/dialer/contacts/resources/res/layout/unread_count_tab.xml
new file mode 100644
index 0000000..d8357f4
--- /dev/null
+++ b/java/com/android/dialer/contacts/resources/res/layout/unread_count_tab.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+  android:layout_width="match_parent"
+  android:layout_height="match_parent"
+  android:background="@drawable/item_background_material_borderless_dark">
+  <!-- The tab icon -->
+  <ImageView
+    android:id="@+id/icon"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_centerInParent="true"/>
+  <TextView
+    android:id="@+id/count"
+    android:layout_width="wrap_content"
+    android:layout_height="@dimen/tab_unread_count_background_size"
+    android:layout_marginTop="@dimen/tab_unread_count_margin_top"
+    android:layout_marginStart="@dimen/tab_unread_count_margin_left"
+    android:layout_toEndOf="@id/icon"
+    android:paddingLeft="@dimen/tab_unread_count_text_padding"
+    android:paddingRight="@dimen/tab_unread_count_text_padding"
+    android:background="@drawable/unread_count_background"
+    android:fontFamily="sans-serif-medium"
+    android:gravity="center"
+    android:importantForAccessibility="no"
+    android:minWidth="@dimen/tab_unread_count_background_size"
+    android:textAlignment="center"
+    android:textColor="?android:attr/colorAccent"
+    android:textSize="@dimen/tab_unread_count_text_size"/>
+</RelativeLayout>
diff --git a/java/com/android/dialer/contacts/resources/res/mipmap-hdpi/ic_contacts_launcher.png b/java/com/android/dialer/contacts/resources/res/mipmap-hdpi/ic_contacts_launcher.png
new file mode 100644
index 0000000..960a684
--- /dev/null
+++ b/java/com/android/dialer/contacts/resources/res/mipmap-hdpi/ic_contacts_launcher.png
Binary files differ
diff --git a/java/com/android/dialer/contacts/resources/res/mipmap-mdpi/ic_contacts_launcher.png b/java/com/android/dialer/contacts/resources/res/mipmap-mdpi/ic_contacts_launcher.png
new file mode 100644
index 0000000..2de5dcf
--- /dev/null
+++ b/java/com/android/dialer/contacts/resources/res/mipmap-mdpi/ic_contacts_launcher.png
Binary files differ
diff --git a/java/com/android/dialer/contacts/resources/res/mipmap-xhdpi/ic_contacts_launcher.png b/java/com/android/dialer/contacts/resources/res/mipmap-xhdpi/ic_contacts_launcher.png
new file mode 100644
index 0000000..3ac0ec7
--- /dev/null
+++ b/java/com/android/dialer/contacts/resources/res/mipmap-xhdpi/ic_contacts_launcher.png
Binary files differ
diff --git a/java/com/android/dialer/contacts/resources/res/mipmap-xxhdpi/ic_contacts_launcher.png b/java/com/android/dialer/contacts/resources/res/mipmap-xxhdpi/ic_contacts_launcher.png
new file mode 100644
index 0000000..1dbbe0e
--- /dev/null
+++ b/java/com/android/dialer/contacts/resources/res/mipmap-xxhdpi/ic_contacts_launcher.png
Binary files differ
diff --git a/java/com/android/dialer/contacts/resources/res/mipmap-xxxhdpi/ic_contacts_launcher.png b/java/com/android/dialer/contacts/resources/res/mipmap-xxxhdpi/ic_contacts_launcher.png
new file mode 100644
index 0000000..a81027f
--- /dev/null
+++ b/java/com/android/dialer/contacts/resources/res/mipmap-xxxhdpi/ic_contacts_launcher.png
Binary files differ
diff --git a/java/com/android/contacts/common/res/values-ja/donottranslate_config.xml b/java/com/android/dialer/contacts/resources/res/values-ja/donottranslate_config.xml
similarity index 100%
rename from java/com/android/contacts/common/res/values-ja/donottranslate_config.xml
rename to java/com/android/dialer/contacts/resources/res/values-ja/donottranslate_config.xml
diff --git a/java/com/android/dialer/contacts/resources/res/values-ko/donottranslate_config.xml b/java/com/android/dialer/contacts/resources/res/values-ko/donottranslate_config.xml
new file mode 100644
index 0000000..8a1c2bf
--- /dev/null
+++ b/java/com/android/dialer/contacts/resources/res/values-ko/donottranslate_config.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2012 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+<resources>
+  <!-- If true, an option is shown in Display Options UI to choose a sort order -->
+  <bool name="config_sort_order_user_changeable">false</bool>
+
+  <!-- If true, the default sort order is primary (i.e. by given name) -->
+  <bool name="config_default_sort_order_primary">false</bool>
+
+  <!-- If true, an option is shown in Display Options UI to choose a name display order -->
+  <bool name="config_display_order_user_changeable">false</bool>
+
+  <!-- If true, the default sort order is primary (i.e. by given name) -->
+  <bool name="config_default_display_order_primary">false</bool>
+
+  <!-- If true, the order of name fields in the editor is primary (i.e. given name first) -->
+  <bool name="config_editor_field_order_primary">false</bool>
+</resources>
\ No newline at end of file
diff --git a/java/com/android/contacts/common/res/values-land/integers.xml b/java/com/android/dialer/contacts/resources/res/values-land/integers.xml
similarity index 100%
rename from java/com/android/contacts/common/res/values-land/integers.xml
rename to java/com/android/dialer/contacts/resources/res/values-land/integers.xml
diff --git a/java/com/android/contacts/common/res/values-sw600dp-land/integers.xml b/java/com/android/dialer/contacts/resources/res/values-sw600dp-land/integers.xml
similarity index 100%
rename from java/com/android/contacts/common/res/values-sw600dp-land/integers.xml
rename to java/com/android/dialer/contacts/resources/res/values-sw600dp-land/integers.xml
diff --git a/java/com/android/contacts/common/res/values-sw600dp/dimens.xml b/java/com/android/dialer/contacts/resources/res/values-sw600dp/dimens.xml
similarity index 100%
rename from java/com/android/contacts/common/res/values-sw600dp/dimens.xml
rename to java/com/android/dialer/contacts/resources/res/values-sw600dp/dimens.xml
diff --git a/java/com/android/contacts/common/res/values-sw600dp/integers.xml b/java/com/android/dialer/contacts/resources/res/values-sw600dp/integers.xml
similarity index 100%
rename from java/com/android/contacts/common/res/values-sw600dp/integers.xml
rename to java/com/android/dialer/contacts/resources/res/values-sw600dp/integers.xml
diff --git a/java/com/android/contacts/common/res/values-sw720dp-land/integers.xml b/java/com/android/dialer/contacts/resources/res/values-sw720dp-land/integers.xml
similarity index 100%
rename from java/com/android/contacts/common/res/values-sw720dp-land/integers.xml
rename to java/com/android/dialer/contacts/resources/res/values-sw720dp-land/integers.xml
diff --git a/java/com/android/contacts/common/res/values-sw720dp/integers.xml b/java/com/android/dialer/contacts/resources/res/values-sw720dp/integers.xml
similarity index 100%
rename from java/com/android/contacts/common/res/values-sw720dp/integers.xml
rename to java/com/android/dialer/contacts/resources/res/values-sw720dp/integers.xml
diff --git a/java/com/android/dialer/contacts/resources/res/values-zh-rCN/donottranslate_config.xml b/java/com/android/dialer/contacts/resources/res/values-zh-rCN/donottranslate_config.xml
new file mode 100644
index 0000000..2c130ba
--- /dev/null
+++ b/java/com/android/dialer/contacts/resources/res/values-zh-rCN/donottranslate_config.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2012 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+<resources>
+  <!-- If true, an option is shown in Display Options UI to choose a sort order -->
+  <bool name="config_sort_order_user_changeable">false</bool>
+
+  <!-- If true, the default sort order is primary (i.e. by given name) -->
+  <bool name="config_default_sort_order_primary">true</bool>
+
+  <!-- If true, an option is shown in Display Options UI to choose a name display order -->
+  <bool name="config_display_order_user_changeable">false</bool>
+
+  <!-- If true, the default sort order is primary (i.e. by given name) -->
+  <bool name="config_default_display_order_primary">true</bool>
+
+  <!-- If true, the order of name fields in the editor is primary (i.e. given name first) -->
+  <bool name="config_editor_field_order_primary">false</bool>
+</resources>
\ No newline at end of file
diff --git a/java/com/android/dialer/contacts/resources/res/values-zh-rTW/donottranslate_config.xml b/java/com/android/dialer/contacts/resources/res/values-zh-rTW/donottranslate_config.xml
new file mode 100644
index 0000000..2c130ba
--- /dev/null
+++ b/java/com/android/dialer/contacts/resources/res/values-zh-rTW/donottranslate_config.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2012 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+<resources>
+  <!-- If true, an option is shown in Display Options UI to choose a sort order -->
+  <bool name="config_sort_order_user_changeable">false</bool>
+
+  <!-- If true, the default sort order is primary (i.e. by given name) -->
+  <bool name="config_default_sort_order_primary">true</bool>
+
+  <!-- If true, an option is shown in Display Options UI to choose a name display order -->
+  <bool name="config_display_order_user_changeable">false</bool>
+
+  <!-- If true, the default sort order is primary (i.e. by given name) -->
+  <bool name="config_default_display_order_primary">true</bool>
+
+  <!-- If true, the order of name fields in the editor is primary (i.e. given name first) -->
+  <bool name="config_editor_field_order_primary">false</bool>
+</resources>
\ No newline at end of file
diff --git a/java/com/android/contacts/common/res/values/animation_constants.xml b/java/com/android/dialer/contacts/resources/res/values/animation_constants.xml
similarity index 100%
copy from java/com/android/contacts/common/res/values/animation_constants.xml
copy to java/com/android/dialer/contacts/resources/res/values/animation_constants.xml
diff --git a/java/com/android/contacts/common/res/values/attrs.xml b/java/com/android/dialer/contacts/resources/res/values/attrs.xml
similarity index 100%
rename from java/com/android/contacts/common/res/values/attrs.xml
rename to java/com/android/dialer/contacts/resources/res/values/attrs.xml
diff --git a/java/com/android/dialer/contacts/resources/res/values/colors.xml b/java/com/android/dialer/contacts/resources/res/values/colors.xml
new file mode 100644
index 0000000..ab9f19b
--- /dev/null
+++ b/java/com/android/dialer/contacts/resources/res/values/colors.xml
@@ -0,0 +1,51 @@
+<!--
+  ~ Copyright (C) 2012 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+
+<resources>
+  <!-- Color of the theme of the People app -->
+  <color name="people_app_theme_color">#363636</color>
+
+  <!-- Darker versions of letter_tile_colors, two shades darker. These colors are used
+      for settings secondary activity colors. -->
+  <array name="letter_tile_colors_dark">
+    <item>#C53929</item>
+    <item>#C2185B</item>
+    <item>#7B1FA2</item>
+    <item>#512DA8</item>
+    <item>#303F9F</item>
+    <item>#3367D6</item>
+    <item>#0277BD</item>
+    <item>#006064</item>
+    <item>#00796B</item>
+    <item>#0B8043</item>
+    <item>#33691E</item>
+    <item>#E65100</item>
+    <item>#E64A19</item>
+    <item>#424242</item>
+  </array>
+
+  <!-- Text color used for character counter when the max limit has been exceeded -->
+  <color name="call_subject_limit_exceeded">#d1041c</color>
+
+  <!-- Tint color for the call subject history icon. -->
+  <color name="call_subject_history_icon">#000000</color>
+
+  <!-- Divider line on the call subject dialog. -->
+  <color name="call_subject_divider">#d8d8d8</color>
+
+  <!-- Text color for the SEND & CALL button on the call subject dialog. -->
+  <color name="call_subject_button">#00c853</color>
+</resources>
diff --git a/java/com/android/contacts/common/res/values/dimens.xml b/java/com/android/dialer/contacts/resources/res/values/dimens.xml
similarity index 100%
rename from java/com/android/contacts/common/res/values/dimens.xml
rename to java/com/android/dialer/contacts/resources/res/values/dimens.xml
diff --git a/java/com/android/contacts/common/res/values/donottranslate_config.xml b/java/com/android/dialer/contacts/resources/res/values/donottranslate_config.xml
similarity index 100%
rename from java/com/android/contacts/common/res/values/donottranslate_config.xml
rename to java/com/android/dialer/contacts/resources/res/values/donottranslate_config.xml
diff --git a/java/com/android/contacts/common/res/values/ids.xml b/java/com/android/dialer/contacts/resources/res/values/ids.xml
similarity index 100%
rename from java/com/android/contacts/common/res/values/ids.xml
rename to java/com/android/dialer/contacts/resources/res/values/ids.xml
diff --git a/java/com/android/contacts/common/res/values/integers.xml b/java/com/android/dialer/contacts/resources/res/values/integers.xml
similarity index 100%
rename from java/com/android/contacts/common/res/values/integers.xml
rename to java/com/android/dialer/contacts/resources/res/values/integers.xml
diff --git a/java/com/android/dialer/contacts/resources/res/values/strings.xml b/java/com/android/dialer/contacts/resources/res/values/strings.xml
new file mode 100644
index 0000000..cf24a88
--- /dev/null
+++ b/java/com/android/dialer/contacts/resources/res/values/strings.xml
@@ -0,0 +1,430 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2012 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
+  <!-- Action string for calling a custom phone number -->
+    <string name="call_custom">Call
+        <xliff:g id="custom">%s</xliff:g>
+    </string>
+  <!-- Action string for calling a home phone number -->
+  <string name="call_home">Call home</string>
+  <!-- Action string for calling a mobile phone number -->
+  <string name="call_mobile">Call mobile</string>
+  <!-- Action string for calling a work phone number -->
+  <string name="call_work">Call work</string>
+  <!-- Action string for calling a work fax phone number -->
+  <string name="call_fax_work">Call work fax</string>
+  <!-- Action string for calling a home fax phone number -->
+  <string name="call_fax_home">Call home fax</string>
+  <!-- Action string for calling a pager phone number -->
+  <string name="call_pager">Call pager</string>
+  <!-- Action string for calling an other phone number -->
+  <string name="call_other">Call</string>
+  <!-- Action string for calling a callback number -->
+  <string name="call_callback">Call callback</string>
+  <!-- Action string for calling a car phone number -->
+  <string name="call_car">Call car</string>
+  <!-- Action string for calling a company main phone number -->
+  <string name="call_company_main">Call company main</string>
+  <!-- Action string for calling a ISDN phone number -->
+  <string name="call_isdn">Call ISDN</string>
+  <!-- Action string for calling a main phone number -->
+  <string name="call_main">Call main</string>
+  <!-- Action string for calling an other fax phone number -->
+  <string name="call_other_fax">Call fax</string>
+  <!-- Action string for calling a radio phone number -->
+  <string name="call_radio">Call radio</string>
+  <!-- Action string for calling a Telex phone number -->
+  <string name="call_telex">Call telex</string>
+  <!-- Action string for calling a TTY/TDD phone number -->
+  <string name="call_tty_tdd">Call TTY/TDD</string>
+  <!-- Action string for calling a work mobile phone number -->
+  <string name="call_work_mobile">Call work mobile</string>
+  <!-- Action string for calling a work pager phone number -->
+  <string name="call_work_pager">Call work pager</string>
+  <!-- Action string for calling an assistant phone number -->
+    <string name="call_assistant">Call
+        <xliff:g id="assistant">%s</xliff:g>
+    </string>
+  <!-- Action string for calling a MMS phone number -->
+  <string name="call_mms">Call MMS</string>
+
+  <!-- Action string for sending an SMS to a custom phone number -->
+    <string name="sms_custom">Text
+        <xliff:g id="custom">%s</xliff:g>
+    </string>
+  <!-- Action string for sending an SMS to a home phone number -->
+  <string name="sms_home">Text home</string>
+  <!-- Action string for sending an SMS to a mobile phone number -->
+  <string name="sms_mobile">Text mobile</string>
+  <!-- Action string for sending an SMS to a work phone number -->
+  <string name="sms_work">Text work</string>
+  <!-- Action string for sending an SMS to a work fax phone number -->
+  <string name="sms_fax_work">Text work fax</string>
+  <!-- Action string for sending an SMS to a home fax phone number -->
+  <string name="sms_fax_home">Text home fax</string>
+  <!-- Action string for sending an SMS to a pager phone number -->
+  <string name="sms_pager">Text pager</string>
+  <!-- Action string for sending an SMS to an other phone number -->
+  <string name="sms_other">Text</string>
+  <!-- Action string for sending an SMS to a callback number -->
+  <string name="sms_callback">Text callback</string>
+  <!-- Action string for sending an SMS to a car phone number -->
+  <string name="sms_car">Text car</string>
+  <!-- Action string for sending an SMS to a company main phone number -->
+  <string name="sms_company_main">Text company main</string>
+  <!-- Action string for sending an SMS to a ISDN phone number -->
+  <string name="sms_isdn">Text ISDN</string>
+  <!-- Action string for sending an SMS to a main phone number -->
+  <string name="sms_main">Text main</string>
+  <!-- Action string for sending an SMS to an other fax phone number -->
+  <string name="sms_other_fax">Text fax</string>
+  <!-- Action string for sending an SMS to a radio phone number -->
+  <string name="sms_radio">Text radio</string>
+  <!-- Action string for sending an SMS to a Telex phone number -->
+  <string name="sms_telex">Text telex</string>
+  <!-- Action string for sending an SMS to a TTY/TDD phone number -->
+  <string name="sms_tty_tdd">Text TTY/TDD</string>
+  <!-- Action string for sending an SMS to a work mobile phone number -->
+  <string name="sms_work_mobile">Text work mobile</string>
+  <!-- Action string for sending an SMS to a work pager phone number -->
+  <string name="sms_work_pager">Text work pager</string>
+  <!-- Action string for sending an SMS to an assistant phone number -->
+    <string name="sms_assistant">Text
+        <xliff:g id="assistant">%s</xliff:g>
+    </string>
+  <!-- Action string for sending an SMS to a MMS phone number -->
+  <string name="sms_mms">Text MMS</string>
+
+  <!-- Title of the confirmation dialog for clearing frequents. [CHAR LIMIT=37] -->
+  <string name="clearFrequentsConfirmation_title">Clear frequently contacted?</string>
+
+  <!-- Confirmation dialog for clearing frequents. [CHAR LIMIT=NONE] -->
+    <string name="clearFrequentsConfirmation">You\'ll clear the frequently contacted list in the
+        Contacts and Phone apps, and force email apps to learn your addressing preferences from
+        scratch.
+    </string>
+
+  <!-- Title of the "Clearing frequently contacted" progress-dialog [CHAR LIMIT=35] -->
+  <string name="clearFrequentsProgress_title">Clearing frequently contacted\u2026</string>
+
+  <!--  Used to display as default status when the contact is available for chat [CHAR LIMIT=19] -->
+  <string name="status_available">Available</string>
+
+  <!--  Used to display as default status when the contact is away or idle for chat [CHAR LIMIT=19] -->
+  <string name="status_away">Away</string>
+
+  <!--  Used to display as default status when the contact is busy or Do not disturb for chat [CHAR LIMIT=19] -->
+  <string name="status_busy">Busy</string>
+
+  <!-- Directory partition name (also exists in contacts) -->
+  <string name="contactsList">Contacts</string>
+
+  <!-- Directory partition name for p13n suggestions -->
+  <string name="contact_suggestions">Top Suggested</string>
+
+  <!-- The name of the invisible local contact directory -->
+  <string name="local_invisible_directory">Other</string>
+
+  <!-- The label in section header in the contact list for a contact directory [CHAR LIMIT=128] -->
+  <string name="directory_search_label">Directory</string>
+
+  <!-- The label in section header in the contact list for a work contact directory [CHAR LIMIT=128] -->
+  <string name="directory_search_label_work">Work directory</string>
+
+  <!-- The label in section header in the contact list for a local contacts [CHAR LIMIT=128] -->
+  <string name="local_search_label">All contacts</string>
+
+  <!-- The label in section header in the contact list for a local suggested contacts [CHAR LIMIT=128] -->
+  <string name="local_suggestions_search_label">Suggestions</string>
+
+  <!-- String describing the text on the header of the profile contact in the contacts list
+       This may be programatically capitalized. [CHAR LIMIT=20] -->
+  <string msgid="9154761216179882405" name="user_profile_contacts_list_header">Me</string>
+
+  <!-- Shown as the display name for a person when the name is missing or unknown. [CHAR LIMIT=18]-->
+  <string name="missing_name">(No name)</string>
+
+  <!-- String describing a contact picture that introduces users to the contact detail screen.
+
+     Used by AccessibilityService to announce the purpose of the button.
+
+     [CHAR LIMIT=NONE]
+  -->
+  <string msgid="2795575601596468581" name="description_view_contact_detail">View contact</string>
+
+  <!-- Contact list filter selection indicating that the list shows all contacts with phone numbers [CHAR LIMIT=64] -->
+  <string name="list_filter_phones">All contacts with phone numbers</string>
+
+  <!-- Contact list filter selection indicating that the list shows all work contacts with phone numbers [CHAR LIMIT=64] -->
+  <string name="list_filter_phones_work">Work profile contacts</string>
+
+  <!-- Button to view the updates from the current group on the group detail page [CHAR LIMIT=25] -->
+  <string name="view_updates_from_group">View updates</string>
+
+  <!-- Title for data source when creating or editing a contact that doesn't
+       belong to a specific account.  This contact will only exist on the device
+       and will not be synced. -->
+  <string name="account_phone">Device-only, unsynced</string>
+
+  <!-- Header that expands to list all name types when editing a structured name of a contact
+       [CHAR LIMIT=20] -->
+  <string name="nameLabelsGroup">Name</string>
+
+  <!-- Header that expands to list all nickname types when editing a nickname of a contact
+       [CHAR LIMIT=20] -->
+  <string name="nicknameLabelsGroup">Nickname</string>
+
+  <!-- Field title for the full name of a contact [CHAR LIMIT=64]-->
+  <string name="full_name">Name</string>
+  <!-- Field title for the given name of a contact -->
+  <string name="name_given">First name</string>
+  <!-- Field title for the family name of a contact -->
+  <string name="name_family">Last name</string>
+  <!-- Field title for the prefix name of a contact -->
+  <string name="name_prefix">Name prefix</string>
+  <!-- Field title for the middle name of a contact -->
+  <string name="name_middle">Middle name</string>
+  <!-- Field title for the suffix name of a contact -->
+  <string name="name_suffix">Name suffix</string>
+
+  <!-- Field title for the phonetic name of a contact [CHAR LIMIT=64]-->
+  <string name="name_phonetic">Phonetic name</string>
+
+  <!-- Field title for the phonetic given name of a contact -->
+  <string name="name_phonetic_given">Phonetic first name</string>
+  <!-- Field title for the phonetic middle name of a contact -->
+  <string name="name_phonetic_middle">Phonetic middle name</string>
+  <!-- Field title for the phonetic family name of a contact -->
+  <string name="name_phonetic_family">Phonetic last name</string>
+
+  <!-- Header that expands to list all of the types of phone numbers when editing or creating a
+       phone number for a contact [CHAR LIMIT=20] -->
+  <string name="phoneLabelsGroup">Phone</string>
+
+  <!-- Header that expands to list all of the types of email addresses when editing or creating
+       an email address for a contact [CHAR LIMIT=20] -->
+  <string name="emailLabelsGroup">Email</string>
+
+  <!-- Header that expands to list all of the types of postal addresses when editing or creating
+       an postal address for a contact [CHAR LIMIT=20] -->
+  <string name="postalLabelsGroup">Address</string>
+
+  <!-- Header that expands to list all of the types of IM account when editing or creating an IM
+       account for a contact [CHAR LIMIT=20] -->
+  <string name="imLabelsGroup">IM</string>
+
+  <!-- Header that expands to list all organization types when editing an organization of a
+       contact [CHAR LIMIT=20] -->
+  <string name="organizationLabelsGroup">Organization</string>
+
+  <!-- Header for the list of all relationships for a contact [CHAR LIMIT=20] -->
+  <string name="relationLabelsGroup">Relationship</string>
+
+  <!-- Header that expands to list all event types when editing an event of a contact
+       [CHAR LIMIT=20] -->
+  <string name="eventLabelsGroup">Special date</string>
+
+  <!-- Generic action string for text messaging a contact. Used by AccessibilityService to
+       announce the purpose of the view. [CHAR LIMIT=NONE] -->
+  <string name="sms">Text message</string>
+
+  <!-- Field title for the full postal address of a contact [CHAR LIMIT=64]-->
+  <string name="postal_address">Address</string>
+
+  <!-- Hint text for the organization name when editing -->
+  <string name="ghostData_company">Company</string>
+
+  <!-- Hint text for the organization title when editing -->
+  <string name="ghostData_title">Title</string>
+
+  <!-- The label describing the Notes field of a contact. This field allows free form text entry
+       about a contact -->
+  <string name="label_notes">Notes</string>
+
+  <!-- The label describing the SIP address field of a contact. [CHAR LIMIT=20] -->
+  <string name="label_sip_address">SIP</string>
+
+  <!-- Header that expands to list all website types when editing a website of a contact
+       [CHAR LIMIT=20] -->
+  <string name="websiteLabelsGroup">Website</string>
+
+  <!-- Header for the list of all groups for a contact [CHAR LIMIT=20] -->
+  <string name="groupsLabel">Groups</string>
+
+  <!-- Action string for sending an email to a home email address -->
+  <string name="email_home">Email home</string>
+  <!-- Action string for sending an email to a mobile email address -->
+  <string name="email_mobile">Email mobile</string>
+  <!-- Action string for sending an email to a work email address -->
+  <string name="email_work">Email work</string>
+  <!-- Action string for sending an email to an other email address -->
+  <string name="email_other">Email</string>
+  <!-- Action string for sending an email to a custom email address -->
+  <string name="email_custom">Email <xliff:g id="custom">%s</xliff:g></string>
+
+  <!-- Generic action string for sending an email -->
+  <string name="email">Email</string>
+
+  <!-- Field title for the street of a structured postal address of a contact -->
+  <string name="postal_street">Street</string>
+  <!-- Field title for the city of a structured postal address of a contact -->
+  <string name="postal_city">City</string>
+  <!-- Field title for the region, or state, of a structured postal address of a contact -->
+  <string name="postal_region">State</string>
+  <!-- Field title for the postal code of a structured postal address of a contact -->
+  <string name="postal_postcode">ZIP code</string>
+  <!-- Field title for the country of a structured postal address of a contact -->
+  <string name="postal_country">Country</string>
+
+  <!-- Action string for viewing a home postal address -->
+  <string name="map_home">View home address</string>
+  <!-- Action string for viewing a work postal address -->
+  <string name="map_work">View work address</string>
+  <!-- Action string for viewing an other postal address -->
+  <string name="map_other">View address</string>
+  <!-- Action string for viewing a custom postal address -->
+  <string name="map_custom">View <xliff:g id="custom">%s</xliff:g> address</string>
+
+  <!-- Action string for starting an IM chat with the AIM protocol -->
+  <string name="chat_aim">Chat using AIM</string>
+  <!-- Action string for starting an IM chat with the MSN or Windows Live protocol -->
+  <string name="chat_msn">Chat using Windows Live</string>
+  <!-- Action string for starting an IM chat with the Yahoo protocol -->
+  <string name="chat_yahoo">Chat using Yahoo</string>
+  <!-- Action string for starting an IM chat with the Skype protocol -->
+  <string name="chat_skype">Chat using Skype</string>
+  <!-- Action string for starting an IM chat with the QQ protocol -->
+  <string name="chat_qq">Chat using QQ</string>
+  <!-- Action string for starting an IM chat with the Google Talk protocol -->
+  <string name="chat_gtalk">Chat using Google Talk</string>
+  <!-- Action string for starting an IM chat with the ICQ protocol -->
+  <string name="chat_icq">Chat using ICQ</string>
+  <!-- Action string for starting an IM chat with the Jabber protocol -->
+  <string name="chat_jabber">Chat using Jabber</string>
+
+  <!-- Generic action string for starting an IM chat -->
+  <string name="chat">Chat</string>
+
+  <!-- Contact list filter label indicating that the list is showing all available accounts [CHAR LIMIT=64] -->
+  <string name="list_filter_all_accounts">All contacts</string>
+
+  <!-- Displayed at the top of the contacts showing the account filter selected  [CHAR LIMIT=64] -->
+  <string name="listAllContactsInAccount">Contacts in <xliff:g example="abc@gmail.com" id="name">%s</xliff:g></string>
+
+  <!-- Displayed at the top of the contacts showing single contact. [CHAR LIMIT=64] -->
+  <string name="listCustomView">Contacts in custom view</string>
+
+  <!-- Displayed at the top of the contacts showing single contact. [CHAR LIMIT=64] -->
+  <string name="listSingleContact">Single contact</string>
+
+  <!-- Contact preferences related strings -->
+
+  <!-- Label of the "sort by" display option -->
+  <string name="display_options_sort_list_by">Sort by</string>
+
+  <!-- An allowable value for the "sort list by" contact display option  -->
+  <string name="display_options_sort_by_given_name">First name</string>
+
+  <!-- An allowable value for the "sort list by" contact display option  -->
+  <string name="display_options_sort_by_family_name">Last name</string>
+
+  <!-- Label of the "name format" display option [CHAR LIMIT=64]-->
+  <string name="display_options_view_names_as">Name format</string>
+
+  <!-- An allowable value for the "view names as" contact display option  -->
+  <string name="display_options_view_given_name_first">First name first</string>
+
+  <!-- An allowable value for the "view names as" contact display option  -->
+  <string name="display_options_view_family_name_first">Last name first</string>
+
+  <!--  The menu item to clear frequents [CHAR LIMIT=30] -->
+  <string name="menu_clear_frequents">Clear frequents</string>
+
+  <!-- Content description for the fake action menu up button as used
+   inside search. [CHAR LIMIT=NONE] -->
+  <string name="action_menu_back_from_search">stop searching</string>
+
+  <!--  String describing the icon used to clear the search field -->
+  <string name="description_clear_search">Clear search</string>
+
+  <!-- The font-family to use for the text inside the searchbox. -->
+  <string name="search_font_family" translatable="false">sans-serif</string>
+
+  <!-- Title for Select Account Dialog [CHAR LIMIT=30] -->
+  <string name="select_account_dialog_title">Account</string>
+
+  <!-- Label for the check box to toggle default sim card setting [CHAR LIMIT=35]-->
+  <string name="set_default_account">Always use this for calls</string>
+
+  <!-- Title for dialog to select Phone Account for outgoing call.  [CHAR LIMIT=40] -->
+  <string name="select_phone_account_for_calls">Choose SIM for this call</string>
+
+  <!-- Checkbox label when selecting a SIM when calling a contact, to use the selected SIM for the
+   same contact and never ask again [CHAR LIMIT=40]-->
+  <string name="select_phone_account_for_calls_remember">Remember this choice</string>
+
+  <!-- String used for actions in the dialer call log and the quick contact card to initiate
+       a call to an individual.  The user is prompted to enter a note which is sent along with
+       the call (e.g. a call subject). [CHAR LIMIT=40] -->
+  <string name="call_with_a_note">Call with a note</string>
+
+  <!-- Hint text shown in the call subject dialog. [CHAR LIMIT=255] -->
+  <string name="call_subject_hint">Type a note to send with call ...</string>
+
+  <!-- Button used to start a new call with the user entered subject. [CHAR LIMIT=32] -->
+  <string name="send_and_call_button">SEND &amp; CALL</string>
+
+  <!-- String used to represent the total number of characters entered for a call subject,
+       compared to the character limit.  Example: 2 / 64 -->
+  <string name="call_subject_limit"><xliff:g example="4" id="count">%1$s</xliff:g> / <xliff:g example="64" id="limit">%2$s</xliff:g></string>
+
+  <!-- String used to build a phone number type and phone number string.
+       Example: Mobile 650-555-1212  -->
+  <string name="old_call_subject_type_and_number"><xliff:g example="Mobile" id="type">%1$s</xliff:g> <xliff:g example="(650) 555-1212" id="number">%2$s</xliff:g></string>
+
+  <!-- String format to describe a tab e.g.call history tab. -->
+  <string name="tab_title"><xliff:g id="title">%1$s</xliff:g> tab.</string>
+
+  <!-- String format to describe the number of unread items in a tab.
+
+      Note: AccessibilityServices use this attribute to announce what the view represents.
+            This is especially valuable for views without textual representation like ImageView.
+  -->
+  <plurals name="tab_title_with_unread_items">
+        <item quantity="one">
+            <xliff:g id="title">%1$s</xliff:g> tab. <xliff:g id="count">%2$d</xliff:g> unread item.
+        </item>
+        <item quantity="other">
+            <xliff:g id="title">%1$s</xliff:g> tab. <xliff:g id="count">%2$d</xliff:g> unread items.
+        </item>
+  </plurals>
+
+  <!-- Description string for an action button to initiate a video call from search results.
+       Note: AccessibilityServices use this attribute to announce what the view represents.
+       This is especially valuable for views without textual representation like ImageView.
+
+       [CHAR LIMIT=NONE]-->
+  <string name="description_search_video_call">Video call</string>
+
+  <!-- Description string for an action button to initiate an enriched call from search results.
+       Note: AccessibilityServices use this attribute to announce what the view represents.
+       This is especially valuable for views without textual representation like ImageView.
+
+       [CHAR LIMIT=NONE]-->
+  <string name="description_search_call_and_share">Share and call</string>
+</resources>
diff --git a/java/com/android/dialer/contacts/resources/res/values/styles.xml b/java/com/android/dialer/contacts/resources/res/values/styles.xml
new file mode 100644
index 0000000..4f0b3f1
--- /dev/null
+++ b/java/com/android/dialer/contacts/resources/res/values/styles.xml
@@ -0,0 +1,96 @@
+<!--
+  ~ Copyright (C) 2012 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+
+<resources>
+
+  <style name="DirectoryHeader">
+    <item name="android:background">@android:color/transparent</item>
+  </style>
+
+  <style name="SectionHeaderStyle" parent="@android:style/TextAppearance.Large">
+    <item name="android:textSize">16sp</item>
+    <item name="android:textAllCaps">true</item>
+    <item name="android:textColor">?android:attr/textColorPrimary</item>
+    <item name="android:textStyle">bold</item>
+  </style>
+
+  <style name="DirectoryHeaderStyle" parent="@android:style/TextAppearance.Small">
+    <item name="android:textSize">14sp</item>
+    <item name="android:textColor">?android:attr/textColorSecondary</item>
+    <item name="android:fontFamily">sans-serif-medium</item>
+  </style>
+
+  <!-- TextView style used for headers.
+
+This is similar to ?android:attr/listSeparatorTextView but uses different
+background and text color. See also android:style/Widget.Holo.TextView.ListSeparator
+(which is private, so we cannot specify it as a parent style).  -->
+  <style name="ContactListSeparatorTextViewStyle">
+    <item name="android:layout_width">match_parent</item>
+    <item name="android:layout_height">wrap_content</item>
+    <!-- See comments for @dimen/list_section_divider_min_height -->
+    <item name="android:minHeight">@dimen/list_section_divider_min_height</item>
+    <item name="android:textAppearance">@style/DirectoryHeaderStyle</item>
+    <item name="android:gravity">center_vertical</item>
+    <item name="android:paddingLeft">8dip</item>
+    <item name="android:paddingStart">8dip</item>
+    <item name="android:paddingTop">4dip</item>
+    <item name="android:paddingBottom">4dip</item>
+    <item name="android:ellipsize">end</item>
+    <item name="android:singleLine">true</item>
+    <item name="android:textAllCaps">true</item>
+  </style>
+
+  <style name="TextAppearanceMedium" parent="@android:style/TextAppearance.Medium">
+    <item name="android:textSize">16sp</item>
+    <item name="android:textColor">#000000</item>
+  </style>
+
+  <style name="TextAppearanceSmall" parent="@android:style/TextAppearance.Small">
+    <item name="android:textSize">14sp</item>
+    <item name="android:textColor">#737373</item>
+  </style>
+
+  <style name="ListViewStyle" parent="@android:style/Widget.Material.Light.ListView">
+    <item name="android:overScrollMode">always</item>
+  </style>
+
+  <style name="BackgroundOnlyTheme" parent="@android:style/Theme.Material.Light">
+    <item name="android:windowBackground">@null</item>
+    <item name="android:windowContentOverlay">@null</item>
+    <item name="android:windowAnimationStyle">@null</item>
+    <item name="android:windowNoTitle">true</item>
+    <!-- Activities that use this theme are background activities without obvious displays.
+        However, some also have dialogs. Therefore, it doesn't make sense to set this true.-->
+    <item name="android:windowNoDisplay">false</item>
+    <item name="android:windowIsFloating">true</item>
+  </style>
+
+  <style name="Theme.CallSubjectDialogTheme" parent="@android:style/Theme.Material.Light.Dialog">
+    <item name="android:layout_width">match_parent</item>
+    <item name="android:layout_height">match_parent</item>
+
+    <!-- No backgrounds, titles or window float -->
+    <item name="android:windowIsTranslucent">true</item>
+    <item name="android:windowNoTitle">true</item>
+    <item name="android:windowFullscreen">false</item>
+    <item name="android:windowIsFloating">true</item>
+    <item name="android:windowBackground">@android:color/transparent</item>
+    <item name="android:windowDrawsSystemBarBackgrounds">false</item>
+    <item name="android:windowContentOverlay">@null</item>
+    <item name="android:windowElevation">0dp</item>
+  </style>
+</resources>
diff --git a/java/com/android/dialer/contactsfragment/ContactViewHolder.java b/java/com/android/dialer/contactsfragment/ContactViewHolder.java
index 2730c0d..e188332 100644
--- a/java/com/android/dialer/contactsfragment/ContactViewHolder.java
+++ b/java/com/android/dialer/contactsfragment/ContactViewHolder.java
@@ -28,12 +28,13 @@
 import com.android.dialer.contactsfragment.ContactsFragment.OnContactSelectedListener;
 import com.android.dialer.logging.InteractionEvent;
 import com.android.dialer.logging.Logger;
+import com.android.dialer.widget.BidiTextView;
 
 /** View holder for a contact. */
 final class ContactViewHolder extends RecyclerView.ViewHolder implements OnClickListener {
 
   private final TextView header;
-  private final TextView name;
+  private final BidiTextView name;
   private final QuickContactBadge photo;
   private final Context context;
   private final OnContactSelectedListener onContactSelectedListener;
diff --git a/java/com/android/dialer/contactsfragment/ContactsAdapter.java b/java/com/android/dialer/contactsfragment/ContactsAdapter.java
index 44abe29..5afd41f 100644
--- a/java/com/android/dialer/contactsfragment/ContactsAdapter.java
+++ b/java/com/android/dialer/contactsfragment/ContactsAdapter.java
@@ -128,7 +128,8 @@
             LetterTileDrawable.TYPE_DEFAULT);
 
     String photoDescription =
-        context.getString(com.android.contacts.common.R.string.description_quick_contact_for, name);
+        context.getString(
+            com.android.dialer.contactphoto.R.string.description_quick_contact_for, name);
     contactViewHolder.getPhoto().setContentDescription(photoDescription);
 
     // Always show the view holder's header if it's the first item in the list. Otherwise, compare
diff --git a/java/com/android/dialer/contactsfragment/ContactsCursorLoader.java b/java/com/android/dialer/contactsfragment/ContactsCursorLoader.java
index e55f951..d74afe5 100644
--- a/java/com/android/dialer/contactsfragment/ContactsCursorLoader.java
+++ b/java/com/android/dialer/contactsfragment/ContactsCursorLoader.java
@@ -21,7 +21,7 @@
 import android.net.Uri;
 import android.provider.ContactsContract.Contacts;
 import android.text.TextUtils;
-import com.android.contacts.common.preference.ContactsPreferences;
+import com.android.dialer.contacts.ContactsComponent;
 
 /** Cursor Loader for {@link ContactsFragment}. */
 final class ContactsCursorLoader extends CursorLoader {
@@ -61,12 +61,13 @@
   }
 
   private static String[] getProjection(Context context) {
-    ContactsPreferences contactsPrefs = new ContactsPreferences(context);
-    boolean displayOrderPrimary =
-        (contactsPrefs.getDisplayOrder() == ContactsPreferences.DISPLAY_ORDER_PRIMARY);
-    return displayOrderPrimary
-        ? CONTACTS_PROJECTION_DISPLAY_NAME_PRIMARY
-        : CONTACTS_PROJECTION_DISPLAY_NAME_ALTERNATIVE;
+    switch (ContactsComponent.get(context).contactDisplayPreferences().getDisplayOrder()) {
+      case PRIMARY:
+        return CONTACTS_PROJECTION_DISPLAY_NAME_PRIMARY;
+      case ALTERNATIVE:
+        return CONTACTS_PROJECTION_DISPLAY_NAME_ALTERNATIVE;
+    }
+    throw new AssertionError("exhaustive switch");
   }
 
   private static String getWhere(Context context, boolean hasPhoneNumbers) {
@@ -78,10 +79,14 @@
   }
 
   private static String getSortKey(Context context) {
-    ContactsPreferences contactsPrefs = new ContactsPreferences(context);
-    boolean sortOrderPrimary =
-        (contactsPrefs.getSortOrder() == ContactsPreferences.SORT_ORDER_PRIMARY);
-    return sortOrderPrimary ? Contacts.SORT_KEY_PRIMARY : Contacts.SORT_KEY_ALTERNATIVE;
+
+    switch (ContactsComponent.get(context).contactDisplayPreferences().getSortOrder()) {
+      case BY_PRIMARY:
+        return Contacts.SORT_KEY_PRIMARY;
+      case BY_ALTERNATIVE:
+        return Contacts.SORT_KEY_ALTERNATIVE;
+    }
+    throw new AssertionError("exhaustive switch");
   }
 
   /** Update cursor loader to filter contacts based on the provided query. */
diff --git a/java/com/android/dialer/contactsfragment/ContactsFragment.java b/java/com/android/dialer/contactsfragment/ContactsFragment.java
index 794a5b9..f40abec 100644
--- a/java/com/android/dialer/contactsfragment/ContactsFragment.java
+++ b/java/com/android/dialer/contactsfragment/ContactsFragment.java
@@ -41,8 +41,6 @@
 import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
-import com.android.contacts.common.preference.ContactsPreferences;
-import com.android.contacts.common.preference.ContactsPreferences.ChangeListener;
 import com.android.dialer.common.Assert;
 import com.android.dialer.common.FragmentUtils;
 import com.android.dialer.common.LogUtil;
@@ -60,8 +58,7 @@
 public class ContactsFragment extends Fragment
     implements LoaderCallbacks<Cursor>,
         OnScrollChangeListener,
-        OnEmptyViewActionButtonClickedListener,
-        ChangeListener {
+        OnEmptyViewActionButtonClickedListener {
 
   /** An enum for the different types of headers that be inserted at position 0 in the list. */
   @Retention(RetentionPolicy.SOURCE)
@@ -98,7 +95,6 @@
 
   private @Header int header;
 
-  private ContactsPreferences contactsPrefs;
   private boolean hasPhoneNumbers;
   private String query;
 
@@ -154,8 +150,6 @@
   @Override
   public void onCreate(@Nullable Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
-    contactsPrefs = new ContactsPreferences(getContext());
-    contactsPrefs.registerChangeListener(this);
     header = getArguments().getInt(EXTRA_HEADER);
     hasPhoneNumbers = getArguments().getBoolean(EXTRA_HAS_PHONE_NUMBERS);
     if (savedInstanceState == null) {
@@ -224,7 +218,8 @@
   }
 
   @Override
-  public void onChange() {
+  public void onResume() {
+    super.onResume();
     if (getActivity() != null
         && isAdded()
         && PermissionsUtil.hasContactsReadPermissions(getContext())) {
@@ -268,7 +263,6 @@
     recyclerView.setAdapter(null);
     recyclerView.setOnScrollChangeListener(null);
     adapter = null;
-    contactsPrefs.unregisterChangeListener();
   }
 
   /*
diff --git a/java/com/android/dialer/contactsfragment/res/drawable/fast_scroller_container_background.xml b/java/com/android/dialer/contactsfragment/res/drawable/fast_scroller_container_background.xml
index a7b2277..87d123a 100644
--- a/java/com/android/dialer/contactsfragment/res/drawable/fast_scroller_container_background.xml
+++ b/java/com/android/dialer/contactsfragment/res/drawable/fast_scroller_container_background.xml
@@ -16,7 +16,7 @@
  -->
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-  <solid android:color="@color/dialer_theme_color"/>
+  <solid android:color="?android:attr/colorPrimary"/>
   <size
       android:height="@dimen/fast_scroller_container_size"
       android:width="@dimen/fast_scroller_container_size"/>
diff --git a/java/com/android/dialer/contactsfragment/res/drawable/fast_scroller_scroll_bar.xml b/java/com/android/dialer/contactsfragment/res/drawable/fast_scroller_scroll_bar.xml
index a3e0c25..b4bc00a 100644
--- a/java/com/android/dialer/contactsfragment/res/drawable/fast_scroller_scroll_bar.xml
+++ b/java/com/android/dialer/contactsfragment/res/drawable/fast_scroller_scroll_bar.xml
@@ -17,14 +17,14 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
   <item android:state_selected="true">
     <shape android:shape="rectangle">
-      <solid android:color="@color/dialer_theme_color"/>
+      <solid android:color="?android:attr/colorPrimary"/>
       <size android:height="32dp" android:width="4dp"/>
       <corners android:radius="2dp"/>
     </shape>
   </item>
   <item>
     <shape android:shape="rectangle">
-      <solid android:color="@color/dialer_secondary_text_color"/>
+      <solid android:color="?android:attr/textColorSecondary"/>
       <size android:height="32dp" android:width="4dp"/>
       <corners android:radius="2dp"/>
     </shape>
diff --git a/java/com/android/dialer/contactsfragment/res/layout/add_contact_row.xml b/java/com/android/dialer/contactsfragment/res/layout/add_contact_row.xml
index dbc7caf..be4ee08 100644
--- a/java/com/android/dialer/contactsfragment/res/layout/add_contact_row.xml
+++ b/java/com/android/dialer/contactsfragment/res/layout/add_contact_row.xml
@@ -34,7 +34,7 @@
       android:layout_width="@dimen/photo_size"
       android:layout_height="@dimen/photo_size"
       android:src="@drawable/quantum_ic_person_add_white_24"
-      android:tint="@color/dialer_theme_color"
+      android:tint="?android:attr/colorPrimary"
       android:scaleType="center"/>
 
   <TextView
@@ -44,7 +44,6 @@
       android:paddingStart="@dimen/text_padding_start"
       android:paddingEnd="@dimen/text_padding_end"
       android:gravity="center_vertical"
-      android:fontFamily="sans-serif"
       android:text="@string/all_contacts_empty_add_contact_action"
-      style="@style/PrimaryText"/>
+      style="@style/Dialer.TextAppearance.Primary"/>
 </LinearLayout>
diff --git a/java/com/android/dialer/contactsfragment/res/layout/contact_row.xml b/java/com/android/dialer/contactsfragment/res/layout/contact_row.xml
index 9e829fe..3309ab4 100644
--- a/java/com/android/dialer/contactsfragment/res/layout/contact_row.xml
+++ b/java/com/android/dialer/contactsfragment/res/layout/contact_row.xml
@@ -41,7 +41,7 @@
         android:layout_height="@dimen/photo_size"
         android:clickable="false"/>
 
-    <TextView
+    <com.android.dialer.widget.BidiTextView
         android:id="@+id/contact_name"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
@@ -51,7 +51,7 @@
         android:ellipsize="end"
         android:gravity="center_vertical"
         android:textSize="@dimen/text_size"
-        android:textColor="@color/dialer_primary_text_color"
+        android:textColor="?android:attr/textColorPrimary"
         android:fontFamily="sans-serif"/>
   </LinearLayout>
 </FrameLayout>
\ No newline at end of file
diff --git a/java/com/android/dialer/contactsfragment/res/layout/fragment_contacts.xml b/java/com/android/dialer/contactsfragment/res/layout/fragment_contacts.xml
index 7bc3b34..fa17bf9 100644
--- a/java/com/android/dialer/contactsfragment/res/layout/fragment_contacts.xml
+++ b/java/com/android/dialer/contactsfragment/res/layout/fragment_contacts.xml
@@ -23,7 +23,7 @@
       android:id="@+id/recycler_view"
       android:layout_width="match_parent"
       android:layout_height="match_parent"
-      android:background="@color/background_dialer_light"
+      android:background="?android:attr/colorBackground"
       android:paddingBottom="@dimen/floating_action_button_list_bottom_padding"
       android:clipToPadding="false"/>
 
@@ -45,7 +45,7 @@
         android:layout_toLeftOf="@+id/fast_scroller_scroll_bar"
         android:gravity="center"
         android:textSize="48sp"
-        android:textColor="@color/background_dialer_white"
+        android:textColor="?android:attr/textColorPrimaryInverse"
         android:visibility="gone"
         android:background="@drawable/fast_scroller_container_background"/>
 
diff --git a/java/com/android/dialer/contactsfragment/res/layout/header.xml b/java/com/android/dialer/contactsfragment/res/layout/header.xml
index cb5e78a..c0ba9d7 100644
--- a/java/com/android/dialer/contactsfragment/res/layout/header.xml
+++ b/java/com/android/dialer/contactsfragment/res/layout/header.xml
@@ -19,8 +19,7 @@
     android:id="@+id/header"
     android:layout_width="@dimen/header_width"
     android:layout_height="@dimen/row_height"
-    android:textColor="@color/dialer_theme_color"
+    android:textColor="?android:attr/colorPrimary"
     android:gravity="center"
-    android:textSize="@dimen/text_size"
     android:textStyle="bold"
-    android:fontFamily="sans-serif-medium"/>
\ No newline at end of file
+    style="@style/Dialer.TextAppearance.Header2"/>
\ No newline at end of file
diff --git a/java/com/android/dialer/database/CallLogQueryHandler.java b/java/com/android/dialer/database/CallLogQueryHandler.java
index 92c49a0..de4329d 100644
--- a/java/com/android/dialer/database/CallLogQueryHandler.java
+++ b/java/com/android/dialer/database/CallLogQueryHandler.java
@@ -26,7 +26,6 @@
 import android.database.sqlite.SQLiteException;
 import android.database.sqlite.SQLiteFullException;
 import android.net.Uri;
-import android.os.Build;
 import android.os.Handler;
 import android.os.Looper;
 import android.os.Message;
@@ -35,8 +34,6 @@
 import android.provider.VoicemailContract.Voicemails;
 import com.android.contacts.common.database.NoNullCursorAsyncQueryHandler;
 import com.android.dialer.common.LogUtil;
-import com.android.dialer.compat.AppCompatConstants;
-import com.android.dialer.compat.SdkVersionOverride;
 import com.android.dialer.phonenumbercache.CallLogQuery;
 import com.android.dialer.telecom.TelecomUtil;
 import com.android.dialer.util.PermissionsUtil;
@@ -114,6 +111,7 @@
         .appendOmtpVoicemailStatusSelectionClause(context, where, selectionArgs);
 
     if (TelecomUtil.hasReadWriteVoicemailPermissions(context)) {
+      LogUtil.i("CallLogQueryHandler.fetchVoicemailStatus", "fetching voicemail status");
       startQuery(
           QUERY_VOICEMAIL_STATUS_TOKEN,
           null,
@@ -122,6 +120,10 @@
           where.toString(),
           selectionArgs.toArray(new String[selectionArgs.size()]),
           null);
+    } else {
+      LogUtil.i(
+          "CallLogQueryHandler.fetchVoicemailStatus",
+          "fetching voicemail status failed due to permissions");
     }
   }
 
@@ -154,12 +156,10 @@
 
     // Always hide blocked calls.
     where.append("(").append(Calls.TYPE).append(" != ?)");
-    selectionArgs.add(Integer.toString(AppCompatConstants.CALLS_BLOCKED_TYPE));
+    selectionArgs.add(Integer.toString(Calls.BLOCKED_TYPE));
 
     // Ignore voicemails marked as deleted
-    if (SdkVersionOverride.getSdkVersion(Build.VERSION_CODES.M) >= Build.VERSION_CODES.M) {
-      where.append(" AND (").append(Voicemails.DELETED).append(" = 0)");
-    }
+    where.append(" AND (").append(Voicemails.DELETED).append(" = 0)");
 
     if (newOnly) {
       where.append(" AND (").append(Calls.NEW).append(" = 1)");
@@ -170,7 +170,7 @@
       selectionArgs.add(Integer.toString(callType));
     } else {
       where.append(" AND NOT ");
-      where.append("(" + Calls.TYPE + " = " + AppCompatConstants.CALLS_VOICEMAIL_TYPE + ")");
+      where.append("(" + Calls.TYPE + " = " + Calls.VOICEMAIL_TYPE + ")");
     }
 
     if (newerThan > 0) {
diff --git a/java/com/android/dialer/database/DialerDatabaseHelper.java b/java/com/android/dialer/database/DialerDatabaseHelper.java
index efff11e..719492e 100644
--- a/java/com/android/dialer/database/DialerDatabaseHelper.java
+++ b/java/com/android/dialer/database/DialerDatabaseHelper.java
@@ -32,21 +32,23 @@
 import android.provider.ContactsContract.Contacts;
 import android.provider.ContactsContract.Data;
 import android.provider.ContactsContract.Directory;
-import android.support.annotation.Nullable;
 import android.support.annotation.VisibleForTesting;
 import android.support.annotation.WorkerThread;
 import android.text.TextUtils;
-import com.android.contacts.common.R;
 import com.android.contacts.common.util.StopWatch;
 import com.android.dialer.common.LogUtil;
-import com.android.dialer.common.concurrent.DialerExecutor.Worker;
+import com.android.dialer.common.concurrent.DefaultFutureCallback;
 import com.android.dialer.common.concurrent.DialerExecutorComponent;
+import com.android.dialer.common.concurrent.DialerFutureSerializer;
 import com.android.dialer.common.database.Selection;
-import com.android.dialer.configprovider.ConfigProviderBindings;
+import com.android.dialer.configprovider.ConfigProviderComponent;
+import com.android.dialer.contacts.resources.R;
 import com.android.dialer.database.FilteredNumberContract.FilteredNumberColumns;
 import com.android.dialer.smartdial.util.SmartDialNameMatcher;
 import com.android.dialer.smartdial.util.SmartDialPrefix;
 import com.android.dialer.util.PermissionsUtil;
+import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.MoreExecutors;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.Objects;
@@ -85,6 +87,8 @@
   private static final int MAX_ENTRIES = 20;
 
   private final Context context;
+  private final DialerFutureSerializer dialerFutureSerializer = new DialerFutureSerializer();
+
   private boolean isTestInstance = false;
 
   protected DialerDatabaseHelper(Context context, String databaseName, int dbVersion) {
@@ -344,11 +348,19 @@
    */
   public void startSmartDialUpdateThread(boolean forceUpdate) {
     if (PermissionsUtil.hasContactsReadPermissions(context)) {
-      DialerExecutorComponent.get(context)
-          .dialerExecutorFactory()
-          .createNonUiTaskBuilder(new UpdateSmartDialWorker())
-          .build()
-          .executeParallel(forceUpdate);
+      Futures.addCallback(
+          // Serialize calls to updateSmartDialDatabase. Use FutureSerializer instead of
+          // synchronizing on the method to prevent deadlocking thread pool. FutureSerializer
+          // provides the guarantee that the next AsyncCallable won't even be submitted until the
+          // ListenableFuture returned by the previous one completes. See a bug.
+          dialerFutureSerializer.submit(
+              () -> {
+                updateSmartDialDatabase(forceUpdate);
+                return null;
+              },
+              DialerExecutorComponent.get(context).backgroundExecutor()),
+          new DefaultFutureCallback<>(),
+          MoreExecutors.directExecutor());
     }
   }
 
@@ -657,7 +669,7 @@
    * @param forceUpdate If set to true, update the database by reloading all contacts.
    */
   @WorkerThread
-  public synchronized void updateSmartDialDatabase(boolean forceUpdate) {
+  public void updateSmartDialDatabase(boolean forceUpdate) {
     LogUtil.enterBlock("DialerDatabaseHelper.updateSmartDialDatabase");
 
     final SQLiteDatabase db = getWritableDatabase();
@@ -670,7 +682,9 @@
         context.getSharedPreferences(DATABASE_LAST_CREATED_SHARED_PREF, Context.MODE_PRIVATE);
 
     long defaultLastUpdateMillis =
-        ConfigProviderBindings.get(context).getLong(DEFAULT_LAST_UPDATED_CONFIG_KEY, 0);
+        ConfigProviderComponent.get(context)
+            .getConfigProvider()
+            .getLong(DEFAULT_LAST_UPDATED_CONFIG_KEY, 0);
 
     long sharedPrefLastUpdateMillis =
         databaseLastUpdateSharedPref.getLong(LAST_UPDATED_MILLIS, defaultLastUpdateMillis);
@@ -954,6 +968,12 @@
       }
       /** Iterates the cursor to find top contact suggestions without duplication. */
       while ((cursor.moveToNext()) && (counter < MAX_ENTRIES)) {
+        if (cursor.isNull(columnDataId)) {
+          LogUtil.i(
+              "DialerDatabaseHelper.getLooseMatches",
+              "_id column null. Row was deleted during iteration, skipping");
+          continue;
+        }
         final long dataID = cursor.getLong(columnDataId);
         final String displayName = cursor.getString(columnDisplayNamePrimary);
         final String phoneNumber = cursor.getString(columnNumber);
@@ -1296,14 +1316,4 @@
       return false;
     }
   }
-
-  private class UpdateSmartDialWorker implements Worker<Boolean, Void> {
-
-    @Nullable
-    @Override
-    public Void doInBackground(Boolean forceUpdate) throws Throwable {
-      updateSmartDialDatabase(forceUpdate);
-      return null;
-    }
-  }
 }
diff --git a/java/com/android/dialer/databasepopulator/BlockedBumberPopulator.java b/java/com/android/dialer/databasepopulator/BlockedBumberPopulator.java
index 378d487..0819d52 100644
--- a/java/com/android/dialer/databasepopulator/BlockedBumberPopulator.java
+++ b/java/com/android/dialer/databasepopulator/BlockedBumberPopulator.java
@@ -16,12 +16,10 @@
 
 package com.android.dialer.databasepopulator;
 
-import android.annotation.TargetApi;
 import android.content.ContentProviderOperation;
 import android.content.ContentValues;
 import android.content.Context;
 import android.content.OperationApplicationException;
-import android.os.Build.VERSION_CODES;
 import android.os.RemoteException;
 import android.provider.BlockedNumberContract;
 import android.provider.BlockedNumberContract.BlockedNumbers;
@@ -38,7 +36,6 @@
       Arrays.asList(
           createContentValuesWithNumber("123456789"), createContentValuesWithNumber("987654321"));
 
-  @TargetApi(VERSION_CODES.N)
   public static void populateBlockedNumber(@NonNull Context context) {
     ArrayList<ContentProviderOperation> operations = new ArrayList<>();
     for (ContentValues value : values) {
@@ -55,7 +52,6 @@
     }
   }
 
-  @TargetApi(VERSION_CODES.N)
   public static void deleteBlockedNumbers(@NonNull Context context) {
     // clean BlockedNumbers db
     context.getContentResolver().delete(BlockedNumbers.CONTENT_URI, null, null);
diff --git a/java/com/android/dialer/databasepopulator/ContactsPopulator.java b/java/com/android/dialer/databasepopulator/ContactsPopulator.java
index f22552d..f21e325 100644
--- a/java/com/android/dialer/databasepopulator/ContactsPopulator.java
+++ b/java/com/android/dialer/databasepopulator/ContactsPopulator.java
@@ -152,6 +152,7 @@
     Assert.isWorkerThread();
     ArrayList<ContentProviderOperation> operations = new ArrayList<>();
     addContact(SIMPLE_CONTACTS[0], operations);
+    addContact(SIMPLE_CONTACTS[3], operations);
     addContact(SIMPLE_CONTACTS[5], operations);
     try {
       context.getContentResolver().applyBatch(ContactsContract.AUTHORITY, operations);
diff --git a/java/com/android/dialer/dialpadview/DialpadCharMappings.java b/java/com/android/dialer/dialpadview/DialpadCharMappings.java
index 15793a5..11975e6 100644
--- a/java/com/android/dialer/dialpadview/DialpadCharMappings.java
+++ b/java/com/android/dialer/dialpadview/DialpadCharMappings.java
@@ -20,7 +20,7 @@
 import android.support.annotation.NonNull;
 import android.support.v4.util.SimpleArrayMap;
 import com.android.dialer.common.Assert;
-import com.android.dialer.compat.CompatUtils;
+import com.android.dialer.i18n.LocaleUtils;
 
 /** A class containing character mappings for the dialpad. */
 public class DialpadCharMappings {
@@ -133,7 +133,7 @@
    * null if no character-key map for the language code is defined.
    */
   public static SimpleArrayMap<Character, Character> getCharToKeyMap(@NonNull Context context) {
-    return CHAR_TO_KEY_MAPS.get(CompatUtils.getLocale(context).getISO3Language());
+    return CHAR_TO_KEY_MAPS.get(LocaleUtils.getLocale(context).getISO3Language());
   }
 
   /**
@@ -163,7 +163,7 @@
    * preference or null if no key-characters map for the language code is defined.
    */
   static String[] getKeyToCharsMap(@NonNull Context context) {
-    return KEY_TO_CHAR_MAPS.get(CompatUtils.getLocale(context).getISO3Language());
+    return KEY_TO_CHAR_MAPS.get(LocaleUtils.getLocale(context).getISO3Language());
   }
 
   /** Returns the default key-characters map (the one that uses the Latin alphabet). */
diff --git a/java/com/android/dialer/dialpadview/DialpadFragment.java b/java/com/android/dialer/dialpadview/DialpadFragment.java
index eeab6c4..2d0eff5 100644
--- a/java/com/android/dialer/dialpadview/DialpadFragment.java
+++ b/java/com/android/dialer/dialpadview/DialpadFragment.java
@@ -16,6 +16,7 @@
 
 package com.android.dialer.dialpadview;
 
+import android.annotation.TargetApi;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.Dialog;
@@ -34,7 +35,10 @@
 import android.media.AudioManager;
 import android.media.ToneGenerator;
 import android.net.Uri;
+import android.os.Build.VERSION;
+import android.os.Build.VERSION_CODES;
 import android.os.Bundle;
+import android.os.PersistableBundle;
 import android.os.Trace;
 import android.provider.Contacts.People;
 import android.provider.Contacts.Phones;
@@ -48,6 +52,7 @@
 import android.telecom.PhoneAccountHandle;
 import android.telephony.PhoneNumberFormattingTextWatcher;
 import android.telephony.PhoneNumberUtils;
+import android.telephony.ServiceState;
 import android.telephony.TelephonyManager;
 import android.text.Editable;
 import android.text.Selection;
@@ -75,6 +80,7 @@
 import com.android.contacts.common.dialog.CallSubjectDialog;
 import com.android.contacts.common.util.StopWatch;
 import com.android.dialer.animation.AnimUtils;
+import com.android.dialer.animation.AnimUtils.AnimationCallback;
 import com.android.dialer.callintent.CallInitiationType;
 import com.android.dialer.callintent.CallIntentBuilder;
 import com.android.dialer.common.Assert;
@@ -83,7 +89,6 @@
 import com.android.dialer.common.concurrent.DialerExecutor;
 import com.android.dialer.common.concurrent.DialerExecutor.Worker;
 import com.android.dialer.common.concurrent.DialerExecutorComponent;
-import com.android.dialer.common.concurrent.ThreadUtil;
 import com.android.dialer.location.GeoUtil;
 import com.android.dialer.logging.UiAction;
 import com.android.dialer.oem.MotorolaUtils;
@@ -142,7 +147,18 @@
   private static final String PREF_DIGITS_FILLED_BY_INTENT = "pref_digits_filled_by_intent";
   private static final String PREF_IS_DIALPAD_SLIDE_OUT = "pref_is_dialpad_slide_out";
 
+  /**
+   * Hidden key in carrier config to determine if no emergency call over wifi warning is required.
+   *
+   * <p>"Time delay (in ms) after which we show the notification for emergency calls, while the
+   * device is registered over WFC. Default value is -1, which indicates that this notification is
+   * not pertinent for a particular carrier. We've added a delay to prevent false positives."
+   */
+  @VisibleForTesting
+  static final String KEY_EMERGENCY_NOTIFICATION_DELAY_INT = "emergency_notification_delay_int";
+
   private static Optional<String> currentCountryIsoForTesting = Optional.absent();
+  private static Boolean showEmergencyCallWarningForTest = null;
 
   private final Object toneGeneratorLock = new Object();
   /** Set of dialpad keys that are currently being pressed */
@@ -151,6 +167,7 @@
   private OnDialpadQueryChangedListener dialpadQueryListener;
   private DialpadView dialpadView;
   private EditText digits;
+  private TextView digitsHint;
   private int dialpadSlideInDuration;
   /** Remembers if we need to clear digits field when the screen is completely gone. */
   private boolean clearDigitsOnStop;
@@ -304,6 +321,7 @@
         activity.invalidateOptionsMenu();
         updateMenuOverflowButton(wasEmptyBeforeTextChange);
       }
+      updateDialpadHint();
     }
 
     // DTMF Tones do not need to be played here any longer -
@@ -386,6 +404,7 @@
     dialpadView = fragmentView.findViewById(R.id.dialpad_view);
     dialpadView.setCanDigitsBeEdited(true);
     digits = dialpadView.getDigits();
+    digitsHint = dialpadView.getDigitsHint();
     digits.setKeyListener(UnicodeDialerKeyListener.INSTANCE);
     digits.setOnClickListener(this);
     digits.setOnKeyListener(this);
@@ -393,7 +412,9 @@
     digits.addTextChangedListener(this);
     digits.setElegantTextHeight(false);
 
-    initPhoneNumberFormattingTextWatcherExecutor.executeSerial(getCurrentCountryIso());
+    if (!MotorolaUtils.shouldDisablePhoneNumberFormatting(getContext())) {
+      initPhoneNumberFormattingTextWatcherExecutor.executeSerial(getCurrentCountryIso());
+    }
 
     // Check for the presence of the keypad
     View oneButton = fragmentView.findViewById(R.id.one);
@@ -438,6 +459,76 @@
     return fragmentView;
   }
 
+  /**
+   * The dialpad hint is a TextView overlaid above the digit EditText. {@link EditText#setHint(int)}
+   * is not used because the digits has auto resize and makes setting the size of the hint
+   * difficult.
+   */
+  private void updateDialpadHint() {
+    if (!TextUtils.isEmpty(digits.getText())) {
+      digitsHint.setVisibility(View.GONE);
+      return;
+    }
+
+    if (shouldShowEmergencyCallWarning(getContext())) {
+      String hint = getContext().getString(R.string.dialpad_hint_emergency_calling_not_available);
+      digits.setContentDescription(hint);
+      digitsHint.setText(hint);
+      digitsHint.setVisibility(View.VISIBLE);
+      return;
+    }
+    digits.setContentDescription(null);
+
+    digitsHint.setVisibility(View.GONE);
+  }
+
+  /**
+   * Only show the "emergency call not available" warning when on wifi call and carrier requires it.
+   *
+   * <p>internal method tested because the conditions cannot be setup in espresso, and the layout
+   * cannot be inflated in robolectric.
+   */
+  @SuppressWarnings("missingPermission")
+  @TargetApi(VERSION_CODES.O)
+  @VisibleForTesting
+  static boolean shouldShowEmergencyCallWarning(Context context) {
+    if (showEmergencyCallWarningForTest != null) {
+      return showEmergencyCallWarningForTest;
+    }
+    if (VERSION.SDK_INT < VERSION_CODES.O) {
+      return false;
+    }
+    if (!PermissionsUtil.hasReadPhoneStatePermissions(context)) {
+      return false;
+    }
+    TelephonyManager telephonyManager = context.getSystemService(TelephonyManager.class);
+    PersistableBundle config = telephonyManager.getCarrierConfig();
+    // A delay of -1 means wifi emergency call is available/the warning is not required.
+    if (config == null || config.getInt(KEY_EMERGENCY_NOTIFICATION_DELAY_INT, -1) == -1) {
+      return false;
+    }
+
+    // TelephonyManager.getVoiceNetworkType() Doesn't always return NETWORK_TYPE_IWLAN when on wifi.
+    // other wifi calling checks are hidden API. Emergency calling is not available without service
+    // regardless of the wifi state so this check is omitted.
+
+    switch (telephonyManager.getServiceState().getState()) {
+      case ServiceState.STATE_OUT_OF_SERVICE:
+      case ServiceState.STATE_POWER_OFF:
+        return true;
+      case ServiceState.STATE_EMERGENCY_ONLY:
+      case ServiceState.STATE_IN_SERVICE:
+        return false;
+      default:
+        throw new AssertionError("unknown state " + telephonyManager.getServiceState().getState());
+    }
+  }
+
+  @VisibleForTesting
+  static void setShowEmergencyCallWarningForTest(Boolean value) {
+    showEmergencyCallWarningForTest = value;
+  }
+
   @Override
   public void onAttach(Context context) {
     super.onAttach(context);
@@ -646,6 +737,14 @@
     LogUtil.i("DialpadFragment.onStart", "first launch: %b", firstLaunch);
     Trace.beginSection(TAG + " onStart");
     super.onStart();
+    Resources res = getResources();
+    int iconId = R.drawable.quantum_ic_call_vd_theme_24;
+    if (MotorolaUtils.isWifiCallingAvailable(getContext())) {
+      iconId = R.drawable.ic_wifi_calling;
+    }
+    floatingActionButtonController.changeIcon(
+        getContext(), iconId, res.getString(R.string.description_dial_button));
+
     // if the mToneGenerator creation fails, just continue without it.  It is
     // a local audio signal, and is not as important as the dtmf tone itself.
     final long start = System.currentTimeMillis();
@@ -674,14 +773,6 @@
     Trace.beginSection(TAG + " onResume");
     super.onResume();
 
-    Resources res = getResources();
-    int iconId = R.drawable.quantum_ic_call_vd_theme_24;
-    if (MotorolaUtils.isWifiCallingAvailable(getContext())) {
-      iconId = R.drawable.ic_wifi_calling;
-    }
-    floatingActionButtonController.changeIcon(
-        getContext(), iconId, res.getString(R.string.description_dial_button));
-
     dialpadQueryListener = FragmentUtils.getParentUnsafe(this, OnDialpadQueryChangedListener.class);
 
     final StopWatch stopWatch = StopWatch.start("Dialpad.onResume");
@@ -731,6 +822,8 @@
     overflowMenuButton.setOnClickListener(this);
     overflowMenuButton.setVisibility(isDigitsEmpty() ? View.INVISIBLE : View.VISIBLE);
 
+    updateDialpadHint();
+
     if (firstLaunch) {
       // The onHiddenChanged callback does not get called the first time the fragment is
       // attached, so call it ourselves here.
@@ -762,6 +855,7 @@
     LogUtil.enterBlock("DialpadFragment.onStop");
     super.onStop();
 
+    floatingActionButtonController.scaleOut();
     synchronized (toneGeneratorLock) {
       if (toneGenerator != null) {
         toneGenerator.release();
@@ -962,9 +1056,15 @@
       digits.clear();
       return true;
     } else if (id == R.id.one) {
-      if (isDigitsEmpty() || TextUtils.equals(this.digits.getText(), "1")) {
+      // For non-talkback users: check for empty
+      // For linear navigation users: check for "1"
+      // For explore by touch users: check for "11"
+      if (isDigitsEmpty()
+          || TextUtils.equals(this.digits.getText(), "1")
+          || TextUtils.equals(this.digits.getText(), "11")) {
         // We'll try to initiate voicemail and thus we want to remove irrelevant string.
         removePreviousDigitIfPossible('1');
+        removePreviousDigitIfPossible('1');
 
         List<PhoneAccountHandle> subscriptionAccountHandles =
             TelecomUtil.getSubscriptionPhoneAccounts(getActivity());
@@ -1006,6 +1106,7 @@
         // (and not via other means like certain accessibility input methods).
         // Remove the '0' that was input when the key was first pressed.
         removePreviousDigitIfPossible('0');
+        removePreviousDigitIfPossible('0');
       }
       keyPressed(KeyEvent.KEYCODE_PLUS);
       stopTone();
@@ -1244,19 +1345,14 @@
       if (dialpadView != null) {
         LogUtil.i("DialpadFragment.showDialpadChooser", "mDialpadView not null");
         dialpadView.setVisibility(View.VISIBLE);
-        floatingActionButtonController.scaleIn();
+        if (isDialpadSlideUp()) {
+          floatingActionButtonController.scaleIn();
+        }
       } else {
         LogUtil.i("DialpadFragment.showDialpadChooser", "mDialpadView null");
         digits.setVisibility(View.VISIBLE);
       }
 
-      // mFloatingActionButtonController must also be 'scaled in', in order to be visible after
-      // 'scaleOut()' hidden method.
-      if (!floatingActionButtonController.isVisible()) {
-        // Just call 'scaleIn()' method if the mFloatingActionButtonController was not already
-        // previously visible.
-        floatingActionButtonController.scaleIn();
-      }
       dialpadChooser.setVisibility(View.GONE);
     }
   }
@@ -1395,7 +1491,16 @@
     if (transitionIn) {
       AnimUtils.fadeIn(overflowMenuButton, AnimUtils.DEFAULT_DURATION);
     } else {
-      AnimUtils.fadeOut(overflowMenuButton, AnimUtils.DEFAULT_DURATION);
+      AnimUtils.fadeOut(
+          overflowMenuButton,
+          AnimUtils.DEFAULT_DURATION,
+          new AnimationCallback() {
+            @Override
+            public void onAnimationEnd() {
+              // AnimUtils will set the visibility to GONE and cause the layout to move around.
+              overflowMenuButton.setVisibility(View.INVISIBLE);
+            }
+          });
     }
   }
 
@@ -1472,18 +1577,8 @@
       if (animate) {
         dialpadView.animateShow();
       }
-      ThreadUtil.getUiThreadHandler()
-          .postDelayed(
-              () -> {
-                if (!isDialpadChooserVisible()) {
-                  floatingActionButtonController.scaleIn();
-                }
-              },
-              animate ? dialpadSlideInDuration : 0);
       FragmentUtils.getParentUnsafe(this, DialpadListener.class).onDialpadShown();
       digits.requestFocus();
-    } else if (hidden) {
-      floatingActionButtonController.scaleOut();
     }
   }
 
@@ -1546,6 +1641,7 @@
     slideDown.setAnimationListener(listener);
     slideDown.setDuration(animate ? dialpadSlideInDuration : 0);
     getView().startAnimation(slideDown);
+    floatingActionButtonController.scaleOut();
   }
 
   /** Animate the dialpad up onto the screen. */
@@ -1561,6 +1657,19 @@
     Animation slideUp = AnimationUtils.loadAnimation(getContext(), animation);
     slideUp.setInterpolator(AnimUtils.EASE_IN);
     slideUp.setDuration(animate ? dialpadSlideInDuration : 0);
+    slideUp.setAnimationListener(
+        new AnimationListener() {
+          @Override
+          public void onAnimationStart(Animation animation) {}
+
+          @Override
+          public void onAnimationEnd(Animation animation) {
+            floatingActionButtonController.scaleIn();
+          }
+
+          @Override
+          public void onAnimationRepeat(Animation animation) {}
+        });
     getView().startAnimation(slideUp);
   }
 
diff --git a/java/com/android/dialer/dialpadview/DialpadKeyButton.java b/java/com/android/dialer/dialpadview/DialpadKeyButton.java
index 84aca14..47553b6 100644
--- a/java/com/android/dialer/dialpadview/DialpadKeyButton.java
+++ b/java/com/android/dialer/dialpadview/DialpadKeyButton.java
@@ -19,13 +19,14 @@
 import android.content.Context;
 import android.graphics.RectF;
 import android.os.Bundle;
+import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 import android.view.View;
-import android.view.ViewConfiguration;
 import android.view.accessibility.AccessibilityEvent;
 import android.view.accessibility.AccessibilityManager;
 import android.view.accessibility.AccessibilityNodeInfo;
+import android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction;
 import android.widget.FrameLayout;
 
 /**
@@ -45,33 +46,21 @@
  */
 public class DialpadKeyButton extends FrameLayout {
 
-  /** Timeout before switching to long-click accessibility mode. */
-  private static final int LONG_HOVER_TIMEOUT = ViewConfiguration.getLongPressTimeout() * 2;
-
   /** Accessibility manager instance used to check touch exploration state. */
   private AccessibilityManager accessibilityManager;
 
   /** Bounds used to filter HOVER_EXIT events. */
   private RectF hoverBounds = new RectF();
 
-  /** Whether this view is currently in the long-hover state. */
-  private boolean longHovered;
-
   /** Alternate content description for long-hover state. */
   private CharSequence longHoverContentDesc;
 
-  /** Backup of standard content description. Used for accessibility. */
-  private CharSequence backupContentDesc;
-
   /** Backup of clickable property. Used for accessibility. */
   private boolean wasClickable;
 
   /** Backup of long-clickable property. Used for accessibility. */
   private boolean wasLongClickable;
 
-  /** Runnable used to trigger long-click mode for accessibility. */
-  private Runnable longHoverRunnable;
-
   private OnPressedListener onPressedListener;
 
   public DialpadKeyButton(Context context, AttributeSet attrs) {
@@ -95,19 +84,6 @@
 
   public void setLongHoverContentDescription(CharSequence contentDescription) {
     longHoverContentDesc = contentDescription;
-
-    if (longHovered) {
-      super.setContentDescription(longHoverContentDesc);
-    }
-  }
-
-  @Override
-  public void setContentDescription(CharSequence contentDescription) {
-    if (longHovered) {
-      backupContentDesc = contentDescription;
-    } else {
-      super.setContentDescription(contentDescription);
-    }
   }
 
   @Override
@@ -139,6 +115,18 @@
   }
 
   @Override
+  public void onInitializeAccessibilityNodeInfo(AccessibilityNodeInfo info) {
+    super.onInitializeAccessibilityNodeInfo(info);
+    // If the button has a long hover description, ask talkback to announce the action follow by
+    // the description (for example "double tap and hold to call voicemail").
+    if (!TextUtils.isEmpty(longHoverContentDesc)) {
+      AccessibilityAction longClickAction =
+          new AccessibilityAction(AccessibilityNodeInfo.ACTION_LONG_CLICK, longHoverContentDesc);
+      info.addAction(longClickAction);
+    }
+  }
+
+  @Override
   public boolean onHoverEvent(MotionEvent event) {
     // When touch exploration is turned on, lifting a finger while inside
     // the button's hover target bounds should perform a click action.
@@ -148,20 +136,6 @@
           // Lift-to-type temporarily disables double-tap activation.
           wasClickable = isClickable();
           wasLongClickable = isLongClickable();
-          if (wasLongClickable && longHoverContentDesc != null) {
-            if (longHoverRunnable == null) {
-              longHoverRunnable =
-                  new Runnable() {
-                    @Override
-                    public void run() {
-                      setLongHovered(true);
-                      announceForAccessibility(longHoverContentDesc);
-                    }
-                  };
-            }
-            postDelayed(longHoverRunnable, LONG_HOVER_TIMEOUT);
-          }
-
           setClickable(false);
           setLongClickable(false);
           break;
@@ -170,7 +144,6 @@
             simulateClickForAccessibility();
           }
 
-          cancelLongHover();
           setClickable(wasClickable);
           setLongClickable(wasLongClickable);
           break;
@@ -201,27 +174,6 @@
     setPressed(false);
   }
 
-  private void setLongHovered(boolean enabled) {
-    if (longHovered != enabled) {
-      longHovered = enabled;
-
-      // Switch between normal and alternate description, if available.
-      if (enabled) {
-        backupContentDesc = getContentDescription();
-        super.setContentDescription(longHoverContentDesc);
-      } else {
-        super.setContentDescription(backupContentDesc);
-      }
-    }
-  }
-
-  private void cancelLongHover() {
-    if (longHoverRunnable != null) {
-      removeCallbacks(longHoverRunnable);
-    }
-    setLongHovered(false);
-  }
-
   public interface OnPressedListener {
 
     void onPressed(View view, boolean pressed);
diff --git a/java/com/android/dialer/dialpadview/DialpadView.java b/java/com/android/dialer/dialpadview/DialpadView.java
index 58ba233..6d538f3 100644
--- a/java/com/android/dialer/dialpadview/DialpadView.java
+++ b/java/com/android/dialer/dialpadview/DialpadView.java
@@ -41,7 +41,7 @@
 import com.android.dialer.animation.AnimUtils;
 import com.android.dialer.common.Assert;
 import com.android.dialer.common.LogUtil;
-import com.android.dialer.compat.CompatUtils;
+import com.android.dialer.i18n.LocaleUtils;
 import java.text.DecimalFormat;
 import java.text.NumberFormat;
 import java.util.Locale;
@@ -82,6 +82,7 @@
   private final int translateDistance;
 
   private EditText digits;
+  private TextView digitsHint;
   private ImageButton delete;
   private View overflowMenuButton;
   private ViewGroup rateContainer;
@@ -134,6 +135,7 @@
 
     setupKeypad();
     digits = (EditText) findViewById(R.id.digits);
+    digitsHint = findViewById(R.id.digits_hint);
     delete = (ImageButton) findViewById(R.id.deleteButton);
     overflowMenuButton = findViewById(R.id.dialpad_overflow);
     rateContainer = (ViewGroup) findViewById(R.id.rate_container);
@@ -169,6 +171,9 @@
       } else if (BUTTON_IDS[i] == R.id.star) {
         numberString = resources.getString(R.string.dialpad_star_number);
         numberContentDescription = numberString;
+      } else if (BUTTON_IDS[i] == R.id.zero) {
+        numberString = numberFormat.format(i);
+        numberContentDescription = numberString;
       } else {
         numberString = numberFormat.format(i);
         // The content description is used for Talkback key presses. The number is
@@ -232,7 +237,7 @@
   }
 
   private NumberFormat getNumberFormat() {
-    Locale locale = CompatUtils.getLocale(getContext());
+    Locale locale = LocaleUtils.getLocale(getContext());
 
     // Return the Persian number format if the current language is Persian.
     return "fas".equals(locale.getISO3Language())
@@ -311,6 +316,10 @@
     return digits;
   }
 
+  public TextView getDigitsHint() {
+    return digitsHint;
+  }
+
   public ImageButton getDeleteButton() {
     return delete;
   }
diff --git a/java/com/android/dialer/dialpadview/SpecialCharSequenceMgr.java b/java/com/android/dialer/dialpadview/SpecialCharSequenceMgr.java
index 3321d93..d2652ee 100644
--- a/java/com/android/dialer/dialpadview/SpecialCharSequenceMgr.java
+++ b/java/com/android/dialer/dialpadview/SpecialCharSequenceMgr.java
@@ -56,31 +56,24 @@
 import com.android.contacts.common.util.ContactDisplayUtils;
 import com.android.contacts.common.widget.SelectPhoneAccountDialogFragment;
 import com.android.contacts.common.widget.SelectPhoneAccountDialogFragment.SelectPhoneAccountListener;
+import com.android.contacts.common.widget.SelectPhoneAccountDialogOptionsUtil;
 import com.android.dialer.common.Assert;
 import com.android.dialer.common.LogUtil;
 import com.android.dialer.compat.telephony.TelephonyManagerCompat;
 import com.android.dialer.oem.MotorolaUtils;
+import com.android.dialer.oem.TranssionUtils;
 import com.android.dialer.telecom.TelecomUtil;
 import com.android.dialer.util.PermissionsUtil;
 import com.google.zxing.BarcodeFormat;
 import com.google.zxing.MultiFormatWriter;
 import com.google.zxing.WriterException;
 import com.google.zxing.common.BitMatrix;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Locale;
 
 /**
- * Helper class to listen for some magic character sequences that are handled specially by the
- * dialer.
- *
- * <p>Note the Phone app also handles these sequences too (in a couple of relatively obscure places
- * in the UI), so there's a separate version of this class under apps/Phone.
- *
- * <p>TODO: there's lots of duplicated code between this class and the corresponding class under
- * apps/Phone. Let's figure out a way to unify these two classes (in the framework? in a common
- * shared library?)
+ * Helper class to listen for some magic character sequences that are handled specially by Dialer.
  */
 public class SpecialCharSequenceMgr {
   private static final String TAG_SELECT_ACCT_FRAGMENT = "tag_select_acct_fragment";
@@ -93,18 +86,6 @@
   private static final String ADN_NAME_COLUMN_NAME = "name";
   private static final int ADN_QUERY_TOKEN = -1;
 
-  @VisibleForTesting
-  static final List<String> TRANSSION_CODES =
-      new ArrayList<String>() {
-        {
-          add("*#07#");
-          add("*#87#");
-          add("*#43#");
-          add("*#2727#");
-          add("*#88#");
-        }
-      };
-
   /**
    * Remembers the previous {@link QueryHandler} and cancel the operation when needed, to prevent
    * possible crash.
@@ -166,17 +147,19 @@
    * @return true if a secret code was encountered and handled
    */
   static boolean handleSecretCode(Context context, String input) {
+    // Secret code specific to OEMs should be handled first.
+    if (TranssionUtils.isTranssionSecretCode(input)) {
+      TranssionUtils.handleTranssionSecretCode(context, input);
+      return true;
+    }
+
     // Secret codes are accessed by dialing *#*#<code>#*#* or "*#<code_starting_with_number>#"
     if (input.length() > 8 && input.startsWith("*#*#") && input.endsWith("#*#*")) {
       String secretCode = input.substring(4, input.length() - 4);
       TelephonyManagerCompat.handleSecretCode(context, secretCode);
       return true;
     }
-    if (TRANSSION_CODES.contains(input)) {
-      String secretCode = input.substring(2, input.length() - 1);
-      TelephonyManagerCompat.handleSecretCode(context, secretCode);
-      return true;
-    }
+
     return false;
   }
 
@@ -252,10 +235,12 @@
         } else {
           SelectPhoneAccountListener callback =
               new HandleAdnEntryAccountSelectedCallback(applicationContext, handler, sc);
-
           DialogFragment dialogFragment =
               SelectPhoneAccountDialogFragment.newInstance(
-                  subscriptionAccountHandles, callback, null);
+                  SelectPhoneAccountDialogOptionsUtil.builderWithAccounts(
+                          subscriptionAccountHandles)
+                      .build(),
+                  callback);
           dialogFragment.show(((Activity) context).getFragmentManager(), TAG_SELECT_ACCT_FRAGMENT);
         }
 
@@ -310,7 +295,9 @@
 
         DialogFragment dialogFragment =
             SelectPhoneAccountDialogFragment.newInstance(
-                subscriptionAccountHandles, listener, null);
+                SelectPhoneAccountDialogOptionsUtil.builderWithAccounts(subscriptionAccountHandles)
+                    .build(),
+                listener);
         dialogFragment.show(((Activity) context).getFragmentManager(), TAG_SELECT_ACCT_FRAGMENT);
       }
       return true;
diff --git a/java/com/android/dialer/dialpadview/res/drawable-hdpi/ic_dialer_fork_add_call.png b/java/com/android/dialer/dialpadview/res/drawable-hdpi/ic_dialer_fork_add_call.png
old mode 100755
new mode 100644
index 4e0d564..7bc443b
--- a/java/com/android/dialer/dialpadview/res/drawable-hdpi/ic_dialer_fork_add_call.png
+++ b/java/com/android/dialer/dialpadview/res/drawable-hdpi/ic_dialer_fork_add_call.png
Binary files differ
diff --git a/java/com/android/dialer/dialpadview/res/drawable-hdpi/ic_dialer_fork_current_call.png b/java/com/android/dialer/dialpadview/res/drawable-hdpi/ic_dialer_fork_current_call.png
old mode 100755
new mode 100644
index 2cf41d5..dccddeb
--- a/java/com/android/dialer/dialpadview/res/drawable-hdpi/ic_dialer_fork_current_call.png
+++ b/java/com/android/dialer/dialpadview/res/drawable-hdpi/ic_dialer_fork_current_call.png
Binary files differ
diff --git a/java/com/android/dialer/dialpadview/res/drawable-hdpi/ic_dialer_fork_tt_keypad.png b/java/com/android/dialer/dialpadview/res/drawable-hdpi/ic_dialer_fork_tt_keypad.png
old mode 100755
new mode 100644
index 043685f..9ad63ff
--- a/java/com/android/dialer/dialpadview/res/drawable-hdpi/ic_dialer_fork_tt_keypad.png
+++ b/java/com/android/dialer/dialpadview/res/drawable-hdpi/ic_dialer_fork_tt_keypad.png
Binary files differ
diff --git a/java/com/android/dialer/dialpadview/res/drawable-mdpi/ic_dialer_fork_add_call.png b/java/com/android/dialer/dialpadview/res/drawable-mdpi/ic_dialer_fork_add_call.png
index 56ac2a3..8b96341 100644
--- a/java/com/android/dialer/dialpadview/res/drawable-mdpi/ic_dialer_fork_add_call.png
+++ b/java/com/android/dialer/dialpadview/res/drawable-mdpi/ic_dialer_fork_add_call.png
Binary files differ
diff --git a/java/com/android/dialer/dialpadview/res/drawable-mdpi/ic_dialer_fork_current_call.png b/java/com/android/dialer/dialpadview/res/drawable-mdpi/ic_dialer_fork_current_call.png
index 16a44a0..0bc00b6 100644
--- a/java/com/android/dialer/dialpadview/res/drawable-mdpi/ic_dialer_fork_current_call.png
+++ b/java/com/android/dialer/dialpadview/res/drawable-mdpi/ic_dialer_fork_current_call.png
Binary files differ
diff --git a/java/com/android/dialer/dialpadview/res/drawable-mdpi/ic_dialer_fork_tt_keypad.png b/java/com/android/dialer/dialpadview/res/drawable-mdpi/ic_dialer_fork_tt_keypad.png
index 66df69e..f4038cd 100644
--- a/java/com/android/dialer/dialpadview/res/drawable-mdpi/ic_dialer_fork_tt_keypad.png
+++ b/java/com/android/dialer/dialpadview/res/drawable-mdpi/ic_dialer_fork_tt_keypad.png
Binary files differ
diff --git a/java/com/android/dialer/dialpadview/res/drawable-xhdpi/ic_dialer_fork_add_call.png b/java/com/android/dialer/dialpadview/res/drawable-xhdpi/ic_dialer_fork_add_call.png
index aff140f..bf657b8 100644
--- a/java/com/android/dialer/dialpadview/res/drawable-xhdpi/ic_dialer_fork_add_call.png
+++ b/java/com/android/dialer/dialpadview/res/drawable-xhdpi/ic_dialer_fork_add_call.png
Binary files differ
diff --git a/java/com/android/dialer/dialpadview/res/drawable-xhdpi/ic_dialer_fork_current_call.png b/java/com/android/dialer/dialpadview/res/drawable-xhdpi/ic_dialer_fork_current_call.png
index 8975727..e8ad65a 100644
--- a/java/com/android/dialer/dialpadview/res/drawable-xhdpi/ic_dialer_fork_current_call.png
+++ b/java/com/android/dialer/dialpadview/res/drawable-xhdpi/ic_dialer_fork_current_call.png
Binary files differ
diff --git a/java/com/android/dialer/dialpadview/res/drawable-xhdpi/ic_dialer_fork_tt_keypad.png b/java/com/android/dialer/dialpadview/res/drawable-xhdpi/ic_dialer_fork_tt_keypad.png
index 4d48ea9..b9b817b 100644
--- a/java/com/android/dialer/dialpadview/res/drawable-xhdpi/ic_dialer_fork_tt_keypad.png
+++ b/java/com/android/dialer/dialpadview/res/drawable-xhdpi/ic_dialer_fork_tt_keypad.png
Binary files differ
diff --git a/java/com/android/dialer/dialpadview/res/drawable-xxhdpi/ic_dialer_fork_add_call.png b/java/com/android/dialer/dialpadview/res/drawable-xxhdpi/ic_dialer_fork_add_call.png
index 1657da4..4f042aa 100644
--- a/java/com/android/dialer/dialpadview/res/drawable-xxhdpi/ic_dialer_fork_add_call.png
+++ b/java/com/android/dialer/dialpadview/res/drawable-xxhdpi/ic_dialer_fork_add_call.png
Binary files differ
diff --git a/java/com/android/dialer/dialpadview/res/drawable-xxhdpi/ic_dialer_fork_current_call.png b/java/com/android/dialer/dialpadview/res/drawable-xxhdpi/ic_dialer_fork_current_call.png
index f25cce6..81bece6 100644
--- a/java/com/android/dialer/dialpadview/res/drawable-xxhdpi/ic_dialer_fork_current_call.png
+++ b/java/com/android/dialer/dialpadview/res/drawable-xxhdpi/ic_dialer_fork_current_call.png
Binary files differ
diff --git a/java/com/android/dialer/dialpadview/res/drawable-xxhdpi/ic_dialer_fork_tt_keypad.png b/java/com/android/dialer/dialpadview/res/drawable-xxhdpi/ic_dialer_fork_tt_keypad.png
index 7ac4d8b..ed4717b 100644
--- a/java/com/android/dialer/dialpadview/res/drawable-xxhdpi/ic_dialer_fork_tt_keypad.png
+++ b/java/com/android/dialer/dialpadview/res/drawable-xxhdpi/ic_dialer_fork_tt_keypad.png
Binary files differ
diff --git a/java/com/android/dialer/dialpadview/res/layout-land/dialpad_fragment.xml b/java/com/android/dialer/dialpadview/res/layout-land/dialpad_fragment.xml
index 6389853..66013c6 100644
--- a/java/com/android/dialer/dialpadview/res/layout-land/dialpad_fragment.xml
+++ b/java/com/android/dialer/dialpadview/res/layout-land/dialpad_fragment.xml
@@ -20,33 +20,33 @@
     android:layout_height="wrap_content">
 
   <LinearLayout
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="horizontal">
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:orientation="horizontal">
 
     <!-- spacer view -->
     <View
-      android:id="@+id/spacer"
-      android:layout_width="0dp"
-      android:layout_height="match_parent"
-      android:layout_weight="4"
-      android:background="#00000000"/>
+        android:id="@+id/spacer"
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+        android:layout_weight="4"
+        android:background="#00000000"/>
 
     <!-- Dialpad shadow -->
     <View
-      android:layout_width="@dimen/shadow_length"
-      android:layout_height="match_parent"
-      android:background="@drawable/shadow_fade_left"/>
+        android:layout_width="@dimen/shadow_length"
+        android:layout_height="match_parent"
+        android:background="@drawable/shadow_fade_left"/>
 
     <RelativeLayout
-      android:layout_width="0dp"
-      android:layout_height="match_parent"
-      android:layout_weight="6">
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+        android:layout_weight="6">
 
       <include
-        layout="@layout/dialpad_view"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"/>
+          layout="@layout/dialpad_view"
+          android:layout_width="match_parent"
+          android:layout_height="match_parent"/>
 
       <!-- "Dialpad chooser" UI, shown only when the user brings up the
                Dialer while a call is already in progress.
@@ -54,18 +54,18 @@
                (the textfield/button and the dialpad) are hidden. -->
 
       <ListView
-        android:id="@+id/dialpadChooser"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@color/background_dialer_light"
-        android:visibility="gone"/>
+          android:id="@+id/dialpadChooser"
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+          android:background="?android:attr/colorBackgroundFloating"
+          android:visibility="gone"/>
 
       <!-- Margin bottom and alignParentBottom don't work well together, so use a Space instead. -->
       <Space
-        android:id="@+id/dialpad_floating_action_button_margin_bottom"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/floating_action_button_margin_bottom"
-        android:layout_alignParentBottom="true"/>
+          android:id="@+id/dialpad_floating_action_button_margin_bottom"
+          android:layout_width="match_parent"
+          android:layout_height="@dimen/floating_action_button_margin_bottom"
+          android:layout_alignParentBottom="true"/>
 
       <android.support.design.widget.FloatingActionButton
           android:id="@+id/dialpad_floating_action_button"
@@ -73,10 +73,11 @@
           android:layout_height="@dimen/floating_action_button_height"
           android:layout_above="@id/dialpad_floating_action_button_margin_bottom"
           android:layout_centerHorizontal="true"
-          android:src="@drawable/quantum_ic_call_white_24"
           android:contentDescription="@string/description_dial_button"
-          app:elevation="@dimen/floating_action_button_translation_z"
-          app:backgroundTint="@color/dialpad_fab_green"/>
+          android:src="@drawable/quantum_ic_call_white_24"
+          android:visibility="invisible"
+          app:backgroundTint="@color/dialer_call_green"
+          app:elevation="@dimen/floating_action_button_translation_z"/>
     </RelativeLayout>
   </LinearLayout>
 </view>
diff --git a/java/com/android/dialer/dialpadview/res/layout-land/dialpad_key_one.xml b/java/com/android/dialer/dialpadview/res/layout-land/dialpad_key_one.xml
index 0a770c2..55bf092 100644
--- a/java/com/android/dialer/dialpadview/res/layout-land/dialpad_key_one.xml
+++ b/java/com/android/dialer/dialpadview/res/layout-land/dialpad_key_one.xml
@@ -46,7 +46,7 @@
           android:layout_height="@dimen/dialpad_voicemail_icon_size"
           android:scaleType="fitCenter"
           android:src="@drawable/quantum_ic_voicemail_white_24"
-          android:tint="@color/dialpad_voicemail_tint"/>
+          android:tint="?colorIcon"/>
     </LinearLayout>
 
     <!-- A placeholder to make the width the same as other dialpad keys. -->
diff --git a/java/com/android/dialer/dialpadview/res/layout/dialpad.xml b/java/com/android/dialer/dialpadview/res/layout/dialpad.xml
index 0061d54..fe4e286 100644
--- a/java/com/android/dialer/dialpadview/res/layout/dialpad.xml
+++ b/java/com/android/dialer/dialpadview/res/layout/dialpad.xml
@@ -96,6 +96,7 @@
     <Space style="@style/DialpadSpaceStyle"/>
   </LinearLayout>
   <Space
+      android:id="@+id/end_call_space"
       android:layout_width="match_parent"
       android:layout_height="?attr/dialpad_end_key_spacing"/>
 </LinearLayout>
diff --git a/java/com/android/dialer/dialpadview/res/layout/dialpad_chooser_list_item.xml b/java/com/android/dialer/dialpadview/res/layout/dialpad_chooser_list_item.xml
index e005296..43df76f 100644
--- a/java/com/android/dialer/dialpadview/res/layout/dialpad_chooser_list_item.xml
+++ b/java/com/android/dialer/dialpadview/res/layout/dialpad_chooser_list_item.xml
@@ -33,6 +33,5 @@
     android:layout_weight="1"
     android:layout_gravity="center_vertical"
     android:textAppearance="?android:attr/textAppearanceMedium"
-    android:textColor="@color/dialpad_primary_text_color"/>
-
+    android:textColor="?android:attr/colorPrimary"/>
 </LinearLayout>
diff --git a/java/com/android/dialer/dialpadview/res/layout/dialpad_fragment.xml b/java/com/android/dialer/dialpadview/res/layout/dialpad_fragment.xml
index 2e6b6ec..3497d2a 100644
--- a/java/com/android/dialer/dialpadview/res/layout/dialpad_fragment.xml
+++ b/java/com/android/dialer/dialpadview/res/layout/dialpad_fragment.xml
@@ -46,7 +46,7 @@
         android:id="@+id/dialpadChooser"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@color/background_dialer_light"
+        android:background="?android:attr/colorBackgroundFloating"
         android:visibility="gone"/>
 
   </LinearLayout>
@@ -66,8 +66,9 @@
       android:layout_centerHorizontal="true"
       android:contentDescription="@string/description_dial_button"
       android:src="@drawable/quantum_ic_call_vd_theme_24"
-      android:tint="#ffffff"
-      app:backgroundTint="@color/dialpad_fab_green"
-      app:colorControlNormal="#ffffff"
+      android:tint="?colorIconOnUnthemedDarkBackground"
+      android:visibility="invisible"
+      app:backgroundTint="@color/dialer_call_green"
+      app:colorControlNormal="?colorIconOnUnthemedDarkBackground"
       app:elevation="@dimen/floating_action_button_translation_z"/>
 </view>
diff --git a/java/com/android/dialer/dialpadview/res/layout/dialpad_key_one.xml b/java/com/android/dialer/dialpadview/res/layout/dialpad_key_one.xml
index 599c2d8..0d8a0f0 100644
--- a/java/com/android/dialer/dialpadview/res/layout/dialpad_key_one.xml
+++ b/java/com/android/dialer/dialpadview/res/layout/dialpad_key_one.xml
@@ -46,7 +46,7 @@
           android:layout_height="@dimen/dialpad_voicemail_icon_size"
           android:scaleType="fitCenter"
           android:src="@drawable/quantum_ic_voicemail_white_24"
-          android:tint="?attr/dialpad_voicemail_tint"/>
+          android:tint="?colorIcon"/>
     </LinearLayout>
   </LinearLayout>
 </com.android.dialer.dialpadview.DialpadKeyButton>
diff --git a/java/com/android/dialer/dialpadview/res/layout/dialpad_view_unthemed.xml b/java/com/android/dialer/dialpadview/res/layout/dialpad_view_unthemed.xml
index 13c11f1..9953fa3 100644
--- a/java/com/android/dialer/dialpadview/res/layout/dialpad_view_unthemed.xml
+++ b/java/com/android/dialer/dialpadview/res/layout/dialpad_view_unthemed.xml
@@ -13,9 +13,8 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<view xmlns:android="http://schemas.android.com/apk/res/android"
+<com.android.dialer.dialpadview.DialpadView xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/dialpad_view"
-    class="com.android.dialer.dialpadview.DialpadView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:layout_gravity="bottom"
@@ -82,7 +81,7 @@
         android:contentDescription="@string/description_dialpad_back"
         android:gravity="center"
         android:src="@drawable/quantum_ic_close_white_24"
-        android:tint="?attr/dialpad_icon_tint"
+        android:tint="?colorIcon"
         android:tintMode="src_in"
         android:visibility="gone"/>
 
@@ -97,32 +96,42 @@
         android:contentDescription="@string/description_dialpad_overflow"
         android:gravity="center"
         android:src="@drawable/quantum_ic_more_vert_white_24"
-        android:tint="?attr/dialpad_icon_tint"
+        android:tint="?colorIcon"
         android:tintMode="src_in"
         android:visibility="gone"/>
-
-    <view xmlns:ex="http://schemas.android.com/apk/res-auto"
-        android:id="@+id/digits"
-        class="com.android.dialer.dialpadview.DigitsEditText"
-        android:textStyle="normal"
-        android:layout_width="0dp"
-        android:layout_height="match_parent"
-        android:layout_weight="1"
-        android:background="@android:color/transparent"
-        android:cursorVisible="false"
-        android:focusableInTouchMode="true"
-        android:fontFamily="sans-serif"
-        android:freezesText="true"
-        android:gravity="center"
-        android:importantForAutofill="no"
-        android:maxLines="1"
-        android:scrollHorizontally="true"
-        android:singleLine="true"
-        android:textColor="?attr/dialpad_text_color"
-        android:textCursorDrawable="@null"
-        android:textSize="?attr/dialpad_digits_adjustable_text_size"
-        ex:resizing_text_min_size="@dimen/dialpad_digits_text_min_size"/>
-
+      <FrameLayout android:layout_width="0dp"
+          android:layout_height="match_parent"
+          android:layout_weight="1">
+        <TextView android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:id="@+id/digits_hint"
+            android:focusable="false"
+            android:gravity="center"
+            android:textSize="14sp"
+            android:textColor="?colorIcon"
+            android:visibility="gone"
+          />
+        <com.android.dialer.dialpadview.DigitsEditText
+            xmlns:ex="http://schemas.android.com/apk/res-auto"
+            android:id="@+id/digits"
+            android:textStyle="normal"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@android:color/transparent"
+            android:cursorVisible="false"
+            android:focusableInTouchMode="true"
+            android:fontFamily="sans-serif"
+            android:freezesText="true"
+            android:gravity="center"
+            android:importantForAutofill="no"
+            android:maxLines="1"
+            android:scrollHorizontally="true"
+            android:singleLine="true"
+            android:textColor="?attr/dialpad_text_color"
+            android:textCursorDrawable="@null"
+            android:textSize="?attr/dialpad_digits_adjustable_text_size"
+            ex:resizing_text_min_size="@dimen/dialpad_digits_text_min_size"/>
+      </FrameLayout>
     <ImageButton
         android:id="@+id/deleteButton"
         android:layout_width="wrap_content"
@@ -133,7 +142,7 @@
         android:contentDescription="@string/description_delete_button"
         android:src="@drawable/quantum_ic_backspace_white_24"
         android:state_enabled="false"
-        android:tint="?attr/dialpad_icon_tint"
+        android:tint="?colorIcon"
         android:tintMode="src_in"/>
   </LinearLayout>
 
@@ -152,4 +161,4 @@
       android:layout_width="match_parent"
       android:layout_height="@dimen/dialpad_space_below_keys"/>
 
-</view>
+</com.android.dialer.dialpadview.DialpadView>
diff --git a/java/com/android/dialer/dialpadview/res/values-af/strings.xml b/java/com/android/dialer/dialpadview/res/values-af/strings.xml
index c5c72e0..0e55e31 100644
--- a/java/com/android/dialer/dialpadview/res/values-af/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-af/strings.xml
@@ -1,39 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_dialpad_back" msgid="6226488105558971135">"Gaan terug"</string>
-    <string name="description_dialpad_overflow" msgid="5984341386518189787">"Meer opsies"</string>
-    <string name="description_delete_button" msgid="8431313818404527096">"backspace"</string>
-    <string name="description_image_button_plus" msgid="8936338119824589388">"plus"</string>
-    <string name="description_voicemail_button" msgid="4187006295368768215">"stemboodskap"</string>
-    <string name="description_dial_button" msgid="6826108965053146374">"bel"</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"Om stemboodskapdiens te bel, skakel eers vliegtuigmodus af."</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"Om stemboodskapdiens op te stel, gaan na Kieslys &gt; Instellings."</string>
-    <string name="add_2sec_pause" msgid="395591627218789322">"Voeg 2-sek.-pouse by"</string>
-    <string name="add_wait" msgid="2278146476349811062">"Voeg wagtyd by"</string>
-    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"Gebruik raak-nommerbord"</string>
-    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"Keer terug na oproep wat besig is"</string>
-    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"Voeg oproep by"</string>
-    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
-    <string name="meid" msgid="5274167198744847659">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"Laai tans van SIM-kaart af …"</string>
-    <string name="simContacts_title" msgid="8972942600800349990">"SIM-kaartkontakte"</string>
-    <string name="menu_callNumber" msgid="1898333075466418368">"Bel <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"Kan nie hierdie nommer bel nie"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_dialpad_back">Gaan terug</string>
+  <string name="description_dialpad_overflow">Meer opsies</string>
+  <string name="description_delete_button">backspace</string>
+  <string name="description_image_button_plus">belblok-plus</string>
+  <string name="description_voicemail_button">bel stemboodskapdiens</string>
+  <string name="description_dial_button">bel</string>
+  <string name="dialog_voicemail_airplane_mode_message">Om stemboodskapdiens te bel, skakel eers vliegtuigmodus af.</string>
+  <string name="dialog_voicemail_not_ready_message">Om stemboodskapdiens op te stel, gaan na Kieslys &gt; Instellings.</string>
+  <string name="add_2sec_pause">Voeg 2-sek.-pouse by</string>
+  <string name="add_wait">Voeg wagtyd by</string>
+  <string name="dialer_useDtmfDialpad">Gebruik raak-nommerbord</string>
+  <string name="dialer_returnToInCallScreen">Keer terug na oproep wat besig is</string>
+  <string name="dialer_addAnotherCall">Voeg oproep by</string>
+  <string name="imei">IMEI</string>
+  <string name="meid">MEID</string>
+  <string name="simContacts_emptyLoading">Laai tans van SIM-kaart af …</string>
+  <string name="simContacts_title">SIM-kaartkontakte</string>
+  <string name="menu_callNumber">Bel %s</string>
+  <string name="dialpad_hint_emergency_calling_not_available">Kan nie noodoproepe oor Wi-Fi maak nie</string>
+  <string msgid="4313552620858880999" name="dialog_phone_call_prohibited_message">Kan nie hierdie nommer bel nie</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-am/strings.xml b/java/com/android/dialer/dialpadview/res/values-am/strings.xml
index efbdb1d..6a72de5 100644
--- a/java/com/android/dialer/dialpadview/res/values-am/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-am/strings.xml
@@ -1,39 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_dialpad_back" msgid="6226488105558971135">"ወደኋላ ያስሱ"</string>
-    <string name="description_dialpad_overflow" msgid="5984341386518189787">"ተጨማሪ አማራጮች"</string>
-    <string name="description_delete_button" msgid="8431313818404527096">"የኋሊት ደምሳሽ"</string>
-    <string name="description_image_button_plus" msgid="8936338119824589388">"የመደመር ምልክት"</string>
-    <string name="description_voicemail_button" msgid="4187006295368768215">"የድምፅ መልዕክት"</string>
-    <string name="description_dial_button" msgid="6826108965053146374">"ይደውሉ"</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"የድምጽ መልዕክት ጥሪ ለማድረግ፣ በመጀመሪያ የአውሮፕላን ሁነታን ያጥፉ።"</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"የድምጽ መልዕክትን ለማዘጋጀት፣ ወደ ምናሌ &gt; ቅንብሮች ይሂዱ።"</string>
-    <string name="add_2sec_pause" msgid="395591627218789322">"2 ሴኮንድ ፋታ አክል"</string>
-    <string name="add_wait" msgid="2278146476349811062">"ቆይታ አክል"</string>
-    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"ባለድምጽ የንኪ ቁልፍ ሰሌዳን ይጠቀሙ"</string>
-    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"በመካሄድ ላይ ወዳለው ጥሪ ተመለስ"</string>
-    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"ጥሪ አክል"</string>
-    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
-    <string name="meid" msgid="5274167198744847659">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"ከSIM ካርድ ላይ በመጫን ላይ…"</string>
-    <string name="simContacts_title" msgid="8972942600800349990">"የSIM ካርድ ዕውቂያዎች"</string>
-    <string name="menu_callNumber" msgid="1898333075466418368">"ወደ <xliff:g id="NUMBER">%s</xliff:g> ደውል"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"ይህን ቁጥር መደወል አልተቻለም"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_dialpad_back">ወደኋላ ያስሱ</string>
+  <string name="description_dialpad_overflow">ተጨማሪ አማራጮች</string>
+  <string name="description_delete_button">የኋሊት ደምሳሽ</string>
+  <string name="description_image_button_plus">መደመር ይደውሉ</string>
+  <string name="description_voicemail_button">የድምፅ መልዕክት ይደውሉ</string>
+  <string name="description_dial_button">ይደውሉ</string>
+  <string name="dialog_voicemail_airplane_mode_message">የድምጽ መልዕክት ጥሪ ለማድረግ፣ በመጀመሪያ የአውሮፕላን ሁነታን ያጥፉ።</string>
+  <string name="dialog_voicemail_not_ready_message">የድምጽ መልዕክትን ለማዘጋጀት፣ ወደ ምናሌ &gt; ቅንብሮች ይሂዱ።</string>
+  <string name="add_2sec_pause">2 ሴኮንድ ፋታ አክል</string>
+  <string name="add_wait">ቆይታ አክል</string>
+  <string name="dialer_useDtmfDialpad">ባለ ንኪ-ድምጽ የቁልፍ ሰሌዳ ይጠቀሙ</string>
+  <string name="dialer_returnToInCallScreen">በመካሄድ ላይ ወዳለው ጥሪ ተመለስ</string>
+  <string name="dialer_addAnotherCall">ጥሪ አክል</string>
+  <string name="imei">IMEI</string>
+  <string name="meid">MEID</string>
+  <string name="simContacts_emptyLoading">ከSIM ካርድ ላይ በመጫን ላይ…</string>
+  <string name="simContacts_title">የSIM ካርድ ዕውቂያዎች</string>
+  <string name="menu_callNumber">ወደ %s ደውል</string>
+  <string name="dialpad_hint_emergency_calling_not_available">በWi‑Fi በኩል የአደጋ ጊዜ ጥሪዎችን ማድረግ አይቻልም</string>
+  <string msgid="4313552620858880999" name="dialog_phone_call_prohibited_message">ይህን ቁጥር መደወል አልተቻለም</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-ar/strings.xml b/java/com/android/dialer/dialpadview/res/values-ar/strings.xml
index 649280a..8878403 100644
--- a/java/com/android/dialer/dialpadview/res/values-ar/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-ar/strings.xml
@@ -1,39 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_dialpad_back" msgid="6226488105558971135">"الرجوع"</string>
-    <string name="description_dialpad_overflow" msgid="5984341386518189787">"مزيد من الخيارات"</string>
-    <string name="description_delete_button" msgid="8431313818404527096">"مسافة للخلف"</string>
-    <string name="description_image_button_plus" msgid="8936338119824589388">"علامة الجمع"</string>
-    <string name="description_voicemail_button" msgid="4187006295368768215">"بريد صوتي"</string>
-    <string name="description_dial_button" msgid="6826108965053146374">"طلب"</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"للاتصال بالبريد الصوتي، يجب أولاً إيقاف وضع الطائرة."</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"لإعداد البريد الصوتي، انتقل إلى القائمة &gt; الإعدادات."</string>
-    <string name="add_2sec_pause" msgid="395591627218789322">"إضافة ثانيتين إيقاف مؤقت"</string>
-    <string name="add_wait" msgid="2278146476349811062">"إضافة انتظار"</string>
-    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"استخدام لوحة مفاتيح نغمات باللمس"</string>
-    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"عودة إلى المكالمة الجارية"</string>
-    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"إضافة مكالمة"</string>
-    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
-    <string name="meid" msgid="5274167198744847659">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"‏جارٍ التحميل من شريحة SIM…"</string>
-    <string name="simContacts_title" msgid="8972942600800349990">"‏شريحة SIM وجهات الاتصال"</string>
-    <string name="menu_callNumber" msgid="1898333075466418368">"الاتصال بالرقم <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"لا يمكن الاتصال بهذا الرقم"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_dialpad_back">الرجوع</string>
+  <string name="description_dialpad_overflow">مزيد من الخيارات</string>
+  <string name="description_delete_button">مسافة للخلف</string>
+  <string name="description_image_button_plus">طلب علامة الجمع</string>
+  <string name="description_voicemail_button">اتصال بالبريد الصوتي</string>
+  <string name="description_dial_button">طلب</string>
+  <string name="dialog_voicemail_airplane_mode_message">للاتصال بالبريد الصوتي، يجب أولاً إيقاف وضع الطائرة.</string>
+  <string name="dialog_voicemail_not_ready_message">لإعداد البريد الصوتي، انتقل إلى القائمة &gt; الإعدادات.</string>
+  <string name="add_2sec_pause">إضافة ثانيتين إيقاف مؤقت</string>
+  <string name="add_wait">إضافة انتظار</string>
+  <string name="dialer_useDtmfDialpad">استخدام لوحة مفاتيح نغمات باللمس</string>
+  <string name="dialer_returnToInCallScreen">عودة إلى المكالمة الجارية</string>
+  <string name="dialer_addAnotherCall">إضافة مكالمة</string>
+  <string name="imei">IMEI</string>
+  <string name="meid">MEID</string>
+  <string name="simContacts_emptyLoading">‏جارٍ التحميل من شريحة SIM…</string>
+  <string name="simContacts_title">‏شريحة SIM وجهات الاتصال</string>
+  <string name="menu_callNumber">الاتصال بالرقم %s</string>
+  <string name="dialpad_hint_emergency_calling_not_available">‏يتعذّر إجراء مكالمات طوارئ عبر WiFi.</string>
+  <string msgid="4313552620858880999" name="dialog_phone_call_prohibited_message">لا يمكن الاتصال بهذا الرقم</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-az/strings.xml b/java/com/android/dialer/dialpadview/res/values-az/strings.xml
index 8de688d..1c2bf36 100644
--- a/java/com/android/dialer/dialpadview/res/values-az/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-az/strings.xml
@@ -1,39 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_dialpad_back" msgid="6226488105558971135">"Geri naviqasiya edin"</string>
-    <string name="description_dialpad_overflow" msgid="5984341386518189787">"Daha çox seçim"</string>
-    <string name="description_delete_button" msgid="8431313818404527096">"geri düyməsi"</string>
-    <string name="description_image_button_plus" msgid="8936338119824589388">"plus"</string>
-    <string name="description_voicemail_button" msgid="4187006295368768215">"səsli məktub"</string>
-    <string name="description_dial_button" msgid="6826108965053146374">"nömrə yığın"</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"Səsli e-poçta zəng etmək üçün Təyyarə rejimini deaktiv edin."</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"Səsli e-poçtu ayarlamaq üçün Menyu &gt; Ayarlar bölməsinə daxil olun."</string>
-    <string name="add_2sec_pause" msgid="395591627218789322">"2 saniyəlik pauza əlavə edin"</string>
-    <string name="add_wait" msgid="2278146476349811062">"Gözləmə əlavə edin"</string>
-    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"Toxunuş ton klaviaturasından istifadə edin"</string>
-    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"Davam edən zəngə qayıdın"</string>
-    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"Zəng əlavə edin"</string>
-    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
-    <string name="meid" msgid="5274167198744847659">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"SIM kartdan yüklənir..."</string>
-    <string name="simContacts_title" msgid="8972942600800349990">"SIM kart kontaktları"</string>
-    <string name="menu_callNumber" msgid="1898333075466418368">"<xliff:g id="NUMBER">%s</xliff:g> nömrəsinə zəng edin"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"Bu nömrəyə zəng etmək mümkün deyil"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_dialpad_back">Geri naviqasiya edin</string>
+  <string name="description_dialpad_overflow">Daha çox seçim</string>
+  <string name="description_delete_button">geri düyməsi</string>
+  <string name="description_image_button_plus">üstəgəl işarəsini yığın</string>
+  <string name="description_voicemail_button">səsli e-poçta zəng edin</string>
+  <string name="description_dial_button">nömrə yığın</string>
+  <string name="dialog_voicemail_airplane_mode_message">Səsli e-poçta zəng etmək üçün Təyyarə rejimini deaktiv edin.</string>
+  <string name="dialog_voicemail_not_ready_message">Səsli e-poçtu ayarlamaq üçün Menyu &gt; Ayarlar bölməsinə daxil olun.</string>
+  <string name="add_2sec_pause">2 saniyəlik pauza əlavə edin</string>
+  <string name="add_wait">Gözləmə əlavə edin</string>
+  <string name="dialer_useDtmfDialpad">Düyməli klaviaturadan istifadə edin</string>
+  <string name="dialer_returnToInCallScreen">Davam edən zəngə qayıdın</string>
+  <string name="dialer_addAnotherCall">Zəng əlavə edin</string>
+  <string name="imei">IMEI</string>
+  <string name="meid">MEID</string>
+  <string name="simContacts_emptyLoading">SIM kartdan yüklənir...</string>
+  <string name="simContacts_title">SIM kart kontaktları</string>
+  <string name="menu_callNumber">%s nömrəsinə zəng edin</string>
+  <string name="dialpad_hint_emergency_calling_not_available">Wi‑Fi vasitəsilə təcili zənglər etmək mümkün deyil</string>
+  <string msgid="4313552620858880999" name="dialog_phone_call_prohibited_message">Bu nömrəyə zəng etmək mümkün deyil</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-b+sr+Latn/strings.xml b/java/com/android/dialer/dialpadview/res/values-b+sr+Latn/strings.xml
index c15aee4..f9986cb 100644
--- a/java/com/android/dialer/dialpadview/res/values-b+sr+Latn/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-b+sr+Latn/strings.xml
@@ -1,39 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_dialpad_back" msgid="6226488105558971135">"Idite nazad"</string>
-    <string name="description_dialpad_overflow" msgid="5984341386518189787">"Još opcija"</string>
-    <string name="description_delete_button" msgid="8431313818404527096">"backspace"</string>
-    <string name="description_image_button_plus" msgid="8936338119824589388">"plus"</string>
-    <string name="description_voicemail_button" msgid="4187006295368768215">"govorna pošta"</string>
-    <string name="description_dial_button" msgid="6826108965053146374">"birajte broj"</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"Da biste pozvali govornu poštu, prvo isključite režim rada u avionu."</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"Da biste podesili govornu poštu, idite u Meni &gt; Podešavanja."</string>
-    <string name="add_2sec_pause" msgid="395591627218789322">"Dodaj pauzu od 2 sekunde"</string>
-    <string name="add_wait" msgid="2278146476349811062">"Dodaj čekanje"</string>
-    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"Koristi tastaturu za tonsko biranje"</string>
-    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"Nazad u poziv koji je u toku"</string>
-    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"Dodaj poziv"</string>
-    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
-    <string name="meid" msgid="5274167198744847659">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"Učitava se sa SIM kartice…"</string>
-    <string name="simContacts_title" msgid="8972942600800349990">"Kontakti na SIM kartici"</string>
-    <string name="menu_callNumber" msgid="1898333075466418368">"Pozovi <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"Nije moguće pozvati ovaj broj"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_dialpad_back">Idite nazad</string>
+  <string name="description_dialpad_overflow">Još opcija</string>
+  <string name="description_delete_button">backspace</string>
+  <string name="description_image_button_plus">unesite plus</string>
+  <string name="description_voicemail_button">pozovite govornu poštu</string>
+  <string name="description_dial_button">birajte broj</string>
+  <string name="dialog_voicemail_airplane_mode_message">Da biste pozvali govornu poštu, prvo isključite režim rada u avionu.</string>
+  <string name="dialog_voicemail_not_ready_message">Da biste podesili govornu poštu, idite u Meni &gt; Podešavanja.</string>
+  <string name="add_2sec_pause">Dodaj pauzu od 2 sekunde</string>
+  <string name="add_wait">Dodaj čekanje</string>
+  <string name="dialer_useDtmfDialpad">Koristi tastaturu za tonsko biranje</string>
+  <string name="dialer_returnToInCallScreen">Nazad u poziv koji je u toku</string>
+  <string name="dialer_addAnotherCall">Dodaj poziv</string>
+  <string name="imei">IMEI</string>
+  <string name="meid">MEID</string>
+  <string name="simContacts_emptyLoading">Učitava se sa SIM kartice…</string>
+  <string name="simContacts_title">Kontakti na SIM kartici</string>
+  <string name="menu_callNumber">Pozovi %s</string>
+  <string name="dialpad_hint_emergency_calling_not_available">Ne možete da upućujete hitne pozive preko Wi‑Fi-ja</string>
+  <string msgid="4313552620858880999" name="dialog_phone_call_prohibited_message">Nije moguće pozvati ovaj broj</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-be/strings.xml b/java/com/android/dialer/dialpadview/res/values-be/strings.xml
index cbe85f5..829ccf6 100644
--- a/java/com/android/dialer/dialpadview/res/values-be/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-be/strings.xml
@@ -1,39 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_dialpad_back" msgid="6226488105558971135">"Перайсці назад"</string>
-    <string name="description_dialpad_overflow" msgid="5984341386518189787">"Дадатковыя параметры"</string>
-    <string name="description_delete_button" msgid="8431313818404527096">"backspace"</string>
-    <string name="description_image_button_plus" msgid="8936338119824589388">"плюс"</string>
-    <string name="description_voicemail_button" msgid="4187006295368768215">"галасавая пошта"</string>
-    <string name="description_dial_button" msgid="6826108965053146374">"набор"</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"Каб пазваніць на галасавую пошту, спачатку адключыце Рэжым палёту."</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"Каб наладзіць галасавую пошту, перайдзіце ў раздзел \"Меню &gt; Налады\"."</string>
-    <string name="add_2sec_pause" msgid="395591627218789322">"Дадаць 2-секундную паўзу"</string>
-    <string name="add_wait" msgid="2278146476349811062">"Дадаць чаканне"</string>
-    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"Выкарыстанне тонавай клавіятуры"</string>
-    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"Вярнуцца да бягучага выкліку"</string>
-    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"Дадаць выклік"</string>
-    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
-    <string name="meid" msgid="5274167198744847659">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"Загрузка з SIM-карты..."</string>
-    <string name="simContacts_title" msgid="8972942600800349990">"Кантакты SIM-карты"</string>
-    <string name="menu_callNumber" msgid="1898333075466418368">"Выклікаць <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"Немагчыма выклікаць гэты нумар"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_dialpad_back">Перайсці назад</string>
+  <string name="description_dialpad_overflow">Дадатковыя параметры</string>
+  <string name="description_delete_button">backspace</string>
+  <string name="description_image_button_plus">дадаць сімвал \"плюс\"</string>
+  <string name="description_voicemail_button">выклікаць галасавую пошту</string>
+  <string name="description_dial_button">набор</string>
+  <string name="dialog_voicemail_airplane_mode_message">Каб пазваніць на галасавую пошту, спачатку адключыце Рэжым палёту.</string>
+  <string name="dialog_voicemail_not_ready_message">Каб наладзіць галасавую пошту, перайдзіце ў раздзел \"Меню &gt; Налады\".</string>
+  <string name="add_2sec_pause">Дадаць 2-секундную паўзу</string>
+  <string name="add_wait">Дадаць чаканне</string>
+  <string name="dialer_useDtmfDialpad">Выкарыстаць танальную клавіятуру</string>
+  <string name="dialer_returnToInCallScreen">Вярнуцца да бягучага выкліку</string>
+  <string name="dialer_addAnotherCall">Дадаць выклік</string>
+  <string name="imei">IMEI</string>
+  <string name="meid">MEID</string>
+  <string name="simContacts_emptyLoading">Загрузка з SIM-карты...</string>
+  <string name="simContacts_title">Кантакты SIM-карты</string>
+  <string name="menu_callNumber">Выклікаць %s</string>
+  <string name="dialpad_hint_emergency_calling_not_available">Экстранныя выклікі ў сетцы Wi‑Fi недаступныя</string>
+  <string msgid="4313552620858880999" name="dialog_phone_call_prohibited_message">Немагчыма выклікаць гэты нумар</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-bg/strings.xml b/java/com/android/dialer/dialpadview/res/values-bg/strings.xml
index 1188d79..1ccdcce 100644
--- a/java/com/android/dialer/dialpadview/res/values-bg/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-bg/strings.xml
@@ -1,39 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_dialpad_back" msgid="6226488105558971135">"Преминаване назад"</string>
-    <string name="description_dialpad_overflow" msgid="5984341386518189787">"Още опции"</string>
-    <string name="description_delete_button" msgid="8431313818404527096">"backspace"</string>
-    <string name="description_image_button_plus" msgid="8936338119824589388">"плюс"</string>
-    <string name="description_voicemail_button" msgid="4187006295368768215">"гласова поща"</string>
-    <string name="description_dial_button" msgid="6826108965053146374">"набиране"</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"За да чуете гласовата си поща, първо изключете самолетния режим."</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"За да настроите гласовата поща, отворете „Меню“ &gt; „Настройки“."</string>
-    <string name="add_2sec_pause" msgid="395591627218789322">"Добавяне на пауза от 2 сек"</string>
-    <string name="add_wait" msgid="2278146476349811062">"Добавяне на изчакване"</string>
-    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"Използване на тонова клавиатура"</string>
-    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"Назад към текущото обаждане"</string>
-    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"Добавяне на обаждане"</string>
-    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
-    <string name="meid" msgid="5274167198744847659">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"Зарежда се от SIM картата…"</string>
-    <string name="simContacts_title" msgid="8972942600800349990">"Контакти от SIM картата"</string>
-    <string name="menu_callNumber" msgid="1898333075466418368">"Обаждане на <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"Не можете да се обадите на този номер"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_dialpad_back">Преминаване назад</string>
+  <string name="description_dialpad_overflow">Още опции</string>
+  <string name="description_delete_button">backspace</string>
+  <string name="description_image_button_plus">въвеждане на плюс</string>
+  <string name="description_voicemail_button">обаждане до гласовата поща</string>
+  <string name="description_dial_button">набиране</string>
+  <string name="dialog_voicemail_airplane_mode_message">За да чуете гласовата си поща, първо изключете самолетния режим.</string>
+  <string name="dialog_voicemail_not_ready_message">За да настроите гласовата поща, отворете „Меню“ &gt; „Настройки“.</string>
+  <string name="add_2sec_pause">Добавяне на пауза от 2 сек</string>
+  <string name="add_wait">Добавяне на изчакване</string>
+  <string name="dialer_useDtmfDialpad">Използване на тонална клавиатура</string>
+  <string name="dialer_returnToInCallScreen">Назад към текущото обаждане</string>
+  <string name="dialer_addAnotherCall">Добавяне на обаждане</string>
+  <string name="imei">IMEI</string>
+  <string name="meid">MEID</string>
+  <string name="simContacts_emptyLoading">Зарежда се от SIM картата…</string>
+  <string name="simContacts_title">Контакти от SIM картата</string>
+  <string name="menu_callNumber">Обаждане на %s</string>
+  <string name="dialpad_hint_emergency_calling_not_available">Не може да се извършват спешни обаждания през Wi-Fi</string>
+  <string msgid="4313552620858880999" name="dialog_phone_call_prohibited_message">Не можете да се обадите на този номер</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-bn/strings.xml b/java/com/android/dialer/dialpadview/res/values-bn/strings.xml
index cc44a27..ff18b17 100644
--- a/java/com/android/dialer/dialpadview/res/values-bn/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-bn/strings.xml
@@ -1,39 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_dialpad_back" msgid="6226488105558971135">"পিছনে যান"</string>
-    <string name="description_dialpad_overflow" msgid="5984341386518189787">"আরও বিকল্প"</string>
-    <string name="description_delete_button" msgid="8431313818404527096">"ব্যাক-স্পেস"</string>
-    <string name="description_image_button_plus" msgid="8936338119824589388">"যোগ চিহ্ন"</string>
-    <string name="description_voicemail_button" msgid="4187006295368768215">"ভয়েসমেল"</string>
-    <string name="description_dial_button" msgid="6826108965053146374">"ডায়াল করুন"</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"ভয়েসমেলে কল করতে, সবার আগে বিমানমোড বন্ধ করুন৷"</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"ভয়েসমেল সেট-আপ করতে, মেনু &gt; সেটিংসে যান৷"</string>
-    <string name="add_2sec_pause" msgid="395591627218789322">"২-সেকেন্ড বিরতি যোগ করুন"</string>
-    <string name="add_wait" msgid="2278146476349811062">"অপেক্ষা যোগ করুন"</string>
-    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"টাচ-টোন কীপ্যাড ব্যবহার করুন"</string>
-    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"আগের কলে ফিরে যান"</string>
-    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"কল যোগ করুন"</string>
-    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
-    <string name="meid" msgid="5274167198744847659">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"সিম কার্ড থেকে লোড করা হচ্ছে…"</string>
-    <string name="simContacts_title" msgid="8972942600800349990">"সিম কার্ডের পরিচিতিগুলি"</string>
-    <string name="menu_callNumber" msgid="1898333075466418368">"<xliff:g id="NUMBER">%s</xliff:g> নম্বরে কল করুন"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"এই নম্বরে কল করা যাবে না"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_dialpad_back">পিছনে যান</string>
+  <string name="description_dialpad_overflow">আরও বিকল্প</string>
+  <string name="description_delete_button">ব্যাক-স্পেস</string>
+  <string name="description_image_button_plus">ডায়াল প্লাস</string>
+  <string name="description_voicemail_button">ভয়েসমেলে কল করুন</string>
+  <string name="description_dial_button">ডায়াল করুন</string>
+  <string name="dialog_voicemail_airplane_mode_message">ভয়েসমেলে কল করতে, সবার আগে বিমানমোড বন্ধ করুন৷</string>
+  <string name="dialog_voicemail_not_ready_message">ভয়েসমেল সেট-আপ করতে, মেনু &gt; সেটিংসে যান৷</string>
+  <string name="add_2sec_pause">২-সেকেন্ড বিরতি যোগ করুন</string>
+  <string name="add_wait">অপেক্ষা যোগ করুন</string>
+  <string name="dialer_useDtmfDialpad">টাচ-টোন কীপ্যাড ব্যবহার করুন</string>
+  <string name="dialer_returnToInCallScreen">আগের কলে ফিরে যান</string>
+  <string name="dialer_addAnotherCall">কল যোগ করুন</string>
+  <string name="imei">IMEI</string>
+  <string name="meid">MEID</string>
+  <string name="simContacts_emptyLoading">সিম কার্ড থেকে লোড করা হচ্ছে…</string>
+  <string name="simContacts_title">সিম কার্ডের পরিচিতিগুলি</string>
+  <string name="menu_callNumber">%s নম্বরে কল করুন</string>
+  <string name="dialpad_hint_emergency_calling_not_available">ওয়াই-ফাইয়ের মাধ্যমে জরুরি কল করা যাবে না</string>
+  <string msgid="4313552620858880999" name="dialog_phone_call_prohibited_message">এই নম্বরে কল করা যাবে না</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-bs/strings.xml b/java/com/android/dialer/dialpadview/res/values-bs/strings.xml
index 4c0527b..404a052 100644
--- a/java/com/android/dialer/dialpadview/res/values-bs/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-bs/strings.xml
@@ -1,39 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_dialpad_back" msgid="6226488105558971135">"Vrati se nazad"</string>
-    <string name="description_dialpad_overflow" msgid="5984341386518189787">"Više opcija"</string>
-    <string name="description_delete_button" msgid="8431313818404527096">"tipka za brisanje"</string>
-    <string name="description_image_button_plus" msgid="8936338119824589388">"plus"</string>
-    <string name="description_voicemail_button" msgid="4187006295368768215">"govorna pošta"</string>
-    <string name="description_dial_button" msgid="6826108965053146374">"biranje"</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"Da pozovete govornu poštu, isključite Način rada u avionu."</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"Da postavite govornu poštu, idite na Meni &gt; Postavke."</string>
-    <string name="add_2sec_pause" msgid="395591627218789322">"Dodajte pauzu od 2 sekunde"</string>
-    <string name="add_wait" msgid="2278146476349811062">"Dodajte čekanje"</string>
-    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"Korištenje tastature za tonsko biranje"</string>
-    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"Povratak na poziv"</string>
-    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"Dodajte poziv"</string>
-    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
-    <string name="meid" msgid="5274167198744847659">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"Učitavanje sa SIM kartice…"</string>
-    <string name="simContacts_title" msgid="8972942600800349990">"Kontakti sa SIM kartice"</string>
-    <string name="menu_callNumber" msgid="1898333075466418368">"Pozivanje broja <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"Nije moguće pozvati ovaj broj"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_dialpad_back">Vrati se nazad</string>
+  <string name="description_dialpad_overflow">Više opcija</string>
+  <string name="description_delete_button">tipka za brisanje</string>
+  <string name="description_image_button_plus">dodavanje znaka plus</string>
+  <string name="description_voicemail_button">pozivanje govorne pošte</string>
+  <string name="description_dial_button">biranje</string>
+  <string name="dialog_voicemail_airplane_mode_message">Da pozovete govornu poštu, isključite Način rada u avionu.</string>
+  <string name="dialog_voicemail_not_ready_message">Da postavite govornu poštu, idite na Meni &gt; Postavke.</string>
+  <string name="add_2sec_pause">Dodajte pauzu od 2 sekunde</string>
+  <string name="add_wait">Dodajte čekanje</string>
+  <string name="dialer_useDtmfDialpad">Korištenje tastature za tonsko biranje</string>
+  <string name="dialer_returnToInCallScreen">Povratak na poziv</string>
+  <string name="dialer_addAnotherCall">Dodajte poziv</string>
+  <string name="imei">IMEI</string>
+  <string name="meid">MEID</string>
+  <string name="simContacts_emptyLoading">Učitavanje sa SIM kartice…</string>
+  <string name="simContacts_title">Kontakti sa SIM kartice</string>
+  <string name="menu_callNumber">Pozivanje broja %s</string>
+  <string name="dialpad_hint_emergency_calling_not_available">Nije moguće uspostaviti hitne pozive putem WiFi-ja</string>
+  <string msgid="4313552620858880999" name="dialog_phone_call_prohibited_message">Nije moguće pozvati ovaj broj</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-ca/strings.xml b/java/com/android/dialer/dialpadview/res/values-ca/strings.xml
index eda95b4..31695af 100644
--- a/java/com/android/dialer/dialpadview/res/values-ca/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-ca/strings.xml
@@ -1,39 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_dialpad_back" msgid="6226488105558971135">"Torna enrere"</string>
-    <string name="description_dialpad_overflow" msgid="5984341386518189787">"Més opcions"</string>
-    <string name="description_delete_button" msgid="8431313818404527096">"retrocés"</string>
-    <string name="description_image_button_plus" msgid="8936338119824589388">"més"</string>
-    <string name="description_voicemail_button" msgid="4187006295368768215">"missatge de veu"</string>
-    <string name="description_dial_button" msgid="6826108965053146374">"marca"</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"Per trucar a la bústia de veu, primer has de desactivar el mode d\'avió."</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"Per configurar la bústia de veu, ves a Menú &gt; Configuració."</string>
-    <string name="add_2sec_pause" msgid="395591627218789322">"Afegeix una pausa de 2 segons"</string>
-    <string name="add_wait" msgid="2278146476349811062">"Afegeix una espera"</string>
-    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"Utilitza el teclat de tons"</string>
-    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"Torna a la trucada en curs"</string>
-    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"Afegeix una trucada"</string>
-    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
-    <string name="meid" msgid="5274167198744847659">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"S\'està carregant des de la targeta SIM..."</string>
-    <string name="simContacts_title" msgid="8972942600800349990">"Contactes de la targeta SIM"</string>
-    <string name="menu_callNumber" msgid="1898333075466418368">"Truca al <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"No es pot trucar a aquest número"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_dialpad_back">Torna enrere</string>
+  <string name="description_dialpad_overflow">Més opcions</string>
+  <string name="description_delete_button">retrocés</string>
+  <string name="description_image_button_plus">afegeix el signe +</string>
+  <string name="description_voicemail_button">truca a la bústia de veu</string>
+  <string name="description_dial_button">marca</string>
+  <string name="dialog_voicemail_airplane_mode_message">Per trucar a la bústia de veu, primer has de desactivar el mode d\'avió.</string>
+  <string name="dialog_voicemail_not_ready_message">Per configurar la bústia de veu, ves a Menú &gt; Configuració.</string>
+  <string name="add_2sec_pause">Afegeix una pausa de 2 segons</string>
+  <string name="add_wait">Afegeix una espera</string>
+  <string name="dialer_useDtmfDialpad">Utilitza el teclat de tons</string>
+  <string name="dialer_returnToInCallScreen">Torna a la trucada en curs</string>
+  <string name="dialer_addAnotherCall">Afegeix una trucada</string>
+  <string name="imei">IMEI</string>
+  <string name="meid">MEID</string>
+  <string name="simContacts_emptyLoading">S\'està carregant des de la targeta SIM...</string>
+  <string name="simContacts_title">Contactes de la targeta SIM</string>
+  <string name="menu_callNumber">Truca al %s</string>
+  <string name="dialpad_hint_emergency_calling_not_available">No es poden fer trucades d\'emergència per Wi-Fi</string>
+  <string msgid="4313552620858880999" name="dialog_phone_call_prohibited_message">No es pot trucar a aquest número</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-cs/strings.xml b/java/com/android/dialer/dialpadview/res/values-cs/strings.xml
index a97d213..458386e 100644
--- a/java/com/android/dialer/dialpadview/res/values-cs/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-cs/strings.xml
@@ -1,39 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_dialpad_back" msgid="6226488105558971135">"Přejít zpět"</string>
-    <string name="description_dialpad_overflow" msgid="5984341386518189787">"Více možností"</string>
-    <string name="description_delete_button" msgid="8431313818404527096">"Backspace"</string>
-    <string name="description_image_button_plus" msgid="8936338119824589388">"plus"</string>
-    <string name="description_voicemail_button" msgid="4187006295368768215">"hlasová zpráva"</string>
-    <string name="description_dial_button" msgid="6826108965053146374">"vytočit"</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"Pokud chcete volat do hlasové schránky, vypněte nejdříve režim letadla."</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"Pokud chcete nastavit hlasovou schránku, přejděte na nabídku &gt; Nastavení."</string>
-    <string name="add_2sec_pause" msgid="395591627218789322">"Přidat pauzu 2 s"</string>
-    <string name="add_wait" msgid="2278146476349811062">"Přidat čekání"</string>
-    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"Použít dotykovou tónovou klávesnici"</string>
-    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"Vrátit se k probíhajícímu hovoru"</string>
-    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"Přidat hovor"</string>
-    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
-    <string name="meid" msgid="5274167198744847659">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"Načítání ze SIM karty…"</string>
-    <string name="simContacts_title" msgid="8972942600800349990">"Kontakty na SIM kartě"</string>
-    <string name="menu_callNumber" msgid="1898333075466418368">"Zavolat <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"Na toto číslo není možné zavolat"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_dialpad_back">Přejít zpět</string>
+  <string name="description_dialpad_overflow">Více možností</string>
+  <string name="description_delete_button">Backspace</string>
+  <string name="description_image_button_plus">vytočit plus</string>
+  <string name="description_voicemail_button">volat do hlasové schránky</string>
+  <string name="description_dial_button">vytočit</string>
+  <string name="dialog_voicemail_airplane_mode_message">Pokud chcete volat do hlasové schránky, vypněte nejdříve režim letadla.</string>
+  <string name="dialog_voicemail_not_ready_message">Pokud chcete nastavit hlasovou schránku, přejděte na nabídku &gt; Nastavení.</string>
+  <string name="add_2sec_pause">Přidat pauzu 2 s</string>
+  <string name="add_wait">Přidat čekání</string>
+  <string name="dialer_useDtmfDialpad">Použít dotykovou tónovou klávesnici</string>
+  <string name="dialer_returnToInCallScreen">Vrátit se k probíhajícímu hovoru</string>
+  <string name="dialer_addAnotherCall">Přidat hovor</string>
+  <string name="imei">IMEI</string>
+  <string name="meid">MEID</string>
+  <string name="simContacts_emptyLoading">Načítání ze SIM karty…</string>
+  <string name="simContacts_title">Kontakty na SIM kartě</string>
+  <string name="menu_callNumber">Zavolat %s</string>
+  <string name="dialpad_hint_emergency_calling_not_available">Přes Wi‑Fi nelze uskutečňovat tísňová volání</string>
+  <string msgid="4313552620858880999" name="dialog_phone_call_prohibited_message">Na toto číslo není možné zavolat</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-da/strings.xml b/java/com/android/dialer/dialpadview/res/values-da/strings.xml
index 45eb872..7cec9e0 100644
--- a/java/com/android/dialer/dialpadview/res/values-da/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-da/strings.xml
@@ -1,39 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_dialpad_back" msgid="6226488105558971135">"Naviger tilbage"</string>
-    <string name="description_dialpad_overflow" msgid="5984341386518189787">"Flere valgmuligheder"</string>
-    <string name="description_delete_button" msgid="8431313818404527096">"tilbagetast"</string>
-    <string name="description_image_button_plus" msgid="8936338119824589388">"plus"</string>
-    <string name="description_voicemail_button" msgid="4187006295368768215">"telefonsvarer"</string>
-    <string name="description_dial_button" msgid="6826108965053146374">"ring op"</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"Hvis du vil ringe til telefonsvareren, skal du først slå Flytilstand fra."</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"Gå til Menu &gt; Indstillinger for at konfigurere telefonsvareren."</string>
-    <string name="add_2sec_pause" msgid="395591627218789322">"Tilføj pause på 2 sek."</string>
-    <string name="add_wait" msgid="2278146476349811062">"Tilføj ventetid"</string>
-    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"Brug trykknaptastatur"</string>
-    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"Vend tilbage til igangværende opkald"</string>
-    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"Tilføj opkald"</string>
-    <string name="imei" msgid="7961343816043247280">"IMEI-nummer"</string>
-    <string name="meid" msgid="5274167198744847659">"MEID-nummer"</string>
-    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"Der indlæses fra SIM-kortet…"</string>
-    <string name="simContacts_title" msgid="8972942600800349990">"Kontaktpersoner på SIM-kortet"</string>
-    <string name="menu_callNumber" msgid="1898333075466418368">"Ring til <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"Det er ikke muligt at ringe til dette nummer"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_dialpad_back">Naviger tilbage</string>
+  <string name="description_dialpad_overflow">Flere valgmuligheder</string>
+  <string name="description_delete_button">tilbagetast</string>
+  <string name="description_image_button_plus">tast plus</string>
+  <string name="description_voicemail_button">ring til telefonsvarer</string>
+  <string name="description_dial_button">ring op</string>
+  <string name="dialog_voicemail_airplane_mode_message">Hvis du vil ringe til telefonsvareren, skal du først slå Flytilstand fra.</string>
+  <string name="dialog_voicemail_not_ready_message">Gå til Menu &gt; Indstillinger for at konfigurere telefonsvareren.</string>
+  <string name="add_2sec_pause">Tilføj pause på 2 sek.</string>
+  <string name="add_wait">Tilføj ventetid</string>
+  <string name="dialer_useDtmfDialpad">Brug trykknaptastatur</string>
+  <string name="dialer_returnToInCallScreen">Vend tilbage til igangværende opkald</string>
+  <string name="dialer_addAnotherCall">Tilføj opkald</string>
+  <string name="imei">IMEI-nummer</string>
+  <string name="meid">MEID-nummer</string>
+  <string name="simContacts_emptyLoading">Der indlæses fra SIM-kortet…</string>
+  <string name="simContacts_title">Kontaktpersoner på SIM-kortet</string>
+  <string name="menu_callNumber">Ring til %s</string>
+  <string name="dialpad_hint_emergency_calling_not_available">Det er ikke muligt at foretage nødopkald via Wi‑Fi</string>
+  <string msgid="4313552620858880999" name="dialog_phone_call_prohibited_message">Det er ikke muligt at ringe til dette nummer</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-de/strings.xml b/java/com/android/dialer/dialpadview/res/values-de/strings.xml
index c350c94..eaeeac6 100644
--- a/java/com/android/dialer/dialpadview/res/values-de/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-de/strings.xml
@@ -1,39 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_dialpad_back" msgid="6226488105558971135">"Zurück"</string>
-    <string name="description_dialpad_overflow" msgid="5984341386518189787">"Mehr Optionen"</string>
-    <string name="description_delete_button" msgid="8431313818404527096">"Rücktaste"</string>
-    <string name="description_image_button_plus" msgid="8936338119824589388">"Plus"</string>
-    <string name="description_voicemail_button" msgid="4187006295368768215">"Mailboxnachricht"</string>
-    <string name="description_dial_button" msgid="6826108965053146374">"Wählen"</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"Deaktiviere zunächst den Flugmodus, um die Mailbox anzurufen."</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"Konfiguriere deine Mailbox unter \"Menü\" &gt; \"Einstellungen\"."</string>
-    <string name="add_2sec_pause" msgid="395591627218789322">"2 Sekunden Pause hinzufügen"</string>
-    <string name="add_wait" msgid="2278146476349811062">"Warten hinzufügen"</string>
-    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"Tonwahltasten verwenden"</string>
-    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"Zurück zum aktuellen Anruf"</string>
-    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"Anruf hinzufügen"</string>
-    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
-    <string name="meid" msgid="5274167198744847659">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"Ladevorgang von SIM-Karte läuft…"</string>
-    <string name="simContacts_title" msgid="8972942600800349990">"Kontakte auf SIM-Karte"</string>
-    <string name="menu_callNumber" msgid="1898333075466418368">"<xliff:g id="NUMBER">%s</xliff:g> anrufen"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"Diese Nummer kann nicht angerufen werden"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_dialpad_back">Zurück</string>
+  <string name="description_dialpad_overflow">Mehr Optionen</string>
+  <string name="description_delete_button">Rücktaste</string>
+  <string name="description_image_button_plus">Pluszeichen auf Wähltastatur</string>
+  <string name="description_voicemail_button">Mailbox anrufen</string>
+  <string name="description_dial_button">Wählen</string>
+  <string name="dialog_voicemail_airplane_mode_message">Deaktiviere zunächst den Flugmodus, um die Mailbox anzurufen.</string>
+  <string name="dialog_voicemail_not_ready_message">Konfiguriere deine Mailbox unter \"Menü\" &gt; \"Einstellungen\".</string>
+  <string name="add_2sec_pause">2 Sekunden Pause hinzufügen</string>
+  <string name="add_wait">Warten hinzufügen</string>
+  <string name="dialer_useDtmfDialpad">Tonwahltasten verwenden</string>
+  <string name="dialer_returnToInCallScreen">Zurück zum aktuellen Anruf</string>
+  <string name="dialer_addAnotherCall">Anruf hinzufügen</string>
+  <string name="imei">IMEI</string>
+  <string name="meid">MEID</string>
+  <string name="simContacts_emptyLoading">Ladevorgang von SIM-Karte läuft…</string>
+  <string name="simContacts_title">Kontakte auf SIM-Karte</string>
+  <string name="menu_callNumber">%s anrufen</string>
+  <string name="dialpad_hint_emergency_calling_not_available">Notrufe über WLAN nicht möglich</string>
+  <string msgid="4313552620858880999" name="dialog_phone_call_prohibited_message">Diese Nummer kann nicht angerufen werden</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-el/strings.xml b/java/com/android/dialer/dialpadview/res/values-el/strings.xml
index 0205f76..e0cd1ce 100644
--- a/java/com/android/dialer/dialpadview/res/values-el/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-el/strings.xml
@@ -1,39 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_dialpad_back" msgid="6226488105558971135">"Μετάβαση πίσω"</string>
-    <string name="description_dialpad_overflow" msgid="5984341386518189787">"Περισσότερες επιλογές"</string>
-    <string name="description_delete_button" msgid="8431313818404527096">"backspace"</string>
-    <string name="description_image_button_plus" msgid="8936338119824589388">"συν"</string>
-    <string name="description_voicemail_button" msgid="4187006295368768215">"αυτόματος τηλεφωνητής"</string>
-    <string name="description_dial_button" msgid="6826108965053146374">"κλήση"</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"Για κλήση αυτόματου τηλεφωνητή, πρώτα απενεργοποιήστε τη λειτουργία πτήσης."</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"Για τη ρύθμιση του αυτόματου τηλεφωνητή, μεταβείτε στο στοιχείο Μενού &gt; Ρυθμίσεις."</string>
-    <string name="add_2sec_pause" msgid="395591627218789322">"Προσθήκη παύσης 2 δευτερολέπτων"</string>
-    <string name="add_wait" msgid="2278146476349811062">"Προσθήκη αναμονής"</string>
-    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"Χρησιμοποιήστε το πληκτρολόγιο αφής ηχητικών τόνων"</string>
-    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"Επιστροφή στην κλήση που βρίσκεται σε εξέλιξη"</string>
-    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"Προσθήκη κλήσης"</string>
-    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
-    <string name="meid" msgid="5274167198744847659">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"Φόρτωση από κάρτα SIM…"</string>
-    <string name="simContacts_title" msgid="8972942600800349990">"Επαφές στην κάρτα SIM"</string>
-    <string name="menu_callNumber" msgid="1898333075466418368">"Κλήση <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"Δεν μπορείτε να καλέσετε αυτόν τον αριθμό"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_dialpad_back">Μετάβαση πίσω</string>
+  <string name="description_dialpad_overflow">Περισσότερες επιλογές</string>
+  <string name="description_delete_button">backspace</string>
+  <string name="description_image_button_plus">πληκτρολόγηση συν</string>
+  <string name="description_voicemail_button">κλήση αυτόματου τηλεφωνητή</string>
+  <string name="description_dial_button">κλήση</string>
+  <string name="dialog_voicemail_airplane_mode_message">Για κλήση αυτόματου τηλεφωνητή, πρώτα απενεργοποιήστε τη λειτουργία πτήσης.</string>
+  <string name="dialog_voicemail_not_ready_message">Για τη ρύθμιση του αυτόματου τηλεφωνητή, μεταβείτε στο στοιχείο Μενού &gt; Ρυθμίσεις.</string>
+  <string name="add_2sec_pause">Προσθήκη παύσης 2 δευτερολέπτων</string>
+  <string name="add_wait">Προσθήκη αναμονής</string>
+  <string name="dialer_useDtmfDialpad">Χρησιμοποιήστε το πληκτρολόγιο αφής ηχητικών τόνων</string>
+  <string name="dialer_returnToInCallScreen">Επιστροφή στην κλήση που βρίσκεται σε εξέλιξη</string>
+  <string name="dialer_addAnotherCall">Προσθήκη κλήσης</string>
+  <string name="imei">IMEI</string>
+  <string name="meid">MEID</string>
+  <string name="simContacts_emptyLoading">Φόρτωση από κάρτα SIM…</string>
+  <string name="simContacts_title">Επαφές στην κάρτα SIM</string>
+  <string name="menu_callNumber">Κλήση %s</string>
+  <string name="dialpad_hint_emergency_calling_not_available">Δεν είναι δυνατές οι κλήσεις έκτακτης ανάγκης μέσω Wi‑Fi</string>
+  <string msgid="4313552620858880999" name="dialog_phone_call_prohibited_message">Δεν μπορείτε να καλέσετε αυτόν τον αριθμό</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-en-rAU/strings.xml b/java/com/android/dialer/dialpadview/res/values-en-rAU/strings.xml
index 3f16055..ca78287 100644
--- a/java/com/android/dialer/dialpadview/res/values-en-rAU/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-en-rAU/strings.xml
@@ -1,39 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_dialpad_back" msgid="6226488105558971135">"Navigate back"</string>
-    <string name="description_dialpad_overflow" msgid="5984341386518189787">"More options"</string>
-    <string name="description_delete_button" msgid="8431313818404527096">"backspace"</string>
-    <string name="description_image_button_plus" msgid="8936338119824589388">"plus"</string>
-    <string name="description_voicemail_button" msgid="4187006295368768215">"voicemail"</string>
-    <string name="description_dial_button" msgid="6826108965053146374">"dial"</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"To call voicemail, first turn off Aeroplane mode."</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"To set up voicemail, go to Menu &gt; Settings."</string>
-    <string name="add_2sec_pause" msgid="395591627218789322">"Add 2-sec pause"</string>
-    <string name="add_wait" msgid="2278146476349811062">"Add wait"</string>
-    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"Use touch tone keypad"</string>
-    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"Return to call in progress"</string>
-    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"Add call"</string>
-    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
-    <string name="meid" msgid="5274167198744847659">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"Loading from SIM card…"</string>
-    <string name="simContacts_title" msgid="8972942600800349990">"SIM card contacts"</string>
-    <string name="menu_callNumber" msgid="1898333075466418368">"Call <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"Can\'t call this number"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_dialpad_back">Navigate back</string>
+  <string name="description_dialpad_overflow">More options</string>
+  <string name="description_delete_button">backspace</string>
+  <string name="description_image_button_plus">dial plus</string>
+  <string name="description_voicemail_button">call voicemail</string>
+  <string name="description_dial_button">dial</string>
+  <string name="dialog_voicemail_airplane_mode_message">To call voicemail, first turn off Aeroplane mode.</string>
+  <string name="dialog_voicemail_not_ready_message">To set up voicemail, go to Menu &gt; Settings.</string>
+  <string name="add_2sec_pause">Add 2-sec pause</string>
+  <string name="add_wait">Add wait</string>
+  <string name="dialer_useDtmfDialpad">Use touch-tone keypad</string>
+  <string name="dialer_returnToInCallScreen">Return to call in progress</string>
+  <string name="dialer_addAnotherCall">Add call</string>
+  <string name="imei">IMEI</string>
+  <string name="meid">MEID</string>
+  <string name="simContacts_emptyLoading">Loading from SIM card…</string>
+  <string name="simContacts_title">SIM card contacts</string>
+  <string name="menu_callNumber">Call %s</string>
+  <string name="dialpad_hint_emergency_calling_not_available">Can’t make emergency calls over Wi‑Fi</string>
+  <string msgid="4313552620858880999" name="dialog_phone_call_prohibited_message">Can\'t call this number</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-en-rGB/strings.xml b/java/com/android/dialer/dialpadview/res/values-en-rGB/strings.xml
index 3f16055..ca78287 100644
--- a/java/com/android/dialer/dialpadview/res/values-en-rGB/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-en-rGB/strings.xml
@@ -1,39 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_dialpad_back" msgid="6226488105558971135">"Navigate back"</string>
-    <string name="description_dialpad_overflow" msgid="5984341386518189787">"More options"</string>
-    <string name="description_delete_button" msgid="8431313818404527096">"backspace"</string>
-    <string name="description_image_button_plus" msgid="8936338119824589388">"plus"</string>
-    <string name="description_voicemail_button" msgid="4187006295368768215">"voicemail"</string>
-    <string name="description_dial_button" msgid="6826108965053146374">"dial"</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"To call voicemail, first turn off Aeroplane mode."</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"To set up voicemail, go to Menu &gt; Settings."</string>
-    <string name="add_2sec_pause" msgid="395591627218789322">"Add 2-sec pause"</string>
-    <string name="add_wait" msgid="2278146476349811062">"Add wait"</string>
-    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"Use touch tone keypad"</string>
-    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"Return to call in progress"</string>
-    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"Add call"</string>
-    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
-    <string name="meid" msgid="5274167198744847659">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"Loading from SIM card…"</string>
-    <string name="simContacts_title" msgid="8972942600800349990">"SIM card contacts"</string>
-    <string name="menu_callNumber" msgid="1898333075466418368">"Call <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"Can\'t call this number"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_dialpad_back">Navigate back</string>
+  <string name="description_dialpad_overflow">More options</string>
+  <string name="description_delete_button">backspace</string>
+  <string name="description_image_button_plus">dial plus</string>
+  <string name="description_voicemail_button">call voicemail</string>
+  <string name="description_dial_button">dial</string>
+  <string name="dialog_voicemail_airplane_mode_message">To call voicemail, first turn off Aeroplane mode.</string>
+  <string name="dialog_voicemail_not_ready_message">To set up voicemail, go to Menu &gt; Settings.</string>
+  <string name="add_2sec_pause">Add 2-sec pause</string>
+  <string name="add_wait">Add wait</string>
+  <string name="dialer_useDtmfDialpad">Use touch-tone keypad</string>
+  <string name="dialer_returnToInCallScreen">Return to call in progress</string>
+  <string name="dialer_addAnotherCall">Add call</string>
+  <string name="imei">IMEI</string>
+  <string name="meid">MEID</string>
+  <string name="simContacts_emptyLoading">Loading from SIM card…</string>
+  <string name="simContacts_title">SIM card contacts</string>
+  <string name="menu_callNumber">Call %s</string>
+  <string name="dialpad_hint_emergency_calling_not_available">Can’t make emergency calls over Wi‑Fi</string>
+  <string msgid="4313552620858880999" name="dialog_phone_call_prohibited_message">Can\'t call this number</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-en-rIN/strings.xml b/java/com/android/dialer/dialpadview/res/values-en-rIN/strings.xml
index 3f16055..ca78287 100644
--- a/java/com/android/dialer/dialpadview/res/values-en-rIN/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-en-rIN/strings.xml
@@ -1,39 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_dialpad_back" msgid="6226488105558971135">"Navigate back"</string>
-    <string name="description_dialpad_overflow" msgid="5984341386518189787">"More options"</string>
-    <string name="description_delete_button" msgid="8431313818404527096">"backspace"</string>
-    <string name="description_image_button_plus" msgid="8936338119824589388">"plus"</string>
-    <string name="description_voicemail_button" msgid="4187006295368768215">"voicemail"</string>
-    <string name="description_dial_button" msgid="6826108965053146374">"dial"</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"To call voicemail, first turn off Aeroplane mode."</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"To set up voicemail, go to Menu &gt; Settings."</string>
-    <string name="add_2sec_pause" msgid="395591627218789322">"Add 2-sec pause"</string>
-    <string name="add_wait" msgid="2278146476349811062">"Add wait"</string>
-    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"Use touch tone keypad"</string>
-    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"Return to call in progress"</string>
-    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"Add call"</string>
-    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
-    <string name="meid" msgid="5274167198744847659">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"Loading from SIM card…"</string>
-    <string name="simContacts_title" msgid="8972942600800349990">"SIM card contacts"</string>
-    <string name="menu_callNumber" msgid="1898333075466418368">"Call <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"Can\'t call this number"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_dialpad_back">Navigate back</string>
+  <string name="description_dialpad_overflow">More options</string>
+  <string name="description_delete_button">backspace</string>
+  <string name="description_image_button_plus">dial plus</string>
+  <string name="description_voicemail_button">call voicemail</string>
+  <string name="description_dial_button">dial</string>
+  <string name="dialog_voicemail_airplane_mode_message">To call voicemail, first turn off Aeroplane mode.</string>
+  <string name="dialog_voicemail_not_ready_message">To set up voicemail, go to Menu &gt; Settings.</string>
+  <string name="add_2sec_pause">Add 2-sec pause</string>
+  <string name="add_wait">Add wait</string>
+  <string name="dialer_useDtmfDialpad">Use touch-tone keypad</string>
+  <string name="dialer_returnToInCallScreen">Return to call in progress</string>
+  <string name="dialer_addAnotherCall">Add call</string>
+  <string name="imei">IMEI</string>
+  <string name="meid">MEID</string>
+  <string name="simContacts_emptyLoading">Loading from SIM card…</string>
+  <string name="simContacts_title">SIM card contacts</string>
+  <string name="menu_callNumber">Call %s</string>
+  <string name="dialpad_hint_emergency_calling_not_available">Can’t make emergency calls over Wi‑Fi</string>
+  <string msgid="4313552620858880999" name="dialog_phone_call_prohibited_message">Can\'t call this number</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-es-rUS/strings.xml b/java/com/android/dialer/dialpadview/res/values-es-rUS/strings.xml
index 5bf2ae8..893e6e5 100644
--- a/java/com/android/dialer/dialpadview/res/values-es-rUS/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-es-rUS/strings.xml
@@ -1,39 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_dialpad_back" msgid="6226488105558971135">"Volver"</string>
-    <string name="description_dialpad_overflow" msgid="5984341386518189787">"Más opciones"</string>
-    <string name="description_delete_button" msgid="8431313818404527096">"retroceso"</string>
-    <string name="description_image_button_plus" msgid="8936338119824589388">"más"</string>
-    <string name="description_voicemail_button" msgid="4187006295368768215">"buzón de voz"</string>
-    <string name="description_dial_button" msgid="6826108965053146374">"marcar"</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"Para escuchar los mensajes de tu buzón de voz, desactiva primero el modo avión."</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"Para configurar el buzón de voz, ve a Menú &gt; Configuración."</string>
-    <string name="add_2sec_pause" msgid="395591627218789322">"Agregar pausa de 2 segundos"</string>
-    <string name="add_wait" msgid="2278146476349811062">"Agregar espera"</string>
-    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"Usar teclado numérico"</string>
-    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"Regresar a la llamada en curso"</string>
-    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"Agregar llamada"</string>
-    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
-    <string name="meid" msgid="5274167198744847659">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"Cargando desde tarjeta SIM…"</string>
-    <string name="simContacts_title" msgid="8972942600800349990">"Contactos de la tarjeta SIM"</string>
-    <string name="menu_callNumber" msgid="1898333075466418368">"Llamar al <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"No se puede llamar a este número"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_dialpad_back">Volver</string>
+  <string name="description_dialpad_overflow">Más opciones</string>
+  <string name="description_delete_button">retroceso</string>
+  <string name="description_image_button_plus">marcar un signo más</string>
+  <string name="description_voicemail_button">llamar al buzón de voz</string>
+  <string name="description_dial_button">marcar</string>
+  <string name="dialog_voicemail_airplane_mode_message">Para escuchar los mensajes de tu buzón de voz, desactiva primero el modo avión.</string>
+  <string name="dialog_voicemail_not_ready_message">Para configurar el buzón de voz, ve a Menú &gt; Configuración.</string>
+  <string name="add_2sec_pause">Agregar pausa de 2 segundos</string>
+  <string name="add_wait">Agregar espera</string>
+  <string name="dialer_useDtmfDialpad">Usar teclado numérico</string>
+  <string name="dialer_returnToInCallScreen">Regresar a la llamada en curso</string>
+  <string name="dialer_addAnotherCall">Agregar llamada</string>
+  <string name="imei">IMEI</string>
+  <string name="meid">MEID</string>
+  <string name="simContacts_emptyLoading">Cargando desde tarjeta SIM…</string>
+  <string name="simContacts_title">Contactos de la tarjeta SIM</string>
+  <string name="menu_callNumber">Llamar al %s</string>
+  <string name="dialpad_hint_emergency_calling_not_available">No se pueden hacer llamadas de emergencia con Wi-Fi</string>
+  <string msgid="4313552620858880999" name="dialog_phone_call_prohibited_message">No se puede llamar a este número</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-es/strings.xml b/java/com/android/dialer/dialpadview/res/values-es/strings.xml
index af35908..92fcdba 100644
--- a/java/com/android/dialer/dialpadview/res/values-es/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-es/strings.xml
@@ -1,39 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_dialpad_back" msgid="6226488105558971135">"Volver"</string>
-    <string name="description_dialpad_overflow" msgid="5984341386518189787">"Más opciones"</string>
-    <string name="description_delete_button" msgid="8431313818404527096">"retroceso"</string>
-    <string name="description_image_button_plus" msgid="8936338119824589388">"más"</string>
-    <string name="description_voicemail_button" msgid="4187006295368768215">"mensaje de voz"</string>
-    <string name="description_dial_button" msgid="6826108965053146374">"marcar"</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"Para llamar al buzón de voz, debes desactivar el modo avión."</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"Para configurar el buzón de voz, ve a Menú &gt; Ajustes."</string>
-    <string name="add_2sec_pause" msgid="395591627218789322">"Añadir pausa de 2 segundos"</string>
-    <string name="add_wait" msgid="2278146476349811062">"Añadir espera"</string>
-    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"Usar teclado táctil"</string>
-    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"Volver a la llamada en curso"</string>
-    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"Añadir llamada"</string>
-    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
-    <string name="meid" msgid="5274167198744847659">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"Cargando el número de teléfono de la tarjeta SIM…"</string>
-    <string name="simContacts_title" msgid="8972942600800349990">"Contactos de la tarjeta SIM"</string>
-    <string name="menu_callNumber" msgid="1898333075466418368">"Llamar al <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"No se puede llamar a este número"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_dialpad_back">Volver</string>
+  <string name="description_dialpad_overflow">Más opciones</string>
+  <string name="description_delete_button">retroceso</string>
+  <string name="description_image_button_plus">marcar el signo más</string>
+  <string name="description_voicemail_button">llamar al buzón de voz</string>
+  <string name="description_dial_button">marcar</string>
+  <string name="dialog_voicemail_airplane_mode_message">Para llamar al buzón de voz, debes desactivar el modo avión.</string>
+  <string name="dialog_voicemail_not_ready_message">Para configurar el buzón de voz, ve a Menú &gt; Ajustes.</string>
+  <string name="add_2sec_pause">Añadir pausa de 2 segundos</string>
+  <string name="add_wait">Añadir espera</string>
+  <string name="dialer_useDtmfDialpad">Usar teclado de marcación por tonos</string>
+  <string name="dialer_returnToInCallScreen">Volver a la llamada en curso</string>
+  <string name="dialer_addAnotherCall">Añadir llamada</string>
+  <string name="imei">IMEI</string>
+  <string name="meid">MEID</string>
+  <string name="simContacts_emptyLoading">Cargando el número de teléfono de la tarjeta SIM…</string>
+  <string name="simContacts_title">Contactos de la tarjeta SIM</string>
+  <string name="menu_callNumber">Llamar al %s</string>
+  <string name="dialpad_hint_emergency_calling_not_available">No se pueden hacer llamadas de emergencia por Wi‑Fi</string>
+  <string msgid="4313552620858880999" name="dialog_phone_call_prohibited_message">No se puede llamar a este número</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-et/strings.xml b/java/com/android/dialer/dialpadview/res/values-et/strings.xml
index c5e4f5f..d9747fd 100644
--- a/java/com/android/dialer/dialpadview/res/values-et/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-et/strings.xml
@@ -1,39 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_dialpad_back" msgid="6226488105558971135">"Tagasi navigeerimine"</string>
-    <string name="description_dialpad_overflow" msgid="5984341386518189787">"Rohkem valikuid"</string>
-    <string name="description_delete_button" msgid="8431313818404527096">"tagasilüke"</string>
-    <string name="description_image_button_plus" msgid="8936338119824589388">"pluss"</string>
-    <string name="description_voicemail_button" msgid="4187006295368768215">"kõnepostisõnum"</string>
-    <string name="description_dial_button" msgid="6826108965053146374">"helista"</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"Kõnepostisõnumite kuulamiseks lülitage esmalt välja lennukirežiim."</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"Kõneposti seadistamiseks tehke valikud Menüü &gt; Seaded."</string>
-    <string name="add_2sec_pause" msgid="395591627218789322">"Lisa kahesekundiline paus"</string>
-    <string name="add_wait" msgid="2278146476349811062">"Lisa ootamine"</string>
-    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"Kasuta puutetooniga klahvistikku"</string>
-    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"Naase käimasolevale kõnele"</string>
-    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"Lisa kõne"</string>
-    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
-    <string name="meid" msgid="5274167198744847659">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"Laadimine SIM-kaardilt …"</string>
-    <string name="simContacts_title" msgid="8972942600800349990">"SIM-kaardi kontaktid"</string>
-    <string name="menu_callNumber" msgid="1898333075466418368">"Helistamine numbrile <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"Sellele numbrile ei saa helistada"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_dialpad_back">Tagasi navigeerimine</string>
+  <string name="description_dialpad_overflow">Rohkem valikuid</string>
+  <string name="description_delete_button">tagasilüke</string>
+  <string name="description_image_button_plus">vali pluss-sümbol</string>
+  <string name="description_voicemail_button">helista kõneposti</string>
+  <string name="description_dial_button">helista</string>
+  <string name="dialog_voicemail_airplane_mode_message">Kõnepostisõnumite kuulamiseks lülitage esmalt välja lennukirežiim.</string>
+  <string name="dialog_voicemail_not_ready_message">Kõneposti seadistamiseks tehke valikud Menüü &gt; Seaded.</string>
+  <string name="add_2sec_pause">Lisa kahesekundiline paus</string>
+  <string name="add_wait">Lisa ootamine</string>
+  <string name="dialer_useDtmfDialpad">Kasuta puutetooniga klahvistikku</string>
+  <string name="dialer_returnToInCallScreen">Naase käimasolevale kõnele</string>
+  <string name="dialer_addAnotherCall">Lisa kõne</string>
+  <string name="imei">IMEI</string>
+  <string name="meid">MEID</string>
+  <string name="simContacts_emptyLoading">Laadimine SIM-kaardilt …</string>
+  <string name="simContacts_title">SIM-kaardi kontaktid</string>
+  <string name="menu_callNumber">Helistamine numbrile %s</string>
+  <string name="dialpad_hint_emergency_calling_not_available">WiFi kaudu ei saa hädaabikõnesid teha</string>
+  <string msgid="4313552620858880999" name="dialog_phone_call_prohibited_message">Sellele numbrile ei saa helistada</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-eu/strings.xml b/java/com/android/dialer/dialpadview/res/values-eu/strings.xml
index 778b199..7b966c2 100644
--- a/java/com/android/dialer/dialpadview/res/values-eu/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-eu/strings.xml
@@ -1,39 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_dialpad_back" msgid="6226488105558971135">"Egin atzera"</string>
-    <string name="description_dialpad_overflow" msgid="5984341386518189787">"Aukera gehiago"</string>
-    <string name="description_delete_button" msgid="8431313818404527096">"atzera tekla"</string>
-    <string name="description_image_button_plus" msgid="8936338119824589388">"gehi"</string>
-    <string name="description_voicemail_button" msgid="4187006295368768215">"erantzungailua"</string>
-    <string name="description_dial_button" msgid="6826108965053146374">"markatu"</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"Ahots-mezuak entzuteko, Hegaldi modua desaktibatu behar duzu."</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"Erantzungailua konfiguratzeko, joan Menua &gt; Ezarpenak atalera."</string>
-    <string name="add_2sec_pause" msgid="395591627218789322">"Gehitu 2 segundoko pausa"</string>
-    <string name="add_wait" msgid="2278146476349811062">"Gehitu itxaronaldia"</string>
-    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"Erabili ukipen-tonuak dituen teklatua"</string>
-    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"Itzuli abian den deira"</string>
-    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"Gehitu deia"</string>
-    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
-    <string name="meid" msgid="5274167198744847659">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"SIM txarteletik kargatzen…"</string>
-    <string name="simContacts_title" msgid="8972942600800349990">"SIM txarteleko kontaktuak"</string>
-    <string name="menu_callNumber" msgid="1898333075466418368">"Deitu <xliff:g id="NUMBER">%s</xliff:g> zenbakira"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"Ezin da deitu zenbaki honetara"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_dialpad_back">Egin atzera</string>
+  <string name="description_dialpad_overflow">Aukera gehiago</string>
+  <string name="description_delete_button">atzera tekla</string>
+  <string name="description_image_button_plus">markagailuko gehi ikurra</string>
+  <string name="description_voicemail_button">erantzungailua</string>
+  <string name="description_dial_button">markatu</string>
+  <string name="dialog_voicemail_airplane_mode_message">Ahots-mezuak entzuteko, Hegaldi modua desaktibatu behar duzu.</string>
+  <string name="dialog_voicemail_not_ready_message">Erantzungailua konfiguratzeko, joan Menua &gt; Ezarpenak atalera.</string>
+  <string name="add_2sec_pause">Gehitu 2 segundoko pausa</string>
+  <string name="add_wait">Gehitu itxaronaldia</string>
+  <string name="dialer_useDtmfDialpad">Erabili ukipen-tonuak dituen teklatua</string>
+  <string name="dialer_returnToInCallScreen">Itzuli abian den deira</string>
+  <string name="dialer_addAnotherCall">Gehitu deia</string>
+  <string name="imei">IMEI</string>
+  <string name="meid">MEID</string>
+  <string name="simContacts_emptyLoading">SIM txarteletik kargatzen…</string>
+  <string name="simContacts_title">SIM txarteleko kontaktuak</string>
+  <string name="menu_callNumber">Deitu %s zenbakira</string>
+  <string name="dialpad_hint_emergency_calling_not_available">Ezin duzu egin larrialdi-deirik Wi-Fi bidez</string>
+  <string msgid="4313552620858880999" name="dialog_phone_call_prohibited_message">Ezin da deitu zenbaki honetara</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-fa/strings.xml b/java/com/android/dialer/dialpadview/res/values-fa/strings.xml
index 070ca00..2364649 100644
--- a/java/com/android/dialer/dialpadview/res/values-fa/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-fa/strings.xml
@@ -1,39 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_dialpad_back" msgid="6226488105558971135">"پیمایش به عقب"</string>
-    <string name="description_dialpad_overflow" msgid="5984341386518189787">"گزینه‌های بیشتر"</string>
-    <string name="description_delete_button" msgid="8431313818404527096">"برگشت به عقب"</string>
-    <string name="description_image_button_plus" msgid="8936338119824589388">"به‌علاوه"</string>
-    <string name="description_voicemail_button" msgid="4187006295368768215">"پست صوتی"</string>
-    <string name="description_dial_button" msgid="6826108965053146374">"شماره‌گیری"</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"برای تماس با پست صوتی، ابتدا حالت هواپیما را غیرفعال کنید."</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"برای راه‌اندازی پست صوتی به منو &gt; تنظیمات بروید."</string>
-    <string name="add_2sec_pause" msgid="395591627218789322">"افزودن یک مکث ۲ ثانیه‌ای"</string>
-    <string name="add_wait" msgid="2278146476349811062">"افزودن انتظار"</string>
-    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"استفاده از صفحه‌کلید لمسی"</string>
-    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"برگشت به تماس درحال انجام"</string>
-    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"افزودن تماس"</string>
-    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
-    <string name="meid" msgid="5274167198744847659">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"در حال بارگیری سیم کارت..."</string>
-    <string name="simContacts_title" msgid="8972942600800349990">"مخاطبین سیم‌کارت"</string>
-    <string name="menu_callNumber" msgid="1898333075466418368">"تماس با <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"تماس با این شماره ممکن نیست"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_dialpad_back">پیمایش به عقب</string>
+  <string name="description_dialpad_overflow">گزینه‌های بیشتر</string>
+  <string name="description_delete_button">برگشت به عقب</string>
+  <string name="description_image_button_plus">شماره‌گیر به‌علاوه</string>
+  <string name="description_voicemail_button">تماس با پست صوتی</string>
+  <string name="description_dial_button">شماره‌گیری</string>
+  <string name="dialog_voicemail_airplane_mode_message">برای تماس با پست صوتی، ابتدا حالت هواپیما را غیرفعال کنید.</string>
+  <string name="dialog_voicemail_not_ready_message">برای راه‌اندازی پست صوتی به منو &gt; تنظیمات بروید.</string>
+  <string name="add_2sec_pause">افزودن یک مکث ۲ ثانیه‌ای</string>
+  <string name="add_wait">افزودن انتظار</string>
+  <string name="dialer_useDtmfDialpad">استفاده از صفحه‌کلید لمسی</string>
+  <string name="dialer_returnToInCallScreen">برگشت به تماس درحال انجام</string>
+  <string name="dialer_addAnotherCall">افزودن تماس</string>
+  <string name="imei">IMEI</string>
+  <string name="meid">MEID</string>
+  <string name="simContacts_emptyLoading">در حال بارگیری سیم کارت...</string>
+  <string name="simContacts_title">مخاطبین سیم‌کارت</string>
+  <string name="menu_callNumber">تماس با %s</string>
+  <string name="dialpad_hint_emergency_calling_not_available">‏برقراری تماس اضطراری ازطریق Wi‑Fi امکان‌پذیر نیست</string>
+  <string msgid="4313552620858880999" name="dialog_phone_call_prohibited_message">تماس با این شماره ممکن نیست</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-fi/strings.xml b/java/com/android/dialer/dialpadview/res/values-fi/strings.xml
index 0a7a791..8fabff2 100644
--- a/java/com/android/dialer/dialpadview/res/values-fi/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-fi/strings.xml
@@ -1,39 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_dialpad_back" msgid="6226488105558971135">"Siirry takaisin"</string>
-    <string name="description_dialpad_overflow" msgid="5984341386518189787">"Lisää vaihtoehtoja"</string>
-    <string name="description_delete_button" msgid="8431313818404527096">"askelpalautin"</string>
-    <string name="description_image_button_plus" msgid="8936338119824589388">"plus"</string>
-    <string name="description_voicemail_button" msgid="4187006295368768215">"ääniviesti"</string>
-    <string name="description_dial_button" msgid="6826108965053146374">"soita"</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"Poista lentokonetila käytöstä ennen vastaajaan soittamista."</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"Määritä puhelinvastaajan asetukset kohdassa Valikko &gt; Asetukset."</string>
-    <string name="add_2sec_pause" msgid="395591627218789322">"Lisää 2 sekunnin tauko"</string>
-    <string name="add_wait" msgid="2278146476349811062">"Lisää tauko"</string>
-    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"Käytä näppäimistöä"</string>
-    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"Palaa meneillään olevaan puheluun"</string>
-    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"Lisää puhelu"</string>
-    <string name="imei" msgid="7961343816043247280">"IMEI-koodi"</string>
-    <string name="meid" msgid="5274167198744847659">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"Ladataan SIM-kortilta…"</string>
-    <string name="simContacts_title" msgid="8972942600800349990">"SIM-kortin yhteystiedot"</string>
-    <string name="menu_callNumber" msgid="1898333075466418368">"Soita <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"Numeroon ei voi soittaa."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_dialpad_back">Siirry takaisin</string>
+  <string name="description_dialpad_overflow">Lisää vaihtoehtoja</string>
+  <string name="description_delete_button">askelpalautin</string>
+  <string name="description_image_button_plus">paina plus-merkkiä</string>
+  <string name="description_voicemail_button">soita vastaajaan</string>
+  <string name="description_dial_button">soita</string>
+  <string name="dialog_voicemail_airplane_mode_message">Poista lentokonetila käytöstä ennen vastaajaan soittamista.</string>
+  <string name="dialog_voicemail_not_ready_message">Määritä puhelinvastaajan asetukset kohdassa Valikko &gt; Asetukset.</string>
+  <string name="add_2sec_pause">Lisää 2 sekunnin tauko</string>
+  <string name="add_wait">Lisää tauko</string>
+  <string name="dialer_useDtmfDialpad">Käytä näppäimistöä</string>
+  <string name="dialer_returnToInCallScreen">Palaa meneillään olevaan puheluun</string>
+  <string name="dialer_addAnotherCall">Lisää puhelu</string>
+  <string name="imei">IMEI-koodi</string>
+  <string name="meid">MEID</string>
+  <string name="simContacts_emptyLoading">Ladataan SIM-kortilta…</string>
+  <string name="simContacts_title">SIM-kortin yhteystiedot</string>
+  <string name="menu_callNumber">Soita %s</string>
+  <string name="dialpad_hint_emergency_calling_not_available">Hätäpuhelujen soittaminen Wi-Fi-yhteyden kautta ei onnistu</string>
+  <string msgid="4313552620858880999" name="dialog_phone_call_prohibited_message">Numeroon ei voi soittaa.</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-fr-rCA/strings.xml b/java/com/android/dialer/dialpadview/res/values-fr-rCA/strings.xml
index 3080169..022cbdc 100644
--- a/java/com/android/dialer/dialpadview/res/values-fr-rCA/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-fr-rCA/strings.xml
@@ -1,39 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_dialpad_back" msgid="6226488105558971135">"Naviguer vers l\'arrière"</string>
-    <string name="description_dialpad_overflow" msgid="5984341386518189787">"Plus d\'options"</string>
-    <string name="description_delete_button" msgid="8431313818404527096">"retour arrière"</string>
-    <string name="description_image_button_plus" msgid="8936338119824589388">"plus"</string>
-    <string name="description_voicemail_button" msgid="4187006295368768215">"messagerie vocale"</string>
-    <string name="description_dial_button" msgid="6826108965053146374">"composer"</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"Veuillez désactiver le mode Avion avant d\'appeler la messagerie vocale."</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"Pour configurer la messagerie vocale, accédez à Menu &gt; Paramètres."</string>
-    <string name="add_2sec_pause" msgid="395591627218789322">"Ajouter une pause de 2 s"</string>
-    <string name="add_wait" msgid="2278146476349811062">"Ajouter une attente"</string>
-    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"Utiliser le clavier DTMF"</string>
-    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"Reprendre l\'appel en cours"</string>
-    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"Ajouter un appel"</string>
-    <string name="imei" msgid="7961343816043247280">"IIEM"</string>
-    <string name="meid" msgid="5274167198744847659">"IDEM"</string>
-    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"Chargement à partir de la carte SIM en cours…"</string>
-    <string name="simContacts_title" msgid="8972942600800349990">"Contacts de la carte SIM"</string>
-    <string name="menu_callNumber" msgid="1898333075466418368">"Appeler le <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"Vous ne pouvez pas appeler ce numéro"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_dialpad_back">Naviguer vers l\'arrière</string>
+  <string name="description_dialpad_overflow">Plus d\'options</string>
+  <string name="description_delete_button">retour arrière</string>
+  <string name="description_image_button_plus">ajouter le signe Plus (+) au clavier</string>
+  <string name="description_voicemail_button">appeler la messagerie vocale</string>
+  <string name="description_dial_button">composer</string>
+  <string name="dialog_voicemail_airplane_mode_message">Veuillez désactiver le mode Avion avant d\'appeler la messagerie vocale.</string>
+  <string name="dialog_voicemail_not_ready_message">Pour configurer la messagerie vocale, accédez à Menu &gt; Paramètres.</string>
+  <string name="add_2sec_pause">Ajouter une pause de 2 s</string>
+  <string name="add_wait">Ajouter une attente</string>
+  <string name="dialer_useDtmfDialpad">Utiliser le clavier DTMF</string>
+  <string name="dialer_returnToInCallScreen">Reprendre l\'appel en cours</string>
+  <string name="dialer_addAnotherCall">Ajouter un appel</string>
+  <string name="imei">IIEM</string>
+  <string name="meid">IDEM</string>
+  <string name="simContacts_emptyLoading">Chargement à partir de la carte SIM en cours…</string>
+  <string name="simContacts_title">Contacts de la carte SIM</string>
+  <string name="menu_callNumber">Appeler le %s</string>
+  <string name="dialpad_hint_emergency_calling_not_available">Impossible d\'effectuer des appels d\'urgence par Wi-Fi</string>
+  <string msgid="4313552620858880999" name="dialog_phone_call_prohibited_message">Vous ne pouvez pas appeler ce numéro</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-fr/strings.xml b/java/com/android/dialer/dialpadview/res/values-fr/strings.xml
index b4fc152..33f1726 100644
--- a/java/com/android/dialer/dialpadview/res/values-fr/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-fr/strings.xml
@@ -1,39 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_dialpad_back" msgid="6226488105558971135">"Revenir en arrière"</string>
-    <string name="description_dialpad_overflow" msgid="5984341386518189787">"Plus d\'options"</string>
-    <string name="description_delete_button" msgid="8431313818404527096">"retour arrière"</string>
-    <string name="description_image_button_plus" msgid="8936338119824589388">"plus"</string>
-    <string name="description_voicemail_button" msgid="4187006295368768215">"message vocal"</string>
-    <string name="description_dial_button" msgid="6826108965053146374">"composer"</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"Pour pouvoir appeler la messagerie vocale, vous devez désactiver le mode Avion."</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"Pour configurer la messagerie vocale, accédez à Menu &gt; Paramètres."</string>
-    <string name="add_2sec_pause" msgid="395591627218789322">"Ajouter une pause de 2 s"</string>
-    <string name="add_wait" msgid="2278146476349811062">"Ajouter une attente"</string>
-    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"Utiliser le clavier DTMF"</string>
-    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"Reprendre l\'appel en cours"</string>
-    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"Ajouter un appel"</string>
-    <string name="imei" msgid="7961343816043247280">"Code IMEI"</string>
-    <string name="meid" msgid="5274167198744847659">"Code MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"Chargement depuis la carte SIM..."</string>
-    <string name="simContacts_title" msgid="8972942600800349990">"Contacts de la carte SIM"</string>
-    <string name="menu_callNumber" msgid="1898333075466418368">"Appeler le <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"Impossible d\'appeler ce numéro"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_dialpad_back">Revenir en arrière</string>
+  <string name="description_dialpad_overflow">Plus d\'options</string>
+  <string name="description_delete_button">retour arrière</string>
+  <string name="description_image_button_plus">ajouter le signe plus au clavier</string>
+  <string name="description_voicemail_button">appeler la messagerie vocale</string>
+  <string name="description_dial_button">composer</string>
+  <string name="dialog_voicemail_airplane_mode_message">Pour pouvoir appeler la messagerie vocale, vous devez désactiver le mode Avion.</string>
+  <string name="dialog_voicemail_not_ready_message">Pour configurer la messagerie vocale, accédez à Menu &gt; Paramètres.</string>
+  <string name="add_2sec_pause">Ajouter une pause de 2 s</string>
+  <string name="add_wait">Ajouter une attente</string>
+  <string name="dialer_useDtmfDialpad">Utiliser le clavier DTMF</string>
+  <string name="dialer_returnToInCallScreen">Reprendre l\'appel en cours</string>
+  <string name="dialer_addAnotherCall">Ajouter un appel</string>
+  <string name="imei">Code IMEI</string>
+  <string name="meid">Code MEID</string>
+  <string name="simContacts_emptyLoading">Chargement depuis la carte SIM...</string>
+  <string name="simContacts_title">Contacts de la carte SIM</string>
+  <string name="menu_callNumber">Appeler le %s</string>
+  <string name="dialpad_hint_emergency_calling_not_available">Impossible de passer des appels d\'urgence via le Wi-Fi</string>
+  <string msgid="4313552620858880999" name="dialog_phone_call_prohibited_message">Impossible d\'appeler ce numéro</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-gl/strings.xml b/java/com/android/dialer/dialpadview/res/values-gl/strings.xml
index 25ffc27..11f5d10 100644
--- a/java/com/android/dialer/dialpadview/res/values-gl/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-gl/strings.xml
@@ -1,39 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_dialpad_back" msgid="6226488105558971135">"Volver á vista anterior"</string>
-    <string name="description_dialpad_overflow" msgid="5984341386518189787">"Máis opcións"</string>
-    <string name="description_delete_button" msgid="8431313818404527096">"retroceso"</string>
-    <string name="description_image_button_plus" msgid="8936338119824589388">"máis"</string>
-    <string name="description_voicemail_button" msgid="4187006295368768215">"correo de voz"</string>
-    <string name="description_dial_button" msgid="6826108965053146374">"marca"</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"Para chamar ao correo de voz, primeiro desactiva o modo avión."</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"Para configurar o correo de voz, accede a Menú &gt; Configuración."</string>
-    <string name="add_2sec_pause" msgid="395591627218789322">"Engadir pausa de 2 segundos"</string>
-    <string name="add_wait" msgid="2278146476349811062">"Engadir espera"</string>
-    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"Usar teclado de tons táctiles"</string>
-    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"Volver á chamada en curso"</string>
-    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"Engadir chamada"</string>
-    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
-    <string name="meid" msgid="5274167198744847659">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"Cargando número da tarxeta SIM…"</string>
-    <string name="simContacts_title" msgid="8972942600800349990">"Contactos da tarxeta SIM"</string>
-    <string name="menu_callNumber" msgid="1898333075466418368">"Chamar ao <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"Non é posible chamar a este número"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_dialpad_back">Volver á vista anterior</string>
+  <string name="description_dialpad_overflow">Máis opcións</string>
+  <string name="description_delete_button">retroceso</string>
+  <string name="description_image_button_plus">marca o signo máis</string>
+  <string name="description_voicemail_button">chama ao correo de voz</string>
+  <string name="description_dial_button">marca</string>
+  <string name="dialog_voicemail_airplane_mode_message">Para chamar ao correo de voz, primeiro desactiva o modo avión.</string>
+  <string name="dialog_voicemail_not_ready_message">Para configurar o correo de voz, accede a Menú &gt; Configuración.</string>
+  <string name="add_2sec_pause">Engadir pausa de 2 segundos</string>
+  <string name="add_wait">Engadir espera</string>
+  <string name="dialer_useDtmfDialpad">Usar teclado de marcación por tons</string>
+  <string name="dialer_returnToInCallScreen">Volver á chamada en curso</string>
+  <string name="dialer_addAnotherCall">Engadir chamada</string>
+  <string name="imei">IMEI</string>
+  <string name="meid">MEID</string>
+  <string name="simContacts_emptyLoading">Cargando número da tarxeta SIM…</string>
+  <string name="simContacts_title">Contactos da tarxeta SIM</string>
+  <string name="menu_callNumber">Chamar ao %s</string>
+  <string name="dialpad_hint_emergency_calling_not_available">Non se poden realizar chamadas de urxencia por wifi</string>
+  <string msgid="4313552620858880999" name="dialog_phone_call_prohibited_message">Non é posible chamar a este número</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-gu/strings.xml b/java/com/android/dialer/dialpadview/res/values-gu/strings.xml
index e4e13b3..d059b41 100644
--- a/java/com/android/dialer/dialpadview/res/values-gu/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-gu/strings.xml
@@ -1,39 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_dialpad_back" msgid="6226488105558971135">"પાછળ નૅવિગેટ કરો"</string>
-    <string name="description_dialpad_overflow" msgid="5984341386518189787">"વધુ વિકલ્પો"</string>
-    <string name="description_delete_button" msgid="8431313818404527096">"backspace"</string>
-    <string name="description_image_button_plus" msgid="8936338119824589388">"પ્લસ"</string>
-    <string name="description_voicemail_button" msgid="4187006295368768215">"વૉઇસમેઇલ"</string>
-    <string name="description_dial_button" msgid="6826108965053146374">"ડાયલ કરો"</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"વૉઇસમેઇલ પર કૉલ કરવા માટે, પહેલાં એરપ્લેન મોડને બંધ કરો."</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"વૉઇસમેઇલ સેટ કરવા માટે, મેનૂ &gt; સેટિંગ્સ પર જાઓ."</string>
-    <string name="add_2sec_pause" msgid="395591627218789322">"2-સેકંડનો વિરામ ઉમેરો"</string>
-    <string name="add_wait" msgid="2278146476349811062">"પ્રતીક્ષા ઉમેરો"</string>
-    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"ટચ ટોન કીપેડનો ઉપયોગ કરો"</string>
-    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"કૉલ પર પાછા આવવું પ્રગતિ પર છે"</string>
-    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"કૉલ ઉમેરો"</string>
-    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
-    <string name="meid" msgid="5274167198744847659">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"SIM કાર્ડમાંથી લોડ કરી રહ્યાં છીએ…"</string>
-    <string name="simContacts_title" msgid="8972942600800349990">"SIM કાર્ડ સંપર્કો"</string>
-    <string name="menu_callNumber" msgid="1898333075466418368">"<xliff:g id="NUMBER">%s</xliff:g> પર કૉલ કરો"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"આ નંબર પર કૉલ કરી શકાતો નથી"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_dialpad_back">પાછળ નૅવિગેટ કરો</string>
+  <string name="description_dialpad_overflow">વધુ વિકલ્પો</string>
+  <string name="description_delete_button">backspace</string>
+  <string name="description_image_button_plus">પ્લસ ડાયલ કરો</string>
+  <string name="description_voicemail_button">વૉઇસમેઇલ પર કૉલ કરો</string>
+  <string name="description_dial_button">ડાયલ કરો</string>
+  <string name="dialog_voicemail_airplane_mode_message">વૉઇસમેઇલ પર કૉલ કરવા માટે, પહેલાં એરપ્લેન મોડને બંધ કરો.</string>
+  <string name="dialog_voicemail_not_ready_message">વૉઇસમેઇલ સેટ કરવા માટે, મેનૂ &gt; સેટિંગ્સ પર જાઓ.</string>
+  <string name="add_2sec_pause">2-સેકંડનો વિરામ ઉમેરો</string>
+  <string name="add_wait">પ્રતીક્ષા ઉમેરો</string>
+  <string name="dialer_useDtmfDialpad">ટચ-ટોન કીપેડનો ઉપયોગ કરો</string>
+  <string name="dialer_returnToInCallScreen">કૉલ પર પાછા આવવું પ્રગતિ પર છે</string>
+  <string name="dialer_addAnotherCall">કૉલ ઉમેરો</string>
+  <string name="imei">IMEI</string>
+  <string name="meid">MEID</string>
+  <string name="simContacts_emptyLoading">SIM કાર્ડમાંથી લોડ કરી રહ્યાં છીએ…</string>
+  <string name="simContacts_title">SIM કાર્ડ સંપર્કો</string>
+  <string name="menu_callNumber">%s પર કૉલ કરો</string>
+  <string name="dialpad_hint_emergency_calling_not_available">વાઇ-ફાઇ પરથી કટોકટીના કૉલ કરી શકાતા નથી</string>
+  <string msgid="4313552620858880999" name="dialog_phone_call_prohibited_message">આ નંબર પર કૉલ કરી શકાતો નથી</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-hi/strings.xml b/java/com/android/dialer/dialpadview/res/values-hi/strings.xml
index 529f8c7..75f5ef1 100644
--- a/java/com/android/dialer/dialpadview/res/values-hi/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-hi/strings.xml
@@ -1,39 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_dialpad_back" msgid="6226488105558971135">"वापस नेविगेट करें"</string>
-    <string name="description_dialpad_overflow" msgid="5984341386518189787">"अधिक विकल्प"</string>
-    <string name="description_delete_button" msgid="8431313818404527096">"backspace"</string>
-    <string name="description_image_button_plus" msgid="8936338119824589388">"धन का चिह्न"</string>
-    <string name="description_voicemail_button" msgid="4187006295368768215">"वॉइसमेल"</string>
-    <string name="description_dial_button" msgid="6826108965053146374">"डायल करें"</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"वॉइसमेल कॉल करने के लिए, पहले हवाई जहाज़ मोड बंद करें."</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"वॉइसमेल सेट अप करने के लिए, मेनू &gt; सेटिंग पर जाएं."</string>
-    <string name="add_2sec_pause" msgid="395591627218789322">"2-सेकंड का विराम जोड़ें"</string>
-    <string name="add_wait" msgid="2278146476349811062">"प्रतीक्षा का समय बढ़ाएं"</string>
-    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"टच टोन कीपैड का उपयोग करें"</string>
-    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"कॉल पर लौटने का कार्य प्रगति पर"</string>
-    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"कॉल जोड़ें"</string>
-    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
-    <string name="meid" msgid="5274167198744847659">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"SIM कार्ड से लोड हो रहा है…"</string>
-    <string name="simContacts_title" msgid="8972942600800349990">"SIM कार्ड के संपर्क"</string>
-    <string name="menu_callNumber" msgid="1898333075466418368">"<xliff:g id="NUMBER">%s</xliff:g> पर कॉल करें"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"इस नंबर पर कॉल नहीं किया जा सकता"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_dialpad_back">वापस नेविगेट करें</string>
+  <string name="description_dialpad_overflow">अधिक विकल्प</string>
+  <string name="description_delete_button">backspace</string>
+  <string name="description_image_button_plus">प्लस डायल करें</string>
+  <string name="description_voicemail_button">वॉइसमेल पर कॉल करें</string>
+  <string name="description_dial_button">डायल करें</string>
+  <string name="dialog_voicemail_airplane_mode_message">वॉइसमेल कॉल करने के लिए, पहले हवाई जहाज़ मोड बंद करें.</string>
+  <string name="dialog_voicemail_not_ready_message">वॉइसमेल सेट अप करने के लिए, मेनू &gt; सेटिंग पर जाएं.</string>
+  <string name="add_2sec_pause">2-सेकंड का विराम जोड़ें</string>
+  <string name="add_wait">प्रतीक्षा का समय बढ़ाएं</string>
+  <string name="dialer_useDtmfDialpad">टच-टोन कीपैड का उपयोग करें</string>
+  <string name="dialer_returnToInCallScreen">कॉल पर लौटने का कार्य प्रगति पर</string>
+  <string name="dialer_addAnotherCall">कॉल जोड़ें</string>
+  <string name="imei">IMEI</string>
+  <string name="meid">MEID</string>
+  <string name="simContacts_emptyLoading">SIM कार्ड से लोड हो रहा है…</string>
+  <string name="simContacts_title">SIM कार्ड के संपर्क</string>
+  <string name="menu_callNumber">%s पर कॉल करें</string>
+  <string name="dialpad_hint_emergency_calling_not_available">वाई-फ़ाई के ज़रिए आपातकालीन कॉल नहीं किए जा सकते</string>
+  <string msgid="4313552620858880999" name="dialog_phone_call_prohibited_message">इस नंबर पर कॉल नहीं किया जा सकता</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-hr/strings.xml b/java/com/android/dialer/dialpadview/res/values-hr/strings.xml
index 6ec34d2..ec12a12 100644
--- a/java/com/android/dialer/dialpadview/res/values-hr/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-hr/strings.xml
@@ -1,39 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_dialpad_back" msgid="6226488105558971135">"Kretanje natrag"</string>
-    <string name="description_dialpad_overflow" msgid="5984341386518189787">"Više opcija"</string>
-    <string name="description_delete_button" msgid="8431313818404527096">"povratna tipka"</string>
-    <string name="description_image_button_plus" msgid="8936338119824589388">"plus"</string>
-    <string name="description_voicemail_button" msgid="4187006295368768215">"govorna pošta"</string>
-    <string name="description_dial_button" msgid="6826108965053146374">"biraj"</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"Da biste nazvali govornu poštu, najprije isključite način rada u zrakoplovu."</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"Da biste postavili govornu poštu, idite na Izbornik &gt; Postavke."</string>
-    <string name="add_2sec_pause" msgid="395591627218789322">"Dodaj pauzu od 2 s."</string>
-    <string name="add_wait" msgid="2278146476349811062">"Dodaj čekanje"</string>
-    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"Koristite dodirnu zvučnu tipkovnicu"</string>
-    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"Natrag na poziv u tijeku"</string>
-    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"Dodaj poziv"</string>
-    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
-    <string name="meid" msgid="5274167198744847659">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"Učitavanje sa SIM kartice..."</string>
-    <string name="simContacts_title" msgid="8972942600800349990">"Kontakti na SIM kartici"</string>
-    <string name="menu_callNumber" msgid="1898333075466418368">"Nazovite <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"Nije moguće nazvati taj broj"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_dialpad_back">Kretanje natrag</string>
+  <string name="description_dialpad_overflow">Više opcija</string>
+  <string name="description_delete_button">povratna tipka</string>
+  <string name="description_image_button_plus">dodaj plus</string>
+  <string name="description_voicemail_button">nazovi službu govorne pošte</string>
+  <string name="description_dial_button">biraj</string>
+  <string name="dialog_voicemail_airplane_mode_message">Da biste nazvali govornu poštu, najprije isključite način rada u zrakoplovu.</string>
+  <string name="dialog_voicemail_not_ready_message">Da biste postavili govornu poštu, idite na Izbornik &gt; Postavke.</string>
+  <string name="add_2sec_pause">Dodaj pauzu od 2 s.</string>
+  <string name="add_wait">Dodaj čekanje</string>
+  <string name="dialer_useDtmfDialpad">Koristite dodirnu zvučnu tipkovnicu</string>
+  <string name="dialer_returnToInCallScreen">Natrag na poziv u tijeku</string>
+  <string name="dialer_addAnotherCall">Dodaj poziv</string>
+  <string name="imei">IMEI</string>
+  <string name="meid">MEID</string>
+  <string name="simContacts_emptyLoading">Učitavanje sa SIM kartice...</string>
+  <string name="simContacts_title">Kontakti na SIM kartici</string>
+  <string name="menu_callNumber">Nazovite %s</string>
+  <string name="dialpad_hint_emergency_calling_not_available">Nije moguće upućivati hitne pozive putem Wi‑Fi-ja</string>
+  <string msgid="4313552620858880999" name="dialog_phone_call_prohibited_message">Nije moguće nazvati taj broj</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-hu/strings.xml b/java/com/android/dialer/dialpadview/res/values-hu/strings.xml
index 7ef2424..9b67a5e 100644
--- a/java/com/android/dialer/dialpadview/res/values-hu/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-hu/strings.xml
@@ -1,39 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_dialpad_back" msgid="6226488105558971135">"Vissza"</string>
-    <string name="description_dialpad_overflow" msgid="5984341386518189787">"További beállítások"</string>
-    <string name="description_delete_button" msgid="8431313818404527096">"Backspace"</string>
-    <string name="description_image_button_plus" msgid="8936338119824589388">"plusz"</string>
-    <string name="description_voicemail_button" msgid="4187006295368768215">"hangposta"</string>
-    <string name="description_dial_button" msgid="6826108965053146374">"tárcsázás"</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"Hangposta hívásához kapcsolja ki a Repülőgép üzemmódot."</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"A hangposta beállításához válassza a Menü &gt; Beállítások pontot."</string>
-    <string name="add_2sec_pause" msgid="395591627218789322">"2 mp-es szünet hozzáadása"</string>
-    <string name="add_wait" msgid="2278146476349811062">"Várakozás hozzáadása"</string>
-    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"Hangkódos telefonbillentyűzet használata"</string>
-    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"Vissza a folyamatban lévő híváshoz"</string>
-    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"Hívás hozzáadása"</string>
-    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
-    <string name="meid" msgid="5274167198744847659">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"Betöltés a SIM-kártyáról…"</string>
-    <string name="simContacts_title" msgid="8972942600800349990">"Névjegyek a SIM-kártyán"</string>
-    <string name="menu_callNumber" msgid="1898333075466418368">"Hívás: <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"Nem lehet felhívni ezt a számot"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_dialpad_back">Vissza</string>
+  <string name="description_dialpad_overflow">További beállítások</string>
+  <string name="description_delete_button">Backspace</string>
+  <string name="description_image_button_plus">pluszjel tárcsázása</string>
+  <string name="description_voicemail_button">hangposta hívása</string>
+  <string name="description_dial_button">tárcsázás</string>
+  <string name="dialog_voicemail_airplane_mode_message">Hangposta hívásához kapcsolja ki a Repülőgép üzemmódot.</string>
+  <string name="dialog_voicemail_not_ready_message">A hangposta beállításához válassza a Menü &gt; Beállítások pontot.</string>
+  <string name="add_2sec_pause">2 mp-es szünet hozzáadása</string>
+  <string name="add_wait">Várakozás hozzáadása</string>
+  <string name="dialer_useDtmfDialpad">Hangkódos telefonbillentyűzet használata</string>
+  <string name="dialer_returnToInCallScreen">Vissza a folyamatban lévő híváshoz</string>
+  <string name="dialer_addAnotherCall">Hívás hozzáadása</string>
+  <string name="imei">IMEI</string>
+  <string name="meid">MEID</string>
+  <string name="simContacts_emptyLoading">Betöltés a SIM-kártyáról…</string>
+  <string name="simContacts_title">Névjegyek a SIM-kártyán</string>
+  <string name="menu_callNumber">Hívás: %s</string>
+  <string name="dialpad_hint_emergency_calling_not_available">Nem lehet segélyhívást kezdeményezni Wi-Fi-n keresztül</string>
+  <string msgid="4313552620858880999" name="dialog_phone_call_prohibited_message">Nem lehet felhívni ezt a számot</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-hy/strings.xml b/java/com/android/dialer/dialpadview/res/values-hy/strings.xml
index 0839922..f0bf7e9 100644
--- a/java/com/android/dialer/dialpadview/res/values-hy/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-hy/strings.xml
@@ -1,39 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_dialpad_back" msgid="6226488105558971135">"Հետ գնալ"</string>
-    <string name="description_dialpad_overflow" msgid="5984341386518189787">"Այլ ընտրանքներ"</string>
-    <string name="description_delete_button" msgid="8431313818404527096">"հետշարժ"</string>
-    <string name="description_image_button_plus" msgid="8936338119824589388">"գումարում"</string>
-    <string name="description_voicemail_button" msgid="4187006295368768215">"ձայնային փոստ"</string>
-    <string name="description_dial_button" msgid="6826108965053146374">"համարհավաքել"</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"Ձայնային փոստին զանգելու համար նախ անջատեք Ինքնաթիռի ռեժիմը:"</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"Ձայնային փոստը կարգավորելու համար անցեք Ընտրացնակ &gt; Կարգավորումներ:"</string>
-    <string name="add_2sec_pause" msgid="395591627218789322">"Ավելացնել 2 վայրկյան դադար"</string>
-    <string name="add_wait" msgid="2278146476349811062">"Ավելացնել սպասելաժամանակ"</string>
-    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"Օգտագործել տոնային ստեղնաշարը"</string>
-    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"Վերադառնալ ընթացիկ զանգին"</string>
-    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"Ավելացնել զանգ"</string>
-    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
-    <string name="meid" msgid="5274167198744847659">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"Բեռնվում է SIM քարտից…"</string>
-    <string name="simContacts_title" msgid="8972942600800349990">"SIM քարտի կոնտակտներ"</string>
-    <string name="menu_callNumber" msgid="1898333075466418368">"Զանգել <xliff:g id="NUMBER">%s</xliff:g> համարին"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"Հնարավոր չէ զանգել այս համարին"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_dialpad_back">Հետ գնալ</string>
+  <string name="description_dialpad_overflow">Այլ ընտրանքներ</string>
+  <string name="description_delete_button">հետշարժ</string>
+  <string name="description_image_button_plus">հավաքել պլյուս</string>
+  <string name="description_voicemail_button">զանգել ձայնային փոստին</string>
+  <string name="description_dial_button">համարհավաքել</string>
+  <string name="dialog_voicemail_airplane_mode_message">Ձայնային փոստին զանգելու համար նախ անջատեք Ինքնաթիռի ռեժիմը:</string>
+  <string name="dialog_voicemail_not_ready_message">Ձայնային փոստը կարգավորելու համար անցեք Ընտրացնակ &gt; Կարգավորումներ:</string>
+  <string name="add_2sec_pause">Ավելացնել 2 վայրկյան դադար</string>
+  <string name="add_wait">Ավելացնել սպասելաժամանակ</string>
+  <string name="dialer_useDtmfDialpad">Բացել տոնային թվաշարը</string>
+  <string name="dialer_returnToInCallScreen">Վերադառնալ ընթացիկ զանգին</string>
+  <string name="dialer_addAnotherCall">Ավելացնել զանգ</string>
+  <string name="imei">IMEI</string>
+  <string name="meid">MEID</string>
+  <string name="simContacts_emptyLoading">Բեռնվում է SIM քարտից…</string>
+  <string name="simContacts_title">SIM քարտի կոնտակտներ</string>
+  <string name="menu_callNumber">Զանգել %s համարին</string>
+  <string name="dialpad_hint_emergency_calling_not_available">Շտապ կանչերը հասանելի չեն Wi‑Fi-ի միջոցով</string>
+  <string msgid="4313552620858880999" name="dialog_phone_call_prohibited_message">Հնարավոր չէ զանգել այս համարին</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-in/strings.xml b/java/com/android/dialer/dialpadview/res/values-in/strings.xml
index 4f7a05f..f1768a6 100644
--- a/java/com/android/dialer/dialpadview/res/values-in/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-in/strings.xml
@@ -1,39 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_dialpad_back" msgid="6226488105558971135">"Tombol kembali"</string>
-    <string name="description_dialpad_overflow" msgid="5984341386518189787">"Opsi lainnya"</string>
-    <string name="description_delete_button" msgid="8431313818404527096">"backspace"</string>
-    <string name="description_image_button_plus" msgid="8936338119824589388">"tambah"</string>
-    <string name="description_voicemail_button" msgid="4187006295368768215">"pesan suara"</string>
-    <string name="description_dial_button" msgid="6826108965053146374">"panggil"</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"Untuk memanggil pesan suara, nonaktifkan mode Pesawat terlebih dahulu."</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"Untuk menyiapkan pesan suara, buka Menu &gt; Setelan."</string>
-    <string name="add_2sec_pause" msgid="395591627218789322">"Tambahkan jeda 2 dtk"</string>
-    <string name="add_wait" msgid="2278146476349811062">"Tambahkan tunggu"</string>
-    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"Gunakan keypad nada sentuh"</string>
-    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"Kembali ke panggilan sedang berlangsung"</string>
-    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"Tambahkan panggilan"</string>
-    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
-    <string name="meid" msgid="5274167198744847659">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"Memuat dari kartu SIM…"</string>
-    <string name="simContacts_title" msgid="8972942600800349990">"Kontak di kartu SIM"</string>
-    <string name="menu_callNumber" msgid="1898333075466418368">"Telepon <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"Tidak dapat menelepon nomor ini"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_dialpad_back">Tombol kembali</string>
+  <string name="description_dialpad_overflow">Opsi lainnya</string>
+  <string name="description_delete_button">backspace</string>
+  <string name="description_image_button_plus">tanda tambah panggilan</string>
+  <string name="description_voicemail_button">panggil pesan suara</string>
+  <string name="description_dial_button">panggil</string>
+  <string name="dialog_voicemail_airplane_mode_message">Untuk memanggil pesan suara, nonaktifkan mode Pesawat terlebih dahulu.</string>
+  <string name="dialog_voicemail_not_ready_message">Untuk menyiapkan pesan suara, buka Menu &gt; Setelan.</string>
+  <string name="add_2sec_pause">Tambahkan jeda 2 dtk</string>
+  <string name="add_wait">Tambahkan tunggu</string>
+  <string name="dialer_useDtmfDialpad">Gunakan keypad nada sentuh</string>
+  <string name="dialer_returnToInCallScreen">Kembali ke panggilan sedang berlangsung</string>
+  <string name="dialer_addAnotherCall">Tambahkan panggilan</string>
+  <string name="imei">IMEI</string>
+  <string name="meid">MEID</string>
+  <string name="simContacts_emptyLoading">Memuat dari kartu SIM…</string>
+  <string name="simContacts_title">Kontak di kartu SIM</string>
+  <string name="menu_callNumber">Telepon %s</string>
+  <string name="dialpad_hint_emergency_calling_not_available">Tidak dapat melakukan panggilan darurat melalui Wi-Fi</string>
+  <string msgid="4313552620858880999" name="dialog_phone_call_prohibited_message">Tidak dapat menelepon nomor ini</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-is/strings.xml b/java/com/android/dialer/dialpadview/res/values-is/strings.xml
index de6b9a2..2379882 100644
--- a/java/com/android/dialer/dialpadview/res/values-is/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-is/strings.xml
@@ -1,39 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_dialpad_back" msgid="6226488105558971135">"Fara til baka"</string>
-    <string name="description_dialpad_overflow" msgid="5984341386518189787">"Fleiri valkostir"</string>
-    <string name="description_delete_button" msgid="8431313818404527096">"bakklykill"</string>
-    <string name="description_image_button_plus" msgid="8936338119824589388">"plús"</string>
-    <string name="description_voicemail_button" msgid="4187006295368768215">"talhólfsskilaboð"</string>
-    <string name="description_dial_button" msgid="6826108965053146374">"hringja"</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"Til að hringja í talhólfið þarftu fyrst að slökkva á flugstillingu."</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"Til að setja upp talhólf þarftu að opna valmyndina og velja Stillingar."</string>
-    <string name="add_2sec_pause" msgid="395591627218789322">"Bæta við 2 sekúndna töf"</string>
-    <string name="add_wait" msgid="2278146476349811062">"Bæta töf við"</string>
-    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"Nota snertitónatakkaborð"</string>
-    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"Fara aftur í símtal í gangi"</string>
-    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"Bæta símtali við"</string>
-    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
-    <string name="meid" msgid="5274167198744847659">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"Hleður af SIM-kortinu…"</string>
-    <string name="simContacts_title" msgid="8972942600800349990">"Tengiliðir á SIM-korti"</string>
-    <string name="menu_callNumber" msgid="1898333075466418368">"Hringja í <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"Ekki er hægt að hringja í þetta númer"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_dialpad_back">Fara til baka</string>
+  <string name="description_dialpad_overflow">Fleiri valkostir</string>
+  <string name="description_delete_button">bakklykill</string>
+  <string name="description_image_button_plus">plúshnappur</string>
+  <string name="description_voicemail_button">hringja í talhólf</string>
+  <string name="description_dial_button">hringja</string>
+  <string name="dialog_voicemail_airplane_mode_message">Til að hringja í talhólfið þarftu fyrst að slökkva á flugstillingu.</string>
+  <string name="dialog_voicemail_not_ready_message">Til að setja upp talhólf þarftu að opna valmyndina og velja Stillingar.</string>
+  <string name="add_2sec_pause">Bæta við 2 sekúndna töf</string>
+  <string name="add_wait">Bæta töf við</string>
+  <string name="dialer_useDtmfDialpad">Nota snertitónatalnaborð</string>
+  <string name="dialer_returnToInCallScreen">Fara aftur í símtal í gangi</string>
+  <string name="dialer_addAnotherCall">Bæta símtali við</string>
+  <string name="imei">IMEI</string>
+  <string name="meid">MEID</string>
+  <string name="simContacts_emptyLoading">Hleður af SIM-kortinu…</string>
+  <string name="simContacts_title">Tengiliðir á SIM-korti</string>
+  <string name="menu_callNumber">Hringja í %s</string>
+  <string name="dialpad_hint_emergency_calling_not_available">Ekki er hægt að hringja neyðarsímtöl með Wi-Fi</string>
+  <string msgid="4313552620858880999" name="dialog_phone_call_prohibited_message">Ekki er hægt að hringja í þetta númer</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-it/strings.xml b/java/com/android/dialer/dialpadview/res/values-it/strings.xml
index cb1b752..b53f557 100644
--- a/java/com/android/dialer/dialpadview/res/values-it/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-it/strings.xml
@@ -1,39 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_dialpad_back" msgid="6226488105558971135">"Torna indietro"</string>
-    <string name="description_dialpad_overflow" msgid="5984341386518189787">"Altre opzioni"</string>
-    <string name="description_delete_button" msgid="8431313818404527096">"backspace"</string>
-    <string name="description_image_button_plus" msgid="8936338119824589388">"più"</string>
-    <string name="description_voicemail_button" msgid="4187006295368768215">"messaggio vocale"</string>
-    <string name="description_dial_button" msgid="6826108965053146374">"componi"</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"Per chiamare la segreteria, disattiva la modalità aereo."</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"Per configurare la segreteria, seleziona Menu &gt; Impostazioni."</string>
-    <string name="add_2sec_pause" msgid="395591627218789322">"Aggiungi pausa 2 sec"</string>
-    <string name="add_wait" msgid="2278146476349811062">"Aggiungi attesa"</string>
-    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"Usa tastierino per selezione a toni"</string>
-    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"Torna alla chiamata in corso"</string>
-    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"Aggiungi chiamata"</string>
-    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
-    <string name="meid" msgid="5274167198744847659">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"Caricamento da SIM..."</string>
-    <string name="simContacts_title" msgid="8972942600800349990">"Contatti della scheda SIM"</string>
-    <string name="menu_callNumber" msgid="1898333075466418368">"Chiama <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"Impossibile chiamare questo numero"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_dialpad_back">Torna indietro</string>
+  <string name="description_dialpad_overflow">Altre opzioni</string>
+  <string name="description_delete_button">backspace</string>
+  <string name="description_image_button_plus">inserisci più</string>
+  <string name="description_voicemail_button">chiama segreteria</string>
+  <string name="description_dial_button">componi</string>
+  <string name="dialog_voicemail_airplane_mode_message">Per chiamare la segreteria, disattiva la modalità aereo.</string>
+  <string name="dialog_voicemail_not_ready_message">Per configurare la segreteria, seleziona Menu &gt; Impostazioni.</string>
+  <string name="add_2sec_pause">Aggiungi pausa 2 sec</string>
+  <string name="add_wait">Aggiungi attesa</string>
+  <string name="dialer_useDtmfDialpad">Utilizza il tastierino per la selezione a toni</string>
+  <string name="dialer_returnToInCallScreen">Torna alla chiamata in corso</string>
+  <string name="dialer_addAnotherCall">Aggiungi chiamata</string>
+  <string name="imei">IMEI</string>
+  <string name="meid">MEID</string>
+  <string name="simContacts_emptyLoading">Caricamento da SIM...</string>
+  <string name="simContacts_title">Contatti della scheda SIM</string>
+  <string name="menu_callNumber">Chiama %s</string>
+  <string name="dialpad_hint_emergency_calling_not_available">Impossibile fare chiamate di emergenza tramite Wi‑Fi</string>
+  <string msgid="4313552620858880999" name="dialog_phone_call_prohibited_message">Impossibile chiamare questo numero</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-iw/strings.xml b/java/com/android/dialer/dialpadview/res/values-iw/strings.xml
index a8e784e..f47f1ec 100644
--- a/java/com/android/dialer/dialpadview/res/values-iw/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-iw/strings.xml
@@ -1,39 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_dialpad_back" msgid="6226488105558971135">"ניווט חזרה"</string>
-    <string name="description_dialpad_overflow" msgid="5984341386518189787">"אפשרויות נוספות"</string>
-    <string name="description_delete_button" msgid="8431313818404527096">"Backspace"</string>
-    <string name="description_image_button_plus" msgid="8936338119824589388">"פלוס"</string>
-    <string name="description_voicemail_button" msgid="4187006295368768215">"דואר קולי"</string>
-    <string name="description_dial_button" msgid="6826108965053146374">"חיוג"</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"כדי להתקשר לתא הקולי, קודם עליך להשבית את מצב הטיסה."</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"כדי להגדיר את התא הקולי, עליך להיכנס לתפריט &gt; הגדרות."</string>
-    <string name="add_2sec_pause" msgid="395591627218789322">"הוספת השהיה של 2 שניות"</string>
-    <string name="add_wait" msgid="2278146476349811062">"הוספת השהיה"</string>
-    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"שימוש במקלדת עם צלילי חיוג"</string>
-    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"חזרה לשיחה הפעילה"</string>
-    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"הוספת שיחה"</string>
-    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
-    <string name="meid" msgid="5274167198744847659">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"‏אנחנו טוענים מכרטיס ה-SIM…"</string>
-    <string name="simContacts_title" msgid="8972942600800349990">"‏אנשי הקשר בכרטיס ה-SIM"</string>
-    <string name="menu_callNumber" msgid="1898333075466418368">"התקשרות אל <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"לא ניתן להתקשר אל המספר הזה"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_dialpad_back">ניווט חזרה</string>
+  <string name="description_dialpad_overflow">אפשרויות נוספות</string>
+  <string name="description_delete_button">Backspace</string>
+  <string name="description_image_button_plus">הוספת סימן פלוס</string>
+  <string name="description_voicemail_button">התקשרות לתא הקולי</string>
+  <string name="description_dial_button">חיוג</string>
+  <string name="dialog_voicemail_airplane_mode_message">כדי להתקשר לתא הקולי, קודם עליך להשבית את מצב הטיסה.</string>
+  <string name="dialog_voicemail_not_ready_message">כדי להגדיר את התא הקולי, עליך להיכנס לתפריט &gt; הגדרות.</string>
+  <string name="add_2sec_pause">הוספת השהיה של 2 שניות</string>
+  <string name="add_wait">הוספת השהיה</string>
+  <string name="dialer_useDtmfDialpad">שימוש במקלדת עם צלילי חיוג</string>
+  <string name="dialer_returnToInCallScreen">חזרה לשיחה הפעילה</string>
+  <string name="dialer_addAnotherCall">הוספת שיחה</string>
+  <string name="imei">IMEI</string>
+  <string name="meid">MEID</string>
+  <string name="simContacts_emptyLoading">‏אנחנו טוענים מכרטיס ה-SIM…</string>
+  <string name="simContacts_title">‏אנשי הקשר בכרטיס ה-SIM</string>
+  <string name="menu_callNumber">התקשרות אל %s</string>
+  <string name="dialpad_hint_emergency_calling_not_available">‏לא ניתן להתקשר לשירותי חירום דרך רשת Wi-Fi</string>
+  <string msgid="4313552620858880999" name="dialog_phone_call_prohibited_message">לא ניתן להתקשר אל המספר הזה</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-ja/strings.xml b/java/com/android/dialer/dialpadview/res/values-ja/strings.xml
index 78ab67a..3ef1dbc 100644
--- a/java/com/android/dialer/dialpadview/res/values-ja/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-ja/strings.xml
@@ -1,39 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_dialpad_back" msgid="6226488105558971135">"戻る"</string>
-    <string name="description_dialpad_overflow" msgid="5984341386518189787">"その他のオプション"</string>
-    <string name="description_delete_button" msgid="8431313818404527096">"Backspace"</string>
-    <string name="description_image_button_plus" msgid="8936338119824589388">"足す"</string>
-    <string name="description_voicemail_button" msgid="4187006295368768215">"ボイスメール"</string>
-    <string name="description_dial_button" msgid="6826108965053146374">"発信"</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"機内モードを OFF にしてからボイスメールを呼び出してください。"</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"ボイスメールを設定するには、[メニュー] &gt; [設定] の順に開いてください。"</string>
-    <string name="add_2sec_pause" msgid="395591627218789322">"2 秒間の停止を追加"</string>
-    <string name="add_wait" msgid="2278146476349811062">"待機を追加"</string>
-    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"プッシュホン式キーパッドを使う"</string>
-    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"通話に戻る"</string>
-    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"通話を追加"</string>
-    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
-    <string name="meid" msgid="5274167198744847659">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"SIM カードから読み込み中…"</string>
-    <string name="simContacts_title" msgid="8972942600800349990">"SIM カードの連絡先"</string>
-    <string name="menu_callNumber" msgid="1898333075466418368">"<xliff:g id="NUMBER">%s</xliff:g> に発信"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"この番号に発信できません"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_dialpad_back">戻る</string>
+  <string name="description_dialpad_overflow">その他のオプション</string>
+  <string name="description_delete_button">Backspace</string>
+  <string name="description_image_button_plus">プラス記号を追加</string>
+  <string name="description_voicemail_button">ボイスメール サービスを呼び出す</string>
+  <string name="description_dial_button">発信</string>
+  <string name="dialog_voicemail_airplane_mode_message">機内モードを OFF にしてからボイスメールを呼び出してください。</string>
+  <string name="dialog_voicemail_not_ready_message">ボイスメールを設定するには、[メニュー] &gt; [設定] の順に開いてください。</string>
+  <string name="add_2sec_pause">2 秒間の停止を追加</string>
+  <string name="add_wait">待機を追加</string>
+  <string name="dialer_useDtmfDialpad">プッシュ式キーパッドを使用</string>
+  <string name="dialer_returnToInCallScreen">通話に戻る</string>
+  <string name="dialer_addAnotherCall">通話を追加</string>
+  <string name="imei">IMEI</string>
+  <string name="meid">MEID</string>
+  <string name="simContacts_emptyLoading">SIM カードから読み込み中…</string>
+  <string name="simContacts_title">SIM カードの連絡先</string>
+  <string name="menu_callNumber">%s に発信</string>
+  <string name="dialpad_hint_emergency_calling_not_available">Wi‑Fi 経由で緊急通報を発信することはできません</string>
+  <string msgid="4313552620858880999" name="dialog_phone_call_prohibited_message">この番号に発信できません</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-ka/strings.xml b/java/com/android/dialer/dialpadview/res/values-ka/strings.xml
index 2e3b25b..1e896bf 100644
--- a/java/com/android/dialer/dialpadview/res/values-ka/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-ka/strings.xml
@@ -1,39 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_dialpad_back" msgid="6226488105558971135">"უკან დაბრუნება"</string>
-    <string name="description_dialpad_overflow" msgid="5984341386518189787">"სხვა პარამეტრები"</string>
-    <string name="description_delete_button" msgid="8431313818404527096">"უკუშლა"</string>
-    <string name="description_image_button_plus" msgid="8936338119824589388">"პლუსი"</string>
-    <string name="description_voicemail_button" msgid="4187006295368768215">"ხმოვანი ფოსტა"</string>
-    <string name="description_dial_button" msgid="6826108965053146374">"აკრეფა"</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"ხმოვან ფოსტასთან დასაკავშირებლად, პირველ რიგში, გამორთეთ თვითმფრინავის რეჟიმი."</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"ხმოვანი ფოსტის დასაყენებლად გადადით: მენიუ &gt; პარამეტრები."</string>
-    <string name="add_2sec_pause" msgid="395591627218789322">"ორწამიანი პაუზის დამატება"</string>
-    <string name="add_wait" msgid="2278146476349811062">"ლოდინის დამატება"</string>
-    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"ტონური რეჟიმის კლავიატურის გამოყენება"</string>
-    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"მიმდინარე ზარზე დაბრუნება"</string>
-    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"ზარის დამატება"</string>
-    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
-    <string name="meid" msgid="5274167198744847659">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"მიმდინარეობს ჩატვირთვა SIM ბარათიდან…"</string>
-    <string name="simContacts_title" msgid="8972942600800349990">"SIM ბარათის კონტაქტები"</string>
-    <string name="menu_callNumber" msgid="1898333075466418368">"დარეკვა <xliff:g id="NUMBER">%s</xliff:g>-ზე"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"ამ ნომერზე დარეკვა შეუძლებელია"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_dialpad_back">უკან დაბრუნება</string>
+  <string name="description_dialpad_overflow">სხვა პარამეტრები</string>
+  <string name="description_delete_button">უკუშლა</string>
+  <string name="description_image_button_plus">პლუსის აკრეფა</string>
+  <string name="description_voicemail_button">ხმოვან ფოსტაში დარეკვა</string>
+  <string name="description_dial_button">აკრეფა</string>
+  <string name="dialog_voicemail_airplane_mode_message">ხმოვან ფოსტასთან დასაკავშირებლად, პირველ რიგში, გამორთეთ თვითმფრინავის რეჟიმი.</string>
+  <string name="dialog_voicemail_not_ready_message">ხმოვანი ფოსტის დასაყენებლად გადადით: მენიუ &gt; პარამეტრები.</string>
+  <string name="add_2sec_pause">ორწამიანი პაუზის დამატება</string>
+  <string name="add_wait">ლოდინის დამატება</string>
+  <string name="dialer_useDtmfDialpad">ტონალური კლავიატურის გამოყენება</string>
+  <string name="dialer_returnToInCallScreen">მიმდინარე ზარზე დაბრუნება</string>
+  <string name="dialer_addAnotherCall">ზარის დამატება</string>
+  <string name="imei">IMEI</string>
+  <string name="meid">MEID</string>
+  <string name="simContacts_emptyLoading">მიმდინარეობს ჩატვირთვა SIM ბარათიდან…</string>
+  <string name="simContacts_title">SIM ბარათის კონტაქტები</string>
+  <string name="menu_callNumber">დარეკვა %s-ზე</string>
+  <string name="dialpad_hint_emergency_calling_not_available">გადაუდებელი ზარები Wi‑Fi-ს მეშვეობით ვერ განხორციელდება</string>
+  <string msgid="4313552620858880999" name="dialog_phone_call_prohibited_message">ამ ნომერზე დარეკვა შეუძლებელია</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-kk/strings.xml b/java/com/android/dialer/dialpadview/res/values-kk/strings.xml
index 3906017..fb1e7ba 100644
--- a/java/com/android/dialer/dialpadview/res/values-kk/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-kk/strings.xml
@@ -1,39 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_dialpad_back" msgid="6226488105558971135">"Артқа қайту"</string>
-    <string name="description_dialpad_overflow" msgid="5984341386518189787">"Басқа опциялар"</string>
-    <string name="description_delete_button" msgid="8431313818404527096">"Backspace пернесі"</string>
-    <string name="description_image_button_plus" msgid="8936338119824589388">"қосу"</string>
-    <string name="description_voicemail_button" msgid="4187006295368768215">"дауыстық пошта"</string>
-    <string name="description_dial_button" msgid="6826108965053146374">"теру"</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"Дауыстық поштаға қоңырау шалу мүмкін болуы үшін, ұшақ режимін өшіру қажет."</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"Дауыстық поштаны орнату үшін, \"Mәзір &gt; Параметрлер\" тармағына өтіңіз."</string>
-    <string name="add_2sec_pause" msgid="395591627218789322">"2 секундтық үзіліс қосу"</string>
-    <string name="add_wait" msgid="2278146476349811062">"\"Күту\" мүмкіндігін қосу"</string>
-    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"Сенсорлы және дыбысты пернетақта"</string>
-    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"Басталған қоңырауға оралу"</string>
-    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"Жаңа қоңырау қосу"</string>
-    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
-    <string name="meid" msgid="5274167198744847659">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"SIM картасынан жүктелуде..."</string>
-    <string name="simContacts_title" msgid="8972942600800349990">"SIM контактілері"</string>
-    <string name="menu_callNumber" msgid="1898333075466418368">"<xliff:g id="NUMBER">%s</xliff:g> нөміріне қоңырау шалу"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"Бұл нөмірге қоңырау шалу мүмкін емес"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_dialpad_back">Артқа қайту</string>
+  <string name="description_dialpad_overflow">Басқа опциялар</string>
+  <string name="description_delete_button">Backspace пернесі</string>
+  <string name="description_image_button_plus">қосу таңбасын теру</string>
+  <string name="description_voicemail_button">дауыстық хабар қызметіне қоңырау шалу</string>
+  <string name="description_dial_button">теру</string>
+  <string name="dialog_voicemail_airplane_mode_message">Дауыстық поштаға қоңырау шалу мүмкін болуы үшін, ұшақ режимін өшіру қажет.</string>
+  <string name="dialog_voicemail_not_ready_message">Дауыстық поштаны орнату үшін, \"Mәзір &gt; Параметрлер\" тармағына өтіңіз.</string>
+  <string name="add_2sec_pause">2 секундтық үзіліс қосу</string>
+  <string name="add_wait">\"Күту\" мүмкіндігін қосу</string>
+  <string name="dialer_useDtmfDialpad">Сенсорлы және дыбысты пернетақта</string>
+  <string name="dialer_returnToInCallScreen">Басталған қоңырауға оралу</string>
+  <string name="dialer_addAnotherCall">Жаңа қоңырау қосу</string>
+  <string name="imei">IMEI</string>
+  <string name="meid">MEID</string>
+  <string name="simContacts_emptyLoading">SIM картасынан жүктелуде...</string>
+  <string name="simContacts_title">SIM контактілері</string>
+  <string name="menu_callNumber">%s нөміріне қоңырау шалу</string>
+  <string name="dialpad_hint_emergency_calling_not_available">Жедел қызметке Wi-Fi арқылы қоңырау шалынбайды</string>
+  <string msgid="4313552620858880999" name="dialog_phone_call_prohibited_message">Бұл нөмірге қоңырау шалу мүмкін емес</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-km/strings.xml b/java/com/android/dialer/dialpadview/res/values-km/strings.xml
index 12b04a5..5ffae6c 100644
--- a/java/com/android/dialer/dialpadview/res/values-km/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-km/strings.xml
@@ -1,39 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_dialpad_back" msgid="6226488105558971135">"រក​មើលថយ​ក្រោយ​វិញ"</string>
-    <string name="description_dialpad_overflow" msgid="5984341386518189787">"ជម្រើស​បន្ថែម"</string>
-    <string name="description_delete_button" msgid="8431313818404527096">"លុប​ថយក្រោយ"</string>
-    <string name="description_image_button_plus" msgid="8936338119824589388">"plus"</string>
-    <string name="description_voicemail_button" msgid="4187006295368768215">"សារ​ជា​សំឡេង"</string>
-    <string name="description_dial_button" msgid="6826108965053146374">"ចុច"</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"ដើម្បី​ហៅ​សារ​ជា​សំឡេង ដំបូង​ត្រូវ​បិទ​​មុខងារ​​ពេល​ជិះ​យន្តហោះ។"</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"ដើម្បី​កំណត់​សារ​ជា​សំឡេង ចូល​ម៉ឺនុយ &gt; ការ​កំណត់។"</string>
-    <string name="add_2sec_pause" msgid="395591627218789322">"បញ្ចូល​ការផ្អាក 2 វិនាទី"</string>
-    <string name="add_wait" msgid="2278146476349811062">"បញ្ចូល​ការ​រង់ចាំ"</string>
-    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"ប្រើ​សំឡេង​ប៉ះ​បន្ទះ​លេខ"</string>
-    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"កំពុង​ត្រឡប់​ទៅកាន់​ការ​ហៅ"</string>
-    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"បញ្ចូល​ការហៅទូរសព្ទ"</string>
-    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
-    <string name="meid" msgid="5274167198744847659">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"កំពុង​ផ្ទុក​ពី​ស៊ីម​កាត..."</string>
-    <string name="simContacts_title" msgid="8972942600800349990">"ទំនាក់ទំនង​នៅ​ក្នុង​ស៊ីម​កាត"</string>
-    <string name="menu_callNumber" msgid="1898333075466418368">"ហៅ​ទៅ​កាន់ <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"មិនអាចហៅ​ទៅ​កាន់​លេខនេះបានទេ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_dialpad_back">រក​មើលថយ​ក្រោយ​វិញ</string>
+  <string name="description_dialpad_overflow">ជម្រើស​បន្ថែម</string>
+  <string name="description_delete_button">លុប​ថយក្រោយ</string>
+  <string name="description_image_button_plus">ចុច​សញ្ញា​បូក</string>
+  <string name="description_voicemail_button">ហៅ​ជា​សារ​សំឡេង</string>
+  <string name="description_dial_button">ចុច</string>
+  <string name="dialog_voicemail_airplane_mode_message">ដើម្បី​ហៅ​សារ​ជា​សំឡេង ដំបូង​ត្រូវ​បិទ​​មុខងារ​​ពេល​ជិះ​យន្តហោះ។</string>
+  <string name="dialog_voicemail_not_ready_message">ដើម្បី​កំណត់​សារ​ជា​សំឡេង ចូល​ម៉ឺនុយ &gt; ការ​កំណត់។</string>
+  <string name="add_2sec_pause">បញ្ចូល​ការផ្អាក 2 វិនាទី</string>
+  <string name="add_wait">បញ្ចូល​ការ​រង់ចាំ</string>
+  <string name="dialer_useDtmfDialpad">ប្រើ​បន្ទះ​ចុច​លេខ​តាម​ការប៉ះ​ជា​សំឡេង</string>
+  <string name="dialer_returnToInCallScreen">កំពុង​ត្រឡប់​ទៅកាន់​ការ​ហៅ</string>
+  <string name="dialer_addAnotherCall">បញ្ចូល​ការហៅទូរសព្ទ</string>
+  <string name="imei">IMEI</string>
+  <string name="meid">MEID</string>
+  <string name="simContacts_emptyLoading">កំពុង​ផ្ទុក​ពី​ស៊ីម​កាត...</string>
+  <string name="simContacts_title">ទំនាក់ទំនង​នៅ​ក្នុង​ស៊ីម​កាត</string>
+  <string name="menu_callNumber">ហៅ​ទៅ​កាន់ %s</string>
+  <string name="dialpad_hint_emergency_calling_not_available">មិន​អាចធ្វើការ​ហៅ​បន្ទាន់​តាម WiFi បានទេ</string>
+  <string msgid="4313552620858880999" name="dialog_phone_call_prohibited_message">មិនអាចហៅ​ទៅ​កាន់​លេខនេះបានទេ</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-kn/strings.xml b/java/com/android/dialer/dialpadview/res/values-kn/strings.xml
index afc99b6..3134797 100644
--- a/java/com/android/dialer/dialpadview/res/values-kn/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-kn/strings.xml
@@ -1,39 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_dialpad_back" msgid="6226488105558971135">"ಹಿಂದಕ್ಕೆ ನ್ಯಾವಿಗೇಟ್ ಮಾಡು"</string>
-    <string name="description_dialpad_overflow" msgid="5984341386518189787">"ಇನ್ನಷ್ಟು ಆಯ್ಕೆಗಳು"</string>
-    <string name="description_delete_button" msgid="8431313818404527096">"backspace"</string>
-    <string name="description_image_button_plus" msgid="8936338119824589388">"ಸಂಕಲನ"</string>
-    <string name="description_voicemail_button" msgid="4187006295368768215">"ಧ್ವನಿಮೇಲ್"</string>
-    <string name="description_dial_button" msgid="6826108965053146374">"ಡಯಲ್"</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"ಧ್ವನಿಮೇಲ್‌ಗೆ ಕರೆ ಮಾಡಲು, ಮೊದಲು ಏರ್‌ಪ್ಲೇನ್‌‌ ಮೋಡ್‌‌ ಆಫ್‌ ಮಾಡಿ."</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"ಧ್ವನಿಮೇಲ್‌ ಹೊಂದಿಸಲು, ಮೆನು &gt; ಸೆಟ್ಟಿಂಗ್‌ಗಳುಗೆ ಹೋಗಿ."</string>
-    <string name="add_2sec_pause" msgid="395591627218789322">"2-ಸೆ ವಿರಾಮವನ್ನು ಸೇರಿಸಿ"</string>
-    <string name="add_wait" msgid="2278146476349811062">"ನಿರೀಕ್ಷೆಯನ್ನು ಸೇರಿಸಿ"</string>
-    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"ಸ್ಪರ್ಶ ಟೋನ್ ಕೀಪ್ಯಾಡ್ ಬಳಸಿ"</string>
-    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"ಪ್ರತ್ಯತ್ತರ ಕರೆಯು ಪ್ರಗತಿಯಲ್ಲಿದೆ"</string>
-    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"ಕರೆಯನ್ನು ಸೇರಿಸಿ"</string>
-    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
-    <string name="meid" msgid="5274167198744847659">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"ಸಿಮ್‌ ಕಾರ್ಡ್‌ನಿಂದ ಲೋಡ್‌ ಮಾಡಲಾಗುತ್ತಿದೆ…"</string>
-    <string name="simContacts_title" msgid="8972942600800349990">"ಸಿಮ್‌ ಕಾರ್ಡ್‌ ಸಂಪರ್ಕಗಳು"</string>
-    <string name="menu_callNumber" msgid="1898333075466418368">"<xliff:g id="NUMBER">%s</xliff:g> ಕರೆ ಮಾಡಿ"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"ಈ ಸಂಖ್ಯೆಗೆ ಕರೆ ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_dialpad_back">ಹಿಂದಕ್ಕೆ ನ್ಯಾವಿಗೇಟ್ ಮಾಡು</string>
+  <string name="description_dialpad_overflow">ಇನ್ನಷ್ಟು ಆಯ್ಕೆಗಳು</string>
+  <string name="description_delete_button">backspace</string>
+  <string name="description_image_button_plus">ಡಯಲ್ ಪ್ಲಸ್</string>
+  <string name="description_voicemail_button">ಧ್ವನಿಮೇಲ್‌‌ಗೆ ಕರೆ ಮಾಡಿ</string>
+  <string name="description_dial_button">ಡಯಲ್</string>
+  <string name="dialog_voicemail_airplane_mode_message">ಧ್ವನಿಮೇಲ್‌ಗೆ ಕರೆ ಮಾಡಲು, ಮೊದಲು ಏರ್‌ಪ್ಲೇನ್‌‌ ಮೋಡ್‌‌ ಆಫ್‌ ಮಾಡಿ.</string>
+  <string name="dialog_voicemail_not_ready_message">ಧ್ವನಿಮೇಲ್‌ ಹೊಂದಿಸಲು, ಮೆನು &gt; ಸೆಟ್ಟಿಂಗ್‌ಗಳುಗೆ ಹೋಗಿ.</string>
+  <string name="add_2sec_pause">2-ಸೆ ವಿರಾಮವನ್ನು ಸೇರಿಸಿ</string>
+  <string name="add_wait">ನಿರೀಕ್ಷೆಯನ್ನು ಸೇರಿಸಿ</string>
+  <string name="dialer_useDtmfDialpad">ಟಚ್ ಟೋನ್ ಕೀಪ್ಯಾಡ್ ಬಳಸಿ</string>
+  <string name="dialer_returnToInCallScreen">ಪ್ರತ್ಯತ್ತರ ಕರೆಯು ಪ್ರಗತಿಯಲ್ಲಿದೆ</string>
+  <string name="dialer_addAnotherCall">ಕರೆಯನ್ನು ಸೇರಿಸಿ</string>
+  <string name="imei">IMEI</string>
+  <string name="meid">MEID</string>
+  <string name="simContacts_emptyLoading">ಸಿಮ್‌ ಕಾರ್ಡ್‌ನಿಂದ ಲೋಡ್‌ ಮಾಡಲಾಗುತ್ತಿದೆ…</string>
+  <string name="simContacts_title">ಸಿಮ್‌ ಕಾರ್ಡ್‌ ಸಂಪರ್ಕಗಳು</string>
+  <string name="menu_callNumber">%s ಕರೆ ಮಾಡಿ</string>
+  <string name="dialpad_hint_emergency_calling_not_available">ವೈ-ಫೈ ಮೂಲಕ ತುರ್ತು ಕರೆಗಳನ್ನು ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ</string>
+  <string msgid="4313552620858880999" name="dialog_phone_call_prohibited_message">ಈ ಸಂಖ್ಯೆಗೆ ಕರೆ ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-ko/strings.xml b/java/com/android/dialer/dialpadview/res/values-ko/strings.xml
index 8366ec5..58ed421 100644
--- a/java/com/android/dialer/dialpadview/res/values-ko/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-ko/strings.xml
@@ -1,39 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_dialpad_back" msgid="6226488105558971135">"뒤로 이동"</string>
-    <string name="description_dialpad_overflow" msgid="5984341386518189787">"옵션 더보기"</string>
-    <string name="description_delete_button" msgid="8431313818404527096">"백스페이스"</string>
-    <string name="description_image_button_plus" msgid="8936338119824589388">"더하기"</string>
-    <string name="description_voicemail_button" msgid="4187006295368768215">"음성사서함"</string>
-    <string name="description_dial_button" msgid="6826108965053146374">"전화걸기"</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"음성사서함 메시지를 확인하려면 먼저 비행기 모드를 해제하세요."</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"음성사서함을 설정하려면 메뉴 &gt; 설정으로 이동하세요."</string>
-    <string name="add_2sec_pause" msgid="395591627218789322">"2초간 일시중지 추가"</string>
-    <string name="add_wait" msgid="2278146476349811062">"대기 시간 추가"</string>
-    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"터치톤 키패드 사용"</string>
-    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"진행 중인 통화로 돌아가기"</string>
-    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"통화 추가"</string>
-    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
-    <string name="meid" msgid="5274167198744847659">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"SIM 카드에서 로딩 중…"</string>
-    <string name="simContacts_title" msgid="8972942600800349990">"SIM 카드 연락처"</string>
-    <string name="menu_callNumber" msgid="1898333075466418368">"<xliff:g id="NUMBER">%s</xliff:g>에 전화걸기"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"이 번호에 전화를 걸 수 없습니다."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_dialpad_back">뒤로 이동</string>
+  <string name="description_dialpad_overflow">옵션 더보기</string>
+  <string name="description_delete_button">백스페이스</string>
+  <string name="description_image_button_plus">더하기 기호 추가</string>
+  <string name="description_voicemail_button">음성사서함 메시지 남기기</string>
+  <string name="description_dial_button">전화걸기</string>
+  <string name="dialog_voicemail_airplane_mode_message">음성사서함 메시지를 확인하려면 먼저 비행기 모드를 해제하세요.</string>
+  <string name="dialog_voicemail_not_ready_message">음성사서함을 설정하려면 메뉴 &gt; 설정으로 이동하세요.</string>
+  <string name="add_2sec_pause">2초간 일시중지 추가</string>
+  <string name="add_wait">대기 시간 추가</string>
+  <string name="dialer_useDtmfDialpad">터치톤 키패드 사용</string>
+  <string name="dialer_returnToInCallScreen">진행 중인 통화로 돌아가기</string>
+  <string name="dialer_addAnotherCall">통화 추가</string>
+  <string name="imei">IMEI</string>
+  <string name="meid">MEID</string>
+  <string name="simContacts_emptyLoading">SIM 카드에서 로딩 중…</string>
+  <string name="simContacts_title">SIM 카드 연락처</string>
+  <string name="menu_callNumber">%s에 전화걸기</string>
+  <string name="dialpad_hint_emergency_calling_not_available">Wi‑Fi로는 긴급 전화를 걸 수 없습니다.</string>
+  <string msgid="4313552620858880999" name="dialog_phone_call_prohibited_message">이 번호에 전화를 걸 수 없습니다.</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-ky/strings.xml b/java/com/android/dialer/dialpadview/res/values-ky/strings.xml
index 8ce1727..86e1371 100644
--- a/java/com/android/dialer/dialpadview/res/values-ky/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-ky/strings.xml
@@ -1,39 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_dialpad_back" msgid="6226488105558971135">"Артка кайтуу"</string>
-    <string name="description_dialpad_overflow" msgid="5984341386518189787">"Көбүрөөк мүмкүнчүлүктөр"</string>
-    <string name="description_delete_button" msgid="8431313818404527096">"артка карай өчүрүү"</string>
-    <string name="description_image_button_plus" msgid="8936338119824589388">"кошуу"</string>
-    <string name="description_voicemail_button" msgid="4187006295368768215">"үн почтасы"</string>
-    <string name="description_dial_button" msgid="6826108965053146374">"терүү"</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"Үн почтасын текшерүү үчүн, алгач Учак режимин өчүрүңүз."</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"Үн почтасын жөндөө үчүн Меню &gt; Жөндөөлөргө кириңиз."</string>
-    <string name="add_2sec_pause" msgid="395591627218789322">"2-сек. тыныгууну кошуңуз"</string>
-    <string name="add_wait" msgid="2278146476349811062">"Тыныгуу кошуу"</string>
-    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"Тоналдык терүү тактасын колдонуу"</string>
-    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"Аткарылып жаткан чалууга кайтуу"</string>
-    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"Чалууну кошуу"</string>
-    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
-    <string name="meid" msgid="5274167198744847659">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"SIM-картадан жүктөлүүдө…"</string>
-    <string name="simContacts_title" msgid="8972942600800349990">"SIM картадагы байланыштар"</string>
-    <string name="menu_callNumber" msgid="1898333075466418368">"<xliff:g id="NUMBER">%s</xliff:g> номерине чалуу"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"Бул номерге чалуу мүмкүн болбой жатат"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_dialpad_back">Артка кайтуу</string>
+  <string name="description_dialpad_overflow">Көбүрөөк мүмкүнчүлүктөр</string>
+  <string name="description_delete_button">артка карай өчүрүү</string>
+  <string name="description_image_button_plus">кошуу белгисин терүү</string>
+  <string name="description_voicemail_button">үн почтасына чалуу</string>
+  <string name="description_dial_button">терүү</string>
+  <string name="dialog_voicemail_airplane_mode_message">Үн почтасын текшерүү үчүн, алгач Учак режимин өчүрүңүз.</string>
+  <string name="dialog_voicemail_not_ready_message">Үн почтасын жөндөө үчүн Меню &gt; Жөндөөлөргө кириңиз.</string>
+  <string name="add_2sec_pause">2-сек. тыныгууну кошуңуз</string>
+  <string name="add_wait">Тыныгуу кошуу</string>
+  <string name="dialer_useDtmfDialpad">Тоналдык терүү тактасын колдонуу</string>
+  <string name="dialer_returnToInCallScreen">Аткарылып жаткан чалууга кайтуу</string>
+  <string name="dialer_addAnotherCall">Чалууну кошуу</string>
+  <string name="imei">IMEI</string>
+  <string name="meid">MEID</string>
+  <string name="simContacts_emptyLoading">SIM-картадан жүктөлүүдө…</string>
+  <string name="simContacts_title">SIM картадагы байланыштар</string>
+  <string name="menu_callNumber">%s номерине чалуу</string>
+  <string name="dialpad_hint_emergency_calling_not_available">WiFi аркылуу шашылыш чалуулар иштетилген жок</string>
+  <string msgid="4313552620858880999" name="dialog_phone_call_prohibited_message">Бул номерге чалуу мүмкүн болбой жатат</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-lo/strings.xml b/java/com/android/dialer/dialpadview/res/values-lo/strings.xml
index a69e28e..59711e0 100644
--- a/java/com/android/dialer/dialpadview/res/values-lo/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-lo/strings.xml
@@ -1,39 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_dialpad_back" msgid="6226488105558971135">"ນຳທາງກັບຄືນ"</string>
-    <string name="description_dialpad_overflow" msgid="5984341386518189787">"ໂຕເລືອກເພີ່ມເຕີມ"</string>
-    <string name="description_delete_button" msgid="8431313818404527096">"ປຸ່ມ backspace"</string>
-    <string name="description_image_button_plus" msgid="8936338119824589388">"ບວກ"</string>
-    <string name="description_voicemail_button" msgid="4187006295368768215">"ຂໍ້ຄວາມສຽງ"</string>
-    <string name="description_dial_button" msgid="6826108965053146374">"ໂທ"</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"ທ່ານຕ້ອງປິດໂໝດຢູ່ເທິງຍົນກ່ອນເພື່ອໂທຫາເບີຂໍ້ຄວາມສຽງ."</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"ເພື່ອຕັ້ງຄ່າຂໍ້ຄວາມສຽງ ໃຫ້ໄປທີ່ ເມນູ &gt; ການຕັ້ງຄ່າ."</string>
-    <string name="add_2sec_pause" msgid="395591627218789322">"ເພີ່ມການຂັ້ນເວລາ 2 ວິນາທີ"</string>
-    <string name="add_wait" msgid="2278146476349811062">"ເພີ່ມການລໍຖ້າ"</string>
-    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"ໃຊ້ປຸ່ມກົດສັນຍານສຽງ"</string>
-    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"ກັບໄປການໂທທີ່ກຳລັງດຳເນີນຢູ່"</string>
-    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"ເພີ່ມການໂທ"</string>
-    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
-    <string name="meid" msgid="5274167198744847659">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"ກຳລັງໂຫລດຈາກ SIM card..."</string>
-    <string name="simContacts_title" msgid="8972942600800349990">"ລາຍຊື່ຜູ້ຕິດຕໍ່ SIM card"</string>
-    <string name="menu_callNumber" msgid="1898333075466418368">"ໂທ​ຫາ <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"ບໍ່​ສາ​ມາດ​ໂທ​ຫາ​ເບີ​ນີ້​ໄດ້"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_dialpad_back">ນຳທາງກັບຄືນ</string>
+  <string name="description_dialpad_overflow">ໂຕເລືອກເພີ່ມເຕີມ</string>
+  <string name="description_delete_button">ປຸ່ມ backspace</string>
+  <string name="description_image_button_plus">ແປ້ນພິມບວກ</string>
+  <string name="description_voicemail_button">ໂທຫາເບີຂໍ້ຄວາມສຽງ</string>
+  <string name="description_dial_button">ໂທ</string>
+  <string name="dialog_voicemail_airplane_mode_message">ທ່ານຕ້ອງປິດໂໝດຢູ່ເທິງຍົນກ່ອນເພື່ອໂທຫາເບີຂໍ້ຄວາມສຽງ.</string>
+  <string name="dialog_voicemail_not_ready_message">ເພື່ອຕັ້ງຄ່າຂໍ້ຄວາມສຽງ ໃຫ້ໄປທີ່ ເມນູ &gt; ການຕັ້ງຄ່າ.</string>
+  <string name="add_2sec_pause">ເພີ່ມການຂັ້ນເວລາ 2 ວິນາທີ</string>
+  <string name="add_wait">ເພີ່ມການລໍຖ້າ</string>
+  <string name="dialer_useDtmfDialpad">ໃຊ້ປຸ່ມກົດສັນຍານສຽງ</string>
+  <string name="dialer_returnToInCallScreen">ກັບໄປການໂທທີ່ກຳລັງດຳເນີນຢູ່</string>
+  <string name="dialer_addAnotherCall">ເພີ່ມການໂທ</string>
+  <string name="imei">IMEI</string>
+  <string name="meid">MEID</string>
+  <string name="simContacts_emptyLoading">ກຳລັງໂຫລດຈາກ SIM card...</string>
+  <string name="simContacts_title">ລາຍຊື່ຜູ້ຕິດຕໍ່ SIM card</string>
+  <string name="menu_callNumber">ໂທ​ຫາ %s</string>
+  <string name="dialpad_hint_emergency_calling_not_available">ບໍ່ສາມາດໂທສຸກເສີນຜ່ານ Wi‑Fi ໄດ້</string>
+  <string msgid="4313552620858880999" name="dialog_phone_call_prohibited_message">ບໍ່​ສາ​ມາດ​ໂທ​ຫາ​ເບີ​ນີ້​ໄດ້</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-lt/strings.xml b/java/com/android/dialer/dialpadview/res/values-lt/strings.xml
index 3f09cdc..058439a 100644
--- a/java/com/android/dialer/dialpadview/res/values-lt/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-lt/strings.xml
@@ -1,39 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_dialpad_back" msgid="6226488105558971135">"Eiti atgal"</string>
-    <string name="description_dialpad_overflow" msgid="5984341386518189787">"Daugiau parinkčių"</string>
-    <string name="description_delete_button" msgid="8431313818404527096">"naikinimo klavišas"</string>
-    <string name="description_image_button_plus" msgid="8936338119824589388">"sudėties ženklas"</string>
-    <string name="description_voicemail_button" msgid="4187006295368768215">"balso pašto pranešimas"</string>
-    <string name="description_dial_button" msgid="6826108965053146374">"rinkti numerį"</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"Jei norite skambinti į balso paštą, išjunkite lėktuvo režimą."</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"Jei norite nustatyti balso paštą, eikite į meniu &gt; „Nustatymai“."</string>
-    <string name="add_2sec_pause" msgid="395591627218789322">"Pridėti 2 sek. pauzę"</string>
-    <string name="add_wait" msgid="2278146476349811062">"Pridėti laukimą"</string>
-    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"Naudoti jutiklinę tonų klaviatūrą"</string>
-    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"Grįžti prie vykdomo skambučio"</string>
-    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"Pridėti skambutį"</string>
-    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
-    <string name="meid" msgid="5274167198744847659">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"Įkeliama iš SIM kortelės..."</string>
-    <string name="simContacts_title" msgid="8972942600800349990">"SIM kortelės kontaktai"</string>
-    <string name="menu_callNumber" msgid="1898333075466418368">"Skambinti <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"Negalima skambinti šiuo numeriu"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_dialpad_back">Eiti atgal</string>
+  <string name="description_dialpad_overflow">Daugiau parinkčių</string>
+  <string name="description_delete_button">naikinimo klavišas</string>
+  <string name="description_image_button_plus">pridėti pliusą</string>
+  <string name="description_voicemail_button">skambinti į balso pašto paslaugą</string>
+  <string name="description_dial_button">rinkti numerį</string>
+  <string name="dialog_voicemail_airplane_mode_message">Jei norite skambinti į balso paštą, išjunkite lėktuvo režimą.</string>
+  <string name="dialog_voicemail_not_ready_message">Jei norite nustatyti balso paštą, eikite į meniu &gt; „Nustatymai“.</string>
+  <string name="add_2sec_pause">Pridėti 2 sek. pauzę</string>
+  <string name="add_wait">Pridėti laukimą</string>
+  <string name="dialer_useDtmfDialpad">Naudoti jutiklinę tonų klaviatūrą</string>
+  <string name="dialer_returnToInCallScreen">Grįžti prie vykdomo skambučio</string>
+  <string name="dialer_addAnotherCall">Pridėti skambutį</string>
+  <string name="imei">IMEI</string>
+  <string name="meid">MEID</string>
+  <string name="simContacts_emptyLoading">Įkeliama iš SIM kortelės...</string>
+  <string name="simContacts_title">SIM kortelės kontaktai</string>
+  <string name="menu_callNumber">Skambinti %s</string>
+  <string name="dialpad_hint_emergency_calling_not_available">Negalima skambinti pagalbos numeriu naudojant „Wi‑Fi“</string>
+  <string msgid="4313552620858880999" name="dialog_phone_call_prohibited_message">Negalima skambinti šiuo numeriu</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-lv/strings.xml b/java/com/android/dialer/dialpadview/res/values-lv/strings.xml
index bcc2039..c2bab3a 100644
--- a/java/com/android/dialer/dialpadview/res/values-lv/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-lv/strings.xml
@@ -1,39 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_dialpad_back" msgid="6226488105558971135">"Pāriet atpakaļ"</string>
-    <string name="description_dialpad_overflow" msgid="5984341386518189787">"Vairāk opciju"</string>
-    <string name="description_delete_button" msgid="8431313818404527096">"atpakaļatkāpe"</string>
-    <string name="description_image_button_plus" msgid="8936338119824589388">"pluszīme"</string>
-    <string name="description_voicemail_button" msgid="4187006295368768215">"balss pasts"</string>
-    <string name="description_dial_button" msgid="6826108965053146374">"sastādīt numuru"</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"Lai piekļūtu balss pastam, vispirms izslēdziet lidojuma režīmu."</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"Lai iestatītu balss pastu, atveriet sadaļu Izvēlne &gt; Iestatījumi."</string>
-    <string name="add_2sec_pause" msgid="395591627218789322">"Pievienot 2 sekundes ilgu pauzi"</string>
-    <string name="add_wait" msgid="2278146476349811062">"Pievienot gaidīšanas funkciju"</string>
-    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"Izmantot skārientastatūru"</string>
-    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"Atgriezties pie pašreizējā zvana"</string>
-    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"Pievienot zvanu"</string>
-    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
-    <string name="meid" msgid="5274167198744847659">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"Notiek ielāde no SIM kartes..."</string>
-    <string name="simContacts_title" msgid="8972942600800349990">"SIM kartes kontaktpersonas"</string>
-    <string name="menu_callNumber" msgid="1898333075466418368">"Zvanīt: <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"Uz šo numuru nevar piezvanīt."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_dialpad_back">Pāriet atpakaļ</string>
+  <string name="description_dialpad_overflow">Vairāk opciju</string>
+  <string name="description_delete_button">atpakaļatkāpe</string>
+  <string name="description_image_button_plus">ievadīt pluszīmi</string>
+  <string name="description_voicemail_button">zvanīt balss pastam</string>
+  <string name="description_dial_button">sastādīt numuru</string>
+  <string name="dialog_voicemail_airplane_mode_message">Lai piekļūtu balss pastam, vispirms izslēdziet lidojuma režīmu.</string>
+  <string name="dialog_voicemail_not_ready_message">Lai iestatītu balss pastu, atveriet sadaļu Izvēlne &gt; Iestatījumi.</string>
+  <string name="add_2sec_pause">Pievienot 2 sekundes ilgu pauzi</string>
+  <string name="add_wait">Pievienot gaidīšanas funkciju</string>
+  <string name="dialer_useDtmfDialpad">Izmantot skārientastatūru</string>
+  <string name="dialer_returnToInCallScreen">Atgriezties pie pašreizējā zvana</string>
+  <string name="dialer_addAnotherCall">Pievienot zvanu</string>
+  <string name="imei">IMEI</string>
+  <string name="meid">MEID</string>
+  <string name="simContacts_emptyLoading">Notiek ielāde no SIM kartes...</string>
+  <string name="simContacts_title">SIM kartes kontaktpersonas</string>
+  <string name="menu_callNumber">Zvanīt: %s</string>
+  <string name="dialpad_hint_emergency_calling_not_available">Izmantojot Wi-Fi, nevar veikt ārkārtas izsaukumus.</string>
+  <string msgid="4313552620858880999" name="dialog_phone_call_prohibited_message">Uz šo numuru nevar piezvanīt.</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-mk/strings.xml b/java/com/android/dialer/dialpadview/res/values-mk/strings.xml
index f98deb4..b1645d9 100644
--- a/java/com/android/dialer/dialpadview/res/values-mk/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-mk/strings.xml
@@ -1,39 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_dialpad_back" msgid="6226488105558971135">"Оди назад"</string>
-    <string name="description_dialpad_overflow" msgid="5984341386518189787">"Повеќе опции"</string>
-    <string name="description_delete_button" msgid="8431313818404527096">"избриши"</string>
-    <string name="description_image_button_plus" msgid="8936338119824589388">"плус"</string>
-    <string name="description_voicemail_button" msgid="4187006295368768215">"говорна пошта"</string>
-    <string name="description_dial_button" msgid="6826108965053146374">"бирај"</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"За да се јавите во говорна пошта, исклучете го авионскиот режим."</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"За поставување говорна пошта, одете во Мени &gt; Поставки."</string>
-    <string name="add_2sec_pause" msgid="395591627218789322">"Додај пауза од 2 сек."</string>
-    <string name="add_wait" msgid="2278146476349811062">"Додај чекање"</string>
-    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"Користете тастатура со тонско бирање"</string>
-    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"Вратете се на повик во тек"</string>
-    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"Додај повик"</string>
-    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
-    <string name="meid" msgid="5274167198744847659">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"Се вчитува од SIM-картичка…"</string>
-    <string name="simContacts_title" msgid="8972942600800349990">"Контакти од SIM-картичка"</string>
-    <string name="menu_callNumber" msgid="1898333075466418368">"Повикај <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"Бројот не може да се повика"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_dialpad_back">Оди назад</string>
+  <string name="description_dialpad_overflow">Повеќе опции</string>
+  <string name="description_delete_button">избриши</string>
+  <string name="description_image_button_plus">бирај плус</string>
+  <string name="description_voicemail_button">повикајте ја говорната пошта</string>
+  <string name="description_dial_button">бирај</string>
+  <string name="dialog_voicemail_airplane_mode_message">За да се јавите во говорна пошта, исклучете го авионскиот режим.</string>
+  <string name="dialog_voicemail_not_ready_message">За поставување говорна пошта, одете во Мени &gt; Поставки.</string>
+  <string name="add_2sec_pause">Додај пауза од 2 сек.</string>
+  <string name="add_wait">Додај чекање</string>
+  <string name="dialer_useDtmfDialpad">Користете тастатура со звуци на допир</string>
+  <string name="dialer_returnToInCallScreen">Вратете се на повик во тек</string>
+  <string name="dialer_addAnotherCall">Додај повик</string>
+  <string name="imei">IMEI</string>
+  <string name="meid">MEID</string>
+  <string name="simContacts_emptyLoading">Се вчитува од SIM-картичка…</string>
+  <string name="simContacts_title">Контакти од SIM-картичка</string>
+  <string name="menu_callNumber">Повикај %s</string>
+  <string name="dialpad_hint_emergency_calling_not_available">Не може да се воспоставуваат итни повици преку Wi-Fi</string>
+  <string msgid="4313552620858880999" name="dialog_phone_call_prohibited_message">Бројот не може да се повика</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-ml/strings.xml b/java/com/android/dialer/dialpadview/res/values-ml/strings.xml
index 77033aa..61c0a35 100644
--- a/java/com/android/dialer/dialpadview/res/values-ml/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-ml/strings.xml
@@ -1,39 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_dialpad_back" msgid="6226488105558971135">"തിരികെ പോകുക"</string>
-    <string name="description_dialpad_overflow" msgid="5984341386518189787">"കൂടുതൽ‍ ഓപ്‌ഷനുകള്‍"</string>
-    <string name="description_delete_button" msgid="8431313818404527096">"ബാക്ക്‌സ്‌പെയ്‌സ്"</string>
-    <string name="description_image_button_plus" msgid="8936338119824589388">"പ്ലസ്"</string>
-    <string name="description_voicemail_button" msgid="4187006295368768215">"വോയ്‌സ്‌മെയിൽ"</string>
-    <string name="description_dial_button" msgid="6826108965053146374">"ഡയൽ ചെയ്യുക"</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"വോയ്‌സ്‌മെയിൽ വിളിക്കാൻ ആദ്യം ഫ്ലൈറ്റ് മോഡ് ഓഫാക്കുക."</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"വോയ്‌സ്‌മെയിൽ സജ്ജീകരിക്കുന്നതിന്, മെനു &gt; ക്രമീകരണങ്ങൾ എന്നതിലേക്ക് പോകുക."</string>
-    <string name="add_2sec_pause" msgid="395591627218789322">"2 സെക്കൻഡ് താൽക്കാലികമായി നിർത്തൽ ചേർക്കുക"</string>
-    <string name="add_wait" msgid="2278146476349811062">"കാത്തിരിക്കൽ ചേർക്കുക"</string>
-    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"ടച്ച് ടോൺ കീപാഡ് ഉപയോഗിക്കുക"</string>
-    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"വിളിച്ചുകൊണ്ടിരിക്കുന്ന കോളിലേക്ക് മടങ്ങുക"</string>
-    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"കോൾ ചേർക്കുക"</string>
-    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
-    <string name="meid" msgid="5274167198744847659">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"സിം കാർഡിൽ നിന്നും ലോഡുചെയ്യുന്നു…"</string>
-    <string name="simContacts_title" msgid="8972942600800349990">"സിം കാർഡ് കോൺടാക്റ്റുകൾ"</string>
-    <string name="menu_callNumber" msgid="1898333075466418368">"വിളിക്കുക <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"ഈ നമ്പറിലേക്ക് കോൾ ചെയ്യാനാവില്ല"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_dialpad_back">തിരികെ പോകുക</string>
+  <string name="description_dialpad_overflow">കൂടുതൽ‍ ഓപ്‌ഷനുകള്‍</string>
+  <string name="description_delete_button">ബാക്ക്‌സ്‌പെയ്‌സ്</string>
+  <string name="description_image_button_plus">ഡയൽ പ്ലസ്</string>
+  <string name="description_voicemail_button">വോയ്‌സ്‌മെയിൽ വിളിക്കുക</string>
+  <string name="description_dial_button">ഡയൽ ചെയ്യുക</string>
+  <string name="dialog_voicemail_airplane_mode_message">വോയ്‌സ്‌മെയിൽ വിളിക്കാൻ ആദ്യം ഫ്ലൈറ്റ് മോഡ് ഓഫാക്കുക.</string>
+  <string name="dialog_voicemail_not_ready_message">വോയ്‌സ്‌മെയിൽ സജ്ജീകരിക്കുന്നതിന്, മെനു &gt; ക്രമീകരണങ്ങൾ എന്നതിലേക്ക് പോകുക.</string>
+  <string name="add_2sec_pause">2 സെക്കൻഡ് താൽക്കാലികമായി നിർത്തൽ ചേർക്കുക</string>
+  <string name="add_wait">കാത്തിരിക്കൽ ചേർക്കുക</string>
+  <string name="dialer_useDtmfDialpad">ടച്ച് ടോൺ കീപാഡ് ഉപയോഗിക്കുക</string>
+  <string name="dialer_returnToInCallScreen">വിളിച്ചുകൊണ്ടിരിക്കുന്ന കോളിലേക്ക് മടങ്ങുക</string>
+  <string name="dialer_addAnotherCall">കോൾ ചേർക്കുക</string>
+  <string name="imei">IMEI</string>
+  <string name="meid">MEID</string>
+  <string name="simContacts_emptyLoading">സിം കാർഡിൽ നിന്നും ലോഡുചെയ്യുന്നു…</string>
+  <string name="simContacts_title">സിം കാർഡ് കോൺടാക്റ്റുകൾ</string>
+  <string name="menu_callNumber">വിളിക്കുക %s</string>
+  <string name="dialpad_hint_emergency_calling_not_available">വൈഫൈ വഴി എമർജൻസി കോളുകൾ ചെയ്യാനാകില്ല</string>
+  <string msgid="4313552620858880999" name="dialog_phone_call_prohibited_message">ഈ നമ്പറിലേക്ക് കോൾ ചെയ്യാനാവില്ല</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-mn/strings.xml b/java/com/android/dialer/dialpadview/res/values-mn/strings.xml
index d03bb93..0df4b81 100644
--- a/java/com/android/dialer/dialpadview/res/values-mn/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-mn/strings.xml
@@ -1,39 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_dialpad_back" msgid="6226488105558971135">"Буцах"</string>
-    <string name="description_dialpad_overflow" msgid="5984341386518189787">"Нэмэлт сонголтууд"</string>
-    <string name="description_delete_button" msgid="8431313818404527096">"ухраах"</string>
-    <string name="description_image_button_plus" msgid="8936338119824589388">"нэмэх"</string>
-    <string name="description_voicemail_button" msgid="4187006295368768215">"дуут шуудан"</string>
-    <string name="description_dial_button" msgid="6826108965053146374">"залгах"</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"Дуут шуудан руу залгахын тулд эхлээд Нислэгийн горимыг идэвхгүй болгоно уу."</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"Дуут шууданг тохируулахын тулд Цэс &gt; Тохиргоо руу очно уу."</string>
-    <string name="add_2sec_pause" msgid="395591627218789322">"2-сек зогсолт нэмэх"</string>
-    <string name="add_wait" msgid="2278146476349811062">"Хүлээлт нэмэх"</string>
-    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"Хүрэлтээр дуугардаг гар ашиглах"</string>
-    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"Үргэлжилж буй дуудлага руу буцах"</string>
-    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"Дуудлага нэмэх"</string>
-    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
-    <string name="meid" msgid="5274167198744847659">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"SIM картаас ачаалж байна…"</string>
-    <string name="simContacts_title" msgid="8972942600800349990">"SIM картны харилцагч"</string>
-    <string name="menu_callNumber" msgid="1898333075466418368">"<xliff:g id="NUMBER">%s</xliff:g> руу залгах"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"Энэ дугаар руу залгах боломжгүй"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_dialpad_back">Буцах</string>
+  <string name="description_dialpad_overflow">Нэмэлт сонголтууд</string>
+  <string name="description_delete_button">ухраах</string>
+  <string name="description_image_button_plus">залгах</string>
+  <string name="description_voicemail_button">дуут шуудан руу залгах</string>
+  <string name="description_dial_button">залгах</string>
+  <string name="dialog_voicemail_airplane_mode_message">Дуут шуудан руу залгахын тулд эхлээд Нислэгийн горимыг идэвхгүй болгоно уу.</string>
+  <string name="dialog_voicemail_not_ready_message">Дуут шууданг тохируулахын тулд Цэс &gt; Тохиргоо руу очно уу.</string>
+  <string name="add_2sec_pause">2-сек зогсолт нэмэх</string>
+  <string name="add_wait">Хүлээлт нэмэх</string>
+  <string name="dialer_useDtmfDialpad">Хүрэлтээр дуугардаг товчлуур ашиглах</string>
+  <string name="dialer_returnToInCallScreen">Үргэлжилж буй дуудлага руу буцах</string>
+  <string name="dialer_addAnotherCall">Дуудлага нэмэх</string>
+  <string name="imei">IMEI</string>
+  <string name="meid">MEID</string>
+  <string name="simContacts_emptyLoading">SIM картаас ачаалж байна…</string>
+  <string name="simContacts_title">SIM картны харилцагч</string>
+  <string name="menu_callNumber">%s руу залгах</string>
+  <string name="dialpad_hint_emergency_calling_not_available">WiFi-р яаралтай дуудлага хийх боломжгүй</string>
+  <string msgid="4313552620858880999" name="dialog_phone_call_prohibited_message">Энэ дугаар руу залгах боломжгүй</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-mr/strings.xml b/java/com/android/dialer/dialpadview/res/values-mr/strings.xml
index 7b466a4..b0472e5 100644
--- a/java/com/android/dialer/dialpadview/res/values-mr/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-mr/strings.xml
@@ -1,39 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_dialpad_back" msgid="6226488105558971135">"मागे नेव्हिगेट करा"</string>
-    <string name="description_dialpad_overflow" msgid="5984341386518189787">"अधिक पर्याय"</string>
-    <string name="description_delete_button" msgid="8431313818404527096">"backspace"</string>
-    <string name="description_image_button_plus" msgid="8936338119824589388">"अधिक"</string>
-    <string name="description_voicemail_button" msgid="4187006295368768215">"व्हॉइसमेल"</string>
-    <string name="description_dial_button" msgid="6826108965053146374">"डायल"</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"व्हॉइसमेलला कॉल करण्यासाठी, प्रथम विमान मोड बंद करा."</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"व्हॉइसमेल सेट करण्‍यासाठी, मेनू &gt; सेटिंग्‍ज वर जा."</string>
-    <string name="add_2sec_pause" msgid="395591627218789322">"2-सेकंदांचा विराम जोडा"</string>
-    <string name="add_wait" msgid="2278146476349811062">"वाट पाहणे जोडा"</string>
-    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"स्‍पर्श टोन कीपॅडचा वापर करा"</string>
-    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"चालू असलेल्या कॉलवर परत जा"</string>
-    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"कॉल जोडा"</string>
-    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
-    <string name="meid" msgid="5274167198744847659">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"सिम कार्ड मधून लोड करत आहे…"</string>
-    <string name="simContacts_title" msgid="8972942600800349990">"सिम कार्ड संपर्क"</string>
-    <string name="menu_callNumber" msgid="1898333075466418368">"<xliff:g id="NUMBER">%s</xliff:g> वर कॉल करा"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"या नंबरवर कॉल करू शकत नाही"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_dialpad_back">मागे नेव्हिगेट करा</string>
+  <string name="description_dialpad_overflow">अधिक पर्याय</string>
+  <string name="description_delete_button">backspace</string>
+  <string name="description_image_button_plus">डायल प्‍लस</string>
+  <string name="description_voicemail_button">व्हॉइसमेलवर कॉल करा</string>
+  <string name="description_dial_button">डायल</string>
+  <string name="dialog_voicemail_airplane_mode_message">व्हॉइसमेलला कॉल करण्यासाठी, प्रथम विमान मोड बंद करा.</string>
+  <string name="dialog_voicemail_not_ready_message">व्हॉइसमेल सेट करण्‍यासाठी, मेनू &gt; सेटिंग्‍ज वर जा.</string>
+  <string name="add_2sec_pause">2-सेकंदांचा विराम जोडा</string>
+  <string name="add_wait">वाट पाहणे जोडा</string>
+  <string name="dialer_useDtmfDialpad">टच-टोन कीपॅड वापरा</string>
+  <string name="dialer_returnToInCallScreen">चालू असलेल्या कॉलवर परत जा</string>
+  <string name="dialer_addAnotherCall">कॉल जोडा</string>
+  <string name="imei">IMEI</string>
+  <string name="meid">MEID</string>
+  <string name="simContacts_emptyLoading">सिम कार्ड मधून लोड करत आहे…</string>
+  <string name="simContacts_title">सिम कार्ड संपर्क</string>
+  <string name="menu_callNumber">%s वर कॉल करा</string>
+  <string name="dialpad_hint_emergency_calling_not_available">वाय-फाय वरून आणीबाणी कॉल करू शकत नाही</string>
+  <string msgid="4313552620858880999" name="dialog_phone_call_prohibited_message">या नंबरवर कॉल करू शकत नाही</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-ms/strings.xml b/java/com/android/dialer/dialpadview/res/values-ms/strings.xml
index a3cbbea..a2643c4 100644
--- a/java/com/android/dialer/dialpadview/res/values-ms/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-ms/strings.xml
@@ -1,39 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_dialpad_back" msgid="6226488105558971135">"Navigasi kembali"</string>
-    <string name="description_dialpad_overflow" msgid="5984341386518189787">"Lagi pilihan"</string>
-    <string name="description_delete_button" msgid="8431313818404527096">"undur ruang"</string>
-    <string name="description_image_button_plus" msgid="8936338119824589388">"tambah"</string>
-    <string name="description_voicemail_button" msgid="4187006295368768215">"mel suara"</string>
-    <string name="description_dial_button" msgid="6826108965053146374">"dail"</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"Untuk membuat panggilan ke mel suara, mula-mula matikan mod Pesawat."</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"Untuk menyediakan mel suara, pergi ke Menu &gt; Tetapan."</string>
-    <string name="add_2sec_pause" msgid="395591627218789322">"Tambah jeda 2 saat"</string>
-    <string name="add_wait" msgid="2278146476349811062">"Tambah penungguan"</string>
-    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"Gunakan pad kekunci nada sentuh"</string>
-    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"Kembali ke panggilan yang sedang berlangsung"</string>
-    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"Tambah panggilan"</string>
-    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
-    <string name="meid" msgid="5274167198744847659">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"Memuatkan daripada kad SIM…"</string>
-    <string name="simContacts_title" msgid="8972942600800349990">"Kenalan kad SIM"</string>
-    <string name="menu_callNumber" msgid="1898333075466418368">"Panggil <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"Tidak dapat menghubungi nombor ini"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_dialpad_back">Navigasi kembali</string>
+  <string name="description_dialpad_overflow">Lagi pilihan</string>
+  <string name="description_delete_button">undur ruang</string>
+  <string name="description_image_button_plus">dail tanda tambah</string>
+  <string name="description_voicemail_button">panggil mel suara</string>
+  <string name="description_dial_button">dail</string>
+  <string name="dialog_voicemail_airplane_mode_message">Untuk membuat panggilan ke mel suara, mula-mula matikan mod Pesawat.</string>
+  <string name="dialog_voicemail_not_ready_message">Untuk menyediakan mel suara, pergi ke Menu &gt; Tetapan.</string>
+  <string name="add_2sec_pause">Tambah jeda 2 saat</string>
+  <string name="add_wait">Tambah penungguan</string>
+  <string name="dialer_useDtmfDialpad">Gunakan pad kekunci nada sentuh</string>
+  <string name="dialer_returnToInCallScreen">Kembali ke panggilan yang sedang berlangsung</string>
+  <string name="dialer_addAnotherCall">Tambah panggilan</string>
+  <string name="imei">IMEI</string>
+  <string name="meid">MEID</string>
+  <string name="simContacts_emptyLoading">Memuatkan daripada kad SIM…</string>
+  <string name="simContacts_title">Kenalan kad SIM</string>
+  <string name="menu_callNumber">Panggil %s</string>
+  <string name="dialpad_hint_emergency_calling_not_available">Tidak boleh membuat panggilan kecemasan melalui Wi-Fi</string>
+  <string msgid="4313552620858880999" name="dialog_phone_call_prohibited_message">Tidak dapat menghubungi nombor ini</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-my/strings.xml b/java/com/android/dialer/dialpadview/res/values-my/strings.xml
index 4ece9fa..79deacc 100644
--- a/java/com/android/dialer/dialpadview/res/values-my/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-my/strings.xml
@@ -1,39 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_dialpad_back" msgid="6226488105558971135">"အနောက်သို့ ပြန်သွားပါ"</string>
-    <string name="description_dialpad_overflow" msgid="5984341386518189787">"ပိုမိုရွေးချယ်စရာများ"</string>
-    <string name="description_delete_button" msgid="8431313818404527096">"နောက်ပြန်ဖျက်ခလုတ်"</string>
-    <string name="description_image_button_plus" msgid="8936338119824589388">"အပေါင်း လက္ခဏာ"</string>
-    <string name="description_voicemail_button" msgid="4187006295368768215">"အသံမေးလ်"</string>
-    <string name="description_dial_button" msgid="6826108965053146374">"ဖုန်းခေါ်ရန်"</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"အသံမေးလ်ခေါ်ဆိုရန်အတွက် လေယာဉ်ပျံမုဒ်ကို ဦးစွာပိတ်ပါ။"</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"အသံမေးလ်စနစ်ကို စီစဉ်သတ်မှတ်ရန် မီနူး &gt; ဆက်တင်များသို့ သွားပါ။"</string>
-    <string name="add_2sec_pause" msgid="395591627218789322">"၂-စက္ကန့် ခဏရပ်ရန်"</string>
-    <string name="add_wait" msgid="2278146476349811062">"စောင့်ဆိုင်းရန်"</string>
-    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"အသံမြည်ခလုတ်ခုံကို အသုံးပြုရန်"</string>
-    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"လက်ရှိဖုန်းပြောနေမှုသို့ ပြန်သွားရန်"</string>
-    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"နောက်ထပ်ဖုန်းတစ်ခု ခေါ်ဆိုရန်"</string>
-    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
-    <string name="meid" msgid="5274167198744847659">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"ဆင်းမ်ကဒ်မှ ဖွင့်နေသည်…"</string>
-    <string name="simContacts_title" msgid="8972942600800349990">"ဆင်းမ်ကဒ်အဆက်အသွယ်များ"</string>
-    <string name="menu_callNumber" msgid="1898333075466418368">"<xliff:g id="NUMBER">%s</xliff:g> ကို ဖုန်းခေါ်ရန်"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"ဤနံပါတ်ကို မခေါ်ဆိုနိုင်ပါ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_dialpad_back">အနောက်သို့ ပြန်သွားပါ</string>
+  <string name="description_dialpad_overflow">ပိုမိုရွေးချယ်စရာများ</string>
+  <string name="description_delete_button">နောက်ပြန်ဖျက်ခလုတ်</string>
+  <string name="description_image_button_plus">အပေါင်း နှိပ်ရန်</string>
+  <string name="description_voicemail_button">အသံမေးလ် ခေါ်ဆိုရန်</string>
+  <string name="description_dial_button">ဖုန်းခေါ်ရန်</string>
+  <string name="dialog_voicemail_airplane_mode_message">အသံမေးလ်ခေါ်ဆိုရန်အတွက် လေယာဉ်ပျံမုဒ်ကို ဦးစွာပိတ်ပါ။</string>
+  <string name="dialog_voicemail_not_ready_message">အသံမေးလ်စနစ်ကို စီစဉ်သတ်မှတ်ရန် မီနူး &gt; ဆက်တင်များသို့ သွားပါ။</string>
+  <string name="add_2sec_pause">၂-စက္ကန့် ခဏရပ်ရန်</string>
+  <string name="add_wait">စောင့်ဆိုင်းရန်</string>
+  <string name="dialer_useDtmfDialpad">နှိပ်ခလုတ်လက်ကွက်ကို အသုံးပြုရန်</string>
+  <string name="dialer_returnToInCallScreen">လက်ရှိဖုန်းပြောနေမှုသို့ ပြန်သွားရန်</string>
+  <string name="dialer_addAnotherCall">နောက်ထပ်ဖုန်းတစ်ခု ခေါ်ဆိုရန်</string>
+  <string name="imei">IMEI</string>
+  <string name="meid">MEID</string>
+  <string name="simContacts_emptyLoading">ဆင်းမ်ကဒ်မှ ဖွင့်နေသည်…</string>
+  <string name="simContacts_title">ဆင်းမ်ကဒ်အဆက်အသွယ်များ</string>
+  <string name="menu_callNumber">%s ကို ဖုန်းခေါ်ရန်</string>
+  <string name="dialpad_hint_emergency_calling_not_available">Wi‑Fi ဖြင့် အရေးပေါ်ခေါ်ဆိုမှုများ ပြုလုပ်၍မရပါ</string>
+  <string msgid="4313552620858880999" name="dialog_phone_call_prohibited_message">ဤနံပါတ်ကို မခေါ်ဆိုနိုင်ပါ</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-nb/strings.xml b/java/com/android/dialer/dialpadview/res/values-nb/strings.xml
index 0f78eb7..56fe380 100644
--- a/java/com/android/dialer/dialpadview/res/values-nb/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-nb/strings.xml
@@ -1,39 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_dialpad_back" msgid="6226488105558971135">"Gå tilbake"</string>
-    <string name="description_dialpad_overflow" msgid="5984341386518189787">"Flere alternativer"</string>
-    <string name="description_delete_button" msgid="8431313818404527096">"tilbaketast"</string>
-    <string name="description_image_button_plus" msgid="8936338119824589388">"pluss"</string>
-    <string name="description_voicemail_button" msgid="4187006295368768215">"talepost"</string>
-    <string name="description_dial_button" msgid="6826108965053146374">"ring"</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"Du må slå av flymodus før du kan sjekke talepostkassen."</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"For å konfigurere talepostfunksjonen, gå til Meny &gt; Innstillinger."</string>
-    <string name="add_2sec_pause" msgid="395591627218789322">"Legg til pause på 2 sek."</string>
-    <string name="add_wait" msgid="2278146476349811062">"Legg til Vent"</string>
-    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"Bruk tonetastatur"</string>
-    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"Gå tilbake til aktiv samtale"</string>
-    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"Nytt anrop"</string>
-    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
-    <string name="meid" msgid="5274167198744847659">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"Henter fra SIM-kort …"</string>
-    <string name="simContacts_title" msgid="8972942600800349990">"Kontakter på SIM-kort"</string>
-    <string name="menu_callNumber" msgid="1898333075466418368">"Ring <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"Kan ikke ringe dette nummeret"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_dialpad_back">Gå tilbake</string>
+  <string name="description_dialpad_overflow">Flere alternativer</string>
+  <string name="description_delete_button">tilbaketast</string>
+  <string name="description_image_button_plus">slå plusstegn</string>
+  <string name="description_voicemail_button">ring talepostkassen</string>
+  <string name="description_dial_button">ring</string>
+  <string name="dialog_voicemail_airplane_mode_message">Du må slå av flymodus før du kan sjekke talepostkassen.</string>
+  <string name="dialog_voicemail_not_ready_message">For å konfigurere talepostfunksjonen, gå til Meny &gt; Innstillinger.</string>
+  <string name="add_2sec_pause">Legg til pause på 2 sek.</string>
+  <string name="add_wait">Legg til Vent</string>
+  <string name="dialer_useDtmfDialpad">Bruk tonetastatur</string>
+  <string name="dialer_returnToInCallScreen">Gå tilbake til aktiv samtale</string>
+  <string name="dialer_addAnotherCall">Nytt anrop</string>
+  <string name="imei">IMEI</string>
+  <string name="meid">MEID</string>
+  <string name="simContacts_emptyLoading">Henter fra SIM-kort …</string>
+  <string name="simContacts_title">Kontakter på SIM-kort</string>
+  <string name="menu_callNumber">Ring %s</string>
+  <string name="dialpad_hint_emergency_calling_not_available">Kan ikke ringe nødnumre via Wi‑Fi</string>
+  <string msgid="4313552620858880999" name="dialog_phone_call_prohibited_message">Kan ikke ringe dette nummeret</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-ne/strings.xml b/java/com/android/dialer/dialpadview/res/values-ne/strings.xml
index 6369eb7..310e060 100644
--- a/java/com/android/dialer/dialpadview/res/values-ne/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-ne/strings.xml
@@ -1,39 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_dialpad_back" msgid="6226488105558971135">"पछाडि नेभिगेट गर्नुहोस्"</string>
-    <string name="description_dialpad_overflow" msgid="5984341386518189787">"थप विकल्पहरू"</string>
-    <string name="description_delete_button" msgid="8431313818404527096">"ब्याकस्पेस"</string>
-    <string name="description_image_button_plus" msgid="8936338119824589388">"जोड"</string>
-    <string name="description_voicemail_button" msgid="4187006295368768215">"भ्वाइसमेल"</string>
-    <string name="description_dial_button" msgid="6826108965053146374">"डायल गर्नुहोस्"</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"भ्वाइसमेल जाँच गर्न पहिले हवाइजहाज मोडलाई निष्क्रिय पार्नुहोस्।"</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"भ्वाइसमेल सेट गर्न मेनु &gt; सेटिङहरूमा जानुहोस्।"</string>
-    <string name="add_2sec_pause" msgid="395591627218789322">"२ सेकन्डको पज थप्नुहोस्"</string>
-    <string name="add_wait" msgid="2278146476349811062">"प्रतीक्षाको समय थप्नुहोस्"</string>
-    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"टच टोन किप्याड प्रयोग गर्नुहोस्"</string>
-    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"जारी रहेको कलमा फर्किनुहोस्"</string>
-    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"कल थप्नुहोस्"</string>
-    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
-    <string name="meid" msgid="5274167198744847659">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"SIM कार्डबाट लोड हुँदै"</string>
-    <string name="simContacts_title" msgid="8972942600800349990">"SIM कार्डका सम्पर्क ठेगानाहरू"</string>
-    <string name="menu_callNumber" msgid="1898333075466418368">"<xliff:g id="NUMBER">%s</xliff:g> मा कल गर्नुहोस्"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"यस नम्बरमा कल गर्न सकिँदैन"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_dialpad_back">पछाडि नेभिगेट गर्नुहोस्</string>
+  <string name="description_dialpad_overflow">थप विकल्पहरू</string>
+  <string name="description_delete_button">ब्याकस्पेस</string>
+  <string name="description_image_button_plus">जोड चिन्ह डायल गर्नुहोस्</string>
+  <string name="description_voicemail_button">भ्वाइस मेल कल गर्नुहोस्</string>
+  <string name="description_dial_button">डायल गर्नुहोस्</string>
+  <string name="dialog_voicemail_airplane_mode_message">भ्वाइसमेल जाँच गर्न पहिले हवाइजहाज मोडलाई निष्क्रिय पार्नुहोस्।</string>
+  <string name="dialog_voicemail_not_ready_message">भ्वाइसमेल सेट गर्न मेनु &gt; सेटिङहरूमा जानुहोस्।</string>
+  <string name="add_2sec_pause">२ सेकन्डको पज थप्नुहोस्</string>
+  <string name="add_wait">प्रतीक्षाको समय थप्नुहोस्</string>
+  <string name="dialer_useDtmfDialpad">टच टोन किप्याडको प्रयोग गर्नुहोस्</string>
+  <string name="dialer_returnToInCallScreen">जारी रहेको कलमा फर्किनुहोस्</string>
+  <string name="dialer_addAnotherCall">कल थप्नुहोस्</string>
+  <string name="imei">IMEI</string>
+  <string name="meid">MEID</string>
+  <string name="simContacts_emptyLoading">SIM कार्डबाट लोड हुँदै</string>
+  <string name="simContacts_title">SIM कार्डका सम्पर्क ठेगानाहरू</string>
+  <string name="menu_callNumber">%s मा कल गर्नुहोस्</string>
+  <string name="dialpad_hint_emergency_calling_not_available">WiFi मार्फत आपतकालीन कल गर्न सकिँदैन</string>
+  <string msgid="4313552620858880999" name="dialog_phone_call_prohibited_message">यस नम्बरमा कल गर्न सकिँदैन</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-nl/strings.xml b/java/com/android/dialer/dialpadview/res/values-nl/strings.xml
index 19911a1..e8e8e8e 100644
--- a/java/com/android/dialer/dialpadview/res/values-nl/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-nl/strings.xml
@@ -1,39 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_dialpad_back" msgid="6226488105558971135">"Terug navigeren"</string>
-    <string name="description_dialpad_overflow" msgid="5984341386518189787">"Meer opties"</string>
-    <string name="description_delete_button" msgid="8431313818404527096">"backspace"</string>
-    <string name="description_image_button_plus" msgid="8936338119824589388">"plus"</string>
-    <string name="description_voicemail_button" msgid="4187006295368768215">"voicemail"</string>
-    <string name="description_dial_button" msgid="6826108965053146374">"bellen"</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"Als je je voicemail wilt bellen, moet je eerst de vliegtuigmodus uitschakelen."</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"Voor het instellen van voicemail ga je naar Menu &gt; Instellingen."</string>
-    <string name="add_2sec_pause" msgid="395591627218789322">"Pauze van 2 seconden toevoegen"</string>
-    <string name="add_wait" msgid="2278146476349811062">"Wachten toevoegen"</string>
-    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"Toetsenblok voor toetsgeluid gebruiken"</string>
-    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"Terug naar actieve oproep"</string>
-    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"Oproep toevoegen"</string>
-    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
-    <string name="meid" msgid="5274167198744847659">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"Laden vanaf simkaart…"</string>
-    <string name="simContacts_title" msgid="8972942600800349990">"Contacten op simkaart"</string>
-    <string name="menu_callNumber" msgid="1898333075466418368">"<xliff:g id="NUMBER">%s</xliff:g> bellen"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"Kan dit nummer niet bellen"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_dialpad_back">Terug navigeren</string>
+  <string name="description_dialpad_overflow">Meer opties</string>
+  <string name="description_delete_button">backspace</string>
+  <string name="description_image_button_plus">plustoets</string>
+  <string name="description_voicemail_button">voicemail bellen</string>
+  <string name="description_dial_button">bellen</string>
+  <string name="dialog_voicemail_airplane_mode_message">Als je je voicemail wilt bellen, moet je eerst de vliegtuigmodus uitschakelen.</string>
+  <string name="dialog_voicemail_not_ready_message">Voor het instellen van voicemail ga je naar Menu &gt; Instellingen.</string>
+  <string name="add_2sec_pause">Pauze van 2 seconden toevoegen</string>
+  <string name="add_wait">Wachten toevoegen</string>
+  <string name="dialer_useDtmfDialpad">Toetsenblok voor toetsgeluid gebruiken</string>
+  <string name="dialer_returnToInCallScreen">Terug naar actieve oproep</string>
+  <string name="dialer_addAnotherCall">Oproep toevoegen</string>
+  <string name="imei">IMEI</string>
+  <string name="meid">MEID</string>
+  <string name="simContacts_emptyLoading">Laden vanaf simkaart…</string>
+  <string name="simContacts_title">Contacten op simkaart</string>
+  <string name="menu_callNumber">%s bellen</string>
+  <string name="dialpad_hint_emergency_calling_not_available">Er kunnen geen noodoproepen worden gemaakt via wifi</string>
+  <string msgid="4313552620858880999" name="dialog_phone_call_prohibited_message">Kan dit nummer niet bellen</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-no/strings.xml b/java/com/android/dialer/dialpadview/res/values-no/strings.xml
index 0f78eb7..56fe380 100644
--- a/java/com/android/dialer/dialpadview/res/values-no/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-no/strings.xml
@@ -1,39 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_dialpad_back" msgid="6226488105558971135">"Gå tilbake"</string>
-    <string name="description_dialpad_overflow" msgid="5984341386518189787">"Flere alternativer"</string>
-    <string name="description_delete_button" msgid="8431313818404527096">"tilbaketast"</string>
-    <string name="description_image_button_plus" msgid="8936338119824589388">"pluss"</string>
-    <string name="description_voicemail_button" msgid="4187006295368768215">"talepost"</string>
-    <string name="description_dial_button" msgid="6826108965053146374">"ring"</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"Du må slå av flymodus før du kan sjekke talepostkassen."</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"For å konfigurere talepostfunksjonen, gå til Meny &gt; Innstillinger."</string>
-    <string name="add_2sec_pause" msgid="395591627218789322">"Legg til pause på 2 sek."</string>
-    <string name="add_wait" msgid="2278146476349811062">"Legg til Vent"</string>
-    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"Bruk tonetastatur"</string>
-    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"Gå tilbake til aktiv samtale"</string>
-    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"Nytt anrop"</string>
-    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
-    <string name="meid" msgid="5274167198744847659">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"Henter fra SIM-kort …"</string>
-    <string name="simContacts_title" msgid="8972942600800349990">"Kontakter på SIM-kort"</string>
-    <string name="menu_callNumber" msgid="1898333075466418368">"Ring <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"Kan ikke ringe dette nummeret"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_dialpad_back">Gå tilbake</string>
+  <string name="description_dialpad_overflow">Flere alternativer</string>
+  <string name="description_delete_button">tilbaketast</string>
+  <string name="description_image_button_plus">slå plusstegn</string>
+  <string name="description_voicemail_button">ring talepostkassen</string>
+  <string name="description_dial_button">ring</string>
+  <string name="dialog_voicemail_airplane_mode_message">Du må slå av flymodus før du kan sjekke talepostkassen.</string>
+  <string name="dialog_voicemail_not_ready_message">For å konfigurere talepostfunksjonen, gå til Meny &gt; Innstillinger.</string>
+  <string name="add_2sec_pause">Legg til pause på 2 sek.</string>
+  <string name="add_wait">Legg til Vent</string>
+  <string name="dialer_useDtmfDialpad">Bruk tonetastatur</string>
+  <string name="dialer_returnToInCallScreen">Gå tilbake til aktiv samtale</string>
+  <string name="dialer_addAnotherCall">Nytt anrop</string>
+  <string name="imei">IMEI</string>
+  <string name="meid">MEID</string>
+  <string name="simContacts_emptyLoading">Henter fra SIM-kort …</string>
+  <string name="simContacts_title">Kontakter på SIM-kort</string>
+  <string name="menu_callNumber">Ring %s</string>
+  <string name="dialpad_hint_emergency_calling_not_available">Kan ikke ringe nødnumre via Wi‑Fi</string>
+  <string msgid="4313552620858880999" name="dialog_phone_call_prohibited_message">Kan ikke ringe dette nummeret</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-pa/strings.xml b/java/com/android/dialer/dialpadview/res/values-pa/strings.xml
index be5dc62..5a7c73b 100644
--- a/java/com/android/dialer/dialpadview/res/values-pa/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-pa/strings.xml
@@ -1,39 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_dialpad_back" msgid="6226488105558971135">"ਪਿੱਛੇ ਆਵਾਗੌਣ ਕਰੋ"</string>
-    <string name="description_dialpad_overflow" msgid="5984341386518189787">"ਹੋਰ ਚੋਣਾਂ"</string>
-    <string name="description_delete_button" msgid="8431313818404527096">"ਬੈਕਸਪੇਸ"</string>
-    <string name="description_image_button_plus" msgid="8936338119824589388">"ਪਲਸ"</string>
-    <string name="description_voicemail_button" msgid="4187006295368768215">"ਵੌਇਸਮੇਲ"</string>
-    <string name="description_dial_button" msgid="6826108965053146374">"ਡਾਇਲ ਕਰੋ"</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"ਵੌਇਸਮੇਲ ਨੂੰ ਕਾਲ ਕਰਨ ਲਈ, ਪਹਿਲਾਂ ਜਹਾਜ਼ ਮੋਡ ਬੰਦ ਕਰੋ।"</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"ਵੌਇਸਮੇਲ ਸਥਾਪਤ ਕਰਨ ਲਈ, ਮੀਨੂ &gt; ਸੈਟਿੰਗਾਂ \'ਤੇ ਜਾਓ।"</string>
-    <string name="add_2sec_pause" msgid="395591627218789322">"2-ਸਕਿੰਟ ਦਾ ਵਿਰਾਮ ਸ਼ਾਮਲ ਕਰੋ"</string>
-    <string name="add_wait" msgid="2278146476349811062">"ਉਡੀਕ ਦਾ ਸਮਾਂ ਸ਼ਾਮਲ ਕਰੋ"</string>
-    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"ਸਪਰੱਸ਼ ਧੁਨੀ ਕੀ-ਪੈਡ ਵਰਤੋ"</string>
-    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"ਜਾਰੀ ਕਾਲ \'ਤੇ ਵਾਪਸ ਜਾਓ"</string>
-    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"ਕਾਲ ਸ਼ਾਮਲ ਕਰੋ"</string>
-    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
-    <string name="meid" msgid="5274167198744847659">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"ਸਿਮ ਕਾਰਡ ਤੋਂ ਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ…"</string>
-    <string name="simContacts_title" msgid="8972942600800349990">"ਸਿਮ ਕਾਰਡ ਸੰਪਰਕ"</string>
-    <string name="menu_callNumber" msgid="1898333075466418368">"<xliff:g id="NUMBER">%s</xliff:g> ਨੂੰ ਕਾਲ ਕਰੋ"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"ਇਸ ਨੰਬਰ \'ਤੇ ਕਾਲ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕਦੀ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_dialpad_back">ਪਿੱਛੇ ਆਵਾਗੌਣ ਕਰੋ</string>
+  <string name="description_dialpad_overflow">ਹੋਰ ਚੋਣਾਂ</string>
+  <string name="description_delete_button">ਬੈਕਸਪੇਸ</string>
+  <string name="description_image_button_plus">ਡਾਇਲ \'ਤੇ ਜੋੜ ਦਾ ਚਿੰਨ੍ਹ ਸ਼ਾਮਲ ਕਰੋ</string>
+  <string name="description_voicemail_button">ਵੌਇਸਮੇਲ ਨੂੰ ਕਾਲ ਕਰੋ</string>
+  <string name="description_dial_button">ਡਾਇਲ ਕਰੋ</string>
+  <string name="dialog_voicemail_airplane_mode_message">ਵੌਇਸਮੇਲ ਨੂੰ ਕਾਲ ਕਰਨ ਲਈ, ਪਹਿਲਾਂ ਜਹਾਜ਼ ਮੋਡ ਬੰਦ ਕਰੋ।</string>
+  <string name="dialog_voicemail_not_ready_message">ਵੌਇਸਮੇਲ ਸਥਾਪਤ ਕਰਨ ਲਈ, ਮੀਨੂ &gt; ਸੈਟਿੰਗਾਂ \'ਤੇ ਜਾਓ।</string>
+  <string name="add_2sec_pause">2-ਸਕਿੰਟ ਦਾ ਵਿਰਾਮ ਸ਼ਾਮਲ ਕਰੋ</string>
+  <string name="add_wait">ਉਡੀਕ ਦਾ ਸਮਾਂ ਸ਼ਾਮਲ ਕਰੋ</string>
+  <string name="dialer_useDtmfDialpad">ਸਪਰੱਸ਼ ਧੁਨੀ ਕੀ-ਪੈਡ ਵਰਤੋ</string>
+  <string name="dialer_returnToInCallScreen">ਜਾਰੀ ਕਾਲ \'ਤੇ ਵਾਪਸ ਜਾਓ</string>
+  <string name="dialer_addAnotherCall">ਕਾਲ ਸ਼ਾਮਲ ਕਰੋ</string>
+  <string name="imei">IMEI</string>
+  <string name="meid">MEID</string>
+  <string name="simContacts_emptyLoading">ਸਿਮ ਕਾਰਡ ਤੋਂ ਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ…</string>
+  <string name="simContacts_title">ਸਿਮ ਕਾਰਡ ਸੰਪਰਕ</string>
+  <string name="menu_callNumber">%s ਨੂੰ ਕਾਲ ਕਰੋ</string>
+  <string name="dialpad_hint_emergency_calling_not_available">ਵਾਈ-ਫਾਈ ਰਾਹੀਂ ਸੰਕਟਕਾਲੀਨ ਕਾਲਾਂ ਨਹੀਂ ਕਰ ਸਕਦੇ</string>
+  <string msgid="4313552620858880999" name="dialog_phone_call_prohibited_message">ਇਸ ਨੰਬਰ \'ਤੇ ਕਾਲ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕਦੀ</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-pl/strings.xml b/java/com/android/dialer/dialpadview/res/values-pl/strings.xml
index e3045b3..d6ea28a 100644
--- a/java/com/android/dialer/dialpadview/res/values-pl/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-pl/strings.xml
@@ -1,39 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_dialpad_back" msgid="6226488105558971135">"Wstecz"</string>
-    <string name="description_dialpad_overflow" msgid="5984341386518189787">"Więcej opcji"</string>
-    <string name="description_delete_button" msgid="8431313818404527096">"usuń"</string>
-    <string name="description_image_button_plus" msgid="8936338119824589388">"plus"</string>
-    <string name="description_voicemail_button" msgid="4187006295368768215">"poczta głosowa"</string>
-    <string name="description_dial_button" msgid="6826108965053146374">"wybierz numer"</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"Aby połączyć się z pocztą głosową, najpierw wyłącz tryb samolotowy."</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"Aby skonfigurować pocztę głosową, kliknij Menu &gt; Ustawienia."</string>
-    <string name="add_2sec_pause" msgid="395591627218789322">"Dodaj 2-sekundową pauzę"</string>
-    <string name="add_wait" msgid="2278146476349811062">"Dodaj oczekiwanie"</string>
-    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"Użyj klawiatury tonowej"</string>
-    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"Wróć do aktywnego połączenia"</string>
-    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"Dodaj połączenie"</string>
-    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
-    <string name="meid" msgid="5274167198744847659">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"Wczytuję z karty SIM…"</string>
-    <string name="simContacts_title" msgid="8972942600800349990">"Kontakty z karty SIM"</string>
-    <string name="menu_callNumber" msgid="1898333075466418368">"Zadzwoń: <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"Nie można zadzwonić pod ten numer"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_dialpad_back">Wstecz</string>
+  <string name="description_dialpad_overflow">Więcej opcji</string>
+  <string name="description_delete_button">usuń</string>
+  <string name="description_image_button_plus">plus na klawiaturze</string>
+  <string name="description_voicemail_button">zadzwoń na pocztę głosową</string>
+  <string name="description_dial_button">wybierz numer</string>
+  <string name="dialog_voicemail_airplane_mode_message">Aby połączyć się z pocztą głosową, najpierw wyłącz tryb samolotowy.</string>
+  <string name="dialog_voicemail_not_ready_message">Aby skonfigurować pocztę głosową, kliknij Menu &gt; Ustawienia.</string>
+  <string name="add_2sec_pause">Dodaj 2-sekundową pauzę</string>
+  <string name="add_wait">Dodaj oczekiwanie</string>
+  <string name="dialer_useDtmfDialpad">Użyj klawiatury tonowej</string>
+  <string name="dialer_returnToInCallScreen">Wróć do aktywnego połączenia</string>
+  <string name="dialer_addAnotherCall">Dodaj połączenie</string>
+  <string name="imei">IMEI</string>
+  <string name="meid">MEID</string>
+  <string name="simContacts_emptyLoading">Wczytuję z karty SIM…</string>
+  <string name="simContacts_title">Kontakty z karty SIM</string>
+  <string name="menu_callNumber">Zadzwoń: %s</string>
+  <string name="dialpad_hint_emergency_calling_not_available">Nie można nawiązywać połączeń alarmowych przez Wi‑Fi</string>
+  <string msgid="4313552620858880999" name="dialog_phone_call_prohibited_message">Nie można zadzwonić pod ten numer</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-pt-rBR/strings.xml b/java/com/android/dialer/dialpadview/res/values-pt-rBR/strings.xml
index dc530fb..10f9c19 100644
--- a/java/com/android/dialer/dialpadview/res/values-pt-rBR/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-pt-rBR/strings.xml
@@ -1,39 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_dialpad_back" msgid="6226488105558971135">"Voltar"</string>
-    <string name="description_dialpad_overflow" msgid="5984341386518189787">"Mais opções"</string>
-    <string name="description_delete_button" msgid="8431313818404527096">"voltar"</string>
-    <string name="description_image_button_plus" msgid="8936338119824589388">"mais"</string>
-    <string name="description_voicemail_button" msgid="4187006295368768215">"correio de voz"</string>
-    <string name="description_dial_button" msgid="6826108965053146374">"discar"</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"Para ligar para o correio de voz, primeiro desative o modo avião."</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"Para configurar o correio de voz, acesse Menu &gt; Configurações."</string>
-    <string name="add_2sec_pause" msgid="395591627218789322">"Adicionar pausa de 2 segundos"</string>
-    <string name="add_wait" msgid="2278146476349811062">"Adicionar espera"</string>
-    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"Usar teclado multifrequencial"</string>
-    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"Retornar para a chamada em espera"</string>
-    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"Adicionar chamada"</string>
-    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
-    <string name="meid" msgid="5274167198744847659">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"Carregando do cartão SIM..."</string>
-    <string name="simContacts_title" msgid="8972942600800349990">"Contatos do cartão SIM"</string>
-    <string name="menu_callNumber" msgid="1898333075466418368">"Ligar para <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"Não é possível ligar para este número"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_dialpad_back">Voltar</string>
+  <string name="description_dialpad_overflow">Mais opções</string>
+  <string name="description_delete_button">voltar</string>
+  <string name="description_image_button_plus">Discar +</string>
+  <string name="description_voicemail_button">Ligar para o correio voz</string>
+  <string name="description_dial_button">discar</string>
+  <string name="dialog_voicemail_airplane_mode_message">Para ligar para o correio de voz, primeiro desative o modo avião.</string>
+  <string name="dialog_voicemail_not_ready_message">Para configurar o correio de voz, acesse Menu &gt; Configurações.</string>
+  <string name="add_2sec_pause">Adicionar pausa de 2 segundos</string>
+  <string name="add_wait">Adicionar espera</string>
+  <string name="dialer_useDtmfDialpad">Usar teclado multifrequencial</string>
+  <string name="dialer_returnToInCallScreen">Retornar para a chamada em espera</string>
+  <string name="dialer_addAnotherCall">Nova chamada</string>
+  <string name="imei">IMEI</string>
+  <string name="meid">MEID</string>
+  <string name="simContacts_emptyLoading">Carregando do cartão SIM...</string>
+  <string name="simContacts_title">Contatos do cartão SIM</string>
+  <string name="menu_callNumber">Ligar para %s</string>
+  <string name="dialpad_hint_emergency_calling_not_available">Não é possível fazer chamadas de emergência por Wi‑Fi</string>
+  <string msgid="4313552620858880999" name="dialog_phone_call_prohibited_message">Não é possível ligar para este número</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-pt-rPT/strings.xml b/java/com/android/dialer/dialpadview/res/values-pt-rPT/strings.xml
index aa39892..239616b 100644
--- a/java/com/android/dialer/dialpadview/res/values-pt-rPT/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-pt-rPT/strings.xml
@@ -1,39 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_dialpad_back" msgid="6226488105558971135">"Navegar para trás"</string>
-    <string name="description_dialpad_overflow" msgid="5984341386518189787">"Mais opções"</string>
-    <string name="description_delete_button" msgid="8431313818404527096">"retrocesso"</string>
-    <string name="description_image_button_plus" msgid="8936338119824589388">"mais"</string>
-    <string name="description_voicemail_button" msgid="4187006295368768215">"mensagem de correio de voz"</string>
-    <string name="description_dial_button" msgid="6826108965053146374">"marcar"</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"Para efetuar uma chamada para o correio de voz, desative primeiro o modo de avião."</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"Para configurar o correio de voz, aceda a Menu &gt; Definições."</string>
-    <string name="add_2sec_pause" msgid="395591627218789322">"Adicionar pausa de 2 seg."</string>
-    <string name="add_wait" msgid="2278146476349811062">"Adicionar espera"</string>
-    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"Utilizar teclado numérico com tons de toque"</string>
-    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"Voltar à chamada em curso"</string>
-    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"Adic. cham."</string>
-    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
-    <string name="meid" msgid="5274167198744847659">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"A carregar a partir do cartão SIM..."</string>
-    <string name="simContacts_title" msgid="8972942600800349990">"Contactos do cartão SIM"</string>
-    <string name="menu_callNumber" msgid="1898333075466418368">"Telefonar para <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"Não é possível ligar para este número"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_dialpad_back">Navegar para trás</string>
+  <string name="description_dialpad_overflow">Mais opções</string>
+  <string name="description_delete_button">retrocesso</string>
+  <string name="description_image_button_plus">mais no teclado</string>
+  <string name="description_voicemail_button">Ligar para correio de voz</string>
+  <string name="description_dial_button">marcar</string>
+  <string name="dialog_voicemail_airplane_mode_message">Para efetuar uma chamada para o correio de voz, desative primeiro o modo de avião.</string>
+  <string name="dialog_voicemail_not_ready_message">Para configurar o correio de voz, aceda a Menu &gt; Definições.</string>
+  <string name="add_2sec_pause">Adicionar pausa de 2 seg.</string>
+  <string name="add_wait">Adicionar espera</string>
+  <string name="dialer_useDtmfDialpad">Utilizar teclado numérico com tons de toque</string>
+  <string name="dialer_returnToInCallScreen">Voltar à chamada em curso</string>
+  <string name="dialer_addAnotherCall">Adic. cham.</string>
+  <string name="imei">IMEI</string>
+  <string name="meid">MEID</string>
+  <string name="simContacts_emptyLoading">A carregar a partir do cartão SIM...</string>
+  <string name="simContacts_title">Contactos do cartão SIM</string>
+  <string name="menu_callNumber">Telefonar para %s</string>
+  <string name="dialpad_hint_emergency_calling_not_available">Impossível efetuar chamadas de emergência através de Wi‑Fi</string>
+  <string msgid="4313552620858880999" name="dialog_phone_call_prohibited_message">Não é possível ligar para este número</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-pt/strings.xml b/java/com/android/dialer/dialpadview/res/values-pt/strings.xml
index dc530fb..10f9c19 100644
--- a/java/com/android/dialer/dialpadview/res/values-pt/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-pt/strings.xml
@@ -1,39 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_dialpad_back" msgid="6226488105558971135">"Voltar"</string>
-    <string name="description_dialpad_overflow" msgid="5984341386518189787">"Mais opções"</string>
-    <string name="description_delete_button" msgid="8431313818404527096">"voltar"</string>
-    <string name="description_image_button_plus" msgid="8936338119824589388">"mais"</string>
-    <string name="description_voicemail_button" msgid="4187006295368768215">"correio de voz"</string>
-    <string name="description_dial_button" msgid="6826108965053146374">"discar"</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"Para ligar para o correio de voz, primeiro desative o modo avião."</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"Para configurar o correio de voz, acesse Menu &gt; Configurações."</string>
-    <string name="add_2sec_pause" msgid="395591627218789322">"Adicionar pausa de 2 segundos"</string>
-    <string name="add_wait" msgid="2278146476349811062">"Adicionar espera"</string>
-    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"Usar teclado multifrequencial"</string>
-    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"Retornar para a chamada em espera"</string>
-    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"Adicionar chamada"</string>
-    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
-    <string name="meid" msgid="5274167198744847659">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"Carregando do cartão SIM..."</string>
-    <string name="simContacts_title" msgid="8972942600800349990">"Contatos do cartão SIM"</string>
-    <string name="menu_callNumber" msgid="1898333075466418368">"Ligar para <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"Não é possível ligar para este número"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_dialpad_back">Voltar</string>
+  <string name="description_dialpad_overflow">Mais opções</string>
+  <string name="description_delete_button">voltar</string>
+  <string name="description_image_button_plus">Discar +</string>
+  <string name="description_voicemail_button">Ligar para o correio voz</string>
+  <string name="description_dial_button">discar</string>
+  <string name="dialog_voicemail_airplane_mode_message">Para ligar para o correio de voz, primeiro desative o modo avião.</string>
+  <string name="dialog_voicemail_not_ready_message">Para configurar o correio de voz, acesse Menu &gt; Configurações.</string>
+  <string name="add_2sec_pause">Adicionar pausa de 2 segundos</string>
+  <string name="add_wait">Adicionar espera</string>
+  <string name="dialer_useDtmfDialpad">Usar teclado multifrequencial</string>
+  <string name="dialer_returnToInCallScreen">Retornar para a chamada em espera</string>
+  <string name="dialer_addAnotherCall">Nova chamada</string>
+  <string name="imei">IMEI</string>
+  <string name="meid">MEID</string>
+  <string name="simContacts_emptyLoading">Carregando do cartão SIM...</string>
+  <string name="simContacts_title">Contatos do cartão SIM</string>
+  <string name="menu_callNumber">Ligar para %s</string>
+  <string name="dialpad_hint_emergency_calling_not_available">Não é possível fazer chamadas de emergência por Wi‑Fi</string>
+  <string msgid="4313552620858880999" name="dialog_phone_call_prohibited_message">Não é possível ligar para este número</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-ro/strings.xml b/java/com/android/dialer/dialpadview/res/values-ro/strings.xml
index 87f4836..5360ca3 100644
--- a/java/com/android/dialer/dialpadview/res/values-ro/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-ro/strings.xml
@@ -1,39 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_dialpad_back" msgid="6226488105558971135">"Navigați înapoi"</string>
-    <string name="description_dialpad_overflow" msgid="5984341386518189787">"Mai multe opțiuni"</string>
-    <string name="description_delete_button" msgid="8431313818404527096">"tasta backspace"</string>
-    <string name="description_image_button_plus" msgid="8936338119824589388">"plus"</string>
-    <string name="description_voicemail_button" msgid="4187006295368768215">"mesaj vocal"</string>
-    <string name="description_dial_button" msgid="6826108965053146374">"apelați"</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"Pentru a apela mesageria vocală, mai întâi dezactivați modul Avion."</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"Pentru a configura mesageria vocală, accesați Meniu &gt; Setări."</string>
-    <string name="add_2sec_pause" msgid="395591627218789322">"Adăugați o pauză de 2 secunde"</string>
-    <string name="add_wait" msgid="2278146476349811062">"Adăugați interval de așteptare"</string>
-    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"Tastatura tactilă cu sunet"</string>
-    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"Reveniți la apelul în curs"</string>
-    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"Adăugați un apel"</string>
-    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
-    <string name="meid" msgid="5274167198744847659">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"Se încarcă de pe cardul SIM…"</string>
-    <string name="simContacts_title" msgid="8972942600800349990">"Agenda de pe cardul SIM"</string>
-    <string name="menu_callNumber" msgid="1898333075466418368">"Apelați <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"Nu puteți apela acest număr"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_dialpad_back">Navigați înapoi</string>
+  <string name="description_dialpad_overflow">Mai multe opțiuni</string>
+  <string name="description_delete_button">tasta backspace</string>
+  <string name="description_image_button_plus">plus pe tastatură</string>
+  <string name="description_voicemail_button">apelați mesageria vocală</string>
+  <string name="description_dial_button">apelați</string>
+  <string name="dialog_voicemail_airplane_mode_message">Pentru a apela mesageria vocală, mai întâi dezactivați modul Avion.</string>
+  <string name="dialog_voicemail_not_ready_message">Pentru a configura mesageria vocală, accesați Meniu &gt; Setări.</string>
+  <string name="add_2sec_pause">Adăugați o pauză de 2 secunde</string>
+  <string name="add_wait">Adăugați interval de așteptare</string>
+  <string name="dialer_useDtmfDialpad">Tastatura tactilă cu sunet</string>
+  <string name="dialer_returnToInCallScreen">Reveniți la apelul în curs</string>
+  <string name="dialer_addAnotherCall">Adăugați un apel</string>
+  <string name="imei">IMEI</string>
+  <string name="meid">MEID</string>
+  <string name="simContacts_emptyLoading">Se încarcă de pe cardul SIM…</string>
+  <string name="simContacts_title">Agenda de pe cardul SIM</string>
+  <string name="menu_callNumber">Apelați %s</string>
+  <string name="dialpad_hint_emergency_calling_not_available">Nu puteți efectua apeluri de urgență prin Wi-Fi</string>
+  <string msgid="4313552620858880999" name="dialog_phone_call_prohibited_message">Nu puteți apela acest număr</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-ru/strings.xml b/java/com/android/dialer/dialpadview/res/values-ru/strings.xml
index 24dd23c..5ca9b29 100644
--- a/java/com/android/dialer/dialpadview/res/values-ru/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-ru/strings.xml
@@ -1,39 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_dialpad_back" msgid="6226488105558971135">"Вернуться"</string>
-    <string name="description_dialpad_overflow" msgid="5984341386518189787">"Ещё"</string>
-    <string name="description_delete_button" msgid="8431313818404527096">"клавиша Backspace"</string>
-    <string name="description_image_button_plus" msgid="8936338119824589388">"плюс"</string>
-    <string name="description_voicemail_button" msgid="4187006295368768215">"голосовая почта"</string>
-    <string name="description_dial_button" msgid="6826108965053146374">"набор номера"</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"Сначала отключите режим полета."</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"Чтобы настроить голосовую почту, выберите \"Меню &gt; Настройки\"."</string>
-    <string name="add_2sec_pause" msgid="395591627218789322">"Добавить двухсекундную паузу"</string>
-    <string name="add_wait" msgid="2278146476349811062">"Добавить паузу"</string>
-    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"Открыть панель тонального набора"</string>
-    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"Вернуться к текущему вызову"</string>
-    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"Добавить вызов"</string>
-    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
-    <string name="meid" msgid="5274167198744847659">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"Загрузка с SIM-карты…"</string>
-    <string name="simContacts_title" msgid="8972942600800349990">"Контакты на SIM-карте"</string>
-    <string name="menu_callNumber" msgid="1898333075466418368">"Позвонить: <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"На этот номер нельзя позвонить"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_dialpad_back">Вернуться</string>
+  <string name="description_dialpad_overflow">Ещё</string>
+  <string name="description_delete_button">клавиша Backspace</string>
+  <string name="description_image_button_plus">добавить плюс</string>
+  <string name="description_voicemail_button">получить почту</string>
+  <string name="description_dial_button">набор номера</string>
+  <string name="dialog_voicemail_airplane_mode_message">Сначала отключите режим полета.</string>
+  <string name="dialog_voicemail_not_ready_message">Чтобы настроить голосовую почту, выберите \"Меню &gt; Настройки\".</string>
+  <string name="add_2sec_pause">Добавить двухсекундную паузу</string>
+  <string name="add_wait">Добавить паузу</string>
+  <string name="dialer_useDtmfDialpad">Панель тонального набора</string>
+  <string name="dialer_returnToInCallScreen">Вернуться к текущему вызову</string>
+  <string name="dialer_addAnotherCall">Добавить вызов</string>
+  <string name="imei">IMEI</string>
+  <string name="meid">MEID</string>
+  <string name="simContacts_emptyLoading">Загрузка с SIM…</string>
+  <string name="simContacts_title">Контакты на SIM</string>
+  <string name="menu_callNumber">Позвонить: %s</string>
+  <string name="dialpad_hint_emergency_calling_not_available">Экстренные вызовы по Wi‑Fi недоступны.</string>
+  <string msgid="4313552620858880999" name="dialog_phone_call_prohibited_message">На этот номер нельзя позвонить</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-si/strings.xml b/java/com/android/dialer/dialpadview/res/values-si/strings.xml
index f9c65b2..630bbbf 100644
--- a/java/com/android/dialer/dialpadview/res/values-si/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-si/strings.xml
@@ -1,39 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_dialpad_back" msgid="6226488105558971135">"ආපසු සංචාලනය කරන්න"</string>
-    <string name="description_dialpad_overflow" msgid="5984341386518189787">"තවත් විකල්ප"</string>
-    <string name="description_delete_button" msgid="8431313818404527096">"backspace බොත්තම"</string>
-    <string name="description_image_button_plus" msgid="8936338119824589388">"ධන"</string>
-    <string name="description_voicemail_button" msgid="4187006295368768215">"හඬ තැපෑල"</string>
-    <string name="description_dial_button" msgid="6826108965053146374">"අමතන්න"</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"හඬ තැපෑල ඇමතීමට, මුලින්ම ගුවන්යානා ප්‍රකාරය වසන්න."</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"හඬ තැපෑල පිහිටුවීමට, මෙනුව &gt; සැකසීම් වෙත යන්න."</string>
-    <string name="add_2sec_pause" msgid="395591627218789322">"තත්පර 2ක විරාමයක් එක් කරන්න"</string>
-    <string name="add_wait" msgid="2278146476349811062">"රැඳී සිටීම එක් කරන්න"</string>
-    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"ස්පර්ශ නාද යතුරුපෑඩය භාවිතා කරන්න"</string>
-    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"පවතින ඇමතුමට නැවත යන්න"</string>
-    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"ඇමතුම එක් කරන්න"</string>
-    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
-    <string name="meid" msgid="5274167198744847659">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"SIM කාඩ්පතෙන් පූරණය කරමින්…"</string>
-    <string name="simContacts_title" msgid="8972942600800349990">"SIM කාඩ්පත් සම්බන්ධතා"</string>
-    <string name="menu_callNumber" msgid="1898333075466418368">"<xliff:g id="NUMBER">%s</xliff:g> අමතන්න"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"මෙම අංකයට ඇමතිය නොහැකිය"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_dialpad_back">ආපසු සංචාලනය කරන්න</string>
+  <string name="description_dialpad_overflow">තවත් විකල්ප</string>
+  <string name="description_delete_button">backspace බොත්තම</string>
+  <string name="description_image_button_plus">ධන ලකුණ ඩයල් කරන්න</string>
+  <string name="description_voicemail_button">හඬ තැපෑල අමතන්න</string>
+  <string name="description_dial_button">අමතන්න</string>
+  <string name="dialog_voicemail_airplane_mode_message">හඬ තැපෑල ඇමතීමට, මුලින්ම ගුවන්යානා ප්‍රකාරය වසන්න.</string>
+  <string name="dialog_voicemail_not_ready_message">හඬ තැපෑල පිහිටුවීමට, මෙනුව &gt; සැකසීම් වෙත යන්න.</string>
+  <string name="add_2sec_pause">තත්පර 2ක විරාමයක් එක් කරන්න</string>
+  <string name="add_wait">රැඳී සිටීම එක් කරන්න</string>
+  <string name="dialer_useDtmfDialpad">ස්පර්ශ නාද යතුරුපෑඩය භාවිත කරන්න</string>
+  <string name="dialer_returnToInCallScreen">පවතින ඇමතුමට නැවත යන්න</string>
+  <string name="dialer_addAnotherCall">ඇමතුම එක් කරන්න</string>
+  <string name="imei">IMEI</string>
+  <string name="meid">MEID</string>
+  <string name="simContacts_emptyLoading">SIM කාඩ්පතෙන් පූරණය කරමින්…</string>
+  <string name="simContacts_title">SIM කාඩ්පත් සම්බන්ධතා</string>
+  <string name="menu_callNumber">%s අමතන්න</string>
+  <string name="dialpad_hint_emergency_calling_not_available">Wi-Fi හරහා හදිසි අවස්ථා ඇමතුම් කිරීමට නොහැකිය</string>
+  <string msgid="4313552620858880999" name="dialog_phone_call_prohibited_message">මෙම අංකයට ඇමතිය නොහැකිය</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-sk/strings.xml b/java/com/android/dialer/dialpadview/res/values-sk/strings.xml
index f8d2ae6..468dbba 100644
--- a/java/com/android/dialer/dialpadview/res/values-sk/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-sk/strings.xml
@@ -1,39 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_dialpad_back" msgid="6226488105558971135">"Prejsť späť"</string>
-    <string name="description_dialpad_overflow" msgid="5984341386518189787">"Ďalšie možnosti"</string>
-    <string name="description_delete_button" msgid="8431313818404527096">"spätné mazanie"</string>
-    <string name="description_image_button_plus" msgid="8936338119824589388">"plus"</string>
-    <string name="description_voicemail_button" msgid="4187006295368768215">"hlasová správa"</string>
-    <string name="description_dial_button" msgid="6826108965053146374">"vytáčanie"</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"Ak chcete volať hlasovú schránku, najprv vypnite režim v lietadle."</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"Ak chcete nastaviť hlasovú schránku, prejdite na ponuku &gt; Nastavenia."</string>
-    <string name="add_2sec_pause" msgid="395591627218789322">"Pridať dvojsekundovú pauzu"</string>
-    <string name="add_wait" msgid="2278146476349811062">"Pridať čakanie"</string>
-    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"Použiť dotykovú tónovú klávesnicu"</string>
-    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"Vrátiť sa k prebiehajúcemu hovoru"</string>
-    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"Pridať hovor"</string>
-    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
-    <string name="meid" msgid="5274167198744847659">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"Načítava sa zo SIM karty..."</string>
-    <string name="simContacts_title" msgid="8972942600800349990">"Kontakty na SIM karte"</string>
-    <string name="menu_callNumber" msgid="1898333075466418368">"Volať na číslo <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"Na toto číslo sa nedá zavolať"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_dialpad_back">Prejsť späť</string>
+  <string name="description_dialpad_overflow">Ďalšie možnosti</string>
+  <string name="description_delete_button">spätné mazanie</string>
+  <string name="description_image_button_plus">vytočiť plus</string>
+  <string name="description_voicemail_button">volať do hlasovej schránky</string>
+  <string name="description_dial_button">vytáčanie</string>
+  <string name="dialog_voicemail_airplane_mode_message">Ak chcete volať hlasovú schránku, najprv vypnite režim v lietadle.</string>
+  <string name="dialog_voicemail_not_ready_message">Ak chcete nastaviť hlasovú schránku, prejdite na ponuku &gt; Nastavenia.</string>
+  <string name="add_2sec_pause">Pridať dvojsekundovú pauzu</string>
+  <string name="add_wait">Pridať čakanie</string>
+  <string name="dialer_useDtmfDialpad">Použiť dotykovú tónovú klávesnicu</string>
+  <string name="dialer_returnToInCallScreen">Vrátiť sa k prebiehajúcemu hovoru</string>
+  <string name="dialer_addAnotherCall">Pridať hovor</string>
+  <string name="imei">IMEI</string>
+  <string name="meid">MEID</string>
+  <string name="simContacts_emptyLoading">Načítava sa zo SIM karty...</string>
+  <string name="simContacts_title">Kontakty na SIM karte</string>
+  <string name="menu_callNumber">Volať na číslo %s</string>
+  <string name="dialpad_hint_emergency_calling_not_available">Cez Wi-Fi sa tiesňové volania nedajú uskutočňovať</string>
+  <string msgid="4313552620858880999" name="dialog_phone_call_prohibited_message">Na toto číslo sa nedá zavolať</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-sl/strings.xml b/java/com/android/dialer/dialpadview/res/values-sl/strings.xml
index e406034..16bcc2b 100644
--- a/java/com/android/dialer/dialpadview/res/values-sl/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-sl/strings.xml
@@ -1,39 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_dialpad_back" msgid="6226488105558971135">"Pomik nazaj"</string>
-    <string name="description_dialpad_overflow" msgid="5984341386518189787">"Več možnosti"</string>
-    <string name="description_delete_button" msgid="8431313818404527096">"vračalka"</string>
-    <string name="description_image_button_plus" msgid="8936338119824589388">"plus"</string>
-    <string name="description_voicemail_button" msgid="4187006295368768215">"sporočilo v odzivniku"</string>
-    <string name="description_dial_button" msgid="6826108965053146374">"pokliči"</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"Če želite poklicati odzivnik, najprej izklopite način za letalo."</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"Če želite nastaviti odzivnik, odprite »Meni« &gt; »Nastavitve«."</string>
-    <string name="add_2sec_pause" msgid="395591627218789322">"Dodaj 2 sekundi premora"</string>
-    <string name="add_wait" msgid="2278146476349811062">"Dodaj čakanje"</string>
-    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"Uporabi številčnico za tonsko izbiranje"</string>
-    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"Nazaj na klic, ki poteka"</string>
-    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"Dodaj klic"</string>
-    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
-    <string name="meid" msgid="5274167198744847659">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"Nalaganje s kartice SIM …"</string>
-    <string name="simContacts_title" msgid="8972942600800349990">"Stiki na kartici SIM"</string>
-    <string name="menu_callNumber" msgid="1898333075466418368">"Pokliči <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"Te številke ni mogoče poklicati"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_dialpad_back">Pomik nazaj</string>
+  <string name="description_dialpad_overflow">Več možnosti</string>
+  <string name="description_delete_button">vračalka</string>
+  <string name="description_image_button_plus">dodaj plus</string>
+  <string name="description_voicemail_button">pokliči odzivnik</string>
+  <string name="description_dial_button">pokliči</string>
+  <string name="dialog_voicemail_airplane_mode_message">Če želite poklicati odzivnik, najprej izklopite način za letalo.</string>
+  <string name="dialog_voicemail_not_ready_message">Če želite nastaviti odzivnik, odprite »Meni« &gt; »Nastavitve«.</string>
+  <string name="add_2sec_pause">Dodaj 2 sekundi premora</string>
+  <string name="add_wait">Dodaj čakanje</string>
+  <string name="dialer_useDtmfDialpad">Uporabi številčnico za tonsko izbiranje</string>
+  <string name="dialer_returnToInCallScreen">Nazaj na klic, ki poteka</string>
+  <string name="dialer_addAnotherCall">Dodaj klic</string>
+  <string name="imei">IMEI</string>
+  <string name="meid">MEID</string>
+  <string name="simContacts_emptyLoading">Nalaganje s kartice SIM …</string>
+  <string name="simContacts_title">Stiki na kartici SIM</string>
+  <string name="menu_callNumber">Pokliči %s</string>
+  <string name="dialpad_hint_emergency_calling_not_available">Klicev v sili ni mogoče opravljati prek omrežja Wi-Fi</string>
+  <string msgid="4313552620858880999" name="dialog_phone_call_prohibited_message">Te številke ni mogoče poklicati</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-sq/strings.xml b/java/com/android/dialer/dialpadview/res/values-sq/strings.xml
index fd11259..99bdf03 100644
--- a/java/com/android/dialer/dialpadview/res/values-sq/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-sq/strings.xml
@@ -1,39 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_dialpad_back" msgid="6226488105558971135">"Kthehu prapa"</string>
-    <string name="description_dialpad_overflow" msgid="5984341386518189787">"Opsione të tjera"</string>
-    <string name="description_delete_button" msgid="8431313818404527096">"kthim prapa"</string>
-    <string name="description_image_button_plus" msgid="8936338119824589388">"plus"</string>
-    <string name="description_voicemail_button" msgid="4187006295368768215">"postë zanore"</string>
-    <string name="description_dial_button" msgid="6826108965053146374">"formo numrin"</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"Për të telefonuar postën zanore, në fillim çaktivizo modalitetin \"në aeroplan\"."</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"Për të konfiguruar postën zanore, shko te \"Menyja\" &gt; \"Cilësimet\"."</string>
-    <string name="add_2sec_pause" msgid="395591627218789322">"Shto një ndërprerje 2-sekondëshe"</string>
-    <string name="add_wait" msgid="2278146476349811062">"Shto një pritje"</string>
-    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"Përdor bllokun e tasteve me prekje"</string>
-    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"Kthehu te telefonata në vazhdim"</string>
-    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"Shto telefonatë"</string>
-    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
-    <string name="meid" msgid="5274167198744847659">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"Po ngarkon nga karta SIM…"</string>
-    <string name="simContacts_title" msgid="8972942600800349990">"Kontaktet e kartës SIM"</string>
-    <string name="menu_callNumber" msgid="1898333075466418368">"Telefono <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"Ky numër nuk mund të telefonohet"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_dialpad_back">Kthehu prapa</string>
+  <string name="description_dialpad_overflow">Opsione të tjera</string>
+  <string name="description_delete_button">kthim prapa</string>
+  <string name="description_image_button_plus">formo shenjën plus</string>
+  <string name="description_voicemail_button">telefono postën zanore</string>
+  <string name="description_dial_button">formo numrin</string>
+  <string name="dialog_voicemail_airplane_mode_message">Për të telefonuar postën zanore, në fillim çaktivizo modalitetin \"në aeroplan\".</string>
+  <string name="dialog_voicemail_not_ready_message">Për të konfiguruar postën zanore, shko te \"Menyja\" &gt; \"Cilësimet\".</string>
+  <string name="add_2sec_pause">Shto një ndërprerje 2-sekondëshe</string>
+  <string name="add_wait">Shto një pritje</string>
+  <string name="dialer_useDtmfDialpad">Përdor bllokun e tasteve me tone të prekjes</string>
+  <string name="dialer_returnToInCallScreen">Kthehu te telefonata në vazhdim</string>
+  <string name="dialer_addAnotherCall">Shto telefonatë</string>
+  <string name="imei">IMEI</string>
+  <string name="meid">MEID</string>
+  <string name="simContacts_emptyLoading">Po ngarkon nga karta SIM…</string>
+  <string name="simContacts_title">Kontaktet e kartës SIM</string>
+  <string name="menu_callNumber">Telefono %s</string>
+  <string name="dialpad_hint_emergency_calling_not_available">Nuk mund të kryhen telefonata urgjence me WiFi</string>
+  <string msgid="4313552620858880999" name="dialog_phone_call_prohibited_message">Ky numër nuk mund të telefonohet</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-sr/strings.xml b/java/com/android/dialer/dialpadview/res/values-sr/strings.xml
index 7068813..d2e998f 100644
--- a/java/com/android/dialer/dialpadview/res/values-sr/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-sr/strings.xml
@@ -1,39 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_dialpad_back" msgid="6226488105558971135">"Идите назад"</string>
-    <string name="description_dialpad_overflow" msgid="5984341386518189787">"Још опција"</string>
-    <string name="description_delete_button" msgid="8431313818404527096">"backspace"</string>
-    <string name="description_image_button_plus" msgid="8936338119824589388">"плус"</string>
-    <string name="description_voicemail_button" msgid="4187006295368768215">"говорна пошта"</string>
-    <string name="description_dial_button" msgid="6826108965053146374">"бирајте број"</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"Да бисте позвали говорну пошту, прво искључите режим рада у авиону."</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"Да бисте подесили говорну пошту, идите у Мени &gt; Подешавања."</string>
-    <string name="add_2sec_pause" msgid="395591627218789322">"Додај паузу од 2 секунде"</string>
-    <string name="add_wait" msgid="2278146476349811062">"Додај чекање"</string>
-    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"Користи тастатуру за тонско бирање"</string>
-    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"Назад у позив који је у току"</string>
-    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"Додај позив"</string>
-    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
-    <string name="meid" msgid="5274167198744847659">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"Учитава се са SIM картице…"</string>
-    <string name="simContacts_title" msgid="8972942600800349990">"Контакти на SIM картици"</string>
-    <string name="menu_callNumber" msgid="1898333075466418368">"Позови <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"Није могуће позвати овај број"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_dialpad_back">Идите назад</string>
+  <string name="description_dialpad_overflow">Још опција</string>
+  <string name="description_delete_button">backspace</string>
+  <string name="description_image_button_plus">унесите плус</string>
+  <string name="description_voicemail_button">позовите говорну пошту</string>
+  <string name="description_dial_button">бирајте број</string>
+  <string name="dialog_voicemail_airplane_mode_message">Да бисте позвали говорну пошту, прво искључите режим рада у авиону.</string>
+  <string name="dialog_voicemail_not_ready_message">Да бисте подесили говорну пошту, идите у Мени &gt; Подешавања.</string>
+  <string name="add_2sec_pause">Додај паузу од 2 секунде</string>
+  <string name="add_wait">Додај чекање</string>
+  <string name="dialer_useDtmfDialpad">Користи тастатуру за тонско бирање</string>
+  <string name="dialer_returnToInCallScreen">Назад у позив који је у току</string>
+  <string name="dialer_addAnotherCall">Додај позив</string>
+  <string name="imei">IMEI</string>
+  <string name="meid">MEID</string>
+  <string name="simContacts_emptyLoading">Учитава се са SIM картице…</string>
+  <string name="simContacts_title">Контакти на SIM картици</string>
+  <string name="menu_callNumber">Позови %s</string>
+  <string name="dialpad_hint_emergency_calling_not_available">Не можете да упућујете хитне позиве преко Wi‑Fi-ја</string>
+  <string msgid="4313552620858880999" name="dialog_phone_call_prohibited_message">Није могуће позвати овај број</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-sv/strings.xml b/java/com/android/dialer/dialpadview/res/values-sv/strings.xml
index 00524a8..589426b 100644
--- a/java/com/android/dialer/dialpadview/res/values-sv/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-sv/strings.xml
@@ -1,39 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_dialpad_back" msgid="6226488105558971135">"Tillbaka"</string>
-    <string name="description_dialpad_overflow" msgid="5984341386518189787">"Fler alternativ"</string>
-    <string name="description_delete_button" msgid="8431313818404527096">"backsteg"</string>
-    <string name="description_image_button_plus" msgid="8936338119824589388">"plus"</string>
-    <string name="description_voicemail_button" msgid="4187006295368768215">"röstbrevlåda"</string>
-    <string name="description_dial_button" msgid="6826108965053146374">"ring"</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"Om du vill ringa röstbrevlådan måste du först inaktivera flygplansläget."</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"Välj Meny &gt; Inställningar om du vill konfigurera röstbrevlådan."</string>
-    <string name="add_2sec_pause" msgid="395591627218789322">"Lägg till en paus på 2 sek."</string>
-    <string name="add_wait" msgid="2278146476349811062">"Lägg till väntetid"</string>
-    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"Använd tonvalstelefon"</string>
-    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"Återvänd till pågående samtal"</string>
-    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"Lägg till samtal"</string>
-    <string name="imei" msgid="7961343816043247280">"IMEI-kod"</string>
-    <string name="meid" msgid="5274167198744847659">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"Läser in från SIM-kort …"</string>
-    <string name="simContacts_title" msgid="8972942600800349990">"Kontakter från SIM-kort"</string>
-    <string name="menu_callNumber" msgid="1898333075466418368">"Ring <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"Det går inte att ringa det här numret"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_dialpad_back">Tillbaka</string>
+  <string name="description_dialpad_overflow">Fler alternativ</string>
+  <string name="description_delete_button">backsteg</string>
+  <string name="description_image_button_plus">ring plus</string>
+  <string name="description_voicemail_button">ring röstbrevlådan</string>
+  <string name="description_dial_button">ring</string>
+  <string name="dialog_voicemail_airplane_mode_message">Om du vill ringa röstbrevlådan måste du först inaktivera flygplansläget.</string>
+  <string name="dialog_voicemail_not_ready_message">Välj Meny &gt; Inställningar om du vill konfigurera röstbrevlådan.</string>
+  <string name="add_2sec_pause">Lägg till en paus på 2 sek.</string>
+  <string name="add_wait">Lägg till väntetid</string>
+  <string name="dialer_useDtmfDialpad">Använd tonvalstelefon</string>
+  <string name="dialer_returnToInCallScreen">Återvänd till pågående samtal</string>
+  <string name="dialer_addAnotherCall">Lägg till samtal</string>
+  <string name="imei">IMEI-kod</string>
+  <string name="meid">MEID</string>
+  <string name="simContacts_emptyLoading">Läser in från SIM-kort …</string>
+  <string name="simContacts_title">Kontakter från SIM-kort</string>
+  <string name="menu_callNumber">Ring %s</string>
+  <string name="dialpad_hint_emergency_calling_not_available">Det går inte att ringa nödsamtal över Wi‑Fi</string>
+  <string msgid="4313552620858880999" name="dialog_phone_call_prohibited_message">Det går inte att ringa det här numret</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-sw/strings.xml b/java/com/android/dialer/dialpadview/res/values-sw/strings.xml
index 98ed9ce..95d1e27 100644
--- a/java/com/android/dialer/dialpadview/res/values-sw/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-sw/strings.xml
@@ -1,39 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_dialpad_back" msgid="6226488105558971135">"Rudi nyuma"</string>
-    <string name="description_dialpad_overflow" msgid="5984341386518189787">"Chaguo zaidi"</string>
-    <string name="description_delete_button" msgid="8431313818404527096">"nafasi ya nyuma"</string>
-    <string name="description_image_button_plus" msgid="8936338119824589388">"jumlisha"</string>
-    <string name="description_voicemail_button" msgid="4187006295368768215">"ujumbe wa sauti"</string>
-    <string name="description_dial_button" msgid="6826108965053146374">"piga simu"</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"Ili usikilize ujumbe wa sauti, kwanza zima Hali ya Ndegeni."</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"Ili uweke mipangilio ya ujumbe wa sauti, nenda kwenye Menyu &gt; Mipangilio."</string>
-    <string name="add_2sec_pause" msgid="395591627218789322">"Ongeza usitishaji wa sekunde 2"</string>
-    <string name="add_wait" msgid="2278146476349811062">"Ongeza muda wa kusubiri"</string>
-    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"Tumia kibao cha kuchapa cha sauti na kugusa"</string>
-    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"Rudi kwenye simu inayoendelea"</string>
-    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"Ongeza simu"</string>
-    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
-    <string name="meid" msgid="5274167198744847659">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"Inapakia kutoka kwenye SIM kadi…"</string>
-    <string name="simContacts_title" msgid="8972942600800349990">"Anwani za SIM kadi"</string>
-    <string name="menu_callNumber" msgid="1898333075466418368">"Piga simu <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"Haiwezi kupiga simu kwa nambari hii"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_dialpad_back">Rudi nyuma</string>
+  <string name="description_dialpad_overflow">Chaguo zaidi</string>
+  <string name="description_delete_button">nafasi ya nyuma</string>
+  <string name="description_image_button_plus">bonyeza +</string>
+  <string name="description_voicemail_button">piga nambari ya ujumbe wa sauti</string>
+  <string name="description_dial_button">piga simu</string>
+  <string name="dialog_voicemail_airplane_mode_message">Ili usikilize ujumbe wa sauti, kwanza zima Hali ya Ndegeni.</string>
+  <string name="dialog_voicemail_not_ready_message">Ili uweke mipangilio ya ujumbe wa sauti, nenda kwenye Menyu &gt; Mipangilio.</string>
+  <string name="add_2sec_pause">Ongeza usitishaji wa sekunde 2</string>
+  <string name="add_wait">Ongeza muda wa kusubiri</string>
+  <string name="dialer_useDtmfDialpad">Tumia kibao cha kuchapa cha sauti na kugusa</string>
+  <string name="dialer_returnToInCallScreen">Rudi kwenye simu inayoendelea</string>
+  <string name="dialer_addAnotherCall">Ongeza simu</string>
+  <string name="imei">IMEI</string>
+  <string name="meid">MEID</string>
+  <string name="simContacts_emptyLoading">Inapakia kutoka kwenye SIM kadi…</string>
+  <string name="simContacts_title">Anwani za SIM kadi</string>
+  <string name="menu_callNumber">Piga simu %s</string>
+  <string name="dialpad_hint_emergency_calling_not_available">Huwezi kupiga simu ya dharura kupitia Wi‑Fi</string>
+  <string msgid="4313552620858880999" name="dialog_phone_call_prohibited_message">Haiwezi kupiga simu kwa nambari hii</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-ta/strings.xml b/java/com/android/dialer/dialpadview/res/values-ta/strings.xml
index 667010d..7b8356b 100644
--- a/java/com/android/dialer/dialpadview/res/values-ta/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-ta/strings.xml
@@ -1,39 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_dialpad_back" msgid="6226488105558971135">"பின் செல்லும்"</string>
-    <string name="description_dialpad_overflow" msgid="5984341386518189787">"மேலும் விருப்பங்கள்"</string>
-    <string name="description_delete_button" msgid="8431313818404527096">"பேக்ஸ்பேஸ்"</string>
-    <string name="description_image_button_plus" msgid="8936338119824589388">"பிளஸ்"</string>
-    <string name="description_voicemail_button" msgid="4187006295368768215">"குரலஞ்சல்"</string>
-    <string name="description_dial_button" msgid="6826108965053146374">"டயல் பொத்தான்"</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"குரலஞ்சலை அழைக்க, முதலில் விமானப் பயன்முறையை முடக்கவும்."</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"குரலஞ்சலை அமைக்க, மெனு &gt; அமைப்புகள் என்பதற்குச் செல்லவும்."</string>
-    <string name="add_2sec_pause" msgid="395591627218789322">"2 வினாடி இடைநிறுத்தத்தைச் சேர்"</string>
-    <string name="add_wait" msgid="2278146476349811062">"காத்திருப்பைச் சேர்"</string>
-    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"டச் டோன் விசைத்தளத்தைப் பயன்படுத்து"</string>
-    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"செயலிலுள்ள அழைப்பிற்குத் திரும்பு"</string>
-    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"அழைப்பைச் சேர்"</string>
-    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
-    <string name="meid" msgid="5274167198744847659">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"சிம் கார்டிலிருந்து ஏற்றுகிறது…"</string>
-    <string name="simContacts_title" msgid="8972942600800349990">"சிம் கார்டு தொடர்புகள்"</string>
-    <string name="menu_callNumber" msgid="1898333075466418368">"<xliff:g id="NUMBER">%s</xliff:g> எண்ணை அழை"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"இந்த எண்ணை அழைக்க முடியாது"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_dialpad_back">பின் செல்லும்</string>
+  <string name="description_dialpad_overflow">மேலும் விருப்பங்கள்</string>
+  <string name="description_delete_button">பேக்ஸ்பேஸ்</string>
+  <string name="description_image_button_plus">பிளஸ் சின்னத்தைச் சேர்க்கும்</string>
+  <string name="description_voicemail_button">குரலஞ்சலை அழைக்கும்</string>
+  <string name="description_dial_button">டயல் பொத்தான்</string>
+  <string name="dialog_voicemail_airplane_mode_message">குரலஞ்சலை அழைக்க, முதலில் விமானப் பயன்முறையை முடக்கவும்.</string>
+  <string name="dialog_voicemail_not_ready_message">குரலஞ்சலை அமைக்க, மெனு &gt; அமைப்புகள் என்பதற்குச் செல்லவும்.</string>
+  <string name="add_2sec_pause">2 வினாடி இடைநிறுத்தத்தைச் சேர்</string>
+  <string name="add_wait">காத்திருப்பைச் சேர்</string>
+  <string name="dialer_useDtmfDialpad">டச் டோன் விசைத்தளத்தைப் பயன்படுத்து</string>
+  <string name="dialer_returnToInCallScreen">செயலிலுள்ள அழைப்பிற்குத் திரும்பு</string>
+  <string name="dialer_addAnotherCall">அழைப்பைச் சேர்</string>
+  <string name="imei">IMEI</string>
+  <string name="meid">MEID</string>
+  <string name="simContacts_emptyLoading">சிம் கார்டிலிருந்து ஏற்றுகிறது…</string>
+  <string name="simContacts_title">சிம் கார்டு தொடர்புகள்</string>
+  <string name="menu_callNumber">%s எண்ணை அழை</string>
+  <string name="dialpad_hint_emergency_calling_not_available">வைஃபையைப் பயன்படுத்தி அவசர அழைப்புகளைச் செய்ய முடியாது</string>
+  <string msgid="4313552620858880999" name="dialog_phone_call_prohibited_message">இந்த எண்ணை அழைக்க முடியாது</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-te/strings.xml b/java/com/android/dialer/dialpadview/res/values-te/strings.xml
index 5e24667..49c5191 100644
--- a/java/com/android/dialer/dialpadview/res/values-te/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-te/strings.xml
@@ -1,39 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_dialpad_back" msgid="6226488105558971135">"వెనుకకు నావిగేట్ చేస్తుంది"</string>
-    <string name="description_dialpad_overflow" msgid="5984341386518189787">"మరిన్ని ఎంపికలు"</string>
-    <string name="description_delete_button" msgid="8431313818404527096">"బ్యాక్‌స్పేస్"</string>
-    <string name="description_image_button_plus" msgid="8936338119824589388">"కూడిక"</string>
-    <string name="description_voicemail_button" msgid="4187006295368768215">"వాయిస్ మెయిల్"</string>
-    <string name="description_dial_button" msgid="6826108965053146374">"డయల్ చేయండి"</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"వాయిస్ మెయిల్ కాల్ చేయడానికి, మొదట విమానం మోడ్‌ను ఆపివేయండి."</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"వాయిస్ మెయిల్ సెటప్ చేయడానికి, మెను &gt; సెట్టింగ్‌లకు వెళ్లండి."</string>
-    <string name="add_2sec_pause" msgid="395591627218789322">"2-సెకన్ల పాజ్‌ను జోడించండి"</string>
-    <string name="add_wait" msgid="2278146476349811062">"నిరీక్షణ సమయాన్ని జోడించండి"</string>
-    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"టచ్ టోన్ కీప్యాడ్‌ను ఉపయోగించండి"</string>
-    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"ప్రస్తుతం నడుస్తున్న కాల్‌కు తిరిగి వెళ్లండి"</string>
-    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"కాల్ జోడించండి"</string>
-    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
-    <string name="meid" msgid="5274167198744847659">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"సిమ్ కార్డు నుండి లోడ్ చేస్తోంది…"</string>
-    <string name="simContacts_title" msgid="8972942600800349990">"SIM కార్డ్ పరిచయాలు"</string>
-    <string name="menu_callNumber" msgid="1898333075466418368">"<xliff:g id="NUMBER">%s</xliff:g>కు కాల్ చేయండి"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"ఈ నంబర్‌కు కాల్ చేయలేరు"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_dialpad_back">వెనుకకు నావిగేట్ చేస్తుంది</string>
+  <string name="description_dialpad_overflow">మరిన్ని ఎంపికలు</string>
+  <string name="description_delete_button">బ్యాక్‌స్పేస్</string>
+  <string name="description_image_button_plus">డయల్ ప్లస్</string>
+  <string name="description_voicemail_button">వాయిస్ మెయిల్‌కు కాల్ చేయి</string>
+  <string name="description_dial_button">డయల్ చేయండి</string>
+  <string name="dialog_voicemail_airplane_mode_message">వాయిస్ మెయిల్ కాల్ చేయడానికి, మొదట విమానం మోడ్‌ను ఆపివేయండి.</string>
+  <string name="dialog_voicemail_not_ready_message">వాయిస్ మెయిల్ సెటప్ చేయడానికి, మెను &gt; సెట్టింగ్‌లకు వెళ్లండి.</string>
+  <string name="add_2sec_pause">2-సెకన్ల పాజ్‌ను జోడించండి</string>
+  <string name="add_wait">నిరీక్షణ సమయాన్ని జోడించండి</string>
+  <string name="dialer_useDtmfDialpad">టచ్ టోన్ కీప్యాడ్‌ను ఉపయోగించండి</string>
+  <string name="dialer_returnToInCallScreen">ప్రస్తుతం నడుస్తున్న కాల్‌కు తిరిగి వెళ్లండి</string>
+  <string name="dialer_addAnotherCall">కాల్ జోడించండి</string>
+  <string name="imei">IMEI</string>
+  <string name="meid">MEID</string>
+  <string name="simContacts_emptyLoading">సిమ్ కార్డు నుండి లోడ్ చేస్తోంది…</string>
+  <string name="simContacts_title">SIM కార్డ్ పరిచయాలు</string>
+  <string name="menu_callNumber">%sకు కాల్ చేయండి</string>
+  <string name="dialpad_hint_emergency_calling_not_available">Wi-Fiతో అత్యవసర కాల్‌లు చేయలేరు</string>
+  <string msgid="4313552620858880999" name="dialog_phone_call_prohibited_message">ఈ నంబర్‌కు కాల్ చేయలేరు</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-th/strings.xml b/java/com/android/dialer/dialpadview/res/values-th/strings.xml
index bb4cabd..8c43757 100644
--- a/java/com/android/dialer/dialpadview/res/values-th/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-th/strings.xml
@@ -1,39 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_dialpad_back" msgid="6226488105558971135">"ย้อนกลับ"</string>
-    <string name="description_dialpad_overflow" msgid="5984341386518189787">"ตัวเลือกเพิ่มเติม"</string>
-    <string name="description_delete_button" msgid="8431313818404527096">"ลบถอยหลัง"</string>
-    <string name="description_image_button_plus" msgid="8936338119824589388">"บวก"</string>
-    <string name="description_voicemail_button" msgid="4187006295368768215">"ข้อความเสียง"</string>
-    <string name="description_dial_button" msgid="6826108965053146374">"หมุนหมายเลข"</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"หากต้องการฟังข้อความเสียง ให้ปิดโหมดใช้งานบนเครื่องบินก่อน"</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"หากต้องการตั้งค่าข้อความเสียง ให้ไปที่เมนู &gt; การตั้งค่า"</string>
-    <string name="add_2sec_pause" msgid="395591627218789322">"เพิ่มช่วงคั่น 2 วินาที"</string>
-    <string name="add_wait" msgid="2278146476349811062">"เพิ่มการรอ"</string>
-    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"ใช้ปุ่มกดสัญญาณเสียง"</string>
-    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"กลับไปคุยสายต่อ"</string>
-    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"เพิ่มการโทร"</string>
-    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
-    <string name="meid" msgid="5274167198744847659">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"กำลังโหลดจากซิมการ์ด…"</string>
-    <string name="simContacts_title" msgid="8972942600800349990">"รายชื่อติดต่อในซิมการ์ด"</string>
-    <string name="menu_callNumber" msgid="1898333075466418368">"โทร <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"ไม่สามารถโทรไปยังหมายเลขนี้"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_dialpad_back">ย้อนกลับ</string>
+  <string name="description_dialpad_overflow">ตัวเลือกเพิ่มเติม</string>
+  <string name="description_delete_button">ลบถอยหลัง</string>
+  <string name="description_image_button_plus">กดปุ่มเครื่องหมายบวก</string>
+  <string name="description_voicemail_button">เรียกใช้ข้อความเสียง</string>
+  <string name="description_dial_button">หมุนหมายเลข</string>
+  <string name="dialog_voicemail_airplane_mode_message">หากต้องการฟังข้อความเสียง ให้ปิดโหมดใช้งานบนเครื่องบินก่อน</string>
+  <string name="dialog_voicemail_not_ready_message">หากต้องการตั้งค่าข้อความเสียง ให้ไปที่เมนู &gt; การตั้งค่า</string>
+  <string name="add_2sec_pause">เพิ่มช่วงคั่น 2 วินาที</string>
+  <string name="add_wait">เพิ่มการรอ</string>
+  <string name="dialer_useDtmfDialpad">ใช้ปุ่มกดแบบมีเสียง</string>
+  <string name="dialer_returnToInCallScreen">กลับไปคุยสายต่อ</string>
+  <string name="dialer_addAnotherCall">เพิ่มการโทร</string>
+  <string name="imei">IMEI</string>
+  <string name="meid">MEID</string>
+  <string name="simContacts_emptyLoading">กำลังโหลดจากซิมการ์ด…</string>
+  <string name="simContacts_title">รายชื่อติดต่อในซิมการ์ด</string>
+  <string name="menu_callNumber">โทร %s</string>
+  <string name="dialpad_hint_emergency_calling_not_available">โทรหาหมายเลขฉุกเฉินผ่าน Wi‑Fi ไม่ได้</string>
+  <string msgid="4313552620858880999" name="dialog_phone_call_prohibited_message">ไม่สามารถโทรไปยังหมายเลขนี้</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-tl/strings.xml b/java/com/android/dialer/dialpadview/res/values-tl/strings.xml
index d23823e..8c43b42 100644
--- a/java/com/android/dialer/dialpadview/res/values-tl/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-tl/strings.xml
@@ -1,39 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_dialpad_back" msgid="6226488105558971135">"Nagna-navigate pabalik"</string>
-    <string name="description_dialpad_overflow" msgid="5984341386518189787">"Higit pang mga pagpipilian"</string>
-    <string name="description_delete_button" msgid="8431313818404527096">"backspace"</string>
-    <string name="description_image_button_plus" msgid="8936338119824589388">"plus"</string>
-    <string name="description_voicemail_button" msgid="4187006295368768215">"voicemail"</string>
-    <string name="description_dial_button" msgid="6826108965053146374">"mag-dial"</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"Upang tumawag sa voicemail, i-off muna ang Airplane mode."</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"Upang mag-set up ng voicemail, pumunta sa Menu &gt; Mga Setting."</string>
-    <string name="add_2sec_pause" msgid="395591627218789322">"Magdagdag ng pag-pause na 2-seg"</string>
-    <string name="add_wait" msgid="2278146476349811062">"Magdagdag ng paghihintay"</string>
-    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"Gumamit ng touch tone na keypad"</string>
-    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"Bumalik sa kasalukuyang tawag"</string>
-    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"Magdagdag ng tawag"</string>
-    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
-    <string name="meid" msgid="5274167198744847659">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"Naglo-load mula sa SIM card…"</string>
-    <string name="simContacts_title" msgid="8972942600800349990">"Mga contact sa SIM card"</string>
-    <string name="menu_callNumber" msgid="1898333075466418368">"Tawagan ang <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"Hindi matawagan ang numerong ito"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_dialpad_back">Nagna-navigate pabalik</string>
+  <string name="description_dialpad_overflow">Higit pang mga pagpipilian</string>
+  <string name="description_delete_button">backspace</string>
+  <string name="description_image_button_plus">dial plus</string>
+  <string name="description_voicemail_button">tawagan ang voicemail</string>
+  <string name="description_dial_button">mag-dial</string>
+  <string name="dialog_voicemail_airplane_mode_message">Upang tumawag sa voicemail, i-off muna ang Airplane mode.</string>
+  <string name="dialog_voicemail_not_ready_message">Upang mag-set up ng voicemail, pumunta sa Menu &gt; Mga Setting.</string>
+  <string name="add_2sec_pause">Magdagdag ng pag-pause na 2-seg</string>
+  <string name="add_wait">Magdagdag ng paghihintay</string>
+  <string name="dialer_useDtmfDialpad">Gumamit ng touch-tone na keypad</string>
+  <string name="dialer_returnToInCallScreen">Bumalik sa kasalukuyang tawag</string>
+  <string name="dialer_addAnotherCall">Magdagdag ng tawag</string>
+  <string name="imei">IMEI</string>
+  <string name="meid">MEID</string>
+  <string name="simContacts_emptyLoading">Naglo-load mula sa SIM card…</string>
+  <string name="simContacts_title">Mga contact sa SIM card</string>
+  <string name="menu_callNumber">Tawagan ang %s</string>
+  <string name="dialpad_hint_emergency_calling_not_available">Di makakagawa ng mga emergency na tawag sa Wi‑Fi</string>
+  <string msgid="4313552620858880999" name="dialog_phone_call_prohibited_message">Hindi matawagan ang numerong ito</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-tr/strings.xml b/java/com/android/dialer/dialpadview/res/values-tr/strings.xml
index b7b8501..8629cb8 100644
--- a/java/com/android/dialer/dialpadview/res/values-tr/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-tr/strings.xml
@@ -1,39 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_dialpad_back" msgid="6226488105558971135">"Geri dön"</string>
-    <string name="description_dialpad_overflow" msgid="5984341386518189787">"Diğer seçenekler"</string>
-    <string name="description_delete_button" msgid="8431313818404527096">"geri tuşu"</string>
-    <string name="description_image_button_plus" msgid="8936338119824589388">"artı"</string>
-    <string name="description_voicemail_button" msgid="4187006295368768215">"sesli mesaj"</string>
-    <string name="description_dial_button" msgid="6826108965053146374">"telefonu arar"</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"Sesli mesajı aramak için öncelikle Uçak modunu kapatın."</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"Sesli mesajı yapılandırmak için Menü &gt; Ayarlar\'a gidin."</string>
-    <string name="add_2sec_pause" msgid="395591627218789322">"2 saniyelik duraklama ekle"</string>
-    <string name="add_wait" msgid="2278146476349811062">"Bekleme ekle"</string>
-    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"Telefon tuş takımını kullan"</string>
-    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"Devam eden çağrıya dön"</string>
-    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"Çağrı ekle"</string>
-    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
-    <string name="meid" msgid="5274167198744847659">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"SIM karttan yükleniyor…"</string>
-    <string name="simContacts_title" msgid="8972942600800349990">"SIM kart kişileri"</string>
-    <string name="menu_callNumber" msgid="1898333075466418368">"Telefon et: <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"Bu numara aranamaz"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_dialpad_back">Geri dön</string>
+  <string name="description_dialpad_overflow">Diğer seçenekler</string>
+  <string name="description_delete_button">geri tuşu</string>
+  <string name="description_image_button_plus">tuş takımına artı simgesi ekler</string>
+  <string name="description_voicemail_button">sesli mesajı arar</string>
+  <string name="description_dial_button">telefonu arar</string>
+  <string name="dialog_voicemail_airplane_mode_message">Sesli mesajı aramak için öncelikle Uçak modunu kapatın.</string>
+  <string name="dialog_voicemail_not_ready_message">Sesli mesajı yapılandırmak için Menü &gt; Ayarlar\'a gidin.</string>
+  <string name="add_2sec_pause">2 saniyelik duraklama ekle</string>
+  <string name="add_wait">Bekleme ekle</string>
+  <string name="dialer_useDtmfDialpad">Telefon tuş takımını kullan</string>
+  <string name="dialer_returnToInCallScreen">Devam eden çağrıya dön</string>
+  <string name="dialer_addAnotherCall">Çağrı ekle</string>
+  <string name="imei">IMEI</string>
+  <string name="meid">MEID</string>
+  <string name="simContacts_emptyLoading">SIM karttan yükleniyor…</string>
+  <string name="simContacts_title">SIM kart kişileri</string>
+  <string name="menu_callNumber">Telefon et: %s</string>
+  <string name="dialpad_hint_emergency_calling_not_available">Kablosuz ağ üzerinden acil durum araması yapılamaz</string>
+  <string msgid="4313552620858880999" name="dialog_phone_call_prohibited_message">Bu numara aranamaz</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-uk/strings.xml b/java/com/android/dialer/dialpadview/res/values-uk/strings.xml
index c862fce..4ffc7ae 100644
--- a/java/com/android/dialer/dialpadview/res/values-uk/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-uk/strings.xml
@@ -1,39 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_dialpad_back" msgid="6226488105558971135">"Назад"</string>
-    <string name="description_dialpad_overflow" msgid="5984341386518189787">"Інші варіанти"</string>
-    <string name="description_delete_button" msgid="8431313818404527096">"видалення символів перед курсором"</string>
-    <string name="description_image_button_plus" msgid="8936338119824589388">"плюс"</string>
-    <string name="description_voicemail_button" msgid="4187006295368768215">"голосова пошта"</string>
-    <string name="description_dial_button" msgid="6826108965053146374">"дзвонити"</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"Щоб перевірити голосову пошту, спочатку вимкніть режим польоту."</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"Щоб налаштувати голосову пошту, перейдіть у Меню &gt; Налаштування."</string>
-    <string name="add_2sec_pause" msgid="395591627218789322">"Додати 2-секундну паузу"</string>
-    <string name="add_wait" msgid="2278146476349811062">"Додати паузу"</string>
-    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"Використовувати тональний набір"</string>
-    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"Повернутися до поточного виклику"</string>
-    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"Додати виклик"</string>
-    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
-    <string name="meid" msgid="5274167198744847659">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"Завантаження із SIM-карти…"</string>
-    <string name="simContacts_title" msgid="8972942600800349990">"Контакти із SIM-карти"</string>
-    <string name="menu_callNumber" msgid="1898333075466418368">"Зателефонувати на номер <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"Не можна телефонувати на цей номер"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_dialpad_back">Назад</string>
+  <string name="description_dialpad_overflow">Інші варіанти</string>
+  <string name="description_delete_button">видалення символів перед курсором</string>
+  <string name="description_image_button_plus">додати плюс на цифрову клавіатуру</string>
+  <string name="description_voicemail_button">зателефонувати на голосову пошту</string>
+  <string name="description_dial_button">дзвонити</string>
+  <string name="dialog_voicemail_airplane_mode_message">Щоб перевірити голосову пошту, спочатку вимкніть режим польоту.</string>
+  <string name="dialog_voicemail_not_ready_message">Щоб налаштувати голосову пошту, перейдіть у Меню &gt; Налаштування.</string>
+  <string name="add_2sec_pause">Додати 2-секундну паузу</string>
+  <string name="add_wait">Додати паузу</string>
+  <string name="dialer_useDtmfDialpad">Використовувати тональний набір</string>
+  <string name="dialer_returnToInCallScreen">Повернутися до поточного виклику</string>
+  <string name="dialer_addAnotherCall">Додати виклик</string>
+  <string name="imei">IMEI</string>
+  <string name="meid">MEID</string>
+  <string name="simContacts_emptyLoading">Завантаження із SIM-карти…</string>
+  <string name="simContacts_title">Контакти із SIM-карти</string>
+  <string name="menu_callNumber">Зателефонувати на номер %s</string>
+  <string name="dialpad_hint_emergency_calling_not_available">Не можна здійснювати екстрені виклики через Wi-Fi</string>
+  <string msgid="4313552620858880999" name="dialog_phone_call_prohibited_message">Не можна телефонувати на цей номер</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-ur/strings.xml b/java/com/android/dialer/dialpadview/res/values-ur/strings.xml
index a7db8ec..30f8705 100644
--- a/java/com/android/dialer/dialpadview/res/values-ur/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-ur/strings.xml
@@ -1,39 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_dialpad_back" msgid="6226488105558971135">"پیچھے کو نیویگیٹ کریں"</string>
-    <string name="description_dialpad_overflow" msgid="5984341386518189787">"مزید اختیارات"</string>
-    <string name="description_delete_button" msgid="8431313818404527096">"بیک اسپیس"</string>
-    <string name="description_image_button_plus" msgid="8936338119824589388">"جمع"</string>
-    <string name="description_voicemail_button" msgid="4187006295368768215">"صوتی میل"</string>
-    <string name="description_dial_button" msgid="6826108965053146374">"ڈائل کریں"</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"صوتی میل کو کال کرنے کیلئے، پہلے ہوائی جہاز طرز آف کریں۔"</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"صوتی میل سیٹ کرنے کے لئے، مینو &gt; ترتیبات میں جائیں۔"</string>
-    <string name="add_2sec_pause" msgid="395591627218789322">"2 سیکنڈ کا توقف شامل کریں"</string>
-    <string name="add_wait" msgid="2278146476349811062">"انتظار شامل کریں"</string>
-    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"ٹچ ٹون کی پیڈ کا استعمال کریں"</string>
-    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"جاری کال پر واپس لوٹیں"</string>
-    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"کال شامل کریں"</string>
-    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
-    <string name="meid" msgid="5274167198744847659">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"‏SIM کارڈ سے لوڈ ہو رہا ہے…"</string>
-    <string name="simContacts_title" msgid="8972942600800349990">"‏SIM کارڈ کے رابطے"</string>
-    <string name="menu_callNumber" msgid="1898333075466418368">"<xliff:g id="NUMBER">%s</xliff:g> کو کال کریں"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"اس نمبر پر کال نہیں کر سکتے"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_dialpad_back">پیچھے کو نیویگیٹ کریں</string>
+  <string name="description_dialpad_overflow">مزید اختیارات</string>
+  <string name="description_delete_button">بیک اسپیس</string>
+  <string name="description_image_button_plus">ڈائل پلس</string>
+  <string name="description_voicemail_button">صوتی میل پر کال کریں</string>
+  <string name="description_dial_button">ڈائل کریں</string>
+  <string name="dialog_voicemail_airplane_mode_message">صوتی میل کو کال کرنے کیلئے، پہلے ہوائی جہاز طرز آف کریں۔</string>
+  <string name="dialog_voicemail_not_ready_message">صوتی میل سیٹ کرنے کے لئے، مینو &gt; ترتیبات میں جائیں۔</string>
+  <string name="add_2sec_pause">2 سیکنڈ کا توقف شامل کریں</string>
+  <string name="add_wait">انتظار شامل کریں</string>
+  <string name="dialer_useDtmfDialpad">ٹچ ٹون کی پیڈ استعمال کریں</string>
+  <string name="dialer_returnToInCallScreen">جاری کال پر واپس لوٹیں</string>
+  <string name="dialer_addAnotherCall">کال شامل کریں</string>
+  <string name="imei">IMEI</string>
+  <string name="meid">MEID</string>
+  <string name="simContacts_emptyLoading">‏SIM کارڈ سے لوڈ ہو رہا ہے…</string>
+  <string name="simContacts_title">‏SIM کارڈ کے رابطے</string>
+  <string name="menu_callNumber">%s کو کال کریں</string>
+  <string name="dialpad_hint_emergency_calling_not_available">‏Wi‑Fi کے ذریعے ایمرجنسی کالز نہیں کر سکتے</string>
+  <string msgid="4313552620858880999" name="dialog_phone_call_prohibited_message">اس نمبر پر کال نہیں کر سکتے</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-uz/strings.xml b/java/com/android/dialer/dialpadview/res/values-uz/strings.xml
index 2230c2c..3a59015 100644
--- a/java/com/android/dialer/dialpadview/res/values-uz/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-uz/strings.xml
@@ -1,39 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_dialpad_back" msgid="6226488105558971135">"Orqaga qaytish"</string>
-    <string name="description_dialpad_overflow" msgid="5984341386518189787">"Boshqa parametrlar"</string>
-    <string name="description_delete_button" msgid="8431313818404527096">"orqaga"</string>
-    <string name="description_image_button_plus" msgid="8936338119824589388">"qo‘shuv belgisi"</string>
-    <string name="description_voicemail_button" msgid="4187006295368768215">"ovozli pochta"</string>
-    <string name="description_dial_button" msgid="6826108965053146374">"raqam terish"</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"Ovozli pochtaga qo‘ng‘iroq qilish uchun parvoz rejimidan chiqing."</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"Ovozli pochtani sozlab olish uchun Menyu &gt; Sozlamalarga o‘ting."</string>
-    <string name="add_2sec_pause" msgid="395591627218789322">"2 soniyalik pauza qo‘shish"</string>
-    <string name="add_wait" msgid="2278146476349811062">"Pauza qo‘shish"</string>
-    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"Tovushli raqam tergichni ochish"</string>
-    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"Davom etayotgan chaqiruvga qaytish"</string>
-    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"Chaqiruv qo‘shish"</string>
-    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
-    <string name="meid" msgid="5274167198744847659">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"SIM kartadan yuklanmoqda…"</string>
-    <string name="simContacts_title" msgid="8972942600800349990">"SIM kartadagi kontaktlar"</string>
-    <string name="menu_callNumber" msgid="1898333075466418368">"<xliff:g id="NUMBER">%s</xliff:g> raqamiga qo‘ng‘iroq qilish"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"Bu raqamga qo‘ng‘iroq qilib bo‘lmaydi"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_dialpad_back">Orqaga qaytish</string>
+  <string name="description_dialpad_overflow">Boshqa parametrlar</string>
+  <string name="description_delete_button">orqaga</string>
+  <string name="description_image_button_plus">plusni terish</string>
+  <string name="description_voicemail_button">ovozli pochta raqamiga terish</string>
+  <string name="description_dial_button">raqam terish</string>
+  <string name="dialog_voicemail_airplane_mode_message">Ovozli pochtaga qo‘ng‘iroq qilish uchun parvoz rejimidan chiqing.</string>
+  <string name="dialog_voicemail_not_ready_message">Ovozli pochtani sozlab olish uchun Menyu &gt; Sozlamalarga o‘ting.</string>
+  <string name="add_2sec_pause">2 soniyalik pauza qo‘shish</string>
+  <string name="add_wait">Pauza qo‘shish</string>
+  <string name="dialer_useDtmfDialpad">Tovushli klaviatura</string>
+  <string name="dialer_returnToInCallScreen">Davom etayotgan chaqiruvga qaytish</string>
+  <string name="dialer_addAnotherCall">Chaqiruv qo‘shish</string>
+  <string name="imei">IMEI</string>
+  <string name="meid">MEID</string>
+  <string name="simContacts_emptyLoading">SIM kartadan yuklanmoqda…</string>
+  <string name="simContacts_title">SIM kartadagi kontaktlar</string>
+  <string name="menu_callNumber">%s raqamiga qo‘ng‘iroq qilish</string>
+  <string name="dialpad_hint_emergency_calling_not_available">Wi‑Fi orqali favqulodda xizmatlarga chaqiruv qilib bo‘lmaydi</string>
+  <string msgid="4313552620858880999" name="dialog_phone_call_prohibited_message">Bu raqamga qo‘ng‘iroq qilib bo‘lmaydi</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-vi/strings.xml b/java/com/android/dialer/dialpadview/res/values-vi/strings.xml
index 5022e79..2fb3eea 100644
--- a/java/com/android/dialer/dialpadview/res/values-vi/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-vi/strings.xml
@@ -1,39 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_dialpad_back" msgid="6226488105558971135">"Điều hướng trở lại"</string>
-    <string name="description_dialpad_overflow" msgid="5984341386518189787">"Tùy chọn khác"</string>
-    <string name="description_delete_button" msgid="8431313818404527096">"phím lùi"</string>
-    <string name="description_image_button_plus" msgid="8936338119824589388">"cộng"</string>
-    <string name="description_voicemail_button" msgid="4187006295368768215">"thư thoại"</string>
-    <string name="description_dial_button" msgid="6826108965053146374">"quay số"</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"Để gọi thư thoại, trước tiên hãy tắt Chế độ trên máy bay."</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"Để thiết lập thư thoại, hãy đi tới Menu &gt; Cài đặt."</string>
-    <string name="add_2sec_pause" msgid="395591627218789322">"Thêm tạm dừng 2 giây"</string>
-    <string name="add_wait" msgid="2278146476349811062">"Thêm chờ"</string>
-    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"Sử dụng bàn phím số cảm ứng có âm"</string>
-    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"Quay lại cuộc gọi đang thực hiện"</string>
-    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"Thêm cuộc gọi"</string>
-    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
-    <string name="meid" msgid="5274167198744847659">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"Đang tải từ thẻ SIM…"</string>
-    <string name="simContacts_title" msgid="8972942600800349990">"Danh bạ trên thẻ SIM"</string>
-    <string name="menu_callNumber" msgid="1898333075466418368">"Gọi <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"Không thể gọi số này"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_dialpad_back">Điều hướng trở lại</string>
+  <string name="description_dialpad_overflow">Tùy chọn khác</string>
+  <string name="description_delete_button">phím lùi</string>
+  <string name="description_image_button_plus">nút thêm dấu cộng vào bàn phím số</string>
+  <string name="description_voicemail_button">gọi thư thoại</string>
+  <string name="description_dial_button">quay số</string>
+  <string name="dialog_voicemail_airplane_mode_message">Để gọi thư thoại, trước tiên hãy tắt Chế độ trên máy bay.</string>
+  <string name="dialog_voicemail_not_ready_message">Để thiết lập thư thoại, hãy đi tới Menu &gt; Cài đặt.</string>
+  <string name="add_2sec_pause">Thêm tạm dừng 2 giây</string>
+  <string name="add_wait">Thêm chờ</string>
+  <string name="dialer_useDtmfDialpad">Sử dụng bàn phím số cảm ứng có âm</string>
+  <string name="dialer_returnToInCallScreen">Quay lại cuộc gọi đang thực hiện</string>
+  <string name="dialer_addAnotherCall">Thêm cuộc gọi</string>
+  <string name="imei">IMEI</string>
+  <string name="meid">MEID</string>
+  <string name="simContacts_emptyLoading">Đang tải từ thẻ SIM…</string>
+  <string name="simContacts_title">Danh bạ trên thẻ SIM</string>
+  <string name="menu_callNumber">Gọi %s</string>
+  <string name="dialpad_hint_emergency_calling_not_available">Không thể thực hiện cuộc gọi khẩn cấp qua Wi‑Fi</string>
+  <string msgid="4313552620858880999" name="dialog_phone_call_prohibited_message">Không thể gọi số này</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-zh-rCN/strings.xml b/java/com/android/dialer/dialpadview/res/values-zh-rCN/strings.xml
index 8d50e8e..81a234e 100644
--- a/java/com/android/dialer/dialpadview/res/values-zh-rCN/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-zh-rCN/strings.xml
@@ -1,39 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_dialpad_back" msgid="6226488105558971135">"返回"</string>
-    <string name="description_dialpad_overflow" msgid="5984341386518189787">"更多选项"</string>
-    <string name="description_delete_button" msgid="8431313818404527096">"删除"</string>
-    <string name="description_image_button_plus" msgid="8936338119824589388">"加号"</string>
-    <string name="description_voicemail_button" msgid="4187006295368768215">"语音邮件"</string>
-    <string name="description_dial_button" msgid="6826108965053146374">"拨号"</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"要呼叫语音信箱，请先关闭飞行模式。"</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"要设置语音信箱，请转到“菜单”&gt;“设置”。"</string>
-    <string name="add_2sec_pause" msgid="395591627218789322">"加入 2 秒暂停时间"</string>
-    <string name="add_wait" msgid="2278146476349811062">"加入等待时间"</string>
-    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"使用按键式键盘"</string>
-    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"返回正在进行的通话"</string>
-    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"添加通话"</string>
-    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
-    <string name="meid" msgid="5274167198744847659">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"正从 SIM 卡中加载…"</string>
-    <string name="simContacts_title" msgid="8972942600800349990">"SIM 卡联系人"</string>
-    <string name="menu_callNumber" msgid="1898333075466418368">"拨打 <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"无法拨打此号码"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_dialpad_back">返回</string>
+  <string name="description_dialpad_overflow">更多选项</string>
+  <string name="description_delete_button">删除</string>
+  <string name="description_image_button_plus">添加加号</string>
+  <string name="description_voicemail_button">呼叫语音信箱</string>
+  <string name="description_dial_button">拨号</string>
+  <string name="dialog_voicemail_airplane_mode_message">要呼叫语音信箱，请先关闭飞行模式。</string>
+  <string name="dialog_voicemail_not_ready_message">要设置语音信箱，请转到“菜单”&gt;“设置”。</string>
+  <string name="add_2sec_pause">加入 2 秒暂停时间</string>
+  <string name="add_wait">加入等待时间</string>
+  <string name="dialer_useDtmfDialpad">使用按键式键盘</string>
+  <string name="dialer_returnToInCallScreen">返回正在进行的通话</string>
+  <string name="dialer_addAnotherCall">添加通话</string>
+  <string name="imei">IMEI</string>
+  <string name="meid">MEID</string>
+  <string name="simContacts_emptyLoading">正从 SIM 卡中加载…</string>
+  <string name="simContacts_title">SIM 卡联系人</string>
+  <string name="menu_callNumber">拨打 %s</string>
+  <string name="dialpad_hint_emergency_calling_not_available">无法通过 WLAN 拨打紧急呼救电话</string>
+  <string msgid="4313552620858880999" name="dialog_phone_call_prohibited_message">无法拨打此号码</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-zh-rHK/strings.xml b/java/com/android/dialer/dialpadview/res/values-zh-rHK/strings.xml
index 320217b..b1638ec 100644
--- a/java/com/android/dialer/dialpadview/res/values-zh-rHK/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-zh-rHK/strings.xml
@@ -1,39 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_dialpad_back" msgid="6226488105558971135">"返回"</string>
-    <string name="description_dialpad_overflow" msgid="5984341386518189787">"更多選項"</string>
-    <string name="description_delete_button" msgid="8431313818404527096">"退格鍵"</string>
-    <string name="description_image_button_plus" msgid="8936338119824589388">"加號"</string>
-    <string name="description_voicemail_button" msgid="4187006295368768215">"留言"</string>
-    <string name="description_dial_button" msgid="6826108965053146374">"撥號"</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"如要致電留言信箱，請先關閉飛行模式。"</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"如要設定留言信箱，請移至 [選單] &gt; [設定]。"</string>
-    <string name="add_2sec_pause" msgid="395591627218789322">"新增 2 秒暫停功能"</string>
-    <string name="add_wait" msgid="2278146476349811062">"新增插播"</string>
-    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"使用觸控音頻鍵盤"</string>
-    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"返回進行中的通話"</string>
-    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"新增通話"</string>
-    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
-    <string name="meid" msgid="5274167198744847659">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"正在從 SIM 卡載入…"</string>
-    <string name="simContacts_title" msgid="8972942600800349990">"SIM 卡聯絡人"</string>
-    <string name="menu_callNumber" msgid="1898333075466418368">"撥打 <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"無法撥打此號碼"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_dialpad_back">返回</string>
+  <string name="description_dialpad_overflow">更多選項</string>
+  <string name="description_delete_button">退格鍵</string>
+  <string name="description_image_button_plus">加號撥號鍵</string>
+  <string name="description_voicemail_button">致電留言信箱</string>
+  <string name="description_dial_button">撥號</string>
+  <string name="dialog_voicemail_airplane_mode_message">如要致電留言信箱，請先關閉飛行模式。</string>
+  <string name="dialog_voicemail_not_ready_message">如要設定留言信箱，請移至 [選單] &gt; [設定]。</string>
+  <string name="add_2sec_pause">新增 2 秒暫停功能</string>
+  <string name="add_wait">新增插播</string>
+  <string name="dialer_useDtmfDialpad">使用觸控音頻鍵盤</string>
+  <string name="dialer_returnToInCallScreen">返回進行中的通話</string>
+  <string name="dialer_addAnotherCall">新增通話</string>
+  <string name="imei">IMEI</string>
+  <string name="meid">MEID</string>
+  <string name="simContacts_emptyLoading">正在從 SIM 卡載入…</string>
+  <string name="simContacts_title">SIM 卡聯絡人</string>
+  <string name="menu_callNumber">撥打 %s</string>
+  <string name="dialpad_hint_emergency_calling_not_available">無法經 Wi‑Fi 撥打緊急電話</string>
+  <string msgid="4313552620858880999" name="dialog_phone_call_prohibited_message">無法撥打此號碼</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-zh-rTW/strings.xml b/java/com/android/dialer/dialpadview/res/values-zh-rTW/strings.xml
index b87048f..406320a 100644
--- a/java/com/android/dialer/dialpadview/res/values-zh-rTW/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-zh-rTW/strings.xml
@@ -1,39 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_dialpad_back" msgid="6226488105558971135">"返回"</string>
-    <string name="description_dialpad_overflow" msgid="5984341386518189787">"更多選項"</string>
-    <string name="description_delete_button" msgid="8431313818404527096">"Backspace 鍵"</string>
-    <string name="description_image_button_plus" msgid="8936338119824589388">"加號"</string>
-    <string name="description_voicemail_button" msgid="4187006295368768215">"語音留言"</string>
-    <string name="description_dial_button" msgid="6826108965053146374">"撥號"</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"如要撥打語音信箱聽取留言，請先關閉飛航模式。"</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"如要設定語音信箱，請依序前往 [選單] &gt; [設定]。"</string>
-    <string name="add_2sec_pause" msgid="395591627218789322">"新增 2 秒暫停功能"</string>
-    <string name="add_wait" msgid="2278146476349811062">"新增插播功能"</string>
-    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"使用觸控音鍵盤"</string>
-    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"返回進行中的通話"</string>
-    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"新增通話"</string>
-    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
-    <string name="meid" msgid="5274167198744847659">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"正在從 SIM 卡載入…"</string>
-    <string name="simContacts_title" msgid="8972942600800349990">"SIM 卡聯絡人"</string>
-    <string name="menu_callNumber" msgid="1898333075466418368">"撥打 <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"無法撥打這個號碼"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_dialpad_back">返回</string>
+  <string name="description_dialpad_overflow">更多選項</string>
+  <string name="description_delete_button">Backspace 鍵</string>
+  <string name="description_image_button_plus">新增加號</string>
+  <string name="description_voicemail_button">撥打語音信箱</string>
+  <string name="description_dial_button">撥號</string>
+  <string name="dialog_voicemail_airplane_mode_message">如要撥打語音信箱聽取留言，請先關閉飛航模式。</string>
+  <string name="dialog_voicemail_not_ready_message">如要設定語音信箱，請依序前往 [選單] &gt; [設定]。</string>
+  <string name="add_2sec_pause">新增 2 秒暫停功能</string>
+  <string name="add_wait">新增插播功能</string>
+  <string name="dialer_useDtmfDialpad">使用觸控音鍵盤</string>
+  <string name="dialer_returnToInCallScreen">返回進行中的通話</string>
+  <string name="dialer_addAnotherCall">新增通話</string>
+  <string name="imei">IMEI</string>
+  <string name="meid">MEID</string>
+  <string name="simContacts_emptyLoading">正在從 SIM 卡載入…</string>
+  <string name="simContacts_title">SIM 卡聯絡人</string>
+  <string name="menu_callNumber">撥打 %s</string>
+  <string name="dialpad_hint_emergency_calling_not_available">無法透過 Wi‑Fi 撥打緊急電話</string>
+  <string msgid="4313552620858880999" name="dialog_phone_call_prohibited_message">無法撥打這個號碼</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values-zu/strings.xml b/java/com/android/dialer/dialpadview/res/values-zu/strings.xml
index 6b1c5f5..97c72fc 100644
--- a/java/com/android/dialer/dialpadview/res/values-zu/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values-zu/strings.xml
@@ -1,39 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="description_dialpad_back" msgid="6226488105558971135">"Zulazula uye emuva"</string>
-    <string name="description_dialpad_overflow" msgid="5984341386518189787">"Izinketho eziningi"</string>
-    <string name="description_delete_button" msgid="8431313818404527096">"i-backspace"</string>
-    <string name="description_image_button_plus" msgid="8936338119824589388">"hlanganisa"</string>
-    <string name="description_voicemail_button" msgid="4187006295368768215">"ivoyisimeyili"</string>
-    <string name="description_dial_button" msgid="6826108965053146374">"dayela"</string>
-    <string name="dialog_voicemail_airplane_mode_message" msgid="1728176091017802282">"Ukushayela i-voicemail, vala kuqala imodi Yendiza."</string>
-    <string name="dialog_voicemail_not_ready_message" msgid="4287602816589585704">"Ukuya emyalezweni wephimbo, yana ezisethweni &gt; zemenyu."</string>
-    <string name="add_2sec_pause" msgid="395591627218789322">"Faka ukumisa okwesikhashana kwamasekhondi angu-2"</string>
-    <string name="add_wait" msgid="2278146476349811062">"Yengeza ukulinda"</string>
-    <string name="dialer_useDtmfDialpad" msgid="6919241568926709507">"Sebenzisa ikhiphedi yethoni yokuthinta"</string>
-    <string name="dialer_returnToInCallScreen" msgid="4111111633248125741">"Buyela kukholi eqhubekayo"</string>
-    <string name="dialer_addAnotherCall" msgid="6842534741272651900">"Engeza ikholi"</string>
-    <string name="imei" msgid="7961343816043247280">"IMEI"</string>
-    <string name="meid" msgid="5274167198744847659">"MEID"</string>
-    <string name="simContacts_emptyLoading" msgid="4158651660353159679">"Ilayisha kusuka ekhadini le-SIM..."</string>
-    <string name="simContacts_title" msgid="8972942600800349990">"Othintana nabo bekhadi le-SIM"</string>
-    <string name="menu_callNumber" msgid="1898333075466418368">"Shayela <xliff:g id="NUMBER">%s</xliff:g>"</string>
-    <string name="dialog_phone_call_prohibited_message" msgid="4806479823793649894">"Ayikwazi ukushayela le nombolo"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="description_dialpad_back">Zulazula uye emuva</string>
+  <string name="description_dialpad_overflow">Izinketho eziningi</string>
+  <string name="description_delete_button">i-backspace</string>
+  <string name="description_image_button_plus">ukudayela kwe-plus</string>
+  <string name="description_voicemail_button">shayela ivoyisimeyili</string>
+  <string name="description_dial_button">dayela</string>
+  <string name="dialog_voicemail_airplane_mode_message">Ukushayela i-voicemail, vala kuqala imodi Yendiza.</string>
+  <string name="dialog_voicemail_not_ready_message">Ukuya emyalezweni wephimbo, yana ezisethweni &gt; zemenyu.</string>
+  <string name="add_2sec_pause">Faka ukumisa okwesikhashana kwamasekhondi angu-2</string>
+  <string name="add_wait">Yengeza ukulinda</string>
+  <string name="dialer_useDtmfDialpad">Sebenzisa ikhiphedi yethoni yokuthinta</string>
+  <string name="dialer_returnToInCallScreen">Buyela kukholi eqhubekayo</string>
+  <string name="dialer_addAnotherCall">Engeza ikholi</string>
+  <string name="imei">IMEI</string>
+  <string name="meid">MEID</string>
+  <string name="simContacts_emptyLoading">Ilayisha kusuka ekhadini le-SIM...</string>
+  <string name="simContacts_title">Othintana nabo bekhadi le-SIM</string>
+  <string name="menu_callNumber">Shayela %s</string>
+  <string name="dialpad_hint_emergency_calling_not_available">Ayikwazi ukwenza amakholi aphuthumayo nge-Wi-Fi</string>
+  <string msgid="4313552620858880999" name="dialog_phone_call_prohibited_message">Ayikwazi ukushayela le nombolo</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values/attrs.xml b/java/com/android/dialer/dialpadview/res/values/attrs.xml
deleted file mode 100644
index 61c9c20..0000000
--- a/java/com/android/dialer/dialpadview/res/values/attrs.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<!--
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<resources>
-
-  <attr format="reference" name="dialpad_style"/>
-  <attr format="dimension" name="dialpad_end_key_spacing"/>
-
-  <declare-styleable name="Dialpad">
-    <attr format="color" name="dialpad_key_button_touch_tint"/>
-    <attr format="dimension" name="dialpad_digits_adjustable_text_size"/>
-    <attr format="dimension" name="dialpad_digits_adjustable_height"/>
-    <attr format="dimension" name="dialpad_key_letters_size_for_dual_alphabets"/>
-    <attr format="dimension" name="dialpad_key_letters_size_for_single_alphabet"/>
-    <attr format="dimension" name="dialpad_key_numbers_size"/>
-    <attr format="dimension" name="dialpad_key_number_margin_bottom"/>
-  </declare-styleable>
-
-  <declare-styleable name="Theme.Dialpad">
-    <attr format="color" name="dialpad_text_color"/>
-    <attr format="color" name="dialpad_text_color_primary"/>
-    <attr format="color" name="dialpad_text_color_secondary"/>
-    <attr format="color" name="dialpad_icon_tint"/>
-    <attr format="color" name="dialpad_voicemail_tint"/>
-    <attr format="color" name="dialpad_background"/>
-    <attr format="dimension" name="dialpad_elevation"/>
-  </declare-styleable>
-</resources>
diff --git a/java/com/android/dialer/dialpadview/res/values/colors.xml b/java/com/android/dialer/dialpadview/res/values/colors.xml
deleted file mode 100644
index 8bea357..0000000
--- a/java/com/android/dialer/dialpadview/res/values/colors.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<!--
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-  -->
-
-<resources>
-  <!-- Colors for the dialpad -->
-  <color name="background_dialpad">#fcfcfc</color>
-  <color name="dialpad_primary_text_color">@color/dialer_theme_color</color>
-  <color name="dialpad_secondary_text_color">#737373</color>
-  <color name="dialpad_digits_text_color">#333</color>
-  <color name="dialpad_icon_tint">#89000000</color>
-  <color name="dialpad_voicemail_tint">#919191</color>
-</resources>
diff --git a/java/com/android/dialer/dialpadview/res/values/dimens.xml b/java/com/android/dialer/dialpadview/res/values/dimens.xml
index 6892fcf..f77c9ab 100644
--- a/java/com/android/dialer/dialpadview/res/values/dimens.xml
+++ b/java/com/android/dialer/dialpadview/res/values/dimens.xml
@@ -16,17 +16,11 @@
 
 <resources>
   <!-- Text dimensions for dialpad keys -->
-  <dimen name="dialpad_key_numbers_default_size">36dp</dimen>
-  <dimen name="dialpad_key_letters_default_size_for_single_alphabet">12sp</dimen>
-  <dimen name="dialpad_key_letters_default_size_for_dual_alphabets">10sp</dimen>
   <dimen name="dialpad_key_pound_size">23sp</dimen>
   <dimen name="dialpad_key_star_size">36sp</dimen>
   <dimen name="dialpad_key_height">64dp</dimen>
-  <dimen name="dialpad_key_number_default_margin_bottom">3dp</dimen>
   <dimen name="dialpad_symbol_margin_bottom">13dp</dimen>
-  <dimen name="dialpad_digits_text_size">34sp</dimen>
   <dimen name="dialpad_digits_text_min_size">24sp</dimen>
-  <dimen name="dialpad_digits_height">60dp</dimen>
   <dimen name="dialpad_digits_padding">16dp</dimen>
   <dimen name="dialpad_digits_menu_left_padding">8dp</dimen>
   <dimen name="dialpad_digits_menu_right_padding">10dp</dimen>
@@ -35,8 +29,6 @@
   <dimen name="dialpad_overflow_margin">8dp</dimen>
   <dimen name="dialpad_space_above_keys">14dp</dimen>
   <dimen name="dialpad_space_below_keys">8dp</dimen>
-  <!-- The bottom space of the dialpad to account for the dial button -->
-  <dimen name="dialpad_bottom_space_height">80dp</dimen>
 
   <!-- Top/Bottom padding around the ILD rate display box. -->
   <dimen name="ild_margin_height">10dp</dimen>
diff --git a/java/com/android/dialer/dialpadview/res/values/strings.xml b/java/com/android/dialer/dialpadview/res/values/strings.xml
index 51367b6..afa0237 100644
--- a/java/com/android/dialer/dialpadview/res/values/strings.xml
+++ b/java/com/android/dialer/dialpadview/res/values/strings.xml
@@ -30,12 +30,12 @@
   <string name="description_delete_button">backspace</string>
 
   <!--  String describing the button used to add a plus (+) symbol to the dialpad -->
-  <string name="description_image_button_plus">plus</string>
+  <string name="description_image_button_plus">dial plus</string>
 
   <!-- String describing the Voicemail ImageButton.
        Used by AccessibilityService to announce the purpose of the button.
   -->
-  <string name="description_voicemail_button">voicemail</string>
+  <string name="description_voicemail_button">call voicemail</string>
 
   <!-- String describing the Dial ImageButton
 
@@ -97,7 +97,11 @@
        Ignored if empty. -->
   <string name="config_prohibited_phone_number_regexp" translatable="false"></string>
 
+  <!-- Warning hint shown in the dialpad input field when emergency call (911, etc.) cannot be made over wifi.
+       [CHAR_LIMIT=60] -->
+  <string name="dialpad_hint_emergency_calling_not_available">Can\'t make emergency calls over WiFi</string>
+
   <!-- Dialog message which is shown when the user tries to make a phone call
        to prohibited phone numbers [CHAR LIMIT=NONE] -->
-  <string msgid="4313552620858880999" name="dialog_phone_call_prohibited_message">Can\'t call this number</string>
+  <string name="dialog_phone_call_prohibited_message" msgid="4313552620858880999">Can\'t call this number</string>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/res/values/styles.xml b/java/com/android/dialer/dialpadview/res/values/styles.xml
index 75a54a3..071c4bd 100644
--- a/java/com/android/dialer/dialpadview/res/values/styles.xml
+++ b/java/com/android/dialer/dialpadview/res/values/styles.xml
@@ -82,43 +82,8 @@
     <item name="android:orientation">vertical</item>
   </style>
 
-  <style name="Dialpad">
-    <item name="dialpad_digits_adjustable_height">@dimen/dialpad_digits_height</item>
-    <item name="dialpad_digits_adjustable_text_size">@dimen/dialpad_digits_text_size</item>
-    <item name="dialpad_key_letters_size_for_dual_alphabets">
-      @dimen/dialpad_key_letters_default_size_for_dual_alphabets
-    </item>
-    <item name="dialpad_key_letters_size_for_single_alphabet">
-      @dimen/dialpad_key_letters_default_size_for_single_alphabet
-    </item>
-    <item name="dialpad_key_numbers_size">@dimen/dialpad_key_numbers_default_size</item>
-    <item name="dialpad_key_number_margin_bottom">
-      @dimen/dialpad_key_number_default_margin_bottom
-    </item>
-    <item name="dialpad_end_key_spacing">@dimen/dialpad_bottom_space_height</item>
-    <item name="dialpad_elevation">0dp</item>
-  </style>
-
-  <style name="Dialpad.Light">
-    <item name="dialpad_text_color">@color/dialpad_digits_text_color</item>
-    <item name="dialpad_text_color_primary">@color/dialpad_primary_text_color</item>
-    <item name="dialpad_text_color_secondary">@color/dialpad_secondary_text_color</item>
-    <item name="dialpad_icon_tint">@color/dialpad_icon_tint</item>
-    <item name="dialpad_voicemail_tint">@color/dialpad_voicemail_tint</item>
-    <item name="dialpad_background">@color/background_dialpad</item>
-  </style>
-
-  <style name="Dialpad.Dark">
-    <item name="dialpad_text_color">@android:color/white</item>
-    <item name="dialpad_text_color_primary">@android:color/white</item>
-    <item name="dialpad_text_color_secondary">#ffd4d6d7</item>
-    <item name="dialpad_icon_tint">@android:color/white</item>
-    <item name="dialpad_voicemail_tint">?attr/dialpad_text_color_secondary</item>
-    <item name="dialpad_background">#00000000</item>
-  </style>
-
   <style name="DeviceIdBody">
-    <item name="android:textColor">?android:textColorPrimary</item>
+    <item name="android:textColor">?android:attr/textColorPrimary</item>
     <item name="android:textSize">16sp</item>
   </style>
 </resources>
diff --git a/java/com/android/dialer/dialpadview/theme/AndroidManifest.xml b/java/com/android/dialer/dialpadview/theme/AndroidManifest.xml
new file mode 100644
index 0000000..f0726d0
--- /dev/null
+++ b/java/com/android/dialer/dialpadview/theme/AndroidManifest.xml
@@ -0,0 +1,16 @@
+<!--
+  ~ Copyright (C) 2018 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+<manifest package="com.android.dialer.dialpadview.theme"/>
diff --git a/java/com/android/dialer/dialpadview/theme/res/values/attr.xml b/java/com/android/dialer/dialpadview/theme/res/values/attr.xml
new file mode 100644
index 0000000..9cd225a
--- /dev/null
+++ b/java/com/android/dialer/dialpadview/theme/res/values/attr.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2018 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+<resources>
+  <attr format="reference" name="dialpad_style"/>
+  <attr format="dimension" name="dialpad_end_key_spacing"/>
+
+  <declare-styleable name="Dialpad">
+    <attr format="color" name="dialpad_key_button_touch_tint"/>
+    <attr format="dimension" name="dialpad_digits_adjustable_text_size"/>
+    <attr format="dimension" name="dialpad_digits_adjustable_height"/>
+    <attr format="dimension" name="dialpad_key_letters_size_for_dual_alphabets"/>
+    <attr format="dimension" name="dialpad_key_letters_size_for_single_alphabet"/>
+    <attr format="dimension" name="dialpad_key_numbers_size"/>
+    <attr format="dimension" name="dialpad_key_number_margin_bottom"/>
+  </declare-styleable>
+
+  <declare-styleable name="Theme.Dialpad">
+    <attr format="color" name="dialpad_text_color"/>
+    <attr format="color" name="dialpad_text_color_primary"/>
+    <attr format="color" name="dialpad_text_color_secondary"/>
+    <attr format="color" name="dialpad_background"/>
+    <attr format="dimension" name="dialpad_elevation"/>
+  </declare-styleable>
+</resources>
diff --git a/java/com/android/dialer/dialpadview/theme/res/values/dimens.xml b/java/com/android/dialer/dialpadview/theme/res/values/dimens.xml
new file mode 100644
index 0000000..e90ee1c
--- /dev/null
+++ b/java/com/android/dialer/dialpadview/theme/res/values/dimens.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2018 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+<resources>
+  <!-- Text dimensions for dialpad keys -->
+  <dimen name="dialpad_key_numbers_default_size">36dp</dimen>
+  <dimen name="dialpad_key_letters_default_size_for_single_alphabet">12sp</dimen>
+  <dimen name="dialpad_key_letters_default_size_for_dual_alphabets">10sp</dimen>
+  <dimen name="dialpad_key_number_default_margin_bottom">3dp</dimen>
+  <dimen name="dialpad_digits_text_size">34sp</dimen>
+  <dimen name="dialpad_digits_height">60dp</dimen>
+  <!-- The bottom space of the dialpad to account for the dial button -->
+  <dimen name="dialpad_bottom_space_height">80dp</dimen>
+</resources>
\ No newline at end of file
diff --git a/java/com/android/dialer/dialpadview/theme/res/values/styles.xml b/java/com/android/dialer/dialpadview/theme/res/values/styles.xml
new file mode 100644
index 0000000..8705a17
--- /dev/null
+++ b/java/com/android/dialer/dialpadview/theme/res/values/styles.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2018 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+<resources>
+  <style name="Dialpad">
+    <item name="dialpad_digits_adjustable_height">@dimen/dialpad_digits_height</item>
+    <item name="dialpad_digits_adjustable_text_size">@dimen/dialpad_digits_text_size</item>
+    <item name="dialpad_key_letters_size_for_dual_alphabets">
+      @dimen/dialpad_key_letters_default_size_for_dual_alphabets
+    </item>
+    <item name="dialpad_key_letters_size_for_single_alphabet">
+      @dimen/dialpad_key_letters_default_size_for_single_alphabet
+    </item>
+    <item name="dialpad_key_numbers_size">@dimen/dialpad_key_numbers_default_size</item>
+    <item name="dialpad_key_number_margin_bottom">
+      @dimen/dialpad_key_number_default_margin_bottom
+    </item>
+    <item name="dialpad_end_key_spacing">@dimen/dialpad_bottom_space_height</item>
+    <item name="dialpad_elevation">0dp</item>
+  </style>
+
+  <style name="Dialpad.Themed">
+    <item name="dialpad_text_color">?android:attr/textColorSecondary</item>
+    <item name="dialpad_text_color_primary">?android:attr/colorPrimary</item>
+    <item name="dialpad_text_color_secondary">?android:attr/textColorSecondary</item>
+    <item name="dialpad_background">?android:attr/colorBackgroundFloating</item>
+  </style>
+</resources>
\ No newline at end of file
diff --git a/java/com/android/dialer/duo/Duo.java b/java/com/android/dialer/duo/Duo.java
index d471a7a..85fe9fb 100644
--- a/java/com/android/dialer/duo/Duo.java
+++ b/java/com/android/dialer/duo/Duo.java
@@ -18,6 +18,7 @@
 
 import android.content.Context;
 import android.content.Intent;
+import android.support.annotation.DrawableRes;
 import android.support.annotation.MainThread;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
@@ -26,9 +27,12 @@
 import android.telecom.PhoneAccountHandle;
 import com.google.auto.value.AutoValue;
 import com.google.common.base.Optional;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.util.concurrent.ListenableFuture;
 import java.util.List;
 
 /** Interface for Duo video call integration. */
+@SuppressWarnings("Guava")
 public interface Duo {
 
   /** @return true if the Duo integration is enabled on this device. */
@@ -59,7 +63,8 @@
 
   /** Starts a task to update the reachability of the parameter numbers asynchronously. */
   @MainThread
-  void updateReachability(@NonNull Context context, @NonNull List<String> numbers);
+  ListenableFuture<ImmutableMap<String, ReachabilityData>> updateReachability(
+      @NonNull Context context, @NonNull List<String> numbers);
 
   /**
    * Clears the current reachability data and starts a task to load the latest reachability data
@@ -69,11 +74,31 @@
   void reloadReachability(@NonNull Context context);
 
   /**
+   * Get the {@link PhoneAccountHandle} used by duo calls in the connection service and call log.
+   */
+  Optional<PhoneAccountHandle> getPhoneAccountHandle();
+
+  boolean isDuoAccount(PhoneAccountHandle phoneAccountHandle);
+
+  boolean isDuoAccount(String componentName);
+
+  /**
    * @return an Intent to start a Duo video call with the parameter number. Must be started using
    *     startActivityForResult.
    */
   @MainThread
-  Intent getIntent(@NonNull Context context, @NonNull String number);
+  Optional<Intent> getCallIntent(@NonNull String number);
+
+  /** @return an Intent to setup duo. Must be started using startActivityForResult. */
+  Optional<Intent> getActivateIntent();
+
+  /**
+   * @return an Intent to invite the parameter number to use duo. Must be started using
+   *     startActivityForResult.
+   */
+  Optional<Intent> getInviteIntent(String number);
+
+  Optional<Intent> getInstallDuoIntent();
 
   /** Requests upgrading the parameter ongoing call to a Duo video call. */
   @MainThread
@@ -97,18 +122,57 @@
   @MainThread
   int getIncomingCallTypeText();
 
+  /** The ID of the drawable resource of a Duo logo. */
+  @DrawableRes
+  @MainThread
+  int getLogo();
+
   /** Reachability information for a number. */
   @AutoValue
   abstract class ReachabilityData {
+    public enum Status {
+      UNKNOWN,
+
+      /**
+       * The number is callable. Apps should further look up “AUDIO_CALLABLE” and “VIDEO_CALLABLE”
+       * keys for supported modes.
+       */
+      CALL,
+
+      /** The number is not callable. Apps can send an invite to the contact via INVITE intent. */
+      INVITE,
+
+      /**
+       * Neither Tachystick nor Duo is registered. Apps should show “setup” icon and send REGISTER
+       * intent to.
+       */
+      SETUP,
+
+      /**
+       * Indicates that the number is callable but user needs to set up (Tachystick/Duo) before
+       * calling.
+       */
+      SETUP_AND_CALL
+    }
+
+    public abstract Status status();
+
     public abstract String number();
 
+    public abstract boolean audioCallable();
+
     public abstract boolean videoCallable();
 
     public abstract boolean supportsUpgrade();
 
     public static ReachabilityData create(
-        String number, boolean videoCallable, boolean supportsUpgrade) {
-      return new AutoValue_Duo_ReachabilityData(number, videoCallable, supportsUpgrade);
+        Status status,
+        String number,
+        boolean audioCallable,
+        boolean videoCallable,
+        boolean supportsUpgrade) {
+      return new AutoValue_Duo_ReachabilityData(
+          status, number, audioCallable, videoCallable, supportsUpgrade);
     }
   }
 }
diff --git a/java/com/android/dialer/duo/DuoComponent.java b/java/com/android/dialer/duo/DuoComponent.java
index 031ee9e..307832a 100644
--- a/java/com/android/dialer/duo/DuoComponent.java
+++ b/java/com/android/dialer/duo/DuoComponent.java
@@ -19,6 +19,7 @@
 import android.content.Context;
 import android.support.annotation.NonNull;
 import com.android.dialer.inject.HasRootComponent;
+import com.android.dialer.inject.IncludeInDialerRoot;
 import dagger.Subcomponent;
 
 /**
@@ -35,6 +36,7 @@
   }
 
   /** Used to refer to the root application component. */
+  @IncludeInDialerRoot
   public interface HasComponent {
     DuoComponent duoComponent();
   }
diff --git a/java/com/android/dialer/duo/DuoConstants.java b/java/com/android/dialer/duo/DuoConstants.java
deleted file mode 100644
index 6eb660d..0000000
--- a/java/com/android/dialer/duo/DuoConstants.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.dialer.duo;
-
-import android.content.ComponentName;
-import android.telecom.PhoneAccountHandle;
-
-/** Constants to reference the Duo application. */
-public final class DuoConstants {
-  public static final String PACKAGE_NAME = "com.google.android.apps.tachyon";
-
-  public static final String CONNECTION_SERVICE =
-      "com.google.android.apps.tachyon.telecom.TachyonTelecomConnectionService";
-
-  public static final String PHONE_ACCOUNT_ID = "0";
-
-  public static final ComponentName PHONE_ACCOUNT_COMPONENT_NAME =
-      new ComponentName(PACKAGE_NAME, CONNECTION_SERVICE);
-
-  public static final PhoneAccountHandle PHONE_ACCOUNT_HANDLE =
-      new PhoneAccountHandle(PHONE_ACCOUNT_COMPONENT_NAME, PHONE_ACCOUNT_ID);
-
-  public static final String DUO_ACTIVATE_ACTION =
-      "com.google.android.apps.tachyon.action.REGISTER";
-
-  public static final String DUO_INVITE_ACTION = "com.google.android.apps.tachyon.action.INVITE";
-
-  public static final String DUO_CALL_ACTION = "com.google.android.apps.tachyon.action.CALL";
-
-  private DuoConstants() {}
-}
diff --git a/java/com/android/dialer/duo/stub/DuoStub.java b/java/com/android/dialer/duo/stub/DuoStub.java
index 9e896cf..2131d16 100644
--- a/java/com/android/dialer/duo/stub/DuoStub.java
+++ b/java/com/android/dialer/duo/stub/DuoStub.java
@@ -18,6 +18,7 @@
 
 import android.content.Context;
 import android.content.Intent;
+import android.support.annotation.DrawableRes;
 import android.support.annotation.MainThread;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
@@ -28,6 +29,9 @@
 import com.android.dialer.duo.Duo;
 import com.android.dialer.duo.DuoListener;
 import com.google.common.base.Optional;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.ListenableFuture;
 import java.util.List;
 import javax.inject.Inject;
 
@@ -71,21 +75,52 @@
   }
 
   @Override
-  public void updateReachability(@NonNull Context context, @NonNull List<String> numbers) {
+  public ListenableFuture<ImmutableMap<String, ReachabilityData>> updateReachability(
+      @NonNull Context context, @NonNull List<String> numbers) {
     Assert.isMainThread();
     Assert.isNotNull(context);
     Assert.isNotNull(numbers);
+    return Futures.immediateFuture(ImmutableMap.of());
   }
 
   @Override
   public void reloadReachability(@NonNull Context context) {}
 
+  @Override
+  public Optional<PhoneAccountHandle> getPhoneAccountHandle() {
+    return Optional.absent();
+  }
+
+  @Override
+  public boolean isDuoAccount(PhoneAccountHandle phoneAccountHandle) {
+    return false;
+  }
+
+  @Override
+  public boolean isDuoAccount(String componentName) {
+    return false;
+  }
+
   @MainThread
   @Override
-  public Intent getIntent(@NonNull Context context, @NonNull String number) {
+  public Optional<Intent> getCallIntent(@NonNull String number) {
     Assert.isMainThread();
-    Assert.isNotNull(context);
     Assert.isNotNull(number);
+    return Optional.absent();
+  }
+
+  @Override
+  public Optional<Intent> getActivateIntent() {
+    return Optional.absent();
+  }
+
+  @Override
+  public Optional<Intent> getInviteIntent(String number) {
+    return Optional.absent();
+  }
+
+  @Override
+  public Optional<Intent> getInstallDuoIntent() {
     return null;
   }
 
@@ -121,4 +156,10 @@
   public int getIncomingCallTypeText() {
     return -1;
   }
+
+  @DrawableRes
+  @Override
+  public int getLogo() {
+    return -1;
+  }
 }
diff --git a/java/com/android/dialer/duo/stub/StubDuoModule.java b/java/com/android/dialer/duo/stub/StubDuoModule.java
index 604406a..57c3570 100644
--- a/java/com/android/dialer/duo/stub/StubDuoModule.java
+++ b/java/com/android/dialer/duo/stub/StubDuoModule.java
@@ -17,11 +17,14 @@
 package com.android.dialer.duo.stub;
 
 import com.android.dialer.duo.Duo;
+import com.android.dialer.inject.DialerVariant;
+import com.android.dialer.inject.InstallIn;
 import dagger.Binds;
 import dagger.Module;
 import javax.inject.Singleton;
 
 @Module
+@InstallIn(variants = DialerVariant.DIALER_TEST)
 public abstract class StubDuoModule {
 
   @Binds
diff --git a/java/com/android/dialer/enrichedcall/EnrichedCallComponent.java b/java/com/android/dialer/enrichedcall/EnrichedCallComponent.java
index 2ed2e94..46afd84 100644
--- a/java/com/android/dialer/enrichedcall/EnrichedCallComponent.java
+++ b/java/com/android/dialer/enrichedcall/EnrichedCallComponent.java
@@ -19,6 +19,7 @@
 import android.content.Context;
 import android.support.annotation.NonNull;
 import com.android.dialer.inject.HasRootComponent;
+import com.android.dialer.inject.IncludeInDialerRoot;
 import dagger.Subcomponent;
 
 /** Subcomponent that can be used to access the enriched call implementation. */
@@ -37,6 +38,7 @@
   }
 
   /** Used to refer to the root application component. */
+  @IncludeInDialerRoot
   public interface HasComponent {
     EnrichedCallComponent enrichedCallComponent();
   }
diff --git a/java/com/android/dialer/enrichedcall/simulator/AndroidManifest.xml b/java/com/android/dialer/enrichedcall/simulator/AndroidManifest.xml
index 003ff19..35dc531 100644
--- a/java/com/android/dialer/enrichedcall/simulator/AndroidManifest.xml
+++ b/java/com/android/dialer/enrichedcall/simulator/AndroidManifest.xml
@@ -16,11 +16,10 @@
 <manifest
     xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.android.dialer.calldetails">
-  <application android:theme="@style/Theme.AppCompat">
-    <activity
+  <application>
+  <activity
         android:label="@string/enriched_call_simulator_activity"
-        android:name="com.android.dialer.enrichedcall.simulator.EnrichedCallSimulatorActivity"
-        android:theme="@style/DialerThemeBase.NoActionBar">
+        android:name="com.android.dialer.enrichedcall.simulator.EnrichedCallSimulatorActivity">
     </activity>
   </application>
 </manifest>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-af/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-af/strings.xml
index b0c27bc..045e125 100644
--- a/java/com/android/dialer/enrichedcall/simulator/res/values-af/strings.xml
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-af/strings.xml
@@ -1,20 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-am/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-am/strings.xml
index b0c27bc..045e125 100644
--- a/java/com/android/dialer/enrichedcall/simulator/res/values-am/strings.xml
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-am/strings.xml
@@ -1,20 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-ar/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-ar/strings.xml
index b0c27bc..045e125 100644
--- a/java/com/android/dialer/enrichedcall/simulator/res/values-ar/strings.xml
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-ar/strings.xml
@@ -1,20 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-az/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-az/strings.xml
index b0c27bc..045e125 100644
--- a/java/com/android/dialer/enrichedcall/simulator/res/values-az/strings.xml
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-az/strings.xml
@@ -1,20 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-b+sr+Latn/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-b+sr+Latn/strings.xml
index b0c27bc..045e125 100644
--- a/java/com/android/dialer/enrichedcall/simulator/res/values-b+sr+Latn/strings.xml
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-b+sr+Latn/strings.xml
@@ -1,20 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-be/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-be/strings.xml
index b0c27bc..045e125 100644
--- a/java/com/android/dialer/enrichedcall/simulator/res/values-be/strings.xml
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-be/strings.xml
@@ -1,20 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-bg/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-bg/strings.xml
index b0c27bc..045e125 100644
--- a/java/com/android/dialer/enrichedcall/simulator/res/values-bg/strings.xml
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-bg/strings.xml
@@ -1,20 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-bn/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-bn/strings.xml
index b0c27bc..045e125 100644
--- a/java/com/android/dialer/enrichedcall/simulator/res/values-bn/strings.xml
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-bn/strings.xml
@@ -1,20 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-bs/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-bs/strings.xml
index b0c27bc..045e125 100644
--- a/java/com/android/dialer/enrichedcall/simulator/res/values-bs/strings.xml
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-bs/strings.xml
@@ -1,20 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-ca/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-ca/strings.xml
index b0c27bc..045e125 100644
--- a/java/com/android/dialer/enrichedcall/simulator/res/values-ca/strings.xml
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-ca/strings.xml
@@ -1,20 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-cs/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-cs/strings.xml
index b0c27bc..045e125 100644
--- a/java/com/android/dialer/enrichedcall/simulator/res/values-cs/strings.xml
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-cs/strings.xml
@@ -1,20 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-da/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-da/strings.xml
index b0c27bc..045e125 100644
--- a/java/com/android/dialer/enrichedcall/simulator/res/values-da/strings.xml
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-da/strings.xml
@@ -1,20 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-de/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-de/strings.xml
index b0c27bc..045e125 100644
--- a/java/com/android/dialer/enrichedcall/simulator/res/values-de/strings.xml
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-de/strings.xml
@@ -1,20 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-el/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-el/strings.xml
index b0c27bc..045e125 100644
--- a/java/com/android/dialer/enrichedcall/simulator/res/values-el/strings.xml
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-el/strings.xml
@@ -1,20 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-en-rAU/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-en-rAU/strings.xml
index b0c27bc..045e125 100644
--- a/java/com/android/dialer/enrichedcall/simulator/res/values-en-rAU/strings.xml
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-en-rAU/strings.xml
@@ -1,20 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-en-rGB/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-en-rGB/strings.xml
index b0c27bc..045e125 100644
--- a/java/com/android/dialer/enrichedcall/simulator/res/values-en-rGB/strings.xml
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-en-rGB/strings.xml
@@ -1,20 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-en-rIN/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-en-rIN/strings.xml
index b0c27bc..045e125 100644
--- a/java/com/android/dialer/enrichedcall/simulator/res/values-en-rIN/strings.xml
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-en-rIN/strings.xml
@@ -1,20 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-es-rUS/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-es-rUS/strings.xml
index b0c27bc..045e125 100644
--- a/java/com/android/dialer/enrichedcall/simulator/res/values-es-rUS/strings.xml
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-es-rUS/strings.xml
@@ -1,20 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-es/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-es/strings.xml
index b0c27bc..045e125 100644
--- a/java/com/android/dialer/enrichedcall/simulator/res/values-es/strings.xml
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-es/strings.xml
@@ -1,20 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-et/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-et/strings.xml
index b0c27bc..045e125 100644
--- a/java/com/android/dialer/enrichedcall/simulator/res/values-et/strings.xml
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-et/strings.xml
@@ -1,20 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-eu/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-eu/strings.xml
index b0c27bc..045e125 100644
--- a/java/com/android/dialer/enrichedcall/simulator/res/values-eu/strings.xml
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-eu/strings.xml
@@ -1,20 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-fa/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-fa/strings.xml
index b0c27bc..045e125 100644
--- a/java/com/android/dialer/enrichedcall/simulator/res/values-fa/strings.xml
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-fa/strings.xml
@@ -1,20 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-fi/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-fi/strings.xml
index b0c27bc..045e125 100644
--- a/java/com/android/dialer/enrichedcall/simulator/res/values-fi/strings.xml
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-fi/strings.xml
@@ -1,20 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-fr-rCA/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-fr-rCA/strings.xml
index b0c27bc..045e125 100644
--- a/java/com/android/dialer/enrichedcall/simulator/res/values-fr-rCA/strings.xml
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-fr-rCA/strings.xml
@@ -1,20 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-fr/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-fr/strings.xml
index b0c27bc..045e125 100644
--- a/java/com/android/dialer/enrichedcall/simulator/res/values-fr/strings.xml
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-fr/strings.xml
@@ -1,20 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-gl/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-gl/strings.xml
index b0c27bc..045e125 100644
--- a/java/com/android/dialer/enrichedcall/simulator/res/values-gl/strings.xml
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-gl/strings.xml
@@ -1,20 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-gu/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-gu/strings.xml
index b0c27bc..045e125 100644
--- a/java/com/android/dialer/enrichedcall/simulator/res/values-gu/strings.xml
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-gu/strings.xml
@@ -1,20 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-hi/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-hi/strings.xml
index b0c27bc..045e125 100644
--- a/java/com/android/dialer/enrichedcall/simulator/res/values-hi/strings.xml
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-hi/strings.xml
@@ -1,20 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-hr/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-hr/strings.xml
index b0c27bc..045e125 100644
--- a/java/com/android/dialer/enrichedcall/simulator/res/values-hr/strings.xml
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-hr/strings.xml
@@ -1,20 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-hu/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-hu/strings.xml
index b0c27bc..045e125 100644
--- a/java/com/android/dialer/enrichedcall/simulator/res/values-hu/strings.xml
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-hu/strings.xml
@@ -1,20 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-hy/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-hy/strings.xml
index b0c27bc..045e125 100644
--- a/java/com/android/dialer/enrichedcall/simulator/res/values-hy/strings.xml
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-hy/strings.xml
@@ -1,20 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-in/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-in/strings.xml
index b0c27bc..045e125 100644
--- a/java/com/android/dialer/enrichedcall/simulator/res/values-in/strings.xml
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-in/strings.xml
@@ -1,20 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-is/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-is/strings.xml
index b0c27bc..045e125 100644
--- a/java/com/android/dialer/enrichedcall/simulator/res/values-is/strings.xml
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-is/strings.xml
@@ -1,20 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-it/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-it/strings.xml
index b0c27bc..045e125 100644
--- a/java/com/android/dialer/enrichedcall/simulator/res/values-it/strings.xml
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-it/strings.xml
@@ -1,20 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-iw/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-iw/strings.xml
index b0c27bc..045e125 100644
--- a/java/com/android/dialer/enrichedcall/simulator/res/values-iw/strings.xml
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-iw/strings.xml
@@ -1,20 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-ja/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-ja/strings.xml
index b0c27bc..045e125 100644
--- a/java/com/android/dialer/enrichedcall/simulator/res/values-ja/strings.xml
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-ja/strings.xml
@@ -1,20 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-ka/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-ka/strings.xml
index b0c27bc..045e125 100644
--- a/java/com/android/dialer/enrichedcall/simulator/res/values-ka/strings.xml
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-ka/strings.xml
@@ -1,20 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-kk/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-kk/strings.xml
index b0c27bc..045e125 100644
--- a/java/com/android/dialer/enrichedcall/simulator/res/values-kk/strings.xml
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-kk/strings.xml
@@ -1,20 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-km/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-km/strings.xml
index b0c27bc..045e125 100644
--- a/java/com/android/dialer/enrichedcall/simulator/res/values-km/strings.xml
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-km/strings.xml
@@ -1,20 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-kn/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-kn/strings.xml
index b0c27bc..045e125 100644
--- a/java/com/android/dialer/enrichedcall/simulator/res/values-kn/strings.xml
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-kn/strings.xml
@@ -1,20 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-ko/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-ko/strings.xml
index b0c27bc..045e125 100644
--- a/java/com/android/dialer/enrichedcall/simulator/res/values-ko/strings.xml
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-ko/strings.xml
@@ -1,20 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-ky/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-ky/strings.xml
index b0c27bc..045e125 100644
--- a/java/com/android/dialer/enrichedcall/simulator/res/values-ky/strings.xml
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-ky/strings.xml
@@ -1,20 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-lo/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-lo/strings.xml
index b0c27bc..045e125 100644
--- a/java/com/android/dialer/enrichedcall/simulator/res/values-lo/strings.xml
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-lo/strings.xml
@@ -1,20 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-lt/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-lt/strings.xml
index b0c27bc..045e125 100644
--- a/java/com/android/dialer/enrichedcall/simulator/res/values-lt/strings.xml
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-lt/strings.xml
@@ -1,20 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-lv/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-lv/strings.xml
index b0c27bc..045e125 100644
--- a/java/com/android/dialer/enrichedcall/simulator/res/values-lv/strings.xml
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-lv/strings.xml
@@ -1,20 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-mk/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-mk/strings.xml
index b0c27bc..045e125 100644
--- a/java/com/android/dialer/enrichedcall/simulator/res/values-mk/strings.xml
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-mk/strings.xml
@@ -1,20 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-ml/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-ml/strings.xml
index b0c27bc..045e125 100644
--- a/java/com/android/dialer/enrichedcall/simulator/res/values-ml/strings.xml
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-ml/strings.xml
@@ -1,20 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-mn/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-mn/strings.xml
index b0c27bc..045e125 100644
--- a/java/com/android/dialer/enrichedcall/simulator/res/values-mn/strings.xml
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-mn/strings.xml
@@ -1,20 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-mr/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-mr/strings.xml
index b0c27bc..045e125 100644
--- a/java/com/android/dialer/enrichedcall/simulator/res/values-mr/strings.xml
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-mr/strings.xml
@@ -1,20 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-ms/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-ms/strings.xml
index b0c27bc..045e125 100644
--- a/java/com/android/dialer/enrichedcall/simulator/res/values-ms/strings.xml
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-ms/strings.xml
@@ -1,20 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-my/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-my/strings.xml
index b0c27bc..045e125 100644
--- a/java/com/android/dialer/enrichedcall/simulator/res/values-my/strings.xml
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-my/strings.xml
@@ -1,20 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-nb/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-nb/strings.xml
index b0c27bc..045e125 100644
--- a/java/com/android/dialer/enrichedcall/simulator/res/values-nb/strings.xml
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-nb/strings.xml
@@ -1,20 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-ne/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-ne/strings.xml
index b0c27bc..045e125 100644
--- a/java/com/android/dialer/enrichedcall/simulator/res/values-ne/strings.xml
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-ne/strings.xml
@@ -1,20 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-nl/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-nl/strings.xml
index b0c27bc..045e125 100644
--- a/java/com/android/dialer/enrichedcall/simulator/res/values-nl/strings.xml
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-nl/strings.xml
@@ -1,20 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-no/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-no/strings.xml
index b0c27bc..045e125 100644
--- a/java/com/android/dialer/enrichedcall/simulator/res/values-no/strings.xml
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-no/strings.xml
@@ -1,20 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-pa/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-pa/strings.xml
index b0c27bc..045e125 100644
--- a/java/com/android/dialer/enrichedcall/simulator/res/values-pa/strings.xml
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-pa/strings.xml
@@ -1,20 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-pl/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-pl/strings.xml
index b0c27bc..045e125 100644
--- a/java/com/android/dialer/enrichedcall/simulator/res/values-pl/strings.xml
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-pl/strings.xml
@@ -1,20 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-pt-rBR/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-pt-rBR/strings.xml
index b0c27bc..045e125 100644
--- a/java/com/android/dialer/enrichedcall/simulator/res/values-pt-rBR/strings.xml
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-pt-rBR/strings.xml
@@ -1,20 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-pt-rPT/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-pt-rPT/strings.xml
index b0c27bc..045e125 100644
--- a/java/com/android/dialer/enrichedcall/simulator/res/values-pt-rPT/strings.xml
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-pt-rPT/strings.xml
@@ -1,20 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-pt/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-pt/strings.xml
index b0c27bc..045e125 100644
--- a/java/com/android/dialer/enrichedcall/simulator/res/values-pt/strings.xml
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-pt/strings.xml
@@ -1,20 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-ro/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-ro/strings.xml
index b0c27bc..045e125 100644
--- a/java/com/android/dialer/enrichedcall/simulator/res/values-ro/strings.xml
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-ro/strings.xml
@@ -1,20 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-ru/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-ru/strings.xml
index b0c27bc..045e125 100644
--- a/java/com/android/dialer/enrichedcall/simulator/res/values-ru/strings.xml
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-ru/strings.xml
@@ -1,20 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-si/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-si/strings.xml
index b0c27bc..045e125 100644
--- a/java/com/android/dialer/enrichedcall/simulator/res/values-si/strings.xml
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-si/strings.xml
@@ -1,20 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-sk/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-sk/strings.xml
index b0c27bc..045e125 100644
--- a/java/com/android/dialer/enrichedcall/simulator/res/values-sk/strings.xml
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-sk/strings.xml
@@ -1,20 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-sl/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-sl/strings.xml
index b0c27bc..045e125 100644
--- a/java/com/android/dialer/enrichedcall/simulator/res/values-sl/strings.xml
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-sl/strings.xml
@@ -1,20 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-sq/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-sq/strings.xml
index b0c27bc..045e125 100644
--- a/java/com/android/dialer/enrichedcall/simulator/res/values-sq/strings.xml
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-sq/strings.xml
@@ -1,20 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-sr/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-sr/strings.xml
index b0c27bc..045e125 100644
--- a/java/com/android/dialer/enrichedcall/simulator/res/values-sr/strings.xml
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-sr/strings.xml
@@ -1,20 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-sv/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-sv/strings.xml
index b0c27bc..045e125 100644
--- a/java/com/android/dialer/enrichedcall/simulator/res/values-sv/strings.xml
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-sv/strings.xml
@@ -1,20 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-sw/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-sw/strings.xml
index b0c27bc..045e125 100644
--- a/java/com/android/dialer/enrichedcall/simulator/res/values-sw/strings.xml
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-sw/strings.xml
@@ -1,20 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-ta/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-ta/strings.xml
index b0c27bc..045e125 100644
--- a/java/com/android/dialer/enrichedcall/simulator/res/values-ta/strings.xml
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-ta/strings.xml
@@ -1,20 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-te/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-te/strings.xml
index b0c27bc..045e125 100644
--- a/java/com/android/dialer/enrichedcall/simulator/res/values-te/strings.xml
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-te/strings.xml
@@ -1,20 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-th/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-th/strings.xml
index b0c27bc..045e125 100644
--- a/java/com/android/dialer/enrichedcall/simulator/res/values-th/strings.xml
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-th/strings.xml
@@ -1,20 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-tl/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-tl/strings.xml
index b0c27bc..045e125 100644
--- a/java/com/android/dialer/enrichedcall/simulator/res/values-tl/strings.xml
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-tl/strings.xml
@@ -1,20 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-tr/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-tr/strings.xml
index b0c27bc..045e125 100644
--- a/java/com/android/dialer/enrichedcall/simulator/res/values-tr/strings.xml
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-tr/strings.xml
@@ -1,20 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-uk/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-uk/strings.xml
index b0c27bc..045e125 100644
--- a/java/com/android/dialer/enrichedcall/simulator/res/values-uk/strings.xml
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-uk/strings.xml
@@ -1,20 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-ur/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-ur/strings.xml
index b0c27bc..045e125 100644
--- a/java/com/android/dialer/enrichedcall/simulator/res/values-ur/strings.xml
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-ur/strings.xml
@@ -1,20 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-uz/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-uz/strings.xml
index b0c27bc..045e125 100644
--- a/java/com/android/dialer/enrichedcall/simulator/res/values-uz/strings.xml
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-uz/strings.xml
@@ -1,20 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-vi/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-vi/strings.xml
index b0c27bc..045e125 100644
--- a/java/com/android/dialer/enrichedcall/simulator/res/values-vi/strings.xml
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-vi/strings.xml
@@ -1,20 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-zh-rCN/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-zh-rCN/strings.xml
index b0c27bc..045e125 100644
--- a/java/com/android/dialer/enrichedcall/simulator/res/values-zh-rCN/strings.xml
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-zh-rCN/strings.xml
@@ -1,20 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-zh-rHK/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-zh-rHK/strings.xml
index b0c27bc..045e125 100644
--- a/java/com/android/dialer/enrichedcall/simulator/res/values-zh-rHK/strings.xml
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-zh-rHK/strings.xml
@@ -1,20 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-zh-rTW/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-zh-rTW/strings.xml
index b0c27bc..045e125 100644
--- a/java/com/android/dialer/enrichedcall/simulator/res/values-zh-rTW/strings.xml
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-zh-rTW/strings.xml
@@ -1,20 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/dialer/enrichedcall/simulator/res/values-zu/strings.xml b/java/com/android/dialer/enrichedcall/simulator/res/values-zu/strings.xml
index b0c27bc..045e125 100644
--- a/java/com/android/dialer/enrichedcall/simulator/res/values-zu/strings.xml
+++ b/java/com/android/dialer/enrichedcall/simulator/res/values-zu/strings.xml
@@ -1,20 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/dialer/enrichedcall/stub/StubEnrichedCallModule.java b/java/com/android/dialer/enrichedcall/stub/StubEnrichedCallModule.java
index 93e1579..5a0618d 100644
--- a/java/com/android/dialer/enrichedcall/stub/StubEnrichedCallModule.java
+++ b/java/com/android/dialer/enrichedcall/stub/StubEnrichedCallModule.java
@@ -18,12 +18,15 @@
 
 import com.android.dialer.enrichedcall.EnrichedCallManager;
 import com.android.dialer.enrichedcall.RcsVideoShareFactory;
+import com.android.dialer.inject.DialerVariant;
+import com.android.dialer.inject.InstallIn;
 import com.android.incallui.videotech.empty.EmptyVideoTech;
 import dagger.Module;
 import dagger.Provides;
 import javax.inject.Singleton;
 
 /** Module which binds {@link EnrichedCallManagerStub}. */
+@InstallIn(variants = {DialerVariant.DIALER_TEST})
 @Module
 public class StubEnrichedCallModule {
 
diff --git a/java/com/android/dialer/feedback/stub/StubFeedbackModule.java b/java/com/android/dialer/feedback/stub/StubFeedbackModule.java
index 49df09a..19f7e2e 100644
--- a/java/com/android/dialer/feedback/stub/StubFeedbackModule.java
+++ b/java/com/android/dialer/feedback/stub/StubFeedbackModule.java
@@ -20,6 +20,8 @@
 import com.android.dialer.common.LogUtil;
 import com.android.dialer.feedback.FeedbackSender;
 import com.android.dialer.inject.ApplicationContext;
+import com.android.dialer.inject.DialerVariant;
+import com.android.dialer.inject.InstallIn;
 import com.android.dialer.logging.LoggingBindings;
 import com.android.dialer.logging.LoggingBindingsFactory;
 import com.android.dialer.logging.LoggingBindingsStub;
@@ -28,6 +30,7 @@
 import dagger.Provides;
 
 /** Module which bind {@link com.android.dialer.feedback.stub.CallFeedbackListenerStub}. */
+@InstallIn(variants = {DialerVariant.DIALER_TEST})
 @Module
 public class StubFeedbackModule {
 
diff --git a/java/com/android/dialer/glidephotomanager/GlidePhotoManager.java b/java/com/android/dialer/glidephotomanager/GlidePhotoManager.java
index 519a394..de16c38 100644
--- a/java/com/android/dialer/glidephotomanager/GlidePhotoManager.java
+++ b/java/com/android/dialer/glidephotomanager/GlidePhotoManager.java
@@ -17,6 +17,7 @@
 package com.android.dialer.glidephotomanager;
 
 import android.support.annotation.MainThread;
+import android.widget.ImageView;
 import android.widget.QuickContactBadge;
 
 /** Class to load photo for call/contacts */
@@ -30,4 +31,13 @@
    */
   @MainThread
   void loadQuickContactBadge(QuickContactBadge badge, PhotoInfo photoInfo);
+
+  /**
+   * Load {@code photoInfo} into the {@code imageView}. The loading is performed in the background
+   * and a placeholder will be used appropriately. {@code imageView} must be already attached to an
+   * activity/fragment, and the load will be automatically canceled if the lifecycle of the activity
+   * ends.
+   */
+  @MainThread
+  void loadContactPhoto(ImageView imageView, PhotoInfo photoInfo);
 }
diff --git a/java/com/android/dialer/glidephotomanager/GlidePhotoManagerModule.java b/java/com/android/dialer/glidephotomanager/GlidePhotoManagerModule.java
index 79629d6..d4199f0 100644
--- a/java/com/android/dialer/glidephotomanager/GlidePhotoManagerModule.java
+++ b/java/com/android/dialer/glidephotomanager/GlidePhotoManagerModule.java
@@ -17,11 +17,14 @@
 package com.android.dialer.glidephotomanager;
 
 import com.android.dialer.glidephotomanager.impl.GlidePhotoManagerImpl;
+import com.android.dialer.inject.DialerVariant;
+import com.android.dialer.inject.InstallIn;
 import dagger.Binds;
 import dagger.Module;
 import javax.inject.Singleton;
 
 /** Module for {@link GlidePhotoManagerComponent} */
+@InstallIn(variants = {DialerVariant.DIALER_TEST})
 @Module
 public abstract class GlidePhotoManagerModule {
   @Binds
diff --git a/java/com/android/dialer/glidephotomanager/PhotoInfo.java b/java/com/android/dialer/glidephotomanager/PhotoInfo.java
deleted file mode 100644
index 016221f..0000000
--- a/java/com/android/dialer/glidephotomanager/PhotoInfo.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.dialer.glidephotomanager;
-
-import android.support.annotation.Nullable;
-import com.google.auto.value.AutoValue;
-
-/** The number information used to create the photo.. */
-@AutoValue
-public abstract class PhotoInfo {
-
-  /** The display name of the number */
-  @Nullable
-  public abstract String name();
-
-  /** The number displayed to the user. */
-  @Nullable
-  public abstract String formattedNumber();
-
-  /** The URI to the photo */
-  @Nullable
-  public abstract String photoUri();
-
-  /** Value of {@link android.provider.ContactsContract.CommonDataKinds.Photo#_ID} */
-  public abstract long photoId();
-
-  /** The contacts provider lookup URI for the contact associated with the number */
-  @Nullable
-  public abstract String lookupUri();
-
-  /** Should a business icon be displayed */
-  public abstract boolean isBusiness();
-
-  /** Should a voicemail icon be displayed */
-  public abstract boolean isVoicemail();
-
-  /** Should a blocked icon be displayed */
-  public abstract boolean isBlocked();
-
-  /** Should a spam icon be displayed */
-  public abstract boolean isSpam();
-
-  /**
-   * Should the photo be badged as video call.
-   *
-   * <p>Defaults to false.
-   */
-  public abstract boolean isVideo();
-
-  /** Builder for {@link PhotoInfo} */
-  @AutoValue.Builder
-  public abstract static class Builder {
-
-    public abstract Builder setName(@Nullable String name);
-
-    public abstract Builder setFormattedNumber(@Nullable String formattedNumber);
-
-    public abstract Builder setPhotoUri(@Nullable String uri);
-
-    public abstract Builder setPhotoId(long id);
-
-    public abstract Builder setLookupUri(@Nullable String uri);
-
-    public abstract Builder setIsBusiness(boolean isBusiness);
-
-    public abstract Builder setIsVoicemail(boolean isVoicemail);
-
-    public abstract Builder setIsBlocked(boolean isBlocked);
-
-    public abstract Builder setIsSpam(boolean isSpam);
-
-    public abstract Builder setIsVideo(boolean isVideo);
-
-    public abstract PhotoInfo build();
-  }
-
-  public static PhotoInfo.Builder builder() {
-    return new AutoValue_PhotoInfo.Builder()
-        .setPhotoId(0)
-        .setIsBusiness(false)
-        .setIsVoicemail(false)
-        .setIsBlocked(false)
-        .setIsSpam(false)
-        .setIsVideo(false);
-  }
-}
diff --git a/java/com/android/dialer/glidephotomanager/impl/DefaultLookupUriGenerator.java b/java/com/android/dialer/glidephotomanager/impl/DefaultLookupUriGenerator.java
new file mode 100644
index 0000000..2c4acd4
--- /dev/null
+++ b/java/com/android/dialer/glidephotomanager/impl/DefaultLookupUriGenerator.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.dialer.glidephotomanager.impl;
+
+import android.net.Uri;
+import android.provider.ContactsContract;
+import android.provider.ContactsContract.CommonDataKinds;
+import android.provider.ContactsContract.Contacts;
+import android.provider.ContactsContract.DisplayNameSources;
+import com.android.dialer.glidephotomanager.PhotoInfo;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+/**
+ * Generate a lookup URI that will populate the quick contact with the number. Used when the lookup
+ * URI is not available (non-contact and no other sources). The info is encoded into a JSON string
+ * that is not governed by any public interface. URI format:
+ * content://com.android.contacts/contacts/lookup/encoded/[JSON]
+ *
+ * <p>The JSON is a object containing "display_name", "display_name_source" ({@link
+ * DisplayNameSources}), and several {@link ContactsContract.Data} rows keyed by the {@link
+ * ContactsContract.Data#MIMETYPE}. In this case only {@link
+ * ContactsContract.CommonDataKinds.Phone#CONTENT_ITEM_TYPE} is available.
+ *
+ * <p>Example JSON:<br>
+ * {"display_name":"+1 650-253-0000","display_name_source":30,"vnd.android.cursor.item\/contact":{
+ * "vnd.android.cursor.item\/phone_v2":[{"data1":"+1 650-253-0000","data2":12}]}}
+ */
+final class DefaultLookupUriGenerator {
+
+  static Uri generateUri(PhotoInfo photoInfo) {
+    JSONObject lookupJson = new JSONObject();
+    try {
+      lookupJson.put(Contacts.DISPLAY_NAME, photoInfo.getFormattedNumber());
+      // DISPLAY_NAME_SOURCE required by contacts, otherwise the URI will not be recognized.
+      lookupJson.put(Contacts.DISPLAY_NAME_SOURCE, DisplayNameSources.PHONE);
+      JSONObject contactRows = new JSONObject();
+      JSONObject phone = new JSONObject();
+      phone.put(CommonDataKinds.Phone.NUMBER, photoInfo.getFormattedNumber());
+      contactRows.put(CommonDataKinds.Phone.CONTENT_ITEM_TYPE, new JSONArray().put(phone));
+
+      lookupJson.put(Contacts.CONTENT_ITEM_TYPE, contactRows);
+    } catch (JSONException e) {
+      throw new AssertionError(e);
+    }
+    return Contacts.CONTENT_LOOKUP_URI
+        .buildUpon()
+        .appendPath("encoded")
+        .encodedFragment(lookupJson.toString())
+        // Directory is required in the URI but it does not exist, use MAX_VALUE to avoid clashing
+        // with other directory
+        .appendQueryParameter(
+            ContactsContract.DIRECTORY_PARAM_KEY, String.valueOf(Integer.MAX_VALUE))
+        .build();
+  }
+}
diff --git a/java/com/android/dialer/glidephotomanager/impl/GlidePhotoManagerImpl.java b/java/com/android/dialer/glidephotomanager/impl/GlidePhotoManagerImpl.java
index e14e604..9129e58 100644
--- a/java/com/android/dialer/glidephotomanager/impl/GlidePhotoManagerImpl.java
+++ b/java/com/android/dialer/glidephotomanager/impl/GlidePhotoManagerImpl.java
@@ -20,11 +20,13 @@
 import android.content.Context;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
+import android.provider.ContactsContract.Contacts;
 import android.provider.ContactsContract.Data;
 import android.support.annotation.MainThread;
 import android.support.annotation.Nullable;
 import android.telecom.TelecomManager;
 import android.text.TextUtils;
+import android.widget.ImageView;
 import android.widget.QuickContactBadge;
 import com.android.dialer.common.Assert;
 import com.android.dialer.glide.GlideApp;
@@ -32,12 +34,18 @@
 import com.android.dialer.glide.GlideRequests;
 import com.android.dialer.glidephotomanager.GlidePhotoManager;
 import com.android.dialer.glidephotomanager.PhotoInfo;
+import com.android.dialer.i18n.DialerBidiFormatter;
 import com.android.dialer.inject.ApplicationContext;
 import com.android.dialer.lettertile.LetterTileDrawable;
+import java.util.List;
 import javax.inject.Inject;
 
 /** Implementation of {@link GlidePhotoManager} */
 public class GlidePhotoManagerImpl implements GlidePhotoManager {
+
+  private static final int LOOKUP_URI_PATH_SEGMENTS =
+      Contacts.CONTENT_LOOKUP_URI.getPathSegments().size();
+
   private final Context appContext;
 
   @Inject
@@ -49,10 +57,27 @@
   @Override
   public void loadQuickContactBadge(QuickContactBadge badge, PhotoInfo photoInfo) {
     Assert.isMainThread();
-    badge.assignContactUri(parseUri(photoInfo.lookupUri()));
+    badge.assignContactUri(
+        TextUtils.isEmpty(photoInfo.getLookupUri())
+            ? DefaultLookupUriGenerator.generateUri(photoInfo)
+            : parseUri(photoInfo.getLookupUri()));
     badge.setOverlay(null);
-    GlideRequest<Drawable> request = buildRequest(GlideApp.with(badge), photoInfo);
-    request.into(badge);
+    loadContactPhoto(badge, photoInfo);
+  }
+
+  @MainThread
+  @Override
+  public void loadContactPhoto(ImageView imageView, PhotoInfo photoInfo) {
+    Assert.isMainThread();
+    imageView.setContentDescription(
+        TextUtils.expandTemplate(
+            appContext.getText(R.string.a11y_glide_photo_manager_contact_photo_description),
+            // The display name in "photoInfo" can be a contact name, a number, or a mixture of text
+            // and a phone number. We use DialerBidiFormatter to wrap the phone number with TTS
+            // span.
+            DialerBidiFormatter.format(photoInfo.getName())));
+    GlideRequest<Drawable> request = buildRequest(GlideApp.with(imageView), photoInfo);
+    request.into(imageView);
   }
 
   private GlideRequest<Drawable> buildRequest(GlideRequests requestManager, PhotoInfo photoInfo) {
@@ -62,20 +87,20 @@
     GlideRequest<Drawable> request;
     boolean circleCrop = true; // Photos are cropped to a circle by default.
 
-    if (photoInfo.isBlocked()) {
+    if (photoInfo.getIsBlocked()) {
       // Whether the number is blocked takes precedence over the spam status.
       request = requestManager.load(R.drawable.ic_block_grey_48dp);
 
-    } else if (photoInfo.isSpam()) {
+    } else if (photoInfo.getIsSpam()) {
       request = requestManager.load(R.drawable.quantum_ic_report_vd_red_24);
       circleCrop = false; // The spam icon is an octagon so we don't crop it.
 
-    } else if (!TextUtils.isEmpty(photoInfo.photoUri())) {
-      request = requestManager.load(parseUri(photoInfo.photoUri()));
+    } else if (!TextUtils.isEmpty(photoInfo.getPhotoUri())) {
+      request = requestManager.load(parseUri(photoInfo.getPhotoUri()));
 
-    } else if (photoInfo.photoId() != 0) {
+    } else if (photoInfo.getPhotoId() != 0) {
       request =
-          requestManager.load(ContentUris.withAppendedId(Data.CONTENT_URI, photoInfo.photoId()));
+          requestManager.load(ContentUris.withAppendedId(Data.CONTENT_URI, photoInfo.getPhotoId()));
 
     } else {
       // load null to indicate fallback should be used.
@@ -102,25 +127,27 @@
     LetterTileDrawable letterTileDrawable = new LetterTileDrawable(appContext.getResources());
     String displayName;
     String identifier;
-    if (TextUtils.isEmpty(photoInfo.lookupUri())) {
+    if (TextUtils.isEmpty(photoInfo.getLookupUri())) {
       // Use generic avatar instead of letter for non-contacts.
       displayName = null;
       identifier =
-          TextUtils.isEmpty(photoInfo.name()) ? photoInfo.formattedNumber() : photoInfo.name();
+          TextUtils.isEmpty(photoInfo.getName())
+              ? photoInfo.getFormattedNumber()
+              : photoInfo.getName();
     } else {
-      displayName = photoInfo.name();
-      identifier = photoInfo.lookupUri();
+      displayName = photoInfo.getName();
+      identifier = getIdentifier(photoInfo.getLookupUri());
     }
     letterTileDrawable.setCanonicalDialerLetterTileDetails(
         displayName,
         identifier,
         LetterTileDrawable.SHAPE_CIRCLE,
         LetterTileDrawable.getContactTypeFromPrimitives(
-            photoInfo.isVoicemail(),
-            photoInfo.isSpam(),
-            photoInfo.isBusiness(),
+            photoInfo.getIsVoicemail(),
+            photoInfo.getIsSpam(),
+            photoInfo.getIsBusiness(),
             TelecomManager.PRESENTATION_ALLOWED, // TODO(twyen):implement
-            false)); // TODO(twyen):implement
+            photoInfo.getIsConference()));
     return letterTileDrawable;
   }
 
@@ -128,4 +155,27 @@
   private static Uri parseUri(@Nullable String uri) {
     return TextUtils.isEmpty(uri) ? null : Uri.parse(uri);
   }
+
+  /**
+   * Return the "lookup key" inside the lookup URI. If the URI does not contain the key (i.e, JSON
+   * based prepopulated URIs for non-contact entries), the URI itself is returned.
+   *
+   * <p>The lookup URI has the format of Contacts.CONTENT_LOOKUP_URI/lookupKey/rowId. For JSON based
+   * URI, it would be Contacts.CONTENT_LOOKUP_URI/encoded#JSON
+   */
+  private static String getIdentifier(String lookupUri) {
+    if (!lookupUri.startsWith(Contacts.CONTENT_LOOKUP_URI.toString())) {
+      return lookupUri;
+    }
+
+    List<String> segments = Uri.parse(lookupUri).getPathSegments();
+    if (segments.size() < LOOKUP_URI_PATH_SEGMENTS) {
+      return lookupUri;
+    }
+    String lookupKey = segments.get(LOOKUP_URI_PATH_SEGMENTS);
+    if ("encoded".equals(lookupKey)) {
+      return lookupUri;
+    }
+    return lookupKey;
+  }
 }
diff --git a/java/com/android/dialer/glidephotomanager/impl/res/values-af/strings.xml b/java/com/android/dialer/glidephotomanager/impl/res/values-af/strings.xml
new file mode 100644
index 0000000..24fd38b
--- /dev/null
+++ b/java/com/android/dialer/glidephotomanager/impl/res/values-af/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_glide_photo_manager_contact_photo_description">Vinnige kontak vir ^1</string>
+</resources>
diff --git a/java/com/android/dialer/glidephotomanager/impl/res/values-am/strings.xml b/java/com/android/dialer/glidephotomanager/impl/res/values-am/strings.xml
new file mode 100644
index 0000000..2690a53
--- /dev/null
+++ b/java/com/android/dialer/glidephotomanager/impl/res/values-am/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_glide_photo_manager_contact_photo_description">ፈጣን ዕውቂያ ለ^1</string>
+</resources>
diff --git a/java/com/android/dialer/glidephotomanager/impl/res/values-ar/strings.xml b/java/com/android/dialer/glidephotomanager/impl/res/values-ar/strings.xml
new file mode 100644
index 0000000..4bf8821
--- /dev/null
+++ b/java/com/android/dialer/glidephotomanager/impl/res/values-ar/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_glide_photo_manager_contact_photo_description">اتصال سريع لـ ^1</string>
+</resources>
diff --git a/java/com/android/dialer/glidephotomanager/impl/res/values-az/strings.xml b/java/com/android/dialer/glidephotomanager/impl/res/values-az/strings.xml
new file mode 100644
index 0000000..a81f888
--- /dev/null
+++ b/java/com/android/dialer/glidephotomanager/impl/res/values-az/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_glide_photo_manager_contact_photo_description">^1 üçün sürətli kontakt</string>
+</resources>
diff --git a/java/com/android/dialer/glidephotomanager/impl/res/values-b+sr+Latn/strings.xml b/java/com/android/dialer/glidephotomanager/impl/res/values-b+sr+Latn/strings.xml
new file mode 100644
index 0000000..977d713
--- /dev/null
+++ b/java/com/android/dialer/glidephotomanager/impl/res/values-b+sr+Latn/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_glide_photo_manager_contact_photo_description">Brzi kontakt za: ^1</string>
+</resources>
diff --git a/java/com/android/dialer/glidephotomanager/impl/res/values-be/strings.xml b/java/com/android/dialer/glidephotomanager/impl/res/values-be/strings.xml
new file mode 100644
index 0000000..03c08d8
--- /dev/null
+++ b/java/com/android/dialer/glidephotomanager/impl/res/values-be/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_glide_photo_manager_contact_photo_description">Хуткі кантакт для карыстальніка ^1</string>
+</resources>
diff --git a/java/com/android/dialer/glidephotomanager/impl/res/values-bg/strings.xml b/java/com/android/dialer/glidephotomanager/impl/res/values-bg/strings.xml
new file mode 100644
index 0000000..670dde9
--- /dev/null
+++ b/java/com/android/dialer/glidephotomanager/impl/res/values-bg/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_glide_photo_manager_contact_photo_description">Бърз контакт за ^1</string>
+</resources>
diff --git a/java/com/android/dialer/glidephotomanager/impl/res/values-bn/strings.xml b/java/com/android/dialer/glidephotomanager/impl/res/values-bn/strings.xml
new file mode 100644
index 0000000..0a5ed60
--- /dev/null
+++ b/java/com/android/dialer/glidephotomanager/impl/res/values-bn/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_glide_photo_manager_contact_photo_description">^1 এর জন্য দ্রুত পরিচিতি</string>
+</resources>
diff --git a/java/com/android/dialer/glidephotomanager/impl/res/values-bs/strings.xml b/java/com/android/dialer/glidephotomanager/impl/res/values-bs/strings.xml
new file mode 100644
index 0000000..da9a499
--- /dev/null
+++ b/java/com/android/dialer/glidephotomanager/impl/res/values-bs/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_glide_photo_manager_contact_photo_description">Brzi kontakt za ^1</string>
+</resources>
diff --git a/java/com/android/dialer/glidephotomanager/impl/res/values-ca/strings.xml b/java/com/android/dialer/glidephotomanager/impl/res/values-ca/strings.xml
new file mode 100644
index 0000000..9f224f4
--- /dev/null
+++ b/java/com/android/dialer/glidephotomanager/impl/res/values-ca/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_glide_photo_manager_contact_photo_description">Funció de contacte ràpid per a ^1</string>
+</resources>
diff --git a/java/com/android/dialer/glidephotomanager/impl/res/values-cs/strings.xml b/java/com/android/dialer/glidephotomanager/impl/res/values-cs/strings.xml
new file mode 100644
index 0000000..78a518b
--- /dev/null
+++ b/java/com/android/dialer/glidephotomanager/impl/res/values-cs/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_glide_photo_manager_contact_photo_description">Rychlý kontakt ^1</string>
+</resources>
diff --git a/java/com/android/dialer/glidephotomanager/impl/res/values-da/strings.xml b/java/com/android/dialer/glidephotomanager/impl/res/values-da/strings.xml
new file mode 100644
index 0000000..2e0f9a7
--- /dev/null
+++ b/java/com/android/dialer/glidephotomanager/impl/res/values-da/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_glide_photo_manager_contact_photo_description">Hurtigkontakt for ^1</string>
+</resources>
diff --git a/java/com/android/dialer/glidephotomanager/impl/res/values-de/strings.xml b/java/com/android/dialer/glidephotomanager/impl/res/values-de/strings.xml
new file mode 100644
index 0000000..ce6f6ec
--- /dev/null
+++ b/java/com/android/dialer/glidephotomanager/impl/res/values-de/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_glide_photo_manager_contact_photo_description">Schnellkontakt für ^1</string>
+</resources>
diff --git a/java/com/android/dialer/glidephotomanager/impl/res/values-el/strings.xml b/java/com/android/dialer/glidephotomanager/impl/res/values-el/strings.xml
new file mode 100644
index 0000000..43f7365
--- /dev/null
+++ b/java/com/android/dialer/glidephotomanager/impl/res/values-el/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_glide_photo_manager_contact_photo_description">Γρήγορη επαφή για ^1</string>
+</resources>
diff --git a/java/com/android/dialer/glidephotomanager/impl/res/values-en-rAU/strings.xml b/java/com/android/dialer/glidephotomanager/impl/res/values-en-rAU/strings.xml
new file mode 100644
index 0000000..fffaee9
--- /dev/null
+++ b/java/com/android/dialer/glidephotomanager/impl/res/values-en-rAU/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_glide_photo_manager_contact_photo_description">Quick contact for ^1</string>
+</resources>
diff --git a/java/com/android/dialer/glidephotomanager/impl/res/values-en-rGB/strings.xml b/java/com/android/dialer/glidephotomanager/impl/res/values-en-rGB/strings.xml
new file mode 100644
index 0000000..fffaee9
--- /dev/null
+++ b/java/com/android/dialer/glidephotomanager/impl/res/values-en-rGB/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_glide_photo_manager_contact_photo_description">Quick contact for ^1</string>
+</resources>
diff --git a/java/com/android/dialer/glidephotomanager/impl/res/values-en-rIN/strings.xml b/java/com/android/dialer/glidephotomanager/impl/res/values-en-rIN/strings.xml
new file mode 100644
index 0000000..fffaee9
--- /dev/null
+++ b/java/com/android/dialer/glidephotomanager/impl/res/values-en-rIN/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_glide_photo_manager_contact_photo_description">Quick contact for ^1</string>
+</resources>
diff --git a/java/com/android/dialer/glidephotomanager/impl/res/values-es-rUS/strings.xml b/java/com/android/dialer/glidephotomanager/impl/res/values-es-rUS/strings.xml
new file mode 100644
index 0000000..e145273
--- /dev/null
+++ b/java/com/android/dialer/glidephotomanager/impl/res/values-es-rUS/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_glide_photo_manager_contact_photo_description">Contacto rápido de ^1</string>
+</resources>
diff --git a/java/com/android/dialer/glidephotomanager/impl/res/values-es/strings.xml b/java/com/android/dialer/glidephotomanager/impl/res/values-es/strings.xml
new file mode 100644
index 0000000..e145273
--- /dev/null
+++ b/java/com/android/dialer/glidephotomanager/impl/res/values-es/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_glide_photo_manager_contact_photo_description">Contacto rápido de ^1</string>
+</resources>
diff --git a/java/com/android/dialer/glidephotomanager/impl/res/values-et/strings.xml b/java/com/android/dialer/glidephotomanager/impl/res/values-et/strings.xml
new file mode 100644
index 0000000..efa7cc3
--- /dev/null
+++ b/java/com/android/dialer/glidephotomanager/impl/res/values-et/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_glide_photo_manager_contact_photo_description">Kiirkontakt: ^1</string>
+</resources>
diff --git a/java/com/android/dialer/glidephotomanager/impl/res/values-eu/strings.xml b/java/com/android/dialer/glidephotomanager/impl/res/values-eu/strings.xml
new file mode 100644
index 0000000..71f2fdf
--- /dev/null
+++ b/java/com/android/dialer/glidephotomanager/impl/res/values-eu/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_glide_photo_manager_contact_photo_description">^1 erabiltzailearen kontaktu bizkorra</string>
+</resources>
diff --git a/java/com/android/dialer/glidephotomanager/impl/res/values-fa/strings.xml b/java/com/android/dialer/glidephotomanager/impl/res/values-fa/strings.xml
new file mode 100644
index 0000000..3ed51f1
--- /dev/null
+++ b/java/com/android/dialer/glidephotomanager/impl/res/values-fa/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_glide_photo_manager_contact_photo_description">تماس سریع برای ^1</string>
+</resources>
diff --git a/java/com/android/dialer/glidephotomanager/impl/res/values-fi/strings.xml b/java/com/android/dialer/glidephotomanager/impl/res/values-fi/strings.xml
new file mode 100644
index 0000000..a0b494e
--- /dev/null
+++ b/java/com/android/dialer/glidephotomanager/impl/res/values-fi/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_glide_photo_manager_contact_photo_description">Pikayhteys henkilöön ^1</string>
+</resources>
diff --git a/java/com/android/dialer/glidephotomanager/impl/res/values-fr-rCA/strings.xml b/java/com/android/dialer/glidephotomanager/impl/res/values-fr-rCA/strings.xml
new file mode 100644
index 0000000..8b41475
--- /dev/null
+++ b/java/com/android/dialer/glidephotomanager/impl/res/values-fr-rCA/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_glide_photo_manager_contact_photo_description">Lien rapide vers ^1</string>
+</resources>
diff --git a/java/com/android/dialer/glidephotomanager/impl/res/values-fr/strings.xml b/java/com/android/dialer/glidephotomanager/impl/res/values-fr/strings.xml
new file mode 100644
index 0000000..8b41475
--- /dev/null
+++ b/java/com/android/dialer/glidephotomanager/impl/res/values-fr/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_glide_photo_manager_contact_photo_description">Lien rapide vers ^1</string>
+</resources>
diff --git a/java/com/android/dialer/glidephotomanager/impl/res/values-gl/strings.xml b/java/com/android/dialer/glidephotomanager/impl/res/values-gl/strings.xml
new file mode 100644
index 0000000..54c5071
--- /dev/null
+++ b/java/com/android/dialer/glidephotomanager/impl/res/values-gl/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_glide_photo_manager_contact_photo_description">Contacto rápido para ^1</string>
+</resources>
diff --git a/java/com/android/dialer/glidephotomanager/impl/res/values-gu/strings.xml b/java/com/android/dialer/glidephotomanager/impl/res/values-gu/strings.xml
new file mode 100644
index 0000000..697a1b4
--- /dev/null
+++ b/java/com/android/dialer/glidephotomanager/impl/res/values-gu/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_glide_photo_manager_contact_photo_description">^1 માટે ઝડપી સંપર્ક</string>
+</resources>
diff --git a/java/com/android/dialer/glidephotomanager/impl/res/values-hi/strings.xml b/java/com/android/dialer/glidephotomanager/impl/res/values-hi/strings.xml
new file mode 100644
index 0000000..adf60a6
--- /dev/null
+++ b/java/com/android/dialer/glidephotomanager/impl/res/values-hi/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_glide_photo_manager_contact_photo_description">^1 का तुरंत संपर्क</string>
+</resources>
diff --git a/java/com/android/dialer/glidephotomanager/impl/res/values-hr/strings.xml b/java/com/android/dialer/glidephotomanager/impl/res/values-hr/strings.xml
new file mode 100644
index 0000000..ca26eb6
--- /dev/null
+++ b/java/com/android/dialer/glidephotomanager/impl/res/values-hr/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_glide_photo_manager_contact_photo_description">Brzi kontakt za korisnika ^1</string>
+</resources>
diff --git a/java/com/android/dialer/glidephotomanager/impl/res/values-hu/strings.xml b/java/com/android/dialer/glidephotomanager/impl/res/values-hu/strings.xml
new file mode 100644
index 0000000..7c49f86
--- /dev/null
+++ b/java/com/android/dialer/glidephotomanager/impl/res/values-hu/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_glide_photo_manager_contact_photo_description">^1 gyors elérése</string>
+</resources>
diff --git a/java/com/android/dialer/glidephotomanager/impl/res/values-hy/strings.xml b/java/com/android/dialer/glidephotomanager/impl/res/values-hy/strings.xml
new file mode 100644
index 0000000..3e8a18e
--- /dev/null
+++ b/java/com/android/dialer/glidephotomanager/impl/res/values-hy/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_glide_photo_manager_contact_photo_description">Արագ կապ ^1-ի հետ</string>
+</resources>
diff --git a/java/com/android/dialer/glidephotomanager/impl/res/values-in/strings.xml b/java/com/android/dialer/glidephotomanager/impl/res/values-in/strings.xml
new file mode 100644
index 0000000..674f895
--- /dev/null
+++ b/java/com/android/dialer/glidephotomanager/impl/res/values-in/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_glide_photo_manager_contact_photo_description">Kontak kilat untuk ^1</string>
+</resources>
diff --git a/java/com/android/dialer/glidephotomanager/impl/res/values-is/strings.xml b/java/com/android/dialer/glidephotomanager/impl/res/values-is/strings.xml
new file mode 100644
index 0000000..0d4e97a
--- /dev/null
+++ b/java/com/android/dialer/glidephotomanager/impl/res/values-is/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_glide_photo_manager_contact_photo_description">Flýtitengiliður fyrir ^1</string>
+</resources>
diff --git a/java/com/android/dialer/glidephotomanager/impl/res/values-it/strings.xml b/java/com/android/dialer/glidephotomanager/impl/res/values-it/strings.xml
new file mode 100644
index 0000000..57a6d21
--- /dev/null
+++ b/java/com/android/dialer/glidephotomanager/impl/res/values-it/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_glide_photo_manager_contact_photo_description">Contatto rapido per ^1</string>
+</resources>
diff --git a/java/com/android/dialer/glidephotomanager/impl/res/values-iw/strings.xml b/java/com/android/dialer/glidephotomanager/impl/res/values-iw/strings.xml
new file mode 100644
index 0000000..cd2d801
--- /dev/null
+++ b/java/com/android/dialer/glidephotomanager/impl/res/values-iw/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_glide_photo_manager_contact_photo_description">קשר מהיר עבור ^1</string>
+</resources>
diff --git a/java/com/android/dialer/glidephotomanager/impl/res/values-ja/strings.xml b/java/com/android/dialer/glidephotomanager/impl/res/values-ja/strings.xml
new file mode 100644
index 0000000..55cd579
--- /dev/null
+++ b/java/com/android/dialer/glidephotomanager/impl/res/values-ja/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_glide_photo_manager_contact_photo_description">^1 さんのクイックコンタクト</string>
+</resources>
diff --git a/java/com/android/dialer/glidephotomanager/impl/res/values-ka/strings.xml b/java/com/android/dialer/glidephotomanager/impl/res/values-ka/strings.xml
new file mode 100644
index 0000000..ba691e3
--- /dev/null
+++ b/java/com/android/dialer/glidephotomanager/impl/res/values-ka/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_glide_photo_manager_contact_photo_description">სწრაფი კონტაქტი ^1-თან</string>
+</resources>
diff --git a/java/com/android/dialer/glidephotomanager/impl/res/values-kk/strings.xml b/java/com/android/dialer/glidephotomanager/impl/res/values-kk/strings.xml
new file mode 100644
index 0000000..4cf2ddb
--- /dev/null
+++ b/java/com/android/dialer/glidephotomanager/impl/res/values-kk/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_glide_photo_manager_contact_photo_description">^1 үшін жылдам байланыс</string>
+</resources>
diff --git a/java/com/android/dialer/glidephotomanager/impl/res/values-km/strings.xml b/java/com/android/dialer/glidephotomanager/impl/res/values-km/strings.xml
new file mode 100644
index 0000000..3daffa3
--- /dev/null
+++ b/java/com/android/dialer/glidephotomanager/impl/res/values-km/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_glide_photo_manager_contact_photo_description">ទំនាក់ទំនង​រហ័ស​សម្រាប់ ^1</string>
+</resources>
diff --git a/java/com/android/dialer/glidephotomanager/impl/res/values-kn/strings.xml b/java/com/android/dialer/glidephotomanager/impl/res/values-kn/strings.xml
new file mode 100644
index 0000000..871ff4d
--- /dev/null
+++ b/java/com/android/dialer/glidephotomanager/impl/res/values-kn/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_glide_photo_manager_contact_photo_description">^1 ಅವರಿಗೆ ತ್ವರಿತ ಸಂಪರ್ಕ</string>
+</resources>
diff --git a/java/com/android/dialer/glidephotomanager/impl/res/values-ko/strings.xml b/java/com/android/dialer/glidephotomanager/impl/res/values-ko/strings.xml
new file mode 100644
index 0000000..017377d
--- /dev/null
+++ b/java/com/android/dialer/glidephotomanager/impl/res/values-ko/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_glide_photo_manager_contact_photo_description">^1님의 빠른 주소록</string>
+</resources>
diff --git a/java/com/android/dialer/glidephotomanager/impl/res/values-ky/strings.xml b/java/com/android/dialer/glidephotomanager/impl/res/values-ky/strings.xml
new file mode 100644
index 0000000..96f5bea
--- /dev/null
+++ b/java/com/android/dialer/glidephotomanager/impl/res/values-ky/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_glide_photo_manager_contact_photo_description">^1 үчүн тез байланыш</string>
+</resources>
diff --git a/java/com/android/dialer/glidephotomanager/impl/res/values-lo/strings.xml b/java/com/android/dialer/glidephotomanager/impl/res/values-lo/strings.xml
new file mode 100644
index 0000000..1a3021d
--- /dev/null
+++ b/java/com/android/dialer/glidephotomanager/impl/res/values-lo/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_glide_photo_manager_contact_photo_description">ຂໍ້ມູນຕິດຕໍ່ດ່ວນສຳລັບ ^1</string>
+</resources>
diff --git a/java/com/android/dialer/glidephotomanager/impl/res/values-lt/strings.xml b/java/com/android/dialer/glidephotomanager/impl/res/values-lt/strings.xml
new file mode 100644
index 0000000..843e03a
--- /dev/null
+++ b/java/com/android/dialer/glidephotomanager/impl/res/values-lt/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_glide_photo_manager_contact_photo_description">Spartusis ^1 kontaktas</string>
+</resources>
diff --git a/java/com/android/dialer/glidephotomanager/impl/res/values-lv/strings.xml b/java/com/android/dialer/glidephotomanager/impl/res/values-lv/strings.xml
new file mode 100644
index 0000000..bc1781e
--- /dev/null
+++ b/java/com/android/dialer/glidephotomanager/impl/res/values-lv/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_glide_photo_manager_contact_photo_description">Ātrā saziņa ar kontaktpersonu ^1</string>
+</resources>
diff --git a/java/com/android/dialer/glidephotomanager/impl/res/values-mk/strings.xml b/java/com/android/dialer/glidephotomanager/impl/res/values-mk/strings.xml
new file mode 100644
index 0000000..56fc46e
--- /dev/null
+++ b/java/com/android/dialer/glidephotomanager/impl/res/values-mk/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_glide_photo_manager_contact_photo_description">Брз контакт за ^1</string>
+</resources>
diff --git a/java/com/android/dialer/glidephotomanager/impl/res/values-ml/strings.xml b/java/com/android/dialer/glidephotomanager/impl/res/values-ml/strings.xml
new file mode 100644
index 0000000..1324e30
--- /dev/null
+++ b/java/com/android/dialer/glidephotomanager/impl/res/values-ml/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_glide_photo_manager_contact_photo_description">^1 എന്നയാളുടെ ദ്രുത കോൺടാക്റ്റ്</string>
+</resources>
diff --git a/java/com/android/dialer/glidephotomanager/impl/res/values-mn/strings.xml b/java/com/android/dialer/glidephotomanager/impl/res/values-mn/strings.xml
new file mode 100644
index 0000000..f91ac47
--- /dev/null
+++ b/java/com/android/dialer/glidephotomanager/impl/res/values-mn/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_glide_photo_manager_contact_photo_description">^1-н шуурхай харилцагчид</string>
+</resources>
diff --git a/java/com/android/dialer/glidephotomanager/impl/res/values-mr/strings.xml b/java/com/android/dialer/glidephotomanager/impl/res/values-mr/strings.xml
new file mode 100644
index 0000000..a8440f5
--- /dev/null
+++ b/java/com/android/dialer/glidephotomanager/impl/res/values-mr/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_glide_photo_manager_contact_photo_description">^1 साठी जलद संपर्क</string>
+</resources>
diff --git a/java/com/android/dialer/glidephotomanager/impl/res/values-ms/strings.xml b/java/com/android/dialer/glidephotomanager/impl/res/values-ms/strings.xml
new file mode 100644
index 0000000..f832137
--- /dev/null
+++ b/java/com/android/dialer/glidephotomanager/impl/res/values-ms/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_glide_photo_manager_contact_photo_description">Kenalan cepat untuk ^1</string>
+</resources>
diff --git a/java/com/android/dialer/glidephotomanager/impl/res/values-my/strings.xml b/java/com/android/dialer/glidephotomanager/impl/res/values-my/strings.xml
new file mode 100644
index 0000000..db40c4b
--- /dev/null
+++ b/java/com/android/dialer/glidephotomanager/impl/res/values-my/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_glide_photo_manager_contact_photo_description">^1 အတွက် အမြန်အဆက်အသွယ်</string>
+</resources>
diff --git a/java/com/android/dialer/glidephotomanager/impl/res/values-nb/strings.xml b/java/com/android/dialer/glidephotomanager/impl/res/values-nb/strings.xml
new file mode 100644
index 0000000..2e0f9a7
--- /dev/null
+++ b/java/com/android/dialer/glidephotomanager/impl/res/values-nb/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_glide_photo_manager_contact_photo_description">Hurtigkontakt for ^1</string>
+</resources>
diff --git a/java/com/android/dialer/glidephotomanager/impl/res/values-ne/strings.xml b/java/com/android/dialer/glidephotomanager/impl/res/values-ne/strings.xml
new file mode 100644
index 0000000..bf962fe
--- /dev/null
+++ b/java/com/android/dialer/glidephotomanager/impl/res/values-ne/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_glide_photo_manager_contact_photo_description">^1 को छिटो सम्पर्क</string>
+</resources>
diff --git a/java/com/android/dialer/glidephotomanager/impl/res/values-nl/strings.xml b/java/com/android/dialer/glidephotomanager/impl/res/values-nl/strings.xml
new file mode 100644
index 0000000..cf51f85
--- /dev/null
+++ b/java/com/android/dialer/glidephotomanager/impl/res/values-nl/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_glide_photo_manager_contact_photo_description">Snelcontact voor ^1</string>
+</resources>
diff --git a/java/com/android/dialer/glidephotomanager/impl/res/values-no/strings.xml b/java/com/android/dialer/glidephotomanager/impl/res/values-no/strings.xml
new file mode 100644
index 0000000..2e0f9a7
--- /dev/null
+++ b/java/com/android/dialer/glidephotomanager/impl/res/values-no/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_glide_photo_manager_contact_photo_description">Hurtigkontakt for ^1</string>
+</resources>
diff --git a/java/com/android/dialer/glidephotomanager/impl/res/values-pa/strings.xml b/java/com/android/dialer/glidephotomanager/impl/res/values-pa/strings.xml
new file mode 100644
index 0000000..9f8756f
--- /dev/null
+++ b/java/com/android/dialer/glidephotomanager/impl/res/values-pa/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_glide_photo_manager_contact_photo_description">^1 ਲਈ ਤਤਕਾਲ ਸੰਪਰਕ</string>
+</resources>
diff --git a/java/com/android/dialer/glidephotomanager/impl/res/values-pl/strings.xml b/java/com/android/dialer/glidephotomanager/impl/res/values-pl/strings.xml
new file mode 100644
index 0000000..116500b
--- /dev/null
+++ b/java/com/android/dialer/glidephotomanager/impl/res/values-pl/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_glide_photo_manager_contact_photo_description">Szybki kontakt: ^1</string>
+</resources>
diff --git a/java/com/android/dialer/glidephotomanager/impl/res/values-pt-rBR/strings.xml b/java/com/android/dialer/glidephotomanager/impl/res/values-pt-rBR/strings.xml
new file mode 100644
index 0000000..e4f5999
--- /dev/null
+++ b/java/com/android/dialer/glidephotomanager/impl/res/values-pt-rBR/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_glide_photo_manager_contact_photo_description">Contato rápido de ^1</string>
+</resources>
diff --git a/java/com/android/dialer/glidephotomanager/impl/res/values-pt-rPT/strings.xml b/java/com/android/dialer/glidephotomanager/impl/res/values-pt-rPT/strings.xml
new file mode 100644
index 0000000..8a523dc
--- /dev/null
+++ b/java/com/android/dialer/glidephotomanager/impl/res/values-pt-rPT/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_glide_photo_manager_contact_photo_description">Contactos rápidos para ^1</string>
+</resources>
diff --git a/java/com/android/dialer/glidephotomanager/impl/res/values-pt/strings.xml b/java/com/android/dialer/glidephotomanager/impl/res/values-pt/strings.xml
new file mode 100644
index 0000000..e4f5999
--- /dev/null
+++ b/java/com/android/dialer/glidephotomanager/impl/res/values-pt/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_glide_photo_manager_contact_photo_description">Contato rápido de ^1</string>
+</resources>
diff --git a/java/com/android/dialer/glidephotomanager/impl/res/values-ro/strings.xml b/java/com/android/dialer/glidephotomanager/impl/res/values-ro/strings.xml
new file mode 100644
index 0000000..cd9921d
--- /dev/null
+++ b/java/com/android/dialer/glidephotomanager/impl/res/values-ro/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_glide_photo_manager_contact_photo_description">Contact rapid pentru ^1</string>
+</resources>
diff --git a/java/com/android/dialer/glidephotomanager/impl/res/values-ru/strings.xml b/java/com/android/dialer/glidephotomanager/impl/res/values-ru/strings.xml
new file mode 100644
index 0000000..7461cc2
--- /dev/null
+++ b/java/com/android/dialer/glidephotomanager/impl/res/values-ru/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_glide_photo_manager_contact_photo_description">Быстрый вызов: ^1</string>
+</resources>
diff --git a/java/com/android/dialer/glidephotomanager/impl/res/values-si/strings.xml b/java/com/android/dialer/glidephotomanager/impl/res/values-si/strings.xml
new file mode 100644
index 0000000..f9d8765
--- /dev/null
+++ b/java/com/android/dialer/glidephotomanager/impl/res/values-si/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_glide_photo_manager_contact_photo_description">^1 සඳහා ඉක්මන් සම්බන්ධතාව</string>
+</resources>
diff --git a/java/com/android/dialer/glidephotomanager/impl/res/values-sk/strings.xml b/java/com/android/dialer/glidephotomanager/impl/res/values-sk/strings.xml
new file mode 100644
index 0000000..4620e32
--- /dev/null
+++ b/java/com/android/dialer/glidephotomanager/impl/res/values-sk/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_glide_photo_manager_contact_photo_description">Rýchly kontakt pre osobu ^1</string>
+</resources>
diff --git a/java/com/android/dialer/glidephotomanager/impl/res/values-sl/strings.xml b/java/com/android/dialer/glidephotomanager/impl/res/values-sl/strings.xml
new file mode 100644
index 0000000..dcf805e
--- /dev/null
+++ b/java/com/android/dialer/glidephotomanager/impl/res/values-sl/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_glide_photo_manager_contact_photo_description">Hitri stik za osebo ^1</string>
+</resources>
diff --git a/java/com/android/dialer/glidephotomanager/impl/res/values-sq/strings.xml b/java/com/android/dialer/glidephotomanager/impl/res/values-sq/strings.xml
new file mode 100644
index 0000000..dd9dd38
--- /dev/null
+++ b/java/com/android/dialer/glidephotomanager/impl/res/values-sq/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_glide_photo_manager_contact_photo_description">Kontakti i shpejtë për ^1</string>
+</resources>
diff --git a/java/com/android/dialer/glidephotomanager/impl/res/values-sr/strings.xml b/java/com/android/dialer/glidephotomanager/impl/res/values-sr/strings.xml
new file mode 100644
index 0000000..fbbd1a9
--- /dev/null
+++ b/java/com/android/dialer/glidephotomanager/impl/res/values-sr/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_glide_photo_manager_contact_photo_description">Брзи контакт за: ^1</string>
+</resources>
diff --git a/java/com/android/dialer/glidephotomanager/impl/res/values-sv/strings.xml b/java/com/android/dialer/glidephotomanager/impl/res/values-sv/strings.xml
new file mode 100644
index 0000000..bbf9276
--- /dev/null
+++ b/java/com/android/dialer/glidephotomanager/impl/res/values-sv/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_glide_photo_manager_contact_photo_description">Snabbkontakt för ^1</string>
+</resources>
diff --git a/java/com/android/dialer/glidephotomanager/impl/res/values-sw/strings.xml b/java/com/android/dialer/glidephotomanager/impl/res/values-sw/strings.xml
new file mode 100644
index 0000000..17ae7bf
--- /dev/null
+++ b/java/com/android/dialer/glidephotomanager/impl/res/values-sw/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_glide_photo_manager_contact_photo_description">Anwani ya kuwasiliana kwa haraka na ^1</string>
+</resources>
diff --git a/java/com/android/dialer/glidephotomanager/impl/res/values-ta/strings.xml b/java/com/android/dialer/glidephotomanager/impl/res/values-ta/strings.xml
new file mode 100644
index 0000000..b3ef351
--- /dev/null
+++ b/java/com/android/dialer/glidephotomanager/impl/res/values-ta/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_glide_photo_manager_contact_photo_description">^1க்கான விரைவுத் தொடர்பு</string>
+</resources>
diff --git a/java/com/android/dialer/glidephotomanager/impl/res/values-te/strings.xml b/java/com/android/dialer/glidephotomanager/impl/res/values-te/strings.xml
new file mode 100644
index 0000000..ba8ea1f
--- /dev/null
+++ b/java/com/android/dialer/glidephotomanager/impl/res/values-te/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_glide_photo_manager_contact_photo_description">^1 కోసం త్వరిత సంప్రదింపు</string>
+</resources>
diff --git a/java/com/android/dialer/glidephotomanager/impl/res/values-th/strings.xml b/java/com/android/dialer/glidephotomanager/impl/res/values-th/strings.xml
new file mode 100644
index 0000000..f24a1e7
--- /dev/null
+++ b/java/com/android/dialer/glidephotomanager/impl/res/values-th/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_glide_photo_manager_contact_photo_description">สมุดโทรศัพท์ด่วนสำหรับ ^1</string>
+</resources>
diff --git a/java/com/android/dialer/glidephotomanager/impl/res/values-tl/strings.xml b/java/com/android/dialer/glidephotomanager/impl/res/values-tl/strings.xml
new file mode 100644
index 0000000..86158ff
--- /dev/null
+++ b/java/com/android/dialer/glidephotomanager/impl/res/values-tl/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_glide_photo_manager_contact_photo_description">Mabilisan na contact para kay ^1</string>
+</resources>
diff --git a/java/com/android/dialer/glidephotomanager/impl/res/values-tr/strings.xml b/java/com/android/dialer/glidephotomanager/impl/res/values-tr/strings.xml
new file mode 100644
index 0000000..9c0ae83
--- /dev/null
+++ b/java/com/android/dialer/glidephotomanager/impl/res/values-tr/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_glide_photo_manager_contact_photo_description">^1 için hızlı iletişim</string>
+</resources>
diff --git a/java/com/android/dialer/glidephotomanager/impl/res/values-uk/strings.xml b/java/com/android/dialer/glidephotomanager/impl/res/values-uk/strings.xml
new file mode 100644
index 0000000..6f751be
--- /dev/null
+++ b/java/com/android/dialer/glidephotomanager/impl/res/values-uk/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_glide_photo_manager_contact_photo_description">Швидкий контакт із користувачем ^1</string>
+</resources>
diff --git a/java/com/android/dialer/glidephotomanager/impl/res/values-ur/strings.xml b/java/com/android/dialer/glidephotomanager/impl/res/values-ur/strings.xml
new file mode 100644
index 0000000..0cb8cc0
--- /dev/null
+++ b/java/com/android/dialer/glidephotomanager/impl/res/values-ur/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_glide_photo_manager_contact_photo_description">^1 کیلئے فوری رابطہ</string>
+</resources>
diff --git a/java/com/android/dialer/glidephotomanager/impl/res/values-uz/strings.xml b/java/com/android/dialer/glidephotomanager/impl/res/values-uz/strings.xml
new file mode 100644
index 0000000..73575e9
--- /dev/null
+++ b/java/com/android/dialer/glidephotomanager/impl/res/values-uz/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_glide_photo_manager_contact_photo_description">Tezkor chaqiruv, kontakt: ^1</string>
+</resources>
diff --git a/java/com/android/dialer/glidephotomanager/impl/res/values-vi/strings.xml b/java/com/android/dialer/glidephotomanager/impl/res/values-vi/strings.xml
new file mode 100644
index 0000000..f00b50c
--- /dev/null
+++ b/java/com/android/dialer/glidephotomanager/impl/res/values-vi/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_glide_photo_manager_contact_photo_description">Liên hệ nhanh của ^1</string>
+</resources>
diff --git a/java/com/android/dialer/glidephotomanager/impl/res/values-zh-rCN/strings.xml b/java/com/android/dialer/glidephotomanager/impl/res/values-zh-rCN/strings.xml
new file mode 100644
index 0000000..2f19b9f
--- /dev/null
+++ b/java/com/android/dialer/glidephotomanager/impl/res/values-zh-rCN/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_glide_photo_manager_contact_photo_description">^1的快捷联系方式</string>
+</resources>
diff --git a/java/com/android/dialer/glidephotomanager/impl/res/values-zh-rHK/strings.xml b/java/com/android/dialer/glidephotomanager/impl/res/values-zh-rHK/strings.xml
new file mode 100644
index 0000000..c150f15
--- /dev/null
+++ b/java/com/android/dialer/glidephotomanager/impl/res/values-zh-rHK/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_glide_photo_manager_contact_photo_description">快速聯絡^1</string>
+</resources>
diff --git a/java/com/android/dialer/glidephotomanager/impl/res/values-zh-rTW/strings.xml b/java/com/android/dialer/glidephotomanager/impl/res/values-zh-rTW/strings.xml
new file mode 100644
index 0000000..c4fe756
--- /dev/null
+++ b/java/com/android/dialer/glidephotomanager/impl/res/values-zh-rTW/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_glide_photo_manager_contact_photo_description">^1的快速聯絡人相片</string>
+</resources>
diff --git a/java/com/android/dialer/glidephotomanager/impl/res/values-zu/strings.xml b/java/com/android/dialer/glidephotomanager/impl/res/values-zu/strings.xml
new file mode 100644
index 0000000..94aba05
--- /dev/null
+++ b/java/com/android/dialer/glidephotomanager/impl/res/values-zu/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_glide_photo_manager_contact_photo_description">Okokuxhumanisa ngokushesha kwe-^1</string>
+</resources>
diff --git a/java/com/android/dialer/glidephotomanager/impl/res/values/strings.xml b/java/com/android/dialer/glidephotomanager/impl/res/values/strings.xml
new file mode 100644
index 0000000..217ad60
--- /dev/null
+++ b/java/com/android/dialer/glidephotomanager/impl/res/values/strings.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ Copyright (C) 2018 The Android Open Source Project
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~      http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License
+ -->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
+  <!--
+    String describing to a11y users the image view containing a contact photo loaded by
+    GlidePhotoManager [CHAR LIMIT=NONE]
+  -->
+  <string name="a11y_glide_photo_manager_contact_photo_description">
+    Quick contact for <xliff:g example="Jane Smith" id="name">^1</xliff:g>
+  </string>
+</resources>
\ No newline at end of file
diff --git a/java/com/android/dialer/glidephotomanager/photo_info.proto b/java/com/android/dialer/glidephotomanager/photo_info.proto
new file mode 100644
index 0000000..07908d8
--- /dev/null
+++ b/java/com/android/dialer/glidephotomanager/photo_info.proto
@@ -0,0 +1,50 @@
+syntax = "proto2";
+
+option java_package = "com.android.dialer.glidephotomanager";
+option java_multiple_files = true;
+option optimize_for = LITE_RUNTIME;
+
+
+package com.android.dialer.glidephotomanager;
+
+// Contains information associated with a number, which is used to create the
+// photo.
+// Next ID: 13
+message PhotoInfo {
+  // The display name of the number.
+  optional string name = 1;
+
+  // The number presented to the user.
+  optional string formatted_number = 2;
+
+  // The URI of the photo.
+  optional string photo_uri = 3;
+
+  // Value of android.provider.ContactsContract.CommonDataKinds.Photo#_ID
+  optional int64 photo_id = 4;
+
+  // The Contacts Provider lookup URI for the contact associated with the
+  // number.
+  optional string lookup_uri = 5;
+
+  // Whether a business icon should be displayed.
+  optional bool is_business = 6;
+
+  // Whether a voicemail icon should be displayed.
+  optional bool is_voicemail = 7;
+
+  // Whether a "blocked" icon should be displayed.
+  optional bool is_blocked = 8;
+
+  // Whether a "spam" icon should be displayed.
+  optional bool is_spam = 9;
+
+  // Whether the photo should be badged as video call.
+  optional bool is_video = 10;
+
+  // Whether the photo should be badged as RTT call.
+  optional bool is_rtt = 11;
+
+  // Whether to show conference call icon instead of contact icon.
+  optional bool is_conference = 12;
+}
diff --git a/java/com/android/dialer/historyitemactions/BlockReportSpamModules.java b/java/com/android/dialer/historyitemactions/BlockReportSpamModules.java
new file mode 100644
index 0000000..c47b097
--- /dev/null
+++ b/java/com/android/dialer/historyitemactions/BlockReportSpamModules.java
@@ -0,0 +1,138 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.dialer.historyitemactions;
+
+import android.content.Context;
+import com.android.dialer.blockreportspam.BlockReportSpamDialogInfo;
+import com.android.dialer.blockreportspam.ShowBlockReportSpamDialogNotifier;
+import com.android.dialer.logging.DialerImpression;
+import com.android.dialer.logging.Logger;
+import java.util.Optional;
+
+/** Modules for blocking/unblocking a number and/or reporting it as spam/not spam. */
+final class BlockReportSpamModules {
+
+  private BlockReportSpamModules() {}
+
+  static HistoryItemActionModule moduleForMarkingNumberAsNotSpam(
+      Context context,
+      BlockReportSpamDialogInfo blockReportSpamDialogInfo,
+      Optional<DialerImpression.Type> impression) {
+
+    return new HistoryItemActionModule() {
+      @Override
+      public int getStringId() {
+        return R.string.not_spam;
+      }
+
+      @Override
+      public int getDrawableId() {
+        return R.drawable.quantum_ic_report_off_vd_theme_24;
+      }
+
+      @Override
+      public boolean onClick() {
+        ShowBlockReportSpamDialogNotifier.notifyShowDialogToReportNotSpam(
+            context, blockReportSpamDialogInfo);
+
+        impression.ifPresent(Logger.get(context)::logImpression);
+        return true; // Close the bottom sheet.
+      }
+    };
+  }
+
+  static HistoryItemActionModule moduleForBlockingNumber(
+      Context context,
+      BlockReportSpamDialogInfo blockReportSpamDialogInfo,
+      Optional<DialerImpression.Type> impression) {
+
+    return new HistoryItemActionModule() {
+      @Override
+      public int getStringId() {
+        return R.string.block_number;
+      }
+
+      @Override
+      public int getDrawableId() {
+        return R.drawable.quantum_ic_block_vd_theme_24;
+      }
+
+      @Override
+      public boolean onClick() {
+        ShowBlockReportSpamDialogNotifier.notifyShowDialogToBlockNumber(
+            context, blockReportSpamDialogInfo);
+
+        impression.ifPresent(Logger.get(context)::logImpression);
+        return true; // Close the bottom sheet.
+      }
+    };
+  }
+
+  static HistoryItemActionModule moduleForUnblockingNumber(
+      Context context,
+      BlockReportSpamDialogInfo blockReportSpamDialogInfo,
+      Optional<DialerImpression.Type> impression) {
+
+    return new HistoryItemActionModule() {
+      @Override
+      public int getStringId() {
+        return R.string.unblock_number;
+      }
+
+      @Override
+      public int getDrawableId() {
+        return R.drawable.quantum_ic_unblock_vd_theme_24;
+      }
+
+      @Override
+      public boolean onClick() {
+        ShowBlockReportSpamDialogNotifier.notifyShowDialogToUnblockNumber(
+            context, blockReportSpamDialogInfo);
+
+        impression.ifPresent(Logger.get(context)::logImpression);
+        return true; // Close the bottom sheet.
+      }
+    };
+  }
+
+  static HistoryItemActionModule moduleForBlockingNumberAndOptionallyReportingSpam(
+      Context context,
+      BlockReportSpamDialogInfo blockReportSpamDialogInfo,
+      Optional<DialerImpression.Type> impression) {
+
+    return new HistoryItemActionModule() {
+      @Override
+      public int getStringId() {
+        return R.string.block_and_optionally_report_spam;
+      }
+
+      @Override
+      public int getDrawableId() {
+        return R.drawable.quantum_ic_block_vd_theme_24;
+      }
+
+      @Override
+      public boolean onClick() {
+        ShowBlockReportSpamDialogNotifier.notifyShowDialogToBlockNumberAndOptionallyReportSpam(
+            context, blockReportSpamDialogInfo);
+
+        impression.ifPresent(Logger.get(context)::logImpression);
+        return true; // Close the bottom sheet.
+      }
+    };
+  }
+}
diff --git a/java/com/android/dialer/historyitemactions/HistoryItemActionBottomSheet.java b/java/com/android/dialer/historyitemactions/HistoryItemActionBottomSheet.java
index 47aa100..9bc6570 100644
--- a/java/com/android/dialer/historyitemactions/HistoryItemActionBottomSheet.java
+++ b/java/com/android/dialer/historyitemactions/HistoryItemActionBottomSheet.java
@@ -17,63 +17,108 @@
 package com.android.dialer.historyitemactions;
 
 import android.content.Context;
+import android.content.res.ColorStateList;
 import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.design.widget.BottomSheetBehavior;
+import android.support.design.widget.BottomSheetBehavior.BottomSheetCallback;
 import android.support.design.widget.BottomSheetDialog;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.ViewGroup;
+import android.view.ViewTreeObserver.OnPreDrawListener;
+import android.view.Window;
+import android.view.accessibility.AccessibilityManager;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 import com.android.dialer.common.Assert;
-import com.android.dialer.glidephotomanager.GlidePhotoManager;
+import com.android.dialer.compat.android.support.design.bottomsheet.BottomSheetStateCompat;
+import com.android.dialer.theme.base.ThemeComponent;
+import com.android.dialer.widget.ContactPhotoView;
+import com.google.common.collect.ImmutableSet;
 import java.util.List;
 
 /**
  * {@link BottomSheetDialog} used to show a list of actions in a bottom sheet menu.
  *
- * <p>{@link #show(Context, HistoryItemPrimaryActionInfo, List, GlidePhotoManager)} should be used
- * to create and display the menu. Modules are built using {@link HistoryItemActionModule} and some
- * defaults are provided by {@link IntentModule} and {@link DividerModule}.
+ * <p>{@link #show(Context, HistoryItemBottomSheetHeaderInfo, List)} should be used to create and
+ * display the menu. Modules are built using {@link HistoryItemActionModule} and some defaults are
+ * provided by {@link IntentModule} and {@link DividerModule}.
  */
 public class HistoryItemActionBottomSheet extends BottomSheetDialog implements OnClickListener {
 
   private final List<HistoryItemActionModule> modules;
-  private final HistoryItemPrimaryActionInfo historyItemPrimaryActionInfo;
-  private final GlidePhotoManager glidePhotoManager;
+  private final HistoryItemBottomSheetHeaderInfo historyItemBottomSheetHeaderInfo;
+
+  /**
+   * An {@link OnPreDrawListener} that sets the contact layout's elevation if
+   *
+   * <ul>
+   *   <li>the bottom sheet can expand to full screen, and
+   *   <li>the bottom sheet is fully expanded.
+   * </ul>
+   *
+   * <p>The reason an {@link OnPreDrawListener} instead of a {@link BottomSheetCallback} is used to
+   * handle this is that the initial state of the bottom sheet will be STATE_EXPANDED when the touch
+   * exploration (e.g., TalkBack) is enabled and {@link BottomSheetCallback} won't be triggered in
+   * this case. See {@link #setupBottomSheetBehavior()} for details.
+   */
+  private final OnPreDrawListener onPreDrawListenerForContactLayout =
+      () -> {
+        View contactLayout = findViewById(R.id.contact_layout_root);
+        View background = findViewById(android.support.design.R.id.touch_outside);
+        View bottomSheet = findViewById(android.support.design.R.id.design_bottom_sheet);
+
+        BottomSheetBehavior<View> behavior = BottomSheetBehavior.from(bottomSheet);
+
+        // If the height of the background is equal to that of the bottom sheet, the bottom sheet
+        // *can* be expanded to full screen.
+        contactLayout.setElevation(
+            background.getHeight() == bottomSheet.getHeight()
+                    && behavior.getState() == BottomSheetStateCompat.STATE_EXPANDED
+                ? getContext()
+                    .getResources()
+                    .getDimensionPixelSize(R.dimen.contact_actions_header_elevation)
+                : 0);
+
+        return true; // Return true to proceed with the current drawing pass.
+      };
+
+  private LinearLayout contactLayout;
 
   private HistoryItemActionBottomSheet(
       Context context,
-      HistoryItemPrimaryActionInfo historyItemPrimaryActionInfo,
-      List<HistoryItemActionModule> modules,
-      GlidePhotoManager glidePhotoManager) {
-    super(context);
+      HistoryItemBottomSheetHeaderInfo historyItemBottomSheetHeaderInfo,
+      List<HistoryItemActionModule> modules) {
+    super(context, R.style.HistoryItemBottomSheet);
     this.modules = modules;
-    this.historyItemPrimaryActionInfo = historyItemPrimaryActionInfo;
-    this.glidePhotoManager = glidePhotoManager;
+    this.historyItemBottomSheetHeaderInfo = Assert.isNotNull(historyItemBottomSheetHeaderInfo);
     setContentView(LayoutInflater.from(context).inflate(R.layout.sheet_layout, null));
   }
 
   public static HistoryItemActionBottomSheet show(
       Context context,
-      HistoryItemPrimaryActionInfo historyItemPrimaryActionInfo,
-      List<HistoryItemActionModule> modules,
-      GlidePhotoManager glidePhotoManager) {
+      HistoryItemBottomSheetHeaderInfo historyItemBottomSheetHeaderInfo,
+      List<HistoryItemActionModule> modules) {
     HistoryItemActionBottomSheet sheet =
-        new HistoryItemActionBottomSheet(
-            context, historyItemPrimaryActionInfo, modules, glidePhotoManager);
+        new HistoryItemActionBottomSheet(context, historyItemBottomSheetHeaderInfo, modules);
     sheet.show();
     return sheet;
   }
 
   @Override
   protected void onCreate(Bundle bundle) {
-    super.onCreate(bundle);
-    LinearLayout container = Assert.isNotNull(findViewById(R.id.action_container));
-    container.addView(getContactView(container));
+    contactLayout = Assert.isNotNull(findViewById(R.id.contact_layout_root));
 
+    initBottomSheetState();
+    setupBottomSheetBehavior();
+    setupWindow();
+    setupContactLayout();
+
+    LinearLayout container = Assert.isNotNull(findViewById(R.id.action_container));
     for (HistoryItemActionModule module : modules) {
       if (module instanceof DividerModule) {
         container.addView(getDividerView(container));
@@ -83,33 +128,93 @@
     }
   }
 
-  private View getContactView(ViewGroup container) {
-    LayoutInflater inflater = LayoutInflater.from(getContext());
-    View contactView = inflater.inflate(R.layout.contact_layout, container, false);
+  @Override
+  public void onAttachedToWindow() {
+    super.onAttachedToWindow();
+    contactLayout.getViewTreeObserver().addOnPreDrawListener(onPreDrawListenerForContactLayout);
+  }
 
-    // TODO(zachh): The contact image should be badged with a video icon if it is for a video call.
-    glidePhotoManager.loadQuickContactBadge(
-        contactView.findViewById(R.id.quick_contact_photo),
-        historyItemPrimaryActionInfo.photoInfo());
+  @Override
+  public void onDetachedFromWindow() {
+    super.onDetachedFromWindow();
+    contactLayout.getViewTreeObserver().removeOnPreDrawListener(onPreDrawListenerForContactLayout);
+  }
 
-    TextView primaryTextView = contactView.findViewById(R.id.primary_text);
-    TextView secondaryTextView = contactView.findViewById(R.id.secondary_text);
+  private void initBottomSheetState() {
+    // If the touch exploration in the system (e.g., TalkBack) is enabled, the bottom sheet should
+    // be fully expanded because sometimes services like TalkBack won't read all items when the
+    // bottom sheet is not fully expanded.
+    if (isTouchExplorationEnabled()) {
+      BottomSheetBehavior<View> behavior =
+          BottomSheetBehavior.from(findViewById(android.support.design.R.id.design_bottom_sheet));
+      behavior.setState(BottomSheetStateCompat.STATE_EXPANDED);
+    }
+  }
 
-    primaryTextView.setText(historyItemPrimaryActionInfo.primaryText());
-    if (!TextUtils.isEmpty(historyItemPrimaryActionInfo.secondaryText())) {
-      secondaryTextView.setText(historyItemPrimaryActionInfo.secondaryText());
+  /**
+   * Configures the bottom sheet behavior when its state changes.
+   *
+   * <p>If the touch exploration in the system (e.g., TalkBack) is enabled, the bottom sheet will be
+   * canceled if it is in a final state other than {@link BottomSheetBehavior#STATE_EXPANDED}. This
+   * is because sometimes services like TalkBack won't read all items when the bottom sheet is not
+   * fully expanded.
+   *
+   * <p>If the touch exploration is disabled, cancel the bottom sheet when it is in {@link
+   * BottomSheetBehavior#STATE_HIDDEN}.
+   */
+  private void setupBottomSheetBehavior() {
+    BottomSheetBehavior<View> behavior =
+        BottomSheetBehavior.from(findViewById(android.support.design.R.id.design_bottom_sheet));
+    behavior.setBottomSheetCallback(
+        new BottomSheetCallback() {
+          @Override
+          public void onStateChanged(@NonNull View bottomSheet, int newState) {
+            ImmutableSet<Integer> statesToCancelBottomSheet =
+                isTouchExplorationEnabled()
+                    ? ImmutableSet.of(
+                        BottomSheetStateCompat.STATE_COLLAPSED,
+                        BottomSheetStateCompat.STATE_HIDDEN,
+                        BottomSheetStateCompat.STATE_HALF_EXPANDED)
+                    : ImmutableSet.of(BottomSheetStateCompat.STATE_HIDDEN);
+
+            if (statesToCancelBottomSheet.contains(newState)) {
+              cancel();
+            }
+
+            // TODO(calderwoodra): set the status bar color when expanded, else translucent
+          }
+
+          @Override
+          public void onSlide(@NonNull View bottomSheet, float slideOffset) {}
+        });
+  }
+
+  // Overwrites the window size since it doesn't match the parent.
+  private void setupWindow() {
+    Window window = getWindow();
+    if (window == null) {
+      return;
+    }
+    // TODO(calderwoodra): set the nav bar color
+    window.setLayout(
+        /* width = */ ViewGroup.LayoutParams.MATCH_PARENT,
+        /* height = */ ViewGroup.LayoutParams.MATCH_PARENT);
+  }
+
+  private void setupContactLayout() {
+    ContactPhotoView contactPhotoView = contactLayout.findViewById(R.id.contact_photo_view);
+    contactPhotoView.setPhoto(historyItemBottomSheetHeaderInfo.getPhotoInfo());
+
+    TextView primaryTextView = contactLayout.findViewById(R.id.primary_text);
+    TextView secondaryTextView = contactLayout.findViewById(R.id.secondary_text);
+
+    primaryTextView.setText(historyItemBottomSheetHeaderInfo.getPrimaryText());
+    if (!TextUtils.isEmpty(historyItemBottomSheetHeaderInfo.getSecondaryText())) {
+      secondaryTextView.setText(historyItemBottomSheetHeaderInfo.getSecondaryText());
     } else {
       secondaryTextView.setVisibility(View.GONE);
       secondaryTextView.setText(null);
     }
-    if (historyItemPrimaryActionInfo.intent() != null) {
-      contactView.setOnClickListener(
-          (view) -> {
-            getContext().startActivity(historyItemPrimaryActionInfo.intent());
-            dismiss();
-          });
-    }
-    return contactView;
   }
 
   private View getDividerView(ViewGroup container) {
@@ -123,6 +228,11 @@
     ((TextView) moduleView.findViewById(R.id.module_text)).setText(module.getStringId());
     ((ImageView) moduleView.findViewById(R.id.module_image))
         .setImageResource(module.getDrawableId());
+    if (module.tintDrawable()) {
+      ((ImageView) moduleView.findViewById(R.id.module_image))
+          .setImageTintList(
+              ColorStateList.valueOf(ThemeComponent.get(getContext()).theme().getColorIcon()));
+    }
     moduleView.setOnClickListener(this);
     moduleView.setTag(module);
     return moduleView;
@@ -134,4 +244,11 @@
       dismiss();
     }
   }
+
+  private boolean isTouchExplorationEnabled() {
+    AccessibilityManager accessibilityManager =
+        getContext().getSystemService(AccessibilityManager.class);
+
+    return accessibilityManager.isTouchExplorationEnabled();
+  }
 }
diff --git a/java/com/android/dialer/historyitemactions/HistoryItemActionModule.java b/java/com/android/dialer/historyitemactions/HistoryItemActionModule.java
index d64cbca..e948924 100644
--- a/java/com/android/dialer/historyitemactions/HistoryItemActionModule.java
+++ b/java/com/android/dialer/historyitemactions/HistoryItemActionModule.java
@@ -32,6 +32,11 @@
   @DrawableRes
   int getDrawableId();
 
+  /** Returns true if tint can be applied to the drawable. */
+  default boolean tintDrawable() {
+    return true;
+  }
+
   /** @return true if the bottom sheet should close, false otherwise */
   boolean onClick();
 }
diff --git a/java/com/android/dialer/historyitemactions/HistoryItemActionModulesBuilder.java b/java/com/android/dialer/historyitemactions/HistoryItemActionModulesBuilder.java
new file mode 100644
index 0000000..917aa95
--- /dev/null
+++ b/java/com/android/dialer/historyitemactions/HistoryItemActionModulesBuilder.java
@@ -0,0 +1,552 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.dialer.historyitemactions;
+
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+import android.provider.CallLog.Calls;
+import android.provider.ContactsContract;
+import android.support.annotation.IntDef;
+import android.text.TextUtils;
+import com.android.dialer.blockreportspam.BlockReportSpamDialogInfo;
+import com.android.dialer.callintent.CallInitiationType;
+import com.android.dialer.callintent.CallIntentBuilder;
+import com.android.dialer.clipboard.ClipboardUtils;
+import com.android.dialer.common.Assert;
+import com.android.dialer.duo.Duo;
+import com.android.dialer.duo.DuoComponent;
+import com.android.dialer.logging.DialerImpression;
+import com.android.dialer.logging.ReportingLocation;
+import com.android.dialer.spam.Spam;
+import com.android.dialer.util.CallUtil;
+import com.android.dialer.util.PermissionsUtil;
+import com.android.dialer.util.UriUtils;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+
+/**
+ * Builds a list of {@link HistoryItemActionModule HistoryItemActionModules}.
+ *
+ * <p>Example usage:
+ *
+ * <pre><code>
+ *    // Create a HistoryItemActionModuleInfo proto with the information you have.
+ *    // You can simply skip a field if there is no information for it.
+ *    HistoryItemActionModuleInfo moduleInfo =
+ *        HistoryItemActionModuleInfo.newBuilder()
+ *            .setNormalizedNumber("+16502530000")
+ *            .setCountryIso("US")
+ *            .setName("Google")
+ *            .build();
+ *
+ *    // Initialize the builder using the module info above.
+ *    // Note that some modules require an activity context to work so it is preferred to pass one
+ *    // instead of an application context to the builder.
+ *    HistoryItemActionModulesBuilder modulesBuilder =
+ *        new HistoryItemActionModulesBuilder(activityContext, moduleInfo);
+ *
+ *    // Add all modules you want in the order you like.
+ *    // If a module shouldn't be added according to the module info, it won't be.
+ *    // For example, if the module info is not for a video call and doesn't indicate the presence
+ *    // of video calling capabilities, calling addModuleForVideoCall() is a no-op.
+ *    modulesBuilder
+ *        .addModuleForVoiceCall()
+ *        .addModuleForVideoCall()
+ *        .addModuleForSendingTextMessage()
+ *        .addModuleForDivider()
+ *        .addModuleForAddingToContacts()
+ *        .addModuleForBlockedOrSpamNumber()
+ *        .addModuleForCopyingNumber();
+ *
+ *    List<HistoryItemActionModule> modules = modulesBuilder.build();
+ * </code></pre>
+ */
+public final class HistoryItemActionModulesBuilder {
+
+  /** Represents events when a module is tapped by the user. */
+  @Retention(RetentionPolicy.SOURCE)
+  @IntDef({
+    Event.ADD_TO_CONTACT,
+    Event.BLOCK_NUMBER,
+    Event.BLOCK_NUMBER_AND_REPORT_SPAM,
+    Event.REPORT_NOT_SPAM,
+    Event.REQUEST_CARRIER_VIDEO_CALL,
+    Event.REQUEST_DUO_VIDEO_CALL,
+    Event.REQUEST_DUO_VIDEO_CALL_FOR_NON_CONTACT,
+    Event.SEND_TEXT_MESSAGE,
+    Event.UNBLOCK_NUMBER
+  })
+  @interface Event {
+    int ADD_TO_CONTACT = 1;
+    int BLOCK_NUMBER = 2;
+    int BLOCK_NUMBER_AND_REPORT_SPAM = 3;
+    int REPORT_NOT_SPAM = 4;
+    int REQUEST_CARRIER_VIDEO_CALL = 5;
+    int REQUEST_DUO_VIDEO_CALL = 6;
+    int REQUEST_DUO_VIDEO_CALL_FOR_NON_CONTACT = 7;
+    int SEND_TEXT_MESSAGE = 8;
+    int UNBLOCK_NUMBER = 9;
+  }
+
+  /**
+   * Maps each {@link Event} to a {@link DialerImpression.Type} to be logged when the modules are
+   * hosted by the call log.
+   */
+  private static final ImmutableMap<Integer, DialerImpression.Type> CALL_LOG_IMPRESSIONS =
+      new ImmutableMap.Builder<Integer, DialerImpression.Type>()
+          .put(Event.ADD_TO_CONTACT, DialerImpression.Type.ADD_TO_A_CONTACT_FROM_CALL_LOG)
+          .put(Event.BLOCK_NUMBER, DialerImpression.Type.CALL_LOG_BLOCK_NUMBER)
+          .put(Event.BLOCK_NUMBER_AND_REPORT_SPAM, DialerImpression.Type.CALL_LOG_BLOCK_REPORT_SPAM)
+          .put(Event.REPORT_NOT_SPAM, DialerImpression.Type.CALL_LOG_REPORT_AS_NOT_SPAM)
+          .put(
+              Event.REQUEST_CARRIER_VIDEO_CALL,
+              DialerImpression.Type.IMS_VIDEO_REQUESTED_FROM_CALL_LOG)
+          .put(
+              Event.REQUEST_DUO_VIDEO_CALL,
+              DialerImpression.Type.LIGHTBRINGER_VIDEO_REQUESTED_FROM_CALL_LOG)
+          .put(
+              Event.REQUEST_DUO_VIDEO_CALL_FOR_NON_CONTACT,
+              DialerImpression.Type.LIGHTBRINGER_NON_CONTACT_VIDEO_REQUESTED_FROM_CALL_LOG)
+          .put(Event.SEND_TEXT_MESSAGE, DialerImpression.Type.CALL_LOG_SEND_MESSAGE)
+          .put(Event.UNBLOCK_NUMBER, DialerImpression.Type.CALL_LOG_UNBLOCK_NUMBER)
+          .build();
+
+  private final Context context;
+  private final HistoryItemActionModuleInfo moduleInfo;
+  private final List<HistoryItemActionModule> modules;
+
+  public HistoryItemActionModulesBuilder(Context context, HistoryItemActionModuleInfo moduleInfo) {
+    Assert.checkArgument(
+        moduleInfo.getHost() != HistoryItemActionModuleInfo.Host.UNKNOWN,
+        "A host must be specified.");
+
+    this.context = context;
+    this.moduleInfo = moduleInfo;
+    this.modules = new ArrayList<>();
+  }
+
+  public List<HistoryItemActionModule> build() {
+    return new ArrayList<>(modules);
+  }
+
+  /**
+   * Adds a module for placing a voice call.
+   *
+   * <p>The method is a no-op if the number is blocked.
+   */
+  public HistoryItemActionModulesBuilder addModuleForVoiceCall() {
+    if (moduleInfo.getIsBlocked()) {
+      return this;
+    }
+
+    // TODO(zachh): Support post-dial digits; consider using DialerPhoneNumber.
+    // Do not set PhoneAccountHandle so that regular PreCall logic will be used. The account used to
+    // place or receive the call should be ignored for voice calls.
+    CallIntentBuilder callIntentBuilder =
+        new CallIntentBuilder(moduleInfo.getNormalizedNumber(), getCallInitiationType())
+            .setAllowAssistedDial(moduleInfo.getCanSupportAssistedDialing());
+    modules.add(IntentModule.newCallModule(context, callIntentBuilder));
+    return this;
+  }
+
+  /**
+   * Adds a module for a carrier video call *or* a Duo video call.
+   *
+   * <p>This method is a no-op if
+   *
+   * <ul>
+   *   <li>the call is one made to/received from an emergency number,
+   *   <li>the call is one made to a voicemail box,
+   *   <li>the call should be shown as spam, or
+   *   <li>the number is blocked.
+   * </ul>
+   *
+   * <p>If the provided module info is for a Duo video call and Duo is available, add a Duo video
+   * call module.
+   *
+   * <p>If the provided module info is for a Duo video call but Duo is unavailable, add a carrier
+   * video call module.
+   *
+   * <p>If the provided module info is for a carrier video call, add a carrier video call module.
+   *
+   * <p>If the provided module info is for a voice call and the device has carrier video call
+   * capability, add a carrier video call module.
+   *
+   * <p>If the provided module info is for a voice call, the device doesn't have carrier video call
+   * capability, and Duo is available, add a Duo video call module.
+   */
+  public HistoryItemActionModulesBuilder addModuleForVideoCall() {
+    if (moduleInfo.getIsEmergencyNumber()
+        || moduleInfo.getIsVoicemailCall()
+        || Spam.shouldShowAsSpam(moduleInfo.getIsSpam(), moduleInfo.getCallType())
+        || moduleInfo.getIsBlocked()) {
+      return this;
+    }
+
+    // Do not set PhoneAccountHandle so that regular PreCall logic will be used. The account used to
+    // place or receive the call should be ignored for carrier video calls.
+    // TODO(a bug): figure out the correct video call behavior
+    CallIntentBuilder callIntentBuilder =
+        new CallIntentBuilder(moduleInfo.getNormalizedNumber(), getCallInitiationType())
+            .setAllowAssistedDial(moduleInfo.getCanSupportAssistedDialing())
+            .setIsVideoCall(true);
+
+    // If the module info is for a video call, add an appropriate video call module.
+    if ((moduleInfo.getFeatures() & Calls.FEATURES_VIDEO) == Calls.FEATURES_VIDEO) {
+      boolean isDuoCall = isDuoCall();
+      modules.add(
+          IntentModule.newCallModule(
+              context,
+              callIntentBuilder.setIsDuoCall(isDuoCall),
+              isDuoCall
+                  ? getImpressionsForDuoVideoCall()
+                  : getImpressions(Event.REQUEST_CARRIER_VIDEO_CALL)));
+      return this;
+    }
+
+    // At this point, the module info is for an audio call. We will also add a video call module if
+    // the video capability is present.
+    //
+    // The carrier video call module takes precedence over the Duo module.
+    if (canPlaceCarrierVideoCall()) {
+      modules.add(
+          IntentModule.newCallModule(
+              context, callIntentBuilder, getImpressions(Event.REQUEST_CARRIER_VIDEO_CALL)));
+    } else if (canPlaceDuoCall()) {
+      modules.add(
+          IntentModule.newCallModule(
+              context, callIntentBuilder.setIsDuoCall(true), getImpressionsForDuoVideoCall()));
+    }
+    return this;
+  }
+
+  /**
+   * Returns a list of impressions to be logged when the user taps the module that attempts to
+   * initiate a Duo video call.
+   */
+  private ImmutableList<DialerImpression.Type> getImpressionsForDuoVideoCall() {
+    return isExistingContact()
+        ? getImpressions(Event.REQUEST_DUO_VIDEO_CALL)
+        : getImpressions(
+            Event.REQUEST_DUO_VIDEO_CALL, Event.REQUEST_DUO_VIDEO_CALL_FOR_NON_CONTACT);
+  }
+
+  /**
+   * Adds a module for sending text messages.
+   *
+   * <p>The method is a no-op if
+   *
+   * <ul>
+   *   <li>the permission to send SMS is not granted,
+   *   <li>the call is one made to/received from an emergency number,
+   *   <li>the call is one made to a voicemail box,
+   *   <li>the number is blocked, or
+   *   <li>the number is empty.
+   * </ul>
+   */
+  public HistoryItemActionModulesBuilder addModuleForSendingTextMessage() {
+    // TODO(zachh): There are other conditions where this module should not be shown
+    // (e.g., business numbers).
+    if (!PermissionsUtil.hasSendSmsPermissions(context)
+        || moduleInfo.getIsEmergencyNumber()
+        || moduleInfo.getIsVoicemailCall()
+        || moduleInfo.getIsBlocked()
+        || TextUtils.isEmpty(moduleInfo.getNormalizedNumber())) {
+      return this;
+    }
+
+    modules.add(
+        IntentModule.newModuleForSendingTextMessage(
+            context, moduleInfo.getNormalizedNumber(), getImpressions(Event.SEND_TEXT_MESSAGE)));
+    return this;
+  }
+
+  /**
+   * Adds a module for a divider.
+   *
+   * <p>The method is a no-op if the divider module will be the first module.
+   */
+  public HistoryItemActionModulesBuilder addModuleForDivider() {
+    if (modules.isEmpty()) {
+      return this;
+    }
+
+    modules.add(new DividerModule());
+    return this;
+  }
+
+  /**
+   * Adds a module for adding a number to Contacts.
+   *
+   * <p>The method is a no-op if
+   *
+   * <ul>
+   *   <li>the permission to write contacts is not granted,
+   *   <li>the call is one made to/received from an emergency number,
+   *   <li>the call is one made to a voicemail box,
+   *   <li>the call should be shown as spam,
+   *   <li>the number is blocked,
+   *   <li>the number is empty, or
+   *   <li>the number belongs to an existing contact.
+   * </ul>
+   */
+  public HistoryItemActionModulesBuilder addModuleForAddingToContacts() {
+    if (!PermissionsUtil.hasContactsWritePermissions(context)
+        || moduleInfo.getIsEmergencyNumber()
+        || moduleInfo.getIsVoicemailCall()
+        || Spam.shouldShowAsSpam(moduleInfo.getIsSpam(), moduleInfo.getCallType())
+        || moduleInfo.getIsBlocked()
+        || isExistingContact()
+        || TextUtils.isEmpty(moduleInfo.getNormalizedNumber())) {
+      return this;
+    }
+
+    Intent intent = new Intent(Intent.ACTION_INSERT_OR_EDIT);
+    intent.setType(ContactsContract.Contacts.CONTENT_ITEM_TYPE);
+    intent.putExtra(ContactsContract.Intents.Insert.PHONE, moduleInfo.getNormalizedNumber());
+
+    if (!TextUtils.isEmpty(moduleInfo.getName())) {
+      intent.putExtra(ContactsContract.Intents.Insert.NAME, moduleInfo.getName());
+    }
+
+    modules.add(
+        new IntentModule(
+            context,
+            intent,
+            R.string.add_to_contacts,
+            R.drawable.quantum_ic_person_add_vd_theme_24,
+            getImpressions(Event.ADD_TO_CONTACT)));
+    return this;
+  }
+
+  /**
+   * Add modules for blocking/unblocking a number and/or marking it as spam/not spam.
+   *
+   * <p>The method is a no-op if
+   *
+   * <ul>
+   *   <li>the call is one made to/received from an emergency number, or
+   *   <li>the call is one made to a voicemail box.
+   * </ul>
+   *
+   * <p>If the call should be shown as spam, add two modules:
+   *
+   * <ul>
+   *   <li>"Not spam" and "Block", or
+   *   <li>"Not spam" and "Unblock".
+   * </ul>
+   *
+   * <p>If the number is blocked but the call should not be shown as spam, add the "Unblock" module.
+   *
+   * <p>If the number is not blocked and the call should not be shown as spam, add the "Block/Report
+   * spam" module.
+   */
+  public HistoryItemActionModulesBuilder addModuleForBlockedOrSpamNumber() {
+    if (moduleInfo.getIsEmergencyNumber() || moduleInfo.getIsVoicemailCall()) {
+      return this;
+    }
+
+    BlockReportSpamDialogInfo blockReportSpamDialogInfo =
+        BlockReportSpamDialogInfo.newBuilder()
+            .setNormalizedNumber(moduleInfo.getNormalizedNumber())
+            .setCountryIso(moduleInfo.getCountryIso())
+            .setCallType(moduleInfo.getCallType())
+            .setReportingLocation(getReportingLocation())
+            .setContactSource(moduleInfo.getContactSource())
+            .build();
+
+    // For a call that should be shown as spam, add two modules:
+    // (1) "Not spam" and "Block", or
+    // (2) "Not spam" and "Unblock".
+    if (Spam.shouldShowAsSpam(moduleInfo.getIsSpam(), moduleInfo.getCallType())) {
+      modules.add(
+          BlockReportSpamModules.moduleForMarkingNumberAsNotSpam(
+              context, blockReportSpamDialogInfo, getImpression(Event.REPORT_NOT_SPAM)));
+      modules.add(
+          moduleInfo.getIsBlocked()
+              ? BlockReportSpamModules.moduleForUnblockingNumber(
+                  context, blockReportSpamDialogInfo, getImpression(Event.UNBLOCK_NUMBER))
+              : BlockReportSpamModules.moduleForBlockingNumber(
+                  context, blockReportSpamDialogInfo, getImpression(Event.BLOCK_NUMBER)));
+      return this;
+    }
+
+    // For a blocked number associated with a call that should not be shown as spam, add the
+    // "Unblock" module.
+    if (moduleInfo.getIsBlocked()) {
+      modules.add(
+          BlockReportSpamModules.moduleForUnblockingNumber(
+              context, blockReportSpamDialogInfo, getImpression(Event.UNBLOCK_NUMBER)));
+      return this;
+    }
+
+    // For a number that is not blocked and is associated with a call that should not be shown as
+    // spam, add the "Block/Report spam" module.
+    modules.add(
+        BlockReportSpamModules.moduleForBlockingNumberAndOptionallyReportingSpam(
+            context, blockReportSpamDialogInfo, getImpression(Event.BLOCK_NUMBER_AND_REPORT_SPAM)));
+    return this;
+  }
+
+  /**
+   * Adds a module for copying a number.
+   *
+   * <p>The method is a no-op if the number is empty.
+   */
+  public HistoryItemActionModulesBuilder addModuleForCopyingNumber() {
+    if (TextUtils.isEmpty(moduleInfo.getNormalizedNumber())) {
+      return this;
+    }
+
+    modules.add(
+        new HistoryItemActionModule() {
+          @Override
+          public int getStringId() {
+            return R.string.copy_number;
+          }
+
+          @Override
+          public int getDrawableId() {
+            return R.drawable.quantum_ic_content_copy_vd_theme_24;
+          }
+
+          @Override
+          public boolean onClick() {
+            ClipboardUtils.copyText(
+                context,
+                /* label = */ null,
+                moduleInfo.getNormalizedNumber(),
+                /* showToast = */ true);
+            return false;
+          }
+        });
+    return this;
+  }
+
+  private boolean canPlaceCarrierVideoCall() {
+    int carrierVideoAvailability = CallUtil.getVideoCallingAvailability(context);
+    boolean isCarrierVideoCallingEnabled =
+        ((carrierVideoAvailability & CallUtil.VIDEO_CALLING_ENABLED)
+            == CallUtil.VIDEO_CALLING_ENABLED);
+    boolean canRelyOnCarrierVideoPresence =
+        ((carrierVideoAvailability & CallUtil.VIDEO_CALLING_PRESENCE)
+            == CallUtil.VIDEO_CALLING_PRESENCE);
+
+    return isCarrierVideoCallingEnabled
+        && canRelyOnCarrierVideoPresence
+        && moduleInfo.getCanSupportCarrierVideoCall();
+  }
+
+  private boolean isDuoCall() {
+    return DuoComponent.get(context)
+        .getDuo()
+        .isDuoAccount(moduleInfo.getPhoneAccountComponentName());
+  }
+
+  private boolean canPlaceDuoCall() {
+    Duo duo = DuoComponent.get(context).getDuo();
+
+    return duo.isInstalled(context)
+        && duo.isEnabled(context)
+        && duo.isActivated(context)
+        && duo.isReachable(context, moduleInfo.getNormalizedNumber());
+  }
+
+  /**
+   * Lookup URIs are currently fetched from the cached column of the system call log. This URI
+   * contains encoded information for non-contacts for the purposes of populating contact cards.
+   *
+   * <p>We infer whether a contact is existing or not by checking if the lookup URI is "encoded" or
+   * not.
+   *
+   * <p>TODO(zachh): We should revisit this once the contact URI is no longer being read from the
+   * cached column in the system database, in case we decide not to overload the column.
+   */
+  private boolean isExistingContact() {
+    return !TextUtils.isEmpty(moduleInfo.getLookupUri())
+        && !UriUtils.isEncodedContactUri(Uri.parse(moduleInfo.getLookupUri()));
+  }
+
+  /**
+   * Maps the value of {@link HistoryItemActionModuleInfo#getHost()} to {@link
+   * CallInitiationType.Type}, which is required by {@link CallIntentBuilder} to build a call
+   * intent.
+   */
+  private CallInitiationType.Type getCallInitiationType() {
+    switch (moduleInfo.getHost()) {
+      case CALL_LOG:
+        return CallInitiationType.Type.CALL_LOG;
+      case VOICEMAIL:
+        return CallInitiationType.Type.VOICEMAIL_LOG;
+      default:
+        throw Assert.createUnsupportedOperationFailException(
+            String.format("Unsupported host: %s", moduleInfo.getHost()));
+    }
+  }
+
+  /**
+   * Maps the value of {@link HistoryItemActionModuleInfo#getHost()} to {@link
+   * ReportingLocation.Type}, which is for logging where a spam number is reported.
+   */
+  private ReportingLocation.Type getReportingLocation() {
+    switch (moduleInfo.getHost()) {
+      case CALL_LOG:
+        return ReportingLocation.Type.CALL_LOG_HISTORY;
+      case VOICEMAIL:
+        return ReportingLocation.Type.VOICEMAIL_HISTORY;
+      default:
+        throw Assert.createUnsupportedOperationFailException(
+            String.format("Unsupported host: %s", moduleInfo.getHost()));
+    }
+  }
+
+  /** Returns a list of impressions to be logged for the given {@link Event events}. */
+  private ImmutableList<DialerImpression.Type> getImpressions(@Event int... events) {
+    Assert.isNotNull(events);
+
+    ImmutableList.Builder<DialerImpression.Type> impressionListBuilder =
+        new ImmutableList.Builder<>();
+    for (@Event int event : events) {
+      getImpression(event).ifPresent(impressionListBuilder::add);
+    }
+
+    return impressionListBuilder.build();
+  }
+
+  /**
+   * Returns an impression to be logged for the given {@link Event}, or {@link Optional#empty()} if
+   * no impression is available for the event.
+   */
+  private Optional<DialerImpression.Type> getImpression(@Event int event) {
+    switch (moduleInfo.getHost()) {
+      case CALL_LOG:
+        return Optional.of(CALL_LOG_IMPRESSIONS.get(event));
+      case VOICEMAIL:
+        // TODO(a bug): Return proper impressions for voicemail.
+        return Optional.empty();
+      default:
+        throw Assert.createUnsupportedOperationFailException(
+            String.format("Unsupported host: %s", moduleInfo.getHost()));
+    }
+  }
+}
diff --git a/java/com/android/dialer/historyitemactions/HistoryItemPrimaryActionInfo.java b/java/com/android/dialer/historyitemactions/HistoryItemPrimaryActionInfo.java
deleted file mode 100644
index f4338ce..0000000
--- a/java/com/android/dialer/historyitemactions/HistoryItemPrimaryActionInfo.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.dialer.historyitemactions;
-
-import android.content.Intent;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import com.android.dialer.DialerPhoneNumber;
-import com.android.dialer.glidephotomanager.PhotoInfo;
-import com.google.auto.value.AutoValue;
-
-/**
- * Contains information necessary to construct the primary action for a history item's bottom sheet.
- *
- * <p>A history item is one that is displayed in the call log or the voicemail fragment.
- */
-@AutoValue
-public abstract class HistoryItemPrimaryActionInfo {
-
-  @Nullable
-  public abstract DialerPhoneNumber number();
-
-  @NonNull
-  public abstract PhotoInfo photoInfo();
-
-  @Nullable
-  public abstract CharSequence primaryText();
-
-  @Nullable
-  public abstract CharSequence secondaryText();
-
-  /**
-   * The intent to fire when the user clicks the top row of the bottom sheet. Null if no action
-   * should occur (e.g. if the number is unknown).
-   */
-  @Nullable
-  public abstract Intent intent();
-
-  // TODO(zachh): Add SIM info here if should be shown in bottom sheet.
-
-  /** Builder for {@link HistoryItemPrimaryActionInfo}. */
-  @AutoValue.Builder
-  public abstract static class Builder {
-    public abstract Builder setNumber(@Nullable DialerPhoneNumber dialerPhoneNumber);
-
-    public abstract Builder setPhotoInfo(@NonNull PhotoInfo photoInfo);
-
-    public abstract Builder setPrimaryText(@Nullable CharSequence primaryText);
-
-    public abstract Builder setSecondaryText(@Nullable CharSequence secondaryText);
-
-    public abstract Builder setIntent(@Nullable Intent intent);
-
-    public abstract HistoryItemPrimaryActionInfo build();
-  }
-
-  public static Builder builder() {
-    return new AutoValue_HistoryItemPrimaryActionInfo.Builder();
-  }
-}
diff --git a/java/com/android/dialer/historyitemactions/IntentModule.java b/java/com/android/dialer/historyitemactions/IntentModule.java
index dfe9bb0..f4fc678 100644
--- a/java/com/android/dialer/historyitemactions/IntentModule.java
+++ b/java/com/android/dialer/historyitemactions/IntentModule.java
@@ -19,13 +19,14 @@
 import android.content.Context;
 import android.content.Intent;
 import android.support.annotation.DrawableRes;
-import android.support.annotation.Nullable;
 import android.support.annotation.StringRes;
-import android.telecom.PhoneAccountHandle;
-import com.android.dialer.callintent.CallInitiationType.Type;
 import com.android.dialer.callintent.CallIntentBuilder;
+import com.android.dialer.logging.DialerImpression;
+import com.android.dialer.logging.Logger;
 import com.android.dialer.precall.PreCall;
 import com.android.dialer.util.DialerUtils;
+import com.android.dialer.util.IntentUtil;
+import com.google.common.collect.ImmutableList;
 
 /**
  * {@link HistoryItemActionModule} useful for making easy to build modules based on starting an
@@ -37,12 +38,28 @@
   private final Intent intent;
   private final @StringRes int text;
   private final @DrawableRes int image;
+  private final ImmutableList<DialerImpression.Type> impressions;
 
+  /**
+   * @deprecated use {@link IntentModule#IntentModule(Context, Intent, int, int, ImmutableList)}
+   *     instead.
+   */
+  @Deprecated
   public IntentModule(Context context, Intent intent, @StringRes int text, @DrawableRes int image) {
+    this(context, intent, text, image, /* impressions = */ ImmutableList.of());
+  }
+
+  IntentModule(
+      Context context,
+      Intent intent,
+      @StringRes int text,
+      @DrawableRes int image,
+      ImmutableList<DialerImpression.Type> impressions) {
     this.context = context;
     this.intent = intent;
     this.text = text;
     this.image = image;
+    this.impressions = impressions;
   }
 
   @Override
@@ -58,39 +75,53 @@
   @Override
   public boolean onClick() {
     DialerUtils.startActivityWithErrorToast(context, intent);
+    impressions.forEach(Logger.get(context)::logImpression);
     return true;
   }
 
-  public static IntentModule newCallModule(
-      Context context,
-      String number,
-      @Nullable PhoneAccountHandle phoneAccountHandle,
-      Type initiationType) {
-    // TODO(zachh): Support post-dial digits; consider using DialerPhoneNumber.
-    return new IntentModule(
-        context,
-        PreCall.getIntent(
-            context,
-            new CallIntentBuilder(number, initiationType)
-                .setPhoneAccountHandle(phoneAccountHandle)),
-        R.string.voice_call,
-        R.drawable.quantum_ic_call_white_24);
+  /** @deprecated Use {@link #newCallModule(Context, CallIntentBuilder, ImmutableList)} instead. */
+  @Deprecated
+  public static IntentModule newCallModule(Context context, CallIntentBuilder callIntentBuilder) {
+    return newCallModule(context, callIntentBuilder, /* impressions = */ ImmutableList.of());
   }
 
-  public static IntentModule newVideoCallModule(
+  /** Creates a module for starting an outgoing call with a {@link CallIntentBuilder}. */
+  static IntentModule newCallModule(
       Context context,
-      String number,
-      @Nullable PhoneAccountHandle phoneAccountHandle,
-      Type initiationType) {
-    // TODO(zachh): Support post-dial digits; consider using DialerPhoneNumber.
+      CallIntentBuilder callIntentBuilder,
+      ImmutableList<DialerImpression.Type> impressions) {
+    @StringRes int text;
+    @DrawableRes int image;
+
+    if (callIntentBuilder.isVideoCall()) {
+      text = R.string.video_call;
+      image = R.drawable.quantum_ic_videocam_vd_white_24;
+    } else {
+      text = R.string.voice_call;
+      image = R.drawable.quantum_ic_call_white_24;
+    }
+
+    return new IntentModule(
+        context, PreCall.getIntent(context, callIntentBuilder), text, image, impressions);
+  }
+
+  /**
+   * @deprecated Use {@link #newModuleForSendingTextMessage(Context, String, ImmutableList)}
+   *     instead.
+   */
+  @Deprecated
+  public static IntentModule newModuleForSendingTextMessage(Context context, String number) {
+    return newModuleForSendingTextMessage(context, number, /* impressions = */ ImmutableList.of());
+  }
+
+  /** Creates a module for sending a text message to the given number. */
+  static IntentModule newModuleForSendingTextMessage(
+      Context context, String number, ImmutableList<DialerImpression.Type> impressions) {
     return new IntentModule(
         context,
-        PreCall.getIntent(
-            context,
-            new CallIntentBuilder(number, initiationType)
-                .setPhoneAccountHandle(phoneAccountHandle)
-                .setIsVideoCall(true)),
-        R.string.video_call,
-        R.drawable.quantum_ic_videocam_white_24);
+        IntentUtil.getSendSmsIntent(number),
+        R.string.send_a_message,
+        R.drawable.quantum_ic_message_vd_theme_24,
+        impressions);
   }
 }
diff --git a/java/com/android/dialer/historyitemactions/SharedModules.java b/java/com/android/dialer/historyitemactions/SharedModules.java
deleted file mode 100644
index c046086..0000000
--- a/java/com/android/dialer/historyitemactions/SharedModules.java
+++ /dev/null
@@ -1,251 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.dialer.historyitemactions;
-
-import android.content.Context;
-import android.content.Intent;
-import android.net.Uri;
-import android.provider.ContactsContract;
-import android.support.annotation.Nullable;
-import android.text.TextUtils;
-import android.widget.Toast;
-import com.android.dialer.DialerPhoneNumber;
-import com.android.dialer.blockreportspam.BlockReportSpamDialogInfo;
-import com.android.dialer.blockreportspam.ShowBlockReportSpamDialogNotifier;
-import com.android.dialer.clipboard.ClipboardUtils;
-import com.android.dialer.util.IntentUtil;
-import com.android.dialer.util.UriUtils;
-import com.google.common.base.Optional;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
-
-/**
- * Modules for the bottom sheet that are shared between NewVoicemailFragment and NewCallLogFragment
- */
-@SuppressWarnings("Guava")
-public class SharedModules {
-
-  public static Optional<HistoryItemActionModule> createModuleForAddingToContacts(
-      Context context,
-      DialerPhoneNumber dialerPhoneNumber,
-      String name,
-      String lookupUri,
-      boolean isBlocked,
-      boolean isSpam) {
-    // Skip showing the menu item for a spam/blocked number.
-    if (isBlocked || isSpam) {
-      return Optional.absent();
-    }
-
-    // Skip showing the menu item for existing contacts.
-    if (isExistingContact(lookupUri)) {
-      return Optional.absent();
-    }
-
-    // Skip showing the menu item if there is no number.
-    String normalizedNumber = dialerPhoneNumber.getNormalizedNumber();
-    if (TextUtils.isEmpty(normalizedNumber)) {
-      return Optional.absent();
-    }
-
-    Intent intent = new Intent(Intent.ACTION_INSERT_OR_EDIT);
-    intent.setType(ContactsContract.Contacts.CONTENT_ITEM_TYPE);
-    intent.putExtra(ContactsContract.Intents.Insert.PHONE, normalizedNumber);
-
-    if (!TextUtils.isEmpty(name)) {
-      intent.putExtra(ContactsContract.Intents.Insert.NAME, name);
-    }
-
-    return Optional.of(
-        new IntentModule(
-            context,
-            intent,
-            R.string.add_to_contacts,
-            R.drawable.quantum_ic_person_add_vd_theme_24));
-  }
-
-  /**
-   * Lookup URIs are currently fetched from the cached column of the system call log. This URI
-   * contains encoded information for non-contacts for the purposes of populating contact cards.
-   *
-   * <p>We infer whether a contact is existing or not by checking if the lookup URI is "encoded" or
-   * not.
-   *
-   * <p>TODO(zachh): We should revisit this once the contact URI is no longer being read from the
-   * cached column in the system database, in case we decide not to overload the column.
-   */
-  private static boolean isExistingContact(@Nullable String lookupUri) {
-    return !TextUtils.isEmpty(lookupUri) && !UriUtils.isEncodedContactUri(Uri.parse(lookupUri));
-  }
-
-  public static Optional<HistoryItemActionModule> createModuleForSendingTextMessage(
-      Context context, String normalizedNumber, boolean isBlocked) {
-    // Don't show the option to send a text message if the number is blocked.
-    if (isBlocked) {
-      return Optional.absent();
-    }
-
-    // TODO(zachh): There are some conditions where this module should not be shown; consider
-    // voicemail, business numbers, etc.
-
-    return !TextUtils.isEmpty(normalizedNumber)
-        ? Optional.of(
-            new IntentModule(
-                context,
-                IntentUtil.getSendSmsIntent(normalizedNumber),
-                R.string.send_a_message,
-                R.drawable.quantum_ic_message_vd_theme_24))
-        : Optional.absent();
-  }
-
-  /**
-   * Create modules related to blocking/unblocking a number and/or reporting it as spam/not spam.
-   */
-  public static List<HistoryItemActionModule> createModulesHandlingBlockedOrSpamNumber(
-      Context context,
-      BlockReportSpamDialogInfo blockReportSpamDialogInfo,
-      boolean isBlocked,
-      boolean isSpam) {
-    List<HistoryItemActionModule> modules = new ArrayList<>();
-
-    // For a spam number, add two options:
-    // (1) "Not spam" and "Block", or
-    // (2) "Not spam" and "Unblock".
-    if (isSpam) {
-      modules.add(createModuleForMarkingNumberAsNonSpam(context, blockReportSpamDialogInfo));
-      modules.add(
-          createModuleForBlockingOrUnblockingNumber(context, blockReportSpamDialogInfo, isBlocked));
-      return modules;
-    }
-
-    // For a blocked non-spam number, add "Unblock" option.
-    if (isBlocked) {
-      modules.add(
-          createModuleForBlockingOrUnblockingNumber(context, blockReportSpamDialogInfo, isBlocked));
-      return modules;
-    }
-
-    // For a number that is neither a spam number nor blocked, add "Block/Report spam" option.
-    modules.add(
-        createModuleForBlockingNumberAndOptionallyReportingSpam(
-            context, blockReportSpamDialogInfo));
-    return modules;
-  }
-
-  /** Create "Not spam" module. */
-  private static HistoryItemActionModule createModuleForMarkingNumberAsNonSpam(
-      Context context, BlockReportSpamDialogInfo blockReportSpamDialogInfo) {
-    return new HistoryItemActionModule() {
-      @Override
-      public int getStringId() {
-        return R.string.not_spam;
-      }
-
-      @Override
-      public int getDrawableId() {
-        return R.drawable.quantum_ic_report_off_vd_theme_24;
-      }
-
-      @Override
-      public boolean onClick() {
-        ShowBlockReportSpamDialogNotifier.notifyShowDialogToReportNotSpam(
-            context, blockReportSpamDialogInfo);
-        return true; // Close the bottom sheet.
-      }
-    };
-  }
-
-  private static HistoryItemActionModule createModuleForBlockingOrUnblockingNumber(
-      Context context, BlockReportSpamDialogInfo blockReportSpamDialogInfo, boolean isBlocked) {
-    return new HistoryItemActionModule() {
-      @Override
-      public int getStringId() {
-        return isBlocked ? R.string.unblock_number : R.string.block_number;
-      }
-
-      @Override
-      public int getDrawableId() {
-        return isBlocked
-            ? R.drawable.ic_unblock // TODO(a bug): use a vector icon
-            : R.drawable.quantum_ic_block_vd_theme_24;
-      }
-
-      @Override
-      public boolean onClick() {
-        // TODO(a bug): implement this method.
-        Toast.makeText(
-                context,
-                String.format(
-                    Locale.ENGLISH,
-                    "TODO: " + (isBlocked ? "Unblock " : "Block ") + " number %s.",
-                    blockReportSpamDialogInfo.getNormalizedNumber()),
-                Toast.LENGTH_SHORT)
-            .show();
-        return true; // Close the bottom sheet.
-      }
-    };
-  }
-
-  /** Create "Block/Report spam" module */
-  private static HistoryItemActionModule createModuleForBlockingNumberAndOptionallyReportingSpam(
-      Context context, BlockReportSpamDialogInfo blockReportSpamDialogInfo) {
-    return new HistoryItemActionModule() {
-      @Override
-      public int getStringId() {
-        return R.string.block_and_optionally_report_spam;
-      }
-
-      @Override
-      public int getDrawableId() {
-        return R.drawable.quantum_ic_block_vd_theme_24;
-      }
-
-      @Override
-      public boolean onClick() {
-        ShowBlockReportSpamDialogNotifier.notifyShowDialogToBlockNumberAndOptionallyReportSpam(
-            context, blockReportSpamDialogInfo);
-        return true; // Close the bottom sheet.
-      }
-    };
-  }
-
-  public static Optional<HistoryItemActionModule> createModuleForCopyingNumber(
-      Context context, String normalizedNumber) {
-    if (TextUtils.isEmpty(normalizedNumber)) {
-      return Optional.absent();
-    }
-    return Optional.of(
-        new HistoryItemActionModule() {
-          @Override
-          public int getStringId() {
-            return R.string.copy_number;
-          }
-
-          @Override
-          public int getDrawableId() {
-            return R.drawable.quantum_ic_content_copy_vd_theme_24;
-          }
-
-          @Override
-          public boolean onClick() {
-            ClipboardUtils.copyText(context, null, normalizedNumber, true);
-            return false;
-          }
-        });
-  }
-}
diff --git a/java/com/android/dialer/historyitemactions/history_item_action_module_info.proto b/java/com/android/dialer/historyitemactions/history_item_action_module_info.proto
new file mode 100644
index 0000000..f7022c2
--- /dev/null
+++ b/java/com/android/dialer/historyitemactions/history_item_action_module_info.proto
@@ -0,0 +1,72 @@
+syntax = "proto2";
+
+option java_package = "com.android.dialer.historyitemactions";
+option java_multiple_files = true;
+option optimize_for = LITE_RUNTIME;
+
+
+package com.android.dialer.historyitemactions;
+
+import "java/com/android/dialer/logging/contact_source.proto";
+
+// Contains information needed to construct items (modules) in a bottom sheet.
+// Next ID: 17
+message HistoryItemActionModuleInfo {
+  // The dialer-normalized version of a phone number.
+  // See DialerPhoneNumber.normalized_number.
+  optional string normalized_number = 1;
+
+  // The ISO 3166-1 two letters country code of the number.
+  optional string country_iso = 2;
+
+  // The name associated with the number.
+  optional string name = 3;
+
+  // The type of the call.
+  // See android.provider.CallLog.Calls.TYPE.
+  optional int32 call_type = 4;
+
+  // Bit-mask describing features of the call.
+  // See android.provider.CallLog.Calls.FEATURES.
+  optional int32 features = 5;
+
+  // The Contacts Provider lookup URI for the contact associated with the
+  // number.
+  optional string lookup_uri = 6;
+
+  // The component name of the account used to place or receive the call.
+  // See android.provider.CallLog.Calls.PHONE_ACCOUNT_COMPONENT_NAME.
+  optional string phone_account_component_name = 7;
+
+  // Whether the number can be reported as invalid through People API
+  optional bool can_report_as_invalid_number = 8;
+
+  // Whether assisted dialing is supported.
+  optional bool can_support_assisted_dialing = 9;
+
+  // Whether carrier video call is supported.
+  optional bool can_support_carrier_video_call = 10;
+
+  // Whether the number is blocked.
+  optional bool is_blocked = 11;
+
+  // Whether the number is spam.
+  optional bool is_spam = 12;
+
+  // Whether the call is to the voicemail inbox.
+  optional bool is_voicemail_call = 13;
+
+  // The source of the contact if there is one associated with the number.
+  optional com.android.dialer.logging.ContactSource.Type contact_source = 14;
+
+  // Places that can host items (modules) in a bottom sheet
+  enum Host {
+    UNKNOWN = 0;
+    CALL_LOG = 1;
+    VOICEMAIL = 2;
+  }
+  optional Host host = 15;
+
+  // Whether the number is an emergency number.
+  optional bool is_emergency_number = 16;
+}
diff --git a/java/com/android/dialer/historyitemactions/history_item_bottom_sheet_header_info.proto b/java/com/android/dialer/historyitemactions/history_item_bottom_sheet_header_info.proto
new file mode 100644
index 0000000..04d9f22
--- /dev/null
+++ b/java/com/android/dialer/historyitemactions/history_item_bottom_sheet_header_info.proto
@@ -0,0 +1,39 @@
+syntax = "proto2";
+
+option java_package = "com.android.dialer.historyitemactions";
+option java_multiple_files = true;
+option optimize_for = LITE_RUNTIME;
+
+
+package com.android.dialer.historyitemactions;
+
+import "java/com/android/dialer/glidephotomanager/photo_info.proto";
+import "java/com/android/dialer/phonenumberproto/dialer_phone_number.proto";
+
+// Contains information necessary to construct the header for a history item's
+// bottom sheet.
+//
+// A history item is one that is displayed in the call log or the voicemail
+// fragment.
+//
+// Next ID: 5
+message HistoryItemBottomSheetHeaderInfo {
+  // The phone number associated with the item.
+  optional com.android.dialer.DialerPhoneNumber number = 1;
+
+  // Information used to load the contact photo.
+  optional com.android.dialer.glidephotomanager.PhotoInfo photo_info = 2;
+
+  // Primary text of the header, which can be
+  // (1) a presentation name (e.g., "Restricted", "Unknown", etc.),
+  // (2) the contact name, or
+  // (3) the formatted number.
+  optional string primary_text = 3;
+
+  // Secondary test of the header, which describes the number.
+  // Some examples are:
+  //   "Mobile • 555-1234",
+  //   "Blocked • Mobile • 555-1234", and
+  //   "Spam • Mobile • 555-1234".
+  optional string secondary_text = 4;
+}
diff --git a/java/com/android/dialer/historyitemactions/res/drawable-xxxhdpi/ic_unblock.png b/java/com/android/dialer/historyitemactions/res/drawable-xxxhdpi/ic_unblock.png
deleted file mode 100644
index 01551e2..0000000
--- a/java/com/android/dialer/historyitemactions/res/drawable-xxxhdpi/ic_unblock.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/dialer/historyitemactions/res/layout/contact_layout.xml b/java/com/android/dialer/historyitemactions/res/layout/contact_layout.xml
index 4deef3e..247ca0b 100644
--- a/java/com/android/dialer/historyitemactions/res/layout/contact_layout.xml
+++ b/java/com/android/dialer/historyitemactions/res/layout/contact_layout.xml
@@ -15,22 +15,23 @@
  ~ limitations under the License
  -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/contact_layout_root"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:layout_marginTop="8dp"
-    android:layout_marginBottom="12dp"
-    android:layout_marginEnd="8dp"
+    android:paddingTop="12dp"
+    android:paddingBottom="12dp"
+    android:paddingStart="8dp"
+    android:paddingEnd="8dp"
     android:gravity="center_vertical"
-    android:orientation="horizontal">
+    android:orientation="horizontal"
+    android:background="#FFFFFF"
+    android:focusable="true">
 
-  <QuickContactBadge
-      android:id="@+id/quick_contact_photo"
-      android:layout_width="@dimen/contact_actions_image_size"
-      android:layout_height="@dimen/contact_actions_image_size"
-      android:layout_marginStart="@dimen/contact_actions_image_margin"
-      android:layout_marginEnd="@dimen/contact_actions_image_margin"
-      android:padding="4dp"
-      android:focusable="true"/>
+  <com.android.dialer.widget.ContactPhotoView
+      android:id="@+id/contact_photo_view"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_marginEnd="8dp"/>
 
   <LinearLayout
       android:layout_width="wrap_content"
@@ -38,15 +39,15 @@
       android:gravity="center_vertical"
       android:orientation="vertical">
 
-    <TextView
+    <com.android.dialer.widget.BidiTextView
         android:id="@+id/primary_text"
-        style="@style/PrimaryText"
+        style="@style/Dialer.TextAppearance.Primary.Ellipsize"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"/>
 
-    <TextView
+    <com.android.dialer.widget.BidiTextView
         android:id="@+id/secondary_text"
-        style="@style/SecondaryText"
+        style="@style/Dialer.TextAppearance.Secondary.Ellipsize"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="2dp"/>
diff --git a/java/com/android/dialer/historyitemactions/res/layout/module_layout.xml b/java/com/android/dialer/historyitemactions/res/layout/module_layout.xml
index 9aee679..ec8cc4e 100644
--- a/java/com/android/dialer/historyitemactions/res/layout/module_layout.xml
+++ b/java/com/android/dialer/historyitemactions/res/layout/module_layout.xml
@@ -22,13 +22,14 @@
     android:layout_height="wrap_content"
     android:background="?android:attr/selectableItemBackground">
 
+  <!-- The icon is not important for a11y as it is not clickable. -->
   <ImageView
       android:id="@+id/module_image"
       android:layout_width="@dimen/contact_actions_image_size"
       android:layout_height="@dimen/contact_actions_image_size"
       android:layout_marginStart="@dimen/contact_actions_image_margin"
       android:layout_marginEnd="@dimen/contact_actions_image_margin"
-      android:tint="@color/dialer_secondary_text_color"
+      android:importantForAccessibility="no"
       android:scaleType="center"/>
 
   <TextView
@@ -36,5 +37,5 @@
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_gravity="center_vertical"
-      style="@style/PrimaryText"/>
+      style="@style/Dialer.TextAppearance.Primary.Ellipsize"/>
 </LinearLayout>
\ No newline at end of file
diff --git a/java/com/android/dialer/historyitemactions/res/layout/sheet_layout.xml b/java/com/android/dialer/historyitemactions/res/layout/sheet_layout.xml
index 6984367..006302e 100644
--- a/java/com/android/dialer/historyitemactions/res/layout/sheet_layout.xml
+++ b/java/com/android/dialer/historyitemactions/res/layout/sheet_layout.xml
@@ -16,9 +16,24 @@
  -->
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/action_container"
+    android:id="@+id/history_item_actions_bottom_sheet_root"
     android:orientation="vertical"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:paddingTop="4dp"
-    android:paddingBottom="8dp"/>
+    android:layout_height="match_parent">
+
+  <include layout="@layout/contact_layout"/>
+
+  <android.support.v4.widget.NestedScrollView
+      android:id="@+id/history_actions_scroll_view"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content">
+
+      <LinearLayout
+          android:id="@+id/action_container"
+          android:orientation="vertical"
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+          android:paddingBottom="4dp"
+          android:clipToPadding="false"/>
+  </android.support.v4.widget.NestedScrollView>
+</LinearLayout>
diff --git a/java/com/android/dialer/historyitemactions/res/values-af/strings.xml b/java/com/android/dialer/historyitemactions/res/values-af/strings.xml
new file mode 100644
index 0000000..7cafbd4
--- /dev/null
+++ b/java/com/android/dialer/historyitemactions/res/values-af/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="voice_call">Stemoproep</string>
+  <string name="video_call">Video-oproep</string>
+  <string name="add_to_contacts">Voeg kontak by</string>
+  <string name="send_a_message">SMS</string>
+  <string name="not_spam">Nie strooipos nie</string>
+  <string name="block_number">Blokkeer</string>
+  <string name="unblock_number">Deblokkeer</string>
+  <string name="block_and_optionally_report_spam">Blokkeer/Gee strooipos aan</string>
+  <string name="copy_number">Kopieer nommer</string>
+</resources>
diff --git a/java/com/android/dialer/historyitemactions/res/values-am/strings.xml b/java/com/android/dialer/historyitemactions/res/values-am/strings.xml
new file mode 100644
index 0000000..4254c98
--- /dev/null
+++ b/java/com/android/dialer/historyitemactions/res/values-am/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="voice_call">የድምጽ ጥሪ</string>
+  <string name="video_call">የቪዲዮ ጥሪ</string>
+  <string name="add_to_contacts">እውቂያ ያክሉ</string>
+  <string name="send_a_message">መልዕክት</string>
+  <string name="not_spam">አይፈለጌ መልዕክት አይደለም</string>
+  <string name="block_number">አግድ</string>
+  <string name="unblock_number">እገዳውን አንሳ</string>
+  <string name="block_and_optionally_report_spam">አይፈለጌ መልዕክትን አግድ/ሪፖርት አድርግ</string>
+  <string name="copy_number">ቁጥር ቅዳ</string>
+</resources>
diff --git a/java/com/android/dialer/historyitemactions/res/values-ar/strings.xml b/java/com/android/dialer/historyitemactions/res/values-ar/strings.xml
new file mode 100644
index 0000000..1abdea1
--- /dev/null
+++ b/java/com/android/dialer/historyitemactions/res/values-ar/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="voice_call">مكالمة صوتية</string>
+  <string name="video_call">مكالمة فيديو</string>
+  <string name="add_to_contacts">إضافة جهة اتصال</string>
+  <string name="send_a_message">رسالة</string>
+  <string name="not_spam">ليست محادثة غير مرغوب فيها.</string>
+  <string name="block_number">حظر</string>
+  <string name="unblock_number">إزالة الحظر</string>
+  <string name="block_and_optionally_report_spam">حظر/إبلاغ عن رقم غير مرغوب فيه</string>
+  <string name="copy_number">نسخ الرقم</string>
+</resources>
diff --git a/java/com/android/dialer/historyitemactions/res/values-az/strings.xml b/java/com/android/dialer/historyitemactions/res/values-az/strings.xml
new file mode 100644
index 0000000..d0faffb
--- /dev/null
+++ b/java/com/android/dialer/historyitemactions/res/values-az/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="voice_call">Səsli zəng</string>
+  <string name="video_call">Video zəng</string>
+  <string name="add_to_contacts">Kontakt əlavə edin</string>
+  <string name="send_a_message">Mesaj</string>
+  <string name="not_spam">Spam deyil</string>
+  <string name="block_number">Blok edin</string>
+  <string name="unblock_number">Blokdan çıxarın</string>
+  <string name="block_and_optionally_report_spam">Spamı blok edin və ya bildirin</string>
+  <string name="copy_number">Nömrəni kopyalayın</string>
+</resources>
diff --git a/java/com/android/dialer/historyitemactions/res/values-b+sr+Latn/strings.xml b/java/com/android/dialer/historyitemactions/res/values-b+sr+Latn/strings.xml
new file mode 100644
index 0000000..4733266
--- /dev/null
+++ b/java/com/android/dialer/historyitemactions/res/values-b+sr+Latn/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="voice_call">Uputi audio poziv</string>
+  <string name="video_call">Uputi video poziv</string>
+  <string name="add_to_contacts">Dodaj</string>
+  <string name="send_a_message">Pošalji SMS</string>
+  <string name="not_spam">Nije nepoželjan</string>
+  <string name="block_number">Blokiraj</string>
+  <string name="unblock_number">Deblokiraj</string>
+  <string name="block_and_optionally_report_spam">Blokiraj/prijavi kao nepoželjan</string>
+  <string name="copy_number">Kopiraj broj</string>
+</resources>
diff --git a/java/com/android/dialer/historyitemactions/res/values-be/strings.xml b/java/com/android/dialer/historyitemactions/res/values-be/strings.xml
new file mode 100644
index 0000000..9c1f3b6
--- /dev/null
+++ b/java/com/android/dialer/historyitemactions/res/values-be/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="voice_call">Галасавы выклік</string>
+  <string name="video_call">Відэавыклік</string>
+  <string name="add_to_contacts">Дадаць у кантакты</string>
+  <string name="send_a_message">Паведамленне</string>
+  <string name="not_spam">Не спам</string>
+  <string name="block_number">Заблакіраваць</string>
+  <string name="unblock_number">Разблакіраваць</string>
+  <string name="block_and_optionally_report_spam">Заблак. ці паведаміць пра спам</string>
+  <string name="copy_number">Капіраваць нумар</string>
+</resources>
diff --git a/java/com/android/dialer/historyitemactions/res/values-bg/strings.xml b/java/com/android/dialer/historyitemactions/res/values-bg/strings.xml
new file mode 100644
index 0000000..9548c39
--- /dev/null
+++ b/java/com/android/dialer/historyitemactions/res/values-bg/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="voice_call">Обаждане</string>
+  <string name="video_call">Видеообаждане</string>
+  <string name="add_to_contacts">Добавяне на контакт</string>
+  <string name="send_a_message">Съобщение</string>
+  <string name="not_spam">Не е спам</string>
+  <string name="block_number">Блокиране</string>
+  <string name="unblock_number">Отблокиране</string>
+  <string name="block_and_optionally_report_spam">Блокиране/сигнал за спам</string>
+  <string name="copy_number">Копиране на номера</string>
+</resources>
diff --git a/java/com/android/dialer/historyitemactions/res/values-bn/strings.xml b/java/com/android/dialer/historyitemactions/res/values-bn/strings.xml
new file mode 100644
index 0000000..b648684
--- /dev/null
+++ b/java/com/android/dialer/historyitemactions/res/values-bn/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="voice_call">ভয়েস কল</string>
+  <string name="video_call">ভিডিও কল</string>
+  <string name="add_to_contacts">পরিচিতি যোগ করুন</string>
+  <string name="send_a_message">মেসেজ</string>
+  <string name="not_spam">স্প্যাম নয়</string>
+  <string name="block_number">ব্লক করুন</string>
+  <string name="unblock_number">আনব্লক করুন</string>
+  <string name="block_and_optionally_report_spam">ব্লক করুন/স্প্যাম অভিযোগ করুন</string>
+  <string name="copy_number">নম্বর কপি করুন</string>
+</resources>
diff --git a/java/com/android/dialer/historyitemactions/res/values-bs/strings.xml b/java/com/android/dialer/historyitemactions/res/values-bs/strings.xml
new file mode 100644
index 0000000..ba00485
--- /dev/null
+++ b/java/com/android/dialer/historyitemactions/res/values-bs/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="voice_call">Glasovni poziv</string>
+  <string name="video_call">Video poziv</string>
+  <string name="add_to_contacts">Dodaj kontakt</string>
+  <string name="send_a_message">Poruka</string>
+  <string name="not_spam">Nije neželjeno</string>
+  <string name="block_number">Blokiraj</string>
+  <string name="unblock_number">Odblokiraj</string>
+  <string name="block_and_optionally_report_spam">Blokiraj/prijavi než. sadržaj</string>
+  <string name="copy_number">Kopiraj broj</string>
+</resources>
diff --git a/java/com/android/dialer/historyitemactions/res/values-ca/strings.xml b/java/com/android/dialer/historyitemactions/res/values-ca/strings.xml
new file mode 100644
index 0000000..32d4dde
--- /dev/null
+++ b/java/com/android/dialer/historyitemactions/res/values-ca/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="voice_call">Fes una trucada de veu</string>
+  <string name="video_call">Fes una videotrucada</string>
+  <string name="add_to_contacts">Afegeix el contacte</string>
+  <string name="send_a_message">Envia un missatge de text</string>
+  <string name="not_spam">No és brossa</string>
+  <string name="block_number">Bloqueja</string>
+  <string name="unblock_number">Desbloqueja</string>
+  <string name="block_and_optionally_report_spam">Bloqueja o marca com a brossa</string>
+  <string name="copy_number">Copia el número</string>
+</resources>
diff --git a/java/com/android/dialer/historyitemactions/res/values-cs/strings.xml b/java/com/android/dialer/historyitemactions/res/values-cs/strings.xml
new file mode 100644
index 0000000..cdf5bca
--- /dev/null
+++ b/java/com/android/dialer/historyitemactions/res/values-cs/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="voice_call">Hovor</string>
+  <string name="video_call">Videohovor</string>
+  <string name="add_to_contacts">Přidat kontakt</string>
+  <string name="send_a_message">Zpráva</string>
+  <string name="not_spam">Nešlo o spam</string>
+  <string name="block_number">Blokovat</string>
+  <string name="unblock_number">Odblokovat</string>
+  <string name="block_and_optionally_report_spam">Zablokovat / nahlásit spam</string>
+  <string name="copy_number">Kopírovat číslo</string>
+</resources>
diff --git a/java/com/android/dialer/historyitemactions/res/values-da/strings.xml b/java/com/android/dialer/historyitemactions/res/values-da/strings.xml
new file mode 100644
index 0000000..6cecc79
--- /dev/null
+++ b/java/com/android/dialer/historyitemactions/res/values-da/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="voice_call">Foretag et taleopkald</string>
+  <string name="video_call">Foretag et videoopkald</string>
+  <string name="add_to_contacts">Tilføj kontaktperson</string>
+  <string name="send_a_message">Sms-besked</string>
+  <string name="not_spam">Ikke spam</string>
+  <string name="block_number">Bloker</string>
+  <string name="unblock_number">Fjern blokering</string>
+  <string name="block_and_optionally_report_spam">Bloker/rapportér spam</string>
+  <string name="copy_number">Kopiér nummer</string>
+</resources>
diff --git a/java/com/android/dialer/historyitemactions/res/values-de/strings.xml b/java/com/android/dialer/historyitemactions/res/values-de/strings.xml
new file mode 100644
index 0000000..69c2312
--- /dev/null
+++ b/java/com/android/dialer/historyitemactions/res/values-de/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="voice_call">Sprachanruf</string>
+  <string name="video_call">Videoanruf</string>
+  <string name="add_to_contacts">Als Kontakt hinzufügen</string>
+  <string name="send_a_message">Nachricht</string>
+  <string name="not_spam">Kein Spam</string>
+  <string name="block_number">Blockieren</string>
+  <string name="unblock_number">Blockierung aufheben</string>
+  <string name="block_and_optionally_report_spam">Blockieren/Spam melden</string>
+  <string name="copy_number">Nummer kopieren</string>
+</resources>
diff --git a/java/com/android/dialer/historyitemactions/res/values-el/strings.xml b/java/com/android/dialer/historyitemactions/res/values-el/strings.xml
new file mode 100644
index 0000000..2c6f099
--- /dev/null
+++ b/java/com/android/dialer/historyitemactions/res/values-el/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="voice_call">Φωνητική κλήση</string>
+  <string name="video_call">Βιντεοκλήση</string>
+  <string name="add_to_contacts">Προσθήκη επαφής</string>
+  <string name="send_a_message">Μήνυμα</string>
+  <string name="not_spam">Μη ανεπιθύμητη</string>
+  <string name="block_number">Αποκλεισμός</string>
+  <string name="unblock_number">Κατάργηση αποκλεισμού</string>
+  <string name="block_and_optionally_report_spam">Αποκλεισμός/αναφορά ανεπιθύμ.</string>
+  <string name="copy_number">Αντιγραφή αριθμού</string>
+</resources>
diff --git a/java/com/android/dialer/historyitemactions/res/values-en-rAU/strings.xml b/java/com/android/dialer/historyitemactions/res/values-en-rAU/strings.xml
new file mode 100644
index 0000000..5ce603b
--- /dev/null
+++ b/java/com/android/dialer/historyitemactions/res/values-en-rAU/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="voice_call">Voice call</string>
+  <string name="video_call">Video call</string>
+  <string name="add_to_contacts">Add contact</string>
+  <string name="send_a_message">Message</string>
+  <string name="not_spam">Not spam</string>
+  <string name="block_number">Block</string>
+  <string name="unblock_number">Unblock</string>
+  <string name="block_and_optionally_report_spam">Block/Report spam</string>
+  <string name="copy_number">Copy number</string>
+</resources>
diff --git a/java/com/android/dialer/historyitemactions/res/values-en-rGB/strings.xml b/java/com/android/dialer/historyitemactions/res/values-en-rGB/strings.xml
new file mode 100644
index 0000000..5ce603b
--- /dev/null
+++ b/java/com/android/dialer/historyitemactions/res/values-en-rGB/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="voice_call">Voice call</string>
+  <string name="video_call">Video call</string>
+  <string name="add_to_contacts">Add contact</string>
+  <string name="send_a_message">Message</string>
+  <string name="not_spam">Not spam</string>
+  <string name="block_number">Block</string>
+  <string name="unblock_number">Unblock</string>
+  <string name="block_and_optionally_report_spam">Block/Report spam</string>
+  <string name="copy_number">Copy number</string>
+</resources>
diff --git a/java/com/android/dialer/historyitemactions/res/values-en-rIN/strings.xml b/java/com/android/dialer/historyitemactions/res/values-en-rIN/strings.xml
new file mode 100644
index 0000000..5ce603b
--- /dev/null
+++ b/java/com/android/dialer/historyitemactions/res/values-en-rIN/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="voice_call">Voice call</string>
+  <string name="video_call">Video call</string>
+  <string name="add_to_contacts">Add contact</string>
+  <string name="send_a_message">Message</string>
+  <string name="not_spam">Not spam</string>
+  <string name="block_number">Block</string>
+  <string name="unblock_number">Unblock</string>
+  <string name="block_and_optionally_report_spam">Block/Report spam</string>
+  <string name="copy_number">Copy number</string>
+</resources>
diff --git a/java/com/android/dialer/historyitemactions/res/values-es-rUS/strings.xml b/java/com/android/dialer/historyitemactions/res/values-es-rUS/strings.xml
new file mode 100644
index 0000000..8c3f69a
--- /dev/null
+++ b/java/com/android/dialer/historyitemactions/res/values-es-rUS/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="voice_call">Llamada de voz</string>
+  <string name="video_call">Videollamada</string>
+  <string name="add_to_contacts">Agregar contacto</string>
+  <string name="send_a_message">Enviar un mensaje</string>
+  <string name="not_spam">No es spam</string>
+  <string name="block_number">Bloquear</string>
+  <string name="unblock_number">Desbloquear</string>
+  <string name="block_and_optionally_report_spam">Bloquear/marcar como spam</string>
+  <string name="copy_number">Copiar número</string>
+</resources>
diff --git a/java/com/android/dialer/historyitemactions/res/values-es/strings.xml b/java/com/android/dialer/historyitemactions/res/values-es/strings.xml
new file mode 100644
index 0000000..09f1ab2
--- /dev/null
+++ b/java/com/android/dialer/historyitemactions/res/values-es/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="voice_call">Llamada de voz</string>
+  <string name="video_call">Videollamada</string>
+  <string name="add_to_contacts">Añadir contacto</string>
+  <string name="send_a_message">Mensaje</string>
+  <string name="not_spam">No es spam</string>
+  <string name="block_number">Bloquear</string>
+  <string name="unblock_number">Desbloquear</string>
+  <string name="block_and_optionally_report_spam">Bloquear/Marcar como spam</string>
+  <string name="copy_number">Copiar número</string>
+</resources>
diff --git a/java/com/android/dialer/historyitemactions/res/values-et/strings.xml b/java/com/android/dialer/historyitemactions/res/values-et/strings.xml
new file mode 100644
index 0000000..3ca9fcb
--- /dev/null
+++ b/java/com/android/dialer/historyitemactions/res/values-et/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="voice_call">Häälkõne</string>
+  <string name="video_call">Videokõne</string>
+  <string name="add_to_contacts">Lisa kontakt</string>
+  <string name="send_a_message">Sõnum</string>
+  <string name="not_spam">Pole rämpskõne</string>
+  <string name="block_number">Blokeeri</string>
+  <string name="unblock_number">Deblokeeri</string>
+  <string name="block_and_optionally_report_spam">Blokeeri / teavita rämpskõnest</string>
+  <string name="copy_number">Kopeeri number</string>
+</resources>
diff --git a/java/com/android/dialer/historyitemactions/res/values-eu/strings.xml b/java/com/android/dialer/historyitemactions/res/values-eu/strings.xml
new file mode 100644
index 0000000..64bb784
--- /dev/null
+++ b/java/com/android/dialer/historyitemactions/res/values-eu/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="voice_call">Ahots-deia</string>
+  <string name="video_call">Bideo-deia</string>
+  <string name="add_to_contacts">Gehitu kontaktua</string>
+  <string name="send_a_message">Mezua</string>
+  <string name="not_spam">Ez da spama</string>
+  <string name="block_number">Blokeatu</string>
+  <string name="unblock_number">Desblokeatu</string>
+  <string name="block_and_optionally_report_spam">Blokeatu edo salatu spama dela</string>
+  <string name="copy_number">Kopiatu zenbakia</string>
+</resources>
diff --git a/java/com/android/dialer/historyitemactions/res/values-fa/strings.xml b/java/com/android/dialer/historyitemactions/res/values-fa/strings.xml
new file mode 100644
index 0000000..b2bb17a
--- /dev/null
+++ b/java/com/android/dialer/historyitemactions/res/values-fa/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="voice_call">تماس صوتی</string>
+  <string name="video_call">تماس ویدیویی</string>
+  <string name="add_to_contacts">افزودن مخاطب</string>
+  <string name="send_a_message">پیام</string>
+  <string name="not_spam">هرزنامه نیست</string>
+  <string name="block_number">مسدود کردن</string>
+  <string name="unblock_number">لغو انسداد</string>
+  <string name="block_and_optionally_report_spam">مسدود کردن/گزارش هرزنامه</string>
+  <string name="copy_number">کپی کردن شماره</string>
+</resources>
diff --git a/java/com/android/dialer/historyitemactions/res/values-fi/strings.xml b/java/com/android/dialer/historyitemactions/res/values-fi/strings.xml
new file mode 100644
index 0000000..5e62609
--- /dev/null
+++ b/java/com/android/dialer/historyitemactions/res/values-fi/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="voice_call">Puhelu</string>
+  <string name="video_call">Videopuhelu</string>
+  <string name="add_to_contacts">Lisää yhteystieto</string>
+  <string name="send_a_message">Viesti</string>
+  <string name="not_spam">Ei häirikkösoittaja</string>
+  <string name="block_number">Estä</string>
+  <string name="unblock_number">Kumoa esto</string>
+  <string name="block_and_optionally_report_spam">Estä/ilmoita</string>
+  <string name="copy_number">Kopioi numero</string>
+</resources>
diff --git a/java/com/android/dialer/historyitemactions/res/values-fr-rCA/strings.xml b/java/com/android/dialer/historyitemactions/res/values-fr-rCA/strings.xml
new file mode 100644
index 0000000..d7b90a8
--- /dev/null
+++ b/java/com/android/dialer/historyitemactions/res/values-fr-rCA/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="voice_call">Faire un appel vocal</string>
+  <string name="video_call">Faire un appel vidéo</string>
+  <string name="add_to_contacts">Ajouter un contact</string>
+  <string name="send_a_message">Envoyer un message texte</string>
+  <string name="not_spam">Marquer comme non importun</string>
+  <string name="block_number">Bloquer</string>
+  <string name="unblock_number">Débloquer</string>
+  <string name="block_and_optionally_report_spam">Bloquer/Signaler comme importun</string>
+  <string name="copy_number">Copier le numéro</string>
+</resources>
diff --git a/java/com/android/dialer/historyitemactions/res/values-fr/strings.xml b/java/com/android/dialer/historyitemactions/res/values-fr/strings.xml
new file mode 100644
index 0000000..204af78
--- /dev/null
+++ b/java/com/android/dialer/historyitemactions/res/values-fr/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="voice_call">Appel vocal</string>
+  <string name="video_call">Appel vidéo</string>
+  <string name="add_to_contacts">Ajouter aux infos d\'un contact</string>
+  <string name="send_a_message">Message</string>
+  <string name="not_spam">Fiable</string>
+  <string name="block_number">Bloquer</string>
+  <string name="unblock_number">Débloquer</string>
+  <string name="block_and_optionally_report_spam">Bloquer/Signaler</string>
+  <string name="copy_number">Copier le numéro</string>
+</resources>
diff --git a/java/com/android/dialer/historyitemactions/res/values-gl/strings.xml b/java/com/android/dialer/historyitemactions/res/values-gl/strings.xml
new file mode 100644
index 0000000..3ec21ca
--- /dev/null
+++ b/java/com/android/dialer/historyitemactions/res/values-gl/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="voice_call">Chamada de voz</string>
+  <string name="video_call">Videochamada</string>
+  <string name="add_to_contacts">Engadir contacto</string>
+  <string name="send_a_message">Mensaxe</string>
+  <string name="not_spam">Non é spam</string>
+  <string name="block_number">Bloquear</string>
+  <string name="unblock_number">Desbloquear</string>
+  <string name="block_and_optionally_report_spam">Bloquear ou informar de spam</string>
+  <string name="copy_number">Copiar número</string>
+</resources>
diff --git a/java/com/android/dialer/historyitemactions/res/values-gu/strings.xml b/java/com/android/dialer/historyitemactions/res/values-gu/strings.xml
new file mode 100644
index 0000000..5c8f952
--- /dev/null
+++ b/java/com/android/dialer/historyitemactions/res/values-gu/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="voice_call">વૉઇસ કૉલ કરો</string>
+  <string name="video_call">વીડિઓ કૉલ કરો</string>
+  <string name="add_to_contacts">સંપર્ક ઉમેરો</string>
+  <string name="send_a_message">સંદેશ</string>
+  <string name="not_spam">સ્પામ નથી</string>
+  <string name="block_number">બ્લૉક કરો</string>
+  <string name="unblock_number">અનબ્લૉક કરો</string>
+  <string name="block_and_optionally_report_spam">બ્લૉક કરો/સ્પામની જાણ કરો</string>
+  <string name="copy_number">નંબર કૉપિ કરો</string>
+</resources>
diff --git a/java/com/android/dialer/historyitemactions/res/values-hi/strings.xml b/java/com/android/dialer/historyitemactions/res/values-hi/strings.xml
new file mode 100644
index 0000000..6c63d87
--- /dev/null
+++ b/java/com/android/dialer/historyitemactions/res/values-hi/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="voice_call">वॉइस कॉल करें</string>
+  <string name="video_call">वीडियो कॉल करें</string>
+  <string name="add_to_contacts">संपर्क जोड़ें</string>
+  <string name="send_a_message">मैसेज</string>
+  <string name="not_spam">स्पैम नहीं</string>
+  <string name="block_number">रोक लगाएं</string>
+  <string name="unblock_number">रोक हटाएं</string>
+  <string name="block_and_optionally_report_spam">रोक लगाएं/स्पैम रिपोर्ट करें</string>
+  <string name="copy_number">नंबर कॉपी करें</string>
+</resources>
diff --git a/java/com/android/dialer/historyitemactions/res/values-hr/strings.xml b/java/com/android/dialer/historyitemactions/res/values-hr/strings.xml
new file mode 100644
index 0000000..1029f5f
--- /dev/null
+++ b/java/com/android/dialer/historyitemactions/res/values-hr/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="voice_call">Glasovni poziv</string>
+  <string name="video_call">Videopoziv</string>
+  <string name="add_to_contacts">Dodavanje kontakta</string>
+  <string name="send_a_message">Poruka</string>
+  <string name="not_spam">Nije neželjeni broj</string>
+  <string name="block_number">Blokiranje</string>
+  <string name="unblock_number">Deblokiranje</string>
+  <string name="block_and_optionally_report_spam">Blokiranje/prijava neželjenog broja</string>
+  <string name="copy_number">Kopiranje broja</string>
+</resources>
diff --git a/java/com/android/dialer/historyitemactions/res/values-hu/strings.xml b/java/com/android/dialer/historyitemactions/res/values-hu/strings.xml
new file mode 100644
index 0000000..1c54b22
--- /dev/null
+++ b/java/com/android/dialer/historyitemactions/res/values-hu/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="voice_call">Hanghívás</string>
+  <string name="video_call">Videohívás</string>
+  <string name="add_to_contacts">Névjegy felvétele</string>
+  <string name="send_a_message">Üzenetküldés</string>
+  <string name="not_spam">Nem spam</string>
+  <string name="block_number">Letiltás</string>
+  <string name="unblock_number">Letiltás feloldása</string>
+  <string name="block_and_optionally_report_spam">Letiltás/spam bejelentése</string>
+  <string name="copy_number">Szám másolása</string>
+</resources>
diff --git a/java/com/android/dialer/historyitemactions/res/values-hy/strings.xml b/java/com/android/dialer/historyitemactions/res/values-hy/strings.xml
new file mode 100644
index 0000000..8671b44
--- /dev/null
+++ b/java/com/android/dialer/historyitemactions/res/values-hy/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="voice_call">Զանգ</string>
+  <string name="video_call">Տեսազանգ</string>
+  <string name="add_to_contacts">Ավելացնել կոնտակտ</string>
+  <string name="send_a_message">SMS գրել</string>
+  <string name="not_spam">Սպամ չէ</string>
+  <string name="block_number">Արգելափակել</string>
+  <string name="unblock_number">Արգելաբացել</string>
+  <string name="block_and_optionally_report_spam">Արգելափակել/նշել որպես սպամ</string>
+  <string name="copy_number">Պատճենել համարը</string>
+</resources>
diff --git a/java/com/android/dialer/historyitemactions/res/values-in/strings.xml b/java/com/android/dialer/historyitemactions/res/values-in/strings.xml
new file mode 100644
index 0000000..900a586
--- /dev/null
+++ b/java/com/android/dialer/historyitemactions/res/values-in/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="voice_call">Panggilan suara</string>
+  <string name="video_call">Video call</string>
+  <string name="add_to_contacts">Tambahkan kontak</string>
+  <string name="send_a_message">Pesan</string>
+  <string name="not_spam">Bukan spam</string>
+  <string name="block_number">Blokir</string>
+  <string name="unblock_number">Batalkan pemblokiran</string>
+  <string name="block_and_optionally_report_spam">Blokir/Laporkan spam</string>
+  <string name="copy_number">Salin nomor</string>
+</resources>
diff --git a/java/com/android/dialer/historyitemactions/res/values-is/strings.xml b/java/com/android/dialer/historyitemactions/res/values-is/strings.xml
new file mode 100644
index 0000000..6d2d8a1
--- /dev/null
+++ b/java/com/android/dialer/historyitemactions/res/values-is/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="voice_call">Símtal</string>
+  <string name="video_call">Myndsímtal</string>
+  <string name="add_to_contacts">Bæta tengilið við</string>
+  <string name="send_a_message">Skilaboð</string>
+  <string name="not_spam">Ekki ruslnúmer</string>
+  <string name="block_number">Loka á</string>
+  <string name="unblock_number">Taka af bannlista</string>
+  <string name="block_and_optionally_report_spam">Loka á / tilkynna sem rusl</string>
+  <string name="copy_number">Afrita númer</string>
+</resources>
diff --git a/java/com/android/dialer/historyitemactions/res/values-it/strings.xml b/java/com/android/dialer/historyitemactions/res/values-it/strings.xml
new file mode 100644
index 0000000..9da9216
--- /dev/null
+++ b/java/com/android/dialer/historyitemactions/res/values-it/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="voice_call">Chiama</string>
+  <string name="video_call">Videochiama</string>
+  <string name="add_to_contacts">Aggiungi contatto</string>
+  <string name="send_a_message">Invia SMS</string>
+  <string name="not_spam">Non spam</string>
+  <string name="block_number">Blocca</string>
+  <string name="unblock_number">Sblocca</string>
+  <string name="block_and_optionally_report_spam">Blocca/Segnala come spam</string>
+  <string name="copy_number">Copia numero</string>
+</resources>
diff --git a/java/com/android/dialer/historyitemactions/res/values-iw/strings.xml b/java/com/android/dialer/historyitemactions/res/values-iw/strings.xml
new file mode 100644
index 0000000..ab917ad
--- /dev/null
+++ b/java/com/android/dialer/historyitemactions/res/values-iw/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="voice_call">שיחה קולית</string>
+  <string name="video_call">שיחת וידאו</string>
+  <string name="add_to_contacts">הוספת איש קשר</string>
+  <string name="send_a_message">הודעה</string>
+  <string name="not_spam">לא ספאם</string>
+  <string name="block_number">חסימה</string>
+  <string name="unblock_number">ביטול החסימה</string>
+  <string name="block_and_optionally_report_spam">חסימה/דיווח על ספאם</string>
+  <string name="copy_number">העתקת המספר</string>
+</resources>
diff --git a/java/com/android/dialer/historyitemactions/res/values-ja/strings.xml b/java/com/android/dialer/historyitemactions/res/values-ja/strings.xml
new file mode 100644
index 0000000..059fac0
--- /dev/null
+++ b/java/com/android/dialer/historyitemactions/res/values-ja/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="voice_call">音声通話</string>
+  <string name="video_call">ビデオ通話</string>
+  <string name="add_to_contacts">連絡先に追加</string>
+  <string name="send_a_message">メッセージ</string>
+  <string name="not_spam">迷惑電話ではない</string>
+  <string name="block_number">ブロック</string>
+  <string name="unblock_number">ブロックを解除</string>
+  <string name="block_and_optionally_report_spam">ブロック / 迷惑電話として報告</string>
+  <string name="copy_number">電話番号をコピー</string>
+</resources>
diff --git a/java/com/android/dialer/historyitemactions/res/values-ka/strings.xml b/java/com/android/dialer/historyitemactions/res/values-ka/strings.xml
new file mode 100644
index 0000000..b109a55
--- /dev/null
+++ b/java/com/android/dialer/historyitemactions/res/values-ka/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="voice_call">ხმოვანი ზარი</string>
+  <string name="video_call">ვიდეოზარი</string>
+  <string name="add_to_contacts">კონტაქტის დამატება</string>
+  <string name="send_a_message">შეტყობინება</string>
+  <string name="not_spam">არ არის სპამი</string>
+  <string name="block_number">დაბლოკვა</string>
+  <string name="unblock_number">განბლოკვა</string>
+  <string name="block_and_optionally_report_spam">დაბლოკვა/სპამ. შესახებ შეტყობ.</string>
+  <string name="copy_number">ნომრის კოპირება</string>
+</resources>
diff --git a/java/com/android/dialer/historyitemactions/res/values-kk/strings.xml b/java/com/android/dialer/historyitemactions/res/values-kk/strings.xml
new file mode 100644
index 0000000..4ed0f91
--- /dev/null
+++ b/java/com/android/dialer/historyitemactions/res/values-kk/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="voice_call">Дауыстық қоңырау</string>
+  <string name="video_call">Бейне қоңырау</string>
+  <string name="add_to_contacts">Контакт қосу</string>
+  <string name="send_a_message">Хабар</string>
+  <string name="not_spam">Спам емес</string>
+  <string name="block_number">Бөгеу</string>
+  <string name="unblock_number">Бөгеуді алу</string>
+  <string name="block_and_optionally_report_spam">Спамды бөгеу/хабарлау</string>
+  <string name="copy_number">Нөмірді көшіру</string>
+</resources>
diff --git a/java/com/android/dialer/historyitemactions/res/values-km/strings.xml b/java/com/android/dialer/historyitemactions/res/values-km/strings.xml
new file mode 100644
index 0000000..9611e06
--- /dev/null
+++ b/java/com/android/dialer/historyitemactions/res/values-km/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="voice_call">ការហៅ​ជា​សំឡេង</string>
+  <string name="video_call">ការហៅ​ជា​វីដេអូ</string>
+  <string name="add_to_contacts">បញ្ចូល​​ទំនាក់ទំនង</string>
+  <string name="send_a_message">សារ</string>
+  <string name="not_spam">មិនមែន​ជា​លេខ​ហៅ​ឥត​បាន​ការ​ទេ</string>
+  <string name="block_number">ទប់ស្កាត់</string>
+  <string name="unblock_number">ឈប់​ទប់ស្កាត់</string>
+  <string name="block_and_optionally_report_spam">ទប់ស្កាត់/រាយការណ៍​ថា​ជា​លេខ​ហៅ​ឥត​បាន​ការ</string>
+  <string name="copy_number">ថត​ចម្លង​លេខ​ទូរសព្ទ</string>
+</resources>
diff --git a/java/com/android/dialer/historyitemactions/res/values-kn/strings.xml b/java/com/android/dialer/historyitemactions/res/values-kn/strings.xml
new file mode 100644
index 0000000..8e87e0b
--- /dev/null
+++ b/java/com/android/dialer/historyitemactions/res/values-kn/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="voice_call">ಧ್ವನಿ ಕರೆ</string>
+  <string name="video_call">ವೀಡಿಯೊ ಕರೆ</string>
+  <string name="add_to_contacts">ಸಂಪರ್ಕ ಸೇರಿಸಿ</string>
+  <string name="send_a_message">ಸಂದೇಶ</string>
+  <string name="not_spam">ಸ್ಪ್ಯಾಮ್‌ ಅಲ್ಲ</string>
+  <string name="block_number">ನಿರ್ಬಂಧಿಸಿ</string>
+  <string name="unblock_number">ನಿರ್ಬಂಧ ತೆಗೆಯಿರಿ</string>
+  <string name="block_and_optionally_report_spam">ಸ್ಪ್ಯಾಮ್ ನಿರ್ಬಂಧಿಸಿ/ವರದಿ ಮಾಡಿ</string>
+  <string name="copy_number">ಸಂಖ್ಯೆಯನ್ನು ನಕಲಿಸಿ</string>
+</resources>
diff --git a/java/com/android/dialer/historyitemactions/res/values-ko/strings.xml b/java/com/android/dialer/historyitemactions/res/values-ko/strings.xml
new file mode 100644
index 0000000..eebd608
--- /dev/null
+++ b/java/com/android/dialer/historyitemactions/res/values-ko/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="voice_call">음성 통화</string>
+  <string name="video_call">화상 통화</string>
+  <string name="add_to_contacts">연락처 추가</string>
+  <string name="send_a_message">메시지</string>
+  <string name="not_spam">스팸 해제</string>
+  <string name="block_number">차단</string>
+  <string name="unblock_number">차단 해제</string>
+  <string name="block_and_optionally_report_spam">스팸 차단/신고</string>
+  <string name="copy_number">전화번호 복사</string>
+</resources>
diff --git a/java/com/android/dialer/historyitemactions/res/values-ky/strings.xml b/java/com/android/dialer/historyitemactions/res/values-ky/strings.xml
new file mode 100644
index 0000000..7d27428
--- /dev/null
+++ b/java/com/android/dialer/historyitemactions/res/values-ky/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="voice_call">Үн чалуусу</string>
+  <string name="video_call">Видео чалуу</string>
+  <string name="add_to_contacts">Байланыш кошуу</string>
+  <string name="send_a_message">Билдирүү</string>
+  <string name="not_spam">Спам эмес</string>
+  <string name="block_number">Бөгөттөө</string>
+  <string name="unblock_number">Бөгөттөн чыгаруу</string>
+  <string name="block_and_optionally_report_spam">Бөгөттөө/спам деп кабарлоо</string>
+  <string name="copy_number">Номерди көчүрүү</string>
+</resources>
diff --git a/java/com/android/dialer/historyitemactions/res/values-land/styles.xml b/java/com/android/dialer/historyitemactions/res/values-land/styles.xml
new file mode 100644
index 0000000..bc727d0
--- /dev/null
+++ b/java/com/android/dialer/historyitemactions/res/values-land/styles.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ Copyright (C) 2018 The Android Open Source Project
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~      http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License
+ -->
+<resources>
+  <style name="HistoryItemBottomSheet.BottomSheetStyle" parent="Widget.Design.BottomSheet.Modal">
+    <item name="behavior_peekHeight">206dp</item>
+  </style>
+</resources>
diff --git a/java/com/android/dialer/historyitemactions/res/values-lo/strings.xml b/java/com/android/dialer/historyitemactions/res/values-lo/strings.xml
new file mode 100644
index 0000000..25cc6b0
--- /dev/null
+++ b/java/com/android/dialer/historyitemactions/res/values-lo/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="voice_call">ການໂທດ້ວຍສຽງ</string>
+  <string name="video_call">ໂທວິດີໂອ</string>
+  <string name="add_to_contacts">ເພີ່ມລາຍຊື່ຜູ້ຕິດຕໍ່</string>
+  <string name="send_a_message">ຂໍ້ຄວາມ</string>
+  <string name="not_spam">ບໍ່ແມ່ນສະແປມ</string>
+  <string name="block_number">ບລັອກ</string>
+  <string name="unblock_number">ຍົກເລີກການບລັອກ</string>
+  <string name="block_and_optionally_report_spam">ບລັອກ/ລາຍງານສະແປມ</string>
+  <string name="copy_number">ສຳເນົາເບີໂທ</string>
+</resources>
diff --git a/java/com/android/dialer/historyitemactions/res/values-lt/strings.xml b/java/com/android/dialer/historyitemactions/res/values-lt/strings.xml
new file mode 100644
index 0000000..d1aa0db
--- /dev/null
+++ b/java/com/android/dialer/historyitemactions/res/values-lt/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="voice_call">Balso skambutis</string>
+  <string name="video_call">Vaizdo skambutis</string>
+  <string name="add_to_contacts">Pridėti kontaktą</string>
+  <string name="send_a_message">Pranešimas</string>
+  <string name="not_spam">Ne šlamštas</string>
+  <string name="block_number">Blokuoti</string>
+  <string name="unblock_number">Panaikinti blokavimą</string>
+  <string name="block_and_optionally_report_spam">Blokuoti / pran. apie šlamštą</string>
+  <string name="copy_number">Kopijuoti numerį</string>
+</resources>
diff --git a/java/com/android/dialer/historyitemactions/res/values-lv/strings.xml b/java/com/android/dialer/historyitemactions/res/values-lv/strings.xml
new file mode 100644
index 0000000..0985f41
--- /dev/null
+++ b/java/com/android/dialer/historyitemactions/res/values-lv/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="voice_call">Balss zvans</string>
+  <string name="video_call">Videozvans</string>
+  <string name="add_to_contacts">Pievienot kontaktpersonu</string>
+  <string name="send_a_message">Sūtīt īsziņu</string>
+  <string name="not_spam">Nav nevēlams numurs</string>
+  <string name="block_number">Bloķēt</string>
+  <string name="unblock_number">Atbloķēt</string>
+  <string name="block_and_optionally_report_spam">Bloķēt numuru/ziņot par to</string>
+  <string name="copy_number">Kopēt numuru</string>
+</resources>
diff --git a/java/com/android/dialer/historyitemactions/res/values-mk/strings.xml b/java/com/android/dialer/historyitemactions/res/values-mk/strings.xml
new file mode 100644
index 0000000..a2f1389
--- /dev/null
+++ b/java/com/android/dialer/historyitemactions/res/values-mk/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="voice_call">Гласовен повик</string>
+  <string name="video_call">Видеоповик</string>
+  <string name="add_to_contacts">Додајте контакт</string>
+  <string name="send_a_message">Испратете SMS</string>
+  <string name="not_spam">Не е спам</string>
+  <string name="block_number">Блокирајте</string>
+  <string name="unblock_number">Одблокирајте</string>
+  <string name="block_and_optionally_report_spam">Блокирајте/Пријавете спам</string>
+  <string name="copy_number">Копирајте го бројот</string>
+</resources>
diff --git a/java/com/android/dialer/historyitemactions/res/values-ml/strings.xml b/java/com/android/dialer/historyitemactions/res/values-ml/strings.xml
new file mode 100644
index 0000000..6779828
--- /dev/null
+++ b/java/com/android/dialer/historyitemactions/res/values-ml/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="voice_call">വോയ്‌സ് കോൾ</string>
+  <string name="video_call">വീഡിയോ കോള്‍</string>
+  <string name="add_to_contacts">കോൺടാക്റ്റ് ചേർക്കുക</string>
+  <string name="send_a_message">സന്ദേശം</string>
+  <string name="not_spam">സ്‌പാം അല്ല</string>
+  <string name="block_number">ബ്ലോക്ക് ചെയ്യുക</string>
+  <string name="unblock_number">അൺബ്ലോക്ക് ചെയ്യുക</string>
+  <string name="block_and_optionally_report_spam">ബ്ലോക്ക്/സ്‌പാം റിപ്പോർട്ട് ചെയ്യൂ</string>
+  <string name="copy_number">നമ്പർ പകർത്തുക</string>
+</resources>
diff --git a/java/com/android/dialer/historyitemactions/res/values-mn/strings.xml b/java/com/android/dialer/historyitemactions/res/values-mn/strings.xml
new file mode 100644
index 0000000..4fd91e9
--- /dev/null
+++ b/java/com/android/dialer/historyitemactions/res/values-mn/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="voice_call">Дуудлага</string>
+  <string name="video_call">Видео дуудлага</string>
+  <string name="add_to_contacts">Харилцагч нэмэх</string>
+  <string name="send_a_message">Зурвас</string>
+  <string name="not_spam">Спам биш</string>
+  <string name="block_number">Хориглох</string>
+  <string name="unblock_number">Хоригоос гаргах</string>
+  <string name="block_and_optionally_report_spam">Спам гэж мэдээлэх/хориглох</string>
+  <string name="copy_number">Дугаар хуулах</string>
+</resources>
diff --git a/java/com/android/dialer/historyitemactions/res/values-mr/strings.xml b/java/com/android/dialer/historyitemactions/res/values-mr/strings.xml
new file mode 100644
index 0000000..7e13f69
--- /dev/null
+++ b/java/com/android/dialer/historyitemactions/res/values-mr/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="voice_call">व्हॉइस कॉल</string>
+  <string name="video_call">व्हिडिओ कॉल</string>
+  <string name="add_to_contacts">संपर्क जोडा</string>
+  <string name="send_a_message">मेसेज</string>
+  <string name="not_spam">स्पॅम नाही</string>
+  <string name="block_number">ब्लॉक करा</string>
+  <string name="unblock_number">अनब्लॉक करा</string>
+  <string name="block_and_optionally_report_spam">ब्लॉक/स्पॅमची तक्रार नोंदवा</string>
+  <string name="copy_number">नंबर कॉपी करा</string>
+</resources>
diff --git a/java/com/android/dialer/historyitemactions/res/values-ms/strings.xml b/java/com/android/dialer/historyitemactions/res/values-ms/strings.xml
new file mode 100644
index 0000000..75b469a
--- /dev/null
+++ b/java/com/android/dialer/historyitemactions/res/values-ms/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="voice_call">Panggilan suara</string>
+  <string name="video_call">Panggilan video</string>
+  <string name="add_to_contacts">Tambah kenalan</string>
+  <string name="send_a_message">Mesej</string>
+  <string name="not_spam">Bukan spam</string>
+  <string name="block_number">Sekat</string>
+  <string name="unblock_number">Nyahsekat</string>
+  <string name="block_and_optionally_report_spam">Sekat/Laporkan spam</string>
+  <string name="copy_number">Salin nombor</string>
+</resources>
diff --git a/java/com/android/dialer/historyitemactions/res/values-my/strings.xml b/java/com/android/dialer/historyitemactions/res/values-my/strings.xml
new file mode 100644
index 0000000..b10a7d4
--- /dev/null
+++ b/java/com/android/dialer/historyitemactions/res/values-my/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="voice_call">ဖုန်း ခေါ်ဆိုရန်</string>
+  <string name="video_call">ဗီဒီယို ခေါ်ဆိုရန်</string>
+  <string name="add_to_contacts">အဆက်အသွယ် ထည့်ရန်</string>
+  <string name="send_a_message">မက်ဆေ့ဂျ်ပို့ရန်</string>
+  <string name="not_spam">စပမ်း မဟုတ်ပါ</string>
+  <string name="block_number">ပိတ်ရန်</string>
+  <string name="unblock_number">ပြန်ဖွင့်ရန်</string>
+  <string name="block_and_optionally_report_spam">စပမ်းကို ပိတ်ရန်/တိုင်ကြားရန်</string>
+  <string name="copy_number">နံပါတ်ကို ကူးယူရန်</string>
+</resources>
diff --git a/java/com/android/dialer/historyitemactions/res/values-nb/strings.xml b/java/com/android/dialer/historyitemactions/res/values-nb/strings.xml
new file mode 100644
index 0000000..14c26c0
--- /dev/null
+++ b/java/com/android/dialer/historyitemactions/res/values-nb/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="voice_call">Taleanrop</string>
+  <string name="video_call">Videoanrop</string>
+  <string name="add_to_contacts">Legg til i Kontakter</string>
+  <string name="send_a_message">Melding</string>
+  <string name="not_spam">Ikke useriøs</string>
+  <string name="block_number">Blokkér</string>
+  <string name="unblock_number">Opphev blokkering</string>
+  <string name="block_and_optionally_report_spam">Blokkér/rapportér som useriøs</string>
+  <string name="copy_number">Kopiér nummeret</string>
+</resources>
diff --git a/java/com/android/dialer/historyitemactions/res/values-ne/strings.xml b/java/com/android/dialer/historyitemactions/res/values-ne/strings.xml
new file mode 100644
index 0000000..1e0cf3e
--- /dev/null
+++ b/java/com/android/dialer/historyitemactions/res/values-ne/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="voice_call">भ्वाइस कल</string>
+  <string name="video_call">भिडियो कल</string>
+  <string name="add_to_contacts">सम्पर्क ठेगाना थप्नुहोस्</string>
+  <string name="send_a_message">सन्देश</string>
+  <string name="not_spam">स्प्याम होइन</string>
+  <string name="block_number">रोक लगाउनुहोस्</string>
+  <string name="unblock_number">रोक हटाउनुहोस्</string>
+  <string name="block_and_optionally_report_spam">रोक लगाउनु/स्प्याम भनी रिपोर्ट गर्नु…</string>
+  <string name="copy_number">नम्बरको प्रतिलिपि गर्नुहोस्</string>
+</resources>
diff --git a/java/com/android/dialer/historyitemactions/res/values-nl/strings.xml b/java/com/android/dialer/historyitemactions/res/values-nl/strings.xml
new file mode 100644
index 0000000..9808759
--- /dev/null
+++ b/java/com/android/dialer/historyitemactions/res/values-nl/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="voice_call">Spraakoproep</string>
+  <string name="video_call">Videogesprek</string>
+  <string name="add_to_contacts">Contact toevoegen</string>
+  <string name="send_a_message">Bericht</string>
+  <string name="not_spam">Geen spam</string>
+  <string name="block_number">Blokkeren</string>
+  <string name="unblock_number">Blokkeren opheffen</string>
+  <string name="block_and_optionally_report_spam">Blokkeren/spam melden</string>
+  <string name="copy_number">Nummer kopiëren</string>
+</resources>
diff --git a/java/com/android/dialer/historyitemactions/res/values-no/strings.xml b/java/com/android/dialer/historyitemactions/res/values-no/strings.xml
new file mode 100644
index 0000000..14c26c0
--- /dev/null
+++ b/java/com/android/dialer/historyitemactions/res/values-no/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="voice_call">Taleanrop</string>
+  <string name="video_call">Videoanrop</string>
+  <string name="add_to_contacts">Legg til i Kontakter</string>
+  <string name="send_a_message">Melding</string>
+  <string name="not_spam">Ikke useriøs</string>
+  <string name="block_number">Blokkér</string>
+  <string name="unblock_number">Opphev blokkering</string>
+  <string name="block_and_optionally_report_spam">Blokkér/rapportér som useriøs</string>
+  <string name="copy_number">Kopiér nummeret</string>
+</resources>
diff --git a/java/com/android/dialer/historyitemactions/res/values-pa/strings.xml b/java/com/android/dialer/historyitemactions/res/values-pa/strings.xml
new file mode 100644
index 0000000..3f369ba
--- /dev/null
+++ b/java/com/android/dialer/historyitemactions/res/values-pa/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="voice_call">ਅਵਾਜ਼ੀ ਕਾਲ</string>
+  <string name="video_call">ਵੀਡੀਓ ਕਾਲ</string>
+  <string name="add_to_contacts">ਸੰਪਰਕ ਸ਼ਾਮਲ ਕਰੋ</string>
+  <string name="send_a_message">ਸੁਨੇਹਾ</string>
+  <string name="not_spam">ਸਪੈਮ ਨਹੀਂ</string>
+  <string name="block_number">ਬਲਾਕ ਕਰੋ</string>
+  <string name="unblock_number">ਅਣਬਲਾਕ ਕਰੋ</string>
+  <string name="block_and_optionally_report_spam">ਸਪੈਮ ਬਲਾਕ ਕਰੋ ਜਾਂ ਰਿਪੋਰਟ ਕਰੋ</string>
+  <string name="copy_number">ਨੰਬਰ ਕਾਪੀ ਕਰੋ</string>
+</resources>
diff --git a/java/com/android/dialer/historyitemactions/res/values-pl/strings.xml b/java/com/android/dialer/historyitemactions/res/values-pl/strings.xml
new file mode 100644
index 0000000..5fc7e2e
--- /dev/null
+++ b/java/com/android/dialer/historyitemactions/res/values-pl/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="voice_call">Rozmowa głosowa</string>
+  <string name="video_call">Rozmowa wideo</string>
+  <string name="add_to_contacts">Dodaj kontakt</string>
+  <string name="send_a_message">SMS</string>
+  <string name="not_spam">To nie spam</string>
+  <string name="block_number">Zablokuj</string>
+  <string name="unblock_number">Odblokuj</string>
+  <string name="block_and_optionally_report_spam">Zablokuj/zgłoś spam</string>
+  <string name="copy_number">Kopiuj numer</string>
+</resources>
diff --git a/java/com/android/dialer/historyitemactions/res/values-pt-rBR/strings.xml b/java/com/android/dialer/historyitemactions/res/values-pt-rBR/strings.xml
new file mode 100644
index 0000000..88a953a
--- /dev/null
+++ b/java/com/android/dialer/historyitemactions/res/values-pt-rBR/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="voice_call">Chamada de voz</string>
+  <string name="video_call">Videochamada</string>
+  <string name="add_to_contacts">Adicionar contato</string>
+  <string name="send_a_message">Mensagem</string>
+  <string name="not_spam">Não é spam</string>
+  <string name="block_number">Bloquear</string>
+  <string name="unblock_number">Desbloquear</string>
+  <string name="block_and_optionally_report_spam">Bloquear/denunciar spam</string>
+  <string name="copy_number">Copiar número</string>
+</resources>
diff --git a/java/com/android/dialer/historyitemactions/res/values-pt-rPT/strings.xml b/java/com/android/dialer/historyitemactions/res/values-pt-rPT/strings.xml
new file mode 100644
index 0000000..e53e4ae
--- /dev/null
+++ b/java/com/android/dialer/historyitemactions/res/values-pt-rPT/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="voice_call">Chamada de voz</string>
+  <string name="video_call">Videochamada</string>
+  <string name="add_to_contacts">Adicionar contacto</string>
+  <string name="send_a_message">Mensagem</string>
+  <string name="not_spam">Não é spam</string>
+  <string name="block_number">Bloquear</string>
+  <string name="unblock_number">Desbloquear</string>
+  <string name="block_and_optionally_report_spam">Bloquear/denunciar spam</string>
+  <string name="copy_number">Copiar número</string>
+</resources>
diff --git a/java/com/android/dialer/historyitemactions/res/values-pt/strings.xml b/java/com/android/dialer/historyitemactions/res/values-pt/strings.xml
new file mode 100644
index 0000000..88a953a
--- /dev/null
+++ b/java/com/android/dialer/historyitemactions/res/values-pt/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="voice_call">Chamada de voz</string>
+  <string name="video_call">Videochamada</string>
+  <string name="add_to_contacts">Adicionar contato</string>
+  <string name="send_a_message">Mensagem</string>
+  <string name="not_spam">Não é spam</string>
+  <string name="block_number">Bloquear</string>
+  <string name="unblock_number">Desbloquear</string>
+  <string name="block_and_optionally_report_spam">Bloquear/denunciar spam</string>
+  <string name="copy_number">Copiar número</string>
+</resources>
diff --git a/java/com/android/dialer/historyitemactions/res/values-ro/strings.xml b/java/com/android/dialer/historyitemactions/res/values-ro/strings.xml
new file mode 100644
index 0000000..e4f617d
--- /dev/null
+++ b/java/com/android/dialer/historyitemactions/res/values-ro/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="voice_call">Apel vocal</string>
+  <string name="video_call">Apel video</string>
+  <string name="add_to_contacts">Adăugați o persoană de contact</string>
+  <string name="send_a_message">Trimiteți mesaj</string>
+  <string name="not_spam">Nu este spam</string>
+  <string name="block_number">Blocați</string>
+  <string name="unblock_number">Deblocați</string>
+  <string name="block_and_optionally_report_spam">Blocați/Raportați ca spam</string>
+  <string name="copy_number">Copiați numărul</string>
+</resources>
diff --git a/java/com/android/dialer/historyitemactions/res/values-ru/strings.xml b/java/com/android/dialer/historyitemactions/res/values-ru/strings.xml
new file mode 100644
index 0000000..e25872a
--- /dev/null
+++ b/java/com/android/dialer/historyitemactions/res/values-ru/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="voice_call">Начать голосовой вызов</string>
+  <string name="video_call">Начать видеовстречу</string>
+  <string name="add_to_contacts">Добавить в контакты</string>
+  <string name="send_a_message">Отправить SMS</string>
+  <string name="not_spam">Отметить как не спам</string>
+  <string name="block_number">Заблокировать</string>
+  <string name="unblock_number">Разблокировать</string>
+  <string name="block_and_optionally_report_spam">Заблокировать/сообщить о спаме</string>
+  <string name="copy_number">Скопировать номер</string>
+</resources>
diff --git a/java/com/android/dialer/historyitemactions/res/values-si/strings.xml b/java/com/android/dialer/historyitemactions/res/values-si/strings.xml
new file mode 100644
index 0000000..92887aa
--- /dev/null
+++ b/java/com/android/dialer/historyitemactions/res/values-si/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="voice_call">හඬ ඇමතුම</string>
+  <string name="video_call">වීඩියෝ ඇමතුම</string>
+  <string name="add_to_contacts">සම්බන්ධතාව එක් කරන්න</string>
+  <string name="send_a_message">පණිවිඩය</string>
+  <string name="not_spam">අයාචිත තැපෑලක් නොවේ</string>
+  <string name="block_number">අවහිර කරන්න</string>
+  <string name="unblock_number">අවහිර කිරීම ඉවත් කරන්න</string>
+  <string name="block_and_optionally_report_spam">අවහිර ක./අයාචිත ලෙස වාර්තා ක.</string>
+  <string name="copy_number">අංකය පිටපත් කරන්න</string>
+</resources>
diff --git a/java/com/android/dialer/historyitemactions/res/values-sk/strings.xml b/java/com/android/dialer/historyitemactions/res/values-sk/strings.xml
new file mode 100644
index 0000000..495c388
--- /dev/null
+++ b/java/com/android/dialer/historyitemactions/res/values-sk/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="voice_call">Hlasový hovor</string>
+  <string name="video_call">Videohovor</string>
+  <string name="add_to_contacts">Pridať kontakt</string>
+  <string name="send_a_message">Správa</string>
+  <string name="not_spam">Nie je spam</string>
+  <string name="block_number">Blokovať</string>
+  <string name="unblock_number">Odblokovať</string>
+  <string name="block_and_optionally_report_spam">Blokovať/nahlásiť spam</string>
+  <string name="copy_number">Kopírovať číslo</string>
+</resources>
diff --git a/java/com/android/dialer/historyitemactions/res/values-sl/strings.xml b/java/com/android/dialer/historyitemactions/res/values-sl/strings.xml
new file mode 100644
index 0000000..30e7d98
--- /dev/null
+++ b/java/com/android/dialer/historyitemactions/res/values-sl/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="voice_call">Glasovni klic</string>
+  <string name="video_call">Videoklic</string>
+  <string name="add_to_contacts">Dodaj stik</string>
+  <string name="send_a_message">Sporočilo</string>
+  <string name="not_spam">Ni neželeni klic</string>
+  <string name="block_number">Blokiraj</string>
+  <string name="unblock_number">Odblokiraj</string>
+  <string name="block_and_optionally_report_spam">Blokiraj/prijavi neželeni klic</string>
+  <string name="copy_number">Kopiraj številko</string>
+</resources>
diff --git a/java/com/android/dialer/historyitemactions/res/values-sq/strings.xml b/java/com/android/dialer/historyitemactions/res/values-sq/strings.xml
new file mode 100644
index 0000000..42b825b
--- /dev/null
+++ b/java/com/android/dialer/historyitemactions/res/values-sq/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="voice_call">Telefonatë zanore</string>
+  <string name="video_call">Telefonatë me video</string>
+  <string name="add_to_contacts">Shto një kontakt</string>
+  <string name="send_a_message">Dërgo mesazh</string>
+  <string name="not_spam">Nuk është i padëshiruar</string>
+  <string name="block_number">Blloko</string>
+  <string name="unblock_number">Zhblloko</string>
+  <string name="block_and_optionally_report_spam">Blloko/raporto si të padëshiruar</string>
+  <string name="copy_number">Kopjo numrin</string>
+</resources>
diff --git a/java/com/android/dialer/historyitemactions/res/values-sr/strings.xml b/java/com/android/dialer/historyitemactions/res/values-sr/strings.xml
new file mode 100644
index 0000000..039bfad
--- /dev/null
+++ b/java/com/android/dialer/historyitemactions/res/values-sr/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="voice_call">Упути аудио позив</string>
+  <string name="video_call">Упути видео позив</string>
+  <string name="add_to_contacts">Додај</string>
+  <string name="send_a_message">Пошаљи SMS</string>
+  <string name="not_spam">Није непожељан</string>
+  <string name="block_number">Блокирај</string>
+  <string name="unblock_number">Деблокирај</string>
+  <string name="block_and_optionally_report_spam">Блокирај/пријави као непожељан</string>
+  <string name="copy_number">Копирај број</string>
+</resources>
diff --git a/java/com/android/dialer/historyitemactions/res/values-sv/strings.xml b/java/com/android/dialer/historyitemactions/res/values-sv/strings.xml
new file mode 100644
index 0000000..3778f84
--- /dev/null
+++ b/java/com/android/dialer/historyitemactions/res/values-sv/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="voice_call">Röstsamtal</string>
+  <string name="video_call">Videosamtal</string>
+  <string name="add_to_contacts">Lägg till kontakt</string>
+  <string name="send_a_message">Meddelande</string>
+  <string name="not_spam">Inte spam</string>
+  <string name="block_number">Blockera</string>
+  <string name="unblock_number">Återaktivera</string>
+  <string name="block_and_optionally_report_spam">Blockera/rapportera spam</string>
+  <string name="copy_number">Kopiera nummer</string>
+</resources>
diff --git a/java/com/android/dialer/historyitemactions/res/values-sw/strings.xml b/java/com/android/dialer/historyitemactions/res/values-sw/strings.xml
new file mode 100644
index 0000000..235b1d8
--- /dev/null
+++ b/java/com/android/dialer/historyitemactions/res/values-sw/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="voice_call">Simu ya sauti</string>
+  <string name="video_call">Simu ya video</string>
+  <string name="add_to_contacts">Ongeza anwani</string>
+  <string name="send_a_message">Ujumbe</string>
+  <string name="not_spam">Si taka</string>
+  <string name="block_number">Zuia</string>
+  <string name="unblock_number">Acha kuzuia</string>
+  <string name="block_and_optionally_report_spam">Zuia/Ripoti taka</string>
+  <string name="copy_number">Nakili nambari</string>
+</resources>
diff --git a/java/com/android/dialer/historyitemactions/res/values-ta/strings.xml b/java/com/android/dialer/historyitemactions/res/values-ta/strings.xml
new file mode 100644
index 0000000..76270ad
--- /dev/null
+++ b/java/com/android/dialer/historyitemactions/res/values-ta/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="voice_call">குரல் அழைப்பு</string>
+  <string name="video_call">வீடியோ அழைப்பு</string>
+  <string name="add_to_contacts">தொடர்பைச் சேர்</string>
+  <string name="send_a_message">செய்தி அனுப்பு</string>
+  <string name="not_spam">ஸ்பேம் அல்ல</string>
+  <string name="block_number">தடு</string>
+  <string name="unblock_number">தடைநீக்கு</string>
+  <string name="block_and_optionally_report_spam">தடு/ஸ்பேம் எனப் புகாரளி</string>
+  <string name="copy_number">எண்ணை நகலெடு</string>
+</resources>
diff --git a/java/com/android/dialer/historyitemactions/res/values-te/strings.xml b/java/com/android/dialer/historyitemactions/res/values-te/strings.xml
new file mode 100644
index 0000000..6930383
--- /dev/null
+++ b/java/com/android/dialer/historyitemactions/res/values-te/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="voice_call">వాయిస్ కాల్</string>
+  <string name="video_call">వీడియో కాల్</string>
+  <string name="add_to_contacts">పరిచయాన్ని జోడించు</string>
+  <string name="send_a_message">సందేశం పంపు</string>
+  <string name="not_spam">స్పామ్ కాదు</string>
+  <string name="block_number">బ్లాక్ చేయి</string>
+  <string name="unblock_number">అన్‌బ్లాక్ చేయి</string>
+  <string name="block_and_optionally_report_spam">బ్లాక్ చేయి/స్పామ్ నివేదించు</string>
+  <string name="copy_number">నంబర్‌ను కాపీ చేయి</string>
+</resources>
diff --git a/java/com/android/dialer/historyitemactions/res/values-th/strings.xml b/java/com/android/dialer/historyitemactions/res/values-th/strings.xml
new file mode 100644
index 0000000..1660d90
--- /dev/null
+++ b/java/com/android/dialer/historyitemactions/res/values-th/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="voice_call">การโทรด้วยเสียง</string>
+  <string name="video_call">วิดีโอคอล</string>
+  <string name="add_to_contacts">เพิ่มรายชื่อติดต่อ</string>
+  <string name="send_a_message">ข้อความ</string>
+  <string name="not_spam">ไม่ใช่สแปม</string>
+  <string name="block_number">บล็อก</string>
+  <string name="unblock_number">เลิกบล็อก</string>
+  <string name="block_and_optionally_report_spam">บล็อก/รายงานสแปม</string>
+  <string name="copy_number">คัดลอกหมายเลข</string>
+</resources>
diff --git a/java/com/android/dialer/historyitemactions/res/values-tl/strings.xml b/java/com/android/dialer/historyitemactions/res/values-tl/strings.xml
new file mode 100644
index 0000000..0944a8b
--- /dev/null
+++ b/java/com/android/dialer/historyitemactions/res/values-tl/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="voice_call">Voice call</string>
+  <string name="video_call">Video call</string>
+  <string name="add_to_contacts">Magdagdag ng contact</string>
+  <string name="send_a_message">Mensahe</string>
+  <string name="not_spam">Hindi spam</string>
+  <string name="block_number">I-block</string>
+  <string name="unblock_number">I-unblock</string>
+  <string name="block_and_optionally_report_spam">I-block/Iulat bilang spam</string>
+  <string name="copy_number">Kopyahin ang numero</string>
+</resources>
diff --git a/java/com/android/dialer/historyitemactions/res/values-tr/strings.xml b/java/com/android/dialer/historyitemactions/res/values-tr/strings.xml
new file mode 100644
index 0000000..7e70048
--- /dev/null
+++ b/java/com/android/dialer/historyitemactions/res/values-tr/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="voice_call">Sesli arama</string>
+  <string name="video_call">Görüntülü görüşme</string>
+  <string name="add_to_contacts">Kişi ekle</string>
+  <string name="send_a_message">Mesaj gönder</string>
+  <string name="not_spam">Spam değil</string>
+  <string name="block_number">Engelle</string>
+  <string name="unblock_number">Engellemeyi kaldır</string>
+  <string name="block_and_optionally_report_spam">Engelle ve spam bildir</string>
+  <string name="copy_number">Numarayı kopyala</string>
+</resources>
diff --git a/java/com/android/dialer/historyitemactions/res/values-uk/strings.xml b/java/com/android/dialer/historyitemactions/res/values-uk/strings.xml
new file mode 100644
index 0000000..5f62eb6
--- /dev/null
+++ b/java/com/android/dialer/historyitemactions/res/values-uk/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="voice_call">Голосовий дзвінок</string>
+  <string name="video_call">Відеодзвінок</string>
+  <string name="add_to_contacts">Додати контакт</string>
+  <string name="send_a_message">Повідомлення</string>
+  <string name="not_spam">Не спам</string>
+  <string name="block_number">Заблокувати</string>
+  <string name="unblock_number">Розблокувати</string>
+  <string name="block_and_optionally_report_spam">Заблокувати/позначити як спам</string>
+  <string name="copy_number">Копіювати номер</string>
+</resources>
diff --git a/java/com/android/dialer/historyitemactions/res/values-ur/strings.xml b/java/com/android/dialer/historyitemactions/res/values-ur/strings.xml
new file mode 100644
index 0000000..d78be19
--- /dev/null
+++ b/java/com/android/dialer/historyitemactions/res/values-ur/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="voice_call">صوتی کال</string>
+  <string name="video_call">ویڈیو کال</string>
+  <string name="add_to_contacts">رابطہ شامل کریں</string>
+  <string name="send_a_message">پیغام</string>
+  <string name="not_spam">اسپام نہیں ہے</string>
+  <string name="block_number">مسدود کریں</string>
+  <string name="unblock_number">غیر مسدود کریں</string>
+  <string name="block_and_optionally_report_spam">مسدود کریں/اسپام کی اطلاع دیں</string>
+  <string name="copy_number">نمبر کاپی کریں</string>
+</resources>
diff --git a/java/com/android/dialer/historyitemactions/res/values-uz/strings.xml b/java/com/android/dialer/historyitemactions/res/values-uz/strings.xml
new file mode 100644
index 0000000..2ed4a79
--- /dev/null
+++ b/java/com/android/dialer/historyitemactions/res/values-uz/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="voice_call">Ovozli chaqiruv qilish</string>
+  <string name="video_call">Video chaqiruv qilish</string>
+  <string name="add_to_contacts">Kontaktlarga saqlash</string>
+  <string name="send_a_message">SMS yuborish</string>
+  <string name="not_spam">Spam emas deb belgilash</string>
+  <string name="block_number">Bloklash</string>
+  <string name="unblock_number">Blokdan chiqarish</string>
+  <string name="block_and_optionally_report_spam">Bloklash/spam deb belgilash</string>
+  <string name="copy_number">Raqamni nusxalash</string>
+</resources>
diff --git a/java/com/android/dialer/historyitemactions/res/values-vi/strings.xml b/java/com/android/dialer/historyitemactions/res/values-vi/strings.xml
new file mode 100644
index 0000000..4660aa8
--- /dev/null
+++ b/java/com/android/dialer/historyitemactions/res/values-vi/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="voice_call">Gọi thoại</string>
+  <string name="video_call">Gọi điện video</string>
+  <string name="add_to_contacts">Thêm liên hệ</string>
+  <string name="send_a_message">Tin nhắn</string>
+  <string name="not_spam">Không phải là spam</string>
+  <string name="block_number">Chặn</string>
+  <string name="unblock_number">Bỏ chặn</string>
+  <string name="block_and_optionally_report_spam">Chặn/Báo cáo spam</string>
+  <string name="copy_number">Sao chép số</string>
+</resources>
diff --git a/java/com/android/dialer/historyitemactions/res/values-zh-rCN/strings.xml b/java/com/android/dialer/historyitemactions/res/values-zh-rCN/strings.xml
new file mode 100644
index 0000000..bc56e73
--- /dev/null
+++ b/java/com/android/dialer/historyitemactions/res/values-zh-rCN/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="voice_call">拨打语音电话</string>
+  <string name="video_call">发起视频通话</string>
+  <string name="add_to_contacts">添加联系人</string>
+  <string name="send_a_message">发短信</string>
+  <string name="not_spam">标为非骚扰电话号码</string>
+  <string name="block_number">屏蔽</string>
+  <string name="unblock_number">取消屏蔽</string>
+  <string name="block_and_optionally_report_spam">屏蔽/举报骚扰电话号码</string>
+  <string name="copy_number">复制号码</string>
+</resources>
diff --git a/java/com/android/dialer/historyitemactions/res/values-zh-rHK/strings.xml b/java/com/android/dialer/historyitemactions/res/values-zh-rHK/strings.xml
new file mode 100644
index 0000000..895c265
--- /dev/null
+++ b/java/com/android/dialer/historyitemactions/res/values-zh-rHK/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="voice_call">語音通話</string>
+  <string name="video_call">視像通話</string>
+  <string name="add_to_contacts">新增聯絡人</string>
+  <string name="send_a_message">訊息</string>
+  <string name="not_spam">非垃圾來電</string>
+  <string name="block_number">封鎖</string>
+  <string name="unblock_number">解除封鎖</string>
+  <string name="block_and_optionally_report_spam">封鎖/舉報為垃圾來電</string>
+  <string name="copy_number">複製號碼</string>
+</resources>
diff --git a/java/com/android/dialer/historyitemactions/res/values-zh-rTW/strings.xml b/java/com/android/dialer/historyitemactions/res/values-zh-rTW/strings.xml
new file mode 100644
index 0000000..19a2540
--- /dev/null
+++ b/java/com/android/dialer/historyitemactions/res/values-zh-rTW/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="voice_call">語音通話</string>
+  <string name="video_call">視訊通話</string>
+  <string name="add_to_contacts">新增聯絡人</string>
+  <string name="send_a_message">訊息</string>
+  <string name="not_spam">非騷擾/廣告電話</string>
+  <string name="block_number">封鎖</string>
+  <string name="unblock_number">解除封鎖</string>
+  <string name="block_and_optionally_report_spam">封鎖/回報為騷擾/廣告電話</string>
+  <string name="copy_number">複製號碼</string>
+</resources>
diff --git a/java/com/android/dialer/historyitemactions/res/values-zu/strings.xml b/java/com/android/dialer/historyitemactions/res/values-zu/strings.xml
new file mode 100644
index 0000000..3199d94
--- /dev/null
+++ b/java/com/android/dialer/historyitemactions/res/values-zu/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="voice_call">Ikholi yezwi</string>
+  <string name="video_call">Ikholi yevidiyo</string>
+  <string name="add_to_contacts">Engeza oxhumana naye</string>
+  <string name="send_a_message">Umlayezo</string>
+  <string name="not_spam">Akusiko okugaxekile</string>
+  <string name="block_number">Vimba</string>
+  <string name="unblock_number">Vulela</string>
+  <string name="block_and_optionally_report_spam">Vimba/bika ugaxekile</string>
+  <string name="copy_number">Kopisha inombolo</string>
+</resources>
diff --git a/java/com/android/dialer/historyitemactions/res/values/dimens.xml b/java/com/android/dialer/historyitemactions/res/values/dimens.xml
index 47bf804..a98101e 100644
--- a/java/com/android/dialer/historyitemactions/res/values/dimens.xml
+++ b/java/com/android/dialer/historyitemactions/res/values/dimens.xml
@@ -17,4 +17,5 @@
 <resources>
   <dimen name="contact_actions_image_size">48dp</dimen>
   <dimen name="contact_actions_image_margin">12dp</dimen>
+  <dimen name="contact_actions_header_elevation">4dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/java/com/android/dialer/historyitemactions/res/values/styles.xml b/java/com/android/dialer/historyitemactions/res/values/styles.xml
new file mode 100644
index 0000000..ed5c186
--- /dev/null
+++ b/java/com/android/dialer/historyitemactions/res/values/styles.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ Copyright (C) 2018 The Android Open Source Project
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~      http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License
+ -->
+<resources>
+  <style name="HistoryItemBottomSheet.Base" parent="Theme.Design.Light.BottomSheetDialog">
+    <item name="android:windowDrawsSystemBarBackgrounds">false</item>
+    <item name="android:windowTranslucentNavigation">false</item>
+    <item name="android:windowTranslucentStatus">false</item>
+    <item name="android:navigationBarColor">?android:attr/colorBackgroundFloating</item>
+  </style>
+
+  <style name="HistoryItemBottomSheet" parent="HistoryItemBottomSheet.Base">
+    <item name="bottomSheetStyle">@style/HistoryItemBottomSheet.BottomSheetStyle</item>
+  </style>
+
+  <style name="HistoryItemBottomSheet.BottomSheetStyle" parent="Widget.Design.BottomSheet.Modal">
+    <item name="behavior_peekHeight">405dp</item>
+  </style>
+</resources>
diff --git a/java/com/android/dialer/i18n/DialerBidiFormatter.java b/java/com/android/dialer/i18n/DialerBidiFormatter.java
new file mode 100644
index 0000000..440db17
--- /dev/null
+++ b/java/com/android/dialer/i18n/DialerBidiFormatter.java
@@ -0,0 +1,91 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.dialer.i18n;
+
+import android.support.annotation.Nullable;
+import android.telephony.PhoneNumberUtils;
+import android.text.SpannableStringBuilder;
+import android.text.SpannedString;
+import android.text.TextUtils;
+import android.util.Patterns;
+import java.util.regex.Matcher;
+
+/** A formatter that applies bidirectional formatting to phone numbers in text. */
+public final class DialerBidiFormatter {
+
+  /** Unicode "Left-To-Right Embedding" (LRE) character. */
+  private static final char LRE = '\u202A';
+
+  /** Unicode "Pop Directional Formatting" (PDF) character. */
+  private static final char PDF = '\u202C';
+
+  private DialerBidiFormatter() {}
+
+  /**
+   * Divides the given text into segments, applies LTR formatting and adds TTS span to segments that
+   * are phone numbers, then reassembles the text.
+   *
+   * <p>Formatted phone numbers usually contain one or more whitespaces (e.g., "+1 650-253-0000",
+   * "(650) 253-0000", etc). The system mistakes such a number for tokens separated by whitespaces.
+   * Therefore, these numbers can't be correctly shown in a RTL context (e.g., "+1 650-253-0000"
+   * would be shown as "650-253-0000 1+".)
+   *
+   * <p>This method wraps phone numbers with Unicode formatting characters LRE & PDF to ensure phone
+   * numbers are always shown as LTR strings.
+   *
+   * <p>Note that the regex used to find phone numbers ({@link Patterns#PHONE}) will also match any
+   * number. As this method also adds TTS span to segments that match {@link Patterns#PHONE}, extra
+   * actions need to be taken if you don't want a number to be read as a phone number by TalkBack.
+   */
+  public static CharSequence format(@Nullable CharSequence text) {
+    if (TextUtils.isEmpty(text)) {
+      return text;
+    }
+
+    SpannableStringBuilder spannableStringBuilder = new SpannableStringBuilder();
+
+    // Find the start index and the end index of each segment matching the phone number pattern.
+    Matcher matcher = Patterns.PHONE.matcher(text.toString());
+
+    int currIndex = 0;
+    while (matcher.find()) {
+      int start = matcher.start();
+      int end = matcher.end();
+
+      // Handle the case where the input text doesn't start with a phone number.
+      if (currIndex < start) {
+        spannableStringBuilder.append(text.subSequence(currIndex, start));
+      }
+
+      // For a phone number, wrap it with Unicode characters LRE & PDF so that it will always be
+      // shown as a LTR string.
+      spannableStringBuilder.append(
+          PhoneNumberUtils.createTtsSpannable(
+              TextUtils.concat(
+                  String.valueOf(LRE), text.subSequence(start, end), String.valueOf(PDF))));
+
+      currIndex = end;
+    }
+
+    // Handle the case where the input doesn't end with a phone number.
+    if (currIndex < text.length()) {
+      spannableStringBuilder.append(text.subSequence(currIndex, text.length()));
+    }
+
+    return new SpannedString(spannableStringBuilder);
+  }
+}
diff --git a/java/com/android/dialer/i18n/LocaleUtils.java b/java/com/android/dialer/i18n/LocaleUtils.java
new file mode 100644
index 0000000..0532cc3
--- /dev/null
+++ b/java/com/android/dialer/i18n/LocaleUtils.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.dialer.i18n;
+
+import android.content.Context;
+import android.os.LocaleList;
+import java.util.Locale;
+
+/** Utilities for locale. */
+public final class LocaleUtils {
+
+  /** Returns the default locale of the device. */
+  public static Locale getLocale(Context context) {
+    LocaleList localList = context.getResources().getConfiguration().getLocales();
+    if (!localList.isEmpty()) {
+      return localList.get(0);
+    }
+    return Locale.getDefault();
+  }
+}
diff --git a/java/com/android/dialer/inject/ContextModule.java b/java/com/android/dialer/inject/ContextModule.java
index e3da08e..72febbb 100644
--- a/java/com/android/dialer/inject/ContextModule.java
+++ b/java/com/android/dialer/inject/ContextModule.java
@@ -18,18 +18,18 @@
 
 import android.content.Context;
 import android.support.annotation.NonNull;
-import com.android.dialer.common.Assert;
 import dagger.Module;
 import dagger.Provides;
 
 /** Provides the singleton application context object. */
 @Module
+@InstallIn(variants = {DialerVariant.DIALER_DEMO, DialerVariant.DIALER_TEST})
 public final class ContextModule {
 
   @NonNull private final Context context;
 
   public ContextModule(@NonNull Context appContext) {
-    this.context = Assert.isNotNull(appContext);
+    this.context = appContext;
   }
 
   @Provides
diff --git a/java/com/android/dialer/inject/DialerRootComponent.java b/java/com/android/dialer/inject/DialerRootComponent.java
new file mode 100644
index 0000000..e508e17
--- /dev/null
+++ b/java/com/android/dialer/inject/DialerRootComponent.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.dialer.inject;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Annotates the place with this annotation when a RootComponent is needed.
+ *
+ * <p>Usually users put this annotation on application class that is root of dependencies (the last
+ * thing to compile). The annotation processor will figure out what it needs to generate a variant
+ * root through dependencies.
+ *
+ * <p>Example:
+ *
+ * <pre>
+ * <code>
+ * @DialerRootComponent(variant = DialerVariant.DIALER_AOSP)
+ * public class RootDialerAosp {}
+ * </code>
+ * </pre>
+ */
+@Target(ElementType.TYPE)
+@Retention(RetentionPolicy.SOURCE)
+public @interface DialerRootComponent {
+  DialerVariant variant();
+
+  Class<?> injectClass() default Object.class;
+}
diff --git a/java/com/android/dialer/inject/DialerVariant.java b/java/com/android/dialer/inject/DialerVariant.java
new file mode 100644
index 0000000..2e5794f
--- /dev/null
+++ b/java/com/android/dialer/inject/DialerVariant.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.dialer.inject;
+
+/** Represents all dialer variants. */
+public enum DialerVariant {
+  // AOSP Dialer variants
+  DIALER_AOSP("DialerAosp"),
+  DIALER_AOSP_ESPRESSO("DialerAospEspresso"),
+  DIALER_ROBOLECTRIC("DialerRobolectric"),
+
+
+
+  // TEST variant will be used in situations where we need create in-test application class which
+  // doesn't belong to any variants listed above
+  DIALER_TEST("DialerTest"),
+  // Just for sample code in inject/demo.
+  DIALER_DEMO("DialerDemo");
+
+  private final String variant;
+
+  DialerVariant(String variant) {
+    this.variant = variant;
+  }
+
+  @Override
+  public String toString() {
+    return variant;
+  }
+}
diff --git a/java/com/android/dialer/inject/IncludeInDialerRoot.java b/java/com/android/dialer/inject/IncludeInDialerRoot.java
new file mode 100644
index 0000000..4e80055
--- /dev/null
+++ b/java/com/android/dialer/inject/IncludeInDialerRoot.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.dialer.inject;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Target;
+
+/**
+ * Annotates a type that should be included in Dialer Root Component. Typically, annotated types are
+ * HasComponent interfaces.
+ *
+ * <p>An example:
+ *
+ * <pre>
+ * <code>
+ * {@literal @}dagger.Subcomponent
+ * public abstract class SimulatorComponent {
+ *   public static SimulatorComponent get(Context context) {
+ *      return ((HasComponent)((HasRootComponent) context.getApplicationContext()).component())
+ *         .simulatorComponent();
+ *   }
+ *   {@literal @}IncludeInDialerRoot
+ *   public interface HasComponent {
+ *      SimulatorComponent simulatorComponent();
+ *  }
+ * }
+ * </code>
+ * </pre>
+ */
+@Target(ElementType.TYPE)
+public @interface IncludeInDialerRoot {
+  Class<?>[] modules() default {};
+}
diff --git a/java/com/android/dialer/inject/InstallIn.java b/java/com/android/dialer/inject/InstallIn.java
new file mode 100644
index 0000000..a6f973b
--- /dev/null
+++ b/java/com/android/dialer/inject/InstallIn.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.dialer.inject;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Target;
+
+/**
+ * Annotation for {@link dagger.Module dagger.Modules} which causes them to be installed in the
+ * specified variants.
+ *
+ * <p>It has a parameter for users to enter on which variants annotated module will be installed and
+ * also must be non-empty. Example:
+ *
+ * <pre>
+ * <code>
+ * @InstallIn(variants = {DialerVariant.DIALER_AOSP, DialerVariant.DIALER_TEST})
+ * public class Module1 {}
+ *
+ * </code>
+ * </pre>
+ */
+@Target(ElementType.TYPE)
+public @interface InstallIn {
+  DialerVariant[] variants();
+}
diff --git a/java/com/android/dialer/inject/RootComponentGeneratorMetadata.java b/java/com/android/dialer/inject/RootComponentGeneratorMetadata.java
new file mode 100644
index 0000000..924b41e
--- /dev/null
+++ b/java/com/android/dialer/inject/RootComponentGeneratorMetadata.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.dialer.inject;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Target;
+
+/**
+ * Only used by rootcomponent generator to store metadata for locating annotated class with {@link
+ * IncludeInDialerRoot}, {@link InstallIn}.
+ */
+@Target(ElementType.TYPE)
+public @interface RootComponentGeneratorMetadata {
+  String tag();
+
+  Class<?> annotatedClass();
+}
diff --git a/java/com/android/dialer/inject/demo/DemoDaggerApplication.java b/java/com/android/dialer/inject/demo/DemoDaggerApplication.java
new file mode 100644
index 0000000..ab40eca
--- /dev/null
+++ b/java/com/android/dialer/inject/demo/DemoDaggerApplication.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.dialer.inject.demo;
+
+import android.app.Application;
+import android.support.annotation.NonNull;
+import com.android.dialer.inject.ContextModule;
+import com.android.dialer.inject.DialerRootComponent;
+import com.android.dialer.inject.DialerVariant;
+import com.android.dialer.inject.HasRootComponent;
+
+/** Demo dialer dagger application. */
+@DialerRootComponent(variant = DialerVariant.DIALER_DEMO)
+public final class DemoDaggerApplication extends Application implements HasRootComponent {
+
+  private volatile Object rootComponent;
+
+  /** Returns a cached instance of application's root component. */
+  @Override
+  @NonNull
+  public final Object component() {
+    Object result = rootComponent;
+    if (result == null) {
+      synchronized (this) {
+        result = rootComponent;
+        if (result == null) {
+          rootComponent =
+              result = DaggerDialerDemo.builder().contextModule(new ContextModule(this)).build();
+        }
+      }
+    }
+    return result;
+  }
+
+  @Override
+  public void onCreate() {
+    super.onCreate();
+
+    DemoSubcomponent.get(this).demoObjects();
+  }
+}
diff --git a/java/com/android/dialer/inject/demo/DemoModule.java b/java/com/android/dialer/inject/demo/DemoModule.java
new file mode 100644
index 0000000..9917c7d
--- /dev/null
+++ b/java/com/android/dialer/inject/demo/DemoModule.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.dialer.inject.demo;
+
+import com.android.dialer.inject.DialerVariant;
+import com.android.dialer.inject.InstallIn;
+import dagger.Module;
+import dagger.Provides;
+import dagger.multibindings.IntoSet;
+
+/** Module for demo dagger application. */
+@Module
+@InstallIn(variants = DialerVariant.DIALER_DEMO)
+public final class DemoModule {
+
+  private DemoModule() {}
+
+  @Provides
+  @IntoSet
+  static DemoObject provide() {
+    return DemoObject.create("prod");
+  }
+}
diff --git a/java/com/android/dialer/inject/demo/DemoObject.java b/java/com/android/dialer/inject/demo/DemoObject.java
new file mode 100644
index 0000000..3c38621
--- /dev/null
+++ b/java/com/android/dialer/inject/demo/DemoObject.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.dialer.inject.demo;
+
+import com.google.auto.value.AutoValue;
+
+/** Object used to demonstrate dagger bindings. */
+@AutoValue
+abstract class DemoObject {
+
+  abstract String value();
+
+  static DemoObject create(String value) {
+    return new AutoValue_DemoObject(value);
+  }
+}
diff --git a/java/com/android/dialer/inject/demo/DemoSubcomponent.java b/java/com/android/dialer/inject/demo/DemoSubcomponent.java
new file mode 100644
index 0000000..3e4dd66
--- /dev/null
+++ b/java/com/android/dialer/inject/demo/DemoSubcomponent.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.dialer.inject.demo;
+
+import android.content.Context;
+import com.android.dialer.inject.HasRootComponent;
+import com.android.dialer.inject.IncludeInDialerRoot;
+import dagger.Subcomponent;
+import java.util.Set;
+
+/** Subcomponent for the demo dagger application. */
+@Subcomponent
+public abstract class DemoSubcomponent {
+
+  abstract Set<DemoObject> demoObjects();
+
+  public static DemoSubcomponent get(Context context) {
+    return ((HasComponent) ((HasRootComponent) context.getApplicationContext()).component())
+        .demoSubcomponent();
+  }
+
+  /** Used to refer to the root application component. */
+  @IncludeInDialerRoot
+  public interface HasComponent {
+    DemoSubcomponent demoSubcomponent();
+  }
+}
diff --git a/java/com/android/dialer/interactions/res/values-af/strings.xml b/java/com/android/dialer/interactions/res/values-af/strings.xml
index 462d71f..00ef0a7 100644
--- a/java/com/android/dialer/interactions/res/values-af/strings.xml
+++ b/java/com/android/dialer/interactions/res/values-af/strings.xml
@@ -1,23 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="sms_disambig_title" msgid="369677069797534410">"Kies nommer"</string>
-    <string name="call_disambig_title" msgid="2395382326030227603">"Kies nommer"</string>
-    <string name="make_primary" msgid="9069345357862475091">"Onthou hierdie keuse"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="sms_disambig_title">Kies nommer</string>
+  <string name="call_disambig_title">Kies nommer</string>
+  <string name="make_primary">Onthou hierdie keuse</string>
 </resources>
diff --git a/java/com/android/dialer/interactions/res/values-am/strings.xml b/java/com/android/dialer/interactions/res/values-am/strings.xml
index c765cc8..a71632c 100644
--- a/java/com/android/dialer/interactions/res/values-am/strings.xml
+++ b/java/com/android/dialer/interactions/res/values-am/strings.xml
@@ -1,23 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="sms_disambig_title" msgid="369677069797534410">"ቁጥር ምረጥ"</string>
-    <string name="call_disambig_title" msgid="2395382326030227603">"ቁጥር ምረጥ"</string>
-    <string name="make_primary" msgid="9069345357862475091">"ይህን ምርጫ አስታውስ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="sms_disambig_title">ቁጥር ምረጥ</string>
+  <string name="call_disambig_title">ቁጥር ምረጥ</string>
+  <string name="make_primary">ይህን ምርጫ አስታውስ</string>
 </resources>
diff --git a/java/com/android/dialer/interactions/res/values-ar/strings.xml b/java/com/android/dialer/interactions/res/values-ar/strings.xml
index 365e00d..586265c 100644
--- a/java/com/android/dialer/interactions/res/values-ar/strings.xml
+++ b/java/com/android/dialer/interactions/res/values-ar/strings.xml
@@ -1,23 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="sms_disambig_title" msgid="369677069797534410">"اختيار رقم"</string>
-    <string name="call_disambig_title" msgid="2395382326030227603">"اختيار رقم"</string>
-    <string name="make_primary" msgid="9069345357862475091">"تذكر هذا الاختيار"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="sms_disambig_title">اختيار رقم</string>
+  <string name="call_disambig_title">اختيار رقم</string>
+  <string name="make_primary">تذكر هذا الاختيار</string>
 </resources>
diff --git a/java/com/android/dialer/interactions/res/values-az/strings.xml b/java/com/android/dialer/interactions/res/values-az/strings.xml
index b45e24c..4a31724 100644
--- a/java/com/android/dialer/interactions/res/values-az/strings.xml
+++ b/java/com/android/dialer/interactions/res/values-az/strings.xml
@@ -1,23 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="sms_disambig_title" msgid="369677069797534410">"Nömrə seçin"</string>
-    <string name="call_disambig_title" msgid="2395382326030227603">"Nömrə seçin"</string>
-    <string name="make_primary" msgid="9069345357862475091">"Bu seçimi yadda saxla"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="sms_disambig_title">Nömrə seçin</string>
+  <string name="call_disambig_title">Nömrə seçin</string>
+  <string name="make_primary">Bu seçimi yadda saxla</string>
 </resources>
diff --git a/java/com/android/dialer/interactions/res/values-b+sr+Latn/strings.xml b/java/com/android/dialer/interactions/res/values-b+sr+Latn/strings.xml
index 46db1d6..49abc7a 100644
--- a/java/com/android/dialer/interactions/res/values-b+sr+Latn/strings.xml
+++ b/java/com/android/dialer/interactions/res/values-b+sr+Latn/strings.xml
@@ -1,23 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="sms_disambig_title" msgid="369677069797534410">"Izbor broja"</string>
-    <string name="call_disambig_title" msgid="2395382326030227603">"Izbor broja"</string>
-    <string name="make_primary" msgid="9069345357862475091">"Zapamti ovaj izbor"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="sms_disambig_title">Izbor broja</string>
+  <string name="call_disambig_title">Izbor broja</string>
+  <string name="make_primary">Zapamti ovaj izbor</string>
 </resources>
diff --git a/java/com/android/dialer/interactions/res/values-be/strings.xml b/java/com/android/dialer/interactions/res/values-be/strings.xml
index 9f125ee..6af88cd 100644
--- a/java/com/android/dialer/interactions/res/values-be/strings.xml
+++ b/java/com/android/dialer/interactions/res/values-be/strings.xml
@@ -1,23 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="sms_disambig_title" msgid="369677069797534410">"Выбар нумару"</string>
-    <string name="call_disambig_title" msgid="2395382326030227603">"Выбар нумару"</string>
-    <string name="make_primary" msgid="9069345357862475091">"Запомніць гэты выбар"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="sms_disambig_title">Выбар нумару</string>
+  <string name="call_disambig_title">Выбар нумару</string>
+  <string name="make_primary">Запомніць гэты выбар</string>
 </resources>
diff --git a/java/com/android/dialer/interactions/res/values-bg/strings.xml b/java/com/android/dialer/interactions/res/values-bg/strings.xml
index 12d4f74..311d7ac 100644
--- a/java/com/android/dialer/interactions/res/values-bg/strings.xml
+++ b/java/com/android/dialer/interactions/res/values-bg/strings.xml
@@ -1,23 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="sms_disambig_title" msgid="369677069797534410">"Избиране на номер"</string>
-    <string name="call_disambig_title" msgid="2395382326030227603">"Избиране на номер"</string>
-    <string name="make_primary" msgid="9069345357862475091">"Запомняне на този избор"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="sms_disambig_title">Избиране на номер</string>
+  <string name="call_disambig_title">Избиране на номер</string>
+  <string name="make_primary">Запомняне на този избор</string>
 </resources>
diff --git a/java/com/android/dialer/interactions/res/values-bn/strings.xml b/java/com/android/dialer/interactions/res/values-bn/strings.xml
index bf4a59e..1fbc893 100644
--- a/java/com/android/dialer/interactions/res/values-bn/strings.xml
+++ b/java/com/android/dialer/interactions/res/values-bn/strings.xml
@@ -1,23 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="sms_disambig_title" msgid="369677069797534410">"নম্বর বেছে নিন"</string>
-    <string name="call_disambig_title" msgid="2395382326030227603">"নম্বর বেছে নিন"</string>
-    <string name="make_primary" msgid="9069345357862475091">"এই পছন্দটিকে মনে রাখুন"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="sms_disambig_title">নম্বর বেছে নিন</string>
+  <string name="call_disambig_title">নম্বর বেছে নিন</string>
+  <string name="make_primary">এই পছন্দটিকে মনে রাখুন</string>
 </resources>
diff --git a/java/com/android/dialer/interactions/res/values-bs/strings.xml b/java/com/android/dialer/interactions/res/values-bs/strings.xml
index 24601b5..dd26727 100644
--- a/java/com/android/dialer/interactions/res/values-bs/strings.xml
+++ b/java/com/android/dialer/interactions/res/values-bs/strings.xml
@@ -1,23 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="sms_disambig_title" msgid="369677069797534410">"Odaberite broj"</string>
-    <string name="call_disambig_title" msgid="2395382326030227603">"Odaberite broj"</string>
-    <string name="make_primary" msgid="9069345357862475091">"Zapamti ovaj izbor"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="sms_disambig_title">Odaberite broj</string>
+  <string name="call_disambig_title">Odaberite broj</string>
+  <string name="make_primary">Zapamti ovaj odabir</string>
 </resources>
diff --git a/java/com/android/dialer/interactions/res/values-ca/strings.xml b/java/com/android/dialer/interactions/res/values-ca/strings.xml
index 981d6b6..1cb98e5 100644
--- a/java/com/android/dialer/interactions/res/values-ca/strings.xml
+++ b/java/com/android/dialer/interactions/res/values-ca/strings.xml
@@ -1,23 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="sms_disambig_title" msgid="369677069797534410">"Tria d\'un número"</string>
-    <string name="call_disambig_title" msgid="2395382326030227603">"Tria d\'un número"</string>
-    <string name="make_primary" msgid="9069345357862475091">"Recorda aquesta selecció"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="sms_disambig_title">Tria d\'un número</string>
+  <string name="call_disambig_title">Tria d\'un número</string>
+  <string name="make_primary">Recorda aquesta selecció</string>
 </resources>
diff --git a/java/com/android/dialer/interactions/res/values-cs/strings.xml b/java/com/android/dialer/interactions/res/values-cs/strings.xml
index cfdfa0e..d4f4e35 100644
--- a/java/com/android/dialer/interactions/res/values-cs/strings.xml
+++ b/java/com/android/dialer/interactions/res/values-cs/strings.xml
@@ -1,23 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="sms_disambig_title" msgid="369677069797534410">"Zvolte číslo"</string>
-    <string name="call_disambig_title" msgid="2395382326030227603">"Zvolte číslo"</string>
-    <string name="make_primary" msgid="9069345357862475091">"Zapamatovat tuto volbu"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="sms_disambig_title">Zvolte číslo</string>
+  <string name="call_disambig_title">Zvolte číslo</string>
+  <string name="make_primary">Zapamatovat tuto volbu</string>
 </resources>
diff --git a/java/com/android/dialer/interactions/res/values-da/strings.xml b/java/com/android/dialer/interactions/res/values-da/strings.xml
index bd3a4e3..c1beefb 100644
--- a/java/com/android/dialer/interactions/res/values-da/strings.xml
+++ b/java/com/android/dialer/interactions/res/values-da/strings.xml
@@ -1,23 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="sms_disambig_title" msgid="369677069797534410">"Vælg nummer"</string>
-    <string name="call_disambig_title" msgid="2395382326030227603">"Vælg nummer"</string>
-    <string name="make_primary" msgid="9069345357862475091">"Husk dette valg"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="sms_disambig_title">Vælg nummer</string>
+  <string name="call_disambig_title">Vælg nummer</string>
+  <string name="make_primary">Husk dette valg</string>
 </resources>
diff --git a/java/com/android/dialer/interactions/res/values-de/strings.xml b/java/com/android/dialer/interactions/res/values-de/strings.xml
index a6ba832..83e18cc 100644
--- a/java/com/android/dialer/interactions/res/values-de/strings.xml
+++ b/java/com/android/dialer/interactions/res/values-de/strings.xml
@@ -1,23 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="sms_disambig_title" msgid="369677069797534410">"Nummer auswählen"</string>
-    <string name="call_disambig_title" msgid="2395382326030227603">"Nummer auswählen"</string>
-    <string name="make_primary" msgid="9069345357862475091">"Auswahl speichern"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="sms_disambig_title">Nummer auswählen</string>
+  <string name="call_disambig_title">Nummer auswählen</string>
+  <string name="make_primary">Auswahl speichern</string>
 </resources>
diff --git a/java/com/android/dialer/interactions/res/values-el/strings.xml b/java/com/android/dialer/interactions/res/values-el/strings.xml
index 019316d..761c669 100644
--- a/java/com/android/dialer/interactions/res/values-el/strings.xml
+++ b/java/com/android/dialer/interactions/res/values-el/strings.xml
@@ -1,23 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="sms_disambig_title" msgid="369677069797534410">"Επιλέξτε αριθμό"</string>
-    <string name="call_disambig_title" msgid="2395382326030227603">"Επιλέξτε αριθμό"</string>
-    <string name="make_primary" msgid="9069345357862475091">"Διατήρηση αυτής της ρύθμισης"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="sms_disambig_title">Επιλέξτε αριθμό</string>
+  <string name="call_disambig_title">Επιλέξτε αριθμό</string>
+  <string name="make_primary">Διατήρηση αυτής της ρύθμισης</string>
 </resources>
diff --git a/java/com/android/dialer/interactions/res/values-en-rAU/strings.xml b/java/com/android/dialer/interactions/res/values-en-rAU/strings.xml
index be5719e..28cd507 100644
--- a/java/com/android/dialer/interactions/res/values-en-rAU/strings.xml
+++ b/java/com/android/dialer/interactions/res/values-en-rAU/strings.xml
@@ -1,23 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="sms_disambig_title" msgid="369677069797534410">"Choose number"</string>
-    <string name="call_disambig_title" msgid="2395382326030227603">"Choose number"</string>
-    <string name="make_primary" msgid="9069345357862475091">"Remember this choice"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="sms_disambig_title">Choose number</string>
+  <string name="call_disambig_title">Choose number</string>
+  <string name="make_primary">Remember this choice</string>
 </resources>
diff --git a/java/com/android/dialer/interactions/res/values-en-rGB/strings.xml b/java/com/android/dialer/interactions/res/values-en-rGB/strings.xml
index be5719e..28cd507 100644
--- a/java/com/android/dialer/interactions/res/values-en-rGB/strings.xml
+++ b/java/com/android/dialer/interactions/res/values-en-rGB/strings.xml
@@ -1,23 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="sms_disambig_title" msgid="369677069797534410">"Choose number"</string>
-    <string name="call_disambig_title" msgid="2395382326030227603">"Choose number"</string>
-    <string name="make_primary" msgid="9069345357862475091">"Remember this choice"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="sms_disambig_title">Choose number</string>
+  <string name="call_disambig_title">Choose number</string>
+  <string name="make_primary">Remember this choice</string>
 </resources>
diff --git a/java/com/android/dialer/interactions/res/values-en-rIN/strings.xml b/java/com/android/dialer/interactions/res/values-en-rIN/strings.xml
index be5719e..28cd507 100644
--- a/java/com/android/dialer/interactions/res/values-en-rIN/strings.xml
+++ b/java/com/android/dialer/interactions/res/values-en-rIN/strings.xml
@@ -1,23 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="sms_disambig_title" msgid="369677069797534410">"Choose number"</string>
-    <string name="call_disambig_title" msgid="2395382326030227603">"Choose number"</string>
-    <string name="make_primary" msgid="9069345357862475091">"Remember this choice"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="sms_disambig_title">Choose number</string>
+  <string name="call_disambig_title">Choose number</string>
+  <string name="make_primary">Remember this choice</string>
 </resources>
diff --git a/java/com/android/dialer/interactions/res/values-es-rUS/strings.xml b/java/com/android/dialer/interactions/res/values-es-rUS/strings.xml
index cc08f99..7a2034a 100644
--- a/java/com/android/dialer/interactions/res/values-es-rUS/strings.xml
+++ b/java/com/android/dialer/interactions/res/values-es-rUS/strings.xml
@@ -1,23 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="sms_disambig_title" msgid="369677069797534410">"Elige un número"</string>
-    <string name="call_disambig_title" msgid="2395382326030227603">"Elige un número"</string>
-    <string name="make_primary" msgid="9069345357862475091">"Recuerda esta opción"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="sms_disambig_title">Elige un número</string>
+  <string name="call_disambig_title">Elige un número</string>
+  <string name="make_primary">Recuerda esta opción</string>
 </resources>
diff --git a/java/com/android/dialer/interactions/res/values-es/strings.xml b/java/com/android/dialer/interactions/res/values-es/strings.xml
index d796418..2197a64 100644
--- a/java/com/android/dialer/interactions/res/values-es/strings.xml
+++ b/java/com/android/dialer/interactions/res/values-es/strings.xml
@@ -1,23 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="sms_disambig_title" msgid="369677069797534410">"Elige un número"</string>
-    <string name="call_disambig_title" msgid="2395382326030227603">"Elige un número"</string>
-    <string name="make_primary" msgid="9069345357862475091">"Recordar esta opción"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="sms_disambig_title">Elige un número</string>
+  <string name="call_disambig_title">Elige un número</string>
+  <string name="make_primary">Recordar esta opción</string>
 </resources>
diff --git a/java/com/android/dialer/interactions/res/values-et/strings.xml b/java/com/android/dialer/interactions/res/values-et/strings.xml
index e18cd35..da85bfc 100644
--- a/java/com/android/dialer/interactions/res/values-et/strings.xml
+++ b/java/com/android/dialer/interactions/res/values-et/strings.xml
@@ -1,23 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="sms_disambig_title" msgid="369677069797534410">"Valige number"</string>
-    <string name="call_disambig_title" msgid="2395382326030227603">"Valige number"</string>
-    <string name="make_primary" msgid="9069345357862475091">"Pea see valik meeles"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="sms_disambig_title">Valige number</string>
+  <string name="call_disambig_title">Valige number</string>
+  <string name="make_primary">Pea see valik meeles</string>
 </resources>
diff --git a/java/com/android/dialer/interactions/res/values-eu/strings.xml b/java/com/android/dialer/interactions/res/values-eu/strings.xml
index 3bf2d83..31777e4 100644
--- a/java/com/android/dialer/interactions/res/values-eu/strings.xml
+++ b/java/com/android/dialer/interactions/res/values-eu/strings.xml
@@ -1,23 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="sms_disambig_title" msgid="369677069797534410">"Aukeratu zenbakia"</string>
-    <string name="call_disambig_title" msgid="2395382326030227603">"Aukeratu zenbakia"</string>
-    <string name="make_primary" msgid="9069345357862475091">"Gogoratu aukera hau"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="sms_disambig_title">Aukeratu zenbakia</string>
+  <string name="call_disambig_title">Aukeratu zenbakia</string>
+  <string name="make_primary">Gogoratu aukera hau</string>
 </resources>
diff --git a/java/com/android/dialer/interactions/res/values-fa/strings.xml b/java/com/android/dialer/interactions/res/values-fa/strings.xml
index 16aad9d..8521e3e 100644
--- a/java/com/android/dialer/interactions/res/values-fa/strings.xml
+++ b/java/com/android/dialer/interactions/res/values-fa/strings.xml
@@ -1,23 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="sms_disambig_title" msgid="369677069797534410">"انتخاب شماره"</string>
-    <string name="call_disambig_title" msgid="2395382326030227603">"انتخاب شماره"</string>
-    <string name="make_primary" msgid="9069345357862475091">"این گزینه را به خاطر بسپار"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="sms_disambig_title">انتخاب شماره</string>
+  <string name="call_disambig_title">انتخاب شماره</string>
+  <string name="make_primary">این گزینه را به خاطر بسپار</string>
 </resources>
diff --git a/java/com/android/dialer/interactions/res/values-fi/strings.xml b/java/com/android/dialer/interactions/res/values-fi/strings.xml
index 139bdc2..d07d7bb 100644
--- a/java/com/android/dialer/interactions/res/values-fi/strings.xml
+++ b/java/com/android/dialer/interactions/res/values-fi/strings.xml
@@ -1,23 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="sms_disambig_title" msgid="369677069797534410">"Valitse numero"</string>
-    <string name="call_disambig_title" msgid="2395382326030227603">"Valitse numero"</string>
-    <string name="make_primary" msgid="9069345357862475091">"Muista valinta"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="sms_disambig_title">Valitse numero</string>
+  <string name="call_disambig_title">Valitse numero</string>
+  <string name="make_primary">Muista valinta</string>
 </resources>
diff --git a/java/com/android/dialer/interactions/res/values-fr-rCA/strings.xml b/java/com/android/dialer/interactions/res/values-fr-rCA/strings.xml
index ca76032..32ec33b 100644
--- a/java/com/android/dialer/interactions/res/values-fr-rCA/strings.xml
+++ b/java/com/android/dialer/interactions/res/values-fr-rCA/strings.xml
@@ -1,23 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="sms_disambig_title" msgid="369677069797534410">"Sélectionner un numéro"</string>
-    <string name="call_disambig_title" msgid="2395382326030227603">"Sélectionner un numéro"</string>
-    <string name="make_primary" msgid="9069345357862475091">"Mémoriser ce choix"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="sms_disambig_title">Sélectionner un numéro</string>
+  <string name="call_disambig_title">Sélectionner un numéro</string>
+  <string name="make_primary">Mémoriser ce choix</string>
 </resources>
diff --git a/java/com/android/dialer/interactions/res/values-fr/strings.xml b/java/com/android/dialer/interactions/res/values-fr/strings.xml
index ca76032..32ec33b 100644
--- a/java/com/android/dialer/interactions/res/values-fr/strings.xml
+++ b/java/com/android/dialer/interactions/res/values-fr/strings.xml
@@ -1,23 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="sms_disambig_title" msgid="369677069797534410">"Sélectionner un numéro"</string>
-    <string name="call_disambig_title" msgid="2395382326030227603">"Sélectionner un numéro"</string>
-    <string name="make_primary" msgid="9069345357862475091">"Mémoriser ce choix"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="sms_disambig_title">Sélectionner un numéro</string>
+  <string name="call_disambig_title">Sélectionner un numéro</string>
+  <string name="make_primary">Mémoriser ce choix</string>
 </resources>
diff --git a/java/com/android/dialer/interactions/res/values-gl/strings.xml b/java/com/android/dialer/interactions/res/values-gl/strings.xml
index a09ee71..1d2d457 100644
--- a/java/com/android/dialer/interactions/res/values-gl/strings.xml
+++ b/java/com/android/dialer/interactions/res/values-gl/strings.xml
@@ -1,23 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="sms_disambig_title" msgid="369677069797534410">"Escoller número"</string>
-    <string name="call_disambig_title" msgid="2395382326030227603">"Escoller número"</string>
-    <string name="make_primary" msgid="9069345357862475091">"Lembrar esta opción"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="sms_disambig_title">Escoller número</string>
+  <string name="call_disambig_title">Escoller número</string>
+  <string name="make_primary">Lembrar esta opción</string>
 </resources>
diff --git a/java/com/android/dialer/interactions/res/values-gu/strings.xml b/java/com/android/dialer/interactions/res/values-gu/strings.xml
index 84f25be..4f82985 100644
--- a/java/com/android/dialer/interactions/res/values-gu/strings.xml
+++ b/java/com/android/dialer/interactions/res/values-gu/strings.xml
@@ -1,23 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="sms_disambig_title" msgid="369677069797534410">"નંબર પસંદ કરો"</string>
-    <string name="call_disambig_title" msgid="2395382326030227603">"નંબર પસંદ કરો"</string>
-    <string name="make_primary" msgid="9069345357862475091">"આ પસંદ યાદ રાખો"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="sms_disambig_title">નંબર પસંદ કરો</string>
+  <string name="call_disambig_title">નંબર પસંદ કરો</string>
+  <string name="make_primary">આ પસંદ યાદ રાખો</string>
 </resources>
diff --git a/java/com/android/dialer/interactions/res/values-hi/strings.xml b/java/com/android/dialer/interactions/res/values-hi/strings.xml
index b373f3a..fd68763 100644
--- a/java/com/android/dialer/interactions/res/values-hi/strings.xml
+++ b/java/com/android/dialer/interactions/res/values-hi/strings.xml
@@ -1,23 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="sms_disambig_title" msgid="369677069797534410">"नंबर चुनें"</string>
-    <string name="call_disambig_title" msgid="2395382326030227603">"नंबर चुनें"</string>
-    <string name="make_primary" msgid="9069345357862475091">"यह विकल्प याद रखें"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="sms_disambig_title">नंबर चुनें</string>
+  <string name="call_disambig_title">नंबर चुनें</string>
+  <string name="make_primary">यह विकल्प याद रखें</string>
 </resources>
diff --git a/java/com/android/dialer/interactions/res/values-hr/strings.xml b/java/com/android/dialer/interactions/res/values-hr/strings.xml
index 24601b5..a01dd05 100644
--- a/java/com/android/dialer/interactions/res/values-hr/strings.xml
+++ b/java/com/android/dialer/interactions/res/values-hr/strings.xml
@@ -1,23 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="sms_disambig_title" msgid="369677069797534410">"Odaberite broj"</string>
-    <string name="call_disambig_title" msgid="2395382326030227603">"Odaberite broj"</string>
-    <string name="make_primary" msgid="9069345357862475091">"Zapamti ovaj izbor"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="sms_disambig_title">Odaberite broj</string>
+  <string name="call_disambig_title">Odaberite broj</string>
+  <string name="make_primary">Zapamti ovaj izbor</string>
 </resources>
diff --git a/java/com/android/dialer/interactions/res/values-hu/strings.xml b/java/com/android/dialer/interactions/res/values-hu/strings.xml
index d71f73e..5f611f0 100644
--- a/java/com/android/dialer/interactions/res/values-hu/strings.xml
+++ b/java/com/android/dialer/interactions/res/values-hu/strings.xml
@@ -1,23 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="sms_disambig_title" msgid="369677069797534410">"Válassza ki a számot"</string>
-    <string name="call_disambig_title" msgid="2395382326030227603">"Válassza ki a számot"</string>
-    <string name="make_primary" msgid="9069345357862475091">"Választás megjegyzése"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="sms_disambig_title">Válassza ki a számot</string>
+  <string name="call_disambig_title">Válassza ki a számot</string>
+  <string name="make_primary">Választás megjegyzése</string>
 </resources>
diff --git a/java/com/android/dialer/interactions/res/values-hy/strings.xml b/java/com/android/dialer/interactions/res/values-hy/strings.xml
index b3c8342..8f9423a 100644
--- a/java/com/android/dialer/interactions/res/values-hy/strings.xml
+++ b/java/com/android/dialer/interactions/res/values-hy/strings.xml
@@ -1,23 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="sms_disambig_title" msgid="369677069797534410">"Ընտրել համարը"</string>
-    <string name="call_disambig_title" msgid="2395382326030227603">"Ընտրել համարը"</string>
-    <string name="make_primary" msgid="9069345357862475091">"Հիշել այս ընտրությունը"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="sms_disambig_title">Ընտրել համարը</string>
+  <string name="call_disambig_title">Ընտրել համարը</string>
+  <string name="make_primary">Հիշել այս ընտրությունը</string>
 </resources>
diff --git a/java/com/android/dialer/interactions/res/values-in/strings.xml b/java/com/android/dialer/interactions/res/values-in/strings.xml
index 16fe6cf..2d69ef6 100644
--- a/java/com/android/dialer/interactions/res/values-in/strings.xml
+++ b/java/com/android/dialer/interactions/res/values-in/strings.xml
@@ -1,23 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="sms_disambig_title" msgid="369677069797534410">"Pilih nomor"</string>
-    <string name="call_disambig_title" msgid="2395382326030227603">"Pilih nomor"</string>
-    <string name="make_primary" msgid="9069345357862475091">"Ingat pilihan ini"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="sms_disambig_title">Pilih nomor</string>
+  <string name="call_disambig_title">Pilih nomor</string>
+  <string name="make_primary">Ingat pilihan ini</string>
 </resources>
diff --git a/java/com/android/dialer/interactions/res/values-is/strings.xml b/java/com/android/dialer/interactions/res/values-is/strings.xml
index 9da665b..c42b5a5 100644
--- a/java/com/android/dialer/interactions/res/values-is/strings.xml
+++ b/java/com/android/dialer/interactions/res/values-is/strings.xml
@@ -1,23 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="sms_disambig_title" msgid="369677069797534410">"Veldu símanúmer"</string>
-    <string name="call_disambig_title" msgid="2395382326030227603">"Veldu símanúmer"</string>
-    <string name="make_primary" msgid="9069345357862475091">"Muna þetta val"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="sms_disambig_title">Veldu símanúmer</string>
+  <string name="call_disambig_title">Veldu símanúmer</string>
+  <string name="make_primary">Muna þetta val</string>
 </resources>
diff --git a/java/com/android/dialer/interactions/res/values-it/strings.xml b/java/com/android/dialer/interactions/res/values-it/strings.xml
index 237b5e8..93575fb 100644
--- a/java/com/android/dialer/interactions/res/values-it/strings.xml
+++ b/java/com/android/dialer/interactions/res/values-it/strings.xml
@@ -1,23 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="sms_disambig_title" msgid="369677069797534410">"Scegli numero"</string>
-    <string name="call_disambig_title" msgid="2395382326030227603">"Scegli numero"</string>
-    <string name="make_primary" msgid="9069345357862475091">"Memorizza questa scelta"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="sms_disambig_title">Scegli numero</string>
+  <string name="call_disambig_title">Scegli numero</string>
+  <string name="make_primary">Memorizza questa scelta</string>
 </resources>
diff --git a/java/com/android/dialer/interactions/res/values-iw/strings.xml b/java/com/android/dialer/interactions/res/values-iw/strings.xml
index afde7a4..b435c81 100644
--- a/java/com/android/dialer/interactions/res/values-iw/strings.xml
+++ b/java/com/android/dialer/interactions/res/values-iw/strings.xml
@@ -1,23 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="sms_disambig_title" msgid="369677069797534410">"בחר מספר"</string>
-    <string name="call_disambig_title" msgid="2395382326030227603">"בחר מספר"</string>
-    <string name="make_primary" msgid="9069345357862475091">"זכור בחירה זו"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="sms_disambig_title">בחר מספר</string>
+  <string name="call_disambig_title">בחר מספר</string>
+  <string name="make_primary">זכור בחירה זו</string>
 </resources>
diff --git a/java/com/android/dialer/interactions/res/values-ja/strings.xml b/java/com/android/dialer/interactions/res/values-ja/strings.xml
index dca4bd1..df66918 100644
--- a/java/com/android/dialer/interactions/res/values-ja/strings.xml
+++ b/java/com/android/dialer/interactions/res/values-ja/strings.xml
@@ -1,23 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="sms_disambig_title" msgid="369677069797534410">"番号を選択"</string>
-    <string name="call_disambig_title" msgid="2395382326030227603">"番号を選択"</string>
-    <string name="make_primary" msgid="9069345357862475091">"この選択を保存"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="sms_disambig_title">番号を選択</string>
+  <string name="call_disambig_title">番号を選択</string>
+  <string name="make_primary">この選択を保存</string>
 </resources>
diff --git a/java/com/android/dialer/interactions/res/values-ka/strings.xml b/java/com/android/dialer/interactions/res/values-ka/strings.xml
index 4365d74..3ff85bd 100644
--- a/java/com/android/dialer/interactions/res/values-ka/strings.xml
+++ b/java/com/android/dialer/interactions/res/values-ka/strings.xml
@@ -1,23 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="sms_disambig_title" msgid="369677069797534410">"ნომრის შერჩევა"</string>
-    <string name="call_disambig_title" msgid="2395382326030227603">"ნომრის შერჩევა"</string>
-    <string name="make_primary" msgid="9069345357862475091">"დაიმახსოვრე ეს არჩევანი"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="sms_disambig_title">ნომრის შერჩევა</string>
+  <string name="call_disambig_title">ნომრის შერჩევა</string>
+  <string name="make_primary">დაიმახსოვრე ეს არჩევანი</string>
 </resources>
diff --git a/java/com/android/dialer/interactions/res/values-kk/strings.xml b/java/com/android/dialer/interactions/res/values-kk/strings.xml
index 3420cf7..da38123 100644
--- a/java/com/android/dialer/interactions/res/values-kk/strings.xml
+++ b/java/com/android/dialer/interactions/res/values-kk/strings.xml
@@ -1,23 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="sms_disambig_title" msgid="369677069797534410">"Нөмірді таңдау"</string>
-    <string name="call_disambig_title" msgid="2395382326030227603">"Нөмірді таңдау"</string>
-    <string name="make_primary" msgid="9069345357862475091">"Бұл таңдау есте сақталсын."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="sms_disambig_title">Нөмірді таңдау</string>
+  <string name="call_disambig_title">Нөмірді таңдау</string>
+  <string name="make_primary">Бұл таңдау есте сақталсын.</string>
 </resources>
diff --git a/java/com/android/dialer/interactions/res/values-km/strings.xml b/java/com/android/dialer/interactions/res/values-km/strings.xml
index 18da3af..3ca7211 100644
--- a/java/com/android/dialer/interactions/res/values-km/strings.xml
+++ b/java/com/android/dialer/interactions/res/values-km/strings.xml
@@ -1,23 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="sms_disambig_title" msgid="369677069797534410">"ជ្រើស​លេខ"</string>
-    <string name="call_disambig_title" msgid="2395382326030227603">"ជ្រើស​លេខ"</string>
-    <string name="make_primary" msgid="9069345357862475091">"ចងចាំ​ជម្រើស​នេះ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="sms_disambig_title">ជ្រើស​លេខ</string>
+  <string name="call_disambig_title">ជ្រើស​លេខ</string>
+  <string name="make_primary">ចងចាំ​ជម្រើស​នេះ</string>
 </resources>
diff --git a/java/com/android/dialer/interactions/res/values-kn/strings.xml b/java/com/android/dialer/interactions/res/values-kn/strings.xml
index e75a425..f956fe3 100644
--- a/java/com/android/dialer/interactions/res/values-kn/strings.xml
+++ b/java/com/android/dialer/interactions/res/values-kn/strings.xml
@@ -1,23 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="sms_disambig_title" msgid="369677069797534410">"ಸಂಖ್ಯೆಯನ್ನು ಆಯ್ಕೆಮಾಡಿ"</string>
-    <string name="call_disambig_title" msgid="2395382326030227603">"ಸಂಖ್ಯೆಯನ್ನು ಆಯ್ಕೆಮಾಡಿ"</string>
-    <string name="make_primary" msgid="9069345357862475091">"ಈ ಆಯ್ಕೆಯನ್ನು ನೆನಪಿಡಿ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="sms_disambig_title">ಸಂಖ್ಯೆಯನ್ನು ಆಯ್ಕೆಮಾಡಿ</string>
+  <string name="call_disambig_title">ಸಂಖ್ಯೆಯನ್ನು ಆಯ್ಕೆಮಾಡಿ</string>
+  <string name="make_primary">ಈ ಆಯ್ಕೆಯನ್ನು ನೆನಪಿಡಿ</string>
 </resources>
diff --git a/java/com/android/dialer/interactions/res/values-ko/strings.xml b/java/com/android/dialer/interactions/res/values-ko/strings.xml
index e3aa47f..65ef960 100644
--- a/java/com/android/dialer/interactions/res/values-ko/strings.xml
+++ b/java/com/android/dialer/interactions/res/values-ko/strings.xml
@@ -1,23 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="sms_disambig_title" msgid="369677069797534410">"번호 선택"</string>
-    <string name="call_disambig_title" msgid="2395382326030227603">"번호 선택"</string>
-    <string name="make_primary" msgid="9069345357862475091">"이 선택사항 저장"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="sms_disambig_title">번호 선택</string>
+  <string name="call_disambig_title">번호 선택</string>
+  <string name="make_primary">이 선택사항 저장</string>
 </resources>
diff --git a/java/com/android/dialer/interactions/res/values-ky/strings.xml b/java/com/android/dialer/interactions/res/values-ky/strings.xml
index 1691704..5d22745 100644
--- a/java/com/android/dialer/interactions/res/values-ky/strings.xml
+++ b/java/com/android/dialer/interactions/res/values-ky/strings.xml
@@ -1,23 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="sms_disambig_title" msgid="369677069797534410">"Номур тандаңыз"</string>
-    <string name="call_disambig_title" msgid="2395382326030227603">"Номур тандаңыз"</string>
-    <string name="make_primary" msgid="9069345357862475091">"Бул тандоону эстеп калуу"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="sms_disambig_title">Номур тандаңыз</string>
+  <string name="call_disambig_title">Номур тандаңыз</string>
+  <string name="make_primary">Бул тандоону эстеп калуу</string>
 </resources>
diff --git a/java/com/android/dialer/interactions/res/values-lo/strings.xml b/java/com/android/dialer/interactions/res/values-lo/strings.xml
index 0a0b494..c0b4972 100644
--- a/java/com/android/dialer/interactions/res/values-lo/strings.xml
+++ b/java/com/android/dialer/interactions/res/values-lo/strings.xml
@@ -1,23 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="sms_disambig_title" msgid="369677069797534410">"ເລືອກເບີໂທ"</string>
-    <string name="call_disambig_title" msgid="2395382326030227603">"ເລືອກເບີໂທ"</string>
-    <string name="make_primary" msgid="9069345357862475091">"ຈື່ການເລືອກນີ້"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="sms_disambig_title">ເລືອກເບີໂທ</string>
+  <string name="call_disambig_title">ເລືອກເບີໂທ</string>
+  <string name="make_primary">ຈື່ການເລືອກນີ້</string>
 </resources>
diff --git a/java/com/android/dialer/interactions/res/values-lt/strings.xml b/java/com/android/dialer/interactions/res/values-lt/strings.xml
index bf16ad9..e0e3c1a 100644
--- a/java/com/android/dialer/interactions/res/values-lt/strings.xml
+++ b/java/com/android/dialer/interactions/res/values-lt/strings.xml
@@ -1,23 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="sms_disambig_title" msgid="369677069797534410">"Pasirinkite numerį"</string>
-    <string name="call_disambig_title" msgid="2395382326030227603">"Pasirinkite numerį"</string>
-    <string name="make_primary" msgid="9069345357862475091">"Atsiminti šį pasirinkimą"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="sms_disambig_title">Pasirinkite numerį</string>
+  <string name="call_disambig_title">Pasirinkite numerį</string>
+  <string name="make_primary">Atsiminti šį pasirinkimą</string>
 </resources>
diff --git a/java/com/android/dialer/interactions/res/values-lv/strings.xml b/java/com/android/dialer/interactions/res/values-lv/strings.xml
index 2a2982a..6ab44e7 100644
--- a/java/com/android/dialer/interactions/res/values-lv/strings.xml
+++ b/java/com/android/dialer/interactions/res/values-lv/strings.xml
@@ -1,23 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="sms_disambig_title" msgid="369677069797534410">"Numura izvēlēšanās"</string>
-    <string name="call_disambig_title" msgid="2395382326030227603">"Numura izvēlēšanās"</string>
-    <string name="make_primary" msgid="9069345357862475091">"Atcerēties šo izvēli"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="sms_disambig_title">Numura izvēlēšanās</string>
+  <string name="call_disambig_title">Numura izvēlēšanās</string>
+  <string name="make_primary">Atcerēties šo izvēli</string>
 </resources>
diff --git a/java/com/android/dialer/interactions/res/values-mk/strings.xml b/java/com/android/dialer/interactions/res/values-mk/strings.xml
index e8203a8..663b80c 100644
--- a/java/com/android/dialer/interactions/res/values-mk/strings.xml
+++ b/java/com/android/dialer/interactions/res/values-mk/strings.xml
@@ -1,23 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="sms_disambig_title" msgid="369677069797534410">"Избери број"</string>
-    <string name="call_disambig_title" msgid="2395382326030227603">"Избери број"</string>
-    <string name="make_primary" msgid="9069345357862475091">"Запомни го овој избор"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="sms_disambig_title">Избери број</string>
+  <string name="call_disambig_title">Избери број</string>
+  <string name="make_primary">Запомни го овој избор</string>
 </resources>
diff --git a/java/com/android/dialer/interactions/res/values-ml/strings.xml b/java/com/android/dialer/interactions/res/values-ml/strings.xml
index 5cfba53..8c1ca24 100644
--- a/java/com/android/dialer/interactions/res/values-ml/strings.xml
+++ b/java/com/android/dialer/interactions/res/values-ml/strings.xml
@@ -1,23 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="sms_disambig_title" msgid="369677069797534410">"നമ്പർ തിരഞ്ഞെടുക്കുക"</string>
-    <string name="call_disambig_title" msgid="2395382326030227603">"നമ്പർ തിരഞ്ഞെടുക്കുക"</string>
-    <string name="make_primary" msgid="9069345357862475091">"ഈ തിരഞ്ഞെടുക്കൽ ഓർക്കുക"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="sms_disambig_title">നമ്പർ തിരഞ്ഞെടുക്കുക</string>
+  <string name="call_disambig_title">നമ്പർ തിരഞ്ഞെടുക്കുക</string>
+  <string name="make_primary">ഈ തിരഞ്ഞെടുക്കൽ ഓർക്കുക</string>
 </resources>
diff --git a/java/com/android/dialer/interactions/res/values-mn/strings.xml b/java/com/android/dialer/interactions/res/values-mn/strings.xml
index ca9867b..f56c3ef 100644
--- a/java/com/android/dialer/interactions/res/values-mn/strings.xml
+++ b/java/com/android/dialer/interactions/res/values-mn/strings.xml
@@ -1,23 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="sms_disambig_title" msgid="369677069797534410">"Дугаар сонгоно уу"</string>
-    <string name="call_disambig_title" msgid="2395382326030227603">"Дугаар сонгоно уу"</string>
-    <string name="make_primary" msgid="9069345357862475091">"Энэ сонголтыг санах"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="sms_disambig_title">Дугаар сонгоно уу</string>
+  <string name="call_disambig_title">Дугаар сонгоно уу</string>
+  <string name="make_primary">Энэ сонголтыг санах</string>
 </resources>
diff --git a/java/com/android/dialer/interactions/res/values-mr/strings.xml b/java/com/android/dialer/interactions/res/values-mr/strings.xml
index 5e08e30..8e9cfa3 100644
--- a/java/com/android/dialer/interactions/res/values-mr/strings.xml
+++ b/java/com/android/dialer/interactions/res/values-mr/strings.xml
@@ -1,23 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="sms_disambig_title" msgid="369677069797534410">"नंबर निवडा"</string>
-    <string name="call_disambig_title" msgid="2395382326030227603">"नंबर निवडा"</string>
-    <string name="make_primary" msgid="9069345357862475091">"ही निवड लक्षात ठेवा"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="sms_disambig_title">नंबर निवडा</string>
+  <string name="call_disambig_title">नंबर निवडा</string>
+  <string name="make_primary">ही निवड लक्षात ठेवा</string>
 </resources>
diff --git a/java/com/android/dialer/interactions/res/values-ms/strings.xml b/java/com/android/dialer/interactions/res/values-ms/strings.xml
index 4553fdc..5cf6a02 100644
--- a/java/com/android/dialer/interactions/res/values-ms/strings.xml
+++ b/java/com/android/dialer/interactions/res/values-ms/strings.xml
@@ -1,23 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="sms_disambig_title" msgid="369677069797534410">"Pilih nombor"</string>
-    <string name="call_disambig_title" msgid="2395382326030227603">"Pilih nombor"</string>
-    <string name="make_primary" msgid="9069345357862475091">"Ingat pilihan ini"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="sms_disambig_title">Pilih nombor</string>
+  <string name="call_disambig_title">Pilih nombor</string>
+  <string name="make_primary">Ingat pilihan ini</string>
 </resources>
diff --git a/java/com/android/dialer/interactions/res/values-my/strings.xml b/java/com/android/dialer/interactions/res/values-my/strings.xml
index 5bb7530..8f07849 100644
--- a/java/com/android/dialer/interactions/res/values-my/strings.xml
+++ b/java/com/android/dialer/interactions/res/values-my/strings.xml
@@ -1,23 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="sms_disambig_title" msgid="369677069797534410">"နံပါတ်ရွေးပါ"</string>
-    <string name="call_disambig_title" msgid="2395382326030227603">"နံပါတ်ရွေးပါ"</string>
-    <string name="make_primary" msgid="9069345357862475091">"ဒီရွေးချယ်မှုကို မှတ်ထားပါ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="sms_disambig_title">နံပါတ်ရွေးပါ</string>
+  <string name="call_disambig_title">နံပါတ်ရွေးပါ</string>
+  <string name="make_primary">ဒီရွေးချယ်မှုကို မှတ်ထားပါ</string>
 </resources>
diff --git a/java/com/android/dialer/interactions/res/values-nb/strings.xml b/java/com/android/dialer/interactions/res/values-nb/strings.xml
index 9482949..5b78aa9 100644
--- a/java/com/android/dialer/interactions/res/values-nb/strings.xml
+++ b/java/com/android/dialer/interactions/res/values-nb/strings.xml
@@ -1,23 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="sms_disambig_title" msgid="369677069797534410">"Velg nummer"</string>
-    <string name="call_disambig_title" msgid="2395382326030227603">"Velg nummer"</string>
-    <string name="make_primary" msgid="9069345357862475091">"Husk dette valget"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="sms_disambig_title">Velg nummer</string>
+  <string name="call_disambig_title">Velg nummer</string>
+  <string name="make_primary">Husk dette valget</string>
 </resources>
diff --git a/java/com/android/dialer/interactions/res/values-ne/strings.xml b/java/com/android/dialer/interactions/res/values-ne/strings.xml
index 4d672b2..e36942c 100644
--- a/java/com/android/dialer/interactions/res/values-ne/strings.xml
+++ b/java/com/android/dialer/interactions/res/values-ne/strings.xml
@@ -1,23 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="sms_disambig_title" msgid="369677069797534410">"नम्बर छान्नुहोस्"</string>
-    <string name="call_disambig_title" msgid="2395382326030227603">"नम्बर छान्नुहोस्"</string>
-    <string name="make_primary" msgid="9069345357862475091">"यो छनौट याद राख्नुहोस्"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="sms_disambig_title">नम्बर छान्नुहोस्</string>
+  <string name="call_disambig_title">नम्बर छान्नुहोस्</string>
+  <string name="make_primary">यो छनौट याद राख्नुहोस्</string>
 </resources>
diff --git a/java/com/android/dialer/interactions/res/values-nl/strings.xml b/java/com/android/dialer/interactions/res/values-nl/strings.xml
index 5412d1c..d4158ea 100644
--- a/java/com/android/dialer/interactions/res/values-nl/strings.xml
+++ b/java/com/android/dialer/interactions/res/values-nl/strings.xml
@@ -1,23 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="sms_disambig_title" msgid="369677069797534410">"Nummer kiezen"</string>
-    <string name="call_disambig_title" msgid="2395382326030227603">"Nummer kiezen"</string>
-    <string name="make_primary" msgid="9069345357862475091">"Deze keuze onthouden"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="sms_disambig_title">Nummer kiezen</string>
+  <string name="call_disambig_title">Nummer kiezen</string>
+  <string name="make_primary">Deze keuze onthouden</string>
 </resources>
diff --git a/java/com/android/dialer/interactions/res/values-no/strings.xml b/java/com/android/dialer/interactions/res/values-no/strings.xml
index 9482949..5b78aa9 100644
--- a/java/com/android/dialer/interactions/res/values-no/strings.xml
+++ b/java/com/android/dialer/interactions/res/values-no/strings.xml
@@ -1,23 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="sms_disambig_title" msgid="369677069797534410">"Velg nummer"</string>
-    <string name="call_disambig_title" msgid="2395382326030227603">"Velg nummer"</string>
-    <string name="make_primary" msgid="9069345357862475091">"Husk dette valget"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="sms_disambig_title">Velg nummer</string>
+  <string name="call_disambig_title">Velg nummer</string>
+  <string name="make_primary">Husk dette valget</string>
 </resources>
diff --git a/java/com/android/dialer/interactions/res/values-pa/strings.xml b/java/com/android/dialer/interactions/res/values-pa/strings.xml
index da6b8b6..1d0fb71 100644
--- a/java/com/android/dialer/interactions/res/values-pa/strings.xml
+++ b/java/com/android/dialer/interactions/res/values-pa/strings.xml
@@ -1,23 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="sms_disambig_title" msgid="369677069797534410">"ਨੰਬਰ ਚੁਣੋ"</string>
-    <string name="call_disambig_title" msgid="2395382326030227603">"ਨੰਬਰ ਚੁਣੋ"</string>
-    <string name="make_primary" msgid="9069345357862475091">"ਇਹ ਚੋਣ ਯਾਦ ਰੱਖੋ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="sms_disambig_title">ਨੰਬਰ ਚੁਣੋ</string>
+  <string name="call_disambig_title">ਨੰਬਰ ਚੁਣੋ</string>
+  <string name="make_primary">ਇਹ ਚੋਣ ਯਾਦ ਰੱਖੋ</string>
 </resources>
diff --git a/java/com/android/dialer/interactions/res/values-pl/strings.xml b/java/com/android/dialer/interactions/res/values-pl/strings.xml
index 18664ce..c59f9c1 100644
--- a/java/com/android/dialer/interactions/res/values-pl/strings.xml
+++ b/java/com/android/dialer/interactions/res/values-pl/strings.xml
@@ -1,23 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="sms_disambig_title" msgid="369677069797534410">"Wybierz numer"</string>
-    <string name="call_disambig_title" msgid="2395382326030227603">"Wybierz numer"</string>
-    <string name="make_primary" msgid="9069345357862475091">"Zapamiętaj ten wybór"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="sms_disambig_title">Wybierz numer</string>
+  <string name="call_disambig_title">Wybierz numer</string>
+  <string name="make_primary">Zapamiętaj ten wybór</string>
 </resources>
diff --git a/java/com/android/dialer/interactions/res/values-pt-rBR/strings.xml b/java/com/android/dialer/interactions/res/values-pt-rBR/strings.xml
index b221c8c..414cb18 100644
--- a/java/com/android/dialer/interactions/res/values-pt-rBR/strings.xml
+++ b/java/com/android/dialer/interactions/res/values-pt-rBR/strings.xml
@@ -1,23 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="sms_disambig_title" msgid="369677069797534410">"Escolher número"</string>
-    <string name="call_disambig_title" msgid="2395382326030227603">"Escolher número"</string>
-    <string name="make_primary" msgid="9069345357862475091">"Lembrar desta escolha"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="sms_disambig_title">Escolher número</string>
+  <string name="call_disambig_title">Escolher número</string>
+  <string name="make_primary">Lembrar desta escolha</string>
 </resources>
diff --git a/java/com/android/dialer/interactions/res/values-pt-rPT/strings.xml b/java/com/android/dialer/interactions/res/values-pt-rPT/strings.xml
index 792fa3b..edab743 100644
--- a/java/com/android/dialer/interactions/res/values-pt-rPT/strings.xml
+++ b/java/com/android/dialer/interactions/res/values-pt-rPT/strings.xml
@@ -1,23 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="sms_disambig_title" msgid="369677069797534410">"Selecionar número"</string>
-    <string name="call_disambig_title" msgid="2395382326030227603">"Selecionar número"</string>
-    <string name="make_primary" msgid="9069345357862475091">"Memorizar esta escolha"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="sms_disambig_title">Selecionar número</string>
+  <string name="call_disambig_title">Selecionar número</string>
+  <string name="make_primary">Memorizar esta escolha</string>
 </resources>
diff --git a/java/com/android/dialer/interactions/res/values-pt/strings.xml b/java/com/android/dialer/interactions/res/values-pt/strings.xml
index b221c8c..414cb18 100644
--- a/java/com/android/dialer/interactions/res/values-pt/strings.xml
+++ b/java/com/android/dialer/interactions/res/values-pt/strings.xml
@@ -1,23 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="sms_disambig_title" msgid="369677069797534410">"Escolher número"</string>
-    <string name="call_disambig_title" msgid="2395382326030227603">"Escolher número"</string>
-    <string name="make_primary" msgid="9069345357862475091">"Lembrar desta escolha"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="sms_disambig_title">Escolher número</string>
+  <string name="call_disambig_title">Escolher número</string>
+  <string name="make_primary">Lembrar desta escolha</string>
 </resources>
diff --git a/java/com/android/dialer/interactions/res/values-ro/strings.xml b/java/com/android/dialer/interactions/res/values-ro/strings.xml
index d071e3c..0ae223d 100644
--- a/java/com/android/dialer/interactions/res/values-ro/strings.xml
+++ b/java/com/android/dialer/interactions/res/values-ro/strings.xml
@@ -1,23 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="sms_disambig_title" msgid="369677069797534410">"Selectați numărul"</string>
-    <string name="call_disambig_title" msgid="2395382326030227603">"Selectați numărul"</string>
-    <string name="make_primary" msgid="9069345357862475091">"Rețineți această alegere"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="sms_disambig_title">Selectați numărul</string>
+  <string name="call_disambig_title">Selectați numărul</string>
+  <string name="make_primary">Rețineți această alegere</string>
 </resources>
diff --git a/java/com/android/dialer/interactions/res/values-ru/strings.xml b/java/com/android/dialer/interactions/res/values-ru/strings.xml
index 4964ec9..b2d4914 100644
--- a/java/com/android/dialer/interactions/res/values-ru/strings.xml
+++ b/java/com/android/dialer/interactions/res/values-ru/strings.xml
@@ -1,23 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="sms_disambig_title" msgid="369677069797534410">"Выбор номера"</string>
-    <string name="call_disambig_title" msgid="2395382326030227603">"Выбор номера"</string>
-    <string name="make_primary" msgid="9069345357862475091">"Запомнить выбор"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="sms_disambig_title">Выбор номера</string>
+  <string name="call_disambig_title">Выбор номера</string>
+  <string name="make_primary">Запомнить выбор</string>
 </resources>
diff --git a/java/com/android/dialer/interactions/res/values-si/strings.xml b/java/com/android/dialer/interactions/res/values-si/strings.xml
index 7c65175..05a4a48 100644
--- a/java/com/android/dialer/interactions/res/values-si/strings.xml
+++ b/java/com/android/dialer/interactions/res/values-si/strings.xml
@@ -1,23 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="sms_disambig_title" msgid="369677069797534410">"අංකය තෝරන්න"</string>
-    <string name="call_disambig_title" msgid="2395382326030227603">"අංකය තෝරන්න"</string>
-    <string name="make_primary" msgid="9069345357862475091">"මෙම තේරීම මතක තබාගන්න"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="sms_disambig_title">අංකය තෝරන්න</string>
+  <string name="call_disambig_title">අංකය තෝරන්න</string>
+  <string name="make_primary">මෙම තේරීම මතක තබාගන්න</string>
 </resources>
diff --git a/java/com/android/dialer/interactions/res/values-sk/strings.xml b/java/com/android/dialer/interactions/res/values-sk/strings.xml
index 7a63698..0e1a09c 100644
--- a/java/com/android/dialer/interactions/res/values-sk/strings.xml
+++ b/java/com/android/dialer/interactions/res/values-sk/strings.xml
@@ -1,23 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="sms_disambig_title" msgid="369677069797534410">"Zvoľte číslo"</string>
-    <string name="call_disambig_title" msgid="2395382326030227603">"Zvoľte číslo"</string>
-    <string name="make_primary" msgid="9069345357862475091">"Zapamätať si túto voľbu"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="sms_disambig_title">Zvoľte číslo</string>
+  <string name="call_disambig_title">Zvoľte číslo</string>
+  <string name="make_primary">Zapamätať si túto voľbu</string>
 </resources>
diff --git a/java/com/android/dialer/interactions/res/values-sl/strings.xml b/java/com/android/dialer/interactions/res/values-sl/strings.xml
index 11dc463..7352c43 100644
--- a/java/com/android/dialer/interactions/res/values-sl/strings.xml
+++ b/java/com/android/dialer/interactions/res/values-sl/strings.xml
@@ -1,23 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="sms_disambig_title" msgid="369677069797534410">"Izberite številko"</string>
-    <string name="call_disambig_title" msgid="2395382326030227603">"Izberite številko"</string>
-    <string name="make_primary" msgid="9069345357862475091">"Zapomni si to izbiro"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="sms_disambig_title">Izberite številko</string>
+  <string name="call_disambig_title">Izberite številko</string>
+  <string name="make_primary">Zapomni si to izbiro</string>
 </resources>
diff --git a/java/com/android/dialer/interactions/res/values-sq/strings.xml b/java/com/android/dialer/interactions/res/values-sq/strings.xml
index d86218d..b120a76 100644
--- a/java/com/android/dialer/interactions/res/values-sq/strings.xml
+++ b/java/com/android/dialer/interactions/res/values-sq/strings.xml
@@ -1,23 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="sms_disambig_title" msgid="369677069797534410">"Zgjidh një numër"</string>
-    <string name="call_disambig_title" msgid="2395382326030227603">"Zgjidh një numër"</string>
-    <string name="make_primary" msgid="9069345357862475091">"Kujtoje këtë zgjedhje"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="sms_disambig_title">Zgjidh një numër</string>
+  <string name="call_disambig_title">Zgjidh një numër</string>
+  <string name="make_primary">Kujtoje këtë zgjedhje</string>
 </resources>
diff --git a/java/com/android/dialer/interactions/res/values-sr/strings.xml b/java/com/android/dialer/interactions/res/values-sr/strings.xml
index 8ed631e..8370397 100644
--- a/java/com/android/dialer/interactions/res/values-sr/strings.xml
+++ b/java/com/android/dialer/interactions/res/values-sr/strings.xml
@@ -1,23 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="sms_disambig_title" msgid="369677069797534410">"Избор броја"</string>
-    <string name="call_disambig_title" msgid="2395382326030227603">"Избор броја"</string>
-    <string name="make_primary" msgid="9069345357862475091">"Запамти овај избор"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="sms_disambig_title">Избор броја</string>
+  <string name="call_disambig_title">Избор броја</string>
+  <string name="make_primary">Запамти овај избор</string>
 </resources>
diff --git a/java/com/android/dialer/interactions/res/values-sv/strings.xml b/java/com/android/dialer/interactions/res/values-sv/strings.xml
index 04442e7..b2bfd61 100644
--- a/java/com/android/dialer/interactions/res/values-sv/strings.xml
+++ b/java/com/android/dialer/interactions/res/values-sv/strings.xml
@@ -1,23 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="sms_disambig_title" msgid="369677069797534410">"Välj nummer"</string>
-    <string name="call_disambig_title" msgid="2395382326030227603">"Välj nummer"</string>
-    <string name="make_primary" msgid="9069345357862475091">"Kom ihåg det här valet"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="sms_disambig_title">Välj nummer</string>
+  <string name="call_disambig_title">Välj nummer</string>
+  <string name="make_primary">Kom ihåg det här valet</string>
 </resources>
diff --git a/java/com/android/dialer/interactions/res/values-sw/strings.xml b/java/com/android/dialer/interactions/res/values-sw/strings.xml
index c55fb46..2c1bbb7 100644
--- a/java/com/android/dialer/interactions/res/values-sw/strings.xml
+++ b/java/com/android/dialer/interactions/res/values-sw/strings.xml
@@ -1,23 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="sms_disambig_title" msgid="369677069797534410">"Chagua nambari"</string>
-    <string name="call_disambig_title" msgid="2395382326030227603">"Chagua nambari"</string>
-    <string name="make_primary" msgid="9069345357862475091">"Kumbuka chaguo hili"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="sms_disambig_title">Chagua nambari</string>
+  <string name="call_disambig_title">Chagua nambari</string>
+  <string name="make_primary">Kumbuka chaguo hili</string>
 </resources>
diff --git a/java/com/android/dialer/interactions/res/values-ta/strings.xml b/java/com/android/dialer/interactions/res/values-ta/strings.xml
index 30fecc5..ac4ac73 100644
--- a/java/com/android/dialer/interactions/res/values-ta/strings.xml
+++ b/java/com/android/dialer/interactions/res/values-ta/strings.xml
@@ -1,23 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="sms_disambig_title" msgid="369677069797534410">"எண்ணைத் தேர்வுசெய்யவும்"</string>
-    <string name="call_disambig_title" msgid="2395382326030227603">"எண்ணைத் தேர்வுசெய்யவும்"</string>
-    <string name="make_primary" msgid="9069345357862475091">"இந்த விருப்பத்தை நினைவில்கொள்"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="sms_disambig_title">எண்ணைத் தேர்வுசெய்யவும்</string>
+  <string name="call_disambig_title">எண்ணைத் தேர்வுசெய்யவும்</string>
+  <string name="make_primary">இந்த விருப்பத்தை நினைவில்கொள்</string>
 </resources>
diff --git a/java/com/android/dialer/interactions/res/values-te/strings.xml b/java/com/android/dialer/interactions/res/values-te/strings.xml
index 4233681..fbea86f 100644
--- a/java/com/android/dialer/interactions/res/values-te/strings.xml
+++ b/java/com/android/dialer/interactions/res/values-te/strings.xml
@@ -1,23 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="sms_disambig_title" msgid="369677069797534410">"నంబర్‌ను ఎంచుకోండి"</string>
-    <string name="call_disambig_title" msgid="2395382326030227603">"నంబర్‌ను ఎంచుకోండి"</string>
-    <string name="make_primary" msgid="9069345357862475091">"ఈ ఎంపికను గుర్తుంచుకో"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="sms_disambig_title">నంబర్‌ను ఎంచుకోండి</string>
+  <string name="call_disambig_title">నంబర్‌ను ఎంచుకోండి</string>
+  <string name="make_primary">ఈ ఎంపికను గుర్తుంచుకో</string>
 </resources>
diff --git a/java/com/android/dialer/interactions/res/values-th/strings.xml b/java/com/android/dialer/interactions/res/values-th/strings.xml
index 755d477..78b7b06 100644
--- a/java/com/android/dialer/interactions/res/values-th/strings.xml
+++ b/java/com/android/dialer/interactions/res/values-th/strings.xml
@@ -1,23 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="sms_disambig_title" msgid="369677069797534410">"เลือกหมายเลข"</string>
-    <string name="call_disambig_title" msgid="2395382326030227603">"เลือกหมายเลข"</string>
-    <string name="make_primary" msgid="9069345357862475091">"จำตัวเลือกนี้"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="sms_disambig_title">เลือกหมายเลข</string>
+  <string name="call_disambig_title">เลือกหมายเลข</string>
+  <string name="make_primary">จำตัวเลือกนี้</string>
 </resources>
diff --git a/java/com/android/dialer/interactions/res/values-tl/strings.xml b/java/com/android/dialer/interactions/res/values-tl/strings.xml
index 6cfa8d6..ae2dca7 100644
--- a/java/com/android/dialer/interactions/res/values-tl/strings.xml
+++ b/java/com/android/dialer/interactions/res/values-tl/strings.xml
@@ -1,23 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="sms_disambig_title" msgid="369677069797534410">"Pumili ng numero"</string>
-    <string name="call_disambig_title" msgid="2395382326030227603">"Pumili ng numero"</string>
-    <string name="make_primary" msgid="9069345357862475091">"Tandaan ang pagpipiliang ito"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="sms_disambig_title">Pumili ng numero</string>
+  <string name="call_disambig_title">Pumili ng numero</string>
+  <string name="make_primary">Tandaan ang pagpipiliang ito</string>
 </resources>
diff --git a/java/com/android/dialer/interactions/res/values-tr/strings.xml b/java/com/android/dialer/interactions/res/values-tr/strings.xml
index da0f0e2..58d8229 100644
--- a/java/com/android/dialer/interactions/res/values-tr/strings.xml
+++ b/java/com/android/dialer/interactions/res/values-tr/strings.xml
@@ -1,23 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="sms_disambig_title" msgid="369677069797534410">"Numarayı seçin"</string>
-    <string name="call_disambig_title" msgid="2395382326030227603">"Numarayı seçin"</string>
-    <string name="make_primary" msgid="9069345357862475091">"Bu tercihi anımsa"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="sms_disambig_title">Numarayı seçin</string>
+  <string name="call_disambig_title">Numarayı seçin</string>
+  <string name="make_primary">Bu tercihi anımsa</string>
 </resources>
diff --git a/java/com/android/dialer/interactions/res/values-uk/strings.xml b/java/com/android/dialer/interactions/res/values-uk/strings.xml
index 8e72f87..8e6472c 100644
--- a/java/com/android/dialer/interactions/res/values-uk/strings.xml
+++ b/java/com/android/dialer/interactions/res/values-uk/strings.xml
@@ -1,23 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="sms_disambig_title" msgid="369677069797534410">"Вибрати номер"</string>
-    <string name="call_disambig_title" msgid="2395382326030227603">"Вибрати номер"</string>
-    <string name="make_primary" msgid="9069345357862475091">"Пам\'ятати цей вибір"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="sms_disambig_title">Вибрати номер</string>
+  <string name="call_disambig_title">Вибрати номер</string>
+  <string name="make_primary">Пам\'ятати цей вибір</string>
 </resources>
diff --git a/java/com/android/dialer/interactions/res/values-ur/strings.xml b/java/com/android/dialer/interactions/res/values-ur/strings.xml
index f716cce..c0556c4 100644
--- a/java/com/android/dialer/interactions/res/values-ur/strings.xml
+++ b/java/com/android/dialer/interactions/res/values-ur/strings.xml
@@ -1,23 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="sms_disambig_title" msgid="369677069797534410">"نمبر منتخب کریں"</string>
-    <string name="call_disambig_title" msgid="2395382326030227603">"نمبر منتخب کریں"</string>
-    <string name="make_primary" msgid="9069345357862475091">"یہ انتخاب یاد رکھیں"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="sms_disambig_title">نمبر منتخب کریں</string>
+  <string name="call_disambig_title">نمبر منتخب کریں</string>
+  <string name="make_primary">یہ انتخاب یاد رکھیں</string>
 </resources>
diff --git a/java/com/android/dialer/interactions/res/values-uz/strings.xml b/java/com/android/dialer/interactions/res/values-uz/strings.xml
index 026198c..5739945 100644
--- a/java/com/android/dialer/interactions/res/values-uz/strings.xml
+++ b/java/com/android/dialer/interactions/res/values-uz/strings.xml
@@ -1,23 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="sms_disambig_title" msgid="369677069797534410">"Raqamni tanlang"</string>
-    <string name="call_disambig_title" msgid="2395382326030227603">"Raqamni tanlang"</string>
-    <string name="make_primary" msgid="9069345357862475091">"Bu tanlov eslab qolinsin"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="sms_disambig_title">Raqamni tanlang</string>
+  <string name="call_disambig_title">Raqamni tanlang</string>
+  <string name="make_primary">Bu tanlov eslab qolinsin</string>
 </resources>
diff --git a/java/com/android/dialer/interactions/res/values-vi/strings.xml b/java/com/android/dialer/interactions/res/values-vi/strings.xml
index 4d268f6..b04386c 100644
--- a/java/com/android/dialer/interactions/res/values-vi/strings.xml
+++ b/java/com/android/dialer/interactions/res/values-vi/strings.xml
@@ -1,23 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="sms_disambig_title" msgid="369677069797534410">"Chọn số"</string>
-    <string name="call_disambig_title" msgid="2395382326030227603">"Chọn số"</string>
-    <string name="make_primary" msgid="9069345357862475091">"Nhớ lựa chọn này"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="sms_disambig_title">Chọn số</string>
+  <string name="call_disambig_title">Chọn số</string>
+  <string name="make_primary">Nhớ lựa chọn này</string>
 </resources>
diff --git a/java/com/android/dialer/interactions/res/values-zh-rCN/strings.xml b/java/com/android/dialer/interactions/res/values-zh-rCN/strings.xml
index eb28573..d998d08 100644
--- a/java/com/android/dialer/interactions/res/values-zh-rCN/strings.xml
+++ b/java/com/android/dialer/interactions/res/values-zh-rCN/strings.xml
@@ -1,23 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="sms_disambig_title" msgid="369677069797534410">"选择号码"</string>
-    <string name="call_disambig_title" msgid="2395382326030227603">"选择号码"</string>
-    <string name="make_primary" msgid="9069345357862475091">"记住此选择"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="sms_disambig_title">选择号码</string>
+  <string name="call_disambig_title">选择号码</string>
+  <string name="make_primary">记住此选择</string>
 </resources>
diff --git a/java/com/android/dialer/interactions/res/values-zh-rHK/strings.xml b/java/com/android/dialer/interactions/res/values-zh-rHK/strings.xml
index 1615a32..b5569f6 100644
--- a/java/com/android/dialer/interactions/res/values-zh-rHK/strings.xml
+++ b/java/com/android/dialer/interactions/res/values-zh-rHK/strings.xml
@@ -1,23 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="sms_disambig_title" msgid="369677069797534410">"選擇號碼"</string>
-    <string name="call_disambig_title" msgid="2395382326030227603">"選擇號碼"</string>
-    <string name="make_primary" msgid="9069345357862475091">"記住這個選擇"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="sms_disambig_title">選擇號碼</string>
+  <string name="call_disambig_title">選擇號碼</string>
+  <string name="make_primary">記住這個選擇</string>
 </resources>
diff --git a/java/com/android/dialer/interactions/res/values-zh-rTW/strings.xml b/java/com/android/dialer/interactions/res/values-zh-rTW/strings.xml
index 1615a32..b5569f6 100644
--- a/java/com/android/dialer/interactions/res/values-zh-rTW/strings.xml
+++ b/java/com/android/dialer/interactions/res/values-zh-rTW/strings.xml
@@ -1,23 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="sms_disambig_title" msgid="369677069797534410">"選擇號碼"</string>
-    <string name="call_disambig_title" msgid="2395382326030227603">"選擇號碼"</string>
-    <string name="make_primary" msgid="9069345357862475091">"記住這個選擇"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="sms_disambig_title">選擇號碼</string>
+  <string name="call_disambig_title">選擇號碼</string>
+  <string name="make_primary">記住這個選擇</string>
 </resources>
diff --git a/java/com/android/dialer/interactions/res/values-zu/strings.xml b/java/com/android/dialer/interactions/res/values-zu/strings.xml
index f0fabaa..04fd260 100644
--- a/java/com/android/dialer/interactions/res/values-zu/strings.xml
+++ b/java/com/android/dialer/interactions/res/values-zu/strings.xml
@@ -1,23 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="sms_disambig_title" msgid="369677069797534410">"Khetha inombolo"</string>
-    <string name="call_disambig_title" msgid="2395382326030227603">"Khetha inombolo"</string>
-    <string name="make_primary" msgid="9069345357862475091">"Khumbula lokhu okukhethiwe"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="sms_disambig_title">Khetha inombolo</string>
+  <string name="call_disambig_title">Khetha inombolo</string>
+  <string name="make_primary">Khumbula lokhu okukhethiwe</string>
 </resources>
diff --git a/java/com/android/dialer/location/CountryDetector.java b/java/com/android/dialer/location/CountryDetector.java
index 5c5ed9c..664bb50 100644
--- a/java/com/android/dialer/location/CountryDetector.java
+++ b/java/com/android/dialer/location/CountryDetector.java
@@ -16,10 +16,12 @@
 
 package com.android.dialer.location;
 
+import android.Manifest.permission;
 import android.app.PendingIntent;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
+import android.content.pm.PackageManager;
 import android.location.Address;
 import android.location.Geocoder;
 import android.location.Location;
@@ -35,7 +37,6 @@
 import com.android.dialer.common.LogUtil;
 import com.android.dialer.common.concurrent.DialerExecutor.Worker;
 import com.android.dialer.common.concurrent.DialerExecutorComponent;
-import com.android.dialer.util.PermissionsUtil;
 import java.util.List;
 import java.util.Locale;
 
@@ -98,8 +99,9 @@
     }
   }
 
+  @SuppressWarnings("missingPermission")
   private static void registerForLocationUpdates(Context context, LocationManager locationManager) {
-    if (!PermissionsUtil.hasLocationPermissions(context)) {
+    if (!hasLocationPermissions(context)) {
       LogUtil.w(
           "CountryDetector.registerForLocationUpdates",
           "no location permissions, not registering for location updates");
@@ -163,7 +165,7 @@
   @Nullable
   private String getLocationBasedCountryIso() {
     if (!Geocoder.isPresent()
-        || !PermissionsUtil.hasLocationPermissions(appContext)
+        || !hasLocationPermissions(appContext)
         || !UserManagerCompat.isUserUnlocked(appContext)) {
       return null;
     }
@@ -265,4 +267,9 @@
       return null;
     }
   }
+
+  private static boolean hasLocationPermissions(Context context) {
+    return context.checkSelfPermission(permission.ACCESS_FINE_LOCATION)
+        == PackageManager.PERMISSION_GRANTED;
+  }
 }
diff --git a/java/com/android/dialer/location/GeoUtil.java b/java/com/android/dialer/location/GeoUtil.java
index 27fbf23..8a875e8 100644
--- a/java/com/android/dialer/location/GeoUtil.java
+++ b/java/com/android/dialer/location/GeoUtil.java
@@ -22,7 +22,12 @@
 /** Static methods related to Geo. */
 public class GeoUtil {
 
-  /** @return the ISO 3166-1 two letters country code of the country the user is in. */
+  /**
+   * Return the ISO 3166-1 two letters country code of the country the user is in.
+   *
+   * <p>WARNING: {@link CountryDetector} caches TelephonyManager and other system services in a
+   * static. {@link CountryDetector#instance} must be reset in tests.
+   */
   public static String getCurrentCountryIso(Context context) {
     // The {@link CountryDetector} should never return null so this is safe to return as-is.
     Trace.beginSection("GeoUtil.getCurrentCountryIso");
diff --git a/java/com/android/dialer/logging/LoggingBindings.java b/java/com/android/dialer/logging/LoggingBindings.java
index ca9a053..9288324 100644
--- a/java/com/android/dialer/logging/LoggingBindings.java
+++ b/java/com/android/dialer/logging/LoggingBindings.java
@@ -16,6 +16,8 @@
 
 import android.app.Activity;
 import android.widget.QuickContactBadge;
+import com.google.auto.value.AutoValue;
+import java.util.Collection;
 
 /** Allows the container application to gather analytics. */
 public interface LoggingBindings {
@@ -87,4 +89,57 @@
 
   /** Logs successful People Api lookup result */
   void logSuccessfulPeopleApiLookupReport(long latency, int httpResponseCode);
+
+  /** Logs a call auto-blocked in call screening. */
+  void logAutoBlockedCall(String phoneNumber);
+
+  /** Logs annotated call log metrics. */
+  void logAnnotatedCallLogMetrics(int invalidNumbersInCallLog);
+
+  /** Logs annotated call log metrics. */
+  void logAnnotatedCallLogMetrics(int numberRowsThatDidPop, int numberRowsThatDidNotPop);
+
+  /** Logs contacts provider metrics. */
+  void logContactsProviderMetrics(Collection<ContactsProviderMatchInfo> matchInfos);
+
+  /** Input type for {@link #logContactsProviderMetrics(Collection)}. */
+  @AutoValue
+  abstract class ContactsProviderMatchInfo {
+    public abstract boolean matchedContact();
+
+    public abstract boolean inputNumberValid();
+
+    public abstract int inputNumberLength();
+
+    public abstract int matchedNumberLength();
+
+    public abstract boolean inputNumberHasPostdialDigits();
+
+    public abstract boolean matchedNumberHasPostdialDigits();
+
+    public static Builder builder() {
+      return new AutoValue_LoggingBindings_ContactsProviderMatchInfo.Builder()
+          .setMatchedContact(false)
+          .setMatchedNumberLength(0)
+          .setMatchedNumberHasPostdialDigits(false);
+    }
+
+    /** Builder. */
+    @AutoValue.Builder
+    public abstract static class Builder {
+      public abstract Builder setMatchedContact(boolean value);
+
+      public abstract Builder setInputNumberValid(boolean value);
+
+      public abstract Builder setInputNumberLength(int value);
+
+      public abstract Builder setMatchedNumberLength(int value);
+
+      public abstract Builder setInputNumberHasPostdialDigits(boolean value);
+
+      public abstract Builder setMatchedNumberHasPostdialDigits(boolean value);
+
+      public abstract ContactsProviderMatchInfo build();
+    }
+  }
 }
diff --git a/java/com/android/dialer/logging/LoggingBindingsStub.java b/java/com/android/dialer/logging/LoggingBindingsStub.java
index 2dbcc3f..9231782 100644
--- a/java/com/android/dialer/logging/LoggingBindingsStub.java
+++ b/java/com/android/dialer/logging/LoggingBindingsStub.java
@@ -16,6 +16,7 @@
 
 import android.app.Activity;
 import android.widget.QuickContactBadge;
+import java.util.Collection;
 
 /** Default implementation for logging bindings. */
 public class LoggingBindingsStub implements LoggingBindings {
@@ -61,4 +62,16 @@
 
   @Override
   public void logSuccessfulPeopleApiLookupReport(long latency, int httpResponseCode) {}
+
+  @Override
+  public void logAutoBlockedCall(String phoneNumber) {}
+
+  @Override
+  public void logAnnotatedCallLogMetrics(int invalidNumbersInCallLog) {}
+
+  @Override
+  public void logAnnotatedCallLogMetrics(int numberRowsThatDidPop, int numberRowsThatDidNotPop) {}
+
+  @Override
+  public void logContactsProviderMetrics(Collection<ContactsProviderMatchInfo> matchInfos) {}
 }
diff --git a/java/com/android/dialer/logging/contact_lookup_result.proto b/java/com/android/dialer/logging/contact_lookup_result.proto
index 673ade7..6dda2a6 100644
--- a/java/com/android/dialer/logging/contact_lookup_result.proto
+++ b/java/com/android/dialer/logging/contact_lookup_result.proto
@@ -100,5 +100,8 @@
     // Number was found in Dialer's local cache and was originally identified
     // as REMOTE_KNOWLEDGE_GRAPH
     LOCAL_CACHE_REMOTE_KNOWLEDGE_GRAPH = 25;
+
+    // Number was identified via Cequint caller ID.
+    CEQUINT = 26;
   }
 }
diff --git a/java/com/android/dialer/logging/contact_source.proto b/java/com/android/dialer/logging/contact_source.proto
index 7b90730..fbff642 100644
--- a/java/com/android/dialer/logging/contact_source.proto
+++ b/java/com/android/dialer/logging/contact_source.proto
@@ -16,8 +16,6 @@
   // number's status at the time they made or received the call.
   // Type definitions are from the CachedContactInfo interface in
   // CachedNumberLookupService.java
-  // When adding new sources here, consider updating the isPeopleApiSource() and
-  // isBusiness() methods in LookupSourceUtils.java if needed.
   enum Type {
     UNKNOWN_SOURCE_TYPE = 0;
 
diff --git a/java/com/android/dialer/logging/dialer_impression.proto b/java/com/android/dialer/logging/dialer_impression.proto
index 80249f4..f3173f8 100644
--- a/java/com/android/dialer/logging/dialer_impression.proto
+++ b/java/com/android/dialer/logging/dialer_impression.proto
@@ -12,7 +12,7 @@
   // Event enums to be used for Impression Logging in Dialer.
   // It's perfectly acceptable for this enum to be large
   // Values should be from 1000 to 100000.
-  // Next Tag: 1346
+  // Next Tag: 1409
   enum Type {
     UNKNOWN_AOSP_EVENT_TYPE = 1000;
 
@@ -78,9 +78,17 @@
 
         ;
 
+    // User made it to the last step but blocking failed because user is
+    // secondary or dialer is not default
+    USER_ACTION_BLOCK_NUMBER_FAILED = 1369;
+
     // User made it to the last step and actually unblocked the number
     USER_ACTION_UNBLOCKED_NUMBER = 1013;
 
+    // User made it to the last step but unblocking failed because user is
+    // secondary or dialer is not default
+    USER_ACTION_UNBLOCK_NUMBER_FAILED = 1370;
+
     // User blocked a number, does not guarantee if the number was reported as
     // spam or not To compute the number of blocked numbers that were reported
     // as not spam and yet blocked Subtract this value from
@@ -372,7 +380,7 @@
     VVM_SETTINGS_VIEWED = 1148;
     VVM_CHANGE_PIN_CLICKED = 1149;
     VVM_CHANGE_PIN_COMPLETED = 1150;
-    VVM_CHANGE_RINGTONE_CLICKED = 1151;
+    VVM_CHANGE_RINGTONE_CLICKED = 1151 [deprecated = true];
     VVM_CHANGE_VIBRATION_CLICKED = 1152;
     VVM_USER_ENABLED_IN_SETTINGS = 1153;
     VVM_USER_DISABLED_IN_SETTINGS = 1154;
@@ -594,14 +602,12 @@
     ASSISTED_DIALING_FEATURE_DISABLED_BY_USER = 1292;
 
     // User reports a same prefix call as spam from call history
-    REPORT_SAME_PREFIX_CALL_AS_SPAM_VIA_CALL_HISTORY =
-        1290
+    REPORT_SAME_PREFIX_CALL_AS_SPAM_VIA_CALL_HISTORY = 1290
 
         ;
 
     // User reports a same prefix call as not spam from call history
-    REPORT_SAME_PREFIX_CALL_AS_NOT_SPAM_VIA_CALL_HISTORY =
-        1291
+    REPORT_SAME_PREFIX_CALL_AS_NOT_SPAM_VIA_CALL_HISTORY = 1291
 
         ;
 
@@ -620,7 +626,11 @@
     DUAL_SIM_SELECTION_NON_SUGGESTED_SIM_SELECTED = 1304;
     DUAL_SIM_SELECTION_PREFERRED_SET = 1305;
     DUAL_SIM_SELECTION_PREFERRED_USED = 1306;
+    DUAL_SIM_SELECTION_PREFERRED_NOT_SELECTABLE = 1389;
     DUAL_SIM_SELECTION_GLOBAL_USED = 1307;
+    DUAL_SIM_SELECTION_GLOBAL_NOT_SELECTABLE = 1390;
+    DUAL_SIM_SELECTION_SUGGESTION_AUTO_SELECTED = 1322;
+    DUAL_SIM_SELECTION_SUGGESTION_AUTO_NOT_SELECTABLE = 1391;
 
     DUO_CALL_LOG_SET_UP_INSTALL = 1308;
     DUO_CALL_LOG_SET_UP_ACTIVATE = 1309;
@@ -649,8 +659,6 @@
     // Drag bubble to bottom and end call
     BUBBLE_V2_BOTTOM_ACTION_END_CALL = 1321;
 
-    DUAL_SIM_SELECTION_SUGGESTION_AUTO_SELECTED = 1322;
-
     // Bubble appears
     BUBBLE_V2_SHOW = 1323;
 
@@ -658,7 +666,7 @@
     DUO_CALL_LOG_SET_UP_ACTIVATE_SHOWN = 1325;
     DUO_CALL_LOG_INVITE_SHOWN = 1326;
 
-    // NUI bottom navigation bar
+    // NUI bottom navigation bar user actions
     MAIN_SWITCH_TAB_TO_FAVORITE = 1327;
     MAIN_SWITCH_TAB_TO_CALL_LOG = 1328;
     MAIN_SWITCH_TAB_TO_CONTACTS = 1329;
@@ -686,5 +694,108 @@
     ANNOTATED_CALL_LOG_CHANGES_NEEDED = 1344;
     // The call log was force refreshed and changes were needed.
     ANNOTATED_CALL_LOG_FORCE_REFRESH_CHANGES_NEEDED = 1345;
+
+    MAIN_VVM_TAB_VISIBLE = 1346;
+
+    // Main bottom navigation bar non user actions
+    MAIN_OPEN_WITH_TAB_FAVORITE = 1347;
+    MAIN_OPEN_WITH_TAB_CALL_LOG = 1348;
+    MAIN_OPEN_WITH_TAB_CONTACTS = 1349;
+    MAIN_OPEN_WITH_TAB_VOICEMAIL = 1350;
+    MAIN_OPEN_WITH_DIALPAD = 1351;
+
+    // Incoming call screened for spam auto blocking
+    INCOMING_CALL_SCREENED = 1352;
+    // Incoming call auto blocked as spam
+    INCOMING_CALL_AUTO_BLOCKED_AS_SPAM = 1353;
+    // Incoming voicemail screened for spam auto blocking
+    INCOMING_VOICEMAIL_SCREENED = 1354;
+    // Incoming voicemail auto blocked as spam
+    INCOMING_VOICEMAIL_AUTO_BLOCKED_AS_SPAM = 1355;
+    // User reported auto blocked spam call as spam
+    AUTO_BLOCKED_SPAM_CALL_REPORTED_AS_SPAM = 1356;
+    // User reported auto blocked spam call as not spam
+    AUTO_BLOCKED_SPAM_CALL_REPORTED_AS_NOT_SPAM = 1357;
+
+    // User enabled spam blocking through setting page.
+    SPAM_BLOCKING_ENABLED_THROUGH_SETTING = 1358;
+    // User disabled spam blocking through setting page.
+    SPAM_BLOCKING_DISABLED_THROUGH_SETTING = 1359;
+    // Failure happened while modifying spam blocking setting.
+    SPAM_BLOCKING_MODIFY_FAILURE_THROUGH_SETTING = 1360;
+
+    VVM_NOTIFICATIONS_SETTING_CLICKED = 1361;
+    VVM_USER_TURNED_TRANSCRIBE_ON_FROM_SETTINGS = 1362;
+    VVM_USER_TURNED_TRANSCRIBE_OFF_FROM_SETTINGS = 1363;
+    VVM_USER_TURNED_DONATION_ON_FROM_SETTINGS = 1364;
+    VVM_USER_TURNED_DONATION_OFF_FROM_SETTINGS = 1365;
+
+    // Spam blocking call log promo shown for user.
+    SPAM_BLOCKING_CALL_LOG_PROMO_SHOWN = 1366;
+    // User enabled spam blocking through call log promo.
+    SPAM_BLOCKING_ENABLED_THROUGH_CALL_LOG_PROMO = 1367;
+    // Failure happened while enabling spam blocking through call log promo.
+    SPAM_BLOCKING_MODIFY_FAILURE_THROUGH_CALL_LOG_PROMO = 1368;
+
+    TOKEN_FETCHER_NEED_USER_APPROVAL = 1371;
+    TOKEN_FETCHER_IO_EXCEPTION = 1372;
+    TOKEN_FETCHER_AUTH_EXCEPTION = 1373;
+    TOKEN_FETCHER_CLEAR_EXCEPTION = 1374;
+
+    PEOPLE_API_LOOKUP_FAILED = 1375;
+
+    // New Speed Dial impressions
+    LIGHTBRINGER_VIDEO_REQUESTED_FOR_FAVORITE_CONTACT = 1376;
+    LIGHTBRINGER_VIDEO_REQUESTED_FOR_SUGGESTED_CONTACT = 1377;
+    LIGHTBRINGER_VIDEO_REQUESTED_FOR_FAVORITE_CONTACT_DISAMBIG = 1378;
+
+    // Spam blocking after call notification promo shown for user.
+    SPAM_BLOCKING_AFTER_CALL_NOTIFICATION_PROMO_SHOWN = 1379;
+    // User enabled spam blocking through after call notification promo.
+    SPAM_BLOCKING_ENABLED_THROUGH_AFTER_CALL_NOTIFICATION_PROMO = 1380;
+    // Failure happened while enabling spam blocking through after call
+    // notification promo.
+    SPAM_BLOCKING_MODIFY_FAILURE_THROUGH_AFTER_CALL_NOTIFICATION_PROMO = 1381;
+
+    // RTT call impressions
+    OUTGOING_RTT_CALL = 1382;
+    INCOMING_RTT_CALL = 1383;
+    // The call turns into RTT call mid call.
+    RTT_MID_CALL_ENABLED = 1384;
+    // Mid call RTT request accepted.
+    RTT_MID_CALL_ACCEPTED = 1385;
+    // Mid call RTT request rejected.
+    RTT_MID_CALL_REJECTED = 1386;
+
+    // Send button clicked in RTT call, this includes send button on keyboard.
+    RTT_SEND_BUTTON_CLICKED = 1387;
+    RTT_KEYBOARD_SEND_BUTTON_CLICKED = 1388;
+
+    // For background calling
+    START_CALL_IN_BUBBLE_MODE = 1392;
+
+    // Switch audio route
+    IN_CALL_SWITCH_AUDIO_ROUTE_SPEAKER = 1393;
+    IN_CALL_SWITCH_AUDIO_ROUTE_WIRED_HEADSET = 1394;
+    IN_CALL_SWITCH_AUDIO_ROUTE_EARPIECE = 1395;
+    IN_CALL_SWITCH_AUDIO_ROUTE_BLUETOOTH = 1396;
+
+    // Impressions for PhoneLookup
+    PEOPLE_API_PHONE_LOOKUP_TIMEOUT = 1397;
+    CP2_EXTENDED_DIRECTORY_PHONE_LOOKUP_TIMEOUT = 1398;
+
+    // Favorite general
+    FAVORITE_ADD_FAVORITE = 1399;
+    FAVORITE_OPEN_DISAMBIG_DIALOG = 1400;
+    FAVORITE_REMOVE_FAVORITE_BY_DRAG_AND_DROP = 1401;
+    FAVORITE_MOVE_FAVORITE_BY_DRAG_AND_DROP = 1402;
+    // Favorite menu
+    FAVORITE_OPEN_FAVORITE_MENU = 1403;
+    FAVORITE_SEND_MESSAGE = 1404;
+    FAVORITE_OPEN_CONTACT_CARD = 1405;
+    FAVORITE_REMOVE_FAVORITE = 1406;  // Include drag and drop
+    // Favorite disambig
+    FAVORITE_SET_VIDEO_DEFAULT = 1407;
+    FAVORITE_SET_VOICE_DEFAULT = 1408;
   }
 }
diff --git a/java/com/android/dialer/logging/reporting_location.proto b/java/com/android/dialer/logging/reporting_location.proto
index b9912be..1d6ba47 100644
--- a/java/com/android/dialer/logging/reporting_location.proto
+++ b/java/com/android/dialer/logging/reporting_location.proto
@@ -15,5 +15,6 @@
     CALL_LOG_HISTORY = 1;
     FEEDBACK_PROMPT = 2;
     VOICEMAIL_HISTORY = 3;
+    CONTACT_DETAILS = 4;
   }
 }
diff --git a/java/com/android/dialer/logging/screen_event.proto b/java/com/android/dialer/logging/screen_event.proto
index 603f710..f4d0735 100644
--- a/java/com/android/dialer/logging/screen_event.proto
+++ b/java/com/android/dialer/logging/screen_event.proto
@@ -69,5 +69,12 @@
     BLOCKED_NUMBER_ADD_NUMBER = 19;
 
     CALL_DETAILS = 20;
+
+    MAIN_SPEED_DIAL = 21;
+    MAIN_CALL_LOG = 22;
+    MAIN_CONTACTS = 23;
+    MAIN_VOICEMAIL = 24;
+    MAIN_DIALPAD = 25;
+    MAIN_SEARCH = 26;
   }
 }
diff --git a/java/com/android/dialer/main/Main.java b/java/com/android/dialer/main/Main.java
deleted file mode 100644
index e7295f1..0000000
--- a/java/com/android/dialer/main/Main.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.dialer.main;
-
-import android.content.Context;
-
-/** Used to display the main activity for Dialer. This hosts favorites, dial pad, search, etc... */
-public interface Main {
-
-  boolean isNewUiEnabled(Context context);
-
-  // TODO(38502365): Remove this when we're ready to launch the new UI. */
-  void createNewUiLauncherShortcut(Context context);
-
-  void disableComponentForTesting(Context context);
-}
diff --git a/java/com/android/dialer/main/MainComponent.java b/java/com/android/dialer/main/MainComponent.java
deleted file mode 100644
index e735457..0000000
--- a/java/com/android/dialer/main/MainComponent.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.dialer.main;
-
-import android.content.Context;
-import com.android.dialer.inject.HasRootComponent;
-import com.android.dialer.main.impl.MainModule;
-import dagger.Subcomponent;
-
-/** Subcomponent that can be used to access the main implementation. */
-@Subcomponent(modules = MainModule.class)
-public abstract class MainComponent {
-
-  public abstract Main getMain();
-
-  public static MainComponent get(Context context) {
-    return ((HasComponent) ((HasRootComponent) context.getApplicationContext()).component())
-        .mainComponent();
-  }
-
-  /** Used to refer to the root application component. */
-  public interface HasComponent {
-    MainComponent mainComponent();
-  }
-}
diff --git a/java/com/android/dialer/main/impl/AndroidManifest-withoutActivity.xml b/java/com/android/dialer/main/impl/AndroidManifest-withoutActivity.xml
new file mode 100644
index 0000000..c273a57
--- /dev/null
+++ b/java/com/android/dialer/main/impl/AndroidManifest-withoutActivity.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2018 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+<manifest package="com.android.dialer.main.impl"/>
diff --git a/java/com/android/dialer/main/impl/AndroidManifest.xml b/java/com/android/dialer/main/impl/AndroidManifest.xml
index 972c9d9..a1ed5eb 100644
--- a/java/com/android/dialer/main/impl/AndroidManifest.xml
+++ b/java/com/android/dialer/main/impl/AndroidManifest.xml
@@ -15,23 +15,28 @@
   ~ limitations under the License
   -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-  package="com.android.dialer.main.impl">
+    package="com.android.dialer.main.impl">
 
   <application>
 
+    <!-- TODO(a bug): remove activity themes and only have application wide themes -->
+    <!-- The entrance point for Phone UI.
+         stateAlwaysHidden is set to suppress keyboard show up on dialpad screen. -->
     <activity
-      android:clearTaskOnLaunch="true"
-      android:directBootAware="true"
-      android:enabled="false"
-      android:exported="true"
-      android:icon="@drawable/nui_launcher_icon"
-      android:label="@string/main_activity_label"
-      android:launchMode="singleTask"
-      android:name="com.android.dialer.main.impl.MainActivity"
-      android:resizeableActivity="true"
-      android:theme="@style/NuiActivityTheme"
-      android:windowSoftInputMode="stateAlwaysHidden|adjustNothing">
+        android:name="com.android.dialer.main.impl.MainActivity"
+        android:clearTaskOnLaunch="true"
+        android:directBootAware="true"
+        android:exported="true"
+        android:label="@string/main_activity_label"
+        android:launchMode="singleTask"
+        android:resizeableActivity="true"
+        android:theme="@style/MainActivityTheme"
+        android:windowSoftInputMode="stateAlwaysHidden|adjustNothing">
 
+      <intent-filter>
+        <action android:name="com.android.dialer.main.impl.MAIN"/>
+        <category android:name="android.intent.category.DEFAULT"/>
+      </intent-filter>
 
       <intent-filter>
         <action android:name="android.intent.action.DIAL"/>
@@ -84,6 +89,7 @@
         <category android:name="android.intent.category.DEFAULT"/>
         <category android:name="android.intent.category.BROWSABLE"/>
       </intent-filter>
+
       <!-- This was never intended to be public, but is here for backward
            compatibility.  Use Intent.ACTION_DIAL instead. -->
       <intent-filter>
@@ -92,19 +98,27 @@
         <category android:name="android.intent.category.DEFAULT"/>
         <category android:name="android.intent.category.TAB"/>
       </intent-filter>
-      <intent-filter android:label="@string/main_call_history_tab_description">
+      <intent-filter>
         <action android:name="com.android.phone.action.RECENT_CALLS"/>
 
         <category android:name="android.intent.category.DEFAULT"/>
         <category android:name="android.intent.category.TAB"/>
       </intent-filter>
 
-
       <meta-data
-        android:name="com.android.keyguard.layout"
-        android:resource="@layout/keyguard_preview"/>
+          android:name="com.android.keyguard.layout"
+          android:resource="@layout/keyguard_preview"/>
+
     </activity>
 
-  </application>
+    <!-- This is the historical name of the "main" activity and is kept as an alias for backwards
+         compatibility in case older apps refer to the activity in this way. -->
 
+    <!--  {@deprecated Use .MainActivity instead.} -->
+    <activity-alias
+        android:name="com.android.dialer.app.DialtactsActivity"
+        android:exported="true"
+        android:targetActivity=".MainActivity"/>
+
+  </application>
 </manifest>
diff --git a/java/com/android/dialer/main/impl/MainActivity.java b/java/com/android/dialer/main/impl/MainActivity.java
index fbcbeff..1129609 100644
--- a/java/com/android/dialer/main/impl/MainActivity.java
+++ b/java/com/android/dialer/main/impl/MainActivity.java
@@ -19,9 +19,11 @@
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
+import android.support.v4.content.LocalBroadcastManager;
+import com.android.dialer.blockreportspam.ShowBlockReportSpamDialogReceiver;
+import com.android.dialer.calllog.config.CallLogConfigComponent;
 import com.android.dialer.common.Assert;
 import com.android.dialer.common.LogUtil;
-import com.android.dialer.configprovider.ConfigProviderBindings;
 import com.android.dialer.interactions.PhoneNumberInteraction.DisambigDialogDismissedListener;
 import com.android.dialer.interactions.PhoneNumberInteraction.InteractionErrorCode;
 import com.android.dialer.interactions.PhoneNumberInteraction.InteractionErrorListener;
@@ -39,13 +41,19 @@
 
   private MainActivityPeer activePeer;
 
+  /**
+   * {@link android.content.BroadcastReceiver} that shows a dialog to block a number and/or report
+   * it as spam when notified.
+   */
+  private ShowBlockReportSpamDialogReceiver showBlockReportSpamDialogReceiver;
+
   public static Intent getShowCallLogIntent(Context context) {
     return getShowTabIntent(context, TabIndex.CALL_LOG);
   }
 
   /** Returns intent that will open MainActivity to the specified tab. */
   public static Intent getShowTabIntent(Context context, @TabIndex int tabIndex) {
-    if (ConfigProviderBindings.get(context).getBoolean("nui_peer_enabled", false)) {
+    if (CallLogConfigComponent.get(context).callLogConfig().isNewPeerEnabled()) {
       // TODO(calderwoodra): implement this in NewMainActivityPeer
       return null;
     }
@@ -69,10 +77,13 @@
     // If peer was set by the super, don't reset it.
     activePeer = getNewPeer();
     activePeer.onActivityCreate(savedInstanceState);
+
+    showBlockReportSpamDialogReceiver =
+        new ShowBlockReportSpamDialogReceiver(getSupportFragmentManager());
   }
 
   protected MainActivityPeer getNewPeer() {
-    if (ConfigProviderBindings.get(this).getBoolean("nui_peer_enabled", false)) {
+    if (CallLogConfigComponent.get(this).callLogConfig().isNewPeerEnabled()) {
       return new NewMainActivityPeer(this);
     } else {
       return new OldMainActivityPeer(this);
@@ -90,6 +101,10 @@
   protected void onResume() {
     super.onResume();
     activePeer.onActivityResume();
+
+    LocalBroadcastManager.getInstance(this)
+        .registerReceiver(
+            showBlockReportSpamDialogReceiver, ShowBlockReportSpamDialogReceiver.getIntentFilter());
   }
 
   @Override
@@ -102,6 +117,8 @@
   protected void onPause() {
     super.onPause();
     activePeer.onActivityPause();
+
+    LocalBroadcastManager.getInstance(this).unregisterReceiver(showBlockReportSpamDialogReceiver);
   }
 
   @Override
diff --git a/java/com/android/dialer/main/impl/MainImpl.java b/java/com/android/dialer/main/impl/MainImpl.java
deleted file mode 100644
index 1cd457c..0000000
--- a/java/com/android/dialer/main/impl/MainImpl.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.dialer.main.impl;
-
-import android.annotation.TargetApi;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.os.Build;
-import android.os.Build.VERSION_CODES;
-import android.support.v4.content.pm.ShortcutInfoCompat;
-import android.support.v4.content.pm.ShortcutManagerCompat;
-import android.support.v4.graphics.drawable.IconCompat;
-import com.android.dialer.configprovider.ConfigProviderBindings;
-import com.android.dialer.main.Main;
-import javax.inject.Inject;
-
-/** The entry point for the main feature. */
-final class MainImpl implements Main {
-  private static final String SHORTCUT_KEY = "nui_launcher_shortcut";
-
-  @Inject
-  MainImpl() {}
-
-  @Override
-  public boolean isNewUiEnabled(Context context) {
-    return ConfigProviderBindings.get(context).getBoolean("is_nui_shortcut_enabled", false);
-  }
-
-  @Override
-  public void createNewUiLauncherShortcut(Context context) {
-    enableComponent(context);
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-      createLauncherShortcutO(context);
-    } else {
-      createLauncherShortcutPreO(context);
-    }
-  }
-
-  /**
-   * Enables the NUI activity component. By default the component is disabled and can't be accessed.
-   * Once the component has been enabled the user will get an option to use the new UI to handle
-   * DIAL (and other) intents.
-   */
-  private static void enableComponent(Context context) {
-    context
-        .getPackageManager()
-        .setComponentEnabledSetting(
-            new ComponentName(context, MainActivity.class),
-            PackageManager.COMPONENT_ENABLED_STATE_ENABLED,
-            PackageManager.DONT_KILL_APP);
-  }
-
-  @Override
-  public void disableComponentForTesting(Context context) {
-    context
-        .getPackageManager()
-        .setComponentEnabledSetting(
-            new ComponentName(context, MainActivity.class),
-            PackageManager.COMPONENT_ENABLED_STATE_DISABLED,
-            PackageManager.DONT_KILL_APP);
-  }
-
-  @TargetApi(VERSION_CODES.O)
-  private static void createLauncherShortcutO(Context context) {
-    ShortcutInfoCompat shortcutInfo =
-        new ShortcutInfoCompat.Builder(context, SHORTCUT_KEY)
-            .setIcon(IconCompat.createWithResource(context, R.drawable.nui_launcher_icon))
-            .setIntent(MainActivity.getIntent(context))
-            .setShortLabel(context.getString(R.string.nui_shortcut_name))
-            .build();
-    ShortcutManagerCompat.requestPinShortcut(context, shortcutInfo, null);
-  }
-
-  private static void createLauncherShortcutPreO(Context context) {
-    Intent intent = new Intent("com.android.launcher.action.INSTALL_SHORTCUT");
-    intent.putExtra(
-        Intent.EXTRA_SHORTCUT_ICON,
-        Intent.ShortcutIconResource.fromContext(context, R.drawable.nui_launcher_icon));
-    intent.putExtra(Intent.EXTRA_SHORTCUT_NAME, context.getString(R.string.nui_shortcut_name));
-    intent.putExtra(Intent.EXTRA_SHORTCUT_INTENT, MainActivity.getIntent(context));
-    context.sendBroadcast(intent);
-  }
-}
diff --git a/java/com/android/dialer/main/impl/MainModule.java b/java/com/android/dialer/main/impl/MainModule.java
deleted file mode 100644
index 90342cf..0000000
--- a/java/com/android/dialer/main/impl/MainModule.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.dialer.main.impl;
-
-import com.android.dialer.main.Main;
-import dagger.Module;
-import dagger.Provides;
-
-/** This module provides an instance of {@link Main}. */
-@Module
-public final class MainModule {
-  @Provides
-  public static Main provideMain() {
-    return new MainImpl();
-  }
-}
diff --git a/java/com/android/dialer/main/impl/MainSearchController.java b/java/com/android/dialer/main/impl/MainSearchController.java
index 993ed3d..364f5bc 100644
--- a/java/com/android/dialer/main/impl/MainSearchController.java
+++ b/java/com/android/dialer/main/impl/MainSearchController.java
@@ -23,6 +23,7 @@
 import android.os.Bundle;
 import android.speech.RecognizerIntent;
 import android.support.annotation.Nullable;
+import android.support.annotation.VisibleForTesting;
 import android.support.design.widget.FloatingActionButton;
 import android.support.v7.app.AppCompatActivity;
 import android.text.TextUtils;
@@ -35,7 +36,6 @@
 import com.android.dialer.app.calllog.CallLogActivity;
 import com.android.dialer.app.settings.DialerSettingsActivity;
 import com.android.dialer.callintent.CallInitiationType;
-import com.android.dialer.common.Assert;
 import com.android.dialer.common.LogUtil;
 import com.android.dialer.constants.ActivityRequestCodes;
 import com.android.dialer.dialpadview.DialpadFragment;
@@ -50,6 +50,7 @@
 import com.android.dialer.searchfragment.list.NewSearchFragment;
 import com.android.dialer.searchfragment.list.NewSearchFragment.SearchFragmentListener;
 import com.android.dialer.smartdial.util.SmartDialNameMatcher;
+import com.android.dialer.util.TransactionSafeActivity;
 import com.google.common.base.Optional;
 import java.util.ArrayList;
 import java.util.List;
@@ -78,30 +79,61 @@
   private static final String DIALPAD_FRAGMENT_TAG = "dialpad_fragment_tag";
   private static final String SEARCH_FRAGMENT_TAG = "search_fragment_tag";
 
-  private final MainActivity mainActivity;
+  private final TransactionSafeActivity activity;
   private final BottomNavBar bottomNav;
   private final FloatingActionButton fab;
   private final MainToolbar toolbar;
   private final View toolbarShadow;
 
+  /** View located underneath the toolbar that needs to animate with it. */
+  private final View fragmentContainer;
+
   private final List<OnSearchShowListener> onSearchShowListenerList = new ArrayList<>();
 
+  /**
+   * True when an action happens that closes search (like leaving the app or placing a call). We
+   * want to wait until onPause is called otherwise the transition will look extremely janky.
+   */
+  private boolean closeSearchOnPause;
+
+  private boolean callPlacedFromSearch;
+  private boolean requestingPermission;
+
+  private DialpadFragment dialpadFragment;
+  private NewSearchFragment searchFragment;
+
   public MainSearchController(
-      MainActivity mainActivity,
+      TransactionSafeActivity activity,
       BottomNavBar bottomNav,
       FloatingActionButton fab,
       MainToolbar toolbar,
-      View toolbarShadow) {
-    this.mainActivity = mainActivity;
+      View toolbarShadow,
+      View fragmentContainer) {
+    this.activity = activity;
     this.bottomNav = bottomNav;
     this.fab = fab;
     this.toolbar = toolbar;
     this.toolbarShadow = toolbarShadow;
+    this.fragmentContainer = fragmentContainer;
+
+    dialpadFragment =
+        (DialpadFragment) activity.getFragmentManager().findFragmentByTag(DIALPAD_FRAGMENT_TAG);
+    searchFragment =
+        (NewSearchFragment) activity.getFragmentManager().findFragmentByTag(SEARCH_FRAGMENT_TAG);
   }
 
   /** Should be called if we're showing the dialpad because of a new ACTION_DIAL intent. */
   public void showDialpadFromNewIntent() {
     LogUtil.enterBlock("MainSearchController.showDialpadFromNewIntent");
+    if (isDialpadVisible()) {
+      // One scenario where this can happen is if the user has the dialpad open when the receive a
+      // call and press add call in the in call ui which calls this method.
+      LogUtil.i("MainSearchController.showDialpadFromNewIntent", "Dialpad is already visible.");
+
+      // Mark started from new intent in case there is a phone number in the intent
+      dialpadFragment.setStartedFromNewIntent(true);
+      return;
+    }
     showDialpad(/* animate=*/ false, /* fromNewIntent=*/ true);
   }
 
@@ -112,42 +144,38 @@
   }
 
   private void showDialpad(boolean animate, boolean fromNewIntent) {
-    Assert.checkArgument(!isDialpadVisible());
+    if (isDialpadVisible()) {
+      LogUtil.e("MainSearchController.showDialpad", "Dialpad is already visible.");
+      return;
+    }
+
+    Logger.get(activity).logScreenView(ScreenEvent.Type.MAIN_DIALPAD, activity);
 
     fab.hide();
-    toolbar.slideUp(animate);
-    toolbar.expand(animate, Optional.absent());
+    toolbar.slideUp(animate, fragmentContainer);
+    toolbar.expand(animate, Optional.absent(), /* requestFocus */ false);
     toolbarShadow.setVisibility(View.VISIBLE);
-    mainActivity.setTitle(R.string.dialpad_activity_title);
 
-    FragmentTransaction transaction = mainActivity.getFragmentManager().beginTransaction();
-    NewSearchFragment searchFragment = getSearchFragment();
+    activity.setTitle(R.string.dialpad_activity_title);
+
+    FragmentTransaction transaction = activity.getFragmentManager().beginTransaction();
 
     // Show Search
     if (searchFragment == null) {
-      // TODO(a bug): zero suggest results aren't actually shown but this enabled the nearby
-      // places promo to be shown.
-      searchFragment = NewSearchFragment.newInstance(/* showZeroSuggest=*/ true);
-      transaction.replace(R.id.fragment_container, searchFragment, SEARCH_FRAGMENT_TAG);
-      transaction.addToBackStack(null);
+      searchFragment = NewSearchFragment.newInstance();
+      transaction.add(R.id.search_fragment_container, searchFragment, SEARCH_FRAGMENT_TAG);
       transaction.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE);
     } else if (!isSearchVisible()) {
       transaction.show(searchFragment);
     }
-    searchFragment.setQuery("", CallInitiationType.Type.DIALPAD);
-
-    // Split the transactions so that the dialpad fragment isn't popped off the stack when we exit
-    // search. We do this so that the dialpad actually animates down instead of just disappearing.
-    transaction.commit();
-    transaction = mainActivity.getFragmentManager().beginTransaction();
 
     // Show Dialpad
-    if (getDialpadFragment() == null) {
-      DialpadFragment dialpadFragment = new DialpadFragment();
+    if (dialpadFragment == null) {
+      dialpadFragment = new DialpadFragment();
       dialpadFragment.setStartedFromNewIntent(fromNewIntent);
       transaction.add(R.id.dialpad_fragment_container, dialpadFragment, DIALPAD_FRAGMENT_TAG);
+      searchFragment.setQuery("", CallInitiationType.Type.DIALPAD);
     } else {
-      DialpadFragment dialpadFragment = getDialpadFragment();
       dialpadFragment.setStartedFromNewIntent(fromNewIntent);
       transaction.show(dialpadFragment);
     }
@@ -165,35 +193,45 @@
    *
    * @see {@link #closeSearch(boolean)} to "remove" the dialpad.
    */
-  private void hideDialpad(boolean animate, boolean bottomNavVisible) {
+  private void hideDialpad(boolean animate) {
     LogUtil.enterBlock("MainSearchController.hideDialpad");
-    Assert.checkArgument(isDialpadVisible());
+    if (dialpadFragment == null) {
+      LogUtil.e("MainSearchController.hideDialpad", "Dialpad fragment is null.");
+      return;
+    }
+
+    if (!dialpadFragment.isAdded()) {
+      LogUtil.e("MainSearchController.hideDialpad", "Dialpad fragment is not added.");
+      return;
+    }
+
+    if (dialpadFragment.isHidden()) {
+      LogUtil.e("MainSearchController.hideDialpad", "Dialpad fragment is already hidden.");
+      return;
+    }
+
+    if (!dialpadFragment.isDialpadSlideUp()) {
+      LogUtil.e("MainSearchController.hideDialpad", "Dialpad fragment is already slide down.");
+      return;
+    }
 
     fab.show();
-    toolbar.slideDown(animate);
-    toolbar.transferQueryFromDialpad(getDialpadFragment().getQuery());
-    mainActivity.setTitle(R.string.main_activity_label);
+    toolbar.slideDown(animate, fragmentContainer);
+    toolbar.transferQueryFromDialpad(dialpadFragment.getQuery());
+    activity.setTitle(R.string.main_activity_label);
 
-    DialpadFragment dialpadFragment = getDialpadFragment();
     dialpadFragment.setAnimate(animate);
     dialpadFragment.slideDown(
         animate,
         new AnimationListener() {
           @Override
-          public void onAnimationStart(Animation animation) {
-            // Slide the bottom nav on animation start so it's (not) visible when the dialpad
-            // finishes animating down.
-            if (bottomNavVisible) {
-              showBottomNav();
-            } else {
-              hideBottomNav();
-            }
-          }
+          public void onAnimationStart(Animation animation) {}
 
           @Override
           public void onAnimationEnd(Animation animation) {
-            if (!(mainActivity.isFinishing() || mainActivity.isDestroyed())) {
-              mainActivity.getFragmentManager().beginTransaction().hide(dialpadFragment).commit();
+            if (activity.isSafeToCommitTransactions()
+                && !(activity.isFinishing() || activity.isDestroyed())) {
+              activity.getFragmentManager().beginTransaction().hide(dialpadFragment).commit();
             }
           }
 
@@ -213,7 +251,7 @@
   /** Should be called when {@link DialpadListener#onDialpadShown()} is called. */
   public void onDialpadShown() {
     LogUtil.enterBlock("MainSearchController.onDialpadShown");
-    getDialpadFragment().slideUp(true);
+    dialpadFragment.slideUp(true);
     hideBottomNav();
   }
 
@@ -230,25 +268,25 @@
   public void onSearchListTouch() {
     LogUtil.enterBlock("MainSearchController.onSearchListTouched");
     if (isDialpadVisible()) {
-      if (TextUtils.isEmpty(getDialpadFragment().getQuery())) {
-        Logger.get(mainActivity)
+      if (TextUtils.isEmpty(dialpadFragment.getQuery())) {
+        Logger.get(activity)
             .logImpression(
                 DialerImpression.Type.MAIN_TOUCH_DIALPAD_SEARCH_LIST_TO_CLOSE_SEARCH_AND_DIALPAD);
         closeSearch(true);
       } else {
-        Logger.get(mainActivity)
+        Logger.get(activity)
             .logImpression(DialerImpression.Type.MAIN_TOUCH_DIALPAD_SEARCH_LIST_TO_HIDE_DIALPAD);
-        hideDialpad(/* animate=*/ true, /* bottomNavVisible=*/ false);
+        hideDialpad(/* animate=*/ true);
       }
     } else if (isSearchVisible()) {
       if (TextUtils.isEmpty(toolbar.getQuery())) {
-        Logger.get(mainActivity)
+        Logger.get(activity)
             .logImpression(DialerImpression.Type.MAIN_TOUCH_SEARCH_LIST_TO_CLOSE_SEARCH);
         closeSearch(true);
       } else {
-        Logger.get(mainActivity)
+        Logger.get(activity)
             .logImpression(DialerImpression.Type.MAIN_TOUCH_SEARCH_LIST_TO_HIDE_KEYBOARD);
-        toolbar.hideKeyboard();
+        closeKeyboard();
       }
     }
   }
@@ -259,15 +297,15 @@
    * @return true if #onBackPressed() handled to action.
    */
   public boolean onBackPressed() {
-    if (isDialpadVisible() && !TextUtils.isEmpty(getDialpadFragment().getQuery())) {
+    if (isDialpadVisible() && !TextUtils.isEmpty(dialpadFragment.getQuery())) {
       LogUtil.i("MainSearchController.onBackPressed", "Dialpad visible with query");
-      Logger.get(mainActivity)
+      Logger.get(activity)
           .logImpression(DialerImpression.Type.MAIN_PRESS_BACK_BUTTON_TO_HIDE_DIALPAD);
-      hideDialpad(/* animate=*/ true, /* bottomNavVisible=*/ false);
+      hideDialpad(/* animate=*/ true);
       return true;
     } else if (isSearchVisible()) {
       LogUtil.i("MainSearchController.onBackPressed", "Search is visible");
-      Logger.get(mainActivity)
+      Logger.get(activity)
           .logImpression(
               isDialpadVisible()
                   ? DialerImpression.Type.MAIN_PRESS_BACK_BUTTON_TO_CLOSE_SEARCH_AND_DIALPAD
@@ -279,25 +317,35 @@
     }
   }
 
-  /**
-   * Calls {@link #hideDialpad(boolean, boolean)}, removes the search fragment and clears the
-   * dialpad.
-   */
+  /** Calls {@link #hideDialpad(boolean)}, removes the search fragment and clears the dialpad. */
   private void closeSearch(boolean animate) {
     LogUtil.enterBlock("MainSearchController.closeSearch");
-    Assert.checkArgument(isSearchVisible());
+    if (searchFragment == null) {
+      LogUtil.e("MainSearchController.closeSearch", "Search fragment is null.");
+      return;
+    }
+
+    if (!searchFragment.isAdded()) {
+      LogUtil.e("MainSearchController.closeSearch", "Search fragment isn't added.");
+      return;
+    }
+
+    if (searchFragment.isHidden()) {
+      LogUtil.e("MainSearchController.closeSearch", "Search fragment is already hidden.");
+      return;
+    }
+
     if (isDialpadVisible()) {
-      hideDialpad(animate, /* bottomNavVisible=*/ true);
+      hideDialpad(animate);
     } else if (!fab.isShown()) {
       fab.show();
     }
     showBottomNav();
     toolbar.collapse(animate);
     toolbarShadow.setVisibility(View.GONE);
-    mainActivity.getFragmentManager().popBackStack();
+    activity.getFragmentManager().beginTransaction().hide(searchFragment).commit();
 
     // Clear the dialpad so the phone number isn't persisted between search sessions.
-    DialpadFragment dialpadFragment = getDialpadFragment();
     if (dialpadFragment != null) {
       // Temporarily disable accessibility when we clear the dialpad, since it should be
       // invisible and should not announce anything.
@@ -315,27 +363,18 @@
 
   @Nullable
   protected DialpadFragment getDialpadFragment() {
-    return (DialpadFragment)
-        mainActivity.getFragmentManager().findFragmentByTag(DIALPAD_FRAGMENT_TAG);
-  }
-
-  @Nullable
-  private NewSearchFragment getSearchFragment() {
-    return (NewSearchFragment)
-        mainActivity.getFragmentManager().findFragmentByTag(SEARCH_FRAGMENT_TAG);
+    return dialpadFragment;
   }
 
   private boolean isDialpadVisible() {
-    DialpadFragment fragment = getDialpadFragment();
-    return fragment != null
-        && fragment.isAdded()
-        && !fragment.isHidden()
-        && fragment.isDialpadSlideUp();
+    return dialpadFragment != null
+        && dialpadFragment.isAdded()
+        && !dialpadFragment.isHidden()
+        && dialpadFragment.isDialpadSlideUp();
   }
 
   private boolean isSearchVisible() {
-    NewSearchFragment fragment = getSearchFragment();
-    return fragment != null && fragment.isAdded() && !fragment.isHidden();
+    return searchFragment != null && searchFragment.isAdded() && !searchFragment.isHidden();
   }
 
   /** Returns true if the search UI is visible. */
@@ -343,6 +382,13 @@
     return isSearchVisible();
   }
 
+  /** Closes the keyboard if necessary. */
+  private void closeKeyboard() {
+    if (searchFragment != null && searchFragment.isAdded()) {
+      toolbar.hideKeyboard();
+    }
+  }
+
   /**
    * Opens search in regular/search bar search mode.
    *
@@ -351,36 +397,37 @@
   @Override
   public void onSearchBarClicked() {
     LogUtil.enterBlock("MainSearchController.onSearchBarClicked");
-    Logger.get(mainActivity).logImpression(DialerImpression.Type.MAIN_CLICK_SEARCH_BAR);
+    Logger.get(activity).logImpression(DialerImpression.Type.MAIN_CLICK_SEARCH_BAR);
     openSearch(Optional.absent());
   }
 
   private void openSearch(Optional<String> query) {
     LogUtil.enterBlock("MainSearchController.openSearch");
+
+    Logger.get(activity).logScreenView(ScreenEvent.Type.MAIN_SEARCH, activity);
+
     fab.hide();
-    toolbar.expand(/* animate=*/ true, query);
+    toolbar.expand(/* animate=*/ true, query, /* requestFocus */ true);
     toolbar.showKeyboard();
     toolbarShadow.setVisibility(View.VISIBLE);
     hideBottomNav();
 
-    FragmentTransaction transaction = mainActivity.getFragmentManager().beginTransaction();
-    NewSearchFragment searchFragment = getSearchFragment();
-
+    FragmentTransaction transaction = activity.getFragmentManager().beginTransaction();
     // Show Search
     if (searchFragment == null) {
-      // TODO(a bug): zero suggest results aren't actually shown but this enabled the nearby
-      // places promo to be shown.
-      searchFragment = NewSearchFragment.newInstance(true);
-      transaction.replace(R.id.fragment_container, searchFragment, SEARCH_FRAGMENT_TAG);
-      transaction.addToBackStack(null);
+      searchFragment = NewSearchFragment.newInstance();
+      transaction.add(R.id.search_fragment_container, searchFragment, SEARCH_FRAGMENT_TAG);
       transaction.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE);
     } else if (!isSearchVisible()) {
-      transaction.show(getSearchFragment());
+      transaction.show(searchFragment);
     }
 
     searchFragment.setQuery(
         query.isPresent() ? query.get() : "", CallInitiationType.Type.REGULAR_SEARCH);
-    transaction.commit();
+
+    if (activity.isSafeToCommitTransactions()) {
+      transaction.commit();
+    }
 
     notifyListenersOnSearchOpen();
   }
@@ -393,61 +440,85 @@
 
   @Override
   public void onSearchQueryUpdated(String query) {
-    NewSearchFragment fragment = getSearchFragment();
-    if (fragment != null) {
-      fragment.setQuery(query, CallInitiationType.Type.REGULAR_SEARCH);
+    if (searchFragment != null) {
+      searchFragment.setQuery(query, CallInitiationType.Type.REGULAR_SEARCH);
     }
   }
 
   /** @see OnDialpadQueryChangedListener#onDialpadQueryChanged(java.lang.String) */
   public void onDialpadQueryChanged(String query) {
-    query = SmartDialNameMatcher.normalizeNumber(/* context = */ mainActivity, query);
-    NewSearchFragment fragment = getSearchFragment();
-    if (fragment != null) {
-      fragment.setQuery(query, CallInitiationType.Type.DIALPAD);
+    String normalizedQuery = SmartDialNameMatcher.normalizeNumber(/* context = */ activity, query);
+    if (searchFragment != null) {
+      searchFragment.setRawNumber(query);
+      searchFragment.setQuery(normalizedQuery, CallInitiationType.Type.DIALPAD);
     }
-    getDialpadFragment().process_quote_emergency_unquote(query);
+    dialpadFragment.process_quote_emergency_unquote(normalizedQuery);
   }
 
   @Override
   public void onVoiceButtonClicked(VoiceSearchResultCallback voiceSearchResultCallback) {
-    Logger.get(mainActivity)
-        .logImpression(DialerImpression.Type.MAIN_CLICK_SEARCH_BAR_VOICE_BUTTON);
+    Logger.get(activity).logImpression(DialerImpression.Type.MAIN_CLICK_SEARCH_BAR_VOICE_BUTTON);
     try {
       Intent voiceIntent = new Intent(RecognizerIntent.ACTION_RECOGNIZE_SPEECH);
-      mainActivity.startActivityForResult(voiceIntent, ActivityRequestCodes.DIALTACTS_VOICE_SEARCH);
+      activity.startActivityForResult(voiceIntent, ActivityRequestCodes.DIALTACTS_VOICE_SEARCH);
     } catch (ActivityNotFoundException e) {
-      Toast.makeText(mainActivity, R.string.voice_search_not_available, Toast.LENGTH_SHORT).show();
+      Toast.makeText(activity, R.string.voice_search_not_available, Toast.LENGTH_SHORT).show();
     }
   }
 
   @Override
   public boolean onMenuItemClicked(MenuItem menuItem) {
     if (menuItem.getItemId() == R.id.settings) {
-      mainActivity.startActivity(new Intent(mainActivity, DialerSettingsActivity.class));
-      Logger.get(mainActivity).logScreenView(ScreenEvent.Type.SETTINGS, mainActivity);
+      activity.startActivity(new Intent(activity, DialerSettingsActivity.class));
+      Logger.get(activity).logScreenView(ScreenEvent.Type.SETTINGS, activity);
       return true;
     } else if (menuItem.getItemId() == R.id.clear_frequents) {
-      ClearFrequentsDialog.show(mainActivity.getFragmentManager());
-      Logger.get(mainActivity).logScreenView(ScreenEvent.Type.CLEAR_FREQUENTS, mainActivity);
+      ClearFrequentsDialog.show(activity.getFragmentManager());
+      Logger.get(activity).logScreenView(ScreenEvent.Type.CLEAR_FREQUENTS, activity);
       return true;
     } else if (menuItem.getItemId() == R.id.menu_call_history) {
-      final Intent intent = new Intent(mainActivity, CallLogActivity.class);
-      mainActivity.startActivity(intent);
+      final Intent intent = new Intent(activity, CallLogActivity.class);
+      activity.startActivity(intent);
     }
     return false;
   }
 
   @Override
+  public void onActivityPause() {
+    LogUtil.enterBlock("MainSearchController.onActivityPause");
+    closeKeyboard();
+
+    if (closeSearchOnPause) {
+      if (isInSearch() && (callPlacedFromSearch || !isDialpadVisible())) {
+        closeSearch(false);
+      }
+      closeSearchOnPause = false;
+      callPlacedFromSearch = false;
+    }
+  }
+
+  @Override
   public void onUserLeaveHint() {
     if (isInSearch()) {
-      closeSearch(false);
+      // Requesting a permission causes this to be called and we want search to remain open when
+      // that happens. Otherwise, close search.
+      closeSearchOnPause = !requestingPermission;
+
+      // Always hide the keyboard when the user leaves dialer (including permission requests)
+      closeKeyboard();
     }
   }
 
   @Override
   public void onCallPlacedFromSearch() {
-    closeSearch(false);
+    closeSearchOnPause = true;
+    callPlacedFromSearch = true;
+  }
+
+  @Override
+  public void requestingPermission() {
+    LogUtil.enterBlock("MainSearchController.requestingPermission");
+    requestingPermission = true;
   }
 
   public void onVoiceResults(int resultCode, Intent data) {
@@ -476,11 +547,14 @@
     if (savedInstanceState.getBoolean(KEY_IS_FAB_HIDDEN, false)) {
       fab.hide();
     }
-    if (savedInstanceState.getBoolean(KEY_IS_TOOLBAR_EXPANDED, false)) {
-      toolbar.expand(false, Optional.absent());
+    boolean isSlideUp = savedInstanceState.getBoolean(KEY_IS_TOOLBAR_SLIDE_UP, false);
+    if (isSlideUp) {
+      toolbar.slideUp(false, fragmentContainer);
     }
-    if (savedInstanceState.getBoolean(KEY_IS_TOOLBAR_SLIDE_UP, false)) {
-      toolbar.slideUp(false);
+    if (savedInstanceState.getBoolean(KEY_IS_TOOLBAR_EXPANDED, false)) {
+      // If the toolbar is slide up, that means the dialpad is showing. Thus we don't want to
+      // request focus or we'll break physical/bluetooth keyboards typing.
+      toolbar.expand(/* animate */ false, Optional.absent(), /* requestFocus */ !isSlideUp);
     }
   }
 
@@ -510,4 +584,14 @@
 
     void onSearchClose();
   }
+
+  @VisibleForTesting
+  void setDialpadFragment(DialpadFragment dialpadFragment) {
+    this.dialpadFragment = dialpadFragment;
+  }
+
+  @VisibleForTesting
+  void setSearchFragment(NewSearchFragment searchFragment) {
+    this.searchFragment = searchFragment;
+  }
 }
diff --git a/java/com/android/dialer/main/impl/NewMainActivityPeer.java b/java/com/android/dialer/main/impl/NewMainActivityPeer.java
index 081559a..f2d6fa6 100644
--- a/java/com/android/dialer/main/impl/NewMainActivityPeer.java
+++ b/java/com/android/dialer/main/impl/NewMainActivityPeer.java
@@ -22,8 +22,6 @@
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentTransaction;
-import android.support.v4.content.LocalBroadcastManager;
-import com.android.dialer.blockreportspam.ShowBlockReportSpamDialogReceiver;
 import com.android.dialer.calllog.CallLogComponent;
 import com.android.dialer.calllog.ui.NewCallLogFragment;
 import com.android.dialer.common.concurrent.DefaultFutureCallback;
@@ -39,12 +37,9 @@
 public class NewMainActivityPeer implements MainActivityPeer {
 
   private final MainActivity mainActivity;
-  private final ShowBlockReportSpamDialogReceiver showBlockReportSpamDialogReceiver;
 
   public NewMainActivityPeer(MainActivity mainActivity) {
     this.mainActivity = mainActivity;
-    this.showBlockReportSpamDialogReceiver =
-        new ShowBlockReportSpamDialogReceiver(mainActivity.getFragmentManager());
   }
 
   @Override
@@ -59,20 +54,13 @@
   }
 
   @Override
-  public void onActivityResume() {
-    LocalBroadcastManager.getInstance(mainActivity)
-        .registerReceiver(
-            showBlockReportSpamDialogReceiver, ShowBlockReportSpamDialogReceiver.getIntentFilter());
-  }
+  public void onActivityResume() {}
 
   @Override
   public void onUserLeaveHint() {}
 
   @Override
-  public void onActivityPause() {
-    LocalBroadcastManager.getInstance(mainActivity)
-        .unregisterReceiver(showBlockReportSpamDialogReceiver);
-  }
+  public void onActivityPause() {}
 
   @Override
   public void onActivityStop() {}
@@ -101,6 +89,7 @@
   private static final class MainBottomNavBarBottomNavTabListener
       implements OnBottomNavTabSelectedListener {
 
+    private static final String SPEED_DIAL_TAG = "speed_dial";
     private static final String CALL_LOG_TAG = "call_log";
     private static final String VOICEMAIL_TAG = "voicemail";
 
@@ -116,7 +105,18 @@
     @Override
     public void onSpeedDialSelected() {
       hideAllFragments();
-      // TODO(calderwoodra): Implement SpeedDialFragment when FragmentUtils#getParent works
+      // TODO(calderwoodra): Since we aren't using fragment utils in this peer, let's disable
+      // speed dial until we figure out a solution.
+      // SpeedDialFragment fragment =
+      //     (SpeedDialFragment) supportFragmentManager.findFragmentByTag(SPEED_DIAL_TAG);
+      // if (fragment == null) {
+      //   supportFragmentManager
+      //       .beginTransaction()
+      //       .add(R.id.fragment_container, SpeedDialFragment.newInstance(), SPEED_DIAL_TAG)
+      //       .commit();
+      // } else {
+      //   supportFragmentManager.beginTransaction().show(fragment).commit();
+      // }
     }
 
     @Override
@@ -155,8 +155,14 @@
       }
     }
 
+    // TODO(calderwoodra): fix overlapping fragments issue
     private void hideAllFragments() {
       FragmentTransaction supportTransaction = supportFragmentManager.beginTransaction();
+      Fragment speedDialFragment = supportFragmentManager.findFragmentByTag(SPEED_DIAL_TAG);
+      if (speedDialFragment != null) {
+        supportTransaction.hide(speedDialFragment);
+      }
+
       Fragment callLogFragment = supportFragmentManager.findFragmentByTag(CALL_LOG_TAG);
       if (callLogFragment != null) {
         if (callLogFragment.isVisible()) {
@@ -170,6 +176,7 @@
         }
         supportTransaction.hide(callLogFragment);
       }
+
       if (supportFragmentManager.findFragmentByTag(VOICEMAIL_TAG) != null) {
         supportTransaction.hide(supportFragmentManager.findFragmentByTag(VOICEMAIL_TAG));
       }
diff --git a/java/com/android/dialer/main/impl/OldMainActivityPeer.java b/java/com/android/dialer/main/impl/OldMainActivityPeer.java
index e87fb0e..feb76ac 100644
--- a/java/com/android/dialer/main/impl/OldMainActivityPeer.java
+++ b/java/com/android/dialer/main/impl/OldMainActivityPeer.java
@@ -16,13 +16,16 @@
 
 package com.android.dialer.main.impl;
 
-import android.app.Activity;
+import android.annotation.SuppressLint;
 import android.app.Fragment;
 import android.app.FragmentManager;
+import android.app.FragmentTransaction;
 import android.app.KeyguardManager;
+import android.content.BroadcastReceiver;
 import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Intent;
+import android.content.IntentFilter;
 import android.database.ContentObserver;
 import android.database.Cursor;
 import android.net.Uri;
@@ -31,21 +34,29 @@
 import android.provider.CallLog.Calls;
 import android.provider.ContactsContract.QuickContact;
 import android.provider.VoicemailContract;
+import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+import android.support.design.widget.BottomSheetBehavior;
 import android.support.design.widget.FloatingActionButton;
 import android.support.design.widget.Snackbar;
 import android.support.v4.content.ContextCompat;
+import android.support.v4.content.LocalBroadcastManager;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
 import android.telecom.PhoneAccount;
 import android.telecom.PhoneAccountHandle;
 import android.telephony.TelephonyManager;
 import android.text.TextUtils;
+import android.text.method.LinkMovementMethod;
+import android.view.ActionMode;
+import android.view.DragEvent;
 import android.view.View;
+import android.view.ViewGroup;
 import android.widget.ImageView;
+import android.widget.TextView;
 import com.android.contacts.common.list.OnPhoneNumberPickerActionListener;
 import com.android.dialer.animation.AnimUtils;
-import com.android.dialer.app.DialtactsActivity;
+import com.android.dialer.app.MainComponent;
 import com.android.dialer.app.calllog.CallLogAdapter;
 import com.android.dialer.app.calllog.CallLogFragment;
 import com.android.dialer.app.calllog.CallLogFragment.CallLogFragmentListener;
@@ -59,16 +70,19 @@
 import com.android.dialer.app.list.PhoneFavoriteSquareTileView;
 import com.android.dialer.app.list.RemoveView;
 import com.android.dialer.callcomposer.CallComposerActivity;
-import com.android.dialer.calldetails.CallDetailsActivity;
+import com.android.dialer.calldetails.OldCallDetailsActivity;
 import com.android.dialer.callintent.CallIntentBuilder;
 import com.android.dialer.callintent.CallSpecificAppData;
+import com.android.dialer.calllog.CallLogComponent;
+import com.android.dialer.calllog.config.CallLogConfigComponent;
+import com.android.dialer.calllog.ui.NewCallLogFragment;
 import com.android.dialer.common.FragmentUtils.FragmentUtilListener;
 import com.android.dialer.common.LogUtil;
+import com.android.dialer.common.concurrent.DefaultFutureCallback;
 import com.android.dialer.common.concurrent.DialerExecutorComponent;
 import com.android.dialer.common.concurrent.ThreadUtil;
 import com.android.dialer.common.concurrent.UiListener;
-import com.android.dialer.compat.CompatUtils;
-import com.android.dialer.configprovider.ConfigProviderBindings;
+import com.android.dialer.configprovider.ConfigProviderComponent;
 import com.android.dialer.constants.ActivityRequestCodes;
 import com.android.dialer.contactsfragment.ContactsFragment;
 import com.android.dialer.contactsfragment.ContactsFragment.Header;
@@ -80,32 +94,45 @@
 import com.android.dialer.dialpadview.DialpadFragment.LastOutgoingCallCallback;
 import com.android.dialer.dialpadview.DialpadFragment.OnDialpadQueryChangedListener;
 import com.android.dialer.duo.DuoComponent;
+import com.android.dialer.i18n.LocaleUtils;
 import com.android.dialer.interactions.PhoneNumberInteraction;
 import com.android.dialer.logging.DialerImpression;
 import com.android.dialer.logging.Logger;
+import com.android.dialer.logging.ScreenEvent;
 import com.android.dialer.main.MainActivityPeer;
 import com.android.dialer.main.impl.bottomnav.BottomNavBar;
 import com.android.dialer.main.impl.bottomnav.BottomNavBar.OnBottomNavTabSelectedListener;
 import com.android.dialer.main.impl.bottomnav.BottomNavBar.TabIndex;
+import com.android.dialer.main.impl.bottomnav.MissedCallCountObserver;
 import com.android.dialer.main.impl.toolbar.MainToolbar;
 import com.android.dialer.metrics.Metrics;
 import com.android.dialer.metrics.MetricsComponent;
 import com.android.dialer.postcall.PostCall;
 import com.android.dialer.precall.PreCall;
+import com.android.dialer.promotion.Promotion;
+import com.android.dialer.promotion.Promotion.PromotionType;
+import com.android.dialer.promotion.PromotionComponent;
 import com.android.dialer.searchfragment.list.NewSearchFragment.SearchFragmentListener;
 import com.android.dialer.smartdial.util.SmartDialPrefix;
+import com.android.dialer.speeddial.SpeedDialFragment;
 import com.android.dialer.storage.StorageComponent;
 import com.android.dialer.telecom.TelecomUtil;
+import com.android.dialer.theme.base.Theme;
+import com.android.dialer.theme.base.ThemeComponent;
 import com.android.dialer.util.DialerUtils;
 import com.android.dialer.util.PermissionsUtil;
 import com.android.dialer.util.TransactionSafeActivity;
+import com.android.dialer.voicemail.listui.NewVoicemailFragment;
 import com.android.dialer.voicemail.listui.error.VoicemailStatusCorruptionHandler;
 import com.android.dialer.voicemail.listui.error.VoicemailStatusCorruptionHandler.Source;
 import com.android.dialer.voicemailstatus.VisualVoicemailEnabledChecker;
 import com.android.dialer.voicemailstatus.VoicemailStatusHelper;
 import com.android.voicemail.VoicemailComponent;
+import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
+import com.google.common.util.concurrent.MoreExecutors;
 import java.util.Locale;
+import java.util.Optional;
 import java.util.concurrent.TimeUnit;
 
 /**
@@ -124,7 +151,26 @@
 
   private static final String EXTRA_SHOW_TAB = "EXTRA_SHOW_TAB";
 
-  private final MainActivity mainActivity;
+  // TODO(calderwoodra): change to AppCompatActivity once new speed dial ships
+  private final TransactionSafeActivity activity;
+
+  private final BroadcastReceiver disableCallLogFrameworkReceiver =
+      new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+          if (bottomNavTabListener == null) {
+            return;
+          }
+          /*
+           * Remove the NewCallLogFragment and NewVoicemailFragment if it is currently attached. If
+           * this is not done, user interaction with the fragment could cause call log framework
+           * state to be unexpectedly written. For example scrolling could cause the
+           * AnnotatedCallLog to be read (which would trigger database creation).
+           */
+          bottomNavTabListener.disableNewCallLogFragment();
+          bottomNavTabListener.disableNewVoicemailFragment();
+        }
+      };
 
   // Contacts
   private MainOnContactSelectedListener onContactSelectedListener;
@@ -148,6 +194,7 @@
   // Speed Dial
   private MainOnPhoneNumberPickerActionListener onPhoneNumberPickerActionListener;
   private MainOldSpeedDialFragmentHost oldSpeedDialFragmentHost;
+  private MainSpeedDialFragmentHost speedDialFragmentHost;
 
   /** Language the device was in last time {@link #onSaveInstanceState(Bundle)} was called. */
   private String savedLanguageCode;
@@ -155,8 +202,12 @@
   private LastTabController lastTabController;
 
   private BottomNavBar bottomNav;
+  private MainBottomNavBarBottomNavTabListener bottomNavTabListener;
   private View snackbarContainer;
+  private MissedCallCountObserver missedCallCountObserver;
   private UiListener<String> getLastOutgoingCallListener;
+  private UiListener<Integer> missedCallObserverUiListener;
+  private View bottomSheet;
 
   public static Intent getShowTabIntent(Context context, @TabIndex int tabIndex) {
     Intent intent = new Intent(context, MainActivity.class);
@@ -174,81 +225,124 @@
     return intent.getIntExtra(EXTRA_SHOW_TAB, -1);
   }
 
-  public OldMainActivityPeer(MainActivity mainActivity) {
-    this.mainActivity = mainActivity;
+  public OldMainActivityPeer(TransactionSafeActivity activity) {
+    this.activity = activity;
   }
 
   @Override
   public void onActivityCreate(Bundle savedInstanceState) {
     LogUtil.enterBlock("OldMainActivityPeer.onActivityCreate");
-    mainActivity.setContentView(R.layout.main_activity);
+    setTheme();
+    activity.setContentView(R.layout.main_activity);
     initUiListeners();
     initLayout(savedInstanceState);
-    SmartDialPrefix.initializeNanpSettings(mainActivity);
+    SmartDialPrefix.initializeNanpSettings(activity);
+  }
+
+  /** should be called before {@link AppCompatActivity#setContentView(int)}. */
+  private void setTheme() {
+    @Theme.Type int theme = ThemeComponent.get(activity).theme().getTheme();
+    switch (theme) {
+      case Theme.DARK:
+        activity.setTheme(R.style.MainActivityTheme_Dark);
+        break;
+      case Theme.LIGHT:
+      case Theme.LIGHT_M2:
+        activity.setTheme(R.style.MainActivityTheme);
+        break;
+      case Theme.UNKNOWN:
+      default:
+        throw new IllegalArgumentException("Invalid theme.");
+    }
   }
 
   private void initUiListeners() {
     getLastOutgoingCallListener =
-        DialerExecutorComponent.get(mainActivity)
-            .createUiListener(mainActivity.getFragmentManager(), "Query last phone number");
+        DialerExecutorComponent.get(activity)
+            .createUiListener(activity.getFragmentManager(), "Query last phone number");
+    missedCallObserverUiListener =
+        DialerExecutorComponent.get(activity)
+            .createUiListener(activity.getFragmentManager(), "Missed call observer");
   }
 
   private void initLayout(Bundle savedInstanceState) {
-    onContactSelectedListener = new MainOnContactSelectedListener(mainActivity);
+    onContactSelectedListener = new MainOnContactSelectedListener(activity);
     dialpadFragmentHostInterface = new MainDialpadFragmentHost();
 
-    snackbarContainer = mainActivity.findViewById(R.id.coordinator_layout);
+    snackbarContainer = activity.findViewById(R.id.coordinator_layout);
+    bottomSheet = activity.findViewById(R.id.promotion_bottom_sheet);
+    BottomSheetBehavior<View> bottomSheetBehavior = BottomSheetBehavior.from(bottomSheet);
+    bottomSheetBehavior.setState(BottomSheetBehavior.STATE_HIDDEN);
 
-    FloatingActionButton fab = mainActivity.findViewById(R.id.fab);
+    FloatingActionButton fab = activity.findViewById(R.id.fab);
     fab.setOnClickListener(
         v -> {
-          Logger.get(mainActivity)
-              .logImpression(DialerImpression.Type.MAIN_CLICK_FAB_TO_OPEN_DIALPAD);
+          Logger.get(activity).logImpression(DialerImpression.Type.MAIN_CLICK_FAB_TO_OPEN_DIALPAD);
           searchController.showDialpad(true);
+          if (callLogAdapterOnActionModeStateChangedListener.isEnabled) {
+            LogUtil.i("OldMainActivityPeer.onFabClicked", "closing multiselect");
+            callLogAdapterOnActionModeStateChangedListener.actionMode.finish();
+          }
         });
 
-    MainToolbar toolbar = mainActivity.findViewById(R.id.toolbar);
-    toolbar.maybeShowSimulator(mainActivity);
-    mainActivity.setSupportActionBar(mainActivity.findViewById(R.id.toolbar));
+    MainToolbar toolbar = activity.findViewById(R.id.toolbar);
+    toolbar.maybeShowSimulator(activity);
+    activity.setSupportActionBar(activity.findViewById(R.id.toolbar));
 
-    bottomNav = mainActivity.findViewById(R.id.bottom_nav_bar);
-    MainBottomNavBarBottomNavTabListener bottomNavTabListener =
+    bottomNav = activity.findViewById(R.id.bottom_nav_bar);
+    bottomNavTabListener =
         new MainBottomNavBarBottomNavTabListener(
-            mainActivity, mainActivity.getFragmentManager(), fab);
+            activity,
+            activity.getFragmentManager(),
+            activity.getSupportFragmentManager(),
+            fab,
+            bottomSheet);
     bottomNav.addOnTabSelectedListener(bottomNavTabListener);
     // TODO(uabdullah): Handle case of when a sim is inserted/removed while the activity is open.
-    boolean showVoicemailTab = canVoicemailTabBeShown(mainActivity);
+    boolean showVoicemailTab = canVoicemailTabBeShown(activity);
     bottomNav.showVoicemail(showVoicemailTab);
 
+    missedCallCountObserver =
+        new MissedCallCountObserver(
+            activity.getApplicationContext(), bottomNav, missedCallObserverUiListener);
+
     callLogFragmentListener =
         new MainCallLogFragmentListener(
-            mainActivity, mainActivity.getContentResolver(), bottomNav, toolbar);
+            activity, activity.getContentResolver(), bottomNav, toolbar, bottomNavTabListener);
     bottomNav.addOnTabSelectedListener(callLogFragmentListener);
 
     searchController =
         getNewMainSearchController(
-            bottomNav, fab, toolbar, mainActivity.findViewById(R.id.toolbar_shadow));
+            bottomNav, fab, toolbar, activity.findViewById(R.id.toolbar_shadow), snackbarContainer);
     toolbar.setSearchBarListener(searchController);
 
     onDialpadQueryChangedListener = getNewOnDialpadQueryChangedListener(searchController);
     dialpadListener =
-        new MainDialpadListener(mainActivity, searchController, getLastOutgoingCallListener);
+        new MainDialpadListener(activity, searchController, getLastOutgoingCallListener);
     searchFragmentListener = new MainSearchFragmentListener(searchController);
     callLogAdapterOnActionModeStateChangedListener =
         new MainCallLogAdapterOnActionModeStateChangedListener();
     callLogHostInterface = new MainCallLogHost(searchController, fab);
 
     onListFragmentScrolledListener = new MainOnListFragmentScrolledListener(snackbarContainer);
-    onPhoneNumberPickerActionListener = new MainOnPhoneNumberPickerActionListener(mainActivity);
+    onPhoneNumberPickerActionListener = new MainOnPhoneNumberPickerActionListener(activity);
     oldSpeedDialFragmentHost =
         new MainOldSpeedDialFragmentHost(
+            activity,
+            activity.findViewById(R.id.root_layout),
             bottomNav,
-            mainActivity.findViewById(R.id.contact_tile_drag_shadow_overlay),
-            mainActivity.findViewById(R.id.remove_view),
-            mainActivity.findViewById(R.id.search_view_container),
+            activity.findViewById(R.id.contact_tile_drag_shadow_overlay),
+            activity.findViewById(R.id.remove_view),
+            activity.findViewById(R.id.search_view_container),
             toolbar);
+    speedDialFragmentHost =
+        new MainSpeedDialFragmentHost(
+            toolbar,
+            activity.findViewById(R.id.root_layout),
+            activity.findViewById(R.id.coordinator_layout),
+            activity.findViewById(R.id.fragment_container));
 
-    lastTabController = new LastTabController(mainActivity, bottomNav, showVoicemailTab);
+    lastTabController = new LastTabController(activity, bottomNav, showVoicemailTab);
 
     // Restore our view state if needed, else initialize as if the app opened for the first time
     if (savedInstanceState != null) {
@@ -256,7 +350,7 @@
       searchController.onRestoreInstanceState(savedInstanceState);
       bottomNav.selectTab(savedInstanceState.getInt(KEY_CURRENT_TAB));
     } else {
-      onHandleIntent(mainActivity.getIntent());
+      onHandleIntent(activity.getIntent());
     }
   }
 
@@ -300,10 +394,11 @@
    *     listener of some kind to detect when a sim is recognized. TODO(uabdullah): Move this to a
    *     utility class or wrap it all in a static inner class.
    */
+  @SuppressLint("MissingPermission")
   private static boolean isVoicemailAvailable(
       Context context, PhoneAccountHandle defaultUserSelectedAccount) {
 
-    if (!TelecomUtil.hasReadPhoneStatePermission(context)) {
+    if (!PermissionsUtil.hasReadPhoneStatePermissions(context)) {
       LogUtil.i(
           "OldMainActivityPeer.isVoicemailAvailable",
           "No read phone permisison or not the default dialer.");
@@ -337,36 +432,53 @@
     //     select a tab here.
     //  2) Don't return early here in case the intent does contain extra data.
     //  3) External intents should take priority over other intents (like Calls.CONTENT_TYPE).
+    @TabIndex int tabToSelect;
     if (Calls.CONTENT_TYPE.equals(intent.getType())) {
       Bundle extras = intent.getExtras();
       if (extras != null && extras.getInt(Calls.EXTRA_CALL_TYPE_FILTER) == Calls.VOICEMAIL_TYPE) {
         LogUtil.i("OldMainActivityPeer.onHandleIntent", "Voicemail content type intent");
-        bottomNav.selectTab(TabIndex.VOICEMAIL);
-        Logger.get(mainActivity).logImpression(DialerImpression.Type.VVM_NOTIFICATION_CLICKED);
+        tabToSelect = TabIndex.VOICEMAIL;
+        Logger.get(activity).logImpression(DialerImpression.Type.VVM_NOTIFICATION_CLICKED);
       } else {
         LogUtil.i("OldMainActivityPeer.onHandleIntent", "Call log content type intent");
-        bottomNav.selectTab(TabIndex.CALL_LOG);
+        tabToSelect = TabIndex.CALL_LOG;
       }
 
     } else if (isShowTabIntent(intent)) {
       LogUtil.i("OldMainActivityPeer.onHandleIntent", "Show tab intent");
-      bottomNav.selectTab(getTabFromIntent(intent));
-    } else if (lastTabController.isEnabled) {
-      LogUtil.i("OldMainActivityPeer.onHandleIntent", "Show last tab");
-      lastTabController.selectLastTab();
+      tabToSelect = getTabFromIntent(intent);
     } else {
-      bottomNav.selectTab(TabIndex.SPEED_DIAL);
+      LogUtil.i("OldMainActivityPeer.onHandleIntent", "Show last tab");
+      tabToSelect = lastTabController.getLastTab();
     }
+    logImpressionForSelectedTab(tabToSelect);
+    bottomNav.selectTab(tabToSelect);
 
     if (isDialOrAddCallIntent(intent)) {
       LogUtil.i("OldMainActivityPeer.onHandleIntent", "Dial or add call intent");
       // Dialpad will grab the intent and populate the number
       searchController.showDialpadFromNewIntent();
+      Logger.get(activity).logImpression(DialerImpression.Type.MAIN_OPEN_WITH_DIALPAD);
     }
 
-    if (intent.getBooleanExtra(DialtactsActivity.EXTRA_CLEAR_NEW_VOICEMAILS, false)) {
+    if (intent.getBooleanExtra(MainComponent.EXTRA_CLEAR_NEW_VOICEMAILS, false)) {
       LogUtil.i("OldMainActivityPeer.onHandleIntent", "clearing all new voicemails");
-      CallLogNotificationsService.markAllNewVoicemailsAsOld(mainActivity);
+      CallLogNotificationsService.markAllNewVoicemailsAsOld(activity);
+    }
+  }
+
+  /** Log impression for non user tab selection. */
+  private void logImpressionForSelectedTab(@TabIndex int tab) {
+    if (tab == TabIndex.SPEED_DIAL) {
+      Logger.get(activity).logImpression(DialerImpression.Type.MAIN_OPEN_WITH_TAB_FAVORITE);
+    } else if (tab == TabIndex.CALL_LOG) {
+      Logger.get(activity).logImpression(DialerImpression.Type.MAIN_OPEN_WITH_TAB_CALL_LOG);
+    } else if (tab == TabIndex.CONTACTS) {
+      Logger.get(activity).logImpression(DialerImpression.Type.MAIN_OPEN_WITH_TAB_CONTACTS);
+    } else if (tab == TabIndex.VOICEMAIL) {
+      Logger.get(activity).logImpression(DialerImpression.Type.MAIN_OPEN_WITH_TAB_VOICEMAIL);
+    } else {
+      throw new IllegalStateException("Invalid tab: " + tab);
     }
   }
 
@@ -389,16 +501,16 @@
     return DialpadFragment.isAddCallMode(intent);
   }
 
+  @SuppressLint("MissingPermission")
   @Override
   public void onActivityResume() {
+    LogUtil.enterBlock("MainBottomNavBarBottomNavTabListener.onActivityResume");
     callLogFragmentListener.onActivityResume();
     // Start the thread that updates the smart dial database if the activity is recreated with a
     // language change.
     boolean forceUpdate =
-        !CompatUtils.getLocale(mainActivity).getISO3Language().equals(savedLanguageCode);
-    Database.get(mainActivity)
-        .getDatabaseHelper(mainActivity)
-        .startSmartDialUpdateThread(forceUpdate);
+        !LocaleUtils.getLocale(activity).getISO3Language().equals(savedLanguageCode);
+    Database.get(activity).getDatabaseHelper(activity).startSmartDialUpdateThread(forceUpdate);
     showPostCallPrompt();
 
     if (searchController.isInSearch()
@@ -408,10 +520,40 @@
       bottomNav.setVisibility(View.VISIBLE);
     }
 
+    /*
+     * While the activity is running, listen for the call log framework being disabled. If this is
+     * not done, user interaction with the fragment could cause call log framework state to be
+     * unexpectedly written. For example scrolling could cause the AnnotatedCallLog to be read
+     * (which would trigger database creation).
+     */
+    LocalBroadcastManager.getInstance(activity)
+        .registerReceiver(
+            disableCallLogFrameworkReceiver, new IntentFilter("disableCallLogFramework"));
+
+    /*
+     * Similar to above, if the new call log/new voicemail is being shown and then the activity is
+     * paused, when the user returns we need to remove the NewCallLogFragment if the framework has
+     * been disabled in the meantime.
+     */
+    bottomNavTabListener.ensureCorrectCallLogShown();
+    bottomNavTabListener.ensureCorrectVoicemailShown();
+
+    // Config the badge of missed calls for the new call log.
+    if (bottomNavTabListener.newCallLogFragmentActive()) {
+      if (PermissionsUtil.hasCallLogReadPermissions(activity)) {
+        missedCallCountObserver.onChange(false); // Set the initial value for the badge
+        activity
+            .getContentResolver()
+            .registerContentObserver(Calls.CONTENT_URI, true, missedCallCountObserver);
+      } else {
+        bottomNav.setNotificationCount(TabIndex.CALL_LOG, 0);
+      }
+    }
+
     // add 1 sec delay to get memory snapshot so that dialer wont react slowly on resume.
     ThreadUtil.postDelayedOnUiThread(
         () ->
-            MetricsComponent.get(mainActivity)
+            MetricsComponent.get(activity)
                 .metrics()
                 .recordMemory(Metrics.OLD_MAIN_ACTIVITY_PEER_ON_RESUME_MEMORY_EVENT_NAME),
         1000);
@@ -423,21 +565,25 @@
   }
 
   @Override
-  public void onActivityPause() {}
+  public void onActivityPause() {
+    searchController.onActivityPause();
+    LocalBroadcastManager.getInstance(activity).unregisterReceiver(disableCallLogFrameworkReceiver);
+    activity.getContentResolver().unregisterContentObserver(missedCallCountObserver);
+  }
 
   @Override
   public void onActivityStop() {
     lastTabController.onActivityStop();
     callLogFragmentListener.onActivityStop(
-        mainActivity.isChangingConfigurations(),
-        mainActivity.getSystemService(KeyguardManager.class).isKeyguardLocked());
+        activity.isChangingConfigurations(),
+        activity.getSystemService(KeyguardManager.class).isKeyguardLocked());
   }
 
   @Override
   public void onActivityDestroyed() {}
 
   private void showPostCallPrompt() {
-    if (TelecomUtil.isInManagedCall(mainActivity)) {
+    if (TelecomUtil.isInManagedCall(activity)) {
       // No prompt to show if the user is in a call
       return;
     }
@@ -447,13 +593,12 @@
       return;
     }
 
-    PostCall.promptUserForMessageIfNecessary(mainActivity, snackbarContainer);
+    PostCall.promptUserForMessageIfNecessary(activity, snackbarContainer);
   }
 
   @Override
   public void onSaveInstanceState(Bundle bundle) {
-    bundle.putString(
-        KEY_SAVED_LANGUAGE_CODE, CompatUtils.getLocale(mainActivity).getISO3Language());
+    bundle.putString(KEY_SAVED_LANGUAGE_CODE, LocaleUtils.getLocale(activity).getISO3Language());
     bundle.putInt(KEY_CURRENT_TAB, bottomNav.getSelectedTab());
     searchController.onSaveInstanceState(bundle);
   }
@@ -472,7 +617,7 @@
         LogUtil.i(
             "OldMainActivityPeer.onActivityResult", "returned from call composer, error occurred");
         String message =
-            mainActivity.getString(
+            activity.getString(
                 R.string.call_composer_connection_failed,
                 data.getStringExtra(CallComposerActivity.KEY_CONTACT_NAME));
         Snackbar.make(snackbarContainer, message, Snackbar.LENGTH_LONG).show();
@@ -483,27 +628,27 @@
     } else if (requestCode == ActivityRequestCodes.DIALTACTS_CALL_DETAILS) {
       if (resultCode == AppCompatActivity.RESULT_OK
           && data != null
-          && data.getBooleanExtra(CallDetailsActivity.EXTRA_HAS_ENRICHED_CALL_DATA, false)) {
-        String number = data.getStringExtra(CallDetailsActivity.EXTRA_PHONE_NUMBER);
+          && data.getBooleanExtra(OldCallDetailsActivity.EXTRA_HAS_ENRICHED_CALL_DATA, false)) {
+        String number = data.getStringExtra(OldCallDetailsActivity.EXTRA_PHONE_NUMBER);
         int snackbarDurationMillis = 5_000;
         Snackbar.make(
                 snackbarContainer,
-                mainActivity.getString(R.string.ec_data_deleted),
+                activity.getString(R.string.ec_data_deleted),
                 snackbarDurationMillis)
             .setAction(
                 R.string.view_conversation,
                 v ->
-                    mainActivity.startActivity(
-                        IntentProvider.getSendSmsIntentProvider(number).getIntent(mainActivity)))
+                    activity.startActivity(
+                        IntentProvider.getSendSmsIntentProvider(number).getIntent(activity)))
             .setActionTextColor(
-                ContextCompat.getColor(mainActivity, R.color.dialer_snackbar_action_text_color))
+                ContextCompat.getColor(activity, R.color.dialer_snackbar_action_text_color))
             .show();
       }
 
     } else if (requestCode == ActivityRequestCodes.DIALTACTS_DUO) {
       // We just returned from starting Duo for a task. Reload our reachability data since it
       // may have changed after a user finished activating Duo.
-      DuoComponent.get(mainActivity).getDuo().reloadReachability(mainActivity);
+      DuoComponent.get(activity).getDuo().reloadReachability(activity);
 
     } else {
       LogUtil.e("OldMainActivityPeer.onActivityResult", "Unknown request code: " + requestCode);
@@ -547,6 +692,8 @@
       return (T) oldSpeedDialFragmentHost;
     } else if (callbackInterface.isInstance(searchController)) {
       return (T) searchController;
+    } else if (callbackInterface.isInstance(speedDialFragmentHost)) {
+      return (T) speedDialFragmentHost;
     } else {
       return null;
     }
@@ -556,8 +703,10 @@
       BottomNavBar bottomNavBar,
       FloatingActionButton fab,
       MainToolbar mainToolbar,
-      View toolbarShadow) {
-    return new MainSearchController(mainActivity, bottomNavBar, fab, mainToolbar, toolbarShadow);
+      View toolbarShadow,
+      View fragmentContainer) {
+    return new MainSearchController(
+        activity, bottomNavBar, fab, mainToolbar, toolbarShadow, fragmentContainer);
   }
 
   public MainOnDialpadQueryChangedListener getNewOnDialpadQueryChangedListener(
@@ -652,6 +801,11 @@
       // TODO(calderwoodra): logging
       searchController.onCallPlacedFromSearch();
     }
+
+    @Override
+    public void requestingPermission() {
+      searchController.requestingPermission();
+    }
   }
 
   /** @see DialpadFragment.HostInterface */
@@ -675,9 +829,11 @@
       implements CallLogAdapter.OnActionModeStateChangedListener {
 
     private boolean isEnabled;
+    private ActionMode actionMode;
 
     @Override
-    public void onActionModeStateChanged(boolean isEnabled) {
+    public void onActionModeStateChanged(ActionMode actionMode, boolean isEnabled) {
+      this.actionMode = actionMode;
       this.isEnabled = isEnabled;
     }
 
@@ -747,6 +903,7 @@
     private final Context context;
     private final BottomNavBar bottomNavBar;
     private final Toolbar toolbar;
+    private final MainBottomNavBarBottomNavTabListener bottomNavTabListener;
 
     private @TabIndex int currentTab = TabIndex.SPEED_DIAL;
     private long timeSelected = -1;
@@ -756,6 +913,10 @@
         new ContentObserver(new Handler()) {
           @Override
           public void onChange(boolean selfChange) {
+            LogUtil.i(
+                "MainCallLogFragmentListener",
+                "voicemailStatusObserver.onChange selfChange:%b",
+                selfChange);
             super.onChange(selfChange);
             callLogQueryHandler.fetchVoicemailStatus();
           }
@@ -765,17 +926,20 @@
         Context context,
         ContentResolver contentResolver,
         BottomNavBar bottomNavBar,
-        Toolbar toolbar) {
+        Toolbar toolbar,
+        MainBottomNavBarBottomNavTabListener bottomNavTabListener) {
       callLogQueryHandler = new CallLogQueryHandler(context, contentResolver, this);
       this.context = context;
       this.bottomNavBar = bottomNavBar;
       this.toolbar = toolbar;
+      this.bottomNavTabListener = bottomNavTabListener;
     }
 
     private void registerVoicemailStatusContentObserver(Context context) {
-
+      LogUtil.enterBlock("MainCallLogFragmentListener.registerVoicemailStatusContentObserver");
       if (PermissionsUtil.hasReadVoicemailPermissions(context)
           && PermissionsUtil.hasAddVoicemailPermissions(context)) {
+        LogUtil.i("MainCallLogFragmentListener.registerVoicemailStatusContentObserver", "register");
         context
             .getContentResolver()
             .registerContentObserver(
@@ -819,8 +983,7 @@
               numberOfActiveVoicemailSources));
 
       if (hasActiveVoicemailProvider) {
-        // TODO(yueg): Use new logging for VVM_TAB_VISIBLE
-        // Logger.get(context).logImpression(DialerImpression.Type.VVM_TAB_VISIBLE);
+        Logger.get(context).logImpression(DialerImpression.Type.MAIN_VVM_TAB_VISIBLE);
         bottomNavBar.showVoicemail(true);
         callLogQueryHandler.fetchVoicemailUnreadCount();
       } else {
@@ -882,8 +1045,15 @@
     }
 
     private void markMissedCallsAsReadAndRemoveNotification() {
-      callLogQueryHandler.markMissedCallsAsRead();
-      CallLogNotificationsService.cancelAllMissedCalls(context);
+      if (bottomNavTabListener.newCallLogFragmentActive()) {
+        Futures.addCallback(
+            CallLogComponent.get(context).getClearMissedCalls().clearAll(),
+            new DefaultFutureCallback<>(),
+            MoreExecutors.directExecutor());
+      } else {
+        callLogQueryHandler.markMissedCallsAsRead();
+        CallLogNotificationsService.cancelAllMissedCalls(context);
+      }
     }
 
     private void setCurrentTab(@TabIndex int tabIndex) {
@@ -895,19 +1065,28 @@
     }
 
     public void onActivityResume() {
+      LogUtil.enterBlock("MainCallLogFragmentListener.onActivityResume");
       activityIsAlive = true;
       registerVoicemailStatusContentObserver(context);
+      // TODO(a bug): Don't use callLogQueryHandler
       callLogQueryHandler.fetchVoicemailStatus();
-      callLogQueryHandler.fetchMissedCallsUnreadCount();
+
+      if (!bottomNavTabListener.newCallLogFragmentActive()) {
+        callLogQueryHandler.fetchMissedCallsUnreadCount();
+      }
       // Reset the tab on resume to restart the timer
       setCurrentTab(bottomNavBar.getSelectedTab());
     }
 
-    /** Should be called when {@link Activity#onStop()} is called. */
+    /** Should be called when {@link AppCompatActivity#onStop()} is called. */
     public void onActivityStop(boolean changingConfigurations, boolean keyguardLocked) {
       context.getContentResolver().unregisterContentObserver(voicemailStatusObserver);
       activityIsAlive = false;
-      if (viewedCallLogTabPastTimeThreshold() && !changingConfigurations && !keyguardLocked) {
+      // The new call log fragment handles this on its own.
+      if (!bottomNavTabListener.newCallLogFragmentActive()
+          && viewedCallLogTabPastTimeThreshold()
+          && !changingConfigurations
+          && !keyguardLocked) {
         markMissedCallsAsReadAndRemoveNotification();
       }
     }
@@ -994,37 +1173,49 @@
   private static final class MainOldSpeedDialFragmentHost
       implements OldSpeedDialFragment.HostInterface, OnDragDropListener {
 
+    private final Context context;
+    private final View rootLayout;
     private final BottomNavBar bottomNavBar;
     private final ImageView dragShadowOverlay;
     private final RemoveView removeView;
+    private final View removeViewContent;
     private final View searchViewContainer;
     private final MainToolbar toolbar;
 
-    // TODO(calderwoodra): Use this for drag and drop
-    @SuppressWarnings("unused")
-    private DragDropController dragDropController;
-
     MainOldSpeedDialFragmentHost(
+        Context context,
+        View rootLayout,
         BottomNavBar bottomNavBar,
         ImageView dragShadowOverlay,
         RemoveView removeView,
         View searchViewContainer,
         MainToolbar toolbar) {
+      this.context = context;
+      this.rootLayout = rootLayout;
       this.bottomNavBar = bottomNavBar;
       this.dragShadowOverlay = dragShadowOverlay;
       this.removeView = removeView;
       this.searchViewContainer = searchViewContainer;
       this.toolbar = toolbar;
+      removeViewContent = removeView.findViewById(R.id.remove_view_content);
     }
 
     @Override
     public void setDragDropController(DragDropController dragDropController) {
       removeView.setDragDropController(dragDropController);
+      rootLayout.setOnDragListener(
+          (v, event) -> {
+            if (event.getAction() == DragEvent.ACTION_DRAG_LOCATION) {
+              dragDropController.handleDragHovered(v, (int) event.getX(), (int) event.getY());
+            }
+            return true;
+          });
     }
 
     @Override
     public void showAllContactsTab() {
       bottomNavBar.selectTab(TabIndex.CONTACTS);
+      Logger.get(context).logImpression(DialerImpression.Type.MAIN_OPEN_WITH_TAB_CONTACTS);
     }
 
     @Override
@@ -1055,14 +1246,50 @@
 
     private void showRemoveView(boolean show) {
       if (show) {
-        AnimUtils.crossFadeViews(removeView, searchViewContainer, 300);
+        AnimUtils.crossFadeViews(removeViewContent, searchViewContainer, 300);
       } else {
-        AnimUtils.crossFadeViews(searchViewContainer, removeView, 300);
+        AnimUtils.crossFadeViews(searchViewContainer, removeViewContent, 300);
       }
     }
   }
 
   /**
+   * Handles the callbacks for {@link SpeedDialFragment}.
+   *
+   * @see SpeedDialFragment.HostInterface
+   */
+  private static final class MainSpeedDialFragmentHost implements SpeedDialFragment.HostInterface {
+
+    private final MainToolbar toolbar;
+    private final ViewGroup rootLayout;
+    private final ViewGroup coordinatorLayout;
+    private final ViewGroup fragmentContainer;
+
+    MainSpeedDialFragmentHost(
+        MainToolbar toolbar,
+        ViewGroup rootLayout,
+        ViewGroup coordinatorLayout,
+        ViewGroup fragmentContainer) {
+      this.toolbar = toolbar;
+      this.rootLayout = rootLayout;
+      this.coordinatorLayout = coordinatorLayout;
+      this.fragmentContainer = fragmentContainer;
+    }
+
+    @Override
+    public void setHasFrequents(boolean hasFrequents) {
+      toolbar.showClearFrequents(hasFrequents);
+    }
+
+    @Override
+    public void dragFavorite(boolean start) {
+      rootLayout.setClipChildren(!start);
+      coordinatorLayout.setClipChildren(!start);
+      fragmentContainer.setClipChildren(!start);
+    }
+  }
+
+  /**
    * Implementation of {@link OnBottomNavTabSelectedListener} that handles logic for showing each of
    * the main tabs and FAB.
    *
@@ -1077,47 +1304,47 @@
     private static final String CONTACTS_TAG = "contacts";
     private static final String VOICEMAIL_TAG = "voicemail";
 
-    private final Context context;
+    private final TransactionSafeActivity activity;
     private final FragmentManager fragmentManager;
+    private final android.support.v4.app.FragmentManager supportFragmentManager;
     private final FloatingActionButton fab;
+    private final View bottomSheet;
 
     @TabIndex private int selectedTab = -1;
 
     private MainBottomNavBarBottomNavTabListener(
-        Context context, FragmentManager fragmentManager, FloatingActionButton fab) {
-      this.context = context;
+        TransactionSafeActivity activity,
+        FragmentManager fragmentManager,
+        android.support.v4.app.FragmentManager supportFragmentManager,
+        FloatingActionButton fab,
+        View bottomSheet) {
+      this.activity = activity;
       this.fragmentManager = fragmentManager;
+      this.supportFragmentManager = supportFragmentManager;
       this.fab = fab;
-      preloadCallLogFragment();
-    }
-
-    private void preloadCallLogFragment() {
-      if (ConfigProviderBindings.get(context).getBoolean("nui_preload_call_log", true)) {
-        CallLogFragment fragment = new CallLogFragment();
-        fragmentManager
-            .beginTransaction()
-            .add(R.id.fragment_container, fragment, CALL_LOG_TAG)
-            .hide(fragment)
-            .commit();
-      }
+      this.bottomSheet = bottomSheet;
     }
 
     @Override
     public void onSpeedDialSelected() {
       LogUtil.enterBlock("MainBottomNavBarBottomNavTabListener.onSpeedDialSelected");
-      if (selectedTab != TabIndex.SPEED_DIAL) {
-        Logger.get(context).logImpression(DialerImpression.Type.MAIN_SWITCH_TAB_TO_FAVORITE);
-        selectedTab = TabIndex.SPEED_DIAL;
+      if (selectedTab == TabIndex.SPEED_DIAL) {
+        return;
       }
-      hideAllFragments();
-      Fragment fragment = fragmentManager.findFragmentByTag(SPEED_DIAL_TAG);
-      if (fragment == null) {
-        fragmentManager
-            .beginTransaction()
-            .add(R.id.fragment_container, new OldSpeedDialFragment(), SPEED_DIAL_TAG)
-            .commit();
+      Logger.get(activity).logScreenView(ScreenEvent.Type.MAIN_SPEED_DIAL, activity);
+      selectedTab = TabIndex.SPEED_DIAL;
+
+      if (ConfigProviderComponent.get(activity)
+          .getConfigProvider()
+          .getBoolean("enable_new_favorites_tab", false)) {
+        android.support.v4.app.Fragment supportFragment =
+            supportFragmentManager.findFragmentByTag(SPEED_DIAL_TAG);
+        showSupportFragment(
+            supportFragment == null ? SpeedDialFragment.newInstance() : supportFragment,
+            SPEED_DIAL_TAG);
       } else {
-        fragmentManager.beginTransaction().show(fragment).commit();
+        Fragment fragment = fragmentManager.findFragmentByTag(SPEED_DIAL_TAG);
+        showFragment(fragment == null ? new OldSpeedDialFragment() : fragment, SPEED_DIAL_TAG);
       }
       fab.show();
     }
@@ -1125,91 +1352,281 @@
     @Override
     public void onCallLogSelected() {
       LogUtil.enterBlock("MainBottomNavBarBottomNavTabListener.onCallLogSelected");
-      if (selectedTab != TabIndex.CALL_LOG) {
-        Logger.get(context).logImpression(DialerImpression.Type.MAIN_SWITCH_TAB_TO_CALL_LOG);
-        selectedTab = TabIndex.CALL_LOG;
+      if (selectedTab == TabIndex.CALL_LOG) {
+        return;
       }
-      hideAllFragments();
-      CallLogFragment fragment = (CallLogFragment) fragmentManager.findFragmentByTag(CALL_LOG_TAG);
-      if (fragment == null) {
-        fragmentManager
-            .beginTransaction()
-            .add(R.id.fragment_container, new CallLogFragment(), CALL_LOG_TAG)
-            .commit();
+      Logger.get(activity).logScreenView(ScreenEvent.Type.MAIN_CALL_LOG, activity);
+      selectedTab = TabIndex.CALL_LOG;
+
+      if (CallLogConfigComponent.get(activity).callLogConfig().isNewCallLogFragmentEnabled()) {
+        android.support.v4.app.Fragment supportFragment =
+            supportFragmentManager.findFragmentByTag(CALL_LOG_TAG);
+        showSupportFragment(
+            supportFragment == null ? new NewCallLogFragment() : supportFragment, CALL_LOG_TAG);
       } else {
-        fragmentManager.beginTransaction().show(fragment).commit();
+        Fragment fragment = fragmentManager.findFragmentByTag(CALL_LOG_TAG);
+        showFragment(fragment == null ? new CallLogFragment() : fragment, CALL_LOG_TAG);
       }
       fab.show();
+      showPromotionBottomSheet(activity, bottomSheet);
+    }
+
+    private static void showPromotionBottomSheet(Context context, View view) {
+      BottomSheetBehavior<View> bottomSheetBehavior = BottomSheetBehavior.from(view);
+      Optional<Promotion> promotionOptional =
+          PromotionComponent.get(context)
+              .promotionManager()
+              .getHighestPriorityPromotion(PromotionType.BOTTOM_SHEET);
+      if (!promotionOptional.isPresent()) {
+        bottomSheetBehavior.setState(BottomSheetBehavior.STATE_HIDDEN);
+        return;
+      }
+
+      Promotion promotion = promotionOptional.get();
+      ImageView icon = view.findViewById(R.id.promotion_icon);
+      icon.setImageResource(promotion.getIconRes());
+      TextView details = view.findViewById(R.id.promotion_details);
+      details.setText(promotion.getDetails());
+      // Required to make link clickable.
+      details.setMovementMethod(LinkMovementMethod.getInstance());
+      TextView title = view.findViewById(R.id.promotion_title);
+      title.setText(promotion.getTitle());
+      view.findViewById(R.id.ok_got_it)
+          .setOnClickListener(
+              v -> {
+                promotion.dismiss();
+                bottomSheetBehavior.setState(BottomSheetBehavior.STATE_HIDDEN);
+              });
+      view.setVisibility(View.VISIBLE);
+      bottomSheetBehavior.setState(BottomSheetBehavior.STATE_EXPANDED);
+    }
+
+    void disableNewCallLogFragment() {
+      LogUtil.i("MainBottomNavBarBottomNavTabListener.disableNewCallLogFragment", "disabled");
+      android.support.v4.app.Fragment supportFragment =
+          supportFragmentManager.findFragmentByTag(CALL_LOG_TAG);
+      if (supportFragment != null) {
+        supportFragmentManager.beginTransaction().remove(supportFragment).commitAllowingStateLoss();
+        // If the NewCallLogFragment was showing, immediately show the old call log fragment
+        // instead.
+        if (selectedTab == TabIndex.CALL_LOG) {
+          LogUtil.i(
+              "MainBottomNavBarBottomNavTabListener.disableNewCallLogFragment", "showing old");
+          Fragment fragment = fragmentManager.findFragmentByTag(CALL_LOG_TAG);
+          showFragment(fragment == null ? new CallLogFragment() : fragment, CALL_LOG_TAG);
+        }
+      }
+    }
+
+    void disableNewVoicemailFragment() {
+      LogUtil.i("MainBottomNavBarBottomNavTabListener.disableNewVoicemailFragment", "disabled");
+      android.support.v4.app.Fragment supportFragment =
+          supportFragmentManager.findFragmentByTag(VOICEMAIL_TAG);
+      if (supportFragment != null) {
+        supportFragmentManager.beginTransaction().remove(supportFragment).commitAllowingStateLoss();
+        // If the NewVoicemailFragment was showing, immediately show the old voicemail fragment
+        // instead.
+        if (selectedTab == TabIndex.VOICEMAIL) {
+          LogUtil.i(
+              "MainBottomNavBarBottomNavTabListener.disableNewVoicemailFragment", "showing old");
+          Fragment fragment = fragmentManager.findFragmentByTag(VOICEMAIL_TAG);
+          showFragment(
+              fragment == null ? new VisualVoicemailCallLogFragment() : fragment, VOICEMAIL_TAG);
+        }
+      }
+    }
+
+    void ensureCorrectCallLogShown() {
+      android.support.v4.app.Fragment supportFragment =
+          supportFragmentManager.findFragmentByTag(CALL_LOG_TAG);
+      if (supportFragment != null
+          && !CallLogConfigComponent.get(activity).callLogConfig().isNewCallLogFragmentEnabled()) {
+        LogUtil.i("MainBottomNavBarBottomNavTabListener.ensureCorrectCallLogShown", "disabling");
+        disableNewCallLogFragment();
+      }
+    }
+
+    void ensureCorrectVoicemailShown() {
+      android.support.v4.app.Fragment supportFragment =
+          supportFragmentManager.findFragmentByTag(VOICEMAIL_TAG);
+      if (supportFragment != null
+          && !CallLogConfigComponent.get(activity)
+              .callLogConfig()
+              .isNewVoicemailFragmentEnabled()) {
+        LogUtil.i("MainBottomNavBarBottomNavTabListener.ensureCorrectVoicemailShown", "disabling");
+        disableNewVoicemailFragment();
+      }
+    }
+
+    boolean newCallLogFragmentActive() {
+      return supportFragmentManager.findFragmentByTag(CALL_LOG_TAG) != null
+          || (fragmentManager.findFragmentByTag(CALL_LOG_TAG) == null
+              && CallLogConfigComponent.get(activity)
+                  .callLogConfig()
+                  .isNewCallLogFragmentEnabled());
+    }
+
+    boolean newVoicemailFragmentActive() {
+      return supportFragmentManager.findFragmentByTag(VOICEMAIL_TAG) != null
+          || (fragmentManager.findFragmentByTag(VOICEMAIL_TAG) == null
+              && CallLogConfigComponent.get(activity)
+                  .callLogConfig()
+                  .isNewVoicemailFragmentEnabled());
     }
 
     @Override
     public void onContactsSelected() {
       LogUtil.enterBlock("MainBottomNavBarBottomNavTabListener.onContactsSelected");
-      if (selectedTab != TabIndex.CONTACTS) {
-        Logger.get(context).logImpression(DialerImpression.Type.MAIN_SWITCH_TAB_TO_CONTACTS);
-        selectedTab = TabIndex.CONTACTS;
+      if (selectedTab == TabIndex.CONTACTS) {
+        return;
       }
-      hideAllFragments();
-      ContactsFragment fragment =
-          (ContactsFragment) fragmentManager.findFragmentByTag(CONTACTS_TAG);
-      if (fragment == null) {
-        fragmentManager
-            .beginTransaction()
-            .add(
-                R.id.fragment_container,
-                ContactsFragment.newInstance(Header.ADD_CONTACT),
-                CONTACTS_TAG)
-            .commit();
-      } else {
-        fragmentManager.beginTransaction().show(fragment).commit();
-      }
+      Logger.get(activity).logScreenView(ScreenEvent.Type.MAIN_CONTACTS, activity);
+      selectedTab = TabIndex.CONTACTS;
+      Fragment fragment = fragmentManager.findFragmentByTag(CONTACTS_TAG);
+      showFragment(
+          fragment == null ? ContactsFragment.newInstance(Header.ADD_CONTACT) : fragment,
+          CONTACTS_TAG);
       fab.show();
     }
 
     @Override
     public void onVoicemailSelected() {
       LogUtil.enterBlock("MainBottomNavBarBottomNavTabListener.onVoicemailSelected");
-      if (selectedTab != TabIndex.VOICEMAIL) {
-        Logger.get(context).logImpression(DialerImpression.Type.MAIN_SWITCH_TAB_TO_VOICEMAIL);
-        selectedTab = TabIndex.VOICEMAIL;
+      if (selectedTab == TabIndex.VOICEMAIL) {
+        return;
       }
-      hideAllFragments();
-      VisualVoicemailCallLogFragment fragment =
-          (VisualVoicemailCallLogFragment) fragmentManager.findFragmentByTag(VOICEMAIL_TAG);
-      if (fragment == null) {
-        fragment = new VisualVoicemailCallLogFragment();
-        fragmentManager
-            .beginTransaction()
-            .add(R.id.fragment_container, fragment, VOICEMAIL_TAG)
-            .commit();
-      } else {
-        fragmentManager.beginTransaction().show(fragment).commit();
-      }
-      fragment.setUserVisibleHint(true);
-      fragment.onVisible();
-    }
+      Logger.get(activity).logScreenView(ScreenEvent.Type.MAIN_VOICEMAIL, activity);
+      selectedTab = TabIndex.VOICEMAIL;
 
-    private void hideAllFragments() {
-      android.app.FragmentTransaction transaction = fragmentManager.beginTransaction();
-      if (fragmentManager.findFragmentByTag(SPEED_DIAL_TAG) != null) {
-        transaction.hide(fragmentManager.findFragmentByTag(SPEED_DIAL_TAG));
-      }
-      if (fragmentManager.findFragmentByTag(CALL_LOG_TAG) != null) {
-        // Old CallLogFragment
-        transaction.hide(fragmentManager.findFragmentByTag(CALL_LOG_TAG));
-      }
-      if (fragmentManager.findFragmentByTag(CONTACTS_TAG) != null) {
-        transaction.hide(fragmentManager.findFragmentByTag(CONTACTS_TAG));
-      }
-      if (fragmentManager.findFragmentByTag(VOICEMAIL_TAG) != null) {
-        // Old VisualVoicemailFragment
+      if (CallLogConfigComponent.get(activity).callLogConfig().isNewVoicemailFragmentEnabled()) {
+        android.support.v4.app.Fragment supportFragment =
+            supportFragmentManager.findFragmentByTag(VOICEMAIL_TAG);
+        showSupportFragment(
+            supportFragment == null ? new NewVoicemailFragment() : supportFragment, VOICEMAIL_TAG);
+      } else {
         VisualVoicemailCallLogFragment fragment =
             (VisualVoicemailCallLogFragment) fragmentManager.findFragmentByTag(VOICEMAIL_TAG);
-        fragment.setUserVisibleHint(false);
-        fragment.onNotVisible();
-        transaction.hide(fragment);
+        if (fragment == null) {
+          fragment = new VisualVoicemailCallLogFragment();
+        }
+        showFragment(fragment, VOICEMAIL_TAG);
+        fragment.setUserVisibleHint(true);
+        fragment.onVisible();
       }
-      transaction.commit();
+    }
+
+    private void showFragment(@NonNull Fragment fragment, String tag) {
+      showFragment(fragment, null, tag);
+    }
+
+    /**
+     * Shows the passed in fragment and hides all of the others in one transaction.
+     *
+     * <p>Exactly one of fragment or supportFragment should be provided.
+     *
+     * <p>Executes all fragment shows/hides in one transaction with no conflicting transactions
+     * (like showing and hiding the same fragment in the same transaction). See a bug.
+     *
+     * <p>Special care should be taken to avoid calling this method several times in a short window
+     * as it can lead to fragments overlapping.
+     */
+    private void showFragment(
+        @Nullable Fragment fragment,
+        @Nullable android.support.v4.app.Fragment supportFragment,
+        String tag) {
+      LogUtil.enterBlock("MainBottomNavBarBottomNavTabListener.showFragment");
+      Fragment oldSpeedDial = fragmentManager.findFragmentByTag(SPEED_DIAL_TAG);
+      Fragment oldCallLog = fragmentManager.findFragmentByTag(CALL_LOG_TAG);
+      Fragment contacts = fragmentManager.findFragmentByTag(CONTACTS_TAG);
+      Fragment oldVoicemail = fragmentManager.findFragmentByTag(VOICEMAIL_TAG);
+
+      FragmentTransaction transaction = fragmentManager.beginTransaction();
+      boolean fragmentShown = showIfEqualElseHide(transaction, fragment, oldSpeedDial);
+      fragmentShown |= showIfEqualElseHide(transaction, fragment, oldCallLog);
+      fragmentShown |= showIfEqualElseHide(transaction, fragment, contacts);
+      fragmentShown |= showIfEqualElseHide(transaction, fragment, oldVoicemail);
+
+      if (!fragmentShown && fragment != null) {
+        LogUtil.i(
+            "MainBottomNavBarBottomNavTabListener.showFragment", "Not added yet: " + fragment);
+        transaction.add(R.id.fragment_container, fragment, tag);
+      }
+      if (activity.isSafeToCommitTransactions()) {
+        transaction.commit();
+      }
+
+      // Handle support fragments.
+      // TODO(calderwoodra): Handle other new fragments.
+      android.support.v4.app.Fragment speedDial =
+          supportFragmentManager.findFragmentByTag(SPEED_DIAL_TAG);
+      android.support.v4.app.Fragment newCallLog =
+          supportFragmentManager.findFragmentByTag(CALL_LOG_TAG);
+      android.support.v4.app.Fragment newVoicemail =
+          supportFragmentManager.findFragmentByTag(VOICEMAIL_TAG);
+
+      android.support.v4.app.FragmentTransaction supportTransaction =
+          supportFragmentManager.beginTransaction();
+      boolean supportFragmentShown =
+          showIfEqualElseHideSupport(supportTransaction, supportFragment, speedDial);
+      supportFragmentShown |=
+          showIfEqualElseHideSupport(supportTransaction, supportFragment, newCallLog);
+      supportFragmentShown |=
+          showIfEqualElseHideSupport(supportTransaction, supportFragment, newVoicemail);
+
+      if (!supportFragmentShown && supportFragment != null) {
+        LogUtil.i(
+            "MainBottomNavBarBottomNavTabListener.showFragment",
+            "Not added yet: " + supportFragment);
+        supportTransaction.add(R.id.fragment_container, supportFragment, tag);
+      }
+      if (activity.isSafeToCommitTransactions()) {
+        supportTransaction.commit();
+      }
+    }
+
+    private void showSupportFragment(
+        @NonNull android.support.v4.app.Fragment supportFragment, String tag) {
+      showFragment(null, supportFragment, tag);
+    }
+
+    /**
+     * @param fragment1 will be shown if equal to {@code fragment2}
+     * @param fragment2 will be hidden if unequal to {@code fragment1}
+     * @return {@code true} if {@code fragment1} was shown
+     */
+    private boolean showIfEqualElseHide(
+        FragmentTransaction transaction, Fragment fragment1, Fragment fragment2) {
+      boolean shown = false;
+      if (fragment1 != null && fragment1.equals(fragment2)) {
+        transaction.show(fragment1);
+        shown = true;
+      } else if (fragment2 != null) {
+        if (fragment2 instanceof VisualVoicemailCallLogFragment) {
+          fragment2.setUserVisibleHint(false);
+          ((VisualVoicemailCallLogFragment) fragment2).onNotVisible();
+        }
+        transaction.hide(fragment2);
+      }
+      return shown;
+    }
+
+    /**
+     * @param supportFragment1 will be shown if equal to {@code fragment2}
+     * @param supportFragment2 will be hidden if unequal to {@code fragment1}
+     * @return {@code true} if {@code fragment1} was shown
+     */
+    private boolean showIfEqualElseHideSupport(
+        android.support.v4.app.FragmentTransaction supportTransaction,
+        android.support.v4.app.Fragment supportFragment1,
+        android.support.v4.app.Fragment supportFragment2) {
+      boolean shown = false;
+      if (supportFragment1 != null && supportFragment1.equals(supportFragment2)) {
+        supportTransaction.show(supportFragment1);
+        shown = true;
+      } else if (supportFragment2 != null) {
+        supportTransaction.hide(supportFragment2);
+      }
+      return shown;
     }
   }
 
@@ -1217,32 +1634,33 @@
 
     private final Context context;
     private final BottomNavBar bottomNavBar;
-    private final boolean isEnabled;
     private final boolean canShowVoicemailTab;
 
     LastTabController(Context context, BottomNavBar bottomNavBar, boolean canShowVoicemailTab) {
       this.context = context;
       this.bottomNavBar = bottomNavBar;
-      isEnabled = ConfigProviderBindings.get(context).getBoolean("last_tab_enabled", false);
       this.canShowVoicemailTab = canShowVoicemailTab;
     }
 
-    /** Sets the last tab if the feature is enabled, otherwise defaults to speed dial. */
-    void selectLastTab() {
+    /**
+     * Get the last tab shown to the user, or the speed dial tab if this is the first time the user
+     * has opened the app.
+     */
+    @TabIndex
+    int getLastTab() {
       @TabIndex int tabIndex = TabIndex.SPEED_DIAL;
-      if (isEnabled) {
-        tabIndex =
-            StorageComponent.get(context)
-                .unencryptedSharedPrefs()
-                .getInt(KEY_LAST_TAB, TabIndex.SPEED_DIAL);
-      }
+
+      tabIndex =
+          StorageComponent.get(context)
+              .unencryptedSharedPrefs()
+              .getInt(KEY_LAST_TAB, TabIndex.SPEED_DIAL);
 
       // If the voicemail tab cannot be shown, default to showing speed dial
       if (tabIndex == TabIndex.VOICEMAIL && !canShowVoicemailTab) {
         tabIndex = TabIndex.SPEED_DIAL;
       }
 
-      bottomNavBar.selectTab(tabIndex);
+      return tabIndex;
     }
 
     void onActivityStop() {
diff --git a/java/com/android/dialer/main/impl/bottomnav/BottomNavBar.java b/java/com/android/dialer/main/impl/bottomnav/BottomNavBar.java
index 5ee33fc..80aa38b 100644
--- a/java/com/android/dialer/main/impl/bottomnav/BottomNavBar.java
+++ b/java/com/android/dialer/main/impl/bottomnav/BottomNavBar.java
@@ -24,6 +24,8 @@
 import android.widget.LinearLayout;
 import com.android.dialer.common.Assert;
 import com.android.dialer.common.LogUtil;
+import com.android.dialer.logging.DialerImpression;
+import com.android.dialer.logging.Logger;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.util.ArrayList;
@@ -74,27 +76,35 @@
 
     speedDial.setOnClickListener(
         v -> {
-          selectedTab = TabIndex.SPEED_DIAL;
-          setSelected(speedDial);
-          updateListeners(selectedTab);
+          if (selectedTab != TabIndex.SPEED_DIAL) {
+            Logger.get(getContext())
+                .logImpression(DialerImpression.Type.MAIN_SWITCH_TAB_TO_FAVORITE);
+          }
+          selectTab(TabIndex.SPEED_DIAL);
         });
     callLog.setOnClickListener(
         v -> {
-          selectedTab = TabIndex.CALL_LOG;
-          setSelected(callLog);
-          updateListeners(selectedTab);
+          if (selectedTab != TabIndex.CALL_LOG) {
+            Logger.get(getContext())
+                .logImpression(DialerImpression.Type.MAIN_SWITCH_TAB_TO_CALL_LOG);
+          }
+          selectTab(TabIndex.CALL_LOG);
         });
     contacts.setOnClickListener(
         v -> {
-          selectedTab = TabIndex.CONTACTS;
-          setSelected(contacts);
-          updateListeners(selectedTab);
+          if (selectedTab != TabIndex.CONTACTS) {
+            Logger.get(getContext())
+                .logImpression(DialerImpression.Type.MAIN_SWITCH_TAB_TO_CONTACTS);
+          }
+          selectTab(TabIndex.CONTACTS);
         });
     voicemail.setOnClickListener(
         v -> {
-          selectedTab = TabIndex.VOICEMAIL;
-          setSelected(voicemail);
-          updateListeners(selectedTab);
+          if (selectedTab != TabIndex.VOICEMAIL) {
+            Logger.get(getContext())
+                .logImpression(DialerImpression.Type.MAIN_SWITCH_TAB_TO_VOICEMAIL);
+          }
+          selectTab(TabIndex.VOICEMAIL);
         });
   }
 
@@ -106,22 +116,28 @@
   }
 
   /**
-   * Calls {@link View#performClick()} on the desired tab.
+   * Select tab for uesr and non-user click.
    *
    * @param tab {@link TabIndex}
    */
   public void selectTab(@TabIndex int tab) {
     if (tab == TabIndex.SPEED_DIAL) {
-      speedDial.performClick();
+      selectedTab = TabIndex.SPEED_DIAL;
+      setSelected(speedDial);
     } else if (tab == TabIndex.CALL_LOG) {
-      callLog.performClick();
+      selectedTab = TabIndex.CALL_LOG;
+      setSelected(callLog);
     } else if (tab == TabIndex.CONTACTS) {
-      contacts.performClick();
+      selectedTab = TabIndex.CONTACTS;
+      setSelected(contacts);
     } else if (tab == TabIndex.VOICEMAIL) {
-      voicemail.performClick();
+      selectedTab = TabIndex.VOICEMAIL;
+      setSelected(voicemail);
     } else {
       throw new IllegalStateException("Invalid tab: " + tab);
     }
+
+    updateListeners(selectedTab);
   }
 
   /**
@@ -139,7 +155,8 @@
     int voicemailcurrentVisibility = voicemail.getVisibility();
 
     if (voicemailpreviousVisibility != voicemailcurrentVisibility
-        && voicemailpreviousVisibility == View.VISIBLE) {
+        && voicemailpreviousVisibility == View.VISIBLE
+        && getSelectedTab() == TabIndex.VOICEMAIL) {
       LogUtil.i("OldMainActivityPeer.showVoicemail", "hid VM tab and moved to speed dial tab");
       selectTab(TabIndex.SPEED_DIAL);
     }
diff --git a/java/com/android/dialer/main/impl/bottomnav/BottomNavItem.java b/java/com/android/dialer/main/impl/bottomnav/BottomNavItem.java
index 2519d23..4794b88 100644
--- a/java/com/android/dialer/main/impl/bottomnav/BottomNavItem.java
+++ b/java/com/android/dialer/main/impl/bottomnav/BottomNavItem.java
@@ -29,7 +29,8 @@
 import android.widget.LinearLayout;
 import android.widget.TextView;
 import com.android.dialer.common.Assert;
-import com.android.dialer.configprovider.ConfigProviderBindings;
+import com.android.dialer.configprovider.ConfigProviderComponent;
+import com.android.dialer.theme.base.ThemeComponent;
 
 /** Navigation item in a bottom nav. */
 final class BottomNavItem extends LinearLayout {
@@ -53,10 +54,12 @@
   @Override
   public void setSelected(boolean selected) {
     super.setSelected(selected);
-    int colorId = selected ? R.color.bottom_nav_icon_selected : R.color.bottom_nav_icon_deselected;
-    int color = getContext().getColor(colorId);
-    image.setImageTintList(ColorStateList.valueOf(color));
-    text.setTextColor(color);
+    int colorId =
+        selected
+            ? ThemeComponent.get(getContext()).theme().getColorPrimary()
+            : ThemeComponent.get(getContext()).theme().getTextColorSecondary();
+    image.setImageTintList(ColorStateList.valueOf(colorId));
+    text.setTextColor(colorId);
   }
 
   void setup(@StringRes int stringRes, @DrawableRes int drawableRes) {
@@ -72,7 +75,9 @@
       String countString = String.format(Integer.toString(count));
 
       boolean use99PlusCount =
-          ConfigProviderBindings.get(getContext()).getBoolean("use_99_plus", false);
+          ConfigProviderComponent.get(getContext())
+              .getConfigProvider()
+              .getBoolean("use_99_plus", false);
       boolean use9Plus = !use99PlusCount;
 
       if (use99PlusCount && count > 99) {
diff --git a/java/com/android/dialer/main/impl/bottomnav/MissedCallCountObserver.java b/java/com/android/dialer/main/impl/bottomnav/MissedCallCountObserver.java
new file mode 100644
index 0000000..a4995c1
--- /dev/null
+++ b/java/com/android/dialer/main/impl/bottomnav/MissedCallCountObserver.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.dialer.main.impl.bottomnav;
+
+import android.Manifest;
+import android.content.Context;
+import android.database.ContentObserver;
+import android.database.Cursor;
+import android.provider.CallLog.Calls;
+import android.support.annotation.RequiresPermission;
+import com.android.dialer.common.concurrent.DialerExecutorComponent;
+import com.android.dialer.common.concurrent.UiListener;
+import com.android.dialer.main.impl.bottomnav.BottomNavBar.TabIndex;
+import com.google.common.util.concurrent.ListenableFuture;
+
+/**
+ * Observes the call log and updates the badge count to show the number of unread missed calls.
+ *
+ * <p>Used only when the new call log fragment is enabled.
+ */
+public final class MissedCallCountObserver extends ContentObserver {
+  private final Context appContext;
+  private final BottomNavBar bottomNavBar;
+  private final UiListener<Integer> uiListener;
+
+  public MissedCallCountObserver(
+      Context appContext, BottomNavBar bottomNavBar, UiListener<Integer> uiListener) {
+    super(null);
+    this.appContext = appContext;
+    this.bottomNavBar = bottomNavBar;
+    this.uiListener = uiListener;
+  }
+
+  @RequiresPermission(Manifest.permission.READ_CALL_LOG)
+  @Override
+  public void onChange(boolean selfChange) {
+    ListenableFuture<Integer> countFuture =
+        DialerExecutorComponent.get(appContext)
+            .backgroundExecutor()
+            .submit(
+                () -> {
+                  try (Cursor cursor =
+                      appContext
+                          .getContentResolver()
+                          .query(
+                              Calls.CONTENT_URI,
+                              new String[] {Calls._ID},
+                              "("
+                                  + Calls.IS_READ
+                                  + " = ? OR "
+                                  + Calls.IS_READ
+                                  + " IS NULL) AND "
+                                  + Calls.TYPE
+                                  + " = ?",
+                              new String[] {"0", Integer.toString(Calls.MISSED_TYPE)},
+                              /* sortOrder= */ null)) {
+                    return cursor == null ? 0 : cursor.getCount();
+                  }
+                });
+    uiListener.listen(
+        appContext,
+        countFuture,
+        count -> bottomNavBar.setNotificationCount(TabIndex.CALL_LOG, count == null ? 0 : count),
+        throwable -> {
+          throw new RuntimeException(throwable);
+        });
+  }
+}
diff --git a/java/com/android/dialer/main/impl/bottomnav/res/drawable/notification_badge.xml b/java/com/android/dialer/main/impl/bottomnav/res/drawable/notification_badge.xml
index 67e3f37..65bc8f9 100644
--- a/java/com/android/dialer/main/impl/bottomnav/res/drawable/notification_badge.xml
+++ b/java/com/android/dialer/main/impl/bottomnav/res/drawable/notification_badge.xml
@@ -17,7 +17,7 @@
 <shape
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-  <solid android:color="@color/dialer_theme_color"/>
-  <corners android:radius="18dp"/>
-  <stroke android:color="@color/background_dialer_white" android:width="2dp"/>
+  <solid android:color="?android:attr/colorPrimary"/>
+  <corners android:radius="20dp"/>
+  <stroke android:color="?android:attr/colorBackgroundFloating" android:width="2dp"/>
 </shape>
\ No newline at end of file
diff --git a/java/com/android/dialer/main/impl/bottomnav/res/layout/bottom_nav_bar_layout.xml b/java/com/android/dialer/main/impl/bottomnav/res/layout/bottom_nav_bar_layout.xml
index 02ba3ab..1dd60d8 100644
--- a/java/com/android/dialer/main/impl/bottomnav/res/layout/bottom_nav_bar_layout.xml
+++ b/java/com/android/dialer/main/impl/bottomnav/res/layout/bottom_nav_bar_layout.xml
@@ -19,7 +19,7 @@
     android:orientation="horizontal"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/background_dialer_white"
+    android:background="?android:attr/colorBackgroundFloating"
     android:elevation="8dp">
 
   <include
diff --git a/java/com/android/dialer/main/impl/bottomnav/res/layout/bottom_nav_item.xml b/java/com/android/dialer/main/impl/bottomnav/res/layout/bottom_nav_item.xml
index d319b2e..02874a9 100644
--- a/java/com/android/dialer/main/impl/bottomnav/res/layout/bottom_nav_item.xml
+++ b/java/com/android/dialer/main/impl/bottomnav/res/layout/bottom_nav_item.xml
@@ -22,7 +22,7 @@
     android:minWidth="80dp"
     android:minHeight="56dp"
     android:gravity="center"
-    android:background="?android:selectableItemBackgroundBorderless">
+    android:background="?android:attr/selectableItemBackgroundBorderless">
 
   <FrameLayout
       android:layout_width="wrap_content"
@@ -32,20 +32,22 @@
         android:id="@+id/bottom_nav_item_image"
         android:layout_width="24dp"
         android:layout_height="24dp"
-        android:layout_marginTop="4dp"/>
+        android:layout_marginTop="8dp"/>
 
     <TextView
         android:id="@+id/notification_badge"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="top|end"
+        android:layout_marginTop="2dp"
         android:paddingStart="6dp"
         android:paddingEnd="6dp"
+        android:paddingBottom="1dp"
         android:minHeight="20dp"
-        android:minWidth="18dp"
+        android:minWidth="20dp"
         android:gravity="center"
         android:textSize="12sp"
-        android:textColor="@color/dialer_primary_text_color_white"
+        android:textColor="?android:attr/textColorPrimaryInverse"
         android:background="@drawable/notification_badge"
         android:fontFamily="sans-serif-medium"
         android:visibility="invisible"/>
@@ -56,7 +58,7 @@
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_marginBottom="8dp"
+      android:gravity="center_horizontal"
       android:textSize="12sp"
-      android:textColor="@color/dialer_theme_color"
-      android:gravity="center_horizontal"/>
+      style="@style/Dialer.TextAppearance.Secondary"/>
 </com.android.dialer.main.impl.bottomnav.BottomNavItem>
\ No newline at end of file
diff --git a/java/com/android/dialer/main/impl/bottomnav/res/values/colors.xml b/java/com/android/dialer/main/impl/bottomnav/res/values/colors.xml
deleted file mode 100644
index b858b4f..0000000
--- a/java/com/android/dialer/main/impl/bottomnav/res/values/colors.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2018 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-  -->
-<resources>
-  <color name="bottom_nav_icon_selected">@color/dialer_theme_color</color>
-  <color name="bottom_nav_icon_deselected">@color/dialer_secondary_text_color</color>
-</resources>
diff --git a/java/com/android/dialer/main/impl/res/drawable-xxxhdpi/nui_launcher_icon.png b/java/com/android/dialer/main/impl/res/drawable-xxxhdpi/nui_launcher_icon.png
deleted file mode 100644
index 7845ebc..0000000
--- a/java/com/android/dialer/main/impl/res/drawable-xxxhdpi/nui_launcher_icon.png
+++ /dev/null
Binary files differ
diff --git a/java/com/android/dialer/main/impl/res/layout/main_activity.xml b/java/com/android/dialer/main/impl/res/layout/main_activity.xml
index 0883ace..25db637 100644
--- a/java/com/android/dialer/main/impl/res/layout/main_activity.xml
+++ b/java/com/android/dialer/main/impl/res/layout/main_activity.xml
@@ -21,6 +21,11 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
+  <!-- MainToolbar -->
+  <include
+      android:id="@+id/toolbar"
+      layout="@layout/toolbar_layout"/>
+
   <android.support.design.widget.CoordinatorLayout
       xmlns:android="http://schemas.android.com/apk/res/android"
       xmlns:app="http://schemas.android.com/apk/res-auto"
@@ -34,8 +39,20 @@
     <FrameLayout
         android:id="@+id/fragment_container"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_above="@+id/bottom_nav_bar"/>
+        android:layout_height="match_parent"/>
+
+    <FrameLayout
+        android:id="@+id/search_fragment_container"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"/>
+
+    <ImageView
+        android:id="@+id/toolbar_shadow"
+        android:layout_width="match_parent"
+        android:layout_height="2dp"
+        android:scaleType="fitXY"
+        android:src="@drawable/search_shadow"
+        android:visibility="gone"/>
 
     <com.android.dialer.widget.DialerFloatingActionButton
         android:id="@+id/fab"
@@ -46,6 +63,9 @@
         android:src="@drawable/quantum_ic_dialpad_white_24"
         android:contentDescription="@string/dialpad_button_content_description"
         app:backgroundTint="?android:attr/colorAccent"/>
+
+    <include android:id="@+id/promotion_bottom_sheet"
+        layout="@layout/promotion_bottom_sheet"/>
   </android.support.design.widget.CoordinatorLayout>
 
   <!-- BottomNavBar -->
@@ -63,20 +83,6 @@
       android:layout_height="match_parent"
       android:elevation="10dp"/>
 
-  <!-- MainToolbar -->
-  <include
-      android:id="@+id/toolbar"
-      layout="@layout/toolbar_layout"/>
-
-  <ImageView
-      android:id="@+id/toolbar_shadow"
-      android:layout_width="match_parent"
-      android:layout_height="2dp"
-      android:scaleType="fitXY"
-      android:src="@drawable/search_shadow"
-      android:layout_below="@+id/toolbar"
-      android:visibility="gone"/>
-
   <!-- TODO(calderwoodra): investigate what this is for and why we want it. -->
   <!-- Host container for the contact tile drag shadow -->
   <FrameLayout
@@ -90,4 +96,4 @@
         android:importantForAccessibility="no"
         android:visibility="gone"/>
   </FrameLayout>
-</RelativeLayout>
\ No newline at end of file
+</RelativeLayout>
diff --git a/java/com/android/dialer/main/impl/res/layout/promotion_bottom_sheet.xml b/java/com/android/dialer/main/impl/res/layout/promotion_bottom_sheet.xml
new file mode 100644
index 0000000..0edc03c
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/layout/promotion_bottom_sheet.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2018 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingTop="24dp"
+    android:paddingBottom="8dp"
+    android:paddingStart="16dp"
+    android:paddingEnd="24dp"
+    android:background="#FAFAFA"
+    android:clickable="true"
+    android:elevation="8dp"
+    android:orientation="horizontal"
+    android:visibility="gone"
+    app:behavior_hideable="true"
+    app:behavior_skipCollapsed="true"
+    app:layout_behavior="android.support.design.widget.BottomSheetBehavior"
+    app:layout_insetEdge="bottom">
+
+  <ImageView
+      android:id="@+id/promotion_icon"
+      android:layout_width="36dp"
+      android:layout_height="36dp"
+      android:tint="?android:attr/colorPrimary"/>
+  <LinearLayout
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:paddingStart="32dp"
+      android:orientation="vertical">
+    <TextView
+        android:id="@+id/promotion_title"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        style="@style/Dialer.TextAppearance.Header2"
+        />
+    <TextView
+        android:id="@+id/promotion_details"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:layout_marginBottom="16dp"
+        android:lineSpacingMultiplier="1.5"
+        style="@style/Dialer.TextAppearance.Secondary"/>
+    <Button
+        android:id="@+id/ok_got_it"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:layout_marginBottom="8dp"
+        android:layout_gravity="end"
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp"
+        android:fontFamily="sans-serif-medium"
+        android:stateListAnimator="@null"
+        android:text="@string/ok_got_it"
+        android:textColor="@android:color/white"
+        android:textSize="16sp"/>
+  </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/java/com/android/dialer/main/impl/res/layout/stub_fragment.xml b/java/com/android/dialer/main/impl/res/layout/stub_fragment.xml
deleted file mode 100644
index 3bb744f..0000000
--- a/java/com/android/dialer/main/impl/res/layout/stub_fragment.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-  -->
-<FrameLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-  <TextView
-      android:text="hello world!"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:layout_gravity="center"/>
-</FrameLayout>
\ No newline at end of file
diff --git a/java/com/android/dialer/main/impl/res/values-v27/styles.xml b/java/com/android/dialer/main/impl/res/values-v27/styles.xml
index 86e6f28..261012e 100644
--- a/java/com/android/dialer/main/impl/res/values-v27/styles.xml
+++ b/java/com/android/dialer/main/impl/res/values-v27/styles.xml
@@ -17,10 +17,20 @@
 <resources>
 
   <!-- Used on sdk 27 and above -->
-  <style name="NuiActivityTheme" parent="NuiActivityThemeBase">
+  <!-- TODO(a bug): refactor into dialer/theme -->
+  <style name="MainActivityTheme" parent="MainActivityThemeBase">
     <!-- Used to change the navigation bar color -->
     <item name="android:windowLightNavigationBar">true</item>
-    <item name="android:navigationBarColor">@color/background_dialer_white</item>
+    <item name="android:navigationBarColor">?android:attr/colorBackgroundFloating</item>
+    <item name="android:navigationBarDividerColor">#E0E0E0</item>
+  </style>
+
+  <!-- Used on sdk 27 and above -->
+  <!-- TODO(a bug): refactor into dialer/theme -->
+  <style name="MainActivityTheme.Dark" parent="MainActivityThemeBase.Dark">
+    <!-- Used to change the navigation bar color -->
+    <item name="android:windowLightNavigationBar">true</item>
+    <item name="android:navigationBarColor">?android:attr/colorBackgroundFloating</item>
     <item name="android:navigationBarDividerColor">#E0E0E0</item>
   </style>
 </resources>
\ No newline at end of file
diff --git a/java/com/android/dialer/main/impl/res/values/strings.xml b/java/com/android/dialer/main/impl/res/values/strings.xml
index 4e65432..cde78e6 100644
--- a/java/com/android/dialer/main/impl/res/values/strings.xml
+++ b/java/com/android/dialer/main/impl/res/values/strings.xml
@@ -18,16 +18,9 @@
   <!-- Name of the main activity. -->
   <string name="main_activity_label" tools:ignore="UnusedResources">Phone</string>
 
-  <!-- Name of launcher shortcut for the new UI main activity.
-       TODO(38502365): Remove this once we're ready to launch the new UI. -->
-  <string name="nui_shortcut_name">Phone NUI</string>
-
   <!-- Title for the activity that dials the phone, when launched directly into the dialpad -->
   <string name="dialpad_activity_title">Phone Keypad</string>
 
-  <!-- The description text for the call log tab. -->
-  <string name="main_call_history_tab_description" tools:ignore="UnusedResources">Call history</string>
-
   <!-- Text for a toolbar button that shows the user their contacts [CHAR LIMIT=NONE] -->
   <string name="search">@android:string/search_go</string>
   <!-- A11y announcement to let users know a button will let them search for contacts and places [CHAR LIMIT=NONE] -->
diff --git a/java/com/android/dialer/main/impl/res/values/styles.xml b/java/com/android/dialer/main/impl/res/values/styles.xml
index 47fdbac..25f247e 100644
--- a/java/com/android/dialer/main/impl/res/values/styles.xml
+++ b/java/com/android/dialer/main/impl/res/values/styles.xml
@@ -17,47 +17,35 @@
 <resources>
 
   <!-- Activities should use this theme as their style -->
-  <style name="NuiActivityTheme" parent="NuiActivityThemeBase"/>
+  <style name="MainActivityTheme" parent="MainActivityThemeBase"/>
+
+  <style name="MainActivityTheme.Dark" parent="MainActivityTheme.Dark"/>
 
   <!-- Used as a procy for values-v27/styles.xml -->
-  <style name="NuiActivityThemeBase" parent="Theme.AppCompat.Light.NoActionBar">
-    <!-- App colors -->
-    <item name="android:colorPrimary">@color/dialtacts_theme_color</item>
-    <item name="android:colorPrimaryDark">@color/dialer_theme_color_dark</item>
-    <item name="android:colorAccent">@color/dialer_secondary_color</item>
-
-    <!-- TODO(calderwoodra): figure out what this is used for, but I think it's for checkboxes -->
-    <item name="android:colorControlActivated">@color/dialer_theme_color</item>
-
-    <!-- Text colors -->
-    <item name="android:textColorPrimary">@color/dialer_primary_text_color</item>
-    <item name="android:textColorSecondary">@color/dialer_secondary_text_color</item>
-    <item name="android:textColorLink">@color/dialer_theme_color</item>
-
-    <!-- Themeing for material buttons and widgets -->
-    <item name="android:colorButtonNormal">@color/dialer_theme_color</item>
-    <item name="android:textAppearanceButton">@style/DialerButtonTextStyle</item>
-
-    <!-- Theme needed for DialpadFragment -->
-    <item name="dialpad_style">@style/Dialpad.Light</item>
-
-    <!-- Custom theme for Alert Dialogs-->
-    <item name="android:alertDialogTheme">@style/AlertDialogTheme</item>
-
+  <style name="MainActivityThemeBase" parent="Dialer.ThemeBase.NoActionBar">
     <!-- Required for actionmode/multiselect to render properly. -->
-    <!-- TODO(calderwoodra): Check to see if we can remove this after NewVoicemailFragment launches -->
-    <item name="actionModeStyle">@style/ActionModeStyle</item>
+    <!-- TODO(a bug): Check to see if we can remove this after NewVoicemailFragment launches -->
+    <item name="actionModeStyle">@style/MainActionModeStyle</item>
     <item name="actionBarTheme">@style/ThemeOverlay.AppCompat.Dark.ActionBar</item>
+    <item name="dialpad_style">@style/Dialpad.Themed</item>
+  </style>
+
+  <style name="MainActivityThemeBase.Dark" parent="Dialer.Dark.ThemeBase.NoActionBar">
+    <!-- Required for actionmode/multiselect to render properly. -->
+    <!-- TODO(a bug): Check to see if we can remove this after NewVoicemailFragment launches -->
+    <item name="actionModeStyle">@style/MainActionModeStyle</item>
+    <item name="actionBarTheme">@style/ThemeOverlay.AppCompat.Dark.ActionBar</item>
+    <item name="dialpad_style">@style/Dialpad.Themed</item>
   </style>
 
   <!-- Colors our actionbar in action mode to dialer theme color. -->
-  <style name="ActionModeStyle" parent="@style/Widget.AppCompat.ActionMode">
-    <item name="background">@color/dialer_theme_color</item>
+  <style name="MainActionModeStyle" parent="@style/Widget.AppCompat.ActionMode">
+    <item name="background">?android:attr/colorPrimary</item>
     <item name="titleTextStyle">@style/ActionModeTitleTextStyle</item>
   </style>
 
   <!-- Colors our actionbar text in action mode to dialer white text color. -->
   <style name="ActionModeTitleTextStyle" parent="@style/TextAppearance.AppCompat.Widget.ActionMode.Title">
-    <item name="android:textColor">@color/dialer_primary_text_color_white</item>
+    <item name="android:textColor">?android:attr/textColorPrimary</item>
   </style>
 </resources>
diff --git a/java/com/android/dialer/main/impl/toolbar/MainToolbar.java b/java/com/android/dialer/main/impl/toolbar/MainToolbar.java
index 2f36717..475383b 100644
--- a/java/com/android/dialer/main/impl/toolbar/MainToolbar.java
+++ b/java/com/android/dialer/main/impl/toolbar/MainToolbar.java
@@ -16,8 +16,6 @@
 
 package com.android.dialer.main.impl.toolbar;
 
-import android.animation.ValueAnimator;
-import android.animation.ValueAnimator.AnimatorUpdateListener;
 import android.content.Context;
 import android.support.annotation.NonNull;
 import android.support.annotation.StringRes;
@@ -25,11 +23,12 @@
 import android.support.v7.widget.Toolbar;
 import android.util.AttributeSet;
 import android.view.MenuItem;
+import android.view.View;
 import android.view.animation.AccelerateDecelerateInterpolator;
 import android.widget.ImageButton;
 import android.widget.PopupMenu;
-import android.widget.RelativeLayout;
 import com.android.dialer.common.Assert;
+import com.android.dialer.common.LogUtil;
 import com.android.dialer.util.ViewUtil;
 import com.google.common.base.Optional;
 
@@ -43,7 +42,7 @@
   private SearchBarView searchBar;
   private SearchBarListener listener;
   private MainToolbarMenu overflowMenu;
-  private boolean isSlideUp;
+  private boolean hasGlobalLayoutListener;
 
   public MainToolbar(Context context, AttributeSet attrs) {
     super(context, attrs);
@@ -73,47 +72,58 @@
   }
 
   /** Slides the toolbar up and off the screen. */
-  public void slideUp(boolean animate) {
-    Assert.checkArgument(!isSlideUp);
-    if (getHeight() == 0) {
-      ViewUtil.doOnGlobalLayout(this, view -> slideUp(animate));
+  public void slideUp(boolean animate, View container) {
+    if (hasGlobalLayoutListener) {
+      // Return early since we've already scheduled the toolbar to slide up
       return;
     }
-    isSlideUp = true;
-    ValueAnimator animator = ValueAnimator.ofFloat(0, -getHeight());
-    animator.setDuration(animate ? SLIDE_DURATION : 0);
-    animator.setInterpolator(SLIDE_INTERPOLATOR);
-    animator.addUpdateListener(
-        new AnimatorUpdateListener() {
-          @Override
-          public void onAnimationUpdate(ValueAnimator animation) {
-            int val = ((Float) animation.getAnimatedValue()).intValue();
-            RelativeLayout.LayoutParams params = (RelativeLayout.LayoutParams) getLayoutParams();
-            params.topMargin = val;
-            requestLayout();
-          }
-        });
-    animator.start();
+
+    if (getHeight() == 0) {
+      hasGlobalLayoutListener = true;
+      ViewUtil.doOnGlobalLayout(
+          this,
+          view -> {
+            hasGlobalLayoutListener = false;
+            slideUp(animate, container);
+          });
+      return;
+    }
+
+    if (isSlideUp()) {
+      LogUtil.e("MainToolbar.slideDown", "Already slide up.");
+      return;
+    }
+
+    animate()
+        .translationY(-getHeight())
+        .setDuration(animate ? SLIDE_DURATION : 0)
+        .setInterpolator(SLIDE_INTERPOLATOR)
+        .start();
+    container
+        .animate()
+        .translationY(-getHeight())
+        .setDuration(animate ? SLIDE_DURATION : 0)
+        .setInterpolator(SLIDE_INTERPOLATOR)
+        .start();
   }
 
   /** Slides the toolbar down and back onto the screen. */
-  public void slideDown(boolean animate) {
-    Assert.checkArgument(isSlideUp);
-    isSlideUp = false;
-    ValueAnimator animator = ValueAnimator.ofFloat(-getHeight(), 0);
-    animator.setDuration(animate ? SLIDE_DURATION : 0);
-    animator.setInterpolator(SLIDE_INTERPOLATOR);
-    animator.addUpdateListener(
-        new AnimatorUpdateListener() {
-          @Override
-          public void onAnimationUpdate(ValueAnimator animation) {
-            int val = ((Float) animation.getAnimatedValue()).intValue();
-            RelativeLayout.LayoutParams params = (RelativeLayout.LayoutParams) getLayoutParams();
-            params.topMargin = val;
-            requestLayout();
-          }
-        });
-    animator.start();
+  public void slideDown(boolean animate, View container) {
+    if (getTranslationY() == 0) {
+      LogUtil.e("MainToolbar.slideDown", "Already slide down.");
+      return;
+    }
+    animate()
+        .translationY(0)
+        .setDuration(animate ? SLIDE_DURATION : 0)
+        .setInterpolator(SLIDE_INTERPOLATOR)
+        .start();
+    container
+        .animate()
+        .translationY(0)
+        .setDuration(animate ? SLIDE_DURATION : 0)
+        .setInterpolator(SLIDE_INTERPOLATOR)
+        .start();
   }
 
   /** @see SearchBarView#collapse(boolean) */
@@ -121,13 +131,13 @@
     searchBar.collapse(animate);
   }
 
-  /** @see SearchBarView#collapse(boolean) */
-  public void expand(boolean animate, Optional<String> text) {
-    searchBar.expand(animate, text);
+  /** @see SearchBarView#expand(boolean, Optional, boolean) */
+  public void expand(boolean animate, Optional<String> text, boolean requestFocus) {
+    searchBar.expand(animate, text, requestFocus);
   }
 
   public boolean isSlideUp() {
-    return isSlideUp;
+    return getHeight() != 0 && getTranslationY() == -getHeight();
   }
 
   public boolean isExpanded() {
diff --git a/java/com/android/dialer/main/impl/toolbar/SearchBarListener.java b/java/com/android/dialer/main/impl/toolbar/SearchBarListener.java
index 857c4b9..d01fe3a 100644
--- a/java/com/android/dialer/main/impl/toolbar/SearchBarListener.java
+++ b/java/com/android/dialer/main/impl/toolbar/SearchBarListener.java
@@ -16,6 +16,7 @@
 
 package com.android.dialer.main.impl.toolbar;
 
+import android.app.Activity;
 import android.support.v7.app.AppCompatActivity;
 import android.view.MenuItem;
 
@@ -37,12 +38,18 @@
   /** Called when a toolbar menu item is clicked. */
   boolean onMenuItemClicked(MenuItem menuItem);
 
+  /** Called when {@link Activity#onPause()} is called. */
+  void onActivityPause();
+
   /** Called when {@link AppCompatActivity#onUserLeaveHint()} is called. */
   void onUserLeaveHint();
 
   /** Called when the user places a call from search (regular or dialpad). */
   void onCallPlacedFromSearch();
 
+  /** Called when a permission is about to be requested. */
+  void requestingPermission();
+
   /** Interface for returning voice results to the search bar. */
   interface VoiceSearchResultCallback {
 
diff --git a/java/com/android/dialer/main/impl/toolbar/SearchBarView.java b/java/com/android/dialer/main/impl/toolbar/SearchBarView.java
index 2999850..60b0673 100644
--- a/java/com/android/dialer/main/impl/toolbar/SearchBarView.java
+++ b/java/com/android/dialer/main/impl/toolbar/SearchBarView.java
@@ -101,13 +101,17 @@
     listener.onVoiceButtonClicked(
         result -> {
           if (!TextUtils.isEmpty(result)) {
-            expand(true, Optional.of(result));
+            expand(/* animate */ true, Optional.of(result), /* requestFocus */ true);
           }
         });
   }
 
-  /** Expand the search bar and populate it with text if any exists. */
-  /* package-private */ void expand(boolean animate, Optional<String> text) {
+  /**
+   * Expand the search bar and populate it with text if any exists.
+   *
+   * @param requestFocus should be false if showing the dialpad
+   */
+  /* package-private */ void expand(boolean animate, Optional<String> text, boolean requestFocus) {
     if (isExpanded) {
       return;
     }
@@ -133,7 +137,11 @@
             if (text.isPresent()) {
               searchBox.setText(text.get());
             }
-            searchBox.requestFocus();
+            // Don't request focus unless we're actually showing the search box, otherwise
+            // physical/bluetooth keyboards will type into this box when the dialpad is open.
+            if (requestFocus) {
+              searchBox.requestFocus();
+            }
             setBackgroundResource(R.drawable.search_bar_background);
           }
         });
@@ -186,7 +194,6 @@
     params.rightMargin = margin;
     searchBoxExpanded.getLayoutParams().height =
         (int) (animationEndHeight - (animationEndHeight - animationStartHeight) * fraction);
-    requestLayout();
   }
 
   /* package-private */ void setSearchBarListener(@NonNull SearchBarListener listener) {
@@ -212,7 +219,7 @@
   }
 
   public void showKeyboard() {
-    UiUtil.openKeyboardFrom(getContext(), searchBox);
+    UiUtil.forceOpenKeyboardFrom(getContext(), searchBox);
   }
 
   public void setHint(@StringRes int hint) {
diff --git a/java/com/android/dialer/main/impl/toolbar/res/drawable/custom_cursor.xml b/java/com/android/dialer/main/impl/toolbar/res/drawable/custom_cursor.xml
index 008b0a3..f352901 100644
--- a/java/com/android/dialer/main/impl/toolbar/res/drawable/custom_cursor.xml
+++ b/java/com/android/dialer/main/impl/toolbar/res/drawable/custom_cursor.xml
@@ -16,5 +16,5 @@
   -->
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
   <size android:width="2dp"/>
-  <solid android:color="@color/dialtacts_theme_color"/>
+  <solid android:color="?android:attr/colorPrimary"/>
 </shape>
\ No newline at end of file
diff --git a/java/com/android/dialer/main/impl/toolbar/res/drawable/search_bar_background.xml b/java/com/android/dialer/main/impl/toolbar/res/drawable/search_bar_background.xml
index 8767057..b797bd1 100644
--- a/java/com/android/dialer/main/impl/toolbar/res/drawable/search_bar_background.xml
+++ b/java/com/android/dialer/main/impl/toolbar/res/drawable/search_bar_background.xml
@@ -16,5 +16,5 @@
   -->
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
   android:shape="rectangle">
-  <solid android:color="@color/background_dialer_white"/>
+  <solid android:color="?android:attr/colorBackgroundFloating"/>
 </shape>
diff --git a/java/com/android/dialer/main/impl/toolbar/res/drawable/search_bar_background_rounded_corners.xml b/java/com/android/dialer/main/impl/toolbar/res/drawable/search_bar_background_rounded_corners.xml
index 58cdabe..88f5a04 100644
--- a/java/com/android/dialer/main/impl/toolbar/res/drawable/search_bar_background_rounded_corners.xml
+++ b/java/com/android/dialer/main/impl/toolbar/res/drawable/search_bar_background_rounded_corners.xml
@@ -16,6 +16,6 @@
   -->
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
   android:shape="rectangle">
-  <solid android:color="@color/background_dialer_white"/>
+  <solid android:color="?android:attr/colorBackgroundFloating"/>
   <corners android:radius="2dp"/>
 </shape>
diff --git a/java/com/android/dialer/main/impl/toolbar/res/layout/expanded_search_bar.xml b/java/com/android/dialer/main/impl/toolbar/res/layout/expanded_search_bar.xml
index 3bd71b6..e5b72f2 100644
--- a/java/com/android/dialer/main/impl/toolbar/res/layout/expanded_search_bar.xml
+++ b/java/com/android/dialer/main/impl/toolbar/res/layout/expanded_search_bar.xml
@@ -29,7 +29,7 @@
       android:background="?attr/selectableItemBackgroundBorderless"
       android:contentDescription="@string/action_menu_back_from_search"
       android:src="@drawable/quantum_ic_arrow_back_vd_theme_24"
-      android:tint="@color/dialer_theme_color"/>
+      android:tint="?android:attr/colorPrimary"/>
 
   <EditText
       android:id="@+id/search_view"
@@ -45,8 +45,8 @@
       android:inputType="textFilter"
       android:maxLines="1"
       android:hint="@string/dialer_hint_find_contact"
-      android:textColor="@color/dialer_secondary_text_color"
-      android:textColorHint="@color/dialer_edit_text_hint_color"
+      android:textColor="?android:attr/textColorSecondary"
+      android:textColorHint="?android:attr/textColorHint"
       android:textCursorDrawable="@drawable/custom_cursor"
       android:textSize="16sp"/>
 
@@ -60,6 +60,6 @@
       android:background="?attr/selectableItemBackgroundBorderless"
       android:contentDescription="@string/description_clear_search"
       android:src="@drawable/quantum_ic_close_vd_theme_24"
-      android:tint="@color/dialer_secondary_text_color"
+      android:tint="?colorIcon"
       android:visibility="gone"/>
 </RelativeLayout>
\ No newline at end of file
diff --git a/java/com/android/dialer/main/impl/toolbar/res/layout/toolbar_layout.xml b/java/com/android/dialer/main/impl/toolbar/res/layout/toolbar_layout.xml
index 3ab20c1..049cf2e 100644
--- a/java/com/android/dialer/main/impl/toolbar/res/layout/toolbar_layout.xml
+++ b/java/com/android/dialer/main/impl/toolbar/res/layout/toolbar_layout.xml
@@ -18,115 +18,119 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="@dimen/expanded_search_bar_height"
-    android:background="@color/dialer_theme_color"
-    app:contentInsetStart="0dp"
-    app:contentInsetEnd="0dp">
-
-  <com.android.dialer.main.impl.toolbar.SearchBarView
-      android:id="@+id/search_view_container"
+    android:background="?android:attr/colorPrimary"
+    app:contentInsetEnd="0dp"
+    app:contentInsetStart="0dp">
+  <FrameLayout
       android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:layout_margin="@dimen/search_bar_margin"
-      android:minHeight="@dimen/collapsed_search_bar_height"
-      android:background="@drawable/search_bar_background_rounded_corners"
-      android:elevation="4dp">
+      android:layout_height="match_parent">
+    <com.android.dialer.main.impl.toolbar.SearchBarView
+        android:id="@+id/search_view_container"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="@dimen/search_bar_margin"
+        android:background="@drawable/search_bar_background_rounded_corners"
+        android:elevation="4dp"
+        android:minHeight="@dimen/collapsed_search_bar_height">
 
-    <RelativeLayout
-      android:id="@+id/search_box_collapsed"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:layout_gravity="center_vertical"
-      android:background="?android:selectableItemBackground"
-      android:gravity="center_vertical">
-
-      <ImageView
-          android:id="@+id/search_magnifying_glass"
-          android:layout_width="48dp"
-          android:layout_height="48dp"
-          android:layout_marginStart="8dp"
-          android:layout_centerVertical="true"
-          android:importantForAccessibility="no"
-          android:scaleType="center"
-          android:src="@drawable/quantum_ic_search_vd_theme_24"
-          android:tint="@color/dialer_secondary_text_color"/>
-
-      <TextView
-          android:id="@+id/search_box_start_search"
-          android:layout_width="wrap_content"
+      <RelativeLayout
+          android:id="@+id/search_box_collapsed"
+          android:layout_width="match_parent"
           android:layout_height="wrap_content"
-          android:layout_toEndOf="@+id/search_magnifying_glass"
-          android:layout_toStartOf="@+id/voice_search_button"
-          android:layout_marginStart="8dp"
-          android:layout_centerVertical="true"
-          android:fontFamily="sans-serif"
-          android:text="@string/dialer_hint_find_contact"
-          android:textColor="@color/dialer_secondary_text_color"
-          android:textSize="16dp"/>
+          android:layout_gravity="center_vertical"
+          android:background="?android:attr/selectableItemBackground"
+          android:gravity="center_vertical">
 
-      <ImageView
-          android:id="@+id/voice_search_button"
-          android:layout_width="48dp"
-          android:layout_height="48dp"
-          android:layout_toStartOf="@+id/main_options_menu_button"
-          android:background="?android:attr/selectableItemBackgroundBorderless"
-          android:contentDescription="@string/description_start_voice_search"
-          android:scaleType="center"
-          android:src="@drawable/quantum_ic_mic_vd_theme_24"
-          android:tint="@color/dialer_secondary_text_color"/>
+        <ImageView
+            android:id="@+id/search_magnifying_glass"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
+            android:layout_marginStart="8dp"
+            android:layout_centerVertical="true"
+            android:importantForAccessibility="no"
+            android:scaleType="center"
+            android:src="@drawable/quantum_ic_search_vd_theme_24"
+            android:tint="?colorIcon"/>
 
-      <ImageButton
-          android:id="@+id/main_options_menu_button"
-          android:layout_width="48dp"
-          android:layout_height="48dp"
-          android:layout_alignParentEnd="true"
-          android:background="?android:attr/selectableItemBackgroundBorderless"
-          android:contentDescription="@string/action_menu_overflow_description"
-          android:scaleType="center"
-          android:src="@drawable/quantum_ic_more_vert_vd_theme_24"
-          android:tint="@color/dialer_secondary_text_color"/>
-    </RelativeLayout>
+        <TextView
+            android:id="@+id/search_box_start_search"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="8dp"
+            android:layout_centerVertical="true"
+            android:layout_toEndOf="@+id/search_magnifying_glass"
+            android:layout_toStartOf="@+id/voice_search_button"
+            android:text="@string/dialer_hint_find_contact"
+            android:textSize="16dp"
+            style="@style/Dialer.TextAppearance.Secondary"/>
 
-    <include layout="@layout/expanded_search_bar"/>
-  </com.android.dialer.main.impl.toolbar.SearchBarView>
+        <ImageView
+            android:id="@+id/voice_search_button"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
+            android:layout_toStartOf="@+id/main_options_menu_button"
+            android:background="?android:attr/selectableItemBackgroundBorderless"
+            android:contentDescription="@string/description_start_voice_search"
+            android:scaleType="center"
+            android:src="@drawable/quantum_ic_mic_vd_theme_24"
+            android:tint="?colorIcon"/>
 
-  <!-- Sets android:importantForAccessibility="no" to avoid being announced when navigating with
-       talkback enabled. It will still be announced when user drag or drop contact onto it.
-       This is required since drag and drop event is only sent to views are visible when drag
-       starts. -->
-  <com.android.dialer.app.list.RemoveView
-      android:id="@+id/remove_view"
-      android:layout_width="match_parent"
-      android:layout_height="match_parent"
-      android:layout_gravity="center_vertical"
-      android:layout_margin="@dimen/search_bar_margin"
-      android:contentDescription="@string/main_remove_contact"
-      android:visibility="gone"
-      android:importantForAccessibility="no">
+        <ImageButton
+            android:id="@+id/main_options_menu_button"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
+            android:layout_alignParentEnd="true"
+            android:background="?android:attr/selectableItemBackgroundBorderless"
+            android:contentDescription="@string/action_menu_overflow_description"
+            android:scaleType="center"
+            android:src="@drawable/quantum_ic_more_vert_vd_theme_24"
+            android:tint="?colorIcon"/>
+      </RelativeLayout>
 
-    <LinearLayout
-        android:id="@+id/remove_view_content"
+      <include layout="@layout/expanded_search_bar"/>
+    </com.android.dialer.main.impl.toolbar.SearchBarView>
+
+    <!-- Sets android:importantForAccessibility="no" to avoid being announced when navigating with
+         talkback enabled. It will still be announced when user drag or drop contact onto it.
+         This is required since drag and drop event is only sent to views are visible when drag
+         starts. -->
+    <com.android.dialer.app.list.RemoveView
+        android:id="@+id/remove_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/dialer_theme_color"
-        android:gravity="center"
-        android:orientation="horizontal">
+        android:layout_margin="@dimen/search_bar_margin"
+        android:layout_gravity="center_vertical"
+        android:contentDescription="@string/main_remove_contact"
+        android:importantForAccessibility="no">
 
-      <ImageView
-          android:id="@+id/remove_view_icon"
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content"
-          android:layout_marginTop="8dp"
-          android:layout_marginBottom="8dp"
-          android:src="@drawable/quantum_ic_close_vd_theme_24"
-          android:tint="@color/dialer_primary_text_color_white"/>
+      <!-- We set this view's visibility to gone instead of the parent because if we hide remove
+      view, it won't receive drag and accessibility events. -->
+      <LinearLayout
+          android:id="@+id/remove_view_content"
+          android:layout_width="match_parent"
+          android:layout_height="match_parent"
+          android:background="?android:attr/colorPrimary"
+          android:gravity="center"
+          android:orientation="horizontal"
+          android:visibility="gone">
 
-      <TextView
-          android:id="@+id/remove_view_text"
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content"
-          android:text="@string/main_remove_contact"
-          android:textColor="@color/dialer_primary_text_color_white"
-          android:textSize="16sp"/>
-    </LinearLayout>
-  </com.android.dialer.app.list.RemoveView>
+        <ImageView
+            android:id="@+id/remove_view_icon"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:layout_marginBottom="8dp"
+            android:src="@drawable/quantum_ic_close_vd_theme_24"
+            android:tint="?colorIconOnUnthemedDarkBackground"/>
+
+        <TextView
+            android:id="@+id/remove_view_text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/main_remove_contact"
+            android:textColor="?colorTextOnUnthemedDarkBackground"
+            android:textSize="16sp"/>
+      </LinearLayout>
+    </com.android.dialer.app.list.RemoveView>
+  </FrameLayout>
 </com.android.dialer.main.impl.toolbar.MainToolbar>
diff --git a/java/com/android/dialer/metrics/Metrics.java b/java/com/android/dialer/metrics/Metrics.java
index 5572658..a8c68c8 100644
--- a/java/com/android/dialer/metrics/Metrics.java
+++ b/java/com/android/dialer/metrics/Metrics.java
@@ -66,7 +66,8 @@
   String GET_MOST_RECENT_INFO_TEMPLATE = "%s.GetMostRecentInfo";
   String ON_SUCCESSFUL_FILL_TEMPLATE = "%s.OnSuccessfulFill";
   String ON_SUCCESSFUL_BULK_UPDATE_TEMPLATE = "%s.OnSuccessfulBulkUpdate";
-  String LOOKUP_TEMPLATE = "%s.Lookup";
+  String LOOKUP_FOR_CALL_TEMPLATE = "%s.LookupForCall";
+  String LOOKUP_FOR_NUMBER_TEMPLATE = "%s.LookupForNumber";
 
   /** Start a timer. */
   void startTimer(String timerEventName);
@@ -100,6 +101,9 @@
   /** Record memory. */
   void recordMemory(String memoryEventName);
 
+  /** Record battery. */
+  void recordBattery(String batteryEventName);
+
   /** Initiazer for metrics. */
   interface Initializer {
     /** Initialize metrics for the application . */
diff --git a/java/com/android/dialer/metrics/MetricsComponent.java b/java/com/android/dialer/metrics/MetricsComponent.java
index a3570db..c0d957b 100644
--- a/java/com/android/dialer/metrics/MetricsComponent.java
+++ b/java/com/android/dialer/metrics/MetricsComponent.java
@@ -18,6 +18,7 @@
 
 import android.content.Context;
 import com.android.dialer.inject.HasRootComponent;
+import com.android.dialer.inject.IncludeInDialerRoot;
 import dagger.Subcomponent;
 
 /** Component for metrics. */
@@ -37,6 +38,7 @@
   }
 
   /** Used to refer to the root application component. */
+  @IncludeInDialerRoot
   public interface HasComponent {
     MetricsComponent metricsComponent();
   }
diff --git a/java/com/android/dialer/metrics/StubMetrics.java b/java/com/android/dialer/metrics/StubMetrics.java
index ecd2382..be1cf60 100644
--- a/java/com/android/dialer/metrics/StubMetrics.java
+++ b/java/com/android/dialer/metrics/StubMetrics.java
@@ -96,6 +96,11 @@
     LogUtil.d("StubMetrics.startJankRecorder", "recorded memory for %s", memoryEventName);
   }
 
+  @Override
+  public void recordBattery(String batteryEventName) {
+    LogUtil.d("StubMetrics.recordBattery", "recorded battery for %s", batteryEventName);
+  }
+
   private static class StubTimerEvent {
     final long startTime;
 
diff --git a/java/com/android/dialer/metrics/StubMetricsModule.java b/java/com/android/dialer/metrics/StubMetricsModule.java
index a2d9ebf..46b2b4d 100644
--- a/java/com/android/dialer/metrics/StubMetricsModule.java
+++ b/java/com/android/dialer/metrics/StubMetricsModule.java
@@ -16,10 +16,13 @@
 
 package com.android.dialer.metrics;
 
+import com.android.dialer.inject.DialerVariant;
+import com.android.dialer.inject.InstallIn;
 import dagger.Binds;
 import dagger.Module;
 
 /** Binds stub {@link Metrics}. */
+@InstallIn(variants = {DialerVariant.DIALER_TEST})
 @Module
 public interface StubMetricsModule {
 
diff --git a/java/com/android/dialer/notification/DialerNotificationManager.java b/java/com/android/dialer/notification/DialerNotificationManager.java
index 0e34201..eb730be 100644
--- a/java/com/android/dialer/notification/DialerNotificationManager.java
+++ b/java/com/android/dialer/notification/DialerNotificationManager.java
@@ -27,12 +27,17 @@
 import android.util.Pair;
 import com.android.dialer.common.Assert;
 import com.android.dialer.common.LogUtil;
+import java.util.HashSet;
+import java.util.Set;
 
 /**
  * Wrapper around the notification manager APIs. The wrapper ensures that channels are set and that
  * notifications are limited to 10 per group.
  */
 public final class DialerNotificationManager {
+
+  private static final Set<StatusBarNotification> throttledNotificationSet = new HashSet<>();
+
   public static void notify(@NonNull Context context, int id, @NonNull Notification notification) {
     Assert.isNotNull(context);
     Assert.isNotNull(notification);
@@ -50,7 +55,7 @@
     }
 
     getNotificationManager(context).notify(tag, id, notification);
-    NotificationThrottler.throttle(context, notification);
+    throttledNotificationSet.addAll(NotificationThrottler.throttle(context, notification));
   }
 
   public static void cancel(@NonNull Context context, int id) {
@@ -83,6 +88,16 @@
     notificationManager.cancel(tag, id);
   }
 
+  public static void cancelAll(Context context, String prefix) {
+    NotificationManager notificationManager = getNotificationManager(context);
+    StatusBarNotification[] notifications = notificationManager.getActiveNotifications();
+    for (StatusBarNotification notification : notifications) {
+      if (notification.getTag() != null && notification.getTag().startsWith(prefix)) {
+        notificationManager.cancel(notification.getTag(), notification.getId());
+      }
+    }
+  }
+
   public static StatusBarNotification[] getActiveNotifications(@NonNull Context context) {
     Assert.isNotNull(context);
     return getNotificationManager(context).getActiveNotifications();
@@ -121,5 +136,9 @@
     return context.getSystemService(NotificationManager.class);
   }
 
+  public static Set<StatusBarNotification> getThrottledNotificationSet() {
+    return throttledNotificationSet;
+  }
+
   private DialerNotificationManager() {}
 }
diff --git a/java/com/android/dialer/notification/NotificationThrottler.java b/java/com/android/dialer/notification/NotificationThrottler.java
index 9db744d..1f60920 100644
--- a/java/com/android/dialer/notification/NotificationThrottler.java
+++ b/java/com/android/dialer/notification/NotificationThrottler.java
@@ -29,32 +29,43 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 /**
  * Utility to ensure that only a certain number of notifications are shown for a particular
  * notification type. Once the limit is reached, older notifications are cancelled.
  */
-/* package */ class NotificationThrottler {
+class NotificationThrottler {
   /**
    * For gropued bundled notifications, the system UI will only display the last 8. For grouped
    * unbundled notifications, the system displays all notifications until a global maximum of 50 is
    * reached.
    */
-  private static final int MAX_NOTIFICATIONS_PER_TAG = 10;
+  private static final int MAX_NOTIFICATIONS_PER_TAG = 8;
 
   private static final int HIGH_GLOBAL_NOTIFICATION_COUNT = 45;
 
   private static boolean didLogHighGlobalNotificationCountReached;
 
-  /* package */ static void throttle(@NonNull Context context, @NonNull Notification notification) {
+  /**
+   * For all the active notifications in the same group as the provided notification, cancel the
+   * earliest ones until the left ones is under limit.
+   *
+   * @param notification the provided notification to determine group
+   * @return a set of cancelled notification
+   */
+  static Set<StatusBarNotification> throttle(
+      @NonNull Context context, @NonNull Notification notification) {
     Assert.isNotNull(context);
     Assert.isNotNull(notification);
+    Set<StatusBarNotification> throttledNotificationSet = new HashSet<>();
 
     // No limiting for non-grouped notifications.
     String groupKey = notification.getGroup();
     if (TextUtils.isEmpty(groupKey)) {
-      return;
+      return throttledNotificationSet;
     }
 
     NotificationManager notificationManager = context.getSystemService(NotificationManager.class);
@@ -88,8 +99,10 @@
       List<StatusBarNotification> notifications = getSortedMatchingNotifications(context, groupKey);
       for (int i = 0; i < (count - MAX_NOTIFICATIONS_PER_TAG); i++) {
         notificationManager.cancel(notifications.get(i).getTag(), notifications.get(i).getId());
+        throttledNotificationSet.add(notifications.get(i));
       }
     }
+    return throttledNotificationSet;
   }
 
   private static List<StatusBarNotification> getSortedMatchingNotifications(
diff --git a/java/com/android/dialer/notification/VoicemailChannelUtils.java b/java/com/android/dialer/notification/VoicemailChannelUtils.java
index 7bc757a..83bda0f 100644
--- a/java/com/android/dialer/notification/VoicemailChannelUtils.java
+++ b/java/com/android/dialer/notification/VoicemailChannelUtils.java
@@ -212,6 +212,9 @@
       @NonNull Context context, @NonNull PhoneAccountHandle handle) {
     PhoneAccount phoneAccount =
         context.getSystemService(TelecomManager.class).getPhoneAccount(handle);
+    if (phoneAccount == null) {
+      return;
+    }
     NotificationChannel channel =
         newChannel(context, getChannelIdForAccount(handle), phoneAccount.getLabel());
     migrateVoicemailSoundSettings(context, channel, handle);
diff --git a/java/com/android/dialer/notification/res/values-af/strings.xml b/java/com/android/dialer/notification/res/values-af/strings.xml
index e48249b..1509eee 100644
--- a/java/com/android/dialer/notification/res/values-af/strings.xml
+++ b/java/com/android/dialer/notification/res/values-af/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_channel_incoming_call" msgid="2478740764736158630">"Inkomende oproepe"</string>
-    <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Deurlopende oproepe"</string>
-    <string name="notification_channel_missed_call" msgid="5820652855908217695">"Gemiste oproepe"</string>
-    <string name="notification_channel_voicemail" msgid="9206363659849426204">"Stemboodskappe"</string>
-    <string name="notification_channel_misc" msgid="5595452227577858518">"Verstek"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="notification_channel_incoming_call">Inkomende oproepe</string>
+  <string name="notification_channel_ongoing_call">Deurlopende oproepe</string>
+  <string name="notification_channel_missed_call">Gemiste oproepe</string>
+  <string name="notification_channel_voicemail">Stemboodskappe</string>
+  <string name="notification_channel_misc">Verstek</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-am/strings.xml b/java/com/android/dialer/notification/res/values-am/strings.xml
index 0983e05..3d94cb3 100644
--- a/java/com/android/dialer/notification/res/values-am/strings.xml
+++ b/java/com/android/dialer/notification/res/values-am/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_channel_incoming_call" msgid="2478740764736158630">"ገቢ ጥሪዎች"</string>
-    <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"በመካሄድ ላይ ያሉ ጥሪዎች"</string>
-    <string name="notification_channel_missed_call" msgid="5820652855908217695">"ያመለጡ ጥሪዎች"</string>
-    <string name="notification_channel_voicemail" msgid="9206363659849426204">"የድምፅ መልዕክቶች"</string>
-    <string name="notification_channel_misc" msgid="5595452227577858518">"ነባሪ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="notification_channel_incoming_call">ገቢ ጥሪዎች</string>
+  <string name="notification_channel_ongoing_call">በመካሄድ ላይ ያሉ ጥሪዎች</string>
+  <string name="notification_channel_missed_call">ያመለጡ ጥሪዎች</string>
+  <string name="notification_channel_voicemail">የድምፅ መልዕክቶች</string>
+  <string name="notification_channel_misc">ነባሪ</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-ar/strings.xml b/java/com/android/dialer/notification/res/values-ar/strings.xml
index ab6059f..5285a28 100644
--- a/java/com/android/dialer/notification/res/values-ar/strings.xml
+++ b/java/com/android/dialer/notification/res/values-ar/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_channel_incoming_call" msgid="2478740764736158630">"المكالمات الواردة"</string>
-    <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"المكالمات الجارية"</string>
-    <string name="notification_channel_missed_call" msgid="5820652855908217695">"المكالمات الفائتة"</string>
-    <string name="notification_channel_voicemail" msgid="9206363659849426204">"رسائل البريد الصوتي"</string>
-    <string name="notification_channel_misc" msgid="5595452227577858518">"افتراضي"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="notification_channel_incoming_call">المكالمات الواردة</string>
+  <string name="notification_channel_ongoing_call">المكالمات الجارية</string>
+  <string name="notification_channel_missed_call">المكالمات الفائتة</string>
+  <string name="notification_channel_voicemail">رسائل البريد الصوتي</string>
+  <string name="notification_channel_misc">تلقائي</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-az/strings.xml b/java/com/android/dialer/notification/res/values-az/strings.xml
index 425f30a..8e68c1c 100644
--- a/java/com/android/dialer/notification/res/values-az/strings.xml
+++ b/java/com/android/dialer/notification/res/values-az/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_channel_incoming_call" msgid="2478740764736158630">"Gələn zənglər"</string>
-    <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Gedən zənglər"</string>
-    <string name="notification_channel_missed_call" msgid="5820652855908217695">"Buraxılmış zənglər"</string>
-    <string name="notification_channel_voicemail" msgid="9206363659849426204">"Səsli məktublar"</string>
-    <string name="notification_channel_misc" msgid="5595452227577858518">"Defolt"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="notification_channel_incoming_call">Gələn zənglər</string>
+  <string name="notification_channel_ongoing_call">Gedən zənglər</string>
+  <string name="notification_channel_missed_call">Buraxılmış zənglər</string>
+  <string name="notification_channel_voicemail">Səsli məktublar</string>
+  <string name="notification_channel_misc">Defolt</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-b+sr+Latn/strings.xml b/java/com/android/dialer/notification/res/values-b+sr+Latn/strings.xml
index 4598e76..b4a5e56 100644
--- a/java/com/android/dialer/notification/res/values-b+sr+Latn/strings.xml
+++ b/java/com/android/dialer/notification/res/values-b+sr+Latn/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_channel_incoming_call" msgid="2478740764736158630">"Dolazni pozivi"</string>
-    <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Pozivi u toku"</string>
-    <string name="notification_channel_missed_call" msgid="5820652855908217695">"Propušteni pozivi"</string>
-    <string name="notification_channel_voicemail" msgid="9206363659849426204">"Govorne poruke"</string>
-    <string name="notification_channel_misc" msgid="5595452227577858518">"Podrazumevano"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="notification_channel_incoming_call">Dolazni pozivi</string>
+  <string name="notification_channel_ongoing_call">Pozivi u toku</string>
+  <string name="notification_channel_missed_call">Propušteni pozivi</string>
+  <string name="notification_channel_voicemail">Govorne poruke</string>
+  <string name="notification_channel_misc">Podrazumevano</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-be/strings.xml b/java/com/android/dialer/notification/res/values-be/strings.xml
index 586a36c..edca3c1 100644
--- a/java/com/android/dialer/notification/res/values-be/strings.xml
+++ b/java/com/android/dialer/notification/res/values-be/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_channel_incoming_call" msgid="2478740764736158630">"Уваходныя выклікі"</string>
-    <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Адбываючыяся выклікі"</string>
-    <string name="notification_channel_missed_call" msgid="5820652855908217695">"Прапушчаныя выклікі"</string>
-    <string name="notification_channel_voicemail" msgid="9206363659849426204">"Галасавая пошта"</string>
-    <string name="notification_channel_misc" msgid="5595452227577858518">"Стандартны"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="notification_channel_incoming_call">Уваходныя выклікі</string>
+  <string name="notification_channel_ongoing_call">Адбываючыяся выклікі</string>
+  <string name="notification_channel_missed_call">Прапушчаныя выклікі</string>
+  <string name="notification_channel_voicemail">Галасавая пошта</string>
+  <string name="notification_channel_misc">Стандартны</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-bg/strings.xml b/java/com/android/dialer/notification/res/values-bg/strings.xml
index 9bc8f8f..83098c5 100644
--- a/java/com/android/dialer/notification/res/values-bg/strings.xml
+++ b/java/com/android/dialer/notification/res/values-bg/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_channel_incoming_call" msgid="2478740764736158630">"Входящи обаждания"</string>
-    <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Текущи обаждания"</string>
-    <string name="notification_channel_missed_call" msgid="5820652855908217695">"Пропуснати обаждания"</string>
-    <string name="notification_channel_voicemail" msgid="9206363659849426204">"Гласови съобщения"</string>
-    <string name="notification_channel_misc" msgid="5595452227577858518">"По подразбиране"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="notification_channel_incoming_call">Входящи обаждания</string>
+  <string name="notification_channel_ongoing_call">Текущи обаждания</string>
+  <string name="notification_channel_missed_call">Пропуснати обаждания</string>
+  <string name="notification_channel_voicemail">Гласови съобщения</string>
+  <string name="notification_channel_misc">По подразбиране</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-bn/strings.xml b/java/com/android/dialer/notification/res/values-bn/strings.xml
index 1d77817..01a3c50 100644
--- a/java/com/android/dialer/notification/res/values-bn/strings.xml
+++ b/java/com/android/dialer/notification/res/values-bn/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_channel_incoming_call" msgid="2478740764736158630">"ইনকামিং কল"</string>
-    <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"সংযুক্ত কল"</string>
-    <string name="notification_channel_missed_call" msgid="5820652855908217695">"মিস করা কল"</string>
-    <string name="notification_channel_voicemail" msgid="9206363659849426204">"ভয়েসমেল"</string>
-    <string name="notification_channel_misc" msgid="5595452227577858518">"ডিফল্ট"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="notification_channel_incoming_call">ইনকামিং কল</string>
+  <string name="notification_channel_ongoing_call">সংযুক্ত কল</string>
+  <string name="notification_channel_missed_call">মিস করা কল</string>
+  <string name="notification_channel_voicemail">ভয়েসমেল</string>
+  <string name="notification_channel_misc">ডিফল্ট</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-bs/strings.xml b/java/com/android/dialer/notification/res/values-bs/strings.xml
index dedbb1c..0960ca2 100644
--- a/java/com/android/dialer/notification/res/values-bs/strings.xml
+++ b/java/com/android/dialer/notification/res/values-bs/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_channel_incoming_call" msgid="2478740764736158630">"Dolazni pozivi"</string>
-    <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Tekući pozivi"</string>
-    <string name="notification_channel_missed_call" msgid="5820652855908217695">"Propušteni pozivi"</string>
-    <string name="notification_channel_voicemail" msgid="9206363659849426204">"Poruke govorne pošte"</string>
-    <string name="notification_channel_misc" msgid="5595452227577858518">"Zadano"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="notification_channel_incoming_call">Dolazni pozivi</string>
+  <string name="notification_channel_ongoing_call">Tekući pozivi</string>
+  <string name="notification_channel_missed_call">Propušteni pozivi</string>
+  <string name="notification_channel_voicemail">Poruke govorne pošte</string>
+  <string name="notification_channel_misc">Zadano</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-ca/strings.xml b/java/com/android/dialer/notification/res/values-ca/strings.xml
index 1c19d0f..c62eb5c 100644
--- a/java/com/android/dialer/notification/res/values-ca/strings.xml
+++ b/java/com/android/dialer/notification/res/values-ca/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_channel_incoming_call" msgid="2478740764736158630">"Trucades entrants"</string>
-    <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Trucades en curs"</string>
-    <string name="notification_channel_missed_call" msgid="5820652855908217695">"Trucades perdudes"</string>
-    <string name="notification_channel_voicemail" msgid="9206363659849426204">"Missatges de veu"</string>
-    <string name="notification_channel_misc" msgid="5595452227577858518">"Predeterminat"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="notification_channel_incoming_call">Trucades entrants</string>
+  <string name="notification_channel_ongoing_call">Trucades en curs</string>
+  <string name="notification_channel_missed_call">Trucades perdudes</string>
+  <string name="notification_channel_voicemail">Missatges de veu</string>
+  <string name="notification_channel_misc">Predeterminat</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-cs/strings.xml b/java/com/android/dialer/notification/res/values-cs/strings.xml
index c428ca2..f8b16bd 100644
--- a/java/com/android/dialer/notification/res/values-cs/strings.xml
+++ b/java/com/android/dialer/notification/res/values-cs/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_channel_incoming_call" msgid="2478740764736158630">"Příchozí hovory"</string>
-    <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Probíhající hovory"</string>
-    <string name="notification_channel_missed_call" msgid="5820652855908217695">"Zmeškané hovory"</string>
-    <string name="notification_channel_voicemail" msgid="9206363659849426204">"Hlasové zprávy"</string>
-    <string name="notification_channel_misc" msgid="5595452227577858518">"Výchozí"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="notification_channel_incoming_call">Příchozí hovory</string>
+  <string name="notification_channel_ongoing_call">Probíhající hovory</string>
+  <string name="notification_channel_missed_call">Zmeškané hovory</string>
+  <string name="notification_channel_voicemail">Hlasové zprávy</string>
+  <string name="notification_channel_misc">Výchozí</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-da/strings.xml b/java/com/android/dialer/notification/res/values-da/strings.xml
index 7f0ce9f..e9adca7 100644
--- a/java/com/android/dialer/notification/res/values-da/strings.xml
+++ b/java/com/android/dialer/notification/res/values-da/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_channel_incoming_call" msgid="2478740764736158630">"Indgående opkald"</string>
-    <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Igangværende opkald"</string>
-    <string name="notification_channel_missed_call" msgid="5820652855908217695">"Ubesvarede opkald"</string>
-    <string name="notification_channel_voicemail" msgid="9206363659849426204">"Talebeskeder"</string>
-    <string name="notification_channel_misc" msgid="5595452227577858518">"Standard"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="notification_channel_incoming_call">Indgående opkald</string>
+  <string name="notification_channel_ongoing_call">Igangværende opkald</string>
+  <string name="notification_channel_missed_call">Ubesvarede opkald</string>
+  <string name="notification_channel_voicemail">Talebeskeder</string>
+  <string name="notification_channel_misc">Standard</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-de/strings.xml b/java/com/android/dialer/notification/res/values-de/strings.xml
index 86b7520..4b2918c 100644
--- a/java/com/android/dialer/notification/res/values-de/strings.xml
+++ b/java/com/android/dialer/notification/res/values-de/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_channel_incoming_call" msgid="2478740764736158630">"Eingehende Anrufe"</string>
-    <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Laufende Anrufe"</string>
-    <string name="notification_channel_missed_call" msgid="5820652855908217695">"Entgangene Anrufe"</string>
-    <string name="notification_channel_voicemail" msgid="9206363659849426204">"Mailboxnachrichten"</string>
-    <string name="notification_channel_misc" msgid="5595452227577858518">"Standard"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="notification_channel_incoming_call">Eingehende Anrufe</string>
+  <string name="notification_channel_ongoing_call">Laufende Anrufe</string>
+  <string name="notification_channel_missed_call">Entgangene Anrufe</string>
+  <string name="notification_channel_voicemail">Mailboxnachrichten</string>
+  <string name="notification_channel_misc">Standard</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-el/strings.xml b/java/com/android/dialer/notification/res/values-el/strings.xml
index 812dc25..720a7e4 100644
--- a/java/com/android/dialer/notification/res/values-el/strings.xml
+++ b/java/com/android/dialer/notification/res/values-el/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_channel_incoming_call" msgid="2478740764736158630">"Εισερχόμενες κλήσεις"</string>
-    <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Κλήσεις σε εξέλιξη"</string>
-    <string name="notification_channel_missed_call" msgid="5820652855908217695">"Αναπάντητες κλήσεις"</string>
-    <string name="notification_channel_voicemail" msgid="9206363659849426204">"Μηνύματα αυτόματου τηλεφωνητή"</string>
-    <string name="notification_channel_misc" msgid="5595452227577858518">"Προεπιλογή"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="notification_channel_incoming_call">Εισερχόμενες κλήσεις</string>
+  <string name="notification_channel_ongoing_call">Κλήσεις σε εξέλιξη</string>
+  <string name="notification_channel_missed_call">Αναπάντητες κλήσεις</string>
+  <string name="notification_channel_voicemail">Μηνύματα αυτόματου τηλεφωνητή</string>
+  <string name="notification_channel_misc">Προεπιλογή</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-en-rAU/strings.xml b/java/com/android/dialer/notification/res/values-en-rAU/strings.xml
index 43b722b..c2c8ceb 100644
--- a/java/com/android/dialer/notification/res/values-en-rAU/strings.xml
+++ b/java/com/android/dialer/notification/res/values-en-rAU/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_channel_incoming_call" msgid="2478740764736158630">"Incoming calls"</string>
-    <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Ongoing calls"</string>
-    <string name="notification_channel_missed_call" msgid="5820652855908217695">"Missed calls"</string>
-    <string name="notification_channel_voicemail" msgid="9206363659849426204">"Voicemail"</string>
-    <string name="notification_channel_misc" msgid="5595452227577858518">"Default"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="notification_channel_incoming_call">Incoming calls</string>
+  <string name="notification_channel_ongoing_call">Ongoing calls</string>
+  <string name="notification_channel_missed_call">Missed calls</string>
+  <string name="notification_channel_voicemail">Voicemail</string>
+  <string name="notification_channel_misc">Default</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-en-rGB/strings.xml b/java/com/android/dialer/notification/res/values-en-rGB/strings.xml
index 43b722b..c2c8ceb 100644
--- a/java/com/android/dialer/notification/res/values-en-rGB/strings.xml
+++ b/java/com/android/dialer/notification/res/values-en-rGB/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_channel_incoming_call" msgid="2478740764736158630">"Incoming calls"</string>
-    <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Ongoing calls"</string>
-    <string name="notification_channel_missed_call" msgid="5820652855908217695">"Missed calls"</string>
-    <string name="notification_channel_voicemail" msgid="9206363659849426204">"Voicemail"</string>
-    <string name="notification_channel_misc" msgid="5595452227577858518">"Default"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="notification_channel_incoming_call">Incoming calls</string>
+  <string name="notification_channel_ongoing_call">Ongoing calls</string>
+  <string name="notification_channel_missed_call">Missed calls</string>
+  <string name="notification_channel_voicemail">Voicemail</string>
+  <string name="notification_channel_misc">Default</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-en-rIN/strings.xml b/java/com/android/dialer/notification/res/values-en-rIN/strings.xml
index 43b722b..c2c8ceb 100644
--- a/java/com/android/dialer/notification/res/values-en-rIN/strings.xml
+++ b/java/com/android/dialer/notification/res/values-en-rIN/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_channel_incoming_call" msgid="2478740764736158630">"Incoming calls"</string>
-    <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Ongoing calls"</string>
-    <string name="notification_channel_missed_call" msgid="5820652855908217695">"Missed calls"</string>
-    <string name="notification_channel_voicemail" msgid="9206363659849426204">"Voicemail"</string>
-    <string name="notification_channel_misc" msgid="5595452227577858518">"Default"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="notification_channel_incoming_call">Incoming calls</string>
+  <string name="notification_channel_ongoing_call">Ongoing calls</string>
+  <string name="notification_channel_missed_call">Missed calls</string>
+  <string name="notification_channel_voicemail">Voicemail</string>
+  <string name="notification_channel_misc">Default</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-es-rUS/strings.xml b/java/com/android/dialer/notification/res/values-es-rUS/strings.xml
index c56edcf..d4ec9d0 100644
--- a/java/com/android/dialer/notification/res/values-es-rUS/strings.xml
+++ b/java/com/android/dialer/notification/res/values-es-rUS/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_channel_incoming_call" msgid="2478740764736158630">"Llamadas entrantes"</string>
-    <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Llamadas en curso"</string>
-    <string name="notification_channel_missed_call" msgid="5820652855908217695">"Llamadas perdidas"</string>
-    <string name="notification_channel_voicemail" msgid="9206363659849426204">"Mensajes de voz"</string>
-    <string name="notification_channel_misc" msgid="5595452227577858518">"Predeterminado"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="notification_channel_incoming_call">Llamadas entrantes</string>
+  <string name="notification_channel_ongoing_call">Llamadas activas</string>
+  <string name="notification_channel_missed_call">Llamadas perdidas</string>
+  <string name="notification_channel_voicemail">Correos de voz</string>
+  <string name="notification_channel_misc">Predeterminada</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-es/strings.xml b/java/com/android/dialer/notification/res/values-es/strings.xml
index c56edcf..3da1a61 100644
--- a/java/com/android/dialer/notification/res/values-es/strings.xml
+++ b/java/com/android/dialer/notification/res/values-es/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_channel_incoming_call" msgid="2478740764736158630">"Llamadas entrantes"</string>
-    <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Llamadas en curso"</string>
-    <string name="notification_channel_missed_call" msgid="5820652855908217695">"Llamadas perdidas"</string>
-    <string name="notification_channel_voicemail" msgid="9206363659849426204">"Mensajes de voz"</string>
-    <string name="notification_channel_misc" msgid="5595452227577858518">"Predeterminado"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="notification_channel_incoming_call">Llamadas entrantes</string>
+  <string name="notification_channel_ongoing_call">Llamadas en curso</string>
+  <string name="notification_channel_missed_call">Llamadas perdidas</string>
+  <string name="notification_channel_voicemail">Mensajes de voz</string>
+  <string name="notification_channel_misc">Predeterminado</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-et/strings.xml b/java/com/android/dialer/notification/res/values-et/strings.xml
index 9c60a31..c0d4806 100644
--- a/java/com/android/dialer/notification/res/values-et/strings.xml
+++ b/java/com/android/dialer/notification/res/values-et/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_channel_incoming_call" msgid="2478740764736158630">"Sissetulevad kõned"</string>
-    <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Käimasolevad kõned"</string>
-    <string name="notification_channel_missed_call" msgid="5820652855908217695">"Vastamata kõned"</string>
-    <string name="notification_channel_voicemail" msgid="9206363659849426204">"Kõnepostisõnumid"</string>
-    <string name="notification_channel_misc" msgid="5595452227577858518">"Vaikeseade"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="notification_channel_incoming_call">Sissetulevad kõned</string>
+  <string name="notification_channel_ongoing_call">Käimasolevad kõned</string>
+  <string name="notification_channel_missed_call">Vastamata kõned</string>
+  <string name="notification_channel_voicemail">Kõnepostisõnumid</string>
+  <string name="notification_channel_misc">Vaikeseade</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-eu/strings.xml b/java/com/android/dialer/notification/res/values-eu/strings.xml
index d94ac0a..957c4b6 100644
--- a/java/com/android/dialer/notification/res/values-eu/strings.xml
+++ b/java/com/android/dialer/notification/res/values-eu/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_channel_incoming_call" msgid="2478740764736158630">"Jasotako deiak"</string>
-    <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Abian diren deiak"</string>
-    <string name="notification_channel_missed_call" msgid="5820652855908217695">"Dei galduak"</string>
-    <string name="notification_channel_voicemail" msgid="9206363659849426204">"Ahots-mezuak"</string>
-    <string name="notification_channel_misc" msgid="5595452227577858518">"Lehenetsia"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="notification_channel_incoming_call">Jasotako deiak</string>
+  <string name="notification_channel_ongoing_call">Abian diren deiak</string>
+  <string name="notification_channel_missed_call">Dei galduak</string>
+  <string name="notification_channel_voicemail">Ahots-mezuak</string>
+  <string name="notification_channel_misc">Lehenetsia</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-fa/strings.xml b/java/com/android/dialer/notification/res/values-fa/strings.xml
index edbc983..712f590 100644
--- a/java/com/android/dialer/notification/res/values-fa/strings.xml
+++ b/java/com/android/dialer/notification/res/values-fa/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_channel_incoming_call" msgid="2478740764736158630">"تماس‌های ورودی"</string>
-    <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"تماس‌های درحال انجام"</string>
-    <string name="notification_channel_missed_call" msgid="5820652855908217695">"تماس‌های بی‌پاسخ"</string>
-    <string name="notification_channel_voicemail" msgid="9206363659849426204">"پست‌های صوتی"</string>
-    <string name="notification_channel_misc" msgid="5595452227577858518">"پیش‌فرض"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="notification_channel_incoming_call">تماس‌های ورودی</string>
+  <string name="notification_channel_ongoing_call">تماس‌های درحال انجام</string>
+  <string name="notification_channel_missed_call">تماس‌های بی‌پاسخ</string>
+  <string name="notification_channel_voicemail">پست‌های صوتی</string>
+  <string name="notification_channel_misc">پیش‌فرض</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-fi/strings.xml b/java/com/android/dialer/notification/res/values-fi/strings.xml
index 87652f8..f2f5266 100644
--- a/java/com/android/dialer/notification/res/values-fi/strings.xml
+++ b/java/com/android/dialer/notification/res/values-fi/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_channel_incoming_call" msgid="2478740764736158630">"Saapuvat puhelut"</string>
-    <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Käynnissä olevat puhelut"</string>
-    <string name="notification_channel_missed_call" msgid="5820652855908217695">"Vastaamattomat puhelut"</string>
-    <string name="notification_channel_voicemail" msgid="9206363659849426204">"Vastaajaviestit"</string>
-    <string name="notification_channel_misc" msgid="5595452227577858518">"Oletus"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="notification_channel_incoming_call">Saapuvat puhelut</string>
+  <string name="notification_channel_ongoing_call">Käynnissä olevat puhelut</string>
+  <string name="notification_channel_missed_call">Vastaamattomat puhelut</string>
+  <string name="notification_channel_voicemail">Vastaajaviestit</string>
+  <string name="notification_channel_misc">Oletus</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-fr-rCA/strings.xml b/java/com/android/dialer/notification/res/values-fr-rCA/strings.xml
index 5a2d7dc..f1a92b8 100644
--- a/java/com/android/dialer/notification/res/values-fr-rCA/strings.xml
+++ b/java/com/android/dialer/notification/res/values-fr-rCA/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_channel_incoming_call" msgid="2478740764736158630">"Appels entrants"</string>
-    <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Appels en cours"</string>
-    <string name="notification_channel_missed_call" msgid="5820652855908217695">"Appels manqués"</string>
-    <string name="notification_channel_voicemail" msgid="9206363659849426204">"Messages vocaux"</string>
-    <string name="notification_channel_misc" msgid="5595452227577858518">"Par défaut"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="notification_channel_incoming_call">Appels entrants</string>
+  <string name="notification_channel_ongoing_call">Appels en cours</string>
+  <string name="notification_channel_missed_call">Appels manqués</string>
+  <string name="notification_channel_voicemail">Messages vocaux</string>
+  <string name="notification_channel_misc">Par défaut</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-fr/strings.xml b/java/com/android/dialer/notification/res/values-fr/strings.xml
index 5a2d7dc..f1a92b8 100644
--- a/java/com/android/dialer/notification/res/values-fr/strings.xml
+++ b/java/com/android/dialer/notification/res/values-fr/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_channel_incoming_call" msgid="2478740764736158630">"Appels entrants"</string>
-    <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Appels en cours"</string>
-    <string name="notification_channel_missed_call" msgid="5820652855908217695">"Appels manqués"</string>
-    <string name="notification_channel_voicemail" msgid="9206363659849426204">"Messages vocaux"</string>
-    <string name="notification_channel_misc" msgid="5595452227577858518">"Par défaut"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="notification_channel_incoming_call">Appels entrants</string>
+  <string name="notification_channel_ongoing_call">Appels en cours</string>
+  <string name="notification_channel_missed_call">Appels manqués</string>
+  <string name="notification_channel_voicemail">Messages vocaux</string>
+  <string name="notification_channel_misc">Par défaut</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-gl/strings.xml b/java/com/android/dialer/notification/res/values-gl/strings.xml
index 0e7fb61..2849a15 100644
--- a/java/com/android/dialer/notification/res/values-gl/strings.xml
+++ b/java/com/android/dialer/notification/res/values-gl/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_channel_incoming_call" msgid="2478740764736158630">"Chamadas entrantes"</string>
-    <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Chamadas saíntes"</string>
-    <string name="notification_channel_missed_call" msgid="5820652855908217695">"Chamadas perdidas"</string>
-    <string name="notification_channel_voicemail" msgid="9206363659849426204">"Correos de voz"</string>
-    <string name="notification_channel_misc" msgid="5595452227577858518">"Predeterminado"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="notification_channel_incoming_call">Chamadas entrantes</string>
+  <string name="notification_channel_ongoing_call">Chamadas saíntes</string>
+  <string name="notification_channel_missed_call">Chamadas perdidas</string>
+  <string name="notification_channel_voicemail">Correos de voz</string>
+  <string name="notification_channel_misc">Predeterminado</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-gu/strings.xml b/java/com/android/dialer/notification/res/values-gu/strings.xml
index a4a0a7a..6f7eed8 100644
--- a/java/com/android/dialer/notification/res/values-gu/strings.xml
+++ b/java/com/android/dialer/notification/res/values-gu/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_channel_incoming_call" msgid="2478740764736158630">"ઇનકમિંગ કૉલ"</string>
-    <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"ચાલુ કૉલ"</string>
-    <string name="notification_channel_missed_call" msgid="5820652855908217695">"છૂટેલા કૉલ"</string>
-    <string name="notification_channel_voicemail" msgid="9206363659849426204">"વૉઇસમેઇલ"</string>
-    <string name="notification_channel_misc" msgid="5595452227577858518">"ડિફૉલ્ટ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="notification_channel_incoming_call">ઇનકમિંગ કૉલ</string>
+  <string name="notification_channel_ongoing_call">ચાલુ કૉલ</string>
+  <string name="notification_channel_missed_call">છૂટેલા કૉલ</string>
+  <string name="notification_channel_voicemail">વૉઇસમેઇલ</string>
+  <string name="notification_channel_misc">ડિફૉલ્ટ</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-hi/strings.xml b/java/com/android/dialer/notification/res/values-hi/strings.xml
index 69ed9b0..24fac3f 100644
--- a/java/com/android/dialer/notification/res/values-hi/strings.xml
+++ b/java/com/android/dialer/notification/res/values-hi/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_channel_incoming_call" msgid="2478740764736158630">"इनकमिंग कॉल"</string>
-    <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"चल रहे कॉल"</string>
-    <string name="notification_channel_missed_call" msgid="5820652855908217695">"छूटे कॉल"</string>
-    <string name="notification_channel_voicemail" msgid="9206363659849426204">"वॉइसमेल"</string>
-    <string name="notification_channel_misc" msgid="5595452227577858518">"डिफ़ॉल्ट"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="notification_channel_incoming_call">इनकमिंग कॉल</string>
+  <string name="notification_channel_ongoing_call">चल रहे कॉल</string>
+  <string name="notification_channel_missed_call">छूटे कॉल</string>
+  <string name="notification_channel_voicemail">वॉइसमेल</string>
+  <string name="notification_channel_misc">डिफ़ॉल्ट</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-hr/strings.xml b/java/com/android/dialer/notification/res/values-hr/strings.xml
index a5924c3..c81de38 100644
--- a/java/com/android/dialer/notification/res/values-hr/strings.xml
+++ b/java/com/android/dialer/notification/res/values-hr/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_channel_incoming_call" msgid="2478740764736158630">"Dolazni pozivi"</string>
-    <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Pozivi u tijeku"</string>
-    <string name="notification_channel_missed_call" msgid="5820652855908217695">"Propušteni pozivi"</string>
-    <string name="notification_channel_voicemail" msgid="9206363659849426204">"Poruke govorne pošte"</string>
-    <string name="notification_channel_misc" msgid="5595452227577858518">"Zadano"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="notification_channel_incoming_call">Dolazni pozivi</string>
+  <string name="notification_channel_ongoing_call">Pozivi u tijeku</string>
+  <string name="notification_channel_missed_call">Propušteni pozivi</string>
+  <string name="notification_channel_voicemail">Poruke govorne pošte</string>
+  <string name="notification_channel_misc">Zadano</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-hu/strings.xml b/java/com/android/dialer/notification/res/values-hu/strings.xml
index 719252f..cd39ecb 100644
--- a/java/com/android/dialer/notification/res/values-hu/strings.xml
+++ b/java/com/android/dialer/notification/res/values-hu/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_channel_incoming_call" msgid="2478740764736158630">"Beérkező hívások"</string>
-    <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Kimenő hívások"</string>
-    <string name="notification_channel_missed_call" msgid="5820652855908217695">"Nem fogadott hívások"</string>
-    <string name="notification_channel_voicemail" msgid="9206363659849426204">"Hangüzenetek"</string>
-    <string name="notification_channel_misc" msgid="5595452227577858518">"Alapértelmezett"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="notification_channel_incoming_call">Beérkező hívások</string>
+  <string name="notification_channel_ongoing_call">Kimenő hívások</string>
+  <string name="notification_channel_missed_call">Nem fogadott hívások</string>
+  <string name="notification_channel_voicemail">Hangüzenetek</string>
+  <string name="notification_channel_misc">Alapértelmezett</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-hy/strings.xml b/java/com/android/dialer/notification/res/values-hy/strings.xml
index 6bb2c34..bb73bb2 100644
--- a/java/com/android/dialer/notification/res/values-hy/strings.xml
+++ b/java/com/android/dialer/notification/res/values-hy/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_channel_incoming_call" msgid="2478740764736158630">"Մուտքային զանգեր"</string>
-    <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Ընթացիկ զանգեր"</string>
-    <string name="notification_channel_missed_call" msgid="5820652855908217695">"Բաց թողնված զանգեր"</string>
-    <string name="notification_channel_voicemail" msgid="9206363659849426204">"Ձայնային փոստ"</string>
-    <string name="notification_channel_misc" msgid="5595452227577858518">"Կանխադրված"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="notification_channel_incoming_call">Մուտքային զանգեր</string>
+  <string name="notification_channel_ongoing_call">Ընթացիկ զանգեր</string>
+  <string name="notification_channel_missed_call">Բաց թողնված զանգեր</string>
+  <string name="notification_channel_voicemail">Ձայնային փոստ</string>
+  <string name="notification_channel_misc">Կանխադրված</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-in/strings.xml b/java/com/android/dialer/notification/res/values-in/strings.xml
index 88ef3d5..22c981c 100644
--- a/java/com/android/dialer/notification/res/values-in/strings.xml
+++ b/java/com/android/dialer/notification/res/values-in/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_channel_incoming_call" msgid="2478740764736158630">"Panggilan masuk"</string>
-    <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Panggilan keluar"</string>
-    <string name="notification_channel_missed_call" msgid="5820652855908217695">"Panggilan tak terjawab"</string>
-    <string name="notification_channel_voicemail" msgid="9206363659849426204">"Pesan suara"</string>
-    <string name="notification_channel_misc" msgid="5595452227577858518">"Default"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="notification_channel_incoming_call">Panggilan masuk</string>
+  <string name="notification_channel_ongoing_call">Panggilan keluar</string>
+  <string name="notification_channel_missed_call">Panggilan tak terjawab</string>
+  <string name="notification_channel_voicemail">Pesan suara</string>
+  <string name="notification_channel_misc">Default</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-is/strings.xml b/java/com/android/dialer/notification/res/values-is/strings.xml
index 166d974..87f4874 100644
--- a/java/com/android/dialer/notification/res/values-is/strings.xml
+++ b/java/com/android/dialer/notification/res/values-is/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_channel_incoming_call" msgid="2478740764736158630">"Móttekin símtöl"</string>
-    <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Símtöl í gangi"</string>
-    <string name="notification_channel_missed_call" msgid="5820652855908217695">"Ósvöruð símtöl"</string>
-    <string name="notification_channel_voicemail" msgid="9206363659849426204">"Talhólfsskilaboð"</string>
-    <string name="notification_channel_misc" msgid="5595452227577858518">"Sjálfgefið"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="notification_channel_incoming_call">Móttekin símtöl</string>
+  <string name="notification_channel_ongoing_call">Símtöl í gangi</string>
+  <string name="notification_channel_missed_call">Ósvöruð símtöl</string>
+  <string name="notification_channel_voicemail">Talhólfsskilaboð</string>
+  <string name="notification_channel_misc">Sjálfgefið</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-it/strings.xml b/java/com/android/dialer/notification/res/values-it/strings.xml
index 7b55da9..5c8f1f9 100644
--- a/java/com/android/dialer/notification/res/values-it/strings.xml
+++ b/java/com/android/dialer/notification/res/values-it/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_channel_incoming_call" msgid="2478740764736158630">"Chiamate in arrivo"</string>
-    <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Chiamate in uscita"</string>
-    <string name="notification_channel_missed_call" msgid="5820652855908217695">"Chiamate perse"</string>
-    <string name="notification_channel_voicemail" msgid="9206363659849426204">"Messaggi vocali"</string>
-    <string name="notification_channel_misc" msgid="5595452227577858518">"Predefinito"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="notification_channel_incoming_call">Chiamate in arrivo</string>
+  <string name="notification_channel_ongoing_call">Chiamate in uscita</string>
+  <string name="notification_channel_missed_call">Chiamate perse</string>
+  <string name="notification_channel_voicemail">Messaggi vocali</string>
+  <string name="notification_channel_misc">Predefinito</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-iw/strings.xml b/java/com/android/dialer/notification/res/values-iw/strings.xml
index 2b8b9df..cd0a889 100644
--- a/java/com/android/dialer/notification/res/values-iw/strings.xml
+++ b/java/com/android/dialer/notification/res/values-iw/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_channel_incoming_call" msgid="2478740764736158630">"שיחות נכנסות"</string>
-    <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"שיחות יוצאות"</string>
-    <string name="notification_channel_missed_call" msgid="5820652855908217695">"שיחות שלא נענו"</string>
-    <string name="notification_channel_voicemail" msgid="9206363659849426204">"הודעות קוליות"</string>
-    <string name="notification_channel_misc" msgid="5595452227577858518">"ברירת מחדל"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="notification_channel_incoming_call">שיחות נכנסות</string>
+  <string name="notification_channel_ongoing_call">שיחות יוצאות</string>
+  <string name="notification_channel_missed_call">שיחות שלא נענו</string>
+  <string name="notification_channel_voicemail">הודעות קוליות</string>
+  <string name="notification_channel_misc">ברירת מחדל</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-ja/strings.xml b/java/com/android/dialer/notification/res/values-ja/strings.xml
index 2ff8da7..87edfea 100644
--- a/java/com/android/dialer/notification/res/values-ja/strings.xml
+++ b/java/com/android/dialer/notification/res/values-ja/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_channel_incoming_call" msgid="2478740764736158630">"着信"</string>
-    <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"通話中"</string>
-    <string name="notification_channel_missed_call" msgid="5820652855908217695">"不在着信"</string>
-    <string name="notification_channel_voicemail" msgid="9206363659849426204">"ボイスメール"</string>
-    <string name="notification_channel_misc" msgid="5595452227577858518">"デフォルト"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="notification_channel_incoming_call">着信</string>
+  <string name="notification_channel_ongoing_call">通話中</string>
+  <string name="notification_channel_missed_call">不在着信</string>
+  <string name="notification_channel_voicemail">ボイスメール</string>
+  <string name="notification_channel_misc">デフォルト</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-ka/strings.xml b/java/com/android/dialer/notification/res/values-ka/strings.xml
index 73394ef..f5b9ea6 100644
--- a/java/com/android/dialer/notification/res/values-ka/strings.xml
+++ b/java/com/android/dialer/notification/res/values-ka/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_channel_incoming_call" msgid="2478740764736158630">"შემომავალი ზარები"</string>
-    <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"გამავალი ზარები"</string>
-    <string name="notification_channel_missed_call" msgid="5820652855908217695">"გამოტოვებული ზარები"</string>
-    <string name="notification_channel_voicemail" msgid="9206363659849426204">"ხმოვანი ფოსტა"</string>
-    <string name="notification_channel_misc" msgid="5595452227577858518">"ნაგულისხმევი"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="notification_channel_incoming_call">შემომავალი ზარები</string>
+  <string name="notification_channel_ongoing_call">გამავალი ზარები</string>
+  <string name="notification_channel_missed_call">გამოტოვებული ზარები</string>
+  <string name="notification_channel_voicemail">ხმოვანი ფოსტა</string>
+  <string name="notification_channel_misc">ნაგულისხმევი</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-kk/strings.xml b/java/com/android/dialer/notification/res/values-kk/strings.xml
index 8151c9c..5bf6214 100644
--- a/java/com/android/dialer/notification/res/values-kk/strings.xml
+++ b/java/com/android/dialer/notification/res/values-kk/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_channel_incoming_call" msgid="2478740764736158630">"Келген қоңыраулар"</string>
-    <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Қазіргі қоңыраулар"</string>
-    <string name="notification_channel_missed_call" msgid="5820652855908217695">"Қабылданбаған қоңыраулар"</string>
-    <string name="notification_channel_voicemail" msgid="9206363659849426204">"Дауыстық хабарлар"</string>
-    <string name="notification_channel_misc" msgid="5595452227577858518">"Әдепкі"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="notification_channel_incoming_call">Келген қоңыраулар</string>
+  <string name="notification_channel_ongoing_call">Қазіргі қоңыраулар</string>
+  <string name="notification_channel_missed_call">Қабылданбаған қоңыраулар</string>
+  <string name="notification_channel_voicemail">Дауыстық хабарлар</string>
+  <string name="notification_channel_misc">Әдепкі</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-km/strings.xml b/java/com/android/dialer/notification/res/values-km/strings.xml
index 22131ff..7fe6f61 100644
--- a/java/com/android/dialer/notification/res/values-km/strings.xml
+++ b/java/com/android/dialer/notification/res/values-km/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_channel_incoming_call" msgid="2478740764736158630">"ការ​ហៅ​ចូល"</string>
-    <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"ការ​ហៅ​បន្ត"</string>
-    <string name="notification_channel_missed_call" msgid="5820652855908217695">"ការ​ហៅ​ដែល​មិន​បាន​ទទួល"</string>
-    <string name="notification_channel_voicemail" msgid="9206363659849426204">"សារ​ជា​សំឡេង"</string>
-    <string name="notification_channel_misc" msgid="5595452227577858518">"លំ​នាំ​ដើម"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="notification_channel_incoming_call">ការ​ហៅ​ចូល</string>
+  <string name="notification_channel_ongoing_call">ការ​ហៅ​បន្ត</string>
+  <string name="notification_channel_missed_call">ការ​ហៅ​ដែល​មិន​បាន​ទទួល</string>
+  <string name="notification_channel_voicemail">សារ​ជា​សំឡេង</string>
+  <string name="notification_channel_misc">លំ​នាំ​ដើម</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-kn/strings.xml b/java/com/android/dialer/notification/res/values-kn/strings.xml
index d6e55bd..dabcb48 100644
--- a/java/com/android/dialer/notification/res/values-kn/strings.xml
+++ b/java/com/android/dialer/notification/res/values-kn/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_channel_incoming_call" msgid="2478740764736158630">"ಒಳಬರುವ ಕರೆಗಳು"</string>
-    <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"ಚಾಲ್ತಿಯಲ್ಲಿರುವ ಕರೆಗಳು"</string>
-    <string name="notification_channel_missed_call" msgid="5820652855908217695">"ಮಿಸ್ಡ್‌ ಕರೆಗಳು"</string>
-    <string name="notification_channel_voicemail" msgid="9206363659849426204">"ಧ್ವನಿಮೇಲ್‌ಗಳು"</string>
-    <string name="notification_channel_misc" msgid="5595452227577858518">"ಡಿಫಾಲ್ಟ್"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="notification_channel_incoming_call">ಒಳಬರುವ ಕರೆಗಳು</string>
+  <string name="notification_channel_ongoing_call">ಚಾಲ್ತಿಯಲ್ಲಿರುವ ಕರೆಗಳು</string>
+  <string name="notification_channel_missed_call">ಮಿಸ್ಡ್‌ ಕರೆಗಳು</string>
+  <string name="notification_channel_voicemail">ಧ್ವನಿಮೇಲ್‌ಗಳು</string>
+  <string name="notification_channel_misc">ಡಿಫಾಲ್ಟ್</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-ko/strings.xml b/java/com/android/dialer/notification/res/values-ko/strings.xml
index 5a66717..e283e50 100644
--- a/java/com/android/dialer/notification/res/values-ko/strings.xml
+++ b/java/com/android/dialer/notification/res/values-ko/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_channel_incoming_call" msgid="2478740764736158630">"수신 전화"</string>
-    <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"진행 중인 전화"</string>
-    <string name="notification_channel_missed_call" msgid="5820652855908217695">"부재중 전화"</string>
-    <string name="notification_channel_voicemail" msgid="9206363659849426204">"음성사서함"</string>
-    <string name="notification_channel_misc" msgid="5595452227577858518">"기본"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="notification_channel_incoming_call">수신 전화</string>
+  <string name="notification_channel_ongoing_call">진행 중인 전화</string>
+  <string name="notification_channel_missed_call">부재중 전화</string>
+  <string name="notification_channel_voicemail">음성사서함</string>
+  <string name="notification_channel_misc">기본</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-ky/strings.xml b/java/com/android/dialer/notification/res/values-ky/strings.xml
index c525931..8c85494 100644
--- a/java/com/android/dialer/notification/res/values-ky/strings.xml
+++ b/java/com/android/dialer/notification/res/values-ky/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_channel_incoming_call" msgid="2478740764736158630">"Кирүүчү чалуулар"</string>
-    <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Учурдагы чалуулар"</string>
-    <string name="notification_channel_missed_call" msgid="5820652855908217695">"Кабыл алынбаган чалуулар"</string>
-    <string name="notification_channel_voicemail" msgid="9206363659849426204">"Үнкаттар"</string>
-    <string name="notification_channel_misc" msgid="5595452227577858518">"Демейки"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="notification_channel_incoming_call">Кирүүчү чалуулар</string>
+  <string name="notification_channel_ongoing_call">Учурдагы чалуулар</string>
+  <string name="notification_channel_missed_call">Кабыл алынбаган чалуулар</string>
+  <string name="notification_channel_voicemail">Үнкаттар</string>
+  <string name="notification_channel_misc">Демейки</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-lo/strings.xml b/java/com/android/dialer/notification/res/values-lo/strings.xml
index a52d9df..58aa359 100644
--- a/java/com/android/dialer/notification/res/values-lo/strings.xml
+++ b/java/com/android/dialer/notification/res/values-lo/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_channel_incoming_call" msgid="2478740764736158630">"ສາຍໂທເຂົ້າ"</string>
-    <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"ສາຍໂທອອກ"</string>
-    <string name="notification_channel_missed_call" msgid="5820652855908217695">"ສາຍບໍ່ໄດ້ຮັບ"</string>
-    <string name="notification_channel_voicemail" msgid="9206363659849426204">"ຂໍ້ຄວາມສຽງ"</string>
-    <string name="notification_channel_misc" msgid="5595452227577858518">"ຄ່າເລີ່ມຕົ້ນ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="notification_channel_incoming_call">ສາຍໂທເຂົ້າ</string>
+  <string name="notification_channel_ongoing_call">ສາຍໂທອອກ</string>
+  <string name="notification_channel_missed_call">ສາຍບໍ່ໄດ້ຮັບ</string>
+  <string name="notification_channel_voicemail">ຂໍ້ຄວາມສຽງ</string>
+  <string name="notification_channel_misc">ຄ່າເລີ່ມຕົ້ນ</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-lt/strings.xml b/java/com/android/dialer/notification/res/values-lt/strings.xml
index 6f26d3e..b0aea7d 100644
--- a/java/com/android/dialer/notification/res/values-lt/strings.xml
+++ b/java/com/android/dialer/notification/res/values-lt/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_channel_incoming_call" msgid="2478740764736158630">"Gautieji skambučiai"</string>
-    <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Vykstantys skambučiai"</string>
-    <string name="notification_channel_missed_call" msgid="5820652855908217695">"Praleisti skambučiai"</string>
-    <string name="notification_channel_voicemail" msgid="9206363659849426204">"Balso pašto pranešimai"</string>
-    <string name="notification_channel_misc" msgid="5595452227577858518">"Numatytasis"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="notification_channel_incoming_call">Gautieji skambučiai</string>
+  <string name="notification_channel_ongoing_call">Vykstantys skambučiai</string>
+  <string name="notification_channel_missed_call">Praleisti skambučiai</string>
+  <string name="notification_channel_voicemail">Balso pašto pranešimai</string>
+  <string name="notification_channel_misc">Numatytasis</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-lv/strings.xml b/java/com/android/dialer/notification/res/values-lv/strings.xml
index 1819d81..22c1c97 100644
--- a/java/com/android/dialer/notification/res/values-lv/strings.xml
+++ b/java/com/android/dialer/notification/res/values-lv/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_channel_incoming_call" msgid="2478740764736158630">"Ienākošie zvani"</string>
-    <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Aktīvie zvani"</string>
-    <string name="notification_channel_missed_call" msgid="5820652855908217695">"Neatbildētie zvani"</string>
-    <string name="notification_channel_voicemail" msgid="9206363659849426204">"Balss pasta ziņojumi"</string>
-    <string name="notification_channel_misc" msgid="5595452227577858518">"Noklusējums"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="notification_channel_incoming_call">Ienākošie zvani</string>
+  <string name="notification_channel_ongoing_call">Aktīvie zvani</string>
+  <string name="notification_channel_missed_call">Neatbildētie zvani</string>
+  <string name="notification_channel_voicemail">Balss pasta ziņojumi</string>
+  <string name="notification_channel_misc">Noklusējums</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-mk/strings.xml b/java/com/android/dialer/notification/res/values-mk/strings.xml
index 56459c4..2040074 100644
--- a/java/com/android/dialer/notification/res/values-mk/strings.xml
+++ b/java/com/android/dialer/notification/res/values-mk/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_channel_incoming_call" msgid="2478740764736158630">"Дојдовни повици"</string>
-    <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Појдовни повици"</string>
-    <string name="notification_channel_missed_call" msgid="5820652855908217695">"Пропуштени повици"</string>
-    <string name="notification_channel_voicemail" msgid="9206363659849426204">"Говорни пораки"</string>
-    <string name="notification_channel_misc" msgid="5595452227577858518">"Стандардно"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="notification_channel_incoming_call">Дојдовни повици</string>
+  <string name="notification_channel_ongoing_call">Појдовни повици</string>
+  <string name="notification_channel_missed_call">Пропуштени повици</string>
+  <string name="notification_channel_voicemail">Говорни пораки</string>
+  <string name="notification_channel_misc">Стандардно</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-ml/strings.xml b/java/com/android/dialer/notification/res/values-ml/strings.xml
index 49a64e8..07118dc 100644
--- a/java/com/android/dialer/notification/res/values-ml/strings.xml
+++ b/java/com/android/dialer/notification/res/values-ml/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_channel_incoming_call" msgid="2478740764736158630">"ഇൻകമിംഗ് കോളുകൾ"</string>
-    <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"നിലവിലുള്ള കോളുകൾ"</string>
-    <string name="notification_channel_missed_call" msgid="5820652855908217695">"മിസ്‌ഡ് കോളുകൾ"</string>
-    <string name="notification_channel_voicemail" msgid="9206363659849426204">"വോയ്‌സ്മെയിലുകൾ"</string>
-    <string name="notification_channel_misc" msgid="5595452227577858518">"ഡിഫോൾട്ട്"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="notification_channel_incoming_call">ഇൻകമിംഗ് കോളുകൾ</string>
+  <string name="notification_channel_ongoing_call">നിലവിലുള്ള കോളുകൾ</string>
+  <string name="notification_channel_missed_call">മിസ്‌ഡ് കോളുകൾ</string>
+  <string name="notification_channel_voicemail">വോയ്‌സ്മെയിലുകൾ</string>
+  <string name="notification_channel_misc">ഡിഫോൾട്ട്</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-mn/strings.xml b/java/com/android/dialer/notification/res/values-mn/strings.xml
index 28297b3..694e73b 100644
--- a/java/com/android/dialer/notification/res/values-mn/strings.xml
+++ b/java/com/android/dialer/notification/res/values-mn/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_channel_incoming_call" msgid="2478740764736158630">"Ирж буй дуудлага"</string>
-    <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Үргэлжилж буй дуудлага"</string>
-    <string name="notification_channel_missed_call" msgid="5820652855908217695">"Аваагүй дуудлага"</string>
-    <string name="notification_channel_voicemail" msgid="9206363659849426204">"Дуут шуудан"</string>
-    <string name="notification_channel_misc" msgid="5595452227577858518">"Өгөгдмөл"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="notification_channel_incoming_call">Ирж буй дуудлага</string>
+  <string name="notification_channel_ongoing_call">Үргэлжилж буй дуудлага</string>
+  <string name="notification_channel_missed_call">Аваагүй дуудлага</string>
+  <string name="notification_channel_voicemail">Дуут шуудан</string>
+  <string name="notification_channel_misc">Өгөгдмөл</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-mr/strings.xml b/java/com/android/dialer/notification/res/values-mr/strings.xml
index 38fbd60..654bfc7 100644
--- a/java/com/android/dialer/notification/res/values-mr/strings.xml
+++ b/java/com/android/dialer/notification/res/values-mr/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_channel_incoming_call" msgid="2478740764736158630">"येणारे कॉल"</string>
-    <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"सुरू असलेले कॉल"</string>
-    <string name="notification_channel_missed_call" msgid="5820652855908217695">"सुटलेले कॉल"</string>
-    <string name="notification_channel_voicemail" msgid="9206363659849426204">"व्हॉइसमेल"</string>
-    <string name="notification_channel_misc" msgid="5595452227577858518">"डीफॉल्ट"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="notification_channel_incoming_call">येणारे कॉल</string>
+  <string name="notification_channel_ongoing_call">सुरू असलेले कॉल</string>
+  <string name="notification_channel_missed_call">सुटलेले कॉल</string>
+  <string name="notification_channel_voicemail">व्हॉइसमेल</string>
+  <string name="notification_channel_misc">डीफॉल्ट</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-ms/strings.xml b/java/com/android/dialer/notification/res/values-ms/strings.xml
index ec7be04..e603b14 100644
--- a/java/com/android/dialer/notification/res/values-ms/strings.xml
+++ b/java/com/android/dialer/notification/res/values-ms/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_channel_incoming_call" msgid="2478740764736158630">"Panggilan masuk"</string>
-    <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Panggilan sedang berlangsung"</string>
-    <string name="notification_channel_missed_call" msgid="5820652855908217695">"Panggilan terlepas"</string>
-    <string name="notification_channel_voicemail" msgid="9206363659849426204">"Mel suara"</string>
-    <string name="notification_channel_misc" msgid="5595452227577858518">"Lalai"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="notification_channel_incoming_call">Panggilan masuk</string>
+  <string name="notification_channel_ongoing_call">Panggilan sedang berlangsung</string>
+  <string name="notification_channel_missed_call">Panggilan terlepas</string>
+  <string name="notification_channel_voicemail">Mel suara</string>
+  <string name="notification_channel_misc">Lalai</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-my/strings.xml b/java/com/android/dialer/notification/res/values-my/strings.xml
index 44df847..2795d28 100644
--- a/java/com/android/dialer/notification/res/values-my/strings.xml
+++ b/java/com/android/dialer/notification/res/values-my/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_channel_incoming_call" msgid="2478740764736158630">"အဝင်ခေါ်ဆိုမှုများ"</string>
-    <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"လက်ရှိခေါ်ဆိုမှုများ"</string>
-    <string name="notification_channel_missed_call" msgid="5820652855908217695">"လွဲသွားသော ခေါ်ဆိုမှုများ"</string>
-    <string name="notification_channel_voicemail" msgid="9206363659849426204">"အသံစာပို့စနစ်များ"</string>
-    <string name="notification_channel_misc" msgid="5595452227577858518">"မူရင်း"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="notification_channel_incoming_call">အဝင်ခေါ်ဆိုမှုများ</string>
+  <string name="notification_channel_ongoing_call">လက်ရှိခေါ်ဆိုမှုများ</string>
+  <string name="notification_channel_missed_call">လွဲသွားသော ခေါ်ဆိုမှုများ</string>
+  <string name="notification_channel_voicemail">အသံစာပို့စနစ်များ</string>
+  <string name="notification_channel_misc">မူရင်း</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-nb/strings.xml b/java/com/android/dialer/notification/res/values-nb/strings.xml
index 8e63fd2..2fb9c78 100644
--- a/java/com/android/dialer/notification/res/values-nb/strings.xml
+++ b/java/com/android/dialer/notification/res/values-nb/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_channel_incoming_call" msgid="2478740764736158630">"Innkommende anrop"</string>
-    <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Pågående samtaler"</string>
-    <string name="notification_channel_missed_call" msgid="5820652855908217695">"Tapte anrop"</string>
-    <string name="notification_channel_voicemail" msgid="9206363659849426204">"Talepost"</string>
-    <string name="notification_channel_misc" msgid="5595452227577858518">"Standard"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="notification_channel_incoming_call">Innkommende anrop</string>
+  <string name="notification_channel_ongoing_call">Pågående samtaler</string>
+  <string name="notification_channel_missed_call">Tapte anrop</string>
+  <string name="notification_channel_voicemail">Talepost</string>
+  <string name="notification_channel_misc">Standard</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-ne/strings.xml b/java/com/android/dialer/notification/res/values-ne/strings.xml
index e653bb3..2118741 100644
--- a/java/com/android/dialer/notification/res/values-ne/strings.xml
+++ b/java/com/android/dialer/notification/res/values-ne/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_channel_incoming_call" msgid="2478740764736158630">"आगमन कलहरू"</string>
-    <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"जारी रहेका कलहरू"</string>
-    <string name="notification_channel_missed_call" msgid="5820652855908217695">"छुटेका कलहरू"</string>
-    <string name="notification_channel_voicemail" msgid="9206363659849426204">"भ्वाइस मेलहरू"</string>
-    <string name="notification_channel_misc" msgid="5595452227577858518">"पूर्वनिर्धारित मान"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="notification_channel_incoming_call">आगमन कलहरू</string>
+  <string name="notification_channel_ongoing_call">जारी रहेका कलहरू</string>
+  <string name="notification_channel_missed_call">छुटेका कलहरू</string>
+  <string name="notification_channel_voicemail">भ्वाइस मेलहरू</string>
+  <string name="notification_channel_misc">पूर्वनिर्धारित मान</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-nl/strings.xml b/java/com/android/dialer/notification/res/values-nl/strings.xml
index 094cc35..e3b21e7 100644
--- a/java/com/android/dialer/notification/res/values-nl/strings.xml
+++ b/java/com/android/dialer/notification/res/values-nl/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_channel_incoming_call" msgid="2478740764736158630">"Inkomende oproepen"</string>
-    <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Actieve oproepen"</string>
-    <string name="notification_channel_missed_call" msgid="5820652855908217695">"Gemiste oproepen"</string>
-    <string name="notification_channel_voicemail" msgid="9206363659849426204">"Voicemails"</string>
-    <string name="notification_channel_misc" msgid="5595452227577858518">"Standaard"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="notification_channel_incoming_call">Inkomende oproepen</string>
+  <string name="notification_channel_ongoing_call">Actieve oproepen</string>
+  <string name="notification_channel_missed_call">Gemiste oproepen</string>
+  <string name="notification_channel_voicemail">Voicemails</string>
+  <string name="notification_channel_misc">Standaard</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-no/strings.xml b/java/com/android/dialer/notification/res/values-no/strings.xml
index 8e63fd2..2fb9c78 100644
--- a/java/com/android/dialer/notification/res/values-no/strings.xml
+++ b/java/com/android/dialer/notification/res/values-no/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_channel_incoming_call" msgid="2478740764736158630">"Innkommende anrop"</string>
-    <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Pågående samtaler"</string>
-    <string name="notification_channel_missed_call" msgid="5820652855908217695">"Tapte anrop"</string>
-    <string name="notification_channel_voicemail" msgid="9206363659849426204">"Talepost"</string>
-    <string name="notification_channel_misc" msgid="5595452227577858518">"Standard"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="notification_channel_incoming_call">Innkommende anrop</string>
+  <string name="notification_channel_ongoing_call">Pågående samtaler</string>
+  <string name="notification_channel_missed_call">Tapte anrop</string>
+  <string name="notification_channel_voicemail">Talepost</string>
+  <string name="notification_channel_misc">Standard</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-pa/strings.xml b/java/com/android/dialer/notification/res/values-pa/strings.xml
index c4ee97b..946ec36 100644
--- a/java/com/android/dialer/notification/res/values-pa/strings.xml
+++ b/java/com/android/dialer/notification/res/values-pa/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_channel_incoming_call" msgid="2478740764736158630">"ਇਨਕਮਿੰਗ ਕਾਲਾਂ"</string>
-    <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"ਆਊਟਗੋਇੰਗ ਕਾਲਾਂ"</string>
-    <string name="notification_channel_missed_call" msgid="5820652855908217695">"ਖੁੰਝੀਆਂ ਕਾਲਾਂ"</string>
-    <string name="notification_channel_voicemail" msgid="9206363659849426204">"ਵੌਇਸਮੇਲਾਂ"</string>
-    <string name="notification_channel_misc" msgid="5595452227577858518">"ਪੂਰਵ-ਨਿਰਧਾਰਤ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="notification_channel_incoming_call">ਇਨਕਮਿੰਗ ਕਾਲਾਂ</string>
+  <string name="notification_channel_ongoing_call">ਆਊਟਗੋਇੰਗ ਕਾਲਾਂ</string>
+  <string name="notification_channel_missed_call">ਖੁੰਝੀਆਂ ਕਾਲਾਂ</string>
+  <string name="notification_channel_voicemail">ਵੌਇਸਮੇਲਾਂ</string>
+  <string name="notification_channel_misc">ਪੂਰਵ-ਨਿਰਧਾਰਤ</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-pl/strings.xml b/java/com/android/dialer/notification/res/values-pl/strings.xml
index 4b33460..018cf3b 100644
--- a/java/com/android/dialer/notification/res/values-pl/strings.xml
+++ b/java/com/android/dialer/notification/res/values-pl/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_channel_incoming_call" msgid="2478740764736158630">"Połączenia przychodzące"</string>
-    <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Połączenia trwające"</string>
-    <string name="notification_channel_missed_call" msgid="5820652855908217695">"Połączenia nieodebrane"</string>
-    <string name="notification_channel_voicemail" msgid="9206363659849426204">"Wiadomości głosowe"</string>
-    <string name="notification_channel_misc" msgid="5595452227577858518">"Domyślny"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="notification_channel_incoming_call">Połączenia przychodzące</string>
+  <string name="notification_channel_ongoing_call">Połączenia trwające</string>
+  <string name="notification_channel_missed_call">Połączenia nieodebrane</string>
+  <string name="notification_channel_voicemail">Wiadomości głosowe</string>
+  <string name="notification_channel_misc">Domyślny</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-pt-rBR/strings.xml b/java/com/android/dialer/notification/res/values-pt-rBR/strings.xml
index 4b988c3..8b048d4 100644
--- a/java/com/android/dialer/notification/res/values-pt-rBR/strings.xml
+++ b/java/com/android/dialer/notification/res/values-pt-rBR/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_channel_incoming_call" msgid="2478740764736158630">"Chamadas recebidas"</string>
-    <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Chamadas em andamento"</string>
-    <string name="notification_channel_missed_call" msgid="5820652855908217695">"Chamadas perdidas"</string>
-    <string name="notification_channel_voicemail" msgid="9206363659849426204">"Correios de voz"</string>
-    <string name="notification_channel_misc" msgid="5595452227577858518">"Padrão"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="notification_channel_incoming_call">Chamadas recebidas</string>
+  <string name="notification_channel_ongoing_call">Chamadas em andamento</string>
+  <string name="notification_channel_missed_call">Chamadas perdidas</string>
+  <string name="notification_channel_voicemail">Correios de voz</string>
+  <string name="notification_channel_misc">Padrão</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-pt-rPT/strings.xml b/java/com/android/dialer/notification/res/values-pt-rPT/strings.xml
index 45b31eb..6a745f8 100644
--- a/java/com/android/dialer/notification/res/values-pt-rPT/strings.xml
+++ b/java/com/android/dialer/notification/res/values-pt-rPT/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_channel_incoming_call" msgid="2478740764736158630">"Chamadas recebidas"</string>
-    <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Chamadas efetuadas"</string>
-    <string name="notification_channel_missed_call" msgid="5820652855908217695">"Chamadas não atendidas"</string>
-    <string name="notification_channel_voicemail" msgid="9206363659849426204">"Mensagens de correio de voz"</string>
-    <string name="notification_channel_misc" msgid="5595452227577858518">"Predefinição"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="notification_channel_incoming_call">Chamadas recebidas</string>
+  <string name="notification_channel_ongoing_call">Chamadas efetuadas</string>
+  <string name="notification_channel_missed_call">Chamadas não atendidas</string>
+  <string name="notification_channel_voicemail">Mensagens de correio de voz</string>
+  <string name="notification_channel_misc">Predefinição</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-pt/strings.xml b/java/com/android/dialer/notification/res/values-pt/strings.xml
index 4b988c3..8b048d4 100644
--- a/java/com/android/dialer/notification/res/values-pt/strings.xml
+++ b/java/com/android/dialer/notification/res/values-pt/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_channel_incoming_call" msgid="2478740764736158630">"Chamadas recebidas"</string>
-    <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Chamadas em andamento"</string>
-    <string name="notification_channel_missed_call" msgid="5820652855908217695">"Chamadas perdidas"</string>
-    <string name="notification_channel_voicemail" msgid="9206363659849426204">"Correios de voz"</string>
-    <string name="notification_channel_misc" msgid="5595452227577858518">"Padrão"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="notification_channel_incoming_call">Chamadas recebidas</string>
+  <string name="notification_channel_ongoing_call">Chamadas em andamento</string>
+  <string name="notification_channel_missed_call">Chamadas perdidas</string>
+  <string name="notification_channel_voicemail">Correios de voz</string>
+  <string name="notification_channel_misc">Padrão</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-ro/strings.xml b/java/com/android/dialer/notification/res/values-ro/strings.xml
index 040c58a..6ecff6e 100644
--- a/java/com/android/dialer/notification/res/values-ro/strings.xml
+++ b/java/com/android/dialer/notification/res/values-ro/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_channel_incoming_call" msgid="2478740764736158630">"Apeluri primite"</string>
-    <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Apeluri în desfășurare"</string>
-    <string name="notification_channel_missed_call" msgid="5820652855908217695">"Apeluri nepreluate"</string>
-    <string name="notification_channel_voicemail" msgid="9206363659849426204">"Mesaje vocale"</string>
-    <string name="notification_channel_misc" msgid="5595452227577858518">"Prestabilit"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="notification_channel_incoming_call">Apeluri primite</string>
+  <string name="notification_channel_ongoing_call">Apeluri în desfășurare</string>
+  <string name="notification_channel_missed_call">Apeluri nepreluate</string>
+  <string name="notification_channel_voicemail">Mesaje vocale</string>
+  <string name="notification_channel_misc">Prestabilit</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-ru/strings.xml b/java/com/android/dialer/notification/res/values-ru/strings.xml
index a811799..ce3cbeb 100644
--- a/java/com/android/dialer/notification/res/values-ru/strings.xml
+++ b/java/com/android/dialer/notification/res/values-ru/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_channel_incoming_call" msgid="2478740764736158630">"Входящие вызовы"</string>
-    <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Текущие вызовы"</string>
-    <string name="notification_channel_missed_call" msgid="5820652855908217695">"Пропущенные вызовы"</string>
-    <string name="notification_channel_voicemail" msgid="9206363659849426204">"Голосовые сообщения"</string>
-    <string name="notification_channel_misc" msgid="5595452227577858518">"По умолчанию"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="notification_channel_incoming_call">Входящие вызовы</string>
+  <string name="notification_channel_ongoing_call">Текущие вызовы</string>
+  <string name="notification_channel_missed_call">Пропущенные вызовы</string>
+  <string name="notification_channel_voicemail">Голосовые сообщения</string>
+  <string name="notification_channel_misc">По умолчанию</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-si/strings.xml b/java/com/android/dialer/notification/res/values-si/strings.xml
index 3ad0af7..7673f50 100644
--- a/java/com/android/dialer/notification/res/values-si/strings.xml
+++ b/java/com/android/dialer/notification/res/values-si/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_channel_incoming_call" msgid="2478740764736158630">"එන ඇමතුම්"</string>
-    <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"යන ඇමතුම්"</string>
-    <string name="notification_channel_missed_call" msgid="5820652855908217695">"මඟ හැරුණු ඇමතුම්"</string>
-    <string name="notification_channel_voicemail" msgid="9206363659849426204">"හඬ තැපැල්"</string>
-    <string name="notification_channel_misc" msgid="5595452227577858518">"පෙරනිමි"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="notification_channel_incoming_call">එන ඇමතුම්</string>
+  <string name="notification_channel_ongoing_call">යන ඇමතුම්</string>
+  <string name="notification_channel_missed_call">මඟ හැරුණු ඇමතුම්</string>
+  <string name="notification_channel_voicemail">හඬ තැපැල්</string>
+  <string name="notification_channel_misc">පෙරනිමි</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-sk/strings.xml b/java/com/android/dialer/notification/res/values-sk/strings.xml
index 30941bc..2ce23eb 100644
--- a/java/com/android/dialer/notification/res/values-sk/strings.xml
+++ b/java/com/android/dialer/notification/res/values-sk/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_channel_incoming_call" msgid="2478740764736158630">"Prichádzajúce hovory"</string>
-    <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Prebiehajúce hovory"</string>
-    <string name="notification_channel_missed_call" msgid="5820652855908217695">"Zmeškané hovory"</string>
-    <string name="notification_channel_voicemail" msgid="9206363659849426204">"Hlasové správy"</string>
-    <string name="notification_channel_misc" msgid="5595452227577858518">"Predvolené"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="notification_channel_incoming_call">Prichádzajúce hovory</string>
+  <string name="notification_channel_ongoing_call">Prebiehajúce hovory</string>
+  <string name="notification_channel_missed_call">Zmeškané hovory</string>
+  <string name="notification_channel_voicemail">Hlasové správy</string>
+  <string name="notification_channel_misc">Predvolené</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-sl/strings.xml b/java/com/android/dialer/notification/res/values-sl/strings.xml
index 70474b8..60dd3f9 100644
--- a/java/com/android/dialer/notification/res/values-sl/strings.xml
+++ b/java/com/android/dialer/notification/res/values-sl/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_channel_incoming_call" msgid="2478740764736158630">"Dohodni klici"</string>
-    <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Aktivni klici"</string>
-    <string name="notification_channel_missed_call" msgid="5820652855908217695">"Neodgovorjeni klici"</string>
-    <string name="notification_channel_voicemail" msgid="9206363659849426204">"Sporočila v odzivniku"</string>
-    <string name="notification_channel_misc" msgid="5595452227577858518">"Privzeto"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="notification_channel_incoming_call">Dohodni klici</string>
+  <string name="notification_channel_ongoing_call">Aktivni klici</string>
+  <string name="notification_channel_missed_call">Neodgovorjeni klici</string>
+  <string name="notification_channel_voicemail">Sporočila v odzivniku</string>
+  <string name="notification_channel_misc">Privzeto</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-sq/strings.xml b/java/com/android/dialer/notification/res/values-sq/strings.xml
index 03bc247..e8f356b 100644
--- a/java/com/android/dialer/notification/res/values-sq/strings.xml
+++ b/java/com/android/dialer/notification/res/values-sq/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_channel_incoming_call" msgid="2478740764736158630">"Telefonatat hyrëse"</string>
-    <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Telefonatat në vazhdim"</string>
-    <string name="notification_channel_missed_call" msgid="5820652855908217695">"Telefonatat e humbura"</string>
-    <string name="notification_channel_voicemail" msgid="9206363659849426204">"Postat zanore"</string>
-    <string name="notification_channel_misc" msgid="5595452227577858518">"I parazgjedhur"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="notification_channel_incoming_call">Telefonatat hyrëse</string>
+  <string name="notification_channel_ongoing_call">Telefonatat në vazhdim</string>
+  <string name="notification_channel_missed_call">Telefonatat e humbura</string>
+  <string name="notification_channel_voicemail">Postat zanore</string>
+  <string name="notification_channel_misc">I parazgjedhur</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-sr/strings.xml b/java/com/android/dialer/notification/res/values-sr/strings.xml
index 8326c04..1d81093 100644
--- a/java/com/android/dialer/notification/res/values-sr/strings.xml
+++ b/java/com/android/dialer/notification/res/values-sr/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_channel_incoming_call" msgid="2478740764736158630">"Долазни позиви"</string>
-    <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Позиви у току"</string>
-    <string name="notification_channel_missed_call" msgid="5820652855908217695">"Пропуштени позиви"</string>
-    <string name="notification_channel_voicemail" msgid="9206363659849426204">"Говорне поруке"</string>
-    <string name="notification_channel_misc" msgid="5595452227577858518">"Подразумевано"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="notification_channel_incoming_call">Долазни позиви</string>
+  <string name="notification_channel_ongoing_call">Позиви у току</string>
+  <string name="notification_channel_missed_call">Пропуштени позиви</string>
+  <string name="notification_channel_voicemail">Говорне поруке</string>
+  <string name="notification_channel_misc">Подразумевано</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-sv/strings.xml b/java/com/android/dialer/notification/res/values-sv/strings.xml
index e3170d4..63f7015 100644
--- a/java/com/android/dialer/notification/res/values-sv/strings.xml
+++ b/java/com/android/dialer/notification/res/values-sv/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_channel_incoming_call" msgid="2478740764736158630">"Inkommande samtal"</string>
-    <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Pågående samtal"</string>
-    <string name="notification_channel_missed_call" msgid="5820652855908217695">"Missade samtal"</string>
-    <string name="notification_channel_voicemail" msgid="9206363659849426204">"Röstmeddelanden"</string>
-    <string name="notification_channel_misc" msgid="5595452227577858518">"Standard"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="notification_channel_incoming_call">Inkommande samtal</string>
+  <string name="notification_channel_ongoing_call">Pågående samtal</string>
+  <string name="notification_channel_missed_call">Missade samtal</string>
+  <string name="notification_channel_voicemail">Röstmeddelanden</string>
+  <string name="notification_channel_misc">Standard</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-sw/strings.xml b/java/com/android/dialer/notification/res/values-sw/strings.xml
index d0a65b0..bad53eb 100644
--- a/java/com/android/dialer/notification/res/values-sw/strings.xml
+++ b/java/com/android/dialer/notification/res/values-sw/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_channel_incoming_call" msgid="2478740764736158630">"Simu zinazoingia"</string>
-    <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Simu zinazoendelea"</string>
-    <string name="notification_channel_missed_call" msgid="5820652855908217695">"Simu ambazo hukujibu"</string>
-    <string name="notification_channel_voicemail" msgid="9206363659849426204">"Ujumbe wa sauti"</string>
-    <string name="notification_channel_misc" msgid="5595452227577858518">"Chaguo-msingi"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="notification_channel_incoming_call">Simu zinazoingia</string>
+  <string name="notification_channel_ongoing_call">Simu zinazoendelea</string>
+  <string name="notification_channel_missed_call">Simu ambazo hukujibu</string>
+  <string name="notification_channel_voicemail">Ujumbe wa sauti</string>
+  <string name="notification_channel_misc">Chaguo msingi</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-ta/strings.xml b/java/com/android/dialer/notification/res/values-ta/strings.xml
index 8a6ae89..a6b0661 100644
--- a/java/com/android/dialer/notification/res/values-ta/strings.xml
+++ b/java/com/android/dialer/notification/res/values-ta/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_channel_incoming_call" msgid="2478740764736158630">"உள்வரும் அழைப்புகள்"</string>
-    <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"செயலில் உள்ள அழைப்புகள்"</string>
-    <string name="notification_channel_missed_call" msgid="5820652855908217695">"தவறிய அழைப்புகள்"</string>
-    <string name="notification_channel_voicemail" msgid="9206363659849426204">"குரலஞ்சல்கள்"</string>
-    <string name="notification_channel_misc" msgid="5595452227577858518">"இயல்பு"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="notification_channel_incoming_call">உள்வரும் அழைப்புகள்</string>
+  <string name="notification_channel_ongoing_call">செயலில் உள்ள அழைப்புகள்</string>
+  <string name="notification_channel_missed_call">தவறிய அழைப்புகள்</string>
+  <string name="notification_channel_voicemail">குரலஞ்சல்கள்</string>
+  <string name="notification_channel_misc">இயல்பு</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-te/strings.xml b/java/com/android/dialer/notification/res/values-te/strings.xml
index b1911d3..8a25b77 100644
--- a/java/com/android/dialer/notification/res/values-te/strings.xml
+++ b/java/com/android/dialer/notification/res/values-te/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_channel_incoming_call" msgid="2478740764736158630">"ఇన్‌కమింగ్ కాల్‌లు"</string>
-    <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"కొనసాగుతున్న కాల్‌లు"</string>
-    <string name="notification_channel_missed_call" msgid="5820652855908217695">"సమాధానమివ్వని కాల్‌లు"</string>
-    <string name="notification_channel_voicemail" msgid="9206363659849426204">"వాయిస్ మెయిల్‌లు"</string>
-    <string name="notification_channel_misc" msgid="5595452227577858518">"డిఫాల్ట్"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="notification_channel_incoming_call">ఇన్‌కమింగ్ కాల్‌లు</string>
+  <string name="notification_channel_ongoing_call">కొనసాగుతున్న కాల్‌లు</string>
+  <string name="notification_channel_missed_call">సమాధానమివ్వని కాల్‌లు</string>
+  <string name="notification_channel_voicemail">వాయిస్ మెయిల్‌లు</string>
+  <string name="notification_channel_misc">డిఫాల్ట్</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-th/strings.xml b/java/com/android/dialer/notification/res/values-th/strings.xml
index b2949e4..3763ee5 100644
--- a/java/com/android/dialer/notification/res/values-th/strings.xml
+++ b/java/com/android/dialer/notification/res/values-th/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_channel_incoming_call" msgid="2478740764736158630">"สายโทรเข้า"</string>
-    <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"สายที่สนทนาอยู่"</string>
-    <string name="notification_channel_missed_call" msgid="5820652855908217695">"สายที่ไม่ได้รับ"</string>
-    <string name="notification_channel_voicemail" msgid="9206363659849426204">"ข้อความเสียง"</string>
-    <string name="notification_channel_misc" msgid="5595452227577858518">"ค่าเริ่มต้น"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="notification_channel_incoming_call">สายโทรเข้า</string>
+  <string name="notification_channel_ongoing_call">สายที่สนทนาอยู่</string>
+  <string name="notification_channel_missed_call">สายที่ไม่ได้รับ</string>
+  <string name="notification_channel_voicemail">ข้อความเสียง</string>
+  <string name="notification_channel_misc">ค่าเริ่มต้น</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-tl/strings.xml b/java/com/android/dialer/notification/res/values-tl/strings.xml
index 1219ad8..596916b 100644
--- a/java/com/android/dialer/notification/res/values-tl/strings.xml
+++ b/java/com/android/dialer/notification/res/values-tl/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_channel_incoming_call" msgid="2478740764736158630">"Mga papasok na tawag"</string>
-    <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Mga kasalukuyang tawag"</string>
-    <string name="notification_channel_missed_call" msgid="5820652855908217695">"Mga hindi nasagot na tawag"</string>
-    <string name="notification_channel_voicemail" msgid="9206363659849426204">"Mga voicemail"</string>
-    <string name="notification_channel_misc" msgid="5595452227577858518">"Default"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="notification_channel_incoming_call">Mga papasok na tawag</string>
+  <string name="notification_channel_ongoing_call">Mga kasalukuyang tawag</string>
+  <string name="notification_channel_missed_call">Mga hindi nasagot na tawag</string>
+  <string name="notification_channel_voicemail">Mga voicemail</string>
+  <string name="notification_channel_misc">Default</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-tr/strings.xml b/java/com/android/dialer/notification/res/values-tr/strings.xml
index 71c91c8..cd6e12f 100644
--- a/java/com/android/dialer/notification/res/values-tr/strings.xml
+++ b/java/com/android/dialer/notification/res/values-tr/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_channel_incoming_call" msgid="2478740764736158630">"Gelen çağrılar"</string>
-    <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Devam eden çağrılar"</string>
-    <string name="notification_channel_missed_call" msgid="5820652855908217695">"Cevapsız çağrılar"</string>
-    <string name="notification_channel_voicemail" msgid="9206363659849426204">"Sesli mesajlar"</string>
-    <string name="notification_channel_misc" msgid="5595452227577858518">"Varsayılan"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="notification_channel_incoming_call">Gelen çağrılar</string>
+  <string name="notification_channel_ongoing_call">Devam eden çağrılar</string>
+  <string name="notification_channel_missed_call">Cevapsız çağrılar</string>
+  <string name="notification_channel_voicemail">Sesli mesajlar</string>
+  <string name="notification_channel_misc">Varsayılan</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-uk/strings.xml b/java/com/android/dialer/notification/res/values-uk/strings.xml
index a002f42..f648e3b 100644
--- a/java/com/android/dialer/notification/res/values-uk/strings.xml
+++ b/java/com/android/dialer/notification/res/values-uk/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_channel_incoming_call" msgid="2478740764736158630">"Вхідні виклики"</string>
-    <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Поточні виклики"</string>
-    <string name="notification_channel_missed_call" msgid="5820652855908217695">"Пропущені виклики"</string>
-    <string name="notification_channel_voicemail" msgid="9206363659849426204">"Голосова пошта"</string>
-    <string name="notification_channel_misc" msgid="5595452227577858518">"За умовчанням"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="notification_channel_incoming_call">Вхідні виклики</string>
+  <string name="notification_channel_ongoing_call">Поточні виклики</string>
+  <string name="notification_channel_missed_call">Пропущені виклики</string>
+  <string name="notification_channel_voicemail">Голосова пошта</string>
+  <string name="notification_channel_misc">За умовчанням</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-ur/strings.xml b/java/com/android/dialer/notification/res/values-ur/strings.xml
index 805fe08..93dc03a 100644
--- a/java/com/android/dialer/notification/res/values-ur/strings.xml
+++ b/java/com/android/dialer/notification/res/values-ur/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_channel_incoming_call" msgid="2478740764736158630">"آنے والی کالیں"</string>
-    <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"جاری کالیں"</string>
-    <string name="notification_channel_missed_call" msgid="5820652855908217695">"چھوٹی ہوئی کالیں"</string>
-    <string name="notification_channel_voicemail" msgid="9206363659849426204">"صوتی میلز"</string>
-    <string name="notification_channel_misc" msgid="5595452227577858518">"ڈیفالٹ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="notification_channel_incoming_call">آنے والی کالیں</string>
+  <string name="notification_channel_ongoing_call">جاری کالیں</string>
+  <string name="notification_channel_missed_call">چھوٹی ہوئی کالیں</string>
+  <string name="notification_channel_voicemail">صوتی میلز</string>
+  <string name="notification_channel_misc">ڈیفالٹ</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-uz/strings.xml b/java/com/android/dialer/notification/res/values-uz/strings.xml
index 16075b0..b4c9713 100644
--- a/java/com/android/dialer/notification/res/values-uz/strings.xml
+++ b/java/com/android/dialer/notification/res/values-uz/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_channel_incoming_call" msgid="2478740764736158630">"Kiruvchi chaqiruvlar"</string>
-    <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Davom etayotgan suhbatlar"</string>
-    <string name="notification_channel_missed_call" msgid="5820652855908217695">"Javobsiz chaqiruvlar"</string>
-    <string name="notification_channel_voicemail" msgid="9206363659849426204">"Ovozli xabarlar"</string>
-    <string name="notification_channel_misc" msgid="5595452227577858518">"Standart"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="notification_channel_incoming_call">Kiruvchi chaqiruvlar</string>
+  <string name="notification_channel_ongoing_call">Davom etayotgan suhbatlar</string>
+  <string name="notification_channel_missed_call">Javobsiz chaqiruvlar</string>
+  <string name="notification_channel_voicemail">Ovozli xabarlar</string>
+  <string name="notification_channel_misc">Standart</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-vi/strings.xml b/java/com/android/dialer/notification/res/values-vi/strings.xml
index b6ab3d2..3176509 100644
--- a/java/com/android/dialer/notification/res/values-vi/strings.xml
+++ b/java/com/android/dialer/notification/res/values-vi/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_channel_incoming_call" msgid="2478740764736158630">"Cuộc gọi đến"</string>
-    <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Cuộc gọi đến"</string>
-    <string name="notification_channel_missed_call" msgid="5820652855908217695">"Cuộc gọi nhỡ"</string>
-    <string name="notification_channel_voicemail" msgid="9206363659849426204">"Thư thoại"</string>
-    <string name="notification_channel_misc" msgid="5595452227577858518">"Mặc định"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="notification_channel_incoming_call">Cuộc gọi đến</string>
+  <string name="notification_channel_ongoing_call">Cuộc gọi đến</string>
+  <string name="notification_channel_missed_call">Cuộc gọi nhỡ</string>
+  <string name="notification_channel_voicemail">Thư thoại</string>
+  <string name="notification_channel_misc">Mặc định</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-zh-rCN/strings.xml b/java/com/android/dialer/notification/res/values-zh-rCN/strings.xml
index 1ef46c2..f80c3b5 100644
--- a/java/com/android/dialer/notification/res/values-zh-rCN/strings.xml
+++ b/java/com/android/dialer/notification/res/values-zh-rCN/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_channel_incoming_call" msgid="2478740764736158630">"来电"</string>
-    <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"正在进行的通话"</string>
-    <string name="notification_channel_missed_call" msgid="5820652855908217695">"未接电话"</string>
-    <string name="notification_channel_voicemail" msgid="9206363659849426204">"语音邮件"</string>
-    <string name="notification_channel_misc" msgid="5595452227577858518">"默认"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="notification_channel_incoming_call">来电</string>
+  <string name="notification_channel_ongoing_call">正在进行的通话</string>
+  <string name="notification_channel_missed_call">未接电话</string>
+  <string name="notification_channel_voicemail">语音邮件</string>
+  <string name="notification_channel_misc">默认</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-zh-rHK/strings.xml b/java/com/android/dialer/notification/res/values-zh-rHK/strings.xml
index 43a6fab..6e7293c 100644
--- a/java/com/android/dialer/notification/res/values-zh-rHK/strings.xml
+++ b/java/com/android/dialer/notification/res/values-zh-rHK/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_channel_incoming_call" msgid="2478740764736158630">"來電"</string>
-    <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"進行中的通話"</string>
-    <string name="notification_channel_missed_call" msgid="5820652855908217695">"未接來電"</string>
-    <string name="notification_channel_voicemail" msgid="9206363659849426204">"留言信箱"</string>
-    <string name="notification_channel_misc" msgid="5595452227577858518">"預設"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="notification_channel_incoming_call">來電</string>
+  <string name="notification_channel_ongoing_call">進行中的通話</string>
+  <string name="notification_channel_missed_call">未接來電</string>
+  <string name="notification_channel_voicemail">留言信箱</string>
+  <string name="notification_channel_misc">預設</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-zh-rTW/strings.xml b/java/com/android/dialer/notification/res/values-zh-rTW/strings.xml
index 35236be..96a42ae 100644
--- a/java/com/android/dialer/notification/res/values-zh-rTW/strings.xml
+++ b/java/com/android/dialer/notification/res/values-zh-rTW/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_channel_incoming_call" msgid="2478740764736158630">"來電"</string>
-    <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"進行中的通話"</string>
-    <string name="notification_channel_missed_call" msgid="5820652855908217695">"未接來電"</string>
-    <string name="notification_channel_voicemail" msgid="9206363659849426204">"語音留言"</string>
-    <string name="notification_channel_misc" msgid="5595452227577858518">"預設"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="notification_channel_incoming_call">來電</string>
+  <string name="notification_channel_ongoing_call">進行中的通話</string>
+  <string name="notification_channel_missed_call">未接來電</string>
+  <string name="notification_channel_voicemail">語音留言</string>
+  <string name="notification_channel_misc">預設</string>
 </resources>
diff --git a/java/com/android/dialer/notification/res/values-zu/strings.xml b/java/com/android/dialer/notification/res/values-zu/strings.xml
index f3d9553..b6ca20b 100644
--- a/java/com/android/dialer/notification/res/values-zu/strings.xml
+++ b/java/com/android/dialer/notification/res/values-zu/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_channel_incoming_call" msgid="2478740764736158630">"Amakhooli angenayo"</string>
-    <string name="notification_channel_ongoing_call" msgid="5593444445363940672">"Amakholi aqhubekayo"</string>
-    <string name="notification_channel_missed_call" msgid="5820652855908217695">"Amakholi akuphuthile"</string>
-    <string name="notification_channel_voicemail" msgid="9206363659849426204">"Amavoyisimeyili"</string>
-    <string name="notification_channel_misc" msgid="5595452227577858518">"Okuzenzakalelayo"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="notification_channel_incoming_call">Amakhooli angenayo</string>
+  <string name="notification_channel_ongoing_call">Amakholi aqhubekayo</string>
+  <string name="notification_channel_missed_call">Amakholi akuphuthile</string>
+  <string name="notification_channel_voicemail">Amavoyisimeyili</string>
+  <string name="notification_channel_misc">Okuzenzakalelayo</string>
 </resources>
diff --git a/java/com/android/dialer/oem/AndroidManifest.xml b/java/com/android/dialer/oem/AndroidManifest.xml
index 9e0373a..94cd4fc 100644
--- a/java/com/android/dialer/oem/AndroidManifest.xml
+++ b/java/com/android/dialer/oem/AndroidManifest.xml
@@ -18,4 +18,6 @@
   <!-- This is used for querying Cequint caller id. -->
   <uses-permission android:name="com.cequint.ecid.CALLER_ID_LOOKUP"/>
 
-</manifest>
\ No newline at end of file
+  <!-- This is used by MotorolaInCallUiNotifier to send broadcasts. -->
+  <uses-permission android:name="com.motorola.incallui.permission.INCOMING_CALL_VISIBILITY_CHANGED"/>
+</manifest>
diff --git a/java/com/android/dialer/oem/CequintCallerIdManager.java b/java/com/android/dialer/oem/CequintCallerIdManager.java
index 48a5985..da217c8 100644
--- a/java/com/android/dialer/oem/CequintCallerIdManager.java
+++ b/java/com/android/dialer/oem/CequintCallerIdManager.java
@@ -15,21 +15,21 @@
  */
 package com.android.dialer.oem;
 
-import android.annotation.TargetApi;
 import android.content.Context;
 import android.content.pm.PackageManager;
 import android.database.Cursor;
 import android.net.Uri;
-import android.os.Build.VERSION_CODES;
 import android.support.annotation.AnyThread;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+import android.support.annotation.VisibleForTesting;
 import android.support.annotation.WorkerThread;
 import android.telephony.PhoneNumberUtils;
 import android.text.TextUtils;
 import com.android.dialer.common.Assert;
 import com.android.dialer.common.LogUtil;
-import com.android.dialer.configprovider.ConfigProviderBindings;
+import com.android.dialer.configprovider.ConfigProviderComponent;
+import com.google.auto.value.AutoValue;
 import java.util.concurrent.ConcurrentHashMap;
 
 /**
@@ -41,10 +41,10 @@
  * Cequint Caller ID. It also caches any information fetched in static map, which lives through
  * whole application lifecycle.
  */
-@TargetApi(VERSION_CODES.M)
 public class CequintCallerIdManager {
 
-  private static final String CONFIG_CALLER_ID_ENABLED = "config_caller_id_enabled";
+  @VisibleForTesting
+  public static final String CONFIG_CALLER_ID_ENABLED = "config_caller_id_enabled";
 
   private static final int CALLER_ID_LOOKUP_USER_PROVIDED_CID = 0x0001;
   private static final int CALLER_ID_LOOKUP_SYSTEM_PROVIDED_CID = 0x0002;
@@ -52,41 +52,67 @@
 
   private static final String[] EMPTY_PROJECTION = new String[] {};
 
-  // Column names in Cequint provider.
-  private static final String CITY_NAME = "cid_pCityName";
-  private static final String STATE_NAME = "cid_pStateName";
-  private static final String STATE_ABBR = "cid_pStateAbbr";
-  private static final String COUNTRY_NAME = "cid_pCountryName";
-  private static final String COMPANY = "cid_pCompany";
-  private static final String NAME = "cid_pName";
-  private static final String FIRST_NAME = "cid_pFirstName";
-  private static final String LAST_NAME = "cid_pLastName";
-  private static final String IMAGE = "cid_pLogo";
-  private static final String DISPLAY_NAME = "cid_pDisplayName";
+  /** Column names in Cequint content provider. */
+  @VisibleForTesting
+  public static final class CequintColumnNames {
+    public static final String CITY_NAME = "cid_pCityName";
+    public static final String STATE_NAME = "cid_pStateName";
+    public static final String STATE_ABBR = "cid_pStateAbbr";
+    public static final String COUNTRY_NAME = "cid_pCountryName";
+    public static final String COMPANY = "cid_pCompany";
+    public static final String NAME = "cid_pName";
+    public static final String FIRST_NAME = "cid_pFirstName";
+    public static final String LAST_NAME = "cid_pLastName";
+    public static final String PHOTO_URI = "cid_pLogo";
+    public static final String DISPLAY_NAME = "cid_pDisplayName";
+  }
 
   private static boolean hasAlreadyCheckedCequintCallerIdPackage;
   private static String cequintProviderAuthority;
 
-  // TODO(wangqi): Revisit it and maybe remove it if it's not necessary.
-  private final ConcurrentHashMap<String, CequintCallerIdContact> callLogCache;
+  // TODO(a bug): Revisit it and maybe remove it if it's not necessary.
+  private final ConcurrentHashMap<String, CequintCallerIdContact> callLogCache =
+      new ConcurrentHashMap<>();
 
-  /** Cequint caller id contact information. */
-  public static class CequintCallerIdContact {
-    public final String name;
-    public final String geoDescription;
-    public final String imageUrl;
+  /** Cequint caller ID contact information. */
+  @AutoValue
+  public abstract static class CequintCallerIdContact {
 
-    private CequintCallerIdContact(String name, String geoDescription, String imageUrl) {
-      this.name = name;
-      this.geoDescription = geoDescription;
-      this.imageUrl = imageUrl;
+    @Nullable
+    public abstract String name();
+
+    /**
+     * Description of the geolocation (e.g., "Mountain View, CA"), which is for display purpose
+     * only.
+     */
+    @Nullable
+    public abstract String geolocation();
+
+    @Nullable
+    public abstract String photoUri();
+
+    static Builder builder() {
+      return new AutoValue_CequintCallerIdManager_CequintCallerIdContact.Builder();
+    }
+
+    @AutoValue.Builder
+    abstract static class Builder {
+      abstract Builder setName(@Nullable String name);
+
+      abstract Builder setGeolocation(@Nullable String geolocation);
+
+      abstract Builder setPhotoUri(@Nullable String photoUri);
+
+      abstract CequintCallerIdContact build();
     }
   }
 
-  /** Check whether Cequint Caller Id provider package is available and enabled. */
+  /** Check whether Cequint Caller ID provider package is available and enabled. */
   @AnyThread
   public static synchronized boolean isCequintCallerIdEnabled(@NonNull Context context) {
-    if (!ConfigProviderBindings.get(context).getBoolean(CONFIG_CALLER_ID_ENABLED, true)) {
+    if (!ConfigProviderComponent.get(context)
+        .getConfigProvider()
+        .getBoolean(CONFIG_CALLER_ID_ENABLED, true)) {
       return false;
     }
     if (!hasAlreadyCheckedCequintCallerIdPackage) {
@@ -107,17 +133,14 @@
     return cequintProviderAuthority != null;
   }
 
-  public static CequintCallerIdManager createInstanceForCallLog() {
-    return new CequintCallerIdManager();
-  }
-
+  /** Returns a {@link CequintCallerIdContact} for a call. */
   @WorkerThread
   @Nullable
-  public static CequintCallerIdContact getCequintCallerIdContactForInCall(
+  public static CequintCallerIdContact getCequintCallerIdContactForCall(
       Context context, String number, String cnapName, boolean isIncoming) {
     Assert.isWorkerThread();
     LogUtil.d(
-        "CequintCallerIdManager.getCequintCallerIdContactForInCall",
+        "CequintCallerIdManager.getCequintCallerIdContactForCall",
         "number: %s, cnapName: %s, isIncoming: %b",
         LogUtil.sanitizePhoneNumber(number),
         LogUtil.sanitizePii(cnapName),
@@ -133,29 +156,51 @@
     return lookup(context, getIncallLookupUri(), number, flags);
   }
 
+  /**
+   * Returns a cached {@link CequintCallerIdContact} associated with the provided number. If no
+   * contact can be found in the cache, look up the number using the Cequint content provider.
+   *
+   * @deprecated This method is for the old call log only. New code should use {@link
+   *     #getCequintCallerIdContactForNumber(Context, String)}.
+   */
+  @Deprecated
   @WorkerThread
   @Nullable
-  public CequintCallerIdContact getCequintCallerIdContact(Context context, String number) {
+  public CequintCallerIdContact getCachedCequintCallerIdContact(Context context, String number) {
     Assert.isWorkerThread();
     LogUtil.d(
-        "CequintCallerIdManager.getCequintCallerIdContact",
+        "CequintCallerIdManager.getCachedCequintCallerIdContact",
         "number: %s",
         LogUtil.sanitizePhoneNumber(number));
     if (callLogCache.containsKey(number)) {
       return callLogCache.get(number);
     }
     CequintCallerIdContact cequintCallerIdContact =
-        lookup(
-            context,
-            getLookupUri(),
-            PhoneNumberUtils.stripSeparators(number),
-            new String[] {"system"});
+        getCequintCallerIdContactForNumber(context, number);
     if (cequintCallerIdContact != null) {
       callLogCache.put(number, cequintCallerIdContact);
     }
     return cequintCallerIdContact;
   }
 
+  /**
+   * Returns a {@link CequintCallerIdContact} associated with the provided number by looking it up
+   * using the Cequint content provider.
+   */
+  @WorkerThread
+  @Nullable
+  public static CequintCallerIdContact getCequintCallerIdContactForNumber(
+      Context context, String number) {
+    Assert.isWorkerThread();
+    LogUtil.d(
+        "CequintCallerIdManager.getCequintCallerIdContactForNumber",
+        "number: %s",
+        LogUtil.sanitizePhoneNumber(number));
+
+    return lookup(
+        context, getLookupUri(), PhoneNumberUtils.stripSeparators(number), new String[] {"system"});
+  }
+
   @WorkerThread
   @Nullable
   private static CequintCallerIdContact lookup(
@@ -167,30 +212,35 @@
     try (Cursor cursor =
         context.getContentResolver().query(uri, EMPTY_PROJECTION, number, flags, null)) {
       if (cursor != null && cursor.moveToFirst()) {
-        String city = getString(cursor, cursor.getColumnIndex(CITY_NAME));
-        String state = getString(cursor, cursor.getColumnIndex(STATE_NAME));
-        String stateAbbr = getString(cursor, cursor.getColumnIndex(STATE_ABBR));
-        String country = getString(cursor, cursor.getColumnIndex(COUNTRY_NAME));
-        String company = getString(cursor, cursor.getColumnIndex(COMPANY));
-        String name = getString(cursor, cursor.getColumnIndex(NAME));
-        String firstName = getString(cursor, cursor.getColumnIndex(FIRST_NAME));
-        String lastName = getString(cursor, cursor.getColumnIndex(LAST_NAME));
-        String imageUrl = getString(cursor, cursor.getColumnIndex(IMAGE));
-        String displayName = getString(cursor, cursor.getColumnIndex(DISPLAY_NAME));
+        String city = getString(cursor, cursor.getColumnIndex(CequintColumnNames.CITY_NAME));
+        String state = getString(cursor, cursor.getColumnIndex(CequintColumnNames.STATE_NAME));
+        String stateAbbr = getString(cursor, cursor.getColumnIndex(CequintColumnNames.STATE_ABBR));
+        String country = getString(cursor, cursor.getColumnIndex(CequintColumnNames.COUNTRY_NAME));
+        String company = getString(cursor, cursor.getColumnIndex(CequintColumnNames.COMPANY));
+        String name = getString(cursor, cursor.getColumnIndex(CequintColumnNames.NAME));
+        String firstName = getString(cursor, cursor.getColumnIndex(CequintColumnNames.FIRST_NAME));
+        String lastName = getString(cursor, cursor.getColumnIndex(CequintColumnNames.LAST_NAME));
+        String photoUri = getString(cursor, cursor.getColumnIndex(CequintColumnNames.PHOTO_URI));
+        String displayName =
+            getString(cursor, cursor.getColumnIndex(CequintColumnNames.DISPLAY_NAME));
 
         String contactName =
             TextUtils.isEmpty(displayName)
                 ? generateDisplayName(firstName, lastName, company, name)
                 : displayName;
-        String geoDescription = getGeoDescription(city, state, stateAbbr, country);
+        String geolocation = getGeolocation(city, state, stateAbbr, country);
         LogUtil.d(
             "CequintCallerIdManager.lookup",
             "number: %s, contact name: %s, geo: %s, photo url: %s",
             LogUtil.sanitizePhoneNumber(number),
             LogUtil.sanitizePii(contactName),
-            LogUtil.sanitizePii(geoDescription),
-            imageUrl);
-        return new CequintCallerIdContact(contactName, geoDescription, imageUrl);
+            LogUtil.sanitizePii(geolocation),
+            photoUri);
+        return CequintCallerIdContact.builder()
+            .setName(contactName)
+            .setGeolocation(geolocation)
+            .setPhotoUri(photoUri)
+            .build();
       } else {
         LogUtil.d("CequintCallerIdManager.lookup", "No CequintCallerIdContact found");
         return null;
@@ -249,8 +299,8 @@
     return null;
   }
 
-  /** Returns geo location information. e.g. Mountain View, CA. */
-  private static String getGeoDescription(
+  /** Returns geolocation information (e.g., "Mountain View, CA"). */
+  private static String getGeolocation(
       String city, String state, String stateAbbr, String country) {
     String geoDescription = null;
 
@@ -271,8 +321,4 @@
   private static Uri getIncallLookupUri() {
     return Uri.parse("content://" + cequintProviderAuthority + "/incalllookup");
   }
-
-  private CequintCallerIdManager() {
-    callLogCache = new ConcurrentHashMap<>();
-  }
 }
diff --git a/java/com/android/dialer/oem/MotorolaHiddenMenuKeySequence.java b/java/com/android/dialer/oem/MotorolaHiddenMenuKeySequence.java
index 079624b..74ad1b8 100644
--- a/java/com/android/dialer/oem/MotorolaHiddenMenuKeySequence.java
+++ b/java/com/android/dialer/oem/MotorolaHiddenMenuKeySequence.java
@@ -71,6 +71,11 @@
   }
 
   @VisibleForTesting
+  static void setInstanceForTest(MotorolaHiddenMenuKeySequence instance) {
+    MotorolaHiddenMenuKeySequence.instance = instance;
+  }
+
+  @VisibleForTesting
   MotorolaHiddenMenuKeySequence(
       Context context, SystemPropertiesAccessor systemPropertiesAccessor) {
     if (MotorolaUtils.isSupportingHiddenMenu(context)) {
diff --git a/java/com/android/dialer/oem/MotorolaUtils.java b/java/com/android/dialer/oem/MotorolaUtils.java
index 1446a02..0268937 100644
--- a/java/com/android/dialer/oem/MotorolaUtils.java
+++ b/java/com/android/dialer/oem/MotorolaUtils.java
@@ -22,7 +22,7 @@
 import android.telephony.TelephonyManager;
 import com.android.dialer.common.LogUtil;
 import com.android.dialer.common.PackageUtils;
-import com.android.dialer.configprovider.ConfigProviderBindings;
+import com.android.dialer.configprovider.ConfigProviderComponent;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 
@@ -36,6 +36,9 @@
   private static final String CONFIG_WIFI_CALL_SHOW_ICON_IN_CALL_LOG_ENABLED =
       "wifi_call_show_icon_in_call_log_enabled";
 
+  @VisibleForTesting
+  static final String CONFIG_DISABLE_PHONE_NUMBER_FORMATTING = "disable_phone_number_formatting";
+
   // This is used to check if a Motorola device supports HD voice call feature, which comes from
   // system feature setting.
   private static final String HD_CALL_FEATRURE = "com.motorola.software.sprint.hd_call";
@@ -46,6 +49,7 @@
   @VisibleForTesting
   static final String HIDDEN_MENU_FEATURE = "com.motorola.software.sprint.hidden_menu";
 
+  private static Boolean disablePhoneNumberFormattingForTest = null;
   private static boolean hasCheckedSprintWifiCall;
   private static boolean supportSprintWifiCall;
 
@@ -55,9 +59,14 @@
    */
   private static boolean isSpnMatched(Context context) {
     try {
-      String spnResource = context.getResources().getString(R.string.motorola_enabled_spn);
-      return spnResource.equalsIgnoreCase(
-          context.getSystemService(TelephonyManager.class).getSimOperatorName());
+      for (String spnResource :
+          context.getResources().getStringArray(R.array.motorola_enabled_spn)) {
+        if (spnResource.equalsIgnoreCase(
+            context.getSystemService(TelephonyManager.class).getSimOperatorName())) {
+          return true;
+        }
+      }
+      return false;
     } catch (Resources.NotFoundException exception) {
       // If SPN is not specified we consider as not necessary to enable/disable the feature.
       return true;
@@ -65,28 +74,43 @@
   }
 
   static boolean isSupportingHiddenMenu(Context context) {
-    return context.getPackageManager().hasSystemFeature(HIDDEN_MENU_FEATURE);
+    return context.getPackageManager().hasSystemFeature(HIDDEN_MENU_FEATURE)
+        && context.getResources().getBoolean(R.bool.motorola_hidden_menu_enabled);
   }
 
   public static boolean shouldBlinkHdIconWhenConnectingCall(Context context) {
-    return ConfigProviderBindings.get(context)
+    return ConfigProviderComponent.get(context)
+            .getConfigProvider()
             .getBoolean(CONFIG_HD_CODEC_BLINKING_ICON_WHEN_CONNECTING_CALL_ENABLED, true)
         && isSupportingSprintHdCodec(context);
   }
 
   public static boolean shouldShowHdIconInNotification(Context context) {
-    return ConfigProviderBindings.get(context)
+    return ConfigProviderComponent.get(context)
+            .getConfigProvider()
             .getBoolean(CONFIG_HD_CODEC_SHOW_ICON_IN_NOTIFICATION_ENABLED, true)
         && isSupportingSprintHdCodec(context);
   }
 
   public static boolean shouldShowWifiIconInCallLog(Context context, int features) {
-    return ConfigProviderBindings.get(context)
+    return ConfigProviderComponent.get(context)
+            .getConfigProvider()
             .getBoolean(CONFIG_WIFI_CALL_SHOW_ICON_IN_CALL_LOG_ENABLED, true)
         && (features & Calls.FEATURES_WIFI) == Calls.FEATURES_WIFI
         && isSupportingSprintWifiCall(context);
   }
 
+  public static boolean shouldDisablePhoneNumberFormatting(Context context) {
+    if (disablePhoneNumberFormattingForTest != null) {
+      return disablePhoneNumberFormattingForTest;
+    }
+
+    return ConfigProviderComponent.get(context)
+            .getConfigProvider()
+            .getBoolean(CONFIG_DISABLE_PHONE_NUMBER_FORMATTING, true)
+        && context.getResources().getBoolean(R.bool.motorola_disable_phone_number_formatting);
+  }
+
   /**
    * Handle special char sequence entered in dialpad. This may launch special intent based on input.
    *
@@ -129,6 +153,11 @@
     return supportSprintWifiCall;
   }
 
+  @VisibleForTesting(otherwise = VisibleForTesting.NONE)
+  public static void setDisablePhoneNumberFormattingForTest(boolean disablePhoneNumberFormatting) {
+    disablePhoneNumberFormattingForTest = disablePhoneNumberFormatting;
+  }
+
   @VisibleForTesting
   public static void resetForTest() {
     hasCheckedSprintWifiCall = false;
diff --git a/java/com/android/dialer/oem/PhoneNumberUtilsAccessor.java b/java/com/android/dialer/oem/PhoneNumberUtilsAccessor.java
new file mode 100644
index 0000000..178a7b2
--- /dev/null
+++ b/java/com/android/dialer/oem/PhoneNumberUtilsAccessor.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.dialer.oem;
+
+import android.content.Context;
+import android.telephony.PhoneNumberUtils;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
+/** Provides access to hidden APIs in {@link android.telephony.PhoneNumberUtils}. */
+public final class PhoneNumberUtilsAccessor {
+
+  /**
+   * Checks if a given number is an emergency number for the country that the user is in.
+   *
+   * @param subId the subscription ID of the SIM
+   * @param number the number to check
+   * @param context the specific context which the number should be checked against
+   * @return true if the specified number is an emergency number for the country the user is
+   *     currently in.
+   */
+  public static boolean isLocalEmergencyNumber(Context context, int subId, String number) {
+    try {
+      Method method =
+          PhoneNumberUtils.class.getMethod(
+              "isLocalEmergencyNumber", Context.class, int.class, String.class);
+      return (boolean) method.invoke(null, context, subId, number);
+
+    } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException e) {
+      throw new RuntimeException(e);
+    }
+  }
+}
diff --git a/java/com/android/dialer/oem/TranssionUtils.java b/java/com/android/dialer/oem/TranssionUtils.java
new file mode 100644
index 0000000..a0d3f2d
--- /dev/null
+++ b/java/com/android/dialer/oem/TranssionUtils.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.dialer.oem;
+
+import android.content.Context;
+import android.os.Build;
+import android.support.annotation.VisibleForTesting;
+import com.android.dialer.common.Assert;
+import com.android.dialer.compat.telephony.TelephonyManagerCompat;
+import com.google.common.collect.ImmutableSet;
+
+/** Utilities for Transsion devices. */
+public final class TranssionUtils {
+
+  @VisibleForTesting
+  public static final ImmutableSet<String> TRANSSION_DEVICE_MANUFACTURERS =
+      ImmutableSet.of("INFINIX MOBILITY LIMITED", "itel", "TECNO");
+
+  @VisibleForTesting
+  public static final ImmutableSet<String> TRANSSION_SECRET_CODES =
+      ImmutableSet.of("*#07#", "*#87#", "*#43#", "*#2727#", "*#88#");
+
+  private TranssionUtils() {}
+
+  /**
+   * Returns true if
+   *
+   * <ul>
+   *   <li>the device is a Transsion device, AND
+   *   <li>the input is a secret code for Transsion devices.
+   * </ul>
+   */
+  public static boolean isTranssionSecretCode(String input) {
+    return TRANSSION_DEVICE_MANUFACTURERS.contains(Build.MANUFACTURER)
+        && TRANSSION_SECRET_CODES.contains(input);
+  }
+
+  /**
+   * Handle a Transsion secret code by passing it to {@link
+   * TelephonyManagerCompat#handleSecretCode(Context, String)}.
+   *
+   * <p>Before calling this method, we must use {@link #isTranssionSecretCode(String)} to ensure the
+   * device is a Transsion device and the input is a valid Transsion secret code.
+   *
+   * <p>An exception will be thrown if either of the conditions above is not met.
+   */
+  public static void handleTranssionSecretCode(Context context, String input) {
+    Assert.checkState(isTranssionSecretCode(input));
+
+    TelephonyManagerCompat.handleSecretCode(context, getDigitsFromSecretCode(input));
+  }
+
+  private static String getDigitsFromSecretCode(String input) {
+    // We assume a valid secret code is of format "*#{[0-9]+}#".
+    Assert.checkArgument(input.length() > 3 && input.startsWith("*#") && input.endsWith("#"));
+
+    return input.substring(2, input.length() - 1);
+  }
+}
diff --git a/java/com/android/dialer/oem/res/values-mcc310-mnc000/motorola_config.xml b/java/com/android/dialer/oem/res/values-mcc310-mnc000/motorola_config.xml
index ac33975..3b4d547 100644
--- a/java/com/android/dialer/oem/res/values-mcc310-mnc000/motorola_config.xml
+++ b/java/com/android/dialer/oem/res/values-mcc310-mnc000/motorola_config.xml
@@ -17,5 +17,9 @@
 
 <resources>
   <bool name="motorola_sprint_hd_codec">true</bool>
-  <string name="motorola_enabled_spn">Sprint</string>
+  <bool name="motorola_hidden_menu_enabled">true</bool>
+  <string-array name="motorola_enabled_spn">
+    <item>Sprint</item>
+    <item>moto</item>
+  </string-array>
 </resources>
\ No newline at end of file
diff --git a/java/com/android/dialer/oem/res/values-mcc310-mnc120/motorola_config.xml b/java/com/android/dialer/oem/res/values-mcc310-mnc120/motorola_config.xml
index 417a4b8..18c4c3f 100644
--- a/java/com/android/dialer/oem/res/values-mcc310-mnc120/motorola_config.xml
+++ b/java/com/android/dialer/oem/res/values-mcc310-mnc120/motorola_config.xml
@@ -17,60 +17,5 @@
 
 <resources>
   <bool name="motorola_sprint_hd_codec">true</bool>
-
-  <!-- Hidden menu configuration for Motorola. -->
-  <!-- This defines the specific key sequence that will be caught in the SpecialCharSequenceMgr
-       such as, ##OMADM# -->
-  <string-array name="motorola_hidden_menu_key_sequence">
-    <item>##66236#</item>   <!--##OMADM#-->
-    <item>##2539#</item>    <!--##AKEY#-->
-    <item>##786#</item>     <!--##RTN#-->
-    <item>##72786#</item>   <!--##SCRTN#-->
-    <item>##3282#</item>    <!--##DATA#-->
-    <item>##33284#</item>   <!--##DEBUG#-->
-    <item>##3424#</item>    <!--##DIAG#-->
-    <item>##564#</item>     <!--##LOG#-->
-    <item>##4567257#</item> <!--##GLMSCLR#-->
-    <item>##873283#</item>  <!--##UPDATE#-->
-    <item>##6343#</item>    <!--##MEID#-->
-    <item>##27263#</item>   <!--##BRAND#-->
-    <item>##258#</item>     <!--##BLV#-->
-    <item>##8422#</item>    <!--##UICC#-->
-    <item>##4382#</item>    <!--CMAS/WEA-->
-  </string-array>
-
-  <string name="motorola_hidden_menu_intent">com.motorola.intent.action.LAUNCH_HIDDEN_MENU</string>
-
-  <!-- This defines the intents that will be send out when the key sequence is matched, this must be
-       in the same order with he KeySequence array. -->
-  <string-array name="motorola_hidden_menu_key_sequence_intents">
-    <item>@string/motorola_hidden_menu_intent</item>
-    <item>@string/motorola_hidden_menu_intent</item>
-    <item>@string/motorola_hidden_menu_intent</item>
-    <item>@string/motorola_hidden_menu_intent</item>
-    <item>@string/motorola_hidden_menu_intent</item>
-    <item>@string/motorola_hidden_menu_intent</item>
-    <item>@string/motorola_hidden_menu_intent</item>
-    <item>@string/motorola_hidden_menu_intent</item>
-    <item>@string/motorola_hidden_menu_intent</item>
-    <item>com.motorola.android.intent.action.omadm.sprint.hfa</item>
-    <item>@string/motorola_hidden_menu_intent</item>
-    <item>@string/motorola_hidden_menu_intent</item>
-    <item>@string/motorola_hidden_menu_intent</item>
-    <item>@string/motorola_hidden_menu_intent</item>
-    <item>@string/motorola_hidden_menu_intent</item>
-  </string-array>
-
-  <!-- This defines the specific key patterns that will be caught in the SpecialCharSequenceMgr
-       such as, ##[0-9]{3,7}# -->
-  <string-array name="motorola_hidden_menu_key_pattern">
-    <!--##MSL#, here MSL is 6 digits SPC code, ##OTKSL#, OTKSL is also digits code -->
-    <item>##[0-9]{6}#</item>
-  </string-array>
-
-  <!-- This defines the intents that will be send out when the key sequence is matched, this must be
-     in the same order with he KeyPattern array. -->
-  <string-array name="motorola_hidden_menu_key_pattern_intents">
-    <item>@string/motorola_hidden_menu_intent</item>
-  </string-array>
+  <bool name="motorola_hidden_menu_enabled">true</bool>
 </resources>
\ No newline at end of file
diff --git a/java/com/android/dialer/oem/res/values-mcc310-mnc130/motorola_config.xml b/java/com/android/dialer/oem/res/values-mcc310-mnc130/motorola_config.xml
new file mode 100644
index 0000000..935627b
--- /dev/null
+++ b/java/com/android/dialer/oem/res/values-mcc310-mnc130/motorola_config.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2018 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+
+<resources>
+  <bool name="motorola_sprint_hd_codec">true</bool>
+  <bool name="motorola_hidden_menu_enabled">true</bool>
+</resources>
\ No newline at end of file
diff --git a/java/com/android/dialer/oem/res/values-mcc310-mnc470/motorola_config.xml b/java/com/android/dialer/oem/res/values-mcc310-mnc470/motorola_config.xml
new file mode 100644
index 0000000..935627b
--- /dev/null
+++ b/java/com/android/dialer/oem/res/values-mcc310-mnc470/motorola_config.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2018 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+
+<resources>
+  <bool name="motorola_sprint_hd_codec">true</bool>
+  <bool name="motorola_hidden_menu_enabled">true</bool>
+</resources>
\ No newline at end of file
diff --git a/java/com/android/dialer/oem/res/values-mcc310-mnc580/motorola_config.xml b/java/com/android/dialer/oem/res/values-mcc310-mnc580/motorola_config.xml
new file mode 100644
index 0000000..935627b
--- /dev/null
+++ b/java/com/android/dialer/oem/res/values-mcc310-mnc580/motorola_config.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2018 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+
+<resources>
+  <bool name="motorola_sprint_hd_codec">true</bool>
+  <bool name="motorola_hidden_menu_enabled">true</bool>
+</resources>
\ No newline at end of file
diff --git a/java/com/android/dialer/oem/res/values-mcc311-mnc230/motorola_config.xml b/java/com/android/dialer/oem/res/values-mcc311-mnc230/motorola_config.xml
new file mode 100644
index 0000000..935627b
--- /dev/null
+++ b/java/com/android/dialer/oem/res/values-mcc311-mnc230/motorola_config.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2018 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+
+<resources>
+  <bool name="motorola_sprint_hd_codec">true</bool>
+  <bool name="motorola_hidden_menu_enabled">true</bool>
+</resources>
\ No newline at end of file
diff --git a/java/com/android/dialer/oem/res/values-mcc311-mnc450/motorola_config.xml b/java/com/android/dialer/oem/res/values-mcc311-mnc450/motorola_config.xml
new file mode 100644
index 0000000..935627b
--- /dev/null
+++ b/java/com/android/dialer/oem/res/values-mcc311-mnc450/motorola_config.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2018 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+
+<resources>
+  <bool name="motorola_sprint_hd_codec">true</bool>
+  <bool name="motorola_hidden_menu_enabled">true</bool>
+</resources>
\ No newline at end of file
diff --git a/java/com/android/dialer/oem/res/values-mcc311-mnc490/motorola_config.xml b/java/com/android/dialer/oem/res/values-mcc311-mnc490/motorola_config.xml
index c5cb0d1..18c4c3f 100644
--- a/java/com/android/dialer/oem/res/values-mcc311-mnc490/motorola_config.xml
+++ b/java/com/android/dialer/oem/res/values-mcc311-mnc490/motorola_config.xml
@@ -17,4 +17,5 @@
 
 <resources>
   <bool name="motorola_sprint_hd_codec">true</bool>
+  <bool name="motorola_hidden_menu_enabled">true</bool>
 </resources>
\ No newline at end of file
diff --git a/java/com/android/dialer/oem/res/values-mcc311-mnc670/motorola_config.xml b/java/com/android/dialer/oem/res/values-mcc311-mnc670/motorola_config.xml
new file mode 100644
index 0000000..935627b
--- /dev/null
+++ b/java/com/android/dialer/oem/res/values-mcc311-mnc670/motorola_config.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2018 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+
+<resources>
+  <bool name="motorola_sprint_hd_codec">true</bool>
+  <bool name="motorola_hidden_menu_enabled">true</bool>
+</resources>
\ No newline at end of file
diff --git a/java/com/android/dialer/oem/res/values-mcc311-mnc870/motorola_config.xml b/java/com/android/dialer/oem/res/values-mcc311-mnc870/motorola_config.xml
index c5cb0d1..18c4c3f 100644
--- a/java/com/android/dialer/oem/res/values-mcc311-mnc870/motorola_config.xml
+++ b/java/com/android/dialer/oem/res/values-mcc311-mnc870/motorola_config.xml
@@ -17,4 +17,5 @@
 
 <resources>
   <bool name="motorola_sprint_hd_codec">true</bool>
+  <bool name="motorola_hidden_menu_enabled">true</bool>
 </resources>
\ No newline at end of file
diff --git a/java/com/android/dialer/oem/res/values-mcc311-mnc910/motorola_config.xml b/java/com/android/dialer/oem/res/values-mcc311-mnc910/motorola_config.xml
new file mode 100644
index 0000000..935627b
--- /dev/null
+++ b/java/com/android/dialer/oem/res/values-mcc311-mnc910/motorola_config.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2018 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+
+<resources>
+  <bool name="motorola_sprint_hd_codec">true</bool>
+  <bool name="motorola_hidden_menu_enabled">true</bool>
+</resources>
\ No newline at end of file
diff --git a/java/com/android/dialer/oem/res/values-mcc312-mnc420/motorola_config.xml b/java/com/android/dialer/oem/res/values-mcc312-mnc420/motorola_config.xml
new file mode 100644
index 0000000..935627b
--- /dev/null
+++ b/java/com/android/dialer/oem/res/values-mcc312-mnc420/motorola_config.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2018 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+
+<resources>
+  <bool name="motorola_sprint_hd_codec">true</bool>
+  <bool name="motorola_hidden_menu_enabled">true</bool>
+</resources>
\ No newline at end of file
diff --git a/java/com/android/dialer/oem/res/values-mcc312-mnc530/motorola_config.xml b/java/com/android/dialer/oem/res/values-mcc312-mnc530/motorola_config.xml
index c5cb0d1..18c4c3f 100644
--- a/java/com/android/dialer/oem/res/values-mcc312-mnc530/motorola_config.xml
+++ b/java/com/android/dialer/oem/res/values-mcc312-mnc530/motorola_config.xml
@@ -17,4 +17,5 @@
 
 <resources>
   <bool name="motorola_sprint_hd_codec">true</bool>
+  <bool name="motorola_hidden_menu_enabled">true</bool>
 </resources>
\ No newline at end of file
diff --git a/java/com/android/dialer/oem/res/values-mcc312-mnc570/motorola_config.xml b/java/com/android/dialer/oem/res/values-mcc312-mnc570/motorola_config.xml
new file mode 100644
index 0000000..935627b
--- /dev/null
+++ b/java/com/android/dialer/oem/res/values-mcc312-mnc570/motorola_config.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2018 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+
+<resources>
+  <bool name="motorola_sprint_hd_codec">true</bool>
+  <bool name="motorola_hidden_menu_enabled">true</bool>
+</resources>
\ No newline at end of file
diff --git a/java/com/android/dialer/oem/res/values-mcc312-mnc720/motorola_config.xml b/java/com/android/dialer/oem/res/values-mcc312-mnc720/motorola_config.xml
new file mode 100644
index 0000000..935627b
--- /dev/null
+++ b/java/com/android/dialer/oem/res/values-mcc312-mnc720/motorola_config.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2018 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+
+<resources>
+  <bool name="motorola_sprint_hd_codec">true</bool>
+  <bool name="motorola_hidden_menu_enabled">true</bool>
+</resources>
\ No newline at end of file
diff --git a/java/com/android/dialer/oem/res/values-mcc316-mnc010/motorola_config.xml b/java/com/android/dialer/oem/res/values-mcc316-mnc010/motorola_config.xml
index c5cb0d1..18c4c3f 100644
--- a/java/com/android/dialer/oem/res/values-mcc316-mnc010/motorola_config.xml
+++ b/java/com/android/dialer/oem/res/values-mcc316-mnc010/motorola_config.xml
@@ -17,4 +17,5 @@
 
 <resources>
   <bool name="motorola_sprint_hd_codec">true</bool>
+  <bool name="motorola_hidden_menu_enabled">true</bool>
 </resources>
\ No newline at end of file
diff --git a/java/com/android/dialer/oem/res/values-mcc722/motorola_config.xml b/java/com/android/dialer/oem/res/values-mcc722/motorola_config.xml
new file mode 100644
index 0000000..bfe0cb7
--- /dev/null
+++ b/java/com/android/dialer/oem/res/values-mcc722/motorola_config.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2018 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+
+<resources>
+  <!-- Flag to control whether to disable phone number formatting -->
+  <bool name="motorola_disable_phone_number_formatting">true</bool>
+</resources>
diff --git a/java/com/android/dialer/oem/res/values-mcc724/motorola_config.xml b/java/com/android/dialer/oem/res/values-mcc724/motorola_config.xml
new file mode 100644
index 0000000..bfe0cb7
--- /dev/null
+++ b/java/com/android/dialer/oem/res/values-mcc724/motorola_config.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2018 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+
+<resources>
+  <!-- Flag to control whether to disable phone number formatting -->
+  <bool name="motorola_disable_phone_number_formatting">true</bool>
+</resources>
diff --git a/java/com/android/dialer/oem/res/values/motorola_config.xml b/java/com/android/dialer/oem/res/values/motorola_config.xml
index fd9cee0..56bfb65 100644
--- a/java/com/android/dialer/oem/res/values/motorola_config.xml
+++ b/java/com/android/dialer/oem/res/values/motorola_config.xml
@@ -20,31 +20,70 @@
   <bool name="motorola_sprint_hd_codec">false</bool>
 
   <!-- Hidden menu configuration for Motorola. -->
+  <!-- Hidden menu is only enabled for sprint-->
+  <bool name="motorola_hidden_menu_enabled">false</bool>
   <!-- This defines the specific key sequence that will be caught in the SpecialCharSequenceMgr
        such as, ##OMADM# -->
   <string-array name="motorola_hidden_menu_key_sequence">
+    <item>##66236#</item>   <!--##OMADM#-->
+    <item>##2539#</item>    <!--##AKEY#-->
+    <item>##786#</item>     <!--##RTN#-->
+    <item>##72786#</item>   <!--##SCRTN#-->
+    <item>##3282#</item>    <!--##DATA#-->
+    <item>##33284#</item>   <!--##DEBUG#-->
+    <item>##3424#</item>    <!--##DIAG#-->
+    <item>##564#</item>     <!--##LOG#-->
+    <item>##4567257#</item> <!--##GLMSCLR#-->
+    <item>##873283#</item>  <!--##UPDATE#-->
+    <item>##6343#</item>    <!--##MEID#-->
+    <item>##27263#</item>   <!--##BRAND#-->
+    <item>##258#</item>     <!--##BLV#-->
+    <item>##8422#</item>    <!--##UICC#-->
+    <item>##4382#</item>    <!--CMAS/WEA-->
   </string-array>
 
-  <string name="motorola_hidden_menu_intent"></string>
+  <string name="motorola_hidden_menu_intent">com.motorola.intent.action.LAUNCH_HIDDEN_MENU</string>
 
   <!-- This defines the intents that will be send out when the key sequence is matched, this must be
        in the same order with he KeySequence array. -->
   <string-array name="motorola_hidden_menu_key_sequence_intents">
+    <item>@string/motorola_hidden_menu_intent</item>
+    <item>@string/motorola_hidden_menu_intent</item>
+    <item>@string/motorola_hidden_menu_intent</item>
+    <item>@string/motorola_hidden_menu_intent</item>
+    <item>@string/motorola_hidden_menu_intent</item>
+    <item>@string/motorola_hidden_menu_intent</item>
+    <item>@string/motorola_hidden_menu_intent</item>
+    <item>@string/motorola_hidden_menu_intent</item>
+    <item>@string/motorola_hidden_menu_intent</item>
+    <item>com.motorola.android.intent.action.omadm.sprint.hfa</item>
+    <item>@string/motorola_hidden_menu_intent</item>
+    <item>@string/motorola_hidden_menu_intent</item>
+    <item>@string/motorola_hidden_menu_intent</item>
+    <item>@string/motorola_hidden_menu_intent</item>
+    <item>@string/motorola_hidden_menu_intent</item>
   </string-array>
 
   <!-- This defines the specific key patterns that will be caught in the SpecialCharSequenceMgr
        such as, ##[0-9]{3,7}# -->
   <string-array name="motorola_hidden_menu_key_pattern">
+    <!--##MSL#, here MSL is 6 digits SPC code, ##OTKSL#, OTKSL is also digits code -->
+    <item>##[0-9]{6}#</item>
   </string-array>
 
   <!-- This defines the intents that will be send out when the key sequence is matched, this must be
-       in the same order with he KeyPattern array. -->
+     in the same order with he KeyPattern array. -->
   <string-array name="motorola_hidden_menu_key_pattern_intents">
+    <item>@string/motorola_hidden_menu_intent</item>
   </string-array>
 
   <!-- This defines the provider names for cequint callerid applications
        used for different carriers-->
   <string-array name="cequint_providers">
     <item>com.cequint.ecid</item>
+    <item>com.vzw.ecid</item>
   </string-array>
+
+  <!-- Flag to control whether to disable phone number formatting -->
+  <bool name="motorola_disable_phone_number_formatting">false</bool>
 </resources>
diff --git a/java/com/android/dialer/p13n/inference/P13nRanking.java b/java/com/android/dialer/p13n/inference/P13nRanking.java
deleted file mode 100644
index 79b4d71..0000000
--- a/java/com/android/dialer/p13n/inference/P13nRanking.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.dialer.p13n.inference;
-
-import android.content.Context;
-import android.database.Cursor;
-import android.support.annotation.MainThread;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import com.android.dialer.common.Assert;
-import com.android.dialer.configprovider.ConfigProviderBindings;
-import com.android.dialer.p13n.inference.protocol.P13nRanker;
-import com.android.dialer.p13n.inference.protocol.P13nRankerFactory;
-import java.util.List;
-
-/** Single entry point for all personalized ranking. */
-public final class P13nRanking {
-
-  private static P13nRanker ranker;
-
-  private P13nRanking() {}
-
-  @MainThread
-  @NonNull
-  public static P13nRanker get(@NonNull Context context) {
-    Assert.isNotNull(context);
-    Assert.isMainThread();
-
-    if (ranker != null) {
-      return ranker;
-    }
-
-    if (!ConfigProviderBindings.get(context).getBoolean("p13n_ranker_should_enable", false)) {
-      setToIdentityRanker();
-      return ranker;
-    }
-
-    Context application = context.getApplicationContext();
-    if (application instanceof P13nRankerFactory) {
-      ranker = ((P13nRankerFactory) application).newP13nRanker();
-    }
-
-    if (ranker == null) {
-      setToIdentityRanker();
-    }
-    return ranker;
-  }
-
-  private static void setToIdentityRanker() {
-    ranker =
-        new P13nRanker() {
-          @Override
-          public void refresh(@Nullable P13nRefreshCompleteListener listener) {}
-
-          @Override
-          public List<String> rankList(List<String> phoneNumbers) {
-            return phoneNumbers;
-          }
-
-          @NonNull
-          @Override
-          public Cursor rankCursor(@NonNull Cursor phoneQueryResults, int queryLength) {
-            return phoneQueryResults;
-          }
-
-          @Override
-          public boolean shouldShowEmptyListForNullQuery() {
-            return true;
-          }
-        };
-  }
-
-  public static void setForTesting(@NonNull P13nRanker ranker) {
-    P13nRanking.ranker = ranker;
-  }
-}
diff --git a/java/com/android/dialer/p13n/inference/protocol/P13nRanker.java b/java/com/android/dialer/p13n/inference/protocol/P13nRanker.java
deleted file mode 100644
index 41f1de4..0000000
--- a/java/com/android/dialer/p13n/inference/protocol/P13nRanker.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.android.dialer.p13n.inference.protocol;
-
-import android.database.Cursor;
-import android.support.annotation.MainThread;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import java.util.List;
-
-/** Provides personalized ranking of outgoing call targets. */
-public interface P13nRanker {
-
-  /**
-   * Re-orders a list of phone numbers according to likelihood they will be the next outgoing call.
-   *
-   * @param phoneNumbers the list of candidate numbers to call (may be in contacts list or not)
-   */
-  @NonNull
-  @MainThread
-  List<String> rankList(@NonNull List<String> phoneNumbers);
-
-  /**
-   * Re-orders a retrieved contact list according to likelihood they will be the next outgoing call.
-   *
-   * <p>A new cursor with reordered data is returned; the input cursor is unmodified except for its
-   * position. If the order is unchanged, this method may return a reference to the unmodified input
-   * cursor directly. The order would be unchanged if the ranking cache is not yet ready, or if the
-   * input cursor is closed or invalid, or if any other error occurs in the ranking process.
-   *
-   * @param phoneQueryResults cursor of results of a Dialer search query
-   * @param queryLength length of the search query that resulted in the cursor data, if below 0,
-   *     assumes no length is specified, thus applies the default behavior which is same as when
-   *     queryLength is greater than zero.
-   * @return new cursor of data reordered by ranking (or reference to input cursor if order
-   *     unchanged)
-   */
-  @NonNull
-  @MainThread
-  Cursor rankCursor(@NonNull Cursor phoneQueryResults, int queryLength);
-
-  /**
-   * Refreshes ranking cache (pulls fresh contextual features, pre-caches inference results, etc.).
-   *
-   * <p>Asynchronously runs in background as the process might take a few seconds, notifying a
-   * listener upon completion; meanwhile, any calls to {@link #rankList} will simply return the
-   * input in same order.
-   *
-   * @param listener callback for when ranking refresh has completed; null value skips notification.
-   */
-  @MainThread
-  void refresh(@Nullable P13nRefreshCompleteListener listener);
-
-  /** Decides if results should be displayed for no-query search. */
-  @MainThread
-  boolean shouldShowEmptyListForNullQuery();
-
-  /**
-   * Callback class for when ranking refresh has completed.
-   *
-   * <p>Primary use is to notify {@link com.android.dialer.app.DialtactsActivity} that the ranking
-   * functions {@link #rankList} and {@link #rankCursor(Cursor, int)} will now give useful results.
-   */
-  interface P13nRefreshCompleteListener {
-
-    /** Callback for when ranking refresh has completed. */
-    void onP13nRefreshComplete();
-  }
-}
diff --git a/java/com/android/dialer/p13n/inference/protocol/P13nRankerFactory.java b/java/com/android/dialer/p13n/inference/protocol/P13nRankerFactory.java
deleted file mode 100644
index 7038cf4..0000000
--- a/java/com/android/dialer/p13n/inference/protocol/P13nRankerFactory.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.android.dialer.p13n.inference.protocol;
-
-import android.support.annotation.Nullable;
-
-/**
- * This interface should be implemented by the Application subclass. It allows this module to get
- * references to the {@link P13nRanker}.
- */
-public interface P13nRankerFactory {
-  @Nullable
-  P13nRanker newP13nRanker();
-}
diff --git a/java/com/android/dialer/p13n/logging/P13nLogger.java b/java/com/android/dialer/p13n/logging/P13nLogger.java
deleted file mode 100644
index 069a293..0000000
--- a/java/com/android/dialer/p13n/logging/P13nLogger.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.android.dialer.p13n.logging;
-
-import com.android.contacts.common.list.PhoneNumberListAdapter;
-
-/** Allows logging of data for personalization. */
-public interface P13nLogger {
-
-  /**
-   * Logs a search query (text or digits) entered by user.
-   *
-   * @param query search text (or digits) entered by user
-   * @param adapter list adapter providing access to contacts matching search query
-   */
-  void onSearchQuery(String query, PhoneNumberListAdapter adapter);
-
-  /**
-   * Resets logging session (clears searches, re-initializes app entry timestamp, etc.) Should be
-   * called when Dialer app is resumed.
-   */
-  void reset();
-}
diff --git a/java/com/android/dialer/p13n/logging/P13nLoggerFactory.java b/java/com/android/dialer/p13n/logging/P13nLoggerFactory.java
deleted file mode 100644
index 7350e99..0000000
--- a/java/com/android/dialer/p13n/logging/P13nLoggerFactory.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.android.dialer.p13n.logging;
-
-import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-
-/**
- * This interface should be implemented by the Application subclass. It allows this module to get
- * references to the P13nLogger.
- */
-public interface P13nLoggerFactory {
-
-  @Nullable
-  P13nLogger newP13nLogger(@NonNull Context context);
-}
diff --git a/java/com/android/dialer/p13n/logging/P13nLogging.java b/java/com/android/dialer/p13n/logging/P13nLogging.java
deleted file mode 100644
index 21b9725..0000000
--- a/java/com/android/dialer/p13n/logging/P13nLogging.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.dialer.p13n.logging;
-
-import android.content.Context;
-import android.support.annotation.NonNull;
-import com.android.contacts.common.list.PhoneNumberListAdapter;
-import com.android.dialer.common.Assert;
-
-/** Single entry point for all logging for personalization. */
-public final class P13nLogging {
-
-  private static P13nLogger logger;
-
-  private P13nLogging() {}
-
-  @NonNull
-  public static P13nLogger get(@NonNull Context context) {
-    Assert.isNotNull(context);
-    Assert.isMainThread();
-    if (logger != null) {
-      return logger;
-    }
-
-    Context application = context.getApplicationContext();
-    if (application instanceof P13nLoggerFactory) {
-      logger = ((P13nLoggerFactory) application).newP13nLogger(context);
-    }
-
-    if (logger == null) {
-      logger =
-          new P13nLogger() {
-            @Override
-            public void onSearchQuery(String query, PhoneNumberListAdapter adapter) {}
-
-            @Override
-            public void reset() {}
-          };
-    }
-    return logger;
-  }
-
-  public static void setForTesting(@NonNull P13nLogger logger) {
-    P13nLogging.logger = logger;
-  }
-}
diff --git a/java/com/android/dialer/persistentlog/PersistentLogFileHandler.java b/java/com/android/dialer/persistentlog/PersistentLogFileHandler.java
index 8bd8335..5f39222 100644
--- a/java/com/android/dialer/persistentlog/PersistentLogFileHandler.java
+++ b/java/com/android/dialer/persistentlog/PersistentLogFileHandler.java
@@ -16,10 +16,8 @@
 
 package com.android.dialer.persistentlog;
 
-import android.annotation.TargetApi;
 import android.content.Context;
 import android.content.SharedPreferences;
-import android.os.Build.VERSION_CODES;
 import android.preference.PreferenceManager;
 import android.support.annotation.AnyThread;
 import android.support.annotation.MainThread;
@@ -52,8 +50,6 @@
  * <p>This class is NOT thread safe. All methods expect the constructor must be called on the same
  * worker thread.
  */
-@SuppressWarnings("AndroidApiChecker") // lambdas
-@TargetApi(VERSION_CODES.M)
 final class PersistentLogFileHandler {
 
   private static final String LOG_DIRECTORY = "persistent_log";
@@ -67,7 +63,7 @@
     public LogCorruptionException(String message) {
       super(message);
     }
-  };
+  }
 
   private File logDirectory;
   private final String subfolder;
diff --git a/java/com/android/dialer/phonelookup/PhoneLookup.java b/java/com/android/dialer/phonelookup/PhoneLookup.java
index a7974ad..1043ee7 100644
--- a/java/com/android/dialer/phonelookup/PhoneLookup.java
+++ b/java/com/android/dialer/phonelookup/PhoneLookup.java
@@ -18,10 +18,18 @@
 
 import android.content.Context;
 import android.support.annotation.MainThread;
+import android.telecom.Call;
 import com.android.dialer.DialerPhoneNumber;
+import com.android.dialer.common.concurrent.DialerExecutorComponent;
+import com.android.dialer.location.GeoUtil;
+import com.android.dialer.phonenumberproto.DialerPhoneNumberUtil;
+import com.android.dialer.telecom.TelecomCallUtil;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
+import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
+import com.google.common.util.concurrent.ListeningExecutorService;
+import com.google.common.util.concurrent.MoreExecutors;
 
 /**
  * Provides operations related to retrieving information about phone numbers.
@@ -33,11 +41,44 @@
 public interface PhoneLookup<T> {
 
   /**
+   * Returns a future containing a new info for the number associated with the provided call.
+   *
+   * <p>The returned message should contain populated data for the sub-message corresponding to this
+   * {@link PhoneLookup}. For example, the CP2 implementation returns a {@link
+   * PhoneLookupInfo.Cp2Info} sub-message.
+   *
+   * <p>The default implementation is for all {@link PhoneLookup} implementations that don't need
+   * info in the given call, i.e., it simply extracts the phone number from the call and delegates
+   * to {@link #lookup(DialerPhoneNumber)}.
+   *
+   * <p>However, for {@link PhoneLookup} implementations that need info in the call (such as one for
+   * CNAP), they should override this method.
+   */
+  default ListenableFuture<T> lookup(Context appContext, Call call) {
+    ListeningExecutorService backgroundExecutor =
+        DialerExecutorComponent.get(appContext).backgroundExecutor();
+
+    ListenableFuture<DialerPhoneNumber> numberFuture =
+        backgroundExecutor.submit(
+            () -> {
+              DialerPhoneNumberUtil dialerPhoneNumberUtil = new DialerPhoneNumberUtil();
+              return dialerPhoneNumberUtil.parse(
+                  TelecomCallUtil.getNumber(call), GeoUtil.getCurrentCountryIso(appContext));
+            });
+
+    return Futures.transformAsync(numberFuture, this::lookup, MoreExecutors.directExecutor());
+  }
+
+  /**
    * Returns a future containing a new info for the provided number.
    *
    * <p>The returned message should contain populated data for the sub-message corresponding to this
    * {@link PhoneLookup}. For example, the CP2 implementation returns a {@link
    * PhoneLookupInfo.Cp2Info} sub-message.
+   *
+   * <p>If the lookup can't be done without info in a {@link Call} (e.g., CNAP), this method is
+   * expected to return existing info saved during the most recent lookup for a call to/from the
+   * provided number ({@link #lookup(Context, Call)}).
    */
   ListenableFuture<T> lookup(DialerPhoneNumber dialerPhoneNumber);
 
@@ -84,5 +125,21 @@
   ListenableFuture<Void> onSuccessfulBulkUpdate();
 
   @MainThread
-  void registerContentObservers(Context appContext);
+  void registerContentObservers();
+
+  @MainThread
+  void unregisterContentObservers();
+
+  /**
+   * Clear any data written by this lookup. This is called when the new call log framework has been
+   * disabled (because for example there was a problem with it).
+   */
+  ListenableFuture<Void> clearData();
+
+  /**
+   * The name of this lookup for logging purposes. This is generally the same as the class name (but
+   * should not use methods from {@link Class} because the class names are generally obfuscated by
+   * Proguard.
+   */
+  String getLoggingName();
 }
diff --git a/java/com/android/dialer/phonelookup/PhoneLookupComponent.java b/java/com/android/dialer/phonelookup/PhoneLookupComponent.java
index 832587c..70743c8 100644
--- a/java/com/android/dialer/phonelookup/PhoneLookupComponent.java
+++ b/java/com/android/dialer/phonelookup/PhoneLookupComponent.java
@@ -17,6 +17,7 @@
 
 import android.content.Context;
 import com.android.dialer.inject.HasRootComponent;
+import com.android.dialer.inject.IncludeInDialerRoot;
 import com.android.dialer.phonelookup.composite.CompositePhoneLookup;
 import dagger.Subcomponent;
 
@@ -32,6 +33,7 @@
   }
 
   /** Used to refer to the root application component. */
+  @IncludeInDialerRoot
   public interface HasComponent {
     PhoneLookupComponent phoneLookupComponent();
   }
diff --git a/java/com/android/dialer/phonelookup/PhoneLookupModule.java b/java/com/android/dialer/phonelookup/PhoneLookupModule.java
index a4cc5c7..6d5ffd2 100644
--- a/java/com/android/dialer/phonelookup/PhoneLookupModule.java
+++ b/java/com/android/dialer/phonelookup/PhoneLookupModule.java
@@ -16,31 +16,40 @@
 
 package com.android.dialer.phonelookup;
 
-import com.android.dialer.phonelookup.blockednumber.DialerBlockedNumberPhoneLookup;
+import com.android.dialer.inject.DialerVariant;
+import com.android.dialer.inject.InstallIn;
 import com.android.dialer.phonelookup.blockednumber.SystemBlockedNumberPhoneLookup;
+import com.android.dialer.phonelookup.cequint.CequintPhoneLookup;
+import com.android.dialer.phonelookup.cnap.CnapPhoneLookup;
 import com.android.dialer.phonelookup.cp2.Cp2DefaultDirectoryPhoneLookup;
 import com.android.dialer.phonelookup.cp2.Cp2ExtendedDirectoryPhoneLookup;
+import com.android.dialer.phonelookup.emergency.EmergencyPhoneLookup;
 import com.android.dialer.phonelookup.spam.SpamPhoneLookup;
 import com.google.common.collect.ImmutableList;
 import dagger.Module;
 import dagger.Provides;
 
 /** Dagger module which binds the PhoneLookup implementation. */
+@InstallIn(variants = {DialerVariant.DIALER_TEST})
 @Module
 public abstract class PhoneLookupModule {
 
   @Provides
   @SuppressWarnings({"unchecked", "rawtype"})
   static ImmutableList<PhoneLookup> providePhoneLookupList(
+      CequintPhoneLookup cequintPhoneLookup,
+      CnapPhoneLookup cnapPhoneLookup,
       Cp2DefaultDirectoryPhoneLookup cp2DefaultDirectoryPhoneLookup,
       Cp2ExtendedDirectoryPhoneLookup cp2ExtendedDirectoryPhoneLookup,
-      DialerBlockedNumberPhoneLookup dialerBlockedNumberPhoneLookup,
+      EmergencyPhoneLookup emergencyPhoneLookup,
       SystemBlockedNumberPhoneLookup systemBlockedNumberPhoneLookup,
       SpamPhoneLookup spamPhoneLookup) {
     return ImmutableList.of(
+        cequintPhoneLookup,
+        cnapPhoneLookup,
         cp2DefaultDirectoryPhoneLookup,
         cp2ExtendedDirectoryPhoneLookup,
-        dialerBlockedNumberPhoneLookup,
+        emergencyPhoneLookup,
         systemBlockedNumberPhoneLookup,
         spamPhoneLookup);
   }
diff --git a/java/com/android/dialer/phonelookup/blockednumber/DialerBlockedNumberPhoneLookup.java b/java/com/android/dialer/phonelookup/blockednumber/DialerBlockedNumberPhoneLookup.java
deleted file mode 100644
index b6b02e1..0000000
--- a/java/com/android/dialer/phonelookup/blockednumber/DialerBlockedNumberPhoneLookup.java
+++ /dev/null
@@ -1,180 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.dialer.phonelookup.blockednumber;
-
-import android.content.Context;
-import android.database.Cursor;
-import android.support.annotation.WorkerThread;
-import android.util.ArraySet;
-import com.android.dialer.DialerPhoneNumber;
-import com.android.dialer.blocking.FilteredNumberCompat;
-import com.android.dialer.calllog.observer.MarkDirtyObserver;
-import com.android.dialer.common.Assert;
-import com.android.dialer.common.LogUtil;
-import com.android.dialer.common.concurrent.Annotations.BackgroundExecutor;
-import com.android.dialer.common.database.Selection;
-import com.android.dialer.database.FilteredNumberContract.FilteredNumber;
-import com.android.dialer.database.FilteredNumberContract.FilteredNumberColumns;
-import com.android.dialer.database.FilteredNumberContract.FilteredNumberTypes;
-import com.android.dialer.inject.ApplicationContext;
-import com.android.dialer.phonelookup.PhoneLookup;
-import com.android.dialer.phonelookup.PhoneLookupInfo;
-import com.android.dialer.phonelookup.PhoneLookupInfo.BlockedState;
-import com.android.dialer.phonelookup.PhoneLookupInfo.DialerBlockedNumberInfo;
-import com.android.dialer.phonenumberproto.PartitionedNumbers;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.util.concurrent.Futures;
-import com.google.common.util.concurrent.ListenableFuture;
-import com.google.common.util.concurrent.ListeningExecutorService;
-import java.util.Set;
-import javax.inject.Inject;
-
-/**
- * Lookup blocked numbers in the dialer internal database. This is used when the system database is
- * not yet available.
- */
-public final class DialerBlockedNumberPhoneLookup implements PhoneLookup<DialerBlockedNumberInfo> {
-
-  private final Context appContext;
-  private final ListeningExecutorService executorService;
-  private final MarkDirtyObserver markDirtyObserver;
-
-  @Inject
-  DialerBlockedNumberPhoneLookup(
-      @ApplicationContext Context appContext,
-      @BackgroundExecutor ListeningExecutorService executorService,
-      MarkDirtyObserver markDirtyObserver) {
-    this.appContext = appContext;
-    this.executorService = executorService;
-    this.markDirtyObserver = markDirtyObserver;
-  }
-
-  @Override
-  public ListenableFuture<DialerBlockedNumberInfo> lookup(DialerPhoneNumber dialerPhoneNumber) {
-    if (FilteredNumberCompat.useNewFiltering(appContext)) {
-      return Futures.immediateFuture(DialerBlockedNumberInfo.getDefaultInstance());
-    }
-    return executorService.submit(
-        () -> queryNumbers(ImmutableSet.of(dialerPhoneNumber)).get(dialerPhoneNumber));
-  }
-
-  @Override
-  public ListenableFuture<Boolean> isDirty(ImmutableSet<DialerPhoneNumber> phoneNumbers) {
-    // Dirty state is recorded with PhoneLookupDataSource.markDirtyAndNotify(), which will force
-    // rebuild with the CallLogFramework
-    return Futures.immediateFuture(false);
-  }
-
-  @Override
-  public ListenableFuture<ImmutableMap<DialerPhoneNumber, DialerBlockedNumberInfo>>
-      getMostRecentInfo(ImmutableMap<DialerPhoneNumber, DialerBlockedNumberInfo> existingInfoMap) {
-    if (FilteredNumberCompat.useNewFiltering(appContext)) {
-      return Futures.immediateFuture(existingInfoMap);
-    }
-    LogUtil.enterBlock("DialerBlockedNumberPhoneLookup.getMostRecentPhoneLookupInfo");
-    return executorService.submit(() -> queryNumbers(existingInfoMap.keySet()));
-  }
-
-  @Override
-  public void setSubMessage(
-      PhoneLookupInfo.Builder phoneLookupInfo, DialerBlockedNumberInfo subMessage) {
-    phoneLookupInfo.setDialerBlockedNumberInfo(subMessage);
-  }
-
-  @Override
-  public DialerBlockedNumberInfo getSubMessage(PhoneLookupInfo phoneLookupInfo) {
-    return phoneLookupInfo.getDialerBlockedNumberInfo();
-  }
-
-  @Override
-  public ListenableFuture<Void> onSuccessfulBulkUpdate() {
-    return Futures.immediateFuture(null);
-  }
-
-  @WorkerThread
-  private ImmutableMap<DialerPhoneNumber, DialerBlockedNumberInfo> queryNumbers(
-      ImmutableSet<DialerPhoneNumber> numbers) {
-    Assert.isWorkerThread();
-    PartitionedNumbers partitionedNumbers = new PartitionedNumbers(numbers);
-
-    Set<DialerPhoneNumber> blockedNumbers = new ArraySet<>();
-
-    Selection normalizedSelection =
-        Selection.column(FilteredNumberColumns.NORMALIZED_NUMBER)
-            .in(partitionedNumbers.validE164Numbers());
-    try (Cursor cursor =
-        appContext
-            .getContentResolver()
-            .query(
-                FilteredNumber.CONTENT_URI,
-                new String[] {FilteredNumberColumns.NORMALIZED_NUMBER, FilteredNumberColumns.TYPE},
-                normalizedSelection.getSelection(),
-                normalizedSelection.getSelectionArgs(),
-                null)) {
-      while (cursor != null && cursor.moveToNext()) {
-        if (cursor.getInt(1) == FilteredNumberTypes.BLOCKED_NUMBER) {
-          blockedNumbers.addAll(
-              partitionedNumbers.dialerPhoneNumbersForValidE164(cursor.getString(0)));
-        }
-      }
-    }
-
-    Selection rawSelection =
-        Selection.column(FilteredNumberColumns.NUMBER).in(partitionedNumbers.invalidNumbers());
-    try (Cursor cursor =
-        appContext
-            .getContentResolver()
-            .query(
-                FilteredNumber.CONTENT_URI,
-                new String[] {FilteredNumberColumns.NUMBER, FilteredNumberColumns.TYPE},
-                rawSelection.getSelection(),
-                rawSelection.getSelectionArgs(),
-                null)) {
-      while (cursor != null && cursor.moveToNext()) {
-        if (cursor.getInt(1) == FilteredNumberTypes.BLOCKED_NUMBER) {
-          blockedNumbers.addAll(
-              partitionedNumbers.dialerPhoneNumbersForInvalid(cursor.getString(0)));
-        }
-      }
-    }
-
-    ImmutableMap.Builder<DialerPhoneNumber, DialerBlockedNumberInfo> result =
-        ImmutableMap.builder();
-
-    for (DialerPhoneNumber number : numbers) {
-      result.put(
-          number,
-          DialerBlockedNumberInfo.newBuilder()
-              .setBlockedState(
-                  blockedNumbers.contains(number) ? BlockedState.BLOCKED : BlockedState.NOT_BLOCKED)
-              .build());
-    }
-
-    return result.build();
-  }
-
-  @Override
-  public void registerContentObservers(Context appContext) {
-    appContext
-        .getContentResolver()
-        .registerContentObserver(
-            FilteredNumber.CONTENT_URI,
-            true, // FilteredNumberProvider notifies on the item
-            markDirtyObserver);
-  }
-}
diff --git a/java/com/android/dialer/phonelookup/blockednumber/SystemBlockedNumberPhoneLookup.java b/java/com/android/dialer/phonelookup/blockednumber/SystemBlockedNumberPhoneLookup.java
index d791e9b..4192e79 100644
--- a/java/com/android/dialer/phonelookup/blockednumber/SystemBlockedNumberPhoneLookup.java
+++ b/java/com/android/dialer/phonelookup/blockednumber/SystemBlockedNumberPhoneLookup.java
@@ -16,11 +16,8 @@
 
 package com.android.dialer.phonelookup.blockednumber;
 
-import android.annotation.TargetApi;
 import android.content.Context;
 import android.database.Cursor;
-import android.os.Build.VERSION;
-import android.os.Build.VERSION_CODES;
 import android.provider.BlockedNumberContract.BlockedNumbers;
 import android.support.annotation.NonNull;
 import android.support.annotation.WorkerThread;
@@ -72,10 +69,7 @@
     if (!FilteredNumberCompat.useNewFiltering(appContext)) {
       return Futures.immediateFuture(SystemBlockedNumberInfo.getDefaultInstance());
     }
-    return executorService.submit(
-        () -> {
-          return queryNumbers(ImmutableSet.of(number)).get(number);
-        });
+    return executorService.submit(() -> queryNumbers(ImmutableSet.of(number)).get(number));
   }
 
   @Override
@@ -96,7 +90,6 @@
   }
 
   @WorkerThread
-  @TargetApi(VERSION_CODES.N)
   private ImmutableMap<DialerPhoneNumber, SystemBlockedNumberInfo> queryNumbers(
       ImmutableSet<DialerPhoneNumber> numbers) {
     Assert.isWorkerThread();
@@ -170,10 +163,7 @@
   }
 
   @Override
-  public void registerContentObservers(Context appContext) {
-    if (VERSION.SDK_INT < VERSION_CODES.N) {
-      return;
-    }
+  public void registerContentObservers() {
     appContext
         .getContentResolver()
         .registerContentObserver(
@@ -181,4 +171,19 @@
             true, // BlockedNumbers notifies on the item
             markDirtyObserver);
   }
+
+  @Override
+  public void unregisterContentObservers() {
+    appContext.getContentResolver().unregisterContentObserver(markDirtyObserver);
+  }
+
+  @Override
+  public ListenableFuture<Void> clearData() {
+    return Futures.immediateFuture(null);
+  }
+
+  @Override
+  public String getLoggingName() {
+    return "SystemBlockedNumberPhoneLookup";
+  }
 }
diff --git a/java/com/android/dialer/phonelookup/cequint/CequintPhoneLookup.java b/java/com/android/dialer/phonelookup/cequint/CequintPhoneLookup.java
new file mode 100644
index 0000000..b045d03
--- /dev/null
+++ b/java/com/android/dialer/phonelookup/cequint/CequintPhoneLookup.java
@@ -0,0 +1,169 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.dialer.phonelookup.cequint;
+
+import android.content.Context;
+import android.telecom.Call;
+import android.text.TextUtils;
+import com.android.dialer.DialerPhoneNumber;
+import com.android.dialer.common.Assert;
+import com.android.dialer.common.concurrent.Annotations.BackgroundExecutor;
+import com.android.dialer.common.concurrent.Annotations.LightweightExecutor;
+import com.android.dialer.inject.ApplicationContext;
+import com.android.dialer.location.GeoUtil;
+import com.android.dialer.oem.CequintCallerIdManager;
+import com.android.dialer.oem.CequintCallerIdManager.CequintCallerIdContact;
+import com.android.dialer.phonelookup.PhoneLookup;
+import com.android.dialer.phonelookup.PhoneLookupInfo;
+import com.android.dialer.phonelookup.PhoneLookupInfo.CequintInfo;
+import com.android.dialer.phonenumberproto.DialerPhoneNumberUtil;
+import com.android.dialer.telecom.TelecomCallUtil;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.ListenableFuture;
+import com.google.common.util.concurrent.ListeningExecutorService;
+import javax.inject.Inject;
+
+/** PhoneLookup implementation for Cequint. */
+public class CequintPhoneLookup implements PhoneLookup<CequintInfo> {
+
+  private final Context appContext;
+  private final ListeningExecutorService backgroundExecutorService;
+  private final ListeningExecutorService lightweightExecutorService;
+
+  @Inject
+  CequintPhoneLookup(
+      @ApplicationContext Context appContext,
+      @BackgroundExecutor ListeningExecutorService backgroundExecutorService,
+      @LightweightExecutor ListeningExecutorService lightweightExecutorService) {
+    this.appContext = appContext;
+    this.backgroundExecutorService = backgroundExecutorService;
+    this.lightweightExecutorService = lightweightExecutorService;
+  }
+
+  @Override
+  public ListenableFuture<CequintInfo> lookup(Context appContext, Call call) {
+    if (!CequintCallerIdManager.isCequintCallerIdEnabled(appContext)) {
+      return Futures.immediateFuture(CequintInfo.getDefaultInstance());
+    }
+
+    ListenableFuture<DialerPhoneNumber> dialerPhoneNumberFuture =
+        backgroundExecutorService.submit(
+            () -> {
+              DialerPhoneNumberUtil dialerPhoneNumberUtil = new DialerPhoneNumberUtil();
+              return dialerPhoneNumberUtil.parse(
+                  TelecomCallUtil.getNumber(call), GeoUtil.getCurrentCountryIso(appContext));
+            });
+    String callerDisplayName = call.getDetails().getCallerDisplayName();
+    boolean isIncomingCall = (call.getState() == Call.STATE_RINGING);
+
+    return Futures.transformAsync(
+        dialerPhoneNumberFuture,
+        dialerPhoneNumber ->
+            backgroundExecutorService.submit(
+                () ->
+                    buildCequintInfo(
+                        CequintCallerIdManager.getCequintCallerIdContactForCall(
+                            appContext,
+                            Assert.isNotNull(dialerPhoneNumber).getNormalizedNumber(),
+                            callerDisplayName,
+                            isIncomingCall))),
+        lightweightExecutorService);
+  }
+
+  @Override
+  public ListenableFuture<CequintInfo> lookup(DialerPhoneNumber dialerPhoneNumber) {
+    if (!CequintCallerIdManager.isCequintCallerIdEnabled(appContext)) {
+      return Futures.immediateFuture(CequintInfo.getDefaultInstance());
+    }
+
+    return backgroundExecutorService.submit(
+        () ->
+            buildCequintInfo(
+                CequintCallerIdManager.getCequintCallerIdContactForNumber(
+                    appContext, dialerPhoneNumber.getNormalizedNumber())));
+  }
+
+  @Override
+  public ListenableFuture<Boolean> isDirty(ImmutableSet<DialerPhoneNumber> phoneNumbers) {
+    return Futures.immediateFuture(false);
+  }
+
+  @Override
+  public ListenableFuture<ImmutableMap<DialerPhoneNumber, CequintInfo>> getMostRecentInfo(
+      ImmutableMap<DialerPhoneNumber, CequintInfo> existingInfoMap) {
+    return Futures.immediateFuture(existingInfoMap);
+  }
+
+  @Override
+  public void setSubMessage(PhoneLookupInfo.Builder destination, CequintInfo subMessage) {
+    destination.setCequintInfo(subMessage);
+  }
+
+  @Override
+  public CequintInfo getSubMessage(PhoneLookupInfo phoneLookupInfo) {
+    return phoneLookupInfo.getCequintInfo();
+  }
+
+  @Override
+  public ListenableFuture<Void> onSuccessfulBulkUpdate() {
+    return Futures.immediateFuture(null);
+  }
+
+  @Override
+  public void registerContentObservers() {
+    // No need to register a content observer as the Cequint content provider doesn't support batch
+    // queries.
+  }
+
+  @Override
+  public void unregisterContentObservers() {
+    // Nothing to be done as no content observer is registered.
+  }
+
+  @Override
+  public ListenableFuture<Void> clearData() {
+    return Futures.immediateFuture(null);
+  }
+
+  @Override
+  public String getLoggingName() {
+    return "CequintPhoneLookup";
+  }
+
+  /**
+   * Builds a {@link CequintInfo} proto based on the given {@link CequintCallerIdContact} returned
+   * by {@link CequintCallerIdManager}.
+   */
+  private static CequintInfo buildCequintInfo(CequintCallerIdContact cequintCallerIdContact) {
+    CequintInfo.Builder cequintInfoBuilder = CequintInfo.newBuilder();
+
+    // Every field in CequintCallerIdContact can be null.
+    if (!TextUtils.isEmpty(cequintCallerIdContact.name())) {
+      cequintInfoBuilder.setName(cequintCallerIdContact.name());
+    }
+    if (!TextUtils.isEmpty(cequintCallerIdContact.geolocation())) {
+      cequintInfoBuilder.setGeolocation(cequintCallerIdContact.geolocation());
+    }
+    if (!TextUtils.isEmpty(cequintCallerIdContact.photoUri())) {
+      cequintInfoBuilder.setPhotoUri(cequintCallerIdContact.photoUri());
+    }
+
+    return cequintInfoBuilder.build();
+  }
+}
diff --git a/java/com/android/dialer/phonelookup/cnap/CnapPhoneLookup.java b/java/com/android/dialer/phonelookup/cnap/CnapPhoneLookup.java
new file mode 100644
index 0000000..1b78a8e
--- /dev/null
+++ b/java/com/android/dialer/phonelookup/cnap/CnapPhoneLookup.java
@@ -0,0 +1,165 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.dialer.phonelookup.cnap;
+
+import android.content.Context;
+import android.database.Cursor;
+import android.telecom.Call;
+import android.text.TextUtils;
+import com.android.dialer.DialerPhoneNumber;
+import com.android.dialer.common.Assert;
+import com.android.dialer.common.LogUtil;
+import com.android.dialer.common.concurrent.Annotations.BackgroundExecutor;
+import com.android.dialer.common.database.Selection;
+import com.android.dialer.inject.ApplicationContext;
+import com.android.dialer.phonelookup.PhoneLookup;
+import com.android.dialer.phonelookup.PhoneLookupInfo;
+import com.android.dialer.phonelookup.PhoneLookupInfo.CnapInfo;
+import com.android.dialer.phonelookup.database.contract.PhoneLookupHistoryContract.PhoneLookupHistory;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.ListenableFuture;
+import com.google.common.util.concurrent.ListeningExecutorService;
+import com.google.protobuf.InvalidProtocolBufferException;
+import javax.inject.Inject;
+
+/** PhoneLookup implementation for CNAP info. */
+public final class CnapPhoneLookup implements PhoneLookup<CnapInfo> {
+
+  private final Context appContext;
+  private final ListeningExecutorService backgroundExecutorService;
+
+  @Inject
+  CnapPhoneLookup(
+      @ApplicationContext Context appContext,
+      @BackgroundExecutor ListeningExecutorService backgroundExecutorService) {
+    this.appContext = appContext;
+    this.backgroundExecutorService = backgroundExecutorService;
+  }
+
+  /**
+   * Override the default implementation in {@link PhoneLookup#lookup(Context, Call)} as CNAP info
+   * is in the provided {@link Call}.
+   */
+  @Override
+  public ListenableFuture<CnapInfo> lookup(Context appContext, Call call) {
+    String callerDisplayName = call.getDetails().getCallerDisplayName();
+    return Futures.immediateFuture(
+        TextUtils.isEmpty(callerDisplayName)
+            ? CnapInfo.getDefaultInstance()
+            : CnapInfo.newBuilder().setName(callerDisplayName).build());
+  }
+
+  /**
+   * CNAP info cannot be retrieved when all we have is a number. The best we can do is returning the
+   * existing info in {@link PhoneLookupHistory}.
+   */
+  @Override
+  public ListenableFuture<CnapInfo> lookup(DialerPhoneNumber dialerPhoneNumber) {
+    return backgroundExecutorService.submit(
+        () -> {
+          Selection selection =
+              Selection.builder()
+                  .and(
+                      Selection.column(PhoneLookupHistory.NORMALIZED_NUMBER)
+                          .is("=", dialerPhoneNumber.getNormalizedNumber()))
+                  .build();
+
+          try (Cursor cursor =
+              appContext
+                  .getContentResolver()
+                  .query(
+                      PhoneLookupHistory.CONTENT_URI,
+                      new String[] {PhoneLookupHistory.PHONE_LOOKUP_INFO},
+                      selection.getSelection(),
+                      selection.getSelectionArgs(),
+                      /* sortOrder = */ null)) {
+            if (cursor == null) {
+              LogUtil.e("CnapPhoneLookup.lookup", "null cursor");
+              return CnapInfo.getDefaultInstance();
+            }
+
+            if (!cursor.moveToFirst()) {
+              LogUtil.i("CnapPhoneLookup.lookup", "empty cursor");
+              return CnapInfo.getDefaultInstance();
+            }
+
+            // At ths point, we expect only one row in the cursor as
+            // PhoneLookupHistory.NORMALIZED_NUMBER is the primary key of table PhoneLookupHistory.
+            Assert.checkState(cursor.getCount() == 1);
+
+            int phoneLookupInfoColumn =
+                cursor.getColumnIndexOrThrow(PhoneLookupHistory.PHONE_LOOKUP_INFO);
+            PhoneLookupInfo phoneLookupInfo;
+            try {
+              phoneLookupInfo = PhoneLookupInfo.parseFrom(cursor.getBlob(phoneLookupInfoColumn));
+            } catch (InvalidProtocolBufferException e) {
+              throw new IllegalStateException(e);
+            }
+
+            return phoneLookupInfo.getCnapInfo();
+          }
+        });
+  }
+
+  @Override
+  public ListenableFuture<Boolean> isDirty(ImmutableSet<DialerPhoneNumber> phoneNumbers) {
+    return Futures.immediateFuture(false);
+  }
+
+  @Override
+  public ListenableFuture<ImmutableMap<DialerPhoneNumber, CnapInfo>> getMostRecentInfo(
+      ImmutableMap<DialerPhoneNumber, CnapInfo> existingInfoMap) {
+    return Futures.immediateFuture(existingInfoMap);
+  }
+
+  @Override
+  public void setSubMessage(PhoneLookupInfo.Builder destination, CnapInfo subMessage) {
+    destination.setCnapInfo(subMessage);
+  }
+
+  @Override
+  public CnapInfo getSubMessage(PhoneLookupInfo phoneLookupInfo) {
+    return phoneLookupInfo.getCnapInfo();
+  }
+
+  @Override
+  public ListenableFuture<Void> onSuccessfulBulkUpdate() {
+    return Futures.immediateFuture(null);
+  }
+
+  @Override
+  public void registerContentObservers() {
+    // No content observers for CNAP info.
+  }
+
+  @Override
+  public void unregisterContentObservers() {
+    // No content observers for CNAP info.
+  }
+
+  @Override
+  public ListenableFuture<Void> clearData() {
+    return Futures.immediateFuture(null);
+  }
+
+  @Override
+  public String getLoggingName() {
+    return "CnapPhoneLookup";
+  }
+}
diff --git a/java/com/android/dialer/phonelookup/composite/CompositePhoneLookup.java b/java/com/android/dialer/phonelookup/composite/CompositePhoneLookup.java
index 0d84a2e..8322329 100644
--- a/java/com/android/dialer/phonelookup/composite/CompositePhoneLookup.java
+++ b/java/com/android/dialer/phonelookup/composite/CompositePhoneLookup.java
@@ -19,11 +19,13 @@
 import android.content.Context;
 import android.support.annotation.MainThread;
 import android.support.annotation.VisibleForTesting;
+import android.telecom.Call;
 import com.android.dialer.DialerPhoneNumber;
 import com.android.dialer.calllog.CallLogState;
 import com.android.dialer.common.LogUtil;
 import com.android.dialer.common.concurrent.Annotations.LightweightExecutor;
 import com.android.dialer.common.concurrent.DialerFutures;
+import com.android.dialer.inject.ApplicationContext;
 import com.android.dialer.metrics.FutureTimer;
 import com.android.dialer.metrics.FutureTimer.LogCatMode;
 import com.android.dialer.metrics.Metrics;
@@ -52,6 +54,7 @@
  */
 public final class CompositePhoneLookup {
 
+  private final Context appContext;
   private final ImmutableList<PhoneLookup> phoneLookups;
   private final FutureTimer futureTimer;
   private final CallLogState callLogState;
@@ -60,10 +63,12 @@
   @VisibleForTesting
   @Inject
   public CompositePhoneLookup(
+      @ApplicationContext Context appContext,
       ImmutableList<PhoneLookup> phoneLookups,
       FutureTimer futureTimer,
       CallLogState callLogState,
       @LightweightExecutor ListeningExecutorService lightweightExecutorService) {
+    this.appContext = appContext;
     this.phoneLookups = phoneLookups;
     this.futureTimer = futureTimer;
     this.callLogState = callLogState;
@@ -71,12 +76,36 @@
   }
 
   /**
-   * Delegates to a set of dependent lookups to build a complete {@link PhoneLookupInfo}.
+   * Delegates to a set of dependent lookups to build a complete {@link PhoneLookupInfo} for the
+   * number associated with the provided call.
    *
    * <p>Note: If any of the dependent lookups fails, the returned future will also fail. If any of
    * the dependent lookups does not complete, the returned future will also not complete.
    */
-  @SuppressWarnings({"unchecked", "rawtype"})
+  public ListenableFuture<PhoneLookupInfo> lookup(Call call) {
+    // TODO(zachh): Add short-circuiting logic so that this call is not blocked on low-priority
+    // lookups finishing when a higher-priority one has already finished.
+    List<ListenableFuture<?>> futures = new ArrayList<>();
+    for (PhoneLookup<?> phoneLookup : phoneLookups) {
+      ListenableFuture<?> lookupFuture = phoneLookup.lookup(appContext, call);
+      String eventName =
+          String.format(Metrics.LOOKUP_FOR_CALL_TEMPLATE, phoneLookup.getLoggingName());
+      futureTimer.applyTiming(lookupFuture, eventName);
+      futures.add(lookupFuture);
+    }
+    ListenableFuture<PhoneLookupInfo> combinedFuture = combineSubMessageFutures(futures);
+    String eventName = String.format(Metrics.LOOKUP_FOR_CALL_TEMPLATE, getLoggingName());
+    futureTimer.applyTiming(combinedFuture, eventName);
+    return combinedFuture;
+  }
+
+  /**
+   * Delegates to a set of dependent lookups to build a complete {@link PhoneLookupInfo} for the
+   * provided number.
+   *
+   * <p>Note: If any of the dependent lookups fails, the returned future will also fail. If any of
+   * the dependent lookups does not complete, the returned future will also not complete.
+   */
   public ListenableFuture<PhoneLookupInfo> lookup(DialerPhoneNumber dialerPhoneNumber) {
     // TODO(zachh): Add short-circuiting logic so that this call is not blocked on low-priority
     // lookups finishing when a higher-priority one has already finished.
@@ -84,28 +113,34 @@
     for (PhoneLookup<?> phoneLookup : phoneLookups) {
       ListenableFuture<?> lookupFuture = phoneLookup.lookup(dialerPhoneNumber);
       String eventName =
-          String.format(Metrics.LOOKUP_TEMPLATE, phoneLookup.getClass().getSimpleName());
+          String.format(Metrics.LOOKUP_FOR_NUMBER_TEMPLATE, phoneLookup.getLoggingName());
       futureTimer.applyTiming(lookupFuture, eventName);
       futures.add(lookupFuture);
     }
-    ListenableFuture<PhoneLookupInfo> combinedFuture =
-        Futures.transform(
-            Futures.allAsList(futures),
-            infos -> {
-              Builder mergedInfo = PhoneLookupInfo.newBuilder();
-              for (int i = 0; i < infos.size(); i++) {
-                PhoneLookup phoneLookup = phoneLookups.get(i);
-                phoneLookup.setSubMessage(mergedInfo, infos.get(i));
-              }
-              return mergedInfo.build();
-            },
-            lightweightExecutorService);
-    String eventName =
-        String.format(Metrics.LOOKUP_TEMPLATE, CompositePhoneLookup.class.getSimpleName());
+    ListenableFuture<PhoneLookupInfo> combinedFuture = combineSubMessageFutures(futures);
+    String eventName = String.format(Metrics.LOOKUP_FOR_NUMBER_TEMPLATE, getLoggingName());
     futureTimer.applyTiming(combinedFuture, eventName);
     return combinedFuture;
   }
 
+  /** Combines a list of sub-message futures into a future for {@link PhoneLookupInfo}. */
+  @SuppressWarnings({"unchecked", "rawtype"})
+  private ListenableFuture<PhoneLookupInfo> combineSubMessageFutures(
+      List<ListenableFuture<?>> subMessageFutures) {
+    return Futures.transform(
+        Futures.allAsList(subMessageFutures),
+        subMessages -> {
+          Preconditions.checkNotNull(subMessages);
+          Builder mergedInfo = PhoneLookupInfo.newBuilder();
+          for (int i = 0; i < subMessages.size(); i++) {
+            PhoneLookup phoneLookup = phoneLookups.get(i);
+            phoneLookup.setSubMessage(mergedInfo, subMessages.get(i));
+          }
+          return mergedInfo.build();
+        },
+        lightweightExecutorService);
+  }
+
   /**
    * Delegates to sub-lookups' {@link PhoneLookup#isDirty(ImmutableSet)} completing when the first
    * sub-lookup which returns true completes.
@@ -115,16 +150,14 @@
     for (PhoneLookup<?> phoneLookup : phoneLookups) {
       ListenableFuture<Boolean> isDirtyFuture = phoneLookup.isDirty(phoneNumbers);
       futures.add(isDirtyFuture);
-      String eventName =
-          String.format(Metrics.IS_DIRTY_TEMPLATE, phoneLookup.getClass().getSimpleName());
+      String eventName = String.format(Metrics.IS_DIRTY_TEMPLATE, phoneLookup.getLoggingName());
       futureTimer.applyTiming(isDirtyFuture, eventName, LogCatMode.LOG_VALUES);
     }
     // Executes all child lookups (possibly in parallel), completing when the first composite lookup
     // which returns "true" completes, and cancels the others.
     ListenableFuture<Boolean> firstMatching =
         DialerFutures.firstMatching(futures, Preconditions::checkNotNull, false /* defaultValue */);
-    String eventName =
-        String.format(Metrics.IS_DIRTY_TEMPLATE, CompositePhoneLookup.class.getSimpleName());
+    String eventName = String.format(Metrics.IS_DIRTY_TEMPLATE, getLoggingName());
     futureTimer.applyTiming(firstMatching, eventName, LogCatMode.LOG_VALUES);
     return firstMatching;
   }
@@ -141,6 +174,7 @@
     return Futures.transformAsync(
         callLogState.isBuilt(),
         isBuilt -> {
+          Preconditions.checkNotNull(isBuilt);
           List<ListenableFuture<ImmutableMap<DialerPhoneNumber, ?>>> futures = new ArrayList<>();
           for (PhoneLookup phoneLookup : phoneLookups) {
             futures.add(buildSubmapAndGetMostRecentInfo(existingInfoMap, phoneLookup, isBuilt));
@@ -149,6 +183,7 @@
               Futures.transform(
                   Futures.allAsList(futures),
                   (allMaps) -> {
+                    Preconditions.checkNotNull(allMaps);
                     ImmutableMap.Builder<DialerPhoneNumber, PhoneLookupInfo> combinedMap =
                         ImmutableMap.builder();
                     for (DialerPhoneNumber dialerPhoneNumber : existingInfoMap.keySet()) {
@@ -169,7 +204,7 @@
                     return combinedMap.build();
                   },
                   lightweightExecutorService);
-          String eventName = getMostRecentInfoEventName(this, isBuilt);
+          String eventName = getMostRecentInfoEventName(getLoggingName(), isBuilt);
           futureTimer.applyTiming(combinedFuture, eventName);
           return combinedFuture;
         },
@@ -187,7 +222,7 @@
                 phoneLookup.getSubMessage(existingInfoMap.get(dialerPhoneNumber)));
     ListenableFuture<ImmutableMap<DialerPhoneNumber, T>> mostRecentInfoFuture =
         phoneLookup.getMostRecentInfo(ImmutableMap.copyOf(submap));
-    String eventName = getMostRecentInfoEventName(phoneLookup, isBuilt);
+    String eventName = getMostRecentInfoEventName(phoneLookup.getLoggingName(), isBuilt);
     futureTimer.applyTiming(mostRecentInfoFuture, eventName);
     return mostRecentInfoFuture;
   }
@@ -197,44 +232,69 @@
     return Futures.transformAsync(
         callLogState.isBuilt(),
         isBuilt -> {
+          Preconditions.checkNotNull(isBuilt);
           List<ListenableFuture<Void>> futures = new ArrayList<>();
           for (PhoneLookup<?> phoneLookup : phoneLookups) {
             ListenableFuture<Void> phoneLookupFuture = phoneLookup.onSuccessfulBulkUpdate();
             futures.add(phoneLookupFuture);
-            String eventName = onSuccessfulBulkUpdatedEventName(phoneLookup, isBuilt);
+            String eventName =
+                onSuccessfulBulkUpdatedEventName(phoneLookup.getLoggingName(), isBuilt);
             futureTimer.applyTiming(phoneLookupFuture, eventName);
           }
           ListenableFuture<Void> combinedFuture =
               Futures.transform(
                   Futures.allAsList(futures), unused -> null, lightweightExecutorService);
-          String eventName = onSuccessfulBulkUpdatedEventName(this, isBuilt);
+          String eventName = onSuccessfulBulkUpdatedEventName(getLoggingName(), isBuilt);
           futureTimer.applyTiming(combinedFuture, eventName);
           return combinedFuture;
         },
         MoreExecutors.directExecutor());
   }
 
-  /** Delegates to sub-lookups' {@link PhoneLookup#registerContentObservers(Context)}. */
+  /** Delegates to sub-lookups' {@link PhoneLookup#registerContentObservers()}. */
   @MainThread
-  public void registerContentObservers(Context appContext) {
+  public void registerContentObservers() {
     for (PhoneLookup phoneLookup : phoneLookups) {
-      phoneLookup.registerContentObservers(appContext);
+      phoneLookup.registerContentObservers();
     }
   }
 
-  private static String getMostRecentInfoEventName(Object classNameSource, boolean isBuilt) {
+  /** Delegates to sub-lookups' {@link PhoneLookup#unregisterContentObservers()}. */
+  @MainThread
+  public void unregisterContentObservers() {
+    for (PhoneLookup phoneLookup : phoneLookups) {
+      phoneLookup.unregisterContentObservers();
+    }
+  }
+
+  /** Delegates to sub-lookups' {@link PhoneLookup#clearData()}. */
+  public ListenableFuture<Void> clearData() {
+    List<ListenableFuture<Void>> futures = new ArrayList<>();
+    for (PhoneLookup<?> phoneLookup : phoneLookups) {
+      ListenableFuture<Void> phoneLookupFuture = phoneLookup.clearData();
+      futures.add(phoneLookupFuture);
+    }
+    return Futures.transform(
+        Futures.allAsList(futures), unused -> null, lightweightExecutorService);
+  }
+
+  private static String getMostRecentInfoEventName(String loggingName, boolean isBuilt) {
     return String.format(
         !isBuilt
             ? Metrics.INITIAL_GET_MOST_RECENT_INFO_TEMPLATE
             : Metrics.GET_MOST_RECENT_INFO_TEMPLATE,
-        classNameSource.getClass().getSimpleName());
+        loggingName);
   }
 
-  private static String onSuccessfulBulkUpdatedEventName(Object classNameSource, boolean isBuilt) {
+  private static String onSuccessfulBulkUpdatedEventName(String loggingName, boolean isBuilt) {
     return String.format(
         !isBuilt
             ? Metrics.INITIAL_ON_SUCCESSFUL_BULK_UPDATE_TEMPLATE
             : Metrics.ON_SUCCESSFUL_BULK_UPDATE_TEMPLATE,
-        classNameSource.getClass().getSimpleName());
+        loggingName);
+  }
+
+  private String getLoggingName() {
+    return "CompositePhoneLookup";
   }
 }
diff --git a/java/com/android/dialer/phonelookup/consolidator/PhoneLookupInfoConsolidator.java b/java/com/android/dialer/phonelookup/consolidator/PhoneLookupInfoConsolidator.java
index 6e86756..efd7ae6 100644
--- a/java/com/android/dialer/phonelookup/consolidator/PhoneLookupInfoConsolidator.java
+++ b/java/com/android/dialer/phonelookup/consolidator/PhoneLookupInfoConsolidator.java
@@ -45,13 +45,19 @@
     NameSource.NONE,
     NameSource.CP2_DEFAULT_DIRECTORY,
     NameSource.CP2_EXTENDED_DIRECTORY,
-    NameSource.PEOPLE_API
+    NameSource.PEOPLE_API,
+    NameSource.CEQUINT,
+    NameSource.CNAP,
+    NameSource.PHONE_NUMBER_CACHE
   })
   @interface NameSource {
     int NONE = 0; // used when none of the other sources can provide the name
     int CP2_DEFAULT_DIRECTORY = 1;
     int CP2_EXTENDED_DIRECTORY = 2;
     int PEOPLE_API = 3;
+    int CEQUINT = 4;
+    int CNAP = 5;
+    int PHONE_NUMBER_CACHE = 6;
   }
 
   /**
@@ -75,7 +81,10 @@
       ImmutableList.of(
           NameSource.CP2_DEFAULT_DIRECTORY,
           NameSource.CP2_EXTENDED_DIRECTORY,
-          NameSource.PEOPLE_API);
+          NameSource.PEOPLE_API,
+          NameSource.CEQUINT,
+          NameSource.CNAP,
+          NameSource.PHONE_NUMBER_CACHE);
 
   private final @NameSource int nameSource;
   private final PhoneLookupInfo phoneLookupInfo;
@@ -103,6 +112,17 @@
         return ContactSource.Type.SOURCE_TYPE_EXTENDED;
       case NameSource.PEOPLE_API:
         return getRefinedPeopleApiSource();
+      case NameSource.CEQUINT:
+        return ContactSource.Type.SOURCE_TYPE_CEQUINT_CALLER_ID;
+      case NameSource.CNAP:
+        return ContactSource.Type.SOURCE_TYPE_CNAP;
+      case NameSource.PHONE_NUMBER_CACHE:
+        ContactSource.Type sourceType =
+            ContactSource.Type.forNumber(phoneLookupInfo.getMigratedInfo().getSourceType());
+        if (sourceType == null) {
+          sourceType = ContactSource.Type.UNKNOWN_SOURCE_TYPE;
+        }
+        return sourceType;
       case NameSource.NONE:
         return ContactSource.Type.UNKNOWN_SOURCE_TYPE;
       default:
@@ -141,6 +161,12 @@
         return Assert.isNotNull(firstExtendedCp2Contact).getName();
       case NameSource.PEOPLE_API:
         return phoneLookupInfo.getPeopleApiInfo().getDisplayName();
+      case NameSource.CEQUINT:
+        return phoneLookupInfo.getCequintInfo().getName();
+      case NameSource.CNAP:
+        return phoneLookupInfo.getCnapInfo().getName();
+      case NameSource.PHONE_NUMBER_CACHE:
+        return phoneLookupInfo.getMigratedInfo().getName();
       case NameSource.NONE:
         return "";
       default:
@@ -162,7 +188,11 @@
         return Assert.isNotNull(firstDefaultCp2Contact).getPhotoThumbnailUri();
       case NameSource.CP2_EXTENDED_DIRECTORY:
         return Assert.isNotNull(firstExtendedCp2Contact).getPhotoThumbnailUri();
+      case NameSource.PHONE_NUMBER_CACHE:
+        return phoneLookupInfo.getMigratedInfo().getPhotoUri();
       case NameSource.PEOPLE_API:
+      case NameSource.CEQUINT:
+      case NameSource.CNAP:
       case NameSource.NONE:
         return "";
       default:
@@ -184,7 +214,12 @@
         return Assert.isNotNull(firstDefaultCp2Contact).getPhotoUri();
       case NameSource.CP2_EXTENDED_DIRECTORY:
         return Assert.isNotNull(firstExtendedCp2Contact).getPhotoUri();
+      case NameSource.CEQUINT:
+        return phoneLookupInfo.getCequintInfo().getPhotoUri();
+      case NameSource.PHONE_NUMBER_CACHE:
+        return phoneLookupInfo.getMigratedInfo().getPhotoUri();
       case NameSource.PEOPLE_API:
+      case NameSource.CNAP:
       case NameSource.NONE:
         return "";
       default:
@@ -203,7 +238,10 @@
         return Math.max(Assert.isNotNull(firstDefaultCp2Contact).getPhotoId(), 0);
       case NameSource.CP2_EXTENDED_DIRECTORY:
         return Math.max(Assert.isNotNull(firstExtendedCp2Contact).getPhotoId(), 0);
+      case NameSource.PHONE_NUMBER_CACHE:
       case NameSource.PEOPLE_API:
+      case NameSource.CEQUINT:
+      case NameSource.CNAP:
       case NameSource.NONE:
         return 0;
       default:
@@ -225,6 +263,9 @@
         return Assert.isNotNull(firstExtendedCp2Contact).getLookupUri();
       case NameSource.PEOPLE_API:
         return Assert.isNotNull(phoneLookupInfo.getPeopleApiInfo().getLookupUri());
+      case NameSource.PHONE_NUMBER_CACHE:
+      case NameSource.CEQUINT:
+      case NameSource.CNAP:
       case NameSource.NONE:
         return "";
       default:
@@ -247,7 +288,35 @@
         return Assert.isNotNull(firstDefaultCp2Contact).getLabel();
       case NameSource.CP2_EXTENDED_DIRECTORY:
         return Assert.isNotNull(firstExtendedCp2Contact).getLabel();
+      case NameSource.PHONE_NUMBER_CACHE:
+        return phoneLookupInfo.getMigratedInfo().getLabel();
       case NameSource.PEOPLE_API:
+      case NameSource.CEQUINT:
+      case NameSource.CNAP:
+      case NameSource.NONE:
+        return "";
+      default:
+        throw Assert.createUnsupportedOperationFailException(
+            String.format("Unsupported name source: %s", nameSource));
+    }
+  }
+
+  /**
+   * The {@link PhoneLookupInfo} passed to the constructor is associated with a number. This method
+   * returns the number's geolocation (which is for display purpose only).
+   *
+   * <p>If no geolocation can be obtained from the {@link PhoneLookupInfo}, an empty string will be
+   * returned.
+   */
+  public String getGeolocation() {
+    switch (nameSource) {
+      case NameSource.CEQUINT:
+        return phoneLookupInfo.getCequintInfo().getGeolocation();
+      case NameSource.CP2_DEFAULT_DIRECTORY:
+      case NameSource.CP2_EXTENDED_DIRECTORY:
+      case NameSource.PEOPLE_API:
+      case NameSource.CNAP:
+      case NameSource.PHONE_NUMBER_CACHE:
       case NameSource.NONE:
         return "";
       default:
@@ -261,17 +330,21 @@
    * returns whether the number belongs to a business place.
    */
   public boolean isBusiness() {
-    return phoneLookupInfo.hasPeopleApiInfo()
-        && phoneLookupInfo.getPeopleApiInfo().getInfoType() == InfoType.NEARBY_BUSINESS;
-  }
-
-  /**
-   * The {@link PhoneLookupInfo} passed to the constructor is associated with a number. This method
-   * returns whether the number is a voicemail number.
-   */
-  public boolean isVoicemail() {
-    // TODO(twyen): implement
-    return false;
+    switch (nameSource) {
+      case NameSource.PEOPLE_API:
+        return phoneLookupInfo.getPeopleApiInfo().getInfoType() == InfoType.NEARBY_BUSINESS;
+      case NameSource.PHONE_NUMBER_CACHE:
+        return phoneLookupInfo.getMigratedInfo().getIsBusiness();
+      case NameSource.CP2_DEFAULT_DIRECTORY:
+      case NameSource.CP2_EXTENDED_DIRECTORY:
+      case NameSource.CEQUINT:
+      case NameSource.CNAP:
+      case NameSource.NONE:
+        return false;
+      default:
+        throw Assert.createUnsupportedOperationFailException(
+            String.format("Unsupported name source: %s", nameSource));
+    }
   }
 
   /**
@@ -287,10 +360,7 @@
           .getBlockedState()
           .equals(BlockedState.BLOCKED);
     }
-    return phoneLookupInfo
-        .getDialerBlockedNumberInfo()
-        .getBlockedState()
-        .equals(BlockedState.BLOCKED);
+    return false;
   }
 
   /**
@@ -311,6 +381,14 @@
 
   /**
    * The {@link PhoneLookupInfo} passed to the constructor is associated with a number. This method
+   * returns whether the number is an emergency number (e.g., 911 in the U.S.).
+   */
+  public boolean isEmergencyNumber() {
+    return phoneLookupInfo.getEmergencyInfo().getIsEmergencyNumber();
+  }
+
+  /**
+   * The {@link PhoneLookupInfo} passed to the constructor is associated with a number. This method
    * returns whether the number can be reported as invalid.
    *
    * <p>As we currently report invalid numbers via the People API, only numbers from the People API
@@ -320,11 +398,34 @@
     switch (nameSource) {
       case NameSource.CP2_DEFAULT_DIRECTORY:
       case NameSource.CP2_EXTENDED_DIRECTORY:
+      case NameSource.CEQUINT:
+      case NameSource.CNAP:
+      case NameSource.PHONE_NUMBER_CACHE:
+      case NameSource.NONE:
         return false;
       case NameSource.PEOPLE_API:
         PeopleApiInfo peopleApiInfo = phoneLookupInfo.getPeopleApiInfo();
         return peopleApiInfo.getInfoType() != InfoType.UNKNOWN
             && !peopleApiInfo.getPersonId().isEmpty();
+      default:
+        throw Assert.createUnsupportedOperationFailException(
+            String.format("Unsupported name source: %s", nameSource));
+    }
+  }
+
+  /**
+   * The {@link PhoneLookupInfo} passed to the constructor is associated with a number. This method
+   * returns whether the number can be reached via carrier video calls.
+   */
+  public boolean canSupportCarrierVideoCall() {
+    switch (nameSource) {
+      case NameSource.CP2_DEFAULT_DIRECTORY:
+        return Assert.isNotNull(firstDefaultCp2Contact).getCanSupportCarrierVideoCall();
+      case NameSource.CP2_EXTENDED_DIRECTORY:
+      case NameSource.PEOPLE_API:
+      case NameSource.CEQUINT:
+      case NameSource.CNAP:
+      case NameSource.PHONE_NUMBER_CACHE:
       case NameSource.NONE:
         return false;
       default:
@@ -377,6 +478,21 @@
             return NameSource.PEOPLE_API;
           }
           break;
+        case NameSource.CEQUINT:
+          if (!phoneLookupInfo.getCequintInfo().getName().isEmpty()) {
+            return NameSource.CEQUINT;
+          }
+          break;
+        case NameSource.CNAP:
+          if (!phoneLookupInfo.getCnapInfo().getName().isEmpty()) {
+            return NameSource.CNAP;
+          }
+          break;
+        case NameSource.PHONE_NUMBER_CACHE:
+          if (!phoneLookupInfo.getMigratedInfo().getName().isEmpty()) {
+            return NameSource.PHONE_NUMBER_CACHE;
+          }
+          break;
         default:
           throw Assert.createUnsupportedOperationFailException(
               String.format("Unsupported name source: %s", nameSource));
diff --git a/java/com/android/dialer/phonelookup/cp2/Cp2DefaultDirectoryPhoneLookup.java b/java/com/android/dialer/phonelookup/cp2/Cp2DefaultDirectoryPhoneLookup.java
index a79eb19..7f2d91a 100644
--- a/java/com/android/dialer/phonelookup/cp2/Cp2DefaultDirectoryPhoneLookup.java
+++ b/java/com/android/dialer/phonelookup/cp2/Cp2DefaultDirectoryPhoneLookup.java
@@ -24,6 +24,7 @@
 import android.provider.ContactsContract.CommonDataKinds.Phone;
 import android.provider.ContactsContract.Contacts;
 import android.provider.ContactsContract.DeletedContacts;
+import android.provider.ContactsContract.Directory;
 import android.support.annotation.Nullable;
 import android.support.v4.util.ArrayMap;
 import android.support.v4.util.ArraySet;
@@ -33,7 +34,9 @@
 import com.android.dialer.common.LogUtil;
 import com.android.dialer.common.concurrent.Annotations.BackgroundExecutor;
 import com.android.dialer.common.concurrent.Annotations.LightweightExecutor;
+import com.android.dialer.configprovider.ConfigProvider;
 import com.android.dialer.inject.ApplicationContext;
+import com.android.dialer.logging.Logger;
 import com.android.dialer.phonelookup.PhoneLookup;
 import com.android.dialer.phonelookup.PhoneLookupInfo;
 import com.android.dialer.phonelookup.PhoneLookupInfo.Cp2Info;
@@ -41,6 +44,7 @@
 import com.android.dialer.phonelookup.database.contract.PhoneLookupHistoryContract.PhoneLookupHistory;
 import com.android.dialer.phonenumberproto.PartitionedNumbers;
 import com.android.dialer.storage.Unencrypted;
+import com.android.dialer.util.PermissionsUtil;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Iterables;
@@ -56,6 +60,7 @@
 import java.util.Map.Entry;
 import java.util.Set;
 import java.util.concurrent.Callable;
+import java.util.function.Predicate;
 import javax.inject.Inject;
 
 /** PhoneLookup implementation for contacts in the default directory. */
@@ -64,15 +69,12 @@
   private static final String PREF_LAST_TIMESTAMP_PROCESSED =
       "cp2DefaultDirectoryPhoneLookupLastTimestampProcessed";
 
-  // We cannot efficiently process invalid numbers because batch queries cannot be constructed which
-  // accomplish the necessary loose matching. We'll attempt to process a limited number of them,
-  // but if there are too many we fall back to querying CP2 at render time.
-  private static final int MAX_SUPPORTED_INVALID_NUMBERS = 5;
-
   private final Context appContext;
   private final SharedPreferences sharedPreferences;
   private final ListeningExecutorService backgroundExecutorService;
   private final ListeningExecutorService lightweightExecutorService;
+  private final ConfigProvider configProvider;
+  private final MissingPermissionsOperations missingPermissionsOperations;
 
   @Nullable private Long currentLastTimestampProcessed;
 
@@ -81,15 +83,22 @@
       @ApplicationContext Context appContext,
       @Unencrypted SharedPreferences sharedPreferences,
       @BackgroundExecutor ListeningExecutorService backgroundExecutorService,
-      @LightweightExecutor ListeningExecutorService lightweightExecutorService) {
+      @LightweightExecutor ListeningExecutorService lightweightExecutorService,
+      ConfigProvider configProvider,
+      MissingPermissionsOperations missingPermissionsOperations) {
     this.appContext = appContext;
     this.sharedPreferences = sharedPreferences;
     this.backgroundExecutorService = backgroundExecutorService;
     this.lightweightExecutorService = lightweightExecutorService;
+    this.configProvider = configProvider;
+    this.missingPermissionsOperations = missingPermissionsOperations;
   }
 
   @Override
   public ListenableFuture<Cp2Info> lookup(DialerPhoneNumber dialerPhoneNumber) {
+    if (!PermissionsUtil.hasContactsReadPermissions(appContext)) {
+      return Futures.immediateFuture(Cp2Info.getDefaultInstance());
+    }
     return backgroundExecutorService.submit(() -> lookupInternal(dialerPhoneNumber));
   }
 
@@ -125,7 +134,8 @@
         return Cp2Info.getDefaultInstance();
       }
       while (cursor.moveToNext()) {
-        cp2ContactInfos.add(Cp2Projections.buildCp2ContactInfoFromCursor(appContext, cursor));
+        cp2ContactInfos.add(
+            Cp2Projections.buildCp2ContactInfoFromCursor(appContext, cursor, Directory.DEFAULT));
       }
     } finally {
       if (cursor != null) {
@@ -137,8 +147,17 @@
 
   @Override
   public ListenableFuture<Boolean> isDirty(ImmutableSet<DialerPhoneNumber> phoneNumbers) {
+    if (!PermissionsUtil.hasContactsReadPermissions(appContext)) {
+      LogUtil.w("Cp2DefaultDirectoryPhoneLookup.isDirty", "missing permissions");
+      Predicate<PhoneLookupInfo> phoneLookupInfoIsDirtyFn =
+          phoneLookupInfo ->
+              !phoneLookupInfo.getDefaultCp2Info().equals(Cp2Info.getDefaultInstance());
+      return missingPermissionsOperations.isDirtyForMissingPermissions(
+          phoneNumbers, phoneLookupInfoIsDirtyFn);
+    }
+
     PartitionedNumbers partitionedNumbers = new PartitionedNumbers(phoneNumbers);
-    if (partitionedNumbers.invalidNumbers().size() > MAX_SUPPORTED_INVALID_NUMBERS) {
+    if (partitionedNumbers.invalidNumbers().size() > getMaxSupportedInvalidNumbers()) {
       // If there are N invalid numbers, we can't determine determine dirtiness without running N
       // queries; since running this many queries is not feasible for the (lightweight) isDirty
       // check, simply return true. The expectation is that this should rarely be the case as the
@@ -234,7 +253,8 @@
 
     // Then run a separate query for each invalid number. Separate queries are done to accomplish
     // loose matching which couldn't be accomplished with a batch query.
-    Assert.checkState(partitionedNumbers.invalidNumbers().size() <= MAX_SUPPORTED_INVALID_NUMBERS);
+    Assert.checkState(
+        partitionedNumbers.invalidNumbers().size() <= getMaxSupportedInvalidNumbers());
     for (String invalidNumber : partitionedNumbers.invalidNumbers()) {
       queryFutures.add(queryPhoneLookupTableForContactIdsBasedOnRawNumber(invalidNumber));
     }
@@ -440,6 +460,11 @@
       ImmutableMap<DialerPhoneNumber, Cp2Info> existingInfoMap) {
     currentLastTimestampProcessed = null;
 
+    if (!PermissionsUtil.hasContactsReadPermissions(appContext)) {
+      LogUtil.w("Cp2DefaultDirectoryPhoneLookup.getMostRecentInfo", "missing permissions");
+      return missingPermissionsOperations.getMostRecentInfoForMissingPermissions(existingInfoMap);
+    }
+
     ListenableFuture<Long> lastModifiedFuture =
         backgroundExecutorService.submit(
             () -> sharedPreferences.getLong(PREF_LAST_TIMESTAMP_PROCESSED, 0L));
@@ -529,7 +554,11 @@
       ImmutableMap<DialerPhoneNumber, Cp2Info> existingInfoMap) {
     ArraySet<DialerPhoneNumber> unprocessableNumbers = new ArraySet<>();
     PartitionedNumbers partitionedNumbers = new PartitionedNumbers(existingInfoMap.keySet());
-    if (partitionedNumbers.invalidNumbers().size() > MAX_SUPPORTED_INVALID_NUMBERS) {
+
+    int invalidNumberCount = partitionedNumbers.invalidNumbers().size();
+    Logger.get(appContext).logAnnotatedCallLogMetrics(invalidNumberCount);
+
+    if (invalidNumberCount > getMaxSupportedInvalidNumbers()) {
       for (String invalidNumber : partitionedNumbers.invalidNumbers()) {
         unprocessableNumbers.addAll(partitionedNumbers.dialerPhoneNumbersForInvalid(invalidNumber));
       }
@@ -623,10 +652,27 @@
   }
 
   @Override
-  public void registerContentObservers(Context appContext) {
+  public void registerContentObservers() {
     // Do nothing since CP2 changes are too noisy.
   }
 
+  @Override
+  public void unregisterContentObservers() {}
+
+  @Override
+  public ListenableFuture<Void> clearData() {
+    return backgroundExecutorService.submit(
+        () -> {
+          sharedPreferences.edit().remove(PREF_LAST_TIMESTAMP_PROCESSED).apply();
+          return null;
+        });
+  }
+
+  @Override
+  public String getLoggingName() {
+    return "Cp2DefaultDirectoryPhoneLookup";
+  }
+
   /**
    * 1. get all contact ids. if the id is unset, add the number to the list of contacts to look up.
    * 2. reduce our list of contact ids to those that were updated after lastModified. 3. Now we have
@@ -749,7 +795,8 @@
                   cp2ContactInfosByNumber.put(validE164Number, cp2ContactInfos);
                 }
                 cp2ContactInfos.add(
-                    Cp2Projections.buildCp2ContactInfoFromCursor(appContext, cursor));
+                    Cp2Projections.buildCp2ContactInfoFromCursor(
+                        appContext, cursor, Directory.DEFAULT));
               }
             }
           }
@@ -773,7 +820,8 @@
             } else {
               while (cursor.moveToNext()) {
                 cp2ContactInfos.add(
-                    Cp2Projections.buildCp2ContactInfoFromCursor(appContext, cursor));
+                    Cp2Projections.buildCp2ContactInfoFromCursor(
+                        appContext, cursor, Directory.DEFAULT));
               }
             }
           }
@@ -916,4 +964,13 @@
     }
     return where.toString();
   }
+
+  /**
+   * We cannot efficiently process invalid numbers because batch queries cannot be constructed which
+   * accomplish the necessary loose matching. We'll attempt to process a limited number of them, but
+   * if there are too many we fall back to querying CP2 at render time.
+   */
+  private long getMaxSupportedInvalidNumbers() {
+    return configProvider.getLong("cp2_phone_lookup_max_invalid_numbers", 5);
+  }
 }
diff --git a/java/com/android/dialer/phonelookup/cp2/Cp2ExtendedDirectoryPhoneLookup.java b/java/com/android/dialer/phonelookup/cp2/Cp2ExtendedDirectoryPhoneLookup.java
index 519ec5f..237ae5e 100644
--- a/java/com/android/dialer/phonelookup/cp2/Cp2ExtendedDirectoryPhoneLookup.java
+++ b/java/com/android/dialer/phonelookup/cp2/Cp2ExtendedDirectoryPhoneLookup.java
@@ -19,20 +19,23 @@
 import android.content.Context;
 import android.database.Cursor;
 import android.net.Uri;
-import android.os.Build.VERSION;
-import android.os.Build.VERSION_CODES;
 import android.provider.ContactsContract;
+import android.provider.ContactsContract.Directory;
 import android.support.annotation.VisibleForTesting;
 import com.android.dialer.DialerPhoneNumber;
 import com.android.dialer.common.LogUtil;
 import com.android.dialer.common.concurrent.Annotations.BackgroundExecutor;
 import com.android.dialer.common.concurrent.Annotations.LightweightExecutor;
-import com.android.dialer.common.cp2.DirectoryCompat;
+import com.android.dialer.common.concurrent.Annotations.NonUiSerial;
+import com.android.dialer.configprovider.ConfigProvider;
 import com.android.dialer.inject.ApplicationContext;
+import com.android.dialer.logging.DialerImpression;
+import com.android.dialer.logging.Logger;
 import com.android.dialer.phonelookup.PhoneLookup;
 import com.android.dialer.phonelookup.PhoneLookupInfo;
 import com.android.dialer.phonelookup.PhoneLookupInfo.Cp2Info;
 import com.android.dialer.phonenumberutil.PhoneNumberHelper;
+import com.android.dialer.util.PermissionsUtil;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.util.concurrent.Futures;
@@ -40,6 +43,10 @@
 import com.google.common.util.concurrent.ListeningExecutorService;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+import java.util.function.Predicate;
 import javax.inject.Inject;
 
 /**
@@ -50,26 +57,66 @@
  */
 public final class Cp2ExtendedDirectoryPhoneLookup implements PhoneLookup<Cp2Info> {
 
+  /** Config flag for timeout (in ms). */
+  @VisibleForTesting
+  static final String CP2_EXTENDED_DIRECTORY_PHONE_LOOKUP_TIMEOUT_MILLIS =
+      "cp2_extended_directory_phone_lookup_timout_millis";
+
   private final Context appContext;
+  private final ConfigProvider configProvider;
   private final ListeningExecutorService backgroundExecutorService;
   private final ListeningExecutorService lightweightExecutorService;
+  private final MissingPermissionsOperations missingPermissionsOperations;
+  private final ScheduledExecutorService scheduledExecutorService;
 
   @Inject
   Cp2ExtendedDirectoryPhoneLookup(
       @ApplicationContext Context appContext,
       @BackgroundExecutor ListeningExecutorService backgroundExecutorService,
-      @LightweightExecutor ListeningExecutorService lightweightExecutorService) {
+      @LightweightExecutor ListeningExecutorService lightweightExecutorService,
+      @NonUiSerial ScheduledExecutorService scheduledExecutorService,
+      ConfigProvider configProvider,
+      MissingPermissionsOperations missingPermissionsOperations) {
     this.appContext = appContext;
     this.backgroundExecutorService = backgroundExecutorService;
     this.lightweightExecutorService = lightweightExecutorService;
+    this.scheduledExecutorService = scheduledExecutorService;
+    this.configProvider = configProvider;
+    this.missingPermissionsOperations = missingPermissionsOperations;
   }
 
   @Override
   public ListenableFuture<Cp2Info> lookup(DialerPhoneNumber dialerPhoneNumber) {
-    return Futures.transformAsync(
-        queryCp2ForExtendedDirectoryIds(),
-        directoryIds -> queryCp2ForDirectoryContact(dialerPhoneNumber, directoryIds),
-        lightweightExecutorService);
+    if (!PermissionsUtil.hasContactsReadPermissions(appContext)) {
+      return Futures.immediateFuture(Cp2Info.getDefaultInstance());
+    }
+
+    ListenableFuture<Cp2Info> cp2InfoFuture =
+        Futures.transformAsync(
+            queryCp2ForExtendedDirectoryIds(),
+            directoryIds -> queryCp2ForDirectoryContact(dialerPhoneNumber, directoryIds),
+            lightweightExecutorService);
+
+    long timeoutMillis =
+        configProvider.getLong(CP2_EXTENDED_DIRECTORY_PHONE_LOOKUP_TIMEOUT_MILLIS, Long.MAX_VALUE);
+
+    // Do not pass Long.MAX_VALUE to Futures.withTimeout as it will cause the internal
+    // ScheduledExecutorService for timing to keep waiting even after "cp2InfoFuture" is done.
+    // Do not pass 0 or a negative value to Futures.withTimeout either as it will cause the timeout
+    // event to be triggered immediately.
+    return timeoutMillis == Long.MAX_VALUE
+        ? cp2InfoFuture
+        : Futures.catching(
+            Futures.withTimeout(
+                cp2InfoFuture, timeoutMillis, TimeUnit.MILLISECONDS, scheduledExecutorService),
+            TimeoutException.class,
+            unused -> {
+              LogUtil.w("Cp2ExtendedDirectoryPhoneLookup.lookup", "Time out!");
+              Logger.get(appContext)
+                  .logImpression(DialerImpression.Type.CP2_EXTENDED_DIRECTORY_PHONE_LOOKUP_TIMEOUT);
+              return Cp2Info.getDefaultInstance();
+            },
+            lightweightExecutorService);
   }
 
   private ListenableFuture<List<Long>> queryCp2ForExtendedDirectoryIds() {
@@ -80,7 +127,7 @@
               appContext
                   .getContentResolver()
                   .query(
-                      DirectoryCompat.getContentUri(),
+                      Directory.ENTERPRISE_CONTENT_URI,
                       /* projection = */ new String[] {ContactsContract.Directory._ID},
                       /* selection = */ null,
                       /* selectionArgs = */ null,
@@ -168,7 +215,7 @@
 
             do {
               cp2InfoBuilder.addCp2ContactInfo(
-                  Cp2Projections.buildCp2ContactInfoFromCursor(appContext, cursor));
+                  Cp2Projections.buildCp2ContactInfoFromCursor(appContext, cursor, directoryId));
             } while (cursor.moveToNext());
           }
 
@@ -178,13 +225,8 @@
 
   @VisibleForTesting
   static Uri getContentUriForContacts(String number, long directoryId) {
-    Uri baseUri =
-        VERSION.SDK_INT >= VERSION_CODES.N
-            ? ContactsContract.PhoneLookup.ENTERPRISE_CONTENT_FILTER_URI
-            : ContactsContract.PhoneLookup.CONTENT_FILTER_URI;
-
     Uri.Builder builder =
-        baseUri
+        ContactsContract.PhoneLookup.ENTERPRISE_CONTENT_FILTER_URI
             .buildUpon()
             .appendPath(number)
             .appendQueryParameter(
@@ -197,18 +239,29 @@
   }
 
   private static boolean isExtendedDirectory(long directoryId) {
-    return DirectoryCompat.isRemoteDirectoryId(directoryId)
-        || DirectoryCompat.isEnterpriseDirectoryId(directoryId);
+    return Directory.isRemoteDirectoryId(directoryId)
+        || Directory.isEnterpriseDirectoryId(directoryId);
   }
 
   @Override
   public ListenableFuture<Boolean> isDirty(ImmutableSet<DialerPhoneNumber> phoneNumbers) {
+    if (!PermissionsUtil.hasContactsReadPermissions(appContext)) {
+      Predicate<PhoneLookupInfo> phoneLookupInfoIsDirtyFn =
+          phoneLookupInfo ->
+              !phoneLookupInfo.getExtendedCp2Info().equals(Cp2Info.getDefaultInstance());
+      return missingPermissionsOperations.isDirtyForMissingPermissions(
+          phoneNumbers, phoneLookupInfoIsDirtyFn);
+    }
     return Futures.immediateFuture(false);
   }
 
   @Override
   public ListenableFuture<ImmutableMap<DialerPhoneNumber, Cp2Info>> getMostRecentInfo(
       ImmutableMap<DialerPhoneNumber, Cp2Info> existingInfoMap) {
+    if (!PermissionsUtil.hasContactsReadPermissions(appContext)) {
+      LogUtil.w("Cp2ExtendedDirectoryPhoneLookup.getMostRecentInfo", "missing permissions");
+      return missingPermissionsOperations.getMostRecentInfoForMissingPermissions(existingInfoMap);
+    }
     return Futures.immediateFuture(existingInfoMap);
   }
 
@@ -228,9 +281,22 @@
   }
 
   @Override
-  public void registerContentObservers(Context appContext) {
+  public void registerContentObservers() {
     // For contacts in remote directories, no content observer can be registered.
     // For contacts in local (but not default) directories (e.g., the local work directory), we
     // don't register a content observer for now.
   }
+
+  @Override
+  public void unregisterContentObservers() {}
+
+  @Override
+  public ListenableFuture<Void> clearData() {
+    return Futures.immediateFuture(null);
+  }
+
+  @Override
+  public String getLoggingName() {
+    return "Cp2ExtendedDirectoryPhoneLookup";
+  }
 }
diff --git a/java/com/android/dialer/phonelookup/cp2/Cp2Projections.java b/java/com/android/dialer/phonelookup/cp2/Cp2Projections.java
index 5a211ed..38390e5 100644
--- a/java/com/android/dialer/phonelookup/cp2/Cp2Projections.java
+++ b/java/com/android/dialer/phonelookup/cp2/Cp2Projections.java
@@ -18,6 +18,7 @@
 
 import android.content.Context;
 import android.database.Cursor;
+import android.provider.ContactsContract;
 import android.provider.ContactsContract.CommonDataKinds.Phone;
 import android.provider.ContactsContract.Contacts;
 import android.provider.ContactsContract.PhoneLookup;
@@ -41,7 +42,8 @@
         Phone.LABEL, // 5
         Phone.NORMALIZED_NUMBER, // 6
         Phone.CONTACT_ID, // 7
-        Phone.LOOKUP_KEY // 8
+        Phone.LOOKUP_KEY, // 8
+        Phone.CARRIER_PRESENCE
       };
 
   // Projection for performing lookups using the PHONE_LOOKUP table
@@ -58,7 +60,8 @@
         PhoneLookup.LOOKUP_KEY // 8
       };
 
-  // The following indexes should match both PHONE_PROJECTION and PHONE_LOOKUP_PROJECTION above.
+  // The following indexes should match the common columns in
+  // PHONE_PROJECTION and PHONE_LOOKUP_PROJECTION above.
   private static final int CP2_INFO_NAME_INDEX = 0;
   private static final int CP2_INFO_PHOTO_THUMBNAIL_URI_INDEX = 1;
   private static final int CP2_INFO_PHOTO_URI_INDEX = 2;
@@ -83,7 +86,8 @@
    * Builds a {@link Cp2ContactInfo} based on the current row of {@code cursor}, of which the
    * projection is either {@link #PHONE_PROJECTION} or {@link #PHONE_LOOKUP_PROJECTION}.
    */
-  static Cp2ContactInfo buildCp2ContactInfoFromCursor(Context appContext, Cursor cursor) {
+  static Cp2ContactInfo buildCp2ContactInfoFromCursor(
+      Context appContext, Cursor cursor, long directoryId) {
     String displayName = cursor.getString(CP2_INFO_NAME_INDEX);
     String photoThumbnailUri = cursor.getString(CP2_INFO_PHOTO_THUMBNAIL_URI_INDEX);
     String photoUri = cursor.getString(CP2_INFO_PHOTO_URI_INDEX);
@@ -114,8 +118,24 @@
     }
     infoBuilder.setContactId(contactId);
     if (!TextUtils.isEmpty(lookupKey)) {
-      infoBuilder.setLookupUri(Contacts.getLookupUri(contactId, lookupKey).toString());
+      infoBuilder.setLookupUri(
+          Contacts.getLookupUri(contactId, lookupKey)
+              .buildUpon()
+              .appendQueryParameter(
+                  ContactsContract.DIRECTORY_PARAM_KEY, String.valueOf(directoryId))
+              .build()
+              .toString());
     }
+
+    // Only PHONE_PROJECTION has a column containing carrier presence info.
+    int carrierPresenceColumn = cursor.getColumnIndex(Phone.CARRIER_PRESENCE);
+    if (carrierPresenceColumn != -1) {
+      int carrierPresenceInfo = cursor.getInt(carrierPresenceColumn);
+      infoBuilder.setCanSupportCarrierVideoCall(
+          (carrierPresenceInfo & Phone.CARRIER_PRESENCE_VT_CAPABLE)
+              == Phone.CARRIER_PRESENCE_VT_CAPABLE);
+    }
+
     return infoBuilder.build();
   }
 
diff --git a/java/com/android/dialer/phonelookup/cp2/MissingPermissionsOperations.java b/java/com/android/dialer/phonelookup/cp2/MissingPermissionsOperations.java
new file mode 100644
index 0000000..a241368
--- /dev/null
+++ b/java/com/android/dialer/phonelookup/cp2/MissingPermissionsOperations.java
@@ -0,0 +1,130 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.dialer.phonelookup.cp2;
+
+import android.content.Context;
+import android.database.Cursor;
+import com.android.dialer.DialerPhoneNumber;
+import com.android.dialer.common.LogUtil;
+import com.android.dialer.common.concurrent.Annotations.BackgroundExecutor;
+import com.android.dialer.common.concurrent.Annotations.LightweightExecutor;
+import com.android.dialer.common.database.Selection;
+import com.android.dialer.inject.ApplicationContext;
+import com.android.dialer.phonelookup.PhoneLookupInfo;
+import com.android.dialer.phonelookup.PhoneLookupInfo.Cp2Info;
+import com.android.dialer.phonelookup.database.contract.PhoneLookupHistoryContract.PhoneLookupHistory;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.util.concurrent.ListenableFuture;
+import com.google.common.util.concurrent.ListeningExecutorService;
+import com.google.protobuf.InvalidProtocolBufferException;
+import java.util.function.Predicate;
+import javax.inject.Inject;
+
+/** Shared logic for handling missing permissions in CP2 lookups. */
+final class MissingPermissionsOperations {
+
+  private final Context appContext;
+  private final ListeningExecutorService backgroundExecutor;
+  private final ListeningExecutorService lightweightExecutor;
+
+  @Inject
+  MissingPermissionsOperations(
+      @ApplicationContext Context appContext,
+      @BackgroundExecutor ListeningExecutorService backgroundExecutor,
+      @LightweightExecutor ListeningExecutorService lightweightExecutor) {
+    this.appContext = appContext;
+    this.backgroundExecutor = backgroundExecutor;
+    this.lightweightExecutor = lightweightExecutor;
+  }
+
+  /**
+   * Returns true if there is any CP2 data for the specified numbers in PhoneLookupHistory, because
+   * that data needs to be cleared.
+   *
+   * <p>Note: This might be a little slow for users without contacts permissions, but we don't
+   * expect this to often be the case. If necessary, a shared pref could be used to track the
+   * permission state as an optimization.
+   */
+  ListenableFuture<Boolean> isDirtyForMissingPermissions(
+      ImmutableSet<DialerPhoneNumber> phoneNumbers,
+      Predicate<PhoneLookupInfo> phoneLookupInfoIsDirtyFn) {
+    return backgroundExecutor.submit(
+        () -> {
+          // Note: This loses country info when number is not valid.
+          String[] normalizedNumbers =
+              phoneNumbers
+                  .stream()
+                  .map(DialerPhoneNumber::getNormalizedNumber)
+                  .toArray(String[]::new);
+
+          Selection selection =
+              Selection.builder()
+                  .and(Selection.column(PhoneLookupHistory.NORMALIZED_NUMBER).in(normalizedNumbers))
+                  .build();
+
+          try (Cursor cursor =
+              appContext
+                  .getContentResolver()
+                  .query(
+                      PhoneLookupHistory.CONTENT_URI,
+                      new String[] {
+                        PhoneLookupHistory.PHONE_LOOKUP_INFO,
+                      },
+                      selection.getSelection(),
+                      selection.getSelectionArgs(),
+                      null)) {
+
+            if (cursor == null) {
+              LogUtil.w("MissingPermissionsOperations.isDirtyForMissingPermissions", "null cursor");
+              return false;
+            }
+
+            if (cursor.moveToFirst()) {
+              int phoneLookupInfoColumn =
+                  cursor.getColumnIndexOrThrow(PhoneLookupHistory.PHONE_LOOKUP_INFO);
+              do {
+                PhoneLookupInfo phoneLookupInfo;
+                try {
+                  phoneLookupInfo =
+                      PhoneLookupInfo.parseFrom(cursor.getBlob(phoneLookupInfoColumn));
+                } catch (InvalidProtocolBufferException e) {
+                  throw new IllegalStateException(e);
+                }
+                if (phoneLookupInfoIsDirtyFn.test(phoneLookupInfo)) {
+                  return true;
+                }
+              } while (cursor.moveToNext());
+            }
+          }
+          return false;
+        });
+  }
+
+  /** Clears all CP2 info because permissions are missing. */
+  ListenableFuture<ImmutableMap<DialerPhoneNumber, Cp2Info>> getMostRecentInfoForMissingPermissions(
+      ImmutableMap<DialerPhoneNumber, Cp2Info> existingInfoMap) {
+    return lightweightExecutor.submit(
+        () -> {
+          ImmutableMap.Builder<DialerPhoneNumber, Cp2Info> clearedInfos = ImmutableMap.builder();
+          for (DialerPhoneNumber number : existingInfoMap.keySet()) {
+            clearedInfos.put(number, Cp2Info.getDefaultInstance());
+          }
+          return clearedInfos.build();
+        });
+  }
+}
diff --git a/java/com/android/dialer/phonelookup/database/PhoneLookupDatabaseComponent.java b/java/com/android/dialer/phonelookup/database/PhoneLookupDatabaseComponent.java
new file mode 100644
index 0000000..92659c1
--- /dev/null
+++ b/java/com/android/dialer/phonelookup/database/PhoneLookupDatabaseComponent.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+package com.android.dialer.phonelookup.database;
+
+import android.content.Context;
+import com.android.dialer.inject.HasRootComponent;
+import com.android.dialer.inject.IncludeInDialerRoot;
+import dagger.Subcomponent;
+
+/** Dagger component for database package. */
+@Subcomponent
+public abstract class PhoneLookupDatabaseComponent {
+
+  public abstract PhoneLookupHistoryDatabaseHelper phoneLookupHistoryDatabaseHelper();
+
+  public static PhoneLookupDatabaseComponent get(Context context) {
+    return ((PhoneLookupDatabaseComponent.HasComponent)
+            ((HasRootComponent) context.getApplicationContext()).component())
+        .phoneLookupDatabaseComponent();
+  }
+
+  /** Used to refer to the root application component. */
+  @IncludeInDialerRoot
+  public interface HasComponent {
+    PhoneLookupDatabaseComponent phoneLookupDatabaseComponent();
+  }
+}
diff --git a/java/com/android/dialer/phonelookup/database/PhoneLookupHistoryContentProvider.java b/java/com/android/dialer/phonelookup/database/PhoneLookupHistoryContentProvider.java
index 1c20b10..35d2d4f 100644
--- a/java/com/android/dialer/phonelookup/database/PhoneLookupHistoryContentProvider.java
+++ b/java/com/android/dialer/phonelookup/database/PhoneLookupHistoryContentProvider.java
@@ -81,7 +81,8 @@
 
   @Override
   public boolean onCreate() {
-    databaseHelper = new PhoneLookupHistoryDatabaseHelper(getContext());
+    databaseHelper =
+        PhoneLookupDatabaseComponent.get(getContext()).phoneLookupHistoryDatabaseHelper();
     return true;
   }
 
diff --git a/java/com/android/dialer/phonelookup/database/PhoneLookupHistoryDatabaseHelper.java b/java/com/android/dialer/phonelookup/database/PhoneLookupHistoryDatabaseHelper.java
index 43b6f10..337e467 100644
--- a/java/com/android/dialer/phonelookup/database/PhoneLookupHistoryDatabaseHelper.java
+++ b/java/com/android/dialer/phonelookup/database/PhoneLookupHistoryDatabaseHelper.java
@@ -21,13 +21,31 @@
 import android.database.sqlite.SQLiteOpenHelper;
 import android.os.SystemClock;
 import com.android.dialer.common.LogUtil;
+import com.android.dialer.common.concurrent.Annotations.BackgroundExecutor;
+import com.android.dialer.inject.ApplicationContext;
 import com.android.dialer.phonelookup.database.contract.PhoneLookupHistoryContract.PhoneLookupHistory;
+import com.google.common.util.concurrent.ListenableFuture;
+import com.google.common.util.concurrent.ListeningExecutorService;
+import javax.inject.Inject;
+import javax.inject.Singleton;
 
 /** {@link SQLiteOpenHelper} for the PhoneLookupHistory database. */
-class PhoneLookupHistoryDatabaseHelper extends SQLiteOpenHelper {
+@Singleton
+public class PhoneLookupHistoryDatabaseHelper extends SQLiteOpenHelper {
 
-  PhoneLookupHistoryDatabaseHelper(Context appContext) {
-    super(appContext, "phone_lookup_history.db", null, 1);
+  private static final String FILENAME = "phone_lookup_history.db";
+
+  private final Context appContext;
+  private final ListeningExecutorService backgroundExecutor;
+
+  @Inject
+  PhoneLookupHistoryDatabaseHelper(
+      @ApplicationContext Context appContext,
+      @BackgroundExecutor ListeningExecutorService backgroundExecutor) {
+    super(appContext, FILENAME, null, 1);
+
+    this.appContext = appContext;
+    this.backgroundExecutor = backgroundExecutor;
   }
 
   // TODO(zachh): LAST_MODIFIED is no longer read and can be deleted.
@@ -62,4 +80,14 @@
 
   @Override
   public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {}
+
+  /** Closes the database and deletes it. */
+  public ListenableFuture<Void> delete() {
+    return backgroundExecutor.submit(
+        () -> {
+          close();
+          appContext.deleteDatabase(FILENAME);
+          return null;
+        });
+  }
 }
diff --git a/java/com/android/dialer/phonelookup/emergency/EmergencyPhoneLookup.java b/java/com/android/dialer/phonelookup/emergency/EmergencyPhoneLookup.java
new file mode 100644
index 0000000..d31614a
--- /dev/null
+++ b/java/com/android/dialer/phonelookup/emergency/EmergencyPhoneLookup.java
@@ -0,0 +1,122 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.dialer.phonelookup.emergency;
+
+import android.content.Context;
+import com.android.dialer.DialerPhoneNumber;
+import com.android.dialer.common.concurrent.Annotations.BackgroundExecutor;
+import com.android.dialer.inject.ApplicationContext;
+import com.android.dialer.phonelookup.PhoneLookup;
+import com.android.dialer.phonelookup.PhoneLookupInfo;
+import com.android.dialer.phonelookup.PhoneLookupInfo.EmergencyInfo;
+import com.android.dialer.phonenumberutil.PhoneNumberHelper;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.ListenableFuture;
+import com.google.common.util.concurrent.ListeningExecutorService;
+import javax.inject.Inject;
+
+/**
+ * PhoneLookup implementation for checking if a number is an emergency number.
+ *
+ * <p>The check has to be done in a PhoneLookup as it involves detecting the user's location and
+ * obtaining SIM info, which are expensive operations. Doing it in the main thread will make the UI
+ * super janky.
+ */
+public class EmergencyPhoneLookup implements PhoneLookup<EmergencyInfo> {
+
+  private final Context appContext;
+  private final ListeningExecutorService backgroundExecutorService;
+
+  @Inject
+  EmergencyPhoneLookup(
+      @ApplicationContext Context appContext,
+      @BackgroundExecutor ListeningExecutorService backgroundExecutorService) {
+    this.appContext = appContext;
+    this.backgroundExecutorService = backgroundExecutorService;
+  }
+
+  @Override
+  public ListenableFuture<EmergencyInfo> lookup(DialerPhoneNumber dialerPhoneNumber) {
+    return backgroundExecutorService.submit(
+        () ->
+            EmergencyInfo.newBuilder()
+                .setIsEmergencyNumber(
+                    PhoneNumberHelper.isLocalEmergencyNumber(
+                        appContext, dialerPhoneNumber.getNormalizedNumber()))
+                .build());
+  }
+
+  @Override
+  public ListenableFuture<Boolean> isDirty(ImmutableSet<DialerPhoneNumber> phoneNumbers) {
+    return Futures.immediateFuture(false);
+  }
+
+  @Override
+  public ListenableFuture<ImmutableMap<DialerPhoneNumber, EmergencyInfo>> getMostRecentInfo(
+      ImmutableMap<DialerPhoneNumber, EmergencyInfo> existingInfoMap) {
+    // We can update EmergencyInfo for all numbers in the provided map, but the negative impact on
+    // performance is intolerable as checking a single number involves detecting the user's location
+    // and obtaining SIM info, which will take more than 100ms (see
+    // android.telephony.PhoneNumberUtils#isLocalEmergencyNumber(Context, int, String) for details).
+    //
+    // As emergency numbers won't change in a country, the only case we will miss is that
+    //   (1) a number is an emergency number in country A but not in country B,
+    //   (2) a user has an emergency call entry when they are in country A, and
+    //   (3) they travel from A to B,
+    // which is a rare event.
+    //
+    // We can update the implementation if telecom supports batch check in the future.
+    return Futures.immediateFuture(existingInfoMap);
+  }
+
+  @Override
+  public void setSubMessage(PhoneLookupInfo.Builder destination, EmergencyInfo subMessage) {
+    destination.setEmergencyInfo(subMessage);
+  }
+
+  @Override
+  public EmergencyInfo getSubMessage(PhoneLookupInfo phoneLookupInfo) {
+    return phoneLookupInfo.getEmergencyInfo();
+  }
+
+  @Override
+  public ListenableFuture<Void> onSuccessfulBulkUpdate() {
+    return Futures.immediateFuture(null);
+  }
+
+  @Override
+  public void registerContentObservers() {
+    // No content observer to register.
+  }
+
+  @Override
+  public void unregisterContentObservers() {
+    // Nothing to be done as no content observer is registered.
+  }
+
+  @Override
+  public ListenableFuture<Void> clearData() {
+    return Futures.immediateFuture(null);
+  }
+
+  @Override
+  public String getLoggingName() {
+    return "EmergencyPhoneLookup";
+  }
+}
diff --git a/java/com/android/dialer/phonelookup/phone_lookup_info.proto b/java/com/android/dialer/phonelookup/phone_lookup_info.proto
index 44c237b..f5ab5f0 100644
--- a/java/com/android/dialer/phonelookup/phone_lookup_info.proto
+++ b/java/com/android/dialer/phonelookup/phone_lookup_info.proto
@@ -13,12 +13,13 @@
 // to an implementation of PhoneLookup. For example, field
 // "cp2_info_in_default_directory" corresponds to class
 // Cp2DefaultDirectoryPhoneLookup, and class Cp2DefaultDirectoryPhoneLookup
-// alone is responsible for populating it. Next ID: 7
+// alone is responsible for populating it.
+// Next ID: 11
 message PhoneLookupInfo {
   // Information about a PhoneNumber retrieved from CP2.
   message Cp2Info {
     // Information about a single contact.
-    // Next ID: 8
+    // Next ID: 9
     message Cp2ContactInfo {
       // For a contact in the default directory:
       //   android.provider.ContactsContract.CommonDataKinds.Phone.DISPLAY_NAME_PRIMARY
@@ -65,6 +66,15 @@
       //   constructed based on
       //   android.provider.ContactsContract.PhoneLookup.LOOKUP_KEY
       optional string lookup_uri = 7;
+
+      // For a contact in the default directory:
+      //    value set based on
+      //    android.provider.ContactsContract.CommonDataKinds.Phone.CARRIER_PRESENCE
+      // For a contact in other directories: always false.
+      //    This is because we lookup contacts in other directories via
+      //    android.provider.ContactsContract.PhoneLookup, to which carrier
+      //    presence info is not directly accessible.
+      optional bool can_support_carrier_video_call = 8;
     }
     // Repeated because one phone number can be associated with multiple CP2
     // contacts.
@@ -146,10 +156,45 @@
   }
   optional SystemBlockedNumberInfo system_blocked_number_info = 4;
 
-  // Message for the dialer fallback for blocked number. Used in M or when the
-  // migration to the system has not been completed.
-  message DialerBlockedNumberInfo {
-    optional BlockedState blocked_state = 1;
+  // Information obtained via CNAP
+  // (https://en.wikipedia.org/wiki/Calling_Name_Presentation)
+  // Next ID: 2
+  message CnapInfo {
+    optional string name = 1;
   }
-  optional DialerBlockedNumberInfo dialer_blocked_number_info = 5;
+  optional CnapInfo cnap_info = 7;
+
+  // Information obtained via Cequint
+  // Next ID: 4
+  message CequintInfo {
+    optional string name = 1;
+
+    // Description of the geolocation (e.g., "Mountain View, CA")
+    optional string geolocation = 2;
+
+    optional string photo_uri = 3;
+  }
+  optional CequintInfo cequint_info = 8;
+
+  // Message indicating whether a number is an emergency number.
+  // Next ID: 2
+  message EmergencyInfo {
+    optional bool is_emergency_number = 1;
+  }
+  optional EmergencyInfo emergency_info = 9;
+
+  // Information cached in the old calllog
+  message MigratedInfo {
+    // The display name
+    optional string name = 1;
+    // Display label, i.e. "Home", "Mobile"
+    optional string label = 2;
+
+    optional string photo_uri = 3;
+
+    optional bool is_business = 4;
+    // ContactSource.Type
+    optional int32 source_type = 5;
+  }
+  optional MigratedInfo migrated_info = 10;
 }
\ No newline at end of file
diff --git a/java/com/android/dialer/phonelookup/spam/SpamPhoneLookup.java b/java/com/android/dialer/phonelookup/spam/SpamPhoneLookup.java
index 7661a15..7e5c973 100644
--- a/java/com/android/dialer/phonelookup/spam/SpamPhoneLookup.java
+++ b/java/com/android/dialer/phonelookup/spam/SpamPhoneLookup.java
@@ -16,7 +16,6 @@
 
 package com.android.dialer.phonelookup.spam;
 
-import android.content.Context;
 import android.content.SharedPreferences;
 import android.support.annotation.Nullable;
 import android.support.annotation.VisibleForTesting;
@@ -28,7 +27,7 @@
 import com.android.dialer.phonelookup.PhoneLookupInfo;
 import com.android.dialer.phonelookup.PhoneLookupInfo.SpamInfo;
 import com.android.dialer.spam.Spam;
-import com.android.dialer.spam.SpamStatus;
+import com.android.dialer.spam.status.SpamStatus;
 import com.android.dialer.storage.Unencrypted;
 import com.google.common.base.Optional;
 import com.google.common.collect.ImmutableMap;
@@ -152,8 +151,25 @@
   }
 
   @Override
-  public void registerContentObservers(Context appContext) {
+  public void registerContentObservers() {
     // No content observer can be registered as Spam is not based on a content provider.
     // Each Spam implementation should be responsible for notifying any data changes.
   }
+
+  @Override
+  public void unregisterContentObservers() {}
+
+  @Override
+  public ListenableFuture<Void> clearData() {
+    return backgroundExecutorService.submit(
+        () -> {
+          sharedPreferences.edit().remove(PREF_LAST_TIMESTAMP_PROCESSED).apply();
+          return null;
+        });
+  }
+
+  @Override
+  public String getLoggingName() {
+    return "SpamPhoneLookup";
+  }
 }
diff --git a/java/com/android/dialer/phonenumbercache/CachedNumberLookupService.java b/java/com/android/dialer/phonenumbercache/CachedNumberLookupService.java
index c398251..b2720d1 100644
--- a/java/com/android/dialer/phonenumbercache/CachedNumberLookupService.java
+++ b/java/com/android/dialer/phonenumbercache/CachedNumberLookupService.java
@@ -43,8 +43,6 @@
 
   void addContact(Context context, CachedContactInfo info);
 
-  boolean isCacheUri(String uri);
-
   boolean isBusiness(ContactSource.Type sourceType);
 
   boolean canReportAsInvalid(ContactSource.Type sourceType, String objectId);
@@ -71,8 +69,6 @@
 
     void setDirectorySource(String name, long directoryId);
 
-    void setExtendedSource(String name, long directoryId);
-
     void setLookupKey(String lookupKey);
   }
 }
diff --git a/java/com/android/dialer/phonenumbercache/CallLogQuery.java b/java/com/android/dialer/phonenumbercache/CallLogQuery.java
index 2ebc302..2f2758a 100644
--- a/java/com/android/dialer/phonenumbercache/CallLogQuery.java
+++ b/java/com/android/dialer/phonenumbercache/CallLogQuery.java
@@ -53,17 +53,13 @@
   public static final int DATA_USAGE = 21;
   public static final int TRANSCRIPTION = 22;
   public static final int CACHED_PHOTO_URI = 23;
-
-  @RequiresApi(VERSION_CODES.N)
   public static final int POST_DIAL_DIGITS = 24;
-
-  @RequiresApi(VERSION_CODES.N)
   public static final int VIA_NUMBER = 25;
 
   @RequiresApi(VERSION_CODES.O)
   public static final int TRANSCRIPTION_STATE = 26;
 
-  private static final String[] PROJECTION_M =
+  private static final String[] PROJECTION_N =
       new String[] {
         Calls._ID, // 0
         Calls.NUMBER, // 1
@@ -89,17 +85,10 @@
         Calls.DATA_USAGE, // 21
         Calls.TRANSCRIPTION, // 22
         Calls.CACHED_PHOTO_URI, // 23
+        CallLog.Calls.POST_DIAL_DIGITS, // 24
+        CallLog.Calls.VIA_NUMBER // 25
       };
 
-  private static final String[] PROJECTION_N;
-
-  static {
-    List<String> projectionList = new ArrayList<>(Arrays.asList(PROJECTION_M));
-    projectionList.add(CallLog.Calls.POST_DIAL_DIGITS);
-    projectionList.add(CallLog.Calls.VIA_NUMBER);
-    PROJECTION_N = projectionList.toArray(new String[projectionList.size()]);
-  }
-
   private static final String[] PROJECTION_O;
 
   // TODO(mdooley): remove when this becomes a public api
@@ -114,12 +103,6 @@
 
   @NonNull
   public static String[] getProjection() {
-    if (VERSION.SDK_INT >= VERSION_CODES.O) {
-      return PROJECTION_O;
-    }
-    if (VERSION.SDK_INT >= VERSION_CODES.N) {
-      return PROJECTION_N;
-    }
-    return PROJECTION_M;
+    return VERSION.SDK_INT >= VERSION_CODES.O ? PROJECTION_O : PROJECTION_N;
   }
 }
diff --git a/java/com/android/dialer/phonenumbercache/ContactInfoHelper.java b/java/com/android/dialer/phonenumbercache/ContactInfoHelper.java
index 01f9669..6179b5d 100644
--- a/java/com/android/dialer/phonenumbercache/ContactInfoHelper.java
+++ b/java/com/android/dialer/phonenumbercache/ContactInfoHelper.java
@@ -14,14 +14,11 @@
 
 package com.android.dialer.phonenumbercache;
 
-import android.annotation.TargetApi;
 import android.content.ContentValues;
 import android.content.Context;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteFullException;
 import android.net.Uri;
-import android.os.Build.VERSION;
-import android.os.Build.VERSION_CODES;
 import android.provider.CallLog.Calls;
 import android.provider.ContactsContract;
 import android.provider.ContactsContract.CommonDataKinds.Phone;
@@ -38,7 +35,6 @@
 import com.android.contacts.common.util.Constants;
 import com.android.dialer.common.Assert;
 import com.android.dialer.common.LogUtil;
-import com.android.dialer.common.cp2.DirectoryCompat;
 import com.android.dialer.logging.ContactSource;
 import com.android.dialer.oem.CequintCallerIdManager;
 import com.android.dialer.oem.CequintCallerIdManager.CequintCallerIdContact;
@@ -53,8 +49,6 @@
 import org.json.JSONObject;
 
 /** Utility class to look up the contact information for a given number. */
-// This class uses Java 7 language features, so it must target M+
-@TargetApi(VERSION_CODES.M)
 public class ContactInfoHelper {
 
   private static final String TAG = ContactInfoHelper.class.getSimpleName();
@@ -112,12 +106,12 @@
 
     if (directoryId != null) {
       // Query {@link Contacts#CONTENT_LOOKUP_URI} with work lookup key is not allowed.
-      if (DirectoryCompat.isEnterpriseDirectoryId(directoryId)) {
+      if (Directory.isEnterpriseDirectoryId(directoryId)) {
         return null;
       }
 
       // Skip this to avoid an extra remote network call for alternative name
-      if (DirectoryCompat.isRemoteDirectoryId(directoryId)) {
+      if (Directory.isRemoteDirectoryId(directoryId)) {
         return null;
       }
     }
@@ -153,15 +147,6 @@
     // Get URI for the number in the PhoneLookup table, with a parameter to indicate whether
     // the number is a SIP number.
     Uri uri = PhoneLookup.ENTERPRISE_CONTENT_FILTER_URI;
-    if (VERSION.SDK_INT < VERSION_CODES.N) {
-      if (directoryId != -1) {
-        // ENTERPRISE_CONTENT_FILTER_URI in M doesn't support directory lookup
-        uri = PhoneLookup.CONTENT_FILTER_URI;
-      } else {
-        // a bug in M. PhoneLookup.ENTERPRISE_CONTENT_FILTER_URI, encodes twice.
-        number = Uri.encode(number);
-      }
-    }
     Uri.Builder builder =
         uri.buildUpon()
             .appendPath(number)
@@ -187,8 +172,7 @@
     info.type = c.getInt(CallLogQuery.CACHED_NUMBER_TYPE);
     info.label = c.getString(CallLogQuery.CACHED_NUMBER_LABEL);
     String matchedNumber = c.getString(CallLogQuery.CACHED_MATCHED_NUMBER);
-    String postDialDigits =
-        (VERSION.SDK_INT >= VERSION_CODES.N) ? c.getString(CallLogQuery.POST_DIAL_DIGITS) : "";
+    String postDialDigits = c.getString(CallLogQuery.POST_DIAL_DIGITS);
     info.number =
         (matchedNumber == null) ? c.getString(CallLogQuery.NUMBER) + postDialDigits : matchedNumber;
 
@@ -294,10 +278,7 @@
 
   private List<Long> getRemoteDirectories(Context context) {
     List<Long> remoteDirectories = new ArrayList<>();
-    Uri uri =
-        VERSION.SDK_INT >= VERSION_CODES.N
-            ? Directory.ENTERPRISE_CONTENT_URI
-            : Directory.CONTENT_URI;
+    Uri uri = Directory.ENTERPRISE_CONTENT_URI;
     Cursor cursor =
         context.getContentResolver().query(uri, new String[] {Directory._ID}, null, null, null);
     if (cursor == null) {
@@ -307,7 +288,7 @@
     try {
       while (cursor.moveToNext()) {
         long directoryId = cursor.getLong(idIndex);
-        if (DirectoryCompat.isRemoteDirectoryId(directoryId)) {
+        if (Directory.isRemoteDirectoryId(directoryId)) {
           remoteDirectories.add(directoryId);
         }
       }
@@ -341,7 +322,7 @@
             .getContentResolver()
             .query(
                 uri,
-                PhoneQuery.getPhoneLookupProjection(uri),
+                PhoneQuery.getPhoneLookupProjection(),
                 null /* selection */,
                 null /* selectionArgs */,
                 null /* sortOrder */)) {
@@ -640,20 +621,20 @@
       return;
     }
     CequintCallerIdContact cequintCallerIdContact =
-        cequintCallerIdManager.getCequintCallerIdContact(context, number);
+        cequintCallerIdManager.getCachedCequintCallerIdContact(context, number);
     if (cequintCallerIdContact == null) {
       return;
     }
-    if (TextUtils.isEmpty(info.name) && !TextUtils.isEmpty(cequintCallerIdContact.name)) {
-      info.name = cequintCallerIdContact.name;
+    if (TextUtils.isEmpty(info.name) && !TextUtils.isEmpty(cequintCallerIdContact.name())) {
+      info.name = cequintCallerIdContact.name();
     }
-    if (!TextUtils.isEmpty(cequintCallerIdContact.geoDescription)) {
-      info.geoDescription = cequintCallerIdContact.geoDescription;
+    if (!TextUtils.isEmpty(cequintCallerIdContact.geolocation())) {
+      info.geoDescription = cequintCallerIdContact.geolocation();
       info.sourceType = ContactSource.Type.SOURCE_TYPE_CEQUINT_CALLER_ID;
     }
     // Only update photo if local lookup has no result.
-    if (!info.contactExists && info.photoUri == null && cequintCallerIdContact.imageUrl != null) {
-      info.photoUri = UriUtils.parseUriOrNull(cequintCallerIdContact.imageUrl);
+    if (!info.contactExists && info.photoUri == null && cequintCallerIdContact.photoUri() != null) {
+      info.photoUri = UriUtils.parseUriOrNull(cequintCallerIdContact.photoUri());
     }
   }
 }
diff --git a/java/com/android/dialer/phonenumbercache/PhoneLookupUtil.java b/java/com/android/dialer/phonenumbercache/PhoneLookupUtil.java
deleted file mode 100644
index 74175e8..0000000
--- a/java/com/android/dialer/phonenumbercache/PhoneLookupUtil.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.dialer.phonenumbercache;
-
-import android.net.Uri;
-import android.os.Build.VERSION;
-import android.os.Build.VERSION_CODES;
-import android.provider.ContactsContract;
-import android.provider.ContactsContract.PhoneLookup;
-
-public final class PhoneLookupUtil {
-
-  private PhoneLookupUtil() {}
-
-  /** @return the column name that stores contact id for phone lookup query. */
-  public static String getContactIdColumnNameForUri(Uri phoneLookupUri) {
-    if (VERSION.SDK_INT >= VERSION_CODES.N) {
-      return PhoneLookup.CONTACT_ID;
-    }
-    // In pre-N, contact id is stored in {@link PhoneLookup#_ID} in non-sip query.
-    boolean isSip =
-        phoneLookupUri.getBooleanQueryParameter(
-            ContactsContract.PhoneLookup.QUERY_PARAMETER_SIP_ADDRESS, false);
-    return (isSip) ? PhoneLookup.CONTACT_ID : ContactsContract.PhoneLookup._ID;
-  }
-}
diff --git a/java/com/android/dialer/phonenumbercache/PhoneQuery.java b/java/com/android/dialer/phonenumbercache/PhoneQuery.java
index 5ddd5f8..a43e489 100644
--- a/java/com/android/dialer/phonenumbercache/PhoneQuery.java
+++ b/java/com/android/dialer/phonenumbercache/PhoneQuery.java
@@ -16,10 +16,6 @@
 
 package com.android.dialer.phonenumbercache;
 
-import android.net.Uri;
-import android.os.Build.VERSION;
-import android.os.Build.VERSION_CODES;
-import android.provider.ContactsContract;
 import android.provider.ContactsContract.CommonDataKinds.Phone;
 import android.provider.ContactsContract.Contacts;
 import android.provider.ContactsContract.PhoneLookup;
@@ -27,27 +23,27 @@
 /** The queries to look up the {@link ContactInfo} for a given number in the Call Log. */
 final class PhoneQuery {
 
-  public static final int PERSON_ID = 0;
-  public static final int NAME = 1;
-  public static final int PHONE_TYPE = 2;
-  public static final int LABEL = 3;
-  public static final int MATCHED_NUMBER = 4;
-  public static final int NORMALIZED_NUMBER = 5;
-  public static final int PHOTO_ID = 6;
-  public static final int LOOKUP_KEY = 7;
-  public static final int PHOTO_URI = 8;
+  static final int PERSON_ID = 0;
+  static final int NAME = 1;
+  static final int PHONE_TYPE = 2;
+  static final int LABEL = 3;
+  static final int MATCHED_NUMBER = 4;
+  static final int NORMALIZED_NUMBER = 5;
+  static final int PHOTO_ID = 6;
+  static final int LOOKUP_KEY = 7;
+  static final int PHOTO_URI = 8;
   /** Projection to look up a contact's DISPLAY_NAME_ALTERNATIVE */
-  public static final String[] DISPLAY_NAME_ALTERNATIVE_PROJECTION =
+  static final String[] DISPLAY_NAME_ALTERNATIVE_PROJECTION =
       new String[] {
         Contacts.DISPLAY_NAME_ALTERNATIVE,
       };
 
-  public static final int NAME_ALTERNATIVE = 0;
+  static final int NAME_ALTERNATIVE = 0;
 
-  public static final String[] ADDITIONAL_CONTACT_INFO_PROJECTION =
+  static final String[] ADDITIONAL_CONTACT_INFO_PROJECTION =
       new String[] {Phone.DISPLAY_NAME_ALTERNATIVE, Phone.CARRIER_PRESENCE};
-  public static final int ADDITIONAL_CONTACT_INFO_DISPLAY_NAME_ALTERNATIVE = 0;
-  public static final int ADDITIONAL_CONTACT_INFO_CARRIER_PRESENCE = 1;
+  static final int ADDITIONAL_CONTACT_INFO_DISPLAY_NAME_ALTERNATIVE = 0;
+  static final int ADDITIONAL_CONTACT_INFO_CARRIER_PRESENCE = 1;
 
   /**
    * Projection to look up the ContactInfo. Does not include DISPLAY_NAME_ALTERNATIVE as that column
@@ -66,31 +62,8 @@
         PhoneLookup.LOOKUP_KEY,
         PhoneLookup.PHOTO_URI
       };
-  /**
-   * Similar to {@link PHONE_LOOKUP_PROJECTION}. In pre-N, contact id is stored in {@link
-   * PhoneLookup#_ID} in non-sip query.
-   */
-  private static final String[] BACKWARD_COMPATIBLE_NON_SIP_PHONE_LOOKUP_PROJECTION =
-      new String[] {
-        PhoneLookup._ID,
-        PhoneLookup.DISPLAY_NAME,
-        PhoneLookup.TYPE,
-        PhoneLookup.LABEL,
-        PhoneLookup.NUMBER,
-        PhoneLookup.NORMALIZED_NUMBER,
-        PhoneLookup.PHOTO_ID,
-        PhoneLookup.LOOKUP_KEY,
-        PhoneLookup.PHOTO_URI
-      };
 
-  public static String[] getPhoneLookupProjection(Uri phoneLookupUri) {
-    if (VERSION.SDK_INT >= VERSION_CODES.N) {
+  static String[] getPhoneLookupProjection() {
       return PHONE_LOOKUP_PROJECTION;
-    }
-    // Pre-N
-    boolean isSip =
-        phoneLookupUri.getBooleanQueryParameter(
-            ContactsContract.PhoneLookup.QUERY_PARAMETER_SIP_ADDRESS, false);
-    return (isSip) ? PHONE_LOOKUP_PROJECTION : BACKWARD_COMPATIBLE_NON_SIP_PHONE_LOOKUP_PROJECTION;
   }
 }
diff --git a/java/com/android/dialer/phonenumbergeoutil/impl/PhoneNumberGeoUtilImpl.java b/java/com/android/dialer/phonenumbergeoutil/impl/PhoneNumberGeoUtilImpl.java
index fb28ed5..89fe04a 100644
--- a/java/com/android/dialer/phonenumbergeoutil/impl/PhoneNumberGeoUtilImpl.java
+++ b/java/com/android/dialer/phonenumbergeoutil/impl/PhoneNumberGeoUtilImpl.java
@@ -19,7 +19,7 @@
 import android.content.Context;
 import android.text.TextUtils;
 import com.android.dialer.common.LogUtil;
-import com.android.dialer.compat.CompatUtils;
+import com.android.dialer.i18n.LocaleUtils;
 import com.android.dialer.phonenumbergeoutil.PhoneNumberGeoUtil;
 import com.google.i18n.phonenumbers.NumberParseException;
 import com.google.i18n.phonenumbers.PhoneNumberUtil;
@@ -45,7 +45,7 @@
     PhoneNumberUtil util = PhoneNumberUtil.getInstance();
     PhoneNumberOfflineGeocoder geocoder = PhoneNumberOfflineGeocoder.getInstance();
 
-    Locale locale = CompatUtils.getLocale(context);
+    Locale locale = LocaleUtils.getLocale(context);
     Phonenumber.PhoneNumber pn = null;
     try {
       LogUtil.v(
diff --git a/java/com/android/dialer/phonenumbergeoutil/impl/PhoneNumberGeoUtilModule.java b/java/com/android/dialer/phonenumbergeoutil/impl/PhoneNumberGeoUtilModule.java
index 3878ac5..db4f7fa 100644
--- a/java/com/android/dialer/phonenumbergeoutil/impl/PhoneNumberGeoUtilModule.java
+++ b/java/com/android/dialer/phonenumbergeoutil/impl/PhoneNumberGeoUtilModule.java
@@ -16,12 +16,15 @@
 
 package com.android.dialer.phonenumbergeoutil.impl;
 
+import com.android.dialer.inject.DialerVariant;
+import com.android.dialer.inject.InstallIn;
 import com.android.dialer.phonenumbergeoutil.PhoneNumberGeoUtil;
 import dagger.Binds;
 import dagger.Module;
 import javax.inject.Singleton;
 
 /** Module which binds {@link PhoneNumberGeoUtilImpl}. */
+@InstallIn(variants = {DialerVariant.DIALER_TEST})
 @Module
 public abstract class PhoneNumberGeoUtilModule {
 
diff --git a/java/com/android/dialer/phonenumberproto/DialerPhoneNumberUtil.java b/java/com/android/dialer/phonenumberproto/DialerPhoneNumberUtil.java
index a5b9520..d8079ef 100644
--- a/java/com/android/dialer/phonenumberproto/DialerPhoneNumberUtil.java
+++ b/java/com/android/dialer/phonenumberproto/DialerPhoneNumberUtil.java
@@ -29,6 +29,7 @@
 import com.google.i18n.phonenumbers.PhoneNumberUtil.MatchType;
 import com.google.i18n.phonenumbers.PhoneNumberUtil.PhoneNumberFormat;
 import com.google.i18n.phonenumbers.Phonenumber.PhoneNumber;
+import com.google.i18n.phonenumbers.ShortNumberInfo;
 
 /**
  * Wrapper for selected methods in {@link PhoneNumberUtil} which uses the {@link DialerPhoneNumber}
@@ -38,11 +39,13 @@
  */
 public class DialerPhoneNumberUtil {
   private final PhoneNumberUtil phoneNumberUtil;
+  private final ShortNumberInfo shortNumberInfo;
 
   @WorkerThread
-  public DialerPhoneNumberUtil(@NonNull PhoneNumberUtil phoneNumberUtil) {
+  public DialerPhoneNumberUtil() {
     Assert.isWorkerThread();
-    this.phoneNumberUtil = Assert.isNotNull(phoneNumberUtil);
+    this.phoneNumberUtil = PhoneNumberUtil.getInstance();
+    this.shortNumberInfo = ShortNumberInfo.getInstance();
   }
 
   /**
@@ -159,6 +162,13 @@
       return firstNumberIn.getNormalizedNumber().equals(secondNumberIn.getNormalizedNumber());
     }
 
+    // Both numbers are parseable, first check for short codes to so that a number like "5555"
+    // doesn't match "55555" (due to those being a SHORT_NSN_MATCH below).
+    if (shortNumberInfo.isPossibleShortNumber(phoneNumber1)
+        || shortNumberInfo.isPossibleShortNumber(phoneNumber2)) {
+      return firstNumberIn.getNormalizedNumber().equals(secondNumberIn.getNormalizedNumber());
+    }
+
     // Both numbers are parseable, use more sophisticated libphonenumber matching.
     MatchType matchType = phoneNumberUtil.isNumberMatch(phoneNumber1, phoneNumber2);
 
diff --git a/java/com/android/dialer/phonenumberutil/PhoneNumberHelper.java b/java/com/android/dialer/phonenumberutil/PhoneNumberHelper.java
index f5e6346..df7716c 100644
--- a/java/com/android/dialer/phonenumberutil/PhoneNumberHelper.java
+++ b/java/com/android/dialer/phonenumberutil/PhoneNumberHelper.java
@@ -25,24 +25,27 @@
 import android.support.annotation.Nullable;
 import android.telecom.PhoneAccountHandle;
 import android.telephony.PhoneNumberUtils;
+import android.telephony.SubscriptionInfo;
 import android.telephony.TelephonyManager;
 import android.text.BidiFormatter;
 import android.text.TextDirectionHeuristics;
 import android.text.TextUtils;
 import com.android.dialer.common.Assert;
 import com.android.dialer.common.LogUtil;
-import com.android.dialer.compat.CompatUtils;
 import com.android.dialer.compat.telephony.TelephonyManagerCompat;
+import com.android.dialer.i18n.LocaleUtils;
+import com.android.dialer.oem.MotorolaUtils;
+import com.android.dialer.oem.PhoneNumberUtilsAccessor;
 import com.android.dialer.phonenumbergeoutil.PhoneNumberGeoUtilComponent;
 import com.android.dialer.telecom.TelecomUtil;
-import com.google.common.base.Ascii;
+import com.google.common.base.Optional;
 import java.util.Arrays;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
 
 public class PhoneNumberHelper {
 
-  private static final String TAG = "PhoneNumberUtil";
   private static final Set<String> LEGACY_UNKNOWN_NUMBERS =
       new HashSet<>(Arrays.asList("-1", "-2", "-3"));
 
@@ -139,6 +142,39 @@
   }
 
   /**
+   * An enhanced version of {@link PhoneNumberUtils#isLocalEmergencyNumber(Context, String)}.
+   *
+   * <p>This methods supports checking the number for all SIMs.
+   *
+   * @param context the context which the number should be checked against
+   * @param number the number to tbe checked
+   * @return true if the specified number is an emergency number for any SIM in the device.
+   */
+  @SuppressWarnings("Guava")
+  public static boolean isLocalEmergencyNumber(Context context, String number) {
+    List<PhoneAccountHandle> phoneAccountHandles =
+        TelecomUtil.getSubscriptionPhoneAccounts(context);
+
+    // If the number of phone accounts with a subscription is no greater than 1, only one SIM is
+    // installed in the device. We hand over the job to PhoneNumberUtils#isLocalEmergencyNumber.
+    if (phoneAccountHandles.size() <= 1) {
+      return PhoneNumberUtils.isLocalEmergencyNumber(context, number);
+    }
+
+    for (PhoneAccountHandle phoneAccountHandle : phoneAccountHandles) {
+      Optional<SubscriptionInfo> subscriptionInfo =
+          TelecomUtil.getSubscriptionInfo(context, phoneAccountHandle);
+      if (subscriptionInfo.isPresent()
+          && PhoneNumberUtilsAccessor.isLocalEmergencyNumber(
+              context, subscriptionInfo.get().getSubscriptionId(), number)) {
+        return true;
+      }
+    }
+
+    return false;
+  }
+
+  /**
    * Returns true if the given number is the number of the configured voicemail. To be able to
    * mock-out this, it is not a static method.
    */
@@ -213,7 +249,7 @@
         TelephonyManagerCompat.getNetworkCountryIsoForPhoneAccountHandle(
             context, phoneAccountHandle);
     if (TextUtils.isEmpty(countryIso)) {
-      countryIso = CompatUtils.getLocale(context).getCountry();
+      countryIso = LocaleUtils.getLocale(context).getCountry();
       LogUtil.i(
           "PhoneNumberHelper.getCurrentCountryIso",
           "No CountryDetector; falling back to countryIso based on locale: " + countryIso);
@@ -239,14 +275,7 @@
       return null;
     }
 
-    // Argentina phone number formats are complex and PhoneNumberUtils doesn't format all Argentina
-    // numbers correctly.
-    // To ensure consistent user experience, we disable phone number formatting for all numbers
-    // (not just Argentinian ones) for devices with Argentinian SIMs.
-    TelephonyManager telephonyManager =
-        (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
-    if (telephonyManager != null
-        && "AR".equals(Ascii.toUpperCase(telephonyManager.getSimCountryIso()))) {
+    if (MotorolaUtils.shouldDisablePhoneNumberFormatting(context)) {
       return number;
     }
 
diff --git a/java/com/android/dialer/phonenumberutil/res/values-af/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-af/strings.xml
index 86d4c78..27ed500 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-af/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-af/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="private_num_verizon" msgid="3281061244372204957">"Beperk"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"Privaat nommer"</string>
+<resources>
+  <string name="private_num_verizon">Beperk</string>
+  <string name="private_num_non_verizon">Privaat nommer</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-am/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-am/strings.xml
index 117d96c..6127163 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-am/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-am/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="private_num_verizon" msgid="3281061244372204957">"ተገድቧል"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"የግል ቁጥር"</string>
+<resources>
+  <string name="private_num_verizon">ተገድቧል</string>
+  <string name="private_num_non_verizon">የግል ቁጥር</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-ar/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-ar/strings.xml
index 72e5f40..af8a568 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-ar/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-ar/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="private_num_verizon" msgid="3281061244372204957">"مقيّد"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"رقم خاص"</string>
+<resources>
+  <string name="private_num_verizon">محظور  </string>
+  <string name="private_num_non_verizon">رقم خاص</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-az/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-az/strings.xml
index c6010af..fe93ace 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-az/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-az/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="private_num_verizon" msgid="3281061244372204957">"Məhdudlaşdırılmış"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"Gizli nömrə"</string>
+<resources>
+  <string name="private_num_verizon">Məhdudlaşdırılmış</string>
+  <string name="private_num_non_verizon">Gizli nömrə</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-b+sr+Latn/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-b+sr+Latn/strings.xml
index bab794c..4012a0f 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-b+sr+Latn/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-b+sr+Latn/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="private_num_verizon" msgid="3281061244372204957">"Ograničeno"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"Privatan broj"</string>
+<resources>
+  <string name="private_num_verizon">Ograničeno</string>
+  <string name="private_num_non_verizon">Privatan broj</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-be/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-be/strings.xml
index 94ed613..563c703 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-be/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-be/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="private_num_verizon" msgid="3281061244372204957">"Абмежавана"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"Прыватны нумар"</string>
+<resources>
+  <string name="private_num_verizon">Абмежавана</string>
+  <string name="private_num_non_verizon">Прыватны нумар</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-bg/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-bg/strings.xml
index 59a1c56..71f6090 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-bg/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-bg/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="private_num_verizon" msgid="3281061244372204957">"Ограничен"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"Частен номер"</string>
+<resources>
+  <string name="private_num_verizon">Ограничен</string>
+  <string name="private_num_non_verizon">Частен номер</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-bn/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-bn/strings.xml
index 16dbe8e..b08721a 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-bn/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-bn/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="private_num_verizon" msgid="3281061244372204957">"বিধিনিষেধযুক্ত"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"ব্যক্তিগত নম্বর"</string>
+<resources>
+  <string name="private_num_verizon">বিধিনিষেধযুক্ত</string>
+  <string name="private_num_non_verizon">ব্যক্তিগত নম্বর</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-bs/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-bs/strings.xml
index 444bce0..54fa43e 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-bs/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-bs/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="private_num_verizon" msgid="3281061244372204957">"Ograničeno"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"Privatni broj"</string>
+<resources>
+  <string name="private_num_verizon">Ograničeno</string>
+  <string name="private_num_non_verizon">Privatni broj</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-ca/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-ca/strings.xml
index 917bc3a..e9ccb4c 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-ca/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-ca/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="private_num_verizon" msgid="3281061244372204957">"Restringit"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"Número privat"</string>
+<resources>
+  <string name="private_num_verizon">Restringit</string>
+  <string name="private_num_non_verizon">Número privat</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-cs/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-cs/strings.xml
index 57e0049..7c225fa 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-cs/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-cs/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="private_num_verizon" msgid="3281061244372204957">"Omezeno"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"Soukromé číslo"</string>
+<resources>
+  <string name="private_num_verizon">Omezeno</string>
+  <string name="private_num_non_verizon">Soukromé číslo</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-da/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-da/strings.xml
index 16fa7e5..e9975f4 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-da/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-da/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="private_num_verizon" msgid="3281061244372204957">"Privat"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"Privat nummer"</string>
+<resources>
+  <string name="private_num_verizon">Privat</string>
+  <string name="private_num_non_verizon">Privat nummer</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-de/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-de/strings.xml
index cd1ae23..01d6803 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-de/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-de/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="private_num_verizon" msgid="3281061244372204957">"Beschränkt"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"Private Nummer"</string>
+<resources>
+  <string name="private_num_verizon">Beschränkt</string>
+  <string name="private_num_non_verizon">Private Nummer</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-el/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-el/strings.xml
index 50cbd8b..e1782c8 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-el/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-el/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="private_num_verizon" msgid="3281061244372204957">"Περιορισμένος"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"Απόκρυψη αριθμού"</string>
+<resources>
+  <string name="private_num_verizon">Περιορισμένος</string>
+  <string name="private_num_non_verizon">Απόκρυψη αριθμού</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-en-rAU/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-en-rAU/strings.xml
index e5db44b..8e85d0b 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-en-rAU/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-en-rAU/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="private_num_verizon" msgid="3281061244372204957">"Restricted"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"Private number"</string>
+<resources>
+  <string name="private_num_verizon">Restricted</string>
+  <string name="private_num_non_verizon">Private number</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-en-rGB/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-en-rGB/strings.xml
index e5db44b..8e85d0b 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-en-rGB/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-en-rGB/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="private_num_verizon" msgid="3281061244372204957">"Restricted"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"Private number"</string>
+<resources>
+  <string name="private_num_verizon">Restricted</string>
+  <string name="private_num_non_verizon">Private number</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-en-rIN/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-en-rIN/strings.xml
index e5db44b..8e85d0b 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-en-rIN/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-en-rIN/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="private_num_verizon" msgid="3281061244372204957">"Restricted"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"Private number"</string>
+<resources>
+  <string name="private_num_verizon">Restricted</string>
+  <string name="private_num_non_verizon">Private number</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-es-rUS/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-es-rUS/strings.xml
index 279a537..7515f32 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-es-rUS/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-es-rUS/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="private_num_verizon" msgid="3281061244372204957">"Restringido"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"Número privado"</string>
+<resources>
+  <string name="private_num_verizon">Restringido</string>
+  <string name="private_num_non_verizon">Número privado</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-es/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-es/strings.xml
index eb6ec76..637d072 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-es/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-es/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="private_num_verizon" msgid="3281061244372204957">"Restringidas"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"Número privado"</string>
+<resources>
+  <string name="private_num_verizon">Restringidas</string>
+  <string name="private_num_non_verizon">Número privado</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-et/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-et/strings.xml
index b1affbd..bf886ff 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-et/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-et/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="private_num_verizon" msgid="3281061244372204957">"Piiratud"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"Varjatud number"</string>
+<resources>
+  <string name="private_num_verizon">Piiratud</string>
+  <string name="private_num_non_verizon">Varjatud number</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-eu/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-eu/strings.xml
index 41dcfcc..5ac836f 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-eu/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-eu/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="private_num_verizon" msgid="3281061244372204957">"Murriztua"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"Zenbaki pribatua"</string>
+<resources>
+  <string name="private_num_verizon">Murriztua</string>
+  <string name="private_num_non_verizon">Zenbaki pribatua</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-fa/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-fa/strings.xml
index dd6908d..6b3d2c8 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-fa/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-fa/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="private_num_verizon" msgid="3281061244372204957">"محدودشده"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"شماره خصوصی"</string>
+<resources>
+  <string name="private_num_verizon">محدودشده</string>
+  <string name="private_num_non_verizon">شماره خصوصی</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-fi/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-fi/strings.xml
index 0d901c4..eb7ff9f 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-fi/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-fi/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="private_num_verizon" msgid="3281061244372204957">"Rajoitettu"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"Yksityinen numero"</string>
+<resources>
+  <string name="private_num_verizon">Rajoitettu</string>
+  <string name="private_num_non_verizon">Yksityinen numero</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-fr-rCA/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-fr-rCA/strings.xml
index 1915d9d..4949bba 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-fr-rCA/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-fr-rCA/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="private_num_verizon" msgid="3281061244372204957">"Numéro privé"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"Numéro privé"</string>
+<resources>
+  <string name="private_num_verizon">Numéro privé</string>
+  <string name="private_num_non_verizon">Numéro privé</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-fr/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-fr/strings.xml
index 372f122..37ae694 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-fr/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-fr/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="private_num_verizon" msgid="3281061244372204957">"Restreint"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"Numéro privé"</string>
+<resources>
+  <string name="private_num_verizon">Restreint</string>
+  <string name="private_num_non_verizon">Numéro privé</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-gl/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-gl/strings.xml
index d034dad..1a001c3 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-gl/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-gl/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="private_num_verizon" msgid="3281061244372204957">"Restrinxido"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"Número privado"</string>
+<resources>
+  <string name="private_num_verizon">Restrinxido</string>
+  <string name="private_num_non_verizon">Número privado</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-gu/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-gu/strings.xml
index e2aef44..4c3b067 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-gu/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-gu/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="private_num_verizon" msgid="3281061244372204957">"પ્રતિબંધિત"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"ખાનગી નંબર"</string>
+<resources>
+  <string name="private_num_verizon">પ્રતિબંધિત</string>
+  <string name="private_num_non_verizon">ખાનગી નંબર</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-hi/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-hi/strings.xml
index 4b60490..5a6ba89 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-hi/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-hi/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="private_num_verizon" msgid="3281061244372204957">"प्रतिबंधित"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"निजी नंबर"</string>
+<resources>
+  <string name="private_num_verizon">प्रतिबंधित</string>
+  <string name="private_num_non_verizon">निजी नंबर</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-hr/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-hr/strings.xml
index 444bce0..54fa43e 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-hr/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-hr/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="private_num_verizon" msgid="3281061244372204957">"Ograničeno"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"Privatni broj"</string>
+<resources>
+  <string name="private_num_verizon">Ograničeno</string>
+  <string name="private_num_non_verizon">Privatni broj</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-hu/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-hu/strings.xml
index 17ce312..c54d830 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-hu/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-hu/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="private_num_verizon" msgid="3281061244372204957">"Korlátozott"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"Magántelefonszám"</string>
+<resources>
+  <string name="private_num_verizon">Korlátozott</string>
+  <string name="private_num_non_verizon">Magántelefonszám</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-hy/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-hy/strings.xml
index fe1a48f..3fc82ef 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-hy/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-hy/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="private_num_verizon" msgid="3281061244372204957">"Սահմանափակված"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"Փակ համար"</string>
+<resources>
+  <string name="private_num_verizon">Սահմանափակված</string>
+  <string name="private_num_non_verizon">Փակ համար</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-in/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-in/strings.xml
index 844d704..713666d 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-in/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-in/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="private_num_verizon" msgid="3281061244372204957">"Dibatasi"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"Nomor pribadi"</string>
+<resources>
+  <string name="private_num_verizon">Dibatasi</string>
+  <string name="private_num_non_verizon">Nomor pribadi</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-is/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-is/strings.xml
index c2b1440..cbc6c28 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-is/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-is/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="private_num_verizon" msgid="3281061244372204957">"Einkanúmer"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"Leyninúmer"</string>
+<resources>
+  <string name="private_num_verizon">Einkanúmer</string>
+  <string name="private_num_non_verizon">Leyninúmer</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-it/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-it/strings.xml
index c8f8fed..1f80844 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-it/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-it/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="private_num_verizon" msgid="3281061244372204957">"Limitata"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"Numero privato"</string>
+<resources>
+  <string name="private_num_verizon">Limitata</string>
+  <string name="private_num_non_verizon">Numero privato</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-iw/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-iw/strings.xml
index 25d55b1..3844682 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-iw/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-iw/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="private_num_verizon" msgid="3281061244372204957">"מספר חסום"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"מספר פרטי"</string>
+<resources>
+  <string name="private_num_verizon">מספר חסום</string>
+  <string name="private_num_non_verizon">מספר פרטי</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-ja/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-ja/strings.xml
index 1e2b09b..f28d08f 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-ja/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-ja/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="private_num_verizon" msgid="3281061244372204957">"制限されています"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"非通知設定"</string>
+<resources>
+  <string name="private_num_verizon">制限されています</string>
+  <string name="private_num_non_verizon">非通知設定</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-ka/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-ka/strings.xml
index 8bc1b6f..421b616 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-ka/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-ka/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="private_num_verizon" msgid="3281061244372204957">"შეზღუდული"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"დაფარული ნომერი"</string>
+<resources>
+  <string name="private_num_verizon">შეზღუდული</string>
+  <string name="private_num_non_verizon">დაფარული ნომერი</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-kk/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-kk/strings.xml
index 1679a13..24a06f8 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-kk/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-kk/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="private_num_verizon" msgid="3281061244372204957">"Шектелген"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"Жеке нөмір"</string>
+<resources>
+  <string name="private_num_verizon">Шектелген</string>
+  <string name="private_num_non_verizon">Жеке нөмір</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-km/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-km/strings.xml
index d079ad4..cf32395 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-km/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-km/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="private_num_verizon" msgid="3281061244372204957">"បាន​ដាក់​កម្រិត"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"លេខ​ឯកជន"</string>
+<resources>
+  <string name="private_num_verizon">បាន​ដាក់​កម្រិត</string>
+  <string name="private_num_non_verizon">លេខ​ឯកជន</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-kn/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-kn/strings.xml
index 982cee5..e1c8194 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-kn/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-kn/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="private_num_verizon" msgid="3281061244372204957">"ನಿರ್ಬಂಧಿಸಲಾಗಿದೆ"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"ಖಾಸಗಿ ಸಂಖ್ಯೆ"</string>
+<resources>
+  <string name="private_num_verizon">ನಿರ್ಬಂಧಿಸಲಾಗಿದೆ</string>
+  <string name="private_num_non_verizon">ಖಾಸಗಿ ಸಂಖ್ಯೆ</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-ko/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-ko/strings.xml
index 72b4c7c..ead9f7a 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-ko/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-ko/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="private_num_verizon" msgid="3281061244372204957">"제한됨"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"비공개 번호"</string>
+<resources>
+  <string name="private_num_verizon">제한됨</string>
+  <string name="private_num_non_verizon">비공개 번호</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-ky/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-ky/strings.xml
index 5470991..d64aa74 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-ky/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-ky/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="private_num_verizon" msgid="3281061244372204957">"Чектелген"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"Купуя номер"</string>
+<resources>
+  <string name="private_num_verizon">Чектелген</string>
+  <string name="private_num_non_verizon">Купуя номер</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-lo/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-lo/strings.xml
index 5c980bf..3b4cfa3 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-lo/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-lo/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="private_num_verizon" msgid="3281061244372204957">"ຖືກຈຳກັດ"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"ເບີສ່ວນຕົວ"</string>
+<resources>
+  <string name="private_num_verizon">ຖືກຈຳກັດ</string>
+  <string name="private_num_non_verizon">ເບີສ່ວນຕົວ</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-lt/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-lt/strings.xml
index 3374aae..1df0133 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-lt/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-lt/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="private_num_verizon" msgid="3281061244372204957">"Apriboti"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"Privatus numeris"</string>
+<resources>
+  <string name="private_num_verizon">Apriboti</string>
+  <string name="private_num_non_verizon">Privatus numeris</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-lv/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-lv/strings.xml
index 02eb2ea..c6dd574 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-lv/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-lv/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="private_num_verizon" msgid="3281061244372204957">"Ierobežots"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"Privāts numurs"</string>
+<resources>
+  <string name="private_num_verizon">Ierobežots</string>
+  <string name="private_num_non_verizon">Privāts numurs</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-mk/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-mk/strings.xml
index c5d670b..ba79acf 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-mk/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-mk/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="private_num_verizon" msgid="3281061244372204957">"Ограничено"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"Приватен број"</string>
+<resources>
+  <string name="private_num_verizon">Ограничено</string>
+  <string name="private_num_non_verizon">Приватен број</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-ml/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-ml/strings.xml
index de8de2f..f689835 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-ml/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-ml/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="private_num_verizon" msgid="3281061244372204957">"നിയന്ത്രിച്ചിരിക്കുന്നു"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"സ്വകാര്യ നമ്പർ"</string>
+<resources>
+  <string name="private_num_verizon">നിയന്ത്രിച്ചിരിക്കുന്നു</string>
+  <string name="private_num_non_verizon">സ്വകാര്യ നമ്പർ</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-mn/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-mn/strings.xml
index a496dc7..eeefc0b 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-mn/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-mn/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="private_num_verizon" msgid="3281061244372204957">"Хязгаарлагдсан"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"Нууцалсан дугаар"</string>
+<resources>
+  <string name="private_num_verizon">Хязгаарлагдсан</string>
+  <string name="private_num_non_verizon">Нууцалсан дугаар</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-mr/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-mr/strings.xml
index 3e6f9e0..2286781 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-mr/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-mr/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="private_num_verizon" msgid="3281061244372204957">"प्रतिबंधित"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"खाजगी नंबर"</string>
+<resources>
+  <string name="private_num_verizon">प्रतिबंधित</string>
+  <string name="private_num_non_verizon">खाजगी नंबर</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-ms/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-ms/strings.xml
index 8f0a945..07106b5 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-ms/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-ms/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="private_num_verizon" msgid="3281061244372204957">"Terhad"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"Nombor peribadi"</string>
+<resources>
+  <string name="private_num_verizon">Terhad</string>
+  <string name="private_num_non_verizon">Nombor peribadi</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-my/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-my/strings.xml
index 7001f8a..8f67cdd 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-my/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-my/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="private_num_verizon" msgid="3281061244372204957">"ကန့်သတ်ထားသည်"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"ပုဂ္ဂလိကဖုန်းနံပါတ်"</string>
+<resources>
+  <string name="private_num_verizon">ကန့်သတ်ထားသည်</string>
+  <string name="private_num_non_verizon">ပုဂ္ဂလိကဖုန်းနံပါတ်</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-nb/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-nb/strings.xml
index 26d252b..8a3fe1d 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-nb/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-nb/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="private_num_verizon" msgid="3281061244372204957">"Begrenset"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"Skjult nummer"</string>
+<resources>
+  <string name="private_num_verizon">Begrenset</string>
+  <string name="private_num_non_verizon">Skjult nummer</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-ne/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-ne/strings.xml
index 6332ec3..d6b66aa 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-ne/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-ne/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="private_num_verizon" msgid="3281061244372204957">"प्रतिबन्धित"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"निजी नम्बर"</string>
+<resources>
+  <string name="private_num_verizon">प्रतिबन्धित</string>
+  <string name="private_num_non_verizon">निजी नम्बर</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-nl/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-nl/strings.xml
index 358fa99..2813a9f 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-nl/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-nl/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="private_num_verizon" msgid="3281061244372204957">"Beperkt"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"Privénummer"</string>
+<resources>
+  <string name="private_num_verizon">Beperkt</string>
+  <string name="private_num_non_verizon">Privénummer</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-no/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-no/strings.xml
index 26d252b..8a3fe1d 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-no/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-no/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="private_num_verizon" msgid="3281061244372204957">"Begrenset"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"Skjult nummer"</string>
+<resources>
+  <string name="private_num_verizon">Begrenset</string>
+  <string name="private_num_non_verizon">Skjult nummer</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-pa/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-pa/strings.xml
index 6cd29a2..00f7045 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-pa/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-pa/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="private_num_verizon" msgid="3281061244372204957">"ਪ੍ਰਤੀਬੰਧਿਤ"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"ਨਿੱਜੀ ਨੰਬਰ"</string>
+<resources>
+  <string name="private_num_verizon">ਪ੍ਰਤੀਬੰਧਿਤ</string>
+  <string name="private_num_non_verizon">ਨਿੱਜੀ ਨੰਬਰ</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-pl/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-pl/strings.xml
index 712a3c6..312b87e 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-pl/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-pl/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="private_num_verizon" msgid="3281061244372204957">"Zastrzeżone"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"Numer prywatny"</string>
+<resources>
+  <string name="private_num_verizon">Zastrzeżone</string>
+  <string name="private_num_non_verizon">Numer prywatny</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-pt-rBR/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-pt-rBR/strings.xml
index 5241b16..495ad7d 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-pt-rBR/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-pt-rBR/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="private_num_verizon" msgid="3281061244372204957">"Restrito"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"Número particular"</string>
+<resources>
+  <string name="private_num_verizon">Restrito</string>
+  <string name="private_num_non_verizon">Número particular</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-pt-rPT/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-pt-rPT/strings.xml
index c41cc36..a145003 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-pt-rPT/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-pt-rPT/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="private_num_verizon" msgid="3281061244372204957">"Restrito"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"Número privado"</string>
+<resources>
+  <string name="private_num_verizon">Restrito</string>
+  <string name="private_num_non_verizon">Número privado</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-pt/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-pt/strings.xml
index 5241b16..495ad7d 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-pt/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-pt/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="private_num_verizon" msgid="3281061244372204957">"Restrito"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"Número particular"</string>
+<resources>
+  <string name="private_num_verizon">Restrito</string>
+  <string name="private_num_non_verizon">Número particular</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-ro/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-ro/strings.xml
index bd1a312..03a0e01 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-ro/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-ro/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="private_num_verizon" msgid="3281061244372204957">"Restricționat"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"Număr privat"</string>
+<resources>
+  <string name="private_num_verizon">Restricționat</string>
+  <string name="private_num_non_verizon">Număr privat</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-ru/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-ru/strings.xml
index ae9ed81..c6e5356 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-ru/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-ru/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="private_num_verizon" msgid="3281061244372204957">"Ограничено"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"Частный номер"</string>
+<resources>
+  <string name="private_num_verizon">Ограничено</string>
+  <string name="private_num_non_verizon">Номер скрыт</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-si/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-si/strings.xml
index 3da9971..360a2fb 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-si/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-si/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="private_num_verizon" msgid="3281061244372204957">"සීමා කළ"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"පුද්ගලික අංකය"</string>
+<resources>
+  <string name="private_num_verizon">සීමා කළ</string>
+  <string name="private_num_non_verizon">පුද්ගලික අංකය</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-sk/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-sk/strings.xml
index f127ab6..22abe59 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-sk/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-sk/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="private_num_verizon" msgid="3281061244372204957">"Obmedzené"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"Súkromné číslo"</string>
+<resources>
+  <string name="private_num_verizon">Obmedzené</string>
+  <string name="private_num_non_verizon">Súkromné číslo</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-sl/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-sl/strings.xml
index 6d44c5b..5be25d4 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-sl/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-sl/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="private_num_verizon" msgid="3281061244372204957">"Omejeno"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"Zasebna številka"</string>
+<resources>
+  <string name="private_num_verizon">Omejeno</string>
+  <string name="private_num_non_verizon">Zasebna številka</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-sq/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-sq/strings.xml
index 13035f4..3f1c3e4 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-sq/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-sq/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="private_num_verizon" msgid="3281061244372204957">"I kufizuar"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"Numër privat"</string>
+<resources>
+  <string name="private_num_verizon">I kufizuar</string>
+  <string name="private_num_non_verizon">Numër privat</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-sr/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-sr/strings.xml
index a6732e7..6803472 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-sr/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-sr/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="private_num_verizon" msgid="3281061244372204957">"Ограничено"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"Приватан број"</string>
+<resources>
+  <string name="private_num_verizon">Ограничено</string>
+  <string name="private_num_non_verizon">Приватан број</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-sv/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-sv/strings.xml
index 187e2ad..a61872c 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-sv/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-sv/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="private_num_verizon" msgid="3281061244372204957">"Hemligt nummer"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"Privat nummer"</string>
+<resources>
+  <string name="private_num_verizon">Hemligt nummer</string>
+  <string name="private_num_non_verizon">Privat nummer</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-sw/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-sw/strings.xml
index 94472c4..26ed3fc 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-sw/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-sw/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="private_num_verizon" msgid="3281061244372204957">"Zilizozuiwa"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"Nambari isiyojulikana"</string>
+<resources>
+  <string name="private_num_verizon">Zilizozuiwa</string>
+  <string name="private_num_non_verizon">Nambari isiyojulikana</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-ta/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-ta/strings.xml
index 4b7796d..5f64e67 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-ta/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-ta/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="private_num_verizon" msgid="3281061244372204957">"வரம்பிட்டவை"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"தனிப்பட்ட எண்"</string>
+<resources>
+  <string name="private_num_verizon">வரம்பிட்டவை</string>
+  <string name="private_num_non_verizon">தனிப்பட்ட எண்</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-te/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-te/strings.xml
index 0bbae69..95a0f78 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-te/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-te/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="private_num_verizon" msgid="3281061244372204957">"నియంత్రించబడింది"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"ప్రైవేట్ నంబర్"</string>
+<resources>
+  <string name="private_num_verizon">నియంత్రించబడింది</string>
+  <string name="private_num_non_verizon">ప్రైవేట్ నంబర్</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-th/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-th/strings.xml
index ba8a64a..78c5f72 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-th/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-th/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="private_num_verizon" msgid="3281061244372204957">"ถูกจำกัด"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"หมายเลขส่วนตัว"</string>
+<resources>
+  <string name="private_num_verizon">ถูกจำกัด</string>
+  <string name="private_num_non_verizon">หมายเลขส่วนตัว</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-tl/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-tl/strings.xml
index 90e4a89..f15f069 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-tl/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-tl/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="private_num_verizon" msgid="3281061244372204957">"Pinaghihigpitan"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"Pribadong numero"</string>
+<resources>
+  <string name="private_num_verizon">Pinaghihigpitan</string>
+  <string name="private_num_non_verizon">Pribadong numero</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-tr/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-tr/strings.xml
index 93905ab..22e49f3 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-tr/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-tr/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="private_num_verizon" msgid="3281061244372204957">"Kısıtlanmış"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"Özel numara"</string>
+<resources>
+  <string name="private_num_verizon">Kısıtlanmış</string>
+  <string name="private_num_non_verizon">Özel numara</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-uk/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-uk/strings.xml
index b374958..fd4881c 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-uk/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-uk/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="private_num_verizon" msgid="3281061244372204957">"Обмежено"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"Приватний номер"</string>
+<resources>
+  <string name="private_num_verizon">Обмежено</string>
+  <string name="private_num_non_verizon">Приватний номер</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-ur/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-ur/strings.xml
index 5812528..52358ef 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-ur/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-ur/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="private_num_verizon" msgid="3281061244372204957">"ممنوع"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"نجی نمبر"</string>
+<resources>
+  <string name="private_num_verizon">ممنوع</string>
+  <string name="private_num_non_verizon">نجی نمبر</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-uz/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-uz/strings.xml
index b1d0332..0504781 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-uz/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-uz/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="private_num_verizon" msgid="3281061244372204957">"Cheklangan"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"Maxfiy raqam"</string>
+<resources>
+  <string name="private_num_verizon">Cheklangan</string>
+  <string name="private_num_non_verizon">Maxfiy raqam</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-vi/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-vi/strings.xml
index 12092f6..bbd2a58 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-vi/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-vi/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="private_num_verizon" msgid="3281061244372204957">"Bị giới hạn"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"Số cá nhân"</string>
+<resources>
+  <string name="private_num_verizon">Bị giới hạn</string>
+  <string name="private_num_non_verizon">Số cá nhân</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-zh-rCN/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-zh-rCN/strings.xml
index e269781..40c3213 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-zh-rCN/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-zh-rCN/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="private_num_verizon" msgid="3281061244372204957">"受限"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"私密号码"</string>
+<resources>
+  <string name="private_num_verizon">受限</string>
+  <string name="private_num_non_verizon">私密号码</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-zh-rHK/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-zh-rHK/strings.xml
index 6020b25..e687a5f 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-zh-rHK/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-zh-rHK/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="private_num_verizon" msgid="3281061244372204957">"受限制"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"私人號碼"</string>
+<resources>
+  <string name="private_num_verizon">受限制</string>
+  <string name="private_num_non_verizon">私人號碼</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-zh-rTW/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-zh-rTW/strings.xml
index 20adc65..a497b17 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-zh-rTW/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-zh-rTW/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="private_num_verizon" msgid="3281061244372204957">"受限"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"私人號碼"</string>
+<resources>
+  <string name="private_num_verizon">受限</string>
+  <string name="private_num_non_verizon">私人號碼</string>
 </resources>
diff --git a/java/com/android/dialer/phonenumberutil/res/values-zu/strings.xml b/java/com/android/dialer/phonenumberutil/res/values-zu/strings.xml
index db421af..22cc7ea 100644
--- a/java/com/android/dialer/phonenumberutil/res/values-zu/strings.xml
+++ b/java/com/android/dialer/phonenumberutil/res/values-zu/strings.xml
@@ -1,22 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="private_num_verizon" msgid="3281061244372204957">"Kuvinjelwe"</string>
-    <string name="private_num_non_verizon" msgid="5829254390933301216">"Inombolo eyimfihlo"</string>
+<resources>
+  <string name="private_num_verizon">Kuvinjelwe</string>
+  <string name="private_num_non_verizon">Inombolo eyimfihlo</string>
 </resources>
diff --git a/java/com/android/dialer/postcall/AndroidManifest.xml b/java/com/android/dialer/postcall/AndroidManifest.xml
index a097505..247b6e6 100644
--- a/java/com/android/dialer/postcall/AndroidManifest.xml
+++ b/java/com/android/dialer/postcall/AndroidManifest.xml
@@ -17,11 +17,10 @@
   xmlns:android="http://schemas.android.com/apk/res/android"
   package="com.android.dialer.postcall">
 
-  <application android:theme="@style/Theme.AppCompat">
-    <activity
+  <application>
+  <activity
       android:name="com.android.dialer.postcall.PostCallActivity"
       android:exported="false"
-      android:theme="@style/DialerThemeBase.NoActionBar"
       android:windowSoftInputMode="adjustResize"/>
   </application>
 </manifest>
diff --git a/java/com/android/dialer/postcall/PostCall.java b/java/com/android/dialer/postcall/PostCall.java
index 341db3b..542b8d0 100644
--- a/java/com/android/dialer/postcall/PostCall.java
+++ b/java/com/android/dialer/postcall/PostCall.java
@@ -29,7 +29,7 @@
 import com.android.dialer.common.Assert;
 import com.android.dialer.common.LogUtil;
 import com.android.dialer.configprovider.ConfigProvider;
-import com.android.dialer.configprovider.ConfigProviderBindings;
+import com.android.dialer.configprovider.ConfigProviderComponent;
 import com.android.dialer.enrichedcall.EnrichedCallCapabilities;
 import com.android.dialer.enrichedcall.EnrichedCallComponent;
 import com.android.dialer.enrichedcall.EnrichedCallManager;
@@ -96,7 +96,10 @@
         };
 
     int durationMs =
-        (int) ConfigProviderBindings.get(activity).getLong("post_call_prompt_duration_ms", 8_000);
+        (int)
+            ConfigProviderComponent.get(activity)
+                .getConfigProvider()
+                .getLong("post_call_prompt_duration_ms", 8_000);
     activeSnackbar =
         Snackbar.make(rootView, message, durationMs)
             .setAction(actionText, onClickListener)
@@ -215,7 +218,7 @@
 
     boolean callDisconnectedByUser = manager.getBoolean(KEY_POST_CALL_DISCONNECT_PRESSED, false);
 
-    ConfigProvider binding = ConfigProviderBindings.get(context);
+    ConfigProvider binding = ConfigProviderComponent.get(context).getConfigProvider();
     return disconnectTimeMillis != -1
         && connectTimeMillis != -1
         && isSimReady(context)
@@ -240,7 +243,9 @@
   }
 
   private static boolean isEnabled(Context context) {
-    return ConfigProviderBindings.get(context).getBoolean("enable_post_call_prod", true);
+    return ConfigProviderComponent.get(context)
+        .getConfigProvider()
+        .getBoolean("enable_post_call_prod", true);
   }
 
   private static boolean isSimReady(Context context) {
diff --git a/java/com/android/dialer/postcall/res/layout/post_call_activity.xml b/java/com/android/dialer/postcall/res/layout/post_call_activity.xml
index c42764e..94df324 100644
--- a/java/com/android/dialer/postcall/res/layout/post_call_activity.xml
+++ b/java/com/android/dialer/postcall/res/layout/post_call_activity.xml
@@ -19,7 +19,7 @@
   android:orientation="vertical"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
-  android:background="@color/background_dialer_white">
+  android:background="?android:attr/colorBackground">
 
   <com.android.dialer.widget.DialerToolbar
       android:id="@+id/toolbar"
@@ -30,5 +30,5 @@
     android:id="@+id/message_container"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/background_dialer_white"/>
+    android:background="?android:attr/colorBackground"/>
 </LinearLayout>
\ No newline at end of file
diff --git a/java/com/android/dialer/postcall/res/values-af/strings.xml b/java/com/android/dialer/postcall/res/values-af/strings.xml
index 58e9707..229ff80 100644
--- a/java/com/android/dialer/postcall/res/values-af/strings.xml
+++ b/java/com/android/dialer/postcall/res/values-af/strings.xml
@@ -1,28 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="post_call_message" msgid="3541277172068556862">"Sê waarom jy gebel het"</string>
-    <string name="post_call_message_1" msgid="4827849136801228106">"Dit is dringend. Bel my terug."</string>
-    <string name="post_call_message_2" msgid="5310301526176003385">"Bel my terug wanneer jy \'n tydjie het."</string>
-    <string name="post_call_message_3" msgid="3932759658420368056">"Nie dringend nie, ons kan later klets."</string>
-    <string name="post_call_add_message" msgid="8298853527467080463">"Voeg boodskap by"</string>
-    <string name="post_call_send_message" msgid="8039569617234824873">"Stuur boodskap"</string>
-    <string name="post_call_message_sent" msgid="832757977985265036">"Boodskap is gestuur"</string>
-    <string name="view" msgid="8572192949673703830">"Bekyk"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="post_call_message">Sê waarom jy gebel het</string>
+  <string name="post_call_message_1">Dit is dringend. Bel my terug.</string>
+  <string name="post_call_message_2">Bel my terug wanneer jy \'n tydjie het.</string>
+  <string name="post_call_message_3">Nie dringend nie, ons kan later klets.</string>
+  <string name="post_call_add_message">Voeg boodskap by</string>
+  <string name="post_call_send_message">Stuur boodskap</string>
+  <string name="post_call_message_sent">Boodskap is gestuur</string>
+  <string name="view">Bekyk</string>
 </resources>
diff --git a/java/com/android/dialer/postcall/res/values-am/strings.xml b/java/com/android/dialer/postcall/res/values-am/strings.xml
index a545633..4ffe2ae 100644
--- a/java/com/android/dialer/postcall/res/values-am/strings.xml
+++ b/java/com/android/dialer/postcall/res/values-am/strings.xml
@@ -1,28 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="post_call_message" msgid="3541277172068556862">"ለምን እንደደወሉ ይንገሩን"</string>
-    <string name="post_call_message_1" msgid="4827849136801228106">"ይህ አስቸኳይ ነው። መልሰው ይደውሉልኝ።"</string>
-    <string name="post_call_message_2" msgid="5310301526176003385">"ጊዜ ሲኖርዎት መልሰው ይደውሉልኝ።"</string>
-    <string name="post_call_message_3" msgid="3932759658420368056">"አስቸኳይ አይደለም። በኋላ መወያየት እንችላለን።"</string>
-    <string name="post_call_add_message" msgid="8298853527467080463">"መልዕክት አክል"</string>
-    <string name="post_call_send_message" msgid="8039569617234824873">"መልዕክት ይላኩ"</string>
-    <string name="post_call_message_sent" msgid="832757977985265036">"መልዕክት ልከዋል"</string>
-    <string name="view" msgid="8572192949673703830">"አሳይ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="post_call_message">ለምን እንደደወሉ ይንገሩን</string>
+  <string name="post_call_message_1">ይህ አስቸኳይ ነው። መልሰው ይደውሉልኝ።</string>
+  <string name="post_call_message_2">ጊዜ ሲኖርዎት መልሰው ይደውሉልኝ።</string>
+  <string name="post_call_message_3">አስቸኳይ አይደለም። በኋላ መወያየት እንችላለን።</string>
+  <string name="post_call_add_message">መልዕክት አክል</string>
+  <string name="post_call_send_message">መልዕክት ይላኩ</string>
+  <string name="post_call_message_sent">መልዕክት ልከዋል</string>
+  <string name="view">አሳይ</string>
 </resources>
diff --git a/java/com/android/dialer/postcall/res/values-ar/strings.xml b/java/com/android/dialer/postcall/res/values-ar/strings.xml
index 966f26f..8bed4a8 100644
--- a/java/com/android/dialer/postcall/res/values-ar/strings.xml
+++ b/java/com/android/dialer/postcall/res/values-ar/strings.xml
@@ -1,28 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="post_call_message" msgid="3541277172068556862">"الإخبار عن سبب اتصالك"</string>
-    <string name="post_call_message_1" msgid="4827849136801228106">"إنه أمر عاجل. عاود الاتصال بي."</string>
-    <string name="post_call_message_2" msgid="5310301526176003385">"عاود الاتصال بي عندما يتوفر لك الوقت."</string>
-    <string name="post_call_message_3" msgid="3932759658420368056">"الأمر ليس عاجلاً، يمكننا الدردشة لاحقًا."</string>
-    <string name="post_call_add_message" msgid="8298853527467080463">"إضافة رسالة"</string>
-    <string name="post_call_send_message" msgid="8039569617234824873">"إرسال رسالة"</string>
-    <string name="post_call_message_sent" msgid="832757977985265036">"تم إرسال الرسالة"</string>
-    <string name="view" msgid="8572192949673703830">"عرض"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="post_call_message">الإخبار عن سبب اتصالك</string>
+  <string name="post_call_message_1">إنه أمر عاجل. عاود الاتصال بي.</string>
+  <string name="post_call_message_2">عاود الاتصال بي عندما يتوفر لك الوقت.</string>
+  <string name="post_call_message_3">الأمر ليس عاجلاً، يمكننا المحادثة لاحقًا.</string>
+  <string name="post_call_add_message">إضافة رسالة</string>
+  <string name="post_call_send_message">إرسال رسالة</string>
+  <string name="post_call_message_sent">تم إرسال الرسالة</string>
+  <string name="view">عرض</string>
 </resources>
diff --git a/java/com/android/dialer/postcall/res/values-az/strings.xml b/java/com/android/dialer/postcall/res/values-az/strings.xml
index 3df31bc..a8d6fc3 100644
--- a/java/com/android/dialer/postcall/res/values-az/strings.xml
+++ b/java/com/android/dialer/postcall/res/values-az/strings.xml
@@ -1,28 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="post_call_message" msgid="3541277172068556862">"Nə üçün zəng et etdiyinizi bildirin"</string>
-    <string name="post_call_message_1" msgid="4827849136801228106">"Bu çox vacibdir. Mənə geri zəng edin."</string>
-    <string name="post_call_message_2" msgid="5310301526176003385">"Vaxtın olanda mənə geri zəng edin."</string>
-    <string name="post_call_message_3" msgid="3932759658420368056">"Vacib deyil, daha sonra söhbət edə bilərik."</string>
-    <string name="post_call_add_message" msgid="8298853527467080463">"Mesaj əlavə edin"</string>
-    <string name="post_call_send_message" msgid="8039569617234824873">"Mesaj göndərin"</string>
-    <string name="post_call_message_sent" msgid="832757977985265036">"Mesaj göndərildi"</string>
-    <string name="view" msgid="8572192949673703830">"Baxın"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="post_call_message">Nə üçün zəng et etdiyinizi bildirin</string>
+  <string name="post_call_message_1">Bu çox vacibdir. Mənə geri zəng edin.</string>
+  <string name="post_call_message_2">Vaxtın olanda mənə geri zəng edin.</string>
+  <string name="post_call_message_3">Vacib deyil, daha sonra söhbət edə bilərik.</string>
+  <string name="post_call_add_message">Mesaj əlavə edin</string>
+  <string name="post_call_send_message">Mesaj göndərin</string>
+  <string name="post_call_message_sent">Mesaj göndərildi</string>
+  <string name="view">Baxın</string>
 </resources>
diff --git a/java/com/android/dialer/postcall/res/values-b+sr+Latn/strings.xml b/java/com/android/dialer/postcall/res/values-b+sr+Latn/strings.xml
index 50bb82b..8146805 100644
--- a/java/com/android/dialer/postcall/res/values-b+sr+Latn/strings.xml
+++ b/java/com/android/dialer/postcall/res/values-b+sr+Latn/strings.xml
@@ -1,28 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="post_call_message" msgid="3541277172068556862">"Recite zašto zovete"</string>
-    <string name="post_call_message_1" msgid="4827849136801228106">"Hitno je. Uzvratite mi poziv."</string>
-    <string name="post_call_message_2" msgid="5310301526176003385">"Pozovite me kad budete imali vremena."</string>
-    <string name="post_call_message_3" msgid="3932759658420368056">"Nije hitno, možemo da ćaskamo kasnije."</string>
-    <string name="post_call_add_message" msgid="8298853527467080463">"Dodaj poruku"</string>
-    <string name="post_call_send_message" msgid="8039569617234824873">"Pošaljite poruku"</string>
-    <string name="post_call_message_sent" msgid="832757977985265036">"Poruka je poslata"</string>
-    <string name="view" msgid="8572192949673703830">"Prikaži"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="post_call_message">Recite zašto zovete</string>
+  <string name="post_call_message_1">Hitno je. Uzvratite mi poziv.</string>
+  <string name="post_call_message_2">Pozovite me kad budete imali vremena.</string>
+  <string name="post_call_message_3">Nije hitno, možemo da ćaskamo kasnije.</string>
+  <string name="post_call_add_message">Dodaj poruku</string>
+  <string name="post_call_send_message">Pošaljite poruku</string>
+  <string name="post_call_message_sent">Poruka je poslata</string>
+  <string name="view">Prikaži</string>
 </resources>
diff --git a/java/com/android/dialer/postcall/res/values-be/strings.xml b/java/com/android/dialer/postcall/res/values-be/strings.xml
index d915cc2..d021a4f 100644
--- a/java/com/android/dialer/postcall/res/values-be/strings.xml
+++ b/java/com/android/dialer/postcall/res/values-be/strings.xml
@@ -1,28 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="post_call_message" msgid="3541277172068556862">"Скажыце, чаму вы выклікалі"</string>
-    <string name="post_call_message_1" msgid="4827849136801228106">"Гэта тэрмінова. Перазваніце мне."</string>
-    <string name="post_call_message_2" msgid="5310301526176003385">"Перазваніце мне, калі будзеце мець час."</string>
-    <string name="post_call_message_3" msgid="3932759658420368056">"Не тэрмінова. Можам пагаварыць пазней."</string>
-    <string name="post_call_add_message" msgid="8298853527467080463">"Дадаць паведамленне"</string>
-    <string name="post_call_send_message" msgid="8039569617234824873">"Адправіць паведамленне"</string>
-    <string name="post_call_message_sent" msgid="832757977985265036">"Паведамленне адпраўлена"</string>
-    <string name="view" msgid="8572192949673703830">"Праглядзець"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="post_call_message">Скажыце, чаму вы выклікалі</string>
+  <string name="post_call_message_1">Гэта тэрмінова. Перазваніце мне.</string>
+  <string name="post_call_message_2">Перазваніце мне, калі будзеце мець час.</string>
+  <string name="post_call_message_3">Не тэрмінова. Можам пагаварыць пазней.</string>
+  <string name="post_call_add_message">Дадаць паведамленне</string>
+  <string name="post_call_send_message">Адправіць паведамленне</string>
+  <string name="post_call_message_sent">Паведамленне адпраўлена</string>
+  <string name="view">Праглядзець</string>
 </resources>
diff --git a/java/com/android/dialer/postcall/res/values-bg/strings.xml b/java/com/android/dialer/postcall/res/values-bg/strings.xml
index bdaaa66..be8b6a9 100644
--- a/java/com/android/dialer/postcall/res/values-bg/strings.xml
+++ b/java/com/android/dialer/postcall/res/values-bg/strings.xml
@@ -1,28 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="post_call_message" msgid="3541277172068556862">"Обяснете защо се обадихте"</string>
-    <string name="post_call_message_1" msgid="4827849136801228106">"Спешно е. Обадете ми се."</string>
-    <string name="post_call_message_2" msgid="5310301526176003385">"Обадете ми се, когато имате време."</string>
-    <string name="post_call_message_3" msgid="3932759658420368056">"Не е спешно, можем да говорим по-късно."</string>
-    <string name="post_call_add_message" msgid="8298853527467080463">"Добавяне на съобщение"</string>
-    <string name="post_call_send_message" msgid="8039569617234824873">"Изпращане на съобщение"</string>
-    <string name="post_call_message_sent" msgid="832757977985265036">"Съобщението бе изпратено"</string>
-    <string name="view" msgid="8572192949673703830">"Преглед"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="post_call_message">Обяснете защо се обадихте</string>
+  <string name="post_call_message_1">Спешно е. Обадете ми се.</string>
+  <string name="post_call_message_2">Обадете ми се, когато имате време.</string>
+  <string name="post_call_message_3">Не е спешно, можем да говорим по-късно.</string>
+  <string name="post_call_add_message">Добавяне на съобщение</string>
+  <string name="post_call_send_message">Изпращане на съобщение</string>
+  <string name="post_call_message_sent">Съобщението бе изпратено</string>
+  <string name="view">Преглед</string>
 </resources>
diff --git a/java/com/android/dialer/postcall/res/values-bn/strings.xml b/java/com/android/dialer/postcall/res/values-bn/strings.xml
index efc1b53..808352e 100644
--- a/java/com/android/dialer/postcall/res/values-bn/strings.xml
+++ b/java/com/android/dialer/postcall/res/values-bn/strings.xml
@@ -1,28 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="post_call_message" msgid="3541277172068556862">"আপনি কেন কল করেছেন বলুন"</string>
-    <string name="post_call_message_1" msgid="4827849136801228106">"এটি জরুরী৷ আমায় ফোন করুন৷"</string>
-    <string name="post_call_message_2" msgid="5310301526176003385">"আপনার হাতে যখন সময় হবে তখন আমায় ফোন করুন৷"</string>
-    <string name="post_call_message_3" msgid="3932759658420368056">"জরুরী নয়, আমরা পরে চ্যাট করতে পারি৷"</string>
-    <string name="post_call_add_message" msgid="8298853527467080463">"বার্তা যোগ করুন"</string>
-    <string name="post_call_send_message" msgid="8039569617234824873">"বার্তা পাঠান"</string>
-    <string name="post_call_message_sent" msgid="832757977985265036">"বার্তা পাঠানো হয়েছে"</string>
-    <string name="view" msgid="8572192949673703830">"দেখুন"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="post_call_message">আপনি কেন কল করেছেন বলুন</string>
+  <string name="post_call_message_1">এটি জরুরী৷ আমায় ফোন করুন৷</string>
+  <string name="post_call_message_2">আপনার হাতে যখন সময় হবে তখন আমায় ফোন করুন৷</string>
+  <string name="post_call_message_3">জরুরী নয়, আমরা পরে চ্যাট করতে পারি৷</string>
+  <string name="post_call_add_message">বার্তা যোগ করুন</string>
+  <string name="post_call_send_message">বার্তা পাঠান</string>
+  <string name="post_call_message_sent">বার্তা পাঠানো হয়েছে</string>
+  <string name="view">দেখুন</string>
 </resources>
diff --git a/java/com/android/dialer/postcall/res/values-bs/strings.xml b/java/com/android/dialer/postcall/res/values-bs/strings.xml
index 625fc74..153d855 100644
--- a/java/com/android/dialer/postcall/res/values-bs/strings.xml
+++ b/java/com/android/dialer/postcall/res/values-bs/strings.xml
@@ -1,28 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="post_call_message" msgid="3541277172068556862">"Recite zašto ste zvali"</string>
-    <string name="post_call_message_1" msgid="4827849136801228106">"Hitno je. Nazovi me."</string>
-    <string name="post_call_message_2" msgid="5310301526176003385">"Nazovi me kad mogneš."</string>
-    <string name="post_call_message_3" msgid="3932759658420368056">"Nije hitno, možemo razgovarati kasnije."</string>
-    <string name="post_call_add_message" msgid="8298853527467080463">"Dodaj poruku"</string>
-    <string name="post_call_send_message" msgid="8039569617234824873">"Pošaljite poruku"</string>
-    <string name="post_call_message_sent" msgid="832757977985265036">"Poruka je poslana"</string>
-    <string name="view" msgid="8572192949673703830">"Prikaži"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="post_call_message">Recite zašto ste zvali</string>
+  <string name="post_call_message_1">Hitno je. Nazovi me.</string>
+  <string name="post_call_message_2">Nazovi me kad mogneš.</string>
+  <string name="post_call_message_3">Nije hitno, možemo razgovarati kasnije.</string>
+  <string name="post_call_add_message">Dodaj poruku</string>
+  <string name="post_call_send_message">Pošaljite poruku</string>
+  <string name="post_call_message_sent">Poruka je poslana</string>
+  <string name="view">Prikaži</string>
 </resources>
diff --git a/java/com/android/dialer/postcall/res/values-ca/strings.xml b/java/com/android/dialer/postcall/res/values-ca/strings.xml
index 9928345..6d9491e 100644
--- a/java/com/android/dialer/postcall/res/values-ca/strings.xml
+++ b/java/com/android/dialer/postcall/res/values-ca/strings.xml
@@ -1,28 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="post_call_message" msgid="3541277172068556862">"Digues per què trucaves"</string>
-    <string name="post_call_message_1" msgid="4827849136801228106">"És urgent. Truca\'m."</string>
-    <string name="post_call_message_2" msgid="5310301526176003385">"Truca\'m quan tinguis una estona."</string>
-    <string name="post_call_message_3" msgid="3932759658420368056">"No és urgent. Parlem més tard."</string>
-    <string name="post_call_add_message" msgid="8298853527467080463">"Afegeix un missatge"</string>
-    <string name="post_call_send_message" msgid="8039569617234824873">"Envia un missatge"</string>
-    <string name="post_call_message_sent" msgid="832757977985265036">"El missatge s\'ha enviat"</string>
-    <string name="view" msgid="8572192949673703830">"Mostra"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="post_call_message">Digues per què trucaves</string>
+  <string name="post_call_message_1">És urgent. Truca\'m.</string>
+  <string name="post_call_message_2">Truca\'m quan tinguis una estona.</string>
+  <string name="post_call_message_3">No és urgent. Parlem més tard.</string>
+  <string name="post_call_add_message">Afegeix un missatge</string>
+  <string name="post_call_send_message">Envia un missatge</string>
+  <string name="post_call_message_sent">El missatge s\'ha enviat</string>
+  <string name="view">Mostra</string>
 </resources>
diff --git a/java/com/android/dialer/postcall/res/values-cs/strings.xml b/java/com/android/dialer/postcall/res/values-cs/strings.xml
index 914b060..158f340 100644
--- a/java/com/android/dialer/postcall/res/values-cs/strings.xml
+++ b/java/com/android/dialer/postcall/res/values-cs/strings.xml
@@ -1,28 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="post_call_message" msgid="3541277172068556862">"Vysvětlete, proč jste volali"</string>
-    <string name="post_call_message_1" msgid="4827849136801228106">"Zavolej mi, je to naléhavé."</string>
-    <string name="post_call_message_2" msgid="5310301526176003385">"Zavolej mi, až budeš mít čas."</string>
-    <string name="post_call_message_3" msgid="3932759658420368056">"Neděje si nic naléhavého, zavoláme si později."</string>
-    <string name="post_call_add_message" msgid="8298853527467080463">"Přidat zprávu"</string>
-    <string name="post_call_send_message" msgid="8039569617234824873">"Poslat zprávu"</string>
-    <string name="post_call_message_sent" msgid="832757977985265036">"Zpráva byla odeslána"</string>
-    <string name="view" msgid="8572192949673703830">"Zobrazit"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="post_call_message">Vysvětlete, proč jste volali</string>
+  <string name="post_call_message_1">Zavolej mi, je to naléhavé.</string>
+  <string name="post_call_message_2">Zavolej mi, až budeš mít čas.</string>
+  <string name="post_call_message_3">Neděje si nic naléhavého, zavoláme si později.</string>
+  <string name="post_call_add_message">Přidat zprávu</string>
+  <string name="post_call_send_message">Poslat zprávu</string>
+  <string name="post_call_message_sent">Zpráva byla odeslána</string>
+  <string name="view">Zobrazit</string>
 </resources>
diff --git a/java/com/android/dialer/postcall/res/values-da/strings.xml b/java/com/android/dialer/postcall/res/values-da/strings.xml
index bfed516..cb74033 100644
--- a/java/com/android/dialer/postcall/res/values-da/strings.xml
+++ b/java/com/android/dialer/postcall/res/values-da/strings.xml
@@ -1,28 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="post_call_message" msgid="3541277172068556862">"Fortæl, hvorfor du har ringet"</string>
-    <string name="post_call_message_1" msgid="4827849136801228106">"Det haster. Ring tilbage til mig."</string>
-    <string name="post_call_message_2" msgid="5310301526176003385">"Ring tilbage til mig, når du har tid."</string>
-    <string name="post_call_message_3" msgid="3932759658420368056">"Det haster ikke. Vi kan tale sammen senere."</string>
-    <string name="post_call_add_message" msgid="8298853527467080463">"Tilføj besked"</string>
-    <string name="post_call_send_message" msgid="8039569617234824873">"Send besked"</string>
-    <string name="post_call_message_sent" msgid="832757977985265036">"Beskeden blev sendt"</string>
-    <string name="view" msgid="8572192949673703830">"Se"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="post_call_message">Fortæl, hvorfor du har ringet</string>
+  <string name="post_call_message_1">Det haster. Ring tilbage til mig.</string>
+  <string name="post_call_message_2">Ring tilbage til mig, når du har tid.</string>
+  <string name="post_call_message_3">Det haster ikke. Vi kan tale sammen senere.</string>
+  <string name="post_call_add_message">Tilføj besked</string>
+  <string name="post_call_send_message">Send besked</string>
+  <string name="post_call_message_sent">Beskeden blev sendt</string>
+  <string name="view">Se</string>
 </resources>
diff --git a/java/com/android/dialer/postcall/res/values-de/strings.xml b/java/com/android/dialer/postcall/res/values-de/strings.xml
index 7e97710..32cd3f0 100644
--- a/java/com/android/dialer/postcall/res/values-de/strings.xml
+++ b/java/com/android/dialer/postcall/res/values-de/strings.xml
@@ -1,28 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="post_call_message" msgid="3541277172068556862">"Grund für den Anruf"</string>
-    <string name="post_call_message_1" msgid="4827849136801228106">"Es ist dringend. Bitte zurückrufen."</string>
-    <string name="post_call_message_2" msgid="5310301526176003385">"Bitte bei Gelegenheit zurückrufen."</string>
-    <string name="post_call_message_3" msgid="3932759658420368056">"Nicht dringend, wir können später sprechen."</string>
-    <string name="post_call_add_message" msgid="8298853527467080463">"Nachricht hinzufügen"</string>
-    <string name="post_call_send_message" msgid="8039569617234824873">"Nachricht senden"</string>
-    <string name="post_call_message_sent" msgid="832757977985265036">"Nachricht gesendet"</string>
-    <string name="view" msgid="8572192949673703830">"Ansehen"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="post_call_message">Grund für den Anruf</string>
+  <string name="post_call_message_1">Es ist dringend. Bitte zurückrufen.</string>
+  <string name="post_call_message_2">Bitte bei Gelegenheit zurückrufen.</string>
+  <string name="post_call_message_3">Nicht dringend, wir können später sprechen.</string>
+  <string name="post_call_add_message">Nachricht hinzufügen</string>
+  <string name="post_call_send_message">Nachricht senden</string>
+  <string name="post_call_message_sent">Nachricht gesendet</string>
+  <string name="view">Ansehen</string>
 </resources>
diff --git a/java/com/android/dialer/postcall/res/values-el/strings.xml b/java/com/android/dialer/postcall/res/values-el/strings.xml
index 8eb311d..7023b33 100644
--- a/java/com/android/dialer/postcall/res/values-el/strings.xml
+++ b/java/com/android/dialer/postcall/res/values-el/strings.xml
@@ -1,28 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="post_call_message" msgid="3541277172068556862">"Πείτε μου γιατί καλέσατε"</string>
-    <string name="post_call_message_1" msgid="4827849136801228106">"Είναι επείγον. Καλέστε με."</string>
-    <string name="post_call_message_2" msgid="5310301526176003385">"Καλέστε με όταν έχετε λίγο χρόνο."</string>
-    <string name="post_call_message_3" msgid="3932759658420368056">"Τίποτα επείγον, μπορούμε να τα πούμε αργότερα."</string>
-    <string name="post_call_add_message" msgid="8298853527467080463">"Προσθήκη μηνύματος"</string>
-    <string name="post_call_send_message" msgid="8039569617234824873">"Αποστολή μηνύματος"</string>
-    <string name="post_call_message_sent" msgid="832757977985265036">"Το μήνυμα εστάλη"</string>
-    <string name="view" msgid="8572192949673703830">"Προβολή"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="post_call_message">Πείτε μου γιατί καλέσατε</string>
+  <string name="post_call_message_1">Είναι επείγον. Καλέστε με.</string>
+  <string name="post_call_message_2">Καλέστε με όταν έχετε λίγο χρόνο.</string>
+  <string name="post_call_message_3">Τίποτα επείγον, μπορούμε να τα πούμε αργότερα.</string>
+  <string name="post_call_add_message">Προσθήκη μηνύματος</string>
+  <string name="post_call_send_message">Αποστολή μηνύματος</string>
+  <string name="post_call_message_sent">Το μήνυμα εστάλη</string>
+  <string name="view">Προβολή</string>
 </resources>
diff --git a/java/com/android/dialer/postcall/res/values-en-rAU/strings.xml b/java/com/android/dialer/postcall/res/values-en-rAU/strings.xml
index a04b78d..ba0ecde 100644
--- a/java/com/android/dialer/postcall/res/values-en-rAU/strings.xml
+++ b/java/com/android/dialer/postcall/res/values-en-rAU/strings.xml
@@ -1,28 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="post_call_message" msgid="3541277172068556862">"Say why you called"</string>
-    <string name="post_call_message_1" msgid="4827849136801228106">"This is urgent. Call me back."</string>
-    <string name="post_call_message_2" msgid="5310301526176003385">"Call me back when you have time."</string>
-    <string name="post_call_message_3" msgid="3932759658420368056">"Not urgent – we can chat later."</string>
-    <string name="post_call_add_message" msgid="8298853527467080463">"Add message"</string>
-    <string name="post_call_send_message" msgid="8039569617234824873">"Send message"</string>
-    <string name="post_call_message_sent" msgid="832757977985265036">"Message sent"</string>
-    <string name="view" msgid="8572192949673703830">"View"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="post_call_message">Say why you called</string>
+  <string name="post_call_message_1">This is urgent. Call me back.</string>
+  <string name="post_call_message_2">Call me back when you have time.</string>
+  <string name="post_call_message_3">Not urgent – we can chat later.</string>
+  <string name="post_call_add_message">Add message</string>
+  <string name="post_call_send_message">Send message</string>
+  <string name="post_call_message_sent">Message sent</string>
+  <string name="view">View</string>
 </resources>
diff --git a/java/com/android/dialer/postcall/res/values-en-rGB/strings.xml b/java/com/android/dialer/postcall/res/values-en-rGB/strings.xml
index a04b78d..ba0ecde 100644
--- a/java/com/android/dialer/postcall/res/values-en-rGB/strings.xml
+++ b/java/com/android/dialer/postcall/res/values-en-rGB/strings.xml
@@ -1,28 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="post_call_message" msgid="3541277172068556862">"Say why you called"</string>
-    <string name="post_call_message_1" msgid="4827849136801228106">"This is urgent. Call me back."</string>
-    <string name="post_call_message_2" msgid="5310301526176003385">"Call me back when you have time."</string>
-    <string name="post_call_message_3" msgid="3932759658420368056">"Not urgent – we can chat later."</string>
-    <string name="post_call_add_message" msgid="8298853527467080463">"Add message"</string>
-    <string name="post_call_send_message" msgid="8039569617234824873">"Send message"</string>
-    <string name="post_call_message_sent" msgid="832757977985265036">"Message sent"</string>
-    <string name="view" msgid="8572192949673703830">"View"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="post_call_message">Say why you called</string>
+  <string name="post_call_message_1">This is urgent. Call me back.</string>
+  <string name="post_call_message_2">Call me back when you have time.</string>
+  <string name="post_call_message_3">Not urgent – we can chat later.</string>
+  <string name="post_call_add_message">Add message</string>
+  <string name="post_call_send_message">Send message</string>
+  <string name="post_call_message_sent">Message sent</string>
+  <string name="view">View</string>
 </resources>
diff --git a/java/com/android/dialer/postcall/res/values-en-rIN/strings.xml b/java/com/android/dialer/postcall/res/values-en-rIN/strings.xml
index a04b78d..ba0ecde 100644
--- a/java/com/android/dialer/postcall/res/values-en-rIN/strings.xml
+++ b/java/com/android/dialer/postcall/res/values-en-rIN/strings.xml
@@ -1,28 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="post_call_message" msgid="3541277172068556862">"Say why you called"</string>
-    <string name="post_call_message_1" msgid="4827849136801228106">"This is urgent. Call me back."</string>
-    <string name="post_call_message_2" msgid="5310301526176003385">"Call me back when you have time."</string>
-    <string name="post_call_message_3" msgid="3932759658420368056">"Not urgent – we can chat later."</string>
-    <string name="post_call_add_message" msgid="8298853527467080463">"Add message"</string>
-    <string name="post_call_send_message" msgid="8039569617234824873">"Send message"</string>
-    <string name="post_call_message_sent" msgid="832757977985265036">"Message sent"</string>
-    <string name="view" msgid="8572192949673703830">"View"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="post_call_message">Say why you called</string>
+  <string name="post_call_message_1">This is urgent. Call me back.</string>
+  <string name="post_call_message_2">Call me back when you have time.</string>
+  <string name="post_call_message_3">Not urgent – we can chat later.</string>
+  <string name="post_call_add_message">Add message</string>
+  <string name="post_call_send_message">Send message</string>
+  <string name="post_call_message_sent">Message sent</string>
+  <string name="view">View</string>
 </resources>
diff --git a/java/com/android/dialer/postcall/res/values-es-rUS/strings.xml b/java/com/android/dialer/postcall/res/values-es-rUS/strings.xml
index 9c3e781..ee49628 100644
--- a/java/com/android/dialer/postcall/res/values-es-rUS/strings.xml
+++ b/java/com/android/dialer/postcall/res/values-es-rUS/strings.xml
@@ -1,28 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="post_call_message" msgid="3541277172068556862">"Dile por qué llamaste"</string>
-    <string name="post_call_message_1" msgid="4827849136801228106">"Es urgente. Llámame."</string>
-    <string name="post_call_message_2" msgid="5310301526176003385">"Llámame cuando tengas un momento."</string>
-    <string name="post_call_message_3" msgid="3932759658420368056">"No es urgente. Podemos hablar más tarde."</string>
-    <string name="post_call_add_message" msgid="8298853527467080463">"Agregar mensaje"</string>
-    <string name="post_call_send_message" msgid="8039569617234824873">"Enviar mensaje"</string>
-    <string name="post_call_message_sent" msgid="832757977985265036">"Se envió el mensaje"</string>
-    <string name="view" msgid="8572192949673703830">"Ver"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="post_call_message">Dile por qué llamaste</string>
+  <string name="post_call_message_1">Es urgente. Llámame.</string>
+  <string name="post_call_message_2">Llámame cuando tengas un momento.</string>
+  <string name="post_call_message_3">No es urgente. Podemos hablar más tarde.</string>
+  <string name="post_call_add_message">Agregar mensaje</string>
+  <string name="post_call_send_message">Enviar mensaje</string>
+  <string name="post_call_message_sent">Se envió el mensaje</string>
+  <string name="view">Ver</string>
 </resources>
diff --git a/java/com/android/dialer/postcall/res/values-es/strings.xml b/java/com/android/dialer/postcall/res/values-es/strings.xml
index e2717b7..dcc1ad7 100644
--- a/java/com/android/dialer/postcall/res/values-es/strings.xml
+++ b/java/com/android/dialer/postcall/res/values-es/strings.xml
@@ -1,28 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="post_call_message" msgid="3541277172068556862">"Di el motivo de la llamada"</string>
-    <string name="post_call_message_1" msgid="4827849136801228106">"Llámame, es urgente."</string>
-    <string name="post_call_message_2" msgid="5310301526176003385">"Llámame cuando puedas."</string>
-    <string name="post_call_message_3" msgid="3932759658420368056">"No es urgente, podemos hablar luego."</string>
-    <string name="post_call_add_message" msgid="8298853527467080463">"Añade un mensaje"</string>
-    <string name="post_call_send_message" msgid="8039569617234824873">"Enviar mensaje"</string>
-    <string name="post_call_message_sent" msgid="832757977985265036">"Mensaje enviado"</string>
-    <string name="view" msgid="8572192949673703830">"Ver"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="post_call_message">Di el motivo de la llamada</string>
+  <string name="post_call_message_1">Llámame, es urgente.</string>
+  <string name="post_call_message_2">Llámame cuando puedas.</string>
+  <string name="post_call_message_3">No es urgente, podemos hablar luego.</string>
+  <string name="post_call_add_message">Añade un mensaje</string>
+  <string name="post_call_send_message">Enviar mensaje</string>
+  <string name="post_call_message_sent">Mensaje enviado</string>
+  <string name="view">Ver</string>
 </resources>
diff --git a/java/com/android/dialer/postcall/res/values-et/strings.xml b/java/com/android/dialer/postcall/res/values-et/strings.xml
index 51b8ecd..da09e4b 100644
--- a/java/com/android/dialer/postcall/res/values-et/strings.xml
+++ b/java/com/android/dialer/postcall/res/values-et/strings.xml
@@ -1,28 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="post_call_message" msgid="3541277172068556862">"Öelge, miks te helistasite"</string>
-    <string name="post_call_message_1" msgid="4827849136801228106">"Sellega on kiire. Helistage tagasi."</string>
-    <string name="post_call_message_2" msgid="5310301526176003385">"Helistage tagasi, kui teil on rohkem aega."</string>
-    <string name="post_call_message_3" msgid="3932759658420368056">"Sellega pole kiiret, võime hiljem vestalda."</string>
-    <string name="post_call_add_message" msgid="8298853527467080463">"Lisage sõnum"</string>
-    <string name="post_call_send_message" msgid="8039569617234824873">"Saada sõnum"</string>
-    <string name="post_call_message_sent" msgid="832757977985265036">"Sõnum on saadetud"</string>
-    <string name="view" msgid="8572192949673703830">"Kuva"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="post_call_message">Öelge, miks te helistasite</string>
+  <string name="post_call_message_1">Sellega on kiire. Helistage tagasi.</string>
+  <string name="post_call_message_2">Helistage tagasi, kui teil on rohkem aega.</string>
+  <string name="post_call_message_3">Sellega pole kiiret, võime hiljem vestalda.</string>
+  <string name="post_call_add_message">Lisage sõnum</string>
+  <string name="post_call_send_message">Saada sõnum</string>
+  <string name="post_call_message_sent">Sõnum on saadetud</string>
+  <string name="view">Kuva</string>
 </resources>
diff --git a/java/com/android/dialer/postcall/res/values-eu/strings.xml b/java/com/android/dialer/postcall/res/values-eu/strings.xml
index b336a4e..b0c0549 100644
--- a/java/com/android/dialer/postcall/res/values-eu/strings.xml
+++ b/java/com/android/dialer/postcall/res/values-eu/strings.xml
@@ -1,28 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="post_call_message" msgid="3541277172068556862">"Esan zergatik deitu duzun"</string>
-    <string name="post_call_message_1" msgid="4827849136801228106">"Dei iezadazu. Premiazkoa da."</string>
-    <string name="post_call_message_2" msgid="5310301526176003385">"Dei iezadazu denbora duzunean."</string>
-    <string name="post_call_message_3" msgid="3932759658420368056">"Geroago hitz egin dezakegu, ez da premiazkoa."</string>
-    <string name="post_call_add_message" msgid="8298853527467080463">"Gehitu mezua"</string>
-    <string name="post_call_send_message" msgid="8039569617234824873">"Bidali mezua"</string>
-    <string name="post_call_message_sent" msgid="832757977985265036">"Bidali da mezua"</string>
-    <string name="view" msgid="8572192949673703830">"Ikusi"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="post_call_message">Esan zergatik deitu duzun</string>
+  <string name="post_call_message_1">Dei iezadazu. Premiazkoa da.</string>
+  <string name="post_call_message_2">Dei iezadazu denbora duzunean.</string>
+  <string name="post_call_message_3">Geroago hitz egin dezakegu, ez da premiazkoa.</string>
+  <string name="post_call_add_message">Gehitu mezua</string>
+  <string name="post_call_send_message">Bidali mezua</string>
+  <string name="post_call_message_sent">Bidali da mezua</string>
+  <string name="view">Ikusi</string>
 </resources>
diff --git a/java/com/android/dialer/postcall/res/values-fa/strings.xml b/java/com/android/dialer/postcall/res/values-fa/strings.xml
index 113370f..a1be369 100644
--- a/java/com/android/dialer/postcall/res/values-fa/strings.xml
+++ b/java/com/android/dialer/postcall/res/values-fa/strings.xml
@@ -1,28 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="post_call_message" msgid="3541277172068556862">"بگو چرا تماس گرفته‌ای"</string>
-    <string name="post_call_message_1" msgid="4827849136801228106">"ضروریه. تماس بگیر."</string>
-    <string name="post_call_message_2" msgid="5310301526176003385">"با من تماس بگیر هنگامی که وقت کردی."</string>
-    <string name="post_call_message_3" msgid="3932759658420368056">"ضروری نیست. می‌تونیم بعدا گپ بزنیم."</string>
-    <string name="post_call_add_message" msgid="8298853527467080463">"افزودن پیام"</string>
-    <string name="post_call_send_message" msgid="8039569617234824873">"ارسال پیام"</string>
-    <string name="post_call_message_sent" msgid="832757977985265036">"پیام ارسال شد"</string>
-    <string name="view" msgid="8572192949673703830">"مشاهده"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="post_call_message">بگو چرا تماس گرفته‌ای</string>
+  <string name="post_call_message_1">ضروریه. تماس بگیر.</string>
+  <string name="post_call_message_2">با من تماس بگیر هنگامی که وقت کردی.</string>
+  <string name="post_call_message_3">ضروری نیست، می‌توانیم بعداً گپ بزنیم.</string>
+  <string name="post_call_add_message">افزودن پیام</string>
+  <string name="post_call_send_message">ارسال پیام</string>
+  <string name="post_call_message_sent">پیام ارسال شد</string>
+  <string name="view">مشاهده</string>
 </resources>
diff --git a/java/com/android/dialer/postcall/res/values-fi/strings.xml b/java/com/android/dialer/postcall/res/values-fi/strings.xml
index 11be3ac..eefb00f 100644
--- a/java/com/android/dialer/postcall/res/values-fi/strings.xml
+++ b/java/com/android/dialer/postcall/res/values-fi/strings.xml
@@ -1,28 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="post_call_message" msgid="3541277172068556862">"Kerro, miksi soitit"</string>
-    <string name="post_call_message_1" msgid="4827849136801228106">"Asia on kiireinen. Soittakaa minulle takaisin."</string>
-    <string name="post_call_message_2" msgid="5310301526176003385">"Soittakaa minulle takaisin, kun teillä on hetki aikaa."</string>
-    <string name="post_call_message_3" msgid="3932759658420368056">"Asia ei ole kiireellinen, voimme puhua myöhemmin."</string>
-    <string name="post_call_add_message" msgid="8298853527467080463">"Lisää viesti"</string>
-    <string name="post_call_send_message" msgid="8039569617234824873">"Lähetä viesti"</string>
-    <string name="post_call_message_sent" msgid="832757977985265036">"Viesti lähetetty"</string>
-    <string name="view" msgid="8572192949673703830">"Näytä"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="post_call_message">Kerro, miksi soitit</string>
+  <string name="post_call_message_1">Asia on kiireinen. Soittakaa minulle takaisin.</string>
+  <string name="post_call_message_2">Soittakaa minulle takaisin, kun teillä on hetki aikaa.</string>
+  <string name="post_call_message_3">Asia ei ole kiireellinen, voimme puhua myöhemmin.</string>
+  <string name="post_call_add_message">Lisää viesti</string>
+  <string name="post_call_send_message">Lähetä viesti</string>
+  <string name="post_call_message_sent">Viesti lähetetty</string>
+  <string name="view">Näytä</string>
 </resources>
diff --git a/java/com/android/dialer/postcall/res/values-fr-rCA/strings.xml b/java/com/android/dialer/postcall/res/values-fr-rCA/strings.xml
index 5a5960c..799faa8 100644
--- a/java/com/android/dialer/postcall/res/values-fr-rCA/strings.xml
+++ b/java/com/android/dialer/postcall/res/values-fr-rCA/strings.xml
@@ -1,28 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="post_call_message" msgid="3541277172068556862">"Dites pourquoi vous avez appelé"</string>
-    <string name="post_call_message_1" msgid="4827849136801228106">"C\'est urgent. Rappelez-moi."</string>
-    <string name="post_call_message_2" msgid="5310301526176003385">"Rappelez-moi quand vous aurez un peu de temps."</string>
-    <string name="post_call_message_3" msgid="3932759658420368056">"Ce n\'est pas urgent. Nous pourrons clavarder plus tard."</string>
-    <string name="post_call_add_message" msgid="8298853527467080463">"Ajouter un message"</string>
-    <string name="post_call_send_message" msgid="8039569617234824873">"Envoyer le message"</string>
-    <string name="post_call_message_sent" msgid="832757977985265036">"Message envoyé"</string>
-    <string name="view" msgid="8572192949673703830">"Afficher"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="post_call_message">Dites pourquoi vous avez appelé</string>
+  <string name="post_call_message_1">C\'est urgent. Rappelez-moi.</string>
+  <string name="post_call_message_2">Rappelez-moi quand vous aurez un peu de temps.</string>
+  <string name="post_call_message_3">Ce n\'est pas urgent. Nous pourrons clavarder plus tard.</string>
+  <string name="post_call_add_message">Ajouter un message</string>
+  <string name="post_call_send_message">Envoyer le message</string>
+  <string name="post_call_message_sent">Message envoyé</string>
+  <string name="view">Afficher</string>
 </resources>
diff --git a/java/com/android/dialer/postcall/res/values-fr/strings.xml b/java/com/android/dialer/postcall/res/values-fr/strings.xml
index ee3e0d9..fe6b023 100644
--- a/java/com/android/dialer/postcall/res/values-fr/strings.xml
+++ b/java/com/android/dialer/postcall/res/values-fr/strings.xml
@@ -1,28 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="post_call_message" msgid="3541277172068556862">"Indiquez la raison de votre appel"</string>
-    <string name="post_call_message_1" msgid="4827849136801228106">"Veuillez me rappeler de toute urgence."</string>
-    <string name="post_call_message_2" msgid="5310301526176003385">"Veuillez me rappeler dès que vous avez un moment."</string>
-    <string name="post_call_message_3" msgid="3932759658420368056">"Aucune urgence. On se recontacte ultérieurement."</string>
-    <string name="post_call_add_message" msgid="8298853527467080463">"Ajouter un message"</string>
-    <string name="post_call_send_message" msgid="8039569617234824873">"Envoyer un message"</string>
-    <string name="post_call_message_sent" msgid="832757977985265036">"Message envoyé"</string>
-    <string name="view" msgid="8572192949673703830">"Afficher"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="post_call_message">Indiquez la raison de votre appel</string>
+  <string name="post_call_message_1">Veuillez me rappeler de toute urgence.</string>
+  <string name="post_call_message_2">Veuillez me rappeler dès que vous avez un moment.</string>
+  <string name="post_call_message_3">Aucune urgence. On se recontacte ultérieurement.</string>
+  <string name="post_call_add_message">Ajouter un message</string>
+  <string name="post_call_send_message">Envoyer un message</string>
+  <string name="post_call_message_sent">Message envoyé</string>
+  <string name="view">Afficher</string>
 </resources>
diff --git a/java/com/android/dialer/postcall/res/values-gl/strings.xml b/java/com/android/dialer/postcall/res/values-gl/strings.xml
index a0b635f..ce062f2 100644
--- a/java/com/android/dialer/postcall/res/values-gl/strings.xml
+++ b/java/com/android/dialer/postcall/res/values-gl/strings.xml
@@ -1,28 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="post_call_message" msgid="3541277172068556862">"Di por que chamaches"</string>
-    <string name="post_call_message_1" msgid="4827849136801228106">"É urxente. Chámame."</string>
-    <string name="post_call_message_2" msgid="5310301526176003385">"Chámame cando teñas tempo."</string>
-    <string name="post_call_message_3" msgid="3932759658420368056">"Non é urxente. Podemos falar máis tarde."</string>
-    <string name="post_call_add_message" msgid="8298853527467080463">"Engade unha mensaxe"</string>
-    <string name="post_call_send_message" msgid="8039569617234824873">"Envia unha mensaxe"</string>
-    <string name="post_call_message_sent" msgid="832757977985265036">"Enviouse a mensaxe"</string>
-    <string name="view" msgid="8572192949673703830">"Ver"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="post_call_message">Di por que chamaches</string>
+  <string name="post_call_message_1">É urxente. Chámame.</string>
+  <string name="post_call_message_2">Chámame cando teñas tempo.</string>
+  <string name="post_call_message_3">Non é urxente. Podemos falar máis tarde.</string>
+  <string name="post_call_add_message">Engade unha mensaxe</string>
+  <string name="post_call_send_message">Envia unha mensaxe</string>
+  <string name="post_call_message_sent">Enviouse a mensaxe</string>
+  <string name="view">Ver</string>
 </resources>
diff --git a/java/com/android/dialer/postcall/res/values-gu/strings.xml b/java/com/android/dialer/postcall/res/values-gu/strings.xml
index ea8329e..3f36977 100644
--- a/java/com/android/dialer/postcall/res/values-gu/strings.xml
+++ b/java/com/android/dialer/postcall/res/values-gu/strings.xml
@@ -1,28 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="post_call_message" msgid="3541277172068556862">"તમે શા માટે કૉલ કર્યો તે કહો"</string>
-    <string name="post_call_message_1" msgid="4827849136801228106">"અગત્યનું કામ છે. મને ફરી કૉલ કરો."</string>
-    <string name="post_call_message_2" msgid="5310301526176003385">"તમારી પાસે થોડો સમય હોય ત્યારે મને ફરી કૉલ કરો."</string>
-    <string name="post_call_message_3" msgid="3932759658420368056">"કોઇ ખાસ કામ નથી, આપણે પછી ચેટ કરી શકીએ."</string>
-    <string name="post_call_add_message" msgid="8298853527467080463">"સંદેશ ઉમેરો"</string>
-    <string name="post_call_send_message" msgid="8039569617234824873">"સંદેશ મોકલો"</string>
-    <string name="post_call_message_sent" msgid="832757977985265036">"સંદેશ મોકલ્યો"</string>
-    <string name="view" msgid="8572192949673703830">"જુઓ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="post_call_message">તમે શા માટે કૉલ કર્યો તે કહો</string>
+  <string name="post_call_message_1">અગત્યનું કામ છે. મને ફરી કૉલ કરો.</string>
+  <string name="post_call_message_2">તમારી પાસે થોડો સમય હોય ત્યારે મને ફરી કૉલ કરો.</string>
+  <string name="post_call_message_3">કોઇ ખાસ કામ નથી, આપણે પછી ચેટ કરી શકીએ.</string>
+  <string name="post_call_add_message">સંદેશ ઉમેરો</string>
+  <string name="post_call_send_message">સંદેશ મોકલો</string>
+  <string name="post_call_message_sent">સંદેશ મોકલ્યો</string>
+  <string name="view">જુઓ</string>
 </resources>
diff --git a/java/com/android/dialer/postcall/res/values-hi/strings.xml b/java/com/android/dialer/postcall/res/values-hi/strings.xml
index 53ccbad..d9bffdd 100644
--- a/java/com/android/dialer/postcall/res/values-hi/strings.xml
+++ b/java/com/android/dialer/postcall/res/values-hi/strings.xml
@@ -1,28 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="post_call_message" msgid="3541277172068556862">"कहें कि आपने कॉल क्यों किया"</string>
-    <string name="post_call_message_1" msgid="4827849136801228106">"यह बहुत ज़रूरी है. मुझे वापस कॉल करें."</string>
-    <string name="post_call_message_2" msgid="5310301526176003385">"आपके पास कुछ समय होने पर मुझे वापस कॉल करें."</string>
-    <string name="post_call_message_3" msgid="3932759658420368056">"ज़रूरी नहीं है, हम बाद में चैट कर सकते हैं."</string>
-    <string name="post_call_add_message" msgid="8298853527467080463">"संदेश जोड़ें"</string>
-    <string name="post_call_send_message" msgid="8039569617234824873">"संदेश भेजें"</string>
-    <string name="post_call_message_sent" msgid="832757977985265036">"संदेश भेजा गया"</string>
-    <string name="view" msgid="8572192949673703830">"देखें"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="post_call_message">कहें कि आपने कॉल क्यों किया</string>
+  <string name="post_call_message_1">यह बहुत ज़रूरी है. मुझे वापस कॉल करें.</string>
+  <string name="post_call_message_2">आपके पास कुछ समय होने पर मुझे वापस कॉल करें.</string>
+  <string name="post_call_message_3">ज़रूरी नहीं है, हम बाद में चैट कर सकते हैं.</string>
+  <string name="post_call_add_message">संदेश जोड़ें</string>
+  <string name="post_call_send_message">संदेश भेजें</string>
+  <string name="post_call_message_sent">संदेश भेजा गया</string>
+  <string name="view">देखें</string>
 </resources>
diff --git a/java/com/android/dialer/postcall/res/values-hr/strings.xml b/java/com/android/dialer/postcall/res/values-hr/strings.xml
index f715575..073e3fc 100644
--- a/java/com/android/dialer/postcall/res/values-hr/strings.xml
+++ b/java/com/android/dialer/postcall/res/values-hr/strings.xml
@@ -1,28 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="post_call_message" msgid="3541277172068556862">"Recite zašto ste nazvali"</string>
-    <string name="post_call_message_1" msgid="4827849136801228106">"Ovo je hitno. Uzvrati mi poziv."</string>
-    <string name="post_call_message_2" msgid="5310301526176003385">"Uzvrati mi poziv kada uhvatiš vremena."</string>
-    <string name="post_call_message_3" msgid="3932759658420368056">"Nije hitno, možemo chatati kasnije."</string>
-    <string name="post_call_add_message" msgid="8298853527467080463">"Dodaj poruku"</string>
-    <string name="post_call_send_message" msgid="8039569617234824873">"Slanje poruke"</string>
-    <string name="post_call_message_sent" msgid="832757977985265036">"Poruka je poslana"</string>
-    <string name="view" msgid="8572192949673703830">"Prikaži"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="post_call_message">Recite zašto ste nazvali</string>
+  <string name="post_call_message_1">Ovo je hitno. Uzvrati mi poziv.</string>
+  <string name="post_call_message_2">Uzvrati mi poziv kada uhvatiš vremena.</string>
+  <string name="post_call_message_3">Nije hitno, možemo chatati kasnije.</string>
+  <string name="post_call_add_message">Dodaj poruku</string>
+  <string name="post_call_send_message">Slanje poruke</string>
+  <string name="post_call_message_sent">Poruka je poslana</string>
+  <string name="view">Prikaži</string>
 </resources>
diff --git a/java/com/android/dialer/postcall/res/values-hu/strings.xml b/java/com/android/dialer/postcall/res/values-hu/strings.xml
index 689998d..46abc88 100644
--- a/java/com/android/dialer/postcall/res/values-hu/strings.xml
+++ b/java/com/android/dialer/postcall/res/values-hu/strings.xml
@@ -1,28 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="post_call_message" msgid="3541277172068556862">"Mondja el, miért hívta"</string>
-    <string name="post_call_message_1" msgid="4827849136801228106">"Sürgős. Hívjon vissza."</string>
-    <string name="post_call_message_2" msgid="5310301526176003385">"Hívjon vissza, ha alkalmas."</string>
-    <string name="post_call_message_3" msgid="3932759658420368056">"Nem sürgős, ráér később."</string>
-    <string name="post_call_add_message" msgid="8298853527467080463">"Üzenet hozzáadása"</string>
-    <string name="post_call_send_message" msgid="8039569617234824873">"Üzenet küldése"</string>
-    <string name="post_call_message_sent" msgid="832757977985265036">"Üzenet elküldve"</string>
-    <string name="view" msgid="8572192949673703830">"Megtekintés"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="post_call_message">Mondja el, miért hívta</string>
+  <string name="post_call_message_1">Sürgős. Hívjon vissza.</string>
+  <string name="post_call_message_2">Hívjon vissza, ha alkalmas.</string>
+  <string name="post_call_message_3">Nem sürgős, ráér később.</string>
+  <string name="post_call_add_message">Üzenet hozzáadása</string>
+  <string name="post_call_send_message">Üzenet küldése</string>
+  <string name="post_call_message_sent">Üzenet elküldve</string>
+  <string name="view">Megtekintés</string>
 </resources>
diff --git a/java/com/android/dialer/postcall/res/values-hy/strings.xml b/java/com/android/dialer/postcall/res/values-hy/strings.xml
index 485bce4..77db258 100644
--- a/java/com/android/dialer/postcall/res/values-hy/strings.xml
+++ b/java/com/android/dialer/postcall/res/values-hy/strings.xml
@@ -1,28 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="post_call_message" msgid="3541277172068556862">"Ասեք, թե ինչու էիք զանգել"</string>
-    <string name="post_call_message_1" msgid="4827849136801228106">"Շտապ է: Հետ զանգիր ինձ:"</string>
-    <string name="post_call_message_2" msgid="5310301526176003385">"Հետ զանգիր, երբ ժամանակ ունենաս:"</string>
-    <string name="post_call_message_3" msgid="3932759658420368056">"Շտապ չէ, կարող ենք հետո խոսել:"</string>
-    <string name="post_call_add_message" msgid="8298853527467080463">"Ավելացնել հաղորդագրություն"</string>
-    <string name="post_call_send_message" msgid="8039569617234824873">"Ուղարկել հաղորդագրություն"</string>
-    <string name="post_call_message_sent" msgid="832757977985265036">"Հաղորդագրությունն ուղարկվել է"</string>
-    <string name="view" msgid="8572192949673703830">"Դիտել"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="post_call_message">Ասեք, թե ինչու էիք զանգել</string>
+  <string name="post_call_message_1">Շտապ է: Հետ զանգիր ինձ:</string>
+  <string name="post_call_message_2">Հետ զանգիր, երբ ժամանակ ունենաս:</string>
+  <string name="post_call_message_3">Շտապ չէ, կարող ենք հետո խոսել:</string>
+  <string name="post_call_add_message">Ավելացնել հաղորդագրություն</string>
+  <string name="post_call_send_message">Ուղարկել հաղորդագրություն</string>
+  <string name="post_call_message_sent">Հաղորդագրությունն ուղարկվել է</string>
+  <string name="view">Դիտել</string>
 </resources>
diff --git a/java/com/android/dialer/postcall/res/values-in/strings.xml b/java/com/android/dialer/postcall/res/values-in/strings.xml
index 6241fec..a0d2f2f 100644
--- a/java/com/android/dialer/postcall/res/values-in/strings.xml
+++ b/java/com/android/dialer/postcall/res/values-in/strings.xml
@@ -1,28 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="post_call_message" msgid="3541277172068556862">"Katakan alasan Anda menelepon"</string>
-    <string name="post_call_message_1" msgid="4827849136801228106">"Ini penting. Telepon saya balik."</string>
-    <string name="post_call_message_2" msgid="5310301526176003385">"Telepon saya balik jika Anda memiliki waktu luang."</string>
-    <string name="post_call_message_3" msgid="3932759658420368056">"Tidak penting, kita bisa chatting nanti."</string>
-    <string name="post_call_add_message" msgid="8298853527467080463">"Tambahkan pesan"</string>
-    <string name="post_call_send_message" msgid="8039569617234824873">"Kirim pesan"</string>
-    <string name="post_call_message_sent" msgid="832757977985265036">"Pesan terkirim"</string>
-    <string name="view" msgid="8572192949673703830">"Lihat"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="post_call_message">Katakan alasan Anda menelepon</string>
+  <string name="post_call_message_1">Ini penting. Telepon saya balik.</string>
+  <string name="post_call_message_2">Telepon saya balik jika Anda memiliki waktu luang.</string>
+  <string name="post_call_message_3">Tidak penting, kita bisa chatting nanti.</string>
+  <string name="post_call_add_message">Tambahkan pesan</string>
+  <string name="post_call_send_message">Kirim pesan</string>
+  <string name="post_call_message_sent">Pesan terkirim</string>
+  <string name="view">Lihat</string>
 </resources>
diff --git a/java/com/android/dialer/postcall/res/values-is/strings.xml b/java/com/android/dialer/postcall/res/values-is/strings.xml
index 4105bcc..e8e46a1 100644
--- a/java/com/android/dialer/postcall/res/values-is/strings.xml
+++ b/java/com/android/dialer/postcall/res/values-is/strings.xml
@@ -1,28 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="post_call_message" msgid="3541277172068556862">"Segðu hvers vegna þú hringdir"</string>
-    <string name="post_call_message_1" msgid="4827849136801228106">"Þetta er áríðandi. Hringdu í mig."</string>
-    <string name="post_call_message_2" msgid="5310301526176003385">"Hringdu í mig þegar þú hefur tíma."</string>
-    <string name="post_call_message_3" msgid="3932759658420368056">"Ekkert áríðandi, við getum spjallað síðar."</string>
-    <string name="post_call_add_message" msgid="8298853527467080463">"Senda skilaboð"</string>
-    <string name="post_call_send_message" msgid="8039569617234824873">"Senda skilaboð"</string>
-    <string name="post_call_message_sent" msgid="832757977985265036">"Skilaboð send"</string>
-    <string name="view" msgid="8572192949673703830">"Skoða"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="post_call_message">Segðu hvers vegna þú hringdir</string>
+  <string name="post_call_message_1">Þetta er áríðandi. Hringdu í mig.</string>
+  <string name="post_call_message_2">Hringdu í mig þegar þú hefur tíma.</string>
+  <string name="post_call_message_3">Ekkert áríðandi, við getum spjallað síðar.</string>
+  <string name="post_call_add_message">Senda skilaboð</string>
+  <string name="post_call_send_message">Senda skilaboð</string>
+  <string name="post_call_message_sent">Skilaboð send</string>
+  <string name="view">Skoða</string>
 </resources>
diff --git a/java/com/android/dialer/postcall/res/values-it/strings.xml b/java/com/android/dialer/postcall/res/values-it/strings.xml
index 7d90071..2bb1350 100644
--- a/java/com/android/dialer/postcall/res/values-it/strings.xml
+++ b/java/com/android/dialer/postcall/res/values-it/strings.xml
@@ -1,28 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="post_call_message" msgid="3541277172068556862">"Specifica perché hai chiamato"</string>
-    <string name="post_call_message_1" msgid="4827849136801228106">"È urgente. Richiamami."</string>
-    <string name="post_call_message_2" msgid="5310301526176003385">"Richiamami quando hai tempo."</string>
-    <string name="post_call_message_3" msgid="3932759658420368056">"Non è urgente, possiamo parlare più tardi."</string>
-    <string name="post_call_add_message" msgid="8298853527467080463">"Aggiungi messaggio"</string>
-    <string name="post_call_send_message" msgid="8039569617234824873">"Invia messaggio"</string>
-    <string name="post_call_message_sent" msgid="832757977985265036">"Messaggio inviato"</string>
-    <string name="view" msgid="8572192949673703830">"Visualizza"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="post_call_message">Specifica perché hai chiamato</string>
+  <string name="post_call_message_1">È urgente. Richiamami.</string>
+  <string name="post_call_message_2">Richiamami quando hai tempo.</string>
+  <string name="post_call_message_3">Non è urgente, possiamo parlare più tardi.</string>
+  <string name="post_call_add_message">Aggiungi messaggio</string>
+  <string name="post_call_send_message">Invia messaggio</string>
+  <string name="post_call_message_sent">Messaggio inviato</string>
+  <string name="view">Visualizza</string>
 </resources>
diff --git a/java/com/android/dialer/postcall/res/values-iw/strings.xml b/java/com/android/dialer/postcall/res/values-iw/strings.xml
index 66febbf..0d23712 100644
--- a/java/com/android/dialer/postcall/res/values-iw/strings.xml
+++ b/java/com/android/dialer/postcall/res/values-iw/strings.xml
@@ -1,28 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="post_call_message" msgid="3541277172068556862">"ספר למה התקשרת"</string>
-    <string name="post_call_message_1" msgid="4827849136801228106">"זה דחוף. תוכל/י לחזור אלי?"</string>
-    <string name="post_call_message_2" msgid="5310301526176003385">"תוכל/י לחזור אלי כשיהיה לך זמן?"</string>
-    <string name="post_call_message_3" msgid="3932759658420368056">"זה לא דחוף. אנחנו יכולים לדבר אחר כך."</string>
-    <string name="post_call_add_message" msgid="8298853527467080463">"הוסף הודעה"</string>
-    <string name="post_call_send_message" msgid="8039569617234824873">"שליחת הודעה"</string>
-    <string name="post_call_message_sent" msgid="832757977985265036">"ההודעה נשלחה"</string>
-    <string name="view" msgid="8572192949673703830">"הצג"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="post_call_message">ספר למה התקשרת</string>
+  <string name="post_call_message_1">זה דחוף. תוכל/י לחזור אלי?</string>
+  <string name="post_call_message_2">תוכל/י לחזור אלי כשיהיה לך זמן?</string>
+  <string name="post_call_message_3">זה לא דחוף. אנחנו יכולים לדבר אחר כך.</string>
+  <string name="post_call_add_message">הוסף הודעה</string>
+  <string name="post_call_send_message">שליחת הודעה</string>
+  <string name="post_call_message_sent">ההודעה נשלחה</string>
+  <string name="view">הצג</string>
 </resources>
diff --git a/java/com/android/dialer/postcall/res/values-ja/strings.xml b/java/com/android/dialer/postcall/res/values-ja/strings.xml
index 7fe66c5..4249ccd 100644
--- a/java/com/android/dialer/postcall/res/values-ja/strings.xml
+++ b/java/com/android/dialer/postcall/res/values-ja/strings.xml
@@ -1,28 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="post_call_message" msgid="3541277172068556862">"電話をした理由を伝えられます"</string>
-    <string name="post_call_message_1" msgid="4827849136801228106">"至急お伝えしたいことがあるので、折り返しお電話ください。"</string>
-    <string name="post_call_message_2" msgid="5310301526176003385">"お時間のあるときにお電話ください。"</string>
-    <string name="post_call_message_3" msgid="3932759658420368056">"急ぎではないので、また後でかけ直します。"</string>
-    <string name="post_call_add_message" msgid="8298853527467080463">"メッセージを追加できます"</string>
-    <string name="post_call_send_message" msgid="8039569617234824873">"メッセージを送信"</string>
-    <string name="post_call_message_sent" msgid="832757977985265036">"メッセージを送信しました"</string>
-    <string name="view" msgid="8572192949673703830">"表示"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="post_call_message">電話をした理由を伝えられます</string>
+  <string name="post_call_message_1">至急お伝えしたいことがあるので、折り返しお電話ください。</string>
+  <string name="post_call_message_2">お時間のあるときにお電話ください。</string>
+  <string name="post_call_message_3">急ぎではないので、また後でかけ直します。</string>
+  <string name="post_call_add_message">メッセージを追加できます</string>
+  <string name="post_call_send_message">メッセージを送信</string>
+  <string name="post_call_message_sent">メッセージを送信しました</string>
+  <string name="view">表示</string>
 </resources>
diff --git a/java/com/android/dialer/postcall/res/values-ka/strings.xml b/java/com/android/dialer/postcall/res/values-ka/strings.xml
index 1b1dadd..ecd8686 100644
--- a/java/com/android/dialer/postcall/res/values-ka/strings.xml
+++ b/java/com/android/dialer/postcall/res/values-ka/strings.xml
@@ -1,28 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="post_call_message" msgid="3541277172068556862">"თქვით, რატომ დარეკეთ"</string>
-    <string name="post_call_message_1" msgid="4827849136801228106">"ეს სასწრაფოა. გადმომირეკე."</string>
-    <string name="post_call_message_2" msgid="5310301526176003385">"დამირეკე, როცა დრო გექნება."</string>
-    <string name="post_call_message_3" msgid="3932759658420368056">"სასწრაფო არ არის, შეგვიძლია ვისაუბროთ მოგვიანებით."</string>
-    <string name="post_call_add_message" msgid="8298853527467080463">"შეტყობინების დამატება"</string>
-    <string name="post_call_send_message" msgid="8039569617234824873">"შეტყობინების გაგზავნა"</string>
-    <string name="post_call_message_sent" msgid="832757977985265036">"შეტყობინება გაიგზავნა"</string>
-    <string name="view" msgid="8572192949673703830">"ნახვა"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="post_call_message">თქვით, რატომ დარეკეთ</string>
+  <string name="post_call_message_1">ეს სასწრაფოა. გადმომირეკე.</string>
+  <string name="post_call_message_2">დამირეკე, როცა დრო გექნება.</string>
+  <string name="post_call_message_3">სასწრაფო არ არის, შეგვიძლია ვისაუბროთ მოგვიანებით.</string>
+  <string name="post_call_add_message">შეტყობინების დამატება</string>
+  <string name="post_call_send_message">შეტყობინების გაგზავნა</string>
+  <string name="post_call_message_sent">შეტყობინება გაიგზავნა</string>
+  <string name="view">ნახვა</string>
 </resources>
diff --git a/java/com/android/dialer/postcall/res/values-kk/strings.xml b/java/com/android/dialer/postcall/res/values-kk/strings.xml
index aaf2f40..2d2fee1 100644
--- a/java/com/android/dialer/postcall/res/values-kk/strings.xml
+++ b/java/com/android/dialer/postcall/res/values-kk/strings.xml
@@ -1,28 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="post_call_message" msgid="3541277172068556862">"Неге қоңырау шалғаныңызды айтыңыз"</string>
-    <string name="post_call_message_1" msgid="4827849136801228106">"Шұғыл шаруа. Маған қайта қоңырау шалыңыз."</string>
-    <string name="post_call_message_2" msgid="5310301526176003385">"Уақытыңыз болғанда, маған қайта қоңырау шалыңыз."</string>
-    <string name="post_call_message_3" msgid="3932759658420368056">"Шұғыл емес, кейінірек сөйлесерміз."</string>
-    <string name="post_call_add_message" msgid="8298853527467080463">"Хабар қосу"</string>
-    <string name="post_call_send_message" msgid="8039569617234824873">"Хабарды жіберу"</string>
-    <string name="post_call_message_sent" msgid="832757977985265036">"Хабар жіберілді"</string>
-    <string name="view" msgid="8572192949673703830">"Көру"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="post_call_message">Неге қоңырау шалғаныңызды айтыңыз</string>
+  <string name="post_call_message_1">Шұғыл шаруа. Маған қайта қоңырау шалыңыз.</string>
+  <string name="post_call_message_2">Уақытыңыз болғанда, маған қайта қоңырау шалыңыз.</string>
+  <string name="post_call_message_3">Шұғыл емес, кейінірек сөйлесерміз.</string>
+  <string name="post_call_add_message">Хабар қосу</string>
+  <string name="post_call_send_message">Хабарды жіберу</string>
+  <string name="post_call_message_sent">Хабар жіберілді</string>
+  <string name="view">Көру</string>
 </resources>
diff --git a/java/com/android/dialer/postcall/res/values-km/strings.xml b/java/com/android/dialer/postcall/res/values-km/strings.xml
index db9e8aa..3b97ba3 100644
--- a/java/com/android/dialer/postcall/res/values-km/strings.xml
+++ b/java/com/android/dialer/postcall/res/values-km/strings.xml
@@ -1,28 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="post_call_message" msgid="3541277172068556862">"និយាយពីមូលហេតុដែលអ្នកហៅទូរស័ព្ទ"</string>
-    <string name="post_call_message_1" msgid="4827849136801228106">"នេះជាការបន្ទាន់។ សូមហៅទូរស័ព្ទមកខ្ញុំវិញ។"</string>
-    <string name="post_call_message_2" msgid="5310301526176003385">"សូមហៅទូរស័ព្ទមកខ្ញុំវិញនៅពេលអ្នកឆ្លៀតពេលបានខ្លះ។"</string>
-    <string name="post_call_message_3" msgid="3932759658420368056">"មិនបន្ទាន់ទេ យើងអាចជជែកគ្នានៅពេលក្រោយ។"</string>
-    <string name="post_call_add_message" msgid="8298853527467080463">"បន្ថែមសារ"</string>
-    <string name="post_call_send_message" msgid="8039569617234824873">"ផ្ញើ​សារ"</string>
-    <string name="post_call_message_sent" msgid="832757977985265036">"បានផ្ញើសាររួចហើយ"</string>
-    <string name="view" msgid="8572192949673703830">"មើល"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="post_call_message">និយាយពីមូលហេតុដែលអ្នកហៅទូរស័ព្ទ</string>
+  <string name="post_call_message_1">នេះជាការបន្ទាន់។ សូមហៅទូរស័ព្ទមកខ្ញុំវិញ។</string>
+  <string name="post_call_message_2">សូមហៅទូរស័ព្ទមកខ្ញុំវិញនៅពេលអ្នកឆ្លៀតពេលបានខ្លះ។</string>
+  <string name="post_call_message_3">មិនបន្ទាន់ទេ យើងអាចជជែកគ្នានៅពេលក្រោយ។</string>
+  <string name="post_call_add_message">បន្ថែមសារ</string>
+  <string name="post_call_send_message">ផ្ញើ​សារ</string>
+  <string name="post_call_message_sent">បានផ្ញើសាររួចហើយ</string>
+  <string name="view">មើល</string>
 </resources>
diff --git a/java/com/android/dialer/postcall/res/values-kn/strings.xml b/java/com/android/dialer/postcall/res/values-kn/strings.xml
index 213e97a..2a9dca6 100644
--- a/java/com/android/dialer/postcall/res/values-kn/strings.xml
+++ b/java/com/android/dialer/postcall/res/values-kn/strings.xml
@@ -1,28 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="post_call_message" msgid="3541277172068556862">"ನೀವು ಏಕೆ ಕರೆ ಮಾಡಿರುವಿರಿ ಎಂದು ಹೇಳಿ"</string>
-    <string name="post_call_message_1" msgid="4827849136801228106">"ತುರ್ತಾಗಿ ನನಗೆ ತಕ್ಷಣ ಕರೆ ಮಾಡಿ."</string>
-    <string name="post_call_message_2" msgid="5310301526176003385">"ನಿಮಗೆ ಸಮಯವಿದ್ದಾಗ ನನಗೆ ಕರೆ ಮಾಡಿ."</string>
-    <string name="post_call_message_3" msgid="3932759658420368056">"ಅವಸರವಿಲ್ಲ, ನಾವು ನಂತರ ಚಾಟ್ ಮಾಡಬಹುದು."</string>
-    <string name="post_call_add_message" msgid="8298853527467080463">"ಸಂದೇಶವನ್ನು ಸೇರಿಸಿ"</string>
-    <string name="post_call_send_message" msgid="8039569617234824873">"ಸಂದೇಶ ಕಳುಹಿಸಿ"</string>
-    <string name="post_call_message_sent" msgid="832757977985265036">"ಸಂದೇಶ ಕಳುಹಿಸಲಾಗಿದೆ"</string>
-    <string name="view" msgid="8572192949673703830">"ವೀಕ್ಷಿಸಿ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="post_call_message">ನೀವು ಏಕೆ ಕರೆ ಮಾಡಿರುವಿರಿ ಎಂದು ಹೇಳಿ</string>
+  <string name="post_call_message_1">ತುರ್ತಾಗಿ ನನಗೆ ತಕ್ಷಣ ಕರೆ ಮಾಡಿ.</string>
+  <string name="post_call_message_2">ನಿಮಗೆ ಸಮಯವಿದ್ದಾಗ ನನಗೆ ಕರೆ ಮಾಡಿ.</string>
+  <string name="post_call_message_3">ಅವಸರವಿಲ್ಲ, ನಾವು ನಂತರ ಚಾಟ್ ಮಾಡಬಹುದು.</string>
+  <string name="post_call_add_message">ಸಂದೇಶವನ್ನು ಸೇರಿಸಿ</string>
+  <string name="post_call_send_message">ಸಂದೇಶ ಕಳುಹಿಸಿ</string>
+  <string name="post_call_message_sent">ಸಂದೇಶ ಕಳುಹಿಸಲಾಗಿದೆ</string>
+  <string name="view">ವೀಕ್ಷಿಸಿ</string>
 </resources>
diff --git a/java/com/android/dialer/postcall/res/values-ko/strings.xml b/java/com/android/dialer/postcall/res/values-ko/strings.xml
index dbd07b4..5805db4 100644
--- a/java/com/android/dialer/postcall/res/values-ko/strings.xml
+++ b/java/com/android/dialer/postcall/res/values-ko/strings.xml
@@ -1,28 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="post_call_message" msgid="3541277172068556862">"전화한 이유를 알려주세요."</string>
-    <string name="post_call_message_1" msgid="4827849136801228106">"급한 용무이니 전화해 주세요."</string>
-    <string name="post_call_message_2" msgid="5310301526176003385">"시간 나실 때 전화해 주세요."</string>
-    <string name="post_call_message_3" msgid="3932759658420368056">"급한 용무는 아니니 나중에 다시 연락드릴게요."</string>
-    <string name="post_call_add_message" msgid="8298853527467080463">"메시지를 추가하시겠습니까?"</string>
-    <string name="post_call_send_message" msgid="8039569617234824873">"메시지 보내기"</string>
-    <string name="post_call_message_sent" msgid="832757977985265036">"메시지 전송됨"</string>
-    <string name="view" msgid="8572192949673703830">"보기"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="post_call_message">전화한 이유를 알려주세요.</string>
+  <string name="post_call_message_1">급한 용무이니 전화해 주세요.</string>
+  <string name="post_call_message_2">시간 나실 때 전화해 주세요.</string>
+  <string name="post_call_message_3">급한 용무는 아니니 나중에 다시 연락드릴게요.</string>
+  <string name="post_call_add_message">메시지를 추가하시겠습니까?</string>
+  <string name="post_call_send_message">메시지 보내기</string>
+  <string name="post_call_message_sent">메시지 전송됨</string>
+  <string name="view">보기</string>
 </resources>
diff --git a/java/com/android/dialer/postcall/res/values-ky/strings.xml b/java/com/android/dialer/postcall/res/values-ky/strings.xml
index 8121bcf..afa227d 100644
--- a/java/com/android/dialer/postcall/res/values-ky/strings.xml
+++ b/java/com/android/dialer/postcall/res/values-ky/strings.xml
@@ -1,28 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="post_call_message" msgid="3541277172068556862">"Эмне үчүн чалганыңызды айтып бериңиз"</string>
-    <string name="post_call_message_1" msgid="4827849136801228106">"Бул шашылыш нерсе. Мага кайра чалыңыз."</string>
-    <string name="post_call_message_2" msgid="5310301526176003385">"Убактыңыз болгондо мага кайра чалып коюңуз."</string>
-    <string name="post_call_message_3" msgid="3932759658420368056">"Шашылыш эмес, биз кийинчерээк маектеше алабыз."</string>
-    <string name="post_call_add_message" msgid="8298853527467080463">"Билдирүүнү кошуңуз"</string>
-    <string name="post_call_send_message" msgid="8039569617234824873">"Билдирүү жөнөтүү"</string>
-    <string name="post_call_message_sent" msgid="832757977985265036">"Билдирүү жөнөтүлдү"</string>
-    <string name="view" msgid="8572192949673703830">"Карап көрүү"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="post_call_message">Эмне үчүн чалганыңызды айтып бериңиз</string>
+  <string name="post_call_message_1">Бул шашылыш нерсе. Мага кайра чалыңыз.</string>
+  <string name="post_call_message_2">Убактыңыз болгондо мага кайра чалып коюңуз.</string>
+  <string name="post_call_message_3">Шашылыш эмес, биз кийинчерээк маектеше алабыз.</string>
+  <string name="post_call_add_message">Билдирүүнү кошуңуз</string>
+  <string name="post_call_send_message">Билдирүү жөнөтүү</string>
+  <string name="post_call_message_sent">Билдирүү жөнөтүлдү</string>
+  <string name="view">Карап көрүү</string>
 </resources>
diff --git a/java/com/android/dialer/postcall/res/values-lo/strings.xml b/java/com/android/dialer/postcall/res/values-lo/strings.xml
index 1b9f500..102d302 100644
--- a/java/com/android/dialer/postcall/res/values-lo/strings.xml
+++ b/java/com/android/dialer/postcall/res/values-lo/strings.xml
@@ -1,28 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="post_call_message" msgid="3541277172068556862">"ບອກວ່າເປັນຫຍັງທ່ານໂທ"</string>
-    <string name="post_call_message_1" msgid="4827849136801228106">"ເລື່ອງດ່ວນ. ໂທກັບແດ່."</string>
-    <string name="post_call_message_2" msgid="5310301526176003385">"ຖ້າຫວ່າງແລ້ວໂທກັບແດ່."</string>
-    <string name="post_call_message_3" msgid="3932759658420368056">"ບໍ່ດ່ວນປານໃດ, ໄວ້ຄ່ອຍລົມກໍໄດ້."</string>
-    <string name="post_call_add_message" msgid="8298853527467080463">"ເພີ່ມຂໍ້ຄວາມ"</string>
-    <string name="post_call_send_message" msgid="8039569617234824873">"ສົ່ງຂໍ້ຄວາມ"</string>
-    <string name="post_call_message_sent" msgid="832757977985265036">"ສົ່ງຂໍ້ຄວາມແລ້ວ"</string>
-    <string name="view" msgid="8572192949673703830">"ເບິ່ງ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="post_call_message">ບອກວ່າເປັນຫຍັງທ່ານໂທ</string>
+  <string name="post_call_message_1">ເລື່ອງດ່ວນ. ໂທກັບແດ່.</string>
+  <string name="post_call_message_2">ຖ້າຫວ່າງແລ້ວໂທກັບແດ່.</string>
+  <string name="post_call_message_3">ບໍ່ດ່ວນປານໃດ, ໄວ້ຄ່ອຍລົມກໍໄດ້.</string>
+  <string name="post_call_add_message">ເພີ່ມຂໍ້ຄວາມ</string>
+  <string name="post_call_send_message">ສົ່ງຂໍ້ຄວາມ</string>
+  <string name="post_call_message_sent">ສົ່ງຂໍ້ຄວາມແລ້ວ</string>
+  <string name="view">ເບິ່ງ</string>
 </resources>
diff --git a/java/com/android/dialer/postcall/res/values-lt/strings.xml b/java/com/android/dialer/postcall/res/values-lt/strings.xml
index 445cc9a..709bf8a 100644
--- a/java/com/android/dialer/postcall/res/values-lt/strings.xml
+++ b/java/com/android/dialer/postcall/res/values-lt/strings.xml
@@ -1,28 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="post_call_message" msgid="3541277172068556862">"Pasakykite, kodėl paskambinote"</string>
-    <string name="post_call_message_1" msgid="4827849136801228106">"Tai skubu. Atskambinkite."</string>
-    <string name="post_call_message_2" msgid="5310301526176003385">"Atskambinkite, kai turėsite šiek tiek laiko."</string>
-    <string name="post_call_message_3" msgid="3932759658420368056">"Neskubu, galėsime vėliau pasikalbėti."</string>
-    <string name="post_call_add_message" msgid="8298853527467080463">"Pridėkite pranešimą"</string>
-    <string name="post_call_send_message" msgid="8039569617234824873">"Siųsti pranešimą"</string>
-    <string name="post_call_message_sent" msgid="832757977985265036">"Pranešimas išsiųstas"</string>
-    <string name="view" msgid="8572192949673703830">"Peržiūrėti"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="post_call_message">Pasakykite, kodėl paskambinote</string>
+  <string name="post_call_message_1">Tai skubu. Atskambinkite.</string>
+  <string name="post_call_message_2">Atskambinkite, kai turėsite šiek tiek laiko.</string>
+  <string name="post_call_message_3">Neskubu, galėsime vėliau pasikalbėti.</string>
+  <string name="post_call_add_message">Pridėkite pranešimą</string>
+  <string name="post_call_send_message">Siųsti pranešimą</string>
+  <string name="post_call_message_sent">Pranešimas išsiųstas</string>
+  <string name="view">Peržiūrėti</string>
 </resources>
diff --git a/java/com/android/dialer/postcall/res/values-lv/strings.xml b/java/com/android/dialer/postcall/res/values-lv/strings.xml
index 0a2f697..3bfd5d1 100644
--- a/java/com/android/dialer/postcall/res/values-lv/strings.xml
+++ b/java/com/android/dialer/postcall/res/values-lv/strings.xml
@@ -1,28 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="post_call_message" msgid="3541277172068556862">"Pastāstiet, kāpēc zvanījāt"</string>
-    <string name="post_call_message_1" msgid="4827849136801228106">"Tas ir steidzami. Piezvaniet man!"</string>
-    <string name="post_call_message_2" msgid="5310301526176003385">"Piezvaniet man, kad būs brīdis laika."</string>
-    <string name="post_call_message_3" msgid="3932759658420368056">"Tas nav steidzami. Varam parunāt vēlāk."</string>
-    <string name="post_call_add_message" msgid="8298853527467080463">"Pievienojiet ziņojumu"</string>
-    <string name="post_call_send_message" msgid="8039569617234824873">"Sūtīt ziņojumu"</string>
-    <string name="post_call_message_sent" msgid="832757977985265036">"Ziņojums nosūtīts"</string>
-    <string name="view" msgid="8572192949673703830">"Skatīt"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="post_call_message">Pastāstiet, kāpēc zvanījāt</string>
+  <string name="post_call_message_1">Tas ir steidzami. Piezvaniet man!</string>
+  <string name="post_call_message_2">Piezvaniet man, kad būs brīdis laika.</string>
+  <string name="post_call_message_3">Tas nav steidzami. Varam parunāt vēlāk.</string>
+  <string name="post_call_add_message">Pievienojiet ziņojumu</string>
+  <string name="post_call_send_message">Sūtīt ziņojumu</string>
+  <string name="post_call_message_sent">Ziņojums nosūtīts</string>
+  <string name="view">Skatīt</string>
 </resources>
diff --git a/java/com/android/dialer/postcall/res/values-mk/strings.xml b/java/com/android/dialer/postcall/res/values-mk/strings.xml
index b6ec11e..2ad6399 100644
--- a/java/com/android/dialer/postcall/res/values-mk/strings.xml
+++ b/java/com/android/dialer/postcall/res/values-mk/strings.xml
@@ -1,28 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="post_call_message" msgid="3541277172068556862">"Кажете зошто се јавивте"</string>
-    <string name="post_call_message_1" msgid="4827849136801228106">"Итно е. Јави ми се."</string>
-    <string name="post_call_message_2" msgid="5310301526176003385">"Јави ми се кога ќе имаш време."</string>
-    <string name="post_call_message_3" msgid="3932759658420368056">"Не е итно. Може да разговараме подоцна."</string>
-    <string name="post_call_add_message" msgid="8298853527467080463">"Додајте порака"</string>
-    <string name="post_call_send_message" msgid="8039569617234824873">"Испратете порака"</string>
-    <string name="post_call_message_sent" msgid="832757977985265036">"Пораката е испратена"</string>
-    <string name="view" msgid="8572192949673703830">"Прикажи"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="post_call_message">Кажете зошто се јавивте</string>
+  <string name="post_call_message_1">Итно е. Јави ми се.</string>
+  <string name="post_call_message_2">Јави ми се кога ќе имаш време.</string>
+  <string name="post_call_message_3">Не е итно. Може да разговараме подоцна.</string>
+  <string name="post_call_add_message">Додајте порака</string>
+  <string name="post_call_send_message">Испратете порака</string>
+  <string name="post_call_message_sent">Пораката е испратена</string>
+  <string name="view">Прикажи</string>
 </resources>
diff --git a/java/com/android/dialer/postcall/res/values-ml/strings.xml b/java/com/android/dialer/postcall/res/values-ml/strings.xml
index 7d9fc60..0db9e35 100644
--- a/java/com/android/dialer/postcall/res/values-ml/strings.xml
+++ b/java/com/android/dialer/postcall/res/values-ml/strings.xml
@@ -1,28 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="post_call_message" msgid="3541277172068556862">"നിങ്ങളെന്തിനാണ് വിളിച്ചതെന്ന് പറയൂ"</string>
-    <string name="post_call_message_1" msgid="4827849136801228106">"ഇതൊരു അത്യാവശ്യ കോളാണ്. എന്നെ തിരിച്ച് വിളിക്കുക."</string>
-    <string name="post_call_message_2" msgid="5310301526176003385">"നിങ്ങൾക്ക് സമയം കിട്ടുമ്പോൾ എന്നെ തിരിച്ച് വിളിക്കൂ."</string>
-    <string name="post_call_message_3" msgid="3932759658420368056">"അത്യാവശ്യമില്ല, നമുക്ക് പിന്നീട് ചാറ്റുചെയ്യാം."</string>
-    <string name="post_call_add_message" msgid="8298853527467080463">"സന്ദേശം ചേർക്കുക"</string>
-    <string name="post_call_send_message" msgid="8039569617234824873">"സന്ദേശം അയയ്‌ക്കുക"</string>
-    <string name="post_call_message_sent" msgid="832757977985265036">"സന്ദേശം അയച്ചു"</string>
-    <string name="view" msgid="8572192949673703830">"കാണുക"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="post_call_message">നിങ്ങളെന്തിനാണ് വിളിച്ചതെന്ന് പറയൂ</string>
+  <string name="post_call_message_1">ഇതൊരു അത്യാവശ്യ കോളാണ്. എന്നെ തിരിച്ച് വിളിക്കുക.</string>
+  <string name="post_call_message_2">നിങ്ങൾക്ക് സമയം കിട്ടുമ്പോൾ എന്നെ തിരിച്ച് വിളിക്കൂ.</string>
+  <string name="post_call_message_3">അത്യാവശ്യമില്ല, നമുക്ക് പിന്നീട് ചാറ്റുചെയ്യാം.</string>
+  <string name="post_call_add_message">സന്ദേശം ചേർക്കുക</string>
+  <string name="post_call_send_message">സന്ദേശം അയയ്‌ക്കുക</string>
+  <string name="post_call_message_sent">സന്ദേശം അയച്ചു</string>
+  <string name="view">കാണുക</string>
 </resources>
diff --git a/java/com/android/dialer/postcall/res/values-mn/strings.xml b/java/com/android/dialer/postcall/res/values-mn/strings.xml
index 08ceac4..f2213a4 100644
--- a/java/com/android/dialer/postcall/res/values-mn/strings.xml
+++ b/java/com/android/dialer/postcall/res/values-mn/strings.xml
@@ -1,28 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="post_call_message" msgid="3541277172068556862">"Яагаад залгасан гэдгээ хэлнэ үү"</string>
-    <string name="post_call_message_1" msgid="4827849136801228106">"Энэ бол яаралтай. Над руу буцааж залгана уу."</string>
-    <string name="post_call_message_2" msgid="5310301526176003385">"Завтай болоод над руу буцааж залгана уу."</string>
-    <string name="post_call_message_3" msgid="3932759658420368056">"Яаралтай биш, бид дараа чатлаж болно."</string>
-    <string name="post_call_add_message" msgid="8298853527467080463">"Зурвас нэмэх"</string>
-    <string name="post_call_send_message" msgid="8039569617234824873">"Зурвас илгээх"</string>
-    <string name="post_call_message_sent" msgid="832757977985265036">"Зурвас илгээсэн"</string>
-    <string name="view" msgid="8572192949673703830">"Үзэх"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="post_call_message">Яагаад залгасан гэдгээ хэлнэ үү</string>
+  <string name="post_call_message_1">Энэ бол яаралтай. Над руу буцааж залгана уу.</string>
+  <string name="post_call_message_2">Завтай болоод над руу буцааж залгана уу.</string>
+  <string name="post_call_message_3">Яаралтай биш, бид дараа чатлаж болно.</string>
+  <string name="post_call_add_message">Зурвас нэмэх</string>
+  <string name="post_call_send_message">Зурвас илгээх</string>
+  <string name="post_call_message_sent">Зурвас илгээсэн</string>
+  <string name="view">Үзэх</string>
 </resources>
diff --git a/java/com/android/dialer/postcall/res/values-mr/strings.xml b/java/com/android/dialer/postcall/res/values-mr/strings.xml
index fb3d2bd..63848b0 100644
--- a/java/com/android/dialer/postcall/res/values-mr/strings.xml
+++ b/java/com/android/dialer/postcall/res/values-mr/strings.xml
@@ -1,28 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="post_call_message" msgid="3541277172068556862">"आपण कॉल का केला ते सांगा"</string>
-    <string name="post_call_message_1" msgid="4827849136801228106">"हे खूप महत्वाचे आहे. मला परत कॉल करा."</string>
-    <string name="post_call_message_2" msgid="5310301526176003385">"आपल्याकडे वेळ असेल तेव्हा मला परत कॉल करा."</string>
-    <string name="post_call_message_3" msgid="3932759658420368056">"काही महत्वाचे नाही, आपण नंतर चॅट करू शकतो."</string>
-    <string name="post_call_add_message" msgid="8298853527467080463">"संदेश जोडा"</string>
-    <string name="post_call_send_message" msgid="8039569617234824873">"संदेश पाठवा"</string>
-    <string name="post_call_message_sent" msgid="832757977985265036">"संदेश पाठविला"</string>
-    <string name="view" msgid="8572192949673703830">"पहा"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="post_call_message">आपण कॉल का केला ते सांगा</string>
+  <string name="post_call_message_1">हे खूप महत्वाचे आहे. मला परत कॉल करा.</string>
+  <string name="post_call_message_2">आपल्याकडे वेळ असेल तेव्हा मला परत कॉल करा.</string>
+  <string name="post_call_message_3">काही महत्वाचे नाही, आपण नंतर चॅट करू शकतो.</string>
+  <string name="post_call_add_message">मेसेज जोडा</string>
+  <string name="post_call_send_message">मेसेज पाठवा</string>
+  <string name="post_call_message_sent">मेसेज पाठविला</string>
+  <string name="view">पहा</string>
 </resources>
diff --git a/java/com/android/dialer/postcall/res/values-ms/strings.xml b/java/com/android/dialer/postcall/res/values-ms/strings.xml
index fa4db84..77629ba 100644
--- a/java/com/android/dialer/postcall/res/values-ms/strings.xml
+++ b/java/com/android/dialer/postcall/res/values-ms/strings.xml
@@ -1,28 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="post_call_message" msgid="3541277172068556862">"Nyatakan sebab anda memanggil"</string>
-    <string name="post_call_message_1" msgid="4827849136801228106">"Ada hal penting. Hubungi saya balik."</string>
-    <string name="post_call_message_2" msgid="5310301526176003385">"Hubungi saya balik apabila ada kelapangan."</string>
-    <string name="post_call_message_3" msgid="3932759658420368056">"Tidak penting, kita boleh bersembang kemudian."</string>
-    <string name="post_call_add_message" msgid="8298853527467080463">"Tambah mesej"</string>
-    <string name="post_call_send_message" msgid="8039569617234824873">"Hantar mesej"</string>
-    <string name="post_call_message_sent" msgid="832757977985265036">"Mesej dihantar"</string>
-    <string name="view" msgid="8572192949673703830">"Lihat"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="post_call_message">Nyatakan sebab anda memanggil</string>
+  <string name="post_call_message_1">Ada hal penting. Hubungi saya balik.</string>
+  <string name="post_call_message_2">Hubungi saya balik apabila ada kelapangan.</string>
+  <string name="post_call_message_3">Tidak penting, kita boleh bersembang kemudian.</string>
+  <string name="post_call_add_message">Tambah mesej</string>
+  <string name="post_call_send_message">Hantar mesej</string>
+  <string name="post_call_message_sent">Mesej dihantar</string>
+  <string name="view">Lihat</string>
 </resources>
diff --git a/java/com/android/dialer/postcall/res/values-my/strings.xml b/java/com/android/dialer/postcall/res/values-my/strings.xml
index 6c976fb..2eca1ea 100644
--- a/java/com/android/dialer/postcall/res/values-my/strings.xml
+++ b/java/com/android/dialer/postcall/res/values-my/strings.xml
@@ -1,28 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="post_call_message" msgid="3541277172068556862">"သင် ဘာကြောင့် ခေါ်ဆိုသည်ကို ပြောပါ"</string>
-    <string name="post_call_message_1" msgid="4827849136801228106">"အရေးကြီးသည်။ ကျွန်ုပ်ကို ပြန်ခေါ်ပါ။"</string>
-    <string name="post_call_message_2" msgid="5310301526176003385">"သင်အချိန်ရလျှင် ကျွန်ုပ်ကို ပြန်ခေါ်ပါ။"</string>
-    <string name="post_call_message_3" msgid="3932759658420368056">"အရေးမကြီးပါ၊ နောက်မှ ကျွန်ုပ်တို့ ချတ်လုပ်နိုင်ပါသည်။"</string>
-    <string name="post_call_add_message" msgid="8298853527467080463">"မက်ဆေ့ဂျ် ထည့်သွင်းပါ"</string>
-    <string name="post_call_send_message" msgid="8039569617234824873">"မက်ဆေ့ဂျ် ပို့မလား"</string>
-    <string name="post_call_message_sent" msgid="832757977985265036">"မက်ဆေ့ဂျ် ပို့ပြီးပါပြီ"</string>
-    <string name="view" msgid="8572192949673703830">"ကြည့်ရန်"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="post_call_message">သင် ဘာကြောင့် ခေါ်ဆိုသည်ကို ပြောပါ</string>
+  <string name="post_call_message_1">အရေးကြီးသည်။ ကျွန်ုပ်ကို ပြန်ခေါ်ပါ။</string>
+  <string name="post_call_message_2">သင်အချိန်ရလျှင် ကျွန်ုပ်ကို ပြန်ခေါ်ပါ။</string>
+  <string name="post_call_message_3">အရေးမကြီးပါ၊ နောက်မှ ကျွန်ုပ်တို့ ချတ်လုပ်နိုင်ပါသည်။</string>
+  <string name="post_call_add_message">မက်ဆေ့ဂျ် ထည့်သွင်းပါ</string>
+  <string name="post_call_send_message">မက်ဆေ့ဂျ် ပို့မလား</string>
+  <string name="post_call_message_sent">မက်ဆေ့ဂျ် ပို့ပြီးပါပြီ</string>
+  <string name="view">ကြည့်ရန်</string>
 </resources>
diff --git a/java/com/android/dialer/postcall/res/values-nb/strings.xml b/java/com/android/dialer/postcall/res/values-nb/strings.xml
index 56b7b68..bfd5c3c 100644
--- a/java/com/android/dialer/postcall/res/values-nb/strings.xml
+++ b/java/com/android/dialer/postcall/res/values-nb/strings.xml
@@ -1,28 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="post_call_message" msgid="3541277172068556862">"Si hvorfor du ringte"</string>
-    <string name="post_call_message_1" msgid="4827849136801228106">"Haster! Ring meg."</string>
-    <string name="post_call_message_2" msgid="5310301526176003385">"Ring tilbake når du har tid."</string>
-    <string name="post_call_message_3" msgid="3932759658420368056">"Haster ikke. Prates senere?"</string>
-    <string name="post_call_add_message" msgid="8298853527467080463">"Legg til melding"</string>
-    <string name="post_call_send_message" msgid="8039569617234824873">"Send melding"</string>
-    <string name="post_call_message_sent" msgid="832757977985265036">"Meldingen er sendt"</string>
-    <string name="view" msgid="8572192949673703830">"Se"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="post_call_message">Si hvorfor du ringte</string>
+  <string name="post_call_message_1">Haster! Ring meg.</string>
+  <string name="post_call_message_2">Ring tilbake når du har tid.</string>
+  <string name="post_call_message_3">Haster ikke. Prates senere?</string>
+  <string name="post_call_add_message">Legg til melding</string>
+  <string name="post_call_send_message">Send melding</string>
+  <string name="post_call_message_sent">Meldingen er sendt</string>
+  <string name="view">Se</string>
 </resources>
diff --git a/java/com/android/dialer/postcall/res/values-ne/strings.xml b/java/com/android/dialer/postcall/res/values-ne/strings.xml
index 93546cd..5744d32 100644
--- a/java/com/android/dialer/postcall/res/values-ne/strings.xml
+++ b/java/com/android/dialer/postcall/res/values-ne/strings.xml
@@ -1,28 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="post_call_message" msgid="3541277172068556862">"तपाईंले किन बोलाउनुभयो भन्नुहोस्"</string>
-    <string name="post_call_message_1" msgid="4827849136801228106">"जरूरी काम छ। मलाई कल गरिहाल्नुहोस्।"</string>
-    <string name="post_call_message_2" msgid="5310301526176003385">"तपाईंलाई अलि फुर्सद भएका बेला मलाई कल गर्नुहोस्।"</string>
-    <string name="post_call_message_3" msgid="3932759658420368056">"जरूरी छैन, पछि कुरा गर्दा हुन्छ।"</string>
-    <string name="post_call_add_message" msgid="8298853527467080463">"सन्देश थप्नुहोस्"</string>
-    <string name="post_call_send_message" msgid="8039569617234824873">"सन्देश पठाउनुहोस्"</string>
-    <string name="post_call_message_sent" msgid="832757977985265036">"सन्देश पठाइयो"</string>
-    <string name="view" msgid="8572192949673703830">"हेर्नुहोस्"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="post_call_message">तपाईंले किन बोलाउनुभयो भन्नुहोस्</string>
+  <string name="post_call_message_1">जरुरी काम छ। मलाई कल गरिहाल्नुहोस्।</string>
+  <string name="post_call_message_2">तपाईंलाई अलि फुर्सद भएका बेला मलाई कल गर्नुहोस्।</string>
+  <string name="post_call_message_3">जरुरी छैन, पछि कुरा गर्दा हुन्छ।</string>
+  <string name="post_call_add_message">सन्देश थप्नुहोस्</string>
+  <string name="post_call_send_message">सन्देश पठाउनुहोस्</string>
+  <string name="post_call_message_sent">सन्देश पठाइयो</string>
+  <string name="view">हेर्नुहोस्</string>
 </resources>
diff --git a/java/com/android/dialer/postcall/res/values-nl/strings.xml b/java/com/android/dialer/postcall/res/values-nl/strings.xml
index 3aeec01..eea15fb 100644
--- a/java/com/android/dialer/postcall/res/values-nl/strings.xml
+++ b/java/com/android/dialer/postcall/res/values-nl/strings.xml
@@ -1,28 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="post_call_message" msgid="3541277172068556862">"Vertel waarom je hebt gebeld"</string>
-    <string name="post_call_message_1" msgid="4827849136801228106">"Ik moet je dringend spreken, bel me terug."</string>
-    <string name="post_call_message_2" msgid="5310301526176003385">"Bel me terug als je tijd hebt."</string>
-    <string name="post_call_message_3" msgid="3932759658420368056">"Het is niet dringend, ik spreek je later."</string>
-    <string name="post_call_add_message" msgid="8298853527467080463">"Bericht toevoegen"</string>
-    <string name="post_call_send_message" msgid="8039569617234824873">"Bericht verzenden"</string>
-    <string name="post_call_message_sent" msgid="832757977985265036">"Bericht verzonden"</string>
-    <string name="view" msgid="8572192949673703830">"Weergeven"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="post_call_message">Vertel waarom je hebt gebeld</string>
+  <string name="post_call_message_1">Ik moet je dringend spreken, bel me terug.</string>
+  <string name="post_call_message_2">Bel me terug als je tijd hebt.</string>
+  <string name="post_call_message_3">Het is niet dringend, ik spreek je later.</string>
+  <string name="post_call_add_message">Bericht toevoegen</string>
+  <string name="post_call_send_message">Bericht verzenden</string>
+  <string name="post_call_message_sent">Bericht verzonden</string>
+  <string name="view">Weergeven</string>
 </resources>
diff --git a/java/com/android/dialer/postcall/res/values-no/strings.xml b/java/com/android/dialer/postcall/res/values-no/strings.xml
index 56b7b68..bfd5c3c 100644
--- a/java/com/android/dialer/postcall/res/values-no/strings.xml
+++ b/java/com/android/dialer/postcall/res/values-no/strings.xml
@@ -1,28 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="post_call_message" msgid="3541277172068556862">"Si hvorfor du ringte"</string>
-    <string name="post_call_message_1" msgid="4827849136801228106">"Haster! Ring meg."</string>
-    <string name="post_call_message_2" msgid="5310301526176003385">"Ring tilbake når du har tid."</string>
-    <string name="post_call_message_3" msgid="3932759658420368056">"Haster ikke. Prates senere?"</string>
-    <string name="post_call_add_message" msgid="8298853527467080463">"Legg til melding"</string>
-    <string name="post_call_send_message" msgid="8039569617234824873">"Send melding"</string>
-    <string name="post_call_message_sent" msgid="832757977985265036">"Meldingen er sendt"</string>
-    <string name="view" msgid="8572192949673703830">"Se"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="post_call_message">Si hvorfor du ringte</string>
+  <string name="post_call_message_1">Haster! Ring meg.</string>
+  <string name="post_call_message_2">Ring tilbake når du har tid.</string>
+  <string name="post_call_message_3">Haster ikke. Prates senere?</string>
+  <string name="post_call_add_message">Legg til melding</string>
+  <string name="post_call_send_message">Send melding</string>
+  <string name="post_call_message_sent">Meldingen er sendt</string>
+  <string name="view">Se</string>
 </resources>
diff --git a/java/com/android/dialer/postcall/res/values-pa/strings.xml b/java/com/android/dialer/postcall/res/values-pa/strings.xml
index ae9bb56..ecab7b5 100644
--- a/java/com/android/dialer/postcall/res/values-pa/strings.xml
+++ b/java/com/android/dialer/postcall/res/values-pa/strings.xml
@@ -1,28 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="post_call_message" msgid="3541277172068556862">"ਦੱਸੋ ਕਿ ਤੁਸੀਂ ਕਾਲ ਕਿਉਂ ਕੀਤੀ ਸੀ"</string>
-    <string name="post_call_message_1" msgid="4827849136801228106">"ਇਹ ਜ਼ਰੂਰੀ ਹੈ। ਮੈਨੂੰ ਵਾਪਸ ਕਾਲ ਕਰੋ।"</string>
-    <string name="post_call_message_2" msgid="5310301526176003385">"ਜਦੋਂ ਤੁਹਾਡੇ ਕੋਲ ਕੁਝ ਸਮਾਂ ਹੋਵੇ ਤਾਂ ਮੈਨੂੰ ਵਾਪਸ ਕਾਲ ਕਰੋ।"</string>
-    <string name="post_call_message_3" msgid="3932759658420368056">"ਜ਼ਰੂਰੀ ਨਹੀਂ ਹੈ, ਅਸੀਂ ਬਾਅਦ ਵਿੱਚ ਚੈਟ ਕਰ ਸਕਦੇ ਹਾਂ।"</string>
-    <string name="post_call_add_message" msgid="8298853527467080463">"ਸੁਨੇਹਾ ਸ਼ਾਮਲ ਕਰੋ"</string>
-    <string name="post_call_send_message" msgid="8039569617234824873">"ਸੁਨੇਹਾ ਭੇਜੋ"</string>
-    <string name="post_call_message_sent" msgid="832757977985265036">"ਸੁਨੇਹਾ ਭੇਜਿਆ ਗਿਆ"</string>
-    <string name="view" msgid="8572192949673703830">"ਵੇਖੋ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="post_call_message">ਦੱਸੋ ਕਿ ਤੁਸੀਂ ਕਾਲ ਕਿਉਂ ਕੀਤੀ ਸੀ</string>
+  <string name="post_call_message_1">ਇਹ ਜ਼ਰੂਰੀ ਹੈ। ਮੈਨੂੰ ਵਾਪਸ ਕਾਲ ਕਰੋ।</string>
+  <string name="post_call_message_2">ਜਦੋਂ ਤੁਹਾਡੇ ਕੋਲ ਕੁਝ ਸਮਾਂ ਹੋਵੇ ਤਾਂ ਮੈਨੂੰ ਵਾਪਸ ਕਾਲ ਕਰੋ।</string>
+  <string name="post_call_message_3">ਜ਼ਰੂਰੀ ਨਹੀਂ ਹੈ, ਅਸੀਂ ਬਾਅਦ ਵਿੱਚ ਚੈਟ ਕਰ ਸਕਦੇ ਹਾਂ।</string>
+  <string name="post_call_add_message">ਸੁਨੇਹਾ ਸ਼ਾਮਲ ਕਰੋ</string>
+  <string name="post_call_send_message">ਸੁਨੇਹਾ ਭੇਜੋ</string>
+  <string name="post_call_message_sent">ਸੁਨੇਹਾ ਭੇਜਿਆ ਗਿਆ</string>
+  <string name="view">ਵੇਖੋ</string>
 </resources>
diff --git a/java/com/android/dialer/postcall/res/values-pl/strings.xml b/java/com/android/dialer/postcall/res/values-pl/strings.xml
index 57876d7..40c86f7 100644
--- a/java/com/android/dialer/postcall/res/values-pl/strings.xml
+++ b/java/com/android/dialer/postcall/res/values-pl/strings.xml
@@ -1,28 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="post_call_message" msgid="3541277172068556862">"Napisz, dlaczego dzwoniłeś"</string>
-    <string name="post_call_message_1" msgid="4827849136801228106">"To pilne. Zadzwoń do mnie."</string>
-    <string name="post_call_message_2" msgid="5310301526176003385">"Zadzwoń do mnie, jak znajdziesz czas."</string>
-    <string name="post_call_message_3" msgid="3932759658420368056">"Nic ważnego, pogadamy później."</string>
-    <string name="post_call_add_message" msgid="8298853527467080463">"Dodaj wiadomość"</string>
-    <string name="post_call_send_message" msgid="8039569617234824873">"Wyślij wiadomość"</string>
-    <string name="post_call_message_sent" msgid="832757977985265036">"Wiadomość została wysłana"</string>
-    <string name="view" msgid="8572192949673703830">"Wyświetl"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="post_call_message">Napisz, dlaczego dzwoniłeś</string>
+  <string name="post_call_message_1">To pilne. Zadzwoń do mnie.</string>
+  <string name="post_call_message_2">Zadzwoń do mnie, jak znajdziesz czas.</string>
+  <string name="post_call_message_3">Nic ważnego, pogadamy później.</string>
+  <string name="post_call_add_message">Dodaj wiadomość</string>
+  <string name="post_call_send_message">Wyślij wiadomość</string>
+  <string name="post_call_message_sent">Wiadomość została wysłana</string>
+  <string name="view">Wyświetl</string>
 </resources>
diff --git a/java/com/android/dialer/postcall/res/values-pt-rBR/strings.xml b/java/com/android/dialer/postcall/res/values-pt-rBR/strings.xml
index 9ab02ea..4ff9fdb 100644
--- a/java/com/android/dialer/postcall/res/values-pt-rBR/strings.xml
+++ b/java/com/android/dialer/postcall/res/values-pt-rBR/strings.xml
@@ -1,28 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="post_call_message" msgid="3541277172068556862">"Diga por que você ligou"</string>
-    <string name="post_call_message_1" msgid="4827849136801228106">"É urgente. Retorne minha chamada."</string>
-    <string name="post_call_message_2" msgid="5310301526176003385">"Retorne minha chamada quando você tiver tempo."</string>
-    <string name="post_call_message_3" msgid="3932759658420368056">"Não é urgente, podemos bater papo mais tarde."</string>
-    <string name="post_call_add_message" msgid="8298853527467080463">"Adicionar mensagem"</string>
-    <string name="post_call_send_message" msgid="8039569617234824873">"Enviar mensagem"</string>
-    <string name="post_call_message_sent" msgid="832757977985265036">"Mensagem enviada"</string>
-    <string name="view" msgid="8572192949673703830">"Ver"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="post_call_message">Diga por que você ligou</string>
+  <string name="post_call_message_1">É urgente. Retorne minha chamada.</string>
+  <string name="post_call_message_2">Retorne minha chamada quando você tiver tempo.</string>
+  <string name="post_call_message_3">Não é urgente, podemos bater papo mais tarde.</string>
+  <string name="post_call_add_message">Adicionar mensagem</string>
+  <string name="post_call_send_message">Enviar mensagem</string>
+  <string name="post_call_message_sent">Mensagem enviada</string>
+  <string name="view">Ver</string>
 </resources>
diff --git a/java/com/android/dialer/postcall/res/values-pt-rPT/strings.xml b/java/com/android/dialer/postcall/res/values-pt-rPT/strings.xml
index 8345e20..6c19219 100644
--- a/java/com/android/dialer/postcall/res/values-pt-rPT/strings.xml
+++ b/java/com/android/dialer/postcall/res/values-pt-rPT/strings.xml
@@ -1,28 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="post_call_message" msgid="3541277172068556862">"Diga por que motivo ligou"</string>
-    <string name="post_call_message_1" msgid="4827849136801228106">"É urgente. Ligue-me de volta."</string>
-    <string name="post_call_message_2" msgid="5310301526176003385">"Ligue-me de volta quando tiver algum tempo."</string>
-    <string name="post_call_message_3" msgid="3932759658420368056">"Não é urgente, podemos conversar mais tarde."</string>
-    <string name="post_call_add_message" msgid="8298853527467080463">"Adicionar mensagem"</string>
-    <string name="post_call_send_message" msgid="8039569617234824873">"Enviar mensagem"</string>
-    <string name="post_call_message_sent" msgid="832757977985265036">"Mensagem enviada"</string>
-    <string name="view" msgid="8572192949673703830">"Ver"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="post_call_message">Diga por que motivo ligou</string>
+  <string name="post_call_message_1">É urgente. Ligue-me de volta.</string>
+  <string name="post_call_message_2">Ligue-me de volta quando tiver algum tempo.</string>
+  <string name="post_call_message_3">Não é urgente, podemos conversar mais tarde.</string>
+  <string name="post_call_add_message">Adicionar mensagem</string>
+  <string name="post_call_send_message">Enviar mensagem</string>
+  <string name="post_call_message_sent">Mensagem enviada</string>
+  <string name="view">Ver</string>
 </resources>
diff --git a/java/com/android/dialer/postcall/res/values-pt/strings.xml b/java/com/android/dialer/postcall/res/values-pt/strings.xml
index 9ab02ea..4ff9fdb 100644
--- a/java/com/android/dialer/postcall/res/values-pt/strings.xml
+++ b/java/com/android/dialer/postcall/res/values-pt/strings.xml
@@ -1,28 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="post_call_message" msgid="3541277172068556862">"Diga por que você ligou"</string>
-    <string name="post_call_message_1" msgid="4827849136801228106">"É urgente. Retorne minha chamada."</string>
-    <string name="post_call_message_2" msgid="5310301526176003385">"Retorne minha chamada quando você tiver tempo."</string>
-    <string name="post_call_message_3" msgid="3932759658420368056">"Não é urgente, podemos bater papo mais tarde."</string>
-    <string name="post_call_add_message" msgid="8298853527467080463">"Adicionar mensagem"</string>
-    <string name="post_call_send_message" msgid="8039569617234824873">"Enviar mensagem"</string>
-    <string name="post_call_message_sent" msgid="832757977985265036">"Mensagem enviada"</string>
-    <string name="view" msgid="8572192949673703830">"Ver"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="post_call_message">Diga por que você ligou</string>
+  <string name="post_call_message_1">É urgente. Retorne minha chamada.</string>
+  <string name="post_call_message_2">Retorne minha chamada quando você tiver tempo.</string>
+  <string name="post_call_message_3">Não é urgente, podemos bater papo mais tarde.</string>
+  <string name="post_call_add_message">Adicionar mensagem</string>
+  <string name="post_call_send_message">Enviar mensagem</string>
+  <string name="post_call_message_sent">Mensagem enviada</string>
+  <string name="view">Ver</string>
 </resources>
diff --git a/java/com/android/dialer/postcall/res/values-ro/strings.xml b/java/com/android/dialer/postcall/res/values-ro/strings.xml
index 5527a65..e5c900f 100644
--- a/java/com/android/dialer/postcall/res/values-ro/strings.xml
+++ b/java/com/android/dialer/postcall/res/values-ro/strings.xml
@@ -1,28 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="post_call_message" msgid="3541277172068556862">"Spuneți de ce ați sunat"</string>
-    <string name="post_call_message_1" msgid="4827849136801228106">"Este ceva urgent. Sună-mă."</string>
-    <string name="post_call_message_2" msgid="5310301526176003385">"Sună-mă când ai puțin timp."</string>
-    <string name="post_call_message_3" msgid="3932759658420368056">"Nu e ceva urgent. Putem vorbi mai târziu."</string>
-    <string name="post_call_add_message" msgid="8298853527467080463">"Adăugați un mesaj"</string>
-    <string name="post_call_send_message" msgid="8039569617234824873">"Trimiteți un mesaj"</string>
-    <string name="post_call_message_sent" msgid="832757977985265036">"Mesaj trimis"</string>
-    <string name="view" msgid="8572192949673703830">"Afișați"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="post_call_message">Spuneți de ce ați sunat</string>
+  <string name="post_call_message_1">Este ceva urgent. Sună-mă.</string>
+  <string name="post_call_message_2">Sună-mă când ai puțin timp.</string>
+  <string name="post_call_message_3">Nu e ceva urgent. Putem vorbi mai târziu.</string>
+  <string name="post_call_add_message">Adăugați un mesaj</string>
+  <string name="post_call_send_message">Trimiteți un mesaj</string>
+  <string name="post_call_message_sent">Mesaj trimis</string>
+  <string name="view">Afișați</string>
 </resources>
diff --git a/java/com/android/dialer/postcall/res/values-ru/strings.xml b/java/com/android/dialer/postcall/res/values-ru/strings.xml
index 480166f..f245488 100644
--- a/java/com/android/dialer/postcall/res/values-ru/strings.xml
+++ b/java/com/android/dialer/postcall/res/values-ru/strings.xml
@@ -1,28 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="post_call_message" msgid="3541277172068556862">"Поясните, был ли звонок срочным"</string>
-    <string name="post_call_message_1" msgid="4827849136801228106">"Это срочно. Пожалуйста, перезвоните мне."</string>
-    <string name="post_call_message_2" msgid="5310301526176003385">"Перезвоните мне, когда сможете."</string>
-    <string name="post_call_message_3" msgid="3932759658420368056">"Не срочно, можем поговорить позже."</string>
-    <string name="post_call_add_message" msgid="8298853527467080463">"Добавить сообщение"</string>
-    <string name="post_call_send_message" msgid="8039569617234824873">"Отправить сообщение"</string>
-    <string name="post_call_message_sent" msgid="832757977985265036">"Сообщение отправлено"</string>
-    <string name="view" msgid="8572192949673703830">"Просмотреть"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="post_call_message">Поясните, был ли звонок срочным</string>
+  <string name="post_call_message_1">Это срочно. Пожалуйста, перезвоните мне.</string>
+  <string name="post_call_message_2">Перезвоните мне, когда сможете.</string>
+  <string name="post_call_message_3">Не срочно, можем поговорить позже.</string>
+  <string name="post_call_add_message">Добавить сообщение</string>
+  <string name="post_call_send_message">Отправить сообщение</string>
+  <string name="post_call_message_sent">Сообщение отправлено</string>
+  <string name="view">Просмотреть</string>
 </resources>
diff --git a/java/com/android/dialer/postcall/res/values-si/strings.xml b/java/com/android/dialer/postcall/res/values-si/strings.xml
index 9dad594..ed5f62b 100644
--- a/java/com/android/dialer/postcall/res/values-si/strings.xml
+++ b/java/com/android/dialer/postcall/res/values-si/strings.xml
@@ -1,28 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="post_call_message" msgid="3541277172068556862">"ඔබ ඇමතුවේ ඇයිදැයි පවසන්න"</string>
-    <string name="post_call_message_1" msgid="4827849136801228106">"මෙය හදිස්සියි. මට ආපසු අමතන්න."</string>
-    <string name="post_call_message_2" msgid="5310301526176003385">"ඔබට යම් වේලාවක් තිබෙන විට මට ආපසු අමතන්න."</string>
-    <string name="post_call_message_3" msgid="3932759658420368056">"හදිස්සි නැත, අපට පසුව කතාබස් කිරීමට හැකිය."</string>
-    <string name="post_call_add_message" msgid="8298853527467080463">"පණිවිඩය එක් කරන්න"</string>
-    <string name="post_call_send_message" msgid="8039569617234824873">"පණිවිඩය යවන්න"</string>
-    <string name="post_call_message_sent" msgid="832757977985265036">"පණිවිඩය යවන ලදී"</string>
-    <string name="view" msgid="8572192949673703830">"බලන්න"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="post_call_message">ඔබ ඇමතුවේ ඇයිදැයි පවසන්න</string>
+  <string name="post_call_message_1">මෙය හදිස්සියි. මට ආපසු අමතන්න.</string>
+  <string name="post_call_message_2">ඔබට යම් වේලාවක් තිබෙන විට මට ආපසු අමතන්න.</string>
+  <string name="post_call_message_3">හදිස්සි නැත, අපට පසුව කතාබස් කිරීමට හැකිය.</string>
+  <string name="post_call_add_message">පණිවිඩය එක් කරන්න</string>
+  <string name="post_call_send_message">පණිවිඩය යවන්න</string>
+  <string name="post_call_message_sent">පණිවිඩය යවන ලදී</string>
+  <string name="view">බලන්න</string>
 </resources>
diff --git a/java/com/android/dialer/postcall/res/values-sk/strings.xml b/java/com/android/dialer/postcall/res/values-sk/strings.xml
index 85bf495..c45e75b 100644
--- a/java/com/android/dialer/postcall/res/values-sk/strings.xml
+++ b/java/com/android/dialer/postcall/res/values-sk/strings.xml
@@ -1,28 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="post_call_message" msgid="3541277172068556862">"Vysvetlite, prečo ste volali"</string>
-    <string name="post_call_message_1" msgid="4827849136801228106">"Je to súrne. Zavolaj mi späť."</string>
-    <string name="post_call_message_2" msgid="5310301526176003385">"Zavolaj mi späť, keď budeš mať čas."</string>
-    <string name="post_call_message_3" msgid="3932759658420368056">"Nie je to súrne, môžeme sa porozprávať neskôr."</string>
-    <string name="post_call_add_message" msgid="8298853527467080463">"Pridať správu"</string>
-    <string name="post_call_send_message" msgid="8039569617234824873">"Odoslanie správy"</string>
-    <string name="post_call_message_sent" msgid="832757977985265036">"Správa bola odoslaná"</string>
-    <string name="view" msgid="8572192949673703830">"Zobraziť"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="post_call_message">Vysvetlite, prečo ste volali</string>
+  <string name="post_call_message_1">Je to súrne. Zavolaj mi späť.</string>
+  <string name="post_call_message_2">Zavolaj mi späť, keď budeš mať čas.</string>
+  <string name="post_call_message_3">Nie je to súrne, môžeme sa porozprávať neskôr.</string>
+  <string name="post_call_add_message">Pridať správu</string>
+  <string name="post_call_send_message">Odoslanie správy</string>
+  <string name="post_call_message_sent">Správa bola odoslaná</string>
+  <string name="view">Zobraziť</string>
 </resources>
diff --git a/java/com/android/dialer/postcall/res/values-sl/strings.xml b/java/com/android/dialer/postcall/res/values-sl/strings.xml
index 99f0e85..3de9477 100644
--- a/java/com/android/dialer/postcall/res/values-sl/strings.xml
+++ b/java/com/android/dialer/postcall/res/values-sl/strings.xml
@@ -1,28 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="post_call_message" msgid="3541277172068556862">"Navedite razlog, da ste poklicali"</string>
-    <string name="post_call_message_1" msgid="4827849136801228106">"To je nujno. Pokliči me."</string>
-    <string name="post_call_message_2" msgid="5310301526176003385">"Ko si lahko vzameš nekaj časa, me pokliči."</string>
-    <string name="post_call_message_3" msgid="3932759658420368056">"Ni nujno, klepetava lahko tudi pozneje."</string>
-    <string name="post_call_add_message" msgid="8298853527467080463">"Dodaj sporočilo"</string>
-    <string name="post_call_send_message" msgid="8039569617234824873">"Pošiljanje sporočila"</string>
-    <string name="post_call_message_sent" msgid="832757977985265036">"Sporočilo je bilo poslano"</string>
-    <string name="view" msgid="8572192949673703830">"Prikaži"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="post_call_message">Navedite razlog, da ste poklicali</string>
+  <string name="post_call_message_1">To je nujno. Pokliči me.</string>
+  <string name="post_call_message_2">Ko si lahko vzameš nekaj časa, me pokliči.</string>
+  <string name="post_call_message_3">Ni nujno, klepetava lahko tudi pozneje.</string>
+  <string name="post_call_add_message">Dodaj sporočilo</string>
+  <string name="post_call_send_message">Pošiljanje sporočila</string>
+  <string name="post_call_message_sent">Sporočilo je bilo poslano</string>
+  <string name="view">Prikaži</string>
 </resources>
diff --git a/java/com/android/dialer/postcall/res/values-sq/strings.xml b/java/com/android/dialer/postcall/res/values-sq/strings.xml
index 20a4dcb..f2f534b 100644
--- a/java/com/android/dialer/postcall/res/values-sq/strings.xml
+++ b/java/com/android/dialer/postcall/res/values-sq/strings.xml
@@ -1,28 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="post_call_message" msgid="3541277172068556862">"Thuaj pse telefonove"</string>
-    <string name="post_call_message_1" msgid="4827849136801228106">"Është urgjente. Më telefono."</string>
-    <string name="post_call_message_2" msgid="5310301526176003385">"Më telefono kur të kesh kohë."</string>
-    <string name="post_call_message_3" msgid="3932759658420368056">"Nuk është urgjente, mund të bisedojmë më vonë."</string>
-    <string name="post_call_add_message" msgid="8298853527467080463">"Shto një mesazh"</string>
-    <string name="post_call_send_message" msgid="8039569617234824873">"Dërgo mesazh"</string>
-    <string name="post_call_message_sent" msgid="832757977985265036">"Mesazhi u dërgua"</string>
-    <string name="view" msgid="8572192949673703830">"Shiko"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="post_call_message">Thuaj pse telefonove</string>
+  <string name="post_call_message_1">Është urgjente. Më telefono.</string>
+  <string name="post_call_message_2">Më telefono kur të kesh kohë.</string>
+  <string name="post_call_message_3">Nuk është urgjente, mund të bisedojmë më vonë.</string>
+  <string name="post_call_add_message">Shto një mesazh</string>
+  <string name="post_call_send_message">Dërgo mesazh</string>
+  <string name="post_call_message_sent">Mesazhi u dërgua</string>
+  <string name="view">Shiko</string>
 </resources>
diff --git a/java/com/android/dialer/postcall/res/values-sr/strings.xml b/java/com/android/dialer/postcall/res/values-sr/strings.xml
index 49d026a..22305e8 100644
--- a/java/com/android/dialer/postcall/res/values-sr/strings.xml
+++ b/java/com/android/dialer/postcall/res/values-sr/strings.xml
@@ -1,28 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="post_call_message" msgid="3541277172068556862">"Реците зашто зовете"</string>
-    <string name="post_call_message_1" msgid="4827849136801228106">"Хитно је. Узвратите ми позив."</string>
-    <string name="post_call_message_2" msgid="5310301526176003385">"Позовите ме кад будете имали времена."</string>
-    <string name="post_call_message_3" msgid="3932759658420368056">"Није хитно, можемо да ћаскамо касније."</string>
-    <string name="post_call_add_message" msgid="8298853527467080463">"Додај поруку"</string>
-    <string name="post_call_send_message" msgid="8039569617234824873">"Пошаљите поруку"</string>
-    <string name="post_call_message_sent" msgid="832757977985265036">"Порука је послата"</string>
-    <string name="view" msgid="8572192949673703830">"Прикажи"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="post_call_message">Реците зашто зовете</string>
+  <string name="post_call_message_1">Хитно је. Узвратите ми позив.</string>
+  <string name="post_call_message_2">Позовите ме кад будете имали времена.</string>
+  <string name="post_call_message_3">Није хитно, можемо да ћаскамо касније.</string>
+  <string name="post_call_add_message">Додај поруку</string>
+  <string name="post_call_send_message">Пошаљите поруку</string>
+  <string name="post_call_message_sent">Порука је послата</string>
+  <string name="view">Прикажи</string>
 </resources>
diff --git a/java/com/android/dialer/postcall/res/values-sv/strings.xml b/java/com/android/dialer/postcall/res/values-sv/strings.xml
index e7fbde2..e93a9ed 100644
--- a/java/com/android/dialer/postcall/res/values-sv/strings.xml
+++ b/java/com/android/dialer/postcall/res/values-sv/strings.xml
@@ -1,28 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="post_call_message" msgid="3541277172068556862">"Berätta varför du ringde"</string>
-    <string name="post_call_message_1" msgid="4827849136801228106">"Det här är brådskande. Ring tillbaka."</string>
-    <string name="post_call_message_2" msgid="5310301526176003385">"Ring tillbaka när du har tid."</string>
-    <string name="post_call_message_3" msgid="3932759658420368056">"Inte brådskande, vi kan prata senare."</string>
-    <string name="post_call_add_message" msgid="8298853527467080463">"Lägg till meddelande"</string>
-    <string name="post_call_send_message" msgid="8039569617234824873">"Skicka meddelande"</string>
-    <string name="post_call_message_sent" msgid="832757977985265036">"Meddelandet skickat"</string>
-    <string name="view" msgid="8572192949673703830">"Visa"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="post_call_message">Berätta varför du ringde</string>
+  <string name="post_call_message_1">Det här är brådskande. Ring tillbaka.</string>
+  <string name="post_call_message_2">Ring tillbaka när du har tid.</string>
+  <string name="post_call_message_3">Inte brådskande, vi kan prata senare.</string>
+  <string name="post_call_add_message">Lägg till meddelande</string>
+  <string name="post_call_send_message">Skicka meddelande</string>
+  <string name="post_call_message_sent">Meddelandet skickat</string>
+  <string name="view">Visa</string>
 </resources>
diff --git a/java/com/android/dialer/postcall/res/values-sw/strings.xml b/java/com/android/dialer/postcall/res/values-sw/strings.xml
index 7949ba7..f41df71 100644
--- a/java/com/android/dialer/postcall/res/values-sw/strings.xml
+++ b/java/com/android/dialer/postcall/res/values-sw/strings.xml
@@ -1,28 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="post_call_message" msgid="3541277172068556862">"Sema sababu ya kupiga simu"</string>
-    <string name="post_call_message_1" msgid="4827849136801228106">"Hili ni la dharura. Nipigie."</string>
-    <string name="post_call_message_2" msgid="5310301526176003385">"Nipigie ukipata nafasi."</string>
-    <string name="post_call_message_3" msgid="3932759658420368056">"Si jambo la dharura, tunaweza kuzungumza baadaye."</string>
-    <string name="post_call_add_message" msgid="8298853527467080463">"Ongeza ujumbe"</string>
-    <string name="post_call_send_message" msgid="8039569617234824873">"Tuma ujumbe"</string>
-    <string name="post_call_message_sent" msgid="832757977985265036">"Ujumbe umetumwa"</string>
-    <string name="view" msgid="8572192949673703830">"Uangalie"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="post_call_message">Sema sababu ya kupiga simu</string>
+  <string name="post_call_message_1">Hili ni la dharura. Nipigie.</string>
+  <string name="post_call_message_2">Nipigie ukipata nafasi.</string>
+  <string name="post_call_message_3">Si jambo la dharura, tunaweza kuzungumza baadaye.</string>
+  <string name="post_call_add_message">Ongeza ujumbe</string>
+  <string name="post_call_send_message">Tuma ujumbe</string>
+  <string name="post_call_message_sent">Ujumbe umetumwa</string>
+  <string name="view">Uangalie</string>
 </resources>
diff --git a/java/com/android/dialer/postcall/res/values-ta/strings.xml b/java/com/android/dialer/postcall/res/values-ta/strings.xml
index d80b73d..7050d87 100644
--- a/java/com/android/dialer/postcall/res/values-ta/strings.xml
+++ b/java/com/android/dialer/postcall/res/values-ta/strings.xml
@@ -1,28 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="post_call_message" msgid="3541277172068556862">"ஏன் அழைத்தீர்கள் என்பதைச் சொல்லவும்"</string>
-    <string name="post_call_message_1" msgid="4827849136801228106">"அவசரம். என்னைத் திரும்ப அழைக்கவும்."</string>
-    <string name="post_call_message_2" msgid="5310301526176003385">"உங்களுக்கு நேரமிருக்கும் போது என்னைத் திரும்ப அழைக்கவும்."</string>
-    <string name="post_call_message_3" msgid="3932759658420368056">"அவசரமில்லை, நாம் பின்னர் அரட்டையடிக்கலாம்."</string>
-    <string name="post_call_add_message" msgid="8298853527467080463">"செய்தியைச் சேர்க்கவும்"</string>
-    <string name="post_call_send_message" msgid="8039569617234824873">"செய்தி அனுப்பவும்"</string>
-    <string name="post_call_message_sent" msgid="832757977985265036">"செய்தி அனுப்பப்பட்டது"</string>
-    <string name="view" msgid="8572192949673703830">"காட்டு"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="post_call_message">ஏன் அழைத்தீர்கள் என்பதைச் சொல்லவும்</string>
+  <string name="post_call_message_1">அவசரம். என்னைத் திரும்ப அழைக்கவும்.</string>
+  <string name="post_call_message_2">உங்களுக்கு நேரமிருக்கும் போது என்னைத் திரும்ப அழைக்கவும்.</string>
+  <string name="post_call_message_3">அவசரமில்லை, நாம் பின்னர் அரட்டையடிக்கலாம்.</string>
+  <string name="post_call_add_message">செய்தியைச் சேர்க்கவும்</string>
+  <string name="post_call_send_message">செய்தி அனுப்பவும்</string>
+  <string name="post_call_message_sent">செய்தி அனுப்பப்பட்டது</string>
+  <string name="view">காட்டு</string>
 </resources>
diff --git a/java/com/android/dialer/postcall/res/values-te/strings.xml b/java/com/android/dialer/postcall/res/values-te/strings.xml
index 931ee7c..f3b244f 100644
--- a/java/com/android/dialer/postcall/res/values-te/strings.xml
+++ b/java/com/android/dialer/postcall/res/values-te/strings.xml
@@ -1,28 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="post_call_message" msgid="3541277172068556862">"మీరు ఎందుకు కాల్ చేసారో చెప్పండి"</string>
-    <string name="post_call_message_1" msgid="4827849136801228106">"అత్యవసరమైన విషయం. నాకు తిరిగి కాల్ చేయండి."</string>
-    <string name="post_call_message_2" msgid="5310301526176003385">"మీకు సమయం ఉన్నప్పుడు నాకు తిరిగి కాల్ చేయండి."</string>
-    <string name="post_call_message_3" msgid="3932759658420368056">"అత్యవసరమేమీ కాదు, మనం తర్వాత చాట్ చేసుకోవచ్చు."</string>
-    <string name="post_call_add_message" msgid="8298853527467080463">"సందేశాన్ని జోడించండి"</string>
-    <string name="post_call_send_message" msgid="8039569617234824873">"సందేశాన్ని పంపండి"</string>
-    <string name="post_call_message_sent" msgid="832757977985265036">"సందేశం పంపబడింది"</string>
-    <string name="view" msgid="8572192949673703830">"వీక్షించండి"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="post_call_message">మీరు ఎందుకు కాల్ చేసారో చెప్పండి</string>
+  <string name="post_call_message_1">అత్యవసరమైన విషయం. నాకు తిరిగి కాల్ చేయండి.</string>
+  <string name="post_call_message_2">మీకు సమయం ఉన్నప్పుడు నాకు తిరిగి కాల్ చేయండి.</string>
+  <string name="post_call_message_3">అత్యవసరమేమీ కాదు, మనం తర్వాత చాట్ చేసుకోవచ్చు.</string>
+  <string name="post_call_add_message">సందేశాన్ని జోడించండి</string>
+  <string name="post_call_send_message">సందేశాన్ని పంపండి</string>
+  <string name="post_call_message_sent">సందేశం పంపబడింది</string>
+  <string name="view">వీక్షించండి</string>
 </resources>
diff --git a/java/com/android/dialer/postcall/res/values-th/strings.xml b/java/com/android/dialer/postcall/res/values-th/strings.xml
index 5d11a7d..1f972d8 100644
--- a/java/com/android/dialer/postcall/res/values-th/strings.xml
+++ b/java/com/android/dialer/postcall/res/values-th/strings.xml
@@ -1,28 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="post_call_message" msgid="3541277172068556862">"บอกเหตุผลที่โทรหา"</string>
-    <string name="post_call_message_1" msgid="4827849136801228106">"มีเรื่องด่วน โปรดโทรกลับ"</string>
-    <string name="post_call_message_2" msgid="5310301526176003385">"ว่างแล้วโปรดโทรกลับ"</string>
-    <string name="post_call_message_3" msgid="3932759658420368056">"ไม่ด่วนอะไร ไว้แชททีหลังก็ได้"</string>
-    <string name="post_call_add_message" msgid="8298853527467080463">"เพิ่มข้อความ"</string>
-    <string name="post_call_send_message" msgid="8039569617234824873">"ส่งข้อความ"</string>
-    <string name="post_call_message_sent" msgid="832757977985265036">"ส่งข้อความแล้ว"</string>
-    <string name="view" msgid="8572192949673703830">"ดู"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="post_call_message">บอกเหตุผลที่โทรหา</string>
+  <string name="post_call_message_1">มีเรื่องด่วน โปรดโทรกลับ</string>
+  <string name="post_call_message_2">ว่างแล้วโปรดโทรกลับ</string>
+  <string name="post_call_message_3">ไม่ด่วนอะไร ไว้แชททีหลังก็ได้</string>
+  <string name="post_call_add_message">เพิ่มข้อความ</string>
+  <string name="post_call_send_message">ส่งข้อความ</string>
+  <string name="post_call_message_sent">ส่งข้อความแล้ว</string>
+  <string name="view">ดู</string>
 </resources>
diff --git a/java/com/android/dialer/postcall/res/values-tl/strings.xml b/java/com/android/dialer/postcall/res/values-tl/strings.xml
index 8095cb5..1e72833 100644
--- a/java/com/android/dialer/postcall/res/values-tl/strings.xml
+++ b/java/com/android/dialer/postcall/res/values-tl/strings.xml
@@ -1,28 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="post_call_message" msgid="3541277172068556862">"Sabihin kung bakit ka tumawag"</string>
-    <string name="post_call_message_1" msgid="4827849136801228106">"Apurahan ito. Tawagan mo ko."</string>
-    <string name="post_call_message_2" msgid="5310301526176003385">"Tawagan mo ako kapag may oras ka."</string>
-    <string name="post_call_message_3" msgid="3932759658420368056">"Hindi agaran, maaari tayong mag-chat sa ibang pagkakataon."</string>
-    <string name="post_call_add_message" msgid="8298853527467080463">"Magdagdag ng mensahe"</string>
-    <string name="post_call_send_message" msgid="8039569617234824873">"Magpadala ng mensahe"</string>
-    <string name="post_call_message_sent" msgid="832757977985265036">"Naipadala ang mensahe"</string>
-    <string name="view" msgid="8572192949673703830">"Tingnan"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="post_call_message">Sabihin kung bakit ka tumawag</string>
+  <string name="post_call_message_1">Apurahan ito. Tawagan mo ko.</string>
+  <string name="post_call_message_2">Tawagan mo ako kapag may oras ka.</string>
+  <string name="post_call_message_3">Hindi agaran, maaari tayong mag-chat sa ibang pagkakataon.</string>
+  <string name="post_call_add_message">Magdagdag ng mensahe</string>
+  <string name="post_call_send_message">Magpadala ng mensahe</string>
+  <string name="post_call_message_sent">Naipadala ang mensahe</string>
+  <string name="view">Tingnan</string>
 </resources>
diff --git a/java/com/android/dialer/postcall/res/values-tr/strings.xml b/java/com/android/dialer/postcall/res/values-tr/strings.xml
index c0adeea..91a15b1 100644
--- a/java/com/android/dialer/postcall/res/values-tr/strings.xml
+++ b/java/com/android/dialer/postcall/res/values-tr/strings.xml
@@ -1,28 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="post_call_message" msgid="3541277172068556862">"Arama nedeninizi söyleyin"</string>
-    <string name="post_call_message_1" msgid="4827849136801228106">"Acil bir durum var. Beni geri arayın."</string>
-    <string name="post_call_message_2" msgid="5310301526176003385">"Zamanınız olduğunda beni geri arayın."</string>
-    <string name="post_call_message_3" msgid="3932759658420368056">"Acil bir durum yok. Daha sonra konuşuruz."</string>
-    <string name="post_call_add_message" msgid="8298853527467080463">"Mesaj ekleyin"</string>
-    <string name="post_call_send_message" msgid="8039569617234824873">"Mesaj gönder"</string>
-    <string name="post_call_message_sent" msgid="832757977985265036">"Mesaj gönderildi"</string>
-    <string name="view" msgid="8572192949673703830">"Görüntüle"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="post_call_message">Arama nedeninizi söyleyin</string>
+  <string name="post_call_message_1">Acil bir durum var. Beni geri arayın.</string>
+  <string name="post_call_message_2">Zamanınız olduğunda beni geri arayın.</string>
+  <string name="post_call_message_3">Acil bir durum yok. Daha sonra konuşuruz.</string>
+  <string name="post_call_add_message">Mesaj ekleyin</string>
+  <string name="post_call_send_message">Mesaj gönder</string>
+  <string name="post_call_message_sent">Mesaj gönderildi</string>
+  <string name="view">Görüntüle</string>
 </resources>
diff --git a/java/com/android/dialer/postcall/res/values-uk/strings.xml b/java/com/android/dialer/postcall/res/values-uk/strings.xml
index a5b6313..3bd493f 100644
--- a/java/com/android/dialer/postcall/res/values-uk/strings.xml
+++ b/java/com/android/dialer/postcall/res/values-uk/strings.xml
@@ -1,28 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="post_call_message" msgid="3541277172068556862">"Скажіть, чому ви телефонували"</string>
-    <string name="post_call_message_1" msgid="4827849136801228106">"Це терміново. Передзвоніть мені."</string>
-    <string name="post_call_message_2" msgid="5310301526176003385">"Передзвоніть мені, коли матимете час."</string>
-    <string name="post_call_message_3" msgid="3932759658420368056">"Нічого термінового, поспілкуємося пізніше."</string>
-    <string name="post_call_add_message" msgid="8298853527467080463">"Додати повідомлення"</string>
-    <string name="post_call_send_message" msgid="8039569617234824873">"Надіслати повідомлення"</string>
-    <string name="post_call_message_sent" msgid="832757977985265036">"Повідомлення надіслано"</string>
-    <string name="view" msgid="8572192949673703830">"Переглянути"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="post_call_message">Скажіть, чому ви телефонували</string>
+  <string name="post_call_message_1">Це терміново. Передзвоніть мені.</string>
+  <string name="post_call_message_2">Передзвоніть мені, коли матимете час.</string>
+  <string name="post_call_message_3">Нічого термінового, поспілкуємося пізніше.</string>
+  <string name="post_call_add_message">Додати повідомлення</string>
+  <string name="post_call_send_message">Надіслати повідомлення</string>
+  <string name="post_call_message_sent">Повідомлення надіслано</string>
+  <string name="view">Переглянути</string>
 </resources>
diff --git a/java/com/android/dialer/postcall/res/values-ur/strings.xml b/java/com/android/dialer/postcall/res/values-ur/strings.xml
index 3d5db32..c18675c 100644
--- a/java/com/android/dialer/postcall/res/values-ur/strings.xml
+++ b/java/com/android/dialer/postcall/res/values-ur/strings.xml
@@ -1,28 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="post_call_message" msgid="3541277172068556862">"بولیں کہ آپ نے کال کیوں کی"</string>
-    <string name="post_call_message_1" msgid="4827849136801228106">"یہ ارجنٹ ہے۔ مجھے واپس کال کریں۔"</string>
-    <string name="post_call_message_2" msgid="5310301526176003385">"جب آپ کے پاس کچھ وقت ہو تو مجھے واپس کال کریں۔"</string>
-    <string name="post_call_message_3" msgid="3932759658420368056">"ارجنٹ نہیں ہے، ہم بعد میں چیٹ کر سکتے ہیں۔"</string>
-    <string name="post_call_add_message" msgid="8298853527467080463">"پیغام شامل کریں"</string>
-    <string name="post_call_send_message" msgid="8039569617234824873">"پیغام بھیجیں"</string>
-    <string name="post_call_message_sent" msgid="832757977985265036">"پیغام بھیج دیا گیا"</string>
-    <string name="view" msgid="8572192949673703830">"دیکھیں"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="post_call_message">بولیں کہ آپ نے کال کیوں کی</string>
+  <string name="post_call_message_1">یہ ارجنٹ ہے۔ مجھے واپس کال کریں۔</string>
+  <string name="post_call_message_2">جب آپ کے پاس کچھ وقت ہو تو مجھے واپس کال کریں۔</string>
+  <string name="post_call_message_3">ارجنٹ نہیں ہے، ہم بعد میں چیٹ کر سکتے ہیں۔</string>
+  <string name="post_call_add_message">پیغام شامل کریں</string>
+  <string name="post_call_send_message">پیغام بھیجیں</string>
+  <string name="post_call_message_sent">پیغام بھیج دیا گیا</string>
+  <string name="view">دیکھیں</string>
 </resources>
diff --git a/java/com/android/dialer/postcall/res/values-uz/strings.xml b/java/com/android/dialer/postcall/res/values-uz/strings.xml
index f046c51..285775f 100644
--- a/java/com/android/dialer/postcall/res/values-uz/strings.xml
+++ b/java/com/android/dialer/postcall/res/values-uz/strings.xml
@@ -1,28 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="post_call_message" msgid="3541277172068556862">"Chaqirish maqsadini izohlang"</string>
-    <string name="post_call_message_1" msgid="4827849136801228106">"Bu juda shoshilinch. Menga qayta qo‘ng‘iroq qiling."</string>
-    <string name="post_call_message_2" msgid="5310301526176003385">"Imkoniyatingiz bo‘lganda, menga qayta qo‘ng‘iroq qiling."</string>
-    <string name="post_call_message_3" msgid="3932759658420368056">"Bu shoshilinch emas. Keyinroq ham suhbatlashishimiz mumkin."</string>
-    <string name="post_call_add_message" msgid="8298853527467080463">"Xabar qo‘shish"</string>
-    <string name="post_call_send_message" msgid="8039569617234824873">"Xabar yuborish"</string>
-    <string name="post_call_message_sent" msgid="832757977985265036">"Xabar yuborildi"</string>
-    <string name="view" msgid="8572192949673703830">"Ko‘rish"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="post_call_message">Chaqirish maqsadini izohlang</string>
+  <string name="post_call_message_1">Bu juda shoshilinch. Menga qayta qo‘ng‘iroq qiling.</string>
+  <string name="post_call_message_2">Imkoniyatingiz bo‘lganda, menga qayta qo‘ng‘iroq qiling.</string>
+  <string name="post_call_message_3">Bu shoshilinch emas. Keyinroq ham suhbatlashishimiz mumkin.</string>
+  <string name="post_call_add_message">Xabar qo‘shish</string>
+  <string name="post_call_send_message">Xabar yuborish</string>
+  <string name="post_call_message_sent">Xabar yuborildi</string>
+  <string name="view">Ko‘rish</string>
 </resources>
diff --git a/java/com/android/dialer/postcall/res/values-vi/strings.xml b/java/com/android/dialer/postcall/res/values-vi/strings.xml
index 15d058c..51c3b43 100644
--- a/java/com/android/dialer/postcall/res/values-vi/strings.xml
+++ b/java/com/android/dialer/postcall/res/values-vi/strings.xml
@@ -1,28 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="post_call_message" msgid="3541277172068556862">"Nói lý do bạn gọi"</string>
-    <string name="post_call_message_1" msgid="4827849136801228106">"Cuộc gọi này là khẩn cấp. Hãy gọi lại cho tôi."</string>
-    <string name="post_call_message_2" msgid="5310301526176003385">"Hãy gọi lại cho tôi khi bạn có thời gian."</string>
-    <string name="post_call_message_3" msgid="3932759658420368056">"Không khẩn cấp, chúng ta có thể trò chuyện sau."</string>
-    <string name="post_call_add_message" msgid="8298853527467080463">"Thêm tin nhắn"</string>
-    <string name="post_call_send_message" msgid="8039569617234824873">"Gửi tin nhắn"</string>
-    <string name="post_call_message_sent" msgid="832757977985265036">"Đã gửi tin nhắn"</string>
-    <string name="view" msgid="8572192949673703830">"Xem"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="post_call_message">Nói lý do bạn gọi</string>
+  <string name="post_call_message_1">Cuộc gọi này là khẩn cấp. Hãy gọi lại cho tôi.</string>
+  <string name="post_call_message_2">Hãy gọi lại cho tôi khi bạn có thời gian.</string>
+  <string name="post_call_message_3">Không khẩn cấp, chúng ta có thể trò chuyện sau.</string>
+  <string name="post_call_add_message">Thêm tin nhắn</string>
+  <string name="post_call_send_message">Gửi tin nhắn</string>
+  <string name="post_call_message_sent">Đã gửi tin nhắn</string>
+  <string name="view">Xem</string>
 </resources>
diff --git a/java/com/android/dialer/postcall/res/values-zh-rCN/strings.xml b/java/com/android/dialer/postcall/res/values-zh-rCN/strings.xml
index 3490d16..b1a216b 100644
--- a/java/com/android/dialer/postcall/res/values-zh-rCN/strings.xml
+++ b/java/com/android/dialer/postcall/res/values-zh-rCN/strings.xml
@@ -1,28 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="post_call_message" msgid="3541277172068556862">"说明致电原因"</string>
-    <string name="post_call_message_1" msgid="4827849136801228106">"情况紧急，请回电。"</string>
-    <string name="post_call_message_2" msgid="5310301526176003385">"有空时给我回电。"</string>
-    <string name="post_call_message_3" msgid="3932759658420368056">"不着急，稍后再聊。"</string>
-    <string name="post_call_add_message" msgid="8298853527467080463">"添加信息"</string>
-    <string name="post_call_send_message" msgid="8039569617234824873">"发送短信"</string>
-    <string name="post_call_message_sent" msgid="832757977985265036">"信息已发送"</string>
-    <string name="view" msgid="8572192949673703830">"查看"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="post_call_message">说明致电原因</string>
+  <string name="post_call_message_1">情况紧急，请回电。</string>
+  <string name="post_call_message_2">有空时给我回电。</string>
+  <string name="post_call_message_3">不着急，稍后再聊。</string>
+  <string name="post_call_add_message">添加信息</string>
+  <string name="post_call_send_message">发送短信</string>
+  <string name="post_call_message_sent">信息已发送</string>
+  <string name="view">查看</string>
 </resources>
diff --git a/java/com/android/dialer/postcall/res/values-zh-rHK/strings.xml b/java/com/android/dialer/postcall/res/values-zh-rHK/strings.xml
index 8312b54..d0df6c2 100644
--- a/java/com/android/dialer/postcall/res/values-zh-rHK/strings.xml
+++ b/java/com/android/dialer/postcall/res/values-zh-rHK/strings.xml
@@ -1,28 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="post_call_message" msgid="3541277172068556862">"說明來電原因"</string>
-    <string name="post_call_message_1" msgid="4827849136801228106">"緊急狀況，請回電給我。"</string>
-    <string name="post_call_message_2" msgid="5310301526176003385">"有空時請回電給我。"</string>
-    <string name="post_call_message_3" msgid="3932759658420368056">"不急，稍後再聊也可以。"</string>
-    <string name="post_call_add_message" msgid="8298853527467080463">"新增訊息"</string>
-    <string name="post_call_send_message" msgid="8039569617234824873">"傳送訊息"</string>
-    <string name="post_call_message_sent" msgid="832757977985265036">"已傳送訊息"</string>
-    <string name="view" msgid="8572192949673703830">"查看"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="post_call_message">說明來電原因</string>
+  <string name="post_call_message_1">緊急狀況，請回電給我。</string>
+  <string name="post_call_message_2">有空時請回電給我。</string>
+  <string name="post_call_message_3">不急，稍後再聊也可以。</string>
+  <string name="post_call_add_message">新增訊息</string>
+  <string name="post_call_send_message">傳送訊息</string>
+  <string name="post_call_message_sent">已傳送訊息</string>
+  <string name="view">查看</string>
 </resources>
diff --git a/java/com/android/dialer/postcall/res/values-zh-rTW/strings.xml b/java/com/android/dialer/postcall/res/values-zh-rTW/strings.xml
index b9b2f72..47b6c10 100644
--- a/java/com/android/dialer/postcall/res/values-zh-rTW/strings.xml
+++ b/java/com/android/dialer/postcall/res/values-zh-rTW/strings.xml
@@ -1,28 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="post_call_message" msgid="3541277172068556862">"請說明你打電話的原因"</string>
-    <string name="post_call_message_1" msgid="4827849136801228106">"緊急狀況，請回電給我。"</string>
-    <string name="post_call_message_2" msgid="5310301526176003385">"有空時請回電給我。"</string>
-    <string name="post_call_message_3" msgid="3932759658420368056">"不急，我們可以晚點再聊。"</string>
-    <string name="post_call_add_message" msgid="8298853527467080463">"加入訊息"</string>
-    <string name="post_call_send_message" msgid="8039569617234824873">"傳送訊息"</string>
-    <string name="post_call_message_sent" msgid="832757977985265036">"訊息成功送出"</string>
-    <string name="view" msgid="8572192949673703830">"查看"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="post_call_message">請說明你打電話的原因</string>
+  <string name="post_call_message_1">緊急狀況，請回電給我。</string>
+  <string name="post_call_message_2">有空時請回電給我。</string>
+  <string name="post_call_message_3">不急，我們可以晚點再聊。</string>
+  <string name="post_call_add_message">加入訊息</string>
+  <string name="post_call_send_message">傳送訊息</string>
+  <string name="post_call_message_sent">訊息成功送出</string>
+  <string name="view">查看</string>
 </resources>
diff --git a/java/com/android/dialer/postcall/res/values-zu/strings.xml b/java/com/android/dialer/postcall/res/values-zu/strings.xml
index 4de1134..ff64b72 100644
--- a/java/com/android/dialer/postcall/res/values-zu/strings.xml
+++ b/java/com/android/dialer/postcall/res/values-zu/strings.xml
@@ -1,28 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="post_call_message" msgid="3541277172068556862">"Isho ukuthi kungathi ushayile"</string>
-    <string name="post_call_message_1" msgid="4827849136801228106">"Lokhu kuyashesha. Ngishayele futhi."</string>
-    <string name="post_call_message_2" msgid="5310301526176003385">"Ngishayele futhi uma unesikhathi."</string>
-    <string name="post_call_message_3" msgid="3932759658420368056">"Akusheshi, singaxoxa kamuva."</string>
-    <string name="post_call_add_message" msgid="8298853527467080463">"Engeza umlayezo"</string>
-    <string name="post_call_send_message" msgid="8039569617234824873">"Thumela umlayezo"</string>
-    <string name="post_call_message_sent" msgid="832757977985265036">"Umlayezo uthunyelwe"</string>
-    <string name="view" msgid="8572192949673703830">"Buka"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="post_call_message">Isho ukuthi kungathi ushayile</string>
+  <string name="post_call_message_1">Lokhu kuyashesha. Ngishayele futhi.</string>
+  <string name="post_call_message_2">Ngishayele futhi uma unesikhathi.</string>
+  <string name="post_call_message_3">Akusheshi, singaxoxa kamuva.</string>
+  <string name="post_call_add_message">Engeza umlayezo</string>
+  <string name="post_call_send_message">Thumela umlayezo</string>
+  <string name="post_call_message_sent">Umlayezo uthunyelwe</string>
+  <string name="view">Buka</string>
 </resources>
diff --git a/java/com/android/dialer/precall/PreCall.java b/java/com/android/dialer/precall/PreCall.java
index 4f021f1..bd0aee5 100644
--- a/java/com/android/dialer/precall/PreCall.java
+++ b/java/com/android/dialer/precall/PreCall.java
@@ -22,19 +22,11 @@
 import android.support.annotation.NonNull;
 import com.android.dialer.callintent.CallIntentBuilder;
 import com.android.dialer.util.DialerUtils;
-import com.google.common.collect.ImmutableList;
 
 /** Interface to prepare a {@link CallIntentBuilder} before placing the call with telecom. */
 public interface PreCall {
 
   /**
-   * @return a list of {@link PreCallAction} in execution order for the {@link PreCallCoordinator}
-   *     to run.
-   */
-  @NonNull
-  ImmutableList<PreCallAction> getActions();
-
-  /**
    * @return a intent when started as activity, will perform the pre-call actions and then place a
    *     call. TODO(twyen): if all actions do not require an UI, return a intent that will place the
    *     call directly instead.
diff --git a/java/com/android/dialer/precall/PreCallAction.java b/java/com/android/dialer/precall/PreCallAction.java
index 9ddc6f2..298af08 100644
--- a/java/com/android/dialer/precall/PreCallAction.java
+++ b/java/com/android/dialer/precall/PreCallAction.java
@@ -25,6 +25,9 @@
  * CallIntentBuilder} to generate full information for the call. For example, showing a dialog to
  * select the phone account on a multi-SIM device, ask if RTT should be enabled, or rewrite the
  * number for roaming calls.
+ *
+ * <p>UI actions are discarded when the hosting activity is paused. A new instance of the action
+ * will be created once the activity is resumed again.
  */
 public interface PreCallAction {
 
diff --git a/java/com/android/dialer/precall/PreCallComponent.java b/java/com/android/dialer/precall/PreCallComponent.java
index 00adde5..859eb01 100644
--- a/java/com/android/dialer/precall/PreCallComponent.java
+++ b/java/com/android/dialer/precall/PreCallComponent.java
@@ -17,7 +17,9 @@
 package com.android.dialer.precall;
 
 import android.content.Context;
+import android.support.annotation.NonNull;
 import com.android.dialer.inject.HasRootComponent;
+import com.google.common.collect.ImmutableList;
 import dagger.Subcomponent;
 
 /** Daggaer component for {@link PreCall} */
@@ -25,6 +27,13 @@
 public abstract class PreCallComponent {
   public abstract PreCall getPreCall();
 
+  /**
+   * @return a list of {@link PreCallAction} in execution order for the {@link PreCallCoordinator}
+   *     to run.
+   */
+  @NonNull
+  public abstract ImmutableList<PreCallAction> createActions();
+
   public static PreCallComponent get(Context context) {
     return ((HasComponent) ((HasRootComponent) context.getApplicationContext()).component())
         .preCallActionsComponent();
diff --git a/java/com/android/dialer/precall/PreCallCoordinator.java b/java/com/android/dialer/precall/PreCallCoordinator.java
index cb3221a..4d4859a 100644
--- a/java/com/android/dialer/precall/PreCallCoordinator.java
+++ b/java/com/android/dialer/precall/PreCallCoordinator.java
@@ -21,6 +21,8 @@
 import android.support.annotation.NonNull;
 import android.support.annotation.VisibleForTesting;
 import com.android.dialer.callintent.CallIntentBuilder;
+import com.android.dialer.function.Consumer;
+import com.google.common.util.concurrent.ListenableFuture;
 
 /**
  * Runs {@link PreCallAction} one by one to prepare a {@link
@@ -65,4 +67,9 @@
   @MainThread
   @NonNull
   PendingAction startPendingAction();
+
+  <OutputT> void listen(
+      ListenableFuture<OutputT> future,
+      Consumer<OutputT> successListener,
+      Consumer<Throwable> failureListener);
 }
diff --git a/java/com/android/dialer/precall/externalreceiver/LaunchPreCallActivity.java b/java/com/android/dialer/precall/externalreceiver/LaunchPreCallActivity.java
index 6096d51..60245ee 100644
--- a/java/com/android/dialer/precall/externalreceiver/LaunchPreCallActivity.java
+++ b/java/com/android/dialer/precall/externalreceiver/LaunchPreCallActivity.java
@@ -23,13 +23,16 @@
 import android.support.annotation.Nullable;
 import android.telecom.PhoneAccountHandle;
 import android.telecom.TelecomManager;
+import android.telecom.VideoProfile;
 import com.android.dialer.callintent.CallInitiationType.Type;
 import com.android.dialer.callintent.CallIntentBuilder;
+import com.android.dialer.common.LogUtil;
 import com.android.dialer.configprovider.ConfigProvider;
-import com.android.dialer.configprovider.ConfigProviderBindings;
+import com.android.dialer.configprovider.ConfigProviderComponent;
 import com.android.dialer.logging.DialerImpression;
 import com.android.dialer.logging.Logger;
 import com.android.dialer.precall.PreCall;
+import com.google.common.collect.ImmutableList;
 
 /**
  * Activity that forwards to {@link PreCall#start(Context, CallIntentBuilder)} so the pre-call flow
@@ -50,12 +53,24 @@
 
   public static final String EXTRA_ALLOW_ASSISTED_DIAL = "allow_assisted_dial";
 
+  private static final ImmutableList<String> HANDLED_INTENT_EXTRAS =
+      ImmutableList.of(
+          TelecomManager.EXTRA_START_CALL_WITH_VIDEO_STATE,
+          TelecomManager.EXTRA_OUTGOING_CALL_EXTRAS,
+          TelecomManager.EXTRA_PHONE_ACCOUNT_HANDLE,
+          TelecomManager.EXTRA_CALL_SUBJECT,
+          EXTRA_PHONE_ACCOUNT_HANDLE,
+          EXTRA_IS_VIDEO_CALL,
+          EXTRA_CALL_SUBJECT,
+          EXTRA_ALLOW_ASSISTED_DIAL);
+
   @Override
   public void onCreate(@Nullable Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
     Logger.get(this).logImpression(DialerImpression.Type.PRECALL_INITIATED_EXTERNAL);
 
-    ConfigProvider configProvider = ConfigProviderBindings.get(getApplicationContext());
+    ConfigProvider configProvider =
+        ConfigProviderComponent.get(getApplicationContext()).getConfigProvider();
     Intent intent = getIntent();
     CallIntentBuilder builder = new CallIntentBuilder(intent.getData(), Type.EXTERNAL_INITIATION);
 
@@ -72,7 +87,62 @@
             intent.getBooleanExtra(
                 EXTRA_ALLOW_ASSISTED_DIAL,
                 configProvider.getBoolean("assisted_dialing_default_precall_state", false)));
+    filterExtras(intent.getExtras(), builder);
     PreCall.start(this, builder);
     finish();
   }
+
+  /**
+   * Move key-value pairs that {@link CallIntentBuilder} can handle from {@code intentExtras} to
+   * {@code builder}
+   */
+  private void filterExtras(@Nullable Bundle intentExtras, CallIntentBuilder builder) {
+    if (intentExtras == null) {
+      return;
+    }
+    Bundle bundle = new Bundle();
+    bundle.putAll(intentExtras);
+
+    if (intentExtras.containsKey(TelecomManager.EXTRA_START_CALL_WITH_VIDEO_STATE)) {
+      int videoState = intentExtras.getInt(TelecomManager.EXTRA_START_CALL_WITH_VIDEO_STATE);
+      switch (videoState) {
+        case VideoProfile.STATE_BIDIRECTIONAL:
+          builder.setIsVideoCall(true);
+          break;
+        case VideoProfile.STATE_AUDIO_ONLY:
+          builder.setIsVideoCall(false);
+          break;
+        case VideoProfile.STATE_RX_ENABLED:
+        case VideoProfile.STATE_TX_ENABLED:
+          LogUtil.w(
+              "LaunchPreCallActivity.filterExtras",
+              "unsupported video state " + videoState + ", overriding to STATE_BIDIRECTIONAL");
+          builder.setIsVideoCall(true);
+          break;
+        default:
+          LogUtil.w("LaunchPreCallActivity.filterExtras", "unknown video state " + videoState);
+          builder.setIsVideoCall(false);
+      }
+    }
+
+    if (intentExtras.containsKey(TelecomManager.EXTRA_OUTGOING_CALL_EXTRAS)) {
+      builder
+          .getInCallUiIntentExtras()
+          .putAll(intentExtras.getBundle(TelecomManager.EXTRA_OUTGOING_CALL_EXTRAS));
+    }
+
+    if (intentExtras.containsKey(TelecomManager.EXTRA_PHONE_ACCOUNT_HANDLE)) {
+      builder.setPhoneAccountHandle(
+          intentExtras.getParcelable(TelecomManager.EXTRA_PHONE_ACCOUNT_HANDLE));
+    }
+
+    if (intentExtras.containsKey(TelecomManager.EXTRA_CALL_SUBJECT)) {
+      builder.setCallSubject(intentExtras.getString(TelecomManager.EXTRA_CALL_SUBJECT));
+    }
+
+    for (String handledKey : HANDLED_INTENT_EXTRAS) {
+      bundle.remove(handledKey);
+    }
+    builder.getPlaceCallExtras().putAll(bundle);
+  }
 }
diff --git a/java/com/android/dialer/precall/impl/AssistedDialAction.java b/java/com/android/dialer/precall/impl/AssistedDialAction.java
index 9ed37ac..0e38231 100644
--- a/java/com/android/dialer/precall/impl/AssistedDialAction.java
+++ b/java/com/android/dialer/precall/impl/AssistedDialAction.java
@@ -16,9 +16,7 @@
 
 package com.android.dialer.precall.impl;
 
-import android.annotation.TargetApi;
 import android.content.Context;
-import android.os.Build;
 import android.os.Bundle;
 import android.telecom.PhoneAccount;
 import android.telephony.SubscriptionInfo;
@@ -31,7 +29,7 @@
 import com.android.dialer.common.LogUtil;
 import com.android.dialer.compat.telephony.TelephonyManagerCompat;
 import com.android.dialer.configprovider.ConfigProvider;
-import com.android.dialer.configprovider.ConfigProviderBindings;
+import com.android.dialer.configprovider.ConfigProviderComponent;
 import com.android.dialer.precall.PreCallAction;
 import com.android.dialer.precall.PreCallCoordinator;
 import com.android.dialer.telecom.TelecomUtil;
@@ -46,8 +44,6 @@
     return false;
   }
 
-  @SuppressWarnings("AndroidApiChecker") // Use of optional
-  @TargetApi(Build.VERSION_CODES.N)
   @Override
   public void runWithoutUi(Context context, CallIntentBuilder builder) {
     if (!builder.isAssistedDialAllowed()) {
@@ -69,10 +65,12 @@
     Optional<TransformationInfo> transformedNumber =
         assistedDialingMediator.attemptAssistedDial(phoneNumber);
     if (transformedNumber.isPresent()) {
-      builder.getOutgoingCallExtras().putBoolean(TelephonyManagerCompat.USE_ASSISTED_DIALING, true);
+      builder
+          .getInCallUiIntentExtras()
+          .putBoolean(TelephonyManagerCompat.USE_ASSISTED_DIALING, true);
       Bundle assistedDialingExtras = transformedNumber.get().toBundle();
       builder
-          .getOutgoingCallExtras()
+          .getInCallUiIntentExtras()
           .putBundle(TelephonyManagerCompat.ASSISTED_DIALING_EXTRAS, assistedDialingExtras);
       builder.setUri(
           CallUtil.getCallUri(Assert.isNotNull(transformedNumber.get().transformedNumber())));
@@ -83,12 +81,10 @@
   /**
    * A convenience method to return the proper TelephonyManager in possible multi-sim environments.
    */
-  @SuppressWarnings("AndroidApiChecker") // Use of createForSubscriptionId
-  @TargetApi(Build.VERSION_CODES.N)
   private TelephonyManager getAssistedDialingTelephonyManager(
       Context context, CallIntentBuilder builder) {
 
-    ConfigProvider configProvider = ConfigProviderBindings.get(context);
+    ConfigProvider configProvider = ConfigProviderComponent.get(context).getConfigProvider();
     TelephonyManager telephonyManager = context.getSystemService(TelephonyManager.class);
     // None of this will be required in the framework because the PhoneAccountHandle
     // is already mapped to the request in the TelecomConnection.
diff --git a/java/com/android/dialer/precall/impl/CallingAccountSelector.java b/java/com/android/dialer/precall/impl/CallingAccountSelector.java
index 43f6680..042f585 100644
--- a/java/com/android/dialer/precall/impl/CallingAccountSelector.java
+++ b/java/com/android/dialer/precall/impl/CallingAccountSelector.java
@@ -17,55 +17,33 @@
 package com.android.dialer.precall.impl;
 
 import android.app.Activity;
-import android.content.ContentResolver;
-import android.content.ContentUris;
-import android.content.ContentValues;
 import android.content.Context;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
-import android.database.Cursor;
-import android.net.Uri;
-import android.os.Build.VERSION;
-import android.os.Build.VERSION_CODES;
-import android.provider.ContactsContract.Contacts;
-import android.provider.ContactsContract.Data;
-import android.provider.ContactsContract.PhoneLookup;
-import android.provider.ContactsContract.QuickContact;
-import android.provider.ContactsContract.RawContacts;
 import android.support.annotation.MainThread;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.annotation.VisibleForTesting;
-import android.support.annotation.WorkerThread;
 import android.telecom.PhoneAccount;
 import android.telecom.PhoneAccountHandle;
 import android.telecom.TelecomManager;
+import android.telephony.PhoneNumberUtils;
 import com.android.contacts.common.widget.SelectPhoneAccountDialogFragment;
 import com.android.contacts.common.widget.SelectPhoneAccountDialogFragment.SelectPhoneAccountListener;
+import com.android.contacts.common.widget.SelectPhoneAccountDialogOptions;
 import com.android.dialer.callintent.CallIntentBuilder;
 import com.android.dialer.common.Assert;
 import com.android.dialer.common.LogUtil;
-import com.android.dialer.common.concurrent.DialerExecutor.Worker;
-import com.android.dialer.common.concurrent.DialerExecutorComponent;
-import com.android.dialer.configprovider.ConfigProviderBindings;
-import com.android.dialer.logging.DialerImpression;
+import com.android.dialer.configprovider.ConfigProviderComponent;
 import com.android.dialer.logging.DialerImpression.Type;
 import com.android.dialer.logging.Logger;
 import com.android.dialer.precall.PreCallAction;
 import com.android.dialer.precall.PreCallCoordinator;
 import com.android.dialer.precall.PreCallCoordinator.PendingAction;
-import com.android.dialer.preferredsim.PreferredAccountUtil;
-import com.android.dialer.preferredsim.PreferredSimFallbackContract;
-import com.android.dialer.preferredsim.PreferredSimFallbackContract.PreferredSim;
-import com.android.dialer.preferredsim.suggestion.SimSuggestionComponent;
+import com.android.dialer.preferredsim.PreferredAccountRecorder;
+import com.android.dialer.preferredsim.PreferredAccountWorker;
+import com.android.dialer.preferredsim.suggestion.SuggestionProvider;
 import com.android.dialer.preferredsim.suggestion.SuggestionProvider.Suggestion;
-import com.android.dialer.telecom.TelecomUtil;
-import com.android.dialer.util.PermissionsUtil;
-import com.google.common.base.Optional;
-import com.google.common.collect.ImmutableSet;
-import java.util.ArrayList;
 import java.util.List;
+import javax.inject.Inject;
 
 /** PreCallAction to select which phone account to call with. Ignored if there's only one account */
 @SuppressWarnings("MissingPermission")
@@ -73,16 +51,21 @@
 
   @VisibleForTesting static final String TAG_CALLING_ACCOUNT_SELECTOR = "CallingAccountSelector";
 
-  @VisibleForTesting
-  static final String METADATA_SUPPORTS_PREFERRED_SIM = "supports_per_number_preferred_account";
-
   private SelectPhoneAccountDialogFragment selectPhoneAccountDialogFragment;
 
   private boolean isDiscarding;
 
+  private final PreferredAccountWorker preferredAccountWorker;
+
+  @Inject
+  CallingAccountSelector(PreferredAccountWorker preferredAccountWorker) {
+    this.preferredAccountWorker = preferredAccountWorker;
+  }
+
   @Override
   public boolean requiresUi(Context context, CallIntentBuilder builder) {
-    if (!ConfigProviderBindings.get(context)
+    if (!ConfigProviderComponent.get(context)
+        .getConfigProvider()
         .getBoolean("precall_calling_account_selector_enabled", true)) {
       return false;
     }
@@ -90,22 +73,15 @@
     if (builder.getPhoneAccountHandle() != null) {
       return false;
     }
+    if (PhoneNumberUtils.isEmergencyNumber(builder.getUri().getSchemeSpecificPart())) {
+      return false;
+    }
+
     TelecomManager telecomManager = context.getSystemService(TelecomManager.class);
     List<PhoneAccountHandle> accounts = telecomManager.getCallCapablePhoneAccounts();
     if (accounts.size() <= 1) {
       return false;
     }
-
-    if (TelecomUtil.isInManagedCall(context)) {
-      // Most devices are DSDS (dual SIM dual standby) which only one SIM can have active calls at
-      // a time. Telecom will ignore the phone account handle and use the current active SIM, thus
-      // there's no point of selecting SIMs
-      // TODO(a bug): let the user know selections are not available and preferred SIM is not
-      // used
-      // TODO(twyen): support other dual SIM modes when the API is exposed.
-      return false;
-    }
-
     return true;
   }
 
@@ -122,7 +98,13 @@
     }
     switch (builder.getUri().getScheme()) {
       case PhoneAccount.SCHEME_VOICEMAIL:
-        showDialog(coordinator, coordinator.startPendingAction(), null, null, null);
+        showDialog(
+            coordinator,
+            coordinator.startPendingAction(),
+            preferredAccountWorker.getVoicemailDialogOptions(),
+            null,
+            null,
+            null);
         Logger.get(coordinator.getActivity()).logImpression(Type.DUAL_SIM_SELECTION_VOICEMAIL);
         break;
       case PhoneAccount.SCHEME_TEL:
@@ -145,131 +127,70 @@
     Activity activity = coordinator.getActivity();
     String phoneNumber = builder.getUri().getSchemeSpecificPart();
     PendingAction pendingAction = coordinator.startPendingAction();
-    DialerExecutorComponent.get(coordinator.getActivity())
-        .dialerExecutorFactory()
-        .createNonUiTaskBuilder(new PreferredAccountWorker(phoneNumber))
-        .onSuccess(
-            (result -> {
-              if (isDiscarding) {
-                return;
-              }
-              if (result.phoneAccountHandle.isPresent()) {
-                Logger.get(coordinator.getActivity())
-                    .logImpression(DialerImpression.Type.DUAL_SIM_SELECTION_PREFERRED_USED);
-                coordinator.getBuilder().setPhoneAccountHandle(result.phoneAccountHandle.get());
-                pendingAction.finish();
-                return;
-              }
-              PhoneAccountHandle defaultPhoneAccount =
-                  activity
-                      .getSystemService(TelecomManager.class)
-                      .getDefaultOutgoingPhoneAccount(builder.getUri().getScheme());
-              if (defaultPhoneAccount != null) {
-                Logger.get(coordinator.getActivity())
-                    .logImpression(DialerImpression.Type.DUAL_SIM_SELECTION_GLOBAL_USED);
-                builder.setPhoneAccountHandle(defaultPhoneAccount);
-                pendingAction.finish();
-                return;
-              }
-              if (result.suggestion.isPresent()) {
-                LogUtil.i(
-                    "CallingAccountSelector.processPreferredAccount",
-                    "SIM suggested: " + result.suggestion.get().reason);
-                if (result.suggestion.get().shouldAutoSelect) {
-                  Logger.get(coordinator.getActivity())
-                      .logImpression(
-                          DialerImpression.Type.DUAL_SIM_SELECTION_SUGGESTION_AUTO_SELECTED);
-                  LogUtil.i(
-                      "CallingAccountSelector.processPreferredAccount", "Auto selected suggestion");
-                  builder.setPhoneAccountHandle(result.suggestion.get().phoneAccountHandle);
-                  pendingAction.finish();
-                  return;
-                }
-              }
-              showDialog(
-                  coordinator,
-                  pendingAction,
-                  result.dataId.orNull(),
-                  phoneNumber,
-                  result.suggestion.orNull());
-            }))
-        .build()
-        .executeParallel(activity);
+
+    coordinator.listen(
+        preferredAccountWorker.selectAccount(
+            phoneNumber,
+            activity.getSystemService(TelecomManager.class).getCallCapablePhoneAccounts()),
+        result -> {
+          if (isDiscarding) {
+            // pendingAction is dropped by the coordinator before onDiscard is triggered.
+            return;
+          }
+          if (result.getSelectedPhoneAccountHandle().isPresent()) {
+
+            if (result.getSuggestion().isPresent()
+                && result
+                    .getSelectedPhoneAccountHandle()
+                    .get()
+                    .equals(result.getSuggestion().get().phoneAccountHandle)) {
+              builder
+                  .getInCallUiIntentExtras()
+                  .putString(
+                      SuggestionProvider.EXTRA_SIM_SUGGESTION_REASON,
+                      result.getSuggestion().get().reason.name());
+            }
+
+            coordinator
+                .getBuilder()
+                .setPhoneAccountHandle(result.getSelectedPhoneAccountHandle().get());
+            pendingAction.finish();
+            return;
+          }
+          showDialog(
+              coordinator,
+              pendingAction,
+              result.getDialogOptionsBuilder().get().build(),
+              result.getDataId().orNull(),
+              phoneNumber,
+              result.getSuggestion().orNull());
+        },
+        (throwable) -> {
+          throw new RuntimeException(throwable);
+        });
   }
 
   @MainThread
   private void showDialog(
       PreCallCoordinator coordinator,
       PendingAction pendingAction,
+      SelectPhoneAccountDialogOptions dialogOptions,
       @Nullable String dataId,
       @Nullable String number,
       @Nullable Suggestion suggestion) {
     Assert.isMainThread();
-    Logger.get(coordinator.getActivity()).logImpression(Type.DUAL_SIM_SELECTION_SHOWN);
-    if (dataId != null) {
-      Logger.get(coordinator.getActivity()).logImpression(Type.DUAL_SIM_SELECTION_IN_CONTACTS);
-    }
-    if (suggestion != null) {
-      Logger.get(coordinator.getActivity())
-          .logImpression(Type.DUAL_SIM_SELECTION_SUGGESTION_AVAILABLE);
-      switch (suggestion.reason) {
-        case INTRA_CARRIER:
-          Logger.get(coordinator.getActivity())
-              .logImpression(Type.DUAL_SIM_SELECTION_SUGGESTED_CARRIER);
-          break;
-        case FREQUENT:
-          Logger.get(coordinator.getActivity())
-              .logImpression(Type.DUAL_SIM_SELECTION_SUGGESTED_FREQUENCY);
-          break;
-        default:
-      }
-    }
-    List<PhoneAccountHandle> phoneAccountHandles =
-        coordinator
-            .getActivity()
-            .getSystemService(TelecomManager.class)
-            .getCallCapablePhoneAccounts();
+
     selectPhoneAccountDialogFragment =
         SelectPhoneAccountDialogFragment.newInstance(
-            R.string.pre_call_select_phone_account,
-            dataId != null /* canSetDefault */,
-            R.string.pre_call_select_phone_account_remember,
-            phoneAccountHandles,
-            new SelectedListener(coordinator, pendingAction, dataId, number, suggestion),
-            null /* call ID */,
-            buildHint(coordinator.getActivity(), phoneAccountHandles, suggestion));
+            dialogOptions,
+            new SelectedListener(
+                coordinator,
+                pendingAction,
+                new PreferredAccountRecorder(number, suggestion, dataId)));
     selectPhoneAccountDialogFragment.show(
         coordinator.getActivity().getFragmentManager(), TAG_CALLING_ACCOUNT_SELECTOR);
   }
 
-  @Nullable
-  private static List<String> buildHint(
-      Context context,
-      List<PhoneAccountHandle> phoneAccountHandles,
-      @Nullable Suggestion suggestion) {
-    if (suggestion == null) {
-      return null;
-    }
-    List<String> hints = new ArrayList<>();
-    for (PhoneAccountHandle phoneAccountHandle : phoneAccountHandles) {
-      if (!phoneAccountHandle.equals(suggestion.phoneAccountHandle)) {
-        hints.add(null);
-        continue;
-      }
-      switch (suggestion.reason) {
-        case INTRA_CARRIER:
-          hints.add(context.getString(R.string.pre_call_select_phone_account_hint_intra_carrier));
-          break;
-        case FREQUENT:
-          hints.add(context.getString(R.string.pre_call_select_phone_account_hint_frequent));
-          break;
-        default:
-          LogUtil.w("CallingAccountSelector.buildHint", "unhandled reason " + suggestion.reason);
-      }
-    }
-    return hints;
-  }
-
   @MainThread
   @Override
   public void onDiscard() {
@@ -279,220 +200,27 @@
     }
   }
 
-  private static class PreferredAccountWorkerResult {
-
-    /** The preferred phone account for the number. Absent if not set or invalid. */
-    Optional<PhoneAccountHandle> phoneAccountHandle = Optional.absent();
-
-    /**
-     * {@link android.provider.ContactsContract.Data#_ID} of the row matching the number. If the
-     * preferred account is to be set it should be stored in this row
-     */
-    Optional<String> dataId = Optional.absent();
-
-    Optional<Suggestion> suggestion = Optional.absent();
-  }
-
-  private static class PreferredAccountWorker
-      implements Worker<Context, PreferredAccountWorkerResult> {
-
-    private final String phoneNumber;
-
-    public PreferredAccountWorker(String phoneNumber) {
-      this.phoneNumber = phoneNumber;
-    }
-
-    @NonNull
-    @Override
-    @WorkerThread
-    public PreferredAccountWorkerResult doInBackground(Context context) throws Throwable {
-      PreferredAccountWorkerResult result = new PreferredAccountWorkerResult();
-      if (!isPreferredSimEnabled(context)) {
-        return result;
-      }
-      if (!PermissionsUtil.hasContactsReadPermissions(context)) {
-        LogUtil.i(
-            "CallingAccountSelector.PreferredAccountWorker.doInBackground",
-            "missing READ_CONTACTS permission");
-        return result;
-      }
-      result.dataId = getDataId(context, phoneNumber);
-      if (result.dataId.isPresent()) {
-        result.phoneAccountHandle = getPreferredAccount(context, result.dataId.get());
-      }
-      if (!result.phoneAccountHandle.isPresent()) {
-        result.suggestion =
-            SimSuggestionComponent.get(context)
-                .getSuggestionProvider()
-                .getSuggestion(context, phoneNumber);
-      }
-      return result;
-    }
-  }
-
-  @WorkerThread
-  @NonNull
-  private static Optional<String> getDataId(
-      @NonNull Context context, @Nullable String phoneNumber) {
-    Assert.isWorkerThread();
-    if (VERSION.SDK_INT < VERSION_CODES.N) {
-      return Optional.absent();
-    }
-    try (Cursor cursor =
-        context
-            .getContentResolver()
-            .query(
-                Uri.withAppendedPath(PhoneLookup.CONTENT_FILTER_URI, Uri.encode(phoneNumber)),
-                new String[] {PhoneLookup.DATA_ID},
-                null,
-                null,
-                null)) {
-      if (cursor == null) {
-        return Optional.absent();
-      }
-      ImmutableSet<String> validAccountTypes = PreferredAccountUtil.getValidAccountTypes(context);
-      String result = null;
-      while (cursor.moveToNext()) {
-        Optional<String> accountType =
-            getAccountType(context.getContentResolver(), cursor.getLong(0));
-        if (!accountType.isPresent() || !validAccountTypes.contains(accountType.get())) {
-          LogUtil.i("CallingAccountSelector.getDataId", "ignoring non-writable " + accountType);
-          continue;
-        }
-        if (result != null && !result.equals(cursor.getString(0))) {
-          // TODO(twyen): if there are multiple entries attempt to grab from the contact that
-          // initiated the call.
-          LogUtil.i("CallingAccountSelector.getDataId", "lookup result not unique, ignoring");
-          return Optional.absent();
-        }
-        result = cursor.getString(0);
-      }
-      return Optional.fromNullable(result);
-    }
-  }
-
-  @WorkerThread
-  private static Optional<String> getAccountType(ContentResolver contentResolver, long dataId) {
-    Assert.isWorkerThread();
-    Optional<Long> rawContactId = getRawContactId(contentResolver, dataId);
-    if (!rawContactId.isPresent()) {
-      return Optional.absent();
-    }
-    try (Cursor cursor =
-        contentResolver.query(
-            ContentUris.withAppendedId(RawContacts.CONTENT_URI, rawContactId.get()),
-            new String[] {RawContacts.ACCOUNT_TYPE},
-            null,
-            null,
-            null)) {
-      if (cursor == null || !cursor.moveToFirst()) {
-        return Optional.absent();
-      }
-      return Optional.fromNullable(cursor.getString(0));
-    }
-  }
-
-  @WorkerThread
-  private static Optional<Long> getRawContactId(ContentResolver contentResolver, long dataId) {
-    Assert.isWorkerThread();
-    try (Cursor cursor =
-        contentResolver.query(
-            ContentUris.withAppendedId(Data.CONTENT_URI, dataId),
-            new String[] {Data.RAW_CONTACT_ID},
-            null,
-            null,
-            null)) {
-      if (cursor == null || !cursor.moveToFirst()) {
-        return Optional.absent();
-      }
-      return Optional.of(cursor.getLong(0));
-    }
-  }
-
-  @WorkerThread
-  @NonNull
-  private static Optional<PhoneAccountHandle> getPreferredAccount(
-      @NonNull Context context, @NonNull String dataId) {
-    Assert.isWorkerThread();
-    Assert.isNotNull(dataId);
-    try (Cursor cursor =
-        context
-            .getContentResolver()
-            .query(
-                PreferredSimFallbackContract.CONTENT_URI,
-                new String[] {
-                  PreferredSim.PREFERRED_PHONE_ACCOUNT_COMPONENT_NAME,
-                  PreferredSim.PREFERRED_PHONE_ACCOUNT_ID
-                },
-                PreferredSim.DATA_ID + " = ?",
-                new String[] {dataId},
-                null)) {
-      if (cursor == null) {
-        return Optional.absent();
-      }
-      if (!cursor.moveToFirst()) {
-        return Optional.absent();
-      }
-      return PreferredAccountUtil.getValidPhoneAccount(
-          context, cursor.getString(0), cursor.getString(1));
-    }
-  }
-
   private class SelectedListener extends SelectPhoneAccountListener {
 
     private final PreCallCoordinator coordinator;
     private final PreCallCoordinator.PendingAction listener;
-    private final String dataId;
-    private final String number;
-    private final Suggestion suggestion;
+    private final PreferredAccountRecorder recorder;
 
     public SelectedListener(
         @NonNull PreCallCoordinator builder,
         @NonNull PreCallCoordinator.PendingAction listener,
-        @Nullable String dataId,
-        @Nullable String number,
-        @Nullable Suggestion suggestion) {
+        @NonNull PreferredAccountRecorder recorder) {
       this.coordinator = Assert.isNotNull(builder);
       this.listener = Assert.isNotNull(listener);
-      this.dataId = dataId;
-      this.number = number;
-      this.suggestion = suggestion;
+      this.recorder = Assert.isNotNull(recorder);
     }
 
     @MainThread
     @Override
     public void onPhoneAccountSelected(
         PhoneAccountHandle selectedAccountHandle, boolean setDefault, @Nullable String callId) {
-      if (suggestion != null) {
-        if (suggestion.phoneAccountHandle.equals(selectedAccountHandle)) {
-          Logger.get(coordinator.getActivity())
-              .logImpression(DialerImpression.Type.DUAL_SIM_SELECTION_SUGGESTED_SIM_SELECTED);
-        } else {
-          Logger.get(coordinator.getActivity())
-              .logImpression(DialerImpression.Type.DUAL_SIM_SELECTION_NON_SUGGESTED_SIM_SELECTED);
-        }
-      }
       coordinator.getBuilder().setPhoneAccountHandle(selectedAccountHandle);
-
-      if (dataId != null && setDefault) {
-        Logger.get(coordinator.getActivity())
-            .logImpression(DialerImpression.Type.DUAL_SIM_SELECTION_PREFERRED_SET);
-        DialerExecutorComponent.get(coordinator.getActivity())
-            .dialerExecutorFactory()
-            .createNonUiTaskBuilder(new WritePreferredAccountWorker())
-            .build()
-            .executeParallel(
-                new WritePreferredAccountWorkerInput(
-                    coordinator.getActivity(), dataId, selectedAccountHandle));
-      }
-      if (number != null) {
-        DialerExecutorComponent.get(coordinator.getActivity())
-            .dialerExecutorFactory()
-            .createNonUiTaskBuilder(
-                new UserSelectionReporter(selectedAccountHandle, number, setDefault))
-            .build()
-            .executeParallel(coordinator.getActivity());
-      }
+      recorder.record(coordinator.getActivity(), selectedAccountHandle, setDefault);
       listener.finish();
     }
 
@@ -506,103 +234,4 @@
       listener.finish();
     }
   }
-
-  private static class UserSelectionReporter implements Worker<Context, Void> {
-
-    private final String number;
-    private final PhoneAccountHandle phoneAccountHandle;
-    private final boolean remember;
-
-    public UserSelectionReporter(
-        @NonNull PhoneAccountHandle phoneAccountHandle, @Nullable String number, boolean remember) {
-      this.phoneAccountHandle = Assert.isNotNull(phoneAccountHandle);
-      this.number = Assert.isNotNull(number);
-      this.remember = remember;
-    }
-
-    @Nullable
-    @Override
-    public Void doInBackground(@NonNull Context context) throws Throwable {
-      SimSuggestionComponent.get(context)
-          .getSuggestionProvider()
-          .reportUserSelection(context, number, phoneAccountHandle, remember);
-      return null;
-    }
-  }
-
-  private static class WritePreferredAccountWorkerInput {
-    private final Context context;
-    private final String dataId;
-    private final PhoneAccountHandle phoneAccountHandle;
-
-    WritePreferredAccountWorkerInput(
-        @NonNull Context context,
-        @NonNull String dataId,
-        @NonNull PhoneAccountHandle phoneAccountHandle) {
-      this.context = Assert.isNotNull(context);
-      this.dataId = Assert.isNotNull(dataId);
-      this.phoneAccountHandle = Assert.isNotNull(phoneAccountHandle);
-    }
-  }
-
-  private static class WritePreferredAccountWorker
-      implements Worker<WritePreferredAccountWorkerInput, Void> {
-
-    @Nullable
-    @Override
-    @WorkerThread
-    public Void doInBackground(WritePreferredAccountWorkerInput input) throws Throwable {
-      ContentValues values = new ContentValues();
-      values.put(
-          PreferredSim.PREFERRED_PHONE_ACCOUNT_COMPONENT_NAME,
-          input.phoneAccountHandle.getComponentName().flattenToString());
-      values.put(PreferredSim.PREFERRED_PHONE_ACCOUNT_ID, input.phoneAccountHandle.getId());
-      input
-          .context
-          .getContentResolver()
-          .update(
-              PreferredSimFallbackContract.CONTENT_URI,
-              values,
-              PreferredSim.DATA_ID + " = ?",
-              new String[] {String.valueOf(input.dataId)});
-      return null;
-    }
-  }
-
-  @WorkerThread
-  private static boolean isPreferredSimEnabled(Context context) {
-    Assert.isWorkerThread();
-    if (!ConfigProviderBindings.get(context).getBoolean("preferred_sim_enabled", true)) {
-      return false;
-    }
-
-    Intent quickContactIntent = getQuickContactIntent();
-    ResolveInfo resolveInfo =
-        context
-            .getPackageManager()
-            .resolveActivity(quickContactIntent, PackageManager.GET_META_DATA);
-    if (resolveInfo == null
-        || resolveInfo.activityInfo == null
-        || resolveInfo.activityInfo.applicationInfo == null
-        || resolveInfo.activityInfo.applicationInfo.metaData == null) {
-      LogUtil.e("CallingAccountSelector.isPreferredSimEnabled", "cannot resolve quick contact app");
-      return false;
-    }
-    if (!resolveInfo.activityInfo.applicationInfo.metaData.getBoolean(
-        METADATA_SUPPORTS_PREFERRED_SIM, false)) {
-      LogUtil.i(
-          "CallingAccountSelector.isPreferredSimEnabled",
-          "system contacts does not support preferred SIM");
-      return false;
-    }
-    return true;
-  }
-
-  @VisibleForTesting
-  static Intent getQuickContactIntent() {
-    Intent intent = new Intent(QuickContact.ACTION_QUICK_CONTACT);
-    intent.addCategory(Intent.CATEGORY_DEFAULT);
-    intent.setData(Contacts.CONTENT_URI.buildUpon().appendPath("1").build());
-    return intent;
-  }
 }
diff --git a/java/com/android/dialer/precall/impl/DuoAction.java b/java/com/android/dialer/precall/impl/DuoAction.java
new file mode 100644
index 0000000..c05fbe1
--- /dev/null
+++ b/java/com/android/dialer/precall/impl/DuoAction.java
@@ -0,0 +1,97 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.dialer.precall.impl;
+
+import android.content.Context;
+import android.content.Intent;
+import com.android.dialer.callintent.CallIntentBuilder;
+import com.android.dialer.common.LogUtil;
+import com.android.dialer.common.concurrent.Annotations.Ui;
+import com.android.dialer.duo.Duo.ReachabilityData;
+import com.android.dialer.duo.DuoComponent;
+import com.android.dialer.precall.PreCallAction;
+import com.android.dialer.precall.PreCallCoordinator;
+import com.android.dialer.precall.PreCallCoordinator.PendingAction;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.util.concurrent.FutureCallback;
+import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.ListenableFuture;
+import com.google.common.util.concurrent.ListeningExecutorService;
+import javax.inject.Inject;
+
+/**
+ * Checks if a duo call is actually callable, and request an activity for {@link
+ * android.app.Activity#startActivityForResult(Intent, int)}
+ */
+public class DuoAction implements PreCallAction {
+
+  private final ListeningExecutorService uiExecutor;
+
+  @Inject
+  DuoAction(@Ui ListeningExecutorService uiExecutor) {
+    this.uiExecutor = uiExecutor;
+  }
+
+  @Override
+  public boolean requiresUi(Context context, CallIntentBuilder builder) {
+    // Duo call must be started with startActivityForResult() which needs a activity.
+    return builder.isDuoCall();
+  }
+
+  @Override
+  public void runWithoutUi(Context context, CallIntentBuilder builder) {}
+
+  @Override
+  public void runWithUi(PreCallCoordinator coordinator) {
+    if (!requiresUi(coordinator.getActivity(), coordinator.getBuilder())) {
+      return;
+    }
+    String number = coordinator.getBuilder().getUri().getSchemeSpecificPart();
+    ListenableFuture<ImmutableMap<String, ReachabilityData>> reachabilities =
+        DuoComponent.get(coordinator.getActivity())
+            .getDuo()
+            .updateReachability(coordinator.getActivity(), ImmutableList.of(number));
+    PendingAction pendingAction = coordinator.startPendingAction();
+
+    Futures.addCallback(
+        reachabilities,
+        new FutureCallback<ImmutableMap<String, ReachabilityData>>() {
+          @Override
+          public void onSuccess(ImmutableMap<String, ReachabilityData> result) {
+            if (!result.containsKey(number) || !result.get(number).videoCallable()) {
+              LogUtil.w(
+                  "DuoAction.runWithUi",
+                  number + " number no longer duo reachable, falling back to carrier video call");
+              coordinator.getBuilder().setIsDuoCall(false);
+            }
+            pendingAction.finish();
+          }
+
+          @Override
+          public void onFailure(Throwable throwable) {
+            LogUtil.e("DuoAction.runWithUi", "reachability query failed", throwable);
+            coordinator.getBuilder().setIsDuoCall(false);
+            pendingAction.finish();
+          }
+        },
+        uiExecutor);
+  }
+
+  @Override
+  public void onDiscard() {}
+}
diff --git a/java/com/android/dialer/precall/impl/MalformedNumberRectifier.java b/java/com/android/dialer/precall/impl/MalformedNumberRectifier.java
new file mode 100644
index 0000000..2e41463
--- /dev/null
+++ b/java/com/android/dialer/precall/impl/MalformedNumberRectifier.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.dialer.precall.impl;
+
+import android.content.Context;
+import android.net.Uri;
+import android.support.annotation.MainThread;
+import android.telecom.PhoneAccount;
+import com.android.dialer.callintent.CallIntentBuilder;
+import com.android.dialer.precall.PreCallAction;
+import com.android.dialer.precall.PreCallCoordinator;
+import com.google.common.base.Optional;
+import com.google.common.collect.ImmutableList;
+
+/**
+ * Fix common malformed number before it is dialed. Rewrite the number to the first handler that can
+ * handle it
+ */
+public class MalformedNumberRectifier implements PreCallAction {
+
+  /** Handler for individual rules. */
+  public interface MalformedNumberHandler {
+
+    /** @return the number to be corrected to. */
+    @MainThread
+    Optional<String> handle(Context context, String number);
+  }
+
+  private final ImmutableList<MalformedNumberHandler> handlers;
+
+  MalformedNumberRectifier(ImmutableList<MalformedNumberHandler> handlers) {
+    this.handlers = handlers;
+  }
+
+  @Override
+  public boolean requiresUi(Context context, CallIntentBuilder builder) {
+    return false;
+  }
+
+  @Override
+  public void runWithoutUi(Context context, CallIntentBuilder builder) {
+    if (!PhoneAccount.SCHEME_TEL.equals(builder.getUri().getScheme())) {
+      return;
+    }
+    String number = builder.getUri().getSchemeSpecificPart();
+
+    for (MalformedNumberHandler handler : handlers) {
+      Optional<String> result = handler.handle(context, number);
+      if (result.isPresent()) {
+        builder.setUri(Uri.fromParts(PhoneAccount.SCHEME_TEL, result.get(), null));
+        return;
+      }
+    }
+  }
+
+  @Override
+  public void runWithUi(PreCallCoordinator coordinator) {
+    runWithoutUi(coordinator.getActivity(), coordinator.getBuilder());
+  }
+
+  @Override
+  public void onDiscard() {}
+}
diff --git a/java/com/android/dialer/precall/impl/PreCallActivity.java b/java/com/android/dialer/precall/impl/PreCallActivity.java
index ee417b9..7b27945 100644
--- a/java/com/android/dialer/precall/impl/PreCallActivity.java
+++ b/java/com/android/dialer/precall/impl/PreCallActivity.java
@@ -16,11 +16,8 @@
 
 package com.android.dialer.precall.impl;
 
-import android.annotation.TargetApi;
 import android.app.Activity;
 import android.app.KeyguardManager;
-import android.os.Build.VERSION;
-import android.os.Build.VERSION_CODES;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.view.WindowManager.LayoutParams;
@@ -36,8 +33,32 @@
     preCallCoordinator = new PreCallCoordinatorImpl(this);
     preCallCoordinator.onCreate(getIntent(), savedInstanceState);
     if (getSystemService(KeyguardManager.class).isKeyguardLocked()) {
-        getWindow().addFlags(LayoutParams.FLAG_SHOW_WHEN_LOCKED);
-
+      // Note:
+      //
+      // Flag LayoutParams.FLAG_TURN_SCREEN_ON was deprecated in O_MR1, but calling the new API
+      // setTurnScreenOn(true) doesn't give us the expected behavior.
+      //
+      // Calling setTurnScreenOn(true) alone doesn't turn on the screen when the device is locked.
+      // We must also call KeyguardManager#requestDismissKeyguard, which will bring up the lock
+      // screen for the user to enter their credentials.
+      //
+      // If the Keyguard is not secure or the device is currently in a trusted state, calling
+      // requestDismissKeyguard will immediately dismiss the Keyguard without any user interaction.
+      // However, the lock screen will still pop up before it quickly disappears.
+      //
+      // If the Keyguard is secure and the device is not in a trusted state, the device will show
+      // the lock screen and wait for the user's credentials.
+      //
+      // Therefore, to avoid showing the lock screen, we will continue using the deprecated flag in
+      // O_MR1 and later Android versions.
+      //
+      // Flag LayoutParams.FLAG_SHOW_WHEN_LOCKED was also deprecated in O_MR1, and the new API
+      // setShowWhenLocked(boolean) works. However, as the purpose of the two new APIs is to prevent
+      // an unintentional double life-cycle event, only using one is ineffective.
+      //
+      // Therefore, to simplify code and make testing easier, we will also keep using
+      // LayoutParams.FLAG_SHOW_WHEN_LOCKED.
+      getWindow().addFlags(LayoutParams.FLAG_SHOW_WHEN_LOCKED | LayoutParams.FLAG_TURN_SCREEN_ON);
     }
   }
 
diff --git a/java/com/android/dialer/precall/impl/PreCallCoordinatorImpl.java b/java/com/android/dialer/precall/impl/PreCallCoordinatorImpl.java
index 36af622..314a0a0 100644
--- a/java/com/android/dialer/precall/impl/PreCallCoordinatorImpl.java
+++ b/java/com/android/dialer/precall/impl/PreCallCoordinatorImpl.java
@@ -24,13 +24,21 @@
 import com.android.dialer.callintent.CallIntentBuilder;
 import com.android.dialer.common.Assert;
 import com.android.dialer.common.LogUtil;
+import com.android.dialer.common.concurrent.DialerExecutorComponent;
+import com.android.dialer.common.concurrent.UiListener;
+import com.android.dialer.duo.DuoComponent;
+import com.android.dialer.function.Consumer;
 import com.android.dialer.logging.DialerImpression.Type;
 import com.android.dialer.logging.Logger;
 import com.android.dialer.precall.PreCallAction;
 import com.android.dialer.precall.PreCallComponent;
 import com.android.dialer.precall.PreCallCoordinator;
 import com.android.dialer.telecom.TelecomUtil;
+import com.google.common.base.Optional;
 import com.google.common.collect.ImmutableList;
+import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.ListenableFuture;
+import com.google.common.util.concurrent.MoreExecutors;
 
 /**
  * Implements {@link PreCallCoordinator}. Listens to the life cycle of {@link PreCallActivity} to
@@ -49,6 +57,8 @@
   private PendingAction pendingAction;
   private boolean aborted = false;
 
+  private UiListener<Object> uiListener;
+
   PreCallCoordinatorImpl(@NonNull Activity activity) {
     this.activity = Assert.isNotNull(activity);
   }
@@ -61,6 +71,9 @@
     } else {
       builder = Assert.isNotNull(intent.getParcelableExtra(EXTRA_CALL_INTENT_BUILDER));
     }
+    uiListener =
+        DialerExecutorComponent.get(activity)
+            .createUiListener(activity.getFragmentManager(), "PreCallCoordinatorImpl.uiListener");
   }
 
   void onRestoreInstanceState(Bundle savedInstanceState) {
@@ -69,7 +82,7 @@
   }
 
   void onResume() {
-    actions = PreCallComponent.get(activity).getPreCall().getActions();
+    actions = PreCallComponent.get(activity).createActions();
     runNextAction();
   }
 
@@ -90,7 +103,7 @@
     LogUtil.enterBlock("PreCallCoordinatorImpl.runNextAction");
     Assert.checkArgument(currentAction == null);
     if (currentActionIndex >= actions.size()) {
-      TelecomUtil.placeCall(activity, builder.build());
+      placeCall();
       activity.finish();
       return;
     }
@@ -152,4 +165,34 @@
       onActionFinished();
     }
   }
+
+  @SuppressWarnings("unchecked")
+  @Override
+  public <OutputT> void listen(
+      ListenableFuture<OutputT> future,
+      Consumer<OutputT> successListener,
+      Consumer<Throwable> failureListener) {
+
+    uiListener.listen(
+        activity,
+        Futures.transform(future, (output) -> (Object) output, MoreExecutors.directExecutor()),
+        output -> successListener.accept((OutputT) output),
+        failureListener::accept);
+  }
+
+  private void placeCall() {
+    if (builder.isDuoCall()) {
+      Optional<Intent> intent =
+          DuoComponent.get(activity)
+              .getDuo()
+              .getCallIntent(builder.getUri().getSchemeSpecificPart());
+      if (intent.isPresent()) {
+        activity.startActivityForResult(intent.get(), 0);
+        return;
+      } else {
+        LogUtil.e("PreCallCoordinatorImpl.placeCall", "duo.getCallIntent() returned absent");
+      }
+    }
+    TelecomUtil.placeCall(activity, builder.build());
+  }
 }
diff --git a/java/com/android/dialer/precall/impl/PreCallImpl.java b/java/com/android/dialer/precall/impl/PreCallImpl.java
index f75c8d9..f52fa61 100644
--- a/java/com/android/dialer/precall/impl/PreCallImpl.java
+++ b/java/com/android/dialer/precall/impl/PreCallImpl.java
@@ -25,7 +25,6 @@
 import com.android.dialer.logging.Logger;
 import com.android.dialer.precall.PreCall;
 import com.android.dialer.precall.PreCallAction;
-import com.android.dialer.precall.PreCallComponent;
 import com.android.dialer.precall.PreCallCoordinator;
 import com.google.common.collect.ImmutableList;
 import javax.inject.Inject;
@@ -33,13 +32,11 @@
 /** Implementation of {@link PreCall} */
 public class PreCallImpl implements PreCall {
 
-  @Inject
-  PreCallImpl() {}
+  private final ImmutableList<PreCallAction> actions;
 
-  @Override
-  public ImmutableList<PreCallAction> getActions() {
-    return ImmutableList.of(
-        new PermissionCheckAction(), new CallingAccountSelector(), new AssistedDialAction());
+  @Inject
+  PreCallImpl(ImmutableList<PreCallAction> actions) {
+    this.actions = actions;
   }
 
   @NonNull
@@ -48,7 +45,7 @@
     Logger.get(context).logImpression(DialerImpression.Type.PRECALL_INITIATED);
     if (!requiresUi(context, builder)) {
       LogUtil.i("PreCallImpl.buildIntent", "No UI requested, running pre-call directly");
-      for (PreCallAction action : PreCallComponent.get(context).getPreCall().getActions()) {
+      for (PreCallAction action : actions) {
         action.runWithoutUi(context, builder);
       }
       return builder.build();
@@ -60,7 +57,7 @@
   }
 
   private boolean requiresUi(Context context, CallIntentBuilder builder) {
-    for (PreCallAction action : PreCallComponent.get(context).getPreCall().getActions()) {
+    for (PreCallAction action : actions) {
       if (action.requiresUi(context, builder)) {
         LogUtil.i("PreCallImpl.requiresUi", action + " requested UI");
         return true;
diff --git a/java/com/android/dialer/precall/impl/PreCallModule.java b/java/com/android/dialer/precall/impl/PreCallModule.java
index 608cd5a..cbdabe3 100644
--- a/java/com/android/dialer/precall/impl/PreCallModule.java
+++ b/java/com/android/dialer/precall/impl/PreCallModule.java
@@ -16,16 +16,36 @@
 
 package com.android.dialer.precall.impl;
 
+import com.android.dialer.inject.DialerVariant;
+import com.android.dialer.inject.InstallIn;
 import com.android.dialer.precall.PreCall;
+import com.android.dialer.precall.PreCallAction;
+import com.google.common.collect.ImmutableList;
 import dagger.Binds;
 import dagger.Module;
+import dagger.Provides;
 import javax.inject.Singleton;
 
 /** Dagger module for {@link PreCall}. */
+@InstallIn(variants = {DialerVariant.DIALER_TEST})
 @Module
 public abstract class PreCallModule {
 
+  private PreCallModule() {}
+
   @Binds
   @Singleton
-  public abstract PreCall bindPreCall(PreCallImpl simulator);
+  public abstract PreCall to(PreCallImpl impl);
+
+  @Provides
+  public static ImmutableList<PreCallAction> provideActions(
+      DuoAction duoAction, CallingAccountSelector callingAccountSelector) {
+    return ImmutableList.of(
+        new PermissionCheckAction(),
+        new MalformedNumberRectifier(
+            ImmutableList.of(new UkRegionPrefixInInternationalFormatHandler())),
+        callingAccountSelector,
+        duoAction,
+        new AssistedDialAction());
+  }
 }
diff --git a/java/com/android/dialer/precall/impl/UkRegionPrefixInInternationalFormatHandler.java b/java/com/android/dialer/precall/impl/UkRegionPrefixInInternationalFormatHandler.java
new file mode 100644
index 0000000..825375d
--- /dev/null
+++ b/java/com/android/dialer/precall/impl/UkRegionPrefixInInternationalFormatHandler.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.dialer.precall.impl;
+
+import android.content.Context;
+import android.telephony.PhoneNumberUtils;
+import com.android.dialer.common.LogUtil;
+import com.android.dialer.configprovider.ConfigProviderComponent;
+import com.android.dialer.precall.impl.MalformedNumberRectifier.MalformedNumberHandler;
+import com.google.common.base.Optional;
+
+/**
+ * It is customary in UK to present numbers as "+44 (0) xx xxxx xxxx". This is actually a amalgam of
+ * international (+44 xx xxxx xxxx) and regional (0xx xxxx xxxx) format, and is in fact invalid. It
+ * might be rejected depending on the carrier.
+ *
+ * <p>This class removes the "0" region code prefix if the first dialable digits are "+440". UK
+ * short codes and region codes in international format will never start with a 0.
+ */
+class UkRegionPrefixInInternationalFormatHandler implements MalformedNumberHandler {
+
+  private static final String MALFORMED_PREFIX = "+440";
+
+  @Override
+  public Optional<String> handle(Context context, String number) {
+    if (!ConfigProviderComponent.get(context)
+        .getConfigProvider()
+        .getBoolean("uk_region_prefix_in_international_format_fix_enabled", true)) {
+      return Optional.absent();
+    }
+    if (!PhoneNumberUtils.normalizeNumber(number).startsWith(MALFORMED_PREFIX)) {
+      return Optional.absent();
+    }
+    LogUtil.i("UkRegionPrefixInInternationalFormatHandler.handle", "removing (0) in UK numbers");
+
+    // libPhoneNumber is not used because we want to keep post dial digits, and this is on the main
+    // thread.
+    String convertedNumber = PhoneNumberUtils.convertKeypadLettersToDigits(number);
+    StringBuilder result = new StringBuilder();
+    int prefixPosition = 0;
+    for (int i = 0; i < convertedNumber.length(); i++) {
+      char c = convertedNumber.charAt(i);
+      if (c != MALFORMED_PREFIX.charAt(prefixPosition)) {
+        result.append(c);
+        continue;
+      }
+      prefixPosition++;
+      if (prefixPosition == MALFORMED_PREFIX.length()) {
+        result.append(convertedNumber.substring(i + 1));
+        break;
+      }
+      result.append(c);
+    }
+    return Optional.of(result.toString());
+  }
+}
diff --git a/java/com/android/dialer/precall/impl/res/values-af/strings.xml b/java/com/android/dialer/precall/impl/res/values-af/strings.xml
new file mode 100644
index 0000000..a44293c
--- /dev/null
+++ b/java/com/android/dialer/precall/impl/res/values-af/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">Kan nie bel sonder foontoestemming nie</string>
+</resources>
diff --git a/java/com/android/dialer/precall/impl/res/values-am/strings.xml b/java/com/android/dialer/precall/impl/res/values-am/strings.xml
new file mode 100644
index 0000000..3efff22
--- /dev/null
+++ b/java/com/android/dialer/precall/impl/res/values-am/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">ያለ ስልክ ፈቃድ ጥሪ ማድረግ አይቻልም</string>
+</resources>
diff --git a/java/com/android/dialer/precall/impl/res/values-ar/strings.xml b/java/com/android/dialer/precall/impl/res/values-ar/strings.xml
new file mode 100644
index 0000000..8f44fe8
--- /dev/null
+++ b/java/com/android/dialer/precall/impl/res/values-ar/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">يتعذر إجراء مكالمة بدون إذن الهاتف</string>
+</resources>
diff --git a/java/com/android/dialer/precall/impl/res/values-az/strings.xml b/java/com/android/dialer/precall/impl/res/values-az/strings.xml
new file mode 100644
index 0000000..04f2d66
--- /dev/null
+++ b/java/com/android/dialer/precall/impl/res/values-az/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">Telefon icazəsi olmadan zəng etmək mümkün deyil</string>
+</resources>
diff --git a/java/com/android/dialer/precall/impl/res/values-b+sr+Latn/strings.xml b/java/com/android/dialer/precall/impl/res/values-b+sr+Latn/strings.xml
new file mode 100644
index 0000000..306450c
--- /dev/null
+++ b/java/com/android/dialer/precall/impl/res/values-b+sr+Latn/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">Ne možete da uputite poziv ako ne odobrite dozvolu za telefon</string>
+</resources>
diff --git a/java/com/android/dialer/precall/impl/res/values-be/strings.xml b/java/com/android/dialer/precall/impl/res/values-be/strings.xml
new file mode 100644
index 0000000..e3338f4
--- /dev/null
+++ b/java/com/android/dialer/precall/impl/res/values-be/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">Немагчыма рабіць выклікі без дазволу на карыстанне тэлефонам</string>
+</resources>
diff --git a/java/com/android/dialer/precall/impl/res/values-bg/strings.xml b/java/com/android/dialer/precall/impl/res/values-bg/strings.xml
new file mode 100644
index 0000000..ffe7887
--- /dev/null
+++ b/java/com/android/dialer/precall/impl/res/values-bg/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">За извършване на обаждане е нужно разрешение за достъп до телефона</string>
+</resources>
diff --git a/java/com/android/dialer/precall/impl/res/values-bn/strings.xml b/java/com/android/dialer/precall/impl/res/values-bn/strings.xml
new file mode 100644
index 0000000..abbc75b
--- /dev/null
+++ b/java/com/android/dialer/precall/impl/res/values-bn/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">ফোনের অনুমতি না দিলে কল করা যাবে না</string>
+</resources>
diff --git a/java/com/android/dialer/precall/impl/res/values-bs/strings.xml b/java/com/android/dialer/precall/impl/res/values-bs/strings.xml
new file mode 100644
index 0000000..2c487d4
--- /dev/null
+++ b/java/com/android/dialer/precall/impl/res/values-bs/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">Poziv se ne može uputiti bez odobrenja telefona</string>
+</resources>
diff --git a/java/com/android/dialer/precall/impl/res/values-ca/strings.xml b/java/com/android/dialer/precall/impl/res/values-ca/strings.xml
new file mode 100644
index 0000000..e0ce63d
--- /dev/null
+++ b/java/com/android/dialer/precall/impl/res/values-ca/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">No es pot fer la trucada sense el permís Telèfon</string>
+</resources>
diff --git a/java/com/android/dialer/precall/impl/res/values-cs/strings.xml b/java/com/android/dialer/precall/impl/res/values-cs/strings.xml
new file mode 100644
index 0000000..c4f2f6d
--- /dev/null
+++ b/java/com/android/dialer/precall/impl/res/values-cs/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">Hovor nejde uskutečnit bez oprávnění k použití telefonu</string>
+</resources>
diff --git a/java/com/android/dialer/precall/impl/res/values-da/strings.xml b/java/com/android/dialer/precall/impl/res/values-da/strings.xml
new file mode 100644
index 0000000..ef647c9
--- /dev/null
+++ b/java/com/android/dialer/precall/impl/res/values-da/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">Opkaldet kan ikke foretages uden telefontilladelse</string>
+</resources>
diff --git a/java/com/android/dialer/precall/impl/res/values-de/strings.xml b/java/com/android/dialer/precall/impl/res/values-de/strings.xml
new file mode 100644
index 0000000..e4b6075
--- /dev/null
+++ b/java/com/android/dialer/precall/impl/res/values-de/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">Anruf kann ohne Telefonberechtigung nicht getätigt werden</string>
+</resources>
diff --git a/java/com/android/dialer/precall/impl/res/values-el/strings.xml b/java/com/android/dialer/precall/impl/res/values-el/strings.xml
new file mode 100644
index 0000000..dcb224a
--- /dev/null
+++ b/java/com/android/dialer/precall/impl/res/values-el/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">Δεν είναι δυνατή η κλήση χωρίς άδεια χρήσης του τηλεφώνου</string>
+</resources>
diff --git a/java/com/android/dialer/precall/impl/res/values-en-rAU/strings.xml b/java/com/android/dialer/precall/impl/res/values-en-rAU/strings.xml
new file mode 100644
index 0000000..8d30452
--- /dev/null
+++ b/java/com/android/dialer/precall/impl/res/values-en-rAU/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">Cannot make call without phone permission</string>
+</resources>
diff --git a/java/com/android/dialer/precall/impl/res/values-en-rGB/strings.xml b/java/com/android/dialer/precall/impl/res/values-en-rGB/strings.xml
new file mode 100644
index 0000000..8d30452
--- /dev/null
+++ b/java/com/android/dialer/precall/impl/res/values-en-rGB/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">Cannot make call without phone permission</string>
+</resources>
diff --git a/java/com/android/dialer/precall/impl/res/values-en-rIN/strings.xml b/java/com/android/dialer/precall/impl/res/values-en-rIN/strings.xml
new file mode 100644
index 0000000..8d30452
--- /dev/null
+++ b/java/com/android/dialer/precall/impl/res/values-en-rIN/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">Cannot make call without phone permission</string>
+</resources>
diff --git a/java/com/android/dialer/precall/impl/res/values-es-rUS/strings.xml b/java/com/android/dialer/precall/impl/res/values-es-rUS/strings.xml
new file mode 100644
index 0000000..94c5088
--- /dev/null
+++ b/java/com/android/dialer/precall/impl/res/values-es-rUS/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">No se puede realizar la llamada sin el permiso de acceso al teléfono</string>
+</resources>
diff --git a/java/com/android/dialer/precall/impl/res/values-es/strings.xml b/java/com/android/dialer/precall/impl/res/values-es/strings.xml
new file mode 100644
index 0000000..4073c78
--- /dev/null
+++ b/java/com/android/dialer/precall/impl/res/values-es/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">No se pueden hacer llamadas sin habilitar el permiso de teléfono</string>
+</resources>
diff --git a/java/com/android/dialer/precall/impl/res/values-et/strings.xml b/java/com/android/dialer/precall/impl/res/values-et/strings.xml
new file mode 100644
index 0000000..bbcfa0b
--- /dev/null
+++ b/java/com/android/dialer/precall/impl/res/values-et/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">Ilma telefoni loata ei saa helistada</string>
+</resources>
diff --git a/java/com/android/dialer/precall/impl/res/values-eu/strings.xml b/java/com/android/dialer/precall/impl/res/values-eu/strings.xml
new file mode 100644
index 0000000..4cb93cf
--- /dev/null
+++ b/java/com/android/dialer/precall/impl/res/values-eu/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">Ezin da deitu telefonoa atzitzeko baimenik gabe</string>
+</resources>
diff --git a/java/com/android/dialer/precall/impl/res/values-fa/strings.xml b/java/com/android/dialer/precall/impl/res/values-fa/strings.xml
new file mode 100644
index 0000000..57436e1
--- /dev/null
+++ b/java/com/android/dialer/precall/impl/res/values-fa/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">بدون مجوز دسترسی به تلفن، تماس امکان‌پذیر نیست</string>
+</resources>
diff --git a/java/com/android/dialer/precall/impl/res/values-fi/strings.xml b/java/com/android/dialer/precall/impl/res/values-fi/strings.xml
new file mode 100644
index 0000000..73b8908
--- /dev/null
+++ b/java/com/android/dialer/precall/impl/res/values-fi/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">Puhelua ei voi soittaa ilman puhelimen käyttöoikeutta</string>
+</resources>
diff --git a/java/com/android/dialer/precall/impl/res/values-fr-rCA/strings.xml b/java/com/android/dialer/precall/impl/res/values-fr-rCA/strings.xml
new file mode 100644
index 0000000..d483a88
--- /dev/null
+++ b/java/com/android/dialer/precall/impl/res/values-fr-rCA/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">Impossible de passer un appel sans l\'autorisation d\'accéder au téléphone</string>
+</resources>
diff --git a/java/com/android/dialer/precall/impl/res/values-fr/strings.xml b/java/com/android/dialer/precall/impl/res/values-fr/strings.xml
new file mode 100644
index 0000000..2f29402
--- /dev/null
+++ b/java/com/android/dialer/precall/impl/res/values-fr/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">Impossible de passer l\'appel sans les autorisations requises par l\'application Téléphone</string>
+</resources>
diff --git a/java/com/android/dialer/precall/impl/res/values-gl/strings.xml b/java/com/android/dialer/precall/impl/res/values-gl/strings.xml
new file mode 100644
index 0000000..e8f3d37
--- /dev/null
+++ b/java/com/android/dialer/precall/impl/res/values-gl/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">Non se pode facer ningunha chamada sen habilitar os permisos de teléfono</string>
+</resources>
diff --git a/java/com/android/dialer/precall/impl/res/values-gu/strings.xml b/java/com/android/dialer/precall/impl/res/values-gu/strings.xml
new file mode 100644
index 0000000..6915080
--- /dev/null
+++ b/java/com/android/dialer/precall/impl/res/values-gu/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">ફોનની પરવાનગી વગર કૉલ કરી શકાતો નથી</string>
+</resources>
diff --git a/java/com/android/dialer/precall/impl/res/values-hi/strings.xml b/java/com/android/dialer/precall/impl/res/values-hi/strings.xml
new file mode 100644
index 0000000..35649f7
--- /dev/null
+++ b/java/com/android/dialer/precall/impl/res/values-hi/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">फ़ोन अनुमति के बिना कॉल नहीं किया जा सकता</string>
+</resources>
diff --git a/java/com/android/dialer/precall/impl/res/values-hr/strings.xml b/java/com/android/dialer/precall/impl/res/values-hr/strings.xml
new file mode 100644
index 0000000..8c99aee
--- /dev/null
+++ b/java/com/android/dialer/precall/impl/res/values-hr/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">Poziv se ne može izvršiti bez dopuštenja za telefon</string>
+</resources>
diff --git a/java/com/android/dialer/precall/impl/res/values-hu/strings.xml b/java/com/android/dialer/precall/impl/res/values-hu/strings.xml
new file mode 100644
index 0000000..d8938bc
--- /dev/null
+++ b/java/com/android/dialer/precall/impl/res/values-hu/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">Nem indíthat hívást telefonálási engedély nélkül</string>
+</resources>
diff --git a/java/com/android/dialer/precall/impl/res/values-hy/strings.xml b/java/com/android/dialer/precall/impl/res/values-hy/strings.xml
new file mode 100644
index 0000000..fcf9dba
--- /dev/null
+++ b/java/com/android/dialer/precall/impl/res/values-hy/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">Զանգ կատարելու համար անհրաժեշտ է հեռախոսից օգտվելու թույլտվություն</string>
+</resources>
diff --git a/java/com/android/dialer/precall/impl/res/values-in/strings.xml b/java/com/android/dialer/precall/impl/res/values-in/strings.xml
new file mode 100644
index 0000000..abfa3a3
--- /dev/null
+++ b/java/com/android/dialer/precall/impl/res/values-in/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">Tidak dapat melakukan panggilan tanpa izin menelepon</string>
+</resources>
diff --git a/java/com/android/dialer/precall/impl/res/values-is/strings.xml b/java/com/android/dialer/precall/impl/res/values-is/strings.xml
new file mode 100644
index 0000000..f94db53
--- /dev/null
+++ b/java/com/android/dialer/precall/impl/res/values-is/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">Ekki er hægt að hringja án símaheimildar</string>
+</resources>
diff --git a/java/com/android/dialer/precall/impl/res/values-it/strings.xml b/java/com/android/dialer/precall/impl/res/values-it/strings.xml
new file mode 100644
index 0000000..ae37859
--- /dev/null
+++ b/java/com/android/dialer/precall/impl/res/values-it/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">Non puoi effettuare chiamate senza l\'autorizzazione Telefono.</string>
+</resources>
diff --git a/java/com/android/dialer/precall/impl/res/values-iw/strings.xml b/java/com/android/dialer/precall/impl/res/values-iw/strings.xml
new file mode 100644
index 0000000..e65878e
--- /dev/null
+++ b/java/com/android/dialer/precall/impl/res/values-iw/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">אי אפשר להתקשר בלי להעניק הרשאת גישה לטלפון</string>
+</resources>
diff --git a/java/com/android/dialer/precall/impl/res/values-ja/strings.xml b/java/com/android/dialer/precall/impl/res/values-ja/strings.xml
new file mode 100644
index 0000000..b3a9e3c
--- /dev/null
+++ b/java/com/android/dialer/precall/impl/res/values-ja/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">通話を発信するには、電話へのアクセスを許可する必要があります</string>
+</resources>
diff --git a/java/com/android/dialer/precall/impl/res/values-ka/strings.xml b/java/com/android/dialer/precall/impl/res/values-ka/strings.xml
new file mode 100644
index 0000000..664aa35
--- /dev/null
+++ b/java/com/android/dialer/precall/impl/res/values-ka/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">ტელეფონის ნებართვის გარეშე დარეკვა შეუძლებელია</string>
+</resources>
diff --git a/java/com/android/dialer/precall/impl/res/values-kk/strings.xml b/java/com/android/dialer/precall/impl/res/values-kk/strings.xml
new file mode 100644
index 0000000..bb69d46
--- /dev/null
+++ b/java/com/android/dialer/precall/impl/res/values-kk/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">Телефон рұқсатынсыз қоңырау шалу мүмкін емес</string>
+</resources>
diff --git a/java/com/android/dialer/precall/impl/res/values-km/strings.xml b/java/com/android/dialer/precall/impl/res/values-km/strings.xml
new file mode 100644
index 0000000..106028b
--- /dev/null
+++ b/java/com/android/dialer/precall/impl/res/values-km/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">មិន​អាច​ហៅ​ទូរសព្ទ​ដោយ​មិនមាន​ការអនុញ្ញាត​ក្នុង​ទូរសព្ទ​​បាន​ទេ</string>
+</resources>
diff --git a/java/com/android/dialer/precall/impl/res/values-kn/strings.xml b/java/com/android/dialer/precall/impl/res/values-kn/strings.xml
new file mode 100644
index 0000000..4102266
--- /dev/null
+++ b/java/com/android/dialer/precall/impl/res/values-kn/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">ಫೋನ್‌ ಅನುಮತಿ ಇಲ್ಲದೆ ಕರೆಯನ್ನು ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ</string>
+</resources>
diff --git a/java/com/android/dialer/precall/impl/res/values-ko/strings.xml b/java/com/android/dialer/precall/impl/res/values-ko/strings.xml
new file mode 100644
index 0000000..ec8ccd4
--- /dev/null
+++ b/java/com/android/dialer/precall/impl/res/values-ko/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">통화 권한이 없어 전화를 걸 수 없습니다.</string>
+</resources>
diff --git a/java/com/android/dialer/precall/impl/res/values-ky/strings.xml b/java/com/android/dialer/precall/impl/res/values-ky/strings.xml
new file mode 100644
index 0000000..cc4cccc
--- /dev/null
+++ b/java/com/android/dialer/precall/impl/res/values-ky/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">Телефон колдонмосунан уруксатсыз чала албайсыз</string>
+</resources>
diff --git a/java/com/android/dialer/precall/impl/res/values-lo/strings.xml b/java/com/android/dialer/precall/impl/res/values-lo/strings.xml
new file mode 100644
index 0000000..1937a17
--- /dev/null
+++ b/java/com/android/dialer/precall/impl/res/values-lo/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">ບໍ່ສາມາດໂທໂດຍບໍ່ໄດ້ຮັບສິດອະນຸຍາດໂທລະສັບໄດ້</string>
+</resources>
diff --git a/java/com/android/dialer/precall/impl/res/values-lt/strings.xml b/java/com/android/dialer/precall/impl/res/values-lt/strings.xml
new file mode 100644
index 0000000..a953330
--- /dev/null
+++ b/java/com/android/dialer/precall/impl/res/values-lt/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">Negalima atlikti skambučio be telefono leidimo</string>
+</resources>
diff --git a/java/com/android/dialer/precall/impl/res/values-lv/strings.xml b/java/com/android/dialer/precall/impl/res/values-lv/strings.xml
new file mode 100644
index 0000000..21d7061
--- /dev/null
+++ b/java/com/android/dialer/precall/impl/res/values-lv/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">Nevar veikt zvanu bez atļaujas Tālrunis.</string>
+</resources>
diff --git a/java/com/android/dialer/precall/impl/res/values-mk/strings.xml b/java/com/android/dialer/precall/impl/res/values-mk/strings.xml
new file mode 100644
index 0000000..5798307
--- /dev/null
+++ b/java/com/android/dialer/precall/impl/res/values-mk/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">Не може да се воспоставуваат повици без дозвола за телефон</string>
+</resources>
diff --git a/java/com/android/dialer/precall/impl/res/values-ml/strings.xml b/java/com/android/dialer/precall/impl/res/values-ml/strings.xml
new file mode 100644
index 0000000..33d0bd7
--- /dev/null
+++ b/java/com/android/dialer/precall/impl/res/values-ml/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">ഫോൺ അനുമതിയില്ലാതെ കോൾ ചെയ്യാനാവില്ല</string>
+</resources>
diff --git a/java/com/android/dialer/precall/impl/res/values-mn/strings.xml b/java/com/android/dialer/precall/impl/res/values-mn/strings.xml
new file mode 100644
index 0000000..37b6d96
--- /dev/null
+++ b/java/com/android/dialer/precall/impl/res/values-mn/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">Утасны зөвшөөрөлгүйгээр дуудлага хийх боломжгүй</string>
+</resources>
diff --git a/java/com/android/dialer/precall/impl/res/values-mr/strings.xml b/java/com/android/dialer/precall/impl/res/values-mr/strings.xml
new file mode 100644
index 0000000..e583ce7
--- /dev/null
+++ b/java/com/android/dialer/precall/impl/res/values-mr/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">फोन परवानगीशिवाय कॉल करू नका</string>
+</resources>
diff --git a/java/com/android/dialer/precall/impl/res/values-ms/strings.xml b/java/com/android/dialer/precall/impl/res/values-ms/strings.xml
new file mode 100644
index 0000000..1e53f69
--- /dev/null
+++ b/java/com/android/dialer/precall/impl/res/values-ms/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">Tidak dapat membuat panggilan tanpa kebenaran telefon</string>
+</resources>
diff --git a/java/com/android/dialer/precall/impl/res/values-my/strings.xml b/java/com/android/dialer/precall/impl/res/values-my/strings.xml
new file mode 100644
index 0000000..2703067
--- /dev/null
+++ b/java/com/android/dialer/precall/impl/res/values-my/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">ဖုန်းခွင့်ပြုချက်များမရှိဘဲ ဖုန်းခေါ်ဆိုမှု မပြုလုပ်နိုင်ပါ</string>
+</resources>
diff --git a/java/com/android/dialer/precall/impl/res/values-nb/strings.xml b/java/com/android/dialer/precall/impl/res/values-nb/strings.xml
new file mode 100644
index 0000000..6ef3d82
--- /dev/null
+++ b/java/com/android/dialer/precall/impl/res/values-nb/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">Kan ikke ringe uten telefontillatelse</string>
+</resources>
diff --git a/java/com/android/dialer/precall/impl/res/values-ne/strings.xml b/java/com/android/dialer/precall/impl/res/values-ne/strings.xml
new file mode 100644
index 0000000..d8288e9
--- /dev/null
+++ b/java/com/android/dialer/precall/impl/res/values-ne/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">फोनसम्बन्धी अनुमतिबिना कल गर्न सकिँदैन</string>
+</resources>
diff --git a/java/com/android/dialer/precall/impl/res/values-nl/strings.xml b/java/com/android/dialer/precall/impl/res/values-nl/strings.xml
new file mode 100644
index 0000000..17d7bd2
--- /dev/null
+++ b/java/com/android/dialer/precall/impl/res/values-nl/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">Kan niet bellen zonder telefoonrechten</string>
+</resources>
diff --git a/java/com/android/dialer/precall/impl/res/values-no/strings.xml b/java/com/android/dialer/precall/impl/res/values-no/strings.xml
new file mode 100644
index 0000000..6ef3d82
--- /dev/null
+++ b/java/com/android/dialer/precall/impl/res/values-no/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">Kan ikke ringe uten telefontillatelse</string>
+</resources>
diff --git a/java/com/android/dialer/precall/impl/res/values-pa/strings.xml b/java/com/android/dialer/precall/impl/res/values-pa/strings.xml
new file mode 100644
index 0000000..a844479
--- /dev/null
+++ b/java/com/android/dialer/precall/impl/res/values-pa/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">ਫ਼ੋਨ ਇਜਾਜ਼ਤ ਤੋਂ ਬਿਨਾਂ ਕਾਲ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕਦੀ</string>
+</resources>
diff --git a/java/com/android/dialer/precall/impl/res/values-pl/strings.xml b/java/com/android/dialer/precall/impl/res/values-pl/strings.xml
new file mode 100644
index 0000000..0e9c643
--- /dev/null
+++ b/java/com/android/dialer/precall/impl/res/values-pl/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">Nie można zadzwonić bez uprawnień do korzystania z telefonu</string>
+</resources>
diff --git a/java/com/android/dialer/precall/impl/res/values-pt-rBR/strings.xml b/java/com/android/dialer/precall/impl/res/values-pt-rBR/strings.xml
new file mode 100644
index 0000000..c3d3a83
--- /dev/null
+++ b/java/com/android/dialer/precall/impl/res/values-pt-rBR/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">Não é possível ligar sem a permissão do smartphone</string>
+</resources>
diff --git a/java/com/android/dialer/precall/impl/res/values-pt-rPT/strings.xml b/java/com/android/dialer/precall/impl/res/values-pt-rPT/strings.xml
new file mode 100644
index 0000000..0cdbc6a
--- /dev/null
+++ b/java/com/android/dialer/precall/impl/res/values-pt-rPT/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">Não é possível telefonar sem autorização de telemóvel.</string>
+</resources>
diff --git a/java/com/android/dialer/precall/impl/res/values-pt/strings.xml b/java/com/android/dialer/precall/impl/res/values-pt/strings.xml
new file mode 100644
index 0000000..c3d3a83
--- /dev/null
+++ b/java/com/android/dialer/precall/impl/res/values-pt/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">Não é possível ligar sem a permissão do smartphone</string>
+</resources>
diff --git a/java/com/android/dialer/precall/impl/res/values-ro/strings.xml b/java/com/android/dialer/precall/impl/res/values-ro/strings.xml
new file mode 100644
index 0000000..0f82184
--- /dev/null
+++ b/java/com/android/dialer/precall/impl/res/values-ro/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">Nu se poate apela fără permisiunea telefonului</string>
+</resources>
diff --git a/java/com/android/dialer/precall/impl/res/values-ru/strings.xml b/java/com/android/dialer/precall/impl/res/values-ru/strings.xml
new file mode 100644
index 0000000..8f95502
--- /dev/null
+++ b/java/com/android/dialer/precall/impl/res/values-ru/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">Не удается позвонить: отсутствует разрешение для телефона</string>
+</resources>
diff --git a/java/com/android/dialer/precall/impl/res/values-si/strings.xml b/java/com/android/dialer/precall/impl/res/values-si/strings.xml
new file mode 100644
index 0000000..131d1a3
--- /dev/null
+++ b/java/com/android/dialer/precall/impl/res/values-si/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">දුරකථන අවසරයකින් තොරව ඇමතුම් සිදු කළ නොහැකිය</string>
+</resources>
diff --git a/java/com/android/dialer/precall/impl/res/values-sk/strings.xml b/java/com/android/dialer/precall/impl/res/values-sk/strings.xml
new file mode 100644
index 0000000..0f038f7
--- /dev/null
+++ b/java/com/android/dialer/precall/impl/res/values-sk/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">Hovor sa nedá uskutočniť bez povolenia na používanie telefónu</string>
+</resources>
diff --git a/java/com/android/dialer/precall/impl/res/values-sl/strings.xml b/java/com/android/dialer/precall/impl/res/values-sl/strings.xml
new file mode 100644
index 0000000..b8d099c
--- /dev/null
+++ b/java/com/android/dialer/precall/impl/res/values-sl/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">Brez dovoljenja za telefon ni mogoče opraviti klica</string>
+</resources>
diff --git a/java/com/android/dialer/precall/impl/res/values-sq/strings.xml b/java/com/android/dialer/precall/impl/res/values-sq/strings.xml
new file mode 100644
index 0000000..44ed33e
--- /dev/null
+++ b/java/com/android/dialer/precall/impl/res/values-sq/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">Telefonata nuk mund të kryhet pa lejen e telefonit</string>
+</resources>
diff --git a/java/com/android/dialer/precall/impl/res/values-sr/strings.xml b/java/com/android/dialer/precall/impl/res/values-sr/strings.xml
new file mode 100644
index 0000000..64a6393
--- /dev/null
+++ b/java/com/android/dialer/precall/impl/res/values-sr/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">Не можете да упутите позив ако не одобрите дозволу за телефон</string>
+</resources>
diff --git a/java/com/android/dialer/precall/impl/res/values-sv/strings.xml b/java/com/android/dialer/precall/impl/res/values-sv/strings.xml
new file mode 100644
index 0000000..e39e4f8
--- /dev/null
+++ b/java/com/android/dialer/precall/impl/res/values-sv/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">Det går inte att ringa utan telefonbehörighet</string>
+</resources>
diff --git a/java/com/android/dialer/precall/impl/res/values-sw/strings.xml b/java/com/android/dialer/precall/impl/res/values-sw/strings.xml
new file mode 100644
index 0000000..b1a4d73
--- /dev/null
+++ b/java/com/android/dialer/precall/impl/res/values-sw/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">Huwezi kupiga simu bila ruhusa ya simu</string>
+</resources>
diff --git a/java/com/android/dialer/precall/impl/res/values-ta/strings.xml b/java/com/android/dialer/precall/impl/res/values-ta/strings.xml
new file mode 100644
index 0000000..67c72fc
--- /dev/null
+++ b/java/com/android/dialer/precall/impl/res/values-ta/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">ஃபோன் அனுமதி இல்லாமல் அழைக்க முடியாது</string>
+</resources>
diff --git a/java/com/android/dialer/precall/impl/res/values-te/strings.xml b/java/com/android/dialer/precall/impl/res/values-te/strings.xml
new file mode 100644
index 0000000..d392485
--- /dev/null
+++ b/java/com/android/dialer/precall/impl/res/values-te/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">ఫోన్ అనుమతి లేకుండా కాల్ చేయడం సాధ్యపడదు</string>
+</resources>
diff --git a/java/com/android/dialer/precall/impl/res/values-th/strings.xml b/java/com/android/dialer/precall/impl/res/values-th/strings.xml
new file mode 100644
index 0000000..27289d3
--- /dev/null
+++ b/java/com/android/dialer/precall/impl/res/values-th/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">โทรออกไม่ได้หากไม่มีสิทธิ์เข้าถึงโทรศัพท์</string>
+</resources>
diff --git a/java/com/android/dialer/precall/impl/res/values-tl/strings.xml b/java/com/android/dialer/precall/impl/res/values-tl/strings.xml
new file mode 100644
index 0000000..0bbf59d
--- /dev/null
+++ b/java/com/android/dialer/precall/impl/res/values-tl/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">Hindi makakatawag nang walang pahintulot sa telepono</string>
+</resources>
diff --git a/java/com/android/dialer/precall/impl/res/values-tr/strings.xml b/java/com/android/dialer/precall/impl/res/values-tr/strings.xml
new file mode 100644
index 0000000..c39bb59
--- /dev/null
+++ b/java/com/android/dialer/precall/impl/res/values-tr/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">Telefon izni olmadan telefon edilemez</string>
+</resources>
diff --git a/java/com/android/dialer/precall/impl/res/values-uk/strings.xml b/java/com/android/dialer/precall/impl/res/values-uk/strings.xml
new file mode 100644
index 0000000..fc6779d
--- /dev/null
+++ b/java/com/android/dialer/precall/impl/res/values-uk/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">Ви не можете телефонувати без відповідного дозволу</string>
+</resources>
diff --git a/java/com/android/dialer/precall/impl/res/values-ur/strings.xml b/java/com/android/dialer/precall/impl/res/values-ur/strings.xml
new file mode 100644
index 0000000..aa53e10
--- /dev/null
+++ b/java/com/android/dialer/precall/impl/res/values-ur/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">فون کی اجازت کے بغیر کال نہیں کر سکتے</string>
+</resources>
diff --git a/java/com/android/dialer/precall/impl/res/values-uz/strings.xml b/java/com/android/dialer/precall/impl/res/values-uz/strings.xml
new file mode 100644
index 0000000..a7a9ce3
--- /dev/null
+++ b/java/com/android/dialer/precall/impl/res/values-uz/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">Telefon ruxsatnomasisiz chaqiruvni amalga oshirib bo‘lmaydi</string>
+</resources>
diff --git a/java/com/android/dialer/precall/impl/res/values-vi/strings.xml b/java/com/android/dialer/precall/impl/res/values-vi/strings.xml
new file mode 100644
index 0000000..6ffa304
--- /dev/null
+++ b/java/com/android/dialer/precall/impl/res/values-vi/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">Không thể gọi điện khi không có quyền truy cập điện thoại</string>
+</resources>
diff --git a/java/com/android/dialer/precall/impl/res/values-zh-rCN/strings.xml b/java/com/android/dialer/precall/impl/res/values-zh-rCN/strings.xml
new file mode 100644
index 0000000..c90269b
--- /dev/null
+++ b/java/com/android/dialer/precall/impl/res/values-zh-rCN/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">没有电话使用权限，因此无法拨打电话</string>
+</resources>
diff --git a/java/com/android/dialer/precall/impl/res/values-zh-rHK/strings.xml b/java/com/android/dialer/precall/impl/res/values-zh-rHK/strings.xml
new file mode 100644
index 0000000..f626436
--- /dev/null
+++ b/java/com/android/dialer/precall/impl/res/values-zh-rHK/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">必須有電話權限才能撥打電話</string>
+</resources>
diff --git a/java/com/android/dialer/precall/impl/res/values-zh-rTW/strings.xml b/java/com/android/dialer/precall/impl/res/values-zh-rTW/strings.xml
new file mode 100644
index 0000000..5966f8a
--- /dev/null
+++ b/java/com/android/dialer/precall/impl/res/values-zh-rTW/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">必須授予電話權限才能撥打電話</string>
+</resources>
diff --git a/java/com/android/dialer/precall/impl/res/values-zu/strings.xml b/java/com/android/dialer/precall/impl/res/values-zu/strings.xml
new file mode 100644
index 0000000..66e6e9f
--- /dev/null
+++ b/java/com/android/dialer/precall/impl/res/values-zu/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">Ayikwazi ukwenza ikholi ngaphandle kwemvume yefoni</string>
+</resources>
diff --git a/java/com/android/dialer/precall/impl/res/values/strings.xml b/java/com/android/dialer/precall/impl/res/values/strings.xml
index 0b59607..a920f07 100644
--- a/java/com/android/dialer/precall/impl/res/values/strings.xml
+++ b/java/com/android/dialer/precall/impl/res/values/strings.xml
@@ -14,24 +14,7 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License
   -->
-<resources>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Toast when the user tried to place a call but has revoked phone permission [CHAR_LIMIT=none]  -->
   <string name="pre_call_permission_check_no_phone_permission">Cannot make call without phone permission</string>
-
-  <!-- Title of the dialog to select which SIM to call with before making a call, if the device has
-  multiple SIMs [CHAR LIMIT=40]-->
-  <string name="pre_call_select_phone_account">Choose SIM for this call</string>
-
-  <!-- Checkbox label when selecting a SIM when calling a contact, to use the selected SIM for the
-   same contact and never ask again [CHAR LIMIT=40]-->
-  <string name="pre_call_select_phone_account_remember">Remember this choice</string>
-
-  <!-- Hint text under a SIM when selecting SIM to call, indicating the SIM is on the same carrier
-   as the outgoing call.[CHAR LIMIT=40]-->
-  <string name="pre_call_select_phone_account_hint_intra_carrier">Uses same carrier</string>
-
-  <!-- Hint text under a SIM when selecting SIM to call, indicating user often use the SIM to call
-  the contact.[CHAR LIMIT=40]-->
-  <string name="pre_call_select_phone_account_hint_frequent">Recently used</string>
-
 </resources>
\ No newline at end of file
diff --git a/java/com/android/dialer/precall/impl/res/values/styles.xml b/java/com/android/dialer/precall/impl/res/values/styles.xml
deleted file mode 100644
index dd41265..0000000
--- a/java/com/android/dialer/precall/impl/res/values/styles.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-  -->
-
-<resources>
-  <style name="Theme.PreCall.DialogHolder" parent="DialerThemeBase.NoActionBar">
-    <item name="android:windowBackground">@android:color/transparent</item>
-    <item name="android:windowActivityTransitions">false</item>
-    <item name="android:windowIsTranslucent">true</item>
-
-    <item name="android:statusBarColor">@android:color/transparent</item>
-    <item name="android:navigationBarColor">@android:color/transparent</item>
-    <item name="android:windowDrawsSystemBarBackgrounds">true</item>
-  </style>
-
-</resources>
diff --git a/java/com/android/dialer/preferredsim/PreferredAccountRecorder.java b/java/com/android/dialer/preferredsim/PreferredAccountRecorder.java
new file mode 100644
index 0000000..75f8ad7
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/PreferredAccountRecorder.java
@@ -0,0 +1,145 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.dialer.preferredsim;
+
+import android.content.ContentValues;
+import android.content.Context;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.annotation.WorkerThread;
+import android.telecom.PhoneAccountHandle;
+import com.android.dialer.common.Assert;
+import com.android.dialer.common.concurrent.DialerExecutor.Worker;
+import com.android.dialer.common.concurrent.DialerExecutorComponent;
+import com.android.dialer.logging.DialerImpression;
+import com.android.dialer.logging.Logger;
+import com.android.dialer.preferredsim.PreferredSimFallbackContract.PreferredSim;
+import com.android.dialer.preferredsim.suggestion.SimSuggestionComponent;
+import com.android.dialer.preferredsim.suggestion.SuggestionProvider.Suggestion;
+
+/** Records selected preferred SIM and reports related metric to the suggestion provider */
+public class PreferredAccountRecorder {
+
+  @Nullable private final String number;
+  @Nullable private final Suggestion suggestion;
+  @Nullable private final String dataId;
+
+  public PreferredAccountRecorder(
+      @Nullable String number, @Nullable Suggestion suggestion, @Nullable String dataId) {
+    this.number = number;
+    this.suggestion = suggestion;
+    this.dataId = dataId;
+  }
+
+  /**
+   * Record the result from {@link
+   * com.android.contacts.common.widget.SelectPhoneAccountDialogFragment.SelectPhoneAccountListener#onPhoneAccountSelected}
+   */
+  public void record(
+      Context context, PhoneAccountHandle selectedAccountHandle, boolean setDefault) {
+
+    if (suggestion != null) {
+      if (suggestion.phoneAccountHandle.equals(selectedAccountHandle)) {
+        Logger.get(context)
+            .logImpression(DialerImpression.Type.DUAL_SIM_SELECTION_SUGGESTED_SIM_SELECTED);
+      } else {
+        Logger.get(context)
+            .logImpression(DialerImpression.Type.DUAL_SIM_SELECTION_NON_SUGGESTED_SIM_SELECTED);
+      }
+    }
+
+    if (dataId != null && setDefault) {
+      Logger.get(context).logImpression(DialerImpression.Type.DUAL_SIM_SELECTION_PREFERRED_SET);
+      DialerExecutorComponent.get(context)
+          .dialerExecutorFactory()
+          .createNonUiTaskBuilder(new WritePreferredAccountWorker())
+          .build()
+          .executeParallel(
+              new WritePreferredAccountWorkerInput(context, dataId, selectedAccountHandle));
+    }
+    if (number != null) {
+      DialerExecutorComponent.get(context)
+          .dialerExecutorFactory()
+          .createNonUiTaskBuilder(
+              new UserSelectionReporter(selectedAccountHandle, number, setDefault))
+          .build()
+          .executeParallel(context);
+    }
+  }
+
+  private static class UserSelectionReporter implements Worker<Context, Void> {
+
+    private final String number;
+    private final PhoneAccountHandle phoneAccountHandle;
+    private final boolean remember;
+
+    public UserSelectionReporter(
+        @NonNull PhoneAccountHandle phoneAccountHandle, @Nullable String number, boolean remember) {
+      this.phoneAccountHandle = Assert.isNotNull(phoneAccountHandle);
+      this.number = Assert.isNotNull(number);
+      this.remember = remember;
+    }
+
+    @Nullable
+    @Override
+    public Void doInBackground(@NonNull Context context) throws Throwable {
+      SimSuggestionComponent.get(context)
+          .getSuggestionProvider()
+          .reportUserSelection(context, number, phoneAccountHandle, remember);
+      return null;
+    }
+  }
+
+  private static class WritePreferredAccountWorkerInput {
+    private final Context context;
+    private final String dataId;
+    private final PhoneAccountHandle phoneAccountHandle;
+
+    WritePreferredAccountWorkerInput(
+        @NonNull Context context,
+        @NonNull String dataId,
+        @NonNull PhoneAccountHandle phoneAccountHandle) {
+      this.context = Assert.isNotNull(context);
+      this.dataId = Assert.isNotNull(dataId);
+      this.phoneAccountHandle = Assert.isNotNull(phoneAccountHandle);
+    }
+  }
+
+  private static class WritePreferredAccountWorker
+      implements Worker<WritePreferredAccountWorkerInput, Void> {
+
+    @Nullable
+    @Override
+    @WorkerThread
+    public Void doInBackground(WritePreferredAccountWorkerInput input) throws Throwable {
+      ContentValues values = new ContentValues();
+      values.put(
+          PreferredSim.PREFERRED_PHONE_ACCOUNT_COMPONENT_NAME,
+          input.phoneAccountHandle.getComponentName().flattenToString());
+      values.put(PreferredSim.PREFERRED_PHONE_ACCOUNT_ID, input.phoneAccountHandle.getId());
+      input
+          .context
+          .getContentResolver()
+          .update(
+              PreferredSimFallbackContract.CONTENT_URI,
+              values,
+              PreferredSim.DATA_ID + " = ?",
+              new String[] {String.valueOf(input.dataId)});
+      return null;
+    }
+  }
+}
diff --git a/java/com/android/dialer/preferredsim/PreferredAccountWorker.java b/java/com/android/dialer/preferredsim/PreferredAccountWorker.java
new file mode 100644
index 0000000..965d088
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/PreferredAccountWorker.java
@@ -0,0 +1,95 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.dialer.preferredsim;
+
+import android.telecom.PhoneAccountHandle;
+import com.android.contacts.common.widget.SelectPhoneAccountDialogOptions;
+import com.android.dialer.preferredsim.suggestion.SuggestionProvider.Suggestion;
+import com.google.auto.value.AutoValue;
+import com.google.common.base.Optional;
+import com.google.common.util.concurrent.ListenableFuture;
+import java.util.List;
+
+/** Query a preferred SIM to make a call with. */
+@SuppressWarnings({"missingPermission", "Guava"})
+public interface PreferredAccountWorker {
+
+  /** Result of the query. */
+  @AutoValue
+  abstract class Result {
+
+    /**
+     * The phone account to dial with for the number. Absent if no account can be auto selected. If
+     * absent, {@link #getSelectedPhoneAccountHandle()} will be present to show a dialog for the
+     * user to manually select.
+     */
+    public abstract Optional<PhoneAccountHandle> getSelectedPhoneAccountHandle();
+
+    /**
+     * The {@link SelectPhoneAccountDialogOptions} that should be used to show the selection dialog.
+     * Absent if {@link #getSelectedPhoneAccountHandle()} is present, which should be used directly
+     * instead of asking the user.
+     */
+    public abstract Optional<SelectPhoneAccountDialogOptions.Builder> getDialogOptionsBuilder();
+
+    /**
+     * {@link android.provider.ContactsContract.Data#_ID} of the row matching the number. If the
+     * preferred account is to be set it should be stored in this row
+     */
+    public abstract Optional<String> getDataId();
+
+    public abstract Optional<Suggestion> getSuggestion();
+
+    public static Builder builder(PhoneAccountHandle selectedPhoneAccountHandle) {
+      return new AutoValue_PreferredAccountWorker_Result.Builder()
+          .setSelectedPhoneAccountHandle(selectedPhoneAccountHandle);
+    }
+
+    public static Builder builder(SelectPhoneAccountDialogOptions.Builder optionsBuilder) {
+      return new AutoValue_PreferredAccountWorker_Result.Builder()
+          .setDialogOptionsBuilder(optionsBuilder);
+    }
+
+    /** For implementations of {@link PreferredAccountWorker} only. */
+    @AutoValue.Builder
+    public abstract static class Builder {
+
+      abstract Builder setSelectedPhoneAccountHandle(PhoneAccountHandle phoneAccountHandle);
+
+      public abstract Builder setDataId(String dataId);
+
+      abstract Builder setDialogOptionsBuilder(
+          SelectPhoneAccountDialogOptions.Builder optionsBuilder);
+
+      public abstract Builder setSuggestion(Suggestion suggestion);
+
+      public abstract Result build();
+    }
+  }
+
+  /**
+   * @return a {@link SelectPhoneAccountDialogOptions} for a dialog to select SIM for voicemail call
+   */
+  SelectPhoneAccountDialogOptions getVoicemailDialogOptions();
+
+  /**
+   * Return {@link Result} for the best {@link PhoneAccountHandle} among {@code candidates} to call
+   * the number with. If none are eligible, a {@link SelectPhoneAccountDialogOptions} will be
+   * provided to show a dialog for the user to manually select.
+   */
+  ListenableFuture<Result> selectAccount(String phoneNumber, List<PhoneAccountHandle> candidates);
+}
diff --git a/java/com/android/dialer/preferredsim/PreferredSimComponent.java b/java/com/android/dialer/preferredsim/PreferredSimComponent.java
new file mode 100644
index 0000000..b8d7fa1
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/PreferredSimComponent.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.dialer.preferredsim;
+
+import android.content.Context;
+import com.android.dialer.inject.HasRootComponent;
+import dagger.Subcomponent;
+
+/** Component for preferred SIM */
+@Subcomponent
+public abstract class PreferredSimComponent {
+  public abstract PreferredAccountWorker preferredAccountWorker();
+
+  public static PreferredSimComponent get(Context context) {
+    return ((HasComponent) ((HasRootComponent) context.getApplicationContext()).component())
+        .preferredSimComponent();
+  }
+
+  /** Used to refer to the root application component. */
+  public interface HasComponent {
+    PreferredSimComponent preferredSimComponent();
+  }
+}
diff --git a/java/com/android/dialer/preferredsim/PreferredSimModule.java b/java/com/android/dialer/preferredsim/PreferredSimModule.java
new file mode 100644
index 0000000..bdc6a5a
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/PreferredSimModule.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.dialer.preferredsim;
+
+import com.android.dialer.preferredsim.impl.PreferredAccountWorkerImpl;
+import dagger.Binds;
+import dagger.Module;
+
+/** Module for preferred SIM */
+@Module
+public abstract class PreferredSimModule {
+
+  @Binds
+  public abstract PreferredAccountWorker to(PreferredAccountWorkerImpl impl);
+}
diff --git a/java/com/android/dialer/preferredsim/impl/AndroidManifest.xml b/java/com/android/dialer/preferredsim/impl/AndroidManifest.xml
index e21598f..e6f932e 100644
--- a/java/com/android/dialer/preferredsim/impl/AndroidManifest.xml
+++ b/java/com/android/dialer/preferredsim/impl/AndroidManifest.xml
@@ -14,7 +14,7 @@
  ~ limitations under the License
  -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.dialer.preferredsim">
+    package="com.android.dialer.preferredsim.impl">
 
   <application>
 
@@ -22,7 +22,7 @@
         android:authorities="com.android.dialer.preferredsimfallback"
         android:exported="true"
         android:multiprocess="false"
-        android:name=".impl.PreferredSimFallbackProvider"
+        android:name=".PreferredSimFallbackProvider"
         android:readPermission="android.permission.READ_CONTACTS"
         android:writePermission="android.permission.WRITE_CONTACTS"/>
 
diff --git a/java/com/android/dialer/preferredsim/impl/PreferredAccountWorkerImpl.java b/java/com/android/dialer/preferredsim/impl/PreferredAccountWorkerImpl.java
new file mode 100644
index 0000000..ffd98f4
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/impl/PreferredAccountWorkerImpl.java
@@ -0,0 +1,437 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.dialer.preferredsim.impl;
+
+import android.content.ContentResolver;
+import android.content.ContentUris;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.database.Cursor;
+import android.net.Uri;
+import android.provider.ContactsContract.Contacts;
+import android.provider.ContactsContract.Data;
+import android.provider.ContactsContract.PhoneLookup;
+import android.provider.ContactsContract.QuickContact;
+import android.provider.ContactsContract.RawContacts;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.annotation.VisibleForTesting;
+import android.support.annotation.WorkerThread;
+import android.telecom.PhoneAccount;
+import android.telecom.PhoneAccountHandle;
+import android.telecom.TelecomManager;
+import android.text.TextUtils;
+import com.android.contacts.common.widget.SelectPhoneAccountDialogOptions;
+import com.android.contacts.common.widget.SelectPhoneAccountDialogOptionsUtil;
+import com.android.dialer.activecalls.ActiveCallInfo;
+import com.android.dialer.activecalls.ActiveCallsComponent;
+import com.android.dialer.common.Assert;
+import com.android.dialer.common.LogUtil;
+import com.android.dialer.common.concurrent.Annotations.BackgroundExecutor;
+import com.android.dialer.configprovider.ConfigProviderComponent;
+import com.android.dialer.inject.ApplicationContext;
+import com.android.dialer.logging.DialerImpression.Type;
+import com.android.dialer.logging.Logger;
+import com.android.dialer.preferredsim.PreferredAccountUtil;
+import com.android.dialer.preferredsim.PreferredAccountWorker;
+import com.android.dialer.preferredsim.PreferredAccountWorker.Result.Builder;
+import com.android.dialer.preferredsim.PreferredSimFallbackContract;
+import com.android.dialer.preferredsim.PreferredSimFallbackContract.PreferredSim;
+import com.android.dialer.preferredsim.suggestion.SimSuggestionComponent;
+import com.android.dialer.preferredsim.suggestion.SuggestionProvider;
+import com.android.dialer.preferredsim.suggestion.SuggestionProvider.Suggestion;
+import com.android.dialer.util.PermissionsUtil;
+import com.google.common.base.Optional;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.util.concurrent.ListenableFuture;
+import com.google.common.util.concurrent.ListeningExecutorService;
+import java.util.List;
+import java.util.Objects;
+import javax.inject.Inject;
+
+/** Implements {@link PreferredAccountWorker}. */
+@SuppressWarnings({"missingPermission", "Guava"})
+public class PreferredAccountWorkerImpl implements PreferredAccountWorker {
+
+  private final Context appContext;
+  private final ListeningExecutorService backgroundExecutor;
+
+  @VisibleForTesting
+  public static final String METADATA_SUPPORTS_PREFERRED_SIM =
+      "supports_per_number_preferred_account";
+
+  @Inject
+  public PreferredAccountWorkerImpl(
+      @ApplicationContext Context appContext,
+      @BackgroundExecutor ListeningExecutorService backgroundExecutor) {
+    this.appContext = appContext;
+    this.backgroundExecutor = backgroundExecutor;
+  }
+
+  @Override
+  public SelectPhoneAccountDialogOptions getVoicemailDialogOptions() {
+    return SelectPhoneAccountDialogOptionsUtil.builderWithAccounts(
+            appContext.getSystemService(TelecomManager.class).getCallCapablePhoneAccounts())
+        .setTitle(R.string.pre_call_select_phone_account)
+        .setCanSetDefault(false)
+        .build();
+  }
+
+  @Override
+  public ListenableFuture<Result> selectAccount(
+      String phoneNumber, List<PhoneAccountHandle> candidates) {
+    return backgroundExecutor.submit(() -> doInBackground(phoneNumber, candidates));
+  }
+
+  private Result doInBackground(String phoneNumber, List<PhoneAccountHandle> candidates) {
+
+    Optional<String> dataId = getDataId(phoneNumber);
+    if (dataId.isPresent()) {
+      Optional<PhoneAccountHandle> preferred = getPreferredAccount(appContext, dataId.get());
+      if (preferred.isPresent()) {
+        return usePreferredSim(preferred.get(), candidates, dataId.get());
+      }
+    }
+
+    PhoneAccountHandle defaultPhoneAccount =
+        appContext
+            .getSystemService(TelecomManager.class)
+            .getDefaultOutgoingPhoneAccount(PhoneAccount.SCHEME_TEL);
+    if (defaultPhoneAccount != null) {
+      return useDefaultSim(defaultPhoneAccount, candidates, dataId.orNull());
+    }
+
+    Optional<Suggestion> suggestion =
+        SimSuggestionComponent.get(appContext)
+            .getSuggestionProvider()
+            .getSuggestion(appContext, phoneNumber);
+    if (suggestion.isPresent() && suggestion.get().shouldAutoSelect) {
+      return useSuggestedSim(suggestion.get(), candidates, dataId.orNull());
+    }
+
+    Builder resultBuilder =
+        Result.builder(
+            createDialogOptionsBuilder(candidates, dataId.orNull(), suggestion.orNull()));
+    if (suggestion.isPresent()) {
+      resultBuilder.setSuggestion(suggestion.get());
+    }
+    if (dataId.isPresent()) {
+      resultBuilder.setDataId(dataId.get());
+    }
+    return resultBuilder.build();
+  }
+
+  private Result usePreferredSim(
+      PhoneAccountHandle preferred, List<PhoneAccountHandle> candidates, String dataId) {
+    Builder resultBuilder;
+    if (isSelectable(preferred)) {
+      Logger.get(appContext).logImpression(Type.DUAL_SIM_SELECTION_PREFERRED_USED);
+      resultBuilder = Result.builder(preferred);
+    } else {
+      Logger.get(appContext).logImpression(Type.DUAL_SIM_SELECTION_PREFERRED_NOT_SELECTABLE);
+      LogUtil.i("CallingAccountSelector.usePreferredAccount", "preferred account not selectable");
+      resultBuilder = Result.builder(createDialogOptionsBuilder(candidates, dataId, null));
+    }
+    resultBuilder.setDataId(dataId);
+    return resultBuilder.build();
+  }
+
+  private Result useDefaultSim(
+      PhoneAccountHandle defaultPhoneAccount,
+      List<PhoneAccountHandle> candidates,
+      @Nullable String dataId) {
+    if (isSelectable(defaultPhoneAccount)) {
+      Logger.get(appContext).logImpression(Type.DUAL_SIM_SELECTION_GLOBAL_USED);
+      return Result.builder(defaultPhoneAccount).build();
+    } else {
+      Logger.get(appContext).logImpression(Type.DUAL_SIM_SELECTION_GLOBAL_NOT_SELECTABLE);
+      LogUtil.i("CallingAccountSelector.usePreferredAccount", "global account not selectable");
+      return Result.builder(createDialogOptionsBuilder(candidates, dataId, null)).build();
+    }
+  }
+
+  private Result useSuggestedSim(
+      Suggestion suggestion, List<PhoneAccountHandle> candidates, @Nullable String dataId) {
+    Builder resultBuilder;
+    PhoneAccountHandle suggestedPhoneAccount = suggestion.phoneAccountHandle;
+    if (isSelectable(suggestedPhoneAccount)) {
+      resultBuilder = Result.builder(suggestedPhoneAccount);
+      Logger.get(appContext).logImpression(Type.DUAL_SIM_SELECTION_SUGGESTION_AUTO_SELECTED);
+    } else {
+      Logger.get(appContext).logImpression(Type.DUAL_SIM_SELECTION_SUGGESTION_AUTO_NOT_SELECTABLE);
+      LogUtil.i("CallingAccountSelector.usePreferredAccount", "global account not selectable");
+      resultBuilder = Result.builder(createDialogOptionsBuilder(candidates, dataId, suggestion));
+      return resultBuilder.build();
+    }
+    resultBuilder.setSuggestion(suggestion);
+    return resultBuilder.build();
+  }
+
+  SelectPhoneAccountDialogOptions.Builder createDialogOptionsBuilder(
+      List<PhoneAccountHandle> candidates,
+      @Nullable String dataId,
+      @Nullable Suggestion suggestion) {
+    Logger.get(appContext).logImpression(Type.DUAL_SIM_SELECTION_SHOWN);
+    if (dataId != null) {
+      Logger.get(appContext).logImpression(Type.DUAL_SIM_SELECTION_IN_CONTACTS);
+    }
+    if (suggestion != null) {
+      Logger.get(appContext).logImpression(Type.DUAL_SIM_SELECTION_SUGGESTION_AVAILABLE);
+      switch (suggestion.reason) {
+        case INTRA_CARRIER:
+          Logger.get(appContext).logImpression(Type.DUAL_SIM_SELECTION_SUGGESTED_CARRIER);
+          break;
+        case FREQUENT:
+          Logger.get(appContext).logImpression(Type.DUAL_SIM_SELECTION_SUGGESTED_FREQUENCY);
+          break;
+        default:
+      }
+    }
+    SelectPhoneAccountDialogOptions.Builder optionsBuilder =
+        SelectPhoneAccountDialogOptions.newBuilder()
+            .setTitle(R.string.pre_call_select_phone_account)
+            .setCanSetDefault(dataId != null)
+            .setSetDefaultLabel(R.string.pre_call_select_phone_account_remember);
+
+    for (PhoneAccountHandle phoneAccountHandle : candidates) {
+      SelectPhoneAccountDialogOptions.Entry.Builder entryBuilder =
+          SelectPhoneAccountDialogOptions.Entry.newBuilder();
+      SelectPhoneAccountDialogOptionsUtil.setPhoneAccountHandle(entryBuilder, phoneAccountHandle);
+      if (isSelectable(phoneAccountHandle)) {
+        Optional<String> hint =
+            SuggestionProvider.getHint(appContext, phoneAccountHandle, suggestion);
+        if (hint.isPresent()) {
+          entryBuilder.setHint(hint.get());
+        }
+      } else {
+        entryBuilder.setEnabled(false);
+        Optional<String> activeCallLabel = getActiveCallLabel();
+        if (activeCallLabel.isPresent()) {
+          entryBuilder.setHint(
+              appContext.getString(
+                  R.string.pre_call_select_phone_account_hint_other_sim_in_use,
+                  activeCallLabel.get()));
+        }
+      }
+      optionsBuilder.addEntries(entryBuilder);
+    }
+
+    return optionsBuilder;
+  }
+
+  @WorkerThread
+  @NonNull
+  private Optional<String> getDataId(@Nullable String phoneNumber) {
+    Assert.isWorkerThread();
+
+    if (!isPreferredSimEnabled(appContext)) {
+      return Optional.absent();
+    }
+    if (!PermissionsUtil.hasContactsReadPermissions(appContext)) {
+      LogUtil.i("PreferredAccountWorker.doInBackground", "missing READ_CONTACTS permission");
+      return Optional.absent();
+    }
+
+    if (TextUtils.isEmpty(phoneNumber)) {
+      return Optional.absent();
+    }
+    try (Cursor cursor =
+        appContext
+            .getContentResolver()
+            .query(
+                Uri.withAppendedPath(PhoneLookup.CONTENT_FILTER_URI, Uri.encode(phoneNumber)),
+                new String[] {PhoneLookup.DATA_ID},
+                null,
+                null,
+                null)) {
+      if (cursor == null) {
+        return Optional.absent();
+      }
+      ImmutableSet<String> validAccountTypes =
+          PreferredAccountUtil.getValidAccountTypes(appContext);
+      String result = null;
+      while (cursor.moveToNext()) {
+        Optional<String> accountType =
+            getAccountType(appContext.getContentResolver(), cursor.getLong(0));
+        if (accountType.isPresent() && !validAccountTypes.contains(accountType.get())) {
+          // Empty accountType is treated as writable
+          LogUtil.i("CallingAccountSelector.getDataId", "ignoring non-writable " + accountType);
+          continue;
+        }
+        if (result != null && !result.equals(cursor.getString(0))) {
+          // TODO(twyen): if there are multiple entries attempt to grab from the contact that
+          // initiated the call.
+          LogUtil.i("CallingAccountSelector.getDataId", "lookup result not unique, ignoring");
+          return Optional.absent();
+        }
+        result = cursor.getString(0);
+      }
+      return Optional.fromNullable(result);
+    }
+  }
+
+  @WorkerThread
+  private static Optional<String> getAccountType(ContentResolver contentResolver, long dataId) {
+    Assert.isWorkerThread();
+    Optional<Long> rawContactId = getRawContactId(contentResolver, dataId);
+    if (!rawContactId.isPresent()) {
+      return Optional.absent();
+    }
+    try (Cursor cursor =
+        contentResolver.query(
+            ContentUris.withAppendedId(RawContacts.CONTENT_URI, rawContactId.get()),
+            new String[] {RawContacts.ACCOUNT_TYPE},
+            null,
+            null,
+            null)) {
+      if (cursor == null || !cursor.moveToFirst()) {
+        return Optional.absent();
+      }
+      return Optional.fromNullable(cursor.getString(0));
+    }
+  }
+
+  @WorkerThread
+  private static Optional<Long> getRawContactId(ContentResolver contentResolver, long dataId) {
+    Assert.isWorkerThread();
+    try (Cursor cursor =
+        contentResolver.query(
+            ContentUris.withAppendedId(Data.CONTENT_URI, dataId),
+            new String[] {Data.RAW_CONTACT_ID},
+            null,
+            null,
+            null)) {
+      if (cursor == null || !cursor.moveToFirst()) {
+        return Optional.absent();
+      }
+      return Optional.of(cursor.getLong(0));
+    }
+  }
+
+  @WorkerThread
+  @NonNull
+  private static Optional<PhoneAccountHandle> getPreferredAccount(
+      @NonNull Context context, @NonNull String dataId) {
+    Assert.isWorkerThread();
+    Assert.isNotNull(dataId);
+    try (Cursor cursor =
+        context
+            .getContentResolver()
+            .query(
+                PreferredSimFallbackContract.CONTENT_URI,
+                new String[] {
+                  PreferredSim.PREFERRED_PHONE_ACCOUNT_COMPONENT_NAME,
+                  PreferredSim.PREFERRED_PHONE_ACCOUNT_ID
+                },
+                PreferredSim.DATA_ID + " = ?",
+                new String[] {dataId},
+                null)) {
+      if (cursor == null) {
+        return Optional.absent();
+      }
+      if (!cursor.moveToFirst()) {
+        return Optional.absent();
+      }
+      return PreferredAccountUtil.getValidPhoneAccount(
+          context, cursor.getString(0), cursor.getString(1));
+    }
+  }
+
+  @WorkerThread
+  private static boolean isPreferredSimEnabled(Context context) {
+    Assert.isWorkerThread();
+    if (!ConfigProviderComponent.get(context)
+        .getConfigProvider()
+        .getBoolean("preferred_sim_enabled", true)) {
+      return false;
+    }
+
+    Intent quickContactIntent = getQuickContactIntent();
+    ResolveInfo resolveInfo =
+        context
+            .getPackageManager()
+            .resolveActivity(quickContactIntent, PackageManager.GET_META_DATA);
+    if (resolveInfo == null
+        || resolveInfo.activityInfo == null
+        || resolveInfo.activityInfo.applicationInfo == null
+        || resolveInfo.activityInfo.applicationInfo.metaData == null) {
+      LogUtil.e("CallingAccountSelector.isPreferredSimEnabled", "cannot resolve quick contact app");
+      return false;
+    }
+    if (!resolveInfo.activityInfo.applicationInfo.metaData.getBoolean(
+        METADATA_SUPPORTS_PREFERRED_SIM, false)) {
+      LogUtil.i(
+          "CallingAccountSelector.isPreferredSimEnabled",
+          "system contacts does not support preferred SIM");
+      return false;
+    }
+    return true;
+  }
+
+  @VisibleForTesting
+  public static Intent getQuickContactIntent() {
+    Intent intent = new Intent(QuickContact.ACTION_QUICK_CONTACT);
+    intent.addCategory(Intent.CATEGORY_DEFAULT);
+    intent.setData(Contacts.CONTENT_URI.buildUpon().appendPath("1").build());
+    return intent;
+  }
+
+  /**
+   * Most devices are DSDS (dual SIM dual standby) which only one SIM can have active calls at a
+   * time. TODO(twyen): support other dual SIM modes when the API is exposed.
+   */
+  private boolean isSelectable(PhoneAccountHandle phoneAccountHandle) {
+    ImmutableList<ActiveCallInfo> activeCalls =
+        ActiveCallsComponent.get(appContext).activeCalls().getActiveCalls();
+    if (activeCalls.isEmpty()) {
+      return true;
+    }
+    for (ActiveCallInfo activeCall : activeCalls) {
+      if (Objects.equals(phoneAccountHandle, activeCall.phoneAccountHandle().orNull())) {
+        return true;
+      }
+    }
+    return false;
+  }
+
+  private Optional<String> getActiveCallLabel() {
+    ImmutableList<ActiveCallInfo> activeCalls =
+        ActiveCallsComponent.get(appContext).activeCalls().getActiveCalls();
+
+    if (activeCalls.isEmpty()) {
+      LogUtil.e("CallingAccountSelector.getActiveCallLabel", "active calls no longer exist");
+      return Optional.absent();
+    }
+    ActiveCallInfo activeCall = activeCalls.get(0);
+    if (!activeCall.phoneAccountHandle().isPresent()) {
+      LogUtil.e("CallingAccountSelector.getActiveCallLabel", "active call has no phone account");
+      return Optional.absent();
+    }
+    PhoneAccount phoneAccount =
+        appContext
+            .getSystemService(TelecomManager.class)
+            .getPhoneAccount(activeCall.phoneAccountHandle().get());
+    if (phoneAccount == null) {
+      LogUtil.e("CallingAccountSelector.getActiveCallLabel", "phone account not found");
+      return Optional.absent();
+    }
+    return Optional.of(phoneAccount.getLabel().toString());
+  }
+}
diff --git a/java/com/android/dialer/preferredsim/impl/PreferredSimFallbackProvider.java b/java/com/android/dialer/preferredsim/impl/PreferredSimFallbackProvider.java
index 2263e9e..515ed96 100644
--- a/java/com/android/dialer/preferredsim/impl/PreferredSimFallbackProvider.java
+++ b/java/com/android/dialer/preferredsim/impl/PreferredSimFallbackProvider.java
@@ -21,12 +21,14 @@
 import android.content.ContentValues;
 import android.content.pm.PackageManager;
 import android.database.Cursor;
+import android.database.sqlite.SQLiteQueryBuilder;
 import android.net.Uri;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.text.TextUtils;
 import com.android.dialer.preferredsim.PreferredSimFallbackContract;
 import com.android.dialer.preferredsim.PreferredSimFallbackContract.PreferredSim;
+import com.google.common.collect.ImmutableMap;
 
 /**
  * Content provider for preferred SIM columns that is only available in ContactsProvider after P.
@@ -39,6 +41,15 @@
 
   private static final String UPDATE_ID_SELECTION = PreferredSim.DATA_ID + " = ?";
 
+  private static final ImmutableMap<String, String> PROJECTION_MAP =
+      ImmutableMap.of(
+          PreferredSim.DATA_ID,
+          PreferredSim.DATA_ID,
+          PreferredSim.PREFERRED_PHONE_ACCOUNT_COMPONENT_NAME,
+          PreferredSim.PREFERRED_PHONE_ACCOUNT_COMPONENT_NAME,
+          PreferredSim.PREFERRED_PHONE_ACCOUNT_ID,
+          PreferredSim.PREFERRED_PHONE_ACCOUNT_ID);
+
   private PreferredSimDatabaseHelper databaseHelper;
 
   @Override
@@ -56,16 +67,18 @@
       @Nullable String[] selectionArgs,
       @Nullable String sortOrder) {
     checkReadContactsPermission();
-    return databaseHelper
-        .getReadableDatabase()
-        .query(
-            PreferredSimDatabaseHelper.TABLE,
-            projection,
-            selection,
-            selectionArgs,
-            null,
-            null,
-            sortOrder);
+    SQLiteQueryBuilder queryBuilder = new SQLiteQueryBuilder();
+    queryBuilder.setStrict(true);
+    queryBuilder.setProjectionMap(PROJECTION_MAP);
+    queryBuilder.setTables(PreferredSimDatabaseHelper.TABLE);
+    return queryBuilder.query(
+        databaseHelper.getReadableDatabase(),
+        projection,
+        selection,
+        selectionArgs,
+        null,
+        null,
+        sortOrder);
   }
 
   @Nullable
diff --git a/java/com/android/dialer/preferredsim/impl/res/values-af/strings.xml b/java/com/android/dialer/preferredsim/impl/res/values-af/strings.xml
new file mode 100644
index 0000000..15710f3
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/impl/res/values-af/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">Kan nie bel sonder foontoestemming nie</string>
+  <string name="pre_call_select_phone_account">Kies SIM vir hierdie oproep</string>
+  <string name="pre_call_select_phone_account_remember">Onthou hierdie keuse</string>
+  <string name="pre_call_select_phone_account_hint_other_sim_in_use">Nie beskikbaar tydens die gebruik van %1$s nie</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/impl/res/values-am/strings.xml b/java/com/android/dialer/preferredsim/impl/res/values-am/strings.xml
new file mode 100644
index 0000000..9bac07d
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/impl/res/values-am/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">ያለ ስልክ ፈቃድ ጥሪ ማድረግ አይቻልም</string>
+  <string name="pre_call_select_phone_account">ለዚህ ጥሪ ሲም ይምረጡ</string>
+  <string name="pre_call_select_phone_account_remember">ይህን ምርጫ አስታውስ</string>
+  <string name="pre_call_select_phone_account_hint_other_sim_in_use">%1$s በሚጠቀሙ ጊዜ አይገኝም</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/impl/res/values-ar/strings.xml b/java/com/android/dialer/preferredsim/impl/res/values-ar/strings.xml
new file mode 100644
index 0000000..2d78f75
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/impl/res/values-ar/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">يتعذر إجراء مكالمة بدون إذن الهاتف</string>
+  <string name="pre_call_select_phone_account">‏اختيار شريحة SIM لهذه المكالمة</string>
+  <string name="pre_call_select_phone_account_remember">تذكر هذا الاختيار</string>
+  <string name="pre_call_select_phone_account_hint_other_sim_in_use">غير متوفر أثناء استخدام %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/impl/res/values-az/strings.xml b/java/com/android/dialer/preferredsim/impl/res/values-az/strings.xml
new file mode 100644
index 0000000..5ebf9ad
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/impl/res/values-az/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">Telefon icazəsi olmadan zəng etmək mümkün deyil</string>
+  <string name="pre_call_select_phone_account">Bu zəng üçün SIM seçin</string>
+  <string name="pre_call_select_phone_account_remember">Bu seçimi yadda saxlayın</string>
+  <string name="pre_call_select_phone_account_hint_other_sim_in_use">%1$s istifadə edərkən əlçatan deyil</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/impl/res/values-b+sr+Latn/strings.xml b/java/com/android/dialer/preferredsim/impl/res/values-b+sr+Latn/strings.xml
new file mode 100644
index 0000000..9a09a28
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/impl/res/values-b+sr+Latn/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">Ne možete da uputite poziv ako ne odobrite dozvolu za telefon</string>
+  <string name="pre_call_select_phone_account">Izaberite SIM za ovaj poziv</string>
+  <string name="pre_call_select_phone_account_remember">Zapamti ovaj izbor</string>
+  <string name="pre_call_select_phone_account_hint_other_sim_in_use">Nije dostupno dok koristite %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/impl/res/values-be/strings.xml b/java/com/android/dialer/preferredsim/impl/res/values-be/strings.xml
new file mode 100644
index 0000000..866e612
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/impl/res/values-be/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">Немагчыма рабіць выклікі без дазволу на карыстанне тэлефонам</string>
+  <string name="pre_call_select_phone_account">Выберыце SIM-карту для гэтага выкліку</string>
+  <string name="pre_call_select_phone_account_remember">Запомніць гэты выбар</string>
+  <string name="pre_call_select_phone_account_hint_other_sim_in_use">Недаступна падчас выкарыстання %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/impl/res/values-bg/strings.xml b/java/com/android/dialer/preferredsim/impl/res/values-bg/strings.xml
new file mode 100644
index 0000000..1cd9bb3
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/impl/res/values-bg/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">За извършване на обаждане е нужно разрешение за достъп до телефона</string>
+  <string name="pre_call_select_phone_account">Изберете SIM карта за това обаждане</string>
+  <string name="pre_call_select_phone_account_remember">Запомняне на този избор</string>
+  <string name="pre_call_select_phone_account_hint_other_sim_in_use">Не е налице, докато се използва %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/impl/res/values-bn/strings.xml b/java/com/android/dialer/preferredsim/impl/res/values-bn/strings.xml
new file mode 100644
index 0000000..9936180
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/impl/res/values-bn/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">ফোনের অনুমতি না দিলে কল করা যাবে না</string>
+  <string name="pre_call_select_phone_account">এই কলের জন্য সিম বেছে নিন</string>
+  <string name="pre_call_select_phone_account_remember">এই পছন্দটি মনে রাখব</string>
+  <string name="pre_call_select_phone_account_hint_other_sim_in_use">%1$s ব্যবহার করার সময় এটি দিয়ে কল করা যাবে না</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/impl/res/values-bs/strings.xml b/java/com/android/dialer/preferredsim/impl/res/values-bs/strings.xml
new file mode 100644
index 0000000..5c28f70
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/impl/res/values-bs/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">Poziv se ne može uputiti bez odobrenja telefona</string>
+  <string name="pre_call_select_phone_account">Odaberite SIM za ovaj poziv</string>
+  <string name="pre_call_select_phone_account_remember">Zapamti ovaj odabir</string>
+  <string name="pre_call_select_phone_account_hint_other_sim_in_use">Nedostupno dok se koristi %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/impl/res/values-ca/strings.xml b/java/com/android/dialer/preferredsim/impl/res/values-ca/strings.xml
new file mode 100644
index 0000000..d15bea2
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/impl/res/values-ca/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">No es pot fer la trucada sense el permís Telèfon</string>
+  <string name="pre_call_select_phone_account">Tria la SIM per a aquesta trucada</string>
+  <string name="pre_call_select_phone_account_remember">Recorda aquesta selecció</string>
+  <string name="pre_call_select_phone_account_hint_other_sim_in_use">No disponible mentre s\'utilitza %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/impl/res/values-cs/strings.xml b/java/com/android/dialer/preferredsim/impl/res/values-cs/strings.xml
new file mode 100644
index 0000000..8e722b0
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/impl/res/values-cs/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">Hovor nejde uskutečnit bez oprávnění k použití telefonu</string>
+  <string name="pre_call_select_phone_account">Vyberte SIM kartu na tento hovor</string>
+  <string name="pre_call_select_phone_account_remember">Zapamatovat tuto volbu</string>
+  <string name="pre_call_select_phone_account_hint_other_sim_in_use">Nedostupné, když používáte kartu %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/impl/res/values-da/strings.xml b/java/com/android/dialer/preferredsim/impl/res/values-da/strings.xml
new file mode 100644
index 0000000..e739f04
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/impl/res/values-da/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">Opkaldet kan ikke foretages uden telefontilladelse</string>
+  <string name="pre_call_select_phone_account">Vælg SIM-kort til dette opkald</string>
+  <string name="pre_call_select_phone_account_remember">Husk dette valg</string>
+  <string name="pre_call_select_phone_account_hint_other_sim_in_use">Ikke tilgængelig, mens du bruger %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/impl/res/values-de/strings.xml b/java/com/android/dialer/preferredsim/impl/res/values-de/strings.xml
new file mode 100644
index 0000000..8b3e0a7
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/impl/res/values-de/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">Anruf kann ohne Telefonberechtigung nicht getätigt werden</string>
+  <string name="pre_call_select_phone_account">SIM für diesen Anruf auswählen</string>
+  <string name="pre_call_select_phone_account_remember">Auswahl speichern</string>
+  <string name="pre_call_select_phone_account_hint_other_sim_in_use">Anruf mit \"%1$s\" nicht möglich</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/impl/res/values-el/strings.xml b/java/com/android/dialer/preferredsim/impl/res/values-el/strings.xml
new file mode 100644
index 0000000..4c7d766
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/impl/res/values-el/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">Δεν είναι δυνατή η κλήση χωρίς άδεια χρήσης του τηλεφώνου</string>
+  <string name="pre_call_select_phone_account">Επιλέξτε SIM για αυτήν την κλήση</string>
+  <string name="pre_call_select_phone_account_remember">Διατήρηση αυτής της ρύθμισης</string>
+  <string name="pre_call_select_phone_account_hint_other_sim_in_use">Δεν είναι διαθέσιμο κατά τη χρήση %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/impl/res/values-en-rAU/strings.xml b/java/com/android/dialer/preferredsim/impl/res/values-en-rAU/strings.xml
new file mode 100644
index 0000000..c04f92f
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/impl/res/values-en-rAU/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">Cannot make call without phone permission</string>
+  <string name="pre_call_select_phone_account">Choose SIM for this call</string>
+  <string name="pre_call_select_phone_account_remember">Remember this choice</string>
+  <string name="pre_call_select_phone_account_hint_other_sim_in_use">Not available while using %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/impl/res/values-en-rGB/strings.xml b/java/com/android/dialer/preferredsim/impl/res/values-en-rGB/strings.xml
new file mode 100644
index 0000000..c04f92f
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/impl/res/values-en-rGB/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">Cannot make call without phone permission</string>
+  <string name="pre_call_select_phone_account">Choose SIM for this call</string>
+  <string name="pre_call_select_phone_account_remember">Remember this choice</string>
+  <string name="pre_call_select_phone_account_hint_other_sim_in_use">Not available while using %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/impl/res/values-en-rIN/strings.xml b/java/com/android/dialer/preferredsim/impl/res/values-en-rIN/strings.xml
new file mode 100644
index 0000000..c04f92f
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/impl/res/values-en-rIN/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">Cannot make call without phone permission</string>
+  <string name="pre_call_select_phone_account">Choose SIM for this call</string>
+  <string name="pre_call_select_phone_account_remember">Remember this choice</string>
+  <string name="pre_call_select_phone_account_hint_other_sim_in_use">Not available while using %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/impl/res/values-es-rUS/strings.xml b/java/com/android/dialer/preferredsim/impl/res/values-es-rUS/strings.xml
new file mode 100644
index 0000000..923dfc1
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/impl/res/values-es-rUS/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">No se puede realizar la llamada sin el permiso de acceso al teléfono</string>
+  <string name="pre_call_select_phone_account">Elige una SIM para realizar esta llamada</string>
+  <string name="pre_call_select_phone_account_remember">Recordar esta opción</string>
+  <string name="pre_call_select_phone_account_hint_other_sim_in_use">No disponible al utilizar %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/impl/res/values-es/strings.xml b/java/com/android/dialer/preferredsim/impl/res/values-es/strings.xml
new file mode 100644
index 0000000..c6a06ea
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/impl/res/values-es/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">No se pueden hacer llamadas sin habilitar el permiso de teléfono</string>
+  <string name="pre_call_select_phone_account">Elegir SIM para esta llamada</string>
+  <string name="pre_call_select_phone_account_remember">Recordar esta opción</string>
+  <string name="pre_call_select_phone_account_hint_other_sim_in_use">No disponible mientras se use %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/impl/res/values-et/strings.xml b/java/com/android/dialer/preferredsim/impl/res/values-et/strings.xml
new file mode 100644
index 0000000..b45e756
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/impl/res/values-et/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">Ilma telefoni loata ei saa helistada</string>
+  <string name="pre_call_select_phone_account">Valige selle kõne jaoks SIM-kaart</string>
+  <string name="pre_call_select_phone_account_remember">Jäta see valik meelde</string>
+  <string name="pre_call_select_phone_account_hint_other_sim_in_use">Pole SIM-kaardi %1$s kasutamisel saadaval</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/impl/res/values-eu/strings.xml b/java/com/android/dialer/preferredsim/impl/res/values-eu/strings.xml
new file mode 100644
index 0000000..dcd48f1
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/impl/res/values-eu/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">Ezin da deitu telefonoa atzitzeko baimenik gabe</string>
+  <string name="pre_call_select_phone_account">Aukeratu dei hau egiteko SIM txartela</string>
+  <string name="pre_call_select_phone_account_remember">Gogoratu aukera hau</string>
+  <string name="pre_call_select_phone_account_hint_other_sim_in_use">Ez dago erabilgarri %1$s erabiltzen duzunean</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/impl/res/values-fa/strings.xml b/java/com/android/dialer/preferredsim/impl/res/values-fa/strings.xml
new file mode 100644
index 0000000..e759bc1
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/impl/res/values-fa/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">بدون مجوز دسترسی به تلفن، تماس امکان‌پذیر نیست</string>
+  <string name="pre_call_select_phone_account">سیم‌کارتی برای این تماس انتخاب کنید</string>
+  <string name="pre_call_select_phone_account_remember">این گزینه به خاطر سپرده شود</string>
+  <string name="pre_call_select_phone_account_hint_other_sim_in_use">هنگام استفاده از %1$s دردسترس نیست</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/impl/res/values-fi/strings.xml b/java/com/android/dialer/preferredsim/impl/res/values-fi/strings.xml
new file mode 100644
index 0000000..ee114f2
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/impl/res/values-fi/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">Puhelua ei voi soittaa ilman puhelimen käyttöoikeutta</string>
+  <string name="pre_call_select_phone_account">Valitse SIM tätä puhelua varten</string>
+  <string name="pre_call_select_phone_account_remember">Muista valinta</string>
+  <string name="pre_call_select_phone_account_hint_other_sim_in_use">Ei käytettävissä, kun %1$s on käytössä</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/impl/res/values-fr-rCA/strings.xml b/java/com/android/dialer/preferredsim/impl/res/values-fr-rCA/strings.xml
new file mode 100644
index 0000000..bc727c7
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/impl/res/values-fr-rCA/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">Impossible de passer un appel sans l\'autorisation d\'accéder au téléphone</string>
+  <string name="pre_call_select_phone_account">Choisir une carte SIM pour cet appel</string>
+  <string name="pre_call_select_phone_account_remember">Mémoriser ce choix</string>
+  <string name="pre_call_select_phone_account_hint_other_sim_in_use">Non disponible lors de l\'utilisation de la carte SIM %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/impl/res/values-fr/strings.xml b/java/com/android/dialer/preferredsim/impl/res/values-fr/strings.xml
new file mode 100644
index 0000000..f627c57
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/impl/res/values-fr/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">Impossible de passer l\'appel sans les autorisations requises par l\'application Téléphone</string>
+  <string name="pre_call_select_phone_account">Choisir la carte SIM pour cet appel</string>
+  <string name="pre_call_select_phone_account_remember">Mémoriser ce choix</string>
+  <string name="pre_call_select_phone_account_hint_other_sim_in_use">Non disponible, car la carte SIM %1$s est en cours d\'utilisation</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/impl/res/values-gl/strings.xml b/java/com/android/dialer/preferredsim/impl/res/values-gl/strings.xml
new file mode 100644
index 0000000..88d9326
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/impl/res/values-gl/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">Non se pode facer ningunha chamada sen habilitar os permisos de teléfono</string>
+  <string name="pre_call_select_phone_account">Escolle a SIM para esta chamada</string>
+  <string name="pre_call_select_phone_account_remember">Lembrar esta opción</string>
+  <string name="pre_call_select_phone_account_hint_other_sim_in_use">Non está dispoñible mentres se use %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/impl/res/values-gu/strings.xml b/java/com/android/dialer/preferredsim/impl/res/values-gu/strings.xml
new file mode 100644
index 0000000..5f3cfa8
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/impl/res/values-gu/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">ફોનની પરવાનગી વગર કૉલ કરી શકાતો નથી</string>
+  <string name="pre_call_select_phone_account">આ કૉલ માટે સિમ પસંદ કરો</string>
+  <string name="pre_call_select_phone_account_remember">આ પસંદ યાદ રાખો</string>
+  <string name="pre_call_select_phone_account_hint_other_sim_in_use">%1$sનો ઉપયોગ કરતા હોય ત્યારે ઉપલબ્ધ રહેશે નહીં</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/impl/res/values-hi/strings.xml b/java/com/android/dialer/preferredsim/impl/res/values-hi/strings.xml
new file mode 100644
index 0000000..c9a638c
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/impl/res/values-hi/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">फ़ोन अनुमति के बिना कॉल नहीं किया जा सकता</string>
+  <string name="pre_call_select_phone_account">इस कॉल के लिए सिम चुनें</string>
+  <string name="pre_call_select_phone_account_remember">यह चयन याद रखें</string>
+  <string name="pre_call_select_phone_account_hint_other_sim_in_use">%1$s का इस्तेमाल करते समय उपलब्ध नहीं होता</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/impl/res/values-hr/strings.xml b/java/com/android/dialer/preferredsim/impl/res/values-hr/strings.xml
new file mode 100644
index 0000000..8b9cde6
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/impl/res/values-hr/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">Poziv se ne može izvršiti bez dopuštenja za telefon</string>
+  <string name="pre_call_select_phone_account">Odabir SIM-a za ovaj poziv</string>
+  <string name="pre_call_select_phone_account_remember">Zapamti ovaj odabir</string>
+  <string name="pre_call_select_phone_account_hint_other_sim_in_use">Nije dostupno dok upotrebljavate %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/impl/res/values-hu/strings.xml b/java/com/android/dialer/preferredsim/impl/res/values-hu/strings.xml
new file mode 100644
index 0000000..38d91b1
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/impl/res/values-hu/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">Nem indíthat hívást telefonálási engedély nélkül</string>
+  <string name="pre_call_select_phone_account">SIM-kártya kiválasztása a híváshoz</string>
+  <string name="pre_call_select_phone_account_remember">Választás megjegyzése</string>
+  <string name="pre_call_select_phone_account_hint_other_sim_in_use">Nem áll rendelkezésre a következő használatakor: %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/impl/res/values-hy/strings.xml b/java/com/android/dialer/preferredsim/impl/res/values-hy/strings.xml
new file mode 100644
index 0000000..e776951
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/impl/res/values-hy/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">Զանգ կատարելու համար անհրաժեշտ է հեռախոսից օգտվելու թույլտվություն</string>
+  <string name="pre_call_select_phone_account">Ընտրեք, թե որ SIM քարտով զանգել</string>
+  <string name="pre_call_select_phone_account_remember">Հիշել այս ընտրությունը</string>
+  <string name="pre_call_select_phone_account_hint_other_sim_in_use">Հասանելի չէ, երբ օգտագործվում է %1$s քարտը</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/impl/res/values-in/strings.xml b/java/com/android/dialer/preferredsim/impl/res/values-in/strings.xml
new file mode 100644
index 0000000..62717d2
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/impl/res/values-in/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">Tidak dapat melakukan panggilan tanpa izin menelepon</string>
+  <string name="pre_call_select_phone_account">Pilih SIM untuk panggilan ini</string>
+  <string name="pre_call_select_phone_account_remember">Ingat pilihan ini</string>
+  <string name="pre_call_select_phone_account_hint_other_sim_in_use">Tidak tersedia saat menggunakan %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/impl/res/values-is/strings.xml b/java/com/android/dialer/preferredsim/impl/res/values-is/strings.xml
new file mode 100644
index 0000000..6d24bc1
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/impl/res/values-is/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">Ekki er hægt að hringja án símaheimildar</string>
+  <string name="pre_call_select_phone_account">Veldu SIM-kort fyrir þetta símtal</string>
+  <string name="pre_call_select_phone_account_remember">Muna þetta val</string>
+  <string name="pre_call_select_phone_account_hint_other_sim_in_use">Ekki í boði þegar %1$s er í notkun</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/impl/res/values-it/strings.xml b/java/com/android/dialer/preferredsim/impl/res/values-it/strings.xml
new file mode 100644
index 0000000..7df7578
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/impl/res/values-it/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">Non puoi effettuare chiamate senza l\'autorizzazione Telefono.</string>
+  <string name="pre_call_select_phone_account">Scegli la SIM per questa chiamata</string>
+  <string name="pre_call_select_phone_account_remember">Memorizza questa scelta</string>
+  <string name="pre_call_select_phone_account_hint_other_sim_in_use">Non disponibile quando utilizzi %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/impl/res/values-iw/strings.xml b/java/com/android/dialer/preferredsim/impl/res/values-iw/strings.xml
new file mode 100644
index 0000000..3875c3e
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/impl/res/values-iw/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">אי אפשר להתקשר בלי להעניק הרשאת גישה לטלפון</string>
+  <string name="pre_call_select_phone_account">‏בחירת כרטיס SIM לשיחה הזו</string>
+  <string name="pre_call_select_phone_account_remember">אני רוצה להשתמש באפשרות הזו גם בעתיד</string>
+  <string name="pre_call_select_phone_account_hint_other_sim_in_use">אי אפשר להתקשר בזמן השימוש בכרטיס %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/impl/res/values-ja/strings.xml b/java/com/android/dialer/preferredsim/impl/res/values-ja/strings.xml
new file mode 100644
index 0000000..bb0c0d4
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/impl/res/values-ja/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">通話を発信するには、電話へのアクセスを許可する必要があります</string>
+  <string name="pre_call_select_phone_account">この通話で使用する SIM の選択</string>
+  <string name="pre_call_select_phone_account_remember">この設定を記憶する</string>
+  <string name="pre_call_select_phone_account_hint_other_sim_in_use">%1$s を使用中のため、ご利用いただけません</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/impl/res/values-ka/strings.xml b/java/com/android/dialer/preferredsim/impl/res/values-ka/strings.xml
new file mode 100644
index 0000000..835e7db
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/impl/res/values-ka/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">ტელეფონის ნებართვის გარეშე დარეკვა შეუძლებელია</string>
+  <string name="pre_call_select_phone_account">აირჩიეთ SIM ამ ზარისთვის</string>
+  <string name="pre_call_select_phone_account_remember">ამ არჩევანის დამახსოვრება</string>
+  <string name="pre_call_select_phone_account_hint_other_sim_in_use">მიუწვდომელია %1$s-ის გამოყენებისას</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/impl/res/values-kk/strings.xml b/java/com/android/dialer/preferredsim/impl/res/values-kk/strings.xml
new file mode 100644
index 0000000..068aa02
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/impl/res/values-kk/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">Телефон рұқсатынсыз қоңырау шалу мүмкін емес</string>
+  <string name="pre_call_select_phone_account">Қоңырау шалынатын SIM картасын таңдаңыз</string>
+  <string name="pre_call_select_phone_account_remember">Таңдауды еске сақтау</string>
+  <string name="pre_call_select_phone_account_hint_other_sim_in_use">%1$s картасымен қатар қолдану мүмкін емес</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/impl/res/values-km/strings.xml b/java/com/android/dialer/preferredsim/impl/res/values-km/strings.xml
new file mode 100644
index 0000000..20225c9
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/impl/res/values-km/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">មិន​អាច​ហៅ​ទូរសព្ទ​ដោយ​មិនមាន​ការអនុញ្ញាត​ក្នុង​ទូរសព្ទ​​បាន​ទេ</string>
+  <string name="pre_call_select_phone_account">ជ្រើសរើសស៊ីមសម្រាប់​ការហៅ​ទូរសព្ទ​នេះ</string>
+  <string name="pre_call_select_phone_account_remember">ចងចាំ​ជម្រើស​នេះ</string>
+  <string name="pre_call_select_phone_account_hint_other_sim_in_use">មិន​ដំណើរការ នៅពេល​កំពុង​ប្រើប្រាស់ %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/impl/res/values-kn/strings.xml b/java/com/android/dialer/preferredsim/impl/res/values-kn/strings.xml
new file mode 100644
index 0000000..e4d5742
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/impl/res/values-kn/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">ಫೋನ್‌ ಅನುಮತಿ ಇಲ್ಲದೆ ಕರೆಯನ್ನು ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ</string>
+  <string name="pre_call_select_phone_account">ಈ ಕರೆಗಾಗಿ ಸಿಮ್ ಆರಿಸಿ</string>
+  <string name="pre_call_select_phone_account_remember">ಈ ಆಯ್ಕೆಯನ್ನು ನೆನಪಿಡಿ</string>
+  <string name="pre_call_select_phone_account_hint_other_sim_in_use">%1$s ಅನ್ನು ಬಳುಸುತ್ತಿರುವಾಗ ಬೇರೆ ಕರೆಗಳನ್ನು ಮಾಡಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/impl/res/values-ko/strings.xml b/java/com/android/dialer/preferredsim/impl/res/values-ko/strings.xml
new file mode 100644
index 0000000..4e1fb70
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/impl/res/values-ko/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">통화 권한이 없어 전화를 걸 수 없습니다.</string>
+  <string name="pre_call_select_phone_account">이 통화에 사용할 SIM 선택</string>
+  <string name="pre_call_select_phone_account_remember">이 선택사항 저장</string>
+  <string name="pre_call_select_phone_account_hint_other_sim_in_use">%1$s을(를) 사용 중일 때는 이용할 수 없습니다.</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/impl/res/values-ky/strings.xml b/java/com/android/dialer/preferredsim/impl/res/values-ky/strings.xml
new file mode 100644
index 0000000..88ec814
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/impl/res/values-ky/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">Телефон колдонмосунан уруксатсыз чала албайсыз</string>
+  <string name="pre_call_select_phone_account">Бул чалуу үчүн SIM картаны тандаңыз</string>
+  <string name="pre_call_select_phone_account_remember">Бул тандоону эстеп калуу</string>
+  <string name="pre_call_select_phone_account_hint_other_sim_in_use">%1$s SIM-картаны пайдаланып жатканда жеткиликсиз</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/impl/res/values-lo/strings.xml b/java/com/android/dialer/preferredsim/impl/res/values-lo/strings.xml
new file mode 100644
index 0000000..eb1dae5
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/impl/res/values-lo/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">ບໍ່ສາມາດໂທໂດຍບໍ່ໄດ້ຮັບສິດອະນຸຍາດໂທລະສັບໄດ້</string>
+  <string name="pre_call_select_phone_account">ເລືອກ SIM ສຳລັບສາຍນີ້</string>
+  <string name="pre_call_select_phone_account_remember">ຈື່ການເລືອກນີ້ໄວ້</string>
+  <string name="pre_call_select_phone_account_hint_other_sim_in_use">ບໍ່ສາມາດໃຊ້ໄດ້ໃນລະຫວ່າງໃຊ້ %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/impl/res/values-lt/strings.xml b/java/com/android/dialer/preferredsim/impl/res/values-lt/strings.xml
new file mode 100644
index 0000000..f173710
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/impl/res/values-lt/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">Negalima atlikti skambučio be telefono leidimo</string>
+  <string name="pre_call_select_phone_account">Pasir. SIM k., kad gal. atl. šį skamb.</string>
+  <string name="pre_call_select_phone_account_remember">Atsiminti šį pasirinkimą</string>
+  <string name="pre_call_select_phone_account_hint_other_sim_in_use">Nepasiekiama naudojant %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/impl/res/values-lv/strings.xml b/java/com/android/dialer/preferredsim/impl/res/values-lv/strings.xml
new file mode 100644
index 0000000..b098dbf
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/impl/res/values-lv/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">Nevar veikt zvanu bez atļaujas Tālrunis.</string>
+  <string name="pre_call_select_phone_account">SIM kartes izvēle šim zvanam</string>
+  <string name="pre_call_select_phone_account_remember">Atcerēties šo izvēli</string>
+  <string name="pre_call_select_phone_account_hint_other_sim_in_use">Nav pieejams, izmantojot: %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/impl/res/values-mk/strings.xml b/java/com/android/dialer/preferredsim/impl/res/values-mk/strings.xml
new file mode 100644
index 0000000..52ab0ae
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/impl/res/values-mk/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">Не може да се воспоставуваат повици без дозвола за телефон</string>
+  <string name="pre_call_select_phone_account">Изберете SIM за повиков</string>
+  <string name="pre_call_select_phone_account_remember">Запомни го изборов</string>
+  <string name="pre_call_select_phone_account_hint_other_sim_in_use">Не е достапно при користење %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/impl/res/values-ml/strings.xml b/java/com/android/dialer/preferredsim/impl/res/values-ml/strings.xml
new file mode 100644
index 0000000..3dcd601
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/impl/res/values-ml/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">ഫോൺ അനുമതിയില്ലാതെ കോൾ ചെയ്യാനാവില്ല</string>
+  <string name="pre_call_select_phone_account">ഈ കോളിനായി സിം തിരഞ്ഞെടുക്കുക</string>
+  <string name="pre_call_select_phone_account_remember">ഈ തിരഞ്ഞെടുക്കൽ ഓർക്കുക</string>
+  <string name="pre_call_select_phone_account_hint_other_sim_in_use">%1$s ഉപയോഗിക്കുമ്പോൾ ലഭ്യമല്ല</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/impl/res/values-mn/strings.xml b/java/com/android/dialer/preferredsim/impl/res/values-mn/strings.xml
new file mode 100644
index 0000000..450c4ee
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/impl/res/values-mn/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">Утасны зөвшөөрөлгүйгээр дуудлага хийх боломжгүй</string>
+  <string name="pre_call_select_phone_account">Энэ дуудлагад ашиглах SIM сонгоно уу</string>
+  <string name="pre_call_select_phone_account_remember">Энэ сонголтыг санах</string>
+  <string name="pre_call_select_phone_account_hint_other_sim_in_use">%1$s ашиглаж байх үед боломжгүй</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/impl/res/values-mr/strings.xml b/java/com/android/dialer/preferredsim/impl/res/values-mr/strings.xml
new file mode 100644
index 0000000..28108b5
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/impl/res/values-mr/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">फोन परवानगीशिवाय कॉल करू नका</string>
+  <string name="pre_call_select_phone_account">या कॉलसाठी सिम निवडा</string>
+  <string name="pre_call_select_phone_account_remember">ही निवड लक्षात ठेवा</string>
+  <string name="pre_call_select_phone_account_hint_other_sim_in_use">%1$s वापरत असताना उपलब्‍ध नसेल</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/impl/res/values-ms/strings.xml b/java/com/android/dialer/preferredsim/impl/res/values-ms/strings.xml
new file mode 100644
index 0000000..5cd5f86
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/impl/res/values-ms/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">Tidak dapat membuat panggilan tanpa kebenaran telefon</string>
+  <string name="pre_call_select_phone_account">Pilih SIM untuk panggilan ini</string>
+  <string name="pre_call_select_phone_account_remember">Ingat pilihan ini</string>
+  <string name="pre_call_select_phone_account_hint_other_sim_in_use">Tidak tersedia semasa menggunakan %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/impl/res/values-my/strings.xml b/java/com/android/dialer/preferredsim/impl/res/values-my/strings.xml
new file mode 100644
index 0000000..70f90f4
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/impl/res/values-my/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">ဖုန်းခွင့်ပြုချက်များမရှိဘဲ ဖုန်းခေါ်ဆိုမှု မပြုလုပ်နိုင်ပါ</string>
+  <string name="pre_call_select_phone_account">ဤခေါ်ဆိုမှုအတွက် ဆင်းမ်ကဒ်ရွေးချယ်ခြင်း</string>
+  <string name="pre_call_select_phone_account_remember">ဤရွေးချယ်မှုကို မှတ်ထားရန်</string>
+  <string name="pre_call_select_phone_account_hint_other_sim_in_use">%1$s ကို အသုံးပြုနေစဉ် မရရှိနိုင်ပါ</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/impl/res/values-nb/strings.xml b/java/com/android/dialer/preferredsim/impl/res/values-nb/strings.xml
new file mode 100644
index 0000000..ecdc0c4
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/impl/res/values-nb/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">Kan ikke ringe uten telefontillatelse</string>
+  <string name="pre_call_select_phone_account">Velg SIM-kort for dette anropet</string>
+  <string name="pre_call_select_phone_account_remember">Husk dette valget</string>
+  <string name="pre_call_select_phone_account_hint_other_sim_in_use">Ikke tilgjengelig mens du bruker %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/impl/res/values-ne/strings.xml b/java/com/android/dialer/preferredsim/impl/res/values-ne/strings.xml
new file mode 100644
index 0000000..a37aac2
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/impl/res/values-ne/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">फोनसम्बन्धी अनुमतिबिना कल गर्न सकिँदैन</string>
+  <string name="pre_call_select_phone_account">यो कल गर्न SIM छनौट गर्नुहोस्</string>
+  <string name="pre_call_select_phone_account_remember">यो रोजाइ याद राख्नुहोला</string>
+  <string name="pre_call_select_phone_account_hint_other_sim_in_use">%1$s प्रयोग भइरहेको अवस्थामा उपलब्ध हुँदैन</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/impl/res/values-nl/strings.xml b/java/com/android/dialer/preferredsim/impl/res/values-nl/strings.xml
new file mode 100644
index 0000000..9b2b2df
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/impl/res/values-nl/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">Kan niet bellen zonder telefoonrechten</string>
+  <string name="pre_call_select_phone_account">Simkaart voor deze oproep kiezen</string>
+  <string name="pre_call_select_phone_account_remember">Deze keuze onthouden</string>
+  <string name="pre_call_select_phone_account_hint_other_sim_in_use">Niet beschikbaar tijdens gebruik van %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/impl/res/values-no/strings.xml b/java/com/android/dialer/preferredsim/impl/res/values-no/strings.xml
new file mode 100644
index 0000000..ecdc0c4
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/impl/res/values-no/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">Kan ikke ringe uten telefontillatelse</string>
+  <string name="pre_call_select_phone_account">Velg SIM-kort for dette anropet</string>
+  <string name="pre_call_select_phone_account_remember">Husk dette valget</string>
+  <string name="pre_call_select_phone_account_hint_other_sim_in_use">Ikke tilgjengelig mens du bruker %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/impl/res/values-pa/strings.xml b/java/com/android/dialer/preferredsim/impl/res/values-pa/strings.xml
new file mode 100644
index 0000000..9331aef
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/impl/res/values-pa/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">ਫ਼ੋਨ ਇਜਾਜ਼ਤ ਤੋਂ ਬਿਨਾਂ ਕਾਲ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕਦੀ</string>
+  <string name="pre_call_select_phone_account">ਇਸ ਕਾਲ ਲਈ ਸਿਮ ਚੁਣੋ</string>
+  <string name="pre_call_select_phone_account_remember">ਇਹ ਚੋਣ ਯਾਦ ਰੱਖੋ</string>
+  <string name="pre_call_select_phone_account_hint_other_sim_in_use">%1$s ਦੀ ਵਰਤੋਂ ਦੌਰਾਨ ਉਪਲਬਧ ਨਹੀਂ ਹੈ</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/impl/res/values-pl/strings.xml b/java/com/android/dialer/preferredsim/impl/res/values-pl/strings.xml
new file mode 100644
index 0000000..605d460
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/impl/res/values-pl/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">Nie można zadzwonić bez uprawnień do korzystania z telefonu</string>
+  <string name="pre_call_select_phone_account">Wybierz kartę SIM, aby zadzwonić</string>
+  <string name="pre_call_select_phone_account_remember">Zapamiętaj ten wybór</string>
+  <string name="pre_call_select_phone_account_hint_other_sim_in_use">Nie można tego zrobić podczas korzystania z karty %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/impl/res/values-pt-rBR/strings.xml b/java/com/android/dialer/preferredsim/impl/res/values-pt-rBR/strings.xml
new file mode 100644
index 0000000..1e90ed1
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/impl/res/values-pt-rBR/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">Não é possível ligar sem a permissão do smartphone</string>
+  <string name="pre_call_select_phone_account">Escolher o SIM para esta chamada</string>
+  <string name="pre_call_select_phone_account_remember">Lembrar desta escolha</string>
+  <string name="pre_call_select_phone_account_hint_other_sim_in_use">Indisponível enquanto %1$s é usado</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/impl/res/values-pt-rPT/strings.xml b/java/com/android/dialer/preferredsim/impl/res/values-pt-rPT/strings.xml
new file mode 100644
index 0000000..b1efddd
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/impl/res/values-pt-rPT/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">Não é possível telefonar sem autorização de telemóvel.</string>
+  <string name="pre_call_select_phone_account">Escolher o SIM para esta chamada</string>
+  <string name="pre_call_select_phone_account_remember">Lembrar esta escolha</string>
+  <string name="pre_call_select_phone_account_hint_other_sim_in_use">Indisponível ao utilizar %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/impl/res/values-pt/strings.xml b/java/com/android/dialer/preferredsim/impl/res/values-pt/strings.xml
new file mode 100644
index 0000000..1e90ed1
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/impl/res/values-pt/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">Não é possível ligar sem a permissão do smartphone</string>
+  <string name="pre_call_select_phone_account">Escolher o SIM para esta chamada</string>
+  <string name="pre_call_select_phone_account_remember">Lembrar desta escolha</string>
+  <string name="pre_call_select_phone_account_hint_other_sim_in_use">Indisponível enquanto %1$s é usado</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/impl/res/values-ro/strings.xml b/java/com/android/dialer/preferredsim/impl/res/values-ro/strings.xml
new file mode 100644
index 0000000..6ee832b
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/impl/res/values-ro/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">Nu se poate apela fără permisiunea telefonului</string>
+  <string name="pre_call_select_phone_account">Alegeți cardul SIM pentru acest apel</string>
+  <string name="pre_call_select_phone_account_remember">Rețineți această alegere</string>
+  <string name="pre_call_select_phone_account_hint_other_sim_in_use">Nu este disponibil când folosiți %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/impl/res/values-ru/strings.xml b/java/com/android/dialer/preferredsim/impl/res/values-ru/strings.xml
new file mode 100644
index 0000000..42d4186
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/impl/res/values-ru/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">Не удается позвонить: отсутствует разрешение для телефона</string>
+  <string name="pre_call_select_phone_account">Выбор SIM-карты для вызова</string>
+  <string name="pre_call_select_phone_account_remember">Запомнить выбор</string>
+  <string name="pre_call_select_phone_account_hint_other_sim_in_use">Недоступно, пока используется SIM-карта \"%1$s\"</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/impl/res/values-si/strings.xml b/java/com/android/dialer/preferredsim/impl/res/values-si/strings.xml
new file mode 100644
index 0000000..0737eb7
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/impl/res/values-si/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">දුරකථන අවසරයකින් තොරව ඇමතුම් සිදු කළ නොහැකිය</string>
+  <string name="pre_call_select_phone_account">මෙම ඇමතුම සඳහා SIM තෝරන්න</string>
+  <string name="pre_call_select_phone_account_remember">මෙම තේරීම මතක තබාගන්න</string>
+  <string name="pre_call_select_phone_account_hint_other_sim_in_use">%1$s භාවිතය අතරතුර ලබා ගත නොහැකිය</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/impl/res/values-sk/strings.xml b/java/com/android/dialer/preferredsim/impl/res/values-sk/strings.xml
new file mode 100644
index 0000000..a89f62d
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/impl/res/values-sk/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">Hovor sa nedá uskutočniť bez povolenia na používanie telefónu</string>
+  <string name="pre_call_select_phone_account">Vyberte SIM kartu na tento hovor</string>
+  <string name="pre_call_select_phone_account_remember">Zapamätať si túto voľbu</string>
+  <string name="pre_call_select_phone_account_hint_other_sim_in_use">Nedostupné pri použití karty %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/impl/res/values-sl/strings.xml b/java/com/android/dialer/preferredsim/impl/res/values-sl/strings.xml
new file mode 100644
index 0000000..898e625
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/impl/res/values-sl/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">Brez dovoljenja za telefon ni mogoče opraviti klica</string>
+  <string name="pre_call_select_phone_account">Izbira kartice SIM za ta klic</string>
+  <string name="pre_call_select_phone_account_remember">Zapomni si to izbiro</string>
+  <string name="pre_call_select_phone_account_hint_other_sim_in_use">Ni na voljo med uporabo kartice %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/impl/res/values-sq/strings.xml b/java/com/android/dialer/preferredsim/impl/res/values-sq/strings.xml
new file mode 100644
index 0000000..3980541
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/impl/res/values-sq/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">Telefonata nuk mund të kryhet pa lejen e telefonit</string>
+  <string name="pre_call_select_phone_account">Zgjidh kartën SIM për këtë telefonatë</string>
+  <string name="pre_call_select_phone_account_remember">Kujtoje këtë zgjedhje</string>
+  <string name="pre_call_select_phone_account_hint_other_sim_in_use">Nuk ofrohet kur përdor %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/impl/res/values-sr/strings.xml b/java/com/android/dialer/preferredsim/impl/res/values-sr/strings.xml
new file mode 100644
index 0000000..3944986
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/impl/res/values-sr/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">Не можете да упутите позив ако не одобрите дозволу за телефон</string>
+  <string name="pre_call_select_phone_account">Изаберите SIM за овај позив</string>
+  <string name="pre_call_select_phone_account_remember">Запамти овај избор</string>
+  <string name="pre_call_select_phone_account_hint_other_sim_in_use">Није доступно док користите %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/impl/res/values-sv/strings.xml b/java/com/android/dialer/preferredsim/impl/res/values-sv/strings.xml
new file mode 100644
index 0000000..0c36b73
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/impl/res/values-sv/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">Det går inte att ringa utan telefonbehörighet</string>
+  <string name="pre_call_select_phone_account">Välj SIM-kort till det här samtalet</string>
+  <string name="pre_call_select_phone_account_remember">Kom ihåg det här valet</string>
+  <string name="pre_call_select_phone_account_hint_other_sim_in_use">Ej tillgängligt samtidigt med %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/impl/res/values-sw/strings.xml b/java/com/android/dialer/preferredsim/impl/res/values-sw/strings.xml
new file mode 100644
index 0000000..323fef4
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/impl/res/values-sw/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">Huwezi kupiga simu bila ruhusa ya simu</string>
+  <string name="pre_call_select_phone_account">Chagua SIM kwa ajili ya simu hii</string>
+  <string name="pre_call_select_phone_account_remember">Kumbuka chaguo hili</string>
+  <string name="pre_call_select_phone_account_hint_other_sim_in_use">Huwezi kupiga simu hii huku kukiwa na simu inayoendelea kwenye %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/impl/res/values-ta/strings.xml b/java/com/android/dialer/preferredsim/impl/res/values-ta/strings.xml
new file mode 100644
index 0000000..27d5803
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/impl/res/values-ta/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">ஃபோன் அனுமதி இல்லாமல் அழைக்க முடியாது</string>
+  <string name="pre_call_select_phone_account">இந்த அழைப்பிற்கான சிம்மைத் தேர்வுசெய்க</string>
+  <string name="pre_call_select_phone_account_remember">இந்த விருப்பத்தை நினைவில்கொள்</string>
+  <string name="pre_call_select_phone_account_hint_other_sim_in_use">%1$sஐப் பயன்படுத்தும் போது கிடைக்காது</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/impl/res/values-te/strings.xml b/java/com/android/dialer/preferredsim/impl/res/values-te/strings.xml
new file mode 100644
index 0000000..3c069e4
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/impl/res/values-te/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">ఫోన్ అనుమతి లేకుండా కాల్ చేయడం సాధ్యపడదు</string>
+  <string name="pre_call_select_phone_account">ఈ కాల్ కోసం SIMని ఎంచుకోండి</string>
+  <string name="pre_call_select_phone_account_remember">ఈ ఎంపికను గుర్తుంచుకో</string>
+  <string name="pre_call_select_phone_account_hint_other_sim_in_use">%1$sని ఉపయోగిస్తున్నప్పుడు అందుబాటులో ఉండదు</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/impl/res/values-th/strings.xml b/java/com/android/dialer/preferredsim/impl/res/values-th/strings.xml
new file mode 100644
index 0000000..c20c34c
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/impl/res/values-th/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">โทรออกไม่ได้หากไม่มีสิทธิ์เข้าถึงโทรศัพท์</string>
+  <string name="pre_call_select_phone_account">เลือกซิมสำหรับการโทรนี้</string>
+  <string name="pre_call_select_phone_account_remember">จำตัวเลือกนี้</string>
+  <string name="pre_call_select_phone_account_hint_other_sim_in_use">ใช้งานไม่ได้ในขณะที่ใช้ %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/impl/res/values-tl/strings.xml b/java/com/android/dialer/preferredsim/impl/res/values-tl/strings.xml
new file mode 100644
index 0000000..a792eb0
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/impl/res/values-tl/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">Hindi makakatawag nang walang pahintulot sa telepono</string>
+  <string name="pre_call_select_phone_account">Pumili ng SIM para sa tawag na ito</string>
+  <string name="pre_call_select_phone_account_remember">Tandaan ang pagpipiliang ito</string>
+  <string name="pre_call_select_phone_account_hint_other_sim_in_use">Hindi available habang gumagamit ng %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/impl/res/values-tr/strings.xml b/java/com/android/dialer/preferredsim/impl/res/values-tr/strings.xml
new file mode 100644
index 0000000..256e76c
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/impl/res/values-tr/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">Telefon izni olmadan telefon edilemez</string>
+  <string name="pre_call_select_phone_account">Bu görüşme için kullanılacak SIM\'i seçin</string>
+  <string name="pre_call_select_phone_account_remember">Bu tercihi hatırla</string>
+  <string name="pre_call_select_phone_account_hint_other_sim_in_use">%1$s üzerinden devam eden çağrı olduğu için kullanılamaz</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/impl/res/values-uk/strings.xml b/java/com/android/dialer/preferredsim/impl/res/values-uk/strings.xml
new file mode 100644
index 0000000..2d1d532
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/impl/res/values-uk/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">Ви не можете телефонувати без відповідного дозволу</string>
+  <string name="pre_call_select_phone_account">Виберіть SIM-карту для цього виклику</string>
+  <string name="pre_call_select_phone_account_remember">Запам’ятати цей вибір</string>
+  <string name="pre_call_select_phone_account_hint_other_sim_in_use">Недоступно, коли використовується %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/impl/res/values-ur/strings.xml b/java/com/android/dialer/preferredsim/impl/res/values-ur/strings.xml
new file mode 100644
index 0000000..f25f2e9
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/impl/res/values-ur/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">فون کی اجازت کے بغیر کال نہیں کر سکتے</string>
+  <string name="pre_call_select_phone_account">‏اس کال کے لیے SIM منتخب کریں</string>
+  <string name="pre_call_select_phone_account_remember">یہ انتخاب یاد رکھیں</string>
+  <string name="pre_call_select_phone_account_hint_other_sim_in_use">%1$s کا استعمال کرتے ہوئے دستیاب نہیں ہے</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/impl/res/values-uz/strings.xml b/java/com/android/dialer/preferredsim/impl/res/values-uz/strings.xml
new file mode 100644
index 0000000..4df10f3
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/impl/res/values-uz/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">Telefon ruxsatnomasisiz chaqiruvni amalga oshirib bo‘lmaydi</string>
+  <string name="pre_call_select_phone_account">Chaqiruv uchun SIM kartani tanlang</string>
+  <string name="pre_call_select_phone_account_remember">Shu tanlov eslab qolinsin</string>
+  <string name="pre_call_select_phone_account_hint_other_sim_in_use">%1$s ishlatilayotgan vaqtda bu amalni bajarish imkonsiz</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/impl/res/values-vi/strings.xml b/java/com/android/dialer/preferredsim/impl/res/values-vi/strings.xml
new file mode 100644
index 0000000..9d8d207
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/impl/res/values-vi/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">Không thể gọi điện khi không có quyền truy cập điện thoại</string>
+  <string name="pre_call_select_phone_account">Chọn SIM cho cuộc gọi này</string>
+  <string name="pre_call_select_phone_account_remember">Nhớ lựa chọn này</string>
+  <string name="pre_call_select_phone_account_hint_other_sim_in_use">Không thể thực hiện cuộc gọi bằng %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/impl/res/values-zh-rCN/strings.xml b/java/com/android/dialer/preferredsim/impl/res/values-zh-rCN/strings.xml
new file mode 100644
index 0000000..74234c9
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/impl/res/values-zh-rCN/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">没有电话使用权限，因此无法拨打电话</string>
+  <string name="pre_call_select_phone_account">为此次通话选择 SIM 卡</string>
+  <string name="pre_call_select_phone_account_remember">记住此选择</string>
+  <string name="pre_call_select_phone_account_hint_other_sim_in_use">使用 %1$s 时无法拨打电话</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/impl/res/values-zh-rHK/strings.xml b/java/com/android/dialer/preferredsim/impl/res/values-zh-rHK/strings.xml
new file mode 100644
index 0000000..3ed8c96
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/impl/res/values-zh-rHK/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">必須有電話權限才能撥打電話</string>
+  <string name="pre_call_select_phone_account">選擇此通話要使用的 SIM 卡</string>
+  <string name="pre_call_select_phone_account_remember">記住這個選擇</string>
+  <string name="pre_call_select_phone_account_hint_other_sim_in_use">使用 %1$s 時無法撥打</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/impl/res/values-zh-rTW/strings.xml b/java/com/android/dialer/preferredsim/impl/res/values-zh-rTW/strings.xml
new file mode 100644
index 0000000..14267b9
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/impl/res/values-zh-rTW/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">必須授予電話權限才能撥打電話</string>
+  <string name="pre_call_select_phone_account">選擇本次通話要使用的 SIM 卡</string>
+  <string name="pre_call_select_phone_account_remember">記住這個選擇</string>
+  <string name="pre_call_select_phone_account_hint_other_sim_in_use">使用 %1$s 時無法撥打電話</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/impl/res/values-zu/strings.xml b/java/com/android/dialer/preferredsim/impl/res/values-zu/strings.xml
new file mode 100644
index 0000000..22fa51d
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/impl/res/values-zu/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="pre_call_permission_check_no_phone_permission">Ayikwazi ukwenza ikholi ngaphandle kwemvume yefoni</string>
+  <string name="pre_call_select_phone_account">Khetha i-SIM yale kholi</string>
+  <string name="pre_call_select_phone_account_remember">Khumbula lokhu okukhethiwe</string>
+  <string name="pre_call_select_phone_account_hint_other_sim_in_use">Akutholakali uma kusetshenziswa i-%1$s</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/impl/res/values/strings.xml b/java/com/android/dialer/preferredsim/impl/res/values/strings.xml
new file mode 100644
index 0000000..5e7ddd3
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/impl/res/values/strings.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2017 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Toast when the user tried to place a call but has revoked phone permission [CHAR_LIMIT=none]  -->
+  <string name="pre_call_permission_check_no_phone_permission">Cannot make call without phone permission</string>
+
+  <!-- Title of the dialog to select which SIM to call with before making a call, if the device has
+  multiple SIMs [CHAR LIMIT=40]-->
+  <string name="pre_call_select_phone_account">Choose SIM for this call</string>
+
+  <!-- Checkbox label when selecting a SIM when calling a contact, to use the selected SIM for the
+   same contact and never ask again [CHAR LIMIT=40]-->
+  <string name="pre_call_select_phone_account_remember">Remember this choice</string>
+
+  <!-- Hint to show under a SIM entry when selecting SIM for call on a multi-SIM device, when the
+  call cannot be placed with the SIM because there is already a call on the other SIM,
+  [CHAR LIMIT=NONE]-->
+  <string name="pre_call_select_phone_account_hint_other_sim_in_use">Not available while using <xliff:g example="SIM 1" id="other_sim">%1$s</xliff:g></string>
+</resources>
\ No newline at end of file
diff --git a/java/com/android/dialer/preferredsim/suggestion/AndroidManifest.xml b/java/com/android/dialer/preferredsim/suggestion/AndroidManifest.xml
new file mode 100644
index 0000000..78f7c26
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/suggestion/AndroidManifest.xml
@@ -0,0 +1,19 @@
+<!--
+ ~ Copyright (C) 2018 The Android Open Source Project
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~      http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License
+ -->
+<manifest
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.dialer.preferredsim.suggestion">
+</manifest>
diff --git a/java/com/android/dialer/preferredsim/suggestion/SuggestionProvider.java b/java/com/android/dialer/preferredsim/suggestion/SuggestionProvider.java
index 0a91d15..50ae01f 100644
--- a/java/com/android/dialer/preferredsim/suggestion/SuggestionProvider.java
+++ b/java/com/android/dialer/preferredsim/suggestion/SuggestionProvider.java
@@ -18,14 +18,19 @@
 
 import android.content.Context;
 import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 import android.support.annotation.WorkerThread;
 import android.telecom.PhoneAccountHandle;
 import com.android.dialer.common.Assert;
+import com.android.dialer.common.LogUtil;
 import com.google.common.base.Optional;
 
 /** Provides hints to the user when selecting a SIM to make a call. */
+@SuppressWarnings("Guava")
 public interface SuggestionProvider {
 
+  String EXTRA_SIM_SUGGESTION_REASON = "sim_suggestion_reason";
+
   /** The reason the suggestion is made. */
   enum Reason {
     UNKNOWN,
@@ -72,4 +77,27 @@
   @WorkerThread
   void reportIncorrectSuggestion(
       @NonNull Context context, @NonNull String number, @NonNull PhoneAccountHandle newAccount);
+
+  /**
+   * Return the hint for {@code phoneAccountHandle}. Absent if no hint is available for the account.
+   */
+  static Optional<String> getHint(
+      Context context, PhoneAccountHandle phoneAccountHandle, @Nullable Suggestion suggestion) {
+    if (suggestion == null) {
+      return Optional.absent();
+    }
+    if (!phoneAccountHandle.equals(suggestion.phoneAccountHandle)) {
+      return Optional.absent();
+    }
+    switch (suggestion.reason) {
+      case INTRA_CARRIER:
+        return Optional.of(
+            context.getString(R.string.pre_call_select_phone_account_hint_intra_carrier));
+      case FREQUENT:
+        return Optional.of(context.getString(R.string.pre_call_select_phone_account_hint_frequent));
+      default:
+        LogUtil.w("CallingAccountSelector.getHint", "unhandled reason " + suggestion.reason);
+        return Optional.absent();
+    }
+  }
 }
diff --git a/java/com/android/dialer/preferredsim/suggestion/res/values-af/strings.xml b/java/com/android/dialer/preferredsim/suggestion/res/values-af/strings.xml
new file mode 100644
index 0000000..736b5cc
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/suggestion/res/values-af/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="pre_call_select_phone_account_hint_intra_carrier">Gebruik dieselfde diensverskaffer</string>
+  <string name="pre_call_select_phone_account_hint_frequent">Onlangs gebruik</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/suggestion/res/values-am/strings.xml b/java/com/android/dialer/preferredsim/suggestion/res/values-am/strings.xml
new file mode 100644
index 0000000..b74e2db
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/suggestion/res/values-am/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="pre_call_select_phone_account_hint_intra_carrier">ተመሳሳይ አገልግሎት አቅራቢ ይጠቀማል</string>
+  <string name="pre_call_select_phone_account_hint_frequent">በቅርቡ ጥቅም ላይ የዋለ</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/suggestion/res/values-ar/strings.xml b/java/com/android/dialer/preferredsim/suggestion/res/values-ar/strings.xml
new file mode 100644
index 0000000..1b8ee6b
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/suggestion/res/values-ar/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="pre_call_select_phone_account_hint_intra_carrier">تستخدم مشغل شبكة الجوال نفسه</string>
+  <string name="pre_call_select_phone_account_hint_frequent">المستخدمة حديثًا</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/suggestion/res/values-az/strings.xml b/java/com/android/dialer/preferredsim/suggestion/res/values-az/strings.xml
new file mode 100644
index 0000000..366839d
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/suggestion/res/values-az/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="pre_call_select_phone_account_hint_intra_carrier">Eyni operator istifadə olunur</string>
+  <string name="pre_call_select_phone_account_hint_frequent">Son zamanlar istifadə edilib</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/suggestion/res/values-b+sr+Latn/strings.xml b/java/com/android/dialer/preferredsim/suggestion/res/values-b+sr+Latn/strings.xml
new file mode 100644
index 0000000..797a07f
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/suggestion/res/values-b+sr+Latn/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="pre_call_select_phone_account_hint_intra_carrier">Isti mobilni operater</string>
+  <string name="pre_call_select_phone_account_hint_frequent">Nedavno korišćeno</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/suggestion/res/values-be/strings.xml b/java/com/android/dialer/preferredsim/suggestion/res/values-be/strings.xml
new file mode 100644
index 0000000..80e47a4
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/suggestion/res/values-be/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="pre_call_select_phone_account_hint_intra_carrier">Аднолькавы аператар</string>
+  <string name="pre_call_select_phone_account_hint_frequent">Выкарыстоўвалася нядаўна</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/suggestion/res/values-bg/strings.xml b/java/com/android/dialer/preferredsim/suggestion/res/values-bg/strings.xml
new file mode 100644
index 0000000..ca643d3
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/suggestion/res/values-bg/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="pre_call_select_phone_account_hint_intra_carrier">Използва същия оператор</string>
+  <string name="pre_call_select_phone_account_hint_frequent">Наскоро използвана</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/suggestion/res/values-bn/strings.xml b/java/com/android/dialer/preferredsim/suggestion/res/values-bn/strings.xml
new file mode 100644
index 0000000..00a802e
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/suggestion/res/values-bn/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="pre_call_select_phone_account_hint_intra_carrier">একই পরিষেবা প্রদানকারীতে চলে</string>
+  <string name="pre_call_select_phone_account_hint_frequent">সম্প্রতি ব্যবহৃত</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/suggestion/res/values-bs/strings.xml b/java/com/android/dialer/preferredsim/suggestion/res/values-bs/strings.xml
new file mode 100644
index 0000000..6341e17
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/suggestion/res/values-bs/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="pre_call_select_phone_account_hint_intra_carrier">Koristi istog mobilnog operatera</string>
+  <string name="pre_call_select_phone_account_hint_frequent">Nedavno korišteno</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/suggestion/res/values-ca/strings.xml b/java/com/android/dialer/preferredsim/suggestion/res/values-ca/strings.xml
new file mode 100644
index 0000000..6b56751
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/suggestion/res/values-ca/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="pre_call_select_phone_account_hint_intra_carrier">Utilitza el mateix operador de telefonia mòbil</string>
+  <string name="pre_call_select_phone_account_hint_frequent">Utilitzada fa poc</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/suggestion/res/values-cs/strings.xml b/java/com/android/dialer/preferredsim/suggestion/res/values-cs/strings.xml
new file mode 100644
index 0000000..193bbee
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/suggestion/res/values-cs/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="pre_call_select_phone_account_hint_intra_carrier">Používá stejného operátora</string>
+  <string name="pre_call_select_phone_account_hint_frequent">Nedávno použitá</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/suggestion/res/values-da/strings.xml b/java/com/android/dialer/preferredsim/suggestion/res/values-da/strings.xml
new file mode 100644
index 0000000..8926e6f
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/suggestion/res/values-da/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="pre_call_select_phone_account_hint_intra_carrier">Bruger samme mobilselskab</string>
+  <string name="pre_call_select_phone_account_hint_frequent">Brugt for nylig</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/suggestion/res/values-de/strings.xml b/java/com/android/dialer/preferredsim/suggestion/res/values-de/strings.xml
new file mode 100644
index 0000000..ae737b9
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/suggestion/res/values-de/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="pre_call_select_phone_account_hint_intra_carrier">Verwendet den gleichen Mobilfunkanbieter</string>
+  <string name="pre_call_select_phone_account_hint_frequent">Zuletzt verwendet</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/suggestion/res/values-el/strings.xml b/java/com/android/dialer/preferredsim/suggestion/res/values-el/strings.xml
new file mode 100644
index 0000000..a3b7129
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/suggestion/res/values-el/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="pre_call_select_phone_account_hint_intra_carrier">Χρησιμοποιεί την ίδια εταιρεία κινητής</string>
+  <string name="pre_call_select_phone_account_hint_frequent">Χρησιμοποιήθηκαν πρόσφατα</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/suggestion/res/values-en-rAU/strings.xml b/java/com/android/dialer/preferredsim/suggestion/res/values-en-rAU/strings.xml
new file mode 100644
index 0000000..9fae411
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/suggestion/res/values-en-rAU/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="pre_call_select_phone_account_hint_intra_carrier">Uses same operator</string>
+  <string name="pre_call_select_phone_account_hint_frequent">Recently used</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/suggestion/res/values-en-rGB/strings.xml b/java/com/android/dialer/preferredsim/suggestion/res/values-en-rGB/strings.xml
new file mode 100644
index 0000000..9fae411
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/suggestion/res/values-en-rGB/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="pre_call_select_phone_account_hint_intra_carrier">Uses same operator</string>
+  <string name="pre_call_select_phone_account_hint_frequent">Recently used</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/suggestion/res/values-en-rIN/strings.xml b/java/com/android/dialer/preferredsim/suggestion/res/values-en-rIN/strings.xml
new file mode 100644
index 0000000..9fae411
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/suggestion/res/values-en-rIN/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="pre_call_select_phone_account_hint_intra_carrier">Uses same operator</string>
+  <string name="pre_call_select_phone_account_hint_frequent">Recently used</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/suggestion/res/values-es-rUS/strings.xml b/java/com/android/dialer/preferredsim/suggestion/res/values-es-rUS/strings.xml
new file mode 100644
index 0000000..a29a1ca
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/suggestion/res/values-es-rUS/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="pre_call_select_phone_account_hint_intra_carrier">Tiene el mismo proveedor</string>
+  <string name="pre_call_select_phone_account_hint_frequent">Se usó recientemente</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/suggestion/res/values-es/strings.xml b/java/com/android/dialer/preferredsim/suggestion/res/values-es/strings.xml
new file mode 100644
index 0000000..45429c5
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/suggestion/res/values-es/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="pre_call_select_phone_account_hint_intra_carrier">Usa el mismo operador</string>
+  <string name="pre_call_select_phone_account_hint_frequent">Usada recientemente</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/suggestion/res/values-et/strings.xml b/java/com/android/dialer/preferredsim/suggestion/res/values-et/strings.xml
new file mode 100644
index 0000000..7e189f7
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/suggestion/res/values-et/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="pre_call_select_phone_account_hint_intra_carrier">Kasutab sama operaatorit</string>
+  <string name="pre_call_select_phone_account_hint_frequent">Hiljuti kasutatud</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/suggestion/res/values-eu/strings.xml b/java/com/android/dialer/preferredsim/suggestion/res/values-eu/strings.xml
new file mode 100644
index 0000000..7950941
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/suggestion/res/values-eu/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="pre_call_select_phone_account_hint_intra_carrier">Operadore berbera erabiltzen du</string>
+  <string name="pre_call_select_phone_account_hint_frequent">Azkenaldian erabilitako SIM txartela</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/suggestion/res/values-fa/strings.xml b/java/com/android/dialer/preferredsim/suggestion/res/values-fa/strings.xml
new file mode 100644
index 0000000..83922e7
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/suggestion/res/values-fa/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="pre_call_select_phone_account_hint_intra_carrier">از شرکت مخابراتی یکسانی استفاده می‌کند</string>
+  <string name="pre_call_select_phone_account_hint_frequent">اخیراً استفاده‌شده</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/suggestion/res/values-fi/strings.xml b/java/com/android/dialer/preferredsim/suggestion/res/values-fi/strings.xml
new file mode 100644
index 0000000..8533d10
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/suggestion/res/values-fi/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="pre_call_select_phone_account_hint_intra_carrier">Käytä samaa operaattoria</string>
+  <string name="pre_call_select_phone_account_hint_frequent">Äskettäin käytetyt</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/suggestion/res/values-fr-rCA/strings.xml b/java/com/android/dialer/preferredsim/suggestion/res/values-fr-rCA/strings.xml
new file mode 100644
index 0000000..2186ca8
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/suggestion/res/values-fr-rCA/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="pre_call_select_phone_account_hint_intra_carrier">Utilise le même fournisseur de services</string>
+  <string name="pre_call_select_phone_account_hint_frequent">Utilisée récemment</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/suggestion/res/values-fr/strings.xml b/java/com/android/dialer/preferredsim/suggestion/res/values-fr/strings.xml
new file mode 100644
index 0000000..3b66d03
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/suggestion/res/values-fr/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="pre_call_select_phone_account_hint_intra_carrier">Utilise le même opérateur</string>
+  <string name="pre_call_select_phone_account_hint_frequent">Récemment utilisée</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/suggestion/res/values-gl/strings.xml b/java/com/android/dialer/preferredsim/suggestion/res/values-gl/strings.xml
new file mode 100644
index 0000000..8902de4
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/suggestion/res/values-gl/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="pre_call_select_phone_account_hint_intra_carrier">Usa o mesmo operador</string>
+  <string name="pre_call_select_phone_account_hint_frequent">Usada recentemente</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/suggestion/res/values-gu/strings.xml b/java/com/android/dialer/preferredsim/suggestion/res/values-gu/strings.xml
new file mode 100644
index 0000000..34e0726
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/suggestion/res/values-gu/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="pre_call_select_phone_account_hint_intra_carrier">એકસમાન કૅરિઅરનો ઉપયોગ કરે છે</string>
+  <string name="pre_call_select_phone_account_hint_frequent">તાજેતરમાં ઉપયોગમાં લીધેલ</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/suggestion/res/values-hi/strings.xml b/java/com/android/dialer/preferredsim/suggestion/res/values-hi/strings.xml
new file mode 100644
index 0000000..acd02ec
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/suggestion/res/values-hi/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="pre_call_select_phone_account_hint_intra_carrier">एक ही वाहक का उपयोग करता है</string>
+  <string name="pre_call_select_phone_account_hint_frequent">हाल ही में उपयोग किया गया</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/suggestion/res/values-hr/strings.xml b/java/com/android/dialer/preferredsim/suggestion/res/values-hr/strings.xml
new file mode 100644
index 0000000..a018ed7
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/suggestion/res/values-hr/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="pre_call_select_phone_account_hint_intra_carrier">Upotrebljava isti mobilni operater</string>
+  <string name="pre_call_select_phone_account_hint_frequent">Nedavno korišteno</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/suggestion/res/values-hu/strings.xml b/java/com/android/dialer/preferredsim/suggestion/res/values-hu/strings.xml
new file mode 100644
index 0000000..c569477
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/suggestion/res/values-hu/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="pre_call_select_phone_account_hint_intra_carrier">Ugyanaz a szolgáltató</string>
+  <string name="pre_call_select_phone_account_hint_frequent">Legutóbb használt</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/suggestion/res/values-hy/strings.xml b/java/com/android/dialer/preferredsim/suggestion/res/values-hy/strings.xml
new file mode 100644
index 0000000..b5c3d70
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/suggestion/res/values-hy/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="pre_call_select_phone_account_hint_intra_carrier">Օգտագործվում է միևնույն կապի օպերատորը</string>
+  <string name="pre_call_select_phone_account_hint_frequent">Վերջերս օգտագործված</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/suggestion/res/values-in/strings.xml b/java/com/android/dialer/preferredsim/suggestion/res/values-in/strings.xml
new file mode 100644
index 0000000..92ba7cb
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/suggestion/res/values-in/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="pre_call_select_phone_account_hint_intra_carrier">Menggunakan operator yang sama</string>
+  <string name="pre_call_select_phone_account_hint_frequent">Baru saja digunakan</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/suggestion/res/values-is/strings.xml b/java/com/android/dialer/preferredsim/suggestion/res/values-is/strings.xml
new file mode 100644
index 0000000..a702035
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/suggestion/res/values-is/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="pre_call_select_phone_account_hint_intra_carrier">Notar sama símafyrirtæki</string>
+  <string name="pre_call_select_phone_account_hint_frequent">Notað nýlega</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/suggestion/res/values-it/strings.xml b/java/com/android/dialer/preferredsim/suggestion/res/values-it/strings.xml
new file mode 100644
index 0000000..e52d309
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/suggestion/res/values-it/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="pre_call_select_phone_account_hint_intra_carrier">Utilizza lo stesso operatore</string>
+  <string name="pre_call_select_phone_account_hint_frequent">Utilizzata di recente</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/suggestion/res/values-iw/strings.xml b/java/com/android/dialer/preferredsim/suggestion/res/values-iw/strings.xml
new file mode 100644
index 0000000..340108d
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/suggestion/res/values-iw/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="pre_call_select_phone_account_hint_intra_carrier">שימוש באותו ספק סלולרי</string>
+  <string name="pre_call_select_phone_account_hint_frequent">בשימוש לאחרונה</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/suggestion/res/values-ja/strings.xml b/java/com/android/dialer/preferredsim/suggestion/res/values-ja/strings.xml
new file mode 100644
index 0000000..088bdf6
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/suggestion/res/values-ja/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="pre_call_select_phone_account_hint_intra_carrier">同じ携帯通信会社の SIM</string>
+  <string name="pre_call_select_phone_account_hint_frequent">最近使用した SIM</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/suggestion/res/values-ka/strings.xml b/java/com/android/dialer/preferredsim/suggestion/res/values-ka/strings.xml
new file mode 100644
index 0000000..a4c3380
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/suggestion/res/values-ka/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="pre_call_select_phone_account_hint_intra_carrier">იყენებს იმავე ოპერატორს</string>
+  <string name="pre_call_select_phone_account_hint_frequent">გამოყენებულია ახლახან</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/suggestion/res/values-kk/strings.xml b/java/com/android/dialer/preferredsim/suggestion/res/values-kk/strings.xml
new file mode 100644
index 0000000..037aab5
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/suggestion/res/values-kk/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="pre_call_select_phone_account_hint_intra_carrier">Бір операторды қолданады</string>
+  <string name="pre_call_select_phone_account_hint_frequent">Жуықта қолданылған</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/suggestion/res/values-km/strings.xml b/java/com/android/dialer/preferredsim/suggestion/res/values-km/strings.xml
new file mode 100644
index 0000000..59abe7a
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/suggestion/res/values-km/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="pre_call_select_phone_account_hint_intra_carrier">ប្រើប្រាស់​ក្រុមហ៊ុន​សេវា​ទូរសព្ទ​ដូចគ្នា</string>
+  <string name="pre_call_select_phone_account_hint_frequent">បាន​ប្រើ​ថ្មីៗ</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/suggestion/res/values-kn/strings.xml b/java/com/android/dialer/preferredsim/suggestion/res/values-kn/strings.xml
new file mode 100644
index 0000000..5ede9a4
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/suggestion/res/values-kn/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="pre_call_select_phone_account_hint_intra_carrier">ಅದೇ ವಾಹಕವನ್ನು ಬಳಸುತ್ತದೆ</string>
+  <string name="pre_call_select_phone_account_hint_frequent">ಇತ್ತೀಚೆಗೆ ಬಳಸಲಾದ</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/suggestion/res/values-ko/strings.xml b/java/com/android/dialer/preferredsim/suggestion/res/values-ko/strings.xml
new file mode 100644
index 0000000..3be323a
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/suggestion/res/values-ko/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="pre_call_select_phone_account_hint_intra_carrier">동일한 이동통신사 사용</string>
+  <string name="pre_call_select_phone_account_hint_frequent">최근에 사용한 SIM</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/suggestion/res/values-ky/strings.xml b/java/com/android/dialer/preferredsim/suggestion/res/values-ky/strings.xml
new file mode 100644
index 0000000..b07837f
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/suggestion/res/values-ky/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="pre_call_select_phone_account_hint_intra_carrier">Ошол эле байланыш операторун колдонот</string>
+  <string name="pre_call_select_phone_account_hint_frequent">Акыркы колдонулган SIM карта</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/suggestion/res/values-lo/strings.xml b/java/com/android/dialer/preferredsim/suggestion/res/values-lo/strings.xml
new file mode 100644
index 0000000..549efdf
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/suggestion/res/values-lo/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="pre_call_select_phone_account_hint_intra_carrier">ໃຊ້ຜູ້ໃຫ້ບໍລິການດຽວກັນ</string>
+  <string name="pre_call_select_phone_account_hint_frequent">ໃຊ້ຫຼ້າສຸດ</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/suggestion/res/values-lt/strings.xml b/java/com/android/dialer/preferredsim/suggestion/res/values-lt/strings.xml
new file mode 100644
index 0000000..912e0da
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/suggestion/res/values-lt/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="pre_call_select_phone_account_hint_intra_carrier">Naud. to paties operatoriaus paslaugomis</string>
+  <string name="pre_call_select_phone_account_hint_frequent">Neseniai naudota</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/suggestion/res/values-lv/strings.xml b/java/com/android/dialer/preferredsim/suggestion/res/values-lv/strings.xml
new file mode 100644
index 0000000..9630381
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/suggestion/res/values-lv/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="pre_call_select_phone_account_hint_intra_carrier">Izmanto to pašu mobilo sakaru operatoru</string>
+  <string name="pre_call_select_phone_account_hint_frequent">Nesen izmantota</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/suggestion/res/values-mk/strings.xml b/java/com/android/dialer/preferredsim/suggestion/res/values-mk/strings.xml
new file mode 100644
index 0000000..6abcf58
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/suggestion/res/values-mk/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="pre_call_select_phone_account_hint_intra_carrier">Го користи истиот оператор</string>
+  <string name="pre_call_select_phone_account_hint_frequent">Неодамна користено</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/suggestion/res/values-ml/strings.xml b/java/com/android/dialer/preferredsim/suggestion/res/values-ml/strings.xml
new file mode 100644
index 0000000..32bada4
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/suggestion/res/values-ml/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="pre_call_select_phone_account_hint_intra_carrier">ഒരേ കാരിയറെ തന്നെ ഉപയോഗിക്കുന്നു</string>
+  <string name="pre_call_select_phone_account_hint_frequent">അടുത്തിടെ ഉപയോഗിച്ചത്</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/suggestion/res/values-mn/strings.xml b/java/com/android/dialer/preferredsim/suggestion/res/values-mn/strings.xml
new file mode 100644
index 0000000..e2ddd8f
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/suggestion/res/values-mn/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="pre_call_select_phone_account_hint_intra_carrier">Ижил үүрэн холбооны компани ашиглах</string>
+  <string name="pre_call_select_phone_account_hint_frequent">Саяхан ашигласан</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/suggestion/res/values-mr/strings.xml b/java/com/android/dialer/preferredsim/suggestion/res/values-mr/strings.xml
new file mode 100644
index 0000000..38f3987
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/suggestion/res/values-mr/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="pre_call_select_phone_account_hint_intra_carrier">तोच वाहक वापरते</string>
+  <string name="pre_call_select_phone_account_hint_frequent">अलीकडे वापरलेले</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/suggestion/res/values-ms/strings.xml b/java/com/android/dialer/preferredsim/suggestion/res/values-ms/strings.xml
new file mode 100644
index 0000000..f7fb4a9
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/suggestion/res/values-ms/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="pre_call_select_phone_account_hint_intra_carrier">Menggunakan pembawa yang sama</string>
+  <string name="pre_call_select_phone_account_hint_frequent">Digunakan baru-baru ini</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/suggestion/res/values-my/strings.xml b/java/com/android/dialer/preferredsim/suggestion/res/values-my/strings.xml
new file mode 100644
index 0000000..1212c49
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/suggestion/res/values-my/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="pre_call_select_phone_account_hint_intra_carrier">တူညီသောဖုန်းလိုင်းကို အသုံးပြုသည်</string>
+  <string name="pre_call_select_phone_account_hint_frequent">လတ်တလော အသုံးပြုထားသည်</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/suggestion/res/values-nb/strings.xml b/java/com/android/dialer/preferredsim/suggestion/res/values-nb/strings.xml
new file mode 100644
index 0000000..4b29392
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/suggestion/res/values-nb/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="pre_call_select_phone_account_hint_intra_carrier">Bruker samme operatør</string>
+  <string name="pre_call_select_phone_account_hint_frequent">Nylig brukt</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/suggestion/res/values-ne/strings.xml b/java/com/android/dialer/preferredsim/suggestion/res/values-ne/strings.xml
new file mode 100644
index 0000000..31b85a3
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/suggestion/res/values-ne/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="pre_call_select_phone_account_hint_intra_carrier">उही सेवा प्रदायक प्रयोग गर्दछ</string>
+  <string name="pre_call_select_phone_account_hint_frequent">हालै प्रयोग गरिएको</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/suggestion/res/values-nl/strings.xml b/java/com/android/dialer/preferredsim/suggestion/res/values-nl/strings.xml
new file mode 100644
index 0000000..f6cfb1b
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/suggestion/res/values-nl/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="pre_call_select_phone_account_hint_intra_carrier">Gebruikt dezelfde provider</string>
+  <string name="pre_call_select_phone_account_hint_frequent">Onlangs gebruikt</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/suggestion/res/values-no/strings.xml b/java/com/android/dialer/preferredsim/suggestion/res/values-no/strings.xml
new file mode 100644
index 0000000..4b29392
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/suggestion/res/values-no/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="pre_call_select_phone_account_hint_intra_carrier">Bruker samme operatør</string>
+  <string name="pre_call_select_phone_account_hint_frequent">Nylig brukt</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/suggestion/res/values-pa/strings.xml b/java/com/android/dialer/preferredsim/suggestion/res/values-pa/strings.xml
new file mode 100644
index 0000000..ac530e9
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/suggestion/res/values-pa/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="pre_call_select_phone_account_hint_intra_carrier">ਇੱਕੋ ਕੈਰੀਅਰ ਦੀ ਵਰਤੋਂ ਕਰਦਾ ਹੈ</string>
+  <string name="pre_call_select_phone_account_hint_frequent">ਹਾਲ ਹੀ ਵਿੱਚ ਵਰਤਿਆ ਗਿਆ</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/suggestion/res/values-pl/strings.xml b/java/com/android/dialer/preferredsim/suggestion/res/values-pl/strings.xml
new file mode 100644
index 0000000..1122f34
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/suggestion/res/values-pl/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="pre_call_select_phone_account_hint_intra_carrier">Ten sam operator</string>
+  <string name="pre_call_select_phone_account_hint_frequent">Ostatnio używane</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/suggestion/res/values-pt-rBR/strings.xml b/java/com/android/dialer/preferredsim/suggestion/res/values-pt-rBR/strings.xml
new file mode 100644
index 0000000..6a70cff
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/suggestion/res/values-pt-rBR/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="pre_call_select_phone_account_hint_intra_carrier">Usa a mesma operadora</string>
+  <string name="pre_call_select_phone_account_hint_frequent">Usado recentemente</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/suggestion/res/values-pt-rPT/strings.xml b/java/com/android/dialer/preferredsim/suggestion/res/values-pt-rPT/strings.xml
new file mode 100644
index 0000000..fb3e3d7
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/suggestion/res/values-pt-rPT/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="pre_call_select_phone_account_hint_intra_carrier">Utiliza o mesmo operador</string>
+  <string name="pre_call_select_phone_account_hint_frequent">Utilizado recentemente</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/suggestion/res/values-pt/strings.xml b/java/com/android/dialer/preferredsim/suggestion/res/values-pt/strings.xml
new file mode 100644
index 0000000..6a70cff
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/suggestion/res/values-pt/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="pre_call_select_phone_account_hint_intra_carrier">Usa a mesma operadora</string>
+  <string name="pre_call_select_phone_account_hint_frequent">Usado recentemente</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/suggestion/res/values-ro/strings.xml b/java/com/android/dialer/preferredsim/suggestion/res/values-ro/strings.xml
new file mode 100644
index 0000000..ffcac40
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/suggestion/res/values-ro/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="pre_call_select_phone_account_hint_intra_carrier">Folosește același operator</string>
+  <string name="pre_call_select_phone_account_hint_frequent">Utilizat recent</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/suggestion/res/values-ru/strings.xml b/java/com/android/dialer/preferredsim/suggestion/res/values-ru/strings.xml
new file mode 100644
index 0000000..71fe234
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/suggestion/res/values-ru/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="pre_call_select_phone_account_hint_intra_carrier">Тот же оператор</string>
+  <string name="pre_call_select_phone_account_hint_frequent">Использовалась недавно</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/suggestion/res/values-si/strings.xml b/java/com/android/dialer/preferredsim/suggestion/res/values-si/strings.xml
new file mode 100644
index 0000000..7dab96e
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/suggestion/res/values-si/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="pre_call_select_phone_account_hint_intra_carrier">එකම වාහකය භාවිත කරයි</string>
+  <string name="pre_call_select_phone_account_hint_frequent">මෑතකදී භාවිත කළ</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/suggestion/res/values-sk/strings.xml b/java/com/android/dialer/preferredsim/suggestion/res/values-sk/strings.xml
new file mode 100644
index 0000000..d1b0598
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/suggestion/res/values-sk/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="pre_call_select_phone_account_hint_intra_carrier">Používa rovnakého operátora</string>
+  <string name="pre_call_select_phone_account_hint_frequent">Nedávno použitá</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/suggestion/res/values-sl/strings.xml b/java/com/android/dialer/preferredsim/suggestion/res/values-sl/strings.xml
new file mode 100644
index 0000000..16525a2
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/suggestion/res/values-sl/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="pre_call_select_phone_account_hint_intra_carrier">Uporablja istega operaterja</string>
+  <string name="pre_call_select_phone_account_hint_frequent">Nedavno uporabljeno</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/suggestion/res/values-sq/strings.xml b/java/com/android/dialer/preferredsim/suggestion/res/values-sq/strings.xml
new file mode 100644
index 0000000..2de0fc7
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/suggestion/res/values-sq/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="pre_call_select_phone_account_hint_intra_carrier">Përdor të njëjtin operator celular</string>
+  <string name="pre_call_select_phone_account_hint_frequent">Përdorur së fundi</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/suggestion/res/values-sr/strings.xml b/java/com/android/dialer/preferredsim/suggestion/res/values-sr/strings.xml
new file mode 100644
index 0000000..752a2b1
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/suggestion/res/values-sr/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="pre_call_select_phone_account_hint_intra_carrier">Исти мобилни оператер</string>
+  <string name="pre_call_select_phone_account_hint_frequent">Недавно коришћенo</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/suggestion/res/values-sv/strings.xml b/java/com/android/dialer/preferredsim/suggestion/res/values-sv/strings.xml
new file mode 100644
index 0000000..e5ed277
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/suggestion/res/values-sv/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="pre_call_select_phone_account_hint_intra_carrier">Använder samma operatör</string>
+  <string name="pre_call_select_phone_account_hint_frequent">Senast använt</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/suggestion/res/values-sw/strings.xml b/java/com/android/dialer/preferredsim/suggestion/res/values-sw/strings.xml
new file mode 100644
index 0000000..0f907eb
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/suggestion/res/values-sw/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="pre_call_select_phone_account_hint_intra_carrier">Mtoa huduma za mtandao yule yule</string>
+  <string name="pre_call_select_phone_account_hint_frequent">Iliyotumika hivi majuzi</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/suggestion/res/values-ta/strings.xml b/java/com/android/dialer/preferredsim/suggestion/res/values-ta/strings.xml
new file mode 100644
index 0000000..b14d5af
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/suggestion/res/values-ta/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="pre_call_select_phone_account_hint_intra_carrier">அதே மொபைல் நிறுவனத்தைப் பயன்படுத்தும்</string>
+  <string name="pre_call_select_phone_account_hint_frequent">சமீபத்தில் பயன்படுத்தியது</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/suggestion/res/values-te/strings.xml b/java/com/android/dialer/preferredsim/suggestion/res/values-te/strings.xml
new file mode 100644
index 0000000..d32778b
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/suggestion/res/values-te/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="pre_call_select_phone_account_hint_intra_carrier">అదే క్యారియర్‌ని ఉపయోగిస్తుంది</string>
+  <string name="pre_call_select_phone_account_hint_frequent">ఇటీవల ఉపయోగించినవి</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/suggestion/res/values-th/strings.xml b/java/com/android/dialer/preferredsim/suggestion/res/values-th/strings.xml
new file mode 100644
index 0000000..169a449
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/suggestion/res/values-th/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="pre_call_select_phone_account_hint_intra_carrier">ใช้ผู้ให้บริการเดียวกัน</string>
+  <string name="pre_call_select_phone_account_hint_frequent">ใช้ล่าสุด</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/suggestion/res/values-tl/strings.xml b/java/com/android/dialer/preferredsim/suggestion/res/values-tl/strings.xml
new file mode 100644
index 0000000..bf1d257
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/suggestion/res/values-tl/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="pre_call_select_phone_account_hint_intra_carrier">Gumagamit ng parehong carrier</string>
+  <string name="pre_call_select_phone_account_hint_frequent">Ginamit kamakailan</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/suggestion/res/values-tr/strings.xml b/java/com/android/dialer/preferredsim/suggestion/res/values-tr/strings.xml
new file mode 100644
index 0000000..8a3260a
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/suggestion/res/values-tr/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="pre_call_select_phone_account_hint_intra_carrier">Aynı operatörü kullanır</string>
+  <string name="pre_call_select_phone_account_hint_frequent">Son kullanılan</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/suggestion/res/values-uk/strings.xml b/java/com/android/dialer/preferredsim/suggestion/res/values-uk/strings.xml
new file mode 100644
index 0000000..966c6b4
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/suggestion/res/values-uk/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="pre_call_select_phone_account_hint_intra_carrier">Використовується той самий оператор</string>
+  <string name="pre_call_select_phone_account_hint_frequent">Нещодавно використана</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/suggestion/res/values-ur/strings.xml b/java/com/android/dialer/preferredsim/suggestion/res/values-ur/strings.xml
new file mode 100644
index 0000000..023b823
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/suggestion/res/values-ur/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="pre_call_select_phone_account_hint_intra_carrier">اسی کیریئر کا استعمال کرتا ہے</string>
+  <string name="pre_call_select_phone_account_hint_frequent">حال ہی میں استعمال شدہ</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/suggestion/res/values-uz/strings.xml b/java/com/android/dialer/preferredsim/suggestion/res/values-uz/strings.xml
new file mode 100644
index 0000000..f8dad04
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/suggestion/res/values-uz/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="pre_call_select_phone_account_hint_intra_carrier">Shu aloqa operatori</string>
+  <string name="pre_call_select_phone_account_hint_frequent">Yaqinda ishlatilgan</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/suggestion/res/values-vi/strings.xml b/java/com/android/dialer/preferredsim/suggestion/res/values-vi/strings.xml
new file mode 100644
index 0000000..14f3811
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/suggestion/res/values-vi/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="pre_call_select_phone_account_hint_intra_carrier">Sử dụng cùng một nhà mạng</string>
+  <string name="pre_call_select_phone_account_hint_frequent">Đã dùng gần đây</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/suggestion/res/values-zh-rCN/strings.xml b/java/com/android/dialer/preferredsim/suggestion/res/values-zh-rCN/strings.xml
new file mode 100644
index 0000000..a6c2eba
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/suggestion/res/values-zh-rCN/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="pre_call_select_phone_account_hint_intra_carrier">使用相同运营商的 SIM 卡</string>
+  <string name="pre_call_select_phone_account_hint_frequent">最近用过的 SIM 卡</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/suggestion/res/values-zh-rHK/strings.xml b/java/com/android/dialer/preferredsim/suggestion/res/values-zh-rHK/strings.xml
new file mode 100644
index 0000000..14d2d00
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/suggestion/res/values-zh-rHK/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="pre_call_select_phone_account_hint_intra_carrier">使用相同流動網絡供應商</string>
+  <string name="pre_call_select_phone_account_hint_frequent">最近使用的</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/suggestion/res/values-zh-rTW/strings.xml b/java/com/android/dialer/preferredsim/suggestion/res/values-zh-rTW/strings.xml
new file mode 100644
index 0000000..abeb35d
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/suggestion/res/values-zh-rTW/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="pre_call_select_phone_account_hint_intra_carrier">使用此號碼所屬電信業者提供的 SIM 卡</string>
+  <string name="pre_call_select_phone_account_hint_frequent">最近使用過的 SIM 卡</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/suggestion/res/values-zu/strings.xml b/java/com/android/dialer/preferredsim/suggestion/res/values-zu/strings.xml
new file mode 100644
index 0000000..b5e307d
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/suggestion/res/values-zu/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="pre_call_select_phone_account_hint_intra_carrier">Isebenzisa inkampani yenethiwekhi efanayo</string>
+  <string name="pre_call_select_phone_account_hint_frequent">Okusetshenziswe kamuva</string>
+</resources>
diff --git a/java/com/android/dialer/preferredsim/suggestion/res/values/strings.xml b/java/com/android/dialer/preferredsim/suggestion/res/values/strings.xml
new file mode 100644
index 0000000..c417531
--- /dev/null
+++ b/java/com/android/dialer/preferredsim/suggestion/res/values/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2018 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+<resources>
+<!-- Hint text under a SIM when selecting SIM to call, indicating the SIM is on the same carrier
+ as the outgoing call.[CHAR LIMIT=40]-->
+<string name="pre_call_select_phone_account_hint_intra_carrier">Uses same carrier</string>
+
+    <!-- Hint text under a SIM when selecting SIM to call, indicating user often use the SIM to call
+    the contact.[CHAR LIMIT=40]-->
+<string name="pre_call_select_phone_account_hint_frequent">Recently used</string>
+</resources>
\ No newline at end of file
diff --git a/java/com/android/dialer/promotion/Promotion.java b/java/com/android/dialer/promotion/Promotion.java
new file mode 100644
index 0000000..176606f
--- /dev/null
+++ b/java/com/android/dialer/promotion/Promotion.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.dialer.promotion;
+
+import android.support.annotation.DrawableRes;
+import android.support.annotation.IntDef;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+/** Interface for promotion bottom sheet. */
+public interface Promotion {
+
+  /**
+   * Type of promotion, which means promotion should be shown as a card in {@link
+   * android.support.v7.widget.RecyclerView} or {@link
+   * android.support.design.bottomsheet.BottomSheetBehavior}.
+   */
+  @Retention(RetentionPolicy.SOURCE)
+  @IntDef({PromotionType.CARD, PromotionType.BOTTOM_SHEET})
+  @interface PromotionType {
+    /** Shown as card in call log or voicemail tab. */
+    int CARD = 1;
+
+    /** Shown as bottom sheet. */
+    int BOTTOM_SHEET = 2;
+  }
+
+  /** Returns {@link PromotionType} for this promotion. */
+  @PromotionType
+  int getType();
+
+  /**
+   * Returns if this promotion should be shown. This usually means the promotion is enabled and not
+   * dismissed yet.
+   */
+  boolean isEligibleToBeShown();
+
+  /** Called when this promotion is first time viewed by user. */
+  default void onViewed() {}
+
+  /** Dismisses this promotion. This is called when user acknowledged the promotion. */
+  void dismiss();
+
+  /** Returns title text of the promotion. */
+  CharSequence getTitle();
+
+  /** Returns details text of the promotion. */
+  CharSequence getDetails();
+
+  /** Returns resource id of the icon for the promotion. */
+  @DrawableRes
+  int getIconRes();
+}
diff --git a/java/com/android/dialer/promotion/PromotionComponent.java b/java/com/android/dialer/promotion/PromotionComponent.java
new file mode 100644
index 0000000..caf10db
--- /dev/null
+++ b/java/com/android/dialer/promotion/PromotionComponent.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.dialer.promotion;
+
+import android.content.Context;
+import com.android.dialer.inject.HasRootComponent;
+import com.android.dialer.inject.IncludeInDialerRoot;
+import com.google.common.collect.ImmutableList;
+import dagger.Subcomponent;
+
+/** Component for promotion. */
+@Subcomponent
+public abstract class PromotionComponent {
+
+  public abstract PromotionManager promotionManager();
+
+  public abstract ImmutableList<Promotion> priorityPromotionList();
+
+  public static PromotionComponent get(Context context) {
+    return ((HasComponent) ((HasRootComponent) context.getApplicationContext()).component())
+        .promotionComponent();
+  }
+
+  /** Used to refer to the root application component. */
+  @IncludeInDialerRoot
+  public interface HasComponent {
+    PromotionComponent promotionComponent();
+  }
+}
diff --git a/java/com/android/dialer/promotion/PromotionManager.java b/java/com/android/dialer/promotion/PromotionManager.java
new file mode 100644
index 0000000..24830de
--- /dev/null
+++ b/java/com/android/dialer/promotion/PromotionManager.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.dialer.promotion;
+
+import com.android.dialer.promotion.Promotion.PromotionType;
+import com.google.common.collect.ImmutableList;
+import java.util.Optional;
+import javax.inject.Inject;
+
+/**
+ * A class to manage all promotion cards/bottom sheet.
+ *
+ * <p>Only one promotion with highest priority will be shown at a time no matter type. So if there
+ * are one card and one bottom sheet promotion, either one will be shown instead of both.
+ */
+public final class PromotionManager {
+
+  /** Promotion priority order list. Promotions with higher priority must be added first. */
+  private ImmutableList<Promotion> priorityPromotionList;
+
+  @Inject
+  public PromotionManager(ImmutableList<Promotion> priorityPromotionList) {
+    this.priorityPromotionList = priorityPromotionList;
+  }
+
+  /**
+   * Returns promotion should show with highest priority. {@link Optional#empty()} if no promotion
+   * should be shown with given {@link PromotionType}.
+   *
+   * <p>e.g. if FooPromotion(card, high priority) and BarPromotion(bottom sheet, low priority) are
+   * both enabled, getHighestPriorityPromotion(CARD) returns Optional.of(FooPromotion) but
+   * getHighestPriorityPromotion(BOTTOM_SHEET) returns {@link Optional#empty()}.
+   *
+   * <p>Currently it only supports promotion in call log tab.
+   *
+   * <p>TODO(wangqi): add support for other tabs.
+   */
+  public Optional<Promotion> getHighestPriorityPromotion(@PromotionType int type) {
+    for (Promotion promotion : priorityPromotionList) {
+      if (promotion.isEligibleToBeShown()) {
+        if (promotion.getType() == type) {
+          return Optional.of(promotion);
+        } else {
+          // Returns empty promotion since it's not the type looking for and only one promotion
+          // should be shown at a time.
+          return Optional.empty();
+        }
+      }
+    }
+    return Optional.empty();
+  }
+}
diff --git a/java/com/android/dialer/promotion/impl/AndroidManifest.xml b/java/com/android/dialer/promotion/impl/AndroidManifest.xml
new file mode 100644
index 0000000..c938b9a
--- /dev/null
+++ b/java/com/android/dialer/promotion/impl/AndroidManifest.xml
@@ -0,0 +1,23 @@
+<!--
+ ~ Copyright (C) 2018 The Android Open Source Project
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~      http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License
+ -->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.dialer.promotion">
+
+  <uses-sdk
+      android:minSdkVersion="24"
+      android:targetSdkVersion="28"/>
+
+</manifest>
diff --git a/java/com/android/dialer/promotion/impl/DuoPromotion.java b/java/com/android/dialer/promotion/impl/DuoPromotion.java
new file mode 100644
index 0000000..750e4a1
--- /dev/null
+++ b/java/com/android/dialer/promotion/impl/DuoPromotion.java
@@ -0,0 +1,132 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.dialer.promotion.impl;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.support.annotation.VisibleForTesting;
+import com.android.dialer.configprovider.ConfigProvider;
+import com.android.dialer.duo.Duo;
+import com.android.dialer.inject.ApplicationContext;
+import com.android.dialer.promotion.Promotion;
+import com.android.dialer.spannable.ContentWithLearnMoreSpanner;
+import com.android.dialer.storage.Unencrypted;
+import java.util.concurrent.TimeUnit;
+import javax.inject.Inject;
+
+/** Duo promotion. */
+final class DuoPromotion implements Promotion {
+  private static final String SHARED_PREF_KEY_DUO_DISCLOSURE_DISMISSED = "duo_disclosure_dismissed";
+
+  private static final String SHARED_PREF_KEY_DUO_DISCLOSURE_FIRST_VIEW_TIME_MILLIS =
+      "duo_disclosure_first_viewed_time_ms";
+  @VisibleForTesting static final String FLAG_SHOW_DUO_DISCLOSURE = "show_duo_disclosure";
+
+  @VisibleForTesting
+  static final String FLAG_DUO_DISCLOSURE_AUTO_DISMISS_AFTER_VIEWED_TIME_MILLIS =
+      "show_duo_disclosure_auto_dismiss_after_viewed_time_millis";
+
+  private final Context appContext;
+  private final ConfigProvider configProvider;
+  private final Duo duo;
+  private final SharedPreferences sharedPreferences;
+
+  @Inject
+  DuoPromotion(
+      @ApplicationContext Context context,
+      ConfigProvider configProvider,
+      Duo duo,
+      @Unencrypted SharedPreferences sharedPreferences) {
+    this.appContext = context;
+    this.configProvider = configProvider;
+    this.duo = duo;
+    this.sharedPreferences = sharedPreferences;
+  }
+
+  @Override
+  public int getType() {
+    return PromotionType.CARD;
+  }
+
+  @Override
+  public boolean isEligibleToBeShown() {
+    if (!configProvider.getBoolean(FLAG_SHOW_DUO_DISCLOSURE, false)) {
+      return false;
+    }
+    // Don't show the Duo disclosure card if
+    // (1) Duo integration is not enabled on the device, or
+    // (2) Duo is not activated.
+    if (!duo.isEnabled(appContext) || !duo.isActivated(appContext)) {
+      return false;
+    }
+
+    // Don't show the Duo disclosure card if it has been dismissed.
+    if (sharedPreferences.getBoolean(SHARED_PREF_KEY_DUO_DISCLOSURE_DISMISSED, false)) {
+      return false;
+    }
+
+    // At this point, Duo is activated and the disclosure card hasn't been dismissed.
+    // We should show the card if it has never been viewed by the user.
+    if (!sharedPreferences.contains(SHARED_PREF_KEY_DUO_DISCLOSURE_FIRST_VIEW_TIME_MILLIS)) {
+      return true;
+    }
+
+    // At this point, the card has been viewed but not dismissed.
+    // We should not show the card if it has been viewed for more than 1 day.
+    long duoDisclosureFirstViewTimeMillis =
+        sharedPreferences.getLong(SHARED_PREF_KEY_DUO_DISCLOSURE_FIRST_VIEW_TIME_MILLIS, 0);
+    return System.currentTimeMillis() - duoDisclosureFirstViewTimeMillis
+        <= configProvider.getLong(
+            FLAG_DUO_DISCLOSURE_AUTO_DISMISS_AFTER_VIEWED_TIME_MILLIS, TimeUnit.DAYS.toMillis(1));
+  }
+
+  @Override
+  public void onViewed() {
+    if (!sharedPreferences.contains(SHARED_PREF_KEY_DUO_DISCLOSURE_FIRST_VIEW_TIME_MILLIS)) {
+      sharedPreferences
+          .edit()
+          .putLong(
+              SHARED_PREF_KEY_DUO_DISCLOSURE_FIRST_VIEW_TIME_MILLIS, System.currentTimeMillis())
+          .apply();
+    }
+  }
+
+  @Override
+  public void dismiss() {
+    sharedPreferences.edit().putBoolean(SHARED_PREF_KEY_DUO_DISCLOSURE_DISMISSED, true).apply();
+  }
+
+  @Override
+  public CharSequence getTitle() {
+    return appContext.getString(R.string.duo_disclosure_title);
+  }
+
+  @Override
+  public CharSequence getDetails() {
+    return new ContentWithLearnMoreSpanner(appContext)
+        .create(
+            appContext.getString(R.string.duo_disclosure_details),
+            configProvider.getString(
+                "duo_disclosure_link_full_url",
+                "http://support.google.com/pixelphone/?p=dialer_duo"));
+  }
+
+  @Override
+  public int getIconRes() {
+    return duo.getLogo();
+  }
+}
diff --git a/java/com/android/dialer/promotion/impl/PromotionModule.java b/java/com/android/dialer/promotion/impl/PromotionModule.java
new file mode 100644
index 0000000..f090878
--- /dev/null
+++ b/java/com/android/dialer/promotion/impl/PromotionModule.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.dialer.promotion.impl;
+
+import com.android.dialer.inject.DialerVariant;
+import com.android.dialer.inject.InstallIn;
+import com.android.dialer.promotion.Promotion;
+import com.google.common.collect.ImmutableList;
+import dagger.Module;
+import dagger.Provides;
+
+/** Module for Promotion. */
+@InstallIn(variants = {DialerVariant.DIALER_TEST})
+@Module
+public abstract class PromotionModule {
+
+  @Provides
+  static ImmutableList<Promotion> providePriorityPromotionList(
+      RttPromotion rttPromotion, DuoPromotion duoPromotion) {
+    return ImmutableList.of(rttPromotion, duoPromotion);
+  }
+}
diff --git a/java/com/android/dialer/promotion/impl/RttPromotion.java b/java/com/android/dialer/promotion/impl/RttPromotion.java
new file mode 100644
index 0000000..f0f7f54
--- /dev/null
+++ b/java/com/android/dialer/promotion/impl/RttPromotion.java
@@ -0,0 +1,94 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.dialer.promotion.impl;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.support.annotation.DrawableRes;
+import com.android.dialer.common.LogUtil;
+import com.android.dialer.configprovider.ConfigProvider;
+import com.android.dialer.inject.ApplicationContext;
+import com.android.dialer.promotion.Promotion;
+import com.android.dialer.spannable.ContentWithLearnMoreSpanner;
+import com.android.dialer.storage.StorageComponent;
+import com.android.dialer.storage.Unencrypted;
+import javax.inject.Inject;
+
+/** RTT promotion. */
+public final class RttPromotion implements Promotion {
+  private static final String SHARED_PREFERENCE_KEY_ENABLED = "rtt_promotion_enabled";
+  private static final String SHARED_PREFERENCE_KEY_DISMISSED = "rtt_promotion_dismissed";
+  private final Context appContext;
+  private final SharedPreferences sharedPreferences;
+  private final ConfigProvider configProvider;
+
+  @Override
+  public int getType() {
+    return PromotionType.BOTTOM_SHEET;
+  }
+
+  @Inject
+  RttPromotion(
+      @ApplicationContext Context context,
+      @Unencrypted SharedPreferences sharedPreferences,
+      ConfigProvider configProvider) {
+    appContext = context;
+    this.sharedPreferences = sharedPreferences;
+    this.configProvider = configProvider;
+  }
+
+  @Override
+  public boolean isEligibleToBeShown() {
+    return sharedPreferences.getBoolean(SHARED_PREFERENCE_KEY_ENABLED, false)
+        && !sharedPreferences.getBoolean(SHARED_PREFERENCE_KEY_DISMISSED, false);
+  }
+
+  @Override
+  public CharSequence getTitle() {
+    return appContext.getString(R.string.rtt_promotion_title);
+  }
+
+  @Override
+  public CharSequence getDetails() {
+    return new ContentWithLearnMoreSpanner(appContext)
+        .create(
+            appContext.getString(R.string.rtt_promotion_details),
+            configProvider.getString(
+                "rtt_promo_learn_more_link_full_url",
+                "http://support.google.com/pixelphone/?p=dialer_rtt"));
+  }
+
+  @Override
+  @DrawableRes
+  public int getIconRes() {
+    return R.drawable.quantum_ic_rtt_vd_theme_24;
+  }
+
+  public static void setEnabled(Context context) {
+    LogUtil.enterBlock("RttPromotion.setEnabled");
+    StorageComponent.get(context)
+        .unencryptedSharedPrefs()
+        .edit()
+        .putBoolean(SHARED_PREFERENCE_KEY_ENABLED, true)
+        .apply();
+  }
+
+  @Override
+  public void dismiss() {
+    sharedPreferences.edit().putBoolean(SHARED_PREFERENCE_KEY_DISMISSED, true).apply();
+  }
+}
diff --git a/java/com/android/dialer/promotion/impl/res/values-af/strings.xml b/java/com/android/dialer/promotion/impl/res/values-af/strings.xml
new file mode 100644
index 0000000..c49cbc2
--- /dev/null
+++ b/java/com/android/dialer/promotion/impl/res/values-af/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="rtt_promotion_title">Intydse teksboodskappe binne \'n oproep</string>
+  <string name="rtt_promotion_details">RTT help bellers wat doof is, gehoorgestremd is, \'n spraakgebrek het
+    of meer as net spraak benodig. RTT-boodskaptranskripsies word op jou toestel gestoor
+    in die oproepgeskiedenis. %1$s</string>
+  <string name="duo_disclosure_title">Maak video-oproepe met Duo</string>
+  <string name="duo_disclosure_details">Met Google Duo-video-oproepe kan jy van aangesig tot aangesig met vriende en familie klets. Datakoste kan van toepassing wees. %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/promotion/impl/res/values-am/strings.xml b/java/com/android/dialer/promotion/impl/res/values-am/strings.xml
new file mode 100644
index 0000000..1306f30
--- /dev/null
+++ b/java/com/android/dialer/promotion/impl/res/values-am/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="rtt_promotion_title">በጥሪ ውስጥ የቀጥታ ጊዜ ጽሁፍ መልዕክት መላላክ</string>
+  <string name="rtt_promotion_details">አርቲቲ መስማት ለተሳናቸው፣ የመስማት ችግር ያለባቸው፣ የንግግር አካል ጉዳት ያለባቸው፣ ወይም ከድምፅ ብቻ በላይ ድጋፍ የሚያሻቸው ደዋዮች እገዛ ይሰጣል። የአርቲቲ መልዕክት መላላክ የጽሁፍ ግልባጮች በመሳሪያዎ ላይ በጥሪ ታሪክ ውስጥ ይቀመጣሉ። %1$s</string>
+  <string name="duo_disclosure_title">በDuo የቪዲዮ ጥሪዎችን አድርግ</string>
+  <string name="duo_disclosure_details">የGoogle Duo የቪዲዮ ጥሪ ከጓደኞች እና ቤተሰብ ጋር ፊት ለፊት እንዲወያዩ ያስችልዎታል። የውሂብ ክፍያዎች ሊተገበሩ ይችላሉ። %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/promotion/impl/res/values-ar/strings.xml b/java/com/android/dialer/promotion/impl/res/values-ar/strings.xml
new file mode 100644
index 0000000..4674dd7
--- /dev/null
+++ b/java/com/android/dialer/promotion/impl/res/values-ar/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="rtt_promotion_title">مراسلة نصية في الوقت الفعلي داخل مكالمة</string>
+  <string name="rtt_promotion_details">تساعد ميزة \"المراسلة النصية في الوقت الفعلي\" المتصلين الذين يعانون من فقدان حاسة السمع أو من ضعف في السمع أو ليست لديهم القدرة
+    على التحدث أو يحتاجون إلى ما هو أكثر من الصوت فقط. يتم تخزين نصوص ميزة \"المراسلة النصية في الوقت الفعلي\" على جهازك
+    في سجلّ المكالمات. %1$s</string>
+  <string name="duo_disclosure_title">‏إجراء مكالمات فيديو باستخدام Duo</string>
+  <string name="duo_disclosure_details">‏تتيح لك مكالمات الفيديو من Google Duo إمكانية المحادثة مع أصدقائك وعائلتك وجهًا لوجه. قد يتم فرض رسوم على استخدام البيانات. %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/promotion/impl/res/values-az/strings.xml b/java/com/android/dialer/promotion/impl/res/values-az/strings.xml
new file mode 100644
index 0000000..5ccc54b
--- /dev/null
+++ b/java/com/android/dialer/promotion/impl/res/values-az/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="rtt_promotion_title">Zəng daxili real zaman mətn mesajlaşması</string>
+  <string name="rtt_promotion_details">RTT kar və ya eşitmə problemi, danışma qüsuru olan və ya səsdən daha çoxuna ehtiyac duyan şəxslərə dəstək olur. RTT mesajlaşma transkripsiyaları cihazın zəng tarixçəsində saxlanılır.%1$s</string>
+  <string name="duo_disclosure_title">Duo ilə video zənglər edin</string>
+  <string name="duo_disclosure_details">Google Duo video zəngi Sizə dost və ailənizlə üzbəüz danışmaq imkanı verir. Data xərcləri tətbiq edilə bilər. %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/promotion/impl/res/values-b+sr+Latn/strings.xml b/java/com/android/dialer/promotion/impl/res/values-b+sr+Latn/strings.xml
new file mode 100644
index 0000000..69a5d2a
--- /dev/null
+++ b/java/com/android/dialer/promotion/impl/res/values-b+sr+Latn/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="rtt_promotion_title">Razmena SMS-ova u realnom vremenu u pozivu</string>
+  <string name="rtt_promotion_details">RTT pomaže pozivaocima koji su gluvi, imaju oštećenje sluha, teškoće u
+    govoru ili im je potrebno nešto više od glasa. Transkripti RTT poruka se čuvaju na uređaju
+    u istoriji poziva. %1$s</string>
+  <string name="duo_disclosure_title">Upućujte video pozive pomoću Duo-a</string>
+  <string name="duo_disclosure_details">Video pozivi u Google Duo-u vam omogućavaju da ćaskate sa prijateljima i porodicom licem u lice. Važe naknade za prenos podataka. %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/promotion/impl/res/values-be/strings.xml b/java/com/android/dialer/promotion/impl/res/values-be/strings.xml
new file mode 100644
index 0000000..1e0c4e4
--- /dev/null
+++ b/java/com/android/dialer/promotion/impl/res/values-be/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="rtt_promotion_title">Абмен тэкставымі паведамленнямі падчас выкліку</string>
+  <string name="rtt_promotion_details">Функцыя RTT дапамагае карыстальнікам з парушэннямі слыху і маўлення.
+    Расшыфроўкі паведамленняў RTT захоўваюцца на прыладзе
+    ў гісторыі выклікаў. %1$s</string>
+  <string name="duo_disclosure_title">Рабіце відэавыклікі з дапамогай Duo</string>
+  <string name="duo_disclosure_details">Гаварыце з сябрамі і роднымі ў відэавыкліках Google Duo. Можа спаганяцца аплата за перадачу даных. %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/promotion/impl/res/values-bg/strings.xml b/java/com/android/dialer/promotion/impl/res/values-bg/strings.xml
new file mode 100644
index 0000000..34a1ff4
--- /dev/null
+++ b/java/com/android/dialer/promotion/impl/res/values-bg/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="rtt_promotion_title">Текстови съобщения в реално време в обаждане</string>
+  <string name="rtt_promotion_details">ТСРВ подпомага обаждащите се, които са глухи, с влошен слух, имат проблеми с говора или се нуждаят от повече от само глас. Преписите на съобщенията с ТСРВ се съхраняват в историята на обажданията на устройството ви. %1$s</string>
+  <string name="duo_disclosure_title">Извършвайте видеообаждания с Duo</string>
+  <string name="duo_disclosure_details">Видеообажданията с Google Duo ви дават възможност да говорите с близки и приятели лице в лице. Възможно е да бъдете таксувани за данни. %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/promotion/impl/res/values-bn/strings.xml b/java/com/android/dialer/promotion/impl/res/values-bn/strings.xml
new file mode 100644
index 0000000..8a0e562
--- /dev/null
+++ b/java/com/android/dialer/promotion/impl/res/values-bn/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="rtt_promotion_title">ফোনে কথা বলতে বলতে রিয়েল-টাইম টেক্সট মেসেজ পাঠানো</string>
+  <string name="rtt_promotion_details">যে কলাররা বধির, কানে কম শোনেন, যাদের কথা বলতে অসুবিধা হয়
+    অথবা যারা কণ্ঠস্বরের সাথে অন্য কোনও উপায়ে নিজেদের প্রকাশ করেন, RTT বৈশিষ্ট্যটি তাদের সাহায্য করে। RTT মেসেজিং 
+ট্রান্সক্রিপ্টগুলি আপনার ডিভাইসের কলের ইতিহাসে সেভ করে রাখা হয়। %1$s</string>
+  <string name="duo_disclosure_title">Duo-তে ভিডিও কল করুন</string>
+  <string name="duo_disclosure_details">Google Duo ভিডিও কলিং এর মাধ্যমে আপনি পরিবারের সদস্য এবং বন্ধুদের সাথে মুখোমুখি চ্যাট করতে পারেন। ডেটা চার্জ প্রযোজ্য হতে পারে। %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/promotion/impl/res/values-bs/strings.xml b/java/com/android/dialer/promotion/impl/res/values-bs/strings.xml
new file mode 100644
index 0000000..ac4d870
--- /dev/null
+++ b/java/com/android/dialer/promotion/impl/res/values-bs/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="rtt_promotion_title">Slanje SMS-ova u stvarnom vremenu tokom poziva</string>
+  <string name="rtt_promotion_details">RTT pomaže pozivaocima koji su gluhi, imaju probleme sa sluhom ili govorom te onima kojima treba više od samog glasa. RTT transkripti poruka se pohranjuju na vašem uređaju u historiji poziva. %1$s</string>
+  <string name="duo_disclosure_title">Upućivanje video poziva pomoću aplikacije Duo</string>
+  <string name="duo_disclosure_details">Google Duo video pozivi vam omogućavaju da razgovarate licem u lice s prijateljima i porodicom. Mogu nastati troškovi prijenosa podataka. %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/promotion/impl/res/values-ca/strings.xml b/java/com/android/dialer/promotion/impl/res/values-ca/strings.xml
new file mode 100644
index 0000000..a7976ea
--- /dev/null
+++ b/java/com/android/dialer/promotion/impl/res/values-ca/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="rtt_promotion_title">Missatges de text en temps real durant una trucada</string>
+  <string name="rtt_promotion_details">La funció RTT ofereix assistència als usuaris que són sords, tenen problemes
+    d\'audició o alteracions de la parla, o bé que necessiten un text a banda de la veu. Les transcripcions RTT es desen a l\'historial de trucades
+    del dispositiu.%1$s</string>
+  <string name="duo_disclosure_title">Fes videotrucades amb Duo</string>
+  <string name="duo_disclosure_details">Les videotrucades de Google Duo et permeten parlar cara a cara amb els amics i la família. És possible que s\'hi apliquin càrrecs de dades. %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/promotion/impl/res/values-cs/strings.xml b/java/com/android/dialer/promotion/impl/res/values-cs/strings.xml
new file mode 100644
index 0000000..8a586bb
--- /dev/null
+++ b/java/com/android/dialer/promotion/impl/res/values-cs/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="rtt_promotion_title">Posílání zpráv SMS během hovoru</string>
+  <string name="rtt_promotion_details">Funkce SMS během hovoru (RTT) pomáhá volajícím, kteří neslyší, jsou nedoslýchaví, mají řečovou vadu, případně potřebují víc než jen hlas z jiného důvodu. Přepisy těchto zpráv jsou uchovávány ve vašem zařízení v historii hovorů. %1$s</string>
+  <string name="duo_disclosure_title">Provádějte videohovory v aplikaci Duo</string>
+  <string name="duo_disclosure_details">Pomocí videohovorů v aplikaci Google Duo můžete chatovat tváří v tvář s přáteli a rodinou. Mohou vám být účtovány poplatky za data. %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/promotion/impl/res/values-da/strings.xml b/java/com/android/dialer/promotion/impl/res/values-da/strings.xml
new file mode 100644
index 0000000..c7249f0
--- /dev/null
+++ b/java/com/android/dialer/promotion/impl/res/values-da/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="rtt_promotion_title">Sms i realtid under et opkald</string>
+  <string name="rtt_promotion_details">Sms i realtid hjælper personer, som er døve, hørehæmmede, talehandicappede,
+    eller som har brug for mere end bare tale, med at foretage opkald. Transskriptioner af sms i realtid gemmes på din enhed 
+    i opkaldshistorikken. %1$s</string>
+  <string name="duo_disclosure_title">Foretag videoopkald med Duo</string>
+  <string name="duo_disclosure_details">Med videoopkald i Google Duo kan du tale med venner og familie ansigt til ansigt. Du opkræves muligvis betaling for dataforbruget. %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/promotion/impl/res/values-de/strings.xml b/java/com/android/dialer/promotion/impl/res/values-de/strings.xml
new file mode 100644
index 0000000..6e5e063
--- /dev/null
+++ b/java/com/android/dialer/promotion/impl/res/values-de/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="rtt_promotion_title">RTT-Nachrichten während eines Anrufs</string>
+  <string name="rtt_promotion_details">Echtzeittext (Real-Time Text, RTT) dient als Unterstützung für Anrufer, die gehörlos, schwerhörig oder sprachgeschädigt sind oder zusätzlich zur gesprochenen Sprache weitere Informationen benötigen. RTT-Transkripte werden auf Ihrem Gerät in der Anrufliste gespeichert.%1$s</string>
+  <string name="duo_disclosure_title">Mit Duo Videoanrufe führen</string>
+  <string name="duo_disclosure_details">Mit Videoanrufen über Google Duo kannst du dich mit Freunden und Familienmitgliedern von Angesicht zu Angesicht unterhalten. Für die Datenübertragung können Gebühren anfallen. %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/promotion/impl/res/values-el/strings.xml b/java/com/android/dialer/promotion/impl/res/values-el/strings.xml
new file mode 100644
index 0000000..259120f
--- /dev/null
+++ b/java/com/android/dialer/promotion/impl/res/values-el/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="rtt_promotion_title">Ανταλλαγή μηνυμάτων με αποστολή κειμένου σε πραγματικό χρόνο εντός μιας κλήσης</string>
+  <string name="rtt_promotion_details">Το RTT υποβοηθά καλούντες που είναι κωφοί ή αντιμετωπίζουν προβλήματα ακοής ή ομιλίας, καθώς και όσους χρειάζονται κάτι περισσότερο από απλή φωνητική επικοινωνία. Οι μεταγραφές μηνυμάτων RTT αποθηκεύονται στη συσκευή σας, στο ιστορικό κλήσεων. %1$s</string>
+  <string name="duo_disclosure_title">Πραγματοποιήστε βιντεοκλήσεις με το Duo</string>
+  <string name="duo_disclosure_details">Οι βιντεοκλήσεις μέσω του Google Duo σάς επιτρέπουν να συνομιλείτε με τους φίλους και την οικογένειά σας πρόσωπο με πρόσωπο. Ενδέχεται να ισχύουν χρεώσεις δεδομένων. %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/promotion/impl/res/values-en-rAU/strings.xml b/java/com/android/dialer/promotion/impl/res/values-en-rAU/strings.xml
new file mode 100644
index 0000000..deb085f
--- /dev/null
+++ b/java/com/android/dialer/promotion/impl/res/values-en-rAU/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="rtt_promotion_title">Real-time text messaging within a call</string>
+  <string name="rtt_promotion_details">RTT assists callers who are deaf, hard of hearing, have a speech
+    disability or need more than voice alone. RTT messaging transcripts are stored on your device
+    in the call history. %1$s</string>
+  <string name="duo_disclosure_title">Make video calls with Duo</string>
+  <string name="duo_disclosure_details">Google Duo video calling lets you chat with friends and family face to face. Data charges may apply. %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/promotion/impl/res/values-en-rGB/strings.xml b/java/com/android/dialer/promotion/impl/res/values-en-rGB/strings.xml
new file mode 100644
index 0000000..deb085f
--- /dev/null
+++ b/java/com/android/dialer/promotion/impl/res/values-en-rGB/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="rtt_promotion_title">Real-time text messaging within a call</string>
+  <string name="rtt_promotion_details">RTT assists callers who are deaf, hard of hearing, have a speech
+    disability or need more than voice alone. RTT messaging transcripts are stored on your device
+    in the call history. %1$s</string>
+  <string name="duo_disclosure_title">Make video calls with Duo</string>
+  <string name="duo_disclosure_details">Google Duo video calling lets you chat with friends and family face to face. Data charges may apply. %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/promotion/impl/res/values-en-rIN/strings.xml b/java/com/android/dialer/promotion/impl/res/values-en-rIN/strings.xml
new file mode 100644
index 0000000..deb085f
--- /dev/null
+++ b/java/com/android/dialer/promotion/impl/res/values-en-rIN/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="rtt_promotion_title">Real-time text messaging within a call</string>
+  <string name="rtt_promotion_details">RTT assists callers who are deaf, hard of hearing, have a speech
+    disability or need more than voice alone. RTT messaging transcripts are stored on your device
+    in the call history. %1$s</string>
+  <string name="duo_disclosure_title">Make video calls with Duo</string>
+  <string name="duo_disclosure_details">Google Duo video calling lets you chat with friends and family face to face. Data charges may apply. %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/promotion/impl/res/values-es-rUS/strings.xml b/java/com/android/dialer/promotion/impl/res/values-es-rUS/strings.xml
new file mode 100644
index 0000000..4ddf19d
--- /dev/null
+++ b/java/com/android/dialer/promotion/impl/res/values-es-rUS/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="rtt_promotion_title">Mensajería de texto en tiempo real dentro de las llamadas</string>
+  <string name="rtt_promotion_details">El RTT brinda asistencia a las personas sordas o hipoacúsicas, que tienen
+    algún trastorno del habla, o necesitan una transcripción además de la voz. Las transcripciones de la mensajería de RTT
+    se almacenan en el historial de llamadas de tu dispositivo. %1$s</string>
+  <string name="duo_disclosure_title">Realiza videollamadas con Duo</string>
+  <string name="duo_disclosure_details">Con la videollamada de Google Duo, puedes chatear con amigos y familiares cara a cara. Es posible que apliquen cargos por el uso de datos. %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/promotion/impl/res/values-es/strings.xml b/java/com/android/dialer/promotion/impl/res/values-es/strings.xml
new file mode 100644
index 0000000..0ecd2cb
--- /dev/null
+++ b/java/com/android/dialer/promotion/impl/res/values-es/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="rtt_promotion_title">Mensajes de texto en tiempo real en las llamadas</string>
+  <string name="rtt_promotion_details">La función TTR (texto en tiempo real) ofrece asistencia a las personas
+    sordas o con discapacidades auditivas, que tienen algún trastorno del habla o que necesitan una transcripción además de la voz para comunicarse. Las transcripciones de mensajes de TTR se guardan en el
+    historial de llamadas de tu dispositivo. %1$s</string>
+  <string name="duo_disclosure_title">Haz videollamadas con Duo</string>
+  <string name="duo_disclosure_details">Habla cara a cara con tus familiares y amigos con las videollamadas de Google Duo. Es posible que se apliquen cargos por el uso de datos. %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/promotion/impl/res/values-et/strings.xml b/java/com/android/dialer/promotion/impl/res/values-et/strings.xml
new file mode 100644
index 0000000..b42d631
--- /dev/null
+++ b/java/com/android/dialer/promotion/impl/res/values-et/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="rtt_promotion_title">Reaalajas tekstsõnumside kõnes</string>
+  <string name="rtt_promotion_details">RTT aitab kurte, kuulmis- või kõnepuudega helistajaid või neid,
+    kes vajavad lisaks häälele muud abi. RTT sõnumside transkriptsioonid
+    salvestatakse teie seadmes kõneajaloos. %1$s</string>
+  <string name="duo_disclosure_title">Videokõnede tegemine Duoga</string>
+  <string name="duo_disclosure_details">Google Duo videokõned lubavad teil sõprade ja perega näost näkku vestelda. Rakenduda võivad andmesidetasud. %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/promotion/impl/res/values-eu/strings.xml b/java/com/android/dialer/promotion/impl/res/values-eu/strings.xml
new file mode 100644
index 0000000..c5a83b4
--- /dev/null
+++ b/java/com/android/dialer/promotion/impl/res/values-eu/strings.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="rtt_promotion_title">Deietan testua bidaltzeko eginbidea</string>
+  <string name="rtt_promotion_details">Deietan testua bidaltzeko eginbideak (RTT) deitzaile gorrei,
+    entzumen-arazoak dituztenei, hitz egiteko ezintasunen bat dutenei edota,
+    ahotsaz gain, beste makuluren bat behar dutenei laguntzen die. Gailuko
+    deien historian gordeko dira deietan testu bidez bidaltzen diren mezuen
+    transkripzioak. %1$s</string>
+  <string name="duo_disclosure_title">Egin bideo-deiak Duo-rekin</string>
+  <string name="duo_disclosure_details">Google Duo zerbitzuko bideo-deien bidez, aurrez aurre hitz egin dezakezu lagunekin eta familiarekin. Baliteke datuak erabiltzearen ondorioz zerbait kobratzea. %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/promotion/impl/res/values-fa/strings.xml b/java/com/android/dialer/promotion/impl/res/values-fa/strings.xml
new file mode 100644
index 0000000..1768ccc
--- /dev/null
+++ b/java/com/android/dialer/promotion/impl/res/values-fa/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="rtt_promotion_title">پیام‌رسانی نوشتار هم‌زمان درحین تماس</string>
+  <string name="rtt_promotion_details">نوشتار هم‌زمان به تماس گیرندگان ناشنوا، دارای مشکل شنوایی، دارای ناتوانی
+    گفتاری یا افرادی که به چیزی بیش از صدا نیاز دارند کمک می‌کند. آوانویسی‌های پیام‌رسانی نوشتار هم‌زمان، در سابقه تماس
+    دستگاهتان ذخیره می‌شوند. %1$s</string>
+  <string name="duo_disclosure_title">‏برقراری تماس ویدیویی با Duo</string>
+  <string name="duo_disclosure_details">‏تماس ویدیویی Google Duo امکان می‌دهد با دوستان و خانواده گپ رودررو داشته باشید. ممکن است هزینه داده اعمال شود. %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/promotion/impl/res/values-fi/strings.xml b/java/com/android/dialer/promotion/impl/res/values-fi/strings.xml
new file mode 100644
index 0000000..da01e53
--- /dev/null
+++ b/java/com/android/dialer/promotion/impl/res/values-fi/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="rtt_promotion_title">Reaaliaikaiset tekstiviestit puhelun aikana</string>
+  <string name="rtt_promotion_details">RTT-toiminto auttaa kuuroja sekä käyttäjiä, joilla on kuulo‑
+    tai puhehäiriöitä tai jotka tarvitsevat muuta tukea pelkän puheen lisäksi. RTT-viestien transkriptiot tallennetaan laitteen
+    puheluhistoriaan. %1$s</string>
+  <string name="duo_disclosure_title">Soita videopuheluja Duolla</string>
+  <string name="duo_disclosure_details">Kun soitat videopuhelun Google Duon kautta, voit keskustella ystävien ja perheenjäsenten kanssa kasvokkain. Tiedonsiirrosta voidaan periä maksu. %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/promotion/impl/res/values-fr-rCA/strings.xml b/java/com/android/dialer/promotion/impl/res/values-fr-rCA/strings.xml
new file mode 100644
index 0000000..e940542
--- /dev/null
+++ b/java/com/android/dialer/promotion/impl/res/values-fr-rCA/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="rtt_promotion_title">Messages texte en temps réel lors d\'un appel</string>
+  <string name="rtt_promotion_details">La fonctionnalité TTR aide les appelants qui sont sourds ou malentendants, qui ont un trouble
+    de la parole ou pour qui la voix ne suffit pas. Les transcriptions sont stockées sur votre appareil,
+    dans l\'historique des appels. %1$s</string>
+  <string name="duo_disclosure_title">Faites des appels vidéo avec Duo</string>
+  <string name="duo_disclosure_details">Les appels vidéo Google Duo vous permettent de clavarder en face à face avec vos proches. Des frais de données peuvent s\'appliquer. %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/promotion/impl/res/values-fr/strings.xml b/java/com/android/dialer/promotion/impl/res/values-fr/strings.xml
new file mode 100644
index 0000000..8c01433
--- /dev/null
+++ b/java/com/android/dialer/promotion/impl/res/values-fr/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="rtt_promotion_title">Envoi de messages en cours d\'appel avec la fonctionnalité de texte en temps réel</string>
+  <string name="rtt_promotion_details">Le texte en temps réel (RTT) vient en aide aux personnes sourdes, malentendantes, qui ont un trouble de la parole, ou qui ont besoin d\'une transcription en plus de la voix. La transcription des messages RTT est stockée dans l\'historique des appels de votre appareil. %1$s</string>
+  <string name="duo_disclosure_title">Passez des appels vidéo avec Duo</string>
+  <string name="duo_disclosure_details">L\'application d\'appel vidéo Google Duo vous permet de discuter avec vos proches en face à face. Ce service peut occasionner des frais liés à la consommation de données. %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/promotion/impl/res/values-gl/strings.xml b/java/com/android/dialer/promotion/impl/res/values-gl/strings.xml
new file mode 100644
index 0000000..7ae0f45
--- /dev/null
+++ b/java/com/android/dialer/promotion/impl/res/values-gl/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="rtt_promotion_title">Mensaxes de texto en tempo real durante unha chamada</string>
+  <string name="rtt_promotion_details">A función de texto en tempo real (RTT) constitúe unha axuda para todos aqueles emisores de chamadas que padezan xordeira ou outros problemas auditivos, teñan algún trastorno
+    da fala ou necesiten algo máis que a voz para comunicarse. As transcricións das mensaxes de RTT almacénanse no historial de chamadas
+    do dispositivo. %1$s</string>
+  <string name="duo_disclosure_title">Facer videochamadas con Duo</string>
+  <string name="duo_disclosure_details">Coas videochamadas de Google Duo, podes chatear cos amigos e a familia cara a cara. É posible que se apliquen tarifas de datos. %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/promotion/impl/res/values-gu/strings.xml b/java/com/android/dialer/promotion/impl/res/values-gu/strings.xml
new file mode 100644
index 0000000..87e3929
--- /dev/null
+++ b/java/com/android/dialer/promotion/impl/res/values-gu/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="rtt_promotion_title">કૉલમાં રિઅલ-ટાઇમ ટેક્સ્ટ મેસેજિંગ</string>
+  <string name="rtt_promotion_details">જેઓ બહેરા, ઓછું સાંભળતા, બોલવામાં તકલીફવાળા અથવા જેમને માત્ર વૉઇસ કરતાં પણ
+    કંઈક વધુની જરૂર હોય એવા કૉલરોને RTT સહાય કરે છે. RTT મેસેજિંગ ટ્રાન્સક્રિપ્ટને તમારા ઉપકરણ પર કૉલ ઇતિહાસમાં
+    સ્ટોર કરવામાં આવે છે. %1$s</string>
+  <string name="duo_disclosure_title">Duo વડે વીડિઓ કૉલ કરો</string>
+  <string name="duo_disclosure_details">Google Duo વીડિઓ કૉલિંગ વડે તમે મિત્રો અને કુટુંબ સાથે સામ-સામે ચૅટ કરી શકો છો. ડેટા શુલ્ક લાગુ થઈ શકે છે. %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/promotion/impl/res/values-hi/strings.xml b/java/com/android/dialer/promotion/impl/res/values-hi/strings.xml
new file mode 100644
index 0000000..7baa782
--- /dev/null
+++ b/java/com/android/dialer/promotion/impl/res/values-hi/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="rtt_promotion_title">अब कॉल में रीयल-टाइम मैसेज भेजने की सुविधा उपलब्ध है</string>
+  <string name="rtt_promotion_details">आरटीटी उन कॉल करने वालों की मदद करता है, जो बधिर हैं, ऊंचा सुनते हैं, जिन्हें बोलने में
+    दिक्कत है या जिनके लिए सिर्फ़ आवाज़ काफ़ी नहीं होती. आरटीटी मैसेज लेख आपके डिवाइस
+    के कॉल इतिहास में सेव किए जाते हैं. %1$s</string>
+  <string name="duo_disclosure_title">Duo के ज़रिए वीडियो कॉल करें</string>
+  <string name="duo_disclosure_details">\'Google Duo\' वीडियो कॉल के ज़रिए आप अपने दोस्तों और परिवार के लोगों के साथ आमने-सामने चैट कर सकते हैं. डेटा शुल्क लागू हो सकते हैं. %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/promotion/impl/res/values-hr/strings.xml b/java/com/android/dialer/promotion/impl/res/values-hr/strings.xml
new file mode 100644
index 0000000..786c195
--- /dev/null
+++ b/java/com/android/dialer/promotion/impl/res/values-hr/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="rtt_promotion_title">Slanje poruka u stvarnom vremenu u pozivu</string>
+  <string name="rtt_promotion_details">RTT pomaže pozivateljima koji su gluhi, nagluhi,
+    imaju govornu manu ili im je potrebno nešto više od glasa. Prijepisi poruka poslanih putem značajke RTT spremaju se na vaš uređaj
+    u povijesti poziva. %1$s</string>
+  <string name="duo_disclosure_title">Upućivanje videopoziva pomoću aplikacije Duo</string>
+  <string name="duo_disclosure_details">Upućivanje videopoziva u aplikaciji Google Duo omogućuje vam da licem u lice chatate s prijateljima i obitelji. Operater može naplatiti podatkovni promet. %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/promotion/impl/res/values-hu/strings.xml b/java/com/android/dialer/promotion/impl/res/values-hu/strings.xml
new file mode 100644
index 0000000..1fe0c76
--- /dev/null
+++ b/java/com/android/dialer/promotion/impl/res/values-hu/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="rtt_promotion_title">Valós idejű szöveges üzenetküldés a híváson belül</string>
+  <string name="rtt_promotion_details">Az RTT funkció a siket, hallássérült, beszédzavaros vagy a hangalapú kommunikáción kívül más kommunikációt is igénylő hívóknak lehet segítségére. Az RTT-átiratokat a rendszer az eszköz híváselőzményeiben tárolja. %1$s</string>
+  <string name="duo_disclosure_title">Videohívások indítása a Duóval</string>
+  <string name="duo_disclosure_details">A Google Duo videohívási funkciójával közvetlenül cseveghet ismerőseivel és családtagjaival. A szolgáltató adatforgalmi díjat számíthat fel. %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/promotion/impl/res/values-hy/strings.xml b/java/com/android/dialer/promotion/impl/res/values-hy/strings.xml
new file mode 100644
index 0000000..bcd7980
--- /dev/null
+++ b/java/com/android/dialer/promotion/impl/res/values-hy/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="rtt_promotion_title">Զանգի ընթացքում հաղորդագրությունների ուղարկում և ստացում</string>
+  <string name="rtt_promotion_details">RTT-ն օգնում է այն բաժանորդներին, ովքեր լսողության և խոսքի
+    դժվարություններ ունեն, կամ ովքեր լոկ ձայնով չեն բավարարվում: RTT հաղորդագրությունների տառադրումները պահվում են ձեր սարքում՝
+    զանգերի պատմության մեջ: %1$s</string>
+  <string name="duo_disclosure_title">Կատարեք տեսազանգեր Duo-ի միջոցով</string>
+  <string name="duo_disclosure_details">Google Duo տեսազանգի ծառայության օգնությամբ կարող եք երես առ երես զրուցել ընկերների և ընտանիքի անդամների հետ: Բջջային ինտերնետի համար կարող է վճար գանձվել: %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/promotion/impl/res/values-in/strings.xml b/java/com/android/dialer/promotion/impl/res/values-in/strings.xml
new file mode 100644
index 0000000..ae519fd
--- /dev/null
+++ b/java/com/android/dialer/promotion/impl/res/values-in/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="rtt_promotion_title">Pengiriman pesan real-time pada saat panggilan suara berlangsung</string>
+  <string name="rtt_promotion_details">RTT membantu penelepon yang tunarungu, kesulitan mendengar, memiliki gangguan berbicara, atau memerlukan lebih dari sekadar suara. Transkripsi pesan RTT disimpan dalam histori panggilan di perangkat Anda. %1$s</string>
+  <string name="duo_disclosure_title">Lakukan video call dengan Duo</string>
+  <string name="duo_disclosure_details">Video call dengan Google Duo memungkinkan Anda melakukan chat bersama teman dan keluarga sambil bertatap muka. Biaya data mungkin berlaku. %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/promotion/impl/res/values-is/strings.xml b/java/com/android/dialer/promotion/impl/res/values-is/strings.xml
new file mode 100644
index 0000000..b3831af
--- /dev/null
+++ b/java/com/android/dialer/promotion/impl/res/values-is/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="rtt_promotion_title">Textaskilaboð í rauntíma meðan á símtali stendur</string>
+  <string name="rtt_promotion_details">RTT-símtöl (með texta í rauntíma) aðstoða heyrnarlausa og fólk með heyrnarskerðingu eða skerta
+    talgetu og þá sem þurfa að styðja sig við meira en bara hljóð. Umritanir RTT-skilaboða eru vistaðar í símtalaferli
+    tækisins þíns. %1$s</string>
+  <string name="duo_disclosure_title">Hringdu myndsímtöl með Duo</string>
+  <string name="duo_disclosure_details">Með myndsímtölum í Google Duo geturðu spjallað við vini og fjölskyldu augliti til auglitis. Gjöld fyrir gagnanotkun geta átt við. %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/promotion/impl/res/values-it/strings.xml b/java/com/android/dialer/promotion/impl/res/values-it/strings.xml
new file mode 100644
index 0000000..9c2536a
--- /dev/null
+++ b/java/com/android/dialer/promotion/impl/res/values-it/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="rtt_promotion_title">SMS in tempo reale durante una chiamata</string>
+  <string name="rtt_promotion_details">RTT aiuta i chiamanti con disabilità uditive o del linguaggio e le persone che hanno bisogno di un supporto scritto oltre alla voce. Le trascrizioni dei messaggi di RTT vengono memorizzate nella cronologia delle chiamate del tuo dispositivo. %1$s</string>
+  <string name="duo_disclosure_title">Fai videochiamate con Duo</string>
+  <string name="duo_disclosure_details">Le videochiamate di Google Duo ti permettono di chiacchierare con amici e familiari faccia a faccia. Potrebbero essere applicati dei costi per i dati. %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/promotion/impl/res/values-iw/strings.xml b/java/com/android/dialer/promotion/impl/res/values-iw/strings.xml
new file mode 100644
index 0000000..c6d6914
--- /dev/null
+++ b/java/com/android/dialer/promotion/impl/res/values-iw/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="rtt_promotion_title">‏שליחת הודעות טקסט בזמן אמת (RTT) במהלך שיחה</string>
+  <string name="rtt_promotion_details">‏RTT (טקסט בזמן אמת) היא תכונת נגישות שעוזרת לחרשים, לקויי שמיעה, לקויי דיבור או אנשים שלא יכולים להסתפק רק בקול במהלך השיחה. %1$s</string>
+  <string name="duo_disclosure_title">‏ב-Duo אפשר לשוחח בשיחות וידאו</string>
+  <string name="duo_disclosure_details">‏באמצעות Google Duo אפשר לשוחח בשיחות וידאו ולראות את החברים וקרובי המשפחה. השירות עשוי להיות בתשלום, בהתאם לחבילה הסלולרית שלך. %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/promotion/impl/res/values-ja/strings.xml b/java/com/android/dialer/promotion/impl/res/values-ja/strings.xml
new file mode 100644
index 0000000..0c6ba11
--- /dev/null
+++ b/java/com/android/dialer/promotion/impl/res/values-ja/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="rtt_promotion_title">通話音声をリアルタイムでテキスト化（RTT）</string>
+  <string name="rtt_promotion_details">RTT は、聴覚障害や言語障害があるなど、
+    音声だけではコミュニケーションを取ることが困難なユーザーをサポートする機能です。RTT の音声文字変換結果は、ご利用の端末の
+    通話履歴に保存されます。%1$s</string>
+  <string name="duo_disclosure_title">Duo のビデオ通話を発信できます</string>
+  <string name="duo_disclosure_details">Google Duo のビデオ通話なら、家族や友だちとお互いの顔を見ながら会話を楽しむことができます。なお、場合によってはデータ通信料が適用されます。%1$s</string>
+</resources>
diff --git a/java/com/android/dialer/promotion/impl/res/values-ka/strings.xml b/java/com/android/dialer/promotion/impl/res/values-ka/strings.xml
new file mode 100644
index 0000000..7c23af0
--- /dev/null
+++ b/java/com/android/dialer/promotion/impl/res/values-ka/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="rtt_promotion_title">ტექსტური შეტყობინებები რეალურ დროში, ზარში</string>
+  <string name="rtt_promotion_details">RTT დახმარებას უწევს ყრუ, სმენადაქვეითებულ, შეზღუდული მეტყველების
+    მქონე აბონენტებს, ან მათ, ვისაც სჭირდება მეტი, ვიდრე მხოლოდ ხმაა. RTT შეტყობინებების ტრანსკრიპტები ინახება თქვენს მოწყობილობაში,
+    ზარების ისტორიაში. %1$s</string>
+  <string name="duo_disclosure_title">განახორციელეთ ვიდეოზარები Duo-თი</string>
+  <string name="duo_disclosure_details">Google Duo ვიდეო დარეკვა საშუალებას გაძლევთ, პირისპირ ესაუბროთ ჩეთში მეგობრებსა და ოჯახის წევრებს. შესაძლოა მოგიწიოთ მობილური ინტერნეტის საფასურის გადახდა. %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/promotion/impl/res/values-kk/strings.xml b/java/com/android/dialer/promotion/impl/res/values-kk/strings.xml
new file mode 100644
index 0000000..4b1ecb9
--- /dev/null
+++ b/java/com/android/dialer/promotion/impl/res/values-kk/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="rtt_promotion_title">Қоңырау кезінде хабар жіберу мүмкіндігі</string>
+  <string name="rtt_promotion_details">RTT қызметі мүлдем естімейтін, есту немесе сөйлеу қабілеті нашар немесе дыбысқа қосымша басқа қызметтерді қажет ететін адамдарға көмек ретінде қолданылады. RTT мәтіндік хабар транскрипциялары құрылғыңыздағы қоңыраулар тарихына сақталады. %1$s</string>
+  <string name="duo_disclosure_title">Duo арқылы бейне қоңырау шалу</string>
+  <string name="duo_disclosure_details">Google Duo бейне қоңыраулары туыстарыңызбен және достарыңызбен бетпе-бет кездесіп, сөйлесу мүмкіндігін ұсынады. Дерек төлемдері қолданылуы мүмкін. %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/promotion/impl/res/values-km/strings.xml b/java/com/android/dialer/promotion/impl/res/values-km/strings.xml
new file mode 100644
index 0000000..bf8ca12
--- /dev/null
+++ b/java/com/android/dialer/promotion/impl/res/values-km/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="rtt_promotion_title">ការផ្ញើ​សារ​ជា​អក្សរ​​ក្នុង​ពេល​ជាក់ស្ដែង​នៅ​ក្នុង​ការហៅ​ទូរសព្ទ</string>
+  <string name="rtt_promotion_details">RTT ជួយ​អ្នក​ហៅ​ទូរសព្ទ​ដែល​​ថ្លង់ ពិបាក​ក្នុង​ការស្ដាប់ មិន​អាច​និយាយ​បាន
+    ឬ​មាន​តម្រូវការ​ក្រៅ​ពី​​សំឡេង។ ប្រតិចារឹក​ការផ្ញើ​សារ RTT ​បាន​រក្សាទុក​នៅ​លើ​ឧបករណ៍​របស់​អ្នក​
+    នៅ​ក្នុង​ប្រវត្តិ​ហៅ​ទូរសព្ទ។ %1$s</string>
+  <string name="duo_disclosure_title">ហៅ​ជា​វីដេអូ​ជាមួយ Duo</string>
+  <string name="duo_disclosure_details">ការហៅ​ជា​វីដេអូ​តាម Google Duo អាច​ជួយ​អ្នក​ជជែក​ជាមួយ​មិត្តភក្ដិ និង​គ្រួសារ​ដោយ​ផ្ទាល់។ អាច​នឹង​មាន​ការគិតថ្លៃ​ទិន្នន័យ។ %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/promotion/impl/res/values-kn/strings.xml b/java/com/android/dialer/promotion/impl/res/values-kn/strings.xml
new file mode 100644
index 0000000..9ed662f
--- /dev/null
+++ b/java/com/android/dialer/promotion/impl/res/values-kn/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="rtt_promotion_title">ಕರೆಯಲ್ಲಿರುವಾಗ ನೈಜ ಸಮಯದ ಪಠ್ಯ ಸಂದೇಶ ಕಳುಹಿಸುವಿಕೆ</string>
+  <string name="rtt_promotion_details">ಯಾರು ಕಿವುಡರು, ಆಲಿಸಲು ಕಷ್ಟಪಡುವವರು, ಆಲಿಸಲು ಅಸಾಮರ್ಥ್ಯವಾಗಿರುವವರು, ಮಾತಿನ ಸಮಸ್ಯೆಯನ್ನು ಹೊಂದಿರುವವರು ಅಥವಾ ಧ್ವನಿಗಿಂತ ಇನ್ನಷ್ಟು ಬಯಸುವವರು RTT ಸಹಾಯಕ ಕರೆಮಾಡುವವರು. ನಿಮ್ಮ ಸಾಧನದ ಕರೆ ಇತಿಹಾಸದಲ್ಲಿ RTT ಪ್ರತಿಲೇಖನಗಳನ್ನು ಸಂಗ್ರಹಿಸಲಾಗಿದೆ. %1$s</string>
+  <string name="duo_disclosure_title">Duo ಮೂಲಕ ವೀಡಿಯೊ ಕರೆಗಳನ್ನು ಮಾಡಿ</string>
+  <string name="duo_disclosure_details">\"Google Duo ವೀಡಿಯೊ ಕರೆ\"ಯು ಸ್ನೇಹಿತರು ಮತ್ತು ಕುಟುಂಬದೊಂದಿಗೆ ನೀವು ಮುಖಾಮುಖಿಯಾಗಿ ಚಾಟ್ ಮಾಡಲು ಅವಕಾಶ ಮಾಡಿಕೊಡುತ್ತದೆ. ಡೇಟಾ ಶುಲ್ಕಗಳು ಅನ್ವಯವಾಗಬಹುದು. %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/promotion/impl/res/values-ko/strings.xml b/java/com/android/dialer/promotion/impl/res/values-ko/strings.xml
new file mode 100644
index 0000000..090d823
--- /dev/null
+++ b/java/com/android/dialer/promotion/impl/res/values-ko/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="rtt_promotion_title">통화 중 실시간 문자 메시지</string>
+  <string name="rtt_promotion_details">RTT는 청각 장애, 난청, 언어 장애가 있거나
+    음성 이외의 의사소통 수단이 필요한 발신자에게 도움이 됩니다. RTT 메시지 스크립트는 내 기기의 통화 기록에
+    저장됩니다. %1$s</string>
+  <string name="duo_disclosure_title">Duo로 화상 통화 걸기</string>
+  <string name="duo_disclosure_details">Google Duo 화상 통화를 사용하면 가족, 친구와 얼굴을 마주 보며 채팅할 수 있습니다. 데이터 요금이 부과될 수 있습니다. %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/promotion/impl/res/values-ky/strings.xml b/java/com/android/dialer/promotion/impl/res/values-ky/strings.xml
new file mode 100644
index 0000000..9fac2f7
--- /dev/null
+++ b/java/com/android/dialer/promotion/impl/res/values-ky/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="rtt_promotion_title">Чалуу учурунда анык убакыттагы SMS билдирүү</string>
+  <string name="rtt_promotion_details">RTT функциясы угуу жана сүйлөө жөндөмдүүлүгү бузулган адамдарга арналат. RTT транскрипциялары түзмөгүңүздөгү чалуу таржымалында сакталат. %1$s</string>
+  <string name="duo_disclosure_title">Duo\'нун жардамы менен видео чалууларды баштаңыз</string>
+  <string name="duo_disclosure_details">Google Duo аркылуу видео режиминде чалып, досторуңуз жана туугандарыңыз менен сүйлөшүңүз. Трафик үчүн акы төлөп калышыңыз мүмкүн. %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/promotion/impl/res/values-lo/strings.xml b/java/com/android/dialer/promotion/impl/res/values-lo/strings.xml
new file mode 100644
index 0000000..dac7e42
--- /dev/null
+++ b/java/com/android/dialer/promotion/impl/res/values-lo/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="rtt_promotion_title">ສົ່ງຂໍ້ຄວາມແບບສົດໆໃນການໂທ</string>
+  <string name="rtt_promotion_details">RTT ຈະຊ່ວຍເຫຼືອຜູ້ໂທທີ່ຫູໜວກ, ມີບັນຫາໃນການໄດ້ຍິນ, ບໍ່ສາມາດເວົ້າໄດ້ ຫຼື ຕ້ອງການໃຊ້ຫຼາຍກວ່າສຽງ. ການຖອດຂໍ້ຄວາມ RTT ຈະຖືກບັນທຶກໄວ້ຢູ່ອຸປະກອນຂອງທ່ານໃນປະຫວັດການໂທ. %1$s</string>
+  <string name="duo_disclosure_title">ໂທວິດີໂອດ້ວຍ Duo</string>
+  <string name="duo_disclosure_details">ການໂທວິດີໂອ Google Duo ເຮັດໃຫ້ທ່ານສາມາດລົມກັບໝູ່ ແລະ ຄອບຄົວໄດ້ແບບເຫັນໜ້າກັນ. ອາດມີການຮຽກເກັບຄ່າອິນເຕີເນັດ. %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/promotion/impl/res/values-lt/strings.xml b/java/com/android/dialer/promotion/impl/res/values-lt/strings.xml
new file mode 100644
index 0000000..a601f72
--- /dev/null
+++ b/java/com/android/dialer/promotion/impl/res/values-lt/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="rtt_promotion_title">Susirašinėjimas tikralaikiais teksto pranešimais, kai vyksta skambutis</string>
+  <string name="rtt_promotion_details">RTT padeda skambintojams, kurie yra kurti, neprigirdintys, sunkiai
+    kalba arba kuriems reikia ne tik kalbėti. RTT susirašinėjimo nuorašai saugomi įrenginio
+    skambučių istorijoje. %1$s</string>
+  <string name="duo_disclosure_title">Atlikite vaizdo skambučius naudodami „Duo“</string>
+  <string name="duo_disclosure_details">Naudodami „Google Duo“ vaizdo skambučius galite kalbėti su draugais ir šeimos nariais akis į akį. Gali būti taikomi duomenų mokesčiai. %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/promotion/impl/res/values-lv/strings.xml b/java/com/android/dialer/promotion/impl/res/values-lv/strings.xml
new file mode 100644
index 0000000..f953141
--- /dev/null
+++ b/java/com/android/dialer/promotion/impl/res/values-lv/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="rtt_promotion_title">Reāllaika teksta ziņojumapmaiņa zvanā</string>
+  <string name="rtt_promotion_details">RTT funkcionalitāte palīdz nedzirdīgiem un vājdzirdīgiem zvanītājiem, kā arī zvanītājiem, kuriem ir runas traucējumi vai ir nepieciešama ne tikai balss skaņa. RTT ziņojumapmaiņas transkripcijas tiek glabātas zvanu vēsturē jūsu ierīcē. %1$s</string>
+  <string name="duo_disclosure_title">Veiciet videozvanus, izmantojot lietotni Duo</string>
+  <string name="duo_disclosure_details">Google Duo videozvani ļauj jums personiski tērzēt ar draugiem un ģimeni. Var tikt piemērota maksa par datu pārraidi. %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/promotion/impl/res/values-mk/strings.xml b/java/com/android/dialer/promotion/impl/res/values-mk/strings.xml
new file mode 100644
index 0000000..44ecd8d
--- /dev/null
+++ b/java/com/android/dialer/promotion/impl/res/values-mk/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="rtt_promotion_title">Текстуални пораки во реално време во тек на повик</string>
+  <string name="rtt_promotion_details">RTT им помага на повикувачи коишто се глуви, слабо слушаат, имаат говорна
+    мана или пак, им е потребно многу повеќе од глас. Преписите на RTT-пораките се складирани на вашиот уред
+    во историјата на повици. %1$s</string>
+  <string name="duo_disclosure_title">Воспоставувајте видеоповици со Duo</string>
+  <string name="duo_disclosure_details">Видеоповикувањето со Google Duo ви овозможува да разговарате со пријателите и семејството лице в лице. Може да ви се наплати за мобилен интернет. %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/promotion/impl/res/values-ml/strings.xml b/java/com/android/dialer/promotion/impl/res/values-ml/strings.xml
new file mode 100644
index 0000000..f4db8db
--- /dev/null
+++ b/java/com/android/dialer/promotion/impl/res/values-ml/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="rtt_promotion_title">ഒരു കോളിനുള്ളിൽ തത്സമയ സന്ദേശമയയ്ക്കൽ</string>
+  <string name="rtt_promotion_details">ബധിരർ, കേൾവി ശക്തി കുറഞ്ഞവർ, സംഭാഷണ വൈകല്യമുള്ളവർ അല്ലെങ്കിൽ ശബ്‌ദത്തിന് പുറമേ മറ്റ് സഹായവും ആവശ്യമുള്ള,
+    വിളിക്കുന്ന ആളുകളെ RTT സഹായിക്കുന്നു. നിങ്ങളുടെ ഉപകരണത്തിൽ RTT സന്ദേശമയയ്ക്കൽ ട്രാൻസ്‌ക്രിപ്റ്റുകൾ സംഭരിക്കപ്പെടുന്നത്
+    കോൾ ചരിത്രത്തിലാണ്. %1$s</string>
+  <string name="duo_disclosure_title">Duo ഉപയോഗിച്ച് വീഡിയോ കോളുകൾ ചെയ്യൂ</string>
+  <string name="duo_disclosure_details">നിങ്ങളുടെ സുഹൃത്തുക്കളുമായും കുടുംബാംഗങ്ങളുമായും ‌മുഖാമുഖം ചാറ്റ് ചെയ്യാൻ Google Duo വീഡിയോ കോളിംഗ് അനുവദിക്കുന്നു. ഡാറ്റ നിരക്കുകൾ ബാധകമായേക്കാം. %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/promotion/impl/res/values-mn/strings.xml b/java/com/android/dialer/promotion/impl/res/values-mn/strings.xml
new file mode 100644
index 0000000..d399ea7
--- /dev/null
+++ b/java/com/android/dialer/promotion/impl/res/values-mn/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="rtt_promotion_title">Дуудлагын тухайн агшины текст зурвас</string>
+  <string name="rtt_promotion_details">ТАТ нь дүлий, сонсголын бэрхшээлтэй, хэл ярианы хөгжлийн бэрхшээлтэй эсвэл хэн нэгний тусламжтай ярьдаг дуудлага хийгчдэд тусладаг. ТАТ зурвас сийрүүлгийг таны төхөөрөмжийн дуудлагын түүх хэсэгт хадгалдаг.%1$s</string>
+  <string name="duo_disclosure_title">Duo ашиглан видео дуудлага хийх</string>
+  <string name="duo_disclosure_details">Google Duo видео дуудлага танд гэр бүлийнхэн, найз нөхөдтэйгээ нүүр нүүрээ харж ярилцах боломжийг олгодог. Дата төлбөр гарч болзошгүй. %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/promotion/impl/res/values-mr/strings.xml b/java/com/android/dialer/promotion/impl/res/values-mr/strings.xml
new file mode 100644
index 0000000..6fa8c22
--- /dev/null
+++ b/java/com/android/dialer/promotion/impl/res/values-mr/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="rtt_promotion_title">कॉलमध्‍ये रिअल टाइम एसएमएस</string>
+  <string name="rtt_promotion_details">RTT अशा कॉल करणार्‍यांना साहाय्य करते, ज्‍यांना बहिरेपणा आहे, ज्‍यांना कमी ऐकू येते किंवा बोलताना अडखळतात किंवा ज्‍यांना फक्‍त आवाज पुरेसा नसतो. कॉल इतिहासामध्‍ये तुमच्‍या डिव्‍हाइसवर मेसेजिंग प्रतिलेख स्‍टोअर केले आहेत. %1$s</string>
+  <string name="duo_disclosure_title">Duo ने व्हिडिओ कॉल करा</string>
+  <string name="duo_disclosure_details">Google Duo व्हिडिओ कॉलिंग तुम्हाला तुमचे मित्रमैत्रिणी आणि कुटुंबाशी समोरासमोर चॅट करू देते. डेटा शुल्क लागू शकतात. %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/promotion/impl/res/values-ms/strings.xml b/java/com/android/dialer/promotion/impl/res/values-ms/strings.xml
new file mode 100644
index 0000000..b8f01e2
--- /dev/null
+++ b/java/com/android/dialer/promotion/impl/res/values-ms/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="rtt_promotion_title">Pemesejan teks masa nyata dalam panggilan</string>
+  <string name="rtt_promotion_details">RTT membantu pemanggil yang pekak, pekak labang, mengalami kesukaran bertutur atau memerlukan ciri selain suara. Transkrip pemesejan RTT disimpan pada peranti anda dalam sejarah panggilan. %1$s</string>
+  <string name="duo_disclosure_title">Buat panggilan video dengan Duo</string>
+  <string name="duo_disclosure_details">Panggilan video Google Duo membolehkan anda bersembang dengan rakan dan keluarga secara bersemuka. Caj data mungkin dikenakan. %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/promotion/impl/res/values-my/strings.xml b/java/com/android/dialer/promotion/impl/res/values-my/strings.xml
new file mode 100644
index 0000000..4784fbc
--- /dev/null
+++ b/java/com/android/dialer/promotion/impl/res/values-my/strings.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="rtt_promotion_title">ဖုန်းပြောနေစဉ် အချိန်နှင့်တစ်ပြေးညီ စာသားမက်ဆေ့ဂျ်ပို့ခြင်း</string>
+  <string name="rtt_promotion_details">RTT သည် နားမကြားသူ၊ နားလေးသူ၊ စကားချို့ယွင်းသူ (သို့) အသံတစ်မျိုးတည်းထက် ပိုမို၍ လိုအပ်သူများကို ကူညီပေးပါသည်။
+ RTT မက်ဆေ့ဂျ်ပို့ခြင်း စာသားမှတ်တမ်းများကို သင့်ကိရိယာရှိ ခေါ်ဆိုမှုမှတ်တမ်းတွင် သိမ်းဆည်းထားပါသည်။ %1$s</string>
+  <string name="duo_disclosure_title">Duo ဖြင့် ဗီဒီယိုခေါ်ဆိုမှုများ ပြုလုပ်ခြင်း</string>
+  <string name="duo_disclosure_details">Google Duo ဗီဒီယိုခေါ်ဆိုမှုက သင့်အား မိတ်ဆွေများ၊ မိသားစုများနှင့် မျက်နှာချင်းဆိုင် ချတ်လုပ်ခွင့်ပေးပါသည်။ ဒေတာသုံးစွဲခများ ကျသင့်နိုင်ပါသည်။ %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/promotion/impl/res/values-nb/strings.xml b/java/com/android/dialer/promotion/impl/res/values-nb/strings.xml
new file mode 100644
index 0000000..a148de3
--- /dev/null
+++ b/java/com/android/dialer/promotion/impl/res/values-nb/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="rtt_promotion_title">Tekstmeldinger i sanntid i anrop</string>
+  <string name="rtt_promotion_details">STT er til hjelp for anropsbrukere som er døve, tunghørte, har talefunksjonshemninger eller trenger mer enn bare tale. Transkripsjoner av STT-meldinger lagres i anropsloggen på enheten din. %1$s</string>
+  <string name="duo_disclosure_title">Ha videosamtaler i Duo</string>
+  <string name="duo_disclosure_details">Med videosamtaler i Google Duo kan du snakke med venner og familie ansikt til ansikt. Datakostnader kan påløpe. %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/promotion/impl/res/values-ne/strings.xml b/java/com/android/dialer/promotion/impl/res/values-ne/strings.xml
new file mode 100644
index 0000000..ad7d02d
--- /dev/null
+++ b/java/com/android/dialer/promotion/impl/res/values-ne/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="rtt_promotion_title">कलभित्रै द्रुत पाठ सन्देश प्रवाह</string>
+  <string name="rtt_promotion_details">RTT ले बहिरा, सुन्नमा कठिन हुने, बोल्न नसक्ने र कल गर्दा आवाजका साथै अरू कुराहरूको आवश्यकता पर्ने मान्छेहरूलाई सहायता गर्छ। तपाईंको यन्त्रको कलसम्बन्धी इतिहासमा RTT सन्देश प्रवाह ट्रान्सक्रिप्सनहरू भण्डारण गरिन्छ। %1$s</string>
+  <string name="duo_disclosure_title">Duo मार्फत भिडियो कलहरू गर्नुहोस्</string>
+  <string name="duo_disclosure_details">Google Duo को भिडियो कल गर्ने सेवामार्फत तपाईं आफ्ना साथी र परिवारका सदस्यहरूसँग आमनेसामने कुराकानी गर्न सक्नुहुन्छ। डेटा शुल्क लाग्न सक्छ। %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/promotion/impl/res/values-nl/strings.xml b/java/com/android/dialer/promotion/impl/res/values-nl/strings.xml
new file mode 100644
index 0000000..eb7f804
--- /dev/null
+++ b/java/com/android/dialer/promotion/impl/res/values-nl/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="rtt_promotion_title">In realtime sms\'en in een oproep</string>
+  <string name="rtt_promotion_details">RTT helpt dove en slechthorende bellers en bellers met een spraakbeperking. Deze functie kan ook handig zijn voor bellers die meer dan alleen gesproken communicatie nodig hebben. Transcripts van RTT-berichten worden op je apparaat opgeslagen in de oproepgeschiedenis. %1$s</string>
+  <string name="duo_disclosure_title">Videogesprekken voeren met Duo</string>
+  <string name="duo_disclosure_details">Met videogesprekken via Google Duo kun je je vrienden en familie zien terwijl je hen spreekt. Er kunnen datakosten in rekening worden gebracht. %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/promotion/impl/res/values-no/strings.xml b/java/com/android/dialer/promotion/impl/res/values-no/strings.xml
new file mode 100644
index 0000000..a148de3
--- /dev/null
+++ b/java/com/android/dialer/promotion/impl/res/values-no/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="rtt_promotion_title">Tekstmeldinger i sanntid i anrop</string>
+  <string name="rtt_promotion_details">STT er til hjelp for anropsbrukere som er døve, tunghørte, har talefunksjonshemninger eller trenger mer enn bare tale. Transkripsjoner av STT-meldinger lagres i anropsloggen på enheten din. %1$s</string>
+  <string name="duo_disclosure_title">Ha videosamtaler i Duo</string>
+  <string name="duo_disclosure_details">Med videosamtaler i Google Duo kan du snakke med venner og familie ansikt til ansikt. Datakostnader kan påløpe. %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/promotion/impl/res/values-pa/strings.xml b/java/com/android/dialer/promotion/impl/res/values-pa/strings.xml
new file mode 100644
index 0000000..635086a
--- /dev/null
+++ b/java/com/android/dialer/promotion/impl/res/values-pa/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="rtt_promotion_title">ਕਿਸੇ ਕਾਲ ਦੌਰਾਨ ਅਸਲ-ਸਮੇਂ ਲਿਖਤ ਸੁਨੇਹਾ ਭੇਜਣਾ</string>
+  <string name="rtt_promotion_details">RTT ਬੋਲੇ, ਗੂੰਗੇ, ਸੁਣਨ ਸੰਬੰਧੀ ਪਰੇਸ਼ਾਨੀਆਂ ਵਾਲੇ ਕਾਲਰਾਂ ਜਾਂ ਚੀਜ਼ਾਂ ਨੂੰ ਸਮਝਣ ਲਈ ਅਵਾਜ਼ ਤੋਂ ਇਲਾਵਾ ਹੋਰ ਚੀਜ਼ਾਂ \'ਤੇ ਨਿਰਭਰ ਕਰਨ ਵਾਲੇ ਕਾਲਰਾਂ ਦੀ ਸਹਾਇਤਾ ਕਰਦਾ ਹੈ। RTT ਸੁਨੇਹੇ ਦੀਆਂ ਪ੍ਰਤੀਲਿਪੀਆਂ ਨੂੰ ਤੁਹਾਡੇ ਡੀਵਾਈਸ ਵਿੱਚ ਕਾਲ ਇਤਿਹਾਸ ਵਿੱਚ ਸਟੋਰ ਕੀਤਾ ਜਾਂਦਾ ਹੈ। %1$s</string>
+  <string name="duo_disclosure_title">Duo ਨਾਲ ਵੀਡੀਓ ਕਾਲਾਂ ਕਰੋ</string>
+  <string name="duo_disclosure_details">Google Duo ਵੀਡੀਓ ਕਾਲਿੰਗ ਤੁਹਾਨੂੰ ਦੋਸਤਾਂ ਅਤੇ ਪਰਿਵਾਰ ਨਾਲ ਆਮ੍ਹੋ-ਸਾਹਮਣੇ ਗੱਲਬਾਤ ਕਰਨ ਦਿੰਦੀ ਹੈ। ਡਾਟਾ ਖਰਚੇ ਲਏ ਜਾ ਸਕਦੇ ਹਨ। %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/promotion/impl/res/values-pl/strings.xml b/java/com/android/dialer/promotion/impl/res/values-pl/strings.xml
new file mode 100644
index 0000000..a170b5c
--- /dev/null
+++ b/java/com/android/dialer/promotion/impl/res/values-pl/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="rtt_promotion_title">Wysyłanie SMS-ów w czasie rzeczywistym podczas rozmowy</string>
+  <string name="rtt_promotion_details">RTT pomaga osobom niesłyszącym, niedosłyszącym, mającym problemy z mówieniem oraz potrzebującym czegoś więcej oprócz głosu. Transkrypcje są przechowywane na urządzeniu w historii połączeń. %1$s</string>
+  <string name="duo_disclosure_title">Prowadź rozmowy wideo w Duo</string>
+  <string name="duo_disclosure_details">Dzięki rozmowom wideo w Google Duo możesz czatować na żywo ze znajomymi i rodziną. Mogą obowiązywać opłaty za transmisję danych. %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/promotion/impl/res/values-pt-rBR/strings.xml b/java/com/android/dialer/promotion/impl/res/values-pt-rBR/strings.xml
new file mode 100644
index 0000000..33d88da
--- /dev/null
+++ b/java/com/android/dialer/promotion/impl/res/values-pt-rBR/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="rtt_promotion_title">Mensagem de texto em tempo real em uma chamada</string>
+  <string name="rtt_promotion_details">A RTT ajuda os autores das chamadas com deficiências como surdez, dificuldade de audição ou fala ou que precisam de outros recursos além de voz. As transcrições das mensagens RTT são armazenadas no histórico de chamadas do dispositivo. %1$s</string>
+  <string name="duo_disclosure_title">Fazer videochamadas com o Duo</string>
+  <string name="duo_disclosure_details">Com as videochamadas do Google Duo, você pode bater papo cara a cara com amigos e familiares. O uso de dados está sujeito a cobranças. %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/promotion/impl/res/values-pt-rPT/strings.xml b/java/com/android/dialer/promotion/impl/res/values-pt-rPT/strings.xml
new file mode 100644
index 0000000..1075dd1
--- /dev/null
+++ b/java/com/android/dialer/promotion/impl/res/values-pt-rPT/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="rtt_promotion_title">Envio de mensagens em tempo real numa chamada de voz</string>
+  <string name="rtt_promotion_details">A RTT assiste os autores de chamadas surdos, com deficiências auditivas,
+    dificuldades da fala ou que precisem de mais do que apenas a voz. As transcrições de mensagens da RTT são armazenadas no seu dispositivo,
+    no histórico de chamadas. %1$s</string>
+  <string name="duo_disclosure_title">Efetue videochamadas com o Duo</string>
+  <string name="duo_disclosure_details">As videochamadas do Google Duo permitem-lhe conversar no chat com os amigos e a família cara a cara. Poderão ser aplicadas taxas de dados. %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/promotion/impl/res/values-pt/strings.xml b/java/com/android/dialer/promotion/impl/res/values-pt/strings.xml
new file mode 100644
index 0000000..33d88da
--- /dev/null
+++ b/java/com/android/dialer/promotion/impl/res/values-pt/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="rtt_promotion_title">Mensagem de texto em tempo real em uma chamada</string>
+  <string name="rtt_promotion_details">A RTT ajuda os autores das chamadas com deficiências como surdez, dificuldade de audição ou fala ou que precisam de outros recursos além de voz. As transcrições das mensagens RTT são armazenadas no histórico de chamadas do dispositivo. %1$s</string>
+  <string name="duo_disclosure_title">Fazer videochamadas com o Duo</string>
+  <string name="duo_disclosure_details">Com as videochamadas do Google Duo, você pode bater papo cara a cara com amigos e familiares. O uso de dados está sujeito a cobranças. %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/promotion/impl/res/values-ro/strings.xml b/java/com/android/dialer/promotion/impl/res/values-ro/strings.xml
new file mode 100644
index 0000000..34a8faf
--- /dev/null
+++ b/java/com/android/dialer/promotion/impl/res/values-ro/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="rtt_promotion_title">Schimb de mesaje în timp real într-un apel</string>
+  <string name="rtt_promotion_details">TTR oferă asistență apelanților fără auz, cu deficiențe de auz, care au dizabilități
+    de vorbire sau care au nevoie de mai mult decât vocea. Transcrierile mesajelor TTR sunt stocate pe dispozitiv
+    în istoricul apelurilor. %1$s</string>
+  <string name="duo_disclosure_title">Inițiați apeluri video folosind Duo</string>
+  <string name="duo_disclosure_details">Folosind apelarea video din Google Duo, puteți conversa cu prietenii și familia față în față. Se pot aplica taxe pentru date. %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/promotion/impl/res/values-ru/strings.xml b/java/com/android/dialer/promotion/impl/res/values-ru/strings.xml
new file mode 100644
index 0000000..b4e3fc7
--- /dev/null
+++ b/java/com/android/dialer/promotion/impl/res/values-ru/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="rtt_promotion_title">Сообщения RTT во время вызова</string>
+  <string name="rtt_promotion_details">Функция RTT предназначена для пользователей
+    с нарушениями слуха и речи. Расшифровки сообщений RTT сохраняются в журнале звонков
+    на вашем устройстве. %1$s</string>
+  <string name="duo_disclosure_title">Начинайте видеовстречи с помощью Duo</string>
+  <string name="duo_disclosure_details">Общайтесь с друзьями и родными в видеочатах Google Duo. Может взиматься плата за передачу данных. %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/promotion/impl/res/values-si/strings.xml b/java/com/android/dialer/promotion/impl/res/values-si/strings.xml
new file mode 100644
index 0000000..a188534
--- /dev/null
+++ b/java/com/android/dialer/promotion/impl/res/values-si/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="rtt_promotion_title">ඇමතුමක් ඇතුළත තථ්‍ය කාල පෙළ පණිවිඩකරණය</string>
+  <string name="rtt_promotion_details">බිහිරි, ශ්‍රවණ දුර්වලතා, කථන ආබාධයක් හෝ හඬට වඩා වැඩි දෙයක් අවශ්‍ය අමතන්නන්ට RTT සහාය දක්වයි. RTT පණිවිඩකරණ පිටපත් ඔබේ උපාංගයේ ඇමතුම් ඉතිහාසය තුළ ගබඩා කෙරේ. %1$s</string>
+  <string name="duo_disclosure_title">Duo සමගින් වීඩියෝ ඇමතුම් කරන්න</string>
+  <string name="duo_disclosure_details">Google Duo වීඩියෝ ඇමතීම ඔබට මිතුරන් සහ පවුලේ අය සමග මුහුණට මුහුණ කතාබස් කිරීමට ඉඩ දේ. දත්ත ගාස්තු අදාළ විය හැකිය. %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/promotion/impl/res/values-sk/strings.xml b/java/com/android/dialer/promotion/impl/res/values-sk/strings.xml
new file mode 100644
index 0000000..18db4c6
--- /dev/null
+++ b/java/com/android/dialer/promotion/impl/res/values-sk/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="rtt_promotion_title">Odosielanie okamžitého textu počas hovoru</string>
+  <string name="rtt_promotion_details">Okamžitý text pomáha volajúcim, ktorí nepočujú, majú problémy so sluchom,
+    rečovú poruchu alebo potrebujú viac ako samotný hlas. Prepisy správ s okamžitým textom sa ukladajú
+    vo vašom zariadení v histórii hovorov. %1$s</string>
+  <string name="duo_disclosure_title">Uskutočňujte videohovory v aplikácii Duo</string>
+  <string name="duo_disclosure_details">Vďaka videohovorom v aplikácii Google Duo môžete bezprostredne četovať s priateľmi a rodinou. Môžu sa účtovať poplatky za dátový prenos. %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/promotion/impl/res/values-sl/strings.xml b/java/com/android/dialer/promotion/impl/res/values-sl/strings.xml
new file mode 100644
index 0000000..f8e653f
--- /dev/null
+++ b/java/com/android/dialer/promotion/impl/res/values-sl/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="rtt_promotion_title">Sprotna sporočila v klicu</string>
+  <string name="rtt_promotion_details">Funkcija RTT pomaga klicateljem, ki so gluhi, naglušni, imajo govorno
+    motnjo ali potrebujejo več kot samo glas. Prepisi sporočil RTT so shranjeni v vaši napravi
+    v zgodovini klicev. %1$s</string>
+  <string name="duo_disclosure_title">Opravljajte videoklice prek Dua</string>
+  <string name="duo_disclosure_details">Videoklici prek Googla Duo omogočajo, da s prijatelji in družinskimi člani klepetate iz oči v oči. Morda boste morali plačati stroške prenosa podatkov. %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/promotion/impl/res/values-sq/strings.xml b/java/com/android/dialer/promotion/impl/res/values-sq/strings.xml
new file mode 100644
index 0000000..e94e3f9
--- /dev/null
+++ b/java/com/android/dialer/promotion/impl/res/values-sq/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="rtt_promotion_title">Mesazhet me tekst në kohë reale brenda një telefonate</string>
+  <string name="rtt_promotion_details">Funksioni RTT ndihmon telefonuesit që janë të shurdhër, kanë vështirësi dëgjimi, kanë një aftësi të kufizuar të të folurit ose që kanë nevojë për më shumë se thjesht zërin. Transkriptet e mesazheve të funksionit RTT ruhen në pajisjen tënde në historikun e telefonatave. %1$s</string>
+  <string name="duo_disclosure_title">Bëj telefonata me video me Duo</string>
+  <string name="duo_disclosure_details">Telefonatat me video me Google Duo të lejojnë të bisedosh me shokët dhe familjen tënde ballë për ballë. Mund të zbatohen tarifat për të dhënat. %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/promotion/impl/res/values-sr/strings.xml b/java/com/android/dialer/promotion/impl/res/values-sr/strings.xml
new file mode 100644
index 0000000..432e2d9
--- /dev/null
+++ b/java/com/android/dialer/promotion/impl/res/values-sr/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="rtt_promotion_title">Размена SMS-ова у реалном времену у позиву</string>
+  <string name="rtt_promotion_details">RTT помаже позиваоцима који су глуви, имају оштећење слуха, тешкоће у
+    говору или им је потребно нешто више од гласа. Транскрипти RTT порука се чувају на уређају
+    у историји позива. %1$s</string>
+  <string name="duo_disclosure_title">Упућујте видео позиве помоћу Duo-а</string>
+  <string name="duo_disclosure_details">Видео позиви у Google Duo-у вам омогућавају да ћаскате са пријатељима и породицом лицем у лице. Важе накнаде за пренос података. %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/promotion/impl/res/values-sv/strings.xml b/java/com/android/dialer/promotion/impl/res/values-sv/strings.xml
new file mode 100644
index 0000000..08cd4ef
--- /dev/null
+++ b/java/com/android/dialer/promotion/impl/res/values-sv/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="rtt_promotion_title">Meddelanden med realtidstext i samtal</string>
+  <string name="rtt_promotion_details">RTT hjälper döva, hörselskadade, personer med
+    talsvårigheter eller behöver mer än endast röst. Transkriptioner av RTT-meddelanden lagras på enheten
+    i samtalshistoriken. %1$s</string>
+  <string name="duo_disclosure_title">Ring videosamtal med Duo</string>
+  <string name="duo_disclosure_details">Google Duo videosamtal gör det möjligt att chatta ansikte mot ansikte med familj och vänner. Dataavgifter kan tillkomma. %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/promotion/impl/res/values-sw/strings.xml b/java/com/android/dialer/promotion/impl/res/values-sw/strings.xml
new file mode 100644
index 0000000..22cac3a
--- /dev/null
+++ b/java/com/android/dialer/promotion/impl/res/values-sw/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="rtt_promotion_title">Kutuma SMS katika muda halisi wakati unapiga simu</string>
+  <string name="rtt_promotion_details">RTT huwasaidia wapigaji simu ambao ni viziwi, wenye matatizo ya kusikia, wenye matatizo ya kuzungumza au wanaohitaji kufanya zaidi ya kuzungumza tu. Manukuu ya ujumbe wa RTT huhifadhiwa kwenye kifaa chako katika rekodi ya simu zilizopigwa. %1$s</string>
+  <string name="duo_disclosure_title">Piga simu za video kwa kutumia Duo</string>
+  <string name="duo_disclosure_details">Huduma ya simu ya video ya Google Duo inakuwezesha kuzungumza na marafiki na familia ana kwa ana. Gharama ya kutumia data inaweza kutozwa. %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/promotion/impl/res/values-ta/strings.xml b/java/com/android/dialer/promotion/impl/res/values-ta/strings.xml
new file mode 100644
index 0000000..0fe2f16
--- /dev/null
+++ b/java/com/android/dialer/promotion/impl/res/values-ta/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="rtt_promotion_title">அழைப்பில் இருக்கும் போதே நிகழ்நேர உரைச் செய்தியை அனுப்பலாம்</string>
+  <string name="rtt_promotion_details">காது கேட்காதவர்கள், கேட்பதில் பிரச்சனை உள்ளவர்கள், பேச
+    முடியாதவர்கள் அல்லது குரலுடன் கூடுதல் சேவை தேவைப்படும் அழைப்பாளர்களுக்கு RTT உதவுகிறது. RTT செய்தி டிரான்ஸ்கிரிப்ட்டுகள், உங்கள் சாதன
+    அழைப்பு வரலாற்றில் சேமிக்கப்படும். %1$s</string>
+  <string name="duo_disclosure_title">Duo மூலம் வீடியோ அழைப்புகளைச் செய்யுங்கள்</string>
+  <string name="duo_disclosure_details">Google Duo இன் வீடியோ அழைப்பு மூலம் நண்பர்களுடனும் குடும்பத்தினருடனும் நேருக்கு நேராக அரட்டையடிக்கலாம். தரவுக் கட்டணங்கள் விதிக்கப்படலாம். %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/promotion/impl/res/values-te/strings.xml b/java/com/android/dialer/promotion/impl/res/values-te/strings.xml
new file mode 100644
index 0000000..21bda7e
--- /dev/null
+++ b/java/com/android/dialer/promotion/impl/res/values-te/strings.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="rtt_promotion_title">కాల్‌లో నిజ సమయ వచన సందేశం</string>
+  <string name="rtt_promotion_details">చెవిటివారు, వినికిడి సమస్యలు ఉన్న వారు, మాట్లాడటంలో సమస్యలు ఉన్న వారు లేదా కేవలం వాయిస్‌తో అర్థం చేసుకోలేని కాలర్‌లకు RTT సహాయపడుతుంది. RTT సందేశ
+లిపి మార్పులు మీ పరికరంలోని కాల్ చరిత్రలో నిల్వ చేయబడతాయి. %1$s</string>
+  <string name="duo_disclosure_title">Duoతో వీడియో కాల్‌లను చేయండి</string>
+  <string name="duo_disclosure_details">Google Duo వీడియో కాలింగ్ మీరు మీ స్నేహితులు మరియు కుటుంబ సభ్యులతో ముఖాముఖిగా సంభాషించడానికి వీలు కల్పిస్తుంది. డేటా ఛార్జీలు వర్తించవచ్చు. %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/promotion/impl/res/values-th/strings.xml b/java/com/android/dialer/promotion/impl/res/values-th/strings.xml
new file mode 100644
index 0000000..8eefae3
--- /dev/null
+++ b/java/com/android/dialer/promotion/impl/res/values-th/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="rtt_promotion_title">การรับส่งข้อความแบบเรียลไทม์ภายในการโทร</string>
+  <string name="rtt_promotion_details">RTT ช่วยเหลือผู้โทรที่หูหนวก ได้ยินไม่ชัด มีความบกพร่อง
+    ในการพูด หรือต้องการการสื่อสารที่นอกเหนือจากเสียงพูด ระบบจะจัดเก็บการถอดเสียงการรับส่งข้อความ RTT ไว้ในอุปกรณ์ของคุณ
+    ในประวัติการโทร %1$s</string>
+  <string name="duo_disclosure_title">ใช้วิดีโอคอลผ่าน Duo</string>
+  <string name="duo_disclosure_details">วิดีโอคอลจาก Google Duo ช่วยให้คุณแชทกับเพื่อนๆ และครอบครัวแบบเห็นหน้าเห็นตาได้ อาจมีการคิดค่าเน็ตมือถือ %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/promotion/impl/res/values-tl/strings.xml b/java/com/android/dialer/promotion/impl/res/values-tl/strings.xml
new file mode 100644
index 0000000..bbb30a2
--- /dev/null
+++ b/java/com/android/dialer/promotion/impl/res/values-tl/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="rtt_promotion_title">Real-time na pagmemensahe sa text habang nasa isang tawag</string>
+  <string name="rtt_promotion_details">Tinutulungan ng RTT ang mga tumatawag na bingi, mahina ang pandinig, may kapansanan
+    sa pagsasalita, o kailangan ng higit pa sa boses lang. Ini-store ang mga transcript ng pagmemensahe gamit ang RTT sa iyong device
+    sa history ng tawag. %1$s</string>
+  <string name="duo_disclosure_title">Makipag-video call gamit ang Duo</string>
+  <string name="duo_disclosure_details">Pinahihintulutan ka ng pakikipag-video call sa Google Duo na makipag-chat sa mga kaibigan at pamilya nang harapan. Maaaring may mga babayaran sa data. %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/promotion/impl/res/values-tr/strings.xml b/java/com/android/dialer/promotion/impl/res/values-tr/strings.xml
new file mode 100644
index 0000000..5b527f7
--- /dev/null
+++ b/java/com/android/dialer/promotion/impl/res/values-tr/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="rtt_promotion_title">Çağrı sırasında gerçek zamanlı mesaj gönderip alma</string>
+  <string name="rtt_promotion_details">RTT; tam veya kısmi işitme engelli, konuşma engeli olan veya sesten
+    fazlasına ihtiyaç duyan arayanlara yardımcı olur. RTT mesajlarının çeviri yazıları
+    cihazınızdaki çağrı geçmişinde depolanır. %1$s</string>
+  <string name="duo_disclosure_title">Duo ile görüntülü görüşmeler yapın</string>
+  <string name="duo_disclosure_details">Google Duo görüntülü görüşmesi, arkadaşlarınız ve ailenizle yüz yüze sohbet etmenizi sağlar. Veri aktarımı için ücret alınabilir. %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/promotion/impl/res/values-uk/strings.xml b/java/com/android/dialer/promotion/impl/res/values-uk/strings.xml
new file mode 100644
index 0000000..83c51f3
--- /dev/null
+++ b/java/com/android/dialer/promotion/impl/res/values-uk/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="rtt_promotion_title">Текстові повідомлення в реальному часі під час дзвінка</string>
+  <string name="rtt_promotion_details">RTT допомагає користувачам із вадами слуху, мовлення
+    та іншим користувачам, для яких голосового спілкування недостатньо. Транскрипції повідомлень RTT зберігаються на вашому пристрої
+    в історії викликів. %1$s</string>
+  <string name="duo_disclosure_title">Здійснюйте відеодзвінки за допомогою Duo</string>
+  <string name="duo_disclosure_details">Відеодзвінки Google Duo дають змогу спілкуватися з друзями та рідними віч-на-віч. Може стягуватися плата за обмін даними. %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/promotion/impl/res/values-ur/strings.xml b/java/com/android/dialer/promotion/impl/res/values-ur/strings.xml
new file mode 100644
index 0000000..2da5d9d
--- /dev/null
+++ b/java/com/android/dialer/promotion/impl/res/values-ur/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="rtt_promotion_title">کال میں ریئل ٹائم ٹیکسٹ پیغام رسانی کی سہولت</string>
+  <string name="rtt_promotion_details">‏RTT ایسے کالرز کی مدد کرتا ہے جو بہرے ہیں، اونچا سنتے ہیں، بولنے سے معذور ہیں یا ان کیلئے صرف آواز ہی کافی نہیں ہے۔ RTT پیغام ٹرانسکرپٹس کو آپ کے آلہ پر کال کی سرگزشت میں اسٹور کیا جاتا ہے۔ %1$s</string>
+  <string name="duo_disclosure_title">‏Duo کے ذریعے ویڈیو کال کریں</string>
+  <string name="duo_disclosure_details">‏Google Duo ویڈیو کالنگ کے ذریعے آپ دوستوں اور فیملی کے ساتھ رو برو چیٹ کر سکتے ہیں۔ ڈیٹا چارجز لاگو ہو سکتے ہیں۔ %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/promotion/impl/res/values-uz/strings.xml b/java/com/android/dialer/promotion/impl/res/values-uz/strings.xml
new file mode 100644
index 0000000..cbb34b6
--- /dev/null
+++ b/java/com/android/dialer/promotion/impl/res/values-uz/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="rtt_promotion_title">Chaqiruv vaqtida RTT xabar almashinuvi</string>
+  <string name="rtt_promotion_details">RTT kar, eshitish qobiliyati va nutqiy faoliyati buzilgan shaxslarga
+    mo‘ljallangan funksiyadir. RTT xabarlari transkripsiyalari qurilmangizga, chaqiruv
+    jurnaliga saqlanadi. %1$s</string>
+  <string name="duo_disclosure_title">Duo orqali video suhbat qiling</string>
+  <string name="duo_disclosure_details">Google Duo orqali do‘st va yaqinlaringiz bilan onlayn video suhbat qiling. Internet uchun haq olinishi mumkin. %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/promotion/impl/res/values-vi/strings.xml b/java/com/android/dialer/promotion/impl/res/values-vi/strings.xml
new file mode 100644
index 0000000..1b0109f
--- /dev/null
+++ b/java/com/android/dialer/promotion/impl/res/values-vi/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="rtt_promotion_title">Nhắn tin theo thời gian thực trong lúc gọi</string>
+  <string name="rtt_promotion_details">Tin nhắn theo thời gian thực (RTT) hỗ trợ những người gọi khiếm thính, bị suy giảm thính lực, không có
+    khả năng nói hoặc cần thêm hỗ trợ khác ngoài giọng nói. Bản ghi RTT được lưu trữ trên thiết bị
+    trong nhật ký cuộc gọi. %1$s</string>
+  <string name="duo_disclosure_title">Gọi điện video bằng Duo</string>
+  <string name="duo_disclosure_details">Ứng dụng gọi điện video Google Duo cho phép bạn trò chuyện trực diện với bạn bè và gia đình. Có thể mất cước phí dữ liệu. %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/promotion/impl/res/values-zh-rCN/strings.xml b/java/com/android/dialer/promotion/impl/res/values-zh-rCN/strings.xml
new file mode 100644
index 0000000..a657a53
--- /dev/null
+++ b/java/com/android/dialer/promotion/impl/res/values-zh-rCN/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="rtt_promotion_title">通话期间收发实时信息</string>
+  <string name="rtt_promotion_details">RTT 可为以下类型的来电者提供协助：失聪者、听力障碍人士、语言障碍人士或需要语音以外服务的人。实时信息的转录文字会存储在您设备上的通话记录中。%1$s</string>
+  <string name="duo_disclosure_title">使用 Duo 进行视频通话</string>
+  <string name="duo_disclosure_details">借助 Google Duo 视频通话功能，您可与亲朋好友“面对面”地聊天。您可能需要支付流量费。%1$s</string>
+</resources>
diff --git a/java/com/android/dialer/promotion/impl/res/values-zh-rHK/strings.xml b/java/com/android/dialer/promotion/impl/res/values-zh-rHK/strings.xml
new file mode 100644
index 0000000..8715a58
--- /dev/null
+++ b/java/com/android/dialer/promotion/impl/res/values-zh-rHK/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="rtt_promotion_title">在通話中進行即時文字短訊</string>
+  <string name="rtt_promotion_details">即時文字短訊 (RTT) 功能可協助失聰、有聽力障礙、語言障礙或需要語音以外更多功能的通話者。RTT 訊息轉錄內容會儲存在您裝置中的通話記錄。%1$s</string>
+  <string name="duo_disclosure_title">透過 Duo 撥打視像通話</string>
+  <string name="duo_disclosure_details">Google Duo 視像通話可讓您與親朋好友面對面聊天。您可能需要支付數據費用。%1$s</string>
+</resources>
diff --git a/java/com/android/dialer/promotion/impl/res/values-zh-rTW/strings.xml b/java/com/android/dialer/promotion/impl/res/values-zh-rTW/strings.xml
new file mode 100644
index 0000000..b8f1f2d
--- /dev/null
+++ b/java/com/android/dialer/promotion/impl/res/values-zh-rTW/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="rtt_promotion_title">通話內的即時文字訊息</string>
+  <string name="rtt_promotion_details">即時文字訊息功能可為以下類型的來電者提供協助：聽障人士、聽力受損者、語言障礙者，或需要語音服務以外的使用者。系統會將即時文字訊息的留言轉錄儲存在裝置的通話記錄中。%1$s</string>
+  <string name="duo_disclosure_title">使用 Duo 進行視訊通話</string>
+  <string name="duo_disclosure_details">你可以使用 Google Duo 視訊通話服務與親友面對面聊天。使用本服務可能需支付數據傳輸費用。%1$s</string>
+</resources>
diff --git a/java/com/android/dialer/promotion/impl/res/values-zu/strings.xml b/java/com/android/dialer/promotion/impl/res/values-zu/strings.xml
new file mode 100644
index 0000000..38d564e
--- /dev/null
+++ b/java/com/android/dialer/promotion/impl/res/values-zu/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="rtt_promotion_title">Ukulayeza kombhalo wesikhathi sangempela ngaphakathi kwekholi</string>
+  <string name="rtt_promotion_details">I-RTT isiza abafonayo abayizithulu, abanenkinga yokuzwa, abanokukhubazeka
+    bokukhuluma, noma abadinga okungaphezulu kwezwi lilodwa. Okulotshiwe kokulayeza kwe-RTT kugcinwa kudivayisi yakho
+    kumlando wekholi. %1$s</string>
+  <string name="duo_disclosure_title">Yenza amakholi evidiyo nge-Duo</string>
+  <string name="duo_disclosure_details">Ukushaya kwevidiyo kwe-Google Duo kukuvumela ukuthi uxoxe nabangani nomndeni ubuso nobuso. izindleko zedatha zingasebenza. %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/promotion/impl/res/values/strings.xml b/java/com/android/dialer/promotion/impl/res/values/strings.xml
new file mode 100644
index 0000000..8990749
--- /dev/null
+++ b/java/com/android/dialer/promotion/impl/res/values/strings.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2018 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Title for RTT promotion dialog. [CHAR LIMIT=NONE] -->
+  <string name="rtt_promotion_title">Real-time text messaging within a call</string>
+
+  <!-- Details for RTT promotion dialog. [CHAR LIMIT=NONE] -->
+  <string name="rtt_promotion_details">RTT assists callers who are deaf, hard of hearing, have a speech
+    disability, or need more than voice alone. RTT messaging transcripts are stored on your device
+    in the call history. <xliff:g exmaple="Learn More">%1$s</xliff:g></string>
+
+  <!-- Header on the Duo disclosure card. [CHAR_LIMIT=60] -->
+  <string name="duo_disclosure_title">
+    Make video calls with Duo
+  </string>
+
+  <!-- Details on the Duo disclosure card. [CHAR_LIMIT=200] -->
+  <string name="duo_disclosure_details">
+    Google Duo video calling lets you chat with friends and family face-to-face. Data charges may apply. <xliff:g example="Learn More">%1$s</xliff:g>
+  </string>
+</resources>
diff --git a/java/com/android/dialer/protos/ProtoParsers.java b/java/com/android/dialer/protos/ProtoParsers.java
index e529206..00d5a26 100644
--- a/java/com/android/dialer/protos/ProtoParsers.java
+++ b/java/com/android/dialer/protos/ProtoParsers.java
@@ -16,6 +16,7 @@
 
 package com.android.dialer.protos;
 
+import android.content.ContentValues;
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
@@ -43,9 +44,26 @@
   }
 
   /**
+   * Retrieve a proto from a ContentValues which was not created within the current
+   * executable/version.
+   */
+  @SuppressWarnings("unchecked") // We want to eventually optimize away parser classes, so cast
+  public static <T extends MessageLite> T get(
+      @NonNull ContentValues contentValues, @NonNull String key, @NonNull T defaultInstance)
+      throws InvalidProtocolBufferException {
+
+    Assert.isNotNull(contentValues);
+    Assert.isNotNull(key);
+    Assert.isNotNull(defaultInstance);
+
+    byte[] bytes = contentValues.getAsByteArray(key);
+    return (T) mergeFrom(bytes, defaultInstance.getDefaultInstanceForType());
+  }
+
+  /**
    * Retrieve a proto from a trusted bundle which was created within the current executable/version.
    *
-   * @throws RuntimeException if the proto cannot be parsed
+   * @throws IllegalStateException if the proto cannot be parsed
    */
   public static <T extends MessageLite> T getTrusted(
       @NonNull Bundle bundle, @NonNull String key, @NonNull T defaultInstance) {
@@ -57,6 +75,21 @@
   }
 
   /**
+   * Retrieve a proto from a trusted ContentValues which was created within the current
+   * executable/version.
+   *
+   * @throws IllegalStateException if the proto cannot be parsed
+   */
+  public static <T extends MessageLite> T getTrusted(
+      @NonNull ContentValues contentValues, @NonNull String key, @NonNull T defaultInstance) {
+    try {
+      return get(contentValues, key, defaultInstance);
+    } catch (InvalidProtocolBufferException e) {
+      throw Assert.createIllegalStateFailException(e.toString());
+    }
+  }
+
+  /**
    * Retrieve a proto from a trusted bundle which was created within the current executable/version.
    *
    * @throws RuntimeException if the proto cannot be parsed
diff --git a/java/com/android/dialer/rootcomponentgenerator/ComponentGeneratingStep.java b/java/com/android/dialer/rootcomponentgenerator/ComponentGeneratingStep.java
new file mode 100644
index 0000000..1a40611
--- /dev/null
+++ b/java/com/android/dialer/rootcomponentgenerator/ComponentGeneratingStep.java
@@ -0,0 +1,267 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.dialer.rootcomponentgenerator;
+
+import static com.google.auto.common.AnnotationMirrors.getAnnotationValue;
+import static com.google.auto.common.MoreElements.getAnnotationMirror;
+import static javax.lang.model.element.Modifier.ABSTRACT;
+import static javax.lang.model.element.Modifier.PUBLIC;
+import static javax.lang.model.element.Modifier.STATIC;
+import static javax.lang.model.util.ElementFilter.typesIn;
+
+import com.android.dialer.inject.IncludeInDialerRoot;
+import com.google.auto.common.BasicAnnotationProcessor.ProcessingStep;
+import com.google.auto.common.MoreElements;
+import com.google.common.base.Optional;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.SetMultimap;
+import com.squareup.javapoet.AnnotationSpec;
+import com.squareup.javapoet.ClassName;
+import com.squareup.javapoet.FieldSpec;
+import com.squareup.javapoet.MethodSpec;
+import com.squareup.javapoet.ParameterSpec;
+import com.squareup.javapoet.TypeName;
+import com.squareup.javapoet.TypeSpec;
+import dagger.Subcomponent;
+import java.lang.annotation.Annotation;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
+import javax.annotation.processing.ProcessingEnvironment;
+import javax.lang.model.element.AnnotationMirror;
+import javax.lang.model.element.AnnotationValue;
+import javax.lang.model.element.Element;
+import javax.lang.model.element.ExecutableElement;
+import javax.lang.model.element.TypeElement;
+import javax.lang.model.element.VariableElement;
+import javax.lang.model.type.TypeMirror;
+
+/**
+ * Generates component for a type annotated with {@link IncludeInDialerRoot}.
+ *
+ * <p>Our components have boilerplate code like:
+ *
+ * <p>
+ *
+ * <pre>
+ * <code>
+ *
+ * {@literal @}dagger.Subcomponent
+ * public abstract class GenXXXXComponent {
+ *   public static SimulatorComponent get(Context context) {
+ *      return ((HasComponent)((HasRootComponent) context.getApplicationContext()).component())
+ *         .simulatorComponent();
+ *   }
+ *   {@literal @}IncludeInDialerRoot
+ *   public interface HasComponent {
+ *      SimulatorComponent simulatorComponent();
+ *  }
+ * }
+ * </code>
+ * </pre>
+ */
+final class ComponentGeneratingStep implements ProcessingStep {
+
+  private static final String DIALER_INJECT_PACKAGE = "com.android.dialer.inject";
+  private static final String DIALER_HASROOTCOMPONENT_INTERFACE = "HasRootComponent";
+  private static final ClassName ANDROID_CONTEXT_CLASS_NAME =
+      ClassName.get("android.content", "Context");
+  private final ProcessingEnvironment processingEnv;
+
+  public ComponentGeneratingStep(ProcessingEnvironment processingEnv) {
+    this.processingEnv = processingEnv;
+  }
+
+  @Override
+  public Set<? extends Class<? extends Annotation>> annotations() {
+    return ImmutableSet.of(IncludeInDialerRoot.class);
+  }
+
+  @Override
+  public Set<? extends Element> process(
+      SetMultimap<Class<? extends Annotation>, Element> elementsByAnnotation) {
+    for (TypeElement type : typesIn(elementsByAnnotation.get(IncludeInDialerRoot.class))) {
+      generateComponent(type);
+    }
+    return Collections.emptySet();
+  }
+
+  /**
+   * Generates component file for a componentElement.
+   *
+   * <p>The annotation processor will generate a new type file with some prefix, which contains
+   * public static XXX get(Context context) method and HasComponent interface.
+   *
+   * @param dialerComponentElement a component used by the annotation processor.
+   */
+  private void generateComponent(TypeElement dialerComponentElement) {
+    TypeSpec.Builder componentClass =
+        dialerComponentElement.getKind().isClass()
+            ? cloneClass(dialerComponentElement, RootComponentUtils.GENERATED_COMPONENT_PREFIX)
+            : cloneInterface(dialerComponentElement, RootComponentUtils.GENERATED_COMPONENT_PREFIX);
+    componentClass.addAnnotation(makeDaggerSubcomponentAnnotation(dialerComponentElement));
+    RootComponentUtils.writeJavaFile(
+        processingEnv,
+        ClassName.get(dialerComponentElement).packageName(),
+        dialerBoilerplateCode(componentClass, dialerComponentElement));
+  }
+
+  @SuppressWarnings("unchecked")
+  private AnnotationSpec makeDaggerSubcomponentAnnotation(TypeElement dialerComponentElement) {
+
+    Optional<AnnotationMirror> componentMirror =
+        getAnnotationMirror(dialerComponentElement, IncludeInDialerRoot.class);
+
+    AnnotationSpec.Builder subcomponentBuilder = AnnotationSpec.builder(Subcomponent.class);
+    for (AnnotationValue annotationValue :
+        (List<? extends AnnotationValue>)
+            getAnnotationValue(componentMirror.get(), "modules").getValue()) {
+      subcomponentBuilder.addMember(
+          "modules", "$T.class", ClassName.get((TypeMirror) annotationValue.getValue()));
+    }
+    return subcomponentBuilder.build();
+  }
+
+  private TypeSpec dialerBoilerplateCode(
+      TypeSpec.Builder typeBuilder, TypeElement dialerComponentElement) {
+    return typeBuilder
+        .addType(hasComponentInterface(typeBuilder, dialerComponentElement))
+        .addMethod(addGetComponentMethod(typeBuilder, dialerComponentElement))
+        .build();
+  }
+
+  private TypeSpec hasComponentInterface(
+      TypeSpec.Builder typeBuilder, TypeElement dialerComponentElement) {
+    return TypeSpec.interfaceBuilder("HasComponent")
+        .addModifiers(PUBLIC)
+        .addMethod(
+            MethodSpec.methodBuilder("make" + dialerComponentElement.getSimpleName())
+                .addModifiers(PUBLIC, ABSTRACT)
+                .returns(getComponentClass(typeBuilder, dialerComponentElement))
+                .build())
+        .build();
+  }
+
+  private MethodSpec addGetComponentMethod(
+      TypeSpec.Builder typeBuilder, TypeElement dialerComponentElement) {
+    ClassName hasComponenetInterface =
+        ClassName.get(
+                getPackageName(dialerComponentElement),
+                RootComponentUtils.GENERATED_COMPONENT_PREFIX
+                    + dialerComponentElement.getSimpleName())
+            .nestedClass("HasComponent");
+    ClassName hasRootComponentInterface =
+        ClassName.get(DIALER_INJECT_PACKAGE, DIALER_HASROOTCOMPONENT_INTERFACE);
+    return MethodSpec.methodBuilder("get")
+        .addModifiers(PUBLIC, STATIC)
+        .addParameter(ParameterSpec.builder(ANDROID_CONTEXT_CLASS_NAME, "context").build())
+        .addStatement(
+            "$1T hasRootComponent = ($1T) context.getApplicationContext()",
+            hasRootComponentInterface)
+        .addStatement(
+            "return (($T) (hasRootComponent.component())).make$T()",
+            hasComponenetInterface,
+            dialerComponentElement)
+        .returns(getComponentClass(typeBuilder, dialerComponentElement))
+        .build();
+  }
+
+  private void addElement(TypeSpec.Builder builder, Element element) {
+    switch (element.getKind()) {
+      case INTERFACE:
+        builder.addType(cloneInterface(MoreElements.asType(element), "").build());
+        break;
+      case CLASS:
+        builder.addType(cloneClass(MoreElements.asType(element), "").build());
+        break;
+      case FIELD:
+        builder.addField(cloneField(MoreElements.asVariable(element)).build());
+        break;
+      case METHOD:
+        builder.addMethod(cloneMethod(MoreElements.asExecutable(element)));
+        break;
+      case CONSTRUCTOR:
+        builder.addMethod(cloneConstructor(MoreElements.asExecutable(element)));
+        break;
+      default:
+        throw new RuntimeException(
+            String.format("Unexpected element %s met during class cloning phase!", element));
+    }
+  }
+
+  private MethodSpec cloneMethod(ExecutableElement element) {
+    return MethodSpec.methodBuilder(element.getSimpleName().toString())
+        .addModifiers(element.getModifiers())
+        .returns(TypeName.get(element.getReturnType()))
+        .addParameters(cloneParameters(element.getParameters()))
+        .build();
+  }
+
+  private MethodSpec cloneConstructor(ExecutableElement element) {
+    return MethodSpec.constructorBuilder()
+        .addModifiers(element.getModifiers())
+        .addParameters(cloneParameters(element.getParameters()))
+        .build();
+  }
+
+  private List<ParameterSpec> cloneParameters(
+      List<? extends VariableElement> variableElementsList) {
+    List<ParameterSpec> list = new ArrayList<>();
+    for (VariableElement variableElement : variableElementsList) {
+      ParameterSpec.Builder builder =
+          ParameterSpec.builder(
+                  TypeName.get(variableElement.asType()),
+                  variableElement.getSimpleName().toString())
+              .addModifiers(variableElement.getModifiers());
+      list.add(builder.build());
+    }
+    return list;
+  }
+
+  private TypeSpec.Builder cloneInterface(TypeElement element, String prefix) {
+    return cloneType(TypeSpec.interfaceBuilder(prefix + element.getSimpleName()), element);
+  }
+
+  private TypeSpec.Builder cloneClass(TypeElement element, String prefix) {
+    return cloneType(TypeSpec.classBuilder(prefix + element.getSimpleName()), element);
+  }
+
+  private FieldSpec.Builder cloneField(VariableElement element) {
+    FieldSpec.Builder builder =
+        FieldSpec.builder(TypeName.get(element.asType()), element.getSimpleName().toString());
+    element.getModifiers().forEach(builder::addModifiers);
+    return builder;
+  }
+
+  private TypeSpec.Builder cloneType(TypeSpec.Builder builder, TypeElement element) {
+    element.getModifiers().forEach(builder::addModifiers);
+    for (Element enclosedElement : element.getEnclosedElements()) {
+      addElement(builder, enclosedElement);
+    }
+    return builder;
+  }
+
+  private ClassName getComponentClass(
+      TypeSpec.Builder typeBuilder, TypeElement dialerComponentElement) {
+    return ClassName.get(getPackageName(dialerComponentElement), typeBuilder.build().name);
+  }
+
+  private String getPackageName(TypeElement element) {
+    return ClassName.get(element).packageName();
+  }
+}
diff --git a/java/com/android/dialer/rootcomponentgenerator/MetadataGeneratingStep.java b/java/com/android/dialer/rootcomponentgenerator/MetadataGeneratingStep.java
new file mode 100644
index 0000000..266574d
--- /dev/null
+++ b/java/com/android/dialer/rootcomponentgenerator/MetadataGeneratingStep.java
@@ -0,0 +1,92 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.dialer.rootcomponentgenerator;
+
+import static javax.tools.Diagnostic.Kind.ERROR;
+
+import com.android.dialer.inject.IncludeInDialerRoot;
+import com.android.dialer.inject.InstallIn;
+import com.android.dialer.inject.RootComponentGeneratorMetadata;
+import com.google.auto.common.BasicAnnotationProcessor.ProcessingStep;
+import com.google.auto.common.MoreElements;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.SetMultimap;
+import com.squareup.javapoet.AnnotationSpec;
+import com.squareup.javapoet.TypeSpec;
+import java.lang.annotation.Annotation;
+import java.util.Collections;
+import java.util.Set;
+import javax.annotation.processing.ProcessingEnvironment;
+import javax.lang.model.element.Element;
+import javax.lang.model.element.TypeElement;
+
+/**
+ * Genereates metadata for every type annotated by {@link InstallIn} and {@link
+ * IncludeInDialerRoot}.
+ *
+ * <p>The metadata has the information where the annotated types are and it is used by annotation
+ * processor when the processor tries to generate root component.
+ */
+final class MetadataGeneratingStep implements ProcessingStep {
+
+  private final ProcessingEnvironment processingEnv;
+
+  MetadataGeneratingStep(ProcessingEnvironment processingEnv) {
+    this.processingEnv = processingEnv;
+  }
+
+  @Override
+  public Set<? extends Class<? extends Annotation>> annotations() {
+    return ImmutableSet.of(IncludeInDialerRoot.class, InstallIn.class);
+  }
+
+  @Override
+  public Set<? extends Element> process(
+      SetMultimap<Class<? extends Annotation>, Element> elementsByAnnotation) {
+
+    for (Element element : elementsByAnnotation.get(IncludeInDialerRoot.class)) {
+      generateMetadataFor(IncludeInDialerRoot.class, MoreElements.asType(element));
+    }
+    for (Element element : elementsByAnnotation.get(InstallIn.class)) {
+      if (element.getAnnotation(InstallIn.class).variants().length == 0) {
+        processingEnv
+            .getMessager()
+            .printMessage(
+                ERROR, String.format("@InstallIn %s must have at least one variant", element));
+        continue;
+      }
+      generateMetadataFor(InstallIn.class, MoreElements.asType(element));
+    }
+
+    return Collections.emptySet();
+  }
+
+  private void generateMetadataFor(
+      Class<? extends Annotation> annotation, TypeElement annotatedElement) {
+    TypeSpec.Builder metadataClassBuilder =
+        TypeSpec.classBuilder(
+            annotatedElement.getQualifiedName().toString().replace('.', '_') + "Metadata");
+    metadataClassBuilder.addAnnotation(
+        AnnotationSpec.builder(RootComponentGeneratorMetadata.class)
+            .addMember("tag", "$S", annotation.getSimpleName())
+            .addMember("annotatedClass", "$T.class", annotatedElement.asType())
+            .build());
+    TypeSpec metadataClass = metadataClassBuilder.build();
+    RootComponentUtils.writeJavaFile(
+        processingEnv, RootComponentUtils.METADATA_PACKAGE_NAME, metadataClass);
+  }
+}
diff --git a/java/com/android/dialer/rootcomponentgenerator/RootComponentGeneratingStep.java b/java/com/android/dialer/rootcomponentgenerator/RootComponentGeneratingStep.java
new file mode 100644
index 0000000..06b994f
--- /dev/null
+++ b/java/com/android/dialer/rootcomponentgenerator/RootComponentGeneratingStep.java
@@ -0,0 +1,210 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.dialer.rootcomponentgenerator;
+
+import static com.google.auto.common.AnnotationMirrors.getAnnotationValue;
+import static com.google.auto.common.MoreElements.getAnnotationMirror;
+import static com.google.auto.common.MoreElements.isAnnotationPresent;
+import static javax.tools.Diagnostic.Kind.ERROR;
+
+import com.android.dialer.inject.DialerRootComponent;
+import com.android.dialer.inject.DialerVariant;
+import com.android.dialer.inject.IncludeInDialerRoot;
+import com.android.dialer.inject.InstallIn;
+import com.android.dialer.inject.RootComponentGeneratorMetadata;
+import com.google.auto.common.BasicAnnotationProcessor.ProcessingStep;
+import com.google.auto.common.MoreElements;
+import com.google.common.base.Optional;
+import com.google.common.collect.ArrayListMultimap;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.ListMultimap;
+import com.google.common.collect.SetMultimap;
+import com.squareup.javapoet.AnnotationSpec;
+import com.squareup.javapoet.ClassName;
+import com.squareup.javapoet.MethodSpec;
+import com.squareup.javapoet.TypeSpec;
+import dagger.Component;
+import java.lang.annotation.Annotation;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
+import javax.annotation.processing.ProcessingEnvironment;
+import javax.inject.Singleton;
+import javax.lang.model.element.AnnotationMirror;
+import javax.lang.model.element.Element;
+import javax.lang.model.element.Modifier;
+import javax.lang.model.element.PackageElement;
+import javax.lang.model.element.TypeElement;
+import javax.lang.model.type.TypeMirror;
+
+/**
+ * Generates root component for a java type annotated with {@link DialerRootComponent}.
+ *
+ * <p>If users use {@link GenerateTestDaggerApp} along with RootComponentGenerator, there's an
+ * optional method that they can use to inject instance in the test.
+ *
+ * <p>Example:
+ *
+ * <p>
+ *
+ * <pre>
+ * <code>
+ * @Inject SomeThing someThing;
+ * @Before
+ * public void setUp() {
+ * ...
+ * TestApplication application = (TestApplication) RuntimeEnvironment.application;
+ * TestComponent component = (TestComponent) application.component();
+ * component.inject(this);
+ * ...
+ * }
+ * </code>
+ * </pre>
+ */
+final class RootComponentGeneratingStep implements ProcessingStep {
+
+  private final ProcessingEnvironment processingEnv;
+
+  public RootComponentGeneratingStep(ProcessingEnvironment processingEnv) {
+    this.processingEnv = processingEnv;
+  }
+
+  @Override
+  public Set<? extends Class<? extends Annotation>> annotations() {
+    return ImmutableSet.of(DialerRootComponent.class, InstallIn.class, IncludeInDialerRoot.class);
+  }
+
+  @Override
+  public Set<? extends Element> process(
+      SetMultimap<Class<? extends Annotation>, Element> elementsByAnnotation) {
+    for (Element element : elementsByAnnotation.get(DialerRootComponent.class)) {
+      // defer root components to the next round in case where the current build target contains
+      // elements annotated with @InstallIn. Annotation processor cannot detect metadata files
+      // generated in the same round and the metadata is accessible in the next round.
+      if (shouldDeferRootComponent(elementsByAnnotation)) {
+        return elementsByAnnotation.get(DialerRootComponent.class);
+      } else {
+        generateRootComponent(MoreElements.asType(element));
+      }
+    }
+    return Collections.emptySet();
+  }
+
+  private boolean shouldDeferRootComponent(
+      SetMultimap<Class<? extends Annotation>, Element> elementsByAnnotation) {
+    return elementsByAnnotation.containsKey(InstallIn.class)
+        || elementsByAnnotation.containsKey(IncludeInDialerRoot.class);
+  }
+
+  /**
+   * Generates a root component.
+   *
+   * @param rootElement the annotated type with {@link DialerRootComponent} used in annotation
+   *     processor.
+   */
+  private void generateRootComponent(TypeElement rootElement) {
+    DialerRootComponent dialerRootComponent = rootElement.getAnnotation(DialerRootComponent.class);
+    ListMultimap<DialerVariant, TypeElement> componentModuleMap = generateComponentModuleMap();
+    List<TypeElement> componentList = generateComponentList();
+    DialerVariant dialerVariant = dialerRootComponent.variant();
+    TypeSpec.Builder rootComponentClassBuilder =
+        TypeSpec.interfaceBuilder(dialerVariant.toString())
+            .addModifiers(Modifier.PUBLIC)
+            .addAnnotation(Singleton.class);
+    for (TypeElement componentWithSuperInterface : componentList) {
+      rootComponentClassBuilder.addSuperinterface(ClassName.get(componentWithSuperInterface));
+    }
+    AnnotationSpec.Builder componentAnnotation = AnnotationSpec.builder(Component.class);
+    for (TypeElement annotatedElement : componentModuleMap.get(dialerVariant)) {
+      componentAnnotation.addMember("modules", "$T.class", annotatedElement.asType());
+    }
+    rootComponentClassBuilder.addAnnotation(componentAnnotation.build());
+
+    AnnotationMirror dialerRootComponentMirror =
+        getAnnotationMirror(rootElement, DialerRootComponent.class).get();
+
+    TypeMirror annotatedTestClass =
+        (TypeMirror) getAnnotationValue(dialerRootComponentMirror, "injectClass").getValue();
+
+    rootComponentClassBuilder.addMethod(generateInjectMethod(annotatedTestClass));
+
+    TypeSpec rootComponentClass = rootComponentClassBuilder.build();
+    RootComponentUtils.writeJavaFile(
+        processingEnv, ClassName.get(rootElement).packageName(), rootComponentClass);
+  }
+
+  private List<TypeElement> generateComponentList() {
+    List<TypeElement> list = new ArrayList<>();
+    extractInfoFromMetadata(IncludeInDialerRoot.class, list::add);
+    return list;
+  }
+
+  private ListMultimap<DialerVariant, TypeElement> generateComponentModuleMap() {
+    ListMultimap<DialerVariant, TypeElement> map = ArrayListMultimap.create();
+    extractInfoFromMetadata(
+        InstallIn.class,
+        (annotatedElement) -> {
+          for (DialerVariant rootComponentName :
+              annotatedElement.getAnnotation(InstallIn.class).variants()) {
+            map.put(rootComponentName, annotatedElement);
+          }
+        });
+    return map;
+  }
+
+  private void extractInfoFromMetadata(
+      Class<? extends Annotation> annotation, MetadataProcessor metadataProcessor) {
+    PackageElement cachePackage =
+        processingEnv.getElementUtils().getPackageElement(RootComponentUtils.METADATA_PACKAGE_NAME);
+    if (cachePackage == null) {
+      processingEnv
+          .getMessager()
+          .printMessage(
+              ERROR,
+              "Metadata haven't been generated! do you forget to add modules "
+                  + "or components in dependency of dialer root?");
+      return;
+    }
+    for (Element element : cachePackage.getEnclosedElements()) {
+      Optional<AnnotationMirror> metadataAnnotation =
+          getAnnotationMirror(element, RootComponentGeneratorMetadata.class);
+      if (isAnnotationPresent(element, RootComponentGeneratorMetadata.class)
+          && getAnnotationValue(metadataAnnotation.get(), "tag")
+              .getValue()
+              .equals(annotation.getSimpleName())) {
+        TypeMirror annotatedClass =
+            (TypeMirror) getAnnotationValue(metadataAnnotation.get(), "annotatedClass").getValue();
+        TypeElement annotatedElement =
+            processingEnv.getElementUtils().getTypeElement(annotatedClass.toString());
+        metadataProcessor.process(annotatedElement);
+      }
+    }
+  }
+
+  private MethodSpec generateInjectMethod(TypeMirror testClassTypeMirror) {
+    return MethodSpec.methodBuilder("inject")
+        .addModifiers(Modifier.PUBLIC, Modifier.ABSTRACT)
+        .returns(void.class)
+        .addParameter(ClassName.get(testClassTypeMirror), "clazz")
+        .build();
+  }
+
+  private interface MetadataProcessor {
+    void process(TypeElement typeElement);
+  }
+}
diff --git a/java/com/android/dialer/rootcomponentgenerator/RootComponentProcessor.java b/java/com/android/dialer/rootcomponentgenerator/RootComponentProcessor.java
new file mode 100644
index 0000000..e5086aa
--- /dev/null
+++ b/java/com/android/dialer/rootcomponentgenerator/RootComponentProcessor.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.dialer.rootcomponentgenerator;
+
+import com.google.auto.common.BasicAnnotationProcessor;
+import com.google.auto.service.AutoService;
+import com.google.common.collect.ImmutableList;
+import javax.annotation.processing.Processor;
+import javax.lang.model.SourceVersion;
+
+/** Processes annotations defined by RootComponentGenerator. */
+@AutoService(Processor.class)
+public class RootComponentProcessor extends BasicAnnotationProcessor {
+
+  @Override
+  protected Iterable<? extends ProcessingStep> initSteps() {
+    return ImmutableList.of(
+        new MetadataGeneratingStep(processingEnv), new RootComponentGeneratingStep(processingEnv));
+  }
+
+  @Override
+  public SourceVersion getSupportedSourceVersion() {
+    return SourceVersion.latestSupported();
+  }
+}
diff --git a/java/com/android/dialer/rootcomponentgenerator/RootComponentUtils.java b/java/com/android/dialer/rootcomponentgenerator/RootComponentUtils.java
new file mode 100644
index 0000000..cdcae92
--- /dev/null
+++ b/java/com/android/dialer/rootcomponentgenerator/RootComponentUtils.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.dialer.rootcomponentgenerator;
+
+import com.squareup.javapoet.JavaFile;
+import com.squareup.javapoet.TypeSpec;
+import java.io.IOException;
+import javax.annotation.processing.ProcessingEnvironment;
+
+/**
+ * Contains a basic method writing java file to a curtain package. ProcessingEnvironment is needed.
+ */
+public abstract class RootComponentUtils {
+  /**
+   * The place where the generator puts metadata files storing reference for {@link
+   * RootComponentGeneratingStep}.
+   */
+  static final String METADATA_PACKAGE_NAME = "com.android.dialer.rootcomponentgenerator.metadata";
+
+  static final String GENERATED_COMPONENT_PREFIX = "Gen";
+
+  static void writeJavaFile(
+      ProcessingEnvironment processingEnv, String packageName, TypeSpec typeSpec) {
+    try {
+      JavaFile.builder(packageName, typeSpec)
+          .skipJavaLangImports(true)
+          .build()
+          .writeTo(processingEnv.getFiler());
+    } catch (IOException e) {
+      System.out.println(e);
+      throw new RuntimeException(e);
+    }
+  }
+}
diff --git a/java/com/android/dialer/rtt/AndroidManifest.xml b/java/com/android/dialer/rtt/AndroidManifest.xml
new file mode 100644
index 0000000..f8e8e0b
--- /dev/null
+++ b/java/com/android/dialer/rtt/AndroidManifest.xml
@@ -0,0 +1,21 @@
+<!--
+ ~ Copyright (C) 2018 The Android Open Source Project
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~      http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License
+ -->
+<manifest package="com.android.dialer.rtt"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+  <application>
+    <activity android:name=".RttTranscriptActivity"/>
+  </application>
+</manifest>
\ No newline at end of file
diff --git a/java/com/android/dialer/rtt/RttTranscriptActivity.java b/java/com/android/dialer/rtt/RttTranscriptActivity.java
new file mode 100644
index 0000000..574cdb2
--- /dev/null
+++ b/java/com/android/dialer/rtt/RttTranscriptActivity.java
@@ -0,0 +1,115 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.dialer.rtt;
+
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.view.MenuItem;
+import com.android.dialer.common.Assert;
+import com.android.dialer.common.concurrent.DialerExecutorComponent;
+import com.android.dialer.common.concurrent.UiListener;
+import com.android.dialer.glidephotomanager.PhotoInfo;
+import com.android.dialer.protos.ProtoParsers;
+import com.android.dialer.widget.DialerToolbar;
+
+/** Activity holds RTT transcript. */
+public class RttTranscriptActivity extends AppCompatActivity {
+
+  public static final String EXTRA_TRANSCRIPT_ID = "extra_transcript_id";
+  public static final String EXTRA_PRIMARY_TEXT = "extra_primary_text";
+  public static final String EXTRA_PHOTO_INFO = "extra_photo_info";
+
+  private RttTranscriptAdapter adapter;
+  private UiListener<RttTranscript> rttTranscriptUiListener;
+  private DialerToolbar toolbar;
+
+  public static Intent getIntent(
+      Context context, String transcriptId, String primaryText, PhotoInfo photoInfo) {
+    Intent intent = new Intent(context, RttTranscriptActivity.class);
+    intent.putExtra(RttTranscriptActivity.EXTRA_TRANSCRIPT_ID, transcriptId);
+    intent.putExtra(RttTranscriptActivity.EXTRA_PRIMARY_TEXT, primaryText);
+    ProtoParsers.put(intent, RttTranscriptActivity.EXTRA_PHOTO_INFO, Assert.isNotNull(photoInfo));
+    return intent;
+  }
+
+  @Override
+  protected void onCreate(@Nullable Bundle bundle) {
+    super.onCreate(bundle);
+    setContentView(R.layout.activity_rtt_transcript);
+    toolbar = findViewById(R.id.toolbar);
+    toolbar.setBackgroundColor(getColor(R.color.rtt_transcript_primary_color));
+    getWindow().setStatusBarColor(getColor(R.color.rtt_transcript_primary_color_dark));
+
+    RecyclerView recyclerView = findViewById(R.id.rtt_recycler_view);
+    LinearLayoutManager layoutManager = new LinearLayoutManager(this);
+    recyclerView.setLayoutManager(layoutManager);
+    recyclerView.setHasFixedSize(true);
+    adapter = new RttTranscriptAdapter(this);
+    recyclerView.setAdapter(adapter);
+
+    rttTranscriptUiListener =
+        DialerExecutorComponent.get(this)
+            .createUiListener(getFragmentManager(), "Load RTT transcript");
+    handleIntent(getIntent());
+  }
+
+  private void handleIntent(Intent intent) {
+    Assert.checkArgument(intent.hasExtra(EXTRA_TRANSCRIPT_ID));
+    Assert.checkArgument(intent.hasExtra(EXTRA_PRIMARY_TEXT));
+    Assert.checkArgument(intent.hasExtra(EXTRA_PHOTO_INFO));
+
+    String id = intent.getStringExtra(EXTRA_TRANSCRIPT_ID);
+    rttTranscriptUiListener.listen(
+        this,
+        RttTranscriptUtil.loadRttTranscript(this, id),
+        adapter::setRttTranscript,
+        throwable -> {
+          throw new RuntimeException(throwable);
+        });
+
+    String primaryText = intent.getStringExtra(EXTRA_PRIMARY_TEXT);
+    toolbar.setTitle(primaryText);
+
+    PhotoInfo photoInfo =
+        ProtoParsers.getTrusted(intent, EXTRA_PHOTO_INFO, PhotoInfo.getDefaultInstance());
+    // Photo shown here shouldn't have video or RTT badge.
+    PhotoInfo sanitizedPhotoInfo =
+        PhotoInfo.newBuilder().mergeFrom(photoInfo).setIsRtt(false).setIsVideo(false).build();
+    adapter.setPhotoInfo(sanitizedPhotoInfo);
+  }
+
+  @Override
+  protected void onNewIntent(Intent intent) {
+    super.onNewIntent(intent);
+    handleIntent(intent);
+  }
+
+  @Override
+  public boolean onOptionsItemSelected(MenuItem item) {
+    final int itemId = item.getItemId();
+    if (itemId == android.R.id.home) {
+      onBackPressed();
+      return true;
+    }
+    return super.onOptionsItemSelected(item);
+  }
+}
diff --git a/java/com/android/dialer/rtt/RttTranscriptAdapter.java b/java/com/android/dialer/rtt/RttTranscriptAdapter.java
new file mode 100644
index 0000000..52f9d84
--- /dev/null
+++ b/java/com/android/dialer/rtt/RttTranscriptAdapter.java
@@ -0,0 +1,112 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.dialer.rtt;
+
+import android.content.Context;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import com.android.dialer.common.LogUtil;
+import com.android.dialer.glidephotomanager.PhotoInfo;
+
+/** Adapter class for holding RTT chat data. */
+public class RttTranscriptAdapter extends RecyclerView.Adapter<RttTranscriptMessageViewHolder> {
+
+  private PhotoInfo photoInfo;
+
+  private final Context context;
+  private RttTranscript rttTranscript;
+  private int firstPositionToShowTimestamp;
+
+  RttTranscriptAdapter(Context context) {
+    this.context = context;
+  }
+
+  @Override
+  public RttTranscriptMessageViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+    LayoutInflater layoutInflater = LayoutInflater.from(context);
+    View view = layoutInflater.inflate(R.layout.rtt_transcript_list_item, parent, false);
+    return new RttTranscriptMessageViewHolder(view);
+  }
+
+  @Override
+  public int getItemViewType(int position) {
+    return super.getItemViewType(position);
+  }
+
+  @Override
+  public void onBindViewHolder(RttTranscriptMessageViewHolder rttChatMessageViewHolder, int i) {
+    boolean isSameGroup = false;
+    boolean hasMoreInSameGroup = false;
+    RttTranscriptMessage rttTranscriptMessage = rttTranscript.getMessages(i);
+    if (i > 0) {
+      isSameGroup =
+          rttTranscriptMessage.getIsRemote() == rttTranscript.getMessages(i - 1).getIsRemote();
+    }
+    if (i + 1 < getItemCount()) {
+      hasMoreInSameGroup =
+          rttTranscriptMessage.getIsRemote() == rttTranscript.getMessages(i + 1).getIsRemote();
+    }
+    rttChatMessageViewHolder.setMessage(rttTranscriptMessage, isSameGroup, photoInfo);
+    if (hasMoreInSameGroup) {
+      rttChatMessageViewHolder.hideTimestamp();
+    } else {
+      rttChatMessageViewHolder.showTimestamp(
+          rttTranscriptMessage.getTimestamp(),
+          rttTranscriptMessage.getIsRemote(),
+          i == firstPositionToShowTimestamp);
+    }
+  }
+
+  @Override
+  public int getItemCount() {
+    if (rttTranscript == null) {
+      return 0;
+    }
+    return rttTranscript.getMessagesCount();
+  }
+
+  void setRttTranscript(RttTranscript rttTranscript) {
+    if (rttTranscript == null) {
+      LogUtil.w("RttTranscriptAdapter.setRttTranscript", "null RttTranscript");
+      return;
+    }
+    this.rttTranscript = rttTranscript;
+    firstPositionToShowTimestamp = findFirstPositionToShowTimestamp(rttTranscript);
+
+    notifyDataSetChanged();
+  }
+
+  /**
+   * Returns first position of message that should show time stamp. This is usually the last one of
+   * first grouped messages.
+   */
+  protected static int findFirstPositionToShowTimestamp(RttTranscript rttTranscript) {
+    int i = 0;
+    while (i + 1 < rttTranscript.getMessagesCount()
+        && rttTranscript.getMessages(i).getIsRemote()
+            == rttTranscript.getMessages(i + 1).getIsRemote()) {
+      i++;
+    }
+    return i;
+  }
+
+  void setPhotoInfo(PhotoInfo photoInfo) {
+    this.photoInfo = photoInfo;
+  }
+}
diff --git a/java/com/android/dialer/rtt/RttTranscriptContract.java b/java/com/android/dialer/rtt/RttTranscriptContract.java
new file mode 100644
index 0000000..ddc9c53
--- /dev/null
+++ b/java/com/android/dialer/rtt/RttTranscriptContract.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.dialer.rtt;
+
+/** Contract for the RTT transcript database. */
+public final class RttTranscriptContract {
+
+  /** Columns for RTT transcript. */
+  static final class RttTranscriptColumn {
+
+    /**
+     * Unique key that should match {@link android.provider.CallLog.Calls#DATE} of the data row it
+     * is associated with.
+     *
+     * <p>TYPE: TEXT
+     */
+    static final String TRANSCRIPT_ID = "rtt_transcript_id";
+
+    /**
+     * Transcript data, encoded as {@link RttTranscript} proto.
+     *
+     * <p>TYPE: BLOB
+     */
+    static final String TRANSCRIPT_DATA = "transcript_data";
+  }
+}
diff --git a/java/com/android/dialer/rtt/RttTranscriptDatabaseHelper.java b/java/com/android/dialer/rtt/RttTranscriptDatabaseHelper.java
new file mode 100644
index 0000000..934eedb
--- /dev/null
+++ b/java/com/android/dialer/rtt/RttTranscriptDatabaseHelper.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.dialer.rtt;
+
+import android.content.Context;
+import android.database.sqlite.SQLiteDatabase;
+import android.database.sqlite.SQLiteOpenHelper;
+import android.os.SystemClock;
+import com.android.dialer.common.LogUtil;
+import com.android.dialer.rtt.RttTranscriptContract.RttTranscriptColumn;
+
+/** Database helper class for RTT transcript. */
+final class RttTranscriptDatabaseHelper extends SQLiteOpenHelper {
+
+  static final String TABLE = "rtt_transcript";
+
+  private static final String CREATE_TABLE_SQL =
+      "create table if not exists "
+          + TABLE
+          + " ("
+          + (RttTranscriptColumn.TRANSCRIPT_ID + " integer primary key, ")
+          + (RttTranscriptColumn.TRANSCRIPT_DATA + " blob not null")
+          + ");";
+
+  RttTranscriptDatabaseHelper(Context context) {
+    super(context, "rtt_transcript.db", null, 1);
+  }
+
+  @Override
+  public void onCreate(SQLiteDatabase db) {
+    LogUtil.enterBlock("RttTranscriptDatabaseHelper.onCreate");
+    long startTime = SystemClock.elapsedRealtime();
+    db.execSQL(CREATE_TABLE_SQL);
+    LogUtil.i(
+        "RttTranscriptDatabaseHelper.onCreate",
+        "took: %dms",
+        SystemClock.elapsedRealtime() - startTime);
+  }
+
+  @Override
+  public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {}
+}
diff --git a/java/com/android/dialer/rtt/RttTranscriptMessageViewHolder.java b/java/com/android/dialer/rtt/RttTranscriptMessageViewHolder.java
new file mode 100644
index 0000000..daa8136
--- /dev/null
+++ b/java/com/android/dialer/rtt/RttTranscriptMessageViewHolder.java
@@ -0,0 +1,95 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.dialer.rtt;
+
+import android.content.Context;
+import android.content.res.Resources;
+import android.support.v7.widget.RecyclerView.ViewHolder;
+import android.text.format.DateUtils;
+import android.view.Gravity;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.LinearLayout.LayoutParams;
+import android.widget.TextView;
+import com.android.dialer.glidephotomanager.GlidePhotoManagerComponent;
+import com.android.dialer.glidephotomanager.PhotoInfo;
+
+/** ViewHolder class for RTT chat message bubble. */
+public class RttTranscriptMessageViewHolder extends ViewHolder {
+
+  private final TextView messageTextView;
+  private final Resources resources;
+  private final ImageView avatarImageView;
+  private final View container;
+  private final TextView timestampTextView;
+
+  RttTranscriptMessageViewHolder(View view) {
+    super(view);
+    container = view.findViewById(R.id.rtt_chat_message_container);
+    messageTextView = view.findViewById(R.id.rtt_chat_message);
+    avatarImageView = view.findViewById(R.id.rtt_chat_avatar);
+    timestampTextView = view.findViewById(R.id.rtt_chat_timestamp);
+    resources = view.getResources();
+  }
+
+  void setMessage(RttTranscriptMessage message, boolean isSameGroup, PhotoInfo photoInfo) {
+    messageTextView.setText(message.getContent());
+    LinearLayout.LayoutParams params = (LayoutParams) container.getLayoutParams();
+    params.gravity = message.getIsRemote() ? Gravity.START : Gravity.END;
+    params.topMargin =
+        isSameGroup
+            ? resources.getDimensionPixelSize(R.dimen.rtt_transcript_same_group_message_margin_top)
+            : resources.getDimensionPixelSize(R.dimen.rtt_transcript_message_margin_top);
+    container.setLayoutParams(params);
+    messageTextView.setEnabled(message.getIsRemote());
+    if (message.getIsRemote()) {
+      if (isSameGroup) {
+        avatarImageView.setVisibility(View.INVISIBLE);
+      } else {
+        avatarImageView.setVisibility(View.VISIBLE);
+        GlidePhotoManagerComponent.get(container.getContext())
+            .glidePhotoManager()
+            .loadContactPhoto(avatarImageView, photoInfo);
+      }
+      messageTextView.setTextAppearance(R.style.RttTranscriptBubble_Remote);
+    } else {
+      avatarImageView.setVisibility(View.GONE);
+      messageTextView.setTextAppearance(R.style.RttTranscriptBubble_Local);
+    }
+  }
+
+  void showTimestamp(long timestamp, boolean isRemote, boolean showFullDate) {
+    timestampTextView.setVisibility(View.VISIBLE);
+    timestampTextView.setText(
+        getTimestampText(timestampTextView.getContext(), timestamp, showFullDate));
+    timestampTextView.setGravity(isRemote ? Gravity.START : Gravity.END);
+  }
+
+  void hideTimestamp() {
+    timestampTextView.setVisibility(View.GONE);
+  }
+
+  private String getTimestampText(Context context, long timestamp, boolean showFullDate) {
+    return DateUtils.formatDateTime(
+        context,
+        timestamp,
+        showFullDate
+            ? DateUtils.FORMAT_SHOW_DATE | DateUtils.FORMAT_SHOW_TIME
+            : DateUtils.FORMAT_SHOW_TIME);
+  }
+}
diff --git a/java/com/android/dialer/rtt/RttTranscriptUtil.java b/java/com/android/dialer/rtt/RttTranscriptUtil.java
new file mode 100644
index 0000000..967a123
--- /dev/null
+++ b/java/com/android/dialer/rtt/RttTranscriptUtil.java
@@ -0,0 +1,133 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.dialer.rtt;
+
+import android.content.ContentValues;
+import android.content.Context;
+import android.database.Cursor;
+import android.support.annotation.WorkerThread;
+import com.android.dialer.common.Assert;
+import com.android.dialer.common.concurrent.DialerExecutorComponent;
+import com.android.dialer.common.database.Selection;
+import com.android.dialer.rtt.RttTranscriptContract.RttTranscriptColumn;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.util.concurrent.ListenableFuture;
+import com.google.protobuf.InvalidProtocolBufferException;
+
+/** Util class to save and load RTT transcript. */
+public final class RttTranscriptUtil {
+
+  public static ListenableFuture<ImmutableSet<String>> getAvailableRttTranscriptIds(
+      Context context, ImmutableSet<String> transcriptIds) {
+    return DialerExecutorComponent.get(context)
+        .backgroundExecutor()
+        .submit(() -> checkRttTranscriptAvailability(context, transcriptIds));
+  }
+
+  @WorkerThread
+  private static ImmutableSet<String> checkRttTranscriptAvailability(
+      Context context, ImmutableSet<String> transcriptIds) {
+    Assert.isWorkerThread();
+    RttTranscriptDatabaseHelper databaseHelper = new RttTranscriptDatabaseHelper(context);
+    ImmutableSet.Builder<String> builder = ImmutableSet.builder();
+    Selection selection =
+        Selection.builder()
+            .and(Selection.column(RttTranscriptColumn.TRANSCRIPT_ID).in(transcriptIds))
+            .build();
+
+    try (Cursor cursor =
+        databaseHelper
+            .getReadableDatabase()
+            .query(
+                RttTranscriptDatabaseHelper.TABLE,
+                new String[] {RttTranscriptColumn.TRANSCRIPT_ID},
+                selection.getSelection(),
+                selection.getSelectionArgs(),
+                null,
+                null,
+                null)) {
+      if (cursor != null) {
+        while (cursor.moveToNext()) {
+          builder.add(cursor.getString(0));
+        }
+      }
+    }
+    databaseHelper.close();
+    return builder.build();
+  }
+
+  static ListenableFuture<RttTranscript> loadRttTranscript(Context context, String transcriptId) {
+    return DialerExecutorComponent.get(context)
+        .lightweightExecutor()
+        .submit(() -> getRttTranscript(context, transcriptId));
+  }
+
+  @WorkerThread
+  private static RttTranscript getRttTranscript(Context context, String transcriptId) {
+    Assert.isWorkerThread();
+    RttTranscriptDatabaseHelper databaseHelper = new RttTranscriptDatabaseHelper(context);
+    try (Cursor cursor =
+        databaseHelper
+            .getReadableDatabase()
+            .query(
+                RttTranscriptDatabaseHelper.TABLE,
+                new String[] {RttTranscriptColumn.TRANSCRIPT_DATA},
+                RttTranscriptColumn.TRANSCRIPT_ID + " = ?",
+                new String[] {transcriptId},
+                null,
+                null,
+                null)) {
+      if (cursor != null && cursor.moveToFirst()) {
+        try {
+          return RttTranscript.parseFrom(cursor.getBlob(0));
+        } catch (InvalidProtocolBufferException e) {
+          throw new RuntimeException("Parse failed for RTT transcript", e);
+        }
+      } else {
+        return null;
+      }
+    } finally {
+      databaseHelper.close();
+    }
+  }
+
+  public static ListenableFuture<Void> saveRttTranscript(
+      Context context, RttTranscript rttTranscript) {
+    return DialerExecutorComponent.get(context)
+        .backgroundExecutor()
+        .submit(
+            () -> {
+              save(context, rttTranscript);
+              return null;
+            });
+  }
+
+  @WorkerThread
+  private static void save(Context context, RttTranscript rttTranscript) {
+    Assert.isWorkerThread();
+    RttTranscriptDatabaseHelper databaseHelper = new RttTranscriptDatabaseHelper(context);
+    ContentValues value = new ContentValues();
+    value.put(RttTranscriptColumn.TRANSCRIPT_ID, rttTranscript.getId());
+    value.put(RttTranscriptColumn.TRANSCRIPT_DATA, rttTranscript.toByteArray());
+    long id =
+        databaseHelper.getWritableDatabase().insert(RttTranscriptDatabaseHelper.TABLE, null, value);
+    databaseHelper.close();
+    if (id < 0) {
+      throw new RuntimeException("Failed to save RTT transcript");
+    }
+  }
+}
diff --git a/java/com/android/dialer/rtt/res/color/bubble_background.xml b/java/com/android/dialer/rtt/res/color/bubble_background.xml
new file mode 100644
index 0000000..9a08401
--- /dev/null
+++ b/java/com/android/dialer/rtt/res/color/bubble_background.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2018 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+  <item android:state_enabled="false"
+      android:color="?android:attr/colorBackgroundFloating" />
+  <item android:color="@color/rtt_transcript_primary_color" />
+</selector>
\ No newline at end of file
diff --git a/java/com/android/dialer/rtt/res/drawable/message_bubble.xml b/java/com/android/dialer/rtt/res/drawable/message_bubble.xml
new file mode 100644
index 0000000..31044b6
--- /dev/null
+++ b/java/com/android/dialer/rtt/res/drawable/message_bubble.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2018 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+  <solid android:color="?android:attr/colorBackgroundFloating"/>
+  <corners android:radius="20dp"/>
+</shape>
\ No newline at end of file
diff --git a/java/com/android/dialer/rtt/res/layout/activity_rtt_transcript.xml b/java/com/android/dialer/rtt/res/layout/activity_rtt_transcript.xml
new file mode 100644
index 0000000..772fde1
--- /dev/null
+++ b/java/com/android/dialer/rtt/res/layout/activity_rtt_transcript.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2018 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/rtt_transcript_background_color"
+    android:orientation="vertical">
+
+  <com.android.dialer.widget.DialerToolbar
+      android:id="@+id/toolbar"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"/>
+
+  <android.support.v7.widget.RecyclerView
+      android:id="@+id/rtt_recycler_view"
+      android:layout_width="match_parent"
+      android:layout_height="match_parent"
+      android:paddingTop="16dp"
+      android:paddingBottom="16dp"
+      android:clipToPadding="false"/>
+
+</LinearLayout>
diff --git a/java/com/android/dialer/rtt/res/layout/rtt_transcript_list_item.xml b/java/com/android/dialer/rtt/res/layout/rtt_transcript_list_item.xml
new file mode 100644
index 0000000..d86a682
--- /dev/null
+++ b/java/com/android/dialer/rtt/res/layout/rtt_transcript_list_item.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2018 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginEnd="8dp"
+    android:orientation="vertical">
+  <LinearLayout
+      android:id="@+id/rtt_chat_message_container"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:orientation="horizontal">
+    <ImageView
+        android:id="@+id/rtt_chat_avatar"
+        android:layout_width="@dimen/rtt_transcript_avatar_size"
+        android:layout_height="@dimen/rtt_transcript_avatar_size"
+        android:layout_marginStart="8dp"
+        android:layout_marginEnd="8dp"
+        android:visibility="gone"/>
+    <TextView
+        android:id="@+id/rtt_chat_message"
+        style="@style/RttTranscriptBubble"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:paddingTop="9dp"
+        android:paddingBottom="9dp"
+        android:paddingStart="12dp"
+        android:paddingEnd="12dp"
+        android:background="@drawable/message_bubble"
+        android:backgroundTint="@color/bubble_background"
+        android:maxWidth="292dp"/>
+  </LinearLayout>
+  <TextView
+      android:id="@+id/rtt_chat_timestamp"
+      style="@style/RttTranscriptBubble.Timestamp"
+      android:paddingStart="64dp"
+      android:paddingEnd="8dp"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"/>
+</LinearLayout>
\ No newline at end of file
diff --git a/java/com/android/dialer/rtt/res/values/colors.xml b/java/com/android/dialer/rtt/res/values/colors.xml
new file mode 100644
index 0000000..3b27a57
--- /dev/null
+++ b/java/com/android/dialer/rtt/res/values/colors.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2018 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+<resources>
+  <color name="rtt_transcript_primary_color">#37474F</color>
+  <color name="rtt_transcript_primary_color_dark">#263238</color>
+  <color name="rtt_transcript_background_color">#ECEFF1</color>
+</resources>
\ No newline at end of file
diff --git a/java/com/android/dialer/rtt/res/values/dimens.xml b/java/com/android/dialer/rtt/res/values/dimens.xml
new file mode 100644
index 0000000..a36cdd7
--- /dev/null
+++ b/java/com/android/dialer/rtt/res/values/dimens.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2018 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+<resources>
+  <dimen name="rtt_transcript_message_margin_top">16dp</dimen>
+  <dimen name="rtt_transcript_same_group_message_margin_top">2dp</dimen>
+  <dimen name="rtt_transcript_avatar_size">40dp</dimen>
+</resources>
diff --git a/java/com/android/dialer/rtt/res/values/styles.xml b/java/com/android/dialer/rtt/res/values/styles.xml
new file mode 100644
index 0000000..d8bc245
--- /dev/null
+++ b/java/com/android/dialer/rtt/res/values/styles.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2018 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+<resources>
+  <style name="RttTranscriptBubble">
+    <item name="android:fontFamily">sans-serif</item>
+    <item name="android:textColor">#DD000000</item>
+    <item name="android:textSize">16sp</item>
+  </style>
+
+  <style name="RttTranscriptBubble.Remote">
+    <item name="android:textColor">#FFFFFF</item>
+  </style>
+
+  <style name="RttTranscriptBubble.Local">
+    <item name="android:textColor">#DD000000</item>
+  </style>
+
+  <style name="RttTranscriptBubble.Timestamp">
+    <item name="android:textColor">#757575</item>
+    <item name="android:textSize">12sp</item>
+  </style>
+</resources>
\ No newline at end of file
diff --git a/java/com/android/dialer/rtt/rtt_transcript.proto b/java/com/android/dialer/rtt/rtt_transcript.proto
new file mode 100644
index 0000000..a580b0d
--- /dev/null
+++ b/java/com/android/dialer/rtt/rtt_transcript.proto
@@ -0,0 +1,30 @@
+syntax = "proto2";
+
+option java_package = "com.android.dialer.rtt";
+option java_multiple_files = true;
+option optimize_for = LITE_RUNTIME;
+
+
+package com.android.dialer.rtt;
+
+// RTT transcript which contains chat history of a RTT call.
+message RttTranscript {
+  // Unique ID used for database.
+  optional string id = 1;
+  // Phone number of RTT call.
+  optional string number = 2;
+  // Timestamp when the RTT call is created.
+  optional int64 timestamp = 3;
+  // Chat messages.
+  repeated RttTranscriptMessage messages = 4;
+}
+
+// Single chat message inside a RTT call.
+message RttTranscriptMessage {
+  optional string content = 1;
+  optional int64 timestamp = 2;
+  // Whether this message is sent from local device or received from remote
+  // party.
+  optional bool is_remote = 3;
+  optional bool is_finished = 4;
+}
\ No newline at end of file
diff --git a/java/com/android/dialer/searchfragment/common/res/layout/search_contact_row.xml b/java/com/android/dialer/searchfragment/common/res/layout/search_contact_row.xml
index 9be7fa0..4f8e305 100644
--- a/java/com/android/dialer/searchfragment/common/res/layout/search_contact_row.xml
+++ b/java/com/android/dialer/searchfragment/common/res/layout/search_contact_row.xml
@@ -39,21 +39,21 @@
       android:layout_centerVertical="true"
       android:layout_marginStart="8dp">
 
-    <TextView
+    <com.android.dialer.widget.BidiTextView
         android:id="@+id/primary"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:gravity="center_vertical|start"
         android:fontFamily="sans-serif"
-        style="@style/PrimaryText"/>
+        style="@style/Dialer.TextAppearance.Primary"/>
 
-    <TextView
+    <com.android.dialer.widget.BidiTextView
         android:id="@+id/secondary"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:gravity="center_vertical|start"
         android:fontFamily="sans-serif"
-        style="@style/SecondaryText"/>
+        style="@style/Dialer.TextAppearance.Secondary"/>
   </LinearLayout>
 
   <ImageView
@@ -62,7 +62,7 @@
       android:layout_height="@dimen/search_row_height"
       android:layout_alignParentEnd="true"
       android:padding="@dimen/call_to_action_padding"
-      android:tint="@color/dialer_secondary_text_color"
+      android:tint="?colorIcon"
       android:visibility="gone"
       android:scaleType="center"/>
 
@@ -74,6 +74,7 @@
       android:layout_centerVertical="true"
       android:padding="@dimen/call_to_action_padding"
       android:src="@drawable/ic_work_profile"
+      android:tint="?colorIcon"
       android:scaleType="centerInside"
       android:visibility="gone"/>
 </RelativeLayout>
\ No newline at end of file
diff --git a/java/com/android/dialer/searchfragment/cp2/SearchContactViewHolder.java b/java/com/android/dialer/searchfragment/cp2/SearchContactViewHolder.java
index e36df4b..11f5218 100644
--- a/java/com/android/dialer/searchfragment/cp2/SearchContactViewHolder.java
+++ b/java/com/android/dialer/searchfragment/cp2/SearchContactViewHolder.java
@@ -30,7 +30,6 @@
 import android.view.View.OnClickListener;
 import android.widget.ImageView;
 import android.widget.QuickContactBadge;
-import android.widget.TextView;
 import com.android.dialer.common.Assert;
 import com.android.dialer.contactphoto.ContactPhotoManager;
 import com.android.dialer.dialercontact.DialerContact;
@@ -44,6 +43,7 @@
 import com.android.dialer.searchfragment.common.R;
 import com.android.dialer.searchfragment.common.RowClickListener;
 import com.android.dialer.searchfragment.common.SearchCursor;
+import com.android.dialer.widget.BidiTextView;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
@@ -67,8 +67,8 @@
 
   private final RowClickListener listener;
   private final QuickContactBadge photo;
-  private final TextView nameOrNumberView;
-  private final TextView numberView;
+  private final BidiTextView nameOrNumberView;
+  private final BidiTextView numberView;
   private final ImageView callToActionView;
   private final Context context;
 
@@ -102,7 +102,9 @@
         TextUtils.isEmpty(label)
             ? number
             : context.getString(
-                com.android.contacts.common.R.string.call_subject_type_and_number, label, number);
+                com.android.dialer.contacts.resources.R.string.call_subject_type_and_number,
+                label,
+                number);
 
     nameOrNumberView.setText(QueryBoldingUtil.getNameWithQueryBolded(query, name, context));
     numberView.setText(QueryBoldingUtil.getNumberWithQueryBolded(query, secondaryInfo));
@@ -170,7 +172,7 @@
       case CallToAction.SHARE_AND_CALL:
         callToActionView.setVisibility(View.VISIBLE);
         callToActionView.setImageDrawable(
-            context.getDrawable(com.android.contacts.common.R.drawable.ic_phone_attach));
+            context.getDrawable(com.android.dialer.contacts.resources.R.drawable.ic_phone_attach));
         callToActionView.setContentDescription(
             context.getString(R.string.description_search_call_and_share));
         callToActionView.setOnClickListener(this);
@@ -179,7 +181,7 @@
       case CallToAction.VIDEO_CALL:
         callToActionView.setVisibility(View.VISIBLE);
         callToActionView.setImageDrawable(
-            context.getDrawable(R.drawable.quantum_ic_videocam_white_24));
+            context.getDrawable(R.drawable.quantum_ic_videocam_vd_white_24));
         callToActionView.setContentDescription(
             context.getString(R.string.description_search_video_call));
         callToActionView.setOnClickListener(this);
diff --git a/java/com/android/dialer/searchfragment/cp2/SearchContactsCursorLoader.java b/java/com/android/dialer/searchfragment/cp2/SearchContactsCursorLoader.java
index 7caa314..f4ed21e 100644
--- a/java/com/android/dialer/searchfragment/cp2/SearchContactsCursorLoader.java
+++ b/java/com/android/dialer/searchfragment/cp2/SearchContactsCursorLoader.java
@@ -27,8 +27,10 @@
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.text.TextUtils;
-import com.android.contacts.common.preference.ContactsPreferences;
 import com.android.dialer.common.LogUtil;
+import com.android.dialer.contacts.ContactsComponent;
+import com.android.dialer.contacts.displaypreference.ContactDisplayPreferences.DisplayOrder;
+import com.android.dialer.contacts.displaypreference.ContactDisplayPreferences.SortOrder;
 import com.android.dialer.searchfragment.common.Projections;
 import com.android.dialer.searchfragment.common.SearchCursor;
 import com.android.dialer.smartdial.SmartDialCursorLoader;
@@ -55,9 +57,9 @@
   }
 
   private static String[] getProjection(Context context) {
-    ContactsPreferences contactsPrefs = new ContactsPreferences(context);
     boolean displayOrderPrimary =
-        (contactsPrefs.getDisplayOrder() == ContactsPreferences.DISPLAY_ORDER_PRIMARY);
+        (ContactsComponent.get(context).contactDisplayPreferences().getDisplayOrder()
+            == DisplayOrder.PRIMARY);
     return displayOrderPrimary
         ? Projections.CP2_PROJECTION
         : Projections.CP2_PROJECTION_ALTERNATIVE;
@@ -70,9 +72,9 @@
   }
 
   private static String getSortKey(Context context) {
-    ContactsPreferences contactsPrefs = new ContactsPreferences(context);
     boolean sortOrderPrimary =
-        (contactsPrefs.getSortOrder() == ContactsPreferences.SORT_ORDER_PRIMARY);
+        (ContactsComponent.get(context).contactDisplayPreferences().getSortOrder()
+            == SortOrder.BY_PRIMARY);
     return sortOrderPrimary ? Phone.SORT_KEY_PRIMARY : Phone.SORT_KEY_ALTERNATIVE;
   }
 
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-af/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-af/strings.xml
index 10a86a4..3079a33 100644
--- a/java/com/android/dialer/searchfragment/cp2/res/values-af/strings.xml
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-af/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="all_contacts" msgid="2155583160607462513">"Alle kontakte"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="all_contacts">Alle kontakte</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-am/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-am/strings.xml
index 4d530eb..ba8b937 100644
--- a/java/com/android/dialer/searchfragment/cp2/res/values-am/strings.xml
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-am/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="all_contacts" msgid="2155583160607462513">"ሁሉም እውቂያዎች"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="all_contacts">ሁሉም እውቂያዎች</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-ar/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-ar/strings.xml
index 5f0084b..c356710 100644
--- a/java/com/android/dialer/searchfragment/cp2/res/values-ar/strings.xml
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-ar/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="all_contacts" msgid="2155583160607462513">"جميع جهات الاتصال"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="all_contacts">جميع جهات الاتصال</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-az/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-az/strings.xml
index f28fd5f..027ebd6 100644
--- a/java/com/android/dialer/searchfragment/cp2/res/values-az/strings.xml
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-az/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="all_contacts" msgid="2155583160607462513">"Bütün kontaktlar"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="all_contacts">Bütün kontaktlar</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-b+sr+Latn/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-b+sr+Latn/strings.xml
index aaf2a2a..e9772f2 100644
--- a/java/com/android/dialer/searchfragment/cp2/res/values-b+sr+Latn/strings.xml
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-b+sr+Latn/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="all_contacts" msgid="2155583160607462513">"Svi kontakti"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="all_contacts">Svi kontakti</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-be/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-be/strings.xml
index d67743d..b864636 100644
--- a/java/com/android/dialer/searchfragment/cp2/res/values-be/strings.xml
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-be/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="all_contacts" msgid="2155583160607462513">"Усе кантакты"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="all_contacts">Усе кантакты</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-bg/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-bg/strings.xml
index 2004db8..4c833fe 100644
--- a/java/com/android/dialer/searchfragment/cp2/res/values-bg/strings.xml
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-bg/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="all_contacts" msgid="2155583160607462513">"Всички контакти"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="all_contacts">Всички контакти</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-bn/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-bn/strings.xml
index 8a78098..d081308 100644
--- a/java/com/android/dialer/searchfragment/cp2/res/values-bn/strings.xml
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-bn/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="all_contacts" msgid="2155583160607462513">"সমস্ত পরিচিতি"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="all_contacts">সমস্ত পরিচিতি</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-bs/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-bs/strings.xml
index aaf2a2a..e9772f2 100644
--- a/java/com/android/dialer/searchfragment/cp2/res/values-bs/strings.xml
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-bs/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="all_contacts" msgid="2155583160607462513">"Svi kontakti"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="all_contacts">Svi kontakti</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-ca/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-ca/strings.xml
index b3cf9b3..44a33c4 100644
--- a/java/com/android/dialer/searchfragment/cp2/res/values-ca/strings.xml
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-ca/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="all_contacts" msgid="2155583160607462513">"Tots els contactes"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="all_contacts">Tots els contactes</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-cs/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-cs/strings.xml
index 0544dc2..9d4d9d1 100644
--- a/java/com/android/dialer/searchfragment/cp2/res/values-cs/strings.xml
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-cs/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="all_contacts" msgid="2155583160607462513">"Všechny kontakty"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="all_contacts">Všechny kontakty</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-da/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-da/strings.xml
index 2295070..5a23f6e 100644
--- a/java/com/android/dialer/searchfragment/cp2/res/values-da/strings.xml
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-da/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="all_contacts" msgid="2155583160607462513">"Alle kontaktpersoner"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="all_contacts">Alle kontaktpersoner</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-de/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-de/strings.xml
index 5f9d38b..22e0370 100644
--- a/java/com/android/dialer/searchfragment/cp2/res/values-de/strings.xml
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-de/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="all_contacts" msgid="2155583160607462513">"Alle Kontakte"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="all_contacts">Alle Kontakte</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-el/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-el/strings.xml
index a1ea818..bb9449f 100644
--- a/java/com/android/dialer/searchfragment/cp2/res/values-el/strings.xml
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-el/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="all_contacts" msgid="2155583160607462513">"Όλες οι επαφές"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="all_contacts">Όλες οι επαφές</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-en-rAU/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-en-rAU/strings.xml
index 51d8367..1d5d345 100644
--- a/java/com/android/dialer/searchfragment/cp2/res/values-en-rAU/strings.xml
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-en-rAU/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="all_contacts" msgid="2155583160607462513">"All contacts"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="all_contacts">All contacts</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-en-rGB/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-en-rGB/strings.xml
index 51d8367..1d5d345 100644
--- a/java/com/android/dialer/searchfragment/cp2/res/values-en-rGB/strings.xml
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-en-rGB/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="all_contacts" msgid="2155583160607462513">"All contacts"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="all_contacts">All contacts</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-en-rIN/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-en-rIN/strings.xml
index 51d8367..1d5d345 100644
--- a/java/com/android/dialer/searchfragment/cp2/res/values-en-rIN/strings.xml
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-en-rIN/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="all_contacts" msgid="2155583160607462513">"All contacts"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="all_contacts">All contacts</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-es-rUS/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-es-rUS/strings.xml
index 8790597..f4e4b78 100644
--- a/java/com/android/dialer/searchfragment/cp2/res/values-es-rUS/strings.xml
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-es-rUS/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="all_contacts" msgid="2155583160607462513">"Todos los contactos"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="all_contacts">Todos los contactos</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-es/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-es/strings.xml
index 8790597..f4e4b78 100644
--- a/java/com/android/dialer/searchfragment/cp2/res/values-es/strings.xml
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-es/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="all_contacts" msgid="2155583160607462513">"Todos los contactos"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="all_contacts">Todos los contactos</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-et/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-et/strings.xml
index d8ea3b2..f52d3ab 100644
--- a/java/com/android/dialer/searchfragment/cp2/res/values-et/strings.xml
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-et/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="all_contacts" msgid="2155583160607462513">"Kõik kontaktid"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="all_contacts">Kõik kontaktid</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-eu/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-eu/strings.xml
index bdea9a9..d044c9d 100644
--- a/java/com/android/dialer/searchfragment/cp2/res/values-eu/strings.xml
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-eu/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="all_contacts" msgid="2155583160607462513">"Kontaktu guztiak"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="all_contacts">Kontaktu guztiak</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-fa/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-fa/strings.xml
index 6d23a54..f9428f2 100644
--- a/java/com/android/dialer/searchfragment/cp2/res/values-fa/strings.xml
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-fa/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="all_contacts" msgid="2155583160607462513">"همه مخاطبین"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="all_contacts">همه مخاطبین</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-fi/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-fi/strings.xml
index 957fc79..d6281c0 100644
--- a/java/com/android/dialer/searchfragment/cp2/res/values-fi/strings.xml
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-fi/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="all_contacts" msgid="2155583160607462513">"Kaikki yhteystiedot"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="all_contacts">Kaikki yhteystiedot</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-fr-rCA/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-fr-rCA/strings.xml
index c6bf954..2163eea 100644
--- a/java/com/android/dialer/searchfragment/cp2/res/values-fr-rCA/strings.xml
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-fr-rCA/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="all_contacts" msgid="2155583160607462513">"Tous les contacts"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="all_contacts">Tous les contacts</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-fr/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-fr/strings.xml
index c6bf954..2163eea 100644
--- a/java/com/android/dialer/searchfragment/cp2/res/values-fr/strings.xml
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-fr/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="all_contacts" msgid="2155583160607462513">"Tous les contacts"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="all_contacts">Tous les contacts</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-gl/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-gl/strings.xml
index e69e199..623b5dc 100644
--- a/java/com/android/dialer/searchfragment/cp2/res/values-gl/strings.xml
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-gl/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="all_contacts" msgid="2155583160607462513">"Todos os contactos"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="all_contacts">Todos os contactos</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-gu/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-gu/strings.xml
index 9adc2bc..2da1c01 100644
--- a/java/com/android/dialer/searchfragment/cp2/res/values-gu/strings.xml
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-gu/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="all_contacts" msgid="2155583160607462513">"બધા સંપર્કો"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="all_contacts">બધા સંપર્કો</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-hi/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-hi/strings.xml
index 1eb07a7..8a60a0e 100644
--- a/java/com/android/dialer/searchfragment/cp2/res/values-hi/strings.xml
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-hi/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="all_contacts" msgid="2155583160607462513">"सभी संपर्क"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="all_contacts">सभी संपर्क</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-hr/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-hr/strings.xml
index aaf2a2a..e9772f2 100644
--- a/java/com/android/dialer/searchfragment/cp2/res/values-hr/strings.xml
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-hr/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="all_contacts" msgid="2155583160607462513">"Svi kontakti"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="all_contacts">Svi kontakti</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-hu/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-hu/strings.xml
index 34c206c..2c23af9 100644
--- a/java/com/android/dialer/searchfragment/cp2/res/values-hu/strings.xml
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-hu/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="all_contacts" msgid="2155583160607462513">"Összes névjegy"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="all_contacts">Összes névjegy</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-hy/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-hy/strings.xml
index 350662f..a406102 100644
--- a/java/com/android/dialer/searchfragment/cp2/res/values-hy/strings.xml
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-hy/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="all_contacts" msgid="2155583160607462513">"Բոլոր կոնտակտները"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="all_contacts">Բոլոր կոնտակտները</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-in/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-in/strings.xml
index 753dd3d..f2b1f76 100644
--- a/java/com/android/dialer/searchfragment/cp2/res/values-in/strings.xml
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-in/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="all_contacts" msgid="2155583160607462513">"Semua kontak"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="all_contacts">Semua kontak</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-is/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-is/strings.xml
index aba498d..740a373 100644
--- a/java/com/android/dialer/searchfragment/cp2/res/values-is/strings.xml
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-is/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="all_contacts" msgid="2155583160607462513">"Allir tengiliðir"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="all_contacts">Allir tengiliðir</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-it/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-it/strings.xml
index b523cb6..3434398 100644
--- a/java/com/android/dialer/searchfragment/cp2/res/values-it/strings.xml
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-it/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="all_contacts" msgid="2155583160607462513">"Tutti i contatti"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="all_contacts">Tutti i contatti</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-iw/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-iw/strings.xml
index d71c523..8fdbb69 100644
--- a/java/com/android/dialer/searchfragment/cp2/res/values-iw/strings.xml
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-iw/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="all_contacts" msgid="2155583160607462513">"כל אנשי הקשר"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="all_contacts">כל אנשי הקשר</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-ja/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-ja/strings.xml
index 5a36ea1..5f83286 100644
--- a/java/com/android/dialer/searchfragment/cp2/res/values-ja/strings.xml
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-ja/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="all_contacts" msgid="2155583160607462513">"すべての連絡先"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="all_contacts">すべての連絡先</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-ka/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-ka/strings.xml
index 11a1d70..1748ff8 100644
--- a/java/com/android/dialer/searchfragment/cp2/res/values-ka/strings.xml
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-ka/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="all_contacts" msgid="2155583160607462513">"ყველა კონტაქტი"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="all_contacts">ყველა კონტაქტი</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-kk/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-kk/strings.xml
index 7eeb039..363bac3 100644
--- a/java/com/android/dialer/searchfragment/cp2/res/values-kk/strings.xml
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-kk/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="all_contacts" msgid="2155583160607462513">"Барлық контактілер"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="all_contacts">Барлық контактілер</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-km/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-km/strings.xml
index 951fc16..aef413e 100644
--- a/java/com/android/dialer/searchfragment/cp2/res/values-km/strings.xml
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-km/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="all_contacts" msgid="2155583160607462513">"ទំនាក់ទំនង​ទាំងអស់"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="all_contacts">ទំនាក់ទំនង​ទាំងអស់</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-kn/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-kn/strings.xml
index 899787d..88dae04 100644
--- a/java/com/android/dialer/searchfragment/cp2/res/values-kn/strings.xml
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-kn/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="all_contacts" msgid="2155583160607462513">"ಎಲ್ಲಾ ಸಂಪರ್ಕಗಳು"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="all_contacts">ಎಲ್ಲಾ ಸಂಪರ್ಕಗಳು</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-ko/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-ko/strings.xml
index c702564..4136bcb 100644
--- a/java/com/android/dialer/searchfragment/cp2/res/values-ko/strings.xml
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-ko/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="all_contacts" msgid="2155583160607462513">"모든 연락처"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="all_contacts">모든 연락처</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-ky/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-ky/strings.xml
index b115ab4..542fcf5 100644
--- a/java/com/android/dialer/searchfragment/cp2/res/values-ky/strings.xml
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-ky/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="all_contacts" msgid="2155583160607462513">"Бардык байланыштар"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="all_contacts">Бардык байланыштар</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-lo/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-lo/strings.xml
index 166d1e0..5f2587f 100644
--- a/java/com/android/dialer/searchfragment/cp2/res/values-lo/strings.xml
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-lo/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="all_contacts" msgid="2155583160607462513">"ລາຍຊື່ຜູ້ຕິດຕໍ່ທັງໝົດ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="all_contacts">ລາຍຊື່ຜູ້ຕິດຕໍ່ທັງໝົດ</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-lt/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-lt/strings.xml
index b3efc6b..3305ce6 100644
--- a/java/com/android/dialer/searchfragment/cp2/res/values-lt/strings.xml
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-lt/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="all_contacts" msgid="2155583160607462513">"Visi kontaktai"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="all_contacts">Visi kontaktai</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-lv/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-lv/strings.xml
index 3c7a34a..6264727 100644
--- a/java/com/android/dialer/searchfragment/cp2/res/values-lv/strings.xml
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-lv/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="all_contacts" msgid="2155583160607462513">"Visas kontaktpersonas"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="all_contacts">Visas kontaktpersonas</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-mk/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-mk/strings.xml
index 1ef92dd..5114f45 100644
--- a/java/com/android/dialer/searchfragment/cp2/res/values-mk/strings.xml
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-mk/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="all_contacts" msgid="2155583160607462513">"Сите контакти"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="all_contacts">Сите контакти</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-ml/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-ml/strings.xml
index b9daf87..1cd4145 100644
--- a/java/com/android/dialer/searchfragment/cp2/res/values-ml/strings.xml
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-ml/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="all_contacts" msgid="2155583160607462513">"എല്ലാ കോൺടാക്റ്റുകളും"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="all_contacts">എല്ലാ കോൺടാക്റ്റുകളും</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-mn/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-mn/strings.xml
index 9325de5..336716f 100644
--- a/java/com/android/dialer/searchfragment/cp2/res/values-mn/strings.xml
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-mn/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="all_contacts" msgid="2155583160607462513">"Бүх харилцагчид"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="all_contacts">Бүх харилцагчид</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-mr/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-mr/strings.xml
index 4b9d6bd..e44c02e 100644
--- a/java/com/android/dialer/searchfragment/cp2/res/values-mr/strings.xml
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-mr/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="all_contacts" msgid="2155583160607462513">"सर्व संपर्क"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="all_contacts">सर्व संपर्क</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-ms/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-ms/strings.xml
index 29cb581..d5bb227 100644
--- a/java/com/android/dialer/searchfragment/cp2/res/values-ms/strings.xml
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-ms/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="all_contacts" msgid="2155583160607462513">"Semua kenalan"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="all_contacts">Semua kenalan</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-my/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-my/strings.xml
index 31e3ec5..3c7b2bb 100644
--- a/java/com/android/dialer/searchfragment/cp2/res/values-my/strings.xml
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-my/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="all_contacts" msgid="2155583160607462513">"အဆက်အသွယ်အားလုံး"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="all_contacts">အဆက်အသွယ်အားလုံး</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-nb/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-nb/strings.xml
index 4a1e562..c6a7c76 100644
--- a/java/com/android/dialer/searchfragment/cp2/res/values-nb/strings.xml
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-nb/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="all_contacts" msgid="2155583160607462513">"Alle kontakter"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="all_contacts">Alle kontakter</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-ne/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-ne/strings.xml
index a987d0e..4a44d14 100644
--- a/java/com/android/dialer/searchfragment/cp2/res/values-ne/strings.xml
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-ne/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="all_contacts" msgid="2155583160607462513">"सबै सम्पर्कहरू"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="all_contacts">सबै सम्पर्कहरू</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-nl/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-nl/strings.xml
index b29ac65..706b355 100644
--- a/java/com/android/dialer/searchfragment/cp2/res/values-nl/strings.xml
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-nl/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="all_contacts" msgid="2155583160607462513">"Alle contacten"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="all_contacts">Alle contacten</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-no/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-no/strings.xml
index 4a1e562..c6a7c76 100644
--- a/java/com/android/dialer/searchfragment/cp2/res/values-no/strings.xml
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-no/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="all_contacts" msgid="2155583160607462513">"Alle kontakter"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="all_contacts">Alle kontakter</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-pa/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-pa/strings.xml
index 1b26c22..f370fe8 100644
--- a/java/com/android/dialer/searchfragment/cp2/res/values-pa/strings.xml
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-pa/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="all_contacts" msgid="2155583160607462513">"ਸਾਰੇ ਸੰਪਰਕ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="all_contacts">ਸਾਰੇ ਸੰਪਰਕ</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-pl/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-pl/strings.xml
index 23190de..f1d937d 100644
--- a/java/com/android/dialer/searchfragment/cp2/res/values-pl/strings.xml
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-pl/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="all_contacts" msgid="2155583160607462513">"Wszystkie kontakty"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="all_contacts">Wszystkie kontakty</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-pt-rBR/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-pt-rBR/strings.xml
index ccc0c91..cbb949c 100644
--- a/java/com/android/dialer/searchfragment/cp2/res/values-pt-rBR/strings.xml
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-pt-rBR/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="all_contacts" msgid="2155583160607462513">"Todos os contatos"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="all_contacts">Todos os contatos</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-pt-rPT/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-pt-rPT/strings.xml
index e69e199..623b5dc 100644
--- a/java/com/android/dialer/searchfragment/cp2/res/values-pt-rPT/strings.xml
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-pt-rPT/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="all_contacts" msgid="2155583160607462513">"Todos os contactos"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="all_contacts">Todos os contactos</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-pt/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-pt/strings.xml
index ccc0c91..cbb949c 100644
--- a/java/com/android/dialer/searchfragment/cp2/res/values-pt/strings.xml
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-pt/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="all_contacts" msgid="2155583160607462513">"Todos os contatos"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="all_contacts">Todos os contatos</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-ro/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-ro/strings.xml
index 503c0e5..3c0f39a 100644
--- a/java/com/android/dialer/searchfragment/cp2/res/values-ro/strings.xml
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-ro/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="all_contacts" msgid="2155583160607462513">"Toată agenda"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="all_contacts">Toată agenda</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-ru/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-ru/strings.xml
index 38cf675..2489b42 100644
--- a/java/com/android/dialer/searchfragment/cp2/res/values-ru/strings.xml
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-ru/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="all_contacts" msgid="2155583160607462513">"Все контакты"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="all_contacts">Все контакты</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-si/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-si/strings.xml
index ceafda0..54b9b7a 100644
--- a/java/com/android/dialer/searchfragment/cp2/res/values-si/strings.xml
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-si/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="all_contacts" msgid="2155583160607462513">"සියලුම සම්බන්ධතා"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="all_contacts">සියලුම සම්බන්ධතා</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-sk/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-sk/strings.xml
index a214b6b..886a317 100644
--- a/java/com/android/dialer/searchfragment/cp2/res/values-sk/strings.xml
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-sk/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="all_contacts" msgid="2155583160607462513">"Všetky kontakty"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="all_contacts">Všetky kontakty</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-sl/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-sl/strings.xml
index 3d65765..c2d7c61 100644
--- a/java/com/android/dialer/searchfragment/cp2/res/values-sl/strings.xml
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-sl/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="all_contacts" msgid="2155583160607462513">"Vsi stiki"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="all_contacts">Vsi stiki</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-sq/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-sq/strings.xml
index cb6501c..1027197 100644
--- a/java/com/android/dialer/searchfragment/cp2/res/values-sq/strings.xml
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-sq/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="all_contacts" msgid="2155583160607462513">"Të gjitha kontaktet"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="all_contacts">Të gjitha kontaktet</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-sr/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-sr/strings.xml
index 6b86da9..b102e8d 100644
--- a/java/com/android/dialer/searchfragment/cp2/res/values-sr/strings.xml
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-sr/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="all_contacts" msgid="2155583160607462513">"Сви контакти"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="all_contacts">Сви контакти</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-sv/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-sv/strings.xml
index 1914803..ea3fe57 100644
--- a/java/com/android/dialer/searchfragment/cp2/res/values-sv/strings.xml
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-sv/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="all_contacts" msgid="2155583160607462513">"Alla kontakter"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="all_contacts">Alla kontakter</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-sw/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-sw/strings.xml
index 2865645..96daf52 100644
--- a/java/com/android/dialer/searchfragment/cp2/res/values-sw/strings.xml
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-sw/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="all_contacts" msgid="2155583160607462513">"Anwani zote"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="all_contacts">Anwani zote</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-ta/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-ta/strings.xml
index e8cf9e7..9945001 100644
--- a/java/com/android/dialer/searchfragment/cp2/res/values-ta/strings.xml
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-ta/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="all_contacts" msgid="2155583160607462513">"எல்லாத் தொடர்புகளும்"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="all_contacts">எல்லாத் தொடர்புகளும்</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-te/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-te/strings.xml
index 431de21..0c150eb 100644
--- a/java/com/android/dialer/searchfragment/cp2/res/values-te/strings.xml
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-te/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="all_contacts" msgid="2155583160607462513">"అన్ని పరిచయాలు"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="all_contacts">అన్ని పరిచయాలు</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-th/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-th/strings.xml
index 4b7cb44..55d2cbd 100644
--- a/java/com/android/dialer/searchfragment/cp2/res/values-th/strings.xml
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-th/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="all_contacts" msgid="2155583160607462513">"รายชื่อทั้งหมด"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="all_contacts">รายชื่อทั้งหมด</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-tl/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-tl/strings.xml
index ad973da..129505f 100644
--- a/java/com/android/dialer/searchfragment/cp2/res/values-tl/strings.xml
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-tl/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="all_contacts" msgid="2155583160607462513">"Lahat ng contact"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="all_contacts">Lahat ng contact</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-tr/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-tr/strings.xml
index 6bb043a..a449e41 100644
--- a/java/com/android/dialer/searchfragment/cp2/res/values-tr/strings.xml
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-tr/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="all_contacts" msgid="2155583160607462513">"Tüm kişiler"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="all_contacts">Tüm kişiler</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-uk/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-uk/strings.xml
index 6a24a69..2d76504 100644
--- a/java/com/android/dialer/searchfragment/cp2/res/values-uk/strings.xml
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-uk/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="all_contacts" msgid="2155583160607462513">"Усі контакти"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="all_contacts">Усі контакти</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-ur/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-ur/strings.xml
index 2a84916..842ea97 100644
--- a/java/com/android/dialer/searchfragment/cp2/res/values-ur/strings.xml
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-ur/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="all_contacts" msgid="2155583160607462513">"سبھی رابطے"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="all_contacts">سبھی رابطے</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-uz/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-uz/strings.xml
index b562c4e..839e991 100644
--- a/java/com/android/dialer/searchfragment/cp2/res/values-uz/strings.xml
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-uz/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="all_contacts" msgid="2155583160607462513">"Barcha kontaktlar"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="all_contacts">Barcha kontaktlar</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-vi/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-vi/strings.xml
index 0bdf9e2..a6978ac 100644
--- a/java/com/android/dialer/searchfragment/cp2/res/values-vi/strings.xml
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-vi/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="all_contacts" msgid="2155583160607462513">"Tất cả địa chỉ liên hệ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="all_contacts">Tất cả địa chỉ liên hệ</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-zh-rCN/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-zh-rCN/strings.xml
index fe8b1ff..a5dfe63 100644
--- a/java/com/android/dialer/searchfragment/cp2/res/values-zh-rCN/strings.xml
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-zh-rCN/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="all_contacts" msgid="2155583160607462513">"所有联系人"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="all_contacts">所有联系人</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-zh-rHK/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-zh-rHK/strings.xml
index 5191ae9..7b89dae 100644
--- a/java/com/android/dialer/searchfragment/cp2/res/values-zh-rHK/strings.xml
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-zh-rHK/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="all_contacts" msgid="2155583160607462513">"所有聯絡人"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="all_contacts">所有聯絡人</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-zh-rTW/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-zh-rTW/strings.xml
index 5191ae9..7b89dae 100644
--- a/java/com/android/dialer/searchfragment/cp2/res/values-zh-rTW/strings.xml
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-zh-rTW/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="all_contacts" msgid="2155583160607462513">"所有聯絡人"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="all_contacts">所有聯絡人</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/cp2/res/values-zu/strings.xml b/java/com/android/dialer/searchfragment/cp2/res/values-zu/strings.xml
index e6812c0..4bd1a29 100644
--- a/java/com/android/dialer/searchfragment/cp2/res/values-zu/strings.xml
+++ b/java/com/android/dialer/searchfragment/cp2/res/values-zu/strings.xml
@@ -1,21 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="all_contacts" msgid="2155583160607462513">"Bonke oxhumana nabo"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="all_contacts">Bonke oxhumana nabo</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/directories/DirectoriesCursorLoader.java b/java/com/android/dialer/searchfragment/directories/DirectoriesCursorLoader.java
index 4d7ea3f..754e055 100644
--- a/java/com/android/dialer/searchfragment/directories/DirectoriesCursorLoader.java
+++ b/java/com/android/dialer/searchfragment/directories/DirectoriesCursorLoader.java
@@ -20,9 +20,6 @@
 import android.content.Context;
 import android.content.CursorLoader;
 import android.database.Cursor;
-import android.net.Uri;
-import android.os.Build.VERSION;
-import android.os.Build.VERSION_CODES;
 import android.provider.ContactsContract;
 import android.support.annotation.Nullable;
 import com.android.dialer.common.LogUtil;
@@ -51,7 +48,13 @@
   private static final int PHOTO_SUPPORT = 2;
 
   public DirectoriesCursorLoader(Context context) {
-    super(context, getContentUri(), PROJECTION, null, null, ContactsContract.Directory._ID);
+    super(
+        context,
+        ContactsContract.Directory.ENTERPRISE_CONTENT_URI,
+        PROJECTION,
+        null,
+        null,
+        ContactsContract.Directory._ID);
   }
 
   @Override
@@ -88,12 +91,6 @@
     return directories;
   }
 
-  private static Uri getContentUri() {
-    return VERSION.SDK_INT >= VERSION_CODES.N
-        ? ContactsContract.Directory.ENTERPRISE_CONTENT_URI
-        : ContactsContract.Directory.CONTENT_URI;
-  }
-
   /** POJO representing the results returned from {@link DirectoriesCursorLoader}. */
   @AutoValue
   public abstract static class Directory {
diff --git a/java/com/android/dialer/searchfragment/directories/DirectoryContactViewHolder.java b/java/com/android/dialer/searchfragment/directories/DirectoryContactViewHolder.java
index aef1e9e..29127ff 100644
--- a/java/com/android/dialer/searchfragment/directories/DirectoryContactViewHolder.java
+++ b/java/com/android/dialer/searchfragment/directories/DirectoryContactViewHolder.java
@@ -29,15 +29,13 @@
 import android.widget.ImageView;
 import android.widget.QuickContactBadge;
 import android.widget.TextView;
-import com.android.dialer.callintent.CallInitiationType;
-import com.android.dialer.callintent.CallIntentBuilder;
-import com.android.dialer.common.cp2.DirectoryCompat;
+import com.android.dialer.common.cp2.DirectoryUtils;
 import com.android.dialer.contactphoto.ContactPhotoManager;
 import com.android.dialer.lettertile.LetterTileDrawable;
-import com.android.dialer.precall.PreCall;
 import com.android.dialer.searchfragment.common.Projections;
 import com.android.dialer.searchfragment.common.QueryBoldingUtil;
 import com.android.dialer.searchfragment.common.R;
+import com.android.dialer.searchfragment.common.RowClickListener;
 import com.android.dialer.searchfragment.common.SearchCursor;
 
 /** ViewHolder for a directory contact row. */
@@ -49,10 +47,12 @@
   private final TextView numberView;
   private final QuickContactBadge photo;
   private final ImageView workBadge;
+  private final RowClickListener listener;
 
   private String number;
+  private int position;
 
-  public DirectoryContactViewHolder(View view) {
+  public DirectoryContactViewHolder(View view, RowClickListener listener) {
     super(view);
     view.setOnClickListener(this);
     photo = view.findViewById(R.id.photo);
@@ -60,6 +60,7 @@
     numberView = view.findViewById(R.id.secondary);
     workBadge = view.findViewById(R.id.work_icon);
     context = view.getContext();
+    this.listener = listener;
   }
 
   /**
@@ -68,6 +69,7 @@
    */
   public void bind(SearchCursor cursor, String query) {
     number = cursor.getString(Projections.PHONE_NUMBER);
+    position = cursor.getPosition();
     String name = cursor.getString(Projections.DISPLAY_NAME);
     String label = getLabel(context.getResources(), cursor);
     String secondaryInfo =
@@ -78,7 +80,7 @@
     nameView.setText(QueryBoldingUtil.getNameWithQueryBolded(query, name, context));
     numberView.setText(QueryBoldingUtil.getNameWithQueryBolded(query, secondaryInfo, context));
     workBadge.setVisibility(
-        DirectoryCompat.isOnlyEnterpriseDirectoryId(cursor.getDirectoryId())
+        DirectoryUtils.isLocalEnterpriseDirectoryId(cursor.getDirectoryId())
             ? View.VISIBLE
             : View.GONE);
 
@@ -128,9 +130,8 @@
   }
 
   private static Uri getContactUri(SearchCursor cursor) {
-    long contactId = cursor.getLong(Projections.ID);
     String lookupKey = cursor.getString(Projections.LOOKUP_KEY);
-    return Contacts.getLookupUri(contactId, lookupKey)
+    return Uri.withAppendedPath(Contacts.CONTENT_LOOKUP_URI, lookupKey)
         .buildUpon()
         .appendQueryParameter(
             ContactsContract.DIRECTORY_PARAM_KEY, String.valueOf(cursor.getDirectoryId()))
@@ -139,6 +140,6 @@
 
   @Override
   public void onClick(View v) {
-    PreCall.start(context, new CallIntentBuilder(number, CallInitiationType.Type.REGULAR_SEARCH));
+    listener.placeVoiceCall(number, position);
   }
 }
diff --git a/java/com/android/dialer/searchfragment/directories/DirectoryContactsCursor.java b/java/com/android/dialer/searchfragment/directories/DirectoryContactsCursor.java
index 0c1ad83..b081de0 100644
--- a/java/com/android/dialer/searchfragment/directories/DirectoryContactsCursor.java
+++ b/java/com/android/dialer/searchfragment/directories/DirectoryContactsCursor.java
@@ -23,7 +23,7 @@
 import android.support.annotation.Nullable;
 import android.support.annotation.VisibleForTesting;
 import com.android.dialer.common.Assert;
-import com.android.dialer.common.cp2.DirectoryCompat;
+import com.android.dialer.common.cp2.DirectoryUtils;
 import com.android.dialer.searchfragment.common.SearchCursor;
 import com.android.dialer.searchfragment.directories.DirectoriesCursorLoader.Directory;
 import java.util.ArrayList;
@@ -101,7 +101,7 @@
 
   private static MatrixCursor createHeaderCursor(Context context, String name, long id) {
     MatrixCursor headerCursor = new MatrixCursor(PROJECTION, 1);
-    if (DirectoryCompat.isOnlyEnterpriseDirectoryId(id)) {
+    if (DirectoryUtils.isLocalEnterpriseDirectoryId(id)) {
       headerCursor.addRow(
           new Object[] {context.getString(R.string.directory_search_label_work), id});
     } else {
diff --git a/java/com/android/dialer/searchfragment/directories/DirectoryContactsCursorLoader.java b/java/com/android/dialer/searchfragment/directories/DirectoryContactsCursorLoader.java
index d719cb9..bf56a1c 100644
--- a/java/com/android/dialer/searchfragment/directories/DirectoryContactsCursorLoader.java
+++ b/java/com/android/dialer/searchfragment/directories/DirectoryContactsCursorLoader.java
@@ -21,13 +21,11 @@
 import android.database.Cursor;
 import android.database.MatrixCursor;
 import android.net.Uri;
-import android.os.Build.VERSION;
-import android.os.Build.VERSION_CODES;
 import android.provider.ContactsContract;
 import android.provider.ContactsContract.CommonDataKinds.Phone;
 import android.support.annotation.NonNull;
 import android.support.annotation.VisibleForTesting;
-import com.android.dialer.common.cp2.DirectoryCompat;
+import com.android.dialer.common.cp2.DirectoryUtils;
 import com.android.dialer.searchfragment.common.Projections;
 import com.android.dialer.searchfragment.directories.DirectoriesCursorLoader.Directory;
 import java.util.ArrayList;
@@ -71,14 +69,14 @@
     for (int i = 0; i < directories.size(); i++) {
       Directory directory = directories.get(i);
 
-      if (!DirectoryCompat.isRemoteDirectoryId(directory.getId())
-          && !DirectoryCompat.isEnterpriseDirectoryId(directory.getId())) {
+      if (!ContactsContract.Directory.isRemoteDirectoryId(directory.getId())
+          && !ContactsContract.Directory.isEnterpriseDirectoryId(directory.getId())) {
         cursors[i] = null;
         continue;
       }
 
       // Filter out invisible directories.
-      if (DirectoryCompat.isInvisibleDirectory(directory.getId())) {
+      if (DirectoryUtils.isInvisibleDirectoryId(directory.getId())) {
         cursors[i] = null;
         continue;
       }
@@ -145,12 +143,7 @@
 
   @VisibleForTesting
   static Uri getContentFilterUri(String query, long directoryId) {
-    Uri baseUri =
-        VERSION.SDK_INT >= VERSION_CODES.N
-            ? ENTERPRISE_CONTENT_FILTER_URI
-            : Phone.CONTENT_FILTER_URI;
-
-    return baseUri
+    return ENTERPRISE_CONTENT_FILTER_URI
         .buildUpon()
         .appendPath(query)
         .appendQueryParameter(ContactsContract.DIRECTORY_PARAM_KEY, String.valueOf(directoryId))
diff --git a/java/com/android/dialer/searchfragment/directories/res/values-af/strings.xml b/java/com/android/dialer/searchfragment/directories/res/values-af/strings.xml
new file mode 100644
index 0000000..3223504
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/directories/res/values-af/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="directory">Gids %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/directories/res/values-am/strings.xml b/java/com/android/dialer/searchfragment/directories/res/values-am/strings.xml
new file mode 100644
index 0000000..7e5dae7
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/directories/res/values-am/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="directory">ማውጫ %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/directories/res/values-ar/strings.xml b/java/com/android/dialer/searchfragment/directories/res/values-ar/strings.xml
new file mode 100644
index 0000000..e772061
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/directories/res/values-ar/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="directory">دليل %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/directories/res/values-az/strings.xml b/java/com/android/dialer/searchfragment/directories/res/values-az/strings.xml
new file mode 100644
index 0000000..af1bd99
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/directories/res/values-az/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="directory">Kataloq %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/directories/res/values-b+sr+Latn/strings.xml b/java/com/android/dialer/searchfragment/directories/res/values-b+sr+Latn/strings.xml
new file mode 100644
index 0000000..db29a14
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/directories/res/values-b+sr+Latn/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="directory">Katalog %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/directories/res/values-be/strings.xml b/java/com/android/dialer/searchfragment/directories/res/values-be/strings.xml
new file mode 100644
index 0000000..0f74dc9
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/directories/res/values-be/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="directory">Каталог %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/directories/res/values-bg/strings.xml b/java/com/android/dialer/searchfragment/directories/res/values-bg/strings.xml
new file mode 100644
index 0000000..de4f995
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/directories/res/values-bg/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="directory">Директория на %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/directories/res/values-bn/strings.xml b/java/com/android/dialer/searchfragment/directories/res/values-bn/strings.xml
new file mode 100644
index 0000000..8d2166d
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/directories/res/values-bn/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="directory">ডিরেক্টরি %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/directories/res/values-bs/strings.xml b/java/com/android/dialer/searchfragment/directories/res/values-bs/strings.xml
new file mode 100644
index 0000000..36b1376
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/directories/res/values-bs/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="directory">Imenik e-pošte %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/directories/res/values-ca/strings.xml b/java/com/android/dialer/searchfragment/directories/res/values-ca/strings.xml
new file mode 100644
index 0000000..a2e5e33
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/directories/res/values-ca/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="directory">Directori %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/directories/res/values-cs/strings.xml b/java/com/android/dialer/searchfragment/directories/res/values-cs/strings.xml
new file mode 100644
index 0000000..0ad8ca6
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/directories/res/values-cs/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="directory">Adresář %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/directories/res/values-da/strings.xml b/java/com/android/dialer/searchfragment/directories/res/values-da/strings.xml
new file mode 100644
index 0000000..33eaa34
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/directories/res/values-da/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="directory">Indeks %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/directories/res/values-de/strings.xml b/java/com/android/dialer/searchfragment/directories/res/values-de/strings.xml
new file mode 100644
index 0000000..513451f
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/directories/res/values-de/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="directory">Verzeichnis \"%1$s\"</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/directories/res/values-el/strings.xml b/java/com/android/dialer/searchfragment/directories/res/values-el/strings.xml
new file mode 100644
index 0000000..389cce8
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/directories/res/values-el/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="directory">Κατάλογος %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/directories/res/values-en-rAU/strings.xml b/java/com/android/dialer/searchfragment/directories/res/values-en-rAU/strings.xml
new file mode 100644
index 0000000..6b63984
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/directories/res/values-en-rAU/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="directory">Directory %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/directories/res/values-en-rGB/strings.xml b/java/com/android/dialer/searchfragment/directories/res/values-en-rGB/strings.xml
new file mode 100644
index 0000000..6b63984
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/directories/res/values-en-rGB/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="directory">Directory %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/directories/res/values-en-rIN/strings.xml b/java/com/android/dialer/searchfragment/directories/res/values-en-rIN/strings.xml
new file mode 100644
index 0000000..6b63984
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/directories/res/values-en-rIN/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="directory">Directory %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/directories/res/values-es-rUS/strings.xml b/java/com/android/dialer/searchfragment/directories/res/values-es-rUS/strings.xml
new file mode 100644
index 0000000..770083b
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/directories/res/values-es-rUS/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="directory">Directorio %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/directories/res/values-es/strings.xml b/java/com/android/dialer/searchfragment/directories/res/values-es/strings.xml
new file mode 100644
index 0000000..770083b
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/directories/res/values-es/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="directory">Directorio %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/directories/res/values-et/strings.xml b/java/com/android/dialer/searchfragment/directories/res/values-et/strings.xml
new file mode 100644
index 0000000..0009c1f
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/directories/res/values-et/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="directory">Kataloog %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/directories/res/values-eu/strings.xml b/java/com/android/dialer/searchfragment/directories/res/values-eu/strings.xml
new file mode 100644
index 0000000..01bc780
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/directories/res/values-eu/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="directory">%1$s gida</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/directories/res/values-fa/strings.xml b/java/com/android/dialer/searchfragment/directories/res/values-fa/strings.xml
new file mode 100644
index 0000000..91f03e4
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/directories/res/values-fa/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="directory">فهرست %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/directories/res/values-fi/strings.xml b/java/com/android/dialer/searchfragment/directories/res/values-fi/strings.xml
new file mode 100644
index 0000000..dbc27ad
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/directories/res/values-fi/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="directory">%1$s-hakemisto</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/directories/res/values-fr-rCA/strings.xml b/java/com/android/dialer/searchfragment/directories/res/values-fr-rCA/strings.xml
new file mode 100644
index 0000000..15b3d32
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/directories/res/values-fr-rCA/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="directory">Annuaire %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/directories/res/values-fr/strings.xml b/java/com/android/dialer/searchfragment/directories/res/values-fr/strings.xml
new file mode 100644
index 0000000..eaef0be
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/directories/res/values-fr/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="directory">Dossier %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/directories/res/values-gl/strings.xml b/java/com/android/dialer/searchfragment/directories/res/values-gl/strings.xml
new file mode 100644
index 0000000..770083b
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/directories/res/values-gl/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="directory">Directorio %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/directories/res/values-gu/strings.xml b/java/com/android/dialer/searchfragment/directories/res/values-gu/strings.xml
new file mode 100644
index 0000000..eac2848
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/directories/res/values-gu/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="directory">ડિરેક્ટરી %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/directories/res/values-hi/strings.xml b/java/com/android/dialer/searchfragment/directories/res/values-hi/strings.xml
new file mode 100644
index 0000000..e971531
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/directories/res/values-hi/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="directory">निर्देशिका %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/directories/res/values-hr/strings.xml b/java/com/android/dialer/searchfragment/directories/res/values-hr/strings.xml
new file mode 100644
index 0000000..1997250
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/directories/res/values-hr/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="directory">Direktorij %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/directories/res/values-hu/strings.xml b/java/com/android/dialer/searchfragment/directories/res/values-hu/strings.xml
new file mode 100644
index 0000000..b91254b
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/directories/res/values-hu/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="directory">Címtár: %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/directories/res/values-hy/strings.xml b/java/com/android/dialer/searchfragment/directories/res/values-hy/strings.xml
new file mode 100644
index 0000000..f4eb2c4
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/directories/res/values-hy/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="directory">Գրացուցակ «%1$s»</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/directories/res/values-in/strings.xml b/java/com/android/dialer/searchfragment/directories/res/values-in/strings.xml
new file mode 100644
index 0000000..af0d5d0
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/directories/res/values-in/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="directory">Direktori %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/directories/res/values-is/strings.xml b/java/com/android/dialer/searchfragment/directories/res/values-is/strings.xml
new file mode 100644
index 0000000..3808fe8
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/directories/res/values-is/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="directory">Tengiliðaskrá %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/directories/res/values-it/strings.xml b/java/com/android/dialer/searchfragment/directories/res/values-it/strings.xml
new file mode 100644
index 0000000..6b63984
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/directories/res/values-it/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="directory">Directory %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/directories/res/values-iw/strings.xml b/java/com/android/dialer/searchfragment/directories/res/values-iw/strings.xml
new file mode 100644
index 0000000..c3948a8
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/directories/res/values-iw/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="directory">הספרייה של %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/directories/res/values-ja/strings.xml b/java/com/android/dialer/searchfragment/directories/res/values-ja/strings.xml
new file mode 100644
index 0000000..5b13897
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/directories/res/values-ja/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="directory">「%1$s」ディレクトリ</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/directories/res/values-ka/strings.xml b/java/com/android/dialer/searchfragment/directories/res/values-ka/strings.xml
new file mode 100644
index 0000000..94daac6
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/directories/res/values-ka/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="directory">კატალოგი %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/directories/res/values-kk/strings.xml b/java/com/android/dialer/searchfragment/directories/res/values-kk/strings.xml
new file mode 100644
index 0000000..097deb6
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/directories/res/values-kk/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="directory">%1$s каталогы</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/directories/res/values-km/strings.xml b/java/com/android/dialer/searchfragment/directories/res/values-km/strings.xml
new file mode 100644
index 0000000..a9d8c4f
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/directories/res/values-km/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="directory">បញ្ជី %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/directories/res/values-kn/strings.xml b/java/com/android/dialer/searchfragment/directories/res/values-kn/strings.xml
new file mode 100644
index 0000000..e982566
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/directories/res/values-kn/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="directory">%1$s ಡೈರೆಕ್ಟರಿ</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/directories/res/values-ko/strings.xml b/java/com/android/dialer/searchfragment/directories/res/values-ko/strings.xml
new file mode 100644
index 0000000..efbc45e
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/directories/res/values-ko/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="directory">디렉토리 %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/directories/res/values-ky/strings.xml b/java/com/android/dialer/searchfragment/directories/res/values-ky/strings.xml
new file mode 100644
index 0000000..0f74dc9
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/directories/res/values-ky/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="directory">Каталог %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/directories/res/values-lo/strings.xml b/java/com/android/dialer/searchfragment/directories/res/values-lo/strings.xml
new file mode 100644
index 0000000..cdb283b
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/directories/res/values-lo/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="directory">ໄດເຣັກທໍຣີ %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/directories/res/values-lt/strings.xml b/java/com/android/dialer/searchfragment/directories/res/values-lt/strings.xml
new file mode 100644
index 0000000..42fc3a5
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/directories/res/values-lt/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="directory">Katalogas „%1$s“</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/directories/res/values-lv/strings.xml b/java/com/android/dialer/searchfragment/directories/res/values-lv/strings.xml
new file mode 100644
index 0000000..b461dea
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/directories/res/values-lv/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="directory">Direktorijs: %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/directories/res/values-mk/strings.xml b/java/com/android/dialer/searchfragment/directories/res/values-mk/strings.xml
new file mode 100644
index 0000000..de6f571
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/directories/res/values-mk/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="directory">Адресар %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/directories/res/values-ml/strings.xml b/java/com/android/dialer/searchfragment/directories/res/values-ml/strings.xml
new file mode 100644
index 0000000..1936bee
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/directories/res/values-ml/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="directory">ഡയറക്റ്ററി %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/directories/res/values-mn/strings.xml b/java/com/android/dialer/searchfragment/directories/res/values-mn/strings.xml
new file mode 100644
index 0000000..3ae0fce
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/directories/res/values-mn/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="directory">Директор %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/directories/res/values-mr/strings.xml b/java/com/android/dialer/searchfragment/directories/res/values-mr/strings.xml
new file mode 100644
index 0000000..8337f80
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/directories/res/values-mr/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="directory">डिरेक्टरी %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/directories/res/values-ms/strings.xml b/java/com/android/dialer/searchfragment/directories/res/values-ms/strings.xml
new file mode 100644
index 0000000..af0d5d0
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/directories/res/values-ms/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="directory">Direktori %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/directories/res/values-my/strings.xml b/java/com/android/dialer/searchfragment/directories/res/values-my/strings.xml
new file mode 100644
index 0000000..d37adf4
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/directories/res/values-my/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="directory">လမ်းညွှန် %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/directories/res/values-nb/strings.xml b/java/com/android/dialer/searchfragment/directories/res/values-nb/strings.xml
new file mode 100644
index 0000000..74d49ae
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/directories/res/values-nb/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="directory">Katalog – %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/directories/res/values-ne/strings.xml b/java/com/android/dialer/searchfragment/directories/res/values-ne/strings.xml
new file mode 100644
index 0000000..e971531
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/directories/res/values-ne/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="directory">निर्देशिका %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/directories/res/values-nl/strings.xml b/java/com/android/dialer/searchfragment/directories/res/values-nl/strings.xml
new file mode 100644
index 0000000..6b63984
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/directories/res/values-nl/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="directory">Directory %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/directories/res/values-no/strings.xml b/java/com/android/dialer/searchfragment/directories/res/values-no/strings.xml
new file mode 100644
index 0000000..74d49ae
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/directories/res/values-no/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="directory">Katalog – %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/directories/res/values-pa/strings.xml b/java/com/android/dialer/searchfragment/directories/res/values-pa/strings.xml
new file mode 100644
index 0000000..11fc1ed
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/directories/res/values-pa/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="directory">ਡਾਇਰੈਕਟਰੀ %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/directories/res/values-pl/strings.xml b/java/com/android/dialer/searchfragment/directories/res/values-pl/strings.xml
new file mode 100644
index 0000000..db29a14
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/directories/res/values-pl/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="directory">Katalog %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/directories/res/values-pt-rBR/strings.xml b/java/com/android/dialer/searchfragment/directories/res/values-pt-rBR/strings.xml
new file mode 100644
index 0000000..fb94b75
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/directories/res/values-pt-rBR/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="directory">Diretório %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/directories/res/values-pt-rPT/strings.xml b/java/com/android/dialer/searchfragment/directories/res/values-pt-rPT/strings.xml
new file mode 100644
index 0000000..fb94b75
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/directories/res/values-pt-rPT/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="directory">Diretório %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/directories/res/values-pt/strings.xml b/java/com/android/dialer/searchfragment/directories/res/values-pt/strings.xml
new file mode 100644
index 0000000..fb94b75
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/directories/res/values-pt/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="directory">Diretório %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/directories/res/values-ro/strings.xml b/java/com/android/dialer/searchfragment/directories/res/values-ro/strings.xml
new file mode 100644
index 0000000..ec2d90c
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/directories/res/values-ro/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="directory">Directorul %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/directories/res/values-ru/strings.xml b/java/com/android/dialer/searchfragment/directories/res/values-ru/strings.xml
new file mode 100644
index 0000000..0f74dc9
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/directories/res/values-ru/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="directory">Каталог %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/directories/res/values-si/strings.xml b/java/com/android/dialer/searchfragment/directories/res/values-si/strings.xml
new file mode 100644
index 0000000..4c4a41b
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/directories/res/values-si/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="directory">නාමාවලිය %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/directories/res/values-sk/strings.xml b/java/com/android/dialer/searchfragment/directories/res/values-sk/strings.xml
new file mode 100644
index 0000000..3a3f319
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/directories/res/values-sk/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="directory">Adresár %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/directories/res/values-sl/strings.xml b/java/com/android/dialer/searchfragment/directories/res/values-sl/strings.xml
new file mode 100644
index 0000000..91cd972
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/directories/res/values-sl/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="directory">Imenik %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/directories/res/values-sq/strings.xml b/java/com/android/dialer/searchfragment/directories/res/values-sq/strings.xml
new file mode 100644
index 0000000..bea2644
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/directories/res/values-sq/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="directory">Direktoria %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/directories/res/values-sr/strings.xml b/java/com/android/dialer/searchfragment/directories/res/values-sr/strings.xml
new file mode 100644
index 0000000..0f74dc9
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/directories/res/values-sr/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="directory">Каталог %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/directories/res/values-sv/strings.xml b/java/com/android/dialer/searchfragment/directories/res/values-sv/strings.xml
new file mode 100644
index 0000000..ab3503d
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/directories/res/values-sv/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="directory">Katalogen %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/directories/res/values-sw/strings.xml b/java/com/android/dialer/searchfragment/directories/res/values-sw/strings.xml
new file mode 100644
index 0000000..74ec3f7
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/directories/res/values-sw/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="directory">Saraka %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/directories/res/values-ta/strings.xml b/java/com/android/dialer/searchfragment/directories/res/values-ta/strings.xml
new file mode 100644
index 0000000..5152d57
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/directories/res/values-ta/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="directory">%1$s கோப்பகம்</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/directories/res/values-te/strings.xml b/java/com/android/dialer/searchfragment/directories/res/values-te/strings.xml
new file mode 100644
index 0000000..d3b7abe
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/directories/res/values-te/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="directory">డైరెక్టరీ %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/directories/res/values-th/strings.xml b/java/com/android/dialer/searchfragment/directories/res/values-th/strings.xml
new file mode 100644
index 0000000..9f2945d
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/directories/res/values-th/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="directory">ไดเรกทอรี %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/directories/res/values-tl/strings.xml b/java/com/android/dialer/searchfragment/directories/res/values-tl/strings.xml
new file mode 100644
index 0000000..6b63984
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/directories/res/values-tl/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="directory">Directory %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/directories/res/values-tr/strings.xml b/java/com/android/dialer/searchfragment/directories/res/values-tr/strings.xml
new file mode 100644
index 0000000..00adbd6
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/directories/res/values-tr/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="directory">%1$s dizini</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/directories/res/values-uk/strings.xml b/java/com/android/dialer/searchfragment/directories/res/values-uk/strings.xml
new file mode 100644
index 0000000..0f74dc9
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/directories/res/values-uk/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="directory">Каталог %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/directories/res/values-ur/strings.xml b/java/com/android/dialer/searchfragment/directories/res/values-ur/strings.xml
new file mode 100644
index 0000000..d2a533f
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/directories/res/values-ur/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="directory">ڈائرکٹری %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/directories/res/values-uz/strings.xml b/java/com/android/dialer/searchfragment/directories/res/values-uz/strings.xml
new file mode 100644
index 0000000..925412a
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/directories/res/values-uz/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="directory">%1$s katalogi</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/directories/res/values-vi/strings.xml b/java/com/android/dialer/searchfragment/directories/res/values-vi/strings.xml
new file mode 100644
index 0000000..a93f8a5
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/directories/res/values-vi/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="directory">Thư mục %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/directories/res/values-zh-rCN/strings.xml b/java/com/android/dialer/searchfragment/directories/res/values-zh-rCN/strings.xml
new file mode 100644
index 0000000..86882db
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/directories/res/values-zh-rCN/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="directory">目录 %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/directories/res/values-zh-rHK/strings.xml b/java/com/android/dialer/searchfragment/directories/res/values-zh-rHK/strings.xml
new file mode 100644
index 0000000..0bf497c
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/directories/res/values-zh-rHK/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="directory">目錄 %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/directories/res/values-zh-rTW/strings.xml b/java/com/android/dialer/searchfragment/directories/res/values-zh-rTW/strings.xml
new file mode 100644
index 0000000..0bf497c
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/directories/res/values-zh-rTW/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="directory">目錄 %1$s</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/directories/res/values-zu/strings.xml b/java/com/android/dialer/searchfragment/directories/res/values-zu/strings.xml
new file mode 100644
index 0000000..155eb30
--- /dev/null
+++ b/java/com/android/dialer/searchfragment/directories/res/values-zu/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="directory">Uhla lwemibhalo ye-%1$s</string>
+</resources>
diff --git a/java/com/android/dialer/searchfragment/directories/res/values/strings.xml b/java/com/android/dialer/searchfragment/directories/res/values/strings.xml
index 097f353..beabba1 100644
--- a/java/com/android/dialer/searchfragment/directories/res/values/strings.xml
+++ b/java/com/android/dialer/searchfragment/directories/res/values/strings.xml
@@ -17,10 +17,4 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Label for a list of contacts stored in a seperate directory [CHAR LIMIT=30]-->
   <string name="directory">Directory <xliff:g example="google.com" id="email">%1$s</xliff:g></string>
-
-  <!-- String used to build a phone number type and phone number string.
-     Example: Mobile 650-555-1212  -->
-  <string name="call_subject_type_and_number">
-    <xliff:g example="Mobile" id="type">%1$s</xliff:g> <xliff:g example="(650) 555-1212" id="number">%2$s</xliff:g>
-  </string>
 </resources>
\ No newline at end of file
diff --git a/java/com/android/dialer/searchfragment/list/NewSearchFragment.java b/java/com/android/dialer/searchfragment/list/NewSearchFragment.java
index aff9462..809f917 100644
--- a/java/com/android/dialer/searchfragment/list/NewSearchFragment.java
+++ b/java/com/android/dialer/searchfragment/list/NewSearchFragment.java
@@ -29,7 +29,6 @@
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.annotation.VisibleForTesting;
-import android.support.v13.app.FragmentCompat;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.telephony.PhoneNumberUtils;
@@ -52,9 +51,7 @@
 import com.android.dialer.common.FragmentUtils;
 import com.android.dialer.common.LogUtil;
 import com.android.dialer.common.concurrent.ThreadUtil;
-import com.android.dialer.constants.ActivityRequestCodes;
 import com.android.dialer.dialercontact.DialerContact;
-import com.android.dialer.duo.DuoComponent;
 import com.android.dialer.enrichedcall.EnrichedCallComponent;
 import com.android.dialer.enrichedcall.EnrichedCallManager.CapabilitiesListener;
 import com.android.dialer.logging.DialerImpression;
@@ -68,7 +65,6 @@
 import com.android.dialer.searchfragment.directories.DirectoryContactsCursorLoader;
 import com.android.dialer.searchfragment.list.SearchActionViewHolder.Action;
 import com.android.dialer.searchfragment.nearbyplaces.NearbyPlacesCursorLoader;
-import com.android.dialer.storage.StorageComponent;
 import com.android.dialer.util.CallUtil;
 import com.android.dialer.util.DialerUtils;
 import com.android.dialer.util.PermissionsUtil;
@@ -95,7 +91,6 @@
   // updates so they are bundled together
   private static final int ENRICHED_CALLING_CAPABILITIES_UPDATED_DELAY = 400;
 
-  private static final String KEY_SHOW_ZERO_SUGGEST = "use_zero_suggest";
   private static final String KEY_LOCATION_PROMPT_DISMISSED = "search_location_prompt_dismissed";
 
   @VisibleForTesting public static final int READ_CONTACTS_PERMISSION_REQUEST_CODE = 1;
@@ -126,21 +121,29 @@
   // the contacts in them).
   private final List<Directory> directories = new ArrayList<>();
   private final Runnable loaderCp2ContactsRunnable =
-      () -> getLoaderManager().restartLoader(CONTACTS_LOADER_ID, null, this);
+      () -> {
+        if (getHost() != null) {
+          getLoaderManager().restartLoader(CONTACTS_LOADER_ID, null, this);
+        }
+      };
   private final Runnable loadNearbyPlacesRunnable =
-      () -> getLoaderManager().restartLoader(NEARBY_PLACES_LOADER_ID, null, this);
+      () -> {
+        if (getHost() != null) {
+          getLoaderManager().restartLoader(NEARBY_PLACES_LOADER_ID, null, this);
+        }
+      };
   private final Runnable loadDirectoryContactsRunnable =
-      () -> getLoaderManager().restartLoader(DIRECTORY_CONTACTS_LOADER_ID, null, this);
+      () -> {
+        if (getHost() != null) {
+          getLoaderManager().restartLoader(DIRECTORY_CONTACTS_LOADER_ID, null, this);
+        }
+      };
   private final Runnable capabilitiesUpdatedRunnable = () -> adapter.notifyDataSetChanged();
 
   private Runnable updatePositionRunnable;
 
-  public static NewSearchFragment newInstance(boolean showZeroSuggest) {
-    NewSearchFragment fragment = new NewSearchFragment();
-    Bundle args = new Bundle();
-    args.putBoolean(KEY_SHOW_ZERO_SUGGEST, showZeroSuggest);
-    fragment.setArguments(args);
-    return fragment;
+  public static NewSearchFragment newInstance() {
+    return new NewSearchFragment();
   }
 
   @Nullable
@@ -149,9 +152,9 @@
       LayoutInflater inflater, @Nullable ViewGroup parent, @Nullable Bundle savedInstanceState) {
     View view = inflater.inflate(R.layout.fragment_search, parent, false);
     adapter = new SearchAdapter(getContext(), new SearchCursorManager(), this);
-    adapter.setQuery(query, rawNumber, callInitiationType);
+    adapter.setQuery(query, rawNumber);
     adapter.setSearchActions(getActions());
-    adapter.setZeroSuggestVisible(getArguments().getBoolean(KEY_SHOW_ZERO_SUGGEST));
+    showLocationPermission();
     emptyContentView = view.findViewById(R.id.empty_view);
     recyclerView = view.findViewById(R.id.recycler_view);
     recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
@@ -260,19 +263,43 @@
     this.rawNumber = rawNumber;
   }
 
+  @VisibleForTesting
+  public String getRawNumber() {
+    return rawNumber;
+  }
+
   public void setQuery(String query, CallInitiationType.Type callInitiationType) {
     this.query = query;
     this.callInitiationType = callInitiationType;
     if (adapter != null) {
-      adapter.setQuery(query, rawNumber, callInitiationType);
+      adapter.setQuery(query, rawNumber);
       adapter.setSearchActions(getActions());
-      adapter.setZeroSuggestVisible(isRegularSearch());
+      showLocationPermission();
       loadCp2ContactsCursor();
       loadNearbyPlacesCursor();
       loadDirectoryContactsCursors();
     }
   }
 
+  /** Returns true if the location permission was shown. */
+  private boolean showLocationPermission() {
+    if (adapter == null) {
+      return false;
+    }
+
+    if (getContext() == null
+        || PermissionsUtil.hasLocationPermissions(getContext())
+        || hasBeenDismissed()
+        || !isRegularSearch()) {
+      adapter.hideLocationPermissionRequest();
+      return false;
+    }
+
+    adapter.showLocationPermissionRequest(
+        v -> requestLocationPermission(), v -> dismissLocationPermission());
+    return true;
+  }
+
   /** Translate the search fragment and resize it to fit on the screen. */
   public void animatePosition(int start, int end, int duration) {
     // Called before the view is ready, prepare a runnable to run in onCreateView
@@ -342,8 +369,8 @@
       LogUtil.i(
           "NewSearchFragment.onEmptyViewActionButtonClicked",
           "Requesting permissions: " + Arrays.toString(deniedPermissions));
-      FragmentCompat.requestPermissions(
-          this, deniedPermissions, READ_CONTACTS_PERMISSION_REQUEST_CODE);
+      FragmentUtils.getParentUnsafe(this, SearchFragmentListener.class).requestingPermission();
+      requestPermissions(deniedPermissions, READ_CONTACTS_PERMISSION_REQUEST_CODE);
     }
   }
 
@@ -383,16 +410,16 @@
    * <p>Should not be called before finishing loading info about all directories (local and remote).
    */
   private void loadNearbyPlacesCursor() {
-    if (!PermissionsUtil.hasLocationPermissions(getContext())
-        && !StorageComponent.get(getContext())
-            .unencryptedSharedPrefs()
-            .getBoolean(KEY_LOCATION_PROMPT_DISMISSED, false)) {
-      if (adapter != null && isRegularSearch() && !hasBeenDismissed()) {
-        adapter.showLocationPermissionRequest(
-            v -> requestLocationPermission(), v -> dismissLocationPermission());
-      }
+    // If we're requesting the location permission, don't load nearby places cursor.
+    if (showLocationPermission()) {
       return;
     }
+
+    // If the user dismissed the prompt without granting us the permission, don't load the cursor.
+    if (getContext() == null || !PermissionsUtil.hasLocationPermissions(getContext())) {
+      return;
+    }
+
     // Cancel existing load if one exists.
     ThreadUtil.getUiThreadHandler().removeCallbacks(loadNearbyPlacesRunnable);
 
@@ -411,6 +438,7 @@
     String[] deniedPermissions =
         PermissionsUtil.getPermissionsCurrentlyDenied(
             getContext(), PermissionsUtil.allLocationGroupPermissionsUsedInDialer);
+    FragmentUtils.getParentUnsafe(this, SearchFragmentListener.class).requestingPermission();
     requestPermissions(deniedPermissions, LOCATION_PERMISSION_REQUEST_CODE);
   }
 
@@ -509,28 +537,27 @@
 
   @Override
   public void placeVoiceCall(String phoneNumber, int ranking) {
-    placeCall(phoneNumber, ranking, false, true);
+    placeCall(phoneNumber, ranking, false);
   }
 
   @Override
   public void placeVideoCall(String phoneNumber, int ranking) {
-    placeCall(phoneNumber, ranking, true, false);
+    placeCall(phoneNumber, ranking, true);
   }
 
-  private void placeCall(
-      String phoneNumber, int position, boolean isVideoCall, boolean allowAssistedDial) {
+  private void placeCall(String phoneNumber, int position, boolean isVideoCall) {
     CallSpecificAppData callSpecificAppData =
         CallSpecificAppData.newBuilder()
             .setCallInitiationType(callInitiationType)
             .setPositionOfSelectedSearchResult(position)
             .setCharactersInSearchString(query == null ? 0 : query.length())
-            .setAllowAssistedDialing(allowAssistedDial)
+            .setAllowAssistedDialing(true)
             .build();
     PreCall.start(
         getContext(),
         new CallIntentBuilder(phoneNumber, callSpecificAppData)
             .setIsVideoCall(isVideoCall)
-            .setAllowAssistedDial(allowAssistedDial));
+            .setAllowAssistedDial(true));
     FragmentUtils.getParentUnsafe(this, SearchFragmentListener.class).onCallPlacedFromSearch();
   }
 
@@ -538,8 +565,11 @@
   public void placeDuoCall(String phoneNumber) {
     Logger.get(getContext())
         .logImpression(DialerImpression.Type.LIGHTBRINGER_VIDEO_REQUESTED_FROM_SEARCH);
-    Intent intent = DuoComponent.get(getContext()).getDuo().getIntent(getContext(), phoneNumber);
-    getActivity().startActivityForResult(intent, ActivityRequestCodes.DIALTACTS_DUO);
+    PreCall.start(
+        getContext(),
+        new CallIntentBuilder(phoneNumber, CallInitiationType.Type.REGULAR_SEARCH)
+            .setIsVideoCall(true)
+            .setIsDuoCall(true));
     FragmentUtils.getParentUnsafe(this, SearchFragmentListener.class).onCallPlacedFromSearch();
   }
 
@@ -557,5 +587,8 @@
 
     /** Called when a call is placed from the search fragment. */
     void onCallPlacedFromSearch();
+
+    /** Called when a permission is about to be requested. */
+    void requestingPermission();
   }
 }
diff --git a/java/com/android/dialer/searchfragment/list/SearchActionViewHolder.java b/java/com/android/dialer/searchfragment/list/SearchActionViewHolder.java
index 76c71d6..7315e89 100644
--- a/java/com/android/dialer/searchfragment/list/SearchActionViewHolder.java
+++ b/java/com/android/dialer/searchfragment/list/SearchActionViewHolder.java
@@ -26,13 +26,10 @@
 import android.view.View.OnClickListener;
 import android.widget.ImageView;
 import android.widget.TextView;
-import com.android.dialer.callintent.CallInitiationType;
-import com.android.dialer.callintent.CallIntentBuilder;
-import com.android.dialer.callintent.CallSpecificAppData;
 import com.android.dialer.common.Assert;
 import com.android.dialer.logging.DialerImpression;
 import com.android.dialer.logging.Logger;
-import com.android.dialer.precall.PreCall;
+import com.android.dialer.searchfragment.common.RowClickListener;
 import com.android.dialer.util.DialerUtils;
 import com.android.dialer.util.IntentUtil;
 import java.lang.annotation.Retention;
@@ -70,25 +67,25 @@
   private final Context context;
   private final ImageView actionImage;
   private final TextView actionText;
+  private final RowClickListener listener;
 
   private @Action int action;
   private int position;
   private String query;
-  private CallInitiationType.Type callInitiationType;
 
-  SearchActionViewHolder(View view) {
+  SearchActionViewHolder(View view, RowClickListener listener) {
     super(view);
     context = view.getContext();
     actionImage = view.findViewById(R.id.search_action_image);
     actionText = view.findViewById(R.id.search_action_text);
+    this.listener = listener;
     view.setOnClickListener(this);
   }
 
-  void setAction(@Action int action, int position, String query, CallInitiationType.Type type) {
+  void setAction(@Action int action, int position, String query) {
     this.action = action;
     this.position = position;
     this.query = query;
-    this.callInitiationType = type;
     switch (action) {
       case Action.ADD_TO_CONTACT:
         actionText.setText(R.string.search_shortcut_add_to_contact);
@@ -113,7 +110,6 @@
       case Action.INVALID:
       default:
         throw Assert.createIllegalStateFailException("Invalid action: " + action);
-
     }
   }
 
@@ -140,14 +136,7 @@
         break;
 
       case Action.MAKE_VILTE_CALL:
-        CallSpecificAppData videoCallSpecificAppData =
-            CallSpecificAppData.newBuilder()
-                .setCallInitiationType(callInitiationType)
-                .setPositionOfSelectedSearchResult(position)
-                .setCharactersInSearchString(query.length())
-                .build();
-        PreCall.start(
-            context, new CallIntentBuilder(query, videoCallSpecificAppData).setIsVideoCall(true));
+        listener.placeVideoCall(query, position);
         break;
 
       case Action.SEND_SMS:
@@ -156,13 +145,7 @@
         break;
 
       case Action.MAKE_VOICE_CALL:
-        CallSpecificAppData voiceCallSpecificAppData =
-            CallSpecificAppData.newBuilder()
-                .setCallInitiationType(callInitiationType)
-                .setPositionOfSelectedSearchResult(position)
-                .setCharactersInSearchString(query.length())
-                .build();
-        PreCall.start(context, new CallIntentBuilder(query, voiceCallSpecificAppData));
+        listener.placeVoiceCall(query, position);
         break;
 
       case Action.INVALID:
diff --git a/java/com/android/dialer/searchfragment/list/SearchAdapter.java b/java/com/android/dialer/searchfragment/list/SearchAdapter.java
index 4624269..74b60c6 100644
--- a/java/com/android/dialer/searchfragment/list/SearchAdapter.java
+++ b/java/com/android/dialer/searchfragment/list/SearchAdapter.java
@@ -26,7 +26,6 @@
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.ViewGroup;
-import com.android.dialer.callintent.CallInitiationType;
 import com.android.dialer.common.Assert;
 import com.android.dialer.searchfragment.common.RowClickListener;
 import com.android.dialer.searchfragment.common.SearchCursor;
@@ -43,12 +42,10 @@
   private final SearchCursorManager searchCursorManager;
   private final Context context;
 
-  private boolean showZeroSuggest;
   private String query;
   // Raw query number from dialpad, which may contain special character such as "+". This is used
   // for actions to add contact or send sms.
   private String rawNumber;
-  private CallInitiationType.Type callInitiationType;
   private OnClickListener allowClickListener;
   private OnClickListener dismissClickListener;
   private RowClickListener rowClickListener;
@@ -70,7 +67,8 @@
             rowClickListener);
       case RowType.NEARBY_PLACES_ROW:
         return new NearbyPlaceViewHolder(
-            LayoutInflater.from(context).inflate(R.layout.search_contact_row, root, false));
+            LayoutInflater.from(context).inflate(R.layout.search_contact_row, root, false),
+            rowClickListener);
       case RowType.CONTACT_HEADER:
       case RowType.DIRECTORY_HEADER:
       case RowType.NEARBY_PLACES_HEADER:
@@ -78,10 +76,12 @@
             LayoutInflater.from(context).inflate(R.layout.header_layout, root, false));
       case RowType.DIRECTORY_ROW:
         return new DirectoryContactViewHolder(
-            LayoutInflater.from(context).inflate(R.layout.search_contact_row, root, false));
+            LayoutInflater.from(context).inflate(R.layout.search_contact_row, root, false),
+            rowClickListener);
       case RowType.SEARCH_ACTION:
         return new SearchActionViewHolder(
-            LayoutInflater.from(context).inflate(R.layout.search_action_layout, root, false));
+            LayoutInflater.from(context).inflate(R.layout.search_action_layout, root, false),
+            rowClickListener);
       case RowType.LOCATION_REQUEST:
         return new LocationPermissionViewHolder(
             LayoutInflater.from(context).inflate(R.layout.location_permission_row, root, false),
@@ -115,8 +115,7 @@
           .setAction(
               searchCursorManager.getSearchAction(position),
               position,
-              TextUtils.isEmpty(rawNumber) ? query : rawNumber,
-              callInitiationType);
+              TextUtils.isEmpty(rawNumber) ? query : rawNumber);
     } else if (holder instanceof LocationPermissionViewHolder) {
       // No-op
     } else {
@@ -138,25 +137,12 @@
 
   @Override
   public int getItemCount() {
-    if (TextUtils.isEmpty(query) && !showZeroSuggest) {
-      return 0;
-    }
     return searchCursorManager.getCount();
   }
 
-  /**
-   * @param visible If true and query is empty, the adapter won't show any list elements.
-   * @see #setQuery(String, String, CallInitiationType.Type)
-   * @see #getItemCount()
-   */
-  public void setZeroSuggestVisible(boolean visible) {
-    showZeroSuggest = visible;
-  }
-
-  public void setQuery(String query, @Nullable String rawNumber, CallInitiationType.Type type) {
+  public void setQuery(String query, @Nullable String rawNumber) {
     this.query = query;
     this.rawNumber = rawNumber;
-    this.callInitiationType = type;
     if (searchCursorManager.setQuery(query)) {
       notifyDataSetChanged();
     }
diff --git a/java/com/android/dialer/searchfragment/list/res/layout/fragment_search.xml b/java/com/android/dialer/searchfragment/list/res/layout/fragment_search.xml
index cde9cb6..3037067 100644
--- a/java/com/android/dialer/searchfragment/list/res/layout/fragment_search.xml
+++ b/java/com/android/dialer/searchfragment/list/res/layout/fragment_search.xml
@@ -23,12 +23,12 @@
       android:id="@+id/recycler_view"
       android:layout_width="match_parent"
       android:layout_height="match_parent"
-      android:background="@color/background_dialer_light"/>
+      android:background="?android:attr/colorBackground"/>
 
   <com.android.dialer.widget.EmptyContentView
       android:id="@+id/empty_view"
       android:layout_width="match_parent"
       android:layout_height="match_parent"
       android:visibility="gone"
-      android:background="@color/background_dialer_light"/>
+      android:background="?android:attr/colorBackground"/>
 </FrameLayout>
diff --git a/java/com/android/dialer/searchfragment/list/res/layout/header_layout.xml b/java/com/android/dialer/searchfragment/list/res/layout/header_layout.xml
index 6eb1d2e..ff59206 100644
--- a/java/com/android/dialer/searchfragment/list/res/layout/header_layout.xml
+++ b/java/com/android/dialer/searchfragment/list/res/layout/header_layout.xml
@@ -27,5 +27,5 @@
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_gravity="center_vertical"
-      style="@style/SecondaryText"/>
+      style="@style/Dialer.TextAppearance.Secondary.Ellipsize"/>
 </FrameLayout>
diff --git a/java/com/android/dialer/searchfragment/list/res/layout/search_action_layout.xml b/java/com/android/dialer/searchfragment/list/res/layout/search_action_layout.xml
index 99d0fbf..b6e3048 100644
--- a/java/com/android/dialer/searchfragment/list/res/layout/search_action_layout.xml
+++ b/java/com/android/dialer/searchfragment/list/res/layout/search_action_layout.xml
@@ -24,9 +24,9 @@
       android:layout_width="48dp"
       android:layout_height="48dp"
       android:layout_marginStart="8dp"
-      android:layout_gravity="center_vertical"
+      android:layout_gravity="center_vertical|start"
       android:padding="12dp"
-      android:tint="@color/dialer_theme_color"/>
+      android:tint="?android:attr/colorPrimary"/>
 
   <TextView
       android:id="@+id/search_action_text"
@@ -35,5 +35,5 @@
       android:layout_marginStart="72dp"
       android:layout_marginEnd="16dp"
       android:layout_gravity="center_vertical"
-      style="@style/PrimaryText"/>
+      style="@style/Dialer.TextAppearance.Primary"/>
 </FrameLayout>
\ No newline at end of file
diff --git a/java/com/android/dialer/searchfragment/list/res/values-af/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-af/strings.xml
index d2f1a29..8e109ca 100644
--- a/java/com/android/dialer/searchfragment/list/res/values-af/strings.xml
+++ b/java/com/android/dialer/searchfragment/list/res/values-af/strings.xml
@@ -1,25 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_permission_no_search" msgid="6107959563874740441">"Skakel die Kontakte-toestemmings aan om jou kontakte te deursoek."</string>
-    <string name="search_shortcut_create_new_contact" msgid="1439862712551110400">"Skep nuwe kontak"</string>
-    <string name="search_shortcut_add_to_contact" msgid="3973534599468326173">"Voeg by \'n kontak"</string>
-    <string name="search_shortcut_send_sms_message" msgid="6871818587632705560">"Stuur SMS"</string>
-    <string name="search_shortcut_make_video_call" msgid="3236284255758156964">"Maak video-oproep"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="new_permission_no_search">Skakel die Kontakte-toestemmings aan om jou kontakte te deursoek.</string>
+  <string name="search_shortcut_create_new_contact">Skep nuwe kontak</string>
+  <string name="search_shortcut_add_to_contact">Voeg by \'n kontak</string>
+  <string name="search_shortcut_send_sms_message">Stuur SMS</string>
+  <string name="search_shortcut_make_video_call">Maak video-oproep</string>
+  <string name="search_shortcut_make_voice_call">Bel %1$s</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-am/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-am/strings.xml
index 7b6d329..874f832 100644
--- a/java/com/android/dialer/searchfragment/list/res/values-am/strings.xml
+++ b/java/com/android/dialer/searchfragment/list/res/values-am/strings.xml
@@ -1,25 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_permission_no_search" msgid="6107959563874740441">"እውቂያዎችዎን ለመፈለግ፣ የእውቂያዎች ፈቃዶችን ያብሩ።"</string>
-    <string name="search_shortcut_create_new_contact" msgid="1439862712551110400">"አዲስ እውቂያ ፍጠር"</string>
-    <string name="search_shortcut_add_to_contact" msgid="3973534599468326173">"ወደ እውቂያ አክል"</string>
-    <string name="search_shortcut_send_sms_message" msgid="6871818587632705560">"ኤስኤምኤስ ላክ"</string>
-    <string name="search_shortcut_make_video_call" msgid="3236284255758156964">"የቪዲዮ ጥሪ ያድርጉ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="new_permission_no_search">እውቂያዎችዎን ለመፈለግ፣ የእውቂያዎች ፈቃዶችን ያብሩ።</string>
+  <string name="search_shortcut_create_new_contact">አዲስ እውቂያ ይፍጠሩ</string>
+  <string name="search_shortcut_add_to_contact">ወደ እውቂያ አክል</string>
+  <string name="search_shortcut_send_sms_message">ኤስኤምኤስ ላክ</string>
+  <string name="search_shortcut_make_video_call">የቪዲዮ ጥሪ አድርግ</string>
+  <string name="search_shortcut_make_voice_call">ወደ %1$s ይደውሉ</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-ar/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-ar/strings.xml
index f0f0a9c..48ac855 100644
--- a/java/com/android/dialer/searchfragment/list/res/values-ar/strings.xml
+++ b/java/com/android/dialer/searchfragment/list/res/values-ar/strings.xml
@@ -1,25 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_permission_no_search" msgid="6107959563874740441">"عليك تشغيل أذونات جهات الاتصال للبحث عنا"</string>
-    <string name="search_shortcut_create_new_contact" msgid="1439862712551110400">"إنشاء جهة اتصال"</string>
-    <string name="search_shortcut_add_to_contact" msgid="3973534599468326173">"إضافة إلى جهة اتصال"</string>
-    <string name="search_shortcut_send_sms_message" msgid="6871818587632705560">"‏إرسال رسائل قصيرة SMS"</string>
-    <string name="search_shortcut_make_video_call" msgid="3236284255758156964">"إجراء مكالمة فيديو"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="new_permission_no_search">عليك تشغيل أذونات جهات الاتصال للبحث عنا</string>
+  <string name="search_shortcut_create_new_contact">إنشاء جهة اتصال جديدة</string>
+  <string name="search_shortcut_add_to_contact">إضافة إلى جهة اتصال</string>
+  <string name="search_shortcut_send_sms_message">‏إرسال رسالة قصيرة SMS</string>
+  <string name="search_shortcut_make_video_call">إجراء مكالمة فيديو</string>
+  <string name="search_shortcut_make_voice_call">الاتصال بالرقم %1$s</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-az/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-az/strings.xml
index 76a090a..da7c82d 100644
--- a/java/com/android/dialer/searchfragment/list/res/values-az/strings.xml
+++ b/java/com/android/dialer/searchfragment/list/res/values-az/strings.xml
@@ -1,25 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_permission_no_search" msgid="6107959563874740441">"Kontaktlarınızı axtarmaq üçün Kontakt icazələrini aktiv edin."</string>
-    <string name="search_shortcut_create_new_contact" msgid="1439862712551110400">"Yeni kontakt yaradın"</string>
-    <string name="search_shortcut_add_to_contact" msgid="3973534599468326173">"Kontakta əlavə edin"</string>
-    <string name="search_shortcut_send_sms_message" msgid="6871818587632705560">"SMS göndərin"</string>
-    <string name="search_shortcut_make_video_call" msgid="3236284255758156964">"Video zəng edin"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="new_permission_no_search">Kontaktlarınızı axtarmaq üçün Kontakt icazələrini aktiv edin.</string>
+  <string name="search_shortcut_create_new_contact">Yeni kontakt yaradın</string>
+  <string name="search_shortcut_add_to_contact">Kontakta əlavə edin</string>
+  <string name="search_shortcut_send_sms_message">SMS göndərin</string>
+  <string name="search_shortcut_make_video_call">Video zəng edin</string>
+  <string name="search_shortcut_make_voice_call">%1$s nömrəsinə zəng edin</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-b+sr+Latn/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-b+sr+Latn/strings.xml
index 7b88082..1d7cdd2 100644
--- a/java/com/android/dialer/searchfragment/list/res/values-b+sr+Latn/strings.xml
+++ b/java/com/android/dialer/searchfragment/list/res/values-b+sr+Latn/strings.xml
@@ -1,25 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_permission_no_search" msgid="6107959563874740441">"Da biste pretražili kontakte, uključite dozvole za Kontakte."</string>
-    <string name="search_shortcut_create_new_contact" msgid="1439862712551110400">"Napravi novi kontakt"</string>
-    <string name="search_shortcut_add_to_contact" msgid="3973534599468326173">"Dodaj u kontakt"</string>
-    <string name="search_shortcut_send_sms_message" msgid="6871818587632705560">"Pošalji SMS"</string>
-    <string name="search_shortcut_make_video_call" msgid="3236284255758156964">"Uputi video poziv"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="new_permission_no_search">Da biste pretražili kontakte, uključite dozvole za Kontakte.</string>
+  <string name="search_shortcut_create_new_contact">Napravi novi kontakt</string>
+  <string name="search_shortcut_add_to_contact">Dodaj u kontakt</string>
+  <string name="search_shortcut_send_sms_message">Pošalji SMS</string>
+  <string name="search_shortcut_make_video_call">Uputi video poziv</string>
+  <string name="search_shortcut_make_voice_call">Pozovi %1$s</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-be/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-be/strings.xml
index f4584d4..f903830 100644
--- a/java/com/android/dialer/searchfragment/list/res/values-be/strings.xml
+++ b/java/com/android/dialer/searchfragment/list/res/values-be/strings.xml
@@ -1,25 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_permission_no_search" msgid="6107959563874740441">"Каб шукаць свае кантакты, уключыце дазвол для Кантактаў."</string>
-    <string name="search_shortcut_create_new_contact" msgid="1439862712551110400">"Новы кантакт"</string>
-    <string name="search_shortcut_add_to_contact" msgid="3973534599468326173">"Дадаць у кантакт"</string>
-    <string name="search_shortcut_send_sms_message" msgid="6871818587632705560">"Адправіць SMS"</string>
-    <string name="search_shortcut_make_video_call" msgid="3236284255758156964">"Зрабіць відэавыклік"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="new_permission_no_search">Каб шукаць свае кантакты, уключыце дазвол для Кантактаў.</string>
+  <string name="search_shortcut_create_new_contact">Новы кантакт</string>
+  <string name="search_shortcut_add_to_contact">Дадаць у кантакт</string>
+  <string name="search_shortcut_send_sms_message">Адправiць SMS</string>
+  <string name="search_shortcut_make_video_call">Зрабіць відэавыклік</string>
+  <string name="search_shortcut_make_voice_call">Выклікаць %1$s</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-bg/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-bg/strings.xml
index 242a71e..483c11e 100644
--- a/java/com/android/dialer/searchfragment/list/res/values-bg/strings.xml
+++ b/java/com/android/dialer/searchfragment/list/res/values-bg/strings.xml
@@ -1,25 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_permission_no_search" msgid="6107959563874740441">"За да търсите в контактите си, включете разрешенията за тях."</string>
-    <string name="search_shortcut_create_new_contact" msgid="1439862712551110400">"Създаване на нов контакт"</string>
-    <string name="search_shortcut_add_to_contact" msgid="3973534599468326173">"Добавяне към контакт"</string>
-    <string name="search_shortcut_send_sms_message" msgid="6871818587632705560">"Изпращане на SMS"</string>
-    <string name="search_shortcut_make_video_call" msgid="3236284255758156964">"Видеообаждане"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="new_permission_no_search">За да търсите в контактите си, включете разрешенията за тях.</string>
+  <string name="search_shortcut_create_new_contact">Създаване на нов контакт</string>
+  <string name="search_shortcut_add_to_contact">Добавяне към контакт</string>
+  <string name="search_shortcut_send_sms_message">Изпращане на SMS</string>
+  <string name="search_shortcut_make_video_call">Провеждане на видеообаждане</string>
+  <string name="search_shortcut_make_voice_call">Обаждане на %1$s</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-bn/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-bn/strings.xml
index 00690b1..0c093f1 100644
--- a/java/com/android/dialer/searchfragment/list/res/values-bn/strings.xml
+++ b/java/com/android/dialer/searchfragment/list/res/values-bn/strings.xml
@@ -1,25 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_permission_no_search" msgid="6107959563874740441">"আপনার পরিচিতিগুলি অনুসন্ধান করতে, পরিচিতির অনুমতিগুলি চালু করুন।"</string>
-    <string name="search_shortcut_create_new_contact" msgid="1439862712551110400">"নতুন পরিচিতি তৈরি করুন"</string>
-    <string name="search_shortcut_add_to_contact" msgid="3973534599468326173">"একটি পরিচিতিতে যোগ করুন"</string>
-    <string name="search_shortcut_send_sms_message" msgid="6871818587632705560">"এসএমএস পাঠান"</string>
-    <string name="search_shortcut_make_video_call" msgid="3236284255758156964">"ভিডিও কল করুন"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="new_permission_no_search">আপনার পরিচিতিগুলি সার্চ করতে, পরিচিতির অনুমতিগুলি চালু করুন।</string>
+  <string name="search_shortcut_create_new_contact">নতুন পরিচিতি বানান</string>
+  <string name="search_shortcut_add_to_contact">একটি পরিচিতিতে যোগ করুন</string>
+  <string name="search_shortcut_send_sms_message">SMS পাঠান</string>
+  <string name="search_shortcut_make_video_call">ভিডিও কল করুন</string>
+  <string name="search_shortcut_make_voice_call">%1$s এ কল করুন</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-bs/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-bs/strings.xml
index 5448120..c5b39a2 100644
--- a/java/com/android/dialer/searchfragment/list/res/values-bs/strings.xml
+++ b/java/com/android/dialer/searchfragment/list/res/values-bs/strings.xml
@@ -1,25 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_permission_no_search" msgid="6107959563874740441">"Da pretražujete kontakte, uključite dozvole za Kontakte."</string>
-    <string name="search_shortcut_create_new_contact" msgid="1439862712551110400">"Kreiraj novi kontakt"</string>
-    <string name="search_shortcut_add_to_contact" msgid="3973534599468326173">"Dodaj u kontakt"</string>
-    <string name="search_shortcut_send_sms_message" msgid="6871818587632705560">"Pošalji SMS"</string>
-    <string name="search_shortcut_make_video_call" msgid="3236284255758156964">"Uputi videopoziv"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="new_permission_no_search">Da pretražujete kontakte, uključite odobrenja za Kontakte.</string>
+  <string name="search_shortcut_create_new_contact">Izrada novog kontakta</string>
+  <string name="search_shortcut_add_to_contact">Dodaj u kontakt</string>
+  <string name="search_shortcut_send_sms_message">Pošalji SMS</string>
+  <string name="search_shortcut_make_video_call">Uputi video poziv</string>
+  <string name="search_shortcut_make_voice_call">Pozvati %1$s</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-ca/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-ca/strings.xml
index dda184e..431dbdc 100644
--- a/java/com/android/dialer/searchfragment/list/res/values-ca/strings.xml
+++ b/java/com/android/dialer/searchfragment/list/res/values-ca/strings.xml
@@ -1,25 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_permission_no_search" msgid="6107959563874740441">"Activa els permisos de Contactes per cercar els teus contactes."</string>
-    <string name="search_shortcut_create_new_contact" msgid="1439862712551110400">"Crea un contacte"</string>
-    <string name="search_shortcut_add_to_contact" msgid="3973534599468326173">"Afegeix a un contacte"</string>
-    <string name="search_shortcut_send_sms_message" msgid="6871818587632705560">"Envia un SMS"</string>
-    <string name="search_shortcut_make_video_call" msgid="3236284255758156964">"Fes una videotrucada"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="new_permission_no_search">Activa els permisos de Contactes per cercar els teus contactes.</string>
+  <string name="search_shortcut_create_new_contact">Crea un contacte</string>
+  <string name="search_shortcut_add_to_contact">Afegeix a un contacte</string>
+  <string name="search_shortcut_send_sms_message">Envia SMS</string>
+  <string name="search_shortcut_make_video_call">Fes una videotrucada</string>
+  <string name="search_shortcut_make_voice_call">Truca al %1$s</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-cs/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-cs/strings.xml
index b56b1da..0e282b4 100644
--- a/java/com/android/dialer/searchfragment/list/res/values-cs/strings.xml
+++ b/java/com/android/dialer/searchfragment/list/res/values-cs/strings.xml
@@ -1,25 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_permission_no_search" msgid="6107959563874740441">"Chcete-li vyhledat kontakty, zapněte oprávnění Kontakty."</string>
-    <string name="search_shortcut_create_new_contact" msgid="1439862712551110400">"Vytvořit nový kontakt"</string>
-    <string name="search_shortcut_add_to_contact" msgid="3973534599468326173">"Přidat ke kontaktu"</string>
-    <string name="search_shortcut_send_sms_message" msgid="6871818587632705560">"Poslat SMS"</string>
-    <string name="search_shortcut_make_video_call" msgid="3236284255758156964">"Zahájit videohovor"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="new_permission_no_search">Chcete-li vyhledat kontakty, zapněte oprávnění Kontakty.</string>
+  <string name="search_shortcut_create_new_contact">Vytvořit nový kontakt</string>
+  <string name="search_shortcut_add_to_contact">Přidat ke kontaktu</string>
+  <string name="search_shortcut_send_sms_message">Odeslat SMS</string>
+  <string name="search_shortcut_make_video_call">Uskutečnit videohovor</string>
+  <string name="search_shortcut_make_voice_call">Zavolat na číslo %1$s</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-da/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-da/strings.xml
index 61c9034..21ba83c 100644
--- a/java/com/android/dialer/searchfragment/list/res/values-da/strings.xml
+++ b/java/com/android/dialer/searchfragment/list/res/values-da/strings.xml
@@ -1,25 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_permission_no_search" msgid="6107959563874740441">"Slå tilladelser til Kontaktpersoner til for at søge i dine kontaktpersoner."</string>
-    <string name="search_shortcut_create_new_contact" msgid="1439862712551110400">"Opret ny kontaktperson"</string>
-    <string name="search_shortcut_add_to_contact" msgid="3973534599468326173">"Føj til en kontaktperson"</string>
-    <string name="search_shortcut_send_sms_message" msgid="6871818587632705560">"Send sms"</string>
-    <string name="search_shortcut_make_video_call" msgid="3236284255758156964">"Foretag videoopkald"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="new_permission_no_search">Slå tilladelser til Kontaktpersoner til for at søge i dine kontaktpersoner.</string>
+  <string name="search_shortcut_create_new_contact">Opret ny kontaktperson</string>
+  <string name="search_shortcut_add_to_contact">Føj til en kontaktperson</string>
+  <string name="search_shortcut_send_sms_message">Send sms</string>
+  <string name="search_shortcut_make_video_call">Foretag videoopkald</string>
+  <string name="search_shortcut_make_voice_call">Ring til %1$s</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-de/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-de/strings.xml
index 9d0bebd..1b99258 100644
--- a/java/com/android/dialer/searchfragment/list/res/values-de/strings.xml
+++ b/java/com/android/dialer/searchfragment/list/res/values-de/strings.xml
@@ -1,25 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_permission_no_search" msgid="6107959563874740441">"Aktiviere die Berechtigungen \"Kontakte\", um deine Kontakte zu suchen."</string>
-    <string name="search_shortcut_create_new_contact" msgid="1439862712551110400">"Neuen Kontakt erstellen"</string>
-    <string name="search_shortcut_add_to_contact" msgid="3973534599468326173">"Zu Kontakt hinzufügen"</string>
-    <string name="search_shortcut_send_sms_message" msgid="6871818587632705560">"SMS senden"</string>
-    <string name="search_shortcut_make_video_call" msgid="3236284255758156964">"Videoanruf starten"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="new_permission_no_search">Aktiviere die Berechtigungen \"Kontakte\", um deine Kontakte zu suchen.</string>
+  <string name="search_shortcut_create_new_contact">Neuen Kontakt erstellen</string>
+  <string name="search_shortcut_add_to_contact">Zu Kontakt hinzufügen</string>
+  <string name="search_shortcut_send_sms_message">SMS senden</string>
+  <string name="search_shortcut_make_video_call">Videoanruf starten</string>
+  <string name="search_shortcut_make_voice_call">%1$s anrufen</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-el/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-el/strings.xml
index 941728f..92c8ae1 100644
--- a/java/com/android/dialer/searchfragment/list/res/values-el/strings.xml
+++ b/java/com/android/dialer/searchfragment/list/res/values-el/strings.xml
@@ -1,25 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_permission_no_search" msgid="6107959563874740441">"Για να κάνετε αναζήτηση στις επαφές σας, ενεργοποιήστε τις άδειες \"Επαφές\"."</string>
-    <string name="search_shortcut_create_new_contact" msgid="1439862712551110400">"Δημιουργία νέας επαφής"</string>
-    <string name="search_shortcut_add_to_contact" msgid="3973534599468326173">"Προσθήκη σε μια επαφή"</string>
-    <string name="search_shortcut_send_sms_message" msgid="6871818587632705560">"Αποστολή SMS"</string>
-    <string name="search_shortcut_make_video_call" msgid="3236284255758156964">"Πραγματοπ. βιντεοκλήσης"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="new_permission_no_search">Για να κάνετε αναζήτηση στις επαφές σας, ενεργοποιήστε τις άδειες \"Επαφές\".</string>
+  <string name="search_shortcut_create_new_contact">Δημιουργία νέας επαφής</string>
+  <string name="search_shortcut_add_to_contact">Προσθήκη σε μια επαφή</string>
+  <string name="search_shortcut_send_sms_message">Αποστολή SMS</string>
+  <string name="search_shortcut_make_video_call">Πραγματοποίηση βιντεοκλήσης</string>
+  <string name="search_shortcut_make_voice_call">Κλήση %1$s</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-en-rAU/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-en-rAU/strings.xml
index d49d818..4987cbe 100644
--- a/java/com/android/dialer/searchfragment/list/res/values-en-rAU/strings.xml
+++ b/java/com/android/dialer/searchfragment/list/res/values-en-rAU/strings.xml
@@ -1,25 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_permission_no_search" msgid="6107959563874740441">"To search your contacts, turn on the Contacts permissions."</string>
-    <string name="search_shortcut_create_new_contact" msgid="1439862712551110400">"Create new contact"</string>
-    <string name="search_shortcut_add_to_contact" msgid="3973534599468326173">"Add to a contact"</string>
-    <string name="search_shortcut_send_sms_message" msgid="6871818587632705560">"Send SMS"</string>
-    <string name="search_shortcut_make_video_call" msgid="3236284255758156964">"Make video call"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="new_permission_no_search">To search your contacts, turn on the Contacts permissions.</string>
+  <string name="search_shortcut_create_new_contact">Create new contact</string>
+  <string name="search_shortcut_add_to_contact">Add to a contact</string>
+  <string name="search_shortcut_send_sms_message">Send SMS</string>
+  <string name="search_shortcut_make_video_call">Make video call</string>
+  <string name="search_shortcut_make_voice_call">Call %1$s</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-en-rGB/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-en-rGB/strings.xml
index d49d818..4987cbe 100644
--- a/java/com/android/dialer/searchfragment/list/res/values-en-rGB/strings.xml
+++ b/java/com/android/dialer/searchfragment/list/res/values-en-rGB/strings.xml
@@ -1,25 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_permission_no_search" msgid="6107959563874740441">"To search your contacts, turn on the Contacts permissions."</string>
-    <string name="search_shortcut_create_new_contact" msgid="1439862712551110400">"Create new contact"</string>
-    <string name="search_shortcut_add_to_contact" msgid="3973534599468326173">"Add to a contact"</string>
-    <string name="search_shortcut_send_sms_message" msgid="6871818587632705560">"Send SMS"</string>
-    <string name="search_shortcut_make_video_call" msgid="3236284255758156964">"Make video call"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="new_permission_no_search">To search your contacts, turn on the Contacts permissions.</string>
+  <string name="search_shortcut_create_new_contact">Create new contact</string>
+  <string name="search_shortcut_add_to_contact">Add to a contact</string>
+  <string name="search_shortcut_send_sms_message">Send SMS</string>
+  <string name="search_shortcut_make_video_call">Make video call</string>
+  <string name="search_shortcut_make_voice_call">Call %1$s</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-en-rIN/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-en-rIN/strings.xml
index d49d818..4987cbe 100644
--- a/java/com/android/dialer/searchfragment/list/res/values-en-rIN/strings.xml
+++ b/java/com/android/dialer/searchfragment/list/res/values-en-rIN/strings.xml
@@ -1,25 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_permission_no_search" msgid="6107959563874740441">"To search your contacts, turn on the Contacts permissions."</string>
-    <string name="search_shortcut_create_new_contact" msgid="1439862712551110400">"Create new contact"</string>
-    <string name="search_shortcut_add_to_contact" msgid="3973534599468326173">"Add to a contact"</string>
-    <string name="search_shortcut_send_sms_message" msgid="6871818587632705560">"Send SMS"</string>
-    <string name="search_shortcut_make_video_call" msgid="3236284255758156964">"Make video call"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="new_permission_no_search">To search your contacts, turn on the Contacts permissions.</string>
+  <string name="search_shortcut_create_new_contact">Create new contact</string>
+  <string name="search_shortcut_add_to_contact">Add to a contact</string>
+  <string name="search_shortcut_send_sms_message">Send SMS</string>
+  <string name="search_shortcut_make_video_call">Make video call</string>
+  <string name="search_shortcut_make_voice_call">Call %1$s</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-es-rUS/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-es-rUS/strings.xml
index 18bec13..8565eb9 100644
--- a/java/com/android/dialer/searchfragment/list/res/values-es-rUS/strings.xml
+++ b/java/com/android/dialer/searchfragment/list/res/values-es-rUS/strings.xml
@@ -1,25 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_permission_no_search" msgid="6107959563874740441">"Para buscar contactos, activa el permiso Contactos."</string>
-    <string name="search_shortcut_create_new_contact" msgid="1439862712551110400">"Crear contacto nuevo"</string>
-    <string name="search_shortcut_add_to_contact" msgid="3973534599468326173">"Agregar a un contacto"</string>
-    <string name="search_shortcut_send_sms_message" msgid="6871818587632705560">"Enviar SMS"</string>
-    <string name="search_shortcut_make_video_call" msgid="3236284255758156964">"Realizar una videollamada"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="new_permission_no_search">Para buscar contactos, activa el permiso Contactos.</string>
+  <string name="search_shortcut_create_new_contact">Crear contacto nuevo</string>
+  <string name="search_shortcut_add_to_contact">Agregar a un contacto</string>
+  <string name="search_shortcut_send_sms_message">Enviar SMS</string>
+  <string name="search_shortcut_make_video_call">Realizar videollamada</string>
+  <string name="search_shortcut_make_voice_call">Llamar a %1$s</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-es/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-es/strings.xml
index 974e9e6..ef00fa5 100644
--- a/java/com/android/dialer/searchfragment/list/res/values-es/strings.xml
+++ b/java/com/android/dialer/searchfragment/list/res/values-es/strings.xml
@@ -1,25 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_permission_no_search" msgid="6107959563874740441">"Para buscar tus contactos, activa los permisos de Contactos."</string>
-    <string name="search_shortcut_create_new_contact" msgid="1439862712551110400">"Crear un contacto"</string>
-    <string name="search_shortcut_add_to_contact" msgid="3973534599468326173">"Añadir a un contacto"</string>
-    <string name="search_shortcut_send_sms_message" msgid="6871818587632705560">"Enviar SMS"</string>
-    <string name="search_shortcut_make_video_call" msgid="3236284255758156964">"Hacer videollamada"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="new_permission_no_search">Para buscar tus contactos, activa los permisos de Contactos.</string>
+  <string name="search_shortcut_create_new_contact">Crear nuevo contacto</string>
+  <string name="search_shortcut_add_to_contact">Añadir a un contacto</string>
+  <string name="search_shortcut_send_sms_message">Enviar SMS</string>
+  <string name="search_shortcut_make_video_call">Hacer videollamada</string>
+  <string name="search_shortcut_make_voice_call">Llamar al %1$s</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-et/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-et/strings.xml
index 3899e03..b06de58 100644
--- a/java/com/android/dialer/searchfragment/list/res/values-et/strings.xml
+++ b/java/com/android/dialer/searchfragment/list/res/values-et/strings.xml
@@ -1,25 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_permission_no_search" msgid="6107959563874740441">"Kontaktide otsimiseks lülitage sisse kontaktiload."</string>
-    <string name="search_shortcut_create_new_contact" msgid="1439862712551110400">"Uue kontakti loomine"</string>
-    <string name="search_shortcut_add_to_contact" msgid="3973534599468326173">"Kontaktile lisamine"</string>
-    <string name="search_shortcut_send_sms_message" msgid="6871818587632705560">"SMS-i saatmine"</string>
-    <string name="search_shortcut_make_video_call" msgid="3236284255758156964">"Videokõne tegemine"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="new_permission_no_search">Kontaktide otsimiseks lülitage sisse kontaktiload.</string>
+  <string name="search_shortcut_create_new_contact">Loo uus kontakt</string>
+  <string name="search_shortcut_add_to_contact">Lisa kontaktile</string>
+  <string name="search_shortcut_send_sms_message">Saada SMS</string>
+  <string name="search_shortcut_make_video_call">Videokõne tegemine</string>
+  <string name="search_shortcut_make_voice_call">Helista numbrile %1$s</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-eu/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-eu/strings.xml
index ebc0f1c..30d435b 100644
--- a/java/com/android/dialer/searchfragment/list/res/values-eu/strings.xml
+++ b/java/com/android/dialer/searchfragment/list/res/values-eu/strings.xml
@@ -1,25 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_permission_no_search" msgid="6107959563874740441">"Kontaktuak bilatzeko, eman kontaktuak atzitzeko baimena."</string>
-    <string name="search_shortcut_create_new_contact" msgid="1439862712551110400">"Sortu kontaktu bat"</string>
-    <string name="search_shortcut_add_to_contact" msgid="3973534599468326173">"Gehitu kontaktu batean"</string>
-    <string name="search_shortcut_send_sms_message" msgid="6871818587632705560">"Bidali SMS mezua"</string>
-    <string name="search_shortcut_make_video_call" msgid="3236284255758156964">"Egin bideo-deia"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="new_permission_no_search">Kontaktuak bilatzeko, eman kontaktuak atzitzeko baimena.</string>
+  <string name="search_shortcut_create_new_contact">Sortu kontaktua</string>
+  <string name="search_shortcut_add_to_contact">Gehitu kontaktuetan</string>
+  <string name="search_shortcut_send_sms_message">Bidali SMS mezua</string>
+  <string name="search_shortcut_make_video_call">Egin bideo-deia</string>
+  <string name="search_shortcut_make_voice_call">Deitu %1$s zenbakira</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-fa/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-fa/strings.xml
index 5eebb45..94e65e4 100644
--- a/java/com/android/dialer/searchfragment/list/res/values-fa/strings.xml
+++ b/java/com/android/dialer/searchfragment/list/res/values-fa/strings.xml
@@ -1,25 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_permission_no_search" msgid="6107959563874740441">"برای جستجوی مخاطبینتان، مجوزهای مخاطبین را روشن کنید."</string>
-    <string name="search_shortcut_create_new_contact" msgid="1439862712551110400">"ایجاد مخاطب جدید"</string>
-    <string name="search_shortcut_add_to_contact" msgid="3973534599468326173">"افزودن به مخاطب"</string>
-    <string name="search_shortcut_send_sms_message" msgid="6871818587632705560">"ارسال پیامک"</string>
-    <string name="search_shortcut_make_video_call" msgid="3236284255758156964">"برقراری تماس ویدیویی"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="new_permission_no_search">برای جستجوی مخاطبینتان، مجوزهای مخاطبین را روشن کنید.</string>
+  <string name="search_shortcut_create_new_contact">ایجاد مخاطب جدید</string>
+  <string name="search_shortcut_add_to_contact">افزودن به مخاطب</string>
+  <string name="search_shortcut_send_sms_message">ارسال پیامک</string>
+  <string name="search_shortcut_make_video_call">برقراری تماس ویدئویی</string>
+  <string name="search_shortcut_make_voice_call">تماس با %1$s</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-fi/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-fi/strings.xml
index 1a78e68..5855165 100644
--- a/java/com/android/dialer/searchfragment/list/res/values-fi/strings.xml
+++ b/java/com/android/dialer/searchfragment/list/res/values-fi/strings.xml
@@ -1,25 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_permission_no_search" msgid="6107959563874740441">"Jos haluat hakea kontaktejasi, ota käyttöön kontaktien käyttöoikeudet."</string>
-    <string name="search_shortcut_create_new_contact" msgid="1439862712551110400">"Luo uusi yhteystieto"</string>
-    <string name="search_shortcut_add_to_contact" msgid="3973534599468326173">"Lisää yhteystietoon"</string>
-    <string name="search_shortcut_send_sms_message" msgid="6871818587632705560">"Lähetä tekstiviesti"</string>
-    <string name="search_shortcut_make_video_call" msgid="3236284255758156964">"Soita videopuhelu"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="new_permission_no_search">Jos haluat hakea kontaktejasi, ota käyttöön kontaktien käyttöoikeudet.</string>
+  <string name="search_shortcut_create_new_contact">Luo uusi yhteystieto</string>
+  <string name="search_shortcut_add_to_contact">Lisää yhteystietoihin</string>
+  <string name="search_shortcut_send_sms_message">Lähetä tekstiviesti</string>
+  <string name="search_shortcut_make_video_call">Soita videopuhelu</string>
+  <string name="search_shortcut_make_voice_call">Soita numeroon %1$s</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-fr-rCA/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-fr-rCA/strings.xml
index 3ec4611..d156bcc 100644
--- a/java/com/android/dialer/searchfragment/list/res/values-fr-rCA/strings.xml
+++ b/java/com/android/dialer/searchfragment/list/res/values-fr-rCA/strings.xml
@@ -1,25 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_permission_no_search" msgid="6107959563874740441">"Pour rechercher vos contacts, activez les autorisations Contacts."</string>
-    <string name="search_shortcut_create_new_contact" msgid="1439862712551110400">"Créer un contact"</string>
-    <string name="search_shortcut_add_to_contact" msgid="3973534599468326173">"Ajouter à un contact"</string>
-    <string name="search_shortcut_send_sms_message" msgid="6871818587632705560">"Envoyer un message texte"</string>
-    <string name="search_shortcut_make_video_call" msgid="3236284255758156964">"Faire un appel vidéo"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="new_permission_no_search">Pour rechercher vos contacts, activez les autorisations Contacts.</string>
+  <string name="search_shortcut_create_new_contact">Créer un contact</string>
+  <string name="search_shortcut_add_to_contact">Ajouter à un contact</string>
+  <string name="search_shortcut_send_sms_message">Envoyer un texto</string>
+  <string name="search_shortcut_make_video_call">Faire un appel vidéo</string>
+  <string name="search_shortcut_make_voice_call">Composer le %1$s</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-fr/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-fr/strings.xml
index 276a366..2badd0c 100644
--- a/java/com/android/dialer/searchfragment/list/res/values-fr/strings.xml
+++ b/java/com/android/dialer/searchfragment/list/res/values-fr/strings.xml
@@ -1,25 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_permission_no_search" msgid="6107959563874740441">"Pour effectuer une recherche dans vos contacts, activez les autorisations de l\'application Contacts."</string>
-    <string name="search_shortcut_create_new_contact" msgid="1439862712551110400">"Créer un contact"</string>
-    <string name="search_shortcut_add_to_contact" msgid="3973534599468326173">"Ajouter à un contact"</string>
-    <string name="search_shortcut_send_sms_message" msgid="6871818587632705560">"Envoyer un SMS"</string>
-    <string name="search_shortcut_make_video_call" msgid="3236284255758156964">"Passer un appel vidéo"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="new_permission_no_search">Pour effectuer une recherche dans vos contacts, activez les autorisations de l\'application Contacts.</string>
+  <string name="search_shortcut_create_new_contact">Créer un contact</string>
+  <string name="search_shortcut_add_to_contact">Ajouter à un contact</string>
+  <string name="search_shortcut_send_sms_message">Envoyer un SMS</string>
+  <string name="search_shortcut_make_video_call">Passer un appel vidéo</string>
+  <string name="search_shortcut_make_voice_call">Composer le %1$s</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-gl/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-gl/strings.xml
index 994736b..ece496d 100644
--- a/java/com/android/dialer/searchfragment/list/res/values-gl/strings.xml
+++ b/java/com/android/dialer/searchfragment/list/res/values-gl/strings.xml
@@ -1,25 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_permission_no_search" msgid="6107959563874740441">"Para buscar os teus contactos, activa os permisos de Contactos."</string>
-    <string name="search_shortcut_create_new_contact" msgid="1439862712551110400">"Crear novo contacto"</string>
-    <string name="search_shortcut_add_to_contact" msgid="3973534599468326173">"Engadir a un contacto"</string>
-    <string name="search_shortcut_send_sms_message" msgid="6871818587632705560">"Enviar SMS"</string>
-    <string name="search_shortcut_make_video_call" msgid="3236284255758156964">"Realizar videochamada"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="new_permission_no_search">Para buscar os teus contactos, activa os permisos de Contactos.</string>
+  <string name="search_shortcut_create_new_contact">Crear novo contacto</string>
+  <string name="search_shortcut_add_to_contact">Engadir a un contacto</string>
+  <string name="search_shortcut_send_sms_message">Enviar SMS</string>
+  <string name="search_shortcut_make_video_call">Realizar unha videochamada</string>
+  <string name="search_shortcut_make_voice_call">Chamar ao %1$s</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-gu/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-gu/strings.xml
index 959d067..b245a83 100644
--- a/java/com/android/dialer/searchfragment/list/res/values-gu/strings.xml
+++ b/java/com/android/dialer/searchfragment/list/res/values-gu/strings.xml
@@ -1,25 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_permission_no_search" msgid="6107959563874740441">"તમારા સંપર્કો શોધવા માટે, સંપર્કોની પરવાનગીઓ ચાલુ કરો."</string>
-    <string name="search_shortcut_create_new_contact" msgid="1439862712551110400">"નવો સંપર્ક બનાવો"</string>
-    <string name="search_shortcut_add_to_contact" msgid="3973534599468326173">"સંપર્કમાં ઉમેરો"</string>
-    <string name="search_shortcut_send_sms_message" msgid="6871818587632705560">"SMS મોકલો"</string>
-    <string name="search_shortcut_make_video_call" msgid="3236284255758156964">"વીડિઓ કૉલ કરો"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="new_permission_no_search">તમારા સંપર્કો શોધવા માટે, સંપર્કોની પરવાનગીઓ ચાલુ કરો.</string>
+  <string name="search_shortcut_create_new_contact">નવો સંપર્ક બનાવો</string>
+  <string name="search_shortcut_add_to_contact">સંપર્કમાં ઉમેરો</string>
+  <string name="search_shortcut_send_sms_message">SMS મોકલો</string>
+  <string name="search_shortcut_make_video_call">વિડિઓ કૉલ કરો</string>
+  <string name="search_shortcut_make_voice_call">%1$sને કૉલ કરો</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-hi/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-hi/strings.xml
index 840c393..4690e30 100644
--- a/java/com/android/dialer/searchfragment/list/res/values-hi/strings.xml
+++ b/java/com/android/dialer/searchfragment/list/res/values-hi/strings.xml
@@ -1,25 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_permission_no_search" msgid="6107959563874740441">"अपने संपर्कों की खोज करने के लिए, संपर्क अनुमतियों को चालू करें."</string>
-    <string name="search_shortcut_create_new_contact" msgid="1439862712551110400">"नया संपर्क बनाएं"</string>
-    <string name="search_shortcut_add_to_contact" msgid="3973534599468326173">"किसी संपर्क में जोड़ें"</string>
-    <string name="search_shortcut_send_sms_message" msgid="6871818587632705560">"SMS भेजें"</string>
-    <string name="search_shortcut_make_video_call" msgid="3236284255758156964">"वीडियो कॉल करें"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="new_permission_no_search">अपने संपर्कों की खोज करने के लिए, संपर्क अनुमतियों को चालू करें.</string>
+  <string name="search_shortcut_create_new_contact">नया संपर्क बनाएं</string>
+  <string name="search_shortcut_add_to_contact">किसी संपर्क में जोड़ें</string>
+  <string name="search_shortcut_send_sms_message">SMS भेजें</string>
+  <string name="search_shortcut_make_video_call">वीडियो कॉल करें</string>
+  <string name="search_shortcut_make_voice_call">%1$s पर कॉल करें</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-hr/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-hr/strings.xml
index fcecda1..52f6da6 100644
--- a/java/com/android/dialer/searchfragment/list/res/values-hr/strings.xml
+++ b/java/com/android/dialer/searchfragment/list/res/values-hr/strings.xml
@@ -1,25 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_permission_no_search" msgid="6107959563874740441">"Da biste pretraživali kontakte, uključite dopuštenja za kontakte."</string>
-    <string name="search_shortcut_create_new_contact" msgid="1439862712551110400">"Izrada novog kontakta"</string>
-    <string name="search_shortcut_add_to_contact" msgid="3973534599468326173">"Dodavanje u kontakt"</string>
-    <string name="search_shortcut_send_sms_message" msgid="6871818587632705560">"Slanje SMS-a"</string>
-    <string name="search_shortcut_make_video_call" msgid="3236284255758156964">"Upućivanje videopoziva"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="new_permission_no_search">Da biste pretraživali kontakte, uključite dopuštenja za kontakte.</string>
+  <string name="search_shortcut_create_new_contact">Izrada novog kontakta</string>
+  <string name="search_shortcut_add_to_contact">Dodaj kontaktu</string>
+  <string name="search_shortcut_send_sms_message">Pošalji SMS</string>
+  <string name="search_shortcut_make_video_call">Uputite videopoziv</string>
+  <string name="search_shortcut_make_voice_call">Poziv na broj %1$s</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-hu/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-hu/strings.xml
index 0051f8f..01e1e01 100644
--- a/java/com/android/dialer/searchfragment/list/res/values-hu/strings.xml
+++ b/java/com/android/dialer/searchfragment/list/res/values-hu/strings.xml
@@ -1,25 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_permission_no_search" msgid="6107959563874740441">"A névjegyek kereséséhez engedélyezze a névjegyhozzáférést."</string>
-    <string name="search_shortcut_create_new_contact" msgid="1439862712551110400">"Új névjegy létrehozása"</string>
-    <string name="search_shortcut_add_to_contact" msgid="3973534599468326173">"Hozzáadás névjegyhez"</string>
-    <string name="search_shortcut_send_sms_message" msgid="6871818587632705560">"SMS küldése"</string>
-    <string name="search_shortcut_make_video_call" msgid="3236284255758156964">"Videohívás kezdeményezése"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="new_permission_no_search">A névjegyek kereséséhez engedélyezze a névjegyhozzáférést.</string>
+  <string name="search_shortcut_create_new_contact">Új névjegy létrehozása</string>
+  <string name="search_shortcut_add_to_contact">Hozzáadás névjegyhez</string>
+  <string name="search_shortcut_send_sms_message">SMS küldése</string>
+  <string name="search_shortcut_make_video_call">Videohívás kezdeményezése</string>
+  <string name="search_shortcut_make_voice_call">%1$s hívása</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-hy/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-hy/strings.xml
index aaab420..f0cbe0f 100644
--- a/java/com/android/dialer/searchfragment/list/res/values-hy/strings.xml
+++ b/java/com/android/dialer/searchfragment/list/res/values-hy/strings.xml
@@ -1,25 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_permission_no_search" msgid="6107959563874740441">"Կոնտակտները որոնելու համար միացրեք Կոնտակտների թույլտվությունները:"</string>
-    <string name="search_shortcut_create_new_contact" msgid="1439862712551110400">"Ստեղծել նոր կոնտակտ"</string>
-    <string name="search_shortcut_add_to_contact" msgid="3973534599468326173">"Ավելացնել կոնտակտին"</string>
-    <string name="search_shortcut_send_sms_message" msgid="6871818587632705560">"Ուղարկել SMS"</string>
-    <string name="search_shortcut_make_video_call" msgid="3236284255758156964">"Տեսազանգ սկսել"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="new_permission_no_search">Կոնտակտները որոնելու համար միացրեք Կոնտակտների թույլտվությունները:</string>
+  <string name="search_shortcut_create_new_contact">Ստեղծել նոր կոնտակտ</string>
+  <string name="search_shortcut_add_to_contact">Ավելացնել կոնտակտին</string>
+  <string name="search_shortcut_send_sms_message">Ուղարկել SMS</string>
+  <string name="search_shortcut_make_video_call">Տեսազանգ սկսել</string>
+  <string name="search_shortcut_make_voice_call">Զանգել %1$s համարին</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-in/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-in/strings.xml
index 81ea93e..b598a6c 100644
--- a/java/com/android/dialer/searchfragment/list/res/values-in/strings.xml
+++ b/java/com/android/dialer/searchfragment/list/res/values-in/strings.xml
@@ -1,25 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_permission_no_search" msgid="6107959563874740441">"Untuk menelusuri kontak, aktifkan izin Kontak."</string>
-    <string name="search_shortcut_create_new_contact" msgid="1439862712551110400">"Buat kontak baru"</string>
-    <string name="search_shortcut_add_to_contact" msgid="3973534599468326173">"Tambahkan ke kontak"</string>
-    <string name="search_shortcut_send_sms_message" msgid="6871818587632705560">"Kirim SMS"</string>
-    <string name="search_shortcut_make_video_call" msgid="3236284255758156964">"Lakukan video call"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="new_permission_no_search">Untuk menelusuri kontak, aktifkan izin Kontak.</string>
+  <string name="search_shortcut_create_new_contact">Buat kontak baru</string>
+  <string name="search_shortcut_add_to_contact">Tambahkan ke kontak</string>
+  <string name="search_shortcut_send_sms_message">Kirim SMS</string>
+  <string name="search_shortcut_make_video_call">Lakukan video call</string>
+  <string name="search_shortcut_make_voice_call">Telepon %1$s</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-is/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-is/strings.xml
index 3459e54..5701700 100644
--- a/java/com/android/dialer/searchfragment/list/res/values-is/strings.xml
+++ b/java/com/android/dialer/searchfragment/list/res/values-is/strings.xml
@@ -1,25 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_permission_no_search" msgid="6107959563874740441">"Kveiktu á heimildunum fyrir tengiliði til að leita að tengiliðum."</string>
-    <string name="search_shortcut_create_new_contact" msgid="1439862712551110400">"Búa til nýjan tengilið"</string>
-    <string name="search_shortcut_add_to_contact" msgid="3973534599468326173">"Bæta við tengilið"</string>
-    <string name="search_shortcut_send_sms_message" msgid="6871818587632705560">"Senda SMS"</string>
-    <string name="search_shortcut_make_video_call" msgid="3236284255758156964">"Hringja myndsímtal"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="new_permission_no_search">Kveiktu á heimildunum fyrir tengiliði til að leita að tengiliðum.</string>
+  <string name="search_shortcut_create_new_contact">Búa til nýjan tengilið</string>
+  <string name="search_shortcut_add_to_contact">Bæta við tengilið</string>
+  <string name="search_shortcut_send_sms_message">Senda SMS-skilaboð</string>
+  <string name="search_shortcut_make_video_call">Hringja myndsímtal</string>
+  <string name="search_shortcut_make_voice_call">Hringja í %1$s</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-it/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-it/strings.xml
index a0f92c9..8d60aeb 100644
--- a/java/com/android/dialer/searchfragment/list/res/values-it/strings.xml
+++ b/java/com/android/dialer/searchfragment/list/res/values-it/strings.xml
@@ -1,25 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_permission_no_search" msgid="6107959563874740441">"Per cercare nei tuoi contatti, attiva le autorizzazioni Contatti."</string>
-    <string name="search_shortcut_create_new_contact" msgid="1439862712551110400">"Crea nuovo contatto"</string>
-    <string name="search_shortcut_add_to_contact" msgid="3973534599468326173">"Aggiungi a un contatto"</string>
-    <string name="search_shortcut_send_sms_message" msgid="6871818587632705560">"Invia SMS"</string>
-    <string name="search_shortcut_make_video_call" msgid="3236284255758156964">"Avvia videochiamata"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="new_permission_no_search">Per cercare nei tuoi contatti, attiva le autorizzazioni Contatti.</string>
+  <string name="search_shortcut_create_new_contact">Crea nuovo contatto</string>
+  <string name="search_shortcut_add_to_contact">Aggiungi a un contatto</string>
+  <string name="search_shortcut_send_sms_message">Invia SMS</string>
+  <string name="search_shortcut_make_video_call">Fai una videochiamata</string>
+  <string name="search_shortcut_make_voice_call">Chiama %1$s</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-iw/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-iw/strings.xml
index 663fae8..39322cd 100644
--- a/java/com/android/dialer/searchfragment/list/res/values-iw/strings.xml
+++ b/java/com/android/dialer/searchfragment/list/res/values-iw/strings.xml
@@ -1,25 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_permission_no_search" msgid="6107959563874740441">"עליך להפעיל את ההרשאה \'אנשי קשר\' כדי לחפש באנשי הקשר שלך."</string>
-    <string name="search_shortcut_create_new_contact" msgid="1439862712551110400">"יצירת איש קשר חדש"</string>
-    <string name="search_shortcut_add_to_contact" msgid="3973534599468326173">"הוספה לאיש קשר קיים"</string>
-    <string name="search_shortcut_send_sms_message" msgid="6871818587632705560">"‏שליחת SMS"</string>
-    <string name="search_shortcut_make_video_call" msgid="3236284255758156964">"התקשרות בשיחת וידאו"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="new_permission_no_search">עליך להפעיל את ההרשאה \'אנשי קשר\' כדי לחפש באנשי הקשר שלך.</string>
+  <string name="search_shortcut_create_new_contact">איש קשר חדש</string>
+  <string name="search_shortcut_add_to_contact">הוסף לאיש קשר</string>
+  <string name="search_shortcut_send_sms_message">‏שלח SMS</string>
+  <string name="search_shortcut_make_video_call">בצע שיחת וידאו</string>
+  <string name="search_shortcut_make_voice_call">התקשרות אל %1$s</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-ja/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-ja/strings.xml
index f208074..d6c5b12 100644
--- a/java/com/android/dialer/searchfragment/list/res/values-ja/strings.xml
+++ b/java/com/android/dialer/searchfragment/list/res/values-ja/strings.xml
@@ -1,25 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_permission_no_search" msgid="6107959563874740441">"連絡先を検索するには、連絡先の権限を ON にしてください。"</string>
-    <string name="search_shortcut_create_new_contact" msgid="1439862712551110400">"新しい連絡先を作成"</string>
-    <string name="search_shortcut_add_to_contact" msgid="3973534599468326173">"既存の連絡先に追加"</string>
-    <string name="search_shortcut_send_sms_message" msgid="6871818587632705560">"SMS を送信"</string>
-    <string name="search_shortcut_make_video_call" msgid="3236284255758156964">"ビデオ通話を発信"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="new_permission_no_search">連絡先を検索するには、連絡先の権限を ON にしてください。</string>
+  <string name="search_shortcut_create_new_contact">新しい連絡先を作成</string>
+  <string name="search_shortcut_add_to_contact">連絡先に追加</string>
+  <string name="search_shortcut_send_sms_message">SMSを送信</string>
+  <string name="search_shortcut_make_video_call">ビデオハングアウト</string>
+  <string name="search_shortcut_make_voice_call">%1$s 宛に発信</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-ka/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-ka/strings.xml
index 7fff761..9d920a0 100644
--- a/java/com/android/dialer/searchfragment/list/res/values-ka/strings.xml
+++ b/java/com/android/dialer/searchfragment/list/res/values-ka/strings.xml
@@ -1,25 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_permission_no_search" msgid="6107959563874740441">"თქვენი კონტაქტების მოსაძებნად ჩართეთ კონტაქტების ნებართვები."</string>
-    <string name="search_shortcut_create_new_contact" msgid="1439862712551110400">"ახალი კონტაქტის შექმნა"</string>
-    <string name="search_shortcut_add_to_contact" msgid="3973534599468326173">"კონტაქტისთვის დამატება"</string>
-    <string name="search_shortcut_send_sms_message" msgid="6871818587632705560">"SMS-ის გაგზავნა"</string>
-    <string name="search_shortcut_make_video_call" msgid="3236284255758156964">"ვიდეოზარის განხორციელება"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="new_permission_no_search">თქვენი კონტაქტების მოსაძებნად ჩართეთ კონტაქტების ნებართვები.</string>
+  <string name="search_shortcut_create_new_contact">ახალი კონტაქტის შექმნა</string>
+  <string name="search_shortcut_add_to_contact">კონტაქტისადმი დამატება</string>
+  <string name="search_shortcut_send_sms_message">SMS-ის გაგზავნა</string>
+  <string name="search_shortcut_make_video_call">ვიდეოზარის განხორციელება</string>
+  <string name="search_shortcut_make_voice_call">%1$s-ზე დარეკვა</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-kk/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-kk/strings.xml
index c8929ae..b9f0eab 100644
--- a/java/com/android/dialer/searchfragment/list/res/values-kk/strings.xml
+++ b/java/com/android/dialer/searchfragment/list/res/values-kk/strings.xml
@@ -1,25 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_permission_no_search" msgid="6107959563874740441">"Контактілерді іздеу мүмкін болуы үшін, \"Контактілер\" рұқсаттарын қосыңыз."</string>
-    <string name="search_shortcut_create_new_contact" msgid="1439862712551110400">"Жаңа контакт жасау"</string>
-    <string name="search_shortcut_add_to_contact" msgid="3973534599468326173">"Контактіге қосу"</string>
-    <string name="search_shortcut_send_sms_message" msgid="6871818587632705560">"SMS жіберу"</string>
-    <string name="search_shortcut_make_video_call" msgid="3236284255758156964">"Бейне қоңырау шалу"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="new_permission_no_search">Контактілерді іздеу мүмкін болуы үшін, \"Контактілер\" рұқсаттарын қосыңыз.</string>
+  <string name="search_shortcut_create_new_contact">Жаңа контакт жасау</string>
+  <string name="search_shortcut_add_to_contact">Контактіге қосу</string>
+  <string name="search_shortcut_send_sms_message">SMS жіберу</string>
+  <string name="search_shortcut_make_video_call">Бейне қоңырау шалу</string>
+  <string name="search_shortcut_make_voice_call">Қоңырау шалу: %1$s</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-km/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-km/strings.xml
index 3926b8a..46444d8 100644
--- a/java/com/android/dialer/searchfragment/list/res/values-km/strings.xml
+++ b/java/com/android/dialer/searchfragment/list/res/values-km/strings.xml
@@ -1,25 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_permission_no_search" msgid="6107959563874740441">"ដើម្បីស្វែងរកទំនាក់ទំនងរបស់អ្នក សូមបើកការអនុញ្ញាតទំនាក់ទំនង។"</string>
-    <string name="search_shortcut_create_new_contact" msgid="1439862712551110400">"បង្កើត​ទំនាក់ទំនង​ថ្មី"</string>
-    <string name="search_shortcut_add_to_contact" msgid="3973534599468326173">"បញ្ចូល​ទៅទំនាក់ទំនង"</string>
-    <string name="search_shortcut_send_sms_message" msgid="6871818587632705560">"ផ្ញើ​សារ SMS"</string>
-    <string name="search_shortcut_make_video_call" msgid="3236284255758156964">"ហៅ​ជា​វីដេអូ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="new_permission_no_search">ដើម្បីស្វែងរកទំនាក់ទំនងរបស់អ្នក សូមបើកការអនុញ្ញាតទំនាក់ទំនង។</string>
+  <string name="search_shortcut_create_new_contact">បង្កើតទំនាក់ទំនងថ្មី</string>
+  <string name="search_shortcut_add_to_contact">បន្ថែមទៅទំនាក់ទំនង</string>
+  <string name="search_shortcut_send_sms_message">ផ្ញើសារ SMS</string>
+  <string name="search_shortcut_make_video_call">ការ​ហៅ​ជា​វីដេអូ</string>
+  <string name="search_shortcut_make_voice_call">ហៅ​ទូរសព្ទ​ទៅ​ %1$s</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-kn/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-kn/strings.xml
index 1d6a9ad..130ecf2 100644
--- a/java/com/android/dialer/searchfragment/list/res/values-kn/strings.xml
+++ b/java/com/android/dialer/searchfragment/list/res/values-kn/strings.xml
@@ -1,25 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_permission_no_search" msgid="6107959563874740441">"ನಿಮ್ಮ ಸಂಪರ್ಕಗಳನ್ನು ಹುಡುಕಲು, ಸಂಪರ್ಕಗಳ ಅನುಮತಿಗಳನ್ನು ಆನ್ ಮಾಡಿ."</string>
-    <string name="search_shortcut_create_new_contact" msgid="1439862712551110400">"ಹೊಸ ಸಂಪರ್ಕ ರಚಿಸಿ"</string>
-    <string name="search_shortcut_add_to_contact" msgid="3973534599468326173">"ಸಂಪರ್ಕಕ್ಕೆ ಸೇರಿಸು"</string>
-    <string name="search_shortcut_send_sms_message" msgid="6871818587632705560">"ಎಸ್‌ಎಂಎಸ್‌ ಕಳುಹಿಸಿ"</string>
-    <string name="search_shortcut_make_video_call" msgid="3236284255758156964">"ವೀಡಿಯೊ ಕರೆ ಮಾಡು"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="new_permission_no_search">ನಿಮ್ಮ ಸಂಪರ್ಕಗಳನ್ನು ಹುಡುಕಲು, ಸಂಪರ್ಕಗಳ ಅನುಮತಿಗಳನ್ನು ಆನ್ ಮಾಡಿ.</string>
+  <string name="search_shortcut_create_new_contact">ಹೊಸ ಸಂಪರ್ಕ ರಚಿಸು</string>
+  <string name="search_shortcut_add_to_contact">ಸಂಪರ್ಕಕ್ಕೆ ಸೇರಿಸು</string>
+  <string name="search_shortcut_send_sms_message">SMS ಕಳುಹಿಸು</string>
+  <string name="search_shortcut_make_video_call">ವೀಡಿಯೊ ಕರೆ ಮಾಡಿ</string>
+  <string name="search_shortcut_make_voice_call">%1$s ಗೆ ಕರೆಮಾಡಿ</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-ko/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-ko/strings.xml
index 9010d43..4d36e88 100644
--- a/java/com/android/dialer/searchfragment/list/res/values-ko/strings.xml
+++ b/java/com/android/dialer/searchfragment/list/res/values-ko/strings.xml
@@ -1,25 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_permission_no_search" msgid="6107959563874740441">"연락처를 검색하려면 연락처 권한을 사용하도록 설정하세요."</string>
-    <string name="search_shortcut_create_new_contact" msgid="1439862712551110400">"새 연락처 만들기"</string>
-    <string name="search_shortcut_add_to_contact" msgid="3973534599468326173">"연락처에 추가"</string>
-    <string name="search_shortcut_send_sms_message" msgid="6871818587632705560">"SMS 보내기"</string>
-    <string name="search_shortcut_make_video_call" msgid="3236284255758156964">"화상 통화하기"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="new_permission_no_search">연락처를 검색하려면 연락처 권한을 사용하도록 설정하세요.</string>
+  <string name="search_shortcut_create_new_contact">새 연락처 만들기</string>
+  <string name="search_shortcut_add_to_contact">연락처에 추가</string>
+  <string name="search_shortcut_send_sms_message">SMS 보내기</string>
+  <string name="search_shortcut_make_video_call">화상 통화하기</string>
+  <string name="search_shortcut_make_voice_call">%1$s(으)로 전화 걸기</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-ky/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-ky/strings.xml
index f51fd8f..92ea5b7 100644
--- a/java/com/android/dialer/searchfragment/list/res/values-ky/strings.xml
+++ b/java/com/android/dialer/searchfragment/list/res/values-ky/strings.xml
@@ -1,25 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_permission_no_search" msgid="6107959563874740441">"Байланыштарыңызды издөө үчүн, Байланыштарга уруксатты күйгүзүңүз."</string>
-    <string name="search_shortcut_create_new_contact" msgid="1439862712551110400">"Жаңы байланыш түзүү"</string>
-    <string name="search_shortcut_add_to_contact" msgid="3973534599468326173">"Байланышка кошуу"</string>
-    <string name="search_shortcut_send_sms_message" msgid="6871818587632705560">"SMS жөнөтүү"</string>
-    <string name="search_shortcut_make_video_call" msgid="3236284255758156964">"Видео чалуу"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="new_permission_no_search">Байланыштарыңызды издөө үчүн, Байланыштарга уруксатты күйгүзүңүз.</string>
+  <string name="search_shortcut_create_new_contact">Жаңы байланыш түзүү</string>
+  <string name="search_shortcut_add_to_contact">Байланышка кошуу</string>
+  <string name="search_shortcut_send_sms_message">SMS жөнөтүү</string>
+  <string name="search_shortcut_make_video_call">Видео түрүндө чалуу</string>
+  <string name="search_shortcut_make_voice_call">%1$s номерине чалуу</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-lo/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-lo/strings.xml
index 0d224b7..e3c23bd 100644
--- a/java/com/android/dialer/searchfragment/list/res/values-lo/strings.xml
+++ b/java/com/android/dialer/searchfragment/list/res/values-lo/strings.xml
@@ -1,25 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_permission_no_search" msgid="6107959563874740441">"ເພື່ອຊອກຫາລາຍຊື່ຂອງທ່ານ, ໃຫ້ອະນຸຍາດສິດການໃຊ້ລາຍຊື່ຜູ້ຕິດຕໍ່ກ່ອນ."</string>
-    <string name="search_shortcut_create_new_contact" msgid="1439862712551110400">"ສ້າງລາຍຊື່ຜູ້ຕິດຕໍ່ໃໝ່"</string>
-    <string name="search_shortcut_add_to_contact" msgid="3973534599468326173">"ເພີ່ມ​ໃສ່​ລາຍ​ຊື່"</string>
-    <string name="search_shortcut_send_sms_message" msgid="6871818587632705560">"ສົ່ງ SMS"</string>
-    <string name="search_shortcut_make_video_call" msgid="3236284255758156964">"ໂທວິດີໂອ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="new_permission_no_search">ເພື່ອຊອກຫາລາຍຊື່ຂອງທ່ານ, ໃຫ້ອະນຸຍາດສິດການໃຊ້ລາຍຊື່ຜູ້ຕິດຕໍ່ກ່ອນ.</string>
+  <string name="search_shortcut_create_new_contact">ສ້າງລາຍຊື່ຜູ້ຕິດຕໍ່ໃໝ່</string>
+  <string name="search_shortcut_add_to_contact">ເພີ່ມ​ໃສ່​ລາຍ​ຊື່</string>
+  <string name="search_shortcut_send_sms_message">ສົ່ງ SMS</string>
+  <string name="search_shortcut_make_video_call">​ໂທ​ອອກ​ດ້ວຍ​ວິ​ດີ​ໂອ</string>
+  <string name="search_shortcut_make_voice_call">ໂທຫາ %1$s</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-lt/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-lt/strings.xml
index 2bb1e54..0825b7e 100644
--- a/java/com/android/dialer/searchfragment/list/res/values-lt/strings.xml
+++ b/java/com/android/dialer/searchfragment/list/res/values-lt/strings.xml
@@ -1,25 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_permission_no_search" msgid="6107959563874740441">"Kad galėtumėte ieškoti kontaktų, įjunkite Kontaktų leidimus."</string>
-    <string name="search_shortcut_create_new_contact" msgid="1439862712551110400">"Sukurti naują kontaktą"</string>
-    <string name="search_shortcut_add_to_contact" msgid="3973534599468326173">"Pridėti prie kontakto"</string>
-    <string name="search_shortcut_send_sms_message" msgid="6871818587632705560">"Siųsti SMS"</string>
-    <string name="search_shortcut_make_video_call" msgid="3236284255758156964">"Atlikti vaizdo skambutį"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="new_permission_no_search">Kad galėtumėte ieškoti kontaktų, įjunkite Kontaktų leidimus.</string>
+  <string name="search_shortcut_create_new_contact">Kurti naują kontaktą</string>
+  <string name="search_shortcut_add_to_contact">Pridėti prie kontakto</string>
+  <string name="search_shortcut_send_sms_message">Siųsti SMS</string>
+  <string name="search_shortcut_make_video_call">Atlikti vaizdo skambutį</string>
+  <string name="search_shortcut_make_voice_call">Skambinti numeriu %1$s</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-lv/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-lv/strings.xml
index de6caff..88ca225 100644
--- a/java/com/android/dialer/searchfragment/list/res/values-lv/strings.xml
+++ b/java/com/android/dialer/searchfragment/list/res/values-lv/strings.xml
@@ -1,25 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_permission_no_search" msgid="6107959563874740441">"Lai meklētu savas kontaktpersonas, ieslēdziet atļauju Kontaktpersonas."</string>
-    <string name="search_shortcut_create_new_contact" msgid="1439862712551110400">"Jauna kontaktpersona"</string>
-    <string name="search_shortcut_add_to_contact" msgid="3973534599468326173">"Pievienot kontaktpersonai"</string>
-    <string name="search_shortcut_send_sms_message" msgid="6871818587632705560">"Sūtīt īsziņu"</string>
-    <string name="search_shortcut_make_video_call" msgid="3236284255758156964">"Veikt videozvanu"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="new_permission_no_search">Lai meklētu savas kontaktpersonas, ieslēdziet atļauju Kontaktpersonas.</string>
+  <string name="search_shortcut_create_new_contact">Izveidot jaunu kontaktpersonu</string>
+  <string name="search_shortcut_add_to_contact">Pievienot kontaktpersonai</string>
+  <string name="search_shortcut_send_sms_message">Sūtīt īsziņu</string>
+  <string name="search_shortcut_make_video_call">Veikt videozvanu</string>
+  <string name="search_shortcut_make_voice_call">Zvanīt: %1$s</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-mk/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-mk/strings.xml
index a4fcb5a..28c68de 100644
--- a/java/com/android/dialer/searchfragment/list/res/values-mk/strings.xml
+++ b/java/com/android/dialer/searchfragment/list/res/values-mk/strings.xml
@@ -1,25 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_permission_no_search" msgid="6107959563874740441">"За да ги пребарувате контактите, вклучете ги дозволите за контакти."</string>
-    <string name="search_shortcut_create_new_contact" msgid="1439862712551110400">"Создајте нов контакт"</string>
-    <string name="search_shortcut_add_to_contact" msgid="3973534599468326173">"Додајте на контакт"</string>
-    <string name="search_shortcut_send_sms_message" msgid="6871818587632705560">"Испратете SMS"</string>
-    <string name="search_shortcut_make_video_call" msgid="3236284255758156964">"Воспоставете видеоповик"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="new_permission_no_search">За да ги пребарувате контактите, вклучете ги дозволите за контакти.</string>
+  <string name="search_shortcut_create_new_contact">Создај нов контакт</string>
+  <string name="search_shortcut_add_to_contact">Додај на контакт</string>
+  <string name="search_shortcut_send_sms_message">Испрати SMS</string>
+  <string name="search_shortcut_make_video_call">Остварете видеоповик</string>
+  <string name="search_shortcut_make_voice_call">Повикај %1$s</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-ml/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-ml/strings.xml
index 21db4b7..dd11915 100644
--- a/java/com/android/dialer/searchfragment/list/res/values-ml/strings.xml
+++ b/java/com/android/dialer/searchfragment/list/res/values-ml/strings.xml
@@ -1,25 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_permission_no_search" msgid="6107959563874740441">"നിങ്ങളുടെ കോൺടാക്റ്റുകൾ തിരയുന്നതിന് കോൺടാക്റ്റുകൾക്കുള്ള അനുമതികൾ ഓണാക്കുക."</string>
-    <string name="search_shortcut_create_new_contact" msgid="1439862712551110400">"പുതുവിലാസം സൃഷ്‌ടിക്കൂ"</string>
-    <string name="search_shortcut_add_to_contact" msgid="3973534599468326173">"ഒരുകോൺടാക്റ്റിൽ ചേർക്കൂ"</string>
-    <string name="search_shortcut_send_sms_message" msgid="6871818587632705560">"SMS അയയ്ക്കുക"</string>
-    <string name="search_shortcut_make_video_call" msgid="3236284255758156964">"വീഡിയോ കോൾ ചെയ്യുക"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="new_permission_no_search">നിങ്ങളുടെ കോൺടാക്റ്റുകൾ തിരയുന്നതിന് കോൺടാക്റ്റുകൾക്കുള്ള അനുമതികൾ ഓണാക്കുക.</string>
+  <string name="search_shortcut_create_new_contact">പുതിയകോൺടാക്റ്റ് സൃഷ്‌ടിക്കൂ</string>
+  <string name="search_shortcut_add_to_contact">ഒരുകോൺടാക്റ്റിൽ ചേർക്കൂ</string>
+  <string name="search_shortcut_send_sms_message">SMS അയയ്ക്കുക</string>
+  <string name="search_shortcut_make_video_call">വീഡിയോ കോൾ ചെയ്യുക</string>
+  <string name="search_shortcut_make_voice_call">%1$s എന്ന നമ്പറിൽ വിളിക്കുക</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-mn/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-mn/strings.xml
index 9e4a5f9..92979c1 100644
--- a/java/com/android/dialer/searchfragment/list/res/values-mn/strings.xml
+++ b/java/com/android/dialer/searchfragment/list/res/values-mn/strings.xml
@@ -1,25 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_permission_no_search" msgid="6107959563874740441">"Харилцагчаа хайхын тулд, Харилцагчийн зөвшөөрлийг идэвхжүүлнэ үү."</string>
-    <string name="search_shortcut_create_new_contact" msgid="1439862712551110400">"Шинэ харилцагч үүсгэх"</string>
-    <string name="search_shortcut_add_to_contact" msgid="3973534599468326173">"Харилцагчийн хаягт нэмэх"</string>
-    <string name="search_shortcut_send_sms_message" msgid="6871818587632705560">"SMS илгээх"</string>
-    <string name="search_shortcut_make_video_call" msgid="3236284255758156964">"Видео дуудлага хийх"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="new_permission_no_search">Харилцагчаа хайхын тулд, Харилцагчийн зөвшөөрлийг идэвхжүүлнэ үү.</string>
+  <string name="search_shortcut_create_new_contact">Шинэ хаяг үүсгэх</string>
+  <string name="search_shortcut_add_to_contact">Харилцагчийн хаягт нэмэх</string>
+  <string name="search_shortcut_send_sms_message">Мессеж илгээх</string>
+  <string name="search_shortcut_make_video_call">Видео дуудлага хийх</string>
+  <string name="search_shortcut_make_voice_call">%1$s руу залгах</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-mr/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-mr/strings.xml
index cf2ffdf..5122859 100644
--- a/java/com/android/dialer/searchfragment/list/res/values-mr/strings.xml
+++ b/java/com/android/dialer/searchfragment/list/res/values-mr/strings.xml
@@ -1,26 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for new_permission_no_search (6107959563874740441) -->
-    <skip />
-    <string name="search_shortcut_create_new_contact" msgid="1439862712551110400">"नवीन संपर्क तयार करा"</string>
-    <string name="search_shortcut_add_to_contact" msgid="3973534599468326173">"संपर्कामध्‍ये जोडा"</string>
-    <string name="search_shortcut_send_sms_message" msgid="6871818587632705560">"SMS पाठवा"</string>
-    <string name="search_shortcut_make_video_call" msgid="3236284255758156964">"व्‍हिडिओ कॉल करा"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="new_permission_no_search">तुमचे संपर्क शोधण्‍यासाठी, संपर्क परवानग्या चालू करा.</string>
+  <string name="search_shortcut_create_new_contact">नवीन संपर्क तयार करा</string>
+  <string name="search_shortcut_add_to_contact">संपर्कांमध्‍ये जोडा</string>
+  <string name="search_shortcut_send_sms_message">SMS पाठवा</string>
+  <string name="search_shortcut_make_video_call">व्‍हिडिओ कॉल करा</string>
+  <string name="search_shortcut_make_voice_call">%1$s वर कॉल करा</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-ms/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-ms/strings.xml
index 800eca8..959cbb7 100644
--- a/java/com/android/dialer/searchfragment/list/res/values-ms/strings.xml
+++ b/java/com/android/dialer/searchfragment/list/res/values-ms/strings.xml
@@ -1,25 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_permission_no_search" msgid="6107959563874740441">"Untuk mencari kenalan anda, hidupkan kebenaran Kenalan."</string>
-    <string name="search_shortcut_create_new_contact" msgid="1439862712551110400">"Buat kenalan baharu"</string>
-    <string name="search_shortcut_add_to_contact" msgid="3973534599468326173">"Tambahkan pada kenalan"</string>
-    <string name="search_shortcut_send_sms_message" msgid="6871818587632705560">"Hantar SMS"</string>
-    <string name="search_shortcut_make_video_call" msgid="3236284255758156964">"Buat panggilan video"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="new_permission_no_search">Untuk mencari kenalan anda, hidupkan kebenaran Kenalan.</string>
+  <string name="search_shortcut_create_new_contact">Buat kenalan baharu</string>
+  <string name="search_shortcut_add_to_contact">Tambahkan pada kenalan</string>
+  <string name="search_shortcut_send_sms_message">Hantar SMS</string>
+  <string name="search_shortcut_make_video_call">Buat panggilan video</string>
+  <string name="search_shortcut_make_voice_call">Panggil %1$s</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-my/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-my/strings.xml
index 4ef54c3..46151a9 100644
--- a/java/com/android/dialer/searchfragment/list/res/values-my/strings.xml
+++ b/java/com/android/dialer/searchfragment/list/res/values-my/strings.xml
@@ -1,25 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_permission_no_search" msgid="6107959563874740441">"သင့်အဆက်အသွယ်များကို ရှာဖွေရန် Contacts ခွင့်ပြုချက်များကို ဖွင့်ပါ။"</string>
-    <string name="search_shortcut_create_new_contact" msgid="1439862712551110400">"အဆက်အသွယ်အသစ် ပြုလုပ်ရန်"</string>
-    <string name="search_shortcut_add_to_contact" msgid="3973534599468326173">"အဆက်အသွယ်သို့ ထည့်ရန်"</string>
-    <string name="search_shortcut_send_sms_message" msgid="6871818587632705560">"SMS ပို့ရန်"</string>
-    <string name="search_shortcut_make_video_call" msgid="3236284255758156964">"ဗီဒီယိုခေါ်ဆိုရန်"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="new_permission_no_search">သင့်အဆက်အသွယ်များကို ရှာဖွေရန် Contacts ခွင့်ပြုချက်များကို ဖွင့်ပါ။</string>
+  <string name="search_shortcut_create_new_contact">အဆက်အသွယ် အသစ် ဖန်တီးရန်</string>
+  <string name="search_shortcut_add_to_contact">အဆက်အသွယ်သို့ ပေါင်းထည့်ရန်</string>
+  <string name="search_shortcut_send_sms_message">စာတို ပို့ရန်</string>
+  <string name="search_shortcut_make_video_call">ဗီဒီယို ဖုန်းခေါ်ရန်</string>
+  <string name="search_shortcut_make_voice_call">%1$s ကို ခေါ်ဆိုရန်</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-nb/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-nb/strings.xml
index b888f4a..8a04e69 100644
--- a/java/com/android/dialer/searchfragment/list/res/values-nb/strings.xml
+++ b/java/com/android/dialer/searchfragment/list/res/values-nb/strings.xml
@@ -1,25 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_permission_no_search" msgid="6107959563874740441">"For å søke i kontaktene dine, slå på tillatelser for Kontakter."</string>
-    <string name="search_shortcut_create_new_contact" msgid="1439862712551110400">"Opprett en ny kontakt"</string>
-    <string name="search_shortcut_add_to_contact" msgid="3973534599468326173">"Legg til for en kontakt"</string>
-    <string name="search_shortcut_send_sms_message" msgid="6871818587632705560">"Send SMS"</string>
-    <string name="search_shortcut_make_video_call" msgid="3236284255758156964">"Start en videosamtale"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="new_permission_no_search">For å søke i kontaktene dine, slå på tillatelser for Kontakter.</string>
+  <string name="search_shortcut_create_new_contact">Opprett ny kontakt</string>
+  <string name="search_shortcut_add_to_contact">Legg til for en kontakt</string>
+  <string name="search_shortcut_send_sms_message">Send SMS</string>
+  <string name="search_shortcut_make_video_call">Start en videosamtale</string>
+  <string name="search_shortcut_make_voice_call">Ring %1$s</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-ne/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-ne/strings.xml
index e18b1d1..88c0e8f 100644
--- a/java/com/android/dialer/searchfragment/list/res/values-ne/strings.xml
+++ b/java/com/android/dialer/searchfragment/list/res/values-ne/strings.xml
@@ -1,25 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_permission_no_search" msgid="6107959563874740441">"आफ्ना सम्पर्कहरू खोज्न सम्पर्कसम्बन्धी अनुमतिहरूलाई सक्रिय गर्नुहोस्।"</string>
-    <string name="search_shortcut_create_new_contact" msgid="1439862712551110400">"नयाँ सम्पर्क सिर्जना गर्नुहोस्"</string>
-    <string name="search_shortcut_add_to_contact" msgid="3973534599468326173">"कुनै सम्पर्कमा थप्नुहोस्"</string>
-    <string name="search_shortcut_send_sms_message" msgid="6871818587632705560">"SMS पठाउनुहोस्"</string>
-    <string name="search_shortcut_make_video_call" msgid="3236284255758156964">"भिडियो कल बनाउनुहोस्"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="new_permission_no_search">आफ्ना सम्पर्कहरू खोज्न सम्पर्कसम्बन्धी अनुमतिहरूलाई सक्रिय गर्नुहोस्।</string>
+  <string name="search_shortcut_create_new_contact">नयाँ सम्पर्क सिर्जना गर्नुहोस्</string>
+  <string name="search_shortcut_add_to_contact">सम्पर्कमा थप्नुहोस्</string>
+  <string name="search_shortcut_send_sms_message">SMS पठाउनुहोस्</string>
+  <string name="search_shortcut_make_video_call">भिडियो कल बनाउनुहोस्</string>
+  <string name="search_shortcut_make_voice_call">%1$s मा कल गर्नुहोस्</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-nl/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-nl/strings.xml
index d107b28..eb3ca51 100644
--- a/java/com/android/dialer/searchfragment/list/res/values-nl/strings.xml
+++ b/java/com/android/dialer/searchfragment/list/res/values-nl/strings.xml
@@ -1,25 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_permission_no_search" msgid="6107959563874740441">"Als je wilt zoeken in je contacten, moet je het recht Contacten inschakelen."</string>
-    <string name="search_shortcut_create_new_contact" msgid="1439862712551110400">"Nieuw contact maken"</string>
-    <string name="search_shortcut_add_to_contact" msgid="3973534599468326173">"Toevoegen aan een contact"</string>
-    <string name="search_shortcut_send_sms_message" msgid="6871818587632705560">"Sms verzenden"</string>
-    <string name="search_shortcut_make_video_call" msgid="3236284255758156964">"Videogesprek starten"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="new_permission_no_search">Als je wilt zoeken in je contacten, moet je het recht Contacten inschakelen.</string>
+  <string name="search_shortcut_create_new_contact">Nieuw contact maken</string>
+  <string name="search_shortcut_add_to_contact">Toevoegen aan een contact</string>
+  <string name="search_shortcut_send_sms_message">Sms verzenden</string>
+  <string name="search_shortcut_make_video_call">Videogesprek starten</string>
+  <string name="search_shortcut_make_voice_call">%1$s bellen</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-no/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-no/strings.xml
index b888f4a..8a04e69 100644
--- a/java/com/android/dialer/searchfragment/list/res/values-no/strings.xml
+++ b/java/com/android/dialer/searchfragment/list/res/values-no/strings.xml
@@ -1,25 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_permission_no_search" msgid="6107959563874740441">"For å søke i kontaktene dine, slå på tillatelser for Kontakter."</string>
-    <string name="search_shortcut_create_new_contact" msgid="1439862712551110400">"Opprett en ny kontakt"</string>
-    <string name="search_shortcut_add_to_contact" msgid="3973534599468326173">"Legg til for en kontakt"</string>
-    <string name="search_shortcut_send_sms_message" msgid="6871818587632705560">"Send SMS"</string>
-    <string name="search_shortcut_make_video_call" msgid="3236284255758156964">"Start en videosamtale"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="new_permission_no_search">For å søke i kontaktene dine, slå på tillatelser for Kontakter.</string>
+  <string name="search_shortcut_create_new_contact">Opprett ny kontakt</string>
+  <string name="search_shortcut_add_to_contact">Legg til for en kontakt</string>
+  <string name="search_shortcut_send_sms_message">Send SMS</string>
+  <string name="search_shortcut_make_video_call">Start en videosamtale</string>
+  <string name="search_shortcut_make_voice_call">Ring %1$s</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-pa/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-pa/strings.xml
index 0607b7a..f02d6b5 100644
--- a/java/com/android/dialer/searchfragment/list/res/values-pa/strings.xml
+++ b/java/com/android/dialer/searchfragment/list/res/values-pa/strings.xml
@@ -1,25 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_permission_no_search" msgid="6107959563874740441">"ਆਪਣੇ ਸੰਪਰਕ ਖੋਜਣ ਲਈ, ਸੰਪਰਕ ਇਜਾਜ਼ਤਾਂ ਨੂੰ ਚਾਲੂ ਕਰੋ।"</string>
-    <string name="search_shortcut_create_new_contact" msgid="1439862712551110400">"ਨਵਾਂ ਸੰਪਰਕ ਬਣਾਓ"</string>
-    <string name="search_shortcut_add_to_contact" msgid="3973534599468326173">"ਇੱਕ ਸੰਪਰਕ ਵਿੱਚ ਸ਼ਾਮਲ ਕਰੋ"</string>
-    <string name="search_shortcut_send_sms_message" msgid="6871818587632705560">"SMS ਭੇਜੋ"</string>
-    <string name="search_shortcut_make_video_call" msgid="3236284255758156964">"ਵੀਡੀਓ ਕਾਲ ਕਰੋ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="new_permission_no_search">ਆਪਣੇ ਸੰਪਰਕ ਖੋਜਣ ਲਈ, ਸੰਪਰਕ ਇਜਾਜ਼ਤਾਂ ਨੂੰ ਚਾਲੂ ਕਰੋ।</string>
+  <string name="search_shortcut_create_new_contact">ਨਵਾਂ ਸੰਪਰਕ ਬਣਾਓ</string>
+  <string name="search_shortcut_add_to_contact">ਕਿਸੇ ਸੰਪਰਕ ਵਿੱਚ ਸ਼ਾਮਲ ਕਰੋ</string>
+  <string name="search_shortcut_send_sms_message">SMS ਭੇਜੋ</string>
+  <string name="search_shortcut_make_video_call">ਵੀਡੀਓ ਕਾਲ ਕਰੋ</string>
+  <string name="search_shortcut_make_voice_call">%1$s \'ਤੇ ਕਾਲ ਕਰੋ</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-pl/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-pl/strings.xml
index f4160f2..0d2a33a 100644
--- a/java/com/android/dialer/searchfragment/list/res/values-pl/strings.xml
+++ b/java/com/android/dialer/searchfragment/list/res/values-pl/strings.xml
@@ -1,25 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_permission_no_search" msgid="6107959563874740441">"Aby wyszukać kontakty, włącz uprawnienia Kontakty."</string>
-    <string name="search_shortcut_create_new_contact" msgid="1439862712551110400">"Utwórz nowy kontakt"</string>
-    <string name="search_shortcut_add_to_contact" msgid="3973534599468326173">"Dodaj do kontaktu"</string>
-    <string name="search_shortcut_send_sms_message" msgid="6871818587632705560">"Wyślij SMS-a"</string>
-    <string name="search_shortcut_make_video_call" msgid="3236284255758156964">"Rozpocznij rozmowę wideo"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="new_permission_no_search">Aby wyszukać kontakty, włącz uprawnienia Kontakty.</string>
+  <string name="search_shortcut_create_new_contact">Utwórz nowy kontakt</string>
+  <string name="search_shortcut_add_to_contact">Dodaj do kontaktu</string>
+  <string name="search_shortcut_send_sms_message">Wyślij SMS-a</string>
+  <string name="search_shortcut_make_video_call">Rozmowa wideo</string>
+  <string name="search_shortcut_make_voice_call">Zadzwoń: %1$s</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-pt-rBR/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-pt-rBR/strings.xml
index dce7eab..3a2a35f 100644
--- a/java/com/android/dialer/searchfragment/list/res/values-pt-rBR/strings.xml
+++ b/java/com/android/dialer/searchfragment/list/res/values-pt-rBR/strings.xml
@@ -1,25 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_permission_no_search" msgid="6107959563874740441">"Para pesquisar seus contatos, ative as permissões para Contatos."</string>
-    <string name="search_shortcut_create_new_contact" msgid="1439862712551110400">"Criar novo contato"</string>
-    <string name="search_shortcut_add_to_contact" msgid="3973534599468326173">"Adicionar a um contato"</string>
-    <string name="search_shortcut_send_sms_message" msgid="6871818587632705560">"Enviar SMS"</string>
-    <string name="search_shortcut_make_video_call" msgid="3236284255758156964">"Fazer videochamada"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="new_permission_no_search">Para pesquisar seus contatos, ative as permissões para Contatos.</string>
+  <string name="search_shortcut_create_new_contact">Criar novo contato</string>
+  <string name="search_shortcut_add_to_contact">Adicionar a um contato</string>
+  <string name="search_shortcut_send_sms_message">Enviar SMS</string>
+  <string name="search_shortcut_make_video_call">Fazer videochamada</string>
+  <string name="search_shortcut_make_voice_call">Ligar para %1$s</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-pt-rPT/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-pt-rPT/strings.xml
index 9585684..c99152f 100644
--- a/java/com/android/dialer/searchfragment/list/res/values-pt-rPT/strings.xml
+++ b/java/com/android/dialer/searchfragment/list/res/values-pt-rPT/strings.xml
@@ -1,25 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_permission_no_search" msgid="6107959563874740441">"Para pesquisar os seus contactos, ative as autorizações Contactos."</string>
-    <string name="search_shortcut_create_new_contact" msgid="1439862712551110400">"Criar novo contacto"</string>
-    <string name="search_shortcut_add_to_contact" msgid="3973534599468326173">"Adicionar a um contacto"</string>
-    <string name="search_shortcut_send_sms_message" msgid="6871818587632705560">"Enviar SMS"</string>
-    <string name="search_shortcut_make_video_call" msgid="3236284255758156964">"Fazer videochamada"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="new_permission_no_search">Para pesquisar os seus contactos, ative as autorizações Contactos.</string>
+  <string name="search_shortcut_create_new_contact">Criar novo contacto</string>
+  <string name="search_shortcut_add_to_contact">Adicionar a um contacto</string>
+  <string name="search_shortcut_send_sms_message">Enviar SMS</string>
+  <string name="search_shortcut_make_video_call">Fazer videochamada</string>
+  <string name="search_shortcut_make_voice_call">Ligar a %1$s</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-pt/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-pt/strings.xml
index dce7eab..3a2a35f 100644
--- a/java/com/android/dialer/searchfragment/list/res/values-pt/strings.xml
+++ b/java/com/android/dialer/searchfragment/list/res/values-pt/strings.xml
@@ -1,25 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_permission_no_search" msgid="6107959563874740441">"Para pesquisar seus contatos, ative as permissões para Contatos."</string>
-    <string name="search_shortcut_create_new_contact" msgid="1439862712551110400">"Criar novo contato"</string>
-    <string name="search_shortcut_add_to_contact" msgid="3973534599468326173">"Adicionar a um contato"</string>
-    <string name="search_shortcut_send_sms_message" msgid="6871818587632705560">"Enviar SMS"</string>
-    <string name="search_shortcut_make_video_call" msgid="3236284255758156964">"Fazer videochamada"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="new_permission_no_search">Para pesquisar seus contatos, ative as permissões para Contatos.</string>
+  <string name="search_shortcut_create_new_contact">Criar novo contato</string>
+  <string name="search_shortcut_add_to_contact">Adicionar a um contato</string>
+  <string name="search_shortcut_send_sms_message">Enviar SMS</string>
+  <string name="search_shortcut_make_video_call">Fazer videochamada</string>
+  <string name="search_shortcut_make_voice_call">Ligar para %1$s</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-ro/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-ro/strings.xml
index 1ad721f..9539dd0 100644
--- a/java/com/android/dialer/searchfragment/list/res/values-ro/strings.xml
+++ b/java/com/android/dialer/searchfragment/list/res/values-ro/strings.xml
@@ -1,25 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_permission_no_search" msgid="6107959563874740441">"Pentru a căuta în agendă, activați permisiunea pentru Agendă."</string>
-    <string name="search_shortcut_create_new_contact" msgid="1439862712551110400">"Creați o intrare nouă"</string>
-    <string name="search_shortcut_add_to_contact" msgid="3973534599468326173">"Adăugați la o intrare"</string>
-    <string name="search_shortcut_send_sms_message" msgid="6871818587632705560">"Trimiteți SMS"</string>
-    <string name="search_shortcut_make_video_call" msgid="3236284255758156964">"Inițiați un apel video"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="new_permission_no_search">Pentru a căuta în agendă, activați permisiunea pentru Agendă.</string>
+  <string name="search_shortcut_create_new_contact">Creați o intrare nouă</string>
+  <string name="search_shortcut_add_to_contact">Adăugați la o intrare</string>
+  <string name="search_shortcut_send_sms_message">Trimiteți SMS</string>
+  <string name="search_shortcut_make_video_call">Inițiați un apel video</string>
+  <string name="search_shortcut_make_voice_call">Apelați %1$s</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-ru/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-ru/strings.xml
index 8f890e1..ed963c3 100644
--- a/java/com/android/dialer/searchfragment/list/res/values-ru/strings.xml
+++ b/java/com/android/dialer/searchfragment/list/res/values-ru/strings.xml
@@ -1,25 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_permission_no_search" msgid="6107959563874740441">"Для поиска контактов включите разрешение \"Контакты\"."</string>
-    <string name="search_shortcut_create_new_contact" msgid="1439862712551110400">"Создать контакт"</string>
-    <string name="search_shortcut_add_to_contact" msgid="3973534599468326173">"Добавить к контакту"</string>
-    <string name="search_shortcut_send_sms_message" msgid="6871818587632705560">"Отправить SMS"</string>
-    <string name="search_shortcut_make_video_call" msgid="3236284255758156964">"Начать видеовстречу"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="new_permission_no_search">Для поиска контактов включите разрешение \"Контакты\".</string>
+  <string name="search_shortcut_create_new_contact">Создать контакт</string>
+  <string name="search_shortcut_add_to_contact">Добавить к контакту</string>
+  <string name="search_shortcut_send_sms_message">Отправить SMS</string>
+  <string name="search_shortcut_make_video_call">Начать видеовстречу</string>
+  <string name="search_shortcut_make_voice_call">Позвонить по номеру %1$s</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-si/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-si/strings.xml
index 5c268b1..b579958 100644
--- a/java/com/android/dialer/searchfragment/list/res/values-si/strings.xml
+++ b/java/com/android/dialer/searchfragment/list/res/values-si/strings.xml
@@ -1,25 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_permission_no_search" msgid="6107959563874740441">"ඔබේ සම්බන්ධතා සෙවීමට, සම්බන්ධතා අවසර ක්‍රියාත්මක කරන්න."</string>
-    <string name="search_shortcut_create_new_contact" msgid="1439862712551110400">"නව සම්බන්ධතාවක් තනන්න"</string>
-    <string name="search_shortcut_add_to_contact" msgid="3973534599468326173">"සම්බන්ධතාවකට එක් කරන්න"</string>
-    <string name="search_shortcut_send_sms_message" msgid="6871818587632705560">"SMS යවන්න"</string>
-    <string name="search_shortcut_make_video_call" msgid="3236284255758156964">"වීඩියෝ ඇමතුමක් ලබා ගන්න"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="new_permission_no_search">ඔබේ සම්බන්ධතා සෙවීමට, සම්බන්ධතා අවසර ක්‍රියාත්මක කරන්න.</string>
+  <string name="search_shortcut_create_new_contact">නව සම්බන්ධතාවයක් සාදන්න</string>
+  <string name="search_shortcut_add_to_contact">සම්බන්ධතාවකට එක් කරන්න</string>
+  <string name="search_shortcut_send_sms_message">SMS යවන්න</string>
+  <string name="search_shortcut_make_video_call">වීඩියෝ ඇමතුමක් ලබාගන්න</string>
+  <string name="search_shortcut_make_voice_call">%1$s අමතන්න</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-sk/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-sk/strings.xml
index 18da18c..96a7dc1 100644
--- a/java/com/android/dialer/searchfragment/list/res/values-sk/strings.xml
+++ b/java/com/android/dialer/searchfragment/list/res/values-sk/strings.xml
@@ -1,25 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_permission_no_search" msgid="6107959563874740441">"Ak chcete hľadať kontakty, zapnite povolenie Kontakty."</string>
-    <string name="search_shortcut_create_new_contact" msgid="1439862712551110400">"Vytvoriť nový kontakt"</string>
-    <string name="search_shortcut_add_to_contact" msgid="3973534599468326173">"Pridať ku kontaktu"</string>
-    <string name="search_shortcut_send_sms_message" msgid="6871818587632705560">"Odoslať SMS"</string>
-    <string name="search_shortcut_make_video_call" msgid="3236284255758156964">"Uskutočniť videohovor"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="new_permission_no_search">Ak chcete hľadať kontakty, zapnite povolenie Kontakty.</string>
+  <string name="search_shortcut_create_new_contact">Vytvoriť nový kontakt</string>
+  <string name="search_shortcut_add_to_contact">Pridať ku kontaktu</string>
+  <string name="search_shortcut_send_sms_message">Odoslať SMS</string>
+  <string name="search_shortcut_make_video_call">Uskutočniť videohovor</string>
+  <string name="search_shortcut_make_voice_call">Volať %1$s</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-sl/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-sl/strings.xml
index 8234017..864a915 100644
--- a/java/com/android/dialer/searchfragment/list/res/values-sl/strings.xml
+++ b/java/com/android/dialer/searchfragment/list/res/values-sl/strings.xml
@@ -1,25 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_permission_no_search" msgid="6107959563874740441">"Če želite iskati po stikih, vklopite dovoljenje za stike."</string>
-    <string name="search_shortcut_create_new_contact" msgid="1439862712551110400">"Ustvari nov stik"</string>
-    <string name="search_shortcut_add_to_contact" msgid="3973534599468326173">"Dodaj stiku"</string>
-    <string name="search_shortcut_send_sms_message" msgid="6871818587632705560">"Pošlji SMS"</string>
-    <string name="search_shortcut_make_video_call" msgid="3236284255758156964">"Opravi videoklic"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="new_permission_no_search">Če želite iskati po stikih, vklopite dovoljenje za stike.</string>
+  <string name="search_shortcut_create_new_contact">Ustvari nov stik</string>
+  <string name="search_shortcut_add_to_contact">Dodaj stiku</string>
+  <string name="search_shortcut_send_sms_message">Pošlji SMS</string>
+  <string name="search_shortcut_make_video_call">Opravi videoklic</string>
+  <string name="search_shortcut_make_voice_call">Pokliči %1$s</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-sq/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-sq/strings.xml
index 5a6905c..82561ab 100644
--- a/java/com/android/dialer/searchfragment/list/res/values-sq/strings.xml
+++ b/java/com/android/dialer/searchfragment/list/res/values-sq/strings.xml
@@ -1,25 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_permission_no_search" msgid="6107959563874740441">"Për të kërkuar te kontaktet, aktivizo lejet e \"Kontakteve\""</string>
-    <string name="search_shortcut_create_new_contact" msgid="1439862712551110400">"Krijo një kontakt të ri"</string>
-    <string name="search_shortcut_add_to_contact" msgid="3973534599468326173">"Shto te një kontakt"</string>
-    <string name="search_shortcut_send_sms_message" msgid="6871818587632705560">"Dërgo SMS"</string>
-    <string name="search_shortcut_make_video_call" msgid="3236284255758156964">"Bëj telefonatë me video"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="new_permission_no_search">Për të kërkuar te kontaktet, aktivizo lejet e \"Kontakteve\"</string>
+  <string name="search_shortcut_create_new_contact">Krijo një kontakt të ri</string>
+  <string name="search_shortcut_add_to_contact">Shto te një kontakt</string>
+  <string name="search_shortcut_send_sms_message">Dërgo SMS</string>
+  <string name="search_shortcut_make_video_call">Bëj një telefonatë me video</string>
+  <string name="search_shortcut_make_voice_call">Telefono %1$s</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-sr/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-sr/strings.xml
index a80a052..bf4c169 100644
--- a/java/com/android/dialer/searchfragment/list/res/values-sr/strings.xml
+++ b/java/com/android/dialer/searchfragment/list/res/values-sr/strings.xml
@@ -1,25 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_permission_no_search" msgid="6107959563874740441">"Да бисте претражили контакте, укључите дозволе за Контакте."</string>
-    <string name="search_shortcut_create_new_contact" msgid="1439862712551110400">"Направи нови контакт"</string>
-    <string name="search_shortcut_add_to_contact" msgid="3973534599468326173">"Додај у контакт"</string>
-    <string name="search_shortcut_send_sms_message" msgid="6871818587632705560">"Пошаљи SMS"</string>
-    <string name="search_shortcut_make_video_call" msgid="3236284255758156964">"Упути видео позив"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="new_permission_no_search">Да бисте претражили контакте, укључите дозволе за Контакте.</string>
+  <string name="search_shortcut_create_new_contact">Направи нови контакт</string>
+  <string name="search_shortcut_add_to_contact">Додај у контакт</string>
+  <string name="search_shortcut_send_sms_message">Пошаљи SMS</string>
+  <string name="search_shortcut_make_video_call">Упути видео позив</string>
+  <string name="search_shortcut_make_voice_call">Позови %1$s</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-sv/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-sv/strings.xml
index ab9ce51..a21fd62 100644
--- a/java/com/android/dialer/searchfragment/list/res/values-sv/strings.xml
+++ b/java/com/android/dialer/searchfragment/list/res/values-sv/strings.xml
@@ -1,25 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_permission_no_search" msgid="6107959563874740441">"Aktivera behörigheten till Kontakter om du vill söka bland kontakterna."</string>
-    <string name="search_shortcut_create_new_contact" msgid="1439862712551110400">"Skapa ny kontakt"</string>
-    <string name="search_shortcut_add_to_contact" msgid="3973534599468326173">"Lägg till som kontakt"</string>
-    <string name="search_shortcut_send_sms_message" msgid="6871818587632705560">"Skicka sms"</string>
-    <string name="search_shortcut_make_video_call" msgid="3236284255758156964">"Ring videosamtal"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="new_permission_no_search">Aktivera behörigheten till Kontakter om du vill söka bland kontakterna.</string>
+  <string name="search_shortcut_create_new_contact">Skapa ny kontakt</string>
+  <string name="search_shortcut_add_to_contact">Lägg till i kontakt</string>
+  <string name="search_shortcut_send_sms_message">Skicka sms</string>
+  <string name="search_shortcut_make_video_call">Ring videosamtal</string>
+  <string name="search_shortcut_make_voice_call">Ring %1$s</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-sw/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-sw/strings.xml
index 656f934..d09676b 100644
--- a/java/com/android/dialer/searchfragment/list/res/values-sw/strings.xml
+++ b/java/com/android/dialer/searchfragment/list/res/values-sw/strings.xml
@@ -1,25 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_permission_no_search" msgid="6107959563874740441">"Ili utafute anwani zako, washa ruhusa za Anwani."</string>
-    <string name="search_shortcut_create_new_contact" msgid="1439862712551110400">"Ongeza anwani mpya"</string>
-    <string name="search_shortcut_add_to_contact" msgid="3973534599468326173">"Ongeza kwenye anwani"</string>
-    <string name="search_shortcut_send_sms_message" msgid="6871818587632705560">"Tuma SMS"</string>
-    <string name="search_shortcut_make_video_call" msgid="3236284255758156964">"Piga simu ya video"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="new_permission_no_search">Ili utafute anwani zako, washa ruhusa za Anwani.</string>
+  <string name="search_shortcut_create_new_contact">Ongeza anwani mpya</string>
+  <string name="search_shortcut_add_to_contact">Ongeza kwenye anwani</string>
+  <string name="search_shortcut_send_sms_message">Tuma SMS</string>
+  <string name="search_shortcut_make_video_call">Piga Hangout ya video</string>
+  <string name="search_shortcut_make_voice_call">Piga simu nambari %1$s</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-ta/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-ta/strings.xml
index 209b54a..84c4646 100644
--- a/java/com/android/dialer/searchfragment/list/res/values-ta/strings.xml
+++ b/java/com/android/dialer/searchfragment/list/res/values-ta/strings.xml
@@ -1,25 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_permission_no_search" msgid="6107959563874740441">"தொடர்புகளைத் தேட, தொடர்புகளுக்கான அனுமதிகளை இயக்கவும்."</string>
-    <string name="search_shortcut_create_new_contact" msgid="1439862712551110400">"புதிய தொடர்பை உருவாக்கு"</string>
-    <string name="search_shortcut_add_to_contact" msgid="3973534599468326173">"தொடர்பில் சேர்"</string>
-    <string name="search_shortcut_send_sms_message" msgid="6871818587632705560">"SMS அனுப்பு"</string>
-    <string name="search_shortcut_make_video_call" msgid="3236284255758156964">"வீடியோ அழைப்பு செய்"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="new_permission_no_search">தொடர்புகளைத் தேட, தொடர்புகளுக்கான அனுமதிகளை இயக்கவும்.</string>
+  <string name="search_shortcut_create_new_contact">புதிய தொடர்பை உருவாக்கு</string>
+  <string name="search_shortcut_add_to_contact">தொடர்பில் சேர்</string>
+  <string name="search_shortcut_send_sms_message">SMS அனுப்பு</string>
+  <string name="search_shortcut_make_video_call">வீடியோவில் அழை</string>
+  <string name="search_shortcut_make_voice_call">%1$sஐ அழை</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-te/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-te/strings.xml
index 76791c8..b8b8c84 100644
--- a/java/com/android/dialer/searchfragment/list/res/values-te/strings.xml
+++ b/java/com/android/dialer/searchfragment/list/res/values-te/strings.xml
@@ -1,25 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_permission_no_search" msgid="6107959563874740441">"మీ పరిచయాలను శోధించడానికి, పరిచయాల అనుమతులను ఆన్ చేయండి."</string>
-    <string name="search_shortcut_create_new_contact" msgid="1439862712551110400">"కొత్త పరిచయాన్ని సృష్టించండి"</string>
-    <string name="search_shortcut_add_to_contact" msgid="3973534599468326173">"పరిచయానికి జోడించండి"</string>
-    <string name="search_shortcut_send_sms_message" msgid="6871818587632705560">"SMSను పంపండి"</string>
-    <string name="search_shortcut_make_video_call" msgid="3236284255758156964">"వీడియో కాల్ చేయండి"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="new_permission_no_search">మీ పరిచయాలను శోధించడానికి, పరిచయాల అనుమతులను ఆన్ చేయండి.</string>
+  <string name="search_shortcut_create_new_contact">కొత్త పరిచయాన్ని సృష్టించు</string>
+  <string name="search_shortcut_add_to_contact">పరిచయానికి జోడించు</string>
+  <string name="search_shortcut_send_sms_message">SMS పంపు</string>
+  <string name="search_shortcut_make_video_call">వీడియో కాల్ చేయండి</string>
+  <string name="search_shortcut_make_voice_call">%1$sకి కాల్ చేయి</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-th/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-th/strings.xml
index 960cc0b..42bd3f4 100644
--- a/java/com/android/dialer/searchfragment/list/res/values-th/strings.xml
+++ b/java/com/android/dialer/searchfragment/list/res/values-th/strings.xml
@@ -1,25 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_permission_no_search" msgid="6107959563874740441">"หากต้องการค้นหารายชื่อติดต่อ ให้เปิดสิทธิ์เข้าถึงรายชื่อติดต่อ"</string>
-    <string name="search_shortcut_create_new_contact" msgid="1439862712551110400">"สร้างรายชื่อติดต่อใหม่"</string>
-    <string name="search_shortcut_add_to_contact" msgid="3973534599468326173">"เพิ่มในรายชื่อติดต่อ"</string>
-    <string name="search_shortcut_send_sms_message" msgid="6871818587632705560">"ส่ง SMS"</string>
-    <string name="search_shortcut_make_video_call" msgid="3236284255758156964">"ใช้วิดีโอคอล"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="new_permission_no_search">หากต้องการค้นหารายชื่อติดต่อ ให้เปิดสิทธิ์เข้าถึงรายชื่อติดต่อ</string>
+  <string name="search_shortcut_create_new_contact">สร้างรายชื่อติดต่อใหม่</string>
+  <string name="search_shortcut_add_to_contact">เพิ่มในรายชื่อติดต่อ</string>
+  <string name="search_shortcut_send_sms_message">ส่ง SMS</string>
+  <string name="search_shortcut_make_video_call">ใช้ Hangouts วิดีโอ</string>
+  <string name="search_shortcut_make_voice_call">โทร %1$s</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-tl/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-tl/strings.xml
index 905cdf4..3e3be79 100644
--- a/java/com/android/dialer/searchfragment/list/res/values-tl/strings.xml
+++ b/java/com/android/dialer/searchfragment/list/res/values-tl/strings.xml
@@ -1,25 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_permission_no_search" msgid="6107959563874740441">"Upang makapaghanap sa iyong mga contact, i-on ang mga pahintulot sa Mga Contact."</string>
-    <string name="search_shortcut_create_new_contact" msgid="1439862712551110400">"Gumawa ng bagong contact"</string>
-    <string name="search_shortcut_add_to_contact" msgid="3973534599468326173">"Idagdag sa contact"</string>
-    <string name="search_shortcut_send_sms_message" msgid="6871818587632705560">"Magpadala ng SMS"</string>
-    <string name="search_shortcut_make_video_call" msgid="3236284255758156964">"Makipag-video call"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="new_permission_no_search">Upang makapaghanap sa iyong mga contact, i-on ang mga pahintulot sa Mga Contact.</string>
+  <string name="search_shortcut_create_new_contact">Gumawa ng bagong contact</string>
+  <string name="search_shortcut_add_to_contact">Idagdag sa isang contact</string>
+  <string name="search_shortcut_send_sms_message">Magpadala ng SMS</string>
+  <string name="search_shortcut_make_video_call">Gumawa ng video call</string>
+  <string name="search_shortcut_make_voice_call">Tawagan ang %1$s</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-tr/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-tr/strings.xml
index 331aa28..06fbb8d 100644
--- a/java/com/android/dialer/searchfragment/list/res/values-tr/strings.xml
+++ b/java/com/android/dialer/searchfragment/list/res/values-tr/strings.xml
@@ -1,25 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_permission_no_search" msgid="6107959563874740441">"Kişilerinizde arama yapmak için Kişiler izinlerini etkinleştirin."</string>
-    <string name="search_shortcut_create_new_contact" msgid="1439862712551110400">"Yeni kişi oluştur"</string>
-    <string name="search_shortcut_add_to_contact" msgid="3973534599468326173">"Bir kişiye ekle"</string>
-    <string name="search_shortcut_send_sms_message" msgid="6871818587632705560">"SMS gönder"</string>
-    <string name="search_shortcut_make_video_call" msgid="3236284255758156964">"Görüntülü görüşme yap"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="new_permission_no_search">Kişilerinizde arama yapmak için Kişiler izinlerini etkinleştirin.</string>
+  <string name="search_shortcut_create_new_contact">Yeni kişi oluştur</string>
+  <string name="search_shortcut_add_to_contact">Bir kişiye ekle</string>
+  <string name="search_shortcut_send_sms_message">SMS gönder</string>
+  <string name="search_shortcut_make_video_call">Video görüşmesi yap</string>
+  <string name="search_shortcut_make_voice_call">Telefon et: %1$s</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-uk/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-uk/strings.xml
index 0f2e7d9..f013e78 100644
--- a/java/com/android/dialer/searchfragment/list/res/values-uk/strings.xml
+++ b/java/com/android/dialer/searchfragment/list/res/values-uk/strings.xml
@@ -1,25 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_permission_no_search" msgid="6107959563874740441">"Щоб шукати контакти, увімкніть дозвіл \"Контакти\"."</string>
-    <string name="search_shortcut_create_new_contact" msgid="1439862712551110400">"Створити новий контакт"</string>
-    <string name="search_shortcut_add_to_contact" msgid="3973534599468326173">"Додати до контакту"</string>
-    <string name="search_shortcut_send_sms_message" msgid="6871818587632705560">"Надіслати SMS"</string>
-    <string name="search_shortcut_make_video_call" msgid="3236284255758156964">"Здійснити відеодзвінок"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="new_permission_no_search">Щоб шукати контакти, увімкніть дозвіл \"Контакти\".</string>
+  <string name="search_shortcut_create_new_contact">Створити контакт</string>
+  <string name="search_shortcut_add_to_contact">Додати в контакти</string>
+  <string name="search_shortcut_send_sms_message">Надіслати SMS</string>
+  <string name="search_shortcut_make_video_call">Здійснити відеодзвінок</string>
+  <string name="search_shortcut_make_voice_call">Зателефонувати на номер %1$s</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-ur/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-ur/strings.xml
index 4570f5b..f9eea96 100644
--- a/java/com/android/dialer/searchfragment/list/res/values-ur/strings.xml
+++ b/java/com/android/dialer/searchfragment/list/res/values-ur/strings.xml
@@ -1,25 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_permission_no_search" msgid="6107959563874740441">"اپنے رابطوں کو تلاش کرنے کے لیے رابطوں کی اجازتیں آن کریں۔"</string>
-    <string name="search_shortcut_create_new_contact" msgid="1439862712551110400">"نیا رابطہ بنائیں"</string>
-    <string name="search_shortcut_add_to_contact" msgid="3973534599468326173">"رابطے میں شامل کریں"</string>
-    <string name="search_shortcut_send_sms_message" msgid="6871818587632705560">"‏SMS بھیجیں"</string>
-    <string name="search_shortcut_make_video_call" msgid="3236284255758156964">"ویڈیو کال کریں"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="new_permission_no_search">اپنے رابطوں کو تلاش کرنے کے لیے رابطوں کی اجازتیں آن کریں۔</string>
+  <string name="search_shortcut_create_new_contact">نیا رابطہ بنائیں</string>
+  <string name="search_shortcut_add_to_contact">رابطے میں شامل کریں</string>
+  <string name="search_shortcut_send_sms_message">‏SMS بھیجیں</string>
+  <string name="search_shortcut_make_video_call">ویڈیو کال کریں</string>
+  <string name="search_shortcut_make_voice_call">%1$s پر کال کریں</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-uz/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-uz/strings.xml
index 9cde25a..831ac1f 100644
--- a/java/com/android/dialer/searchfragment/list/res/values-uz/strings.xml
+++ b/java/com/android/dialer/searchfragment/list/res/values-uz/strings.xml
@@ -1,25 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_permission_no_search" msgid="6107959563874740441">"Kontaktlarni qidirish uchun “Kontaktlar” ruxsatnomasini yoqing."</string>
-    <string name="search_shortcut_create_new_contact" msgid="1439862712551110400">"Yangi kontakt yaratish"</string>
-    <string name="search_shortcut_add_to_contact" msgid="3973534599468326173">"Mavjud kontaktga qo‘shish"</string>
-    <string name="search_shortcut_send_sms_message" msgid="6871818587632705560">"SMS yuborish"</string>
-    <string name="search_shortcut_make_video_call" msgid="3236284255758156964">"Video suhbat boshlash"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="new_permission_no_search">Kontaktlarni qidirish uchun “Kontaktlar” ruxsatnomasini yoqing.</string>
+  <string name="search_shortcut_create_new_contact">Yangi kontakt yaratish</string>
+  <string name="search_shortcut_add_to_contact">Mavjud kontaktga saqlash</string>
+  <string name="search_shortcut_send_sms_message">SMS yuborish</string>
+  <string name="search_shortcut_make_video_call">Videoqo‘ng‘iroq qilish</string>
+  <string name="search_shortcut_make_voice_call">Chaqiruv: %1$s</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-vi/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-vi/strings.xml
index 61369e9..5b5b559 100644
--- a/java/com/android/dialer/searchfragment/list/res/values-vi/strings.xml
+++ b/java/com/android/dialer/searchfragment/list/res/values-vi/strings.xml
@@ -1,25 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_permission_no_search" msgid="6107959563874740441">"Để tìm kiếm liên hệ của bạn, hãy bật quyền đối với Danh bạ."</string>
-    <string name="search_shortcut_create_new_contact" msgid="1439862712551110400">"Tạo liên hệ mới"</string>
-    <string name="search_shortcut_add_to_contact" msgid="3973534599468326173">"Thêm vào một liên hệ"</string>
-    <string name="search_shortcut_send_sms_message" msgid="6871818587632705560">"Gửi SMS"</string>
-    <string name="search_shortcut_make_video_call" msgid="3236284255758156964">"Gọi điện video"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="new_permission_no_search">Để tìm kiếm liên hệ của bạn, hãy bật quyền đối với Danh bạ.</string>
+  <string name="search_shortcut_create_new_contact">Tạo liên hệ mới</string>
+  <string name="search_shortcut_add_to_contact">Thêm vào liên hệ</string>
+  <string name="search_shortcut_send_sms_message">Gửi SMS</string>
+  <string name="search_shortcut_make_video_call">Gọi điện video</string>
+  <string name="search_shortcut_make_voice_call">Gọi %1$s</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-zh-rCN/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-zh-rCN/strings.xml
index 7633d57..0dc03cb 100644
--- a/java/com/android/dialer/searchfragment/list/res/values-zh-rCN/strings.xml
+++ b/java/com/android/dialer/searchfragment/list/res/values-zh-rCN/strings.xml
@@ -1,25 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_permission_no_search" msgid="6107959563874740441">"要搜索您的联系人，请开启“通讯录”权限。"</string>
-    <string name="search_shortcut_create_new_contact" msgid="1439862712551110400">"创建新联系人"</string>
-    <string name="search_shortcut_add_to_contact" msgid="3973534599468326173">"添加到联系人"</string>
-    <string name="search_shortcut_send_sms_message" msgid="6871818587632705560">"发送短信"</string>
-    <string name="search_shortcut_make_video_call" msgid="3236284255758156964">"发起视频通话"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="new_permission_no_search">要搜索您的联系人，请开启“通讯录”权限。</string>
+  <string name="search_shortcut_create_new_contact">新建联系人</string>
+  <string name="search_shortcut_add_to_contact">添加到联系人</string>
+  <string name="search_shortcut_send_sms_message">发送短信</string>
+  <string name="search_shortcut_make_video_call">发起视频通话</string>
+  <string name="search_shortcut_make_voice_call">拨打 %1$s</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-zh-rHK/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-zh-rHK/strings.xml
index 6e63d20..a082084 100644
--- a/java/com/android/dialer/searchfragment/list/res/values-zh-rHK/strings.xml
+++ b/java/com/android/dialer/searchfragment/list/res/values-zh-rHK/strings.xml
@@ -1,25 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_permission_no_search" msgid="6107959563874740441">"如要搜尋聯絡人，請開啟「通訊錄」權限。"</string>
-    <string name="search_shortcut_create_new_contact" msgid="1439862712551110400">"建立新聯絡人"</string>
-    <string name="search_shortcut_add_to_contact" msgid="3973534599468326173">"加至現有聯絡人資料"</string>
-    <string name="search_shortcut_send_sms_message" msgid="6871818587632705560">"傳送短訊"</string>
-    <string name="search_shortcut_make_video_call" msgid="3236284255758156964">"進行視像通話"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="new_permission_no_search">如要搜尋聯絡人，請開啟「通訊錄」權限。</string>
+  <string name="search_shortcut_create_new_contact">建立新聯絡人</string>
+  <string name="search_shortcut_add_to_contact">加至現有聯絡人資料</string>
+  <string name="search_shortcut_send_sms_message">傳送短訊</string>
+  <string name="search_shortcut_make_video_call">進行視像通話</string>
+  <string name="search_shortcut_make_voice_call">撥打 %1$s</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-zh-rTW/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-zh-rTW/strings.xml
index ffb7a34..fed436a 100644
--- a/java/com/android/dialer/searchfragment/list/res/values-zh-rTW/strings.xml
+++ b/java/com/android/dialer/searchfragment/list/res/values-zh-rTW/strings.xml
@@ -1,25 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_permission_no_search" msgid="6107959563874740441">"如要搜尋你的聯絡人，請開啟「聯絡人」存取權限。"</string>
-    <string name="search_shortcut_create_new_contact" msgid="1439862712551110400">"建立新聯絡人"</string>
-    <string name="search_shortcut_add_to_contact" msgid="3973534599468326173">"新增至聯絡人"</string>
-    <string name="search_shortcut_send_sms_message" msgid="6871818587632705560">"傳送簡訊"</string>
-    <string name="search_shortcut_make_video_call" msgid="3236284255758156964">"發起視訊通話"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="new_permission_no_search">如要搜尋你的聯絡人，請開啟「聯絡人」存取權限。</string>
+  <string name="search_shortcut_create_new_contact">建立新聯絡人</string>
+  <string name="search_shortcut_add_to_contact">新增至聯絡人</string>
+  <string name="search_shortcut_send_sms_message">傳送簡訊</string>
+  <string name="search_shortcut_make_video_call">進行視訊通話</string>
+  <string name="search_shortcut_make_voice_call">撥打 %1$s</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/list/res/values-zu/strings.xml b/java/com/android/dialer/searchfragment/list/res/values-zu/strings.xml
index aa3ab3c..5a1106a 100644
--- a/java/com/android/dialer/searchfragment/list/res/values-zu/strings.xml
+++ b/java/com/android/dialer/searchfragment/list/res/values-zu/strings.xml
@@ -1,25 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="new_permission_no_search" msgid="6107959563874740441">"Ukuze useshe oxhumana nabo, vula izimvume zoxhumana nabo."</string>
-    <string name="search_shortcut_create_new_contact" msgid="1439862712551110400">"Dala othintana naye omusha"</string>
-    <string name="search_shortcut_add_to_contact" msgid="3973534599468326173">"Engeza koxhumana naye"</string>
-    <string name="search_shortcut_send_sms_message" msgid="6871818587632705560">"Thumela i-SMS"</string>
-    <string name="search_shortcut_make_video_call" msgid="3236284255758156964">"Yenza ikholi yevidiyo"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="new_permission_no_search">Ukuze useshe oxhumana nabo, vula izimvume zoxhumana nabo.</string>
+  <string name="search_shortcut_create_new_contact">Dala oxhumana naye omusha</string>
+  <string name="search_shortcut_add_to_contact">Engeza koxhumana naye</string>
+  <string name="search_shortcut_send_sms_message">Thumela i-SMS</string>
+  <string name="search_shortcut_make_video_call">Yenza ikholi yevidiyo</string>
+  <string name="search_shortcut_make_voice_call">Shayela ku-%1$s</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/NearbyPlaceViewHolder.java b/java/com/android/dialer/searchfragment/nearbyplaces/NearbyPlaceViewHolder.java
index f15b236..968c195 100644
--- a/java/com/android/dialer/searchfragment/nearbyplaces/NearbyPlaceViewHolder.java
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/NearbyPlaceViewHolder.java
@@ -25,14 +25,12 @@
 import android.widget.QuickContactBadge;
 import android.widget.TextView;
 import com.android.contacts.common.util.Constants;
-import com.android.dialer.callintent.CallInitiationType;
-import com.android.dialer.callintent.CallIntentBuilder;
 import com.android.dialer.contactphoto.ContactPhotoManager;
 import com.android.dialer.lettertile.LetterTileDrawable;
-import com.android.dialer.precall.PreCall;
 import com.android.dialer.searchfragment.common.Projections;
 import com.android.dialer.searchfragment.common.QueryBoldingUtil;
 import com.android.dialer.searchfragment.common.R;
+import com.android.dialer.searchfragment.common.RowClickListener;
 import com.android.dialer.searchfragment.common.SearchCursor;
 
 /** ViewHolder for a nearby place row. */
@@ -43,16 +41,19 @@
   private final TextView placeName;
   private final TextView placeAddress;
   private final QuickContactBadge photo;
+  private final RowClickListener listener;
 
   private String number;
+  private int position;
 
-  public NearbyPlaceViewHolder(View view) {
+  public NearbyPlaceViewHolder(View view, RowClickListener listener) {
     super(view);
     view.setOnClickListener(this);
     photo = view.findViewById(R.id.photo);
     placeName = view.findViewById(R.id.primary);
     placeAddress = view.findViewById(R.id.secondary);
     context = view.getContext();
+    this.listener = listener;
   }
 
   /**
@@ -61,6 +62,7 @@
    */
   public void bind(SearchCursor cursor, String query) {
     number = cursor.getString(Projections.PHONE_NUMBER);
+    position = cursor.getPosition();
     String name = cursor.getString(Projections.DISPLAY_NAME);
     String address = cursor.getString(Projections.PHONE_LABEL);
 
@@ -93,6 +95,6 @@
 
   @Override
   public void onClick(View v) {
-    PreCall.start(context, new CallIntentBuilder(number, CallInitiationType.Type.REGULAR_SEARCH));
+    listener.placeVoiceCall(number, position);
   }
 }
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/drawable-hdpi/business_asset.png b/java/com/android/dialer/searchfragment/nearbyplaces/res/drawable-hdpi/business_asset.png
index 8164c9a..062bba5 100644
--- a/java/com/android/dialer/searchfragment/nearbyplaces/res/drawable-hdpi/business_asset.png
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/drawable-hdpi/business_asset.png
Binary files differ
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/drawable-mdpi/business_asset.png b/java/com/android/dialer/searchfragment/nearbyplaces/res/drawable-mdpi/business_asset.png
index e749e57..60d8497 100644
--- a/java/com/android/dialer/searchfragment/nearbyplaces/res/drawable-mdpi/business_asset.png
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/drawable-mdpi/business_asset.png
Binary files differ
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/drawable-xhdpi/business_asset.png b/java/com/android/dialer/searchfragment/nearbyplaces/res/drawable-xhdpi/business_asset.png
index 6014f68..e8a4e5d 100644
--- a/java/com/android/dialer/searchfragment/nearbyplaces/res/drawable-xhdpi/business_asset.png
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/drawable-xhdpi/business_asset.png
Binary files differ
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/drawable-xxhdpi/business_asset.png b/java/com/android/dialer/searchfragment/nearbyplaces/res/drawable-xxhdpi/business_asset.png
index 0dc4b4c..73b716c 100644
--- a/java/com/android/dialer/searchfragment/nearbyplaces/res/drawable-xxhdpi/business_asset.png
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/drawable-xxhdpi/business_asset.png
Binary files differ
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/drawable-xxxhdpi/business_asset.png b/java/com/android/dialer/searchfragment/nearbyplaces/res/drawable-xxxhdpi/business_asset.png
index ef76303..b243f71 100644
--- a/java/com/android/dialer/searchfragment/nearbyplaces/res/drawable-xxxhdpi/business_asset.png
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/drawable-xxxhdpi/business_asset.png
Binary files differ
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/layout/location_permission_row.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/layout/location_permission_row.xml
index 4373252..41ffb45 100644
--- a/java/com/android/dialer/searchfragment/nearbyplaces/res/layout/location_permission_row.xml
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/layout/location_permission_row.xml
@@ -47,8 +47,7 @@
         android:minHeight="40dp"
         android:text="@string/search_location_permission"
         android:lineSpacingMultiplier="1.2"
-        android:textSize="16sp"
-        android:textColor="@color/dialer_secondary_text_color"/>
+        style="@style/Dialer.TextAppearance.Primary"/>
 
     <Button
         android:id="@+id/location_permission_allow"
@@ -72,7 +71,7 @@
         android:paddingTop="8dp"
         android:paddingBottom="8dp"
         android:text="@string/nearby_places_dismiss"
-        android:textColor="@color/dialer_theme_color"
+        android:textColor="?android:attr/colorPrimary"
         style="@style/Widget.AppCompat.Button.Borderless"/>
   </RelativeLayout>
 </android.support.v7.widget.CardView>
\ No newline at end of file
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-af/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-af/strings.xml
index 6b24724..a020388 100644
--- a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-af/strings.xml
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-af/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="nearby_places" msgid="275117539511113867">"Nabygeleë plekke"</string>
-    <string name="search_location_permission" msgid="5893183045324252816">"Om kontakinligting vir plekke naby jou te kry, laat toegang tot jou ligging toe."</string>
-    <string name="nearby_places_allow" msgid="4060507469206871903">"Laat toe"</string>
-    <string name="nearby_places_dismiss" msgid="3255977972553076907">"Weier"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="nearby_places">Nabygeleë plekke</string>
+  <string name="search_location_permission">Om kontakinligting vir plekke naby jou te kry, laat toegang tot jou ligging toe.</string>
+  <string name="nearby_places_allow">Laat toe</string>
+  <string name="nearby_places_dismiss">Weier</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-am/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-am/strings.xml
index 8e1cf94..bcbfb22 100644
--- a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-am/strings.xml
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-am/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="nearby_places" msgid="275117539511113867">"በአቅራቢያ ያሉ ቦታዎች"</string>
-    <string name="search_location_permission" msgid="5893183045324252816">"በአቅራቢያዎ ላሉ ቦታዎች የእውቂያ መረጃ ለማግኘት፣ ወደ አካባቢዎ መዳረሻ ይፍቀዱ።"</string>
-    <string name="nearby_places_allow" msgid="4060507469206871903">"ፍቀድ"</string>
-    <string name="nearby_places_dismiss" msgid="3255977972553076907">"አሰናብት"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="nearby_places">በአቅራቢያ ያሉ ቦታዎች</string>
+  <string name="search_location_permission">በአቅራቢያዎ ላሉ ቦታዎች የእውቂያ መረጃ ለማግኘት፣ ወደ አካባቢዎ መዳረሻ ይፍቀዱ።</string>
+  <string name="nearby_places_allow">ፍቀድ</string>
+  <string name="nearby_places_dismiss">አሰናብት</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ar/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ar/strings.xml
index 82f868d..92d4725 100644
--- a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ar/strings.xml
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ar/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="nearby_places" msgid="275117539511113867">"الأماكن المجاورة"</string>
-    <string name="search_location_permission" msgid="5893183045324252816">"للحصول على معلومات الاتصال بأماكن موجودة بالقرب منك، امنح صلاحية الوصول إلى موقعك."</string>
-    <string name="nearby_places_allow" msgid="4060507469206871903">"سماح"</string>
-    <string name="nearby_places_dismiss" msgid="3255977972553076907">"رفض"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="nearby_places">الأماكن المجاورة</string>
+  <string name="search_location_permission">للحصول على معلومات الاتصال بأماكن موجودة بالقرب منك، امنح صلاحية الوصول إلى موقعك.</string>
+  <string name="nearby_places_allow">سماح</string>
+  <string name="nearby_places_dismiss">رفض</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-az/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-az/strings.xml
index 8ca4f33..40c14d7 100644
--- a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-az/strings.xml
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-az/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="nearby_places" msgid="275117539511113867">"Yaxınlıqdakı yerlər"</string>
-    <string name="search_location_permission" msgid="5893183045324252816">"Yaxınlıqdakı yerlər haqqında kontakt məlumatı almaq üçün məkana giriş icazəsi verin."</string>
-    <string name="nearby_places_allow" msgid="4060507469206871903">"İcazə verin"</string>
-    <string name="nearby_places_dismiss" msgid="3255977972553076907">"Rədd edin"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="nearby_places">Yaxınlıqdakı yerlər</string>
+  <string name="search_location_permission">Yaxınlıqdakı yerlər haqqında kontakt məlumatı almaq üçün məkana giriş icazəsi verin.</string>
+  <string name="nearby_places_allow">İcazə verin</string>
+  <string name="nearby_places_dismiss">Rədd edin</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-b+sr+Latn/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-b+sr+Latn/strings.xml
index 54ded80..2c42fbb 100644
--- a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-b+sr+Latn/strings.xml
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-b+sr+Latn/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="nearby_places" msgid="275117539511113867">"Obližnja mesta"</string>
-    <string name="search_location_permission" msgid="5893183045324252816">"Da biste dobijali kontakt informacije za mesta u svojoj blizini, odobrite pristup lokaciji."</string>
-    <string name="nearby_places_allow" msgid="4060507469206871903">"Dozvoli"</string>
-    <string name="nearby_places_dismiss" msgid="3255977972553076907">"Odbaci"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="nearby_places">Obližnja mesta</string>
+  <string name="search_location_permission">Da biste dobijali kontakt informacije za mesta u svojoj blizini, odobrite pristup lokaciji.</string>
+  <string name="nearby_places_allow">Dozvoli</string>
+  <string name="nearby_places_dismiss">Odbaci</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-be/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-be/strings.xml
index c3bd37b..956d744 100644
--- a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-be/strings.xml
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-be/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="nearby_places" msgid="275117539511113867">"Месцы паблізу"</string>
-    <string name="search_location_permission" msgid="5893183045324252816">"Каб атрымліваць кантактныя звесткі для месцаў паблізу з вамі, дазвольце доступ да месцазнаходжання."</string>
-    <string name="nearby_places_allow" msgid="4060507469206871903">"Дазволіць"</string>
-    <string name="nearby_places_dismiss" msgid="3255977972553076907">"Адхіліць"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="nearby_places">Месцы паблізу</string>
+  <string name="search_location_permission">Каб атрымліваць кантактныя звесткі для месцаў паблізу з вамі, дазвольце доступ да месцазнаходжання.</string>
+  <string name="nearby_places_allow">Дазволіць</string>
+  <string name="nearby_places_dismiss">Адхіліць</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-bg/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-bg/strings.xml
index 3147e74..771c0f0 100644
--- a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-bg/strings.xml
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-bg/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="nearby_places" msgid="275117539511113867">"Места в района"</string>
-    <string name="search_location_permission" msgid="5893183045324252816">"За да получавате информация за връзка за места в близост до вас, разрешете достъпа до местоположението си."</string>
-    <string name="nearby_places_allow" msgid="4060507469206871903">"Разрешаване"</string>
-    <string name="nearby_places_dismiss" msgid="3255977972553076907">"Отхвърляне"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="nearby_places">Места в района</string>
+  <string name="search_location_permission">За да получавате информация за връзка за места в близост до вас, разрешете достъпа до местоположението си.</string>
+  <string name="nearby_places_allow">Разрешаване</string>
+  <string name="nearby_places_dismiss">Отхвърляне</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-bn/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-bn/strings.xml
index 2990c14..411b32a 100644
--- a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-bn/strings.xml
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-bn/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="nearby_places" msgid="275117539511113867">"আশপাশের জায়গাগুলি"</string>
-    <string name="search_location_permission" msgid="5893183045324252816">"আশেপাশের স্থানগুলির যোগাযোগের তথ্য পেতে আপনার লোকেশনে অ্যাক্সেস দিন।"</string>
-    <string name="nearby_places_allow" msgid="4060507469206871903">"অ্যাক্সেস দিন"</string>
-    <string name="nearby_places_dismiss" msgid="3255977972553076907">"খারিজ করুন"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="nearby_places">আশপাশের জায়গাগুলি</string>
+  <string name="search_location_permission">আশেপাশের স্থানগুলির যোগাযোগের তথ্য পেতে আপনার লোকেশনে অ্যাক্সেস দিন।</string>
+  <string name="nearby_places_allow">অ্যাক্সেস দিন</string>
+  <string name="nearby_places_dismiss">খারিজ করুন</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-bs/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-bs/strings.xml
index f356734..a4b8881 100644
--- a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-bs/strings.xml
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-bs/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="nearby_places" msgid="275117539511113867">"Mjesta u blizini"</string>
-    <string name="search_location_permission" msgid="5893183045324252816">"Da dobijete podatke o kontaktu za mjesta u blizini, dozvolite pristup lokaciji."</string>
-    <string name="nearby_places_allow" msgid="4060507469206871903">"Dozvoli"</string>
-    <string name="nearby_places_dismiss" msgid="3255977972553076907">"Odbaci"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="nearby_places">Mjesta u blizini</string>
+  <string name="search_location_permission">Da dobijete podatke o kontaktu za mjesta u blizini, dozvolite pristup lokaciji.</string>
+  <string name="nearby_places_allow">Dozvoli</string>
+  <string name="nearby_places_dismiss">Odbaci</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ca/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ca/strings.xml
index 62a5f2e..f00f1af 100644
--- a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ca/strings.xml
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ca/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="nearby_places" msgid="275117539511113867">"Llocs propers"</string>
-    <string name="search_location_permission" msgid="5893183045324252816">"Permet l\'accés a la teva ubicació per obtenir la informació de contacte dels llocs propers."</string>
-    <string name="nearby_places_allow" msgid="4060507469206871903">"Permet"</string>
-    <string name="nearby_places_dismiss" msgid="3255977972553076907">"Ignora"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="nearby_places">Llocs propers</string>
+  <string name="search_location_permission">Permet l\'accés a la teva ubicació per obtenir la informació de contacte dels llocs propers.</string>
+  <string name="nearby_places_allow">Permet</string>
+  <string name="nearby_places_dismiss">Ignora</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-cs/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-cs/strings.xml
index 299c70f..c8dfe0f 100644
--- a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-cs/strings.xml
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-cs/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="nearby_places" msgid="275117539511113867">"Místa v okolí"</string>
-    <string name="search_location_permission" msgid="5893183045324252816">"Pokud chcete najít kontaktní údaje míst ve vašem okolí, povolte aplikaci přístup ke své poloze."</string>
-    <string name="nearby_places_allow" msgid="4060507469206871903">"Povolit"</string>
-    <string name="nearby_places_dismiss" msgid="3255977972553076907">"Zavřít"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="nearby_places">Místa v okolí</string>
+  <string name="search_location_permission">Pokud chcete najít kontaktní údaje míst ve vašem okolí, povolte aplikaci přístup ke své poloze.</string>
+  <string name="nearby_places_allow">Povolit</string>
+  <string name="nearby_places_dismiss">Zavřít</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-da/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-da/strings.xml
index 9a15503..064add2 100644
--- a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-da/strings.xml
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-da/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="nearby_places" msgid="275117539511113867">"Steder i nærheden"</string>
-    <string name="search_location_permission" msgid="5893183045324252816">"Tillad adgang til din placering for at få kontaktoplysninger om steder i nærheden af dig."</string>
-    <string name="nearby_places_allow" msgid="4060507469206871903">"Tillad"</string>
-    <string name="nearby_places_dismiss" msgid="3255977972553076907">"Afvis"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="nearby_places">Steder i nærheden</string>
+  <string name="search_location_permission">Tillad adgang til din placering for at få kontaktoplysninger om steder i nærheden af dig.</string>
+  <string name="nearby_places_allow">Tillad</string>
+  <string name="nearby_places_dismiss">Afvis</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-de/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-de/strings.xml
index f24b188..bf19ade 100644
--- a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-de/strings.xml
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-de/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="nearby_places" msgid="275117539511113867">"Orte in der Nähe"</string>
-    <string name="search_location_permission" msgid="5893183045324252816">"Erlaube den Zugriff auf deinen Standort, um Kontaktinformationen für Orte in der Nähe zu erhalten."</string>
-    <string name="nearby_places_allow" msgid="4060507469206871903">"Erlauben"</string>
-    <string name="nearby_places_dismiss" msgid="3255977972553076907">"Ablehnen"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="nearby_places">Orte in der Nähe</string>
+  <string name="search_location_permission">Erlaube den Zugriff auf deinen Standort, um Kontaktinformationen für Orte in der Nähe zu erhalten.</string>
+  <string name="nearby_places_allow">Erlauben</string>
+  <string name="nearby_places_dismiss">Ablehnen</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-el/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-el/strings.xml
index d5b9920..60b320d 100644
--- a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-el/strings.xml
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-el/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="nearby_places" msgid="275117539511113867">"Κοντινά μέρη"</string>
-    <string name="search_location_permission" msgid="5893183045324252816">"Για να λάβετε πληροφορίες επικοινωνίας για μέρη κοντά σας, επιτρέψτε την πρόσβαση στην τοποθεσία σας."</string>
-    <string name="nearby_places_allow" msgid="4060507469206871903">"Ναι"</string>
-    <string name="nearby_places_dismiss" msgid="3255977972553076907">"Παράβλεψη"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="nearby_places">Κοντινά μέρη</string>
+  <string name="search_location_permission">Για να λάβετε πληροφορίες επικοινωνίας για μέρη κοντά σας, επιτρέψτε την πρόσβαση στην τοποθεσία σας.</string>
+  <string name="nearby_places_allow">Ναι</string>
+  <string name="nearby_places_dismiss">Παράβλεψη</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-en-rAU/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-en-rAU/strings.xml
index 57c3218..9ae579f 100644
--- a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-en-rAU/strings.xml
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-en-rAU/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="nearby_places" msgid="275117539511113867">"Places nearby"</string>
-    <string name="search_location_permission" msgid="5893183045324252816">"To get contact information for places near you, allow access to your location."</string>
-    <string name="nearby_places_allow" msgid="4060507469206871903">"Allow"</string>
-    <string name="nearby_places_dismiss" msgid="3255977972553076907">"Dismiss"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="nearby_places">Places nearby</string>
+  <string name="search_location_permission">To get contact information for places near you, allow access to your location.</string>
+  <string name="nearby_places_allow">Allow</string>
+  <string name="nearby_places_dismiss">Dismiss</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-en-rGB/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-en-rGB/strings.xml
index 57c3218..9ae579f 100644
--- a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-en-rGB/strings.xml
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-en-rGB/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="nearby_places" msgid="275117539511113867">"Places nearby"</string>
-    <string name="search_location_permission" msgid="5893183045324252816">"To get contact information for places near you, allow access to your location."</string>
-    <string name="nearby_places_allow" msgid="4060507469206871903">"Allow"</string>
-    <string name="nearby_places_dismiss" msgid="3255977972553076907">"Dismiss"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="nearby_places">Places nearby</string>
+  <string name="search_location_permission">To get contact information for places near you, allow access to your location.</string>
+  <string name="nearby_places_allow">Allow</string>
+  <string name="nearby_places_dismiss">Dismiss</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-en-rIN/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-en-rIN/strings.xml
index 57c3218..9ae579f 100644
--- a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-en-rIN/strings.xml
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-en-rIN/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="nearby_places" msgid="275117539511113867">"Places nearby"</string>
-    <string name="search_location_permission" msgid="5893183045324252816">"To get contact information for places near you, allow access to your location."</string>
-    <string name="nearby_places_allow" msgid="4060507469206871903">"Allow"</string>
-    <string name="nearby_places_dismiss" msgid="3255977972553076907">"Dismiss"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="nearby_places">Places nearby</string>
+  <string name="search_location_permission">To get contact information for places near you, allow access to your location.</string>
+  <string name="nearby_places_allow">Allow</string>
+  <string name="nearby_places_dismiss">Dismiss</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-es-rUS/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-es-rUS/strings.xml
index 1df12b2..d5f3bcf 100644
--- a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-es-rUS/strings.xml
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-es-rUS/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="nearby_places" msgid="275117539511113867">"Lugares cercanos"</string>
-    <string name="search_location_permission" msgid="5893183045324252816">"Para obtener información de contacto de lugares cercanos, permite el acceso a tu ubicación."</string>
-    <string name="nearby_places_allow" msgid="4060507469206871903">"Permitir"</string>
-    <string name="nearby_places_dismiss" msgid="3255977972553076907">"Descartar"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="nearby_places">Lugares cercanos</string>
+  <string name="search_location_permission">Para obtener información de contacto de lugares cercanos, permite el acceso a tu ubicación.</string>
+  <string name="nearby_places_allow">Permitir</string>
+  <string name="nearby_places_dismiss">Descartar</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-es/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-es/strings.xml
index 3f265de..bc5a27a 100644
--- a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-es/strings.xml
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-es/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="nearby_places" msgid="275117539511113867">"Sitios cercanos"</string>
-    <string name="search_location_permission" msgid="5893183045324252816">"Para ver la información de contacto de sitios de tu alrededor, permite el acceso a tu ubicación."</string>
-    <string name="nearby_places_allow" msgid="4060507469206871903">"Permitir"</string>
-    <string name="nearby_places_dismiss" msgid="3255977972553076907">"Rechazar"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="nearby_places">Sitios cercanos</string>
+  <string name="search_location_permission">Para ver la información de contacto de sitios de tu alrededor, permite el acceso a tu ubicación.</string>
+  <string name="nearby_places_allow">Permitir</string>
+  <string name="nearby_places_dismiss">Rechazar</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-et/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-et/strings.xml
index 3da942b..9656ecb 100644
--- a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-et/strings.xml
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-et/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="nearby_places" msgid="275117539511113867">"Lähedalasuvad kohad"</string>
-    <string name="search_location_permission" msgid="5893183045324252816">"Teie läheduses olevate kohtade kohta kontaktteabe saamiseks andke juurdepääs oma asukohale."</string>
-    <string name="nearby_places_allow" msgid="4060507469206871903">"Luba"</string>
-    <string name="nearby_places_dismiss" msgid="3255977972553076907">"Loobu"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="nearby_places">Lähedalasuvad kohad</string>
+  <string name="search_location_permission">Teie läheduses olevate kohtade kohta kontaktteabe saamiseks andke juurdepääs oma asukohale.</string>
+  <string name="nearby_places_allow">Luba</string>
+  <string name="nearby_places_dismiss">Loobu</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-eu/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-eu/strings.xml
index 6fe0818..6368e1b 100644
--- a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-eu/strings.xml
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-eu/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="nearby_places" msgid="275117539511113867">"Inguruko tokiak"</string>
-    <string name="search_location_permission" msgid="5893183045324252816">"Inguruan dituzun tokien harremanetarako informazioa lortzeko, eman baimena zure kokapena atzitzeko."</string>
-    <string name="nearby_places_allow" msgid="4060507469206871903">"Baimendu"</string>
-    <string name="nearby_places_dismiss" msgid="3255977972553076907">"Baztertu"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="nearby_places">Inguruko tokiak</string>
+  <string name="search_location_permission">Inguruan dituzun tokien harremanetarako informazioa lortzeko, eman baimena zure kokapena atzitzeko.</string>
+  <string name="nearby_places_allow">Baimendu</string>
+  <string name="nearby_places_dismiss">Baztertu</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-fa/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-fa/strings.xml
index ac23d39..aaf5f72 100644
--- a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-fa/strings.xml
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-fa/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="nearby_places" msgid="275117539511113867">"مکان‌های اطراف"</string>
-    <string name="search_location_permission" msgid="5893183045324252816">"برای دریافت اطلاعات تماس مکان‌های اطرافتان، به برنامه اجازه دهید به مکانتان دسترسی داشته باشد."</string>
-    <string name="nearby_places_allow" msgid="4060507469206871903">"اجازه دادن"</string>
-    <string name="nearby_places_dismiss" msgid="3255977972553076907">"نپذیرفتن"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="nearby_places">مکان‌های اطراف</string>
+  <string name="search_location_permission">برای دریافت اطلاعات تماس مکان‌های اطرافتان، به برنامه اجازه دهید به مکانتان دسترسی داشته باشد.</string>
+  <string name="nearby_places_allow">اجازه دادن</string>
+  <string name="nearby_places_dismiss">نپذیرفتن</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-fi/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-fi/strings.xml
index 5dd5eb2..51fb642 100644
--- a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-fi/strings.xml
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-fi/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="nearby_places" msgid="275117539511113867">"Lähellä olevat paikat"</string>
-    <string name="search_location_permission" msgid="5893183045324252816">"Voit nähdä lähelläsi olevien paikkojen yhteystiedot sallimalla sijaintisi käyttöoikeus."</string>
-    <string name="nearby_places_allow" msgid="4060507469206871903">"Salli"</string>
-    <string name="nearby_places_dismiss" msgid="3255977972553076907">"Ohita"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="nearby_places">Lähellä olevat paikat</string>
+  <string name="search_location_permission">Voit nähdä lähelläsi olevien paikkojen yhteystiedot sallimalla sijaintisi käyttöoikeus.</string>
+  <string name="nearby_places_allow">Salli</string>
+  <string name="nearby_places_dismiss">Ohita</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-fr-rCA/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-fr-rCA/strings.xml
index eb2be17..62aaf58 100644
--- a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-fr-rCA/strings.xml
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-fr-rCA/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="nearby_places" msgid="275117539511113867">"Adresses à proximité"</string>
-    <string name="search_location_permission" msgid="5893183045324252816">"Pour obtenir les coordonnées de lieux à proximité, autorisez l\'accès à votre position."</string>
-    <string name="nearby_places_allow" msgid="4060507469206871903">"Autoriser"</string>
-    <string name="nearby_places_dismiss" msgid="3255977972553076907">"Ignorer"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="nearby_places">Adresses à proximité</string>
+  <string name="search_location_permission">Pour obtenir les coordonnées de lieux à proximité, autorisez l\'accès à votre position.</string>
+  <string name="nearby_places_allow">Autoriser</string>
+  <string name="nearby_places_dismiss">Ignorer</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-fr/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-fr/strings.xml
index 9b07b34..b311c08 100644
--- a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-fr/strings.xml
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-fr/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="nearby_places" msgid="275117539511113867">"Adresses à proximité"</string>
-    <string name="search_location_permission" msgid="5893183045324252816">"Pour obtenir les coordonnées de lieux à proximité, autorisez l\'accès à vos données de localisation."</string>
-    <string name="nearby_places_allow" msgid="4060507469206871903">"Autoriser"</string>
-    <string name="nearby_places_dismiss" msgid="3255977972553076907">"Ignorer"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="nearby_places">Adresses à proximité</string>
+  <string name="search_location_permission">Pour obtenir les coordonnées de lieux à proximité, autorisez l\'accès à vos données de localisation.</string>
+  <string name="nearby_places_allow">Autoriser</string>
+  <string name="nearby_places_dismiss">Ignorer</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-gl/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-gl/strings.xml
index 0ff6655..ba5f731 100644
--- a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-gl/strings.xml
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-gl/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="nearby_places" msgid="275117539511113867">"Lugares próximos"</string>
-    <string name="search_location_permission" msgid="5893183045324252816">"Para obter información de contacto dos lugares que están cerca de ti, permite o acceso á túa localización."</string>
-    <string name="nearby_places_allow" msgid="4060507469206871903">"Permitir"</string>
-    <string name="nearby_places_dismiss" msgid="3255977972553076907">"Ignorar"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="nearby_places">Lugares próximos</string>
+  <string name="search_location_permission">Para obter información de contacto dos lugares que están cerca de ti, permite o acceso á túa localización.</string>
+  <string name="nearby_places_allow">Permitir</string>
+  <string name="nearby_places_dismiss">Ignorar</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-gu/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-gu/strings.xml
index eb4b2a6..1246d70 100644
--- a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-gu/strings.xml
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-gu/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="nearby_places" msgid="275117539511113867">"નજીકના સ્થળો"</string>
-    <string name="search_location_permission" msgid="5893183045324252816">"તમારી નજીકના સ્થાનોની સંપર્ક માહિતી મેળવવા માટે, તમારું સ્થાન ઍક્સેસ કરવાની મંજૂરી આપો."</string>
-    <string name="nearby_places_allow" msgid="4060507469206871903">"મંજૂરી આપો"</string>
-    <string name="nearby_places_dismiss" msgid="3255977972553076907">"છોડી દો"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="nearby_places">નજીકના સ્થળો</string>
+  <string name="search_location_permission">તમારી નજીકના સ્થાનોની સંપર્ક માહિતી મેળવવા માટે, તમારું સ્થાન ઍક્સેસ કરવાની મંજૂરી આપો.</string>
+  <string name="nearby_places_allow">મંજૂરી આપો</string>
+  <string name="nearby_places_dismiss">છોડી દો</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-hi/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-hi/strings.xml
index f0aff1c..1bbb804 100644
--- a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-hi/strings.xml
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-hi/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="nearby_places" msgid="275117539511113867">"आस-पास के स्थल"</string>
-    <string name="search_location_permission" msgid="5893183045324252816">"अपने आस-पास के स्थानों की संपर्क जानकारी पाने के लिए, अपना स्थान एक्सेस करने की अनुमति दें."</string>
-    <string name="nearby_places_allow" msgid="4060507469206871903">"अनुमति दें"</string>
-    <string name="nearby_places_dismiss" msgid="3255977972553076907">"खारिज करें"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="nearby_places">आस-पास के स्थान</string>
+  <string name="search_location_permission">अपने आस-पास के स्थानों की संपर्क जानकारी पाने के लिए, अपनी जगह की जानकारी एक्सेस करने की अनुमति दें.</string>
+  <string name="nearby_places_allow">अनुमति दें</string>
+  <string name="nearby_places_dismiss">खारिज करें</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-hr/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-hr/strings.xml
index aaf248f..b7c92c6 100644
--- a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-hr/strings.xml
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-hr/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="nearby_places" msgid="275117539511113867">"Mjesta u blizini"</string>
-    <string name="search_location_permission" msgid="5893183045324252816">"Da biste primali podatke za kontakt za mjesta u svojoj blizini, dopustite pristupanje lokaciji."</string>
-    <string name="nearby_places_allow" msgid="4060507469206871903">"Dopusti"</string>
-    <string name="nearby_places_dismiss" msgid="3255977972553076907">"Odbaci"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="nearby_places">Mjesta u blizini</string>
+  <string name="search_location_permission">Da biste primali podatke za kontakt za mjesta u svojoj blizini, dopustite pristupanje lokaciji.</string>
+  <string name="nearby_places_allow">Dopusti</string>
+  <string name="nearby_places_dismiss">Odbaci</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-hu/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-hu/strings.xml
index dc68362..2248404 100644
--- a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-hu/strings.xml
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-hu/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="nearby_places" msgid="275117539511113867">"Közeli helyek"</string>
-    <string name="search_location_permission" msgid="5893183045324252816">"A közeli helyek kapcsolatfelvételi adatainak lekéréséhez engedélyezze a helyadatokhoz való hozzáférést."</string>
-    <string name="nearby_places_allow" msgid="4060507469206871903">"Engedélyezés"</string>
-    <string name="nearby_places_dismiss" msgid="3255977972553076907">"Elvetés"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="nearby_places">Közeli helyek</string>
+  <string name="search_location_permission">A közeli helyek kapcsolatfelvételi adatainak lekéréséhez engedélyezze a helyadatokhoz való hozzáférést.</string>
+  <string name="nearby_places_allow">Engedélyezés</string>
+  <string name="nearby_places_dismiss">Elvetés</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-hy/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-hy/strings.xml
index fa6ff2c..7a56c57 100644
--- a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-hy/strings.xml
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-hy/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="nearby_places" msgid="275117539511113867">"Մոտակա վայրեր"</string>
-    <string name="search_location_permission" msgid="5893183045324252816">"Մոտակայքում գտնվող վայրերի կոնտակտային տվյալները ստանալու համար թույլատրեք օգտագործել տեղադրության մասին տվյալները:"</string>
-    <string name="nearby_places_allow" msgid="4060507469206871903">"Թույլատրել"</string>
-    <string name="nearby_places_dismiss" msgid="3255977972553076907">"Ոչ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="nearby_places">Մոտակա վայրեր</string>
+  <string name="search_location_permission">Մոտակայքում գտնվող վայրերի կոնտակտային տվյալները ստանալու համար թույլատրեք օգտագործել տեղադրության մասին տվյալները:</string>
+  <string name="nearby_places_allow">Թույլատրել</string>
+  <string name="nearby_places_dismiss">Ոչ</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-in/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-in/strings.xml
index f889183..7d8761b 100644
--- a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-in/strings.xml
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-in/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="nearby_places" msgid="275117539511113867">"Tempat terdekat"</string>
-    <string name="search_location_permission" msgid="5893183045324252816">"To  obtain  information  contact  for  a place  in  near  you,  please allow  access  to  the location  you."</string>
-    <string name="nearby_places_allow" msgid="4060507469206871903">"Izinkan"</string>
-    <string name="nearby_places_dismiss" msgid="3255977972553076907">"Tolak"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="nearby_places">Tempat terdekat</string>
+  <string name="search_location_permission">To  obtain  information  contact  for  a place  in  near  you,  please allow  access  to  the location  you.</string>
+  <string name="nearby_places_allow">Izinkan</string>
+  <string name="nearby_places_dismiss">Tolak</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-is/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-is/strings.xml
index ce26e32..c7ed75f 100644
--- a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-is/strings.xml
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-is/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="nearby_places" msgid="275117539511113867">"Staðir í nágrenninu"</string>
-    <string name="search_location_permission" msgid="5893183045324252816">"Til að fá samskiptaupplýsingar fyrir staði í nágrenninu skaltu leyfa aðgang að staðsetningu."</string>
-    <string name="nearby_places_allow" msgid="4060507469206871903">"Leyfa"</string>
-    <string name="nearby_places_dismiss" msgid="3255977972553076907">"Hunsa"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="nearby_places">Staðir í nágrenninu</string>
+  <string name="search_location_permission">Til að fá samskiptaupplýsingar fyrir staði í nágrenninu skaltu leyfa aðgang að staðsetningu.</string>
+  <string name="nearby_places_allow">Leyfa</string>
+  <string name="nearby_places_dismiss">Hunsa</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-it/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-it/strings.xml
index 6d0995d..983784a 100644
--- a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-it/strings.xml
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-it/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="nearby_places" msgid="275117539511113867">"Luoghi nelle vicinanze"</string>
-    <string name="search_location_permission" msgid="5893183045324252816">"Per ricevere le informazioni di contatto dei luoghi nelle vicinanze, consenti l\'accesso alla tua posizione."</string>
-    <string name="nearby_places_allow" msgid="4060507469206871903">"Consenti"</string>
-    <string name="nearby_places_dismiss" msgid="3255977972553076907">"Ignora"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="nearby_places">Luoghi nelle vicinanze</string>
+  <string name="search_location_permission">Per ricevere le informazioni di contatto dei luoghi nelle vicinanze, consenti l\'accesso alla tua posizione.</string>
+  <string name="nearby_places_allow">Consenti</string>
+  <string name="nearby_places_dismiss">Ignora</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-iw/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-iw/strings.xml
index 2c666d4..715471b 100644
--- a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-iw/strings.xml
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-iw/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="nearby_places" msgid="275117539511113867">"מקומות קרובים"</string>
-    <string name="search_location_permission" msgid="5893183045324252816">"יש לאשר לאפליקציה גישה למיקום שלך כדי לקבל את הפרטים ליצירת קשר של מקומות בסביבה."</string>
-    <string name="nearby_places_allow" msgid="4060507469206871903">"אני רוצה לאשר"</string>
-    <string name="nearby_places_dismiss" msgid="3255977972553076907">"סגירה"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="nearby_places">מקומות קרובים</string>
+  <string name="search_location_permission">יש לאשר לאפליקציה גישה למיקום שלך כדי לקבל את הפרטים ליצירת קשר של מקומות בסביבה.</string>
+  <string name="nearby_places_allow">אני רוצה לאשר</string>
+  <string name="nearby_places_dismiss">סגירה</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ja/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ja/strings.xml
index 0a0c7fb..7f2301a 100644
--- a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ja/strings.xml
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ja/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="nearby_places" msgid="275117539511113867">"周辺のスポット"</string>
-    <string name="search_location_permission" msgid="5893183045324252816">"付近の場所の連絡先情報を取得するには、位置情報へのアクセスを許可してください。"</string>
-    <string name="nearby_places_allow" msgid="4060507469206871903">"許可"</string>
-    <string name="nearby_places_dismiss" msgid="3255977972553076907">"閉じる"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="nearby_places">周辺のスポット</string>
+  <string name="search_location_permission">付近の場所の連絡先情報を取得するには、位置情報へのアクセスを許可してください。</string>
+  <string name="nearby_places_allow">許可</string>
+  <string name="nearby_places_dismiss">閉じる</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ka/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ka/strings.xml
index 16865f8..2b7a1f6 100644
--- a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ka/strings.xml
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ka/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="nearby_places" msgid="275117539511113867">"ახლომდებარე ადგილები"</string>
-    <string name="search_location_permission" msgid="5893183045324252816">"ახლომდებარე ადგილების საკონტაქტო ინფორმაციის მისაღებად დაუშვით წვდომა თქვენს მდებარეობაზე."</string>
-    <string name="nearby_places_allow" msgid="4060507469206871903">"დაშვება"</string>
-    <string name="nearby_places_dismiss" msgid="3255977972553076907">"დახურვა"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="nearby_places">ახლომდებარე ადგილები</string>
+  <string name="search_location_permission">ახლომდებარე ადგილების საკონტაქტო ინფორმაციის მისაღებად დაუშვით წვდომა თქვენს მდებარეობაზე.</string>
+  <string name="nearby_places_allow">დაშვება</string>
+  <string name="nearby_places_dismiss">დახურვა</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-kk/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-kk/strings.xml
index 309f359..450eb51 100644
--- a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-kk/strings.xml
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-kk/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="nearby_places" msgid="275117539511113867">"Маңайдағы орындар"</string>
-    <string name="search_location_permission" msgid="5893183045324252816">"Маңайдағы орындардың контакт деректерін алу үшін, орын деректеріңізге кіруге рұқсат беріңіз."</string>
-    <string name="nearby_places_allow" msgid="4060507469206871903">"Рұқсат беру"</string>
-    <string name="nearby_places_dismiss" msgid="3255977972553076907">"Жабу"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="nearby_places">Маңайдағы орындар</string>
+  <string name="search_location_permission">Маңайдағы орындардың контакт деректерін алу үшін, орын деректеріңізге кіруге рұқсат беріңіз.</string>
+  <string name="nearby_places_allow">Рұқсат беру</string>
+  <string name="nearby_places_dismiss">Жабу</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-km/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-km/strings.xml
index c371ba4..3e48b11 100644
--- a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-km/strings.xml
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-km/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="nearby_places" msgid="275117539511113867">"កន្លែងនៅក្បែរ"</string>
-    <string name="search_location_permission" msgid="5893183045324252816">"ដើម្បី​ទទួល​បាន​ព័ត៌មាន​ទំនាក់ទំនង​សម្រាប់​កន្លែង​ដែល​នៅ​ជិត​អ្នក សូម​អនុញ្ញាត​ការចូលប្រើប្រាស់​ទីតាំង​របស់​អ្នក។"</string>
-    <string name="nearby_places_allow" msgid="4060507469206871903">"អនុញ្ញាត"</string>
-    <string name="nearby_places_dismiss" msgid="3255977972553076907">"បដិសេធ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="nearby_places">កន្លែងនៅក្បែរ</string>
+  <string name="search_location_permission">ដើម្បី​ទទួល​បាន​ព័ត៌មាន​ទំនាក់ទំនង​សម្រាប់​កន្លែង​ដែល​នៅ​ជិត​អ្នក សូម​អនុញ្ញាត​ការចូលប្រើប្រាស់​ទីតាំង​របស់​អ្នក។</string>
+  <string name="nearby_places_allow">អនុញ្ញាត</string>
+  <string name="nearby_places_dismiss">បដិសេធ</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-kn/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-kn/strings.xml
index c3af078..97de388 100644
--- a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-kn/strings.xml
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-kn/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="nearby_places" msgid="275117539511113867">"ಹತ್ತಿರದ ಸ್ಥಳಗಳು"</string>
-    <string name="search_location_permission" msgid="5893183045324252816">"ನಿಮ್ಮ ಹತ್ತಿರದ ಸ್ಥಳಗಳಿಗಾಗಿ ಸಂಪರ್ಕ ಮಾಹಿತಿಯನ್ನು ಪಡೆಯಲು, ನಿಮ್ಮ ಸ್ಥಳಕ್ಕೆ ಪ್ರವೇಶವನ್ನು ಅನುಮತಿಸಿ."</string>
-    <string name="nearby_places_allow" msgid="4060507469206871903">"ಅನುಮತಿಸಿ"</string>
-    <string name="nearby_places_dismiss" msgid="3255977972553076907">"ವಜಾಗೊಳಿಸಿ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="nearby_places">ಹತ್ತಿರದ ಸ್ಥಳಗಳು</string>
+  <string name="search_location_permission">ನಿಮ್ಮ ಹತ್ತಿರದ ಸ್ಥಳಗಳಿಗಾಗಿ ಸಂಪರ್ಕ ಮಾಹಿತಿಯನ್ನು ಪಡೆಯಲು, ನಿಮ್ಮ ಸ್ಥಳಕ್ಕೆ ಪ್ರವೇಶವನ್ನು ಅನುಮತಿಸಿ.</string>
+  <string name="nearby_places_allow">ಅನುಮತಿಸಿ</string>
+  <string name="nearby_places_dismiss">ವಜಾಗೊಳಿಸಿ</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ko/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ko/strings.xml
index b7fe953..145699d 100644
--- a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ko/strings.xml
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ko/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="nearby_places" msgid="275117539511113867">"주변 장소"</string>
-    <string name="search_location_permission" msgid="5893183045324252816">"주변 장소의 연락처 정보를 보려면 내 위치 정보에 액세스할 수 있도록 허용하세요."</string>
-    <string name="nearby_places_allow" msgid="4060507469206871903">"허용"</string>
-    <string name="nearby_places_dismiss" msgid="3255977972553076907">"닫기"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="nearby_places">주변 장소</string>
+  <string name="search_location_permission">주변 장소의 연락처 정보를 보려면 내 위치 정보에 액세스할 수 있도록 허용하세요.</string>
+  <string name="nearby_places_allow">허용</string>
+  <string name="nearby_places_dismiss">닫기</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ky/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ky/strings.xml
index 0500ee6..179531a 100644
--- a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ky/strings.xml
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ky/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="nearby_places" msgid="275117539511113867">"Жакын арадагы жерлер"</string>
-    <string name="search_location_permission" msgid="5893183045324252816">"Жакын арадагы жерлердин байланыш маалыматтарын алуу үчүн, жайгашкан жериңиздин маалыматтарына кирүү мүмкүнчүлүгүн бериңиз."</string>
-    <string name="nearby_places_allow" msgid="4060507469206871903">"Уруксат берүү"</string>
-    <string name="nearby_places_dismiss" msgid="3255977972553076907">"Жабуу"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="nearby_places">Жакын арадагы жерлер</string>
+  <string name="search_location_permission">Жакын арадагы жерлердин байланыш маалыматтарын алуу үчүн, жайгашкан жериңиздин маалыматтарына кирүү мүмкүнчүлүгүн бериңиз.</string>
+  <string name="nearby_places_allow">Уруксат берүү</string>
+  <string name="nearby_places_dismiss">Жабуу</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-lo/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-lo/strings.xml
index a43c69e..470d4fa 100644
--- a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-lo/strings.xml
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-lo/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="nearby_places" msgid="275117539511113867">"ສະຖານທີ່ໃກ້ຄຽງ"</string>
-    <string name="search_location_permission" msgid="5893183045324252816">"ເພື່ອຮັບຂໍ້ມູນການຕິດຕໍ່ສຳລັບສະຖານທີ່ໃກ້ທ່ານ, ໃຫ້ອະນຸຍາດການເຂົ້າເຖິງສະຖານທີ່ຂອງທ່ານກ່ອນ."</string>
-    <string name="nearby_places_allow" msgid="4060507469206871903">"ອະນຸຍາດ"</string>
-    <string name="nearby_places_dismiss" msgid="3255977972553076907">"ປິດໄວ້"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="nearby_places">ສະຖານທີ່ໃກ້ຄຽງ</string>
+  <string name="search_location_permission">ເພື່ອຮັບຂໍ້ມູນການຕິດຕໍ່ສຳລັບສະຖານທີ່ໃກ້ທ່ານ, ໃຫ້ອະນຸຍາດການເຂົ້າເຖິງສະຖານທີ່ຂອງທ່ານກ່ອນ.</string>
+  <string name="nearby_places_allow">ອະນຸຍາດ</string>
+  <string name="nearby_places_dismiss">ປິດໄວ້</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-lt/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-lt/strings.xml
index c6730f4..5d7819f 100644
--- a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-lt/strings.xml
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-lt/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="nearby_places" msgid="275117539511113867">"Netoliese esančios vietos"</string>
-    <string name="search_location_permission" msgid="5893183045324252816">"Jei norite gauti netoli jūsų esančių vietų kontaktinės informacijos, suteikite prieigą prie vietovės."</string>
-    <string name="nearby_places_allow" msgid="4060507469206871903">"Leisti"</string>
-    <string name="nearby_places_dismiss" msgid="3255977972553076907">"Atsisakyti"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="nearby_places">Netoliese esančios vietos</string>
+  <string name="search_location_permission">Jei norite gauti netoli jūsų esančių vietų kontaktinės informacijos, suteikite prieigą prie vietovės.</string>
+  <string name="nearby_places_allow">Leisti</string>
+  <string name="nearby_places_dismiss">Atsisakyti</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-lv/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-lv/strings.xml
index b9b385f..2cf935a 100644
--- a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-lv/strings.xml
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-lv/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="nearby_places" msgid="275117539511113867">"Vietas blakus"</string>
-    <string name="search_location_permission" msgid="5893183045324252816">"Lai iegūtu kontaktinformāciju vietām, kas atrodas jums tuvumā, atļaujiet piekļuvi savai atrašanās vietai."</string>
-    <string name="nearby_places_allow" msgid="4060507469206871903">"Atļaut"</string>
-    <string name="nearby_places_dismiss" msgid="3255977972553076907">"Noraidīt"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="nearby_places">Vietas blakus</string>
+  <string name="search_location_permission">Lai iegūtu kontaktinformāciju vietām, kas atrodas jums tuvumā, atļaujiet piekļuvi savai atrašanās vietai.</string>
+  <string name="nearby_places_allow">Atļaut</string>
+  <string name="nearby_places_dismiss">Noraidīt</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-mk/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-mk/strings.xml
index 21578af..6f33c14 100644
--- a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-mk/strings.xml
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-mk/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="nearby_places" msgid="275117539511113867">"Места во близина"</string>
-    <string name="search_location_permission" msgid="5893183045324252816">"За да добиете информации за контакт за места во близина, дозволете пристап до вашата локација."</string>
-    <string name="nearby_places_allow" msgid="4060507469206871903">"Дозволи"</string>
-    <string name="nearby_places_dismiss" msgid="3255977972553076907">"Отфрли"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="nearby_places">Места во близина</string>
+  <string name="search_location_permission">За да добиете информации за контакт за места во близина, дозволете пристап до вашата локација.</string>
+  <string name="nearby_places_allow">Дозволи</string>
+  <string name="nearby_places_dismiss">Отфрли</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ml/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ml/strings.xml
index f3e0a00..72d9931 100644
--- a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ml/strings.xml
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ml/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="nearby_places" msgid="275117539511113867">"സമീപത്തുള്ള സ്ഥലങ്ങൾ"</string>
-    <string name="search_location_permission" msgid="5893183045324252816">"നിങ്ങളുടെ സമീപത്തുള്ള സ്ഥലങ്ങളെ ബന്ധപ്പെടാനുള്ള ‌വിവരങ്ങൾ ‌ലഭിക്കാൻ, ലൊക്കേഷനിലേക്ക് ആക്‌സസ് അനുവദിക്കുക."</string>
-    <string name="nearby_places_allow" msgid="4060507469206871903">"അനുവദിക്കുക"</string>
-    <string name="nearby_places_dismiss" msgid="3255977972553076907">"ഒഴിവാക്കുക"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="nearby_places">സമീപത്തുള്ള സ്ഥലങ്ങൾ</string>
+  <string name="search_location_permission">നിങ്ങളുടെ സമീപത്തുള്ള സ്ഥലങ്ങളെ ബന്ധപ്പെടാനുള്ള ‌വിവരങ്ങൾ ‌ലഭിക്കാൻ, ലൊക്കേഷനിലേക്ക് ആക്‌സസ് അനുവദിക്കുക.</string>
+  <string name="nearby_places_allow">അനുവദിക്കുക</string>
+  <string name="nearby_places_dismiss">ഒഴിവാക്കുക</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-mn/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-mn/strings.xml
index 79e2e57..77e549a 100644
--- a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-mn/strings.xml
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-mn/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="nearby_places" msgid="275117539511113867">"Ойролцоох газрууд"</string>
-    <string name="search_location_permission" msgid="5893183045324252816">"Өөрийн ойролцоох газруудын холбогдох хаягийг авахын тулд өөрийн байршилд хандах зөвшөөрөл өгнө үү."</string>
-    <string name="nearby_places_allow" msgid="4060507469206871903">"Зөвшөөрөх"</string>
-    <string name="nearby_places_dismiss" msgid="3255977972553076907">"Хаах"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="nearby_places">Ойролцоох газрууд</string>
+  <string name="search_location_permission">Өөрийн ойролцоох газруудын холбогдох хаягийг авахын тулд өөрийн байршилд хандах зөвшөөрөл өгнө үү.</string>
+  <string name="nearby_places_allow">Зөвшөөрөх</string>
+  <string name="nearby_places_dismiss">Хаах</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-mr/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-mr/strings.xml
index e491257..066942e 100644
--- a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-mr/strings.xml
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-mr/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="nearby_places" msgid="275117539511113867">"जवळपासची ठिकाणे"</string>
-    <string name="search_location_permission" msgid="5893183045324252816">"तुमच्या जवळपासच्या ठिकाणांची संपर्क माहिती मिळवण्यासाठी तुमचे स्थान अ‍ॅक्सेस करण्याची अनुमती द्या."</string>
-    <string name="nearby_places_allow" msgid="4060507469206871903">"अनुमती द्या"</string>
-    <string name="nearby_places_dismiss" msgid="3255977972553076907">"डिसमिस करा"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="nearby_places">जवळपासची ठिकाणे</string>
+  <string name="search_location_permission">तुमच्या जवळपासच्या ठिकाणांची संपर्क माहिती मिळवण्यासाठी तुमचे स्थान अ‍ॅक्सेस करण्याची अनुमती द्या.</string>
+  <string name="nearby_places_allow">अनुमती द्या</string>
+  <string name="nearby_places_dismiss">डिसमिस करा</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ms/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ms/strings.xml
index 0a891f4..c6a6151 100644
--- a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ms/strings.xml
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ms/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="nearby_places" msgid="275117539511113867">"Tempat berdekatan"</string>
-    <string name="search_location_permission" msgid="5893183045324252816">"Untuk mendapatkan maklumat hubungan bagi tempat berdekatan anda, benarkan akses ke lokasi anda."</string>
-    <string name="nearby_places_allow" msgid="4060507469206871903">"Benarkan"</string>
-    <string name="nearby_places_dismiss" msgid="3255977972553076907">"Ketepikan"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="nearby_places">Tempat berdekatan</string>
+  <string name="search_location_permission">Untuk mendapatkan maklumat hubungan bagi tempat berdekatan anda, benarkan akses ke lokasi anda.</string>
+  <string name="nearby_places_allow">Benarkan</string>
+  <string name="nearby_places_dismiss">Ketepikan</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-my/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-my/strings.xml
index 077d2cd..cfa6285 100644
--- a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-my/strings.xml
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-my/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="nearby_places" msgid="275117539511113867">"အနီးတဝိုက်ရှိ နေရာများ"</string>
-    <string name="search_location_permission" msgid="5893183045324252816">"သင့်အနီးရှိ နေရာများအတွက် အဆက်အသွယ် အချက်အလက်များ ရရှိရန် သင့်တည်နေရာကို သုံးခွင့်ပြုပါ။"</string>
-    <string name="nearby_places_allow" msgid="4060507469206871903">"ခွင့်ပြုရန်"</string>
-    <string name="nearby_places_dismiss" msgid="3255977972553076907">"ပယ်ရန်"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="nearby_places">အနီးတဝိုက်ရှိ နေရာများ</string>
+  <string name="search_location_permission">သင့်အနီးရှိ နေရာများအတွက် အဆက်အသွယ် အချက်အလက်များ ရရှိရန် သင့်တည်နေရာကို သုံးခွင့်ပြုပါ။</string>
+  <string name="nearby_places_allow">ခွင့်ပြုရန်</string>
+  <string name="nearby_places_dismiss">ပယ်ရန်</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-nb/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-nb/strings.xml
index 2fac0b5..d4260d3 100644
--- a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-nb/strings.xml
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-nb/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="nearby_places" msgid="275117539511113867">"Steder i nærheten"</string>
-    <string name="search_location_permission" msgid="5893183045324252816">"Tillat tilgang til posisjonen din for å få kontaktinformasjon for steder i nærheten av deg."</string>
-    <string name="nearby_places_allow" msgid="4060507469206871903">"Tillat"</string>
-    <string name="nearby_places_dismiss" msgid="3255977972553076907">"Avvis"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="nearby_places">Steder i nærheten</string>
+  <string name="search_location_permission">Tillat tilgang til posisjonen din for å få kontaktinformasjon for steder i nærheten av deg.</string>
+  <string name="nearby_places_allow">Tillat</string>
+  <string name="nearby_places_dismiss">Avvis</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ne/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ne/strings.xml
index 0c263aa..a4ea892 100644
--- a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ne/strings.xml
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ne/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="nearby_places" msgid="275117539511113867">"नजिकका स्थानहरू"</string>
-    <string name="search_location_permission" msgid="5893183045324252816">"आफ्नो नजिकका ठाउँहरूको सम्पर्क जानकारी प्राप्त गर्न तपाईंको स्थानमाथि पहुँच राख्न दिनुहोस्।"</string>
-    <string name="nearby_places_allow" msgid="4060507469206871903">"अनुमति दिनुहोस्"</string>
-    <string name="nearby_places_dismiss" msgid="3255977972553076907">"खारेज गर्नुहोस्"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="nearby_places">नजिकका स्थानहरू</string>
+  <string name="search_location_permission">आफ्नो नजिकका ठाउँहरूको सम्पर्क जानकारी प्राप्त गर्न तपाईंको स्थानमाथि पहुँच राख्न दिनुहोस्।</string>
+  <string name="nearby_places_allow">अनुमति दिनुहोस्</string>
+  <string name="nearby_places_dismiss">खारेज गर्नुहोस्</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-nl/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-nl/strings.xml
index 42001d0..bbff7ce 100644
--- a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-nl/strings.xml
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-nl/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="nearby_places" msgid="275117539511113867">"Plaatsen in de buurt"</string>
-    <string name="search_location_permission" msgid="5893183045324252816">"Verleen toegang tot je locatie om contactgegevens te ontvangen voor plaatsen bij jou in de buurt."</string>
-    <string name="nearby_places_allow" msgid="4060507469206871903">"Toestaan"</string>
-    <string name="nearby_places_dismiss" msgid="3255977972553076907">"Sluiten"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="nearby_places">Plaatsen in de buurt</string>
+  <string name="search_location_permission">Verleen toegang tot je locatie om contactgegevens te ontvangen voor plaatsen bij jou in de buurt.</string>
+  <string name="nearby_places_allow">Toestaan</string>
+  <string name="nearby_places_dismiss">Sluiten</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-no/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-no/strings.xml
index 2fac0b5..d4260d3 100644
--- a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-no/strings.xml
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-no/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="nearby_places" msgid="275117539511113867">"Steder i nærheten"</string>
-    <string name="search_location_permission" msgid="5893183045324252816">"Tillat tilgang til posisjonen din for å få kontaktinformasjon for steder i nærheten av deg."</string>
-    <string name="nearby_places_allow" msgid="4060507469206871903">"Tillat"</string>
-    <string name="nearby_places_dismiss" msgid="3255977972553076907">"Avvis"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="nearby_places">Steder i nærheten</string>
+  <string name="search_location_permission">Tillat tilgang til posisjonen din for å få kontaktinformasjon for steder i nærheten av deg.</string>
+  <string name="nearby_places_allow">Tillat</string>
+  <string name="nearby_places_dismiss">Avvis</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-pa/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-pa/strings.xml
index a991866..45595f8 100644
--- a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-pa/strings.xml
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-pa/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="nearby_places" msgid="275117539511113867">"ਨਜ਼ਦੀਕੀ ਸਥਾਨ"</string>
-    <string name="search_location_permission" msgid="5893183045324252816">"ਤੁਹਾਡੀਆਂ ਨਜ਼ਦੀਕੀ ਥਾਂਵਾਂ ਦੀ ਸੰਪਰਕ ਜਾਣਕਾਰੀ ਪ੍ਰਾਪਤ ਕਰਨ ਲਈ, ਆਪਣੇ ਟਿਕਾਣੇ \'ਤੇ ਪਹੁੰਚ ਕਰਨ ਦਿਓ।"</string>
-    <string name="nearby_places_allow" msgid="4060507469206871903">"ਕਰਨ ਦਿਓ"</string>
-    <string name="nearby_places_dismiss" msgid="3255977972553076907">"ਖਾਰਜ ਕਰੋ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="nearby_places">ਨਜ਼ਦੀਕੀ ਸਥਾਨ</string>
+  <string name="search_location_permission">ਤੁਹਾਡੀਆਂ ਨਜ਼ਦੀਕੀ ਥਾਂਵਾਂ ਦੀ ਸੰਪਰਕ ਜਾਣਕਾਰੀ ਪ੍ਰਾਪਤ ਕਰਨ ਲਈ, ਆਪਣੇ ਟਿਕਾਣੇ \'ਤੇ ਪਹੁੰਚ ਕਰਨ ਦਿਓ।</string>
+  <string name="nearby_places_allow">ਕਰਨ ਦਿਓ</string>
+  <string name="nearby_places_dismiss">ਖਾਰਜ ਕਰੋ</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-pl/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-pl/strings.xml
index 9a71ae4..b8d15e7 100644
--- a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-pl/strings.xml
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-pl/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="nearby_places" msgid="275117539511113867">"Miejsca w pobliżu"</string>
-    <string name="search_location_permission" msgid="5893183045324252816">"Aby otrzymywać informacje kontaktowe miejsc w pobliżu, zezwól na dostęp do swojej lokalizacji."</string>
-    <string name="nearby_places_allow" msgid="4060507469206871903">"Zezwól"</string>
-    <string name="nearby_places_dismiss" msgid="3255977972553076907">"Odrzuć"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="nearby_places">Miejsca w pobliżu</string>
+  <string name="search_location_permission">Aby otrzymywać informacje kontaktowe miejsc w pobliżu, zezwól na dostęp do swojej lokalizacji.</string>
+  <string name="nearby_places_allow">Zezwól</string>
+  <string name="nearby_places_dismiss">Odrzuć</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-pt-rBR/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-pt-rBR/strings.xml
index 510b4bf..838b409 100644
--- a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-pt-rBR/strings.xml
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-pt-rBR/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="nearby_places" msgid="275117539511113867">"Lugares próximos"</string>
-    <string name="search_location_permission" msgid="5893183045324252816">"Para ver os dados de contato dos lugares perto de você, permita o acesso ao seu local."</string>
-    <string name="nearby_places_allow" msgid="4060507469206871903">"Permitir"</string>
-    <string name="nearby_places_dismiss" msgid="3255977972553076907">"Dispensar"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="nearby_places">Lugares por perto</string>
+  <string name="search_location_permission">Para ver os dados de contato dos lugares perto de você, permita o acesso ao seu local.</string>
+  <string name="nearby_places_allow">Permitir</string>
+  <string name="nearby_places_dismiss">Dispensar</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-pt-rPT/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-pt-rPT/strings.xml
index 9fd08a5..f945aff 100644
--- a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-pt-rPT/strings.xml
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-pt-rPT/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="nearby_places" msgid="275117539511113867">"Locais próximos"</string>
-    <string name="search_location_permission" msgid="5893183045324252816">"Para receber informações de contacto de locais perto de si, permita o acesso à sua localização."</string>
-    <string name="nearby_places_allow" msgid="4060507469206871903">"Permitir"</string>
-    <string name="nearby_places_dismiss" msgid="3255977972553076907">"Ignorar"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="nearby_places">Locais próximos</string>
+  <string name="search_location_permission">Para receber informações de contacto de locais perto de si, permita o acesso à sua localização.</string>
+  <string name="nearby_places_allow">Permitir</string>
+  <string name="nearby_places_dismiss">Ignorar</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-pt/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-pt/strings.xml
index 510b4bf..838b409 100644
--- a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-pt/strings.xml
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-pt/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="nearby_places" msgid="275117539511113867">"Lugares próximos"</string>
-    <string name="search_location_permission" msgid="5893183045324252816">"Para ver os dados de contato dos lugares perto de você, permita o acesso ao seu local."</string>
-    <string name="nearby_places_allow" msgid="4060507469206871903">"Permitir"</string>
-    <string name="nearby_places_dismiss" msgid="3255977972553076907">"Dispensar"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="nearby_places">Lugares por perto</string>
+  <string name="search_location_permission">Para ver os dados de contato dos lugares perto de você, permita o acesso ao seu local.</string>
+  <string name="nearby_places_allow">Permitir</string>
+  <string name="nearby_places_dismiss">Dispensar</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ro/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ro/strings.xml
index ed5d428..c314e2c 100644
--- a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ro/strings.xml
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ro/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="nearby_places" msgid="275117539511113867">"Locații din apropiere"</string>
-    <string name="search_location_permission" msgid="5893183045324252816">"Pentru a primit informații legate de locuri din aproprierea dvs., permiteți accesul la locație."</string>
-    <string name="nearby_places_allow" msgid="4060507469206871903">"Permiteți"</string>
-    <string name="nearby_places_dismiss" msgid="3255977972553076907">"Închideți"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="nearby_places">Locații din apropiere</string>
+  <string name="search_location_permission">Pentru a primit informații legate de locuri din aproprierea dvs., permiteți accesul la locație.</string>
+  <string name="nearby_places_allow">Permiteți</string>
+  <string name="nearby_places_dismiss">Închideți</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ru/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ru/strings.xml
index 596e7fb..348ac9a 100644
--- a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ru/strings.xml
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ru/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="nearby_places" msgid="275117539511113867">"Места рядом"</string>
-    <string name="search_location_permission" msgid="5893183045324252816">"Чтобы получать контактную информацию мест поблизости, разрешите доступ к сведениям о вашем местоположении."</string>
-    <string name="nearby_places_allow" msgid="4060507469206871903">"Разрешить"</string>
-    <string name="nearby_places_dismiss" msgid="3255977972553076907">"Закрыть"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="nearby_places">Места рядом</string>
+  <string name="search_location_permission">Чтобы получать контактную информацию мест поблизости, разрешите доступ к сведениям о вашем местоположении.</string>
+  <string name="nearby_places_allow">Разрешить</string>
+  <string name="nearby_places_dismiss">Закрыть</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-si/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-si/strings.xml
index 967c2eb..1565991 100644
--- a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-si/strings.xml
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-si/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="nearby_places" msgid="275117539511113867">"අවට ස්ථාන"</string>
-    <string name="search_location_permission" msgid="5893183045324252816">"ඔබ අසල ස්ථාන සඳහා සම්බන්ධතා තොරතුරු ලබා ගැනීමට, ඔබේ ස්ථානයට ප්‍රවේශය ඉඩ දෙන්න."</string>
-    <string name="nearby_places_allow" msgid="4060507469206871903">"ඉඩ දෙන්න"</string>
-    <string name="nearby_places_dismiss" msgid="3255977972553076907">"ඉවත ලන්න"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="nearby_places">අවට ස්ථාන</string>
+  <string name="search_location_permission">ඔබ අසල ස්ථාන සඳහා සම්බන්ධතා තොරතුරු ලබා ගැනීමට, ඔබේ ස්ථානයට ප්‍රවේශය ඉඩ දෙන්න.</string>
+  <string name="nearby_places_allow">ඉඩ දෙන්න</string>
+  <string name="nearby_places_dismiss">ඉවත ලන්න</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-sk/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-sk/strings.xml
index 2eb5ff9..9f71168 100644
--- a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-sk/strings.xml
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-sk/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="nearby_places" msgid="275117539511113867">"Miesta v okolí"</string>
-    <string name="search_location_permission" msgid="5893183045324252816">"Ak chcete získať kontaktné údaje miest vo svojom okolí, povoľte aplikácii prístup k svojej polohe."</string>
-    <string name="nearby_places_allow" msgid="4060507469206871903">"Povoliť"</string>
-    <string name="nearby_places_dismiss" msgid="3255977972553076907">"Zavrieť"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="nearby_places">Miesta v okolí</string>
+  <string name="search_location_permission">Ak chcete získať kontaktné údaje miest vo svojom okolí, povoľte aplikácii prístup k svojej polohe.</string>
+  <string name="nearby_places_allow">Povoliť</string>
+  <string name="nearby_places_dismiss">Zavrieť</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-sl/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-sl/strings.xml
index 0172d1e..dd23d1a 100644
--- a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-sl/strings.xml
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-sl/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="nearby_places" msgid="275117539511113867">"Mesta v bližini"</string>
-    <string name="search_location_permission" msgid="5893183045324252816">"Če si želite ogledati podatke za stik za mesta v bližini, dovolite dostop do svoje lokacije."</string>
-    <string name="nearby_places_allow" msgid="4060507469206871903">"Dovoli"</string>
-    <string name="nearby_places_dismiss" msgid="3255977972553076907">"Opusti"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="nearby_places">Mesta v bližini</string>
+  <string name="search_location_permission">Če si želite ogledati podatke za stik za mesta v bližini, dovolite dostop do svoje lokacije.</string>
+  <string name="nearby_places_allow">Dovoli</string>
+  <string name="nearby_places_dismiss">Opusti</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-sq/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-sq/strings.xml
index 176a67d..d48e881 100644
--- a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-sq/strings.xml
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-sq/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="nearby_places" msgid="275117539511113867">"Vendet në afërsi"</string>
-    <string name="search_location_permission" msgid="5893183045324252816">"Për të marrë informacionet e kontaktit për vendet në afërsi, lejo qasjen te vendndodhja jote."</string>
-    <string name="nearby_places_allow" msgid="4060507469206871903">"Lejo"</string>
-    <string name="nearby_places_dismiss" msgid="3255977972553076907">"Hiq"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="nearby_places">Vendet në afërsi</string>
+  <string name="search_location_permission">Për të marrë informacionet e kontaktit për vendet në afërsi, lejo qasjen te vendndodhja jote.</string>
+  <string name="nearby_places_allow">Lejo</string>
+  <string name="nearby_places_dismiss">Hiq</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-sr/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-sr/strings.xml
index 74fac42..e44a5fb 100644
--- a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-sr/strings.xml
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-sr/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="nearby_places" msgid="275117539511113867">"Оближња места"</string>
-    <string name="search_location_permission" msgid="5893183045324252816">"Да бисте добијали контакт информације за места у својој близини, одобрите приступ локацији."</string>
-    <string name="nearby_places_allow" msgid="4060507469206871903">"Дозволи"</string>
-    <string name="nearby_places_dismiss" msgid="3255977972553076907">"Одбаци"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="nearby_places">Оближња места</string>
+  <string name="search_location_permission">Да бисте добијали контакт информације за места у својој близини, одобрите приступ локацији.</string>
+  <string name="nearby_places_allow">Дозволи</string>
+  <string name="nearby_places_dismiss">Одбаци</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-sv/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-sv/strings.xml
index c968b38..d38ade9 100644
--- a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-sv/strings.xml
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-sv/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="nearby_places" msgid="275117539511113867">"Platser i närheten"</string>
-    <string name="search_location_permission" msgid="5893183045324252816">"Tillåt åtkomst till din plats om du vill få kontaktuppgifter till ställen i närheten."</string>
-    <string name="nearby_places_allow" msgid="4060507469206871903">"Tillåt"</string>
-    <string name="nearby_places_dismiss" msgid="3255977972553076907">"Ignorera"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="nearby_places">Platser i närheten</string>
+  <string name="search_location_permission">Tillåt åtkomst till din plats om du vill få kontaktuppgifter till ställen i närheten.</string>
+  <string name="nearby_places_allow">Tillåt</string>
+  <string name="nearby_places_dismiss">Ignorera</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-sw/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-sw/strings.xml
index f9d39fb..390c1b4 100644
--- a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-sw/strings.xml
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-sw/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="nearby_places" msgid="275117539511113867">"Maeneo ya karibu"</string>
-    <string name="search_location_permission" msgid="5893183045324252816">"Ruhusu sehemu yako ifikiwe ili upate maelezo ya anwani kuhusu maeneo yaliyo karibu."</string>
-    <string name="nearby_places_allow" msgid="4060507469206871903">"Ruhusu"</string>
-    <string name="nearby_places_dismiss" msgid="3255977972553076907">"Ondoa"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="nearby_places">Maeneo ya karibu</string>
+  <string name="search_location_permission">Ruhusu sehemu yako ifikiwe ili upate maelezo ya anwani kuhusu maeneo yaliyo karibu.</string>
+  <string name="nearby_places_allow">Ruhusu</string>
+  <string name="nearby_places_dismiss">Ondoa</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ta/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ta/strings.xml
index 2c091ce..b13459c 100644
--- a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ta/strings.xml
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ta/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="nearby_places" msgid="275117539511113867">"அருகிலுள்ள இடங்கள்"</string>
-    <string name="search_location_permission" msgid="5893183045324252816">"உங்கள் அருகிலுள்ள இடங்களின் தொடர்புத் தகவலைப் பெற, உங்கள் இருப்பிடத்திற்கான அணுகலை வழங்கவும்."</string>
-    <string name="nearby_places_allow" msgid="4060507469206871903">"அனுமதி"</string>
-    <string name="nearby_places_dismiss" msgid="3255977972553076907">"நிராகரி"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="nearby_places">அருகிலுள்ள இடங்கள்</string>
+  <string name="search_location_permission">உங்கள் அருகிலுள்ள இடங்களின் தொடர்புத் தகவலைப் பெற, உங்கள் இருப்பிடத்திற்கான அணுகலை வழங்கவும்.</string>
+  <string name="nearby_places_allow">அனுமதி</string>
+  <string name="nearby_places_dismiss">நிராகரி</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-te/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-te/strings.xml
index 8c9a91d..464e8c9 100644
--- a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-te/strings.xml
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-te/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="nearby_places" msgid="275117539511113867">"సమీప స్థలాలు"</string>
-    <string name="search_location_permission" msgid="5893183045324252816">"మీ సమీపంలోని స్థలాల యొక్క సంప్రదింపు సమాచారం పొందడానికి, మీ స్థానానికి యాక్సెస్‌ను అనుమతించండి."</string>
-    <string name="nearby_places_allow" msgid="4060507469206871903">"అనుమతించు"</string>
-    <string name="nearby_places_dismiss" msgid="3255977972553076907">"విస్మరించు"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="nearby_places">సమీప స్థలాలు</string>
+  <string name="search_location_permission">మీ సమీపంలోని స్థలాల యొక్క సంప్రదింపు సమాచారం పొందడానికి, మీ స్థానానికి యాక్సెస్‌ను అనుమతించండి.</string>
+  <string name="nearby_places_allow">అనుమతించు</string>
+  <string name="nearby_places_dismiss">విస్మరించు</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-th/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-th/strings.xml
index 2bcc778..3eed32d 100644
--- a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-th/strings.xml
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-th/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="nearby_places" msgid="275117539511113867">"สถานที่ใกล้เคียง"</string>
-    <string name="search_location_permission" msgid="5893183045324252816">"หากต้องการรับข้อมูลติดต่อสำหรับสถานที่ใกล้เคียง โปรดอนุญาตให้เข้าถึงตำแหน่งของคุณได้"</string>
-    <string name="nearby_places_allow" msgid="4060507469206871903">"อนุญาต"</string>
-    <string name="nearby_places_dismiss" msgid="3255977972553076907">"ปิด"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="nearby_places">สถานที่ใกล้เคียง</string>
+  <string name="search_location_permission">หากต้องการรับข้อมูลติดต่อสำหรับสถานที่ใกล้เคียง โปรดอนุญาตให้เข้าถึงตำแหน่งของคุณได้</string>
+  <string name="nearby_places_allow">อนุญาต</string>
+  <string name="nearby_places_dismiss">ปิด</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-tl/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-tl/strings.xml
index 4be1df5..6d4d22b 100644
--- a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-tl/strings.xml
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-tl/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="nearby_places" msgid="275117539511113867">"Mga kalapit na lugar"</string>
-    <string name="search_location_permission" msgid="5893183045324252816">"Upang makakuha ng impormasyon ng contact para sa mga lugar na malapit sa iyo, magbigay ng access sa iyong lokasyon."</string>
-    <string name="nearby_places_allow" msgid="4060507469206871903">"Payagan"</string>
-    <string name="nearby_places_dismiss" msgid="3255977972553076907">"I-dismiss"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="nearby_places">Mga kalapit na lugar</string>
+  <string name="search_location_permission">Upang makakuha ng impormasyon ng contact para sa mga lugar na malapit sa iyo, magbigay ng access sa iyong lokasyon.</string>
+  <string name="nearby_places_allow">Payagan</string>
+  <string name="nearby_places_dismiss">I-dismiss</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-tr/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-tr/strings.xml
index 79dd7ea..8b3da09 100644
--- a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-tr/strings.xml
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-tr/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="nearby_places" msgid="275117539511113867">"Yakındaki yerler"</string>
-    <string name="search_location_permission" msgid="5893183045324252816">"Yakınınızdaki yerlerin iletişim bilgilerine ulaşmak için konumunuza erişime izin verin."</string>
-    <string name="nearby_places_allow" msgid="4060507469206871903">"İzin ver"</string>
-    <string name="nearby_places_dismiss" msgid="3255977972553076907">"Kapat"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="nearby_places">Yakındaki yerler</string>
+  <string name="search_location_permission">Yakınınızdaki yerlerin iletişim bilgilerine ulaşmak için konumunuza erişime izin verin.</string>
+  <string name="nearby_places_allow">İzin ver</string>
+  <string name="nearby_places_dismiss">Kapat</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-uk/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-uk/strings.xml
index 71f9fbb..6c49f6c 100644
--- a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-uk/strings.xml
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-uk/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="nearby_places" msgid="275117539511113867">"Місця поблизу"</string>
-    <string name="search_location_permission" msgid="5893183045324252816">"Щоб бачити контактну інформацію місць поблизу, дозвольте доступ до вашого місцезнаходження."</string>
-    <string name="nearby_places_allow" msgid="4060507469206871903">"Дозволити"</string>
-    <string name="nearby_places_dismiss" msgid="3255977972553076907">"Відхилити"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="nearby_places">Місця поблизу</string>
+  <string name="search_location_permission">Щоб бачити контактну інформацію місць поблизу, дозвольте доступ до вашого місцезнаходження.</string>
+  <string name="nearby_places_allow">Дозволити</string>
+  <string name="nearby_places_dismiss">Відхилити</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ur/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ur/strings.xml
index de589f2..8f4a664 100644
--- a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ur/strings.xml
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-ur/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="nearby_places" msgid="275117539511113867">"قریبی مقامات"</string>
-    <string name="search_location_permission" msgid="5893183045324252816">"اپنے قریبی مقامات کے بارے میں رابطہ کی معلومات حاصل کرنے کیلئے، اپنے مقام تک رسائی کی اجازت دیں۔"</string>
-    <string name="nearby_places_allow" msgid="4060507469206871903">"اجازت دیں"</string>
-    <string name="nearby_places_dismiss" msgid="3255977972553076907">"برخاست کریں"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="nearby_places">قریبی مقامات</string>
+  <string name="search_location_permission">اپنے قریبی مقامات کے بارے میں رابطہ کی معلومات حاصل کرنے کیلئے، اپنے مقام تک رسائی کی اجازت دیں۔</string>
+  <string name="nearby_places_allow">اجازت دیں</string>
+  <string name="nearby_places_dismiss">برخاست کریں</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-uz/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-uz/strings.xml
index bb93140..c3ccedf 100644
--- a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-uz/strings.xml
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-uz/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="nearby_places" msgid="275117539511113867">"Yaqin-atrofdagi joylar"</string>
-    <string name="search_location_permission" msgid="5893183045324252816">"Yon-atrofingizdagi joylarning aloqa ma’lumotlarini olish uchun geoaxborotingizga kirishga ruxsat bering."</string>
-    <string name="nearby_places_allow" msgid="4060507469206871903">"Ruxsat berish"</string>
-    <string name="nearby_places_dismiss" msgid="3255977972553076907">"Yopish"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="nearby_places">Yaqin-atrofdagi joylar</string>
+  <string name="search_location_permission">Yon-atrofingizdagi joylarning aloqa ma’lumotlarini olish uchun geoaxborotingizga kirishga ruxsat bering.</string>
+  <string name="nearby_places_allow">Ruxsat berish</string>
+  <string name="nearby_places_dismiss">Yopish</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-vi/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-vi/strings.xml
index 582cfe1..6fed9aa 100644
--- a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-vi/strings.xml
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-vi/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="nearby_places" msgid="275117539511113867">"Địa điểm lân cận"</string>
-    <string name="search_location_permission" msgid="5893183045324252816">"Để nhận thông tin liên hệ cho những địa điểm gần bạn, hãy cho phép truy cập vào vị trí của bạn."</string>
-    <string name="nearby_places_allow" msgid="4060507469206871903">"Cho phép"</string>
-    <string name="nearby_places_dismiss" msgid="3255977972553076907">"Loại bỏ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="nearby_places">Địa điểm lân cận</string>
+  <string name="search_location_permission">Để nhận thông tin liên hệ cho những địa điểm gần bạn, hãy cho phép truy cập vào vị trí của bạn.</string>
+  <string name="nearby_places_allow">Cho phép</string>
+  <string name="nearby_places_dismiss">Bỏ qua</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-zh-rCN/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-zh-rCN/strings.xml
index e7108b9..ea525cf 100644
--- a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-zh-rCN/strings.xml
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-zh-rCN/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="nearby_places" msgid="275117539511113867">"附近的地点"</string>
-    <string name="search_location_permission" msgid="5893183045324252816">"要获取附近地点的联系信息，请允许应用使用您的位置信息。"</string>
-    <string name="nearby_places_allow" msgid="4060507469206871903">"允许"</string>
-    <string name="nearby_places_dismiss" msgid="3255977972553076907">"关闭"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="nearby_places">附近的地点</string>
+  <string name="search_location_permission">要获取附近地点的联系信息，请允许应用使用您的位置信息。</string>
+  <string name="nearby_places_allow">允许</string>
+  <string name="nearby_places_dismiss">关闭</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-zh-rHK/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-zh-rHK/strings.xml
index c6f2261..5cf7d1f 100644
--- a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-zh-rHK/strings.xml
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-zh-rHK/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="nearby_places" msgid="275117539511113867">"附近地點"</string>
-    <string name="search_location_permission" msgid="5893183045324252816">"若要取得鄰近地點的聯絡資料，請開放您的位置資訊存取權。"</string>
-    <string name="nearby_places_allow" msgid="4060507469206871903">"允許"</string>
-    <string name="nearby_places_dismiss" msgid="3255977972553076907">"關閉"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="nearby_places">附近地點</string>
+  <string name="search_location_permission">若要取得鄰近地點的聯絡資料，請開放您的位置資訊存取權。</string>
+  <string name="nearby_places_allow">允許</string>
+  <string name="nearby_places_dismiss">關閉</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-zh-rTW/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-zh-rTW/strings.xml
index 66ef333..fa75a68 100644
--- a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-zh-rTW/strings.xml
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-zh-rTW/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="nearby_places" msgid="275117539511113867">"附近地點"</string>
-    <string name="search_location_permission" msgid="5893183045324252816">"如要取得附近地點的聯絡資訊，請授予位置資訊存取權。"</string>
-    <string name="nearby_places_allow" msgid="4060507469206871903">"允許"</string>
-    <string name="nearby_places_dismiss" msgid="3255977972553076907">"關閉"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="nearby_places">附近地點</string>
+  <string name="search_location_permission">如要取得附近地點的聯絡資訊，請授予位置資訊存取權。</string>
+  <string name="nearby_places_allow">允許</string>
+  <string name="nearby_places_dismiss">關閉</string>
 </resources>
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-zu/strings.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-zu/strings.xml
index c62562d..9857d14 100644
--- a/java/com/android/dialer/searchfragment/nearbyplaces/res/values-zu/strings.xml
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/values-zu/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="nearby_places" msgid="275117539511113867">"Izindawo eziseduze"</string>
-    <string name="search_location_permission" msgid="5893183045324252816">"Ukuze uthole ulwazi lokuxhumana ngezindawo eziseduze kwakho, vumela ukufinyelela endaweni yakho."</string>
-    <string name="nearby_places_allow" msgid="4060507469206871903">"Vumela"</string>
-    <string name="nearby_places_dismiss" msgid="3255977972553076907">"Chitha"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="nearby_places">Izindawo eziseduze</string>
+  <string name="search_location_permission">Ukuze uthole ulwazi lokuxhumana ngezindawo eziseduze kwakho, vumela ukufinyelela endaweni yakho.</string>
+  <string name="nearby_places_allow">Vumela</string>
+  <string name="nearby_places_dismiss">Chitha</string>
 </resources>
diff --git a/java/com/android/dialer/shortcuts/AndroidManifest.xml b/java/com/android/dialer/shortcuts/AndroidManifest.xml
index 1170058..c0f07bf 100644
--- a/java/com/android/dialer/shortcuts/AndroidManifest.xml
+++ b/java/com/android/dialer/shortcuts/AndroidManifest.xml
@@ -17,12 +17,12 @@
   package="com.android.dialer.shortcuts">
 
   <uses-sdk
-    android:minSdkVersion="23"
-    android:targetSdkVersion="27"/>
+    android:minSdkVersion="24"
+    android:targetSdkVersion="28"/>
 
-  <application android:theme="@style/Theme.AppCompat">
+  <application>
 
-    <service
+  <service
       android:exported="false"
       android:name=".PeriodicJobService"
       android:permission="android.permission.BIND_JOB_SERVICE"/>
diff --git a/java/com/android/dialer/shortcuts/DynamicShortcuts.java b/java/com/android/dialer/shortcuts/DynamicShortcuts.java
index be9e088..e39dc27 100644
--- a/java/com/android/dialer/shortcuts/DynamicShortcuts.java
+++ b/java/com/android/dialer/shortcuts/DynamicShortcuts.java
@@ -124,7 +124,7 @@
           DialerShortcut.builder()
               .setContactId(entry.id)
               .setLookupKey(entry.lookupKey)
-              .setDisplayName(entry.getPreferredDisplayName())
+              .setDisplayName(entry.getPreferredDisplayName(context))
               .setRank(rank++)
               .build();
       newDynamicShortcutsById.put(shortcut.getShortcutId(), shortcut);
diff --git a/java/com/android/dialer/shortcuts/PinnedShortcuts.java b/java/com/android/dialer/shortcuts/PinnedShortcuts.java
index 6e23a5c..d5265c2 100644
--- a/java/com/android/dialer/shortcuts/PinnedShortcuts.java
+++ b/java/com/android/dialer/shortcuts/PinnedShortcuts.java
@@ -106,7 +106,7 @@
         // setRank is nonsensical for pinned shortcuts and therefore could not be calculated.
         continue;
       }
-      // Exclude shortcuts like the "Phone NUI" shortcut.
+      // Exclude shortcuts not for contacts.
       String action = null;
       if (shortcutInfo.getIntent() != null) {
         action = shortcutInfo.getIntent().getAction();
diff --git a/java/com/android/dialer/shortcuts/ShortcutRefresher.java b/java/com/android/dialer/shortcuts/ShortcutRefresher.java
index 3201d59..7776aa9 100644
--- a/java/com/android/dialer/shortcuts/ShortcutRefresher.java
+++ b/java/com/android/dialer/shortcuts/ShortcutRefresher.java
@@ -25,6 +25,7 @@
 import com.android.dialer.common.LogUtil;
 import com.android.dialer.common.concurrent.DialerExecutor.Worker;
 import com.android.dialer.common.concurrent.DialerExecutorComponent;
+import com.android.dialer.speeddial.loader.SpeedDialUiItem;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -52,6 +53,20 @@
         .executeSerial(new ArrayList<>(contacts));
   }
 
+  public static List<ContactEntry> speedDialUiItemsToContactEntries(List<SpeedDialUiItem> items) {
+    List<ContactEntry> contactEntries = new ArrayList<>();
+    for (SpeedDialUiItem item : items) {
+      ContactEntry entry = new ContactEntry();
+      entry.id = item.contactId();
+      entry.lookupKey = item.lookupKey();
+      // SpeedDialUiItem name's are already configured for alternative display orders, so we don't
+      // need to account for them in these entries.
+      entry.namePrimary = item.name();
+      contactEntries.add(entry);
+    }
+    return contactEntries;
+  }
+
   private static final class RefreshWorker implements Worker<List<ContactEntry>, Void> {
     private final Context context;
 
diff --git a/java/com/android/dialer/shortcuts/Shortcuts.java b/java/com/android/dialer/shortcuts/Shortcuts.java
index c2bbb4d..d08e344 100644
--- a/java/com/android/dialer/shortcuts/Shortcuts.java
+++ b/java/com/android/dialer/shortcuts/Shortcuts.java
@@ -18,7 +18,7 @@
 
 import android.content.Context;
 import android.support.annotation.NonNull;
-import com.android.dialer.configprovider.ConfigProviderBindings;
+import com.android.dialer.configprovider.ConfigProviderComponent;
 
 /** Checks if dynamic shortcuts should be enabled. */
 public class Shortcuts {
@@ -27,7 +27,9 @@
   private static final String DYNAMIC_SHORTCUTS_ENABLED = "dynamic_shortcuts_enabled";
 
   static boolean areDynamicShortcutsEnabled(@NonNull Context context) {
-    return ConfigProviderBindings.get(context).getBoolean(DYNAMIC_SHORTCUTS_ENABLED, true);
+    return ConfigProviderComponent.get(context)
+        .getConfigProvider()
+        .getBoolean(DYNAMIC_SHORTCUTS_ENABLED, true);
   }
 
   private Shortcuts() {}
diff --git a/java/com/android/dialer/shortcuts/res/drawable/ic_add_contact_foreground.xml b/java/com/android/dialer/shortcuts/res/drawable/ic_add_contact_foreground.xml
index 6bc1727..2baa051 100644
--- a/java/com/android/dialer/shortcuts/res/drawable/ic_add_contact_foreground.xml
+++ b/java/com/android/dialer/shortcuts/res/drawable/ic_add_contact_foreground.xml
@@ -18,6 +18,5 @@
 <bitmap xmlns:android="http://schemas.android.com/apk/res/android"
     android:gravity="center"
     android:src="@drawable/quantum_ic_person_add_white_24"
-    android:tint="@color/shortcut_add_contact_foreground_color">
-
+    android:tint="?android:attr/colorPrimary">
 </bitmap>
diff --git a/java/com/android/dialer/shortcuts/res/drawable/ic_shortcut_add_contact.xml b/java/com/android/dialer/shortcuts/res/drawable/ic_shortcut_add_contact.xml
index c06aec8..59dc466 100644
--- a/java/com/android/dialer/shortcuts/res/drawable/ic_shortcut_add_contact.xml
+++ b/java/com/android/dialer/shortcuts/res/drawable/ic_shortcut_add_contact.xml
@@ -24,7 +24,7 @@
       <size
         android:height="44dp"
         android:width="44dp"/>
-      <solid android:color="@color/shortcut_add_contact_background_color"/>
+      <solid android:color="?android:attr/colorBackgroundFloating"/>
     </shape>
   </item>
 
@@ -34,6 +34,6 @@
     android:right="14dp"
     android:top="12dp">
       <bitmap android:src="@drawable/quantum_ic_person_add_white_24"
-              android:tint="@color/shortcut_add_contact_foreground_color"/>
+              android:tint="?android:attr/colorPrimary"/>
   </item>
 </layer-list>
diff --git a/java/com/android/dialer/shortcuts/res/values-af/strings.xml b/java/com/android/dialer/shortcuts/res/values-af/strings.xml
index 055df6f..ed59ea0 100644
--- a/java/com/android/dialer/shortcuts/res/values-af/strings.xml
+++ b/java/com/android/dialer/shortcuts/res/values-af/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="dialer_shortcut_add_contact_short" msgid="7587385197258884650">"Nuwe kontak"</string>
-    <string name="dialer_shortcut_add_contact_long" msgid="7573187314386728329">"Nuwe kontak"</string>
-    <string name="dialer_shortcut_disabled_message" msgid="7713603194332953571">"Kortpad werk nie. Sleep om te verwyder."</string>
-    <string name="dialer_shortcut_contact_not_found_or_has_no_number" msgid="3538594504123040498">"Kontak is nie meer beskikbaar nie."</string>
-    <string name="dialer_shortcut_no_permissions" msgid="4422956724546867357">"Kan nie sonder toestemmings bel nie."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <string name="dialer_shortcut_add_contact_short">Nuwe kontak</string>
+  <string name="dialer_shortcut_add_contact_long">Nuwe kontak</string>
+  <string name="dialer_shortcut_disabled_message">Kortpad werk nie. Sleep om te verwyder.</string>
+  <string name="dialer_shortcut_contact_not_found_or_has_no_number">Kontak is nie meer beskikbaar nie.</string>
+  <string name="dialer_shortcut_no_permissions">Kan nie sonder toestemmings bel nie.</string>
 </resources>
diff --git a/java/com/android/dialer/shortcuts/res/values-am/strings.xml b/java/com/android/dialer/shortcuts/res/values-am/strings.xml
index ac007bd..e0e7d1d 100644
--- a/java/com/android/dialer/shortcuts/res/values-am/strings.xml
+++ b/java/com/android/dialer/shortcuts/res/values-am/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="dialer_shortcut_add_contact_short" msgid="7587385197258884650">"አዲስ ዕውቂያ"</string>
-    <string name="dialer_shortcut_add_contact_long" msgid="7573187314386728329">"አዲስ ዕውቂያ"</string>
-    <string name="dialer_shortcut_disabled_message" msgid="7713603194332953571">"አቋራጭ እየሰራ አይደለም። ለማስወገድ ይጎትቱ።"</string>
-    <string name="dialer_shortcut_contact_not_found_or_has_no_number" msgid="3538594504123040498">"እውቂያው ከእንግዲህ በኋላ አይገኝም።"</string>
-    <string name="dialer_shortcut_no_permissions" msgid="4422956724546867357">"ያለ ፍቃዶች መደወል አይቻልም።"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <string name="dialer_shortcut_add_contact_short">አዲስ ዕውቂያ</string>
+  <string name="dialer_shortcut_add_contact_long">አዲስ ዕውቂያ</string>
+  <string name="dialer_shortcut_disabled_message">አቋራጭ እየሰራ አይደለም። ለማስወገድ ይጎትቱ።</string>
+  <string name="dialer_shortcut_contact_not_found_or_has_no_number">እውቂያው ከእንግዲህ በኋላ አይገኝም።</string>
+  <string name="dialer_shortcut_no_permissions">ያለ ፍቃዶች መደወል አይቻልም።</string>
 </resources>
diff --git a/java/com/android/dialer/shortcuts/res/values-ar/strings.xml b/java/com/android/dialer/shortcuts/res/values-ar/strings.xml
index 5cc0257..137fbcb 100644
--- a/java/com/android/dialer/shortcuts/res/values-ar/strings.xml
+++ b/java/com/android/dialer/shortcuts/res/values-ar/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="dialer_shortcut_add_contact_short" msgid="7587385197258884650">"جهة اتصال"</string>
-    <string name="dialer_shortcut_add_contact_long" msgid="7573187314386728329">"جهة اتصال جديدة"</string>
-    <string name="dialer_shortcut_disabled_message" msgid="7713603194332953571">"الاختصار لا يعمل. اسحب لإزالته."</string>
-    <string name="dialer_shortcut_contact_not_found_or_has_no_number" msgid="3538594504123040498">"جهة الاتصال لم تعد متوفرة."</string>
-    <string name="dialer_shortcut_no_permissions" msgid="4422956724546867357">"يتعذر الاتصال دون أذونات."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <string name="dialer_shortcut_add_contact_short">جهة اتصال</string>
+  <string name="dialer_shortcut_add_contact_long">جهة اتصال جديدة</string>
+  <string name="dialer_shortcut_disabled_message">الاختصار لا يعمل. اسحب لإزالته.</string>
+  <string name="dialer_shortcut_contact_not_found_or_has_no_number">جهة الاتصال لم تعد متوفرة.</string>
+  <string name="dialer_shortcut_no_permissions">يتعذر الاتصال دون أذونات.</string>
 </resources>
diff --git a/java/com/android/dialer/shortcuts/res/values-az/strings.xml b/java/com/android/dialer/shortcuts/res/values-az/strings.xml
index 66d7b70..c2d68ad 100644
--- a/java/com/android/dialer/shortcuts/res/values-az/strings.xml
+++ b/java/com/android/dialer/shortcuts/res/values-az/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="dialer_shortcut_add_contact_short" msgid="7587385197258884650">"Yeni kontakt"</string>
-    <string name="dialer_shortcut_add_contact_long" msgid="7573187314386728329">"Yeni kontakt"</string>
-    <string name="dialer_shortcut_disabled_message" msgid="7713603194332953571">"Qısayol işləmir. Ləğv etmək üçn sürüşdürün."</string>
-    <string name="dialer_shortcut_contact_not_found_or_has_no_number" msgid="3538594504123040498">"Kontakt artıq əlçatan deyil."</string>
-    <string name="dialer_shortcut_no_permissions" msgid="4422956724546867357">"İcazə olmadan zəng etmək mümkün deyil."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <string name="dialer_shortcut_add_contact_short">Yeni kontakt</string>
+  <string name="dialer_shortcut_add_contact_long">Yeni kontakt</string>
+  <string name="dialer_shortcut_disabled_message">Qısayol işləmir. Ləğv etmək üçn sürüşdürün.</string>
+  <string name="dialer_shortcut_contact_not_found_or_has_no_number">Kontakt artıq əlçatan deyil.</string>
+  <string name="dialer_shortcut_no_permissions">İcazə olmadan zəng etmək mümkün deyil.</string>
 </resources>
diff --git a/java/com/android/dialer/shortcuts/res/values-b+sr+Latn/strings.xml b/java/com/android/dialer/shortcuts/res/values-b+sr+Latn/strings.xml
index f977210..ef30d50 100644
--- a/java/com/android/dialer/shortcuts/res/values-b+sr+Latn/strings.xml
+++ b/java/com/android/dialer/shortcuts/res/values-b+sr+Latn/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="dialer_shortcut_add_contact_short" msgid="7587385197258884650">"Novi kont."</string>
-    <string name="dialer_shortcut_add_contact_long" msgid="7573187314386728329">"Novi kontakt"</string>
-    <string name="dialer_shortcut_disabled_message" msgid="7713603194332953571">"Prečica ne funkcioniše. Prevucite da biste je uklonili."</string>
-    <string name="dialer_shortcut_contact_not_found_or_has_no_number" msgid="3538594504123040498">"Kontakt više nije dostupan."</string>
-    <string name="dialer_shortcut_no_permissions" msgid="4422956724546867357">"Ne možete da pozovete jer nemate dozvole."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <string name="dialer_shortcut_add_contact_short">Novi kont.</string>
+  <string name="dialer_shortcut_add_contact_long">Novi kontakt</string>
+  <string name="dialer_shortcut_disabled_message">Prečica ne funkcioniše. Prevucite da biste je uklonili.</string>
+  <string name="dialer_shortcut_contact_not_found_or_has_no_number">Kontakt više nije dostupan.</string>
+  <string name="dialer_shortcut_no_permissions">Ne možete da pozovete jer nemate dozvole.</string>
 </resources>
diff --git a/java/com/android/dialer/shortcuts/res/values-be/strings.xml b/java/com/android/dialer/shortcuts/res/values-be/strings.xml
index 89175ef..63fd76e 100644
--- a/java/com/android/dialer/shortcuts/res/values-be/strings.xml
+++ b/java/com/android/dialer/shortcuts/res/values-be/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="dialer_shortcut_add_contact_short" msgid="7587385197258884650">"Новы кантакт"</string>
-    <string name="dialer_shortcut_add_contact_long" msgid="7573187314386728329">"Новы кантакт"</string>
-    <string name="dialer_shortcut_disabled_message" msgid="7713603194332953571">"Ярлык не працуе. Перацягніце, каб выдаліць."</string>
-    <string name="dialer_shortcut_contact_not_found_or_has_no_number" msgid="3538594504123040498">"Кантакт больш недаступны."</string>
-    <string name="dialer_shortcut_no_permissions" msgid="4422956724546867357">"Немагчыма рабіць выклікі без дазволаў."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <string name="dialer_shortcut_add_contact_short">Новы кантакт</string>
+  <string name="dialer_shortcut_add_contact_long">Новы кантакт</string>
+  <string name="dialer_shortcut_disabled_message">Ярлык не працуе. Перацягніце, каб выдаліць.</string>
+  <string name="dialer_shortcut_contact_not_found_or_has_no_number">Кантакт больш недаступны.</string>
+  <string name="dialer_shortcut_no_permissions">Немагчыма рабіць выклікі без дазволаў.</string>
 </resources>
diff --git a/java/com/android/dialer/shortcuts/res/values-bg/strings.xml b/java/com/android/dialer/shortcuts/res/values-bg/strings.xml
index 9b509f7..63202ab 100644
--- a/java/com/android/dialer/shortcuts/res/values-bg/strings.xml
+++ b/java/com/android/dialer/shortcuts/res/values-bg/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="dialer_shortcut_add_contact_short" msgid="7587385197258884650">"Нов конт."</string>
-    <string name="dialer_shortcut_add_contact_long" msgid="7573187314386728329">"Нов контакт"</string>
-    <string name="dialer_shortcut_disabled_message" msgid="7713603194332953571">"Прекият път не работи. Преместете го с плъзгане, за да го премахнете."</string>
-    <string name="dialer_shortcut_contact_not_found_or_has_no_number" msgid="3538594504123040498">"Контактът вече не е налице."</string>
-    <string name="dialer_shortcut_no_permissions" msgid="4422956724546867357">"Не можете да се обадите без разрешения."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <string name="dialer_shortcut_add_contact_short">Нов конт.</string>
+  <string name="dialer_shortcut_add_contact_long">Нов контакт</string>
+  <string name="dialer_shortcut_disabled_message">Прекият път не работи. Преместете го с плъзгане, за да го премахнете.</string>
+  <string name="dialer_shortcut_contact_not_found_or_has_no_number">Контактът вече не е налице.</string>
+  <string name="dialer_shortcut_no_permissions">Не можете да се обадите без разрешения.</string>
 </resources>
diff --git a/java/com/android/dialer/shortcuts/res/values-bn/strings.xml b/java/com/android/dialer/shortcuts/res/values-bn/strings.xml
index c9cd66e..59669fb 100644
--- a/java/com/android/dialer/shortcuts/res/values-bn/strings.xml
+++ b/java/com/android/dialer/shortcuts/res/values-bn/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="dialer_shortcut_add_contact_short" msgid="7587385197258884650">"নতুন পরিচিতি"</string>
-    <string name="dialer_shortcut_add_contact_long" msgid="7573187314386728329">"নতুন পরিচিতি"</string>
-    <string name="dialer_shortcut_disabled_message" msgid="7713603194332953571">"শর্টকাটটি কাজ করছে না৷ সরানোর জন্য টেনে আনুন৷"</string>
-    <string name="dialer_shortcut_contact_not_found_or_has_no_number" msgid="3538594504123040498">"পরিচিতি আর উপলব্ধ নেই৷"</string>
-    <string name="dialer_shortcut_no_permissions" msgid="4422956724546867357">"অনুমতি ছাড়া কল করা যাবে না৷"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <string name="dialer_shortcut_add_contact_short">নতুন পরিচিতি</string>
+  <string name="dialer_shortcut_add_contact_long">নতুন পরিচিতি</string>
+  <string name="dialer_shortcut_disabled_message">শর্টকাটটি কাজ করছে না৷ সরানোর জন্য টেনে আনুন৷</string>
+  <string name="dialer_shortcut_contact_not_found_or_has_no_number">পরিচিতি আর উপলব্ধ নেই৷</string>
+  <string name="dialer_shortcut_no_permissions">অনুমতি ছাড়া কল করা যাবে না৷</string>
 </resources>
diff --git a/java/com/android/dialer/shortcuts/res/values-bs/strings.xml b/java/com/android/dialer/shortcuts/res/values-bs/strings.xml
index c2916bc..1f1435d 100644
--- a/java/com/android/dialer/shortcuts/res/values-bs/strings.xml
+++ b/java/com/android/dialer/shortcuts/res/values-bs/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="dialer_shortcut_add_contact_short" msgid="7587385197258884650">"Novi kontakt"</string>
-    <string name="dialer_shortcut_add_contact_long" msgid="7573187314386728329">"Novi kontakt"</string>
-    <string name="dialer_shortcut_disabled_message" msgid="7713603194332953571">"Prečica ne radi. Povucite da je uklonite."</string>
-    <string name="dialer_shortcut_contact_not_found_or_has_no_number" msgid="3538594504123040498">"Kontakt više nije dostupan."</string>
-    <string name="dialer_shortcut_no_permissions" msgid="4422956724546867357">"Ne može se zvati bez odobrenja."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <string name="dialer_shortcut_add_contact_short">Novi kontakt</string>
+  <string name="dialer_shortcut_add_contact_long">Novi kontakt</string>
+  <string name="dialer_shortcut_disabled_message">Prečica ne radi. Povucite da je uklonite.</string>
+  <string name="dialer_shortcut_contact_not_found_or_has_no_number">Kontakt više nije dostupan.</string>
+  <string name="dialer_shortcut_no_permissions">Ne može se zvati bez odobrenja.</string>
 </resources>
diff --git a/java/com/android/dialer/shortcuts/res/values-ca/strings.xml b/java/com/android/dialer/shortcuts/res/values-ca/strings.xml
index 31164af..ffccebc 100644
--- a/java/com/android/dialer/shortcuts/res/values-ca/strings.xml
+++ b/java/com/android/dialer/shortcuts/res/values-ca/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="dialer_shortcut_add_contact_short" msgid="7587385197258884650">"Contacte nou"</string>
-    <string name="dialer_shortcut_add_contact_long" msgid="7573187314386728329">"Contacte nou"</string>
-    <string name="dialer_shortcut_disabled_message" msgid="7713603194332953571">"La drecera no funciona. Arrossega-la per suprimir-la."</string>
-    <string name="dialer_shortcut_contact_not_found_or_has_no_number" msgid="3538594504123040498">"El contacte ja no està disponible."</string>
-    <string name="dialer_shortcut_no_permissions" msgid="4422956724546867357">"No es pot trucar sense permisos."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <string name="dialer_shortcut_add_contact_short">Contacte nou</string>
+  <string name="dialer_shortcut_add_contact_long">Contacte nou</string>
+  <string name="dialer_shortcut_disabled_message">La drecera no funciona. Arrossega-la per suprimir-la.</string>
+  <string name="dialer_shortcut_contact_not_found_or_has_no_number">El contacte ja no està disponible.</string>
+  <string name="dialer_shortcut_no_permissions">No es pot trucar sense permisos.</string>
 </resources>
diff --git a/java/com/android/dialer/shortcuts/res/values-cs/strings.xml b/java/com/android/dialer/shortcuts/res/values-cs/strings.xml
index ccb1fd8..9cda492 100644
--- a/java/com/android/dialer/shortcuts/res/values-cs/strings.xml
+++ b/java/com/android/dialer/shortcuts/res/values-cs/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="dialer_shortcut_add_contact_short" msgid="7587385197258884650">"Nový kontakt"</string>
-    <string name="dialer_shortcut_add_contact_long" msgid="7573187314386728329">"Nový kontakt"</string>
-    <string name="dialer_shortcut_disabled_message" msgid="7713603194332953571">"Zkratka nefunguje. Přetažením ji odeberete."</string>
-    <string name="dialer_shortcut_contact_not_found_or_has_no_number" msgid="3538594504123040498">"Kontakt už není k dispozici."</string>
-    <string name="dialer_shortcut_no_permissions" msgid="4422956724546867357">"Bez oprávnění není možné volat."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <string name="dialer_shortcut_add_contact_short">Nový kontakt</string>
+  <string name="dialer_shortcut_add_contact_long">Nový kontakt</string>
+  <string name="dialer_shortcut_disabled_message">Zkratka nefunguje. Přetažením ji odeberete.</string>
+  <string name="dialer_shortcut_contact_not_found_or_has_no_number">Kontakt už není k dispozici.</string>
+  <string name="dialer_shortcut_no_permissions">Bez oprávnění není možné volat.</string>
 </resources>
diff --git a/java/com/android/dialer/shortcuts/res/values-da/strings.xml b/java/com/android/dialer/shortcuts/res/values-da/strings.xml
index e40fc56..e5c39d0a 100644
--- a/java/com/android/dialer/shortcuts/res/values-da/strings.xml
+++ b/java/com/android/dialer/shortcuts/res/values-da/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="dialer_shortcut_add_contact_short" msgid="7587385197258884650">"Ny kontakt"</string>
-    <string name="dialer_shortcut_add_contact_long" msgid="7573187314386728329">"Ny kontaktperson"</string>
-    <string name="dialer_shortcut_disabled_message" msgid="7713603194332953571">"Genvejen virker ikke. Træk for at fjerne."</string>
-    <string name="dialer_shortcut_contact_not_found_or_has_no_number" msgid="3538594504123040498">"Kontaktpersonen er ikke længere tilgængelig."</string>
-    <string name="dialer_shortcut_no_permissions" msgid="4422956724546867357">"Opkaldet kan ikke foretages uden tilladelser."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <string name="dialer_shortcut_add_contact_short">Ny kontakt</string>
+  <string name="dialer_shortcut_add_contact_long">Ny kontaktperson</string>
+  <string name="dialer_shortcut_disabled_message">Genvejen virker ikke. Træk for at fjerne.</string>
+  <string name="dialer_shortcut_contact_not_found_or_has_no_number">Kontaktpersonen er ikke længere tilgængelig.</string>
+  <string name="dialer_shortcut_no_permissions">Opkaldet kan ikke foretages uden tilladelser.</string>
 </resources>
diff --git a/java/com/android/dialer/shortcuts/res/values-de/strings.xml b/java/com/android/dialer/shortcuts/res/values-de/strings.xml
index 1040954..beae6e6 100644
--- a/java/com/android/dialer/shortcuts/res/values-de/strings.xml
+++ b/java/com/android/dialer/shortcuts/res/values-de/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="dialer_shortcut_add_contact_short" msgid="7587385197258884650">"Neuer Kontakt"</string>
-    <string name="dialer_shortcut_add_contact_long" msgid="7573187314386728329">"Neuer Kontakt"</string>
-    <string name="dialer_shortcut_disabled_message" msgid="7713603194332953571">"Verknüpfung funktioniert nicht. Zum Entfernen ziehen."</string>
-    <string name="dialer_shortcut_contact_not_found_or_has_no_number" msgid="3538594504123040498">"Kontakt nicht mehr verfügbar."</string>
-    <string name="dialer_shortcut_no_permissions" msgid="4422956724546867357">"Anruf ohne Berechtigungen nicht möglich."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <string name="dialer_shortcut_add_contact_short">Neuer Kontakt</string>
+  <string name="dialer_shortcut_add_contact_long">Neuer Kontakt</string>
+  <string name="dialer_shortcut_disabled_message">Verknüpfung funktioniert nicht. Zum Entfernen ziehen.</string>
+  <string name="dialer_shortcut_contact_not_found_or_has_no_number">Kontakt nicht mehr verfügbar.</string>
+  <string name="dialer_shortcut_no_permissions">Anruf ohne Berechtigungen nicht möglich.</string>
 </resources>
diff --git a/java/com/android/dialer/shortcuts/res/values-el/strings.xml b/java/com/android/dialer/shortcuts/res/values-el/strings.xml
index fd488ed..9d4edfa 100644
--- a/java/com/android/dialer/shortcuts/res/values-el/strings.xml
+++ b/java/com/android/dialer/shortcuts/res/values-el/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="dialer_shortcut_add_contact_short" msgid="7587385197258884650">"Νέα επαφή"</string>
-    <string name="dialer_shortcut_add_contact_long" msgid="7573187314386728329">"Νέα επαφή"</string>
-    <string name="dialer_shortcut_disabled_message" msgid="7713603194332953571">"Η συντόμευση δεν λειτουργεί. Σύρετε για κατάργηση."</string>
-    <string name="dialer_shortcut_contact_not_found_or_has_no_number" msgid="3538594504123040498">"Η επαφή δεν είναι διαθέσιμη πλέον."</string>
-    <string name="dialer_shortcut_no_permissions" msgid="4422956724546867357">"Δεν είναι δυνατή η κλήση χωρίς δικαιώματα πρόσβασης."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <string name="dialer_shortcut_add_contact_short">Νέα επαφή</string>
+  <string name="dialer_shortcut_add_contact_long">Νέα επαφή</string>
+  <string name="dialer_shortcut_disabled_message">Η συντόμευση δεν λειτουργεί. Σύρετε για κατάργηση.</string>
+  <string name="dialer_shortcut_contact_not_found_or_has_no_number">Η επαφή δεν είναι διαθέσιμη πλέον.</string>
+  <string name="dialer_shortcut_no_permissions">Δεν είναι δυνατή η κλήση χωρίς δικαιώματα πρόσβασης.</string>
 </resources>
diff --git a/java/com/android/dialer/shortcuts/res/values-en-rAU/strings.xml b/java/com/android/dialer/shortcuts/res/values-en-rAU/strings.xml
index 4e5ece5..0bac4ca 100644
--- a/java/com/android/dialer/shortcuts/res/values-en-rAU/strings.xml
+++ b/java/com/android/dialer/shortcuts/res/values-en-rAU/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="dialer_shortcut_add_contact_short" msgid="7587385197258884650">"+ contact"</string>
-    <string name="dialer_shortcut_add_contact_long" msgid="7573187314386728329">"New contact"</string>
-    <string name="dialer_shortcut_disabled_message" msgid="7713603194332953571">"Shortcut not working. Drag to remove."</string>
-    <string name="dialer_shortcut_contact_not_found_or_has_no_number" msgid="3538594504123040498">"Contact no longer available."</string>
-    <string name="dialer_shortcut_no_permissions" msgid="4422956724546867357">"Cannot call without permission."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <string name="dialer_shortcut_add_contact_short">+ contact</string>
+  <string name="dialer_shortcut_add_contact_long">New contact</string>
+  <string name="dialer_shortcut_disabled_message">Shortcut not working. Drag to remove.</string>
+  <string name="dialer_shortcut_contact_not_found_or_has_no_number">Contact no longer available.</string>
+  <string name="dialer_shortcut_no_permissions">Cannot call without permission.</string>
 </resources>
diff --git a/java/com/android/dialer/shortcuts/res/values-en-rGB/strings.xml b/java/com/android/dialer/shortcuts/res/values-en-rGB/strings.xml
index 4e5ece5..0bac4ca 100644
--- a/java/com/android/dialer/shortcuts/res/values-en-rGB/strings.xml
+++ b/java/com/android/dialer/shortcuts/res/values-en-rGB/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="dialer_shortcut_add_contact_short" msgid="7587385197258884650">"+ contact"</string>
-    <string name="dialer_shortcut_add_contact_long" msgid="7573187314386728329">"New contact"</string>
-    <string name="dialer_shortcut_disabled_message" msgid="7713603194332953571">"Shortcut not working. Drag to remove."</string>
-    <string name="dialer_shortcut_contact_not_found_or_has_no_number" msgid="3538594504123040498">"Contact no longer available."</string>
-    <string name="dialer_shortcut_no_permissions" msgid="4422956724546867357">"Cannot call without permission."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <string name="dialer_shortcut_add_contact_short">+ contact</string>
+  <string name="dialer_shortcut_add_contact_long">New contact</string>
+  <string name="dialer_shortcut_disabled_message">Shortcut not working. Drag to remove.</string>
+  <string name="dialer_shortcut_contact_not_found_or_has_no_number">Contact no longer available.</string>
+  <string name="dialer_shortcut_no_permissions">Cannot call without permission.</string>
 </resources>
diff --git a/java/com/android/dialer/shortcuts/res/values-en-rIN/strings.xml b/java/com/android/dialer/shortcuts/res/values-en-rIN/strings.xml
index 4e5ece5..0bac4ca 100644
--- a/java/com/android/dialer/shortcuts/res/values-en-rIN/strings.xml
+++ b/java/com/android/dialer/shortcuts/res/values-en-rIN/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="dialer_shortcut_add_contact_short" msgid="7587385197258884650">"+ contact"</string>
-    <string name="dialer_shortcut_add_contact_long" msgid="7573187314386728329">"New contact"</string>
-    <string name="dialer_shortcut_disabled_message" msgid="7713603194332953571">"Shortcut not working. Drag to remove."</string>
-    <string name="dialer_shortcut_contact_not_found_or_has_no_number" msgid="3538594504123040498">"Contact no longer available."</string>
-    <string name="dialer_shortcut_no_permissions" msgid="4422956724546867357">"Cannot call without permission."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <string name="dialer_shortcut_add_contact_short">+ contact</string>
+  <string name="dialer_shortcut_add_contact_long">New contact</string>
+  <string name="dialer_shortcut_disabled_message">Shortcut not working. Drag to remove.</string>
+  <string name="dialer_shortcut_contact_not_found_or_has_no_number">Contact no longer available.</string>
+  <string name="dialer_shortcut_no_permissions">Cannot call without permission.</string>
 </resources>
diff --git a/java/com/android/dialer/shortcuts/res/values-es-rUS/strings.xml b/java/com/android/dialer/shortcuts/res/values-es-rUS/strings.xml
index 325780f..7db8c3a 100644
--- a/java/com/android/dialer/shortcuts/res/values-es-rUS/strings.xml
+++ b/java/com/android/dialer/shortcuts/res/values-es-rUS/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="dialer_shortcut_add_contact_short" msgid="7587385197258884650">"Nuevo"</string>
-    <string name="dialer_shortcut_add_contact_long" msgid="7573187314386728329">"Contacto nuevo"</string>
-    <string name="dialer_shortcut_disabled_message" msgid="7713603194332953571">"El acceso directo no funciona. Arrástralo para quitarlo."</string>
-    <string name="dialer_shortcut_contact_not_found_or_has_no_number" msgid="3538594504123040498">"Este contacto ya no está disponible."</string>
-    <string name="dialer_shortcut_no_permissions" msgid="4422956724546867357">"No se puede llamar sin permisos."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <string name="dialer_shortcut_add_contact_short">Nuevo</string>
+  <string name="dialer_shortcut_add_contact_long">Contacto nuevo</string>
+  <string name="dialer_shortcut_disabled_message">El acceso directo no funciona. Arrástralo para quitarlo.</string>
+  <string name="dialer_shortcut_contact_not_found_or_has_no_number">Este contacto ya no está disponible.</string>
+  <string name="dialer_shortcut_no_permissions">No se puede llamar sin permisos.</string>
 </resources>
diff --git a/java/com/android/dialer/shortcuts/res/values-es/strings.xml b/java/com/android/dialer/shortcuts/res/values-es/strings.xml
index 4e33efd..674654e 100644
--- a/java/com/android/dialer/shortcuts/res/values-es/strings.xml
+++ b/java/com/android/dialer/shortcuts/res/values-es/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="dialer_shortcut_add_contact_short" msgid="7587385197258884650">"Nuevo cont."</string>
-    <string name="dialer_shortcut_add_contact_long" msgid="7573187314386728329">"Nuevo contacto"</string>
-    <string name="dialer_shortcut_disabled_message" msgid="7713603194332953571">"La combinación de teclas no funciona. Arrástrala para eliminarla."</string>
-    <string name="dialer_shortcut_contact_not_found_or_has_no_number" msgid="3538594504123040498">"Este contacto ya no está disponible."</string>
-    <string name="dialer_shortcut_no_permissions" msgid="4422956724546867357">"No puedes llamar sin permisos."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <string name="dialer_shortcut_add_contact_short">Nuevo cont.</string>
+  <string name="dialer_shortcut_add_contact_long">Nuevo contacto</string>
+  <string name="dialer_shortcut_disabled_message">La combinación de teclas no funciona. Arrástrala para eliminarla.</string>
+  <string name="dialer_shortcut_contact_not_found_or_has_no_number">Este contacto ya no está disponible.</string>
+  <string name="dialer_shortcut_no_permissions">No puedes llamar sin permisos.</string>
 </resources>
diff --git a/java/com/android/dialer/shortcuts/res/values-et/strings.xml b/java/com/android/dialer/shortcuts/res/values-et/strings.xml
index d9b4221..55e52e6 100644
--- a/java/com/android/dialer/shortcuts/res/values-et/strings.xml
+++ b/java/com/android/dialer/shortcuts/res/values-et/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="dialer_shortcut_add_contact_short" msgid="7587385197258884650">"Uus kontakt"</string>
-    <string name="dialer_shortcut_add_contact_long" msgid="7573187314386728329">"Uus kontakt"</string>
-    <string name="dialer_shortcut_disabled_message" msgid="7713603194332953571">"Otsetee ei tööta. Lohistage eemaldamiseks."</string>
-    <string name="dialer_shortcut_contact_not_found_or_has_no_number" msgid="3538594504123040498">"Kontakt pole enam saadaval."</string>
-    <string name="dialer_shortcut_no_permissions" msgid="4422956724546867357">"Ilma lubadeta ei saa helistada."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <string name="dialer_shortcut_add_contact_short">Uus kontakt</string>
+  <string name="dialer_shortcut_add_contact_long">Uus kontakt</string>
+  <string name="dialer_shortcut_disabled_message">Otsetee ei tööta. Lohistage eemaldamiseks.</string>
+  <string name="dialer_shortcut_contact_not_found_or_has_no_number">Kontakt pole enam saadaval.</string>
+  <string name="dialer_shortcut_no_permissions">Ilma lubadeta ei saa helistada.</string>
 </resources>
diff --git a/java/com/android/dialer/shortcuts/res/values-eu/strings.xml b/java/com/android/dialer/shortcuts/res/values-eu/strings.xml
index b284732..dee8d8f 100644
--- a/java/com/android/dialer/shortcuts/res/values-eu/strings.xml
+++ b/java/com/android/dialer/shortcuts/res/values-eu/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="dialer_shortcut_add_contact_short" msgid="7587385197258884650">"Kontaktua"</string>
-    <string name="dialer_shortcut_add_contact_long" msgid="7573187314386728329">"Kontaktu berria"</string>
-    <string name="dialer_shortcut_disabled_message" msgid="7713603194332953571">"Lasterbidea ez dabil. Arrastatu kentzeko."</string>
-    <string name="dialer_shortcut_contact_not_found_or_has_no_number" msgid="3538594504123040498">"Kontaktua ez dago jada erabilgarri."</string>
-    <string name="dialer_shortcut_no_permissions" msgid="4422956724546867357">"Ezin duzu egin deirik baimenik ez baduzu."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <string name="dialer_shortcut_add_contact_short">Kontaktua</string>
+  <string name="dialer_shortcut_add_contact_long">Kontaktu berria</string>
+  <string name="dialer_shortcut_disabled_message">Lasterbidea ez dabil. Arrastatu kentzeko.</string>
+  <string name="dialer_shortcut_contact_not_found_or_has_no_number">Kontaktua ez dago jada erabilgarri.</string>
+  <string name="dialer_shortcut_no_permissions">Ezin duzu egin deirik baimenik ez baduzu.</string>
 </resources>
diff --git a/java/com/android/dialer/shortcuts/res/values-fa/strings.xml b/java/com/android/dialer/shortcuts/res/values-fa/strings.xml
index 0122beb..948275f 100644
--- a/java/com/android/dialer/shortcuts/res/values-fa/strings.xml
+++ b/java/com/android/dialer/shortcuts/res/values-fa/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="dialer_shortcut_add_contact_short" msgid="7587385197258884650">"مخاطب جدید"</string>
-    <string name="dialer_shortcut_add_contact_long" msgid="7573187314386728329">"مخاطب جدید"</string>
-    <string name="dialer_shortcut_disabled_message" msgid="7713603194332953571">"میان‌بر کار نمی‌کند. برای حذف کردن، بکشید."</string>
-    <string name="dialer_shortcut_contact_not_found_or_has_no_number" msgid="3538594504123040498">"مخاطب دیگر در دسترس نیست."</string>
-    <string name="dialer_shortcut_no_permissions" msgid="4422956724546867357">"برقراری تماس بدون مجوز ممکن نیست."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <string name="dialer_shortcut_add_contact_short">مخاطب جدید</string>
+  <string name="dialer_shortcut_add_contact_long">مخاطب جدید</string>
+  <string name="dialer_shortcut_disabled_message">میان‌بر کار نمی‌کند. برای حذف کردن، بکشید.</string>
+  <string name="dialer_shortcut_contact_not_found_or_has_no_number">مخاطب دیگر در دسترس نیست.</string>
+  <string name="dialer_shortcut_no_permissions">برقراری تماس بدون مجوز ممکن نیست.</string>
 </resources>
diff --git a/java/com/android/dialer/shortcuts/res/values-fi/strings.xml b/java/com/android/dialer/shortcuts/res/values-fi/strings.xml
index d1a4b52..5e9cbfa 100644
--- a/java/com/android/dialer/shortcuts/res/values-fi/strings.xml
+++ b/java/com/android/dialer/shortcuts/res/values-fi/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="dialer_shortcut_add_contact_short" msgid="7587385197258884650">"Uusi yhteystieto"</string>
-    <string name="dialer_shortcut_add_contact_long" msgid="7573187314386728329">"Uusi yhteystieto"</string>
-    <string name="dialer_shortcut_disabled_message" msgid="7713603194332953571">"Pikavalinta ei toimi. Poista vetämällä."</string>
-    <string name="dialer_shortcut_contact_not_found_or_has_no_number" msgid="3538594504123040498">"Yhteystieto ei ole enää käytettävissä."</string>
-    <string name="dialer_shortcut_no_permissions" msgid="4422956724546867357">"Ei voi soittaa ilman käyttöoikeuksia."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <string name="dialer_shortcut_add_contact_short">Uusi yhteystieto</string>
+  <string name="dialer_shortcut_add_contact_long">Uusi yhteystieto</string>
+  <string name="dialer_shortcut_disabled_message">Pikavalinta ei toimi. Poista vetämällä.</string>
+  <string name="dialer_shortcut_contact_not_found_or_has_no_number">Yhteystieto ei ole enää käytettävissä.</string>
+  <string name="dialer_shortcut_no_permissions">Ei voi soittaa ilman käyttöoikeuksia.</string>
 </resources>
diff --git a/java/com/android/dialer/shortcuts/res/values-fr-rCA/strings.xml b/java/com/android/dialer/shortcuts/res/values-fr-rCA/strings.xml
index 9123019..ae2393a 100644
--- a/java/com/android/dialer/shortcuts/res/values-fr-rCA/strings.xml
+++ b/java/com/android/dialer/shortcuts/res/values-fr-rCA/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="dialer_shortcut_add_contact_short" msgid="7587385197258884650">"Nouv. cont."</string>
-    <string name="dialer_shortcut_add_contact_long" msgid="7573187314386728329">"Nouveau contact"</string>
-    <string name="dialer_shortcut_disabled_message" msgid="7713603194332953571">"Le raccourci ne fonctionne pas. Faites-le glisser pour le supprimer."</string>
-    <string name="dialer_shortcut_contact_not_found_or_has_no_number" msgid="3538594504123040498">"Le contact n\'est plus disponible."</string>
-    <string name="dialer_shortcut_no_permissions" msgid="4422956724546867357">"Impossible de faire des appels sans autorisations."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <string name="dialer_shortcut_add_contact_short">Nouv. cont.</string>
+  <string name="dialer_shortcut_add_contact_long">Nouveau contact</string>
+  <string name="dialer_shortcut_disabled_message">Le raccourci ne fonctionne pas. Faites-le glisser pour le supprimer.</string>
+  <string name="dialer_shortcut_contact_not_found_or_has_no_number">Le contact n\'est plus disponible.</string>
+  <string name="dialer_shortcut_no_permissions">Impossible de faire des appels sans autorisations.</string>
 </resources>
diff --git a/java/com/android/dialer/shortcuts/res/values-fr/strings.xml b/java/com/android/dialer/shortcuts/res/values-fr/strings.xml
index 1e816ab..8a349a3 100644
--- a/java/com/android/dialer/shortcuts/res/values-fr/strings.xml
+++ b/java/com/android/dialer/shortcuts/res/values-fr/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="dialer_shortcut_add_contact_short" msgid="7587385197258884650">"Nv contact"</string>
-    <string name="dialer_shortcut_add_contact_long" msgid="7573187314386728329">"Nouveau contact"</string>
-    <string name="dialer_shortcut_disabled_message" msgid="7713603194332953571">"Ce raccourci ne fonctionne pas. Faites-le glisser pour le supprimer."</string>
-    <string name="dialer_shortcut_contact_not_found_or_has_no_number" msgid="3538594504123040498">"Le contact n\'est plus disponible."</string>
-    <string name="dialer_shortcut_no_permissions" msgid="4422956724546867357">"Impossible d\'appeler si vous n\'avez pas validé les autorisations."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <string name="dialer_shortcut_add_contact_short">Nv contact</string>
+  <string name="dialer_shortcut_add_contact_long">Nouveau contact</string>
+  <string name="dialer_shortcut_disabled_message">Ce raccourci ne fonctionne pas. Faites-le glisser pour le supprimer.</string>
+  <string name="dialer_shortcut_contact_not_found_or_has_no_number">Le contact n\'est plus disponible.</string>
+  <string name="dialer_shortcut_no_permissions">Impossible d\'appeler si vous n\'avez pas validé les autorisations.</string>
 </resources>
diff --git a/java/com/android/dialer/shortcuts/res/values-gl/strings.xml b/java/com/android/dialer/shortcuts/res/values-gl/strings.xml
index e487201..1927075 100644
--- a/java/com/android/dialer/shortcuts/res/values-gl/strings.xml
+++ b/java/com/android/dialer/shortcuts/res/values-gl/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="dialer_shortcut_add_contact_short" msgid="7587385197258884650">"Novo cont."</string>
-    <string name="dialer_shortcut_add_contact_long" msgid="7573187314386728329">"Novo contacto"</string>
-    <string name="dialer_shortcut_disabled_message" msgid="7713603194332953571">"O atallo non funciona. Arrástrao para eliminalo."</string>
-    <string name="dialer_shortcut_contact_not_found_or_has_no_number" msgid="3538594504123040498">"O contacto xa non está dispoñible."</string>
-    <string name="dialer_shortcut_no_permissions" msgid="4422956724546867357">"Non se pode chamar sen os permisos."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <string name="dialer_shortcut_add_contact_short">Novo cont.</string>
+  <string name="dialer_shortcut_add_contact_long">Novo contacto</string>
+  <string name="dialer_shortcut_disabled_message">O atallo non funciona. Arrástrao para eliminalo.</string>
+  <string name="dialer_shortcut_contact_not_found_or_has_no_number">O contacto xa non está dispoñible.</string>
+  <string name="dialer_shortcut_no_permissions">Non se pode chamar sen os permisos.</string>
 </resources>
diff --git a/java/com/android/dialer/shortcuts/res/values-gu/strings.xml b/java/com/android/dialer/shortcuts/res/values-gu/strings.xml
index b4e60e3..cef2ae6 100644
--- a/java/com/android/dialer/shortcuts/res/values-gu/strings.xml
+++ b/java/com/android/dialer/shortcuts/res/values-gu/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="dialer_shortcut_add_contact_short" msgid="7587385197258884650">"નવો સંપર્ક"</string>
-    <string name="dialer_shortcut_add_contact_long" msgid="7573187314386728329">"નવો સંપર્ક"</string>
-    <string name="dialer_shortcut_disabled_message" msgid="7713603194332953571">"શૉર્ટકટ કામ કરતું નથી. દૂર કરવા માટે ખેંચો."</string>
-    <string name="dialer_shortcut_contact_not_found_or_has_no_number" msgid="3538594504123040498">"સંપર્ક હવે ઉપલબ્ધ નથી."</string>
-    <string name="dialer_shortcut_no_permissions" msgid="4422956724546867357">"પરવાનગીઓ વગર કૉલ કરી શકતાં નથી."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <string name="dialer_shortcut_add_contact_short">નવો સંપર્ક</string>
+  <string name="dialer_shortcut_add_contact_long">નવો સંપર્ક</string>
+  <string name="dialer_shortcut_disabled_message">શૉર્ટકટ કામ કરતું નથી. દૂર કરવા માટે ખેંચો.</string>
+  <string name="dialer_shortcut_contact_not_found_or_has_no_number">સંપર્ક હવે ઉપલબ્ધ નથી.</string>
+  <string name="dialer_shortcut_no_permissions">પરવાનગીઓ વગર કૉલ કરી શકતાં નથી.</string>
 </resources>
diff --git a/java/com/android/dialer/shortcuts/res/values-hi/strings.xml b/java/com/android/dialer/shortcuts/res/values-hi/strings.xml
index fbd8ab5..5cd3103 100644
--- a/java/com/android/dialer/shortcuts/res/values-hi/strings.xml
+++ b/java/com/android/dialer/shortcuts/res/values-hi/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="dialer_shortcut_add_contact_short" msgid="7587385197258884650">"नया संपर्क"</string>
-    <string name="dialer_shortcut_add_contact_long" msgid="7573187314386728329">"नया संपर्क"</string>
-    <string name="dialer_shortcut_disabled_message" msgid="7713603194332953571">"शॉर्टकट काम नहीं कर रहा है. उसे निकालने के लिए खींचें."</string>
-    <string name="dialer_shortcut_contact_not_found_or_has_no_number" msgid="3538594504123040498">"संपर्क अब उपलब्ध नहीं है."</string>
-    <string name="dialer_shortcut_no_permissions" msgid="4422956724546867357">"अनुमतियों के बिना कॉल नहीं किया जा सकता."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <string name="dialer_shortcut_add_contact_short">नया संपर्क</string>
+  <string name="dialer_shortcut_add_contact_long">नया संपर्क</string>
+  <string name="dialer_shortcut_disabled_message">शॉर्टकट काम नहीं कर रहा है. उसे निकालने के लिए खींचें.</string>
+  <string name="dialer_shortcut_contact_not_found_or_has_no_number">संपर्क अब उपलब्ध नहीं है.</string>
+  <string name="dialer_shortcut_no_permissions">अनुमतियों के बिना कॉल नहीं किया जा सकता.</string>
 </resources>
diff --git a/java/com/android/dialer/shortcuts/res/values-hr/strings.xml b/java/com/android/dialer/shortcuts/res/values-hr/strings.xml
index 74895c4..44f6315 100644
--- a/java/com/android/dialer/shortcuts/res/values-hr/strings.xml
+++ b/java/com/android/dialer/shortcuts/res/values-hr/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="dialer_shortcut_add_contact_short" msgid="7587385197258884650">"Novi kontakt"</string>
-    <string name="dialer_shortcut_add_contact_long" msgid="7573187314386728329">"Novi kontakt"</string>
-    <string name="dialer_shortcut_disabled_message" msgid="7713603194332953571">"Prečac ne radi. Povucite za uklanjanje."</string>
-    <string name="dialer_shortcut_contact_not_found_or_has_no_number" msgid="3538594504123040498">"Kontakt više nije dostupan."</string>
-    <string name="dialer_shortcut_no_permissions" msgid="4422956724546867357">"Pozivanje nije moguće bez dopuštenja."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <string name="dialer_shortcut_add_contact_short">Novi kontakt</string>
+  <string name="dialer_shortcut_add_contact_long">Novi kontakt</string>
+  <string name="dialer_shortcut_disabled_message">Prečac ne radi. Povucite za uklanjanje.</string>
+  <string name="dialer_shortcut_contact_not_found_or_has_no_number">Kontakt više nije dostupan.</string>
+  <string name="dialer_shortcut_no_permissions">Pozivanje nije moguće bez dopuštenja.</string>
 </resources>
diff --git a/java/com/android/dialer/shortcuts/res/values-hu/strings.xml b/java/com/android/dialer/shortcuts/res/values-hu/strings.xml
index bf85558..c6c2454 100644
--- a/java/com/android/dialer/shortcuts/res/values-hu/strings.xml
+++ b/java/com/android/dialer/shortcuts/res/values-hu/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="dialer_shortcut_add_contact_short" msgid="7587385197258884650">"Új névjegy"</string>
-    <string name="dialer_shortcut_add_contact_long" msgid="7573187314386728329">"Új névjegy"</string>
-    <string name="dialer_shortcut_disabled_message" msgid="7713603194332953571">"A parancsikon nem működik. Húzással távolítsa el."</string>
-    <string name="dialer_shortcut_contact_not_found_or_has_no_number" msgid="3538594504123040498">"A névjegy már nem érhető el."</string>
-    <string name="dialer_shortcut_no_permissions" msgid="4422956724546867357">"Nem indíthat hívást engedély nélkül."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <string name="dialer_shortcut_add_contact_short">Új névjegy</string>
+  <string name="dialer_shortcut_add_contact_long">Új névjegy</string>
+  <string name="dialer_shortcut_disabled_message">A parancsikon nem működik. Húzással távolítsa el.</string>
+  <string name="dialer_shortcut_contact_not_found_or_has_no_number">A névjegy már nem érhető el.</string>
+  <string name="dialer_shortcut_no_permissions">Nem indíthat hívást engedély nélkül.</string>
 </resources>
diff --git a/java/com/android/dialer/shortcuts/res/values-hy/strings.xml b/java/com/android/dialer/shortcuts/res/values-hy/strings.xml
index 7106b46..2c9f435 100644
--- a/java/com/android/dialer/shortcuts/res/values-hy/strings.xml
+++ b/java/com/android/dialer/shortcuts/res/values-hy/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="dialer_shortcut_add_contact_short" msgid="7587385197258884650">"Նոր կոնտակտ"</string>
-    <string name="dialer_shortcut_add_contact_long" msgid="7573187314386728329">"Նոր կոնտակտ"</string>
-    <string name="dialer_shortcut_disabled_message" msgid="7713603194332953571">"Դյուրանցումը չի աշխատում: Քաշեք՝ հեռացնելու համար:"</string>
-    <string name="dialer_shortcut_contact_not_found_or_has_no_number" msgid="3538594504123040498">"Կոնտակտն այլևս հասանելի չէ:"</string>
-    <string name="dialer_shortcut_no_permissions" msgid="4422956724546867357">"Զանգելու համար պահանջվում է թույլտվություն:"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <string name="dialer_shortcut_add_contact_short">Նոր կոնտակտ</string>
+  <string name="dialer_shortcut_add_contact_long">Նոր կոնտակտ</string>
+  <string name="dialer_shortcut_disabled_message">Դյուրանցումը չի աշխատում: Քաշեք՝ հեռացնելու համար:</string>
+  <string name="dialer_shortcut_contact_not_found_or_has_no_number">Կոնտակտն այլևս հասանելի չէ:</string>
+  <string name="dialer_shortcut_no_permissions">Զանգելու համար պահանջվում է թույլտվություն:</string>
 </resources>
diff --git a/java/com/android/dialer/shortcuts/res/values-in/strings.xml b/java/com/android/dialer/shortcuts/res/values-in/strings.xml
index d563990..19d5c9e 100644
--- a/java/com/android/dialer/shortcuts/res/values-in/strings.xml
+++ b/java/com/android/dialer/shortcuts/res/values-in/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="dialer_shortcut_add_contact_short" msgid="7587385197258884650">"Kontak baru"</string>
-    <string name="dialer_shortcut_add_contact_long" msgid="7573187314386728329">"Kontak baru"</string>
-    <string name="dialer_shortcut_disabled_message" msgid="7713603194332953571">"Pintasan tidak berfungsi. Seret untuk menghapus."</string>
-    <string name="dialer_shortcut_contact_not_found_or_has_no_number" msgid="3538594504123040498">"Kontak tidak tersedia lagi."</string>
-    <string name="dialer_shortcut_no_permissions" msgid="4422956724546867357">"Tidak dapat melakukan panggilan tanpa izin."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <string name="dialer_shortcut_add_contact_short">Kontak baru</string>
+  <string name="dialer_shortcut_add_contact_long">Kontak baru</string>
+  <string name="dialer_shortcut_disabled_message">Pintasan tidak berfungsi. Tarik untuk menghapus.</string>
+  <string name="dialer_shortcut_contact_not_found_or_has_no_number">Kontak tidak tersedia lagi.</string>
+  <string name="dialer_shortcut_no_permissions">Tidak dapat melakukan panggilan tanpa izin.</string>
 </resources>
diff --git a/java/com/android/dialer/shortcuts/res/values-is/strings.xml b/java/com/android/dialer/shortcuts/res/values-is/strings.xml
index 4682ec7..68924fb 100644
--- a/java/com/android/dialer/shortcuts/res/values-is/strings.xml
+++ b/java/com/android/dialer/shortcuts/res/values-is/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="dialer_shortcut_add_contact_short" msgid="7587385197258884650">"Nýr tengiliður"</string>
-    <string name="dialer_shortcut_add_contact_long" msgid="7573187314386728329">"Nýr tengiliður"</string>
-    <string name="dialer_shortcut_disabled_message" msgid="7713603194332953571">"Flýtileið virkar ekki. Dragðu til að fjarlægja."</string>
-    <string name="dialer_shortcut_contact_not_found_or_has_no_number" msgid="3538594504123040498">"Tengiliður ekki lengur tiltækur."</string>
-    <string name="dialer_shortcut_no_permissions" msgid="4422956724546867357">"Ekki er hægt að hringja án heimilda."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <string name="dialer_shortcut_add_contact_short">Nýr tengiliður</string>
+  <string name="dialer_shortcut_add_contact_long">Nýr tengiliður</string>
+  <string name="dialer_shortcut_disabled_message">Flýtileið virkar ekki. Dragðu til að fjarlægja.</string>
+  <string name="dialer_shortcut_contact_not_found_or_has_no_number">Tengiliður ekki lengur tiltækur.</string>
+  <string name="dialer_shortcut_no_permissions">Ekki er hægt að hringja án heimilda.</string>
 </resources>
diff --git a/java/com/android/dialer/shortcuts/res/values-it/strings.xml b/java/com/android/dialer/shortcuts/res/values-it/strings.xml
index 7ab841f..c9cab09 100644
--- a/java/com/android/dialer/shortcuts/res/values-it/strings.xml
+++ b/java/com/android/dialer/shortcuts/res/values-it/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="dialer_shortcut_add_contact_short" msgid="7587385197258884650">"Nuovo contatto"</string>
-    <string name="dialer_shortcut_add_contact_long" msgid="7573187314386728329">"Nuovo contatto"</string>
-    <string name="dialer_shortcut_disabled_message" msgid="7713603194332953571">"La scorciatoia non funziona. Trascina per rimuoverla."</string>
-    <string name="dialer_shortcut_contact_not_found_or_has_no_number" msgid="3538594504123040498">"Contatto non più disponibile."</string>
-    <string name="dialer_shortcut_no_permissions" msgid="4422956724546867357">"Impossibile chiamare senza autorizzazioni."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <string name="dialer_shortcut_add_contact_short">Nuovo contatto</string>
+  <string name="dialer_shortcut_add_contact_long">Nuovo contatto</string>
+  <string name="dialer_shortcut_disabled_message">La scorciatoia non funziona. Trascina per rimuoverla.</string>
+  <string name="dialer_shortcut_contact_not_found_or_has_no_number">Contatto non più disponibile.</string>
+  <string name="dialer_shortcut_no_permissions">Impossibile chiamare senza autorizzazioni.</string>
 </resources>
diff --git a/java/com/android/dialer/shortcuts/res/values-iw/strings.xml b/java/com/android/dialer/shortcuts/res/values-iw/strings.xml
index 6829f3b..0494adf 100644
--- a/java/com/android/dialer/shortcuts/res/values-iw/strings.xml
+++ b/java/com/android/dialer/shortcuts/res/values-iw/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="dialer_shortcut_add_contact_short" msgid="7587385197258884650">"איש קשר חדש"</string>
-    <string name="dialer_shortcut_add_contact_long" msgid="7573187314386728329">"איש קשר חדש"</string>
-    <string name="dialer_shortcut_disabled_message" msgid="7713603194332953571">"מקש הקיצור לא פועל. גרור כדי להסיר."</string>
-    <string name="dialer_shortcut_contact_not_found_or_has_no_number" msgid="3538594504123040498">"איש הקשר לא זמין יותר."</string>
-    <string name="dialer_shortcut_no_permissions" msgid="4422956724546867357">"לא ניתן להתקשר ללא הרשאות הגישה."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <string name="dialer_shortcut_add_contact_short">איש קשר חדש</string>
+  <string name="dialer_shortcut_add_contact_long">איש קשר חדש</string>
+  <string name="dialer_shortcut_disabled_message">מקש הקיצור לא פועל. גרור כדי להסיר.</string>
+  <string name="dialer_shortcut_contact_not_found_or_has_no_number">איש הקשר לא זמין יותר.</string>
+  <string name="dialer_shortcut_no_permissions">לא ניתן להתקשר ללא הרשאות הגישה.</string>
 </resources>
diff --git a/java/com/android/dialer/shortcuts/res/values-ja/strings.xml b/java/com/android/dialer/shortcuts/res/values-ja/strings.xml
index 009aaae..6bf0a07 100644
--- a/java/com/android/dialer/shortcuts/res/values-ja/strings.xml
+++ b/java/com/android/dialer/shortcuts/res/values-ja/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="dialer_shortcut_add_contact_short" msgid="7587385197258884650">"新規連絡先"</string>
-    <string name="dialer_shortcut_add_contact_long" msgid="7573187314386728329">"新しい連絡先"</string>
-    <string name="dialer_shortcut_disabled_message" msgid="7713603194332953571">"このショートカットは無効になっています。ドラッグして削除してください。"</string>
-    <string name="dialer_shortcut_contact_not_found_or_has_no_number" msgid="3538594504123040498">"この連絡先は利用できません"</string>
-    <string name="dialer_shortcut_no_permissions" msgid="4422956724546867357">"通話を発信するにはアクセスを許可する必要があります。"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <string name="dialer_shortcut_add_contact_short">新規連絡先</string>
+  <string name="dialer_shortcut_add_contact_long">新しい連絡先</string>
+  <string name="dialer_shortcut_disabled_message">このショートカットは無効になっています。ドラッグして削除してください。</string>
+  <string name="dialer_shortcut_contact_not_found_or_has_no_number">この連絡先は利用できません</string>
+  <string name="dialer_shortcut_no_permissions">通話を発信するにはアクセスを許可する必要があります。</string>
 </resources>
diff --git a/java/com/android/dialer/shortcuts/res/values-ka/strings.xml b/java/com/android/dialer/shortcuts/res/values-ka/strings.xml
index ccab3eb..fa05ae1 100644
--- a/java/com/android/dialer/shortcuts/res/values-ka/strings.xml
+++ b/java/com/android/dialer/shortcuts/res/values-ka/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="dialer_shortcut_add_contact_short" msgid="7587385197258884650">"ახალ.კონტ."</string>
-    <string name="dialer_shortcut_add_contact_long" msgid="7573187314386728329">"ახალი კონტაქტი"</string>
-    <string name="dialer_shortcut_disabled_message" msgid="7713603194332953571">"მალსახმობი არ მუშაობს. ჩაავლეთ წასაშლელად."</string>
-    <string name="dialer_shortcut_contact_not_found_or_has_no_number" msgid="3538594504123040498">"კონტაქტი ხელმისაწვდომი აღარ არის."</string>
-    <string name="dialer_shortcut_no_permissions" msgid="4422956724546867357">"ნებართვების გარეშე დარეკვა შეუძლებელია."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <string name="dialer_shortcut_add_contact_short">ახალ.კონტ.</string>
+  <string name="dialer_shortcut_add_contact_long">ახალი კონტაქტი</string>
+  <string name="dialer_shortcut_disabled_message">მალსახმობი არ მუშაობს. ჩაავლეთ წასაშლელად.</string>
+  <string name="dialer_shortcut_contact_not_found_or_has_no_number">კონტაქტი ხელმისაწვდომი აღარ არის.</string>
+  <string name="dialer_shortcut_no_permissions">ნებართვების გარეშე დარეკვა შეუძლებელია.</string>
 </resources>
diff --git a/java/com/android/dialer/shortcuts/res/values-kk/strings.xml b/java/com/android/dialer/shortcuts/res/values-kk/strings.xml
index 1919830..ce5292e 100644
--- a/java/com/android/dialer/shortcuts/res/values-kk/strings.xml
+++ b/java/com/android/dialer/shortcuts/res/values-kk/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="dialer_shortcut_add_contact_short" msgid="7587385197258884650">"Жаңа контакт"</string>
-    <string name="dialer_shortcut_add_contact_long" msgid="7573187314386728329">"Жаңа контакт"</string>
-    <string name="dialer_shortcut_disabled_message" msgid="7713603194332953571">"Төте таңба жұмыс істемейді. Жою үшін сүйреңіз."</string>
-    <string name="dialer_shortcut_contact_not_found_or_has_no_number" msgid="3538594504123040498">"Контакт бұдан былай қолжетімді емес."</string>
-    <string name="dialer_shortcut_no_permissions" msgid="4422956724546867357">"Рұқсатсыз қоңырау шалу мүмкін емес."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <string name="dialer_shortcut_add_contact_short">Жаңа контакт</string>
+  <string name="dialer_shortcut_add_contact_long">Жаңа контакт</string>
+  <string name="dialer_shortcut_disabled_message">Төте таңба жұмыс істемейді. Жою үшін сүйреңіз.</string>
+  <string name="dialer_shortcut_contact_not_found_or_has_no_number">Контакт бұдан былай қолжетімді емес.</string>
+  <string name="dialer_shortcut_no_permissions">Рұқсатсыз қоңырау шалу мүмкін емес.</string>
 </resources>
diff --git a/java/com/android/dialer/shortcuts/res/values-km/strings.xml b/java/com/android/dialer/shortcuts/res/values-km/strings.xml
index 12fedb0..242bdba 100644
--- a/java/com/android/dialer/shortcuts/res/values-km/strings.xml
+++ b/java/com/android/dialer/shortcuts/res/values-km/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="dialer_shortcut_add_contact_short" msgid="7587385197258884650">"ទំនាក់ទំនង​ថ្មី"</string>
-    <string name="dialer_shortcut_add_contact_long" msgid="7573187314386728329">"ទំនាក់ទំនង​ថ្មី"</string>
-    <string name="dialer_shortcut_disabled_message" msgid="7713603194332953571">"ផ្លូវកាត់​មិន​ដំណើរការ។ ទាញ​ដើម្បី​ដក​ចេញ។"</string>
-    <string name="dialer_shortcut_contact_not_found_or_has_no_number" msgid="3538594504123040498">"ទំនាក់ទំនង​មិន​មាន​ទៀត​ទេ។"</string>
-    <string name="dialer_shortcut_no_permissions" msgid="4422956724546867357">"មិន​អាច​ហៅ​ទូរសព្ទ​បាន​ដោយ​គ្មាន​ការ​អនុញ្ញាត​ទេ។"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <string name="dialer_shortcut_add_contact_short">ទំនាក់ទំនង​ថ្មី</string>
+  <string name="dialer_shortcut_add_contact_long">ទំនាក់ទំនង​ថ្មី</string>
+  <string name="dialer_shortcut_disabled_message">ផ្លូវកាត់​មិន​ដំណើរការ។ ទាញ​ដើម្បី​ដក​ចេញ។</string>
+  <string name="dialer_shortcut_contact_not_found_or_has_no_number">ទំនាក់ទំនង​មិន​មាន​ទៀត​ទេ។</string>
+  <string name="dialer_shortcut_no_permissions">មិន​អាច​ហៅ​ទូរសព្ទ​បាន​ដោយ​គ្មាន​ការ​អនុញ្ញាត​ទេ។</string>
 </resources>
diff --git a/java/com/android/dialer/shortcuts/res/values-kn/strings.xml b/java/com/android/dialer/shortcuts/res/values-kn/strings.xml
index e82c048..3e675dc 100644
--- a/java/com/android/dialer/shortcuts/res/values-kn/strings.xml
+++ b/java/com/android/dialer/shortcuts/res/values-kn/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="dialer_shortcut_add_contact_short" msgid="7587385197258884650">"ಹೊಸ ಸಂಪರ್ಕ"</string>
-    <string name="dialer_shortcut_add_contact_long" msgid="7573187314386728329">"ಹೊಸ ಸಂಪರ್ಕ"</string>
-    <string name="dialer_shortcut_disabled_message" msgid="7713603194332953571">"ಶಾರ್ಟ್‌ಕಟ್ ಕಾರ್ಯನಿರ್ವಹಿಸುತ್ತಿಲ್ಲ. ತೆಗೆದುಹಾಕಲು ಡ್ರ್ಯಾಗ್ ಮಾಡಿ."</string>
-    <string name="dialer_shortcut_contact_not_found_or_has_no_number" msgid="3538594504123040498">"ಸಂಪರ್ಕ ಇನ್ನು ಮುಂದೆ ಲಭ್ಯವಿಲ್ಲ."</string>
-    <string name="dialer_shortcut_no_permissions" msgid="4422956724546867357">"ಅನುಮತಿಗಳಿಲ್ಲದೆ ಕರೆ ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <string name="dialer_shortcut_add_contact_short">ಹೊಸ ಸಂಪರ್ಕ</string>
+  <string name="dialer_shortcut_add_contact_long">ಹೊಸ ಸಂಪರ್ಕ</string>
+  <string name="dialer_shortcut_disabled_message">ಶಾರ್ಟ್‌ಕಟ್ ಕಾರ್ಯನಿರ್ವಹಿಸುತ್ತಿಲ್ಲ. ತೆಗೆದುಹಾಕಲು ಡ್ರ್ಯಾಗ್ ಮಾಡಿ.</string>
+  <string name="dialer_shortcut_contact_not_found_or_has_no_number">ಸಂಪರ್ಕ ಇನ್ನು ಮುಂದೆ ಲಭ್ಯವಿಲ್ಲ.</string>
+  <string name="dialer_shortcut_no_permissions">ಅನುಮತಿಗಳಿಲ್ಲದೆ ಕರೆ ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ.</string>
 </resources>
diff --git a/java/com/android/dialer/shortcuts/res/values-ko/strings.xml b/java/com/android/dialer/shortcuts/res/values-ko/strings.xml
index 669a0ba..b2f6abb 100644
--- a/java/com/android/dialer/shortcuts/res/values-ko/strings.xml
+++ b/java/com/android/dialer/shortcuts/res/values-ko/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="dialer_shortcut_add_contact_short" msgid="7587385197258884650">"새 연락처"</string>
-    <string name="dialer_shortcut_add_contact_long" msgid="7573187314386728329">"새 연락처"</string>
-    <string name="dialer_shortcut_disabled_message" msgid="7713603194332953571">"단축키가 작동하지 않습니다. 삭제하려면 드래그하세요."</string>
-    <string name="dialer_shortcut_contact_not_found_or_has_no_number" msgid="3538594504123040498">"더 이상 사용할 수 없는 연락처입니다."</string>
-    <string name="dialer_shortcut_no_permissions" msgid="4422956724546867357">"권한이 없으므로 전화를 걸 수 없습니다."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <string name="dialer_shortcut_add_contact_short">새 연락처</string>
+  <string name="dialer_shortcut_add_contact_long">새 연락처</string>
+  <string name="dialer_shortcut_disabled_message">단축키가 작동하지 않습니다. 삭제하려면 드래그하세요.</string>
+  <string name="dialer_shortcut_contact_not_found_or_has_no_number">더 이상 사용할 수 없는 연락처입니다.</string>
+  <string name="dialer_shortcut_no_permissions">권한이 없으므로 전화를 걸 수 없습니다.</string>
 </resources>
diff --git a/java/com/android/dialer/shortcuts/res/values-ky/strings.xml b/java/com/android/dialer/shortcuts/res/values-ky/strings.xml
index 6fabfa9..7eb81f8 100644
--- a/java/com/android/dialer/shortcuts/res/values-ky/strings.xml
+++ b/java/com/android/dialer/shortcuts/res/values-ky/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="dialer_shortcut_add_contact_short" msgid="7587385197258884650">"Жаңы байланыш"</string>
-    <string name="dialer_shortcut_add_contact_long" msgid="7573187314386728329">"Жаңы байлнш"</string>
-    <string name="dialer_shortcut_disabled_message" msgid="7713603194332953571">"Тез чакырма иштеген жок. Сүйрөп алып салыңыз."</string>
-    <string name="dialer_shortcut_contact_not_found_or_has_no_number" msgid="3538594504123040498">"Байланыш жеткиликтүү эмес."</string>
-    <string name="dialer_shortcut_no_permissions" msgid="4422956724546867357">"Уруксатысыз чала албайсыз."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <string name="dialer_shortcut_add_contact_short">Жаңы байланыш</string>
+  <string name="dialer_shortcut_add_contact_long">Жаңы байлнш</string>
+  <string name="dialer_shortcut_disabled_message">Тез чакырма иштеген жок. Сүйрөп алып салыңыз.</string>
+  <string name="dialer_shortcut_contact_not_found_or_has_no_number">Байланыш жеткиликтүү эмес.</string>
+  <string name="dialer_shortcut_no_permissions">Уруксатысыз чала албайсыз.</string>
 </resources>
diff --git a/java/com/android/dialer/shortcuts/res/values-lo/strings.xml b/java/com/android/dialer/shortcuts/res/values-lo/strings.xml
index 8fa3b20..7ebdb90 100644
--- a/java/com/android/dialer/shortcuts/res/values-lo/strings.xml
+++ b/java/com/android/dialer/shortcuts/res/values-lo/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="dialer_shortcut_add_contact_short" msgid="7587385197258884650">"ສ້າງລາຍຊື່ຜູ້ຕິດຕໍ່ໃໝ່"</string>
-    <string name="dialer_shortcut_add_contact_long" msgid="7573187314386728329">"ສ້າງລາຍຊື່ຜູ້ຕິດຕໍ່ໃໝ່"</string>
-    <string name="dialer_shortcut_disabled_message" msgid="7713603194332953571">"ທາງລັດບໍ່ເຮັດວຽກ. ໃຫ້ລາກເພື່ອລຶບອອກ."</string>
-    <string name="dialer_shortcut_contact_not_found_or_has_no_number" msgid="3538594504123040498">"ບໍ່ໍ່ມີລາຍຊື່ຜູ້ຕິດຕໍ່ນີ້ແລ້ວ."</string>
-    <string name="dialer_shortcut_no_permissions" msgid="4422956724546867357">"ບໍ່ສາມາດໂທໄດ້ໂດຍບໍ່ໄດ້ຮັບອະນຸຍາດ."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <string name="dialer_shortcut_add_contact_short">ສ້າງລາຍຊື່ຜູ້ຕິດຕໍ່ໃໝ່</string>
+  <string name="dialer_shortcut_add_contact_long">ສ້າງລາຍຊື່ຜູ້ຕິດຕໍ່ໃໝ່</string>
+  <string name="dialer_shortcut_disabled_message">ທາງລັດບໍ່ເຮັດວຽກ. ໃຫ້ລາກເພື່ອລຶບອອກ.</string>
+  <string name="dialer_shortcut_contact_not_found_or_has_no_number">ບໍ່ໍ່ມີລາຍຊື່ຜູ້ຕິດຕໍ່ນີ້ແລ້ວ.</string>
+  <string name="dialer_shortcut_no_permissions">ບໍ່ສາມາດໂທໄດ້ໂດຍບໍ່ໄດ້ຮັບອະນຸຍາດ.</string>
 </resources>
diff --git a/java/com/android/dialer/shortcuts/res/values-lt/strings.xml b/java/com/android/dialer/shortcuts/res/values-lt/strings.xml
index bbe76c7..a34b30a 100644
--- a/java/com/android/dialer/shortcuts/res/values-lt/strings.xml
+++ b/java/com/android/dialer/shortcuts/res/values-lt/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="dialer_shortcut_add_contact_short" msgid="7587385197258884650">"N. kont."</string>
-    <string name="dialer_shortcut_add_contact_long" msgid="7573187314386728329">"Naujas kontaktas"</string>
-    <string name="dialer_shortcut_disabled_message" msgid="7713603194332953571">"Spartusis klavišas neveikia. Nuvilkite, kad pašalintumėte."</string>
-    <string name="dialer_shortcut_contact_not_found_or_has_no_number" msgid="3538594504123040498">"Kontaktas nebepasiekiamas."</string>
-    <string name="dialer_shortcut_no_permissions" msgid="4422956724546867357">"Negalima skambinti be leidimų."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <string name="dialer_shortcut_add_contact_short">N. kont.</string>
+  <string name="dialer_shortcut_add_contact_long">Naujas kontaktas</string>
+  <string name="dialer_shortcut_disabled_message">Spartusis klavišas neveikia. Nuvilkite, kad pašalintumėte.</string>
+  <string name="dialer_shortcut_contact_not_found_or_has_no_number">Kontaktas nebepasiekiamas.</string>
+  <string name="dialer_shortcut_no_permissions">Negalima skambinti be leidimų.</string>
 </resources>
diff --git a/java/com/android/dialer/shortcuts/res/values-lv/strings.xml b/java/com/android/dialer/shortcuts/res/values-lv/strings.xml
index a79f769..2a140fa 100644
--- a/java/com/android/dialer/shortcuts/res/values-lv/strings.xml
+++ b/java/com/android/dialer/shortcuts/res/values-lv/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="dialer_shortcut_add_contact_short" msgid="7587385197258884650">"Jauna kont."</string>
-    <string name="dialer_shortcut_add_contact_long" msgid="7573187314386728329">"Jauna kontaktpersona"</string>
-    <string name="dialer_shortcut_disabled_message" msgid="7713603194332953571">"Saīsne nedarbojas. Velciet, lai to noņemtu."</string>
-    <string name="dialer_shortcut_contact_not_found_or_has_no_number" msgid="3538594504123040498">"Kontaktpersona vairs nav pieejama."</string>
-    <string name="dialer_shortcut_no_permissions" msgid="4422956724546867357">"Nevar zvanīt bez atļaujām."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <string name="dialer_shortcut_add_contact_short">Jauna kont.</string>
+  <string name="dialer_shortcut_add_contact_long">Jauna kontaktpersona</string>
+  <string name="dialer_shortcut_disabled_message">Saīsne nedarbojas. Velciet, lai to noņemtu.</string>
+  <string name="dialer_shortcut_contact_not_found_or_has_no_number">Kontaktpersona vairs nav pieejama.</string>
+  <string name="dialer_shortcut_no_permissions">Nevar zvanīt bez atļaujām.</string>
 </resources>
diff --git a/java/com/android/dialer/shortcuts/res/values-mk/strings.xml b/java/com/android/dialer/shortcuts/res/values-mk/strings.xml
index 4670e37..72bccdb 100644
--- a/java/com/android/dialer/shortcuts/res/values-mk/strings.xml
+++ b/java/com/android/dialer/shortcuts/res/values-mk/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="dialer_shortcut_add_contact_short" msgid="7587385197258884650">"Нов контакт"</string>
-    <string name="dialer_shortcut_add_contact_long" msgid="7573187314386728329">"Нов контакт"</string>
-    <string name="dialer_shortcut_disabled_message" msgid="7713603194332953571">"Кратенката не работи. Повлечете за отстранување."</string>
-    <string name="dialer_shortcut_contact_not_found_or_has_no_number" msgid="3538594504123040498">"Контактот веќе не е достапен."</string>
-    <string name="dialer_shortcut_no_permissions" msgid="4422956724546867357">"Не може да се повикува без дозволи."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <string name="dialer_shortcut_add_contact_short">Нов контакт</string>
+  <string name="dialer_shortcut_add_contact_long">Нов контакт</string>
+  <string name="dialer_shortcut_disabled_message">Кратенката не работи. Повлечете за отстранување.</string>
+  <string name="dialer_shortcut_contact_not_found_or_has_no_number">Контактот веќе не е достапен.</string>
+  <string name="dialer_shortcut_no_permissions">Не може да се повикува без дозволи.</string>
 </resources>
diff --git a/java/com/android/dialer/shortcuts/res/values-ml/strings.xml b/java/com/android/dialer/shortcuts/res/values-ml/strings.xml
index 66c4564..b74abdf 100644
--- a/java/com/android/dialer/shortcuts/res/values-ml/strings.xml
+++ b/java/com/android/dialer/shortcuts/res/values-ml/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="dialer_shortcut_add_contact_short" msgid="7587385197258884650">"പുതിയ കോണ്‍ടാക്റ്റ്"</string>
-    <string name="dialer_shortcut_add_contact_long" msgid="7573187314386728329">"പുതിയ കോണ്‍ടാക്റ്റ്"</string>
-    <string name="dialer_shortcut_disabled_message" msgid="7713603194332953571">"കുറുക്കുവഴി പ്രവർത്തിക്കുന്നില്ല. നീക്കംചെയ്യാൻ, വലിച്ചിടുക."</string>
-    <string name="dialer_shortcut_contact_not_found_or_has_no_number" msgid="3538594504123040498">"കോൺടാക്‌റ്റ് ഇനി ലഭ്യമാകില്ല."</string>
-    <string name="dialer_shortcut_no_permissions" msgid="4422956724546867357">"അനുമതികളില്ലാത്തതിനാൽ കോൾ ചെയ്യാനായില്ല."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <string name="dialer_shortcut_add_contact_short">പുതിയ കോണ്‍ടാക്റ്റ്</string>
+  <string name="dialer_shortcut_add_contact_long">പുതിയ കോണ്‍ടാക്റ്റ്</string>
+  <string name="dialer_shortcut_disabled_message">കുറുക്കുവഴി പ്രവർത്തിക്കുന്നില്ല. നീക്കംചെയ്യാൻ, വലിച്ചിടുക.</string>
+  <string name="dialer_shortcut_contact_not_found_or_has_no_number">കോൺടാക്‌റ്റ് ഇനി ലഭ്യമാകില്ല.</string>
+  <string name="dialer_shortcut_no_permissions">അനുമതികളില്ലാത്തതിനാൽ കോൾ ചെയ്യാനായില്ല.</string>
 </resources>
diff --git a/java/com/android/dialer/shortcuts/res/values-mn/strings.xml b/java/com/android/dialer/shortcuts/res/values-mn/strings.xml
index 850ab0e..d0a3b0c 100644
--- a/java/com/android/dialer/shortcuts/res/values-mn/strings.xml
+++ b/java/com/android/dialer/shortcuts/res/values-mn/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="dialer_shortcut_add_contact_short" msgid="7587385197258884650">"Шинэ харилцагч"</string>
-    <string name="dialer_shortcut_add_contact_long" msgid="7573187314386728329">"Шинэ харилцагч"</string>
-    <string name="dialer_shortcut_disabled_message" msgid="7713603194332953571">"Товчилбор ажиллахгүй байна. Устгахын тулд чирнэ үү."</string>
-    <string name="dialer_shortcut_contact_not_found_or_has_no_number" msgid="3538594504123040498">"Харилцагч байхаа больсон."</string>
-    <string name="dialer_shortcut_no_permissions" msgid="4422956724546867357">"Зөвшөөрөлгүйгээр дуудлага хийх боломжгүй."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <string name="dialer_shortcut_add_contact_short">Шинэ харилцагч</string>
+  <string name="dialer_shortcut_add_contact_long">Шинэ харилцагч</string>
+  <string name="dialer_shortcut_disabled_message">Товчилбор ажиллахгүй байна. Устгахын тулд чирнэ үү.</string>
+  <string name="dialer_shortcut_contact_not_found_or_has_no_number">Харилцагч байхаа больсон.</string>
+  <string name="dialer_shortcut_no_permissions">Зөвшөөрөлгүйгээр дуудлага хийх боломжгүй.</string>
 </resources>
diff --git a/java/com/android/dialer/shortcuts/res/values-mr/strings.xml b/java/com/android/dialer/shortcuts/res/values-mr/strings.xml
index 6f6cfd4..937e62f 100644
--- a/java/com/android/dialer/shortcuts/res/values-mr/strings.xml
+++ b/java/com/android/dialer/shortcuts/res/values-mr/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="dialer_shortcut_add_contact_short" msgid="7587385197258884650">"नवीन संपर्क"</string>
-    <string name="dialer_shortcut_add_contact_long" msgid="7573187314386728329">"नवीन संपर्क"</string>
-    <string name="dialer_shortcut_disabled_message" msgid="7713603194332953571">"शॉर्टकट कार्य करीत नाही. काढण्यासाठी ड्रॅग करा."</string>
-    <string name="dialer_shortcut_contact_not_found_or_has_no_number" msgid="3538594504123040498">"संपर्क यापुढे उपलब्ध नाही."</string>
-    <string name="dialer_shortcut_no_permissions" msgid="4422956724546867357">"परवानग्यांशिवाय कॉल करू शकत नाही."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <string name="dialer_shortcut_add_contact_short">नवीन संपर्क</string>
+  <string name="dialer_shortcut_add_contact_long">नवीन संपर्क</string>
+  <string name="dialer_shortcut_disabled_message">शॉर्टकट कार्य करीत नाही. काढण्यासाठी ड्रॅग करा.</string>
+  <string name="dialer_shortcut_contact_not_found_or_has_no_number">संपर्क यापुढे उपलब्ध नाही.</string>
+  <string name="dialer_shortcut_no_permissions">परवानग्यांशिवाय कॉल करू शकत नाही.</string>
 </resources>
diff --git a/java/com/android/dialer/shortcuts/res/values-ms/strings.xml b/java/com/android/dialer/shortcuts/res/values-ms/strings.xml
index 4410c75..12518b0 100644
--- a/java/com/android/dialer/shortcuts/res/values-ms/strings.xml
+++ b/java/com/android/dialer/shortcuts/res/values-ms/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="dialer_shortcut_add_contact_short" msgid="7587385197258884650">"Knalan baru"</string>
-    <string name="dialer_shortcut_add_contact_long" msgid="7573187314386728329">"Kenalan baharu"</string>
-    <string name="dialer_shortcut_disabled_message" msgid="7713603194332953571">"Pintasan tidak berfungsi. Seret untuk mengalih keluar."</string>
-    <string name="dialer_shortcut_contact_not_found_or_has_no_number" msgid="3538594504123040498">"Kenalan tidak tersedia lagi."</string>
-    <string name="dialer_shortcut_no_permissions" msgid="4422956724546867357">"Tidak boleh memanggil tanpa kebenaran."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <string name="dialer_shortcut_add_contact_short">Knalan baru</string>
+  <string name="dialer_shortcut_add_contact_long">Kenalan baharu</string>
+  <string name="dialer_shortcut_disabled_message">Pintasan tidak berfungsi. Seret untuk mengalih keluar.</string>
+  <string name="dialer_shortcut_contact_not_found_or_has_no_number">Kenalan tidak tersedia lagi.</string>
+  <string name="dialer_shortcut_no_permissions">Tidak boleh memanggil tanpa kebenaran.</string>
 </resources>
diff --git a/java/com/android/dialer/shortcuts/res/values-my/strings.xml b/java/com/android/dialer/shortcuts/res/values-my/strings.xml
index 17dfb8c..9393538 100644
--- a/java/com/android/dialer/shortcuts/res/values-my/strings.xml
+++ b/java/com/android/dialer/shortcuts/res/values-my/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="dialer_shortcut_add_contact_short" msgid="7587385197258884650">"နံပါတ်သစ်"</string>
-    <string name="dialer_shortcut_add_contact_long" msgid="7573187314386728329">"အဆက်အသွယ်အသစ်"</string>
-    <string name="dialer_shortcut_disabled_message" msgid="7713603194332953571">"ဖြတ်လမ်း အလုပ်မလုပ်ပါ။ ဖယ်ရှားရန် ဖိဆွဲပါ။"</string>
-    <string name="dialer_shortcut_contact_not_found_or_has_no_number" msgid="3538594504123040498">"အဆက်အသွယ် မရှိတော့ပါ။"</string>
-    <string name="dialer_shortcut_no_permissions" msgid="4422956724546867357">"ခွင့်ပြုချက် မရှိဘဲ ခေါ်ဆို၍ မရပါ။"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <string name="dialer_shortcut_add_contact_short">နံပါတ်သစ်</string>
+  <string name="dialer_shortcut_add_contact_long">အဆက်အသွယ်အသစ်</string>
+  <string name="dialer_shortcut_disabled_message">ဖြတ်လမ်း အလုပ်မလုပ်ပါ။ ဖယ်ရှားရန် ဖိဆွဲပါ။</string>
+  <string name="dialer_shortcut_contact_not_found_or_has_no_number">အဆက်အသွယ် မရှိတော့ပါ။</string>
+  <string name="dialer_shortcut_no_permissions">ခွင့်ပြုချက် မရှိဘဲ ခေါ်ဆို၍ မရပါ။</string>
 </resources>
diff --git a/java/com/android/dialer/shortcuts/res/values-nb/strings.xml b/java/com/android/dialer/shortcuts/res/values-nb/strings.xml
index bf88537..bce1cca 100644
--- a/java/com/android/dialer/shortcuts/res/values-nb/strings.xml
+++ b/java/com/android/dialer/shortcuts/res/values-nb/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="dialer_shortcut_add_contact_short" msgid="7587385197258884650">"Ny kontakt"</string>
-    <string name="dialer_shortcut_add_contact_long" msgid="7573187314386728329">"Ny kontakt"</string>
-    <string name="dialer_shortcut_disabled_message" msgid="7713603194332953571">"Snarveien virker ikke. Dra for å fjerne den."</string>
-    <string name="dialer_shortcut_contact_not_found_or_has_no_number" msgid="3538594504123040498">"Kontakten er ikke lenger tilgjengelig."</string>
-    <string name="dialer_shortcut_no_permissions" msgid="4422956724546867357">"Kan ikke ringe uten tillatelser."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <string name="dialer_shortcut_add_contact_short">Ny kontakt</string>
+  <string name="dialer_shortcut_add_contact_long">Ny kontakt</string>
+  <string name="dialer_shortcut_disabled_message">Snarveien virker ikke. Dra for å fjerne den.</string>
+  <string name="dialer_shortcut_contact_not_found_or_has_no_number">Kontakten er ikke lenger tilgjengelig.</string>
+  <string name="dialer_shortcut_no_permissions">Kan ikke ringe uten tillatelser.</string>
 </resources>
diff --git a/java/com/android/dialer/shortcuts/res/values-ne/strings.xml b/java/com/android/dialer/shortcuts/res/values-ne/strings.xml
index 01869d1..38e54ca 100644
--- a/java/com/android/dialer/shortcuts/res/values-ne/strings.xml
+++ b/java/com/android/dialer/shortcuts/res/values-ne/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="dialer_shortcut_add_contact_short" msgid="7587385197258884650">"नयाँ सम्पर्क"</string>
-    <string name="dialer_shortcut_add_contact_long" msgid="7573187314386728329">"नयाँ सम्पर्क"</string>
-    <string name="dialer_shortcut_disabled_message" msgid="7713603194332953571">"सर्टकटले काम गरिरहेको छैन। हटाउन ड्र्याग गर्नुहोस्।"</string>
-    <string name="dialer_shortcut_contact_not_found_or_has_no_number" msgid="3538594504123040498">"सम्पर्क अब उप्रान्त उपलब्ध छैन।"</string>
-    <string name="dialer_shortcut_no_permissions" msgid="4422956724546867357">"अनुमति विना कल गर्न सकिँदैन।"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <string name="dialer_shortcut_add_contact_short">नयाँ सम्पर्क</string>
+  <string name="dialer_shortcut_add_contact_long">नयाँ सम्पर्क</string>
+  <string name="dialer_shortcut_disabled_message">सर्टकटले काम गरिरहेको छैन। हटाउन ड्र्याग गर्नुहोस्।</string>
+  <string name="dialer_shortcut_contact_not_found_or_has_no_number">सम्पर्क अब उप्रान्त उपलब्ध छैन।</string>
+  <string name="dialer_shortcut_no_permissions">अनुमति विना कल गर्न सकिँदैन।</string>
 </resources>
diff --git a/java/com/android/dialer/shortcuts/res/values-nl/strings.xml b/java/com/android/dialer/shortcuts/res/values-nl/strings.xml
index 0ec4022..d21eb09 100644
--- a/java/com/android/dialer/shortcuts/res/values-nl/strings.xml
+++ b/java/com/android/dialer/shortcuts/res/values-nl/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="dialer_shortcut_add_contact_short" msgid="7587385197258884650">"Nw contact"</string>
-    <string name="dialer_shortcut_add_contact_long" msgid="7573187314386728329">"Nieuw contact"</string>
-    <string name="dialer_shortcut_disabled_message" msgid="7713603194332953571">"Snelkoppeling werkt niet. Sleep om te verwijderen."</string>
-    <string name="dialer_shortcut_contact_not_found_or_has_no_number" msgid="3538594504123040498">"Contact niet meer beschikbaar."</string>
-    <string name="dialer_shortcut_no_permissions" msgid="4422956724546867357">"Kan niet bellen zonder rechten."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <string name="dialer_shortcut_add_contact_short">Nw contact</string>
+  <string name="dialer_shortcut_add_contact_long">Nieuw contact</string>
+  <string name="dialer_shortcut_disabled_message">Snelkoppeling werkt niet. Sleep om te verwijderen.</string>
+  <string name="dialer_shortcut_contact_not_found_or_has_no_number">Contact niet meer beschikbaar.</string>
+  <string name="dialer_shortcut_no_permissions">Kan niet bellen zonder rechten.</string>
 </resources>
diff --git a/java/com/android/dialer/shortcuts/res/values-no/strings.xml b/java/com/android/dialer/shortcuts/res/values-no/strings.xml
index bf88537..bce1cca 100644
--- a/java/com/android/dialer/shortcuts/res/values-no/strings.xml
+++ b/java/com/android/dialer/shortcuts/res/values-no/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="dialer_shortcut_add_contact_short" msgid="7587385197258884650">"Ny kontakt"</string>
-    <string name="dialer_shortcut_add_contact_long" msgid="7573187314386728329">"Ny kontakt"</string>
-    <string name="dialer_shortcut_disabled_message" msgid="7713603194332953571">"Snarveien virker ikke. Dra for å fjerne den."</string>
-    <string name="dialer_shortcut_contact_not_found_or_has_no_number" msgid="3538594504123040498">"Kontakten er ikke lenger tilgjengelig."</string>
-    <string name="dialer_shortcut_no_permissions" msgid="4422956724546867357">"Kan ikke ringe uten tillatelser."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <string name="dialer_shortcut_add_contact_short">Ny kontakt</string>
+  <string name="dialer_shortcut_add_contact_long">Ny kontakt</string>
+  <string name="dialer_shortcut_disabled_message">Snarveien virker ikke. Dra for å fjerne den.</string>
+  <string name="dialer_shortcut_contact_not_found_or_has_no_number">Kontakten er ikke lenger tilgjengelig.</string>
+  <string name="dialer_shortcut_no_permissions">Kan ikke ringe uten tillatelser.</string>
 </resources>
diff --git a/java/com/android/dialer/shortcuts/res/values-pa/strings.xml b/java/com/android/dialer/shortcuts/res/values-pa/strings.xml
index 0e9dd43..d7ca884 100644
--- a/java/com/android/dialer/shortcuts/res/values-pa/strings.xml
+++ b/java/com/android/dialer/shortcuts/res/values-pa/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="dialer_shortcut_add_contact_short" msgid="7587385197258884650">"ਨਵਾਂ ਸੰਪਰਕ"</string>
-    <string name="dialer_shortcut_add_contact_long" msgid="7573187314386728329">"ਨਵਾਂ ਸੰਪਰਕ"</string>
-    <string name="dialer_shortcut_disabled_message" msgid="7713603194332953571">"ਸ਼ਾਰਟਕੱਟ ਕੰਮ ਨਹੀਂ ਕਰ ਰਿਹਾ ਹੈ। ਹਟਾਉਣ ਲਈ ਘਸੀਟੋ।"</string>
-    <string name="dialer_shortcut_contact_not_found_or_has_no_number" msgid="3538594504123040498">"ਸੰਪਰਕ ਹੁਣ ਉਪਲਬਧ ਨਹੀਂ।"</string>
-    <string name="dialer_shortcut_no_permissions" msgid="4422956724546867357">"ਇਜਾਜ਼ਤਾਂ ਦੇ ਬਿਨਾਂ ਕਾਲ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕਦੀ।"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <string name="dialer_shortcut_add_contact_short">ਨਵਾਂ ਸੰਪਰਕ</string>
+  <string name="dialer_shortcut_add_contact_long">ਨਵਾਂ ਸੰਪਰਕ</string>
+  <string name="dialer_shortcut_disabled_message">ਸ਼ਾਰਟਕੱਟ ਕੰਮ ਨਹੀਂ ਕਰ ਰਿਹਾ ਹੈ। ਹਟਾਉਣ ਲਈ ਘਸੀਟੋ।</string>
+  <string name="dialer_shortcut_contact_not_found_or_has_no_number">ਸੰਪਰਕ ਹੁਣ ਉਪਲਬਧ ਨਹੀਂ।</string>
+  <string name="dialer_shortcut_no_permissions">ਇਜਾਜ਼ਤਾਂ ਦੇ ਬਿਨਾਂ ਕਾਲ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕਦੀ।</string>
 </resources>
diff --git a/java/com/android/dialer/shortcuts/res/values-pl/strings.xml b/java/com/android/dialer/shortcuts/res/values-pl/strings.xml
index 8b64202..56fedc5 100644
--- a/java/com/android/dialer/shortcuts/res/values-pl/strings.xml
+++ b/java/com/android/dialer/shortcuts/res/values-pl/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="dialer_shortcut_add_contact_short" msgid="7587385197258884650">"Nowy kontakt"</string>
-    <string name="dialer_shortcut_add_contact_long" msgid="7573187314386728329">"Nowy kontakt"</string>
-    <string name="dialer_shortcut_disabled_message" msgid="7713603194332953571">"Skrót nie działa. Przeciągnij, aby usunąć."</string>
-    <string name="dialer_shortcut_contact_not_found_or_has_no_number" msgid="3538594504123040498">"Kontakt niedostępny."</string>
-    <string name="dialer_shortcut_no_permissions" msgid="4422956724546867357">"Nie możesz zadzwonić, jeśli nie masz odpowiednich uprawnień."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <string name="dialer_shortcut_add_contact_short">Nowy kontakt</string>
+  <string name="dialer_shortcut_add_contact_long">Nowy kontakt</string>
+  <string name="dialer_shortcut_disabled_message">Skrót nie działa. Przeciągnij, aby usunąć.</string>
+  <string name="dialer_shortcut_contact_not_found_or_has_no_number">Kontakt niedostępny.</string>
+  <string name="dialer_shortcut_no_permissions">Nie możesz zadzwonić, jeśli nie masz odpowiednich uprawnień.</string>
 </resources>
diff --git a/java/com/android/dialer/shortcuts/res/values-pt-rBR/strings.xml b/java/com/android/dialer/shortcuts/res/values-pt-rBR/strings.xml
index da252be..8f6ffcd 100644
--- a/java/com/android/dialer/shortcuts/res/values-pt-rBR/strings.xml
+++ b/java/com/android/dialer/shortcuts/res/values-pt-rBR/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="dialer_shortcut_add_contact_short" msgid="7587385197258884650">"Novo cont."</string>
-    <string name="dialer_shortcut_add_contact_long" msgid="7573187314386728329">"Novo contato"</string>
-    <string name="dialer_shortcut_disabled_message" msgid="7713603194332953571">"O atalho não está funcionando. Arraste-o para removê-lo."</string>
-    <string name="dialer_shortcut_contact_not_found_or_has_no_number" msgid="3538594504123040498">"O contato não está mais disponível."</string>
-    <string name="dialer_shortcut_no_permissions" msgid="4422956724546867357">"Não é possível ligar sem as permissões."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <string name="dialer_shortcut_add_contact_short">Novo cont.</string>
+  <string name="dialer_shortcut_add_contact_long">Novo contato</string>
+  <string name="dialer_shortcut_disabled_message">O atalho não está funcionando. Arraste-o para removê-lo.</string>
+  <string name="dialer_shortcut_contact_not_found_or_has_no_number">O contato não está mais disponível.</string>
+  <string name="dialer_shortcut_no_permissions">Não é possível ligar sem as permissões.</string>
 </resources>
diff --git a/java/com/android/dialer/shortcuts/res/values-pt-rPT/strings.xml b/java/com/android/dialer/shortcuts/res/values-pt-rPT/strings.xml
index 055f9ce..e778284 100644
--- a/java/com/android/dialer/shortcuts/res/values-pt-rPT/strings.xml
+++ b/java/com/android/dialer/shortcuts/res/values-pt-rPT/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="dialer_shortcut_add_contact_short" msgid="7587385197258884650">"Nv. contac."</string>
-    <string name="dialer_shortcut_add_contact_long" msgid="7573187314386728329">"Novo contacto"</string>
-    <string name="dialer_shortcut_disabled_message" msgid="7713603194332953571">"O atalho não funciona. Arraste para remover."</string>
-    <string name="dialer_shortcut_contact_not_found_or_has_no_number" msgid="3538594504123040498">"O contacto já não se encontra disponível."</string>
-    <string name="dialer_shortcut_no_permissions" msgid="4422956724546867357">"Não é possível ligar sem autorizações."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <string name="dialer_shortcut_add_contact_short">Nv. contac.</string>
+  <string name="dialer_shortcut_add_contact_long">Novo contacto</string>
+  <string name="dialer_shortcut_disabled_message">O atalho não funciona. Arraste para remover.</string>
+  <string name="dialer_shortcut_contact_not_found_or_has_no_number">O contacto já não se encontra disponível.</string>
+  <string name="dialer_shortcut_no_permissions">Não é possível ligar sem autorizações.</string>
 </resources>
diff --git a/java/com/android/dialer/shortcuts/res/values-pt/strings.xml b/java/com/android/dialer/shortcuts/res/values-pt/strings.xml
index da252be..8f6ffcd 100644
--- a/java/com/android/dialer/shortcuts/res/values-pt/strings.xml
+++ b/java/com/android/dialer/shortcuts/res/values-pt/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="dialer_shortcut_add_contact_short" msgid="7587385197258884650">"Novo cont."</string>
-    <string name="dialer_shortcut_add_contact_long" msgid="7573187314386728329">"Novo contato"</string>
-    <string name="dialer_shortcut_disabled_message" msgid="7713603194332953571">"O atalho não está funcionando. Arraste-o para removê-lo."</string>
-    <string name="dialer_shortcut_contact_not_found_or_has_no_number" msgid="3538594504123040498">"O contato não está mais disponível."</string>
-    <string name="dialer_shortcut_no_permissions" msgid="4422956724546867357">"Não é possível ligar sem as permissões."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <string name="dialer_shortcut_add_contact_short">Novo cont.</string>
+  <string name="dialer_shortcut_add_contact_long">Novo contato</string>
+  <string name="dialer_shortcut_disabled_message">O atalho não está funcionando. Arraste-o para removê-lo.</string>
+  <string name="dialer_shortcut_contact_not_found_or_has_no_number">O contato não está mais disponível.</string>
+  <string name="dialer_shortcut_no_permissions">Não é possível ligar sem as permissões.</string>
 </resources>
diff --git a/java/com/android/dialer/shortcuts/res/values-ro/strings.xml b/java/com/android/dialer/shortcuts/res/values-ro/strings.xml
index d1a2903..920a6ab 100644
--- a/java/com/android/dialer/shortcuts/res/values-ro/strings.xml
+++ b/java/com/android/dialer/shortcuts/res/values-ro/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="dialer_shortcut_add_contact_short" msgid="7587385197258884650">"Pers. nouă"</string>
-    <string name="dialer_shortcut_add_contact_long" msgid="7573187314386728329">"Persoană nouă"</string>
-    <string name="dialer_shortcut_disabled_message" msgid="7713603194332953571">"Comanda rapidă nu funcționează. Trageți pentru a elimina."</string>
-    <string name="dialer_shortcut_contact_not_found_or_has_no_number" msgid="3538594504123040498">"Persoana de contact nu mai este disponibilă."</string>
-    <string name="dialer_shortcut_no_permissions" msgid="4422956724546867357">"Nu se poate apela fără acordarea permisiunilor."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <string name="dialer_shortcut_add_contact_short">Pers. nouă</string>
+  <string name="dialer_shortcut_add_contact_long">Persoană nouă</string>
+  <string name="dialer_shortcut_disabled_message">Comanda rapidă nu funcționează. Trageți pentru a elimina.</string>
+  <string name="dialer_shortcut_contact_not_found_or_has_no_number">Persoana de contact nu mai este disponibilă.</string>
+  <string name="dialer_shortcut_no_permissions">Nu se poate apela fără acordarea permisiunilor.</string>
 </resources>
diff --git a/java/com/android/dialer/shortcuts/res/values-ru/strings.xml b/java/com/android/dialer/shortcuts/res/values-ru/strings.xml
index 475b374..03771a2 100644
--- a/java/com/android/dialer/shortcuts/res/values-ru/strings.xml
+++ b/java/com/android/dialer/shortcuts/res/values-ru/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="dialer_shortcut_add_contact_short" msgid="7587385197258884650">"Доб. контакт"</string>
-    <string name="dialer_shortcut_add_contact_long" msgid="7573187314386728329">"Создать контакт"</string>
-    <string name="dialer_shortcut_disabled_message" msgid="7713603194332953571">"Ярлык не работает. Перетащите его, чтобы удалить."</string>
-    <string name="dialer_shortcut_contact_not_found_or_has_no_number" msgid="3538594504123040498">"Контакт недоступен."</string>
-    <string name="dialer_shortcut_no_permissions" msgid="4422956724546867357">"Вызов невозможен: отсутствуют разрешения."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <string name="dialer_shortcut_add_contact_short">Доб. контакт</string>
+  <string name="dialer_shortcut_add_contact_long">Создать контакт</string>
+  <string name="dialer_shortcut_disabled_message">Ярлык не работает. Перетащите его, чтобы удалить.</string>
+  <string name="dialer_shortcut_contact_not_found_or_has_no_number">Контакт недоступен.</string>
+  <string name="dialer_shortcut_no_permissions">Вызов невозможен: отсутствуют разрешения.</string>
 </resources>
diff --git a/java/com/android/dialer/shortcuts/res/values-si/strings.xml b/java/com/android/dialer/shortcuts/res/values-si/strings.xml
index 2600481..abd79d4 100644
--- a/java/com/android/dialer/shortcuts/res/values-si/strings.xml
+++ b/java/com/android/dialer/shortcuts/res/values-si/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="dialer_shortcut_add_contact_short" msgid="7587385197258884650">"සම්බන්ධතාව"</string>
-    <string name="dialer_shortcut_add_contact_long" msgid="7573187314386728329">"නව සම්බන්ධතාව"</string>
-    <string name="dialer_shortcut_disabled_message" msgid="7713603194332953571">"කෙටිමග ක්‍රියා නොකරයි. ඉවත් කිරීමට අදින්න."</string>
-    <string name="dialer_shortcut_contact_not_found_or_has_no_number" msgid="3538594504123040498">"සම්බන්ධතාව තවදුරටත් නොපවතී."</string>
-    <string name="dialer_shortcut_no_permissions" msgid="4422956724546867357">"අවසර නොමැතිව ඇමතිය නොහැකිය."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <string name="dialer_shortcut_add_contact_short">සම්බන්ධතාව</string>
+  <string name="dialer_shortcut_add_contact_long">නව සම්බන්ධතාව</string>
+  <string name="dialer_shortcut_disabled_message">කෙටිමග ක්‍රියා නොකරයි. ඉවත් කිරීමට අදින්න.</string>
+  <string name="dialer_shortcut_contact_not_found_or_has_no_number">සම්බන්ධතාව තවදුරටත් නොපවතී.</string>
+  <string name="dialer_shortcut_no_permissions">අවසර නොමැතිව ඇමතිය නොහැකිය.</string>
 </resources>
diff --git a/java/com/android/dialer/shortcuts/res/values-sk/strings.xml b/java/com/android/dialer/shortcuts/res/values-sk/strings.xml
index 2a307a4..4406c56 100644
--- a/java/com/android/dialer/shortcuts/res/values-sk/strings.xml
+++ b/java/com/android/dialer/shortcuts/res/values-sk/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="dialer_shortcut_add_contact_short" msgid="7587385197258884650">"Kontakt"</string>
-    <string name="dialer_shortcut_add_contact_long" msgid="7573187314386728329">"Nový kontakt"</string>
-    <string name="dialer_shortcut_disabled_message" msgid="7713603194332953571">"Odkaz nefunguje. Presunutím ho odstránite."</string>
-    <string name="dialer_shortcut_contact_not_found_or_has_no_number" msgid="3538594504123040498">"Kontakt už nie je k dispozícii."</string>
-    <string name="dialer_shortcut_no_permissions" msgid="4422956724546867357">"Bez povolení sa nedá volať."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <string name="dialer_shortcut_add_contact_short">Kontakt</string>
+  <string name="dialer_shortcut_add_contact_long">Nový kontakt</string>
+  <string name="dialer_shortcut_disabled_message">Odkaz nefunguje. Presunutím ho odstránite.</string>
+  <string name="dialer_shortcut_contact_not_found_or_has_no_number">Kontakt už nie je k dispozícii.</string>
+  <string name="dialer_shortcut_no_permissions">Bez povolení sa nedá volať.</string>
 </resources>
diff --git a/java/com/android/dialer/shortcuts/res/values-sl/strings.xml b/java/com/android/dialer/shortcuts/res/values-sl/strings.xml
index 54d9715..2f2201a 100644
--- a/java/com/android/dialer/shortcuts/res/values-sl/strings.xml
+++ b/java/com/android/dialer/shortcuts/res/values-sl/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="dialer_shortcut_add_contact_short" msgid="7587385197258884650">"Nov stik"</string>
-    <string name="dialer_shortcut_add_contact_long" msgid="7573187314386728329">"Nov stik"</string>
-    <string name="dialer_shortcut_disabled_message" msgid="7713603194332953571">"Bližnjica ne deluje. Povlecite za odstranitev."</string>
-    <string name="dialer_shortcut_contact_not_found_or_has_no_number" msgid="3538594504123040498">"Stik ni več na voljo."</string>
-    <string name="dialer_shortcut_no_permissions" msgid="4422956724546867357">"Klicanje ni mogoče brez dovoljenj."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <string name="dialer_shortcut_add_contact_short">Nov stik</string>
+  <string name="dialer_shortcut_add_contact_long">Nov stik</string>
+  <string name="dialer_shortcut_disabled_message">Bližnjica ne deluje. Povlecite za odstranitev.</string>
+  <string name="dialer_shortcut_contact_not_found_or_has_no_number">Stik ni več na voljo.</string>
+  <string name="dialer_shortcut_no_permissions">Klicanje ni mogoče brez dovoljenj.</string>
 </resources>
diff --git a/java/com/android/dialer/shortcuts/res/values-sq/strings.xml b/java/com/android/dialer/shortcuts/res/values-sq/strings.xml
index b8599e9..1304b89 100644
--- a/java/com/android/dialer/shortcuts/res/values-sq/strings.xml
+++ b/java/com/android/dialer/shortcuts/res/values-sq/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="dialer_shortcut_add_contact_short" msgid="7587385197258884650">"Kontakt i ri"</string>
-    <string name="dialer_shortcut_add_contact_long" msgid="7573187314386728329">"Kontakt i ri"</string>
-    <string name="dialer_shortcut_disabled_message" msgid="7713603194332953571">"Shkurtorja nuk funksionon. Zvarrite për ta hequr."</string>
-    <string name="dialer_shortcut_contact_not_found_or_has_no_number" msgid="3538594504123040498">"Kontakti nuk disponohet më."</string>
-    <string name="dialer_shortcut_no_permissions" msgid="4422956724546867357">"Nuk mund të telefonosh pa leje."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <string name="dialer_shortcut_add_contact_short">Kontakt i ri</string>
+  <string name="dialer_shortcut_add_contact_long">Kontakt i ri</string>
+  <string name="dialer_shortcut_disabled_message">Shkurtorja nuk funksionon. Zvarrite për ta hequr.</string>
+  <string name="dialer_shortcut_contact_not_found_or_has_no_number">Kontakti nuk disponohet më.</string>
+  <string name="dialer_shortcut_no_permissions">Nuk mund të telefonosh pa leje.</string>
 </resources>
diff --git a/java/com/android/dialer/shortcuts/res/values-sr/strings.xml b/java/com/android/dialer/shortcuts/res/values-sr/strings.xml
index 39024f5..1736f8b 100644
--- a/java/com/android/dialer/shortcuts/res/values-sr/strings.xml
+++ b/java/com/android/dialer/shortcuts/res/values-sr/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="dialer_shortcut_add_contact_short" msgid="7587385197258884650">"Нови конт."</string>
-    <string name="dialer_shortcut_add_contact_long" msgid="7573187314386728329">"Нови контакт"</string>
-    <string name="dialer_shortcut_disabled_message" msgid="7713603194332953571">"Пречица не функционише. Превуците да бисте је уклонили."</string>
-    <string name="dialer_shortcut_contact_not_found_or_has_no_number" msgid="3538594504123040498">"Контакт више није доступан."</string>
-    <string name="dialer_shortcut_no_permissions" msgid="4422956724546867357">"Не можете да позовете јер немате дозволе."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <string name="dialer_shortcut_add_contact_short">Нови конт.</string>
+  <string name="dialer_shortcut_add_contact_long">Нови контакт</string>
+  <string name="dialer_shortcut_disabled_message">Пречица не функционише. Превуците да бисте је уклонили.</string>
+  <string name="dialer_shortcut_contact_not_found_or_has_no_number">Контакт више није доступан.</string>
+  <string name="dialer_shortcut_no_permissions">Не можете да позовете јер немате дозволе.</string>
 </resources>
diff --git a/java/com/android/dialer/shortcuts/res/values-sv/strings.xml b/java/com/android/dialer/shortcuts/res/values-sv/strings.xml
index 31589df..2932756 100644
--- a/java/com/android/dialer/shortcuts/res/values-sv/strings.xml
+++ b/java/com/android/dialer/shortcuts/res/values-sv/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="dialer_shortcut_add_contact_short" msgid="7587385197258884650">"Ny kontakt"</string>
-    <string name="dialer_shortcut_add_contact_long" msgid="7573187314386728329">"Ny kontakt"</string>
-    <string name="dialer_shortcut_disabled_message" msgid="7713603194332953571">"Genvägen fungerar inte. Dra om du vill ta bort den."</string>
-    <string name="dialer_shortcut_contact_not_found_or_has_no_number" msgid="3538594504123040498">"Kontakten är inte längre tillgänglig."</string>
-    <string name="dialer_shortcut_no_permissions" msgid="4422956724546867357">"Det går inte att ringa utan behörighet."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <string name="dialer_shortcut_add_contact_short">Ny kontakt</string>
+  <string name="dialer_shortcut_add_contact_long">Ny kontakt</string>
+  <string name="dialer_shortcut_disabled_message">Genvägen fungerar inte. Dra om du vill ta bort den.</string>
+  <string name="dialer_shortcut_contact_not_found_or_has_no_number">Kontakten är inte längre tillgänglig.</string>
+  <string name="dialer_shortcut_no_permissions">Det går inte att ringa utan behörighet.</string>
 </resources>
diff --git a/java/com/android/dialer/shortcuts/res/values-sw/strings.xml b/java/com/android/dialer/shortcuts/res/values-sw/strings.xml
index 3676b56..70202b9 100644
--- a/java/com/android/dialer/shortcuts/res/values-sw/strings.xml
+++ b/java/com/android/dialer/shortcuts/res/values-sw/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="dialer_shortcut_add_contact_short" msgid="7587385197258884650">"Anwani mpya"</string>
-    <string name="dialer_shortcut_add_contact_long" msgid="7573187314386728329">"Anwani mpya"</string>
-    <string name="dialer_shortcut_disabled_message" msgid="7713603194332953571">"Njia ya mkato haifanyi kazi. Iburute ili uiondoe."</string>
-    <string name="dialer_shortcut_contact_not_found_or_has_no_number" msgid="3538594504123040498">"Anwani haipatikani tena."</string>
-    <string name="dialer_shortcut_no_permissions" msgid="4422956724546867357">"Haiwezi kupiga simu bila ruhusa."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <string name="dialer_shortcut_add_contact_short">Anwani mpya</string>
+  <string name="dialer_shortcut_add_contact_long">Anwani mpya</string>
+  <string name="dialer_shortcut_disabled_message">Njia ya mkato haifanyi kazi. Iburute ili uiondoe.</string>
+  <string name="dialer_shortcut_contact_not_found_or_has_no_number">Anwani haipatikani tena.</string>
+  <string name="dialer_shortcut_no_permissions">Haiwezi kupiga simu bila ruhusa.</string>
 </resources>
diff --git a/java/com/android/dialer/shortcuts/res/values-ta/strings.xml b/java/com/android/dialer/shortcuts/res/values-ta/strings.xml
index d944392..0a36ecd 100644
--- a/java/com/android/dialer/shortcuts/res/values-ta/strings.xml
+++ b/java/com/android/dialer/shortcuts/res/values-ta/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="dialer_shortcut_add_contact_short" msgid="7587385197258884650">"புதியது"</string>
-    <string name="dialer_shortcut_add_contact_long" msgid="7573187314386728329">"புதிய தொடர்பு"</string>
-    <string name="dialer_shortcut_disabled_message" msgid="7713603194332953571">"குறுக்குவழி வேலை இயங்கவில்லை. அகற்ற, இழுக்கவும்."</string>
-    <string name="dialer_shortcut_contact_not_found_or_has_no_number" msgid="3538594504123040498">"தொடர்பு இல்லை."</string>
-    <string name="dialer_shortcut_no_permissions" msgid="4422956724546867357">"அனுமதிகள் இல்லாமல் அழைக்க முடியாது."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <string name="dialer_shortcut_add_contact_short">புதியது</string>
+  <string name="dialer_shortcut_add_contact_long">புதிய தொடர்பு</string>
+  <string name="dialer_shortcut_disabled_message">குறுக்குவழி வேலை இயங்கவில்லை. அகற்ற, இழுக்கவும்.</string>
+  <string name="dialer_shortcut_contact_not_found_or_has_no_number">தொடர்பு இல்லை.</string>
+  <string name="dialer_shortcut_no_permissions">அனுமதிகள் இல்லாமல் அழைக்க முடியாது.</string>
 </resources>
diff --git a/java/com/android/dialer/shortcuts/res/values-te/strings.xml b/java/com/android/dialer/shortcuts/res/values-te/strings.xml
index ea808cd..1a08ed7 100644
--- a/java/com/android/dialer/shortcuts/res/values-te/strings.xml
+++ b/java/com/android/dialer/shortcuts/res/values-te/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="dialer_shortcut_add_contact_short" msgid="7587385197258884650">"కొత్త పరిచయం"</string>
-    <string name="dialer_shortcut_add_contact_long" msgid="7573187314386728329">"కొత్త పరిచయం"</string>
-    <string name="dialer_shortcut_disabled_message" msgid="7713603194332953571">"సత్వరమార్గం పని చేయడం లేదు. తీసివేయడానికి లాగండి."</string>
-    <string name="dialer_shortcut_contact_not_found_or_has_no_number" msgid="3538594504123040498">"పరిచయం ఇప్పుడు అందుబాటులో లేదు."</string>
-    <string name="dialer_shortcut_no_permissions" msgid="4422956724546867357">"అనుమతులు లేకుండా కాల్ చేయలేరు."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <string name="dialer_shortcut_add_contact_short">కొత్త పరిచయం</string>
+  <string name="dialer_shortcut_add_contact_long">కొత్త పరిచయం</string>
+  <string name="dialer_shortcut_disabled_message">సత్వరమార్గం పని చేయడం లేదు. తీసివేయడానికి లాగండి.</string>
+  <string name="dialer_shortcut_contact_not_found_or_has_no_number">పరిచయం ఇప్పుడు అందుబాటులో లేదు.</string>
+  <string name="dialer_shortcut_no_permissions">అనుమతులు లేకుండా కాల్ చేయలేరు.</string>
 </resources>
diff --git a/java/com/android/dialer/shortcuts/res/values-th/strings.xml b/java/com/android/dialer/shortcuts/res/values-th/strings.xml
index 33abe8b..2114dc0 100644
--- a/java/com/android/dialer/shortcuts/res/values-th/strings.xml
+++ b/java/com/android/dialer/shortcuts/res/values-th/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="dialer_shortcut_add_contact_short" msgid="7587385197258884650">"รายชื่อติดต่อใหม่"</string>
-    <string name="dialer_shortcut_add_contact_long" msgid="7573187314386728329">"รายชื่อติดต่อใหม่"</string>
-    <string name="dialer_shortcut_disabled_message" msgid="7713603194332953571">"ปุ่มลัดไม่ทำงาน ลากเพื่อนำออก"</string>
-    <string name="dialer_shortcut_contact_not_found_or_has_no_number" msgid="3538594504123040498">"ไม่มีรายชื่อติดต่อนี้แล้ว"</string>
-    <string name="dialer_shortcut_no_permissions" msgid="4422956724546867357">"ไม่สามารถโทรได้หากไม่ได้รับอนุญาต"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <string name="dialer_shortcut_add_contact_short">รายชื่อติดต่อใหม่</string>
+  <string name="dialer_shortcut_add_contact_long">รายชื่อติดต่อใหม่</string>
+  <string name="dialer_shortcut_disabled_message">ปุ่มลัดไม่ทำงาน ลากเพื่อนำออก</string>
+  <string name="dialer_shortcut_contact_not_found_or_has_no_number">ไม่มีรายชื่อติดต่อนี้แล้ว</string>
+  <string name="dialer_shortcut_no_permissions">ไม่สามารถโทรได้หากไม่ได้รับอนุญาต</string>
 </resources>
diff --git a/java/com/android/dialer/shortcuts/res/values-tl/strings.xml b/java/com/android/dialer/shortcuts/res/values-tl/strings.xml
index 22273dd..1edad04 100644
--- a/java/com/android/dialer/shortcuts/res/values-tl/strings.xml
+++ b/java/com/android/dialer/shortcuts/res/values-tl/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="dialer_shortcut_add_contact_short" msgid="7587385197258884650">"Bagong contact"</string>
-    <string name="dialer_shortcut_add_contact_long" msgid="7573187314386728329">"Bagong contact"</string>
-    <string name="dialer_shortcut_disabled_message" msgid="7713603194332953571">"Hindi gumagana ang shortcut. I-drag upang alisin."</string>
-    <string name="dialer_shortcut_contact_not_found_or_has_no_number" msgid="3538594504123040498">"Hindi na available ang mga contact."</string>
-    <string name="dialer_shortcut_no_permissions" msgid="4422956724546867357">"Hindi maaaring tumawag nang walang pahintulot."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <string name="dialer_shortcut_add_contact_short">Bagong contact</string>
+  <string name="dialer_shortcut_add_contact_long">Bagong contact</string>
+  <string name="dialer_shortcut_disabled_message">Hindi gumagana ang shortcut. I-drag upang alisin.</string>
+  <string name="dialer_shortcut_contact_not_found_or_has_no_number">Hindi na available ang mga contact.</string>
+  <string name="dialer_shortcut_no_permissions">Hindi maaaring tumawag nang walang pahintulot.</string>
 </resources>
diff --git a/java/com/android/dialer/shortcuts/res/values-tr/strings.xml b/java/com/android/dialer/shortcuts/res/values-tr/strings.xml
index 2afafc3..fe49c49 100644
--- a/java/com/android/dialer/shortcuts/res/values-tr/strings.xml
+++ b/java/com/android/dialer/shortcuts/res/values-tr/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="dialer_shortcut_add_contact_short" msgid="7587385197258884650">"Yeni kişi"</string>
-    <string name="dialer_shortcut_add_contact_long" msgid="7573187314386728329">"Yeni kişi"</string>
-    <string name="dialer_shortcut_disabled_message" msgid="7713603194332953571">"Kısayol çalışmıyor. Kaldırmak için sürükleyin."</string>
-    <string name="dialer_shortcut_contact_not_found_or_has_no_number" msgid="3538594504123040498">"Kişi artık kullanılamıyor."</string>
-    <string name="dialer_shortcut_no_permissions" msgid="4422956724546867357">"İzinler olmadan sesli arama yapılamaz."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <string name="dialer_shortcut_add_contact_short">Yeni kişi</string>
+  <string name="dialer_shortcut_add_contact_long">Yeni kişi</string>
+  <string name="dialer_shortcut_disabled_message">Kısayol çalışmıyor. Kaldırmak için sürükleyin.</string>
+  <string name="dialer_shortcut_contact_not_found_or_has_no_number">Kişi artık kullanılamıyor.</string>
+  <string name="dialer_shortcut_no_permissions">İzinler olmadan sesli arama yapılamaz.</string>
 </resources>
diff --git a/java/com/android/dialer/shortcuts/res/values-uk/strings.xml b/java/com/android/dialer/shortcuts/res/values-uk/strings.xml
index f02d128..97d3706 100644
--- a/java/com/android/dialer/shortcuts/res/values-uk/strings.xml
+++ b/java/com/android/dialer/shortcuts/res/values-uk/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="dialer_shortcut_add_contact_short" msgid="7587385197258884650">"Новий контакт"</string>
-    <string name="dialer_shortcut_add_contact_long" msgid="7573187314386728329">"Новий контакт"</string>
-    <string name="dialer_shortcut_disabled_message" msgid="7713603194332953571">"Ярлик не працює. Перетягніть, щоб видалити."</string>
-    <string name="dialer_shortcut_contact_not_found_or_has_no_number" msgid="3538594504123040498">"Контакт більше не доступний."</string>
-    <string name="dialer_shortcut_no_permissions" msgid="4422956724546867357">"Неможливо здійснити виклик без дозволу."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <string name="dialer_shortcut_add_contact_short">Новий контакт</string>
+  <string name="dialer_shortcut_add_contact_long">Новий контакт</string>
+  <string name="dialer_shortcut_disabled_message">Ярлик не працює. Перетягніть, щоб видалити.</string>
+  <string name="dialer_shortcut_contact_not_found_or_has_no_number">Контакт більше не доступний.</string>
+  <string name="dialer_shortcut_no_permissions">Неможливо здійснити виклик без дозволу.</string>
 </resources>
diff --git a/java/com/android/dialer/shortcuts/res/values-ur/strings.xml b/java/com/android/dialer/shortcuts/res/values-ur/strings.xml
index 3a75e00..ef67678 100644
--- a/java/com/android/dialer/shortcuts/res/values-ur/strings.xml
+++ b/java/com/android/dialer/shortcuts/res/values-ur/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="dialer_shortcut_add_contact_short" msgid="7587385197258884650">"نیا رابطہ"</string>
-    <string name="dialer_shortcut_add_contact_long" msgid="7573187314386728329">"نیا رابطہ"</string>
-    <string name="dialer_shortcut_disabled_message" msgid="7713603194332953571">"شارٹ کٹ کام نہیں کر رہا۔ ہٹانے کیلئے گھسیٹیں۔"</string>
-    <string name="dialer_shortcut_contact_not_found_or_has_no_number" msgid="3538594504123040498">"رابطہ اب مزید دستیاب نہیں رہا۔"</string>
-    <string name="dialer_shortcut_no_permissions" msgid="4422956724546867357">"اجازتوں کے بغیر کال نہیں ہو سکتی۔"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <string name="dialer_shortcut_add_contact_short">نیا رابطہ</string>
+  <string name="dialer_shortcut_add_contact_long">نیا رابطہ</string>
+  <string name="dialer_shortcut_disabled_message">شارٹ کٹ کام نہیں کر رہا۔ ہٹانے کیلئے گھسیٹیں۔</string>
+  <string name="dialer_shortcut_contact_not_found_or_has_no_number">رابطہ اب مزید دستیاب نہیں رہا۔</string>
+  <string name="dialer_shortcut_no_permissions">اجازتوں کے بغیر کال نہیں ہو سکتی۔</string>
 </resources>
diff --git a/java/com/android/dialer/shortcuts/res/values-uz/strings.xml b/java/com/android/dialer/shortcuts/res/values-uz/strings.xml
index f831edc..8ae3e6c 100644
--- a/java/com/android/dialer/shortcuts/res/values-uz/strings.xml
+++ b/java/com/android/dialer/shortcuts/res/values-uz/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="dialer_shortcut_add_contact_short" msgid="7587385197258884650">"+ kontakt"</string>
-    <string name="dialer_shortcut_add_contact_long" msgid="7573187314386728329">"Kontakt qo‘shish"</string>
-    <string name="dialer_shortcut_disabled_message" msgid="7713603194332953571">"Yorliq ishlamayapti. Uni o‘chirib tashlash uchun torting."</string>
-    <string name="dialer_shortcut_contact_not_found_or_has_no_number" msgid="3538594504123040498">"Kontakt mavjud emas."</string>
-    <string name="dialer_shortcut_no_permissions" msgid="4422956724546867357">"Ruxsatnomasiz qo‘ng‘iroq qilib bo‘lmaydi."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <string name="dialer_shortcut_add_contact_short">+ kontakt</string>
+  <string name="dialer_shortcut_add_contact_long">Kontakt qo‘shish</string>
+  <string name="dialer_shortcut_disabled_message">Yorliq ishlamayapti. Uni o‘chirib tashlash uchun torting.</string>
+  <string name="dialer_shortcut_contact_not_found_or_has_no_number">Kontakt mavjud emas.</string>
+  <string name="dialer_shortcut_no_permissions">Ruxsatnomasiz qo‘ng‘iroq qilib bo‘lmaydi.</string>
 </resources>
diff --git a/java/com/android/dialer/shortcuts/res/values-vi/strings.xml b/java/com/android/dialer/shortcuts/res/values-vi/strings.xml
index d236430..37091ed 100644
--- a/java/com/android/dialer/shortcuts/res/values-vi/strings.xml
+++ b/java/com/android/dialer/shortcuts/res/values-vi/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="dialer_shortcut_add_contact_short" msgid="7587385197258884650">"Liên hệ mới"</string>
-    <string name="dialer_shortcut_add_contact_long" msgid="7573187314386728329">"Liên hệ mới"</string>
-    <string name="dialer_shortcut_disabled_message" msgid="7713603194332953571">"Lối tắt không hoạt động. Kéo để xóa."</string>
-    <string name="dialer_shortcut_contact_not_found_or_has_no_number" msgid="3538594504123040498">"Liên hệ không còn khả dụng."</string>
-    <string name="dialer_shortcut_no_permissions" msgid="4422956724546867357">"Không thể gọi mà không có quyền."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <string name="dialer_shortcut_add_contact_short">Liên hệ mới</string>
+  <string name="dialer_shortcut_add_contact_long">Liên hệ mới</string>
+  <string name="dialer_shortcut_disabled_message">Lối tắt không hoạt động. Kéo để xóa.</string>
+  <string name="dialer_shortcut_contact_not_found_or_has_no_number">Liên hệ không còn khả dụng.</string>
+  <string name="dialer_shortcut_no_permissions">Không thể gọi mà không có quyền.</string>
 </resources>
diff --git a/java/com/android/dialer/shortcuts/res/values-zh-rCN/strings.xml b/java/com/android/dialer/shortcuts/res/values-zh-rCN/strings.xml
index 3cfb885..bb9c5eb 100644
--- a/java/com/android/dialer/shortcuts/res/values-zh-rCN/strings.xml
+++ b/java/com/android/dialer/shortcuts/res/values-zh-rCN/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="dialer_shortcut_add_contact_short" msgid="7587385197258884650">"新增联系人"</string>
-    <string name="dialer_shortcut_add_contact_long" msgid="7573187314386728329">"添加新联系人"</string>
-    <string name="dialer_shortcut_disabled_message" msgid="7713603194332953571">"快捷方式已失效。拖动即可移除。"</string>
-    <string name="dialer_shortcut_contact_not_found_or_has_no_number" msgid="3538594504123040498">"找不到联系人（或联系人电话号码）。"</string>
-    <string name="dialer_shortcut_no_permissions" msgid="4422956724546867357">"只有授予应用相关权限，才能拨打电话。"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <string name="dialer_shortcut_add_contact_short">新增联系人</string>
+  <string name="dialer_shortcut_add_contact_long">添加新联系人</string>
+  <string name="dialer_shortcut_disabled_message">快捷方式已失效。拖动即可移除。</string>
+  <string name="dialer_shortcut_contact_not_found_or_has_no_number">找不到联系人（或联系人电话号码）。</string>
+  <string name="dialer_shortcut_no_permissions">只有授予应用相关权限，才能拨打电话。</string>
 </resources>
diff --git a/java/com/android/dialer/shortcuts/res/values-zh-rHK/strings.xml b/java/com/android/dialer/shortcuts/res/values-zh-rHK/strings.xml
index 2ac8b2f..1684964 100644
--- a/java/com/android/dialer/shortcuts/res/values-zh-rHK/strings.xml
+++ b/java/com/android/dialer/shortcuts/res/values-zh-rHK/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="dialer_shortcut_add_contact_short" msgid="7587385197258884650">"新增聯絡人"</string>
-    <string name="dialer_shortcut_add_contact_long" msgid="7573187314386728329">"新增聯絡人"</string>
-    <string name="dialer_shortcut_disabled_message" msgid="7713603194332953571">"捷徑無法運作，拖曳即可移除。"</string>
-    <string name="dialer_shortcut_contact_not_found_or_has_no_number" msgid="3538594504123040498">"已找不到該聯絡人。"</string>
-    <string name="dialer_shortcut_no_permissions" msgid="4422956724546867357">"必須取得權限才能通話。"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <string name="dialer_shortcut_add_contact_short">新增聯絡人</string>
+  <string name="dialer_shortcut_add_contact_long">新增聯絡人</string>
+  <string name="dialer_shortcut_disabled_message">捷徑無法運作，拖曳即可移除。</string>
+  <string name="dialer_shortcut_contact_not_found_or_has_no_number">已找不到該聯絡人。</string>
+  <string name="dialer_shortcut_no_permissions">必須取得權限才能通話。</string>
 </resources>
diff --git a/java/com/android/dialer/shortcuts/res/values-zh-rTW/strings.xml b/java/com/android/dialer/shortcuts/res/values-zh-rTW/strings.xml
index 0573516..047b05c 100644
--- a/java/com/android/dialer/shortcuts/res/values-zh-rTW/strings.xml
+++ b/java/com/android/dialer/shortcuts/res/values-zh-rTW/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="dialer_shortcut_add_contact_short" msgid="7587385197258884650">"新聯絡人"</string>
-    <string name="dialer_shortcut_add_contact_long" msgid="7573187314386728329">"新增聯絡人"</string>
-    <string name="dialer_shortcut_disabled_message" msgid="7713603194332953571">"捷徑無法使用，拖曳即可移除。"</string>
-    <string name="dialer_shortcut_contact_not_found_or_has_no_number" msgid="3538594504123040498">"已沒有這位聯絡人的資料。"</string>
-    <string name="dialer_shortcut_no_permissions" msgid="4422956724546867357">"沒有權限，無法撥打電話。"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <string name="dialer_shortcut_add_contact_short">新聯絡人</string>
+  <string name="dialer_shortcut_add_contact_long">新增聯絡人</string>
+  <string name="dialer_shortcut_disabled_message">捷徑無法使用，拖曳即可移除。</string>
+  <string name="dialer_shortcut_contact_not_found_or_has_no_number">已沒有這位聯絡人的資料。</string>
+  <string name="dialer_shortcut_no_permissions">沒有權限，無法撥打電話。</string>
 </resources>
diff --git a/java/com/android/dialer/shortcuts/res/values-zu/strings.xml b/java/com/android/dialer/shortcuts/res/values-zu/strings.xml
index f1df8e3..8ffd77a 100644
--- a/java/com/android/dialer/shortcuts/res/values-zu/strings.xml
+++ b/java/com/android/dialer/shortcuts/res/values-zu/strings.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="dialer_shortcut_add_contact_short" msgid="7587385197258884650">"Oxhumana naye omusha"</string>
-    <string name="dialer_shortcut_add_contact_long" msgid="7573187314386728329">"Oxhumana naye omusha"</string>
-    <string name="dialer_shortcut_disabled_message" msgid="7713603194332953571">"Isinqamuleli asisebenzi. Hudula ukuze ususe."</string>
-    <string name="dialer_shortcut_contact_not_found_or_has_no_number" msgid="3538594504123040498">"Oxhumana naye akasatholakali."</string>
-    <string name="dialer_shortcut_no_permissions" msgid="4422956724546867357">"Ayikwazi ukushaya ngaphandle kwezimvume."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <string name="dialer_shortcut_add_contact_short">Oxhumana naye omusha</string>
+  <string name="dialer_shortcut_add_contact_long">Oxhumana naye omusha</string>
+  <string name="dialer_shortcut_disabled_message">Isinqamuleli asisebenzi. Hudula ukuze ususe.</string>
+  <string name="dialer_shortcut_contact_not_found_or_has_no_number">Oxhumana naye akasatholakali.</string>
+  <string name="dialer_shortcut_no_permissions">Ayikwazi ukushaya ngaphandle kwezimvume.</string>
 </resources>
diff --git a/java/com/android/dialer/simulator/SimulatorComponent.java b/java/com/android/dialer/simulator/SimulatorComponent.java
index 6fa3f0c..ff75e9f 100644
--- a/java/com/android/dialer/simulator/SimulatorComponent.java
+++ b/java/com/android/dialer/simulator/SimulatorComponent.java
@@ -18,6 +18,7 @@
 
 import android.content.Context;
 import com.android.dialer.inject.HasRootComponent;
+import com.android.dialer.inject.IncludeInDialerRoot;
 import dagger.Subcomponent;
 
 /** Subcomponent that can be used to access the simulator implementation. */
@@ -36,6 +37,7 @@
   }
 
   /** Used to refer to the root application component. */
+  @IncludeInDialerRoot
   public interface HasComponent {
     SimulatorComponent simulatorComponent();
   }
diff --git a/java/com/android/dialer/simulator/impl/AndroidManifest.xml b/java/com/android/dialer/simulator/impl/AndroidManifest.xml
index a30504d..718d50e 100644
--- a/java/com/android/dialer/simulator/impl/AndroidManifest.xml
+++ b/java/com/android/dialer/simulator/impl/AndroidManifest.xml
@@ -1,4 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2018 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
   package="com.android.dialer.simulator.impl">
 
diff --git a/java/com/android/dialer/simulator/impl/RttChatBot.java b/java/com/android/dialer/simulator/impl/RttChatBot.java
index b2860e3..cd52343 100644
--- a/java/com/android/dialer/simulator/impl/RttChatBot.java
+++ b/java/com/android/dialer/simulator/impl/RttChatBot.java
@@ -32,7 +32,7 @@
 
 /** Chat bot to generate remote RTT chat messages. */
 @TargetApi(28)
-public class RttChatBot {
+class RttChatBot {
 
   interface Callback {
     void type(String text);
@@ -62,14 +62,14 @@
   }
 
   @MainThread
-  public void start() {
+  void start() {
     Assert.isMainThread();
     LogUtil.enterBlock("RttChatBot.start");
     messageHandler.sendEmptyMessage(START_SENDING);
   }
 
   @MainThread
-  public void stop() {
+  void stop() {
     Assert.isMainThread();
     LogUtil.enterBlock("RttChatBot.stop");
     if (handlerThread != null && handlerThread.isAlive()) {
diff --git a/java/com/android/dialer/simulator/impl/SimulatorConferenceCreator.java b/java/com/android/dialer/simulator/impl/SimulatorConferenceCreator.java
index 81a3d30..aec9398 100644
--- a/java/com/android/dialer/simulator/impl/SimulatorConferenceCreator.java
+++ b/java/com/android/dialer/simulator/impl/SimulatorConferenceCreator.java
@@ -46,13 +46,18 @@
 
   @Simulator.ConferenceType private final int conferenceType;
 
-  public SimulatorConferenceCreator(
+  SimulatorConferenceCreator(
       @NonNull Context context, @Simulator.ConferenceType int conferenceType) {
     this.context = Assert.isNotNull(context);
     this.conferenceType = conferenceType;
     simulatorConnectionsBank = SimulatorComponent.get(context).getSimulatorConnectionsBank();
   }
 
+  /**
+   * Starts to create certain number of calls to form a conference call.
+   *
+   * @param callCount the number of calls in conference to create.
+   */
   void start(int callCount) {
     onNewIncomingConnectionEnabled = true;
     SimulatorConnectionService.addListener(this);
diff --git a/java/com/android/dialer/simulator/impl/SimulatorImpl.java b/java/com/android/dialer/simulator/impl/SimulatorImpl.java
index c8b8af9..ee910ba 100644
--- a/java/com/android/dialer/simulator/impl/SimulatorImpl.java
+++ b/java/com/android/dialer/simulator/impl/SimulatorImpl.java
@@ -39,7 +39,7 @@
 
   @Override
   public ActionProvider getActionProvider(AppCompatActivity activity) {
-    return SimulatorMainMenu.getActionProvider(activity);
+    return new SimulatorMainPortal(activity).getActionProvider();
   }
 
   @Override
diff --git a/java/com/android/dialer/simulator/impl/SimulatorMainMenu.java b/java/com/android/dialer/simulator/impl/SimulatorMainMenu.java
deleted file mode 100644
index ba2b558..0000000
--- a/java/com/android/dialer/simulator/impl/SimulatorMainMenu.java
+++ /dev/null
@@ -1,216 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.dialer.simulator.impl;
-
-import android.content.Context;
-import android.content.Intent;
-import android.provider.VoicemailContract;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
-import android.view.ActionProvider;
-import com.android.dialer.common.concurrent.DialerExecutor.Worker;
-import com.android.dialer.common.concurrent.DialerExecutorComponent;
-import com.android.dialer.databasepopulator.BlockedBumberPopulator;
-import com.android.dialer.databasepopulator.CallLogPopulator;
-import com.android.dialer.databasepopulator.ContactsPopulator;
-import com.android.dialer.databasepopulator.VoicemailPopulator;
-import com.android.dialer.enrichedcall.simulator.EnrichedCallSimulatorActivity;
-import com.android.dialer.persistentlog.PersistentLogger;
-import com.android.dialer.preferredsim.PreferredSimFallbackContract;
-import com.android.dialer.simulator.SimulatorComponent;
-
-/** Implements the top level simulator menu. */
-final class SimulatorMainMenu {
-
-  static ActionProvider getActionProvider(@NonNull AppCompatActivity activity) {
-    SimulatorSubMenu simulatorSubMenu = new SimulatorSubMenu(activity.getApplicationContext());
-    simulatorSubMenu
-        .addItem("Voice call", SimulatorVoiceCall.getActionProvider(activity))
-        .addItem("Rtt call", SimulatorRttCall.getActionProvider(activity.getApplicationContext()))
-        .addItem(
-            "IMS video", SimulatorVideoCall.getActionProvider(activity.getApplicationContext()))
-        .addItem(
-            "Notifications",
-            SimulatorNotifications.getActionProvider(activity.getApplicationContext()))
-        .addItem("Populate database", () -> populateDatabase(activity.getApplicationContext()))
-        .addItem("Populate voicemail", () -> populateVoicemail(activity.getApplicationContext()))
-        .addItem(
-            "Fast populate database", () -> fastPopulateDatabase(activity.getApplicationContext()))
-        .addItem(
-            "Fast populate voicemail database",
-            () -> populateVoicemailFast(activity.getApplicationContext()))
-        .addItem("Clean database", () -> cleanDatabase(activity.getApplicationContext()))
-        .addItem("clear preferred SIM", () -> clearPreferredSim(activity.getApplicationContext()))
-        .addItem("Sync voicemail", () -> syncVoicemail(activity.getApplicationContext()))
-        .addItem("Share persistent log", () -> sharePersistentLog(activity.getApplicationContext()))
-        .addItem(
-            "Enriched call simulator",
-            () ->
-                activity.startActivity(
-                    EnrichedCallSimulatorActivity.newIntent(activity.getApplicationContext())))
-        .addItem(
-            "Enable simulator mode",
-            () -> {
-              SimulatorComponent.get(activity.getApplicationContext())
-                  .getSimulator()
-                  .enableSimulatorMode();
-              SimulatorSimCallManager.register(activity.getApplicationContext());
-            })
-        .addItem(
-            "Disable simulator mode",
-            () -> {
-              SimulatorComponent.get(activity.getApplicationContext())
-                  .getSimulator()
-                  .disableSimulatorMode();
-              SimulatorSimCallManager.unregister(activity.getApplicationContext());
-            });
-    return simulatorSubMenu;
-  }
-
-  private static void populateDatabase(@NonNull Context context) {
-    DialerExecutorComponent.get(context)
-        .dialerExecutorFactory()
-        .createNonUiTaskBuilder(new PopulateDatabaseWorker())
-        .build()
-        .executeSerial(new PopulateDatabaseWorkerInput(context, false));
-  }
-
-  private static void populateVoicemail(@NonNull Context context) {
-    DialerExecutorComponent.get(context)
-        .dialerExecutorFactory()
-        .createNonUiTaskBuilder(new PopulateVoicemailWorker())
-        .build()
-        .executeSerial(new PopulateDatabaseWorkerInput(context, false));
-  }
-
-  private static void populateVoicemailFast(@NonNull Context context) {
-    DialerExecutorComponent.get(context)
-        .dialerExecutorFactory()
-        .createNonUiTaskBuilder(new PopulateVoicemailWorker())
-        .build()
-        .executeSerial(new PopulateDatabaseWorkerInput(context, true));
-  }
-
-  private static class PopulateVoicemailWorker
-      implements Worker<PopulateDatabaseWorkerInput, Void> {
-    @Nullable
-    @Override
-    public Void doInBackground(PopulateDatabaseWorkerInput input) {
-      VoicemailPopulator.populateVoicemail(input.context, input.fastMode);
-      return null;
-    }
-  }
-
-  private static void fastPopulateDatabase(@NonNull Context context) {
-    DialerExecutorComponent.get(context)
-        .dialerExecutorFactory()
-        .createNonUiTaskBuilder(new PopulateDatabaseWorker())
-        .build()
-        .executeSerial(new PopulateDatabaseWorkerInput(context, true));
-  }
-
-  private static void cleanDatabase(@NonNull Context context) {
-    DialerExecutorComponent.get(context)
-        .dialerExecutorFactory()
-        .createNonUiTaskBuilder(new CleanDatabaseWorker())
-        .build()
-        .executeSerial(context);
-  }
-
-  private static void clearPreferredSim(Context context) {
-    DialerExecutorComponent.get(context)
-        .dialerExecutorFactory()
-        .createNonUiTaskBuilder(new ClearPreferredSimWorker())
-        .build()
-        .executeSerial(context);
-  }
-
-  private static void syncVoicemail(@NonNull Context context) {
-    Intent intent = new Intent(VoicemailContract.ACTION_SYNC_VOICEMAIL);
-    context.sendBroadcast(intent);
-  }
-
-  private static void sharePersistentLog(@NonNull Context context) {
-    DialerExecutorComponent.get(context)
-        .dialerExecutorFactory()
-        .createNonUiTaskBuilder(new ShareLogWorker())
-        .onSuccess(
-            (String log) -> {
-              Intent intent = new Intent(Intent.ACTION_SEND);
-              intent.setType("text/plain");
-              intent.putExtra(Intent.EXTRA_TEXT, log);
-              if (intent.resolveActivity(context.getPackageManager()) != null) {
-                context.startActivity(intent);
-              }
-            })
-        .build()
-        .executeSerial(null);
-  }
-
-  private SimulatorMainMenu() {}
-
-  private static class PopulateDatabaseWorker implements Worker<PopulateDatabaseWorkerInput, Void> {
-    @Nullable
-    @Override
-    public Void doInBackground(PopulateDatabaseWorkerInput input) {
-      ContactsPopulator.populateContacts(input.context, input.fastMode);
-      CallLogPopulator.populateCallLog(input.context, false, input.fastMode);
-      VoicemailPopulator.populateVoicemail(input.context, input.fastMode);
-      return null;
-    }
-  }
-
-  private static class CleanDatabaseWorker implements Worker<Context, Void> {
-    @Nullable
-    @Override
-    public Void doInBackground(Context context) {
-      ContactsPopulator.deleteAllContacts(context);
-      CallLogPopulator.deleteAllCallLog(context);
-      VoicemailPopulator.deleteAllVoicemail(context);
-      BlockedBumberPopulator.deleteBlockedNumbers(context);
-      return null;
-    }
-  }
-
-  private static class ClearPreferredSimWorker implements Worker<Context, Void> {
-    @Nullable
-    @Override
-    public Void doInBackground(Context context) {
-      context.getContentResolver().delete(PreferredSimFallbackContract.CONTENT_URI, null, null);
-      return null;
-    }
-  }
-
-  private static class ShareLogWorker implements Worker<Void, String> {
-    @Nullable
-    @Override
-    public String doInBackground(Void unused) {
-      return PersistentLogger.dumpLogToString();
-    }
-  }
-
-  private static class PopulateDatabaseWorkerInput {
-    Context context;
-    boolean fastMode;
-
-    PopulateDatabaseWorkerInput(Context context, boolean fastMode) {
-      this.context = context;
-      this.fastMode = fastMode;
-    }
-  }
-}
diff --git a/java/com/android/dialer/simulator/impl/SimulatorMainPortal.java b/java/com/android/dialer/simulator/impl/SimulatorMainPortal.java
new file mode 100644
index 0000000..2612757
--- /dev/null
+++ b/java/com/android/dialer/simulator/impl/SimulatorMainPortal.java
@@ -0,0 +1,251 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.dialer.simulator.impl;
+
+import android.content.Context;
+import android.support.v7.app.AppCompatActivity;
+import android.telecom.TelecomManager;
+import android.telecom.VideoProfile;
+import android.view.ActionProvider;
+import com.android.dialer.common.concurrent.DialerExecutorComponent;
+import com.android.dialer.enrichedcall.simulator.EnrichedCallSimulatorActivity;
+import com.android.dialer.simulator.Simulator;
+import com.android.dialer.simulator.SimulatorComponent;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.util.concurrent.ListenableFuture;
+
+/** Implements the top level simulator menu. */
+public class SimulatorMainPortal {
+
+  private final Context context;
+  private final AppCompatActivity activity;
+  private SimulatorPortalEntryGroup simulatorPortalEntryGroup;
+  private String callerId = "";
+  private int presentation = TelecomManager.PRESENTATION_ALLOWED;
+  private int missedCallNum = 1;
+
+  public SimulatorMainPortal(AppCompatActivity activity) {
+    this.activity = activity;
+    this.context = activity.getApplicationContext();
+    buildMainPortal();
+  }
+
+  public SimulatorMainPortal(Context context) {
+    this.activity = null;
+    this.context = context;
+    buildMainPortal();
+  }
+
+  public void setCallerId(String callerId) {
+    this.callerId = callerId;
+  }
+
+  public void setPresentation(int presentation) {
+    this.presentation = presentation;
+  }
+
+  public void setMissedCallNum(int missedCallNum) {
+    this.missedCallNum = missedCallNum;
+  }
+
+  /**
+   * Executes commands sent to this portal.
+   *
+   * @param commands a string array that stores commands that trigger runnable methods stored in the
+   *     portal. For example: ["VoiceCall", "Incoming Call"] triggers "() -> new
+   *     SimulatorVoiceCall(context).addNewIncomingCall()" runnable method.
+   */
+  public void execute(String[] commands) {
+    @SuppressWarnings("unused")
+    ListenableFuture<?> executeCommand =
+        DialerExecutorComponent.get(context)
+            .backgroundExecutor()
+            .submit(() -> execute(simulatorPortalEntryGroup, commands, 0));
+  }
+
+  private void execute(
+      SimulatorPortalEntryGroup simulatorPortalEntryGroup, String[] commands, int index) {
+    if (simulatorPortalEntryGroup.methods().containsKey(commands[index])) {
+      simulatorPortalEntryGroup.methods().get(commands[index]).run();
+    } else if (simulatorPortalEntryGroup.subPortals().containsKey(commands[index])) {
+      execute(simulatorPortalEntryGroup.subPortals().get(commands[index]), commands, index + 1);
+    }
+  }
+
+  private void buildMainPortal() {
+    simulatorPortalEntryGroup =
+        SimulatorPortalEntryGroup.builder()
+            .setMethods(
+                ImmutableMap.<String, Runnable>builder()
+                    .put("Populate database", () -> SimulatorUtils.populateDatabase(context))
+                    .put("Populate voicemail", () -> SimulatorUtils.populateVoicemail(context))
+                    .put(
+                        "Fast Populate database",
+                        () -> SimulatorUtils.fastPopulateDatabase(context))
+                    .put(
+                        "Fast populate voicemail database",
+                        () -> SimulatorUtils.populateVoicemailFast(context))
+                    .put("Clean database", () -> SimulatorUtils.cleanDatabase(context))
+                    .put("clear preferred SIM", () -> SimulatorUtils.clearPreferredSim(context))
+                    .put("Sync voicemail", () -> SimulatorUtils.syncVoicemail(context))
+                    .put("Share persistent log", () -> SimulatorUtils.sharePersistentLog(context))
+                    .put(
+                        "Enriched call simulator",
+                        () ->
+                            context.startActivity(EnrichedCallSimulatorActivity.newIntent(context)))
+                    .put(
+                        "Enable simulator mode",
+                        () -> {
+                          SimulatorComponent.get(context).getSimulator().enableSimulatorMode();
+                          SimulatorSimCallManager.register(context);
+                        })
+                    .put(
+                        "Disable simulator mode",
+                        () -> {
+                          SimulatorComponent.get(context).getSimulator().disableSimulatorMode();
+                          SimulatorSimCallManager.unregister(context);
+                        })
+                    .build())
+            .setSubPortals(
+                ImmutableMap.of(
+                    "VoiceCall",
+                    buildSimulatorVoiceCallPortal(),
+                    "VideoCall",
+                    buildSimulatorVideoCallPortal(),
+                    "RttCall",
+                    buildSimulatorRttCallPortal(),
+                    "Notifications",
+                    buildSimulatorNotificationsPortal()))
+            .build();
+  }
+
+  public SimulatorPortalEntryGroup buildSimulatorVoiceCallPortal() {
+    return SimulatorPortalEntryGroup.builder()
+        .setMethods(
+            ImmutableMap.<String, Runnable>builder()
+                .put("Incoming call", () -> new SimulatorVoiceCall(context).addNewIncomingCall())
+                .put("Outgoing call", () -> new SimulatorVoiceCall(context).addNewOutgoingCall())
+                .put(
+                    "Customized incoming call (Dialog)",
+                    () ->
+                        new SimulatorVoiceCall(context)
+                            .addCustomizedIncomingCallWithDialog(activity))
+                .put(
+                    "Customized outgoing call (Dialog)",
+                    () ->
+                        new SimulatorVoiceCall(context)
+                            .addCustomizedOutgoingCallWithDialog(activity))
+                .put(
+                    "Customized incoming call",
+                    () ->
+                        new SimulatorVoiceCall(context)
+                            .addCustomizedIncomingCall(this.callerId, this.presentation))
+                .put(
+                    "Customized outgoing call",
+                    () ->
+                        new SimulatorVoiceCall(context)
+                            .addCustomizedOutgoingCall(this.callerId, this.presentation))
+                .put(
+                    "Incoming enriched call",
+                    () -> new SimulatorVoiceCall(context).incomingEnrichedCall())
+                .put(
+                    "Outgoing enriched call",
+                    () -> new SimulatorVoiceCall(context).outgoingEnrichedCall())
+                .put(
+                    "Spam incoming call",
+                    () -> new SimulatorVoiceCall(context).addSpamIncomingCall())
+                .put(
+                    "Emergency call back",
+                    () -> new SimulatorVoiceCall(context).addNewEmergencyCallBack())
+                .put(
+                    "GSM conference",
+                    () ->
+                        new SimulatorConferenceCreator(context, Simulator.CONFERENCE_TYPE_GSM)
+                            .start(5))
+                .put(
+                    "VoLTE conference",
+                    () ->
+                        new SimulatorConferenceCreator(context, Simulator.CONFERENCE_TYPE_VOLTE)
+                            .start(5))
+                .build())
+        .build();
+  }
+
+  private SimulatorPortalEntryGroup buildSimulatorVideoCallPortal() {
+    return SimulatorPortalEntryGroup.builder()
+        .setMethods(
+            ImmutableMap.<String, Runnable>builder()
+                .put(
+                    "Incoming one way",
+                    () ->
+                        new SimulatorVideoCall(context, VideoProfile.STATE_RX_ENABLED)
+                            .addNewIncomingCall())
+                .put(
+                    "Incoming two way",
+                    () ->
+                        new SimulatorVideoCall(context, VideoProfile.STATE_BIDIRECTIONAL)
+                            .addNewIncomingCall())
+                .put(
+                    "Outgoing one way",
+                    () ->
+                        new SimulatorVideoCall(context, VideoProfile.STATE_TX_ENABLED)
+                            .addNewOutgoingCall())
+                .put(
+                    "Outgoing two way",
+                    () ->
+                        new SimulatorVideoCall(context, VideoProfile.STATE_BIDIRECTIONAL)
+                            .addNewOutgoingCall())
+                .build())
+        .build();
+  }
+
+  private SimulatorPortalEntryGroup buildSimulatorRttCallPortal() {
+    return SimulatorPortalEntryGroup.builder()
+        .setMethods(
+            ImmutableMap.<String, Runnable>builder()
+                .put("Incoming call", () -> new SimulatorRttCall(context).addNewIncomingCall(false))
+                .put("Outgoing call", () -> new SimulatorRttCall(context).addNewOutgoingCall())
+                .put("Emergency call", () -> new SimulatorRttCall(context).addNewEmergencyCall())
+                .build())
+        .build();
+  }
+
+  private SimulatorPortalEntryGroup buildSimulatorNotificationsPortal() {
+    return SimulatorPortalEntryGroup.builder()
+        .setMethods(
+            ImmutableMap.<String, Runnable>builder()
+                .put(
+                    "Missed calls",
+                    () ->
+                        new SimulatorMissedCallCreator(context)
+                            .start(SimulatorUtils.NOTIFICATION_COUNT))
+                .put(
+                    "Missed calls (few)",
+                    () -> new SimulatorMissedCallCreator(context).start(missedCallNum))
+                .put(
+                    "Voicemails",
+                    () ->
+                        SimulatorUtils.addVoicemailNotifications(
+                            context, SimulatorUtils.NOTIFICATION_COUNT))
+                .build())
+        .build();
+  }
+
+  public ActionProvider getActionProvider() {
+    return new SimulatorMenu(context, simulatorPortalEntryGroup);
+  }
+}
diff --git a/java/com/android/dialer/simulator/impl/SimulatorMenu.java b/java/com/android/dialer/simulator/impl/SimulatorMenu.java
new file mode 100644
index 0000000..0c8f242
--- /dev/null
+++ b/java/com/android/dialer/simulator/impl/SimulatorMenu.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.dialer.simulator.impl;
+
+import android.content.Context;
+import android.support.annotation.NonNull;
+import android.view.ActionProvider;
+import android.view.MenuItem;
+import android.view.SubMenu;
+import android.view.View;
+import com.android.dialer.common.Assert;
+import java.util.Map.Entry;
+
+/** Makes option menu for simulator. */
+public final class SimulatorMenu extends ActionProvider {
+
+  SimulatorPortalEntryGroup portal;
+
+  Context context;
+
+  public SimulatorMenu(@NonNull Context context, SimulatorPortalEntryGroup portal) {
+    super(Assert.isNotNull(context));
+    this.context = context;
+    this.portal = portal;
+  }
+
+  @Override
+  public View onCreateActionView() {
+    return null;
+  }
+
+  @Override
+  public View onCreateActionView(MenuItem forItem) {
+    return null;
+  }
+
+  @Override
+  public boolean hasSubMenu() {
+    return true;
+  }
+
+  @Override
+  public void onPrepareSubMenu(SubMenu subMenu) {
+    super.onPrepareSubMenu(subMenu);
+    subMenu.clear();
+
+    for (Entry<String, SimulatorPortalEntryGroup> subPortal : portal.subPortals().entrySet()) {
+      subMenu
+          .add(subPortal.getKey())
+          .setActionProvider(new SimulatorMenu(context, subPortal.getValue()));
+    }
+    for (Entry<String, Runnable> method : portal.methods().entrySet()) {
+      subMenu
+          .add(method.getKey())
+          .setOnMenuItemClickListener(
+              (i) -> {
+                method.getValue().run();
+                return true;
+              });
+    }
+  }
+}
diff --git a/java/com/android/dialer/simulator/impl/SimulatorModule.java b/java/com/android/dialer/simulator/impl/SimulatorModule.java
index 2bc72c9..af554b6 100644
--- a/java/com/android/dialer/simulator/impl/SimulatorModule.java
+++ b/java/com/android/dialer/simulator/impl/SimulatorModule.java
@@ -16,6 +16,8 @@
 
 package com.android.dialer.simulator.impl;
 
+import com.android.dialer.inject.DialerVariant;
+import com.android.dialer.inject.InstallIn;
 import com.android.dialer.simulator.Simulator;
 import com.android.dialer.simulator.SimulatorConnectionsBank;
 import dagger.Binds;
@@ -23,6 +25,7 @@
 import javax.inject.Singleton;
 
 /** This module provides an instance of the simulator. */
+@InstallIn(variants = {DialerVariant.DIALER_TEST})
 @Module
 public abstract class SimulatorModule {
   @Binds
diff --git a/java/com/android/dialer/simulator/impl/SimulatorNotifications.java b/java/com/android/dialer/simulator/impl/SimulatorNotifications.java
deleted file mode 100644
index bd17b7f..0000000
--- a/java/com/android/dialer/simulator/impl/SimulatorNotifications.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.dialer.simulator.impl;
-
-import android.content.ContentValues;
-import android.content.Context;
-import android.provider.VoicemailContract.Voicemails;
-import android.support.annotation.NonNull;
-import android.view.ActionProvider;
-import com.android.dialer.common.LogUtil;
-import com.android.dialer.databasepopulator.VoicemailPopulator;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-
-/** Implements the simulator submenu. */
-final class SimulatorNotifications {
-  private static final int NOTIFICATION_COUNT = 12;
-
-  static ActionProvider getActionProvider(@NonNull Context context) {
-    return new SimulatorSubMenu(context)
-        .addItem(
-            "Missed calls", () -> new SimulatorMissedCallCreator(context).start(NOTIFICATION_COUNT))
-        .addItem("Voicemails", () -> addVoicemailNotifications(context));
-  }
-
-  private static void addVoicemailNotifications(@NonNull Context context) {
-    LogUtil.enterBlock("SimulatorNotifications.addVoicemailNotifications");
-    List<ContentValues> voicemails = new ArrayList<>();
-    for (int i = NOTIFICATION_COUNT; i > 0; i--) {
-      VoicemailPopulator.Voicemail voicemail =
-          VoicemailPopulator.Voicemail.builder()
-              .setPhoneNumber(String.format("+%d", i))
-              .setTranscription(String.format("Short transcript %d", i))
-              .setDurationSeconds(60)
-              .setIsRead(false)
-              .setPhoneAccountComponentName("")
-              .setTimeMillis(System.currentTimeMillis() - TimeUnit.HOURS.toMillis(i))
-              .build();
-      voicemails.add(voicemail.getAsContentValues(context));
-    }
-    context
-        .getContentResolver()
-        .bulkInsert(
-            Voicemails.buildSourceUri(context.getPackageName()),
-            voicemails.toArray(new ContentValues[voicemails.size()]));
-  }
-}
diff --git a/java/com/android/dialer/simulator/impl/SimulatorPortalEntryGroup.java b/java/com/android/dialer/simulator/impl/SimulatorPortalEntryGroup.java
new file mode 100644
index 0000000..200b10f
--- /dev/null
+++ b/java/com/android/dialer/simulator/impl/SimulatorPortalEntryGroup.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.dialer.simulator.impl;
+
+import com.google.auto.value.AutoValue;
+import com.google.common.collect.ImmutableMap;
+import java.util.Collections;
+import java.util.Map;
+
+/** Represents a portal that receives requests from either UI or IPC. */
+@AutoValue
+public abstract class SimulatorPortalEntryGroup {
+  abstract ImmutableMap<String, Runnable> methods();
+
+  abstract ImmutableMap<String, SimulatorPortalEntryGroup> subPortals();
+
+  static Builder builder() {
+    return new AutoValue_SimulatorPortalEntryGroup.Builder()
+        .setMethods(Collections.emptyMap())
+        .setSubPortals(Collections.emptyMap());
+  }
+
+  @AutoValue.Builder
+  abstract static class Builder {
+    abstract Builder setMethods(Map<String, Runnable> value);
+
+    abstract Builder setSubPortals(Map<String, SimulatorPortalEntryGroup> value);
+
+    abstract SimulatorPortalEntryGroup build();
+  }
+}
diff --git a/java/com/android/dialer/simulator/impl/SimulatorRttCall.java b/java/com/android/dialer/simulator/impl/SimulatorRttCall.java
index 352b9e4..62e05a7 100644
--- a/java/com/android/dialer/simulator/impl/SimulatorRttCall.java
+++ b/java/com/android/dialer/simulator/impl/SimulatorRttCall.java
@@ -21,7 +21,6 @@
 import android.support.annotation.Nullable;
 import android.telecom.Connection;
 import android.telecom.DisconnectCause;
-import android.view.ActionProvider;
 import com.android.dialer.common.Assert;
 import com.android.dialer.common.LogUtil;
 import com.android.dialer.common.concurrent.ThreadUtil;
@@ -36,21 +35,14 @@
   @Nullable private String connectionTag;
   private RttChatBot rttChatBot;
 
-  static ActionProvider getActionProvider(@NonNull Context context) {
-    return new SimulatorSubMenu(context)
-        .addItem("Incoming call", () -> new SimulatorRttCall(context).addNewIncomingCall(false))
-        .addItem("Outgoing call", () -> new SimulatorRttCall(context).addNewOutgoingCall())
-        .addItem("Emergency call", () -> new SimulatorRttCall(context).addNewEmergencyCall());
-  }
-
-  private SimulatorRttCall(@NonNull Context context) {
+  SimulatorRttCall(@NonNull Context context) {
     this.context = Assert.isNotNull(context);
     SimulatorConnectionService.addListener(this);
     SimulatorConnectionService.addListener(
         new SimulatorConferenceCreator(context, Simulator.CONFERENCE_TYPE_GSM));
   }
 
-  private void addNewIncomingCall(boolean isSpam) {
+  void addNewIncomingCall(boolean isSpam) {
     String callerId =
         isSpam
             ? "+1-661-778-3020" /* Blacklisted custom spam number */
@@ -60,14 +52,14 @@
             context, callerId, SimulatorSimCallManager.CALL_TYPE_RTT);
   }
 
-  private void addNewOutgoingCall() {
+  void addNewOutgoingCall() {
     String callerId = "+55-31-2128-6800"; // Brazil office.
     connectionTag =
         SimulatorSimCallManager.addNewOutgoingCall(
             context, callerId, SimulatorSimCallManager.CALL_TYPE_RTT);
   }
 
-  private void addNewEmergencyCall() {
+  void addNewEmergencyCall() {
     String callerId = "911";
     connectionTag =
         SimulatorSimCallManager.addNewIncomingCall(
diff --git a/java/com/android/dialer/simulator/impl/SimulatorSimCallManager.java b/java/com/android/dialer/simulator/impl/SimulatorSimCallManager.java
index c56afb2..0296ace 100644
--- a/java/com/android/dialer/simulator/impl/SimulatorSimCallManager.java
+++ b/java/com/android/dialer/simulator/impl/SimulatorSimCallManager.java
@@ -64,7 +64,7 @@
   private static final String EXTRA_CONNECTION_TAG = "connection_tag";
   private static final String EXTRA_CONNECTION_CALL_TYPE = "connection_call_type";
 
-  static void register(@NonNull Context context) {
+  public static void register(@NonNull Context context) {
     LogUtil.enterBlock("SimulatorSimCallManager.register");
     Assert.isNotNull(context);
     StrictModeUtils.bypass(
@@ -75,7 +75,7 @@
         });
   }
 
-  static void unregister(@NonNull Context context) {
+  public static void unregister(@NonNull Context context) {
     LogUtil.enterBlock("SimulatorSimCallManager.unregister");
     Assert.isNotNull(context);
     StrictModeUtils.bypass(
diff --git a/java/com/android/dialer/simulator/impl/SimulatorSubMenu.java b/java/com/android/dialer/simulator/impl/SimulatorSubMenu.java
deleted file mode 100644
index 64a2e72..0000000
--- a/java/com/android/dialer/simulator/impl/SimulatorSubMenu.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.dialer.simulator.impl;
-
-import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.view.ActionProvider;
-import android.view.MenuItem;
-import android.view.SubMenu;
-import android.view.View;
-import com.android.dialer.common.Assert;
-import java.util.ArrayList;
-import java.util.List;
-
-/** Makes it easier to create submenus in the simulator. */
-final class SimulatorSubMenu extends ActionProvider {
-  List<Item> items = new ArrayList<>();
-
-  SimulatorSubMenu(@NonNull Context context) {
-    super(Assert.isNotNull(context));
-  }
-
-  SimulatorSubMenu addItem(@NonNull String title, @NonNull Runnable clickHandler) {
-    items.add(new Item(title, clickHandler));
-    return this;
-  }
-
-  SimulatorSubMenu addItem(@NonNull String title, @NonNull ActionProvider actionProvider) {
-    items.add(new Item(title, actionProvider));
-    return this;
-  }
-
-  @Override
-  public View onCreateActionView() {
-    return null;
-  }
-
-  @Override
-  public View onCreateActionView(MenuItem forItem) {
-    return null;
-  }
-
-  @Override
-  public boolean hasSubMenu() {
-    return true;
-  }
-
-  @Override
-  public void onPrepareSubMenu(SubMenu subMenu) {
-    super.onPrepareSubMenu(subMenu);
-    subMenu.clear();
-
-    for (Item item : items) {
-      if (item.clickHandler != null) {
-        subMenu
-            .add(item.title)
-            .setOnMenuItemClickListener(
-                (i) -> {
-                  item.clickHandler.run();
-                  return true;
-                });
-      } else {
-        subMenu.add(item.title).setActionProvider(item.actionProvider);
-      }
-    }
-  }
-
-  private static final class Item {
-    @NonNull final String title;
-    @Nullable final Runnable clickHandler;
-    @Nullable final ActionProvider actionProvider;
-
-    Item(@NonNull String title, @NonNull Runnable clickHandler) {
-      this.title = Assert.isNotNull(title);
-      this.clickHandler = Assert.isNotNull(clickHandler);
-      actionProvider = null;
-    }
-
-    Item(@NonNull String title, @NonNull ActionProvider actionProvider) {
-      this.title = Assert.isNotNull(title);
-      this.clickHandler = null;
-      this.actionProvider = Assert.isNotNull(actionProvider);
-    }
-  }
-}
diff --git a/java/com/android/dialer/simulator/impl/SimulatorUtils.java b/java/com/android/dialer/simulator/impl/SimulatorUtils.java
new file mode 100644
index 0000000..9e46f5a
--- /dev/null
+++ b/java/com/android/dialer/simulator/impl/SimulatorUtils.java
@@ -0,0 +1,204 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.dialer.simulator.impl;
+
+import android.content.ContentValues;
+import android.content.Context;
+import android.content.Intent;
+import android.provider.VoicemailContract;
+import android.provider.VoicemailContract.Voicemails;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import com.android.dialer.common.LogUtil;
+import com.android.dialer.common.concurrent.DialerExecutor.Worker;
+import com.android.dialer.common.concurrent.DialerExecutorComponent;
+import com.android.dialer.databasepopulator.BlockedBumberPopulator;
+import com.android.dialer.databasepopulator.CallLogPopulator;
+import com.android.dialer.databasepopulator.ContactsPopulator;
+import com.android.dialer.databasepopulator.VoicemailPopulator;
+import com.android.dialer.persistentlog.PersistentLogger;
+import com.android.dialer.preferredsim.PreferredSimFallbackContract;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+import java.util.concurrent.TimeUnit;
+
+/** Contains utilities used often in test workflow. */
+public class SimulatorUtils {
+
+  public static final int NOTIFICATION_COUNT_FEW = 1;
+  public static final int NOTIFICATION_COUNT = 12;
+
+  /** Populates contacts database with predefined contacts entries. */
+  public static void populateDatabase(@NonNull Context context) {
+    DialerExecutorComponent.get(context)
+        .dialerExecutorFactory()
+        .createNonUiTaskBuilder(new PopulateDatabaseWorker())
+        .build()
+        .executeSerial(new PopulateDatabaseWorkerInput(context, false));
+  }
+
+  /** Populates voicemail database with predefined voicemail entries. */
+  public static void populateVoicemail(@NonNull Context context) {
+    DialerExecutorComponent.get(context)
+        .dialerExecutorFactory()
+        .createNonUiTaskBuilder(new PopulateVoicemailWorker())
+        .build()
+        .executeSerial(new PopulateDatabaseWorkerInput(context, false));
+  }
+
+  /** Populates voicemail database with only few predefined voicemail entries. */
+  public static void populateVoicemailFast(@NonNull Context context) {
+    DialerExecutorComponent.get(context)
+        .dialerExecutorFactory()
+        .createNonUiTaskBuilder(new PopulateVoicemailWorker())
+        .build()
+        .executeSerial(new PopulateDatabaseWorkerInput(context, true));
+  }
+
+  /** Populates contacts database with only few predefined contacts entries. */
+  public static void fastPopulateDatabase(@NonNull Context context) {
+    DialerExecutorComponent.get(context)
+        .dialerExecutorFactory()
+        .createNonUiTaskBuilder(new PopulateDatabaseWorker())
+        .build()
+        .executeSerial(new PopulateDatabaseWorkerInput(context, true));
+  }
+
+  /** Clean contacts database. */
+  public static void cleanDatabase(@NonNull Context context) {
+    DialerExecutorComponent.get(context)
+        .dialerExecutorFactory()
+        .createNonUiTaskBuilder(new CleanDatabaseWorker())
+        .build()
+        .executeSerial(context);
+  }
+
+  /** Clear preference over sim. */
+  public static void clearPreferredSim(Context context) {
+    DialerExecutorComponent.get(context)
+        .dialerExecutorFactory()
+        .createNonUiTaskBuilder(new ClearPreferredSimWorker())
+        .build()
+        .executeSerial(context);
+  }
+
+  /** Sync voicemail by sending intents to system. */
+  public static void syncVoicemail(@NonNull Context context) {
+    Intent intent = new Intent(VoicemailContract.ACTION_SYNC_VOICEMAIL);
+    context.sendBroadcast(intent);
+  }
+
+  public static void sharePersistentLog(@NonNull Context context) {
+    DialerExecutorComponent.get(context)
+        .dialerExecutorFactory()
+        .createNonUiTaskBuilder(new ShareLogWorker())
+        .onSuccess(
+            (String log) -> {
+              Intent intent = new Intent(Intent.ACTION_SEND);
+              intent.setType("text/plain");
+              intent.putExtra(Intent.EXTRA_TEXT, log);
+              if (intent.resolveActivity(context.getPackageManager()) != null) {
+                context.startActivity(intent);
+              }
+            })
+        .build()
+        .executeSerial(null);
+  }
+
+  public static void addVoicemailNotifications(@NonNull Context context, int notificationNum) {
+    LogUtil.enterBlock("SimulatorNotifications.addVoicemailNotifications");
+    List<ContentValues> voicemails = new ArrayList<>();
+    for (int i = notificationNum; i > 0; i--) {
+      VoicemailPopulator.Voicemail voicemail =
+          VoicemailPopulator.Voicemail.builder()
+              .setPhoneNumber(String.format(Locale.ENGLISH, "+%d", i))
+              .setTranscription(String.format(Locale.ENGLISH, "Short transcript %d", i))
+              .setDurationSeconds(60)
+              .setIsRead(false)
+              .setPhoneAccountComponentName("")
+              .setTimeMillis(System.currentTimeMillis() - TimeUnit.HOURS.toMillis(i))
+              .build();
+      voicemails.add(voicemail.getAsContentValues(context));
+    }
+    context
+        .getContentResolver()
+        .bulkInsert(
+            Voicemails.buildSourceUri(context.getPackageName()),
+            voicemails.toArray(new ContentValues[voicemails.size()]));
+  }
+
+  private static class PopulateVoicemailWorker
+      implements Worker<PopulateDatabaseWorkerInput, Void> {
+    @Nullable
+    @Override
+    public Void doInBackground(PopulateDatabaseWorkerInput input) {
+      VoicemailPopulator.populateVoicemail(input.context, input.fastMode);
+      return null;
+    }
+  }
+
+  private static class PopulateDatabaseWorker implements Worker<PopulateDatabaseWorkerInput, Void> {
+    @Nullable
+    @Override
+    public Void doInBackground(PopulateDatabaseWorkerInput input) {
+      ContactsPopulator.populateContacts(input.context, input.fastMode);
+      CallLogPopulator.populateCallLog(input.context, false, input.fastMode);
+      VoicemailPopulator.populateVoicemail(input.context, input.fastMode);
+      return null;
+    }
+  }
+
+  private static class CleanDatabaseWorker implements Worker<Context, Void> {
+    @Nullable
+    @Override
+    public Void doInBackground(Context context) {
+      ContactsPopulator.deleteAllContacts(context);
+      CallLogPopulator.deleteAllCallLog(context);
+      VoicemailPopulator.deleteAllVoicemail(context);
+      BlockedBumberPopulator.deleteBlockedNumbers(context);
+      return null;
+    }
+  }
+
+  private static class ClearPreferredSimWorker implements Worker<Context, Void> {
+    @Nullable
+    @Override
+    public Void doInBackground(Context context) {
+      context.getContentResolver().delete(PreferredSimFallbackContract.CONTENT_URI, null, null);
+      return null;
+    }
+  }
+
+  private static class ShareLogWorker implements Worker<Void, String> {
+    @Nullable
+    @Override
+    public String doInBackground(Void unused) {
+      return PersistentLogger.dumpLogToString();
+    }
+  }
+
+  private static class PopulateDatabaseWorkerInput {
+    Context context;
+    boolean fastMode;
+
+    PopulateDatabaseWorkerInput(Context context, boolean fastMode) {
+      this.context = context;
+      this.fastMode = fastMode;
+    }
+  }
+}
diff --git a/java/com/android/dialer/simulator/impl/SimulatorVideoCall.java b/java/com/android/dialer/simulator/impl/SimulatorVideoCall.java
index 0bb56f1..986ed99 100644
--- a/java/com/android/dialer/simulator/impl/SimulatorVideoCall.java
+++ b/java/com/android/dialer/simulator/impl/SimulatorVideoCall.java
@@ -23,8 +23,6 @@
 import android.telecom.Connection;
 import android.telecom.DisconnectCause;
 import android.telecom.TelecomManager;
-import android.telecom.VideoProfile;
-import android.view.ActionProvider;
 import android.widget.Toast;
 import com.android.dialer.common.Assert;
 import com.android.dialer.common.LogUtil;
@@ -39,29 +37,7 @@
   private final int initialVideoState;
   @Nullable private String connectionTag;
 
-  static ActionProvider getActionProvider(@NonNull Context context) {
-    return new SimulatorSubMenu(context)
-        .addItem(
-            "Incoming one way",
-            () ->
-                new SimulatorVideoCall(context, VideoProfile.STATE_RX_ENABLED).addNewIncomingCall())
-        .addItem(
-            "Incoming two way",
-            () ->
-                new SimulatorVideoCall(context, VideoProfile.STATE_BIDIRECTIONAL)
-                    .addNewIncomingCall())
-        .addItem(
-            "Outgoing one way",
-            () ->
-                new SimulatorVideoCall(context, VideoProfile.STATE_TX_ENABLED).addNewOutgoingCall())
-        .addItem(
-            "Outgoing two way",
-            () ->
-                new SimulatorVideoCall(context, VideoProfile.STATE_BIDIRECTIONAL)
-                    .addNewOutgoingCall());
-  }
-
-  private SimulatorVideoCall(@NonNull Context context, int initialVideoState) {
+  SimulatorVideoCall(@NonNull Context context, int initialVideoState) {
     this.context = Assert.isNotNull(context);
     this.initialVideoCapability =
         Connection.CAPABILITY_SUPPORTS_VT_LOCAL_BIDIRECTIONAL
@@ -70,7 +46,7 @@
     SimulatorConnectionService.addListener(this);
   }
 
-  private void addNewIncomingCall() {
+  void addNewIncomingCall() {
     if (!isVideoAccountEnabled()) {
       showVideoAccountSettings();
       return;
@@ -81,7 +57,7 @@
             context, callerId, SimulatorSimCallManager.CALL_TYPE_VIDEO);
   }
 
-  private void addNewOutgoingCall() {
+  void addNewOutgoingCall() {
     if (!isVideoAccountEnabled()) {
       showVideoAccountSettings();
       return;
diff --git a/java/com/android/dialer/simulator/impl/SimulatorVoiceCall.java b/java/com/android/dialer/simulator/impl/SimulatorVoiceCall.java
index e59cddd..9e38470 100644
--- a/java/com/android/dialer/simulator/impl/SimulatorVoiceCall.java
+++ b/java/com/android/dialer/simulator/impl/SimulatorVoiceCall.java
@@ -24,7 +24,6 @@
 import android.telecom.Connection;
 import android.telecom.Connection.RttModifyStatus;
 import android.telecom.DisconnectCause;
-import android.view.ActionProvider;
 import com.android.dialer.common.Assert;
 import com.android.dialer.common.LogUtil;
 import com.android.dialer.common.concurrent.DialerExecutorComponent;
@@ -43,52 +42,7 @@
   @Nullable private String connectionTag;
   private final SimulatorEnrichedCall simulatorEnrichedCall;
 
-  static ActionProvider getActionProvider(@NonNull AppCompatActivity activity) {
-    return new SimulatorSubMenu(activity.getApplicationContext())
-        .addItem(
-            "Incoming call",
-            () -> new SimulatorVoiceCall(activity.getApplicationContext()).addNewIncomingCall())
-        .addItem(
-            "Outgoing call",
-            () -> new SimulatorVoiceCall(activity.getApplicationContext()).addNewOutgoingCall())
-        .addItem(
-            "Customized incoming call",
-            () ->
-                new SimulatorVoiceCall(activity.getApplicationContext())
-                    .addNewIncomingCall(activity))
-        .addItem(
-            "Customized outgoing call",
-            () ->
-                new SimulatorVoiceCall(activity.getApplicationContext())
-                    .addNewOutgoingCall(activity))
-        .addItem(
-            "Incoming enriched call",
-            () -> new SimulatorVoiceCall(activity.getApplicationContext()).incomingEnrichedCall())
-        .addItem(
-            "Outgoing enriched call",
-            () -> new SimulatorVoiceCall(activity.getApplicationContext()).outgoingEnrichedCall())
-        .addItem(
-            "Spam incoming call",
-            () -> new SimulatorVoiceCall(activity.getApplicationContext()).addSpamIncomingCall())
-        .addItem(
-            "Emergency call back",
-            () ->
-                new SimulatorVoiceCall(activity.getApplicationContext()).addNewEmergencyCallBack())
-        .addItem(
-            "GSM conference",
-            () ->
-                new SimulatorConferenceCreator(
-                        activity.getApplicationContext(), Simulator.CONFERENCE_TYPE_GSM)
-                    .start(5))
-        .addItem(
-            "VoLTE conference",
-            () ->
-                new SimulatorConferenceCreator(
-                        activity.getApplicationContext(), Simulator.CONFERENCE_TYPE_VOLTE)
-                    .start(5));
-  }
-
-  private SimulatorVoiceCall(@NonNull Context context) {
+  SimulatorVoiceCall(@NonNull Context context) {
     this.context = Assert.isNotNull(context);
     simulatorEnrichedCall = SimulatorComponent.get(context).getSimulatorEnrichedCall();
     SimulatorConnectionService.addListener(this);
@@ -96,7 +50,7 @@
         new SimulatorConferenceCreator(context, Simulator.CONFERENCE_TYPE_GSM));
   }
 
-  private void incomingEnrichedCall() {
+  void incomingEnrichedCall() {
     simulatorEnrichedCall
         .setupIncomingEnrichedCall(Simulator.ENRICHED_CALL_INCOMING_NUMBER)
         .addListener(
@@ -113,7 +67,7 @@
             DialerExecutorComponent.get(context).uiExecutor());
   }
 
-  private void outgoingEnrichedCall() {
+  void outgoingEnrichedCall() {
     getEnrichedCallManager().registerStateChangedListener(simulatorEnrichedCall);
     simulatorEnrichedCall
         .setupOutgoingEnrichedCall(Simulator.ENRICHED_CALL_OUTGOING_NUMBER)
@@ -131,14 +85,22 @@
             DialerExecutorComponent.get(context).uiExecutor());
   }
 
-  private void addNewIncomingCall() {
+  void addNewIncomingCall() {
     String callerId = "+44 (0) 20 7031 3000" /* Google London office */;
     connectionTag =
         SimulatorSimCallManager.addNewIncomingCall(
             context, callerId, SimulatorSimCallManager.CALL_TYPE_VOICE);
   }
 
-  private void addNewIncomingCall(AppCompatActivity activity) {
+  void addCustomizedIncomingCall(String callerId, int callerIdPresentation) {
+    Bundle extras = new Bundle();
+    extras.putInt(Simulator.PRESENTATION_CHOICE, callerIdPresentation);
+    connectionTag =
+        SimulatorSimCallManager.addNewIncomingCall(
+            context, callerId, SimulatorSimCallManager.CALL_TYPE_VOICE, extras);
+  }
+
+  void addCustomizedIncomingCallWithDialog(AppCompatActivity activity) {
     SimulatorDialogFragment.newInstance(
             (callerId, callerIdPresentation) -> {
               Bundle extras = new Bundle();
@@ -150,14 +112,22 @@
         .show(activity.getSupportFragmentManager(), "SimulatorDialog");
   }
 
-  private void addNewOutgoingCall() {
+  void addNewOutgoingCall() {
     String callerId = "+55-31-2128-6800"; // Brazil office.
     connectionTag =
         SimulatorSimCallManager.addNewOutgoingCall(
             context, callerId, SimulatorSimCallManager.CALL_TYPE_VOICE);
   }
 
-  private void addNewOutgoingCall(AppCompatActivity activity) {
+  void addCustomizedOutgoingCall(String callerId, int callerIdPresentation) {
+    Bundle extras = new Bundle();
+    extras.putInt(Simulator.PRESENTATION_CHOICE, callerIdPresentation);
+    connectionTag =
+        SimulatorSimCallManager.addNewIncomingCall(
+            context, callerId, SimulatorSimCallManager.CALL_TYPE_VOICE, extras);
+  }
+
+  void addCustomizedOutgoingCallWithDialog(AppCompatActivity activity) {
     SimulatorDialogFragment.newInstance(
             (callerId, callerIdPresentation) -> {
               Bundle extras = new Bundle();
@@ -169,14 +139,14 @@
         .show(activity.getSupportFragmentManager(), "SimulatorDialog");
   }
 
-  private void addSpamIncomingCall() {
+  void addSpamIncomingCall() {
     String callerId = "+1-661-778-3020"; /* Blacklisted custom spam number */
     connectionTag =
         SimulatorSimCallManager.addNewIncomingCall(
             context, callerId, SimulatorSimCallManager.CALL_TYPE_VOICE);
   }
 
-  private void addNewEmergencyCallBack() {
+  void addNewEmergencyCallBack() {
     String callerId = "911";
     connectionTag =
         SimulatorSimCallManager.addNewIncomingCall(
diff --git a/java/com/android/dialer/simulator/service/AndroidManifest.xml b/java/com/android/dialer/simulator/service/AndroidManifest.xml
new file mode 100644
index 0000000..37f26ba
--- /dev/null
+++ b/java/com/android/dialer/simulator/service/AndroidManifest.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2018 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.dialer.simulator.service">
+
+  <application>
+
+    <service
+        android:name=".SimulatorService"
+        android:exported="true">
+    </service>
+
+  </application>
+
+</manifest>
\ No newline at end of file
diff --git a/java/com/android/dialer/simulator/service/ISimulatorService.aidl b/java/com/android/dialer/simulator/service/ISimulatorService.aidl
new file mode 100644
index 0000000..77511cc
--- /dev/null
+++ b/java/com/android/dialer/simulator/service/ISimulatorService.aidl
@@ -0,0 +1,45 @@
+package com.android.dialer.simulator.service;
+
+interface ISimulatorService {
+ /**
+  * Makes an incoming call by simulator api.
+  * @param callerId is the number showing on incall UI.
+  * @param presentation is one of types of a call e.g. Payphone, Restricted, etc.. check
+  * {@link TelecomManager} for more information.
+  * */
+ void makeIncomingCall(String callerId, int presentation);
+ /**
+  * Makes an incoming call.
+  * @param callerId the number showing on incall UI.
+  * @param presentation one of types of a call e.g. Payphone, Restricted, etc.. check
+  * {@link TelecomManager} for more information.
+  * */
+ void makeOutgoingCall(String callerId, int presentation);
+ /**
+  * Makes an incoming enriched call.
+  * Note: simulator mode should be enabled first.
+  * */
+ void makeIncomingEnrichedCall();
+ /**
+  * Makes an outgoing enriched call.
+  * Note: simulator mode should be enabled first.
+  * */
+ void makeOutgoingEnrichedCall();
+ /**
+  * Populate missed call logs.
+  * @param num the number of missed call to make with this api.
+  * */
+ void populateMissedCall(int num);
+ /** Populate contacts database to get contacts, call logs, voicemails, etc.. */
+ void populateDataBase();
+ /** Clean contacts database to clean all exsting contacts, call logs. voicemails, etc.. */
+ void cleanDataBase();
+ /**
+  * Enable simulator mode. After entering simulator mode, all calls made by dialer will be handled
+  * by simulator connection service, meaning users can directly make fake calls through simulator.
+  * It is also a prerequisite to make an enriched call.
+  * */
+ void enableSimulatorMode();
+ /** Disable simulator mode to use system connection service. */
+ void disableSimulatorMode();
+}
\ No newline at end of file
diff --git a/java/com/android/dialer/simulator/service/SimulatorService.java b/java/com/android/dialer/simulator/service/SimulatorService.java
new file mode 100644
index 0000000..9b51b1b
--- /dev/null
+++ b/java/com/android/dialer/simulator/service/SimulatorService.java
@@ -0,0 +1,228 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.dialer.simulator.service;
+
+import android.app.ActivityManager;
+import android.app.ActivityManager.RunningAppProcessInfo;
+import android.app.Service;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.PackageManager.NameNotFoundException;
+import android.content.pm.Signature;
+import android.os.Binder;
+import android.os.IBinder;
+import android.os.Process;
+import android.os.RemoteException;
+import android.support.annotation.Nullable;
+import com.android.dialer.simulator.impl.SimulatorMainPortal;
+import com.google.common.base.Optional;
+import com.google.common.collect.ImmutableList;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+
+/**
+ * A secured android service that gives clients simulator api access through binder if clients do
+ * have registered certificates.
+ */
+public class SimulatorService extends Service {
+
+  private static final String POPULATE_DATABASE = "Populate database";
+  private static final String CLEAN_DATABASE = "Clean database";
+  private static final String ENABLE_SIMULATOR_MODE = "Enable simulator mode";
+  private static final String DISABLE_SIMULATOR_MODE = "Disable simulator mode";
+  private static final String VOICECALL = "VoiceCall";
+  private static final String NOTIFICATIONS = "Notifications";
+  private static final String CUSTOMIZED_INCOMING_CALL = "Customized incoming call";
+  private static final String CUSTOMIZED_OUTGOING_CALL = "Customized outgoing call";
+  private static final String INCOMING_ENRICHED_CALL = "Incoming enriched call";
+  private static final String OUTGOING_ENRICHED_CALL = "Outgoing enriched call";
+  private static final String MISSED_CALL = "Missed calls (few)";
+
+  // Certificates that used for checking whether a client is a trusted client.
+  // To get a hashed certificate
+  private ImmutableList<String> certificates;
+
+  private SimulatorMainPortal simulatorMainPortal;
+
+  /**
+   * The implementation of {@link ISimulatorService} that contains logic for clients to call
+   * simulator api.
+   */
+  private final ISimulatorService.Stub binder =
+      new ISimulatorService.Stub() {
+
+        @Override
+        public void makeIncomingCall(String callerId, int presentation) {
+          doSecurityCheck(
+              () -> {
+                simulatorMainPortal.setCallerId(callerId);
+                simulatorMainPortal.setPresentation(presentation);
+                simulatorMainPortal.execute(new String[] {VOICECALL, CUSTOMIZED_INCOMING_CALL});
+              });
+        }
+
+        @Override
+        public void makeOutgoingCall(String callerId, int presentation) {
+          doSecurityCheck(
+              () -> {
+                simulatorMainPortal.setCallerId(callerId);
+                simulatorMainPortal.setPresentation(presentation);
+                simulatorMainPortal.execute(new String[] {VOICECALL, CUSTOMIZED_OUTGOING_CALL});
+              });
+        }
+
+        @Override
+        public void populateDataBase() throws RemoteException {
+          doSecurityCheck(
+              () -> {
+                simulatorMainPortal.execute(new String[] {POPULATE_DATABASE});
+              });
+        }
+
+        @Override
+        public void cleanDataBase() throws RemoteException {
+          doSecurityCheck(
+              () -> {
+                simulatorMainPortal.execute(new String[] {CLEAN_DATABASE});
+              });
+        }
+
+        @Override
+        public void enableSimulatorMode() throws RemoteException {
+          doSecurityCheck(
+              () -> {
+                simulatorMainPortal.execute(new String[] {ENABLE_SIMULATOR_MODE});
+              });
+        }
+
+        @Override
+        public void disableSimulatorMode() throws RemoteException {
+          doSecurityCheck(
+              () -> {
+                simulatorMainPortal.execute(new String[] {DISABLE_SIMULATOR_MODE});
+              });
+        }
+
+        @Override
+        public void makeIncomingEnrichedCall() throws RemoteException {
+          doSecurityCheck(
+              () -> {
+                simulatorMainPortal.execute(new String[] {VOICECALL, INCOMING_ENRICHED_CALL});
+              });
+        }
+
+        @Override
+        public void makeOutgoingEnrichedCall() throws RemoteException {
+          doSecurityCheck(
+              () -> {
+                simulatorMainPortal.execute(new String[] {VOICECALL, OUTGOING_ENRICHED_CALL});
+              });
+        }
+
+        @Override
+        public void populateMissedCall(int num) throws RemoteException {
+          doSecurityCheck(
+              () -> {
+                simulatorMainPortal.setMissedCallNum(num);
+                simulatorMainPortal.execute(new String[] {NOTIFICATIONS, MISSED_CALL});
+              });
+        }
+
+        private void doSecurityCheck(Runnable runnable) {
+          if (!hasAccessToService()) {
+            throw new RuntimeException("Client doesn't have access to Simulator service!");
+          }
+          runnable.run();
+        }
+      };
+
+  /** Sets SimulatorMainPortal instance for SimulatorService. */
+  public void setSimulatorMainPortal(SimulatorMainPortal simulatorMainPortal) {
+    this.simulatorMainPortal = simulatorMainPortal;
+  }
+
+  /** Sets immutable CertificatesList for SimulatorService. */
+  public void setCertificatesList(ImmutableList<String> certificates) {
+    this.certificates = certificates;
+  }
+
+  private boolean hasAccessToService() {
+    int clientPid = Binder.getCallingPid();
+    if (clientPid == Process.myPid()) {
+      throw new RuntimeException("Client and service have the same PID!");
+    }
+    Optional<String> packageName = getPackageNameForPid(clientPid);
+    if (packageName.isPresent()) {
+      try {
+        PackageInfo packageInfo =
+            getPackageManager().getPackageInfo(packageName.get(), PackageManager.GET_SIGNATURES);
+        MessageDigest messageDigest = MessageDigest.getInstance("MD5");
+        if (packageInfo.signatures.length != 1) {
+          throw new NotOnlyOneSignatureException("The client has more than one signature!");
+        }
+        Signature signature = packageInfo.signatures[0];
+        return isCertificateValid(messageDigest.digest(signature.toByteArray()), this.certificates);
+      } catch (NameNotFoundException | NoSuchAlgorithmException | NotOnlyOneSignatureException e) {
+        throw new RuntimeException(e);
+      }
+    }
+    return false;
+  }
+
+  private Optional<String> getPackageNameForPid(int pid) {
+    ActivityManager activityManager =
+        (ActivityManager) this.getSystemService(Context.ACTIVITY_SERVICE);
+    for (RunningAppProcessInfo processInfo : activityManager.getRunningAppProcesses()) {
+      if (processInfo.pid == pid) {
+        return Optional.of(processInfo.processName);
+      }
+    }
+    return Optional.absent();
+  }
+
+  private static boolean isCertificateValid(
+      byte[] clientCerfificate, ImmutableList<String> certificates) {
+    for (String certificate : certificates) {
+      if (certificate.equals(bytesToHexString(clientCerfificate))) {
+        return true;
+      }
+    }
+    return false;
+  }
+
+  private static String bytesToHexString(byte[] in) {
+    final StringBuilder builder = new StringBuilder();
+    for (byte b : in) {
+      builder.append(String.format("%02X", b));
+    }
+    return builder.toString();
+  }
+
+  @Nullable
+  @Override
+  public IBinder onBind(Intent intent) {
+    return binder;
+  }
+
+  private static class NotOnlyOneSignatureException extends Exception {
+    public NotOnlyOneSignatureException(String desc) {
+      super(desc);
+    }
+  }
+}
diff --git a/java/com/android/dialer/simulator/service/SimulatorServiceClient.java b/java/com/android/dialer/simulator/service/SimulatorServiceClient.java
new file mode 100644
index 0000000..7917dfb
--- /dev/null
+++ b/java/com/android/dialer/simulator/service/SimulatorServiceClient.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.dialer.simulator.service;
+
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.ServiceConnection;
+import android.os.IBinder;
+import android.os.RemoteException;
+
+/** Contains the basic logic that a simulator service client needs to get access to the service. */
+public abstract class SimulatorServiceClient {
+
+  /** Initiates service connection. */
+  public void connectionService(Context context) {
+    Intent intent = new Intent(context, SimulatorService.class);
+    SimulatorServiceConnection mConnection = new SimulatorServiceConnection();
+    context.bindService(intent, mConnection, Context.BIND_AUTO_CREATE);
+    mConnection.bindToClient(this);
+  }
+
+  /** Contains client logic using SimulatorService api defined in ISimulatorService.aidl. */
+  public abstract void process(ISimulatorService service) throws RemoteException;
+
+  private void onServiceConnected(ISimulatorService service) {
+    try {
+      process(service);
+    } catch (RemoteException e) {
+      throw new RuntimeException(e);
+    }
+  }
+
+  private void onServiceDisconnected() {}
+
+  static class SimulatorServiceConnection implements ServiceConnection {
+
+    private SimulatorServiceClient client;
+    private ISimulatorService simulatorService;
+
+    @Override
+    public void onServiceConnected(ComponentName name, IBinder service) {
+      simulatorService = ISimulatorService.Stub.asInterface(service);
+      client.onServiceConnected(simulatorService);
+    }
+
+    @Override
+    public void onServiceDisconnected(ComponentName name) {
+      client.onServiceDisconnected();
+    }
+
+    void bindToClient(SimulatorServiceClient client) {
+      this.client = client;
+    }
+  }
+}
diff --git a/java/com/android/dialer/simulator/stub/StubSimulatorEnrichedCallModule.java b/java/com/android/dialer/simulator/stub/StubSimulatorEnrichedCallModule.java
index 36314e7..6a002f0 100644
--- a/java/com/android/dialer/simulator/stub/StubSimulatorEnrichedCallModule.java
+++ b/java/com/android/dialer/simulator/stub/StubSimulatorEnrichedCallModule.java
@@ -16,12 +16,15 @@
 
 package com.android.dialer.simulator.stub;
 
+import com.android.dialer.inject.DialerVariant;
+import com.android.dialer.inject.InstallIn;
 import com.android.dialer.simulator.SimulatorEnrichedCall;
 import dagger.Binds;
 import dagger.Module;
 import javax.inject.Singleton;
 
 /** Provides a stub instance of SimulatorEnrichedCall. */
+@InstallIn(variants = {DialerVariant.DIALER_TEST})
 @Module
 public abstract class StubSimulatorEnrichedCallModule {
   @Binds
diff --git a/java/com/android/dialer/smartdial/SmartDialCursorLoader.java b/java/com/android/dialer/smartdial/SmartDialCursorLoader.java
index f2e41b2..205362c 100644
--- a/java/com/android/dialer/smartdial/SmartDialCursorLoader.java
+++ b/java/com/android/dialer/smartdial/SmartDialCursorLoader.java
@@ -20,7 +20,7 @@
 import android.content.Context;
 import android.database.Cursor;
 import android.database.MatrixCursor;
-import com.android.contacts.common.list.PhoneNumberListAdapter.PhoneQuery;
+import android.provider.ContactsContract.CommonDataKinds.Phone;
 import com.android.dialer.common.LogUtil;
 import com.android.dialer.database.Database;
 import com.android.dialer.database.DialerDatabaseHelper;
@@ -28,6 +28,8 @@
 import com.android.dialer.smartdial.util.SmartDialNameMatcher;
 import com.android.dialer.util.PermissionsUtil;
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 
 /** Implements a Loader<Cursor> class to asynchronously load SmartDial search results. */
 public class SmartDialCursorLoader extends AsyncTaskLoader<Cursor> {
@@ -179,4 +181,60 @@
       nameMatcher.setShouldMatchEmptyQuery(!show);
     }
   }
+
+  /** Moved from contacts/common, contains all of the projections needed for Smart Dial queries. */
+  public static class PhoneQuery {
+
+    public static final String[] PROJECTION_PRIMARY_INTERNAL =
+        new String[] {
+          Phone._ID, // 0
+          Phone.TYPE, // 1
+          Phone.LABEL, // 2
+          Phone.NUMBER, // 3
+          Phone.CONTACT_ID, // 4
+          Phone.LOOKUP_KEY, // 5
+          Phone.PHOTO_ID, // 6
+          Phone.DISPLAY_NAME_PRIMARY, // 7
+          Phone.PHOTO_THUMBNAIL_URI, // 8
+        };
+
+    public static final String[] PROJECTION_PRIMARY;
+    public static final String[] PROJECTION_ALTERNATIVE_INTERNAL =
+        new String[] {
+          Phone._ID, // 0
+          Phone.TYPE, // 1
+          Phone.LABEL, // 2
+          Phone.NUMBER, // 3
+          Phone.CONTACT_ID, // 4
+          Phone.LOOKUP_KEY, // 5
+          Phone.PHOTO_ID, // 6
+          Phone.DISPLAY_NAME_ALTERNATIVE, // 7
+          Phone.PHOTO_THUMBNAIL_URI, // 8
+        };
+    public static final String[] PROJECTION_ALTERNATIVE;
+    public static final int PHONE_ID = 0;
+    public static final int PHONE_TYPE = 1;
+    public static final int PHONE_LABEL = 2;
+    public static final int PHONE_NUMBER = 3;
+    public static final int CONTACT_ID = 4;
+    public static final int LOOKUP_KEY = 5;
+    public static final int PHOTO_ID = 6;
+    public static final int DISPLAY_NAME = 7;
+    public static final int PHOTO_URI = 8;
+    public static final int CARRIER_PRESENCE = 9;
+
+    static {
+      final List<String> projectionList =
+          new ArrayList<>(Arrays.asList(PROJECTION_PRIMARY_INTERNAL));
+      projectionList.add(Phone.CARRIER_PRESENCE); // 9
+      PROJECTION_PRIMARY = projectionList.toArray(new String[projectionList.size()]);
+    }
+
+    static {
+      final List<String> projectionList =
+          new ArrayList<>(Arrays.asList(PROJECTION_ALTERNATIVE_INTERNAL));
+      projectionList.add(Phone.CARRIER_PRESENCE); // 9
+      PROJECTION_ALTERNATIVE = projectionList.toArray(new String[projectionList.size()]);
+    }
+  }
 }
diff --git a/java/com/android/dialer/smartdial/map/CompositeSmartDialMap.java b/java/com/android/dialer/smartdial/map/CompositeSmartDialMap.java
index 112cb19..76c05c5 100644
--- a/java/com/android/dialer/smartdial/map/CompositeSmartDialMap.java
+++ b/java/com/android/dialer/smartdial/map/CompositeSmartDialMap.java
@@ -19,7 +19,7 @@
 import android.content.Context;
 import android.support.annotation.VisibleForTesting;
 import android.support.v4.util.SimpleArrayMap;
-import com.android.dialer.compat.CompatUtils;
+import com.android.dialer.i18n.LocaleUtils;
 import com.google.common.base.Optional;
 
 /**
@@ -157,7 +157,7 @@
 
   @VisibleForTesting
   static Optional<SmartDialMap> getExtraMap(Context context) {
-    String languageCode = CompatUtils.getLocale(context).getISO3Language();
+    String languageCode = LocaleUtils.getLocale(context).getISO3Language();
     return EXTRA_MAPS.containsKey(languageCode)
         ? Optional.of(EXTRA_MAPS.get(languageCode))
         : Optional.absent();
diff --git a/java/com/android/dialer/spam/Spam.java b/java/com/android/dialer/spam/Spam.java
index 5924d56..028bda4 100644
--- a/java/com/android/dialer/spam/Spam.java
+++ b/java/com/android/dialer/spam/Spam.java
@@ -16,12 +16,15 @@
 
 package com.android.dialer.spam;
 
-import android.support.annotation.NonNull;
+import android.preference.Preference;
+import android.preference.Preference.OnPreferenceChangeListener;
+import android.provider.CallLog.Calls;
 import android.support.annotation.Nullable;
 import com.android.dialer.DialerPhoneNumber;
 import com.android.dialer.logging.ContactLookupResult;
 import com.android.dialer.logging.ContactSource;
 import com.android.dialer.logging.ReportingLocation;
+import com.android.dialer.spam.status.SpamStatus;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.util.concurrent.ListenableFuture;
@@ -29,19 +32,6 @@
 /** Allows the container application to mark calls as spam. */
 public interface Spam {
 
-  boolean isSpamEnabled();
-
-  boolean isSpamNotificationEnabled();
-
-  boolean isDialogEnabledForSpamNotification();
-
-  boolean isDialogReportSpamCheckedByDefault();
-
-  /** @return what percentage of aftercall notifications to show to the user */
-  int percentOfSpamNotificationsToShow();
-
-  int percentOfNonSpamNotificationsToShow();
-
   /**
    * Checks if each of numbers in the given list is suspected of being a spam.
    *
@@ -52,37 +42,37 @@
       ImmutableSet<DialerPhoneNumber> dialerPhoneNumbers);
 
   /**
-   * Checks if the given number is suspected of being a spam.
+   * Checks if the given number is suspected of being spam.
    *
-   * @param number The phone number of the call.
-   * @param countryIso The country ISO of the call.
-   * @param listener The callback to be invoked after {@code Info} is fetched.
+   * @param dialerPhoneNumber the phone number.
+   * @return the {@link SpamStatus} for the given number.
    */
-  void checkSpamStatus(String number, String countryIso, Listener listener);
+  ListenableFuture<SpamStatus> checkSpamStatus(DialerPhoneNumber dialerPhoneNumber);
 
   /**
-   * @param number The number to check if the number is in the user's white list (non spam list)
-   * @param countryIso The country ISO of the call.
-   * @param listener The callback to be invoked after {@code Info} is fetched.
+   * Checks if the given number is suspected of being spam.
+   *
+   * <p>See {@link #checkSpamStatus(DialerPhoneNumber)}.
+   *
+   * @param number the phone number.
+   * @param defaultCountryIso the default country to use if it's not part of the number.
+   * @return the {@link SpamStatus} for the given number.
    */
-  void checkUserMarkedNonSpamStatus(
-      String number, @Nullable String countryIso, @NonNull Listener listener);
+  ListenableFuture<SpamStatus> checkSpamStatus(String number, @Nullable String defaultCountryIso);
 
   /**
-   * @param number The number to check if it is in user's spam list
-   * @param countryIso The country ISO of the call.
-   * @param listener The callback to be invoked after {@code Info} is fetched.
+   * Called as an indication that the Spam implementation should check whether downloading a spam
+   * list needs to occur or not.
+   *
+   * @param isEnabledByUser true if spam is enabled by the user. Generally, this value should be
+   *     passed as {@link SpamSettings#isSpamEnabled()}. In the scenario where the user toggles the
+   *     spam setting isSpamEnabled returns stale data: the SharedPreferences will not have updated
+   *     prior to executing {@link OnPreferenceChangeListener#onPreferenceChange(Preference,
+   *     Object)}. For that case, use the new value provided in the onPreferenceChange callback.
+   * @return a future containing no value. It is only an indication of success or failure of the
+   *     operation.
    */
-  void checkUserMarkedSpamStatus(
-      String number, @Nullable String countryIso, @NonNull Listener listener);
-
-  /**
-   * @param number The number to check if it is in the global spam list
-   * @param countryIso The country ISO of the call.
-   * @param listener The callback to be invoked after {@code Info} is fetched.
-   */
-  void checkGlobalSpamListStatus(
-      String number, @Nullable String countryIso, @NonNull Listener listener);
+  ListenableFuture<Void> updateSpamListDownload(boolean isEnabledByUser);
 
   /**
    * Synchronously checks if the given number is suspected of being a spamer.
@@ -178,10 +168,24 @@
       ReportingLocation.Type from,
       ContactSource.Type contactSourceType);
 
-  /** Callback to be invoked when data is fetched. */
-  interface Listener {
-
-    /** Called when data is fetched. */
-    void onComplete(boolean isSpam);
+  /**
+   * Given a number's spam status and a call type, determine if the call should be shown as spam.
+   *
+   * <p>We show a call as spam if
+   *
+   * <ul>
+   *   <li>the number is marked as spam, and
+   *   <li>the call is not an outgoing call.
+   * </ul>
+   *
+   * <p>This is because spammers can hide behind a legit number (e.g., a customer service number).
+   * We don't want to show a spam icon when users call it.
+   *
+   * @param isNumberSpam Whether the number is spam.
+   * @param callType One of the types in {@link android.provider.CallLog.Calls#TYPE}.
+   * @return true if the number is spam *and* the call is not an outgoing call.
+   */
+  static boolean shouldShowAsSpam(boolean isNumberSpam, int callType) {
+    return isNumberSpam && (callType != Calls.OUTGOING_TYPE);
   }
 }
diff --git a/java/com/android/dialer/spam/SpamComponent.java b/java/com/android/dialer/spam/SpamComponent.java
index 0bcdafa..a0ffcce 100644
--- a/java/com/android/dialer/spam/SpamComponent.java
+++ b/java/com/android/dialer/spam/SpamComponent.java
@@ -18,6 +18,7 @@
 
 import android.content.Context;
 import com.android.dialer.inject.HasRootComponent;
+import com.android.dialer.inject.IncludeInDialerRoot;
 import dagger.Subcomponent;
 
 /** Dagger component to get Spam. */
@@ -26,6 +27,8 @@
 
   public abstract Spam spam();
 
+  public abstract SpamSettings spamSettings();
+
   public static SpamComponent get(Context context) {
     return ((SpamComponent.HasComponent)
             ((HasRootComponent) context.getApplicationContext()).component())
@@ -33,6 +36,7 @@
   }
 
   /** Used to refer to the root application component. */
+  @IncludeInDialerRoot
   public interface HasComponent {
     SpamComponent spamComponent();
   }
diff --git a/java/com/android/dialer/spam/SpamSettings.java b/java/com/android/dialer/spam/SpamSettings.java
new file mode 100644
index 0000000..e0c0682
--- /dev/null
+++ b/java/com/android/dialer/spam/SpamSettings.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.dialer.spam;
+
+import android.content.Context;
+import android.content.Intent;
+
+/** Allows the container application to interact with spam settings. */
+public interface SpamSettings {
+
+  /** @return if spam module is enabled */
+  boolean isSpamEnabled();
+
+  /** @return if spam after call notification is enabled */
+  boolean isSpamNotificationEnabled();
+
+  /** @return if spam blocking is enabled */
+  boolean isSpamBlockingEnabled();
+
+  /** @return if spam blocking user setting is controlled by carrier */
+  boolean isSpamBlockingControlledByCarrier();
+
+  /** @return if spam blocking module is enabled by flag */
+  boolean isSpamBlockingEnabledByFlag();
+
+  /** @return if spam blocking setting is enabled by user */
+  boolean isSpamBlockingEnabledByUser();
+
+  /** @return if dialog is used by default for spam after call notification */
+  boolean isDialogEnabledForSpamNotification();
+
+  /** @return if report spam is checked by default in block/report dialog */
+  boolean isDialogReportSpamCheckedByDefault();
+
+  /** @return percentage of after call notifications for spam numbers to show to the user */
+  int percentOfSpamNotificationsToShow();
+
+  /** @return percentage of after call notifications for nonspam numbers to show to the user */
+  int percentOfNonSpamNotificationsToShow();
+
+  /**
+   * Modifies spam blocking setting.
+   *
+   * @param enabled Whether to enable or disable the setting.
+   * @param listener The callback to be invoked after setting change is done.
+   */
+  void modifySpamBlockingSetting(boolean enabled, ModifySettingListener listener);
+
+  /** @return an intent to start spam blocking setting */
+  Intent getSpamBlockingSettingIntent(Context context);
+
+  /** Callback to be invoked when setting change completes. */
+  interface ModifySettingListener {
+
+    /** Called when setting change completes. */
+    void onComplete(boolean success);
+  }
+}
diff --git a/java/com/android/dialer/spam/SpamStatus.java b/java/com/android/dialer/spam/SpamStatus.java
deleted file mode 100644
index 0b859d1..0000000
--- a/java/com/android/dialer/spam/SpamStatus.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.dialer.spam;
-
-import com.google.common.base.Optional;
-
-/** An interface representing a number's spam status. */
-@SuppressWarnings("Guava")
-public interface SpamStatus {
-
-  /** Returns true if the number is spam. */
-  boolean isSpam();
-
-  /**
-   * Returns the timestamp (in milliseconds) indicating when the number's spam status entered the
-   * underlying data source.
-   *
-   * <p>{@code Optional.absent()} is returned if
-   *
-   * <ul>
-   *   <li>the number's spam status doesn't exist in the underlying data source, or
-   *   <li>the underlying data source can't provide a timestamp.
-   * </ul>
-   */
-  Optional<Long> getTimestampMillis();
-}
diff --git a/java/com/android/dialer/spam/SpamStub.java b/java/com/android/dialer/spam/SpamStub.java
deleted file mode 100644
index b171d0d..0000000
--- a/java/com/android/dialer/spam/SpamStub.java
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.dialer.spam;
-
-import com.android.dialer.DialerPhoneNumber;
-import com.android.dialer.common.concurrent.Annotations.BackgroundExecutor;
-import com.android.dialer.logging.ContactLookupResult;
-import com.android.dialer.logging.ContactSource;
-import com.android.dialer.logging.ReportingLocation;
-import com.google.common.base.Optional;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.util.concurrent.Futures;
-import com.google.common.util.concurrent.ListenableFuture;
-import com.google.common.util.concurrent.ListeningExecutorService;
-import javax.inject.Inject;
-
-/** Default implementation of Spam. */
-public class SpamStub implements Spam {
-
-  private final ListeningExecutorService backgroundExecutorService;
-
-  @Inject
-  public SpamStub(@BackgroundExecutor ListeningExecutorService backgroundExecutorService) {
-    this.backgroundExecutorService = backgroundExecutorService;
-  }
-
-  @Override
-  public boolean isSpamEnabled() {
-    return false;
-  }
-
-  @Override
-  public boolean isSpamNotificationEnabled() {
-    return false;
-  }
-
-  @Override
-  public boolean isDialogEnabledForSpamNotification() {
-    return false;
-  }
-
-  @Override
-  public boolean isDialogReportSpamCheckedByDefault() {
-    return false;
-  }
-
-  @Override
-  public int percentOfSpamNotificationsToShow() {
-    return 0;
-  }
-
-  @Override
-  public int percentOfNonSpamNotificationsToShow() {
-    return 0;
-  }
-
-  @Override
-  public ListenableFuture<ImmutableMap<DialerPhoneNumber, SpamStatus>> batchCheckSpamStatus(
-      ImmutableSet<DialerPhoneNumber> dialerPhoneNumbers) {
-    return backgroundExecutorService.submit(
-        () -> {
-          ImmutableMap.Builder<DialerPhoneNumber, SpamStatus> resultBuilder =
-              new ImmutableMap.Builder<>();
-          for (DialerPhoneNumber dialerPhoneNumber : dialerPhoneNumbers) {
-            resultBuilder.put(
-                dialerPhoneNumber,
-                new SpamStatus() {
-                  @Override
-                  public boolean isSpam() {
-                    return false;
-                  }
-
-                  @Override
-                  public Optional<Long> getTimestampMillis() {
-                    return Optional.absent();
-                  }
-                });
-          }
-          return resultBuilder.build();
-        });
-  }
-
-  @Override
-  public void checkSpamStatus(String number, String countryIso, Listener listener) {
-    listener.onComplete(false);
-  }
-
-  @Override
-  public void checkUserMarkedNonSpamStatus(String number, String countryIso, Listener listener) {
-    listener.onComplete(false);
-  }
-
-  @Override
-  public void checkUserMarkedSpamStatus(String number, String countryIso, Listener listener) {
-    listener.onComplete(false);
-  }
-
-  @Override
-  public void checkGlobalSpamListStatus(String number, String countryIso, Listener listener) {
-    listener.onComplete(false);
-  }
-
-  @Override
-  public boolean checkSpamStatusSynchronous(String number, String countryIso) {
-    return false;
-  }
-
-  @Override
-  public ListenableFuture<Boolean> dataUpdatedSince(long timestampMillis) {
-    return Futures.immediateFuture(false);
-  }
-
-  @Override
-  public void reportSpamFromAfterCallNotification(
-      String number,
-      String countryIso,
-      int callType,
-      ReportingLocation.Type from,
-      ContactLookupResult.Type contactLookupResultType) {}
-
-  @Override
-  public void reportSpamFromCallHistory(
-      String number,
-      String countryIso,
-      int callType,
-      ReportingLocation.Type from,
-      ContactSource.Type contactSourceType) {}
-
-  @Override
-  public void reportNotSpamFromAfterCallNotification(
-      String number,
-      String countryIso,
-      int callType,
-      ReportingLocation.Type from,
-      ContactLookupResult.Type contactLookupResultType) {}
-
-  @Override
-  public void reportNotSpamFromCallHistory(
-      String number,
-      String countryIso,
-      int callType,
-      ReportingLocation.Type from,
-      ContactSource.Type contactSourceType) {}
-}
diff --git a/java/com/android/dialer/spam/StubSpamModule.java b/java/com/android/dialer/spam/StubSpamModule.java
deleted file mode 100644
index 0d3b917..0000000
--- a/java/com/android/dialer/spam/StubSpamModule.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.dialer.spam;
-
-import dagger.Binds;
-import dagger.Module;
-
-/** Module which binds {@link SpamStub}. */
-@Module
-public abstract class StubSpamModule {
-
-  @Binds
-  public abstract Spam bindSpam(SpamStub stub);
-}
diff --git a/java/com/android/dialer/spam/promo/AndroidManifest.xml b/java/com/android/dialer/spam/promo/AndroidManifest.xml
new file mode 100644
index 0000000..7d766b8
--- /dev/null
+++ b/java/com/android/dialer/spam/promo/AndroidManifest.xml
@@ -0,0 +1,19 @@
+<!--
+  ~ Copyright (C) 2018 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+
+<manifest
+    package="com.android.dialer.spam.promo">
+</manifest>
diff --git a/java/com/android/dialer/spam/promo/SpamBlockingPromoDialogFragment.java b/java/com/android/dialer/spam/promo/SpamBlockingPromoDialogFragment.java
new file mode 100644
index 0000000..dbefc52
--- /dev/null
+++ b/java/com/android/dialer/spam/promo/SpamBlockingPromoDialogFragment.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.dialer.spam.promo;
+
+import android.app.Dialog;
+import android.content.DialogInterface;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v4.app.DialogFragment;
+import android.support.v7.app.AlertDialog;
+
+/** Dialog for spam blocking on-boarding promotion. */
+public class SpamBlockingPromoDialogFragment extends DialogFragment {
+
+  public static final String SPAM_BLOCKING_PROMO_DIALOG_TAG = "SpamBlockingPromoDialog";
+
+  /** Called when dialog positive button is pressed. */
+  protected OnEnableListener positiveListener;
+
+  /** Called when the dialog is dismissed. */
+  @Nullable protected DialogInterface.OnDismissListener dismissListener;
+
+  public static DialogFragment newInstance(
+      OnEnableListener positiveListener,
+      @Nullable DialogInterface.OnDismissListener dismissListener) {
+    SpamBlockingPromoDialogFragment fragment = new SpamBlockingPromoDialogFragment();
+    fragment.positiveListener = positiveListener;
+    fragment.dismissListener = dismissListener;
+    return fragment;
+  }
+
+  @Override
+  public void onDismiss(DialogInterface dialog) {
+    if (dismissListener != null) {
+      dismissListener.onDismiss(dialog);
+    }
+    super.onDismiss(dialog);
+  }
+
+  @Override
+  public void onPause() {
+    // The dialog is dismissed onPause, i.e. rotation.
+    dismiss();
+    dismissListener = null;
+    positiveListener = null;
+    super.onPause();
+  }
+
+  @Override
+  public Dialog onCreateDialog(Bundle savedInstanceState) {
+    super.onCreateDialog(savedInstanceState);
+    // Return the newly created dialog
+    return new AlertDialog.Builder(getActivity())
+        .setCancelable(true)
+        .setTitle(R.string.spam_blocking_promo_title)
+        .setMessage(R.string.spam_blocking_promo_text)
+        .setNegativeButton(
+            R.string.spam_blocking_promo_action_dismiss, (dialog, which) -> dismiss())
+        .setPositiveButton(
+            R.string.spam_blocking_promo_action_filter_spam,
+            (dialog, which) -> {
+              dismiss();
+              positiveListener.onClick();
+            })
+        .create();
+  }
+
+  /** Positive listener for spam blocking promotion dialog. */
+  public interface OnEnableListener {
+    /** Called when user clicks on positive button in the spam blocking promo dialog. */
+    void onClick();
+  }
+}
diff --git a/java/com/android/dialer/spam/promo/SpamBlockingPromoHelper.java b/java/com/android/dialer/spam/promo/SpamBlockingPromoHelper.java
new file mode 100644
index 0000000..c270c59
--- /dev/null
+++ b/java/com/android/dialer/spam/promo/SpamBlockingPromoHelper.java
@@ -0,0 +1,207 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.dialer.spam.promo;
+
+import android.annotation.SuppressLint;
+import android.app.Notification;
+import android.app.Notification.Builder;
+import android.app.PendingIntent;
+import android.content.Context;
+import android.content.DialogInterface.OnDismissListener;
+import android.graphics.drawable.Icon;
+import android.support.design.widget.Snackbar;
+import android.support.v4.app.FragmentManager;
+import android.support.v4.os.BuildCompat;
+import android.view.View;
+import android.widget.Toast;
+import com.android.dialer.configprovider.ConfigProviderComponent;
+import com.android.dialer.logging.DialerImpression;
+import com.android.dialer.logging.Logger;
+import com.android.dialer.notification.DialerNotificationManager;
+import com.android.dialer.notification.NotificationChannelId;
+import com.android.dialer.spam.SpamSettings;
+import com.android.dialer.spam.promo.SpamBlockingPromoDialogFragment.OnEnableListener;
+import com.android.dialer.storage.StorageComponent;
+import com.android.dialer.theme.base.ThemeComponent;
+
+/** Helper class for showing spam blocking on-boarding promotions. */
+public class SpamBlockingPromoHelper {
+
+  static final String SPAM_BLOCKING_PROMO_PERIOD_MILLIS = "spam_blocking_promo_period_millis";
+  static final String SPAM_BLOCKING_PROMO_LAST_SHOW_MILLIS = "spam_blocking_promo_last_show_millis";
+  public static final String ENABLE_SPAM_BLOCKING_PROMO = "enable_spam_blocking_promo";
+  public static final String ENABLE_AFTER_CALL_SPAM_BLOCKING_PROMO =
+      "enable_after_call_spam_blocking_promo";
+
+  private final Context context;
+  private final SpamSettings spamSettings;
+
+  public SpamBlockingPromoHelper(Context context, SpamSettings spamSettings) {
+    this.context = context;
+    this.spamSettings = spamSettings;
+  }
+
+  /**
+   * Returns true if we should show a spam blocking promo.
+   *
+   * <p>Should show spam blocking promo only when all of the following criteria meet 1. Spam
+   * blocking promo is enabled by flag. 2. Spam blocking setting is available. 3. Spam blocking
+   * setting is not yet enabled. 4. Time since last spam blocking promo exceeds the threshold.
+   *
+   * @return true if we should show a spam blocking promo.
+   */
+  public boolean shouldShowSpamBlockingPromo() {
+    if (!ConfigProviderComponent.get(context)
+            .getConfigProvider()
+            .getBoolean(ENABLE_SPAM_BLOCKING_PROMO, false)
+        || !spamSettings.isSpamEnabled()
+        || !spamSettings.isSpamBlockingEnabledByFlag()
+        || spamSettings.isSpamBlockingEnabledByUser()) {
+      return false;
+    }
+
+    long lastShowMillis =
+        StorageComponent.get(context)
+            .unencryptedSharedPrefs()
+            .getLong(SPAM_BLOCKING_PROMO_LAST_SHOW_MILLIS, 0);
+    long showPeriodMillis =
+        ConfigProviderComponent.get(context)
+            .getConfigProvider()
+            .getLong(SPAM_BLOCKING_PROMO_PERIOD_MILLIS, Long.MAX_VALUE);
+    return lastShowMillis == 0 || System.currentTimeMillis() - lastShowMillis > showPeriodMillis;
+  }
+
+  /* Returns true if we should show a spam blocking promo in after call notification scenario. */
+  public boolean shouldShowAfterCallSpamBlockingPromo() {
+    return shouldShowSpamBlockingPromo()
+        && ConfigProviderComponent.get(context)
+            .getConfigProvider()
+            .getBoolean(ENABLE_AFTER_CALL_SPAM_BLOCKING_PROMO, false);
+  }
+
+  /**
+   * Shows a spam blocking promo dialog.
+   *
+   * @param fragmentManager the fragment manager to show the dialog.
+   * @param onEnableListener the listener called when enable button is clicked.
+   * @param onDismissListener the listener called when the dialog is dismissed.
+   */
+  public void showSpamBlockingPromoDialog(
+      FragmentManager fragmentManager,
+      OnEnableListener onEnableListener,
+      OnDismissListener onDismissListener) {
+    updateLastShowSpamTimestamp();
+    SpamBlockingPromoDialogFragment.newInstance(onEnableListener, onDismissListener)
+        .show(fragmentManager, SpamBlockingPromoDialogFragment.SPAM_BLOCKING_PROMO_DIALOG_TAG);
+  }
+
+  private void updateLastShowSpamTimestamp() {
+    StorageComponent.get(context)
+        .unencryptedSharedPrefs()
+        .edit()
+        .putLong(SPAM_BLOCKING_PROMO_LAST_SHOW_MILLIS, System.currentTimeMillis())
+        .apply();
+  }
+
+  /**
+   * Shows a modify setting on complete snackbar and a link to redirect to setting page.
+   *
+   * @param view the view to attach on-complete notice snackbar.
+   * @param success whether the modify setting operation succceeds.
+   */
+  public void showModifySettingOnCompleteSnackbar(View view, boolean success) {
+    String snackBarText =
+        success
+            ? context.getString(R.string.spam_blocking_settings_enable_complete_text)
+            : context.getString(R.string.spam_blocking_settings_enable_error_text);
+    Snackbar.make(view, snackBarText, Snackbar.LENGTH_LONG)
+        .setAction(
+            R.string.spam_blocking_setting_prompt,
+            v -> context.startActivity(spamSettings.getSpamBlockingSettingIntent(context)))
+        .setActionTextColor(
+            context.getResources().getColor(R.color.dialer_snackbar_action_text_color))
+        .show();
+  }
+
+  /** Shows a modify setting on complete toast message. */
+  public void showModifySettingOnCompleteToast(boolean success) {
+    String toastText =
+        success
+            ? context.getString(R.string.spam_blocking_settings_enable_complete_text)
+            : context.getString(R.string.spam_blocking_settings_enable_error_text);
+    Toast.makeText(context, toastText, Toast.LENGTH_LONG).show();
+  }
+
+  /**
+   * Shows a spam blocking promo notification.
+   *
+   * @param notificationTag a string identifier for this notification.
+   * @param notificationId an identifier for this notification.
+   * @param contentIntent pending intent to be sent when notification is clicked.
+   * @param actionIntent pending intent to be sent when enable-spam-blocking button is clicked.
+   */
+  public void showSpamBlockingPromoNotification(
+      String notificationTag,
+      int notificationId,
+      PendingIntent contentIntent,
+      PendingIntent actionIntent) {
+    updateLastShowSpamTimestamp();
+    Logger.get(context)
+        .logImpression(DialerImpression.Type.SPAM_BLOCKING_AFTER_CALL_NOTIFICATION_PROMO_SHOWN);
+    DialerNotificationManager.notify(
+        context,
+        notificationTag,
+        notificationId,
+        getSpamBlockingPromoNotification(contentIntent, actionIntent));
+  }
+
+  /**
+   * Builds a spam blocking promo notification with given intents.
+   *
+   * @param contentIntent pending intent to be sent when notification is clicked.
+   * @param actionIntent pending intent to be sent when enable-spam-blocking button is clicked.
+   */
+  @SuppressLint("NewApi")
+  private Notification getSpamBlockingPromoNotification(
+      PendingIntent contentIntent, PendingIntent actionIntent) {
+    Notification.Builder builder =
+        new Builder(context)
+            .setContentIntent(contentIntent)
+            .setCategory(Notification.CATEGORY_STATUS)
+            .setPriority(Notification.PRIORITY_DEFAULT)
+            .setColor(ThemeComponent.get(context).theme().getColorPrimary())
+            .setSmallIcon(R.drawable.quantum_ic_call_vd_theme_24)
+            .setLargeIcon(Icon.createWithResource(context, R.drawable.spam_blocking_promo_icon))
+            .setContentText(context.getString(R.string.spam_blocking_promo_text))
+            .setStyle(
+                new Notification.BigTextStyle()
+                    .bigText(context.getString(R.string.spam_blocking_promo_text)))
+            .addAction(
+                new Notification.Action.Builder(
+                        R.drawable.quantum_ic_block_vd_theme_24,
+                        context.getString(R.string.spam_blocking_promo_action_filter_spam),
+                        actionIntent)
+                    .build())
+            .setContentTitle(context.getString(R.string.spam_blocking_promo_title));
+
+    if (BuildCompat.isAtLeastO()) {
+      builder.setChannelId(NotificationChannelId.DEFAULT);
+    }
+    return builder.build();
+  }
+}
+
diff --git a/java/com/android/dialer/spam/promo/res/drawable/spam_blocking_promo_icon.xml b/java/com/android/dialer/spam/promo/res/drawable/spam_blocking_promo_icon.xml
new file mode 100644
index 0000000..0434004
--- /dev/null
+++ b/java/com/android/dialer/spam/promo/res/drawable/spam_blocking_promo_icon.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~ Copyright (C) 2018 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+
+  <item>
+    <shape android:shape="oval">
+      <!-- Note: Ensure matches incallui and blocking colors. -->
+      <solid android:color="#A52714"/>
+      <size
+          android:height="@android:dimen/notification_large_icon_height"
+          android:width="@android:dimen/notification_large_icon_width"/>
+    </shape>
+  </item>
+
+  <item
+      android:drawable="@drawable/quantum_ic_report_white_36"
+      android:gravity="center"/>
+
+</layer-list>
diff --git a/java/com/android/dialer/spam/promo/res/values-af/strings.xml b/java/com/android/dialer/spam/promo/res/values-af/strings.xml
new file mode 100644
index 0000000..37a210f
--- /dev/null
+++ b/java/com/android/dialer/spam/promo/res/values-af/strings.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_blocking_promo_title">Filtreer alle verdagte strooiposoproepe?</string>
+  <string name="spam_blocking_promo_text">Oproepe soos die een wat jy pas geblokkeer het, sal jou nie meer
+      steur nie</string>
+  <string name="spam_blocking_promo_action_filter_spam">Filtreer strooipos</string>
+  <string name="spam_blocking_promo_action_dismiss">Weier</string>
+  <string name="spam_blocking_setting_prompt">Instellings</string>
+  <string name="spam_blocking_settings_enable_error_text">Sukkel om strooiposfiltrering aan te skakel</string>
+  <string name="spam_blocking_settings_disable_error_text">Sukkel om strooiposfiltrering af te skakel</string>
+  <string name="spam_blocking_settings_enable_complete_text">Strooiposfiltrering is aangeskakel</string>
+  <string name="spam_blocking_settings_disable_complete_text">Strooiposfiltrering is afgeskakel</string>
+</resources>
diff --git a/java/com/android/dialer/spam/promo/res/values-am/strings.xml b/java/com/android/dialer/spam/promo/res/values-am/strings.xml
new file mode 100644
index 0000000..46ff084
--- /dev/null
+++ b/java/com/android/dialer/spam/promo/res/values-am/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_blocking_promo_title">ሁሉንም የተጠረጠሩ አይፈለጌ ጥሪዎችን አጣራ?</string>
+  <string name="spam_blocking_promo_text">አሁን እንዳገዱት ጥሪ አይነት ጥሪዎች ከእንግዲህ ወዲያ አይረብሹዎትም</string>
+  <string name="spam_blocking_promo_action_filter_spam">አይፈለጌ መልዕክትን አጣራ</string>
+  <string name="spam_blocking_promo_action_dismiss">አሰናብት</string>
+  <string name="spam_blocking_setting_prompt">ቅንብሮች</string>
+  <string name="spam_blocking_settings_enable_error_text">አይፈለጌ ማጣራትን በማብራት ላይ ችግር</string>
+  <string name="spam_blocking_settings_disable_error_text">አይፈለጌ ማጣራትን በማብራት ላይ ችግር</string>
+  <string name="spam_blocking_settings_enable_complete_text">የአይፈለጌ መልዕክት ማጣሪያ በርቷል</string>
+  <string name="spam_blocking_settings_disable_complete_text">የአይፈለጌ መልዕክት ማጣሪያ ጠፍቷል</string>
+</resources>
diff --git a/java/com/android/dialer/spam/promo/res/values-ar/strings.xml b/java/com/android/dialer/spam/promo/res/values-ar/strings.xml
new file mode 100644
index 0000000..7e3705f
--- /dev/null
+++ b/java/com/android/dialer/spam/promo/res/values-ar/strings.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_blocking_promo_title">هل تريد تصفية كل المكالمات غير المرغوب فيها؟</string>
+  <string name="spam_blocking_promo_text">لن تزعجك أي مكالمات مثل التي حظرتها لتوك
+      بعد الآن</string>
+  <string name="spam_blocking_promo_action_filter_spam">تصفية المحتوى غير المرغوب فيه</string>
+  <string name="spam_blocking_promo_action_dismiss">رفض</string>
+  <string name="spam_blocking_setting_prompt">الإعدادات</string>
+  <string name="spam_blocking_settings_enable_error_text">حدثت مشكلة أثناء تفعيل تصفية المحتوى غير المرغوب فيه</string>
+  <string name="spam_blocking_settings_disable_error_text">حدثت مشكلة أثناء إيقاف تصفية المحتوى غير المرغوب فيه</string>
+  <string name="spam_blocking_settings_enable_complete_text">تم تفعيل تصفية المحتوى غير المرغوب فيه</string>
+  <string name="spam_blocking_settings_disable_complete_text">تم إيقاف تصفية المحتوى غير المرغوب فيه</string>
+</resources>
diff --git a/java/com/android/dialer/spam/promo/res/values-az/strings.xml b/java/com/android/dialer/spam/promo/res/values-az/strings.xml
new file mode 100644
index 0000000..8faa2fa
--- /dev/null
+++ b/java/com/android/dialer/spam/promo/res/values-az/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_blocking_promo_title">Bütün şübhəli spam zəngləri filtrlənsin?</string>
+  <string name="spam_blocking_promo_text">Yeni blok etdiyiniz kimi zənglər artıq Sizi narahat etməyəcək</string>
+  <string name="spam_blocking_promo_action_filter_spam">Spamı Filtrləyin</string>
+  <string name="spam_blocking_promo_action_dismiss">Kənarlaşdırın</string>
+  <string name="spam_blocking_setting_prompt">Ayarlar</string>
+  <string name="spam_blocking_settings_enable_error_text">Spam filterini aktiv edərkən xəta baş verdi</string>
+  <string name="spam_blocking_settings_disable_error_text">Spam filterini deaktiv edərkən xəta baş verdi</string>
+  <string name="spam_blocking_settings_enable_complete_text">Spam filteri aktivdir</string>
+  <string name="spam_blocking_settings_disable_complete_text">Spam filtri deaktivdir</string>
+</resources>
diff --git a/java/com/android/dialer/spam/promo/res/values-b+sr+Latn/strings.xml b/java/com/android/dialer/spam/promo/res/values-b+sr+Latn/strings.xml
new file mode 100644
index 0000000..8f62f39
--- /dev/null
+++ b/java/com/android/dialer/spam/promo/res/values-b+sr+Latn/strings.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_blocking_promo_title">Želite li da filtrirate sve pozive za koje se sumnja da su nepoželjni?</string>
+  <string name="spam_blocking_promo_text">Pozivi kao što je ovaj koji ste upravo blokirali vas više
+      neće ometati</string>
+  <string name="spam_blocking_promo_action_filter_spam">Filtriraj nepoželjne pozive</string>
+  <string name="spam_blocking_promo_action_dismiss">Odbaci</string>
+  <string name="spam_blocking_setting_prompt">Podešavanja</string>
+  <string name="spam_blocking_settings_enable_error_text">Problem pri uključivanju filtriranja nepoželjnih poziva</string>
+  <string name="spam_blocking_settings_disable_error_text">Problem pri isključivanju filtriranja nepoželjnih poziva</string>
+  <string name="spam_blocking_settings_enable_complete_text">Filtriranje nepoželjnih poziva je uključeno</string>
+  <string name="spam_blocking_settings_disable_complete_text">Filtriranje nepoželjnih poziva je isključeno</string>
+</resources>
diff --git a/java/com/android/dialer/spam/promo/res/values-be/strings.xml b/java/com/android/dialer/spam/promo/res/values-be/strings.xml
new file mode 100644
index 0000000..b6e0655
--- /dev/null
+++ b/java/com/android/dialer/spam/promo/res/values-be/strings.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_blocking_promo_title">Фільтраванне ўсіх выклікаў, якія падазраюцца ў спаме</string>
+  <string name="spam_blocking_promo_text">Выклікі, падобныя на той, які вы заблакіравалі, больш не
+      будуць турбаваць вас</string>
+  <string name="spam_blocking_promo_action_filter_spam">Фільтраваць спам</string>
+  <string name="spam_blocking_promo_action_dismiss">Адхіліць</string>
+  <string name="spam_blocking_setting_prompt">Налады</string>
+  <string name="spam_blocking_settings_enable_error_text">Памылка ўключэння фільтра спама</string>
+  <string name="spam_blocking_settings_disable_error_text">Памылка выключэння фільтра спама</string>
+  <string name="spam_blocking_settings_enable_complete_text">Фільтрацыя спама ўключана</string>
+  <string name="spam_blocking_settings_disable_complete_text">Фільтрацыя спама выключана</string>
+</resources>
diff --git a/java/com/android/dialer/spam/promo/res/values-bg/strings.xml b/java/com/android/dialer/spam/promo/res/values-bg/strings.xml
new file mode 100644
index 0000000..608c5b2
--- /dev/null
+++ b/java/com/android/dialer/spam/promo/res/values-bg/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_blocking_promo_title">Да се филтрират ли всички обаждания, които са възможен спам?</string>
+  <string name="spam_blocking_promo_text">Повече няма да ви безпокоят обаждания като току-що блокираното от вас</string>
+  <string name="spam_blocking_promo_action_filter_spam">Филтриране на спама</string>
+  <string name="spam_blocking_promo_action_dismiss">Отхвърляне</string>
+  <string name="spam_blocking_setting_prompt">Настройки</string>
+  <string name="spam_blocking_settings_enable_error_text">При включването на филтрирането на спама възникна проблем</string>
+  <string name="spam_blocking_settings_disable_error_text">При изключването на филтрирането на спама възникна проблем</string>
+  <string name="spam_blocking_settings_enable_complete_text">Филтрирането на спама е включено</string>
+  <string name="spam_blocking_settings_disable_complete_text">Филтрирането на спама е изключено</string>
+</resources>
diff --git a/java/com/android/dialer/spam/promo/res/values-bn/strings.xml b/java/com/android/dialer/spam/promo/res/values-bn/strings.xml
new file mode 100644
index 0000000..60fc070
--- /dev/null
+++ b/java/com/android/dialer/spam/promo/res/values-bn/strings.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_blocking_promo_title">সন্দেহজনক স্প্যাম কল ফিল্টার করবেন?</string>
+  <string name="spam_blocking_promo_text">আপনি এইমাত্র যে কলটি ব্লক করলেন, সেই ধরনের কল দিয়ে আপনাকে
+      আর বিরক্ত করা হবে না</string>
+  <string name="spam_blocking_promo_action_filter_spam">স্প্যাম ফিল্টার করুন</string>
+  <string name="spam_blocking_promo_action_dismiss">খারিজ</string>
+  <string name="spam_blocking_setting_prompt">সেটিংস</string>
+  <string name="spam_blocking_settings_enable_error_text">স্প্যাম ফিল্টার করার বৈশিষ্ট্য চালু করতে সমস্যা হয়েছে</string>
+  <string name="spam_blocking_settings_disable_error_text">স্প্যাম ফিল্টার করার বৈশিষ্ট্য বন্ধ করতে সমস্যা হয়েছে</string>
+  <string name="spam_blocking_settings_enable_complete_text">স্প্যাম ফিল্টার করার বৈশিষ্ট্য চালু করা হয়েছে</string>
+  <string name="spam_blocking_settings_disable_complete_text">স্প্যাম ফিল্টার করার বৈশিষ্ট্য বন্ধ করা হয়েছে</string>
+</resources>
diff --git a/java/com/android/dialer/spam/promo/res/values-bs/strings.xml b/java/com/android/dialer/spam/promo/res/values-bs/strings.xml
new file mode 100644
index 0000000..495192a
--- /dev/null
+++ b/java/com/android/dialer/spam/promo/res/values-bs/strings.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_blocking_promo_title">Filtrirati sve potencijalne neželjene pozive?</string>
+  <string name="spam_blocking_promo_text">Pozivi, kao što je onaj koji ste upravo blokirali, više vas neće
+      uznemiravati</string>
+  <string name="spam_blocking_promo_action_filter_spam">Filtriranje neželjenih poziva</string>
+  <string name="spam_blocking_promo_action_dismiss">Odbaci</string>
+  <string name="spam_blocking_setting_prompt">Postavke</string>
+  <string name="spam_blocking_settings_enable_error_text">Problem prilikom uključivanja filtriranja neželjenih poziva</string>
+  <string name="spam_blocking_settings_disable_error_text">Problem prilikom isključivanja filtriranja neželjenih poziva</string>
+  <string name="spam_blocking_settings_enable_complete_text">Filtriranje neželjenih poziva je uključeno</string>
+  <string name="spam_blocking_settings_disable_complete_text">Filtriranje neželjenih poziva je isključeno</string>
+</resources>
diff --git a/java/com/android/dialer/spam/promo/res/values-ca/strings.xml b/java/com/android/dialer/spam/promo/res/values-ca/strings.xml
new file mode 100644
index 0000000..2b26129
--- /dev/null
+++ b/java/com/android/dialer/spam/promo/res/values-ca/strings.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_blocking_promo_title">Vols filtrar totes les possibles trucades brossa?</string>
+  <string name="spam_blocking_promo_text">Les trucades com la que acabes de bloquejar ja no
+      t\'interrompran</string>
+  <string name="spam_blocking_promo_action_filter_spam">Filtra les trucades brossa</string>
+  <string name="spam_blocking_promo_action_dismiss">Ignora</string>
+  <string name="spam_blocking_setting_prompt">Configuració</string>
+  <string name="spam_blocking_settings_enable_error_text">S\'ha produït un error en activar el filtre de correu brossa</string>
+  <string name="spam_blocking_settings_disable_error_text">S\'ha produït un error en desactivar el filtre de correu brossa</string>
+  <string name="spam_blocking_settings_enable_complete_text">El filtre de trucades brossa s\'ha activat</string>
+  <string name="spam_blocking_settings_disable_complete_text">El filtre de trucades brossa s\'ha desactivat</string>
+</resources>
diff --git a/java/com/android/dialer/spam/promo/res/values-cs/strings.xml b/java/com/android/dialer/spam/promo/res/values-cs/strings.xml
new file mode 100644
index 0000000..6aa3e79
--- /dev/null
+++ b/java/com/android/dialer/spam/promo/res/values-cs/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_blocking_promo_title">Filtrovat všechny hovory, u kterých je podezření na spam?</string>
+  <string name="spam_blocking_promo_text">Hovory jako ten, který jste právě zablokovali, už vás nebudou rušit</string>
+  <string name="spam_blocking_promo_action_filter_spam">Filtrovat spam</string>
+  <string name="spam_blocking_promo_action_dismiss">Zavřít</string>
+  <string name="spam_blocking_setting_prompt">Nastavení</string>
+  <string name="spam_blocking_settings_enable_error_text">Filtrování spamu se nepodařilo zapnout</string>
+  <string name="spam_blocking_settings_disable_error_text">Filtrování spamu se nepodařilo vypnout</string>
+  <string name="spam_blocking_settings_enable_complete_text">Filtrování spamu je zapnuto</string>
+  <string name="spam_blocking_settings_disable_complete_text">Filtrování spamu je vypnuto</string>
+</resources>
diff --git a/java/com/android/dialer/spam/promo/res/values-da/strings.xml b/java/com/android/dialer/spam/promo/res/values-da/strings.xml
new file mode 100644
index 0000000..2e72e5c
--- /dev/null
+++ b/java/com/android/dialer/spam/promo/res/values-da/strings.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_blocking_promo_title">Vil du filtrere alle formodede spamopkald?</string>
+  <string name="spam_blocking_promo_text">Opkald som det, du netop har blokeret, forstyrrer dig
+      ikke længere</string>
+  <string name="spam_blocking_promo_action_filter_spam">Filtrer spam</string>
+  <string name="spam_blocking_promo_action_dismiss">Afvis</string>
+  <string name="spam_blocking_setting_prompt">Indstillinger</string>
+  <string name="spam_blocking_settings_enable_error_text">Der opstod et problem, da filtrering af spamopkald skulle aktiveres</string>
+  <string name="spam_blocking_settings_disable_error_text">Der opstod et problem, da filtrering af spamopkald skulle deaktiveres</string>
+  <string name="spam_blocking_settings_enable_complete_text">Filtrering af spamopkald blev aktiveret</string>
+  <string name="spam_blocking_settings_disable_complete_text">Filtrering af spamopkald blev deaktiveret</string>
+</resources>
diff --git a/java/com/android/dialer/spam/promo/res/values-de/strings.xml b/java/com/android/dialer/spam/promo/res/values-de/strings.xml
new file mode 100644
index 0000000..1d21d96
--- /dev/null
+++ b/java/com/android/dialer/spam/promo/res/values-de/strings.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_blocking_promo_title">Alle Anrufe bei Verdacht auf Spam herausfiltern?</string>
+  <string name="spam_blocking_promo_text">Anrufe wie der, den du gerade blockiert hast,
+      werden dich in Zukunft nicht mehr stören</string>
+  <string name="spam_blocking_promo_action_filter_spam">Spam herausfiltern</string>
+  <string name="spam_blocking_promo_action_dismiss">Schließen</string>
+  <string name="spam_blocking_setting_prompt">Einstellungen</string>
+  <string name="spam_blocking_settings_enable_error_text">Fehler beim Aktivieren des Spamfilters</string>
+  <string name="spam_blocking_settings_disable_error_text">Fehler beim Deaktivieren des Spamfilters</string>
+  <string name="spam_blocking_settings_enable_complete_text">Spamfilter aktiviert</string>
+  <string name="spam_blocking_settings_disable_complete_text">Spamfilter deaktiviert</string>
+</resources>
diff --git a/java/com/android/dialer/spam/promo/res/values-el/strings.xml b/java/com/android/dialer/spam/promo/res/values-el/strings.xml
new file mode 100644
index 0000000..def1d70
--- /dev/null
+++ b/java/com/android/dialer/spam/promo/res/values-el/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_blocking_promo_title">Φιλτράρισμα όλων των ύποπτων ανεπιθύμητων κλήσεων;</string>
+  <string name="spam_blocking_promo_text">Κλήσεις όπως αυτή που μόλις αποκλείσατε δεν θα σας ενοχλούν πλέον</string>
+  <string name="spam_blocking_promo_action_filter_spam">Φιλτράρισμα ανεπιθύμητων κλήσεων</string>
+  <string name="spam_blocking_promo_action_dismiss">Απόρριψη</string>
+  <string name="spam_blocking_setting_prompt">Ρυθμίσεις</string>
+  <string name="spam_blocking_settings_enable_error_text">Προέκυψε πρόβλημα κατά την ενεργοποίηση του φιλτραρίσματος ανεπιθύμητων μηνυμάτων</string>
+  <string name="spam_blocking_settings_disable_error_text">Προέκυψε πρόβλημα κατά την απενεργοποίηση του φιλτραρίσματος ανεπιθύμητων μηνυμάτων</string>
+  <string name="spam_blocking_settings_enable_complete_text">Το φιλτράρισμα ανεπιθύμητων κλήσεων ενεργοποιήθηκε</string>
+  <string name="spam_blocking_settings_disable_complete_text">Το φιλτράρισμα ανεπιθύμητων κλήσεων απενεργοποιήθηκε</string>
+</resources>
diff --git a/java/com/android/dialer/spam/promo/res/values-en-rAU/strings.xml b/java/com/android/dialer/spam/promo/res/values-en-rAU/strings.xml
new file mode 100644
index 0000000..ab59fce
--- /dev/null
+++ b/java/com/android/dialer/spam/promo/res/values-en-rAU/strings.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_blocking_promo_title">Filter all suspected spam calls?</string>
+  <string name="spam_blocking_promo_text">Calls like the one that you just blocked will no longer
+      disturb you</string>
+  <string name="spam_blocking_promo_action_filter_spam">Filter Spam</string>
+  <string name="spam_blocking_promo_action_dismiss">Dismiss</string>
+  <string name="spam_blocking_setting_prompt">Settings</string>
+  <string name="spam_blocking_settings_enable_error_text">Problem turning on spam filtering</string>
+  <string name="spam_blocking_settings_disable_error_text">Problem turning off spam filtering</string>
+  <string name="spam_blocking_settings_enable_complete_text">Spam filtering turned on</string>
+  <string name="spam_blocking_settings_disable_complete_text">Spam filtering turned off</string>
+</resources>
diff --git a/java/com/android/dialer/spam/promo/res/values-en-rGB/strings.xml b/java/com/android/dialer/spam/promo/res/values-en-rGB/strings.xml
new file mode 100644
index 0000000..ab59fce
--- /dev/null
+++ b/java/com/android/dialer/spam/promo/res/values-en-rGB/strings.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_blocking_promo_title">Filter all suspected spam calls?</string>
+  <string name="spam_blocking_promo_text">Calls like the one that you just blocked will no longer
+      disturb you</string>
+  <string name="spam_blocking_promo_action_filter_spam">Filter Spam</string>
+  <string name="spam_blocking_promo_action_dismiss">Dismiss</string>
+  <string name="spam_blocking_setting_prompt">Settings</string>
+  <string name="spam_blocking_settings_enable_error_text">Problem turning on spam filtering</string>
+  <string name="spam_blocking_settings_disable_error_text">Problem turning off spam filtering</string>
+  <string name="spam_blocking_settings_enable_complete_text">Spam filtering turned on</string>
+  <string name="spam_blocking_settings_disable_complete_text">Spam filtering turned off</string>
+</resources>
diff --git a/java/com/android/dialer/spam/promo/res/values-en-rIN/strings.xml b/java/com/android/dialer/spam/promo/res/values-en-rIN/strings.xml
new file mode 100644
index 0000000..ab59fce
--- /dev/null
+++ b/java/com/android/dialer/spam/promo/res/values-en-rIN/strings.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_blocking_promo_title">Filter all suspected spam calls?</string>
+  <string name="spam_blocking_promo_text">Calls like the one that you just blocked will no longer
+      disturb you</string>
+  <string name="spam_blocking_promo_action_filter_spam">Filter Spam</string>
+  <string name="spam_blocking_promo_action_dismiss">Dismiss</string>
+  <string name="spam_blocking_setting_prompt">Settings</string>
+  <string name="spam_blocking_settings_enable_error_text">Problem turning on spam filtering</string>
+  <string name="spam_blocking_settings_disable_error_text">Problem turning off spam filtering</string>
+  <string name="spam_blocking_settings_enable_complete_text">Spam filtering turned on</string>
+  <string name="spam_blocking_settings_disable_complete_text">Spam filtering turned off</string>
+</resources>
diff --git a/java/com/android/dialer/spam/promo/res/values-es-rUS/strings.xml b/java/com/android/dialer/spam/promo/res/values-es-rUS/strings.xml
new file mode 100644
index 0000000..3144e82
--- /dev/null
+++ b/java/com/android/dialer/spam/promo/res/values-es-rUS/strings.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_blocking_promo_title">¿Quieres filtrar todas las llamadas que se identifiquen como spam?</string>
+  <string name="spam_blocking_promo_text">Las llamadas como la que bloqueaste recién ya no
+      te molestarán</string>
+  <string name="spam_blocking_promo_action_filter_spam">Filtrar spam</string>
+  <string name="spam_blocking_promo_action_dismiss">Descartar</string>
+  <string name="spam_blocking_setting_prompt">Configuración</string>
+  <string name="spam_blocking_settings_enable_error_text">Hubo un problema al activar la opción para filtrar spam</string>
+  <string name="spam_blocking_settings_disable_error_text">Hubo un problema al desactivar la opción para filtrar spam</string>
+  <string name="spam_blocking_settings_enable_complete_text">Se activó la opción para filtrar spam</string>
+  <string name="spam_blocking_settings_disable_complete_text">Se desactivó la opción para filtrar spam</string>
+</resources>
diff --git a/java/com/android/dialer/spam/promo/res/values-es/strings.xml b/java/com/android/dialer/spam/promo/res/values-es/strings.xml
new file mode 100644
index 0000000..163ed85
--- /dev/null
+++ b/java/com/android/dialer/spam/promo/res/values-es/strings.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_blocking_promo_title">¿Quieres filtrar todas las posibles llamadas de spam?</string>
+  <string name="spam_blocking_promo_text">Las llamadas como la que acabas de bloquear ya no te
+      molestarán</string>
+  <string name="spam_blocking_promo_action_filter_spam">Filtrar spam</string>
+  <string name="spam_blocking_promo_action_dismiss">Ignorar</string>
+  <string name="spam_blocking_setting_prompt">Ajustes</string>
+  <string name="spam_blocking_settings_enable_error_text">No se ha podido activar el filtrado de spam</string>
+  <string name="spam_blocking_settings_disable_error_text">No se ha podido desactivar el filtrado de spam</string>
+  <string name="spam_blocking_settings_enable_complete_text">Se ha activado el filtrado de spam</string>
+  <string name="spam_blocking_settings_disable_complete_text">Se ha desactivado el filtrado de spam</string>
+</resources>
diff --git a/java/com/android/dialer/spam/promo/res/values-et/strings.xml b/java/com/android/dialer/spam/promo/res/values-et/strings.xml
new file mode 100644
index 0000000..521f14f
--- /dev/null
+++ b/java/com/android/dialer/spam/promo/res/values-et/strings.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_blocking_promo_title">Kas soovite filtreerida kõik arvatavad rämpskõned?</string>
+  <string name="spam_blocking_promo_text">Hiljuti blokeeritud kõnega sarnased kõned
+      ei häiri teid edaspidi</string>
+  <string name="spam_blocking_promo_action_filter_spam">Filtreeri rämpskõned</string>
+  <string name="spam_blocking_promo_action_dismiss">Loobu</string>
+  <string name="spam_blocking_setting_prompt">Seaded</string>
+  <string name="spam_blocking_settings_enable_error_text">Rämpskõnede filtreerimise sisselülitamisel tekkis probleem</string>
+  <string name="spam_blocking_settings_disable_error_text">Rämpskõnede filtreerimise väljalülitamisel tekkis probleem</string>
+  <string name="spam_blocking_settings_enable_complete_text">Rämpskõnede filtreerimine on sisse lülitatud</string>
+  <string name="spam_blocking_settings_disable_complete_text">Rämpskõnede filtreerimine on välja lülitatud</string>
+</resources>
diff --git a/java/com/android/dialer/spam/promo/res/values-eu/strings.xml b/java/com/android/dialer/spam/promo/res/values-eu/strings.xml
new file mode 100644
index 0000000..94023c0
--- /dev/null
+++ b/java/com/android/dialer/spam/promo/res/values-eu/strings.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_blocking_promo_title">Ustezko spam-dei guztiak iragazi nahi dituzu?</string>
+  <string name="spam_blocking_promo_text">Aurrerantzean, blokeatu berri duzunaren antzeko deiek
+      ez zaituzte molestatuko</string>
+  <string name="spam_blocking_promo_action_filter_spam">Iragazi spama</string>
+  <string name="spam_blocking_promo_action_dismiss">Baztertu</string>
+  <string name="spam_blocking_setting_prompt">Ezarpenak</string>
+  <string name="spam_blocking_settings_enable_error_text">Arazo bat izan da spama iragazteko aukera aktibatzean</string>
+  <string name="spam_blocking_settings_disable_error_text">Arazo bat izan da spama iragazteko aukera desaktibatzean</string>
+  <string name="spam_blocking_settings_enable_complete_text">Aktibatu da spama iragazteko aukera</string>
+  <string name="spam_blocking_settings_disable_complete_text">Desaktibatu da spama iragazteko aukera</string>
+</resources>
diff --git a/java/com/android/dialer/spam/promo/res/values-fa/strings.xml b/java/com/android/dialer/spam/promo/res/values-fa/strings.xml
new file mode 100644
index 0000000..db797c6
--- /dev/null
+++ b/java/com/android/dialer/spam/promo/res/values-fa/strings.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_blocking_promo_title">همه تماس‌های مشکوک به هرزنامه فیلتر شود؟</string>
+  <string name="spam_blocking_promo_text">تماس‌های مشابه تماسی که همین‌حالا مسدود کردید
+      دیگر برای شما مزاحمت ایجاد نخواهند کرد</string>
+  <string name="spam_blocking_promo_action_filter_spam">فیلتر هرزنامه</string>
+  <string name="spam_blocking_promo_action_dismiss">نپذیرفتن</string>
+  <string name="spam_blocking_setting_prompt">تنظیمات</string>
+  <string name="spam_blocking_settings_enable_error_text">مشکل هنگام روشن کردن فیلتر هرزنامه</string>
+  <string name="spam_blocking_settings_disable_error_text">مشکل هنگام خاموش کردن فیلتر هرزنامه</string>
+  <string name="spam_blocking_settings_enable_complete_text">فیلتر هرزنامه فعال است</string>
+  <string name="spam_blocking_settings_disable_complete_text">فیلتر هرزنامه غیرفعال است</string>
+</resources>
diff --git a/java/com/android/dialer/spam/promo/res/values-fi/strings.xml b/java/com/android/dialer/spam/promo/res/values-fi/strings.xml
new file mode 100644
index 0000000..3b85fb0
--- /dev/null
+++ b/java/com/android/dialer/spam/promo/res/values-fi/strings.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_blocking_promo_title">Suodatetaanko kaikki häirikköpuheluilta vaikuttavat puhelut?</string>
+  <string name="spam_blocking_promo_text">Estämäsi kaltaiset puhelut eivät enää
+      häiritse sinua</string>
+  <string name="spam_blocking_promo_action_filter_spam">Suodata häirikköpuhelut</string>
+  <string name="spam_blocking_promo_action_dismiss">Ohita</string>
+  <string name="spam_blocking_setting_prompt">Asetukset</string>
+  <string name="spam_blocking_settings_enable_error_text">Häirikköpuhelujen suodatuksen käyttöönotossa oli ongelma</string>
+  <string name="spam_blocking_settings_disable_error_text">Häirikköpuhelujen suodatuksen poistamisessa käytöstä oli ongelma</string>
+  <string name="spam_blocking_settings_enable_complete_text">Häirikköpuhelujen suodatus päällä</string>
+  <string name="spam_blocking_settings_disable_complete_text">Häirikköpuhelujen suodatus pois päältä</string>
+</resources>
diff --git a/java/com/android/dialer/spam/promo/res/values-fr-rCA/strings.xml b/java/com/android/dialer/spam/promo/res/values-fr-rCA/strings.xml
new file mode 100644
index 0000000..312f7f0
--- /dev/null
+++ b/java/com/android/dialer/spam/promo/res/values-fr-rCA/strings.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_blocking_promo_title">Filtrer tous les appels importuns suspects?</string>
+  <string name="spam_blocking_promo_text">Les appels comme celui que vous venez de bloquer ne vous
+      dérangeront plus</string>
+  <string name="spam_blocking_promo_action_filter_spam">Filtrer les appels importuns</string>
+  <string name="spam_blocking_promo_action_dismiss">Ignorer</string>
+  <string name="spam_blocking_setting_prompt">Paramètres</string>
+  <string name="spam_blocking_settings_enable_error_text">Problème lors de l\'activation du filtrage des appels importuns</string>
+  <string name="spam_blocking_settings_disable_error_text">Problème lors de la désactivation du filtrage des appels importuns</string>
+  <string name="spam_blocking_settings_enable_complete_text">Filtrage des appels importuns activé</string>
+  <string name="spam_blocking_settings_disable_complete_text">Filtrage des appels importuns désactivé</string>
+</resources>
diff --git a/java/com/android/dialer/spam/promo/res/values-fr/strings.xml b/java/com/android/dialer/spam/promo/res/values-fr/strings.xml
new file mode 100644
index 0000000..c6ec5a9
--- /dev/null
+++ b/java/com/android/dialer/spam/promo/res/values-fr/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_blocking_promo_title">Filtrer tous les appels potentiellement indésirables ?</string>
+  <string name="spam_blocking_promo_text">Vous ne serez plus dérangé par des appels similaires à celui que vous venez de bloquer.</string>
+  <string name="spam_blocking_promo_action_filter_spam">Filtrer le spam</string>
+  <string name="spam_blocking_promo_action_dismiss">Ignorer</string>
+  <string name="spam_blocking_setting_prompt">Paramètres</string>
+  <string name="spam_blocking_settings_enable_error_text">Problème lors de l\'activation du fitre antispam</string>
+  <string name="spam_blocking_settings_disable_error_text">Problème lors de la désactivation du filtre antispam</string>
+  <string name="spam_blocking_settings_enable_complete_text">Le filtre antispam est activé</string>
+  <string name="spam_blocking_settings_disable_complete_text">Le filtre antispam est désactivé</string>
+</resources>
diff --git a/java/com/android/dialer/spam/promo/res/values-gl/strings.xml b/java/com/android/dialer/spam/promo/res/values-gl/strings.xml
new file mode 100644
index 0000000..3b3b5df
--- /dev/null
+++ b/java/com/android/dialer/spam/promo/res/values-gl/strings.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_blocking_promo_title">Queres filtrar todas as posibles chamadas de spam?</string>
+  <string name="spam_blocking_promo_text">Xa non te amolarán chamadas como a que
+      acabas de bloquear</string>
+  <string name="spam_blocking_promo_action_filter_spam">Filtrar spam</string>
+  <string name="spam_blocking_promo_action_dismiss">Ignorar</string>
+  <string name="spam_blocking_setting_prompt">Configuración</string>
+  <string name="spam_blocking_settings_enable_error_text">Produciuse un problema ao activar o filtrado de spam</string>
+  <string name="spam_blocking_settings_disable_error_text">Produciuse un problema ao desactivar o filtrado de spam</string>
+  <string name="spam_blocking_settings_enable_complete_text">Activouse o filtrado de spam</string>
+  <string name="spam_blocking_settings_disable_complete_text">Desactivouse o filtrado de spam</string>
+</resources>
diff --git a/java/com/android/dialer/spam/promo/res/values-gu/strings.xml b/java/com/android/dialer/spam/promo/res/values-gu/strings.xml
new file mode 100644
index 0000000..265ecfe
--- /dev/null
+++ b/java/com/android/dialer/spam/promo/res/values-gu/strings.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_blocking_promo_title">બધા શંકાસ્પદ સ્પામ કૉલને ફિલ્ટર કરીએ?</string>
+  <string name="spam_blocking_promo_text">તમે હમણાં જ જે કૉલને બ્લૉક કર્યો છે તેવા કૉલ હવેથી તમારા કામમાં ખલેલ
+      પાડી શકશે નહીં</string>
+  <string name="spam_blocking_promo_action_filter_spam">સ્પામ ફિલ્ટર કરો</string>
+  <string name="spam_blocking_promo_action_dismiss">છોડી દો</string>
+  <string name="spam_blocking_setting_prompt">સેટિંગ</string>
+  <string name="spam_blocking_settings_enable_error_text">સ્પામ ફિલ્ટરિંગને ચાલુ કરવામાં સમસ્યા</string>
+  <string name="spam_blocking_settings_disable_error_text">સ્પામ ફિલ્ટરિંગને બંધ કરવામાં સમસ્યા</string>
+  <string name="spam_blocking_settings_enable_complete_text">સ્પામ ફિલ્ટરિંગ ચાલુ કર્યું</string>
+  <string name="spam_blocking_settings_disable_complete_text">સ્પામ ફિલ્ટરિંગ બંધ કર્યું</string>
+</resources>
diff --git a/java/com/android/dialer/spam/promo/res/values-hi/strings.xml b/java/com/android/dialer/spam/promo/res/values-hi/strings.xml
new file mode 100644
index 0000000..80a98d4
--- /dev/null
+++ b/java/com/android/dialer/spam/promo/res/values-hi/strings.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_blocking_promo_title">सभी संदिग्ध स्पैम कॉल फ़िल्टर करें?</string>
+  <string name="spam_blocking_promo_text">आपने अभी-अभी जिस तरह के कॉल पर रोक लगाई है, वैसे कॉल अब आपको
+      परेशान नहीं करेंगे</string>
+  <string name="spam_blocking_promo_action_filter_spam">स्पैम फ़िल्टर करें</string>
+  <string name="spam_blocking_promo_action_dismiss">खारिज करें</string>
+  <string name="spam_blocking_setting_prompt">सेटिंग</string>
+  <string name="spam_blocking_settings_enable_error_text">स्पैम फ़िल्टर करने की सुविधा चालू करने में समस्या आई</string>
+  <string name="spam_blocking_settings_disable_error_text">स्पैम फ़िल्टर करने की सुविधा बंद करने में समस्या आई</string>
+  <string name="spam_blocking_settings_enable_complete_text">स्पैम फ़िल्टर चालू किया गया</string>
+  <string name="spam_blocking_settings_disable_complete_text">स्पैम फ़िल्टर बंद किया गया</string>
+</resources>
diff --git a/java/com/android/dialer/spam/promo/res/values-hr/strings.xml b/java/com/android/dialer/spam/promo/res/values-hr/strings.xml
new file mode 100644
index 0000000..5ce00b1
--- /dev/null
+++ b/java/com/android/dialer/spam/promo/res/values-hr/strings.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_blocking_promo_title">Želite li filtrirati sve moguće neželjene pozive?</string>
+  <string name="spam_blocking_promo_text">Pozivi kao što je ovaj koji ste upravo blokirali više
+      vas neće ometati</string>
+  <string name="spam_blocking_promo_action_filter_spam">Filtriranje neželjenih poziva</string>
+  <string name="spam_blocking_promo_action_dismiss">Odbaci</string>
+  <string name="spam_blocking_setting_prompt">Postavke</string>
+  <string name="spam_blocking_settings_enable_error_text">Problem pri uključivanju filtriranja neželjenih poziva</string>
+  <string name="spam_blocking_settings_disable_error_text">Problem pri isključivanju filtriranja neželjenih poziva</string>
+  <string name="spam_blocking_settings_enable_complete_text">Filtriranje neželjenih poziva uključeno</string>
+  <string name="spam_blocking_settings_disable_complete_text">Filtriranje neželjenih poziva isključeno</string>
+</resources>
diff --git a/java/com/android/dialer/spam/promo/res/values-hu/strings.xml b/java/com/android/dialer/spam/promo/res/values-hu/strings.xml
new file mode 100644
index 0000000..cdd2c57
--- /dev/null
+++ b/java/com/android/dialer/spam/promo/res/values-hu/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_blocking_promo_title">Ki szeretné szűrni az összes gyanús spamhívást?</string>
+  <string name="spam_blocking_promo_text">Az épp letiltotthoz hasonló hívások nem fogják többet zavarni.</string>
+  <string name="spam_blocking_promo_action_filter_spam">Spamszűrés</string>
+  <string name="spam_blocking_promo_action_dismiss">Bezárás</string>
+  <string name="spam_blocking_setting_prompt">Beállítások</string>
+  <string name="spam_blocking_settings_enable_error_text">Hiba történt a spamszűrés bekapcsolásakor</string>
+  <string name="spam_blocking_settings_disable_error_text">Hiba történt a spamszűrés kikapcsolásakor</string>
+  <string name="spam_blocking_settings_enable_complete_text">Spamszűrés bekapcsolva</string>
+  <string name="spam_blocking_settings_disable_complete_text">Spamszűrés kikapcsolva</string>
+</resources>
diff --git a/java/com/android/dialer/spam/promo/res/values-hy/strings.xml b/java/com/android/dialer/spam/promo/res/values-hy/strings.xml
new file mode 100644
index 0000000..b0fe325
--- /dev/null
+++ b/java/com/android/dialer/spam/promo/res/values-hy/strings.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_blocking_promo_title">Զտե՞լ բոլոր անցանկալի զանգերը</string>
+  <string name="spam_blocking_promo_text">Դուք քիչ առաջ զանգ արգելափակեցիք: Նման զանգերը այլևս ձեզ
+      չեն անհանգստացնի</string>
+  <string name="spam_blocking_promo_action_filter_spam">Զտել սպամը</string>
+  <string name="spam_blocking_promo_action_dismiss">Փակել</string>
+  <string name="spam_blocking_setting_prompt">Կարգավորումներ</string>
+  <string name="spam_blocking_settings_enable_error_text">Չհաջողվեց միացնել սպամի զտումը</string>
+  <string name="spam_blocking_settings_disable_error_text">Չհաջողվեց անջատել սպամի զտումը</string>
+  <string name="spam_blocking_settings_enable_complete_text">Սպապի զտումը միացավ</string>
+  <string name="spam_blocking_settings_disable_complete_text">Սպապի զտումն անջատվեց</string>
+</resources>
diff --git a/java/com/android/dialer/spam/promo/res/values-in/strings.xml b/java/com/android/dialer/spam/promo/res/values-in/strings.xml
new file mode 100644
index 0000000..53e3e7a
--- /dev/null
+++ b/java/com/android/dialer/spam/promo/res/values-in/strings.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_blocking_promo_title">Filter semua panggilan yang diduga spam?</string>
+  <string name="spam_blocking_promo_text">Panggilan seperti yang baru saja diblokir tidak akan lagi
+      mengganggu Anda</string>
+  <string name="spam_blocking_promo_action_filter_spam">Filter Spam</string>
+  <string name="spam_blocking_promo_action_dismiss">Tutup</string>
+  <string name="spam_blocking_setting_prompt">Setelan</string>
+  <string name="spam_blocking_settings_enable_error_text">Masalah saat mengaktifkan pemfilteran spam</string>
+  <string name="spam_blocking_settings_disable_error_text">Masalah saat menonaktifkan pemfilteran spam</string>
+  <string name="spam_blocking_settings_enable_complete_text">Pemfilteran spam diaktifkan</string>
+  <string name="spam_blocking_settings_disable_complete_text">Pemfilteran spam dinonaktifkan</string>
+</resources>
diff --git a/java/com/android/dialer/spam/promo/res/values-is/strings.xml b/java/com/android/dialer/spam/promo/res/values-is/strings.xml
new file mode 100644
index 0000000..b48f100
--- /dev/null
+++ b/java/com/android/dialer/spam/promo/res/values-is/strings.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_blocking_promo_title">Viltu sía út símtöl sem berast úr hugsanlegum ruslnúmerum?</string>
+  <string name="spam_blocking_promo_text">Þú munt ekki lengur fá símtal eins og það
+      sem þú lokaðir á</string>
+  <string name="spam_blocking_promo_action_filter_spam">Sía símtöl úr ruslnúmerum</string>
+  <string name="spam_blocking_promo_action_dismiss">Hunsa</string>
+  <string name="spam_blocking_setting_prompt">Stillingar</string>
+  <string name="spam_blocking_settings_enable_error_text">Villa við að kveikja á síun símtala úr ruslnúmerum</string>
+  <string name="spam_blocking_settings_disable_error_text">Villa við að slökkva á síun símtala úr ruslnúmerum</string>
+  <string name="spam_blocking_settings_enable_complete_text">Kveikt á síun símtala úr ruslnúmerum</string>
+  <string name="spam_blocking_settings_disable_complete_text">Slökkt á síun símtala úr ruslnúmerum</string>
+</resources>
diff --git a/java/com/android/dialer/spam/promo/res/values-it/strings.xml b/java/com/android/dialer/spam/promo/res/values-it/strings.xml
new file mode 100644
index 0000000..e882f7b
--- /dev/null
+++ b/java/com/android/dialer/spam/promo/res/values-it/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_blocking_promo_title">Filtrare tutte le chiamate di presunto spam?</string>
+  <string name="spam_blocking_promo_text">Le chiamate come quella che hai appena bloccato non ti disturberanno più</string>
+  <string name="spam_blocking_promo_action_filter_spam">Filtro antispam</string>
+  <string name="spam_blocking_promo_action_dismiss">Ignora</string>
+  <string name="spam_blocking_setting_prompt">Impostazioni</string>
+  <string name="spam_blocking_settings_enable_error_text">Errore durante l\'attivazione del filtro antispam</string>
+  <string name="spam_blocking_settings_disable_error_text">Errore durante la disattivazione del filtro antispam</string>
+  <string name="spam_blocking_settings_enable_complete_text">Filtro antispam attivato</string>
+  <string name="spam_blocking_settings_disable_complete_text">Filtro antispam disattivato</string>
+</resources>
diff --git a/java/com/android/dialer/spam/promo/res/values-iw/strings.xml b/java/com/android/dialer/spam/promo/res/values-iw/strings.xml
new file mode 100644
index 0000000..76caf27
--- /dev/null
+++ b/java/com/android/dialer/spam/promo/res/values-iw/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_blocking_promo_title">רוצה לסנן את כל השיחות שחשודות כספאם?</string>
+  <string name="spam_blocking_promo_text">שיחות כמו השיחה שחסמת לא יטרידו אותך יותר.</string>
+  <string name="spam_blocking_promo_action_filter_spam">סינון ספאם</string>
+  <string name="spam_blocking_promo_action_dismiss">סגירה</string>
+  <string name="spam_blocking_setting_prompt">הגדרות</string>
+  <string name="spam_blocking_settings_enable_error_text">הייתה בעיה בהפעלת הסינון של שיחות ספאם</string>
+  <string name="spam_blocking_settings_disable_error_text">הייתה בעיה בהשבתת הסינון של שיחות ספאם</string>
+  <string name="spam_blocking_settings_enable_complete_text">סינון הספאם הופעל</string>
+  <string name="spam_blocking_settings_disable_complete_text">סינון הספאם הושבת</string>
+</resources>
diff --git a/java/com/android/dialer/spam/promo/res/values-ja/strings.xml b/java/com/android/dialer/spam/promo/res/values-ja/strings.xml
new file mode 100644
index 0000000..7e517b4
--- /dev/null
+++ b/java/com/android/dialer/spam/promo/res/values-ja/strings.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_blocking_promo_title">迷惑電話の疑いがある通話をすべてブロックしますか？</string>
+  <string name="spam_blocking_promo_text">迷惑電話の疑いがある通話はすべて
+      ブロックされます</string>
+  <string name="spam_blocking_promo_action_filter_spam">迷惑電話をフィルタリング</string>
+  <string name="spam_blocking_promo_action_dismiss">閉じる</string>
+  <string name="spam_blocking_setting_prompt">設定</string>
+  <string name="spam_blocking_settings_enable_error_text">迷惑電話のブロックを ON にできませんでした</string>
+  <string name="spam_blocking_settings_disable_error_text">迷惑電話のブロックを OFF にできませんでした</string>
+  <string name="spam_blocking_settings_enable_complete_text">迷惑電話のフィルタリングを ON にしました</string>
+  <string name="spam_blocking_settings_disable_complete_text">迷惑電話のフィルタリングを OFF にしました</string>
+</resources>
diff --git a/java/com/android/dialer/spam/promo/res/values-ka/strings.xml b/java/com/android/dialer/spam/promo/res/values-ka/strings.xml
new file mode 100644
index 0000000..4452f99
--- /dev/null
+++ b/java/com/android/dialer/spam/promo/res/values-ka/strings.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_blocking_promo_title">გსურთ ყველა სავარაუდოდ სპამი ზარის გაფილტვრა?</string>
+  <string name="spam_blocking_promo_text">ისეთი ზარები, როგორიც ახლახან დაბლოკეთ, აღარ
+      შეგაწუხებთ</string>
+  <string name="spam_blocking_promo_action_filter_spam">სპამის გაფილტვრა</string>
+  <string name="spam_blocking_promo_action_dismiss">დახურვა</string>
+  <string name="spam_blocking_setting_prompt">პარამეტრები</string>
+  <string name="spam_blocking_settings_enable_error_text">სპამის გაფილტვრის ჩართვისას წარმოიშვა პრობლემა</string>
+  <string name="spam_blocking_settings_disable_error_text">სპამის გაფილტვრის გამორთვისას წარმოიშვა პრობლემა</string>
+  <string name="spam_blocking_settings_enable_complete_text">სპამის გაფილტვრა ჩართულია</string>
+  <string name="spam_blocking_settings_disable_complete_text">სპამის გაფილტვრა გამორთულია</string>
+</resources>
diff --git a/java/com/android/dialer/spam/promo/res/values-kk/strings.xml b/java/com/android/dialer/spam/promo/res/values-kk/strings.xml
new file mode 100644
index 0000000..5a73b4f
--- /dev/null
+++ b/java/com/android/dialer/spam/promo/res/values-kk/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_blocking_promo_title">Барлық күдікті спам қоңырауларды сүзу қажет пе?</string>
+  <string name="spam_blocking_promo_text">Осы сияқты бөгелген қоңыраулар енді мазаңызды алмайды</string>
+  <string name="spam_blocking_promo_action_filter_spam">Спам сүзу</string>
+  <string name="spam_blocking_promo_action_dismiss">Жабу</string>
+  <string name="spam_blocking_setting_prompt">Параметрлер</string>
+  <string name="spam_blocking_settings_enable_error_text">Спам сүзгісі қосылмады</string>
+  <string name="spam_blocking_settings_disable_error_text">Спам сүзгісі өшірілмеді</string>
+  <string name="spam_blocking_settings_enable_complete_text">Спам сүзгісі қосылды</string>
+  <string name="spam_blocking_settings_disable_complete_text">Спам сүзгісі өшірілді</string>
+</resources>
diff --git a/java/com/android/dialer/spam/promo/res/values-km/strings.xml b/java/com/android/dialer/spam/promo/res/values-km/strings.xml
new file mode 100644
index 0000000..ec3ca45
--- /dev/null
+++ b/java/com/android/dialer/spam/promo/res/values-km/strings.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_blocking_promo_title">ត្រង​ការហៅទូរសព្ទ​​​ឥតបាន​ការ​ដែល​សង្ស័យ​ទាំងអស់​ដែរ​ឬ​ទេ?</string>
+  <string name="spam_blocking_promo_text">ការហៅ​ទូរសព្ទ​ដូច​ការហៅដែល​អ្នក​ទើបបាន​ទប់ស្កាត់​នឹង​លែង
+      រំខាន​អ្នក​ទៀត​ហើយ</string>
+  <string name="spam_blocking_promo_action_filter_spam">តម្រង​សារ​ឥត​បានការ</string>
+  <string name="spam_blocking_promo_action_dismiss">បដិសេធ</string>
+  <string name="spam_blocking_setting_prompt">ការកំណត់</string>
+  <string name="spam_blocking_settings_enable_error_text">មាន​បញ្ហា​ក្នុង​ការបើក​តម្រង​ការហៅ​ឥត​បានការ</string>
+  <string name="spam_blocking_settings_disable_error_text">មាន​បញ្ហា​បិទ​តម្រង​ការហៅ​ឥត​បានការ</string>
+  <string name="spam_blocking_settings_enable_complete_text">បាន​បើក​​តម្រង​ការហៅ​ឥត​បានការ</string>
+  <string name="spam_blocking_settings_disable_complete_text">បាន​បិទ​តម្រង​ការហៅ​ឥត​​បានការ</string>
+</resources>
diff --git a/java/com/android/dialer/spam/promo/res/values-kn/strings.xml b/java/com/android/dialer/spam/promo/res/values-kn/strings.xml
new file mode 100644
index 0000000..bde9a45
--- /dev/null
+++ b/java/com/android/dialer/spam/promo/res/values-kn/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_blocking_promo_title">ಶಂಕಿತ ಸ್ಪ್ಯಾಮ್ ಕರೆಗಳನ್ನು ಫಿಲ್ಟರ್‌ ಮಾಡುವುದೇ?</string>
+  <string name="spam_blocking_promo_text">ನೀವು ನಿರ್ಬಂಧಿಸಿದಂತಹ ಕರೆಗಳು ಇನ್ನು ಮುಂದೆ ನಿಮಗೆ ತೊಂದರೆ ಉಂಟು ಮಾಡುವುದಿಲ್ಲ</string>
+  <string name="spam_blocking_promo_action_filter_spam">ಸ್ಪ್ಯಾಮ್‌ ಫಿಲ್ಟರ್‌</string>
+  <string name="spam_blocking_promo_action_dismiss">ವಜಾಗೊಳಿಸಿ</string>
+  <string name="spam_blocking_setting_prompt">ಸೆಟ್ಟಿಂಗ್‌ಗಳು</string>
+  <string name="spam_blocking_settings_enable_error_text">ಸ್ಪ್ಯಾಮ್ ಫಿಲ್ಟರಿಂಗ್‌ ಆನ್ ಮಾಡುವಲ್ಲಿ ಸಮಸ್ಯೆ ಎದುರಾಗಿದೆ</string>
+  <string name="spam_blocking_settings_disable_error_text">ಸ್ಪ್ಯಾಮ್ ಫಿಲ್ಟರಿಂಗ್‌ ಆಫ್ ಮಾಡುವಲ್ಲಿ ಸಮಸ್ಯೆ ಎದುರಾಗಿದೆ</string>
+  <string name="spam_blocking_settings_enable_complete_text">ಸ್ಪ್ಯಾಮ್ ಫಿಲ್ಟರಿಂಗ್ ಆನ್ ಮಾಡಲಾಗಿದೆ</string>
+  <string name="spam_blocking_settings_disable_complete_text">ಸ್ಪ್ಯಾಮ್ ಫಿಲ್ಟರಿಂಗ್ ಆಫ್ ಮಾಡಲಾಗಿದೆ</string>
+</resources>
diff --git a/java/com/android/dialer/spam/promo/res/values-ko/strings.xml b/java/com/android/dialer/spam/promo/res/values-ko/strings.xml
new file mode 100644
index 0000000..b6effac
--- /dev/null
+++ b/java/com/android/dialer/spam/promo/res/values-ko/strings.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_blocking_promo_title">의심스러운 스팸 통화를 모두 필터링하시겠습니까?</string>
+  <string name="spam_blocking_promo_text">방금 차단한 통화와 같은 스팸 통화를
+      더 이상 받지 않게 됩니다.</string>
+  <string name="spam_blocking_promo_action_filter_spam">스팸 필터링</string>
+  <string name="spam_blocking_promo_action_dismiss">닫기</string>
+  <string name="spam_blocking_setting_prompt">설정</string>
+  <string name="spam_blocking_settings_enable_error_text">스팸 필터링을 켜는 중에 문제가 발생했습니다.</string>
+  <string name="spam_blocking_settings_disable_error_text">스팸 필터링을 끄는 중에 문제가 발생했습니다.</string>
+  <string name="spam_blocking_settings_enable_complete_text">스팸 필터링이 켜짐</string>
+  <string name="spam_blocking_settings_disable_complete_text">스팸 필터링이 꺼짐</string>
+</resources>
diff --git a/java/com/android/dialer/spam/promo/res/values-ky/strings.xml b/java/com/android/dialer/spam/promo/res/values-ky/strings.xml
new file mode 100644
index 0000000..4f3cd6f
--- /dev/null
+++ b/java/com/android/dialer/spam/promo/res/values-ky/strings.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_blocking_promo_title">Бардык шектүү спам чалуулар чыпкалансынбы?</string>
+  <string name="spam_blocking_promo_text">Сиз азыр эле бөгөттөгөн чалууга окшош чалуулар мындан ары
+      тынчыңызды албайт</string>
+  <string name="spam_blocking_promo_action_filter_spam">Спамды чыпкалоо</string>
+  <string name="spam_blocking_promo_action_dismiss">Жабуу</string>
+  <string name="spam_blocking_setting_prompt">Жөндөөлөр</string>
+  <string name="spam_blocking_settings_enable_error_text">Спамдын чыпкасын күйгүзүүдө көйгөй келип чыкты</string>
+  <string name="spam_blocking_settings_disable_error_text">Спамдын чыпкасын өчүрүүдө көйгөй келип чыкты</string>
+  <string name="spam_blocking_settings_enable_complete_text">Спам чыпкасы күйгүзүлдү</string>
+  <string name="spam_blocking_settings_disable_complete_text">Спам чыпкасы өчүрүлдү</string>
+</resources>
diff --git a/java/com/android/dialer/spam/promo/res/values-lo/strings.xml b/java/com/android/dialer/spam/promo/res/values-lo/strings.xml
new file mode 100644
index 0000000..298ecae
--- /dev/null
+++ b/java/com/android/dialer/spam/promo/res/values-lo/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_blocking_promo_title">ກັ່ນຕອງສາຍທີ່ສົງໄສວ່າເປັນສະແປມທັງໝົດບໍ?</string>
+  <string name="spam_blocking_promo_text">ສາຍແບບດຽວກັບທີ່ທ່ານຫາກໍບລັອກໄປຈະບໍ່ສາມາດລົບກວນທ່ານໄດ້ອີກ.</string>
+  <string name="spam_blocking_promo_action_filter_spam">ກັ່ນຕອງສະແປມ</string>
+  <string name="spam_blocking_promo_action_dismiss">ປິດໄວ້</string>
+  <string name="spam_blocking_setting_prompt">ການຕັ້ງຄ່າ</string>
+  <string name="spam_blocking_settings_enable_error_text">ເກີດບັນຫາໃນການເປີດຕົວກັ່ນຕອງສະແປມ</string>
+  <string name="spam_blocking_settings_disable_error_text">ເກີດບັນຫາໃນການປິດຕົວກັ່ນຕອງສະແປມ</string>
+  <string name="spam_blocking_settings_enable_complete_text">ເປີດຕົວກັ່ນຕອງສະແປມແລ້ວ</string>
+  <string name="spam_blocking_settings_disable_complete_text">ປິດຕົວກັ່ນຕອງສະແປມແລ້ວ</string>
+</resources>
diff --git a/java/com/android/dialer/spam/promo/res/values-lt/strings.xml b/java/com/android/dialer/spam/promo/res/values-lt/strings.xml
new file mode 100644
index 0000000..d3d9cdc
--- /dev/null
+++ b/java/com/android/dialer/spam/promo/res/values-lt/strings.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_blocking_promo_title">Filtruoti visus įtartinus šlamšto skambučius?</string>
+  <string name="spam_blocking_promo_text">Tokie skambučiai kaip ką tik užblokuotas
+      nebetrukdys jums</string>
+  <string name="spam_blocking_promo_action_filter_spam">Filtruoti šlamštą</string>
+  <string name="spam_blocking_promo_action_dismiss">Atsisakyti</string>
+  <string name="spam_blocking_setting_prompt">Nustatymai</string>
+  <string name="spam_blocking_settings_enable_error_text">Įjungiant šlamšto filtravimą kilo problema</string>
+  <string name="spam_blocking_settings_disable_error_text">Išjungiant šlamšto filtravimą kilo problema</string>
+  <string name="spam_blocking_settings_enable_complete_text">Šlamšto filtravimas įjungtas</string>
+  <string name="spam_blocking_settings_disable_complete_text">Šlamšto filtravimas išjungtas</string>
+</resources>
diff --git a/java/com/android/dialer/spam/promo/res/values-lv/strings.xml b/java/com/android/dialer/spam/promo/res/values-lv/strings.xml
new file mode 100644
index 0000000..9d0aafa
--- /dev/null
+++ b/java/com/android/dialer/spam/promo/res/values-lv/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_blocking_promo_title">Vai filtrēt visus aizdomīgos nevēlamos zvanus?</string>
+  <string name="spam_blocking_promo_text">Jūs vairs netraucēs tādi zvani kā zvans, ko tikko bloķējāt.</string>
+  <string name="spam_blocking_promo_action_filter_spam">Filtrēt nevēlamus zvanus</string>
+  <string name="spam_blocking_promo_action_dismiss">Nerādīt</string>
+  <string name="spam_blocking_setting_prompt">Iestatījumi</string>
+  <string name="spam_blocking_settings_enable_error_text">Ieslēdzot nevēlamu zvanu filtrēšanu, radās problēma.</string>
+  <string name="spam_blocking_settings_disable_error_text">Izslēdzot nevēlamu zvanu filtrēšanu, radās problēma.</string>
+  <string name="spam_blocking_settings_enable_complete_text">Nevēlamu zvanu filtrēšana ieslēgta</string>
+  <string name="spam_blocking_settings_disable_complete_text">Nevēlamu zvanu filtrēšana izslēgta</string>
+</resources>
diff --git a/java/com/android/dialer/spam/promo/res/values-mk/strings.xml b/java/com/android/dialer/spam/promo/res/values-mk/strings.xml
new file mode 100644
index 0000000..457039a
--- /dev/null
+++ b/java/com/android/dialer/spam/promo/res/values-mk/strings.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_blocking_promo_title">Да се филтрираат сите повици што може да се спам?</string>
+  <string name="spam_blocking_promo_text">Повици како оној што го блокиравте веќе нема
+      да ве вознемируваат</string>
+  <string name="spam_blocking_promo_action_filter_spam">Филтрирање спам</string>
+  <string name="spam_blocking_promo_action_dismiss">Отфрли</string>
+  <string name="spam_blocking_setting_prompt">Поставки</string>
+  <string name="spam_blocking_settings_enable_error_text">Проблем при вклучување филтрирање спам</string>
+  <string name="spam_blocking_settings_disable_error_text">Проблем при исклучување филтрирање спам</string>
+  <string name="spam_blocking_settings_enable_complete_text">Филтрирањето спам е вклучено</string>
+  <string name="spam_blocking_settings_disable_complete_text">Филтрирањето спам е исклучено</string>
+</resources>
diff --git a/java/com/android/dialer/spam/promo/res/values-ml/strings.xml b/java/com/android/dialer/spam/promo/res/values-ml/strings.xml
new file mode 100644
index 0000000..c76754a
--- /dev/null
+++ b/java/com/android/dialer/spam/promo/res/values-ml/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_blocking_promo_title">എല്ലാ സംശയാസ്‌പദമായ സ്‌പാം കോളുകളും ഫിൽട്ടർ ചെയ്യണോ?</string>
+  <string name="spam_blocking_promo_text">നിങ്ങൾ ഇപ്പോൾ ബ്ലോക്ക് ചെയ്‌ത പോലുള്ള കോളുകൾ ഇനി നിങ്ങളെ ശല്യപ്പെടുത്തില്ല</string>
+  <string name="spam_blocking_promo_action_filter_spam">സ്‌പാം ഫിൽട്ടർ ചെയ്യുക</string>
+  <string name="spam_blocking_promo_action_dismiss">ഒഴിവാക്കുക</string>
+  <string name="spam_blocking_setting_prompt">ക്രമീകരണം</string>
+  <string name="spam_blocking_settings_enable_error_text">സ്‌പാം ഫിൽട്ടർ ചെയ്യൽ ഓണാക്കുന്നതിൽ പ്രശ്‌നം</string>
+  <string name="spam_blocking_settings_disable_error_text">സ്‌പാം ഫിൽട്ടർ ചെയ്യൽ ഓഫാക്കുന്നതിൽ പ്രശ്‌നം</string>
+  <string name="spam_blocking_settings_enable_complete_text">സ്‌പാം ഫിൽട്ടർ ചെയ്യൽ ഓണാക്കി</string>
+  <string name="spam_blocking_settings_disable_complete_text">സ്‌പാം ഫിൽട്ടർ ചെയ്യൽ ഓഫാക്കി</string>
+</resources>
diff --git a/java/com/android/dialer/spam/promo/res/values-mn/strings.xml b/java/com/android/dialer/spam/promo/res/values-mn/strings.xml
new file mode 100644
index 0000000..1acdb00
--- /dev/null
+++ b/java/com/android/dialer/spam/promo/res/values-mn/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_blocking_promo_title">Бүх сэжигтэй спам дуудлагыг шүүх үү?</string>
+  <string name="spam_blocking_promo_text">Таны саяхан блоклосон иймэрхүү дуудлагууд танд цаашид саад болохгүй</string>
+  <string name="spam_blocking_promo_action_filter_spam">Спам шүүлтүүрдэх</string>
+  <string name="spam_blocking_promo_action_dismiss">Хаах</string>
+  <string name="spam_blocking_setting_prompt">Тохиргоо</string>
+  <string name="spam_blocking_settings_enable_error_text">Спамийн шүүлтүүрийг асаахад асуудал гарсан</string>
+  <string name="spam_blocking_settings_disable_error_text">Спамийн шүүлтүүрийг унтраахад асуудал гарсан</string>
+  <string name="spam_blocking_settings_enable_complete_text">Спамын шүүлтүүрийг асаасан</string>
+  <string name="spam_blocking_settings_disable_complete_text">Спамын шүүлтүүрийг унтраасан</string>
+</resources>
diff --git a/java/com/android/dialer/spam/promo/res/values-mr/strings.xml b/java/com/android/dialer/spam/promo/res/values-mr/strings.xml
new file mode 100644
index 0000000..3f2bee5
--- /dev/null
+++ b/java/com/android/dialer/spam/promo/res/values-mr/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_blocking_promo_title">सर्व संशयित स्पॅम कॉल फिल्टर करायचे?</string>
+  <string name="spam_blocking_promo_text">तुम्ही आत्ताच ब्लॉक केलेल्या सारखे कॉल तुम्हाला अडथळा आणणार नाहीत</string>
+  <string name="spam_blocking_promo_action_filter_spam">स्पॅम फिल्टर करा</string>
+  <string name="spam_blocking_promo_action_dismiss">डिसमिस करा</string>
+  <string name="spam_blocking_setting_prompt">सेटिंग्ज</string>
+  <string name="spam_blocking_settings_enable_error_text">स्‍पॅम फिल्‍टरिंग सुरू करण्‍यात समस्‍या</string>
+  <string name="spam_blocking_settings_disable_error_text">स्‍पॅम फिल्‍टरिंग बंद करण्‍यात समस्‍या</string>
+  <string name="spam_blocking_settings_enable_complete_text">स्पॅम फिल्टरिंग चालू केलेले आहे</string>
+  <string name="spam_blocking_settings_disable_complete_text">स्पॅम फिल्टरिंग बंद केलेले आहे</string>
+</resources>
diff --git a/java/com/android/dialer/spam/promo/res/values-ms/strings.xml b/java/com/android/dialer/spam/promo/res/values-ms/strings.xml
new file mode 100644
index 0000000..28a51da
--- /dev/null
+++ b/java/com/android/dialer/spam/promo/res/values-ms/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_blocking_promo_title">Tapis semua panggilan yang disyaki spam?</string>
+  <string name="spam_blocking_promo_text">Panggilan seperti yang baru sahaja anda sekat tidak akan mengganggu anda lagi</string>
+  <string name="spam_blocking_promo_action_filter_spam">Tapis Spam</string>
+  <string name="spam_blocking_promo_action_dismiss">Ketepikan</string>
+  <string name="spam_blocking_setting_prompt">Tetapan</string>
+  <string name="spam_blocking_settings_enable_error_text">Masalah semasa menghidupkan penapisan spam</string>
+  <string name="spam_blocking_settings_disable_error_text">Masalah semasa mematikan penapisan spam</string>
+  <string name="spam_blocking_settings_enable_complete_text">Penapisan spam dihidupkan</string>
+  <string name="spam_blocking_settings_disable_complete_text">Penapisan spam dimatikan</string>
+</resources>
diff --git a/java/com/android/dialer/spam/promo/res/values-my/strings.xml b/java/com/android/dialer/spam/promo/res/values-my/strings.xml
new file mode 100644
index 0000000..641e814
--- /dev/null
+++ b/java/com/android/dialer/spam/promo/res/values-my/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_blocking_promo_title">သံသယဖြစ်ဖွဘ် စပမ်းခေါ်ဆိုမှုအားလုံးကို စစ်ထုတ်မလား။</string>
+  <string name="spam_blocking_promo_text">သင်ပိတ်ထားသော ခေါ်ဆိုမှုများသည် သင့်အား အနှောင့်အယှက် ပေးတော့မည်မဟုတ်ပါ</string>
+  <string name="spam_blocking_promo_action_filter_spam">စပမ်းကို စစ်ထုတ်ရန်</string>
+  <string name="spam_blocking_promo_action_dismiss">ပယ်ရန်</string>
+  <string name="spam_blocking_setting_prompt">ဆက်တင်များ</string>
+  <string name="spam_blocking_settings_enable_error_text">စပမ်းစစ်ထုတ်ခြင်းကို ဖွင့်ရာတွင် အခက်အခဲရှိပါသည်</string>
+  <string name="spam_blocking_settings_disable_error_text">စပမ်းစစ်ထုတ်ခြင်းကို ပိတ်ရာတွင် အခက်အခဲရှိပါသည်</string>
+  <string name="spam_blocking_settings_enable_complete_text">စပမ်းစစ်ထုတ်ခြင်းကို ဖွင့်လိုက်ပါပြီ</string>
+  <string name="spam_blocking_settings_disable_complete_text">စပမ်းစစ်ထုတ်ခြင်းကို ပိတ်လိုက်ပါပြီ</string>
+</resources>
diff --git a/java/com/android/dialer/spam/promo/res/values-nb/strings.xml b/java/com/android/dialer/spam/promo/res/values-nb/strings.xml
new file mode 100644
index 0000000..a0b645b
--- /dev/null
+++ b/java/com/android/dialer/spam/promo/res/values-nb/strings.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_blocking_promo_title">Vil du filtrere alle potensielt useriøse anrop?</string>
+  <string name="spam_blocking_promo_text">Anrop som det du akkurat har blokkert, kommer ikke til
+      å forstyrre deg lenger</string>
+  <string name="spam_blocking_promo_action_filter_spam">Filtrér useriøse anrop</string>
+  <string name="spam_blocking_promo_action_dismiss">Lukk</string>
+  <string name="spam_blocking_setting_prompt">Innstillinger</string>
+  <string name="spam_blocking_settings_enable_error_text">Det oppsto problemer da filtrering av useriøse anrop skulle slås på</string>
+  <string name="spam_blocking_settings_disable_error_text">Det oppsto problemer da filtrering av useriøse anrop skulle slås av</string>
+  <string name="spam_blocking_settings_enable_complete_text">Filtrering av useriøse anrop er slått på</string>
+  <string name="spam_blocking_settings_disable_complete_text">Filtrering av useriøse anrop er slått av</string>
+</resources>
diff --git a/java/com/android/dialer/spam/promo/res/values-ne/strings.xml b/java/com/android/dialer/spam/promo/res/values-ne/strings.xml
new file mode 100644
index 0000000..629b97c
--- /dev/null
+++ b/java/com/android/dialer/spam/promo/res/values-ne/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_blocking_promo_title">सबै शङ्कास्पद स्प्याम कलहरूलाई फिल्टर गर्ने हो?</string>
+  <string name="spam_blocking_promo_text">तपाईंले भर्खरै रोक लगाउनुभएका जस्ता कलहरूले तपाईंलाई अब उप्रान्त बाधा पुऱ्याउने छैनन्</string>
+  <string name="spam_blocking_promo_action_filter_spam">स्प्यामलाई फिल्टर गर्नुहोस्</string>
+  <string name="spam_blocking_promo_action_dismiss">खारेज गर्नुहोस्</string>
+  <string name="spam_blocking_setting_prompt">सेटिङहरू</string>
+  <string name="spam_blocking_settings_enable_error_text">स्प्यामलाई फिल्टर गर्ने सुविधा सक्रिय गर्दा समस्या भयो</string>
+  <string name="spam_blocking_settings_disable_error_text">स्प्याम फिल्टर गर्ने सुविधा निष्क्रिय पार्दा समस्या भयो</string>
+  <string name="spam_blocking_settings_enable_complete_text">स्प्याम फिल्टर गर्ने सुविधा सक्रिय गरियो</string>
+  <string name="spam_blocking_settings_disable_complete_text">स्प्याम फिल्टर गर्ने सुविधा निष्क्रिय पारियो</string>
+</resources>
diff --git a/java/com/android/dialer/spam/promo/res/values-nl/strings.xml b/java/com/android/dialer/spam/promo/res/values-nl/strings.xml
new file mode 100644
index 0000000..498fb53
--- /dev/null
+++ b/java/com/android/dialer/spam/promo/res/values-nl/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_blocking_promo_title">Alle vermoedelijke spamoproepen filteren?</string>
+  <string name="spam_blocking_promo_text">Je wordt niet meer gestoord door oproepen zoals de oproep die je net hebt geblokkeerd</string>
+  <string name="spam_blocking_promo_action_filter_spam">Spam filteren</string>
+  <string name="spam_blocking_promo_action_dismiss">Sluiten</string>
+  <string name="spam_blocking_setting_prompt">Instellingen</string>
+  <string name="spam_blocking_settings_enable_error_text">Probleem bij inschakelen van spamfilters</string>
+  <string name="spam_blocking_settings_disable_error_text">Probleem bij uitschakelen van spamfilters</string>
+  <string name="spam_blocking_settings_enable_complete_text">Spamfilter ingeschakeld</string>
+  <string name="spam_blocking_settings_disable_complete_text">Spamfilter uitgeschakeld</string>
+</resources>
diff --git a/java/com/android/dialer/spam/promo/res/values-no/strings.xml b/java/com/android/dialer/spam/promo/res/values-no/strings.xml
new file mode 100644
index 0000000..a0b645b
--- /dev/null
+++ b/java/com/android/dialer/spam/promo/res/values-no/strings.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_blocking_promo_title">Vil du filtrere alle potensielt useriøse anrop?</string>
+  <string name="spam_blocking_promo_text">Anrop som det du akkurat har blokkert, kommer ikke til
+      å forstyrre deg lenger</string>
+  <string name="spam_blocking_promo_action_filter_spam">Filtrér useriøse anrop</string>
+  <string name="spam_blocking_promo_action_dismiss">Lukk</string>
+  <string name="spam_blocking_setting_prompt">Innstillinger</string>
+  <string name="spam_blocking_settings_enable_error_text">Det oppsto problemer da filtrering av useriøse anrop skulle slås på</string>
+  <string name="spam_blocking_settings_disable_error_text">Det oppsto problemer da filtrering av useriøse anrop skulle slås av</string>
+  <string name="spam_blocking_settings_enable_complete_text">Filtrering av useriøse anrop er slått på</string>
+  <string name="spam_blocking_settings_disable_complete_text">Filtrering av useriøse anrop er slått av</string>
+</resources>
diff --git a/java/com/android/dialer/spam/promo/res/values-pa/strings.xml b/java/com/android/dialer/spam/promo/res/values-pa/strings.xml
new file mode 100644
index 0000000..ef0bb01
--- /dev/null
+++ b/java/com/android/dialer/spam/promo/res/values-pa/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_blocking_promo_title">ਕੀ ਸਾਰੀਆਂ ਸ਼ੱਕੀ ਸਪੈਮ ਕਾਲਾਂ ਫਿਲਟਰ ਕਰਨੀਆਂ ਹਨ?</string>
+  <string name="spam_blocking_promo_text">ਜਿਸ ਤਰ੍ਹਾਂ ਦੀਆਂ ਕਾਲਾਂ ਤੁਸੀਂ ਬਲਾਕ ਕੀਤੀਆਂ ਹਨ ਉਹ ਹੁਣ ਤੁਹਾਨੂੰ ਕਦੇ ਵੀ ਪਰੇਸ਼ਾਨ ਨਹੀਂ ਕਰਨਗੀਆਂ</string>
+  <string name="spam_blocking_promo_action_filter_spam">ਸਪੈਮ ਨੂੰ ਫਿਲਟਰ ਕਰੋ</string>
+  <string name="spam_blocking_promo_action_dismiss">ਖਾਰਜ ਕਰੋ</string>
+  <string name="spam_blocking_setting_prompt">ਸੈਟਿੰਗਾਂ</string>
+  <string name="spam_blocking_settings_enable_error_text">ਸਪੈਮ ਫਿਲਟਰ ਕਰਨ ਦਾ ਵਿਕਲਪ ਚਾਲੂ ਕਰਨ ਵੇਲੇ ਸਮੱਸਿਆ ਆਈ</string>
+  <string name="spam_blocking_settings_disable_error_text">ਸਪੈਮ ਫਿਲਟਰ ਕਰਨ ਦਾ ਵਿਕਲਪ ਬੰਦ ਕਰਨ ਵੇਲੇ ਸਮੱਸਿਆ ਆਈ</string>
+  <string name="spam_blocking_settings_enable_complete_text">ਸਪੈਮ ਫਿਲਟਰ ਕਰਨਾ ਚਾਲੂ ਕੀਤਾ ਗਿਆ</string>
+  <string name="spam_blocking_settings_disable_complete_text">ਸਪੈਮ ਫਿਲਟਰ ਕਰਨਾ ਬੰਦ ਕੀਤਾ ਗਿਆ</string>
+</resources>
diff --git a/java/com/android/dialer/spam/promo/res/values-pl/strings.xml b/java/com/android/dialer/spam/promo/res/values-pl/strings.xml
new file mode 100644
index 0000000..e3c35c4
--- /dev/null
+++ b/java/com/android/dialer/spam/promo/res/values-pl/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_blocking_promo_title">Filtrować wszystkie połączenia podejrzanie o spam?</string>
+  <string name="spam_blocking_promo_text">Połączenia podobne do tego, które właśnie zostało zablokowane, nie będą Ci już przeszkadzać</string>
+  <string name="spam_blocking_promo_action_filter_spam">Filtruj spam</string>
+  <string name="spam_blocking_promo_action_dismiss">Odrzuć</string>
+  <string name="spam_blocking_setting_prompt">Ustawienia</string>
+  <string name="spam_blocking_settings_enable_error_text">Nie udało się włączyć filtrowania spamu</string>
+  <string name="spam_blocking_settings_disable_error_text">Nie udało się wyłączyć filtrowania spamu</string>
+  <string name="spam_blocking_settings_enable_complete_text">Włączono filtrowanie spamu</string>
+  <string name="spam_blocking_settings_disable_complete_text">Wyłączono filtrowanie spamu</string>
+</resources>
diff --git a/java/com/android/dialer/spam/promo/res/values-pt-rBR/strings.xml b/java/com/android/dialer/spam/promo/res/values-pt-rBR/strings.xml
new file mode 100644
index 0000000..42ad4a9
--- /dev/null
+++ b/java/com/android/dialer/spam/promo/res/values-pt-rBR/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_blocking_promo_title">Filtrar todas as chamadas suspeitas (spam)?</string>
+  <string name="spam_blocking_promo_text">Você não será mais incomodado por chamadas como a que acabou de bloquear</string>
+  <string name="spam_blocking_promo_action_filter_spam">Filtrar spam</string>
+  <string name="spam_blocking_promo_action_dismiss">Dispensar</string>
+  <string name="spam_blocking_setting_prompt">Configurações</string>
+  <string name="spam_blocking_settings_enable_error_text">Ocorreu um problema ao ativar a filtragem de spam</string>
+  <string name="spam_blocking_settings_disable_error_text">Ocorreu um problema ao desativar a filtragem de spam</string>
+  <string name="spam_blocking_settings_enable_complete_text">A filtragem de spam foi ativada</string>
+  <string name="spam_blocking_settings_disable_complete_text">A filtragem de spam foi desativada</string>
+</resources>
diff --git a/java/com/android/dialer/spam/promo/res/values-pt-rPT/strings.xml b/java/com/android/dialer/spam/promo/res/values-pt-rPT/strings.xml
new file mode 100644
index 0000000..cc9ad00
--- /dev/null
+++ b/java/com/android/dialer/spam/promo/res/values-pt-rPT/strings.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_blocking_promo_title">Filtrar chamadas de spam suspeitas?</string>
+  <string name="spam_blocking_promo_text">As chamadas como a que acabou de bloquear não voltarão
+      a incomodá-lo</string>
+  <string name="spam_blocking_promo_action_filter_spam">Filtrar spam</string>
+  <string name="spam_blocking_promo_action_dismiss">Ignorar</string>
+  <string name="spam_blocking_setting_prompt">Definições</string>
+  <string name="spam_blocking_settings_enable_error_text">Problema ao ativar o filtro de spam</string>
+  <string name="spam_blocking_settings_disable_error_text">Problema ao desativar o filtro de spam</string>
+  <string name="spam_blocking_settings_enable_complete_text">Filtro de spam ativado</string>
+  <string name="spam_blocking_settings_disable_complete_text">Filtro de spam desativado</string>
+</resources>
diff --git a/java/com/android/dialer/spam/promo/res/values-pt/strings.xml b/java/com/android/dialer/spam/promo/res/values-pt/strings.xml
new file mode 100644
index 0000000..42ad4a9
--- /dev/null
+++ b/java/com/android/dialer/spam/promo/res/values-pt/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_blocking_promo_title">Filtrar todas as chamadas suspeitas (spam)?</string>
+  <string name="spam_blocking_promo_text">Você não será mais incomodado por chamadas como a que acabou de bloquear</string>
+  <string name="spam_blocking_promo_action_filter_spam">Filtrar spam</string>
+  <string name="spam_blocking_promo_action_dismiss">Dispensar</string>
+  <string name="spam_blocking_setting_prompt">Configurações</string>
+  <string name="spam_blocking_settings_enable_error_text">Ocorreu um problema ao ativar a filtragem de spam</string>
+  <string name="spam_blocking_settings_disable_error_text">Ocorreu um problema ao desativar a filtragem de spam</string>
+  <string name="spam_blocking_settings_enable_complete_text">A filtragem de spam foi ativada</string>
+  <string name="spam_blocking_settings_disable_complete_text">A filtragem de spam foi desativada</string>
+</resources>
diff --git a/java/com/android/dialer/spam/promo/res/values-ro/strings.xml b/java/com/android/dialer/spam/promo/res/values-ro/strings.xml
new file mode 100644
index 0000000..e96a266
--- /dev/null
+++ b/java/com/android/dialer/spam/promo/res/values-ro/strings.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_blocking_promo_title">Filtrați apelurile care ar putea fi spam?</string>
+  <string name="spam_blocking_promo_text">Apelurile precum cel pe care tocmai l-ați blocat
+      nu vă vor mai deranja</string>
+  <string name="spam_blocking_promo_action_filter_spam">Filtrați mesajele spam</string>
+  <string name="spam_blocking_promo_action_dismiss">Închideți</string>
+  <string name="spam_blocking_setting_prompt">Setări</string>
+  <string name="spam_blocking_settings_enable_error_text">Problemă la activarea filtrării spamului</string>
+  <string name="spam_blocking_settings_disable_error_text">Problemă la dezactivarea filtrării spamului</string>
+  <string name="spam_blocking_settings_enable_complete_text">Filtrarea apelurilor spam este activată.</string>
+  <string name="spam_blocking_settings_disable_complete_text">Filtrarea mesajelor spam este dezactivată.</string>
+</resources>
diff --git a/java/com/android/dialer/spam/promo/res/values-ru/strings.xml b/java/com/android/dialer/spam/promo/res/values-ru/strings.xml
new file mode 100644
index 0000000..2586017
--- /dev/null
+++ b/java/com/android/dialer/spam/promo/res/values-ru/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_blocking_promo_title">Фильтровать спам?</string>
+  <string name="spam_blocking_promo_text">Звонки, подобные этому, больше не будут беспокоить вас.</string>
+  <string name="spam_blocking_promo_action_filter_spam">Фильтровать спам</string>
+  <string name="spam_blocking_promo_action_dismiss">Закрыть</string>
+  <string name="spam_blocking_setting_prompt">Настройки</string>
+  <string name="spam_blocking_settings_enable_error_text">Не удалось включить фильтрацию спама</string>
+  <string name="spam_blocking_settings_disable_error_text">Не удалось выключить фильтрацию спама</string>
+  <string name="spam_blocking_settings_enable_complete_text">Фильтрация спама включена</string>
+  <string name="spam_blocking_settings_disable_complete_text">Фильтрация спама выключена</string>
+</resources>
diff --git a/java/com/android/dialer/spam/promo/res/values-si/strings.xml b/java/com/android/dialer/spam/promo/res/values-si/strings.xml
new file mode 100644
index 0000000..8bf35f2
--- /dev/null
+++ b/java/com/android/dialer/spam/promo/res/values-si/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_blocking_promo_title">සියලු සැකසහිත අයාචිත ඇමතුම් පෙරන්නද?</string>
+  <string name="spam_blocking_promo_text">ඔබ මේ දැන් අවහිර කළ එක වැනි ඇමතුම් තවදුරටත් ඔබට බාධා නොකරනු ඇත</string>
+  <string name="spam_blocking_promo_action_filter_spam">අයාචිත තැපැල් පෙරහන් කරන්න</string>
+  <string name="spam_blocking_promo_action_dismiss">ඉවත ලන්න</string>
+  <string name="spam_blocking_setting_prompt">සැකසීම්</string>
+  <string name="spam_blocking_settings_enable_error_text">අයාචිත පෙරහන ක්‍රියාත්මක කිරීමේ ගැටලුවකි</string>
+  <string name="spam_blocking_settings_disable_error_text">අයාචිත පෙරහන ක්‍රියාවිරහිත කිරීමේ ගැටලුවකි</string>
+  <string name="spam_blocking_settings_enable_complete_text">අයාචිත පෙරහන ක්‍රියාත්මකයි</string>
+  <string name="spam_blocking_settings_disable_complete_text">අයාචිත පෙරහන ක්‍රියාවිරහිතයි</string>
+</resources>
diff --git a/java/com/android/dialer/spam/promo/res/values-sk/strings.xml b/java/com/android/dialer/spam/promo/res/values-sk/strings.xml
new file mode 100644
index 0000000..b57d9ed
--- /dev/null
+++ b/java/com/android/dialer/spam/promo/res/values-sk/strings.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_blocking_promo_title">Filtrovať všetky hovory, pri ktorých je podozrenie, že ide o spam?</string>
+  <string name="spam_blocking_promo_text">Hovory, ako ten, ktorý ste práve zablokovali, vás už nebudú
+      rušiť</string>
+  <string name="spam_blocking_promo_action_filter_spam">Filtrovať spam</string>
+  <string name="spam_blocking_promo_action_dismiss">Zavrieť</string>
+  <string name="spam_blocking_setting_prompt">Nastavenia</string>
+  <string name="spam_blocking_settings_enable_error_text">Filtrovanie spamu sa nepodarilo zapnúť</string>
+  <string name="spam_blocking_settings_disable_error_text">Filtrovanie spamu sa nepodarilo vypnúť</string>
+  <string name="spam_blocking_settings_enable_complete_text">Filtrovanie spamu bolo zapnuté</string>
+  <string name="spam_blocking_settings_disable_complete_text">Filtrovanie spamu bolo vypnuté</string>
+</resources>
diff --git a/java/com/android/dialer/spam/promo/res/values-sl/strings.xml b/java/com/android/dialer/spam/promo/res/values-sl/strings.xml
new file mode 100644
index 0000000..6a2d709
--- /dev/null
+++ b/java/com/android/dialer/spam/promo/res/values-sl/strings.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_blocking_promo_title">Želite filtrirati vse domnevno neželene klice?</string>
+  <string name="spam_blocking_promo_text">Klici kot ta, ki ste ga pravkar blokirali, vas ne bodo več
+      zmotili</string>
+  <string name="spam_blocking_promo_action_filter_spam">Filtriraj neželene klice</string>
+  <string name="spam_blocking_promo_action_dismiss">Opusti</string>
+  <string name="spam_blocking_setting_prompt">Nastavitve</string>
+  <string name="spam_blocking_settings_enable_error_text">Težava pri vklopu filtriranja neželenih klicev</string>
+  <string name="spam_blocking_settings_disable_error_text">Težava pri izklopu filtriranja neželenih klicev</string>
+  <string name="spam_blocking_settings_enable_complete_text">Filtriranje neželenih klicev je vklopljeno</string>
+  <string name="spam_blocking_settings_disable_complete_text">Filtriranje neželenih klicev je izklopljeno</string>
+</resources>
diff --git a/java/com/android/dialer/spam/promo/res/values-sq/strings.xml b/java/com/android/dialer/spam/promo/res/values-sq/strings.xml
new file mode 100644
index 0000000..8677f4a
--- /dev/null
+++ b/java/com/android/dialer/spam/promo/res/values-sq/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_blocking_promo_title">Të filtrohen të gjitha telefonatat e dyshuara si të padëshiruara?</string>
+  <string name="spam_blocking_promo_text">Telefonatat si ajo që sapo bllokove nuk do të të shqetësojnë më</string>
+  <string name="spam_blocking_promo_action_filter_spam">Filtro të padëshiruarat</string>
+  <string name="spam_blocking_promo_action_dismiss">Hiq</string>
+  <string name="spam_blocking_setting_prompt">Cilësimet</string>
+  <string name="spam_blocking_settings_enable_error_text">Problem me aktivizimin e filtrimit për të padëshiruarat</string>
+  <string name="spam_blocking_settings_disable_error_text">Problem me çaktivizimin e filtrimit për të padëshiruarat</string>
+  <string name="spam_blocking_settings_enable_complete_text">Filtrimi për të padëshiruarat u aktivizua</string>
+  <string name="spam_blocking_settings_disable_complete_text">Filtrimi për të padëshiruarat u çaktivizua</string>
+</resources>
diff --git a/java/com/android/dialer/spam/promo/res/values-sr/strings.xml b/java/com/android/dialer/spam/promo/res/values-sr/strings.xml
new file mode 100644
index 0000000..9706917
--- /dev/null
+++ b/java/com/android/dialer/spam/promo/res/values-sr/strings.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_blocking_promo_title">Желите ли да филтрирате све позиве за које се сумња да су непожељни?</string>
+  <string name="spam_blocking_promo_text">Позиви као што је овај који сте управо блокирали вас више
+      неће ометати</string>
+  <string name="spam_blocking_promo_action_filter_spam">Филтрирај непожељне позиве</string>
+  <string name="spam_blocking_promo_action_dismiss">Одбаци</string>
+  <string name="spam_blocking_setting_prompt">Подешавања</string>
+  <string name="spam_blocking_settings_enable_error_text">Проблем при укључивању филтрирања непожељних позива</string>
+  <string name="spam_blocking_settings_disable_error_text">Проблем при искључивању филтрирања непожељних позива</string>
+  <string name="spam_blocking_settings_enable_complete_text">Филтрирање непожељних позива је укључено</string>
+  <string name="spam_blocking_settings_disable_complete_text">Филтрирање непожељних позива је искључено</string>
+</resources>
diff --git a/java/com/android/dialer/spam/promo/res/values-sv/strings.xml b/java/com/android/dialer/spam/promo/res/values-sv/strings.xml
new file mode 100644
index 0000000..52b32ce
--- /dev/null
+++ b/java/com/android/dialer/spam/promo/res/values-sv/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_blocking_promo_title">Vill du filtrera alla misstänkta spamsamtal?</string>
+  <string name="spam_blocking_promo_text">Du kommer inte längre att störas av samtal som det du precis blockerade</string>
+  <string name="spam_blocking_promo_action_filter_spam">Filtrera spam</string>
+  <string name="spam_blocking_promo_action_dismiss">Stäng</string>
+  <string name="spam_blocking_setting_prompt">Inställningar</string>
+  <string name="spam_blocking_settings_enable_error_text">Problemet med att aktivera spamfilter</string>
+  <string name="spam_blocking_settings_disable_error_text">Problem med att stänga av spamfilter</string>
+  <string name="spam_blocking_settings_enable_complete_text">Spamfiltrering har aktiverats</string>
+  <string name="spam_blocking_settings_disable_complete_text">Spamfiltrering har inaktiverats</string>
+</resources>
diff --git a/java/com/android/dialer/spam/promo/res/values-sw/strings.xml b/java/com/android/dialer/spam/promo/res/values-sw/strings.xml
new file mode 100644
index 0000000..9758fe9
--- /dev/null
+++ b/java/com/android/dialer/spam/promo/res/values-sw/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_blocking_promo_title">Je, ungependa kuchuja simu zote unazoshuku kuwa taka?</string>
+  <string name="spam_blocking_promo_text">Simu kama ile uliyozuia sasa hivi hazitakusumbua tena</string>
+  <string name="spam_blocking_promo_action_filter_spam">Chuja Taka</string>
+  <string name="spam_blocking_promo_action_dismiss">Ondoa</string>
+  <string name="spam_blocking_setting_prompt">Mipangilio</string>
+  <string name="spam_blocking_settings_enable_error_text">Hitilafu imetokea wakati wa kuwasha kipengele cha kuchuja simu taka</string>
+  <string name="spam_blocking_settings_disable_error_text">Hitilafu imetokea wakati wa kuzima kipengele cha kuchuja simu taka</string>
+  <string name="spam_blocking_settings_enable_complete_text">Kipengele cha kuchuja simu taka kimewashwa</string>
+  <string name="spam_blocking_settings_disable_complete_text">Kipengele cha kuchuja simu taka kimezimwa</string>
+</resources>
diff --git a/java/com/android/dialer/spam/promo/res/values-ta/strings.xml b/java/com/android/dialer/spam/promo/res/values-ta/strings.xml
new file mode 100644
index 0000000..681d289
--- /dev/null
+++ b/java/com/android/dialer/spam/promo/res/values-ta/strings.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_blocking_promo_title">சந்தேகத்திற்குரிய ஸ்பேம் அழைப்புகளைத் தடுக்கவா?</string>
+  <string name="spam_blocking_promo_text">இப்போது நீங்கள் தடுத்த அழைப்பு போன்று, வேறு எந்த அழைப்புகளும் இனி
+      உங்களைத் தொந்தரவு செய்யாது</string>
+  <string name="spam_blocking_promo_action_filter_spam">ஸ்பேமைத் தடு</string>
+  <string name="spam_blocking_promo_action_dismiss">நிராகரி</string>
+  <string name="spam_blocking_setting_prompt">அமைப்புகள்</string>
+  <string name="spam_blocking_settings_enable_error_text">ஸ்பேம் தடுத்தலை இயக்குவதில் சிக்கல்</string>
+  <string name="spam_blocking_settings_disable_error_text">ஸ்பேம் தடுத்தலை முடக்குவதில் சிக்கல்</string>
+  <string name="spam_blocking_settings_enable_complete_text">ஸ்பேம் தடுத்தல் இயக்கப்பட்டது</string>
+  <string name="spam_blocking_settings_disable_complete_text">ஸ்பேம் தடுத்தல் முடக்கப்பட்டது</string>
+</resources>
diff --git a/java/com/android/dialer/spam/promo/res/values-te/strings.xml b/java/com/android/dialer/spam/promo/res/values-te/strings.xml
new file mode 100644
index 0000000..3b7aeff
--- /dev/null
+++ b/java/com/android/dialer/spam/promo/res/values-te/strings.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_blocking_promo_title">అనుమానిత స్పామ్ కాల్‌లన్నింటినీ ఫిల్టర్ చేయాలా?</string>
+  <string name="spam_blocking_promo_text">మీరు ఇప్పుడు బ్లాక్ చేసినటువంటి కాల్‌లు
+      మీకు ఇకపై అంతరాయం కలిగించవు</string>
+  <string name="spam_blocking_promo_action_filter_spam">స్పామ్‌ని ఫిల్టర్ చేయి</string>
+  <string name="spam_blocking_promo_action_dismiss">విస్మరించు</string>
+  <string name="spam_blocking_setting_prompt">సెట్టింగ్‌లు</string>
+  <string name="spam_blocking_settings_enable_error_text">స్పామ్ ఫిల్టరింగ్‌ని ఆన్ చేస్తున్నప్పుడు సమస్య ఏర్పడింది</string>
+  <string name="spam_blocking_settings_disable_error_text">స్పామ్ ఫిల్టరింగ్‌ని ఆఫ్ చేస్తున్నప్పుడు సమస్య ఏర్పడింది</string>
+  <string name="spam_blocking_settings_enable_complete_text">స్పామ్ ఫిల్టరింగ్ ఆన్ చేయబడింది</string>
+  <string name="spam_blocking_settings_disable_complete_text">స్పామ్ ఫిల్టరింగ్ ఆఫ్ చేయబడింది</string>
+</resources>
diff --git a/java/com/android/dialer/spam/promo/res/values-th/strings.xml b/java/com/android/dialer/spam/promo/res/values-th/strings.xml
new file mode 100644
index 0000000..702486d
--- /dev/null
+++ b/java/com/android/dialer/spam/promo/res/values-th/strings.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_blocking_promo_title">กรองสายที่สงสัยว่าเป็นสแปมทั้งหมดไหม</string>
+  <string name="spam_blocking_promo_text">จะไม่มีสายแบบเดียวกับที่บล็อกเมื่อสักครู่
+      มารบกวนคุณอีกต่อไป</string>
+  <string name="spam_blocking_promo_action_filter_spam">กรองสแปม</string>
+  <string name="spam_blocking_promo_action_dismiss">ปิด</string>
+  <string name="spam_blocking_setting_prompt">การตั้งค่า</string>
+  <string name="spam_blocking_settings_enable_error_text">มีปัญหาในการเปิดการกรองสแปม</string>
+  <string name="spam_blocking_settings_disable_error_text">มีปัญหาในการปิดการกรองสแปม</string>
+  <string name="spam_blocking_settings_enable_complete_text">เปิดตัวกรองสแปมแล้ว</string>
+  <string name="spam_blocking_settings_disable_complete_text">ปิดตัวกรองสแปมแล้ว</string>
+</resources>
diff --git a/java/com/android/dialer/spam/promo/res/values-tl/strings.xml b/java/com/android/dialer/spam/promo/res/values-tl/strings.xml
new file mode 100644
index 0000000..8844c13
--- /dev/null
+++ b/java/com/android/dialer/spam/promo/res/values-tl/strings.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_blocking_promo_title">I-filter ang lahat ng pinaghihinalaang spam na tawag?</string>
+  <string name="spam_blocking_promo_text">Ang mga tawag na kaka-block mo lang ay hindi 
+      ka na iistorbohin</string>
+  <string name="spam_blocking_promo_action_filter_spam">I-filter ang Spam</string>
+  <string name="spam_blocking_promo_action_dismiss">I-dismiss</string>
+  <string name="spam_blocking_setting_prompt">Mga Setting</string>
+  <string name="spam_blocking_settings_enable_error_text">May problema sa pag-on ng pag-filter ng spam</string>
+  <string name="spam_blocking_settings_disable_error_text">May problema sa pag-off ng pag-filter ng spam</string>
+  <string name="spam_blocking_settings_enable_complete_text">In-on ang pag-filter ng spam</string>
+  <string name="spam_blocking_settings_disable_complete_text">In-off ang pag-filter ng spam</string>
+</resources>
diff --git a/java/com/android/dialer/spam/promo/res/values-tr/strings.xml b/java/com/android/dialer/spam/promo/res/values-tr/strings.xml
new file mode 100644
index 0000000..0eb6609
--- /dev/null
+++ b/java/com/android/dialer/spam/promo/res/values-tr/strings.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_blocking_promo_title">Spam olabilecek çağrılar filtrelensin mi?</string>
+  <string name="spam_blocking_promo_text">Az önce engellediğiniz gibi çağrılar artık
+      sizi rahatsız edemez</string>
+  <string name="spam_blocking_promo_action_filter_spam">Spam Çağrıları Filtrele</string>
+  <string name="spam_blocking_promo_action_dismiss">Kapat</string>
+  <string name="spam_blocking_setting_prompt">Ayarlar</string>
+  <string name="spam_blocking_settings_enable_error_text">Spam filtresi etkinleştirilirken sorun oluştu</string>
+  <string name="spam_blocking_settings_disable_error_text">Spam filtresi devre dışı bırakılırken sorun oluştu</string>
+  <string name="spam_blocking_settings_enable_complete_text">Spam filtresi etkinleştirildi</string>
+  <string name="spam_blocking_settings_disable_complete_text">Spam filtresi devre dışı bırakıldı</string>
+</resources>
diff --git a/java/com/android/dialer/spam/promo/res/values-uk/strings.xml b/java/com/android/dialer/spam/promo/res/values-uk/strings.xml
new file mode 100644
index 0000000..16b6597
--- /dev/null
+++ b/java/com/android/dialer/spam/promo/res/values-uk/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_blocking_promo_title">Відфільтрувати всі виклики, які можуть бути спамом?</string>
+  <string name="spam_blocking_promo_text">Виклики, подібні до щойно заблокованого, більше не надходитимуть</string>
+  <string name="spam_blocking_promo_action_filter_spam">Відфільтрувати спам</string>
+  <string name="spam_blocking_promo_action_dismiss">Відхилити</string>
+  <string name="spam_blocking_setting_prompt">Налаштування</string>
+  <string name="spam_blocking_settings_enable_error_text">Проблема з увімкненням спам-фільтра</string>
+  <string name="spam_blocking_settings_disable_error_text">Проблема з вимкненням спам-фільтра</string>
+  <string name="spam_blocking_settings_enable_complete_text">Спам-фільтр увімкнено</string>
+  <string name="spam_blocking_settings_disable_complete_text">Спам-фільтр вимкнено</string>
+</resources>
diff --git a/java/com/android/dialer/spam/promo/res/values-ur/strings.xml b/java/com/android/dialer/spam/promo/res/values-ur/strings.xml
new file mode 100644
index 0000000..8fc0613
--- /dev/null
+++ b/java/com/android/dialer/spam/promo/res/values-ur/strings.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_blocking_promo_title">کیا تمام مشتبہ اسپام کالز فلٹر کریں؟</string>
+  <string name="spam_blocking_promo_text">کال جس کو آپ نے ابھی مسدود کیا ہے اس طرح کی کالز آپ کو مزید
+      پریشان نہیں کریں گی</string>
+  <string name="spam_blocking_promo_action_filter_spam">سپام فلٹر کریں</string>
+  <string name="spam_blocking_promo_action_dismiss">برخاست کریں</string>
+  <string name="spam_blocking_setting_prompt">ترتیبات</string>
+  <string name="spam_blocking_settings_enable_error_text">اسپام فلٹر کرنے کی سہولت کو آن کرنے میں مسئلہ</string>
+  <string name="spam_blocking_settings_disable_error_text">اسپام فلٹر کرنے کی سہولت کو آف کرنے میں مسئلہ</string>
+  <string name="spam_blocking_settings_enable_complete_text">سپام فلٹر کرنے کی سہولت آن ہے</string>
+  <string name="spam_blocking_settings_disable_complete_text">سپام فلٹر کرنے کی سہولت آف ہے</string>
+</resources>
diff --git a/java/com/android/dialer/spam/promo/res/values-uz/strings.xml b/java/com/android/dialer/spam/promo/res/values-uz/strings.xml
new file mode 100644
index 0000000..5856c25
--- /dev/null
+++ b/java/com/android/dialer/spam/promo/res/values-uz/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_blocking_promo_title">Spam deb taxmin qilingan barcha chaqiruvlar filtrlansinmi?</string>
+  <string name="spam_blocking_promo_text">Shunga o‘xshash chaqiruvlar sizni boshqa bezovta qilmaydi</string>
+  <string name="spam_blocking_promo_action_filter_spam">Spamni filtrlash</string>
+  <string name="spam_blocking_promo_action_dismiss">Yopish</string>
+  <string name="spam_blocking_setting_prompt">Sozlamalar</string>
+  <string name="spam_blocking_settings_enable_error_text">Spam chaqiruvlarni filtrlar funksiyasi yoqilmadi</string>
+  <string name="spam_blocking_settings_disable_error_text">Spam chaqiruvlarni filtrlar funksiyasi o‘chmadi</string>
+  <string name="spam_blocking_settings_enable_complete_text">Spam chaqiruvlarni filtrlash funksiyasi yoqildi</string>
+  <string name="spam_blocking_settings_disable_complete_text">Spam chaqiruvlarni filtrlash funksiyasi o‘chdi</string>
+</resources>
diff --git a/java/com/android/dialer/spam/promo/res/values-vi/strings.xml b/java/com/android/dialer/spam/promo/res/values-vi/strings.xml
new file mode 100644
index 0000000..7eb4c0b
--- /dev/null
+++ b/java/com/android/dialer/spam/promo/res/values-vi/strings.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_blocking_promo_title">Lọc tất cả các cuộc gọi nghi ngờ là spam?</string>
+  <string name="spam_blocking_promo_text">Các cuộc gọi như cuộc gọi bạn vừa chặn sẽ không còn
+      làm phiền bạn nữa</string>
+  <string name="spam_blocking_promo_action_filter_spam">Lọc spam</string>
+  <string name="spam_blocking_promo_action_dismiss">Bỏ qua</string>
+  <string name="spam_blocking_setting_prompt">Cài đặt</string>
+  <string name="spam_blocking_settings_enable_error_text">Đã xảy ra sự cố khi bật tính năng lọc spam</string>
+  <string name="spam_blocking_settings_disable_error_text">Đã xảy ra sự cố khi tắt tính năng lọc spam</string>
+  <string name="spam_blocking_settings_enable_complete_text">Đã bật tính năng lọc spam</string>
+  <string name="spam_blocking_settings_disable_complete_text">Đã tắt tính năng lọc spam</string>
+</resources>
diff --git a/java/com/android/dialer/spam/promo/res/values-zh-rCN/strings.xml b/java/com/android/dialer/spam/promo/res/values-zh-rCN/strings.xml
new file mode 100644
index 0000000..560d840
--- /dev/null
+++ b/java/com/android/dialer/spam/promo/res/values-zh-rCN/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_blocking_promo_title">要过滤所有疑似骚扰电话吗？</string>
+  <string name="spam_blocking_promo_text">您日后不会再收到与刚刚所屏蔽电话类似的骚扰电话</string>
+  <string name="spam_blocking_promo_action_filter_spam">过滤骚扰电话</string>
+  <string name="spam_blocking_promo_action_dismiss">关闭</string>
+  <string name="spam_blocking_setting_prompt">设置</string>
+  <string name="spam_blocking_settings_enable_error_text">启用骚扰电话过滤功能时出错</string>
+  <string name="spam_blocking_settings_disable_error_text">停用骚扰电话过滤功能时出错</string>
+  <string name="spam_blocking_settings_enable_complete_text">骚扰电话过滤功能已启用</string>
+  <string name="spam_blocking_settings_disable_complete_text">骚扰电话过滤功能已停用</string>
+</resources>
diff --git a/java/com/android/dialer/spam/promo/res/values-zh-rHK/strings.xml b/java/com/android/dialer/spam/promo/res/values-zh-rHK/strings.xml
new file mode 100644
index 0000000..d0ea019
--- /dev/null
+++ b/java/com/android/dialer/spam/promo/res/values-zh-rHK/strings.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_blocking_promo_title">要過濾所有疑似垃圾來電嗎？</string>
+  <string name="spam_blocking_promo_text">剛封鎖的類似來電不會再
+      打擾您</string>
+  <string name="spam_blocking_promo_action_filter_spam">過濾垃圾來電</string>
+  <string name="spam_blocking_promo_action_dismiss">關閉</string>
+  <string name="spam_blocking_setting_prompt">設定</string>
+  <string name="spam_blocking_settings_enable_error_text">開啟垃圾來電濾除功能時發生錯誤</string>
+  <string name="spam_blocking_settings_disable_error_text">關閉垃圾來電濾除功能時發生錯誤</string>
+  <string name="spam_blocking_settings_enable_complete_text">已開啟垃圾來電過濾功能</string>
+  <string name="spam_blocking_settings_disable_complete_text">已關閉垃圾來電過濾功能</string>
+</resources>
diff --git a/java/com/android/dialer/spam/promo/res/values-zh-rTW/strings.xml b/java/com/android/dialer/spam/promo/res/values-zh-rTW/strings.xml
new file mode 100644
index 0000000..0ffc0ed
--- /dev/null
+++ b/java/com/android/dialer/spam/promo/res/values-zh-rTW/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_blocking_promo_title">要過濾所有可疑的騷擾/廣告來電嗎？</string>
+  <string name="spam_blocking_promo_text">剛才封鎖的類似來電將不會再打擾你</string>
+  <string name="spam_blocking_promo_action_filter_spam">過濾騷擾/廣告電話</string>
+  <string name="spam_blocking_promo_action_dismiss">關閉</string>
+  <string name="spam_blocking_setting_prompt">設定</string>
+  <string name="spam_blocking_settings_enable_error_text">無法開啟過濾騷擾/廣告電話的功能</string>
+  <string name="spam_blocking_settings_disable_error_text">無法關閉過濾騷擾/廣告電話的功能</string>
+  <string name="spam_blocking_settings_enable_complete_text">已開啟過濾騷擾/廣告電話的功能</string>
+  <string name="spam_blocking_settings_disable_complete_text">已關閉過濾騷擾/廣告電話的功能</string>
+</resources>
diff --git a/java/com/android/dialer/spam/promo/res/values-zu/strings.xml b/java/com/android/dialer/spam/promo/res/values-zu/strings.xml
new file mode 100644
index 0000000..88fd297
--- /dev/null
+++ b/java/com/android/dialer/spam/promo/res/values-zu/strings.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_blocking_promo_title">Hlunga onke amakholi kagaxekile asolisayo?</string>
+  <string name="spam_blocking_promo_text">Amakholi afana nale osanda kuyivimbela ngeke
+      asakuphazamisa</string>
+  <string name="spam_blocking_promo_action_filter_spam">Hlunga ugaxekile</string>
+  <string name="spam_blocking_promo_action_dismiss">Cashisa</string>
+  <string name="spam_blocking_setting_prompt">Izilungiselelo</string>
+  <string name="spam_blocking_settings_enable_error_text">Inkinga ukuvula isihlungi sikagaxekile</string>
+  <string name="spam_blocking_settings_disable_error_text">Inkinga ngokuvala isihlungi sikagaxekile</string>
+  <string name="spam_blocking_settings_enable_complete_text">Ukuhlunga kogaxekile kuvuliwe</string>
+  <string name="spam_blocking_settings_disable_complete_text">Ukuhlunga kogaxekile kuvaliwe</string>
+</resources>
diff --git a/java/com/android/dialer/spam/promo/res/values/strings.xml b/java/com/android/dialer/spam/promo/res/values/strings.xml
new file mode 100644
index 0000000..91036be
--- /dev/null
+++ b/java/com/android/dialer/spam/promo/res/values/strings.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2017 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+
+<resources>
+  <!-- Title for the spam blocking promo dialog. [CHAR LIMIT=100] -->
+  <string name="spam_blocking_promo_title">Filter all suspected spam calls?</string>
+  <!-- Text for the spam blocking promo dialog. [CHAR LIMIT=NONE] -->
+  <string name="spam_blocking_promo_text">Calls like the one you just blocked will no longer
+      disturb you</string>
+  <!-- Label for filter spam dialog action. [CHAR LIMIT=32] -->
+  <string name="spam_blocking_promo_action_filter_spam">Filter Spam</string>
+  <!-- Label for "Dismiss" dialog action. [CHAR LIMIT=32] -->
+  <string name="spam_blocking_promo_action_dismiss">Dismiss</string>
+  <!-- Button text to prompt a user to open spam blocking setting [CHAR LIMIT=NONE] -->
+  <string name="spam_blocking_setting_prompt">Settings</string>
+
+  <!-- Spam blocking error text, shown when error happens during setting enabling. -->
+  <string name="spam_blocking_settings_enable_error_text">Problem turning on spam filtering</string>
+  <!-- Spam blocking error text, shown when error happens during setting disabling. -->
+  <string name="spam_blocking_settings_disable_error_text">Problem turning off spam filtering</string>
+
+  <!-- On complete text shown when spam blocking is enabled successfully. -->
+  <string name="spam_blocking_settings_enable_complete_text">Spam filtering turned on</string>
+  <!-- On complete text shown when spam blocking is disabled successfully. -->
+  <string name="spam_blocking_settings_disable_complete_text">Spam filtering turned off</string>
+</resources>
diff --git a/java/com/android/dialer/spam/status/GlobalSpamListStatus.java b/java/com/android/dialer/spam/status/GlobalSpamListStatus.java
new file mode 100644
index 0000000..741d6e8
--- /dev/null
+++ b/java/com/android/dialer/spam/status/GlobalSpamListStatus.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.dialer.spam.status;
+
+import android.support.annotation.IntDef;
+import com.google.auto.value.AutoValue;
+import com.google.common.base.Optional;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+/** A value class representing a number's spam status in the global spam list. */
+@AutoValue
+public abstract class GlobalSpamListStatus {
+
+  /** Integers representing the spam status in the global spam list. */
+  @Retention(RetentionPolicy.SOURCE)
+  @IntDef({Status.NOT_ON_LIST, Status.ON_LIST})
+  public @interface Status {
+    int NOT_ON_LIST = 1;
+    int ON_LIST = 2;
+  }
+
+  public abstract @Status int getStatus();
+
+  /**
+   * Returns the timestamp (in milliseconds) representing when a number's spam status was put on the
+   * list, or {@code Optional.absent()} if the number is not on the list.
+   */
+  public abstract Optional<Long> getTimestampMillis();
+
+  public static GlobalSpamListStatus notOnList() {
+    return new AutoValue_GlobalSpamListStatus(Status.NOT_ON_LIST, Optional.absent());
+  }
+
+  public static GlobalSpamListStatus onList(long timestampMillis) {
+    return new AutoValue_GlobalSpamListStatus(Status.ON_LIST, Optional.of(timestampMillis));
+  }
+}
diff --git a/java/com/android/dialer/spam/status/SimpleSpamStatus.java b/java/com/android/dialer/spam/status/SimpleSpamStatus.java
new file mode 100644
index 0000000..5f45c1a
--- /dev/null
+++ b/java/com/android/dialer/spam/status/SimpleSpamStatus.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.dialer.spam.status;
+
+import android.support.annotation.Nullable;
+import com.google.auto.value.AutoValue;
+import com.google.common.base.Optional;
+
+/** Holds a boolean and long to represent spam status. */
+@AutoValue
+public abstract class SimpleSpamStatus implements SpamStatus {
+
+  /** Returns a SimpleSpamStatus with the given boolean and timestamp. */
+  public static SimpleSpamStatus create(boolean isSpam, @Nullable Long timestampMillis) {
+    return builder()
+        .setSpam(isSpam)
+        .setTimestampMillis(timestampMillis)
+        .setSpamMetadata(SpamMetadata.empty())
+        .build();
+  }
+
+  /** Returns a SimpleSpamStatus that's not marked as spam and has no timestamp. */
+  public static SimpleSpamStatus notSpam() {
+    return create(false, null);
+  }
+
+  public static Builder builder() {
+    return new AutoValue_SimpleSpamStatus.Builder();
+  }
+
+  /** Creates instances of SimpleSpamStatus. */
+  @AutoValue.Builder
+  public abstract static class Builder {
+    public abstract Builder setSpam(boolean isSpam);
+
+    abstract Builder setTimestampMillis(Optional<Long> timestamp);
+
+    public Builder setTimestampMillis(@Nullable Long timestampMillis) {
+      return setTimestampMillis(Optional.fromNullable(timestampMillis));
+    }
+
+    public abstract Builder setSpamMetadata(SpamMetadata spamMetadata);
+
+    public abstract SimpleSpamStatus build();
+  }
+}
diff --git a/java/com/android/dialer/spam/status/SpamMetadata.java b/java/com/android/dialer/spam/status/SpamMetadata.java
new file mode 100644
index 0000000..40feba1
--- /dev/null
+++ b/java/com/android/dialer/spam/status/SpamMetadata.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.dialer.spam.status;
+
+import com.google.auto.value.AutoValue;
+import com.google.common.base.Optional;
+
+/**
+ * Holds information which can be used to determine a number's spam status.
+ *
+ * @see SpamStatus
+ */
+@AutoValue
+public abstract class SpamMetadata {
+
+  /** Returns an empty spam metadata, no optional data is set. */
+  public static SpamMetadata empty() {
+    return builder().build();
+  }
+
+  public static SpamMetadata.Builder builder() {
+    return new AutoValue_SpamMetadata.Builder();
+  }
+
+  public abstract Optional<GlobalSpamListStatus> globalSpamListStatus();
+
+  public abstract Optional<UserSpamListStatus> userSpamListStatus();
+
+  /** Creates instances of SpamMetadata. */
+  @AutoValue.Builder
+  public abstract static class Builder {
+    public abstract Builder setGlobalSpamListStatus(GlobalSpamListStatus globalSpamListStatus);
+
+    public abstract Builder setUserSpamListStatus(UserSpamListStatus userSpamListStatus);
+
+    public abstract SpamMetadata build();
+  }
+}
diff --git a/java/com/android/dialer/spam/status/SpamStatus.java b/java/com/android/dialer/spam/status/SpamStatus.java
new file mode 100644
index 0000000..10e8213
--- /dev/null
+++ b/java/com/android/dialer/spam/status/SpamStatus.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.dialer.spam.status;
+
+import com.google.common.base.Optional;
+
+/** An interface representing a number's spam status. */
+@SuppressWarnings("Guava")
+public interface SpamStatus {
+
+  /** Returns true if the number is spam. */
+  boolean isSpam();
+
+  /**
+   * Returns the timestamp (in milliseconds) indicating when the number's spam status entered the
+   * underlying data source.
+   *
+   * <p>{@code Optional.absent()} is returned if
+   *
+   * <ul>
+   *   <li>the number's spam status doesn't exist in the underlying data source, or
+   *   <li>the underlying data source can't provide a timestamp.
+   * </ul>
+   */
+  Optional<Long> getTimestampMillis();
+
+  /** Returns the {@link SpamMetadata} associated with this status. */
+  SpamMetadata getSpamMetadata();
+}
diff --git a/java/com/android/dialer/spam/status/UserSpamListStatus.java b/java/com/android/dialer/spam/status/UserSpamListStatus.java
new file mode 100644
index 0000000..01f9987
--- /dev/null
+++ b/java/com/android/dialer/spam/status/UserSpamListStatus.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.dialer.spam.status;
+
+import android.support.annotation.IntDef;
+import com.google.auto.value.AutoValue;
+import com.google.common.base.Optional;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+/** A value class representing a number's spam status in the user spam list. */
+@AutoValue
+@SuppressWarnings("Guava")
+public abstract class UserSpamListStatus {
+
+  /** Integers representing the spam status in the user spam list. */
+  @Retention(RetentionPolicy.SOURCE)
+  @IntDef({Status.NOT_ON_LIST, Status.WHITELISTED, Status.BLACKLISTED})
+  public @interface Status {
+    int NOT_ON_LIST = 1;
+    int WHITELISTED = 2;
+    int BLACKLISTED = 3;
+  }
+
+  public abstract @Status int getStatus();
+
+  /**
+   * Returns the timestamp (in milliseconds) representing when a number's spam status was put on the
+   * list, or {@code Optional.absent()} if the number is not on the list.
+   */
+  public abstract Optional<Long> getTimestampMillis();
+
+  public static UserSpamListStatus notOnList() {
+    return new AutoValue_UserSpamListStatus(Status.NOT_ON_LIST, Optional.absent());
+  }
+
+  public static UserSpamListStatus whitelisted(long timestampMillis) {
+    return new AutoValue_UserSpamListStatus(Status.WHITELISTED, Optional.of(timestampMillis));
+  }
+
+  public static UserSpamListStatus blacklisted(long timestampMillis) {
+    return new AutoValue_UserSpamListStatus(Status.BLACKLISTED, Optional.of(timestampMillis));
+  }
+}
diff --git a/java/com/android/dialer/spam/stub/SpamSettingsStub.java b/java/com/android/dialer/spam/stub/SpamSettingsStub.java
new file mode 100644
index 0000000..194d184
--- /dev/null
+++ b/java/com/android/dialer/spam/stub/SpamSettingsStub.java
@@ -0,0 +1,89 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.dialer.spam.stub;
+
+import android.content.Context;
+import android.content.Intent;
+import com.android.dialer.spam.SpamSettings;
+import javax.inject.Inject;
+
+/** Default implementation of SpamSettings. */
+public class SpamSettingsStub implements SpamSettings {
+
+  @Inject
+  public SpamSettingsStub() {}
+
+  @Override
+  public boolean isSpamEnabled() {
+    return false;
+  }
+
+  @Override
+  public boolean isSpamNotificationEnabled() {
+    return false;
+  }
+
+  @Override
+  public boolean isSpamBlockingEnabledByFlag() {
+    return false;
+  }
+
+  @Override
+  public boolean isSpamBlockingControlledByCarrier() {
+    return false;
+  }
+
+  @Override
+  public boolean isSpamBlockingEnabled() {
+    return false;
+  }
+
+  @Override
+  public boolean isSpamBlockingEnabledByUser() {
+    return false;
+  }
+
+  @Override
+  public boolean isDialogEnabledForSpamNotification() {
+    return false;
+  }
+
+  @Override
+  public boolean isDialogReportSpamCheckedByDefault() {
+    return false;
+  }
+
+  @Override
+  public int percentOfSpamNotificationsToShow() {
+    return 0;
+  }
+
+  @Override
+  public int percentOfNonSpamNotificationsToShow() {
+    return 0;
+  }
+
+  @Override
+  public void modifySpamBlockingSetting(boolean enabled, ModifySettingListener listener) {
+    listener.onComplete(false);
+  }
+
+  @Override
+  public Intent getSpamBlockingSettingIntent(Context context) {
+    return new Intent();
+  }
+}
diff --git a/java/com/android/dialer/spam/stub/SpamStub.java b/java/com/android/dialer/spam/stub/SpamStub.java
new file mode 100644
index 0000000..5eeed45
--- /dev/null
+++ b/java/com/android/dialer/spam/stub/SpamStub.java
@@ -0,0 +1,117 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.dialer.spam.stub;
+
+import android.support.annotation.Nullable;
+import com.android.dialer.DialerPhoneNumber;
+import com.android.dialer.common.concurrent.Annotations.BackgroundExecutor;
+import com.android.dialer.logging.ContactLookupResult;
+import com.android.dialer.logging.ContactSource;
+import com.android.dialer.logging.ReportingLocation;
+import com.android.dialer.spam.Spam;
+import com.android.dialer.spam.status.SimpleSpamStatus;
+import com.android.dialer.spam.status.SpamStatus;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.ListenableFuture;
+import com.google.common.util.concurrent.ListeningExecutorService;
+import javax.inject.Inject;
+
+/** Default implementation of Spam. */
+public class SpamStub implements Spam {
+
+  private final ListeningExecutorService backgroundExecutorService;
+
+  @Inject
+  public SpamStub(@BackgroundExecutor ListeningExecutorService backgroundExecutorService) {
+    this.backgroundExecutorService = backgroundExecutorService;
+  }
+
+  @Override
+  public ListenableFuture<ImmutableMap<DialerPhoneNumber, SpamStatus>> batchCheckSpamStatus(
+      ImmutableSet<DialerPhoneNumber> dialerPhoneNumbers) {
+    return backgroundExecutorService.submit(
+        () -> {
+          ImmutableMap.Builder<DialerPhoneNumber, SpamStatus> resultBuilder =
+              new ImmutableMap.Builder<>();
+          for (DialerPhoneNumber dialerPhoneNumber : dialerPhoneNumbers) {
+            resultBuilder.put(dialerPhoneNumber, SimpleSpamStatus.notSpam());
+          }
+          return resultBuilder.build();
+        });
+  }
+
+  @Override
+  public ListenableFuture<SpamStatus> checkSpamStatus(DialerPhoneNumber dialerPhoneNumber) {
+    return Futures.immediateFuture(SimpleSpamStatus.notSpam());
+  }
+
+  @Override
+  public ListenableFuture<SpamStatus> checkSpamStatus(
+      String number, @Nullable String defaultCountryIso) {
+    return Futures.immediateFuture(SimpleSpamStatus.notSpam());
+  }
+
+  @Override
+  public ListenableFuture<Void> updateSpamListDownload(boolean isEnabledByUser) {
+    // no-op
+    return Futures.immediateFuture(null);
+  }
+
+  @Override
+  public boolean checkSpamStatusSynchronous(String number, String countryIso) {
+    return false;
+  }
+
+  @Override
+  public ListenableFuture<Boolean> dataUpdatedSince(long timestampMillis) {
+    return Futures.immediateFuture(false);
+  }
+
+  @Override
+  public void reportSpamFromAfterCallNotification(
+      String number,
+      String countryIso,
+      int callType,
+      ReportingLocation.Type from,
+      ContactLookupResult.Type contactLookupResultType) {}
+
+  @Override
+  public void reportSpamFromCallHistory(
+      String number,
+      String countryIso,
+      int callType,
+      ReportingLocation.Type from,
+      ContactSource.Type contactSourceType) {}
+
+  @Override
+  public void reportNotSpamFromAfterCallNotification(
+      String number,
+      String countryIso,
+      int callType,
+      ReportingLocation.Type from,
+      ContactLookupResult.Type contactLookupResultType) {}
+
+  @Override
+  public void reportNotSpamFromCallHistory(
+      String number,
+      String countryIso,
+      int callType,
+      ReportingLocation.Type from,
+      ContactSource.Type contactSourceType) {}
+}
diff --git a/java/com/android/dialer/spam/stub/StubSpamModule.java b/java/com/android/dialer/spam/stub/StubSpamModule.java
new file mode 100644
index 0000000..e6b4622
--- /dev/null
+++ b/java/com/android/dialer/spam/stub/StubSpamModule.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.dialer.spam.stub;
+
+import com.android.dialer.inject.DialerVariant;
+import com.android.dialer.inject.InstallIn;
+import com.android.dialer.spam.Spam;
+import com.android.dialer.spam.SpamSettings;
+import dagger.Binds;
+import dagger.Module;
+
+/** Module which binds {@link SpamStub}. */
+@InstallIn(variants = {DialerVariant.DIALER_TEST})
+@Module
+public abstract class StubSpamModule {
+
+  @Binds
+  public abstract Spam bindSpam(SpamStub stub);
+
+  @Binds
+  public abstract SpamSettings bindSpamSettings(SpamSettingsStub stub);
+}
diff --git a/java/com/android/dialer/spannable/AndroidManifest.xml b/java/com/android/dialer/spannable/AndroidManifest.xml
new file mode 100644
index 0000000..0b05144
--- /dev/null
+++ b/java/com/android/dialer/spannable/AndroidManifest.xml
@@ -0,0 +1,22 @@
+<!--
+ ~ Copyright (C) 2018 The Android Open Source Project
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~      http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License
+ -->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.dialer.spannable">
+
+  <uses-sdk
+      android:minSdkVersion="24"
+      android:targetSdkVersion="28"/>
+</manifest>
diff --git a/java/com/android/dialer/spannable/ContentWithLearnMoreSpanner.java b/java/com/android/dialer/spannable/ContentWithLearnMoreSpanner.java
new file mode 100644
index 0000000..50302af
--- /dev/null
+++ b/java/com/android/dialer/spannable/ContentWithLearnMoreSpanner.java
@@ -0,0 +1,94 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.dialer.spannable;
+
+import android.content.Context;
+import android.support.annotation.NonNull;
+import android.text.SpannableString;
+import android.text.Spanned;
+import android.text.style.TypefaceSpan;
+import com.android.dialer.common.Assert;
+
+/**
+ * Creates {@link SpannableString SpannableStrings} which are styled appropriately for Dialer
+ * content with "Learn more" links.
+ *
+ * <p>Example usage:
+ *
+ * <pre>
+ *   TextView content = ...;
+ *   ContentWithLearnMoreSpanner creator = new ContentWithLearnMoreSpanner(getApplicationContext());
+ *   // myFeatureContent: "Try my feature. <xliff:g example="Learn more">%1$s</xliff:g>"
+ *   String content = getString(R.string.myFeatureContent);
+ *
+ *   SpannableString spannable = creator.create(content, "https://www.myFeatureHelp.com");
+ *   content.setText(spannable);
+ * </pre>
+ *
+ * Users will see: "Try my feature. Learn more" where "Learn more" links to the given url.
+ */
+public final class ContentWithLearnMoreSpanner {
+
+  private final Context context;
+
+  public ContentWithLearnMoreSpanner(@NonNull Context context) {
+    this.context = context.getApplicationContext();
+  }
+
+  /**
+   * Creates a spannable string using the given content and learn more url.
+   *
+   * @param contentFormatString a format string {@see java.util.Formatter} with a single string
+   *     format parameter, e.g. "Try my feature. %1$s".
+   * @param learnMoreUrl a url which the "Learn more" text will link to.
+   * @return a {@link SpannableString}. This string is put together by inserting the text "Learn
+   *     more" into the given {@code contentFormatString}, setting "Learn more" to link to the given
+   *     {@code learnMoreUrl}, then styling the "Learn more" text with common Dialer learn more
+   *     styling. The "Learn more" text uses a non-breaking-space character to ensure it says on a
+   *     single line.
+   * @throws java.util.IllegalFormatException if {@code contentFormatString} has an improper format
+   * @throws IllegalArgumentException if it wasn't possible to add "Learn more" to the given
+   *     contentFormatString
+   */
+  @NonNull
+  public SpannableString create(@NonNull String contentFormatString, @NonNull String learnMoreUrl) {
+    String learnMore = context.getString(R.string.general_learn_more);
+
+    SpannableString contents = new SpannableString(String.format(contentFormatString, learnMore));
+
+    Assert.checkArgument(
+        contents.toString().contains(learnMore),
+        "Couldn't add learn more link to %s",
+        contentFormatString);
+
+    int learnMoreSpanStartIndex = contents.toString().lastIndexOf(learnMore);
+    int learnMoreSpanEndIndex = learnMoreSpanStartIndex + learnMore.length();
+
+    contents.setSpan(
+        new TypefaceSpan("sans-serif-medium"),
+        learnMoreSpanStartIndex,
+        learnMoreSpanEndIndex,
+        Spanned.SPAN_INCLUSIVE_INCLUSIVE);
+
+    contents.setSpan(
+        new UrlSpanWithoutUnderline(learnMoreUrl),
+        learnMoreSpanStartIndex,
+        learnMoreSpanEndIndex,
+        Spanned.SPAN_INCLUSIVE_INCLUSIVE);
+
+    return contents;
+  }
+}
diff --git a/java/com/android/dialer/spannable/UrlSpanWithoutUnderline.java b/java/com/android/dialer/spannable/UrlSpanWithoutUnderline.java
new file mode 100644
index 0000000..81ffa6b
--- /dev/null
+++ b/java/com/android/dialer/spannable/UrlSpanWithoutUnderline.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.dialer.spannable;
+
+import android.text.TextPaint;
+import android.text.style.URLSpan;
+
+/** Version of {@link URLSpan} which doesn't underline links. */
+final class UrlSpanWithoutUnderline extends URLSpan {
+
+  UrlSpanWithoutUnderline(String url) {
+    super(url);
+  }
+
+  @Override
+  public void updateDrawState(TextPaint ds) {
+    super.updateDrawState(ds);
+    ds.setUnderlineText(false);
+  }
+}
diff --git a/java/com/android/dialer/spannable/res/values-af/strings.xml b/java/com/android/dialer/spannable/res/values-af/strings.xml
new file mode 100644
index 0000000..0145e79
--- /dev/null
+++ b/java/com/android/dialer/spannable/res/values-af/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="general_learn_more">Kom meer te wete</string>
+</resources>
diff --git a/java/com/android/dialer/spannable/res/values-am/strings.xml b/java/com/android/dialer/spannable/res/values-am/strings.xml
new file mode 100644
index 0000000..c447055
--- /dev/null
+++ b/java/com/android/dialer/spannable/res/values-am/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="general_learn_more">የበለጠ ለመረዳት</string>
+</resources>
diff --git a/java/com/android/dialer/spannable/res/values-ar/strings.xml b/java/com/android/dialer/spannable/res/values-ar/strings.xml
new file mode 100644
index 0000000..7fec712
--- /dev/null
+++ b/java/com/android/dialer/spannable/res/values-ar/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="general_learn_more">معرفة المزيد</string>
+</resources>
diff --git a/java/com/android/dialer/spannable/res/values-az/strings.xml b/java/com/android/dialer/spannable/res/values-az/strings.xml
new file mode 100644
index 0000000..c5c9973
--- /dev/null
+++ b/java/com/android/dialer/spannable/res/values-az/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="general_learn_more">Ətraflı məlumat</string>
+</resources>
diff --git a/java/com/android/dialer/spannable/res/values-b+sr+Latn/strings.xml b/java/com/android/dialer/spannable/res/values-b+sr+Latn/strings.xml
new file mode 100644
index 0000000..186fbc5
--- /dev/null
+++ b/java/com/android/dialer/spannable/res/values-b+sr+Latn/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="general_learn_more">Saznajte više</string>
+</resources>
diff --git a/java/com/android/dialer/spannable/res/values-be/strings.xml b/java/com/android/dialer/spannable/res/values-be/strings.xml
new file mode 100644
index 0000000..0586b04
--- /dev/null
+++ b/java/com/android/dialer/spannable/res/values-be/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="general_learn_more">Даведацца больш</string>
+</resources>
diff --git a/java/com/android/dialer/spannable/res/values-bg/strings.xml b/java/com/android/dialer/spannable/res/values-bg/strings.xml
new file mode 100644
index 0000000..bd0c6dc
--- /dev/null
+++ b/java/com/android/dialer/spannable/res/values-bg/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="general_learn_more">Научете повече</string>
+</resources>
diff --git a/java/com/android/dialer/spannable/res/values-bn/strings.xml b/java/com/android/dialer/spannable/res/values-bn/strings.xml
new file mode 100644
index 0000000..81c4351
--- /dev/null
+++ b/java/com/android/dialer/spannable/res/values-bn/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="general_learn_more">আরও জানুন</string>
+</resources>
diff --git a/java/com/android/dialer/spannable/res/values-bs/strings.xml b/java/com/android/dialer/spannable/res/values-bs/strings.xml
new file mode 100644
index 0000000..d2950fe
--- /dev/null
+++ b/java/com/android/dialer/spannable/res/values-bs/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="general_learn_more">Saznajte više</string>
+</resources>
diff --git a/java/com/android/dialer/spannable/res/values-ca/strings.xml b/java/com/android/dialer/spannable/res/values-ca/strings.xml
new file mode 100644
index 0000000..ffcb1c2
--- /dev/null
+++ b/java/com/android/dialer/spannable/res/values-ca/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="general_learn_more">Més informació</string>
+</resources>
diff --git a/java/com/android/dialer/spannable/res/values-cs/strings.xml b/java/com/android/dialer/spannable/res/values-cs/strings.xml
new file mode 100644
index 0000000..3a56c9f
--- /dev/null
+++ b/java/com/android/dialer/spannable/res/values-cs/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="general_learn_more">Další informace</string>
+</resources>
diff --git a/java/com/android/dialer/spannable/res/values-da/strings.xml b/java/com/android/dialer/spannable/res/values-da/strings.xml
new file mode 100644
index 0000000..f005a08
--- /dev/null
+++ b/java/com/android/dialer/spannable/res/values-da/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="general_learn_more">Få flere oplysninger</string>
+</resources>
diff --git a/java/com/android/dialer/spannable/res/values-de/strings.xml b/java/com/android/dialer/spannable/res/values-de/strings.xml
new file mode 100644
index 0000000..d9878bf
--- /dev/null
+++ b/java/com/android/dialer/spannable/res/values-de/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="general_learn_more">Weitere Informationen</string>
+</resources>
diff --git a/java/com/android/dialer/spannable/res/values-el/strings.xml b/java/com/android/dialer/spannable/res/values-el/strings.xml
new file mode 100644
index 0000000..e445c73
--- /dev/null
+++ b/java/com/android/dialer/spannable/res/values-el/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="general_learn_more">Μάθετε περισσότερα</string>
+</resources>
diff --git a/java/com/android/dialer/spannable/res/values-en-rAU/strings.xml b/java/com/android/dialer/spannable/res/values-en-rAU/strings.xml
new file mode 100644
index 0000000..414edb1
--- /dev/null
+++ b/java/com/android/dialer/spannable/res/values-en-rAU/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="general_learn_more">Learn more</string>
+</resources>
diff --git a/java/com/android/dialer/spannable/res/values-en-rGB/strings.xml b/java/com/android/dialer/spannable/res/values-en-rGB/strings.xml
new file mode 100644
index 0000000..414edb1
--- /dev/null
+++ b/java/com/android/dialer/spannable/res/values-en-rGB/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="general_learn_more">Learn more</string>
+</resources>
diff --git a/java/com/android/dialer/spannable/res/values-en-rIN/strings.xml b/java/com/android/dialer/spannable/res/values-en-rIN/strings.xml
new file mode 100644
index 0000000..414edb1
--- /dev/null
+++ b/java/com/android/dialer/spannable/res/values-en-rIN/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="general_learn_more">Learn more</string>
+</resources>
diff --git a/java/com/android/dialer/spannable/res/values-es-rUS/strings.xml b/java/com/android/dialer/spannable/res/values-es-rUS/strings.xml
new file mode 100644
index 0000000..bcd9b4e
--- /dev/null
+++ b/java/com/android/dialer/spannable/res/values-es-rUS/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="general_learn_more">Más información</string>
+</resources>
diff --git a/java/com/android/dialer/spannable/res/values-es/strings.xml b/java/com/android/dialer/spannable/res/values-es/strings.xml
new file mode 100644
index 0000000..bcd9b4e
--- /dev/null
+++ b/java/com/android/dialer/spannable/res/values-es/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="general_learn_more">Más información</string>
+</resources>
diff --git a/java/com/android/dialer/spannable/res/values-et/strings.xml b/java/com/android/dialer/spannable/res/values-et/strings.xml
new file mode 100644
index 0000000..e41445e
--- /dev/null
+++ b/java/com/android/dialer/spannable/res/values-et/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="general_learn_more">Lisateave</string>
+</resources>
diff --git a/java/com/android/dialer/spannable/res/values-eu/strings.xml b/java/com/android/dialer/spannable/res/values-eu/strings.xml
new file mode 100644
index 0000000..d7849a6
--- /dev/null
+++ b/java/com/android/dialer/spannable/res/values-eu/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="general_learn_more">Lortu informazio gehiago</string>
+</resources>
diff --git a/java/com/android/dialer/spannable/res/values-fa/strings.xml b/java/com/android/dialer/spannable/res/values-fa/strings.xml
new file mode 100644
index 0000000..612a608
--- /dev/null
+++ b/java/com/android/dialer/spannable/res/values-fa/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="general_learn_more">بیشتر بدانید</string>
+</resources>
diff --git a/java/com/android/dialer/spannable/res/values-fi/strings.xml b/java/com/android/dialer/spannable/res/values-fi/strings.xml
new file mode 100644
index 0000000..21f146f
--- /dev/null
+++ b/java/com/android/dialer/spannable/res/values-fi/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="general_learn_more">Lisätietoja</string>
+</resources>
diff --git a/java/com/android/dialer/spannable/res/values-fr-rCA/strings.xml b/java/com/android/dialer/spannable/res/values-fr-rCA/strings.xml
new file mode 100644
index 0000000..eaab17e
--- /dev/null
+++ b/java/com/android/dialer/spannable/res/values-fr-rCA/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="general_learn_more">En savoir plus</string>
+</resources>
diff --git a/java/com/android/dialer/spannable/res/values-fr/strings.xml b/java/com/android/dialer/spannable/res/values-fr/strings.xml
new file mode 100644
index 0000000..4ec9fd9
--- /dev/null
+++ b/java/com/android/dialer/spannable/res/values-fr/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="general_learn_more">En savoir plus</string>
+</resources>
diff --git a/java/com/android/dialer/spannable/res/values-gl/strings.xml b/java/com/android/dialer/spannable/res/values-gl/strings.xml
new file mode 100644
index 0000000..107828d
--- /dev/null
+++ b/java/com/android/dialer/spannable/res/values-gl/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="general_learn_more">Máis información</string>
+</resources>
diff --git a/java/com/android/dialer/spannable/res/values-gu/strings.xml b/java/com/android/dialer/spannable/res/values-gu/strings.xml
new file mode 100644
index 0000000..b0649a9
--- /dev/null
+++ b/java/com/android/dialer/spannable/res/values-gu/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="general_learn_more">વધુ જાણો</string>
+</resources>
diff --git a/java/com/android/dialer/spannable/res/values-hi/strings.xml b/java/com/android/dialer/spannable/res/values-hi/strings.xml
new file mode 100644
index 0000000..522d607
--- /dev/null
+++ b/java/com/android/dialer/spannable/res/values-hi/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="general_learn_more">अधिक जानें</string>
+</resources>
diff --git a/java/com/android/dialer/spannable/res/values-hr/strings.xml b/java/com/android/dialer/spannable/res/values-hr/strings.xml
new file mode 100644
index 0000000..186fbc5
--- /dev/null
+++ b/java/com/android/dialer/spannable/res/values-hr/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="general_learn_more">Saznajte više</string>
+</resources>
diff --git a/java/com/android/dialer/spannable/res/values-hu/strings.xml b/java/com/android/dialer/spannable/res/values-hu/strings.xml
new file mode 100644
index 0000000..b098f15
--- /dev/null
+++ b/java/com/android/dialer/spannable/res/values-hu/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="general_learn_more">További információ</string>
+</resources>
diff --git a/java/com/android/dialer/spannable/res/values-hy/strings.xml b/java/com/android/dialer/spannable/res/values-hy/strings.xml
new file mode 100644
index 0000000..e9782fe
--- /dev/null
+++ b/java/com/android/dialer/spannable/res/values-hy/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="general_learn_more">Իմանալ ավելին</string>
+</resources>
diff --git a/java/com/android/dialer/spannable/res/values-in/strings.xml b/java/com/android/dialer/spannable/res/values-in/strings.xml
new file mode 100644
index 0000000..fb3274d
--- /dev/null
+++ b/java/com/android/dialer/spannable/res/values-in/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="general_learn_more">Pelajari lebih lanjut</string>
+</resources>
diff --git a/java/com/android/dialer/spannable/res/values-is/strings.xml b/java/com/android/dialer/spannable/res/values-is/strings.xml
new file mode 100644
index 0000000..2e96253
--- /dev/null
+++ b/java/com/android/dialer/spannable/res/values-is/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="general_learn_more">Frekari upplýsingar</string>
+</resources>
diff --git a/java/com/android/dialer/spannable/res/values-it/strings.xml b/java/com/android/dialer/spannable/res/values-it/strings.xml
new file mode 100644
index 0000000..6a875bc
--- /dev/null
+++ b/java/com/android/dialer/spannable/res/values-it/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="general_learn_more">Ulteriori informazioni</string>
+</resources>
diff --git a/java/com/android/dialer/spannable/res/values-iw/strings.xml b/java/com/android/dialer/spannable/res/values-iw/strings.xml
new file mode 100644
index 0000000..9136163
--- /dev/null
+++ b/java/com/android/dialer/spannable/res/values-iw/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="general_learn_more">למידע נוסף</string>
+</resources>
diff --git a/java/com/android/dialer/spannable/res/values-ja/strings.xml b/java/com/android/dialer/spannable/res/values-ja/strings.xml
new file mode 100644
index 0000000..d24f842
--- /dev/null
+++ b/java/com/android/dialer/spannable/res/values-ja/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="general_learn_more">詳細</string>
+</resources>
diff --git a/java/com/android/dialer/spannable/res/values-ka/strings.xml b/java/com/android/dialer/spannable/res/values-ka/strings.xml
new file mode 100644
index 0000000..aa45378
--- /dev/null
+++ b/java/com/android/dialer/spannable/res/values-ka/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="general_learn_more">შეიტყვეთ მეტი</string>
+</resources>
diff --git a/java/com/android/dialer/spannable/res/values-kk/strings.xml b/java/com/android/dialer/spannable/res/values-kk/strings.xml
new file mode 100644
index 0000000..5ac3174
--- /dev/null
+++ b/java/com/android/dialer/spannable/res/values-kk/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="general_learn_more">Толығырақ ақпарат</string>
+</resources>
diff --git a/java/com/android/dialer/spannable/res/values-km/strings.xml b/java/com/android/dialer/spannable/res/values-km/strings.xml
new file mode 100644
index 0000000..447ac0e
--- /dev/null
+++ b/java/com/android/dialer/spannable/res/values-km/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="general_learn_more">ស្វែង​យល់​បន្ថែម</string>
+</resources>
diff --git a/java/com/android/dialer/spannable/res/values-kn/strings.xml b/java/com/android/dialer/spannable/res/values-kn/strings.xml
new file mode 100644
index 0000000..73ac836
--- /dev/null
+++ b/java/com/android/dialer/spannable/res/values-kn/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="general_learn_more">ಇನ್ನಷ್ಟು ತಿಳಿಯಿರಿ</string>
+</resources>
diff --git a/java/com/android/dialer/spannable/res/values-ko/strings.xml b/java/com/android/dialer/spannable/res/values-ko/strings.xml
new file mode 100644
index 0000000..26489e5
--- /dev/null
+++ b/java/com/android/dialer/spannable/res/values-ko/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="general_learn_more">자세히 알아보기</string>
+</resources>
diff --git a/java/com/android/dialer/spannable/res/values-ky/strings.xml b/java/com/android/dialer/spannable/res/values-ky/strings.xml
new file mode 100644
index 0000000..9813cc6
--- /dev/null
+++ b/java/com/android/dialer/spannable/res/values-ky/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="general_learn_more">Көбүрөөк маалымат</string>
+</resources>
diff --git a/java/com/android/dialer/spannable/res/values-lo/strings.xml b/java/com/android/dialer/spannable/res/values-lo/strings.xml
new file mode 100644
index 0000000..187b0d5
--- /dev/null
+++ b/java/com/android/dialer/spannable/res/values-lo/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="general_learn_more">ສຶກສາເພີ່ມເຕີມ</string>
+</resources>
diff --git a/java/com/android/dialer/spannable/res/values-lt/strings.xml b/java/com/android/dialer/spannable/res/values-lt/strings.xml
new file mode 100644
index 0000000..553d567
--- /dev/null
+++ b/java/com/android/dialer/spannable/res/values-lt/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="general_learn_more">Sužinoti daugiau</string>
+</resources>
diff --git a/java/com/android/dialer/spannable/res/values-lv/strings.xml b/java/com/android/dialer/spannable/res/values-lv/strings.xml
new file mode 100644
index 0000000..232d37f
--- /dev/null
+++ b/java/com/android/dialer/spannable/res/values-lv/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="general_learn_more">Uzzināt vairāk</string>
+</resources>
diff --git a/java/com/android/dialer/spannable/res/values-mk/strings.xml b/java/com/android/dialer/spannable/res/values-mk/strings.xml
new file mode 100644
index 0000000..3423e94
--- /dev/null
+++ b/java/com/android/dialer/spannable/res/values-mk/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="general_learn_more">Дознајте повеќе</string>
+</resources>
diff --git a/java/com/android/dialer/spannable/res/values-ml/strings.xml b/java/com/android/dialer/spannable/res/values-ml/strings.xml
new file mode 100644
index 0000000..f81fcf7
--- /dev/null
+++ b/java/com/android/dialer/spannable/res/values-ml/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="general_learn_more">കൂടുതലറിയുക</string>
+</resources>
diff --git a/java/com/android/dialer/spannable/res/values-mn/strings.xml b/java/com/android/dialer/spannable/res/values-mn/strings.xml
new file mode 100644
index 0000000..097bbd0
--- /dev/null
+++ b/java/com/android/dialer/spannable/res/values-mn/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="general_learn_more">Дэлгэрэнгүй үзэх</string>
+</resources>
diff --git a/java/com/android/dialer/spannable/res/values-mr/strings.xml b/java/com/android/dialer/spannable/res/values-mr/strings.xml
new file mode 100644
index 0000000..cac7aa2
--- /dev/null
+++ b/java/com/android/dialer/spannable/res/values-mr/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="general_learn_more">अधिक जाणून घ्या</string>
+</resources>
diff --git a/java/com/android/dialer/spannable/res/values-ms/strings.xml b/java/com/android/dialer/spannable/res/values-ms/strings.xml
new file mode 100644
index 0000000..78509b8
--- /dev/null
+++ b/java/com/android/dialer/spannable/res/values-ms/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="general_learn_more">Ketahui lebih lanjut</string>
+</resources>
diff --git a/java/com/android/dialer/spannable/res/values-my/strings.xml b/java/com/android/dialer/spannable/res/values-my/strings.xml
new file mode 100644
index 0000000..662b2f8
--- /dev/null
+++ b/java/com/android/dialer/spannable/res/values-my/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="general_learn_more">ပိုမိုလေ့လာရန်</string>
+</resources>
diff --git a/java/com/android/dialer/spannable/res/values-nb/strings.xml b/java/com/android/dialer/spannable/res/values-nb/strings.xml
new file mode 100644
index 0000000..c731248
--- /dev/null
+++ b/java/com/android/dialer/spannable/res/values-nb/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="general_learn_more">Finn ut mer</string>
+</resources>
diff --git a/java/com/android/dialer/spannable/res/values-ne/strings.xml b/java/com/android/dialer/spannable/res/values-ne/strings.xml
new file mode 100644
index 0000000..7e8d8a4
--- /dev/null
+++ b/java/com/android/dialer/spannable/res/values-ne/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="general_learn_more">थप जान्नुहोस्</string>
+</resources>
diff --git a/java/com/android/dialer/spannable/res/values-nl/strings.xml b/java/com/android/dialer/spannable/res/values-nl/strings.xml
new file mode 100644
index 0000000..d4d7a2c
--- /dev/null
+++ b/java/com/android/dialer/spannable/res/values-nl/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="general_learn_more">Meer informatie</string>
+</resources>
diff --git a/java/com/android/dialer/spannable/res/values-no/strings.xml b/java/com/android/dialer/spannable/res/values-no/strings.xml
new file mode 100644
index 0000000..c731248
--- /dev/null
+++ b/java/com/android/dialer/spannable/res/values-no/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="general_learn_more">Finn ut mer</string>
+</resources>
diff --git a/java/com/android/dialer/spannable/res/values-pa/strings.xml b/java/com/android/dialer/spannable/res/values-pa/strings.xml
new file mode 100644
index 0000000..ad9f841
--- /dev/null
+++ b/java/com/android/dialer/spannable/res/values-pa/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="general_learn_more">ਹੋਰ ਜਾਣੋ</string>
+</resources>
diff --git a/java/com/android/dialer/spannable/res/values-pl/strings.xml b/java/com/android/dialer/spannable/res/values-pl/strings.xml
new file mode 100644
index 0000000..096da24
--- /dev/null
+++ b/java/com/android/dialer/spannable/res/values-pl/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="general_learn_more">Więcej informacji</string>
+</resources>
diff --git a/java/com/android/dialer/spannable/res/values-pt-rBR/strings.xml b/java/com/android/dialer/spannable/res/values-pt-rBR/strings.xml
new file mode 100644
index 0000000..a97c4b0
--- /dev/null
+++ b/java/com/android/dialer/spannable/res/values-pt-rBR/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="general_learn_more">Saiba mais</string>
+</resources>
diff --git a/java/com/android/dialer/spannable/res/values-pt-rPT/strings.xml b/java/com/android/dialer/spannable/res/values-pt-rPT/strings.xml
new file mode 100644
index 0000000..9b82219
--- /dev/null
+++ b/java/com/android/dialer/spannable/res/values-pt-rPT/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="general_learn_more">Saiba mais</string>
+</resources>
diff --git a/java/com/android/dialer/spannable/res/values-pt/strings.xml b/java/com/android/dialer/spannable/res/values-pt/strings.xml
new file mode 100644
index 0000000..a97c4b0
--- /dev/null
+++ b/java/com/android/dialer/spannable/res/values-pt/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="general_learn_more">Saiba mais</string>
+</resources>
diff --git a/java/com/android/dialer/spannable/res/values-ro/strings.xml b/java/com/android/dialer/spannable/res/values-ro/strings.xml
new file mode 100644
index 0000000..cef7517
--- /dev/null
+++ b/java/com/android/dialer/spannable/res/values-ro/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="general_learn_more">Aflați mai multe</string>
+</resources>
diff --git a/java/com/android/dialer/spannable/res/values-ru/strings.xml b/java/com/android/dialer/spannable/res/values-ru/strings.xml
new file mode 100644
index 0000000..3a96401
--- /dev/null
+++ b/java/com/android/dialer/spannable/res/values-ru/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="general_learn_more">Подробнее…</string>
+</resources>
diff --git a/java/com/android/dialer/spannable/res/values-si/strings.xml b/java/com/android/dialer/spannable/res/values-si/strings.xml
new file mode 100644
index 0000000..9ccd747
--- /dev/null
+++ b/java/com/android/dialer/spannable/res/values-si/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="general_learn_more">තව දැන ගන්න</string>
+</resources>
diff --git a/java/com/android/dialer/spannable/res/values-sk/strings.xml b/java/com/android/dialer/spannable/res/values-sk/strings.xml
new file mode 100644
index 0000000..f1d6b30
--- /dev/null
+++ b/java/com/android/dialer/spannable/res/values-sk/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="general_learn_more">Ďalšie informácie</string>
+</resources>
diff --git a/java/com/android/dialer/spannable/res/values-sl/strings.xml b/java/com/android/dialer/spannable/res/values-sl/strings.xml
new file mode 100644
index 0000000..4c26258
--- /dev/null
+++ b/java/com/android/dialer/spannable/res/values-sl/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="general_learn_more">Več o tem</string>
+</resources>
diff --git a/java/com/android/dialer/spannable/res/values-sq/strings.xml b/java/com/android/dialer/spannable/res/values-sq/strings.xml
new file mode 100644
index 0000000..93023d5
--- /dev/null
+++ b/java/com/android/dialer/spannable/res/values-sq/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="general_learn_more">Mëso më shumë</string>
+</resources>
diff --git a/java/com/android/dialer/spannable/res/values-sr/strings.xml b/java/com/android/dialer/spannable/res/values-sr/strings.xml
new file mode 100644
index 0000000..b9e8831
--- /dev/null
+++ b/java/com/android/dialer/spannable/res/values-sr/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="general_learn_more">Сазнајте више</string>
+</resources>
diff --git a/java/com/android/dialer/spannable/res/values-sv/strings.xml b/java/com/android/dialer/spannable/res/values-sv/strings.xml
new file mode 100644
index 0000000..7e03669
--- /dev/null
+++ b/java/com/android/dialer/spannable/res/values-sv/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="general_learn_more">Läs mer</string>
+</resources>
diff --git a/java/com/android/dialer/spannable/res/values-sw/strings.xml b/java/com/android/dialer/spannable/res/values-sw/strings.xml
new file mode 100644
index 0000000..784f44a
--- /dev/null
+++ b/java/com/android/dialer/spannable/res/values-sw/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="general_learn_more">Pata maelezo zaidi</string>
+</resources>
diff --git a/java/com/android/dialer/spannable/res/values-ta/strings.xml b/java/com/android/dialer/spannable/res/values-ta/strings.xml
new file mode 100644
index 0000000..19115c9
--- /dev/null
+++ b/java/com/android/dialer/spannable/res/values-ta/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="general_learn_more">மேலும் அறிக</string>
+</resources>
diff --git a/java/com/android/dialer/spannable/res/values-te/strings.xml b/java/com/android/dialer/spannable/res/values-te/strings.xml
new file mode 100644
index 0000000..4a356f1
--- /dev/null
+++ b/java/com/android/dialer/spannable/res/values-te/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="general_learn_more">మరింత తెలుసుకోండి</string>
+</resources>
diff --git a/java/com/android/dialer/spannable/res/values-th/strings.xml b/java/com/android/dialer/spannable/res/values-th/strings.xml
new file mode 100644
index 0000000..4e8e573
--- /dev/null
+++ b/java/com/android/dialer/spannable/res/values-th/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="general_learn_more">ดูข้อมูลเพิ่มเติม</string>
+</resources>
diff --git a/java/com/android/dialer/spannable/res/values-tl/strings.xml b/java/com/android/dialer/spannable/res/values-tl/strings.xml
new file mode 100644
index 0000000..dcf1677
--- /dev/null
+++ b/java/com/android/dialer/spannable/res/values-tl/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="general_learn_more">Matuto pa</string>
+</resources>
diff --git a/java/com/android/dialer/spannable/res/values-tr/strings.xml b/java/com/android/dialer/spannable/res/values-tr/strings.xml
new file mode 100644
index 0000000..62a5e96
--- /dev/null
+++ b/java/com/android/dialer/spannable/res/values-tr/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="general_learn_more">Daha fazla bilgi</string>
+</resources>
diff --git a/java/com/android/dialer/spannable/res/values-uk/strings.xml b/java/com/android/dialer/spannable/res/values-uk/strings.xml
new file mode 100644
index 0000000..215b893
--- /dev/null
+++ b/java/com/android/dialer/spannable/res/values-uk/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="general_learn_more">Докладніше</string>
+</resources>
diff --git a/java/com/android/dialer/spannable/res/values-ur/strings.xml b/java/com/android/dialer/spannable/res/values-ur/strings.xml
new file mode 100644
index 0000000..862e19a
--- /dev/null
+++ b/java/com/android/dialer/spannable/res/values-ur/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="general_learn_more">مزید جانیں</string>
+</resources>
diff --git a/java/com/android/dialer/spannable/res/values-uz/strings.xml b/java/com/android/dialer/spannable/res/values-uz/strings.xml
new file mode 100644
index 0000000..c11d8c8
--- /dev/null
+++ b/java/com/android/dialer/spannable/res/values-uz/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="general_learn_more">Batafsil</string>
+</resources>
diff --git a/java/com/android/dialer/spannable/res/values-vi/strings.xml b/java/com/android/dialer/spannable/res/values-vi/strings.xml
new file mode 100644
index 0000000..967f7f9
--- /dev/null
+++ b/java/com/android/dialer/spannable/res/values-vi/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="general_learn_more">Tìm hiểu thêm</string>
+</resources>
diff --git a/java/com/android/dialer/spannable/res/values-zh-rCN/strings.xml b/java/com/android/dialer/spannable/res/values-zh-rCN/strings.xml
new file mode 100644
index 0000000..db1ac39
--- /dev/null
+++ b/java/com/android/dialer/spannable/res/values-zh-rCN/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="general_learn_more">了解详情</string>
+</resources>
diff --git a/java/com/android/dialer/spannable/res/values-zh-rHK/strings.xml b/java/com/android/dialer/spannable/res/values-zh-rHK/strings.xml
new file mode 100644
index 0000000..bab3f6f
--- /dev/null
+++ b/java/com/android/dialer/spannable/res/values-zh-rHK/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="general_learn_more">瞭解詳情</string>
+</resources>
diff --git a/java/com/android/dialer/spannable/res/values-zh-rTW/strings.xml b/java/com/android/dialer/spannable/res/values-zh-rTW/strings.xml
new file mode 100644
index 0000000..bab3f6f
--- /dev/null
+++ b/java/com/android/dialer/spannable/res/values-zh-rTW/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="general_learn_more">瞭解詳情</string>
+</resources>
diff --git a/java/com/android/dialer/spannable/res/values-zu/strings.xml b/java/com/android/dialer/spannable/res/values-zu/strings.xml
new file mode 100644
index 0000000..c06da43
--- /dev/null
+++ b/java/com/android/dialer/spannable/res/values-zu/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="general_learn_more">Funda kabanzi</string>
+</resources>
diff --git a/java/com/android/dialer/spannable/res/values/strings.xml b/java/com/android/dialer/spannable/res/values/strings.xml
new file mode 100644
index 0000000..9e214b2
--- /dev/null
+++ b/java/com/android/dialer/spannable/res/values/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2018 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+<resources>
+
+  <!-- The Learn more text used for all features to link to additional details.
+      [CHAR_LIMIT=30] -->
+  <string name="general_learn_more">Learn\u00A0more</string>
+</resources>
\ No newline at end of file
diff --git a/java/com/android/dialer/speeddial/AddFavoriteActivity.java b/java/com/android/dialer/speeddial/AddFavoriteActivity.java
deleted file mode 100644
index eea6e84..0000000
--- a/java/com/android/dialer/speeddial/AddFavoriteActivity.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.dialer.speeddial;
-
-import android.content.ContentValues;
-import android.net.Uri;
-import android.os.Bundle;
-import android.provider.ContactsContract.Contacts;
-import android.support.annotation.Nullable;
-import android.support.annotation.WorkerThread;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.SearchView;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.widget.ImageView;
-import com.android.dialer.common.Assert;
-import com.android.dialer.common.concurrent.DialerExecutorComponent;
-import com.android.dialer.contactsfragment.ContactsFragment;
-import com.android.dialer.contactsfragment.ContactsFragment.OnContactSelectedListener;
-
-/**
- * Activity for selecting a single contact and adding it to favorites.
- *
- * <p>Contacts are displayed using {@link ContactsFragment}. Contacts are searchable via search bar
- * in the toolbar. When a contact is selected, it's uri is passed back in the result data.
- */
-public class AddFavoriteActivity extends AppCompatActivity implements OnContactSelectedListener {
-
-  private ContactsFragment contactsFragment;
-
-  @Override
-  protected void onCreate(@Nullable Bundle bundle) {
-    super.onCreate(bundle);
-    setContentView(R.layout.add_favorite_activity);
-    contactsFragment = ContactsFragment.newAddFavoritesInstance();
-    getFragmentManager()
-        .beginTransaction()
-        .add(R.id.add_favorite_container, contactsFragment, null)
-        .commit();
-  }
-
-  @Override
-  public boolean onCreateOptionsMenu(Menu menu) {
-    getMenuInflater().inflate(R.menu.add_favorite_menu, menu);
-
-    MenuItem searchItem = menu.findItem(R.id.action_search);
-    SearchView searchView = (SearchView) searchItem.getActionView();
-    searchView.setOnQueryTextListener(
-        new SearchView.OnQueryTextListener() {
-          @Override
-          public boolean onQueryTextSubmit(String query) {
-            if (!searchView.isIconified()) {
-              searchView.setIconified(true);
-            }
-            searchItem.collapseActionView();
-            return false;
-          }
-
-          @Override
-          public boolean onQueryTextChange(String s) {
-            contactsFragment.updateQuery(s);
-            return false;
-          }
-        });
-    return true;
-  }
-
-  @Override
-  public void onContactSelected(ImageView photo, Uri contactUri, long contactId) {
-    DialerExecutorComponent.get(this)
-        .dialerExecutorFactory()
-        .createUiTaskBuilder(
-            getFragmentManager(), "mark_contact_favorite", this::markContactStarred)
-        .onSuccess(output -> finish())
-        .onFailure(this::onContactStarredFailed)
-        .build()
-        .executeParallel(contactId);
-  }
-
-  @WorkerThread
-  private int markContactStarred(long contactId) {
-    // TODO(calderwoodra): For now, we will just mark contacts as starred. This means that contacts
-    // will only be able to exist once in favorites until we implement multiple contact avenues.
-    ContentValues contentValues = new ContentValues();
-    contentValues.put(Contacts.STARRED, 1);
-
-    String where = Contacts._ID + " = ?";
-    String[] selectionArgs = new String[] {Long.toString(contactId)};
-    return getContentResolver().update(Contacts.CONTENT_URI, contentValues, where, selectionArgs);
-  }
-
-  private void onContactStarredFailed(Throwable throwable) {
-    throw Assert.createAssertionFailException(throwable.getMessage());
-  }
-}
diff --git a/java/com/android/dialer/speeddial/AndroidManifest.xml b/java/com/android/dialer/speeddial/AndroidManifest.xml
index 99ab12c..913e500 100644
--- a/java/com/android/dialer/speeddial/AndroidManifest.xml
+++ b/java/com/android/dialer/speeddial/AndroidManifest.xml
@@ -13,15 +13,4 @@
  ~ See the License for the specific language governing permissions and
  ~ limitations under the License
  -->
-<manifest
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.dialer.speeddial">
-
-  <application android:theme="@style/Theme.AppCompat">
-    <activity
-        android:name="com.android.dialer.speeddial.AddFavoriteActivity"
-        android:label="@string/add_favorite_activity_title"
-        android:exported="false"
-        android:theme="@style/DialtactsTheme"/>
-  </application>
-</manifest>
\ No newline at end of file
+<manifest package="com.android.dialer.speeddial"/>
diff --git a/java/com/android/dialer/speeddial/ContextMenu.java b/java/com/android/dialer/speeddial/ContextMenu.java
new file mode 100644
index 0000000..e0a4551
--- /dev/null
+++ b/java/com/android/dialer/speeddial/ContextMenu.java
@@ -0,0 +1,139 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.dialer.speeddial;
+
+import android.content.Context;
+import android.support.annotation.NonNull;
+import android.support.annotation.VisibleForTesting;
+import android.support.v7.widget.PopupMenu;
+import android.support.v7.widget.PopupMenu.OnMenuItemClickListener;
+import android.text.TextUtils;
+import android.view.Gravity;
+import android.view.MenuItem;
+import android.view.View;
+import com.android.dialer.common.Assert;
+import com.android.dialer.speeddial.database.SpeedDialEntry.Channel;
+import com.android.dialer.speeddial.loader.SpeedDialUiItem;
+
+/** {@link PopupMenu} which presents contact options for starred contacts. */
+public class ContextMenu extends PopupMenu implements OnMenuItemClickListener {
+
+  private final ContextMenuItemListener listener;
+
+  private final SpeedDialUiItem speedDialUiItem;
+  private final Channel voiceChannel;
+  private final Channel videoChannel;
+
+  private boolean visible;
+
+  /**
+   * Creates a new context menu and displays it.
+   *
+   * @see #show()
+   */
+  public static ContextMenu show(
+      Context context,
+      View anchor,
+      ContextMenuItemListener contextMenuListener,
+      SpeedDialUiItem speedDialUiItem) {
+    ContextMenu menu = new ContextMenu(context, anchor, contextMenuListener, speedDialUiItem);
+    menu.show();
+    menu.visible = true;
+    return menu;
+  }
+
+  /**
+   * Hides the context menu.
+   *
+   * @see #dismiss()
+   */
+  public void hide() {
+    dismiss();
+    visible = false;
+  }
+
+  private ContextMenu(
+      @NonNull Context context,
+      @NonNull View anchor,
+      ContextMenuItemListener listener,
+      SpeedDialUiItem speedDialUiItem) {
+    super(context, anchor, Gravity.CENTER);
+    this.listener = listener;
+    this.speedDialUiItem = speedDialUiItem;
+    voiceChannel = speedDialUiItem.getDefaultVoiceChannel();
+    videoChannel = speedDialUiItem.getDefaultVideoChannel();
+
+    setOnMenuItemClickListener(this);
+    getMenuInflater().inflate(R.menu.starred_contact_context_menu, getMenu());
+    getMenu().findItem(R.id.voice_call_container).setVisible(voiceChannel != null);
+    getMenu().findItem(R.id.video_call_container).setVisible(videoChannel != null);
+    getMenu().findItem(R.id.send_message_container).setVisible(voiceChannel != null);
+    if (voiceChannel != null) {
+      String secondaryInfo =
+          TextUtils.isEmpty(voiceChannel.label())
+              ? voiceChannel.number()
+              : context.getString(
+                  R.string.call_subject_type_and_number,
+                  voiceChannel.label(),
+                  voiceChannel.number());
+      getMenu().findItem(R.id.starred_contact_context_menu_title).setTitle(secondaryInfo);
+      getMenu().findItem(R.id.starred_contact_context_menu_title).setVisible(true);
+    } else {
+      getMenu().findItem(R.id.starred_contact_context_menu_title).setVisible(false);
+    }
+  }
+
+  @Override
+  public boolean onMenuItemClick(MenuItem menuItem) {
+    if (menuItem.getItemId() == R.id.voice_call_container) {
+      listener.placeCall(Assert.isNotNull(voiceChannel));
+    } else if (menuItem.getItemId() == R.id.video_call_container) {
+      listener.placeCall(Assert.isNotNull(videoChannel));
+    } else if (menuItem.getItemId() == R.id.send_message_container) {
+      listener.openSmsConversation(voiceChannel.number());
+    } else if (menuItem.getItemId() == R.id.remove_container) {
+      listener.removeFavoriteContact(speedDialUiItem);
+    } else if (menuItem.getItemId() == R.id.contact_info_container) {
+      listener.openContactInfo(speedDialUiItem);
+    } else {
+      throw Assert.createIllegalStateFailException("Menu option click not handled");
+    }
+    return true;
+  }
+
+  @VisibleForTesting(otherwise = VisibleForTesting.NONE)
+  public boolean isVisible() {
+    return visible;
+  }
+
+  /** Listener to report user clicks on menu items. */
+  @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)
+  public interface ContextMenuItemListener {
+
+    /** Called when the user selects "voice call" or "video call" option from the context menu. */
+    void placeCall(Channel channel);
+
+    /** Called when the user selects "send message" from the context menu. */
+    void openSmsConversation(String number);
+
+    /** Called when the user selects "remove" from the context menu. */
+    void removeFavoriteContact(SpeedDialUiItem speedDialUiItem);
+
+    /** Called when the user selects "contact info" from the context menu. */
+    void openContactInfo(SpeedDialUiItem speedDialUiItem);
+  }
+}
diff --git a/java/com/android/dialer/speeddial/DisambigDialog.java b/java/com/android/dialer/speeddial/DisambigDialog.java
index ca02f41..15b8109 100644
--- a/java/com/android/dialer/speeddial/DisambigDialog.java
+++ b/java/com/android/dialer/speeddial/DisambigDialog.java
@@ -16,64 +16,81 @@
 
 package com.android.dialer.speeddial;
 
-import android.app.AlertDialog;
 import android.app.Dialog;
-import android.app.DialogFragment;
-import android.app.FragmentManager;
-import android.content.ContentResolver;
-import android.content.res.Resources;
-import android.database.Cursor;
+import android.content.Context;
 import android.os.Bundle;
-import android.provider.ContactsContract.CommonDataKinds.Phone;
-import android.support.annotation.Nullable;
 import android.support.annotation.VisibleForTesting;
+import android.support.annotation.WorkerThread;
+import android.support.v4.app.DialogFragment;
+import android.support.v4.app.FragmentManager;
+import android.support.v7.app.AlertDialog;
 import android.text.TextUtils;
 import android.util.ArraySet;
 import android.view.LayoutInflater;
 import android.view.View;
+import android.widget.CheckBox;
+import android.widget.ImageView;
 import android.widget.LinearLayout;
+import android.widget.LinearLayout.LayoutParams;
 import android.widget.TextView;
 import com.android.dialer.callintent.CallInitiationType;
 import com.android.dialer.callintent.CallIntentBuilder;
+import com.android.dialer.common.Assert;
 import com.android.dialer.common.LogUtil;
-import com.android.dialer.common.concurrent.DialerExecutor.Worker;
+import com.android.dialer.common.concurrent.DefaultFutureCallback;
 import com.android.dialer.common.concurrent.DialerExecutorComponent;
-import com.android.dialer.duo.DuoComponent;
+import com.android.dialer.logging.DialerImpression;
+import com.android.dialer.logging.Logger;
 import com.android.dialer.precall.PreCall;
-import java.util.ArrayList;
-import java.util.Arrays;
+import com.android.dialer.speeddial.database.SpeedDialEntry;
+import com.android.dialer.speeddial.database.SpeedDialEntry.Channel;
+import com.android.dialer.speeddial.database.SpeedDialEntryDatabaseHelper;
+import com.android.dialer.speeddial.loader.SpeedDialUiItem;
+import com.google.common.collect.ImmutableList;
+import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.ListenableFuture;
+import java.util.List;
 import java.util.Set;
 
 /** Disambiguation dialog for favorite contacts in {@link SpeedDialFragment}. */
 public class DisambigDialog extends DialogFragment {
 
-  @VisibleForTesting public static final String DISAMBIG_DIALOG_TAG = "disambig_dialog";
-  private static final String DISAMBIG_DIALOG_WORKER_TAG = "disambig_dialog_worker";
-
+  @VisibleForTesting public static final String FRAGMENT_TAG = "disambig_dialog";
   private final Set<String> phoneNumbers = new ArraySet<>();
-  private LinearLayout container;
-  private String lookupKey;
+
+  private SpeedDialUiItem speedDialUiItem;
+  @VisibleForTesting public List<Channel> channels;
+  @VisibleForTesting public LinearLayout container;
+  @VisibleForTesting public CheckBox rememberThisChoice;
 
   /** Show a disambiguation dialog for a starred contact without a favorite communication avenue. */
-  public static DisambigDialog show(String lookupKey, FragmentManager manager) {
+  public static DisambigDialog show(SpeedDialUiItem speedDialUiItem, FragmentManager manager) {
     DisambigDialog dialog = new DisambigDialog();
-    dialog.lookupKey = lookupKey;
-    dialog.show(manager, DISAMBIG_DIALOG_TAG);
+    dialog.speedDialUiItem = speedDialUiItem;
+    dialog.channels = speedDialUiItem.channels();
+    dialog.show(manager, FRAGMENT_TAG);
     return dialog;
   }
 
   @Override
   public Dialog onCreateDialog(Bundle savedInstanceState) {
     LayoutInflater inflater = getActivity().getLayoutInflater();
+    // TODO(calderwoodra): set max height of the scrollview. Might need to override onMeasure.
     View view = inflater.inflate(R.layout.disambig_dialog_layout, null, false);
     container = view.findViewById(R.id.communication_avenue_container);
+    rememberThisChoice = view.findViewById(R.id.remember_this_choice_checkbox);
+    insertOptions(container.findViewById(R.id.communication_avenue_container), channels);
     return new AlertDialog.Builder(getActivity()).setView(view).create();
   }
 
   @Override
   public void onResume() {
     super.onResume();
-    lookupContactInfo();
+    getDialog()
+        .getWindow()
+        .setLayout(
+            getContext().getResources().getDimensionPixelSize(R.dimen.disambig_dialog_width),
+            LayoutParams.WRAP_CONTENT);
   }
 
   @Override
@@ -84,19 +101,6 @@
     dismiss();
   }
 
-  private void lookupContactInfo() {
-    DialerExecutorComponent.get(getContext())
-        .dialerExecutorFactory()
-        .createUiTaskBuilder(
-            getFragmentManager(),
-            DISAMBIG_DIALOG_WORKER_TAG,
-            new LookupContactInfoWorker(getContext().getContentResolver()))
-        .onSuccess(this::insertOptions)
-        .onFailure(this::onLookupFailed)
-        .build()
-        .executeParallel(lookupKey);
-  }
-
   /**
    * Inflates and inserts the following in the dialog:
    *
@@ -106,139 +110,129 @@
    *   <li>Clickable voice option
    * </ul>
    */
-  private void insertOptions(Cursor cursor) {
-    if (!cursorIsValid(cursor)) {
-      dismiss();
-      return;
-    }
-
-    do {
-      String number = cursor.getString(LookupContactInfoWorker.NUMBER_INDEX);
-      // TODO(calderwoodra): improve this to include fuzzy matching
-      if (phoneNumbers.add(number)) {
-        insertOption(
-            number,
-            getLabel(getContext().getResources(), cursor),
-            isVideoReachable(cursor, number));
+  private void insertOptions(LinearLayout container, List<Channel> channels) {
+    for (Channel channel : channels) {
+      // TODO(calderwoodra): use fuzzy number matcher
+      if (phoneNumbers.add(channel.number())) {
+        if (phoneNumbers.size() != 1) {
+          insertDivider(container);
+        }
+        insertHeader(container, channel.number(), channel.label());
       }
-    } while (cursor.moveToNext());
-    cursor.close();
-    // TODO(calderwoodra): set max height of the scrollview. Might need to override onMeasure.
+      insertOption(container, channel);
+    }
   }
 
-  /** Returns true if the given number is ViLTE reachable or Duo reachable. */
-  private boolean isVideoReachable(Cursor cursor, String number) {
-    boolean isVideoReachable = cursor.getInt(LookupContactInfoWorker.PHONE_PRESENCE_INDEX) == 1;
-    if (!isVideoReachable) {
-      isVideoReachable = DuoComponent.get(getContext()).getDuo().isReachable(getContext(), number);
-    }
-    return isVideoReachable;
+  private void insertDivider(LinearLayout container) {
+    View view =
+        getActivity()
+            .getLayoutInflater()
+            .inflate(R.layout.disambig_dialog_divider, container, false);
+    container.addView(view);
+  }
+
+  private void insertHeader(LinearLayout container, String number, String label) {
+    View view =
+        getActivity()
+            .getLayoutInflater()
+            .inflate(R.layout.disambig_option_header_layout, container, false);
+    String secondaryInfo =
+        TextUtils.isEmpty(label)
+            ? number
+            : getContext().getString(R.string.call_subject_type_and_number, label, number);
+    ((TextView) view.findViewById(R.id.disambig_header_phone_label)).setText(secondaryInfo);
+    container.addView(view);
   }
 
   /** Inserts a group of options for a specific phone number. */
-  private void insertOption(String number, String phoneType, boolean isVideoReachable) {
+  private void insertOption(LinearLayout container, Channel channel) {
     View view =
         getActivity()
             .getLayoutInflater()
             .inflate(R.layout.disambig_option_layout, container, false);
-    ((TextView) view.findViewById(R.id.phone_type)).setText(phoneType);
-    ((TextView) view.findViewById(R.id.phone_number)).setText(number);
-
-    if (isVideoReachable) {
-      View videoOption = view.findViewById(R.id.video_call_container);
-      videoOption.setOnClickListener(v -> onVideoOptionClicked(number));
-      videoOption.setVisibility(View.VISIBLE);
+    if (channel.isVideoTechnology()) {
+      View videoOption = view.findViewById(R.id.option_container);
+      videoOption.setOnClickListener(v -> onVideoOptionClicked(channel));
+      videoOption.setContentDescription(
+          getActivity().getString(R.string.disambig_option_video_call));
+      ((ImageView) view.findViewById(R.id.disambig_option_image))
+          .setImageResource(R.drawable.quantum_ic_videocam_vd_theme_24);
+      ((TextView) view.findViewById(R.id.disambig_option_text))
+          .setText(R.string.disambig_option_video_call);
+    } else {
+      View voiceOption = view.findViewById(R.id.option_container);
+      voiceOption.setOnClickListener(v -> onVoiceOptionClicked(channel));
+      voiceOption.setContentDescription(
+          getActivity().getString(R.string.disambig_option_voice_call));
+      ((ImageView) view.findViewById(R.id.disambig_option_image))
+          .setImageResource(R.drawable.quantum_ic_phone_vd_theme_24);
+      ((TextView) view.findViewById(R.id.disambig_option_text))
+          .setText(R.string.disambig_option_voice_call);
     }
-    View voiceOption = view.findViewById(R.id.voice_call_container);
-    voiceOption.setOnClickListener(v -> onVoiceOptionClicked(number));
     container.addView(view);
   }
 
-  private void onVideoOptionClicked(String number) {
-    // TODO(calderwoodra): save this option if remember is checked
-    // TODO(calderwoodra): place a duo call if possible
+  private void onVideoOptionClicked(Channel channel) {
+    if (rememberThisChoice.isChecked()) {
+      Logger.get(getContext()).logImpression(DialerImpression.Type.FAVORITE_SET_VIDEO_DEFAULT);
+      setDefaultChannel(getContext().getApplicationContext(), speedDialUiItem, channel);
+    }
+
+    if (channel.technology() == Channel.DUO) {
+      Logger.get(getContext())
+          .logImpression(
+              DialerImpression.Type.LIGHTBRINGER_VIDEO_REQUESTED_FOR_FAVORITE_CONTACT_DISAMBIG);
+    }
+
     PreCall.start(
         getContext(),
-        new CallIntentBuilder(number, CallInitiationType.Type.SPEED_DIAL).setIsVideoCall(true));
+        new CallIntentBuilder(channel.number(), CallInitiationType.Type.SPEED_DIAL_DISAMBIG_DIALOG)
+            .setAllowAssistedDial(true)
+            .setIsVideoCall(true)
+            .setIsDuoCall(channel.technology() == Channel.DUO));
+    dismiss();
   }
 
-  private void onVoiceOptionClicked(String number) {
-    // TODO(calderwoodra): save this option if remember is checked
-    PreCall.start(getContext(), new CallIntentBuilder(number, CallInitiationType.Type.SPEED_DIAL));
-  }
-
-  // TODO(calderwoodra): handle CNAP and cequint types.
-  // TODO(calderwoodra): unify this into a utility method with CallLogAdapter#getNumberType
-  private static String getLabel(Resources resources, Cursor cursor) {
-    int numberType = cursor.getInt(LookupContactInfoWorker.PHONE_TYPE_INDEX);
-    String numberLabel = cursor.getString(LookupContactInfoWorker.PHONE_LABEL_INDEX);
-
-    // Returns empty label instead of "custom" if the custom label is empty.
-    if (numberType == Phone.TYPE_CUSTOM && TextUtils.isEmpty(numberLabel)) {
-      return "";
-    }
-    return (String) Phone.getTypeLabel(resources, numberType, numberLabel);
-  }
-
-  // Checks if the cursor is valid and logs an error if there are any issues.
-  private static boolean cursorIsValid(Cursor cursor) {
-    if (cursor == null) {
-      LogUtil.e("DisambigDialog.insertOptions", "cursor null.");
-      return false;
-    } else if (cursor.isClosed()) {
-      LogUtil.e("DisambigDialog.insertOptions", "cursor closed.");
-      cursor.close();
-      return false;
-    } else if (!cursor.moveToFirst()) {
-      LogUtil.e("DisambigDialog.insertOptions", "cursor empty.");
-      cursor.close();
-      return false;
-    }
-    return true;
-  }
-
-  private void onLookupFailed(Throwable throwable) {
-    LogUtil.e("DisambigDialog.onLookupFailed", null, throwable);
-    insertOptions(null);
-  }
-
-  private static class LookupContactInfoWorker implements Worker<String, Cursor> {
-
-    static final int NUMBER_INDEX = 0;
-    static final int PHONE_TYPE_INDEX = 1;
-    static final int PHONE_LABEL_INDEX = 2;
-    static final int PHONE_PRESENCE_INDEX = 3;
-
-    private static final String[] projection =
-        new String[] {Phone.NUMBER, Phone.TYPE, Phone.LABEL, Phone.CARRIER_PRESENCE};
-    private final ContentResolver resolver;
-
-    LookupContactInfoWorker(ContentResolver resolver) {
-      this.resolver = resolver;
+  private void onVoiceOptionClicked(Channel channel) {
+    if (rememberThisChoice.isChecked()) {
+      Logger.get(getContext()).logImpression(DialerImpression.Type.FAVORITE_SET_VOICE_DEFAULT);
+      setDefaultChannel(getContext().getApplicationContext(), speedDialUiItem, channel);
     }
 
-    @Nullable
-    @Override
-    public Cursor doInBackground(@Nullable String lookupKey) throws Throwable {
-      if (TextUtils.isEmpty(lookupKey)) {
-        LogUtil.e("LookupConctactInfoWorker.doInBackground", "contact id unsest.");
-        return null;
-      }
-      return resolver.query(
-          Phone.CONTENT_URI, projection, Phone.LOOKUP_KEY + " = ?", new String[] {lookupKey}, null);
-    }
+    PreCall.start(
+        getContext(),
+        new CallIntentBuilder(channel.number(), CallInitiationType.Type.SPEED_DIAL_DISAMBIG_DIALOG)
+            .setAllowAssistedDial(true));
+    dismiss();
   }
 
-  @VisibleForTesting
-  public static String[] getProjectionForTesting() {
-    ArrayList<String> projection =
-        new ArrayList<>(Arrays.asList(LookupContactInfoWorker.projection));
-    projection.add(Phone.LOOKUP_KEY);
-    return projection.toArray(new String[projection.size()]);
+  private static void setDefaultChannel(Context appContext, SpeedDialUiItem item, Channel channel) {
+    LogUtil.enterBlock("DisambigDialog.setDefaultChannel");
+    ListenableFuture<Void> future =
+        DialerExecutorComponent.get(appContext)
+            .backgroundExecutor()
+            .submit(
+                () -> {
+                  updateDatabaseEntry(appContext, item, channel);
+                  return null;
+                });
+    Futures.addCallback(
+        future,
+        new DefaultFutureCallback<>(),
+        DialerExecutorComponent.get(appContext).backgroundExecutor());
   }
 
-  @VisibleForTesting
-  public LinearLayout getContainer() {
-    return container;
+  @WorkerThread
+  private static void updateDatabaseEntry(
+      Context appContext, SpeedDialUiItem item, Channel channel) {
+    Assert.isWorkerThread();
+    SpeedDialEntry entry =
+        SpeedDialEntry.builder()
+            .setId(item.speedDialEntryId())
+            .setContactId(item.contactId())
+            .setLookupKey(item.lookupKey())
+            .setDefaultChannel(channel)
+            .build();
+    new SpeedDialEntryDatabaseHelper(appContext).update(ImmutableList.of(entry));
   }
 }
diff --git a/java/com/android/dialer/speeddial/FavoritesViewHolder.java b/java/com/android/dialer/speeddial/FavoritesViewHolder.java
index c25b05e..600c8c7 100644
--- a/java/com/android/dialer/speeddial/FavoritesViewHolder.java
+++ b/java/com/android/dialer/speeddial/FavoritesViewHolder.java
@@ -17,26 +17,27 @@
 package com.android.dialer.speeddial;
 
 import android.content.Context;
-import android.content.res.Resources;
-import android.database.Cursor;
-import android.net.Uri;
-import android.provider.ContactsContract.CommonDataKinds.Phone;
 import android.provider.ContactsContract.Contacts;
 import android.support.v7.widget.RecyclerView;
-import android.text.TextUtils;
+import android.support.v7.widget.helper.ItemTouchHelper;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.View.OnLongClickListener;
+import android.view.ViewConfiguration;
 import android.widget.FrameLayout;
 import android.widget.QuickContactBadge;
 import android.widget.TextView;
 import com.android.dialer.common.Assert;
-import com.android.dialer.contactphoto.ContactPhotoManager;
-import com.android.dialer.lettertile.LetterTileDrawable;
+import com.android.dialer.glidephotomanager.GlidePhotoManagerComponent;
+import com.android.dialer.glidephotomanager.PhotoInfo;
+import com.android.dialer.speeddial.database.SpeedDialEntry.Channel;
+import com.android.dialer.speeddial.draghelper.SpeedDialFavoritesViewHolderOnTouchListener;
+import com.android.dialer.speeddial.draghelper.SpeedDialFavoritesViewHolderOnTouchListener.OnTouchFinishCallback;
+import com.android.dialer.speeddial.loader.SpeedDialUiItem;
 
 /** ViewHolder for starred/favorite contacts in {@link SpeedDialFragment}. */
 public class FavoritesViewHolder extends RecyclerView.ViewHolder
-    implements OnClickListener, OnLongClickListener {
+    implements OnClickListener, OnLongClickListener, OnTouchFinishCallback {
 
   private final FavoriteContactsListener listener;
 
@@ -45,89 +46,105 @@
   private final TextView phoneType;
   private final FrameLayout videoCallIcon;
 
-  private boolean hasDefaultNumber;
-  private boolean isVideoCall;
-  private String number;
-  private String lookupKey;
+  private final FrameLayout avatarContainer;
 
-  public FavoritesViewHolder(View view, FavoriteContactsListener listener) {
+  private SpeedDialUiItem speedDialUiItem;
+
+  public FavoritesViewHolder(View view, ItemTouchHelper helper, FavoriteContactsListener listener) {
     super(view);
     photoView = view.findViewById(R.id.avatar);
     nameView = view.findViewById(R.id.name);
     phoneType = view.findViewById(R.id.phone_type);
     videoCallIcon = view.findViewById(R.id.video_call_container);
+    avatarContainer = view.findViewById(R.id.avatar_container);
     view.setOnClickListener(this);
     view.setOnLongClickListener(this);
+    view.setOnTouchListener(
+        new SpeedDialFavoritesViewHolderOnTouchListener(
+            ViewConfiguration.get(view.getContext()), helper, this, this));
     photoView.setClickable(false);
     this.listener = listener;
   }
 
-  public void bind(Context context, Cursor cursor) {
-    Assert.checkArgument(cursor.getInt(StrequentContactsCursorLoader.PHONE_STARRED) == 1);
-    isVideoCall = false; // TODO(calderwoodra): get from disambig data
-    number = cursor.getString(StrequentContactsCursorLoader.PHONE_NUMBER);
+  public void bind(Context context, SpeedDialUiItem speedDialUiItem) {
+    this.speedDialUiItem = Assert.isNotNull(speedDialUiItem);
+    Assert.checkArgument(speedDialUiItem.isStarred());
 
-    String name = cursor.getString(StrequentContactsCursorLoader.PHONE_DISPLAY_NAME);
-    long contactId = cursor.getLong(StrequentContactsCursorLoader.PHONE_ID);
-    lookupKey = cursor.getString(StrequentContactsCursorLoader.PHONE_LOOKUP_KEY);
-    Uri contactUri = Contacts.getLookupUri(contactId, lookupKey);
+    nameView.setText(speedDialUiItem.name());
 
-    String photoUri = cursor.getString(StrequentContactsCursorLoader.PHONE_PHOTO_URI);
-    ContactPhotoManager.getInstance(context)
-        .loadDialerThumbnailOrPhoto(
-            photoView,
-            contactUri,
-            cursor.getLong(StrequentContactsCursorLoader.PHONE_PHOTO_ID),
-            photoUri == null ? null : Uri.parse(photoUri),
-            name,
-            LetterTileDrawable.TYPE_DEFAULT);
-    nameView.setText(name);
-    phoneType.setText(getLabel(context.getResources(), cursor));
-    videoCallIcon.setVisibility(isVideoCall ? View.VISIBLE : View.GONE);
-
-    // TODO(calderwoodra): Update this to include communication avenues also
-    hasDefaultNumber = cursor.getInt(StrequentContactsCursorLoader.PHONE_IS_SUPER_PRIMARY) != 0;
-  }
-
-  // TODO(calderwoodra): handle CNAP and cequint types.
-  // TODO(calderwoodra): unify this into a utility method with CallLogAdapter#getNumberType
-  private static String getLabel(Resources resources, Cursor cursor) {
-    int numberType = cursor.getInt(StrequentContactsCursorLoader.PHONE_TYPE);
-    String numberLabel = cursor.getString(StrequentContactsCursorLoader.PHONE_LABEL);
-
-    // Returns empty label instead of "custom" if the custom label is empty.
-    if (numberType == Phone.TYPE_CUSTOM && TextUtils.isEmpty(numberLabel)) {
-      return "";
+    Channel channel = speedDialUiItem.defaultChannel();
+    if (channel == null) {
+      channel = speedDialUiItem.getDefaultVoiceChannel();
     }
-    return (String) Phone.getTypeLabel(resources, numberType, numberLabel);
+
+    if (channel != null) {
+      phoneType.setText(channel.label());
+      videoCallIcon.setVisibility(channel.isVideoTechnology() ? View.VISIBLE : View.GONE);
+    } else {
+      phoneType.setText("");
+      videoCallIcon.setVisibility(View.GONE);
+    }
+
+    GlidePhotoManagerComponent.get(context)
+        .glidePhotoManager()
+        .loadQuickContactBadge(
+            photoView,
+            PhotoInfo.newBuilder()
+                .setPhotoId(speedDialUiItem.photoId())
+                .setPhotoUri(speedDialUiItem.photoUri())
+                .setName(speedDialUiItem.name())
+                .setLookupUri(
+                    Contacts.getLookupUri(speedDialUiItem.contactId(), speedDialUiItem.lookupKey())
+                        .toString())
+                .build());
   }
 
   @Override
   public void onClick(View v) {
-    if (hasDefaultNumber) {
-      listener.onClick(number, isVideoCall);
+    if (speedDialUiItem.defaultChannel() != null) {
+      listener.onClick(speedDialUiItem.defaultChannel());
     } else {
-      listener.onAmbiguousContactClicked(lookupKey);
+      listener.onAmbiguousContactClicked(speedDialUiItem);
     }
   }
 
   @Override
-  public boolean onLongClick(View v) {
-    // TODO(calderwoodra): implement drag and drop logic
-    listener.onLongClick(number);
+  public boolean onLongClick(View view) {
+    // TODO(calderwoodra): add bounce/sin wave scale animation
+    listener.showContextMenu(photoView, speedDialUiItem);
     return true;
   }
 
+  @Override
+  public void onTouchFinished(boolean closeContextMenu) {
+    listener.onTouchFinished(closeContextMenu);
+  }
+
+  FrameLayout getAvatarContainer() {
+    return avatarContainer;
+  }
+
+  void onSelectedChanged(boolean selected) {
+    nameView.setVisibility(selected ? View.GONE : View.VISIBLE);
+    phoneType.setVisibility(selected ? View.GONE : View.VISIBLE);
+  }
+
   /** Listener/callback for {@link FavoritesViewHolder} actions. */
   public interface FavoriteContactsListener {
 
     /** Called when the user clicks on a favorite contact that doesn't have a default number. */
-    void onAmbiguousContactClicked(String contactId);
+    void onAmbiguousContactClicked(SpeedDialUiItem speedDialUiItem);
 
     /** Called when the user clicks on a favorite contact. */
-    void onClick(String number, boolean isVideoCall);
+    void onClick(Channel channel);
 
     /** Called when the user long clicks on a favorite contact. */
-    void onLongClick(String number);
+    void showContextMenu(View view, SpeedDialUiItem speedDialUiItem);
+
+    /** Called when the user is no longer touching the favorite contact. */
+    void onTouchFinished(boolean closeContextMenu);
+
+    /** Called when the user drag the favorite to remove. */
+    void onRequestRemove(SpeedDialUiItem speedDialUiItem);
   }
 }
diff --git a/java/com/android/dialer/speeddial/RemoveViewHolder.java b/java/com/android/dialer/speeddial/RemoveViewHolder.java
new file mode 100644
index 0000000..998e1ae
--- /dev/null
+++ b/java/com/android/dialer/speeddial/RemoveViewHolder.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.dialer.speeddial;
+
+import android.support.v7.widget.RecyclerView;
+import android.view.View;
+import android.view.View.OnClickListener;
+
+/** ViewHolder for headers in {@link SpeedDialFragment}. */
+public class RemoveViewHolder extends RecyclerView.ViewHolder implements OnClickListener {
+
+  private final View removeViewContent;
+
+  RemoveViewHolder(View view) {
+    super(view);
+    removeViewContent = view;
+  }
+
+  void show() {
+    removeViewContent.setVisibility(View.VISIBLE);
+    removeViewContent.setAlpha(0);
+    removeViewContent.animate().alpha(1).start();
+  }
+
+  void hide() {
+    removeViewContent.setVisibility(View.INVISIBLE);
+    removeViewContent.setAlpha(1);
+    removeViewContent.animate().alpha(0).start();
+  }
+
+  @Override
+  public void onClick(View v) {
+    // Not clickable
+  }
+}
diff --git a/java/com/android/dialer/speeddial/SpeedDialAdapter.java b/java/com/android/dialer/speeddial/SpeedDialAdapter.java
index 5f7b68e..1bc072b 100644
--- a/java/com/android/dialer/speeddial/SpeedDialAdapter.java
+++ b/java/com/android/dialer/speeddial/SpeedDialAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 The Android Open Source Project
+ * Copyright (C) 2018 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,18 +17,31 @@
 package com.android.dialer.speeddial;
 
 import android.content.Context;
-import android.support.annotation.VisibleForTesting;
-import android.support.v7.widget.GridLayoutManager;
+import android.support.annotation.IntDef;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 import android.support.v7.widget.GridLayoutManager.SpanSizeLookup;
 import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.RecyclerView.LayoutManager;
+import android.support.v7.widget.RecyclerView.ViewHolder;
+import android.support.v7.widget.helper.ItemTouchHelper;
+import android.util.ArrayMap;
 import android.view.LayoutInflater;
 import android.view.ViewGroup;
+import android.view.animation.AnticipateInterpolator;
+import android.widget.FrameLayout;
 import com.android.dialer.common.Assert;
 import com.android.dialer.speeddial.FavoritesViewHolder.FavoriteContactsListener;
 import com.android.dialer.speeddial.HeaderViewHolder.SpeedDialHeaderListener;
-import com.android.dialer.speeddial.SpeedDialCursor.RowType;
+import com.android.dialer.speeddial.SpeedDialFragment.HostInterface;
 import com.android.dialer.speeddial.SuggestionViewHolder.SuggestedContactsListener;
+import com.android.dialer.speeddial.draghelper.SpeedDialItemTouchHelperCallback.ItemTouchHelperAdapter;
+import com.android.dialer.speeddial.loader.SpeedDialUiItem;
+import com.google.common.collect.ImmutableList;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
 
 /**
  * RecyclerView adapter for {@link SpeedDialFragment}.
@@ -42,61 +55,108 @@
  *   <li>Suggested contacts
  * </ol>
  */
-final class SpeedDialAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
+public final class SpeedDialAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
+    implements ItemTouchHelperAdapter {
+
+  private static final int NON_CONTACT_ITEM_NUMBER_BEFORE_FAVORITES = 2;
+  private static final int NON_CONTACT_ITEM_NUMBER_BEFORE_SUGGESTION = 3;
+
+  private static final float IN_REMOVE_VIEW_SCALE = 0.5f;
+  private static final float IN_REMOVE_VIEW_ALPHA = 0.5f;
+
+  @Retention(RetentionPolicy.SOURCE)
+  @IntDef({RowType.STARRED_HEADER, RowType.SUGGESTION_HEADER, RowType.STARRED, RowType.SUGGESTION})
+  @interface RowType {
+    int REMOVE_VIEW = 0;
+    int STARRED_HEADER = 1;
+    int SUGGESTION_HEADER = 2;
+    int STARRED = 3;
+    int SUGGESTION = 4;
+  }
 
   private final Context context;
   private final FavoriteContactsListener favoritesListener;
   private final SuggestedContactsListener suggestedListener;
   private final SpeedDialHeaderListener headerListener;
+  private final HostInterface hostInterface;
 
-  private SpeedDialCursor cursor;
+  private final Map<Integer, Integer> positionToRowTypeMap = new ArrayMap<>();
+  private List<SpeedDialUiItem> speedDialUiItems;
+
+  // Needed for FavoriteViewHolder
+  private ItemTouchHelper itemTouchHelper;
+
+  private RemoveViewHolder removeViewHolder;
+  private FavoritesViewHolder draggingFavoritesViewHolder;
 
   public SpeedDialAdapter(
       Context context,
       FavoriteContactsListener favoritesListener,
       SuggestedContactsListener suggestedListener,
-      SpeedDialHeaderListener headerListener) {
+      SpeedDialHeaderListener headerListener,
+      HostInterface hostInterface) {
     this.context = context;
     this.favoritesListener = favoritesListener;
     this.suggestedListener = suggestedListener;
     this.headerListener = headerListener;
+    this.hostInterface = hostInterface;
   }
 
   @Override
   public int getItemViewType(int position) {
-    return cursor.getRowType(position);
+    return positionToRowTypeMap.get(position);
   }
 
+  @NonNull
   @Override
-  public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+  public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
     LayoutInflater inflater = LayoutInflater.from(context);
-    if (viewType == RowType.STARRED) {
-      return new FavoritesViewHolder(
-          inflater.inflate(R.layout.favorite_item_layout, parent, false), favoritesListener);
-    } else if (viewType == RowType.SUGGESTION) {
-      return new SuggestionViewHolder(
-          inflater.inflate(R.layout.suggestion_row_layout, parent, false), suggestedListener);
-    } else if (viewType == RowType.HEADER) {
-      return new HeaderViewHolder(
-          inflater.inflate(R.layout.speed_dial_header_layout, parent, false), headerListener);
-    } else {
-      throw Assert.createIllegalStateFailException("Invalid viewType: " + viewType);
+    switch (viewType) {
+      case RowType.STARRED:
+        return new FavoritesViewHolder(
+            inflater.inflate(R.layout.favorite_item_layout, parent, false),
+            itemTouchHelper,
+            favoritesListener);
+      case RowType.SUGGESTION:
+        return new SuggestionViewHolder(
+            inflater.inflate(R.layout.suggestion_row_layout, parent, false), suggestedListener);
+      case RowType.STARRED_HEADER:
+      case RowType.SUGGESTION_HEADER:
+        return new HeaderViewHolder(
+            inflater.inflate(R.layout.speed_dial_header_layout, parent, false), headerListener);
+      case RowType.REMOVE_VIEW:
+        removeViewHolder =
+            new RemoveViewHolder(
+                inflater.inflate(R.layout.favorite_remove_view_layout, parent, false));
+        return removeViewHolder;
+      default:
+        throw Assert.createIllegalStateFailException("Invalid viewType: " + viewType);
     }
   }
 
   @Override
-  public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) {
-    cursor.moveToPosition(position);
-    switch (cursor.getRowType(position)) {
-      case RowType.HEADER:
-        ((HeaderViewHolder) holder).setHeaderText(cursor.getHeader());
-        ((HeaderViewHolder) holder).showAddButton(cursor.hasFavorites() && position == 0);
-        break;
+  public void onBindViewHolder(@NonNull ViewHolder holder, int position) {
+    switch (getItemViewType(position)) {
+      case RowType.STARRED_HEADER:
+        ((HeaderViewHolder) holder).setHeaderText(R.string.favorites_header);
+        ((HeaderViewHolder) holder).showAddButton(true);
+        return;
+      case RowType.SUGGESTION_HEADER:
+        ((HeaderViewHolder) holder).setHeaderText(R.string.suggestions_header);
+        ((HeaderViewHolder) holder).showAddButton(false);
+        return;
       case RowType.STARRED:
-        ((FavoritesViewHolder) holder).bind(context, cursor);
+        ((FavoritesViewHolder) holder).bind(context, speedDialUiItems.get(position - 2));
+        // Removed item might come back
+        FrameLayout avatarContainer = ((FavoritesViewHolder) holder).getAvatarContainer();
+        avatarContainer.setScaleX(1);
+        avatarContainer.setScaleY(1);
+        avatarContainer.setAlpha(1);
         break;
       case RowType.SUGGESTION:
-        ((SuggestionViewHolder) holder).bind(context, cursor);
+        ((SuggestionViewHolder) holder).bind(context, speedDialUiItems.get(position - 3));
+        break;
+      case RowType.REMOVE_VIEW:
         break;
       default:
         throw Assert.createIllegalStateFailException("Invalid view holder: " + holder);
@@ -105,37 +165,166 @@
 
   @Override
   public int getItemCount() {
-    return cursor == null || cursor.isClosed() ? 0 : cursor.getCount();
+    return positionToRowTypeMap.size();
   }
 
-  public void setCursor(SpeedDialCursor cursor) {
-    this.cursor = cursor;
-    notifyDataSetChanged();
-  }
-
-  LayoutManager getLayoutManager(Context context) {
-    GridLayoutManager layoutManager = new GridLayoutManager(context, 3 /* spanCount */);
-    layoutManager.setSpanSizeLookup(
-        new SpanSizeLookup() {
-          @Override
-          public int getSpanSize(int position) {
-            return SpeedDialAdapter.this.getSpanSize(position);
+  public void setSpeedDialUiItems(List<SpeedDialUiItem> immutableSpeedDialUiItems) {
+    speedDialUiItems = new ArrayList<>();
+    speedDialUiItems.addAll(immutableSpeedDialUiItems);
+    speedDialUiItems.sort(
+        (o1, o2) -> {
+          if (o1.isStarred() && o2.isStarred()) {
+            return Integer.compare(o1.pinnedPosition().or(-1), o2.pinnedPosition().or(-1));
           }
+          return Boolean.compare(o2.isStarred(), o1.isStarred());
         });
-    return layoutManager;
+    updatePositionToRowTypeMap();
   }
 
-  @VisibleForTesting
-  int getSpanSize(int position) {
-    switch (cursor.getRowType(position)) {
-      case RowType.SUGGESTION:
-      case RowType.HEADER:
-        return 3; // span the whole screen
-      case RowType.STARRED:
-        return 1; // span 1/3 of the screen
-      default:
-        throw Assert.createIllegalStateFailException(
-            "Invalid row type: " + cursor.getRowType(position));
+  private void updatePositionToRowTypeMap() {
+    positionToRowTypeMap.clear();
+    if (speedDialUiItems.isEmpty()) {
+      return;
     }
+
+    positionToRowTypeMap.put(0, RowType.REMOVE_VIEW);
+    // Show the add favorites even if there are no favorite contacts
+    positionToRowTypeMap.put(1, RowType.STARRED_HEADER);
+    int positionOfSuggestionHeader = NON_CONTACT_ITEM_NUMBER_BEFORE_FAVORITES;
+    for (int i = 0; i < speedDialUiItems.size(); i++) {
+      if (speedDialUiItems.get(i).isStarred()) {
+        positionToRowTypeMap.put(i + NON_CONTACT_ITEM_NUMBER_BEFORE_FAVORITES, RowType.STARRED);
+        positionOfSuggestionHeader++;
+      } else {
+        positionToRowTypeMap.put(i + NON_CONTACT_ITEM_NUMBER_BEFORE_SUGGESTION, RowType.SUGGESTION);
+      }
+    }
+    if (!speedDialUiItems.get(speedDialUiItems.size() - 1).isStarred()) {
+      positionToRowTypeMap.put(positionOfSuggestionHeader, RowType.SUGGESTION_HEADER);
+    }
+  }
+
+  public ImmutableList<SpeedDialUiItem> getSpeedDialUiItems() {
+    if (speedDialUiItems == null || speedDialUiItems.isEmpty()) {
+      return ImmutableList.of();
+    }
+    return ImmutableList.copyOf(speedDialUiItems);
+  }
+
+  public SpanSizeLookup getSpanSizeLookup() {
+    return new SpanSizeLookup() {
+      @Override
+      public int getSpanSize(int position) {
+        switch (getItemViewType(position)) {
+          case RowType.SUGGESTION:
+          case RowType.STARRED_HEADER:
+          case RowType.SUGGESTION_HEADER:
+          case RowType.REMOVE_VIEW:
+            return 3; // span the whole screen
+          case RowType.STARRED:
+            return 1; // span 1/3 of the screen
+          default:
+            throw Assert.createIllegalStateFailException(
+                "Invalid row type: " + positionToRowTypeMap.get(position));
+        }
+      }
+    };
+  }
+
+  @Override
+  public void onItemMove(int fromPosition, int toPosition) {
+    if (toPosition == 0) {
+      // drop to removeView
+      return;
+    }
+    // fromPosition/toPosition correspond to adapter position, which is off by 1 from the list
+    // position b/c of the favorites header. So subtract 1 here.
+    speedDialUiItems.add(toPosition - 2, speedDialUiItems.remove(fromPosition - 2));
+    notifyItemMoved(fromPosition, toPosition);
+  }
+
+  @Override
+  public boolean canDropOver(ViewHolder target) {
+    return target instanceof FavoritesViewHolder || target instanceof RemoveViewHolder;
+  }
+
+  @Override
+  public void onSelectedChanged(@Nullable ViewHolder viewHolder, int actionState) {
+    switch (actionState) {
+      case ItemTouchHelper.ACTION_STATE_DRAG:
+        if (viewHolder != null) {
+          draggingFavoritesViewHolder = (FavoritesViewHolder) viewHolder;
+          draggingFavoritesViewHolder.onSelectedChanged(true);
+          hostInterface.dragFavorite(true);
+          removeViewHolder.show();
+        }
+        break;
+      case ItemTouchHelper.ACTION_STATE_IDLE:
+        // viewHolder is null in this case
+        if (draggingFavoritesViewHolder != null) {
+          draggingFavoritesViewHolder.onSelectedChanged(false);
+          draggingFavoritesViewHolder = null;
+          hostInterface.dragFavorite(false);
+          removeViewHolder.hide();
+        }
+        break;
+      default:
+        break;
+    }
+  }
+
+  @Override
+  public void enterRemoveView() {
+    if (draggingFavoritesViewHolder != null) {
+      draggingFavoritesViewHolder
+          .getAvatarContainer()
+          .animate()
+          .scaleX(IN_REMOVE_VIEW_SCALE)
+          .scaleY(IN_REMOVE_VIEW_SCALE)
+          .alpha(IN_REMOVE_VIEW_ALPHA)
+          .start();
+    }
+  }
+
+  @Override
+  public void leaveRemoveView() {
+    if (draggingFavoritesViewHolder != null) {
+      draggingFavoritesViewHolder
+          .getAvatarContainer()
+          .animate()
+          .scaleX(1)
+          .scaleY(1)
+          .alpha(1)
+          .start();
+    }
+  }
+
+  @Override
+  public void dropOnRemoveView(ViewHolder fromViewHolder) {
+    if (!(fromViewHolder instanceof FavoritesViewHolder)) {
+      return;
+    }
+    int fromPosition = fromViewHolder.getAdapterPosition();
+
+    SpeedDialUiItem removedItem = speedDialUiItems.remove(fromPosition - 2);
+    favoritesListener.onRequestRemove(removedItem);
+    ((FavoritesViewHolder) fromViewHolder)
+        .getAvatarContainer()
+        .animate()
+        .scaleX(0)
+        .scaleY(0)
+        .alpha(0)
+        .setInterpolator(new AnticipateInterpolator())
+        .start();
+    updatePositionToRowTypeMap();
+  }
+
+  public void setItemTouchHelper(ItemTouchHelper itemTouchHelper) {
+    this.itemTouchHelper = itemTouchHelper;
+  }
+
+  /** Returns true if there are suggested contacts. */
+  public boolean hasFrequents() {
+    return !speedDialUiItems.isEmpty() && getItemViewType(getItemCount() - 1) == RowType.SUGGESTION;
   }
 }
diff --git a/java/com/android/dialer/speeddial/SpeedDialCursor.java b/java/com/android/dialer/speeddial/SpeedDialCursor.java
deleted file mode 100644
index 1208dae..0000000
--- a/java/com/android/dialer/speeddial/SpeedDialCursor.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.dialer.speeddial;
-
-import android.annotation.SuppressLint;
-import android.database.Cursor;
-import android.database.MatrixCursor;
-import android.database.MergeCursor;
-import android.support.annotation.IntDef;
-import android.support.annotation.StringRes;
-import com.android.dialer.common.Assert;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.util.ArrayList;
-import java.util.List;
-
-/** Cursor for favorites contacts. */
-final class SpeedDialCursor extends MergeCursor {
-
-  /**
-   * Caps the speed dial list to contain at most 20 contacts, including favorites and suggestions.
-   * It is only a soft limit though, for the case that there are more than 20 favorite contacts.
-   */
-  private static final int SPEED_DIAL_CONTACT_LIST_SOFT_LIMIT = 20;
-
-  private static final String[] HEADER_CURSOR_PROJECTION = {"header"};
-  private static final int HEADER_COLUMN_POSITION = 0;
-  private boolean hasFavorites;
-
-  @Retention(RetentionPolicy.SOURCE)
-  @IntDef({RowType.HEADER, RowType.STARRED, RowType.SUGGESTION})
-  @interface RowType {
-    int HEADER = 0;
-    int STARRED = 1;
-    int SUGGESTION = 2;
-  }
-
-  public static SpeedDialCursor newInstance(Cursor strequentCursor) {
-    if (strequentCursor == null || strequentCursor.getCount() == 0) {
-      return null;
-    }
-    SpeedDialCursor cursor = new SpeedDialCursor(buildCursors(strequentCursor));
-    strequentCursor.close();
-    return cursor;
-  }
-
-  private static Cursor[] buildCursors(Cursor strequentCursor) {
-    MatrixCursor starred = new MatrixCursor(StrequentContactsCursorLoader.PHONE_PROJECTION);
-    MatrixCursor suggestions = new MatrixCursor(StrequentContactsCursorLoader.PHONE_PROJECTION);
-
-    strequentCursor.moveToPosition(-1);
-    while (strequentCursor.moveToNext()) {
-      if (strequentCursor.getPosition() != 0) {
-        long contactId = strequentCursor.getLong(StrequentContactsCursorLoader.PHONE_CONTACT_ID);
-        int position = strequentCursor.getPosition();
-        boolean duplicate = false;
-        // Iterate backwards through the cursor to check that this isn't a duplicate contact
-        // TODO(calderwoodra): improve this algorithm (currently O(n^2)).
-        while (strequentCursor.moveToPrevious() && !duplicate) {
-          duplicate |=
-              strequentCursor.getLong(StrequentContactsCursorLoader.PHONE_CONTACT_ID) == contactId;
-        }
-        strequentCursor.moveToPosition(position);
-        if (duplicate) {
-          continue;
-        }
-      }
-
-      if (strequentCursor.getInt(StrequentContactsCursorLoader.PHONE_STARRED) == 1) {
-        StrequentContactsCursorLoader.addToCursor(starred, strequentCursor);
-      } else if (starred.getCount() + suggestions.getCount() < SPEED_DIAL_CONTACT_LIST_SOFT_LIMIT) {
-        // Since all starred contacts come before each non-starred contact, it's safe to assume that
-        // this list will never exceed the soft limit unless there are more starred contacts than
-        // the limit permits.
-        StrequentContactsCursorLoader.addToCursor(suggestions, strequentCursor);
-      }
-    }
-
-    List<Cursor> cursorList = new ArrayList<>();
-    if (starred.getCount() > 0) {
-      cursorList.add(createHeaderCursor(R.string.favorites_header));
-      cursorList.add(starred);
-    }
-    if (suggestions.getCount() > 0) {
-      cursorList.add(createHeaderCursor(R.string.suggestions_header));
-      cursorList.add(suggestions);
-    }
-    return cursorList.toArray(new Cursor[cursorList.size()]);
-  }
-
-  private static Cursor createHeaderCursor(@StringRes int header) {
-    MatrixCursor cursor = new MatrixCursor(HEADER_CURSOR_PROJECTION);
-    cursor.newRow().add(HEADER_CURSOR_PROJECTION[HEADER_COLUMN_POSITION], header);
-    return cursor;
-  }
-
-  @RowType
-  int getRowType(int position) {
-    moveToPosition(position);
-    if (getColumnCount() == 1) {
-      return RowType.HEADER;
-    } else if (getInt(StrequentContactsCursorLoader.PHONE_STARRED) == 1) {
-      return RowType.STARRED;
-    } else {
-      return RowType.SUGGESTION;
-    }
-  }
-
-  @SuppressLint("DefaultLocale")
-  @StringRes
-  int getHeader() {
-    if (getRowType(getPosition()) != RowType.HEADER) {
-      throw Assert.createIllegalStateFailException(
-          String.format("Current position (%d) is not a header.", getPosition()));
-    }
-    return getInt(HEADER_COLUMN_POSITION);
-  }
-
-  public boolean hasFavorites() {
-    return hasFavorites;
-  }
-
-  private SpeedDialCursor(Cursor[] cursors) {
-    super(cursors);
-    for (Cursor cursor : cursors) {
-      cursor.moveToFirst();
-      if (cursor.getColumnCount() != 1
-          && cursor.getInt(StrequentContactsCursorLoader.PHONE_STARRED) == 1) {
-        hasFavorites = true;
-        break;
-      }
-    }
-  }
-}
diff --git a/java/com/android/dialer/speeddial/SpeedDialFragment.java b/java/com/android/dialer/speeddial/SpeedDialFragment.java
index 979c894..d4e7a76 100644
--- a/java/com/android/dialer/speeddial/SpeedDialFragment.java
+++ b/java/com/android/dialer/speeddial/SpeedDialFragment.java
@@ -16,24 +16,66 @@
 
 package com.android.dialer.speeddial;
 
-import android.app.Fragment;
-import android.app.LoaderManager.LoaderCallbacks;
+import android.Manifest;
+import android.content.BroadcastReceiver;
+import android.content.Context;
 import android.content.Intent;
-import android.content.Loader;
-import android.database.Cursor;
+import android.content.pm.PackageManager;
+import android.database.ContentObserver;
+import android.net.Uri;
 import android.os.Bundle;
+import android.provider.ContactsContract.CommonDataKinds.Phone;
+import android.provider.ContactsContract.Contacts;
+import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+import android.support.annotation.VisibleForTesting;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentActivity;
+import android.support.v4.app.FragmentManager;
+import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.RecyclerView;
+import android.support.v7.widget.helper.ItemTouchHelper;
+import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import com.android.dialer.callintent.CallInitiationType;
 import com.android.dialer.callintent.CallIntentBuilder;
 import com.android.dialer.common.Assert;
+import com.android.dialer.common.FragmentUtils;
+import com.android.dialer.common.LogUtil;
+import com.android.dialer.common.concurrent.DefaultFutureCallback;
+import com.android.dialer.common.concurrent.DialerExecutorComponent;
+import com.android.dialer.common.concurrent.SupportUiListener;
+import com.android.dialer.common.concurrent.ThreadUtil;
+import com.android.dialer.constants.ActivityRequestCodes;
+import com.android.dialer.historyitemactions.DividerModule;
+import com.android.dialer.historyitemactions.HistoryItemActionBottomSheet;
+import com.android.dialer.historyitemactions.HistoryItemActionModule;
+import com.android.dialer.historyitemactions.HistoryItemBottomSheetHeaderInfo;
+import com.android.dialer.historyitemactions.IntentModule;
+import com.android.dialer.logging.DialerImpression;
+import com.android.dialer.logging.Logger;
 import com.android.dialer.precall.PreCall;
+import com.android.dialer.shortcuts.ShortcutRefresher;
+import com.android.dialer.speeddial.ContextMenu.ContextMenuItemListener;
 import com.android.dialer.speeddial.FavoritesViewHolder.FavoriteContactsListener;
 import com.android.dialer.speeddial.HeaderViewHolder.SpeedDialHeaderListener;
 import com.android.dialer.speeddial.SuggestionViewHolder.SuggestedContactsListener;
+import com.android.dialer.speeddial.database.SpeedDialEntry.Channel;
+import com.android.dialer.speeddial.draghelper.SpeedDialItemTouchHelperCallback;
+import com.android.dialer.speeddial.draghelper.SpeedDialLayoutManager;
+import com.android.dialer.speeddial.loader.SpeedDialUiItem;
+import com.android.dialer.speeddial.loader.UiItemLoaderComponent;
+import com.android.dialer.util.IntentUtil;
+import com.android.dialer.util.PermissionsUtil;
+import com.android.dialer.widget.EmptyContentView;
+import com.android.dialer.widget.EmptyContentView.OnEmptyViewActionButtonClickedListener;
+import com.google.common.collect.ImmutableList;
+import com.google.common.util.concurrent.Futures;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 
 /**
  * Fragment for displaying:
@@ -47,15 +89,44 @@
  */
 public class SpeedDialFragment extends Fragment {
 
-  private static final int STREQUENT_CONTACTS_LOADER_ID = 1;
+  private static final int READ_CONTACTS_PERMISSION_REQUEST_CODE = 1;
+
+  /**
+   * Listen to broadcast events about permissions in order to be notified if the READ_CONTACTS
+   * permission is granted via the UI in another fragment.
+   */
+  private final BroadcastReceiver readContactsPermissionGrantedReceiver =
+      new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+          loadContacts();
+        }
+      };
+
+  /** Listen for changes to the strequents content observer. */
+  private final ContentObserver strequentsContentObserver =
+      new ContentObserver(ThreadUtil.getUiThreadHandler()) {
+        @Override
+        public void onChange(boolean selfChange) {
+          super.onChange(selfChange);
+          loadContacts();
+        }
+      };
 
   private final SpeedDialHeaderListener headerListener = new SpeedDialFragmentHeaderListener();
-  private final FavoriteContactsListener favoritesListener = new SpeedDialFavoritesListener();
-  private final SuggestedContactsListener suggestedListener = new SpeedDialSuggestedListener();
-  private final SpeedDialFragmentLoaderCallback loaderCallback =
-      new SpeedDialFragmentLoaderCallback();
+  private final SpeedDialSuggestedListener suggestedListener = new SpeedDialSuggestedListener();
 
   private SpeedDialAdapter adapter;
+  private SupportUiListener<ImmutableList<SpeedDialUiItem>> speedDialLoaderListener;
+  private SpeedDialFavoritesListener favoritesListener;
+
+  private EmptyContentView emptyContentView;
+
+  /**
+   * We update the UI every time the fragment is resumed. This boolean suppresses that functionality
+   * once per onResume call.
+   */
+  private boolean updateSpeedDialItemsOnResume = true;
 
   public static SpeedDialFragment newInstance() {
     return new SpeedDialFragment();
@@ -65,94 +136,529 @@
   @Override
   public View onCreateView(
       LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-    View view = inflater.inflate(R.layout.fragment_speed_dial, container, false);
-    RecyclerView recyclerView = view.findViewById(R.id.speed_dial_recycler_view);
+    LogUtil.enterBlock("SpeedDialFragment.onCreateView");
+    View rootLayout = inflater.inflate(R.layout.fragment_speed_dial, container, false);
+    emptyContentView = rootLayout.findViewById(R.id.speed_dial_empty_content_view);
+    emptyContentView.setImage(R.drawable.empty_speed_dial);
 
+    speedDialLoaderListener =
+        DialerExecutorComponent.get(getContext())
+            .createUiListener(getChildFragmentManager(), "speed_dial_loader_listener");
+
+    // Setup our RecyclerView
+    SpeedDialLayoutManager layoutManager =
+        new SpeedDialLayoutManager(getContext(), 3 /* spanCount */);
+    favoritesListener =
+        new SpeedDialFavoritesListener(
+            getActivity(),
+            getChildFragmentManager(),
+            layoutManager,
+            new UpdateSpeedDialAdapterListener(),
+            speedDialLoaderListener);
     adapter =
-        new SpeedDialAdapter(getContext(), favoritesListener, suggestedListener, headerListener);
-    recyclerView.setLayoutManager(adapter.getLayoutManager(getContext()));
+        new SpeedDialAdapter(
+            getContext(),
+            favoritesListener,
+            suggestedListener,
+            headerListener,
+            FragmentUtils.getParentUnsafe(this, HostInterface.class));
+    layoutManager.setSpanSizeLookup(adapter.getSpanSizeLookup());
+    RecyclerView recyclerView = rootLayout.findViewById(R.id.speed_dial_recycler_view);
+    recyclerView.setLayoutManager(layoutManager);
     recyclerView.setAdapter(adapter);
-    getLoaderManager().initLoader(STREQUENT_CONTACTS_LOADER_ID, null /* args */, loaderCallback);
-    return view;
-  }
 
-  public boolean hasFrequents() {
-    // TODO(calderwoodra)
-    return false;
+    // Setup drag and drop touch helper
+    ItemTouchHelper.Callback callback = new SpeedDialItemTouchHelperCallback(getContext(), adapter);
+    ItemTouchHelper touchHelper = new ItemTouchHelper(callback);
+    touchHelper.attachToRecyclerView(recyclerView);
+    adapter.setItemTouchHelper(touchHelper);
+    return rootLayout;
   }
 
   @Override
   public void onResume() {
     super.onResume();
-    getLoaderManager().restartLoader(STREQUENT_CONTACTS_LOADER_ID, null, loaderCallback);
+    loadContacts();
+  }
+
+  @Override
+  public void onPause() {
+    super.onPause();
+    favoritesListener.hideMenu();
+    suggestedListener.onPause();
+    onHidden();
+  }
+
+  @Override
+  public void onHiddenChanged(boolean hidden) {
+    super.onHiddenChanged(hidden);
+    if (hidden) {
+      onHidden();
+    } else {
+      loadContacts();
+    }
+  }
+
+  private void onHidden() {
+    if (!PermissionsUtil.hasContactsReadPermissions(getContext())) {
+      return;
+    }
+
+    Futures.addCallback(
+        DialerExecutorComponent.get(getContext())
+            .backgroundExecutor()
+            .submit(
+                () -> {
+                  UiItemLoaderComponent.get(getContext())
+                      .speedDialUiItemMutator()
+                      .updatePinnedPosition(adapter.getSpeedDialUiItems());
+                  return null;
+                }),
+        new DefaultFutureCallback<>(),
+        DialerExecutorComponent.get(getContext()).backgroundExecutor());
+    ShortcutRefresher.refresh(
+        getContext(),
+        ShortcutRefresher.speedDialUiItemsToContactEntries(adapter.getSpeedDialUiItems()));
+  }
+
+  @Override
+  public void onRequestPermissionsResult(
+      int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+    if (requestCode == READ_CONTACTS_PERMISSION_REQUEST_CODE
+        && grantResults.length > 0
+        && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
+      PermissionsUtil.notifyPermissionGranted(getContext(), Manifest.permission.READ_CONTACTS);
+      loadContacts();
+    }
+  }
+
+  private void loadContacts() {
+    if (!updateSpeedDialItemsOnResume) {
+      updateSpeedDialItemsOnResume = true;
+      return;
+    }
+
+    if (showContactsPermissionEmptyContentView()) {
+      return;
+    }
+
+    speedDialLoaderListener.listen(
+        getContext(),
+        UiItemLoaderComponent.get(getContext()).speedDialUiItemMutator().loadSpeedDialUiItems(),
+        this::onSpeedDialUiItemListLoaded,
+        throwable -> {
+          throw new RuntimeException(throwable);
+        });
+  }
+
+  @Override
+  public void onActivityResult(int requestCode, int resultCode, Intent data) {
+    if (requestCode == ActivityRequestCodes.SPEED_DIAL_ADD_FAVORITE) {
+      if (resultCode == AppCompatActivity.RESULT_OK && data.getData() != null) {
+        Logger.get(getContext()).logImpression(DialerImpression.Type.FAVORITE_ADD_FAVORITE);
+        updateSpeedDialItemsOnResume = false;
+        speedDialLoaderListener.listen(
+            getContext(),
+            UiItemLoaderComponent.get(getContext())
+                .speedDialUiItemMutator()
+                .starContact(data.getData()),
+            this::onSpeedDialUiItemListLoaded,
+            throwable -> {
+              throw new RuntimeException(throwable);
+            });
+      }
+    }
+  }
+
+  private void onSpeedDialUiItemListLoaded(ImmutableList<SpeedDialUiItem> speedDialUiItems) {
+    LogUtil.enterBlock("SpeedDialFragment.onSpeedDialUiItemListLoaded");
+    // TODO(calderwoodra): Use DiffUtil to properly update and animate the change
+    adapter.setSpeedDialUiItems(
+        UiItemLoaderComponent.get(getContext())
+            .speedDialUiItemMutator()
+            .insertDuoChannels(getContext(), speedDialUiItems));
+    adapter.notifyDataSetChanged();
+    maybeShowNoContactsEmptyContentView();
+
+    if (getActivity() != null) {
+      FragmentUtils.getParentUnsafe(this, HostInterface.class)
+          .setHasFrequents(adapter.hasFrequents());
+    }
+  }
+
+  /** Returns true if the empty content view was shown. */
+  private boolean showContactsPermissionEmptyContentView() {
+    if (PermissionsUtil.hasContactsReadPermissions(getContext())) {
+      emptyContentView.setVisibility(View.GONE);
+      return false;
+    }
+
+    emptyContentView.setVisibility(View.VISIBLE);
+    emptyContentView.setActionLabel(R.string.speed_dial_turn_on_contacts_permission);
+    emptyContentView.setDescription(R.string.speed_dial_contacts_permission_description);
+    emptyContentView.setActionClickedListener(
+        new SpeedDialContactPermissionEmptyViewListener(getContext(), this));
+    return true;
+  }
+
+  private void maybeShowNoContactsEmptyContentView() {
+    if (adapter.getItemCount() != 0) {
+      emptyContentView.setVisibility(View.GONE);
+      return;
+    }
+
+    emptyContentView.setVisibility(View.VISIBLE);
+    emptyContentView.setActionLabel(R.string.speed_dial_no_contacts_action_text);
+    emptyContentView.setDescription(R.string.speed_dial_no_contacts_description);
+    emptyContentView.setActionClickedListener(new SpeedDialNoContactsEmptyViewListener(this));
+  }
+
+  @Override
+  public void onStart() {
+    super.onStart();
+    PermissionsUtil.registerPermissionReceiver(
+        getActivity(), readContactsPermissionGrantedReceiver, Manifest.permission.READ_CONTACTS);
+    if (PermissionsUtil.hasContactsReadPermissions(getContext())) {
+      getContext()
+          .getContentResolver()
+          .registerContentObserver(Contacts.CONTENT_STREQUENT_URI, true, strequentsContentObserver);
+    }
+  }
+
+  @Override
+  public void onStop() {
+    super.onStop();
+    PermissionsUtil.unregisterPermissionReceiver(
+        getContext(), readContactsPermissionGrantedReceiver);
+    getContext().getContentResolver().unregisterContentObserver(strequentsContentObserver);
   }
 
   private class SpeedDialFragmentHeaderListener implements SpeedDialHeaderListener {
 
     @Override
     public void onAddFavoriteClicked() {
-      startActivity(new Intent(getContext(), AddFavoriteActivity.class));
+      Intent intent = new Intent(Intent.ACTION_PICK, Phone.CONTENT_URI);
+      startActivityForResult(intent, ActivityRequestCodes.SPEED_DIAL_ADD_FAVORITE);
     }
   }
 
-  private class SpeedDialFavoritesListener implements FavoriteContactsListener {
+  @VisibleForTesting
+  static final class SpeedDialFavoritesListener implements FavoriteContactsListener {
 
-    @Override
-    public void onAmbiguousContactClicked(String lookupKey) {
-      DisambigDialog.show(lookupKey, getFragmentManager());
+    private final FragmentActivity activity;
+    private final FragmentManager childFragmentManager;
+    private final SpeedDialLayoutManager layoutManager;
+    private final UpdateSpeedDialAdapterListener updateAdapterListener;
+    private final SupportUiListener<ImmutableList<SpeedDialUiItem>> speedDialLoaderListener;
+
+    private final SpeedDialContextMenuItemListener speedDialContextMenuItemListener =
+        new SpeedDialContextMenuItemListener();
+
+    private ContextMenu contextMenu;
+
+    SpeedDialFavoritesListener(
+        FragmentActivity activity,
+        FragmentManager childFragmentManager,
+        SpeedDialLayoutManager layoutManager,
+        UpdateSpeedDialAdapterListener updateAdapterListener,
+        SupportUiListener<ImmutableList<SpeedDialUiItem>> speedDialLoaderListener) {
+      this.activity = activity;
+      this.childFragmentManager = childFragmentManager;
+      this.layoutManager = layoutManager;
+      this.updateAdapterListener = updateAdapterListener;
+      this.speedDialLoaderListener = speedDialLoaderListener;
     }
 
     @Override
-    public void onClick(String number, boolean isVideoCall) {
-      // TODO(calderwoodra): add logic for duo video calls
+    public void onAmbiguousContactClicked(SpeedDialUiItem speedDialUiItem) {
+      // If there is only one channel, skip the menu and place a call directly
+      if (speedDialUiItem.channels().size() == 1) {
+        onClick(speedDialUiItem.channels().get(0));
+        return;
+      }
+
+      Logger.get(activity).logImpression(DialerImpression.Type.FAVORITE_OPEN_DISAMBIG_DIALOG);
+      DisambigDialog.show(speedDialUiItem, childFragmentManager);
+    }
+
+    @Override
+    public void onClick(Channel channel) {
+      if (channel.technology() == Channel.DUO) {
+        Logger.get(activity)
+            .logImpression(DialerImpression.Type.LIGHTBRINGER_VIDEO_REQUESTED_FOR_FAVORITE_CONTACT);
+      }
+
+      PreCall.start(
+          activity,
+          new CallIntentBuilder(channel.number(), CallInitiationType.Type.SPEED_DIAL)
+              .setAllowAssistedDial(true)
+              .setIsVideoCall(channel.isVideoTechnology())
+              .setIsDuoCall(channel.technology() == Channel.DUO));
+    }
+
+    @Override
+    public void showContextMenu(View view, SpeedDialUiItem speedDialUiItem) {
+      Logger.get(activity).logImpression(DialerImpression.Type.FAVORITE_OPEN_FAVORITE_MENU);
+      layoutManager.setScrollEnabled(false);
+      contextMenu =
+          ContextMenu.show(activity, view, speedDialContextMenuItemListener, speedDialUiItem);
+    }
+
+    @Override
+    public void onTouchFinished(boolean closeContextMenu) {
+      layoutManager.setScrollEnabled(true);
+
+      if (closeContextMenu) {
+        contextMenu.hide();
+        contextMenu = null;
+      }
+    }
+
+    @Override
+    public void onRequestRemove(SpeedDialUiItem speedDialUiItem) {
+      Logger.get(activity)
+          .logImpression(DialerImpression.Type.FAVORITE_REMOVE_FAVORITE_BY_DRAG_AND_DROP);
+      speedDialContextMenuItemListener.removeFavoriteContact(speedDialUiItem);
+    }
+
+    void hideMenu() {
+      if (contextMenu != null) {
+        contextMenu.hide();
+        contextMenu = null;
+      }
+    }
+
+    public SpeedDialContextMenuItemListener getSpeedDialContextMenuItemListener() {
+      return speedDialContextMenuItemListener;
+    }
+
+    class SpeedDialContextMenuItemListener implements ContextMenuItemListener {
+
+      @Override
+      public void placeCall(Channel channel) {
+        if (channel.technology() == Channel.DUO) {
+          Logger.get(activity)
+              .logImpression(
+                  DialerImpression.Type.LIGHTBRINGER_VIDEO_REQUESTED_FOR_FAVORITE_CONTACT);
+        }
+        PreCall.start(
+            activity,
+            new CallIntentBuilder(channel.number(), CallInitiationType.Type.SPEED_DIAL)
+                .setAllowAssistedDial(true)
+                .setIsVideoCall(channel.isVideoTechnology())
+                .setIsDuoCall(channel.technology() == Channel.DUO));
+      }
+
+      @Override
+      public void openSmsConversation(String number) {
+        Logger.get(activity).logImpression(DialerImpression.Type.FAVORITE_SEND_MESSAGE);
+        activity.startActivity(IntentUtil.getSendSmsIntent(number));
+      }
+
+      @Override
+      public void removeFavoriteContact(SpeedDialUiItem speedDialUiItem) {
+        Logger.get(activity).logImpression(DialerImpression.Type.FAVORITE_REMOVE_FAVORITE);
+        speedDialLoaderListener.listen(
+            activity,
+            UiItemLoaderComponent.get(activity)
+                .speedDialUiItemMutator()
+                .removeSpeedDialUiItem(speedDialUiItem),
+            updateAdapterListener::updateAdapter,
+            throwable -> {
+              throw new RuntimeException(throwable);
+            });
+      }
+
+      @Override
+      public void openContactInfo(SpeedDialUiItem speedDialUiItem) {
+        Logger.get(activity).logImpression(DialerImpression.Type.FAVORITE_OPEN_CONTACT_CARD);
+        activity.startActivity(
+            new Intent(
+                Intent.ACTION_VIEW,
+                Uri.withAppendedPath(
+                    Contacts.CONTENT_URI, String.valueOf(speedDialUiItem.contactId()))));
+      }
+    }
+  }
+
+  private final class SpeedDialSuggestedListener implements SuggestedContactsListener {
+
+    private HistoryItemActionBottomSheet bottomSheet;
+
+    @Override
+    public void onOverFlowMenuClicked(
+        SpeedDialUiItem speedDialUiItem, HistoryItemBottomSheetHeaderInfo headerInfo) {
+      List<HistoryItemActionModule> modules = new ArrayList<>();
+      Channel defaultChannel = speedDialUiItem.defaultChannel();
+
+      // Add voice call module
+      Channel voiceChannel = speedDialUiItem.getDefaultVoiceChannel();
+      if (voiceChannel != null) {
+        modules.add(
+            IntentModule.newCallModule(
+                getContext(),
+                new CallIntentBuilder(voiceChannel.number(), CallInitiationType.Type.SPEED_DIAL)
+                    .setAllowAssistedDial(true)));
+      }
+
+      // Add video if we can determine the correct channel
+      Channel videoChannel = speedDialUiItem.getDefaultVideoChannel();
+      if (videoChannel != null) {
+        modules.add(
+            IntentModule.newCallModule(
+                getContext(),
+                new CallIntentBuilder(videoChannel.number(), CallInitiationType.Type.SPEED_DIAL)
+                    .setIsVideoCall(true)
+                    .setAllowAssistedDial(true)));
+      }
+
+      // Add sms module
+      if (!TextUtils.isEmpty(defaultChannel.number())) {
+        modules.add(
+            IntentModule.newModuleForSendingTextMessage(getContext(), defaultChannel.number()));
+      }
+
+      modules.add(new DividerModule());
+
+      modules.add(new StarContactModule(speedDialUiItem));
+      // TODO(calderwoodra): remove from strequent module
+
+      // Contact info module
+      modules.add(
+          new ContactInfoModule(
+              getContext(),
+              new Intent(
+                  Intent.ACTION_VIEW,
+                  Uri.withAppendedPath(
+                      Contacts.CONTENT_URI, String.valueOf(speedDialUiItem.contactId()))),
+              R.string.contact_menu_contact_info,
+              R.drawable.context_menu_contact_icon));
+
+      bottomSheet = HistoryItemActionBottomSheet.show(getContext(), headerInfo, modules);
+    }
+
+    @Override
+    public void onRowClicked(Channel channel) {
+      if (channel.technology() == Channel.DUO) {
+        Logger.get(getContext())
+            .logImpression(
+                DialerImpression.Type.LIGHTBRINGER_VIDEO_REQUESTED_FOR_SUGGESTED_CONTACT);
+      }
       PreCall.start(
           getContext(),
-          new CallIntentBuilder(number, CallInitiationType.Type.SPEED_DIAL)
-              .setIsVideoCall(isVideoCall));
+          new CallIntentBuilder(channel.number(), CallInitiationType.Type.SPEED_DIAL)
+              .setAllowAssistedDial(true)
+              .setIsVideoCall(channel.isVideoTechnology())
+              .setIsDuoCall(channel.technology() == Channel.DUO));
     }
 
-    @Override
-    public void onLongClick(String number) {
-      // TODO(calderwoodra): show favorite contact floating context menu
-    }
-  }
+    private final class StarContactModule implements HistoryItemActionModule {
 
-  private class SpeedDialSuggestedListener implements SuggestedContactsListener {
+      private final SpeedDialUiItem speedDialUiItem;
 
-    @Override
-    public void onOverFlowMenuClicked(String number) {
-      // TODO(calderwoodra) show overflow menu for suggested contacts
-    }
-
-    @Override
-    public void onRowClicked(String number) {
-      PreCall.start(
-          getContext(), new CallIntentBuilder(number, CallInitiationType.Type.SPEED_DIAL));
-    }
-  }
-
-  /**
-   * Loader callback that registers a content observer. {@link #unregisterContentObserver()} needs
-   * to be called during tear down of the fragment.
-   */
-  private class SpeedDialFragmentLoaderCallback implements LoaderCallbacks<Cursor> {
-
-    @Override
-    public Loader<Cursor> onCreateLoader(int id, Bundle args) {
-      if (id == STREQUENT_CONTACTS_LOADER_ID) {
-        return new StrequentContactsCursorLoader(getContext());
+      StarContactModule(SpeedDialUiItem speedDialUiItem) {
+        this.speedDialUiItem = speedDialUiItem;
       }
-      throw Assert.createIllegalStateFailException("Invalid loader id: " + id);
+
+      @Override
+      public int getStringId() {
+        return R.string.suggested_contact_bottom_sheet_add_favorite_option;
+      }
+
+      @Override
+      public int getDrawableId() {
+        return R.drawable.quantum_ic_star_vd_theme_24;
+      }
+
+      @Override
+      public boolean onClick() {
+        speedDialLoaderListener.listen(
+            getContext(),
+            UiItemLoaderComponent.get(getContext())
+                .speedDialUiItemMutator()
+                .starContact(
+                    Uri.withAppendedPath(
+                        Phone.CONTENT_FILTER_URI, speedDialUiItem.defaultChannel().number())),
+            SpeedDialFragment.this::onSpeedDialUiItemListLoaded,
+            throwable -> {
+              throw new RuntimeException(throwable);
+            });
+        return true;
+      }
+    }
+
+    private final class ContactInfoModule extends IntentModule {
+
+      public ContactInfoModule(Context context, Intent intent, int text, int image) {
+        super(context, intent, text, image);
+      }
+
+      @Override
+      public boolean tintDrawable() {
+        return false;
+      }
+    }
+
+    public void onPause() {
+      if (bottomSheet != null && bottomSheet.isShowing()) {
+        bottomSheet.dismiss();
+      }
+    }
+  }
+
+  private static final class SpeedDialContactPermissionEmptyViewListener
+      implements OnEmptyViewActionButtonClickedListener {
+
+    private final Context context;
+    private final Fragment fragment;
+
+    private SpeedDialContactPermissionEmptyViewListener(Context context, Fragment fragment) {
+      this.context = context;
+      this.fragment = fragment;
     }
 
     @Override
-    public void onLoadFinished(Loader<Cursor> loader, Cursor data) {
-      adapter.setCursor((SpeedDialCursor) data);
+    public void onEmptyViewActionButtonClicked() {
+      String[] deniedPermissions =
+          PermissionsUtil.getPermissionsCurrentlyDenied(
+              context, PermissionsUtil.allContactsGroupPermissionsUsedInDialer);
+      Assert.checkArgument(deniedPermissions.length > 0);
+      LogUtil.i(
+          "OldSpeedDialFragment.onEmptyViewActionButtonClicked",
+          "Requesting permissions: " + Arrays.toString(deniedPermissions));
+      fragment.requestPermissions(deniedPermissions, READ_CONTACTS_PERMISSION_REQUEST_CODE);
+    }
+  }
+
+  private static final class SpeedDialNoContactsEmptyViewListener
+      implements OnEmptyViewActionButtonClickedListener {
+
+    private final Fragment fragment;
+
+    SpeedDialNoContactsEmptyViewListener(Fragment fragment) {
+      this.fragment = fragment;
     }
 
     @Override
-    public void onLoaderReset(Loader<Cursor> loader) {
-      adapter.setCursor(null);
+    public void onEmptyViewActionButtonClicked() {
+      Intent intent = new Intent(Intent.ACTION_PICK, Phone.CONTENT_URI);
+      fragment.startActivityForResult(intent, ActivityRequestCodes.SPEED_DIAL_ADD_FAVORITE);
     }
   }
+
+  /** Listener for when a SpeedDialUiItem is updated. */
+  class UpdateSpeedDialAdapterListener {
+
+    void updateAdapter(ImmutableList<SpeedDialUiItem> speedDialUiItems) {
+      onSpeedDialUiItemListLoaded(speedDialUiItems);
+    }
+  }
+
+  /** Interface for {@link SpeedDialFragment} to communicate with its host/parent. */
+  public interface HostInterface {
+
+    void setHasFrequents(boolean hasFrequents);
+
+    void dragFavorite(boolean start);
+  }
 }
diff --git a/java/com/android/dialer/speeddial/SquareImageView.java b/java/com/android/dialer/speeddial/SquareImageView.java
deleted file mode 100644
index a12f4d4..0000000
--- a/java/com/android/dialer/speeddial/SquareImageView.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.dialer.speeddial;
-
-import android.content.Context;
-import android.support.annotation.Nullable;
-import android.util.AttributeSet;
-import android.widget.QuickContactBadge;
-
-/** A square {@link android.widget.ImageView} constrained on width. */
-public class SquareImageView extends QuickContactBadge {
-
-  public SquareImageView(Context context, @Nullable AttributeSet attrs) {
-    super(context, attrs);
-    setClickable(false);
-  }
-
-  @Override
-  protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
-    super.onMeasure(widthMeasureSpec, widthMeasureSpec);
-  }
-}
diff --git a/java/com/android/dialer/speeddial/StrequentContactsCursorLoader.java b/java/com/android/dialer/speeddial/StrequentContactsCursorLoader.java
deleted file mode 100644
index 40d0384..0000000
--- a/java/com/android/dialer/speeddial/StrequentContactsCursorLoader.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.dialer.speeddial;
-
-import android.content.Context;
-import android.content.CursorLoader;
-import android.database.Cursor;
-import android.database.MatrixCursor;
-import android.net.Uri;
-import android.provider.ContactsContract;
-import android.provider.ContactsContract.CommonDataKinds.Phone;
-import android.provider.ContactsContract.Contacts;
-
-/** Cursor Loader for strequent contacts. */
-public final class StrequentContactsCursorLoader extends CursorLoader {
-
-  static final int PHONE_ID = 0;
-  static final int PHONE_DISPLAY_NAME = 1;
-  static final int PHONE_STARRED = 2;
-  static final int PHONE_PHOTO_URI = 3;
-  static final int PHONE_LOOKUP_KEY = 4;
-  static final int PHONE_PHOTO_ID = 5;
-  static final int PHONE_NUMBER = 6;
-  static final int PHONE_TYPE = 7;
-  static final int PHONE_LABEL = 8;
-  static final int PHONE_IS_SUPER_PRIMARY = 9;
-  static final int PHONE_PINNED = 10;
-  static final int PHONE_CONTACT_ID = 11;
-
-  public static final String[] PHONE_PROJECTION =
-      new String[] {
-        Phone._ID, // 0
-        Phone.DISPLAY_NAME, // 1
-        Phone.STARRED, // 2
-        Phone.PHOTO_URI, // 3
-        Phone.LOOKUP_KEY, // 4
-        Phone.PHOTO_ID, // 5
-        Phone.NUMBER, // 6
-        Phone.TYPE, // 7
-        Phone.LABEL, // 8
-        Phone.IS_SUPER_PRIMARY, // 9
-        Phone.PINNED, // 10
-        Phone.CONTACT_ID, // 11
-      };
-
-  StrequentContactsCursorLoader(Context context) {
-    super(
-        context,
-        buildUri(),
-        PHONE_PROJECTION,
-        null /* selection */,
-        null /* selectionArgs */,
-        null /* sortOrder */);
-    // TODO(calderwoodra): implement alternative display names
-  }
-
-  static void addToCursor(MatrixCursor dest, Cursor source) {
-    dest.newRow()
-        .add(PHONE_PROJECTION[PHONE_ID], source.getLong(PHONE_ID))
-        .add(PHONE_PROJECTION[PHONE_DISPLAY_NAME], source.getString(PHONE_DISPLAY_NAME))
-        .add(PHONE_PROJECTION[PHONE_STARRED], source.getInt(PHONE_STARRED))
-        .add(PHONE_PROJECTION[PHONE_PHOTO_URI], source.getString(PHONE_PHOTO_URI))
-        .add(PHONE_PROJECTION[PHONE_LOOKUP_KEY], source.getString(PHONE_LOOKUP_KEY))
-        .add(PHONE_PROJECTION[PHONE_NUMBER], source.getString(PHONE_NUMBER))
-        .add(PHONE_PROJECTION[PHONE_TYPE], source.getInt(PHONE_TYPE))
-        .add(PHONE_PROJECTION[PHONE_LABEL], source.getString(PHONE_LABEL))
-        .add(PHONE_PROJECTION[PHONE_IS_SUPER_PRIMARY], source.getInt(PHONE_IS_SUPER_PRIMARY))
-        .add(PHONE_PROJECTION[PHONE_PINNED], source.getInt(PHONE_PINNED))
-        .add(PHONE_PROJECTION[PHONE_CONTACT_ID], source.getLong(PHONE_CONTACT_ID));
-  }
-
-  private static Uri buildUri() {
-    return Contacts.CONTENT_STREQUENT_URI
-        .buildUpon()
-        .appendQueryParameter(ContactsContract.STREQUENT_PHONE_ONLY, "true")
-        .build();
-  }
-
-  @Override
-  public Cursor loadInBackground() {
-    return SpeedDialCursor.newInstance(super.loadInBackground());
-  }
-}
diff --git a/java/com/android/dialer/speeddial/SuggestionViewHolder.java b/java/com/android/dialer/speeddial/SuggestionViewHolder.java
index 68c0ce4..578e0b3 100644
--- a/java/com/android/dialer/speeddial/SuggestionViewHolder.java
+++ b/java/com/android/dialer/speeddial/SuggestionViewHolder.java
@@ -17,32 +17,29 @@
 package com.android.dialer.speeddial;
 
 import android.content.Context;
-import android.content.res.Resources;
-import android.database.Cursor;
-import android.net.Uri;
-import android.provider.ContactsContract.CommonDataKinds.Phone;
-import android.provider.ContactsContract.Contacts;
 import android.support.v7.widget.RecyclerView;
 import android.text.TextUtils;
 import android.view.View;
 import android.view.View.OnClickListener;
-import android.widget.QuickContactBadge;
 import android.widget.TextView;
-import com.android.dialer.contactphoto.ContactPhotoManager;
-import com.android.dialer.lettertile.LetterTileDrawable;
+import com.android.dialer.common.Assert;
+import com.android.dialer.historyitemactions.HistoryItemBottomSheetHeaderInfo;
 import com.android.dialer.location.GeoUtil;
 import com.android.dialer.phonenumberutil.PhoneNumberHelper;
+import com.android.dialer.speeddial.database.SpeedDialEntry.Channel;
+import com.android.dialer.speeddial.loader.SpeedDialUiItem;
+import com.android.dialer.widget.ContactPhotoView;
 
 /** ViewHolder for displaying suggested contacts in {@link SpeedDialFragment}. */
 public class SuggestionViewHolder extends RecyclerView.ViewHolder implements OnClickListener {
 
   private final SuggestedContactsListener listener;
 
-  private final QuickContactBadge photoView;
+  private final ContactPhotoView photoView;
   private final TextView nameOrNumberView;
   private final TextView numberView;
 
-  private String number;
+  private SpeedDialUiItem speedDialUiItem;
 
   SuggestionViewHolder(View view, SuggestedContactsListener listener) {
     super(view);
@@ -54,64 +51,51 @@
     this.listener = listener;
   }
 
-  public void bind(Context context, Cursor cursor) {
-    number = cursor.getString(StrequentContactsCursorLoader.PHONE_NUMBER);
-    number = PhoneNumberHelper.formatNumber(context, number, GeoUtil.getCurrentCountryIso(context));
+  public void bind(Context context, SpeedDialUiItem speedDialUiItem) {
+    Assert.isNotNull(speedDialUiItem.defaultChannel());
+    this.speedDialUiItem = speedDialUiItem;
+    String number =
+        PhoneNumberHelper.formatNumber(
+            context,
+            speedDialUiItem.defaultChannel().number(),
+            GeoUtil.getCurrentCountryIso(context));
 
-    String name = cursor.getString(StrequentContactsCursorLoader.PHONE_DISPLAY_NAME);
-    String label = getLabel(context.getResources(), cursor);
+    String label = speedDialUiItem.defaultChannel().label();
     String secondaryInfo =
         TextUtils.isEmpty(label)
             ? number
-            : context.getString(
-                com.android.contacts.common.R.string.call_subject_type_and_number, label, number);
+            : context.getString(R.string.call_subject_type_and_number, label, number);
 
-    nameOrNumberView.setText(name);
+    nameOrNumberView.setText(speedDialUiItem.name());
     numberView.setText(secondaryInfo);
 
-    long contactId = cursor.getLong(StrequentContactsCursorLoader.PHONE_ID);
-    String lookupKey = cursor.getString(StrequentContactsCursorLoader.PHONE_LOOKUP_KEY);
-    Uri contactUri = Contacts.getLookupUri(contactId, lookupKey);
-
-    String photoUri = cursor.getString(StrequentContactsCursorLoader.PHONE_PHOTO_URI);
-    ContactPhotoManager.getInstance(context)
-        .loadDialerThumbnailOrPhoto(
-            photoView,
-            contactUri,
-            cursor.getLong(StrequentContactsCursorLoader.PHONE_PHOTO_ID),
-            photoUri == null ? null : Uri.parse(photoUri),
-            name,
-            LetterTileDrawable.TYPE_DEFAULT);
-  }
-
-  // TODO(calderwoodra): handle CNAP and cequint types.
-  // TODO(calderwoodra): unify this into a utility method with CallLogAdapter#getNumberType
-  private static String getLabel(Resources resources, Cursor cursor) {
-    int numberType = cursor.getInt(StrequentContactsCursorLoader.PHONE_TYPE);
-    String numberLabel = cursor.getString(StrequentContactsCursorLoader.PHONE_LABEL);
-
-    // Returns empty label instead of "custom" if the custom label is empty.
-    if (numberType == Phone.TYPE_CUSTOM && TextUtils.isEmpty(numberLabel)) {
-      return "";
-    }
-    return (String) Phone.getTypeLabel(resources, numberType, numberLabel);
+    photoView.setPhoto(speedDialUiItem.getPhotoInfo());
   }
 
   @Override
   public void onClick(View v) {
     if (v.getId() == R.id.overflow) {
-      listener.onOverFlowMenuClicked(number);
+      listener.onOverFlowMenuClicked(speedDialUiItem, getHeaderInfo());
     } else {
-      listener.onRowClicked(number);
+      listener.onRowClicked(speedDialUiItem.defaultChannel());
     }
   }
 
+  private HistoryItemBottomSheetHeaderInfo getHeaderInfo() {
+    return HistoryItemBottomSheetHeaderInfo.newBuilder()
+        .setPhotoInfo(speedDialUiItem.getPhotoInfo())
+        .setPrimaryText(nameOrNumberView.getText().toString())
+        .setSecondaryText(numberView.getText().toString())
+        .build();
+  }
+
   /** Listener/Callback for {@link SuggestionViewHolder} parents. */
   public interface SuggestedContactsListener {
 
-    void onOverFlowMenuClicked(String number);
+    void onOverFlowMenuClicked(
+        SpeedDialUiItem speedDialUiItem, HistoryItemBottomSheetHeaderInfo headerInfo);
 
     /** Called when a suggested contact is clicked. */
-    void onRowClicked(String number);
+    void onRowClicked(Channel channel);
   }
 }
diff --git a/java/com/android/dialer/speeddial/database/SpeedDialEntry.java b/java/com/android/dialer/speeddial/database/SpeedDialEntry.java
new file mode 100644
index 0000000..181f9ec
--- /dev/null
+++ b/java/com/android/dialer/speeddial/database/SpeedDialEntry.java
@@ -0,0 +1,134 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.dialer.speeddial.database;
+
+import android.provider.ContactsContract.CommonDataKinds.Phone;
+import android.support.annotation.IntDef;
+import android.support.annotation.Nullable;
+import com.google.auto.value.AutoValue;
+import com.google.common.base.Optional;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+/** POJO representation of database rows returned by {@link SpeedDialEntryDao}. */
+@AutoValue
+public abstract class SpeedDialEntry {
+
+  /**
+   * Unique ID
+   *
+   * <p>Must be null when inserting, and an ID will be generated and returned after inserting.
+   */
+  @Nullable
+  public abstract Long id();
+
+  /** Position the contact is pinned to in the UI. Will be absent if it hasn't be set yet. */
+  public abstract Optional<Integer> pinnedPosition();
+
+  /** @see {@link Contacts#_ID} */
+  public abstract long contactId();
+
+  /** @see {@link Contacts#LOOKUP_KEY} */
+  public abstract String lookupKey();
+
+  /**
+   * {@link Channel} that is associated with this entry.
+   *
+   * <p>Contacts with multiple channels do not have a default until specified by the user. Once the
+   * default channel is determined, all calls should be placed to this channel.
+   */
+  @Nullable
+  public abstract Channel defaultChannel();
+
+  public abstract Builder toBuilder();
+
+  public static Builder builder() {
+    return new AutoValue_SpeedDialEntry.Builder().setPinnedPosition(Optional.absent());
+  }
+
+  /** Builder class for speed dial entry. */
+  @AutoValue.Builder
+  public abstract static class Builder {
+
+    public abstract Builder setId(Long id);
+
+    public abstract Builder setPinnedPosition(Optional<Integer> pinnedPosition);
+
+    public abstract Builder setContactId(long contactId);
+
+    public abstract Builder setLookupKey(String lookupKey);
+
+    public abstract Builder setDefaultChannel(@Nullable Channel defaultChannel);
+
+    public abstract SpeedDialEntry build();
+  }
+
+  /** POJO representation of a relevant phone number columns in {@link SpeedDialEntryDao}. */
+  @AutoValue
+  public abstract static class Channel {
+
+    public static final int UNKNOWN = 0;
+    public static final int VOICE = 1;
+    public static final int IMS_VIDEO = 2;
+    public static final int DUO = 3;
+
+    /** Whether the Channel is for an audio or video call. */
+    @Retention(RetentionPolicy.SOURCE)
+    @IntDef({UNKNOWN, VOICE, IMS_VIDEO, DUO})
+    public @interface Technology {}
+
+    public boolean isVideoTechnology() {
+      return technology() == IMS_VIDEO || technology() == DUO;
+    }
+
+    /**
+     * Raw phone number as the user entered it.
+     *
+     * @see Phone#NUMBER
+     */
+    public abstract String number();
+
+    /** @see Phone#TYPE */
+    public abstract int phoneType();
+
+    /** @see Phone#LABEL */
+    public abstract String label();
+
+    public abstract @Technology int technology();
+
+    public abstract Builder toBuilder();
+
+    public static Builder builder() {
+      return new AutoValue_SpeedDialEntry_Channel.Builder();
+    }
+
+    /** Builder class for {@link Channel}. */
+    @AutoValue.Builder
+    public abstract static class Builder {
+
+      public abstract Builder setNumber(String number);
+
+      public abstract Builder setPhoneType(int phoneType);
+
+      public abstract Builder setLabel(String label);
+
+      public abstract Builder setTechnology(@Technology int technology);
+
+      public abstract Channel build();
+    }
+  }
+}
diff --git a/java/com/android/dialer/speeddial/database/SpeedDialEntryDao.java b/java/com/android/dialer/speeddial/database/SpeedDialEntryDao.java
new file mode 100644
index 0000000..4d6ac2d
--- /dev/null
+++ b/java/com/android/dialer/speeddial/database/SpeedDialEntryDao.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.dialer.speeddial.database;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+
+/**
+ * Interface that databases support speed dial entries should implement.
+ *
+ * <p>This database is only used for favorite/starred contacts.
+ */
+public interface SpeedDialEntryDao {
+
+  /** Return all entries in the database */
+  ImmutableList<SpeedDialEntry> getAllEntries();
+
+  /**
+   * Insert new entries.
+   *
+   * <p>{@link SpeedDialEntry#id() ids} must be null.
+   *
+   * @return a map of the inserted entries to their new ids.
+   */
+  ImmutableMap<SpeedDialEntry, Long> insert(ImmutableList<SpeedDialEntry> entries);
+
+  /**
+   * Insert a new entry.
+   *
+   * <p>{@link SpeedDialEntry#id() ids} must be null.
+   */
+  long insert(SpeedDialEntry entry);
+
+  /**
+   * Updates existing entries based on {@link SpeedDialEntry#id}.
+   *
+   * <p>Fails if the {@link SpeedDialEntry#id()} doesn't exist.
+   */
+  void update(ImmutableList<SpeedDialEntry> entries);
+
+  /**
+   * Delete the passed in entries based on {@link SpeedDialEntry#id}.
+   *
+   * <p>Fails if the {@link SpeedDialEntry#id()} doesn't exist.
+   */
+  void delete(ImmutableList<Long> entries);
+
+  /**
+   * Inserts, updates and deletes rows all in on transaction.
+   *
+   * @return a map of the inserted entries to their new ids.
+   * @see #insert(ImmutableList)
+   * @see #update(ImmutableList)
+   * @see #delete(ImmutableList)
+   */
+  ImmutableMap<SpeedDialEntry, Long> insertUpdateAndDelete(
+      ImmutableList<SpeedDialEntry> entriesToInsert,
+      ImmutableList<SpeedDialEntry> entriesToUpdate,
+      ImmutableList<Long> entriesToDelete);
+
+  /** Delete all entries in the database. */
+  void deleteAll();
+}
diff --git a/java/com/android/dialer/speeddial/database/SpeedDialEntryDatabaseHelper.java b/java/com/android/dialer/speeddial/database/SpeedDialEntryDatabaseHelper.java
new file mode 100644
index 0000000..211af86
--- /dev/null
+++ b/java/com/android/dialer/speeddial/database/SpeedDialEntryDatabaseHelper.java
@@ -0,0 +1,320 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.dialer.speeddial.database;
+
+import android.content.ContentValues;
+import android.content.Context;
+import android.database.Cursor;
+import android.database.sqlite.SQLiteDatabase;
+import android.database.sqlite.SQLiteOpenHelper;
+import android.text.TextUtils;
+import com.android.dialer.common.Assert;
+import com.android.dialer.common.database.Selection;
+import com.android.dialer.speeddial.database.SpeedDialEntry.Channel;
+import com.google.common.base.Optional;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * {@link SpeedDialEntryDao} implemented as an SQLite database.
+ *
+ * @see SpeedDialEntryDao
+ */
+public final class SpeedDialEntryDatabaseHelper extends SQLiteOpenHelper
+    implements SpeedDialEntryDao {
+
+  /**
+   * If the pinned position is absent, then we need to write an impossible value in the table like
+   * -1 so that it doesn't default to 0. When we read this value from the table, we'll translate it
+   * to Optional.absent() in the resulting {@link SpeedDialEntry}.
+   */
+  private static final int PINNED_POSITION_ABSENT = -1;
+
+  private static final int DATABASE_VERSION = 2;
+  private static final String DATABASE_NAME = "CPSpeedDialEntry";
+
+  // Column names
+  private static final String TABLE_NAME = "speed_dial_entries";
+  private static final String ID = "id";
+  private static final String PINNED_POSITION = "pinned_position";
+  private static final String CONTACT_ID = "contact_id";
+  private static final String LOOKUP_KEY = "lookup_key";
+  private static final String PHONE_NUMBER = "phone_number";
+  private static final String PHONE_TYPE = "phone_type";
+  private static final String PHONE_LABEL = "phone_label";
+  private static final String PHONE_TECHNOLOGY = "phone_technology";
+
+  // Column positions
+  private static final int POSITION_ID = 0;
+  private static final int POSITION_PINNED_POSITION = 1;
+  private static final int POSITION_CONTACT_ID = 2;
+  private static final int POSITION_LOOKUP_KEY = 3;
+  private static final int POSITION_PHONE_NUMBER = 4;
+  private static final int POSITION_PHONE_TYPE = 5;
+  private static final int POSITION_PHONE_LABEL = 6;
+  private static final int POSITION_PHONE_TECHNOLOGY = 7;
+
+  // Create Table Query
+  private static final String CREATE_TABLE_SQL =
+      "create table if not exists "
+          + TABLE_NAME
+          + " ("
+          + (ID + " integer primary key, ")
+          + (PINNED_POSITION + " integer, ")
+          + (CONTACT_ID + " integer, ")
+          + (LOOKUP_KEY + " text, ")
+          + (PHONE_NUMBER + " text, ")
+          + (PHONE_TYPE + " integer, ")
+          + (PHONE_LABEL + " text, ")
+          + (PHONE_TECHNOLOGY + " integer ")
+          + ");";
+
+  private static final String DELETE_TABLE_SQL = "drop table if exists " + TABLE_NAME;
+
+  public SpeedDialEntryDatabaseHelper(Context context) {
+    super(context, DATABASE_NAME, null, DATABASE_VERSION);
+  }
+
+  @Override
+  public void onCreate(SQLiteDatabase db) {
+    db.execSQL(CREATE_TABLE_SQL);
+  }
+
+  @Override
+  public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
+    // TODO(calderwoodra): handle upgrades more elegantly
+    db.execSQL(DELETE_TABLE_SQL);
+    this.onCreate(db);
+  }
+
+  @Override
+  public void onDowngrade(SQLiteDatabase db, int oldVersion, int newVersion) {
+    // TODO(calderwoodra): handle upgrades more elegantly
+    this.onUpgrade(db, oldVersion, newVersion);
+  }
+
+  @Override
+  public ImmutableList<SpeedDialEntry> getAllEntries() {
+    List<SpeedDialEntry> entries = new ArrayList<>();
+
+    String query = "SELECT * FROM " + TABLE_NAME;
+    try (SQLiteDatabase db = getReadableDatabase();
+        Cursor cursor = db.rawQuery(query, null)) {
+      cursor.moveToPosition(-1);
+      while (cursor.moveToNext()) {
+        String number = cursor.getString(POSITION_PHONE_NUMBER);
+        Channel channel = null;
+        if (!TextUtils.isEmpty(number)) {
+          channel =
+              Channel.builder()
+                  .setNumber(number)
+                  .setPhoneType(cursor.getInt(POSITION_PHONE_TYPE))
+                  .setLabel(Optional.of(cursor.getString(POSITION_PHONE_LABEL)).or(""))
+                  .setTechnology(cursor.getInt(POSITION_PHONE_TECHNOLOGY))
+                  .build();
+        }
+
+        Optional<Integer> pinnedPosition = Optional.of(cursor.getInt(POSITION_PINNED_POSITION));
+        if (pinnedPosition.or(PINNED_POSITION_ABSENT) == PINNED_POSITION_ABSENT) {
+          pinnedPosition = Optional.absent();
+        }
+
+        SpeedDialEntry entry =
+            SpeedDialEntry.builder()
+                .setDefaultChannel(channel)
+                .setContactId(cursor.getLong(POSITION_CONTACT_ID))
+                .setLookupKey(cursor.getString(POSITION_LOOKUP_KEY))
+                .setPinnedPosition(pinnedPosition)
+                .setId(cursor.getLong(POSITION_ID))
+                .build();
+        entries.add(entry);
+      }
+    }
+    return ImmutableList.copyOf(entries);
+  }
+
+  @Override
+  public ImmutableMap<SpeedDialEntry, Long> insert(ImmutableList<SpeedDialEntry> entries) {
+    if (entries.isEmpty()) {
+      return ImmutableMap.of();
+    }
+
+    SQLiteDatabase db = getWritableDatabase();
+    db.beginTransaction();
+    try {
+      ImmutableMap<SpeedDialEntry, Long> insertedEntriesToIdsMap = insert(db, entries);
+      db.setTransactionSuccessful();
+      return insertedEntriesToIdsMap;
+    } finally {
+      db.endTransaction();
+      db.close();
+    }
+  }
+
+  private ImmutableMap<SpeedDialEntry, Long> insert(
+      SQLiteDatabase writeableDatabase, ImmutableList<SpeedDialEntry> entries) {
+    ImmutableMap.Builder<SpeedDialEntry, Long> insertedEntriesToIdsMap = ImmutableMap.builder();
+    for (SpeedDialEntry entry : entries) {
+      Assert.checkArgument(entry.id() == null);
+      long id = writeableDatabase.insert(TABLE_NAME, null, buildContentValuesWithoutId(entry));
+      if (id == -1L) {
+        throw Assert.createUnsupportedOperationFailException(
+            "Attempted to insert a row that already exists.");
+      }
+      // It's impossible to insert two identical entries but this is an important assumption we need
+      // to verify because there's an assumption that each entry will correspond to exactly one id.
+      // ImmutableMap#put verifies this check for us.
+      insertedEntriesToIdsMap.put(entry, id);
+    }
+    return insertedEntriesToIdsMap.build();
+  }
+
+  @Override
+  public long insert(SpeedDialEntry entry) {
+    long updateRowId;
+    try (SQLiteDatabase db = getWritableDatabase()) {
+      updateRowId = db.insert(TABLE_NAME, null, buildContentValuesWithoutId(entry));
+    }
+    if (updateRowId == -1) {
+      throw Assert.createUnsupportedOperationFailException(
+          "Attempted to insert a row that already exists.");
+    }
+    return updateRowId;
+  }
+
+  @Override
+  public void update(ImmutableList<SpeedDialEntry> entries) {
+    if (entries.isEmpty()) {
+      return;
+    }
+
+    SQLiteDatabase db = getWritableDatabase();
+    db.beginTransaction();
+    try {
+      update(db, entries);
+      db.setTransactionSuccessful();
+    } finally {
+      db.endTransaction();
+      db.close();
+    }
+  }
+
+  private void update(SQLiteDatabase writeableDatabase, ImmutableList<SpeedDialEntry> entries) {
+    for (SpeedDialEntry entry : entries) {
+      int count =
+          writeableDatabase.update(
+              TABLE_NAME,
+              buildContentValuesWithId(entry),
+              ID + " = ?",
+              new String[] {Long.toString(entry.id())});
+      if (count != 1) {
+        throw Assert.createUnsupportedOperationFailException(
+            "Attempted to update an undetermined number of rows: " + count);
+      }
+    }
+  }
+
+  private ContentValues buildContentValuesWithId(SpeedDialEntry entry) {
+    return buildContentValues(entry, true);
+  }
+
+  private ContentValues buildContentValuesWithoutId(SpeedDialEntry entry) {
+    return buildContentValues(entry, false);
+  }
+
+  private ContentValues buildContentValues(SpeedDialEntry entry, boolean includeId) {
+    ContentValues values = new ContentValues();
+    if (includeId) {
+      values.put(ID, entry.id());
+    }
+    values.put(PINNED_POSITION, entry.pinnedPosition().or(PINNED_POSITION_ABSENT));
+    values.put(CONTACT_ID, entry.contactId());
+    values.put(LOOKUP_KEY, entry.lookupKey());
+    if (entry.defaultChannel() != null) {
+      values.put(PHONE_NUMBER, entry.defaultChannel().number());
+      values.put(PHONE_TYPE, entry.defaultChannel().phoneType());
+      values.put(PHONE_LABEL, entry.defaultChannel().label());
+      values.put(PHONE_TECHNOLOGY, entry.defaultChannel().technology());
+    }
+    return values;
+  }
+
+  @Override
+  public void delete(ImmutableList<Long> ids) {
+    if (ids.isEmpty()) {
+      return;
+    }
+
+    try (SQLiteDatabase db = getWritableDatabase()) {
+      delete(db, ids);
+    }
+  }
+
+  private void delete(SQLiteDatabase writeableDatabase, ImmutableList<Long> ids) {
+    List<String> idStrings = new ArrayList<>();
+    for (Long id : ids) {
+      idStrings.add(Long.toString(id));
+    }
+
+    Selection selection = Selection.builder().and(Selection.column(ID).in(idStrings)).build();
+    int count =
+        writeableDatabase.delete(
+            TABLE_NAME, selection.getSelection(), selection.getSelectionArgs());
+    if (count != ids.size()) {
+      throw Assert.createUnsupportedOperationFailException(
+          "Attempted to delete an undetermined number of rows: " + count);
+    }
+  }
+
+  @Override
+  public ImmutableMap<SpeedDialEntry, Long> insertUpdateAndDelete(
+      ImmutableList<SpeedDialEntry> entriesToInsert,
+      ImmutableList<SpeedDialEntry> entriesToUpdate,
+      ImmutableList<Long> entriesToDelete) {
+    if (entriesToInsert.isEmpty() && entriesToUpdate.isEmpty() && entriesToDelete.isEmpty()) {
+      return ImmutableMap.of();
+    }
+    SQLiteDatabase db = getWritableDatabase();
+    db.beginTransaction();
+    try {
+      ImmutableMap<SpeedDialEntry, Long> insertedEntriesToIdsMap = insert(db, entriesToInsert);
+      update(db, entriesToUpdate);
+      delete(db, entriesToDelete);
+      db.setTransactionSuccessful();
+      return insertedEntriesToIdsMap;
+    } finally {
+      db.endTransaction();
+      db.close();
+    }
+  }
+
+  @Override
+  public void deleteAll() {
+    SQLiteDatabase db = getWritableDatabase();
+    db.beginTransaction();
+    try {
+      // Passing null into where clause will delete all rows
+      db.delete(TABLE_NAME, /* whereClause=*/ null, null);
+      db.setTransactionSuccessful();
+    } finally {
+      db.endTransaction();
+      db.close();
+    }
+  }
+}
diff --git a/java/com/android/dialer/speeddial/draghelper/SpeedDialFavoritesViewHolderOnTouchListener.java b/java/com/android/dialer/speeddial/draghelper/SpeedDialFavoritesViewHolderOnTouchListener.java
new file mode 100644
index 0000000..00fecd7
--- /dev/null
+++ b/java/com/android/dialer/speeddial/draghelper/SpeedDialFavoritesViewHolderOnTouchListener.java
@@ -0,0 +1,107 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.dialer.speeddial.draghelper;
+
+import android.support.v7.widget.RecyclerView.ViewHolder;
+import android.support.v7.widget.helper.ItemTouchHelper;
+import android.view.HapticFeedbackConstants;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.View.OnTouchListener;
+import android.view.ViewConfiguration;
+import com.android.dialer.common.Assert;
+
+/** OnTouchListener for the {@link com.android.dialer.speeddial.FavoritesViewHolder}. */
+public class SpeedDialFavoritesViewHolderOnTouchListener implements OnTouchListener {
+
+  private final ViewConfiguration configuration;
+  private final ItemTouchHelper itemTouchHelper;
+  private final ViewHolder viewHolder;
+  private final OnTouchFinishCallback onTouchFinishCallback;
+
+  private boolean hasPerformedLongClick;
+  private float startX;
+  private float startY;
+
+  public SpeedDialFavoritesViewHolderOnTouchListener(
+      ViewConfiguration configuration,
+      ItemTouchHelper itemTouchHelper,
+      ViewHolder viewHolder,
+      OnTouchFinishCallback onTouchFinishCallback) {
+    this.configuration = configuration;
+    this.itemTouchHelper = itemTouchHelper;
+    this.viewHolder = viewHolder;
+    this.onTouchFinishCallback = onTouchFinishCallback;
+  }
+
+  @Override
+  public boolean onTouch(View v, MotionEvent event) {
+    switch (event.getAction()) {
+      case MotionEvent.ACTION_DOWN:
+        startX = event.getX();
+        startY = event.getY();
+        return true;
+      case MotionEvent.ACTION_MOVE:
+        // If the user has long clicked the view
+        if (event.getEventTime() - event.getDownTime() > ViewConfiguration.getLongPressTimeout()) {
+          // Perform long click if we haven't already
+          if (!hasPerformedLongClick) {
+            v.performLongClick();
+            v.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS);
+            hasPerformedLongClick = true;
+          } else if (moveEventExceedsTouchSlop(event)) {
+            itemTouchHelper.startDrag(viewHolder);
+            onTouchFinishCallback.onTouchFinished(true);
+          }
+        }
+        return true;
+      case MotionEvent.ACTION_UP:
+        if (event.getEventTime() - event.getDownTime() < ViewConfiguration.getLongPressTimeout()) {
+          v.performClick();
+        }
+        // fallthrough
+      case MotionEvent.ACTION_CANCEL:
+        hasPerformedLongClick = false;
+        onTouchFinishCallback.onTouchFinished(false);
+        return true;
+      default:
+        return false;
+    }
+  }
+
+  private boolean moveEventExceedsTouchSlop(MotionEvent event) {
+    Assert.checkArgument(event.getAction() == MotionEvent.ACTION_MOVE);
+    if (event.getHistorySize() <= 0) {
+      return false;
+    }
+
+    return Math.abs(startX - event.getX()) > configuration.getScaledTouchSlop()
+        || Math.abs(startY - event.getY()) > configuration.getScaledTouchSlop();
+  }
+
+  /** Callback to listen for on touch events ending. */
+  public interface OnTouchFinishCallback {
+
+    /**
+     * Called when the user stops touching the view.
+     *
+     * @see MotionEvent#ACTION_UP
+     * @see MotionEvent#ACTION_CANCEL
+     */
+    void onTouchFinished(boolean closeContextMenu);
+  }
+}
diff --git a/java/com/android/dialer/speeddial/draghelper/SpeedDialItemTouchHelperCallback.java b/java/com/android/dialer/speeddial/draghelper/SpeedDialItemTouchHelperCallback.java
new file mode 100644
index 0000000..2f5d87c
--- /dev/null
+++ b/java/com/android/dialer/speeddial/draghelper/SpeedDialItemTouchHelperCallback.java
@@ -0,0 +1,164 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.dialer.speeddial.draghelper;
+
+import android.content.Context;
+import android.graphics.Canvas;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.v7.widget.RecyclerView;
+import android.support.v7.widget.RecyclerView.ViewHolder;
+import android.support.v7.widget.helper.ItemTouchHelper;
+import com.android.dialer.logging.DialerImpression;
+import com.android.dialer.logging.Logger;
+
+/** {@link ItemTouchHelper} for Speed Dial favorite contacts. */
+public class SpeedDialItemTouchHelperCallback extends ItemTouchHelper.Callback {
+
+  private final ItemTouchHelperAdapter adapter;
+  private final Context context;
+
+  // When dragged item is in removeView, onMove() and onChildDraw() are called in turn. This
+  // behavior changes when dragged item entering/leaving removeView. The boolean field
+  // movedOverRemoveView is for onMove() and onChildDraw() to flip.
+  private boolean movedOverRemoveView;
+  private boolean inRemoveView;
+
+  public SpeedDialItemTouchHelperCallback(Context context, ItemTouchHelperAdapter adapter) {
+    this.context = context;
+    this.adapter = adapter;
+  }
+
+  @Override
+  public boolean isLongPressDragEnabled() {
+    // We'll manually call ItemTouchHelper#startDrag
+    return false;
+  }
+
+  @Override
+  public boolean isItemViewSwipeEnabled() {
+    // We don't want to enable swiping
+    return false;
+  }
+
+  @Override
+  public boolean canDropOver(
+      @NonNull RecyclerView recyclerView, @NonNull ViewHolder current, @NonNull ViewHolder target) {
+    return adapter.canDropOver(target);
+  }
+
+  @Override
+  public int getMovementFlags(@NonNull RecyclerView recyclerView, @NonNull ViewHolder viewHolder) {
+    if (!adapter.canDropOver(viewHolder)) {
+      return makeMovementFlags(0, 0);
+    }
+
+    int dragFlags =
+        ItemTouchHelper.UP | ItemTouchHelper.DOWN | ItemTouchHelper.START | ItemTouchHelper.END;
+    return makeMovementFlags(dragFlags, /* swipeFlags */ 0);
+  }
+
+  @Override
+  public boolean onMove(
+      @NonNull RecyclerView recyclerView,
+      @NonNull ViewHolder viewHolder,
+      @NonNull ViewHolder target) {
+    if (target.getItemViewType() == 0) { // 0 for RowType.REMOVE_VIEW
+      movedOverRemoveView = true;
+      if (!inRemoveView) {
+        // onMove() first called
+        adapter.enterRemoveView();
+        inRemoveView = true;
+      }
+      return false;
+    } else if (inRemoveView) {
+      // Move out of removeView fast
+      inRemoveView = false;
+      movedOverRemoveView = false;
+      adapter.leaveRemoveView();
+    }
+    adapter.onItemMove(viewHolder.getAdapterPosition(), target.getAdapterPosition());
+    return true;
+  }
+
+  @Override
+  public void onMoved(
+      @NonNull RecyclerView recyclerView,
+      @NonNull ViewHolder viewHolder,
+      int fromPos,
+      @NonNull ViewHolder viewHolder1,
+      int toPos,
+      int x,
+      int y) {
+    Logger.get(context)
+        .logImpression(DialerImpression.Type.FAVORITE_MOVE_FAVORITE_BY_DRAG_AND_DROP);
+    super.onMoved(recyclerView, viewHolder, fromPos, viewHolder1, toPos, x, y);
+  }
+
+  @Override
+  public void onChildDraw(
+      @NonNull Canvas canvas,
+      @NonNull RecyclerView recyclerView,
+      @NonNull ViewHolder viewHolder,
+      float dx,
+      float dy,
+      int i,
+      boolean isCurrentlyActive) {
+    if (inRemoveView) {
+      if (!isCurrentlyActive) {
+        // View animating back to its original state, which means drop in this case
+        inRemoveView = false;
+        adapter.dropOnRemoveView(viewHolder);
+      }
+      if (!movedOverRemoveView) {
+        // when the view is over a droppable target, onMove() will be called before onChildDraw()
+        // thus if onMove() is not called, it is not over a droppable target.
+        inRemoveView = false;
+        adapter.leaveRemoveView();
+      }
+    }
+    movedOverRemoveView = false;
+    super.onChildDraw(canvas, recyclerView, viewHolder, dx, dy, i, isCurrentlyActive);
+  }
+
+  @Override
+  public void onSelectedChanged(@Nullable ViewHolder viewHolder, int actionState) {
+    super.onSelectedChanged(viewHolder, actionState);
+    adapter.onSelectedChanged(viewHolder, actionState);
+  }
+
+  @Override
+  public void onSwiped(@NonNull ViewHolder viewHolder, int direction) {
+    // No-op since we don't support swiping
+  }
+
+  /** RecyclerView adapters interested in drag and drop should implement this interface. */
+  public interface ItemTouchHelperAdapter {
+
+    void onItemMove(int fromPosition, int toPosition);
+
+    boolean canDropOver(ViewHolder target);
+
+    void onSelectedChanged(@Nullable ViewHolder viewHolder, int actionState);
+
+    void enterRemoveView();
+
+    void leaveRemoveView();
+
+    void dropOnRemoveView(ViewHolder fromViewHolder);
+  }
+}
diff --git a/java/com/android/dialer/speeddial/draghelper/SpeedDialLayoutManager.java b/java/com/android/dialer/speeddial/draghelper/SpeedDialLayoutManager.java
new file mode 100644
index 0000000..fcc9251
--- /dev/null
+++ b/java/com/android/dialer/speeddial/draghelper/SpeedDialLayoutManager.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.dialer.speeddial.draghelper;
+
+import android.content.Context;
+import android.support.v7.widget.GridLayoutManager;
+
+/** {@link GridLayoutManager} that allows disabling scrolling. */
+public class SpeedDialLayoutManager extends GridLayoutManager {
+
+  private boolean isScrollEnabled = true;
+
+  public SpeedDialLayoutManager(Context context, int spanCount) {
+    super(context, spanCount);
+  }
+
+  public void setScrollEnabled(boolean flag) {
+    this.isScrollEnabled = flag;
+  }
+
+  @Override
+  public boolean canScrollVertically() {
+    // Similarly you can customize "canScrollHorizontally()" for managing horizontal scroll
+    return isScrollEnabled && super.canScrollVertically();
+  }
+}
diff --git a/java/com/android/dialer/speeddial/loader/SpeedDialUiItem.java b/java/com/android/dialer/speeddial/loader/SpeedDialUiItem.java
new file mode 100644
index 0000000..4d268f3
--- /dev/null
+++ b/java/com/android/dialer/speeddial/loader/SpeedDialUiItem.java
@@ -0,0 +1,373 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.dialer.speeddial.loader;
+
+import android.content.res.Resources;
+import android.database.Cursor;
+import android.os.Trace;
+import android.provider.ContactsContract.CommonDataKinds.Phone;
+import android.provider.ContactsContract.Contacts;
+import android.provider.ContactsContract.Data;
+import android.support.annotation.Nullable;
+import android.text.TextUtils;
+import android.util.ArraySet;
+import com.android.dialer.common.Assert;
+import com.android.dialer.glidephotomanager.PhotoInfo;
+import com.android.dialer.speeddial.database.SpeedDialEntry;
+import com.android.dialer.speeddial.database.SpeedDialEntry.Channel;
+import com.google.auto.value.AutoValue;
+import com.google.common.base.Optional;
+import com.google.common.collect.ImmutableList;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.Set;
+
+/**
+ * POJO representation of each speed dial list element.
+ *
+ * <p>Contains all data needed for the UI so that the UI never needs do additional contact queries.
+ *
+ * <p>Differs from {@link SpeedDialEntry} in that entries are specific to favorited/starred contacts
+ * and {@link SpeedDialUiItem}s can be both favorites and suggested contacts.
+ */
+@AutoValue
+public abstract class SpeedDialUiItem {
+
+  public static final int LOOKUP_KEY = 0;
+  public static final int CONTACT_ID = 1;
+  public static final int DISPLAY_NAME = 2;
+  public static final int STARRED = 3;
+  public static final int NUMBER = 4;
+  public static final int TYPE = 5;
+  public static final int LABEL = 6;
+  public static final int PHOTO_ID = 7;
+  public static final int PHOTO_URI = 8;
+  public static final int CARRIER_PRESENCE = 9;
+
+  private static final String[] PHONE_PROJECTION = {
+    Phone.LOOKUP_KEY,
+    Phone.CONTACT_ID,
+    Phone.DISPLAY_NAME,
+    Phone.STARRED,
+    Phone.NUMBER,
+    Phone.TYPE,
+    Phone.LABEL,
+    Phone.PHOTO_ID,
+    Phone.PHOTO_URI,
+    Phone.CARRIER_PRESENCE
+  };
+
+  private static final String[] PHONE_PROJECTION_ALTERNATIVE = {
+    Phone.LOOKUP_KEY,
+    Phone.CONTACT_ID,
+    Phone.DISPLAY_NAME_ALTERNATIVE,
+    Phone.STARRED,
+    Phone.NUMBER,
+    Phone.TYPE,
+    Phone.LABEL,
+    Phone.PHOTO_ID,
+    Phone.PHOTO_URI,
+    Phone.CARRIER_PRESENCE
+  };
+
+  public static String[] getPhoneProjection(boolean primaryDisplayOrder) {
+    return primaryDisplayOrder ? PHONE_PROJECTION : PHONE_PROJECTION_ALTERNATIVE;
+  }
+
+  public static Builder builder() {
+    return new AutoValue_SpeedDialUiItem.Builder()
+        .setChannels(ImmutableList.of())
+        .setPinnedPosition(Optional.absent());
+  }
+
+  /**
+   * Convert a cursor with projection {@link #getPhoneProjection(boolean)} into a {@link
+   * SpeedDialUiItem}.
+   *
+   * <p>This cursor is structured such that contacts are grouped by contact id and lookup key and
+   * each row that shares the same contact id and lookup key represents a phone number that belongs
+   * to a single contact.
+   *
+   * <p>If the cursor started at row X, this method will advance to row Y s.t. rows X, X + 1, ... Y
+   * - 1 all belong to the same contact (that is, share the same contact id and lookup key).
+   */
+  public static SpeedDialUiItem fromCursor(
+      Resources resources, Cursor cursor, boolean isImsEnabled) {
+    Trace.beginSection("fromCursor");
+    Assert.checkArgument(cursor != null);
+    Assert.checkArgument(cursor.getCount() != 0);
+    String lookupKey = cursor.getString(LOOKUP_KEY);
+    SpeedDialUiItem.Builder builder =
+        SpeedDialUiItem.builder()
+            .setLookupKey(lookupKey)
+            .setContactId(cursor.getLong(CONTACT_ID))
+            // TODO(a bug): handle last name first preference
+            .setName(cursor.getString(DISPLAY_NAME))
+            .setIsStarred(cursor.getInt(STARRED) == 1)
+            .setPhotoId(cursor.getLong(PHOTO_ID))
+            .setPhotoUri(
+                TextUtils.isEmpty(cursor.getString(PHOTO_URI)) ? "" : cursor.getString(PHOTO_URI));
+
+    // While there are more rows and the lookup keys are the same, add a channel for each of the
+    // contact's phone numbers.
+    List<Channel> channels = new ArrayList<>();
+    Set<String> numbers = new ArraySet<>();
+    do {
+      String number = cursor.getString(NUMBER);
+      // TODO(78492722): consider using lib phone number to compare numbers
+      if (!numbers.add(number)) {
+        // Number is identical to an existing number, skip this number
+        continue;
+      }
+
+      Channel channel =
+          Channel.builder()
+              .setNumber(number)
+              .setPhoneType(cursor.getInt(TYPE))
+              .setLabel(getLabel(resources, cursor))
+              .setTechnology(Channel.VOICE)
+              .build();
+      channels.add(channel);
+
+      if (isImsEnabled
+          && (cursor.getInt(CARRIER_PRESENCE) & Data.CARRIER_PRESENCE_VT_CAPABLE) == 1) {
+        // Add another channel if the number is ViLTE reachable
+        channels.add(channel.toBuilder().setTechnology(Channel.IMS_VIDEO).build());
+      }
+      // TODO(a bug): add another channel for Duo (needs to happen on main thread)
+    } while (cursor.moveToNext() && Objects.equals(lookupKey, cursor.getString(LOOKUP_KEY)));
+
+    builder.setChannels(ImmutableList.copyOf(channels));
+    Trace.endSection();
+    return builder.build();
+  }
+
+  private static String getLabel(Resources resources, Cursor cursor) {
+    int numberType = cursor.getInt(TYPE);
+    String numberLabel = cursor.getString(LABEL);
+
+    // Returns empty label instead of "custom" if the custom label is empty.
+    if (numberType == Phone.TYPE_CUSTOM && TextUtils.isEmpty(numberLabel)) {
+      return "";
+    }
+    return (String) Phone.getTypeLabel(resources, numberType, numberLabel);
+  }
+
+  public PhotoInfo getPhotoInfo() {
+    return PhotoInfo.newBuilder()
+        .setPhotoId(photoId())
+        .setPhotoUri(photoUri())
+        .setName(name())
+        .setIsVideo(defaultChannel() != null && defaultChannel().isVideoTechnology())
+        .setLookupUri(Contacts.getLookupUri(contactId(), lookupKey()).toString())
+        .build();
+  }
+
+  public SpeedDialEntry buildSpeedDialEntry() {
+    return SpeedDialEntry.builder()
+        .setId(speedDialEntryId())
+        .setPinnedPosition(pinnedPosition())
+        .setLookupKey(lookupKey())
+        .setContactId(contactId())
+        .setDefaultChannel(defaultChannel())
+        .build();
+  }
+
+  /**
+   * Returns one of the following:
+   *
+   * <ul>
+   *   <li>The default channel if it's a video channel.
+   *   <li>A video channel if it has the same attributes as the default channel, OR
+   *   <li>null. (This is a deliberate product decision, even if there is only a single video
+   *       reachable channel, we should still return null if it has different attributes from those
+   *       in the default channel).
+   * </ul>
+   */
+  @Nullable
+  public Channel getDefaultVideoChannel() {
+    if (defaultChannel() == null) {
+      return null;
+    }
+
+    if (defaultChannel().isVideoTechnology()) {
+      return defaultChannel();
+    }
+
+    if (channels().size() == 1) {
+      // If there is only a single channel, it can't be a video channel
+      return null;
+    }
+
+    // At this point, the default channel is a *voice* channel and there are more than
+    // one channel in total.
+    //
+    // Our defined assumptions about the channel list include that if a video channel
+    // follows a voice channel, it has the same attributes as that voice channel
+    // (see comments on method channels() for details).
+    //
+    // Therefore, if the default video channel exists, it must be the immediate successor
+    // of the default channel in the list.
+    //
+    // Note that we don't have to check if the last channel in the list is the default
+    // channel because even if it is, there will be no video channel under the assumption
+    // above.
+    for (int i = 0; i < channels().size() - 1; i++) {
+      // Find the default channel
+      if (Objects.equals(defaultChannel(), channels().get(i))) {
+        // Our defined assumptions about the list of channels is that if a video channel follows a
+        // voice channel, it has the same attributes as that voice channel.
+        Channel channel = channels().get(i + 1);
+        if (channel.isVideoTechnology()) {
+          return channel;
+        }
+        // Since the default voice channel isn't video reachable, we can't video call this number
+        return null;
+      }
+    }
+    throw Assert.createIllegalStateFailException("channels() doesn't contain defaultChannel().");
+  }
+
+  /**
+   * Returns a voice channel if there is exactly one channel or the default channel is a voice
+   * channel.
+   */
+  @Nullable
+  public Channel getDefaultVoiceChannel() {
+    if (channels().size() == 1) {
+      // If there is only a single channel, it must be a voice channel as per our defined
+      // assumptions (detailed in comments on method channels()).
+      return channels().get(0);
+    }
+
+    if (defaultChannel() == null) {
+      return null;
+    }
+
+    if (!defaultChannel().isVideoTechnology()) {
+      return defaultChannel();
+    }
+
+    // Default channel is a video channel, so find it's corresponding voice channel by number since
+    // unreachable channels may not be in the list
+    for (Channel currentChannel : channels()) {
+      if (currentChannel.number().equals(defaultChannel().number())
+          && currentChannel.technology() == Channel.VOICE) {
+        return currentChannel;
+      }
+    }
+    return null;
+  }
+
+  /**
+   * The id of the corresponding SpeedDialEntry. Null if the UI item does not have an entry, for
+   * example suggested contacts (isStarred() will also be false)
+   *
+   * @see SpeedDialEntry#id()
+   */
+  @Nullable
+  public abstract Long speedDialEntryId();
+
+  /** @see SpeedDialEntry#pinnedPosition() */
+  public abstract Optional<Integer> pinnedPosition();
+
+  /** @see android.provider.ContactsContract.Contacts#DISPLAY_NAME */
+  public abstract String name();
+
+  /** @see android.provider.ContactsContract.Contacts#_ID */
+  public abstract long contactId();
+
+  /** @see android.provider.ContactsContract.Contacts#LOOKUP_KEY */
+  public abstract String lookupKey();
+
+  /** @see android.provider.ContactsContract.Contacts#STARRED */
+  public abstract boolean isStarred();
+
+  /** @see Phone#PHOTO_ID */
+  public abstract long photoId();
+
+  /** @see Phone#PHOTO_URI */
+  public abstract String photoUri();
+
+  /**
+   * Returns a list of channels available. A Duo channel is included iff it is reachable. Since a
+   * contact can have multiple phone numbers and each number can have multiple technologies,
+   * enumerate each one here so that the user can choose the correct one. Each channel here
+   * represents a row in the {@link com.android.dialer.speeddial.DisambigDialog}.
+   *
+   * <p>These channels have a few very strictly enforced assumption that are used heavily throughout
+   * the codebase. Those assumption are that:
+   *
+   * <ol>
+   *   <li>Each of the contact's numbers are voice reachable. So if a channel has it's technology
+   *       set to anything other than {@link Channel#VOICE}, there is gaurenteed to be another
+   *       channel with the exact same attributes, but technology will be {@link Channel#VOICE}.
+   *   <li>For each of the contact's phone numbers, there will be a voice channel, then the next
+   *       channel will either be the same phone number but a video channel, or a new number.
+   * </ol>
+   *
+   * For example: Say a contact has two phone numbers (A & B) and A is duo reachable. Then you can
+   * assume the list of channels will be ordered as either {A_voice, A_duo, B_voice} or {B_voice,
+   * A_voice, A_duo}.
+   *
+   * @see com.android.dialer.speeddial.database.SpeedDialEntry.Channel
+   */
+  public abstract ImmutableList<Channel> channels();
+
+  /**
+   * Will be null when the user hasn't chosen a default yet. Note that a default channel may not be
+   * in the list returned by {@link #channels()}. This is because that list does not contain an
+   * unreachable Duo channel. When the default channel is a Duo channel and it becomes unreachable,
+   * it will remain as the default channel but disappear in the list returned by {@link
+   * #channels()}.
+   *
+   * @see com.android.dialer.speeddial.database.SpeedDialEntry#defaultChannel()
+   */
+  public abstract @Nullable Channel defaultChannel();
+
+  public abstract Builder toBuilder();
+
+  /** Builder class for speed dial contact. */
+  @AutoValue.Builder
+  public abstract static class Builder {
+
+    /** Set to null if {@link #isStarred()} is false. */
+    public abstract Builder setSpeedDialEntryId(@Nullable Long id);
+
+    public abstract Builder setPinnedPosition(Optional<Integer> pinnedPosition);
+
+    public abstract Builder setName(String name);
+
+    public abstract Builder setContactId(long contactId);
+
+    public abstract Builder setLookupKey(String lookupKey);
+
+    public abstract Builder setIsStarred(boolean isStarred);
+
+    public abstract Builder setPhotoId(long photoId);
+
+    public abstract Builder setPhotoUri(String photoUri);
+
+    public abstract Builder setChannels(ImmutableList<Channel> channels);
+
+    /** Set to null if the user hasn't chosen a default or the channel no longer exists. */
+    public abstract Builder setDefaultChannel(@Nullable Channel defaultChannel);
+
+    public abstract SpeedDialUiItem build();
+  }
+}
diff --git a/java/com/android/dialer/speeddial/loader/SpeedDialUiItemMutator.java b/java/com/android/dialer/speeddial/loader/SpeedDialUiItemMutator.java
new file mode 100644
index 0000000..86d5d37
--- /dev/null
+++ b/java/com/android/dialer/speeddial/loader/SpeedDialUiItemMutator.java
@@ -0,0 +1,691 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.dialer.speeddial.loader;
+
+import android.content.ContentProviderOperation;
+import android.content.ContentValues;
+import android.content.Context;
+import android.content.OperationApplicationException;
+import android.database.Cursor;
+import android.net.Uri;
+import android.os.RemoteException;
+import android.os.Trace;
+import android.provider.ContactsContract;
+import android.provider.ContactsContract.CommonDataKinds.Phone;
+import android.provider.ContactsContract.Contacts;
+import android.support.annotation.MainThread;
+import android.support.annotation.WorkerThread;
+import android.util.ArrayMap;
+import android.util.ArraySet;
+import com.android.dialer.common.Assert;
+import com.android.dialer.common.LogUtil;
+import com.android.dialer.common.concurrent.Annotations.BackgroundExecutor;
+import com.android.dialer.common.concurrent.DefaultFutureCallback;
+import com.android.dialer.common.concurrent.DialerExecutor.SuccessListener;
+import com.android.dialer.common.concurrent.DialerFutureSerializer;
+import com.android.dialer.common.database.Selection;
+import com.android.dialer.contacts.ContactsComponent;
+import com.android.dialer.contacts.displaypreference.ContactDisplayPreferences;
+import com.android.dialer.contacts.displaypreference.ContactDisplayPreferences.DisplayOrder;
+import com.android.dialer.contacts.hiresphoto.HighResolutionPhotoRequester;
+import com.android.dialer.duo.DuoComponent;
+import com.android.dialer.inject.ApplicationContext;
+import com.android.dialer.speeddial.database.SpeedDialEntry;
+import com.android.dialer.speeddial.database.SpeedDialEntry.Channel;
+import com.android.dialer.speeddial.database.SpeedDialEntryDao;
+import com.android.dialer.speeddial.database.SpeedDialEntryDatabaseHelper;
+import com.android.dialer.util.CallUtil;
+import com.google.common.base.Optional;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.ListenableFuture;
+import com.google.common.util.concurrent.ListeningExecutorService;
+import com.google.common.util.concurrent.MoreExecutors;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+/**
+ * Loads a list of {@link SpeedDialUiItem SpeedDialUiItems}.
+ *
+ * @see #loadSpeedDialUiItems()
+ *     <ol>
+ *       <li>Retrieve the list of {@link SpeedDialEntry} from {@link SpeedDialEntryDatabaseHelper}.
+ *       <li>Build a list of {@link SpeedDialUiItem} based on {@link SpeedDialEntry#lookupKey()} in
+ *           {@link Phone#CONTENT_URI}.
+ *       <li>Remove any {@link SpeedDialEntry} that is no longer starred or whose contact was
+ *           deleted.
+ *       <li>Update each {@link SpeedDialEntry} contact id, lookup key and channel.
+ *       <li>Build a list of {@link SpeedDialUiItem} from starred contacts.
+ *       <li>If any contacts in that list aren't in the {@link SpeedDialEntryDatabaseHelper}, insert
+ *           them now.
+ *       <li>Notify the {@link SuccessListener} of the complete list of {@link SpeedDialUiItem
+ *           SpeedDialContacts} composed from {@link SpeedDialEntry SpeedDialEntries} and
+ *           non-starred {@link Contacts#STREQUENT_PHONE_ONLY}.
+ *     </ol>
+ */
+@Singleton
+public final class SpeedDialUiItemMutator {
+
+  private final Context appContext;
+  private final ListeningExecutorService backgroundExecutor;
+  // Used to ensure that only one refresh flow runs at a time.
+  private final DialerFutureSerializer dialerFutureSerializer = new DialerFutureSerializer();
+  private final ContactDisplayPreferences contactDisplayPreferences;
+  private final HighResolutionPhotoRequester highResolutionPhotoRequester;
+
+  @Inject
+  public SpeedDialUiItemMutator(
+      @ApplicationContext Context appContext,
+      @BackgroundExecutor ListeningExecutorService backgroundExecutor,
+      ContactDisplayPreferences contactDisplayPreferences,
+      HighResolutionPhotoRequester highResolutionPhotoRequester) {
+    this.appContext = appContext;
+    this.backgroundExecutor = backgroundExecutor;
+    this.contactDisplayPreferences = contactDisplayPreferences;
+    this.highResolutionPhotoRequester = highResolutionPhotoRequester;
+  }
+
+  /**
+   * Returns a {@link ListenableFuture} for a list of {@link SpeedDialUiItem SpeedDialUiItems}. This
+   * list is composed of starred contacts from {@link SpeedDialEntryDatabaseHelper}.
+   */
+  public ListenableFuture<ImmutableList<SpeedDialUiItem>> loadSpeedDialUiItems() {
+    return dialerFutureSerializer.submit(this::loadSpeedDialUiItemsInternal, backgroundExecutor);
+  }
+
+  /**
+   * Delete the SpeedDialUiItem.
+   *
+   * <p>If the item is starred, it's entry will be removed from the SpeedDialEntry database.
+   * Additionally, if the contact only has one entry in the database, it will be unstarred.
+   *
+   * <p>If the item isn't starred, it's usage data will be deleted.
+   *
+   * @return the updated list of SpeedDialUiItems.
+   */
+  public ListenableFuture<ImmutableList<SpeedDialUiItem>> removeSpeedDialUiItem(
+      SpeedDialUiItem speedDialUiItem) {
+    return dialerFutureSerializer.submit(
+        () -> removeSpeedDialUiItemInternal(speedDialUiItem), backgroundExecutor);
+  }
+
+  @WorkerThread
+  private ImmutableList<SpeedDialUiItem> removeSpeedDialUiItemInternal(
+      SpeedDialUiItem speedDialUiItem) {
+    Assert.isWorkerThread();
+    Assert.checkArgument(speedDialUiItem.isStarred());
+    removeStarredSpeedDialUiItem(speedDialUiItem);
+    return loadSpeedDialUiItemsInternal();
+  }
+
+  /**
+   * Delete the SpeedDialEntry associated with the passed in SpeedDialUiItem. Additionally, if the
+   * entry being deleted is the only entry for that contact, unstar it in the cp2.
+   */
+  @WorkerThread
+  private void removeStarredSpeedDialUiItem(SpeedDialUiItem speedDialUiItem) {
+    Assert.isWorkerThread();
+    Assert.checkArgument(speedDialUiItem.isStarred());
+    SpeedDialEntryDao db = getSpeedDialEntryDao();
+    ImmutableList<SpeedDialEntry> entries = db.getAllEntries();
+
+    SpeedDialEntry entryToDelete = null;
+    int entriesForTheSameContact = 0;
+    for (SpeedDialEntry entry : entries) {
+      if (entry.contactId() == speedDialUiItem.contactId()) {
+        entriesForTheSameContact++;
+      }
+
+      if (Objects.equals(entry.id(), speedDialUiItem.speedDialEntryId())) {
+        Assert.checkArgument(entryToDelete == null);
+        entryToDelete = entry;
+      }
+    }
+    db.delete(ImmutableList.of(entryToDelete.id()));
+    if (entriesForTheSameContact == 1) {
+      unstarContact(speedDialUiItem);
+    }
+  }
+
+  @WorkerThread
+  private void unstarContact(SpeedDialUiItem speedDialUiItem) {
+    Assert.isWorkerThread();
+    ContentValues contentValues = new ContentValues();
+    contentValues.put(Phone.STARRED, 0);
+    appContext
+        .getContentResolver()
+        .update(
+            Contacts.CONTENT_URI,
+            contentValues,
+            Contacts._ID + " = ?",
+            new String[] {Long.toString(speedDialUiItem.contactId())});
+  }
+
+  /**
+   * Takes a contact uri from {@link Phone#CONTENT_URI} and updates {@link Phone#STARRED} to be
+   * true, if it isn't already or Inserts the contact into the {@link SpeedDialEntryDatabaseHelper}
+   */
+  public ListenableFuture<ImmutableList<SpeedDialUiItem>> starContact(Uri contactUri) {
+    return dialerFutureSerializer.submit(
+        () -> insertNewContactEntry(contactUri), backgroundExecutor);
+  }
+
+  @WorkerThread
+  private ImmutableList<SpeedDialUiItem> insertNewContactEntry(Uri contactUri) {
+    Assert.isWorkerThread();
+    try (Cursor cursor =
+        appContext
+            .getContentResolver()
+            .query(
+                contactUri,
+                SpeedDialUiItem.getPhoneProjection(isPrimaryDisplayNameOrder()),
+                null,
+                null,
+                null)) {
+      if (cursor == null) {
+        LogUtil.e("SpeedDialUiItemMutator.insertNewContactEntry", "Cursor was null");
+        return loadSpeedDialUiItemsInternal();
+      }
+      Assert.checkArgument(cursor.moveToFirst(), "Cursor should never be empty");
+      SpeedDialUiItem item =
+          SpeedDialUiItem.fromCursor(
+              appContext.getResources(), cursor, CallUtil.isVideoEnabled(appContext));
+
+      // Star the contact if it isn't starred already, then return.
+      if (!item.isStarred()) {
+        ContentValues values = new ContentValues();
+        values.put(Phone.STARRED, "1");
+        appContext
+            .getContentResolver()
+            .update(
+                Contacts.CONTENT_URI,
+                values,
+                Contacts._ID + " = ?",
+                new String[] {Long.toString(item.contactId())});
+      }
+
+      // Insert a new entry into the SpeedDialEntry database
+      getSpeedDialEntryDao().insert(item.buildSpeedDialEntry());
+    }
+    return loadSpeedDialUiItemsInternal();
+  }
+
+  @WorkerThread
+  private ImmutableList<SpeedDialUiItem> loadSpeedDialUiItemsInternal() {
+    Trace.beginSection("loadSpeedDialUiItemsInternal");
+    Assert.isWorkerThread();
+    Trace.beginSection("getAllEntries");
+    SpeedDialEntryDao db = getSpeedDialEntryDao();
+    Trace.endSection(); // getAllEntries
+
+    // This is the list of contacts that we will display to the user
+    List<SpeedDialUiItem> speedDialUiItems = new ArrayList<>();
+
+    // We'll use these lists to update the SpeedDialEntry database
+    List<SpeedDialEntry> entriesToInsert = new ArrayList<>();
+    List<SpeedDialEntry> entriesToUpdate = new ArrayList<>();
+    List<Long> entriesToDelete = new ArrayList<>();
+
+    // Get all SpeedDialEntries and update their contact ids and lookupkeys.
+    List<SpeedDialEntry> entries = db.getAllEntries();
+    entries = updateContactIdsAndLookupKeys(entries);
+
+    // Build SpeedDialUiItems from our updated entries.
+    Map<SpeedDialEntry, SpeedDialUiItem> entriesToUiItems = getSpeedDialUiItemsFromEntries(entries);
+    Assert.checkArgument(
+        entries.size() == entriesToUiItems.size(),
+        "Updated entries are incomplete: " + entries.size() + " != " + entriesToUiItems.size());
+
+    // Mark the SpeedDialEntries to be updated or deleted
+    Trace.beginSection("updateOrDeleteEntries");
+    for (SpeedDialEntry entry : entries) {
+      SpeedDialUiItem contact = entriesToUiItems.get(entry);
+      // Remove contacts that no longer exist or are no longer starred
+      if (contact == null || !contact.isStarred()) {
+        entriesToDelete.add(entry.id());
+        continue;
+      }
+
+      // Contact exists, so update its entry in SpeedDialEntry Database
+      entriesToUpdate.add(
+          entry
+              .toBuilder()
+              .setLookupKey(contact.lookupKey())
+              .setContactId(contact.contactId())
+              .setDefaultChannel(contact.defaultChannel())
+              .build());
+
+      // These are our existing starred entries
+      speedDialUiItems.add(contact);
+    }
+    Trace.endSection(); // updateOrDeleteEntries
+
+    // Get all starred contacts
+    List<SpeedDialUiItem> starredContacts = getStarredContacts();
+    // If it is starred and not already accounted for above, then insert into the SpeedDialEntry DB.
+    Trace.beginSection("addStarredContact");
+    for (SpeedDialUiItem contact : starredContacts) {
+      if (speedDialUiItems.stream().noneMatch(c -> c.contactId() == contact.contactId())) {
+        entriesToInsert.add(contact.buildSpeedDialEntry());
+
+        // These are our newly starred contacts
+        speedDialUiItems.add(contact);
+      }
+    }
+    Trace.endSection(); // addStarredContact
+
+    Trace.beginSection("insertUpdateAndDelete");
+    requestHighResolutionPhoto(entriesToInsert);
+    ImmutableMap<SpeedDialEntry, Long> insertedEntriesToIdsMap =
+        db.insertUpdateAndDelete(
+            ImmutableList.copyOf(entriesToInsert),
+            ImmutableList.copyOf(entriesToUpdate),
+            ImmutableList.copyOf(entriesToDelete));
+    Trace.endSection(); // insertUpdateAndDelete
+    Trace.endSection(); // loadSpeedDialUiItemsInternal
+    return speedDialUiItemsWithUpdatedIds(speedDialUiItems, insertedEntriesToIdsMap);
+  }
+
+  @WorkerThread
+  private void requestHighResolutionPhoto(List<SpeedDialEntry> newEntries) {
+    ContactsComponent.get(appContext).highResolutionPhotoLoader();
+    for (SpeedDialEntry entry : newEntries) {
+      Uri uri;
+      uri = Contacts.getLookupUri(entry.contactId(), entry.lookupKey());
+
+      Futures.addCallback(
+          highResolutionPhotoRequester.request(uri),
+          new DefaultFutureCallback<>(),
+          MoreExecutors.directExecutor());
+    }
+  }
+
+  /**
+   * Since newly starred contacts sometimes aren't in the SpeedDialEntry database, we couldn't set
+   * their ids when we created our initial list of {@link SpeedDialUiItem speedDialUiItems}. Now
+   * that we've inserted the entries into the database and we have their ids, build a new list of
+   * speedDialUiItems with the now known ids.
+   */
+  private ImmutableList<SpeedDialUiItem> speedDialUiItemsWithUpdatedIds(
+      List<SpeedDialUiItem> speedDialUiItems,
+      ImmutableMap<SpeedDialEntry, Long> insertedEntriesToIdsMap) {
+    if (insertedEntriesToIdsMap.isEmpty()) {
+      // There were no newly inserted entries, so all entries ids are set already.
+      return ImmutableList.copyOf(speedDialUiItems);
+    }
+
+    ImmutableList.Builder<SpeedDialUiItem> updatedItems = ImmutableList.builder();
+    for (SpeedDialUiItem speedDialUiItem : speedDialUiItems) {
+      SpeedDialEntry entry = speedDialUiItem.buildSpeedDialEntry();
+      if (insertedEntriesToIdsMap.containsKey(entry)) {
+        // Get the id for newly inserted entry, update our SpeedDialUiItem and add it to our list
+        Long id = Assert.isNotNull(insertedEntriesToIdsMap.get(entry));
+        updatedItems.add(speedDialUiItem.toBuilder().setSpeedDialEntryId(id).build());
+        continue;
+      }
+
+      // Starred contacts that aren't in the map, should already have speed dial entry ids.
+      // Non-starred contacts aren't in the speed dial entry database, so they
+      // shouldn't have speed dial entry ids.
+      Assert.checkArgument(
+          speedDialUiItem.isStarred() == (speedDialUiItem.speedDialEntryId() != null),
+          "Contact must be starred with a speed dial entry id, or not starred with no id "
+              + "(suggested contacts)");
+      updatedItems.add(speedDialUiItem);
+    }
+    return updatedItems.build();
+  }
+
+  /**
+   * Returns the same list of SpeedDialEntries that are passed in except their contact ids and
+   * lookup keys are updated to current values.
+   *
+   * <p>Unfortunately, we need to look up each contact individually to update the contact id and
+   * lookup key. Luckily though, this query is highly optimized on the framework side and very
+   * quick.
+   */
+  @WorkerThread
+  private List<SpeedDialEntry> updateContactIdsAndLookupKeys(List<SpeedDialEntry> entries) {
+    Assert.isWorkerThread();
+    List<SpeedDialEntry> updatedEntries = new ArrayList<>();
+    for (SpeedDialEntry entry : entries) {
+      try (Cursor cursor =
+          appContext
+              .getContentResolver()
+              .query(
+                  Contacts.getLookupUri(entry.contactId(), entry.lookupKey()),
+                  new String[] {Contacts._ID, Contacts.LOOKUP_KEY},
+                  null,
+                  null,
+                  null)) {
+        if (cursor == null) {
+          LogUtil.e("SpeedDialUiItemMutator.updateContactIdsAndLookupKeys", "null cursor");
+          return new ArrayList<>();
+        }
+        if (cursor.getCount() == 0) {
+          // No need to update this entry, the contact was deleted. We'll clear it up later.
+          updatedEntries.add(entry);
+          continue;
+        }
+        // Since all cursor rows will be have the same contact id and lookup key, just grab the
+        // first one.
+        cursor.moveToFirst();
+        updatedEntries.add(
+            entry
+                .toBuilder()
+                .setContactId(cursor.getLong(0))
+                .setLookupKey(cursor.getString(1))
+                .build());
+      }
+    }
+    return updatedEntries;
+  }
+
+  /**
+   * Returns a map of SpeedDialEntries to their corresponding SpeedDialUiItems. Mappings to null
+   * elements imply that the contact was deleted.
+   */
+  @WorkerThread
+  private Map<SpeedDialEntry, SpeedDialUiItem> getSpeedDialUiItemsFromEntries(
+      List<SpeedDialEntry> entries) {
+    Trace.beginSection("getSpeedDialUiItemsFromEntries");
+    Assert.isWorkerThread();
+    // Fetch the contact ids from the SpeedDialEntries
+    Set<String> contactIds = new ArraySet<>();
+    entries.forEach(entry -> contactIds.add(Long.toString(entry.contactId())));
+    if (contactIds.isEmpty()) {
+      Trace.endSection();
+      return new ArrayMap<>();
+    }
+
+    // Build SpeedDialUiItems from those contact ids and map them to their entries
+    Selection selection =
+        Selection.builder().and(Selection.column(Phone.CONTACT_ID).in(contactIds)).build();
+    try (Cursor cursor =
+        appContext
+            .getContentResolver()
+            .query(
+                Phone.CONTENT_URI,
+                SpeedDialUiItem.getPhoneProjection(isPrimaryDisplayNameOrder()),
+                selection.getSelection(),
+                selection.getSelectionArgs(),
+                null)) {
+      Map<SpeedDialEntry, SpeedDialUiItem> map = new ArrayMap<>();
+      for (cursor.moveToFirst(); !cursor.isAfterLast(); /* Iterate in the loop */ ) {
+        SpeedDialUiItem item =
+            SpeedDialUiItem.fromCursor(
+                appContext.getResources(), cursor, CallUtil.isVideoEnabled(appContext));
+        for (SpeedDialEntry entry : entries) {
+          if (entry.contactId() == item.contactId()) {
+            // Update the id and pinned position to match it's corresponding SpeedDialEntry.
+            SpeedDialUiItem.Builder entrySpeedDialItem =
+                item.toBuilder()
+                    .setSpeedDialEntryId(entry.id())
+                    .setPinnedPosition(entry.pinnedPosition());
+
+            // Preserve the default channel if it didn't change/still exists
+            Channel defaultChannel = entry.defaultChannel();
+            if (defaultChannel != null) {
+              if (item.channels().contains(defaultChannel)
+                  || isValidDuoDefaultChannel(item.channels(), defaultChannel)) {
+                entrySpeedDialItem.setDefaultChannel(defaultChannel);
+              }
+            }
+
+            // It's impossible for two contacts to exist with the same contact id, so if this entry
+            // was previously matched to a SpeedDialUiItem and is being matched again, something
+            // went horribly wrong.
+            Assert.checkArgument(
+                map.put(entry, entrySpeedDialItem.build()) == null,
+                "Each SpeedDialEntry only has one correct SpeedDialUiItem");
+          }
+        }
+      }
+
+      // Contact must have been deleted
+      for (SpeedDialEntry entry : entries) {
+        map.putIfAbsent(entry, null);
+      }
+      Trace.endSection();
+      return map;
+    }
+  }
+
+  /**
+   * Since we can't check duo reachabliity on background threads, we have to assume the contact is
+   * still duo reachable. So we just check it is and return true if the Duo number is still
+   * associated with the contact.
+   */
+  private static boolean isValidDuoDefaultChannel(
+      ImmutableList<Channel> channels, Channel defaultChannel) {
+    if (defaultChannel.technology() != Channel.DUO) {
+      return false;
+    }
+
+    for (Channel channel : channels) {
+      if (channel.number().equals(defaultChannel.number())) {
+        return true;
+      }
+    }
+    return false;
+  }
+
+  @WorkerThread
+  private List<SpeedDialUiItem> getStarredContacts() {
+    Trace.beginSection("getStrequentContacts");
+    Assert.isWorkerThread();
+    Set<String> contactIds = new ArraySet<>();
+
+    // Fetch the contact ids of all starred contacts
+    Uri strequentUri =
+        Contacts.CONTENT_STREQUENT_URI
+            .buildUpon()
+            .appendQueryParameter(ContactsContract.STREQUENT_PHONE_ONLY, "true")
+            .build();
+    Selection selection = Selection.column(Phone.STARRED).is("=", 1);
+    try (Cursor cursor =
+        appContext
+            .getContentResolver()
+            .query(
+                strequentUri,
+                new String[] {Phone.CONTACT_ID},
+                selection.getSelection(),
+                selection.getSelectionArgs(),
+                null)) {
+      if (cursor == null) {
+        LogUtil.e("SpeedDialUiItemMutator.getStarredContacts", "null cursor");
+        Trace.endSection();
+        return new ArrayList<>();
+      }
+      if (cursor.getCount() == 0) {
+        Trace.endSection();
+        return new ArrayList<>();
+      }
+      for (cursor.moveToFirst(); !cursor.isAfterLast(); cursor.moveToNext()) {
+        contactIds.add(Long.toString(cursor.getLong(0)));
+      }
+    }
+
+    // Build SpeedDialUiItems from those contact ids
+    selection = Selection.builder().and(Selection.column(Phone.CONTACT_ID).in(contactIds)).build();
+    try (Cursor cursor =
+        appContext
+            .getContentResolver()
+            .query(
+                Phone.CONTENT_URI,
+                SpeedDialUiItem.getPhoneProjection(isPrimaryDisplayNameOrder()),
+                selection.getSelection(),
+                selection.getSelectionArgs(),
+                null)) {
+      List<SpeedDialUiItem> contacts = new ArrayList<>();
+      if (cursor == null) {
+        LogUtil.e("SpeedDialUiItemMutator.getStrequentContacts", "null cursor");
+        Trace.endSection();
+        return new ArrayList<>();
+      }
+      if (cursor.getCount() == 0) {
+        Trace.endSection();
+        return contacts;
+      }
+      for (cursor.moveToFirst(); !cursor.isAfterLast(); /* Iterate in the loop */ ) {
+        contacts.add(
+            SpeedDialUiItem.fromCursor(
+                appContext.getResources(), cursor, CallUtil.isVideoEnabled(appContext)));
+      }
+      Trace.endSection();
+      return contacts;
+    }
+  }
+
+  /**
+   * Persists the position of the {@link SpeedDialUiItem items} as the pinned position according to
+   * the order they were passed in.
+   */
+  @WorkerThread
+  public void updatePinnedPosition(List<SpeedDialUiItem> speedDialUiItems) {
+    Assert.isWorkerThread();
+    if (speedDialUiItems == null || speedDialUiItems.isEmpty()) {
+      return;
+    }
+
+    // Update the positions in the SpeedDialEntry database
+    ImmutableList.Builder<SpeedDialEntry> entriesToUpdate = ImmutableList.builder();
+    for (int i = 0; i < speedDialUiItems.size(); i++) {
+      SpeedDialUiItem item = speedDialUiItems.get(i);
+      if (item.isStarred()) {
+        entriesToUpdate.add(
+            item.buildSpeedDialEntry().toBuilder().setPinnedPosition(Optional.of(i)).build());
+      }
+    }
+    getSpeedDialEntryDao().update(entriesToUpdate.build());
+
+    // Update the positions in CP2
+    // Build a list of SpeedDialUiItems where each contact is only represented once but the order
+    // is maintained. For example, assume you have a list of contacts with contact ids:
+    //   > { 1, 1, 2, 1, 2, 3 }
+    // This list will be reduced to:
+    //   > { 1, 2, 3 }
+    // and their positions in the resulting list will be written to the CP2 Contacts.PINNED column.
+    List<SpeedDialUiItem> cp2SpeedDialUiItems = new ArrayList<>();
+    Set<Long> contactIds = new ArraySet<>();
+    for (SpeedDialUiItem item : speedDialUiItems) {
+      if (contactIds.add(item.contactId())) {
+        cp2SpeedDialUiItems.add(item);
+      }
+    }
+
+    // Code copied from PhoneFavoritesTileAdapter#handleDrop
+    ArrayList<ContentProviderOperation> operations = new ArrayList<>();
+    for (int i = 0; i < cp2SpeedDialUiItems.size(); i++) {
+      SpeedDialUiItem item = cp2SpeedDialUiItems.get(i);
+      // Pinned positions in the database start from 1 instead of being zero-indexed like
+      // arrays, so offset by 1.
+      int databasePinnedPosition = i + 1;
+      if (item.pinnedPosition().isPresent()
+          && item.pinnedPosition().get() == databasePinnedPosition) {
+        continue;
+      }
+
+      Uri uri = Uri.withAppendedPath(Contacts.CONTENT_URI, String.valueOf(item.contactId()));
+      ContentValues values = new ContentValues();
+      values.put(Contacts.PINNED, databasePinnedPosition);
+      operations.add(ContentProviderOperation.newUpdate(uri).withValues(values).build());
+    }
+    if (operations.isEmpty()) {
+      // Nothing to update
+      return;
+    }
+    try {
+      appContext.getContentResolver().applyBatch(ContactsContract.AUTHORITY, operations);
+      // TODO(calderwoodra): log
+    } catch (RemoteException | OperationApplicationException e) {
+      LogUtil.e(
+          "SpeedDialUiItemMutator.updatePinnedPosition",
+          "Exception thrown when pinning contacts",
+          e);
+    }
+  }
+
+  /**
+   * Returns a new list with duo reachable channels inserted. Duo channels won't replace ViLTE
+   * channels.
+   */
+  @MainThread
+  public ImmutableList<SpeedDialUiItem> insertDuoChannels(
+      Context context, ImmutableList<SpeedDialUiItem> speedDialUiItems) {
+    Assert.isMainThread();
+
+    ImmutableList.Builder<SpeedDialUiItem> newSpeedDialItemList = ImmutableList.builder();
+    // for each existing item
+    for (SpeedDialUiItem item : speedDialUiItems) {
+      if (item.defaultChannel() == null) {
+        // If the contact is starred and doesn't have a default channel, insert duo channels
+        newSpeedDialItemList.add(insertDuoChannelsToStarredContact(context, item));
+      } else {
+        // if starred and has a default channel, leave it as is, the user knows what they want.
+        newSpeedDialItemList.add(item);
+      }
+    }
+    return newSpeedDialItemList.build();
+  }
+
+  @MainThread
+  private SpeedDialUiItem insertDuoChannelsToStarredContact(Context context, SpeedDialUiItem item) {
+    Assert.isMainThread();
+    Assert.checkArgument(item.isStarred());
+
+    // build a new list of channels
+    ImmutableList.Builder<Channel> newChannelsList = ImmutableList.builder();
+    Channel previousChannel = item.channels().get(0);
+    newChannelsList.add(previousChannel);
+
+    for (int i = 1; i < item.channels().size(); i++) {
+      Channel currentChannel = item.channels().get(i);
+      // If the previous and current channel are voice channels, that means the previous number
+      // didn't have a video channel.
+      // If the previous number is duo reachable, insert a duo channel.
+      if (!previousChannel.isVideoTechnology()
+          && !currentChannel.isVideoTechnology()
+          && DuoComponent.get(context).getDuo().isReachable(context, previousChannel.number())) {
+        newChannelsList.add(previousChannel.toBuilder().setTechnology(Channel.DUO).build());
+      }
+      newChannelsList.add(currentChannel);
+      previousChannel = currentChannel;
+    }
+
+    // Check the last channel
+    if (!previousChannel.isVideoTechnology()
+        && DuoComponent.get(context).getDuo().isReachable(context, previousChannel.number())) {
+      newChannelsList.add(previousChannel.toBuilder().setTechnology(Channel.DUO).build());
+    }
+    return item.toBuilder().setChannels(newChannelsList.build()).build();
+  }
+
+  private SpeedDialEntryDao getSpeedDialEntryDao() {
+    return new SpeedDialEntryDatabaseHelper(appContext);
+  }
+
+  private boolean isPrimaryDisplayNameOrder() {
+    return contactDisplayPreferences.getDisplayOrder() == DisplayOrder.PRIMARY;
+  }
+}
diff --git a/java/com/android/dialer/speeddial/loader/UiItemLoaderComponent.java b/java/com/android/dialer/speeddial/loader/UiItemLoaderComponent.java
new file mode 100644
index 0000000..8529084
--- /dev/null
+++ b/java/com/android/dialer/speeddial/loader/UiItemLoaderComponent.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.dialer.speeddial.loader;
+
+import android.content.Context;
+import com.android.dialer.inject.HasRootComponent;
+import dagger.Subcomponent;
+
+/** Dagger component for the speeddial/loader package. */
+@Subcomponent
+public abstract class UiItemLoaderComponent {
+
+  public abstract SpeedDialUiItemMutator speedDialUiItemMutator();
+
+  public static UiItemLoaderComponent get(Context context) {
+    return ((UiItemLoaderComponent.HasComponent)
+            ((HasRootComponent) context.getApplicationContext()).component())
+        .uiItemLoaderComponent();
+  }
+
+  /** Used to refer to the root application component. */
+  public interface HasComponent {
+    UiItemLoaderComponent uiItemLoaderComponent();
+  }
+}
diff --git a/java/com/android/dialer/speeddial/res/drawable/context_menu_contact_icon.xml b/java/com/android/dialer/speeddial/res/drawable/context_menu_contact_icon.xml
new file mode 100644
index 0000000..ee9cde1
--- /dev/null
+++ b/java/com/android/dialer/speeddial/res/drawable/context_menu_contact_icon.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2017 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+  <item>
+    <shape android:shape="oval">
+      <solid android:color="?colorIcon"/>
+      <size android:width="24dp" android:height="24dp"/>
+    </shape>
+  </item>
+  <item
+      android:width="24dp"
+      android:height="24dp"
+      android:gravity="center"
+      android:drawable="@drawable/product_logo_avatar_anonymous_white_color_120"/>
+</layer-list>
\ No newline at end of file
diff --git a/java/com/android/dialer/speeddial/res/drawable/favorite_icon.xml b/java/com/android/dialer/speeddial/res/drawable/favorite_icon.xml
index 81b018f..565877d 100644
--- a/java/com/android/dialer/speeddial/res/drawable/favorite_icon.xml
+++ b/java/com/android/dialer/speeddial/res/drawable/favorite_icon.xml
@@ -18,6 +18,6 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="oval">
 
-  <solid android:color="@color/dialer_theme_color"/>
-  <stroke android:color="@color/background_dialer_light" android:width="3dp"/>
+  <solid android:color="?android:attr/colorPrimary"/>
+  <stroke android:color="?android:attr/colorBackground" android:width="3dp"/>
 </shape>
\ No newline at end of file
diff --git a/java/com/android/dialer/speeddial/res/layout/add_favorite_activity.xml b/java/com/android/dialer/speeddial/res/layout/add_favorite_activity.xml
deleted file mode 100644
index 4df2f29..0000000
--- a/java/com/android/dialer/speeddial/res/layout/add_favorite_activity.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- ~ Copyright (C) 2017 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
- -->
-<FrameLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/add_favorite_container"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"/>
\ No newline at end of file
diff --git a/java/com/android/dialer/speeddial/res/layout/disambig_dialog_divider.xml b/java/com/android/dialer/speeddial/res/layout/disambig_dialog_divider.xml
new file mode 100644
index 0000000..a743ccc
--- /dev/null
+++ b/java/com/android/dialer/speeddial/res/layout/disambig_dialog_divider.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ Copyright (C) 2018 The Android Open Source Project
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~      http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License
+ -->
+<View
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="1dp"
+    android:layout_marginTop="8dp"
+    android:layout_marginBottom="8dp"
+    android:background="#12000000"/>
\ No newline at end of file
diff --git a/java/com/android/dialer/speeddial/res/layout/disambig_dialog_layout.xml b/java/com/android/dialer/speeddial/res/layout/disambig_dialog_layout.xml
index 3562058..0923c52 100644
--- a/java/com/android/dialer/speeddial/res/layout/disambig_dialog_layout.xml
+++ b/java/com/android/dialer/speeddial/res/layout/disambig_dialog_layout.xml
@@ -16,6 +16,7 @@
  -->
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
@@ -25,42 +26,43 @@
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
       android:gravity="center_vertical"
-      android:minHeight="64dp"
+      android:minHeight="56dp"
       android:paddingStart="24dp"
       android:paddingEnd="24dp"
       android:elevation="1dp"
       android:text="@string/speed_dial_disambig_dialog_title"
-      android:textSize="20sp"
-      android:textColor="@color/dialer_primary_text_color"
-      android:fontFamily="sans-serif-medium"
-      android:background="@android:color/white"/>
+      android:background="?android:attr/colorBackgroundFloating"
+      style="@style/Dialer.TextAppearance.Header2"/>
 
-  <ScrollView
+  <com.android.dialer.widget.MaxHeightScrollView
       android:id="@+id/disambig_scrollview"
       android:layout_width="match_parent"
-      android:layout_height="wrap_content">
+      android:layout_height="wrap_content"
+      android:minHeight="168dp"
+      app:maxHeight="256dp">
 
     <LinearLayout
         android:id="@+id/communication_avenue_container"
         android:orientation="vertical"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"/>
-  </ScrollView>
+  </com.android.dialer.widget.MaxHeightScrollView>
 
   <FrameLayout
       android:id="@+id/remember_this_choice_container"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
       android:layout_gravity="bottom"
-      android:minHeight="56dp"
-      android:padding="12dp"
+      android:minHeight="64dp"
       android:elevation="4dp"
-      android:background="@android:color/white">
+      android:background="?android:attr/colorBackgroundFloating">
 
     <CheckBox
         android:id="@+id/remember_this_choice_checkbox"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/speed_dial_remember_this_choice"/>
+        android:layout_height="48dp"
+        android:textSize="14sp"
+        android:text="@string/speed_dial_remember_this_choice"
+        style="@style/DialerCheckboxStyle"/>
   </FrameLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/java/com/android/dialer/speeddial/res/layout/disambig_option_header_layout.xml b/java/com/android/dialer/speeddial/res/layout/disambig_option_header_layout.xml
new file mode 100644
index 0000000..ffda367
--- /dev/null
+++ b/java/com/android/dialer/speeddial/res/layout/disambig_option_header_layout.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ Copyright (C) 2017 The Android Open Source Project
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~      http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License
+ -->
+<TextView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/disambig_header_phone_label"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:gravity="center_vertical"
+    android:minHeight="48dp"
+    android:paddingStart="24dp"
+    android:paddingEnd="24dp"
+    style="@style/Dialer.TextAppearance.Secondary"/>
diff --git a/java/com/android/dialer/speeddial/res/layout/disambig_option_layout.xml b/java/com/android/dialer/speeddial/res/layout/disambig_option_layout.xml
index 097ac40..0388005 100644
--- a/java/com/android/dialer/speeddial/res/layout/disambig_option_layout.xml
+++ b/java/com/android/dialer/speeddial/res/layout/disambig_option_layout.xml
@@ -15,89 +15,27 @@
  ~ limitations under the License
  -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/disambig_option_container"
-    android:orientation="vertical"
+    android:id="@+id/option_container"
+    android:orientation="horizontal"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:paddingStart="24dp"
+    android:paddingEnd="24dp"
     android:minHeight="56dp"
-    android:layout_marginBottom="8dp">
+    android:background="?android:attr/selectableItemBackground">
 
-  <LinearLayout
-      android:orientation="vertical"
-      android:layout_width="match_parent"
+  <ImageView
+      android:id="@+id/disambig_option_image"
+      android:layout_width="24dp"
+      android:layout_height="24dp"
+      android:layout_gravity="center_vertical"
+      android:tint="?colorIcon"/>
+
+  <TextView
+      android:id="@+id/disambig_option_text"
+      android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:minHeight="56dp"
-      android:gravity="center_vertical"
-      android:paddingStart="24dp"
-      android:paddingEnd="24dp">
-
-    <TextView
-        android:id="@+id/phone_type"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        style="@style/PrimaryText"/>
-
-    <TextView
-        android:id="@+id/phone_number"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        style="@style/SecondaryText"/>
-  </LinearLayout>
-
-  <LinearLayout
-      android:id="@+id/video_call_container"
-      android:orientation="horizontal"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:paddingStart="24dp"
-      android:paddingEnd="24dp"
-      android:minHeight="56dp"
-      android:background="?android:attr/selectableItemBackground"
-      android:visibility="gone"
-      android:contentDescription="@string/disambig_option_video_call">
-
-    <ImageView
-        android:layout_width="24dp"
-        android:layout_height="24dp"
-        android:layout_gravity="center_vertical"
-        android:tint="@color/dialer_secondary_text_color"
-        android:src="@drawable/quantum_ic_videocam_vd_theme_24"/>
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="12dp"
-        android:layout_gravity="center_vertical"
-        android:text="@string/disambig_option_video_call"
-        style="@style/PrimaryText"/>
-  </LinearLayout>
-
-  <LinearLayout
-      android:id="@+id/voice_call_container"
-      android:orientation="horizontal"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:paddingStart="24dp"
-      android:paddingEnd="24dp"
-      android:minHeight="56dp"
-      android:background="?android:attr/selectableItemBackground"
-      android:contentDescription="@string/disambig_option_voice_call">
-
-    <ImageView
-        android:id="@+id/disambig_option_icon"
-        android:layout_width="24dp"
-        android:layout_height="24dp"
-        android:layout_gravity="center_vertical"
-        android:tint="@color/dialer_secondary_text_color"
-        android:src="@drawable/quantum_ic_phone_vd_theme_24"/>
-
-    <TextView
-        android:id="@+id/disambig_option_text"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="12dp"
-        android:layout_gravity="center_vertical"
-        android:text="@string/disambig_option_voice_call"
-        style="@style/PrimaryText"/>
-  </LinearLayout>
+      android:layout_marginStart="16dp"
+      android:layout_gravity="center_vertical"
+      style="@style/Dialer.TextAppearance.Primary"/>
 </LinearLayout>
\ No newline at end of file
diff --git a/java/com/android/dialer/speeddial/res/layout/favorite_item_layout.xml b/java/com/android/dialer/speeddial/res/layout/favorite_item_layout.xml
index fb47665..1299f08 100644
--- a/java/com/android/dialer/speeddial/res/layout/favorite_item_layout.xml
+++ b/java/com/android/dialer/speeddial/res/layout/favorite_item_layout.xml
@@ -24,22 +24,25 @@
 
   <FrameLayout
       android:id="@+id/avatar_container"
-      android:layout_width="104dp"
+      android:layout_width="wrap_content"
       android:layout_height="104dp"
       android:layout_gravity="center_horizontal"
-      android:layout_marginBottom="8dp">
+      android:layout_marginBottom="8dp"
+      android:minWidth="128dp">
 
-    <com.android.dialer.speeddial.SquareImageView
+    <QuickContactBadge
         android:id="@+id/avatar"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_width="104dp"
+        android:layout_height="104dp"
+        android:layout_gravity="center_horizontal"
         android:clickable="false"/>
 
     <FrameLayout
         android:id="@+id/video_call_container"
         android:layout_width="36dp"
         android:layout_height="36dp"
-        android:layout_gravity="bottom|end">
+        android:layout_gravity="bottom|end"
+        android:layout_marginEnd="12dp">
 
       <ImageView
           android:layout_width="match_parent"
@@ -50,7 +53,7 @@
           android:layout_width="24dp"
           android:layout_height="24dp"
           android:layout_gravity="center"
-          android:src="@drawable/quantum_ic_videocam_white_24"/>
+          android:src="@drawable/quantum_ic_videocam_vd_white_24"/>
     </FrameLayout>
   </FrameLayout>
 
@@ -59,12 +62,23 @@
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_gravity="center_horizontal"
-      style="@style/PrimaryText"/>
+      android:layout_marginStart="4dp"
+      android:layout_marginEnd="4dp"
+      android:layout_marginTop="8dp"
+      android:layout_marginBottom="1dp"
+      android:fontFamily="sans-serif-medium"
+      android:textSize="14sp"
+      android:gravity="center_horizontal"
+      style="@style/Dialer.TextAppearance.Primary"/>
 
   <TextView
       android:id="@+id/phone_type"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_gravity="center_horizontal"
-      style="@style/SecondaryText"/>
+      android:layout_marginStart="4dp"
+      android:layout_marginEnd="4dp"
+      android:layout_marginBottom="17dp"
+      android:gravity="center_horizontal"
+      style="@style/Dialer.TextAppearance.Secondary"/>
 </LinearLayout>
\ No newline at end of file
diff --git a/java/com/android/dialer/speeddial/res/layout/favorite_remove_view_layout.xml b/java/com/android/dialer/speeddial/res/layout/favorite_remove_view_layout.xml
new file mode 100644
index 0000000..825658c
--- /dev/null
+++ b/java/com/android/dialer/speeddial/res/layout/favorite_remove_view_layout.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ Copyright (C) 2018 The Android Open Source Project
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~      http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License
+ -->
+
+<!-- Sets android:importantForAccessibility="no" to avoid being announced when navigating with
+         talkback enabled. It will still be announced when user drag or drop contact onto it.
+         This is required since drag and drop event is only sent to views are visible when drag
+         starts. -->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/favorite_remove_view"
+    android:layout_width="match_parent"
+    android:layout_height="@dimen/expanded_search_bar_height"
+    android:background="?android:attr/colorPrimary"
+    android:gravity="center"
+    android:orientation="horizontal"
+    android:visibility="invisible"
+    android:contentDescription="@string/speed_dial_remove_favorites"
+    android:importantForAccessibility="no">
+
+  <ImageView
+      android:id="@+id/remove_view_icon"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_marginTop="8dp"
+      android:layout_marginBottom="8dp"
+      android:src="@drawable/quantum_ic_close_vd_theme_24"
+      android:tint="?colorIconOnUnthemedDarkBackground"/>
+
+  <TextView
+      android:id="@+id/remove_view_text"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:text="@string/speed_dial_remove_favorites"
+      android:textColor="?colorTextOnUnthemedDarkBackground"
+      android:textSize="16sp"/>
+</LinearLayout>
\ No newline at end of file
diff --git a/java/com/android/dialer/speeddial/res/layout/fragment_speed_dial.xml b/java/com/android/dialer/speeddial/res/layout/fragment_speed_dial.xml
index 9f2dec9..e79bc6b 100644
--- a/java/com/android/dialer/speeddial/res/layout/fragment_speed_dial.xml
+++ b/java/com/android/dialer/speeddial/res/layout/fragment_speed_dial.xml
@@ -14,13 +14,25 @@
  ~ See the License for the specific language governing permissions and
  ~ limitations under the License
  -->
-<android.support.v7.widget.RecyclerView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/speed_dial_recycler_view"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/speed_dial_root"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:paddingStart="16dp"
-    android:paddingEnd="16dp"
-    android:clipToPadding="false"
-    android:background="@color/background_dialer_light"
-    android:paddingBottom="@dimen/floating_action_button_list_bottom_padding"/>
+    android:layout_height="match_parent">
+
+  <android.support.v7.widget.RecyclerView
+      android:id="@+id/speed_dial_recycler_view"
+      android:layout_width="match_parent"
+      android:layout_height="match_parent"
+      android:layout_marginTop="@dimen/expanded_search_bar_height_minus"
+      android:clipToPadding="false"
+      android:background="@android:color/transparent"
+      android:paddingBottom="@dimen/floating_action_button_list_bottom_padding"/>
+
+  <com.android.dialer.widget.EmptyContentView
+      android:id="@+id/speed_dial_empty_content_view"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:layout_gravity="center"
+      android:visibility="gone"/>
+</FrameLayout>
+
diff --git a/java/com/android/dialer/speeddial/res/layout/speed_dial_header_layout.xml b/java/com/android/dialer/speeddial/res/layout/speed_dial_header_layout.xml
index 0a84b41..1a9d092 100644
--- a/java/com/android/dialer/speeddial/res/layout/speed_dial_header_layout.xml
+++ b/java/com/android/dialer/speeddial/res/layout/speed_dial_header_layout.xml
@@ -17,7 +17,9 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:minHeight="@dimen/dialer_list_item_min_height">
+    android:layout_marginStart="16dp"
+    android:layout_marginEnd="16dp"
+    android:minHeight="48dp">
 
   <TextView
       android:id="@+id/speed_dial_header_text"
@@ -25,7 +27,7 @@
       android:layout_height="wrap_content"
       android:layout_centerVertical="true"
       android:textSize="16sp"
-      style="@style/SecondaryText"/>
+      style="@style/Dialer.TextAppearance.Secondary"/>
 
   <Button
       android:id="@+id/speed_dial_add_button"
@@ -34,8 +36,10 @@
       android:layout_alignParentEnd="true"
       android:layout_centerVertical="true"
       android:minHeight="@dimen/dialer_touch_target_min_size"
-      android:minWidth="@dimen/dialer_button_min_width"
+      android:minWidth="48dp"
+      android:paddingStart="8dp"
+      android:paddingEnd="8dp"
       android:text="@string/speed_dial_add_button_text"
-      android:textColor="@color/dialer_theme_color"
+      android:textColor="?android:attr/colorPrimary"
       style="@style/Widget.AppCompat.Button.Borderless"/>
 </RelativeLayout>
\ No newline at end of file
diff --git a/java/com/android/dialer/speeddial/res/layout/suggestion_row_layout.xml b/java/com/android/dialer/speeddial/res/layout/suggestion_row_layout.xml
index 4281700..4e010c2 100644
--- a/java/com/android/dialer/speeddial/res/layout/suggestion_row_layout.xml
+++ b/java/com/android/dialer/speeddial/res/layout/suggestion_row_layout.xml
@@ -18,34 +18,36 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:minHeight="72dp">
+    android:minHeight="72dp"
+    android:background="?android:attr/selectableItemBackground">
 
-  <QuickContactBadge
+  <com.android.dialer.widget.ContactPhotoView
       android:id="@+id/avatar"
-      android:layout_width="48dp"
-      android:layout_height="48dp"
-      android:layout_centerVertical="true"/>
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_centerVertical="true"
+      android:layout_marginStart="12dp"/>
 
   <LinearLayout
       android:orientation="vertical"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
-      android:layout_marginStart="56dp"
       android:layout_centerVertical="true"
-      android:layout_alignParentStart="true"
-      android:layout_toStartOf="@+id/overflow">
+      android:layout_toEndOf="@+id/avatar"
+      android:layout_toStartOf="@+id/overflow"
+      android:layout_marginStart="4dp">
 
     <TextView
         android:id="@+id/name"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        style="@style/PrimaryText"/>
+        style="@style/Dialer.TextAppearance.Primary"/>
 
     <TextView
         android:id="@+id/number"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        style="@style/SecondaryText"/>
+        style="@style/Dialer.TextAppearance.Secondary"/>
   </LinearLayout>
 
   <ImageView
@@ -55,7 +57,8 @@
       android:layout_centerVertical="true"
       android:layout_alignParentEnd="true"
       android:scaleType="center"
-      android:tint="@color/secondary_text_color"
+      android:tint="?colorIcon"
       android:src="@drawable/quantum_ic_more_vert_white_24"
-      android:background="?android:selectableItemBackgroundBorderless"/>
+      android:background="?android:attr/selectableItemBackgroundBorderless"
+      android:contentDescription="@string/content_description_overflow"/>
 </RelativeLayout>
\ No newline at end of file
diff --git a/java/com/android/dialer/speeddial/res/menu/add_favorite_menu.xml b/java/com/android/dialer/speeddial/res/menu/add_favorite_menu.xml
deleted file mode 100644
index b11c7f5..0000000
--- a/java/com/android/dialer/speeddial/res/menu/add_favorite_menu.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- ~ Copyright (C) 2017 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
- -->
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-  <item
-      android:id="@+id/action_search"
-      android:title="@android:string/search_go"
-      app:showAsAction="always"
-      app:actionViewClass="android.support.v7.widget.SearchView"/>
-</menu>
\ No newline at end of file
diff --git a/java/com/android/dialer/speeddial/res/menu/starred_contact_context_menu.xml b/java/com/android/dialer/speeddial/res/menu/starred_contact_context_menu.xml
new file mode 100644
index 0000000..2ff2524
--- /dev/null
+++ b/java/com/android/dialer/speeddial/res/menu/starred_contact_context_menu.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ Copyright (C) 2018 The Android Open Source Project
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~      http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License
+ -->
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+  <item
+      android:id="@+id/starred_contact_context_menu_title"
+      android:enabled="false"
+      android:title=""/>
+
+  <item
+      android:id="@+id/voice_call_container"
+      android:title="@string/contact_menu_voice_call"
+      android:icon="@drawable/quantum_ic_phone_vd_theme_24"
+      android:iconTint="?colorIcon"/>
+
+  <item
+      android:id="@+id/video_call_container"
+      android:title="@string/contact_menu_video_call"
+      android:icon="@drawable/quantum_ic_videocam_vd_theme_24"
+      android:iconTint="?colorIcon"/>
+
+  <item
+      android:id="@+id/send_message_container"
+      android:title="@string/contact_menu_message"
+      android:icon="@drawable/quantum_ic_message_vd_theme_24"
+      android:iconTint="?colorIcon"/>
+
+  <item
+      android:id="@+id/remove_container"
+      android:title="@string/contact_menu_remove"
+      android:icon="@drawable/quantum_ic_close_vd_theme_24"
+      android:iconTint="?colorIcon"/>
+
+  <item
+      android:id="@+id/contact_info_container"
+      android:title="@string/contact_menu_contact_info"
+      android:icon="@drawable/context_menu_contact_icon"
+      android:iconTint="#FFFFFF"/>
+</menu>
\ No newline at end of file
diff --git a/java/com/android/dialer/speeddial/res/values-af/strings.xml b/java/com/android/dialer/speeddial/res/values-af/strings.xml
index b0c27bc..a8ee6b3 100644
--- a/java/com/android/dialer/speeddial/res/values-af/strings.xml
+++ b/java/com/android/dialer/speeddial/res/values-af/strings.xml
@@ -1,20 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="favorites_header">Gunstelinge</string>
+  <string name="suggestions_header">Gereeldes</string>
+  <string name="speed_dial_add_button_text">Voeg by</string>
+  <string name="speed_dial_remember_this_choice">Onthou hierdie keuse</string>
+  <string name="speed_dial_disambig_dialog_title">Kies oproeptipe</string>
+  <string name="disambig_option_video_call">Video-oproep</string>
+  <string name="disambig_option_voice_call">Bel</string>
+  <string name="add_favorite_activity_title">Voeg gunsteling by</string>
+  <string name="contact_menu_voice_call">Stemoproep</string>
+  <string name="contact_menu_video_call">Video-oproep</string>
+  <string name="contact_menu_message">SMS</string>
+  <string name="contact_menu_remove">Verwyder</string>
+  <string name="contact_menu_contact_info">Kontakinligting</string>
+  <string name="suggested_contact_bottom_sheet_add_favorite_option">Voeg gunsteling by</string>
+  <string name="speed_dial_contacts_permission_description">Skakel die kontaktetoestemming aan om spoedbel te aktiveer.</string>
+  <string name="speed_dial_turn_on_contacts_permission">Skakel aan</string>
+  <string name="speed_dial_no_contacts_description">Jy het nog nie enige gunstelinge bygevoeg nie.</string>
+  <string name="speed_dial_no_contacts_action_text">Voeg gunsteling by</string>
+  <string name="speed_dial_remove_favorites">Verwyder uit gunstelinge</string>
 </resources>
diff --git a/java/com/android/dialer/speeddial/res/values-am/strings.xml b/java/com/android/dialer/speeddial/res/values-am/strings.xml
index b0c27bc..fc6443c 100644
--- a/java/com/android/dialer/speeddial/res/values-am/strings.xml
+++ b/java/com/android/dialer/speeddial/res/values-am/strings.xml
@@ -1,20 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="favorites_header">ተወዳጆች</string>
+  <string name="suggestions_header">ተደጋጋሚዎች</string>
+  <string name="speed_dial_add_button_text">አክል</string>
+  <string name="speed_dial_remember_this_choice">ይህን ምርጫ አስታውስ</string>
+  <string name="speed_dial_disambig_dialog_title">የጥሪ አይነት ይምረጡ</string>
+  <string name="disambig_option_video_call">የቪዲዮ ጥሪ</string>
+  <string name="disambig_option_voice_call">ጥሪ</string>
+  <string name="add_favorite_activity_title">ተወዳጅ ያክሉ</string>
+  <string name="contact_menu_voice_call">የድምጽ ጥሪ</string>
+  <string name="contact_menu_video_call">የቪዲዮ ጥሪ</string>
+  <string name="contact_menu_message">መልዕክት</string>
+  <string name="contact_menu_remove">አስወግድ</string>
+  <string name="contact_menu_contact_info">የዕውቂያ መረጃ</string>
+  <string name="suggested_contact_bottom_sheet_add_favorite_option">ተወዳጅ አክል</string>
+  <string name="speed_dial_contacts_permission_description">ፈጥኖ መደወያን ለማንቃት የእውቂያዎች ፍቃዱን ያብሩ።</string>
+  <string name="speed_dial_turn_on_contacts_permission">አብራ</string>
+  <string name="speed_dial_no_contacts_description">ገና ምንም ተወዳጆችን አላከሉም</string>
+  <string name="speed_dial_no_contacts_action_text">ተወዳጅ አክል</string>
+  <string name="speed_dial_remove_favorites">ከተወዳጆች አስወግድ</string>
 </resources>
diff --git a/java/com/android/dialer/speeddial/res/values-ar/strings.xml b/java/com/android/dialer/speeddial/res/values-ar/strings.xml
index b0c27bc..a0c9d85 100644
--- a/java/com/android/dialer/speeddial/res/values-ar/strings.xml
+++ b/java/com/android/dialer/speeddial/res/values-ar/strings.xml
@@ -1,20 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="favorites_header">المفضّلة</string>
+  <string name="suggestions_header">من يتم الاتصال بهم بشكل متكرر</string>
+  <string name="speed_dial_add_button_text">إضافة</string>
+  <string name="speed_dial_remember_this_choice">تذكر هذا الاختيار</string>
+  <string name="speed_dial_disambig_dialog_title">اختيار نوع المكالمة</string>
+  <string name="disambig_option_video_call">فيديو</string>
+  <string name="disambig_option_voice_call">اتصال</string>
+  <string name="add_favorite_activity_title">إضافة إلى المُفضلة</string>
+  <string name="contact_menu_voice_call">مكالمة صوتية</string>
+  <string name="contact_menu_video_call">مكالمة فيديو</string>
+  <string name="contact_menu_message">رسالة</string>
+  <string name="contact_menu_remove">إزالة</string>
+  <string name="contact_menu_contact_info">معلومات الاتصال</string>
+  <string name="suggested_contact_bottom_sheet_add_favorite_option">إضافة إلى المُفضلة</string>
+  <string name="speed_dial_contacts_permission_description">لتمكين الاتصال السريع، شغِّل إذن جهات الاتصال.</string>
+  <string name="speed_dial_turn_on_contacts_permission">تفعيل</string>
+  <string name="speed_dial_no_contacts_description">لم تضف أي عناصر إلى المفضّلة حتى الآن</string>
+  <string name="speed_dial_no_contacts_action_text">إضافة إلى المُفضلة</string>
+  <string name="speed_dial_remove_favorites">الإزالة من العناصر المفضّلة</string>
 </resources>
diff --git a/java/com/android/dialer/speeddial/res/values-az/strings.xml b/java/com/android/dialer/speeddial/res/values-az/strings.xml
index b0c27bc..afd3abf 100644
--- a/java/com/android/dialer/speeddial/res/values-az/strings.xml
+++ b/java/com/android/dialer/speeddial/res/values-az/strings.xml
@@ -1,20 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="favorites_header">Sevimlilər</string>
+  <string name="suggestions_header">Daimi kontaktlar</string>
+  <string name="speed_dial_add_button_text">Əlavə edin</string>
+  <string name="speed_dial_remember_this_choice">Bu seçimi yadda saxlayın</string>
+  <string name="speed_dial_disambig_dialog_title">Zəng növü seçin</string>
+  <string name="disambig_option_video_call">Video zəng</string>
+  <string name="disambig_option_voice_call">Zəng</string>
+  <string name="add_favorite_activity_title">Sevimlilərə əlavə edin</string>
+  <string name="contact_menu_voice_call">Səsli Zəng</string>
+  <string name="contact_menu_video_call">Video Zəng</string>
+  <string name="contact_menu_message">Mesaj</string>
+  <string name="contact_menu_remove">Silin</string>
+  <string name="contact_menu_contact_info">Kontakt məlumatı</string>
+  <string name="suggested_contact_bottom_sheet_add_favorite_option">Sevimlilərə əlavə edin</string>
+  <string name="speed_dial_contacts_permission_description">Sürətli yığımı aktivləşdirmək üçün, Kontakt icazələrini aktivləşdirin.</string>
+  <string name="speed_dial_turn_on_contacts_permission">Aktiv edin</string>
+  <string name="speed_dial_no_contacts_description">Hələ heç bir sevimli element əlavə etməmisiniz</string>
+  <string name="speed_dial_no_contacts_action_text">Sevimlilərə əlavə edin</string>
+  <string name="speed_dial_remove_favorites">Favoritlərdən silin</string>
 </resources>
diff --git a/java/com/android/dialer/speeddial/res/values-b+sr+Latn/strings.xml b/java/com/android/dialer/speeddial/res/values-b+sr+Latn/strings.xml
index b0c27bc..aae11ca 100644
--- a/java/com/android/dialer/speeddial/res/values-b+sr+Latn/strings.xml
+++ b/java/com/android/dialer/speeddial/res/values-b+sr+Latn/strings.xml
@@ -1,20 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="favorites_header">Omiljeni</string>
+  <string name="suggestions_header">Često kontaktirani</string>
+  <string name="speed_dial_add_button_text">Dodaj</string>
+  <string name="speed_dial_remember_this_choice">Zapamti ovaj izbor</string>
+  <string name="speed_dial_disambig_dialog_title">Izaberite tip poziva</string>
+  <string name="disambig_option_video_call">Video poziv</string>
+  <string name="disambig_option_voice_call">Pozovi</string>
+  <string name="add_favorite_activity_title">Dodajte omiljeni kontakt</string>
+  <string name="contact_menu_voice_call">Audio poziv</string>
+  <string name="contact_menu_video_call">Video poziv</string>
+  <string name="contact_menu_message">Pošalji SMS</string>
+  <string name="contact_menu_remove">Ukloni</string>
+  <string name="contact_menu_contact_info">Kontakt podaci</string>
+  <string name="suggested_contact_bottom_sheet_add_favorite_option">Dodaj omiljeni</string>
+  <string name="speed_dial_contacts_permission_description">Da biste omogućili brzo biranje, uključite dozvolu za Kontakte.</string>
+  <string name="speed_dial_turn_on_contacts_permission">Uključi</string>
+  <string name="speed_dial_no_contacts_description">Još uvek niste dodali omiljene kontakte</string>
+  <string name="speed_dial_no_contacts_action_text">Dodaj omiljeni kontakt</string>
+  <string name="speed_dial_remove_favorites">Uklonite iz omiljenih kontakata</string>
 </resources>
diff --git a/java/com/android/dialer/speeddial/res/values-be/strings.xml b/java/com/android/dialer/speeddial/res/values-be/strings.xml
index b0c27bc..74b0eba 100644
--- a/java/com/android/dialer/speeddial/res/values-be/strings.xml
+++ b/java/com/android/dialer/speeddial/res/values-be/strings.xml
@@ -1,20 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="favorites_header">Абранае</string>
+  <string name="suggestions_header">Частыя кантакты</string>
+  <string name="speed_dial_add_button_text">Дадаць</string>
+  <string name="speed_dial_remember_this_choice">Запомніць гэты выбар</string>
+  <string name="speed_dial_disambig_dialog_title">Выбар тыпу выкліку</string>
+  <string name="disambig_option_video_call">Відэавыклік</string>
+  <string name="disambig_option_voice_call">Выклік</string>
+  <string name="add_favorite_activity_title">Дадаць у Абранае</string>
+  <string name="contact_menu_voice_call">Галасавы выклік</string>
+  <string name="contact_menu_video_call">Відэавыклік</string>
+  <string name="contact_menu_message">Напісаць</string>
+  <string name="contact_menu_remove">Выдаліць</string>
+  <string name="contact_menu_contact_info">Кантактная інфармацыя</string>
+  <string name="suggested_contact_bottom_sheet_add_favorite_option">Дадаць у абраныя</string>
+  <string name="speed_dial_contacts_permission_description">Каб уключыць хуткі набор, уключыце дазвол для Кантактаў.</string>
+  <string name="speed_dial_turn_on_contacts_permission">Уключыць</string>
+  <string name="speed_dial_no_contacts_description">Вы яшчэ нічога не дадалі ў абраныя</string>
+  <string name="speed_dial_no_contacts_action_text">Дадаць у абраныя</string>
+  <string name="speed_dial_remove_favorites">Выдаліць з абраных</string>
 </resources>
diff --git a/java/com/android/dialer/speeddial/res/values-bg/strings.xml b/java/com/android/dialer/speeddial/res/values-bg/strings.xml
index b0c27bc..58d14d3 100644
--- a/java/com/android/dialer/speeddial/res/values-bg/strings.xml
+++ b/java/com/android/dialer/speeddial/res/values-bg/strings.xml
@@ -1,20 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="favorites_header">Любими</string>
+  <string name="suggestions_header">Често търсени</string>
+  <string name="speed_dial_add_button_text">Добавяне</string>
+  <string name="speed_dial_remember_this_choice">Запомняне на този избор</string>
+  <string name="speed_dial_disambig_dialog_title">Избор на типа на обаждането</string>
+  <string name="disambig_option_video_call">Видеообаждане</string>
+  <string name="disambig_option_voice_call">Обаждане</string>
+  <string name="add_favorite_activity_title">Добавяне на любимо</string>
+  <string name="contact_menu_voice_call">Глас. обаждане</string>
+  <string name="contact_menu_video_call">Видеообаждане</string>
+  <string name="contact_menu_message">Съобщение</string>
+  <string name="contact_menu_remove">Премахване</string>
+  <string name="contact_menu_contact_info">Инф. за връзка</string>
+  <string name="suggested_contact_bottom_sheet_add_favorite_option">Добавяне като любим</string>
+  <string name="speed_dial_contacts_permission_description">За да активирате бързото набиране, включете разрешението за Контакти.</string>
+  <string name="speed_dial_turn_on_contacts_permission">Включване</string>
+  <string name="speed_dial_no_contacts_description">Още не сте добавили любими</string>
+  <string name="speed_dial_no_contacts_action_text">Добавяне като любим</string>
+  <string name="speed_dial_remove_favorites">Премахване от любимите</string>
 </resources>
diff --git a/java/com/android/dialer/speeddial/res/values-bn/strings.xml b/java/com/android/dialer/speeddial/res/values-bn/strings.xml
index b0c27bc..c09042a 100644
--- a/java/com/android/dialer/speeddial/res/values-bn/strings.xml
+++ b/java/com/android/dialer/speeddial/res/values-bn/strings.xml
@@ -1,20 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="favorites_header">পছন্দসই</string>
+  <string name="suggestions_header">প্রায়শই ব্যবহৃত</string>
+  <string name="speed_dial_add_button_text">যোগ করুন</string>
+  <string name="speed_dial_remember_this_choice">এই পছন্দটি মনে রাখব</string>
+  <string name="speed_dial_disambig_dialog_title">কলের মোড বেছে নিন</string>
+  <string name="disambig_option_video_call">ভিডিও কল করুন</string>
+  <string name="disambig_option_voice_call">কল করুন</string>
+  <string name="add_favorite_activity_title">পছন্দগুলি যোগ করুন</string>
+  <string name="contact_menu_voice_call">ভয়েস কল করুন</string>
+  <string name="contact_menu_video_call">ভিডিও কল করুন</string>
+  <string name="contact_menu_message">মেসেজ পাঠান</string>
+  <string name="contact_menu_remove">সরিয়ে দিন</string>
+  <string name="contact_menu_contact_info">পরিচিতির তথ্য</string>
+  <string name="suggested_contact_bottom_sheet_add_favorite_option">পছন্দসই হিসেবে চিহ্নিত করুন</string>
+  <string name="speed_dial_contacts_permission_description">স্পিড ডায়াল চালু করতে পরিচিতির অনুমতি দিন।</string>
+  <string name="speed_dial_turn_on_contacts_permission">চালু করুন</string>
+  <string name="speed_dial_no_contacts_description">আপনি এখনও পর্যন্ত কাউকে পছন্দসই হিসেবে চিহ্নিত করেননি</string>
+  <string name="speed_dial_no_contacts_action_text">পছন্দসই হিসেবে চিহ্নিত করুন</string>
+  <string name="speed_dial_remove_favorites">পছন্দসই থেকে সরান</string>
 </resources>
diff --git a/java/com/android/dialer/speeddial/res/values-bs/strings.xml b/java/com/android/dialer/speeddial/res/values-bs/strings.xml
index b0c27bc..84662e6 100644
--- a/java/com/android/dialer/speeddial/res/values-bs/strings.xml
+++ b/java/com/android/dialer/speeddial/res/values-bs/strings.xml
@@ -1,20 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="favorites_header">Omiljeni</string>
+  <string name="suggestions_header">Česti kontakti</string>
+  <string name="speed_dial_add_button_text">Dodaj</string>
+  <string name="speed_dial_remember_this_choice">Zapamti ovaj odabir</string>
+  <string name="speed_dial_disambig_dialog_title">Odaberite vrstu poziva</string>
+  <string name="disambig_option_video_call">Video poziv</string>
+  <string name="disambig_option_voice_call">Poziv</string>
+  <string name="add_favorite_activity_title">Dodavanje u omiljene</string>
+  <string name="contact_menu_voice_call">Glasovni poziv</string>
+  <string name="contact_menu_video_call">Video poziv</string>
+  <string name="contact_menu_message">Poruka</string>
+  <string name="contact_menu_remove">Ukloni</string>
+  <string name="contact_menu_contact_info">Podaci za kontakt</string>
+  <string name="suggested_contact_bottom_sheet_add_favorite_option">Dodaj omiljene</string>
+  <string name="speed_dial_contacts_permission_description">Da omogućite brzo biranje, uključite odobrenje za Kontakte.</string>
+  <string name="speed_dial_turn_on_contacts_permission">Uključi</string>
+  <string name="speed_dial_no_contacts_description">Još uvijek niste dodali omiljene kontakte</string>
+  <string name="speed_dial_no_contacts_action_text">Dodaj omiljeni</string>
+  <string name="speed_dial_remove_favorites">Ukloni iz omiljenih</string>
 </resources>
diff --git a/java/com/android/dialer/speeddial/res/values-ca/strings.xml b/java/com/android/dialer/speeddial/res/values-ca/strings.xml
index b0c27bc..5969d51 100644
--- a/java/com/android/dialer/speeddial/res/values-ca/strings.xml
+++ b/java/com/android/dialer/speeddial/res/values-ca/strings.xml
@@ -1,20 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="favorites_header">Preferits</string>
+  <string name="suggestions_header">Freqüents</string>
+  <string name="speed_dial_add_button_text">Afegeix</string>
+  <string name="speed_dial_remember_this_choice">Recorda aquesta selecció</string>
+  <string name="speed_dial_disambig_dialog_title">Tria el tipus de trucada</string>
+  <string name="disambig_option_video_call">Videotrucada</string>
+  <string name="disambig_option_voice_call">Trucada</string>
+  <string name="add_favorite_activity_title">Afegeix als preferits</string>
+  <string name="contact_menu_voice_call">Trucada de veu</string>
+  <string name="contact_menu_video_call">Videotrucada</string>
+  <string name="contact_menu_message">Missatge</string>
+  <string name="contact_menu_remove">Suprimeix</string>
+  <string name="contact_menu_contact_info">Dades de contacte</string>
+  <string name="suggested_contact_bottom_sheet_add_favorite_option">Afegeix als preferits</string>
+  <string name="speed_dial_contacts_permission_description">Activa el permís Contactes per activar el marcatge ràpid.</string>
+  <string name="speed_dial_turn_on_contacts_permission">Activa</string>
+  <string name="speed_dial_no_contacts_description">Encara no has afegit cap preferit</string>
+  <string name="speed_dial_no_contacts_action_text">Afegeix als preferits</string>
+  <string name="speed_dial_remove_favorites">Suprimeix dels preferits</string>
 </resources>
diff --git a/java/com/android/dialer/speeddial/res/values-cs/strings.xml b/java/com/android/dialer/speeddial/res/values-cs/strings.xml
index b0c27bc..643da4a 100644
--- a/java/com/android/dialer/speeddial/res/values-cs/strings.xml
+++ b/java/com/android/dialer/speeddial/res/values-cs/strings.xml
@@ -1,20 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="favorites_header">Oblíbené</string>
+  <string name="suggestions_header">Časté kontakty</string>
+  <string name="speed_dial_add_button_text">Přidat</string>
+  <string name="speed_dial_remember_this_choice">Zapamatovat tuto volbu</string>
+  <string name="speed_dial_disambig_dialog_title">Vyberte typ hovoru</string>
+  <string name="disambig_option_video_call">Videohovor</string>
+  <string name="disambig_option_voice_call">Volat</string>
+  <string name="add_favorite_activity_title">Přidejte oblíbené</string>
+  <string name="contact_menu_voice_call">Hlasový hovor</string>
+  <string name="contact_menu_video_call">Videohovor</string>
+  <string name="contact_menu_message">Zpráva</string>
+  <string name="contact_menu_remove">Odebrat</string>
+  <string name="contact_menu_contact_info">Kontaktní údaje</string>
+  <string name="suggested_contact_bottom_sheet_add_favorite_option">Přidat mezi oblíbené</string>
+  <string name="speed_dial_contacts_permission_description">Pokud chcete povolit rychlou volbu, zapněte oprávnění Kontakty.</string>
+  <string name="speed_dial_turn_on_contacts_permission">Zapnout</string>
+  <string name="speed_dial_no_contacts_description">Zatím jste nepřidali žádné oblíbené kontakty</string>
+  <string name="speed_dial_no_contacts_action_text">Přidat oblíbené</string>
+  <string name="speed_dial_remove_favorites">Odebrat z oblíbených</string>
 </resources>
diff --git a/java/com/android/dialer/speeddial/res/values-da/strings.xml b/java/com/android/dialer/speeddial/res/values-da/strings.xml
index b0c27bc..763d7bb 100644
--- a/java/com/android/dialer/speeddial/res/values-da/strings.xml
+++ b/java/com/android/dialer/speeddial/res/values-da/strings.xml
@@ -1,20 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="favorites_header">Foretrukne</string>
+  <string name="suggestions_header">Mest brugte</string>
+  <string name="speed_dial_add_button_text">Tilføj</string>
+  <string name="speed_dial_remember_this_choice">Husk dette valg</string>
+  <string name="speed_dial_disambig_dialog_title">Vælg opkaldstype</string>
+  <string name="disambig_option_video_call">Lav videoopkald</string>
+  <string name="disambig_option_voice_call">Ring</string>
+  <string name="add_favorite_activity_title">Tilføj som foretrukken</string>
+  <string name="contact_menu_voice_call">Taleopkald</string>
+  <string name="contact_menu_video_call">Videoopkald</string>
+  <string name="contact_menu_message">Besked</string>
+  <string name="contact_menu_remove">Fjern</string>
+  <string name="contact_menu_contact_info">Kontaktinfo</string>
+  <string name="suggested_contact_bottom_sheet_add_favorite_option">Tilføj som foretrukken</string>
+  <string name="speed_dial_contacts_permission_description">Slå tilladelsen Kontaktpersoner til for at aktivere hurtigopkald.</string>
+  <string name="speed_dial_turn_on_contacts_permission">Slå til</string>
+  <string name="speed_dial_no_contacts_description">Du har endnu ikke tilføjet nogen foretrukne</string>
+  <string name="speed_dial_no_contacts_action_text">Tilføj som foretrukken</string>
+  <string name="speed_dial_remove_favorites">Fjern fra foretrukne</string>
 </resources>
diff --git a/java/com/android/dialer/speeddial/res/values-de/strings.xml b/java/com/android/dialer/speeddial/res/values-de/strings.xml
index b0c27bc..fe1c48c 100644
--- a/java/com/android/dialer/speeddial/res/values-de/strings.xml
+++ b/java/com/android/dialer/speeddial/res/values-de/strings.xml
@@ -1,20 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="favorites_header">Favoriten</string>
+  <string name="suggestions_header">Häufig genutzte Kontakte</string>
+  <string name="speed_dial_add_button_text">Hinzufügen</string>
+  <string name="speed_dial_remember_this_choice">Auswahl speichern</string>
+  <string name="speed_dial_disambig_dialog_title">Anruftyp auswählen</string>
+  <string name="disambig_option_video_call">Videoanruf</string>
+  <string name="disambig_option_voice_call">Anrufen</string>
+  <string name="add_favorite_activity_title">Favorit hinzufügen</string>
+  <string name="contact_menu_voice_call">Sprachanruf</string>
+  <string name="contact_menu_video_call">Videoanruf</string>
+  <string name="contact_menu_message">Nachricht</string>
+  <string name="contact_menu_remove">Entfernen</string>
+  <string name="contact_menu_contact_info">Kontaktdaten</string>
+  <string name="suggested_contact_bottom_sheet_add_favorite_option">Favorit hinzufügen</string>
+  <string name="speed_dial_contacts_permission_description">Aktiviere die Berechtigung \"Kontakte\", um die Kurzwahlfunktion zu verwenden.</string>
+  <string name="speed_dial_turn_on_contacts_permission">Aktivieren</string>
+  <string name="speed_dial_no_contacts_description">Du hast noch keine Favoriten hinzugefügt</string>
+  <string name="speed_dial_no_contacts_action_text">Favorit hinzufügen</string>
+  <string name="speed_dial_remove_favorites">Aus Favoriten entfernen</string>
 </resources>
diff --git a/java/com/android/dialer/speeddial/res/values-el/strings.xml b/java/com/android/dialer/speeddial/res/values-el/strings.xml
index b0c27bc..9dbc648 100644
--- a/java/com/android/dialer/speeddial/res/values-el/strings.xml
+++ b/java/com/android/dialer/speeddial/res/values-el/strings.xml
@@ -1,20 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="favorites_header">Αγαπημένα</string>
+  <string name="suggestions_header">Συχνή επικοινωνία</string>
+  <string name="speed_dial_add_button_text">Προσθήκη</string>
+  <string name="speed_dial_remember_this_choice">Διατήρηση αυτής της ρύθμισης</string>
+  <string name="speed_dial_disambig_dialog_title">Επιλέξτε τύπο κλήσης</string>
+  <string name="disambig_option_video_call">Βιντεοκλήση</string>
+  <string name="disambig_option_voice_call">Κλήση</string>
+  <string name="add_favorite_activity_title">Προσθήκη Αγαπημένου</string>
+  <string name="contact_menu_voice_call">Φωνητική κλήση</string>
+  <string name="contact_menu_video_call">Βιντεοκλήση</string>
+  <string name="contact_menu_message">Μήνυμα</string>
+  <string name="contact_menu_remove">Κατάργηση</string>
+  <string name="contact_menu_contact_info">Στοιχεία επικ.</string>
+  <string name="suggested_contact_bottom_sheet_add_favorite_option">Προσθήκη αγαπημένου</string>
+  <string name="speed_dial_contacts_permission_description">Για να ενεργοποιήσετε την ταχεία κλήση, ενεργοποιήστε την άδεια επαφών.</string>
+  <string name="speed_dial_turn_on_contacts_permission">Ενεργοποίηση</string>
+  <string name="speed_dial_no_contacts_description">Δεν έχετε προσθέσει ακόμα αγαπημένα</string>
+  <string name="speed_dial_no_contacts_action_text">Προσθήκη αγαπημένου</string>
+  <string name="speed_dial_remove_favorites">Κατάργηση από τα αγαπημένα</string>
 </resources>
diff --git a/java/com/android/dialer/speeddial/res/values-en-rAU/strings.xml b/java/com/android/dialer/speeddial/res/values-en-rAU/strings.xml
index b0c27bc..218a24d 100644
--- a/java/com/android/dialer/speeddial/res/values-en-rAU/strings.xml
+++ b/java/com/android/dialer/speeddial/res/values-en-rAU/strings.xml
@@ -1,20 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="favorites_header">Favourites</string>
+  <string name="suggestions_header">Frequents</string>
+  <string name="speed_dial_add_button_text">Add</string>
+  <string name="speed_dial_remember_this_choice">Remember this choice</string>
+  <string name="speed_dial_disambig_dialog_title">Choose call type</string>
+  <string name="disambig_option_video_call">Video call</string>
+  <string name="disambig_option_voice_call">Call</string>
+  <string name="add_favorite_activity_title">Add Favourite</string>
+  <string name="contact_menu_voice_call">Voice call</string>
+  <string name="contact_menu_video_call">Video call</string>
+  <string name="contact_menu_message">Message</string>
+  <string name="contact_menu_remove">Remove</string>
+  <string name="contact_menu_contact_info">Contact info</string>
+  <string name="suggested_contact_bottom_sheet_add_favorite_option">Add favourite</string>
+  <string name="speed_dial_contacts_permission_description">To enable speed dial, turn on the Contacts permission.</string>
+  <string name="speed_dial_turn_on_contacts_permission">Turn on</string>
+  <string name="speed_dial_no_contacts_description">You haven\'t added any favourites yet</string>
+  <string name="speed_dial_no_contacts_action_text">Add favourite</string>
+  <string name="speed_dial_remove_favorites">Remove from favourites</string>
 </resources>
diff --git a/java/com/android/dialer/speeddial/res/values-en-rGB/strings.xml b/java/com/android/dialer/speeddial/res/values-en-rGB/strings.xml
index b0c27bc..218a24d 100644
--- a/java/com/android/dialer/speeddial/res/values-en-rGB/strings.xml
+++ b/java/com/android/dialer/speeddial/res/values-en-rGB/strings.xml
@@ -1,20 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="favorites_header">Favourites</string>
+  <string name="suggestions_header">Frequents</string>
+  <string name="speed_dial_add_button_text">Add</string>
+  <string name="speed_dial_remember_this_choice">Remember this choice</string>
+  <string name="speed_dial_disambig_dialog_title">Choose call type</string>
+  <string name="disambig_option_video_call">Video call</string>
+  <string name="disambig_option_voice_call">Call</string>
+  <string name="add_favorite_activity_title">Add Favourite</string>
+  <string name="contact_menu_voice_call">Voice call</string>
+  <string name="contact_menu_video_call">Video call</string>
+  <string name="contact_menu_message">Message</string>
+  <string name="contact_menu_remove">Remove</string>
+  <string name="contact_menu_contact_info">Contact info</string>
+  <string name="suggested_contact_bottom_sheet_add_favorite_option">Add favourite</string>
+  <string name="speed_dial_contacts_permission_description">To enable speed dial, turn on the Contacts permission.</string>
+  <string name="speed_dial_turn_on_contacts_permission">Turn on</string>
+  <string name="speed_dial_no_contacts_description">You haven\'t added any favourites yet</string>
+  <string name="speed_dial_no_contacts_action_text">Add favourite</string>
+  <string name="speed_dial_remove_favorites">Remove from favourites</string>
 </resources>
diff --git a/java/com/android/dialer/speeddial/res/values-en-rIN/strings.xml b/java/com/android/dialer/speeddial/res/values-en-rIN/strings.xml
index b0c27bc..218a24d 100644
--- a/java/com/android/dialer/speeddial/res/values-en-rIN/strings.xml
+++ b/java/com/android/dialer/speeddial/res/values-en-rIN/strings.xml
@@ -1,20 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="favorites_header">Favourites</string>
+  <string name="suggestions_header">Frequents</string>
+  <string name="speed_dial_add_button_text">Add</string>
+  <string name="speed_dial_remember_this_choice">Remember this choice</string>
+  <string name="speed_dial_disambig_dialog_title">Choose call type</string>
+  <string name="disambig_option_video_call">Video call</string>
+  <string name="disambig_option_voice_call">Call</string>
+  <string name="add_favorite_activity_title">Add Favourite</string>
+  <string name="contact_menu_voice_call">Voice call</string>
+  <string name="contact_menu_video_call">Video call</string>
+  <string name="contact_menu_message">Message</string>
+  <string name="contact_menu_remove">Remove</string>
+  <string name="contact_menu_contact_info">Contact info</string>
+  <string name="suggested_contact_bottom_sheet_add_favorite_option">Add favourite</string>
+  <string name="speed_dial_contacts_permission_description">To enable speed dial, turn on the Contacts permission.</string>
+  <string name="speed_dial_turn_on_contacts_permission">Turn on</string>
+  <string name="speed_dial_no_contacts_description">You haven\'t added any favourites yet</string>
+  <string name="speed_dial_no_contacts_action_text">Add favourite</string>
+  <string name="speed_dial_remove_favorites">Remove from favourites</string>
 </resources>
diff --git a/java/com/android/dialer/speeddial/res/values-es-rUS/strings.xml b/java/com/android/dialer/speeddial/res/values-es-rUS/strings.xml
index b0c27bc..f7abbf5 100644
--- a/java/com/android/dialer/speeddial/res/values-es-rUS/strings.xml
+++ b/java/com/android/dialer/speeddial/res/values-es-rUS/strings.xml
@@ -1,20 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="favorites_header">Favoritos</string>
+  <string name="suggestions_header">Frecuentes</string>
+  <string name="speed_dial_add_button_text">Agregar</string>
+  <string name="speed_dial_remember_this_choice">Recuerda esta opción</string>
+  <string name="speed_dial_disambig_dialog_title">Elige el tipo de llamada</string>
+  <string name="disambig_option_video_call">Videollamada</string>
+  <string name="disambig_option_voice_call">Llamar</string>
+  <string name="add_favorite_activity_title">Agregar favorito</string>
+  <string name="contact_menu_voice_call">Llamada de voz</string>
+  <string name="contact_menu_video_call">Videollamada</string>
+  <string name="contact_menu_message">Mensaje</string>
+  <string name="contact_menu_remove">Quitar</string>
+  <string name="contact_menu_contact_info">Info. de cto</string>
+  <string name="suggested_contact_bottom_sheet_add_favorite_option">Agregar favorito</string>
+  <string name="speed_dial_contacts_permission_description">Para habilitar el marcado rápido, activa el permiso para acceder a Contactos.</string>
+  <string name="speed_dial_turn_on_contacts_permission">Activar</string>
+  <string name="speed_dial_no_contacts_description">Todavía no agregaste ningún favorito</string>
+  <string name="speed_dial_no_contacts_action_text">Agregar favorito</string>
+  <string name="speed_dial_remove_favorites">Quitar de favoritos</string>
 </resources>
diff --git a/java/com/android/dialer/speeddial/res/values-es/strings.xml b/java/com/android/dialer/speeddial/res/values-es/strings.xml
index b0c27bc..25752a7 100644
--- a/java/com/android/dialer/speeddial/res/values-es/strings.xml
+++ b/java/com/android/dialer/speeddial/res/values-es/strings.xml
@@ -1,20 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="favorites_header">Favoritos</string>
+  <string name="suggestions_header">Frecuentes</string>
+  <string name="speed_dial_add_button_text">Añadir</string>
+  <string name="speed_dial_remember_this_choice">Recordar esta opción</string>
+  <string name="speed_dial_disambig_dialog_title">Elegir tipo de llamada</string>
+  <string name="disambig_option_video_call">Videollamada</string>
+  <string name="disambig_option_voice_call">Llamada</string>
+  <string name="add_favorite_activity_title">Añadir favorito</string>
+  <string name="contact_menu_voice_call">Llamada de voz</string>
+  <string name="contact_menu_video_call">Videollamada</string>
+  <string name="contact_menu_message">Mensaje</string>
+  <string name="contact_menu_remove">Quitar</string>
+  <string name="contact_menu_contact_info">Datos del contacto</string>
+  <string name="suggested_contact_bottom_sheet_add_favorite_option">Añadir favorito</string>
+  <string name="speed_dial_contacts_permission_description">Para habilitar la marcación rápida, activa el permiso de Contactos.</string>
+  <string name="speed_dial_turn_on_contacts_permission">Activar</string>
+  <string name="speed_dial_no_contacts_description">Aún no has añadido favoritos</string>
+  <string name="speed_dial_no_contacts_action_text">Añadir favorito</string>
+  <string name="speed_dial_remove_favorites">Quitar de favoritos</string>
 </resources>
diff --git a/java/com/android/dialer/speeddial/res/values-et/strings.xml b/java/com/android/dialer/speeddial/res/values-et/strings.xml
index b0c27bc..d34dc17 100644
--- a/java/com/android/dialer/speeddial/res/values-et/strings.xml
+++ b/java/com/android/dialer/speeddial/res/values-et/strings.xml
@@ -1,20 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="favorites_header">Lemmikud</string>
+  <string name="suggestions_header">Sagedased</string>
+  <string name="speed_dial_add_button_text">Lisa</string>
+  <string name="speed_dial_remember_this_choice">Pea see valik meeles</string>
+  <string name="speed_dial_disambig_dialog_title">Valige kõne tüüp</string>
+  <string name="disambig_option_video_call">Videokõne</string>
+  <string name="disambig_option_voice_call">Kõne</string>
+  <string name="add_favorite_activity_title">Lisage lemmikutesse</string>
+  <string name="contact_menu_voice_call">Häälkõne</string>
+  <string name="contact_menu_video_call">Videokõne</string>
+  <string name="contact_menu_message">Sõnum</string>
+  <string name="contact_menu_remove">Eemalda</string>
+  <string name="contact_menu_contact_info">Kontaktteave</string>
+  <string name="suggested_contact_bottom_sheet_add_favorite_option">Lisage lemmikutesse</string>
+  <string name="speed_dial_contacts_permission_description">Kiirvalimise lubamiseks lülitage sisse kontaktiluba.</string>
+  <string name="speed_dial_turn_on_contacts_permission">Lülita sisse</string>
+  <string name="speed_dial_no_contacts_description">Te ei ole veel lemmikuid lisanud</string>
+  <string name="speed_dial_no_contacts_action_text">Lisage lemmikuid</string>
+  <string name="speed_dial_remove_favorites">Eemalda lemmikutest</string>
 </resources>
diff --git a/java/com/android/dialer/speeddial/res/values-eu/strings.xml b/java/com/android/dialer/speeddial/res/values-eu/strings.xml
index b0c27bc..7d6b86e 100644
--- a/java/com/android/dialer/speeddial/res/values-eu/strings.xml
+++ b/java/com/android/dialer/speeddial/res/values-eu/strings.xml
@@ -1,20 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="favorites_header">Gogokoak</string>
+  <string name="suggestions_header">Maiz erabilitakoak</string>
+  <string name="speed_dial_add_button_text">Gehitu</string>
+  <string name="speed_dial_remember_this_choice">Gogoratu aukera hau</string>
+  <string name="speed_dial_disambig_dialog_title">Aukeratu dei mota</string>
+  <string name="disambig_option_video_call">Bideo-deia</string>
+  <string name="disambig_option_voice_call">Deitu</string>
+  <string name="add_favorite_activity_title">Gehitu gogokoa</string>
+  <string name="contact_menu_voice_call">Ahots-deia</string>
+  <string name="contact_menu_video_call">Bideo-deia</string>
+  <string name="contact_menu_message">Mezua</string>
+  <string name="contact_menu_remove">Kendu</string>
+  <string name="contact_menu_contact_info">Harremanetarako informazioa</string>
+  <string name="suggested_contact_bottom_sheet_add_favorite_option">Gehitu gogokoa</string>
+  <string name="speed_dial_contacts_permission_description">Markatze bizkorra gaitzeko, aktibatu Kontaktuak erabiltzeko baimena.</string>
+  <string name="speed_dial_turn_on_contacts_permission">Aktibatu</string>
+  <string name="speed_dial_no_contacts_description">Ez duzu gehitu gogokorik oraindik</string>
+  <string name="speed_dial_no_contacts_action_text">Gehitu gogokoa</string>
+  <string name="speed_dial_remove_favorites">Kendu gogokoetatik</string>
 </resources>
diff --git a/java/com/android/dialer/speeddial/res/values-fa/strings.xml b/java/com/android/dialer/speeddial/res/values-fa/strings.xml
index b0c27bc..b35788c 100644
--- a/java/com/android/dialer/speeddial/res/values-fa/strings.xml
+++ b/java/com/android/dialer/speeddial/res/values-fa/strings.xml
@@ -1,20 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="favorites_header">موردعلاقه‌‌‌ها</string>
+  <string name="suggestions_header">مکرراً تماس‌گرفته</string>
+  <string name="speed_dial_add_button_text">افزودن</string>
+  <string name="speed_dial_remember_this_choice">این گزینه به خاطر سپرده شود</string>
+  <string name="speed_dial_disambig_dialog_title">انتخاب نوع تماس</string>
+  <string name="disambig_option_video_call">تماس ویدیویی</string>
+  <string name="disambig_option_voice_call">تماس</string>
+  <string name="add_favorite_activity_title">افزودن مورد دلخواه</string>
+  <string name="contact_menu_voice_call">تماس صوتی</string>
+  <string name="contact_menu_video_call">تماس ویدیویی</string>
+  <string name="contact_menu_message">پیام</string>
+  <string name="contact_menu_remove">برداشتن</string>
+  <string name="contact_menu_contact_info">اطلاعات مخاطب</string>
+  <string name="suggested_contact_bottom_sheet_add_favorite_option">افزودن مورد دلخواه</string>
+  <string name="speed_dial_contacts_permission_description">برای فعال کردن شماره‌گیری سریع، مجوز «مخاطبین» را روشن کنید.</string>
+  <string name="speed_dial_turn_on_contacts_permission">روشن کردن</string>
+  <string name="speed_dial_no_contacts_description">هنوز مورد دلخواهی اضافه نکرده‌اید</string>
+  <string name="speed_dial_no_contacts_action_text">افزودن مورد دلخواه</string>
+  <string name="speed_dial_remove_favorites">برداشتن از موارد دلخواه</string>
 </resources>
diff --git a/java/com/android/dialer/speeddial/res/values-fi/strings.xml b/java/com/android/dialer/speeddial/res/values-fi/strings.xml
index b0c27bc..679806e 100644
--- a/java/com/android/dialer/speeddial/res/values-fi/strings.xml
+++ b/java/com/android/dialer/speeddial/res/values-fi/strings.xml
@@ -1,20 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="favorites_header">Suosikit</string>
+  <string name="suggestions_header">Usein käytetyt</string>
+  <string name="speed_dial_add_button_text">Lisää</string>
+  <string name="speed_dial_remember_this_choice">Muista valinta</string>
+  <string name="speed_dial_disambig_dialog_title">Valitse puhelutyyppi</string>
+  <string name="disambig_option_video_call">Videopuhelu</string>
+  <string name="disambig_option_voice_call">Soita</string>
+  <string name="add_favorite_activity_title">Lisää suosikki</string>
+  <string name="contact_menu_voice_call">Äänipuhelu</string>
+  <string name="contact_menu_video_call">Videopuhelu</string>
+  <string name="contact_menu_message">Viesti</string>
+  <string name="contact_menu_remove">Poista</string>
+  <string name="contact_menu_contact_info">Yhteystiedot</string>
+  <string name="suggested_contact_bottom_sheet_add_favorite_option">Lisää suosikki</string>
+  <string name="speed_dial_contacts_permission_description">Jos haluat käyttää pikavalintaa, ota Yhteystiedot-käyttöoikeus käyttöön.</string>
+  <string name="speed_dial_turn_on_contacts_permission">Ota käyttöön</string>
+  <string name="speed_dial_no_contacts_description">Et ole vielä lisännyt suosikkeja</string>
+  <string name="speed_dial_no_contacts_action_text">Lisää suosikki</string>
+  <string name="speed_dial_remove_favorites">Poista suosikeista</string>
 </resources>
diff --git a/java/com/android/dialer/speeddial/res/values-fr-rCA/strings.xml b/java/com/android/dialer/speeddial/res/values-fr-rCA/strings.xml
index b0c27bc..12cc511 100644
--- a/java/com/android/dialer/speeddial/res/values-fr-rCA/strings.xml
+++ b/java/com/android/dialer/speeddial/res/values-fr-rCA/strings.xml
@@ -1,20 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="favorites_header">Favoris</string>
+  <string name="suggestions_header">Fréquents</string>
+  <string name="speed_dial_add_button_text">Ajouter</string>
+  <string name="speed_dial_remember_this_choice">Mémoriser ce choix</string>
+  <string name="speed_dial_disambig_dialog_title">Choisir le type d\'appel</string>
+  <string name="disambig_option_video_call">Appel vidéo</string>
+  <string name="disambig_option_voice_call">Appeler</string>
+  <string name="add_favorite_activity_title">Ajoutez un favori</string>
+  <string name="contact_menu_voice_call">Appel vocal</string>
+  <string name="contact_menu_video_call">Appel vidéo</string>
+  <string name="contact_menu_message">Message</string>
+  <string name="contact_menu_remove">Supprimer</string>
+  <string name="contact_menu_contact_info">Coordonnées</string>
+  <string name="suggested_contact_bottom_sheet_add_favorite_option">Ajouter aux favoris</string>
+  <string name="speed_dial_contacts_permission_description">Pour activer la composition abrégée, activez l\'autorisation Contacts.</string>
+  <string name="speed_dial_turn_on_contacts_permission">Activer</string>
+  <string name="speed_dial_no_contacts_description">Vous n\'avez pas encore ajouté de favoris</string>
+  <string name="speed_dial_no_contacts_action_text">Ajouter un favori</string>
+  <string name="speed_dial_remove_favorites">Supprimer des favoris</string>
 </resources>
diff --git a/java/com/android/dialer/speeddial/res/values-fr/strings.xml b/java/com/android/dialer/speeddial/res/values-fr/strings.xml
index b0c27bc..89194f7 100644
--- a/java/com/android/dialer/speeddial/res/values-fr/strings.xml
+++ b/java/com/android/dialer/speeddial/res/values-fr/strings.xml
@@ -1,20 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="favorites_header">Favoris</string>
+  <string name="suggestions_header">Fréquents</string>
+  <string name="speed_dial_add_button_text">Ajouter</string>
+  <string name="speed_dial_remember_this_choice">Mémoriser ce choix</string>
+  <string name="speed_dial_disambig_dialog_title">Choisir un type d\'appel</string>
+  <string name="disambig_option_video_call">Appel vidéo</string>
+  <string name="disambig_option_voice_call">Appel</string>
+  <string name="add_favorite_activity_title">Ajouter aux favoris</string>
+  <string name="contact_menu_voice_call">Appel audio</string>
+  <string name="contact_menu_video_call">Appel vidéo</string>
+  <string name="contact_menu_message">Message</string>
+  <string name="contact_menu_remove">Supprimer</string>
+  <string name="contact_menu_contact_info">Coordonnées</string>
+  <string name="suggested_contact_bottom_sheet_add_favorite_option">Ajouter aux favoris</string>
+  <string name="speed_dial_contacts_permission_description">Pour activer la numérotation abrégée, activez l\'autorisation Contacts.</string>
+  <string name="speed_dial_turn_on_contacts_permission">Activer</string>
+  <string name="speed_dial_no_contacts_description">Pour le moment, vous n\'avez ajouté aucun contact aux favoris.</string>
+  <string name="speed_dial_no_contacts_action_text">Ajouter aux favoris</string>
+  <string name="speed_dial_remove_favorites">Supprimer des favoris</string>
 </resources>
diff --git a/java/com/android/dialer/speeddial/res/values-gl/strings.xml b/java/com/android/dialer/speeddial/res/values-gl/strings.xml
index b0c27bc..9855624 100644
--- a/java/com/android/dialer/speeddial/res/values-gl/strings.xml
+++ b/java/com/android/dialer/speeddial/res/values-gl/strings.xml
@@ -1,20 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="favorites_header">Favoritos</string>
+  <string name="suggestions_header">Frecuentes</string>
+  <string name="speed_dial_add_button_text">Engadir</string>
+  <string name="speed_dial_remember_this_choice">Lembrar esta escolla</string>
+  <string name="speed_dial_disambig_dialog_title">Escoller tipo de chamada</string>
+  <string name="disambig_option_video_call">Videochamada</string>
+  <string name="disambig_option_voice_call">Chamar</string>
+  <string name="add_favorite_activity_title">Engade un contacto a favoritos</string>
+  <string name="contact_menu_voice_call">Chamada de voz</string>
+  <string name="contact_menu_video_call">Videochamada</string>
+  <string name="contact_menu_message">Mensaxe</string>
+  <string name="contact_menu_remove">Quitar</string>
+  <string name="contact_menu_contact_info">Info. contacto</string>
+  <string name="suggested_contact_bottom_sheet_add_favorite_option">Engadir favorito</string>
+  <string name="speed_dial_contacts_permission_description">Para activar a marcación rápida, activa o permiso de Contactos.</string>
+  <string name="speed_dial_turn_on_contacts_permission">Activar</string>
+  <string name="speed_dial_no_contacts_description">Aínda non engadiches ningún contacto favorito</string>
+  <string name="speed_dial_no_contacts_action_text">Engadir favorito</string>
+  <string name="speed_dial_remove_favorites">Quitar contacto de favoritos</string>
 </resources>
diff --git a/java/com/android/dialer/speeddial/res/values-gu/strings.xml b/java/com/android/dialer/speeddial/res/values-gu/strings.xml
index b0c27bc..60d3635 100644
--- a/java/com/android/dialer/speeddial/res/values-gu/strings.xml
+++ b/java/com/android/dialer/speeddial/res/values-gu/strings.xml
@@ -1,20 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="favorites_header">મનપસંદ</string>
+  <string name="suggestions_header">વારંવાર</string>
+  <string name="speed_dial_add_button_text">ઉમેરો</string>
+  <string name="speed_dial_remember_this_choice">આ પસંદ યાદ રાખો</string>
+  <string name="speed_dial_disambig_dialog_title">કૉલનો પ્રકાર પસંદ કરો</string>
+  <string name="disambig_option_video_call">વીડિઓ કૉલ</string>
+  <string name="disambig_option_voice_call">કૉલ</string>
+  <string name="add_favorite_activity_title">મનપસંદ ઉમેરો</string>
+  <string name="contact_menu_voice_call">વૉઇસ કૉલ</string>
+  <string name="contact_menu_video_call">વીડિઓ કૉલ</string>
+  <string name="contact_menu_message">સંદેશ</string>
+  <string name="contact_menu_remove">કાઢી નાખો</string>
+  <string name="contact_menu_contact_info">સંપર્ક માહિતી</string>
+  <string name="suggested_contact_bottom_sheet_add_favorite_option">મનપસંદ ઉમેરો</string>
+  <string name="speed_dial_contacts_permission_description">સ્પીડ ડાયલ ચાલુ કરવા માટે, સંપર્કોની પરવાનગી ચાલુ કરો.</string>
+  <string name="speed_dial_turn_on_contacts_permission">ચાલુ કરો</string>
+  <string name="speed_dial_no_contacts_description">તમે હજી સુધી કોઈ મનપસંદ ઉમેર્યા નથી</string>
+  <string name="speed_dial_no_contacts_action_text">મનપસંદ ઉમેરો</string>
+  <string name="speed_dial_remove_favorites">મનપસંદમાંથી કાઢી નાખો</string>
 </resources>
diff --git a/java/com/android/dialer/speeddial/res/values-hi/strings.xml b/java/com/android/dialer/speeddial/res/values-hi/strings.xml
index b0c27bc..9d18fa0 100644
--- a/java/com/android/dialer/speeddial/res/values-hi/strings.xml
+++ b/java/com/android/dialer/speeddial/res/values-hi/strings.xml
@@ -1,20 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="favorites_header">पसंदीदा</string>
+  <string name="suggestions_header">नियमित संपर्क</string>
+  <string name="speed_dial_add_button_text">शामिल करें</string>
+  <string name="speed_dial_remember_this_choice">यह चयन याद रखें</string>
+  <string name="speed_dial_disambig_dialog_title">कॉल का प्रकार चुनें</string>
+  <string name="disambig_option_video_call">वीडियो कॉल</string>
+  <string name="disambig_option_voice_call">कॉल करें</string>
+  <string name="add_favorite_activity_title">पसंदीदा जोड़ें</string>
+  <string name="contact_menu_voice_call">वॉइस कॉल करें</string>
+  <string name="contact_menu_video_call">वीडियो कॉल करें</string>
+  <string name="contact_menu_message">मैसेज भेजें</string>
+  <string name="contact_menu_remove">हटाएं</string>
+  <string name="contact_menu_contact_info">संपर्क जानकारी</string>
+  <string name="suggested_contact_bottom_sheet_add_favorite_option">इन्हें पसंदीदा संपर्क बनाएं</string>
+  <string name="speed_dial_contacts_permission_description">स्पीड डायल चालू करने के लिए, \'संपर्क\' इजाज़त चालू करें.</string>
+  <string name="speed_dial_turn_on_contacts_permission">चालू करें</string>
+  <string name="speed_dial_no_contacts_description">आपने अभी तक कोई भी पसंदीदा संपर्क नहीं जोड़ा है.</string>
+  <string name="speed_dial_no_contacts_action_text">पसंदीदा संपर्क जोड़ें</string>
+  <string name="speed_dial_remove_favorites">पसंदीदा से हटाएं</string>
 </resources>
diff --git a/java/com/android/dialer/speeddial/res/values-hr/strings.xml b/java/com/android/dialer/speeddial/res/values-hr/strings.xml
index b0c27bc..7294d83 100644
--- a/java/com/android/dialer/speeddial/res/values-hr/strings.xml
+++ b/java/com/android/dialer/speeddial/res/values-hr/strings.xml
@@ -1,20 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="favorites_header">Omiljeni kontakti</string>
+  <string name="suggestions_header">Često kontaktirani</string>
+  <string name="speed_dial_add_button_text">Dodaj</string>
+  <string name="speed_dial_remember_this_choice">Zapamti ovaj odabir</string>
+  <string name="speed_dial_disambig_dialog_title">Odabir vrste poziva</string>
+  <string name="disambig_option_video_call">Videopoziv</string>
+  <string name="disambig_option_voice_call">Poziv</string>
+  <string name="add_favorite_activity_title">Dodavanje omiljenih konataka</string>
+  <string name="contact_menu_voice_call">Glasovni poziv</string>
+  <string name="contact_menu_video_call">Videopoziv</string>
+  <string name="contact_menu_message">Poruka</string>
+  <string name="contact_menu_remove">Ukloni</string>
+  <string name="contact_menu_contact_info">Podaci za kontakt</string>
+  <string name="suggested_contact_bottom_sheet_add_favorite_option">Dodaj favorit</string>
+  <string name="speed_dial_contacts_permission_description">Da biste omogućili brzo biranje, uključite dopuštenje za kontakte.</string>
+  <string name="speed_dial_turn_on_contacts_permission">Uključi</string>
+  <string name="speed_dial_no_contacts_description">Još niste dodali nijednog favorita</string>
+  <string name="speed_dial_no_contacts_action_text">Dodavanje favorita</string>
+  <string name="speed_dial_remove_favorites">Uklanjanje iz favorita</string>
 </resources>
diff --git a/java/com/android/dialer/speeddial/res/values-hu/strings.xml b/java/com/android/dialer/speeddial/res/values-hu/strings.xml
index b0c27bc..8ed77bb 100644
--- a/java/com/android/dialer/speeddial/res/values-hu/strings.xml
+++ b/java/com/android/dialer/speeddial/res/values-hu/strings.xml
@@ -1,20 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="favorites_header">Kedvencek</string>
+  <string name="suggestions_header">Gyakran használt névjegyek</string>
+  <string name="speed_dial_add_button_text">Hozzáadás</string>
+  <string name="speed_dial_remember_this_choice">Választás megjegyzése</string>
+  <string name="speed_dial_disambig_dialog_title">Hívás típusának kiválasztása</string>
+  <string name="disambig_option_video_call">Videohívás</string>
+  <string name="disambig_option_voice_call">Hívás</string>
+  <string name="add_favorite_activity_title">Felvétel a kedvencek közé</string>
+  <string name="contact_menu_voice_call">Hanghívás</string>
+  <string name="contact_menu_video_call">Videohívás</string>
+  <string name="contact_menu_message">Üzenet</string>
+  <string name="contact_menu_remove">Eltávolítás</string>
+  <string name="contact_menu_contact_info">Névjegyadatok</string>
+  <string name="suggested_contact_bottom_sheet_add_favorite_option">Új kedvenc hozzáadása</string>
+  <string name="speed_dial_contacts_permission_description">A gyorshívás engedélyezéséhez kapcsolja be a Névjegyek engedélyt.</string>
+  <string name="speed_dial_turn_on_contacts_permission">Bekapcsolás</string>
+  <string name="speed_dial_no_contacts_description">Még nem adott hozzá kedvenceket.</string>
+  <string name="speed_dial_no_contacts_action_text">Új kedvenc hozzáadása</string>
+  <string name="speed_dial_remove_favorites">Eltávolítás a kedvencek közül</string>
 </resources>
diff --git a/java/com/android/dialer/speeddial/res/values-hy/strings.xml b/java/com/android/dialer/speeddial/res/values-hy/strings.xml
index b0c27bc..2e3d15a 100644
--- a/java/com/android/dialer/speeddial/res/values-hy/strings.xml
+++ b/java/com/android/dialer/speeddial/res/values-hy/strings.xml
@@ -1,20 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="favorites_header">Ընտրանի</string>
+  <string name="suggestions_header">Հաճախակի օգտագործվող կոնտակտներ</string>
+  <string name="speed_dial_add_button_text">Ավելացնել</string>
+  <string name="speed_dial_remember_this_choice">Հիշել այս ընտրությունը</string>
+  <string name="speed_dial_disambig_dialog_title">Ընտրեք զանգի տեսակը</string>
+  <string name="disambig_option_video_call">Տեսազանգ</string>
+  <string name="disambig_option_voice_call">Զանգ</string>
+  <string name="add_favorite_activity_title">Ընտրեք կոնտակտ՝ ընտրանիում ավելացնելու համար</string>
+  <string name="contact_menu_voice_call">Զանգ</string>
+  <string name="contact_menu_video_call">Տեսազանգ</string>
+  <string name="contact_menu_message">SMS</string>
+  <string name="contact_menu_remove">Հեռացնել</string>
+  <string name="contact_menu_contact_info">Կոնտակտ</string>
+  <string name="suggested_contact_bottom_sheet_add_favorite_option">Ավելացնել ընտրանուն</string>
+  <string name="speed_dial_contacts_permission_description">Արագ համարհավաքման գործառույթից օգտվելու համար միացրեք «Կոնտակտներ» թույլտվությունը:</string>
+  <string name="speed_dial_turn_on_contacts_permission">Միացնել</string>
+  <string name="speed_dial_no_contacts_description">Ցանկում դեռ նախընտրած կոնտակտներ չեք ավելացրել</string>
+  <string name="speed_dial_no_contacts_action_text">Ավելացնել նախընտրած կոնտակտ</string>
+  <string name="speed_dial_remove_favorites">Հեռացնել ընտրանուց</string>
 </resources>
diff --git a/java/com/android/dialer/speeddial/res/values-in/strings.xml b/java/com/android/dialer/speeddial/res/values-in/strings.xml
index b0c27bc..9f72e8d 100644
--- a/java/com/android/dialer/speeddial/res/values-in/strings.xml
+++ b/java/com/android/dialer/speeddial/res/values-in/strings.xml
@@ -1,20 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="favorites_header">Favorit</string>
+  <string name="suggestions_header">Sering dhubungi</string>
+  <string name="speed_dial_add_button_text">Tambahkan</string>
+  <string name="speed_dial_remember_this_choice">Ingat pilihan ini</string>
+  <string name="speed_dial_disambig_dialog_title">Pilih jenis panggilan</string>
+  <string name="disambig_option_video_call">Video call</string>
+  <string name="disambig_option_voice_call">Panggil</string>
+  <string name="add_favorite_activity_title">Tambahkan Favorit</string>
+  <string name="contact_menu_voice_call">Panggilan Suara</string>
+  <string name="contact_menu_video_call">Video Call</string>
+  <string name="contact_menu_message">Pesan</string>
+  <string name="contact_menu_remove">Hapus</string>
+  <string name="contact_menu_contact_info">Info kontak</string>
+  <string name="suggested_contact_bottom_sheet_add_favorite_option">Tambahkan favorit</string>
+  <string name="speed_dial_contacts_permission_description">Untuk mengaktifkan panggilan cepat, aktifkan izin Kontak.</string>
+  <string name="speed_dial_turn_on_contacts_permission">Aktifkan</string>
+  <string name="speed_dial_no_contacts_description">Anda belum menambahkan favorit apa pun</string>
+  <string name="speed_dial_no_contacts_action_text">Tambahkan favorit</string>
+  <string name="speed_dial_remove_favorites">Hapus dari favorit</string>
 </resources>
diff --git a/java/com/android/dialer/speeddial/res/values-is/strings.xml b/java/com/android/dialer/speeddial/res/values-is/strings.xml
index b0c27bc..4073603 100644
--- a/java/com/android/dialer/speeddial/res/values-is/strings.xml
+++ b/java/com/android/dialer/speeddial/res/values-is/strings.xml
@@ -1,20 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="favorites_header">Uppáhald</string>
+  <string name="suggestions_header">Algengir</string>
+  <string name="speed_dial_add_button_text">Bæta við</string>
+  <string name="speed_dial_remember_this_choice">Muna þetta val</string>
+  <string name="speed_dial_disambig_dialog_title">Veldu gerð símtals</string>
+  <string name="disambig_option_video_call">Myndsímtal</string>
+  <string name="disambig_option_voice_call">Símtal</string>
+  <string name="add_favorite_activity_title">Setja í eftirlæti</string>
+  <string name="contact_menu_voice_call">Raddsímtal</string>
+  <string name="contact_menu_video_call">Myndsímtal</string>
+  <string name="contact_menu_message">Skilaboð</string>
+  <string name="contact_menu_remove">Fjarlægja</string>
+  <string name="contact_menu_contact_info">Samskiptauppl.</string>
+  <string name="suggested_contact_bottom_sheet_add_favorite_option">Bæta við uppáhald</string>
+  <string name="speed_dial_contacts_permission_description">Kveiktu á tengiliðaheimildinni til að gera hraðval virkt.</string>
+  <string name="speed_dial_turn_on_contacts_permission">Kveikja</string>
+  <string name="speed_dial_no_contacts_description">Þú hefur ekki bætt neinum við uppáhald ennþá</string>
+  <string name="speed_dial_no_contacts_action_text">Bæta við uppáhald</string>
+  <string name="speed_dial_remove_favorites">Fjarlægja úr uppáhaldi</string>
 </resources>
diff --git a/java/com/android/dialer/speeddial/res/values-it/strings.xml b/java/com/android/dialer/speeddial/res/values-it/strings.xml
index b0c27bc..b076564 100644
--- a/java/com/android/dialer/speeddial/res/values-it/strings.xml
+++ b/java/com/android/dialer/speeddial/res/values-it/strings.xml
@@ -1,20 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="favorites_header">Preferiti</string>
+  <string name="suggestions_header">Frequenti</string>
+  <string name="speed_dial_add_button_text">Aggiungi</string>
+  <string name="speed_dial_remember_this_choice">Memorizza questa scelta</string>
+  <string name="speed_dial_disambig_dialog_title">Scegli il tipo di chiamata</string>
+  <string name="disambig_option_video_call">Videochiama</string>
+  <string name="disambig_option_voice_call">Chiama</string>
+  <string name="add_favorite_activity_title">Aggiungi preferito</string>
+  <string name="contact_menu_voice_call">Chiamata vocale</string>
+  <string name="contact_menu_video_call">Videochiamata</string>
+  <string name="contact_menu_message">Invia SMS</string>
+  <string name="contact_menu_remove">Rimuovi</string>
+  <string name="contact_menu_contact_info">Info contatto</string>
+  <string name="suggested_contact_bottom_sheet_add_favorite_option">Aggiungi preferito</string>
+  <string name="speed_dial_contacts_permission_description">Per attivare la composizione rapida, attiva l\'autorizzazione Contatti.</string>
+  <string name="speed_dial_turn_on_contacts_permission">Attiva</string>
+  <string name="speed_dial_no_contacts_description">Non hai ancora aggiunto nessun contatto ai preferiti</string>
+  <string name="speed_dial_no_contacts_action_text">Aggiungi preferito</string>
+  <string name="speed_dial_remove_favorites">Rimuovi da preferiti</string>
 </resources>
diff --git a/java/com/android/dialer/speeddial/res/values-iw/strings.xml b/java/com/android/dialer/speeddial/res/values-iw/strings.xml
index b0c27bc..af06358 100644
--- a/java/com/android/dialer/speeddial/res/values-iw/strings.xml
+++ b/java/com/android/dialer/speeddial/res/values-iw/strings.xml
@@ -1,20 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="favorites_header">מועדפים</string>
+  <string name="suggestions_header">תדירים</string>
+  <string name="speed_dial_add_button_text">הוספה</string>
+  <string name="speed_dial_remember_this_choice">אני רוצה להשתמש באפשרות הזו גם בעתיד</string>
+  <string name="speed_dial_disambig_dialog_title">בחירת סוג השיחה</string>
+  <string name="disambig_option_video_call">שיחת וידאו</string>
+  <string name="disambig_option_voice_call">שיחה</string>
+  <string name="add_favorite_activity_title">הוספה למועדפים</string>
+  <string name="contact_menu_voice_call">שיחה קולית</string>
+  <string name="contact_menu_video_call">שיחת וידאו</string>
+  <string name="contact_menu_message">הודעה</string>
+  <string name="contact_menu_remove">הסרה</string>
+  <string name="contact_menu_contact_info">פרטי התקשרות</string>
+  <string name="suggested_contact_bottom_sheet_add_favorite_option">הוספה למועדפים</string>
+  <string name="speed_dial_contacts_permission_description">כדי להפעיל את החיוג המהיר, צריך להפעיל את ההרשאה \'אנשי קשר\'.</string>
+  <string name="speed_dial_turn_on_contacts_permission">הפעלה</string>
+  <string name="speed_dial_no_contacts_description">לא הוספת עדיין אף אחד לרשימת המועדפים</string>
+  <string name="speed_dial_no_contacts_action_text">הוספה למועדפים</string>
+  <string name="speed_dial_remove_favorites">הסרה מהמועדפים</string>
 </resources>
diff --git a/java/com/android/dialer/speeddial/res/values-ja/strings.xml b/java/com/android/dialer/speeddial/res/values-ja/strings.xml
index b0c27bc..1e004a0 100644
--- a/java/com/android/dialer/speeddial/res/values-ja/strings.xml
+++ b/java/com/android/dialer/speeddial/res/values-ja/strings.xml
@@ -1,20 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="favorites_header">お気に入り</string>
+  <string name="suggestions_header">よく使う連絡先</string>
+  <string name="speed_dial_add_button_text">追加</string>
+  <string name="speed_dial_remember_this_choice">この設定を保存する</string>
+  <string name="speed_dial_disambig_dialog_title">通話タイプの選択</string>
+  <string name="disambig_option_video_call">ビデオ通話</string>
+  <string name="disambig_option_voice_call">音声通話</string>
+  <string name="add_favorite_activity_title">お気に入りに追加</string>
+  <string name="contact_menu_voice_call">音声通話</string>
+  <string name="contact_menu_video_call">ビデオ通話</string>
+  <string name="contact_menu_message">SMS</string>
+  <string name="contact_menu_remove">削除</string>
+  <string name="contact_menu_contact_info">連絡先情報</string>
+  <string name="suggested_contact_bottom_sheet_add_favorite_option">お気に入りに追加</string>
+  <string name="speed_dial_contacts_permission_description">クイック アクセスを有効にするには、まず連絡帳へのアクセスを ON にしてください。</string>
+  <string name="speed_dial_turn_on_contacts_permission">ON にする</string>
+  <string name="speed_dial_no_contacts_description">お気に入りはまだ追加されていません</string>
+  <string name="speed_dial_no_contacts_action_text">お気に入りに追加</string>
+  <string name="speed_dial_remove_favorites">お気に入りから削除</string>
 </resources>
diff --git a/java/com/android/dialer/speeddial/res/values-ka/strings.xml b/java/com/android/dialer/speeddial/res/values-ka/strings.xml
index b0c27bc..8c0eda1 100644
--- a/java/com/android/dialer/speeddial/res/values-ka/strings.xml
+++ b/java/com/android/dialer/speeddial/res/values-ka/strings.xml
@@ -1,20 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="favorites_header">რჩეულები</string>
+  <string name="suggestions_header">ხშირი კონტაქტები</string>
+  <string name="speed_dial_add_button_text">დამატება</string>
+  <string name="speed_dial_remember_this_choice">ამ არჩევანის დამახსოვრება</string>
+  <string name="speed_dial_disambig_dialog_title">აირჩიეთ ზარის ტიპი</string>
+  <string name="disambig_option_video_call">ვიდეოზარი</string>
+  <string name="disambig_option_voice_call">ზარი</string>
+  <string name="add_favorite_activity_title">რჩეულის დამატება</string>
+  <string name="contact_menu_voice_call">ხმოვანი ზარი</string>
+  <string name="contact_menu_video_call">ვიდეოზარი</string>
+  <string name="contact_menu_message">შეტყობინება</string>
+  <string name="contact_menu_remove">წაშლა</string>
+  <string name="contact_menu_contact_info">საკონტაქტო ინფო</string>
+  <string name="suggested_contact_bottom_sheet_add_favorite_option">რჩეულის დამატება</string>
+  <string name="speed_dial_contacts_permission_description">სწრაფი აკრეფის გასააქტიურებლად, ჩართეთ კონტაქტების ნებართვა.</string>
+  <string name="speed_dial_turn_on_contacts_permission">ჩართვა</string>
+  <string name="speed_dial_no_contacts_description">რჩეულები ჯერ არ დაგიმატებიათ</string>
+  <string name="speed_dial_no_contacts_action_text">რჩეულის დამატება</string>
+  <string name="speed_dial_remove_favorites">რჩეულებიდან ამოშლა</string>
 </resources>
diff --git a/java/com/android/dialer/speeddial/res/values-kk/strings.xml b/java/com/android/dialer/speeddial/res/values-kk/strings.xml
index b0c27bc..31f8670 100644
--- a/java/com/android/dialer/speeddial/res/values-kk/strings.xml
+++ b/java/com/android/dialer/speeddial/res/values-kk/strings.xml
@@ -1,20 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="favorites_header">Таңдаулылар</string>
+  <string name="suggestions_header">Жиі қолданылатын</string>
+  <string name="speed_dial_add_button_text">Қосу</string>
+  <string name="speed_dial_remember_this_choice">Таңдалған нөмірді еске сақтау</string>
+  <string name="speed_dial_disambig_dialog_title">Қоңырау түрін таңдаңыз</string>
+  <string name="disambig_option_video_call">Бейне қоңырау</string>
+  <string name="disambig_option_voice_call">Қоңырау шалу</string>
+  <string name="add_favorite_activity_title">Таңдаулылар тізіміне жаңа контакт қосу</string>
+  <string name="contact_menu_voice_call">Дауыстық қоңырау</string>
+  <string name="contact_menu_video_call">Бейне қоңырау</string>
+  <string name="contact_menu_message">Хабар</string>
+  <string name="contact_menu_remove">Жою</string>
+  <string name="contact_menu_contact_info">Контакт деректері</string>
+  <string name="suggested_contact_bottom_sheet_add_favorite_option">Таңдаулылар тізіміне қосу</string>
+  <string name="speed_dial_contacts_permission_description">Жылдам теру функциясын қосу үшін \"Контактілерге\" кіруге рұқсат беріңіз.</string>
+  <string name="speed_dial_turn_on_contacts_permission">Қосу</string>
+  <string name="speed_dial_no_contacts_description">Әлі ешбір контакт қосылған жоқ</string>
+  <string name="speed_dial_no_contacts_action_text">Таңдаулылар тізіміне қосу</string>
+  <string name="speed_dial_remove_favorites">Таңдаулылар тізімінен жою</string>
 </resources>
diff --git a/java/com/android/dialer/speeddial/res/values-km/strings.xml b/java/com/android/dialer/speeddial/res/values-km/strings.xml
index b0c27bc..ea4c035 100644
--- a/java/com/android/dialer/speeddial/res/values-km/strings.xml
+++ b/java/com/android/dialer/speeddial/res/values-km/strings.xml
@@ -1,20 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="favorites_header">សំណព្វ</string>
+  <string name="suggestions_header">ញឹកញាប់</string>
+  <string name="speed_dial_add_button_text">បញ្ចូល</string>
+  <string name="speed_dial_remember_this_choice">ចងចាំ​ជម្រើស​នេះ</string>
+  <string name="speed_dial_disambig_dialog_title">ជ្រើសរើស​ប្រភេទ​ទាំងអស់</string>
+  <string name="disambig_option_video_call">ការ​ហៅជា​វីដេអូ</string>
+  <string name="disambig_option_voice_call">ហៅទូរសព្ទ</string>
+  <string name="add_favorite_activity_title">បញ្ចូល​សំណព្វ</string>
+  <string name="contact_menu_voice_call">ការហៅ​ជា​សំឡេង</string>
+  <string name="contact_menu_video_call">ការ​ហៅជាវីដេអូ</string>
+  <string name="contact_menu_message">សារ</string>
+  <string name="contact_menu_remove">លុប</string>
+  <string name="contact_menu_contact_info">ព័ត៌មាន​ទំនាក់ទំនង</string>
+  <string name="suggested_contact_bottom_sheet_add_favorite_option">បញ្ចូលទៅ​​សំណព្វ</string>
+  <string name="speed_dial_contacts_permission_description">ដើម្បីបើកការហៅចេញ​រហ័ស សូមបើកការអនុញ្ញាតកម្មវិធីទំនាក់ទំនង។</string>
+  <string name="speed_dial_turn_on_contacts_permission">បើក</string>
+  <string name="speed_dial_no_contacts_description">អ្នក​មិនទាន់​​បាន​បញ្ចូល​​សំណព្វ​ណា​មួយ​នៅ​ឡើយ​ទេ</string>
+  <string name="speed_dial_no_contacts_action_text">បញ្ចូល​​សំណព្វ</string>
+  <string name="speed_dial_remove_favorites">ដក​​ចេញពី​សំណព្វ</string>
 </resources>
diff --git a/java/com/android/dialer/speeddial/res/values-kn/strings.xml b/java/com/android/dialer/speeddial/res/values-kn/strings.xml
index b0c27bc..26607d5 100644
--- a/java/com/android/dialer/speeddial/res/values-kn/strings.xml
+++ b/java/com/android/dialer/speeddial/res/values-kn/strings.xml
@@ -1,20 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="favorites_header">ಮೆಚ್ಚಿನವುಗಳು</string>
+  <string name="suggestions_header">ಪುನರಾವರ್ತನೆಗಳು</string>
+  <string name="speed_dial_add_button_text">ಸೇರಿಸಿ</string>
+  <string name="speed_dial_remember_this_choice">ಈ ಆಯ್ಕೆಯನ್ನು ನೆನಪಿಡಿ</string>
+  <string name="speed_dial_disambig_dialog_title">ಕರೆ ಪ್ರಕಾರವನ್ನು ಆಯ್ಕೆಮಾಡಿ</string>
+  <string name="disambig_option_video_call">ವೀಡಿಯೊ ಕರೆ</string>
+  <string name="disambig_option_voice_call">ಕರೆ</string>
+  <string name="add_favorite_activity_title">ಮೆಚ್ಚಿನದನ್ನು ಸೇರಿಸಿ</string>
+  <string name="contact_menu_voice_call">ಧ್ವನಿ ಕರೆ</string>
+  <string name="contact_menu_video_call">ವೀಡಿಯೊ ಕರೆ</string>
+  <string name="contact_menu_message">ಸಂದೇಶ</string>
+  <string name="contact_menu_remove">ತೆಗೆದುಹಾಕಿ</string>
+  <string name="contact_menu_contact_info">ಸಂಪರ್ಕ ಮಾಹಿತಿ</string>
+  <string name="suggested_contact_bottom_sheet_add_favorite_option">ಮೆಚ್ಚಿನದನ್ನು ಸೇರಿಸಿ</string>
+  <string name="speed_dial_contacts_permission_description">ಸ್ಪೀಡ್ ಡಯಲ್ ಸಕ್ರಿಯಗೊಳಿಸಲು, ಸಂಪರ್ಕಗಳ ಅನುಮತಿಯನ್ನು ಆನ್ ಮಾಡಿ.</string>
+  <string name="speed_dial_turn_on_contacts_permission">ಆನ್ ಮಾಡಿ</string>
+  <string name="speed_dial_no_contacts_description">ನೀವು ಇದುವರೆಗೂ ಯಾವುದೇ ಮೆಚ್ಚಿನವುಗಳನ್ನು ಸೇರಿಸಿಲ್ಲ.</string>
+  <string name="speed_dial_no_contacts_action_text">ಮೆಚ್ಚಿನದನ್ನು ಸೇರಿಸಿ</string>
+  <string name="speed_dial_remove_favorites">ಮೆಚ್ಚಿನವುಗಳಿಂದ ತೆಗೆದುಹಾಕಿ</string>
 </resources>
diff --git a/java/com/android/dialer/speeddial/res/values-ko/strings.xml b/java/com/android/dialer/speeddial/res/values-ko/strings.xml
index b0c27bc..7613be2 100644
--- a/java/com/android/dialer/speeddial/res/values-ko/strings.xml
+++ b/java/com/android/dialer/speeddial/res/values-ko/strings.xml
@@ -1,20 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="favorites_header">즐겨찾는 연락처</string>
+  <string name="suggestions_header">자주 연락하는 사람</string>
+  <string name="speed_dial_add_button_text">추가</string>
+  <string name="speed_dial_remember_this_choice">전화번호 선택사항 저장</string>
+  <string name="speed_dial_disambig_dialog_title">통화 유형 선택</string>
+  <string name="disambig_option_video_call">화상 통화 걸기</string>
+  <string name="disambig_option_voice_call">전화 걸기</string>
+  <string name="add_favorite_activity_title">즐겨찾기에 추가</string>
+  <string name="contact_menu_voice_call">음성 통화</string>
+  <string name="contact_menu_video_call">화상 통화</string>
+  <string name="contact_menu_message">메시지</string>
+  <string name="contact_menu_remove">삭제</string>
+  <string name="contact_menu_contact_info">연락처 정보</string>
+  <string name="suggested_contact_bottom_sheet_add_favorite_option">즐겨찾기에 추가</string>
+  <string name="speed_dial_contacts_permission_description">단축번호를 사용하려면 주소록 권한을 사용하도록 설정하세요.</string>
+  <string name="speed_dial_turn_on_contacts_permission">사용</string>
+  <string name="speed_dial_no_contacts_description">아직 즐겨찾기에 연락처를 추가하지 않았습니다.</string>
+  <string name="speed_dial_no_contacts_action_text">즐겨찾기에 추가</string>
+  <string name="speed_dial_remove_favorites">즐겨찾기에서 삭제</string>
 </resources>
diff --git a/java/com/android/dialer/speeddial/res/values-ky/strings.xml b/java/com/android/dialer/speeddial/res/values-ky/strings.xml
index b0c27bc..91d81e3 100644
--- a/java/com/android/dialer/speeddial/res/values-ky/strings.xml
+++ b/java/com/android/dialer/speeddial/res/values-ky/strings.xml
@@ -1,20 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="favorites_header">Сүйүктүүлөр</string>
+  <string name="suggestions_header">Көп байланышкандар</string>
+  <string name="speed_dial_add_button_text">Кошуу</string>
+  <string name="speed_dial_remember_this_choice">Бул тандоону эстеп калуу</string>
+  <string name="speed_dial_disambig_dialog_title">Чалуу түрүн тандоо</string>
+  <string name="disambig_option_video_call">Видео чалуу</string>
+  <string name="disambig_option_voice_call">Чалуу</string>
+  <string name="add_favorite_activity_title">Сүйүктүүлөрдү кошуу</string>
+  <string name="contact_menu_voice_call">Үн чалуу</string>
+  <string name="contact_menu_video_call">Видео чалуу</string>
+  <string name="contact_menu_message">Билдирүү</string>
+  <string name="contact_menu_remove">Өчүрүү</string>
+  <string name="contact_menu_contact_info">Байланыш маалыматы</string>
+  <string name="suggested_contact_bottom_sheet_add_favorite_option">Сүйүктүүлөргө кошуу</string>
+  <string name="speed_dial_contacts_permission_description">Тез терүүнү иштетүү үчүн, \"Байланыштар\" уруксатын күйгүзүңүз.</string>
+  <string name="speed_dial_turn_on_contacts_permission">Күйгүзүү</string>
+  <string name="speed_dial_no_contacts_description">Азырынча бир да сүйүктүү байланышыңыз жок</string>
+  <string name="speed_dial_no_contacts_action_text">Сүйүктүүлөргө кошуу</string>
+  <string name="speed_dial_remove_favorites">Сүйүктүүлөрдөн алып салуу</string>
 </resources>
diff --git a/java/com/android/dialer/speeddial/res/values-lo/strings.xml b/java/com/android/dialer/speeddial/res/values-lo/strings.xml
index b0c27bc..08efdfb 100644
--- a/java/com/android/dialer/speeddial/res/values-lo/strings.xml
+++ b/java/com/android/dialer/speeddial/res/values-lo/strings.xml
@@ -1,20 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="favorites_header">ລາຍການທີ່ມັກ</string>
+  <string name="suggestions_header">​ຄວາມ​ຖີ່</string>
+  <string name="speed_dial_add_button_text">ເພີ່ມ</string>
+  <string name="speed_dial_remember_this_choice">ຈື່ການເລືອກນີ້ໄວ້</string>
+  <string name="speed_dial_disambig_dialog_title">ເລືອກປະເພດການໂທ</string>
+  <string name="disambig_option_video_call">ໂທດ້ວຍວິດີໂອ</string>
+  <string name="disambig_option_voice_call">ໂທ</string>
+  <string name="add_favorite_activity_title">ເພີ່ມລາຍການທີ່ມັກ</string>
+  <string name="contact_menu_voice_call">ການໂທດ້ວຍສຽງ</string>
+  <string name="contact_menu_video_call">ໂທດ້ວຍວິດີໂອ</string>
+  <string name="contact_menu_message">ຂໍ້ຄວາມ</string>
+  <string name="contact_menu_remove">ລຶບ</string>
+  <string name="contact_menu_contact_info">ຂໍ້ມູນຕິດຕໍ່</string>
+  <string name="suggested_contact_bottom_sheet_add_favorite_option">ເພີ່ມ​ລາຍ​ການ​ທີ່​ມັກ</string>
+  <string name="speed_dial_contacts_permission_description">ເພື່ອເປີດໃຊ້ການໂທດ່ວນ, ໃຫ້ເປີດສິດອະນຸຍາດລາຍຊື່ຜູ້ຕິດຕໍ່ກ່ອນ</string>
+  <string name="speed_dial_turn_on_contacts_permission">ເປີດ</string>
+  <string name="speed_dial_no_contacts_description">ທ່ານຍັງບໍ່ໄດ້ເພີ່ມລາຍການທີ່ມັກເທື່ອ</string>
+  <string name="speed_dial_no_contacts_action_text">ເພີ່ມ​ລາຍ​ການ​ທີ່​ມັກ</string>
+  <string name="speed_dial_remove_favorites">ລຶບອອກຈາກລາຍການທີ່ມັກ</string>
 </resources>
diff --git a/java/com/android/dialer/speeddial/res/values-lt/strings.xml b/java/com/android/dialer/speeddial/res/values-lt/strings.xml
index b0c27bc..077d8ae 100644
--- a/java/com/android/dialer/speeddial/res/values-lt/strings.xml
+++ b/java/com/android/dialer/speeddial/res/values-lt/strings.xml
@@ -1,20 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="favorites_header">Mėgstamiausi</string>
+  <string name="suggestions_header">Dažniausiai naudojami</string>
+  <string name="speed_dial_add_button_text">Pridėti</string>
+  <string name="speed_dial_remember_this_choice">Prisiminti šį pasirinkimą</string>
+  <string name="speed_dial_disambig_dialog_title">Pasirinkite skambučio tipą</string>
+  <string name="disambig_option_video_call">Vaizdo skamb.</string>
+  <string name="disambig_option_voice_call">Skambinti</string>
+  <string name="add_favorite_activity_title">Įtraukti į mėgstamiausius</string>
+  <string name="contact_menu_voice_call">Balso skambutis</string>
+  <string name="contact_menu_video_call">Vaizdo skamb.</string>
+  <string name="contact_menu_message">Pranešimas</string>
+  <string name="contact_menu_remove">Pašalinti</string>
+  <string name="contact_menu_contact_info">Kont. inform.</string>
+  <string name="suggested_contact_bottom_sheet_add_favorite_option">Pridėti mėgstamiausią</string>
+  <string name="speed_dial_contacts_permission_description">Jei norite įgalinti spartųjį rinkimą, įjunkite Kontaktų leidimą.</string>
+  <string name="speed_dial_turn_on_contacts_permission">Įjungti</string>
+  <string name="speed_dial_no_contacts_description">Dar nepridėjote jokių mėgstamiausių</string>
+  <string name="speed_dial_no_contacts_action_text">Pridėti mėgstamiausią</string>
+  <string name="speed_dial_remove_favorites">Pašalinti iš mėgstamiausių</string>
 </resources>
diff --git a/java/com/android/dialer/speeddial/res/values-lv/strings.xml b/java/com/android/dialer/speeddial/res/values-lv/strings.xml
index b0c27bc..e98cd05 100644
--- a/java/com/android/dialer/speeddial/res/values-lv/strings.xml
+++ b/java/com/android/dialer/speeddial/res/values-lv/strings.xml
@@ -1,20 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="favorites_header">Izlase</string>
+  <string name="suggestions_header">Biežāk izmantotās</string>
+  <string name="speed_dial_add_button_text">Pievienot</string>
+  <string name="speed_dial_remember_this_choice">Atcerēties šo izvēli</string>
+  <string name="speed_dial_disambig_dialog_title">Zvana veida izvēle</string>
+  <string name="disambig_option_video_call">Videozvans</string>
+  <string name="disambig_option_voice_call">Zvans</string>
+  <string name="add_favorite_activity_title">Pievienošana izlasei</string>
+  <string name="contact_menu_voice_call">Balss zvans</string>
+  <string name="contact_menu_video_call">Videozvans</string>
+  <string name="contact_menu_message">Īsziņa</string>
+  <string name="contact_menu_remove">Noņemt</string>
+  <string name="contact_menu_contact_info">Kontaktinf.</string>
+  <string name="suggested_contact_bottom_sheet_add_favorite_option">Pievienot izlasei</string>
+  <string name="speed_dial_contacts_permission_description">Lai iespējotu ātros zvanus, ieslēdziet atļauju Kontaktpersonas.</string>
+  <string name="speed_dial_turn_on_contacts_permission">Ieslēgt</string>
+  <string name="speed_dial_no_contacts_description">Jūs vēl neesat pievienojis nevienu izlases vienumu.</string>
+  <string name="speed_dial_no_contacts_action_text">Pievienot izlasei</string>
+  <string name="speed_dial_remove_favorites">Noņemt no izlases</string>
 </resources>
diff --git a/java/com/android/dialer/speeddial/res/values-mk/strings.xml b/java/com/android/dialer/speeddial/res/values-mk/strings.xml
index b0c27bc..9a1f3e9 100644
--- a/java/com/android/dialer/speeddial/res/values-mk/strings.xml
+++ b/java/com/android/dialer/speeddial/res/values-mk/strings.xml
@@ -1,20 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="favorites_header">Омилени</string>
+  <string name="suggestions_header">Чести</string>
+  <string name="speed_dial_add_button_text">Додајте</string>
+  <string name="speed_dial_remember_this_choice">Запомни го изборов</string>
+  <string name="speed_dial_disambig_dialog_title">Изберете тип повик</string>
+  <string name="disambig_option_video_call">Видеоповик</string>
+  <string name="disambig_option_voice_call">Повикај</string>
+  <string name="add_favorite_activity_title">Додавање во омилени</string>
+  <string name="contact_menu_voice_call">Гласовен повик</string>
+  <string name="contact_menu_video_call">Видеоповик</string>
+  <string name="contact_menu_message">Порака</string>
+  <string name="contact_menu_remove">Отстрани</string>
+  <string name="contact_menu_contact_info">Инф. за контакт</string>
+  <string name="suggested_contact_bottom_sheet_add_favorite_option">Додај во омилени</string>
+  <string name="speed_dial_contacts_permission_description">За да овозможите брзо бирање, вклучете ја дозволата за контакти.</string>
+  <string name="speed_dial_turn_on_contacts_permission">Вклучи</string>
+  <string name="speed_dial_no_contacts_description">Сѐ уште немате додадено омилени</string>
+  <string name="speed_dial_no_contacts_action_text">Додај во омилени</string>
+  <string name="speed_dial_remove_favorites">Отстрани од омилени</string>
 </resources>
diff --git a/java/com/android/dialer/speeddial/res/values-ml/strings.xml b/java/com/android/dialer/speeddial/res/values-ml/strings.xml
index b0c27bc..eec847e 100644
--- a/java/com/android/dialer/speeddial/res/values-ml/strings.xml
+++ b/java/com/android/dialer/speeddial/res/values-ml/strings.xml
@@ -1,20 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="favorites_header">പ്രിയപ്പെട്ടവ</string>
+  <string name="suggestions_header">പതിവ് കോൺടാക്റ്റുകൾ</string>
+  <string name="speed_dial_add_button_text">ചേർക്കുക</string>
+  <string name="speed_dial_remember_this_choice">ഈ തിരഞ്ഞെടുക്കൽ ഓർക്കുക</string>
+  <string name="speed_dial_disambig_dialog_title">കോൾ തരം തിരഞ്ഞെടുക്കുക</string>
+  <string name="disambig_option_video_call">വീഡിയോ കോള്‍</string>
+  <string name="disambig_option_voice_call">വിളിക്കുക</string>
+  <string name="add_favorite_activity_title">പ്രിയപ്പെട്ടവ ചേർക്കുക</string>
+  <string name="contact_menu_voice_call">വോയ്‌സ് കോള്‍‌</string>
+  <string name="contact_menu_video_call">വീഡിയോ കോള്‍</string>
+  <string name="contact_menu_message">സന്ദേശം</string>
+  <string name="contact_menu_remove">നീക്കം ചെയ്യുക</string>
+  <string name="contact_menu_contact_info">ബന്ധപ്പെടാനുള്ള വിവരം</string>
+  <string name="suggested_contact_bottom_sheet_add_favorite_option">പ്രിയപ്പെട്ടത് ചേർക്കുക</string>
+  <string name="speed_dial_contacts_permission_description">സ്പീഡ് ഡയൽ പ്രവർത്തനക്ഷമാക്കുന്നതിന്, \'കോൺടാക്റ്റുകൾ\' അനുമതി ഓണാക്കുക.</string>
+  <string name="speed_dial_turn_on_contacts_permission">ഓണാക്കുക</string>
+  <string name="speed_dial_no_contacts_description">നിങ്ങൾ ഇതുവരെ പ്രിയപ്പെട്ടവ ചേർത്തിട്ടില്ല</string>
+  <string name="speed_dial_no_contacts_action_text">പ്രിയപ്പെട്ടത് ചേർക്കുക</string>
+  <string name="speed_dial_remove_favorites">പ്രിയപ്പെട്ടവയിൽ നിന്ന് നീക്കം ചെയ്യുക</string>
 </resources>
diff --git a/java/com/android/dialer/speeddial/res/values-mn/strings.xml b/java/com/android/dialer/speeddial/res/values-mn/strings.xml
index b0c27bc..fa7f247 100644
--- a/java/com/android/dialer/speeddial/res/values-mn/strings.xml
+++ b/java/com/android/dialer/speeddial/res/values-mn/strings.xml
@@ -1,20 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="favorites_header">Дуртай</string>
+  <string name="suggestions_header">Байнгын харилцагчид</string>
+  <string name="speed_dial_add_button_text">Нэмэх</string>
+  <string name="speed_dial_remember_this_choice">Энэ сонголтыг санах</string>
+  <string name="speed_dial_disambig_dialog_title">Дуудлагын төрөл сонгох</string>
+  <string name="disambig_option_video_call">Видео дуудлага</string>
+  <string name="disambig_option_voice_call">Залгах</string>
+  <string name="add_favorite_activity_title">Дуртай хүмүүст нэмэх</string>
+  <string name="contact_menu_voice_call">Дуудлага</string>
+  <string name="contact_menu_video_call">Видео дуудлага</string>
+  <string name="contact_menu_message">Зурвас</string>
+  <string name="contact_menu_remove">Хасах</string>
+  <string name="contact_menu_contact_info">Холбоо барих мэдээлэл</string>
+  <string name="suggested_contact_bottom_sheet_add_favorite_option">Дуртайг нэмэх</string>
+  <string name="speed_dial_contacts_permission_description">Түргэн залгалтыг идэвхжүүлэхийн тулд харилцагчийн зөвшөөрлийг идэвхжүүлнэ үү.</string>
+  <string name="speed_dial_turn_on_contacts_permission">Асаах</string>
+  <string name="speed_dial_no_contacts_description">Та одоогоор ямар ч дуртай зүйлс нэмээгүй байна</string>
+  <string name="speed_dial_no_contacts_action_text">Дуртай зүйлээ нэмэх</string>
+  <string name="speed_dial_remove_favorites">Дуртайгаас хасах</string>
 </resources>
diff --git a/java/com/android/dialer/speeddial/res/values-mr/strings.xml b/java/com/android/dialer/speeddial/res/values-mr/strings.xml
index b0c27bc..f43e7da 100644
--- a/java/com/android/dialer/speeddial/res/values-mr/strings.xml
+++ b/java/com/android/dialer/speeddial/res/values-mr/strings.xml
@@ -1,20 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="favorites_header">आवडीचे</string>
+  <string name="suggestions_header">वारंवार</string>
+  <string name="speed_dial_add_button_text">जोडा</string>
+  <string name="speed_dial_remember_this_choice">ही निवड लक्षात ठेवा</string>
+  <string name="speed_dial_disambig_dialog_title">कॉल प्रकार निवडा</string>
+  <string name="disambig_option_video_call">व्हिडिओ कॉल</string>
+  <string name="disambig_option_voice_call">कॉल करा</string>
+  <string name="add_favorite_activity_title">मनपसंत जोडा</string>
+  <string name="contact_menu_voice_call">व्हॉइस कॉल</string>
+  <string name="contact_menu_video_call">व्हिडिओ कॉल</string>
+  <string name="contact_menu_message">मेसेज</string>
+  <string name="contact_menu_remove">काढा</string>
+  <string name="contact_menu_contact_info">संपर्क माहिती</string>
+  <string name="suggested_contact_bottom_sheet_add_favorite_option">आवडीचे जोडा</string>
+  <string name="speed_dial_contacts_permission_description">स्पीड डायल सुरू करण्‍यासाठी, संपर्क परवानगी सुरू करा.</string>
+  <string name="speed_dial_turn_on_contacts_permission">सुरू करा</string>
+  <string name="speed_dial_no_contacts_description">तुम्ही अजून कोणतेही आवडीचे जोडलेले नाही</string>
+  <string name="speed_dial_no_contacts_action_text">आवडीचे जोडा</string>
+  <string name="speed_dial_remove_favorites">आवडीमधून काढा</string>
 </resources>
diff --git a/java/com/android/dialer/speeddial/res/values-ms/strings.xml b/java/com/android/dialer/speeddial/res/values-ms/strings.xml
index b0c27bc..6e24ccf 100644
--- a/java/com/android/dialer/speeddial/res/values-ms/strings.xml
+++ b/java/com/android/dialer/speeddial/res/values-ms/strings.xml
@@ -1,20 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="favorites_header">Kegemaran</string>
+  <string name="suggestions_header">Kerap</string>
+  <string name="speed_dial_add_button_text">Tambah</string>
+  <string name="speed_dial_remember_this_choice">Ingat pilihan ini</string>
+  <string name="speed_dial_disambig_dialog_title">Pilih jenis panggilan</string>
+  <string name="disambig_option_video_call">Panggilan video</string>
+  <string name="disambig_option_voice_call">Panggil</string>
+  <string name="add_favorite_activity_title">Tambah Kegemaran</string>
+  <string name="contact_menu_voice_call">Panggilan Suara</string>
+  <string name="contact_menu_video_call">Panggilan Video</string>
+  <string name="contact_menu_message">Mesej</string>
+  <string name="contact_menu_remove">Alih keluar</string>
+  <string name="contact_menu_contact_info">Mklmt hubungan</string>
+  <string name="suggested_contact_bottom_sheet_add_favorite_option">Tambahkan kegemaran</string>
+  <string name="speed_dial_contacts_permission_description">Untuk mendayakan dail cepat, hidupkan kebenaran Kenalan.</string>
+  <string name="speed_dial_turn_on_contacts_permission">Hidupkan</string>
+  <string name="speed_dial_no_contacts_description">Anda belum menambah sebarang kegemaran</string>
+  <string name="speed_dial_no_contacts_action_text">Tambahkan kegemaran</string>
+  <string name="speed_dial_remove_favorites">Alih keluar daripada kegemaran</string>
 </resources>
diff --git a/java/com/android/dialer/speeddial/res/values-my/strings.xml b/java/com/android/dialer/speeddial/res/values-my/strings.xml
index b0c27bc..e56690a 100644
--- a/java/com/android/dialer/speeddial/res/values-my/strings.xml
+++ b/java/com/android/dialer/speeddial/res/values-my/strings.xml
@@ -1,20 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="favorites_header">အကြိုက်ဆုံးများ</string>
+  <string name="suggestions_header">မကြာခဏ</string>
+  <string name="speed_dial_add_button_text">ထည့်ရန်</string>
+  <string name="speed_dial_remember_this_choice">ဤရွေးချယ်မှုကို မှတ်ထားပါ</string>
+  <string name="speed_dial_disambig_dialog_title">ခေါ်ဆိုမှု အမျိုးအစားကို ရွေးချယ်ပါ</string>
+  <string name="disambig_option_video_call">ဗီဒီယိုခေါ်ရန်</string>
+  <string name="disambig_option_voice_call">ဖုန်းခေါ်ရန်</string>
+  <string name="add_favorite_activity_title">အကြိုက်ဆုံးအဖြစ် ထည့်ခြင်း</string>
+  <string name="contact_menu_voice_call">အသံခေါ်ဆိုမှု</string>
+  <string name="contact_menu_video_call">ဗီဒီယိုခေါ်ဆိုမှု</string>
+  <string name="contact_menu_message">မက်ဆေ့ဂျ်</string>
+  <string name="contact_menu_remove">ဖယ်ရှားရန်</string>
+  <string name="contact_menu_contact_info">ဆက်သွယ်ရန် အချက်အလက်</string>
+  <string name="suggested_contact_bottom_sheet_add_favorite_option">အနှစ်သက်ဆုံးသို့ ပေါင်းထည့်ရန်</string>
+  <string name="speed_dial_contacts_permission_description">အမြန်ခေါ် နံပါတ်ကွက်ကို ဖွင့်ရန်၊ အဆက်အသွယ်ခွင့်ပြုချက်ကို ဖွင့်ပါ။</string>
+  <string name="speed_dial_turn_on_contacts_permission">ဖွင့်ရန်</string>
+  <string name="speed_dial_no_contacts_description">မည်သည့် အနှစ်သက်ဆုံးကိုမှ သင် မထည့်ရသေးပါ</string>
+  <string name="speed_dial_no_contacts_action_text">အနှစ်သက်ဆုံးသို့ ပေါင်းထည့်ရန်</string>
+  <string name="speed_dial_remove_favorites">စိတ်ကြိုက်များမှ ဖယ်ရှားပါ</string>
 </resources>
diff --git a/java/com/android/dialer/speeddial/res/values-nb/strings.xml b/java/com/android/dialer/speeddial/res/values-nb/strings.xml
index b0c27bc..ac666ee 100644
--- a/java/com/android/dialer/speeddial/res/values-nb/strings.xml
+++ b/java/com/android/dialer/speeddial/res/values-nb/strings.xml
@@ -1,20 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="favorites_header">Favoritter</string>
+  <string name="suggestions_header">Ofte brukte</string>
+  <string name="speed_dial_add_button_text">Legg til</string>
+  <string name="speed_dial_remember_this_choice">Husk dette valget</string>
+  <string name="speed_dial_disambig_dialog_title">Velg anropstype</string>
+  <string name="disambig_option_video_call">Ring med video</string>
+  <string name="disambig_option_voice_call">Ring</string>
+  <string name="add_favorite_activity_title">Legg til favoritt</string>
+  <string name="contact_menu_voice_call">Taleanrop</string>
+  <string name="contact_menu_video_call">Videoanrop</string>
+  <string name="contact_menu_message">Melding</string>
+  <string name="contact_menu_remove">Fjern</string>
+  <string name="contact_menu_contact_info">Kontaktinfo</string>
+  <string name="suggested_contact_bottom_sheet_add_favorite_option">Legg til favoritt</string>
+  <string name="speed_dial_contacts_permission_description">Slå på Kontakter-tillatelsen for å slå på hurtigoppringning.</string>
+  <string name="speed_dial_turn_on_contacts_permission">Slå på</string>
+  <string name="speed_dial_no_contacts_description">Du har ikke lagt til noen favoritter ennå</string>
+  <string name="speed_dial_no_contacts_action_text">Legg til favoritt</string>
+  <string name="speed_dial_remove_favorites">Fjern fra favoritter</string>
 </resources>
diff --git a/java/com/android/dialer/speeddial/res/values-ne/strings.xml b/java/com/android/dialer/speeddial/res/values-ne/strings.xml
index b0c27bc..103bea3 100644
--- a/java/com/android/dialer/speeddial/res/values-ne/strings.xml
+++ b/java/com/android/dialer/speeddial/res/values-ne/strings.xml
@@ -1,20 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="favorites_header">मन पर्ने कुराहरू</string>
+  <string name="suggestions_header">आवृत्ति</string>
+  <string name="speed_dial_add_button_text">थप्नुहोस्</string>
+  <string name="speed_dial_remember_this_choice">यो रोजाइ याद राख्नुहोला</string>
+  <string name="speed_dial_disambig_dialog_title">कलको प्रकार छनौट गर्नुहोस्</string>
+  <string name="disambig_option_video_call">भिडियो कल</string>
+  <string name="disambig_option_voice_call">कल</string>
+  <string name="add_favorite_activity_title">मनपर्नेमा थप्नुहोस्</string>
+  <string name="contact_menu_voice_call">भ्वाइस कल</string>
+  <string name="contact_menu_video_call">भिडियो कल</string>
+  <string name="contact_menu_message">सन्देश</string>
+  <string name="contact_menu_remove">हटाउनुहोस्</string>
+  <string name="contact_menu_contact_info">सम्पर्कबारे जानकारी</string>
+  <string name="suggested_contact_bottom_sheet_add_favorite_option">मन पर्ने सम्पर्कका रूपमा थप्नु…</string>
+  <string name="speed_dial_contacts_permission_description">स्पिड डायल सक्षम पार्न सम्पर्कहरूमाथिको अनुमति सक्रिय गर्नुहोस्।</string>
+  <string name="speed_dial_turn_on_contacts_permission">सक्रिय गर्नुहोस्</string>
+  <string name="speed_dial_no_contacts_description">तपाईंले अहिलेसम्म कुनै पनि मन पर्ने सम्पर्क थप्नुभएको छैन</string>
+  <string name="speed_dial_no_contacts_action_text">मन पर्ने सम्पर्क थप्नुहोस्</string>
+  <string name="speed_dial_remove_favorites">मन पर्ने कुराहरूबाट सम्पर्क ठेगाना हटाउनुहोस्</string>
 </resources>
diff --git a/java/com/android/dialer/speeddial/res/values-nl/strings.xml b/java/com/android/dialer/speeddial/res/values-nl/strings.xml
index b0c27bc..8d97b1b 100644
--- a/java/com/android/dialer/speeddial/res/values-nl/strings.xml
+++ b/java/com/android/dialer/speeddial/res/values-nl/strings.xml
@@ -1,20 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="favorites_header">Favorieten</string>
+  <string name="suggestions_header">Veelgebruikt</string>
+  <string name="speed_dial_add_button_text">Toevoegen</string>
+  <string name="speed_dial_remember_this_choice">Deze keuze onthouden</string>
+  <string name="speed_dial_disambig_dialog_title">Oproeptype kiezen</string>
+  <string name="disambig_option_video_call">Videogesprek</string>
+  <string name="disambig_option_voice_call">Bellen</string>
+  <string name="add_favorite_activity_title">Favoriet toevoegen</string>
+  <string name="contact_menu_voice_call">Spraakbericht</string>
+  <string name="contact_menu_video_call">Videogesprek</string>
+  <string name="contact_menu_message">Bericht</string>
+  <string name="contact_menu_remove">Verwijderen</string>
+  <string name="contact_menu_contact_info">Contactgegevens</string>
+  <string name="suggested_contact_bottom_sheet_add_favorite_option">Favoriet toevoegen</string>
+  <string name="speed_dial_contacts_permission_description">Als je de snelkeuzefunctie wilt inschakelen, schakel je de machtiging voor Contacten in.</string>
+  <string name="speed_dial_turn_on_contacts_permission">Inschakelen</string>
+  <string name="speed_dial_no_contacts_description">Je hebt nog geen favorieten toegevoegd</string>
+  <string name="speed_dial_no_contacts_action_text">Favoriet toevoegen</string>
+  <string name="speed_dial_remove_favorites">Verwijderen uit favorieten</string>
 </resources>
diff --git a/java/com/android/dialer/speeddial/res/values-no/strings.xml b/java/com/android/dialer/speeddial/res/values-no/strings.xml
index b0c27bc..ac666ee 100644
--- a/java/com/android/dialer/speeddial/res/values-no/strings.xml
+++ b/java/com/android/dialer/speeddial/res/values-no/strings.xml
@@ -1,20 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="favorites_header">Favoritter</string>
+  <string name="suggestions_header">Ofte brukte</string>
+  <string name="speed_dial_add_button_text">Legg til</string>
+  <string name="speed_dial_remember_this_choice">Husk dette valget</string>
+  <string name="speed_dial_disambig_dialog_title">Velg anropstype</string>
+  <string name="disambig_option_video_call">Ring med video</string>
+  <string name="disambig_option_voice_call">Ring</string>
+  <string name="add_favorite_activity_title">Legg til favoritt</string>
+  <string name="contact_menu_voice_call">Taleanrop</string>
+  <string name="contact_menu_video_call">Videoanrop</string>
+  <string name="contact_menu_message">Melding</string>
+  <string name="contact_menu_remove">Fjern</string>
+  <string name="contact_menu_contact_info">Kontaktinfo</string>
+  <string name="suggested_contact_bottom_sheet_add_favorite_option">Legg til favoritt</string>
+  <string name="speed_dial_contacts_permission_description">Slå på Kontakter-tillatelsen for å slå på hurtigoppringning.</string>
+  <string name="speed_dial_turn_on_contacts_permission">Slå på</string>
+  <string name="speed_dial_no_contacts_description">Du har ikke lagt til noen favoritter ennå</string>
+  <string name="speed_dial_no_contacts_action_text">Legg til favoritt</string>
+  <string name="speed_dial_remove_favorites">Fjern fra favoritter</string>
 </resources>
diff --git a/java/com/android/dialer/speeddial/res/values-pa/strings.xml b/java/com/android/dialer/speeddial/res/values-pa/strings.xml
index b0c27bc..8b25fbe 100644
--- a/java/com/android/dialer/speeddial/res/values-pa/strings.xml
+++ b/java/com/android/dialer/speeddial/res/values-pa/strings.xml
@@ -1,20 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="favorites_header">ਮਨਪਸੰਦ</string>
+  <string name="suggestions_header">ਆਮ ਸੰਪਰਕ</string>
+  <string name="speed_dial_add_button_text">ਸ਼ਾਮਲ ਕਰੋ</string>
+  <string name="speed_dial_remember_this_choice">ਇਹ ਚੋਣ ਯਾਦ ਰੱਖੋ</string>
+  <string name="speed_dial_disambig_dialog_title">ਕਾਲ ਦੀ ਕਿਸਮ ਚੁਣੋ</string>
+  <string name="disambig_option_video_call">ਵੀਡੀਓ ਕਾਲ</string>
+  <string name="disambig_option_voice_call">ਕਾਲ ਕਰੋ</string>
+  <string name="add_favorite_activity_title">ਮਨਪਸੰਦ ਵਜੋਂ ਸ਼ਾਮਲ ਕਰੋ</string>
+  <string name="contact_menu_voice_call">ਅਵਾਜ਼ੀ ਕਾਲ ਕਰੋ</string>
+  <string name="contact_menu_video_call">ਵੀਡੀਓ ਕਾਲ ਕਰੋ</string>
+  <string name="contact_menu_message">ਸੁਨੇਹਾ ਭੇਜੋ</string>
+  <string name="contact_menu_remove">ਹਟਾਓ</string>
+  <string name="contact_menu_contact_info">ਸੰਪਰਕ ਜਾਣਕਾਰੀ</string>
+  <string name="suggested_contact_bottom_sheet_add_favorite_option">ਮਨਪਸੰਦ ਵਜੋਂ ਸ਼ਾਮਲ ਕਰੋ</string>
+  <string name="speed_dial_contacts_permission_description">ਸਪੀਡ ਡਾਇਲ ਨੂੰ ਚਾਲੂ ਕਰਨ ਲਈ, ਸੰਪਰਕ ਇਜਾਜ਼ਤ ਨੂੰ ਚਾਲੂ ਕਰੋ।</string>
+  <string name="speed_dial_turn_on_contacts_permission">ਚਾਲੂ ਕਰੋ</string>
+  <string name="speed_dial_no_contacts_description">ਤੁਸੀਂ ਹਾਲੇ ਤੱਕ ਕੋਈ ਵੀ ਸੰਪਰਕ ਮਨਪਸੰਦ ਵਜੋਂ ਸ਼ਾਮਲ ਨਹੀਂ ਕੀਤਾ ਹੈ</string>
+  <string name="speed_dial_no_contacts_action_text">ਮਨਪਸੰਦ ਵਜੋਂ ਸ਼ਾਮਲ ਕਰੋ</string>
+  <string name="speed_dial_remove_favorites">ਮਨਪਸੰਦ ਵਿੱਚੋਂ ਹਟਾਓ</string>
 </resources>
diff --git a/java/com/android/dialer/speeddial/res/values-pl/strings.xml b/java/com/android/dialer/speeddial/res/values-pl/strings.xml
index b0c27bc..e799827 100644
--- a/java/com/android/dialer/speeddial/res/values-pl/strings.xml
+++ b/java/com/android/dialer/speeddial/res/values-pl/strings.xml
@@ -1,20 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="favorites_header">Ulubione</string>
+  <string name="suggestions_header">Częste kontakty</string>
+  <string name="speed_dial_add_button_text">Dodaj</string>
+  <string name="speed_dial_remember_this_choice">Zapamiętaj ten wybór</string>
+  <string name="speed_dial_disambig_dialog_title">Wybierz typ połączenia</string>
+  <string name="disambig_option_video_call">Rozmowa wideo</string>
+  <string name="disambig_option_voice_call">Zadzwoń</string>
+  <string name="add_favorite_activity_title">Dodaj do ulubionych</string>
+  <string name="contact_menu_voice_call">Rozmowa głosowa</string>
+  <string name="contact_menu_video_call">Rozmowa wideo</string>
+  <string name="contact_menu_message">SMS</string>
+  <string name="contact_menu_remove">Usuń</string>
+  <string name="contact_menu_contact_info">Dane kontaktowe</string>
+  <string name="suggested_contact_bottom_sheet_add_favorite_option">Dodaj do ulubionych</string>
+  <string name="speed_dial_contacts_permission_description">Aby umożliwić szybkie wybieranie, włącz uprawnienia Kontakty.</string>
+  <string name="speed_dial_turn_on_contacts_permission">Włącz</string>
+  <string name="speed_dial_no_contacts_description">Nie dodano jeszcze nic do ulubionych</string>
+  <string name="speed_dial_no_contacts_action_text">Dodaj do ulubionych</string>
+  <string name="speed_dial_remove_favorites">Usuń z ulubionych</string>
 </resources>
diff --git a/java/com/android/dialer/speeddial/res/values-pt-rBR/strings.xml b/java/com/android/dialer/speeddial/res/values-pt-rBR/strings.xml
index b0c27bc..f30b5a6 100644
--- a/java/com/android/dialer/speeddial/res/values-pt-rBR/strings.xml
+++ b/java/com/android/dialer/speeddial/res/values-pt-rBR/strings.xml
@@ -1,20 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="favorites_header">Favoritos</string>
+  <string name="suggestions_header">Frequentes</string>
+  <string name="speed_dial_add_button_text">Adicionar</string>
+  <string name="speed_dial_remember_this_choice">Lembrar desta escolha</string>
+  <string name="speed_dial_disambig_dialog_title">Escolher o tipo de chamada</string>
+  <string name="disambig_option_video_call">Videochamada</string>
+  <string name="disambig_option_voice_call">Ligar</string>
+  <string name="add_favorite_activity_title">Adicione como favorito</string>
+  <string name="contact_menu_voice_call">Chamada de voz</string>
+  <string name="contact_menu_video_call">Videochamada</string>
+  <string name="contact_menu_message">Mensagem</string>
+  <string name="contact_menu_remove">Remover</string>
+  <string name="contact_menu_contact_info">Contato</string>
+  <string name="suggested_contact_bottom_sheet_add_favorite_option">Adicionar como favorito</string>
+  <string name="speed_dial_contacts_permission_description">Para ativar a discagem rápida, ative a permissão para o app Contatos.</string>
+  <string name="speed_dial_turn_on_contacts_permission">Ativar</string>
+  <string name="speed_dial_no_contacts_description">Você ainda não adicionou favoritos</string>
+  <string name="speed_dial_no_contacts_action_text">Adicionar como favorito</string>
+  <string name="speed_dial_remove_favorites">Remover dos favoritos</string>
 </resources>
diff --git a/java/com/android/dialer/speeddial/res/values-pt-rPT/strings.xml b/java/com/android/dialer/speeddial/res/values-pt-rPT/strings.xml
index b0c27bc..3c839ff 100644
--- a/java/com/android/dialer/speeddial/res/values-pt-rPT/strings.xml
+++ b/java/com/android/dialer/speeddial/res/values-pt-rPT/strings.xml
@@ -1,20 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="favorites_header">Favoritos</string>
+  <string name="suggestions_header">Frequentes</string>
+  <string name="speed_dial_add_button_text">Adicionar</string>
+  <string name="speed_dial_remember_this_choice">Lembrar esta escolha</string>
+  <string name="speed_dial_disambig_dialog_title">Escolha o tipo de chamada</string>
+  <string name="disambig_option_video_call">Videochamada</string>
+  <string name="disambig_option_voice_call">Ligar</string>
+  <string name="add_favorite_activity_title">Adicionar favorito</string>
+  <string name="contact_menu_voice_call">Chamada de Voz</string>
+  <string name="contact_menu_video_call">Videochamada</string>
+  <string name="contact_menu_message">Mensagem</string>
+  <string name="contact_menu_remove">Remover</string>
+  <string name="contact_menu_contact_info">Info. contacto</string>
+  <string name="suggested_contact_bottom_sheet_add_favorite_option">Adicionar favorito</string>
+  <string name="speed_dial_contacts_permission_description">Para ativar a marcação rápida, ative a autorização Contactos.</string>
+  <string name="speed_dial_turn_on_contacts_permission">Ativar</string>
+  <string name="speed_dial_no_contacts_description">Não adicionou ainda nenhum favorito</string>
+  <string name="speed_dial_no_contacts_action_text">Adicionar favorito</string>
+  <string name="speed_dial_remove_favorites">Remover dos favoritos</string>
 </resources>
diff --git a/java/com/android/dialer/speeddial/res/values-pt/strings.xml b/java/com/android/dialer/speeddial/res/values-pt/strings.xml
index b0c27bc..f30b5a6 100644
--- a/java/com/android/dialer/speeddial/res/values-pt/strings.xml
+++ b/java/com/android/dialer/speeddial/res/values-pt/strings.xml
@@ -1,20 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="favorites_header">Favoritos</string>
+  <string name="suggestions_header">Frequentes</string>
+  <string name="speed_dial_add_button_text">Adicionar</string>
+  <string name="speed_dial_remember_this_choice">Lembrar desta escolha</string>
+  <string name="speed_dial_disambig_dialog_title">Escolher o tipo de chamada</string>
+  <string name="disambig_option_video_call">Videochamada</string>
+  <string name="disambig_option_voice_call">Ligar</string>
+  <string name="add_favorite_activity_title">Adicione como favorito</string>
+  <string name="contact_menu_voice_call">Chamada de voz</string>
+  <string name="contact_menu_video_call">Videochamada</string>
+  <string name="contact_menu_message">Mensagem</string>
+  <string name="contact_menu_remove">Remover</string>
+  <string name="contact_menu_contact_info">Contato</string>
+  <string name="suggested_contact_bottom_sheet_add_favorite_option">Adicionar como favorito</string>
+  <string name="speed_dial_contacts_permission_description">Para ativar a discagem rápida, ative a permissão para o app Contatos.</string>
+  <string name="speed_dial_turn_on_contacts_permission">Ativar</string>
+  <string name="speed_dial_no_contacts_description">Você ainda não adicionou favoritos</string>
+  <string name="speed_dial_no_contacts_action_text">Adicionar como favorito</string>
+  <string name="speed_dial_remove_favorites">Remover dos favoritos</string>
 </resources>
diff --git a/java/com/android/dialer/speeddial/res/values-ro/strings.xml b/java/com/android/dialer/speeddial/res/values-ro/strings.xml
index b0c27bc..2891637 100644
--- a/java/com/android/dialer/speeddial/res/values-ro/strings.xml
+++ b/java/com/android/dialer/speeddial/res/values-ro/strings.xml
@@ -1,20 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="favorites_header">Preferate</string>
+  <string name="suggestions_header">Frecvente</string>
+  <string name="speed_dial_add_button_text">Adăugați</string>
+  <string name="speed_dial_remember_this_choice">Rețineți această alegere</string>
+  <string name="speed_dial_disambig_dialog_title">Alegeți tipul de apel</string>
+  <string name="disambig_option_video_call">Apel video</string>
+  <string name="disambig_option_voice_call">Apelați</string>
+  <string name="add_favorite_activity_title">Adăugați la preferate</string>
+  <string name="contact_menu_voice_call">Apel vocal</string>
+  <string name="contact_menu_video_call">Apel video</string>
+  <string name="contact_menu_message">Mesaj</string>
+  <string name="contact_menu_remove">Eliminați</string>
+  <string name="contact_menu_contact_info">Informații</string>
+  <string name="suggested_contact_bottom_sheet_add_favorite_option">Adăugați la preferate</string>
+  <string name="speed_dial_contacts_permission_description">Pentru a activa apelarea rapidă, activați permisiunea pentru Agendă.</string>
+  <string name="speed_dial_turn_on_contacts_permission">Activați</string>
+  <string name="speed_dial_no_contacts_description">Nu ați adăugat nicio persoană preferată încă.</string>
+  <string name="speed_dial_no_contacts_action_text">Adăugați la preferate</string>
+  <string name="speed_dial_remove_favorites">Eliminați din preferate</string>
 </resources>
diff --git a/java/com/android/dialer/speeddial/res/values-ru/strings.xml b/java/com/android/dialer/speeddial/res/values-ru/strings.xml
index b0c27bc..0b8e6be 100644
--- a/java/com/android/dialer/speeddial/res/values-ru/strings.xml
+++ b/java/com/android/dialer/speeddial/res/values-ru/strings.xml
@@ -1,20 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="favorites_header">Избранные</string>
+  <string name="suggestions_header">Частые</string>
+  <string name="speed_dial_add_button_text">Добавить</string>
+  <string name="speed_dial_remember_this_choice">Запомнить выбор</string>
+  <string name="speed_dial_disambig_dialog_title">Укажите тип вызова</string>
+  <string name="disambig_option_video_call">Начать видеочат</string>
+  <string name="disambig_option_voice_call">Позвонить</string>
+  <string name="add_favorite_activity_title">Добавьте в избранные</string>
+  <string name="contact_menu_voice_call">Голосовой вызов</string>
+  <string name="contact_menu_video_call">Видеовызов</string>
+  <string name="contact_menu_message">Написать</string>
+  <string name="contact_menu_remove">Удалить</string>
+  <string name="contact_menu_contact_info">Данные контакта</string>
+  <string name="suggested_contact_bottom_sheet_add_favorite_option">Добавить в избранное</string>
+  <string name="speed_dial_contacts_permission_description">Чтобы настроить быстрый набор, предоставьте приложению разрешение \"Контакты\".</string>
+  <string name="speed_dial_turn_on_contacts_permission">Предоставить</string>
+  <string name="speed_dial_no_contacts_description">У вас ещё нет избранных контактов.</string>
+  <string name="speed_dial_no_contacts_action_text">Добавить в избранное</string>
+  <string name="speed_dial_remove_favorites">Удалить из избранного</string>
 </resources>
diff --git a/java/com/android/dialer/speeddial/res/values-si/strings.xml b/java/com/android/dialer/speeddial/res/values-si/strings.xml
index b0c27bc..a3cb616 100644
--- a/java/com/android/dialer/speeddial/res/values-si/strings.xml
+++ b/java/com/android/dialer/speeddial/res/values-si/strings.xml
@@ -1,20 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="favorites_header">ප්‍රියතම</string>
+  <string name="suggestions_header">නිතරම</string>
+  <string name="speed_dial_add_button_text">එක් කරන්න</string>
+  <string name="speed_dial_remember_this_choice">මෙම තේරීම මතක තබා ගන්න</string>
+  <string name="speed_dial_disambig_dialog_title">ඇමතුම් වර්ගය තෝරන්න</string>
+  <string name="disambig_option_video_call">වීඩියෝ ඇමතුම</string>
+  <string name="disambig_option_voice_call">අමතන්න</string>
+  <string name="add_favorite_activity_title">ප්‍රියතම දේ එක් කරන්න</string>
+  <string name="contact_menu_voice_call">හඬ ඇමතුම</string>
+  <string name="contact_menu_video_call">වීඩියෝ ඇමතුම</string>
+  <string name="contact_menu_message">පණිවිඩය</string>
+  <string name="contact_menu_remove">ඉවත් කරන්න</string>
+  <string name="contact_menu_contact_info">සම්බන්ධතා තතු</string>
+  <string name="suggested_contact_bottom_sheet_add_favorite_option">ප්‍රියතම එක් කරන්න</string>
+  <string name="speed_dial_contacts_permission_description">වේග ඩයල් කිරීම සබල කිරීමට, සම්බන්ධතා අවසරය ක්‍රියාත්මක කරන්න.</string>
+  <string name="speed_dial_turn_on_contacts_permission">ක්‍රියාත්මක කරන්න</string>
+  <string name="speed_dial_no_contacts_description">ඔබ තවම ප්‍රියතම එක් කර නැත</string>
+  <string name="speed_dial_no_contacts_action_text">ප්‍රියතම එක් කරන්න</string>
+  <string name="speed_dial_remove_favorites">ප්‍රියතම වෙතින් ඉවත් කරන්න</string>
 </resources>
diff --git a/java/com/android/dialer/speeddial/res/values-sk/strings.xml b/java/com/android/dialer/speeddial/res/values-sk/strings.xml
index b0c27bc..e30fc45 100644
--- a/java/com/android/dialer/speeddial/res/values-sk/strings.xml
+++ b/java/com/android/dialer/speeddial/res/values-sk/strings.xml
@@ -1,20 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="favorites_header">Obľúbené</string>
+  <string name="suggestions_header">Často kontaktované osoby</string>
+  <string name="speed_dial_add_button_text">Pridať</string>
+  <string name="speed_dial_remember_this_choice">Zapamätať si túto voľbu</string>
+  <string name="speed_dial_disambig_dialog_title">Vyberte typ hovoru</string>
+  <string name="disambig_option_video_call">Videohovor</string>
+  <string name="disambig_option_voice_call">Volať</string>
+  <string name="add_favorite_activity_title">Pridajte obľúbený kontakt</string>
+  <string name="contact_menu_voice_call">Hlasový hovor</string>
+  <string name="contact_menu_video_call">Videohovor</string>
+  <string name="contact_menu_message">Správa</string>
+  <string name="contact_menu_remove">Odstrániť</string>
+  <string name="contact_menu_contact_info">Kontaktné údaje</string>
+  <string name="suggested_contact_bottom_sheet_add_favorite_option">Pridať medzi obľúbené</string>
+  <string name="speed_dial_contacts_permission_description">Ak chcete aktivovať rýchlu voľbu, zapnite povolenie Kontakty.</string>
+  <string name="speed_dial_turn_on_contacts_permission">Zapnúť</string>
+  <string name="speed_dial_no_contacts_description">Zatiaľ ste nepridali žiadne obľúbené kontakty</string>
+  <string name="speed_dial_no_contacts_action_text">Pridať obľúbené</string>
+  <string name="speed_dial_remove_favorites">Odobrať z obľúbených</string>
 </resources>
diff --git a/java/com/android/dialer/speeddial/res/values-sl/strings.xml b/java/com/android/dialer/speeddial/res/values-sl/strings.xml
index b0c27bc..0c7982a 100644
--- a/java/com/android/dialer/speeddial/res/values-sl/strings.xml
+++ b/java/com/android/dialer/speeddial/res/values-sl/strings.xml
@@ -1,20 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="favorites_header">Priljubljeno</string>
+  <string name="suggestions_header">Pogosti</string>
+  <string name="speed_dial_add_button_text">Dodaj</string>
+  <string name="speed_dial_remember_this_choice">Zapomni si to izbiro</string>
+  <string name="speed_dial_disambig_dialog_title">Izberite vrsto klica</string>
+  <string name="disambig_option_video_call">Videoklic</string>
+  <string name="disambig_option_voice_call">Klic</string>
+  <string name="add_favorite_activity_title">Dodajte med priljubljene</string>
+  <string name="contact_menu_voice_call">Glasovni klic</string>
+  <string name="contact_menu_video_call">Videoklic</string>
+  <string name="contact_menu_message">Sporočilo</string>
+  <string name="contact_menu_remove">Odstrani</string>
+  <string name="contact_menu_contact_info">Podatki za stik</string>
+  <string name="suggested_contact_bottom_sheet_add_favorite_option">Dodaj med priljubljene</string>
+  <string name="speed_dial_contacts_permission_description">Če želite omogočiti hitro klicanje, vklopite dovoljenje za stike.</string>
+  <string name="speed_dial_turn_on_contacts_permission">Vklopi</string>
+  <string name="speed_dial_no_contacts_description">Dodali niste še nobenega priljubljenega</string>
+  <string name="speed_dial_no_contacts_action_text">Dodaj med priljubljene</string>
+  <string name="speed_dial_remove_favorites">Odstrani iz priljubljenih</string>
 </resources>
diff --git a/java/com/android/dialer/speeddial/res/values-sq/strings.xml b/java/com/android/dialer/speeddial/res/values-sq/strings.xml
index b0c27bc..8fa0ff2 100644
--- a/java/com/android/dialer/speeddial/res/values-sq/strings.xml
+++ b/java/com/android/dialer/speeddial/res/values-sq/strings.xml
@@ -1,20 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="favorites_header">Të preferuarat</string>
+  <string name="suggestions_header">Të shpeshta</string>
+  <string name="speed_dial_add_button_text">Shto</string>
+  <string name="speed_dial_remember_this_choice">Kujtoje këtë zgjedhje</string>
+  <string name="speed_dial_disambig_dialog_title">Zgjidh llojin e telefonatës</string>
+  <string name="disambig_option_video_call">Telefono me video</string>
+  <string name="disambig_option_voice_call">Telefono</string>
+  <string name="add_favorite_activity_title">Shto si të preferuar</string>
+  <string name="contact_menu_voice_call">Tel. zanore</string>
+  <string name="contact_menu_video_call">Tel. me video</string>
+  <string name="contact_menu_message">Mesazh</string>
+  <string name="contact_menu_remove">Hiq</string>
+  <string name="contact_menu_contact_info">Info. kontakti</string>
+  <string name="suggested_contact_bottom_sheet_add_favorite_option">Shto si të preferuar</string>
+  <string name="speed_dial_contacts_permission_description">Për të aktivizuar telefonatën e shpejtë, aktivizo lejen e \"Kontakteve\".</string>
+  <string name="speed_dial_turn_on_contacts_permission">Aktivizo</string>
+  <string name="speed_dial_no_contacts_description">Nuk ke shtuar ende asnjë të preferuar</string>
+  <string name="speed_dial_no_contacts_action_text">Shto si të preferuar</string>
+  <string name="speed_dial_remove_favorites">Hiq nga të preferuarat</string>
 </resources>
diff --git a/java/com/android/dialer/speeddial/res/values-sr/strings.xml b/java/com/android/dialer/speeddial/res/values-sr/strings.xml
index b0c27bc..1a5324e 100644
--- a/java/com/android/dialer/speeddial/res/values-sr/strings.xml
+++ b/java/com/android/dialer/speeddial/res/values-sr/strings.xml
@@ -1,20 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="favorites_header">Омиљени</string>
+  <string name="suggestions_header">Често контактирани</string>
+  <string name="speed_dial_add_button_text">Додај</string>
+  <string name="speed_dial_remember_this_choice">Запамти овај избор</string>
+  <string name="speed_dial_disambig_dialog_title">Изаберите тип позива</string>
+  <string name="disambig_option_video_call">Видео позив</string>
+  <string name="disambig_option_voice_call">Позови</string>
+  <string name="add_favorite_activity_title">Додајте омиљени контакт</string>
+  <string name="contact_menu_voice_call">Аудио позив</string>
+  <string name="contact_menu_video_call">Видео позив</string>
+  <string name="contact_menu_message">Пошаљи SMS</string>
+  <string name="contact_menu_remove">Уклони</string>
+  <string name="contact_menu_contact_info">Контакт подаци</string>
+  <string name="suggested_contact_bottom_sheet_add_favorite_option">Додај омиљени</string>
+  <string name="speed_dial_contacts_permission_description">Да бисте омогућили брзо бирање, укључите дозволу за Контакте.</string>
+  <string name="speed_dial_turn_on_contacts_permission">Укључи</string>
+  <string name="speed_dial_no_contacts_description">Још увек нисте додали омиљене контакте</string>
+  <string name="speed_dial_no_contacts_action_text">Додај омиљени контакт</string>
+  <string name="speed_dial_remove_favorites">Уклоните из омиљених контаката</string>
 </resources>
diff --git a/java/com/android/dialer/speeddial/res/values-sv/strings.xml b/java/com/android/dialer/speeddial/res/values-sv/strings.xml
index b0c27bc..6b893a6 100644
--- a/java/com/android/dialer/speeddial/res/values-sv/strings.xml
+++ b/java/com/android/dialer/speeddial/res/values-sv/strings.xml
@@ -1,20 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="favorites_header">Favoriter</string>
+  <string name="suggestions_header">Vanliga</string>
+  <string name="speed_dial_add_button_text">Lägg till</string>
+  <string name="speed_dial_remember_this_choice">Kom ihåg det här valet</string>
+  <string name="speed_dial_disambig_dialog_title">Välj samtalstyp</string>
+  <string name="disambig_option_video_call">Videosamtal</string>
+  <string name="disambig_option_voice_call">Ring</string>
+  <string name="add_favorite_activity_title">Lägg till favorit</string>
+  <string name="contact_menu_voice_call">Röstsamtal</string>
+  <string name="contact_menu_video_call">Videosamtal</string>
+  <string name="contact_menu_message">Skicka sms</string>
+  <string name="contact_menu_remove">Ta bort</string>
+  <string name="contact_menu_contact_info">Kontaktinfo</string>
+  <string name="suggested_contact_bottom_sheet_add_favorite_option">Lägg till favorit</string>
+  <string name="speed_dial_contacts_permission_description">Du måste aktivera behörigheten Kontakter för att kunna använda snabbuppringning.</string>
+  <string name="speed_dial_turn_on_contacts_permission">Aktivera</string>
+  <string name="speed_dial_no_contacts_description">Du har inte lagt till några favoriter än</string>
+  <string name="speed_dial_no_contacts_action_text">Lägg till favorit</string>
+  <string name="speed_dial_remove_favorites">Ta bort från Favoriter</string>
 </resources>
diff --git a/java/com/android/dialer/speeddial/res/values-sw/strings.xml b/java/com/android/dialer/speeddial/res/values-sw/strings.xml
index b0c27bc..65f000b 100644
--- a/java/com/android/dialer/speeddial/res/values-sw/strings.xml
+++ b/java/com/android/dialer/speeddial/res/values-sw/strings.xml
@@ -1,20 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="favorites_header">Unazopendelea</string>
+  <string name="suggestions_header">Za mara kwa mara</string>
+  <string name="speed_dial_add_button_text">Ongeza</string>
+  <string name="speed_dial_remember_this_choice">Kumbuka chaguo hili</string>
+  <string name="speed_dial_disambig_dialog_title">Chagua aina ya simu</string>
+  <string name="disambig_option_video_call">Simu ya video</string>
+  <string name="disambig_option_voice_call">Simu</string>
+  <string name="add_favorite_activity_title">Ongeza Kipendwa</string>
+  <string name="contact_menu_voice_call">Simu ya Sauti</string>
+  <string name="contact_menu_video_call">Simu ya Video</string>
+  <string name="contact_menu_message">SMS</string>
+  <string name="contact_menu_remove">Ondoa</string>
+  <string name="contact_menu_contact_info">Maelezo ya mawasiliano</string>
+  <string name="suggested_contact_bottom_sheet_add_favorite_option">Ongeza kipendwa</string>
+  <string name="speed_dial_contacts_permission_description">Ili kuwasha kipengele cha unaowasiliana nao zaidi, washa ruhusa ya Anwani.</string>
+  <string name="speed_dial_turn_on_contacts_permission">Washa</string>
+  <string name="speed_dial_no_contacts_description">Bado hujaongeza anwani zozote unazowasiliana nazo sana</string>
+  <string name="speed_dial_no_contacts_action_text">Ongeza anwani unayowasiliana nayo sana</string>
+  <string name="speed_dial_remove_favorites">Ondoa kwenye vipendwa</string>
 </resources>
diff --git a/java/com/android/dialer/speeddial/res/values-ta/strings.xml b/java/com/android/dialer/speeddial/res/values-ta/strings.xml
index b0c27bc..dc44272 100644
--- a/java/com/android/dialer/speeddial/res/values-ta/strings.xml
+++ b/java/com/android/dialer/speeddial/res/values-ta/strings.xml
@@ -1,20 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="favorites_header">பிடித்தவை</string>
+  <string name="suggestions_header">அடிக்கடித் தொடர்புகொண்டவர்கள்</string>
+  <string name="speed_dial_add_button_text">சேர்</string>
+  <string name="speed_dial_remember_this_choice">இந்த விருப்பத்தை நினைவில்கொள்</string>
+  <string name="speed_dial_disambig_dialog_title">அழைப்பு வகையைத் தேர்வுசெய்யவும்</string>
+  <string name="disambig_option_video_call">வீடியோவில் அழை</string>
+  <string name="disambig_option_voice_call">அழை</string>
+  <string name="add_favorite_activity_title">பிடித்தவர்களில் சேர்</string>
+  <string name="contact_menu_voice_call">குரல் அழைப்பு</string>
+  <string name="contact_menu_video_call">வீடியோ அழைப்பு</string>
+  <string name="contact_menu_message">செய்தி</string>
+  <string name="contact_menu_remove">அகற்று</string>
+  <string name="contact_menu_contact_info">தொடர்புத் தகவல்</string>
+  <string name="suggested_contact_bottom_sheet_add_favorite_option">பிடித்தவர்களில் சேர்</string>
+  <string name="speed_dial_contacts_permission_description">விரைவு டயலை இயக்க, தொடர்புகள் அனுமதியை இயக்கவும்.</string>
+  <string name="speed_dial_turn_on_contacts_permission">இயக்கு</string>
+  <string name="speed_dial_no_contacts_description">பிடித்தவர்கள் எவரையும் நீங்கள் இதுவரை சேர்க்கவில்லை</string>
+  <string name="speed_dial_no_contacts_action_text">பிடித்தவர்களில் சேர்</string>
+  <string name="speed_dial_remove_favorites">பிடித்தவையிலிருந்து அகற்றும்</string>
 </resources>
diff --git a/java/com/android/dialer/speeddial/res/values-te/strings.xml b/java/com/android/dialer/speeddial/res/values-te/strings.xml
index b0c27bc..3a0c0f5 100644
--- a/java/com/android/dialer/speeddial/res/values-te/strings.xml
+++ b/java/com/android/dialer/speeddial/res/values-te/strings.xml
@@ -1,20 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="favorites_header">ఇష్టమైనవి</string>
+  <string name="suggestions_header">తరచుగా సంప్రదించినవి</string>
+  <string name="speed_dial_add_button_text">జోడించు</string>
+  <string name="speed_dial_remember_this_choice">ఈ ఎంపికను గుర్తుంచుకో</string>
+  <string name="speed_dial_disambig_dialog_title">కాల్ రకాన్ని ఎంచుకోండి</string>
+  <string name="disambig_option_video_call">వీడియో కాల్</string>
+  <string name="disambig_option_voice_call">కాల్</string>
+  <string name="add_favorite_activity_title">ఇష్టమైనది జోడించండి</string>
+  <string name="contact_menu_voice_call">వాయిస్ కాల్</string>
+  <string name="contact_menu_video_call">వీడియో కాల్</string>
+  <string name="contact_menu_message">సందేశం</string>
+  <string name="contact_menu_remove">తీసివేయి</string>
+  <string name="contact_menu_contact_info">సంప్రదింపు సమాచారం</string>
+  <string name="suggested_contact_bottom_sheet_add_favorite_option">ఇష్టమైనది జోడించు</string>
+  <string name="speed_dial_contacts_permission_description">స్పీడ్ డయల్‌ను ప్రారంభించడానికి, పరిచయాల అనుమతిని ఆన్ చేయండి.</string>
+  <string name="speed_dial_turn_on_contacts_permission">ఆన్ చేయి</string>
+  <string name="speed_dial_no_contacts_description">మీరు ఇంకా ఇష్టమైనవి జోడించలేదు.</string>
+  <string name="speed_dial_no_contacts_action_text">ఇష్టమైనవి జోడించు</string>
+  <string name="speed_dial_remove_favorites">ఇష్టమైనవాటి నుండి తీసివేయండి</string>
 </resources>
diff --git a/java/com/android/dialer/speeddial/res/values-th/strings.xml b/java/com/android/dialer/speeddial/res/values-th/strings.xml
index b0c27bc..8c4577f 100644
--- a/java/com/android/dialer/speeddial/res/values-th/strings.xml
+++ b/java/com/android/dialer/speeddial/res/values-th/strings.xml
@@ -1,20 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="favorites_header">รายการโปรด</string>
+  <string name="suggestions_header">ผู้ที่ติดต่อบ่อย</string>
+  <string name="speed_dial_add_button_text">เพิ่ม</string>
+  <string name="speed_dial_remember_this_choice">จำตัวเลือกนี้</string>
+  <string name="speed_dial_disambig_dialog_title">เลือกประเภทการโทร</string>
+  <string name="disambig_option_video_call">วิดีโอคอล</string>
+  <string name="disambig_option_voice_call">โทร</string>
+  <string name="add_favorite_activity_title">เพิ่มรายการโปรด</string>
+  <string name="contact_menu_voice_call">การโทรด้วยเสียง</string>
+  <string name="contact_menu_video_call">วิดีโอคอล</string>
+  <string name="contact_menu_message">ข้อความ</string>
+  <string name="contact_menu_remove">ลบ</string>
+  <string name="contact_menu_contact_info">ข้อมูลติดต่อ</string>
+  <string name="suggested_contact_bottom_sheet_add_favorite_option">เพิ่มรายการโปรด</string>
+  <string name="speed_dial_contacts_permission_description">หากต้องการเปิดใช้การโทรด่วน ให้เปิดสิทธิ์เข้าถึงรายชื่อติดต่อ</string>
+  <string name="speed_dial_turn_on_contacts_permission">เปิด</string>
+  <string name="speed_dial_no_contacts_description">คุณยังไม่ได้เพิ่มรายการโปรดใดๆ</string>
+  <string name="speed_dial_no_contacts_action_text">เพิ่มรายการโปรด</string>
+  <string name="speed_dial_remove_favorites">นำออกจากรายการโปรด</string>
 </resources>
diff --git a/java/com/android/dialer/speeddial/res/values-tl/strings.xml b/java/com/android/dialer/speeddial/res/values-tl/strings.xml
index b0c27bc..c44051d 100644
--- a/java/com/android/dialer/speeddial/res/values-tl/strings.xml
+++ b/java/com/android/dialer/speeddial/res/values-tl/strings.xml
@@ -1,20 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="favorites_header">Mga Paborito</string>
+  <string name="suggestions_header">Mga madalas kontakin</string>
+  <string name="speed_dial_add_button_text">Magdagdag</string>
+  <string name="speed_dial_remember_this_choice">Tandaan ang pagpipiliang ito</string>
+  <string name="speed_dial_disambig_dialog_title">Piliin ang uri ng tawag</string>
+  <string name="disambig_option_video_call">Video call</string>
+  <string name="disambig_option_voice_call">Tawag</string>
+  <string name="add_favorite_activity_title">Magdagdag ng Paborito</string>
+  <string name="contact_menu_voice_call">Voice Call</string>
+  <string name="contact_menu_video_call">Video Call</string>
+  <string name="contact_menu_message">Mensahe</string>
+  <string name="contact_menu_remove">Alisin</string>
+  <string name="contact_menu_contact_info">Info sa pagkontak</string>
+  <string name="suggested_contact_bottom_sheet_add_favorite_option">Magdagdag ng paborito</string>
+  <string name="speed_dial_contacts_permission_description">Para i-enable ang speed dial, i-on ang pahintulot ng Mga Contact.</string>
+  <string name="speed_dial_turn_on_contacts_permission">I-on</string>
+  <string name="speed_dial_no_contacts_description">Hindi ka pa nagdaragdag ng anumang paborito</string>
+  <string name="speed_dial_no_contacts_action_text">Magdagdag ng paborito</string>
+  <string name="speed_dial_remove_favorites">Alisin sa mga paborito</string>
 </resources>
diff --git a/java/com/android/dialer/speeddial/res/values-tr/strings.xml b/java/com/android/dialer/speeddial/res/values-tr/strings.xml
index b0c27bc..288a2aa 100644
--- a/java/com/android/dialer/speeddial/res/values-tr/strings.xml
+++ b/java/com/android/dialer/speeddial/res/values-tr/strings.xml
@@ -1,20 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="favorites_header">Favoriler</string>
+  <string name="suggestions_header">Sık görüşülenler</string>
+  <string name="speed_dial_add_button_text">Ekle</string>
+  <string name="speed_dial_remember_this_choice">Bu tercihi hatırla</string>
+  <string name="speed_dial_disambig_dialog_title">Çağrı türünü seçin</string>
+  <string name="disambig_option_video_call">Görünt. görüşm.</string>
+  <string name="disambig_option_voice_call">Telefon et</string>
+  <string name="add_favorite_activity_title">Favori ekleyin</string>
+  <string name="contact_menu_voice_call">Sesli Çağrı</string>
+  <string name="contact_menu_video_call">Görüntülü Çağrı</string>
+  <string name="contact_menu_message">Mesaj</string>
+  <string name="contact_menu_remove">Kaldır</string>
+  <string name="contact_menu_contact_info">Kişi bilgisi</string>
+  <string name="suggested_contact_bottom_sheet_add_favorite_option">Favori olarak ekle</string>
+  <string name="speed_dial_contacts_permission_description">Hızlı aramayı etkinleştirmek için Kişiler iznini etkinleştirin.</string>
+  <string name="speed_dial_turn_on_contacts_permission">Etkinleştir</string>
+  <string name="speed_dial_no_contacts_description">Henüz favori eklemediniz</string>
+  <string name="speed_dial_no_contacts_action_text">Favori olarak ekle</string>
+  <string name="speed_dial_remove_favorites">Favorilerden kaldır</string>
 </resources>
diff --git a/java/com/android/dialer/speeddial/res/values-uk/strings.xml b/java/com/android/dialer/speeddial/res/values-uk/strings.xml
index b0c27bc..475f44a 100644
--- a/java/com/android/dialer/speeddial/res/values-uk/strings.xml
+++ b/java/com/android/dialer/speeddial/res/values-uk/strings.xml
@@ -1,20 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="favorites_header">Вибрані</string>
+  <string name="suggestions_header">Найчастіше на зв’язку</string>
+  <string name="speed_dial_add_button_text">Додати</string>
+  <string name="speed_dial_remember_this_choice">Запам’ятати цей вибір</string>
+  <string name="speed_dial_disambig_dialog_title">Виберіть тип виклику</string>
+  <string name="disambig_option_video_call">Відеодзвінок</string>
+  <string name="disambig_option_voice_call">Дзвінок</string>
+  <string name="add_favorite_activity_title">Додайте до вибраного</string>
+  <string name="contact_menu_voice_call">Голос. дзвінок</string>
+  <string name="contact_menu_video_call">Відеодзвінок</string>
+  <string name="contact_menu_message">Повідомлення</string>
+  <string name="contact_menu_remove">Видалити</string>
+  <string name="contact_menu_contact_info">Контактні дані</string>
+  <string name="suggested_contact_bottom_sheet_add_favorite_option">Додати до вподобань</string>
+  <string name="speed_dial_contacts_permission_description">Щоб активувати швидкий набір, увімкніть дозвіл \"Контакти\".</string>
+  <string name="speed_dial_turn_on_contacts_permission">Увімкнути</string>
+  <string name="speed_dial_no_contacts_description">У списку поки немає вибраних контактів</string>
+  <string name="speed_dial_no_contacts_action_text">Додати вибраний контакт</string>
+  <string name="speed_dial_remove_favorites">Видалити з вибраного</string>
 </resources>
diff --git a/java/com/android/dialer/speeddial/res/values-ur/strings.xml b/java/com/android/dialer/speeddial/res/values-ur/strings.xml
index b0c27bc..049fccc 100644
--- a/java/com/android/dialer/speeddial/res/values-ur/strings.xml
+++ b/java/com/android/dialer/speeddial/res/values-ur/strings.xml
@@ -1,20 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="favorites_header">پسندیدہ</string>
+  <string name="suggestions_header">اکثر و بیشتر</string>
+  <string name="speed_dial_add_button_text">شامل کریں</string>
+  <string name="speed_dial_remember_this_choice">یہ انتخاب یاد رکھیں</string>
+  <string name="speed_dial_disambig_dialog_title">کال کی قسم منتخب کریں</string>
+  <string name="disambig_option_video_call">ویڈیو کال کریں</string>
+  <string name="disambig_option_voice_call">کال کریں</string>
+  <string name="add_favorite_activity_title">پسندیدہ شامل کریں</string>
+  <string name="contact_menu_voice_call">صوتی کال کریں</string>
+  <string name="contact_menu_video_call">ویڈیو کال کریں</string>
+  <string name="contact_menu_message">پیغام بھیجیں</string>
+  <string name="contact_menu_remove">ہٹائیں</string>
+  <string name="contact_menu_contact_info">معلومات رابطہ</string>
+  <string name="suggested_contact_bottom_sheet_add_favorite_option">پسندیدہ میں شامل کریں</string>
+  <string name="speed_dial_contacts_permission_description">اسپیڈ ڈائل کو فعال کرنے کیلئے رابطوں کی اجازت آن کریں۔</string>
+  <string name="speed_dial_turn_on_contacts_permission">آن کریں</string>
+  <string name="speed_dial_no_contacts_description">آپ نے ابھی تک کوئی پسندیدگی شامل نہیں کی ہے</string>
+  <string name="speed_dial_no_contacts_action_text">پسندیدگی شامل کریں</string>
+  <string name="speed_dial_remove_favorites">پسندیدہ سے ہٹائیں</string>
 </resources>
diff --git a/java/com/android/dialer/speeddial/res/values-uz/strings.xml b/java/com/android/dialer/speeddial/res/values-uz/strings.xml
index b0c27bc..3948181 100644
--- a/java/com/android/dialer/speeddial/res/values-uz/strings.xml
+++ b/java/com/android/dialer/speeddial/res/values-uz/strings.xml
@@ -1,20 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="favorites_header">Saralanganlar</string>
+  <string name="suggestions_header">Tez-tez aloqada</string>
+  <string name="speed_dial_add_button_text">Qo‘shish</string>
+  <string name="speed_dial_remember_this_choice">Shu tanlov eslab qolinsin</string>
+  <string name="speed_dial_disambig_dialog_title">Chaqiruv turini tanlang</string>
+  <string name="disambig_option_video_call">Video chaqiruv</string>
+  <string name="disambig_option_voice_call">Ovozli chaqiruv</string>
+  <string name="add_favorite_activity_title">Sevimlilarga qo‘shing</string>
+  <string name="contact_menu_voice_call">Ovozli chaqiruv</string>
+  <string name="contact_menu_video_call">Video chaqiruv</string>
+  <string name="contact_menu_message">Xabar yozish</string>
+  <string name="contact_menu_remove">Olib tashlash</string>
+  <string name="contact_menu_contact_info">Kontakt axboroti</string>
+  <string name="suggested_contact_bottom_sheet_add_favorite_option">Saralanganlarga kiritish</string>
+  <string name="speed_dial_contacts_permission_description">Tezkor raqam terish uchun Kontaktlar ilovasi ruxsatnomasini yoqing.</string>
+  <string name="speed_dial_turn_on_contacts_permission">Yoqish</string>
+  <string name="speed_dial_no_contacts_description">Birorta kontaktni hali saralanganlarga kiritmagansiz</string>
+  <string name="speed_dial_no_contacts_action_text">Saralanganlarga kiritish</string>
+  <string name="speed_dial_remove_favorites">Saralanganlardan olib tashlash</string>
 </resources>
diff --git a/java/com/android/dialer/speeddial/res/values-vi/strings.xml b/java/com/android/dialer/speeddial/res/values-vi/strings.xml
index b0c27bc..97949b5 100644
--- a/java/com/android/dialer/speeddial/res/values-vi/strings.xml
+++ b/java/com/android/dialer/speeddial/res/values-vi/strings.xml
@@ -1,20 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="favorites_header">Liên hệ ưa thích</string>
+  <string name="suggestions_header">Liên hệ thường xuyên</string>
+  <string name="speed_dial_add_button_text">Thêm</string>
+  <string name="speed_dial_remember_this_choice">Nhớ lựa chọn này</string>
+  <string name="speed_dial_disambig_dialog_title">Chọn loại cuộc gọi</string>
+  <string name="disambig_option_video_call">Gọi điện video</string>
+  <string name="disambig_option_voice_call">Gọi</string>
+  <string name="add_favorite_activity_title">Thêm liên hệ yêu thích</string>
+  <string name="contact_menu_voice_call">Cuộc gọi thoại</string>
+  <string name="contact_menu_video_call">Gọi điện video</string>
+  <string name="contact_menu_message">Tin nhắn</string>
+  <string name="contact_menu_remove">Xóa</string>
+  <string name="contact_menu_contact_info">Thông tin l.hệ</string>
+  <string name="suggested_contact_bottom_sheet_add_favorite_option">Thêm liên hệ yêu thích</string>
+  <string name="speed_dial_contacts_permission_description">Để bật tính năng quay số nhanh, hãy bật quyền đối với Danh bạ.</string>
+  <string name="speed_dial_turn_on_contacts_permission">Bật</string>
+  <string name="speed_dial_no_contacts_description">Bạn chưa thêm bất kỳ liên hệ yêu thích nào</string>
+  <string name="speed_dial_no_contacts_action_text">Thêm liên hệ yêu thích</string>
+  <string name="speed_dial_remove_favorites">Xóa khỏi mục ưa thích</string>
 </resources>
diff --git a/java/com/android/dialer/speeddial/res/values-zh-rCN/strings.xml b/java/com/android/dialer/speeddial/res/values-zh-rCN/strings.xml
index b0c27bc..a785d7c 100644
--- a/java/com/android/dialer/speeddial/res/values-zh-rCN/strings.xml
+++ b/java/com/android/dialer/speeddial/res/values-zh-rCN/strings.xml
@@ -1,20 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="favorites_header">收藏</string>
+  <string name="suggestions_header">常用联系人</string>
+  <string name="speed_dial_add_button_text">添加</string>
+  <string name="speed_dial_remember_this_choice">记住此选择</string>
+  <string name="speed_dial_disambig_dialog_title">选择通话类型</string>
+  <string name="disambig_option_video_call">视频通话</string>
+  <string name="disambig_option_voice_call">拨打电话</string>
+  <string name="add_favorite_activity_title">收藏联系人</string>
+  <string name="contact_menu_voice_call">语音呼叫</string>
+  <string name="contact_menu_video_call">视频通话</string>
+  <string name="contact_menu_message">短信</string>
+  <string name="contact_menu_remove">移除</string>
+  <string name="contact_menu_contact_info">联系信息</string>
+  <string name="suggested_contact_bottom_sheet_add_favorite_option">收藏联系人</string>
+  <string name="speed_dial_contacts_permission_description">要启用快速拨号功能，请开启“通讯录”权限。</string>
+  <string name="speed_dial_turn_on_contacts_permission">开启</string>
+  <string name="speed_dial_no_contacts_description">您尚未添加任何收藏</string>
+  <string name="speed_dial_no_contacts_action_text">收藏联系人</string>
+  <string name="speed_dial_remove_favorites">从收藏中移除</string>
 </resources>
diff --git a/java/com/android/dialer/speeddial/res/values-zh-rHK/strings.xml b/java/com/android/dialer/speeddial/res/values-zh-rHK/strings.xml
index b0c27bc..1adec8b 100644
--- a/java/com/android/dialer/speeddial/res/values-zh-rHK/strings.xml
+++ b/java/com/android/dialer/speeddial/res/values-zh-rHK/strings.xml
@@ -1,20 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="favorites_header">我的最愛</string>
+  <string name="suggestions_header">常用聯絡人</string>
+  <string name="speed_dial_add_button_text">新增</string>
+  <string name="speed_dial_remember_this_choice">記住這個選擇</string>
+  <string name="speed_dial_disambig_dialog_title">選擇通話類型</string>
+  <string name="disambig_option_video_call">視像通話</string>
+  <string name="disambig_option_voice_call">通話</string>
+  <string name="add_favorite_activity_title">新增我的最愛</string>
+  <string name="contact_menu_voice_call">語音通話</string>
+  <string name="contact_menu_video_call">視像通話</string>
+  <string name="contact_menu_message">訊息</string>
+  <string name="contact_menu_remove">移除</string>
+  <string name="contact_menu_contact_info">聯絡資料</string>
+  <string name="suggested_contact_bottom_sheet_add_favorite_option">新增常用聯絡人</string>
+  <string name="speed_dial_contacts_permission_description">如要啟用快速撥號功能，請開放「通訊錄」權限。</string>
+  <string name="speed_dial_turn_on_contacts_permission">開啟</string>
+  <string name="speed_dial_no_contacts_description">您尚未新增任何常用聯絡人</string>
+  <string name="speed_dial_no_contacts_action_text">新增常用聯絡人</string>
+  <string name="speed_dial_remove_favorites">從常用聯絡人中移除</string>
 </resources>
diff --git a/java/com/android/dialer/speeddial/res/values-zh-rTW/strings.xml b/java/com/android/dialer/speeddial/res/values-zh-rTW/strings.xml
index b0c27bc..58efabe 100644
--- a/java/com/android/dialer/speeddial/res/values-zh-rTW/strings.xml
+++ b/java/com/android/dialer/speeddial/res/values-zh-rTW/strings.xml
@@ -1,20 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="favorites_header">常用聯絡人</string>
+  <string name="suggestions_header">常用聯絡人</string>
+  <string name="speed_dial_add_button_text">新增</string>
+  <string name="speed_dial_remember_this_choice">記住這個選擇</string>
+  <string name="speed_dial_disambig_dialog_title">選擇通話類型</string>
+  <string name="disambig_option_video_call">視訊通話</string>
+  <string name="disambig_option_voice_call">撥號</string>
+  <string name="add_favorite_activity_title">新增到常用聯絡人</string>
+  <string name="contact_menu_voice_call">語音通話</string>
+  <string name="contact_menu_video_call">視訊通話</string>
+  <string name="contact_menu_message">訊息</string>
+  <string name="contact_menu_remove">移除</string>
+  <string name="contact_menu_contact_info">聯絡資訊</string>
+  <string name="suggested_contact_bottom_sheet_add_favorite_option">新增到常用聯絡人</string>
+  <string name="speed_dial_contacts_permission_description">如要啟用快速撥號，請開啟「聯絡人」存取權限。</string>
+  <string name="speed_dial_turn_on_contacts_permission">開啟</string>
+  <string name="speed_dial_no_contacts_description">你尚未新增任何常用聯絡人</string>
+  <string name="speed_dial_no_contacts_action_text">新增常用聯絡人</string>
+  <string name="speed_dial_remove_favorites">從常用聯絡人中移除</string>
 </resources>
diff --git a/java/com/android/dialer/speeddial/res/values-zu/strings.xml b/java/com/android/dialer/speeddial/res/values-zu/strings.xml
index b0c27bc..81d2ef9 100644
--- a/java/com/android/dialer/speeddial/res/values-zu/strings.xml
+++ b/java/com/android/dialer/speeddial/res/values-zu/strings.xml
@@ -1,20 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="favorites_header">Izintandokazi</string>
+  <string name="suggestions_header">Imvamisa</string>
+  <string name="speed_dial_add_button_text">Engeza</string>
+  <string name="speed_dial_remember_this_choice">Khumbula lokhu okukhethiwe</string>
+  <string name="speed_dial_disambig_dialog_title">Khetha zonke izinhlobo</string>
+  <string name="disambig_option_video_call">Ikholi yevidiyo</string>
+  <string name="disambig_option_voice_call">Shaya</string>
+  <string name="add_favorite_activity_title">engeza intandokazi</string>
+  <string name="contact_menu_voice_call">Ikholi yezwi</string>
+  <string name="contact_menu_video_call">Ikholi Yevidiyo</string>
+  <string name="contact_menu_message">Umlayezo</string>
+  <string name="contact_menu_remove">Susa</string>
+  <string name="contact_menu_contact_info">Ulwazi loxhumana naye</string>
+  <string name="suggested_contact_bottom_sheet_add_favorite_option">Engeza intandokazi</string>
+  <string name="speed_dial_contacts_permission_description">Nika amandla ukudayela okusheshayo, vula imvume yoxhumana nabo.</string>
+  <string name="speed_dial_turn_on_contacts_permission">Vula</string>
+  <string name="speed_dial_no_contacts_description">Awukangezi noma yikuphi ukubhalisa okwamanje</string>
+  <string name="speed_dial_no_contacts_action_text">Engeza intandokazi</string>
+  <string name="speed_dial_remove_favorites">Susa kusukela kuzintandokazi</string>
 </resources>
diff --git a/java/com/android/dialer/speeddial/res/values/dimens.xml b/java/com/android/dialer/speeddial/res/values/dimens.xml
index 74b509b..624c60d 100644
--- a/java/com/android/dialer/speeddial/res/values/dimens.xml
+++ b/java/com/android/dialer/speeddial/res/values/dimens.xml
@@ -16,4 +16,22 @@
   -->
 <resources>
   <dimen name="scrollview_max_height">280dp</dimen>
+  <dimen name="speed_dial_context_menu_width">200dp</dimen>
+  <dimen name="context_menu_elevation">4dp</dimen>
+  <dimen name="speed_dial_recyclerview_horizontal_padding">16dp</dimen>
+
+  <!--
+   ~ This value expands the context menu to allow space for more text w/o being flush with the edge
+   ~ of the screen. Calculated with 2 * (speed_dial_recyclerview_horizontal_padding - 2dp)
+   -->
+  <dimen name="speed_dial_context_menu_extra_width">28dp</dimen>
+  <!--
+   ~ This value centers the context menu with the favorite item layout.
+   ~ Calculated with -1 * (speed_dial_context_menu_extra_width * 1.75)
+   -->
+  <dimen name="speed_dial_context_menu_x_offset">-24dp</dimen>
+  <dimen name="speed_dial_context_menu_corner_radius">16dp</dimen>
+  <dimen name="disambig_dialog_width">280dp</dimen>
+  <dimen name="expanded_search_bar_height">64dp</dimen>
+  <dimen name="expanded_search_bar_height_minus">-64dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/java/com/android/dialer/speeddial/res/values/strings.xml b/java/com/android/dialer/speeddial/res/values/strings.xml
index 677f772..397ec8f 100644
--- a/java/com/android/dialer/speeddial/res/values/strings.xml
+++ b/java/com/android/dialer/speeddial/res/values/strings.xml
@@ -18,8 +18,9 @@
   <!-- header for a list of contacts that are the users favorites. [CHAR LIMIT=30] -->
   <string name="favorites_header">Favorites</string>
 
-  <!-- header for a list of contacts that are suggestions for the user to place calls to. [CHAR LIMIT=30] -->
-  <string name="suggestions_header">Suggestions</string>
+  <!-- header for a list of contacts that are suggestions for the user to place calls to based on
+    their frequently contacted contacts. [CHAR LIMIT=30] -->
+  <string name="suggestions_header">Frequents</string>
 
   <!-- text for a button that prompts the user to add a contact to their favorites. [CHAR LIMIT=12] -->
   <string name="speed_dial_add_button_text">Add</string>
@@ -28,9 +29,9 @@
     If the user checks this box, we will remember their selection and never ask for it again. [CHAR LIMIT=NONE]-->
   <string name="speed_dial_remember_this_choice">Remember this choice</string>
 
-  <!-- Title of a dialog asking the user to choose their favorite mode of communication for a
+  <!-- Title of a dialog asking the user to choose their the mode/type of communication for a
     specific contact where communication modes are video calling and voice calling. [CHAR LIMIT=NONE]-->
-  <string name="speed_dial_disambig_dialog_title">Choose a Favorite mode</string>
+  <string name="speed_dial_disambig_dialog_title">Choose call type</string>
 
   <!-- Text for a button that places a video call [CHAR LIMIT=15]-->
   <string name="disambig_option_video_call">Video call</string>
@@ -40,4 +41,37 @@
 
   <!-- Title for screen prompting the user to select a contact to mark as a favorite. [CHAR LIMIT=NONE] -->
   <string name="add_favorite_activity_title">Add Favorite</string>
+
+  <!-- Text for a button that places a phone/voice call [CHAR LIMIT=15]-->
+  <string name="contact_menu_voice_call">Voice Call</string>
+
+  <!-- Text for a button that places a video call [CHAR LIMIT=15]-->
+  <string name="contact_menu_video_call">Video Call</string>
+
+  <!-- Text for a button that opens the contact in the SMS app [CHAR LIMIT=15]-->
+  <string name="contact_menu_message">Message</string>
+
+  <!-- Text for a button that removes the item from the list [CHAR LIMIT=15]-->
+  <string name="contact_menu_remove">Remove</string>
+
+  <!-- Text for a button that opens the contact's info [CHAR LIMIT=15]-->
+  <string name="contact_menu_contact_info">Contact info</string>
+
+  <!-- Text shown to the user in a button to prompt them to mark a contact as a favorite contact [CHAR LIMIT=30]. -->
+  <string name="suggested_contact_bottom_sheet_add_favorite_option">Add favorite</string>
+
+  <!-- Shown as a prompt to turn on the contacts permission to enable speed dial [CHAR LIMIT=NONE]-->
+  <string name="speed_dial_contacts_permission_description">To enable speed dial, turn on the Contacts permission.</string>
+
+  <!-- The label of the button used to turn on a single permission [CHAR LIMIT=30]-->
+  <string name="speed_dial_turn_on_contacts_permission">Turn on</string>
+
+  <!-- [CHAR LIMIT=NONE] Shown when there are no contacts in the all contacts list. -->
+  <string name="speed_dial_no_contacts_description">You haven\'t added any favorites yet</string>
+
+  <!-- [CHAR LIMIT=NONE] Shown as an action when the all contacts list is empty -->
+  <string name="speed_dial_no_contacts_action_text">Add favorite</string>
+
+  <!-- Text shown on a dragging target that removes the contact from favorites -->
+  <string name="speed_dial_remove_favorites">Remove from favorites</string>
 </resources>
\ No newline at end of file
diff --git a/java/com/android/dialer/speeddial/res/values/styles.xml b/java/com/android/dialer/speeddial/res/values/styles.xml
new file mode 100644
index 0000000..99e6e3c
--- /dev/null
+++ b/java/com/android/dialer/speeddial/res/values/styles.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2017 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+<resources>
+  <style name="SpeedDialContextMenuItem" parent="SpeedDialContextMenuItem.NoDrawableTint">
+    <item name="android:drawableTint">?colorIcon</item>
+  </style>
+
+  <style name="SpeedDialContextMenuItem.NoDrawableTint" parent="Dialer.TextAppearance.Secondary">
+    <item name="android:paddingStart">12dp</item>
+    <item name="android:minHeight">48dp</item>
+    <item name="android:gravity">center_vertical</item>
+    <item name="android:drawablePadding">12dp</item>
+    <item name="android:clickable">true</item>
+    <item name="android:background">?android:attr/selectableItemBackground</item>
+  </style>
+</resources>
\ No newline at end of file
diff --git a/java/com/android/dialer/storage/StorageComponent.java b/java/com/android/dialer/storage/StorageComponent.java
index cb5c4a8..4754cc6 100644
--- a/java/com/android/dialer/storage/StorageComponent.java
+++ b/java/com/android/dialer/storage/StorageComponent.java
@@ -19,6 +19,7 @@
 import android.content.Context;
 import android.content.SharedPreferences;
 import com.android.dialer.inject.HasRootComponent;
+import com.android.dialer.inject.IncludeInDialerRoot;
 import dagger.Subcomponent;
 
 /** Dagger component for storage. */
@@ -42,6 +43,7 @@
   }
 
   /** Used to refer to the root application component. */
+  @IncludeInDialerRoot
   public interface HasComponent {
     StorageComponent storageComponent();
   }
diff --git a/java/com/android/dialer/storage/StorageModule.java b/java/com/android/dialer/storage/StorageModule.java
index e1c5b4b..370998c 100644
--- a/java/com/android/dialer/storage/StorageModule.java
+++ b/java/com/android/dialer/storage/StorageModule.java
@@ -20,11 +20,14 @@
 import android.preference.PreferenceManager;
 import android.support.v4.content.ContextCompat;
 import com.android.dialer.inject.ApplicationContext;
+import com.android.dialer.inject.DialerVariant;
+import com.android.dialer.inject.InstallIn;
 import dagger.Module;
 import dagger.Provides;
 import javax.inject.Singleton;
 
 /** Module for the storage component. */
+@InstallIn(variants = {DialerVariant.DIALER_TEST})
 @Module
 public class StorageModule {
 
diff --git a/java/com/android/dialer/strictmode/impl/SystemDialerStrictMode.java b/java/com/android/dialer/strictmode/impl/SystemDialerStrictMode.java
index 09fdf5c..f3ce70c 100644
--- a/java/com/android/dialer/strictmode/impl/SystemDialerStrictMode.java
+++ b/java/com/android/dialer/strictmode/impl/SystemDialerStrictMode.java
@@ -18,6 +18,7 @@
 
 import android.app.Application;
 import android.os.Build;
+import android.os.Build.VERSION_CODES;
 import android.os.Handler;
 import android.os.Looper;
 import android.os.StrictMode;
@@ -91,7 +92,7 @@
         new StrictMode.VmPolicy.Builder(vmPenalties)
             .detectLeakedClosableObjects()
             .detectLeakedSqlLiteObjects();
-    if (Build.VERSION.SDK_INT >= 26) {
+    if (Build.VERSION.SDK_INT >= VERSION_CODES.O) {
       vmPolicyBuilder.detectContentUriWithoutPermission();
       // TODO(azlatin): Enable detecting untagged sockets once: a bug is fixed.
       // vmPolicyBuilder.detectUntaggedSockets();
diff --git a/java/com/android/dialer/strictmode/impl/SystemStrictModeModule.java b/java/com/android/dialer/strictmode/impl/SystemStrictModeModule.java
index 6ece874..ac6416c 100644
--- a/java/com/android/dialer/strictmode/impl/SystemStrictModeModule.java
+++ b/java/com/android/dialer/strictmode/impl/SystemStrictModeModule.java
@@ -16,12 +16,15 @@
 
 package com.android.dialer.strictmode.impl;
 
+import com.android.dialer.inject.DialerVariant;
+import com.android.dialer.inject.InstallIn;
 import com.android.dialer.strictmode.DialerStrictMode;
 import dagger.Binds;
 import dagger.Module;
 import javax.inject.Singleton;
 
 /** Module which binds {@link SystemDialerStrictMode}. */
+@InstallIn(variants = {DialerVariant.DIALER_TEST})
 @Module
 public abstract class SystemStrictModeModule {
 
diff --git a/java/com/android/dialer/telecom/TelecomCallUtil.java b/java/com/android/dialer/telecom/TelecomCallUtil.java
index 3ae9523..6b66d86 100644
--- a/java/com/android/dialer/telecom/TelecomCallUtil.java
+++ b/java/com/android/dialer/telecom/TelecomCallUtil.java
@@ -22,14 +22,11 @@
 import android.support.annotation.Nullable;
 import android.support.annotation.WorkerThread;
 import android.telecom.Call;
-import android.telecom.PhoneAccountHandle;
 import android.telephony.PhoneNumberUtils;
-import android.telephony.SubscriptionInfo;
 import android.text.TextUtils;
 import com.android.dialer.common.Assert;
-import com.android.dialer.common.LogUtil;
+import com.android.dialer.location.GeoUtil;
 import com.google.common.base.Optional;
-import java.util.Locale;
 
 /**
  * Class to provide a standard interface for obtaining information from the underlying
@@ -72,11 +69,12 @@
   }
 
   /**
-   * Normalizes the number of the {@code call} to E.164. The country of the SIM associated with the
-   * call is used to determine the country.
+   * Normalizes the number of the {@code call} to E.164. If the number for the call does not contain
+   * a country code, then the current location as defined by {@link
+   * GeoUtil#getCurrentCountryIso(Context)} is used.
    *
-   * <p>If the number cannot be formatted (because for example the country cannot be determined),
-   * returns the number with non-dialable digits removed.
+   * <p>If the number cannot be formatted (because for example number is invalid), returns the
+   * number with non-dialable digits removed.
    */
   @WorkerThread
   public static Optional<String> getNormalizedNumber(Context appContext, Call call) {
@@ -94,11 +92,12 @@
   }
 
   /**
-   * Formats the number of the {@code call} to E.164 if it is valid. The country of the SIM
-   * associated with the call is used to determine the country.
+   * Formats the number of the {@code call} to E.164 if it is valid. If the number for the call does
+   * not contain a country code, then the current location as defined by {@link
+   * GeoUtil#getCurrentCountryIso(Context)} is used.
    *
-   * <p>If the number cannot be formatted (because for example it is invalid or the country cannot
-   * be determined), returns {@link Optional#absent()}.
+   * <p>If the number cannot be formatted (because for example it is invalid), returns {@link
+   * Optional#absent()}.
    */
   @WorkerThread
   public static Optional<String> getValidE164Number(Context appContext, Call call) {
@@ -107,23 +106,7 @@
     if (TextUtils.isEmpty(rawNumber)) {
       return Optional.absent();
     }
-    Optional<String> countryCode = getCountryCode(appContext, call);
-    if (!countryCode.isPresent()) {
-      LogUtil.w("TelecomCallUtil.getValidE164Number", "couldn't find a country code for call");
-      return Optional.absent();
-    }
-    return Optional.fromNullable(PhoneNumberUtils.formatNumberToE164(rawNumber, countryCode.get()));
-  }
-
-  @WorkerThread
-  public static Optional<String> getCountryCode(Context appContext, Call call) {
-    Assert.isWorkerThread();
-    PhoneAccountHandle phoneAccountHandle = call.getDetails().getAccountHandle();
-    Optional<SubscriptionInfo> subscriptionInfo =
-        TelecomUtil.getSubscriptionInfo(appContext, phoneAccountHandle);
-    if (subscriptionInfo.isPresent() && subscriptionInfo.get().getCountryIso() != null) {
-      return Optional.of(subscriptionInfo.get().getCountryIso().toUpperCase(Locale.US));
-    }
-    return Optional.absent();
+    return Optional.fromNullable(
+        PhoneNumberUtils.formatNumberToE164(rawNumber, GeoUtil.getCurrentCountryIso(appContext)));
   }
 }
diff --git a/java/com/android/dialer/telecom/TelecomUtil.java b/java/com/android/dialer/telecom/TelecomUtil.java
index 56349b6..c088146 100644
--- a/java/com/android/dialer/telecom/TelecomUtil.java
+++ b/java/com/android/dialer/telecom/TelecomUtil.java
@@ -50,7 +50,7 @@
  * perform the required check and return the fallback default if the permission is missing,
  * otherwise return the value from TelecomManager.
  */
-@SuppressWarnings("MissingPermission")
+@SuppressWarnings({"MissingPermission", "Guava"})
 public abstract class TelecomUtil {
 
   private static final String TAG = "TelecomUtil";
@@ -145,7 +145,8 @@
 
   public static List<PhoneAccountHandle> getCallCapablePhoneAccounts(Context context) {
     if (hasReadPhoneStatePermission(context)) {
-      return getTelecomManager(context).getCallCapablePhoneAccounts();
+      return Optional.fromNullable(getTelecomManager(context).getCallCapablePhoneAccounts())
+          .or(new ArrayList<>());
     }
     return new ArrayList<>();
   }
@@ -274,15 +275,21 @@
             && hasPermission(context, Manifest.permission.WRITE_VOICEMAIL));
   }
 
+  /** @deprecated use {@link com.android.dialer.util.PermissionsUtil} */
+  @Deprecated
   public static boolean hasModifyPhoneStatePermission(Context context) {
     return isDefaultDialer(context)
         || hasPermission(context, Manifest.permission.MODIFY_PHONE_STATE);
   }
 
+  /** @deprecated use {@link com.android.dialer.util.PermissionsUtil} */
+  @Deprecated
   public static boolean hasReadPhoneStatePermission(Context context) {
     return isDefaultDialer(context) || hasPermission(context, Manifest.permission.READ_PHONE_STATE);
   }
 
+  /** @deprecated use {@link com.android.dialer.util.PermissionsUtil} */
+  @Deprecated
   public static boolean hasCallPhonePermission(Context context) {
     return isDefaultDialer(context) || hasPermission(context, Manifest.permission.CALL_PHONE);
   }
@@ -311,6 +318,9 @@
     TelecomManager telecomManager = context.getSystemService(TelecomManager.class);
     for (PhoneAccountHandle phoneAccountHandle : telecomManager.getCallCapablePhoneAccounts()) {
       PhoneAccount phoneAccount = telecomManager.getPhoneAccount(phoneAccountHandle);
+      if (phoneAccount == null) {
+        continue;
+      }
       if (phoneAccount.hasCapabilities(PhoneAccount.CAPABILITY_SIM_SUBSCRIPTION)
           && !phoneAccountHandle.equals(currentAccount)) {
         return phoneAccountHandle;
diff --git a/java/com/android/dialer/theme/AndroidManifest.xml b/java/com/android/dialer/theme/AndroidManifest.xml
deleted file mode 100644
index 7c1e4ef..0000000
--- a/java/com/android/dialer/theme/AndroidManifest.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<manifest
-  package="com.android.dialer.theme">
-</manifest>
diff --git a/java/com/android/dialer/theme/README.md b/java/com/android/dialer/theme/README.md
new file mode 100644
index 0000000..6fb8e4f
--- /dev/null
+++ b/java/com/android/dialer/theme/README.md
@@ -0,0 +1,75 @@
+# How to use this directory
+
+First thing to note, it's imperative that the application and all activities
+inherit from the styles outlined in theme/base. If an Activity doesn\'t specify
+a style for it's theme, it automatically inherits one from the Application. And
+this hierarchy continues: Application > Activity > Fragment > View > View > ...
+
+## theme/base
+
+This is where the base application themes, activity themes and application wide
+style attributes live.
+
+What is an attribute? There are three types (depending on how you want to define
+them):
+
+*   Legacy Android attributes (android:colorPrimary). These are defined by the
+    Android framework and they exist to allow developers easily custom Android
+    provided widgets.
+
+*   Appcompat Android attributes (colorPrimary). There are also defined by the
+    Android framework but they only exist to customize AppCompat widgets. After
+    the framework was more mature, the team realized that they needed to add
+    more customization to their widgets, so they created the AppCompat variant
+    with all of the same attributes plus some. *Note:* Unfortunately our app
+    uses both Legacy Widgets and AppCompat widgets, so when you define an
+    AppCompat attribute in a style, be sure to also define the Legacy version as
+    well if it exists.
+
+*   Custom application attributes (colorIcon). It goes without saying that the
+    names can't collide with the framework attributes. These attributes server
+    to satisfy what the framework doesn't. For example, the framework doesn't
+    provide an attribute to tint all of your ImageViews (why would it?), so we
+    created the colorIcon attribute to apply to all ImageViews that show quantum
+    icons/assets that need to be tinted.
+
+Styles in this package follow a naming convention of inheritance:
+
+*   Dialer. and Dialer.NoActionBar are the two root themes that should be used
+    to add sdk specific features (like coloring the Android nav bar).
+
+*   Dialer.ThemeBase.ActionBar and Dialer.ThemeBase.NoActionBar are great
+    starting points for Activity style's to inherit from if they need specific
+    customizations.
+
+*   Dialer.ThemeBase.ActionBar.* and Dialer.ThemeBase.NoActionBar.* are
+    specialized app themes intended to change the entire look of the app. For
+    example, Dialer.ThemeBase.NoActionBar.Dark is used for a dark mode theme. If
+    you create a custom theme for an activity, be sure your customization will
+    work for all themes. See dialer/dialpadview/theme for an example.
+
+## theme/common
+
+This is a dumping ground for shared resources. Some examples of what should live
+here:
+
+*   Colors that can't be theme'd (there aren't many of those, so you probably
+    won't do that).
+*   Drawables, images, animations, dimensions, styles, ect. that can be (or are)
+    used throughout the entire app without the need for customization. If you
+    want to customize a specific style for one use case, feel free to override
+    it and store it in your own resource directory.
+
+## theme/private
+
+This package is only visible to theme/base. Things you should never do:
+
+*   Reference anything in here.
+*   Duplicate the resources from this directory into another.
+
+Things you should do:
+
+*   Add colors that are common throughout the entire app and need be themed. For
+    example, text colors, background colors and app primary and accent colors.
+    Each color you add needs to exist in each color_*.xml file where *
+    represents an app theme like 'dark' or 'light'.
diff --git a/java/com/android/dialer/theme/base/AndroidManifest.xml b/java/com/android/dialer/theme/base/AndroidManifest.xml
new file mode 100644
index 0000000..ff78910
--- /dev/null
+++ b/java/com/android/dialer/theme/base/AndroidManifest.xml
@@ -0,0 +1,16 @@
+<!--
+  ~ Copyright (C) 2018 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+<manifest package="com.android.dialer.theme.base"/>
diff --git a/java/com/android/dialer/theme/base/Theme.java b/java/com/android/dialer/theme/base/Theme.java
new file mode 100644
index 0000000..6e0d20a
--- /dev/null
+++ b/java/com/android/dialer/theme/base/Theme.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.dialer.theme.base;
+
+import android.content.Context;
+import android.support.annotation.ColorInt;
+import android.support.annotation.IntDef;
+import android.support.annotation.StyleRes;
+import android.view.LayoutInflater;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+/** Interface for theme. */
+public interface Theme {
+
+  /** IntDef for the different themes Dialer supports. */
+  @Retention(RetentionPolicy.SOURCE)
+  @IntDef({UNKNOWN, LIGHT, DARK, LIGHT_M2})
+  @interface Type {}
+
+  int UNKNOWN = 0;
+  int LIGHT = 1;
+  int DARK = 2;
+  int LIGHT_M2 = 3;
+
+  @Type
+  int getTheme();
+
+  @StyleRes
+  int getApplicationThemeRes();
+
+  Context getThemedContext(Context context);
+
+  LayoutInflater getThemedLayoutInflator(LayoutInflater inflater);
+
+  @ColorInt
+  int getColorIcon();
+
+  @ColorInt
+  int getColorIconSecondary();
+
+  @ColorInt
+  int getColorPrimary();
+
+  @ColorInt
+  int getColorPrimaryDark();
+
+  @ColorInt
+  int getColorAccent();
+
+  @ColorInt
+  int getTextColorSecondary();
+
+  @ColorInt
+  int getTextColorPrimary();
+
+  @ColorInt
+  int getColorTextOnUnthemedDarkBackground();
+
+  @ColorInt
+  int getColorIconOnUnthemedDarkBackground();
+}
diff --git a/java/com/android/dialer/theme/base/ThemeComponent.java b/java/com/android/dialer/theme/base/ThemeComponent.java
new file mode 100644
index 0000000..d906761
--- /dev/null
+++ b/java/com/android/dialer/theme/base/ThemeComponent.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.dialer.theme.base;
+
+import android.content.Context;
+import com.android.dialer.inject.HasRootComponent;
+import com.android.dialer.inject.IncludeInDialerRoot;
+import dagger.Subcomponent;
+
+/** Component for Theme. */
+@Subcomponent
+public abstract class ThemeComponent {
+
+  public abstract Theme theme();
+
+  public static ThemeComponent get(Context context) {
+    return ((HasComponent) ((HasRootComponent) context.getApplicationContext()).component())
+        .themeComponent();
+  }
+
+  /** Used to refer to the root application component. */
+  @IncludeInDialerRoot
+  public interface HasComponent {
+    ThemeComponent themeComponent();
+  }
+}
diff --git a/java/com/android/dialer/theme/base/impl/AospThemeImpl.java b/java/com/android/dialer/theme/base/impl/AospThemeImpl.java
new file mode 100644
index 0000000..c8f20c7
--- /dev/null
+++ b/java/com/android/dialer/theme/base/impl/AospThemeImpl.java
@@ -0,0 +1,175 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.dialer.theme.base.impl;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.support.annotation.ColorInt;
+import android.support.annotation.StyleRes;
+import android.view.ContextThemeWrapper;
+import android.view.LayoutInflater;
+import com.android.dialer.common.Assert;
+import com.android.dialer.theme.base.R;
+import com.android.dialer.theme.base.Theme;
+import javax.inject.Singleton;
+
+/** Utility for fetching */
+@SuppressWarnings("unused")
+@Singleton
+public class AospThemeImpl implements Theme {
+
+  private int colorIcon = -1;
+  private int colorIconSecondary = -1;
+  private int colorPrimary = -1;
+  private int colorPrimaryDark = -1;
+  private int colorAccent = -1;
+  private int textColorPrimary = -1;
+  private int textColorSecondary = -1;
+  private int textColorPrimaryInverse = -1;
+  private int textColorHint = -1;
+  private int colorBackground = -1;
+  private int colorBackgroundFloating = -1;
+  private int colorTextOnUnthemedDarkBackground = -1;
+  private int colorIconOnUnthemedDarkBackground = -1;
+
+  public AospThemeImpl(Context context) {
+
+    context = context.getApplicationContext();
+    context.setTheme(getApplicationThemeRes());
+    TypedArray array =
+        context
+            .getTheme()
+            .obtainStyledAttributes(
+                getApplicationThemeRes(),
+                new int[] {
+                  android.R.attr.colorPrimary,
+                  android.R.attr.colorPrimaryDark,
+                  android.R.attr.colorAccent,
+                  android.R.attr.textColorPrimary,
+                  android.R.attr.textColorSecondary,
+                  android.R.attr.textColorPrimaryInverse,
+                  android.R.attr.textColorHint,
+                  android.R.attr.colorBackground,
+                  android.R.attr.colorBackgroundFloating,
+                  R.attr.colorIcon,
+                  R.attr.colorIconSecondary,
+                  R.attr.colorTextOnUnthemedDarkBackground,
+                  R.attr.colorIconOnUnthemedDarkBackground,
+                });
+    colorPrimary = array.getColor(/* index= */ 0, /* defValue= */ -1);
+    colorPrimaryDark = array.getColor(/* index= */ 1, /* defValue= */ -1);
+    colorAccent = array.getColor(/* index= */ 2, /* defValue= */ -1);
+    textColorPrimary = array.getColor(/* index= */ 3, /* defValue= */ -1);
+    textColorSecondary = array.getColor(/* index= */ 4, /* defValue= */ -1);
+    textColorPrimaryInverse = array.getColor(/* index= */ 5, /* defValue= */ -1);
+    textColorHint = array.getColor(/* index= */ 6, /* defValue= */ -1);
+    colorBackground = array.getColor(/* index= */ 7, /* defValue= */ -1);
+    colorBackgroundFloating = array.getColor(/* index= */ 8, /* defValue= */ -1);
+    colorIcon = array.getColor(/* index= */ 9, /* defValue= */ -1);
+    colorIconSecondary = array.getColor(/* index= */ 10, /* defValue= */ -1);
+    colorTextOnUnthemedDarkBackground = array.getColor(/* index= */ 11, /* defValue= */ -1);
+    colorIconOnUnthemedDarkBackground = array.getColor(/* index= */ 12, /* defValue= */ -1);
+    array.recycle();
+  }
+
+  /**
+   * Returns the {@link Theme} that the application is using. Activities should check this value if
+   * their custom style needs to customize further based on the application theme.
+   */
+  @Override
+  public @Type int getTheme() {
+    // TODO(a bug): add share prefs check to configure this
+    return LIGHT;
+  }
+
+  @Override
+  public @StyleRes int getApplicationThemeRes() {
+    switch (getTheme()) {
+      case DARK:
+        return R.style.Dialer_Dark_ThemeBase_NoActionBar;
+      case LIGHT:
+        return R.style.Dialer_ThemeBase_NoActionBar;
+      case UNKNOWN:
+      default:
+        throw Assert.createIllegalStateFailException("Theme hasn't been set yet.");
+    }
+  }
+
+  @Override
+  public Context getThemedContext(Context context) {
+    return new ContextThemeWrapper(context, getApplicationThemeRes());
+  }
+
+  @Override
+  public LayoutInflater getThemedLayoutInflator(LayoutInflater inflater) {
+    return inflater.cloneInContext(getThemedContext(inflater.getContext()));
+  }
+
+  @Override
+  public @ColorInt int getColorIcon() {
+    Assert.checkArgument(colorIcon != -1);
+    return colorIcon;
+  }
+
+  @Override
+  public @ColorInt int getColorIconSecondary() {
+    Assert.checkArgument(colorIconSecondary != -1);
+    return colorIconSecondary;
+  }
+
+  @Override
+  public @ColorInt int getColorPrimary() {
+    Assert.checkArgument(colorPrimary != -1);
+    return colorPrimary;
+  }
+
+  @Override
+  public int getColorPrimaryDark() {
+    Assert.checkArgument(colorPrimaryDark != -1);
+    return colorPrimaryDark;
+  }
+
+  @Override
+  public @ColorInt int getColorAccent() {
+    Assert.checkArgument(colorAccent != -1);
+    return colorAccent;
+  }
+
+  @Override
+  public @ColorInt int getTextColorSecondary() {
+    Assert.checkArgument(textColorSecondary != -1);
+    return textColorSecondary;
+  }
+
+  @Override
+  public @ColorInt int getTextColorPrimary() {
+    Assert.checkArgument(textColorPrimary != -1);
+    return textColorPrimary;
+  }
+
+  @Override
+  public @ColorInt int getColorTextOnUnthemedDarkBackground() {
+    Assert.checkArgument(colorTextOnUnthemedDarkBackground != -1);
+    return colorTextOnUnthemedDarkBackground;
+  }
+
+  @Override
+  public @ColorInt int getColorIconOnUnthemedDarkBackground() {
+    Assert.checkArgument(colorIconOnUnthemedDarkBackground != -1);
+    return colorIconOnUnthemedDarkBackground;
+  }
+}
diff --git a/java/com/android/dialer/theme/base/impl/AospThemeModule.java b/java/com/android/dialer/theme/base/impl/AospThemeModule.java
new file mode 100644
index 0000000..7cf52ca
--- /dev/null
+++ b/java/com/android/dialer/theme/base/impl/AospThemeModule.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.dialer.theme.base.impl;
+
+import android.content.Context;
+import com.android.dialer.inject.ApplicationContext;
+import com.android.dialer.inject.DialerVariant;
+import com.android.dialer.inject.InstallIn;
+import com.android.dialer.theme.base.Theme;
+import dagger.Module;
+import dagger.Provides;
+
+/** Module which binds {@link AospThemeImpl}. */
+@InstallIn(variants = {DialerVariant.DIALER_TEST})
+@Module
+public class AospThemeModule {
+
+  @Provides
+  static Theme provideThemeModule(@ApplicationContext Context context) {
+    return new AospThemeImpl(context);
+  }
+}
diff --git a/java/com/android/dialer/theme/base/res/values/attr.xml b/java/com/android/dialer/theme/base/res/values/attr.xml
new file mode 100644
index 0000000..606d161
--- /dev/null
+++ b/java/com/android/dialer/theme/base/res/values/attr.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2018 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+<resources>
+  <!-- Used to style all icons in Dialer. -->
+  <attr name="colorIcon" format="color"/>
+  <!-- Used to style some icons a little lighter in Dialer. -->
+  <attr name="colorIconSecondary" format="color"/>
+  <!-- Used to color text on dark backgrounds. White in Light Theme. -->
+  <attr name="colorTextOnUnthemedDarkBackground" format="color"/>
+  <!-- Used to color icons on dark backgrounds. White in Light Theme. -->
+  <attr name="colorIconOnUnthemedDarkBackground" format="color"/>
+  <!-- Used to color the background of chat bubbles we send -->
+  <attr name="colorMobileOriginatingChatBackground" format="color"/>
+  <!-- Used to color the text in chat bubbles we send -->
+  <attr name="colorMobileOriginatingChatText" format="color"/>
+  <!-- Used to color the background of chat bubbles we receive -->
+  <attr name="colorMobileTerminatingChatBackground" format="color"/>
+  <!-- Used to color the text in chat bubbles we receive -->
+  <attr name="colorMobileTerminatingChatText" format="color"/>
+  <!-- Used to theme ripple effects with the app's primary color. -->
+  <attr name="colorPrimary20pct" format="color|reference"/>
+</resources>
diff --git a/java/com/android/dialer/theme/base/res/values/styles_dialer_light.xml b/java/com/android/dialer/theme/base/res/values/styles_dialer_light.xml
new file mode 100644
index 0000000..5fecbae
--- /dev/null
+++ b/java/com/android/dialer/theme/base/res/values/styles_dialer_light.xml
@@ -0,0 +1,52 @@
+<!--
+  ~ Copyright (C) 2012 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+<resources>
+  <!-- TODO(a bug): properly document this or delete it -->
+  <!-- We don't want to style this, need to discuss with Yen why this was used instead of a default theme -->
+  <style name="Theme.PreCall.DialogHolder" parent="Dialer.ThemeBase.NoActionBar">
+    <item name="android:windowBackground">@android:color/transparent</item>
+    <item name="android:windowActivityTransitions">false</item>
+    <item name="android:windowIsTranslucent">true</item>
+
+    <item name="android:statusBarColor">@android:color/transparent</item>
+    <item name="android:navigationBarColor">@android:color/transparent</item>
+    <item name="android:windowDrawsSystemBarBackgrounds">true</item>
+  </style>
+
+  <!-- Style applied to the "Settings" screen.  Keep in sync with SettingsLight in Telephony. -->
+  <style name="SettingsStyle" parent="Dialer.ThemeBase.ActionBar">
+    <!-- Setting text. -->
+    <item name="android:textColorPrimary">@color/settings_text_color_primary</item>
+    <!-- Setting description. -->
+    <item name="android:textColorSecondary">@color/settings_text_color_secondary</item>
+    <item name="android:windowBackground">?android:attr/colorBackground</item>
+    <item name="android:colorAccent">?android:attr/colorPrimary</item>
+  </style>
+
+  <!-- TODO(a bug): This is only actively used in empty_content_view.xml. Move it there. -->
+  <style name="TextActionStyle">
+    <item name="android:layout_width">wrap_content</item>
+    <item name="android:layout_height">@dimen/call_log_action_height</item>
+    <item name="android:gravity">end|center_vertical</item>
+    <item name="android:paddingStart">@dimen/call_log_action_horizontal_padding</item>
+    <item name="android:paddingEnd">@dimen/call_log_action_horizontal_padding</item>
+    <item name="android:textColor">?android:attr/colorPrimary</item>
+    <item name="android:fontFamily">sans-serif-medium</item>
+    <item name="android:focusable">true</item>
+    <item name="android:singleLine">true</item>
+    <item name="android:textAllCaps">true</item>
+  </style>
+</resources>
diff --git a/java/com/android/dialer/theme/base/res/values/theme_dialer_dark.xml b/java/com/android/dialer/theme/base/res/values/theme_dialer_dark.xml
new file mode 100644
index 0000000..142bb89
--- /dev/null
+++ b/java/com/android/dialer/theme/base/res/values/theme_dialer_dark.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2018 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+<resources>
+  <!-- Deprecated: ActionBars are clunky and Toolbar (along with Dialer.ThemeBase.NoActionBar)
+      should be used in favor-->
+  <style name="Dialer.Dark.ThemeBase.ActionBar">
+    <!-- These are used to style all actionbars in Dialer. These aren't needed in Dialer.ThemeBase.NoActionBar -->
+    <item name="actionBarStyle">@style/DialerActionBarBaseStyle</item>
+    <item name="actionBarSize">@dimen/action_bar_height</item>
+  </style>
+
+  <style name="Dialer.Dark.ThemeBase.NoActionBar">
+    <!-- Copied from Theme.AppCompat.Light.NoActionBar. We can remove this and update the Dialer
+        base style once none of our activities depend on ActionBar anymore. -->
+    <item name="windowActionBar">false</item>
+    <item name="windowNoTitle">true</item>
+  </style>
+
+  <!-- Activities and Applications should inherit from one of the themes above. -->
+  <style name="Dialer.Dark.ThemeBase">
+    <!-- These values should be used to color all backgrounds. -->
+    <item name="android:colorBackground">@color/google_grey_900</item>
+    <item name="android:colorBackgroundFloating">@color/google_grey_800</item>
+
+    <!-- These values should be used to set text color. -->
+    <!-- swap text colors. -->
+    <item name="android:textColorPrimary">@color/dialer_dark_primary_text_color</item>
+    <item name="android:textColorSecondary">@color/dialer_dark_secondary_text_color</item>
+    <item name="android:textColorPrimaryInverse">@color/dialer_primary_text_color</item>
+    <item name="android:textColorSecondaryInverse">@color/dialer_secondary_text_color</item>
+    <item name="android:textColorHint">@color/google_grey_600</item>
+
+    <!-- These will be automatically used to color most Appcompat/Material widgets. -->
+    <item name="android:colorPrimary">@color/dialer_dark_theme_color</item>
+    <item name="colorPrimary">@color/dialer_dark_theme_color</item>
+    <item name="android:colorPrimaryDark">@color/dialer_dark_theme_color_dark</item>
+    <item name="colorPrimaryDark">@color/dialer_dark_theme_color_dark</item>
+    <item name="android:colorAccent">@color/dialer_dark_secondary_color</item>
+    <item name="colorAccent">@color/dialer_dark_secondary_color</item>
+
+    <!-- Used to automatically style check/selected checkbox, switches and radio buttons -->
+    <item name="colorControlActivated">?android:attr/colorPrimary</item>
+
+    <!-- Dialer specific attributes. -->
+    <item name="colorIcon">?android:attr/textColorSecondary</item>
+    <item name="colorIconSecondary">?android:attr/textColorSecondary</item>
+    <item name="colorTextOnUnthemedDarkBackground">@android:color/white</item>
+    <item name="colorIconOnUnthemedDarkBackground">@android:color/white</item>
+    <item name="colorPrimary20pct">@color/dialer_dark_theme_color_20pct</item>
+  </style>
+</resources>
\ No newline at end of file
diff --git a/java/com/android/dialer/theme/base/res/values/theme_dialer_light.xml b/java/com/android/dialer/theme/base/res/values/theme_dialer_light.xml
new file mode 100644
index 0000000..db06df4
--- /dev/null
+++ b/java/com/android/dialer/theme/base/res/values/theme_dialer_light.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2018 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+<resources>
+  <!-- Deprecated: ActionBars are clunky and Toolbar (along with Dialer.ThemeBase.NoActionBar)
+      should be used in favor-->
+  <style name="Dialer.ThemeBase.ActionBar">
+    <!-- These are used to style all actionbars in Dialer. These aren't needed in Dialer.ThemeBase.NoActionBar -->
+    <item name="actionBarStyle">@style/DialerActionBarBaseStyle</item>
+    <item name="actionBarSize">@dimen/action_bar_height</item>
+
+    <!-- Pulled from Theme.AppCompat.Light.DarkActionbar-->
+    <item name="actionBarPopupTheme">@style/ThemeOverlay.AppCompat.Light</item>
+    <item name="actionBarWidgetTheme">@null</item>
+    <item name="actionBarTheme">@style/DialerActionBarBaseTheme</item>
+    <item name="listChoiceBackgroundIndicator">@drawable/abc_list_selector_holo_dark</item>
+  </style>
+
+  <style name="Dialer.ThemeBase.NoActionBar">
+    <!-- Copied from Theme.AppCompat.Light.NoActionBar. We can remove this and update the Dialer
+        base style once none of our activities depend on ActionBar anymore. -->
+    <item name="windowActionBar">false</item>
+    <item name="windowNoTitle">true</item>
+  </style>
+
+  <!-- Activities and Applications should inherit from one of the themes above. -->
+  <style name="Dialer.ThemeBase">
+    <!-- These values should be used to color all backgrounds. -->
+    <item name="android:colorBackground">@color/dialer_background_color</item>
+    <item name="android:colorBackgroundFloating">@android:color/white</item>
+
+    <!-- These values should be used to set text color. -->
+    <item name="android:textColorPrimary">@color/dialer_primary_text_color</item>
+    <item name="android:textColorSecondary">@color/dialer_secondary_text_color</item>
+    <item name="android:textColorPrimaryInverse">@color/google_grey_300</item>
+    <item name="android:textColorSecondaryInverse">@color/google_grey_400</item>
+    <item name="android:textColorHint">@color/google_grey_600</item>
+
+    <!-- These will be automatically used to color most Appcompat/Material widgets. -->
+    <item name="android:colorPrimary">@color/dialer_theme_color</item>
+    <item name="colorPrimary">@color/dialer_theme_color</item>
+    <item name="android:colorPrimaryDark">@color/dialer_theme_color_dark</item>
+    <item name="colorPrimaryDark">@color/dialer_theme_color_dark</item>
+    <item name="android:colorAccent">@color/dialer_secondary_color</item>
+    <item name="colorAccent">@color/dialer_secondary_color</item>
+
+    <!-- Used to automatically style check/selected checkbox, switches and radio buttons -->
+    <item name="colorControlActivated">?android:attr/colorPrimary</item>
+
+    <!-- Dialer specific attributes. -->
+    <item name="colorIcon">@color/google_grey_700</item>
+    <item name="colorIconSecondary">@color/google_grey_400</item>
+    <item name="colorTextOnUnthemedDarkBackground">@android:color/white</item>
+    <item name="colorIconOnUnthemedDarkBackground">@android:color/white</item>
+    <item name="colorMobileTerminatingChatText">@color/google_grey_900</item>
+    <item name="colorMobileTerminatingChatBackground">@color/google_grey_100</item>
+    <item name="colorMobileOriginatingChatText">@color/google_blue_900</item>
+    <item name="colorMobileOriginatingChatBackground">@color/google_blue_100</item>
+    <item name="colorPrimary20pct">@color/dialer_theme_color_20pct</item>
+  </style>
+
+  <!-- TODO(a bug): investigate making this style's parent Dialer.ThemeBase.NoActionBar -->
+  <style name="Theme.AppCompat.Translucent" parent="Theme.AppCompat.NoActionBar">
+    <item name="android:windowNoTitle">true</item>
+    <item name="android:windowBackground">@android:color/transparent</item>
+    <item name="android:colorBackgroundCacheHint">@null</item>
+    <item name="android:windowIsTranslucent">true</item>
+    <item name="android:windowAnimationStyle">@android:style/Animation</item>
+  </style>
+
+  <!-- Deprecated: Use Toolbar instead of ActionBar. -->
+  <!-- Used to style all Dialer's action bars. Every actionbar is awarded this for free if the parent
+     activity's theme extends from Dialer.ThemeBase.ActionBar or doesn't specify a theme. -->
+  <style name="DialerActionBarBaseStyle"
+      parent="@style/Widget.AppCompat.Light.ActionBar.Solid.Inverse">
+    <item name="android:background">?android:attr/colorPrimary</item>
+    <item name="background">?android:attr/colorPrimary</item>
+  </style>
+  <style name="DialerActionBarBaseTheme"
+      parent="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
+    <item name="colorControlNormal">@android:color/white</item>
+  </style>
+</resources>
diff --git a/java/com/android/dialer/theme/common/AndroidManifest.xml b/java/com/android/dialer/theme/common/AndroidManifest.xml
new file mode 100644
index 0000000..51e532e
--- /dev/null
+++ b/java/com/android/dialer/theme/common/AndroidManifest.xml
@@ -0,0 +1,16 @@
+<!--
+  ~ Copyright (C) 2018 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+<manifest package="com.android.dialer.theme.common"/>
diff --git a/java/com/android/dialer/theme/common/res/anim/front_back_switch_button_animation.xml b/java/com/android/dialer/theme/common/res/anim/front_back_switch_button_animation.xml
new file mode 100644
index 0000000..152497b
--- /dev/null
+++ b/java/com/android/dialer/theme/common/res/anim/front_back_switch_button_animation.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2018 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+<set
+  xmlns:android="http://schemas.android.com/apk/res/android">
+  <set
+    android:ordering="sequentially">
+    <objectAnimator
+      android:duration="500"
+      android:propertyName="rotation"
+      android:valueFrom="0.0"
+      android:valueTo="-180.0"
+      android:valueType="floatType"
+      android:interpolator="@android:interpolator/fast_out_slow_in"/>
+  </set>
+</set>
\ No newline at end of file
diff --git a/java/com/android/dialer/theme/common/res/animator/activated_button_elevation.xml b/java/com/android/dialer/theme/common/res/animator/activated_button_elevation.xml
new file mode 100644
index 0000000..2b47f0d
--- /dev/null
+++ b/java/com/android/dialer/theme/common/res/animator/activated_button_elevation.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2018 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+  <item
+    android:state_enabled="true"
+    android:state_activated="true">
+    <objectAnimator
+      android:duration="@android:integer/config_shortAnimTime"
+      android:propertyName="translationZ"
+      android:valueFrom="0dp"
+      android:valueTo="4dp"
+      android:valueType="floatType"/>
+  </item>
+  <item>
+    <objectAnimator
+      android:duration="@android:integer/config_shortAnimTime"
+      android:propertyName="translationZ"
+      android:valueFrom="4dp"
+      android:valueTo="0dp"
+      android:valueType="floatType"/>
+  </item>
+</selector>
diff --git a/java/com/android/dialer/theme/common/res/drawable-hdpi/empty_speed_dial.png b/java/com/android/dialer/theme/common/res/drawable-hdpi/empty_speed_dial.png
new file mode 100644
index 0000000..5a18295
--- /dev/null
+++ b/java/com/android/dialer/theme/common/res/drawable-hdpi/empty_speed_dial.png
Binary files differ
diff --git a/java/com/android/dialer/theme/common/res/drawable-mdpi/empty_speed_dial.png b/java/com/android/dialer/theme/common/res/drawable-mdpi/empty_speed_dial.png
new file mode 100644
index 0000000..3c95eeb
--- /dev/null
+++ b/java/com/android/dialer/theme/common/res/drawable-mdpi/empty_speed_dial.png
Binary files differ
diff --git a/java/com/android/dialer/theme/common/res/drawable-xhdpi/empty_speed_dial.png b/java/com/android/dialer/theme/common/res/drawable-xhdpi/empty_speed_dial.png
new file mode 100644
index 0000000..9335011
--- /dev/null
+++ b/java/com/android/dialer/theme/common/res/drawable-xhdpi/empty_speed_dial.png
Binary files differ
diff --git a/java/com/android/dialer/theme/common/res/drawable-xxhdpi/empty_speed_dial.png b/java/com/android/dialer/theme/common/res/drawable-xxhdpi/empty_speed_dial.png
new file mode 100644
index 0000000..04ab7b4
--- /dev/null
+++ b/java/com/android/dialer/theme/common/res/drawable-xxhdpi/empty_speed_dial.png
Binary files differ
diff --git a/java/com/android/dialer/theme/common/res/drawable/front_back_switch_button.xml b/java/com/android/dialer/theme/common/res/drawable/front_back_switch_button.xml
new file mode 100644
index 0000000..56fafca
--- /dev/null
+++ b/java/com/android/dialer/theme/common/res/drawable/front_back_switch_button.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2018 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+<vector
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  android:name="front_back_switch_button"
+  android:width="56dp"
+  android:viewportWidth="56"
+  android:height="56dp"
+  android:viewportHeight="56">
+  <group
+    android:name="layer_3_outlines"
+    android:translateX="32.0015"
+    android:translateY="27.00208">
+    <group
+      android:name="layer_3_outlines_pivot"
+      android:translateX="-4.25"
+      android:translateY="-7.25">
+      <group
+        android:name="group_1"
+        android:translateX="4.25"
+        android:translateY="7.25001">
+        <path
+          android:name="path_1"
+          android:pathData="M 2.0,-5.0 c 0.0,0.0 -2.16999816895,0.0 -2.16999816895,0.0 c 0.0,0.0 -1.83000183105,-2.0 -1.83000183105,-2.0 c 0.0,0.0 -2.0,0.0 -2.0,0.0 c 0.0,0.0 0.0,5.0 0.0,5.0 c 1.65600585938,0.0 3.0,1.34399414062 3.0,3.0 c 0.0,1.65600585938 -1.34399414062,3.0 -3.0,3.0 c 0.0,0.0 -3.0,0.00181579589844 -3.0,0.00181579589844 c 0.0,0.0 0.001953125,2.99415588379 0.001953125,2.99415588379 c 0.0,0.0 2.998046875,0.0040283203125 2.998046875,0.0040283203125 c 0.0,0.0 6.0,0.0 6.0,0.0 c 1.10000610352,0.0 2.0,-0.899993896484 2.0,-2.0 c 0.0,0.0 0.0,-8.0 0.0,-8.0 c 0.0,-1.10000610352 -0.899993896484,-2.0 -2.0,-2.0 Z"
+          android:fillColor="#FFFFFFFF"/>
+      </group>
+    </group>
+  </group>
+  <group
+    android:name="layer_1_outlines"
+    android:translateX="24.00099"
+    android:translateY="26.99992">
+    <group
+      android:name="layer_1_outlines_pivot"
+      android:translateX="-4.249"
+      android:translateY="-7.25">
+      <group
+        android:name="group_2"
+        android:translateX="4.249"
+        android:translateY="7.25">
+        <path
+          android:name="path_2"
+          android:pathData="M 3.99900817871,4.0 c -1.65501403809,-0.00099182128906 -2.99800109863,-1.34399414062 -2.99800109863,-3.0 c 0.0,-1.6549987793 1.34298706055,-2.99899291992 2.99800109863,-3.0 c 0.0,0.0 1.0,0.00008 1.0,0.00008 c 0.0,0.0 0.0,-5.0 0.0,-5.0 c 0.0,0.0 -1.0,-0.00008 -1.0,-0.00008 c 0.0,0.0 -1.99800109863,0.0 -1.99800109863,0.0 c 0.0,0.0 -1.83000183105,2.0 -1.83000183105,2.0 c 0.0,0.0 -2.17001342773,0.0 -2.17001342773,0.0 c -1.1009979248,0.0 -2.0,0.899993896484 -2.0,2.0 c 0.0,0.0 0.0,8.0 0.0,8.0 c 0.0,1.10000610352 0.899002075195,2.0 2.0,2.0 c 0.0,0.0 5.99801635742,0.0 5.99801635742,0.0 c 0.0,0.0 0.0,-3.0 0.0,-3.0 Z"
+          android:fillColor="#FFFFFFFF"/>
+      </group>
+    </group>
+  </group>
+  <group
+    android:name="layer_10_outlines"
+    android:translateX="28.00001"
+    android:translateY="27.99999">
+    <group
+      android:name="layer_10_outlines_pivot"
+      android:translateX="-19.25"
+      android:translateY="-19.25005">
+      <group
+        android:name="group_3"
+        android:translateX="20.25"
+        android:translateY="9.75001">
+        <path
+          android:name="path_3"
+          android:pathData="M 12.4349975586,-3.93499755859 c -3.70999145508,-3.71000671387 -8.57299804688,-5.56500244141 -13.4349975586,-5.56500244141 c -4.8630065918,0.0 -9.72500610352,1.85499572754 -13.4349975586,5.56500244141 c -0.337005615234,0.336990356445 -0.652008056641,0.688003540039 -0.956008911133,1.04399108887 c 0.0,0.0 -2.60899353027,-2.60899353027 -2.60899353027,-2.60899353027 c 0.0,0.0 0.0,7.0 0.0,7.0 c 0.0,0.0 7.0,0.0 7.0,0.0 c 0.0,0.0 -2.97300720215,-2.97300720215 -2.97300720215,-2.97300720215 c 0.300003051758,-0.360992431641 0.616012573242,-0.711990356445 0.952011108398,-1.0479888916 c 3.21099853516,-3.21099853516 7.47999572754,-4.97900390625 12.0209960938,-4.97900390625 c 4.54100036621,0.0 8.80999755859,1.76800537109 12.0209960938,4.97900390625 c 3.31401062012,3.31399536133 4.97100830078,7.66799926758 4.97100830078,12.0209960938 c 0.0,0.0 2.00799560547,0.0 2.00799560547,0.0 c 0.0,-4.86199951172 -1.85499572754,-9.72500610352 -5.56500244141,-13.4349975586 Z"
+          android:fillColor="#FFFFFFFF"/>
+      </group>
+      <group
+        android:name="group_4"
+        android:translateX="18.25"
+        android:translateY="28.75011">
+        <path
+          android:name="path_4"
+          android:pathData="M 18.0,-1.5 c 0.0,0.0 -7.0,0.0 -7.0,0.0 c 0.0,0.0 2.97300720215,2.97300720215 2.97300720215,2.97300720215 c -0.300003051758,0.360992431641 -0.616012573242,0.711990356445 -0.952011108398,1.0479888916 c -3.21099853516,3.21099853516 -7.47999572754,4.97900390625 -12.0209960938,4.97900390625 c -4.54100036621,0.0 -8.80999755859,-1.76800537109 -12.0209960938,-4.97900390625 c -3.31401062012,-3.31399536133 -4.97100830078,-7.66799926758 -4.97100830078,-12.0209960938 c 0.0,0.0 -2.00799560547,0.0 -2.00799560547,0.0 c 0.0,4.86199951172 1.85499572754,9.72500610352 5.56500244141,13.4349975586 c 3.70999145508,3.71000671387 8.57299804688,5.56500244141 13.4349975586,5.56500244141 c 4.8630065918,0.0 9.72500610352,-1.85499572754 13.4349975586,-5.56500244141 c 0.337005615234,-0.336990356445 0.652008056641,-0.688003540039 0.956008911133,-1.04400634766 c 0.0,0.0 2.60899353027,2.60900878906 2.60899353027,2.60900878906 c 0.0,0.0 0.0,-7.0 0.0,-7.0 Z"
+          android:fillColor="#FFFFFFFF"/>
+      </group>
+    </group>
+  </group>
+</vector>
\ No newline at end of file
diff --git a/java/com/android/dialer/theme/common/res/drawable/front_back_switch_button_animation.xml b/java/com/android/dialer/theme/common/res/drawable/front_back_switch_button_animation.xml
new file mode 100644
index 0000000..6870616
--- /dev/null
+++ b/java/com/android/dialer/theme/common/res/drawable/front_back_switch_button_animation.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2018 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+<animated-vector
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  android:drawable="@drawable/front_back_switch_button">
+  <target
+    android:name="layer_10_outlines"
+    android:animation="@anim/front_back_switch_button_animation"/>
+</animated-vector>
\ No newline at end of file
diff --git a/java/com/android/dialer/theme/common/res/drawable/item_background_material_borderless_dark.xml b/java/com/android/dialer/theme/common/res/drawable/item_background_material_borderless_dark.xml
new file mode 100644
index 0000000..e18300e
--- /dev/null
+++ b/java/com/android/dialer/theme/common/res/drawable/item_background_material_borderless_dark.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- Based on the Theme.Material's default selectableItemBackgroundBorderless -->
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="#A0FFFFFF"/>
\ No newline at end of file
diff --git a/java/com/android/dialer/theme/common/res/values-af/strings.xml b/java/com/android/dialer/theme/common/res/values-af/strings.xml
new file mode 100644
index 0000000..5c9a1e1
--- /dev/null
+++ b/java/com/android/dialer/theme/common/res/values-af/strings.xml
@@ -0,0 +1,11 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="unknown">Onbekend</string>
+  <string name="unknown_counter">%1$s %2$d</string>
+  <string name="payphone">Telefoonhokkie</string>
+  <string name="emergency_number">Noodnommer</string>
+  <string name="launcherActivityLabel">Foon</string>
+  <string name="call">Bel</string>
+  <string name="video_call_lte_to_wifi_handover_toast">Gaan voort met oproep deur Wi-Fi te gebruik …</string>
+  <string name="rtt_call_not_available_toast">RTT nie beskikbaar vir hierdie oproep nie</string>
+  <string name="call_subject_type_and_number">%1$s %2$s</string>
+</resources>
diff --git a/java/com/android/dialer/theme/common/res/values-am/strings.xml b/java/com/android/dialer/theme/common/res/values-am/strings.xml
new file mode 100644
index 0000000..ae8a1a9
--- /dev/null
+++ b/java/com/android/dialer/theme/common/res/values-am/strings.xml
@@ -0,0 +1,11 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="unknown">ያልታወቀ   </string>
+  <string name="unknown_counter">%1$s %2$d</string>
+  <string name="payphone">የሕዝብ ስልክ</string>
+  <string name="emergency_number">የአደጋ ጊዜ ቁጥር</string>
+  <string name="launcherActivityLabel">ስልክ  </string>
+  <string name="call">ደውል</string>
+  <string name="video_call_lte_to_wifi_handover_toast">Wi‑Fi ን መጠቀም በመቀጠል ላይ…</string>
+  <string name="rtt_call_not_available_toast">አርቲቲ ለዚህ ጥሪ አይገኝም</string>
+  <string name="call_subject_type_and_number">%1$s %2$s</string>
+</resources>
diff --git a/java/com/android/dialer/theme/common/res/values-ar/strings.xml b/java/com/android/dialer/theme/common/res/values-ar/strings.xml
new file mode 100644
index 0000000..bb96605
--- /dev/null
+++ b/java/com/android/dialer/theme/common/res/values-ar/strings.xml
@@ -0,0 +1,11 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="unknown">غير معروف</string>
+  <string name="unknown_counter">%1$s %2$d</string>
+  <string name="payphone">هاتف يعمل بالعملة</string>
+  <string name="emergency_number">رقم الطوارئ</string>
+  <string name="launcherActivityLabel">الهاتف</string>
+  <string name="call">اتصال</string>
+  <string name="video_call_lte_to_wifi_handover_toast">‏جارٍ متابعة المكالمة باستخدام Wi‑Fi…</string>
+  <string name="rtt_call_not_available_toast">لا تتوفر ميزة \"المراسلة النصية في الوقت الفعلي\" لهذه المكالمة</string>
+  <string name="call_subject_type_and_number">%1$s %2$s</string>
+</resources>
diff --git a/java/com/android/dialer/theme/common/res/values-az/strings.xml b/java/com/android/dialer/theme/common/res/values-az/strings.xml
new file mode 100644
index 0000000..ff19fab
--- /dev/null
+++ b/java/com/android/dialer/theme/common/res/values-az/strings.xml
@@ -0,0 +1,11 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="unknown">Naməlum</string>
+  <string name="unknown_counter">%1$s %2$d</string>
+  <string name="payphone">Taksofon</string>
+  <string name="emergency_number">Təcili nömrə</string>
+  <string name="launcherActivityLabel">Telefon</string>
+  <string name="call">Zəng edin</string>
+  <string name="video_call_lte_to_wifi_handover_toast">Wi‑Fi istifadə edərək zəngə davam edin…</string>
+  <string name="rtt_call_not_available_toast">Bu zəng üçün RTT əlçatan deyil</string>
+  <string name="call_subject_type_and_number">%1$s %2$s</string>
+</resources>
diff --git a/java/com/android/dialer/theme/common/res/values-b+sr+Latn/strings.xml b/java/com/android/dialer/theme/common/res/values-b+sr+Latn/strings.xml
new file mode 100644
index 0000000..27e8beb
--- /dev/null
+++ b/java/com/android/dialer/theme/common/res/values-b+sr+Latn/strings.xml
@@ -0,0 +1,11 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="unknown">Nepoznato</string>
+  <string name="unknown_counter">%1$s %2$d</string>
+  <string name="payphone">Telefonska govornica</string>
+  <string name="emergency_number">Broj hitne službe</string>
+  <string name="launcherActivityLabel">Telefon</string>
+  <string name="call">Pozovi</string>
+  <string name="video_call_lte_to_wifi_handover_toast">Poziv se nastavlja pomoću Wi‑Fi-ja…</string>
+  <string name="rtt_call_not_available_toast">RTT nije dostupan za ovaj poziv</string>
+  <string name="call_subject_type_and_number">%1$s %2$s</string>
+</resources>
diff --git a/java/com/android/dialer/theme/common/res/values-be/strings.xml b/java/com/android/dialer/theme/common/res/values-be/strings.xml
new file mode 100644
index 0000000..2e35ba2
--- /dev/null
+++ b/java/com/android/dialer/theme/common/res/values-be/strings.xml
@@ -0,0 +1,11 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="unknown">Невядомы</string>
+  <string name="unknown_counter">%1$s %2$d</string>
+  <string name="payphone">Таксафон</string>
+  <string name="emergency_number">Нумар экстраннай службы</string>
+  <string name="launcherActivityLabel">Тэлефон</string>
+  <string name="call">Выклікаць</string>
+  <string name="video_call_lte_to_wifi_handover_toast">Працягваць выклік, выкарыстоўваючы сетку Wi‑Fi…</string>
+  <string name="rtt_call_not_available_toast">RTT недаступна для гэтага выкліку</string>
+  <string name="call_subject_type_and_number">%1$s %2$s</string>
+</resources>
diff --git a/java/com/android/dialer/theme/common/res/values-bg/strings.xml b/java/com/android/dialer/theme/common/res/values-bg/strings.xml
new file mode 100644
index 0000000..45bafb8
--- /dev/null
+++ b/java/com/android/dialer/theme/common/res/values-bg/strings.xml
@@ -0,0 +1,11 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="unknown">Неизвестен номер</string>
+  <string name="unknown_counter">%1$s %2$d</string>
+  <string name="payphone">Обществен телефон</string>
+  <string name="emergency_number">Спешен номер</string>
+  <string name="launcherActivityLabel">Телефон</string>
+  <string name="call">Обаждане</string>
+  <string name="video_call_lte_to_wifi_handover_toast">Обаждането продължава през Wi‑Fi…</string>
+  <string name="rtt_call_not_available_toast">ТСРВ не е налице за това обаждане</string>
+  <string name="call_subject_type_and_number">%1$s %2$s</string>
+</resources>
diff --git a/java/com/android/dialer/theme/common/res/values-bn/strings.xml b/java/com/android/dialer/theme/common/res/values-bn/strings.xml
new file mode 100644
index 0000000..7752d4e
--- /dev/null
+++ b/java/com/android/dialer/theme/common/res/values-bn/strings.xml
@@ -0,0 +1,11 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="unknown">অজানা</string>
+  <string name="unknown_counter">%1$s %2$d</string>
+  <string name="payphone">পে ফোন</string>
+  <string name="emergency_number">জরুরি নম্বর</string>
+  <string name="launcherActivityLabel">ফোন</string>
+  <string name="call">কল করুন</string>
+  <string name="video_call_lte_to_wifi_handover_toast">ওয়াই-ফাই দিয়ে কল জারি রাখা হচ্ছে…</string>
+  <string name="rtt_call_not_available_toast">এই কলের জন্য RTT সুবিধা উপলভ্য নয়</string>
+  <string name="call_subject_type_and_number">%1$s %2$s</string>
+</resources>
diff --git a/java/com/android/dialer/theme/common/res/values-bs/strings.xml b/java/com/android/dialer/theme/common/res/values-bs/strings.xml
new file mode 100644
index 0000000..8f67289
--- /dev/null
+++ b/java/com/android/dialer/theme/common/res/values-bs/strings.xml
@@ -0,0 +1,11 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="unknown">Nepoznato</string>
+  <string name="unknown_counter">%1$s %2$d</string>
+  <string name="payphone">Telefonska govornica</string>
+  <string name="emergency_number">Broj za hitne slučajeve</string>
+  <string name="launcherActivityLabel">Telefon</string>
+  <string name="call">Pozovi</string>
+  <string name="video_call_lte_to_wifi_handover_toast">Nastavak poziva putem Wi‑Fi-ja…</string>
+  <string name="rtt_call_not_available_toast">RTT nije dostupan za ovaj poziv</string>
+  <string name="call_subject_type_and_number">%1$s %2$s</string>
+</resources>
diff --git a/java/com/android/dialer/theme/common/res/values-ca/strings.xml b/java/com/android/dialer/theme/common/res/values-ca/strings.xml
new file mode 100644
index 0000000..c0797fe
--- /dev/null
+++ b/java/com/android/dialer/theme/common/res/values-ca/strings.xml
@@ -0,0 +1,11 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="unknown">Desconegut</string>
+  <string name="unknown_counter">%1$s %2$d</string>
+  <string name="payphone">Telèfon públic</string>
+  <string name="emergency_number">Número d\'emergència</string>
+  <string name="launcherActivityLabel">Telèfon</string>
+  <string name="call">Truca</string>
+  <string name="video_call_lte_to_wifi_handover_toast">S\'està continuant la trucada mitjançant la Wi‑Fi…</string>
+  <string name="rtt_call_not_available_toast">La funció RTT no està disponible en aquesta trucada</string>
+  <string name="call_subject_type_and_number">%1$s %2$s</string>
+</resources>
diff --git a/java/com/android/dialer/theme/common/res/values-cs/strings.xml b/java/com/android/dialer/theme/common/res/values-cs/strings.xml
new file mode 100644
index 0000000..8471ec0
--- /dev/null
+++ b/java/com/android/dialer/theme/common/res/values-cs/strings.xml
@@ -0,0 +1,11 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="unknown">Neznámé</string>
+  <string name="unknown_counter">%1$s %2$d</string>
+  <string name="payphone">Telefonní automat</string>
+  <string name="emergency_number">Číslo tísňové linky</string>
+  <string name="launcherActivityLabel">Telefon</string>
+  <string name="call">Volat</string>
+  <string name="video_call_lte_to_wifi_handover_toast">Hovor pokračuje přes Wi-Fi…</string>
+  <string name="rtt_call_not_available_toast">Pro tento hovor není funkce SMS během hovoru dostupná</string>
+  <string name="call_subject_type_and_number">%1$s %2$s</string>
+</resources>
diff --git a/java/com/android/dialer/theme/common/res/values-da/strings.xml b/java/com/android/dialer/theme/common/res/values-da/strings.xml
new file mode 100644
index 0000000..8863a78
--- /dev/null
+++ b/java/com/android/dialer/theme/common/res/values-da/strings.xml
@@ -0,0 +1,11 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="unknown">Ukendt</string>
+  <string name="unknown_counter">%1$s %2$d</string>
+  <string name="payphone">Mønttelefon</string>
+  <string name="emergency_number">Alarmnummer</string>
+  <string name="launcherActivityLabel">Opkald</string>
+  <string name="call">Ring op</string>
+  <string name="video_call_lte_to_wifi_handover_toast">Opkaldet fortsættes via Wi-Fi…</string>
+  <string name="rtt_call_not_available_toast">Sms i realtid er ikke tilgængeligt for dette opkald</string>
+  <string name="call_subject_type_and_number">%1$s %2$s</string>
+</resources>
diff --git a/java/com/android/dialer/theme/common/res/values-de/strings.xml b/java/com/android/dialer/theme/common/res/values-de/strings.xml
new file mode 100644
index 0000000..12269e3
--- /dev/null
+++ b/java/com/android/dialer/theme/common/res/values-de/strings.xml
@@ -0,0 +1,11 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="unknown">Unbekannt</string>
+  <string name="unknown_counter">%1$s %2$d</string>
+  <string name="payphone">Münztelefon</string>
+  <string name="emergency_number">Notrufnummer</string>
+  <string name="launcherActivityLabel">Telefon</string>
+  <string name="call">Anrufen</string>
+  <string name="video_call_lte_to_wifi_handover_toast">Anruf wird über WLAN fortgesetzt…</string>
+  <string name="rtt_call_not_available_toast">RTT ist für diesen Anruf nicht verfügbar</string>
+  <string name="call_subject_type_and_number">%1$s %2$s</string>
+</resources>
diff --git a/java/com/android/dialer/theme/common/res/values-el/strings.xml b/java/com/android/dialer/theme/common/res/values-el/strings.xml
new file mode 100644
index 0000000..c395840
--- /dev/null
+++ b/java/com/android/dialer/theme/common/res/values-el/strings.xml
@@ -0,0 +1,11 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="unknown">Άγνωστος</string>
+  <string name="unknown_counter">%1$s %2$d</string>
+  <string name="payphone">Τηλέφωνο με χρέωση</string>
+  <string name="emergency_number">Αριθμός έκτακτης ανάγκης</string>
+  <string name="launcherActivityLabel">Τηλέφωνο</string>
+  <string name="call">Κλήση</string>
+  <string name="video_call_lte_to_wifi_handover_toast">Συνέχιση κλήσης μέσω Wi‑Fi…</string>
+  <string name="rtt_call_not_available_toast">Το RTT δεν είναι διαθέσιμο για αυτήν την κλήση</string>
+  <string name="call_subject_type_and_number">%1$s %2$s</string>
+</resources>
diff --git a/java/com/android/dialer/theme/common/res/values-en-rAU/strings.xml b/java/com/android/dialer/theme/common/res/values-en-rAU/strings.xml
new file mode 100644
index 0000000..c366dac
--- /dev/null
+++ b/java/com/android/dialer/theme/common/res/values-en-rAU/strings.xml
@@ -0,0 +1,11 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="unknown">Unknown</string>
+  <string name="unknown_counter">%1$s %2$d</string>
+  <string name="payphone">Payphone</string>
+  <string name="emergency_number">Emergency number</string>
+  <string name="launcherActivityLabel">Phone</string>
+  <string name="call">Call</string>
+  <string name="video_call_lte_to_wifi_handover_toast">Continuing call using Wi‑Fi…</string>
+  <string name="rtt_call_not_available_toast">RTT not available for this call</string>
+  <string name="call_subject_type_and_number">%1$s %2$s</string>
+</resources>
diff --git a/java/com/android/dialer/theme/common/res/values-en-rGB/strings.xml b/java/com/android/dialer/theme/common/res/values-en-rGB/strings.xml
new file mode 100644
index 0000000..c366dac
--- /dev/null
+++ b/java/com/android/dialer/theme/common/res/values-en-rGB/strings.xml
@@ -0,0 +1,11 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="unknown">Unknown</string>
+  <string name="unknown_counter">%1$s %2$d</string>
+  <string name="payphone">Payphone</string>
+  <string name="emergency_number">Emergency number</string>
+  <string name="launcherActivityLabel">Phone</string>
+  <string name="call">Call</string>
+  <string name="video_call_lte_to_wifi_handover_toast">Continuing call using Wi‑Fi…</string>
+  <string name="rtt_call_not_available_toast">RTT not available for this call</string>
+  <string name="call_subject_type_and_number">%1$s %2$s</string>
+</resources>
diff --git a/java/com/android/dialer/theme/common/res/values-en-rIN/strings.xml b/java/com/android/dialer/theme/common/res/values-en-rIN/strings.xml
new file mode 100644
index 0000000..c366dac
--- /dev/null
+++ b/java/com/android/dialer/theme/common/res/values-en-rIN/strings.xml
@@ -0,0 +1,11 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="unknown">Unknown</string>
+  <string name="unknown_counter">%1$s %2$d</string>
+  <string name="payphone">Payphone</string>
+  <string name="emergency_number">Emergency number</string>
+  <string name="launcherActivityLabel">Phone</string>
+  <string name="call">Call</string>
+  <string name="video_call_lte_to_wifi_handover_toast">Continuing call using Wi‑Fi…</string>
+  <string name="rtt_call_not_available_toast">RTT not available for this call</string>
+  <string name="call_subject_type_and_number">%1$s %2$s</string>
+</resources>
diff --git a/java/com/android/dialer/theme/common/res/values-es-rUS/strings.xml b/java/com/android/dialer/theme/common/res/values-es-rUS/strings.xml
new file mode 100644
index 0000000..340c0d0
--- /dev/null
+++ b/java/com/android/dialer/theme/common/res/values-es-rUS/strings.xml
@@ -0,0 +1,11 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="unknown">Desconocido</string>
+  <string name="unknown_counter">%1$s %2$d</string>
+  <string name="payphone">Teléfono público</string>
+  <string name="emergency_number">Número de emergencia</string>
+  <string name="launcherActivityLabel">Teléfono</string>
+  <string name="call">Llamar</string>
+  <string name="video_call_lte_to_wifi_handover_toast">Continuando llamada a través de Wi-Fi…</string>
+  <string name="rtt_call_not_available_toast">La función de RTT no está disponible en esta llamada</string>
+  <string name="call_subject_type_and_number">%1$s %2$s</string>
+</resources>
diff --git a/java/com/android/dialer/theme/common/res/values-es/strings.xml b/java/com/android/dialer/theme/common/res/values-es/strings.xml
new file mode 100644
index 0000000..50eb043
--- /dev/null
+++ b/java/com/android/dialer/theme/common/res/values-es/strings.xml
@@ -0,0 +1,11 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="unknown">Desconocido</string>
+  <string name="unknown_counter">%1$s %2$d</string>
+  <string name="payphone">Teléfono público</string>
+  <string name="emergency_number">Número de emergencia</string>
+  <string name="launcherActivityLabel">Teléfono</string>
+  <string name="call">Llamar</string>
+  <string name="video_call_lte_to_wifi_handover_toast">Continuando la llamada a través de Wi-Fi…</string>
+  <string name="rtt_call_not_available_toast">TTR no disponible para esta llamada</string>
+  <string name="call_subject_type_and_number">%1$s %2$s</string>
+</resources>
diff --git a/java/com/android/dialer/theme/common/res/values-et/strings.xml b/java/com/android/dialer/theme/common/res/values-et/strings.xml
new file mode 100644
index 0000000..a7a4466
--- /dev/null
+++ b/java/com/android/dialer/theme/common/res/values-et/strings.xml
@@ -0,0 +1,11 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="unknown">Tundmatu</string>
+  <string name="unknown_counter">%1$s %2$d</string>
+  <string name="payphone">Telefoniautomaat</string>
+  <string name="emergency_number">Hädaabinumber</string>
+  <string name="launcherActivityLabel">Telefon</string>
+  <string name="call">Helista</string>
+  <string name="video_call_lte_to_wifi_handover_toast">Kõnet jätkatakse WiFi kaudu …</string>
+  <string name="rtt_call_not_available_toast">RTT pole selle kõne puhul saadaval</string>
+  <string name="call_subject_type_and_number">%1$s %2$s</string>
+</resources>
diff --git a/java/com/android/dialer/theme/common/res/values-eu/strings.xml b/java/com/android/dialer/theme/common/res/values-eu/strings.xml
new file mode 100644
index 0000000..8232dc6
--- /dev/null
+++ b/java/com/android/dialer/theme/common/res/values-eu/strings.xml
@@ -0,0 +1,11 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="unknown">Ezezaguna</string>
+  <string name="unknown_counter">%1$s %2$d</string>
+  <string name="payphone">Telefono publikoa</string>
+  <string name="emergency_number">Larrialdietarako zenbakia</string>
+  <string name="launcherActivityLabel">Telefonoa</string>
+  <string name="call">Deitu</string>
+  <string name="video_call_lte_to_wifi_handover_toast">Wi-Fi bidezko konexiora aldatzen…</string>
+  <string name="rtt_call_not_available_toast">Deietan testua bidaltzeko eginbidea ez dago erabilgarri dei honetan</string>
+  <string name="call_subject_type_and_number">%1$s %2$s</string>
+</resources>
diff --git a/java/com/android/dialer/theme/common/res/values-fa/strings.xml b/java/com/android/dialer/theme/common/res/values-fa/strings.xml
new file mode 100644
index 0000000..d96d7aa
--- /dev/null
+++ b/java/com/android/dialer/theme/common/res/values-fa/strings.xml
@@ -0,0 +1,11 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="unknown">ناشناس</string>
+  <string name="unknown_counter">%1$s %2$d</string>
+  <string name="payphone">تلفن عمومی</string>
+  <string name="emergency_number">شماره اضطراری</string>
+  <string name="launcherActivityLabel">تلفن</string>
+  <string name="call">تماس</string>
+  <string name="video_call_lte_to_wifi_handover_toast">‏ادامه تماس با استفاده از Wi‑Fi…</string>
+  <string name="rtt_call_not_available_toast">«نوشتار هم‌زمان» برای این تماس دردسترس نیست</string>
+  <string name="call_subject_type_and_number">%1$s %2$s</string>
+</resources>
diff --git a/java/com/android/dialer/theme/common/res/values-fi/strings.xml b/java/com/android/dialer/theme/common/res/values-fi/strings.xml
new file mode 100644
index 0000000..7ab7e46
--- /dev/null
+++ b/java/com/android/dialer/theme/common/res/values-fi/strings.xml
@@ -0,0 +1,11 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="unknown">Tuntematon</string>
+  <string name="unknown_counter">%1$s %2$d</string>
+  <string name="payphone">Maksupuhelin</string>
+  <string name="emergency_number">Hätänumero</string>
+  <string name="launcherActivityLabel">Puhelin</string>
+  <string name="call">Soita</string>
+  <string name="video_call_lte_to_wifi_handover_toast">Jatketaan puhelua Wi‑Fi-yhteydellä…</string>
+  <string name="rtt_call_not_available_toast">RTT ei ole käytettävissä tässä puhelussa.</string>
+  <string name="call_subject_type_and_number">%1$s %2$s</string>
+</resources>
diff --git a/java/com/android/dialer/theme/common/res/values-fr-rCA/strings.xml b/java/com/android/dialer/theme/common/res/values-fr-rCA/strings.xml
new file mode 100644
index 0000000..b774b4c
--- /dev/null
+++ b/java/com/android/dialer/theme/common/res/values-fr-rCA/strings.xml
@@ -0,0 +1,11 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="unknown">Inconnu</string>
+  <string name="unknown_counter">%1$s %2$d</string>
+  <string name="payphone">Cabine téléphonique</string>
+  <string name="emergency_number">Numéro d\'urgence</string>
+  <string name="launcherActivityLabel">Téléphone</string>
+  <string name="call">Appeler</string>
+  <string name="video_call_lte_to_wifi_handover_toast">Transfert de l\'appel du réseau Wi-Fi au réseau LTE en cours…</string>
+  <string name="rtt_call_not_available_toast">Texte en temps réel non disponible pour cet appel</string>
+  <string name="call_subject_type_and_number">%1$s %2$s</string>
+</resources>
diff --git a/java/com/android/dialer/theme/common/res/values-fr/strings.xml b/java/com/android/dialer/theme/common/res/values-fr/strings.xml
new file mode 100644
index 0000000..0c0e8f5
--- /dev/null
+++ b/java/com/android/dialer/theme/common/res/values-fr/strings.xml
@@ -0,0 +1,11 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="unknown">Inconnu</string>
+  <string name="unknown_counter">%1$s %2$d</string>
+  <string name="payphone">Cabine téléphonique</string>
+  <string name="emergency_number">Numéro d\'urgence</string>
+  <string name="launcherActivityLabel">Téléphone</string>
+  <string name="call">Appeler</string>
+  <string name="video_call_lte_to_wifi_handover_toast">Poursuite de l\'appel en utilisant le Wi-Fi…</string>
+  <string name="rtt_call_not_available_toast">Texte en temps réel non disponible pour cet appel</string>
+  <string name="call_subject_type_and_number">%1$s %2$s</string>
+</resources>
diff --git a/java/com/android/dialer/theme/common/res/values-gl/strings.xml b/java/com/android/dialer/theme/common/res/values-gl/strings.xml
new file mode 100644
index 0000000..c6c2405
--- /dev/null
+++ b/java/com/android/dialer/theme/common/res/values-gl/strings.xml
@@ -0,0 +1,11 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="unknown">Descoñecido</string>
+  <string name="unknown_counter">%1$s %2$d</string>
+  <string name="payphone">Teléfono público</string>
+  <string name="emergency_number">Número de urxencia</string>
+  <string name="launcherActivityLabel">Teléfono</string>
+  <string name="call">Chamar</string>
+  <string name="video_call_lte_to_wifi_handover_toast">Continuando a chamada a través da wifi…</string>
+  <string name="rtt_call_not_available_toast">A función RTT non está dispoñible para esta chamada</string>
+  <string name="call_subject_type_and_number">%1$s %2$s</string>
+</resources>
diff --git a/java/com/android/dialer/theme/common/res/values-gu/strings.xml b/java/com/android/dialer/theme/common/res/values-gu/strings.xml
new file mode 100644
index 0000000..1934b67
--- /dev/null
+++ b/java/com/android/dialer/theme/common/res/values-gu/strings.xml
@@ -0,0 +1,11 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="unknown">અજાણ્યું</string>
+  <string name="unknown_counter">%1$s %2$d</string>
+  <string name="payphone">પેફોન</string>
+  <string name="emergency_number">કટોકટીનો નંબર</string>
+  <string name="launcherActivityLabel">ફોન</string>
+  <string name="call">કૉલ કરો</string>
+  <string name="video_call_lte_to_wifi_handover_toast">વાઇ-ફાઇનો ઉપયોગ કરીને કૉલ ચાલુ રાખી રહ્યાં છીએ…</string>
+  <string name="rtt_call_not_available_toast">આ કૉલ માટે RTT ઉપલબ્ધ નથી</string>
+  <string name="call_subject_type_and_number">%1$s %2$s</string>
+</resources>
diff --git a/java/com/android/dialer/theme/common/res/values-hi/strings.xml b/java/com/android/dialer/theme/common/res/values-hi/strings.xml
new file mode 100644
index 0000000..b243988
--- /dev/null
+++ b/java/com/android/dialer/theme/common/res/values-hi/strings.xml
@@ -0,0 +1,11 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="unknown">अज्ञात</string>
+  <string name="unknown_counter">%1$s %2$d</string>
+  <string name="payphone">पे-फ़ोन</string>
+  <string name="emergency_number">आपातकालीन नंबर</string>
+  <string name="launcherActivityLabel">फ़ोन</string>
+  <string name="call">कॉल करें</string>
+  <string name="video_call_lte_to_wifi_handover_toast">कॉल वाई‑फ़ाई पर जारी रखा जा रहा है…</string>
+  <string name="rtt_call_not_available_toast">इस कॉल के लिए आरटीटी उपलब्ध नहीं है</string>
+  <string name="call_subject_type_and_number">%1$s %2$s</string>
+</resources>
diff --git a/java/com/android/dialer/theme/common/res/values-hr/strings.xml b/java/com/android/dialer/theme/common/res/values-hr/strings.xml
new file mode 100644
index 0000000..b344138
--- /dev/null
+++ b/java/com/android/dialer/theme/common/res/values-hr/strings.xml
@@ -0,0 +1,11 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="unknown">Nepoznato</string>
+  <string name="unknown_counter">%1$s %2$d</string>
+  <string name="payphone">Javna telefonska govornica</string>
+  <string name="emergency_number">Broj hitne službe</string>
+  <string name="launcherActivityLabel">Telefon</string>
+  <string name="call">Pozovi</string>
+  <string name="video_call_lte_to_wifi_handover_toast">Poziv se nastavlja putem Wi‑Fi mreže…</string>
+  <string name="rtt_call_not_available_toast">RTT nije dostupan za ovaj poziv</string>
+  <string name="call_subject_type_and_number">%1$s %2$s</string>
+</resources>
diff --git a/java/com/android/dialer/theme/common/res/values-hu/strings.xml b/java/com/android/dialer/theme/common/res/values-hu/strings.xml
new file mode 100644
index 0000000..73e832a
--- /dev/null
+++ b/java/com/android/dialer/theme/common/res/values-hu/strings.xml
@@ -0,0 +1,11 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="unknown">Ismeretlen</string>
+  <string name="unknown_counter">%1$s %2$d</string>
+  <string name="payphone">Nyilvános telefon</string>
+  <string name="emergency_number">Segélyhívó szám</string>
+  <string name="launcherActivityLabel">Telefon</string>
+  <string name="call">Hívás</string>
+  <string name="video_call_lte_to_wifi_handover_toast">Hívás folytatása Wi‑Fi-kapcsolaton keresztül…</string>
+  <string name="rtt_call_not_available_toast">Az RTT funkció nem áll rendelkezésre ebben a hívásban.</string>
+  <string name="call_subject_type_and_number">%1$s %2$s</string>
+</resources>
diff --git a/java/com/android/dialer/theme/common/res/values-hy/strings.xml b/java/com/android/dialer/theme/common/res/values-hy/strings.xml
new file mode 100644
index 0000000..586b10e
--- /dev/null
+++ b/java/com/android/dialer/theme/common/res/values-hy/strings.xml
@@ -0,0 +1,11 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="unknown">Անհայտ</string>
+  <string name="unknown_counter">%1$s %2$d</string>
+  <string name="payphone">Բջջային տերմինալ</string>
+  <string name="emergency_number">Արտակարգ ծառայության հեռախոսահամար</string>
+  <string name="launcherActivityLabel">Հեռախոս</string>
+  <string name="call">Զանգել</string>
+  <string name="video_call_lte_to_wifi_handover_toast">Անցում Wi‑Fi-ին…</string>
+  <string name="rtt_call_not_available_toast">RTT գործառույթը հասանելի չէ այս զանգի համար</string>
+  <string name="call_subject_type_and_number">%1$s %2$s</string>
+</resources>
diff --git a/java/com/android/dialer/theme/common/res/values-in/strings.xml b/java/com/android/dialer/theme/common/res/values-in/strings.xml
new file mode 100644
index 0000000..b15e59b
--- /dev/null
+++ b/java/com/android/dialer/theme/common/res/values-in/strings.xml
@@ -0,0 +1,11 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="unknown">Tidak diketahui</string>
+  <string name="unknown_counter">%1$s %2$d</string>
+  <string name="payphone">Telepon Umum</string>
+  <string name="emergency_number">Nomor darurat</string>
+  <string name="launcherActivityLabel">Telepon</string>
+  <string name="call">Telepon</string>
+  <string name="video_call_lte_to_wifi_handover_toast">Melanjutkan panggilan dengan Wi‑Fi…</string>
+  <string name="rtt_call_not_available_toast">RTT tidak tersedia untuk panggilan ini</string>
+  <string name="call_subject_type_and_number">%1$s %2$s</string>
+</resources>
diff --git a/java/com/android/dialer/theme/common/res/values-is/strings.xml b/java/com/android/dialer/theme/common/res/values-is/strings.xml
new file mode 100644
index 0000000..87a4ca4
--- /dev/null
+++ b/java/com/android/dialer/theme/common/res/values-is/strings.xml
@@ -0,0 +1,11 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="unknown">Óþekkt</string>
+  <string name="unknown_counter">%1$s %2$d</string>
+  <string name="payphone">Símasjálfsali</string>
+  <string name="emergency_number">Neyðarnúmer</string>
+  <string name="launcherActivityLabel">Sími</string>
+  <string name="call">Hringja</string>
+  <string name="video_call_lte_to_wifi_handover_toast">Heldur símtali áfram með Wi‑Fi…</string>
+  <string name="rtt_call_not_available_toast">RTT er ekki í boði fyrir þetta símtal</string>
+  <string name="call_subject_type_and_number">%1$s %2$s</string>
+</resources>
diff --git a/java/com/android/dialer/theme/common/res/values-it/strings.xml b/java/com/android/dialer/theme/common/res/values-it/strings.xml
new file mode 100644
index 0000000..c5b1add
--- /dev/null
+++ b/java/com/android/dialer/theme/common/res/values-it/strings.xml
@@ -0,0 +1,11 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="unknown">Sconosciuto</string>
+  <string name="unknown_counter">%1$s %2$d</string>
+  <string name="payphone">Cabina telefonica</string>
+  <string name="emergency_number">Numero di emergenza</string>
+  <string name="launcherActivityLabel">Telefono</string>
+  <string name="call">Chiama</string>
+  <string name="video_call_lte_to_wifi_handover_toast">Proseguimento della chiamata utilizzando la rete Wi-Fi…</string>
+  <string name="rtt_call_not_available_toast">RTT non disponibile per questa chiamata</string>
+  <string name="call_subject_type_and_number">%1$s %2$s</string>
+</resources>
diff --git a/java/com/android/dialer/theme/common/res/values-iw/strings.xml b/java/com/android/dialer/theme/common/res/values-iw/strings.xml
new file mode 100644
index 0000000..6513602
--- /dev/null
+++ b/java/com/android/dialer/theme/common/res/values-iw/strings.xml
@@ -0,0 +1,11 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="unknown">לא ידוע</string>
+  <string name="unknown_counter">%1$s %2$d</string>
+  <string name="payphone">טלפון ציבורי</string>
+  <string name="emergency_number">מספר חירום</string>
+  <string name="launcherActivityLabel">טלפון</string>
+  <string name="call">התקשר</string>
+  <string name="video_call_lte_to_wifi_handover_toast">‏המערכת ממשיכה את השיחה באמצעות Wi‑Fi…</string>
+  <string name="rtt_call_not_available_toast">‏אי אפשר להשתמש ב-RTT בשיחה הזו</string>
+  <string name="call_subject_type_and_number">%1$s %2$s</string>
+</resources>
diff --git a/java/com/android/dialer/theme/common/res/values-ja/strings.xml b/java/com/android/dialer/theme/common/res/values-ja/strings.xml
new file mode 100644
index 0000000..36c3059
--- /dev/null
+++ b/java/com/android/dialer/theme/common/res/values-ja/strings.xml
@@ -0,0 +1,11 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="unknown">不明</string>
+  <string name="unknown_counter">%1$s %2$d</string>
+  <string name="payphone">公衆電話</string>
+  <string name="emergency_number">緊急通報番号</string>
+  <string name="launcherActivityLabel">電話</string>
+  <string name="call">発信</string>
+  <string name="video_call_lte_to_wifi_handover_toast">Wi‑Fi を使用して通話を継続しています…</string>
+  <string name="rtt_call_not_available_toast">この通話では RTT をご利用いただけません</string>
+  <string name="call_subject_type_and_number">%1$s %2$s</string>
+</resources>
diff --git a/java/com/android/dialer/theme/common/res/values-ka/strings.xml b/java/com/android/dialer/theme/common/res/values-ka/strings.xml
new file mode 100644
index 0000000..78448ea
--- /dev/null
+++ b/java/com/android/dialer/theme/common/res/values-ka/strings.xml
@@ -0,0 +1,11 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="unknown">უცნობი</string>
+  <string name="unknown_counter">%1$s %2$d</string>
+  <string name="payphone">გადახდის ტელეფონი</string>
+  <string name="emergency_number">გადაუდებელი დახმარების ნომერი</string>
+  <string name="launcherActivityLabel">ტელეფონი</string>
+  <string name="call">დარეკვა</string>
+  <string name="video_call_lte_to_wifi_handover_toast">ზარი გრძელდება Wi‑Fi-ს გამოყენებით…</string>
+  <string name="rtt_call_not_available_toast">RTT ამ ზარისთვის მიუწვდომელია</string>
+  <string name="call_subject_type_and_number">%1$s %2$s</string>
+</resources>
diff --git a/java/com/android/dialer/theme/common/res/values-kk/strings.xml b/java/com/android/dialer/theme/common/res/values-kk/strings.xml
new file mode 100644
index 0000000..fc87c6c
--- /dev/null
+++ b/java/com/android/dialer/theme/common/res/values-kk/strings.xml
@@ -0,0 +1,11 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="unknown">Белгісіз</string>
+  <string name="unknown_counter">%1$s %2$d</string>
+  <string name="payphone">Автомат-телефон</string>
+  <string name="emergency_number">Төтенше қызмет нөмір</string>
+  <string name="launcherActivityLabel">Телефон</string>
+  <string name="call">Қоңырау шалу</string>
+  <string name="video_call_lte_to_wifi_handover_toast">Қоңырау Wi‑Fi арқылы жалғасуда…</string>
+  <string name="rtt_call_not_available_toast">Бұл қоңырауда RTT мүмкіндігі жоқ</string>
+  <string name="call_subject_type_and_number">%1$s %2$s</string>
+</resources>
diff --git a/java/com/android/dialer/theme/common/res/values-km/strings.xml b/java/com/android/dialer/theme/common/res/values-km/strings.xml
new file mode 100644
index 0000000..4d1bbc3
--- /dev/null
+++ b/java/com/android/dialer/theme/common/res/values-km/strings.xml
@@ -0,0 +1,11 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="unknown">មិន​ស្គាល់</string>
+  <string name="unknown_counter">%1$s %2$d</string>
+  <string name="payphone">ទូរស័ព្ទសាធារណៈ</string>
+  <string name="emergency_number">លេខអាសន្ន</string>
+  <string name="launcherActivityLabel">ទូរស័ព្ទ</string>
+  <string name="call">ហៅ​ទូរសព្ទ</string>
+  <string name="video_call_lte_to_wifi_handover_toast">កំពុង​បន្ត​ការហៅ​ទូរសព្ទ​ដោយ​ប្រើ Wi‑Fi…</string>
+  <string name="rtt_call_not_available_toast">RTT មិន​អាច​ប្រើ​បាន​សម្រាប់​ការហៅ​នេះ​ទេ</string>
+  <string name="call_subject_type_and_number">%1$s %2$s</string>
+</resources>
diff --git a/java/com/android/dialer/theme/common/res/values-kn/strings.xml b/java/com/android/dialer/theme/common/res/values-kn/strings.xml
new file mode 100644
index 0000000..388608e
--- /dev/null
+++ b/java/com/android/dialer/theme/common/res/values-kn/strings.xml
@@ -0,0 +1,11 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="unknown">ಅಪರಿಚಿತ</string>
+  <string name="unknown_counter">%1$s %2$d</string>
+  <string name="payphone">ಪೇಫೋನ್</string>
+  <string name="emergency_number">ತುರ್ತು ಸಂಖ್ಯೆ</string>
+  <string name="launcherActivityLabel">ಫೋನ್</string>
+  <string name="call">ಕರೆಮಾಡಿ</string>
+  <string name="video_call_lte_to_wifi_handover_toast">ವೈ-ಫೈ ಅನ್ನು ಬಳಸಿಕೊಂಡು ಕರೆ ಮಾಡುವುದನ್ನು ಮುಂದುವರಿಸಲಾಗುತ್ತಿದೆ…</string>
+  <string name="rtt_call_not_available_toast">ಈ ಕರೆಗಾಗಿ RTT ಲಭ್ಯವಿಲ್ಲ</string>
+  <string name="call_subject_type_and_number">%1$s %2$s</string>
+</resources>
diff --git a/java/com/android/dialer/theme/common/res/values-ko/strings.xml b/java/com/android/dialer/theme/common/res/values-ko/strings.xml
new file mode 100644
index 0000000..82d647e
--- /dev/null
+++ b/java/com/android/dialer/theme/common/res/values-ko/strings.xml
@@ -0,0 +1,11 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="unknown">알 수 없음</string>
+  <string name="unknown_counter">%1$s %2$d</string>
+  <string name="payphone">공중전화</string>
+  <string name="emergency_number">긴급 전화번호</string>
+  <string name="launcherActivityLabel">휴대전화</string>
+  <string name="call">전화</string>
+  <string name="video_call_lte_to_wifi_handover_toast">Wi‑Fi를 사용하여 계속 통화 중…</string>
+  <string name="rtt_call_not_available_toast">이 통화에서 RTT를 사용할 수 없음</string>
+  <string name="call_subject_type_and_number">%1$s %2$s</string>
+</resources>
diff --git a/java/com/android/dialer/theme/common/res/values-ky/strings.xml b/java/com/android/dialer/theme/common/res/values-ky/strings.xml
new file mode 100644
index 0000000..ededcdc
--- /dev/null
+++ b/java/com/android/dialer/theme/common/res/values-ky/strings.xml
@@ -0,0 +1,11 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="unknown">Белгисиз</string>
+  <string name="unknown_counter">%1$s %2$d</string>
+  <string name="payphone">Таксофон</string>
+  <string name="emergency_number">Өзгөчө кырдаал номери</string>
+  <string name="launcherActivityLabel">Телефон</string>
+  <string name="call">Чалуу</string>
+  <string name="video_call_lte_to_wifi_handover_toast">Wi‑Fi аркылуу чалуу улантылууда…</string>
+  <string name="rtt_call_not_available_toast">Бул чалууда RTT функциясы жеткиликтүү эмес</string>
+  <string name="call_subject_type_and_number">%1$s %2$s</string>
+</resources>
diff --git a/java/com/android/dialer/theme/common/res/values-lo/strings.xml b/java/com/android/dialer/theme/common/res/values-lo/strings.xml
new file mode 100644
index 0000000..c4c8363
--- /dev/null
+++ b/java/com/android/dialer/theme/common/res/values-lo/strings.xml
@@ -0,0 +1,11 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="unknown">ບໍ່ຮູ້ຈັກ</string>
+  <string name="unknown_counter">%1$s %2$d</string>
+  <string name="payphone">ຕູ້​ໂທ​ລະ​ສັບ​ສາ​ທາ​ລະ​ນະ</string>
+  <string name="emergency_number">ເບີໂທສຸກເສີນ</string>
+  <string name="launcherActivityLabel">ໂທລະສັບ</string>
+  <string name="call">ໂທ</string>
+  <string name="video_call_lte_to_wifi_handover_toast">ກຳລັງສືບຕໍ່ການໂທໂດຍໃຊ້ Wi‑Fi…</string>
+  <string name="rtt_call_not_available_toast">ບໍ່ສາມາດໃຊ້ RTT ສຳລັບການໂທນີ້ໄດ້</string>
+  <string name="call_subject_type_and_number">%1$s %2$s</string>
+</resources>
diff --git a/java/com/android/dialer/theme/common/res/values-lt/strings.xml b/java/com/android/dialer/theme/common/res/values-lt/strings.xml
new file mode 100644
index 0000000..05f9a39
--- /dev/null
+++ b/java/com/android/dialer/theme/common/res/values-lt/strings.xml
@@ -0,0 +1,11 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="unknown">Nežinomas</string>
+  <string name="unknown_counter">%1$s %2$d</string>
+  <string name="payphone">Taksofonas</string>
+  <string name="emergency_number">Pagalbos numeris</string>
+  <string name="launcherActivityLabel">Telefonas</string>
+  <string name="call">Skambinti</string>
+  <string name="video_call_lte_to_wifi_handover_toast">Skambutis tęsiamas naudojant „Wi‑Fi“…</string>
+  <string name="rtt_call_not_available_toast">Atliekant šį skambutį RTT paslauga nepasiekiama</string>
+  <string name="call_subject_type_and_number">%1$s %2$s</string>
+</resources>
diff --git a/java/com/android/dialer/theme/common/res/values-lv/strings.xml b/java/com/android/dialer/theme/common/res/values-lv/strings.xml
new file mode 100644
index 0000000..8ea7118
--- /dev/null
+++ b/java/com/android/dialer/theme/common/res/values-lv/strings.xml
@@ -0,0 +1,11 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="unknown">Nezināms</string>
+  <string name="unknown_counter">%1$s %2$d</string>
+  <string name="payphone">Maksas tālrunis</string>
+  <string name="emergency_number">Ārkārtas numurs</string>
+  <string name="launcherActivityLabel">Tālrunis</string>
+  <string name="call">Zvanīt</string>
+  <string name="video_call_lte_to_wifi_handover_toast">Zvans tiek turpināts, izmantojot Wi‑Fi…</string>
+  <string name="rtt_call_not_available_toast">RTT nav pieejams šim zvanam.</string>
+  <string name="call_subject_type_and_number">%1$s %2$s</string>
+</resources>
diff --git a/java/com/android/dialer/theme/common/res/values-mk/strings.xml b/java/com/android/dialer/theme/common/res/values-mk/strings.xml
new file mode 100644
index 0000000..c043447
--- /dev/null
+++ b/java/com/android/dialer/theme/common/res/values-mk/strings.xml
@@ -0,0 +1,11 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="unknown">Непознато</string>
+  <string name="unknown_counter">%1$s %2$d</string>
+  <string name="payphone">Говорница</string>
+  <string name="emergency_number">Број за итни случаи</string>
+  <string name="launcherActivityLabel">Телефон</string>
+  <string name="call">Повикајте</string>
+  <string name="video_call_lte_to_wifi_handover_toast">Повикот ќе продолжи преку Wi‑Fi…</string>
+  <string name="rtt_call_not_available_toast">RTT не е достапна за повиков</string>
+  <string name="call_subject_type_and_number">%1$s %2$s</string>
+</resources>
diff --git a/java/com/android/dialer/theme/common/res/values-ml/strings.xml b/java/com/android/dialer/theme/common/res/values-ml/strings.xml
new file mode 100644
index 0000000..5075c9b
--- /dev/null
+++ b/java/com/android/dialer/theme/common/res/values-ml/strings.xml
@@ -0,0 +1,11 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="unknown">അജ്ഞാതം</string>
+  <string name="unknown_counter">%1$s %2$d</string>
+  <string name="payphone">പണം നൽകി ഉപയോഗിക്കുന്ന ഫോൺ</string>
+  <string name="emergency_number">അടിയന്തര നമ്പർ</string>
+  <string name="launcherActivityLabel">ഫോണ്‍</string>
+  <string name="call">വിളിക്കുക</string>
+  <string name="video_call_lte_to_wifi_handover_toast">വൈഫൈ ഉപയോഗിച്ച് കോൾ തുടരുന്നു…</string>
+  <string name="rtt_call_not_available_toast">ഈ കോളിന് RTT ലഭ്യമല്ല</string>
+  <string name="call_subject_type_and_number">%1$s %2$s</string>
+</resources>
diff --git a/java/com/android/dialer/theme/common/res/values-mn/strings.xml b/java/com/android/dialer/theme/common/res/values-mn/strings.xml
new file mode 100644
index 0000000..4baeb92
--- /dev/null
+++ b/java/com/android/dialer/theme/common/res/values-mn/strings.xml
@@ -0,0 +1,11 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="unknown">Тодорхойгүй</string>
+  <string name="unknown_counter">%1$s %2$d</string>
+  <string name="payphone">Payphone</string>
+  <string name="emergency_number">Яаралтай тусламжийн дугаар</string>
+  <string name="launcherActivityLabel">Утас</string>
+  <string name="call">Залгах</string>
+  <string name="video_call_lte_to_wifi_handover_toast">Wi‑Fi ашиглан дуудлагыг үргэлжлүүлж байна…</string>
+  <string name="rtt_call_not_available_toast">RTT (Тухайн агшны текст) энэ дуудлагад боломжгүй байна</string>
+  <string name="call_subject_type_and_number">%1$s %2$s</string>
+</resources>
diff --git a/java/com/android/dialer/theme/common/res/values-mr/strings.xml b/java/com/android/dialer/theme/common/res/values-mr/strings.xml
new file mode 100644
index 0000000..5a43652
--- /dev/null
+++ b/java/com/android/dialer/theme/common/res/values-mr/strings.xml
@@ -0,0 +1,11 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="unknown">अज्ञात</string>
+  <string name="unknown_counter">%1$s %2$d</string>
+  <string name="payphone">सार्वजनिक फोन</string>
+  <string name="emergency_number">आणीबाणी क्रमांक</string>
+  <string name="launcherActivityLabel">फोन</string>
+  <string name="call">कॉल करा</string>
+  <string name="video_call_lte_to_wifi_handover_toast">वाय-फाय वापरून कॉल सुरू ठेवा…</string>
+  <string name="rtt_call_not_available_toast">या कॉलसाठी RTT उपलब्द्ध नाही</string>
+  <string name="call_subject_type_and_number">%1$s %2$s</string>
+</resources>
diff --git a/java/com/android/dialer/theme/common/res/values-ms/strings.xml b/java/com/android/dialer/theme/common/res/values-ms/strings.xml
new file mode 100644
index 0000000..3fbbb27
--- /dev/null
+++ b/java/com/android/dialer/theme/common/res/values-ms/strings.xml
@@ -0,0 +1,11 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="unknown">Tidak diketahui</string>
+  <string name="unknown_counter">%1$s %2$d</string>
+  <string name="payphone">Telefon Awam</string>
+  <string name="emergency_number">Nombor kecemasan</string>
+  <string name="launcherActivityLabel">Telefon</string>
+  <string name="call">Panggil</string>
+  <string name="video_call_lte_to_wifi_handover_toast">Meneruskan panggilan menggunakan Wi‑Fi…</string>
+  <string name="rtt_call_not_available_toast">RTT tidak tersedia untuk panggilan ini</string>
+  <string name="call_subject_type_and_number">%1$s %2$s</string>
+</resources>
diff --git a/java/com/android/dialer/theme/common/res/values-my/strings.xml b/java/com/android/dialer/theme/common/res/values-my/strings.xml
new file mode 100644
index 0000000..108bcd4
--- /dev/null
+++ b/java/com/android/dialer/theme/common/res/values-my/strings.xml
@@ -0,0 +1,11 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="unknown">မသိပါ</string>
+  <string name="unknown_counter">%1$s %2$d</string>
+  <string name="payphone">ငွေပေးရသည့်ဖုန်း</string>
+  <string name="emergency_number">အရေးပေါ်နံပါတ်</string>
+  <string name="launcherActivityLabel">ဖုန်း</string>
+  <string name="call">ခေါ်ဆိုရန်</string>
+  <string name="video_call_lte_to_wifi_handover_toast">Wi‑Fi သုံးပြီး ဆက်လက်ခေါ်ဆိုနေသည်…</string>
+  <string name="rtt_call_not_available_toast">ဤခေါ်ဆိုမှုအတွက် RTT ကို အသုံးမပြုနိုင်ပါ</string>
+  <string name="call_subject_type_and_number">%1$s %2$s</string>
+</resources>
diff --git a/java/com/android/dialer/theme/common/res/values-nb/strings.xml b/java/com/android/dialer/theme/common/res/values-nb/strings.xml
new file mode 100644
index 0000000..8d18894
--- /dev/null
+++ b/java/com/android/dialer/theme/common/res/values-nb/strings.xml
@@ -0,0 +1,11 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="unknown">Ukjent</string>
+  <string name="unknown_counter">%1$s %2$d</string>
+  <string name="payphone">Telefonkiosk</string>
+  <string name="emergency_number">Nødnummer</string>
+  <string name="launcherActivityLabel">Telefon</string>
+  <string name="call">Ring</string>
+  <string name="video_call_lte_to_wifi_handover_toast">Fortsetter samtalen via Wi‑Fi …</string>
+  <string name="rtt_call_not_available_toast">STT er ikke tilgjengelig for dette anropet</string>
+  <string name="call_subject_type_and_number">%1$s %2$s</string>
+</resources>
diff --git a/java/com/android/dialer/theme/common/res/values-ne/strings.xml b/java/com/android/dialer/theme/common/res/values-ne/strings.xml
new file mode 100644
index 0000000..dc71dda
--- /dev/null
+++ b/java/com/android/dialer/theme/common/res/values-ne/strings.xml
@@ -0,0 +1,11 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="unknown">अज्ञात</string>
+  <string name="unknown_counter">%1$s %2$d</string>
+  <string name="payphone">पेफोन</string>
+  <string name="emergency_number">आपतकालीन नम्बर</string>
+  <string name="launcherActivityLabel">फोन</string>
+  <string name="call">कल गर्नुहोस्</string>
+  <string name="video_call_lte_to_wifi_handover_toast">Wi‑Fi प्रयोग गरी कललाई निरन्तरता दिँदै…</string>
+  <string name="rtt_call_not_available_toast">यो कलमा RTT उपलब्ध छैन</string>
+  <string name="call_subject_type_and_number">%1$s %2$s</string>
+</resources>
diff --git a/java/com/android/dialer/theme/common/res/values-nl/strings.xml b/java/com/android/dialer/theme/common/res/values-nl/strings.xml
new file mode 100644
index 0000000..758ca04
--- /dev/null
+++ b/java/com/android/dialer/theme/common/res/values-nl/strings.xml
@@ -0,0 +1,11 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="unknown">Onbekend</string>
+  <string name="unknown_counter">%1$s %2$d</string>
+  <string name="payphone">Telefooncel</string>
+  <string name="emergency_number">Alarmnummer</string>
+  <string name="launcherActivityLabel">Telefoon</string>
+  <string name="call">Bellen</string>
+  <string name="video_call_lte_to_wifi_handover_toast">Gesprek voortzetten via wifi…</string>
+  <string name="rtt_call_not_available_toast">RTT niet beschikbaar voor deze oproep</string>
+  <string name="call_subject_type_and_number">%1$s %2$s</string>
+</resources>
diff --git a/java/com/android/dialer/theme/common/res/values-no/strings.xml b/java/com/android/dialer/theme/common/res/values-no/strings.xml
new file mode 100644
index 0000000..8d18894
--- /dev/null
+++ b/java/com/android/dialer/theme/common/res/values-no/strings.xml
@@ -0,0 +1,11 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="unknown">Ukjent</string>
+  <string name="unknown_counter">%1$s %2$d</string>
+  <string name="payphone">Telefonkiosk</string>
+  <string name="emergency_number">Nødnummer</string>
+  <string name="launcherActivityLabel">Telefon</string>
+  <string name="call">Ring</string>
+  <string name="video_call_lte_to_wifi_handover_toast">Fortsetter samtalen via Wi‑Fi …</string>
+  <string name="rtt_call_not_available_toast">STT er ikke tilgjengelig for dette anropet</string>
+  <string name="call_subject_type_and_number">%1$s %2$s</string>
+</resources>
diff --git a/java/com/android/dialer/theme/common/res/values-pa/strings.xml b/java/com/android/dialer/theme/common/res/values-pa/strings.xml
new file mode 100644
index 0000000..fb831dd
--- /dev/null
+++ b/java/com/android/dialer/theme/common/res/values-pa/strings.xml
@@ -0,0 +1,11 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="unknown">ਅਗਿਆਤ</string>
+  <string name="unknown_counter">%1$s %2$d</string>
+  <string name="payphone">ਪੇਫੋਨ</string>
+  <string name="emergency_number">ਸੰਕਟਕਾਲੀਨ ਨੰਬਰ</string>
+  <string name="launcherActivityLabel">ਫੋਨ</string>
+  <string name="call">ਕਾਲ ਕਰੋ</string>
+  <string name="video_call_lte_to_wifi_handover_toast">ਵਾਈ-ਫਾਈ ਦੀ ਵਰਤੋ ਨਾਲ ਕਾਲ ਜਾਰੀ ਰੱਖੋ…</string>
+  <string name="rtt_call_not_available_toast">ਇਸ ਕਾਲ ਲਈ RTT ਉਪਲਬਧ ਨਹੀਂ ਹੈ</string>
+  <string name="call_subject_type_and_number">%1$s %2$s</string>
+</resources>
diff --git a/java/com/android/dialer/theme/common/res/values-pl/strings.xml b/java/com/android/dialer/theme/common/res/values-pl/strings.xml
new file mode 100644
index 0000000..54e5ee8
--- /dev/null
+++ b/java/com/android/dialer/theme/common/res/values-pl/strings.xml
@@ -0,0 +1,11 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="unknown">Nieznane</string>
+  <string name="unknown_counter">%1$s %2$d</string>
+  <string name="payphone">Automat telefoniczny</string>
+  <string name="emergency_number">Numer alarmowy</string>
+  <string name="launcherActivityLabel">Telefon</string>
+  <string name="call">Zadzwoń</string>
+  <string name="video_call_lte_to_wifi_handover_toast">Kontynuuję rozmowę przy użyciu sieci Wi-Fi…</string>
+  <string name="rtt_call_not_available_toast">Funkcja RTT jest niedostępna w przypadku tego połączenia</string>
+  <string name="call_subject_type_and_number">%1$s %2$s</string>
+</resources>
diff --git a/java/com/android/dialer/theme/common/res/values-pt-rBR/strings.xml b/java/com/android/dialer/theme/common/res/values-pt-rBR/strings.xml
new file mode 100644
index 0000000..99c2a8b
--- /dev/null
+++ b/java/com/android/dialer/theme/common/res/values-pt-rBR/strings.xml
@@ -0,0 +1,11 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="unknown">Desconhecido</string>
+  <string name="unknown_counter">%1$s %2$d</string>
+  <string name="payphone">Telefone público</string>
+  <string name="emergency_number">Número de emergência</string>
+  <string name="launcherActivityLabel">Telefone</string>
+  <string name="call">Ligar</string>
+  <string name="video_call_lte_to_wifi_handover_toast">Continuando a chamada por Wi‑Fi…</string>
+  <string name="rtt_call_not_available_toast">A RTT não está disponível para esta chamada</string>
+  <string name="call_subject_type_and_number">%1$s %2$s</string>
+</resources>
diff --git a/java/com/android/dialer/theme/common/res/values-pt-rPT/strings.xml b/java/com/android/dialer/theme/common/res/values-pt-rPT/strings.xml
new file mode 100644
index 0000000..37d9cd1
--- /dev/null
+++ b/java/com/android/dialer/theme/common/res/values-pt-rPT/strings.xml
@@ -0,0 +1,11 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="unknown">Desconhecido</string>
+  <string name="unknown_counter">%1$s %2$d</string>
+  <string name="payphone">Telefone público</string>
+  <string name="emergency_number">Número de emergência</string>
+  <string name="launcherActivityLabel">Telefone</string>
+  <string name="call">Telefonar</string>
+  <string name="video_call_lte_to_wifi_handover_toast">Continuar a chamada através de Wi‑Fi…</string>
+  <string name="rtt_call_not_available_toast">RTT não está disponível para esta chamada</string>
+  <string name="call_subject_type_and_number">%1$s %2$s</string>
+</resources>
diff --git a/java/com/android/dialer/theme/common/res/values-pt/strings.xml b/java/com/android/dialer/theme/common/res/values-pt/strings.xml
new file mode 100644
index 0000000..99c2a8b
--- /dev/null
+++ b/java/com/android/dialer/theme/common/res/values-pt/strings.xml
@@ -0,0 +1,11 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="unknown">Desconhecido</string>
+  <string name="unknown_counter">%1$s %2$d</string>
+  <string name="payphone">Telefone público</string>
+  <string name="emergency_number">Número de emergência</string>
+  <string name="launcherActivityLabel">Telefone</string>
+  <string name="call">Ligar</string>
+  <string name="video_call_lte_to_wifi_handover_toast">Continuando a chamada por Wi‑Fi…</string>
+  <string name="rtt_call_not_available_toast">A RTT não está disponível para esta chamada</string>
+  <string name="call_subject_type_and_number">%1$s %2$s</string>
+</resources>
diff --git a/java/com/android/dialer/theme/common/res/values-ro/strings.xml b/java/com/android/dialer/theme/common/res/values-ro/strings.xml
new file mode 100644
index 0000000..8dd7733
--- /dev/null
+++ b/java/com/android/dialer/theme/common/res/values-ro/strings.xml
@@ -0,0 +1,11 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="unknown">Necunoscut</string>
+  <string name="unknown_counter">%1$s %2$d</string>
+  <string name="payphone">Telefon public</string>
+  <string name="emergency_number">Număr de urgență</string>
+  <string name="launcherActivityLabel">Telefon</string>
+  <string name="call">Apelați</string>
+  <string name="video_call_lte_to_wifi_handover_toast">Se continuă apelul folosind Wi‑Fi…</string>
+  <string name="rtt_call_not_available_toast">Funcția TTR nu este disponibilă pentru apel</string>
+  <string name="call_subject_type_and_number">%1$s %2$s</string>
+</resources>
diff --git a/java/com/android/dialer/theme/common/res/values-ru/strings.xml b/java/com/android/dialer/theme/common/res/values-ru/strings.xml
new file mode 100644
index 0000000..be33a12
--- /dev/null
+++ b/java/com/android/dialer/theme/common/res/values-ru/strings.xml
@@ -0,0 +1,11 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="unknown">Неизвестно</string>
+  <string name="unknown_counter">%1$s %2$d</string>
+  <string name="payphone">Телефон-автомат</string>
+  <string name="emergency_number">Экстренная служба</string>
+  <string name="launcherActivityLabel">Телефон</string>
+  <string name="call">Позвонить</string>
+  <string name="video_call_lte_to_wifi_handover_toast">Переключение на Wi‑Fi…</string>
+  <string name="rtt_call_not_available_toast">Функция RTT недоступна для этого вызова</string>
+  <string name="call_subject_type_and_number">%1$s %2$s</string>
+</resources>
diff --git a/java/com/android/dialer/theme/common/res/values-si/strings.xml b/java/com/android/dialer/theme/common/res/values-si/strings.xml
new file mode 100644
index 0000000..bf9403e
--- /dev/null
+++ b/java/com/android/dialer/theme/common/res/values-si/strings.xml
@@ -0,0 +1,11 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="unknown">නොදනී</string>
+  <string name="unknown_counter">%1$s %2$d</string>
+  <string name="payphone">පේෆෝනය</string>
+  <string name="emergency_number">හදිසි ඇමතුම් අංකය</string>
+  <string name="launcherActivityLabel">දුරකථනය</string>
+  <string name="call">ඇමතුම</string>
+  <string name="video_call_lte_to_wifi_handover_toast">Wi‑Fi භාවිතයෙන් ඇමතුම දිගටම කරගෙන යමින්…</string>
+  <string name="rtt_call_not_available_toast">RTT මෙම ඇමතුම සඳහා ලබා ගත නොහැකිය</string>
+  <string name="call_subject_type_and_number">%1$s %2$s</string>
+</resources>
diff --git a/java/com/android/dialer/theme/common/res/values-sk/strings.xml b/java/com/android/dialer/theme/common/res/values-sk/strings.xml
new file mode 100644
index 0000000..faafa6e
--- /dev/null
+++ b/java/com/android/dialer/theme/common/res/values-sk/strings.xml
@@ -0,0 +1,11 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="unknown">Neznáme</string>
+  <string name="unknown_counter">%1$s %2$d</string>
+  <string name="payphone">Telefónny automat</string>
+  <string name="emergency_number">Číslo tiesňovej linky</string>
+  <string name="launcherActivityLabel">Telefón</string>
+  <string name="call">Volať</string>
+  <string name="video_call_lte_to_wifi_handover_toast">Pokračuje sa v hovore cez Wi‑Fi…</string>
+  <string name="rtt_call_not_available_toast">Pre tento hovor nie je okamžitý text k dispozícii</string>
+  <string name="call_subject_type_and_number">%1$s %2$s</string>
+</resources>
diff --git a/java/com/android/dialer/theme/common/res/values-sl/strings.xml b/java/com/android/dialer/theme/common/res/values-sl/strings.xml
new file mode 100644
index 0000000..d4a8efa
--- /dev/null
+++ b/java/com/android/dialer/theme/common/res/values-sl/strings.xml
@@ -0,0 +1,11 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="unknown">Neznano</string>
+  <string name="unknown_counter">%1$s %2$d</string>
+  <string name="payphone">Telefonska govorilnica</string>
+  <string name="emergency_number">Številka za klic v sili</string>
+  <string name="launcherActivityLabel">Telefon</string>
+  <string name="call">Pokliči</string>
+  <string name="video_call_lte_to_wifi_handover_toast">Nadaljevanje klica prek Wi-Fi-ja …</string>
+  <string name="rtt_call_not_available_toast">RTT ni na voljo za ta klic</string>
+  <string name="call_subject_type_and_number">%1$s %2$s</string>
+</resources>
diff --git a/java/com/android/dialer/theme/common/res/values-sq/strings.xml b/java/com/android/dialer/theme/common/res/values-sq/strings.xml
new file mode 100644
index 0000000..3924fb8
--- /dev/null
+++ b/java/com/android/dialer/theme/common/res/values-sq/strings.xml
@@ -0,0 +1,11 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="unknown">I panjohur</string>
+  <string name="unknown_counter">%1$s %2$d</string>
+  <string name="payphone">Telefon me pagesë</string>
+  <string name="emergency_number">Numri i urgjencës</string>
+  <string name="launcherActivityLabel">Telefoni</string>
+  <string name="call">Telefono</string>
+  <string name="video_call_lte_to_wifi_handover_toast">Po vazhdon telefonatën duke përdorur Wi‑Fi…</string>
+  <string name="rtt_call_not_available_toast">Funksioni RTT nuk ofrohet për këtë telefonatë</string>
+  <string name="call_subject_type_and_number">%1$s %2$s</string>
+</resources>
diff --git a/java/com/android/dialer/theme/common/res/values-sr/strings.xml b/java/com/android/dialer/theme/common/res/values-sr/strings.xml
new file mode 100644
index 0000000..0b65e5a
--- /dev/null
+++ b/java/com/android/dialer/theme/common/res/values-sr/strings.xml
@@ -0,0 +1,11 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="unknown">Непознато</string>
+  <string name="unknown_counter">%1$s %2$d</string>
+  <string name="payphone">Телефонска говорница</string>
+  <string name="emergency_number">Број хитне службе</string>
+  <string name="launcherActivityLabel">Телефон</string>
+  <string name="call">Позови</string>
+  <string name="video_call_lte_to_wifi_handover_toast">Позив се наставља помоћу Wi‑Fi-ја…</string>
+  <string name="rtt_call_not_available_toast">RTT није доступан за овај позив</string>
+  <string name="call_subject_type_and_number">%1$s %2$s</string>
+</resources>
diff --git a/java/com/android/dialer/theme/common/res/values-sv/strings.xml b/java/com/android/dialer/theme/common/res/values-sv/strings.xml
new file mode 100644
index 0000000..4154f3d
--- /dev/null
+++ b/java/com/android/dialer/theme/common/res/values-sv/strings.xml
@@ -0,0 +1,11 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="unknown">Okänd</string>
+  <string name="unknown_counter">%1$s %2$d</string>
+  <string name="payphone">Telefonautomat</string>
+  <string name="emergency_number">Larmnummer</string>
+  <string name="launcherActivityLabel">Telefon</string>
+  <string name="call">Ring</string>
+  <string name="video_call_lte_to_wifi_handover_toast">Samtalet fortsätter med Wi‑Fi …</string>
+  <string name="rtt_call_not_available_toast">RTT är inte tillgängligt för det här samtalet</string>
+  <string name="call_subject_type_and_number">%1$s %2$s</string>
+</resources>
diff --git a/java/com/android/dialer/theme/common/res/values-sw/strings.xml b/java/com/android/dialer/theme/common/res/values-sw/strings.xml
new file mode 100644
index 0000000..6b358dc
--- /dev/null
+++ b/java/com/android/dialer/theme/common/res/values-sw/strings.xml
@@ -0,0 +1,11 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="unknown">Haijulikani</string>
+  <string name="unknown_counter">%1$s %2$d</string>
+  <string name="payphone">Simu ya kulipia</string>
+  <string name="emergency_number">Nambari ya dharura</string>
+  <string name="launcherActivityLabel">Simu</string>
+  <string name="call">Piga simu</string>
+  <string name="video_call_lte_to_wifi_handover_toast">Inaendelea kupiga simu ya video kupitia Wi‑Fi…</string>
+  <string name="rtt_call_not_available_toast">RTT haipatikani kwa ajili ya simu hii</string>
+  <string name="call_subject_type_and_number">%1$s %2$s</string>
+</resources>
diff --git a/java/com/android/dialer/theme/common/res/values-ta/strings.xml b/java/com/android/dialer/theme/common/res/values-ta/strings.xml
new file mode 100644
index 0000000..5b2e9c9
--- /dev/null
+++ b/java/com/android/dialer/theme/common/res/values-ta/strings.xml
@@ -0,0 +1,11 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="unknown">தெரியாதவர்</string>
+  <string name="unknown_counter">%1$s %2$d</string>
+  <string name="payphone">கட்டணத் தொலைபேசி</string>
+  <string name="emergency_number">அவசர எண்</string>
+  <string name="launcherActivityLabel">மொபைல்</string>
+  <string name="call">அழை</string>
+  <string name="video_call_lte_to_wifi_handover_toast">வைஃபையைப் பயன்படுத்தி அழைப்பைத் தொடர்கிறது…</string>
+  <string name="rtt_call_not_available_toast">இந்த அழைப்பிற்கு RTT கிடையாது</string>
+  <string name="call_subject_type_and_number">%1$s %2$s</string>
+</resources>
diff --git a/java/com/android/dialer/theme/common/res/values-te/strings.xml b/java/com/android/dialer/theme/common/res/values-te/strings.xml
new file mode 100644
index 0000000..b88dd8b
--- /dev/null
+++ b/java/com/android/dialer/theme/common/res/values-te/strings.xml
@@ -0,0 +1,11 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="unknown">తెలియదు</string>
+  <string name="unknown_counter">%1$s %2$d</string>
+  <string name="payphone">పే ఫోన్</string>
+  <string name="emergency_number">అత్యవసర నంబర్</string>
+  <string name="launcherActivityLabel">ఫోన్</string>
+  <string name="call">కాల్ చేయి</string>
+  <string name="video_call_lte_to_wifi_handover_toast">Wi‑Fiని ఉపయోగించి కాల్‌ను కొనసాగిస్తోంది…</string>
+  <string name="rtt_call_not_available_toast">ఈ కాల్‌కు RTT అందుబాటులో లేదు</string>
+  <string name="call_subject_type_and_number">%1$s %2$s</string>
+</resources>
diff --git a/java/com/android/dialer/theme/common/res/values-th/strings.xml b/java/com/android/dialer/theme/common/res/values-th/strings.xml
new file mode 100644
index 0000000..4324baa
--- /dev/null
+++ b/java/com/android/dialer/theme/common/res/values-th/strings.xml
@@ -0,0 +1,11 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="unknown">ไม่ทราบ</string>
+  <string name="unknown_counter">%1$s %2$d</string>
+  <string name="payphone">โทรศัพท์สาธารณะ</string>
+  <string name="emergency_number">หมายเลขฉุกเฉิน</string>
+  <string name="launcherActivityLabel">โทรศัพท์</string>
+  <string name="call">โทร</string>
+  <string name="video_call_lte_to_wifi_handover_toast">โทรต่อไปโดยใช้ Wi‑Fi…</string>
+  <string name="rtt_call_not_available_toast">RTT ไม่สามารถใช้ได้สำหรับการโทรนี้</string>
+  <string name="call_subject_type_and_number">%1$s %2$s</string>
+</resources>
diff --git a/java/com/android/dialer/theme/common/res/values-tl/strings.xml b/java/com/android/dialer/theme/common/res/values-tl/strings.xml
new file mode 100644
index 0000000..8b210f6
--- /dev/null
+++ b/java/com/android/dialer/theme/common/res/values-tl/strings.xml
@@ -0,0 +1,11 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="unknown">Di-kilala</string>
+  <string name="unknown_counter">%1$s %2$d</string>
+  <string name="payphone">Payphone</string>
+  <string name="emergency_number">Pang-emergency na numero</string>
+  <string name="launcherActivityLabel">Telepono</string>
+  <string name="call">Tawag</string>
+  <string name="video_call_lte_to_wifi_handover_toast">Ipinagpapatuloy ang tawag gamit ang Wi‑Fi…</string>
+  <string name="rtt_call_not_available_toast">Hindi available ang RTT para sa tawag na ito</string>
+  <string name="call_subject_type_and_number">%1$s %2$s</string>
+</resources>
diff --git a/java/com/android/dialer/theme/common/res/values-tr/strings.xml b/java/com/android/dialer/theme/common/res/values-tr/strings.xml
new file mode 100644
index 0000000..324f3dc
--- /dev/null
+++ b/java/com/android/dialer/theme/common/res/values-tr/strings.xml
@@ -0,0 +1,11 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="unknown">Bilinmiyor</string>
+  <string name="unknown_counter">%1$s %2$d</string>
+  <string name="payphone">Ankesörlü telefon</string>
+  <string name="emergency_number">Acil durum numarası</string>
+  <string name="launcherActivityLabel">Telefon</string>
+  <string name="call">Telefon et</string>
+  <string name="video_call_lte_to_wifi_handover_toast">Görüşmeye kablosuz ağ kullanılarak devam ediliyor…</string>
+  <string name="rtt_call_not_available_toast">Bu çağrıda RTT kullanılamaz</string>
+  <string name="call_subject_type_and_number">%1$s %2$s</string>
+</resources>
diff --git a/java/com/android/dialer/theme/common/res/values-uk/strings.xml b/java/com/android/dialer/theme/common/res/values-uk/strings.xml
new file mode 100644
index 0000000..de131f6
--- /dev/null
+++ b/java/com/android/dialer/theme/common/res/values-uk/strings.xml
@@ -0,0 +1,11 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="unknown">Невідомий</string>
+  <string name="unknown_counter">%1$s %2$d</string>
+  <string name="payphone">Таксофон</string>
+  <string name="emergency_number">Екстрений номер</string>
+  <string name="launcherActivityLabel">Телефон</string>
+  <string name="call">Виклик</string>
+  <string name="video_call_lte_to_wifi_handover_toast">Продовження виклику за допомогою Wi-Fi…</string>
+  <string name="rtt_call_not_available_toast">Функція RTT недоступна для цього виклику</string>
+  <string name="call_subject_type_and_number">%1$s %2$s</string>
+</resources>
diff --git a/java/com/android/dialer/theme/common/res/values-ur/strings.xml b/java/com/android/dialer/theme/common/res/values-ur/strings.xml
new file mode 100644
index 0000000..af868ec
--- /dev/null
+++ b/java/com/android/dialer/theme/common/res/values-ur/strings.xml
@@ -0,0 +1,11 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="unknown">نامعلوم</string>
+  <string name="unknown_counter">%1$s %2$d</string>
+  <string name="payphone">پے فون</string>
+  <string name="emergency_number">ایمرجنسی نمبر</string>
+  <string name="launcherActivityLabel">فون</string>
+  <string name="call">کال کریں</string>
+  <string name="video_call_lte_to_wifi_handover_toast">‏Wi‑Fi کے ذریعے کال جاری ہے…</string>
+  <string name="rtt_call_not_available_toast">‏اس کال کے لئے RTT دستیاب نہیں ہے</string>
+  <string name="call_subject_type_and_number">%1$s %2$s</string>
+</resources>
diff --git a/java/com/android/dialer/theme/common/res/values-uz/strings.xml b/java/com/android/dialer/theme/common/res/values-uz/strings.xml
new file mode 100644
index 0000000..a575046
--- /dev/null
+++ b/java/com/android/dialer/theme/common/res/values-uz/strings.xml
@@ -0,0 +1,11 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="unknown">Noma’lum</string>
+  <string name="unknown_counter">%1$s %2$d</string>
+  <string name="payphone">Taksofon</string>
+  <string name="emergency_number">Favqulodda xizmat raqami</string>
+  <string name="launcherActivityLabel">Telefon</string>
+  <string name="call">Telefon</string>
+  <string name="video_call_lte_to_wifi_handover_toast">Chaqiruv Wi‑Fi orqali davom ettirish…</string>
+  <string name="rtt_call_not_available_toast">Ushbu chaqiruvda RTT funksiyasidan foydalanish imkonsiz</string>
+  <string name="call_subject_type_and_number">%1$s %2$s</string>
+</resources>
diff --git a/java/com/android/dialer/theme/common/res/values-vi/strings.xml b/java/com/android/dialer/theme/common/res/values-vi/strings.xml
new file mode 100644
index 0000000..bb274ae
--- /dev/null
+++ b/java/com/android/dialer/theme/common/res/values-vi/strings.xml
@@ -0,0 +1,11 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="unknown">Không xác định</string>
+  <string name="unknown_counter">%1$s %2$d</string>
+  <string name="payphone">Điện thoại công cộng</string>
+  <string name="emergency_number">Số khẩn cấp</string>
+  <string name="launcherActivityLabel">Điện thoại</string>
+  <string name="call">Gọi</string>
+  <string name="video_call_lte_to_wifi_handover_toast">Đang tiếp tục cuộc gọi bằng cách sử dụng Wi‑Fi…</string>
+  <string name="rtt_call_not_available_toast">Không thể sử dụng tin nhắn theo thời gian thực (RTT) cho cuộc gọi này</string>
+  <string name="call_subject_type_and_number">%1$s %2$s</string>
+</resources>
diff --git a/java/com/android/dialer/theme/common/res/values-zh-rCN/strings.xml b/java/com/android/dialer/theme/common/res/values-zh-rCN/strings.xml
new file mode 100644
index 0000000..780fbe7
--- /dev/null
+++ b/java/com/android/dialer/theme/common/res/values-zh-rCN/strings.xml
@@ -0,0 +1,11 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="unknown">未知</string>
+  <string name="unknown_counter">%1$s %2$d</string>
+  <string name="payphone">公用电话</string>
+  <string name="emergency_number">紧急呼救号码</string>
+  <string name="launcherActivityLabel">电话</string>
+  <string name="call">拨打电话</string>
+  <string name="video_call_lte_to_wifi_handover_toast">正在使用 WLAN 继续通话…</string>
+  <string name="rtt_call_not_available_toast">此通话不支持实时信息 (RTT) 功能</string>
+  <string name="call_subject_type_and_number">%1$s %2$s</string>
+</resources>
diff --git a/java/com/android/dialer/theme/common/res/values-zh-rHK/strings.xml b/java/com/android/dialer/theme/common/res/values-zh-rHK/strings.xml
new file mode 100644
index 0000000..02cd157
--- /dev/null
+++ b/java/com/android/dialer/theme/common/res/values-zh-rHK/strings.xml
@@ -0,0 +1,11 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="unknown">未知</string>
+  <string name="unknown_counter">%1$s %2$d</string>
+  <string name="payphone">公共電話</string>
+  <string name="emergency_number">緊急電話號碼</string>
+  <string name="launcherActivityLabel">電話</string>
+  <string name="call">通話</string>
+  <string name="video_call_lte_to_wifi_handover_toast">正在使用 Wi‑Fi 繼續通話…</string>
+  <string name="rtt_call_not_available_toast">RTT 不適用於此通話</string>
+  <string name="call_subject_type_and_number">%1$s %2$s</string>
+</resources>
diff --git a/java/com/android/dialer/theme/common/res/values-zh-rTW/strings.xml b/java/com/android/dialer/theme/common/res/values-zh-rTW/strings.xml
new file mode 100644
index 0000000..cce900b
--- /dev/null
+++ b/java/com/android/dialer/theme/common/res/values-zh-rTW/strings.xml
@@ -0,0 +1,11 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="unknown">不明</string>
+  <string name="unknown_counter">%1$s %2$d</string>
+  <string name="payphone">公用電話</string>
+  <string name="emergency_number">緊急電話號碼</string>
+  <string name="launcherActivityLabel">電話</string>
+  <string name="call">撥號</string>
+  <string name="video_call_lte_to_wifi_handover_toast">使用 Wi‑Fi 繼續進行通話…</string>
+  <string name="rtt_call_not_available_toast">本次通話不支援即時文字訊息功能</string>
+  <string name="call_subject_type_and_number">%1$s %2$s</string>
+</resources>
diff --git a/java/com/android/dialer/theme/common/res/values-zu/strings.xml b/java/com/android/dialer/theme/common/res/values-zu/strings.xml
new file mode 100644
index 0000000..cdcec45
--- /dev/null
+++ b/java/com/android/dialer/theme/common/res/values-zu/strings.xml
@@ -0,0 +1,11 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="unknown">Akwaziwa</string>
+  <string name="unknown_counter">%1$s %2$d</string>
+  <string name="payphone">Ucingo olufakwa imali</string>
+  <string name="emergency_number">Inombolo ephuthumayo</string>
+  <string name="launcherActivityLabel">Ifoni</string>
+  <string name="call">Shaya</string>
+  <string name="video_call_lte_to_wifi_handover_toast">Qhubeka ifone usebenzisa i-Wi‑Fi…</string>
+  <string name="rtt_call_not_available_toast">I-RTT ayitholakaleli le kholi</string>
+  <string name="call_subject_type_and_number">%1$s %2$s</string>
+</resources>
diff --git a/java/com/android/dialer/theme/common/res/values/colors.xml b/java/com/android/dialer/theme/common/res/values/colors.xml
new file mode 100644
index 0000000..1831862
--- /dev/null
+++ b/java/com/android/dialer/theme/common/res/values/colors.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2012 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+<!-- The colors in this file aren't configured at the theme level. -->
+<resources>
+  <color name="dialer_call_green">#00C853</color>
+  <color name="dialer_end_call_button_color">#BD2A2A</color>
+  <color name="dialer_divider_line_color">#D8D8D8</color>
+  <color name="dialer_link_color">#2A56C6</color>
+  <color name="dialer_snackbar_action_text_color">#4285F4</color>
+
+  <!-- Colors for the notification actions -->
+  <color name="notification_action_accept">#097138</color>
+  <color name="notification_action_dismiss">#A52714</color>
+  <color name="notification_action_answer_video">#097138</color>
+
+  <color name="dialer_red">#C53929</color>
+
+  <!-- Legacy -->
+  <color name="blue_grey_100">#CFD8DC</color>
+</resources>
\ No newline at end of file
diff --git a/java/com/android/dialer/theme/res/values/dimens.xml b/java/com/android/dialer/theme/common/res/values/dimens.xml
similarity index 100%
rename from java/com/android/dialer/theme/res/values/dimens.xml
rename to java/com/android/dialer/theme/common/res/values/dimens.xml
diff --git a/java/com/android/dialer/theme/common/res/values/strings.xml b/java/com/android/dialer/theme/common/res/values/strings.xml
new file mode 100644
index 0000000..5952a01
--- /dev/null
+++ b/java/com/android/dialer/theme/common/res/values/strings.xml
@@ -0,0 +1,50 @@
+<!--
+  ~ Copyright (C) 2016 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- String used to display calls from unknown numbers in the call log -->
+  <string name="unknown">Unknown</string>
+
+  <!-- String to identify an unknown/restricted callers. ex. "Unknown 1", "Restricted 2", ect. -->
+  <string name="unknown_counter">
+    <xliff:g id="unknown">%1$s</xliff:g> <xliff:g id="id">%2$d</xliff:g>
+  </string>
+
+  <!-- String used to display calls from pay phone in the call log -->
+  <string name="payphone">Payphone</string>
+
+  <!-- String used to display calls from emergency numbers in the call log and incallui -->
+  <string name="emergency_number">Emergency number</string>
+
+  <!-- Title for the activity that dials the phone.  This is the name
+       used in the Launcher icon. -->
+  <string name="launcherActivityLabel">Phone</string>
+
+  <!-- Label shown on the 'positive' button for the dialog. Indicates that the call will proceed -->
+  <string name="call">Call</string>
+
+  <!-- Displayed when handover from WiFi to Lte occurs during a video call -->
+  <string name="video_call_lte_to_wifi_handover_toast">Continuing call using Wi\u2011Fi\u2026</string>
+
+  <!-- Displayed when RTT upgrade request failed -->
+  <string name="rtt_call_not_available_toast">RTT not available for this call</string>
+
+  <!-- String used to build a phone number type and phone number string.
+     Example: Mobile 650-555-1212  -->
+  <string name="call_subject_type_and_number">
+    <xliff:g example="Mobile" id="type">%1$s</xliff:g> <xliff:g example="(650) 555-1212" id="number">%2$s</xliff:g>
+  </string>
+</resources>
diff --git a/java/com/android/dialer/theme/common/res/values/styles.xml b/java/com/android/dialer/theme/common/res/values/styles.xml
new file mode 100644
index 0000000..2c6446c
--- /dev/null
+++ b/java/com/android/dialer/theme/common/res/values/styles.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2018 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+<resources>
+  <!-- TODO(calderwoodra): Delete this once new call log and new voicemail ship. -->
+  <!-- Ideally we would make a callLogCardStyle attribute but we don't want to expand dialer/app -->
+  <style name="CallLogCardStyle" parent="CardView">
+    <item name="android:layout_width">match_parent</item>
+    <item name="android:layout_height">wrap_content</item>
+    <item name="android:layout_margin">4dp</item>
+    <item name="android:baselineAligned">false</item>
+    <item name="cardCornerRadius">2dp</item>
+    <item name="cardBackgroundColor">?android:attr/colorBackgroundFloating</item>
+  </style>
+
+  <!-- This Checkbox style helps align checkboxes with the common list element layout(Image + text) -->
+  <style name="DialerCheckboxStyle" parent="Widget.AppCompat.CompoundButton.CheckBox">
+    <item name="android:layout_marginStart">20dp</item>
+    <item name="android:paddingLeft">12dp</item>
+  </style>
+</resources>
\ No newline at end of file
diff --git a/java/com/android/dialer/theme/common/res/values/text_styles.xml b/java/com/android/dialer/theme/common/res/values/text_styles.xml
new file mode 100644
index 0000000..def5862
--- /dev/null
+++ b/java/com/android/dialer/theme/common/res/values/text_styles.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2018 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+<resources>
+  <!--
+   - These are official UX approved text styles and all TextViews should inherit from one of these.
+   - If you think you don't see the style you need, double check with your UX designer.
+   -->
+  <style name="Dialer.TextAppearance.Header1" parent="TextAppearance.AppCompat">
+    <item name="android:textColor">?android:attr/textColorPrimary</item>
+    <item name="android:textSize">18sp</item>
+    <item name="android:fontFamily">sans-serif-regular</item>
+  </style>
+
+  <style name="Dialer.TextAppearance.Header2" parent="TextAppearance.AppCompat">
+    <item name="android:textColor">?android:attr/textColorPrimary</item>
+    <item name="android:textSize">16sp</item>
+    <item name="android:fontFamily">sans-serif-medium</item>
+  </style>
+
+  <style name="Dialer.TextAppearance.SubHeader" parent="TextAppearance.AppCompat">
+    <item name="android:textColor">?android:attr/textColorPrimary</item>
+    <item name="android:textSize">16sp</item>
+    <item name="android:fontFamily">sans-serif-medium</item>
+  </style>
+
+  <style name="Dialer.TextAppearance.Primary" parent="TextAppearance.AppCompat">
+    <item name="android:textColor">?android:attr/textColorPrimary</item>
+    <item name="android:textSize">16sp</item>
+    <item name="android:fontFamily">sans-serif-regular</item>
+  </style>
+
+  <style name="Dialer.TextAppearance.Secondary" parent="TextAppearance.AppCompat">
+    <item name="android:textColor">?android:attr/textColorSecondary</item>
+    <item name="android:textSize">14sp</item>
+    <item name="android:fontFamily">sans-serif-regular</item>
+  </style>
+
+  <style name="Dialer.TextAppearance.Secondary2" parent="TextAppearance.AppCompat">
+    <item name="android:textColor">?android:attr/textColorSecondary</item>
+    <item name="android:textSize">12sp</item>
+    <item name="android:fontFamily">sans-serif-regular</item>
+  </style>
+
+  <style name="Dialer.TextAppearance.OVERLINE" parent="TextAppearance.AppCompat">
+    <item name="android:textColor">?android:attr/textColorSecondary</item>
+    <item name="android:textSize">14sp</item>
+    <item name="android:fontFamily">sans-serif-medium</item>
+  </style>
+
+  <style name="Dialer.TextAppearance.Header1.Ellipsize">
+    <item name="android:ellipsize">end</item>
+    <item name="android:maxLines">1</item>
+  </style>
+
+  <style name="Dialer.TextAppearance.Header2.Ellipsize">
+    <item name="android:ellipsize">end</item>
+    <item name="android:maxLines">1</item>
+  </style>
+
+  <style name="Dialer.TextAppearance.SubHeader.Ellipsize">
+    <item name="android:ellipsize">end</item>
+    <item name="android:maxLines">1</item>
+  </style>
+
+  <style name="Dialer.TextAppearance.Primary.Ellipsize">
+    <item name="android:ellipsize">end</item>
+    <item name="android:maxLines">1</item>
+  </style>
+
+  <style name="Dialer.TextAppearance.Secondary.Ellipsize">
+    <item name="android:ellipsize">end</item>
+    <item name="android:maxLines">1</item>
+  </style>
+
+  <style name="Dialer.TextAppearance.Secondary2.Ellipsize">
+    <item name="android:ellipsize">end</item>
+    <item name="android:maxLines">1</item>
+  </style>
+
+  <style name="Dialer.TextAppearance.OVERLINE.Ellipsize">
+    <item name="android:ellipsize">end</item>
+    <item name="android:maxLines">1</item>
+  </style>
+</resources>
\ No newline at end of file
diff --git a/java/com/android/dialer/theme/hidden/AndroidManifest.xml b/java/com/android/dialer/theme/hidden/AndroidManifest.xml
new file mode 100644
index 0000000..ec46a3a
--- /dev/null
+++ b/java/com/android/dialer/theme/hidden/AndroidManifest.xml
@@ -0,0 +1,16 @@
+<!--
+  ~ Copyright (C) 2018 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+<manifest package="com.android.dialer.theme.hidden"/>
diff --git a/java/com/android/dialer/theme/hidden/res/color/dialer_dark_primary_text_color.xml b/java/com/android/dialer/theme/hidden/res/color/dialer_dark_primary_text_color.xml
new file mode 100644
index 0000000..703e40b
--- /dev/null
+++ b/java/com/android/dialer/theme/hidden/res/color/dialer_dark_primary_text_color.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2018 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+<!-- Primary text color in the Phone app -->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+  <item android:state_enabled="false" android:color="@color/google_grey_700"/>
+  <item android:color="@color/google_grey_400"/>
+</selector>
diff --git a/java/com/android/dialer/theme/hidden/res/color/dialer_dark_secondary_text_color.xml b/java/com/android/dialer/theme/hidden/res/color/dialer_dark_secondary_text_color.xml
new file mode 100644
index 0000000..486669f
--- /dev/null
+++ b/java/com/android/dialer/theme/hidden/res/color/dialer_dark_secondary_text_color.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2018 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+<!-- Secondary text color in the Phone app -->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+  <item android:state_enabled="false" android:color="@color/google_grey_700"/>
+  <item android:color="@color/google_grey_300"/>
+</selector>
diff --git a/java/com/android/dialer/theme/hidden/res/color/dialer_primary_text_color.xml b/java/com/android/dialer/theme/hidden/res/color/dialer_primary_text_color.xml
new file mode 100644
index 0000000..58aa2b0
--- /dev/null
+++ b/java/com/android/dialer/theme/hidden/res/color/dialer_primary_text_color.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2018 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+<!-- Primary text color in the Phone app -->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+  <item android:state_enabled="false" android:color="@color/google_grey_400"/>
+  <item android:color="@color/google_grey_900"/>
+</selector>
\ No newline at end of file
diff --git a/java/com/android/dialer/theme/hidden/res/color/dialer_secondary_text_color.xml b/java/com/android/dialer/theme/hidden/res/color/dialer_secondary_text_color.xml
new file mode 100644
index 0000000..20dfd35
--- /dev/null
+++ b/java/com/android/dialer/theme/hidden/res/color/dialer_secondary_text_color.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2018 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+<!-- Secondary text color in the Phone app -->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+  <item android:state_enabled="false" android:color="@color/google_grey_400"/>
+  <item android:color="@color/google_grey_700"/>
+</selector>
\ No newline at end of file
diff --git a/java/com/android/dialer/theme/hidden/res/color/settings_text_color_primary.xml b/java/com/android/dialer/theme/hidden/res/color/settings_text_color_primary.xml
new file mode 100644
index 0000000..b26c2c2
--- /dev/null
+++ b/java/com/android/dialer/theme/hidden/res/color/settings_text_color_primary.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+  <item android:color="@color/google_grey_400" android:state_enabled="false"/>
+  <item android:color="@color/google_grey_900"/>
+</selector>
diff --git a/java/com/android/dialer/theme/hidden/res/color/settings_text_color_secondary.xml b/java/com/android/dialer/theme/hidden/res/color/settings_text_color_secondary.xml
new file mode 100644
index 0000000..21e125a
--- /dev/null
+++ b/java/com/android/dialer/theme/hidden/res/color/settings_text_color_secondary.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+  <item android:color="@color/google_grey_400" android:state_enabled="false"/>
+  <item android:color="@color/google_grey_700"/>
+</selector>
diff --git a/java/com/android/dialer/theme/hidden/res/values/colors_dialer_dark.xml b/java/com/android/dialer/theme/hidden/res/values/colors_dialer_dark.xml
new file mode 100644
index 0000000..e48474e
--- /dev/null
+++ b/java/com/android/dialer/theme/hidden/res/values/colors_dialer_dark.xml
@@ -0,0 +1,22 @@
+<!--
+  ~ Copyright (C) 2018 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+<resources>
+  <!-- Essential theme colors -->
+  <color name="dialer_dark_theme_color">#5195EA</color>
+  <color name="dialer_dark_theme_color_20pct">#335195EA</color>
+  <color name="dialer_dark_theme_color_dark">#2374CE</color>
+  <color name="dialer_dark_secondary_color">#5195EA</color>
+</resources>
diff --git a/java/com/android/dialer/theme/hidden/res/values/colors_dialer_light.xml b/java/com/android/dialer/theme/hidden/res/values/colors_dialer_light.xml
new file mode 100644
index 0000000..988aad7
--- /dev/null
+++ b/java/com/android/dialer/theme/hidden/res/values/colors_dialer_light.xml
@@ -0,0 +1,23 @@
+<!--
+  ~ Copyright (C) 2018 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+<resources>
+  <!-- Essential theme colors -->
+  <color name="dialer_theme_color">#2A56C6</color>
+  <color name="dialer_theme_color_20pct">#332A56C6</color>
+  <color name="dialer_theme_color_dark">#1C3AA9</color>
+  <color name="dialer_secondary_color">#F50057</color>
+  <color name="dialer_background_color">#FAFAFA</color>
+</resources>
diff --git a/java/com/android/dialer/theme/hidden/res/values/colors_pallet.xml b/java/com/android/dialer/theme/hidden/res/values/colors_pallet.xml
new file mode 100644
index 0000000..7a092b2
--- /dev/null
+++ b/java/com/android/dialer/theme/hidden/res/values/colors_pallet.xml
@@ -0,0 +1,35 @@
+<!--
+  ~ Copyright (C) 2018 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+<resources>
+  <color name="google_blue_900">#174EA6</color>
+  <color name="google_blue_800">#185ABC</color>
+  <color name="google_blue_700">#1967D2</color>
+  <color name="google_blue_600">#1A73E8</color>
+  <color name="google_blue_500">#4285F4</color>
+  <color name="google_blue_100">#D2E3FC</color>
+  <color name="google_blue_50">#E8F0FE</color>
+
+  <color name="google_grey_900">#202124</color>
+  <color name="google_grey_800">#3C4043</color>
+  <color name="google_grey_700">#5F6368</color>
+  <color name="google_grey_600">#80868B</color>
+  <color name="google_grey_500">#9AA0A6</color>
+  <color name="google_grey_400">#BDC1C6</color>
+  <color name="google_grey_300">#DADCE0</color>
+  <color name="google_grey_200">#E8EAED</color>
+  <color name="google_grey_100">#F1F3F4</color>
+  <color name="google_grey_50">#F8F9FA</color>
+</resources>
diff --git a/java/com/android/dialer/theme/hidden/res/values/styles.xml b/java/com/android/dialer/theme/hidden/res/values/styles.xml
new file mode 100644
index 0000000..44a35f8
--- /dev/null
+++ b/java/com/android/dialer/theme/hidden/res/values/styles.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2018 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+<resources>
+  <!-- Update to Theme.AppCompat.Light.NoActionBar once we no longer depend on ActionBars. -->
+  <style name="Dialer" parent="Theme.AppCompat.Light">
+    <!-- Used to automatically style all buttons in Dialer -->
+    <item name="android:textAppearanceButton">@style/DialerButtonTextStyle</item>
+    <item name="android:colorButtonNormal">?android:attr/colorPrimary</item>
+
+    <!-- Used to style link text -->
+    <item name="android:textColorLink">@color/dialer_theme_color</item>
+
+    <!-- Used to automatically style AlertDialogs -->
+    <item name="alertDialogTheme">@style/AlertDialogTheme</item>
+    <item name="android:alertDialogTheme">@style/AlertDialogTheme</item>
+  </style>
+
+  <style name="Dialer.Dark" parent="Theme.AppCompat">
+    <!-- Used to automatically style all buttons in Dialer -->
+    <item name="android:textAppearanceButton">@style/DialerButtonTextStyle</item>
+    <item name="android:colorButtonNormal">?android:attr/colorPrimary</item>
+
+    <!-- Used to style link text -->
+    <item name="android:textColorLink">@color/dialer_theme_color</item>
+
+    <!-- Used to automatically style AlertDialogs -->
+    <item name="alertDialogTheme">@style/AlertDialogTheme</item>
+    <item name="android:alertDialogTheme">@style/AlertDialogTheme</item>
+  </style>
+
+  <!-- Used to style all Dialer's button's text. Every button is awarded this for free if the parent
+     activity's theme extends from Dialer.ThemeBase(.NoActionBar) or doesn't specify a theme. -->
+  <style name="DialerButtonTextStyle" parent="@android:style/TextAppearance.Material.Widget.Button">
+    <item name="android:textColor">?android:attr/textColorPrimaryInverse</item>
+  </style>
+
+  <!-- Used to style all Dialer's AlertDialogs. Every button is awarded this for free if the parent
+     activity's theme extends from Dialer.ThemeBase(.NoActionBar) or doesn't specify a theme. -->
+  <style name="AlertDialogTheme" parent="Theme.AppCompat.Light.Dialog.Alert">
+    <item name="android:textColorPrimary">@color/dialer_primary_text_color</item>
+    <!-- TODO(a bug): figure out why ?android:attr/colorPrimary doesn't work here -->
+    <item name="android:colorAccent">@color/dialer_theme_color</item>
+    <item name="colorAccent">@color/dialer_theme_color</item>
+    <item name="android:textColorPrimary">@color/dialer_primary_text_color</item>
+    <item name="android:textColorSecondary">@color/dialer_secondary_text_color</item>
+  </style>
+</resources>
diff --git a/java/com/android/dialer/theme/res/anim/front_back_switch_button_animation.xml b/java/com/android/dialer/theme/res/anim/front_back_switch_button_animation.xml
deleted file mode 100644
index 3098645..0000000
--- a/java/com/android/dialer/theme/res/anim/front_back_switch_button_animation.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<set
-  xmlns:android="http://schemas.android.com/apk/res/android">
-  <set
-    android:ordering="sequentially">
-    <objectAnimator
-      android:duration="500"
-      android:propertyName="rotation"
-      android:valueFrom="0.0"
-      android:valueTo="-180.0"
-      android:valueType="floatType"
-      android:interpolator="@android:interpolator/fast_out_slow_in"/>
-  </set>
-</set>
\ No newline at end of file
diff --git a/java/com/android/dialer/theme/res/animator/activated_button_elevation.xml b/java/com/android/dialer/theme/res/animator/activated_button_elevation.xml
deleted file mode 100644
index b8ea4e8..0000000
--- a/java/com/android/dialer/theme/res/animator/activated_button_elevation.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-  <item
-    android:state_enabled="true"
-    android:state_activated="true">
-    <objectAnimator
-      android:duration="@android:integer/config_shortAnimTime"
-      android:propertyName="translationZ"
-      android:valueFrom="0dp"
-      android:valueTo="4dp"
-      android:valueType="floatType"/>
-  </item>
-  <item>
-    <objectAnimator
-      android:duration="@android:integer/config_shortAnimTime"
-      android:propertyName="translationZ"
-      android:valueFrom="4dp"
-      android:valueTo="0dp"
-      android:valueType="floatType"/>
-  </item>
-</selector>
diff --git a/java/com/android/dialer/theme/res/drawable/front_back_switch_button.xml b/java/com/android/dialer/theme/res/drawable/front_back_switch_button.xml
deleted file mode 100644
index 2dc3eb1..0000000
--- a/java/com/android/dialer/theme/res/drawable/front_back_switch_button.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  android:name="front_back_switch_button"
-  android:width="56dp"
-  android:viewportWidth="56"
-  android:height="56dp"
-  android:viewportHeight="56">
-  <group
-    android:name="layer_3_outlines"
-    android:translateX="32.0015"
-    android:translateY="27.00208">
-    <group
-      android:name="layer_3_outlines_pivot"
-      android:translateX="-4.25"
-      android:translateY="-7.25">
-      <group
-        android:name="group_1"
-        android:translateX="4.25"
-        android:translateY="7.25001">
-        <path
-          android:name="path_1"
-          android:pathData="M 2.0,-5.0 c 0.0,0.0 -2.16999816895,0.0 -2.16999816895,0.0 c 0.0,0.0 -1.83000183105,-2.0 -1.83000183105,-2.0 c 0.0,0.0 -2.0,0.0 -2.0,0.0 c 0.0,0.0 0.0,5.0 0.0,5.0 c 1.65600585938,0.0 3.0,1.34399414062 3.0,3.0 c 0.0,1.65600585938 -1.34399414062,3.0 -3.0,3.0 c 0.0,0.0 -3.0,0.00181579589844 -3.0,0.00181579589844 c 0.0,0.0 0.001953125,2.99415588379 0.001953125,2.99415588379 c 0.0,0.0 2.998046875,0.0040283203125 2.998046875,0.0040283203125 c 0.0,0.0 6.0,0.0 6.0,0.0 c 1.10000610352,0.0 2.0,-0.899993896484 2.0,-2.0 c 0.0,0.0 0.0,-8.0 0.0,-8.0 c 0.0,-1.10000610352 -0.899993896484,-2.0 -2.0,-2.0 Z"
-          android:fillColor="#FFFFFFFF"/>
-      </group>
-    </group>
-  </group>
-  <group
-    android:name="layer_1_outlines"
-    android:translateX="24.00099"
-    android:translateY="26.99992">
-    <group
-      android:name="layer_1_outlines_pivot"
-      android:translateX="-4.249"
-      android:translateY="-7.25">
-      <group
-        android:name="group_2"
-        android:translateX="4.249"
-        android:translateY="7.25">
-        <path
-          android:name="path_2"
-          android:pathData="M 3.99900817871,4.0 c -1.65501403809,-0.00099182128906 -2.99800109863,-1.34399414062 -2.99800109863,-3.0 c 0.0,-1.6549987793 1.34298706055,-2.99899291992 2.99800109863,-3.0 c 0.0,0.0 1.0,0.00008 1.0,0.00008 c 0.0,0.0 0.0,-5.0 0.0,-5.0 c 0.0,0.0 -1.0,-0.00008 -1.0,-0.00008 c 0.0,0.0 -1.99800109863,0.0 -1.99800109863,0.0 c 0.0,0.0 -1.83000183105,2.0 -1.83000183105,2.0 c 0.0,0.0 -2.17001342773,0.0 -2.17001342773,0.0 c -1.1009979248,0.0 -2.0,0.899993896484 -2.0,2.0 c 0.0,0.0 0.0,8.0 0.0,8.0 c 0.0,1.10000610352 0.899002075195,2.0 2.0,2.0 c 0.0,0.0 5.99801635742,0.0 5.99801635742,0.0 c 0.0,0.0 0.0,-3.0 0.0,-3.0 Z"
-          android:fillColor="#FFFFFFFF"/>
-      </group>
-    </group>
-  </group>
-  <group
-    android:name="layer_10_outlines"
-    android:translateX="28.00001"
-    android:translateY="27.99999">
-    <group
-      android:name="layer_10_outlines_pivot"
-      android:translateX="-19.25"
-      android:translateY="-19.25005">
-      <group
-        android:name="group_3"
-        android:translateX="20.25"
-        android:translateY="9.75001">
-        <path
-          android:name="path_3"
-          android:pathData="M 12.4349975586,-3.93499755859 c -3.70999145508,-3.71000671387 -8.57299804688,-5.56500244141 -13.4349975586,-5.56500244141 c -4.8630065918,0.0 -9.72500610352,1.85499572754 -13.4349975586,5.56500244141 c -0.337005615234,0.336990356445 -0.652008056641,0.688003540039 -0.956008911133,1.04399108887 c 0.0,0.0 -2.60899353027,-2.60899353027 -2.60899353027,-2.60899353027 c 0.0,0.0 0.0,7.0 0.0,7.0 c 0.0,0.0 7.0,0.0 7.0,0.0 c 0.0,0.0 -2.97300720215,-2.97300720215 -2.97300720215,-2.97300720215 c 0.300003051758,-0.360992431641 0.616012573242,-0.711990356445 0.952011108398,-1.0479888916 c 3.21099853516,-3.21099853516 7.47999572754,-4.97900390625 12.0209960938,-4.97900390625 c 4.54100036621,0.0 8.80999755859,1.76800537109 12.0209960938,4.97900390625 c 3.31401062012,3.31399536133 4.97100830078,7.66799926758 4.97100830078,12.0209960938 c 0.0,0.0 2.00799560547,0.0 2.00799560547,0.0 c 0.0,-4.86199951172 -1.85499572754,-9.72500610352 -5.56500244141,-13.4349975586 Z"
-          android:fillColor="#FFFFFFFF"/>
-      </group>
-      <group
-        android:name="group_4"
-        android:translateX="18.25"
-        android:translateY="28.75011">
-        <path
-          android:name="path_4"
-          android:pathData="M 18.0,-1.5 c 0.0,0.0 -7.0,0.0 -7.0,0.0 c 0.0,0.0 2.97300720215,2.97300720215 2.97300720215,2.97300720215 c -0.300003051758,0.360992431641 -0.616012573242,0.711990356445 -0.952011108398,1.0479888916 c -3.21099853516,3.21099853516 -7.47999572754,4.97900390625 -12.0209960938,4.97900390625 c -4.54100036621,0.0 -8.80999755859,-1.76800537109 -12.0209960938,-4.97900390625 c -3.31401062012,-3.31399536133 -4.97100830078,-7.66799926758 -4.97100830078,-12.0209960938 c 0.0,0.0 -2.00799560547,0.0 -2.00799560547,0.0 c 0.0,4.86199951172 1.85499572754,9.72500610352 5.56500244141,13.4349975586 c 3.70999145508,3.71000671387 8.57299804688,5.56500244141 13.4349975586,5.56500244141 c 4.8630065918,0.0 9.72500610352,-1.85499572754 13.4349975586,-5.56500244141 c 0.337005615234,-0.336990356445 0.652008056641,-0.688003540039 0.956008911133,-1.04400634766 c 0.0,0.0 2.60899353027,2.60900878906 2.60899353027,2.60900878906 c 0.0,0.0 0.0,-7.0 0.0,-7.0 Z"
-          android:fillColor="#FFFFFFFF"/>
-      </group>
-    </group>
-  </group>
-</vector>
\ No newline at end of file
diff --git a/java/com/android/dialer/theme/res/drawable/front_back_switch_button_animation.xml b/java/com/android/dialer/theme/res/drawable/front_back_switch_button_animation.xml
deleted file mode 100644
index 14cda1b..0000000
--- a/java/com/android/dialer/theme/res/drawable/front_back_switch_button_animation.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<animated-vector
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  android:drawable="@drawable/front_back_switch_button">
-  <target
-    android:name="layer_10_outlines"
-    android:animation="@anim/front_back_switch_button_animation"/>
-</animated-vector>
\ No newline at end of file
diff --git a/java/com/android/dialer/theme/res/values/colors.xml b/java/com/android/dialer/theme/res/values/colors.xml
deleted file mode 100644
index a434874..0000000
--- a/java/com/android/dialer/theme/res/values/colors.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<!--
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-  -->
-
-<resources>
-  <!-- Note: The following colors are used in the Dialer settings screens.  Since Dialer's settings
-       link into the Telephony settings as well, changes to these colors should be mirrored in
-       Telephony:
-
-       Android source path: packages/apps/PhoneCommon/res/values/colors.xml
-         - Local: dialer_theme_color         Android Source: dialer_theme_color
-         - Local: dialer_theme_color_dark    Android Source: dialer_theme_color_dark
-       Android source path: packages/services/Telecomm/res/values/colors.xml
-         - Local: dialer_theme_color         Android Source: theme_color
-         - Local: dialer_theme_color_dark    Android Source: dialer_settings_color_dark
-       -->
-  <color name="dialer_theme_color">#2A56C6</color>
-  <color name="dialer_theme_color_dark">#1C3AA9</color>
-
-  <color name="dialer_snackbar_action_text_color">#4285F4</color>
-  <color name="dialer_theme_color_20pct">#332A56C6</color>
-
-  <color name="dialpad_fab_green">#00C853</color>
-
-  <color name="dialer_secondary_color">#F50057</color>
-
-  <!-- Primary text color in the Phone app -->
-  <color name="dialer_primary_text_color">#333333</color>
-  <color name="dialer_primary_text_color_white">#ffffff</color>
-  <color name="dialer_edit_text_hint_color">#DE78909C</color>
-
-  <!-- Secondary text color in the Phone app -->
-  <color name="dialer_secondary_text_color">#636363</color>
-  <!-- 38% opacity -->
-  <color name="dialer_secondary_text_color_hiden">#61000000</color>
-
-  <!-- Color of the theme of the Dialer app -->
-  <color name="dialtacts_theme_color">@color/dialer_theme_color</color>
-
-  <!-- Background color of new dialer activity -->
-  <color name="background_dialer_light">#fafafa</color>
-  <!-- White background for dialer -->
-  <color name="background_dialer_white">#ffffff</color>
-  <color name="background_dialer_call_log_list_item">@color/background_dialer_white</color>
-
-  <!-- Colors for the notification actions -->
-  <color name="notification_action_accept">#097138</color>
-  <color name="notification_action_dismiss">#A52714</color>
-  <color name="notification_action_answer_video">#097138</color>
-
-  <!-- Background color of action bars -->
-  <color name="actionbar_background_color">@color/dialer_theme_color</color>
-
-  <!-- Background color of title bars in recents -->
-  <color name="titlebar_in_recents_background_color">@color/dialer_theme_color_dark</color>
-
-  <color name="blue_grey_100">#CFD8DC</color>
-
-  <!-- 54% opacity -->
-  <color name="icon_color_grey">#89000000</color>
-
-  <!-- Color for bubble -->
-  <color name="dialer_end_call_button_color">#BD2A2A</color>
-</resources>
diff --git a/java/com/android/dialer/theme/res/values/strings.xml b/java/com/android/dialer/theme/res/values/strings.xml
deleted file mode 100644
index a14693f..0000000
--- a/java/com/android/dialer/theme/res/values/strings.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<!--
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-  -->
-
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- String used to display calls from unknown numbers in the call log -->
-  <string name="unknown">Unknown</string>
-
-  <!-- String to identify an unknown/restricted callers. ex. "Unknown 1", "Restricted 2", ect. -->
-  <string name="unknown_counter">
-    <xliff:g id="unknown">%s</xliff:g> <xliff:g id="id">%d</xliff:g>
-  </string>
-
-  <!-- String used to display calls from pay phone in the call log -->
-  <string name="payphone">Payphone</string>
-
-  <!-- Title for the activity that dials the phone.  This is the name
-       used in the Launcher icon. -->
-  <string name="launcherActivityLabel">Phone</string>
-
-  <!-- Label shown on the 'positive' button for the dialog. Indicates that the call will proceed -->
-  <string name="call">Call</string>
-</resources>
diff --git a/java/com/android/dialer/theme/res/values/styles.xml b/java/com/android/dialer/theme/res/values/styles.xml
deleted file mode 100644
index d65d2af..0000000
--- a/java/com/android/dialer/theme/res/values/styles.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<!--
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-  -->
-
-<resources>
-
-  <style name="CallLogCardStyle" parent="CardView">
-    <item name="android:layout_width">match_parent</item>
-    <item name="android:layout_height">wrap_content</item>
-    <item name="android:layout_margin">4dp</item>
-    <item name="android:baselineAligned">false</item>
-    <item name="cardCornerRadius">2dp</item>
-    <item name="cardBackgroundColor">@color/background_dialer_call_log_list_item</item>
-  </style>
-
-  <!-- Inherit from Theme.Material.Light.Dialog instead of Theme.Material.Light.Dialog.Alert
-  since the Alert dialog is private. They are identical anyway. -->
-  <style name="AlertDialogTheme" parent="@android:style/Theme.Material.Light.Dialog">
-    <item name="android:colorAccent">@color/dialtacts_theme_color</item>
-  </style>
-
-  <style name="TextActionStyle">
-    <item name="android:layout_width">wrap_content</item>
-    <item name="android:layout_height">@dimen/call_log_action_height</item>
-    <item name="android:gravity">end|center_vertical</item>
-    <item name="android:paddingStart">@dimen/call_log_action_horizontal_padding</item>
-    <item name="android:paddingEnd">@dimen/call_log_action_horizontal_padding</item>
-    <item name="android:textColor">@color/dialtacts_theme_color</item>
-    <item name="android:fontFamily">"sans-serif-medium"</item>
-    <item name="android:focusable">true</item>
-    <item name="android:singleLine">true</item>
-    <item name="android:textAllCaps">true</item>
-  </style>
-
-  <style name="DialerButtonTextStyle" parent="@android:style/TextAppearance.Material.Widget.Button">
-    <item name="android:textColor">@color/dialer_primary_text_color_white</item>
-  </style>
-
-  <style name="DialerActionBarBaseStyle"
-    parent="@style/Widget.AppCompat.Light.ActionBar.Solid.Inverse">
-    <item name="android:background">@color/actionbar_background_color</item>
-    <item name="background">@color/actionbar_background_color</item>
-  </style>
-</resources>
diff --git a/java/com/android/dialer/theme/res/values/themes.xml b/java/com/android/dialer/theme/res/values/themes.xml
deleted file mode 100644
index 1c57066..0000000
--- a/java/com/android/dialer/theme/res/values/themes.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-  -->
-<resources>
-
-  <style name="DialerThemeBase" parent="@style/Theme.AppCompat.Light.DarkActionBar">
-    <item name="android:textColorPrimary">@color/dialer_primary_text_color</item>
-    <item name="android:textColorSecondary">@color/dialer_secondary_text_color</item>
-    <!-- This is used for title bar color in recents -->
-    <item name="android:colorPrimary">@color/titlebar_in_recents_background_color</item>
-    <item name="android:colorPrimaryDark">@color/dialer_theme_color_dark</item>
-    <item name="android:colorControlActivated">@color/dialer_theme_color</item>
-    <item name="android:colorButtonNormal">@color/dialer_theme_color</item>
-    <item name="android:colorAccent">@color/dialtacts_theme_color</item>
-    <item name="android:alertDialogTheme">@style/AlertDialogTheme</item>
-    <item name="android:textAppearanceButton">@style/DialerButtonTextStyle</item>
-
-    <item name="android:actionBarStyle">@style/DialerActionBarBaseStyle</item>
-    <item name="actionBarStyle">@style/DialerActionBarBaseStyle</item>
-    <item name="android:actionBarSize">@dimen/action_bar_height</item>
-    <item name="actionBarSize">@dimen/action_bar_height</item>
-  </style>
-
-  <!-- Should be kept in sync with the theme above (minus anything related to actionbars -->
-  <style name="DialerThemeBase.NoActionBar" parent="@style/Theme.AppCompat.Light.NoActionBar">
-    <item name="android:textColorPrimary">@color/dialer_primary_text_color</item>
-    <item name="android:textColorSecondary">@color/dialer_secondary_text_color</item>
-    <!-- This is used for title bar color in recents -->
-    <item name="android:colorPrimary">@color/titlebar_in_recents_background_color</item>
-    <item name="android:colorPrimaryDark">@color/dialer_theme_color_dark</item>
-    <item name="android:colorControlActivated">@color/dialer_theme_color</item>
-    <item name="android:colorButtonNormal">@color/dialer_theme_color</item>
-    <item name="android:colorAccent">@color/dialtacts_theme_color</item>
-    <item name="android:alertDialogTheme">@style/AlertDialogTheme</item>
-    <item name="android:textAppearanceButton">@style/DialerButtonTextStyle</item>
-  </style>
-
-  <style name="Theme.AppCompat.Translucent" parent="Theme.AppCompat.NoActionBar">
-    <item name="android:windowNoTitle">true</item>
-    <item name="android:windowBackground">@android:color/transparent</item>
-    <item name="android:colorBackgroundCacheHint">@null</item>
-    <item name="android:windowIsTranslucent">true</item>
-    <item name="android:windowAnimationStyle">@android:style/Animation</item>
-  </style>
-
-  <style name="PrimaryText" parent="TextAppearance.AppCompat">
-    <item name="android:textColor">#DE000000</item>
-    <item name="android:textSize">16sp</item>
-    <item name="android:ellipsize">end</item>
-    <item name="android:maxLines">1</item>
-  </style>
-
-  <style name="SecondaryText" parent="TextAppearance.AppCompat">
-    <item name="android:textColor">#8A000000</item>
-    <item name="android:textSize">14sp</item>
-    <item name="android:ellipsize">end</item>
-    <item name="android:maxLines">1</item>
-  </style>
-
-  <style name="SubHeader" parent="TextAppearance.AppCompat">
-    <item name="android:textColor">#212121</item>
-    <item name="android:textSize">14sp</item>
-    <item name="android:lineSpacingMultiplier">1.1</item>
-  </style>
-
-</resources>
diff --git a/java/com/android/dialer/util/CallUtil.java b/java/com/android/dialer/util/CallUtil.java
index 22cab87..89af0b9 100644
--- a/java/com/android/dialer/util/CallUtil.java
+++ b/java/com/android/dialer/util/CallUtil.java
@@ -16,13 +16,13 @@
 
 package com.android.dialer.util;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.net.Uri;
 import android.telecom.PhoneAccount;
 import android.telecom.PhoneAccountHandle;
 import android.telecom.TelecomManager;
 import com.android.dialer.common.LogUtil;
-import com.android.dialer.compat.CompatUtils;
 import com.android.dialer.phonenumberutil.PhoneNumberHelper;
 import java.util.List;
 
@@ -62,9 +62,9 @@
    * @param context The context
    * @return A bit-mask describing the current video capabilities.
    */
+  @SuppressLint("MissingPermission")
   public static int getVideoCallingAvailability(Context context) {
-    if (!PermissionsUtil.hasPermission(context, android.Manifest.permission.READ_PHONE_STATE)
-        || !CompatUtils.isVideoCompatible()) {
+    if (!PermissionsUtil.hasPermission(context, android.Manifest.permission.READ_PHONE_STATE)) {
       return VIDEO_CALLING_DISABLED;
     }
     TelecomManager telecommMgr = (TelecomManager) context.getSystemService(Context.TELECOM_SERVICE);
@@ -77,11 +77,6 @@
       PhoneAccount account = telecommMgr.getPhoneAccount(accountHandle);
       if (account != null) {
         if (account.hasCapabilities(PhoneAccount.CAPABILITY_VIDEO_CALLING)) {
-          // Builds prior to N do not have presence support.
-          if (!CompatUtils.isVideoPresenceCompatible()) {
-            return VIDEO_CALLING_ENABLED;
-          }
-
           int videoCapabilities = VIDEO_CALLING_ENABLED;
           if (account.hasCapabilities(PhoneAccount.CAPABILITY_VIDEO_CALLING_RELIES_ON_PRESENCE)) {
             videoCapabilities |= VIDEO_CALLING_PRESENCE;
@@ -128,9 +123,9 @@
    * @return {@code true} if one of the call capable phone accounts supports calling with a subject
    *     specified, {@code false} otherwise.
    */
+  @SuppressLint("MissingPermission")
   public static boolean isCallWithSubjectSupported(Context context) {
-    if (!PermissionsUtil.hasPermission(context, android.Manifest.permission.READ_PHONE_STATE)
-        || !CompatUtils.isCallSubjectCompatible()) {
+    if (!PermissionsUtil.hasPermission(context, android.Manifest.permission.READ_PHONE_STATE)) {
       return false;
     }
     TelecomManager telecommMgr = (TelecomManager) context.getSystemService(Context.TELECOM_SERVICE);
diff --git a/java/com/android/dialer/util/DialerUtils.java b/java/com/android/dialer/util/DialerUtils.java
index 7f7b9da..49a0733 100644
--- a/java/com/android/dialer/util/DialerUtils.java
+++ b/java/com/android/dialer/util/DialerUtils.java
@@ -15,6 +15,7 @@
  */
 package com.android.dialer.util;
 
+import android.annotation.SuppressLint;
 import android.app.AlertDialog;
 import android.content.ActivityNotFoundException;
 import android.content.Context;
@@ -22,8 +23,6 @@
 import android.content.DialogInterface.OnClickListener;
 import android.content.Intent;
 import android.graphics.Point;
-import android.os.Build.VERSION;
-import android.os.Build.VERSION_CODES;
 import android.os.Bundle;
 import android.telecom.TelecomManager;
 import android.telephony.TelephonyManager;
@@ -131,12 +130,12 @@
    * currently active call over LTE. Regardless of the country or carrier, the radio will drop an
    * active LTE call if a WPS number is dialed, so this warning is necessary.
    */
+  @SuppressLint("MissingPermission")
   private static boolean shouldWarnForOutgoingWps(Context context, String number) {
     if (number != null && number.startsWith(WPS_PREFIX)) {
       TelephonyManager telephonyManager = context.getSystemService(TelephonyManager.class);
       boolean isOnVolte =
-          VERSION.SDK_INT >= VERSION_CODES.N
-              && telephonyManager.getVoiceNetworkType() == TelephonyManager.NETWORK_TYPE_LTE;
+          telephonyManager.getVoiceNetworkType() == TelephonyManager.NETWORK_TYPE_LTE;
       boolean hasCurrentActiveCall =
           telephonyManager.getCallState() == TelephonyManager.CALL_STATE_OFFHOOK;
       return isOnVolte && hasCurrentActiveCall;
diff --git a/java/com/android/dialer/util/PermissionsUtil.java b/java/com/android/dialer/util/PermissionsUtil.java
index 09c2b7f..7e8aae9 100644
--- a/java/com/android/dialer/util/PermissionsUtil.java
+++ b/java/com/android/dialer/util/PermissionsUtil.java
@@ -91,6 +91,10 @@
     return hasPermission(context, permission.READ_CONTACTS);
   }
 
+  public static boolean hasContactsWritePermissions(Context context) {
+    return hasPermission(context, permission.WRITE_CONTACTS);
+  }
+
   public static boolean hasLocationPermissions(Context context) {
     return hasPermission(context, permission.ACCESS_FINE_LOCATION);
   }
@@ -127,6 +131,10 @@
     return hasPermission(context, permission.ADD_VOICEMAIL);
   }
 
+  public static boolean hasSendSmsPermissions(Context context) {
+    return hasPermission(context, permission.SEND_SMS);
+  }
+
   public static boolean hasPermission(Context context, String permission) {
     return ContextCompat.checkSelfPermission(context, permission)
         == PackageManager.PERMISSION_GRANTED;
diff --git a/java/com/android/dialer/util/ViewUtil.java b/java/com/android/dialer/util/ViewUtil.java
index 211b3ed..81a32f9 100644
--- a/java/com/android/dialer/util/ViewUtil.java
+++ b/java/com/android/dialer/util/ViewUtil.java
@@ -19,19 +19,16 @@
 import android.content.ContentResolver;
 import android.content.Context;
 import android.graphics.Paint;
-import android.graphics.Point;
 import android.os.PowerManager;
 import android.provider.Settings;
 import android.provider.Settings.Global;
 import android.support.annotation.NonNull;
 import android.text.TextUtils;
 import android.util.TypedValue;
-import android.view.Display;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewTreeObserver.OnGlobalLayoutListener;
 import android.view.ViewTreeObserver.OnPreDrawListener;
-import android.view.WindowManager;
 import android.widget.TextView;
 import java.util.Locale;
 
@@ -142,45 +139,4 @@
     return Settings.Global.getFloat(contentResolver, Global.ANIMATOR_DURATION_SCALE, 1.0f) == 0
         || powerManager.isPowerSaveMode();
   }
-
-  /**
-   * Get navigation bar height by calculating difference between app usable size and real screen
-   * size. Note that this won't work in multi-window mode so it's caller's responsibility to check
-   * if the app is in multi-window mode before using this.
-   *
-   * @param context Context
-   * @return Navigation bar height
-   */
-  public static int getNavigationBarHeight(Context context) {
-    WindowManager windowManager = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE);
-    Display display = windowManager.getDefaultDisplay();
-    Point appUsableSize = getAppUsableScreenSize(display);
-    Point realScreenSize = getRealScreenSize(display);
-
-    // Navigation bar on the right.
-    if (appUsableSize.x < realScreenSize.x) {
-      return appUsableSize.y;
-    }
-
-    // Navigation bar at the bottom.
-    if (appUsableSize.y < realScreenSize.y) {
-      return realScreenSize.y - appUsableSize.y;
-    }
-
-    // Navigation bar is not present.
-    return 0;
-  }
-
-  private static Point getAppUsableScreenSize(Display display) {
-    Point size = new Point();
-    display.getSize(size);
-    return size;
-  }
-
-  private static Point getRealScreenSize(Display display) {
-    Point size = new Point();
-    display.getRealSize(size);
-
-    return size;
-  }
 }
diff --git a/java/com/android/dialer/util/res/values-af/strings.xml b/java/com/android/dialer/util/res/values-af/strings.xml
index 2e4b938..ae09da4 100644
--- a/java/com/android/dialer/util/res/values-af/strings.xml
+++ b/java/com/android/dialer/util/res/values-af/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="default_notification_description" msgid="4304424287748323094">"Verstek klank (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
-    <string name="ringtone_silent" msgid="946744257396998305">"Geen"</string>
-    <string name="ringtone_unknown" msgid="1310974715243581582">"Onbekende luitoon"</string>
-    <string name="activity_not_available" msgid="8360067109103762211">"Geen program daarvoor op hierdie toestel nie"</string>
-    <string name="outgoing_wps_warning" msgid="7505673114152005234">"As jy \'n WPS-oproep maak, sal dit jou huidige oproep afsny."</string>
-    <string name="dialog_continue" msgid="4070630558441163574">"Gaan voort"</string>
-    <string name="camera_privacy_text" msgid="4268584469444688293">"Kameratoestemming is geaktiveer"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="default_notification_description">Verstek klank (%1$s)</string>
+  <string name="ringtone_silent">Geen</string>
+  <string name="ringtone_unknown">Onbekende luitoon</string>
+  <string name="activity_not_available">Geen program daarvoor op hierdie toestel nie</string>
+  <string name="outgoing_wps_warning">As jy \'n WPS-oproep maak, sal dit jou huidige oproep afsny.</string>
+  <string name="dialog_continue">Gaan voort</string>
+  <string name="camera_privacy_text">Kameratoestemming is geaktiveer</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-am/strings.xml b/java/com/android/dialer/util/res/values-am/strings.xml
index c28ad6d..e849e06 100644
--- a/java/com/android/dialer/util/res/values-am/strings.xml
+++ b/java/com/android/dialer/util/res/values-am/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="default_notification_description" msgid="4304424287748323094">"ነባሪ ድምጽ (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
-    <string name="ringtone_silent" msgid="946744257396998305">"ምንም"</string>
-    <string name="ringtone_unknown" msgid="1310974715243581582">"ያልታወቀ የጥሪ ቅላጼ"</string>
-    <string name="activity_not_available" msgid="8360067109103762211">"ለዚያ የሚሆን መተግበሪያ በዚህ መሣሪያ ላይ የለም"</string>
-    <string name="outgoing_wps_warning" msgid="7505673114152005234">"የWPS ጥሪ ማድረግ አሁን ያለውን ጥሪዎን ያቋርጠዋል።"</string>
-    <string name="dialog_continue" msgid="4070630558441163574">"ቀጥል"</string>
-    <string name="camera_privacy_text" msgid="4268584469444688293">"የካሜራ ፈቃድ ነቅቷል"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="default_notification_description">ነባሪ ድምጽ (%1$s)</string>
+  <string name="ringtone_silent">ምንም</string>
+  <string name="ringtone_unknown">ያልታወቀ የጥሪ ቅላጼ</string>
+  <string name="activity_not_available">ለዚያ የሚሆን መተግበሪያ በዚህ መሣሪያ ላይ የለም</string>
+  <string name="outgoing_wps_warning">የWPS ጥሪ ማድረግ አሁን ያለውን ጥሪዎን ያቋርጠዋል።</string>
+  <string name="dialog_continue">ቀጥል</string>
+  <string name="camera_privacy_text">የካሜራ ፈቃድ ነቅቷል</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-ar/strings.xml b/java/com/android/dialer/util/res/values-ar/strings.xml
index 4c2a5ea..744ebdd 100644
--- a/java/com/android/dialer/util/res/values-ar/strings.xml
+++ b/java/com/android/dialer/util/res/values-ar/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="default_notification_description" msgid="4304424287748323094">"الصوت الافتراضي (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
-    <string name="ringtone_silent" msgid="946744257396998305">"بدون"</string>
-    <string name="ringtone_unknown" msgid="1310974715243581582">"نغمة رنين غير معروفة"</string>
-    <string name="activity_not_available" msgid="8360067109103762211">"لا يوجد تطبيق لإجراء ذلك على هذا الجهاز"</string>
-    <string name="outgoing_wps_warning" msgid="7505673114152005234">"‏سيؤدي إجراء مكالمة WPS إلى قطع اتصال مكالماتك الحالية."</string>
-    <string name="dialog_continue" msgid="4070630558441163574">"متابعة"</string>
-    <string name="camera_privacy_text" msgid="4268584469444688293">"تم تمكين إذن الكاميرا"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="default_notification_description">الصوت التلقائي (%1$s)</string>
+  <string name="ringtone_silent">بدون</string>
+  <string name="ringtone_unknown">نغمة رنين غير معروفة</string>
+  <string name="activity_not_available">لا يوجد تطبيق لإجراء ذلك على هذا الجهاز</string>
+  <string name="outgoing_wps_warning">‏سيؤدي إجراء مكالمة WPS إلى قطع اتصال مكالماتك الحالية.</string>
+  <string name="dialog_continue">متابعة</string>
+  <string name="camera_privacy_text">تم تفعيل إذن الكاميرا</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-az/strings.xml b/java/com/android/dialer/util/res/values-az/strings.xml
index 726cbd0..1c463a9 100644
--- a/java/com/android/dialer/util/res/values-az/strings.xml
+++ b/java/com/android/dialer/util/res/values-az/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="default_notification_description" msgid="4304424287748323094">"Defolt səs (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
-    <string name="ringtone_silent" msgid="946744257396998305">"Yoxdur"</string>
-    <string name="ringtone_unknown" msgid="1310974715243581582">"Naməlum zəng melodiyası"</string>
-    <string name="activity_not_available" msgid="8360067109103762211">"Bu cihazda onun üçün heç bir proqram yoxdur"</string>
-    <string name="outgoing_wps_warning" msgid="7505673114152005234">"WPS zənginin edilməsi mövcud zənginizi sonlandıracaq."</string>
-    <string name="dialog_continue" msgid="4070630558441163574">"Davam edin"</string>
-    <string name="camera_privacy_text" msgid="4268584469444688293">"Kamera icazəsi aktiv edildi"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="default_notification_description">Defolt səs (%1$s)</string>
+  <string name="ringtone_silent">Yoxdur</string>
+  <string name="ringtone_unknown">Naməlum zəng melodiyası</string>
+  <string name="activity_not_available">Bu cihazda onun üçün heç bir proqram yoxdur</string>
+  <string name="outgoing_wps_warning">WPS zənginin edilməsi mövcud zənginizi sonlandıracaq.</string>
+  <string name="dialog_continue">Davam edin</string>
+  <string name="camera_privacy_text">Kamera icazəsi aktiv edildi</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-b+sr+Latn/strings.xml b/java/com/android/dialer/util/res/values-b+sr+Latn/strings.xml
index f41e7bc..d2d0e06 100644
--- a/java/com/android/dialer/util/res/values-b+sr+Latn/strings.xml
+++ b/java/com/android/dialer/util/res/values-b+sr+Latn/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="default_notification_description" msgid="4304424287748323094">"Podrazumevani zvuk (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
-    <string name="ringtone_silent" msgid="946744257396998305">"Ništa"</string>
-    <string name="ringtone_unknown" msgid="1310974715243581582">"Nepoznati zvuk zvona"</string>
-    <string name="activity_not_available" msgid="8360067109103762211">"Na ovom uređaju nema aplikacija za to"</string>
-    <string name="outgoing_wps_warning" msgid="7505673114152005234">"Ako uputite WPS poziv, prekinućete postojeći poziv."</string>
-    <string name="dialog_continue" msgid="4070630558441163574">"Nastavi"</string>
-    <string name="camera_privacy_text" msgid="4268584469444688293">"Omogućena je dozvola za kameru"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="default_notification_description">Podrazumevani zvuk (%1$s)</string>
+  <string name="ringtone_silent">Ništa</string>
+  <string name="ringtone_unknown">Nepoznati zvuk zvona</string>
+  <string name="activity_not_available">Na ovom uređaju nema aplikacija za to</string>
+  <string name="outgoing_wps_warning">Ako uputite WPS poziv, prekinućete postojeći poziv.</string>
+  <string name="dialog_continue">Nastavi</string>
+  <string name="camera_privacy_text">Omogućena je dozvola za kameru</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-be/strings.xml b/java/com/android/dialer/util/res/values-be/strings.xml
index e75686c..4f29ef9 100644
--- a/java/com/android/dialer/util/res/values-be/strings.xml
+++ b/java/com/android/dialer/util/res/values-be/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="default_notification_description" msgid="4304424287748323094">"Гук па змаўчанні (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
-    <string name="ringtone_silent" msgid="946744257396998305">"Няма"</string>
-    <string name="ringtone_unknown" msgid="1310974715243581582">"Невядомы рынгтон"</string>
-    <string name="activity_not_available" msgid="8360067109103762211">"На прыладзе няма праграмы для гэтага"</string>
-    <string name="outgoing_wps_warning" msgid="7505673114152005234">"Выкананне выкліку WPS прывядзе да раз\'яднання бягучага выкліку."</string>
-    <string name="dialog_continue" msgid="4070630558441163574">"Працягнуць"</string>
-    <string name="camera_privacy_text" msgid="4268584469444688293">"Уключаны дазвол на выкарыстанне камеры"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="default_notification_description">Стандартны гук (%1$s)</string>
+  <string name="ringtone_silent">Няма</string>
+  <string name="ringtone_unknown">Невядомы рынгтон</string>
+  <string name="activity_not_available">На прыладзе няма праграмы для гэтага</string>
+  <string name="outgoing_wps_warning">Выкананне выкліку WPS прывядзе да раз\'яднання бягучага выкліку.</string>
+  <string name="dialog_continue">Працягнуць</string>
+  <string name="camera_privacy_text">Уключаны дазвол на выкарыстанне камеры</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-bg/strings.xml b/java/com/android/dialer/util/res/values-bg/strings.xml
index 177409d..e0b8be1 100644
--- a/java/com/android/dialer/util/res/values-bg/strings.xml
+++ b/java/com/android/dialer/util/res/values-bg/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="default_notification_description" msgid="4304424287748323094">"Стандартен звук (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
-    <string name="ringtone_silent" msgid="946744257396998305">"Без"</string>
-    <string name="ringtone_unknown" msgid="1310974715243581582">"Неизвестна мелодия"</string>
-    <string name="activity_not_available" msgid="8360067109103762211">"На устройството няма приложение за това действие"</string>
-    <string name="outgoing_wps_warning" msgid="7505673114152005234">"Ако извършите обаждане през WPS, текущото ви обаждане ще бъде прекъснато."</string>
-    <string name="dialog_continue" msgid="4070630558441163574">"Напред"</string>
-    <string name="camera_privacy_text" msgid="4268584469444688293">"Активирано бе разрешението за камерата"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="default_notification_description">Стандартен звук (%1$s)</string>
+  <string name="ringtone_silent">Без</string>
+  <string name="ringtone_unknown">Неизвестна мелодия</string>
+  <string name="activity_not_available">На устройството няма приложение за това действие</string>
+  <string name="outgoing_wps_warning">Ако извършите обаждане през WPS, текущото ви обаждане ще бъде прекъснато.</string>
+  <string name="dialog_continue">Напред</string>
+  <string name="camera_privacy_text">Активирано бе разрешението за камерата</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-bn/strings.xml b/java/com/android/dialer/util/res/values-bn/strings.xml
index 7090a74..16c0de5 100644
--- a/java/com/android/dialer/util/res/values-bn/strings.xml
+++ b/java/com/android/dialer/util/res/values-bn/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="default_notification_description" msgid="4304424287748323094">"ডিফল্ট শব্দ (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
-    <string name="ringtone_silent" msgid="946744257396998305">"একবারও না"</string>
-    <string name="ringtone_unknown" msgid="1310974715243581582">"অজানা রিংটোন"</string>
-    <string name="activity_not_available" msgid="8360067109103762211">"এর জন্য এই ডিভাইসে কোনো অ্যাপ্লিকেশান নেই"</string>
-    <string name="outgoing_wps_warning" msgid="7505673114152005234">"একটি WPS কল করা হলে তা আপনার বিদ্যমান কলটি কেটে দেবে৷"</string>
-    <string name="dialog_continue" msgid="4070630558441163574">"চালিয়ে যান"</string>
-    <string name="camera_privacy_text" msgid="4268584469444688293">"ক্যামেরার অনুমতি সক্ষম করা হয়েছে"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="default_notification_description">ডিফল্ট শব্দ (%1$s)</string>
+  <string name="ringtone_silent">একবারও না</string>
+  <string name="ringtone_unknown">অজানা রিংটোন</string>
+  <string name="activity_not_available">এর জন্য এই ডিভাইসে কোনো অ্যাপ্লিকেশান নেই</string>
+  <string name="outgoing_wps_warning">একটি WPS কল করা হলে তা আপনার বিদ্যমান কলটি কেটে দেবে৷</string>
+  <string name="dialog_continue">চালিয়ে যান</string>
+  <string name="camera_privacy_text">ক্যামেরার অনুমতি সক্ষম করা হয়েছে</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-bs/strings.xml b/java/com/android/dialer/util/res/values-bs/strings.xml
index 597203a..029fe9b 100644
--- a/java/com/android/dialer/util/res/values-bs/strings.xml
+++ b/java/com/android/dialer/util/res/values-bs/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="default_notification_description" msgid="4304424287748323094">"Zadani zvuk (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
-    <string name="ringtone_silent" msgid="946744257396998305">"Ništa"</string>
-    <string name="ringtone_unknown" msgid="1310974715243581582">"Nepoznato zvono"</string>
-    <string name="activity_not_available" msgid="8360067109103762211">"Na ovom uređaju nema aplikacije za to"</string>
-    <string name="outgoing_wps_warning" msgid="7505673114152005234">"Upućivanje WPS poziva prekinut će trenutni poziv."</string>
-    <string name="dialog_continue" msgid="4070630558441163574">"Nastavi"</string>
-    <string name="camera_privacy_text" msgid="4268584469444688293">"Dozvola za kameru je omogućena"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="default_notification_description">Zadani zvuk (%1$s)</string>
+  <string name="ringtone_silent">Ništa</string>
+  <string name="ringtone_unknown">Nepoznato zvono</string>
+  <string name="activity_not_available">Na ovom uređaju nema aplikacije za to</string>
+  <string name="outgoing_wps_warning">Upućivanje WPS poziva prekinut će trenutni poziv.</string>
+  <string name="dialog_continue">Nastavi</string>
+  <string name="camera_privacy_text">Odobrenje za kameru je omogućeno</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-ca/strings.xml b/java/com/android/dialer/util/res/values-ca/strings.xml
index 64b219e..faabb4d 100644
--- a/java/com/android/dialer/util/res/values-ca/strings.xml
+++ b/java/com/android/dialer/util/res/values-ca/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="default_notification_description" msgid="4304424287748323094">"So predeterminat (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
-    <string name="ringtone_silent" msgid="946744257396998305">"Cap"</string>
-    <string name="ringtone_unknown" msgid="1310974715243581582">"So de trucada desconegut"</string>
-    <string name="activity_not_available" msgid="8360067109103762211">"No hi ha cap aplicació per a això en aquest dispositiu."</string>
-    <string name="outgoing_wps_warning" msgid="7505673114152005234">"En fer una trucada WPS, es desconnectarà la trucada en curs."</string>
-    <string name="dialog_continue" msgid="4070630558441163574">"Continua"</string>
-    <string name="camera_privacy_text" msgid="4268584469444688293">"S\'ha activat el permís d\'accés a la càmera"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="default_notification_description">So predeterminat (%1$s)</string>
+  <string name="ringtone_silent">Cap</string>
+  <string name="ringtone_unknown">So de trucada desconegut</string>
+  <string name="activity_not_available">No hi ha cap aplicació per a això en aquest dispositiu.</string>
+  <string name="outgoing_wps_warning">En fer una trucada WPS, es desconnectarà la trucada en curs.</string>
+  <string name="dialog_continue">Continua</string>
+  <string name="camera_privacy_text">S\'ha activat el permís d\'accés a la càmera</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-cs/strings.xml b/java/com/android/dialer/util/res/values-cs/strings.xml
index 015d277..26c461b 100644
--- a/java/com/android/dialer/util/res/values-cs/strings.xml
+++ b/java/com/android/dialer/util/res/values-cs/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="default_notification_description" msgid="4304424287748323094">"Výchozí zvuk (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
-    <string name="ringtone_silent" msgid="946744257396998305">"Žádný"</string>
-    <string name="ringtone_unknown" msgid="1310974715243581582">"Neznámý vyzváněcí tón"</string>
-    <string name="activity_not_available" msgid="8360067109103762211">"Pro tuto akci v zařízení nemáte žádnou aplikaci."</string>
-    <string name="outgoing_wps_warning" msgid="7505673114152005234">"Zahájením hovoru WPS odpojíte probíhající hovor."</string>
-    <string name="dialog_continue" msgid="4070630558441163574">"Pokračovat"</string>
-    <string name="camera_privacy_text" msgid="4268584469444688293">"Byl povolen přístup k fotoaparátu"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="default_notification_description">Výchozí zvuk (%1$s)</string>
+  <string name="ringtone_silent">Žádný</string>
+  <string name="ringtone_unknown">Neznámý vyzváněcí tón</string>
+  <string name="activity_not_available">Pro tuto akci v zařízení nemáte žádnou aplikaci.</string>
+  <string name="outgoing_wps_warning">Zahájením hovoru WPS odpojíte probíhající hovor.</string>
+  <string name="dialog_continue">Pokračovat</string>
+  <string name="camera_privacy_text">Byl povolen přístup k fotoaparátu</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-da/strings.xml b/java/com/android/dialer/util/res/values-da/strings.xml
index 9bff5ad..e09f2aa 100644
--- a/java/com/android/dialer/util/res/values-da/strings.xml
+++ b/java/com/android/dialer/util/res/values-da/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="default_notification_description" msgid="4304424287748323094">"Standardlyd (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
-    <string name="ringtone_silent" msgid="946744257396998305">"Ingen"</string>
-    <string name="ringtone_unknown" msgid="1310974715243581582">"Ukendt ringetone"</string>
-    <string name="activity_not_available" msgid="8360067109103762211">"Der findes Ingen app til det på denne enhed"</string>
-    <string name="outgoing_wps_warning" msgid="7505673114152005234">"Hvis du foretager et WPS-opkald, afsluttes dit nuværende opkald."</string>
-    <string name="dialog_continue" msgid="4070630558441163574">"Fortsæt"</string>
-    <string name="camera_privacy_text" msgid="4268584469444688293">"Kameratilladelse er aktiveret"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="default_notification_description">Standardlyd (%1$s)</string>
+  <string name="ringtone_silent">Ingen</string>
+  <string name="ringtone_unknown">Ukendt ringetone</string>
+  <string name="activity_not_available">Der findes Ingen app til det på denne enhed</string>
+  <string name="outgoing_wps_warning">Hvis du foretager et WPS-opkald, afsluttes dit nuværende opkald.</string>
+  <string name="dialog_continue">Fortsæt</string>
+  <string name="camera_privacy_text">Kameratilladelse er aktiveret</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-de/strings.xml b/java/com/android/dialer/util/res/values-de/strings.xml
index 363006e..88ace29 100644
--- a/java/com/android/dialer/util/res/values-de/strings.xml
+++ b/java/com/android/dialer/util/res/values-de/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="default_notification_description" msgid="4304424287748323094">"Standardklingelton (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
-    <string name="ringtone_silent" msgid="946744257396998305">"Ohne"</string>
-    <string name="ringtone_unknown" msgid="1310974715243581582">"Unbekannter Klingelton"</string>
-    <string name="activity_not_available" msgid="8360067109103762211">"Keine entsprechende App auf diesem Gerät"</string>
-    <string name="outgoing_wps_warning" msgid="7505673114152005234">"Wenn du jetzt einen Anruf über WPS tätigst, wird deine bestehende Verbindung getrennt."</string>
-    <string name="dialog_continue" msgid="4070630558441163574">"Weiter"</string>
-    <string name="camera_privacy_text" msgid="4268584469444688293">"Berechtigung für Kamera aktiviert"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="default_notification_description">Standardklingelton (%1$s)</string>
+  <string name="ringtone_silent">Ohne</string>
+  <string name="ringtone_unknown">Unbekannter Klingelton</string>
+  <string name="activity_not_available">Keine entsprechende App auf diesem Gerät</string>
+  <string name="outgoing_wps_warning">Wenn du jetzt einen Anruf über WPS tätigst, wird deine bestehende Verbindung getrennt.</string>
+  <string name="dialog_continue">Weiter</string>
+  <string name="camera_privacy_text">Berechtigung für Kamera aktiviert</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-el/strings.xml b/java/com/android/dialer/util/res/values-el/strings.xml
index d62f181..a51a436 100644
--- a/java/com/android/dialer/util/res/values-el/strings.xml
+++ b/java/com/android/dialer/util/res/values-el/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="default_notification_description" msgid="4304424287748323094">"Προεπιλεγμένος ήχος (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
-    <string name="ringtone_silent" msgid="946744257396998305">"Κανένας"</string>
-    <string name="ringtone_unknown" msgid="1310974715243581582">"Άγνωστος ήχος κλήσης"</string>
-    <string name="activity_not_available" msgid="8360067109103762211">"Δεν υπάρχει εφαρμογή γι\' αυτήν την ενέργεια σε αυτήν τη συσκευή"</string>
-    <string name="outgoing_wps_warning" msgid="7505673114152005234">"Η διενέργεια κλήσης μέσω WPS θα αποσυνδέσει την υφιστάμενη κλήση."</string>
-    <string name="dialog_continue" msgid="4070630558441163574">"Συνέχεια"</string>
-    <string name="camera_privacy_text" msgid="4268584469444688293">"Το δικαίωμα χρήσης της κάμερας έχει ενεργοποιηθεί"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="default_notification_description">Προεπιλεγμένος ήχος (%1$s)</string>
+  <string name="ringtone_silent">Κανένας</string>
+  <string name="ringtone_unknown">Άγνωστος ήχος κλήσης</string>
+  <string name="activity_not_available">Δεν υπάρχει εφαρμογή γι\' αυτήν την ενέργεια σε αυτήν τη συσκευή</string>
+  <string name="outgoing_wps_warning">Η διενέργεια κλήσης μέσω WPS θα αποσυνδέσει την υφιστάμενη κλήση.</string>
+  <string name="dialog_continue">Συνέχεια</string>
+  <string name="camera_privacy_text">Το δικαίωμα χρήσης της κάμερας έχει ενεργοποιηθεί</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-en-rAU/strings.xml b/java/com/android/dialer/util/res/values-en-rAU/strings.xml
index 34ed26a..53f826f 100644
--- a/java/com/android/dialer/util/res/values-en-rAU/strings.xml
+++ b/java/com/android/dialer/util/res/values-en-rAU/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="default_notification_description" msgid="4304424287748323094">"Default sound (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
-    <string name="ringtone_silent" msgid="946744257396998305">"None"</string>
-    <string name="ringtone_unknown" msgid="1310974715243581582">"Unknown ringtone"</string>
-    <string name="activity_not_available" msgid="8360067109103762211">"No app for that on this device"</string>
-    <string name="outgoing_wps_warning" msgid="7505673114152005234">"Placing a WPS call will disconnect your existing call."</string>
-    <string name="dialog_continue" msgid="4070630558441163574">"Continue"</string>
-    <string name="camera_privacy_text" msgid="4268584469444688293">"Camera permission enabled"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="default_notification_description">Default sound (%1$s)</string>
+  <string name="ringtone_silent">None</string>
+  <string name="ringtone_unknown">Unknown ringtone</string>
+  <string name="activity_not_available">No app for that on this device</string>
+  <string name="outgoing_wps_warning">Placing a WPS call will disconnect your existing call.</string>
+  <string name="dialog_continue">Continue</string>
+  <string name="camera_privacy_text">Camera permission enabled</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-en-rGB/strings.xml b/java/com/android/dialer/util/res/values-en-rGB/strings.xml
index 34ed26a..53f826f 100644
--- a/java/com/android/dialer/util/res/values-en-rGB/strings.xml
+++ b/java/com/android/dialer/util/res/values-en-rGB/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="default_notification_description" msgid="4304424287748323094">"Default sound (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
-    <string name="ringtone_silent" msgid="946744257396998305">"None"</string>
-    <string name="ringtone_unknown" msgid="1310974715243581582">"Unknown ringtone"</string>
-    <string name="activity_not_available" msgid="8360067109103762211">"No app for that on this device"</string>
-    <string name="outgoing_wps_warning" msgid="7505673114152005234">"Placing a WPS call will disconnect your existing call."</string>
-    <string name="dialog_continue" msgid="4070630558441163574">"Continue"</string>
-    <string name="camera_privacy_text" msgid="4268584469444688293">"Camera permission enabled"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="default_notification_description">Default sound (%1$s)</string>
+  <string name="ringtone_silent">None</string>
+  <string name="ringtone_unknown">Unknown ringtone</string>
+  <string name="activity_not_available">No app for that on this device</string>
+  <string name="outgoing_wps_warning">Placing a WPS call will disconnect your existing call.</string>
+  <string name="dialog_continue">Continue</string>
+  <string name="camera_privacy_text">Camera permission enabled</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-en-rIN/strings.xml b/java/com/android/dialer/util/res/values-en-rIN/strings.xml
index 34ed26a..53f826f 100644
--- a/java/com/android/dialer/util/res/values-en-rIN/strings.xml
+++ b/java/com/android/dialer/util/res/values-en-rIN/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="default_notification_description" msgid="4304424287748323094">"Default sound (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
-    <string name="ringtone_silent" msgid="946744257396998305">"None"</string>
-    <string name="ringtone_unknown" msgid="1310974715243581582">"Unknown ringtone"</string>
-    <string name="activity_not_available" msgid="8360067109103762211">"No app for that on this device"</string>
-    <string name="outgoing_wps_warning" msgid="7505673114152005234">"Placing a WPS call will disconnect your existing call."</string>
-    <string name="dialog_continue" msgid="4070630558441163574">"Continue"</string>
-    <string name="camera_privacy_text" msgid="4268584469444688293">"Camera permission enabled"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="default_notification_description">Default sound (%1$s)</string>
+  <string name="ringtone_silent">None</string>
+  <string name="ringtone_unknown">Unknown ringtone</string>
+  <string name="activity_not_available">No app for that on this device</string>
+  <string name="outgoing_wps_warning">Placing a WPS call will disconnect your existing call.</string>
+  <string name="dialog_continue">Continue</string>
+  <string name="camera_privacy_text">Camera permission enabled</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-es-rUS/strings.xml b/java/com/android/dialer/util/res/values-es-rUS/strings.xml
index c7941f8..2156a23 100644
--- a/java/com/android/dialer/util/res/values-es-rUS/strings.xml
+++ b/java/com/android/dialer/util/res/values-es-rUS/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="default_notification_description" msgid="4304424287748323094">"Sonido predeterminado (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
-    <string name="ringtone_silent" msgid="946744257396998305">"Ninguno"</string>
-    <string name="ringtone_unknown" msgid="1310974715243581582">"Tono desconocido"</string>
-    <string name="activity_not_available" msgid="8360067109103762211">"No hay una aplicación para esa acción en este dispositivo."</string>
-    <string name="outgoing_wps_warning" msgid="7505673114152005234">"Realizar una llamada de WPS desconectará tu llamada existente."</string>
-    <string name="dialog_continue" msgid="4070630558441163574">"Continuar"</string>
-    <string name="camera_privacy_text" msgid="4268584469444688293">"Se activó el permiso de la cámara"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="default_notification_description">Sonido predeterminado (%1$s)</string>
+  <string name="ringtone_silent">Ninguno</string>
+  <string name="ringtone_unknown">Tono desconocido</string>
+  <string name="activity_not_available">No hay una aplicación para esa acción en este dispositivo.</string>
+  <string name="outgoing_wps_warning">Realizar una llamada de WPS desconectará tu llamada existente.</string>
+  <string name="dialog_continue">Continuar</string>
+  <string name="camera_privacy_text">Se activó el permiso de la cámara</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-es/strings.xml b/java/com/android/dialer/util/res/values-es/strings.xml
index 2246ac2..e5072ef 100644
--- a/java/com/android/dialer/util/res/values-es/strings.xml
+++ b/java/com/android/dialer/util/res/values-es/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="default_notification_description" msgid="4304424287748323094">"Sonido predeterminado (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
-    <string name="ringtone_silent" msgid="946744257396998305">"Nunca"</string>
-    <string name="ringtone_unknown" msgid="1310974715243581582">"Tono desconocido"</string>
-    <string name="activity_not_available" msgid="8360067109103762211">"No hay aplicaciones para esa acción en este dispositivo"</string>
-    <string name="outgoing_wps_warning" msgid="7505673114152005234">"Al hacer una llamada WPS, se finalizará tu llamada actual."</string>
-    <string name="dialog_continue" msgid="4070630558441163574">"Continuar"</string>
-    <string name="camera_privacy_text" msgid="4268584469444688293">"Se ha habilitado el acceso a la cámara"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="default_notification_description">Sonido predeterminado (%1$s)</string>
+  <string name="ringtone_silent">Nunca</string>
+  <string name="ringtone_unknown">Tono desconocido</string>
+  <string name="activity_not_available">No hay aplicaciones para esa acción en este dispositivo</string>
+  <string name="outgoing_wps_warning">Al hacer una llamada WPS, se finalizará tu llamada actual.</string>
+  <string name="dialog_continue">Continuar</string>
+  <string name="camera_privacy_text">Se ha habilitado el acceso a la cámara</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-et/strings.xml b/java/com/android/dialer/util/res/values-et/strings.xml
index 72a25dd..4dc7c53 100644
--- a/java/com/android/dialer/util/res/values-et/strings.xml
+++ b/java/com/android/dialer/util/res/values-et/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="default_notification_description" msgid="4304424287748323094">"Vaikeheli (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
-    <string name="ringtone_silent" msgid="946744257396998305">"Puudub"</string>
-    <string name="ringtone_unknown" msgid="1310974715243581582">"Tundmatu helin"</string>
-    <string name="activity_not_available" msgid="8360067109103762211">"Seadmes pole selleks sobilikku rakendust"</string>
-    <string name="outgoing_wps_warning" msgid="7505673114152005234">"WPS-kõne tegemisel katkestatakse teie praegune kõne."</string>
-    <string name="dialog_continue" msgid="4070630558441163574">"Jätka"</string>
-    <string name="camera_privacy_text" msgid="4268584469444688293">"Kaameraluba on antud"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="default_notification_description">Vaikeheli (%1$s)</string>
+  <string name="ringtone_silent">Puudub</string>
+  <string name="ringtone_unknown">Tundmatu helin</string>
+  <string name="activity_not_available">Seadmes pole selleks sobilikku rakendust</string>
+  <string name="outgoing_wps_warning">WPS-kõne tegemisel katkestatakse teie praegune kõne.</string>
+  <string name="dialog_continue">Jätka</string>
+  <string name="camera_privacy_text">Kaameraluba on antud</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-eu/strings.xml b/java/com/android/dialer/util/res/values-eu/strings.xml
index 395ae2b..125357e 100644
--- a/java/com/android/dialer/util/res/values-eu/strings.xml
+++ b/java/com/android/dialer/util/res/values-eu/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="default_notification_description" msgid="4304424287748323094">"Soinu lehenetsia (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
-    <string name="ringtone_silent" msgid="946744257396998305">"Bat ere ez"</string>
-    <string name="ringtone_unknown" msgid="1310974715243581582">"Tonu ezezaguna"</string>
-    <string name="activity_not_available" msgid="8360067109103762211">"Ez dago hori egin dezakeen aplikaziorik gailu honetan"</string>
-    <string name="outgoing_wps_warning" msgid="7505673114152005234">"WPS dei bat egiten baduzu, eten egingo da uneko deia."</string>
-    <string name="dialog_continue" msgid="4070630558441163574">"Jarraitu"</string>
-    <string name="camera_privacy_text" msgid="4268584469444688293">"Kamera atzitzeko baimena eman da"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="default_notification_description">Soinu lehenetsia (%1$s)</string>
+  <string name="ringtone_silent">Bat ere ez</string>
+  <string name="ringtone_unknown">Tonu ezezaguna</string>
+  <string name="activity_not_available">Ez dago hori egin dezakeen aplikaziorik gailu honetan</string>
+  <string name="outgoing_wps_warning">WPS dei bat egiten baduzu, eten egingo da uneko deia.</string>
+  <string name="dialog_continue">Egin aurrera</string>
+  <string name="camera_privacy_text">Kamera atzitzeko baimena eman da</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-fa/strings.xml b/java/com/android/dialer/util/res/values-fa/strings.xml
index fd9f71f..e30199d 100644
--- a/java/com/android/dialer/util/res/values-fa/strings.xml
+++ b/java/com/android/dialer/util/res/values-fa/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="default_notification_description" msgid="4304424287748323094">"صدای پیش‌فرض (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
-    <string name="ringtone_silent" msgid="946744257396998305">"هیچ‌کدام"</string>
-    <string name="ringtone_unknown" msgid="1310974715243581582">"آهنگ زنگ ناشناس"</string>
-    <string name="activity_not_available" msgid="8360067109103762211">"هیچ برنامه‌ای برای انجام این کار در این دستگاه نصب نیست"</string>
-    <string name="outgoing_wps_warning" msgid="7505673114152005234">"‏اگر تماس WPS برقرار کنید، تماس فعلی‌تان قطع می‌شود."</string>
-    <string name="dialog_continue" msgid="4070630558441163574">"ادامه"</string>
-    <string name="camera_privacy_text" msgid="4268584469444688293">"مجوز دوربین فعال شد"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="default_notification_description">صدای پیش‌فرض (%1$s)</string>
+  <string name="ringtone_silent">هیچ‌کدام</string>
+  <string name="ringtone_unknown">آهنگ زنگ ناشناس</string>
+  <string name="activity_not_available">هیچ برنامه‌ای برای انجام این کار در این دستگاه نصب نیست</string>
+  <string name="outgoing_wps_warning">‏اگر تماس WPS برقرار کنید، تماس فعلی‌تان قطع می‌شود.</string>
+  <string name="dialog_continue">ادامه</string>
+  <string name="camera_privacy_text">مجوز دوربین فعال شد</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-fi/strings.xml b/java/com/android/dialer/util/res/values-fi/strings.xml
index 570eca5..1273bf4 100644
--- a/java/com/android/dialer/util/res/values-fi/strings.xml
+++ b/java/com/android/dialer/util/res/values-fi/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="default_notification_description" msgid="4304424287748323094">"Oletusääni (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
-    <string name="ringtone_silent" msgid="946744257396998305">"Ei mitään"</string>
-    <string name="ringtone_unknown" msgid="1310974715243581582">"Tuntematon soittoääni"</string>
-    <string name="activity_not_available" msgid="8360067109103762211">"Laitteessa ei ole kyseiseen toimintoon tarvittavaa sovellusta"</string>
-    <string name="outgoing_wps_warning" msgid="7505673114152005234">"WPS-puhelun soittaminen katkaisee meneillään olevan puhelun."</string>
-    <string name="dialog_continue" msgid="4070630558441163574">"Jatka"</string>
-    <string name="camera_privacy_text" msgid="4268584469444688293">"Kameran käyttöoikeus myönnettiin."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="default_notification_description">Oletusääni (%1$s)</string>
+  <string name="ringtone_silent">Ei mitään</string>
+  <string name="ringtone_unknown">Tuntematon soittoääni</string>
+  <string name="activity_not_available">Laitteessa ei ole kyseiseen toimintoon tarvittavaa sovellusta</string>
+  <string name="outgoing_wps_warning">WPS-puhelun soittaminen katkaisee meneillään olevan puhelun.</string>
+  <string name="dialog_continue">Jatka</string>
+  <string name="camera_privacy_text">Kameran käyttöoikeus myönnettiin.</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-fr-rCA/strings.xml b/java/com/android/dialer/util/res/values-fr-rCA/strings.xml
index 3fddd51..c3d088f 100644
--- a/java/com/android/dialer/util/res/values-fr-rCA/strings.xml
+++ b/java/com/android/dialer/util/res/values-fr-rCA/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="default_notification_description" msgid="4304424287748323094">"Sonnerie par défaut (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
-    <string name="ringtone_silent" msgid="946744257396998305">"Aucun"</string>
-    <string name="ringtone_unknown" msgid="1310974715243581582">"Sonnerie Inconnue"</string>
-    <string name="activity_not_available" msgid="8360067109103762211">"Cette action ne peut être effectuée par aucune application sur cet appareil."</string>
-    <string name="outgoing_wps_warning" msgid="7505673114152005234">"Si vous faites un appel WPS, vous déconnecterez l\'appel en cours."</string>
-    <string name="dialog_continue" msgid="4070630558441163574">"Continuer"</string>
-    <string name="camera_privacy_text" msgid="4268584469444688293">"Autorisation d\'accès à l\'appareil photo activée"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="default_notification_description">Sonnerie par défaut (%1$s)</string>
+  <string name="ringtone_silent">Aucun</string>
+  <string name="ringtone_unknown">Sonnerie Inconnue</string>
+  <string name="activity_not_available">Cette action ne peut être effectuée par aucune application sur cet appareil.</string>
+  <string name="outgoing_wps_warning">Si vous faites un appel WPS, vous déconnecterez l\'appel en cours.</string>
+  <string name="dialog_continue">Continuer</string>
+  <string name="camera_privacy_text">Autorisation d\'accès à l\'appareil photo activée</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-fr/strings.xml b/java/com/android/dialer/util/res/values-fr/strings.xml
index b8dd372..04f21f4 100644
--- a/java/com/android/dialer/util/res/values-fr/strings.xml
+++ b/java/com/android/dialer/util/res/values-fr/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="default_notification_description" msgid="4304424287748323094">"Sonnerie par défaut (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
-    <string name="ringtone_silent" msgid="946744257396998305">"Aucun"</string>
-    <string name="ringtone_unknown" msgid="1310974715243581582">"Sonnerie inconnue"</string>
-    <string name="activity_not_available" msgid="8360067109103762211">"Cette action ne peut être effectuée via aucune application sur cet appareil."</string>
-    <string name="outgoing_wps_warning" msgid="7505673114152005234">"L\'émission d\'un appel WPS mettra fin à l\'appel en cours."</string>
-    <string name="dialog_continue" msgid="4070630558441163574">"Continuer"</string>
-    <string name="camera_privacy_text" msgid="4268584469444688293">"Autorisation d\'accès à l\'appareil photo accordée"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="default_notification_description">Sonnerie par défaut (%1$s)</string>
+  <string name="ringtone_silent">Aucun</string>
+  <string name="ringtone_unknown">Sonnerie inconnue</string>
+  <string name="activity_not_available">Cette action ne peut être effectuée via aucune application sur cet appareil.</string>
+  <string name="outgoing_wps_warning">L\'émission d\'un appel WPS mettra fin à l\'appel en cours.</string>
+  <string name="dialog_continue">Continuer</string>
+  <string name="camera_privacy_text">Autorisation d\'accès à l\'appareil photo accordée</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-gl/strings.xml b/java/com/android/dialer/util/res/values-gl/strings.xml
index 7e7dfea..d980d77 100644
--- a/java/com/android/dialer/util/res/values-gl/strings.xml
+++ b/java/com/android/dialer/util/res/values-gl/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="default_notification_description" msgid="4304424287748323094">"Son predeterminado (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
-    <string name="ringtone_silent" msgid="946744257396998305">"Ningún"</string>
-    <string name="ringtone_unknown" msgid="1310974715243581582">"Ton de chamada descoñecido"</string>
-    <string name="activity_not_available" msgid="8360067109103762211">"Non hai ningunha aplicación para esa acción neste dispositivo"</string>
-    <string name="outgoing_wps_warning" msgid="7505673114152005234">"Se realizas unha chamada WPS, desconectarase a túa chamada actual."</string>
-    <string name="dialog_continue" msgid="4070630558441163574">"Continuar"</string>
-    <string name="camera_privacy_text" msgid="4268584469444688293">"Activouse o permiso de acceso á cámara"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="default_notification_description">Son predeterminado (%1$s)</string>
+  <string name="ringtone_silent">Ningún</string>
+  <string name="ringtone_unknown">Ton de chamada descoñecido</string>
+  <string name="activity_not_available">Non hai ningunha aplicación para esa acción neste dispositivo</string>
+  <string name="outgoing_wps_warning">Se realizas unha chamada WPS, desconectarase a túa chamada actual.</string>
+  <string name="dialog_continue">Continuar</string>
+  <string name="camera_privacy_text">Activouse o permiso de acceso á cámara</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-gu/strings.xml b/java/com/android/dialer/util/res/values-gu/strings.xml
index 38e7882..cbeee0d 100644
--- a/java/com/android/dialer/util/res/values-gu/strings.xml
+++ b/java/com/android/dialer/util/res/values-gu/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="default_notification_description" msgid="4304424287748323094">"ડિફોલ્ટ ધ્વનિ (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
-    <string name="ringtone_silent" msgid="946744257396998305">"કોઈ નહીં"</string>
-    <string name="ringtone_unknown" msgid="1310974715243581582">"અજાણ રિંગટોન"</string>
-    <string name="activity_not_available" msgid="8360067109103762211">"આ ઉપકરણ પર તે માટે કોઈ ઍપ્લિકેશન નથી"</string>
-    <string name="outgoing_wps_warning" msgid="7505673114152005234">"WPS કૉલ કરવાનું તમારા અસ્તિત્વમાંના કૉલને ડિસ્કનેક્ટ કરશે."</string>
-    <string name="dialog_continue" msgid="4070630558441163574">"ચાલુ રાખો"</string>
-    <string name="camera_privacy_text" msgid="4268584469444688293">"કૅમેરાની પરવાનગી સક્ષમ કરી"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="default_notification_description">ડિફોલ્ટ ધ્વનિ (%1$s)</string>
+  <string name="ringtone_silent">કોઈ નહીં</string>
+  <string name="ringtone_unknown">અજાણ રિંગટોન</string>
+  <string name="activity_not_available">આ ઉપકરણ પર તે માટે કોઈ ઍપ્લિકેશન નથી</string>
+  <string name="outgoing_wps_warning">WPS કૉલ કરવાનું તમારા અસ્તિત્વમાંના કૉલને ડિસ્કનેક્ટ કરશે.</string>
+  <string name="dialog_continue">ચાલુ રાખો</string>
+  <string name="camera_privacy_text">કૅમેરાની પરવાનગી સક્ષમ કરી</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-hi/strings.xml b/java/com/android/dialer/util/res/values-hi/strings.xml
index 5b778d8..dc5be96 100644
--- a/java/com/android/dialer/util/res/values-hi/strings.xml
+++ b/java/com/android/dialer/util/res/values-hi/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="default_notification_description" msgid="4304424287748323094">"डिफ़ॉल्ट ध्वनि (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
-    <string name="ringtone_silent" msgid="946744257396998305">"कोई नहीं"</string>
-    <string name="ringtone_unknown" msgid="1310974715243581582">"अज्ञात रिंगटोन"</string>
-    <string name="activity_not_available" msgid="8360067109103762211">"उसके लिए इस डिवाइस पर कोई एेप नहीं है"</string>
-    <string name="outgoing_wps_warning" msgid="7505673114152005234">"WPS कॉल करने से आपका मौजूदा कॉल डिसकनेक्ट हो जाएगा."</string>
-    <string name="dialog_continue" msgid="4070630558441163574">"जारी रखें"</string>
-    <string name="camera_privacy_text" msgid="4268584469444688293">"कैमरे की अनुमति सक्षम की गई"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="default_notification_description">डिफ़ॉल्ट ध्वनि (%1$s)</string>
+  <string name="ringtone_silent">कोई नहीं</string>
+  <string name="ringtone_unknown">अज्ञात रिंगटोन</string>
+  <string name="activity_not_available">उसके लिए इस डिवाइस पर कोई एेप नहीं है</string>
+  <string name="outgoing_wps_warning">WPS कॉल करने से आपका मौजूदा कॉल डिसकनेक्ट हो जाएगा.</string>
+  <string name="dialog_continue">जारी रखें</string>
+  <string name="camera_privacy_text">कैमरे की अनुमति सक्षम की गई</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-hr/strings.xml b/java/com/android/dialer/util/res/values-hr/strings.xml
index b8858cb..44a596a 100644
--- a/java/com/android/dialer/util/res/values-hr/strings.xml
+++ b/java/com/android/dialer/util/res/values-hr/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="default_notification_description" msgid="4304424287748323094">"Zadani zvuk (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
-    <string name="ringtone_silent" msgid="946744257396998305">"Ništa"</string>
-    <string name="ringtone_unknown" msgid="1310974715243581582">"Nepoznata melodija zvona"</string>
-    <string name="activity_not_available" msgid="8360067109103762211">"Na ovom uređaju nema aplikacije za to"</string>
-    <string name="outgoing_wps_warning" msgid="7505673114152005234">"Uspostavljanje WPS poziva prekinut će postojeći poziv."</string>
-    <string name="dialog_continue" msgid="4070630558441163574">"Nastavi"</string>
-    <string name="camera_privacy_text" msgid="4268584469444688293">"Omogućen je pristup kameri"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="default_notification_description">Zadani zvuk (%1$s)</string>
+  <string name="ringtone_silent">Ništa</string>
+  <string name="ringtone_unknown">Nepoznata melodija zvona</string>
+  <string name="activity_not_available">Na ovom uređaju nema aplikacije za to</string>
+  <string name="outgoing_wps_warning">Uspostavljanje WPS poziva prekinut će postojeći poziv.</string>
+  <string name="dialog_continue">Nastavi</string>
+  <string name="camera_privacy_text">Omogućen je pristup kameri</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-hu/strings.xml b/java/com/android/dialer/util/res/values-hu/strings.xml
index fc5ef92..0594bf1 100644
--- a/java/com/android/dialer/util/res/values-hu/strings.xml
+++ b/java/com/android/dialer/util/res/values-hu/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="default_notification_description" msgid="4304424287748323094">"Alapértelmezett hang (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
-    <string name="ringtone_silent" msgid="946744257396998305">"Nincs"</string>
-    <string name="ringtone_unknown" msgid="1310974715243581582">"Ismeretlen csengőhang"</string>
-    <string name="activity_not_available" msgid="8360067109103762211">"Nincs megfelelő alkalmazás a művelethez ezen az eszközön"</string>
-    <string name="outgoing_wps_warning" msgid="7505673114152005234">"WPS-hívás indításával megszakítja a folyamatban lévő hívást."</string>
-    <string name="dialog_continue" msgid="4070630558441163574">"Folytatás"</string>
-    <string name="camera_privacy_text" msgid="4268584469444688293">"Kameraengedély megadva"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="default_notification_description">Alapértelmezett hang (%1$s)</string>
+  <string name="ringtone_silent">Nincs</string>
+  <string name="ringtone_unknown">Ismeretlen csengőhang</string>
+  <string name="activity_not_available">Nincs megfelelő alkalmazás a művelethez ezen az eszközön</string>
+  <string name="outgoing_wps_warning">WPS-hívás indításával megszakítja a folyamatban lévő hívást.</string>
+  <string name="dialog_continue">Folytatás</string>
+  <string name="camera_privacy_text">Kameraengedély megadva</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-hy/strings.xml b/java/com/android/dialer/util/res/values-hy/strings.xml
index dd6b132..7c9e4af 100644
--- a/java/com/android/dialer/util/res/values-hy/strings.xml
+++ b/java/com/android/dialer/util/res/values-hy/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="default_notification_description" msgid="4304424287748323094">"Լռելյայն ձայներանգը (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
-    <string name="ringtone_silent" msgid="946744257396998305">"Ոչ մեկը"</string>
-    <string name="ringtone_unknown" msgid="1310974715243581582">"Անհայտ զանգերանգ"</string>
-    <string name="activity_not_available" msgid="8360067109103762211">"Սարքի վրա համապատասխան հավելված չկա"</string>
-    <string name="outgoing_wps_warning" msgid="7505673114152005234">"Եթե WPS-ի միջոցով զանգ կատարեք, ձեր ընթացիկ զանգը կընդհատվի:"</string>
-    <string name="dialog_continue" msgid="4070630558441163574">"Շարունակել"</string>
-    <string name="camera_privacy_text" msgid="4268584469444688293">"Տեսախցիկից օգտվելու թույլտվությունը տրամադրված է"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="default_notification_description">Լռելյայն ձայներանգը (%1$s)</string>
+  <string name="ringtone_silent">Ոչ մեկը</string>
+  <string name="ringtone_unknown">Անհայտ զանգերանգ</string>
+  <string name="activity_not_available">Սարքի վրա համապատասխան հավելված չկա</string>
+  <string name="outgoing_wps_warning">Եթե WPS-ի միջոցով զանգ կատարեք, ձեր ընթացիկ զանգը կընդհատվի:</string>
+  <string name="dialog_continue">Շարունակել</string>
+  <string name="camera_privacy_text">Տեսախցիկից օգտվելու թույլտվությունը տրամադրված է</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-in/strings.xml b/java/com/android/dialer/util/res/values-in/strings.xml
index 6732ffb..9123d64 100644
--- a/java/com/android/dialer/util/res/values-in/strings.xml
+++ b/java/com/android/dialer/util/res/values-in/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="default_notification_description" msgid="4304424287748323094">"Suara default (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
-    <string name="ringtone_silent" msgid="946744257396998305">"Tidak ada"</string>
-    <string name="ringtone_unknown" msgid="1310974715243581582">"Nada dering tidak dikenal"</string>
-    <string name="activity_not_available" msgid="8360067109103762211">"Tidak ada aplikasi untuk tindakan tersebut di perangkat ini"</string>
-    <string name="outgoing_wps_warning" msgid="7505673114152005234">"Melakukan panggilan WPS akan mengakhiri panggilan yang ada."</string>
-    <string name="dialog_continue" msgid="4070630558441163574">"Lanjutkan"</string>
-    <string name="camera_privacy_text" msgid="4268584469444688293">"Izin kamera diaktifkan"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="default_notification_description">Suara default (%1$s)</string>
+  <string name="ringtone_silent">Tidak ada</string>
+  <string name="ringtone_unknown">Nada dering tidak dikenal</string>
+  <string name="activity_not_available">Tidak ada aplikasi untuk tindakan tersebut di perangkat ini</string>
+  <string name="outgoing_wps_warning">Melakukan panggilan WPS akan mengakhiri panggilan yang ada.</string>
+  <string name="dialog_continue">Lanjutkan</string>
+  <string name="camera_privacy_text">Izin kamera diaktifkan</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-is/strings.xml b/java/com/android/dialer/util/res/values-is/strings.xml
index 15f9c6a..1586593 100644
--- a/java/com/android/dialer/util/res/values-is/strings.xml
+++ b/java/com/android/dialer/util/res/values-is/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="default_notification_description" msgid="4304424287748323094">"Sjálfgefið hljóð (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
-    <string name="ringtone_silent" msgid="946744257396998305">"Engin"</string>
-    <string name="ringtone_unknown" msgid="1310974715243581582">"Óþekktur hringitónn"</string>
-    <string name="activity_not_available" msgid="8360067109103762211">"Ekkert forrit fyrir þetta er í tækinu"</string>
-    <string name="outgoing_wps_warning" msgid="7505673114152005234">"Ef þú hringir WPS-símtal slitnar núverandi símtal."</string>
-    <string name="dialog_continue" msgid="4070630558441163574">"Áfram"</string>
-    <string name="camera_privacy_text" msgid="4268584469444688293">"Myndavélarheimild virk"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="default_notification_description">Sjálfgefið hljóð (%1$s)</string>
+  <string name="ringtone_silent">Engin</string>
+  <string name="ringtone_unknown">Óþekktur hringitónn</string>
+  <string name="activity_not_available">Ekkert forrit fyrir þetta er í tækinu</string>
+  <string name="outgoing_wps_warning">Ef þú hringir WPS-símtal slitnar núverandi símtal.</string>
+  <string name="dialog_continue">Áfram</string>
+  <string name="camera_privacy_text">Myndavélarheimild virk</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-it/strings.xml b/java/com/android/dialer/util/res/values-it/strings.xml
index 9288628..4fd8164 100644
--- a/java/com/android/dialer/util/res/values-it/strings.xml
+++ b/java/com/android/dialer/util/res/values-it/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="default_notification_description" msgid="4304424287748323094">"Suono predefinito (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
-    <string name="ringtone_silent" msgid="946744257396998305">"Nessuno"</string>
-    <string name="ringtone_unknown" msgid="1310974715243581582">"Suoneria sconosciuta"</string>
-    <string name="activity_not_available" msgid="8360067109103762211">"Sul dispositivo non sono presenti app per tale azione"</string>
-    <string name="outgoing_wps_warning" msgid="7505673114152005234">"Se effettui una chiamata WPS, la chiamata esistente verrà disconnessa."</string>
-    <string name="dialog_continue" msgid="4070630558441163574">"Continua"</string>
-    <string name="camera_privacy_text" msgid="4268584469444688293">"Autorizzazioni della fotocamera attivate"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="default_notification_description">Suono predefinito (%1$s)</string>
+  <string name="ringtone_silent">Nessuno</string>
+  <string name="ringtone_unknown">Suoneria sconosciuta</string>
+  <string name="activity_not_available">Sul dispositivo non sono presenti app per tale azione</string>
+  <string name="outgoing_wps_warning">Se effettui una chiamata WPS, la chiamata esistente verrà disconnessa.</string>
+  <string name="dialog_continue">Continua</string>
+  <string name="camera_privacy_text">Autorizzazioni della fotocamera attivate</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-iw/strings.xml b/java/com/android/dialer/util/res/values-iw/strings.xml
index 362ed53..8d0f553 100644
--- a/java/com/android/dialer/util/res/values-iw/strings.xml
+++ b/java/com/android/dialer/util/res/values-iw/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="default_notification_description" msgid="4304424287748323094">"צליל ברירת מחדל (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
-    <string name="ringtone_silent" msgid="946744257396998305">"ללא"</string>
-    <string name="ringtone_unknown" msgid="1310974715243581582">"רינגטון לא ידוע"</string>
-    <string name="activity_not_available" msgid="8360067109103762211">"אין אפליקציה עבור הפעולה הזו במכשיר הזה"</string>
-    <string name="outgoing_wps_warning" msgid="7505673114152005234">"התקשרות באמצעות השירות האלחוטי המועדף תנתק את השיחה הנוכחית."</string>
-    <string name="dialog_continue" msgid="4070630558441163574">"המשך"</string>
-    <string name="camera_privacy_text" msgid="4268584469444688293">"הרשאת הגישה למצלמה הופעלה"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="default_notification_description">צליל ברירת מחדל (%1$s)</string>
+  <string name="ringtone_silent">ללא</string>
+  <string name="ringtone_unknown">רינגטון לא ידוע</string>
+  <string name="activity_not_available">אין אפליקציה עבור הפעולה הזו במכשיר הזה</string>
+  <string name="outgoing_wps_warning">התקשרות באמצעות השירות האלחוטי המועדף תנתק את השיחה הנוכחית.</string>
+  <string name="dialog_continue">המשך</string>
+  <string name="camera_privacy_text">הרשאת הגישה למצלמה הופעלה</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-ja/strings.xml b/java/com/android/dialer/util/res/values-ja/strings.xml
index 533caad..ff55bd1 100644
--- a/java/com/android/dialer/util/res/values-ja/strings.xml
+++ b/java/com/android/dialer/util/res/values-ja/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="default_notification_description" msgid="4304424287748323094">"デフォルトの通知音（<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>）"</string>
-    <string name="ringtone_silent" msgid="946744257396998305">"使用しない"</string>
-    <string name="ringtone_unknown" msgid="1310974715243581582">"不明な着信音"</string>
-    <string name="activity_not_available" msgid="8360067109103762211">"この操作を行うアプリが端末上にありません"</string>
-    <string name="outgoing_wps_warning" msgid="7505673114152005234">"WPS で通話を発信すると現在の通話が切断されます。"</string>
-    <string name="dialog_continue" msgid="4070630558441163574">"次へ"</string>
-    <string name="camera_privacy_text" msgid="4268584469444688293">"カメラへのアクセスを自動で許可しました"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="default_notification_description">デフォルトの通知音（%1$s）</string>
+  <string name="ringtone_silent">使用しない</string>
+  <string name="ringtone_unknown">不明な着信音</string>
+  <string name="activity_not_available">この操作を行うアプリが端末上にありません</string>
+  <string name="outgoing_wps_warning">WPS で通話を発信すると現在の通話が切断されます。</string>
+  <string name="dialog_continue">次へ</string>
+  <string name="camera_privacy_text">カメラへのアクセスを自動で許可しました</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-ka/strings.xml b/java/com/android/dialer/util/res/values-ka/strings.xml
index baea1c1..c683456 100644
--- a/java/com/android/dialer/util/res/values-ka/strings.xml
+++ b/java/com/android/dialer/util/res/values-ka/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="default_notification_description" msgid="4304424287748323094">"ნაგულისხმები ხმა (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
-    <string name="ringtone_silent" msgid="946744257396998305">"არცერთი"</string>
-    <string name="ringtone_unknown" msgid="1310974715243581582">"უცნობი ზარი"</string>
-    <string name="activity_not_available" msgid="8360067109103762211">"ამ მოწყობილობაზე არ არის შესაბამისი აპლიკაცია"</string>
-    <string name="outgoing_wps_warning" msgid="7505673114152005234">"WPS ზარის განხორციელება თქვენს მიმდინარე ზარს გათიშავს."</string>
-    <string name="dialog_continue" msgid="4070630558441163574">"გაგრძელება"</string>
-    <string name="camera_privacy_text" msgid="4268584469444688293">"კამერაზე წვდომის ნებართვა ჩართულია"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="default_notification_description">ნაგულისხმები ხმა (%1$s)</string>
+  <string name="ringtone_silent">არცერთი</string>
+  <string name="ringtone_unknown">უცნობი ზარი</string>
+  <string name="activity_not_available">ამ მოწყობილობაზე არ არის შესაბამისი აპლიკაცია</string>
+  <string name="outgoing_wps_warning">WPS ზარის განხორციელება თქვენს მიმდინარე ზარს გათიშავს.</string>
+  <string name="dialog_continue">გაგრძელება</string>
+  <string name="camera_privacy_text">კამერაზე წვდომის ნებართვა ჩართულია</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-kk/strings.xml b/java/com/android/dialer/util/res/values-kk/strings.xml
index e1abe60..c376ea6 100644
--- a/java/com/android/dialer/util/res/values-kk/strings.xml
+++ b/java/com/android/dialer/util/res/values-kk/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="default_notification_description" msgid="4304424287748323094">"Бастапқы бойынша дыбыс (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
-    <string name="ringtone_silent" msgid="946744257396998305">"Ешқандай"</string>
-    <string name="ringtone_unknown" msgid="1310974715243581582">"Белгісіз қоңырау әуені"</string>
-    <string name="activity_not_available" msgid="8360067109103762211">"Бұл үшін осы құрылғыда қолданба жоқ"</string>
-    <string name="outgoing_wps_warning" msgid="7505673114152005234">"WPS қоңырауын шалу қазіргі қоңырауды тоқтатады."</string>
-    <string name="dialog_continue" msgid="4070630558441163574">"Жалғастыру"</string>
-    <string name="camera_privacy_text" msgid="4268584469444688293">"Камера рұқсаты қосылды"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="default_notification_description">Бастапқы бойынша дыбыс (%1$s)</string>
+  <string name="ringtone_silent">Ешқандай</string>
+  <string name="ringtone_unknown">Белгісіз қоңырау әуені</string>
+  <string name="activity_not_available">Бұл үшін осы құрылғыда қолданба жоқ</string>
+  <string name="outgoing_wps_warning">WPS қоңырауын шалу қазіргі қоңырауды тоқтатады.</string>
+  <string name="dialog_continue">Жалғастыру</string>
+  <string name="camera_privacy_text">Камера рұқсаты қосылды</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-km/strings.xml b/java/com/android/dialer/util/res/values-km/strings.xml
index dd8c260..eaeabd4 100644
--- a/java/com/android/dialer/util/res/values-km/strings.xml
+++ b/java/com/android/dialer/util/res/values-km/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="default_notification_description" msgid="4304424287748323094">"សំឡេង​លំនាំដើម (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
-    <string name="ringtone_silent" msgid="946744257396998305">"គ្មាន"</string>
-    <string name="ringtone_unknown" msgid="1310974715243581582">"សំឡេង​រោទ៍​មិន​ស្គាល់"</string>
-    <string name="activity_not_available" msgid="8360067109103762211">"មិនមានកម្មវិធីសម្រាប់សកម្មភាពនេះនៅលើឧបករណ៍នេះទេ"</string>
-    <string name="outgoing_wps_warning" msgid="7505673114152005234">"ការ​ហៅ​ចេញ​​ដោយ​ប្រើ​សេវា WPS នឹង​ផ្ដាច់​ការ​ហៅ​ដែល​មាន​​របស់​អ្នក។"</string>
-    <string name="dialog_continue" msgid="4070630558441163574">"បន្ត"</string>
-    <string name="camera_privacy_text" msgid="4268584469444688293">"បានបើក​ការអនុញ្ញាត​កាមេរ៉ា"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="default_notification_description">សំឡេង​លំនាំដើម (%1$s)</string>
+  <string name="ringtone_silent">គ្មាន</string>
+  <string name="ringtone_unknown">សំឡេង​រោទ៍​មិន​ស្គាល់</string>
+  <string name="activity_not_available">មិនមានកម្មវិធីសម្រាប់សកម្មភាពនេះនៅលើឧបករណ៍នេះទេ</string>
+  <string name="outgoing_wps_warning">ការ​ហៅ​ចេញ​​ដោយ​ប្រើ​សេវា WPS នឹង​ផ្ដាច់​ការ​ហៅ​ដែល​មាន​​របស់​អ្នក។</string>
+  <string name="dialog_continue">បន្ត</string>
+  <string name="camera_privacy_text">បានបើក​ការអនុញ្ញាត​កាមេរ៉ា</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-kn/strings.xml b/java/com/android/dialer/util/res/values-kn/strings.xml
index 833f696..41e0952 100644
--- a/java/com/android/dialer/util/res/values-kn/strings.xml
+++ b/java/com/android/dialer/util/res/values-kn/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="default_notification_description" msgid="4304424287748323094">"ಡಿಫಾಲ್ಟ್‌ ಧ್ವನಿ (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
-    <string name="ringtone_silent" msgid="946744257396998305">"ಯಾವುದೂ ಇಲ್ಲ"</string>
-    <string name="ringtone_unknown" msgid="1310974715243581582">"ಅಪರಿಚಿತ ರಿಂಗ್‌ಟೋನ್"</string>
-    <string name="activity_not_available" msgid="8360067109103762211">"ಈ ಸಾಧನದಲ್ಲಿ ಅದಕ್ಕಾಗಿ ಯಾವುದೇ ಅಪ್ಲಿಕೇಶನ್‌ಗಳಿಲ್ಲ"</string>
-    <string name="outgoing_wps_warning" msgid="7505673114152005234">"WPS ಕರೆ ಅನ್ನು ಮಾಡುವುದರಿಂದ ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ ನಿಮ್ಮ ಕರೆ ಕಡಿತಗೊಳ್ಳುತ್ತದೆ."</string>
-    <string name="dialog_continue" msgid="4070630558441163574">"ಮುಂದುವರಿಸಿ"</string>
-    <string name="camera_privacy_text" msgid="4268584469444688293">"ಕ್ಯಾಮರಾ ಅನುಮತಿಯನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="default_notification_description">ಡಿಫಾಲ್ಟ್‌ ಧ್ವನಿ (%1$s)</string>
+  <string name="ringtone_silent">ಯಾವುದೂ ಇಲ್ಲ</string>
+  <string name="ringtone_unknown">ಅಪರಿಚಿತ ರಿಂಗ್‌ಟೋನ್</string>
+  <string name="activity_not_available">ಈ ಸಾಧನದಲ್ಲಿ ಅದಕ್ಕಾಗಿ ಯಾವುದೇ ಅಪ್ಲಿಕೇಶನ್‌ಗಳಿಲ್ಲ</string>
+  <string name="outgoing_wps_warning">WPS ಕರೆ ಅನ್ನು ಮಾಡುವುದರಿಂದ ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ ನಿಮ್ಮ ಕರೆ ಕಡಿತಗೊಳ್ಳುತ್ತದೆ.</string>
+  <string name="dialog_continue">ಮುಂದುವರಿಸಿ</string>
+  <string name="camera_privacy_text">ಕ್ಯಾಮರಾ ಅನುಮತಿಯನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-ko/strings.xml b/java/com/android/dialer/util/res/values-ko/strings.xml
index 0e08dd3..14f50cb 100644
--- a/java/com/android/dialer/util/res/values-ko/strings.xml
+++ b/java/com/android/dialer/util/res/values-ko/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="default_notification_description" msgid="4304424287748323094">"기본 알림음(<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
-    <string name="ringtone_silent" msgid="946744257396998305">"선택 안함"</string>
-    <string name="ringtone_unknown" msgid="1310974715243581582">"알 수 없는 벨소리"</string>
-    <string name="activity_not_available" msgid="8360067109103762211">"이 기기에 작업을 처리할 수 있는 앱이 없습니다."</string>
-    <string name="outgoing_wps_warning" msgid="7505673114152005234">"WPS 전화를 걸면 기존 전화 연결이 해제됩니다."</string>
-    <string name="dialog_continue" msgid="4070630558441163574">"계속"</string>
-    <string name="camera_privacy_text" msgid="4268584469444688293">"카메라 권한 사용 설정됨"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="default_notification_description">기본 알림음(%1$s)</string>
+  <string name="ringtone_silent">선택 안함</string>
+  <string name="ringtone_unknown">알 수 없는 벨소리</string>
+  <string name="activity_not_available">이 기기에 작업을 처리할 수 있는 앱이 없습니다.</string>
+  <string name="outgoing_wps_warning">WPS 전화를 걸면 기존 전화 연결이 해제됩니다.</string>
+  <string name="dialog_continue">계속</string>
+  <string name="camera_privacy_text">카메라 권한 사용 설정됨</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-ky/strings.xml b/java/com/android/dialer/util/res/values-ky/strings.xml
index 98090eb..a064e73 100644
--- a/java/com/android/dialer/util/res/values-ky/strings.xml
+++ b/java/com/android/dialer/util/res/values-ky/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="default_notification_description" msgid="4304424287748323094">"Абалкы үнү (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
-    <string name="ringtone_silent" msgid="946744257396998305">"Эч нерсе жок"</string>
-    <string name="ringtone_unknown" msgid="1310974715243581582">"Белгисиз рингтон"</string>
-    <string name="activity_not_available" msgid="8360067109103762211">"Бул түзмөктө ал үчүн колдонмо жок"</string>
-    <string name="outgoing_wps_warning" msgid="7505673114152005234">"Азыр WPS аркылуу чалсаңыз, учурдагы чалуу үзүлүп калат."</string>
-    <string name="dialog_continue" msgid="4070630558441163574">"Улантуу"</string>
-    <string name="camera_privacy_text" msgid="4268584469444688293">"Камеранын уруксаты иштетилди"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="default_notification_description">Абалкы үнү (%1$s)</string>
+  <string name="ringtone_silent">Эч нерсе жок</string>
+  <string name="ringtone_unknown">Белгисиз рингтон</string>
+  <string name="activity_not_available">Бул түзмөктө ал үчүн колдонмо жок</string>
+  <string name="outgoing_wps_warning">Азыр WPS аркылуу чалсаңыз, учурдагы чалуу үзүлүп калат.</string>
+  <string name="dialog_continue">Улантуу</string>
+  <string name="camera_privacy_text">Камеранын уруксаты иштетилди</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-lo/strings.xml b/java/com/android/dialer/util/res/values-lo/strings.xml
index b0bbb90..54dc240 100644
--- a/java/com/android/dialer/util/res/values-lo/strings.xml
+++ b/java/com/android/dialer/util/res/values-lo/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="default_notification_description" msgid="4304424287748323094">"ສຽງເລີ່ມຕົ້ນ (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
-    <string name="ringtone_silent" msgid="946744257396998305">"ບໍ່ມີ"</string>
-    <string name="ringtone_unknown" msgid="1310974715243581582">"ສຽງ​ໂທ​ເຂົ້າ​ບໍ່​ຮູ້​ຈັກ"</string>
-    <string name="activity_not_available" msgid="8360067109103762211">"ບໍ່​ມີ​ແອັ​ບຯ​ສຳ​ລັບ​ສິ່ງນັ້ນ​ຢູ່​ໃນ​ອຸ​ປະ​ກອນ​ນີ້"</string>
-    <string name="outgoing_wps_warning" msgid="7505673114152005234">"ການໂທ WPS ຈະຕັດສາຍທີ່ມີຢູ່ແລ້ວຂອງທ່ານ."</string>
-    <string name="dialog_continue" msgid="4070630558441163574">"ດຳເນີນການຕໍ່"</string>
-    <string name="camera_privacy_text" msgid="4268584469444688293">"ເປີດໃຊ້ສິດອະນຸຍາດກ້ອງຖ່າຍຮູບແລ້ວ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="default_notification_description">ສຽງເລີ່ມຕົ້ນ (%1$s)</string>
+  <string name="ringtone_silent">ບໍ່ມີ</string>
+  <string name="ringtone_unknown">ສຽງ​ໂທ​ເຂົ້າ​ບໍ່​ຮູ້​ຈັກ</string>
+  <string name="activity_not_available">ບໍ່​ມີ​ແອັ​ບຯ​ສຳ​ລັບ​ສິ່ງນັ້ນ​ຢູ່​ໃນ​ອຸ​ປະ​ກອນ​ນີ້</string>
+  <string name="outgoing_wps_warning">ການໂທ WPS ຈະຕັດສາຍທີ່ມີຢູ່ແລ້ວຂອງທ່ານ.</string>
+  <string name="dialog_continue">ດຳເນີນການຕໍ່</string>
+  <string name="camera_privacy_text">ເປີດໃຊ້ສິດອະນຸຍາດກ້ອງຖ່າຍຮູບແລ້ວ</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-lt/strings.xml b/java/com/android/dialer/util/res/values-lt/strings.xml
index ab4443a..c002bbd 100644
--- a/java/com/android/dialer/util/res/values-lt/strings.xml
+++ b/java/com/android/dialer/util/res/values-lt/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="default_notification_description" msgid="4304424287748323094">"Numatytasis garsas (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
-    <string name="ringtone_silent" msgid="946744257396998305">"Nėra"</string>
-    <string name="ringtone_unknown" msgid="1310974715243581582">"Nežinomas skambėjimo tonas"</string>
-    <string name="activity_not_available" msgid="8360067109103762211">"Šiame įrenginyje nėra tam skirtos programos"</string>
-    <string name="outgoing_wps_warning" msgid="7505673114152005234">"Pradėjus WPS skambutį bus atjungtas dabartinis skambutis."</string>
-    <string name="dialog_continue" msgid="4070630558441163574">"Tęsti"</string>
-    <string name="camera_privacy_text" msgid="4268584469444688293">"Fotoaparato leidimas įgalintas"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="default_notification_description">Numatytasis garsas (%1$s)</string>
+  <string name="ringtone_silent">Nėra</string>
+  <string name="ringtone_unknown">Nežinomas skambėjimo tonas</string>
+  <string name="activity_not_available">Šiame įrenginyje nėra tam skirtos programos</string>
+  <string name="outgoing_wps_warning">Pradėjus WPS skambutį bus atjungtas dabartinis skambutis.</string>
+  <string name="dialog_continue">Tęsti</string>
+  <string name="camera_privacy_text">Fotoaparato leidimas įgalintas</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-lv/strings.xml b/java/com/android/dialer/util/res/values-lv/strings.xml
index 3df9cf0..273398c 100644
--- a/java/com/android/dialer/util/res/values-lv/strings.xml
+++ b/java/com/android/dialer/util/res/values-lv/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="default_notification_description" msgid="4304424287748323094">"Noklusējuma signāls (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
-    <string name="ringtone_silent" msgid="946744257396998305">"Nav"</string>
-    <string name="ringtone_unknown" msgid="1310974715243581582">"Nezināms zvana signāls"</string>
-    <string name="activity_not_available" msgid="8360067109103762211">"Šajā ierīcē nav nevienas šai darbībai piemērotas lietotnes."</string>
-    <string name="outgoing_wps_warning" msgid="7505673114152005234">"Veicot WPS zvanu, tiks pārtraukts esošais zvans."</string>
-    <string name="dialog_continue" msgid="4070630558441163574">"Turpināt"</string>
-    <string name="camera_privacy_text" msgid="4268584469444688293">"Kameras atļauja iespējota"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="default_notification_description">Noklusējuma signāls (%1$s)</string>
+  <string name="ringtone_silent">Nav</string>
+  <string name="ringtone_unknown">Nezināms zvana signāls</string>
+  <string name="activity_not_available">Šajā ierīcē nav nevienas šai darbībai piemērotas lietotnes.</string>
+  <string name="outgoing_wps_warning">Veicot WPS zvanu, tiks pārtraukts esošais zvans.</string>
+  <string name="dialog_continue">Turpināt</string>
+  <string name="camera_privacy_text">Kameras atļauja iespējota</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-mk/strings.xml b/java/com/android/dialer/util/res/values-mk/strings.xml
index 3c7a95c..a6a4081 100644
--- a/java/com/android/dialer/util/res/values-mk/strings.xml
+++ b/java/com/android/dialer/util/res/values-mk/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="default_notification_description" msgid="4304424287748323094">"Стандарден звук (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
-    <string name="ringtone_silent" msgid="946744257396998305">"Нема"</string>
-    <string name="ringtone_unknown" msgid="1310974715243581582">"Непозната мелодија"</string>
-    <string name="activity_not_available" msgid="8360067109103762211">"Нема апликација за тоа на уредот"</string>
-    <string name="outgoing_wps_warning" msgid="7505673114152005234">"Воспоставувањето повик преку WPS ќе го исклучи вашиот тековен повик."</string>
-    <string name="dialog_continue" msgid="4070630558441163574">"Продолжи"</string>
-    <string name="camera_privacy_text" msgid="4268584469444688293">"Дозволата за камера е овозможена"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="default_notification_description">Стандарден звук (%1$s)</string>
+  <string name="ringtone_silent">Нема</string>
+  <string name="ringtone_unknown">Непозната мелодија</string>
+  <string name="activity_not_available">Нема апликација за тоа на уредот</string>
+  <string name="outgoing_wps_warning">Воспоставувањето повик преку WPS ќе го исклучи вашиот тековен повик.</string>
+  <string name="dialog_continue">Продолжи</string>
+  <string name="camera_privacy_text">Дозволата за камера е овозможена</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-ml/strings.xml b/java/com/android/dialer/util/res/values-ml/strings.xml
index cc3fe4f..7ef4694 100644
--- a/java/com/android/dialer/util/res/values-ml/strings.xml
+++ b/java/com/android/dialer/util/res/values-ml/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="default_notification_description" msgid="4304424287748323094">"സ്ഥിര ശബ്‌ദം (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
-    <string name="ringtone_silent" msgid="946744257396998305">"ഒന്നും വേണ്ട"</string>
-    <string name="ringtone_unknown" msgid="1310974715243581582">"അറിഞ്ഞുകൂടാത്ത റിംഗ്‌ടോൺ"</string>
-    <string name="activity_not_available" msgid="8360067109103762211">"അതിനായി ഈ ഉപകരണത്തിൽ അപ്ലിക്കേഷനുകളൊന്നുമില്ല"</string>
-    <string name="outgoing_wps_warning" msgid="7505673114152005234">"ഒരു WPS കോൾ ചെയ്യുന്നത് നിങ്ങളുടെ നിലവിലെ കോൾ വിച്ഛേദിക്കാനിടയാക്കും."</string>
-    <string name="dialog_continue" msgid="4070630558441163574">"തുടരുക"</string>
-    <string name="camera_privacy_text" msgid="4268584469444688293">"ക്യാമറ അനുമതി നൽകി"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="default_notification_description">സ്ഥിര ശബ്‌ദം (%1$s)</string>
+  <string name="ringtone_silent">ഒന്നും വേണ്ട</string>
+  <string name="ringtone_unknown">അറിഞ്ഞുകൂടാത്ത റിംഗ്‌ടോൺ</string>
+  <string name="activity_not_available">അതിനായി ഈ ഉപകരണത്തിൽ അപ്ലിക്കേഷനുകളൊന്നുമില്ല</string>
+  <string name="outgoing_wps_warning">ഒരു WPS കോൾ ചെയ്യുന്നത് നിങ്ങളുടെ നിലവിലെ കോൾ വിച്ഛേദിക്കാനിടയാക്കും.</string>
+  <string name="dialog_continue">തുടരുക</string>
+  <string name="camera_privacy_text">ക്യാമറ അനുമതി നൽകി</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-mn/strings.xml b/java/com/android/dialer/util/res/values-mn/strings.xml
index ed42c80..15dcb60 100644
--- a/java/com/android/dialer/util/res/values-mn/strings.xml
+++ b/java/com/android/dialer/util/res/values-mn/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="default_notification_description" msgid="4304424287748323094">"Үндсэн дуу (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
-    <string name="ringtone_silent" msgid="946744257396998305">"Байхгүй"</string>
-    <string name="ringtone_unknown" msgid="1310974715243581582">"Үл мэдэгдэх хонхны ая"</string>
-    <string name="activity_not_available" msgid="8360067109103762211">"Энэхүү төхөөрөмж дээр тухайн үйлдлийг гүйцэтгэх апликейшн байхгүй байна."</string>
-    <string name="outgoing_wps_warning" msgid="7505673114152005234">"WPS дуудлага хийвэл одоо байгаа дуудлагыг таслах болно."</string>
-    <string name="dialog_continue" msgid="4070630558441163574">"Үргэлжлүүлэх"</string>
-    <string name="camera_privacy_text" msgid="4268584469444688293">"Камерын зөвшөөрлийг идэвхжүүлсэн"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="default_notification_description">Үндсэн дуу (%1$s)</string>
+  <string name="ringtone_silent">Байхгүй</string>
+  <string name="ringtone_unknown">Үл мэдэгдэх хонхны ая</string>
+  <string name="activity_not_available">Энэхүү төхөөрөмж дээр тухайн үйлдлийг гүйцэтгэх апликейшн байхгүй байна.</string>
+  <string name="outgoing_wps_warning">WPS дуудлага хийвэл одоо байгаа дуудлагыг таслах болно.</string>
+  <string name="dialog_continue">Үргэлжлүүлэх</string>
+  <string name="camera_privacy_text">Камерын зөвшөөрлийг идэвхжүүлсэн</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-mr/strings.xml b/java/com/android/dialer/util/res/values-mr/strings.xml
index 6535514..af49ed7 100644
--- a/java/com/android/dialer/util/res/values-mr/strings.xml
+++ b/java/com/android/dialer/util/res/values-mr/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="default_notification_description" msgid="4304424287748323094">"डीफॉल्ट आवाज (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
-    <string name="ringtone_silent" msgid="946744257396998305">"काहीही नाही"</string>
-    <string name="ringtone_unknown" msgid="1310974715243581582">"अज्ञात रिंगटोन"</string>
-    <string name="activity_not_available" msgid="8360067109103762211">"या डिव्हाइसवर त्यासाठी कोणताही अॅप नाही"</string>
-    <string name="outgoing_wps_warning" msgid="7505673114152005234">"WPS कॉल केल्याने आपला विद्यमान कॉल डिस्कनेक्ट केला जाईल."</string>
-    <string name="dialog_continue" msgid="4070630558441163574">"सुरु ठेवा"</string>
-    <string name="camera_privacy_text" msgid="4268584469444688293">"कॅमेरा परवानगी चालू केली"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="default_notification_description">डीफॉल्ट आवाज (%1$s)</string>
+  <string name="ringtone_silent">काहीही नाही</string>
+  <string name="ringtone_unknown">अज्ञात रिंगटोन</string>
+  <string name="activity_not_available">या डिव्हाइसवर त्यासाठी कोणताही अॅप नाही</string>
+  <string name="outgoing_wps_warning">WPS कॉल केल्याने आपला विद्यमान कॉल डिस्कनेक्ट केला जाईल.</string>
+  <string name="dialog_continue">सुरु ठेवा</string>
+  <string name="camera_privacy_text">कॅमेरा परवानगी चालू केली</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-ms/strings.xml b/java/com/android/dialer/util/res/values-ms/strings.xml
index 5f9d36b..de75868 100644
--- a/java/com/android/dialer/util/res/values-ms/strings.xml
+++ b/java/com/android/dialer/util/res/values-ms/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="default_notification_description" msgid="4304424287748323094">"Bunyi lalai (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
-    <string name="ringtone_silent" msgid="946744257396998305">"Tiada"</string>
-    <string name="ringtone_unknown" msgid="1310974715243581582">"Nada dering tidak diketahui"</string>
-    <string name="activity_not_available" msgid="8360067109103762211">"Tiada apl untuk tindakan itu pada peranti ini"</string>
-    <string name="outgoing_wps_warning" msgid="7505673114152005234">"Membuat panggilan WPS akan memutuskan panggilan anda yang sedia ada."</string>
-    <string name="dialog_continue" msgid="4070630558441163574">"Teruskan"</string>
-    <string name="camera_privacy_text" msgid="4268584469444688293">"Kebenaran kamera didayakan"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="default_notification_description">Bunyi lalai (%1$s)</string>
+  <string name="ringtone_silent">Tiada</string>
+  <string name="ringtone_unknown">Nada dering tidak diketahui</string>
+  <string name="activity_not_available">Tiada apl untuk tindakan itu pada peranti ini</string>
+  <string name="outgoing_wps_warning">Membuat panggilan WPS akan memutuskan panggilan anda yang sedia ada.</string>
+  <string name="dialog_continue">Teruskan</string>
+  <string name="camera_privacy_text">Kebenaran kamera didayakan</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-my/strings.xml b/java/com/android/dialer/util/res/values-my/strings.xml
index 0bb39c4..8c6e375 100644
--- a/java/com/android/dialer/util/res/values-my/strings.xml
+++ b/java/com/android/dialer/util/res/values-my/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="default_notification_description" msgid="4304424287748323094">"ပုံသေ အသံ (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
-    <string name="ringtone_silent" msgid="946744257396998305">"မရှိ"</string>
-    <string name="ringtone_unknown" msgid="1310974715243581582">"မသိသောမြည်သံ"</string>
-    <string name="activity_not_available" msgid="8360067109103762211">"ဒီကိရိယာထဲမှာ အဲဒါ့အတွက် app မရှိပါ"</string>
-    <string name="outgoing_wps_warning" msgid="7505673114152005234">"WPS ခေါ်ဆိုပါက သင့်လက်ရှိခေါ်ဆိုမှု ပြတ်တောက်သွားပါမည်။"</string>
-    <string name="dialog_continue" msgid="4070630558441163574">"ဆက်လုပ်ရန်"</string>
-    <string name="camera_privacy_text" msgid="4268584469444688293">"ကင်မရာအသုံးပြုခွင့် ဖွင့်ထားပါသည်"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="default_notification_description">ပုံသေ အသံ (%1$s)</string>
+  <string name="ringtone_silent">မရှိ</string>
+  <string name="ringtone_unknown">မသိသောမြည်သံ</string>
+  <string name="activity_not_available">ဒီကိရိယာထဲမှာ အဲဒါ့အတွက် app မရှိပါ</string>
+  <string name="outgoing_wps_warning">WPS ခေါ်ဆိုပါက သင့်လက်ရှိခေါ်ဆိုမှု ပြတ်တောက်သွားပါမည်။</string>
+  <string name="dialog_continue">ဆက်လုပ်ရန်</string>
+  <string name="camera_privacy_text">ကင်မရာအသုံးပြုခွင့် ဖွင့်ထားပါသည်</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-nb/strings.xml b/java/com/android/dialer/util/res/values-nb/strings.xml
index de2f405..d54f9d7 100644
--- a/java/com/android/dialer/util/res/values-nb/strings.xml
+++ b/java/com/android/dialer/util/res/values-nb/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="default_notification_description" msgid="4304424287748323094">"Standardlyd (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
-    <string name="ringtone_silent" msgid="946744257396998305">"Ingen"</string>
-    <string name="ringtone_unknown" msgid="1310974715243581582">"Ukjent ringetone"</string>
-    <string name="activity_not_available" msgid="8360067109103762211">"Det finnes ingen apper for det på denne enheten"</string>
-    <string name="outgoing_wps_warning" msgid="7505673114152005234">"Den pågående samtalen brytes hvis du foretar et WPS-anrop (Wireless Priority Service)."</string>
-    <string name="dialog_continue" msgid="4070630558441163574">"Fortsett"</string>
-    <string name="camera_privacy_text" msgid="4268584469444688293">"Kameratillatelsen er slått på"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="default_notification_description">Standardlyd (%1$s)</string>
+  <string name="ringtone_silent">Ingen</string>
+  <string name="ringtone_unknown">Ukjent ringetone</string>
+  <string name="activity_not_available">Det finnes ingen apper for det på denne enheten</string>
+  <string name="outgoing_wps_warning">Den pågående samtalen brytes hvis du foretar et WPS-anrop (Wireless Priority Service).</string>
+  <string name="dialog_continue">Fortsett</string>
+  <string name="camera_privacy_text">Kameratillatelsen er slått på</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-ne/strings.xml b/java/com/android/dialer/util/res/values-ne/strings.xml
index a6da88f..267c75b 100644
--- a/java/com/android/dialer/util/res/values-ne/strings.xml
+++ b/java/com/android/dialer/util/res/values-ne/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="default_notification_description" msgid="4304424287748323094">"पूर्वनिर्धारित ध्वनि ( <xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g> )"</string>
-    <string name="ringtone_silent" msgid="946744257396998305">"कुनै पनि होइन"</string>
-    <string name="ringtone_unknown" msgid="1310974715243581582">"अज्ञात रिङटोन"</string>
-    <string name="activity_not_available" msgid="8360067109103762211">"यस यन्त्रमा त्यसका लागि कुनै पनि अनुप्रयोग छैन"</string>
-    <string name="outgoing_wps_warning" msgid="7505673114152005234">"WPS कल गर्नुले तपाईंको जारी कललाई विच्छेद गर्ने छ।"</string>
-    <string name="dialog_continue" msgid="4070630558441163574">"जारी राख्नुहोस्"</string>
-    <string name="camera_privacy_text" msgid="4268584469444688293">"क्यामेरासम्बन्धी अनुमतिलाई सक्षम पारियो"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="default_notification_description">पूर्वनिर्धारित ध्वनि ( %1$s )</string>
+  <string name="ringtone_silent">कुनै पनि होइन</string>
+  <string name="ringtone_unknown">अज्ञात रिङटोन</string>
+  <string name="activity_not_available">यस यन्त्रमा त्यसका लागि कुनै पनि अनुप्रयोग छैन</string>
+  <string name="outgoing_wps_warning">WPS कल गर्नुले तपाईंको जारी कललाई विच्छेद गर्ने छ।</string>
+  <string name="dialog_continue">जारी राख्नुहोस्</string>
+  <string name="camera_privacy_text">क्यामेरासम्बन्धी अनुमतिलाई सक्षम पारियो</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-nl/strings.xml b/java/com/android/dialer/util/res/values-nl/strings.xml
index 710f853..d014f5d 100644
--- a/java/com/android/dialer/util/res/values-nl/strings.xml
+++ b/java/com/android/dialer/util/res/values-nl/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="default_notification_description" msgid="4304424287748323094">"Standaardgeluid (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
-    <string name="ringtone_silent" msgid="946744257396998305">"Geen"</string>
-    <string name="ringtone_unknown" msgid="1310974715243581582">"Onbekende beltoon"</string>
-    <string name="activity_not_available" msgid="8360067109103762211">"Daarvoor is geen app beschikbaar op dit apparaat"</string>
-    <string name="outgoing_wps_warning" msgid="7505673114152005234">"Als je een WPS-oproep plaatst, wordt je huidige gesprek afgebroken."</string>
-    <string name="dialog_continue" msgid="4070630558441163574">"Doorgaan"</string>
-    <string name="camera_privacy_text" msgid="4268584469444688293">"Cameramachtiging ingeschakeld"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="default_notification_description">Standaardgeluid (%1$s)</string>
+  <string name="ringtone_silent">Geen</string>
+  <string name="ringtone_unknown">Onbekende beltoon</string>
+  <string name="activity_not_available">Daarvoor is geen app beschikbaar op dit apparaat</string>
+  <string name="outgoing_wps_warning">Als je een WPS-oproep plaatst, wordt je huidige gesprek afgebroken.</string>
+  <string name="dialog_continue">Doorgaan</string>
+  <string name="camera_privacy_text">Cameramachtiging ingeschakeld</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-no/strings.xml b/java/com/android/dialer/util/res/values-no/strings.xml
index de2f405..d54f9d7 100644
--- a/java/com/android/dialer/util/res/values-no/strings.xml
+++ b/java/com/android/dialer/util/res/values-no/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="default_notification_description" msgid="4304424287748323094">"Standardlyd (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
-    <string name="ringtone_silent" msgid="946744257396998305">"Ingen"</string>
-    <string name="ringtone_unknown" msgid="1310974715243581582">"Ukjent ringetone"</string>
-    <string name="activity_not_available" msgid="8360067109103762211">"Det finnes ingen apper for det på denne enheten"</string>
-    <string name="outgoing_wps_warning" msgid="7505673114152005234">"Den pågående samtalen brytes hvis du foretar et WPS-anrop (Wireless Priority Service)."</string>
-    <string name="dialog_continue" msgid="4070630558441163574">"Fortsett"</string>
-    <string name="camera_privacy_text" msgid="4268584469444688293">"Kameratillatelsen er slått på"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="default_notification_description">Standardlyd (%1$s)</string>
+  <string name="ringtone_silent">Ingen</string>
+  <string name="ringtone_unknown">Ukjent ringetone</string>
+  <string name="activity_not_available">Det finnes ingen apper for det på denne enheten</string>
+  <string name="outgoing_wps_warning">Den pågående samtalen brytes hvis du foretar et WPS-anrop (Wireless Priority Service).</string>
+  <string name="dialog_continue">Fortsett</string>
+  <string name="camera_privacy_text">Kameratillatelsen er slått på</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-pa/strings.xml b/java/com/android/dialer/util/res/values-pa/strings.xml
index 14d3bee..6e0aa92 100644
--- a/java/com/android/dialer/util/res/values-pa/strings.xml
+++ b/java/com/android/dialer/util/res/values-pa/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="default_notification_description" msgid="4304424287748323094">"ਪੂਰਵ-ਨਿਰਧਾਰਤ ਧੁਨੀ (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
-    <string name="ringtone_silent" msgid="946744257396998305">"ਕੋਈ ਨਹੀਂ"</string>
-    <string name="ringtone_unknown" msgid="1310974715243581582">"ਅਗਿਆਤ ਰਿੰਗਟੋਨ"</string>
-    <string name="activity_not_available" msgid="8360067109103762211">"ਉਸ ਲਈ ਇਸ ਡੀਵਾਈਸ ਤੇ ਕੋਈ ਐਪ ਨਹੀਂ"</string>
-    <string name="outgoing_wps_warning" msgid="7505673114152005234">"ਇੱਕ WPS ਕਾਲ ਕਰਨਾ ਤੁਹਾਡੀ ਮੌਜੂਦਾ ਕਾਲ ਨੂੰ ਡਿਸਕਨੈਕਟ ਕਰ ਦੇਵੇਗਾ।"</string>
-    <string name="dialog_continue" msgid="4070630558441163574">"ਜਾਰੀ ਰੱਖੋ"</string>
-    <string name="camera_privacy_text" msgid="4268584469444688293">"ਕੈਮਰਾ ਇਜਾਜ਼ਤ ਨੂੰ ਯੋਗ ਬਣਾਇਆ ਗਿਆ ਹੈ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="default_notification_description">ਪੂਰਵ-ਨਿਰਧਾਰਤ ਧੁਨੀ (%1$s)</string>
+  <string name="ringtone_silent">ਕੋਈ ਨਹੀਂ</string>
+  <string name="ringtone_unknown">ਅਗਿਆਤ ਰਿੰਗਟੋਨ</string>
+  <string name="activity_not_available">ਉਸ ਲਈ ਇਸ ਡੀਵਾਈਸ ਤੇ ਕੋਈ ਐਪ ਨਹੀਂ</string>
+  <string name="outgoing_wps_warning">ਇੱਕ WPS ਕਾਲ ਕਰਨਾ ਤੁਹਾਡੀ ਮੌਜੂਦਾ ਕਾਲ ਨੂੰ ਡਿਸਕਨੈਕਟ ਕਰ ਦੇਵੇਗਾ।</string>
+  <string name="dialog_continue">ਜਾਰੀ ਰੱਖੋ</string>
+  <string name="camera_privacy_text">ਕੈਮਰਾ ਇਜਾਜ਼ਤ ਨੂੰ ਯੋਗ ਬਣਾਇਆ ਗਿਆ ਹੈ</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-pl/strings.xml b/java/com/android/dialer/util/res/values-pl/strings.xml
index 45cd546..93d4550 100644
--- a/java/com/android/dialer/util/res/values-pl/strings.xml
+++ b/java/com/android/dialer/util/res/values-pl/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="default_notification_description" msgid="4304424287748323094">"Domyślny dźwięk (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
-    <string name="ringtone_silent" msgid="946744257396998305">"Brak"</string>
-    <string name="ringtone_unknown" msgid="1310974715243581582">"Nieznany dzwonek"</string>
-    <string name="activity_not_available" msgid="8360067109103762211">"Na urządzeniu nie ma aplikacji, która mogłaby wykonać tę czynność"</string>
-    <string name="outgoing_wps_warning" msgid="7505673114152005234">"Jeśli nawiążesz połączenie WPS, bieżące połączenie zostanie przerwane."</string>
-    <string name="dialog_continue" msgid="4070630558441163574">"Dalej"</string>
-    <string name="camera_privacy_text" msgid="4268584469444688293">"Uprawnienia do korzystania z aparatu zostały włączone"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="default_notification_description">Domyślny dźwięk (%1$s)</string>
+  <string name="ringtone_silent">Brak</string>
+  <string name="ringtone_unknown">Nieznany dzwonek</string>
+  <string name="activity_not_available">Na urządzeniu nie ma aplikacji, która mogłaby wykonać tę czynność</string>
+  <string name="outgoing_wps_warning">Jeśli nawiążesz połączenie WPS, bieżące połączenie zostanie przerwane.</string>
+  <string name="dialog_continue">Dalej</string>
+  <string name="camera_privacy_text">Uprawnienia do korzystania z aparatu zostały włączone</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-pt-rBR/strings.xml b/java/com/android/dialer/util/res/values-pt-rBR/strings.xml
index 113fc5d..f32ddb7 100644
--- a/java/com/android/dialer/util/res/values-pt-rBR/strings.xml
+++ b/java/com/android/dialer/util/res/values-pt-rBR/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="default_notification_description" msgid="4304424287748323094">"Som padrão (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
-    <string name="ringtone_silent" msgid="946744257396998305">"Nenhum"</string>
-    <string name="ringtone_unknown" msgid="1310974715243581582">"Toque desconhecido"</string>
-    <string name="activity_not_available" msgid="8360067109103762211">"Nenhum app está disponível para essa ação neste dispositivo"</string>
-    <string name="outgoing_wps_warning" msgid="7505673114152005234">"Fazer uma chamada usando o WPS desconectará a chamada atual."</string>
-    <string name="dialog_continue" msgid="4070630558441163574">"Continuar"</string>
-    <string name="camera_privacy_text" msgid="4268584469444688293">"Permissão de câmera ativada"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="default_notification_description">Som padrão (%1$s)</string>
+  <string name="ringtone_silent">Nenhum</string>
+  <string name="ringtone_unknown">Toque desconhecido</string>
+  <string name="activity_not_available">Nenhum app está disponível para essa ação neste dispositivo</string>
+  <string name="outgoing_wps_warning">Fazer uma chamada usando o WPS desconectará a chamada atual.</string>
+  <string name="dialog_continue">Continuar</string>
+  <string name="camera_privacy_text">Permissão de câmera ativada</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-pt-rPT/strings.xml b/java/com/android/dialer/util/res/values-pt-rPT/strings.xml
index 9ebb5e1..2be7843 100644
--- a/java/com/android/dialer/util/res/values-pt-rPT/strings.xml
+++ b/java/com/android/dialer/util/res/values-pt-rPT/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="default_notification_description" msgid="4304424287748323094">"Som predefinido (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
-    <string name="ringtone_silent" msgid="946744257396998305">"Nenhum"</string>
-    <string name="ringtone_unknown" msgid="1310974715243581582">"Toque desconhecido"</string>
-    <string name="activity_not_available" msgid="8360067109103762211">"Não existe nenhuma aplicação para isso neste dispositivo"</string>
-    <string name="outgoing_wps_warning" msgid="7505673114152005234">"Efetuar uma chamada WPS irá desligar a sua chamada atual."</string>
-    <string name="dialog_continue" msgid="4070630558441163574">"Continuar"</string>
-    <string name="camera_privacy_text" msgid="4268584469444688293">"Autorização da câmara ativada"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="default_notification_description">Som predefinido (%1$s)</string>
+  <string name="ringtone_silent">Nenhum</string>
+  <string name="ringtone_unknown">Toque desconhecido</string>
+  <string name="activity_not_available">Não existe nenhuma aplicação para isso neste dispositivo</string>
+  <string name="outgoing_wps_warning">Efetuar uma chamada WPS irá desligar a sua chamada atual.</string>
+  <string name="dialog_continue">Continuar</string>
+  <string name="camera_privacy_text">Autorização da câmara ativada</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-pt/strings.xml b/java/com/android/dialer/util/res/values-pt/strings.xml
index 113fc5d..f32ddb7 100644
--- a/java/com/android/dialer/util/res/values-pt/strings.xml
+++ b/java/com/android/dialer/util/res/values-pt/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="default_notification_description" msgid="4304424287748323094">"Som padrão (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
-    <string name="ringtone_silent" msgid="946744257396998305">"Nenhum"</string>
-    <string name="ringtone_unknown" msgid="1310974715243581582">"Toque desconhecido"</string>
-    <string name="activity_not_available" msgid="8360067109103762211">"Nenhum app está disponível para essa ação neste dispositivo"</string>
-    <string name="outgoing_wps_warning" msgid="7505673114152005234">"Fazer uma chamada usando o WPS desconectará a chamada atual."</string>
-    <string name="dialog_continue" msgid="4070630558441163574">"Continuar"</string>
-    <string name="camera_privacy_text" msgid="4268584469444688293">"Permissão de câmera ativada"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="default_notification_description">Som padrão (%1$s)</string>
+  <string name="ringtone_silent">Nenhum</string>
+  <string name="ringtone_unknown">Toque desconhecido</string>
+  <string name="activity_not_available">Nenhum app está disponível para essa ação neste dispositivo</string>
+  <string name="outgoing_wps_warning">Fazer uma chamada usando o WPS desconectará a chamada atual.</string>
+  <string name="dialog_continue">Continuar</string>
+  <string name="camera_privacy_text">Permissão de câmera ativada</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-ro/strings.xml b/java/com/android/dialer/util/res/values-ro/strings.xml
index a311fea..8012512 100644
--- a/java/com/android/dialer/util/res/values-ro/strings.xml
+++ b/java/com/android/dialer/util/res/values-ro/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="default_notification_description" msgid="4304424287748323094">"Sunet prestabilit (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
-    <string name="ringtone_silent" msgid="946744257396998305">"Niciunul"</string>
-    <string name="ringtone_unknown" msgid="1310974715243581582">"Ton de apel necunoscut"</string>
-    <string name="activity_not_available" msgid="8360067109103762211">"Pe dispozitiv nu există nicio aplicație pentru această acțiune"</string>
-    <string name="outgoing_wps_warning" msgid="7505673114152005234">"Dacă inițiați un apel WPS, apelul existent va fi deconectat."</string>
-    <string name="dialog_continue" msgid="4070630558441163574">"Continuați"</string>
-    <string name="camera_privacy_text" msgid="4268584469444688293">"Permisiunea pentru cameră a fost activată."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="default_notification_description">Sunet prestabilit (%1$s)</string>
+  <string name="ringtone_silent">Niciunul</string>
+  <string name="ringtone_unknown">Ton de apel necunoscut</string>
+  <string name="activity_not_available">Pe dispozitiv nu există nicio aplicație pentru această acțiune</string>
+  <string name="outgoing_wps_warning">Dacă inițiați un apel WPS, apelul existent va fi deconectat.</string>
+  <string name="dialog_continue">Continuați</string>
+  <string name="camera_privacy_text">Permisiunea pentru cameră a fost activată.</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-ru/strings.xml b/java/com/android/dialer/util/res/values-ru/strings.xml
index de02ccf..64cca44 100644
--- a/java/com/android/dialer/util/res/values-ru/strings.xml
+++ b/java/com/android/dialer/util/res/values-ru/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="default_notification_description" msgid="4304424287748323094">"По умолчанию (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
-    <string name="ringtone_silent" msgid="946744257396998305">"Не использовать"</string>
-    <string name="ringtone_unknown" msgid="1310974715243581582">"Мелодия не найдена"</string>
-    <string name="activity_not_available" msgid="8360067109103762211">"На устройстве нет подходящего приложения"</string>
-    <string name="outgoing_wps_warning" msgid="7505673114152005234">"Если вы начнете WPS-вызов, текущий вызов будет прекращен."</string>
-    <string name="dialog_continue" msgid="4070630558441163574">"Продолжить"</string>
-    <string name="camera_privacy_text" msgid="4268584469444688293">"Доступ к камере разрешен"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="default_notification_description">По умолчанию (%1$s)</string>
+  <string name="ringtone_silent">Не использовать</string>
+  <string name="ringtone_unknown">Мелодия не найдена</string>
+  <string name="activity_not_available">На устройстве нет подходящего приложения</string>
+  <string name="outgoing_wps_warning">Если вы начнете WPS-вызов, текущий вызов будет прекращен.</string>
+  <string name="dialog_continue">Продолжить</string>
+  <string name="camera_privacy_text">Доступ к камере разрешен</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-si/strings.xml b/java/com/android/dialer/util/res/values-si/strings.xml
index 86ec845..0abd503 100644
--- a/java/com/android/dialer/util/res/values-si/strings.xml
+++ b/java/com/android/dialer/util/res/values-si/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="default_notification_description" msgid="4304424287748323094">"සුපුරුදු ශබ්දය (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
-    <string name="ringtone_silent" msgid="946744257396998305">"කිසිවක් නැත"</string>
-    <string name="ringtone_unknown" msgid="1310974715243581582">"නොදන්නා රින්ටෝනය"</string>
-    <string name="activity_not_available" msgid="8360067109103762211">"මෙම උපාංගයෙහි ඒ සඳහා යෙදුමක් නැත"</string>
-    <string name="outgoing_wps_warning" msgid="7505673114152005234">"WPS ඇමතුමක් කිරීමෙන් ඔබේ දැනට පවතින ඇමතුම විසන්ධි කරනු ඇත."</string>
-    <string name="dialog_continue" msgid="4070630558441163574">"දිගටම කරගෙන යන්න"</string>
-    <string name="camera_privacy_text" msgid="4268584469444688293">"කැමරා අවසර සබල කර ඇත"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="default_notification_description">සුපුරුදු ශබ්දය (%1$s)</string>
+  <string name="ringtone_silent">කිසිවක් නැත</string>
+  <string name="ringtone_unknown">නොදන්නා රින්ටෝනය</string>
+  <string name="activity_not_available">මෙම උපාංගයෙහි ඒ සඳහා යෙදුමක් නැත</string>
+  <string name="outgoing_wps_warning">WPS ඇමතුමක් කිරීමෙන් ඔබේ දැනට පවතින ඇමතුම විසන්ධි කරනු ඇත.</string>
+  <string name="dialog_continue">දිගටම කරගෙන යන්න</string>
+  <string name="camera_privacy_text">කැමරා අවසර සබල කර ඇත</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-sk/strings.xml b/java/com/android/dialer/util/res/values-sk/strings.xml
index a666950..62f6e9c 100644
--- a/java/com/android/dialer/util/res/values-sk/strings.xml
+++ b/java/com/android/dialer/util/res/values-sk/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="default_notification_description" msgid="4304424287748323094">"Predvolený zvuk (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
-    <string name="ringtone_silent" msgid="946744257396998305">"Žiadny"</string>
-    <string name="ringtone_unknown" msgid="1310974715243581582">"Neznámy tón zvonenia"</string>
-    <string name="activity_not_available" msgid="8360067109103762211">"Na tomto zariadení nie je aplikácia na vykonanie danej akcie"</string>
-    <string name="outgoing_wps_warning" msgid="7505673114152005234">"Uskutočnením hovoru cez WPS prerušíte existujúci hovor."</string>
-    <string name="dialog_continue" msgid="4070630558441163574">"Pokračovať"</string>
-    <string name="camera_privacy_text" msgid="4268584469444688293">"Povolenie pre fotoaparát je aktivované"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="default_notification_description">Predvolený zvuk (%1$s)</string>
+  <string name="ringtone_silent">Žiadny</string>
+  <string name="ringtone_unknown">Neznámy tón zvonenia</string>
+  <string name="activity_not_available">Na tomto zariadení nie je aplikácia na vykonanie danej akcie</string>
+  <string name="outgoing_wps_warning">Uskutočnením hovoru cez WPS prerušíte existujúci hovor.</string>
+  <string name="dialog_continue">Pokračovať</string>
+  <string name="camera_privacy_text">Povolenie pre fotoaparát je aktivované</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-sl/strings.xml b/java/com/android/dialer/util/res/values-sl/strings.xml
index 594cd47..01ed48c 100644
--- a/java/com/android/dialer/util/res/values-sl/strings.xml
+++ b/java/com/android/dialer/util/res/values-sl/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="default_notification_description" msgid="4304424287748323094">"Privzeti zvok (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
-    <string name="ringtone_silent" msgid="946744257396998305">"Brez"</string>
-    <string name="ringtone_unknown" msgid="1310974715243581582">"Neznan ton zvonjenja"</string>
-    <string name="activity_not_available" msgid="8360067109103762211">"V tej napravi ni aplikacije za to"</string>
-    <string name="outgoing_wps_warning" msgid="7505673114152005234">"Če začnete klic WPS, bo obstoječi klic prekinjen."</string>
-    <string name="dialog_continue" msgid="4070630558441163574">"Nadaljuj"</string>
-    <string name="camera_privacy_text" msgid="4268584469444688293">"Dovoljenje za dostop do fotoaparata je omogočeno"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="default_notification_description">Privzeti zvok (%1$s)</string>
+  <string name="ringtone_silent">Brez</string>
+  <string name="ringtone_unknown">Neznan ton zvonjenja</string>
+  <string name="activity_not_available">V tej napravi ni aplikacije za to</string>
+  <string name="outgoing_wps_warning">Če začnete klic WPS, bo obstoječi klic prekinjen.</string>
+  <string name="dialog_continue">Nadaljuj</string>
+  <string name="camera_privacy_text">Dovoljenje za dostop do fotoaparata je omogočeno</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-sq/strings.xml b/java/com/android/dialer/util/res/values-sq/strings.xml
index ee07161..d3b5b1d 100644
--- a/java/com/android/dialer/util/res/values-sq/strings.xml
+++ b/java/com/android/dialer/util/res/values-sq/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="default_notification_description" msgid="4304424287748323094">"Tingulli me parazgjedhje (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
-    <string name="ringtone_silent" msgid="946744257396998305">"Asnjë"</string>
-    <string name="ringtone_unknown" msgid="1310974715243581582">"Toni i ziles është i panjohur"</string>
-    <string name="activity_not_available" msgid="8360067109103762211">"Nuk ka aplikacion për atë në këtë pajisje"</string>
-    <string name="outgoing_wps_warning" msgid="7505673114152005234">"Kryerja e një telefonate WPS do të shkëputë telefonatën tënde ekzistuese."</string>
-    <string name="dialog_continue" msgid="4070630558441163574">"Vazhdo"</string>
-    <string name="camera_privacy_text" msgid="4268584469444688293">"Leja e kamerës është aktivizuar"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="default_notification_description">Tingulli me parazgjedhje (%1$s)</string>
+  <string name="ringtone_silent">Asnjë</string>
+  <string name="ringtone_unknown">Toni i ziles është i panjohur</string>
+  <string name="activity_not_available">Nuk ka aplikacion për atë në këtë pajisje</string>
+  <string name="outgoing_wps_warning">Kryerja e një telefonate WPS do të shkëputë telefonatën tënde ekzistuese.</string>
+  <string name="dialog_continue">Vazhdo</string>
+  <string name="camera_privacy_text">Leja e kamerës është aktivizuar</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-sr/strings.xml b/java/com/android/dialer/util/res/values-sr/strings.xml
index 7f20ba2..84eaa26 100644
--- a/java/com/android/dialer/util/res/values-sr/strings.xml
+++ b/java/com/android/dialer/util/res/values-sr/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="default_notification_description" msgid="4304424287748323094">"Подразумевани звук (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
-    <string name="ringtone_silent" msgid="946744257396998305">"Ништа"</string>
-    <string name="ringtone_unknown" msgid="1310974715243581582">"Непознати звук звона"</string>
-    <string name="activity_not_available" msgid="8360067109103762211">"На овом уређају нема апликација за то"</string>
-    <string name="outgoing_wps_warning" msgid="7505673114152005234">"Ако упутите WPS позив, прекинућете постојећи позив."</string>
-    <string name="dialog_continue" msgid="4070630558441163574">"Настави"</string>
-    <string name="camera_privacy_text" msgid="4268584469444688293">"Омогућена је дозвола за камеру"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="default_notification_description">Подразумевани звук (%1$s)</string>
+  <string name="ringtone_silent">Ништа</string>
+  <string name="ringtone_unknown">Непознати звук звона</string>
+  <string name="activity_not_available">На овом уређају нема апликација за то</string>
+  <string name="outgoing_wps_warning">Ако упутите WPS позив, прекинућете постојећи позив.</string>
+  <string name="dialog_continue">Настави</string>
+  <string name="camera_privacy_text">Омогућена је дозвола за камеру</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-sv/strings.xml b/java/com/android/dialer/util/res/values-sv/strings.xml
index e0d2566..1b3fd43 100644
--- a/java/com/android/dialer/util/res/values-sv/strings.xml
+++ b/java/com/android/dialer/util/res/values-sv/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="default_notification_description" msgid="4304424287748323094">"Standardsignal (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
-    <string name="ringtone_silent" msgid="946744257396998305">"Ingen"</string>
-    <string name="ringtone_unknown" msgid="1310974715243581582">"Okänd ringsignal"</string>
-    <string name="activity_not_available" msgid="8360067109103762211">"Det finns ingen app för detta på enheten"</string>
-    <string name="outgoing_wps_warning" msgid="7505673114152005234">"Ringer du ett WPS-samtal kopplas det nuvarande samtalet bort."</string>
-    <string name="dialog_continue" msgid="4070630558441163574">"Fortsätt"</string>
-    <string name="camera_privacy_text" msgid="4268584469444688293">"Kamerabehörighet har aktiverats"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="default_notification_description">Standardsignal (%1$s)</string>
+  <string name="ringtone_silent">Ingen</string>
+  <string name="ringtone_unknown">Okänd ringsignal</string>
+  <string name="activity_not_available">Det finns ingen app för detta på enheten</string>
+  <string name="outgoing_wps_warning">Ringer du ett WPS-samtal kopplas det nuvarande samtalet bort.</string>
+  <string name="dialog_continue">Fortsätt</string>
+  <string name="camera_privacy_text">Kamerabehörighet har aktiverats</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-sw/strings.xml b/java/com/android/dialer/util/res/values-sw/strings.xml
index 5eefb42..28124e6 100644
--- a/java/com/android/dialer/util/res/values-sw/strings.xml
+++ b/java/com/android/dialer/util/res/values-sw/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="default_notification_description" msgid="4304424287748323094">"Sauti chaguo-msingi (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
-    <string name="ringtone_silent" msgid="946744257396998305">"Isilie"</string>
-    <string name="ringtone_unknown" msgid="1310974715243581582">"Mlio usiojulikana"</string>
-    <string name="activity_not_available" msgid="8360067109103762211">"Hakuna programu kwa ajili ya hiyo kwenye kifaa hiki"</string>
-    <string name="outgoing_wps_warning" msgid="7505673114152005234">"Ukipiga simu ya WPS, simu inayoendelea sasa itakatwa."</string>
-    <string name="dialog_continue" msgid="4070630558441163574">"Endelea"</string>
-    <string name="camera_privacy_text" msgid="4268584469444688293">"Ruhusa ya kufikia kamera imetolewa kiotomatiki"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="default_notification_description">Sauti chaguo msingi (%1$s)</string>
+  <string name="ringtone_silent">Isilie</string>
+  <string name="ringtone_unknown">Mlio usiojulikana</string>
+  <string name="activity_not_available">Hakuna programu kwa ajili ya hiyo kwenye kifaa hiki</string>
+  <string name="outgoing_wps_warning">Ukipiga simu ya WPS, simu inayoendelea sasa itakatwa.</string>
+  <string name="dialog_continue">Endelea</string>
+  <string name="camera_privacy_text">Ruhusa ya kufikia kamera imetolewa kiotomatiki</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-ta/strings.xml b/java/com/android/dialer/util/res/values-ta/strings.xml
index c521eac..750deab 100644
--- a/java/com/android/dialer/util/res/values-ta/strings.xml
+++ b/java/com/android/dialer/util/res/values-ta/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="default_notification_description" msgid="4304424287748323094">"இயல்பு ஒலி (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
-    <string name="ringtone_silent" msgid="946744257396998305">"ஏதுமில்லை"</string>
-    <string name="ringtone_unknown" msgid="1310974715243581582">"அறியப்படாத ரிங்டோன்"</string>
-    <string name="activity_not_available" msgid="8360067109103762211">"சாதனத்தில் இந்தச் செயலைச் செய்வதற்கான பயன்பாடு எதுவும் இல்லை"</string>
-    <string name="outgoing_wps_warning" msgid="7505673114152005234">"WPS அழைப்பை மேற்கொண்டால், தற்போது செயலில் உள்ள அழைப்புத் துண்டிக்கப்படும்."</string>
-    <string name="dialog_continue" msgid="4070630558441163574">"தொடர்க"</string>
-    <string name="camera_privacy_text" msgid="4268584469444688293">"கேமராவிற்கான அனுமதி இயக்கப்பட்டது"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="default_notification_description">இயல்பு ஒலி (%1$s)</string>
+  <string name="ringtone_silent">ஏதுமில்லை</string>
+  <string name="ringtone_unknown">அறியப்படாத ரிங்டோன்</string>
+  <string name="activity_not_available">சாதனத்தில் இந்தச் செயலைச் செய்வதற்கான பயன்பாடு எதுவும் இல்லை</string>
+  <string name="outgoing_wps_warning">WPS அழைப்பை மேற்கொண்டால், தற்போது செயலில் உள்ள அழைப்புத் துண்டிக்கப்படும்.</string>
+  <string name="dialog_continue">தொடர்க</string>
+  <string name="camera_privacy_text">கேமராவிற்கான அனுமதி இயக்கப்பட்டது</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-te/strings.xml b/java/com/android/dialer/util/res/values-te/strings.xml
index cb21a9a..125a28b 100644
--- a/java/com/android/dialer/util/res/values-te/strings.xml
+++ b/java/com/android/dialer/util/res/values-te/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="default_notification_description" msgid="4304424287748323094">"డిఫాల్ట్ ధ్వని (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
-    <string name="ringtone_silent" msgid="946744257396998305">"ఏదీ వద్దు"</string>
-    <string name="ringtone_unknown" msgid="1310974715243581582">"తెలియని రింగ్‌టోన్"</string>
-    <string name="activity_not_available" msgid="8360067109103762211">"ఈ పరికరంలో దాని కోసం అనువర్తనం ఏదీ లేదు"</string>
-    <string name="outgoing_wps_warning" msgid="7505673114152005234">"WPS కాల్ చేయడం వలన మీరు ప్రస్తుతం మాట్లాడుతున్న కాల్ డిస్‌కనెక్ట్ అవుతుంది."</string>
-    <string name="dialog_continue" msgid="4070630558441163574">"కొనసాగించు"</string>
-    <string name="camera_privacy_text" msgid="4268584469444688293">"కెమెరా అనుమతిని ప్రారంభించాము"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="default_notification_description">డిఫాల్ట్ ధ్వని (%1$s)</string>
+  <string name="ringtone_silent">ఏదీ వద్దు</string>
+  <string name="ringtone_unknown">తెలియని రింగ్‌టోన్</string>
+  <string name="activity_not_available">ఈ పరికరంలో దాని కోసం అనువర్తనం ఏదీ లేదు</string>
+  <string name="outgoing_wps_warning">WPS కాల్ చేయడం వలన మీరు ప్రస్తుతం మాట్లాడుతున్న కాల్ డిస్‌కనెక్ట్ అవుతుంది.</string>
+  <string name="dialog_continue">కొనసాగించు</string>
+  <string name="camera_privacy_text">కెమెరా అనుమతిని ప్రారంభించాము</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-th/strings.xml b/java/com/android/dialer/util/res/values-th/strings.xml
index 0ed77ad..7143b68 100644
--- a/java/com/android/dialer/util/res/values-th/strings.xml
+++ b/java/com/android/dialer/util/res/values-th/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="default_notification_description" msgid="4304424287748323094">"เสียงเริ่มต้น (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
-    <string name="ringtone_silent" msgid="946744257396998305">"ไม่มี"</string>
-    <string name="ringtone_unknown" msgid="1310974715243581582">"ไม่ทราบเสียงเรียกเข้า"</string>
-    <string name="activity_not_available" msgid="8360067109103762211">"ไม่มีแอปสำหรับการทำงานนั้นบนอุปกรณ์นี้"</string>
-    <string name="outgoing_wps_warning" msgid="7505673114152005234">"หากคุณโทรผ่านบริการ WPS ตอนนี้ สายที่โทรอยู่จะตัดการเชื่อมต่อ"</string>
-    <string name="dialog_continue" msgid="4070630558441163574">"ต่อไป"</string>
-    <string name="camera_privacy_text" msgid="4268584469444688293">"ให้สิทธิ์เข้าถึงกล้องถ่ายรูปแล้ว"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="default_notification_description">เสียงเริ่มต้น (%1$s)</string>
+  <string name="ringtone_silent">ไม่มี</string>
+  <string name="ringtone_unknown">ไม่ทราบเสียงเรียกเข้า</string>
+  <string name="activity_not_available">ไม่มีแอปสำหรับการทำงานนั้นบนอุปกรณ์นี้</string>
+  <string name="outgoing_wps_warning">หากคุณโทรผ่านบริการ WPS ตอนนี้ สายที่โทรอยู่จะตัดการเชื่อมต่อ</string>
+  <string name="dialog_continue">ต่อไป</string>
+  <string name="camera_privacy_text">ให้สิทธิ์เข้าถึงกล้องถ่ายรูปแล้ว</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-tl/strings.xml b/java/com/android/dialer/util/res/values-tl/strings.xml
index 6d93b6f..4386767 100644
--- a/java/com/android/dialer/util/res/values-tl/strings.xml
+++ b/java/com/android/dialer/util/res/values-tl/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="default_notification_description" msgid="4304424287748323094">"Default na tunog (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
-    <string name="ringtone_silent" msgid="946744257396998305">"Wala"</string>
-    <string name="ringtone_unknown" msgid="1310974715243581582">"Hindi kilalang ringtone"</string>
-    <string name="activity_not_available" msgid="8360067109103762211">"Walang app para doon sa device na ito"</string>
-    <string name="outgoing_wps_warning" msgid="7505673114152005234">"Ang paggawa ng WPS na tawag ay puputulin sa koneksyon ang dati mo nang tawag."</string>
-    <string name="dialog_continue" msgid="4070630558441163574">"Magpatuloy"</string>
-    <string name="camera_privacy_text" msgid="4268584469444688293">"Na-enable ang pahintulot sa camera"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="default_notification_description">Default na tunog (%1$s)</string>
+  <string name="ringtone_silent">Wala</string>
+  <string name="ringtone_unknown">Hindi kilalang ringtone</string>
+  <string name="activity_not_available">Walang app para doon sa device na ito</string>
+  <string name="outgoing_wps_warning">Ang paggawa ng WPS na tawag ay puputulin sa koneksyon ang dati mo nang tawag.</string>
+  <string name="dialog_continue">Magpatuloy</string>
+  <string name="camera_privacy_text">Na-enable ang pahintulot sa camera</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-tr/strings.xml b/java/com/android/dialer/util/res/values-tr/strings.xml
index 94bfd65..08be04a 100644
--- a/java/com/android/dialer/util/res/values-tr/strings.xml
+++ b/java/com/android/dialer/util/res/values-tr/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="default_notification_description" msgid="4304424287748323094">"Varsayılan ses (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
-    <string name="ringtone_silent" msgid="946744257396998305">"Yok"</string>
-    <string name="ringtone_unknown" msgid="1310974715243581582">"Bilinmeyen zil sesi"</string>
-    <string name="activity_not_available" msgid="8360067109103762211">"Bu cihazda bu işlem için uygun uygulama yok"</string>
-    <string name="outgoing_wps_warning" msgid="7505673114152005234">"WPS çağrısı yaparsanız, devam eden çağrı sonlandırılır."</string>
-    <string name="dialog_continue" msgid="4070630558441163574">"Devam"</string>
-    <string name="camera_privacy_text" msgid="4268584469444688293">"Kamera izni etkinleştirildi"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="default_notification_description">Varsayılan ses (%1$s)</string>
+  <string name="ringtone_silent">Yok</string>
+  <string name="ringtone_unknown">Bilinmeyen zil sesi</string>
+  <string name="activity_not_available">Bu cihazda bu işlem için uygun uygulama yok</string>
+  <string name="outgoing_wps_warning">WPS çağrısı yaparsanız, devam eden çağrı sonlandırılır.</string>
+  <string name="dialog_continue">Devam</string>
+  <string name="camera_privacy_text">Kamera izni etkinleştirildi</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-uk/strings.xml b/java/com/android/dialer/util/res/values-uk/strings.xml
index 683a8fb..d05b23a 100644
--- a/java/com/android/dialer/util/res/values-uk/strings.xml
+++ b/java/com/android/dialer/util/res/values-uk/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="default_notification_description" msgid="4304424287748323094">"Звук за умовчанням (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
-    <string name="ringtone_silent" msgid="946744257396998305">"Немає"</string>
-    <string name="ringtone_unknown" msgid="1310974715243581582">"Невідомий сигнал дзвінка"</string>
-    <string name="activity_not_available" msgid="8360067109103762211">"На цьому пристрої немає додатка, який може виконати цю дію"</string>
-    <string name="outgoing_wps_warning" msgid="7505673114152005234">"Якщо здійснити виклик WPS, буде роз’єднано поточний виклик."</string>
-    <string name="dialog_continue" msgid="4070630558441163574">"Продовжити"</string>
-    <string name="camera_privacy_text" msgid="4268584469444688293">"Надано доступ до камери"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="default_notification_description">Звук за умовчанням (%1$s)</string>
+  <string name="ringtone_silent">Немає</string>
+  <string name="ringtone_unknown">Невідомий сигнал дзвінка</string>
+  <string name="activity_not_available">На цьому пристрої немає додатка, який може виконати цю дію</string>
+  <string name="outgoing_wps_warning">Якщо здійснити виклик WPS, буде роз’єднано поточний виклик.</string>
+  <string name="dialog_continue">Продовжити</string>
+  <string name="camera_privacy_text">Надано доступ до камери</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-ur/strings.xml b/java/com/android/dialer/util/res/values-ur/strings.xml
index bc5ed8c..11f851d 100644
--- a/java/com/android/dialer/util/res/values-ur/strings.xml
+++ b/java/com/android/dialer/util/res/values-ur/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="default_notification_description" msgid="4304424287748323094">"ڈیفالٹ آواز (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
-    <string name="ringtone_silent" msgid="946744257396998305">"کوئی نہیں"</string>
-    <string name="ringtone_unknown" msgid="1310974715243581582">"نامعلوم رنگ ٹون"</string>
-    <string name="activity_not_available" msgid="8360067109103762211">"اس آلہ پر اس کیلئے کوئی ایپ نہیں ہے"</string>
-    <string name="outgoing_wps_warning" msgid="7505673114152005234">"‏WPS کال کرنے سے آپ کی موجودہ کال غیر منسلک ہو جائے گی۔"</string>
-    <string name="dialog_continue" msgid="4070630558441163574">"جاری رکھیں"</string>
-    <string name="camera_privacy_text" msgid="4268584469444688293">"کیمرا کی اجازت فعال کر دی گئی"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="default_notification_description">ڈیفالٹ آواز (%1$s)</string>
+  <string name="ringtone_silent">کوئی نہیں</string>
+  <string name="ringtone_unknown">نامعلوم رنگ ٹون</string>
+  <string name="activity_not_available">اس آلہ پر اس کیلئے کوئی ایپ نہیں ہے</string>
+  <string name="outgoing_wps_warning">‏WPS کال کرنے سے آپ کی موجودہ کال غیر منسلک ہو جائے گی۔</string>
+  <string name="dialog_continue">جاری رکھیں</string>
+  <string name="camera_privacy_text">کیمرا کی اجازت فعال کر دی گئی</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-uz/strings.xml b/java/com/android/dialer/util/res/values-uz/strings.xml
index ba27c3b..d8745fd 100644
--- a/java/com/android/dialer/util/res/values-uz/strings.xml
+++ b/java/com/android/dialer/util/res/values-uz/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="default_notification_description" msgid="4304424287748323094">"Standart ovoz (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
-    <string name="ringtone_silent" msgid="946744257396998305">"Ishlatilmasin"</string>
-    <string name="ringtone_unknown" msgid="1310974715243581582">"Noma’lum rington"</string>
-    <string name="activity_not_available" msgid="8360067109103762211">"Qurilmada buni bajaradigan ilova yo‘q"</string>
-    <string name="outgoing_wps_warning" msgid="7505673114152005234">"WPS-chaqiruv boshlab yuborilsa, hozirgi qo‘ng‘iroq tugatiladi."</string>
-    <string name="dialog_continue" msgid="4070630558441163574">"Davom ettirish"</string>
-    <string name="camera_privacy_text" msgid="4268584469444688293">"Kameraga kirishga ruxsat berildi"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="default_notification_description">Standart ovoz (%1$s)</string>
+  <string name="ringtone_silent">Ishlatilmasin</string>
+  <string name="ringtone_unknown">Noma’lum rington</string>
+  <string name="activity_not_available">Qurilmada buni bajaradigan ilova yo‘q</string>
+  <string name="outgoing_wps_warning">WPS-chaqiruv boshlab yuborilsa, hozirgi qo‘ng‘iroq tugatiladi.</string>
+  <string name="dialog_continue">Davom ettirish</string>
+  <string name="camera_privacy_text">Kameraga kirishga ruxsat berildi</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-vi/strings.xml b/java/com/android/dialer/util/res/values-vi/strings.xml
index 880bb2a..9fd3a6d 100644
--- a/java/com/android/dialer/util/res/values-vi/strings.xml
+++ b/java/com/android/dialer/util/res/values-vi/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="default_notification_description" msgid="4304424287748323094">"Âm thanh mặc định (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
-    <string name="ringtone_silent" msgid="946744257396998305">"Không có"</string>
-    <string name="ringtone_unknown" msgid="1310974715243581582">"Nhạc chuông không xác định"</string>
-    <string name="activity_not_available" msgid="8360067109103762211">"Không có ứng dụng nào cho thao tác đó trên thiết bị này"</string>
-    <string name="outgoing_wps_warning" msgid="7505673114152005234">"Việc thực hiện cuộc gọi WPS sẽ ngắt kết nối cuộc gọi hiện có của bạn."</string>
-    <string name="dialog_continue" msgid="4070630558441163574">"Tiếp tục"</string>
-    <string name="camera_privacy_text" msgid="4268584469444688293">"Đã bật quyền sử dụng máy ảnh"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="default_notification_description">Âm thanh mặc định (%1$s)</string>
+  <string name="ringtone_silent">Không có</string>
+  <string name="ringtone_unknown">Nhạc chuông không xác định</string>
+  <string name="activity_not_available">Không có ứng dụng nào cho thao tác đó trên thiết bị này</string>
+  <string name="outgoing_wps_warning">Việc thực hiện cuộc gọi WPS sẽ ngắt kết nối cuộc gọi hiện có của bạn.</string>
+  <string name="dialog_continue">Tiếp tục</string>
+  <string name="camera_privacy_text">Đã bật quyền sử dụng máy ảnh</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-zh-rCN/strings.xml b/java/com/android/dialer/util/res/values-zh-rCN/strings.xml
index f69981a..c7e38ed 100644
--- a/java/com/android/dialer/util/res/values-zh-rCN/strings.xml
+++ b/java/com/android/dialer/util/res/values-zh-rCN/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="default_notification_description" msgid="4304424287748323094">"默认提示音 (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
-    <string name="ringtone_silent" msgid="946744257396998305">"无"</string>
-    <string name="ringtone_unknown" msgid="1310974715243581582">"未知铃声"</string>
-    <string name="activity_not_available" msgid="8360067109103762211">"此设备上没有可执行此操作的应用"</string>
-    <string name="outgoing_wps_warning" msgid="7505673114152005234">"拨打 WPS 电话会中断现有通话。"</string>
-    <string name="dialog_continue" msgid="4070630558441163574">"继续"</string>
-    <string name="camera_privacy_text" msgid="4268584469444688293">"已启用相机使用权限"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="default_notification_description">默认提示音 (%1$s)</string>
+  <string name="ringtone_silent">无</string>
+  <string name="ringtone_unknown">未知铃声</string>
+  <string name="activity_not_available">此设备上没有可执行此操作的应用</string>
+  <string name="outgoing_wps_warning">拨打 WPS 电话会中断现有通话。</string>
+  <string name="dialog_continue">继续</string>
+  <string name="camera_privacy_text">已启用相机使用权限</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-zh-rHK/strings.xml b/java/com/android/dialer/util/res/values-zh-rHK/strings.xml
index a9564f0..4e1ba52 100644
--- a/java/com/android/dialer/util/res/values-zh-rHK/strings.xml
+++ b/java/com/android/dialer/util/res/values-zh-rHK/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="default_notification_description" msgid="4304424287748323094">"預設音效 (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
-    <string name="ringtone_silent" msgid="946744257396998305">"無"</string>
-    <string name="ringtone_unknown" msgid="1310974715243581582">"不明鈴聲"</string>
-    <string name="activity_not_available" msgid="8360067109103762211">"這部裝置上沒有可用的應用程式"</string>
-    <string name="outgoing_wps_warning" msgid="7505673114152005234">"撥打 WPS 電話會掛斷現有通話。"</string>
-    <string name="dialog_continue" msgid="4070630558441163574">"繼續"</string>
-    <string name="camera_privacy_text" msgid="4268584469444688293">"已啟用相機權限"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="default_notification_description">預設音效 (%1$s)</string>
+  <string name="ringtone_silent">無</string>
+  <string name="ringtone_unknown">不明鈴聲</string>
+  <string name="activity_not_available">這部裝置上沒有可用的應用程式</string>
+  <string name="outgoing_wps_warning">撥打 WPS 電話會掛斷現有通話。</string>
+  <string name="dialog_continue">繼續</string>
+  <string name="camera_privacy_text">已啟用相機權限</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-zh-rTW/strings.xml b/java/com/android/dialer/util/res/values-zh-rTW/strings.xml
index f20779e..5113343 100644
--- a/java/com/android/dialer/util/res/values-zh-rTW/strings.xml
+++ b/java/com/android/dialer/util/res/values-zh-rTW/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="default_notification_description" msgid="4304424287748323094">"預設音效 (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
-    <string name="ringtone_silent" msgid="946744257396998305">"無"</string>
-    <string name="ringtone_unknown" msgid="1310974715243581582">"不明的鈴聲"</string>
-    <string name="activity_not_available" msgid="8360067109103762211">"這個裝置未安裝可執行該操作的應用程式"</string>
-    <string name="outgoing_wps_warning" msgid="7505673114152005234">"撥打 WPS 電話會中斷你正在進行的通話。"</string>
-    <string name="dialog_continue" msgid="4070630558441163574">"繼續"</string>
-    <string name="camera_privacy_text" msgid="4268584469444688293">"已啟用相機權限"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="default_notification_description">預設音效 (%1$s)</string>
+  <string name="ringtone_silent">無</string>
+  <string name="ringtone_unknown">不明的鈴聲</string>
+  <string name="activity_not_available">這個裝置未安裝可執行該操作的應用程式</string>
+  <string name="outgoing_wps_warning">撥打 WPS 電話會中斷你正在進行的通話。</string>
+  <string name="dialog_continue">繼續</string>
+  <string name="camera_privacy_text">已啟用相機權限</string>
 </resources>
diff --git a/java/com/android/dialer/util/res/values-zu/strings.xml b/java/com/android/dialer/util/res/values-zu/strings.xml
index 59a9fd6..204794e 100644
--- a/java/com/android/dialer/util/res/values-zu/strings.xml
+++ b/java/com/android/dialer/util/res/values-zu/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="default_notification_description" msgid="4304424287748323094">"Umsindo ozenzakalelayo (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
-    <string name="ringtone_silent" msgid="946744257396998305">"Lutho"</string>
-    <string name="ringtone_unknown" msgid="1310974715243581582">"Ithoni yokukhala engaziwa"</string>
-    <string name="activity_not_available" msgid="8360067109103762211">"Alukho uhlelo lokusebenza lalokho kule divayisi"</string>
-    <string name="outgoing_wps_warning" msgid="7505673114152005234">"Ukwenza ikholi ye-WPS kuzonqamula ikholi yakho ekhona."</string>
-    <string name="dialog_continue" msgid="4070630558441163574">"Qhubeka"</string>
-    <string name="camera_privacy_text" msgid="4268584469444688293">"Imvume yekhamera inikwe amandla"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="default_notification_description">Umsindo ozenzakalelayo (%1$s)</string>
+  <string name="ringtone_silent">Lutho</string>
+  <string name="ringtone_unknown">Ithoni yokukhala engaziwa</string>
+  <string name="activity_not_available">Alukho uhlelo lokusebenza lalokho kule divayisi</string>
+  <string name="outgoing_wps_warning">Ukwenza ikholi ye-WPS kuzonqamula ikholi yakho ekhona.</string>
+  <string name="dialog_continue">Qhubeka</string>
+  <string name="camera_privacy_text">Imvume yekhamera inikwe amandla</string>
 </resources>
diff --git a/java/com/android/dialer/voicemail/datasources/VoicemailData.java b/java/com/android/dialer/voicemail/datasources/VoicemailData.java
deleted file mode 100644
index c3c1ff5..0000000
--- a/java/com/android/dialer/voicemail/datasources/VoicemailData.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.dialer.voicemail.datasources;
-
-import com.google.auto.value.AutoValue;
-
-/** Dummy voicemail data class to allow us to work on the UI for the new voicemail tab. */
-@AutoValue
-public abstract class VoicemailData {
-  public abstract String name();
-
-  public abstract String location();
-
-  public abstract String date();
-
-  public abstract String duration();
-
-  public abstract String transcription();
-
-  public static Builder builder() {
-    return new AutoValue_VoicemailData.Builder();
-  }
-
-  /** Creates instances of {@link VoicemailData}. */
-  @AutoValue.Builder
-  public abstract static class Builder {
-    public abstract Builder setName(String value);
-
-    public abstract Builder setLocation(String value);
-
-    public abstract Builder setDate(String value);
-
-    public abstract Builder setDuration(String value);
-
-    public abstract Builder setTranscription(String value);
-
-    public abstract VoicemailData build();
-  }
-}
diff --git a/java/com/android/dialer/voicemail/listui/NewVoicemailAdapter.java b/java/com/android/dialer/voicemail/listui/NewVoicemailAdapter.java
index 07a37c3..5b2f061 100644
--- a/java/com/android/dialer/voicemail/listui/NewVoicemailAdapter.java
+++ b/java/com/android/dialer/voicemail/listui/NewVoicemailAdapter.java
@@ -29,6 +29,7 @@
 import android.support.annotation.IntDef;
 import android.support.annotation.Nullable;
 import android.support.annotation.WorkerThread;
+import android.support.design.widget.Snackbar;
 import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.RecyclerView.ViewHolder;
 import android.util.ArrayMap;
@@ -36,14 +37,13 @@
 import android.util.Pair;
 import android.view.LayoutInflater;
 import android.view.View;
+import android.view.View.OnClickListener;
 import android.view.ViewGroup;
 import com.android.dialer.calllogutils.CallLogDates;
 import com.android.dialer.common.Assert;
 import com.android.dialer.common.LogUtil;
-import com.android.dialer.common.concurrent.DialerExecutor.Worker;
 import com.android.dialer.common.concurrent.DialerExecutorComponent;
 import com.android.dialer.common.concurrent.ThreadUtil;
-import com.android.dialer.glidephotomanager.GlidePhotoManager;
 import com.android.dialer.time.Clock;
 import com.android.dialer.voicemail.listui.NewVoicemailViewHolder.NewVoicemailViewHolderListener;
 import com.android.dialer.voicemail.listui.error.VoicemailErrorMessage;
@@ -62,6 +62,8 @@
 final class NewVoicemailAdapter extends RecyclerView.Adapter<ViewHolder>
     implements NewVoicemailViewHolderListener {
 
+  private static final int VOICEMAIL_DELETE_DELAY_MS = 3000;
+
   /** IntDef for the different types of rows that can be shown in the call log. */
   @Retention(RetentionPolicy.SOURCE)
   @IntDef({RowType.HEADER, RowType.VOICEMAIL_ENTRY, RowType.VOICEMAIL_ALERT})
@@ -76,7 +78,6 @@
 
   private Cursor cursor;
   private final Clock clock;
-  private final GlidePhotoManager glidePhotoManager;
 
   /** {@link Integer#MAX_VALUE} when the "Today" header should not be displayed. */
   private int todayHeaderPosition = Integer.MAX_VALUE;
@@ -89,7 +90,7 @@
 
   private final FragmentManager fragmentManager;
   /** A valid id for {@link VoicemailEntry} is greater than 0 */
-  private int currentlyExpandedViewHolderId = -1;
+  private long currentlyExpandedViewHolderId = -1;
 
   private VoicemailErrorMessage voicemailErrorMessage;
 
@@ -111,7 +112,7 @@
    * will always ensure there is only (up-to-date) view holder corresponding to a view holder id,
    * unlike the newVoicemailViewHolderSet.
    */
-  private final ArrayMap<Integer, NewVoicemailViewHolder> newVoicemailViewHolderArrayMap =
+  private final ArrayMap<Long, NewVoicemailViewHolder> newVoicemailViewHolderArrayMap =
       new ArrayMap<>();
 
   // A single instance of a media player re-used across the expanded view holders.
@@ -119,16 +120,11 @@
       new NewVoicemailMediaPlayer(new MediaPlayer());
 
   /** @param cursor whose projection is {@link VoicemailCursorLoader#VOICEMAIL_COLUMNS} */
-  NewVoicemailAdapter(
-      Cursor cursor,
-      Clock clock,
-      FragmentManager fragmentManager,
-      GlidePhotoManager glidePhotoManager) {
+  NewVoicemailAdapter(Cursor cursor, Clock clock, FragmentManager fragmentManager) {
     LogUtil.enterBlock("NewVoicemailAdapter");
     this.cursor = cursor;
     this.clock = clock;
     this.fragmentManager = fragmentManager;
-    this.glidePhotoManager = glidePhotoManager;
     initializeMediaPlayerListeners();
     updateHeaderPositions();
   }
@@ -230,7 +226,7 @@
       case NewVoicemailAdapter.RowType.VOICEMAIL_ENTRY:
         view = inflater.inflate(R.layout.new_voicemail_entry, viewGroup, false);
         NewVoicemailViewHolder newVoicemailViewHolder =
-            new NewVoicemailViewHolder(view, clock, this, glidePhotoManager);
+            new NewVoicemailViewHolder(view, clock, this);
         newVoicemailViewHolderSet.add(newVoicemailViewHolder);
         return newVoicemailViewHolder;
       default:
@@ -437,7 +433,7 @@
 
     if (!newVoicemailViewHolderArrayMap.isEmpty()) {
       String ids = "";
-      for (int id : newVoicemailViewHolderArrayMap.keySet()) {
+      for (long id : newVoicemailViewHolderArrayMap.keySet()) {
         ids = ids + id + " ";
       }
       LogUtil.i("NewVoicemailAdapter.printArrayMap", "ids are " + ids);
@@ -640,37 +636,107 @@
 
     collapseExpandedViewHolder(expandedViewHolder);
 
-    Worker<Pair<Context, Uri>, Void> deleteVoicemail = this::deleteVoicemail;
-
-    DialerExecutorComponent.get(context)
-        .dialerExecutorFactory()
-        .createNonUiTaskBuilder(deleteVoicemail)
-        .build()
-        .executeSerial(new Pair<>(context, voicemailUri));
-
-    notifyItemRemoved(expandedViewHolder.getAdapterPosition());
+    showUndoSnackbar(
+        context,
+        expandedViewHolder.getMediaPlayerView(),
+        expandedViewHolder.getAdapterPosition(),
+        voicemailUri);
   }
 
-  @WorkerThread
-  private Void deleteVoicemail(Pair<Context, Uri> contextUriPair) {
-    Assert.isWorkerThread();
-    LogUtil.enterBlock("NewVoicemailAdapter.deleteVoicemail");
+  private void showUndoSnackbar(
+      Context context, View newVoicemailMediaPlayerView, int position, Uri voicemailUri) {
+    LogUtil.i(
+        "NewVoicemailAdapter.showUndoSnackbar",
+        "position:%d and uri:%s",
+        position,
+        String.valueOf(voicemailUri));
+    Snackbar undoSnackbar =
+        Snackbar.make(
+            newVoicemailMediaPlayerView,
+            R.string.snackbar_voicemail_deleted,
+            VOICEMAIL_DELETE_DELAY_MS);
+    undoSnackbar.addCallback(
+        new Snackbar.Callback() {
+          @Override
+          public void onShown(Snackbar sb) {
+            notifyItemRemoved(position);
+            LogUtil.i(
+                "NewVoicemailAdapter.showUndoSnackbar",
+                "onShown for position:%d and uri:%s",
+                position,
+                voicemailUri);
+            super.onShown(sb);
+          }
 
-    Context context = contextUriPair.first;
-    Uri uri = contextUriPair.second;
-    LogUtil.i("NewVoicemailAdapter.deleteVoicemail", "deleting uri:%s", String.valueOf(uri));
-    ContentValues values = new ContentValues();
-    values.put(Voicemails.DELETED, "1");
+          @Override
+          public void onDismissed(Snackbar transientBottomBar, int event) {
+            LogUtil.i(
+                "NewVoicemailAdapter.showUndoSnackbar",
+                "onDismissed for event:%d, position:%d and uri:%s",
+                event,
+                position,
+                String.valueOf(voicemailUri));
 
-    int numRowsUpdated = context.getContentResolver().update(uri, values, null, null);
+            switch (event) {
+              case DISMISS_EVENT_SWIPE:
+              case DISMISS_EVENT_ACTION:
+              case DISMISS_EVENT_MANUAL:
+                LogUtil.i(
+                    "NewVoicemailAdapter.showUndoSnackbar",
+                    "Not proceeding with deleting the voicemail");
+                deletedVoicemailPosition.remove(position);
+                notifyItemChanged(position);
+                break;
+              case DISMISS_EVENT_TIMEOUT:
+              case DISMISS_EVENT_CONSECUTIVE:
+                LogUtil.i(
+                    "NewVoicemailAdapter.showUndoSnackbar", "Proceeding with deleting voicemail");
 
-    LogUtil.i("NewVoicemailAdapter.onVoicemailDeleted", "return value:%d", numRowsUpdated);
-    Assert.checkArgument(numRowsUpdated == 1, "voicemail delete was not successful");
+                DialerExecutorComponent.get(context)
+                    .dialerExecutorFactory()
+                    .createNonUiTaskBuilder(this::deleteVoicemail)
+                    .build()
+                    .executeSerial(new Pair<>(context, voicemailUri));
+                break;
+              default:
+                Assert.checkArgument(event <= 4 && event >= 0, "unknown event");
+            }
+          }
 
-    Intent intent = new Intent(VoicemailClient.ACTION_UPLOAD);
-    intent.setPackage(context.getPackageName());
-    context.sendBroadcast(intent);
-    return null;
+          @WorkerThread
+          private Void deleteVoicemail(Pair<Context, Uri> contextUriPair) {
+            Assert.isWorkerThread();
+            Context context = contextUriPair.first;
+            Uri uri = contextUriPair.second;
+            LogUtil.i(
+                "NewVoicemailAdapter.deleteVoicemail", "deleting uri:%s", String.valueOf(uri));
+            ContentValues values = new ContentValues();
+            values.put(Voicemails.DELETED, "1");
+
+            int numRowsUpdated = context.getContentResolver().update(uri, values, null, null);
+
+            LogUtil.i("NewVoicemailAdapter.deleteVoicemail", "return value:%d", numRowsUpdated);
+            Assert.checkArgument(numRowsUpdated == 1, "voicemail delete was not successful");
+
+            Intent intent = new Intent(VoicemailClient.ACTION_UPLOAD);
+            intent.setPackage(context.getPackageName());
+            context.sendBroadcast(intent);
+            return null;
+          }
+        });
+
+    undoSnackbar
+        .setAction(
+            R.string.snackbar_undo,
+            new OnClickListener() {
+              @Override
+              public void onClick(View v) {
+                // does nothing, but needed for the undo button to show
+              }
+            })
+        .setActionTextColor(
+            context.getResources().getColor(R.color.dialer_snackbar_action_text_color))
+        .show();
   }
 
   /**
diff --git a/java/com/android/dialer/voicemail/listui/NewVoicemailFragment.java b/java/com/android/dialer/voicemail/listui/NewVoicemailFragment.java
index 3a5e72b..87b0a63 100644
--- a/java/com/android/dialer/voicemail/listui/NewVoicemailFragment.java
+++ b/java/com/android/dialer/voicemail/listui/NewVoicemailFragment.java
@@ -36,7 +36,6 @@
 import com.android.dialer.common.LogUtil;
 import com.android.dialer.common.concurrent.DialerExecutorComponent;
 import com.android.dialer.common.concurrent.UiListener;
-import com.android.dialer.glidephotomanager.GlidePhotoManagerComponent;
 import com.android.dialer.voicemail.listui.error.VoicemailStatus;
 import com.android.dialer.voicemailstatus.VoicemailStatusQuery;
 import com.android.dialer.widget.EmptyContentView;
@@ -184,10 +183,7 @@
       // TODO(uabdullah): Replace getActivity().getFragmentManager() with getChildFragment()
       recyclerView.setAdapter(
           new NewVoicemailAdapter(
-              data,
-              System::currentTimeMillis,
-              getActivity().getFragmentManager(),
-              GlidePhotoManagerComponent.get(getContext()).glidePhotoManager()));
+              data, System::currentTimeMillis, getActivity().getFragmentManager()));
     } else {
       // This would only be called in cases such as when voicemail has been fetched from the server
       // or a changed occurred in the annotated table changed (e.g deletes). To check if the change
@@ -205,17 +201,16 @@
 
   /** Shows the view when there are no voicemails to be displayed * */
   private void showEmptyVoicemailFragmentView() {
-    LogUtil.enterBlock("NewVoicemailFragmentListener.showEmptyVoicemailFragmentView");
+    LogUtil.enterBlock("NewVoicemailFragment.showEmptyVoicemailFragmentView");
 
     showView(emptyContentView);
 
     emptyContentView.setDescription((R.string.empty_voicemail_tab_text));
     emptyContentView.setImage(R.drawable.quantum_ic_voicemail_vd_theme_24);
-    emptyContentView.setImageTint(R.color.empty_voicemail_icon_tint_color, null);
   }
 
   private void showView(View view) {
-    LogUtil.i("NewVoicemailFragmentListener.showView", "Showing view: " + view);
+    LogUtil.i("NewVoicemailFragment.showView", "Showing view: " + view);
     emptyContentView.setVisibility(view == emptyContentView ? View.VISIBLE : View.GONE);
     recyclerView.setVisibility(view == recyclerView ? View.VISIBLE : View.GONE);
   }
@@ -284,7 +279,9 @@
 
                 while (cursor.moveToNext()) {
                   VoicemailStatus status = new VoicemailStatus(context, cursor);
-                  if (status.isActive()) {
+                  if (status.isActive(context)) {
+                    LogUtil.i(
+                        "NewVoicemailFragment.queryVoicemailStatus", "inactive source ignored");
                     statuses.add(status);
                     // TODO(a bug): Handle Service State Listeners
                   }
diff --git a/java/com/android/dialer/voicemail/listui/NewVoicemailMediaPlayerView.java b/java/com/android/dialer/voicemail/listui/NewVoicemailMediaPlayerView.java
index 52f3d0a..f821f4f 100644
--- a/java/com/android/dialer/voicemail/listui/NewVoicemailMediaPlayerView.java
+++ b/java/com/android/dialer/voicemail/listui/NewVoicemailMediaPlayerView.java
@@ -154,11 +154,11 @@
       NewVoicemailViewHolderListener listener) {
 
     Assert.isNotNull(voicemailEntryFromAdapter);
-    Uri uri = Uri.parse(voicemailEntryFromAdapter.voicemailUri());
+    Uri uri = Uri.parse(voicemailEntryFromAdapter.getVoicemailUri());
 
-    numberVoicemailFrom = voicemailEntryFromAdapter.number().getNormalizedNumber();
-    phoneAccountId = voicemailEntryFromAdapter.phoneAccountId();
-    phoneAccountComponentName = voicemailEntryFromAdapter.phoneAccountComponentName();
+    numberVoicemailFrom = voicemailEntryFromAdapter.getNumber().getNormalizedNumber();
+    phoneAccountId = voicemailEntryFromAdapter.getPhoneAccountId();
+    phoneAccountComponentName = voicemailEntryFromAdapter.getPhoneAccountComponentName();
 
     Assert.isNotNull(viewHolder);
     Assert.isNotNull(uri);
diff --git a/java/com/android/dialer/voicemail/listui/NewVoicemailViewHolder.java b/java/com/android/dialer/voicemail/listui/NewVoicemailViewHolder.java
index 5328dd3..ba851eb 100644
--- a/java/com/android/dialer/voicemail/listui/NewVoicemailViewHolder.java
+++ b/java/com/android/dialer/voicemail/listui/NewVoicemailViewHolder.java
@@ -34,20 +34,19 @@
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.ImageView;
-import android.widget.QuickContactBadge;
 import android.widget.TextView;
 import com.android.dialer.calllog.database.contract.AnnotatedCallLogContract.AnnotatedCallLog;
-import com.android.dialer.calllogutils.NumberAttributesConverter;
+import com.android.dialer.calllogutils.PhotoInfoBuilder;
 import com.android.dialer.common.Assert;
 import com.android.dialer.common.LogUtil;
 import com.android.dialer.common.concurrent.DialerExecutor.SuccessListener;
 import com.android.dialer.common.concurrent.DialerExecutor.Worker;
 import com.android.dialer.common.concurrent.DialerExecutorComponent;
 import com.android.dialer.compat.android.provider.VoicemailCompat;
-import com.android.dialer.glidephotomanager.GlidePhotoManager;
 import com.android.dialer.time.Clock;
 import com.android.dialer.voicemail.listui.menu.NewVoicemailMenu;
 import com.android.dialer.voicemail.model.VoicemailEntry;
+import com.android.dialer.widget.ContactPhotoView;
 import com.android.voicemail.VoicemailClient;
 
 /** {@link RecyclerView.ViewHolder} for the new voicemail tab. */
@@ -58,22 +57,18 @@
   private final TextView secondaryTextView;
   private final TextView transcriptionTextView;
   private final TextView transcriptionBrandingTextView;
-  private final QuickContactBadge quickContactBadge;
+  private final ContactPhotoView contactPhotoView;
   private final NewVoicemailMediaPlayerView mediaPlayerView;
   private final ImageView menuButton;
   private final Clock clock;
   private boolean isViewHolderExpanded;
-  private int viewHolderId;
+  private long viewHolderId;
   private VoicemailEntry voicemailEntryOfViewHolder;
   @NonNull private Uri viewHolderVoicemailUri;
   private final NewVoicemailViewHolderListener voicemailViewHolderListener;
-  private final GlidePhotoManager glidePhotoManager;
 
   NewVoicemailViewHolder(
-      View view,
-      Clock clock,
-      NewVoicemailViewHolderListener newVoicemailViewHolderListener,
-      GlidePhotoManager glidePhotoManager) {
+      View view, Clock clock, NewVoicemailViewHolderListener newVoicemailViewHolderListener) {
     super(view);
     LogUtil.enterBlock("NewVoicemailViewHolder");
     this.context = view.getContext();
@@ -81,18 +76,21 @@
     secondaryTextView = view.findViewById(R.id.secondary_text);
     transcriptionTextView = view.findViewById(R.id.transcription_text);
     transcriptionBrandingTextView = view.findViewById(R.id.transcription_branding);
-    quickContactBadge = view.findViewById(R.id.quick_contact_photo);
+    contactPhotoView = view.findViewById(R.id.contact_photo_view);
     mediaPlayerView = view.findViewById(R.id.new_voicemail_media_player);
     menuButton = view.findViewById(R.id.menu_button);
     this.clock = clock;
     voicemailViewHolderListener = newVoicemailViewHolderListener;
-    this.glidePhotoManager = glidePhotoManager;
 
     viewHolderId = -1;
     isViewHolderExpanded = false;
     viewHolderVoicemailUri = null;
   }
 
+  public NewVoicemailMediaPlayerView getMediaPlayerView() {
+    return Assert.isNotNull(mediaPlayerView);
+  }
+
   /**
    * When the {@link RecyclerView} displays voicemail entries, it might recycle the views upon
    * scrolling. In that case we need to ensure that the member variables of this {@link
@@ -112,7 +110,7 @@
       FragmentManager fragmentManager,
       NewVoicemailMediaPlayer mediaPlayer,
       int position,
-      int currentlyExpandedViewHolderId) {
+      long currentlyExpandedViewHolderId) {
 
     LogUtil.i(
         "NewVoicemailViewHolder.bindViewHolderValuesFromAdapter",
@@ -123,16 +121,16 @@
         cursor.getCount());
 
     voicemailEntryOfViewHolder = VoicemailCursorLoader.toVoicemailEntry(cursor);
-    viewHolderId = voicemailEntryOfViewHolder.id();
+    viewHolderId = voicemailEntryOfViewHolder.getId();
     LogUtil.i(
         "NewVoicemailViewHolder.bindViewHolderValuesFromAdapter", "viewholderId:%d", viewHolderId);
-    viewHolderVoicemailUri = Uri.parse(voicemailEntryOfViewHolder.voicemailUri());
+    viewHolderVoicemailUri = Uri.parse(voicemailEntryOfViewHolder.getVoicemailUri());
     primaryTextView.setText(
         VoicemailEntryText.buildPrimaryVoicemailText(context, voicemailEntryOfViewHolder));
     secondaryTextView.setText(
         VoicemailEntryText.buildSecondaryVoicemailText(context, clock, voicemailEntryOfViewHolder));
 
-    String voicemailTranscription = voicemailEntryOfViewHolder.transcription();
+    String voicemailTranscription = voicemailEntryOfViewHolder.getTranscription();
 
     if (TextUtils.isEmpty(voicemailTranscription)) {
       transcriptionTextView.setVisibility(GONE);
@@ -147,10 +145,10 @@
 
     itemView.setOnClickListener(this);
     menuButton.setOnClickListener(
-        NewVoicemailMenu.createOnClickListener(
-            context, voicemailEntryOfViewHolder, glidePhotoManager));
+        NewVoicemailMenu.createOnClickListener(context, voicemailEntryOfViewHolder));
 
-    setPhoto(voicemailEntryOfViewHolder);
+    contactPhotoView.setPhoto(
+        PhotoInfoBuilder.fromVoicemailEntry(voicemailEntryOfViewHolder).build());
 
     // Update the expanded/collapsed state of this view holder
     // Only update the binding of the mediaPlayerView of the expanded view holder
@@ -199,24 +197,16 @@
     LogUtil.v(
         "NewVoicemailViewHolder.boldViewHolderIfUnread",
         "id:%d, isRead:%d",
-        voicemailEntryOfViewHolder.id(),
-        voicemailEntryOfViewHolder.isRead());
+        voicemailEntryOfViewHolder.getId(),
+        voicemailEntryOfViewHolder.getIsRead());
 
-    if (voicemailEntryOfViewHolder.isRead() == 0) {
+    if (voicemailEntryOfViewHolder.getIsRead() == 0) {
       primaryTextView.setTypeface(Typeface.DEFAULT, Typeface.BOLD);
       secondaryTextView.setTypeface(Typeface.DEFAULT, Typeface.BOLD);
       transcriptionTextView.setTypeface(Typeface.DEFAULT, Typeface.BOLD);
     }
   }
 
-  private void setPhoto(VoicemailEntry voicemailEntry) {
-    glidePhotoManager.loadQuickContactBadge(
-        quickContactBadge,
-        NumberAttributesConverter.toPhotoInfoBuilder(voicemailEntry.numberAttributes())
-            .setFormattedNumber(voicemailEntry.formattedNumber())
-            .build());
-  }
-
   void collapseViewHolder() {
     LogUtil.i(
         "NewVoicemailViewHolder.collapseViewHolder",
@@ -286,9 +276,9 @@
 
     Assert.isNotNull(voicemailViewHolderListener);
     Assert.checkArgument(
-        voicemailEntry.id() == viewHolderId, "ensure that the adapter binding has taken place");
+        voicemailEntry.getId() == viewHolderId, "ensure that the adapter binding has taken place");
     Assert.checkArgument(
-        Uri.parse(voicemailEntry.voicemailUri()).equals(viewHolderVoicemailUri),
+        Uri.parse(voicemailEntry.getVoicemailUri()).equals(viewHolderVoicemailUri),
         "ensure that the adapter binding has taken place");
     LogUtil.i(
         "NewVoicemailViewHolder.expandAndBindViewHolderAndMediaPlayerViewWithAdapterValues",
@@ -298,15 +288,15 @@
         isViewHolderExpanded,
         String.valueOf(viewHolderVoicemailUri),
         String.valueOf(mediaPlayerView.getVoicemailUri()),
-        voicemailEntry.isRead());
+        voicemailEntry.getIsRead());
 
-    if (voicemailEntry.isRead() == 0) {
+    if (voicemailEntry.getIsRead() == 0) {
       // update as read.
       primaryTextView.setTypeface(Typeface.DEFAULT, Typeface.NORMAL);
       secondaryTextView.setTypeface(Typeface.DEFAULT, Typeface.NORMAL);
       transcriptionTextView.setTypeface(Typeface.DEFAULT, Typeface.NORMAL);
 
-      Uri uri = Uri.parse(voicemailEntry.voicemailUri());
+      Uri uri = Uri.parse(voicemailEntry.getVoicemailUri());
 
       Worker<Pair<Context, Uri>, Integer> markVoicemailRead = this::markVoicemailAsRead;
       SuccessListener<Integer> markedAsReadVoicemailCallBack = this::onVoicemailMarkedAsRead;
@@ -337,8 +327,8 @@
   }
 
   private void updateBrandingText(VoicemailEntry voicemailEntry) {
-    if (voicemailEntry.transcriptionState() == VoicemailCompat.TRANSCRIPTION_AVAILABLE
-        && !TextUtils.isEmpty(voicemailEntry.transcription())) {
+    if (voicemailEntry.getTranscriptionState() == VoicemailCompat.TRANSCRIPTION_AVAILABLE
+        && !TextUtils.isEmpty(voicemailEntry.getTranscription())) {
       transcriptionBrandingTextView.setVisibility(VISIBLE);
     } else {
       transcriptionBrandingTextView.setVisibility(GONE);
@@ -428,7 +418,7 @@
     return isViewHolderExpanded;
   }
 
-  public int getViewHolderId() {
+  public long getViewHolderId() {
     return viewHolderId;
   }
 
diff --git a/java/com/android/dialer/voicemail/listui/VoicemailCursorLoader.java b/java/com/android/dialer/voicemail/listui/VoicemailCursorLoader.java
index 5f717cf..f242484 100644
--- a/java/com/android/dialer/voicemail/listui/VoicemailCursorLoader.java
+++ b/java/com/android/dialer/voicemail/listui/VoicemailCursorLoader.java
@@ -20,6 +20,7 @@
 import android.database.Cursor;
 import android.provider.CallLog.Calls;
 import android.support.v4.content.CursorLoader;
+import android.text.TextUtils;
 import com.android.dialer.DialerPhoneNumber;
 import com.android.dialer.NumberAttributes;
 import com.android.dialer.calllog.database.contract.AnnotatedCallLogContract.AnnotatedCallLog;
@@ -99,22 +100,48 @@
         "CP2 info incomplete for number: %s",
         LogUtil.sanitizePii(number.getNormalizedNumber()));
 
-    return VoicemailEntry.builder()
-        .setId(cursor.getInt(ID))
-        .setTimestamp(cursor.getLong(TIMESTAMP))
-        .setNumber(number)
-        .setFormattedNumber(cursor.getString(FORMATTED_NUMBER))
-        .setDuration(cursor.getLong(DURATION))
-        .setTranscription(cursor.getString(TRANSCRIPTION))
-        .setVoicemailUri(cursor.getString(VOICEMAIL_URI))
-        .setGeocodedLocation(cursor.getString(GEOCODED_LOCATION))
-        .setCallType(cursor.getInt(CALL_TYPE))
-        .setIsRead(cursor.getInt(IS_READ))
-        .setNumberAttributes(numberAttributes)
-        .setTranscriptionState(cursor.getInt(TRANSCRIPTION_STATE))
-        .setPhoneAccountComponentName(cursor.getString(PHONE_ACCOUNT_COMPONENT_NAME))
-        .setPhoneAccountId(cursor.getString(PHONE_ACCOUNT_ID))
-        .build();
+    VoicemailEntry.Builder voicemailEntryBuilder =
+        VoicemailEntry.newBuilder()
+            .setId(cursor.getInt(ID))
+            .setTimestamp(cursor.getLong(TIMESTAMP))
+            .setNumber(number)
+            .setDuration(cursor.getLong(DURATION))
+            .setCallType(cursor.getInt(CALL_TYPE))
+            .setIsRead(cursor.getInt(IS_READ))
+            .setNumberAttributes(numberAttributes)
+            .setTranscriptionState(cursor.getInt(TRANSCRIPTION_STATE));
+
+    String formattedNumber = cursor.getString(FORMATTED_NUMBER);
+    if (!TextUtils.isEmpty(formattedNumber)) {
+      voicemailEntryBuilder.setFormattedNumber(formattedNumber);
+    }
+
+    String geocodedLocation = cursor.getString(GEOCODED_LOCATION);
+    if (!TextUtils.isEmpty(geocodedLocation)) {
+      voicemailEntryBuilder.setGeocodedLocation(geocodedLocation);
+    }
+
+    String transcription = cursor.getString(TRANSCRIPTION);
+    if (!TextUtils.isEmpty(transcription)) {
+      voicemailEntryBuilder.setTranscription(transcription);
+    }
+
+    String voicemailUri = cursor.getString(VOICEMAIL_URI);
+    if (!TextUtils.isEmpty(voicemailUri)) {
+      voicemailEntryBuilder.setVoicemailUri(voicemailUri);
+    }
+
+    String phoneAccountComponentName = cursor.getString(PHONE_ACCOUNT_COMPONENT_NAME);
+    if (!TextUtils.isEmpty(phoneAccountComponentName)) {
+      voicemailEntryBuilder.setPhoneAccountComponentName(phoneAccountComponentName);
+    }
+
+    String phoneAccountId = cursor.getString(PHONE_ACCOUNT_ID);
+    if (!TextUtils.isEmpty(phoneAccountId)) {
+      voicemailEntryBuilder.setPhoneAccountId(phoneAccountId);
+    }
+
+    return voicemailEntryBuilder.build();
   }
 
   static long getTimestamp(Cursor cursor) {
diff --git a/java/com/android/dialer/voicemail/listui/VoicemailEntryText.java b/java/com/android/dialer/voicemail/listui/VoicemailEntryText.java
index 4aaf2d1..dd53dff 100644
--- a/java/com/android/dialer/voicemail/listui/VoicemailEntryText.java
+++ b/java/com/android/dialer/voicemail/listui/VoicemailEntryText.java
@@ -33,10 +33,10 @@
 
   public static String buildPrimaryVoicemailText(Context context, VoicemailEntry data) {
     StringBuilder primaryText = new StringBuilder();
-    if (!TextUtils.isEmpty(data.numberAttributes().getName())) {
-      primaryText.append(data.numberAttributes().getName());
-    } else if (!TextUtils.isEmpty(data.formattedNumber())) {
-      primaryText.append(data.formattedNumber());
+    if (!TextUtils.isEmpty(data.getNumberAttributes().getName())) {
+      primaryText.append(data.getNumberAttributes().getName());
+    } else if (!TextUtils.isEmpty(data.getFormattedNumber())) {
+      primaryText.append(data.getFormattedNumber());
     } else {
       // TODO(uabdullah): Handle CallLog.Calls.PRESENTATION_*, including Verizon restricted numbers.
       primaryText.append(context.getText(R.string.voicemail_entry_unknown));
@@ -71,7 +71,7 @@
   private static String secondaryTextPrefix(
       Context context, Clock clock, VoicemailEntry voicemailEntry) {
     StringBuilder secondaryText = new StringBuilder();
-    String location = voicemailEntry.geocodedLocation();
+    String location = voicemailEntry.getGeocodedLocation();
     if (!TextUtils.isEmpty(location)) {
       secondaryText.append(location);
     }
@@ -80,9 +80,12 @@
     }
     secondaryText.append(
         CallLogDates.newCallLogTimestampLabel(
-            context, clock.currentTimeMillis(), voicemailEntry.timestamp()));
+            context,
+            clock.currentTimeMillis(),
+            voicemailEntry.getTimestamp(),
+            /* abbreviateDateTime = */ true));
 
-    long duration = voicemailEntry.duration();
+    long duration = voicemailEntry.getDuration();
     if (duration >= 0) {
       secondaryText.append(" • ");
       String formattedDuration = getVoicemailDuration(context, voicemailEntry);
@@ -92,15 +95,17 @@
   }
 
   static String getVoicemailDuration(Context context, VoicemailEntry voicemailEntry) {
-    long minutes = TimeUnit.SECONDS.toMinutes(voicemailEntry.duration());
-    long seconds = voicemailEntry.duration() - TimeUnit.MINUTES.toSeconds(minutes);
+    long minutes = TimeUnit.SECONDS.toMinutes(voicemailEntry.getDuration());
+    long seconds = voicemailEntry.getDuration() - TimeUnit.MINUTES.toSeconds(minutes);
 
     // The format for duration is "MM:SS" and we never expect the duration to be > 5 minutes
     // However an incorrect duration could be set by the framework/someone to be >99, and in that
     // case cap it at 99, for the UI to still be able to display it in "MM:SS" format.
     if (minutes > 99) {
       LogUtil.w(
-          "VoicemailEntryText.getVoicemailDuration", "Duration was %d", voicemailEntry.duration());
+          "VoicemailEntryText.getVoicemailDuration",
+          "Duration was %d",
+          voicemailEntry.getDuration());
       minutes = 99;
     }
     return context.getString(R.string.voicemailDurationFormat, minutes, seconds);
diff --git a/java/com/android/dialer/voicemail/listui/error/VoicemailStatus.java b/java/com/android/dialer/voicemail/listui/error/VoicemailStatus.java
index 9b7b7fd..ebda0e6 100644
--- a/java/com/android/dialer/voicemail/listui/error/VoicemailStatus.java
+++ b/java/com/android/dialer/voicemail/listui/error/VoicemailStatus.java
@@ -34,6 +34,8 @@
 import android.text.TextUtils;
 import com.android.dialer.common.LogUtil;
 import com.android.dialer.voicemailstatus.VoicemailStatusQuery;
+import com.android.voicemail.VoicemailClient;
+import com.android.voicemail.VoicemailComponent;
 
 /** Structured data from {@link android.provider.VoicemailContract.Status} */
 public class VoicemailStatus {
@@ -107,16 +109,10 @@
     }
     isAirplaneMode =
         Settings.System.getInt(context.getContentResolver(), Global.AIRPLANE_MODE_ON, 0) != 0;
-
-    if (VERSION.SDK_INT >= VERSION_CODES.N) {
-      quotaOccupied =
-          getInt(statusCursor, VoicemailStatusQuery.QUOTA_OCCUPIED_INDEX, Status.QUOTA_UNAVAILABLE);
-      quotaTotal =
-          getInt(statusCursor, VoicemailStatusQuery.QUOTA_TOTAL_INDEX, Status.QUOTA_UNAVAILABLE);
-    } else {
-      quotaOccupied = Status.QUOTA_UNAVAILABLE;
-      quotaTotal = Status.QUOTA_UNAVAILABLE;
-    }
+    quotaOccupied =
+        getInt(statusCursor, VoicemailStatusQuery.QUOTA_OCCUPIED_INDEX, Status.QUOTA_UNAVAILABLE);
+    quotaTotal =
+        getInt(statusCursor, VoicemailStatusQuery.QUOTA_TOTAL_INDEX, Status.QUOTA_UNAVAILABLE);
   }
 
   private VoicemailStatus(Builder builder) {
@@ -238,7 +234,22 @@
     }
   }
 
-  public boolean isActive() {
+  public boolean isActive(Context context) {
+    VoicemailClient voicemailClient = VoicemailComponent.get(context).getVoicemailClient();
+    if (context.getPackageName().equals(sourcePackage)) {
+      if (!voicemailClient.isVoicemailModuleEnabled()) {
+        LogUtil.i("VoicemailStatus.isActive", "module disabled");
+        return false;
+      }
+      if (!voicemailClient.hasCarrierSupport(context, getPhoneAccountHandle())) {
+        LogUtil.i("VoicemailStatus.isActive", "carrier not supported");
+        return false;
+      }
+      if (!voicemailClient.isVoicemailEnabled(context, getPhoneAccountHandle())) {
+        LogUtil.i("VoicemailStatus.isActive", "VVM disabled");
+        return false;
+      }
+    }
     switch (configurationState) {
       case Status.CONFIGURATION_STATE_NOT_CONFIGURED:
       case Status.CONFIGURATION_STATE_DISABLED:
diff --git a/java/com/android/dialer/voicemail/listui/error/VoicemailStatusCorruptionHandler.java b/java/com/android/dialer/voicemail/listui/error/VoicemailStatusCorruptionHandler.java
index 630a17d..75b21e7 100644
--- a/java/com/android/dialer/voicemail/listui/error/VoicemailStatusCorruptionHandler.java
+++ b/java/com/android/dialer/voicemail/listui/error/VoicemailStatusCorruptionHandler.java
@@ -27,7 +27,7 @@
 import com.android.dialer.common.Assert;
 import com.android.dialer.common.LogUtil;
 import com.android.dialer.compat.telephony.TelephonyManagerCompat;
-import com.android.dialer.configprovider.ConfigProviderBindings;
+import com.android.dialer.configprovider.ConfigProviderComponent;
 import com.android.dialer.logging.DialerImpression;
 import com.android.dialer.logging.Logger;
 
@@ -47,7 +47,9 @@
 
   public static void maybeFixVoicemailStatus(Context context, Cursor statusCursor, Source source) {
 
-    if (ConfigProviderBindings.get(context).getBoolean(CONFIG_VVM_STATUS_FIX_DISABLED, false)) {
+    if (ConfigProviderComponent.get(context)
+        .getConfigProvider()
+        .getBoolean(CONFIG_VVM_STATUS_FIX_DISABLED, false)) {
       return;
     }
 
diff --git a/java/com/android/dialer/voicemail/listui/error/VoicemailStatusWorker.java b/java/com/android/dialer/voicemail/listui/error/VoicemailStatusWorker.java
index df58d41..08fef8e 100644
--- a/java/com/android/dialer/voicemail/listui/error/VoicemailStatusWorker.java
+++ b/java/com/android/dialer/voicemail/listui/error/VoicemailStatusWorker.java
@@ -16,10 +16,8 @@
 
 package com.android.dialer.voicemail.listui.error;
 
-import android.annotation.TargetApi;
 import android.content.Context;
 import android.database.Cursor;
-import android.os.Build.VERSION_CODES;
 import android.provider.VoicemailContract.Status;
 import android.support.annotation.Nullable;
 import com.android.dialer.common.concurrent.DialerExecutor.Worker;
@@ -32,7 +30,6 @@
 /**
  * Worker for {@link com.android.dialer.common.concurrent.DialerExecutors} to fetch voicemail status
  */
-@TargetApi(VERSION_CODES.M)
 public class VoicemailStatusWorker implements Worker<Context, List<VoicemailStatus>> {
 
   @Nullable
diff --git a/java/com/android/dialer/voicemail/listui/error/VoicemailTosMessageCreator.java b/java/com/android/dialer/voicemail/listui/error/VoicemailTosMessageCreator.java
index ec1a95a..efc094c 100644
--- a/java/com/android/dialer/voicemail/listui/error/VoicemailTosMessageCreator.java
+++ b/java/com/android/dialer/voicemail/listui/error/VoicemailTosMessageCreator.java
@@ -22,8 +22,6 @@
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
-import android.net.Uri;
-import android.os.Build;
 import android.preference.PreferenceManager;
 import android.support.annotation.Nullable;
 import android.telecom.PhoneAccountHandle;
@@ -39,12 +37,10 @@
 import android.view.View.OnClickListener;
 import com.android.dialer.common.LogUtil;
 import com.android.dialer.compat.telephony.TelephonyManagerCompat;
-import com.android.dialer.configprovider.ConfigProviderBindings;
-import com.android.dialer.constants.Constants;
+import com.android.dialer.configprovider.ConfigProviderComponent;
 import com.android.dialer.logging.DialerImpression;
 import com.android.dialer.logging.Logger;
 import com.android.dialer.voicemail.listui.error.VoicemailErrorMessage.Action;
-import com.android.dialer.voicemail.settings.VoicemailSettingsFragment;
 import com.android.voicemail.VisualVoicemailTypeExtensions;
 import com.android.voicemail.VoicemailClient;
 import com.android.voicemail.VoicemailComponent;
@@ -112,6 +108,12 @@
                   @Override
                   public void onClick(View v) {
                     LogUtil.i("VoicemailTosMessageCreator.getTosMessage", "accept clicked");
+                    if (isVoicemailTranscriptionAvailable()) {
+                      VoicemailComponent.get(context)
+                          .getVoicemailClient()
+                          .setVoicemailTranscriptionEnabled(
+                              context, status.getPhoneAccountHandle(), true);
+                    }
                     recordTosAcceptance();
                     // Accepting the TOS also acknowledges the latest features
                     recordFeatureAcknowledgement();
@@ -129,19 +131,29 @@
             getExistingUserTosTitle(),
             getExistingUserTosMessageText(),
             new Action(
-                context.getString(R.string.dialer_terms_and_conditions_existing_user_setings),
+                context.getString(R.string.dialer_terms_and_conditions_existing_user_decline),
                 new OnClickListener() {
                   @Override
                   public void onClick(View v) {
-                    LogUtil.i("VoicemailTosMessageCreator.getPromoMessage", "open settings");
-                    Intent intent =
-                        new Intent(Intent.ACTION_VIEW)
-                            .setComponent(
-                                new ComponentName(context, Constants.get().getSettingsActivity()))
-                            .setData(
-                                Uri.fromParts(
-                                    "header", VoicemailSettingsFragment.class.getName(), null));
-                    context.startActivity(intent);
+                    LogUtil.i(
+                        "VoicemailTosMessageCreator.getPromoMessage", "declined transcription");
+                    if (isVoicemailTranscriptionAvailable()) {
+                      VoicemailClient voicemailClient =
+                          VoicemailComponent.get(context).getVoicemailClient();
+                      voicemailClient.setVoicemailTranscriptionEnabled(
+                          context, status.getPhoneAccountHandle(), false);
+                      // Feature acknowledgement also means accepting TOS, otherwise after removing
+                      // the feature ToS, we'll end up showing the ToS
+                      // TODO(uabdullah): Consider separating the ToS acceptance and feature
+                      // acknowledgment.
+                      recordTosAcceptance();
+                      recordFeatureAcknowledgement();
+                      statusReader.refresh();
+                    } else {
+                      LogUtil.e(
+                          "VoicemailTosMessageCreator.getPromoMessage",
+                          "voicemail transcription not available");
+                    }
                   }
                 }),
             new Action(
@@ -150,6 +162,12 @@
                   @Override
                   public void onClick(View v) {
                     LogUtil.i("VoicemailTosMessageCreator.getPromoMessage", "acknowledge clicked");
+                    if (isVoicemailTranscriptionAvailable()) {
+                      VoicemailComponent.get(context)
+                          .getVoicemailClient()
+                          .setVoicemailTranscriptionEnabled(
+                              context, status.getPhoneAccountHandle(), true);
+                    }
                     // Feature acknowledgement also means accepting TOS
                     recordTosAcceptance();
                     recordFeatureAcknowledgement();
@@ -228,9 +246,9 @@
   }
 
   private boolean isVoicemailTranscriptionAvailable() {
-    return Build.VERSION.SDK_INT >= Build.VERSION_CODES.O
-        && ConfigProviderBindings.get(context)
-            .getBoolean("voicemail_transcription_available", false);
+    return VoicemailComponent.get(context)
+        .getVoicemailClient()
+        .isVoicemailTranscriptionAvailable(context, status.getPhoneAccountHandle());
   }
 
   private void showDeclineTosDialog(final PhoneAccountHandle handle) {
@@ -534,7 +552,8 @@
   }
 
   private String getLearnMoreUrl() {
-    return ConfigProviderBindings.get(context)
+    return ConfigProviderComponent.get(context)
+        .getConfigProvider()
         .getString(
             "voicemail_transcription_learn_more_url",
             context.getString(R.string.dialer_terms_and_conditions_learn_more_url));
diff --git a/java/com/android/dialer/voicemail/listui/error/res/layout/voicemail_error_message_fragment.xml b/java/com/android/dialer/voicemail/listui/error/res/layout/voicemail_error_message_fragment.xml
index 4bea8b1..dab2f21 100644
--- a/java/com/android/dialer/voicemail/listui/error/res/layout/voicemail_error_message_fragment.xml
+++ b/java/com/android/dialer/voicemail/listui/error/res/layout/voicemail_error_message_fragment.xml
@@ -41,6 +41,7 @@
           android:layout_width="@dimen/voicemail_promo_card_icon_size"
           android:layout_height="@dimen/voicemail_promo_card_icon_size"
           android:layout_gravity="top"
+          android:importantForAccessibility="no"
           android:src="@drawable/ic_voicemail_error_24px"/>
 
       <LinearLayout
@@ -52,21 +53,18 @@
 
         <TextView
             android:id="@+id/error_card_header"
-            android:textStyle="bold"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginBottom="@dimen/voicemail_promo_card_title_padding"
             android:layout_gravity="center_vertical"
-            android:singleLine="false"
-            android:textSize="@dimen/voicemail_promo_card_title_text_size"/>
+            style="@style/Dialer.TextAppearance.Header2"/>
 
         <TextView
             android:id="@+id/error_card_details"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:lineSpacingExtra="@dimen/voicemail_promo_card_line_spacing"
-            android:singleLine="false"
-            android:textSize="@dimen/voicemail_promo_card_message_size"/>
+            style="@style/Dialer.TextAppearance.Secondary"/>
       </LinearLayout>
     </LinearLayout>
 
@@ -82,10 +80,10 @@
       <TextView
           android:id="@+id/secondary_action_raised"
           style="@style/RaisedErrorActionStyle"
-          android:paddingEnd="@dimen/alert_action_between_padding"
           android:layout_marginEnd="8dp"
-          android:nextFocusForward="@+id/secondary_action"
-          android:clickable="true"/>
+          android:paddingEnd="@dimen/alert_action_between_padding"
+          android:clickable="true"
+          android:nextFocusForward="@+id/secondary_action"/>
 
       <TextView
           android:id="@+id/secondary_action"
@@ -103,9 +101,8 @@
       <TextView
           android:id="@+id/primary_action_raised"
           style="@style/RaisedErrorActionStyle"
-          android:nextFocusForward="@+id/promo_card"
           android:clickable="true"
-          />
+          android:nextFocusForward="@+id/promo_card"/>
 
     </LinearLayout>
   </LinearLayout>
diff --git a/java/com/android/dialer/voicemail/listui/error/res/layout/voicemail_tos_fragment.xml b/java/com/android/dialer/voicemail/listui/error/res/layout/voicemail_tos_fragment.xml
index 4e143a5..17a1f74 100644
--- a/java/com/android/dialer/voicemail/listui/error/res/layout/voicemail_tos_fragment.xml
+++ b/java/com/android/dialer/voicemail/listui/error/res/layout/voicemail_tos_fragment.xml
@@ -71,8 +71,8 @@
     android:minHeight="56dp"
     android:paddingStart="16dp"
     android:paddingEnd="16dp"
-    android:paddingTop="10dp"
-    android:paddingBottom="10dp"
+    android:paddingTop="4dp"
+    android:paddingBottom="4dp"
     android:background="#ffffffff"
     android:orientation="horizontal">
     <TextView
diff --git a/java/com/android/dialer/voicemail/listui/error/res/values-af/strings.xml b/java/com/android/dialer/voicemail/listui/error/res/values-af/strings.xml
new file mode 100644
index 0000000..bf62b1e
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/error/res/values-af/strings.xml
@@ -0,0 +1,102 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_error_activating_title">Aktiveer tans visuele stemboodskapdiens</string>
+  <string name="voicemail_error_activating_message">Jy sal dalk nie stemboodskapkennisgewings ontvang totdat visuele stemboodskapdiens heeltemal geaktiveer is nie. Bel stemboodskapdiens om nuwe boodskappe te kry totdat stemboodskapdiens volledig geaktiveer is.</string>
+  <string name="voicemail_error_not_activate_no_signal_title">Kan nie visuele stemboodskapdiens aktiveer nie</string>
+  <string name="voicemail_error_not_activate_no_signal_message">Maak seker jou foon het ’n mobiele netwerkverbinding en probeer weer.</string>
+  <string name="voicemail_error_not_activate_no_signal_airplane_mode_message">Skakel vliegtuigmodus af en probeer weer.</string>
+  <string name="voicemail_error_no_signal_title">Geen verbinding nie</string>
+  <string name="voicemail_error_no_signal_message">Jy sal nie van nuwe stemboodskappe in kennis gestel word nie. As jy op Wi-Fi is, kan jy jou stemboodskapdiens nagaan deur nou te sinkroniseer.</string>
+  <string name="voicemail_error_no_signal_airplane_mode_message">Jy sal nie van nuwe stemboodskappe in kennis gestel word nie. Skakel vliegtuigmodus af om jou stemboodskapdiens te sinkroniseer.</string>
+  <string name="voicemail_error_no_signal_cellular_required_message">Jou foon benodig \'n mobiele dataverbinding om stemboodskapdiens na te gaan.</string>
+  <string name="voicemail_error_activation_failed_title">Kan nie visuele stemboodskapdiens aktiveer nie</string>
+  <string name="voicemail_error_activation_failed_message">Jy kan steeds bel om stemboodskapdiens na te gaan.</string>
+  <string name="voicemail_error_no_data_title">Kan nie visuele stemboodskapdiens opdateer nie</string>
+  <string name="voicemail_error_no_data_message">Probeer weer wanneer jou Wi-Fi- of mobiele dataverbinding beter is. Jy kan steeds bel om stemboodskapdiens na te gaan.</string>
+  <string name="voicemail_error_no_data_cellular_required_message">Probeer weer wanneer jou mobiele dataverbinding beter is. Jy kan steeds bel om stemboodskapdiens na te gaan.</string>
+  <string name="voicemail_error_bad_config_title">Kan nie visuele stemboodskapdiens opdateer nie</string>
+  <string name="voicemail_error_bad_config_message">Jy kan steeds bel om stemboodskapdiens na te gaan.</string>
+  <string name="voicemail_error_communication_title">Kan nie visuele stemboodskapdiens opdateer nie</string>
+  <string name="voicemail_error_communication_message">Jy kan steeds bel om stemboodskapdiens na te gaan.</string>
+  <string name="voicemail_error_server_connection_title">Kan nie visuele stemboodskapdiens opdateer nie</string>
+  <string name="voicemail_error_server_connection_message">Jy kan steeds bel om stemboodskapdiens na te gaan.</string>
+  <string name="voicemail_error_server_title">Kan nie visuele stemboodskapdiens opdateer nie</string>
+  <string name="voicemail_error_server_message">Jy kan steeds bel om stemboodskapdiens na te gaan.</string>
+  <string name="voicemail_error_inbox_near_full_title">Inkassie is byna vol</string>
+  <string name="voicemail_error_inbox_near_full_message">Jy sal nie nuwe stemboodskappe kan ontvang as jou inkassie vol is nie.</string>
+  <string name="voicemail_error_inbox_full_title">Kan nie nuwe stemboodskappe ontvang nie</string>
+  <string name="voicemail_error_inbox_full_message">Jou inkassie is vol. Probeer \'n paar boodskappe uitvee om nuwe stemboodskappe te ontvang.</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_title">Skakel ekstra berging en rugsteun aan</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_message">Jou posbus is vol. Om spasie beskikbaar te maak, skakel ekstra berging aan sodat Google jou stemboodskappe kan bestuur en rugsteun.</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_title">Skakel ekstra berging en rugsteun aan</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_message">Jou posbus is amper vol. Om spasie beskikbaar te maak, skakel ekstra berging aan sodat Google jou stemboodskappe kan bestuur en rugsteun.</string>
+  <string name="voicemail_error_pin_not_set_title">Stel jou stemboodskap-PIN</string>
+  <string name="voicemail_error_pin_not_set_message">Jy sal \'n stemboodskap-PIN nodig hê wanneer jy ook al na jou stemboodskapdiens toe bel.</string>
+  <string name="voicemail_action_turn_off_airplane_mode">Vliegtuigmodusinstellings</string>
+  <string name="voicemail_action_set_pin">Stel PIN</string>
+  <string name="voicemail_action_retry">Probeer weer</string>
+  <string name="voicemail_action_turn_archive_on">Skakel aan</string>
+  <string name="voicemail_action_dimiss">Nee, dankie</string>
+  <string name="voicemail_action_sync">Sinkroniseer</string>
+  <string name="voicemail_action_call_voicemail">Bel stemboodskapdiens</string>
+  <string name="voicemail_action_call_customer_support">Bel Kliëntediens</string>
+  <string name="vvm3_error_vms_dns_failure_title">Iets het verkeerd geloop</string>
+  <string name="vvm3_error_vms_dns_failure_message">Jammer, ons het \'n probleem teëgekom. Probeer asseblief later weer. As daar steeds \'n probleem is, kontak asseblief Kliëntediens by %1$s en gee vir hulle die foutkode 9001.</string>
+  <string name="vvm3_error_vmg_dns_failure_title">Iets het verkeerd geloop</string>
+  <string name="vvm3_error_vmg_dns_failure_message">Jammer, ons het \'n probleem teëgekom. Probeer asseblief later weer. As daar steeds \'n probleem is, kontak asseblief Kliëntediens by %1$s en gee vir hulle die foutkode 9002.</string>
+  <string name="vvm3_error_spg_dns_failure_title">Iets het verkeerd geloop</string>
+  <string name="vvm3_error_spg_dns_failure_message">Jammer, ons het \'n probleem teëgekom. Probeer asseblief later weer. As daar steeds \'n probleem is, kontak asseblief Kliëntediens by %1$s en gee vir hulle die foutkode 9003.</string>
+  <string name="vvm3_error_vms_no_cellular_title">Kan nie aan jou stemboodskapdiens koppel nie</string>
+  <string name="vvm3_error_vms_no_cellular_message">Jammer, ons sukkel om aan jou stemboodskapdiens te koppel. As jy in \'n gebied met swak sein is, wag totdat jy \'n sterk sein het en probeer weer. As daar steeds \'n probleem is, kontak asseblief Kliëntediens by %1$s en gee vir hulle die foutkode 9004.</string>
+  <string name="vvm3_error_vmg_no_cellular_title">Kan nie aan jou stemboodskapdiens koppel nie</string>
+  <string name="vvm3_error_vmg_no_cellular_message">Jammer, ons sukkel om aan jou stemboodskapdiens te koppel. As jy in \'n gebied met swak sein is, wag totdat jy \'n sterk sein het en probeer weer. As daar steeds \'n probleem is, kontak asseblief Kliëntediens by %1$s en gee vir hulle die foutkode 9005.</string>
+  <string name="vvm3_error_spg_no_cellular_title">Kan nie aan jou stemboodskapdiens koppel nie</string>
+  <string name="vvm3_error_spg_no_cellular_message">Jammer, ons sukkel om aan jou stemboodskapdiens te koppel. As jy in \'n gebied met swak sein is, wag totdat jy \'n sterk sein het en probeer weer. As daar steeds\' n probleem is, kontak asseblief Kliëntediens by %1$sen gee vir hulle die foutkode 9006.</string>
+  <string name="vvm3_error_vms_timeout_title">Iets het verkeerd geloop</string>
+  <string name="vvm3_error_vms_timeout_message">Jammer, ons het \'n probleem teëgekom. Probeer asseblief later weer. As daar steeds \'n probleem is, kontak asseblief Kliëntediens by %1$s en gee vir hulle die foutkode 9007.</string>
+  <string name="vvm3_error_vmg_timeout_title">Iets het verkeerd geloop</string>
+  <string name="vvm3_error_vmg_timeout_message">Jammer, ons het \'n probleem teëgekom. Probeer asseblief later weer. As daar steeds \'n probleem is, kontak asseblief Kliëntediens by %1$s en gee vir hulle die foutkode 9008.</string>
+  <string name="vvm3_error_status_sms_timeout_title">Iets het verkeerd geloop</string>
+  <string name="vvm3_error_status_sms_timeout_message">Jammer, ons sukkel om jou diens op te stel. Probeer asseblief later weer. As daar steeds \'n probleem is, kontak asseblieff Kliëntediens by %1$s en gee vir hulle die foutkode 9009.</string>
+  <string name="vvm3_error_subscriber_blocked_title">Kan nie aan jou stemboodskapdiens koppel nie</string>
+  <string name="vvm3_error_subscriber_blocked_message">Jammer, ons kan nie op die oomblik aan jou stemboodskapdiens koppel nie. Probeer asseblief later weer. As daar steeds \'n probleem is, kontak asseblief Kliëntediens by %1$s en gee vir hulle die foutkode 9990.</string>
+  <string name="vvm3_error_unknown_user_title">Stel stemboodskap op</string>
+  <string name="vvm3_error_unknown_user_message">Stemboodskapdiens is nie op jou rekening opgestel nie. Kontak asseblief Kliëntediens by %1$s en gee vir hulle die foutkode 9991.</string>
+  <string name="vvm3_error_unknown_device_title">Stemboodskap</string>
+  <string name="vvm3_error_unknown_device_message">Visuele stemboodskap kan nie op jou rekening gebruik word nie. Kontak asseblief Kliëntediens by %1$s en gee vir hulle die foutkode 9992.</string>
+  <string name="vvm3_error_invalid_password_title">Iets het verkeerd geloop</string>
+  <string name="vvm3_error_invalid_password_message">Kontak asseblief Kliëntediens by %1$s en gee vir hulle die foutkode 9993.</string>
+  <string name="vvm3_error_mailbox_not_initialized_title">Visuele stemboodskap</string>
+  <string name="vvm3_error_mailbox_not_initialized_message">Kontak asseblief Kliëntediens by %1$s en gee vir hulle die foutkode 9994 om opstelling vir visuele stemboodskap te voltooi.</string>
+  <string name="vvm3_error_service_not_provisioned_title">Visuele stemboodskap</string>
+  <string name="vvm3_error_service_not_provisioned_message">Kontak asseblief Kliëntediens by %1$s en gee vir hulle die foutkode 9995 om opstelling vir visuele stemboodskap te voltooi.</string>
+  <string name="vvm3_error_service_not_activated_title">Visuele stemboodskap</string>
+  <string name="vvm3_error_service_not_activated_message">Kontak asseblief Kliëntediens by %1$s en gee vir hulle die foutkode 9996 om visuele stemboodskap te aktiveer.</string>
+  <string name="vvm3_error_user_blocked_title">Iets het verkeerd geloop</string>
+  <string name="vvm3_error_user_blocked_message">Kontak asseblief Kliëntediens by %1$s en gee vir hulle die foutkode 9998 om visuele stemboodskap te aktiveer.</string>
+  <string name="vvm3_error_subscriber_unknown_title">Visuele stemboodskap is gedeaktiveer</string>
+  <string name="vvm3_error_subscriber_unknown_message">Kontak asseblief Kliëntediens by %1$s om visuele stemboodskapdiens te aktiveer.</string>
+  <string name="vvm3_error_imap_getquota_error_title">Iets het verkeerd geloop</string>
+  <string name="vvm3_error_imap_getquota_error_message">Kontak asseblief Kliëntediens by %1$s en gee vir hulle die foutkode 9997.</string>
+  <string name="vvm3_error_imap_select_error_title">Iets het verkeerd geloop</string>
+  <string name="vvm3_error_imap_select_error_message">Kontak asseblief Kliëntediens by %1$s en gee vir hulle die foutkode 9989.</string>
+  <string name="vvm3_error_imap_error_title">Iets het verkeerd geloop</string>
+  <string name="vvm3_error_imap_error_message">Kontak asseblief Kliëntediens by %1$s en gee vir hulle die foutkode 9999.</string>
+  <string name="verizon_terms_and_conditions_title">Skakel visuele stemboodskap aan</string>
+  <string name="verizon_terms_and_conditions_message">%1$sDeur visuele stemboodskap aan te skakel, stem jy in tot die Verizon Wireless-bepalings en -voorwaardes: \n\n%2$s</string>
+  <string name="dialer_terms_and_conditions_title">Skakel visuele stemboodskap aan</string>
+  <string name="dialer_terms_and_conditions_existing_user_title">Nuut! Lees jou stemboodskap</string>
+  <string name="dialer_terms_and_conditions_message">%s</string>
+  <string name="dialer_terms_and_conditions_1.0">Kyk en luister na jou boodskappe sonder dat jy stemboodskap hoef te bel. Transkripsies van jou stemboodskap word deur Google se gratis transkripsiediens verskaf. Jy kan beide enige tyd in Instellings afskakel. %s</string>
+  <string name="dialer_terms_and_conditions_existing_user">Transkripsies van jou stemboodskap word deur Google se gratis transkripsiediens verskaf. Jy kan dit enige tyd in Instellings afskakel. %s</string>
+  <string name="dialer_terms_and_conditions_for_verizon_1.0">Kyk en luister na jou boodskappe sonder dat jy stemboodskap hoef te bel.</string>
+  <string name="dialer_terms_and_conditions_learn_more">Kom meer te wete</string>
+  <string name="dialer_terms_and_conditions_existing_user_ack">OK, het dit</string>
+  <string name="dialer_terms_and_conditions_existing_user_decline">Nee, dankie</string>
+  <string name="terms_and_conditions_decline_dialog_title">Deaktiveer visuele stemboodskapdiens?</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_message">Visuele stemboodskapdiens sal gedeaktiveer word as die bepalings en voorwaardes afgekeur word.</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_downgrade">Deaktiveer</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_message">Visuele stemboodskapdiens sal gedeaktiveer word as jy visuele stemboodskapdiens afskakel.</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_downgrade">Deaktiveer</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message">Stemboodskapdiens sal slegs toeganklik wees as jy *86 bel. Stel \'n nuwe stemposboodskapdiens-PIN om voort te gaan.</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin">Stel PIN</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/error/res/values-am/strings.xml b/java/com/android/dialer/voicemail/listui/error/res/values-am/strings.xml
new file mode 100644
index 0000000..b363e65
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/error/res/values-am/strings.xml
@@ -0,0 +1,102 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_error_activating_title">እይታዊ የድምጽ መልዕክት በማግበር ላይ</string>
+  <string name="voicemail_error_activating_message">እይታዊ የድምጽ መልዕክት ሙሉ ለሙሉ እስከሚነቃ ድረስ የድምፅ መልዕክት ማሳወቂያዎችን ላይቀበሉ ይችላሉ። የድምጽ መልዕክት ሙሉ ለሙሉ እስኪያገብር ድረስ አዲስ መልዕክቶችን ለማምጣት ወደ ድምፅ መልዕክት ይደውሉ።</string>
+  <string name="voicemail_error_not_activate_no_signal_title">እይታዊ የድምጽ መልዕክትን ማግበር አይቻልም</string>
+  <string name="voicemail_error_not_activate_no_signal_message">ስልክዎ የተንቀሳቃሽ ስልክ አውታረ መረብ ግንኙነት እንዳለው ያረጋግጡና እንደገና ይሞክሩ።</string>
+  <string name="voicemail_error_not_activate_no_signal_airplane_mode_message">የአውሮፕላን ሁነታን ያጥፉ እና እንደገና ይሞክሩ።</string>
+  <string name="voicemail_error_no_signal_title">ግንኙነት የለም</string>
+  <string name="voicemail_error_no_signal_message">ለአዲስ የድምጽ መልዕክቶች ማሳወቂያ አይደርስዎትም። Wi-Fi ላይ ከሆኑ አሁን በማስመር የድምጽ መልዕክትን መፈተሽ ይችላሉ።</string>
+  <string name="voicemail_error_no_signal_airplane_mode_message">ለአዲስ የድምጽ መልዕክቶች ማሳወቂያ አይደርስዎትም። የድምጽ መልዕክትዎን ለማስመር የአውሮፕላን ሁነታን ያጥፉ።</string>
+  <string name="voicemail_error_no_signal_cellular_required_message">የድምጽ መልዕክትን ለመፈተሽ ስልክዎ የተንቀሳቃሽ ስልክ ውሂብ ግንኙነት ያስፈልገዋል።</string>
+  <string name="voicemail_error_activation_failed_title">እይታዊ የድምጽ መልዕክትን ማግበር አይቻልም</string>
+  <string name="voicemail_error_activation_failed_message">አሁንም ቢሆን የድምጽ መልዕክትን ለመፈተሽ መደወል ይችላሉ።</string>
+  <string name="voicemail_error_no_data_title">እይታዊ የድምጽ መልዕክትን ማዘመን አይቻልም</string>
+  <string name="voicemail_error_no_data_message">የWi‑Fi ወይም የተንቀሳቃሽ ስልክ ውሂብ ግንኙነትዎ ሲሻሻል እንደገና ይሞክሩ። አሁንም ቢሆን የድምጽ መልዕክትዎን ለመፈተሽ መደወል ይችላሉ።</string>
+  <string name="voicemail_error_no_data_cellular_required_message">የተንቀሳቃሽ ስልክ ውሂብ ግንኙነትዎ ሲሻሻል እንደገና ይሞክሩ። አሁንም ቢሆን የድምጽ መልዕክትዎን ለመፈተሽ መደወል ይችላሉ።</string>
+  <string name="voicemail_error_bad_config_title">እይታዊ የድምጽ መልዕክትን ማዘመን አይቻልም</string>
+  <string name="voicemail_error_bad_config_message">አሁንም ቢሆን የድምጽ መልዕክትን ለመፈተሽ መደወል ይችላሉ።</string>
+  <string name="voicemail_error_communication_title">እይታዊ የድምጽ መልዕክትን ማዘመን አይቻልም</string>
+  <string name="voicemail_error_communication_message">አሁንም ቢሆን የድምጽ መልዕክትን ለመፈተሽ መደወል ይችላሉ።</string>
+  <string name="voicemail_error_server_connection_title">እይታዊ የድምጽ መልዕክትን ማዘመን አይቻልም</string>
+  <string name="voicemail_error_server_connection_message">አሁንም ቢሆን የድምጽ መልዕክትን ለመፈተሽ መደወል ይችላሉ።</string>
+  <string name="voicemail_error_server_title">እይታዊ የድምጽ መልዕክትን ማዘመን አይቻልም</string>
+  <string name="voicemail_error_server_message">አሁንም ቢሆን የድምጽ መልዕክትን ለመፈተሽ መደወል ይችላሉ።</string>
+  <string name="voicemail_error_inbox_near_full_title">የገቢ መልዕክት ሳጥን ሊሞላ ጥቂት ቀርቶታል</string>
+  <string name="voicemail_error_inbox_near_full_message">የገቢ መልዕክት ሳጥንዎ ሙሉ ከሆነ አዲስ የድምጽ መልዕክት መቀበል አይችሉም።</string>
+  <string name="voicemail_error_inbox_full_title">አዲስ የድምጽ መልዕክት መቀበል አይቻልም</string>
+  <string name="voicemail_error_inbox_full_message">የመልዕክት ሳጥንዎ ሙሉ ነው። አዲስ የድምጽ መልዕክት ለመቀበል የተወሰኑ መልዕክቶችን ለመሰረዝ ይሞክሩ።</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_title">ተጨማሪ ማከማቻ እና ምትኬን ያብሩ</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_message">የእርስዎ የመልዕክት ሳጥን ሙሉ ነው። ባዶ ቦታ ነጻ ለማድረግ፣ Google የእርስዎን የድምፅ መልዕክቶች ማስተዳደር እና በምትኬ ማስቀመጥ እንዲችል ተጨማሪ ማከማቻን ያብሩ።</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_title">ተጨማሪ ማከማቻ እና ምትኬን ያብሩ</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_message">የእርስዎ የመልዕክት ሳጥን ሙሉ ነው። ባዶ ቦታ ነጻ ለማድረግ፣ Google የእርስዎን የድምፅ መልዕክቶች ማስተዳደር እና በምትኬ ማስቀመጥ እንዲችል ተጨማሪ ማከማቻን ያብሩ።</string>
+  <string name="voicemail_error_pin_not_set_title">የድምፅ መልዕክት ፒንዎን ያስገቡ</string>
+  <string name="voicemail_error_pin_not_set_message">በማንኛውም ጊዜ የድምፅ መልዕክትዎ ላይ ለመድረስ ሲደውሉ የድምፅ መልዕክት ፒን ያስፈልግዎታል።</string>
+  <string name="voicemail_action_turn_off_airplane_mode">የአውሮፕላን ሁነታ ቅንብሮች</string>
+  <string name="voicemail_action_set_pin">ፒን ያዘጋጁ</string>
+  <string name="voicemail_action_retry">እንደገና ይሞክሩ</string>
+  <string name="voicemail_action_turn_archive_on">አብራ</string>
+  <string name="voicemail_action_dimiss">አይ አመሰግናለሁ</string>
+  <string name="voicemail_action_sync">አስምር</string>
+  <string name="voicemail_action_call_voicemail">የድምፅ መልዕክት ደውል</string>
+  <string name="voicemail_action_call_customer_support">ወደ ደንበኛ ድጋፍ ይደውሉ</string>
+  <string name="vvm3_error_vms_dns_failure_title">የሆነ ችግር ተፈጥሯል</string>
+  <string name="vvm3_error_vms_dns_failure_message">ይቅርታ፣ ችግር አጋጥሞናል። እባክዎ ቆይተው እንደገና ይሞክሩ። አሁንም ችግር ካለ፣ እባክዎ የደንበኛ አገልግሎትን በ%1$s ላይ ያግኙና የስህተት ቁጥሩ 9001 እንደሆነ ይንገሯቸው።</string>
+  <string name="vvm3_error_vmg_dns_failure_title">የሆነ ችግር ተፈጥሯል</string>
+  <string name="vvm3_error_vmg_dns_failure_message">ይቅርታ፣ ችግር አጋጥሞናል። እባክዎ ቆይተው እንደገና ይሞክሩ። አሁንም ችግር ካለ፣ እባክዎ የደንበኛ አገልግሎትን በ%1$s ላይ ያግኙና የስህተት ቁጥሩ 9002 እንደሆነ ይንገሯቸው።</string>
+  <string name="vvm3_error_spg_dns_failure_title">የሆነ ችግር ተፈጥሯል</string>
+  <string name="vvm3_error_spg_dns_failure_message">ይቅርታ፣ ችግር አጋጥሞናል። እባክዎ ቆይተው እንደገና ይሞክሩ። አሁንም ችግር ካለ፣ እባክዎ የደንበኛ አገልግሎትን በ%1$s ላይ ያግኙና የስህተት ቁጥሩ 9003 እንደሆነ ይንገሯቸው።</string>
+  <string name="vvm3_error_vms_no_cellular_title">ከድምጽ መልዕክት ሳጥንዎ ጋር መገናኘት አይቻልም</string>
+  <string name="vvm3_error_vms_no_cellular_message">ይቅርታ፣ ከድምፅ መልዕክት ሳጥንዎ ጋር ለመገናኘት ችግር እየገጠመን ነው። ደካማ የሲግናል ጥንካሬ ያለበት አካባቢ ውስጥ ከሆኑ ጠንካራ ሲግናል እስኪያገኙ ድረስ ይቆዩና እንደገና ይሞክሩ። ይቅርታ፣ ችግር አጋጥሞናል። አሁንም ችግር ካለ፣ እባክዎ የደንበኛ አገልግሎትን በ%1$s ላይ ያግኙና የስህተት ቁጥሩ 9004 እንደሆነ ይንገሯቸው።</string>
+  <string name="vvm3_error_vmg_no_cellular_title">ከድምጽ መልዕክት ሳጥንዎ ጋር መገናኘት አይቻልም</string>
+  <string name="vvm3_error_vmg_no_cellular_message">ይቅርታ፣ ከድምፅ መልዕክት ሳጥንዎ ጋር ለመገናኘት ችግር እየገጠመን ነው። ደካማ የሲግናል ጥንካሬ ያለበት አካባቢ ውስጥ ከሆኑ ጠንካራ ሲግናል እስኪያገኙ ድረስ ይቆዩና እንደገና ይሞክሩ። አሁንም ችግር ካለ፣ እባክዎ የደንበኛ አገልግሎትን በ%1$s ላይ ያግኙና የስህተት ቁጥሩ 9005 እንደሆነ ይንገሯቸው።</string>
+  <string name="vvm3_error_spg_no_cellular_title">ከድምጽ መልዕክት ሳጥንዎ ጋር መገናኘት አይቻልም</string>
+  <string name="vvm3_error_spg_no_cellular_message">ይቅርታ፣ ከድምፅ መልዕክት ሳጥንዎ ጋር ለመገናኘት ችግር እየገጠመን ነው። ደካማ የሲግናል ጥንካሬ ያለበት አካባቢ ውስጥ ከሆኑ ጠንካራ ሲግናል እስኪያገኙ ድረስ ይቆዩና እንደገና ይሞክሩ። አሁንም ችግር ካለ፣ እባክዎ የደንበኛ አገልግሎትን በ%1$s ላይ ያግኙና የስህተት ቁጥሩ 9006 እንደሆነ ይንገሯቸው።</string>
+  <string name="vvm3_error_vms_timeout_title">የሆነ ችግር ተፈጥሯል</string>
+  <string name="vvm3_error_vms_timeout_message">ይቅርታ፣ ችግር አጋጥሞናል። እባክዎ ቆይተው እንደገና ይሞክሩ። አሁንም ችግር ካለ የደንበኛ አገልግሎትን በ%1$s ላይ ያግኙና የስህተት ቁጥሩ 9007 እንደሆነ ይንገሯቸው።</string>
+  <string name="vvm3_error_vmg_timeout_title">የሆነ ችግር ተፈጥሯል</string>
+  <string name="vvm3_error_vmg_timeout_message">ይቅርታ፣ ችግር አጋጥሞናል። እባክዎ ቆይተው እንደገና ይሞክሩ። አሁንም ችግር ካለ የደንበኛ አገልግሎትን በ%1$s ላይ ያግኙና የስህተት ቁጥሩ 9008 እንደሆነ ይንገሯቸው።</string>
+  <string name="vvm3_error_status_sms_timeout_title">የሆነ ችግር ተፈጥሯል</string>
+  <string name="vvm3_error_status_sms_timeout_message">ይቅርታ፣ አገልግሎትዎን በማዘጋጀት ላይ ችግር አጋጥሞናል። እባክዎ ቆይተው እንደገና ይሞክሩ። አሁንም ችግር ካለ፣ እባክዎ የደንበኛ አገልግሎትን በ%1$s ላይ ያግኙና የስህተት ቁጥሩ 9009 እንደሆነ ይንገሯቸው።</string>
+  <string name="vvm3_error_subscriber_blocked_title">ከድምጽ መልዕክት ሳጥንዎ ጋር መገናኘት አይቻልም</string>
+  <string name="vvm3_error_subscriber_blocked_message">ይቅርታ፣ በአሁኑ ጊዜ ከድምጽ መልዕክት ሳጥንዎ ጋር መገናኘት አልቻልንም። እባክዎ ቆይተው እንደገና ይሞክሩ። አሁንም ችግር ካለ፣ እባክዎ የደንበኛ አገልግሎትን በ%1$s ላይ ያግኙና የስህተት ቁጥሩ 9990 እንደሆነ ይንገሯቸው።</string>
+  <string name="vvm3_error_unknown_user_title">የድምፅ መልዕክት ያዘጋጁ</string>
+  <string name="vvm3_error_unknown_user_message">በእርስዎ መለያ ላይ የድምፅ መልዕክት አልተዘጋጀም። እባክዎ የደንበኛ አገልግሎትን በ%1$s ላይ ያግኙና የስህተት ቁጥሩ 9991 እንደሆነ ይንገሯቸው።</string>
+  <string name="vvm3_error_unknown_device_title">የድምፅ መልዕክት</string>
+  <string name="vvm3_error_unknown_device_message">ዕይታዊ የድምጽ መልዕክት በዚህ መሳሪያ ላይ ጥቅም ላይ መዋል አይችልም። እባክዎ የደንበኛ አገልግሎትን በ%1$s ላይ ያግኙና የስህተት ቁጥሩ 9992 እንደሆነ ይንገሯቸው።</string>
+  <string name="vvm3_error_invalid_password_title">የሆነ ችግር ተፈጥሯል</string>
+  <string name="vvm3_error_invalid_password_message">እባክዎ የደንበኛ አገልግሎትን በ%1$s ላይ ያግኙ እና የስህተት ቁጥሩ 9993 እንደሆነ ይንገሯቸው።</string>
+  <string name="vvm3_error_mailbox_not_initialized_title">ዕይታዊ የድምጽ መልዕክት</string>
+  <string name="vvm3_error_mailbox_not_initialized_message">የዕይታዊ የድምጽ መልዕት ዝግጅትን ለማጠናቀቅ፣ እባክዎ የደንበኛ አገልግሎትን በ%1$s ላይ ያግኙና የስህተት ቁጥሩ 9994 እንደሆነ ይንገሯቸው።</string>
+  <string name="vvm3_error_service_not_provisioned_title">ዕይታዊ የድምጽ መልዕክት</string>
+  <string name="vvm3_error_service_not_provisioned_message">የዕይታዊ የድምጽ መልዕት ዝግጅትን ለማጠናቀቅ፣ እባክዎ የደንበኛ አገልግሎትን በ%1$s ላይ ያግኙና የስህተት ቁጥሩ 9995 እንደሆነ ይንገሯቸው።</string>
+  <string name="vvm3_error_service_not_activated_title">ዕይታዊ የድምጽ መልዕክት</string>
+  <string name="vvm3_error_service_not_activated_message">ዕይታዊ የድምጽ መልዕትን ለማግበር፣ እባክዎ የደንበኛ አገልግሎትን በ%1$s ላይ ያግኙና የስህተት ቁጥሩ 9996 እንደሆነ ይንገሯቸው።</string>
+  <string name="vvm3_error_user_blocked_title">የሆነ ችግር ተፈጥሯል</string>
+  <string name="vvm3_error_user_blocked_message">የዕይታዊ የድምጽ መልዕት ዝግጅትን ለማጠናቀቅ፣ እባክዎ የደንበኛ አገልግሎትን በ%1$s ላይ ያግኙና የስህተት ቁጥሩ 9998 እንደሆነ ይንገሯቸው።</string>
+  <string name="vvm3_error_subscriber_unknown_title">ዕይታዊ የድምጽ መልዕክት ተሰናክሏል</string>
+  <string name="vvm3_error_subscriber_unknown_message">እባክዎ እይታዊ የድምጽ መልዕክትን ለማግበር የደንበኛ አገልግሎትን በ%1$s ላይ ያግኙ።</string>
+  <string name="vvm3_error_imap_getquota_error_title">የሆነ ችግር ተፈጥሯል</string>
+  <string name="vvm3_error_imap_getquota_error_message">እባክዎ የደንበኛ አገልግሎትን በ%1$s ላይ ያግኙና የስህተት ቁጥሩ 9997 እንደሆነ ይንገሯቸው።</string>
+  <string name="vvm3_error_imap_select_error_title">የሆነ ችግር ተፈጥሯል</string>
+  <string name="vvm3_error_imap_select_error_message">እባክዎ የደንበኛ አገልግሎትን በ%1$s ላይ ያግኙ እና የስህተት ቁጥሩ 9989 እንደሆነ ይንገሯቸው።</string>
+  <string name="vvm3_error_imap_error_title">የሆነ ችግር ተፈጥሯል</string>
+  <string name="vvm3_error_imap_error_message">እባክዎ የደንበኛ አገልግሎትን በ%1$s ላይ ያግኙ እና የስህተት ቁጥሩ 9999 እንደሆነ ይንገሯቸው።</string>
+  <string name="verizon_terms_and_conditions_title">ዕይታዊ የድምጽ መልዕክትን አብራ</string>
+  <string name="verizon_terms_and_conditions_message">%1$s ዕይታዊ የድምጽ መልዕክትን በማብራት በVerizon Wireless ውሎች እና ሁኔታዎች ይስማማሉ፦\n\n%2$s</string>
+  <string name="dialer_terms_and_conditions_title">ዕይታዊ የድምጽ መልዕክትን አብራ</string>
+  <string name="dialer_terms_and_conditions_existing_user_title">አዲስ! የድምጽ መልዕክትዎን ያንብቡ</string>
+  <string name="dialer_terms_and_conditions_message">%s</string>
+  <string name="dialer_terms_and_conditions_1.0">ወደ ድምጽ መልዕክት መደወል ሳያስፈልግዎ መልዕክቶችዎን ይመልከቱ እንዲሁም ያዳምጡ። የድምጽ መልዕክትዎ የጽሁፍ ግልባጮች በGoogle ነጻ ወደ ጽሁፍ የመገልበጥ አገልግሎት ይቀርባሉ። የትኛውንም በማንኛውም ጊዜ በቅንብሮች ውስጥ ማጥፋት ይችላሉ። %s</string>
+  <string name="dialer_terms_and_conditions_existing_user">የድምጽ መልዕክትዎ የጽሁፍ ግልባጮች አሁን በGoogle ነጻ ወደ ጽሁፍ የመገልበጥ አገልግሎት ይቀርባሉ። ይህን በማንኛውም ጊዜ ማጥፋት ይችላሉ። %s</string>
+  <string name="dialer_terms_and_conditions_for_verizon_1.0">ወደ የድምጽ መልዕክት መደወል ሳያስፈልግዎ መልዕክቶችዎን ይዩ እንዲሁም ያዳምጡ።</string>
+  <string name="dialer_terms_and_conditions_learn_more">የበለጠ ለመረዳት</string>
+  <string name="dialer_terms_and_conditions_existing_user_ack">እሺ፣ ገባኝ</string>
+  <string name="dialer_terms_and_conditions_existing_user_decline">አይ አመሰግናለሁ</string>
+  <string name="terms_and_conditions_decline_dialog_title">እይታዊ የድምጽ መልዕክት ይሰናከል?</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_message">የአገልግሎት ውሎቹ ተቀባይነት ካላገኙ እይታዊ የድምጽ መልዕክት ይሰናከላል።</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_downgrade">አሰናክል</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_message">ዕይታዊ የድምጽ መልዕክትን ካጠፉ ዕይታዊ የድምጽ መልዕክት ይሰናከላል።</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_downgrade">አሰናክል</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message">የድምጽ መልዕክት ላይ መድረስ የሚቻለው *86 በመደወል ብቻ ነው። ለመቀጠል አዲስ የድምጽ መልዕክት ፒን ያዘጋጁ።</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin">ፒን ያዘጋጁ</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/error/res/values-ar/strings.xml b/java/com/android/dialer/voicemail/listui/error/res/values-ar/strings.xml
new file mode 100644
index 0000000..83fd166
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/error/res/values-ar/strings.xml
@@ -0,0 +1,102 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_error_activating_title">تفعيل البريد الصوتي المرئي</string>
+  <string name="voicemail_error_activating_message">قد لا تتلقّى إشعارات البريد الصوتي حتى يتم تفعيل البريد الصوتي المرئي تمامًا. يمكنك الاتصال بالبريد الصوتي لاسترداد الرسائل الجديدة إلى أن يتم تفعيل البريد الصوتي تمامًا.</string>
+  <string name="voicemail_error_not_activate_no_signal_title">يتعذر تفعيل البريد الصوتي المرئي</string>
+  <string name="voicemail_error_not_activate_no_signal_message">تأكد من أن هاتفك توجد به اتصال شبكة جوال وحاول مرة أخرى.</string>
+  <string name="voicemail_error_not_activate_no_signal_airplane_mode_message">أوقف تشغيل وضع الطائرة وحاول مرة أخرى.</string>
+  <string name="voicemail_error_no_signal_title">لا اتصال</string>
+  <string name="voicemail_error_no_signal_message">‏لن يتم إعلامك برسائل البريد الصوتي الجديدة. إذا كنت تستخدم شبكة Wi-Fi، فيمكنك التحقق من البريد الصوتي عن طريق إجراء المزامنة الآن.</string>
+  <string name="voicemail_error_no_signal_airplane_mode_message">لن يتم إعلامك برسائل البريد الصوتي الجديدة. أوقف تشغيل وضع الطائرة لمزامنة بريدك الصوتي.</string>
+  <string name="voicemail_error_no_signal_cellular_required_message">يحتاج هاتفك إلى اتصال بيانات جوال للتحقق من البريد الصوتي.</string>
+  <string name="voicemail_error_activation_failed_title">يتعذر تفعيل البريد الصوتي المرئي</string>
+  <string name="voicemail_error_activation_failed_message">لا يزال بإمكانك إجراء الاتصال للتحقق من البريد الصوتي.</string>
+  <string name="voicemail_error_no_data_title">يتعذر تحديث البريد الصوتي المرئي</string>
+  <string name="voicemail_error_no_data_message">‏حاول مرة أخرى عندما يكون لديك اتصال Wi-Fi أو جوال أفضل. لا يزال بإمكانك الاتصال والتحقق من البريد الصوتي.</string>
+  <string name="voicemail_error_no_data_cellular_required_message">حاول مرة أخرى عندما يكون لديك اتصال جوال أفضل. لا يزال بإمكانك الاتصال والتحقق من البريد الصوتي.</string>
+  <string name="voicemail_error_bad_config_title">يتعذر تحديث البريد الصوتي المرئي</string>
+  <string name="voicemail_error_bad_config_message">لا يزال بإمكانك إجراء الاتصال للتحقق من البريد الصوتي.</string>
+  <string name="voicemail_error_communication_title">يتعذر تحديث البريد الصوتي المرئي</string>
+  <string name="voicemail_error_communication_message">لا يزال بإمكانك إجراء الاتصال للتحقق من البريد الصوتي.</string>
+  <string name="voicemail_error_server_connection_title">يتعذر تحديث البريد الصوتي المرئي</string>
+  <string name="voicemail_error_server_connection_message">لا يزال بإمكانك إجراء الاتصال للتحقق من البريد الصوتي.</string>
+  <string name="voicemail_error_server_title">يتعذر تحديث البريد الصوتي المرئي</string>
+  <string name="voicemail_error_server_message">لا يزال بإمكانك إجراء الاتصال للتحقق من البريد الصوتي.</string>
+  <string name="voicemail_error_inbox_near_full_title">البريد الوارد على وشك الامتلاء</string>
+  <string name="voicemail_error_inbox_near_full_message">لن تتمكن من تلقي بريد صوتي جديد إذا امتلأ بريدك الوارد.</string>
+  <string name="voicemail_error_inbox_full_title">يتعذر تلقي رسائل بريد صوتي جديدة</string>
+  <string name="voicemail_error_inbox_full_message">بريدك الوارد ممتلئ. حاول حذف بعض الرسائل لتلقي رسائل بريد صوتي جديدة.</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_title">تشغيل سعة التخزين الإضافية والنسخ الاحتياطي</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_message">‏صندوق بريدك ممتلئ. للحصول على بعض المساحة، ينبغي تشغيل سعة التخزين الإضافية حتى يتمكن Google من إدارة رسائل البريد الصوتي ونسخها احتياطيًا.</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_title">تشغيل سعة التخزين الإضافية والنسخ الاحتياطي</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_message">‏صندوق بريدك ممتلئ. للحصول على بعض المساحة، ينبغي تشغيل سعة التخزين الإضافية حتى يتمكن Google من إدارة رسائل البريد الصوتي ونسخها احتياطيًا.</string>
+  <string name="voicemail_error_pin_not_set_title">إعداد رقم التعريف الشخصي للبريد الصوتي</string>
+  <string name="voicemail_error_pin_not_set_message">ستحتاج رقم تعريف شخصي للبريد الصوتي في كل مرة تتصل فيها للوصول إلى بريدك الصوتي.</string>
+  <string name="voicemail_action_turn_off_airplane_mode">إعدادات وضع الطائرة</string>
+  <string name="voicemail_action_set_pin">تعيين رقم التعريف الشخصي</string>
+  <string name="voicemail_action_retry">إعادة المحاولة</string>
+  <string name="voicemail_action_turn_archive_on">تشغيل</string>
+  <string name="voicemail_action_dimiss">لا، شكرًا</string>
+  <string name="voicemail_action_sync">مزامنة</string>
+  <string name="voicemail_action_call_voicemail">اتصال بالبريد الصوتي</string>
+  <string name="voicemail_action_call_customer_support">الاتصال بدعم العملاء</string>
+  <string name="vvm3_error_vms_dns_failure_title">حدث خطأٌ ما</string>
+  <string name="vvm3_error_vms_dns_failure_message">عذرًا، هناك مشكلة. يُرجى إعادة المحاولة لاحقًا. وإذا استمرت المشكلة، يُرجى الاتصال بخدمة العملاء على الرقم %1$s وإبلاغهم أن رمز الخطأ هو 9001.</string>
+  <string name="vvm3_error_vmg_dns_failure_title">حدث خطأٌ ما</string>
+  <string name="vvm3_error_vmg_dns_failure_message">عذرًا، هناك مشكلة. يُرجى إعادة المحاولة لاحقًا. وإذا استمرت المشكلة، يُرجى الاتصال بخدمة العملاء على الرقم %1$s وإبلاغهم أن رمز الخطأ هو 9002.</string>
+  <string name="vvm3_error_spg_dns_failure_title">حدث خطأٌ ما</string>
+  <string name="vvm3_error_spg_dns_failure_message">عذرًا، هناك مشكلة. يُرجى إعادة المحاولة لاحقًا. وإذا استمرت المشكلة، يُرجى الاتصال بخدمة العملاء على الرقم %1$s وإبلاغهم أن رمز الخطأ هو 9003.</string>
+  <string name="vvm3_error_vms_no_cellular_title">لا يمكن الاتصال بصندوق بريدك الصوتي</string>
+  <string name="vvm3_error_vms_no_cellular_message">عذرًا، هناك مشكلة في الاتصال بصندوق بريدك الصوتي. إذا كانت قوة الإشارة ضعيفةً في منطقتك، فانتظر حتى تصبح الإشارة قويةً ثم أعِد المحاولة. وإذا استمرت المشكلة، يُرجى الاتصال بخدمة العملاء على الرقم %1$s وإبلاغهم أن رمز الخطأ هو 9004.</string>
+  <string name="vvm3_error_vmg_no_cellular_title">لا يمكن الاتصال بصندوق بريدك الصوتي</string>
+  <string name="vvm3_error_vmg_no_cellular_message">عذرًا، هناك مشكلة في الاتصال بصندوق بريدك الصوتي. إذا كانت قوة الإشارة ضعيفةً في منطقتك، فانتظر حتى تصبح الإشارة قويةً ثم أعِد المحاولة. وإذا استمرت المشكلة، يُرجى الاتصال بخدمة العملاء على الرقم %1$s وإبلاغهم أن رمز الخطأ هو 9005.</string>
+  <string name="vvm3_error_spg_no_cellular_title">لا يمكن الاتصال بصندوق بريدك الصوتي</string>
+  <string name="vvm3_error_spg_no_cellular_message">عذرًا، هناك مشكلة في الاتصال بصندوق بريدك الصوتي. إذا كانت قوة الإشارة ضعيفةً في منطقتك، فانتظر حتى تصبح الإشارة قويةً ثم أعِد المحاولة. وإذا استمرت المشكلة، يُرجى الاتصال بخدمة العملاء على الرقم %1$s وإبلاغهم أن رمز الخطأ هو 9006.</string>
+  <string name="vvm3_error_vms_timeout_title">حدث خطأٌ ما</string>
+  <string name="vvm3_error_vms_timeout_message">عذرًا، هناك مشكلة. يُرجى إعادة المحاولة لاحقًا. وإذا استمرت المشكلة، يُرجى الاتصال بخدمة العملاء على الرقم %1$s وإبلاغهم أن رمز الخطأ هو 9007.</string>
+  <string name="vvm3_error_vmg_timeout_title">حدث خطأٌ ما</string>
+  <string name="vvm3_error_vmg_timeout_message">عذرًا، هناك مشكلة. يُرجى إعادة المحاولة لاحقًا. وإذا استمرت المشكلة، يُرجى الاتصال بخدمة العملاء على الرقم %1$s وإبلاغهم أن رمز الخطأ هو 9008.</string>
+  <string name="vvm3_error_status_sms_timeout_title">حدث خطأٌ ما</string>
+  <string name="vvm3_error_status_sms_timeout_message">عذرًا، هناك مشكلة في إعداد خدمتك. يُرجى إعادة المحاولة لاحقًا. وإذا استمرت المشكلة، يُرجى الاتصال بخدمة العملاء على الرقم %1$s وإبلاغهم أن رمز الخطأ هو 9009.</string>
+  <string name="vvm3_error_subscriber_blocked_title">لا يمكن الاتصال بصندوق بريدك الصوتي</string>
+  <string name="vvm3_error_subscriber_blocked_message">عذرًا، لا يمكننا الاتصال بصندوق بريدك الصوتي حاليًا. يُرجى إعادة المحاولة لاحقًا. وإذا استمرت المشكلة، يُرجى الاتصال بخدمة العملاء على الرقم %1$s وإبلاغهم أن رمز الخطأ هو 9990.</string>
+  <string name="vvm3_error_unknown_user_title">إعداد البريد الصوتي</string>
+  <string name="vvm3_error_unknown_user_message">لم يتم إعداد البريد الصوتي في حسابك. يُرجى الاتصال بخدمة العملاء على الرقم %1$s وإبلاغهم أن رمز الخطأ هو 9991.</string>
+  <string name="vvm3_error_unknown_device_title">بريد صوتي</string>
+  <string name="vvm3_error_unknown_device_message">لا يمكن استخدام البريد الصوتي المرئي على هذا الجهاز. يُرجى الاتصال بخدمة العملاء على الرقم %1$s وإبلاغهم برمز الخطأ وهو 9992.</string>
+  <string name="vvm3_error_invalid_password_title">حدث خطأٌ ما</string>
+  <string name="vvm3_error_invalid_password_message">يُرجى الاتصال بخدمة العملاء على الرقم %1$s وإبلاغهم أن رمز الخطأ هو 9993.</string>
+  <string name="vvm3_error_mailbox_not_initialized_title">بريد صوتي مرئي</string>
+  <string name="vvm3_error_mailbox_not_initialized_message">لإتمام إعداد البريد الصوتي المرئي، يُرجى الاتصال بخدمة العملاء على الرقم %1$s وإبلاغهم برمز الخطأ وهو 9994.</string>
+  <string name="vvm3_error_service_not_provisioned_title">بريد صوتي مرئي</string>
+  <string name="vvm3_error_service_not_provisioned_message">لإتمام إعداد البريد الصوتي المرئي، يُرجى الاتصال بخدمة العملاء على الرقم %1$s وإبلاغهم برمز الخطأ وهو 9995.</string>
+  <string name="vvm3_error_service_not_activated_title">بريد صوتي مرئي</string>
+  <string name="vvm3_error_service_not_activated_message">لتفعيل البريد الصوتي المرئي، يُرجى الاتصال بخدمة العملاء على الرقم %1$s وإبلاغهم برمز الخطأ وهو 9996.</string>
+  <string name="vvm3_error_user_blocked_title">حدث خطأٌ ما</string>
+  <string name="vvm3_error_user_blocked_message">لإتمام إعداد البريد الصوتي المرئي، يُرجى الاتصال بخدمة العملاء على الرقم %1$s وإبلاغهم برمز الخطأ وهو 9998.</string>
+  <string name="vvm3_error_subscriber_unknown_title">تم إيقاف البريد الصوتي المرئي</string>
+  <string name="vvm3_error_subscriber_unknown_message">يُرجى الاتصال بخدمة العملاء على الرقم %1$s لتفعيل البريد الصوتي المرئي.</string>
+  <string name="vvm3_error_imap_getquota_error_title">حدث خطأٌ ما</string>
+  <string name="vvm3_error_imap_getquota_error_message">يُرجى الاتصال بخدمة العملاء على الرقم %1$s وإبلاغهم أن رمز الخطأ هو 9997.</string>
+  <string name="vvm3_error_imap_select_error_title">حدث خطأٌ ما</string>
+  <string name="vvm3_error_imap_select_error_message">يُرجى الاتصال بخدمة العملاء على الرقم %1$s وإبلاغهم أن رمز الخطأ هو 9989.</string>
+  <string name="vvm3_error_imap_error_title">حدث خطأٌ ما</string>
+  <string name="vvm3_error_imap_error_message">يُرجى الاتصال بخدمة العملاء على الرقم %1$s وإبلاغهم أن رمز الخطأ هو 9999.</string>
+  <string name="verizon_terms_and_conditions_title">تفعيل البريد الصوتي المرئي</string>
+  <string name="verizon_terms_and_conditions_message">‏%1$s يُعد تشغيلك للبريد الصوتي المرئي بمثابة موافقة منك على بنود وشروط Verizon Wireless:\n\n%2$s</string>
+  <string name="dialer_terms_and_conditions_title">تفعيل البريد الصوتي المرئي</string>
+  <string name="dialer_terms_and_conditions_existing_user_title">جديد! قراءة البريد الصوتي</string>
+  <string name="dialer_terms_and_conditions_message">%s</string>
+  <string name="dialer_terms_and_conditions_1.0">‏اطلع على رسائلك واستمع إليها بدون الحاجة إلى الاتصال بالبريد الصوتي. يتم تحويل بريدك الصوتي إلى نص بواسطة خدمة تحويل الصوت إلى نص المجانية من Google. يمكنك إيقاف الخدمة في أي وقت في \"الإعدادات\". %s</string>
+  <string name="dialer_terms_and_conditions_existing_user">‏يتم تحويل بريدك الصوتي إلى نص بواسطة خدمة تحويل الصوت إلى نص المجانية من Google. يمكنك إيقاف هذه الخدمة في أي وقت في \"الإعدادات\". %s</string>
+  <string name="dialer_terms_and_conditions_for_verizon_1.0">اطلع على رسائلك واستمع إليها دون الحاجة إلى الاتصال بالبريد الصوتي.</string>
+  <string name="dialer_terms_and_conditions_learn_more">معرفة المزيد</string>
+  <string name="dialer_terms_and_conditions_existing_user_ack">حسنًا</string>
+  <string name="dialer_terms_and_conditions_existing_user_decline">لا، شكرًا</string>
+  <string name="terms_and_conditions_decline_dialog_title">هل تريد إيقاف البريد الصوتي المرئي؟</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_message">سيتم إيقاف البريد الصوتي المرئي في حالة رفض الأحكام والشروط.</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_downgrade">إيقاف</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_message">سيتم إيقاف البريد الصوتي المرئي في حال إيقاف تشغيله.</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_downgrade">إيقاف</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message">يمكن الوصول إلى البريد الصوتي فقط عن طريق طلب *86. ينبغي تعيين رقم تعريف شخصي جديد للبريد الصوتي للمتابعة.</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin">تعيين رقم التعريف الشخصي</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/error/res/values-az/strings.xml b/java/com/android/dialer/voicemail/listui/error/res/values-az/strings.xml
new file mode 100644
index 0000000..011bef2
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/error/res/values-az/strings.xml
@@ -0,0 +1,102 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_error_activating_title">Vizual səsli e-poçt aktiv edilir</string>
+  <string name="voicemail_error_activating_message">Vizual səsli e-poçt tam aktiv edilənə kimi səsli e-poçt bildirişləri almaya bilərsiniz. Səsli e-poçt tam aktiv edilənə kimi yeni mesajları əldə etmək üçün səsli e-poçta zəng edin.</string>
+  <string name="voicemail_error_not_activate_no_signal_title">Vizual səsli e-poçtu aktiv etmək mümkün deyil</string>
+  <string name="voicemail_error_not_activate_no_signal_message">Telefonda mobil şəbəkə bağlantısı olduğuna əmin olub yenidən cəhd edin.</string>
+  <string name="voicemail_error_not_activate_no_signal_airplane_mode_message">Təyyarə rejimini deaktiv edib yenidən cəhd edin.</string>
+  <string name="voicemail_error_no_signal_title">Bağlantı yoxdur</string>
+  <string name="voicemail_error_no_signal_message">Yeni gələn səsli e-poçtlara görə bildiriş almayacaqsınız. Wi-Fi qoşuludursa, sinxronizasiya etməklə səsli e-poçtları yoxlaya bilərsiniz.</string>
+  <string name="voicemail_error_no_signal_airplane_mode_message">Yeni gələn səsli e-poçtlara görə bildiriş almayacaqsınız. Səsli e-poçtları sinxronizasiya etmək üçün təyyarə rejimini deaktiv edin.</string>
+  <string name="voicemail_error_no_signal_cellular_required_message">Səsli e-poçtları yoxlamaq üçün telefonda mobil data bağlantısı olmalıdır.</string>
+  <string name="voicemail_error_activation_failed_title">Vizual səsli e-poçtu aktiv etmək mümkün deyil</string>
+  <string name="voicemail_error_activation_failed_message">Səsli e-poçtları yoxlamaq üçün yenə də zəng edə bilərsiniz.</string>
+  <string name="voicemail_error_no_data_title">Vizual səsli e-poçtları yeniləmək olmur</string>
+  <string name="voicemail_error_no_data_message">Wi‑Fi və ya mobil data bağlantısı daha yaxşı olduqda yenidən cəhd edin. Səsli e-poçtları yoxlamaq üçün yenə də zəng edə bilərsiniz.</string>
+  <string name="voicemail_error_no_data_cellular_required_message">Mobil data bağlantısı yaxşı olduqda yenidən cəhd edin. Səsli e-poçtları yoxlamaq üçün yenə də zəng edə bilərsiniz.</string>
+  <string name="voicemail_error_bad_config_title">Vizual səsli e-poçtları yeniləmək olmur</string>
+  <string name="voicemail_error_bad_config_message">Səsli e-poçtları yoxlamaq üçün yenə də zəng edə bilərsiniz.</string>
+  <string name="voicemail_error_communication_title">Vizual səsli e-poçtları yeniləmək olmur</string>
+  <string name="voicemail_error_communication_message">Səsli e-poçtları yoxlamaq üçün yenə də zəng edə bilərsiniz.</string>
+  <string name="voicemail_error_server_connection_title">Vizual səsli e-poçtları yeniləmək olmur</string>
+  <string name="voicemail_error_server_connection_message">Səsli e-poçtları yoxlamaq üçün yenə də zəng edə bilərsiniz.</string>
+  <string name="voicemail_error_server_title">Vizual səsli e-poçtları yeniləmək olmur</string>
+  <string name="voicemail_error_server_message">Səsli e-poçtları yoxlamaq üçün yenə də zəng edə bilərsiniz.</string>
+  <string name="voicemail_error_inbox_near_full_title">Gələnlər qutusu demək olar ki doludur</string>
+  <string name="voicemail_error_inbox_near_full_message">Gələnlər qutusu dolu olduqda, yeni səsli e-poçt almayacaqsınız.</string>
+  <string name="voicemail_error_inbox_full_title">Yeni səsli e-poçt almaq mümkün deyil</string>
+  <string name="voicemail_error_inbox_full_message">Gələnlər qutusu doludur. Yeni səsli e-poçt əldə etmək üçün bəzi mesajları silin.</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_title">Əlavə yaddaş və yedəkləməni aktiv edin</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_message">E-poçt qutusu doludur. Boş yer üçün əlavə yaddaşı aktiv edin, beləliklə, Google səsli e-poçt mesajlarını idarə edə və yedəkləyə bilər.</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_title">Əlavə yaddaş və yedəkləməni aktiv edin</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_message">E-poçt qutusu artıq doludur. Boş yer üçün əlavə yaddaşı aktiv edin, beləliklə, Google səsli e-poçt mesajlarını idarə edə və yedəkləyə bilər.</string>
+  <string name="voicemail_error_pin_not_set_title">Səsli e-poçt PIN kodunu ayarlayın</string>
+  <string name="voicemail_error_pin_not_set_message">Zəng etdiyiniz zaman səsli e-poçta daxil olmaq üçün PIN kod tələb olunacaq.</string>
+  <string name="voicemail_action_turn_off_airplane_mode">Təyyarə Rejimi Ayarları</string>
+  <string name="voicemail_action_set_pin">PIN ayarlayın</string>
+  <string name="voicemail_action_retry">Yenidən cəhd edin</string>
+  <string name="voicemail_action_turn_archive_on">Aktiv edin</string>
+  <string name="voicemail_action_dimiss">Xeyr, Təşəkkürlər</string>
+  <string name="voicemail_action_sync">Sinxronizasiya</string>
+  <string name="voicemail_action_call_voicemail">Səsli e-poçta zəng edin</string>
+  <string name="voicemail_action_call_customer_support">Müştəri Xidmətinə zəng edin</string>
+  <string name="vvm3_error_vms_dns_failure_title">Xəta Baş Verdi</string>
+  <string name="vvm3_error_vms_dns_failure_message">Problem baş verdi. Daha sonra yenidən cəhd edin. Problem davam edərsə, %1$s nömrəsi ilə Müştəri Xidmətinə zəng edb xəta kodunun 9001 olduğunu bildirin.</string>
+  <string name="vvm3_error_vmg_dns_failure_title">Xəta Baş Verdi</string>
+  <string name="vvm3_error_vmg_dns_failure_message">Problem baş verdi. Daha sonra yenidən cəhd edin. Problem davam edərsə, %1$s nömrəsi ilə Müştəri Xidmətinə zəng edib xəta kodunun 9002 olduğunu bildirin.</string>
+  <string name="vvm3_error_spg_dns_failure_title">Xəta Baş Verdi</string>
+  <string name="vvm3_error_spg_dns_failure_message">Problem baş verdi. Daha sonra yenidən cəhd edin. Problem davam edərsə, %1$s nömrəsi ilə Müştəri Xidmətinə zəng edib xəta kodunun 9003 olduğunu bildirin.</string>
+  <string name="vvm3_error_vms_no_cellular_title">Səsli E-Poçt Qutunuza Daxil Olmaq Mümkün Deyil</string>
+  <string name="vvm3_error_vms_no_cellular_message">Səsli e-poçt qutunuza daxil ola bilmirik. Əgər hazırda olduğunuz məkanda siqnal zəifdirsə, siqnalın güclənməsini gözləyib yenidən cəhd edin. Problem davam edərsə, %1$s nömrəsi ilə Müştəri Xidmətinə zəng edib xəta kodunun 9004 olduğunu bildirin.</string>
+  <string name="vvm3_error_vmg_no_cellular_title">Səsli E-Poçt Qutunuza Daxil Olmaq Mümkün Deyil</string>
+  <string name="vvm3_error_vmg_no_cellular_message">Səsli e-poçt qutunuza daxil ola bilmirik. Əgər hazırda olduğunuz məkanda siqnal zəifdirsə, siqnalın güclənməsini gözləyib yenidən cəhd edin. Problem davam edərsə, %1$s nömrəsi ilə Müştəri Xidmətinə zəng edib xəta kodunun 9005 olduğunu bildirin.</string>
+  <string name="vvm3_error_spg_no_cellular_title">Səsli E-Poçt Qutunuza Daxil Olmaq Mümkün Deyil</string>
+  <string name="vvm3_error_spg_no_cellular_message">Səsli e-poçt qutunuza daxil ola bilmirik. Əgər hazırda olduğunuz məkanda siqnal zəifdirsə, siqnalın güclənməsini gözləyib yenidən cəhd edin. Problem davam edərsə, %1$s nömrəsi ilə Müştəri Xidmətinə zəng edib xəta kodunun 9006 olduğunu bildirin.</string>
+  <string name="vvm3_error_vms_timeout_title">Xəta Baş Verdi</string>
+  <string name="vvm3_error_vms_timeout_message">Problem baş verdi. Daha sonra yenidən cəhd edin. Problem davam edərsə, %1$s nömrəsi ilə Müştəri Xidmətinə zəng edib xəta kodunun 9007 olduğunu bildirin.</string>
+  <string name="vvm3_error_vmg_timeout_title">Xəta Baş Verdi</string>
+  <string name="vvm3_error_vmg_timeout_message">Problem baş verdi. Daha sonra yenidən cəhd edin. Problem davam edərsə, %1$s nömrəsi ilə Müştəri Xidmətinə zəng edib xəta kodunun 9008 olduğunu bildirin.</string>
+  <string name="vvm3_error_status_sms_timeout_title">Xəta Baş Verdi</string>
+  <string name="vvm3_error_status_sms_timeout_message">Xidməti ayarlaya bilmirik. Problem davam edərsə, %1$s nömrəsi ilə Müştəri Xidmətinə zəng edib xəta kodunun 9009 olduğunu bildirin.</string>
+  <string name="vvm3_error_subscriber_blocked_title">Səsli E-Poçt Qutunuza Daxil Olmaq Mümkün Deyil</string>
+  <string name="vvm3_error_subscriber_blocked_message">Hazırda səsli e-poçt qutusuna daxil ola bilmirik. Daha sonra yenidən cəhd edin. Problem davam edərsə, %1$s nömrəsi ilə Müştəri Xidmətinə zəng edib xəta kodunun 9990 olduğunu bildirin.</string>
+  <string name="vvm3_error_unknown_user_title">Səsli E-Poçt Ayarlayın</string>
+  <string name="vvm3_error_unknown_user_message">Səsli e-poçt hesabınızda ayarlanmayıb. %1$s nömrəsi ilə Müştəri Xidmətinə zəng edib xəta kodunun 9991 olduğunu bildirin.</string>
+  <string name="vvm3_error_unknown_device_title">Səsli e-poçt</string>
+  <string name="vvm3_error_unknown_device_message">Vizual səsli e-poçt bu cihazda istifadə oluna bilməz. %1$s nömrəsi ilə Müştəri Xidmətinə zəng edib xəta kodunun 9992 olduğunu bildirin.</string>
+  <string name="vvm3_error_invalid_password_title">Xəta Baş Verdi</string>
+  <string name="vvm3_error_invalid_password_message">%1$s nömrəsi ilə Müştəri Xidmətinə zəng edib xəta kodunun 9993 olduğunu bildirin.</string>
+  <string name="vvm3_error_mailbox_not_initialized_title">Vizual səsli e-poçt</string>
+  <string name="vvm3_error_mailbox_not_initialized_message">Vizual Səsli e-poçtun ayarlanmasını tamamlamaq üçün %1$s nömrəsi ilə Müştəri Xidmətinə zəng edib xəta kodunun 9994 olduğunu bildirin.</string>
+  <string name="vvm3_error_service_not_provisioned_title">Vizual səsli e-poçt</string>
+  <string name="vvm3_error_service_not_provisioned_message">Vizual səsli e-poçtun ayarlanmasını tamamlamaq üçün %1$s nömrəsi ilə Müştəri Xidmətinə zəng edib xəta kodunun 9995 olduğunu bildirin.</string>
+  <string name="vvm3_error_service_not_activated_title">Vizual səsli e-poçt</string>
+  <string name="vvm3_error_service_not_activated_message">Vizual səsli e-poçtu aktiv etmək üçün %1$s nömrəsi ilə Müştəri Xidmətinə zəng edib xəta kodunun 9996 olduğunu bildirin.</string>
+  <string name="vvm3_error_user_blocked_title">Xəta Baş Verdi</string>
+  <string name="vvm3_error_user_blocked_message">Vizual səsli e-poçtun ayarlanmasını tamamlamaq üçün %1$s nömrəsi ilə Müştəri Xidməti ilə əlaqə saxlayıb xəta kodunun 9998 olduğunu bildirin.</string>
+  <string name="vvm3_error_subscriber_unknown_title">Vizual səsli e-poçt deaktivdir</string>
+  <string name="vvm3_error_subscriber_unknown_message">Vizual səsli e-poçtu aktiv etmək üçün %1$s nömrəsi ilə Müştəri Xidmətinə zəng edin.</string>
+  <string name="vvm3_error_imap_getquota_error_title">Xəta Baş Verdi</string>
+  <string name="vvm3_error_imap_getquota_error_message">%1$s nömrəsi ilə Müştəri Xidmətinə zəng edib xəta kodunun 9997 olduğunu bildirin.</string>
+  <string name="vvm3_error_imap_select_error_title">Xəta Baş Verdi</string>
+  <string name="vvm3_error_imap_select_error_message">%1$s nömrəsi ilə Müştəri Xidmətinə zəng edib xəta kodunun 9989 olduğunu bildirin.</string>
+  <string name="vvm3_error_imap_error_title">Xəta Baş Verdi</string>
+  <string name="vvm3_error_imap_error_message">%1$s nömrəsi ilə Müştəri Xidmətinə zəng edib xəta kodunun 9999 olduğunu bildirin.</string>
+  <string name="verizon_terms_and_conditions_title">Vizual səsli e-poçtu aktiv edin</string>
+  <string name="verizon_terms_and_conditions_message">%1$s Vizual səsli e-poçtu aktiv etməklə Verizon Wireless\'in şərt və qaydaları ilə razılaşırsınız:\n\n%2$s</string>
+  <string name="dialer_terms_and_conditions_title">Vizual səsli e-poçtu aktiv edin</string>
+  <string name="dialer_terms_and_conditions_existing_user_title">Yenilik! Səsli e-poçtu oxuyun</string>
+  <string name="dialer_terms_and_conditions_message">%s</string>
+  <string name="dialer_terms_and_conditions_1.0">Səsli e-poçtda zəng etmədən mesajlara baxın və qulaq asın. İndi səsli e-poçtun transkripsiyası Google\'un ödənişsiz transkripsiya xidməti tərəfindən təmin edilir. Bunu istənilən zaman Ayarlardan deaktiv edə bilərsiniz. %s</string>
+  <string name="dialer_terms_and_conditions_existing_user">İndi səsli e-poçtun transkripsiyası Google\'un ödənişsiz transkripsiya xidməti tərəfindən təmin edilir. Bu funksiyanı istənilən zaman Ayarlardan deaktiv edə bilərsiniz. %s</string>
+  <string name="dialer_terms_and_conditions_for_verizon_1.0">Səsli e-poçta zəng etmədən mesajlara baxın və qulaq asın.</string>
+  <string name="dialer_terms_and_conditions_learn_more">Ətraflı məlumat</string>
+  <string name="dialer_terms_and_conditions_existing_user_ack">Ok, anladım</string>
+  <string name="dialer_terms_and_conditions_existing_user_decline">Xeyr, Təşəkkür</string>
+  <string name="terms_and_conditions_decline_dialog_title">Vizual səsli e-poçt deaktiv edilsin?</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_message">Şərtlər və qaydalar rədd edilərsə, vizual səsli e-poçt deaktiv ediləcək.</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_downgrade">Deaktiv edin</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_message">Vizual səsli e-poçtu deaktiv etsəniz, o deaktiv ediləcək.</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_downgrade">Deaktiv edin</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message">Səsli e-poçt yalnız *86 nömrəsinə zəng etməklə mümkündür. Davam etmək üçün yeni səsli e-poçt PIN kodu təyin edin.</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin">PIN ayarlayın</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/error/res/values-b+sr+Latn/strings.xml b/java/com/android/dialer/voicemail/listui/error/res/values-b+sr+Latn/strings.xml
new file mode 100644
index 0000000..8ad1813
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/error/res/values-b+sr+Latn/strings.xml
@@ -0,0 +1,102 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_error_activating_title">Aktivira se vizuelna govorna pošta</string>
+  <string name="voicemail_error_activating_message">Možda nećete dobijati obaveštenja o govornoj pošti dok potpuno ne aktivirate vizuelnu govornu poštu. Pozovite govornu poštu da biste preuzeli nove poruke dok govorna pošta ne bude potpuno aktivirana.</string>
+  <string name="voicemail_error_not_activate_no_signal_title">Aktiviranje vizuelne govorne pošte nije uspelo</string>
+  <string name="voicemail_error_not_activate_no_signal_message">Proverite da li telefon ima vezu preko mobilne mreže i probajte ponovo.</string>
+  <string name="voicemail_error_not_activate_no_signal_airplane_mode_message">Isključite režim rada u avionu i probajte ponovo.</string>
+  <string name="voicemail_error_no_signal_title">Veza nije uspostavljena</string>
+  <string name="voicemail_error_no_signal_message">Nećete dobijati obaveštenja o novim govornim porukama. Ako ste na Wi‑Fi mreži, možete da sinhronizujete da biste proverili govornu poštu.</string>
+  <string name="voicemail_error_no_signal_airplane_mode_message">Nećete dobijati obaveštenja o novim govornim porukama. Isključite režim rada u avionu da biste sinhronizovali govornu poštu.</string>
+  <string name="voicemail_error_no_signal_cellular_required_message">Telefonu je za proveru govorne pošte potrebna veza za prenos podataka preko mobilnog operatera.</string>
+  <string name="voicemail_error_activation_failed_title">Aktiviranje vizuelne govorne pošte nije uspelo</string>
+  <string name="voicemail_error_activation_failed_message">I dalje možete da pozovete govornu poštu da biste je proverili.</string>
+  <string name="voicemail_error_no_data_title">Ažuriranje vizuelne govorne pošte nije uspelo</string>
+  <string name="voicemail_error_no_data_message">Probajte ponovo kad budete imali bolju Wi‑Fi ili vezu za prenos podataka preko mobilnog operatera. I dalje možete da pozovete govornu poštu da biste je proverili.</string>
+  <string name="voicemail_error_no_data_cellular_required_message">Probajte ponovo kad budete imali bolju vezu za prenos podataka preko mobilnog operatera. I dalje možete da pozovete govornu poštu da biste je proverili.</string>
+  <string name="voicemail_error_bad_config_title">Ažuriranje vizuelne govorne pošte nije uspelo</string>
+  <string name="voicemail_error_bad_config_message">I dalje možete da pozovete govornu poštu da biste je proverili.</string>
+  <string name="voicemail_error_communication_title">Ažuriranje vizuelne govorne pošte nije uspelo</string>
+  <string name="voicemail_error_communication_message">I dalje možete da pozovete govornu poštu da biste je proverili.</string>
+  <string name="voicemail_error_server_connection_title">Ažuriranje vizuelne govorne pošte nije uspelo</string>
+  <string name="voicemail_error_server_connection_message">I dalje možete da pozovete govornu poštu da biste je proverili.</string>
+  <string name="voicemail_error_server_title">Ažuriranje vizuelne govorne pošte nije uspelo</string>
+  <string name="voicemail_error_server_message">I dalje možete da pozovete govornu poštu da biste je proverili.</string>
+  <string name="voicemail_error_inbox_near_full_title">Prijemno sanduče je skoro puno</string>
+  <string name="voicemail_error_inbox_near_full_message">Nećete moći da primate novu govornu poštu ako je prijemno sanduče puno.</string>
+  <string name="voicemail_error_inbox_full_title">Ne možete da primate nove govorne poruke</string>
+  <string name="voicemail_error_inbox_full_message">Prijemno sanduče je puno. Izbrišite neke poruke da biste primili novu govornu poštu.</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_title">Uključite dodatni memorijski prostor i rezervne kopije</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_message">Poštansko sanduče je puno. Da biste oslobodili prostor, uključite dodatni memorijski prostor, pa će Google moći da upravlja vašim govornim porukama i pravi njihove rezervne kopije.</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_title">Uključite dodatni memorijski prostor i rezervne kopije</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_message">Poštansko sanduče je skoro puno. Da biste oslobodili prostor, uključite dodatni memorijski prostor, pa će Google moći da upravlja vašim govornim porukama i pravi njihove rezervne kopije.</string>
+  <string name="voicemail_error_pin_not_set_title">Podesite PIN kôd govorne pošte</string>
+  <string name="voicemail_error_pin_not_set_message">PIN kôd govorne pošte vam treba svaki put kad upućujete poziv da biste pristupili govornoj pošti.</string>
+  <string name="voicemail_action_turn_off_airplane_mode">Podešavanja režima rada u avionu</string>
+  <string name="voicemail_action_set_pin">Podesi PIN</string>
+  <string name="voicemail_action_retry">Probaj ponovo</string>
+  <string name="voicemail_action_turn_archive_on">Uključi</string>
+  <string name="voicemail_action_dimiss">Ne, hvala</string>
+  <string name="voicemail_action_sync">Sinhronizuj</string>
+  <string name="voicemail_action_call_voicemail">Pozovi govornu poštu</string>
+  <string name="voicemail_action_call_customer_support">Pozovi korisničku podršku</string>
+  <string name="vvm3_error_vms_dns_failure_title">Nešto nije u redu</string>
+  <string name="vvm3_error_vms_dns_failure_message">Žao nam je, naišli smo na problem. Probajte ponovo kasnije. Ako i dalje bude problema, kontaktirajte korisničku podršku na %1$s i recite im da je kôd greške 9001.</string>
+  <string name="vvm3_error_vmg_dns_failure_title">Nešto nije u redu</string>
+  <string name="vvm3_error_vmg_dns_failure_message">Žao nam je, naišli smo na problem. Probajte ponovo kasnije. Ako i dalje bude problema, kontaktirajte korisničku podršku na %1$s i recite im da je kôd greške 9002.</string>
+  <string name="vvm3_error_spg_dns_failure_title">Nešto nije u redu</string>
+  <string name="vvm3_error_spg_dns_failure_message">Žao nam je, naišli smo na problem. Probajte ponovo kasnije. Ako i dalje bude problema, kontaktirajte korisničku podršku na %1$s i recite im da je kôd greške 9003.</string>
+  <string name="vvm3_error_vms_no_cellular_title">Povezivanje sa sandučetom govorne pošte nije uspelo</string>
+  <string name="vvm3_error_vms_no_cellular_message">Žao nam je, imamo probleme pri povezivanju sa sandučetom govorne pošte. Ako ste u oblasti sa slabim signalom, sačekajte dok ne budete imali jak signal i probajte ponovo. Ako i dalje bude problema, kontaktirajte korisničku podršku na %1$s i recite im da je kôd greške 9004.</string>
+  <string name="vvm3_error_vmg_no_cellular_title">Povezivanje sa sandučetom govorne pošte nije uspelo</string>
+  <string name="vvm3_error_vmg_no_cellular_message">Žao nam je, imamo probleme pri povezivanju sa sandučetom govorne pošte. Ako ste u oblasti sa slabim signalom, sačekajte dok ne budete imali jak signal i probajte ponovo. Ako i dalje bude problema, kontaktirajte korisničku podršku na %1$s i recite im da je kôd greške 9005.</string>
+  <string name="vvm3_error_spg_no_cellular_title">Povezivanje sa sandučetom govorne pošte nije uspelo</string>
+  <string name="vvm3_error_spg_no_cellular_message">Žao nam je, imamo probleme pri povezivanju sa sandučetom govorne pošte. Ako ste u oblasti sa slabim signalom, sačekajte dok ne budete imali jak signal i probajte ponovo. Ako i dalje bude problema, kontaktirajte korisničku podršku na %1$s i recite im da je kôd greške 9006.</string>
+  <string name="vvm3_error_vms_timeout_title">Nešto nije u redu</string>
+  <string name="vvm3_error_vms_timeout_message">Žao nam je, naišli smo na problem. Probajte ponovo kasnije. Ako i dalje bude problema, kontaktirajte korisničku podršku na %1$s i recite im da je kôd greške 9007.</string>
+  <string name="vvm3_error_vmg_timeout_title">Nešto nije u redu</string>
+  <string name="vvm3_error_vmg_timeout_message">Žao nam je, naišli smo na problem. Probajte ponovo kasnije. Ako i dalje bude problema, kontaktirajte korisničku podršku na %1$s i recite im da je kôd greške 9008.</string>
+  <string name="vvm3_error_status_sms_timeout_title">Nešto nije u redu</string>
+  <string name="vvm3_error_status_sms_timeout_message">Žao nam je, imamo probleme pri podešavanju usluge. Probajte ponovo kasnije. Ako i dalje bude problema, kontaktirajte korisničku podršku na %1$s i recite im da je kôd greške 9009.</string>
+  <string name="vvm3_error_subscriber_blocked_title">Povezivanje sa sandučetom govorne pošte nije uspelo</string>
+  <string name="vvm3_error_subscriber_blocked_message">Žao nam je, trenutno ne možemo da se povežemo sa sandučetom govorne pošte. Probajte ponovo kasnije. Ako i dalje bude problema, kontaktirajte korisničku podršku na %1$s i recite im da je kôd greške 9990.</string>
+  <string name="vvm3_error_unknown_user_title">Podesite govornu poštu</string>
+  <string name="vvm3_error_unknown_user_message">Govorna pošta nije podešena na nalogu. Kontaktirajte korisničku podršku na %1$s i recite im da je kôd greške 9991.</string>
+  <string name="vvm3_error_unknown_device_title">Govorna pošta</string>
+  <string name="vvm3_error_unknown_device_message">Ne možete da koristite vizuelnu govornu poštu na ovom uređaju. Kontaktirajte korisničku podršku na %1$s i recite im da je kôd greške 9992.</string>
+  <string name="vvm3_error_invalid_password_title">Nešto nije u redu</string>
+  <string name="vvm3_error_invalid_password_message">Kontaktirajte korisničku podršku na %1$s i recite im da je kôd greške 9993.</string>
+  <string name="vvm3_error_mailbox_not_initialized_title">Vizuelna govorna pošta</string>
+  <string name="vvm3_error_mailbox_not_initialized_message">Da biste završili podešavanje vizuelne govorne pošte, kontaktirajte korisničku podršku na %1$s i recite im da je kôd greške 9994.</string>
+  <string name="vvm3_error_service_not_provisioned_title">Vizuelna govorna pošta</string>
+  <string name="vvm3_error_service_not_provisioned_message">Da biste završili podešavanje vizuelne govorne pošte, kontaktirajte korisničku podršku na %1$s i recite im da je kôd greške 9995.</string>
+  <string name="vvm3_error_service_not_activated_title">Vizuelna govorna pošta</string>
+  <string name="vvm3_error_service_not_activated_message">Da biste aktivirali vizuelnu govornu poštu, kontaktirajte korisničku podršku na %1$s i recite im da je kôd greške 9996.</string>
+  <string name="vvm3_error_user_blocked_title">Nešto nije u redu</string>
+  <string name="vvm3_error_user_blocked_message">Da biste završili podešavanje vizuelne govorne pošte, kontaktirajte korisničku podršku na %1$s i recite im da je kôd greške 9998.</string>
+  <string name="vvm3_error_subscriber_unknown_title">Vizuelna govorna pošta je onemogućena</string>
+  <string name="vvm3_error_subscriber_unknown_message">Kontaktirajte korisničku podršku na %1$s da biste aktivirali vizuelnu govornu poštu.</string>
+  <string name="vvm3_error_imap_getquota_error_title">Nešto nije u redu</string>
+  <string name="vvm3_error_imap_getquota_error_message">Kontaktirajte korisničku podršku na %1$s i recite im da je kôd greške 9997.</string>
+  <string name="vvm3_error_imap_select_error_title">Nešto nije u redu</string>
+  <string name="vvm3_error_imap_select_error_message">Kontaktirajte korisničku podršku na %1$s i recite im da je kôd greške 9989.</string>
+  <string name="vvm3_error_imap_error_title">Nešto nije u redu</string>
+  <string name="vvm3_error_imap_error_message">Kontaktirajte korisničku podršku na %1$s i recite im da je kôd greške 9999.</string>
+  <string name="verizon_terms_and_conditions_title">Uključite vizuelnu govornu poštu</string>
+  <string name="verizon_terms_and_conditions_message">%1$s Ako uključite vizuelnu govornu poštu, prihvatate uslove i odredbe za Verizon Wireless:\n\n%2$s</string>
+  <string name="dialer_terms_and_conditions_title">Uključite vizuelnu govornu poštu</string>
+  <string name="dialer_terms_and_conditions_existing_user_title">Novo! Pročitajte govornu poštu.</string>
+  <string name="dialer_terms_and_conditions_message">%s</string>
+  <string name="dialer_terms_and_conditions_1.0">Pregledajte i slušajte poruke bez pozivanja govorne pošte. Transkripte govornih poruka dobijate pomoću Google-ove besplatne usluge transkripcije. Obe opcije uvek možete da isključite u Podešavanjima. %s</string>
+  <string name="dialer_terms_and_conditions_existing_user">Transkripte govornih poruka dobijate pomoću Google-ove besplatne usluge transkripcije. Ovo uvek možete da isključite u Podešavanjima. %s</string>
+  <string name="dialer_terms_and_conditions_for_verizon_1.0">Pregledajte i slušajte poruke bez pozivanja govorne pošte.</string>
+  <string name="dialer_terms_and_conditions_learn_more">Saznajte više</string>
+  <string name="dialer_terms_and_conditions_existing_user_ack">Važi</string>
+  <string name="dialer_terms_and_conditions_existing_user_decline">Ne, hvala</string>
+  <string name="terms_and_conditions_decline_dialog_title">Želite li da onemogućite vizuelnu govornu poštu?</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_message">Ako odbijete uslove i odredbe, onemogućićete vizuelnu govornu poštu.</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_downgrade">Onemogući</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_message">Vizuelna govorna pošta će biti onemogućena ako je isključite.</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_downgrade">Onemogući</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message">Govornoj pošti ćete moći da pristupite samo ako pozovete *86. Podesite novi PIN kôd govorne pošte da biste nastavili.</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin">Podesite PIN</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/error/res/values-be/strings.xml b/java/com/android/dialer/voicemail/listui/error/res/values-be/strings.xml
new file mode 100644
index 0000000..fc6f182
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/error/res/values-be/strings.xml
@@ -0,0 +1,102 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_error_activating_title">Актывацыя візуальнай галасавой пошты</string>
+  <string name="voicemail_error_activating_message">Вы можаце не атрымліваць апавяшчэнні галасавой пошты, пакуль візуальная галасавая пошта не будзе поўнасцю актывавана. Каб атрымліваць новыя паведамленні да завяршэння актывацыі, выклікайце галасавую пошту.</string>
+  <string name="voicemail_error_not_activate_no_signal_title">Немагчыма актываваць візуальную галасавую пошту</string>
+  <string name="voicemail_error_not_activate_no_signal_message">Пераканайцеся, што ваш тэлефон падключаны да мабільнай сеткі і паўтарыце спробу.</string>
+  <string name="voicemail_error_not_activate_no_signal_airplane_mode_message">Выключыце рэжым палёту і паўтарыце спробу.</string>
+  <string name="voicemail_error_no_signal_title">Няма падключэння</string>
+  <string name="voicemail_error_no_signal_message">Вас не будуць апавяшчаць аб новых галасавых паведамленнях. Калі вы падключаны да Wi-Fi, можаце праверыць галасавую пошту шляхам сінхранізацыі.</string>
+  <string name="voicemail_error_no_signal_airplane_mode_message">Вас не будуць апавяшчаць аб новых галасавых паведамленнях. Выключыце рэжым палёту і сінхранізуйце галасавую пошту.</string>
+  <string name="voicemail_error_no_signal_cellular_required_message">Каб праверыць галасавую пошту, вашаму тэлефону патрэбна падключэнне да мабільнай перадачы даных.</string>
+  <string name="voicemail_error_activation_failed_title">Немагчыма актываваць візуальную галасавую пошту</string>
+  <string name="voicemail_error_activation_failed_message">Каб праверыць галасавую пошту, вы таксама можаце зрабіць выклік.</string>
+  <string name="voicemail_error_no_data_title">Немагчыма абнавіць візуальную галасавую пошту</string>
+  <string name="voicemail_error_no_data_message">Паўтарыце спробу, калі падключэнне да Wi-Fi або да мабільнай перадачы даных палепшыцца. Каб праверыць галасавую пошту, вы таксама можаце зрабіць выклік.</string>
+  <string name="voicemail_error_no_data_cellular_required_message">Паўтарыце спробу, калі падключэнне да мабільнай перадачы даных палепшыцца. Каб праверыць галасавую пошту, вы таксама можаце зрабіць выклік.</string>
+  <string name="voicemail_error_bad_config_title">Немагчыма абнавіць візуальную галасавую пошту</string>
+  <string name="voicemail_error_bad_config_message">Каб праверыць галасавую пошту, вы таксама можаце зрабіць выклік.</string>
+  <string name="voicemail_error_communication_title">Немагчыма абнавіць візуальную галасавую пошту</string>
+  <string name="voicemail_error_communication_message">Каб праверыць галасавую пошту, вы таксама можаце зрабіць выклік.</string>
+  <string name="voicemail_error_server_connection_title">Немагчыма абнавіць візуальную галасавую пошту</string>
+  <string name="voicemail_error_server_connection_message">Каб праверыць галасавую пошту, вы таксама можаце зрабіць выклік.</string>
+  <string name="voicemail_error_server_title">Немагчыма абнавіць візуальную галасавую пошту</string>
+  <string name="voicemail_error_server_message">Каб праверыць галасавую пошту, вы таксама можаце зрабіць выклік.</string>
+  <string name="voicemail_error_inbox_near_full_title">Папка ўваходных амаль запоўнена</string>
+  <string name="voicemail_error_inbox_near_full_message">Вы не зможаце атрымліваць новыя галасавыя паведамленні, калі ваша папка ўваходных поўная.</string>
+  <string name="voicemail_error_inbox_full_title">Немагчыма атрымліваць новыя галасавыя паведамленні</string>
+  <string name="voicemail_error_inbox_full_message">Ваша папка ўваходных запоўнена. Паспрабуйце выдаліць некалькі паведамленняў, каб атрымаць новую галасавую пошту.</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_title">Уключыць дадатковае сховішча і рэзервовае капіраванне</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_message">Ваша паштовая скрыня запоўнена. Каб вызваліць месца, уключыце дадатковае сховішча, каб Google мог кіраваць вашымі паведамленнямі галасавой пошты і рабіць іх рэзервовую копію.</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_title">Уключыць дадатковае сховішча і рэзервовае капіраванне</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_message">Ваша паштовая скрыня амаль запоўнена. Каб вызваліць месца, уключыце дадатковае сховішча, каб Google мог кіраваць вашымі паведамленнямі галасавой пошты і рабіць іх рэзервовую копію.</string>
+  <string name="voicemail_error_pin_not_set_title">Наладзьце PIN-код галасавой пошты</string>
+  <string name="voicemail_error_pin_not_set_message">PIN-код будзе патрэбны падчас кожнага выкліку на галасавую пошту.</string>
+  <string name="voicemail_action_turn_off_airplane_mode">Налады рэжыму палёту</string>
+  <string name="voicemail_action_set_pin">Задаць PIN-код</string>
+  <string name="voicemail_action_retry">Паўтарыць</string>
+  <string name="voicemail_action_turn_archive_on">Уключыць</string>
+  <string name="voicemail_action_dimiss">Не, дзякуй</string>
+  <string name="voicemail_action_sync">Сінхранізаваць</string>
+  <string name="voicemail_action_call_voicemail">Выклік на галасавую пошту</string>
+  <string name="voicemail_action_call_customer_support">Выклік у службу падтрымкі</string>
+  <string name="vvm3_error_vms_dns_failure_title">Нешта пайшло не так</string>
+  <string name="vvm3_error_vms_dns_failure_message">На жаль, узнікла праблема. Паўтарыце спробу пазней. Калі праблема не знікне, звяжыцеся са Службай падтрымкі па нумары %1$s і паведаміце код памылкі 9001.</string>
+  <string name="vvm3_error_vmg_dns_failure_title">Нешта пайшло не так</string>
+  <string name="vvm3_error_vmg_dns_failure_message">На жаль, узнікла праблема. Паўтарыце спробу пазней. Калі праблема не знікне, звяжыцеся са Службай падтрымкі па нумары %1$s і паведаміце код памылкі 9002.</string>
+  <string name="vvm3_error_spg_dns_failure_title">Нешта пайшло не так</string>
+  <string name="vvm3_error_spg_dns_failure_message">На жаль, узнікла праблема. Паўтарыце спробу пазней. Калі праблема не знікне, звяжыцеся са Службай падтрымкі па нумары %1$s і паведаміце код памылкі 9003.</string>
+  <string name="vvm3_error_vms_no_cellular_title">Не ўдалося падключыцца да вашай галасавой скрынкі</string>
+  <string name="vvm3_error_vms_no_cellular_message">На жаль, узнікла праблема з падключэннем да вашай галасавой скрынкі. Калі вы знаходзіцеся ў месцы з дрэнным сігналам, пачакайце, калі сігнал стане лепшым, і паўтарыце спробу. Калі праблема не знікне, звяжыцеся са Службай падтрымкі па нумары %1$s і паведаміце код памылкі 9004.</string>
+  <string name="vvm3_error_vmg_no_cellular_title">Не ўдалося падключыцца да вашай галасавой скрынкі</string>
+  <string name="vvm3_error_vmg_no_cellular_message">На жаль, узнікла праблема з падключэннем да вашай галасавой скрынкі. Калі вы знаходзіцеся ў месцы з дрэнным сігналам, пачакайце, калі сігнал стане лепшым, і паўтарыце спробу. Калі праблема не знікне, звяжыцеся са Службай падтрымкі па нумары %1$s і паведаміце код памылкі 9005.</string>
+  <string name="vvm3_error_spg_no_cellular_title">Не ўдалося падключыцца да вашай галасавой скрынкі</string>
+  <string name="vvm3_error_spg_no_cellular_message">На жаль, узнікла праблема з падключэннем да вашай галасавой скрынкі. Калі вы знаходзіцеся ў месцы з дрэнным сігналам, пачакайце, калі сігнал стане лепшым, і паўтарыце спробу. Калі праблема не знікне, звяжыцеся са Службай падтрымкі па нумары %1$s і паведаміце код памылкі 9006.</string>
+  <string name="vvm3_error_vms_timeout_title">Нешта пайшло не так</string>
+  <string name="vvm3_error_vms_timeout_message">На жаль, узнікла праблема. Паўтарыце спробу пазней. Калі праблема не знікне, звяжыцеся са Службай падтрымкі па нумары %1$s і паведаміце код памылкі 9007.</string>
+  <string name="vvm3_error_vmg_timeout_title">Нешта пайшло не так</string>
+  <string name="vvm3_error_vmg_timeout_message">На жаль, узнікла праблема. Паўтарыце спробу пазней. Калі праблема не знікне, звяжыцеся са Службай падтрымкі па нумары %1$s і паведаміце код памылкі 9008.</string>
+  <string name="vvm3_error_status_sms_timeout_title">Нешта пайшло не так</string>
+  <string name="vvm3_error_status_sms_timeout_message">На жаль, узнікла праблема з наладай сэрвісу. Паўтарыце спробу пазней. Калі праблема не знікне, звяжыцеся са Службай падтрымкі па нумары %1$s і паведаміце код памылкі 9009.</string>
+  <string name="vvm3_error_subscriber_blocked_title">Не ўдалося падключыцца да вашай галасавой скрынкі</string>
+  <string name="vvm3_error_subscriber_blocked_message">На жаль, узнікла праблема з падключэннем да вашай галасавой скрынкі. Паўтарыце спробу пазней. Калі праблема не знікне, звяжыцеся са Службай падтрымкі па нумары %1$s і паведаміце код памылкі 9990.</string>
+  <string name="vvm3_error_unknown_user_title">Наладзіць галасавую пошту</string>
+  <string name="vvm3_error_unknown_user_message">Галасавая пошта не наладжана для вашага ўліковага запісу. Звяжыцеся са Службай падтрымкі па нумары %1$s і паведаміце код памылкі 9991.</string>
+  <string name="vvm3_error_unknown_device_title">Галасавая пошта</string>
+  <string name="vvm3_error_unknown_device_message">Галасавая пошта не можа выкарыстоўвацца на гэтай прыладзе. Звяжыцеся са службай падтрымкі па нумары %1$s і паведаміце код памылкі 9992.</string>
+  <string name="vvm3_error_invalid_password_title">Нешта пайшло не так</string>
+  <string name="vvm3_error_invalid_password_message">Звяжыцеся са Службай падтрымкі па нумары %1$s і паведаміце код памылкі 9993.</string>
+  <string name="vvm3_error_mailbox_not_initialized_title">Візуальная галасавая пошта</string>
+  <string name="vvm3_error_mailbox_not_initialized_message">Каб завяршыць наладжванне візуальнай галасавой пошты, звяжыцеся са службай падтрымкі па нумары %1$s і паведаміце код памылкі 9994.</string>
+  <string name="vvm3_error_service_not_provisioned_title">Візуальная галасавая пошта</string>
+  <string name="vvm3_error_service_not_provisioned_message">Каб завяршыць наладжванне візуальнай галасавой пошты, звяжыцеся са службай падтрымкі па нумары %1$s і паведаміце код памылкі 9995.</string>
+  <string name="vvm3_error_service_not_activated_title">Візуальная галасавая пошта</string>
+  <string name="vvm3_error_service_not_activated_message">Каб актываваць візуальную галасавую пошту, звяжыцеся са службай падтрымкі па нумары %1$s і паведаміце код памылкі 9996.</string>
+  <string name="vvm3_error_user_blocked_title">Нешта пайшло не так</string>
+  <string name="vvm3_error_user_blocked_message">Каб завяршыць наладжванне візуальнай галасавой пошты, звяжыцеся са службай падтрымкі па нумары %1$s і паведаміце код памылкі 9998.</string>
+  <string name="vvm3_error_subscriber_unknown_title">Візуальная галасавая пошта адключаная</string>
+  <string name="vvm3_error_subscriber_unknown_message">Каб актываваць візуальную галасавую пошту, звяжыцеся са Службай падтрымкі па нумары %1$s.</string>
+  <string name="vvm3_error_imap_getquota_error_title">Нешта пайшло не так</string>
+  <string name="vvm3_error_imap_getquota_error_message">Звяжыцеся са Службай падтрымкі па нумары %1$s і паведаміце код памылкі 9997.</string>
+  <string name="vvm3_error_imap_select_error_title">Нешта пайшло не так</string>
+  <string name="vvm3_error_imap_select_error_message">Звяжыцеся са Службай падтрымкі па нумары %1$s і паведаміце код памылкі 9989.</string>
+  <string name="vvm3_error_imap_error_title">Нешта пайшло не так</string>
+  <string name="vvm3_error_imap_error_message">Звяжыцеся са Службай падтрымкі па нумары %1$s і паведаміце код памылкі 9999.</string>
+  <string name="verizon_terms_and_conditions_title">Уключыць візуальную галасавую пошту</string>
+  <string name="verizon_terms_and_conditions_message">%1$s Уключэнне візуальнай галасавой пошты азначае, што вы згаджаецеся з умовамі Verizon Wireless:\n\n%2$s</string>
+  <string name="dialer_terms_and_conditions_title">Уключыць візуальную галасавую пошту</string>
+  <string name="dialer_terms_and_conditions_existing_user_title">Навінка! Чытайце галасавую пошту</string>
+  <string name="dialer_terms_and_conditions_message">%s</string>
+  <string name="dialer_terms_and_conditions_1.0">Праглядайце і праслухоўвайце паведамленні без званкоў на галасавую пошту. Google бясплатна расшыфруе іх і запіша як тэкст. Любую з гэтых функцый можна адключыць у любы час у наладах. %s</string>
+  <string name="dialer_terms_and_conditions_existing_user">Цяпер Google бясплатна расшыфруе паведамленні галасавой пошты і запіша іх як тэкст. Гэту функцыю можна адключыць у любы час у наладах. %s</string>
+  <string name="dialer_terms_and_conditions_for_verizon_1.0">Праглядайце і праслухоўвайце паведамленні без званкоў на галасавую пошту.</string>
+  <string name="dialer_terms_and_conditions_learn_more">Даведацца больш</string>
+  <string name="dialer_terms_and_conditions_existing_user_ack">OK</string>
+  <string name="dialer_terms_and_conditions_existing_user_decline">Не, дзякуй</string>
+  <string name="terms_and_conditions_decline_dialog_title">Адключыць візуальную галасавую пошту?</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_message">Без згоды з правіламі і ўмовамі візуальная галасавая пошта будзе адключана.</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_downgrade">Адключыць</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_message">Пасля адключэння візуальная галасавая пошта будзе недаступная.</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_downgrade">Адключыць</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message">Галасавая пошта даступна толькі па выкліку на нумар *86. Каб працягнуць, задайце новы PIN-код галасавой пошты.</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin">Задаць PIN-код</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/error/res/values-bg/strings.xml b/java/com/android/dialer/voicemail/listui/error/res/values-bg/strings.xml
new file mode 100644
index 0000000..c59fcdc
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/error/res/values-bg/strings.xml
@@ -0,0 +1,102 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_error_activating_title">Визуалната гласова поща се активира</string>
+  <string name="voicemail_error_activating_message">Възможно е да не получавате известия за гласова поща, докато визуалната гласова поща не бъде напълно активирана. Обаждайте се на номера за гласова поща, за да получавате нови съобщения, докато гласовата поща не е активирана.</string>
+  <string name="voicemail_error_not_activate_no_signal_title">Визуалната гласова поща не може да се активира</string>
+  <string name="voicemail_error_not_activate_no_signal_message">Проверете дали телефонът ви има връзка с мобилната мрежа и опитайте отново.</string>
+  <string name="voicemail_error_not_activate_no_signal_airplane_mode_message">Изключете самолетния режим и опитайте отново.</string>
+  <string name="voicemail_error_no_signal_title">Няма връзка</string>
+  <string name="voicemail_error_no_signal_message">Няма да бъдете известявани за нови гласови съобщения. Ако използвате Wi-Fi, можете да проверите за гласова поща, като синхронизирате сега.</string>
+  <string name="voicemail_error_no_signal_airplane_mode_message">Няма да бъдете известявани за нови гласови съобщения. Изключете самолетния режим, за да синхронизирате гласовата си поща.</string>
+  <string name="voicemail_error_no_signal_cellular_required_message">За да проверите гласовата поща, телефонът ви трябва да използва мобилна връзка за данни.</string>
+  <string name="voicemail_error_activation_failed_title">Визуалната гласова поща не може да се активира</string>
+  <string name="voicemail_error_activation_failed_message">Пак можете да проверите гласовата поща чрез обаждане.</string>
+  <string name="voicemail_error_no_data_title">Визуалната гласова поща не може да се актуализира.</string>
+  <string name="voicemail_error_no_data_message">Опитайте отново, когато имате по-добра Wi-Fi връзка или мобилна връзка за данни. Пак можете да проверите гласовата си поща чрез обаждане.</string>
+  <string name="voicemail_error_no_data_cellular_required_message">Опитайте отново, когато имате по-добра мобилна връзка за данни. Пак можете да проверите гласовата си поща чрез обаждане.</string>
+  <string name="voicemail_error_bad_config_title">Визуалната гласова поща не може да се актуализира.</string>
+  <string name="voicemail_error_bad_config_message">Пак можете да проверите гласовата поща чрез обаждане.</string>
+  <string name="voicemail_error_communication_title">Визуалната гласова поща не може да се актуализира.</string>
+  <string name="voicemail_error_communication_message">Пак можете да проверите гласовата поща чрез обаждане.</string>
+  <string name="voicemail_error_server_connection_title">Визуалната гласова поща не може да се актуализира.</string>
+  <string name="voicemail_error_server_connection_message">Пак можете да проверите гласовата поща чрез обаждане.</string>
+  <string name="voicemail_error_server_title">Визуалната гласова поща не може да се актуализира.</string>
+  <string name="voicemail_error_server_message">Пак можете да проверите гласовата поща чрез обаждане.</string>
+  <string name="voicemail_error_inbox_near_full_title">Входящата поща е почти пълна</string>
+  <string name="voicemail_error_inbox_near_full_message">Няма да можете да получавате нова гласова поща, ако входящата ви поща е пълна.</string>
+  <string name="voicemail_error_inbox_full_title">Не могат да се получават нови гласови съобщения</string>
+  <string name="voicemail_error_inbox_full_message">Входящата ви поща е пълна. Опитайте да изтриете съобщения, за да получавате нова гласова поща.</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_title">Включване на допълнително хранилище и създаване на резервно копие</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_message">Пощенската ви кутия е пълна. За да освободите място, включете допълнително хранилище, така че Google да може да управлява и създаде резервно копие на съобщенията в гласовата ви поща.</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_title">Включване на допълнително хранилище и създаване на резервно копие</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_message">Пощенската ви кутия е почти пълна. За да освободите място, включете допълнително хранилище, така че Google да може да управлява и създаде резервно копие на съобщенията в гласовата ви поща.</string>
+  <string name="voicemail_error_pin_not_set_title">Задайте ПИН за гласовата си поща</string>
+  <string name="voicemail_error_pin_not_set_message">Ще ви е необходим ПИН за гласовата поща при всяко обаждане за достъп до съобщенията ви в нея.</string>
+  <string name="voicemail_action_turn_off_airplane_mode">Настройки за самолетен режим</string>
+  <string name="voicemail_action_set_pin">Задаване на ПИН</string>
+  <string name="voicemail_action_retry">Нов опит</string>
+  <string name="voicemail_action_turn_archive_on">Включване</string>
+  <string name="voicemail_action_dimiss">Не, благодаря</string>
+  <string name="voicemail_action_sync">Синхронизиране</string>
+  <string name="voicemail_action_call_voicemail">Обаждане до гласовата поща</string>
+  <string name="voicemail_action_call_customer_support">Свържете се с екипа за поддръжка на клиенти</string>
+  <string name="vvm3_error_vms_dns_failure_title">Нещо се обърка</string>
+  <string name="vvm3_error_vms_dns_failure_message">За съжаление, възникна проблем. Моля, опитайте отново по-късно. Ако проблемът все още е налице, моля, свържете се с екипа за поддръжка на клиенти на телефон %1$s и кажете, че кодът на грешката е 9001.</string>
+  <string name="vvm3_error_vmg_dns_failure_title">Нещо се обърка</string>
+  <string name="vvm3_error_vmg_dns_failure_message">За съжаление, възникна проблем. Моля, опитайте отново по-късно. Ако проблемът все още е налице, моля, свържете се с екипа за поддръжка на клиенти на телефон %1$s и кажете, че кодът на грешката е 9002.</string>
+  <string name="vvm3_error_spg_dns_failure_title">Нещо се обърка</string>
+  <string name="vvm3_error_spg_dns_failure_message">За съжаление, възникна проблем. Моля, опитайте отново по-късно. Ако проблемът все още е налице, моля, свържете се с екипа за поддръжка на клиенти на телефон %1$s и кажете, че кодът на грешката е 9003.</string>
+  <string name="vvm3_error_vms_no_cellular_title">Не може да се установи връзка с гласовата ви пощенска кутия</string>
+  <string name="vvm3_error_vms_no_cellular_message">За съжаление, възникнаха проблеми при осъществяването на връзка с гласовата ви пощенска кутия. Ако се намирате в зона със слаб сигнал, изчакайте, докато се усили, и опитайте отново. Ако проблемът все още е налице, моля, свържете се с екипа за поддръжка на клиенти на телефон %1$s и кажете, че кодът на грешката е 9004.</string>
+  <string name="vvm3_error_vmg_no_cellular_title">Не може да се установи връзка с гласовата ви пощенска кутия</string>
+  <string name="vvm3_error_vmg_no_cellular_message">За съжаление, възникнаха проблеми при осъществяването на връзка с гласовата ви пощенска кутия. Ако се намирате в зона със слаб сигнал, изчакайте, докато се усили, и опитайте отново. Ако проблемът все още е налице, моля, свържете се с екипа за поддръжка на клиенти на телефон %1$s и кажете, че кодът на грешката е 9005.</string>
+  <string name="vvm3_error_spg_no_cellular_title">Не може да се установи връзка с гласовата ви пощенска кутия</string>
+  <string name="vvm3_error_spg_no_cellular_message">За съжаление, възникнаха проблеми при осъществяването на връзка с гласовата ви пощенска кутия. Ако се намирате в зона със слаб сигнал, изчакайте, докато се усили, и опитайте отново. Ако проблемът все още е налице, моля, свържете се с екипа за поддръжка на клиенти на телефон %1$s и кажете, че кодът на грешката е 9006.</string>
+  <string name="vvm3_error_vms_timeout_title">Нещо се обърка</string>
+  <string name="vvm3_error_vms_timeout_message">За съжаление, възникна проблем. Моля, опитайте отново по-късно. Ако проблемът все още е налице, моля, свържете се с екипа за поддръжка на клиенти на телефон %1$s и кажете, че кодът на грешката е 9007.</string>
+  <string name="vvm3_error_vmg_timeout_title">Нещо се обърка</string>
+  <string name="vvm3_error_vmg_timeout_message">За съжаление, възникна проблем. Моля, опитайте отново по-късно. Ако проблемът все още е налице, моля, свържете се с екипа за поддръжка на клиенти на телефон %1$s и кажете, че кодът на грешката е 9008.</string>
+  <string name="vvm3_error_status_sms_timeout_title">Нещо се обърка</string>
+  <string name="vvm3_error_status_sms_timeout_message">За съжаление, имаме проблеми с настройването на устройството ви. Моля, опитайте отново по-късно. Ако проблемът все още е налице, моля, свържете се с екипа за поддръжка на клиенти на телефон %1$s и кажете, че кодът на грешката е 9009.</string>
+  <string name="vvm3_error_subscriber_blocked_title">Не може да се установи връзка с гласовата ви пощенска кутия</string>
+  <string name="vvm3_error_subscriber_blocked_message">За съжаление, имаме проблеми с осъществяването на връзка с гласовата ви пощенска кутия в момента. Моля, опитайте отново по-късно. Ако проблемът все още е налице, моля, свържете се с екипа за поддръжка на клиенти на телефон %1$s и кажете, че кодът на грешката е 9990.</string>
+  <string name="vvm3_error_unknown_user_title">Настройване на гласова поща</string>
+  <string name="vvm3_error_unknown_user_message">Гласовата поща не е настроена за профила ви. Моля, свържете се с екипа за поддръжка на клиенти на телефон %1$s и кажете, че кодът на грешката е 9991.</string>
+  <string name="vvm3_error_unknown_device_title">Гласова поща</string>
+  <string name="vvm3_error_unknown_device_message">На това устройство не може да се използва визуална гласова поща. Моля, свържете се с екипа за поддръжка на клиенти на телефон %1$s и кажете, че кодът на грешката е 9992.</string>
+  <string name="vvm3_error_invalid_password_title">Нещо се обърка</string>
+  <string name="vvm3_error_invalid_password_message">Моля, свържете се с екипа за поддръжка на клиенти на телефон %1$s и кажете, че кодът на грешката е 9993.</string>
+  <string name="vvm3_error_mailbox_not_initialized_title">Визуална гласова поща</string>
+  <string name="vvm3_error_mailbox_not_initialized_message">За да завършите настройването на визуалната гласова поща, моля, свържете се с екипа за поддръжка на клиенти на телефон %1$s и кажете, че кодът на грешката е 9994.</string>
+  <string name="vvm3_error_service_not_provisioned_title">Визуална гласова поща</string>
+  <string name="vvm3_error_service_not_provisioned_message">За да завършите настройването на визуалната гласова поща, моля, свържете се с екипа за поддръжка на клиенти на телефон %1$s и кажете, че кодът на грешката е 9995.</string>
+  <string name="vvm3_error_service_not_activated_title">Визуална гласова поща</string>
+  <string name="vvm3_error_service_not_activated_message">За да активирате визуалната гласова поща, моля, свържете се с екипа за поддръжка на клиенти на телефон %1$s и кажете, че кодът на грешката е 9996.</string>
+  <string name="vvm3_error_user_blocked_title">Нещо се обърка</string>
+  <string name="vvm3_error_user_blocked_message">За да завършите настройването на визуалната гласова поща, моля, свържете се с екипа за поддръжка на клиенти на телефон %1$s и кажете, че кодът на грешката е 9998.</string>
+  <string name="vvm3_error_subscriber_unknown_title">Визуалната гласова поща е декативирана</string>
+  <string name="vvm3_error_subscriber_unknown_message">Моля, свържете се екипа за обслужване на клиенти на телефон %1$s, за да активирате визуалната гласова поща.</string>
+  <string name="vvm3_error_imap_getquota_error_title">Нещо се обърка</string>
+  <string name="vvm3_error_imap_getquota_error_message">Моля, свържете се с екипа за поддръжка на клиенти на телефон %1$s и кажете, че кодът на грешката е 9997.</string>
+  <string name="vvm3_error_imap_select_error_title">Нещо се обърка</string>
+  <string name="vvm3_error_imap_select_error_message">Моля, свържете се с екипа за поддръжка на клиенти на телефон %1$s и кажете, че кодът на грешката е 9989.</string>
+  <string name="vvm3_error_imap_error_title">Нещо се обърка</string>
+  <string name="vvm3_error_imap_error_message">Моля, свържете се с екипа за поддръжка на клиенти на телефон %1$s и кажете, че кодът на грешката е 9999.</string>
+  <string name="verizon_terms_and_conditions_title">Включване на визуалната гласова поща</string>
+  <string name="verizon_terms_and_conditions_message">%1$s Включвайки визуалната гласова поща, приемате общите условия на Verizon Wireless:\n\n%2$s</string>
+  <string name="dialer_terms_and_conditions_title">Включване на визуалната гласова поща</string>
+  <string name="dialer_terms_and_conditions_existing_user_title">Ново! Четете гласовата си поща</string>
+  <string name="dialer_terms_and_conditions_message">%s</string>
+  <string name="dialer_terms_and_conditions_1.0">Виждайте и слушайте съобщенията си, без да трябва да се обаждате до гласовата поща. Преписите на гласовата ви поща се предоставят от безплатната услуга на Google за преписи. Можете да изключите тези функции по всяко време в настройките. %s</string>
+  <string name="dialer_terms_and_conditions_existing_user">Преписите на гласовата ви поща сега се предоставят от безплатната услуга на Google за преписи. Можете да изключите това по всяко време. %s</string>
+  <string name="dialer_terms_and_conditions_for_verizon_1.0">Виждайте и слушайте съобщенията си, без да трябва да се обаждате до гласовата поща.</string>
+  <string name="dialer_terms_and_conditions_learn_more">Научете повече</string>
+  <string name="dialer_terms_and_conditions_existing_user_ack">Добре, разбрах</string>
+  <string name="dialer_terms_and_conditions_existing_user_decline">Не, благодаря</string>
+  <string name="terms_and_conditions_decline_dialog_title">Да се деактивира ли визуалната гласова поща?</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_message">Ако отхвърлите Общите условия, визуалната гласова поща ще бъде деактивирана.</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_downgrade">Деактивиране</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_message">Ако изключите визуалната гласова поща, тя ще бъде деактивирана.</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_downgrade">Деактивиране</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message">Ще имате достъп до гласовата поща само когато наберете *86. За да продължите, задайте нов ПИН за гласовата поща.</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin">Задаване на ПИН</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/error/res/values-bn/strings.xml b/java/com/android/dialer/voicemail/listui/error/res/values-bn/strings.xml
new file mode 100644
index 0000000..1b3daaf
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/error/res/values-bn/strings.xml
@@ -0,0 +1,102 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_error_activating_title">ভিজুয়াল ভয়েসমেল চালু করা</string>
+  <string name="voicemail_error_activating_message">ভিজুয়াল ভয়েসমেল সম্পূর্ণরূপে সক্রিয় না করা পর্যন্ত আপনি ভয়েসমেল সংক্রান্ত কোনও বিজ্ঞপ্তি নাও পেতে পারেন৷ ভয়েসমেল সম্পূর্ণরূপে সক্রিয় না হওয়া পর্যন্ত নতুন মেসেজ  ফিরিয়ে আনতে ভয়েসমেলে কল করুন৷</string>
+  <string name="voicemail_error_not_activate_no_signal_title">ভিজুয়াল ভয়েসমেল সক্রিয় করা যাচ্ছে না</string>
+  <string name="voicemail_error_not_activate_no_signal_message">আপনার ফোনে কোনও মোবাইল নেটওয়ার্ক সংযোগ আছে কিনা নিশ্চিত করে আবার চেষ্টা করুন।</string>
+  <string name="voicemail_error_not_activate_no_signal_airplane_mode_message">বিমান মোড বন্ধ করুন এবং আবার চেষ্টা করুন।</string>
+  <string name="voicemail_error_no_signal_title">সংযোগ নেই</string>
+  <string name="voicemail_error_no_signal_message">নতুন ভয়েসমেলে এলে আপনাকে জানানো হবে না। আপনি ওয়াই-ফাই ব্যবহার করলে, এখনই সিঙ্ক করে ভয়েসমেল চেক করতে পারেন।</string>
+  <string name="voicemail_error_no_signal_airplane_mode_message">নতুন ভয়েসমেলে এলে আপনাকে জানানো হবে না। ভয়েসমেলে সিঙ্ক করার জন্য বিমান মোড বন্ধ করুন।</string>
+  <string name="voicemail_error_no_signal_cellular_required_message">ভয়েসমেল চেক করার জন্য আপনার ফোনের একটি মোবাইল ডেটা সংযোগের প্রয়োজন।</string>
+  <string name="voicemail_error_activation_failed_title">ভিজুয়াল ভয়েসমেল সক্রিয় করা যাচ্ছে না</string>
+  <string name="voicemail_error_activation_failed_message">আপনি এখনও ভয়েসমেল চেক করার জন্য কল করতে পারেন।</string>
+  <string name="voicemail_error_no_data_title">ভিজুয়াল ভয়েসমেল আপডেট করা যাচ্ছে না</string>
+  <string name="voicemail_error_no_data_message">যখন আপনার ওয়াই-ফাই অথবা মোবাইল ডেটা সংযোগ ভাল থাকবে তখন আবার চেষ্টা করুন। আপনি এখনও ভয়েসমেল চেক করার জন্য কল করতে পারেন।</string>
+  <string name="voicemail_error_no_data_cellular_required_message">মোবাইল ডেটা সংযোগ ভাল থাকবে তখন আবার চেষ্টা করুন। আপনি এখনও ভয়েসমেল চেক করার জন্য কল করতে পারেন।</string>
+  <string name="voicemail_error_bad_config_title">ভিজুয়াল ভয়েসমেল আপডেট করা যাচ্ছে না</string>
+  <string name="voicemail_error_bad_config_message">আপনি এখনও ভয়েসমেল চেক করার জন্য কল করতে পারেন।</string>
+  <string name="voicemail_error_communication_title">ভিজুয়াল ভয়েসমেল আপডেট করা যাচ্ছে না</string>
+  <string name="voicemail_error_communication_message">আপনি এখনও ভয়েসমেল চেক করার জন্য কল করতে পারেন।</string>
+  <string name="voicemail_error_server_connection_title">ভিজুয়াল ভয়েসমেল আপডেট করা যাচ্ছে না</string>
+  <string name="voicemail_error_server_connection_message">আপনি এখনও ভয়েসমেল চেক করার জন্য কল করতে পারেন।</string>
+  <string name="voicemail_error_server_title">ভিজুয়াল ভয়েসমেল আপডেট করা যাচ্ছে না</string>
+  <string name="voicemail_error_server_message">আপনি এখনও ভয়েসমেল চেক করার জন্য কল করতে পারেন।</string>
+  <string name="voicemail_error_inbox_near_full_title">ইনবক্স প্রায় ভর্তি হয়ে গেছে</string>
+  <string name="voicemail_error_inbox_near_full_message">যদি আপনার ইনবক্সে ভর্তি থাকে তাহলে আপনি নতুন ভয়েসমেল পাবেন না।</string>
+  <string name="voicemail_error_inbox_full_title">নতুন ভয়েসমেল পাবেন না</string>
+  <string name="voicemail_error_inbox_full_message">আপনার ইনবক্স ভর্তি। নতুন ভয়েসমেল পেতে কিছু মেসেজ মুছে ফেলার চেষ্টা করুন।</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_title">অতিরিক্ত স্টোরেজ এবং ব্যাক-আপ চালু করুন</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_message">আপনার মেলবক্স ভর্তি। স্টোরেজ খালি করতে, অতিরিক্ত স্টোরেজ চালু করুন যাতে Google আপনার ভয়েসমেল মেসেজ পরিচালনা করতে এবং ব্যাক-আপ নিতে পারে।</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_title">অতিরিক্ত স্টোরেজ এবং ব্যাক-আপ চালু করুন</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_message">আপনার মেলবক্স প্রায় ভর্তি। স্টোরেজ খালি করতে, অতিরিক্ত স্টোরেজ চালু করুন যাতে Google আপনার ভয়েসমেল মেসেজ পরিচালনা করতে এবং ব্যাক-আপ নিতে পারে।</string>
+  <string name="voicemail_error_pin_not_set_title">আপনার ভয়েসমেল পিন সেট করুন</string>
+  <string name="voicemail_error_pin_not_set_message">যেকোনও সময়ে আপনার ভয়েসমেল অ্যাক্সেস করার জন্য আপনার একটি ভয়েসমেল পিন প্রয়োজন৷</string>
+  <string name="voicemail_action_turn_off_airplane_mode">বিমান মোড সেটিংস</string>
+  <string name="voicemail_action_set_pin">পিন সেট করুন</string>
+  <string name="voicemail_action_retry">আবার করুন</string>
+  <string name="voicemail_action_turn_archive_on">চালু করুন</string>
+  <string name="voicemail_action_dimiss">না থাক</string>
+  <string name="voicemail_action_sync">সিঙ্ক করুন</string>
+  <string name="voicemail_action_call_voicemail">ভয়েসমেলে কল করুন</string>
+  <string name="voicemail_action_call_customer_support">গ্রাহক সহায়তায় কল করুন</string>
+  <string name="vvm3_error_vms_dns_failure_title">কিছু সমস্যা হয়েছে</string>
+  <string name="vvm3_error_vms_dns_failure_message">আমরা একটি সমস্যার সম্মুখীন হয়েছি৷ অনুগ্রহ করে আবার পরে চেষ্টা করুন৷ যদি তখনও সমস্যাটি থেকে থাকে, তাহলে অনুগ্রহ করে %1$s এ কল করে গ্রাহক পরিষেবার সাথে যোগাযোগ করুন এবং তাদের ৯০০১ সমস্য়া কোড জানান৷</string>
+  <string name="vvm3_error_vmg_dns_failure_title">কিছু সমস্যা হয়েছে</string>
+  <string name="vvm3_error_vmg_dns_failure_message">আমরা একটি সমস্যার সম্মুখীন হয়েছি৷ অনুগ্রহ করে আবার পরে চেষ্টা করুন৷ যদি তখনও সমস্যাটি থেকে থাকে, তাহলে অনুগ্রহ করে %1$s এ কল করে গ্রাহক পরিষেবার সাথে যোগাযোগ করুন এবং তাদের  ৯০০২ সমস্য়া কোড জানান৷</string>
+  <string name="vvm3_error_spg_dns_failure_title">কিছু সমস্যা হয়েছে</string>
+  <string name="vvm3_error_spg_dns_failure_message">আমরা একটি সমস্যার সম্মুখীন হয়েছি৷ অনুগ্রহ করে আবার পরে চেষ্টা করুন৷ যদি তখনও সমস্যাটি থেকে থাকে, তাহলে অনুগ্রহ করে %1$s এ কল করে গ্রাহক পরিষেবার সাথে যোগাযোগ করুন এবং তাদের সমস্য়া কোড ৯০০৩ জানান ৷</string>
+  <string name="vvm3_error_vms_no_cellular_title">আপনার ভয়েস মেলবক্সের সাথে সংযুক্ত করা যায়নি</string>
+  <string name="vvm3_error_vms_no_cellular_message">আপনার ভয়েস মেলবক্সের সাথে সংযুক্ত করার সময়ে আমাদের সমস্যা হচ্ছে৷ আপনি যদি এমন এলাকায় থাকেন যেখানকার সিগন্য়াল খারাপ, তাহলে জোরালো সিগন্যাল না পাওয়া পর্যন্ত অপেক্ষা করুন এবং আবার চেষ্টা করুন৷ যদি তখনও সমস্যাটি থেকে থাকে, তাহলে অনুগ্রহ করে %1$s এ কল করে গ্রাহক পরিষেবার সাথে যোগাযোগ করুন এবং তাদের সমস্য়া কোড ৯০০৪ জানান ৷</string>
+  <string name="vvm3_error_vmg_no_cellular_title">আপনার ভয়েস মেলবক্সের সাথে সংযুক্ত করা যায়নি</string>
+  <string name="vvm3_error_vmg_no_cellular_message">আপনার ভয়েস মেলবক্সের সাথে সংযুক্ত করার সময়ে আমাদের সমস্যা হচ্ছে৷ আপনি যদি এমন এলাকায় থাকেন যেখানকার সিগন্য়াল খারাপ , তাহলে জোরালো সিগন্যাল না পাওয়া পর্যন্ত অপেক্ষা করুন এবং আবার চেষ্টা করুন৷ যদি তখনও সমস্যাটি থেকে থাকে, তাহলে অনুগ্রহ করে %1$s এ কল করে গ্রাহক পরিষেবার সাথে যোগাযোগ করুন এবং তাদের সমস্য়া কোড ৯০০৫ জানান৷</string>
+  <string name="vvm3_error_spg_no_cellular_title">আপনার ভয়েস মেলবক্সের সাথে সংযুক্ত করা যায়নি</string>
+  <string name="vvm3_error_spg_no_cellular_message">আপনার ভয়েস মেলবক্সের সাথে সংযুক্ত করার সময়ে আমাদের সমস্যা হচ্ছে৷ আপনি যদি এমন এলাকায় থাকেন যেখানকার সিগন্যাল খারাপ, তাহলে জোরালো সিগন্যাল না পাওয়া পর্যন্ত অপেক্ষা করুন এবং আবার চেষ্টা করুন৷ যদি তখনও সমস্যাটি থেকে থাকে, তাহলে অনুগ্রহ করে %1$s এ কল করে গ্রাহক পরিষেবার সাথে যোগাযোগ করুন এবং তাদের সমস্যা কোড ৯০০৬ জানান৷</string>
+  <string name="vvm3_error_vms_timeout_title">কিছু সমস্যা হয়েছে</string>
+  <string name="vvm3_error_vms_timeout_message">আমরা একটি সমস্যার সম্মুখীন হয়েছি৷ অনুগ্রহ করে আবার পরে চেষ্টা করুন৷ যদি তখনও সমস্যাটি থেকে থাকে, তাহলে অনুগ্রহ করে %1$s এ কল করে গ্রাহক পরিষেবার সাথে যোগাযোগ করুন এবং তাদের  ৯০০৭ সমস্যা কোড জানান৷</string>
+  <string name="vvm3_error_vmg_timeout_title">কিছু সমস্যা হয়েছে</string>
+  <string name="vvm3_error_vmg_timeout_message">আমরা একটি সমস্যার সম্মুখীন হয়েছি৷ অনুগ্রহ করে আবার পরে চেষ্টা করুন৷ যদি তখনও সমস্যাটি থেকে থাকে, তাহলে অনুগ্রহ করে %1$s এ কল করে গ্রাহক পরিষেবার সাথে যোগাযোগ করুন এবং তাদের সমস্যা কোড ৯০০৮ জানান৷</string>
+  <string name="vvm3_error_status_sms_timeout_title">কিছু সমস্যা হয়েছে</string>
+  <string name="vvm3_error_status_sms_timeout_message">আপনার পরিষেবার সেট আপ করার সময়ে আমাদের সমস্যা হচ্ছে৷ অনুগ্রহ করে আবার পরে চেষ্টা করুন৷ যদি তখনও সমস্যাটি থেকে থাকে, তাহলে অনুগ্রহ করে %1$s এ কল করে গ্রাহক পরিষেবার সাথে যোগাযোগ করুন এবং তাদের সমস্যা কোড ৯০০৯ জানান৷</string>
+  <string name="vvm3_error_subscriber_blocked_title">আপনার ভয়েস মেলবক্সের সাথে সংযুক্ত করা যায়নি</string>
+  <string name="vvm3_error_subscriber_blocked_message">আমরা আপনার ভয়েস মেলবক্সের সাথে এই সময়ে সংযুক্ত করতে পারছি না৷ অনুগ্রহ করে আবার পরে চেষ্টা করুন৷ যদি তখনও সমস্যাটি থেকে থাকে, তাহলে অনুগ্রহ করে %1$s এ কল করে গ্রাহক পরিষেবার সাথে যোগাযোগ করুন এবং তাদের সমস্যা কোড ৯৯৯০ জানান৷</string>
+  <string name="vvm3_error_unknown_user_title">ভয়েসমেল সেট-আপ করুন</string>
+  <string name="vvm3_error_unknown_user_message">আপনার অ্যাকাউন্টে ভয়েসমেলের সেট আপ করা নেই৷ অনুগ্রহ করে %1$s এ কল করে গ্রাহক পরিষেবার সাথে যোগাযোগ করুন এবং তাদের সমস্যা কোড ৯৯৯১ জানান৷</string>
+  <string name="vvm3_error_unknown_device_title">ভয়েসমেল</string>
+  <string name="vvm3_error_unknown_device_message">এই ডিভাইসটিতে ভিজুয়াল ভয়েসমেল ব্যবহার যায়নি। অনুগ্রহ করে %1$s নম্বরে কল করে গ্রাহক পরিষেবার সাথে যোগাযোগ করে এবং তাদের সমস্য়া কোডটি ৯৯৯২ জানান।</string>
+  <string name="vvm3_error_invalid_password_title">কিছু সমস্যা হয়েছে</string>
+  <string name="vvm3_error_invalid_password_message">অনুগ্রহ করে %1$s এ কল করে গ্রাহক পরিষেবার সাথে যোগাযোগ করুন এবং তাদের  সমস্যা কোড ৯৯৯৩ জানান৷</string>
+  <string name="vvm3_error_mailbox_not_initialized_title">ভিজুয়াল ভয়েসমেল</string>
+  <string name="vvm3_error_mailbox_not_initialized_message">ভিজুয়াল ভয়েসমেলে সেট-আপ সম্পূর্ণ করতে, অনুগ্রহ করে %1$s নম্বরে কল করে গ্রাহক পরিষেবার সাথে যোগাযোগ করুন এবং তাদের ৯৯৯৪ সমস্যা কোড জানান৷</string>
+  <string name="vvm3_error_service_not_provisioned_title">ভিজুয়াল ভয়েসমেল</string>
+  <string name="vvm3_error_service_not_provisioned_message">ভিজুয়াল ভয়েসমেলের সেট-আপ সম্পূর্ণ করতে, অনুগ্রহ করে %1$s নম্বরে কল করে গ্রাহক পরিষেবার সাথে যোগাযোগ করুন এবং তাদের ৯৯৯৫ সমস্যা কোড জানান।</string>
+  <string name="vvm3_error_service_not_activated_title">ভিজুয়াল ভয়েসমেল</string>
+  <string name="vvm3_error_service_not_activated_message">ভিজুয়াল ভয়েসমেল সক্রিয় করতে, অনুগ্রহ করে %1$s নম্বরে কল করে গ্রাহক পরিষেবার সাথে যোগাযোগ করুন এবং তাদের সমস্যা কোড ৯৯৯৬ জানান৷</string>
+  <string name="vvm3_error_user_blocked_title">কিছু সমস্যা হয়েছে</string>
+  <string name="vvm3_error_user_blocked_message">ভিজুয়াল ভয়েসমেলের সেট-আপ সম্পূর্ণ করতে, অনুগ্রহ করে %1$s নম্বরে কল করে গ্রাহক পরিষেবার সাথে যোগাযোগ করুন এবং তাদের ৯৯৯৪ সমস্যা কোড জানান৷</string>
+  <string name="vvm3_error_subscriber_unknown_title">ভিজুয়াল ভয়েসমেল বন্ধ আছে</string>
+  <string name="vvm3_error_subscriber_unknown_message">ভিজুয়াল ভয়েসমেলকে সক্রিয় করতে, অনুগ্রহ করে %1$s এ কল করে গ্রাহক পরিষেবার সাথে যোগাযোগ করুন৷</string>
+  <string name="vvm3_error_imap_getquota_error_title">কিছু সমস্যা হয়েছে</string>
+  <string name="vvm3_error_imap_getquota_error_message">অনুগ্রহ করে %1$s এ কল করে গ্রাহক পরিষেবার সাথে যোগাযোগ করুন এবং তাদের সমস্যা কোড ৯৯৯৭ জানান৷</string>
+  <string name="vvm3_error_imap_select_error_title">কিছু সমস্যা হয়েছে</string>
+  <string name="vvm3_error_imap_select_error_message">অনুগ্রহ করে %1$s এ কল করে গ্রাহক পরিষেবার সাথে যোগাযোগ করুন এবং তাদের সমস্যা কোড ৯৯৮৯ জানান ৷</string>
+  <string name="vvm3_error_imap_error_title">কিছু সমস্যা হয়েছে</string>
+  <string name="vvm3_error_imap_error_message">অনুগ্রহ করে %1$s এ কল করে গ্রাহক পরিষেবার সাথে যোগাযোগ করুন এবং তাদের সমস্যা কোড ৯৯৯৯ জানান ৷</string>
+  <string name="verizon_terms_and_conditions_title">ভিজুয়াল ভয়েসমেল চালু করুন</string>
+  <string name="verizon_terms_and_conditions_message">%1$s ভিজুয়াল ভয়েসমেল চালু করার মাধ্যমে আপনি Verizon Wireless এর নিয়ম ও শর্তাবলীতে সম্মতি দেন:\n\n%2$s</string>
+  <string name="dialer_terms_and_conditions_title">ভিজুয়াল ভয়েসমেল চালু করুন</string>
+  <string name="dialer_terms_and_conditions_existing_user_title">নতুন! আপনার ভয়েসমেল শুনুন</string>
+  <string name="dialer_terms_and_conditions_message">%s</string>
+  <string name="dialer_terms_and_conditions_1.0">ভয়েসমেলে কল না করেই মেসেজ পড়ুন এবং শুনুন। Google-এর ফ্রি ট্রান্সক্রিপশন পরিষেবার মাধ্যমে ভয়েসমেলের ট্রান্সক্রিপ্ট পান। আপনি যেকোনও সময় সেটিংসে গিয়ে দুটির মধ্যে যেকোনওটি বন্ধ করে দিতে পারেন। %s</string>
+  <string name="dialer_terms_and_conditions_existing_user">এখন Google-এর ফ্রি ট্রান্সক্রিপশন পরিষেবার মাধ্যমে ভয়েসমেলের ট্রান্সক্রিপ্ট দেওয়া হয়। আপনি যেকোনও সময় সেটিংস থেকে এটি বন্ধ করে দিতে পারেন। %s</string>
+  <string name="dialer_terms_and_conditions_for_verizon_1.0">ভয়েসমেলে কল না করেই আপনার মেসেজ দেখুন এবং শুনুন।</string>
+  <string name="dialer_terms_and_conditions_learn_more">আরও জানুন</string>
+  <string name="dialer_terms_and_conditions_existing_user_ack">ঠিক আছে, বুঝেছি</string>
+  <string name="dialer_terms_and_conditions_existing_user_decline">না থাক</string>
+  <string name="terms_and_conditions_decline_dialog_title">ভিজুয়াল ভয়েসমেল বন্ধ করবেন?</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_message">নিয়ম ও শর্তাবলী সম্মত না হলে ভিজুয়াল ভয়েসমেল বন্ধ করা হবে৷</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_downgrade">বন্ধ করুন</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_message">যদি আপনি ভিজুয়াল ভয়েসমেল বন্ধ করলে ভিজুয়াল ভয়েসমেল বন্ধ করা হবে।</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_downgrade">বন্ধ করুন</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message">শুধুমাত্র *৮৬ নম্বরে কল করেই ভয়েসমেল অ্যাক্সেস করা যাবে৷ এগিয়ে যাওয়ার জন্য একটি নতুন ভয়েসমেল পিন সেট করুন৷</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin">পিন সেট করুন</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/error/res/values-bs/strings.xml b/java/com/android/dialer/voicemail/listui/error/res/values-bs/strings.xml
new file mode 100644
index 0000000..64c712c
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/error/res/values-bs/strings.xml
@@ -0,0 +1,102 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_error_activating_title">Aktiviranje vizuelne govorne pošte</string>
+  <string name="voicemail_error_activating_message">Možda nećete primati obavještenja o govornoj pošti dok se vizuelna govorna pošta ne aktivira u potpunosti. U međuvremenu pozovite govornu poštu za preuzimanje novih poruka.</string>
+  <string name="voicemail_error_not_activate_no_signal_title">Nije moguće aktivirati vizuelnu govornu poštu</string>
+  <string name="voicemail_error_not_activate_no_signal_message">Provjerite imate li mobilnu mrežu na telefonu i pokušajte ponovo.</string>
+  <string name="voicemail_error_not_activate_no_signal_airplane_mode_message">Isključite način rada u avionu i pokušajte ponovo.</string>
+  <string name="voicemail_error_no_signal_title">Niste povezani na mrežu</string>
+  <string name="voicemail_error_no_signal_message">Nećete primati obavještenja o novim govornim porukama. Ako ste na WiFi mreži, provjerite govornu poštu tako što ćete odmah obaviti sinhronizaciju.</string>
+  <string name="voicemail_error_no_signal_airplane_mode_message">Nećete primati obavještenja o novoj govornoj pošti. Isključite način rada u avionu da sinhronizirate govornu poštu.</string>
+  <string name="voicemail_error_no_signal_cellular_required_message">Za provjeru govorne pošte, telefonu je potrebna veza za prijenos podataka na mobilnoj mreži. </string>
+  <string name="voicemail_error_activation_failed_title">Nije moguće aktivirati vizuelnu govornu poštu</string>
+  <string name="voicemail_error_activation_failed_message">I dalje možete nazvati za provjeru govorne pošte.</string>
+  <string name="voicemail_error_no_data_title">Nije moguće ažurirati vizuelnu govornu poštu</string>
+  <string name="voicemail_error_no_data_message">Pokušajte ponovo kada WiFi veza ili veza za prijenos podataka na mobilnoj mreži bude bolja. I dalje možete nazvati za provjeru govorne pošte.</string>
+  <string name="voicemail_error_no_data_cellular_required_message">Pokušajte ponovo kada veza za prijenos podataka na mobilnoj mreži bude bolja. I dalje možete nazvati za provjeru govorne pošte.</string>
+  <string name="voicemail_error_bad_config_title">Nije moguće ažurirati vizuelnu govornu poštu</string>
+  <string name="voicemail_error_bad_config_message">I dalje možete nazvati za provjeru govorne pošte.</string>
+  <string name="voicemail_error_communication_title">Nije moguće ažurirati vizuelnu govornu poštu</string>
+  <string name="voicemail_error_communication_message">I dalje možete nazvati za provjeru govorne pošte.</string>
+  <string name="voicemail_error_server_connection_title">Nije moguće ažurirati vizuelnu govornu poštu</string>
+  <string name="voicemail_error_server_connection_message">I dalje možete nazvati za provjeru govorne pošte.</string>
+  <string name="voicemail_error_server_title">Nije moguće ažurirati vizuelnu govornu poštu</string>
+  <string name="voicemail_error_server_message">I dalje možete nazvati za provjeru govorne pošte.</string>
+  <string name="voicemail_error_inbox_near_full_title">Pristigla pošta je skoro puna</string>
+  <string name="voicemail_error_inbox_near_full_message">Nećete moći primati novu govornu poštu ako je vam je pristigla pošta puna.</string>
+  <string name="voicemail_error_inbox_full_title">Nije moguće primiti novu govornu poštu</string>
+  <string name="voicemail_error_inbox_full_message">Vaša pristigla pošta je puna. Pokušajte izbrisati neke poruke da primite novu govornu poštu.</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_title">Uključivanje dodatne pohrane i sigurnosne kopije</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_message">Poštanski pretinac je pun. Da oslobodite prostor, uključite dodatnu pohranu tako da Google može upravljati vašim porukama govorne pošte i praviti njihovu sigurnosnu kopiju.</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_title">Uključivanje dodatne pohrane i izrade sigurnosne kopije</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_message">Poštanski pretinac je gotovo sasvim pun. Da oslobodite prostor, uključite dodatnu pohranu tako da Google može upravljati vašim porukama govorne pošte i praviti njihovu sigurnosnu kopiju.</string>
+  <string name="voicemail_error_pin_not_set_title">Postavite PIN za govornu poštu</string>
+  <string name="voicemail_error_pin_not_set_message">PIN za govornu poštu trebat će vam svaki put kada zatražite pristup govornoj pošti.</string>
+  <string name="voicemail_action_turn_off_airplane_mode">Postavke načina rada u avionu</string>
+  <string name="voicemail_action_set_pin">Postavi PIN</string>
+  <string name="voicemail_action_retry">Pokušaj ponovo</string>
+  <string name="voicemail_action_turn_archive_on">Uključi</string>
+  <string name="voicemail_action_dimiss">Ne, hvala</string>
+  <string name="voicemail_action_sync">Sinhroniziraj</string>
+  <string name="voicemail_action_call_voicemail">Pozovi govornu poštu</string>
+  <string name="voicemail_action_call_customer_support">Pozovi podršku korisnicima</string>
+  <string name="vvm3_error_vms_dns_failure_title">Nešto nije uredu</string>
+  <string name="vvm3_error_vms_dns_failure_message">Nažalost, došlo je do problema. Pokušajte ponovo kasnije. Ako problem ne nestane, kontaktirajte službu za korisnike na broj %1$s i obavijestite ih da je kȏd greške 9001.</string>
+  <string name="vvm3_error_vmg_dns_failure_title">Nešto nije uredu</string>
+  <string name="vvm3_error_vmg_dns_failure_message">Nažalost, došlo je do problema. Pokušajte ponovo kasnije. Ako problem ne nestane, kontaktirajte službu za korisnike na broj %1$s i obavijestite ih da je kȏd greške 9002.</string>
+  <string name="vvm3_error_spg_dns_failure_title">Nešto nije uredu</string>
+  <string name="vvm3_error_spg_dns_failure_message">Nažalost, došlo je do problema. Pokušajte ponovo kasnije. Ako problem ne nestane, kontaktirajte službu za korisnike na broj %1$s i obavijestite ih da je kȏd greške 9003.</string>
+  <string name="vvm3_error_vms_no_cellular_title">Povezivanje na spremnik govorne pošte nije moguće</string>
+  <string name="vvm3_error_vms_no_cellular_message">Nažalost, imamo problema pri povezivanju na spremnik govorne pošte. Ako se nalazite u području sa slabim signalom, pričekajte dok signal ne bude jači i pokušajte ponovo. Ako problem ne nestane, kontaktirajte službu za korisnike na broj %1$s i obavijestite ih da je kȏd greške 9004.</string>
+  <string name="vvm3_error_vmg_no_cellular_title">Povezivanje na spremnik govorne pošte nije moguće</string>
+  <string name="vvm3_error_vmg_no_cellular_message">Nažalost, imamo problema pri povezivanju na spremnik govorne pošte. Ako se nalazite u području sa slabim signalom, pričekajte dok signal ne bude jači i pokušajte ponovo. Ako problem ne nestane, kontaktirajte službu za korisnike na broj %1$s i obavijestite ih da je kȏd greške 9005.</string>
+  <string name="vvm3_error_spg_no_cellular_title">Povezivanje na spremnik govorne pošte nije moguće</string>
+  <string name="vvm3_error_spg_no_cellular_message">Nažalost, imamo problema pri povezivanju na spremnik govorne pošte. Ako se nalazite u području sa slabim signalom, pričekajte dok signal ne bude jači i pokušajte ponovo. Ako problem ne nestane, kontaktirajte službu za korisnike na broj %1$s i obavijestite ih da je kȏd greške 9006.</string>
+  <string name="vvm3_error_vms_timeout_title">Nešto nije uredu</string>
+  <string name="vvm3_error_vms_timeout_message">Nažalost, došlo je do problema. Pokušajte ponovo kasnije. Ako problem ne nestane, kontaktirajte službu za korisnike na broj %1$s i obavijestite ih da je kȏd greške 9007.</string>
+  <string name="vvm3_error_vmg_timeout_title">Nešto nije uredu</string>
+  <string name="vvm3_error_vmg_timeout_message">Nažalost, došlo je do problema. Pokušajte ponovo kasnije. Ako problem ne nestane, kontaktirajte službu za korisnike na broj %1$s i obavijestite ih da je kȏd greške 9008.</string>
+  <string name="vvm3_error_status_sms_timeout_title">Nešto nije uredu</string>
+  <string name="vvm3_error_status_sms_timeout_message">Nažalost, imamo problema s postavljanjem vaše usluge. Pokušajte ponovo kasnije. Ako problem ne nestane, kontaktirajte službu za korisnike na broj %1$s i obavijestite ih da je kȏd greške 9009.</string>
+  <string name="vvm3_error_subscriber_blocked_title">Povezivanje na spremnik govorne pošte nije moguće</string>
+  <string name="vvm3_error_subscriber_blocked_message">Nažalost, trenutno ne možemo uspostaviti vezu s vašim spremnikom govorne pošte. Pokušajte ponovo kasnije. Ako problem ne nestane, kontaktirajte službu za korisnike na broj %1$s i obavijestite ih da je kȏd greške 9990.</string>
+  <string name="vvm3_error_unknown_user_title">Postavljanje govorne pošte</string>
+  <string name="vvm3_error_unknown_user_message">Govorna pošta nije postavljena na vašem računu. Kontaktirajte službu za korisnike na broj %1$s i obavijestite ih da je kȏd greške 9991.</string>
+  <string name="vvm3_error_unknown_device_title">Govorna pošta</string>
+  <string name="vvm3_error_unknown_device_message">Vizuelna govorna pošta se ne može koristiti na ovom uređaju. Kontaktirajte Službu za korisnike na broj %1$s i obavijestite ih da je kȏd greške 9992.</string>
+  <string name="vvm3_error_invalid_password_title">Nešto nije uredu</string>
+  <string name="vvm3_error_invalid_password_message">Kontaktirajte službu za korisnike na broj %1$s i obavijestite ih da je kȏd greške 9993.</string>
+  <string name="vvm3_error_mailbox_not_initialized_title">Vizuelna govorna pošta</string>
+  <string name="vvm3_error_mailbox_not_initialized_message">Da dovršite postavljanje vizuelne govorne pošte, kontaktirajte Službu za korisnike na broj %1$s i obavijestite ih da je kȏd greške 9994.</string>
+  <string name="vvm3_error_service_not_provisioned_title">Vizuelna govorna pošta</string>
+  <string name="vvm3_error_service_not_provisioned_message">Da dovršite postavljanje vizuelne govorne pošte, kontaktirajte Službu za korisnike na broj %1$s i obavijestite ih da je kȏd greške 9995.</string>
+  <string name="vvm3_error_service_not_activated_title">Vizuelna govorna pošta</string>
+  <string name="vvm3_error_service_not_activated_message">Da aktivirate vizuelnu govornu poštu, kontaktirajte Službu za korisnike na broj %1$s i obavijestite ih da je kȏd greške 9996.</string>
+  <string name="vvm3_error_user_blocked_title">Nešto nije uredu</string>
+  <string name="vvm3_error_user_blocked_message">Da dovršite postavljanje vizuelne govorne pošte, kontaktirajte Službu za korisnike na broj %1$s i obavijestite ih da je kȏd greške 9998.</string>
+  <string name="vvm3_error_subscriber_unknown_title">Vizuelna govorna pošta je onemogućena</string>
+  <string name="vvm3_error_subscriber_unknown_message">Kontaktirajte korisnički podršku na broj %1$s da aktivirate vizuelnu govornu poštu.</string>
+  <string name="vvm3_error_imap_getquota_error_title">Nešto nije uredu</string>
+  <string name="vvm3_error_imap_getquota_error_message">Kontaktirajte službu za korisnike na broj %1$s i obavijestite ih da je kȏd greške 9997.</string>
+  <string name="vvm3_error_imap_select_error_title">Nešto nije uredu</string>
+  <string name="vvm3_error_imap_select_error_message">Kontaktirajte službu za korisnike na broj %1$s i obavijestite ih da je kȏd greške 9989.</string>
+  <string name="vvm3_error_imap_error_title">Nešto nije uredu</string>
+  <string name="vvm3_error_imap_error_message">Kontaktirajte službu za korisnike na broj %1$s i obavijestite ih da je kȏd greške 9999.</string>
+  <string name="verizon_terms_and_conditions_title">Uključivanje vizuelne govorne pošte</string>
+  <string name="verizon_terms_and_conditions_message">%1$s Ako uključite vizuelnu govornu poštu, prihvatate uslove i odredbe kompanije Verizon Wireless:\n\n%2$s</string>
+  <string name="dialer_terms_and_conditions_title">Uključivanje vizuelne govorne pošte</string>
+  <string name="dialer_terms_and_conditions_existing_user_title">Novo! Pročitajte svoju govornu poštu</string>
+  <string name="dialer_terms_and_conditions_message">%s</string>
+  <string name="dialer_terms_and_conditions_1.0">Pogledajte i poslušajte poruke bez pozivanja govorne pošte. Transkripte govorne pošte omogućava Googleova besplatna usluga transkripcije koju možete isključiti u Postavkama u svakom trenutku. %s</string>
+  <string name="dialer_terms_and_conditions_existing_user">Transkripte govorne pošte sada omogućava Googleova besplatna usluga transkripcije koju možete isključiti u Postavkama u svakom trenutku. %s</string>
+  <string name="dialer_terms_and_conditions_for_verizon_1.0">Gledajte i slušajte poruke bez pozivanja govorne pošte.</string>
+  <string name="dialer_terms_and_conditions_learn_more">Saznajte više</string>
+  <string name="dialer_terms_and_conditions_existing_user_ack">Uredu, razumijem</string>
+  <string name="dialer_terms_and_conditions_existing_user_decline">Ne, hvala</string>
+  <string name="terms_and_conditions_decline_dialog_title">Onemogućiti vizuelnu govornu poštu?</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_message">Vizuelna govorna pošta bit će onemogućena ako odbijete uslove i odredbe.</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_downgrade">Onemogući</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_message">Vizuelna govorna pošta bit će onemogućena ako isključite vizuelnu govornu poštu. </string>
+  <string name="dialer_terms_and_conditions_decline_dialog_downgrade">Onemogući</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message">Govornoj pošti moći ćete pristupiti samo pozivanjem broja *86. Postavite novi PIN govorne pošte da nastavite.</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin">Postavite PIN</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/error/res/values-ca/strings.xml b/java/com/android/dialer/voicemail/listui/error/res/values-ca/strings.xml
new file mode 100644
index 0000000..a829bfa
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/error/res/values-ca/strings.xml
@@ -0,0 +1,102 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_error_activating_title">Activació de la bústia de veu visual</string>
+  <string name="voicemail_error_activating_message">És possible que no rebis notificacions de missatges de veu fins que la bústia de veu visual estigui completament activada. Fins aleshores, truca a la bústia de veu per recuperar els missatges nous.</string>
+  <string name="voicemail_error_not_activate_no_signal_title">No es pot activar la bústia de veu visual</string>
+  <string name="voicemail_error_not_activate_no_signal_message">Assegura\'t que el telèfon tingui connexió a una xarxa mòbil i torna-ho a provar.</string>
+  <string name="voicemail_error_not_activate_no_signal_airplane_mode_message">Desactiva el mode d\'avió i torna-ho a provar.</string>
+  <string name="voicemail_error_no_signal_title">No hi ha connexió</string>
+  <string name="voicemail_error_no_signal_message">No rebràs notificacions de missatges de veu nous. Si estàs connectat a una xarxa Wi-Fi, pots sincronitzar la bústia de veu ara per consultar si tens missatges.</string>
+  <string name="voicemail_error_no_signal_airplane_mode_message">No rebràs notificacions de missatges de veu nous. Desactiva el mode d\'avió per sincronitzar la bústia de veu.</string>
+  <string name="voicemail_error_no_signal_cellular_required_message">Cal que el telèfon tingui una connexió de dades mòbils per poder consultar la bústia de veu.</string>
+  <string name="voicemail_error_activation_failed_title">No es pot activar la bústia de veu visual</string>
+  <string name="voicemail_error_activation_failed_message">Pots trucar igualment per consultar la bústia de veu.</string>
+  <string name="voicemail_error_no_data_title">No es pot actualitzar la bústia de veu visual</string>
+  <string name="voicemail_error_no_data_message">Torna-ho a provar quan la connexió Wi-Fi o de dades mòbils sigui més estable. Pots trucar igualment per consultar la bústia de veu.</string>
+  <string name="voicemail_error_no_data_cellular_required_message">Torna-ho a provar quan la connexió de dades mòbils sigui més estable. Pots trucar igualment per consultar la bústia de veu.</string>
+  <string name="voicemail_error_bad_config_title">No es pot actualitzar la bústia de veu visual</string>
+  <string name="voicemail_error_bad_config_message">Pots trucar igualment per consultar la bústia de veu.</string>
+  <string name="voicemail_error_communication_title">No es pot actualitzar la bústia de veu visual</string>
+  <string name="voicemail_error_communication_message">Pots trucar igualment per consultar la bústia de veu.</string>
+  <string name="voicemail_error_server_connection_title">No es pot actualitzar la bústia de veu visual</string>
+  <string name="voicemail_error_server_connection_message">Pots trucar igualment per consultar la bústia de veu.</string>
+  <string name="voicemail_error_server_title">No es pot actualitzar la bústia de veu visual</string>
+  <string name="voicemail_error_server_message">Pots trucar igualment per consultar la bústia de veu.</string>
+  <string name="voicemail_error_inbox_near_full_title">La safata d\'entrada està gairebé plena</string>
+  <string name="voicemail_error_inbox_near_full_message">No podràs rebre missatges de veu nous si la safata d\'entrada està plena.</string>
+  <string name="voicemail_error_inbox_full_title">No es poden rebre missatges de veu nous</string>
+  <string name="voicemail_error_inbox_full_message">La safata d\'entrada està plena. Per rebre missatges de veu nous, prova de suprimir-ne uns quants.</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_title">Activa l\'emmagatzematge addicional i la còpia de seguretat</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_message">Tens la bústia plena. Per alliberar espai, activa l\'emmagatzematge addicional perquè Google pugui gestionar els missatges de veu i crear-ne una còpia de seguretat.</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_title">Activa l\'emmagatzematge addicional i la còpia de seguretat</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_message">Tens la bústia gairebé plena. Per alliberar espai, activa l\'emmagatzematge addicional perquè Google pugui gestionar els missatges de veu i crear-ne una còpia de seguretat.</string>
+  <string name="voicemail_error_pin_not_set_title">Defineix el PIN de la bústia de veu</string>
+  <string name="voicemail_error_pin_not_set_message">Necessitaràs el PIN de la bústia de veu cada vegada que truquis per accedir-hi.</string>
+  <string name="voicemail_action_turn_off_airplane_mode">Configuració del mode d\'avió</string>
+  <string name="voicemail_action_set_pin">Defineix el PIN</string>
+  <string name="voicemail_action_retry">Torna-ho a provar</string>
+  <string name="voicemail_action_turn_archive_on">Activa</string>
+  <string name="voicemail_action_dimiss">No, gràcies</string>
+  <string name="voicemail_action_sync">Sincronitza</string>
+  <string name="voicemail_action_call_voicemail">Truca a la bústia de veu</string>
+  <string name="voicemail_action_call_customer_support">Truca a atenció al client</string>
+  <string name="vvm3_error_vms_dns_failure_title">S\'ha produït un error</string>
+  <string name="vvm3_error_vms_dns_failure_message">Hem tingut un problema. Torna-ho a provar més tard. Si el problema continua, contacta amb el servei d\'atenció al client al %1$s i indica\'ls que el codi d\'error és 9001.</string>
+  <string name="vvm3_error_vmg_dns_failure_title">S\'ha produït un error</string>
+  <string name="vvm3_error_vmg_dns_failure_message">Hem tingut un problema. Torna-ho a provar més tard. Si el problema continua, contacta amb el servei d\'atenció al client al %1$s i indica\'ls que el codi d\'error és 9002.</string>
+  <string name="vvm3_error_spg_dns_failure_title">S\'ha produït un error</string>
+  <string name="vvm3_error_spg_dns_failure_message">Hem tingut un problema. Torna-ho a provar més tard. Si el problema continua, contacta amb el servei d\'atenció al client al %1$s i indica\'ls que el codi d\'error és 9003.</string>
+  <string name="vvm3_error_vms_no_cellular_title">No es pot establir la connexió amb la bústia de veu</string>
+  <string name="vvm3_error_vms_no_cellular_message">Estem tenint dificultats per establir la connexió amb la bústia de veu. Si ets en una zona amb poca cobertura, espera fins que millori i torna-ho a provar. Si el problema continua, contacta amb el servei d\'atenció al client al %1$s i indica\'ls que el codi d\'error és 9004.</string>
+  <string name="vvm3_error_vmg_no_cellular_title">No es pot establir la connexió amb la bústia de veu</string>
+  <string name="vvm3_error_vmg_no_cellular_message">Estem tenint dificultats per establir la connexió amb la bústia de veu. Si ets en una zona amb poca cobertura, espera fins que millori i torna-ho a provar. Si el problema continua, contacta amb el servei d\'atenció al client al %1$s i indica\'ls que el codi d\'error és 9005.</string>
+  <string name="vvm3_error_spg_no_cellular_title">No es pot establir la connexió amb la bústia de veu</string>
+  <string name="vvm3_error_spg_no_cellular_message">Estem tenint dificultats per establir la connexió amb la bústia de veu. Si ets en una zona amb poca cobertura, espera fins que millori i torna-ho a provar. Si el problema continua, contacta amb el servei d\'atenció al client al %1$s i indica\'ls que el codi d\'error és 9006.</string>
+  <string name="vvm3_error_vms_timeout_title">S\'ha produït un error</string>
+  <string name="vvm3_error_vms_timeout_message">Hem tingut un problema. Torna-ho a provar més tard. Si el problema continua, contacta amb el servei d\'atenció al client al %1$s i indica\'ls que el codi d\'error és 9007.</string>
+  <string name="vvm3_error_vmg_timeout_title">S\'ha produït un error</string>
+  <string name="vvm3_error_vmg_timeout_message">Hem tingut un problema. Torna-ho a provar més tard. Si el problema continua, contacta amb el servei d\'atenció al client al %1$s i indica\'ls que el codi d\'error és 9008.</string>
+  <string name="vvm3_error_status_sms_timeout_title">S\'ha produït un error</string>
+  <string name="vvm3_error_status_sms_timeout_message">Estem tenint dificultats per configurar el servei. Torna-ho a provar més tard. Si el problema continua, contacta amb el servei d\'atenció al client al %1$s i indica\'ls que el codi d\'error és 9009.</string>
+  <string name="vvm3_error_subscriber_blocked_title">No es pot establir la connexió amb la bústia de veu</string>
+  <string name="vvm3_error_subscriber_blocked_message">No podem establir la connexió amb la bústia de veu en aquest moment. Torna-ho a provar més tard. Si el problema continua, contacta amb el servei d\'atenció al client al %1$s i indica\'ls que el codi d\'error és 9990.</string>
+  <string name="vvm3_error_unknown_user_title">Configura la bústia de veu</string>
+  <string name="vvm3_error_unknown_user_message">La bústia de veu no està configurada al teu compte. Contacta amb el servei d\'atenció al client al %1$s i indica\'ls que el codi d\'error és 9991.</string>
+  <string name="vvm3_error_unknown_device_title">Bústia de veu</string>
+  <string name="vvm3_error_unknown_device_message">La bústia de veu visual no es pot utilitzar en aquest dispositiu. Contacta amb el servei d\'atenció al client al %1$s i indica\'ls que el codi d\'error és 9992.</string>
+  <string name="vvm3_error_invalid_password_title">S\'ha produït un error</string>
+  <string name="vvm3_error_invalid_password_message">Contacta amb el servei d\'atenció al client al %1$s i indica\'ls que el codi d\'error és 9993.</string>
+  <string name="vvm3_error_mailbox_not_initialized_title">Bústia de veu visual</string>
+  <string name="vvm3_error_mailbox_not_initialized_message">Per completar la configuració de la bústia de veu visual, contacta amb el servei d\'atenció al client al %1$s i indica\'ls que el codi d\'error és 9994.</string>
+  <string name="vvm3_error_service_not_provisioned_title">Bústia de veu visual</string>
+  <string name="vvm3_error_service_not_provisioned_message">Per completar la configuració de la bústia de veu visual, contacta amb el servei d\'atenció al client al %1$s i indica\'ls que el codi d\'error és 9995.</string>
+  <string name="vvm3_error_service_not_activated_title">Bústia de veu visual</string>
+  <string name="vvm3_error_service_not_activated_message">Per activar la bústia de veu visual, contacta amb el servei d\'atenció al client al %1$s i indica\'ls que el codi d\'error és 9996.</string>
+  <string name="vvm3_error_user_blocked_title">S\'ha produït un error</string>
+  <string name="vvm3_error_user_blocked_message">Per completar la configuració de la bústia de veu visual, contacta amb el servei d\'atenció al client al %1$s i indica\'ls que el codi d\'error és 9998.</string>
+  <string name="vvm3_error_subscriber_unknown_title">La bústia de veu visual està desactivada</string>
+  <string name="vvm3_error_subscriber_unknown_message">Contacta amb el servei d\'atenció al client al %1$s per activar la bústia de veu visual.</string>
+  <string name="vvm3_error_imap_getquota_error_title">S\'ha produït un error</string>
+  <string name="vvm3_error_imap_getquota_error_message">Contacta amb el servei d\'atenció al client al %1$s i indica\'ls que el codi d\'error és 9997.</string>
+  <string name="vvm3_error_imap_select_error_title">S\'ha produït un error</string>
+  <string name="vvm3_error_imap_select_error_message">Contacta amb el servei d\'atenció al client al %1$s i indica\'ls que el codi d\'error és 9989.</string>
+  <string name="vvm3_error_imap_error_title">S\'ha produït un error</string>
+  <string name="vvm3_error_imap_error_message">Contacta amb el servei d\'atenció al client al %1$s i indica\'ls que el codi d\'error és 9999.</string>
+  <string name="verizon_terms_and_conditions_title">Activa la bústia de veu visual</string>
+  <string name="verizon_terms_and_conditions_message">%1$s En activar la bústia de veu visual, acceptes els termes i condicions de Verizon Wireless:\n\n%2$s</string>
+  <string name="dialer_terms_and_conditions_title">Activa la bústia de veu visual</string>
+  <string name="dialer_terms_and_conditions_existing_user_title">Novetat! Llegeix els missatges de veu</string>
+  <string name="dialer_terms_and_conditions_message">%s</string>
+  <string name="dialer_terms_and_conditions_1.0">Pots veure i escoltar els missatges sense haver de trucar a la bústia de veu. Les transcripcions dels missatges de veu les proporciona el servei de transcripció gratuït de Google. Pots desactivar aquesta opció en qualsevol moment des de Configuració. %s</string>
+  <string name="dialer_terms_and_conditions_existing_user">Ara, les transcripcions dels missatges de veu les proporciona el servei de transcripció gratuït de Google. Pots desactivar aquesta opció en qualsevol moment des de Configuració. %s</string>
+  <string name="dialer_terms_and_conditions_for_verizon_1.0">Consulta i escolta els missatges sense haver de trucar a la bústia de veu.</string>
+  <string name="dialer_terms_and_conditions_learn_more">Més informació</string>
+  <string name="dialer_terms_and_conditions_existing_user_ack">D\'acord</string>
+  <string name="dialer_terms_and_conditions_existing_user_decline">No, gràcies</string>
+  <string name="terms_and_conditions_decline_dialog_title">Vols desactivar la bústia de veu visual?</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_message">La bústia de veu visual es desactivarà si es rebutgen els termes i condicions.</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_downgrade">Desactiva</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_message">Si desactives la bústia de veu visual, no hi podràs accedir.</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_downgrade">Desactiva</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message">Només podràs accedir a la bústia de veu trucant al *86. Defineix un nou PIN de la bústia de veu per continuar.</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin">Defineix el PIN</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/error/res/values-cs/strings.xml b/java/com/android/dialer/voicemail/listui/error/res/values-cs/strings.xml
new file mode 100644
index 0000000..b323609
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/error/res/values-cs/strings.xml
@@ -0,0 +1,102 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_error_activating_title">Aktivace vizuální hlasové schránky</string>
+  <string name="voicemail_error_activating_message">Je možné, že dokud nebude vizuální hlasová schránka plně aktivována, nebudou vám chodit oznámení z hlasové schránky. Do té doby se k novým zprávám dostanete po zavolání do hlasové schránky.</string>
+  <string name="voicemail_error_not_activate_no_signal_title">Vizuální hlasovou schránku se nepodařilo aktivovat</string>
+  <string name="voicemail_error_not_activate_no_signal_message">Zkontrolujte, že je telefon připojen k mobilní síti a zkuste to znovu.</string>
+  <string name="voicemail_error_not_activate_no_signal_airplane_mode_message">Vypněte režim letadla a zkuste to znovu.</string>
+  <string name="voicemail_error_no_signal_title">Nejste připojeni</string>
+  <string name="voicemail_error_no_signal_message">Nebudete dostávat oznámení o nových hlasových zprávách. Pokud jste připojeni k Wi-Fi, můžete hlasovou schránku zkontrolovat synchronizací.</string>
+  <string name="voicemail_error_no_signal_airplane_mode_message">Nebudete dostávat oznámení o nových hlasových zprávách. Pokud chcete hlasovou schránku synchronizovat, vypněte režim letadla.</string>
+  <string name="voicemail_error_no_signal_cellular_required_message">Telefon musí být připojen k mobilním datům, aby bylo možné zkontrolovat hlasovou schránku.</string>
+  <string name="voicemail_error_activation_failed_title">Vizuální hlasovou schránku se nepodařilo aktivovat</string>
+  <string name="voicemail_error_activation_failed_message">Můžete ji ale stále zkontrolovat zavoláním.</string>
+  <string name="voicemail_error_no_data_title">Vizuální hlasovou schránku se nepodařilo aktualizovat</string>
+  <string name="voicemail_error_no_data_message">Zkuste to znovu, až budete mít lepší připojení k Wi-Fi nebo k mobilním datům. Stále ale můžete hlasovou schránku zkontrolovat zavoláním.</string>
+  <string name="voicemail_error_no_data_cellular_required_message">Zkuste to znovu, až budete mít lepší připojení k mobilním datům. Stále ale můžete hlasovou schránku zkontrolovat zavoláním.</string>
+  <string name="voicemail_error_bad_config_title">Vizuální hlasovou schránku se nepodařilo aktualizovat</string>
+  <string name="voicemail_error_bad_config_message">Můžete ji ale stále zkontrolovat zavoláním.</string>
+  <string name="voicemail_error_communication_title">Vizuální hlasovou schránku se nepodařilo aktualizovat</string>
+  <string name="voicemail_error_communication_message">Můžete ji ale stále zkontrolovat zavoláním.</string>
+  <string name="voicemail_error_server_connection_title">Vizuální hlasovou schránku se nepodařilo aktualizovat</string>
+  <string name="voicemail_error_server_connection_message">Můžete ji ale stále zkontrolovat zavoláním.</string>
+  <string name="voicemail_error_server_title">Vizuální hlasovou schránku se nepodařilo aktualizovat</string>
+  <string name="voicemail_error_server_message">Můžete ji ale stále zkontrolovat zavoláním.</string>
+  <string name="voicemail_error_inbox_near_full_title">Schránka je téměř plná</string>
+  <string name="voicemail_error_inbox_near_full_message">Pokud máte plnou schránku, nemůžete přijímat nové hlasové zprávy.</string>
+  <string name="voicemail_error_inbox_full_title">Nemůžete přijímat nové hlasové zprávy</string>
+  <string name="voicemail_error_inbox_full_message">Vaše schránka je plná. Abyste mohli přijímat nové hlasové zprávy, zkuste nějaké zprávy smazat.</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_title">Zapněte si další úložiště a zálohování</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_message">Vaše e-mailová schránka je plná. Pokud chcete uvolnit místo, zapněte si další úložiště, aby Google mohl spravovat a zálohovat vaše hlasové zprávy.</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_title">Zapněte si další úložiště a zálohování</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_message">Vaše e-mailová schránka je téměř plná. Pokud chcete uvolnit místo, zapněte si další úložiště, aby Google mohl spravovat a zálohovat vaše hlasové zprávy.</string>
+  <string name="voicemail_error_pin_not_set_title">Nastavte kód PIN hlasové schránky</string>
+  <string name="voicemail_error_pin_not_set_message">PIN hlasové schránky budete potřebovat, kdykoli do své hlasové schránky zavoláte.</string>
+  <string name="voicemail_action_turn_off_airplane_mode">Nastavení režimu letadla</string>
+  <string name="voicemail_action_set_pin">Nastavit kód PIN</string>
+  <string name="voicemail_action_retry">Opakovat</string>
+  <string name="voicemail_action_turn_archive_on">Zapnout</string>
+  <string name="voicemail_action_dimiss">Ne, díky</string>
+  <string name="voicemail_action_sync">Synchronizovat</string>
+  <string name="voicemail_action_call_voicemail">Volat hlasovou schránku</string>
+  <string name="voicemail_action_call_customer_support">Volat zákaznickou podporu</string>
+  <string name="vvm3_error_vms_dns_failure_title">Něco se pokazilo</string>
+  <string name="vvm3_error_vms_dns_failure_message">Bohužel se vyskytl problém. Zkuste to prosím znovu. Pokud budou potíže přetrvávat, kontaktujte zákaznický servis na čísle %1$s a sdělte kód chyby 9001.</string>
+  <string name="vvm3_error_vmg_dns_failure_title">Něco se pokazilo</string>
+  <string name="vvm3_error_vmg_dns_failure_message">Bohužel se vyskytl problém. Zkuste to prosím znovu. Pokud budou potíže přetrvávat, kontaktujte zákaznický servis na čísle %1$s a sdělte kód chyby 9002.</string>
+  <string name="vvm3_error_spg_dns_failure_title">Něco se pokazilo</string>
+  <string name="vvm3_error_spg_dns_failure_message">Bohužel se vyskytl problém. Zkuste to prosím znovu. Pokud budou potíže přetrvávat, kontaktujte zákaznický servis na čísle %1$s a sdělte kód chyby 9003.</string>
+  <string name="vvm3_error_vms_no_cellular_title">K vaší hlasové schránce se nepodařilo připojit</string>
+  <string name="vvm3_error_vms_no_cellular_message">Při připojování k vaší hlasové schránce se bohužel vyskytl problém. Jste-li na místě se slabým signálem, počkejte, dokud signál nebude lepší, a zkuste to znovu. Pokud budou potíže přetrvávat, kontaktujte zákaznický servis na čísle %1$s a sdělte kód chyby 9004.</string>
+  <string name="vvm3_error_vmg_no_cellular_title">K vaší hlasové schránce se nepodařilo připojit</string>
+  <string name="vvm3_error_vmg_no_cellular_message">Při připojování k vaší hlasové schránce se bohužel vyskytl problém. Jste-li na místě se slabým signálem, počkejte, dokud nebudete mít lepší signál, a zkuste to znovu. Pokud budou potíže přetrvávat, kontaktujte zákaznický servis na čísle %1$s a sdělte kód chyby 9005.</string>
+  <string name="vvm3_error_spg_no_cellular_title">K vaší hlasové schránce se nepodařilo připojit</string>
+  <string name="vvm3_error_spg_no_cellular_message">Při připojování k vaší hlasové schránce se bohužel vyskytl problém. Jste-li na místě se slabým signálem, počkejte, dokud nebudete mít lepší signál, a zkuste to znovu. Pokud budou potíže přetrvávat, kontaktujte zákaznický servis na čísle %1$s a sdělte kód chyby 9006.</string>
+  <string name="vvm3_error_vms_timeout_title">Něco se pokazilo</string>
+  <string name="vvm3_error_vms_timeout_message">Bohužel se vyskytl problém. Zkuste to prosím znovu. Pokud budou potíže přetrvávat, kontaktujte zákaznický servis na čísle %1$s a sdělte kód chyby 9007.</string>
+  <string name="vvm3_error_vmg_timeout_title">Něco se pokazilo</string>
+  <string name="vvm3_error_vmg_timeout_message">Bohužel se vyskytl problém. Zkuste to prosím znovu. Pokud budou potíže přetrvávat, kontaktujte zákaznický servis na čísle %1$s a sdělte kód chyby 9008.</string>
+  <string name="vvm3_error_status_sms_timeout_title">Něco se pokazilo</string>
+  <string name="vvm3_error_status_sms_timeout_message">Při nastavování vaší služby se bohužel vyskytl problém. Zkuste to znovu později. Pokud budou potíže přetrvávat, kontaktujte zákaznický servis na čísle %1$s a sdělte kód chyby 9009.</string>
+  <string name="vvm3_error_subscriber_blocked_title">K vaší hlasové schránce se nepodařilo připojit</string>
+  <string name="vvm3_error_subscriber_blocked_message">Bohužel vás k vaší hlasové schránce momentálně nemůžeme připojit. Zkuste to znovu později. Pokud budou potíže přetrvávat, kontaktujte zákaznický servis na čísle %1$s a sdělte kód chyby 9990.</string>
+  <string name="vvm3_error_unknown_user_title">Nastavte hlasovou schránku</string>
+  <string name="vvm3_error_unknown_user_message">Hlasová schránka není ve vašem účtu nastavena. Kontaktujte zákaznický servis na čísle %1$s a sdělte kód chyby 9991.</string>
+  <string name="vvm3_error_unknown_device_title">Hlasová schránka</string>
+  <string name="vvm3_error_unknown_device_message">Vizuální hlasovou schránku není na tomto zařízení možné používat. Kontaktujte zákaznický servis na čísle %1$s a sdělte kód chyby 9992.</string>
+  <string name="vvm3_error_invalid_password_title">Něco se pokazilo</string>
+  <string name="vvm3_error_invalid_password_message">Kontaktujte zákaznický servis na čísle %1$s a sdělte kód chyby 9993.</string>
+  <string name="vvm3_error_mailbox_not_initialized_title">Vizuální hlasová schránka</string>
+  <string name="vvm3_error_mailbox_not_initialized_message">Pokud chcete dokončit nastavení vizuální hlasové schránky, kontaktujte zákaznický servis na čísle %1$s a sdělte kód chyby 9994.</string>
+  <string name="vvm3_error_service_not_provisioned_title">Vizuální hlasová schránka</string>
+  <string name="vvm3_error_service_not_provisioned_message">Pokud chcete dokončit nastavení vizuální hlasové schránky, kontaktujte zákaznický servis na čísle %1$s a sdělte kód chyby 9995.</string>
+  <string name="vvm3_error_service_not_activated_title">Vizuální hlasová schránka</string>
+  <string name="vvm3_error_service_not_activated_message">Pokud chcete zapnout vizuální hlasovou schránku, kontaktujte zákaznický servis na čísle %1$s a sdělte kód chyby 9996.</string>
+  <string name="vvm3_error_user_blocked_title">Něco se pokazilo</string>
+  <string name="vvm3_error_user_blocked_message">Pokud chcete dokončit nastavení vizuální hlasové schránky, kontaktujte zákaznický servis na čísle %1$s a sdělte kód chyby 9998.</string>
+  <string name="vvm3_error_subscriber_unknown_title">Vizuální hlasová schránka je vypnutá</string>
+  <string name="vvm3_error_subscriber_unknown_message">Vizuální hlasovou schránku aktivujete po zavolání zákaznického servisu na čísle %1$s.</string>
+  <string name="vvm3_error_imap_getquota_error_title">Něco se pokazilo</string>
+  <string name="vvm3_error_imap_getquota_error_message">Kontaktujte zákaznický servis na čísle %1$s a sdělte kód chyby 9997.</string>
+  <string name="vvm3_error_imap_select_error_title">Něco se pokazilo</string>
+  <string name="vvm3_error_imap_select_error_message">Kontaktujte zákaznický servis na čísle %1$s a sdělte kód chyby 9989.</string>
+  <string name="vvm3_error_imap_error_title">Něco se pokazilo</string>
+  <string name="vvm3_error_imap_error_message">Kontaktujte zákaznický servis na čísle %1$s a sdělte kód chyby 9999.</string>
+  <string name="verizon_terms_and_conditions_title">Zapnutí vizuální hlasové schránky</string>
+  <string name="verizon_terms_and_conditions_message">%1$s Když zapnete vizuální hlasovou schránku, vyjadřujete tím souhlas se smluvními podmínkami společnosti Verizon Wireless:\n\n%2$s</string>
+  <string name="dialer_terms_and_conditions_title">Zapnutí vizuální hlasové schránky</string>
+  <string name="dialer_terms_and_conditions_existing_user_title">Novinka! Čtěte si hlasové zprávy</string>
+  <string name="dialer_terms_and_conditions_message">%s</string>
+  <string name="dialer_terms_and_conditions_1.0">Čtěte a poslouchejte své zprávy, aniž byste museli volat do hlasové schránky. Přepisy hlasových zpráv poskytuje bezplatná přepisovací služba od Googlu. Obě funkce můžete kdykoli vypnout v nastavení. %s</string>
+  <string name="dialer_terms_and_conditions_existing_user">Přepisy hlasových zpráv poskytuje bezplatná přepisovací služba od Googlu. Tuto funkci můžete kdykoli vypnout v nastavení. %s</string>
+  <string name="dialer_terms_and_conditions_for_verizon_1.0">Čtěte a poslouchejte své zprávy, aniž byste museli volat do hlasové schránky.</string>
+  <string name="dialer_terms_and_conditions_learn_more">Další informace</string>
+  <string name="dialer_terms_and_conditions_existing_user_ack">OK, rozumím</string>
+  <string name="dialer_terms_and_conditions_existing_user_decline">Ne, díky</string>
+  <string name="terms_and_conditions_decline_dialog_title">Vypnout vizuální hlasovou schránku?</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_message">Pokud smluvní podmínky odmítnete, vizuální hlasová schránka bude vypnuta.</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_downgrade">Vypnout</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_message">Pokud vizuální hlasovou schránku vypnete, bude deaktivována.</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_downgrade">Vypnout</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message">Hlasová schránka bude dostupná jen zavoláním na číslo *86. Pokud chcete pokračovat, nastavte si nový kód PIN k hlasové schránce.</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin">Nastavit kód PIN</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/error/res/values-da/strings.xml b/java/com/android/dialer/voicemail/listui/error/res/values-da/strings.xml
new file mode 100644
index 0000000..e4e89a5
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/error/res/values-da/strings.xml
@@ -0,0 +1,102 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_error_activating_title">Den visuelle telefonsvarer aktiveres</string>
+  <string name="voicemail_error_activating_message">Du modtager muligvis ikke telefonsvarerunderretninger, før den visuelle telefonsvarer er fuldt aktiveret. Ring til telefonsvareren for hente nye beskeder, indtil telefonsvareren er fuldt aktiveret.</string>
+  <string name="voicemail_error_not_activate_no_signal_title">Den visuelle telefonsvarer kunne ikke aktiveres</string>
+  <string name="voicemail_error_not_activate_no_signal_message">Sørg for, at din telefon har forbindelse til mobilnetværket, og prøv igen.</string>
+  <string name="voicemail_error_not_activate_no_signal_airplane_mode_message">Slå flytilstand fra, og prøv igen.</string>
+  <string name="voicemail_error_no_signal_title">Der er ingen forbindelse</string>
+  <string name="voicemail_error_no_signal_message">Du får ikke besked om nye talebeskeder. Hvis du er på Wi-Fi, kan du tjekke, om der er talebeskeder, ved at synkronisere nu.</string>
+  <string name="voicemail_error_no_signal_airplane_mode_message">Du får ikke besked om nye talebeskeder. Slå flytilstand fra for at synkronisere din telefonsvarer.</string>
+  <string name="voicemail_error_no_signal_cellular_required_message">Din telefon skal have en mobildataforbindelse, for at du kan tjekke, om der er talebeskeder.</string>
+  <string name="voicemail_error_activation_failed_title">Den visuelle telefonsvarer kunne ikke aktiveres</string>
+  <string name="voicemail_error_activation_failed_message">Du kan stadig ringe op for at tjekke din telefonsvarer.</string>
+  <string name="voicemail_error_no_data_title">Den visuelle telefonsvarer kunne ikke opdateres</string>
+  <string name="voicemail_error_no_data_message">Prøv igen, når din Wi-Fi- eller mobildataforbindelse er bedre. Du kan stadig ringe for at tjekke, om der er talebeskeder.</string>
+  <string name="voicemail_error_no_data_cellular_required_message">Prøv igen, når din mobildataforbindelse er bedre. Du kan stadig ringe for at tjekke, om der er talebeskeder.</string>
+  <string name="voicemail_error_bad_config_title">Den visuelle telefonsvarer kunne ikke opdateres</string>
+  <string name="voicemail_error_bad_config_message">Du kan stadig ringe op for at tjekke din telefonsvarer.</string>
+  <string name="voicemail_error_communication_title">Den visuelle telefonsvarer kunne ikke opdateres</string>
+  <string name="voicemail_error_communication_message">Du kan stadig ringe op for at tjekke din telefonsvarer.</string>
+  <string name="voicemail_error_server_connection_title">Den visuelle telefonsvarer kunne ikke opdateres</string>
+  <string name="voicemail_error_server_connection_message">Du kan stadig ringe op for at tjekke din telefonsvarer.</string>
+  <string name="voicemail_error_server_title">Den visuelle telefonsvarer kunne ikke opdateres</string>
+  <string name="voicemail_error_server_message">Du kan stadig ringe op for at tjekke din telefonsvarer.</string>
+  <string name="voicemail_error_inbox_near_full_title">Indbakken er næsten fuld</string>
+  <string name="voicemail_error_inbox_near_full_message">Du kan ikke modtage nye talebeskeder, hvis din indbakke er fuld.</string>
+  <string name="voicemail_error_inbox_full_title">Du kan ikke modtage nye talebeskeder</string>
+  <string name="voicemail_error_inbox_full_message">Din indbakke er fuld. Prøv at slette nogle beskeder for at modtage nye talebeskeder.</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_title">Slå ekstra lagerplads til, og foretag en sikkerhedskopiering</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_message">Din telefonsvarer er fuld. Du kan frigøre plads ved at slå ekstra lagerplads til, så Google kan administrere og sikkerhedskopiere dine talebeskeder.</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_title">Slå ekstra lagerplads til, og foretag en sikkerhedskopiering</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_message">Din telefonsvarer er næsten fuld. Du kan frigøre plads ved at slå ekstra lagerplads til, så Google kan administrere og sikkerhedskopiere dine talebeskeder.</string>
+  <string name="voicemail_error_pin_not_set_title">Bestem pinkoden til din telefonsvarer</string>
+  <string name="voicemail_error_pin_not_set_message">Du skal bruge en pinkode til din telefonsvarer, når du ringer for at få adgang til den.</string>
+  <string name="voicemail_action_turn_off_airplane_mode">Indstillinger for flytilstand</string>
+  <string name="voicemail_action_set_pin">Angiv pinkode</string>
+  <string name="voicemail_action_retry">Prøv igen</string>
+  <string name="voicemail_action_turn_archive_on">Aktivér</string>
+  <string name="voicemail_action_dimiss">Nej tak</string>
+  <string name="voicemail_action_sync">Synkroniser</string>
+  <string name="voicemail_action_call_voicemail">Ring til telefonsvarer</string>
+  <string name="voicemail_action_call_customer_support">Ring til kundesupport</string>
+  <string name="vvm3_error_vms_dns_failure_title">Der gik noget galt</string>
+  <string name="vvm3_error_vms_dns_failure_message">Der opstod desværre et problem. Prøv igen senere. Kontakt kundeservice på %1$s, og oplys dem om fejlkode 9001, hvis problemet fortsætter.</string>
+  <string name="vvm3_error_vmg_dns_failure_title">Der gik noget galt</string>
+  <string name="vvm3_error_vmg_dns_failure_message">Der opstod desværre et problem. Prøv igen senere. Kontakt kundeservice på %1$s, og oplys dem om fejlkode 9002, hvis problemet fortsætter.</string>
+  <string name="vvm3_error_spg_dns_failure_title">Der gik noget galt</string>
+  <string name="vvm3_error_spg_dns_failure_message">Der opstod desværre et problem. Prøv igen senere. Kontakt kundeservice på %1$s, og oplys dem om fejlkode 9003, hvis problemet fortsætter.</string>
+  <string name="vvm3_error_vms_no_cellular_title">Der kan ikke oprettes forbindelse til din telefonsvarer</string>
+  <string name="vvm3_error_vms_no_cellular_message">Vi har desværre problemer med at oprette forbindelse til din telefonsvarer. Vent, til du har et stærkt signal, hvis du befinder dig i et område med dårlig signalstyrke, og prøv igen. Kontakt kundeservice på %1$s, og oplys dem om fejlkode 9004, hvis problemet fortsætter.</string>
+  <string name="vvm3_error_vmg_no_cellular_title">Der kan ikke oprettes forbindelse til din telefonsvarer</string>
+  <string name="vvm3_error_vmg_no_cellular_message">Vi har desværre problemer med at oprette forbindelse til din telefonsvarer. Vent, til du har et stærkt signal, hvis du befinder dig i et område med dårlig signalstyrke, og prøv igen. Kontakt kundeservice på %1$s, og oplys dem om fejlkode 9005, hvis problemet fortsætter.</string>
+  <string name="vvm3_error_spg_no_cellular_title">Der kan ikke oprettes forbindelse til din telefonsvarer</string>
+  <string name="vvm3_error_spg_no_cellular_message">Vi har desværre problemer med at oprette forbindelse til din telefonsvarer. Vent, til du har et stærkt signal, hvis du befinder dig i et område med dårlig signalstyrke, og prøv igen. Kontakt kundeservice på %1$s, og oplys dem om fejlkode 9006, hvis problemet fortsætter.</string>
+  <string name="vvm3_error_vms_timeout_title">Der gik noget galt</string>
+  <string name="vvm3_error_vms_timeout_message">Der opstod desværre et problem. Prøv igen senere. Kontakt kundeservice på %1$s, og oplys dem om fejlkode 9007, hvis problemet fortsætter.</string>
+  <string name="vvm3_error_vmg_timeout_title">Der gik noget galt</string>
+  <string name="vvm3_error_vmg_timeout_message">Der opstod desværre et problem. Prøv igen senere. Kontakt kundeservice på %1$s, og oplys dem om fejlkode 9008, hvis problemet fortsætter.</string>
+  <string name="vvm3_error_status_sms_timeout_title">Der gik noget galt</string>
+  <string name="vvm3_error_status_sms_timeout_message">Vi har desværre problemer med at konfigurere din tjeneste. Kontakt kundeservice på %1$s, og oplys dem om fejlkode 9009, hvis problemet fortsætter.</string>
+  <string name="vvm3_error_subscriber_blocked_title">Der kan ikke oprettes forbindelse til din telefonsvarer</string>
+  <string name="vvm3_error_subscriber_blocked_message">Vi kan desværre ikke oprette forbindelse til din telefonsvarer i øjeblikket. Kontakt kundeservice på %1$s, og oplys dem om fejlkode 9990, hvis problemet fortsætter.</string>
+  <string name="vvm3_error_unknown_user_title">Konfigurer telefonsvarer</string>
+  <string name="vvm3_error_unknown_user_message">Telefonsvarer er ikke konfigureret på din konto. Kontakt kundeservice på %1$s, og oplys dem om fejlkode 9991.</string>
+  <string name="vvm3_error_unknown_device_title">Talebesked</string>
+  <string name="vvm3_error_unknown_device_message">Visuel telefonsvarer kan ikke bruges på denne enhed. Kontakt kundeservice på %1$s, og oplys dem om fejlkode 9992.</string>
+  <string name="vvm3_error_invalid_password_title">Der gik noget galt</string>
+  <string name="vvm3_error_invalid_password_message">Kontakt kundeservice på %1$s, og oplys dem om fejlkode 9993.</string>
+  <string name="vvm3_error_mailbox_not_initialized_title">Visuel telefonsvarer</string>
+  <string name="vvm3_error_mailbox_not_initialized_message">Kontakt kundeservice på %1$s, og oplys dem om fejlkode 9994, for at fuldføre konfigurationen af den visuelle telefonsvarer.</string>
+  <string name="vvm3_error_service_not_provisioned_title">Visuel telefonsvarer</string>
+  <string name="vvm3_error_service_not_provisioned_message">Kontakt kundeservice på %1$s, og oplys dem om fejlkode 9995, for at fuldføre konfigurationen af den visuelle telefonsvarer.</string>
+  <string name="vvm3_error_service_not_activated_title">Visuel telefonsvarer</string>
+  <string name="vvm3_error_service_not_activated_message">Kontakt kundeservice på %1$s, og oplys dem om fejlkode 9996, for at aktivere den visuelle telefonsvarer.</string>
+  <string name="vvm3_error_user_blocked_title">Der gik noget galt</string>
+  <string name="vvm3_error_user_blocked_message">Kontakt kundeservice på %1$s, og oplys dem om fejlkode 9998, for at fuldføre konfigurationen af den visuelle telefonsvarer.</string>
+  <string name="vvm3_error_subscriber_unknown_title">Den visuelle telefonsvarer er deaktiveret</string>
+  <string name="vvm3_error_subscriber_unknown_message">Kontakt kundeservice på %1$s for at aktivere den visuelle telefonsvarer.</string>
+  <string name="vvm3_error_imap_getquota_error_title">Der gik noget galt</string>
+  <string name="vvm3_error_imap_getquota_error_message">Kontakt kundeservice på %1$s, og oplys dem om fejlkode 9997.</string>
+  <string name="vvm3_error_imap_select_error_title">Der gik noget galt</string>
+  <string name="vvm3_error_imap_select_error_message">Kontakt kundeservice på %1$s, og oplys dem om fejlkode 9989.</string>
+  <string name="vvm3_error_imap_error_title">Der gik noget galt</string>
+  <string name="vvm3_error_imap_error_message">Kontakt kundeservice på %1$s, og oplys dem om fejlkode 9999.</string>
+  <string name="verizon_terms_and_conditions_title">Aktivér visuel telefonsvarer</string>
+  <string name="verizon_terms_and_conditions_message">%1$s Når du slår visuel telefonsvarer til, accepterer du vilkår og betingelser for Verizon Wireless:\n\n%2$s</string>
+  <string name="dialer_terms_and_conditions_title">Aktivér visuel telefonsvarer</string>
+  <string name="dialer_terms_and_conditions_existing_user_title">Nyhed! Læs dine talebeskeder</string>
+  <string name="dialer_terms_and_conditions_message">%s</string>
+  <string name="dialer_terms_and_conditions_1.0">Se og aflyt dine beskeder uden at skulle ringe til din telefonsvarer. Googles gratis transskriptionstjeneste leverer transskriptioner af dine talebeskeder. Du kan altid slå det fra under Indstillinger. %s</string>
+  <string name="dialer_terms_and_conditions_existing_user">Googles gratis transskriptionstjeneste leverer transskriptioner af dine talebeskeder. Du kan altid slå det fra under Indstillinger. %s</string>
+  <string name="dialer_terms_and_conditions_for_verizon_1.0">Se og lyt til dine beskeder uden at skulle ringe til din telefonsvarer.</string>
+  <string name="dialer_terms_and_conditions_learn_more">Få flere oplysninger</string>
+  <string name="dialer_terms_and_conditions_existing_user_ack">OK</string>
+  <string name="dialer_terms_and_conditions_existing_user_decline">Nej tak</string>
+  <string name="terms_and_conditions_decline_dialog_title">Vil du deaktivere den visuelle telefonsvarer?</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_message">Den visuelle telefonsvarer deaktiveres, hvis du afviser vilkår og betingelser.</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_downgrade">Deaktiver</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_message">Den visuelle telefonsvarer deaktiveres, hvis du slår visuel telefonsvarer fra.</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_downgrade">Deaktiver</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message">Telefonsvareren er kun tilgængelig, hvis du taster *86 og ringer op. Angiv en ny pinkode til telefonsvareren for at fortsætte.</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin">Angiv pinkode</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/error/res/values-de/strings.xml b/java/com/android/dialer/voicemail/listui/error/res/values-de/strings.xml
new file mode 100644
index 0000000..14b8e26
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/error/res/values-de/strings.xml
@@ -0,0 +1,102 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_error_activating_title">Visuelle Mailbox wird aktiviert</string>
+  <string name="voicemail_error_activating_message">Möglicherweise erhältst du keine Mailboxbenachrichtigungen, solange die visuelle Mailbox nicht vollständig aktiviert ist. Bis es soweit ist, kannst du deine Mailbox anrufen, um neue Nachrichten abzuhören.</string>
+  <string name="voicemail_error_not_activate_no_signal_title">Visuelle Mailbox kann nicht aktiviert werden</string>
+  <string name="voicemail_error_not_activate_no_signal_message">Vergewissere dich, dass auf deinem Smartphone eine Mobilfunkverbindung besteht, und versuche es noch einmal.</string>
+  <string name="voicemail_error_not_activate_no_signal_airplane_mode_message">Schalte den Flugmodus aus und versuche es noch einmal.</string>
+  <string name="voicemail_error_no_signal_title">Keine Verbindung</string>
+  <string name="voicemail_error_no_signal_message">Du wirst nicht über neue Mailboxnachrichten informiert. Wenn du eine WLAN-Verbindung verwendest, kannst du deine Mailbox abrufen, indem du dein Smartphone jetzt synchronisierst.</string>
+  <string name="voicemail_error_no_signal_airplane_mode_message">Du wirst nicht über neue Mailboxnachrichten informiert. Schalte den Flugmodus aus, um deine Mailbox zu synchronisieren.</string>
+  <string name="voicemail_error_no_signal_cellular_required_message">Dein Smartphone benötigt eine mobile Datenverbindung, um die Mailbox abzurufen.</string>
+  <string name="voicemail_error_activation_failed_title">Visuelle Mailbox kann nicht aktiviert werden</string>
+  <string name="voicemail_error_activation_failed_message">Du kannst deine Mailbox immer noch per Anruf abhören.</string>
+  <string name="voicemail_error_no_data_title">Visuelle Mailbox kann nicht aktualisiert werden</string>
+  <string name="voicemail_error_no_data_message">Versuche es noch einmal, sobald die WLAN- bzw. Mobilfunkverbindung besser ist. Du kannst deine Mailbox weiterhin per Anruf abhören.</string>
+  <string name="voicemail_error_no_data_cellular_required_message">Versuche es noch einmal, sobald die Mobilfunkverbindung besser ist. Du kannst deine Mailbox weiterhin per Anruf abhören.</string>
+  <string name="voicemail_error_bad_config_title">Visuelle Mailbox kann nicht aktualisiert werden</string>
+  <string name="voicemail_error_bad_config_message">Du kannst deine Mailbox immer noch per Anruf abhören.</string>
+  <string name="voicemail_error_communication_title">Visuelle Mailbox kann nicht aktualisiert werden</string>
+  <string name="voicemail_error_communication_message">Du kannst deine Mailbox immer noch per Anruf abhören.</string>
+  <string name="voicemail_error_server_connection_title">Visuelle Mailbox kann nicht aktualisiert werden</string>
+  <string name="voicemail_error_server_connection_message">Du kannst deine Mailbox immer noch per Anruf abhören.</string>
+  <string name="voicemail_error_server_title">Visuelle Mailbox kann nicht aktualisiert werden</string>
+  <string name="voicemail_error_server_message">Du kannst deine Mailbox immer noch per Anruf abhören.</string>
+  <string name="voicemail_error_inbox_near_full_title">Mailbox fast voll</string>
+  <string name="voicemail_error_inbox_near_full_message">Wenn deine Mailbox voll ist, kannst du keine neuen Sprachnachrichten empfangen.</string>
+  <string name="voicemail_error_inbox_full_title">Es können keine neuen Mailboxnachrichten empfangen werden</string>
+  <string name="voicemail_error_inbox_full_message">Deine Mailbox ist voll. Lösche einige Nachrichten, um neue empfangen zu können.</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_title">Zusätzlichen Speicher und Sicherung aktivieren</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_message">Deine Mailbox ist voll. Aktivere zusätzlichen Speicher, um Speicherplatz freizugeben, damit Google deine Mailboxnachrichten verwalten und sichern kann.</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_title">Zusätzlichen Speicher und Sicherung aktivieren</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_message">Deine Mailbox ist fast voll. Aktivere zusätzlichen Speicher, um Speicherplatz freizugeben, damit Google deine Mailboxnachrichten verwalten und sichern kann.</string>
+  <string name="voicemail_error_pin_not_set_title">Mailbox-PIN festlegen</string>
+  <string name="voicemail_error_pin_not_set_message">Bei jedem Anruf auf deiner Mailbox benötigst du eine Mailbox-PIN.</string>
+  <string name="voicemail_action_turn_off_airplane_mode">Flugmoduseinstellungen</string>
+  <string name="voicemail_action_set_pin">PIN festlegen</string>
+  <string name="voicemail_action_retry">Wiederholen</string>
+  <string name="voicemail_action_turn_archive_on">Aktivieren</string>
+  <string name="voicemail_action_dimiss">Nein danke</string>
+  <string name="voicemail_action_sync">Synchronisieren</string>
+  <string name="voicemail_action_call_voicemail">Mailbox anrufen</string>
+  <string name="voicemail_action_call_customer_support">Kundensupport anrufen</string>
+  <string name="vvm3_error_vms_dns_failure_title">Ein Problem ist aufgetreten</string>
+  <string name="vvm3_error_vms_dns_failure_message">Wir haben einen Fehler entdeckt. Bitte versuche es später noch einmal. Wenn das Problem weiterhin besteht, wende dich an den Kundensupport unter der Nummer %1$s und gib den Fehlercode 9001 an.</string>
+  <string name="vvm3_error_vmg_dns_failure_title">Ein Problem ist aufgetreten</string>
+  <string name="vvm3_error_vmg_dns_failure_message">Wir haben einen Fehler entdeckt. Bitte versuche es später noch einmal. Wenn das Problem weiterhin besteht, wende dich an den Kundensupport unter der Nummer %1$s und gib den Fehlercode 9002 an.</string>
+  <string name="vvm3_error_spg_dns_failure_title">Ein Problem ist aufgetreten</string>
+  <string name="vvm3_error_spg_dns_failure_message">Wir haben einen Fehler entdeckt. Bitte versuche es später noch einmal. Wenn das Problem weiterhin besteht, wende dich an den Kundensupport unter der Nummer %1$s und gib den Fehlercode 9003 an.</string>
+  <string name="vvm3_error_vms_no_cellular_title">Verbindung zur Mailbox nicht möglich</string>
+  <string name="vvm3_error_vms_no_cellular_message">Wir haben einen Fehler entdeckt. Bitte versuche es später noch einmal. Wenn das Problem weiterhin besteht, wende dich an den Kundensupport unter der Nummer %1$s und gib den Fehlercode 9004 an.</string>
+  <string name="vvm3_error_vmg_no_cellular_title">Verbindung zur Mailbox nicht möglich</string>
+  <string name="vvm3_error_vmg_no_cellular_message">Wir haben einen Fehler entdeckt. Bitte versuche es später noch einmal. Wenn das Problem weiterhin besteht, wende dich an den Kundensupport unter der Nummer %1$s und gib den Fehlercode 9005 an.</string>
+  <string name="vvm3_error_spg_no_cellular_title">Verbindung zur Mailbox nicht möglich</string>
+  <string name="vvm3_error_spg_no_cellular_message">Wir haben einen Fehler entdeckt. Bitte versuche es später noch einmal. Wenn das Problem weiterhin besteht, wende dich an den Kundensupport unter der Nummer %1$s und gib den Fehlercode 9006 an.</string>
+  <string name="vvm3_error_vms_timeout_title">Ein Problem ist aufgetreten</string>
+  <string name="vvm3_error_vms_timeout_message">Wir haben einen Fehler entdeckt. Bitte versuche es später noch einmal. Wenn das Problem weiterhin besteht, wende dich an den Kundensupport unter der Nummer %1$s und gib den Fehlercode 9007 an.</string>
+  <string name="vvm3_error_vmg_timeout_title">Ein Problem ist aufgetreten</string>
+  <string name="vvm3_error_vmg_timeout_message">Wir haben einen Fehler entdeckt. Bitte versuche es später noch einmal. Wenn das Problem weiterhin besteht, wende dich an den Kundensupport unter der Nummer %1$s und gib den Fehlercode 9008 an.</string>
+  <string name="vvm3_error_status_sms_timeout_title">Ein Problem ist aufgetreten</string>
+  <string name="vvm3_error_status_sms_timeout_message">Wir haben einen Fehler entdeckt. Bitte versuche es später noch einmal. Wenn das Problem weiterhin besteht, wende dich an den Kundensupport unter der Nummer %1$s und gib den Fehlercode 9009 an.</string>
+  <string name="vvm3_error_subscriber_blocked_title">Verbindung zur Mailbox nicht möglich</string>
+  <string name="vvm3_error_subscriber_blocked_message">Zurzeit kann keine Verbindung zu deiner Mailbox hergestellt werden. Bitte versuche es später noch einmal. Wenn das Problem weiterhin besteht, wende dich an den Kundensupport unter der Nummer %1$s und gib den Fehlercode 9990 an.</string>
+  <string name="vvm3_error_unknown_user_title">Mailbox einrichten</string>
+  <string name="vvm3_error_unknown_user_message">Für dein Konto ist keine Mailbox eingerichtet. Bitte wende dich an den Kundensupport unter der Nummer %1$s und gib den Fehlercode 9991 an.</string>
+  <string name="vvm3_error_unknown_device_title">Mailbox</string>
+  <string name="vvm3_error_unknown_device_message">Die visuelle Mailbox kann auf diesem Gerät nicht genutzt werden. Bitte wende dich an den Kundensupport unter der Nummer %1$s und gib den Fehlercode 9992 an.</string>
+  <string name="vvm3_error_invalid_password_title">Ein Problem ist aufgetreten</string>
+  <string name="vvm3_error_invalid_password_message">Bitte wende dich an den Kundensupport unter der Nummer %1$s und gib den Fehlercode 9993 an.</string>
+  <string name="vvm3_error_mailbox_not_initialized_title">Visuelle Mailbox</string>
+  <string name="vvm3_error_mailbox_not_initialized_message">Um die Einrichtung der visuellen Mailbox abzuschließen, wende dich bitte an den Kundensupport unter der Nummer %1$s und gib den Fehlercode 9994 an.</string>
+  <string name="vvm3_error_service_not_provisioned_title">Visuelle Mailbox</string>
+  <string name="vvm3_error_service_not_provisioned_message">Um die Einrichtung der visuellen Mailbox abzuschließen, wende dich bitte an den Kundensupport unter der Nummer %1$s und gib den Fehlercode 9995 an.</string>
+  <string name="vvm3_error_service_not_activated_title">Visuelle Mailbox</string>
+  <string name="vvm3_error_service_not_activated_message">Um die visuelle Mailbox zu aktivieren, wende dich bitte an den Kundensupport unter der Nummer %1$s und gib den Fehlercode 9996 an.</string>
+  <string name="vvm3_error_user_blocked_title">Ein Problem ist aufgetreten</string>
+  <string name="vvm3_error_user_blocked_message">Um die Einrichtung der visuellen Mailbox abzuschließen, wende dich bitte an den Kundensupport unter der Nummer %1$s und gib den Fehlercode 9998 an.</string>
+  <string name="vvm3_error_subscriber_unknown_title">Visuelle Mailbox ist deaktiviert</string>
+  <string name="vvm3_error_subscriber_unknown_message">Bitte wende dich an den Kundensupport unter der Nummer %1$s, um die visuelle Mailbox zu aktivieren.</string>
+  <string name="vvm3_error_imap_getquota_error_title">Ein Problem ist aufgetreten</string>
+  <string name="vvm3_error_imap_getquota_error_message">Bitte wende dich an den Kundensupport unter der Nummer %1$s und gib den Fehlercode 9997 an.</string>
+  <string name="vvm3_error_imap_select_error_title">Ein Problem ist aufgetreten</string>
+  <string name="vvm3_error_imap_select_error_message">Bitte wende dich an den Kundensupport unter der Nummer %1$s und gib den Fehlercode 9989 an.</string>
+  <string name="vvm3_error_imap_error_title">Ein Problem ist aufgetreten</string>
+  <string name="vvm3_error_imap_error_message">Bitte wende dich an den Kundensupport unter der Nummer %1$s und gib den Fehlercode 9999 an.</string>
+  <string name="verizon_terms_and_conditions_title">Visuelle Mailbox aktivieren</string>
+  <string name="verizon_terms_and_conditions_message">%1$s Mit dem Aktivieren der visuellen Mailbox stimmst du den Nutzungsbedingungen von Verizon Wireless zu:\n\n%2$s</string>
+  <string name="dialer_terms_and_conditions_title">Visuelle Mailbox aktivieren</string>
+  <string name="dialer_terms_and_conditions_existing_user_title">Neu! Mailboxnachrichten lesen</string>
+  <string name="dialer_terms_and_conditions_message">%s</string>
+  <string name="dialer_terms_and_conditions_1.0">Du kannst deine Mailboxnachrichten einsehen und abhören, ohne die Mailbox anzurufen. Der kostenlose Transkriptionsdienst von Google liefert dir deine Mailboxnachrichten als geschriebenen Text. Du kannst diese Optionen jederzeit in den Einstellungen deaktivieren. %s</string>
+  <string name="dialer_terms_and_conditions_existing_user">Der kostenlose Transkriptionsdienst von Google liefert dir deine Mailboxnachrichten als geschriebenen Text. Du kannst diese Option jederzeit in den Einstellungen deaktivieren. %s</string>
+  <string name="dialer_terms_and_conditions_for_verizon_1.0">Du kannst deine Mailboxnachrichten einsehen und abhören, ohne die Mailbox anzurufen.</string>
+  <string name="dialer_terms_and_conditions_learn_more">Weitere Informationen</string>
+  <string name="dialer_terms_and_conditions_existing_user_ack">OK</string>
+  <string name="dialer_terms_and_conditions_existing_user_decline">Nein danke</string>
+  <string name="terms_and_conditions_decline_dialog_title">Visuelle Mailbox deaktivieren?</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_message">Die visuelle Mailbox wird deaktiviert, wenn du die Nutzungsbedingungen ablehnst.</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_downgrade">Deaktivieren</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_message">Die visuelle Mailbox wird deaktiviert, wenn du die Nutzungsbedingungen ablehnst.</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_downgrade">Deaktivieren</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message">Du kannst nur auf Mailboxnachrichten zugreifen, indem du *86 anrufst. Lege eine neue Mailbox-PIN fest, um fortzufahren.</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin">PIN festlegen</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/error/res/values-el/strings.xml b/java/com/android/dialer/voicemail/listui/error/res/values-el/strings.xml
new file mode 100644
index 0000000..4608f2e
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/error/res/values-el/strings.xml
@@ -0,0 +1,102 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_error_activating_title">Ενεργοποίηση οπτικού αυτόματου τηλεφωνητή</string>
+  <string name="voicemail_error_activating_message">Ενδέχεται να μην λαμβάνετε ειδοποιήσεις αυτόματου τηλεφωνητή έως ότου ο οπτικός αυτόματος τηλεφωνητής ενεργοποιηθεί πλήρως. Καλέστε τον αυτόματο τηλεφωνητή για να ανακτήσετε νέα μηνύματα, έως ότου γίνει πλήρης ενεργοποίηση του οπτικού αυτόματου τηλεφωνητή.</string>
+  <string name="voicemail_error_not_activate_no_signal_title">Δεν είναι δυνατή η ενεργοποίηση του οπτικού αυτόματου τηλεφωνητή</string>
+  <string name="voicemail_error_not_activate_no_signal_message">Βεβαιωθείτε ότι το τηλέφωνό σας διαθέτει σύνδεση κινητής τηλεφωνίας και δοκιμάστε ξανά.</string>
+  <string name="voicemail_error_not_activate_no_signal_airplane_mode_message">Απενεργοποιήστε τη λειτουργία πτήσης και δοκιμάστε ξανά.</string>
+  <string name="voicemail_error_no_signal_title">Χωρίς σύνδεση</string>
+  <string name="voicemail_error_no_signal_message">Δεν θα ειδοποιείστε για νέα φωνητικά μηνύματα. Εάν είστε συνδεδεμένοι μέσω Wi-Fi, μπορείτε να ελέγξετε τον αυτόματο τηλεφωνητή σας για μηνύματα, εκτελώντας συγχρονισμό τώρα.</string>
+  <string name="voicemail_error_no_signal_airplane_mode_message">Δεν θα ειδοποιείστε για νέα φωνητικά μηνύματα. Απενεργοποιήστε τη λειτουργία πτήσης για συγχρονισμό φωνητικών μηνυμάτων του αυτόματου τηλεφωνητή σας.</string>
+  <string name="voicemail_error_no_signal_cellular_required_message">Το τηλέφωνό σας χρειάζεται σύνδεση δεδομένων κινητής τηλεφωνίας για έλεγχο του αυτόματου τηλεφωνητή σας.</string>
+  <string name="voicemail_error_activation_failed_title">Δεν είναι δυνατή η ενεργοποίηση του οπτικού αυτόματου τηλεφωνητή</string>
+  <string name="voicemail_error_activation_failed_message">Μπορείτε και πάλι να καλέσετε για να ελέγξετε τον αυτόματο τηλεφωνητή σας.</string>
+  <string name="voicemail_error_no_data_title">Δεν είναι δυνατή η ενημέρωση του οπτικού αυτόματου τηλεφωνητή</string>
+  <string name="voicemail_error_no_data_message">Δοκιμάστε ξανά όταν η σύνδεση Wi-Fi ή η σύνδεση κινητής τηλεφωνίας είναι καλύτερη. Ακόμα κι έτσι, μπορείτε να καλέσετε για να ελέγξετε τον αυτόματο τηλεφωνητή σας.</string>
+  <string name="voicemail_error_no_data_cellular_required_message">Δοκιμάστε ξανά όταν η σύνδεση κινητής τηλεφωνίας είναι καλύτερη. Ακόμα κι έτσι, μπορείτε να καλέσετε για να ελέγξετε τον αυτόματο τηλεφωνητή σας.</string>
+  <string name="voicemail_error_bad_config_title">Δεν είναι δυνατή η ενημέρωση του οπτικού αυτόματου τηλεφωνητή</string>
+  <string name="voicemail_error_bad_config_message">Μπορείτε και πάλι να καλέσετε για να ελέγξετε τον αυτόματο τηλεφωνητή σας.</string>
+  <string name="voicemail_error_communication_title">Δεν είναι δυνατή η ενημέρωση του οπτικού αυτόματου τηλεφωνητή</string>
+  <string name="voicemail_error_communication_message">Μπορείτε και πάλι να καλέσετε για να ελέγξετε τον αυτόματο τηλεφωνητή σας.</string>
+  <string name="voicemail_error_server_connection_title">Δεν είναι δυνατή η ενημέρωση του οπτικού αυτόματου τηλεφωνητή</string>
+  <string name="voicemail_error_server_connection_message">Μπορείτε και πάλι να καλέσετε για να ελέγξετε τον αυτόματο τηλεφωνητή σας.</string>
+  <string name="voicemail_error_server_title">Δεν είναι δυνατή η ενημέρωση του οπτικού αυτόματου τηλεφωνητή</string>
+  <string name="voicemail_error_server_message">Μπορείτε και πάλι να καλέσετε για να ελέγξετε τον αυτόματο τηλεφωνητή σας.</string>
+  <string name="voicemail_error_inbox_near_full_title">Εισερχόμενα σχεδόν πλήρη</string>
+  <string name="voicemail_error_inbox_near_full_message">Δεν θα είστε σε θέση να λάβετε νέα φωνητικά μηνύματα από τον αυτόματο τηλεφωνητή εάν τα εισερχόμενά σας είναι πλήρη.</string>
+  <string name="voicemail_error_inbox_full_title">Δεν μπορείτε να λάβετε νέα μηνύματα από τον αυτόματο τηλεφωνητή</string>
+  <string name="voicemail_error_inbox_full_message">Τα εισερχόμενά σας είναι πλήρη. Δοκιμάστε να διαγράψετε μερικά μηνύματα, για να λάβετε νέα μηνύματα από τον αυτόματο τηλεφωνητή.</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_title">Ενεργοποίηση επιπλέον αποθηκευτικού χώρου και αντιγράφων ασφαλείας</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_message">Το γραμματοκιβώτιό σας είναι πλήρες. Για να ελευθερώσετε χώρο, ενεργοποιήστε επιπλέον αποθηκευτικό χώρο, ώστε η Google μπορεί να διαχειριστεί και να δημιουργήσει αντίγραφα ασφαλείας των μηνυμάτων του αυτόματου τηλεφωνητή σας.</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_title">Ενεργοποίηση επιπλέον αποθηκευτικού χώρου και αντιγράφων ασφαλείας</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_message">Το γραμματοκιβώτιό σας είναι σχεδόν πλήρες. Για να ελευθερώσετε χώρο, ενεργοποιήστε επιπλέον αποθηκευτικό χώρο, ώστε η Google μπορεί να διαχειριστεί και να δημιουργήσει αντίγραφα ασφαλείας των μηνυμάτων του αυτόματου τηλεφωνητή σας.</string>
+  <string name="voicemail_error_pin_not_set_title">Ορίστε PIN για τον αυτόματο τηλεφωνητή σας</string>
+  <string name="voicemail_error_pin_not_set_message">Θα χρειάζεστε ένα PIN φωνητικού τηλεφωνητή κάθε φορά που καλείτε, για να έχετε πρόσβαση στον τηλεφωνητή σας.</string>
+  <string name="voicemail_action_turn_off_airplane_mode">Ρυθμίσεις λειτουργίας πτήσης</string>
+  <string name="voicemail_action_set_pin">Ορισμός PIN</string>
+  <string name="voicemail_action_retry">Δοκιμάστε ξανά</string>
+  <string name="voicemail_action_turn_archive_on">Ενεργοποίηση</string>
+  <string name="voicemail_action_dimiss">Όχι, ευχαριστώ</string>
+  <string name="voicemail_action_sync">Συγχρονισμός</string>
+  <string name="voicemail_action_call_voicemail">Κλήση αυτόματου τηλεφωνητή</string>
+  <string name="voicemail_action_call_customer_support">Κλήση τμήματος υποστήριξης πελατών</string>
+  <string name="vvm3_error_vms_dns_failure_title">Παρουσιάστηκε κάποιο πρόβλημα</string>
+  <string name="vvm3_error_vms_dns_failure_message">Δυστυχώς, αντιμετωπίσαμε κάποιο πρόβλημα. Δοκιμάστε ξανά αργότερα. Εάν το πρόβλημα παραμένει, επικοινωνήστε με το τμήμα εξυπηρέτησης πελατών στο %1$s και αναφέρετέ τους τον κωδικό σφάλματος 9001.</string>
+  <string name="vvm3_error_vmg_dns_failure_title">Παρουσιάστηκε κάποιο πρόβλημα</string>
+  <string name="vvm3_error_vmg_dns_failure_message">Δυστυχώς, αντιμετωπίσαμε κάποιο πρόβλημα. Δοκιμάστε ξανά αργότερα. Εάν το πρόβλημα παραμένει, επικοινωνήστε με το τμήμα εξυπηρέτησης πελατών στο %1$s και αναφέρετέ τους τον κωδικό σφάλματος 9002.</string>
+  <string name="vvm3_error_spg_dns_failure_title">Παρουσιάστηκε κάποιο πρόβλημα</string>
+  <string name="vvm3_error_spg_dns_failure_message">Δυστυχώς, αντιμετωπίσαμε κάποιο πρόβλημα. Δοκιμάστε ξανά αργότερα. Εάν το πρόβλημα παραμένει, επικοινωνήστε με το τμήμα εξυπηρέτησης πελατών στο %1$s και αναφέρετέ τους τον κωδικό σφάλματος 9003.</string>
+  <string name="vvm3_error_vms_no_cellular_title">Δεν είναι δυνατή η σύνδεση στον αυτόματο τηλεφωνητή σας</string>
+  <string name="vvm3_error_vms_no_cellular_message">Δυστυχώς, αντιμετωπίζουμε πρόβλημα με τη σύνδεση στον αυτόματο τηλεφωνητή σας. Εάν βρίσκεστε σε κάποια περιοχή με ασθενές σήμα, περιμένετε έως ότου βρεθείτε κάπου με ισχυρό σήμα και δοκιμάστε ξανά. Εάν το πρόβλημα παραμένει, επικοινωνήστε με το τμήμα εξυπηρέτησης πελατών στο %1$s και αναφέρετέ τους τον κωδικό σφάλματος 9004.</string>
+  <string name="vvm3_error_vmg_no_cellular_title">Δεν είναι δυνατή η σύνδεση στον αυτόματο τηλεφωνητή σας</string>
+  <string name="vvm3_error_vmg_no_cellular_message">Δυστυχώς, αντιμετωπίζουμε πρόβλημα με τη σύνδεση στον αυτόματο τηλεφωνητή σας. Εάν βρίσκεστε σε κάποια περιοχή με ασθενές σήμα, περιμένετε έως ότου βρεθείτε κάπου με ισχυρό σήμα και δοκιμάστε ξανά. Εάν το πρόβλημα παραμένει, επικοινωνήστε με το τμήμα εξυπηρέτησης πελατών στο %1$s και αναφέρετέ τους τον κωδικό σφάλματος 9005.</string>
+  <string name="vvm3_error_spg_no_cellular_title">Δεν είναι δυνατή η σύνδεση στον αυτόματο τηλεφωνητή σας</string>
+  <string name="vvm3_error_spg_no_cellular_message">Δυστυχώς, αντιμετωπίζουμε πρόβλημα με τη σύνδεση στον αυτόματο τηλεφωνητή σας. Εάν βρίσκεστε σε κάποια περιοχή με ασθενές σήμα, περιμένετε έως ότου βρεθείτε κάπου με ισχυρό σήμα και δοκιμάστε ξανά. Εάν το πρόβλημα παραμένει, επικοινωνήστε με το τμήμα εξυπηρέτησης πελατών στο %1$s και αναφέρετέ τους τον κωδικό σφάλματος 9006.</string>
+  <string name="vvm3_error_vms_timeout_title">Παρουσιάστηκε κάποιο πρόβλημα</string>
+  <string name="vvm3_error_vms_timeout_message">Δυστυχώς, αντιμετωπίσαμε κάποιο πρόβλημα. Δοκιμάστε ξανά αργότερα. Εάν το πρόβλημα παραμένει, επικοινωνήστε με το τμήμα εξυπηρέτησης πελατών στο %1$s και αναφέρετέ τους τον κωδικό σφάλματος 9007.</string>
+  <string name="vvm3_error_vmg_timeout_title">Παρουσιάστηκε κάποιο πρόβλημα</string>
+  <string name="vvm3_error_vmg_timeout_message">Δυστυχώς, αντιμετωπίσαμε κάποιο πρόβλημα. Δοκιμάστε ξανά αργότερα. Εάν το πρόβλημα παραμένει, επικοινωνήστε με το τμήμα εξυπηρέτησης πελατών στο %1$s και αναφέρετέ τους τον κωδικό σφάλματος 9008.</string>
+  <string name="vvm3_error_status_sms_timeout_title">Παρουσιάστηκε κάποιο πρόβλημα</string>
+  <string name="vvm3_error_status_sms_timeout_message">Δυστυχώς, αντιμετωπίζουμε πρόβλημα με τη ρύθμιση της υπηρεσίας στην περίπτωσή σας. Δοκιμάστε ξανά αργότερα. Εάν το πρόβλημα παραμένει, επικοινωνήστε με το τμήμα εξυπηρέτησης πελατών στο %1$s και αναφέρετέ τους τον κωδικό σφάλματος 9009.</string>
+  <string name="vvm3_error_subscriber_blocked_title">Δεν είναι δυνατή η σύνδεση στον αυτόματο τηλεφωνητή σας</string>
+  <string name="vvm3_error_subscriber_blocked_message">Δυστυχώς, δεν είμαστε σε θέση να συνδεθούμε στον αυτόματο τηλεφωνητή σας αυτήν τη στιγμή. Δοκιμάστε ξανά αργότερα. Εάν το πρόβλημα παραμένει, επικοινωνήστε με το τμήμα εξυπηρέτησης πελατών στο %1$s και αναφέρετέ τους τον κωδικό σφάλματος 9990.</string>
+  <string name="vvm3_error_unknown_user_title">Ρύθμιση αυτόματου τηλεφωνητή</string>
+  <string name="vvm3_error_unknown_user_message">Δεν έχει γίνει ρύθμιση του αυτόματου τηλεφωνητή για τον λογαριασμό σας. Επικοινωνήστε με το τμήμα εξυπηρέτησης πελατών στο %1$s και αναφέρετέ τους τον κωδικό σφάλματος 9991.</string>
+  <string name="vvm3_error_unknown_device_title">Αυτ. τηλ.</string>
+  <string name="vvm3_error_unknown_device_message">Ο οπτικός αυτόματος τηλεφωνητής δεν μπορεί να χρησιμοποιηθεί σε αυτήν τη συσκευή. Επικοινωνήστε με το τμήμα εξυπηρέτησης πελατών στο %1$s και αναφέρετέ τους τον κωδικό σφάλματος 9992.</string>
+  <string name="vvm3_error_invalid_password_title">Παρουσιάστηκε κάποιο πρόβλημα</string>
+  <string name="vvm3_error_invalid_password_message">Επικοινωνήστε με το τμήμα εξυπηρέτησης πελατών στο %1$s και αναφέρετέ τους τον κωδικό σφάλματος 9993.</string>
+  <string name="vvm3_error_mailbox_not_initialized_title">Οπτικός αυτόματος τηλεφωνητής</string>
+  <string name="vvm3_error_mailbox_not_initialized_message">Για να ολοκληρώσετε τη ρύθμιση του οπτικού αυτόματου τηλεφωνητή, επικοινωνήστε με το τμήμα εξυπηρέτησης πελατών στο %1$s και αναφέρετέ τους τον κωδικό σφάλματος 9994.</string>
+  <string name="vvm3_error_service_not_provisioned_title">Οπτικός αυτόματος τηλεφωνητής</string>
+  <string name="vvm3_error_service_not_provisioned_message">Για να ολοκληρώσετε τη ρύθμιση του οπτικού αυτόματου τηλεφωνητή, επικοινωνήστε με το τμήμα εξυπηρέτησης πελατών στο %1$s και αναφέρετέ τους τον κωδικό σφάλματος 9995.</string>
+  <string name="vvm3_error_service_not_activated_title">Οπτικός αυτόματος τηλεφωνητής</string>
+  <string name="vvm3_error_service_not_activated_message">Για να ενεργοποιήσετε τον οπτικό αυτόματο τηλεφωνητή, επικοινωνήστε με το τμήμα εξυπηρέτησης πελατών στο %1$s και αναφέρετέ τους τον κωδικό σφάλματος 9996.</string>
+  <string name="vvm3_error_user_blocked_title">Παρουσιάστηκε κάποιο πρόβλημα</string>
+  <string name="vvm3_error_user_blocked_message">Για να ολοκληρώσετε τη ρύθμιση του οπτικού αυτόματου τηλεφωνητή, επικοινωνήστε με το τμήμα εξυπηρέτησης πελατών στο %1$s και αναφέρετέ τους τον κωδικό σφάλματος 9998.</string>
+  <string name="vvm3_error_subscriber_unknown_title">Ο οπτικός αυτόματος τηλεφωνητής είναι απενεργοποιημένος</string>
+  <string name="vvm3_error_subscriber_unknown_message">Επικοινωνήστε με το τμήμα εξυπηρέτησης πελατών στο %1$s για να ενεργοποιήσετε τον οπτικό αυτόματο τηλεφωνητή.</string>
+  <string name="vvm3_error_imap_getquota_error_title">Παρουσιάστηκε κάποιο πρόβλημα</string>
+  <string name="vvm3_error_imap_getquota_error_message">Επικοινωνήστε με το τμήμα εξυπηρέτησης πελατών στο %1$s και αναφέρετέ τους τον κωδικό σφάλματος 9997.</string>
+  <string name="vvm3_error_imap_select_error_title">Παρουσιάστηκε κάποιο πρόβλημα</string>
+  <string name="vvm3_error_imap_select_error_message">Επικοινωνήστε με το τμήμα εξυπηρέτησης πελατών στο %1$s και αναφέρετέ τους τον κωδικό σφάλματος 9989.</string>
+  <string name="vvm3_error_imap_error_title">Παρουσιάστηκε κάποιο πρόβλημα</string>
+  <string name="vvm3_error_imap_error_message">Επικοινωνήστε με το τμήμα εξυπηρέτησης πελατών στο %1$s και αναφέρετέ τους τον κωδικό σφάλματος 9999.</string>
+  <string name="verizon_terms_and_conditions_title">Ενεργοποίηση οπτικού αυτόματου τηλεφωνητή</string>
+  <string name="verizon_terms_and_conditions_message">%1$s Με την ενεργοποίηση του οπτικού αυτόματου τηλεφωνητή, δηλώνετε ότι αποδέχεστε τους όρους και προϋποθέσεις της Verizon Wireless:\n\n%2$s</string>
+  <string name="dialer_terms_and_conditions_title">Ενεργοποίηση οπτικού αυτόματου τηλεφωνητή</string>
+  <string name="dialer_terms_and_conditions_existing_user_title">Νέο! Διαβάστε τα μηνύματα από τον αυτόματο τηλεφωνητή σας</string>
+  <string name="dialer_terms_and_conditions_message">%s</string>
+  <string name="dialer_terms_and_conditions_1.0">Δείτε και ακούστε τα μηνύματα αυτόματου τηλεφωνητή, χωρίς να χρειάζεται να τον καλέσετε. Οι μεταγραφές των φωνητικών μηνυμάτων του αυτόματου τηλεφωνητή παρέχονται από τη δωρεάν υπηρεσία μεταγραφής της Google. Μπορείτε να απενεργοποιήσετε οποιοδήποτε από τα δύο ανά πάσα στιγμή, από τις Ρυθμίσεις. %s</string>
+  <string name="dialer_terms_and_conditions_existing_user">Οι μεταγραφές των φωνητικών μηνυμάτων του αυτόματου τηλεφωνητή παρέχονται από τη δωρεάν υπηρεσία μεταγραφής της Google. Μπορείτε να απενεργοποιήσετε αυτήν τη λειτουργία ανά πάσα στιγμή, από τις Ρυθμίσεις. %s</string>
+  <string name="dialer_terms_and_conditions_for_verizon_1.0">Δείτε και ακούστε τα μηνύματα αυτόματου τηλεφωνητή, χωρίς να χρειάζεται να τον καλέσετε.</string>
+  <string name="dialer_terms_and_conditions_learn_more">Μάθετε περισσότερα</string>
+  <string name="dialer_terms_and_conditions_existing_user_ack">Εντάξει, το κατάλαβα</string>
+  <string name="dialer_terms_and_conditions_existing_user_decline">Όχι, ευχαριστώ</string>
+  <string name="terms_and_conditions_decline_dialog_title">Απενεργοποίηση οπτικού αυτόματου τηλεφωνητή;</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_message">Ο οπτικός αυτόματος τηλεφωνητής θα απενεργοποιηθεί εάν δεν αποδεχτείτε τους Όρους και τις Προϋποθέσεις.</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_downgrade">Απενεργοποίηση</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_message">Ο οπτικός αυτόματος τηλεφωνητής θα απενεργοποιηθεί, εάν απενεργοποιήσετε τον οπτικό αυτόματο τηλεφωνητή.</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_downgrade">Απενεργοποίηση</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message">Ο αυτόματος τηλεφωνητής θα είναι προσβάσιμος μόνο καλώντας το *86. Ορίστε έναν νέο αριθμό PIN αυτόματου τηλεφωνητή για να συνεχίσετε.</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin">Ορισμός PIN</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/error/res/values-en-rAU/strings.xml b/java/com/android/dialer/voicemail/listui/error/res/values-en-rAU/strings.xml
new file mode 100644
index 0000000..8937212
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/error/res/values-en-rAU/strings.xml
@@ -0,0 +1,102 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_error_activating_title">Activating visual voicemail</string>
+  <string name="voicemail_error_activating_message">You might not receive voicemail notifications until visual voicemail is fully activated. Call voicemail to retrieve new messages until voicemail is fully activated.</string>
+  <string name="voicemail_error_not_activate_no_signal_title">Can\'t activate visual voicemail</string>
+  <string name="voicemail_error_not_activate_no_signal_message">Make sure that your phone has a mobile network connection and try again.</string>
+  <string name="voicemail_error_not_activate_no_signal_airplane_mode_message">Turn off aeroplane mode and try again.</string>
+  <string name="voicemail_error_no_signal_title">No connection</string>
+  <string name="voicemail_error_no_signal_message">You won\'t be notified for new voicemails. If you\'re on Wi‑Fi, you can check for voicemail by syncing now.</string>
+  <string name="voicemail_error_no_signal_airplane_mode_message">You won\'t be notified about new voicemail. Turn off aeroplane mode to sync your voicemail.</string>
+  <string name="voicemail_error_no_signal_cellular_required_message">Your phone needs a mobile data connection to check voicemail.</string>
+  <string name="voicemail_error_activation_failed_title">Can\'t activate visual voicemail</string>
+  <string name="voicemail_error_activation_failed_message">You can still call to check voicemail.</string>
+  <string name="voicemail_error_no_data_title">Can\'t update visual voicemail</string>
+  <string name="voicemail_error_no_data_message">Try again when your Wi‑Fi or mobile data connection is better. You can still call to check voicemail.</string>
+  <string name="voicemail_error_no_data_cellular_required_message">Try again when your mobile data connection is better. You can still call to check voicemail.</string>
+  <string name="voicemail_error_bad_config_title">Can\'t update visual voicemail</string>
+  <string name="voicemail_error_bad_config_message">You can still call to check voicemail.</string>
+  <string name="voicemail_error_communication_title">Can\'t update visual voicemail</string>
+  <string name="voicemail_error_communication_message">You can still call to check voicemail.</string>
+  <string name="voicemail_error_server_connection_title">Can\'t update visual voicemail</string>
+  <string name="voicemail_error_server_connection_message">You can still call to check voicemail.</string>
+  <string name="voicemail_error_server_title">Can\'t update visual voicemail</string>
+  <string name="voicemail_error_server_message">You can still call to check voicemail.</string>
+  <string name="voicemail_error_inbox_near_full_title">Inbox almost full</string>
+  <string name="voicemail_error_inbox_near_full_message">You won\'t be able to receive new voicemail if your inbox is full.</string>
+  <string name="voicemail_error_inbox_full_title">Can\'t receive new voicemail</string>
+  <string name="voicemail_error_inbox_full_message">Your inbox is full. Try deleting some messages to receive new voicemail.</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_title">Turn on extra storage and back up</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_message">Your mailbox is full. To free up space, turn on extra storage so that Google can manage and back up your voicemail messages.</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_title">Turn on extra storage and back up</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_message">Your mailbox is almost full. To free up space, turn on extra storage so that Google can manage and back up your voicemail messages.</string>
+  <string name="voicemail_error_pin_not_set_title">Set your voicemail PIN</string>
+  <string name="voicemail_error_pin_not_set_message">You\'ll need a voicemail PIN whenever you call to access your voicemail.</string>
+  <string name="voicemail_action_turn_off_airplane_mode">Aeroplane mode settings</string>
+  <string name="voicemail_action_set_pin">Set PIN</string>
+  <string name="voicemail_action_retry">Try again</string>
+  <string name="voicemail_action_turn_archive_on">Turn on</string>
+  <string name="voicemail_action_dimiss">No, thanks</string>
+  <string name="voicemail_action_sync">Sync</string>
+  <string name="voicemail_action_call_voicemail">Call voicemail</string>
+  <string name="voicemail_action_call_customer_support">Call Customer Support</string>
+  <string name="vvm3_error_vms_dns_failure_title">Something went wrong</string>
+  <string name="vvm3_error_vms_dns_failure_message">Sorry, we ran into a problem. Please try again later. If there is still a problem, please contact Customer Service on %1$s and tell them that the error code is 9001.</string>
+  <string name="vvm3_error_vmg_dns_failure_title">Something went wrong</string>
+  <string name="vvm3_error_vmg_dns_failure_message">Sorry, we ran into a problem. Please try again later. If there is still a problem, please contact Customer Service on %1$s and tell them that the error code is 9002.</string>
+  <string name="vvm3_error_spg_dns_failure_title">Something went wrong</string>
+  <string name="vvm3_error_spg_dns_failure_message">Sorry, we ran into a problem. Please try again later. If there is still a problem, please contact Customer Service on %1$s and tell them that the error code is 9003.</string>
+  <string name="vvm3_error_vms_no_cellular_title">Can\'t connect to your voice mailbox</string>
+  <string name="vvm3_error_vms_no_cellular_message">Sorry, we\'re having trouble connecting to your voice mailbox. If you\'re in an area with poor signal strength, wait until you have a strong signal and try again. If there is still a problem, please contact Customer Service on %1$s and tell them that the error code is 9004.</string>
+  <string name="vvm3_error_vmg_no_cellular_title">Can\'t connect to your voice mailbox</string>
+  <string name="vvm3_error_vmg_no_cellular_message">Sorry, we\'re having trouble connecting to your voice mailbox. If you\'re in an area with poor signal strength, wait until you have a strong signal and try again. If there is still a problem, please contact Customer Service on %1$s and tell them that the error code is 9005.</string>
+  <string name="vvm3_error_spg_no_cellular_title">Can\'t connect to your voice mailbox</string>
+  <string name="vvm3_error_spg_no_cellular_message">Sorry, we\'re having trouble connecting to your voice mailbox. If you\'re in an area with poor signal strength, wait until you have a strong signal and try again. If there is still a problem, please contact Customer Service on %1$s and tell them that the error code is 9006.</string>
+  <string name="vvm3_error_vms_timeout_title">Something went wrong</string>
+  <string name="vvm3_error_vms_timeout_message">Sorry, we ran into a problem. Please try again later. If there is still a problem, please contact Customer Service on %1$s and tell them that the error code is 9007.</string>
+  <string name="vvm3_error_vmg_timeout_title">Something went wrong</string>
+  <string name="vvm3_error_vmg_timeout_message">Sorry, we ran into a problem. Please try again later. If there is still a problem, please contact Customer Service on %1$s and tell them that the error code is 9008.</string>
+  <string name="vvm3_error_status_sms_timeout_title">Something went wrong</string>
+  <string name="vvm3_error_status_sms_timeout_message">Sorry, we\'re having trouble setting up your service. Please try again later. If there is still a problem, please contact Customer Service on %1$s and tell them that the error code is 9009.</string>
+  <string name="vvm3_error_subscriber_blocked_title">Can\'t connect to your voice mailbox</string>
+  <string name="vvm3_error_subscriber_blocked_message">Sorry, we\'re not able to connect to your voice mailbox at the moment. Please try again later. If there is still a problem, please contact Customer Service on %1$s and tell them that the error code is 9990.</string>
+  <string name="vvm3_error_unknown_user_title">Set Up Voicemail</string>
+  <string name="vvm3_error_unknown_user_message">Voicemail isn\'t set up on your account. Please contact Customer Service on %1$s and tell them that the error code is 9991.</string>
+  <string name="vvm3_error_unknown_device_title">Voicemail</string>
+  <string name="vvm3_error_unknown_device_message">Visual voicemail cannot be used on this device. Please contact Customer Service at %1$s and tell them that the error code is 9992.</string>
+  <string name="vvm3_error_invalid_password_title">Something went wrong</string>
+  <string name="vvm3_error_invalid_password_message">Please contact Customer Service on %1$s and tell them that the error code is 9993.</string>
+  <string name="vvm3_error_mailbox_not_initialized_title">Visual voicemail</string>
+  <string name="vvm3_error_mailbox_not_initialized_message">To complete visual voicemail setup, please contact Customer Service at %1$s and tell them that the error code is 9994.</string>
+  <string name="vvm3_error_service_not_provisioned_title">Visual voicemail</string>
+  <string name="vvm3_error_service_not_provisioned_message">To complete visual voicemail setup, please contact Customer Service at %1$s and tell them that the error code is 9995.</string>
+  <string name="vvm3_error_service_not_activated_title">Visual voicemail</string>
+  <string name="vvm3_error_service_not_activated_message">To activate visual voicemail, please contact Customer Service at %1$s and tell them that the error code is 9996.</string>
+  <string name="vvm3_error_user_blocked_title">Something went wrong</string>
+  <string name="vvm3_error_user_blocked_message">To complete visual voicemail setup, please contact Customer Service at %1$s and tell them that the error code is 9998.</string>
+  <string name="vvm3_error_subscriber_unknown_title">Visual voicemail is disabled</string>
+  <string name="vvm3_error_subscriber_unknown_message">Please contact Customer Service on %1$s to activate visual voicemail.</string>
+  <string name="vvm3_error_imap_getquota_error_title">Something went wrong</string>
+  <string name="vvm3_error_imap_getquota_error_message">Please contact Customer Service on %1$s and tell them that the error code is 9997.</string>
+  <string name="vvm3_error_imap_select_error_title">Something went wrong</string>
+  <string name="vvm3_error_imap_select_error_message">Please contact Customer Service on %1$s and tell them that the error code is 9989.</string>
+  <string name="vvm3_error_imap_error_title">Something went wrong</string>
+  <string name="vvm3_error_imap_error_message">Please contact Customer Service on %1$s and tell them that the error code is 9999.</string>
+  <string name="verizon_terms_and_conditions_title">Turn on visual voicemail</string>
+  <string name="verizon_terms_and_conditions_message">%1$s By turning on visual voicemail, you agree to the Verizon Wireless Terms and Conditions:\n\n%2$s</string>
+  <string name="dialer_terms_and_conditions_title">Turn on visual voicemail</string>
+  <string name="dialer_terms_and_conditions_existing_user_title">New! Read your voicemail</string>
+  <string name="dialer_terms_and_conditions_message">%s</string>
+  <string name="dialer_terms_and_conditions_1.0">See and listen to your messages, without having to call voicemail. Transcripts of your voicemail are provided by Google’s free transcription service. You can turn either off in Settings any time. %s</string>
+  <string name="dialer_terms_and_conditions_existing_user">Transcripts of your voicemail are now provided by Google’s free transcription service. You can turn this off in Settings at any time. %s</string>
+  <string name="dialer_terms_and_conditions_for_verizon_1.0">See and listen to your messages, without having to call voicemail.</string>
+  <string name="dialer_terms_and_conditions_learn_more">Learn more</string>
+  <string name="dialer_terms_and_conditions_existing_user_ack">OK, got it</string>
+  <string name="dialer_terms_and_conditions_existing_user_decline">No, thanks</string>
+  <string name="terms_and_conditions_decline_dialog_title">Disable visual voicemail?</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_message">Visual voicemail will be disabled if the Terms and Conditions are declined.</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_downgrade">Disable</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_message">Visual voicemail will be disabled if you turn off visual voicemail.</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_downgrade">Disable</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message">Voicemail will only be accessible by calling *86. Set a new voicemail PIN to proceed.</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin">Set PIN</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/error/res/values-en-rGB/strings.xml b/java/com/android/dialer/voicemail/listui/error/res/values-en-rGB/strings.xml
new file mode 100644
index 0000000..8937212
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/error/res/values-en-rGB/strings.xml
@@ -0,0 +1,102 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_error_activating_title">Activating visual voicemail</string>
+  <string name="voicemail_error_activating_message">You might not receive voicemail notifications until visual voicemail is fully activated. Call voicemail to retrieve new messages until voicemail is fully activated.</string>
+  <string name="voicemail_error_not_activate_no_signal_title">Can\'t activate visual voicemail</string>
+  <string name="voicemail_error_not_activate_no_signal_message">Make sure that your phone has a mobile network connection and try again.</string>
+  <string name="voicemail_error_not_activate_no_signal_airplane_mode_message">Turn off aeroplane mode and try again.</string>
+  <string name="voicemail_error_no_signal_title">No connection</string>
+  <string name="voicemail_error_no_signal_message">You won\'t be notified for new voicemails. If you\'re on Wi‑Fi, you can check for voicemail by syncing now.</string>
+  <string name="voicemail_error_no_signal_airplane_mode_message">You won\'t be notified about new voicemail. Turn off aeroplane mode to sync your voicemail.</string>
+  <string name="voicemail_error_no_signal_cellular_required_message">Your phone needs a mobile data connection to check voicemail.</string>
+  <string name="voicemail_error_activation_failed_title">Can\'t activate visual voicemail</string>
+  <string name="voicemail_error_activation_failed_message">You can still call to check voicemail.</string>
+  <string name="voicemail_error_no_data_title">Can\'t update visual voicemail</string>
+  <string name="voicemail_error_no_data_message">Try again when your Wi‑Fi or mobile data connection is better. You can still call to check voicemail.</string>
+  <string name="voicemail_error_no_data_cellular_required_message">Try again when your mobile data connection is better. You can still call to check voicemail.</string>
+  <string name="voicemail_error_bad_config_title">Can\'t update visual voicemail</string>
+  <string name="voicemail_error_bad_config_message">You can still call to check voicemail.</string>
+  <string name="voicemail_error_communication_title">Can\'t update visual voicemail</string>
+  <string name="voicemail_error_communication_message">You can still call to check voicemail.</string>
+  <string name="voicemail_error_server_connection_title">Can\'t update visual voicemail</string>
+  <string name="voicemail_error_server_connection_message">You can still call to check voicemail.</string>
+  <string name="voicemail_error_server_title">Can\'t update visual voicemail</string>
+  <string name="voicemail_error_server_message">You can still call to check voicemail.</string>
+  <string name="voicemail_error_inbox_near_full_title">Inbox almost full</string>
+  <string name="voicemail_error_inbox_near_full_message">You won\'t be able to receive new voicemail if your inbox is full.</string>
+  <string name="voicemail_error_inbox_full_title">Can\'t receive new voicemail</string>
+  <string name="voicemail_error_inbox_full_message">Your inbox is full. Try deleting some messages to receive new voicemail.</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_title">Turn on extra storage and back up</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_message">Your mailbox is full. To free up space, turn on extra storage so that Google can manage and back up your voicemail messages.</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_title">Turn on extra storage and back up</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_message">Your mailbox is almost full. To free up space, turn on extra storage so that Google can manage and back up your voicemail messages.</string>
+  <string name="voicemail_error_pin_not_set_title">Set your voicemail PIN</string>
+  <string name="voicemail_error_pin_not_set_message">You\'ll need a voicemail PIN whenever you call to access your voicemail.</string>
+  <string name="voicemail_action_turn_off_airplane_mode">Aeroplane mode settings</string>
+  <string name="voicemail_action_set_pin">Set PIN</string>
+  <string name="voicemail_action_retry">Try again</string>
+  <string name="voicemail_action_turn_archive_on">Turn on</string>
+  <string name="voicemail_action_dimiss">No, thanks</string>
+  <string name="voicemail_action_sync">Sync</string>
+  <string name="voicemail_action_call_voicemail">Call voicemail</string>
+  <string name="voicemail_action_call_customer_support">Call Customer Support</string>
+  <string name="vvm3_error_vms_dns_failure_title">Something went wrong</string>
+  <string name="vvm3_error_vms_dns_failure_message">Sorry, we ran into a problem. Please try again later. If there is still a problem, please contact Customer Service on %1$s and tell them that the error code is 9001.</string>
+  <string name="vvm3_error_vmg_dns_failure_title">Something went wrong</string>
+  <string name="vvm3_error_vmg_dns_failure_message">Sorry, we ran into a problem. Please try again later. If there is still a problem, please contact Customer Service on %1$s and tell them that the error code is 9002.</string>
+  <string name="vvm3_error_spg_dns_failure_title">Something went wrong</string>
+  <string name="vvm3_error_spg_dns_failure_message">Sorry, we ran into a problem. Please try again later. If there is still a problem, please contact Customer Service on %1$s and tell them that the error code is 9003.</string>
+  <string name="vvm3_error_vms_no_cellular_title">Can\'t connect to your voice mailbox</string>
+  <string name="vvm3_error_vms_no_cellular_message">Sorry, we\'re having trouble connecting to your voice mailbox. If you\'re in an area with poor signal strength, wait until you have a strong signal and try again. If there is still a problem, please contact Customer Service on %1$s and tell them that the error code is 9004.</string>
+  <string name="vvm3_error_vmg_no_cellular_title">Can\'t connect to your voice mailbox</string>
+  <string name="vvm3_error_vmg_no_cellular_message">Sorry, we\'re having trouble connecting to your voice mailbox. If you\'re in an area with poor signal strength, wait until you have a strong signal and try again. If there is still a problem, please contact Customer Service on %1$s and tell them that the error code is 9005.</string>
+  <string name="vvm3_error_spg_no_cellular_title">Can\'t connect to your voice mailbox</string>
+  <string name="vvm3_error_spg_no_cellular_message">Sorry, we\'re having trouble connecting to your voice mailbox. If you\'re in an area with poor signal strength, wait until you have a strong signal and try again. If there is still a problem, please contact Customer Service on %1$s and tell them that the error code is 9006.</string>
+  <string name="vvm3_error_vms_timeout_title">Something went wrong</string>
+  <string name="vvm3_error_vms_timeout_message">Sorry, we ran into a problem. Please try again later. If there is still a problem, please contact Customer Service on %1$s and tell them that the error code is 9007.</string>
+  <string name="vvm3_error_vmg_timeout_title">Something went wrong</string>
+  <string name="vvm3_error_vmg_timeout_message">Sorry, we ran into a problem. Please try again later. If there is still a problem, please contact Customer Service on %1$s and tell them that the error code is 9008.</string>
+  <string name="vvm3_error_status_sms_timeout_title">Something went wrong</string>
+  <string name="vvm3_error_status_sms_timeout_message">Sorry, we\'re having trouble setting up your service. Please try again later. If there is still a problem, please contact Customer Service on %1$s and tell them that the error code is 9009.</string>
+  <string name="vvm3_error_subscriber_blocked_title">Can\'t connect to your voice mailbox</string>
+  <string name="vvm3_error_subscriber_blocked_message">Sorry, we\'re not able to connect to your voice mailbox at the moment. Please try again later. If there is still a problem, please contact Customer Service on %1$s and tell them that the error code is 9990.</string>
+  <string name="vvm3_error_unknown_user_title">Set Up Voicemail</string>
+  <string name="vvm3_error_unknown_user_message">Voicemail isn\'t set up on your account. Please contact Customer Service on %1$s and tell them that the error code is 9991.</string>
+  <string name="vvm3_error_unknown_device_title">Voicemail</string>
+  <string name="vvm3_error_unknown_device_message">Visual voicemail cannot be used on this device. Please contact Customer Service at %1$s and tell them that the error code is 9992.</string>
+  <string name="vvm3_error_invalid_password_title">Something went wrong</string>
+  <string name="vvm3_error_invalid_password_message">Please contact Customer Service on %1$s and tell them that the error code is 9993.</string>
+  <string name="vvm3_error_mailbox_not_initialized_title">Visual voicemail</string>
+  <string name="vvm3_error_mailbox_not_initialized_message">To complete visual voicemail setup, please contact Customer Service at %1$s and tell them that the error code is 9994.</string>
+  <string name="vvm3_error_service_not_provisioned_title">Visual voicemail</string>
+  <string name="vvm3_error_service_not_provisioned_message">To complete visual voicemail setup, please contact Customer Service at %1$s and tell them that the error code is 9995.</string>
+  <string name="vvm3_error_service_not_activated_title">Visual voicemail</string>
+  <string name="vvm3_error_service_not_activated_message">To activate visual voicemail, please contact Customer Service at %1$s and tell them that the error code is 9996.</string>
+  <string name="vvm3_error_user_blocked_title">Something went wrong</string>
+  <string name="vvm3_error_user_blocked_message">To complete visual voicemail setup, please contact Customer Service at %1$s and tell them that the error code is 9998.</string>
+  <string name="vvm3_error_subscriber_unknown_title">Visual voicemail is disabled</string>
+  <string name="vvm3_error_subscriber_unknown_message">Please contact Customer Service on %1$s to activate visual voicemail.</string>
+  <string name="vvm3_error_imap_getquota_error_title">Something went wrong</string>
+  <string name="vvm3_error_imap_getquota_error_message">Please contact Customer Service on %1$s and tell them that the error code is 9997.</string>
+  <string name="vvm3_error_imap_select_error_title">Something went wrong</string>
+  <string name="vvm3_error_imap_select_error_message">Please contact Customer Service on %1$s and tell them that the error code is 9989.</string>
+  <string name="vvm3_error_imap_error_title">Something went wrong</string>
+  <string name="vvm3_error_imap_error_message">Please contact Customer Service on %1$s and tell them that the error code is 9999.</string>
+  <string name="verizon_terms_and_conditions_title">Turn on visual voicemail</string>
+  <string name="verizon_terms_and_conditions_message">%1$s By turning on visual voicemail, you agree to the Verizon Wireless Terms and Conditions:\n\n%2$s</string>
+  <string name="dialer_terms_and_conditions_title">Turn on visual voicemail</string>
+  <string name="dialer_terms_and_conditions_existing_user_title">New! Read your voicemail</string>
+  <string name="dialer_terms_and_conditions_message">%s</string>
+  <string name="dialer_terms_and_conditions_1.0">See and listen to your messages, without having to call voicemail. Transcripts of your voicemail are provided by Google’s free transcription service. You can turn either off in Settings any time. %s</string>
+  <string name="dialer_terms_and_conditions_existing_user">Transcripts of your voicemail are now provided by Google’s free transcription service. You can turn this off in Settings at any time. %s</string>
+  <string name="dialer_terms_and_conditions_for_verizon_1.0">See and listen to your messages, without having to call voicemail.</string>
+  <string name="dialer_terms_and_conditions_learn_more">Learn more</string>
+  <string name="dialer_terms_and_conditions_existing_user_ack">OK, got it</string>
+  <string name="dialer_terms_and_conditions_existing_user_decline">No, thanks</string>
+  <string name="terms_and_conditions_decline_dialog_title">Disable visual voicemail?</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_message">Visual voicemail will be disabled if the Terms and Conditions are declined.</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_downgrade">Disable</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_message">Visual voicemail will be disabled if you turn off visual voicemail.</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_downgrade">Disable</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message">Voicemail will only be accessible by calling *86. Set a new voicemail PIN to proceed.</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin">Set PIN</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/error/res/values-en-rIN/strings.xml b/java/com/android/dialer/voicemail/listui/error/res/values-en-rIN/strings.xml
new file mode 100644
index 0000000..8937212
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/error/res/values-en-rIN/strings.xml
@@ -0,0 +1,102 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_error_activating_title">Activating visual voicemail</string>
+  <string name="voicemail_error_activating_message">You might not receive voicemail notifications until visual voicemail is fully activated. Call voicemail to retrieve new messages until voicemail is fully activated.</string>
+  <string name="voicemail_error_not_activate_no_signal_title">Can\'t activate visual voicemail</string>
+  <string name="voicemail_error_not_activate_no_signal_message">Make sure that your phone has a mobile network connection and try again.</string>
+  <string name="voicemail_error_not_activate_no_signal_airplane_mode_message">Turn off aeroplane mode and try again.</string>
+  <string name="voicemail_error_no_signal_title">No connection</string>
+  <string name="voicemail_error_no_signal_message">You won\'t be notified for new voicemails. If you\'re on Wi‑Fi, you can check for voicemail by syncing now.</string>
+  <string name="voicemail_error_no_signal_airplane_mode_message">You won\'t be notified about new voicemail. Turn off aeroplane mode to sync your voicemail.</string>
+  <string name="voicemail_error_no_signal_cellular_required_message">Your phone needs a mobile data connection to check voicemail.</string>
+  <string name="voicemail_error_activation_failed_title">Can\'t activate visual voicemail</string>
+  <string name="voicemail_error_activation_failed_message">You can still call to check voicemail.</string>
+  <string name="voicemail_error_no_data_title">Can\'t update visual voicemail</string>
+  <string name="voicemail_error_no_data_message">Try again when your Wi‑Fi or mobile data connection is better. You can still call to check voicemail.</string>
+  <string name="voicemail_error_no_data_cellular_required_message">Try again when your mobile data connection is better. You can still call to check voicemail.</string>
+  <string name="voicemail_error_bad_config_title">Can\'t update visual voicemail</string>
+  <string name="voicemail_error_bad_config_message">You can still call to check voicemail.</string>
+  <string name="voicemail_error_communication_title">Can\'t update visual voicemail</string>
+  <string name="voicemail_error_communication_message">You can still call to check voicemail.</string>
+  <string name="voicemail_error_server_connection_title">Can\'t update visual voicemail</string>
+  <string name="voicemail_error_server_connection_message">You can still call to check voicemail.</string>
+  <string name="voicemail_error_server_title">Can\'t update visual voicemail</string>
+  <string name="voicemail_error_server_message">You can still call to check voicemail.</string>
+  <string name="voicemail_error_inbox_near_full_title">Inbox almost full</string>
+  <string name="voicemail_error_inbox_near_full_message">You won\'t be able to receive new voicemail if your inbox is full.</string>
+  <string name="voicemail_error_inbox_full_title">Can\'t receive new voicemail</string>
+  <string name="voicemail_error_inbox_full_message">Your inbox is full. Try deleting some messages to receive new voicemail.</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_title">Turn on extra storage and back up</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_message">Your mailbox is full. To free up space, turn on extra storage so that Google can manage and back up your voicemail messages.</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_title">Turn on extra storage and back up</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_message">Your mailbox is almost full. To free up space, turn on extra storage so that Google can manage and back up your voicemail messages.</string>
+  <string name="voicemail_error_pin_not_set_title">Set your voicemail PIN</string>
+  <string name="voicemail_error_pin_not_set_message">You\'ll need a voicemail PIN whenever you call to access your voicemail.</string>
+  <string name="voicemail_action_turn_off_airplane_mode">Aeroplane mode settings</string>
+  <string name="voicemail_action_set_pin">Set PIN</string>
+  <string name="voicemail_action_retry">Try again</string>
+  <string name="voicemail_action_turn_archive_on">Turn on</string>
+  <string name="voicemail_action_dimiss">No, thanks</string>
+  <string name="voicemail_action_sync">Sync</string>
+  <string name="voicemail_action_call_voicemail">Call voicemail</string>
+  <string name="voicemail_action_call_customer_support">Call Customer Support</string>
+  <string name="vvm3_error_vms_dns_failure_title">Something went wrong</string>
+  <string name="vvm3_error_vms_dns_failure_message">Sorry, we ran into a problem. Please try again later. If there is still a problem, please contact Customer Service on %1$s and tell them that the error code is 9001.</string>
+  <string name="vvm3_error_vmg_dns_failure_title">Something went wrong</string>
+  <string name="vvm3_error_vmg_dns_failure_message">Sorry, we ran into a problem. Please try again later. If there is still a problem, please contact Customer Service on %1$s and tell them that the error code is 9002.</string>
+  <string name="vvm3_error_spg_dns_failure_title">Something went wrong</string>
+  <string name="vvm3_error_spg_dns_failure_message">Sorry, we ran into a problem. Please try again later. If there is still a problem, please contact Customer Service on %1$s and tell them that the error code is 9003.</string>
+  <string name="vvm3_error_vms_no_cellular_title">Can\'t connect to your voice mailbox</string>
+  <string name="vvm3_error_vms_no_cellular_message">Sorry, we\'re having trouble connecting to your voice mailbox. If you\'re in an area with poor signal strength, wait until you have a strong signal and try again. If there is still a problem, please contact Customer Service on %1$s and tell them that the error code is 9004.</string>
+  <string name="vvm3_error_vmg_no_cellular_title">Can\'t connect to your voice mailbox</string>
+  <string name="vvm3_error_vmg_no_cellular_message">Sorry, we\'re having trouble connecting to your voice mailbox. If you\'re in an area with poor signal strength, wait until you have a strong signal and try again. If there is still a problem, please contact Customer Service on %1$s and tell them that the error code is 9005.</string>
+  <string name="vvm3_error_spg_no_cellular_title">Can\'t connect to your voice mailbox</string>
+  <string name="vvm3_error_spg_no_cellular_message">Sorry, we\'re having trouble connecting to your voice mailbox. If you\'re in an area with poor signal strength, wait until you have a strong signal and try again. If there is still a problem, please contact Customer Service on %1$s and tell them that the error code is 9006.</string>
+  <string name="vvm3_error_vms_timeout_title">Something went wrong</string>
+  <string name="vvm3_error_vms_timeout_message">Sorry, we ran into a problem. Please try again later. If there is still a problem, please contact Customer Service on %1$s and tell them that the error code is 9007.</string>
+  <string name="vvm3_error_vmg_timeout_title">Something went wrong</string>
+  <string name="vvm3_error_vmg_timeout_message">Sorry, we ran into a problem. Please try again later. If there is still a problem, please contact Customer Service on %1$s and tell them that the error code is 9008.</string>
+  <string name="vvm3_error_status_sms_timeout_title">Something went wrong</string>
+  <string name="vvm3_error_status_sms_timeout_message">Sorry, we\'re having trouble setting up your service. Please try again later. If there is still a problem, please contact Customer Service on %1$s and tell them that the error code is 9009.</string>
+  <string name="vvm3_error_subscriber_blocked_title">Can\'t connect to your voice mailbox</string>
+  <string name="vvm3_error_subscriber_blocked_message">Sorry, we\'re not able to connect to your voice mailbox at the moment. Please try again later. If there is still a problem, please contact Customer Service on %1$s and tell them that the error code is 9990.</string>
+  <string name="vvm3_error_unknown_user_title">Set Up Voicemail</string>
+  <string name="vvm3_error_unknown_user_message">Voicemail isn\'t set up on your account. Please contact Customer Service on %1$s and tell them that the error code is 9991.</string>
+  <string name="vvm3_error_unknown_device_title">Voicemail</string>
+  <string name="vvm3_error_unknown_device_message">Visual voicemail cannot be used on this device. Please contact Customer Service at %1$s and tell them that the error code is 9992.</string>
+  <string name="vvm3_error_invalid_password_title">Something went wrong</string>
+  <string name="vvm3_error_invalid_password_message">Please contact Customer Service on %1$s and tell them that the error code is 9993.</string>
+  <string name="vvm3_error_mailbox_not_initialized_title">Visual voicemail</string>
+  <string name="vvm3_error_mailbox_not_initialized_message">To complete visual voicemail setup, please contact Customer Service at %1$s and tell them that the error code is 9994.</string>
+  <string name="vvm3_error_service_not_provisioned_title">Visual voicemail</string>
+  <string name="vvm3_error_service_not_provisioned_message">To complete visual voicemail setup, please contact Customer Service at %1$s and tell them that the error code is 9995.</string>
+  <string name="vvm3_error_service_not_activated_title">Visual voicemail</string>
+  <string name="vvm3_error_service_not_activated_message">To activate visual voicemail, please contact Customer Service at %1$s and tell them that the error code is 9996.</string>
+  <string name="vvm3_error_user_blocked_title">Something went wrong</string>
+  <string name="vvm3_error_user_blocked_message">To complete visual voicemail setup, please contact Customer Service at %1$s and tell them that the error code is 9998.</string>
+  <string name="vvm3_error_subscriber_unknown_title">Visual voicemail is disabled</string>
+  <string name="vvm3_error_subscriber_unknown_message">Please contact Customer Service on %1$s to activate visual voicemail.</string>
+  <string name="vvm3_error_imap_getquota_error_title">Something went wrong</string>
+  <string name="vvm3_error_imap_getquota_error_message">Please contact Customer Service on %1$s and tell them that the error code is 9997.</string>
+  <string name="vvm3_error_imap_select_error_title">Something went wrong</string>
+  <string name="vvm3_error_imap_select_error_message">Please contact Customer Service on %1$s and tell them that the error code is 9989.</string>
+  <string name="vvm3_error_imap_error_title">Something went wrong</string>
+  <string name="vvm3_error_imap_error_message">Please contact Customer Service on %1$s and tell them that the error code is 9999.</string>
+  <string name="verizon_terms_and_conditions_title">Turn on visual voicemail</string>
+  <string name="verizon_terms_and_conditions_message">%1$s By turning on visual voicemail, you agree to the Verizon Wireless Terms and Conditions:\n\n%2$s</string>
+  <string name="dialer_terms_and_conditions_title">Turn on visual voicemail</string>
+  <string name="dialer_terms_and_conditions_existing_user_title">New! Read your voicemail</string>
+  <string name="dialer_terms_and_conditions_message">%s</string>
+  <string name="dialer_terms_and_conditions_1.0">See and listen to your messages, without having to call voicemail. Transcripts of your voicemail are provided by Google’s free transcription service. You can turn either off in Settings any time. %s</string>
+  <string name="dialer_terms_and_conditions_existing_user">Transcripts of your voicemail are now provided by Google’s free transcription service. You can turn this off in Settings at any time. %s</string>
+  <string name="dialer_terms_and_conditions_for_verizon_1.0">See and listen to your messages, without having to call voicemail.</string>
+  <string name="dialer_terms_and_conditions_learn_more">Learn more</string>
+  <string name="dialer_terms_and_conditions_existing_user_ack">OK, got it</string>
+  <string name="dialer_terms_and_conditions_existing_user_decline">No, thanks</string>
+  <string name="terms_and_conditions_decline_dialog_title">Disable visual voicemail?</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_message">Visual voicemail will be disabled if the Terms and Conditions are declined.</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_downgrade">Disable</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_message">Visual voicemail will be disabled if you turn off visual voicemail.</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_downgrade">Disable</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message">Voicemail will only be accessible by calling *86. Set a new voicemail PIN to proceed.</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin">Set PIN</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/error/res/values-es-rUS/strings.xml b/java/com/android/dialer/voicemail/listui/error/res/values-es-rUS/strings.xml
new file mode 100644
index 0000000..b54c9f6
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/error/res/values-es-rUS/strings.xml
@@ -0,0 +1,102 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_error_activating_title">Activando el buzón de voz visual</string>
+  <string name="voicemail_error_activating_message">Es posible que no recibas notificaciones de los mensajes de voz hasta que el buzón de voz visual se encuentre completamente activado. Hasta ese momento, puedes llamar al buzón de voz para recuperar los mensajes nuevos.</string>
+  <string name="voicemail_error_not_activate_no_signal_title">No se puede activar el buzón de voz visual</string>
+  <string name="voicemail_error_not_activate_no_signal_message">Asegúrate de que el teléfono tenga conexión móvil y vuelve a intentarlo.</string>
+  <string name="voicemail_error_not_activate_no_signal_airplane_mode_message">Desactiva el modo de avión y vuelve a intentarlo.</string>
+  <string name="voicemail_error_no_signal_title">Sin conexión</string>
+  <string name="voicemail_error_no_signal_message">No recibirás notificaciones de los mensajes de voz nuevos. Si estás conectado a Wi-Fi, puedes sincronizar el dispositivo ahora para revisar el buzón de voz.</string>
+  <string name="voicemail_error_no_signal_airplane_mode_message">No recibirás notificaciones de los mensajes de voz nuevos. Desactiva el modo de avión para sincronizar el buzón de voz.</string>
+  <string name="voicemail_error_no_signal_cellular_required_message">El teléfono necesita una conexión de datos móviles para revisar el buzón de voz.</string>
+  <string name="voicemail_error_activation_failed_title">No se puede activar el buzón de voz visual</string>
+  <string name="voicemail_error_activation_failed_message">Aún puedes llamar para revisar el buzón de voz.</string>
+  <string name="voicemail_error_no_data_title">No se puede actualizar el buzón de voz visual</string>
+  <string name="voicemail_error_no_data_message">Vuelve a intentarlo cuando la conexión Wi-Fi o la conexión de datos móviles mejoren. Aún puedes llamar para revisar el buzón de voz.</string>
+  <string name="voicemail_error_no_data_cellular_required_message">Vuelve a intentarlo cuando la conexión de datos móviles mejore. Aún puedes llamar para revisar el buzón de voz.</string>
+  <string name="voicemail_error_bad_config_title">No se puede actualizar el buzón de voz visual</string>
+  <string name="voicemail_error_bad_config_message">Aún puedes llamar para revisar el buzón de voz.</string>
+  <string name="voicemail_error_communication_title">No se puede actualizar el buzón de voz visual</string>
+  <string name="voicemail_error_communication_message">Aún puedes llamar para revisar el buzón de voz.</string>
+  <string name="voicemail_error_server_connection_title">No se puede actualizar el buzón de voz visual</string>
+  <string name="voicemail_error_server_connection_message">Aún puedes llamar para revisar el buzón de voz.</string>
+  <string name="voicemail_error_server_title">No se puede actualizar el buzón de voz visual</string>
+  <string name="voicemail_error_server_message">Aún puedes llamar para revisar el buzón de voz.</string>
+  <string name="voicemail_error_inbox_near_full_title">La carpeta Recibidos está casi llena</string>
+  <string name="voicemail_error_inbox_near_full_message">Si la carpeta Recibidos está llena, no podrás recibir mensajes de voz nuevos.</string>
+  <string name="voicemail_error_inbox_full_title">No se pueden recibir mensajes de voz nuevos</string>
+  <string name="voicemail_error_inbox_full_message">La carpeta Recibidos está llena. Intenta borrar algunos mensajes para recibir mensajes de voz nuevos.</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_title">Activa la opción de almacenamiento adicional y copia de seguridad</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_message">Tu buzón está lleno. A fin de liberar espacio, activa la opción de almacenamiento adicional para que Google pueda administrar tus mensajes de voz y hacer copias de seguridad de ellos.</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_title">Activa la opción de almacenamiento adicional y copia de seguridad</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_message">Tu buzón está casi lleno. A fin de liberar espacio, activa la opción de almacenamiento adicional para que Google pueda administrar tus mensajes de voz y hacer copias de seguridad de ellos.</string>
+  <string name="voicemail_error_pin_not_set_title">Establece el PIN de tu buzón de voz</string>
+  <string name="voicemail_error_pin_not_set_message">Necesitarás un PIN cada vez que llames para acceder al buzón de voz.</string>
+  <string name="voicemail_action_turn_off_airplane_mode">Configuración del modo de avión</string>
+  <string name="voicemail_action_set_pin">Establecer PIN</string>
+  <string name="voicemail_action_retry">Reintentar</string>
+  <string name="voicemail_action_turn_archive_on">Activar</string>
+  <string name="voicemail_action_dimiss">No, gracias</string>
+  <string name="voicemail_action_sync">Sincronizar</string>
+  <string name="voicemail_action_call_voicemail">Llamar al buzón de voz</string>
+  <string name="voicemail_action_call_customer_support">Llamar al servicio de Atención al cliente</string>
+  <string name="vvm3_error_vms_dns_failure_title">Se produjo un error</string>
+  <string name="vvm3_error_vms_dns_failure_message">Tuvimos un problema. Inténtalo más tarde. Si el problema persiste, comunícate con el servicio de Atención al cliente al %1$s e indícales que el código de error es 9001.</string>
+  <string name="vvm3_error_vmg_dns_failure_title">Se produjo un error</string>
+  <string name="vvm3_error_vmg_dns_failure_message">Tuvimos un problema. Inténtalo más tarde. Si el problema persiste, comunícate con el servicio de Atención al cliente al %1$s e indícales que el código de error es 9002.</string>
+  <string name="vvm3_error_spg_dns_failure_title">Se produjo un error</string>
+  <string name="vvm3_error_spg_dns_failure_message">Tuvimos un problema. Inténtalo más tarde. Si el problema persiste, comunícate con el servicio de Atención al cliente al %1$s e indícales que el código de error es 9003.</string>
+  <string name="vvm3_error_vms_no_cellular_title">No se puede establecer la conexión con el buzón de voz</string>
+  <string name="vvm3_error_vms_no_cellular_message">Tenemos problemas para establecer la conexión con tu buzón de voz. Si te encuentras en un área donde la señal es débil, espera a que haya buena señal y vuelve a intentarlo. Si el problema persiste, comunícate con el servicio de Atención al cliente al %1$s e indícales que el código de error es 9004.</string>
+  <string name="vvm3_error_vmg_no_cellular_title">No se puede establecer la conexión con el buzón de voz</string>
+  <string name="vvm3_error_vmg_no_cellular_message">Tenemos problemas para establecer la conexión con tu buzón de voz. Si te encuentras en un área donde la señal es débil, espera a que haya buena señal y vuelve a intentarlo. Si el problema persiste, comunícate con el servicio de Atención al cliente al %1$s e indícales que el código de error es 9005.</string>
+  <string name="vvm3_error_spg_no_cellular_title">No se puede establecer la conexión con el buzón de voz</string>
+  <string name="vvm3_error_spg_no_cellular_message">Tenemos problemas para establecer la conexión con tu buzón de voz. Si te encuentras en un área donde la señal es débil, espera a que haya buena señal y vuelve a intentarlo. Si el problema persiste, comunícate con el servicio de Atención al cliente al %1$s e indícales que el código de error es 9006.</string>
+  <string name="vvm3_error_vms_timeout_title">Se produjo un error</string>
+  <string name="vvm3_error_vms_timeout_message">Tuvimos un problema. Inténtalo más tarde. Si el problema persiste, comunícate con el servicio de Atención al cliente al %1$s e indícales que el código de error es 9007.</string>
+  <string name="vvm3_error_vmg_timeout_title">Se produjo un error</string>
+  <string name="vvm3_error_vmg_timeout_message">Lo sentimos, tuvimos un problema. Inténtalo más tarde. Si el problema persiste, comunícate con el servicio de Atención al cliente al %1$s e indícales que el código de error es 9008.</string>
+  <string name="vvm3_error_status_sms_timeout_title">Se produjo un error</string>
+  <string name="vvm3_error_status_sms_timeout_message">Tenemos dificultades para configurar tu servicio. Inténtalo más tarde. Si el problema persiste, comunícate con el servicio de Atención al cliente al %1$s e indícales que el código de error es 9009.</string>
+  <string name="vvm3_error_subscriber_blocked_title">No se puede establecer la conexión con el buzón de voz</string>
+  <string name="vvm3_error_subscriber_blocked_message">No podemos establecer la conexión con tu buzón de voz en este momento. Inténtalo más tarde. Si el problema persiste, comunícate con el servicio de Atención al cliente al %1$s e indícales que el código de error es 9990.</string>
+  <string name="vvm3_error_unknown_user_title">Configurar buzón de voz</string>
+  <string name="vvm3_error_unknown_user_message">El buzón de voz no está configurado en tu cuenta. Comunícate con el servicio de Atención al cliente al %1$s e indícales que el código de error es 9991.</string>
+  <string name="vvm3_error_unknown_device_title">Buzón de voz</string>
+  <string name="vvm3_error_unknown_device_message">No se puede usar el buzón de voz visual en este dispositivo. Comunícate con el servicio de Atención al cliente al %1$s e indícales que el código de error es 9992.</string>
+  <string name="vvm3_error_invalid_password_title">Se produjo un error</string>
+  <string name="vvm3_error_invalid_password_message">Comunícate con el servicio de Atención al cliente al %1$s e indícales que el código de error es 9993.</string>
+  <string name="vvm3_error_mailbox_not_initialized_title">Buzón de voz visual</string>
+  <string name="vvm3_error_mailbox_not_initialized_message">Para completar la configuración del buzón de voz visual, comunícate con el servicio de Atención al cliente al %1$s e indícales que el código de error es 9994.</string>
+  <string name="vvm3_error_service_not_provisioned_title">Buzón de voz visual</string>
+  <string name="vvm3_error_service_not_provisioned_message">Para completar la configuración del buzón de voz visual, comunícate con el servicio de Atención al cliente al %1$s e indícales que el código de error es 9995.</string>
+  <string name="vvm3_error_service_not_activated_title">Buzón de voz visual</string>
+  <string name="vvm3_error_service_not_activated_message">Para activar el buzón de voz visual, comunícate con el servicio de Atención al cliente al %1$s e indícales que el código de error es 9996.</string>
+  <string name="vvm3_error_user_blocked_title">Se produjo un error</string>
+  <string name="vvm3_error_user_blocked_message">Para completar la configuración del buzón de voz visual, comunícate con el servicio de Atención al cliente al %1$s e indícales que el código de error es 9998.</string>
+  <string name="vvm3_error_subscriber_unknown_title">El buzón de voz visual está inhabilitado</string>
+  <string name="vvm3_error_subscriber_unknown_message">Comunícate con el servicio de Atención al cliente al %1$s para activar el buzón de voz visual.</string>
+  <string name="vvm3_error_imap_getquota_error_title">Se produjo un error</string>
+  <string name="vvm3_error_imap_getquota_error_message">Comunícate con el servicio de Atención al cliente al %1$s e indícales que el código de error es 9997.</string>
+  <string name="vvm3_error_imap_select_error_title">Se produjo un error</string>
+  <string name="vvm3_error_imap_select_error_message">Comunícate con el servicio de Atención al cliente al %1$s e indícales que el código de error es 9989.</string>
+  <string name="vvm3_error_imap_error_title">Se produjo un error</string>
+  <string name="vvm3_error_imap_error_message">Comunícate con el servicio de Atención al cliente al %1$s e indícales que el código de error es 9999.</string>
+  <string name="verizon_terms_and_conditions_title">Cómo activar el buzón de voz visual</string>
+  <string name="verizon_terms_and_conditions_message">%1$s Al activar el buzón de voz visual, aceptas los siguientes Términos y condiciones de Verizon Wireless:\n\n%2$s</string>
+  <string name="dialer_terms_and_conditions_title">Cómo activar el buzón de voz visual</string>
+  <string name="dialer_terms_and_conditions_existing_user_title">¡Nuevo! Lee tus mensajes de voz</string>
+  <string name="dialer_terms_and_conditions_message">%s</string>
+  <string name="dialer_terms_and_conditions_1.0">Lee y escucha tus mensajes sin necesidad de llamar al buzón de voz. El servicio de transcripción gratuito de Google te proporciona las transcripciones del buzón de voz. Puedes desactivarlas en cualquier momento desde la configuración. %s</string>
+  <string name="dialer_terms_and_conditions_existing_user">El servicio de transcripción gratuito de Google ahora te proporciona las transcripciones del buzón de voz. Puedes desactivar esta opción en cualquier momento desde la configuración. %s</string>
+  <string name="dialer_terms_and_conditions_for_verizon_1.0">Puedes ver y escuchar tus mensajes sin necesidad de llamar al buzón de voz.</string>
+  <string name="dialer_terms_and_conditions_learn_more">Más información</string>
+  <string name="dialer_terms_and_conditions_existing_user_ack">Entendido</string>
+  <string name="dialer_terms_and_conditions_existing_user_decline">No, gracias</string>
+  <string name="terms_and_conditions_decline_dialog_title">¿Quieres inhabilitar el buzón de voz visual?</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_message">El buzón de voz visual se inhabilitará si no aceptas los Términos y condiciones.</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_downgrade">Inhabilitar</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_message">El buzón de voz visual se inhabilitará si lo desactivas.</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_downgrade">Inhabilitar</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message">Solo podrás acceder al buzón de voz llamando al *86. Para continuar, establece un nuevo PIN para el buzón de voz.</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin">Establecer PIN</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/error/res/values-es/strings.xml b/java/com/android/dialer/voicemail/listui/error/res/values-es/strings.xml
new file mode 100644
index 0000000..01e3dfb
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/error/res/values-es/strings.xml
@@ -0,0 +1,102 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_error_activating_title">Activando el buzón de voz visual</string>
+  <string name="voicemail_error_activating_message">Es posible que no recibas notificaciones de mensajes de voz hasta que el buzón de voz visual se active por completo. Mientras tanto, puedes llamar al buzón de voz para escuchar los mensajes nuevos.</string>
+  <string name="voicemail_error_not_activate_no_signal_title">No se ha podido activar el buzón de voz visual</string>
+  <string name="voicemail_error_not_activate_no_signal_message">Asegúrate de que tu teléfono tenga conexión a una red móvil y vuelve a intentarlo.</string>
+  <string name="voicemail_error_not_activate_no_signal_airplane_mode_message">Desactiva el modo avión y vuelve a intentarlo.</string>
+  <string name="voicemail_error_no_signal_title">No hay conexión</string>
+  <string name="voicemail_error_no_signal_message">No recibirás notificaciones de los mensajes de voz nuevos. Si estás usando una conexión Wi-Fi, puedes sincronizar ahora el teléfono para comprobar si hay mensajes de voz.</string>
+  <string name="voicemail_error_no_signal_airplane_mode_message">No recibirás notificaciones de los mensajes de voz nuevos. Si quieres sincronizar tu buzón de voz, desactiva el modo avión.</string>
+  <string name="voicemail_error_no_signal_cellular_required_message">Para comprobar el buzón de voz, necesitas una conexión de datos móviles en el teléfono.</string>
+  <string name="voicemail_error_activation_failed_title">No se ha podido activar el buzón de voz visual</string>
+  <string name="voicemail_error_activation_failed_message">Puedes llamar para comprobar el buzón de voz.</string>
+  <string name="voicemail_error_no_data_title">No se ha podido actualizar el buzón de voz visual</string>
+  <string name="voicemail_error_no_data_message">Inténtalo otra vez cuando tengas mejor conexión Wi-Fi o de datos móviles. Puedes llamar para comprobar el buzón de voz.</string>
+  <string name="voicemail_error_no_data_cellular_required_message">Inténtalo otra vez cuando tengas mejor conexión de datos móviles. Puedes llamar para comprobar el buzón de voz.</string>
+  <string name="voicemail_error_bad_config_title">No se ha podido actualizar el buzón de voz visual</string>
+  <string name="voicemail_error_bad_config_message">Puedes llamar para comprobar el buzón de voz.</string>
+  <string name="voicemail_error_communication_title">No se ha podido actualizar el buzón de voz visual</string>
+  <string name="voicemail_error_communication_message">Puedes llamar para comprobar el buzón de voz.</string>
+  <string name="voicemail_error_server_connection_title">No se ha podido actualizar el buzón de voz visual</string>
+  <string name="voicemail_error_server_connection_message">Puedes llamar para comprobar el buzón de voz.</string>
+  <string name="voicemail_error_server_title">No se ha podido actualizar el buzón de voz visual</string>
+  <string name="voicemail_error_server_message">Puedes llamar para comprobar el buzón de voz.</string>
+  <string name="voicemail_error_inbox_near_full_title">La bandeja de entrada está casi llena</string>
+  <string name="voicemail_error_inbox_near_full_message">Si la bandeja de entrada está llena, no podrás recibir mensajes de voz.</string>
+  <string name="voicemail_error_inbox_full_title">No puedes recibir mensajes de voz</string>
+  <string name="voicemail_error_inbox_full_message">Tienes la bandeja de entrada llena. Para recibir mensajes de voz, prueba a eliminar algunos antiguos.</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_title">Habilitar más espacio de almacenamiento y de copia de seguridad</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_message">Tu buzón de voz está lleno. Para liberar espacio, habilita más almacenamiento para que Google pueda hacer una copia de seguridad de tus mensajes del buzón de buzón y gestionarlos.</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_title">Habilitar más espacio de almacenamiento y de copia de seguridad</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_message">Tu buzón de voz está prácticamente lleno. Para liberar espacio, habilita más almacenamiento para que Google pueda hacer una copia de seguridad de tus mensajes del buzón de buzón y gestionarlos.</string>
+  <string name="voicemail_error_pin_not_set_title">Configura el PIN del buzón de voz</string>
+  <string name="voicemail_error_pin_not_set_message">Deberás introducir el PIN del buzón de voz siempre que llames para escuchar los mensajes de voz.</string>
+  <string name="voicemail_action_turn_off_airplane_mode">Ajustes del modo avión</string>
+  <string name="voicemail_action_set_pin">Configurar PIN</string>
+  <string name="voicemail_action_retry">Reintentar</string>
+  <string name="voicemail_action_turn_archive_on">Activar</string>
+  <string name="voicemail_action_dimiss">No, gracias</string>
+  <string name="voicemail_action_sync">Sincronización</string>
+  <string name="voicemail_action_call_voicemail">Llamar al buzón de voz</string>
+  <string name="voicemail_action_call_customer_support">Llamar al servicio de atención al cliente</string>
+  <string name="vvm3_error_vms_dns_failure_title">Se ha producido un error</string>
+  <string name="vvm3_error_vms_dns_failure_message">Se ha producido un problema. Vuelve a intentarlo más tarde. Si no se resuelve, llama al servicio de atención al cliente al %1$s e indica el código de error 9001.</string>
+  <string name="vvm3_error_vmg_dns_failure_title">Se ha producido un error</string>
+  <string name="vvm3_error_vmg_dns_failure_message">Se ha producido un problema. Vuelve a intentarlo más tarde. Si no se resuelve, llama al servicio de atención al cliente al %1$s e indica el código de error 9002.</string>
+  <string name="vvm3_error_spg_dns_failure_title">Se ha producido un error</string>
+  <string name="vvm3_error_spg_dns_failure_message">Se ha producido un problema. Vuelve a intentarlo más tarde. Si no se resuelve, llama al servicio de atención al cliente al %1$s e indica el código de error 9003.</string>
+  <string name="vvm3_error_vms_no_cellular_title">No se ha podido conectar con tu buzón de voz</string>
+  <string name="vvm3_error_vms_no_cellular_message">No hemos podido conectar con tu buzón de voz. Si tienes poca cobertura, espera a tener más para volver a intentarlo. Si no se resuelve el problema, llama al servicio de atención al cliente al %1$s e indica el código de error 9004.</string>
+  <string name="vvm3_error_vmg_no_cellular_title">No se ha podido conectar con tu buzón de voz</string>
+  <string name="vvm3_error_vmg_no_cellular_message">No hemos podido conectar con tu buzón de voz. Si tienes poca cobertura, espera a tener más para volver a intentarlo. Si no se resuelve el problema, llama al servicio de atención al cliente al %1$s e indica el código de error 9005.</string>
+  <string name="vvm3_error_spg_no_cellular_title">No se ha podido conectar con tu buzón de voz</string>
+  <string name="vvm3_error_spg_no_cellular_message">No hemos podido conectar con tu buzón de voz. Si tienes poca cobertura, espera a tener más para volver a intentarlo. Si no se resuelve el problema, llama al servicio de atención al cliente al %1$s e indica el código de error 9006.</string>
+  <string name="vvm3_error_vms_timeout_title">Se ha producido un error</string>
+  <string name="vvm3_error_vms_timeout_message">Se ha producido un problema. Vuelve a intentarlo más tarde. Si no se resuelve, llama al servicio de atención al cliente al %1$s e indica el código de error 9007.</string>
+  <string name="vvm3_error_vmg_timeout_title">Se ha producido un error</string>
+  <string name="vvm3_error_vmg_timeout_message">Se ha producido un problema. Vuelve a intentarlo más tarde. Si no se resuelve, llama al servicio de atención al cliente al %1$s e indica el código de error 9008.</string>
+  <string name="vvm3_error_status_sms_timeout_title">Se ha producido un error</string>
+  <string name="vvm3_error_status_sms_timeout_message">Se ha producido un problema al configurar tu servicio. Vuelve a intentarlo más tarde. Si no se resuelve, llama al servicio de atención al cliente al %1$s e indica el código de error 9009.</string>
+  <string name="vvm3_error_subscriber_blocked_title">No se ha podido conectar con tu buzón de voz</string>
+  <string name="vvm3_error_subscriber_blocked_message">No podemos conectar con tu buzón de voz en este momento. Vuelve a intentarlo más tarde. Si el problema no se resuelve, llama al servicio de atención al cliente al %1$s e indica el código de error 9990.</string>
+  <string name="vvm3_error_unknown_user_title">Configurar el buzón de voz</string>
+  <string name="vvm3_error_unknown_user_message">El buzón de voz no está configurado en tu cuenta. Llama al servicio de atención al cliente al %1$s e indica el código de error 9991.</string>
+  <string name="vvm3_error_unknown_device_title">Buzón de voz</string>
+  <string name="vvm3_error_unknown_device_message">No se puede utilizar el buzón de voz visual en este dispositivo. Llama al servicio de atención al cliente al %1$s e indica el código de error 9992.</string>
+  <string name="vvm3_error_invalid_password_title">Se ha producido un error</string>
+  <string name="vvm3_error_invalid_password_message">Llama al servicio de atención al cliente al %1$s e indica el código de error 9993.</string>
+  <string name="vvm3_error_mailbox_not_initialized_title">Buzón de voz visual</string>
+  <string name="vvm3_error_mailbox_not_initialized_message">Para terminar de configurar el buzón de voz visual, llama al servicio de atención al cliente al %1$s e indica el código de error 9994.</string>
+  <string name="vvm3_error_service_not_provisioned_title">Buzón de voz visual</string>
+  <string name="vvm3_error_service_not_provisioned_message">Para terminar de configurar el buzón de voz visual, llama al servicio de atención al cliente al %1$s e indica el código de error 9995.</string>
+  <string name="vvm3_error_service_not_activated_title">Buzón de voz visual</string>
+  <string name="vvm3_error_service_not_activated_message">Para activar el buzón de voz visual, llama al servicio de atención al cliente al %1$s e indica el código de error 9996.</string>
+  <string name="vvm3_error_user_blocked_title">Se ha producido un error</string>
+  <string name="vvm3_error_user_blocked_message">Para terminar de configurar el buzón de voz visual, llama al servicio de atención al cliente al %1$s e indica el código de error 9998.</string>
+  <string name="vvm3_error_subscriber_unknown_title">El buzón de voz visual está inhabilitado</string>
+  <string name="vvm3_error_subscriber_unknown_message">Llama al servicio de atención al cliente al %1$s para activar el buzón de voz visual.</string>
+  <string name="vvm3_error_imap_getquota_error_title">Se ha producido un error</string>
+  <string name="vvm3_error_imap_getquota_error_message">Llama al servicio de atención al cliente al %1$s e indica el código de error 9997.</string>
+  <string name="vvm3_error_imap_select_error_title">Se ha producido un error</string>
+  <string name="vvm3_error_imap_select_error_message">Llama al servicio de atención al cliente al %1$s e indica el código de error 9989.</string>
+  <string name="vvm3_error_imap_error_title">Se ha producido un error</string>
+  <string name="vvm3_error_imap_error_message">Llama al servicio de atención al cliente al %1$s e indica el código de error 9999.</string>
+  <string name="verizon_terms_and_conditions_title">Activar el buzón de voz visual</string>
+  <string name="verizon_terms_and_conditions_message">%1$s Al activar el buzón de voz visual, aceptas los términos y condiciones de Verizon Wireless:\n\n%2$s</string>
+  <string name="dialer_terms_and_conditions_title">Activar el buzón de voz visual</string>
+  <string name="dialer_terms_and_conditions_existing_user_title">¡Nuevo! Lee tus mensajes de voz</string>
+  <string name="dialer_terms_and_conditions_message">%s</string>
+  <string name="dialer_terms_and_conditions_1.0">Lee y escucha tus mensajes sin tener que llamar al buzón de voz. La transcripción de mensajes de voz es un servicio ofrecido gratuitamente por Google. Puedes desactivar esta función en cualquier momento en los ajustes. %s</string>
+  <string name="dialer_terms_and_conditions_existing_user">La transcripción de mensajes de voz es un nuevo servicio ofrecido gratuitamente por Google. Puedes desactivar esta función en cualquier momento en los ajustes. %s</string>
+  <string name="dialer_terms_and_conditions_for_verizon_1.0">Consulta y escucha tus mensajes sin tener que llamar al buzón de voz.</string>
+  <string name="dialer_terms_and_conditions_learn_more">Más información</string>
+  <string name="dialer_terms_and_conditions_existing_user_ack">Entendido</string>
+  <string name="dialer_terms_and_conditions_existing_user_decline">No, gracias</string>
+  <string name="terms_and_conditions_decline_dialog_title">¿Quieres inhabilitar el buzón de voz visual?</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_message">El buzón de voz visual se inhabilitará si rechazas los términos y condiciones.</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_downgrade">Inhabilitar</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_message">El buzón de voz visual se inhabilitará si lo desactivas.</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_downgrade">Inhabilitar</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message">Solo podrás acceder al buzón de voz llamando al *86. Configura un nuevo PIN del buzón para continuar.</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin">Configurar PIN</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/error/res/values-et/strings.xml b/java/com/android/dialer/voicemail/listui/error/res/values-et/strings.xml
new file mode 100644
index 0000000..d09862b
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/error/res/values-et/strings.xml
@@ -0,0 +1,102 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_error_activating_title">Visuaalse kõneposti aktiveerimine</string>
+  <string name="voicemail_error_activating_message">Te ei pruugi kõneposti märguandeid saada enne, kui visuaalne kõnepost on täielikult aktiveeritud. Kuni kõnepost on täielikult aktiveeritud, helistage uute sõnumite toomiseks kõneposti.</string>
+  <string name="voicemail_error_not_activate_no_signal_title">Visuaalset kõneposti ei saa aktiveerida</string>
+  <string name="voicemail_error_not_activate_no_signal_message">Veenduge, et teie telefonis oleks mobiilsidevõrgu ühendus saadaval, ja proovige uuesti.</string>
+  <string name="voicemail_error_not_activate_no_signal_airplane_mode_message">Lülitage lennukirežiim välja ja proovige uuesti.</string>
+  <string name="voicemail_error_no_signal_title">Ühendus puudub</string>
+  <string name="voicemail_error_no_signal_message">Teid ei teavitata uutest kõnepostisõnumitest. Kui kasutate WiFi-t, saab kõneposti kontrollida, kui nüüd sünkroonite.</string>
+  <string name="voicemail_error_no_signal_airplane_mode_message">Teid ei teavitata uutest kõnepostisõnumitest. Kõneposti sünkroonimiseks lülitage lennukirežiim välja.</string>
+  <string name="voicemail_error_no_signal_cellular_required_message">Kõneposti kontrollimiseks peab teie telefonis olema lubatud mobiilne andmesideühendus.</string>
+  <string name="voicemail_error_activation_failed_title">Visuaalset kõneposti ei saa aktiveerida</string>
+  <string name="voicemail_error_activation_failed_message">Võite siiski helistada, et kõneposti kontrollida.</string>
+  <string name="voicemail_error_no_data_title">Visuaalset kõneposti ei saa värskendada</string>
+  <string name="voicemail_error_no_data_message">Proovige uuesti, kui WiFi- või mobiilne andmesideühendus on parem. Võite siiski helistada, et kõneposti kontrollida.</string>
+  <string name="voicemail_error_no_data_cellular_required_message">Proovige uuesti, kui mobiilne andmesideühendus on parem. Võite siiski helistada, et kõneposti kontrollida.</string>
+  <string name="voicemail_error_bad_config_title">Visuaalset kõneposti ei saa värskendada</string>
+  <string name="voicemail_error_bad_config_message">Võite siiski helistada, et kõneposti kontrollida.</string>
+  <string name="voicemail_error_communication_title">Visuaalset kõneposti ei saa värskendada</string>
+  <string name="voicemail_error_communication_message">Võite siiski helistada, et kõneposti kontrollida.</string>
+  <string name="voicemail_error_server_connection_title">Visuaalset kõneposti ei saa värskendada</string>
+  <string name="voicemail_error_server_connection_message">Võite siiski helistada, et kõneposti kontrollida.</string>
+  <string name="voicemail_error_server_title">Visuaalset kõneposti ei saa värskendada</string>
+  <string name="voicemail_error_server_message">Võite siiski helistada, et kõneposti kontrollida.</string>
+  <string name="voicemail_error_inbox_near_full_title">Postkast on peaaegu täis</string>
+  <string name="voicemail_error_inbox_near_full_message">Kui teie postkast on täis, ei saa te uusi kõnepostisõnumeid vastu võtta.</string>
+  <string name="voicemail_error_inbox_full_title">Uusi kõnepostisõnumeid ei saa vastu võtta</string>
+  <string name="voicemail_error_inbox_full_message">Teie postkast on täis. Uute kõnepostisõnumite vastuvõtmiseks kustutage mõned sõnumid.</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_title">Lisasalvestusruumi ja varundamise sisselülitamine</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_message">Teie postkast on täis. Ruumi vabastamiseks lülitage sisse lisasalvestusruum, et Google saaks teie kõnepostisõnumeid hallata ja varundada.</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_title">Lisasalvestusruumi ja varundamise sisselülitamine</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_message">Teie postkast on peaaegu täis. Ruumi vabastamiseks lülitage sisse lisasalvestusruum, et Google saaks teie kõnepostisõnumeid hallata ja varundada.</string>
+  <string name="voicemail_error_pin_not_set_title">Määrake kõneposti PIN-kood</string>
+  <string name="voicemail_error_pin_not_set_message">Vajate kõneposti PIN-koodi juhul, kui helistate kõnepostile juurdepääsemiseks.</string>
+  <string name="voicemail_action_turn_off_airplane_mode">Lennukirežiimi seaded</string>
+  <string name="voicemail_action_set_pin">Määra PIN-kood</string>
+  <string name="voicemail_action_retry">Proovi uuesti</string>
+  <string name="voicemail_action_turn_archive_on">Lülita sisse</string>
+  <string name="voicemail_action_dimiss">Tänan, ei</string>
+  <string name="voicemail_action_sync">Sünkrooni</string>
+  <string name="voicemail_action_call_voicemail">Helista kõneposti</string>
+  <string name="voicemail_action_call_customer_support">Helista klienditoele</string>
+  <string name="vvm3_error_vms_dns_failure_title">Midagi läks valesti</string>
+  <string name="vvm3_error_vms_dns_failure_message">Kahjuks ilmnes probleem. Proovige hiljem uuesti. Kui probleem püsib, võtke ühendust klienditeenindusega numbril %1$s ja öelge neile, et veakood on 9001.</string>
+  <string name="vvm3_error_vmg_dns_failure_title">Midagi läks valesti</string>
+  <string name="vvm3_error_vmg_dns_failure_message">Kahjuks ilmnes probleem. Proovige hiljem uuesti. Kui probleem püsib, võtke ühendust klienditeenindusega numbril %1$s ja öelge neile, et veakood on 9002.</string>
+  <string name="vvm3_error_spg_dns_failure_title">Midagi läks valesti</string>
+  <string name="vvm3_error_spg_dns_failure_message">Kahjuks ilmnes probleem. Proovige hiljem uuesti. Kui probleem püsib, võtke ühendust klienditeenindusega numbril %1$s ja öelge neile, et veakood on 9003.</string>
+  <string name="vvm3_error_vms_no_cellular_title">Teie kõnepostkastiga ei saa ühendust luua</string>
+  <string name="vvm3_error_vms_no_cellular_message">Kahjuks esineb teie kõnepostkastiga ühenduse loomisel probleeme. Kui asute kehva signaalitugevusega piirkonnas, oodake, kuni signaal on tugev, ja proovige uuesti. Kui probleem püsib, võtke ühendust klienditeenindusega numbril %1$s ja öelge neile, et veakood on 9004.</string>
+  <string name="vvm3_error_vmg_no_cellular_title">Teie kõnepostkastiga ei saa ühendust luua</string>
+  <string name="vvm3_error_vmg_no_cellular_message">Kahjuks esineb teie kõnepostkastiga ühenduse loomisel probleeme. Kui asute kehva signaalitugevusega piirkonnas, oodake, kuni signaal on tugev, ja proovige uuesti. Kui probleem püsib, võtke ühendust klienditeenindusega numbril %1$s ja öelge neile, et veakood on 9005.</string>
+  <string name="vvm3_error_spg_no_cellular_title">Teie kõnepostkastiga ei saa ühendust luua</string>
+  <string name="vvm3_error_spg_no_cellular_message">Kahjuks esineb teie kõnepostkastiga ühenduse loomisel probleeme. Kui asute kehva signaalitugevusega piirkonnas, oodake, kuni signaal on tugev, ja proovige uuesti. Kui probleem püsib, võtke ühendust klienditeenindusega numbril %1$s ja öelge neile, et veakood on 9006.</string>
+  <string name="vvm3_error_vms_timeout_title">Midagi läks valesti</string>
+  <string name="vvm3_error_vms_timeout_message">Kahjuks ilmnes probleem. Proovige hiljem uuesti. Kui probleem püsib, võtke ühendust klienditeenindusega numbril %1$s ja öelge neile, et veakood on 9007.</string>
+  <string name="vvm3_error_vmg_timeout_title">Midagi läks valesti</string>
+  <string name="vvm3_error_vmg_timeout_message">Kahjuks ilmnes probleem. Proovige hiljem uuesti. Kui probleem püsib, võtke ühendust klienditeenindusega numbril %1$s ja öelge neile, et veakood on 9008.</string>
+  <string name="vvm3_error_status_sms_timeout_title">Midagi läks valesti</string>
+  <string name="vvm3_error_status_sms_timeout_message">Kahjuks on meil probleeme teie teenuse seadistamisega. Proovige hiljem uuesti. Kui probleem püsib, võtke ühendust klienditeenindusega numbril %1$s ja öelge neile, et veakood on 9009.</string>
+  <string name="vvm3_error_subscriber_blocked_title">Teie kõnepostkastiga ei saa ühendust luua</string>
+  <string name="vvm3_error_subscriber_blocked_message">Kahjuks ei õnnestu meil praegu teie kõnepostkastiga ühendust luua. Proovige hiljem uuesti. Kui probleem püsib, võtke ühendust klienditeenindusega numbril %1$s ja öelge neile, et veakood on 9990.</string>
+  <string name="vvm3_error_unknown_user_title">Kõneposti seadistamine</string>
+  <string name="vvm3_error_unknown_user_message">Kõnepost pole teie kontol seadistatud. Võtke ühendust klienditeenindusega numbril %1$s ja öelge neile, et veakood on 9991.</string>
+  <string name="vvm3_error_unknown_device_title">Kõnepost</string>
+  <string name="vvm3_error_unknown_device_message">Selles seadmes ei saa visuaalset kõneposti kasutada. Võtke ühendust klienditeenindusega numbril %1$s ja öelge neile, et veakood on 9992.</string>
+  <string name="vvm3_error_invalid_password_title">Midagi läks valesti</string>
+  <string name="vvm3_error_invalid_password_message">Võtke ühendust klienditeenindusega numbril %1$s ja öelge neile, et veakood on 9993.</string>
+  <string name="vvm3_error_mailbox_not_initialized_title">Visuaalne kõnepost</string>
+  <string name="vvm3_error_mailbox_not_initialized_message">Visuaalse kõneposti seadistamise lõpuleviimiseks võtke ühendust klienditeenindusega numbril %1$s ja öelge neile, et veakood on 9994.</string>
+  <string name="vvm3_error_service_not_provisioned_title">Visuaalne kõnepost</string>
+  <string name="vvm3_error_service_not_provisioned_message">Visuaalse kõneposti seadistamise lõpuleviimiseks võtke ühendust klienditeenindusega numbril %1$s ja öelge neile, et veakood on 9995.</string>
+  <string name="vvm3_error_service_not_activated_title">Visuaalne kõnepost</string>
+  <string name="vvm3_error_service_not_activated_message">Visuaalse kõneposti aktiveerimiseks võtke ühendust klienditeenindusega numbril %1$s ja öelge neile, et veakood on 9996.</string>
+  <string name="vvm3_error_user_blocked_title">Midagi läks valesti</string>
+  <string name="vvm3_error_user_blocked_message">Visuaalse kõneposti seadistamise lõpuleviimiseks võtke ühendust klienditeenindusega numbril %1$s ja öelge neile, et veakood on 9998.</string>
+  <string name="vvm3_error_subscriber_unknown_title">Visuaalne kõnepost on keelatud</string>
+  <string name="vvm3_error_subscriber_unknown_message">Visuaalse kõneposti aktiveerimiseks võtke ühendust klienditeenindusega numbril %1$s.</string>
+  <string name="vvm3_error_imap_getquota_error_title">Midagi läks valesti</string>
+  <string name="vvm3_error_imap_getquota_error_message">Võtke ühendust klienditeenindusega numbril %1$s ja öelge neile, et veakood on 9997.</string>
+  <string name="vvm3_error_imap_select_error_title">Midagi läks valesti</string>
+  <string name="vvm3_error_imap_select_error_message">Võtke ühendust klienditeenindusega numbril %1$s ja öelge neile, et veakood on 9989.</string>
+  <string name="vvm3_error_imap_error_title">Midagi läks valesti</string>
+  <string name="vvm3_error_imap_error_message">Võtke ühendust klienditeenindusega numbril %1$s ja öelge neile, et veakood on 9999.</string>
+  <string name="verizon_terms_and_conditions_title">Visuaalse kõneposti sisselülitamine</string>
+  <string name="verizon_terms_and_conditions_message">%1$s Visuaalse kõneposti sisselülitamisel nõustute Verizon Wirelessi nõuete ja tingimustega:\n\n%2$s</string>
+  <string name="dialer_terms_and_conditions_title">Visuaalse kõneposti sisselülitamine</string>
+  <string name="dialer_terms_and_conditions_existing_user_title">Uus! Lugege oma kõnepostisõnumeid</string>
+  <string name="dialer_terms_and_conditions_message">%s</string>
+  <string name="dialer_terms_and_conditions_1.0">Vaadake ja kuulake oma sõnumeid ilma, et peaksite kõneposti helistama. Kõnepostisõnumite transkriptsioone pakub Google\'i tasuta transkribeerimisteenus. Mõlemad saab seadetes igal ajal välja lülitada. %s</string>
+  <string name="dialer_terms_and_conditions_existing_user">Kõnepostisõnumite transkriptsioone pakub nüüd Google\'i tasuta transkribeerimisteenus. Selle saab seadetes igal ajal välja lülitada. %s</string>
+  <string name="dialer_terms_and_conditions_for_verizon_1.0">Vaadake ja kuulake oma sõnumeid ilma, et peaksite kõneposti helistama.</string>
+  <string name="dialer_terms_and_conditions_learn_more">Lisateave</string>
+  <string name="dialer_terms_and_conditions_existing_user_ack">OK, selge</string>
+  <string name="dialer_terms_and_conditions_existing_user_decline">Tänan, ei</string>
+  <string name="terms_and_conditions_decline_dialog_title">Kas keelata visuaalne kõnepost?</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_message">Visuaalne kõnepost keelatakse, kui nõuete ja tingimustega ei nõustuta.</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_downgrade">Keela</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_message">Visuaalne kõnepost keelatakse, kui visuaalse kõneposti välja lülitate.</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_downgrade">Keela</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message">Kõnepost on saadaval vaid siis, kui helistate numbril *86. Jätkamiseks määrake uus kõneposti PIN-kood.</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin">Määra PIN-kood</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/error/res/values-eu/strings.xml b/java/com/android/dialer/voicemail/listui/error/res/values-eu/strings.xml
new file mode 100644
index 0000000..c9ef249
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/error/res/values-eu/strings.xml
@@ -0,0 +1,102 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_error_activating_title">Ikusizko erantzungailua aktibatzen</string>
+  <string name="voicemail_error_activating_message">Ikusizko erantzungailua aktibatu arte, agian ez duzu jasoko erantzungailuaren jakinarazpenik. Erantzungailua guztiz aktibatuta ez dagoen artean, deitu erantzungailuari mezu berriak entzuteko.</string>
+  <string name="voicemail_error_not_activate_no_signal_title">Ezin da aktibatu ikusizko erantzungailua</string>
+  <string name="voicemail_error_not_activate_no_signal_message">Ziurtatu telefonoa sare mugikorrera konektatuta dagoela eta saiatu berriro.</string>
+  <string name="voicemail_error_not_activate_no_signal_airplane_mode_message">Desaktibatu hegaldi modua eta saiatu berriro.</string>
+  <string name="voicemail_error_no_signal_title">Ez dago konexiorik</string>
+  <string name="voicemail_error_no_signal_message">Ez duzu jasoko jakinarazpenik ahots-mezu berriak dituzunean. Wi-Fi sarea erabiltzen ari bazara, orain sinkroniza dezakezu erantzungailua ahots-mezurik duzun begiratzeko.</string>
+  <string name="voicemail_error_no_signal_airplane_mode_message">Ez duzu jasoko jakinarazpenik ahots-mezu berriak dituzunean. Desaktibatu hegaldi modua erantzungailua sinkronizatzeko.</string>
+  <string name="voicemail_error_no_signal_cellular_required_message">Erantzungailuan ahots-mezurik duzun begiratzeko, datu-konexioa behar du telefonoak.</string>
+  <string name="voicemail_error_activation_failed_title">Ezin da aktibatu ikusizko erantzungailua</string>
+  <string name="voicemail_error_activation_failed_message">Bestela ere, deitu egin dezakezu erantzungailuan ahots-mezurik duzun begiratzeko.</string>
+  <string name="voicemail_error_no_data_title">Ezin da eguneratu ikusizko erantzungailua</string>
+  <string name="voicemail_error_no_data_message">Saiatu berriro Wi-Fi konexioa edo datu-konexioa hobeak direnean. Bestela ere, deitu egin dezakezu erantzungailuan ahots-mezurik duzun begiratzeko.</string>
+  <string name="voicemail_error_no_data_cellular_required_message">Saiatu berriro datu-konexioa hobea denean. Bestela ere, deitu egin dezakezu erantzungailuan ahots-mezurik duzun begiratzeko.</string>
+  <string name="voicemail_error_bad_config_title">Ezin da eguneratu ikusizko erantzungailua</string>
+  <string name="voicemail_error_bad_config_message">Bestela ere, deitu egin dezakezu erantzungailuan ahots-mezurik duzun begiratzeko.</string>
+  <string name="voicemail_error_communication_title">Ezin da eguneratu ikusizko erantzungailua</string>
+  <string name="voicemail_error_communication_message">Bestela ere, deitu egin dezakezu erantzungailuan ahots-mezurik duzun begiratzeko.</string>
+  <string name="voicemail_error_server_connection_title">Ezin da eguneratu ikusizko erantzungailua</string>
+  <string name="voicemail_error_server_connection_message">Bestela ere, deitu egin dezakezu erantzungailuan ahots-mezurik duzun begiratzeko.</string>
+  <string name="voicemail_error_server_title">Ezin da eguneratu ikusizko erantzungailua</string>
+  <string name="voicemail_error_server_message">Bestela ere, deitu egin dezakezu erantzungailuan ahots-mezurik duzun begiratzeko.</string>
+  <string name="voicemail_error_inbox_near_full_title">Ia beteta dago sarrera-ontzia</string>
+  <string name="voicemail_error_inbox_near_full_message">Ezin izango duzu jaso ahots-mezu berririk sarrera-ontzia beteta badago.</string>
+  <string name="voicemail_error_inbox_full_title">Ezin da jaso ahots-mezu berririk</string>
+  <string name="voicemail_error_inbox_full_message">Beteta dago sarrera-ontzia. Ahots-mezu berriak jasotzeko, ezabatu mezu batzuk.</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_title">Lortu biltegiratzeko toki gehiago eta aktibatu babeskopiak egiteko aukera</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_message">Beteta dago postontzia. Tokia egiteko, lortu biltegiratzeko toki gehiago, Google-k erantzungailuko mezuak kudeatu eta haien babeskopiak egin ahal izan ditzan.</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_title">Lortu biltegiratzeko toki gehiago eta aktibatu babeskopiak egiteko aukera</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_message">Ia beteta dago postontzia. Tokia egiteko, lortu biltegiratzeko toki gehiago, Google-k erantzungailuko mezuak kudeatu eta haien babeskopiak egin ahal izan ditzan.</string>
+  <string name="voicemail_error_pin_not_set_title">Ezarri erantzungailuko PIN kodea</string>
+  <string name="voicemail_error_pin_not_set_message">Erantzungailua atzitzeko deitzen duzunerako behar duzu PIN kodea.</string>
+  <string name="voicemail_action_turn_off_airplane_mode">Hegaldi moduaren ezarpenak</string>
+  <string name="voicemail_action_set_pin">Ezarri PIN kodea</string>
+  <string name="voicemail_action_retry">Saiatu berriro</string>
+  <string name="voicemail_action_turn_archive_on">Aktibatu</string>
+  <string name="voicemail_action_dimiss">Ez, eskerrik asko</string>
+  <string name="voicemail_action_sync">Sinkronizazioa</string>
+  <string name="voicemail_action_call_voicemail">Deitu erantzungailuari</string>
+  <string name="voicemail_action_call_customer_support">Deitu bezeroarentzako arreta-zerbitzuari</string>
+  <string name="vvm3_error_vms_dns_failure_title">Arazoren bat izan da</string>
+  <string name="vvm3_error_vms_dns_failure_message">Arazoren bat izan dugu. Saiatu berriro geroago. Arazoak bere horretan jarraitzen badu, jarri bezeroarentzako arreta-zerbitzuarekin harremanetan (%1$s) eta esan iezaiezu errore-kodea 9001 dela.</string>
+  <string name="vvm3_error_vmg_dns_failure_title">Arazoren bat izan da</string>
+  <string name="vvm3_error_vmg_dns_failure_message">Arazoren bat izan dugu. Saiatu berriro geroago. Arazoak bere horretan jarraitzen badu, jarri bezeroarentzako arreta-zerbitzuarekin harremanetan (%1$s) eta esan iezaiezu errore-kodea 9002 dela.</string>
+  <string name="vvm3_error_spg_dns_failure_title">Arazoren bat izan da</string>
+  <string name="vvm3_error_spg_dns_failure_message">Arazoren bat izan dugu. Saiatu berriro geroago. Arazoak bere horretan jarraitzen badu, jarri bezeroarentzako arreta-zerbitzuarekin harremanetan (%1$s) eta esan iezaiezu errore-kodea 9003 dela.</string>
+  <string name="vvm3_error_vms_no_cellular_title">Ezin da konektatu erantzungailura</string>
+  <string name="vvm3_error_vms_no_cellular_message">Arazoren bat dugu erantzungailura konektatzeko. Estaldura ahula duen tokiren batean bazaude, itxaron estaldura hobea izan arte eta saiatu berriro. Arazoak bere horretan jarraitzen badu, jarri bezeroarentzako arreta-zerbitzuarekin harremanetan (%1$s) eta esan iezaiezu errore-kodea 9004 dela.</string>
+  <string name="vvm3_error_vmg_no_cellular_title">Ezin da konektatu erantzungailura</string>
+  <string name="vvm3_error_vmg_no_cellular_message">Arazoren bat dugu erantzungailura konektatzeko. Estaldura ahula duen tokiren batean bazaude, itxaron estaldura hobea izan arte eta saiatu berriro. Arazoak bere horretan jarraitzen badu, jarri bezeroarentzako arreta-zerbitzuarekin harremanetan (%1$s) eta esan iezaiezu errore-kodea 9005 dela.</string>
+  <string name="vvm3_error_spg_no_cellular_title">Ezin da konektatu erantzungailura</string>
+  <string name="vvm3_error_spg_no_cellular_message">Arazoren bat dugu erantzungailura konektatzeko. Estaldura ahula duen tokiren batean bazaude, itxaron estaldura hobea izan arte eta saiatu berriro. Arazoak bere horretan jarraitzen badu, jarri bezeroarentzako arreta-zerbitzuarekin harremanetan (%1$s) eta esan iezaiezu errore-kodea 9006 dela.</string>
+  <string name="vvm3_error_vms_timeout_title">Arazoren bat izan da</string>
+  <string name="vvm3_error_vms_timeout_message">Arazoren bat izan dugu. Saiatu berriro geroago. Arazoak bere horretan jarraitzen badu, jarri bezeroarentzako arreta-zerbitzuarekin harremanetan (%1$s) eta esan iezaiezu errore-kodea 9007 dela.</string>
+  <string name="vvm3_error_vmg_timeout_title">Arazoren bat izan da</string>
+  <string name="vvm3_error_vmg_timeout_message">Arazoren bat izan dugu. Saiatu berriro geroago. Arazoak bere horretan jarraitzen badu, jarri bezeroarentzako arreta-zerbitzuarekin harremanetan (%1$s) eta esan iezaiezu errore-kodea 9008 dela.</string>
+  <string name="vvm3_error_status_sms_timeout_title">Arazoren bat izan da</string>
+  <string name="vvm3_error_status_sms_timeout_message">Arazoren bat dugu zerbitzua konfiguratzeko. Saiatu berriro geroago. Arazoak bere horretan jarraitzen badu, jarri bezeroarentzako arreta-zerbitzuarekin harremanetan (%1$s) eta esan iezaiezu errore-kodea 9009 dela.</string>
+  <string name="vvm3_error_subscriber_blocked_title">Ezin da konektatu erantzungailura</string>
+  <string name="vvm3_error_subscriber_blocked_message">Une honetan, ezin gara konektatu erantzungailura. Saiatu berriro geroago. Arazoak bere horretan jarraitzen badu, jarri bezeroarentzako arreta-zerbitzuarekin harremanetan (%1$s) eta esan iezaiezu errore-kodea 9990 dela.</string>
+  <string name="vvm3_error_unknown_user_title">Konfiguratu erantzungailua</string>
+  <string name="vvm3_error_unknown_user_message">Erantzungailua ez dago konfiguratuta kontu honetan. Jarri bezeroarentzako arreta-zerbitzuarekin harremanetan (%1$s) eta esan iezaiezu errore-kodea 9991 dela.</string>
+  <string name="vvm3_error_unknown_device_title">Ahots-mezua</string>
+  <string name="vvm3_error_unknown_device_message">Ezin da erabili ikusizko erantzungailua gailu honetan. Jarri bezeroarentzako zerbitzuarekin harremanetan (%1$s) eta esan iezaiezu errore-kodea 9992 dela.</string>
+  <string name="vvm3_error_invalid_password_title">Arazoren bat izan da</string>
+  <string name="vvm3_error_invalid_password_message">Jarri bezeroarentzako arreta-zerbitzuarekin harremanetan (%1$s) eta esan iezaiezu errore-kodea 9993 dela.</string>
+  <string name="vvm3_error_mailbox_not_initialized_title">Ikusizko erantzungailua</string>
+  <string name="vvm3_error_mailbox_not_initialized_message">Ikusizko erantzungailuaren konfigurazioa osatzeko, jarri bezeroarentzako zerbitzuarekin harremanetan (%1$s) eta esan iezaiezu errore-kodea 9994 dela.</string>
+  <string name="vvm3_error_service_not_provisioned_title">Ikusizko erantzungailua</string>
+  <string name="vvm3_error_service_not_provisioned_message">Ikusizko erantzungailuaren konfigurazioa osatzeko, jarri bezeroarentzako zerbitzuarekin harremanetan (%1$s) eta esan iezaiezu errore-kodea 9995 dela.</string>
+  <string name="vvm3_error_service_not_activated_title">Ikusizko erantzungailua</string>
+  <string name="vvm3_error_service_not_activated_message">Ikusizko erantzungailua aktibatzeko, jarri bezeroarentzako zerbitzuarekin harremanetan (%1$s) eta esan iezaiezu errore-kodea 9996 dela.</string>
+  <string name="vvm3_error_user_blocked_title">Arazoren bat izan da</string>
+  <string name="vvm3_error_user_blocked_message">Ikusizko erantzungailuaren konfigurazioa osatzeko, jarri bezeroarentzako zerbitzuarekin harremanetan (%1$s) eta esan iezaiezu errore-kodea 9998 dela.</string>
+  <string name="vvm3_error_subscriber_unknown_title">Ikusizko erantzungailua desgaituta dago</string>
+  <string name="vvm3_error_subscriber_unknown_message">Ikusizko erantzungailua aktibatzeko, jarri bezeroarentzako arreta-zerbitzuarekin harremanetan (%1$s).</string>
+  <string name="vvm3_error_imap_getquota_error_title">Arazoren bat izan da</string>
+  <string name="vvm3_error_imap_getquota_error_message">Jarri bezeroarentzako arreta-zerbitzuarekin harremanetan (%1$s) eta esan iezaiezu errore-kodea 9997 dela.</string>
+  <string name="vvm3_error_imap_select_error_title">Arazoren bat izan da</string>
+  <string name="vvm3_error_imap_select_error_message">Jarri bezeroarentzako arreta-zerbitzuarekin harremanetan (%1$s) eta esan iezaiezu errore-kodea 9989 dela.</string>
+  <string name="vvm3_error_imap_error_title">Arazoren bat izan da</string>
+  <string name="vvm3_error_imap_error_message">Jarri bezeroarentzako arreta-zerbitzuarekin harremanetan (%1$s) eta esan iezaiezu errore-kodea 9999 dela.</string>
+  <string name="verizon_terms_and_conditions_title">Aktibatu ikusizko erantzungailua</string>
+  <string name="verizon_terms_and_conditions_message">%1$s Ikusizko erantzungailua aktibatzen baduzu, onartu egingo dituzu Verizon Wireless zerbitzuaren Zehaztapenak eta baldintzak:\n\n%2$s</string>
+  <string name="dialer_terms_and_conditions_title">Aktibatu ikusizko erantzungailua</string>
+  <string name="dialer_terms_and_conditions_existing_user_title">Berria! Irakurri ahots-mezuak</string>
+  <string name="dialer_terms_and_conditions_message">%s</string>
+  <string name="dialer_terms_and_conditions_1.0">Ikusi eta entzun mezuak, erantzungailura deitu beharrik gabe. Google-ren doako transkripzio-zerbitzuaren bidez egiten dira ahots-mezuen transkripzioak. Aukera hau desaktibatzeko, joan Ezarpenak atalera. %s</string>
+  <string name="dialer_terms_and_conditions_existing_user">Google-ren doako transkripzio-zerbitzuaren bidez egiten dira ahots-mezuen transkripzioak. Aukera hau desaktibatzeko, joan Ezarpenak atalera. %s</string>
+  <string name="dialer_terms_and_conditions_for_verizon_1.0">Ikusi eta entzun mezuak, erantzungailura deitu beharrik gabe.</string>
+  <string name="dialer_terms_and_conditions_learn_more">Lortu informazio gehiago</string>
+  <string name="dialer_terms_and_conditions_existing_user_ack">Ados</string>
+  <string name="dialer_terms_and_conditions_existing_user_decline">Ez, eskerrik asko</string>
+  <string name="terms_and_conditions_decline_dialog_title">Ikusizko erantzungailua desgaitu nahi duzu?</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_message">Zehaztapenak eta baldintzak onartzen ez badituzu, desgaitu egingo da ikusizko erantzungailua.</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_downgrade">Desgaitu</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_message">Ikusizko erantzungailua desaktibatzen baduzu, desgaitu egingo da zerbitzu hau.</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_downgrade">Desgaitu</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message">Erantzungailua atzitzeko, *86 zenbakira deitu beharko duzu. Jarraitzeko, ezarri erantzungailuaren PIN kodea.</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin">Ezarri PIN kodea</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/error/res/values-fa/strings.xml b/java/com/android/dialer/voicemail/listui/error/res/values-fa/strings.xml
new file mode 100644
index 0000000..c669c2d
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/error/res/values-fa/strings.xml
@@ -0,0 +1,102 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_error_activating_title">درحال فعال کردن پست صوتی تصویری</string>
+  <string name="voicemail_error_activating_message">ممکن است تا زمانی که پست صوتی تصویری کاملاً فعال نشده باشد، اعلان‌های پست صوتی را دریافت نکنید. تا زمانی که پست صوتی به‌طور کامل فعال نشده است، برای بازیابی پیام‌های جدید با پست صوتی تماس بگیرید.</string>
+  <string name="voicemail_error_not_activate_no_signal_title">پست صوتی تصویری فعال نشد</string>
+  <string name="voicemail_error_not_activate_no_signal_message">مطمئن شوید تلفنتان اتصال شبکه تلفن همراه دارد و دوباره امتحان کنید.</string>
+  <string name="voicemail_error_not_activate_no_signal_airplane_mode_message">حالت هواپیما را غیرفعال کنید و دوباره امتحان کنید.</string>
+  <string name="voicemail_error_no_signal_title">اتصال برقرار نیست</string>
+  <string name="voicemail_error_no_signal_message">‏از پست‌های صوتی جدید مطلع نمی‌شود. اگر از Wi-Fi استفاده می‌کنید، اکنون با انجام همگام‌سازی می‌توانید پست صوتی را بررسی کنید.</string>
+  <string name="voicemail_error_no_signal_airplane_mode_message">از پست‌های صوتی جدید مطلع نمی‌شوید. حالت هواپیما را غیرفعال کنید تا پست صوتی همگام‌سازی شود.</string>
+  <string name="voicemail_error_no_signal_cellular_required_message">برای بررسی پست صوتی، تلفنتان باید اتصال داده تلفن همراه داشته باشد.</string>
+  <string name="voicemail_error_activation_failed_title">پست صوتی تصویری فعال نشد</string>
+  <string name="voicemail_error_activation_failed_message">همچنان می‌توانید برای بررسی پست صوتی تماس بگیرید.</string>
+  <string name="voicemail_error_no_data_title">پست صوتی تصویری به‌روزرسانی نشد</string>
+  <string name="voicemail_error_no_data_message">‏وقتی Wi-Fi یا اتصال داده تلفن همراه بهتر شد، دوباره امتحان کنید. هنوز می‌توانید برای بررسی پست صوتی تماس بگیرید.</string>
+  <string name="voicemail_error_no_data_cellular_required_message">وقتی اتصال داده تلفن همراه بهتر شد، دوباره امتحان کنید. هنوز می‌توانید برای بررسی پست صوتی تماس بگیرید.</string>
+  <string name="voicemail_error_bad_config_title">پست صوتی تصویری به‌روزرسانی نشد</string>
+  <string name="voicemail_error_bad_config_message">همچنان می‌توانید برای بررسی پست صوتی تماس بگیرید.</string>
+  <string name="voicemail_error_communication_title">پست صوتی تصویری به‌روزرسانی نشد</string>
+  <string name="voicemail_error_communication_message">همچنان می‌توانید برای بررسی پست صوتی تماس بگیرید.</string>
+  <string name="voicemail_error_server_connection_title">پست صوتی تصویری به‌روزرسانی نشد</string>
+  <string name="voicemail_error_server_connection_message">همچنان می‌توانید برای بررسی پست صوتی تماس بگیرید.</string>
+  <string name="voicemail_error_server_title">پست صوتی تصویری به‌روزرسانی نشد</string>
+  <string name="voicemail_error_server_message">همچنان می‌توانید برای بررسی پست صوتی تماس بگیرید.</string>
+  <string name="voicemail_error_inbox_near_full_title">صندوق ورودی تقریباً پر است</string>
+  <string name="voicemail_error_inbox_near_full_message">اگر صندوق ورودی‌تان پر باشد نمی‌توانید پست صوتی جدیدی دریافت کنید.</string>
+  <string name="voicemail_error_inbox_full_title">پست‌های صوتی جدید دریافت نمی‌شود</string>
+  <string name="voicemail_error_inbox_full_message">صندوق ورودی‌تان پر است. بعضی از پیام‌ها را حذف کنید تا پست صوتی جدید دریافت کنید.</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_title">فعال‌سازی فضای ذخیره‌سازی اضافی و پشتیبان‌گیری</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_message">‏صندوق ورودی‌تان پر است. برای آزاد کردن فضا، فضای ذخیره‌سازی اضافی را فعال‌سازی کنید تا Google بتواند پیام‌های صندوق پستی‌تان را مدیریت و پشتیبان‌گیری کند.</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_title">فعال‌سازی فضای ذخیره‌سازی اضافی و پشتیبان‌گیری</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_message">‏صندوق ورودی‌تان تقریباً پر است. برای آزاد کردن فضا، فضای ذخیره‌سازی اضافی را فعال‌سازی کنید تا Google بتواند پیام‌های صندوق پستی‌تان را مدیریت و پشتیبان‌گیری کند.</string>
+  <string name="voicemail_error_pin_not_set_title">تنظیم پین پست صوتی</string>
+  <string name="voicemail_error_pin_not_set_message">هر بار که تماس می‌گیرید، به پین پست صوتی برای دسترسی به پست صوتی‌تان نیاز دارید.</string>
+  <string name="voicemail_action_turn_off_airplane_mode">تنظیمات حالت هواپیما</string>
+  <string name="voicemail_action_set_pin">تنظیم پین</string>
+  <string name="voicemail_action_retry">سعی مجدد</string>
+  <string name="voicemail_action_turn_archive_on">روشن کردن</string>
+  <string name="voicemail_action_dimiss">نه متشکرم</string>
+  <string name="voicemail_action_sync">همگام‌سازی</string>
+  <string name="voicemail_action_call_voicemail">تماس با پست صوتی</string>
+  <string name="voicemail_action_call_customer_support">تماس با پشتیبانی مشتری</string>
+  <string name="vvm3_error_vms_dns_failure_title">مشکلی رخ داد</string>
+  <string name="vvm3_error_vms_dns_failure_message">متأسفیم، مشکلی رخ داد. لطفاً بعداً دوباره امتحان کنید. اگر هنوز مشکل دارید، لطفاً ازطریق شماره %1$s با خدمات مشتری تماس بگیرید و این کد خطا را به آن‌ها بگویید: ٩٠٠١.</string>
+  <string name="vvm3_error_vmg_dns_failure_title">مشکلی رخ داد</string>
+  <string name="vvm3_error_vmg_dns_failure_message">متأسفیم، مشکلی رخ داد. لطفاً بعداً دوباره امتحان کنید. اگر هنوز مشکل دارید، لطفاً ازطریق شماره %1$s با خدمات مشتری تماس بگیرید و این کد خطا را به آن‌ها بگویید: ٩٠٠۲.</string>
+  <string name="vvm3_error_spg_dns_failure_title">مشکلی رخ داد</string>
+  <string name="vvm3_error_spg_dns_failure_message">متأسفیم، مشکلی رخ داد. لطفاً بعداً دوباره امتحان کنید. اگر هنوز مشکل دارید، لطفاً ازطریق شماره %1$s با خدمات مشتری تماس بگیرید و این کد خطا را به آن‌ها بگویید: ٩٠٠٣.</string>
+  <string name="vvm3_error_vms_no_cellular_title">اتصال به صندوق پستی صوتی برقرار نشد</string>
+  <string name="vvm3_error_vms_no_cellular_message">متأسفیم، برای اتصال به صندوق پستی صوتی‌تان مشکلی داریم. اگر در منطقه‌ای هستید که قدرت سیگنال ضعیف است، منتظر بمانید تا سیگنال قوی شود و دوباره امتحان کنید. اگر همچنان مشکل دارید، لطفاً ازطریق شماره %1$s با خدمات مشتری تماس بگیرید و این کد خطا را به آن‌ها بگویید: ٩٠٠۴.</string>
+  <string name="vvm3_error_vmg_no_cellular_title">اتصال به صندوق پستی صوتی برقرار نشد</string>
+  <string name="vvm3_error_vmg_no_cellular_message">متأسفیم، برای اتصال به صندوق پستی صوتی‌تان مشکلی داریم. اگر در منطقه‌ای هستید که قدرت سیگنال ضعیف است، منتظر بمانید تا سیگنال قوی شود و دوباره امتحان کنید. اگر همچنان مشکل دارید، لطفاً ازطریق شماره %1$s با خدمات مشتری تماس بگیرید و این کد خطا را به آن‌ها بگویید: ٩٠٠۵.</string>
+  <string name="vvm3_error_spg_no_cellular_title">اتصال به صندوق پستی صوتی برقرار نشد</string>
+  <string name="vvm3_error_spg_no_cellular_message">متأسفیم، برای اتصال به صندوق پستی صوتی‌تان مشکلی داریم. اگر در منطقه‌ای هستید که قدرت سیگنال ضعیف است، منتظر بمانید تا سیگنال قوی شود و دوباره امتحان کنید. اگر همچنان مشکل دارید، لطفاً ازطریق شماره %1$s با خدمات مشتری تماس بگیرید و این کد خطا را به آن‌ها بگویید: ٩٠٠۶.</string>
+  <string name="vvm3_error_vms_timeout_title">مشکلی رخ داد</string>
+  <string name="vvm3_error_vms_timeout_message">متأسفیم، مشکلی رخ داد. لطفاً بعداً دوباره امتحان کنید. اگر همچنان مشکل دارید، لطفاً ازطریق شماره %1$s با خدمات مشتری تماس بگیرید و این کد خطا را به آن‌ها بگویید: ٩٠٠٧.</string>
+  <string name="vvm3_error_vmg_timeout_title">مشکلی رخ داد</string>
+  <string name="vvm3_error_vmg_timeout_message">متأسفیم، مشکلی رخ داد. لطفاً بعداً دوباره امتحان کنید. اگر هنوز مشکل دارید، لطفاً ازطریق شماره %1$s با خدمات مشتری تماس بگیرید و این کد خطا را به آن‌ها بگویید: ٩٠٠٨.</string>
+  <string name="vvm3_error_status_sms_timeout_title">مشکلی رخ داد</string>
+  <string name="vvm3_error_status_sms_timeout_message">متأسفیم، برای تنظیم سرویستان مشکلی داریم. لطفاً بعداً دوباره امتحان کنید. اگر هنوز مشکل دارید، لطفاً ازطریق شماره %1$s با خدمات مشتری تماس بگیرید و این کد خطا را به آن‌ها بگویید: ٩٠٠٩.</string>
+  <string name="vvm3_error_subscriber_blocked_title">اتصال به صندوق پستی صوتی برقرار نشد</string>
+  <string name="vvm3_error_subscriber_blocked_message">متأسفیم، فعلاً نمی‌توانیم به صندوق پست صوتی‌تان متصل شویم. لطفاً بعداً دوباره امتحان کنید. اگر هنوز مشکل دارید، لطفاً ازطریق شماره %1$s با خدمات مشتری تماس بگیرید و این کد خطا را به آن‌ها بگویید: ٩٩٩٠.</string>
+  <string name="vvm3_error_unknown_user_title">راه‌اندازی پست صوتی</string>
+  <string name="vvm3_error_unknown_user_message">پست صوتی در حسابتان راه‌اندازی نشده است. لطفاً ازطریق شماره %1$s با خدمات مشتری تماس بگیرید و این کد خطا را به آن‌ها بگویید: ٩٩٩١.</string>
+  <string name="vvm3_error_unknown_device_title">پست صوتی</string>
+  <string name="vvm3_error_unknown_device_message">پست صوتی تصویری در این دستگاه قابل‌استفاده نیست. لطفاً ازطریق شماره %1$s با خدمات مشتری تماس بگیرید و این کد خطا را به آن‌ها بگویید: ٩٩٩۲.</string>
+  <string name="vvm3_error_invalid_password_title">مشکلی رخ داد</string>
+  <string name="vvm3_error_invalid_password_message">لطفاً ازطریق شماره %1$s با خدمات مشتری تماس بگیرید و این کد خطا را به آن‌ها بگویید: ٩٩٩٣.</string>
+  <string name="vvm3_error_mailbox_not_initialized_title">پست صوتی تصویری</string>
+  <string name="vvm3_error_mailbox_not_initialized_message">برای تکمیل مراحل تنظیم پست صوتی تصویری، لطفاً ازطریق شماره %1$s با خدمات مشتری تماس بگیرید و این کد خطا را به آن‌ها بگویید: ٩٩٩۴.</string>
+  <string name="vvm3_error_service_not_provisioned_title">پست صوتی تصویری</string>
+  <string name="vvm3_error_service_not_provisioned_message">برای تکمیل مراحل تنظیم پست صوتی تصویری، لطفاً ازطریق شماره %1$s با خدمات مشتری تماس بگیرید و این کد خطا را به آن‌ها بگویید: ٩٩٩۵.</string>
+  <string name="vvm3_error_service_not_activated_title">پست صوتی تصویری</string>
+  <string name="vvm3_error_service_not_activated_message">برای فعال کردن پست صوتی تصویری، لطفاً ازطریق شماره %1$s با خدمات مشتری تماس بگیرید و این کد خطا را به آن‌ها بگویید: ٩٩٩۶.</string>
+  <string name="vvm3_error_user_blocked_title">مشکلی رخ داد</string>
+  <string name="vvm3_error_user_blocked_message">برای تکمیل مراحل تنظیم پست صوتی تصویری، لطفاً ازطریق شماره %1$s با خدمات مشتری تماس بگیرید و این کد خطا را به آن‌ها بگویید: ٩٩٩۸.</string>
+  <string name="vvm3_error_subscriber_unknown_title">پست صوتی تصویری غیرفعال است</string>
+  <string name="vvm3_error_subscriber_unknown_message">برای فعال کردن پست صوتی تصویری، لطفاً ازطریق شماره %1$s با خدمات مشتری تماس بگیرید.</string>
+  <string name="vvm3_error_imap_getquota_error_title">مشکلی رخ داد</string>
+  <string name="vvm3_error_imap_getquota_error_message">لطفاً ازطریق شماره %1$s با خدمات مشتری تماس بگیرید و این کد خطا را به آن‌ها بگویید: ٩٩٩٧.</string>
+  <string name="vvm3_error_imap_select_error_title">مشکلی رخ داد</string>
+  <string name="vvm3_error_imap_select_error_message">لطفاً ازطریق شماره %1$s با خدمات مشتری تماس بگیرید و این کد خطا را به آن‌ها بگویید: ٩٩٨٩.</string>
+  <string name="vvm3_error_imap_error_title">مشکلی رخ داد</string>
+  <string name="vvm3_error_imap_error_message">لطفاً ازطریق شماره %1$s با خدمات مشتری تماس بگیرید و این کد خطا را به آن‌ها بگویید: ٩٩٩٩.</string>
+  <string name="verizon_terms_and_conditions_title">روشن کردن پست صوتی تصویری</string>
+  <string name="verizon_terms_and_conditions_message">‏%1$s با روشن کردن پست صوتی تصویری، با شرایط و ضوابط Verizon Wireless موافقت می‌کنید:\n\n%2$s</string>
+  <string name="dialer_terms_and_conditions_title">روشن کردن پست صوتی تصویری</string>
+  <string name="dialer_terms_and_conditions_existing_user_title">جدید! پست صوتی‌تان را بخوانید</string>
+  <string name="dialer_terms_and_conditions_message">%s</string>
+  <string name="dialer_terms_and_conditions_1.0">‏بدون نیاز به تماس گرفتن با پست صوتی، پیام‌هایتان را ببینید و به آن‌ها گوش دهید. ترانویسی پست صوتی‌تان توسط سرویس رایگان ترانویسی Google ارائه می‌شود. هرزمان خواستید می‌توانید هرکدام را در «تنظیمات» خاموش کنید. %s</string>
+  <string name="dialer_terms_and_conditions_existing_user">‏درحال‌حاضر ترانویسی پست صوتی‌تان توسط سرویس رایگان ترانویسی Google ارائه می‌شود. هرزمان خواستید می‌توانید این گزینه را در «تنظیمات» خاموش کنید. ‎%s</string>
+  <string name="dialer_terms_and_conditions_for_verizon_1.0">بدون نیاز به تماس گرفتن با پست صوتی، پیام‌هایتان را ببینید و به آن‌ها گوش کنید.</string>
+  <string name="dialer_terms_and_conditions_learn_more">بیشتر بدانید</string>
+  <string name="dialer_terms_and_conditions_existing_user_ack">بله، متوجه شدم</string>
+  <string name="dialer_terms_and_conditions_existing_user_decline">نه متشکرم</string>
+  <string name="terms_and_conditions_decline_dialog_title">پست صوتی تصویری غیرفعال شود؟</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_message">اگر شرایط خدمات را رد کنید، پست صوتی تصویری غیرفعال می‌شود.</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_downgrade">غیرفعال کردن</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_message">اگر پست صوتی تصویری را خاموش کنید، پست صوتی تصویری غیرفعال می‌شود.</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_downgrade">غیرفعال کردن</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message">پست صوتی فقط ازطریق تماس با ٨۶* قابل‌دسترسی است. برای ادامه، پین پست صوتی جدیدی تنظیم کنید.</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin">تنظیم پین</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/error/res/values-fi/strings.xml b/java/com/android/dialer/voicemail/listui/error/res/values-fi/strings.xml
new file mode 100644
index 0000000..a1d136e
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/error/res/values-fi/strings.xml
@@ -0,0 +1,102 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_error_activating_title">Aktivoidaan visuaalista vastaajaa</string>
+  <string name="voicemail_error_activating_message">Et ehkä saa vastaajan ilmoituksia, ennen kuin visuaalinen vastaaja on täysin aktivoitu. Saat uudet viestit soittamalla vastaajaan.</string>
+  <string name="voicemail_error_not_activate_no_signal_title">Visuaalisen vastaajan aktivointi epäonnistui</string>
+  <string name="voicemail_error_not_activate_no_signal_message">Varmista, että puhelimesi mobiilidatayhteys toimii, ja yritä uudelleen.</string>
+  <string name="voicemail_error_not_activate_no_signal_airplane_mode_message">Poista lentokonetila käytöstä ja yritä uudelleen.</string>
+  <string name="voicemail_error_no_signal_title">Ei yhteyttä</string>
+  <string name="voicemail_error_no_signal_message">Uusista vastaajaviesteistä ei lähetetä ilmoitusta. Jos olet yhteydessä Wi-Fi-verkkoon, voit tarkistaa vastaajaviestit synkronoimalla nyt.</string>
+  <string name="voicemail_error_no_signal_airplane_mode_message">Uusista vastaajaviesteistä ei lähetetä ilmoitusta. Synkronoi vastaajaviestit poistamalla lentokonetila käytöstä.</string>
+  <string name="voicemail_error_no_signal_cellular_required_message">Vastaajaviestien tarkistamista varten puhelimessasi on oltava mobiilidatayhteys.</string>
+  <string name="voicemail_error_activation_failed_title">Visuaalisen vastaajan aktivointi epäonnistui</string>
+  <string name="voicemail_error_activation_failed_message">Voit silti tarkistaa vastaajaviestit soittamalla.</string>
+  <string name="voicemail_error_no_data_title">Visuaalisen vastaajan päivitys epäonnistui</string>
+  <string name="voicemail_error_no_data_message">Yritä uudelleen, kun Wi-Fi‑ tai mobiilidatayhteys on vahvempi. Voit edelleen tarkistaa vastaajaviestit soittamalla.</string>
+  <string name="voicemail_error_no_data_cellular_required_message">Yritä uudelleen, kun mobiilidatayhteys on vahvempi. Voit edelleen tarkistaa vastaajaviestit soittamalla.</string>
+  <string name="voicemail_error_bad_config_title">Visuaalisen vastaajan päivitys epäonnistui</string>
+  <string name="voicemail_error_bad_config_message">Voit silti tarkistaa vastaajaviestit soittamalla.</string>
+  <string name="voicemail_error_communication_title">Visuaalisen vastaajan päivitys epäonnistui</string>
+  <string name="voicemail_error_communication_message">Voit silti tarkistaa vastaajaviestit soittamalla.</string>
+  <string name="voicemail_error_server_connection_title">Visuaalisen vastaajan päivitys epäonnistui</string>
+  <string name="voicemail_error_server_connection_message">Voit silti tarkistaa vastaajaviestit soittamalla.</string>
+  <string name="voicemail_error_server_title">Visuaalisen vastaajan päivitys epäonnistui</string>
+  <string name="voicemail_error_server_message">Voit silti tarkistaa vastaajaviestit soittamalla.</string>
+  <string name="voicemail_error_inbox_near_full_title">Postilaatikko lähes täynnä</string>
+  <string name="voicemail_error_inbox_near_full_message">Uusia vastaajaviestejä ei voi vastaanottaa, jos postilaatikko on täynnä.</string>
+  <string name="voicemail_error_inbox_full_title">Uusien vastaajaviestien vastaanottaminen ei onnistu</string>
+  <string name="voicemail_error_inbox_full_message">Postilaatikkosi on täynnä. Poista viestejä, jotta voit vastaanottaa uusia vastaajaviestejä.</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_title">Ota käyttöön lisätallennustila ja ‑varmuuskopiointi</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_message">Postilaatikkosi on täynnä. Jos haluat vapauttaa tilaa, ota käyttöön lisätallennustila, niin Google voi hallinnoida ja varmuuskopioida vastaajaviestisi.</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_title">Ota käyttöön lisätallennustila ja ‑varmuuskopiointi</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_message">Postilaatikkosi on lähes täynnä. Jos haluat vapauttaa tilaa, ota käyttöön lisätallennustila, niin Google voi hallinnoida ja varmuuskopioida vastaajaviestisi.</string>
+  <string name="voicemail_error_pin_not_set_title">Aseta vastaajan PIN-koodi</string>
+  <string name="voicemail_error_pin_not_set_message">Vastaajan PIN-koodi on annettava aina, kun käytät vastaajaa.</string>
+  <string name="voicemail_action_turn_off_airplane_mode">Lentokonetilan asetukset</string>
+  <string name="voicemail_action_set_pin">Aseta PIN-koodi</string>
+  <string name="voicemail_action_retry">Yritä uudelleen</string>
+  <string name="voicemail_action_turn_archive_on">Ota käyttöön</string>
+  <string name="voicemail_action_dimiss">Ei kiitos</string>
+  <string name="voicemail_action_sync">Synkronoi</string>
+  <string name="voicemail_action_call_voicemail">Soita vastaajaan</string>
+  <string name="voicemail_action_call_customer_support">Soita asiakastukeen</string>
+  <string name="vvm3_error_vms_dns_failure_title">Jokin meni vikaan</string>
+  <string name="vvm3_error_vms_dns_failure_message">Tapahtui virhe. Yritä myöhemmin uudelleen. Jos ongelma jatkuu, ota yhteyttä asiakaspalveluun numerossa %1$s ja ilmoita virhekoodi 9001.</string>
+  <string name="vvm3_error_vmg_dns_failure_title">Jokin meni vikaan</string>
+  <string name="vvm3_error_vmg_dns_failure_message">Tapahtui virhe. Yritä myöhemmin uudelleen. Jos ongelma jatkuu, ota yhteyttä asiakaspalveluun numerossa %1$s ja ilmoita virhekoodi 9002.</string>
+  <string name="vvm3_error_spg_dns_failure_title">Jokin meni vikaan</string>
+  <string name="vvm3_error_spg_dns_failure_message">Tapahtui virhe. Yritä myöhemmin uudelleen. Jos ongelma jatkuu, ota yhteyttä asiakaspalveluun numerossa %1$s ja ilmoita virhekoodi 9003.</string>
+  <string name="vvm3_error_vms_no_cellular_title">Vastaajaviestien postilaatikkoon ei saada yhteyttä</string>
+  <string name="vvm3_error_vms_no_cellular_message">Valitettavasti vastaajaviesteihisi ei saada yhteyttä. Jos olet alueella, jossa signaali on heikko, yritä uudelleen, kun pääset vahvemman signaalin alueelle. Jos ongelma jatkuu, ota yhteyttä asiakaspalveluun numerossa %1$s ja ilmoita virhekoodi 9004.</string>
+  <string name="vvm3_error_vmg_no_cellular_title">Vastaajaviestien postilaatikkoon ei saada yhteyttä</string>
+  <string name="vvm3_error_vmg_no_cellular_message">Valitettavasti vastaajaviesteihisi ei saada yhteyttä. Jos olet alueella, jossa signaali on heikko, yritä uudelleen, kun pääset vahvemman signaalin alueelle. Jos ongelma jatkuu, ota yhteyttä asiakaspalveluun numerossa %1$s ja ilmoita virhekoodi 9005.</string>
+  <string name="vvm3_error_spg_no_cellular_title">Vastaajaviestien postilaatikkoon ei saada yhteyttä</string>
+  <string name="vvm3_error_spg_no_cellular_message">Valitettavasti vastaajaviesteihisi ei saada yhteyttä. Jos olet alueella, jossa signaali on heikko, yritä uudelleen, kun pääset vahvemman signaalin alueelle. Jos ongelma jatkuu, ota yhteyttä asiakaspalveluun numerossa %1$s ja ilmoita virhekoodi 9006.</string>
+  <string name="vvm3_error_vms_timeout_title">Jokin meni vikaan</string>
+  <string name="vvm3_error_vms_timeout_message">Tapahtui virhe. Yritä myöhemmin uudelleen. Jos ongelma jatkuu, ota yhteyttä asiakaspalveluun numerossa %1$s ja ilmoita virhekoodi 9007.</string>
+  <string name="vvm3_error_vmg_timeout_title">Jokin meni vikaan</string>
+  <string name="vvm3_error_vmg_timeout_message">Tapahtui virhe. Yritä myöhemmin uudelleen. Jos ongelma jatkuu, ota yhteyttä asiakaspalveluun numerossa %1$s ja ilmoita virhekoodi 9008.</string>
+  <string name="vvm3_error_status_sms_timeout_title">Jokin meni vikaan</string>
+  <string name="vvm3_error_status_sms_timeout_message">Palvelun asetusten määrittäminen ei onnistunut. Yritä myöhemmin uudelleen. Jos ongelma jatkuu, ota yhteyttä asiakaspalveluun numerossa %1$s ja ilmoita virhekoodi 9009.</string>
+  <string name="vvm3_error_subscriber_blocked_title">Vastaajaviestien postilaatikkoon ei saada yhteyttä</string>
+  <string name="vvm3_error_subscriber_blocked_message">Valitettavasti vastaajaviesteihisi ei juuri nyt saada yhteyttä. Yritä myöhemmin uudelleen. Jos ongelma jatkuu, ota yhteyttä asiakaspalveluun numerossa %1$s ja ilmoita virhekoodi 9990.</string>
+  <string name="vvm3_error_unknown_user_title">Määritä vastaaja.</string>
+  <string name="vvm3_error_unknown_user_message">Tilillesi ei ole määritetty vastaajaa. Ota yhteyttä asiakaspalveluun numerossa %1$s ja ilmoita virhekoodi 9991.</string>
+  <string name="vvm3_error_unknown_device_title">Vastaaja</string>
+  <string name="vvm3_error_unknown_device_message">Visuaalista vastaajaa ei voi käyttää tässä laitteessa. Ota yhteyttä asiakaspalveluun numerossa %1$s ja ilmoita virhekoodi 9992.</string>
+  <string name="vvm3_error_invalid_password_title">Jokin meni vikaan</string>
+  <string name="vvm3_error_invalid_password_message">Ota yhteyttä asiakaspalveluun numerossa %1$s ja ilmoita virhekoodi 9993.</string>
+  <string name="vvm3_error_mailbox_not_initialized_title">Visuaalinen vastaaja</string>
+  <string name="vvm3_error_mailbox_not_initialized_message">Jotta voit määrittää visuaalisen vastaajan loppuun, ota yhteyttä asiakaspalveluun numerossa %1$s ja ilmoita virhekoodi 9994.</string>
+  <string name="vvm3_error_service_not_provisioned_title">Visuaalinen vastaaja</string>
+  <string name="vvm3_error_service_not_provisioned_message">Jotta voit määrittää visuaalisen vastaajan loppuun, ota yhteyttä asiakaspalveluun numerossa %1$s ja ilmoita virhekoodi 9995.</string>
+  <string name="vvm3_error_service_not_activated_title">Visuaalinen vastaaja</string>
+  <string name="vvm3_error_service_not_activated_message">Jos haluat aktivoida visuaalisen vastaajan, ota yhteyttä asiakaspalveluun numerossa %1$s ja ilmoita virhekoodi 9996.</string>
+  <string name="vvm3_error_user_blocked_title">Jokin meni vikaan</string>
+  <string name="vvm3_error_user_blocked_message">Jotta voit määrittää visuaalisen vastaajan loppuun, ota yhteyttä asiakaspalveluun numerossa %1$s ja ilmoita virhekoodi 9998.</string>
+  <string name="vvm3_error_subscriber_unknown_title">Visuaalinen vastaaja on poistettu käytöstä</string>
+  <string name="vvm3_error_subscriber_unknown_message">Aktivoi visuaalinen vastaaja ottamalla yhteys asiakaspalveluun numerossa %1$s.</string>
+  <string name="vvm3_error_imap_getquota_error_title">Jokin meni vikaan</string>
+  <string name="vvm3_error_imap_getquota_error_message">Ota yhteyttä asiakaspalveluun numerossa %1$s ja ilmoita virhekoodi 9997.</string>
+  <string name="vvm3_error_imap_select_error_title">Jokin meni vikaan</string>
+  <string name="vvm3_error_imap_select_error_message">Ota yhteyttä asiakaspalveluun numerossa %1$s ja ilmoita virhekoodi 9989.</string>
+  <string name="vvm3_error_imap_error_title">Jokin meni vikaan</string>
+  <string name="vvm3_error_imap_error_message">Ota yhteyttä asiakaspalveluun numerossa %1$s ja ilmoita virhekoodi 9999.</string>
+  <string name="verizon_terms_and_conditions_title">Visuaalisen vastaajan käyttöönotto</string>
+  <string name="verizon_terms_and_conditions_message">%1$s Ottamalla visuaalisen vastaajan käyttöön hyväksyt Verizon Wirelessin käyttöehdot:\n\n%2$s</string>
+  <string name="dialer_terms_and_conditions_title">Visuaalisen vastaajan käyttöönotto</string>
+  <string name="dialer_terms_and_conditions_existing_user_title">Uutta! Lue vastaajaviestisi</string>
+  <string name="dialer_terms_and_conditions_message">%s</string>
+  <string name="dialer_terms_and_conditions_1.0">Voit tarkistaa ja kuunnella viestisi soittamatta vastaajaan. Googlen maksuton transkriptiopalvelu tarjoaa vastaajaviestiesi transkriptiot. Voit poistaa vastaajan tai transkriptiot käytöstä milloin tahansa Asetuksista. %s</string>
+  <string name="dialer_terms_and_conditions_existing_user">Googlen maksuton transkriptiopalvelu tarjoaa vastaajaviestiesi transkriptiot. Voit poistaa palvelun käytöstä milloin tahansa Asetuksista. %s</string>
+  <string name="dialer_terms_and_conditions_for_verizon_1.0">Voit tarkistaa ja kuunnella viestisi soittamatta vastaajaan.</string>
+  <string name="dialer_terms_and_conditions_learn_more">Lisätietoja</string>
+  <string name="dialer_terms_and_conditions_existing_user_ack">Selvä</string>
+  <string name="dialer_terms_and_conditions_existing_user_decline">Ei kiitos</string>
+  <string name="terms_and_conditions_decline_dialog_title">Poistetaanko visuaalinen vastaaja käytöstä?</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_message">Visuaalinen vastaaja poistetaan käytöstä, jos käyttöehtoja ei hyväksytä.</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_downgrade">Poista käytöstä</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_message">Visuaalinen vastaaja poistetaan käytöstä, jos otat sen pois päältä.</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_downgrade">Poista käytöstä</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message">Vastaaja on käytettävissä vain soittamalla numeroon *86. Jatka asettamalla vastaajalle uusi PIN-koodi.</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin">Aseta PIN-koodi</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/error/res/values-fr-rCA/strings.xml b/java/com/android/dialer/voicemail/listui/error/res/values-fr-rCA/strings.xml
new file mode 100644
index 0000000..c7eacce
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/error/res/values-fr-rCA/strings.xml
@@ -0,0 +1,102 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_error_activating_title">Activation de la messagerie vocale visuelle en cours…</string>
+  <string name="voicemail_error_activating_message">Vous ne recevrez peut-être aucune notification de la messagerie vocale tant que la messagerie vocale visuelle ne sera pas complètement activée. Appelez la messagerie vocale pour récupérer les nouveaux messages jusqu\'à son activation complète.</string>
+  <string name="voicemail_error_not_activate_no_signal_title">Impossible d\'activer la messagerie vocale visuelle</string>
+  <string name="voicemail_error_not_activate_no_signal_message">Assurez-vous que votre téléphone dispose d\'une connexion réseau cellulaire et réessayez.</string>
+  <string name="voicemail_error_not_activate_no_signal_airplane_mode_message">Désactivez le mode Avion et réessayez.</string>
+  <string name="voicemail_error_no_signal_title">Aucune connexion</string>
+  <string name="voicemail_error_no_signal_message">Vous ne recevrez pas de notification à l\'arrivée de nouveaux messages vocaux. Si vous utilisez le Wi-Fi, vous pouvez vérifier si vous avez de nouveaux messages vocaux en effectuant une synchronisation.</string>
+  <string name="voicemail_error_no_signal_airplane_mode_message">Vous ne recevrez pas de notification à l\'arrivée de nouveaux messages vocaux. Désactivez le mode Avion pour synchroniser votre messagerie vocale.</string>
+  <string name="voicemail_error_no_signal_cellular_required_message">Votre téléphone requiert une connexion de données mobiles pour que vous puissiez consulter la messagerie vocale.</string>
+  <string name="voicemail_error_activation_failed_title">Impossible d\'activer la messagerie vocale visuelle</string>
+  <string name="voicemail_error_activation_failed_message">Vous pouvez tout de même appeler pour consulter votre messagerie vocale.</string>
+  <string name="voicemail_error_no_data_title">Impossible de mettre à jour la messagerie vocale visuelle</string>
+  <string name="voicemail_error_no_data_message">Réessayez lorsque votre connexion Wi-Fi ou de données mobiles sera meilleure. Vous pouvez tout de même appeler pour consulter votre messagerie vocale.</string>
+  <string name="voicemail_error_no_data_cellular_required_message">Réessayez lorsque votre connexion de données mobiles sera meilleure. Vous pouvez tout de même appeler pour consulter votre messagerie vocale.</string>
+  <string name="voicemail_error_bad_config_title">Impossible de mettre à jour la messagerie vocale visuelle</string>
+  <string name="voicemail_error_bad_config_message">Vous pouvez tout de même appeler pour consulter votre messagerie vocale.</string>
+  <string name="voicemail_error_communication_title">Impossible de mettre à jour la messagerie vocale visuelle</string>
+  <string name="voicemail_error_communication_message">Vous pouvez tout de même appeler pour consulter votre messagerie vocale.</string>
+  <string name="voicemail_error_server_connection_title">Impossible de mettre à jour la messagerie vocale visuelle</string>
+  <string name="voicemail_error_server_connection_message">Vous pouvez tout de même appeler pour consulter votre messagerie vocale.</string>
+  <string name="voicemail_error_server_title">Impossible de mettre à jour la messagerie vocale visuelle</string>
+  <string name="voicemail_error_server_message">Vous pouvez tout de même appeler pour consulter votre messagerie vocale.</string>
+  <string name="voicemail_error_inbox_near_full_title">Boîte de réception presque pleine</string>
+  <string name="voicemail_error_inbox_near_full_message">Vous ne pourrez pas recevoir de nouveaux messages vocaux si votre boîte de réception est pleine.</string>
+  <string name="voicemail_error_inbox_full_title">Impossible de recevoir de nouveaux messages vocaux</string>
+  <string name="voicemail_error_inbox_full_message">Votre boîte de réception est pleine. Essayez de supprimer des messages pour pouvoir recevoir de nouveaux messages vocaux.</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_title">Activer l\'espace supplémentaire de stockage et de sauvegarde</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_message">Votre boîte aux lettres est pleine. Pour libérer de l\'espace, activez l\'espace de stockage supplémentaire pour que Google puisse gérer et sauvegarder vos messages vocaux.</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_title">Activer l\'espace supplémentaire de stockage et de sauvegarde</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_message">Votre boîte aux lettres est presque pleine. Pour libérer de l\'espace, activez l\'espace de stockage supplémentaire pour que Google puisse gérer et sauvegarder vos messages vocaux.</string>
+  <string name="voicemail_error_pin_not_set_title">Définir votre NIP de messagerie vocale</string>
+  <string name="voicemail_error_pin_not_set_message">Vous devrez entrer un NIP de messagerie vocale chaque fois que vous appelez pour accéder à vos messages vocaux.</string>
+  <string name="voicemail_action_turn_off_airplane_mode">Paramètres du mode Avion</string>
+  <string name="voicemail_action_set_pin">Définir un NIP</string>
+  <string name="voicemail_action_retry">Réessayer</string>
+  <string name="voicemail_action_turn_archive_on">Activer</string>
+  <string name="voicemail_action_dimiss">Non, merci</string>
+  <string name="voicemail_action_sync">Synchroniser</string>
+  <string name="voicemail_action_call_voicemail">Appeler la messagerie vocale</string>
+  <string name="voicemail_action_call_customer_support">Appeler le service à la clientèle</string>
+  <string name="vvm3_error_vms_dns_failure_title">Une erreur s\'est produite</string>
+  <string name="vvm3_error_vms_dns_failure_message">Désolés, un problème est survenu. Veuillez réessayer plus tard. Si le problème persiste, veuillez communiquer avec le service à la clientèle au numéro %1$s et lui indiquer que le code d\'erreur est le 9001.</string>
+  <string name="vvm3_error_vmg_dns_failure_title">Une erreur s\'est produite</string>
+  <string name="vvm3_error_vmg_dns_failure_message">Désolés, un problème est survenu. Veuillez réessayer plus tard. Si le problème persiste, veuillez communiquer avec le service à la clientèle au numéro %1$s et lui indiquer que le code d\'erreur est le 9002.</string>
+  <string name="vvm3_error_spg_dns_failure_title">Une erreur s\'est produite</string>
+  <string name="vvm3_error_spg_dns_failure_message">Désolés, un problème est survenu. Veuillez réessayer plus tard. Si le problème persiste, veuillez communiquer avec le service à la clientèle au numéro %1$s et lui indiquer que le code d\'erreur est le 9003.</string>
+  <string name="vvm3_error_vms_no_cellular_title">Impossible de se connecter à votre messagerie vocale</string>
+  <string name="vvm3_error_vms_no_cellular_message">Désolés, nous éprouvons des difficultés à nous connecter à votre messagerie vocale. Si vous vous trouvez dans une zone où le signal est faible, attendez d\'en obtenir un meilleur et réessayez. Si le problème persiste, veuillez communiquer avec le service à la clientèle au numéro %1$s et lui indiquer que le code d\'erreur est le 9004.</string>
+  <string name="vvm3_error_vmg_no_cellular_title">Impossible de se connecter à votre messagerie vocale</string>
+  <string name="vvm3_error_vmg_no_cellular_message">Désolés, nous éprouvons des difficultés à nous connecter à votre messagerie vocale. Si vous vous trouvez dans une zone où le signal est faible, attendez d\'en obtenir un meilleur et réessayez. Si le problème persiste, veuillez communiquer avec le service à la clientèle au numéro %1$s et lui indiquer que le code d\'erreur est le 9005.</string>
+  <string name="vvm3_error_spg_no_cellular_title">Impossible de se connecter à votre messagerie vocale</string>
+  <string name="vvm3_error_spg_no_cellular_message">Désolés, nous éprouvons des difficultés à nous connecter à votre messagerie vocale. Si vous vous trouvez dans une zone où le signal est faible, attendez d\'en obtenir un meilleur et réessayez. Si le problème persiste, veuillez communiquer avec le service à la clientèle au numéro %1$s et lui indiquer que le code d\'erreur est le 9006.</string>
+  <string name="vvm3_error_vms_timeout_title">Une erreur s\'est produite</string>
+  <string name="vvm3_error_vms_timeout_message">Désolés, un problème est survenu. Veuillez réessayer plus tard. Si le problème persiste, veuillez communiquer avec le service à la clientèle au numéro %1$s et lui indiquer que le code d\'erreur est le 9007.</string>
+  <string name="vvm3_error_vmg_timeout_title">Une erreur s\'est produite</string>
+  <string name="vvm3_error_vmg_timeout_message">Désolés, un problème est survenu. Veuillez réessayer plus tard. Si le problème persiste, veuillez communiquer avec le service à la clientèle au numéro %1$s et lui indiquer que le code d\'erreur est le 9008.</string>
+  <string name="vvm3_error_status_sms_timeout_title">Une erreur s\'est produite</string>
+  <string name="vvm3_error_status_sms_timeout_message">Désolés, nous éprouvons des difficultés à configurer votre service. Veuillez réessayer plus tard. Si le problème persiste, veuillez communiquer avec le service à la clientèle au numéro %1$s et lui indiquer que le code d\'erreur est le 9009.</string>
+  <string name="vvm3_error_subscriber_blocked_title">Impossible de se connecter à votre messagerie vocale</string>
+  <string name="vvm3_error_subscriber_blocked_message">Désolés, nous ne sommes pas en mesure de nous connecter à votre messagerie vocale pour le moment. Veuillez réessayer plus tard. Si le problème persiste, veuillez communiquer avec le service à la clientèle au numéro %1$s et lui indiquer que le code d\'erreur est le 9990.</string>
+  <string name="vvm3_error_unknown_user_title">Configurer la messagerie vocale</string>
+  <string name="vvm3_error_unknown_user_message">La messagerie vocale n\'est pas configurée sur votre compte. Veuillez communiquer avec le service à la clientèle au numéro %1$s et lui indiquer que le code d\'erreur est le 9991.</string>
+  <string name="vvm3_error_unknown_device_title">Messagerie vocale</string>
+  <string name="vvm3_error_unknown_device_message">Vous ne pouvez pas utiliser la messagerie vocale visuelle sur cet appareil. Veuillez communiquer avec le service à la clientèle au numéro %1$s et lui indiquer que le code d\'erreur est le 9992.</string>
+  <string name="vvm3_error_invalid_password_title">Une erreur s\'est produite</string>
+  <string name="vvm3_error_invalid_password_message">Veuillez communiquer avec le service à la clientèle au numéro %1$s et lui indiquer que le code d\'erreur est le 9993.</string>
+  <string name="vvm3_error_mailbox_not_initialized_title">Messagerie vocale visuelle</string>
+  <string name="vvm3_error_mailbox_not_initialized_message">Pour terminer la configuration de la messagerie vocale visuelle, veuillez communiquer avec le service à la clientèle au numéro %1$s et lui indiquer que le code d\'erreur est le 9994.</string>
+  <string name="vvm3_error_service_not_provisioned_title">Messagerie vocale visuelle</string>
+  <string name="vvm3_error_service_not_provisioned_message">Pour terminer la configuration de la messagerie vocale visuelle, veuillez communiquer avec le service à la clientèle au numéro %1$s et lui indiquer que le code d\'erreur est le 9995.</string>
+  <string name="vvm3_error_service_not_activated_title">Messagerie vocale visuelle</string>
+  <string name="vvm3_error_service_not_activated_message">Pour activer la messagerie vocale visuelle, veuillez communiquer avec le service à la clientèle au numéro %1$s et lui indiquer que le code d\'erreur est le 9996.</string>
+  <string name="vvm3_error_user_blocked_title">Une erreur s\'est produite</string>
+  <string name="vvm3_error_user_blocked_message">Pour terminer la configuration de la messagerie vocale visuelle, veuillez communiquer avec le service à la clientèle au numéro %1$s et lui indiquer que le code d\'erreur est le 9998.</string>
+  <string name="vvm3_error_subscriber_unknown_title">La messagerie vocale visuelle est désactivée</string>
+  <string name="vvm3_error_subscriber_unknown_message">Veuillez communiquer avec le service à la clientèle au numéro %1$s pour activer la messagerie vocale visuelle.</string>
+  <string name="vvm3_error_imap_getquota_error_title">Une erreur s\'est produite</string>
+  <string name="vvm3_error_imap_getquota_error_message">Veuillez communiquer avec le service à la clientèle au numéro %1$s et lui indiquer que le code d\'erreur est le 9997.</string>
+  <string name="vvm3_error_imap_select_error_title">Une erreur s\'est produite</string>
+  <string name="vvm3_error_imap_select_error_message">Veuillez communiquer avec le service à la clientèle au numéro %1$s et lui indiquer que le code d\'erreur est le 9989.</string>
+  <string name="vvm3_error_imap_error_title">Une erreur s\'est produite</string>
+  <string name="vvm3_error_imap_error_message">Veuillez communiquer avec le service à la clientèle au numéro %1$s et lui indiquer que le code d\'erreur est le 9999.</string>
+  <string name="verizon_terms_and_conditions_title">Activer la messagerie vocale visuelle</string>
+  <string name="verizon_terms_and_conditions_message">%1$s En activant la messagerie vocale visuelle, vous acceptez les conditions d\'utilisation de Verizon Wireless :\n\n%2$s</string>
+  <string name="dialer_terms_and_conditions_title">Activer la messagerie vocale visuelle</string>
+  <string name="dialer_terms_and_conditions_existing_user_title">Nouveau! Lisez vos messages vocaux</string>
+  <string name="dialer_terms_and_conditions_message">%s</string>
+  <string name="dialer_terms_and_conditions_1.0">Affichez et écoutez vos messages, sans devoir appeler la messagerie vocale. Des transcriptions de vos messages vocaux sont fournies par le service de transcription gratuit de Google. Vous pouvez désactiver l\'une ou l\'autre option dans les paramètres à tout moment. %s</string>
+  <string name="dialer_terms_and_conditions_existing_user">Des transcriptions de vos messages vocaux sont maintenant fournies par le service de transcription gratuit de Google. Vous pouvez désactiver cette option dans les paramètres à tout moment. %s</string>
+  <string name="dialer_terms_and_conditions_for_verizon_1.0">Affichez et écoutez vos messages, sans devoir appeler la messagerie vocale.</string>
+  <string name="dialer_terms_and_conditions_learn_more">En savoir plus</string>
+  <string name="dialer_terms_and_conditions_existing_user_ack">OK</string>
+  <string name="dialer_terms_and_conditions_existing_user_decline">Non, merci</string>
+  <string name="terms_and_conditions_decline_dialog_title">Désactiver la messagerie vocale visuelle?</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_message">Si les conditions d\'utilisation sont refusées, la messagerie vocale visuelle sera désactivée.</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_downgrade">Désactiver</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_message">Si vous désactivez la messagerie vocale visuelle, vous n\'y aurez plus accès.</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_downgrade">Désactiver</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message">Pour accéder à la messagerie vocale, vous devrez composer *86. Définissez un nouveau NIP de messagerie vocale pour continuer.</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin">Définir un NIP</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/error/res/values-fr/strings.xml b/java/com/android/dialer/voicemail/listui/error/res/values-fr/strings.xml
new file mode 100644
index 0000000..4315725
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/error/res/values-fr/strings.xml
@@ -0,0 +1,102 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_error_activating_title">Activation de la messagerie vocale visuelle…</string>
+  <string name="voicemail_error_activating_message">Tant que la messagerie vocale visuelle n\'est pas totalement activée, vous risquez de ne pas être averti de la réception de nouveaux messages. Appelez votre boîte vocale pour les consulter.</string>
+  <string name="voicemail_error_not_activate_no_signal_title">Impossible d\'activer la messagerie vocale visuelle</string>
+  <string name="voicemail_error_not_activate_no_signal_message">Vérifiez que votre téléphone est bien connecté au réseau mobile, puis réessayez.</string>
+  <string name="voicemail_error_not_activate_no_signal_airplane_mode_message">Désactivez le mode Avion, puis réessayez.</string>
+  <string name="voicemail_error_no_signal_title">Aucune connexion</string>
+  <string name="voicemail_error_no_signal_message">Vous ne recevrez aucune notification en cas de nouveau message vocal. Si vous êtes connecté en Wi-Fi, vous pouvez effectuer une synchronisation pour savoir si vous en avez reçu.</string>
+  <string name="voicemail_error_no_signal_airplane_mode_message">Vous ne recevrez aucune notification en cas de nouveau message. Désactivez le mode Avion pour synchroniser votre messagerie vocale.</string>
+  <string name="voicemail_error_no_signal_cellular_required_message">Vous devez disposer d\'une connexion de données mobiles pour consulter votre messagerie vocale.</string>
+  <string name="voicemail_error_activation_failed_title">Impossible d\'activer la messagerie vocale visuelle</string>
+  <string name="voicemail_error_activation_failed_message">La consultation de votre messagerie vocale par téléphone est toujours possible.</string>
+  <string name="voicemail_error_no_data_title">Impossible de mettre à jour la messagerie vocale visuelle</string>
+  <string name="voicemail_error_no_data_message">Réessayez lorsque vous bénéficierez d\'une meilleure connexion au réseau mobile ou Wi-Fi. Vous pouvez tout de même consulter votre messagerie vocale par téléphone.</string>
+  <string name="voicemail_error_no_data_cellular_required_message">Réessayez lorsque vous bénéficierez d\'une meilleure connexion de données mobiles. Vous pouvez tout de même consulter votre messagerie vocale par téléphone.</string>
+  <string name="voicemail_error_bad_config_title">Impossible de mettre à jour la messagerie vocale visuelle</string>
+  <string name="voicemail_error_bad_config_message">La consultation de votre messagerie vocale par téléphone est toujours possible.</string>
+  <string name="voicemail_error_communication_title">Impossible de mettre à jour la messagerie vocale visuelle</string>
+  <string name="voicemail_error_communication_message">La consultation de votre messagerie vocale par téléphone est toujours possible.</string>
+  <string name="voicemail_error_server_connection_title">Impossible de mettre à jour la messagerie vocale visuelle</string>
+  <string name="voicemail_error_server_connection_message">La consultation de votre messagerie vocale par téléphone est toujours possible.</string>
+  <string name="voicemail_error_server_title">Impossible de mettre à jour la messagerie vocale visuelle</string>
+  <string name="voicemail_error_server_message">La consultation de votre messagerie vocale par téléphone est toujours possible.</string>
+  <string name="voicemail_error_inbox_near_full_title">Boîte de réception presque pleine</string>
+  <string name="voicemail_error_inbox_near_full_message">Vous ne pouvez pas recevoir de nouveaux messages vocaux si votre boîte de réception est pleine.</string>
+  <string name="voicemail_error_inbox_full_title">Impossible de recevoir de nouveaux messages vocaux</string>
+  <string name="voicemail_error_inbox_full_message">Votre boîte de réception est pleine. Supprimez des messages vocaux pour pouvoir en recevoir de nouveaux.</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_title">Activer l\'espace de stockage supplémentaire et la sauvegarde</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_message">Votre boîte aux lettres est pleine. Pour libérer de l\'espace, activez l\'espace de stockage supplémentaire. Google pourra ainsi gérer vos messages vocaux et les sauvegarder.</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_title">Activer l\'espace de stockage supplémentaire et la sauvegarde</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_message">Votre boîte aux lettres est presque pleine. Pour libérer de l\'espace, activez l\'espace de stockage supplémentaire. Google pourra ainsi gérer vos messages vocaux et les sauvegarder.</string>
+  <string name="voicemail_error_pin_not_set_title">Définir le code secret de votre messagerie vocale</string>
+  <string name="voicemail_error_pin_not_set_message">Vous devrez saisir ce code secret chaque fois que vous consulterez votre messagerie vocale.</string>
+  <string name="voicemail_action_turn_off_airplane_mode">Paramètres du mode Avion</string>
+  <string name="voicemail_action_set_pin">Définir le code secret</string>
+  <string name="voicemail_action_retry">Réessayer</string>
+  <string name="voicemail_action_turn_archive_on">Activer</string>
+  <string name="voicemail_action_dimiss">Non merci</string>
+  <string name="voicemail_action_sync">Synchroniser</string>
+  <string name="voicemail_action_call_voicemail">Appeler la messagerie vocale</string>
+  <string name="voicemail_action_call_customer_support">Contacter le service client</string>
+  <string name="vvm3_error_vms_dns_failure_title">Problème</string>
+  <string name="vvm3_error_vms_dns_failure_message">Une erreur s\'est produite. Réessayez ultérieurement. Si le problème persiste, veuillez contacter le service client au %1$s. Le code d\'erreur à transmettre au conseiller est le 9001.</string>
+  <string name="vvm3_error_vmg_dns_failure_title">Problème</string>
+  <string name="vvm3_error_vmg_dns_failure_message">Une erreur s\'est produite. Réessayez ultérieurement. Si le problème persiste, veuillez contacter le service client au %1$s. Le code d\'erreur à transmettre au conseiller est le 9002.</string>
+  <string name="vvm3_error_spg_dns_failure_title">Problème</string>
+  <string name="vvm3_error_spg_dns_failure_message">Une erreur s\'est produite. Réessayez ultérieurement. Si le problème persiste, veuillez contacter le service client au %1$s. Le code d\'erreur à transmettre au conseiller est le 9003.</string>
+  <string name="vvm3_error_vms_no_cellular_title">Impossible de se connecter à votre boîte vocale</string>
+  <string name="vvm3_error_vms_no_cellular_message">Malheureusement, nous n\'arrivons pas à établir de connexion à votre boîte vocale. Si vous vous trouvez dans une zone où le signal est faible, attendez de capter un bon signal pour réessayer. Si le problème persiste, veuillez contacter le service client au %1$s (le code d\'erreur à transmettre au conseiller est le 9004).</string>
+  <string name="vvm3_error_vmg_no_cellular_title">Impossible de se connecter à votre boîte vocale</string>
+  <string name="vvm3_error_vmg_no_cellular_message">Malheureusement, nous n\'arrivons pas à établir de connexion à votre boîte vocale. Si vous vous trouvez dans une zone où le signal est faible, attendez de capter un bon signal pour réessayer. Si le problème persiste, veuillez contacter le service client au %1$s (le code d\'erreur à transmettre au conseiller est le 9005).</string>
+  <string name="vvm3_error_spg_no_cellular_title">Impossible de se connecter à votre boîte vocale</string>
+  <string name="vvm3_error_spg_no_cellular_message">Malheureusement, nous n\'arrivons pas à établir de connexion à votre boîte vocale. Si vous vous trouvez dans une zone où le signal est faible, attendez de capter un bon signal pour réessayer. Si le problème persiste, veuillez contacter le service client au %1$s (le code d\'erreur à transmettre au conseiller est le 9006).</string>
+  <string name="vvm3_error_vms_timeout_title">Problème</string>
+  <string name="vvm3_error_vms_timeout_message">Une erreur s\'est produite. Réessayez ultérieurement. Si le problème persiste, veuillez contacter le service client au %1$s. Le code d\'erreur à transmettre au conseiller est le 9007.</string>
+  <string name="vvm3_error_vmg_timeout_title">Problème</string>
+  <string name="vvm3_error_vmg_timeout_message">Une erreur s\'est produite. Réessayez ultérieurement. Si le problème persiste, veuillez contacter le service client au %1$s. Le code d\'erreur à transmettre au conseiller est le 9008.</string>
+  <string name="vvm3_error_status_sms_timeout_title">Problème</string>
+  <string name="vvm3_error_status_sms_timeout_message">Malheureusement, nous ne parvenons pas à configurer votre service. Veuillez réessayer ultérieurement. Si le problème persiste, veuillez contacter le service client au %1$s. Le code d\'erreur à transmettre au conseiller est le 9009.</string>
+  <string name="vvm3_error_subscriber_blocked_title">Impossible de se connecter à votre boîte vocale</string>
+  <string name="vvm3_error_subscriber_blocked_message">Désolé, nous ne parvenons pas à établir de connexion à votre boîte vocale pour l\'instant. Veuillez réessayer ultérieurement. Si le problème persiste, veuillez contacter le service client au %1$s (le code d\'erreur à transmettre au conseiller est le 9990).</string>
+  <string name="vvm3_error_unknown_user_title">Configurer la messagerie vocale</string>
+  <string name="vvm3_error_unknown_user_message">La messagerie vocale n\'est pas configurée sur votre compte. Veuillez contacter le service client au %1$s. Le code d\'erreur à transmettre au conseiller est le 9991.</string>
+  <string name="vvm3_error_unknown_device_title">Messagerie</string>
+  <string name="vvm3_error_unknown_device_message">Vous ne pouvez pas utiliser la messagerie vocale visuelle sur cet appareil. Veuillez contacter le service client au %1$s. Le code d\'erreur à transmettre au conseiller est le 9992.</string>
+  <string name="vvm3_error_invalid_password_title">Problème</string>
+  <string name="vvm3_error_invalid_password_message">Veuillez contacter le service client au %1$s. Le code d\'erreur à transmettre au conseiller est le 9993.</string>
+  <string name="vvm3_error_mailbox_not_initialized_title">Messagerie vocale visuelle</string>
+  <string name="vvm3_error_mailbox_not_initialized_message">Pour terminer la configuration de la messagerie vocale visuelle, veuillez contacter le service client au %1$s. Le code d\'erreur à transmettre au conseiller est le 9994.</string>
+  <string name="vvm3_error_service_not_provisioned_title">Messagerie vocale visuelle</string>
+  <string name="vvm3_error_service_not_provisioned_message">Pour terminer la configuration de la messagerie vocale visuelle, veuillez contacter le service client au %1$s. Le code d\'erreur à transmettre au conseiller est le 9995.</string>
+  <string name="vvm3_error_service_not_activated_title">Messagerie vocale visuelle</string>
+  <string name="vvm3_error_service_not_activated_message">Pour activer la messagerie vocale visuelle, veuillez contacter le service client au %1$s. Le code d\'erreur à transmettre au conseiller est le 9996.</string>
+  <string name="vvm3_error_user_blocked_title">Problème</string>
+  <string name="vvm3_error_user_blocked_message">Pour terminer la configuration de la messagerie vocale visuelle, veuillez contacter le service client au %1$s. Le code d\'erreur à transmettre au conseiller est le 9998.</string>
+  <string name="vvm3_error_subscriber_unknown_title">Messagerie vocale visuelle désactivée</string>
+  <string name="vvm3_error_subscriber_unknown_message">Pour activer la messagerie vocale visuelle, veuillez contacter le service client au %1$s.</string>
+  <string name="vvm3_error_imap_getquota_error_title">Problème</string>
+  <string name="vvm3_error_imap_getquota_error_message">Veuillez contacter le service client au %1$s. Le code d\'erreur à transmettre au conseiller est le 9997.</string>
+  <string name="vvm3_error_imap_select_error_title">Problème</string>
+  <string name="vvm3_error_imap_select_error_message">Veuillez contacter le service client au %1$s. Le code d\'erreur à transmettre au conseiller est le 9989.</string>
+  <string name="vvm3_error_imap_error_title">Problème</string>
+  <string name="vvm3_error_imap_error_message">Veuillez contacter le service client au %1$s. Le code d\'erreur à transmettre au conseiller est le 9999.</string>
+  <string name="verizon_terms_and_conditions_title">Activer la messagerie vocale visuelle</string>
+  <string name="verizon_terms_and_conditions_message">%1$s En activant la messagerie vocale visuelle, vous acceptez les conditions d\'utilisation de Verizon Wireless :\n\n%2$s</string>
+  <string name="dialer_terms_and_conditions_title">Activer la messagerie vocale visuelle</string>
+  <string name="dialer_terms_and_conditions_existing_user_title">Nouveau ! Recevez vos messages vocaux par écrit</string>
+  <string name="dialer_terms_and_conditions_message">%s</string>
+  <string name="dialer_terms_and_conditions_1.0">Affichez et écoutez vos messages, sans avoir à appeler la messagerie vocale. La transcription des messages vocaux est un service fourni gratuitement par Google. Vous pouvez à tout moment désactiver l\'une ou l\'autre des fonctionnalités dans les paramètres. %s</string>
+  <string name="dialer_terms_and_conditions_existing_user">La transcription des messages vocaux est un nouveau service fourni gratuitement par Google. Vous pouvez désactiver la fonctionnalité à tout moment dans les paramètres. %s</string>
+  <string name="dialer_terms_and_conditions_for_verizon_1.0">Affichez et écoutez vos messages, sans avoir à appeler la messagerie vocale.</string>
+  <string name="dialer_terms_and_conditions_learn_more">En savoir plus</string>
+  <string name="dialer_terms_and_conditions_existing_user_ack">OK</string>
+  <string name="dialer_terms_and_conditions_existing_user_decline">Non, merci</string>
+  <string name="terms_and_conditions_decline_dialog_title">Désactiver la messagerie vocale visuelle ?</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_message">Si vous refusez les conditions d\'utilisation, la messagerie vocale visuelle sera désactivée.</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_downgrade">Désactiver</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_message">Si vous désactivez le service, la messagerie vocale visuelle ne fonctionnera plus.</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_downgrade">Désactiver</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message">Vous ne pouvez accéder à la messagerie vocale qu\'en composant le *86. Définissez un nouveau code secret de messagerie vocale pour continuer.</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin">Définir le code secret</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/error/res/values-gl/strings.xml b/java/com/android/dialer/voicemail/listui/error/res/values-gl/strings.xml
new file mode 100644
index 0000000..6c24c1d
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/error/res/values-gl/strings.xml
@@ -0,0 +1,102 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_error_activating_title">Activando correo de voz visual</string>
+  <string name="voicemail_error_activating_message">É posible que non recibas notificacións do correo de voz ata que se active por completo o correo de voz visual. Mentres tanto, podes chamar ao correo de voz para consultar as mensaxes novas.</string>
+  <string name="voicemail_error_not_activate_no_signal_title">Non se puido activar o correo de voz visual</string>
+  <string name="voicemail_error_not_activate_no_signal_message">Asegúrate de que o teu teléfono ten unha conexión de rede móbil e téntao de novo.</string>
+  <string name="voicemail_error_not_activate_no_signal_airplane_mode_message">Desactiva o modo avión e téntao de novo.</string>
+  <string name="voicemail_error_no_signal_title">Sen conexión</string>
+  <string name="voicemail_error_no_signal_message">Non recibirás ningunha notificación dos correos de voz novos. Se estás utilizando o sinal wifi, podes comprobar o correo de voz se o sincronizas agora.</string>
+  <string name="voicemail_error_no_signal_airplane_mode_message">Non recibirás ningunha notificación dos correos de voz novos. Desactiva o modo avión para sincronizar o correo de voz.</string>
+  <string name="voicemail_error_no_signal_cellular_required_message">O teléfono necesita conexión de datos móbiles para comprobar o correo de voz.</string>
+  <string name="voicemail_error_activation_failed_title">Non se puido activar o correo de voz visual</string>
+  <string name="voicemail_error_activation_failed_message">Así e todo podes chamar para comprobar o correo de voz.</string>
+  <string name="voicemail_error_no_data_title">Non se puido actualizar o correo de voz visual</string>
+  <string name="voicemail_error_no_data_message">Téntao de novo cando a túa conexión de datos móbiles ou wifi sexa mellor. Así e todo podes chamar para comprobar o correo de voz.</string>
+  <string name="voicemail_error_no_data_cellular_required_message">Téntao de novo cando a túa conexión de datos móbiles sexa mellor. Así e todo podes chamar para comprobar o correo de voz.</string>
+  <string name="voicemail_error_bad_config_title">Non se puido actualizar o correo de voz visual</string>
+  <string name="voicemail_error_bad_config_message">Así e todo podes chamar para comprobar o correo de voz.</string>
+  <string name="voicemail_error_communication_title">Non se puido actualizar o correo de voz visual</string>
+  <string name="voicemail_error_communication_message">Así e todo podes chamar para comprobar o correo de voz.</string>
+  <string name="voicemail_error_server_connection_title">Non se puido actualizar o correo de voz visual</string>
+  <string name="voicemail_error_server_connection_message">Así e todo podes chamar para comprobar o correo de voz.</string>
+  <string name="voicemail_error_server_title">Non se puido actualizar o correo de voz visual</string>
+  <string name="voicemail_error_server_message">Así e todo podes chamar para comprobar o correo de voz.</string>
+  <string name="voicemail_error_inbox_near_full_title">A caixa de entrada está case chea</string>
+  <string name="voicemail_error_inbox_near_full_message">Non poderás recibir ningún correo de voz novo se a caixa de entrada está chea.</string>
+  <string name="voicemail_error_inbox_full_title">Non se pode recibir ningún correo de voz novo</string>
+  <string name="voicemail_error_inbox_full_message">A caixa de entrada está chea. Proba a eliminar algunhas mensaxes para recibir correos de voz novos.</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_title">Activa o almacenamento adicional e a copia de seguranza</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_message">A túa caixa de correo está chea. Para liberar espazo, activa o almacenamento adicional, de modo que Google poida xestionar as túas mensaxes do correo de voz e facer unha copia de seguranza.</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_title">Activa o almacenamento adicional e a copia de seguranza</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_message">A túa caixa de correo está case chea. Para liberar espazo, activa o almacenamento adicional, de modo que Google poida xestionar as túas mensaxes do correo de voz e facer unha copia de seguranza.</string>
+  <string name="voicemail_error_pin_not_set_title">Establece o PIN para o teu correo de voz</string>
+  <string name="voicemail_error_pin_not_set_message">Necesitarás o PIN cada vez que chames para acceder ao teu correo de voz.</string>
+  <string name="voicemail_action_turn_off_airplane_mode">Configuración do modo avión</string>
+  <string name="voicemail_action_set_pin">Establecer PIN</string>
+  <string name="voicemail_action_retry">Tentar de novo</string>
+  <string name="voicemail_action_turn_archive_on">Activar</string>
+  <string name="voicemail_action_dimiss">Non, grazas</string>
+  <string name="voicemail_action_sync">Sincronizar</string>
+  <string name="voicemail_action_call_voicemail">Chamar ao correo de voz</string>
+  <string name="voicemail_action_call_customer_support">Chamar a Atención ao cliente</string>
+  <string name="vvm3_error_vms_dns_failure_title">Produciuse un erro</string>
+  <string name="vvm3_error_vms_dns_failure_message">Vaia, tivemos un problema... Téntao de novo máis tarde. Se o problema continúa, ponte en contacto co servizo de atención ao cliente (%1$s) e indica o código de erro 9001.</string>
+  <string name="vvm3_error_vmg_dns_failure_title">Produciuse un erro</string>
+  <string name="vvm3_error_vmg_dns_failure_message">Vaia, tivemos un problema... Téntao de novo máis tarde. Se o problema continúa, ponte en contacto co servizo de atención ao cliente (%1$s) e indica o código de erro 9002.</string>
+  <string name="vvm3_error_spg_dns_failure_title">Produciuse un erro</string>
+  <string name="vvm3_error_spg_dns_failure_message">Vaia, tivemos un problema... Téntao de novo máis tarde. Se o problema continúa, ponte en contacto co servizo de atención ao cliente (%1$s) e indica o código de erro 9003.</string>
+  <string name="vvm3_error_vms_no_cellular_title">Non se puido conectar coa caixa de entrada do teu correo de voz</string>
+  <string name="vvm3_error_vms_no_cellular_message">Produciuse un problema ao conectar coa caixa de entrada do teu correo de voz. Se te encontras nunha zona con pouca cobertura, agarda ata ter mellor sinal e téntao de novo. Se o problema continúa, ponte en contacto co servizo de atención ao cliente (%1$s) e indica o código de erro 9004.</string>
+  <string name="vvm3_error_vmg_no_cellular_title">Non se puido conectar coa caixa de entrada do teu correo de voz</string>
+  <string name="vvm3_error_vmg_no_cellular_message">Produciuse un problema ao conectar coa caixa de entrada do teu correo de voz. Se te encontras nunha zona con pouca cobertura, agarda ata ter mellor sinal e téntao de novo. Se o problema continúa, ponte en contacto co servizo de atención ao cliente (%1$s) e indica o código de erro 9005.</string>
+  <string name="vvm3_error_spg_no_cellular_title">Non se puido conectar coa caixa de entrada do teu correo de voz</string>
+  <string name="vvm3_error_spg_no_cellular_message">Produciuse un problema ao conectar coa caixa de entrada do teu correo de voz. Se te encontras nunha zona con pouca cobertura, agarda ata ter mellor sinal e téntao de novo. Se o problema continúa, ponte en contacto co servizo de atención ao cliente (%1$s) e indica o código de erro 9006.</string>
+  <string name="vvm3_error_vms_timeout_title">Produciuse un erro</string>
+  <string name="vvm3_error_vms_timeout_message">Vaia, tivemos un problema... Téntao de novo máis tarde. Se o problema continúa, ponte en contacto co servizo de atención ao cliente (%1$s) e indica o código de erro 9007.</string>
+  <string name="vvm3_error_vmg_timeout_title">Produciuse un erro</string>
+  <string name="vvm3_error_vmg_timeout_message">Vaia, tivemos un problema... Téntao de novo máis tarde. Se o problema continúa, ponte en contacto co servizo de atención ao cliente (%1$s) e indica o código de erro 9008.</string>
+  <string name="vvm3_error_status_sms_timeout_title">Produciuse un erro</string>
+  <string name="vvm3_error_status_sms_timeout_message">Vaia, tivemos un problema ao configurar o teu servizo... Téntao de novo máis tarde. Se o problema continúa, ponte en contacto co servizo de atención ao cliente (%1$s) e indica o código de erro 9009.</string>
+  <string name="vvm3_error_subscriber_blocked_title">Non se puido conectar coa caixa de entrada do teu correo de voz</string>
+  <string name="vvm3_error_subscriber_blocked_message">Non se puido conectar coa caixa de entrada do teu correo de voz. Téntao de novo máis tarde. Se o problema continúa, ponte en contacto co servizo de atención ao cliente (%1$s) e indica o código de erro 9990.</string>
+  <string name="vvm3_error_unknown_user_title">Configura o correo de voz</string>
+  <string name="vvm3_error_unknown_user_message">O correo de voz non está configurado para a túa conta. Ponte en contacto co servizo de atención ao cliente (%1$s) e indica o código de erro 9991.</string>
+  <string name="vvm3_error_unknown_device_title">Correo de voz</string>
+  <string name="vvm3_error_unknown_device_message">Non se pode usar o correo de voz visual neste dispositivo. Ponte en contacto co servizo de atención ao cliente (%1$s) e indica o código de erro 9992.</string>
+  <string name="vvm3_error_invalid_password_title">Produciuse un erro</string>
+  <string name="vvm3_error_invalid_password_message">Ponte en contacto co servizo de atención ao cliente (%1$s) e indica o código de erro 9993.</string>
+  <string name="vvm3_error_mailbox_not_initialized_title">Correo de voz visual</string>
+  <string name="vvm3_error_mailbox_not_initialized_message">Para finalizar a configuración do correo de voz visual, ponte en contacto co servizo de atención ao cliente (%1$s) e indica o código de erro 9994.</string>
+  <string name="vvm3_error_service_not_provisioned_title">Correo de voz visual</string>
+  <string name="vvm3_error_service_not_provisioned_message">Para finalizar a configuración do correo de voz visual, ponte en contacto co servizo de atención ao cliente (%1$s) e indica o código de erro 9995.</string>
+  <string name="vvm3_error_service_not_activated_title">Correo de voz visual</string>
+  <string name="vvm3_error_service_not_activated_message">Para activar o correo de voz visual, ponte en contacto co servizo de atención ao cliente (%1$s) e indica o código de erro 9996.</string>
+  <string name="vvm3_error_user_blocked_title">Produciuse un erro</string>
+  <string name="vvm3_error_user_blocked_message">Para finalizar a configuración do correo de voz visual, ponte en contacto co servizo de atención ao cliente (%1$s) e indica o código de erro 9998.</string>
+  <string name="vvm3_error_subscriber_unknown_title">O correo de voz visual está desactivado</string>
+  <string name="vvm3_error_subscriber_unknown_message">Para activar o correo de voz visual, ponte en contacto co servizo de atención ao cliente (%1$s).</string>
+  <string name="vvm3_error_imap_getquota_error_title">Produciuse un erro</string>
+  <string name="vvm3_error_imap_getquota_error_message">Ponte en contacto co servizo de atención ao cliente (%1$s) e indica o código de erro 9997.</string>
+  <string name="vvm3_error_imap_select_error_title">Produciuse un erro</string>
+  <string name="vvm3_error_imap_select_error_message">Ponte en contacto co servizo de atención ao cliente (%1$s) e indica o código de erro 9989.</string>
+  <string name="vvm3_error_imap_error_title">Produciuse un erro</string>
+  <string name="vvm3_error_imap_error_message">Ponte en contacto co servizo de atención ao cliente (%1$s) e indica o código de erro 9999.</string>
+  <string name="verizon_terms_and_conditions_title">Activa o correo de voz visual</string>
+  <string name="verizon_terms_and_conditions_message">%1$s Ao activar o correo de voz visual, aceptas os termos e condicións de Verizon Wireless:\n\n%2$s</string>
+  <string name="dialer_terms_and_conditions_title">Activa o correo de voz visual</string>
+  <string name="dialer_terms_and_conditions_existing_user_title">Novo! Le o teu correo de voz</string>
+  <string name="dialer_terms_and_conditions_message">%s</string>
+  <string name="dialer_terms_and_conditions_1.0">Consulta e escoita as túas mensaxes sen ter que chamar ao correo de voz. O servizo de transcrición gratuíto de Google proporciona transcricións dos teus correos de voz. Podes desactivar esta opción cando queiras na configuración. %s</string>
+  <string name="dialer_terms_and_conditions_existing_user">Grazas ao servizo de transcrición gratuíto de Google, agora podes dispor de transcricións do teu correo de voz. Podes desactivar esta opción cando queiras na configuración. %s</string>
+  <string name="dialer_terms_and_conditions_for_verizon_1.0">Consulta e escoita as túas mensaxes sen ter que chamar ao correo de voz.</string>
+  <string name="dialer_terms_and_conditions_learn_more">Máis información</string>
+  <string name="dialer_terms_and_conditions_existing_user_ack">De acordo</string>
+  <string name="dialer_terms_and_conditions_existing_user_decline">Non, grazas</string>
+  <string name="terms_and_conditions_decline_dialog_title">Queres desactivar o correo de voz visual?</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_message">Se non se aceptan os termos e condicións, desactivarase o correo de voz visual.</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_downgrade">Desactivar</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_message">Se desactivas o correo de voz visual, deixará de funcionar.</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_downgrade">Desactivar</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message">Só poderás acceder ao correo de voz chamando ao *86. Configura un novo PIN do correo de voz para continuar.</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin">Establecer PIN</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/error/res/values-gu/strings.xml b/java/com/android/dialer/voicemail/listui/error/res/values-gu/strings.xml
new file mode 100644
index 0000000..160d76f
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/error/res/values-gu/strings.xml
@@ -0,0 +1,102 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_error_activating_title">વિઝ્યુઅલ વૉઇસમેઇલ સક્રિય કરી રહ્યાં છીએ</string>
+  <string name="voicemail_error_activating_message">જ્યાં સુધી વિઝ્યુઅલ વૉઇસમેઇલ સંપૂર્ણપણે સક્રિય ન થાય ત્યાં સુધી તમે વૉઇસમેઇલના નોટિફિકેશન પ્રાપ્ત કરી શકશો નહીં. વૉઇસમેઇલ સંપૂર્ણપણે સક્રિય ન થાય ત્યાં સુધી નવા સંદેશા પુનઃપ્રાપ્ત કરવા માટે વૉઇસમેઇલને કૉલ કરો.</string>
+  <string name="voicemail_error_not_activate_no_signal_title">વિઝ્યુઅલ વૉઇસમેઇલ સક્રિય કરી શકાતા નથી</string>
+  <string name="voicemail_error_not_activate_no_signal_message">તમારા ફોન પર મોબાઇલ નેટવર્ક કનેક્શન હોવાની ખાતરી કરો અને ફરી પ્રયાસ કરો.</string>
+  <string name="voicemail_error_not_activate_no_signal_airplane_mode_message">એરપ્લેન મોડ બંધ કરો અને ફરી પ્રયાસ કરો.</string>
+  <string name="voicemail_error_no_signal_title">કોઈ કનેક્શન નથી</string>
+  <string name="voicemail_error_no_signal_message">નવા વૉઇસમેઇલ માટે તમને સૂચિત કરવામાં આવશે નહીં. જો તમે વાઇ-ફાઇ પર હો, તો તમે હમણાં સિંક કરીને વૉઇસમેઇલ તપાસી શકો છો.</string>
+  <string name="voicemail_error_no_signal_airplane_mode_message">નવા વૉઇસમેઇલ માટે તમને સૂચિત કરવામાં આવશે નહીં. તમારા વૉઇસમેઇલ સિંક કરવા માટે એરપ્લેન મોડ બંધ કરો.</string>
+  <string name="voicemail_error_no_signal_cellular_required_message">વૉઇસમેઇલને તપાસવા માટે તમારા ફોનને મોબાઇલ ડેટા કનેક્શનની જરૂર છે.</string>
+  <string name="voicemail_error_activation_failed_title">વિઝ્યુઅલ વૉઇસમેઇલ સક્રિય કરી શકાતા નથી</string>
+  <string name="voicemail_error_activation_failed_message">તમે વૉઇસમેઇલ તપાસવા માટે હજી પણ કૉલ કરી શકો છો.</string>
+  <string name="voicemail_error_no_data_title">વિઝ્યુઅલ વૉઇસમેઇલ અપડેટ કરી શકાતા નથી</string>
+  <string name="voicemail_error_no_data_message">તમારું વાઇ-ફાઇ અથવા મોબાઇલ ડેટા કનેક્શન બહેતર હોય ત્યારે ફરી પ્રયાસ કરજો. તમે વૉઇસમેઇલ તપાસવા માટે હજી પણ કૉલ કરી શકો છો.</string>
+  <string name="voicemail_error_no_data_cellular_required_message">તમારું મોબાઇલ ડેટા કનેક્શન બહેતર હોય ત્યારે ફરી પ્રયાસ કરજો. તમે વૉઇસમેઇલ તપાસવા માટે હજી પણ કૉલ કરી શકો છો.</string>
+  <string name="voicemail_error_bad_config_title">વિઝ્યુઅલ વૉઇસમેઇલ અપડેટ કરી શકાતા નથી</string>
+  <string name="voicemail_error_bad_config_message">તમે વૉઇસમેઇલ તપાસવા માટે હજી પણ કૉલ કરી શકો છો.</string>
+  <string name="voicemail_error_communication_title">વિઝ્યુઅલ વૉઇસમેઇલ અપડેટ કરી શકાતા નથી</string>
+  <string name="voicemail_error_communication_message">તમે વૉઇસમેઇલ તપાસવા માટે હજી પણ કૉલ કરી શકો છો.</string>
+  <string name="voicemail_error_server_connection_title">વિઝ્યુઅલ વૉઇસમેઇલ અપડેટ કરી શકાતા નથી</string>
+  <string name="voicemail_error_server_connection_message">તમે વૉઇસમેઇલ તપાસવા માટે હજી પણ કૉલ કરી શકો છો.</string>
+  <string name="voicemail_error_server_title">વિઝ્યુઅલ વૉઇસમેઇલ અપડેટ કરી શકાતા નથી</string>
+  <string name="voicemail_error_server_message">તમે વૉઇસમેઇલ તપાસવા માટે હજી પણ કૉલ કરી શકો છો.</string>
+  <string name="voicemail_error_inbox_near_full_title">ઈનબોક્સ લગભગ ભરાઇ ગયું છે</string>
+  <string name="voicemail_error_inbox_near_full_message">જો તમારું ઈનબોક્સ ભરાઈ ગયું હોય તો તમે નવા વૉઇસમેઇલ પ્રાપ્ત કરી શકશો નહીં.</string>
+  <string name="voicemail_error_inbox_full_title">નવા વૉઇસમેઇલ પ્રાપ્ત કરી શકાતા નથી</string>
+  <string name="voicemail_error_inbox_full_message">તમારું ઈનબોક્સ ભરાઈ ગયું છે. નવા વૉઇસમેઇલ પ્રાપ્ત કરવા માટે થોડા સંદેશા ડિલીટ કરવાનો પ્રયાસ કરો.</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_title">અતિરિક્ત સ્ટોરેજ ચાલુ કરો અને બૅકઅપ લો</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_message">તમારું મેઇલબોક્સ ભરાઈ ગયું છે. સ્પેસ બનાવવા માટે, અતિરિક્ત સ્ટોરેજ ચાલુ કરો જેથી Google તમારા વૉઇસમેઇલ સંદેશા મેનેજ કરી શકે અને તેનું બૅકઅપ લઈ શકે.</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_title">અતિરિક્ત સ્ટોરેજ ચાલુ કરો અને બૅકઅપ લો</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_message">તમારું મેઇલબોક્સ લગભગ ભરાઈ ગયું છે. સ્પેસ બનાવવા માટે, અતિરિક્ત સ્ટોરેજ ચાલુ કરો જેથી Google તમારા વૉઇસમેઇલ સંદેશા મેનેજ કરી શકે અને તેનું બૅકઅપ લઈ શકે.</string>
+  <string name="voicemail_error_pin_not_set_title">તમારો વૉઇસમેઇલ પિન સેટ કરો</string>
+  <string name="voicemail_error_pin_not_set_message">જ્યારે પણ તમે કૉલ કરીને તમારા વૉઇસમેઇલને ઍક્સેસ કરવા માગશો ત્યારે તમારે એક વૉઇસમેઇલ પિનની જરૂર પડશે.</string>
+  <string name="voicemail_action_turn_off_airplane_mode">એરપ્લેન મોડની સેટિંગ</string>
+  <string name="voicemail_action_set_pin">પિન સેટ કરો</string>
+  <string name="voicemail_action_retry">ફરી પ્રયાસ કરો</string>
+  <string name="voicemail_action_turn_archive_on">ચાલુ કરો</string>
+  <string name="voicemail_action_dimiss">ના, આભાર</string>
+  <string name="voicemail_action_sync">સિંક કરો</string>
+  <string name="voicemail_action_call_voicemail">વૉઇસમેઇલ પર કૉલ કરો</string>
+  <string name="voicemail_action_call_customer_support">ગ્રાહક સેવાને કૉલ કરો</string>
+  <string name="vvm3_error_vms_dns_failure_title">કંઈક ખોટું થયું હતું</string>
+  <string name="vvm3_error_vms_dns_failure_message">માફ કરશો, એક સમસ્યા આવી હતી. કૃપા કરીને થોડા સમય પછી ફરી પ્રયાસ કરો. જો હજી પણ કોઈ સમસ્યા હોય, તો કૃપા કરીને %1$s પર ગ્રાહક સેવાનો સંપર્ક કરો અને તેમને જણાવો કે ભૂલનો કોડ 9001 છે.</string>
+  <string name="vvm3_error_vmg_dns_failure_title">કંઈક ખોટું થયું હતું</string>
+  <string name="vvm3_error_vmg_dns_failure_message">માફ કરશો, એક સમસ્યા આવી હતી. કૃપા કરીને થોડા સમય પછી ફરી પ્રયાસ કરો. જો હજી પણ કોઈ સમસ્યા હોય, તો કૃપા કરીને %1$s પર ગ્રાહક સેવાનો સંપર્ક કરો અને તેમને જણાવો કે ભૂલનો કોડ 9002 છે.</string>
+  <string name="vvm3_error_spg_dns_failure_title">કંઈક ખોટું થયું હતું</string>
+  <string name="vvm3_error_spg_dns_failure_message">માફ કરશો, એક સમસ્યા આવી હતી. કૃપા કરીને થોડા સમય પછી ફરી પ્રયાસ કરો. જો હજી પણ કોઈ સમસ્યા હોય, તો કૃપા કરીને %1$s પર ગ્રાહક સેવાનો સંપર્ક કરો અને તેમને જણાવો કે ભૂલનો કોડ 9003 છે.</string>
+  <string name="vvm3_error_vms_no_cellular_title">તમારા વૉઇસ મેઇલબોક્સથી કનેક્ટ થઈ શકતા નથી</string>
+  <string name="vvm3_error_vms_no_cellular_message">માફ કરશો, અમને તમારા વૉઇસ મેઇલબોક્સ સાથે કનેક્ટ થવામાં સમસ્યા છે. જો તમે નબળા સિગ્નલ ધરાવતા વિસ્તારમાં હો, તો યોગ્ય સિગ્નલ ન મળે ત્યાં સુધી રાહ જુઓ અને ફરી પ્રયાસ કરો. હજી પણ કોઈ સમસ્યા રહે, તો કૃપા કરીને %1$s પર ગ્રાહક સેવાનો સંપર્ક કરો અને તેમને જણાવો કે ભૂલનો કોડ 9004 છે.</string>
+  <string name="vvm3_error_vmg_no_cellular_title">તમારા વૉઇસ મેઇલબોક્સથી કનેક્ટ થઈ શકતા નથી</string>
+  <string name="vvm3_error_vmg_no_cellular_message">માફ કરશો, અમને તમારા વૉઇસ મેઇલબોક્સ સાથે કનેક્ટ થવામાં સમસ્યા છે. જો તમે નબળા સિગ્નલ ધરાવતા વિસ્તારમાં હો, તો યોગ્ય સિગ્નલ ન મળે ત્યાં સુધી રાહ જુઓ અને ફરી પ્રયાસ કરો. હજી પણ કોઇ સમસ્યા રહે, તો કૃપા કરીને %1$s પર ગ્રાહક સેવાનો સંપર્ક કરો અને તેમને જણાવો કે ભૂલનો કોડ 9005 છે.</string>
+  <string name="vvm3_error_spg_no_cellular_title">તમારા વૉઇસ મેઇલબોક્સથી કનેક્ટ થઈ શકતા નથી</string>
+  <string name="vvm3_error_spg_no_cellular_message">માફ કરશો, અમને તમારા વૉઇસ મેઇલબોક્સ સાથે કનેક્ટ થવામાં સમસ્યા છે. જો તમે નબળા સિગ્નલ ધરાવતા વિસ્તારમાં હો, તો યોગ્ય સિગ્નલ ન મળે ત્યાં સુધી રાહ જુઓ અને ફરી પ્રયાસ કરો. હજી પણ કોઇ સમસ્યા રહે, તો કૃપા કરીને %1$s પર ગ્રાહક સેવાનો સંપર્ક કરો અને તેમને જણાવો કે ભૂલનો કોડ 9006 છે.</string>
+  <string name="vvm3_error_vms_timeout_title">કંઈક ખોટું થયું હતું</string>
+  <string name="vvm3_error_vms_timeout_message">માફ કરશો, એક સમસ્યા આવી હતી. કૃપા કરીને થોડા સમય પછી ફરી પ્રયાસ કરો. જો હજી પણ કોઇ સમસ્યા હોય, તો કૃપા કરીને %1$s પર ગ્રાહક સેવાનો સંપર્ક કરો અને તેમને જણાવો કે ભૂલનો કોડ 9007 છે.</string>
+  <string name="vvm3_error_vmg_timeout_title">કંઈક ખોટું થયું હતું</string>
+  <string name="vvm3_error_vmg_timeout_message">માફ કરશો, એક સમસ્યા આવી હતી. કૃપા કરીને થોડા સમય પછી ફરી પ્રયાસ કરો. જો હજી પણ કોઇ સમસ્યા હોય, તો કૃપા કરીને %1$s પર ગ્રાહક સેવાનો સંપર્ક કરો અને તેમને જણાવો કે ભૂલનો કોડ 9008 છે.</string>
+  <string name="vvm3_error_status_sms_timeout_title">કંઈક ખોટું થયું હતું</string>
+  <string name="vvm3_error_status_sms_timeout_message">માફ કરશો, અમને તમારી સેવા સેટ કરવામાં સમસ્યા આવી રહી છે. કૃપા કરીને થોડા સમય પછી ફરી પ્રયાસ કરો. જો હજી પણ કોઇ સમસ્યા હોય, તો કૃપા કરીને %1$s પર ગ્રાહક સેવાનો સંપર્ક કરો અને તેમને જણાવો કે ભૂલનો કોડ 9009 છે.</string>
+  <string name="vvm3_error_subscriber_blocked_title">તમારા વૉઇસ મેઇલબોક્સથી કનેક્ટ થઈ શકતા નથી</string>
+  <string name="vvm3_error_subscriber_blocked_message">માફ કરશો, અમે હમણાં તમારા વૉઇસ મેઇલબોક્સ સાથે કનેક્ટ થઈ શકતા નથી. કૃપા કરીને થોડા સમય પછી ફરી પ્રયાસ કરો. જો હજી પણ કોઇ સમસ્યા હોય, તો કૃપા કરીને %1$s પર ગ્રાહક સેવાનો સંપર્ક કરો અને તેમને જણાવો કે ભૂલનો કોડ 9990 છે.</string>
+  <string name="vvm3_error_unknown_user_title">વૉઇસમેઇલ સેટ કરો</string>
+  <string name="vvm3_error_unknown_user_message">તમારા એકાઉન્ટ પર વૉઇસમેઇલ સેટ થયેલ નથી. કૃપા કરીને %1$s પર ગ્રાહક સેવાનો સંપર્ક કરો અને તેમને જણાવો કે ભૂલનો કોડ 9991 છે.</string>
+  <string name="vvm3_error_unknown_device_title">વૉઇસમેઇલ</string>
+  <string name="vvm3_error_unknown_device_message">આ ઉપકરણ પર વિઝ્યુઅલ વૉઇસમેઇલનો ઉપયોગ કરી શકશો નહીં. કૃપા કરીને %1$s પર ગ્રાહક સેવાનો સંપર્ક કરો અને તેમને જણાવો કે ભૂલનો કોડ 9992 છે.</string>
+  <string name="vvm3_error_invalid_password_title">કંઈક ખોટું થયું હતું</string>
+  <string name="vvm3_error_invalid_password_message">કૃપા કરીને %1$s પર ગ્રાહક સેવાનો સંપર્ક કરો અને તેમને જણાવો કે ભૂલનો કોડ 9993 છે.</string>
+  <string name="vvm3_error_mailbox_not_initialized_title">વિઝ્યુઅલ વૉઇસમેઇલ</string>
+  <string name="vvm3_error_mailbox_not_initialized_message">વિઝ્યુઅલ વૉઇસમેઇલ સેટઅપ પૂર્ણ કરવા માટે, કૃપા કરીને %1$s પર ગ્રાહક સેવાનો સંપર્ક કરો અને તેમને જણાવો કે ભૂલનો કોડ 9994 છે.</string>
+  <string name="vvm3_error_service_not_provisioned_title">વિઝ્યુઅલ વૉઇસમેઇલ</string>
+  <string name="vvm3_error_service_not_provisioned_message">વિઝ્યુઅલ વૉઇસમેઇલ સેટઅપ પૂર્ણ કરવા માટે, કૃપા કરીને %1$s પર ગ્રાહક સેવાનો સંપર્ક કરો અને તેમને જણાવો કે ભૂલનો કોડ 9995 છે.</string>
+  <string name="vvm3_error_service_not_activated_title">વિઝ્યુઅલ વૉઇસમેઇલ</string>
+  <string name="vvm3_error_service_not_activated_message">વિઝ્યુઅલ વૉઇસમેઇલ સક્રિય કરવા માટે, કૃપા કરીને %1$s પર ગ્રાહક સેવાનો સંપર્ક કરો અને તેમને જણાવો કે ભૂલનો કોડ 9996 છે.</string>
+  <string name="vvm3_error_user_blocked_title">કંઈક ખોટું થયું હતું</string>
+  <string name="vvm3_error_user_blocked_message">વિઝ્યુઅલ વૉઇસમેઇલ સેટઅપ પૂર્ણ કરવા માટે, કૃપા કરીને %1$s પર ગ્રાહક સેવાનો સંપર્ક કરો અને તેમને જણાવો કે ભૂલનો કોડ 9998 છે.</string>
+  <string name="vvm3_error_subscriber_unknown_title">વિઝ્યુઅલ વૉઇસમેઇલ બંધ છે</string>
+  <string name="vvm3_error_subscriber_unknown_message">વિઝ્યુઅલ વૉઇસમેઇલ સક્રિય કરવા માટે કૃપા કરીને %1$s પર ગ્રાહક સેવાનો સંપર્ક કરો.</string>
+  <string name="vvm3_error_imap_getquota_error_title">કંઈક ખોટું થયું હતું</string>
+  <string name="vvm3_error_imap_getquota_error_message">કૃપા કરીને %1$s પર ગ્રાહક સેવાનો સંપર્ક કરો અને તેમને જણાવો કે ભૂલનો કોડ 9997 છે.</string>
+  <string name="vvm3_error_imap_select_error_title">કંઈક ખોટું થયું હતું</string>
+  <string name="vvm3_error_imap_select_error_message">કૃપા કરીને %1$s પર ગ્રાહક સેવાનો સંપર્ક કરો અને તેમને જણાવો કે ભૂલનો કોડ 9989 છે.</string>
+  <string name="vvm3_error_imap_error_title">કંઈક ખોટું થયું હતું</string>
+  <string name="vvm3_error_imap_error_message">કૃપા કરીને %1$s પર ગ્રાહક સેવાનો સંપર્ક કરો અને તેમને જણાવો કે ભૂલનો કોડ 9999 છે.</string>
+  <string name="verizon_terms_and_conditions_title">વિઝ્યુઅલ વૉઇસમેઇલ ચાલુ કરો</string>
+  <string name="verizon_terms_and_conditions_message">%1$s વિઝ્યુઅલ વૉઇસમેઇલ ચાલુ કરીને તમે Verizon Wirelessના નિયમો અને શરતો સાથે સંમત થાઓ છો:\n\n%2$s</string>
+  <string name="dialer_terms_and_conditions_title">વિઝ્યુઅલ વૉઇસમેઇલ ચાલુ કરો</string>
+  <string name="dialer_terms_and_conditions_existing_user_title">નવું! તમારો વૉઇસમેઇલ વાંચો</string>
+  <string name="dialer_terms_and_conditions_message">%s</string>
+  <string name="dialer_terms_and_conditions_1.0">વૉઇસમેઇલને કૉલ કર્યા વિના તમારા સંદેશા જુઓ અને સાંભળો. Googleની મફત ટ્રાન્સક્રિપ્શન સેવા તમારા વૉઇસમેઇલની ટ્રાન્સક્રિપ્ટ પ્રદાન કરે છે. તમે ગમે ત્યારે સેટિંગમાં બંધ કરી શકો છો. %s</string>
+  <string name="dialer_terms_and_conditions_existing_user">Googleની મફત ટ્રાન્સક્રિપ્શન સેવા હવે તમારા વૉઇસમેઇલની ટ્રાન્સક્રિપ્ટ પ્રદાન કરે છે. તમે ગમે ત્યારે આને સેટિંગમાં બંધ કરી શકો છો. %s</string>
+  <string name="dialer_terms_and_conditions_for_verizon_1.0">વૉઇસમેઇલ પર કૉલ કર્યા વિના, તમારા સંદેશા જુઓ અને સાંભળો.</string>
+  <string name="dialer_terms_and_conditions_learn_more">વધુ જાણો</string>
+  <string name="dialer_terms_and_conditions_existing_user_ack">ઓકે, સમજાઈ ગયું</string>
+  <string name="dialer_terms_and_conditions_existing_user_decline">ના, આભાર</string>
+  <string name="terms_and_conditions_decline_dialog_title">વિઝ્યુઅલ વૉઇસમેઇલ બંધ કરીએ?</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_message">જો નિયમો અને શરતોને નકારવામાં આવશે તો વિઝ્યુઅલ વૉઇસમેઇલ બંધ કરવામાં આવશે.</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_downgrade">બંધ કરો</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_message">જો તમે વિઝ્યુઅલ વૉઇસમેઇલ બંધ કરશો, તો વિઝ્યુઅલ વૉઇસમેઇલ બંધ થશે.</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_downgrade">બંધ કરો</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message">વૉઇસમેઇલ માત્ર *86 પર કૉલ કરીને જ ઍક્સેસ કરી શકાશે. આગળ વધવા માટે નવો વૉઇસમેઇલ પિન સેટ કરો.</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin">પિન સેટ કરો</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/error/res/values-hi/strings.xml b/java/com/android/dialer/voicemail/listui/error/res/values-hi/strings.xml
new file mode 100644
index 0000000..61b0b20
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/error/res/values-hi/strings.xml
@@ -0,0 +1,102 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_error_activating_title">विज़ुअल वॉइसमेल चालू किया जा रहा है</string>
+  <string name="voicemail_error_activating_message">हो सकता है कि विज़ुअल वॉइसमेल के पूरी तरह चालू होने तक आपको वॉइसमेल सूचनाएं न मिलें. वॉइसमेल के पूरी तरह चालू होने तक नए मैसेज पाने के लिए वॉइसमेल को कॉल करें.</string>
+  <string name="voicemail_error_not_activate_no_signal_title">विज़ुअल वॉइसमेल चालू नहीं किया जा सकता</string>
+  <string name="voicemail_error_not_activate_no_signal_message">जांच लें कि आपके फ़ोन में मोबाइल नेटवर्क कनेक्शन है और फिर कोशिश करें.</string>
+  <string name="voicemail_error_not_activate_no_signal_airplane_mode_message">हवाई जहाज़ मोड बंद करें और फिर कोशिश करें.</string>
+  <string name="voicemail_error_no_signal_title">कोई कनेक्शन नहीं</string>
+  <string name="voicemail_error_no_signal_message">आपको नए वॉइसमेल की सूचना नहीं दी जाएगी. अगर आप वाई‑फ़ाई का इस्तेमाल कर रहे हैं, तो आप अभी सिंक करके वॉइसमेल देख सकते हैं.</string>
+  <string name="voicemail_error_no_signal_airplane_mode_message">आपको नए वॉइसमेल की सूचना नहीं दी जाएगी. अपना वॉइसमेल सिंक करने के लिए हवाई जहाज़ मोड बंद करें.</string>
+  <string name="voicemail_error_no_signal_cellular_required_message">वॉइसमेल देखने के लिए आपके फ़ोन में मोबाइल डेटा कनेक्शन होना चाहिए.</string>
+  <string name="voicemail_error_activation_failed_title">विज़ुअल वॉइसमेल चालू नहीं किया जा सकता</string>
+  <string name="voicemail_error_activation_failed_message">आप अभी भी कॉल करके वॉइसमेल देख सकते हैं.</string>
+  <string name="voicemail_error_no_data_title">विज़ुअल वॉइसमेल अपडेट नहीं किया जा सकता</string>
+  <string name="voicemail_error_no_data_message">आपका वाई‑फ़ाई या मोबाइल डेटा कनेक्शन बेहतर होने पर दोबारा कोशिश करें. आप अभी भी कॉल करके वॉइसमेल देख सकते हैं.</string>
+  <string name="voicemail_error_no_data_cellular_required_message">आपका मोबाइल डेटा कनेक्शन बेहतर होने पर दोबारा कोशिश करें. आप अभी भी कॉल करके वॉइसमेल देख सकते हैं.</string>
+  <string name="voicemail_error_bad_config_title">विज़ुअल वॉइसमेल अपडेट नहीं किया जा सकता</string>
+  <string name="voicemail_error_bad_config_message">आप अभी भी कॉल करके वॉइसमेल देख सकते हैं.</string>
+  <string name="voicemail_error_communication_title">विज़ुअल वॉइसमेल अपडेट नहीं किया जा सकता</string>
+  <string name="voicemail_error_communication_message">आप अभी भी कॉल करके वॉइसमेल देख सकते हैं.</string>
+  <string name="voicemail_error_server_connection_title">विज़ुअल वॉइसमेल अपडेट नहीं किया जा सकता</string>
+  <string name="voicemail_error_server_connection_message">आप अभी भी कॉल करके वॉइसमेल देख सकते हैं.</string>
+  <string name="voicemail_error_server_title">विज़ुअल वॉइसमेल अपडेट नहीं किया जा सकता</string>
+  <string name="voicemail_error_server_message">आप अभी भी कॉल करके वॉइसमेल देख सकते हैं.</string>
+  <string name="voicemail_error_inbox_near_full_title">इनबॉक्स लगभग भर चुका है</string>
+  <string name="voicemail_error_inbox_near_full_message">अगर आपका इनबॉक्स भर चुका है, तो आपको नया वॉइसमेल नहीं मिलेगा.</string>
+  <string name="voicemail_error_inbox_full_title">नए वॉइसमेल नहीं मिल रहे हैं</string>
+  <string name="voicemail_error_inbox_full_message">आपका इनबॉक्स भर चुका है. नया वॉइसमेल पाने के लिए कुछ मैसेज मिटाकर देखें.</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_title">अतिरिक्त मेमोरी और बैकअप चालू करें</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_message">आपका मेलबॉक्स भर चुका है. जगह खाली करने के लिए अतिरिक्त मेमोरी चालू करें, ताकि Google आपके वॉइसमेल मैसेज संभाल सके और उनका बैकअप ले सके.</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_title">अतिरिक्त मेमोरी और बैकअप चालू करें</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_message">आपका मेलबॉक्स लगभग भर चुका है. जगह खाली करने के लिए अतिरिक्त मेमोरी चालू करें, ताकि Google आपके वॉइसमेल मैसेज संभाल सके और उनका बैकअप ले सके.</string>
+  <string name="voicemail_error_pin_not_set_title">अपना वॉइसमेल पिन सेट करें</string>
+  <string name="voicemail_error_pin_not_set_message">आप जब भी अपना वॉइसमेल एक्सेस करने के लिए कॉल करेंगे, आपको वॉइसमेल पिन की ज़रूरत पड़ेगी.</string>
+  <string name="voicemail_action_turn_off_airplane_mode">हवाई जहाज़ मोड सेटिंग</string>
+  <string name="voicemail_action_set_pin">पिन सेट करें</string>
+  <string name="voicemail_action_retry">फिर कोशिश करें</string>
+  <string name="voicemail_action_turn_archive_on">चालू करें</string>
+  <string name="voicemail_action_dimiss">रहने दें</string>
+  <string name="voicemail_action_sync">सिंक करें</string>
+  <string name="voicemail_action_call_voicemail">वॉइसमेल को कॉल करें</string>
+  <string name="voicemail_action_call_customer_support">ग्राहक सहायता को कॉल करें</string>
+  <string name="vvm3_error_vms_dns_failure_title">कोई गड़बड़ी हुई</string>
+  <string name="vvm3_error_vms_dns_failure_message">माफ़ करें, हमारे सामने एक समस्या आ गई है. कृपया बाद में फिर कोशिश करें. अगर समस्या फिर भी बनी रहती है, तो कृपया %1$s पर ग्राहक सेवा से संपर्क करके उन्हें बताएं कि गड़बड़ी कोड 9001 है.</string>
+  <string name="vvm3_error_vmg_dns_failure_title">कोई गड़बड़ी हुई</string>
+  <string name="vvm3_error_vmg_dns_failure_message">माफ़ करें, हमारे सामने एक समस्या आ गई है. कृपया बाद में फिर कोशिश करें. अगर समस्या फिर भी बनी रहती है, तो कृपया %1$s पर ग्राहक सेवा से संपर्क करके उन्हें बताएं कि गड़बड़ी कोड 9002 है.</string>
+  <string name="vvm3_error_spg_dns_failure_title">कोई गड़बड़ी हुई</string>
+  <string name="vvm3_error_spg_dns_failure_message">माफ़ करें, हमारे सामने एक समस्या आ गई है. कृपया बाद में फिर कोशिश करें. अगर समस्या फिर भी बनी रहती है, तो कृपया %1$s पर ग्राहक सेवा से संपर्क करके उन्हें बताएं कि गड़बड़ी कोड 9003 है.</string>
+  <string name="vvm3_error_vms_no_cellular_title">आपके वॉइस मेलबॉक्स से कनेक्ट नहीं किया जा सकता</string>
+  <string name="vvm3_error_vms_no_cellular_message">माफ़ करें, हमें आपके वॉइस मेलबॉक्स से कनेक्ट करने में समस्या आ रही है. अगर आप किसी ऐसी जगह पर हैं, जहां सिग्नल कमज़ोर है, तो बढ़िया सिग्नल मिलने तक इंतज़ार करें और फिर कोशिश करें. अगर समस्या फिर भी बनी रहती है, तो कृपया %1$s पर ग्राहक सेवा से संपर्क करके उन्हें बताएं कि गड़बड़ी कोड 9004 है.</string>
+  <string name="vvm3_error_vmg_no_cellular_title">आपके वॉइस मेलबॉक्स से कनेक्ट नहीं किया जा सकता</string>
+  <string name="vvm3_error_vmg_no_cellular_message">माफ़ करें, हमें आपके वॉइस मेलबॉक्स से कनेक्ट करने में समस्या आ रही है. अगर आप किसी ऐसी जगह पर हैं, जहां सिग्नल कमज़ोर है, तो बढ़िया सिग्नल मिलने तक इंतज़ार करें और फिर कोशिश करें. अगर समस्या फिर भी बनी रहती है, तो कृपया %1$s पर ग्राहक सेवा से संपर्क करके उन्हें बताएं कि गड़बड़ी कोड 9005 है.</string>
+  <string name="vvm3_error_spg_no_cellular_title">आपके वॉइस मेलबॉक्स से कनेक्ट नहीं किया जा सकता</string>
+  <string name="vvm3_error_spg_no_cellular_message">माफ़ करें, हमें आपके वॉइस मेलबॉक्स से कनेक्ट करने में समस्या आ रही है. अगर आप किसी ऐसी जगह पर हैं, जहां सिग्नल कमज़ोर है, तो बढ़िया सिग्नल मिलने तक इंतज़ार करें और फिर कोशिश करें. अगर समस्या फिर भी बनी रहती है, तो कृपया %1$s पर ग्राहक सेवा से संपर्क करके उन्हें बताएं कि गड़बड़ी कोड 9006 है.</string>
+  <string name="vvm3_error_vms_timeout_title">कोई गड़बड़ी हुई</string>
+  <string name="vvm3_error_vms_timeout_message">माफ़ करें, हमारे सामने एक समस्या आ गई है. कृपया बाद में फिर कोशिश करें. अगर समस्या फिर भी बनी रहती है, तो कृपया %1$s पर ग्राहक सेवा से संपर्क करके उन्हें बताएं कि गड़बड़ी कोड 9007 है.</string>
+  <string name="vvm3_error_vmg_timeout_title">कोई गड़बड़ी हुई</string>
+  <string name="vvm3_error_vmg_timeout_message">माफ़ करें, हमारे सामने एक समस्या आ गई है. कृपया बाद में फिर कोशिश करें. अगर समस्या फिर भी बनी रहती है, तो कृपया %1$s पर ग्राहक सेवा से संपर्क करके उन्हें बताएं कि गड़बड़ी कोड 9008 है.</string>
+  <string name="vvm3_error_status_sms_timeout_title">कोई गड़बड़ी हुई</string>
+  <string name="vvm3_error_status_sms_timeout_message">माफ़ करें, हमें आपकी सेवा सेट अप करने में समस्या आ रही है. कृपया बाद में फिर कोशिश करें. अगर समस्या फिर भी बनी रहती है, तो कृपया %1$s पर ग्राहक सेवा से संपर्क करके उन्हें बताएं कि गड़बड़ी कोड 9009 है.</string>
+  <string name="vvm3_error_subscriber_blocked_title">आपके वॉइस मेलबॉक्स से कनेक्ट नहीं किया जा सकता</string>
+  <string name="vvm3_error_subscriber_blocked_message">माफ़ करें, हम इस समय आपके वॉइस मेलबॉक्स से कनेक्ट नहीं कर पा रहे हैं. कृपया बाद में फिर कोशिश करें. अगर समस्या फिर भी बनी रहती है, तो कृपया %1$s पर ग्राहक सेवा से संपर्क करके उन्हें बताएं कि गड़बड़ी कोड 9990 है.</string>
+  <string name="vvm3_error_unknown_user_title">वॉइसमेल सेट अप करें</string>
+  <string name="vvm3_error_unknown_user_message">आपके खाते में वॉइसमेल सेट अप नहीं है. कृपया %1$s पर ग्राहक सेवा से संपर्क करके उन्हें बताएं कि गड़बड़ी कोड 9991 है.</string>
+  <string name="vvm3_error_unknown_device_title">वॉइसमेल</string>
+  <string name="vvm3_error_unknown_device_message">इस डिवाइस पर विज़ुअल वॉइसमेल का उपयोग नहीं किया जा सकता. कृपया %1$s पर ग्राहक सेवा से संपर्क करके उन्हें बताएं कि गड़बड़ी कोड 9992 है.</string>
+  <string name="vvm3_error_invalid_password_title">कोई गड़बड़ी हुई</string>
+  <string name="vvm3_error_invalid_password_message">कृपया %1$s पर ग्राहक सेवा से संपर्क करके उन्हें बताएं कि गड़बड़ी कोड 9993 है.</string>
+  <string name="vvm3_error_mailbox_not_initialized_title">विज़ुअल वॉइसमेल</string>
+  <string name="vvm3_error_mailbox_not_initialized_message">विज़ुअल वॉइसमेल का सेटअप पूरा करने के लिए, कृपया %1$s पर ग्राहक सेवा से संपर्क करके उन्हें बताएं कि गड़बड़ी कोड 9994 है.</string>
+  <string name="vvm3_error_service_not_provisioned_title">विज़ुअल वॉइसमेल</string>
+  <string name="vvm3_error_service_not_provisioned_message">विज़ुअल वॉइसमेल का सेटअप पूरा करने के लिए, कृपया %1$s पर ग्राहक सेवा से संपर्क करके उन्हें बताएं कि गड़बड़ी कोड 9995 है.</string>
+  <string name="vvm3_error_service_not_activated_title">विज़ुअल वॉइसमेल</string>
+  <string name="vvm3_error_service_not_activated_message">विज़ुअल वॉइसमेल चालू करने के लिए, कृपया %1$s पर ग्राहक सेवा से संपर्क करके उन्हें बताएं कि गड़बड़ी कोड 9996 है.</string>
+  <string name="vvm3_error_user_blocked_title">कोई गड़बड़ी हुई</string>
+  <string name="vvm3_error_user_blocked_message">विज़ुअल वॉइसमेल का सेटअप पूरा करने के लिए, कृपया %1$s पर ग्राहक सेवा से संपर्क करके उन्हें बताएं कि गड़बड़ी कोड 9998 है.</string>
+  <string name="vvm3_error_subscriber_unknown_title">विज़ुअल वॉइसमेल बंद है</string>
+  <string name="vvm3_error_subscriber_unknown_message">विज़ुअल वॉइसमेल चालू करने के लिए, कृपया %1$s पर ग्राहक सेवा से संपर्क करें.</string>
+  <string name="vvm3_error_imap_getquota_error_title">कोई गड़बड़ी हुई</string>
+  <string name="vvm3_error_imap_getquota_error_message">कृपया %1$s पर ग्राहक सेवा से संपर्क करके उन्हें बताएं कि गड़बड़ी कोड 9997 है.</string>
+  <string name="vvm3_error_imap_select_error_title">कोई गड़बड़ी हुई</string>
+  <string name="vvm3_error_imap_select_error_message">कृपया %1$s पर ग्राहक सेवा से संपर्क करके उन्हें बताएं कि गड़बड़ी कोड 9989 है.</string>
+  <string name="vvm3_error_imap_error_title">कोई गड़बड़ी हुई</string>
+  <string name="vvm3_error_imap_error_message">कृपया %1$s पर ग्राहक सेवा से संपर्क करके उन्हें बताएं कि गड़बड़ी कोड 9999 है.</string>
+  <string name="verizon_terms_and_conditions_title">विज़ुअल वॉइसमेल चालू करें</string>
+  <string name="verizon_terms_and_conditions_message">%1$s विज़ुअल वॉइसमेल चालू करके आप Verizon Wireless के नियम और शर्तों को स्वीकार करते हैं:\n\n%2$s</string>
+  <string name="dialer_terms_and_conditions_title">विज़ुअल वॉइसमेल चालू करें</string>
+  <string name="dialer_terms_and_conditions_existing_user_title">नया! अपना वॉइसमेल पढ़ें</string>
+  <string name="dialer_terms_and_conditions_message">%s</string>
+  <string name="dialer_terms_and_conditions_1.0">वॉइसमेल पर कॉल किए बिना अपने मैसेज देखें और सुनें. Google की वॉइसमेल को लेख में बदलने वाली मुफ़्त सेवा आपके वॉइसमेल को लिखकर देती है. आप जब चाहें सेटिंग में जा कर इसे बंद भी कर सकते हैं. %s</string>
+  <string name="dialer_terms_and_conditions_existing_user">अब Google की वॉइसमेल को लेख में बदलने वाली मुफ़्त सेवा आपके वॉइसमेल को लिखकर देती है. आप जब चाहें सेटिंग में जा कर इसे बंद कर सकते हैं. %s</string>
+  <string name="dialer_terms_and_conditions_for_verizon_1.0">वॉइसमेल पर कॉल किए बिना अपने संदेश देखें और सुनें.</string>
+  <string name="dialer_terms_and_conditions_learn_more">अधिक जानें</string>
+  <string name="dialer_terms_and_conditions_existing_user_ack">ठीक है</string>
+  <string name="dialer_terms_and_conditions_existing_user_decline">नहीं, धन्यवाद</string>
+  <string name="terms_and_conditions_decline_dialog_title">विज़ुअल वॉइसमेल बंद करें?</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_message">नियम और शर्तें अस्वीकार करने पर विज़ुअल वॉइसमेल बंद कर दिया जाएगा.</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_downgrade">बंद करें</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_message">अगर आप विज़ुअल वॉइसमेल को बंद कर देते हैं, तो वह काम नहीं करेगा.</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_downgrade">बंद करें</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message">वॉइसमेल को सिर्फ़ *86 पर कॉल करके एक्सेस किया जा सकेगा. आगे बढ़ने के लिए एक नया वॉइसमेल पिन सेट करें.</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin">पिन सेट करें</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/error/res/values-hr/strings.xml b/java/com/android/dialer/voicemail/listui/error/res/values-hr/strings.xml
new file mode 100644
index 0000000..f8714f7
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/error/res/values-hr/strings.xml
@@ -0,0 +1,102 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_error_activating_title">Aktiviranje vizualne govorne pošte</string>
+  <string name="voicemail_error_activating_message">Možda nećete primiti obavijesti o govornoj pošti dok se vizualna govorna pošta u potpunosti ne aktivira. Nazovite službu za govornu poštu da biste dohvatili nove poruke dok se govorna pošta u potpunosti ne aktivira.</string>
+  <string name="voicemail_error_not_activate_no_signal_title">Vizualna govorna pošta ne može se aktivirati</string>
+  <string name="voicemail_error_not_activate_no_signal_message">Provjerite mobilnu vezu telefona i pokušajte ponovno.</string>
+  <string name="voicemail_error_not_activate_no_signal_airplane_mode_message">Isključite način rada u zrakoplovu i pokušajte ponovno.</string>
+  <string name="voicemail_error_no_signal_title">Nema veze</string>
+  <string name="voicemail_error_no_signal_message">Nećete primati obavijesti o novim govornim porukama. Ako upotrebljavate Wi-Fi mrežu, govornu poštu možete provjeriti tako da se odmah sinkronizirate.</string>
+  <string name="voicemail_error_no_signal_airplane_mode_message">Nećete primati obavijesti o novim govornim porukama. Isključite način rada u zrakoplovu da biste sinkronizirali govornu poštu.</string>
+  <string name="voicemail_error_no_signal_cellular_required_message">Telefon mora imati mobilnu podatkovnu vezu da biste provjerili govornu poštu.</string>
+  <string name="voicemail_error_activation_failed_title">Vizualna govorna pošta ne može se aktivirati</string>
+  <string name="voicemail_error_activation_failed_message">I dalje možete nazvati govornu poštu i provjeriti je.</string>
+  <string name="voicemail_error_no_data_title">Vizualna govorna pošta ne može se ažurirati</string>
+  <string name="voicemail_error_no_data_message">Pokušajte ponovno kad uspostavite bolju Wi-Fi ili mobilnu vezu. I dalje možete nazvati govornu poštu i provjeriti je.</string>
+  <string name="voicemail_error_no_data_cellular_required_message">Pokušajte ponovno kad uspostavite bolju mobilnu podatkovnu vezu. I dalje možete nazvati govornu poštu i provjeriti je.</string>
+  <string name="voicemail_error_bad_config_title">Vizualna govorna pošta ne može se ažurirati</string>
+  <string name="voicemail_error_bad_config_message">I dalje možete nazvati govornu poštu i provjeriti je.</string>
+  <string name="voicemail_error_communication_title">Vizualna govorna pošta ne može se ažurirati</string>
+  <string name="voicemail_error_communication_message">I dalje možete nazvati govornu poštu i provjeriti je.</string>
+  <string name="voicemail_error_server_connection_title">Vizualna govorna pošta ne može se ažurirati</string>
+  <string name="voicemail_error_server_connection_message">I dalje možete nazvati govornu poštu i provjeriti je.</string>
+  <string name="voicemail_error_server_title">Vizualna govorna pošta ne može se ažurirati</string>
+  <string name="voicemail_error_server_message">I dalje možete nazvati govornu poštu i provjeriti je.</string>
+  <string name="voicemail_error_inbox_near_full_title">Pristigla pošta gotovo je puna</string>
+  <string name="voicemail_error_inbox_near_full_message">Ako je vaša pristigla pošta puna, nećete moći primiti novu govornu poruku.</string>
+  <string name="voicemail_error_inbox_full_title">Primanje nove govorne pošte nije moguće</string>
+  <string name="voicemail_error_inbox_full_message">Pristigla pošta je puna. Izbrišite neke poruke da biste primili novu govornu poštu.</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_title">Uključivanje dodatne pohrane i sigurnosnog kopiranja</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_message">Vaš je poštanski pretinac pun. Da biste oslobodili prostor, uključite dodatnu pohranu tako da Google može upravljati porukama u govornoj pošti i sigurnosno ih kopirati.</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_title">Uključivanje dodatne pohrane i sigurnosnog kopiranja</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_message">Vaš je poštanski pretinac gotovo pun. Da biste oslobodili prostor, uključite dodatnu pohranu tako da Google može upravljati porukama u govornoj pošti i sigurnosno ih kopirati.</string>
+  <string name="voicemail_error_pin_not_set_title">Postavljanje PIN-a za govornu poštu</string>
+  <string name="voicemail_error_pin_not_set_message">PIN za govornu poštu trebat će vam svaki put kad zatražite pristup govornoj pošti.</string>
+  <string name="voicemail_action_turn_off_airplane_mode">Postavke načina rada u zrakoplovu</string>
+  <string name="voicemail_action_set_pin">Postavljanje PIN-a</string>
+  <string name="voicemail_action_retry">Ponovi</string>
+  <string name="voicemail_action_turn_archive_on">Uključi</string>
+  <string name="voicemail_action_dimiss">Ne, hvala</string>
+  <string name="voicemail_action_sync">Sinkroniziraj</string>
+  <string name="voicemail_action_call_voicemail">Nazovi službu govorne pošte</string>
+  <string name="voicemail_action_call_customer_support">Nazovi korisničku podršku</string>
+  <string name="vvm3_error_vms_dns_failure_title">Nešto nije u redu</string>
+  <string name="vvm3_error_vms_dns_failure_message">Naišli smo na problem. Pokušajte ponovno kasnije. Ako se problem ne riješi, obratite se korisničkoj službi na broj %1$s i recite da je kôd pogreške 9001.</string>
+  <string name="vvm3_error_vmg_dns_failure_title">Nešto nije u redu</string>
+  <string name="vvm3_error_vmg_dns_failure_message">Naišli smo na problem. Pokušajte ponovno kasnije. Ako se problem ne riješi, obratite se korisničkoj službi na broj %1$s i recite da je kôd pogreške 9002.</string>
+  <string name="vvm3_error_spg_dns_failure_title">Nešto nije u redu</string>
+  <string name="vvm3_error_spg_dns_failure_message">Naišli smo na problem. Pokušajte ponovno kasnije. Ako se problem ne riješi, obratite se korisničkoj službi na broj %1$s i recite da je kôd pogreške 9003.</string>
+  <string name="vvm3_error_vms_no_cellular_title">Povezivanje s pretincem govorne pošte nije uspjelo</string>
+  <string name="vvm3_error_vms_no_cellular_message">Nažalost, naišli smo na problem pri povezivanju s pretincem govorne pošte. Ako se nalazite na području s lošim signalom, pričekajte dok se signal ne poboljša i pokušajte ponovno. Ako se problem ne riješi, obratite se korisničkoj službi na broj %1$s i recite da je kôd pogreške 9004.</string>
+  <string name="vvm3_error_vmg_no_cellular_title">Povezivanje s pretincem govorne pošte nije uspjelo</string>
+  <string name="vvm3_error_vmg_no_cellular_message">Nažalost, naišli smo na problem pri povezivanju s pretincem govorne pošte. Ako se nalazite na području s lošim signalom, pričekajte dok se signal ne poboljša i pokušajte ponovno. Ako se problem ne riješi, obratite se korisničkoj službi na broj %1$s i recite da je kôd pogreške 9005.</string>
+  <string name="vvm3_error_spg_no_cellular_title">Povezivanje s pretincem govorne pošte nije uspjelo</string>
+  <string name="vvm3_error_spg_no_cellular_message">Nažalost, naišli smo na problem pri povezivanju s pretincem govorne pošte. Ako se nalazite na području s lošim signalom, pričekajte dok se signal ne poboljša i pokušajte ponovno. Ako se problem ne riješi, obratite se korisničkoj službi na broj %1$s i recite da je kôd pogreške 9006.</string>
+  <string name="vvm3_error_vms_timeout_title">Nešto nije u redu</string>
+  <string name="vvm3_error_vms_timeout_message">Naišli smo na problem. Pokušajte ponovno kasnije. Ako se problem ne riješi, obratite se korisničkoj službi na broj %1$s i recite da je kôd pogreške 9007.</string>
+  <string name="vvm3_error_vmg_timeout_title">Nešto nije u redu</string>
+  <string name="vvm3_error_vmg_timeout_message">Naišli smo na problem. Pokušajte ponovno kasnije. Ako se problem ne riješi, obratite se korisničkoj službi na broj %1$s i recite da je kôd pogreške 9008.</string>
+  <string name="vvm3_error_status_sms_timeout_title">Nešto nije u redu</string>
+  <string name="vvm3_error_status_sms_timeout_message">Naišli smo na problem pri postavljanju vaše usluge. Pokušajte ponovno kasnije. Ako se problem ne riješi, obratite se korisničkoj službi na broj %1$s i recite da je kôd pogreške 9009.</string>
+  <string name="vvm3_error_subscriber_blocked_title">Povezivanje s pretincem govorne pošte nije uspjelo</string>
+  <string name="vvm3_error_subscriber_blocked_message">Nažalost, povezivanje s pretincem govorne pošte trenutačno nije moguće. Pokušajte ponovno kasnije. Ako se problem ne riješi, obratite se korisničkoj službi na broj %1$s i recite da je kôd pogreške 9990.</string>
+  <string name="vvm3_error_unknown_user_title">Postavljanje govorne pošte</string>
+  <string name="vvm3_error_unknown_user_message">Govorna pošta nije postavljene na vašem računu. Obratite se korisničkoj službi na broj %1$s i recite da je kôd pogreške 9991.</string>
+  <string name="vvm3_error_unknown_device_title">Govorna pošta</string>
+  <string name="vvm3_error_unknown_device_message">Vizualna govorna pošta ne može se koristiti na ovom uređaju. Obratite se korisničkoj službi na broj %1$s i recite da je kôd pogreške 9992.</string>
+  <string name="vvm3_error_invalid_password_title">Nešto nije u redu</string>
+  <string name="vvm3_error_invalid_password_message">Obratite se korisničkoj službi na broj %1$s i recite da je kôd pogreške 9993.</string>
+  <string name="vvm3_error_mailbox_not_initialized_title">Vizualna govorna pošta</string>
+  <string name="vvm3_error_mailbox_not_initialized_message">Da biste dovršili postavljanje vizualne govorne pošte, obratite se korisničkoj službi na broj %1$s i recite da je kôd pogreške 9994.</string>
+  <string name="vvm3_error_service_not_provisioned_title">Vizualna govorna pošta</string>
+  <string name="vvm3_error_service_not_provisioned_message">Da biste dovršili postavljanje vizualne govorne pošte, obratite se korisničkoj službi na broj %1$s i recite da je kôd pogreške 9995.</string>
+  <string name="vvm3_error_service_not_activated_title">Vizualna govorna pošta</string>
+  <string name="vvm3_error_service_not_activated_message">Da biste aktivirali vizualnu govornu poštu, obratite se korisničkoj službi na broj %1$s i recite da je kôd pogreške 9996.</string>
+  <string name="vvm3_error_user_blocked_title">Nešto nije u redu</string>
+  <string name="vvm3_error_user_blocked_message">Da biste dovršili postavljanje vizualne govorne pošte, obratite se korisničkoj službi na broj %1$s i recite da je kôd pogreške 9998.</string>
+  <string name="vvm3_error_subscriber_unknown_title">Vizualna govorna pošta onemogućena</string>
+  <string name="vvm3_error_subscriber_unknown_message">Da biste aktivirali vizualnu govornu poštu, obratite se korisničkoj službi na broj %1$s.</string>
+  <string name="vvm3_error_imap_getquota_error_title">Nešto nije u redu</string>
+  <string name="vvm3_error_imap_getquota_error_message">Obratite se korisničkoj službi na broj %1$s i recite da je kôd pogreške 9997.</string>
+  <string name="vvm3_error_imap_select_error_title">Nešto nije u redu</string>
+  <string name="vvm3_error_imap_select_error_message">Obratite se korisničkoj službi na broj %1$s i recite da je kôd pogreške 9989.</string>
+  <string name="vvm3_error_imap_error_title">Nešto nije u redu</string>
+  <string name="vvm3_error_imap_error_message">Obratite se korisničkoj službi na broj %1$s i recite da je kôd pogreške 9999.</string>
+  <string name="verizon_terms_and_conditions_title">Uključivanje vizualne govorne pošte</string>
+  <string name="verizon_terms_and_conditions_message">%1$s Ako uključite vizualnu govornu poštu, pristajete na uvjete i odredbe Verizon Wirelessa:\n\n%2$s</string>
+  <string name="dialer_terms_and_conditions_title">Uključivanje vizualne govorne pošte</string>
+  <string name="dialer_terms_and_conditions_existing_user_title">Novo! Pročitajte poruke govorne pošte</string>
+  <string name="dialer_terms_and_conditions_message">%s</string>
+  <string name="dialer_terms_and_conditions_1.0">Pogledajte i poslušajte svoje poruke bez pozivanja govorne pošte. Googleova besplatna usluga prijepisa omogućuje vam prijepise poruka govorne pošte. Tu uslugu možete isključiti u bilo kojem trenutku u Postavkama. %s</string>
+  <string name="dialer_terms_and_conditions_existing_user">Googleova besplatna usluga prijepisa sada vam omogućuje prijepise poruka govorne pošte. Tu uslugu možete isključiti u bilo kojem trenutku u Postavkama. %s</string>
+  <string name="dialer_terms_and_conditions_for_verizon_1.0">Pogledajte i poslušajte poruke bez pozivanja govorne pošte.</string>
+  <string name="dialer_terms_and_conditions_learn_more">Saznajte više</string>
+  <string name="dialer_terms_and_conditions_existing_user_ack">U redu, shvaćam</string>
+  <string name="dialer_terms_and_conditions_existing_user_decline">Ne, hvala</string>
+  <string name="terms_and_conditions_decline_dialog_title">Želite li onemogućiti vizualnu govornu poštu?</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_message">Ako odbijete uvjete i odredbe, onemogućit ćete vizualnu govornu poštu.</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_downgrade">Onemogući</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_message">Ako isključite vizualnu govornu poštu, onemogućit ćete je.</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_downgrade">Onemogući</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message">Govornoj pošti moći će se pristupiti samo pozivanjem broja *86. Postavite novi PIN za govornu poštu da biste nastavili.</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin">Postavljanje PIN-a</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/error/res/values-hu/strings.xml b/java/com/android/dialer/voicemail/listui/error/res/values-hu/strings.xml
new file mode 100644
index 0000000..a521c45
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/error/res/values-hu/strings.xml
@@ -0,0 +1,102 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_error_activating_title">Vizuális hangposta aktiválása</string>
+  <string name="voicemail_error_activating_message">A vizuális hangposta teljes aktiválásáig nem feltétlenül kap értesítést a hangpostaüzenetekről. A szolgáltatás teljes aktiválásáig a hangpostát felhívva kérheti le új üzeneteit.</string>
+  <string name="voicemail_error_not_activate_no_signal_title">Nem sikerült aktiválni a vizuális hangpostát</string>
+  <string name="voicemail_error_not_activate_no_signal_message">Győződjön meg róla, hogy van mobil-adatkapcsolat, és próbálja újra.</string>
+  <string name="voicemail_error_not_activate_no_signal_airplane_mode_message">Kapcsolja ki a repülős üzemmódot, és próbálja újra.</string>
+  <string name="voicemail_error_no_signal_title">Nincs kapcsolat</string>
+  <string name="voicemail_error_no_signal_message">Nem kap értesítést az új hangpostaüzenetekről. Ha Wi-Fi-t használ, szinkronizálással lekérheti a hangpostaüzeneteket.</string>
+  <string name="voicemail_error_no_signal_airplane_mode_message">Nem kap értesítést az új hangpostaüzenetekről. Kapcsolja ki a repülős üzemmódot, és szinkronizálja a hangpostaüzeneteket.</string>
+  <string name="voicemail_error_no_signal_cellular_required_message">A hangpostaüzenetek lekéréséhez adatkapcsolat szükséges.</string>
+  <string name="voicemail_error_activation_failed_title">Nem sikerült aktiválni a vizuális hangpostát</string>
+  <string name="voicemail_error_activation_failed_message">Hívással továbbra is lekérheti a hangpostaüzeneteket.</string>
+  <string name="voicemail_error_no_data_title">Nem sikerült frissíteni a vizuális hangpostát</string>
+  <string name="voicemail_error_no_data_message">Próbálja újra, amikor a Wi-Fi- vagy adatkapcsolat erősebb lesz. Hívással továbbra is lekérheti a hangpostaüzeneteket.</string>
+  <string name="voicemail_error_no_data_cellular_required_message">Próbálja újra, amikor a mobil-adatkapcsolat erősebb lesz. Hívással továbbra is lekérheti a hangpostaüzeneteket.</string>
+  <string name="voicemail_error_bad_config_title">Nem sikerült frissíteni a vizuális hangpostát</string>
+  <string name="voicemail_error_bad_config_message">Hívással továbbra is lekérheti a hangpostaüzeneteket.</string>
+  <string name="voicemail_error_communication_title">Nem sikerült frissíteni a vizuális hangpostát</string>
+  <string name="voicemail_error_communication_message">Hívással továbbra is lekérheti a hangpostaüzeneteket.</string>
+  <string name="voicemail_error_server_connection_title">Nem sikerült frissíteni a vizuális hangpostát</string>
+  <string name="voicemail_error_server_connection_message">Hívással továbbra is lekérheti a hangpostaüzeneteket.</string>
+  <string name="voicemail_error_server_title">Nem sikerült frissíteni a vizuális hangpostát</string>
+  <string name="voicemail_error_server_message">Hívással továbbra is lekérheti a hangpostaüzeneteket.</string>
+  <string name="voicemail_error_inbox_near_full_title">Hangpostafiókja majdnem megtelt</string>
+  <string name="voicemail_error_inbox_near_full_message">Ha a postaláda megtelt, nem fogadhat új hangpostaüzeneteket.</string>
+  <string name="voicemail_error_inbox_full_title">Nem tud új hangpostaüzeneteket fogadni</string>
+  <string name="voicemail_error_inbox_full_message">A postaláda megtelt. Ha meg szeretné kapni az új hangpostaüzeneteket, töröljön néhány üzenetet.</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_title">Az extra tárhely és biztonsági mentés bekapcsolása</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_message">A postaláda megtelt. Ha szeretne helyet felszabadítani, kapcsolja be az extra tárhely funkciót, hogy a Google kezelhesse a hangpostaüzeneteket, és biztonsági mentést készíthessen róluk.</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_title">Az extra tárhely és biztonsági mentés bekapcsolása</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_message">A postaláda majdnem megtelt. Ha szeretne helyet felszabadítani, kapcsolja be az extra tárhely funkciót, hogy a Google kezelhesse a hangpostaüzeneteket, és biztonsági mentést készíthessen róluk.</string>
+  <string name="voicemail_error_pin_not_set_title">A hangposta PIN-kódjának beállítása</string>
+  <string name="voicemail_error_pin_not_set_message">A hangpostafiókhoz való hozzáféréshez PIN-kódra van szüksége.</string>
+  <string name="voicemail_action_turn_off_airplane_mode">A repülős üzemmód beállításai</string>
+  <string name="voicemail_action_set_pin">PIN-kód beállítása</string>
+  <string name="voicemail_action_retry">Újra</string>
+  <string name="voicemail_action_turn_archive_on">Bekapcsolás</string>
+  <string name="voicemail_action_dimiss">Nem, köszönöm</string>
+  <string name="voicemail_action_sync">Szinkronizálás</string>
+  <string name="voicemail_action_call_voicemail">Hangposta hívása</string>
+  <string name="voicemail_action_call_customer_support">Ügyfélszolgálat hívása</string>
+  <string name="vvm3_error_vms_dns_failure_title">Hiba történt</string>
+  <string name="vvm3_error_vms_dns_failure_message">Hibába ütköztünk. Próbálkozzon újra később. Ha továbbra is problémát tapasztal, forduljon az ügyfélszolgálathoz a következő telefonszámon, és adja meg a 9001-es hibakódot: %1$s.</string>
+  <string name="vvm3_error_vmg_dns_failure_title">Hiba történt</string>
+  <string name="vvm3_error_vmg_dns_failure_message">Hibába ütköztünk. Próbálkozzon újra később. Ha továbbra is problémát tapasztal, forduljon az ügyfélszolgálathoz a következő telefonszámon, és adja meg a 9002-es hibakódot: %1$s.</string>
+  <string name="vvm3_error_spg_dns_failure_title">Hiba történt</string>
+  <string name="vvm3_error_spg_dns_failure_message">Hibába ütköztünk. Próbálkozzon újra később. Ha továbbra is problémát tapasztal, forduljon az ügyfélszolgálathoz a következő telefonszámon, és adja meg a 9003-as hibakódot: %1$s.</string>
+  <string name="vvm3_error_vms_no_cellular_title">Nem sikerült csatlakozni a hangpostafiókjához</string>
+  <string name="vvm3_error_vms_no_cellular_message">Nem tudtunk csatlakozni a hangpostafiókjához. Ha olyan helyen tartózkodik, ahol gyenge a hálózat, próbálkozzon újra később, amikor újra erős lesz a hálózati jel. Ha továbbra is problémát tapasztal, forduljon az ügyfélszolgálathoz a következő telefonszámon, és adja meg a 9004-es hibakódot: %1$s.</string>
+  <string name="vvm3_error_vmg_no_cellular_title">Nem sikerült csatlakozni a hangpostafiókjához</string>
+  <string name="vvm3_error_vmg_no_cellular_message">Nem tudtunk csatlakozni a hangpostafiókjához. Ha olyan helyen tartózkodik, ahol gyenge a hálózat, próbálkozzon újra később, amikor újra erős lesz a hálózati jel. Ha továbbra is problémát tapasztal, forduljon az ügyfélszolgálathoz a következő telefonszámon, és adja meg a 9005-ös hibakódot: %1$s.</string>
+  <string name="vvm3_error_spg_no_cellular_title">Nem sikerült csatlakozni a hangpostafiókjához</string>
+  <string name="vvm3_error_spg_no_cellular_message">Nem tudtunk csatlakozni a hangpostafiókjához. Ha olyan helyen tartózkodik, ahol gyenge a hálózat, próbálkozzon újra később, amikor újra erős lesz a hálózati jel. Ha továbbra is problémát tapasztal, forduljon az ügyfélszolgálathoz a következő telefonszámon, és adja meg a 9006-os hibakódot: %1$s.</string>
+  <string name="vvm3_error_vms_timeout_title">Hiba történt</string>
+  <string name="vvm3_error_vms_timeout_message">Hibába ütköztünk. Próbálkozzon újra később. Ha továbbra is problémát tapasztal, forduljon az ügyfélszolgálathoz a következő telefonszámon, és adja meg a 9007-es hibakódot: %1$s.</string>
+  <string name="vvm3_error_vmg_timeout_title">Hiba történt</string>
+  <string name="vvm3_error_vmg_timeout_message">Hibába ütköztünk. Próbálkozzon újra később. Ha továbbra is problémát tapasztal, forduljon az ügyfélszolgálathoz a következő telefonszámon, és adja meg a 9008-as hibakódot: %1$s.</string>
+  <string name="vvm3_error_status_sms_timeout_title">Hiba történt</string>
+  <string name="vvm3_error_status_sms_timeout_message">Sajnos nem sikerült beállítanunk a szolgáltatást. Próbálkozzon újra később. Ha továbbra is problémát tapasztal, forduljon az ügyfélszolgálathoz a következő telefonszámon, és adja meg a 9009-es hibakódot: %1$s.</string>
+  <string name="vvm3_error_subscriber_blocked_title">Nem sikerült csatlakozni a hangpostafiókjához</string>
+  <string name="vvm3_error_subscriber_blocked_message">Sajnos jelenleg nem tudunk csatlakozni a hangpostafiókjához. Ha továbbra is problémát tapasztal, forduljon az ügyfélszolgálathoz a következő telefonszámon, és adja meg a 9990-es hibakódot: %1$s.</string>
+  <string name="vvm3_error_unknown_user_title">Hangposta beállítása</string>
+  <string name="vvm3_error_unknown_user_message">Fiókjában nincs beállítva a hangposta. Forduljon az ügyfélszolgálathoz a következő telefonszámon, és adja meg a 9991-es hibakódot: %1$s.</string>
+  <string name="vvm3_error_unknown_device_title">Hangposta</string>
+  <string name="vvm3_error_unknown_device_message">A vizuális hangposta nem használható ezen a készüléken. Forduljon az ügyfélszolgálathoz a következő telefonszámon, és adja meg a 9992-es hibakódot: %1$s.</string>
+  <string name="vvm3_error_invalid_password_title">Hiba történt</string>
+  <string name="vvm3_error_invalid_password_message">Forduljon az ügyfélszolgálathoz a következő telefonszámon, és adja meg a 9993-as hibakódot: %1$s.</string>
+  <string name="vvm3_error_mailbox_not_initialized_title">Vizuális hangposta</string>
+  <string name="vvm3_error_mailbox_not_initialized_message">A vizuális hangposta beállításának befejezéséhez hívja az ügyfélszolgálatot a következő telefonszámon, és adja meg a 9994-es hibakódot: %1$s.</string>
+  <string name="vvm3_error_service_not_provisioned_title">Vizuális hangposta</string>
+  <string name="vvm3_error_service_not_provisioned_message">A vizuális hangposta beállításának befejezéséhez hívja az ügyfélszolgálatot a következő telefonszámon, és adja meg a 9995-ös hibakódot: %1$s.</string>
+  <string name="vvm3_error_service_not_activated_title">Vizuális hangposta</string>
+  <string name="vvm3_error_service_not_activated_message">A vizuális hangposta aktiválásához hívja az ügyfélszolgálatot a következő telefonszámon, és adja meg a 9996-os hibakódot: %1$s.</string>
+  <string name="vvm3_error_user_blocked_title">Hiba történt</string>
+  <string name="vvm3_error_user_blocked_message">A vizuális hangposta beállításának befejezéséhez hívja az ügyfélszolgálatot a következő telefonszámon, és adja meg a 9998-as hibakódot: %1$s.</string>
+  <string name="vvm3_error_subscriber_unknown_title">A vizuális hangposta ki van kapcsolva</string>
+  <string name="vvm3_error_subscriber_unknown_message">A vizuális hangposta aktiválásához hívja az ügyfélszolgálatot a következő számon: %1$s.</string>
+  <string name="vvm3_error_imap_getquota_error_title">Hiba történt</string>
+  <string name="vvm3_error_imap_getquota_error_message">Forduljon az ügyfélszolgálathoz a következő telefonszámon, és adja meg a 9997-es hibakódot: %1$s.</string>
+  <string name="vvm3_error_imap_select_error_title">Hiba történt</string>
+  <string name="vvm3_error_imap_select_error_message">Forduljon az ügyfélszolgálathoz a következő telefonszámon, és adja meg a 9989-es hibakódot: %1$s.</string>
+  <string name="vvm3_error_imap_error_title">Hiba történt</string>
+  <string name="vvm3_error_imap_error_message">Forduljon az ügyfélszolgálathoz a következő telefonszámon, és adja meg a 9999-es hibakódot: %1$s.</string>
+  <string name="verizon_terms_and_conditions_title">A vizuális hangposta bekapcsolása</string>
+  <string name="verizon_terms_and_conditions_message">%1$s A vizuális hangposta bekapcsolásával elfogadja a Verizon Wireless Általános Szerződési Feltételeit:\n\n%2$s</string>
+  <string name="dialer_terms_and_conditions_title">A vizuális hangposta bekapcsolása</string>
+  <string name="dialer_terms_and_conditions_existing_user_title">Új! Olvassa el hangpostaüzeneteit</string>
+  <string name="dialer_terms_and_conditions_message">%s</string>
+  <string name="dialer_terms_and_conditions_1.0">Telefonálás nélkül tekintheti meg és hallgathatja vissza hangpostafiókja tartalmát. A hangpostaüzenetek átiratát a Google ingyenes átírási szolgáltatása biztosítja. A funkciót bármikor kikapcsolhatja a beállításoknál. %s</string>
+  <string name="dialer_terms_and_conditions_existing_user">A hangpostaüzenetek átiratát a Google ingyenes átírási szolgáltatása biztosítja. A funkciót bármikor kikapcsolhatja a beállításoknál. %s</string>
+  <string name="dialer_terms_and_conditions_for_verizon_1.0">Telefonálás nélkül tekintheti meg és hallgathatja vissza hangpostafiókja tartalmát.</string>
+  <string name="dialer_terms_and_conditions_learn_more">További információ</string>
+  <string name="dialer_terms_and_conditions_existing_user_ack">Rendben, értem</string>
+  <string name="dialer_terms_and_conditions_existing_user_decline">Nem, köszönöm</string>
+  <string name="terms_and_conditions_decline_dialog_title">Letiltja a vizuális hangpostát?</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_message">Ha nem fogadja el az Általános Szerződési Feltételeket, letiltjuk a vizuális hangpostát.</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_downgrade">Letiltás</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_message">Ha kikapcsolja a Vizuális hangposta beállítást, a vizuális hangposta le lesz tiltva.</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_downgrade">Letiltás</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message">A hangpostát a *86 számot tárcsázva érheti el. A folytatáshoz állítson be új PIN-kódot.</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin">PIN-kód beállítása</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/error/res/values-hy/strings.xml b/java/com/android/dialer/voicemail/listui/error/res/values-hy/strings.xml
new file mode 100644
index 0000000..bb580bd
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/error/res/values-hy/strings.xml
@@ -0,0 +1,102 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_error_activating_title">Ձայնային փոստի ցուցադրման ակտիվացում</string>
+  <string name="voicemail_error_activating_message">Ձայնային հաղորդագրությունների մասին ծանուցումներ չեք ստանա, քանի որ չեք ակտիվացրել ձայնային փոստի ցուցադրումը: Մինչ այդ, նոր հաղորդագրությունները լսելու համար զանգեք ձայնային փոստի ծառայություն:</string>
+  <string name="voicemail_error_not_activate_no_signal_title">Չհաջողվեց ակտիվացնել ձայնային փոստի ցուցադրումը</string>
+  <string name="voicemail_error_not_activate_no_signal_message">Համոզվեք, որ հեռախոսը միացած է բջջային ցանցին, և նորից փորձեք:</string>
+  <string name="voicemail_error_not_activate_no_signal_airplane_mode_message">Անջատեք ինքնաթիռի ռեժիմը և նորից փորձեք:</string>
+  <string name="voicemail_error_no_signal_title">Կապ չկա</string>
+  <string name="voicemail_error_no_signal_message">Նոր ձայնային հաղորդագրությունների մասին ծանուցումներ չեք ստանա: Եթե միացած եք Wi-Fi-ին, կարող եք ստուգել ձայնային փոստը՝ կատարելով համաժամեցում:</string>
+  <string name="voicemail_error_no_signal_airplane_mode_message">Նոր ձայնային հաղորդագրությունների մասին ծանուցումներ չեք ստանա: Անջատեք ինքնաթիռի ռեժիմը՝ ձայնային փոստը համաժամեցնելու համար:</string>
+  <string name="voicemail_error_no_signal_cellular_required_message">Ձայնային փոստը ստուգելու համար ձեր հեռախոսի բջջային ինտերնետը պետք է միացած լինի:</string>
+  <string name="voicemail_error_activation_failed_title">Չհաջողվեց ակտիվացնել ձայնային փոստի ցուցադրումը</string>
+  <string name="voicemail_error_activation_failed_message">Ձայնային փոստը ստուգելու համար զանգահարեք հատուկ համարին:</string>
+  <string name="voicemail_error_no_data_title">Չհաջողվեց թարմացնել ձայնային փոստի ցուցադրումը</string>
+  <string name="voicemail_error_no_data_message">Նորից փորձեք, երբ Wi-Fi-ը կամ բջջային ինտերնետը լավանա: Ձայնային փոստը ստուգելու համար զանգահարեք հատուկ համարին:</string>
+  <string name="voicemail_error_no_data_cellular_required_message">Նորից փորձեք, երբ բջջային ինտերնետը լավանա: Ձայնային փոստը ստուգելու համար զանգահարեք հատուկ համարին:</string>
+  <string name="voicemail_error_bad_config_title">Չհաջողվեց թարմացնել ձայնային փոստի ցուցադրումը</string>
+  <string name="voicemail_error_bad_config_message">Ձայնային փոստը ստուգելու համար զանգահարեք հատուկ համարին:</string>
+  <string name="voicemail_error_communication_title">Չհաջողվեց թարմացնել ձայնային փոստի ցուցադրումը</string>
+  <string name="voicemail_error_communication_message">Ձայնային փոստը ստուգելու համար զանգահարեք հատուկ համարին:</string>
+  <string name="voicemail_error_server_connection_title">Չհաջողվեց թարմացնել ձայնային փոստի ցուցադրումը</string>
+  <string name="voicemail_error_server_connection_message">Ձայնային փոստը ստուգելու համար զանգահարեք հատուկ համարին:</string>
+  <string name="voicemail_error_server_title">Չհաջողվեց թարմացնել ձայնային փոստի ցուցադրումը</string>
+  <string name="voicemail_error_server_message">Ձայնային փոստը ստուգելու համար զանգահարեք հատուկ համարին:</string>
+  <string name="voicemail_error_inbox_near_full_title">Մուտքի արկղը գրեթե լիքն է</string>
+  <string name="voicemail_error_inbox_near_full_message">Եթե մուտքի արկղը լցվի, նոր ձայնային հաղորդագրություններ չեք կարողանա ստանալ:</string>
+  <string name="voicemail_error_inbox_full_title">Հնարավոր չէ ստանալ նոր ձայնային հաղորդագրություններ</string>
+  <string name="voicemail_error_inbox_full_message">Մուտքի արկղը լիքն է: Նոր հաղոդագրություններ ստանալու համար ջնջեք հները:</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_title">Պահանջվում է լրացուցիչ տարածք</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_message">Ձեր փոստարկղը լիքն է: Ակտիվացրեք լրացուցիչ տարածք, որպեսզի Google-ը կարողանա կառավարել և պահուստավորել ձեր ձայնային փոստի հաղորդագրությունները:</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_title">Պահանջվում է լրացուցիչ տարածք</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_message">Ձեր փոստարկղը գրեթե լիքն է: Ակտիվացրեք լրացուցիչ տարածք, որպեսզի Google-ը կարողանա կառավարել և պահուստավորել ձեր ձայնային փոստի հաղորդագրությունները:</string>
+  <string name="voicemail_error_pin_not_set_title">Սահմանեք ձեր ձայնային փոստի PIN-ը</string>
+  <string name="voicemail_error_pin_not_set_message">Ամեն անգամ ձայնային փոստին զանգելիս ձեզանից կպահանջվի ձայնային փոստի PIN-ը:</string>
+  <string name="voicemail_action_turn_off_airplane_mode">Ինքնաթիռի ռեժիմի կարգավորումներ</string>
+  <string name="voicemail_action_set_pin">Սահմանեք PIN կոդ</string>
+  <string name="voicemail_action_retry">Փորձել</string>
+  <string name="voicemail_action_turn_archive_on">Միացնել</string>
+  <string name="voicemail_action_dimiss">Ոչ</string>
+  <string name="voicemail_action_sync">Համաժամեցնել</string>
+  <string name="voicemail_action_call_voicemail">Զանգել ձայնային փոստին</string>
+  <string name="voicemail_action_call_customer_support">Զանգել հաճախորդների աջակցման կենտրոն</string>
+  <string name="vvm3_error_vms_dns_failure_title">Սխալ առաջացավ</string>
+  <string name="vvm3_error_vms_dns_failure_message">Սխալ առաջացավ: Փորձեք ավելի ուշ: Եթե խնդիրը չվերանա, %1$s համարով կապվեք հաճախորդների սպասարկման ծառայության հետ և հայտնեք սխալի 9001 կոդը:</string>
+  <string name="vvm3_error_vmg_dns_failure_title">Սխալ առաջացավ</string>
+  <string name="vvm3_error_vmg_dns_failure_message">Սխալ առաջացավ: Փորձեք ավելի ուշ: Եթե խնդիրը չվերանա, %1$s համարով կապվեք հաճախորդների սպասարկման ծառայության հետ և հայտնեք սխալի 9002 կոդը:</string>
+  <string name="vvm3_error_spg_dns_failure_title">Սխալ առաջացավ</string>
+  <string name="vvm3_error_spg_dns_failure_message">Սխալ առաջացավ: Փորձեք ավելի ուշ: Եթե խնդիրը չվերանա, %1$s համարով կապվեք hաճախորդների սպասարկման ծառայության հետ և հայտնեք սխալի 9003 կոդը:</string>
+  <string name="vvm3_error_vms_no_cellular_title">Չհաջողվեց միանալ ձայնային փոստարկղին</string>
+  <string name="vvm3_error_vms_no_cellular_message">Չհաջողվեց միանալ ձայնային փոստարկղին: Եթե բջջային ցանցի ազդանշանը թույլ է, սպասեք, միչև որ այն ուժեղանա և նորից փորձեք: Եթե խնդիրը չվերանա, %1$s համարով կապվեք hաճախորդների սպասարկման ծառայության հետ և հայտնեք սխալի 9004 կոդը:</string>
+  <string name="vvm3_error_vmg_no_cellular_title">Չհաջողվեց միանալ ձայնային փոստարկղին</string>
+  <string name="vvm3_error_vmg_no_cellular_message">Չհաջողվեց միանալ ձայնային փոստարկղին: Եթե բջջային ցանցի ազդանշանը թույլ է, սպասեք, միչև որ այն ուժեղանա և նորից փորձեք: Եթե խնդիրը չվերանա, %1$s համարով կապվեք hաճախորդների սպասարկման ծառայության հետ և հայտնեք սխալի 9005 կոդը:</string>
+  <string name="vvm3_error_spg_no_cellular_title">Չհաջողվեց միանալ ձայնային փոստարկղին</string>
+  <string name="vvm3_error_spg_no_cellular_message">Չհաջողվեց միանալ ձայնային փոստարկղին: Եթե բջջային ցանցի ազդանշանը թույլ է, սպասեք, միչև որ այն ուժեղանա և նորից փորձեք: Եթե խնդիրը չվերանա, %1$s համարով կապվեք hաճախորդների սպասարկման ծառայության հետ և հայտնեք սխալի 9006 կոդը:</string>
+  <string name="vvm3_error_vms_timeout_title">Սխալ առաջացավ</string>
+  <string name="vvm3_error_vms_timeout_message">Սխալ առաջացավ: Փորձեք ավելի ուշ: Եթե խնդիրը չվերանա, %1$s համարով կապվեք hաճախորդների սպասարկման ծառայության հետ և հայտնեք սխալի 9007 կոդը:</string>
+  <string name="vvm3_error_vmg_timeout_title">Սխալ առաջացավ</string>
+  <string name="vvm3_error_vmg_timeout_message">Սխալ առաջացավ: Փորձեք ավելի ուշ: Եթե խնդիրը չվերանա, %1$s համարով կապվեք hաճախորդների սպասարկման ծառայության հետ և հայտնեք սխալի 9008 կոդը:</string>
+  <string name="vvm3_error_status_sms_timeout_title">Սխալ առաջացավ</string>
+  <string name="vvm3_error_status_sms_timeout_message">Սերվերը կարգավորելիս սխալ առաջացավ: Փորձեք ավելի ուշ: Եթե խնդիրը չվերանա, %1$s համարով կապվեք hաճախորդների սպասարկման ծառայության հետ և հայտնեք սխալի 9009 կոդը:</string>
+  <string name="vvm3_error_subscriber_blocked_title">Չհաջողվեց միանալ ձայնային փոստարկղին</string>
+  <string name="vvm3_error_subscriber_blocked_message">Դեռևս չի հաջողվում միանալ ձայնային փոստարկղին: Փորձեք ավելի ուշ: Եթե խնդիրը չվերանա, %1$s համարով կապվեք hաճախորդների սպասարկման ծառայության հետ և հայտնեք սխալի 9990 կոդը:</string>
+  <string name="vvm3_error_unknown_user_title">Ձայնային փոստի կարգավորում</string>
+  <string name="vvm3_error_unknown_user_message">Ձեր հաշվի ձայնային փոստը կարգավորված չէ: %1$s համարով կապվեք hաճախորդների սպասարկման ծառայության հետ և հայտնեք սխալի 9991 կոդը:</string>
+  <string name="vvm3_error_unknown_device_title">Ձայնային փոստ</string>
+  <string name="vvm3_error_unknown_device_message">Ձայնային փոստի ցուցադրումը հասանելի չէ այս սարքում: %1$s համարով կապվեք hաճախորդների սպասարկման ծառայության հետ և հայտնեք սխալի 9992 կոդը:</string>
+  <string name="vvm3_error_invalid_password_title">Սխալ առաջացավ</string>
+  <string name="vvm3_error_invalid_password_message">%1$s համարով կապվեք hաճախորդների սպասարկման ծառայության հետ և հայտնեք սխալի 9993 կոդը:</string>
+  <string name="vvm3_error_mailbox_not_initialized_title">Ձայնային փոստի ցուցադրում</string>
+  <string name="vvm3_error_mailbox_not_initialized_message">Ձայնային փոստի ցուցադրման կարգավորումն ավարտելու համար %1$s հեռախոսահամարով կապվեք hաճախորդների սպասարկման ծառայության հետ և հայտնեք սխալի 9994 կոդը:</string>
+  <string name="vvm3_error_service_not_provisioned_title">Ձայնային փոստի ցուցադրում</string>
+  <string name="vvm3_error_service_not_provisioned_message">Ձայնային փոստի ցուցադրման կարգավորումն ավարտելու համար %1$s հեռախոսահամարով կապվեք hաճախորդների սպասարկման ծառայության հետ և հայտնեք սխալի 9995 կոդը:</string>
+  <string name="vvm3_error_service_not_activated_title">Ձայնային փոստի ցուցադրում</string>
+  <string name="vvm3_error_service_not_activated_message">Ձայնային փոստի ցուցադրումն ակտիվացնելու համար %1$s հեռախոսահամարով կապվեք hաճախորդների սպասարկման ծառայության հետ և հայտնեք սխալի 9996 կոդը:</string>
+  <string name="vvm3_error_user_blocked_title">Սխալ առաջացավ</string>
+  <string name="vvm3_error_user_blocked_message">Ձայնային փոստի ցուցադրման կարգավորումն ավարտելու համար %1$s հեռախոսահամարով կապվեք hաճախորդների սպասարկման ծառայության հետ և հայտնեք սխալի 9998 կոդը:</string>
+  <string name="vvm3_error_subscriber_unknown_title">Ձայնային փոստի ցուցադրումն անջատած է</string>
+  <string name="vvm3_error_subscriber_unknown_message">Ձայնային փոստի ցուցադրումն ակտիվացնելու համար %1$s հեռախոսահամարով կապվեք hաճախորդների սպասարկման ծառայության հետ:</string>
+  <string name="vvm3_error_imap_getquota_error_title">Սխալ առաջացավ</string>
+  <string name="vvm3_error_imap_getquota_error_message">%1$s համարով կապվեք hաճախորդների սպասարկման ծառայության հետ և հայտնեք սխալի 9997 կոդը:</string>
+  <string name="vvm3_error_imap_select_error_title">Սխալ առաջացավ</string>
+  <string name="vvm3_error_imap_select_error_message">%1$s համարով կապվեք hաճախորդների սպասարկման ծառայության հետ և հայտնեք սխալի 9989 կոդը:</string>
+  <string name="vvm3_error_imap_error_title">Սխալ առաջացավ</string>
+  <string name="vvm3_error_imap_error_message">%1$s համարով կապվեք hաճախորդների սպասարկման ծառայության հետ և հայտնեք սխալի 9999 կոդը:</string>
+  <string name="verizon_terms_and_conditions_title">Միացնել ձայնային փոստի ցուցադրումը</string>
+  <string name="verizon_terms_and_conditions_message">%1$s Միացնելով ձայնային փոստի ցուցադրումը՝ դուք ընդունում եք Verizon Wireless-ի օգտագործման պայմանները՝\n\n%2$s</string>
+  <string name="dialer_terms_and_conditions_title">Միացնել ձայնային փոստի ցուցադրումը</string>
+  <string name="dialer_terms_and_conditions_existing_user_title">Նորույթ: Կարդացեք ձեր ձայնային հաղորդագրությունները</string>
+  <string name="dialer_terms_and_conditions_message">%s</string>
+  <string name="dialer_terms_and_conditions_1.0">Տեսեք և լսեք ձեր հաղորդագրությունները՝ առանց ձայնային փոստին զանգելու անհրաժեշտության: Ձայնային հաղորդագրությունների տառադրումն արվում է Google-ի անվճար տառադրման ծառայության կողմից: Ցանկացած ժամանակ կարգավորումներում կարող եք անջատել այս գործառույթը: %s</string>
+  <string name="dialer_terms_and_conditions_existing_user">Ձայնային հաղորդագրությունների տառադրումն այժմ արվում է Google-ի անվճար տառադրման ծառայության կողմից: Ցանկացած ժամանակ կարգավորումներում կարող եք անջատել այս գործառույթը: %s</string>
+  <string name="dialer_terms_and_conditions_for_verizon_1.0">Տեսեք և լսեք ձեր հաղորդագրությունները՝ առանց ձայնային փոստին զանգելու անհրաժեշտության:</string>
+  <string name="dialer_terms_and_conditions_learn_more">Իմանալ ավելին</string>
+  <string name="dialer_terms_and_conditions_existing_user_ack">Պարզ է</string>
+  <string name="dialer_terms_and_conditions_existing_user_decline">Ոչ</string>
+  <string name="terms_and_conditions_decline_dialog_title">Անջատե՞լ ձայնային փոստի ցուցադրումը</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_message">Եթե չընդունեք օգտագործման պայմանները, ձայնային փոստի ցուցադրումը կանջատվի:</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_downgrade">Անջատել</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_message">Եթե անջատեք այս ծառայությունը, ձայնային փոստն այլևս չի ցուցադրվի:</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_downgrade">Անջատել</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message">Ձայնային փոստը հասանելի կլինի միայն *86 համարով: Շարունակելու համար ընտրեք ձայնային փոստի նոր PIN:</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin">Սահմանեք PIN կոդ</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/error/res/values-in/strings.xml b/java/com/android/dialer/voicemail/listui/error/res/values-in/strings.xml
new file mode 100644
index 0000000..61a9a8c
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/error/res/values-in/strings.xml
@@ -0,0 +1,102 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_error_activating_title">Mengaktifkan pesan suara visual</string>
+  <string name="voicemail_error_activating_message">Anda mungkin tidak menerima notifikasi pesan suara hingga pesan suara visual sepenuhnya diaktifkan. Panggil pesan suara untuk mengambil pesan baru sampai pesan suara sepenuhnya diaktifkan.</string>
+  <string name="voicemail_error_not_activate_no_signal_title">Tidak dapat mengaktifkan pesan suara visual</string>
+  <string name="voicemail_error_not_activate_no_signal_message">Pastikan ponsel Anda memiliki koneksi jaringan seluler, lalu coba lagi.</string>
+  <string name="voicemail_error_not_activate_no_signal_airplane_mode_message">Nonaktifkan mode pesawat, lalu coba lagi.</string>
+  <string name="voicemail_error_no_signal_title">Tidak ada koneksi internet</string>
+  <string name="voicemail_error_no_signal_message">Anda tidak akan menerima notifikasi pesan suara baru. Jika menggunakan Wi-Fi, pesan suara dapat diperiksa dengan menyinkronkannya sekarang.</string>
+  <string name="voicemail_error_no_signal_airplane_mode_message">Anda tidak akan menerima notifikasi pesan suara baru. Nonaktifkan mode pesawat untuk menyinkronkan pesan suara.</string>
+  <string name="voicemail_error_no_signal_cellular_required_message">Ponsel memerlukan koneksi data seluler untuk memeriksa pesan suara.</string>
+  <string name="voicemail_error_activation_failed_title">Tidak dapat mengaktifkan pesan suara visual</string>
+  <string name="voicemail_error_activation_failed_message">Anda masih dapat menelepon untuk memeriksa pesan suara.</string>
+  <string name="voicemail_error_no_data_title">Tidak dapat memperbarui pesan suara visual</string>
+  <string name="voicemail_error_no_data_message">Coba lagi ketika koneksi Wi-Fi atau data seluler lebih baik. Anda masih dapat menelepon untuk memeriksa pesan suara.</string>
+  <string name="voicemail_error_no_data_cellular_required_message">Coba lagi ketika koneksi data seluler lebih baik. Anda masih dapat menelepon untuk memeriksa pesan suara.</string>
+  <string name="voicemail_error_bad_config_title">Tidak dapat memperbarui pesan suara visual</string>
+  <string name="voicemail_error_bad_config_message">Anda masih dapat menelepon untuk memeriksa pesan suara.</string>
+  <string name="voicemail_error_communication_title">Tidak dapat memperbarui pesan suara visual</string>
+  <string name="voicemail_error_communication_message">Anda masih dapat menelepon untuk memeriksa pesan suara.</string>
+  <string name="voicemail_error_server_connection_title">Tidak dapat memperbarui pesan suara visual</string>
+  <string name="voicemail_error_server_connection_message">Anda masih dapat menelepon untuk memeriksa pesan suara.</string>
+  <string name="voicemail_error_server_title">Tidak dapat memperbarui pesan suara visual</string>
+  <string name="voicemail_error_server_message">Anda masih dapat menelepon untuk memeriksa pesan suara.</string>
+  <string name="voicemail_error_inbox_near_full_title">Kotak masuk hampir penuh</string>
+  <string name="voicemail_error_inbox_near_full_message">Pesan suara tidak dapat diterima jika kotak masuk Anda penuh.</string>
+  <string name="voicemail_error_inbox_full_title">Tidak dapat menerima pesan suara baru</string>
+  <string name="voicemail_error_inbox_full_message">Kotak masuk Anda penuh. Coba hapus beberapa pesan untuk menerima pesan suara baru.</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_title">Aktifkan penyimpanan dan backup ekstra</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_message">Kotak surat Anda sudah penuh. Untuk mengosongkan ruang, aktifkan penyimpanan ekstra sehingga Google dapat mengelola dan melakukan backup pada pesan suara Anda.</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_title">Aktifkan penyimpanan dan backup ekstra</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_message">Kotak surat Anda hampir penuh. Untuk mengosongkan ruang, aktifkan penyimpanan ekstra sehingga Google dapat mengelola dan melakukan backup pada pesan suara Anda.</string>
+  <string name="voicemail_error_pin_not_set_title">Setel PIN pesan suara Anda</string>
+  <string name="voicemail_error_pin_not_set_message">Anda memerlukan PIN pesan suara setiap kali menelepon untuk mengakses pesan suara.</string>
+  <string name="voicemail_action_turn_off_airplane_mode">Setelan Mode Pesawat</string>
+  <string name="voicemail_action_set_pin">Setel PIN</string>
+  <string name="voicemail_action_retry">Coba Lagi</string>
+  <string name="voicemail_action_turn_archive_on">Aktifkan</string>
+  <string name="voicemail_action_dimiss">Tidak</string>
+  <string name="voicemail_action_sync">Sinkronkan</string>
+  <string name="voicemail_action_call_voicemail">Panggil Pesan Suara</string>
+  <string name="voicemail_action_call_customer_support">Panggil Dukungan Pelanggan</string>
+  <string name="vvm3_error_vms_dns_failure_title">Terjadi Masalah</string>
+  <string name="vvm3_error_vms_dns_failure_message">Maaf, kami mengalami masalah. Coba lagi nanti. Jika masih ada masalah, hubungi Layanan Pelanggan melalui nomor telepon %1$s dan beri tahukan kode error 9001.</string>
+  <string name="vvm3_error_vmg_dns_failure_title">Terjadi Masalah</string>
+  <string name="vvm3_error_vmg_dns_failure_message">Maaf, kami mengalami masalah. Coba lagi nanti. Jika masih ada masalah, hubungi Layanan Pelanggan melalui nomor telepon %1$s dan beri tahukan kode error 9002.</string>
+  <string name="vvm3_error_spg_dns_failure_title">Terjadi Masalah</string>
+  <string name="vvm3_error_spg_dns_failure_message">Maaf, kami mengalami masalah. Coba lagi nanti. Jika masih ada masalah, hubungi Layanan Pelanggan melalui nomor telepon %1$s dan beri tahukan kode error 9003.</string>
+  <string name="vvm3_error_vms_no_cellular_title">Tidak Dapat Menyambungkan ke Kotak Pesan Suara Anda</string>
+  <string name="vvm3_error_vms_no_cellular_message">Maaf, kami mengalami masalah saat menyambungkan ke kotak pesan suara Anda. Jika Anda berada di area dengan kekuatan sinyal yang buruk, tunggu hingga sinyal membaik, lalu coba lagi. Jika masih ada masalah, hubungi Layanan Pelanggan melalui nomor telepon %1$s dan beri tahukan kode error 9004.</string>
+  <string name="vvm3_error_vmg_no_cellular_title">Tidak Dapat Menyambungkan ke Kotak Pesan Suara Anda</string>
+  <string name="vvm3_error_vmg_no_cellular_message">Maaf, kami mengalami masalah saat menyambungkan ke kotak pesan suara Anda. Jika Anda berada di area dengan kekuatan sinyal yang buruk, tunggu hingga sinyal membaik, lalu coba lagi. Jika masih ada masalah, hubungi Layanan Pelanggan melalui nomor telepon %1$s dan beri tahukan kode error 9005.</string>
+  <string name="vvm3_error_spg_no_cellular_title">Tidak Dapat Menyambungkan ke Kotak Pesan Suara Anda</string>
+  <string name="vvm3_error_spg_no_cellular_message">Maaf, kami mengalami masalah saat menyambungkan ke kotak pesan suara Anda. Jika Anda berada di area dengan kekuatan sinyal yang buruk, tunggu hingga sinyal membaik, lalu coba lagi. Jika masih ada masalah, hubungi Layanan Pelanggan melalui nomor telepon %1$s dan beri tahukan kode error 9006.</string>
+  <string name="vvm3_error_vms_timeout_title">Terjadi Masalah</string>
+  <string name="vvm3_error_vms_timeout_message">Maaf, kami mengalami masalah. Coba lagi nanti. Jika masih ada masalah, hubungi Layanan Pelanggan melalui nomor telepon %1$s dan beri tahukan kode error 9007.</string>
+  <string name="vvm3_error_vmg_timeout_title">Terjadi Masalah</string>
+  <string name="vvm3_error_vmg_timeout_message">Maaf, kami mengalami masalah. Coba lagi nanti. Jika masih ada masalah, hubungi Layanan Pelanggan melalui nomor telepon %1$s dan beri tahukan kode error 9008.</string>
+  <string name="vvm3_error_status_sms_timeout_title">Terjadi Masalah</string>
+  <string name="vvm3_error_status_sms_timeout_message">Maaf, kami mengalami masalah saat menyiapkan layanan Anda. Coba lagi nanti. Jika masih ada masalah, hubungi Layanan Pelanggan melalui nomor telepon %1$s dan beri tahukan kode error 9009.</string>
+  <string name="vvm3_error_subscriber_blocked_title">Tidak Dapat Menyambungkan ke Kotak Pesan Suara Anda</string>
+  <string name="vvm3_error_subscriber_blocked_message">Maaf, kami tidak dapat menyambungkan ke kotak pesan suara Anda saat ini. Coba lagi nanti. Jika masih ada masalah, hubungi Layanan Pelanggan melalui nomor telepon %1$s dan beri tahukan kode error 9990.</string>
+  <string name="vvm3_error_unknown_user_title">Siapkan Pesan Suara</string>
+  <string name="vvm3_error_unknown_user_message">Pesan suara tidak disiapkan pada akun Anda. Hubungi Layanan Pelanggan melalui nomor telepon %1$s dan beri tahukan kode error 9991.</string>
+  <string name="vvm3_error_unknown_device_title">Pesan Suara</string>
+  <string name="vvm3_error_unknown_device_message">Pesan suara visual tidak dapat digunakan pada perangkat ini. Hubungi Layanan Pelanggan melalui nomor telepon %1$s dan beri tahukan kode error 9992.</string>
+  <string name="vvm3_error_invalid_password_title">Terjadi Masalah</string>
+  <string name="vvm3_error_invalid_password_message">Hubungi Layanan Pelanggan melalui nomor telepon %1$s dan beri tahukan kode error 9993.</string>
+  <string name="vvm3_error_mailbox_not_initialized_title">Pesan suara visual</string>
+  <string name="vvm3_error_mailbox_not_initialized_message">Untuk menyelesaikan penyiapan pesan suara visual, hubungi Layanan Pelanggan melalui nomor telepon %1$s dan beri tahukan kode error 9994.</string>
+  <string name="vvm3_error_service_not_provisioned_title">Pesan suara visual</string>
+  <string name="vvm3_error_service_not_provisioned_message">Untuk menyelesaikan penyiapan pesan suara visual, hubungi Layanan Pelanggan melalui nomor telepon %1$s dan beri tahukan kode error 9995.</string>
+  <string name="vvm3_error_service_not_activated_title">Pesan suara visual</string>
+  <string name="vvm3_error_service_not_activated_message">Untuk mengaktifkan pesan suara visual, hubungi Layanan Pelanggan melalui nomor telepon %1$s dan beri tahukan kode error 9996.</string>
+  <string name="vvm3_error_user_blocked_title">Terjadi Masalah</string>
+  <string name="vvm3_error_user_blocked_message">Untuk menyelesaikan penyiapan pesan suara visual, hubungi Layanan Pelanggan melalui nomor telepon %1$s dan beri tahukan kode error 9998.</string>
+  <string name="vvm3_error_subscriber_unknown_title">Pesan suara visual dinonaktifkan</string>
+  <string name="vvm3_error_subscriber_unknown_message">Hubungi Layanan Pelanggan melalui nomor telepon %1$s untuk mengaktifkan pesan suara visual.</string>
+  <string name="vvm3_error_imap_getquota_error_title">Terjadi Masalah</string>
+  <string name="vvm3_error_imap_getquota_error_message">Hubungi Layanan Pelanggan melalui nomor telepon %1$s dan beri tahukan kode error 9997.</string>
+  <string name="vvm3_error_imap_select_error_title">Terjadi Masalah</string>
+  <string name="vvm3_error_imap_select_error_message">Hubungi Layanan Pelanggan melalui nomor telepon %1$s dan beri tahukan kode error 9989.</string>
+  <string name="vvm3_error_imap_error_title">Terjadi Masalah</string>
+  <string name="vvm3_error_imap_error_message">Hubungi Layanan Pelanggan melalui nomor telepon %1$s dan beri tahukan kode error 9999.</string>
+  <string name="verizon_terms_and_conditions_title">Aktifkan pesan suara visual</string>
+  <string name="verizon_terms_and_conditions_message">%1$s Dengan mengaktifkan pesan suara visual, Anda setuju pada syarat dan ketentuan Verizon Wireless:\n\n%2$s</string>
+  <string name="dialer_terms_and_conditions_title">Aktifkan pesan suara visual</string>
+  <string name="dialer_terms_and_conditions_existing_user_title">Baru! Bacalah pesan suara Anda</string>
+  <string name="dialer_terms_and_conditions_message">%s</string>
+  <string name="dialer_terms_and_conditions_1.0">Lihat dan dengarkan pesan Anda, tanpa harus menelepon pesan suara. Transkrip pesan suara Anda disediakan oleh layanan transkripsi gratis dari Google. Anda dapat menonaktifkannya di Setelan kapan saja. %s</string>
+  <string name="dialer_terms_and_conditions_existing_user">Transkrip pesan suara Anda kini disediakan oleh layanan transkripsi gratis dari Google. Anda dapat menonaktifkannya di Setelan kapan saja. %s</string>
+  <string name="dialer_terms_and_conditions_for_verizon_1.0">Lihat dan dengarkan pesan Anda, tanpa harus menelepon pesan suara.</string>
+  <string name="dialer_terms_and_conditions_learn_more">Pelajari lebih lanjut</string>
+  <string name="dialer_terms_and_conditions_existing_user_ack">Oke</string>
+  <string name="dialer_terms_and_conditions_existing_user_decline">Tidak</string>
+  <string name="terms_and_conditions_decline_dialog_title">Nonaktifkan pesan suara visual?</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_message">Pesan suara visual akan dinonaktifkan jika persyaratan dan ketentuan ditolak.</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_downgrade">Nonaktifkan</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_message">Pesan suara visual tidak akan dapat digunakan jika Anda menonaktifkannya.</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_downgrade">Nonaktifkan</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message">Pesan suara hanya dapat diakses dengan menghubungi *86. Setel PIN pesan suara baru untuk melanjutkan.</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin">Setel PIN</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/error/res/values-is/strings.xml b/java/com/android/dialer/voicemail/listui/error/res/values-is/strings.xml
new file mode 100644
index 0000000..abce78e
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/error/res/values-is/strings.xml
@@ -0,0 +1,102 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_error_activating_title">Virkjar myndrænt talhólf</string>
+  <string name="voicemail_error_activating_message">Þú getur ekki fengið tilkynningar um talhólfsskilaboð fyrr en myndrænt talhólf er virkjað að fullu. Hringdu í talhólfið til að sækja ný skilaboð þar til talhólfið hefur verið virkjað að fullu.</string>
+  <string name="voicemail_error_not_activate_no_signal_title">Ekki hægt að virkja myndrænt talhólf</string>
+  <string name="voicemail_error_not_activate_no_signal_message">Gakktu úr skugga um að síminn sé tengdur farsímakerfi og reyndu aftur.</string>
+  <string name="voicemail_error_not_activate_no_signal_airplane_mode_message">Slökktu á flugstillingu og reyndu aftur.</string>
+  <string name="voicemail_error_no_signal_title">Engin tenging</string>
+  <string name="voicemail_error_no_signal_message">Þú færð ekki tilkynningar um ný talhólfsskilaboð. Ef síminn er tengdur við Wi-Fi net geturðu athugað talhólfið með því að samstilla núna.</string>
+  <string name="voicemail_error_no_signal_airplane_mode_message">Þú færð ekki tilkynningu um ný talhólfsskilaboð. Slökktu á flugstillingu til að samstilla talhólfið.</string>
+  <string name="voicemail_error_no_signal_cellular_required_message">Síminn þarf tengingu við farsímanet til að athuga talhólf.</string>
+  <string name="voicemail_error_activation_failed_title">Ekki hægt að virkja myndrænt talhólf</string>
+  <string name="voicemail_error_activation_failed_message">Þú getur ennþá hringt til að athuga talhólfið.</string>
+  <string name="voicemail_error_no_data_title">Ekki hægt að uppfæra sjónrænt talhólf</string>
+  <string name="voicemail_error_no_data_message">Reyndu aftur þegar tenging við Wi-Fi net eða farsímanet er betri. Þú getur ennþá hringt til að athuga talhólfið.</string>
+  <string name="voicemail_error_no_data_cellular_required_message">Reyndu aftur þegar tenging við farsímanet er betri. Þú getur ennþá hringt til að athuga talhólfið.</string>
+  <string name="voicemail_error_bad_config_title">Ekki hægt að uppfæra sjónrænt talhólf</string>
+  <string name="voicemail_error_bad_config_message">Þú getur ennþá hringt til að athuga talhólfið.</string>
+  <string name="voicemail_error_communication_title">Ekki hægt að uppfæra sjónrænt talhólf</string>
+  <string name="voicemail_error_communication_message">Þú getur ennþá hringt til að athuga talhólfið.</string>
+  <string name="voicemail_error_server_connection_title">Ekki hægt að uppfæra sjónrænt talhólf</string>
+  <string name="voicemail_error_server_connection_message">Þú getur ennþá hringt til að athuga talhólfið.</string>
+  <string name="voicemail_error_server_title">Ekki hægt að uppfæra sjónrænt talhólf</string>
+  <string name="voicemail_error_server_message">Þú getur ennþá hringt til að athuga talhólfið.</string>
+  <string name="voicemail_error_inbox_near_full_title">Pósthólfið er næstum fullt</string>
+  <string name="voicemail_error_inbox_near_full_message">Þú getur ekki tekið á móti nýjum talhólfsskilaboðum ef pósthólfið er fullt.</string>
+  <string name="voicemail_error_inbox_full_title">Ekki hægt að taka á móti nýjum talhólfsskilaboðum</string>
+  <string name="voicemail_error_inbox_full_message">Pósthólfið er fullt. Prófaðu að eyða skilaboðum til að taka á móti nýjum talhólfsskilaboðum.</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_title">Kveikja á viðbótargeymslu og öryggisafritun</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_message">Pósthólfið þitt er fullt. Þú getur losað pláss með því að kveikja á viðbótargeymslu til að Google geti unnið með og tekið öryggisafrit af talhólfsskilaboðunum þínum.</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_title">Kveikja á viðbótargeymslu og öryggisafritun</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_message">Pósthólfið þitt er næstum fullt. Þú getur losað pláss með því að kveikja á viðbótargeymslu til að Google geti unnið með og tekið öryggisafrit af talhólfsskilaboðunum þínum.</string>
+  <string name="voicemail_error_pin_not_set_title">Stilla PIN-númer talhólfs</string>
+  <string name="voicemail_error_pin_not_set_message">Þú þarft að nota PIN-númer talhólfsins í hvert skipti sem þú hringir til að athuga það.</string>
+  <string name="voicemail_action_turn_off_airplane_mode">Stilling flugstillingar</string>
+  <string name="voicemail_action_set_pin">Stilla PIN-númer</string>
+  <string name="voicemail_action_retry">Reyna aftur</string>
+  <string name="voicemail_action_turn_archive_on">Kveikja</string>
+  <string name="voicemail_action_dimiss">Nei, takk</string>
+  <string name="voicemail_action_sync">Samstilla</string>
+  <string name="voicemail_action_call_voicemail">Hringja í talhólf</string>
+  <string name="voicemail_action_call_customer_support">Hringja í þjónustufulltrúa</string>
+  <string name="vvm3_error_vms_dns_failure_title">Eitthvað fór úrskeiðis</string>
+  <string name="vvm3_error_vms_dns_failure_message">Því miður kom upp vandamál. Reyndu aftur seinna. Ef vandamálið heldur áfram skaltu hafa samband við þjónustudeild í síma %1$s og gefa upp villukóðann 9001.</string>
+  <string name="vvm3_error_vmg_dns_failure_title">Eitthvað fór úrskeiðis</string>
+  <string name="vvm3_error_vmg_dns_failure_message">Því miður kom upp vandamál. Reyndu aftur seinna. Ef vandamálið heldur áfram skaltu hafa samband við þjónustudeild í síma %1$s og gefa upp villukóðann 9002.</string>
+  <string name="vvm3_error_spg_dns_failure_title">Eitthvað fór úrskeiðis</string>
+  <string name="vvm3_error_spg_dns_failure_message">Því miður kom upp vandamál. Reyndu aftur seinna. Ef vandamálið heldur áfram skaltu hafa samband við þjónustudeild í síma %1$s og gefa upp villukóðann 9003.</string>
+  <string name="vvm3_error_vms_no_cellular_title">Ekki tókst að tengjast talhólfinu</string>
+  <string name="vvm3_error_vms_no_cellular_message">Því miður kom upp vandamál við að tengjast talhólfinu. Ef þú ert á svæði þar sem er lélegt símasamband skaltu bíða þar til þú kemst í betra samband og reyna aftur. Ef vandamálið heldur áfram skaltu hafa samband við þjónustudeild í síma %1$s og gefa upp villukóðann 9004.</string>
+  <string name="vvm3_error_vmg_no_cellular_title">Ekki tókst að tengjast talhólfinu</string>
+  <string name="vvm3_error_vmg_no_cellular_message">Því miður kom upp vandamál við að tengjast talhólfinu. Ef þú ert á svæði þar sem er lélegt símasamband skaltu bíða þar til þú kemst í betra samband og reyna aftur. Ef vandamálið heldur áfram skaltu hafa samband við þjónustudeild í síma %1$s og gefa upp villukóðann 9005.</string>
+  <string name="vvm3_error_spg_no_cellular_title">Ekki tókst að tengjast talhólfinu</string>
+  <string name="vvm3_error_spg_no_cellular_message">Því miður kom upp vandamál við að tengjast talhólfinu. Ef þú ert á svæði þar sem er lélegt símasamband skaltu bíða þar til þú kemst í betra samband og reyna aftur. Ef vandamálið heldur áfram skaltu hafa samband við þjónustudeild í síma %1$s og gefa upp villukóðann 9006.</string>
+  <string name="vvm3_error_vms_timeout_title">Eitthvað fór úrskeiðis</string>
+  <string name="vvm3_error_vms_timeout_message">Því miður kom upp vandamál. Reyndu aftur seinna. Ef vandamálið heldur áfram skaltu hafa samband við þjónustudeild í síma %1$s og gefa upp villukóðann 9007.</string>
+  <string name="vvm3_error_vmg_timeout_title">Eitthvað fór úrskeiðis</string>
+  <string name="vvm3_error_vmg_timeout_message">Því miður kom upp vandamál. Reyndu aftur seinna. Ef vandamálið heldur áfram skaltu hafa samband við þjónustudeild í síma %1$s og gefa upp villukóðann 9008.</string>
+  <string name="vvm3_error_status_sms_timeout_title">Eitthvað fór úrskeiðis</string>
+  <string name="vvm3_error_status_sms_timeout_message">Því miður kom upp vandamál við uppsetningu þjónustunnar. Reyndu aftur seinna. Ef vandamálið heldur áfram skaltu hafa samband við þjónustudeild í síma %1$s og gefa upp villukóðann 9009.</string>
+  <string name="vvm3_error_subscriber_blocked_title">Ekki tókst að tengjast talhólfinu</string>
+  <string name="vvm3_error_subscriber_blocked_message">Því miður kom upp vandamál við að tengjast talhólfinu þínu á þessari stundu. Reyndu aftur seinna. Ef vandamálið heldur áfram skaltu hafa samband við þjónustudeild í síma %1$s og gefa upp villukóðann 9990.</string>
+  <string name="vvm3_error_unknown_user_title">Setja upp talhólf</string>
+  <string name="vvm3_error_unknown_user_message">Talhólf er ekki uppsett á reikningnum þínum. Hafðu samband við þjónustudeild í síma %1$s og gefðu upp villukóðann 9991.</string>
+  <string name="vvm3_error_unknown_device_title">Talhólf</string>
+  <string name="vvm3_error_unknown_device_message">Ekki er hægt að nota myndrænt talhólf í þessu tæki. Hafðu samband við þjónustudeild í síma %1$s og gefðu upp villukóðann 9992.</string>
+  <string name="vvm3_error_invalid_password_title">Eitthvað fór úrskeiðis</string>
+  <string name="vvm3_error_invalid_password_message">Hafðu samband við þjónustudeild í síma %1$s og gefðu upp villukóðann 9993.</string>
+  <string name="vvm3_error_mailbox_not_initialized_title">Myndrænt talhólf</string>
+  <string name="vvm3_error_mailbox_not_initialized_message">Til þess að ljúka uppsetningu myndræns talhólfs skaltu hafa samband við þjónustudeild í síma %1$s og gefa upp villukóðann 9994.</string>
+  <string name="vvm3_error_service_not_provisioned_title">Myndrænt talhólf</string>
+  <string name="vvm3_error_service_not_provisioned_message">Til þess að ljúka uppsetningu myndræns talhólfs skaltu hafa samband við þjónustudeild í síma %1$s og gefa upp villukóðann 9995.</string>
+  <string name="vvm3_error_service_not_activated_title">Myndrænt talhólf</string>
+  <string name="vvm3_error_service_not_activated_message">Til þess að virkja myndrænt talhólf skaltu hafa samband við þjónustudeild í síma %1$s og gefa upp villukóðann 9996.</string>
+  <string name="vvm3_error_user_blocked_title">Eitthvað fór úrskeiðis</string>
+  <string name="vvm3_error_user_blocked_message">Til þess að ljúka uppsetningu myndræns talhólfs skaltu hafa samband við þjónustudeild í síma %1$s og gefa upp villukóðann 9998.</string>
+  <string name="vvm3_error_subscriber_unknown_title">Myndrænt talhólf er óvirkt</string>
+  <string name="vvm3_error_subscriber_unknown_message">Hafðu samband við þjónustudeild í síma %1$s til að virkja myndrænt talhólf.</string>
+  <string name="vvm3_error_imap_getquota_error_title">Eitthvað fór úrskeiðis</string>
+  <string name="vvm3_error_imap_getquota_error_message">Hafðu samband við þjónustudeild í síma %1$s og gefðu upp villukóðann 9997.</string>
+  <string name="vvm3_error_imap_select_error_title">Eitthvað fór úrskeiðis</string>
+  <string name="vvm3_error_imap_select_error_message">Hafðu samband við þjónustudeild í síma %1$s og gefðu upp villukóðann 9989.</string>
+  <string name="vvm3_error_imap_error_title">Eitthvað fór úrskeiðis</string>
+  <string name="vvm3_error_imap_error_message">Hafðu samband við þjónustudeild í síma %1$s og gefðu upp villukóðann 9999.</string>
+  <string name="verizon_terms_and_conditions_title">Kveikja á myndrænu talhólfi</string>
+  <string name="verizon_terms_and_conditions_message">%1$s Þegar þú kveikir á myndrænu talhólfi samþykkir þú skilmála Verizon Wireless:\n\n%2$s</string>
+  <string name="dialer_terms_and_conditions_title">Kveikja á myndrænu talhólfi</string>
+  <string name="dialer_terms_and_conditions_existing_user_title">Nýtt! Lestu skilaboð í talhólfinu þínu</string>
+  <string name="dialer_terms_and_conditions_message">%s</string>
+  <string name="dialer_terms_and_conditions_1.0">Sjáðu og hlustaðu á skilaboðin þín án þess að þurfa að hringja í talhólfið. Talhólfsskilaboð eru skrifuð upp með ókeypis uppskriftarþjónustu Google. Þú getur hvenær sem er slökkt á öðru hvoru í stillingunum. %s</string>
+  <string name="dialer_terms_and_conditions_existing_user">Talhólfsskilaboð eru nú skrifuð upp með ókeypis uppskriftarþjónustu Google. Þú getur slökkt á þessu hvenær sem er í stillingunum. %s</string>
+  <string name="dialer_terms_and_conditions_for_verizon_1.0">Sjáðu og hlustaðu á skilaboðin þín án þess að þurfa að hringja í talhólfið.</string>
+  <string name="dialer_terms_and_conditions_learn_more">Frekari upplýsingar</string>
+  <string name="dialer_terms_and_conditions_existing_user_ack">Ég skil</string>
+  <string name="dialer_terms_and_conditions_existing_user_decline">Nei, takk</string>
+  <string name="terms_and_conditions_decline_dialog_title">Viltu slökkva á myndrænu talhólfi?</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_message">Slökkt verður á myndrænu talhólfi ef skilmálunum er hafnað.</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_downgrade">Slökkva</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_message">Slökkt verður á myndrænu talhólfi ef það er gert óvirkt.</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_downgrade">Slökkva</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message">Talhólf er einungis aðgengilegt með því að hringja í *86. Stilltu nýtt PIN-númer fyrir talhólfið til að halda áfram.</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin">Stilla PIN-númer</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/error/res/values-it/strings.xml b/java/com/android/dialer/voicemail/listui/error/res/values-it/strings.xml
new file mode 100644
index 0000000..3e5a6a6
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/error/res/values-it/strings.xml
@@ -0,0 +1,102 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_error_activating_title">Attivazione della lettura della segreteria</string>
+  <string name="voicemail_error_activating_message">Potresti non ricevere le notifiche dei messaggi vocali finché la funzione di lettura della segreteria non è completamente attivata. Fino ad allora, chiama la segreteria per recuperare i nuovi messaggi.</string>
+  <string name="voicemail_error_not_activate_no_signal_title">Impossibile attivare la lettura della segreteria</string>
+  <string name="voicemail_error_not_activate_no_signal_message">Assicurati che il telefono abbia una connessione alla rete mobile e riprova.</string>
+  <string name="voicemail_error_not_activate_no_signal_airplane_mode_message">Disattiva la modalità aereo e riprova.</string>
+  <string name="voicemail_error_no_signal_title">Nessuna connessione</string>
+  <string name="voicemail_error_no_signal_message">Non riceverai notifiche per i nuovi messaggi vocali. Se sei connesso a una rete Wi-Fi, puoi consultare la segreteria effettuando subito la sincronizzazione.</string>
+  <string name="voicemail_error_no_signal_airplane_mode_message">Non riceverai notifiche per i nuovi messaggi vocali. Disattiva la modalità aereo per sincronizzare la segreteria.</string>
+  <string name="voicemail_error_no_signal_cellular_required_message">Per poter consultare la segreteria, il telefono deve essere connesso a una rete mobile.</string>
+  <string name="voicemail_error_activation_failed_title">Impossibile attivare la lettura della segreteria</string>
+  <string name="voicemail_error_activation_failed_message">Puoi ancora consultare la segreteria tramite chiamata.</string>
+  <string name="voicemail_error_no_data_title">Impossibile aggiornare la lettura della segreteria</string>
+  <string name="voicemail_error_no_data_message">Riprova quando la connessione alla rete Wi-Fi o mobile sarà migliore. Puoi ancora consultare la segreteria tramite chiamata.</string>
+  <string name="voicemail_error_no_data_cellular_required_message">Riprova quando la connessione dati mobile sarà migliore. Puoi ancora consultare la segreteria tramite chiamata.</string>
+  <string name="voicemail_error_bad_config_title">Impossibile aggiornare la lettura della segreteria</string>
+  <string name="voicemail_error_bad_config_message">Puoi ancora consultare la segreteria tramite chiamata.</string>
+  <string name="voicemail_error_communication_title">Impossibile aggiornare la lettura della segreteria</string>
+  <string name="voicemail_error_communication_message">Puoi ancora consultare la segreteria tramite chiamata.</string>
+  <string name="voicemail_error_server_connection_title">Impossibile aggiornare la lettura della segreteria</string>
+  <string name="voicemail_error_server_connection_message">Puoi ancora consultare la segreteria tramite chiamata.</string>
+  <string name="voicemail_error_server_title">Impossibile aggiornare la lettura della segreteria</string>
+  <string name="voicemail_error_server_message">Puoi ancora consultare la segreteria tramite chiamata.</string>
+  <string name="voicemail_error_inbox_near_full_title">Casella della segreteria quasi piena</string>
+  <string name="voicemail_error_inbox_near_full_message">Se la casella della segreteria è piena non potrai ricevere nuovi messaggi vocali.</string>
+  <string name="voicemail_error_inbox_full_title">Impossibile ricevere nuovi messaggi vocali</string>
+  <string name="voicemail_error_inbox_full_message">La casella della segreteria è piena. Prova a eliminare alcuni messaggi per riceverne di nuovi.</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_title">Attiva spazio di archiviazione supplementare e backup</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_message">La tua casella di posta è piena. Per liberare spazio, attiva lo spazio di archiviazione supplementare in modo che Google possa gestire i messaggi vocali ed eseguirne il backup.</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_title">Attiva spazio di archiviazione supplementare e backup</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_message">La tua casella di posta è quasi piena. Per liberare spazio, attiva lo spazio di archiviazione supplementare in modo che Google possa gestire i messaggi vocali ed eseguirne il backup.</string>
+  <string name="voicemail_error_pin_not_set_title">Imposta il PIN della segreteria</string>
+  <string name="voicemail_error_pin_not_set_message">Dovrai inserire il PIN della segreteria ogni volta che chiami per accedervi.</string>
+  <string name="voicemail_action_turn_off_airplane_mode">Impostazioni modalità aereo</string>
+  <string name="voicemail_action_set_pin">Imposta PIN</string>
+  <string name="voicemail_action_retry">Riprova</string>
+  <string name="voicemail_action_turn_archive_on">Attiva</string>
+  <string name="voicemail_action_dimiss">No grazie</string>
+  <string name="voicemail_action_sync">Sincronizza</string>
+  <string name="voicemail_action_call_voicemail">Chiama segreteria</string>
+  <string name="voicemail_action_call_customer_support">Chiama l\'assistenza clienti</string>
+  <string name="vvm3_error_vms_dns_failure_title">Si è verificato un problema</string>
+  <string name="vvm3_error_vms_dns_failure_message">Spiacenti, si è verificato un problema. Riprova più tardi. Se il problema persiste, contatta l\'assistenza clienti al numero %1$s indicando il seguente codice di errore: 9001.</string>
+  <string name="vvm3_error_vmg_dns_failure_title">Si è verificato un problema</string>
+  <string name="vvm3_error_vmg_dns_failure_message">Spiacenti, si è verificato un problema. Riprova più tardi. Se il problema persiste, contatta l\'assistenza clienti al numero %1$s indicando il seguente codice di errore: 9002.</string>
+  <string name="vvm3_error_spg_dns_failure_title">Si è verificato un problema</string>
+  <string name="vvm3_error_spg_dns_failure_message">Spiacenti, si è verificato un problema. Riprova più tardi. Se il problema persiste, contatta l\'assistenza clienti al numero %1$s indicando il seguente codice di errore: 9003.</string>
+  <string name="vvm3_error_vms_no_cellular_title">Impossibile connettersi alla casella dei messaggi vocali</string>
+  <string name="vvm3_error_vms_no_cellular_message">Spiacenti, si è verificato un problema durante la connessione alla tua casella dei messaggi vocali. Se ti trovi in una zona con segnale debole, attendi che il segnale sia più forte e riprova. Se il problema persiste, contatta l\'assistenza clienti al numero %1$s indicando il seguente codice di errore: 9004.</string>
+  <string name="vvm3_error_vmg_no_cellular_title">Impossibile connettersi alla casella dei messaggi vocali</string>
+  <string name="vvm3_error_vmg_no_cellular_message">Spiacenti, si è verificato un problema durante la connessione alla tua casella dei messaggi vocali. Se ti trovi in una zona con segnale debole, attendi che il segnale sia più forte e riprova. Se il problema persiste, contatta l\'assistenza clienti al numero %1$s indicando il seguente codice di errore: 9005.</string>
+  <string name="vvm3_error_spg_no_cellular_title">Impossibile connettersi alla casella dei messaggi vocali</string>
+  <string name="vvm3_error_spg_no_cellular_message">Spiacenti, si è verificato un problema durante la connessione alla tua casella dei messaggi vocali. Se ti trovi in una zona con segnale debole, attendi che il segnale sia più forte e riprova. Se il problema persiste, contatta l\'assistenza clienti al numero %1$s indicando il seguente codice di errore: 9006.</string>
+  <string name="vvm3_error_vms_timeout_title">Si è verificato un problema</string>
+  <string name="vvm3_error_vms_timeout_message">Spiacenti, si è verificato un problema. Riprova più tardi. Se il problema persiste, contatta l\'assistenza clienti al numero %1$s indicando il seguente codice di errore: 9007.</string>
+  <string name="vvm3_error_vmg_timeout_title">Si è verificato un problema</string>
+  <string name="vvm3_error_vmg_timeout_message">Spiacenti, si è verificato un problema. Riprova più tardi. Se il problema persiste, contatta l\'assistenza clienti al numero %1$s indicando il seguente codice di errore: 9008.</string>
+  <string name="vvm3_error_status_sms_timeout_title">Si è verificato un problema</string>
+  <string name="vvm3_error_status_sms_timeout_message">Spiacenti, si è verificato un problema durante l\'impostazione del servizio. Riprova più tardi. Se il problema persiste, contatta l\'assistenza clienti al numero %1$s indicando il seguente codice di errore: 9009.</string>
+  <string name="vvm3_error_subscriber_blocked_title">Impossibile connettersi alla casella dei messaggi vocali</string>
+  <string name="vvm3_error_subscriber_blocked_message">Al momento non è possibile connettersi alla tua casella dei messaggi vocali. Riprova più tardi. Se il problema persiste, contatta l\'assistenza clienti al numero %1$s indicando il seguente codice di errore: 9990.</string>
+  <string name="vvm3_error_unknown_user_title">Imposta la segreteria</string>
+  <string name="vvm3_error_unknown_user_message">La segreteria non è impostata sul tuo account. Contatta l\'assistenza clienti al numero %1$s indicando il seguente codice di errore: 9991.</string>
+  <string name="vvm3_error_unknown_device_title">Segreteria</string>
+  <string name="vvm3_error_unknown_device_message">Non è possibile utilizzare la funzione di lettura della segreteria su questo dispositivo. Contatta l\'assistenza clienti al numero %1$s indicando il seguente codice di errore: 9992.</string>
+  <string name="vvm3_error_invalid_password_title">Si è verificato un problema</string>
+  <string name="vvm3_error_invalid_password_message">Contatta l\'assistenza clienti al numero %1$s indicando il seguente codice di errore: 9993.</string>
+  <string name="vvm3_error_mailbox_not_initialized_title">Lettura della segreteria</string>
+  <string name="vvm3_error_mailbox_not_initialized_message">Per completare l\'impostazione della lettura della segreteria, contatta l\'assistenza clienti al numero %1$s indicando il seguente codice di errore: 9994.</string>
+  <string name="vvm3_error_service_not_provisioned_title">Lettura della segreteria</string>
+  <string name="vvm3_error_service_not_provisioned_message">Per completare l\'impostazione della lettura della segreteria, contatta l\'assistenza clienti al numero %1$s indicando il seguente codice di errore: 9995.</string>
+  <string name="vvm3_error_service_not_activated_title">Lettura della segreteria</string>
+  <string name="vvm3_error_service_not_activated_message">Per attivare la lettura della segreteria, contatta l\'assistenza clienti al numero %1$s indicando il seguente codice di errore: 9996.</string>
+  <string name="vvm3_error_user_blocked_title">Si è verificato un problema</string>
+  <string name="vvm3_error_user_blocked_message">Per completare l\'impostazione della lettura della segreteria, contatta l\'assistenza clienti al numero %1$s indicando il seguente codice di errore: 9998.</string>
+  <string name="vvm3_error_subscriber_unknown_title">La lettura della segreteria è disattivata</string>
+  <string name="vvm3_error_subscriber_unknown_message">Contatta l\'assistenza clienti al numero %1$s per attivare la lettura della segreteria.</string>
+  <string name="vvm3_error_imap_getquota_error_title">Si è verificato un problema</string>
+  <string name="vvm3_error_imap_getquota_error_message">Contatta l\'assistenza clienti al numero %1$s indicando il seguente codice di errore: 9997.</string>
+  <string name="vvm3_error_imap_select_error_title">Si è verificato un problema</string>
+  <string name="vvm3_error_imap_select_error_message">Contatta l\'assistenza clienti al numero %1$s indicando il seguente codice di errore: 9989.</string>
+  <string name="vvm3_error_imap_error_title">Si è verificato un problema</string>
+  <string name="vvm3_error_imap_error_message">Contatta l\'assistenza clienti al numero %1$s indicando il seguente codice di errore: 9999.</string>
+  <string name="verizon_terms_and_conditions_title">Attivare la funzione di lettura della segreteria</string>
+  <string name="verizon_terms_and_conditions_message">%1$s Attivando la funzione Leggi la segretaria, accetti termini e condizioni di Verizon Wireless:\n\n%2$s</string>
+  <string name="dialer_terms_and_conditions_title">Attivare la funzione di lettura della segreteria</string>
+  <string name="dialer_terms_and_conditions_existing_user_title">Novità. Lettura della segreteria</string>
+  <string name="dialer_terms_and_conditions_message">%s</string>
+  <string name="dialer_terms_and_conditions_1.0">Visualizza e ascolta i tuoi messaggi senza dover chiamare la segreteria. Le trascrizioni dei messaggi vocali sono fornite dal servizio gratuito di trascrizione di Google. Puoi disattivare questa opzione in qualsiasi momento. %s</string>
+  <string name="dialer_terms_and_conditions_existing_user">Le trascrizioni dei messaggi vocali sono ora fornite dal servizio gratuito di trascrizione di Google. Puoi disattivare questa opzione in qualsiasi momento. %s</string>
+  <string name="dialer_terms_and_conditions_for_verizon_1.0">Visualizza e ascolta i tuoi messaggi senza dover chiamare la segreteria.</string>
+  <string name="dialer_terms_and_conditions_learn_more">Ulteriori informazioni</string>
+  <string name="dialer_terms_and_conditions_existing_user_ack">OK</string>
+  <string name="dialer_terms_and_conditions_existing_user_decline">No grazie</string>
+  <string name="terms_and_conditions_decline_dialog_title">Disattivare la lettura della segreteria?</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_message">La lettura della segreteria verrà disattivata se non accetti termini e condizioni.</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_downgrade">Disattiva</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_message">La lettura della segreteria verrà disattivata se non accetti termini e condizioni.</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_downgrade">Disattiva</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message">La segreteria sarà accessibile unicamente chiamando il numero *86. Imposta un nuovo PIN segreteria per procedere.</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin">Imposta PIN</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/error/res/values-iw/strings.xml b/java/com/android/dialer/voicemail/listui/error/res/values-iw/strings.xml
new file mode 100644
index 0000000..56e6167
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/error/res/values-iw/strings.xml
@@ -0,0 +1,102 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_error_activating_title">מפעיל את הדואר הקולי הוויזואלי</string>
+  <string name="voicemail_error_activating_message">ייתכן שלא תקבל עדכונים על הודעות חדשות בדואר הקולי עד שהדואר הקולי הוויזואלי יופעל במלואו. עד אז, תצטרך להתקשר לדואר הקולי כדי להאזין להודעות החדשות.</string>
+  <string name="voicemail_error_not_activate_no_signal_title">לא ניתן להפעיל את הדואר הקולי הוויזואלי</string>
+  <string name="voicemail_error_not_activate_no_signal_message">ודא שהטלפון מחובר לרשת סלולרית ונסה שוב.</string>
+  <string name="voicemail_error_not_activate_no_signal_airplane_mode_message">השבת את מצב טיסה ונסה שוב.</string>
+  <string name="voicemail_error_no_signal_title">אין חיבור</string>
+  <string name="voicemail_error_no_signal_message">‏לא תקבל עדכונים על הודעות קוליות חדשות. אם אתה משתמש בחיבור Wi-Fi, סנכרן עכשיו כדי לבדוק אם יש לך הודעות קוליות.</string>
+  <string name="voicemail_error_no_signal_airplane_mode_message">לא תקבל עדכונים על הודעות חדשות בדואר הקולי. השבת את מצב הטיסה כדי לסנכרן את הדואר הקולי שלך.</string>
+  <string name="voicemail_error_no_signal_cellular_required_message">כדי לבדוק הודעות קוליות נדרש חיבור לרשת סלולרית בטלפון.</string>
+  <string name="voicemail_error_activation_failed_title">לא ניתן להפעיל את הדואר הקולי הוויזואלי</string>
+  <string name="voicemail_error_activation_failed_message">עדיין תוכל להתקשר כדי לבדוק את הדואר הקולי.</string>
+  <string name="voicemail_error_no_data_title">לא ניתן לעדכן את הדואר הקולי הוויזואלי</string>
+  <string name="voicemail_error_no_data_message">‏נסה שוב כשיהיה חיבור טוב יותר ל-Wi-Fi או לרשת הסלולרית. אפשר גם להתקשר כדי לבדוק הודעות קוליות.</string>
+  <string name="voicemail_error_no_data_cellular_required_message">נסה שוב כשיהיה חיבור טוב יותר לרשת הסלולרית. אפשר גם להתקשר כדי לבדוק הודעות קוליות.</string>
+  <string name="voicemail_error_bad_config_title">לא ניתן לעדכן את הדואר הקולי הוויזואלי</string>
+  <string name="voicemail_error_bad_config_message">עדיין תוכל להתקשר כדי לבדוק את הדואר הקולי.</string>
+  <string name="voicemail_error_communication_title">לא ניתן לעדכן את הדואר הקולי הוויזואלי</string>
+  <string name="voicemail_error_communication_message">עדיין תוכל להתקשר כדי לבדוק את הדואר הקולי.</string>
+  <string name="voicemail_error_server_connection_title">לא ניתן לעדכן את הדואר הקולי הוויזואלי</string>
+  <string name="voicemail_error_server_connection_message">עדיין תוכל להתקשר כדי לבדוק את הדואר הקולי.</string>
+  <string name="voicemail_error_server_title">לא ניתן לעדכן את הדואר הקולי הוויזואלי</string>
+  <string name="voicemail_error_server_message">עדיין תוכל להתקשר כדי לבדוק את הדואר הקולי.</string>
+  <string name="voicemail_error_inbox_near_full_title">תיבת הדואר הנכנס כמעט מלאה</string>
+  <string name="voicemail_error_inbox_near_full_message">אם תיבת הדואר הנכנס מלאה, לא תוכל לקבל דואר קולי חדש.</string>
+  <string name="voicemail_error_inbox_full_title">לא ניתן לקבל הודעות חדשות בדואר הקולי</string>
+  <string name="voicemail_error_inbox_full_message">תיבת הדואר הנכנס מלאה. נסה למחוק חלק מההודעות כדי שתוכל לקבל דואר קולי חדש.</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_title">הפעל את הגיבוי ופינוי המקום</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_message">‏תיבת הדואר שלך מלאה. הפעל את הגיבוי ופינוי המקום כדי ש-Google תוכל לנהל ולגבות את ההודעות הקוליות שלך.</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_title">הפעל את הגיבוי ופינוי המקום</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_message">‏תיבת הדואר שלך כמעט מלאה. הפעל את הגיבוי ופינוי המקום כדי ש-Google תוכל לנהל ולגבות את ההודעות הקוליות שלך.</string>
+  <string name="voicemail_error_pin_not_set_title">הגדר קוד גישה לדואר הקולי</string>
+  <string name="voicemail_error_pin_not_set_message">בכל פעם שתשתמש בדואר הקולי תצטרך את קוד הגישה.</string>
+  <string name="voicemail_action_turn_off_airplane_mode">הגדרות למצב טיסה</string>
+  <string name="voicemail_action_set_pin">הגדרת קוד גישה</string>
+  <string name="voicemail_action_retry">נסה שוב</string>
+  <string name="voicemail_action_turn_archive_on">הפעל</string>
+  <string name="voicemail_action_dimiss">לא, תודה</string>
+  <string name="voicemail_action_sync">סנכרן</string>
+  <string name="voicemail_action_call_voicemail">התקשר לדואר קולי</string>
+  <string name="voicemail_action_call_customer_support">התקשר לשירות הלקוחות</string>
+  <string name="vvm3_error_vms_dns_failure_title">משהו השתבש</string>
+  <string name="vvm3_error_vms_dns_failure_message">מצטערים, נתקלנו בבעיה. נסה שוב מאוחר יותר. אם הבעיה נמשכת, התקשר לשירות הלקוחות בטלפון %1$s ואמור לנציג שקוד השגיאה הוא 9001.</string>
+  <string name="vvm3_error_vmg_dns_failure_title">משהו השתבש</string>
+  <string name="vvm3_error_vmg_dns_failure_message">מצטערים, נתקלנו בבעיה. נסה שוב מאוחר יותר. אם הבעיה נמשכת, התקשר לשירות הלקוחות בטלפון %1$s ואמור לנציג שקוד השגיאה הוא 9002.</string>
+  <string name="vvm3_error_spg_dns_failure_title">משהו השתבש</string>
+  <string name="vvm3_error_spg_dns_failure_message">מצטערים, נתקלנו בבעיה. נסה שוב מאוחר יותר. אם הבעיה נמשכת, התקשר לשירות הלקוחות בטלפון %1$s ואמור לנציג שקוד השגיאה הוא 9003.</string>
+  <string name="vvm3_error_vms_no_cellular_title">לא ניתן להתחבר לתיבת הדואר הקולי שלך</string>
+  <string name="vvm3_error_vms_no_cellular_message">מצטערים, נתקלנו בבעיה ולא הצלחנו להתחבר לתיבת הדואר הקולי שלך. אם אין לך קליטה טובה, המתן עד שתהיה לך קליטה טובה יותר ונסה שוב. אם הבעיה נמשכת, התקשר לשירות הלקוחות בטלפון %1$s ואמור לנציג שקוד השגיאה הוא 9004.</string>
+  <string name="vvm3_error_vmg_no_cellular_title">לא ניתן להתחבר לתיבת הדואר הקולי שלך</string>
+  <string name="vvm3_error_vmg_no_cellular_message">מצטערים, נתקלנו בבעיה ולא הצלחנו להתחבר לתיבת הדואר הקולי שלך. אם אין לך קליטה טובה, המתן עד שתהיה לך קליטה טובה יותר ונסה שוב. אם הבעיה נמשכת, התקשר לשירות הלקוחות בטלפון %1$s ואמור לנציג שקוד השגיאה הוא 9005.</string>
+  <string name="vvm3_error_spg_no_cellular_title">לא ניתן להתחבר לתיבת הדואר הקולי שלך</string>
+  <string name="vvm3_error_spg_no_cellular_message">מצטערים, נתקלנו בבעיה ולא הצלחנו להתחבר לתיבת הדואר הקולי שלך. אם אין לך קליטה טובה, המתן עד שתהיה לך קליטה טובה יותר ונסה שוב. אם הבעיה נמשכת, התקשר לשירות הלקוחות בטלפון %1$s ואמור לנציג שקוד השגיאה הוא 9006.</string>
+  <string name="vvm3_error_vms_timeout_title">משהו השתבש</string>
+  <string name="vvm3_error_vms_timeout_message">מצטערים, נתקלנו בבעיה. נסה שוב מאוחר יותר. אם הבעיה נמשכת, התקשר לשירות הלקוחות בטלפון %1$s ואמור לנציג שקוד השגיאה הוא 9007.</string>
+  <string name="vvm3_error_vmg_timeout_title">משהו השתבש</string>
+  <string name="vvm3_error_vmg_timeout_message">מצטערים, נתקלנו בבעיה. נסה שוב מאוחר יותר. אם הבעיה נמשכת, התקשר לשירות הלקוחות בטלפון %1$s ואמור לנציג שקוד השגיאה הוא 9008.</string>
+  <string name="vvm3_error_status_sms_timeout_title">משהו השתבש</string>
+  <string name="vvm3_error_status_sms_timeout_message">מצטערים, נתקלנו בבעיה ולא הצלחנו להגדיר את השירות. נסה שוב מאוחר יותר. אם הבעיה נמשכת, התקשר לשירות הלקוחות בטלפון %1$s ואמור לנציג שקוד השגיאה הוא 9009.</string>
+  <string name="vvm3_error_subscriber_blocked_title">לא ניתן להתחבר לתיבת הדואר הקולי שלך</string>
+  <string name="vvm3_error_subscriber_blocked_message">מצטערים, לא ניתן להתחבר לתיבת הדואר הקולי שלך כרגע. נסה שוב מאוחר יותר. אם הבעיה נמשכת, התקשר לשירות הלקוחות בטלפון %1$s ואמור לנציג שקוד השגיאה הוא 9990.</string>
+  <string name="vvm3_error_unknown_user_title">הגדרת הדואר הקולי</string>
+  <string name="vvm3_error_unknown_user_message">לא מוגדר דואר קולי בחשבון שלך. התקשר לשירות הלקוחות בטלפון %1$s ואמור לנציג שקוד השגיאה הוא 9991.</string>
+  <string name="vvm3_error_unknown_device_title">דואר קולי</string>
+  <string name="vvm3_error_unknown_device_message">לא ניתן להשתמש בדואר הקולי הוויזואלי במכשיר הזה. ניתן להתקשר לשירות הלקוחות בטלפון %1$s ולומר לנציג שקוד השגיאה הוא 9992.</string>
+  <string name="vvm3_error_invalid_password_title">משהו השתבש</string>
+  <string name="vvm3_error_invalid_password_message">התקשר לשירות הלקוחות בטלפון %1$s ואמור לנציג שקוד השגיאה הוא 9993.</string>
+  <string name="vvm3_error_mailbox_not_initialized_title">דואר קולי ויזואלי</string>
+  <string name="vvm3_error_mailbox_not_initialized_message">כדי להשלים את ההגדרה של הדואר הקולי הוויזואלי, עליך להתקשר לשירות הלקוחות בטלפון %1$s ולומר לנציג שקוד השגיאה הוא 9994.</string>
+  <string name="vvm3_error_service_not_provisioned_title">דואר קולי ויזואלי</string>
+  <string name="vvm3_error_service_not_provisioned_message">כדי להשלים את ההגדרה של הדואר הקולי הוויזואלי, עליך להתקשר לשירות הלקוחות בטלפון %1$s ולומר לנציג שקוד השגיאה הוא 9995.</string>
+  <string name="vvm3_error_service_not_activated_title">דואר קולי ויזואלי</string>
+  <string name="vvm3_error_service_not_activated_message">כדי להפעיל את הדואר הקולי הוויזואלי, עליך להתקשר לשירות הלקוחות בטלפון %1$s ולומר לנציג שקוד השגיאה הוא 9996.</string>
+  <string name="vvm3_error_user_blocked_title">משהו השתבש</string>
+  <string name="vvm3_error_user_blocked_message">כדי להשלים את ההגדרה של הדואר הקולי הוויזואלי, עליך להתקשר לשירות הלקוחות בטלפון %1$s ולומר לנציג שקוד השגיאה הוא 9998.</string>
+  <string name="vvm3_error_subscriber_unknown_title">הדואר הקולי הוויזואלי מושבת</string>
+  <string name="vvm3_error_subscriber_unknown_message">כדי להפעיל את הדואר הקולי הוויזואלי, התקשר לשירות הלקוחות בטלפון %1$s.</string>
+  <string name="vvm3_error_imap_getquota_error_title">משהו השתבש</string>
+  <string name="vvm3_error_imap_getquota_error_message">התקשר לשירות הלקוחות בטלפון %1$s ואמור לנציג שקוד השגיאה הוא 9997.</string>
+  <string name="vvm3_error_imap_select_error_title">משהו השתבש</string>
+  <string name="vvm3_error_imap_select_error_message">התקשר לשירות הלקוחות בטלפון %1$s ואמור לנציג שקוד השגיאה הוא 9989.</string>
+  <string name="vvm3_error_imap_error_title">משהו השתבש</string>
+  <string name="vvm3_error_imap_error_message">התקשר לשירות הלקוחות בטלפון %1$s ואמור לנציג שקוד השגיאה הוא 9999.</string>
+  <string name="verizon_terms_and_conditions_title">הפעלה של הדואר הקולי הוויזואלי</string>
+  <string name="verizon_terms_and_conditions_message">‏%1$s הפעלה של הדואר הקולי הוויזואלי מהווה את הסכמתך לתנאים ולהגבלות של Verizon Wireless:\n\n%2$s</string>
+  <string name="dialer_terms_and_conditions_title">הפעלה של הדואר הקולי הוויזואלי</string>
+  <string name="dialer_terms_and_conditions_existing_user_title">חדש! אפשר לקרוא הודעות קוליות</string>
+  <string name="dialer_terms_and_conditions_message">%s</string>
+  <string name="dialer_terms_and_conditions_1.0">‏אפשר להציג את ההודעות הקוליות ולהאזין להן בלי להתקשר לתא הקולי. תמלול ההודעות מבוצע בחינם על ידי שירות התמלול של Google. אפשר להשבית את השירות מתי שרוצים באמצעות ההגדרות. %s</string>
+  <string name="dialer_terms_and_conditions_existing_user">‏תמלילים של ההודעות הקוליות מסופקים עכשיו בחינם על ידי שירות התמלול של Google.‏ אפשר להשבית את השירות מתי שרוצים באמצעות ההגדרות. %s</string>
+  <string name="dialer_terms_and_conditions_for_verizon_1.0">אפשר להציג את ההודעות הקוליות ולהאזין להן בלי להתקשר לתא הקולי.</string>
+  <string name="dialer_terms_and_conditions_learn_more">למידע נוסף</string>
+  <string name="dialer_terms_and_conditions_existing_user_ack">הבנתי</string>
+  <string name="dialer_terms_and_conditions_existing_user_decline">לא, תודה</string>
+  <string name="terms_and_conditions_decline_dialog_title">הדואר הקולי הוויזואלי יושבת. להמשיך?</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_message">דחייה של התנאים וההגבלות תשבית את הדואר הקולי הוויזואלי.</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_downgrade">השבת</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_message">השבתת ההגדרה הזו תשבית את הדואר הקולי הוויזואלי.</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_downgrade">השבת</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message">תוכל לבדוק את הדואר הקולי רק על ידי חיוג 86*. כדי להמשיך, הגדר קוד גישה חדש לדואר הקולי.</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin">הגדרת קוד גישה</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/error/res/values-ja/strings.xml b/java/com/android/dialer/voicemail/listui/error/res/values-ja/strings.xml
new file mode 100644
index 0000000..b0f7712
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/error/res/values-ja/strings.xml
@@ -0,0 +1,102 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_error_activating_title">ビジュアル ボイスメールを有効化中</string>
+  <string name="voicemail_error_activating_message">ビジュアル ボイスメールの有効化が完了するまでボイスメール通知を受信できません。ボイスメールの有効化が完了するまでは、ボイスメール サービスを呼び出して新しいメッセージを取得してください。</string>
+  <string name="voicemail_error_not_activate_no_signal_title">ビジュアル ボイスメールを有効化できません</string>
+  <string name="voicemail_error_not_activate_no_signal_message">スマートフォンがモバイル ネットワークに接続済みであることを確認してから、もう一度お試しください。</string>
+  <string name="voicemail_error_not_activate_no_signal_airplane_mode_message">機内モードを OFF にしてから、もう一度お試しください。</string>
+  <string name="voicemail_error_no_signal_title">接続されていません</string>
+  <string name="voicemail_error_no_signal_message">ボイスメールの着信通知を受信できません。Wi-Fi をご利用の場合は、同期するとボイスメールを確認できます。</string>
+  <string name="voicemail_error_no_signal_airplane_mode_message">ボイスメールの着信通知を受信できません。ボイスメールを同期するには機内モードを OFF にしてください。</string>
+  <string name="voicemail_error_no_signal_cellular_required_message">ボイスメールを確認するには、スマートフォンがモバイルデータ通信に接続している必要があります。</string>
+  <string name="voicemail_error_activation_failed_title">ビジュアル ボイスメールを有効化できません</string>
+  <string name="voicemail_error_activation_failed_message">ボイスメール サービスを呼び出してボイスメールを確認することは可能です。</string>
+  <string name="voicemail_error_no_data_title">ビジュアル ボイスメールを更新できません</string>
+  <string name="voicemail_error_no_data_message">Wi-Fi かモバイルデータ通信の接続状態が良好なときにもう一度お試しください。ボイスメール サービスを呼び出してボイスメールを確認することは可能です。</string>
+  <string name="voicemail_error_no_data_cellular_required_message">モバイルデータ通信の接続状態が良好なときにもう一度お試しください。ボイスメール サービスを呼び出してボイスメールを確認することは可能です。</string>
+  <string name="voicemail_error_bad_config_title">ビジュアル ボイスメールを更新できません</string>
+  <string name="voicemail_error_bad_config_message">ボイスメール サービスを呼び出してボイスメールを確認することは可能です。</string>
+  <string name="voicemail_error_communication_title">ビジュアル ボイスメールを更新できません</string>
+  <string name="voicemail_error_communication_message">ボイスメール サービスを呼び出してボイスメールを確認することは可能です。</string>
+  <string name="voicemail_error_server_connection_title">ビジュアル ボイスメールを更新できません</string>
+  <string name="voicemail_error_server_connection_message">ボイスメール サービスを呼び出してボイスメールを確認することは可能です。</string>
+  <string name="voicemail_error_server_title">ビジュアル ボイスメールを更新できません</string>
+  <string name="voicemail_error_server_message">ボイスメール サービスを呼び出してボイスメールを確認することは可能です。</string>
+  <string name="voicemail_error_inbox_near_full_title">受信トレイの空き容量が少なくなっています</string>
+  <string name="voicemail_error_inbox_near_full_message">受信トレイに空き容量がないため、新しいボイスメールを受信できません。</string>
+  <string name="voicemail_error_inbox_full_title">新しいボイスメールを受信できません</string>
+  <string name="voicemail_error_inbox_full_message">受信トレイに空き容量がありません。新しいボイスメールを受信するには、古いメッセージをいくつか削除してみてください。</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_title">追加の保存容量とバックアップを ON にしてください</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_message">メールボックスに空き容量がありません。空き容量を増やすには、追加の保存容量を ON にして、Google がボイスメールのメッセージの管理とバックアップを行えるようにしてください。</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_title">追加の保存容量とバックアップを ON にしてください</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_message">メールボックスの空き容量が少なくなっています。空き容量を増やすには、追加の保存容量を ON にして、Google がボイスメールのメッセージの管理とバックアップを行えるようにしてください。</string>
+  <string name="voicemail_error_pin_not_set_title">ボイスメール PIN を設定してください</string>
+  <string name="voicemail_error_pin_not_set_message">ボイスメール サービスを呼び出す際にボイスメール PIN が必要になります。</string>
+  <string name="voicemail_action_turn_off_airplane_mode">機内モードの設定</string>
+  <string name="voicemail_action_set_pin">PIN を設定</string>
+  <string name="voicemail_action_retry">再試行</string>
+  <string name="voicemail_action_turn_archive_on">ON にする</string>
+  <string name="voicemail_action_dimiss">スキップ</string>
+  <string name="voicemail_action_sync">同期</string>
+  <string name="voicemail_action_call_voicemail">ボイスメール サービスを呼び出す</string>
+  <string name="voicemail_action_call_customer_support">カスタマー サポート宛に発信</string>
+  <string name="vvm3_error_vms_dns_failure_title">エラーが発生しました</string>
+  <string name="vvm3_error_vms_dns_failure_message">エラーが発生しました。しばらくしてからもう一度お試しください。問題が解決しない場合は、カスタマー サービス（%1$s）にご連絡いただき、次のエラーコードをお伝えください。エラーコード: 9001</string>
+  <string name="vvm3_error_vmg_dns_failure_title">エラーが発生しました</string>
+  <string name="vvm3_error_vmg_dns_failure_message">エラーが発生しました。しばらくしてからもう一度お試しください。問題が解決しない場合は、カスタマー サービス（%1$s）にご連絡いただき、次のエラーコードをお伝えください。エラーコード: 9002</string>
+  <string name="vvm3_error_spg_dns_failure_title">エラーが発生しました</string>
+  <string name="vvm3_error_spg_dns_failure_message">エラーが発生しました。しばらくしてからもう一度お試しください。問題が解決しない場合は、カスタマー サービス（%1$s）にご連絡いただき、次のエラーコードをお伝えください。エラーコード: 9003</string>
+  <string name="vvm3_error_vms_no_cellular_title">ボイス メールボックスに接続できません</string>
+  <string name="vvm3_error_vms_no_cellular_message">ボイス メールボックスへの接続中にエラーが発生しました。電波が弱い場合は、電波状況が良好な場所でもう一度お試しください。問題が解決しない場合は、カスタマー サービス（%1$s）にご連絡いただき、次のエラーコードをお伝えください。エラーコード: 9004</string>
+  <string name="vvm3_error_vmg_no_cellular_title">ボイス メールボックスに接続できません</string>
+  <string name="vvm3_error_vmg_no_cellular_message">ボイス メールボックスへの接続中にエラーが発生しました。電波が弱い場合は、電波状況が良好な場所でもう一度お試しください。問題が解決しない場合は、カスタマー サービス（%1$s）にご連絡いただき、次のエラーコードをお伝えください。エラーコード: 9005</string>
+  <string name="vvm3_error_spg_no_cellular_title">ボイス メールボックスに接続できません</string>
+  <string name="vvm3_error_spg_no_cellular_message">ボイス メールボックスへの接続中にエラーが発生しました。電波が弱い場合は、電波状況が良好な場所でもう一度お試しください。問題が解決しない場合は、カスタマー サービス（%1$s）にご連絡いただき、次のエラーコードをお伝えください。エラーコード: 9006</string>
+  <string name="vvm3_error_vms_timeout_title">エラーが発生しました</string>
+  <string name="vvm3_error_vms_timeout_message">エラーが発生しました。しばらくしてからもう一度お試しください。問題が解決しない場合は、カスタマー サービス（%1$s）にご連絡いただき、次のエラーコードをお伝えください。エラーコード: 9007</string>
+  <string name="vvm3_error_vmg_timeout_title">エラーが発生しました</string>
+  <string name="vvm3_error_vmg_timeout_message">エラーが発生しました。しばらくしてからもう一度お試しください。問題が解決しない場合は、カスタマー サービス（%1$s）にご連絡いただき、次のエラーコードをお伝えください。エラーコード: 9008</string>
+  <string name="vvm3_error_status_sms_timeout_title">エラーが発生しました</string>
+  <string name="vvm3_error_status_sms_timeout_message">サービスのセットアップ中にエラーが発生しました。しばらくしてからもう一度お試しください。問題が解決しない場合は、カスタマー サービス（%1$s）にご連絡いただき、次のエラーコードをお伝えください。エラーコード: 9009</string>
+  <string name="vvm3_error_subscriber_blocked_title">ボイス メールボックスに接続できません</string>
+  <string name="vvm3_error_subscriber_blocked_message">ボイス メールボックスに接続できません。しばらくしてからもう一度お試しください。問題が解決しない場合は、カスタマー サービス（%1$s）にご連絡いただき、次のエラーコードをお伝えください。エラーコード: 9990</string>
+  <string name="vvm3_error_unknown_user_title">ボイスメールをセットアップしてください</string>
+  <string name="vvm3_error_unknown_user_message">ご利用のアカウントではボイスメールがセットアップされていません。カスタマー サービス（%1$s）にご連絡いただき、次のエラーコードをお伝えください。エラーコード: 9991</string>
+  <string name="vvm3_error_unknown_device_title">ボイスメール</string>
+  <string name="vvm3_error_unknown_device_message">ご利用の端末ではビジュアル ボイスメールをご利用いただけません。カスタマー サービス（%1$s）にご連絡いただき、次のエラーコードをお伝えください。エラーコード: 9992</string>
+  <string name="vvm3_error_invalid_password_title">エラーが発生しました</string>
+  <string name="vvm3_error_invalid_password_message">カスタマー サービス（%1$s）にご連絡いただき、次のエラーコードをお伝えください。エラーコード: 9993</string>
+  <string name="vvm3_error_mailbox_not_initialized_title">ビジュアル ボイスメール</string>
+  <string name="vvm3_error_mailbox_not_initialized_message">ビジュアル ボイスメールのセットアップを完了するには、カスタマー サービス（%1$s）にご連絡いただき、次のエラーコードをお伝えください。エラーコード: 9994</string>
+  <string name="vvm3_error_service_not_provisioned_title">ビジュアル ボイスメール</string>
+  <string name="vvm3_error_service_not_provisioned_message">ビジュアル ボイスメールのセットアップを完了するには、カスタマー サービス（%1$s）にご連絡いただき、次のエラーコードをお伝えください。エラーコード: 9995</string>
+  <string name="vvm3_error_service_not_activated_title">ビジュアル ボイスメール</string>
+  <string name="vvm3_error_service_not_activated_message">ビジュアル ボイスメールを有効にするには、カスタマー サービス（%1$s）にご連絡いただき、次のエラーコードをお伝えください。エラーコード: 9996</string>
+  <string name="vvm3_error_user_blocked_title">エラーが発生しました</string>
+  <string name="vvm3_error_user_blocked_message">ビジュアル ボイスメールのセットアップを完了するには、カスタマー サービス（%1$s）にご連絡いただき、次のエラーコードをお伝えください。エラーコード: 9998</string>
+  <string name="vvm3_error_subscriber_unknown_title">ビジュアル ボイスメールが無効になっています</string>
+  <string name="vvm3_error_subscriber_unknown_message">ビジュアル ボイスメールを有効にするには、カスタマー サービス（%1$s）にご連絡ください。</string>
+  <string name="vvm3_error_imap_getquota_error_title">エラーが発生しました</string>
+  <string name="vvm3_error_imap_getquota_error_message">カスタマー サービス（%1$s）にご連絡いただき、次のエラーコードをお伝えください。エラーコード: 9997</string>
+  <string name="vvm3_error_imap_select_error_title">エラーが発生しました</string>
+  <string name="vvm3_error_imap_select_error_message">カスタマー サービス（%1$s）にご連絡いただき、次のエラーコードをお伝えください。エラーコード: 9989</string>
+  <string name="vvm3_error_imap_error_title">エラーが発生しました</string>
+  <string name="vvm3_error_imap_error_message">カスタマー サービス（%1$s）にご連絡いただき、次のエラーコードをお伝えください。エラーコード: 9999</string>
+  <string name="verizon_terms_and_conditions_title">ビジュアル ボイスメールを ON にする</string>
+  <string name="verizon_terms_and_conditions_message">%1$s ビジュアル ボイスメールを ON にすると、Verizon Wireless の利用規約にご同意いただいたものとみなされます。\n\n%2$s</string>
+  <string name="dialer_terms_and_conditions_title">ビジュアル ボイスメールを ON にする</string>
+  <string name="dialer_terms_and_conditions_existing_user_title">New! ボイスメールを文字変換できるようになりました</string>
+  <string name="dialer_terms_and_conditions_message">%s</string>
+  <string name="dialer_terms_and_conditions_1.0">ボイスメール サービスを呼び出さなくても、メッセージを表示して再生できます。ボイスメールは、Google の無料の音声文字変換サービスで文字に変換されます。[設定] にアクセスすると、メッセージを表示または再生する設定のどちらかをいつでも OFF にできます。%s</string>
+  <string name="dialer_terms_and_conditions_existing_user">Google の無料の音声文字変換サービスでボイスメールを文字に変換できるようになりました。この設定は [設定] でいつでも OFF にできます。%s</string>
+  <string name="dialer_terms_and_conditions_for_verizon_1.0">ボイスメール サービスを呼び出さなくても、メッセージを表示して再生できます。</string>
+  <string name="dialer_terms_and_conditions_learn_more">詳細</string>
+  <string name="dialer_terms_and_conditions_existing_user_ack">OK</string>
+  <string name="dialer_terms_and_conditions_existing_user_decline">スキップ</string>
+  <string name="terms_and_conditions_decline_dialog_title">ビジュアル ボイスメールを無効にしますか？</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_message">利用規約にご同意いただけない場合は、ビジュアル ボイスメールが無効となります。</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_downgrade">無効にする</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_message">ビジュアル ボイスメールを OFF にすると、ビジュアル ボイスメールが無効になります。</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_downgrade">無効にする</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message">*86 宛に発信した場合のみボイスメールにアクセスできるようになります。続行するには、新しいボイスメール PIN を設定してください。</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin">PIN を設定</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/error/res/values-ka/strings.xml b/java/com/android/dialer/voicemail/listui/error/res/values-ka/strings.xml
new file mode 100644
index 0000000..e5999b6
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/error/res/values-ka/strings.xml
@@ -0,0 +1,102 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_error_activating_title">ვიზუალური ხმოვანი ფოსტა აქტიურდება</string>
+  <string name="voicemail_error_activating_message">ვიზუალური ხმოვანი ფოსტის სრულად გააქტიურებამდე შეიძლება ხმოვანი ფოსტის შეტყობინებები არ მიიღოთ. დარეკეთ ხმოვან ფოსტაში, რათა მიიღოთ ახალი შეტყობინებები ხმოვანი ფოსტის ბოლომდე გააქტიურებამდე.</string>
+  <string name="voicemail_error_not_activate_no_signal_title">ვიზუალური ხმოვანი ფოსტის გააქტიურება შეუძლებელია</string>
+  <string name="voicemail_error_not_activate_no_signal_message">დარწმუნდით, რომ თქვენს ტელეფონს აქვს მობილურ ქსელთან კავშირი და სცადეთ ხელახლა.</string>
+  <string name="voicemail_error_not_activate_no_signal_airplane_mode_message">გამორთეთ თვითმფრინავის რეჟიმი და სცადეთ ხელახლა.</string>
+  <string name="voicemail_error_no_signal_title">კავშირი არ არის</string>
+  <string name="voicemail_error_no_signal_message">ახალი ხმოვანი ფოსტის შესახებ შეტყობინებას არ მიიღებთ. თუ იყენებთ Wi-Fi-ს, შეგიძლიათ შეამოწმოთ ხმოვანი ფოსტა ახლავე სინქრონიზაციის მეშვეობით.</string>
+  <string name="voicemail_error_no_signal_airplane_mode_message">ახალი ხმოვანი ფოსტის შესახებ არ გეცნობებათ. გამორთეთ თვითმფრინავის რეჟიმი ხმოვანი ფოსტის სინქრონიზაციისთვის.</string>
+  <string name="voicemail_error_no_signal_cellular_required_message">ხმოვანი ფოსტის შესამოწმებლად თქვენი ტელეფონი საჭიროებს მობილურ ინტერნეტთან კავშირს.</string>
+  <string name="voicemail_error_activation_failed_title">ვიზუალური ხმოვანი ფოსტის გააქტიურება შეუძლებელია</string>
+  <string name="voicemail_error_activation_failed_message">ხმოვანი ფოსტის შესამოწმებლად დარეკვა მაინც შეგიძლიათ.</string>
+  <string name="voicemail_error_no_data_title">ვიზუალური ხმოვანი ფოსტის განახლება შეუძლებელია</string>
+  <string name="voicemail_error_no_data_message">სცადეთ ხელახლა, როდესაც Wi‑Fi ან მობილურ ინტერნეტთან კავშირი გაუმჯობესდება. ხმოვანი ფოსტის შესამოწმებლად დარეკვა ახლაც შეგიძლიათ.</string>
+  <string name="voicemail_error_no_data_cellular_required_message">სცადეთ ხელახლა, როდესაც მობილურ ინტერნეტთან კავშირი გაუმჯობესდება. ხმოვანი ფოსტის შესამოწმებლად დარეკვა ახლაც შეგიძლიათ.</string>
+  <string name="voicemail_error_bad_config_title">ვიზუალური ხმოვანი ფოსტის განახლება შეუძლებელია</string>
+  <string name="voicemail_error_bad_config_message">ხმოვანი ფოსტის შესამოწმებლად დარეკვა მაინც შეგიძლიათ.</string>
+  <string name="voicemail_error_communication_title">ვიზუალური ხმოვანი ფოსტის განახლება შეუძლებელია</string>
+  <string name="voicemail_error_communication_message">ხმოვანი ფოსტის შესამოწმებლად დარეკვა მაინც შეგიძლიათ.</string>
+  <string name="voicemail_error_server_connection_title">ვიზუალური ხმოვანი ფოსტის განახლება შეუძლებელია</string>
+  <string name="voicemail_error_server_connection_message">ხმოვანი ფოსტის შესამოწმებლად დარეკვა მაინც შეგიძლიათ.</string>
+  <string name="voicemail_error_server_title">ვიზუალური ხმოვანი ფოსტის განახლება შეუძლებელია</string>
+  <string name="voicemail_error_server_message">ხმოვანი ფოსტის შესამოწმებლად დარეკვა მაინც შეგიძლიათ.</string>
+  <string name="voicemail_error_inbox_near_full_title">შემოსულები თითქმის სავსეა</string>
+  <string name="voicemail_error_inbox_near_full_message">თუ თქვენი შემოსულები სავსეა, ახალ ხმოვან ფოსტას ვერ მიიღებთ.</string>
+  <string name="voicemail_error_inbox_full_title">ახალი ხმოვანი ფოსტის მიღება შეუძლებელია</string>
+  <string name="voicemail_error_inbox_full_message">თქვენი შემოსულები სავსეა. ახალი ხმოვანი ფოსტის მისაღებად სცადეთ რამდენიმე შეტყობინების წაშლა.</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_title">დამატებითი მეხსიერების ჩართვა და სარეზერვო ასლების შექმნა</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_message">თქვენი საფოსტო ყუთი სავსეა. ადგილის გასათავისუფლებლად ჩართეთ დამატებითი მეხსიერება, რათა Google-მა შეძლოს თქვენი ხმოვანი ფოსტის შეტყობინებების მართვა და სარეზერვო ასლების შექმნა.</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_title">დამატებითი მეხსიერების ჩართვა და სარეზერვო ასლების შექმნა</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_message">თქვენი საფოსტო ყუთი თითქმის სავსეა. ადგილის გასათავისუფლებლად ჩართეთ დამატებითი მეხსიერება, რათა Google-მა შეძლოს თქვენი ხმოვანი ფოსტის შეტყობინებების მართვა და სარეზერვო ასლების შექმნა.</string>
+  <string name="voicemail_error_pin_not_set_title">დააყენეთ თქვენი ხმოვანი ფოსტის PIN-კოდი</string>
+  <string name="voicemail_error_pin_not_set_message">ნებისმიერ დროს, როდესაც დარეკავთ, რათა ხმოვან ფოსტაზე წვდომა იქონიოთ, ხმოვანი ფოსტის PIN-კოდი დაგჭირდებათ.</string>
+  <string name="voicemail_action_turn_off_airplane_mode">თვითმფრინავის რეჟიმის პარამეტრები</string>
+  <string name="voicemail_action_set_pin">PIN-კოდის დაყენება</string>
+  <string name="voicemail_action_retry">ხელახლა ცდა</string>
+  <string name="voicemail_action_turn_archive_on">ჩართვა</string>
+  <string name="voicemail_action_dimiss">არა, გმადლობთ</string>
+  <string name="voicemail_action_sync">სინქრონიზაცია</string>
+  <string name="voicemail_action_call_voicemail">ხმოვან ფოსტაში დარეკვა</string>
+  <string name="voicemail_action_call_customer_support">კლიენტთა მხარდაჭერის ცენტრში დარეკვა</string>
+  <string name="vvm3_error_vms_dns_failure_title">მოხდა რაღაც შეცდომა</string>
+  <string name="vvm3_error_vms_dns_failure_message">უკაცრავად, წარმოიშვა პრობლემა. გთხოვთ, სცადოთ ხელახლა მოგვიანებით. თუ პრობლემა არ გამოსწორდება, გთხოვთ, დაუკავშირდეთ კლიენტთა მხარდაჭერის ცენტრს ნომერზე %1$s და უთხრათ, რომ შეცდომის კოდია 9001.</string>
+  <string name="vvm3_error_vmg_dns_failure_title">მოხდა რაღაც შეცდომა</string>
+  <string name="vvm3_error_vmg_dns_failure_message">უკაცრავად, წარმოიშვა პრობლემა. გთხოვთ, სცადოთ ხელახლა მოგვიანებით. თუ პრობლემა არ გამოსწორდება, გთხოვთ, დაუკავშირდეთ კლიენტთა მხარდაჭერის ცენტრს ნომერზე %1$s და უთხრათ, რომ შეცდომის კოდია 9002.</string>
+  <string name="vvm3_error_spg_dns_failure_title">მოხდა რაღაც შეცდომა</string>
+  <string name="vvm3_error_spg_dns_failure_message">უკაცრავად, წარმოიშვა პრობლემა. გთხოვთ, სცადოთ ხელახლა მოგვიანებით. თუ პრობლემა არ გამოსწორდება, გთხოვთ, დაუკავშირდეთ კლიენტთა მხარდაჭერის ცენტრს ნომერზე %1$s და უთხრათ, რომ შეცდომის კოდია 9003.</string>
+  <string name="vvm3_error_vms_no_cellular_title">თქვენს ხმოვან საფოსტო ყუთთან დაკავშირება ვერ ხერხდება</string>
+  <string name="vvm3_error_vms_no_cellular_message">უკაცრავად, თქვენს ხმოვან საფოსტო ყუთთან დაკავშირებას ვერ ვახერხებთ. გთხოვთ, სცადოთ ხელახლა მოგვიანებით. თუ ხართ ისეთ ადგილას, სადაც სუსტი სიგნალია, დაელოდეთ ძლიერ სიგნალს და სცადეთ ხელახლა. თუ პრობლემა არ გამოსწორდება, გთხოვთ, დაუკავშირდეთ კლიენტთა მხარდაჭერის ცენტრს ნომერზე %1$s და უთხრათ, რომ შეცდომის კოდია 9004.</string>
+  <string name="vvm3_error_vmg_no_cellular_title">თქვენს ხმოვან საფოსტო ყუთთან დაკავშირება ვერ ხერხდება</string>
+  <string name="vvm3_error_vmg_no_cellular_message">უკაცრავად, თქვენს ხმოვან საფოსტო ყუთთან დაკავშირებას ვერ ვახერხებთ. გთხოვთ, სცადოთ ხელახლა მოგვიანებით. თუ ხართ ისეთ ადგილას, სადაც სუსტი სიგნალია, დაელოდეთ ძლიერ სიგნალს და სცადეთ ხელახლა. თუ პრობლემა არ გამოსწორდება, გთხოვთ, დაუკავშირდეთ კლიენტთა მხარდაჭერის ცენტრს ნომერზე %1$s და უთხრათ, რომ შეცდომის კოდია 9005.</string>
+  <string name="vvm3_error_spg_no_cellular_title">თქვენს ხმოვან საფოსტო ყუთთან დაკავშირება ვერ ხერხდება</string>
+  <string name="vvm3_error_spg_no_cellular_message">უკაცრავად, თქვენს ხმოვან საფოსტო ყუთთან დაკავშირებას ვერ ვახერხებთ. გთხოვთ, სცადოთ ხელახლა მოგვიანებით. თუ ხართ ისეთ ადგილას, სადაც სუსტი სიგნალია, დაელოდეთ ძლიერ სიგნალს და სცადეთ ხელახლა. თუ პრობლემა არ გამოსწორდება, გთხოვთ, დაუკავშირდეთ კლიენტთა მხარდაჭერის ცენტრს ნომერზე %1$s და უთხრათ, რომ შეცდომის კოდია 9006.</string>
+  <string name="vvm3_error_vms_timeout_title">მოხდა რაღაც შეცდომა</string>
+  <string name="vvm3_error_vms_timeout_message">უკაცრავად, წარმოიშვა პრობლემა. გთხოვთ, სცადოთ ხელახლა მოგვიანებით. თუ პრობლემა არ გამოსწორდება, გთხოვთ, დაუკავშირდეთ კლიენტთა მხარდაჭერის ცენტრს ნომერზე %1$s და უთხრათ, რომ შეცდომის კოდია 9007.</string>
+  <string name="vvm3_error_vmg_timeout_title">მოხდა რაღაც შეცდომა</string>
+  <string name="vvm3_error_vmg_timeout_message">უკაცრავად, წარმოიშვა პრობლემა. გთხოვთ, სცადოთ ხელახლა მოგვიანებით. თუ პრობლემა არ გამოსწორდება, გთხოვთ, დაუკავშირდეთ კლიენტთა მხარდაჭერის ცენტრს ნომერზე %1$s და უთხრათ, რომ შეცდომის კოდია 9008.</string>
+  <string name="vvm3_error_status_sms_timeout_title">მოხდა რაღაც შეცდომა</string>
+  <string name="vvm3_error_status_sms_timeout_message">უკაცრავად, თქვენი სერვისის დაყენებას ვერ ვახერხებთ. გთხოვთ, სცადოთ ხელახლა მოგვიანებით. თუ პრობლემა არ გამოსწორდება, გთხოვთ, დაუკავშირდეთ კლიენტთა მხარდაჭერის ცენტრს ნომერზე %1$s და უთხრათ, რომ შეცდომის კოდია 9009.</string>
+  <string name="vvm3_error_subscriber_blocked_title">თქვენს ხმოვან საფოსტო ყუთთან დაკავშირება ვერ ხერხდება</string>
+  <string name="vvm3_error_subscriber_blocked_message">უკაცრავად, ამჯერად თქვენს ხმოვან საფოსტო ყუთს ვერ ვუკავშირდებით. გთხოვთ, სცადოთ ხელახლა მოგვიანებით. თუ პრობლემა არ გამოსწორდება, გთხოვთ, დაუკავშირდეთ კლიენტთა მხარდაჭერის ცენტრს ნომერზე %1$s და უთხრათ, რომ შეცდომის კოდია 9990.</string>
+  <string name="vvm3_error_unknown_user_title">ხმოვანი ფოსტის დაყენება</string>
+  <string name="vvm3_error_unknown_user_message">თქვენს ანგარიშზე ხმოვანი ფოსტა დაყენებული არ არის. გთხოვთ, დაუკავშირდეთ კლიენტთა მხარდაჭერის ცენტრს ნომერზე %1$s და უთხრათ, რომ შეცდომის კოდია 9991.</string>
+  <string name="vvm3_error_unknown_device_title">ხმოვანი ფოსტა</string>
+  <string name="vvm3_error_unknown_device_message">ამ მოწყობილობაზე ვიზუალური ხმოვანი ფოსტის გამოყენება შეუძლებელია. გთხოვთ, დაუკავშირდეთ კლიენტთა მხარდაჭერის ცენტრს ნომერზე %1$s და უთხრათ, რომ შეცდომის კოდია 9992.</string>
+  <string name="vvm3_error_invalid_password_title">მოხდა რაღაც შეცდომა</string>
+  <string name="vvm3_error_invalid_password_message">გთხოვთ, დაუკავშირდეთ კლიენტთა მხარდაჭერის ცენტრს ნომერზე %1$s და უთხრათ, რომ შეცდომის კოდია 9993.</string>
+  <string name="vvm3_error_mailbox_not_initialized_title">ვიზუალური ხმოვანი ფოსტა</string>
+  <string name="vvm3_error_mailbox_not_initialized_message">ვიზუალური ხმოვანი ფოსტის დაყენების დასასრულებლად გთხოვთ, დაუკავშირდეთ კლიენტთა მხარდაჭერის ცენტრს ნომერზე %1$s და უთხრათ, რომ შეცდომის კოდია 9994.</string>
+  <string name="vvm3_error_service_not_provisioned_title">ვიზუალური ხმოვანი ფოსტა</string>
+  <string name="vvm3_error_service_not_provisioned_message">ვიზუალური ხმოვანი ფოსტის დაყენების დასასრულებლად გთხოვთ, დაუკავშირდეთ კლიენტთა მხარდაჭერის ცენტრს ნომერზე %1$s და უთხრათ, რომ შეცდომის კოდია 9995.</string>
+  <string name="vvm3_error_service_not_activated_title">ვიზუალური ხმოვანი ფოსტა</string>
+  <string name="vvm3_error_service_not_activated_message">ვიზუალური ხმოვანი ფოსტის გასააქტიურებლად გთხოვთ, დაუკავშირდეთ კლიენტთა მხარდაჭერის ცენტრს ნომერზე %1$s და უთხრათ, რომ შეცდომის კოდია 9996.</string>
+  <string name="vvm3_error_user_blocked_title">მოხდა რაღაც შეცდომა</string>
+  <string name="vvm3_error_user_blocked_message">ვიზუალური ხმოვანი ფოსტის დაყენების დასასრულებლად გთხოვთ, დაუკავშირდეთ კლიენტთა მხარდაჭერის ცენტრს ნომერზე %1$s და უთხრათ, რომ შეცდომის კოდია 9998.</string>
+  <string name="vvm3_error_subscriber_unknown_title">ვიზუალური ხმოვანი ფოსტა გათიშულია</string>
+  <string name="vvm3_error_subscriber_unknown_message">გთხოვთ, დაუკავშირდეთ კლიენტთა მხარდაჭერის ცენტრს ნომერზე %1$s, რათა გაააქტიუროთ ხმოვანი ფოსტა.</string>
+  <string name="vvm3_error_imap_getquota_error_title">მოხდა რაღაც შეცდომა</string>
+  <string name="vvm3_error_imap_getquota_error_message">გთხოვთ, დაუკავშირდეთ კლიენტთა მხარდაჭერის ცენტრს ნომერზე %1$s და უთხრათ, რომ შეცდომის კოდია 9997.</string>
+  <string name="vvm3_error_imap_select_error_title">მოხდა რაღაც შეცდომა</string>
+  <string name="vvm3_error_imap_select_error_message">გთხოვთ, დაუკავშირდეთ კლიენტთა მხარდაჭერის ცენტრს ნომერზე %1$s და უთხრათ, რომ შეცდომის კოდია 9989.</string>
+  <string name="vvm3_error_imap_error_title">მოხდა რაღაც შეცდომა</string>
+  <string name="vvm3_error_imap_error_message">გთხოვთ, დაუკავშირდეთ კლიენტთა მხარდაჭერის ცენტრს ნომერზე %1$s და უთხრათ, რომ შეცდომის კოდია 9999.</string>
+  <string name="verizon_terms_and_conditions_title">ვიზუალური ხმოვანი ფოსტის ჩართვა</string>
+  <string name="verizon_terms_and_conditions_message">%1$s ვიზუალური ხმოვანი ფოსტის ჩართვით თქვენ ეთანხმებით Verizon Wireless-ის მომსახურების პირობებს:\n\n%2$s</string>
+  <string name="dialer_terms_and_conditions_title">ვიზუალური ხმოვანი ფოსტის ჩართვა</string>
+  <string name="dialer_terms_and_conditions_existing_user_title">სიახლე! წაიკითხეთ თქვენი ხმოვანი ფოსტა</string>
+  <string name="dialer_terms_and_conditions_message">%s</string>
+  <string name="dialer_terms_and_conditions_1.0">იხილეთ და მოისმინეთ თქვენი შეტყობინებები ხმოვან ფოსტაში დარეკვის გარეშე. თქვენი ხმოვანი ფოსტის ტრანსკრიპტებს Google-ის უფასო ტრანსკრიბირების სერვისი გაწვდით. ორივე ფუნქციის გამორთვა ნებისმიერ დროს შეგიძლიათ პარამეტრებიდან. %s</string>
+  <string name="dialer_terms_and_conditions_existing_user">ახლა ხმოვანი ფოსტის ტრანსკრიპტებს Google-ის უფასო ტრანსკრიბირების სერვისი გაწვდით. მისი გამორთვა ნებისმიერ დროს შეგიძლიათ პარამეტრებიდან. %s</string>
+  <string name="dialer_terms_and_conditions_for_verizon_1.0">იხილეთ და მოისმინეთ თქვენი შეტყობინებები ხმოვან ფოსტაში დარეკვის გარეშე.</string>
+  <string name="dialer_terms_and_conditions_learn_more">შეიტყვეთ მეტი</string>
+  <string name="dialer_terms_and_conditions_existing_user_ack">კარგი, გასაგებია</string>
+  <string name="dialer_terms_and_conditions_existing_user_decline">არა, გმადლობთ</string>
+  <string name="terms_and_conditions_decline_dialog_title">გსურთ ვიზუალური ხმოვანი ფოსტის გათიშვა?</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_message">თუ მომსახურების პირობებს უარყოფთ, ვიზუალური ხმოვანი ფოსტა გამოირთვება.</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_downgrade">გათიშვა</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_message">თუ ვიზუალურ ხმოვან ფოსტას გამორთავთ, ის გაითიშება.</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_downgrade">გათიშვა</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message">ხმოვანი ფოსტა ხელმისაწვდომი იქნება მხოლოდ *86-ზე დარეკვით. გასაგრძელებლად დააყენეთ ხმოვანი ფოსტის ახალი PIN-კოდი.</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin">PIN-კოდის დაყენება</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/error/res/values-kk/strings.xml b/java/com/android/dialer/voicemail/listui/error/res/values-kk/strings.xml
new file mode 100644
index 0000000..f83fdc0
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/error/res/values-kk/strings.xml
@@ -0,0 +1,102 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_error_activating_title">Визуалдық дауыстық хабар қызметін қосу</string>
+  <string name="voicemail_error_activating_message">Визуалдық дауыстық хабар қызметі толығымен қосылмаса, дауыстық хабарларды қабылдай алмайсыз. Дауыстық хабар қызметі толығымен қосылғанша, жаңа хабарларды дауыстық поштаға қоңырау шалу арқылы тексеріңіз.</string>
+  <string name="voicemail_error_not_activate_no_signal_title">Визуалдық дауыстық хабар қызметі қосылмады</string>
+  <string name="voicemail_error_not_activate_no_signal_message">Телефоныңыздың мобильдік байланысын тексеріп, әрекетті қайталаңыз.</string>
+  <string name="voicemail_error_not_activate_no_signal_airplane_mode_message">Ұшақ режимін өшіріп, әрекетті қайталаңыз.</string>
+  <string name="voicemail_error_no_signal_title">Байланыс жоқ</string>
+  <string name="voicemail_error_no_signal_message">Жаңа дауыстық хабарлар туралы сізге хабарланбайды. Егер Wi-Fi байланысын қолдансаңыз, қазір синхрондап, дауыстық хабарларды қазір тексеруіңізге болады.</string>
+  <string name="voicemail_error_no_signal_airplane_mode_message">Жаңа дауыстық хабарлар туралы сізге хабарланбайды. Дауыстық хабарды синхрондау үшін ұшақ режимін өшіріңіз.</string>
+  <string name="voicemail_error_no_signal_cellular_required_message">Дауыстық хабарларды тексеру үшін, телефоныңызда мобильдік байланыс болуы керек.</string>
+  <string name="voicemail_error_activation_failed_title">Визуалдық дауыстық хабар қызметі қосылмады</string>
+  <string name="voicemail_error_activation_failed_message">Дауыстық хабарларды қоңырау шалып та тексеруіңізге болады.</string>
+  <string name="voicemail_error_no_data_title">Визуалдық дауыстық хабар қызметі жаңартылмады</string>
+  <string name="voicemail_error_no_data_message">Wi-Fi немесе мобильдік байланыс жақсарғанда қайталап көріңіз. Дауыстық хабарларды қоңырау шалып та тексеруіңізге болады.</string>
+  <string name="voicemail_error_no_data_cellular_required_message">Мобильдік байланыс жақсарғанда қайталап көріңіз. Дауыстық хабарларды қоңырау шалып та тексеруіңізге болады.</string>
+  <string name="voicemail_error_bad_config_title">Визуалдық дауыстық хабар қызметі жаңартылмады</string>
+  <string name="voicemail_error_bad_config_message">Дауыстық хабарларды қоңырау шалып та тексеруіңізге болады.</string>
+  <string name="voicemail_error_communication_title">Визуалдық дауыстық хабар қызметі жаңартылмады</string>
+  <string name="voicemail_error_communication_message">Дауыстық хабарларды қоңырау шалып та тексеруіңізге болады.</string>
+  <string name="voicemail_error_server_connection_title">Визуалдық дауыстық хабар қызметі жаңартылмады</string>
+  <string name="voicemail_error_server_connection_message">Дауыстық хабарларды қоңырау шалып та тексеруіңізге болады.</string>
+  <string name="voicemail_error_server_title">Визуалдық дауыстық хабар қызметі жаңартылмады</string>
+  <string name="voicemail_error_server_message">Дауыстық хабарларды қоңырау шалып та тексеруіңізге болады.</string>
+  <string name="voicemail_error_inbox_near_full_title">Кіріс қалтасы толуға жақын</string>
+  <string name="voicemail_error_inbox_near_full_message">Кіріс қалтасы толы болса, жаңа дауыстық хабар алу мүмкін болмайды.</string>
+  <string name="voicemail_error_inbox_full_title">Жаңа дауыстық хабар қабылданбайды</string>
+  <string name="voicemail_error_inbox_full_message">Кіріс қалтасы толы. Жаңа дауыстық хабарды қабылдау үшін кейбір хабарларды жойып көріңіз.</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_title">Қосымша жадты қосып, сақтық көшірме жасау</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_message">Кіріс жәшігі толы. Орын босату үшін қосымша жадты қосып, Google-ға дауыстық хабарларыңызды басқарып, сақтық көшірмесін жасауға рұқсат беріңіз.</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_title">Қосымша жадты қосып, сақтық көшірме жасау</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_message">Кіріс жәшігі толы. Орын босату үшін қосымша жад функциясын қосып, Google-ға дауыстық хабарларыңызды басқарып, сақтық көшірмесін жасауға рұқсат беріңіз.</string>
+  <string name="voicemail_error_pin_not_set_title">Дауыстық пошта PIN кодын орнатыңыз</string>
+  <string name="voicemail_error_pin_not_set_message">Дауыстық поштаны тексеру мақсатымен қоңырау шалғанда, дауыстық пошта PIN коды сұралады.</string>
+  <string name="voicemail_action_turn_off_airplane_mode">Ұшақ режимінің параметрлері</string>
+  <string name="voicemail_action_set_pin">PIN кодын орнату</string>
+  <string name="voicemail_action_retry">Қайталап көру</string>
+  <string name="voicemail_action_turn_archive_on">Қосу</string>
+  <string name="voicemail_action_dimiss">Жоқ, рақмет</string>
+  <string name="voicemail_action_sync">Синхрондау</string>
+  <string name="voicemail_action_call_voicemail">Дауыстық хабар қызметіне қоңырау шалу</string>
+  <string name="voicemail_action_call_customer_support">Тұтынушыларға қолдау көрсету орталығына қоңырау шалу</string>
+  <string name="vvm3_error_vms_dns_failure_title">Бір нәрсе дұрыс болмады</string>
+  <string name="vvm3_error_vms_dns_failure_message">Кешіріңіз, ақаулық орын алды. Әрекетті кейінірек қайталаңыз. Егер ақаулық жойылмаса, тұтынушыларға қызмет көрсету орталығына (%1$s) хабарласып, 9001 қате кодын беріңіз.</string>
+  <string name="vvm3_error_vmg_dns_failure_title">Бір нәрсе дұрыс болмады</string>
+  <string name="vvm3_error_vmg_dns_failure_message">Кешіріңіз, ақаулық орын алды. Әрекетті кейінірек қайталаңыз. Егер ақаулық жойылмаса, тұтынушыларға қызмет көрсету орталығына (%1$s) хабарласып, 9002 қате кодын беріңіз.</string>
+  <string name="vvm3_error_spg_dns_failure_title">Бір нәрсе дұрыс болмады</string>
+  <string name="vvm3_error_spg_dns_failure_message">Кешіріңіз, ақаулық орын алды. Әрекетті кейінірек қайталаңыз. Егер ақаулық жойылмаса, тұтынушыларға қызмет көрсету орталығына (%1$s) хабарласып, 9003 қате кодын беріңіз.</string>
+  <string name="vvm3_error_vms_no_cellular_title">Дауыстық хабар жәшігіне қосылмады</string>
+  <string name="vvm3_error_vms_no_cellular_message">Кешіріңіз, дауыстық хабар жәшігіне қосылу кезінде ақаулық туындады. Егер сигнал күші нашар аймақта болсаңыз, сигнал күшейгенше күтіп, әрекетті қайталаңыз. Егер ақаулық жойылмаса, тұтынушыларға қызмет көрсету орталығына (%1$s) хабарласып, 9004 қате кодын беріңіз.</string>
+  <string name="vvm3_error_vmg_no_cellular_title">Дауыстық хабар жәшігіне қосылмады</string>
+  <string name="vvm3_error_vmg_no_cellular_message">Кешіріңіз, дауыстық хабар жәшігіне қосылу кезінде ақаулық туындады. Егер сигнал күші нашар аймақта болсаңыз, сигнал күшейгенше күтіп, әрекетті қайталаңыз. Егер ақаулық жойылмаса, тұтынушыларға қызмет көрсету орталығына (%1$s) хабарласып, 9005 қате кодын беріңіз.</string>
+  <string name="vvm3_error_spg_no_cellular_title">Дауыстық хабар жәшігіне қосылмады</string>
+  <string name="vvm3_error_spg_no_cellular_message">Кешіріңіз, дауыстық хабар жәшігіне қосылу кезінде ақаулық туындады. Егер сигнал күші нашар аймақта болсаңыз, сигнал күшейгенше күтіп, әрекетті қайталаңыз. Егер ақаулық жойылмаса, тұтынушыларға қызмет көрсету орталығына (%1$s) хабарласып, 9006 қате кодын беріңіз.</string>
+  <string name="vvm3_error_vms_timeout_title">Бір нәрсе дұрыс болмады</string>
+  <string name="vvm3_error_vms_timeout_message">Кешіріңіз, ақаулық орын алды. Әрекетті кейінірек қайталаңыз. Егер ақаулық жойылмаса, тұтынушыларға қызмет көрсету орталығына (%1$s) хабарласып, 9007 қате кодын беріңіз.</string>
+  <string name="vvm3_error_vmg_timeout_title">Бір нәрсе дұрыс болмады</string>
+  <string name="vvm3_error_vmg_timeout_message">Кешіріңіз, ақаулық орын алды. Әрекетті кейінірек қайталаңыз. Егер ақаулық жойылмаса, тұтынушыларға қызмет көрсету орталығына (%1$s) хабарласып, 9008 қате кодын беріңіз.</string>
+  <string name="vvm3_error_status_sms_timeout_title">Бір нәрсе дұрыс болмады</string>
+  <string name="vvm3_error_status_sms_timeout_message">Кешіріңіз, қызметті орнату кезінде ақаулық орын алды. Әрекетті кейінірек қайталаңыз. Егер ақаулық жойылмаса, тұтынушыларға қызмет көрсету орталығына (%1$s) хабарласып, 9009 қате кодын беріңіз.</string>
+  <string name="vvm3_error_subscriber_blocked_title">Дауыстық хабар жәшігіне қосылмады</string>
+  <string name="vvm3_error_subscriber_blocked_message">Кешіріңіз, дауыстық хабар қызметіне қосылу мүмкін болмады. Әрекетті кейінірек қайталаңыз. Егер ақаулық жойылмаса, тұтынушыларға қызмет көрсету орталығына (%1$s) хабарласып, 9990 қате кодын беріңіз.</string>
+  <string name="vvm3_error_unknown_user_title">Дауыстық хабар қызметін орнату</string>
+  <string name="vvm3_error_unknown_user_message">Есептік жазбаңызда дауыстық хабар қызметі орнатылмаған. Тұтынушыларға қызмет көрсету орталығына (%1$s) хабарласып, 9991 қате кодын беріңіз.</string>
+  <string name="vvm3_error_unknown_device_title">Дауыстық хабар</string>
+  <string name="vvm3_error_unknown_device_message">Бұл құрылғыда визуалды дауыстық хабар қолданылмайды. Тұтынушыларға қызмет көрсету орталығына (%1$s) хабарласып, 9992 қате кодын беріңіз.</string>
+  <string name="vvm3_error_invalid_password_title">Бір нәрсе дұрыс болмады</string>
+  <string name="vvm3_error_invalid_password_message">Тұтынушыларға қызмет көрсету орталығына (%1$s) хабарласып, 9993 қате кодын беріңіз.</string>
+  <string name="vvm3_error_mailbox_not_initialized_title">Визуалдық дауыстық хабар</string>
+  <string name="vvm3_error_mailbox_not_initialized_message">Визуалдық дауыстық хабар қызметін орнатуды аяқтау үшін, тұтынушыларға қызмет көрсету орталығына (%1$s) хабарласып, 9994 қате кодын беріңіз.</string>
+  <string name="vvm3_error_service_not_provisioned_title">Визуалдық дауыстық хабар</string>
+  <string name="vvm3_error_service_not_provisioned_message">Визуалдық дауыстық хабар қызметін орнатуды аяқтау үшін, тұтынушыларға қызмет көрсету орталығына (%1$s) хабарласып, 9995 қате кодын беріңіз.</string>
+  <string name="vvm3_error_service_not_activated_title">Визуалдық дауыстық хабар</string>
+  <string name="vvm3_error_service_not_activated_message">Визуалдық дауыстық хабар қызметін қосу үшін, тұтынушыларға қызмет көрсету орталығына (%1$s) хабарласып, 9996 қате кодын беріңіз.</string>
+  <string name="vvm3_error_user_blocked_title">Бір нәрсе дұрыс болмады</string>
+  <string name="vvm3_error_user_blocked_message">Визуалдық дауыстық хабар қызметін орнатуды аяқтау үшін, тұтынушыларға қызмет көрсету орталығына (%1$s) хабарласып, 9998 қате кодын беріңіз.</string>
+  <string name="vvm3_error_subscriber_unknown_title">Визуалды дауыстық хабар қызметі өшірулі</string>
+  <string name="vvm3_error_subscriber_unknown_message">Визуалдық дауыстық хабар қызметін қосу үшін, тұтынушыларға қызмет көрсету орталығына (%1$s) хабарласыңыз.</string>
+  <string name="vvm3_error_imap_getquota_error_title">Бір нәрсе дұрыс болмады</string>
+  <string name="vvm3_error_imap_getquota_error_message">Тұтынушыларға қызмет көрсету орталығына (%1$s) хабарласып, 9997 қате кодын беріңіз.</string>
+  <string name="vvm3_error_imap_select_error_title">Бір нәрсе дұрыс болмады</string>
+  <string name="vvm3_error_imap_select_error_message">Тұтынушыларға қызмет көрсету орталығына (%1$s) хабарласып, 9989 қате кодын беріңіз.</string>
+  <string name="vvm3_error_imap_error_title">Бір нәрсе дұрыс болмады</string>
+  <string name="vvm3_error_imap_error_message">Тұтынушыларға қызмет көрсету орталығына (%1$s) хабарласып, 9999 қате кодын беріңіз.</string>
+  <string name="verizon_terms_and_conditions_title">Визуалдық дауыстық хабар қызметін қосу</string>
+  <string name="verizon_terms_and_conditions_message">%1$s Визуалдық дауыстық хабар қызметін қолдану арқылы Verizon Wireless шарттары мен талаптарын қабылдайсыз:\n\n%2$s</string>
+  <string name="dialer_terms_and_conditions_title">Визуалдық дауыстық хабар қызметін қосу</string>
+  <string name="dialer_terms_and_conditions_existing_user_title">Жаңа! Дауыстық хабарларды оқу</string>
+  <string name="dialer_terms_and_conditions_message">%s</string>
+  <string name="dialer_terms_and_conditions_1.0">Хабарларды дауыстық хабар қызметіне қоңырау шалмай-ақ көру және есту мүмкіндігі. Дауыстық хабар транскрипцияларын Google-дың тегін транскрипция қызметі жасайды. Бұл функцияны кез келген уақытта параметрлер бөлімінен өшіруге болады. %s</string>
+  <string name="dialer_terms_and_conditions_existing_user">Дауыстық хабар транскрипцияларын Google-дың тегін транскрипция қызметі жасайды. Бұл функцияны кез келген уақытта параметрлер бөлімінен өшіруге болады. %s</string>
+  <string name="dialer_terms_and_conditions_for_verizon_1.0">Хабарларды дауыстық хабар қызметіне қоңырау шалмай-ақ көру және есту мүмкіндігі.</string>
+  <string name="dialer_terms_and_conditions_learn_more">Толығырақ ақпарат</string>
+  <string name="dialer_terms_and_conditions_existing_user_ack">Жарайды, түсіндім</string>
+  <string name="dialer_terms_and_conditions_existing_user_decline">Жоқ, рақмет</string>
+  <string name="terms_and_conditions_decline_dialog_title">Визуалдық дауыстық хабар қызметін өшіру қажет пе?</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_message">Шарттары мен талаптары қабылданбаса, визуалдық дауыстық хабар қызметі өшіріледі.</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_downgrade">Өшіру</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_message">Визуалдық дауыстық хабар қызметі өшірілгенде, визуалдық дауыстық хабар алу функциясы да өшіріледі.</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_downgrade">Өшіру</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message">Дауыстық хабарларды тексеру үшін *86 нөміріне қоңырау шалу қажет болады. Жалғастыру үшін жаңа дауыстық хабар PIN кодын орнатыңыз.</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin">PIN кодын орнату</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/error/res/values-km/strings.xml b/java/com/android/dialer/voicemail/listui/error/res/values-km/strings.xml
new file mode 100644
index 0000000..a530e08
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/error/res/values-km/strings.xml
@@ -0,0 +1,102 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_error_activating_title">កំពុងបើកដំណើរការសារ​ជា​សំឡេង​ដែល​មើល​ឃើញ</string>
+  <string name="voicemail_error_activating_message">អ្នក​ប្រហែលជា​​មិន​ទទួល​បាន​ការ​ជូនដំណឹង​ជា​សារ​សំឡេង​ឡើយរហូត​​ទាល់តែសារ​ជា​សំឡេង​ដែល​មើល​ឃើញ​បានបើកដំណើរការពេញលេញ​​។ ហៅ​ជា​សារ​សំឡេង​ដើម្បី​​ទទួល​បាន​សារ​ថ្មី​ៗរហូត​សារ​ជា​សំឡេង​ត្រូវ​បានបើកដំណើរការពេញលេញ។</string>
+  <string name="voicemail_error_not_activate_no_signal_title">មិន​អាចបើកដំណើរការសារ​ជា​សំឡេង​ដែល​មើល​ឃើញ​បាន​ទេ</string>
+  <string name="voicemail_error_not_activate_no_signal_message">សូមប្រាកដ​ថា ទូរសព្ទ​របស់​អ្នក​មាន​ភ្ជាប់​បណ្ដាញ​ទូរសព្ទ​ចល័ត រួច​ព្យាយាម​ម្ដង​ទៀត។</string>
+  <string name="voicemail_error_not_activate_no_signal_airplane_mode_message">បិទមុខងារពេលជិះយន្តហោះ រួច​ព្យាយាម​ម្ដង​ទៀត។</string>
+  <string name="voicemail_error_no_signal_title">មិន​មាន​​ការ​​តភ្ជាប់</string>
+  <string name="voicemail_error_no_signal_message">អ្នក​នឹង​មិន​ទទួល​បាន​ការជូនដំណឹង នៅពេល​មាន​សារ​ជា​សំឡេង​ថ្មី​ទេ។ បើ​អ្នក​​ភ្ជាប់​ទៅ Wi-Fi អ្នក​អាច​ពិនិត្យមើល​​សារ​ជា​សំឡេង​ដោយ​ធ្វើ​សមកាលកម្ម​ឥឡូវ​នេះ។</string>
+  <string name="voicemail_error_no_signal_airplane_mode_message">អ្នក​នឹង​មិន​ទទួល​បាន​ការជូនដំណឹង នៅពេល​មាន​សារ​ជា​សំឡេង​ថ្មីៗទេ។ សូម​បិទ​មុខងារពេលជិះយន្តហោះ​ដើម្បី​ធ្វើសម​កាល​កម្មសារជា​សំឡេង​របស់​អ្នក។</string>
+  <string name="voicemail_error_no_signal_cellular_required_message">ទូរសព្ទ​របស់​អ្នក​ត្រូវ​​ភ្ជាប់​អ៊ីនធឺណិតតាម​ទិន្នន័យ​ទូរសព្ទ​​​ចល័ត​ ដើម្បី​អាច​ពិនិត្យ​មើល​សារ​​ជា​សំឡេង​បាន​។</string>
+  <string name="voicemail_error_activation_failed_title">មិន​អាចបើកដំណើរការសារ​ជា​សំឡេង​ដែល​មើល​ឃើញ​បាន​ទេ</string>
+  <string name="voicemail_error_activation_failed_message">អ្នក​នៅ​តែ​អាច​ហៅ​​ទូរសព្ទ​ដើម្បី​ស្ដាប់​សារ​ជា​សំឡេង។</string>
+  <string name="voicemail_error_no_data_title">មិន​អាច​ធ្វើ​បច្ចុប្បន្នភាព​សារ​​ជា​សំឡេង​ដែល​មើល​ឃើញ​​បាន​ទេ</string>
+  <string name="voicemail_error_no_data_message">សូមព្យាយាម​ម្ដង​ទៀត នៅពេលការតភ្ជាប់ Wi-Fi ឬ​​​ទិន្នន័យ​​ទូរសព្ទ​ចល័តរបស់អ្នក​បានប្រសើរឡើង។ អ្នក​នៅ​តែ​អាច​ហៅ​ទូរសព្ទ​ ដើម្បី​​ពិនិត្យមើល​សារ​ជា​សំឡេង​​បាន។</string>
+  <string name="voicemail_error_no_data_cellular_required_message">សូមព្យាយាម​ម្ដង​ទៀត នៅពេល​​​​ការតភ្ជាប់​ទិន្នន័យ​​ទូរសព្ទ​ចល័តរបស់អ្នកបាន​ប្រសើរឡើង។ អ្នក​នៅ​តែ​អាច​ហៅ​ទូរសព្ទ​ ដើម្បី​​ពិនិត្យមើលសារ​ជា​សំឡេង​បាន។</string>
+  <string name="voicemail_error_bad_config_title">មិន​អាច​ធ្វើ​បច្ចុប្បន្នភាព​សារ​​ជា​សំឡេង​ដែល​មើល​ឃើញ​​បាន​ទេ</string>
+  <string name="voicemail_error_bad_config_message">អ្នក​នៅ​តែ​អាច​ហៅ​​ទូរសព្ទ​ដើម្បី​ស្ដាប់​សារ​ជា​សំឡេង។</string>
+  <string name="voicemail_error_communication_title">មិន​អាច​ធ្វើ​បច្ចុប្បន្នភាព​សារ​​ជា​សំឡេង​ដែល​មើល​ឃើញ​​បាន​ទេ</string>
+  <string name="voicemail_error_communication_message">អ្នក​នៅ​តែ​អាច​ហៅ​​ទូរសព្ទ​ដើម្បី​ស្ដាប់​សារ​ជា​សំឡេង</string>
+  <string name="voicemail_error_server_connection_title">មិន​អាច​ធ្វើ​បច្ចុប្បន្នភាព​សារ​​ជា​សំឡេង​ដែល​មើល​ឃើញ​​បាន​ទេ</string>
+  <string name="voicemail_error_server_connection_message">អ្នក​នៅ​តែ​អាច​ហៅ​​ទូរសព្ទ​ដើម្បី​ស្ដាប់​សារ​ជា​សំឡេង។</string>
+  <string name="voicemail_error_server_title">មិន​អាច​ធ្វើ​បច្ចុប្បន្នភាព​សារ​​ជា​សំឡេង​ដែល​មើល​ឃើញ​​បាន​ទេ</string>
+  <string name="voicemail_error_server_message">អ្នក​នៅ​តែ​អាច​ហៅ​​ទូរសព្ទ​ដើម្បី​ស្ដាប់​សារ​ជា​សំឡេង។</string>
+  <string name="voicemail_error_inbox_near_full_title">ប្រអប់​សារជិត​ពេញ</string>
+  <string name="voicemail_error_inbox_near_full_message">អ្នក​នឹង​មិន​អាច​ទទួល​សារ​ជា​សំឡេង​ថ្មី​បាន​ទេ បើ​ប្រអប់​សារ​របស់​អ្នក​ពេញ។</string>
+  <string name="voicemail_error_inbox_full_title">មិនអាចទទួល​សារជា​សំឡេង​ថ្មី​បាន​ទេ</string>
+  <string name="voicemail_error_inbox_full_message">ប្រអប់សាររបស់អ្នកពេញហើយ។ សូមសាកល្បងលុបសារមួយចំនួនដើម្បី​អាច​ទទួល​សារជាសំឡេងថ្មី​បាន។</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_title">បើក​ទំហំ​ផ្ទុក​បន្ថែម រួច​បម្រុងទុក</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_message">ប្រអប់​​សារ​​របស់​អ្នក​ពេញហើយ។ ដើម្បី​បង្កើន​ទំហំ​ផ្ទុក​ទំនេរ សូម​បើក​ទំហំផ្ទុក​បន្ថែម ដើម្បី​ឲ្យ Google អាច​គ្រប់គ្រង និង​បម្រុងទុក​សារ​នៃសារ​ជា​សំឡេង​របស់​អ្នក​បាន។</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_title">បើក​ទំហំ​ផ្ទុក​បន្ថែម រួច​បម្រុងទុក</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_message">ប្រអប់​សារ​របស់​អ្នក​ពេញហើយ។ ដើម្បី​បង្កើន​ទំហំ​ផ្ទុក​ទំនេរ សូម​បើក​ទំហំផ្ទុក​បន្ថែម ដើម្បី​ឲ្យ Google អាច​គ្រប់គ្រង និង​បម្រុងទុក​សារ​នៃសារ​ជា​សំឡេង​របស់​អ្នក​បាន។</string>
+  <string name="voicemail_error_pin_not_set_title">កំណត់កូដ PIN ​សារ​ជាសំឡេង​របស់​អ្នក</string>
+  <string name="voicemail_error_pin_not_set_message">អ្នក​នឹង​ត្រូវការកូដ PIN សារ​ជាសំឡេង ​គ្រប់​ពេល​ដែល​អ្នក​ហៅទូរសព្ទដើម្បីចូល​ដំណើរការ​សារ​ជា​សំឡេង​របស់​អ្នក។</string>
+  <string name="voicemail_action_turn_off_airplane_mode">ការ​កំណត់​​មុខងារ​​​ពេល​ជិះ​យន្តហោះ</string>
+  <string name="voicemail_action_set_pin">កំណត់​កូដ PIN</string>
+  <string name="voicemail_action_retry">ព្យាយាម​ម្តងទៀត</string>
+  <string name="voicemail_action_turn_archive_on">បើក</string>
+  <string name="voicemail_action_dimiss">ទេ អរគុណ</string>
+  <string name="voicemail_action_sync">ធ្វើ​សម​កាល​កម្ម</string>
+  <string name="voicemail_action_call_voicemail">ហៅ​ជា​សារ​សំឡេង</string>
+  <string name="voicemail_action_call_customer_support">ហៅ​ទូរសព្ទ​ទៅ​ផ្នែក​ជំនួយ​អតិថិជន</string>
+  <string name="vvm3_error_vms_dns_failure_title">មានអ្វីមួយមិនប្រក្រតី</string>
+  <string name="vvm3_error_vms_dns_failure_message">សូម​អភ័យទោស យើង​ជួបប្រទះ​បញ្ហា​ហើយ។ សូម​ព្យាយាម​ម្ដង​ទៀត​នៅពេលក្រោយ។ បើ​​នៅ​តែ​មាន​បញ្ហាទៀត សូម​ទាក់ទង​ផ្នែក​សេវា​​អតិថិជន​តាមរយៈ %1$s និង​ប្រាប់​ពួកគេ​​​ថា លេខកូដ​​មាន​បញ្ហាគឺ 9001។</string>
+  <string name="vvm3_error_vmg_dns_failure_title">មានអ្វីមួយមិនប្រក្រតី</string>
+  <string name="vvm3_error_vmg_dns_failure_message">សូម​អភ័យទោស យើង​ជួបប្រទះ​បញ្ហា​ហើយ។ សូម​ព្យាយាម​ម្ដង​ទៀត​នៅពេលក្រោយ។ បើ​​នៅ​តែ​មាន​បញ្ហាទៀត សូម​ទាក់ទង​ផ្នែក​សេវា​អតិថិជន​តាមរយៈ %1$s និង​ប្រាប់​ពួកគេ​​​ថា លេខកូដ​​មាន​បញ្ហា គឺ 9002។</string>
+  <string name="vvm3_error_spg_dns_failure_title">មានអ្វីមួយមិនប្រក្រតី</string>
+  <string name="vvm3_error_spg_dns_failure_message">សូម​អភ័យទោស យើង​ជួបប្រទះ​បញ្ហា​ហើយ។ សូម​ព្យាយាម​ម្ដង​ទៀត​នៅពេលក្រោយ។ បើ​​នៅ​តែ​មាន​បញ្ហាទៀត សូម​ទាក់ទង​ផ្នែក​សេវា​​អតិថិជន​តាមរយៈ %1$s និង​ប្រាប់​ពួកគេថា លេខ​​​កូដ​​មាន​បញ្ហាគឺ 9003។</string>
+  <string name="vvm3_error_vms_no_cellular_title">មិន​អាច​ភ្ជាប់​ទៅ​ប្រអប់​សារ​ជាសំឡេង​របស់​អ្នក​បាន​ទេ</string>
+  <string name="vvm3_error_vms_no_cellular_message">សូម​អភ័យទោស យើង​កំពុងមាន​បញ្ហាក្នុងការ​ភ្ជាប់​ទៅ​ប្រអប់​សារ​ជាសំឡេង​របស់​អ្នក។ បើ​អ្នក​ស្ថិត​នៅ​តំបន់​ដែល​មាន​សញ្ញា​អ៊ីនធឺណិតខ្សោយ សូម​រង់ចាំ​រហូតដល់​អ្នក​មាន​សេវាអ៊ីនធឺណិត​ខ្លាំង រួចព្យាយាម​ម្ដង​ទៀត។ បើ​​នៅ​តែ​មាន​បញ្ហា​ទៀត សូម​ទាក់ទង​ផ្នែក​សេវា​អតិថិជន​តាមរយៈ %1$s និង​ប្រាប់​ពួកគេ​ថា លេខកូដ​មាន​បញ្ហា គឺ 9004។</string>
+  <string name="vvm3_error_vmg_no_cellular_title">មិន​អាច​ភ្ជាប់​ទៅ​ប្រអប់​សារ​ជាសំឡេង​របស់​អ្នក​បាន​ទេ</string>
+  <string name="vvm3_error_vmg_no_cellular_message">សូម​អភ័យទោស យើង​កំពុងមាន​បញ្ហាក្នុងការ​ភ្ជាប់​ទៅ​ប្រអប់​សារ​ជាសំឡេង​របស់​អ្នក។ បើ​អ្នក​ស្ថិត​នៅ​តំបន់​ដែល​មាន​សញ្ញា​អ៊ីនធឺណិតខ្សោយ សូម​រង់ចាំ​រហូតដល់​អ្នក​មាន​សេវាអ៊ីនធឺណិត​ខ្លាំង រួចព្យាយាម​ម្ដង​ទៀត។ បើ​​នៅ​តែ​មាន​បញ្ហា​ទៀត សូម​ទាក់ទង​ផ្នែក​សេវា​អតិថិជន​តាមរយៈ %1$s និង​ប្រាប់​ពួកគេថា លេខ​កូដមាន​បញ្ហាគឺ 9005។</string>
+  <string name="vvm3_error_spg_no_cellular_title">មិន​អាច​ភ្ជាប់​ទៅ​ប្រអប់​សារ​ជាសំឡេង​របស់​អ្នក​បាន​ទេ</string>
+  <string name="vvm3_error_spg_no_cellular_message">សូម​អភ័យទោស យើង​កំពុងមាន​បញ្ហាក្នុងការ​ភ្ជាប់​ទៅ​ប្រអប់​សារ​ជាសំឡេង​របស់​អ្នក។ បើ​អ្នក​ស្ថិត​នៅ​តំបន់​ដែល​មាន​សញ្ញា​អ៊ីនធឺណិតខ្សោយ សូម​រង់ចាំ​រហូតដល់​អ្នក​មាន​សេវាអ៊ីនធឺណិត​ខ្លាំង រួចព្យាយាម​ម្ដង​ទៀត។ បើ​​នៅ​តែ​មាន​បញ្ហា​ទៀត សូម​ទាក់ទង​ផ្នែក​សេវា​អតិថិជន​តាមរយៈ %1$s និង​ប្រាប់​ពួកគេ​ថា លេខកូដមាន​បញ្ហាគឺ 9006។</string>
+  <string name="vvm3_error_vms_timeout_title">មានអ្វីមួយមិនប្រក្រតី</string>
+  <string name="vvm3_error_vms_timeout_message">សូម​អភ័យទោស យើង​ជួបប្រទះ​បញ្ហា​ហើយ។ សូម​ព្យាយាម​ម្ដង​ទៀត​នៅពេលក្រោយ។ បើ​​នៅ​តែ​មាន​បញ្ហាទៀត សូម​ទាក់ទង​ផ្នែក​​សេវា​​អតិថិជន​តាមរយៈ %1$s និង​ប្រាប់​ពួកគេ​​​ថា លេខកូដ​​មាន​បញ្ហាគឺ 9007។</string>
+  <string name="vvm3_error_vmg_timeout_title">មានអ្វីមួយមិនប្រក្រតី</string>
+  <string name="vvm3_error_vmg_timeout_message">សូម​អភ័យទោស យើង​ជួបប្រទះ​បញ្ហា​ហើយ។ សូម​ព្យាយាម​ម្ដង​ទៀត​នៅពេលក្រោយ។ បើ​​នៅ​តែ​មាន​បញ្ហាទៀត សូម​ទាក់ទង​ផ្នែក​សេវា​​អតិថិជន​តាមរយៈ %1$s និង​ប្រាប់​ពួកគេ​​​ថា លេខកូដ​​មាន​បញ្ហាគឺ 9008។</string>
+  <string name="vvm3_error_status_sms_timeout_title">មានអ្វីមួយមិនប្រក្រតី</string>
+  <string name="vvm3_error_status_sms_timeout_message">សូម​អភ័យទោស យើង​កំពុងមាន​បញ្ហា​ក្នុងការរៀបចំ​សេវាកម្ម​របស់​អ្នក។ សូម​ព្យាយាម​ម្ដង​ទៀតនៅ​ពេលក្រោយ។ បើ​​នៅ​តែ​មាន​បញ្ហាទៀត សូម​ទាក់ទង​ផ្នែក​សេវា​អតិថិជន​តាមរយៈ %1$s និង​ប្រាប់​ពួកគេ​​​ថា លេខកូដមាន​បញ្ហាគឺ 9009។</string>
+  <string name="vvm3_error_subscriber_blocked_title">មិន​អាច​ភ្ជាប់​ទៅ​ប្រអប់​សារ​ជាសំឡេង​របស់​អ្នក​បាន​ទេ</string>
+  <string name="vvm3_error_subscriber_blocked_message">សូម​អភ័យទោស យើង​មិនអាចភ្ជាប់​ទៅ​ប្រអប់​សារជា​សំឡេង​របស់​អ្នកនៅពេលនេះបានទេ។ សូម​ព្យាយាម​ម្ដង​ទៀតនៅ​ពេលក្រោយ។ បើ​​នៅ​តែ​មាន​បញ្ហាទៀត សូម​ទាក់ទង​ផ្នែកសេវា​​អតិថិជន​តាមរយៈ %1$s និង​ប្រាប់​ពួកគេថា លេខ​​​កូដមាន​បញ្ហាគឺ 9990។</string>
+  <string name="vvm3_error_unknown_user_title">រៀបចំ​សារ​ជា​សំឡេង</string>
+  <string name="vvm3_error_unknown_user_message">សារ​ជា​សំឡេង​មិន​បាន​រៀបចំ​នៅ​លើ​គណនី​របស់​អ្នក​ទេ។ សូម​ទាក់ទង​ផ្នែក​សេវា​អតិថិជន​តាមរយៈ %1$s និង​ប្រាប់​ពួកគេថា លេខ​កូដមាន​បញ្ហាគឺ 9991។</string>
+  <string name="vvm3_error_unknown_device_title">សារ​ជា​សំឡេង</string>
+  <string name="vvm3_error_unknown_device_message">សារ​ជា​សំឡេង​ដែល​មើល​ឃើញ​មិន​អាច​ប្រើ​នៅ​លើ​ឧបករណ៍​នេះ​បាន​ទេ។ សូម​ទាក់ទង​ផ្នែកសេវា​អតិថិជន​តាមរយៈ %1$s និង​ប្រាប់​ពួក​គេ​ថា លេខ​កូដមាន​បញ្ហា​គឺ 9992។</string>
+  <string name="vvm3_error_invalid_password_title">មានអ្វីមួយមិនប្រក្រតី</string>
+  <string name="vvm3_error_invalid_password_message">សូម​ទាក់ទង​ផ្នែក​សេវា​អតិថិជន​តាមរយៈ %1$s និង​ប្រាប់​ពួកគេ​ថា លេខកូដ​មាន​បញ្ហាគឺ 9993។</string>
+  <string name="vvm3_error_mailbox_not_initialized_title">សារ​ជា​សំឡេង​ដែល​មើល​ឃើញ</string>
+  <string name="vvm3_error_mailbox_not_initialized_message">ដើម្បី​បញ្ចប់​ការ​រៀបចំ​សារ​ជា​សំឡេង​ដែល​មើល​ឃើញ សូម​ទាក់ទង​ផ្នែក​សេវា​អតិថិជន​តាមរយៈ %1$s និង​ប្រាប់​ពួក​គេ​ថា លេខ​កូដមាន​បញ្ហា​គឺ 9994។</string>
+  <string name="vvm3_error_service_not_provisioned_title">សារ​ជា​សំឡេង​ដែល​មើល​ឃើញ</string>
+  <string name="vvm3_error_service_not_provisioned_message">ដើម្បី​បញ្ចប់​ការ​រៀបចំ​សារ​ជា​សំឡេង​ដែល​មើល​ឃើញ សូម​ទាក់ទង​ផ្នែក​សេវា​អតិថិជន​តាមរយៈ %1$s និង​ប្រាប់​ពួកគេ​​ថា លេខ​កូដ​មាន​បញ្ហា​គឺ 9995។</string>
+  <string name="vvm3_error_service_not_activated_title">សារ​ជា​សំឡេង​ដែល​មើល​ឃើញ</string>
+  <string name="vvm3_error_service_not_activated_message">ដើម្បី​បើក​ដំណើរការ​សារ​ជា​សំឡេង​ដែល​មើល​ឃើញ សូម​ទាក់ទង​ផ្នែក​សេវា​អតិថិជន​តាមរយៈ %1$s និង​ប្រាប់​ពួកគេ​ថា លេខ​កូដ​មាន​បញ្ហា​គឺ 9996។</string>
+  <string name="vvm3_error_user_blocked_title">មានអ្វីមួយមិនប្រក្រតី</string>
+  <string name="vvm3_error_user_blocked_message">ដើម្បី​បញ្ចប់​ការ​រៀបចំ​សារ​ជា​សំឡេង​ដែល​មើល​ឃើញ សូម​ទាក់ទង​ផ្នែក​សេវា​អតិថិជន​តាមរយៈ %1$s និង​ប្រាប់​ពួក​គេ​ថា លេខ​កូដ​មាន​បញ្ហា​គឺ 9998។</string>
+  <string name="vvm3_error_subscriber_unknown_title">សារ​ជា​សំឡេង​ដែល​មើល​ឃើញ​ត្រូវ​បាន​បិទ</string>
+  <string name="vvm3_error_subscriber_unknown_message">សូម​ទាក់ទង​ផ្នែកសេវា​អតិថិជន​តាមរយៈ %1$s ដើម្បីបើកដំណើរការសារ​ជា​សំឡេង​ដែល​មើល​ឃើញ។</string>
+  <string name="vvm3_error_imap_getquota_error_title">មានអ្វីមួយមិនប្រក្រតី</string>
+  <string name="vvm3_error_imap_getquota_error_message">សូម​ទាក់ទង​ផ្នែកសេវា​អតិថិជន​តាមរយៈ %1$s និង​ប្រាប់​ពួកគេថា ​លេខកូដ​មាន​បញ្ហា គឺ 9997។</string>
+  <string name="vvm3_error_imap_select_error_title">មានអ្វីមួយមិនប្រក្រតី</string>
+  <string name="vvm3_error_imap_select_error_message">សូម​ទាក់ទង​ផ្នែកសេវា​អតិថិជន​តាមរយៈ %1$s និង​ប្រាប់​ពួកគេ​ថា លេខកូដ​មាន​បញ្ហា គឺ 9989។</string>
+  <string name="vvm3_error_imap_error_title">មានអ្វីមួយមិនប្រក្រតី</string>
+  <string name="vvm3_error_imap_error_message">សូម​ទាក់ទង​ផ្នែក​សេវា​អតិថិជន​តាមរយៈ %1$s និង​ប្រាប់​ពួកគេ​ថា លេខកូដ​មាន​បញ្ហា គឺ 9999។</string>
+  <string name="verizon_terms_and_conditions_title">បើក​សារ​ជា​សំឡេង​ដែល​មើល​ឃើញ</string>
+  <string name="verizon_terms_and_conditions_message">%1$s បើ​អ្នក​បើក​សារ​ជា​សំឡេង​ដែល​មើល​ឃើញ នោះ​អ្នក​យល់ព្រម​តាមខចែង និង​លក្ខខណ្ឌ Verizon Wireless ៖\n\n%2$s</string>
+  <string name="dialer_terms_and_conditions_title">បើក​សារ​ជា​សំឡេង​ដែល​មើល​ឃើញ</string>
+  <string name="dialer_terms_and_conditions_existing_user_title">ថ្មី! អាន​សារ​ជា​​សំឡេង​របស់​អ្នក</string>
+  <string name="dialer_terms_and_conditions_message">%s</string>
+  <string name="dialer_terms_and_conditions_1.0">មើល និង​ស្ដាប់​សារ​របស់​អ្នក ដោយ​មិន​ចាំបាច់​ហៅ​សារ​ជា​សំឡេង។ ប្រតិចារឹក​នៃ​សារ​ជា​សំឡេង​របស់​អ្នក​ត្រូវ​បាន​ផ្ដល់​ដោយ​សេវាកម្ម​ប្រតិចារឹក​ឥត​គិត​ថ្លៃ​របស់ Google​ ។ អ្នក​អាច​បិទ​មុខងារ​នេះ​នៅ​ក្នុង​ការកំណត់​ពេលណា​ក៏បាន។  %s</string>
+  <string name="dialer_terms_and_conditions_existing_user">ឥឡូវនេះ ​ប្រតិចារឹក​នៃ​សារ​ជា​សំឡេង​របស់​អ្នក ត្រូវបាន​ផ្ដល់​ដោយ​សេវាកម្ម​ប្រតិចារឹក​ឥត​គិតថ្លៃ​របស់ Google ។ អ្នក​អាច​បិទ​មុខងារ​នេះ​​នៅ​ក្នុង​ការកំណត់​ពេល​ណា​ក៏​បាន។ %s</string>
+  <string name="dialer_terms_and_conditions_for_verizon_1.0">មើល និង​ស្ដាប់​សារ​របស់​អ្នក ដោយ​មិន​ចាំបាច់​ហៅ​សារ​ជា​សំឡេង។</string>
+  <string name="dialer_terms_and_conditions_learn_more">ស្វែង​យល់​បន្ថែម</string>
+  <string name="dialer_terms_and_conditions_existing_user_ack">យល់ហើយ</string>
+  <string name="dialer_terms_and_conditions_existing_user_decline">ទេ អរគុណ</string>
+  <string name="terms_and_conditions_decline_dialog_title">បិទសារជាសំឡេងដែលមើលឃើញ?</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_message">សារ​ជា​សំឡេង​ដែល​​មើល​ឃើញ​នឹង​ត្រូវ​បាន​បិទ បើ​លក្ខខណ្ឌ​ប្រើប្រាស់​ត្រូវ​បាន​បដិសេធ។</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_downgrade">បិទ</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_message">សារ​ជា​សំឡេង​ដែល​មើល​ឃើញ​នឹង​ត្រូវបាន​បិទ ប្រសិនបើ​អ្នក​បិទ​សារ​ជា​សំឡេង​ដែល​មើ​លឃើញ។</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_downgrade">បិទ</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message">សារ​ជា​សំឡេង​នឹង​អាច​ចូល​ស្ដាប់​បាន​​ដោយ​ហៅ​ទៅ *86 ប៉ុណ្ណោះ។ កំណត់​កូដ PIN នៃ​សារ​ជា​សំឡេង​ថ្មី ដើម្បី​ចាប់ផ្តើមដំណើរការ។</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin">កំណត់​កូដ PIN</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/error/res/values-kn/strings.xml b/java/com/android/dialer/voicemail/listui/error/res/values-kn/strings.xml
new file mode 100644
index 0000000..c4d8ab5
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/error/res/values-kn/strings.xml
@@ -0,0 +1,102 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_error_activating_title">ದೃಶ್ಯ ಧ್ವನಿಮೇಲ್ ಸಕ್ರಿಯಗೊಳಿಸಲಾಗುತ್ತಿದೆ</string>
+  <string name="voicemail_error_activating_message">ದೃಶ್ಯ ಧ್ವನಿಮೇಲ್ ಅನ್ನು ಪೂರ್ಣವಾಗಿ ಸಕ್ರಿಯಗೊಳಿಸುವವರೆಗೆ ನಿಮಗೆ ಧ್ವನಿಮೇಲ್‌ ಅಧಿಸೂಚನೆಗಳನ್ನು ಸ್ವೀಕರಿಸಲು ಸಾಧ್ಯವಾಗದೇ ಇರಬಹುದು. ಧ್ವನಿಮೇಲ್‌ ಪೂರ್ಣವಾಗಿ ಸಕ್ರಿಯವಾಗುವವರೆಗೆ, ಹೊಸ ಸಂದೇಶಗಳನ್ನು ಪಡೆದುಕೊಳ್ಳಲು, ಧ್ವನಿಮೇಲ್‌ಗೆ ಕರೆಮಾಡಿ.</string>
+  <string name="voicemail_error_not_activate_no_signal_title">ದೃಶ್ಯ ಧ್ವನಿಮೇಲ್ ಅನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ</string>
+  <string name="voicemail_error_not_activate_no_signal_message">ನಿಮ್ಮ ಫೋನ್‌ ಮೊಬೈಲ್ ನೆಟ್‌ವರ್ಕ್ ಹೊಂದಿದೆಯೇ ಎಂದು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ ಹಾಗೂ ಪುನಃ ಪ್ರಯತ್ನಿಸಿ.</string>
+  <string name="voicemail_error_not_activate_no_signal_airplane_mode_message">ಏರ್‌ಪ್ಲೇನ್ ಮೋಡ್ ಆಫ್ ಮಾಡಿ ಹಾಗೂ ಪುನಃ ಪ್ರಯತ್ನಿಸಿ.</string>
+  <string name="voicemail_error_no_signal_title">ಸಂಪರ್ಕವಿಲ್ಲ</string>
+  <string name="voicemail_error_no_signal_message">ಹೊಸ ಧ್ವನಿಮೇಲ್‌ಗಳ ಕುರಿತು ನಿಮಗೆ ಸೂಚನೆ ನೀಡಲಾಗುವುದಿಲ್ಲ. ನೀವು ವೈ-ಫೈ ನಲ್ಲಿದ್ದರೆ, ನೀವು ಈಗಲೇ ಸಿಂಕ್ ಮಾಡುವ ಮೂಲಕ ಧ್ವನಿಮೇಲ್‌ ಪರಿಶೀಲಿಸಬಹುದು.</string>
+  <string name="voicemail_error_no_signal_airplane_mode_message">ಹೊಸ ಧ್ವನಿಮೇಲ್‌ಗಳ ಕುರಿತು ನಿಮಗೆ ಸೂಚನೆ ನೀಡಲಾಗುವುದಿಲ್ಲ. ನಿಮ್ಮ ಧ್ವನಿಮೇಲ್‌ ಸಿಂಕ್ ಮಾಡಲು ಏರ್‌ಪ್ಲೇನ್ ಮೋಡ್ ಅನ್ನು ಆಫ್ ಮಾಡಿ.</string>
+  <string name="voicemail_error_no_signal_cellular_required_message">ಧ್ವನಿಮೇಲ್‌ ಅನ್ನು ಪರಿಶೀಲಿಸಲು ನಿಮ್ಮ ಫೋನ್‌‌ಗೆ ಮೊಬೈಲ್ ಡೇಟಾ ಸಂಪರ್ಕದ ಅಗತ್ಯವಿದೆ.</string>
+  <string name="voicemail_error_activation_failed_title">ದೃಶ್ಯ ಧ್ವನಿಮೇಲ್ ಅನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ</string>
+  <string name="voicemail_error_activation_failed_message">ನೀವು ಧ್ವನಿಮೇಲ್‌ ಪರಿಶೀಲಿಸುವುದಕ್ಕಾಗಿ ಈಗಲೂ ಕರೆ ಮಾಡಬಹುದು.</string>
+  <string name="voicemail_error_no_data_title">ದೃಶ್ಯ ಧ್ವನಿಮೇಲ್ ಅನ್ನು ಅಪ್‌ಡೇಟ್‌ ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ</string>
+  <string name="voicemail_error_no_data_message">ನಿಮ್ಮ ವೈ-ಫೈ ಅಥವಾ ಮೊಬೈಲ್ ಡೇಟಾ ಸಂಪರ್ಕವು ಉತ್ತಮವಾಗಿದ್ದಾಗ ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ. ನೀವು ಧ್ವನಿಮೇಲ್‌ ಪರಿಶೀಲಿಸುವುದಕ್ಕಾಗಿ ಈಗಲೂ ಕರೆ ಮಾಡಬಹುದು.</string>
+  <string name="voicemail_error_no_data_cellular_required_message">ನಿಮ್ಮ ಮೊಬೈಲ್ ಡೇಟಾ ಸಂಪರ್ಕವು ಉತ್ತಮವಾಗಿದ್ದಾಗ ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ. ನೀವು ಧ್ವನಿಮೇಲ್‌ ಪರಿಶೀಲಿಸುವುದಕ್ಕಾಗಿ ಈಗಲೂ ಕರೆ ಮಾಡಬಹುದು.</string>
+  <string name="voicemail_error_bad_config_title">ದೃಶ್ಯ ಧ್ವನಿಮೇಲ್ ಅನ್ನು ಅಪ್‌ಡೇಟ್‌ ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ</string>
+  <string name="voicemail_error_bad_config_message">ನೀವು ಧ್ವನಿಮೇಲ್‌ ಪರಿಶೀಲಿಸುವುದಕ್ಕಾಗಿ ಈಗಲೂ ಕರೆ ಮಾಡಬಹುದು.</string>
+  <string name="voicemail_error_communication_title">ದೃಶ್ಯ ಧ್ವನಿಮೇಲ್ ಅನ್ನು ಅಪ್‌ಡೇಟ್‌ ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ</string>
+  <string name="voicemail_error_communication_message">ನೀವು ಧ್ವನಿಮೇಲ್‌ ಪರಿಶೀಲಿಸುವುದಕ್ಕಾಗಿ ಈಗಲೂ ಕರೆ ಮಾಡಬಹುದು.</string>
+  <string name="voicemail_error_server_connection_title">ದೃಶ್ಯ ಧ್ವನಿಮೇಲ್ ಅನ್ನು ಅಪ್‌ಡೇಟ್‌ ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ</string>
+  <string name="voicemail_error_server_connection_message">ನೀವು ಧ್ವನಿಮೇಲ್‌ ಪರಿಶೀಲಿಸುವುದಕ್ಕಾಗಿ ಈಗಲೂ ಕರೆ ಮಾಡಬಹುದು.</string>
+  <string name="voicemail_error_server_title">ದೃಶ್ಯ ಧ್ವನಿಮೇಲ್ ಅನ್ನು ಅಪ್‌ಡೇಟ್‌ ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ</string>
+  <string name="voicemail_error_server_message">ನೀವು ಧ್ವನಿಮೇಲ್‌ ಪರಿಶೀಲಿಸುವುದಕ್ಕಾಗಿ ಈಗಲೂ ಕರೆ ಮಾಡಬಹುದು.</string>
+  <string name="voicemail_error_inbox_near_full_title">ಇನ್‌ಬಾಕ್ಸ್‌ ಬಹುತೇಕ ತುಂಬಿದೆ</string>
+  <string name="voicemail_error_inbox_near_full_message">ನಿಮ್ಮ ಇನ್‌ಬಾಕ್ಸ್ ತುಂಬಿದಾಗ ಹೊಸ ಧ್ವನಿಮೇಲ್‌ ಅನ್ನು ಸ್ವೀಕರಿಸಲು ನಿಮಗೆ ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ.</string>
+  <string name="voicemail_error_inbox_full_title">ಹೊಸ ಧ್ವನಿಮೇಲ್‌‌ಗಳನ್ನು ಸ್ವೀಕರಿಸಲಾಗುವುದಿಲ್ಲ</string>
+  <string name="voicemail_error_inbox_full_message">ನಿಮ್ಮ ಇನ್‌ಬಾಕ್ಸ್‌ ತುಂಬಿದೆ. ಹೊಸ ಧ್ವನಿಮೇಲ್‌ ಸ್ವೀಕರಿಸಲು ಕೆಲವು ಸಂದೇಶಗಳನ್ನು ಅಳಿಸಿ ನೋಡಿ.</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_title">ಹೆಚ್ಚುವರಿ ಸಂಗ್ರಹಣೆ ಮತ್ತು ಬ್ಯಾಕಪ್ ಅನ್ನು ಆನ್ ಮಾಡಿ</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_message">ನಿಮ್ಮ ಮೇಲ್‌ಬಾಕ್ಸ್ ತುಂಬಿದೆ. ಸ್ಥಳಾವಕಾಶವನ್ನು ತೆರವುಗೊಳಿಸಲು, ಹೆಚ್ಚುವರಿ ಸಂಗ್ರಹವನ್ನು ಆನ್ ಮಾಡಿ. ಇದರ ಮೂಲಕ Google ನಿಮ್ಮ ಧ್ವನಿಮೇಲ್ ಸಂದೇಶಗಳನ್ನು ನಿರ್ವಹಿಸಬಹುದು ಮತ್ತು ಬ್ಯಾಕಪ್ ಮಾಡಬಹುದು.</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_title">ಹೆಚ್ಚುವರಿ ಸಂಗ್ರಹಣೆ ಮತ್ತು ಬ್ಯಾಕಪ್ ಅನ್ನು ಆನ್ ಮಾಡಿ</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_message">ನಿಮ್ಮ ಮೇಲ್‌ಬಾಕ್ಸ್ ಬಹುತೇಕ ತುಂಬಿದೆ. ಸ್ಥಳಾವಕಾಶವನ್ನು ತೆರವುಗೊಳಿಸಲು, ಹೆಚ್ಚುವರಿ ಸಂಗ್ರಹವನ್ನು ಆನ್ ಮಾಡಿ. ಇದರ ಮೂಲಕ Google ನಿಮ್ಮ ಧ್ವನಿಮೇಲ್ ಸಂದೇಶಗಳನ್ನು ನಿರ್ವಹಿಸಬಹುದು ಮತ್ತು ಬ್ಯಾಕಪ್ ಮಾಡಬಹುದು.</string>
+  <string name="voicemail_error_pin_not_set_title">ನಿಮ್ಮ ಧ್ವನಿಮೇಲ್ ಪಿನ್ ಹೊಂದಿಸಿ</string>
+  <string name="voicemail_error_pin_not_set_message">ನಿಮ್ಮ ಧ್ವನಿಮೇಲ್‌ಗೆ ಪ್ರವೇಶಿಸುವುದಕ್ಕಾಗಿ ನೀವು ಕರೆ ಮಾಡುವಾಗ ನಿಮಗೆ ಧ್ವನಿಮೇಲ್‌ ಪಿನ್ ಅಗತ್ಯವಿರುತ್ತದೆ.</string>
+  <string name="voicemail_action_turn_off_airplane_mode">ಏರ್‌ಪ್ಲೇನ್ ಮೋಡ್ ಸೆಟ್ಟಿಂಗ್‌ಗಳು</string>
+  <string name="voicemail_action_set_pin">ಪಿನ್ ಹೊಂದಿಸಿ</string>
+  <string name="voicemail_action_retry">ಪುನಃ ಪ್ರಯತ್ನಿಸಿ</string>
+  <string name="voicemail_action_turn_archive_on">ಆನ್</string>
+  <string name="voicemail_action_dimiss">ಬೇಡ</string>
+  <string name="voicemail_action_sync">ಸಿಂಕ್</string>
+  <string name="voicemail_action_call_voicemail">ಧ್ವನಿಮೇಲ್‌‌ಗೆ ಕರೆ ಮಾಡಿ</string>
+  <string name="voicemail_action_call_customer_support">ಗ್ರಾಹಕ ಬೆಂಬಲಕ್ಕೆ ಕರೆ ಮಾಡಿ</string>
+  <string name="vvm3_error_vms_dns_failure_title">ಏನೋ ಸಮಸ್ಯೆಯಾಗಿದೆ</string>
+  <string name="vvm3_error_vms_dns_failure_message">ಕ್ಷಮಿಸಿ, ನಮಗೆ ಸಮಸ್ಯೆ ಎದುರಾಗಿದೆ. ನಂತರ ಪುನಃ ಪ್ರಯತ್ನಿಸಿ. ಸಮಸ್ಯೆ ಇನ್ನೂ ಮುಂದುವರಿದರೆ, %1$s ರಲ್ಲಿ ಗ್ರಾಹಕ ಸೇವೆಯನ್ನು ಸಂಪರ್ಕಿಸಿ ಮತ್ತು ದೋಷ ಕೋಡ್‌ 9001 ಎಂದು ಅವರಿಗೆ ತಿಳಿಸಿ.</string>
+  <string name="vvm3_error_vmg_dns_failure_title">ಏನೋ ಸಮಸ್ಯೆಯಾಗಿದೆ</string>
+  <string name="vvm3_error_vmg_dns_failure_message">ಕ್ಷಮಿಸಿ, ನಮಗೆ ಸಮಸ್ಯೆ ಎದುರಾಗಿದೆ. ನಂತರ ಪುನಃ ಪ್ರಯತ್ನಿಸಿ. ಸಮಸ್ಯೆ ಇನ್ನೂ ಮುಂದುವರಿದರೆ, %1$s ರಲ್ಲಿ ಗ್ರಾಹಕ ಸೇವೆಯನ್ನು ಸಂಪರ್ಕಿಸಿ ಮತ್ತು ದೋಷ ಕೋಡ್‌ 9002 ಎಂದು ಅವರಿಗೆ ತಿಳಿಸಿ.</string>
+  <string name="vvm3_error_spg_dns_failure_title">ಏನೋ ಸಮಸ್ಯೆಯಾಗಿದೆ</string>
+  <string name="vvm3_error_spg_dns_failure_message">ಕ್ಷಮಿಸಿ, ನಮಗೆ ಸಮಸ್ಯೆ ಎದುರಾಗಿದೆ. ನಂತರ ಪುನಃ ಪ್ರಯತ್ನಿಸಿ. ಸಮಸ್ಯೆ ಇನ್ನೂ ಮುಂದುವರಿದರೆ, %1$s ರಲ್ಲಿ ಗ್ರಾಹಕ ಸೇವೆಯನ್ನು ಸಂಪರ್ಕಿಸಿ ಮತ್ತು ದೋಷ ಕೋಡ್‌ 9003 ಎಂದು ಅವರಿಗೆ ತಿಳಿಸಿ.</string>
+  <string name="vvm3_error_vms_no_cellular_title">ನಿಮ್ಮ ಧ್ವನಿ ಮೇಲ್‌ಬಾಕ್ಸ್‌ಗೆ ಸಂಪರ್ಕಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ</string>
+  <string name="vvm3_error_vms_no_cellular_message">ಕ್ಷಮಿಸಿ, ನಿಮ್ಮ ಧ್ವನಿ ಮೇಲ್‌ಬಾಕ್ಸ್‌ಗೆ ಸಂಪರ್ಕಿಸುವಲ್ಲಿ ಸಮಸ್ಯೆ ಕಂಡುಬಂದಿದೆ. ನೀವು ಕಳಪೆ ಸಿಗ್ನಲ್‌ ಸಾಮರ್ಥ್ಯವಿರುವ ಪ್ರದೇಶದಲ್ಲಿದ್ದರೆ ಉತ್ತಮ ಸಿಗ್ನಲ್‌ ಪಡೆದುಕೊಳ್ಳುವವರೆಗೂ ಕಾದು, ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ. ಸಮಸ್ಯೆ ಇನ್ನೂ ಮುಂದುವರಿದರೆ, %1$s ರಲ್ಲಿ ಗ್ರಾಹಕ ಸೇವೆಯನ್ನು ಸಂಪರ್ಕಿಸಿ ಮತ್ತು ದೋಷ ಕೋಡ್‌ 9004 ಎಂದು ಅವರಿಗೆ ತಿಳಿಸಿ.</string>
+  <string name="vvm3_error_vmg_no_cellular_title">ನಿಮ್ಮ ಧ್ವನಿ ಮೇಲ್‌ಬಾಕ್ಸ್‌ಗೆ ಸಂಪರ್ಕಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ</string>
+  <string name="vvm3_error_vmg_no_cellular_message">ಕ್ಷಮಿಸಿ, ನಿಮ್ಮ ಧ್ವನಿ ಮೇಲ್‌ಬಾಕ್ಸ್‌ಗೆ ಸಂಪರ್ಕಿಸುವಲ್ಲಿ ನಮಗೆ ಸಮಸ್ಯೆ ಕಂಡುಬಂದಿದೆ. ನೀವು ಕಳಪೆ ಸಿಗ್ನಲ್‌ ಸಾಮರ್ಥ್ಯವಿರುವ ಪ್ರದೇಶದಲ್ಲಿದ್ದರೆ ಉತ್ತಮ ಸಿಗ್ನಲ್‌ ಹೊಂದುವವರೆಗೂ ಕಾದು, ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ. ಸಮಸ್ಯೆ ಇನ್ನೂ ಮುಂದುವರಿದರೆ, %1$s ರಲ್ಲಿ ಗ್ರಾಹಕ ಸೇವೆಯನ್ನು ಸಂಪರ್ಕಿಸಿ ಮತ್ತು ದೋಷ ಕೋಡ್‌ 9005 ಎಂದು ಅವರಿಗೆ ತಿಳಿಸಿ.</string>
+  <string name="vvm3_error_spg_no_cellular_title">ನಿಮ್ಮ ಧ್ವನಿ ಮೇಲ್‌ಬಾಕ್ಸ್‌ಗೆ ಸಂಪರ್ಕಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ</string>
+  <string name="vvm3_error_spg_no_cellular_message">ಕ್ಷಮಿಸಿ, ನಿಮ್ಮ ಧ್ವನಿ ಮೇಲ್‌ಬಾಕ್ಸ್‌ಗೆ ಸಂಪರ್ಕಿಸುವಲ್ಲಿ ನಮಗೆ ಸಮಸ್ಯೆ ಕಂಡುಬಂದಿದೆ. ನೀವು ಕಳಪೆ ಸಿಗ್ನಲ್‌ ಸಾಮರ್ಥ್ಯವಿರುವ ಪ್ರದೇಶದಲ್ಲಿದ್ದರೆ ಉತ್ತಮ ಸಿಗ್ನಲ್‌ ಹೊಂದುವವರೆಗೂ ಕಾದು, ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ. ಸಮಸ್ಯೆ ಇನ್ನೂ ಮುಂದುವರಿದರೆ, %1$s ರಲ್ಲಿ ಗ್ರಾಹಕ ಸೇವೆ ಸಂಖ್ಯೆಯನ್ನು ಸಂಪರ್ಕಿಸಿ ಮತ್ತು ದೋಷ ಕೋಡ್‌ 9006 ಎಂದು ಅವರಿಗೆ ತಿಳಿಸಿ.</string>
+  <string name="vvm3_error_vms_timeout_title">ಏನೋ ಸಮಸ್ಯೆಯಾಗಿದೆ</string>
+  <string name="vvm3_error_vms_timeout_message">ಕ್ಷಮಿಸಿ, ನಮಗೆ ಸಮಸ್ಯೆ ಎದುರಾಗಿದೆ. ನಂತರ ಪುನಃ ಪ್ರಯತ್ನಿಸಿ. ಈ ಸಮಸ್ಯೆ ಮುಂದುವರಿದರೆ, %1$s ರಲ್ಲಿ ಗ್ರಾಹಕ ಸೇವೆಯನ್ನು ಸಂಪರ್ಕಿಸಿ ಮತ್ತು ದೋಷ ಕೋಡ್‌ 9007 ಎಂದು ಅವರಿಗೆ ತಿಳಿಸಿ.</string>
+  <string name="vvm3_error_vmg_timeout_title">ಏನೋ ಸಮಸ್ಯೆಯಾಗಿದೆ</string>
+  <string name="vvm3_error_vmg_timeout_message">ಕ್ಷಮಿಸಿ, ನಮಗೆ ಸಮಸ್ಯೆ ಎದುರಾಗಿದೆ. ನಂತರ ಪುನಃ ಪ್ರಯತ್ನಿಸಿ. ಈ ಸಮಸ್ಯೆ ಮುಂದುವರಿದರೆ, %1$s ರಲ್ಲಿ ಗ್ರಾಹಕ ಸೇವೆಯನ್ನು ಸಂಪರ್ಕಿಸಿ ಮತ್ತು ದೋಷ ಕೋಡ್‌ 9008 ಎಂದು ಅವರಿಗೆ ತಿಳಿಸಿ.</string>
+  <string name="vvm3_error_status_sms_timeout_title">ಏನೋ ಸಮಸ್ಯೆಯಾಗಿದೆ</string>
+  <string name="vvm3_error_status_sms_timeout_message">ಕ್ಷಮಿಸಿ, ನಿಮ್ಮ ಸೇವೆಯನ್ನು ಹೊಂದಿಸುವಲ್ಲಿ ನಮಗೆ ಸಮಸ್ಯೆ ಕಂಡುಬಂದಿದೆ. ನಂತರ ಪುನಃ ಪ್ರಯತ್ನಿಸಿ. ಸಮಸ್ಯೆ ಇನ್ನೂ ಮುಂದುವರಿದರೆ, %1$s ರಲ್ಲಿ ಗ್ರಾಹಕ ಸೇವೆಯನ್ನು ಸಂಪರ್ಕಿಸಿ ಮತ್ತು ದೋಷ ಕೋಡ್‌ 9009 ಎಂದು ಅವರಿಗೆ ತಿಳಿಸಿ.</string>
+  <string name="vvm3_error_subscriber_blocked_title">ನಿಮ್ಮ ಧ್ವನಿ ಮೇಲ್‌ಬಾಕ್ಸ್‌ಗೆ ಸಂಪರ್ಕಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ</string>
+  <string name="vvm3_error_subscriber_blocked_message">ಕ್ಷಮಿಸಿ, ಈ ಸಮಯದಲ್ಲಿ ನಿಮ್ಮ ಧ್ವನಿ ಮೇಲ್‌ಬಾಕ್ಸ್‌ಗೆ ಸಂಪರ್ಕಿಸಲು ನಮಗೆ ಸಾಧ್ಯವಿಲ್ಲ. ನಂತರ ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ. ಸಮಸ್ಯೆ ಇನ್ನೂ ಮುಂದುವರಿದರೆ, %1$s ರಲ್ಲಿ ಗ್ರಾಹಕ ಸೇವೆಯನ್ನು ಸಂಪರ್ಕಿಸಿ ಮತ್ತು ದೋಷ ಕೋಡ್‌ 9990 ಎಂದು ಅವರಿಗೆ ತಿಳಿಸಿ.</string>
+  <string name="vvm3_error_unknown_user_title">ಧ್ವನಿಮೇಲ್ ಹೊಂದಿಸಿ</string>
+  <string name="vvm3_error_unknown_user_message">ನಿಮ್ಮ ಖಾತೆಯಲ್ಲಿ ಧ್ವನಿಮೇಲ್ ಅನ್ನು ಹೊಂದಿಸಿಲ್ಲ. %1$s ರಲ್ಲಿ ಗ್ರಾಹಕ ಸೇವೆಯನ್ನು ಸಂಪರ್ಕಿಸಿ ಮತ್ತು ದೋಷ ಕೋಡ್‌ 9991 ಎಂದು ಅವರಿಗೆ ತಿಳಿಸಿ.</string>
+  <string name="vvm3_error_unknown_device_title">ಧ್ವನಿಮೇಲ್</string>
+  <string name="vvm3_error_unknown_device_message">ಈ ಸಾಧನದಲ್ಲಿ ದೃಶ್ಯ ಧ್ವನಿಮೇಲ್ ಅನ್ನು ಬಳಸಲಾಗುವುದಿಲ್ಲ. %1$s ರಲ್ಲಿ ಗ್ರಾಹಕ ಸೇವೆಯನ್ನು ಸಂಪರ್ಕಿಸಿ ಮತ್ತು ದೋಷ ಕೋಡ್‌ 9992 ಅವರಿಗೆ ತಿಳಿಸಿ.</string>
+  <string name="vvm3_error_invalid_password_title">ಏನೋ ಸಮಸ್ಯೆಯಾಗಿದೆ</string>
+  <string name="vvm3_error_invalid_password_message">%1$s ರಲ್ಲಿ ಗ್ರಾಹಕ ಸೇವೆಯನ್ನು ಸಂಪರ್ಕಿಸಿ ಮತ್ತು ದೋಷ ಕೋಡ್‌ 9993 ಎಂದು ಅವರಿಗೆ ತಿಳಿಸಿ.</string>
+  <string name="vvm3_error_mailbox_not_initialized_title">ದೃಶ್ಯ ಧ್ವನಿಮೇಲ್</string>
+  <string name="vvm3_error_mailbox_not_initialized_message">ದೃಶ್ಯ ಧ್ವನಿಮೇಲ್ ಹೊಂದಿಸುವಿಕೆಯನ್ನು ಪೂರ್ಣಗೊಳಿಸಲು, %1$s ರಲ್ಲಿ ಗ್ರಾಹಕ ಸೇವೆಯನ್ನು ಸಂಪರ್ಕಿಸಿ ಮತ್ತು ದೋಷ ಕೋಡ್‌ 9994 ಎಂದು ಅವರಿಗೆ ತಿಳಿಸಿ.</string>
+  <string name="vvm3_error_service_not_provisioned_title">ದೃಶ್ಯ ಧ್ವನಿಮೇಲ್</string>
+  <string name="vvm3_error_service_not_provisioned_message">ದೃಶ್ಯ ಧ್ವನಿಮೇಲ್ ಹೊಂದಿಸುವಿಕೆಯನ್ನು ಪೂರ್ಣಗೊಳಿಸಲು, %1$s ರಲ್ಲಿ ಗ್ರಾಹಕ ಸೇವೆಯನ್ನು ಸಂಪರ್ಕಿಸಿ ಮತ್ತು ದೋಷ ಕೋಡ್‌ 9995 ಎಂದು ಅವರಿಗೆ ತಿಳಿಸಿ.</string>
+  <string name="vvm3_error_service_not_activated_title">ದೃಶ್ಯ ಧ್ವನಿಮೇಲ್</string>
+  <string name="vvm3_error_service_not_activated_message">ದೃಶ್ಯ ಧ್ವನಿಮೇಲ್ ಅನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಲು, %1$s ರಲ್ಲಿ ಗ್ರಾಹಕ ಸೇವೆಯನ್ನು ಸಂಪರ್ಕಿಸಿ ಮತ್ತು ದೋಷ ಕೋಡ್‌ 9996 ಎಂದು ಅವರಿಗೆ ತಿಳಿಸಿ.</string>
+  <string name="vvm3_error_user_blocked_title">ಏನೋ ಸಮಸ್ಯೆಯಾಗಿದೆ</string>
+  <string name="vvm3_error_user_blocked_message">ದೃಶ್ಯ ಧ್ವನಿಮೇಲ್ ಹೊಂದಿಸುವಿಕೆಯನ್ನು ಪೂರ್ತಿಗೊಳಿಸಲು, %1$s ರಲ್ಲಿ ಗ್ರಾಹಕ ಸೇವೆಯನ್ನು ಸಂಪರ್ಕಿಸಿ ಮತ್ತು ದೋಷ ಕೋಡ್‌ 9998 ಎಂದು ಅವರಿಗೆ ತಿಳಿಸಿ.</string>
+  <string name="vvm3_error_subscriber_unknown_title">ದೃಶ್ಯ ಧ್ವನಿಮೇಲ್ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ</string>
+  <string name="vvm3_error_subscriber_unknown_message">ದೃಶ್ಯ ಧ್ವನಿಮೇಲ್ ಸಕ್ರಿಯಗೊಳಿಸಲು %1$s ರಲ್ಲಿ ಗ್ರಾಹಕ ಸೇವೆಯನ್ನು ಸಂಪರ್ಕಿಸಿ.</string>
+  <string name="vvm3_error_imap_getquota_error_title">ಏನೋ ಸಮಸ್ಯೆಯಾಗಿದೆ</string>
+  <string name="vvm3_error_imap_getquota_error_message">%1$s ರಲ್ಲಿ ಗ್ರಾಹಕ ಸೇವೆ ಸಂಖ್ಯೆಯನ್ನು ಸಂಪರ್ಕಿಸಿ ಮತ್ತು ದೋಷ ಕೋಡ್‌ 9997 ಎಂದು ಅವರಿಗೆ ತಿಳಿಸಿ.</string>
+  <string name="vvm3_error_imap_select_error_title">ಏನೋ ಸಮಸ್ಯೆಯಾಗಿದೆ</string>
+  <string name="vvm3_error_imap_select_error_message">%1$s ರಲ್ಲಿ ಗ್ರಾಹಕ ಸೇವೆಯನ್ನು ಸಂಪರ್ಕಿಸಿ ಮತ್ತು ದೋಷ ಕೋಡ್‌ 9989 ಎಂದು ಅವರಿಗೆ ತಿಳಿಸಿ.</string>
+  <string name="vvm3_error_imap_error_title">ಏನೋ ಸಮಸ್ಯೆಯಾಗಿದೆ</string>
+  <string name="vvm3_error_imap_error_message">%1$s ರಲ್ಲಿ ಗ್ರಾಹಕ ಸೇವೆಯನ್ನು ಸಂಪರ್ಕಿಸಿ ಮತ್ತು ದೋಷ ಕೋಡ್‌ 9999 ಎಂದು ಅವರಿಗೆ ತಿಳಿಸಿ.</string>
+  <string name="verizon_terms_and_conditions_title">ದೃಶ್ಯ ಧ್ವನಿಮೇಲ್ ಆನ್ ಮಾಡಿ</string>
+  <string name="verizon_terms_and_conditions_message">%1$s ದೃಶ್ಯ ಧ್ವನಿಮೇಲ್ ಆನ್ ಮಾಡುವ ಮೂಲಕ ನೀವು Verizon Wireless ನ ನಿಯಮಗಳು ಮತ್ತು ನಿಬಂಧನೆಗಳಿಗೆ ಸಮ್ಮತಿಸುತ್ತೀರಿ:\n\n%2$s</string>
+  <string name="dialer_terms_and_conditions_title">ದೃಶ್ಯ ಧ್ವನಿಮೇಲ್ ಆನ್ ಮಾಡಿ</string>
+  <string name="dialer_terms_and_conditions_existing_user_title">ಹೊಸತು! ನಿಮ್ಮ ಧ್ವನಿಮೇಲ್‌ ಅನ್ನು ಓದಿ</string>
+  <string name="dialer_terms_and_conditions_message">%s</string>
+  <string name="dialer_terms_and_conditions_1.0">ಧ್ವನಿಮೇಲ್‌ಗೆ ಕರೆ ಮಾಡದೆಯೇ ನಿಮ್ಮ ಸಂದೇಶಗಳನ್ನು ನೋಡಿ ಮತ್ತು ಆಲಿಸಿಬಹುದು. ನಿಮ್ಮ ಧ್ವನಿಮೇಲ್‌ನ ಪ್ರತಿಲೇಖನಗಳನ್ನು Google ನ ಉಚಿತ ಪ್ರತಿಲೇಖನ ಸೇವೆಯ ಮೂಲಕ ಒದಗಿಸಲಾಗುತ್ತದೆ. ನೀವು ಯಾವುದೇ ಸಮಯದಲ್ಲಾದರೂ ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ಆಫ್ ಮಾಡಬಹುದು. %s</string>
+  <string name="dialer_terms_and_conditions_existing_user">ನಿಮ್ಮ ಧ್ವನಿಮೇಲ್‌ನ ಪ್ರತಿಲೇಖನಗಳನ್ನು Google ನ ಉಚಿತ ಪ್ರತಿಲೇಖನ ಸೇವೆಯ ಮೂಲಕ ಒದಗಿಸಲಾಗುತ್ತದೆ. ನೀವು ಯಾವುದೇ ಸಮಯದಲ್ಲಾದರೂ ಸೆಟ್ಟಿಂಗ್‌ಗಳಲ್ಲಿ ಇದನ್ನು ಆಫ್ ಮಾಡಬಹುದು. %s</string>
+  <string name="dialer_terms_and_conditions_for_verizon_1.0">ಧ್ವನಿಮೇಲ್‌ಗೆ ಕರೆ ಮಾಡದೆಯೇ ನಿಮ್ಮ ಸಂದೇಶಗಳನ್ನು ನೋಡಿ ಮತ್ತು ಆಲಿಸಿ.</string>
+  <string name="dialer_terms_and_conditions_learn_more">ಇನ್ನಷ್ಟು ತಿಳಿಯಿರಿ</string>
+  <string name="dialer_terms_and_conditions_existing_user_ack">ಸರಿ, ಅರ್ಥವಾಯಿತು</string>
+  <string name="dialer_terms_and_conditions_existing_user_decline">ಬೇಡ</string>
+  <string name="terms_and_conditions_decline_dialog_title">ದೃಶ್ಯ ಧ್ವನಿಮೇಲ್ ಅನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸುವುದೇ?</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_message">ನಿಯಮಗಳು ಮತ್ತು ನಿಬಂಧನೆಗಳನ್ನು ನಿರಾಕರಿಸಿದಲ್ಲಿ ದೃಶ್ಯ ಧ್ವನಿಮೇಲ್ ಅನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗುತ್ತದೆ.</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_downgrade">ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_message">ನೀವು ದೃಶ್ಯ ಧ್ವನಿಮೇಲ್ ಅನ್ನು ಆಫ್‌ ಮಾಡಿದರೆ ಅದನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗುತ್ತದೆ.</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_downgrade">ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message">*86 ಗ ಕರೆ ಮಾಡುವ ಮೂಲಕ ಮಾತ್ರ ಧ್ವನಿಮೇಲ್‌ಗೆ ಪ್ರವೇಶಿಸಲು ಸಾಧ್ಯ. ಮುಂದುವರಿಯಲು, ಒಂದು ಹೊಸ ಧ್ವನಿಮೇಲ್ ಪಿನ್ ಹೊಂದಿಸಿ.</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin">ಪಿನ್ ಹೊಂದಿಸಿ</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/error/res/values-ko/strings.xml b/java/com/android/dialer/voicemail/listui/error/res/values-ko/strings.xml
new file mode 100644
index 0000000..eabc71f
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/error/res/values-ko/strings.xml
@@ -0,0 +1,102 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_error_activating_title">시각적 음성사서함 활성화 중</string>
+  <string name="voicemail_error_activating_message">시각적 음성사서함이 완전히 활성화되기 전에는 음성사서함 알림을 받지 못할 수 있습니다. 그동안은 음성사서함으로 전화하여 새 메시지를 가져오세요.</string>
+  <string name="voicemail_error_not_activate_no_signal_title">시각적 음성사서함을 활성화할 수 없음</string>
+  <string name="voicemail_error_not_activate_no_signal_message">휴대전화가 모바일 네트워크에 연결되었는지 확인한 다음 다시 시도해 주세요.</string>
+  <string name="voicemail_error_not_activate_no_signal_airplane_mode_message">비행기 모드를 사용 중지한 다음 다시 시도해 주세요.</string>
+  <string name="voicemail_error_no_signal_title">연결되지 않음</string>
+  <string name="voicemail_error_no_signal_message">새 음성사서함에 관한 알림이 전송되지 않습니다. Wi-Fi에 연결되어 있다면 지금 동기화하여 음성사서함을 확인할 수 있습니다.</string>
+  <string name="voicemail_error_no_signal_airplane_mode_message">새로운 음성사서함에 대한 알림이 전송되지 않습니다. 음성사서함을 동기화하려면 비행기 모드를 사용 중지하세요.</string>
+  <string name="voicemail_error_no_signal_cellular_required_message">음성사서함을 확인하려면 휴대전화가 모바일 데이터에 연결되어야 합니다.</string>
+  <string name="voicemail_error_activation_failed_title">시각적 음성사서함을 활성화할 수 없음</string>
+  <string name="voicemail_error_activation_failed_message">다른 방법으로, 전화를 걸어 음성사서함을 확인할 수 있습니다.</string>
+  <string name="voicemail_error_no_data_title">시각적 음성사서함을 업데이트할 수 없음</string>
+  <string name="voicemail_error_no_data_message">Wi-Fi 또는 모바일 데이터 연결 상태가 나아지면 다시 시도해 주세요. 다른 방법으로, 전화를 걸어 음성사서함을 확인할 수 있습니다.</string>
+  <string name="voicemail_error_no_data_cellular_required_message">모바일 데이터 연결 상태가 나아지면 다시 시도해 주세요. 다른 방법으로, 전화를 걸어 음성사서함을 확인할 수 있습니다.</string>
+  <string name="voicemail_error_bad_config_title">시각적 음성사서함을 업데이트할 수 없음</string>
+  <string name="voicemail_error_bad_config_message">다른 방법으로, 전화를 걸어 음성사서함을 확인할 수 있습니다.</string>
+  <string name="voicemail_error_communication_title">시각적 음성사서함을 업데이트할 수 없음</string>
+  <string name="voicemail_error_communication_message">다른 방법으로, 전화를 걸어 음성사서함을 확인할 수 있습니다.</string>
+  <string name="voicemail_error_server_connection_title">시각적 음성사서함을 업데이트할 수 없음</string>
+  <string name="voicemail_error_server_connection_message">다른 방법으로, 전화를 걸어 음성사서함을 확인할 수 있습니다.</string>
+  <string name="voicemail_error_server_title">시각적 음성사서함을 업데이트할 수 없음</string>
+  <string name="voicemail_error_server_message">다른 방법으로, 전화를 걸어 음성사서함을 확인할 수 있습니다.</string>
+  <string name="voicemail_error_inbox_near_full_title">받은편지함이 거의 가득 참</string>
+  <string name="voicemail_error_inbox_near_full_message">받은편지함이 가득 차면 새로운 음성메시지를 받을 수 없습니다.</string>
+  <string name="voicemail_error_inbox_full_title">새로운 음성메시지를 받을 수 없음</string>
+  <string name="voicemail_error_inbox_full_message">받은편지함이 가득 찼습니다. 새로운 음성메시지를 받으려면 일부 메시지를 삭제해 보세요.</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_title">추가 저장용량 및 백업 사용</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_message">음성사서함이 가득 찼습니다. 여유 공간을 확보하려면 Google에서 음성사서함 메시지를 관리하고 백업할 수 있도록 추가 저장용량을 사용 설정하세요.</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_title">추가 저장용량 및 백업 사용</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_message">음성사서함이 거의 가득 찼습니다. 여유 공간을 확보하려면 Google에서 음성사서함 메시지를 관리하고 백업할 수 있도록 추가 저장용량을 사용 설정하세요.</string>
+  <string name="voicemail_error_pin_not_set_title">음성사서함 PIN 설정</string>
+  <string name="voicemail_error_pin_not_set_message">음성사서함에 액세스하기 위해 전화할 때마다 음성사서함 PIN이 필요합니다.</string>
+  <string name="voicemail_action_turn_off_airplane_mode">비행기 모드 설정</string>
+  <string name="voicemail_action_set_pin">PIN 설정</string>
+  <string name="voicemail_action_retry">다시 시도</string>
+  <string name="voicemail_action_turn_archive_on">사용</string>
+  <string name="voicemail_action_dimiss">거부</string>
+  <string name="voicemail_action_sync">동기화</string>
+  <string name="voicemail_action_call_voicemail">음성사서함에 전화</string>
+  <string name="voicemail_action_call_customer_support">고객지원팀에 전화</string>
+  <string name="vvm3_error_vms_dns_failure_title">문제 발생</string>
+  <string name="vvm3_error_vms_dns_failure_message">문제가 발생했습니다. 나중에 다시 시도해 주세요. 문제가 지속되면 고객 서비스 담당자(%1$s)에게 문의하여 오류 코드가 9001임을 알려주시기 바랍니다.</string>
+  <string name="vvm3_error_vmg_dns_failure_title">문제 발생</string>
+  <string name="vvm3_error_vmg_dns_failure_message">문제가 발생했습니다. 나중에 다시 시도해 주세요. 문제가 지속되면 고객 서비스 담당자(%1$s)에게 문의하여 오류 코드가 9002임을 알려주시기 바랍니다.</string>
+  <string name="vvm3_error_spg_dns_failure_title">문제 발생</string>
+  <string name="vvm3_error_spg_dns_failure_message">문제가 발생했습니다. 나중에 다시 시도해 주세요. 문제가 지속되면 고객 서비스 담당자(%1$s)에게 문의하여 오류 코드가 9003임을 알려주시기 바랍니다.</string>
+  <string name="vvm3_error_vms_no_cellular_title">음성사서함에 연결할 수 없음</string>
+  <string name="vvm3_error_vms_no_cellular_message">음성사서함에 연결하는 중에 문제가 발생했습니다. 신호 강도가 약한 지역인 경우 강해질 때까지 기다렸다가 다시 시도해 주세요. 문제가 지속되면 고객 서비스 담당자(%1$s)에게 문의하여 오류 코드가 9004임을 알려주시기 바랍니다.</string>
+  <string name="vvm3_error_vmg_no_cellular_title">음성사서함에 연결할 수 없음</string>
+  <string name="vvm3_error_vmg_no_cellular_message">음성사서함에 연결하는 중에 문제가 발생했습니다. 신호 강도가 약한 지역인 경우 강해질 때까지 기다렸다가 다시 시도해 주세요. 문제가 지속되면 고객 서비스 담당자(%1$s)에게 문의하여 오류 코드가 9005임을 알려주시기 바랍니다.</string>
+  <string name="vvm3_error_spg_no_cellular_title">음성사서함에 연결할 수 없음</string>
+  <string name="vvm3_error_spg_no_cellular_message">음성사서함에 연결하는 중에 문제가 발생했습니다. 신호 강도가 약한 지역인 경우 강해질 때까지 기다렸다가 다시 시도해 주세요. 문제가 지속되면 고객 서비스 담당자(%1$s)에게 문의하여 오류 코드가 9006임을 알려주시기 바랍니다.</string>
+  <string name="vvm3_error_vms_timeout_title">문제 발생</string>
+  <string name="vvm3_error_vms_timeout_message">문제가 발생했습니다. 나중에 다시 시도해 주세요. 문제가 지속되면 고객 서비스 담당자(%1$s)에게 문의하여 오류 코드가 9007임을 알려주시기 바랍니다.</string>
+  <string name="vvm3_error_vmg_timeout_title">문제 발생</string>
+  <string name="vvm3_error_vmg_timeout_message">문제가 발생했습니다. 나중에 다시 시도해 주세요. 문제가 지속되면 고객 서비스 담당자(%1$s)에게 문의하여 오류 코드가 9008임을 알려주시기 바랍니다.</string>
+  <string name="vvm3_error_status_sms_timeout_title">문제 발생</string>
+  <string name="vvm3_error_status_sms_timeout_message">서비스를 설정하는 중에 문제가 발생했습니다. 나중에 다시 시도해 주세요. 문제가 지속되면 고객 서비스 담당자(%1$s)에게 문의하여 오류 코드가 9009임을 알려주시기 바랍니다.</string>
+  <string name="vvm3_error_subscriber_blocked_title">음성사서함에 연결할 수 없음</string>
+  <string name="vvm3_error_subscriber_blocked_message">현재 음성사서함에 연결할 수 없습니다. 나중에 다시 시도해 주세요. 문제가 지속되면 고객 서비스 담당자(%1$s)에게 문의하여 오류 코드가 9990임을 알려주시기 바랍니다.</string>
+  <string name="vvm3_error_unknown_user_title">음성사서함 설정</string>
+  <string name="vvm3_error_unknown_user_message">계정에 음성사서함이 설정되지 않았습니다. 고객 서비스 담당자(%1$s)에게 문의하여 오류 코드가 9991임을 알려주시기 바랍니다.</string>
+  <string name="vvm3_error_unknown_device_title">음성사서함</string>
+  <string name="vvm3_error_unknown_device_message">이 기기에서 시각적 음성사서함을 사용할 수 없습니다. 고객 서비스 담당자(%1$s)에게 문의하여 오류 코드가 9992임을 알려주시기 바랍니다.</string>
+  <string name="vvm3_error_invalid_password_title">문제 발생</string>
+  <string name="vvm3_error_invalid_password_message">고객 서비스 담당자(%1$s)에게 문의하여 오류 코드가 9993임을 알려주시기 바랍니다.</string>
+  <string name="vvm3_error_mailbox_not_initialized_title">시각적 음성사서함</string>
+  <string name="vvm3_error_mailbox_not_initialized_message">시각적 음성사서함 설정을 완료하려면 고객 서비스 담당자(%1$s)에게 문의하여 오류 코드가 9994임을 알려주시기 바랍니다.</string>
+  <string name="vvm3_error_service_not_provisioned_title">시각적 음성사서함</string>
+  <string name="vvm3_error_service_not_provisioned_message">시각적 음성사서함 설정을 완료하려면 고객 서비스 담당자(%1$s)에게 문의하여 오류 코드가 9995임을 알려주시기 바랍니다.</string>
+  <string name="vvm3_error_service_not_activated_title">시각적 음성사서함</string>
+  <string name="vvm3_error_service_not_activated_message">시각적 음성사서함을 활성화하려면 고객 서비스 담당자(%1$s)에게 문의하여 오류 코드가 9996임을 알려주시기 바랍니다.</string>
+  <string name="vvm3_error_user_blocked_title">문제 발생</string>
+  <string name="vvm3_error_user_blocked_message">시각적 음성사서함 설정을 완료하려면 고객 서비스 담당자(%1$s)에게 문의하여 오류 코드가 9998임을 알려주시기 바랍니다.</string>
+  <string name="vvm3_error_subscriber_unknown_title">시각적 음성사서함이 사용 중지됨</string>
+  <string name="vvm3_error_subscriber_unknown_message">시각적 음성사서함을 활성화하려면 고객 서비스 담당자(%1$s)에게 문의하시기 바랍니다.</string>
+  <string name="vvm3_error_imap_getquota_error_title">문제 발생</string>
+  <string name="vvm3_error_imap_getquota_error_message">고객 서비스 담당자(%1$s)에게 문의하여 오류 코드가 9997임을 알려주시기 바랍니다.</string>
+  <string name="vvm3_error_imap_select_error_title">문제 발생</string>
+  <string name="vvm3_error_imap_select_error_message">고객 서비스 담당자(%1$s)에게 문의하여 오류 코드가 9989임을 알려주시기 바랍니다.</string>
+  <string name="vvm3_error_imap_error_title">문제 발생</string>
+  <string name="vvm3_error_imap_error_message">고객 서비스 담당자(%1$s)에게 문의하여 오류 코드가 9999임을 알려주시기 바랍니다.</string>
+  <string name="verizon_terms_and_conditions_title">시각적 음성사서함 사용</string>
+  <string name="verizon_terms_and_conditions_message">%1$s 시각적 음성사서함을 사용 설정하면 Verizon Wireless 이용약관에 동의하게 됩니다.\n\n%2$s</string>
+  <string name="dialer_terms_and_conditions_title">시각적 음성사서함 사용</string>
+  <string name="dialer_terms_and_conditions_existing_user_title">New! 음성사서함 메시지 듣기</string>
+  <string name="dialer_terms_and_conditions_message">%s</string>
+  <string name="dialer_terms_and_conditions_1.0">음성사서함을 직접 확인하지 않아도 메시지를 확인하고 들을 수 있습니다. Google의 무료 텍스트 변환 서비스를 통해 음성사서함 메시지가 스크립트로 제공됩니다. 설정에서 언제든지 사용 중지할 수 있습니다. %s</string>
+  <string name="dialer_terms_and_conditions_existing_user">이제 Google의 무료 텍스트 변환 서비스를 통해 음성사서함 메시지가 스크립트로 제공됩니다. 설정에서 언제든지 사용 중지할 수 있습니다. %s</string>
+  <string name="dialer_terms_and_conditions_for_verizon_1.0">음성사서함에 전화하지 않고도 메시지를 확인하고 들을 수 있습니다.</string>
+  <string name="dialer_terms_and_conditions_learn_more">자세히 알아보기</string>
+  <string name="dialer_terms_and_conditions_existing_user_ack">확인</string>
+  <string name="dialer_terms_and_conditions_existing_user_decline">아니요</string>
+  <string name="terms_and_conditions_decline_dialog_title">시각적 음성사서함을 사용 중지하시겠습니까?</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_message">이용약관을 거부하는 경우 시각적 음성사서함이 사용 중지됩니다.</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_downgrade">사용 중지</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_message">시각적 음성사서함을 끄면 시각적 음성사서함이 사용 중지됩니다.</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_downgrade">사용 중지</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message">음성사서함에 액세스하려면 *86번으로 전화해야 합니다. 계속하려면 새 음성사서함 PIN을 설정하세요.</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin">PIN 설정</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/error/res/values-ky/strings.xml b/java/com/android/dialer/voicemail/listui/error/res/values-ky/strings.xml
new file mode 100644
index 0000000..5d8fefb
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/error/res/values-ky/strings.xml
@@ -0,0 +1,104 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_error_activating_title">Визуалдык үн почтасын иштетүү</string>
+  <string name="voicemail_error_activating_message">Визуалдык үн почтасы толук иштетилмейинче үн почтасынын эскертмелерин ала албайсыз. Үн почтасы толугу менен иштетилгенче жаңы билдирүүлөрдү алуу үчүн үн почтасына чалыңыз.</string>
+  <string name="voicemail_error_not_activate_no_signal_title">Визуалдык үн почтасы иштебей жатат</string>
+  <string name="voicemail_error_not_activate_no_signal_message">Телефонуңузда мобилдик байланыш бар экенин текшерип, кайра аракет кылыңыз.</string>
+  <string name="voicemail_error_not_activate_no_signal_airplane_mode_message">Учак режимин өчүрүп, кайра аракет кылыңыз.</string>
+  <string name="voicemail_error_no_signal_title">Байланыш жок</string>
+  <string name="voicemail_error_no_signal_message">Жаңы билдирүүлөр жөнүндө эскертмелер келбейт. Эгер телефонуңуз Wi-Fi тармагына туташып турса, аны үн почтасы менен шайкештириңиз.</string>
+  <string name="voicemail_error_no_signal_airplane_mode_message">Жаңы билдирүүлөр жөнүндө эскертмелер келбейт. Учак режимин өчүрүп, телефонуңузду үн почтаңыз менен шайкештириңиз.</string>
+  <string name="voicemail_error_no_signal_cellular_required_message">Үн почтаңызды текшерүү үчүн мобилдик интернетти иштетиңиз.</string>
+  <string name="voicemail_error_activation_failed_title">Визуалдык үн почтасы иштебей жатат</string>
+  <string name="voicemail_error_activation_failed_message">Үн почтасын текшерүү үчүн атайын номерге чалсаңыз болот.</string>
+  <string name="voicemail_error_no_data_title">Визуалдык үн почтасы жаңырбай жатат</string>
+  <string name="voicemail_error_no_data_message">Wi-Fi сигналы же мобилдик интернет туруктуу болгончо күтө туруп, анан кайра аракет кылыңыз. Эгер почтаны азыр текшергиңиз келсе, атайын номерге чалыңыз.</string>
+  <string name="voicemail_error_no_data_cellular_required_message">Мобилдик интернет туруктуу болгончо күтө туруп, анан кайра аракет кылыңыз. Эгер почтаны азыр текшергиңиз келсе, атайын номерге чалыңыз.</string>
+  <string name="voicemail_error_bad_config_title">Визуалдык үн почтасы жаңырбай жатат</string>
+  <string name="voicemail_error_bad_config_message">Үн почтасын текшерүү үчүн атайын номерге чалсаңыз болот.</string>
+  <string name="voicemail_error_communication_title">Визуалдык үн почтасы жаңырбай жатат</string>
+  <string name="voicemail_error_communication_message">Үн почтасын текшерүү үчүн атайын номерге чалсаңыз болот.</string>
+  <string name="voicemail_error_server_connection_title">Визуалдык үн почтасы жаңырбай жатат</string>
+  <string name="voicemail_error_server_connection_message">Үн почтасын текшерүү үчүн атайын номерге чалсаңыз болот.</string>
+  <string name="voicemail_error_server_title">Визуалдык үн почтасы жаңырбай жатат</string>
+  <string name="voicemail_error_server_message">Үн почтасын текшерүү үчүн атайын номерге чалсаңыз болот.</string>
+  <string name="voicemail_error_inbox_near_full_title">\"Келген каттар\" кутусу дээрлик толуп калды</string>
+  <string name="voicemail_error_inbox_near_full_message">Почтаңыз толуп калса, жаңы үн каттарын ала албай каласыз.</string>
+  <string name="voicemail_error_inbox_full_title">Жаңы үн каттары алынбай жатат</string>
+  <string name="voicemail_error_inbox_full_message">\"Келген каттар\" кутуңуз толуп калды. Үн каттарын алуу үчүн айрым билдирүүлөрдү өчүрүңүз.</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_title">Кошумча мейкиндик талап кылынат</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_message">Үн почтаңызда бош орун жок. 
+Үн каттарыңызды башкаруу жана алардын камдык көчүрмөлөрүн сактоо үчүн кошумча мейкиндикти күйгүзүп коюңуз.</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_title">Кошумча мейкиндик талап кылынат</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_message">Үн почтаңыз толуп калды. 
+Үн каттарыңызды башкаруу жана алардын камдык көчүрмөлөрүн сактоо үчүн кошумча мейкиндикти күйгүзүп коюңуз.</string>
+  <string name="voicemail_error_pin_not_set_title">Үн почтаңыздын PIN-кодун орнотуңуз</string>
+  <string name="voicemail_error_pin_not_set_message">PIN-код ар чалган сайын үн почтаңызды угуу үчүн керек.</string>
+  <string name="voicemail_action_turn_off_airplane_mode">Учак режиминин жөндөөлөрү</string>
+  <string name="voicemail_action_set_pin">PIN-код коюу</string>
+  <string name="voicemail_action_retry">Кайталоо</string>
+  <string name="voicemail_action_turn_archive_on">Күйгүзүү</string>
+  <string name="voicemail_action_dimiss">Жок, рахмат</string>
+  <string name="voicemail_action_sync">Шайкештирүү</string>
+  <string name="voicemail_action_call_voicemail">Үн почтасына чалуу</string>
+  <string name="voicemail_action_call_customer_support">Кардарларды колдоо кызматына чалуу</string>
+  <string name="vvm3_error_vms_dns_failure_title">Бир жерден ката кетти</string>
+  <string name="vvm3_error_vms_dns_failure_message">Кечиресиз, көйгөйгө учурадык. Бир аздан кийин дагы аракет кылып көрүңүз. Көйгөй кайталана берсе, Кардарларды колдоо кызматынын %1$s номерине чалып, ката коду 9001 деп айтыңыз.</string>
+  <string name="vvm3_error_vmg_dns_failure_title">Бир жерден ката кетти</string>
+  <string name="vvm3_error_vmg_dns_failure_message">Кечиресиз, көйгөйгө учурадык. Бир аздан кийин дагы аракет кылып көрүңүз. Көйгөй кайталана берсе, Кардарларды колдоо кызматынын %1$s номерине чалып, ката коду 9002 деп айтыңыз.</string>
+  <string name="vvm3_error_spg_dns_failure_title">Бир жерден ката кетти</string>
+  <string name="vvm3_error_spg_dns_failure_message">Кечиресиз, көйгөйгө учурадык. Көйгөй кайталана берсе, Кардарларды колдоо кызматынын %1$s номерине чалып, ката коду 9003 деп айтыңыз.</string>
+  <string name="vvm3_error_vms_no_cellular_title">Үн почтаңыздын кутусуна туташа албай жатабыз</string>
+  <string name="vvm3_error_vms_no_cellular_message">Кечиресиз, үн почтаңызга туташуу мүмкүн болбой жатат. Сигнал күчтүү болгон жерди таап, дагы аракет кылып көрүңүз. Көйгөй кайталана берсе, Кардарларды колдоо кызматынын %1$s номерине чалып, ката коду 9004 деп айтыңыз.</string>
+  <string name="vvm3_error_vmg_no_cellular_title">Үн почтаңыздын кутусуна туташа албай жатабыз</string>
+  <string name="vvm3_error_vmg_no_cellular_message">Кечиресиз, үн почтаңызга туташуу мүмкүн болбой жатат. Сигнал күчтүү болгон жерди таап, кайталап көрүңүз. Көйгөй кайталана берсе, Кардарларды колдоо кызматынын %1$s номерине чалып, ката коду 9005 деп айтыңыз.</string>
+  <string name="vvm3_error_spg_no_cellular_title">Үн почтаңыздын кутусуна туташа албай жатабыз</string>
+  <string name="vvm3_error_spg_no_cellular_message">Кечиресиз, үн почтаңызга туташуу мүмкүн болбой жатат. Сигнал күчтүү болгон жерди таап, кайталап көрүңүз. Көйгөй кайталана берсе, Кардарларды колдоо кызматынын %1$s номерине чалып, ката коду 9006 деп айтыңыз.</string>
+  <string name="vvm3_error_vms_timeout_title">Бир жерден ката кетти</string>
+  <string name="vvm3_error_vms_timeout_message">Кечиресиз, көйгөйгө учурадык. Бир аздан кийин дагы аракет кылып көрүңүз. Көйгөй кайталана берсе, Кардарларды колдоо кызматынын %1$s номерине чалып, ката коду 9007 деп айтыңыз.</string>
+  <string name="vvm3_error_vmg_timeout_title">Бир жерден ката кетти</string>
+  <string name="vvm3_error_vmg_timeout_message">Кечиресиз, көйгөйгө учурадык. Бир аздан кийин дагы аракет кылып көрүңүз. Көйгөй кайталана берсе, Кардарларды колдоо кызматынын %1$s номерине чалып, ката коду 9008 деп айтыңыз.</string>
+  <string name="vvm3_error_status_sms_timeout_title">Бир жерден ката кетти</string>
+  <string name="vvm3_error_status_sms_timeout_message">Кечиресиз, кызматыңызды жөндөө мүмкүн болбой жатат. Бир аздан кийин дагы аракет кылып көрүңүз. Көйгөй кайталана берсе, Кардарларды колдоо кызматынын %1$s номерине чалып, ката коду 9009 деп айтыңыз.</string>
+  <string name="vvm3_error_subscriber_blocked_title">Үн почтаңыздын кутусуна туташа албай жатабыз</string>
+  <string name="vvm3_error_subscriber_blocked_message">Кечиресиз, үн почтаңызга туташуу мүмкүн болбой жатат. Бир аздан кийин дагы аракет кылып көрүңүз. Көйгөй кайталана берсе, Кардарларды колдоо кызматынын %1$s номерине чалып, ката коду 9990 деп айтыңыз.</string>
+  <string name="vvm3_error_unknown_user_title">Үн почтасын жөндөө</string>
+  <string name="vvm3_error_unknown_user_message">Аккаунтуңузда үн почтасы жөндөлгөн эмес. Кардарларды колдоо кызматынын %1$s номерине чалып, ката коду 9991 деп айтыңыз.</string>
+  <string name="vvm3_error_unknown_device_title">Үн почтасы</string>
+  <string name="vvm3_error_unknown_device_message">Визуалдык үн почтасын бул түзмөктө колдонууга болбойт. Кардарларды колдоо кызматынын %1$s номерине чалып, ката коду 9992 деп айтыңыз.</string>
+  <string name="vvm3_error_invalid_password_title">Бир жерден ката кетти</string>
+  <string name="vvm3_error_invalid_password_message">Кардарларды колдоо кызматынын %1$s номерине чалып, ката коду 9993 деп айтыңыз.</string>
+  <string name="vvm3_error_mailbox_not_initialized_title">Визуалдык үн почтасы</string>
+  <string name="vvm3_error_mailbox_not_initialized_message">Визуалдык үн почтасын жөндөөнү аягына чыгаруу үчүн Кардарларды колдоо кызматынын %1$s номерине чалып, ката коду 9994 деп айтыңыз.</string>
+  <string name="vvm3_error_service_not_provisioned_title">Визуалдык үн почтасы</string>
+  <string name="vvm3_error_service_not_provisioned_message">Визуалдык үн почтасын жөндөөнү аягына чыгаруу үчүн Кардарларды колдоо кызматынын %1$s номерине чалып, ката коду 9995 деп айтыңыз.</string>
+  <string name="vvm3_error_service_not_activated_title">Визуалдык үн почтасы</string>
+  <string name="vvm3_error_service_not_activated_message">Визуалдык үн почтасын иштетүү үчүн Кардарларды колдоо кызматынын %1$s номерине чалып, ката коду 9996 деп айтыңыз.</string>
+  <string name="vvm3_error_user_blocked_title">Бир жерден ката кетти</string>
+  <string name="vvm3_error_user_blocked_message">Визуалдык үн почтасын жөндөөнү аягына чыгаруу үчүн Кардарларды колдоо кызматынын %1$s номерине чалып, ката коду 9998 деп айтыңыз.</string>
+  <string name="vvm3_error_subscriber_unknown_title">Визуалдык үн почтасы өчүк</string>
+  <string name="vvm3_error_subscriber_unknown_message">Визуалдык үн почтасын иштетүү үчүн Кардарларды колдоо кызматынын %1$s номерине кайрылыңыз.</string>
+  <string name="vvm3_error_imap_getquota_error_title">Бир жерден ката кетти</string>
+  <string name="vvm3_error_imap_getquota_error_message">Кардарларды колдоо кызматынын %1$s номерине чалып, ката коду 9997 деп айтыңыз.</string>
+  <string name="vvm3_error_imap_select_error_title">Бир жерден ката кетти</string>
+  <string name="vvm3_error_imap_select_error_message">Кардарларды колдоо кызматынын %1$s номерине чалып, ката коду 9989 деп айтыңыз.</string>
+  <string name="vvm3_error_imap_error_title">Бир жерден ката кетти</string>
+  <string name="vvm3_error_imap_error_message">Кардарларды колдоо кызматынын %1$s номерине чалып, ката коду 9999 деп айтыңыз.</string>
+  <string name="verizon_terms_and_conditions_title">Визуалдык үн почтасын күйгүзүңүз</string>
+  <string name="verizon_terms_and_conditions_message">%1$s Визуалдык үн почтасын күйгүзүү менен сиз Verizon Wireless\'тин жоболору менен шарттарына макулдугуңузду бересиз:\n\n%2$s</string>
+  <string name="dialer_terms_and_conditions_title">Визуалдык үн почтасын күйгүзүңүз</string>
+  <string name="dialer_terms_and_conditions_existing_user_title">Жаңы! Үн почтаңызды окуңуз</string>
+  <string name="dialer_terms_and_conditions_message">%s</string>
+  <string name="dialer_terms_and_conditions_1.0">Үн почтасына чалып отурбастан, үн почтаңызды көрүп, уга аласыз. Үн почтаңыздын стенограммасын Google’дун акысыз транскрипция кызматы камсыз кылат. Аларды каалаган убакта Жөндөөлөргө өтүп, өчүрүп салсаңыз болот. %s</string>
+  <string name="dialer_terms_and_conditions_existing_user">Үн почтаңыздын стенограммаларын Google’дун акысыз транскрипция кызматы камсыз кылат. Аны каалаган убакта Жөндөөлөргө өтүп, өчүрүп койсоңуз болот. %s</string>
+  <string name="dialer_terms_and_conditions_for_verizon_1.0">Үн почтасына чалып отурбастан, билдирүүлөрүңүздү көрүп, уга аласыз.</string>
+  <string name="dialer_terms_and_conditions_learn_more">Көбүрөөк билүү</string>
+  <string name="dialer_terms_and_conditions_existing_user_ack">Жарайт, түшүндүм</string>
+  <string name="dialer_terms_and_conditions_existing_user_decline">Жок, рахмат</string>
+  <string name="terms_and_conditions_decline_dialog_title">Визуалдык үн почтасы өчүрүлсүнбү?</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_message">Эгер колдонуу жоболору менен шарттары четке кагылган болсо, визуалдык үн почтасы өчүрүлөт.</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_downgrade">Өчүрүү</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_message">Визуалдык үн почтасын өчүрсөңүз, ал иштебей калат.</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_downgrade">Өчүрүү</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message">Үн почтасын угуу үчүн *86 номерине чалыңыз. Улантуу үчүн, үн почтасына жаңы PIN-кодду коюңуз.</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin">PIN-код коюу</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/error/res/values-lo/strings.xml b/java/com/android/dialer/voicemail/listui/error/res/values-lo/strings.xml
new file mode 100644
index 0000000..73c50c7
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/error/res/values-lo/strings.xml
@@ -0,0 +1,102 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_error_activating_title">ກຳລັງເປີດໃຊ້ຂໍ້ຄວາມສຽງແບບພາບ</string>
+  <string name="voicemail_error_activating_message">ທ່ານອາດບໍ່ໄດ້ຮັບການແຈ້ງເຕືອນຂໍ້ຄວາມສຽງຈົນກວ່າຈະເປີດໃຊ້ຂໍ້ຄວາມສຽງແບບພາບສຳເລັດ. ໃຫ້ໂທຫາເບີຂໍ້ຄວາມສຽງເພື່ອຟັງຂໍ້ຄວາມໃໝ່ໃນລະຫວ່າງນີ້.</string>
+  <string name="voicemail_error_not_activate_no_signal_title">ບໍ່ສາມາດເປີດໃຊ້ຂໍ້ຄວາມສຽງແບບພາບໄດ້</string>
+  <string name="voicemail_error_not_activate_no_signal_message">ໃຫ້ກວດສອບວ່າໂທລະສັບຂອງທ່ານມີການເຊື່ອມຕໍ່ອິນເຕີເນັດແລ້ວລອງໃໝ່ອີກຄັ້ງ.</string>
+  <string name="voicemail_error_not_activate_no_signal_airplane_mode_message">ກະລຸນາປິດໂໝດຢູ່ໃນຍົນແລ້ວລອງໃໝ່ອີກຄັ້ງ.</string>
+  <string name="voicemail_error_no_signal_title">ບໍ່ມີການເຊື່ອມຕໍ່</string>
+  <string name="voicemail_error_no_signal_message">ທ່ານຈະບໍ່ໄດ້ຮັບການແຈ້ງເຕືອນເມື່ອມີຂໍ້ຄວາມສຽງໃໝ່. ຫາກທ່ານໃຊ້ Wi-Fi, ທ່ານສາມາດກວດສອບຂໍ້ຄວາມສຽງໄດ້ໂດຍການຊິ້ງຂໍ້ມູນຕອນນີ້.</string>
+  <string name="voicemail_error_no_signal_airplane_mode_message">ທ່ານຈະບໍ່ໄດ້ຮັບການແຈ້ງເຕືອນເມື່ອມີຂໍ້ຄວາມສຽງໃໝ່. ກະລຸນາປິດໂໝດຢູ່ໃນຍົນເພື່ອຊິ້ງຂໍ້ຄວາມສຽງຂອງທ່ານ.</string>
+  <string name="voicemail_error_no_signal_cellular_required_message">ໂທລະສັບຂອງທ່ານຕ້ອງມີການເຊື່ອມຕໍ່ອິນເຕີເນັດມືຖືເພື່ອກວດສອບຂໍ້ຄວາມສຽງ.</string>
+  <string name="voicemail_error_activation_failed_title">ບໍ່ສາມາດເປີດໃຊ້ຂໍ້ຄວາມສຽງແບບພາບໄດ້</string>
+  <string name="voicemail_error_activation_failed_message">ທ່ານສາມາດໂທເພື່ອກວດສອບຂໍ້ຄວາມສຽງໄດ້ຢູ່.</string>
+  <string name="voicemail_error_no_data_title">ບໍ່ສາມາດອັບເດດຂໍ້ຄວາມສຽງແບບພາບໄດ້</string>
+  <string name="voicemail_error_no_data_message">ໃຫ້ລອງໃໝ່ອີກຄັ້ງເມື່ອການເຊື່ອມຕໍ່ Wi‑Fi ຫຼື ອິນເຕີເນັດມືຖືຂອງທ່ານໄວຂຶ້ນກວ່ານີ້. ທ່ານຍັງຄົງສາມາດໂທເພື່ອກວດສອບຂໍ້ຄວາມສຽງຂອງທ່ານໄດ້ຢູ່.</string>
+  <string name="voicemail_error_no_data_cellular_required_message">ໃຫ້ລອງອີກຄັ້ງເມື່ອການເຊື່ອມຕໍ່ອິນຕີເນັດມືຖືຂອງທ່ານໄວຂຶ້ນກວ່ານີ້. ທ່ານຍັງຄົງສາມາດໂທເພື່ອກວດສອບຂໍ້ຄວາມສຽງຂອງທ່ານໄດ້ຢູ່.</string>
+  <string name="voicemail_error_bad_config_title">ບໍ່ສາມາດອັບເດດຂໍ້ຄວາມສຽງແບບພາບໄດ້</string>
+  <string name="voicemail_error_bad_config_message">ທ່ານສາມາດໂທເພື່ອກວດສອບຂໍ້ຄວາມສຽງໄດ້ຢູ່.</string>
+  <string name="voicemail_error_communication_title">ບໍ່ສາມາດອັບເດດຂໍ້ຄວາມສຽງແບບພາບໄດ້</string>
+  <string name="voicemail_error_communication_message">ທ່ານສາມາດໂທເພື່ອກວດສອບຂໍ້ຄວາມສຽງໄດ້ຢູ່.</string>
+  <string name="voicemail_error_server_connection_title">ບໍ່ສາມາດອັບເດດຂໍ້ຄວາມສຽງແບບພາບໄດ້</string>
+  <string name="voicemail_error_server_connection_message">ທ່ານສາມາດໂທເພື່ອກວດສອບຂໍ້ຄວາມສຽງໄດ້ຢູ່.</string>
+  <string name="voicemail_error_server_title">ບໍ່ສາມາດອັບເດດຂໍ້ຄວາມສຽງແບບພາບໄດ້</string>
+  <string name="voicemail_error_server_message">ທ່ານສາມາດໂທເພື່ອກວດສອບຂໍ້ຄວາມສຽງໄດ້ຢູ່.</string>
+  <string name="voicemail_error_inbox_near_full_title">Inbox almost full</string>
+  <string name="voicemail_error_inbox_near_full_message">ທ່ານຈະບໍ່ສາມາດຮັບຂໍ້ຄວາມສຽງໃໝ່ໄດ້ຫາກອິນບັອກຂອງທ່ານເຕັມ.</string>
+  <string name="voicemail_error_inbox_full_title">ບໍ່ສາມາດຮັບຂໍ້ຄວາມສຽງໃໝ່</string>
+  <string name="voicemail_error_inbox_full_message">ອິນບັອກຂອງທ່ານເຕັມແລ້ວ. ໃຫ້ລອງລຶບບາງຂໍ້ຄວາມອອກເພື່ອຮັບຂໍ້ຄວາມສຽງໃໝ່.</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_title">ເປີດໃຊ້ບ່ອນຈັດເກັບຂໍ້ມູນເພີ່ມເຕີມ ແລະ ການສຳຮອງຂໍ້ມູນ</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_message">ກ່ອງອີເມວຂອງທ່ານເຕັມແລ້ວ. ເພື່ອເພີ່ມບ່ອນຈັດເກັບຂໍ້ມູນ, ໃຫ້ເປີດໃຊ້ບ່ອນຈັດເກັບຂໍ້ມູນເພີ່າມເຕີມເພື່ອໃຫ້ Google ສາມາດຈັດການ ແລະ ສຳຮອງຂໍ້ມູນຂໍ້ຄວາມສຽງຂອງທ່ານໄດ້.</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_title">ເປີດໃຊ້ບ່ອນຈັດເກັບຂໍ້ມູນເພີ່ມເຕີມ ແລະ ການສຳຮອງຂໍ້ມູນ</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_message">ກ່ອງອີເມວຂອງທ່ານໃກ້ເຕັມແລ້ວ. ເພື່ອເພີ່ມບ່ອນຈັດເກັບຂໍ້ມູນ, ໃຫ້ເປີດໃຊ້ບ່ອນຈັດເກັບຂໍ້ມູນເພີ່າມເຕີມເພື່ອໃຫ້ Google ສາມາດຈັດການ ແລະ ສຳຮອງຂໍ້ມູນຂໍ້ຄວາມສຽງຂອງທ່ານໄດ້.</string>
+  <string name="voicemail_error_pin_not_set_title">ຕັ້ງລະຫັດ PIN ຂໍ້ຄວາມສຽງຂອງທ່ານ</string>
+  <string name="voicemail_error_pin_not_set_message">ທ່ານຈະຕ້ອງໃຊ້ລະຫັດ PIN ໃນຕອນໃດກໍຕາມທີ່ທ່ານໂທເພື່ອເຂົ້າຟັງຂໍ້ຄວາມສຽງຂອງທ່ານ.</string>
+  <string name="voicemail_action_turn_off_airplane_mode">ການຕ້ງຄ່າໂໝດຢູ່ໃນຍົນ</string>
+  <string name="voicemail_action_set_pin">ຕັ້ງລະຫັດ PIN</string>
+  <string name="voicemail_action_retry">ລອງໃໝ່</string>
+  <string name="voicemail_action_turn_archive_on">ເປີດ</string>
+  <string name="voicemail_action_dimiss">ບໍ່, ຂອບໃຈ</string>
+  <string name="voicemail_action_sync">ຊິ້ງຂໍ້ມູນ</string>
+  <string name="voicemail_action_call_voicemail">ໂທຫາເບີຂໍ້ຄວາມສຽງ</string>
+  <string name="voicemail_action_call_customer_support">Call Customer Support</string>
+  <string name="vvm3_error_vms_dns_failure_title">ມີບາງຢ່າງຜິດພາດເກີດຂຶ້ນ</string>
+  <string name="vvm3_error_vms_dns_failure_message">Sorry, we ran into a problem. Please try again later. If there is still a problem, please contact Customer Service at %1$s and tell them the error code is 9001.</string>
+  <string name="vvm3_error_vmg_dns_failure_title">ມີບາງຢ່າງຜິດພາດເກີດຂຶ້ນ</string>
+  <string name="vvm3_error_vmg_dns_failure_message">ຂໍອະໄພ, ພວກເຮົາກວດພົບບັນຫາ. ກະລຸນາລອງໃໝ່ໃນພາຍຫຼັງ. ຫາກຍັງຄົງພົບບັນຫາຢູ່. ກະລຸນາຕິດຕໍ່ຝ່າຍບໍລິການລູກຄ້າທີ່ເບີ %1$s ແລ້ວບອກລະຫັດຂໍ້ຜິດພາດວ່າແມ່ນ 9002.</string>
+  <string name="vvm3_error_spg_dns_failure_title">ມີບາງຢ່າງຜິດພາດເກີດຂຶ້ນ</string>
+  <string name="vvm3_error_spg_dns_failure_message">ຂໍອະໄພ, ພວກເຮົາກວດພົບບັນຫາ. ກະລຸນາລອງໃໝ່ໃນພາຍຫຼັງ. ຫາກຍັງຄົງພົບບັນຫາຢູ່. ກະລຸນາຕິດຕໍ່ຝ່າຍບໍລິການລູກຄ້າທີ່ເບີ %1$s ແລ້ວບອກລະຫັດຂໍ້ຜິດພາດວ່າແມ່ນ 9003.</string>
+  <string name="vvm3_error_vms_no_cellular_title">ບໍ່ສາມາດເຊື່ອມຕໍ່ຫາກ່ອງຂໍ້ຄວາມສຽງຂອງທ່ານໄດ້</string>
+  <string name="vvm3_error_vms_no_cellular_message">ຂໍອະໄພ, ພວກເຮົາພົບບັນຫາໃນການເຊື່ອມຕໍ່ກ່ອງຂໍ້ຄວາມສຽງຂອງທ່ານ. ຫາກທ່ານຢູ່ໃນພື້ນທີ່ທີ່ມີສັນຍານອ່ອນ, ໃຫ້ລໍຖ້າຈົນກວ່າທ່ານຈະມີສັນຍານແຮງແລ້ວລອງໃໝ່ອີກຄັ້ງ. ຫາກຍັງຄົງພົບບັນຫາຢູ່. ກະລຸນາຕິດຕໍ່ຝ່າຍບໍລິການລູກຄ້າທີ່ເບີ %1$s ແລ້ວບອກລະຫັດຂໍ້ຜິດພາດວ່າແມ່ນ 9004.</string>
+  <string name="vvm3_error_vmg_no_cellular_title">ບໍ່ສາມາດເຊື່ອມຕໍ່ຫາກ່ອງຂໍ້ຄວາມສຽງຂອງທ່ານໄດ້</string>
+  <string name="vvm3_error_vmg_no_cellular_message">ຂໍອະໄພ, ພວກເຮົາພົບບັນຫາໃນການເຊື່ອມຕໍ່ກ່ອງຂໍ້ຄວາມສຽງຂອງທ່ານ. ຫາກທ່ານຢູ່ໃນພື້ນທີ່ທີ່ມີສັນຍານອ່ອນ, ໃຫ້ລໍຖ້າຈົນກວ່າທ່ານຈະມີສັນຍານແຮງແລ້ວລອງໃໝ່ອີກຄັ້ງ. ຫາກຍັງຄົງພົບບັນຫາຢູ່. ກະລຸນາຕິດຕໍ່ຝ່າຍບໍລິການລູກຄ້າທີ່ເບີ %1$s ແລ້ວບອກລະຫັດຂໍ້ຜິດພາດວ່າແມ່ນ 9005.</string>
+  <string name="vvm3_error_spg_no_cellular_title">ບໍ່ສາມາດເຊື່ອມຕໍ່ຫາກ່ອງຂໍ້ຄວາມສຽງຂອງທ່ານໄດ້</string>
+  <string name="vvm3_error_spg_no_cellular_message">ຂໍອະໄພ, ພວກເຮົາພົບບັນຫາໃນການເຊື່ອມຕໍ່ກ່ອງຂໍ້ຄວາມສຽງຂອງທ່ານ. ຫາກທ່ານຢູ່ໃນພື້ນທີ່ທີ່ມີສັນຍານອ່ອນ, ໃຫ້ລໍຖ້າຈົນກວ່າທ່ານຈະມີສັນຍານແຮງແລ້ວລອງໃໝ່ອີກຄັ້ງ. ຫາກຍັງຄົງພົບບັນຫາຢູ່. ກະລຸນາຕິດຕໍ່ຝ່າຍບໍລິການລູກຄ້າທີ່ເບີ %1$s ແລ້ວບອກລະຫັດຂໍ້ຜິດພາດວ່າແມ່ນ 9006.</string>
+  <string name="vvm3_error_vms_timeout_title">ມີບາງຢ່າງຜິດພາດເກີດຂຶ້ນ</string>
+  <string name="vvm3_error_vms_timeout_message">ຂໍອະໄພ, ພວກເຮົາພົບບັນຫາ. ກະລຸນາລອງໃໝ່ອີກຄັ້ງ. ຫາກຍັງຄົງພົບບັນຫາຢູ່. ກະລຸນາຕິດຕໍ່ຝ່າຍບໍລິການລູກຄ້າທີ່ເບີ %1$s ແລ້ວບອກລະຫັດຂໍ້ຜິດພາດວ່າແມ່ນ 9007.</string>
+  <string name="vvm3_error_vmg_timeout_title">ມີບາງຢ່າງຜິດພາດເກີດຂຶ້ນ</string>
+  <string name="vvm3_error_vmg_timeout_message">ຂໍອະໄພ, ພວກເຮົາພົບບັນຫາ. ກະລຸນາລອງໃໝ່ອີກຄັ້ງ. ຫາກຍັງຄົງພົບບັນຫາຢູ່. ກະລຸນາຕິດຕໍ່ຝ່າຍບໍລິການລູກຄ້າທີ່ເບີ %1$s ແລ້ວບອກລະຫັດຂໍ້ຜິດພາດວ່າແມ່ນ 9008.</string>
+  <string name="vvm3_error_status_sms_timeout_title">ມີບາງຢ່າງຜິດພາດເກີດຂຶ້ນ</string>
+  <string name="vvm3_error_status_sms_timeout_message">ຂໍອະໄພ, ພວກເຮົາກຳລັງພົບບັນຫາໃນການຕັ້ງບໍລິການຂອງທ່ານ. ກະລຸນາລອງໃໝ່ອີກຄັ້ງໃນພາຍຫຼັງ. ຫາກຍັງຄົງພົບບັນຫາຢູ່. ກະລຸນາຕິດຕໍ່ຝ່າຍບໍລິການລູກຄ້າທີ່ເບີ %1$s ແລ້ວບອກລະຫັດຂໍ້ຜິດພາດວ່າແມ່ນ 9009.</string>
+  <string name="vvm3_error_subscriber_blocked_title">ບໍ່ສາມາດເຊື່ອມຕໍ່ຫາກ່ອງຂໍ້ຄວາມສຽງຂອງທ່ານໄດ້</string>
+  <string name="vvm3_error_subscriber_blocked_message">ຂໍອະໄພ, ພວກເຮົາພົບບັນຫາໃນການເຊື່ອມຕໍ່ກ່ອງຂໍ້ຄວາມສຽງຂອງທ່ານ. ກະລຸນາລອງໃໝ່ອີກຄັ້ງ. ຫາກຍັງຄົງພົບບັນຫາຢູ່. ກະລຸນາຕິດຕໍ່ຝ່າຍບໍລິການລູກຄ້າທີ່ເບີ %1$s ແລ້ວບອກລະຫັດຂໍ້ຜິດພາດວ່າແມ່ນ 9990.</string>
+  <string name="vvm3_error_unknown_user_title">ຕັ້ງຄ່າຂໍ້ຄວາມສຽງ</string>
+  <string name="vvm3_error_unknown_user_message">ບັນຊີຂອງທ່ານຍັງບໍ່ໄດ້ຕັ້ງຂໍ້ຄວາມສຽງເທື່ອ. ກະລຸນາຕິດຕໍ່ຝ່າຍບໍລິການລູກຄ້າທີ່ເບີ %1$s ແລ້ວບອກລະຫັດຂໍ້ຜິດພາດວ່າແມ່ນ 9991.</string>
+  <string name="vvm3_error_unknown_device_title">ຂໍ້ຄວາມສຽງ</string>
+  <string name="vvm3_error_unknown_device_message">ບໍ່ສາມາດໃຊ້ຂໍ້ຄວາມສຽງແບບພາບຢູ່ອຸປະກອນນີ້ໄດ້. ກະລຸນາຕິດຕໍ່ຫາຝ່າຍບໍລິການລູກຄ້າທີ່ເບີ %1$s ແລ້ວແຈ້ງລະຫັດຂໍ້ຜິດພາດ 9992.</string>
+  <string name="vvm3_error_invalid_password_title">ມີບາງຢ່າງຜິດພາດເກີດຂຶ້ນ</string>
+  <string name="vvm3_error_invalid_password_message">ກະລຸນາຕິດຕໍ່ຝ່າຍບໍລິການລູກຄ້າທີ່ເບີ %1$s ແລ້ວບອກລະຫັດຂໍ້ຜິດພາດວ່າແມ່ນ 9993.</string>
+  <string name="vvm3_error_mailbox_not_initialized_title">ຂໍ້ຄວາມສຽງສະເໝືອນ</string>
+  <string name="vvm3_error_mailbox_not_initialized_message">ເພື່ອສຳເລັດການຕັ້ງຄ່າຂໍ້ຄວາມສຽງແບບສະເໝືອນ, ກະລຸນາຕິດຕໍ່ຝ່າຍບໍລິການລູກຄ້າທີ່ເບີ %1$s ແລ້ວແຈ້ງລະຫັດຂໍ້ຜິດພາດ 9994.</string>
+  <string name="vvm3_error_service_not_provisioned_title">ຂໍ້ຄວາມສຽງສະເໝືອນ</string>
+  <string name="vvm3_error_service_not_provisioned_message">ເພື່ອສຳເລັດການຕັ້ງຄ່າຂໍ້ຄວາມສຽງແບບສະເໝືອນ, ກະລຸນາຕິດຕໍ່ຝ່າຍບໍລິການລູກຄ້າທີ່ເບີ %1$s ແລ້ວແຈ້ງລະຫັດຂໍ້ຜິດພາດ 9995.</string>
+  <string name="vvm3_error_service_not_activated_title">ຂໍ້ຄວາມສຽງສະເໝືອນ</string>
+  <string name="vvm3_error_service_not_activated_message">ເພື່ອເປີດນຳໃຊ້ຂໍ້ຄວາມສຽງແບບສະເໝືອນ, ກະລຸນາຕິດຕໍ່ຝ່າຍບໍລິການລູກຄ້າທີ່ເບີ %1$s ແລ້ວແຈ້ງລະຫັດຂໍ້ຜິດພາດ 9996.</string>
+  <string name="vvm3_error_user_blocked_title">ມີບາງຢ່າງຜິດພາດເກີດຂຶ້ນ</string>
+  <string name="vvm3_error_user_blocked_message">ເພື່ອສຳເລັດການຕັ້ງຄ່າຂໍ້ຄວາມສຽງແບບສະເໝືອນ, ກະລຸນາຕິດຕໍ່ຝ່າຍບໍລິການລູກຄ້າທີ່ເບີ %1$s ແລ້ວແຈ້ງລະຫັດຂໍ້ຜິດພາດ 9998.</string>
+  <string name="vvm3_error_subscriber_unknown_title">ຂໍ້ຄວາມສຽງສະເໝືອນຖືກປິດການນຳໃຊ້ແລ້ວ</string>
+  <string name="vvm3_error_subscriber_unknown_message">ກະລຸນາຕິດຕໍ່ຝ່າຍບໍລິການລູກຄ້າທີ່ເບີ %1$s ເພື່ອເປີດໃຊ້ຂໍ້ຄວາມສຽງແບບພາບ.</string>
+  <string name="vvm3_error_imap_getquota_error_title">ມີບາງຢ່າງຜິດພາດເກີດຂຶ້ນ</string>
+  <string name="vvm3_error_imap_getquota_error_message">ກະລຸນາຕິດຕໍ່ຝ່າຍບໍລິການລູກຄ້າທີ່ເບີ %1$s ແລ້ວບອກລະຫັດຂໍ້ຜິດພາດວ່າແມ່ນ 9997.</string>
+  <string name="vvm3_error_imap_select_error_title">ມີບາງຢ່າງຜິດພາດເກີດຂຶ້ນ</string>
+  <string name="vvm3_error_imap_select_error_message">ກະລຸນາຕິດຕໍ່ຝ່າຍບໍລິການລູກຄ້າທີ່ເບີ %1$s ແລ້ວບອກລະຫັດຂໍ້ຜິດພາດວ່າແມ່ນ 9989.</string>
+  <string name="vvm3_error_imap_error_title">ມີບາງຢ່າງຜິດພາດເກີດຂຶ້ນ</string>
+  <string name="vvm3_error_imap_error_message">ກະລຸນາຕິດຕໍ່ຝ່າຍບໍລິການລູກຄ້າທີ່ເບີ %1$s ແລ້ວບອກລະຫັດຂໍ້ຜິດພາດວ່າແມ່ນ 9999.</string>
+  <string name="verizon_terms_and_conditions_title">ເປີດໃຊ້ຂໍ້ຄວາມສຽງສະເໝືອນ</string>
+  <string name="verizon_terms_and_conditions_message">%1$s ໂດຍການເປີດໃຊ້ຂໍ້ຄວາມສຽງສະເໝືອນ ແມ່ນຖືວ່າທ່ານຍອມຮັບຂໍ້ກຳນົດ ແລະ ເງື່ອນໄຂຂອງ Verizon Wireless:\n\n%2$s</string>
+  <string name="dialer_terms_and_conditions_title">ເປີດໃຊ້ຂໍ້ຄວາມສຽງສະເໝືອນ</string>
+  <string name="dialer_terms_and_conditions_existing_user_title">ໃໝ່! ອ່ານຂໍ້ຄວາມສຽງຂອງທ່ານ</string>
+  <string name="dialer_terms_and_conditions_message">%s</string>
+  <string name="dialer_terms_and_conditions_1.0">ເບິ່ງ ແລະ ຟັງຂໍ້ຄວາມຂອງທ່ານ, ໂດຍບໍ່ຕ້ອງໂທຫາເບີຂໍ້ຄວາມສຽງ. ການຖອດຂໍ້ຄວາມສຽງຂອງທ່ານແມ່ນສະໜອງໃຫ້ໂດຍບໍລິການຖອດຂໍ້ຄວາມຟຣີຂອງ Google. ທ່ານສາມາດປິດ ຫຼື ເປີດໄດ້ຕະຫຼອດເວລາໃນການຕັ້ງຄ່າ. %s</string>
+  <string name="dialer_terms_and_conditions_existing_user">ການຖອດຂໍ້ຄວາມສຽງຂອງທ່ານແມ່ນສະໜອງໃຫ້ໂດຍບໍລິການຖອດຂໍ້ຄວາມຟຣີຂອງ Google. ທ່ານສາມາດປິດຄຸນສົມບັດນີ້ໄດ້ຕະຫຼອດເວລາໃນການຕັ້ງຄ່າ. %s</string>
+  <string name="dialer_terms_and_conditions_for_verizon_1.0">ເບິ່ງ ແລະ ຟັງຂໍ້ຄວາມຂອງທ່ານໂດຍບໍ່ຕ້ອງໂທຫາເບີຂໍ້ຄວາມສຽງ.</string>
+  <string name="dialer_terms_and_conditions_learn_more">ສຶກສາເພີ່ມເຕີມ</string>
+  <string name="dialer_terms_and_conditions_existing_user_ack">ຕົກລົງ, ເຂົ້າໃຈແລ້ວ</string>
+  <string name="dialer_terms_and_conditions_existing_user_decline">ບໍ່, ຂອບໃຈ</string>
+  <string name="terms_and_conditions_decline_dialog_title">ປິດການນຳໃຊ້ຂໍ້ຄວາມສຽງສະເໝືອນບໍ?</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_message">ຂໍ້ຄວາມສຽງສະເໝືອນຈະຖືກປິດການນຳໃຊ້ຫາກປະຕິເສດຂໍ້ກຳນົດ ແລະ ເງື່ອນໄຂ</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_downgrade">ປິດນຳໃຊ້</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_message">ຂໍ້ຄວາມສຽງສະເໝືອນຈະຖືກປິດໄວ້ຫາກທ່ານປິດການນຳໃຊ້ມັນ.</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_downgrade">ປິດນຳໃຊ້</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message">ຂໍ້ຄວາມສຽງສາມາດເຂົ້າເຖິງໄດ້ສະເພາະການໂທຜ່ານ *86 ເທົ່ານັ້ນ. ຕັ້ງລະຫັດ PIN ຂໍ້ຄວາມສຽງໃໝ່ເພື່ອດຳເນີນການຕໍ່.</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin">ຕັ້ງລະຫັດ PIN</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/error/res/values-lt/strings.xml b/java/com/android/dialer/voicemail/listui/error/res/values-lt/strings.xml
new file mode 100644
index 0000000..5fc985c
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/error/res/values-lt/strings.xml
@@ -0,0 +1,102 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_error_activating_title">Suaktyvinamas vaizdinis balso paštas</string>
+  <string name="voicemail_error_activating_message">Kol vaizdinis balso paštas nebus visiškai suaktyvintas, galite negauti balso pašto pranešimų. Jei norite gauti naujus pranešimus, kol jis nėra visiškai suaktyvintas, paskambinkite į balso paštą.</string>
+  <string name="voicemail_error_not_activate_no_signal_title">Nepavyksta suaktyvinti vaizdinio balso pašto</string>
+  <string name="voicemail_error_not_activate_no_signal_message">Įsitikinkite, kad telefone veikia mobilusis ryšys, ir bandykite dar kartą.</string>
+  <string name="voicemail_error_not_activate_no_signal_airplane_mode_message">Išjunkite lėktuvo režimą ir bandykite dar kartą.</string>
+  <string name="voicemail_error_no_signal_title">Nėra jokio ryšio</string>
+  <string name="voicemail_error_no_signal_message">Jums nebus pranešta apie naujus balso pašto pranešimus. Jei esate prisijungę prie „Wi-Fi“, dabar įjungę sinchronizavimą galite patikrinti, ar yra balso pašto pranešimų.</string>
+  <string name="voicemail_error_no_signal_airplane_mode_message">Jums nebus pranešta apie naujus balso pašto pranešimus. Išjunkite lėktuvo režimą, kad galėtumėte sinchronizuoti balso pašto pranešimus.</string>
+  <string name="voicemail_error_no_signal_cellular_required_message">Kad galėtumėte patikrinti balso pašto pranešimus, telefone turi būti įjungti mobiliojo ryšio duomenys.</string>
+  <string name="voicemail_error_activation_failed_title">Nepavyksta suaktyvinti vaizdinio balso pašto</string>
+  <string name="voicemail_error_activation_failed_message">Vis tiek galite skambinti ir tikrinti balso pašto pranešimus.</string>
+  <string name="voicemail_error_no_data_title">Nepavyksta atnaujinti vaizdinio balso pašto</string>
+  <string name="voicemail_error_no_data_message">Bandykite dar kartą, kai „Wi-Fi“ arba mobiliųjų duomenų ryšys bus geresnis. Vis tiek galite paskambinti ir patikrinti balso pašto pranešimus.</string>
+  <string name="voicemail_error_no_data_cellular_required_message">Bandykite dar kartą, kai mobiliųjų duomenų ryšys bus geresnis. Vis tiek galite paskambinti ir patikrinti balso pašto pranešimus.</string>
+  <string name="voicemail_error_bad_config_title">Nepavyksta atnaujinti vaizdinio balso pašto</string>
+  <string name="voicemail_error_bad_config_message">Vis tiek galite skambinti ir tikrinti balso pašto pranešimus.</string>
+  <string name="voicemail_error_communication_title">Nepavyksta atnaujinti vaizdinio balso pašto</string>
+  <string name="voicemail_error_communication_message">Vis tiek galite skambinti ir tikrinti balso pašto pranešimus.</string>
+  <string name="voicemail_error_server_connection_title">Nepavyksta atnaujinti vaizdinio balso pašto</string>
+  <string name="voicemail_error_server_connection_message">Vis tiek galite skambinti ir tikrinti balso pašto pranešimus.</string>
+  <string name="voicemail_error_server_title">Nepavyksta atnaujinti vaizdinio balso pašto</string>
+  <string name="voicemail_error_server_message">Vis tiek galite skambinti ir tikrinti balso pašto pranešimus.</string>
+  <string name="voicemail_error_inbox_near_full_title">Gautųjų aplankas beveik pilnas</string>
+  <string name="voicemail_error_inbox_near_full_message">Negalėsite gauti naujų balso pašto pranešimų, jei gautuosiuose nebeliks laisvos vietos.</string>
+  <string name="voicemail_error_inbox_full_title">Nepavyksta gauti naujų balso pašto pranešimų</string>
+  <string name="voicemail_error_inbox_full_message">Gautuosiuose nebėra laisvos vietos. Kad galėtumėte gauti naujus balso pašto pranešimus, pabandykite ištrinti keletą pranešimų.</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_title">Įjunkite papildomos saugyklos vietos ir atsarginės kopijos kūrimo parinktį</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_message">Jūsų pašto dėžutė pilna. Jei norite atlaisvinti vietos, įjunkite papildomos saugyklos vietos parinktį, kad „Google“ galėtų tvarkyti balso pašto pranešimus ir kurti atsargines jų kopijas.</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_title">Įjunkite papildomos saugyklos vietos ir atsarginės kopijos kūrimo parinktį</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_message">Jūsų pašto dėžutė beveik pilna. Jei norite atlaisvinti vietos, įjunkite papildomos saugyklos vietos parinktį, kad „Google“ galėtų tvarkyti balso pašto pranešimus ir kurti atsargines jų kopijas.</string>
+  <string name="voicemail_error_pin_not_set_title">Nustatykite balso pašto PIN kodą</string>
+  <string name="voicemail_error_pin_not_set_message">Jums reikės balso pašto PIN kodo visada, kai skambinsite norėdami pasiekti balso paštą.</string>
+  <string name="voicemail_action_turn_off_airplane_mode">Lėktuvo režimo nustatymai</string>
+  <string name="voicemail_action_set_pin">Nustatyti PIN kodą</string>
+  <string name="voicemail_action_retry">Bandyti dar kartą</string>
+  <string name="voicemail_action_turn_archive_on">Įjungti</string>
+  <string name="voicemail_action_dimiss">Ne, ačiū</string>
+  <string name="voicemail_action_sync">Sinchronizuoti</string>
+  <string name="voicemail_action_call_voicemail">Skambinti į balso paštą</string>
+  <string name="voicemail_action_call_customer_support">Skambinti klientų palaikymo komandai</string>
+  <string name="vvm3_error_vms_dns_failure_title">Kažkas nepavyko</string>
+  <string name="vvm3_error_vms_dns_failure_message">Deja, kilo problema. Vėliau bandykite dar kartą. Jei problema išlieka, susisiekite su klientų aptarnavimo komanda numeriu %1$s ir pasakykite klaidos kodą 9001.</string>
+  <string name="vvm3_error_vmg_dns_failure_title">Kažkas nepavyko</string>
+  <string name="vvm3_error_vmg_dns_failure_message">Deja, kilo problema. Vėliau bandykite dar kartą. Jei problema išlieka, susisiekite su klientų aptarnavimo komanda numeriu %1$s ir pasakykite klaidos kodą 9002.</string>
+  <string name="vvm3_error_spg_dns_failure_title">Kažkas nepavyko</string>
+  <string name="vvm3_error_spg_dns_failure_message">Deja, kilo problema. Vėliau bandykite dar kartą. Jei problema išlieka, susisiekite su klientų aptarnavimo komanda numeriu %1$s ir pasakykite klaidos kodą 9003.</string>
+  <string name="vvm3_error_vms_no_cellular_title">Nepavyko prisijungti prie balso pašto dėžutės</string>
+  <string name="vvm3_error_vms_no_cellular_message">Deja, nepavyksta prisijungti prie balso pašto dėžutės. Jei esate vietoje, kur signalas yra silpnas, palaukite, kol jis bus stiprus, ir bandykite dar kartą. Jei problema išlieka, susisiekite su klientų aptarnavimo komanda %1$s ir pasakykite klaidos kodą 9004.</string>
+  <string name="vvm3_error_vmg_no_cellular_title">Nepavyko prisijungti prie balso pašto dėžutės</string>
+  <string name="vvm3_error_vmg_no_cellular_message">Deja, nepavyksta prisijungti prie balso pašto dėžutės. Jei esate vietoje, kur signalas yra silpnas, palaukite, kol jis bus stiprus, ir bandykite dar kartą. Jei problema išlieka, susisiekite su klientų aptarnavimo komanda numeriu %1$s ir pasakykite klaidos kodą 9005.</string>
+  <string name="vvm3_error_spg_no_cellular_title">Nepavyko prisijungti prie balso pašto dėžutės</string>
+  <string name="vvm3_error_spg_no_cellular_message">Deja, nepavyksta prisijungti prie balso pašto dėžutės. Jei esate vietoje, kur signalas yra silpnas, palaukite, kol jis bus stiprus, ir bandykite dar kartą. Jei problema išlieka, susisiekite su klientų aptarnavimo komanda numeriu %1$s ir pasakykite klaidos kodą 9006.</string>
+  <string name="vvm3_error_vms_timeout_title">Kažkas nepavyko</string>
+  <string name="vvm3_error_vms_timeout_message">Deja, kilo problema. Vėliau bandykite dar kartą. Jei problema išlieka, susisiekite su klientų aptarnavimo komanda numeriu %1$s ir pasakykite klaidos kodą 9007.</string>
+  <string name="vvm3_error_vmg_timeout_title">Kažkas nepavyko</string>
+  <string name="vvm3_error_vmg_timeout_message">Deja, kilo problema. Vėliau bandykite dar kartą. Jei problema išlieka, susisiekite su klientų aptarnavimo komanda numeriu %1$s ir pasakykite klaidos kodą 9008.</string>
+  <string name="vvm3_error_status_sms_timeout_title">Kažkas nepavyko</string>
+  <string name="vvm3_error_status_sms_timeout_message">Deja, nepavyksta nustatyti paslaugos. Vėliau bandykite dar kartą. Jei problema išlieka, susisiekite su klientų aptarnavimo komanda numeriu %1$s ir pasakykite klaidos kodą 9009.</string>
+  <string name="vvm3_error_subscriber_blocked_title">Nepavyko prisijungti prie balso pašto dėžutės</string>
+  <string name="vvm3_error_subscriber_blocked_message">Deja, šiuo metu nepavyksta prisijungti prie jūsų balso pašto dėžutės. Vėliau bandykite dar kartą. Jei problema išlieka, susisiekite su klientų aptarnavimo komanda numeriu %1$s ir pasakykite klaidos kodą 9990.</string>
+  <string name="vvm3_error_unknown_user_title">Nustatyti balso paštą</string>
+  <string name="vvm3_error_unknown_user_message">Nenustatytas jūsų paskyros balso paštas. Susisiekite su klientų aptarnavimo komanda numeriu %1$s ir pasakykite klaidos kodą 9991.</string>
+  <string name="vvm3_error_unknown_device_title">Balso paštas</string>
+  <string name="vvm3_error_unknown_device_message">Šiame įrenginyje negalima naudoti vaizdinio balso pašto. Susisiekite su klientų aptarnavimo komanda numeriu %1$s ir pasakykite klaidos kodą 9992.</string>
+  <string name="vvm3_error_invalid_password_title">Kažkas nepavyko</string>
+  <string name="vvm3_error_invalid_password_message">Susisiekite su klientų aptarnavimo komanda numeriu %1$s ir pasakykite klaidos kodą 9993.</string>
+  <string name="vvm3_error_mailbox_not_initialized_title">Vaizdinis balso paštas</string>
+  <string name="vvm3_error_mailbox_not_initialized_message">Norėdami užbaigti vaizdinio balso pašto sąranką, susisiekite su klientų aptarnavimo komanda numeriu %1$s ir pasakykite klaidos kodą 9994.</string>
+  <string name="vvm3_error_service_not_provisioned_title">Vaizdinis balso paštas</string>
+  <string name="vvm3_error_service_not_provisioned_message">Norėdami užbaigti vaizdinio balso pašto sąranką, susisiekite su klientų aptarnavimo komanda numeriu %1$s ir pasakykite klaidos kodą 9995.</string>
+  <string name="vvm3_error_service_not_activated_title">Vaizdinis balso paštas</string>
+  <string name="vvm3_error_service_not_activated_message">Norėdami suaktyvinti vaizdinį balso paštą, susisiekite su klientų aptarnavimo komanda numeriu %1$s ir pasakykite klaidos kodą 9996.</string>
+  <string name="vvm3_error_user_blocked_title">Kažkas nepavyko</string>
+  <string name="vvm3_error_user_blocked_message">Norėdami užbaigti vaizdinio balso pašto sąranką, susisiekite su klientų aptarnavimo komanda numeriu %1$s ir pasakykite klaidos kodą 9998.</string>
+  <string name="vvm3_error_subscriber_unknown_title">Vaizdinis balso paštas išjungtas</string>
+  <string name="vvm3_error_subscriber_unknown_message">Norėdami suaktyvinti vaizdinį balso paštą, susisiekite su klientų aptarnavimo komanda numeriu %1$s.</string>
+  <string name="vvm3_error_imap_getquota_error_title">Kažkas nepavyko</string>
+  <string name="vvm3_error_imap_getquota_error_message">Susisiekite su klientų aptarnavimo komanda numeriu %1$s ir pasakykite klaidos kodą 9997.</string>
+  <string name="vvm3_error_imap_select_error_title">Kažkas nepavyko</string>
+  <string name="vvm3_error_imap_select_error_message">Susisiekite su klientų aptarnavimo komanda numeriu %1$s ir pasakykite klaidos kodą 9989.</string>
+  <string name="vvm3_error_imap_error_title">Kažkas nepavyko</string>
+  <string name="vvm3_error_imap_error_message">Susisiekite su klientų aptarnavimo komanda numeriu %1$s ir pasakykite klaidos kodą 9999.</string>
+  <string name="verizon_terms_and_conditions_title">Vaizdinio balso pašto įjungimas</string>
+  <string name="verizon_terms_and_conditions_message">%1$s Įjungdami vaizdinį balso paštą sutinkate su „Verizon Wireless“ taisyklėmis ir nuostatomis:\n\n%2$s</string>
+  <string name="dialer_terms_and_conditions_title">Vaizdinio balso pašto įjungimas</string>
+  <string name="dialer_terms_and_conditions_existing_user_title">Naujiena! Skaitykite balso paštą</string>
+  <string name="dialer_terms_and_conditions_message">%s</string>
+  <string name="dialer_terms_and_conditions_1.0">Peržiūrėkite ir klausykite pranešimų neskambindami balso pašto paslaugos numeriu. Balso pašto pranešimų nuorašus teikia „Google“ nemokama transkribavimo paslauga. Tą ar kitą nustatymą galite bet kuriuo metu išjungti skiltyje „Nustatymai“. %s</string>
+  <string name="dialer_terms_and_conditions_existing_user">Balso pašto pranešimų nuorašus dabar teikia „Google“ nemokama transkribavimo paslauga. Šį nustatymą galite bet kuriuo metu išjungti skiltyje „Nustatymai“. %s</string>
+  <string name="dialer_terms_and_conditions_for_verizon_1.0">Peržiūrėkite ir klausykite pranešimų neskambindami balso pašto paslaugos numeriu.</string>
+  <string name="dialer_terms_and_conditions_learn_more">Sužinoti daugiau</string>
+  <string name="dialer_terms_and_conditions_existing_user_ack">Gerai, supratau</string>
+  <string name="dialer_terms_and_conditions_existing_user_decline">Ne, ačiū</string>
+  <string name="terms_and_conditions_decline_dialog_title">Išjungti vaizdinį balso paštą?</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_message">Atmetus taisykles ir nuostatas, vaizdinis balso paštas bus išjungtas.</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_downgrade">Išjungti</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_message">Jei išjungsite vaizdinį balso paštą, jis bus išjungtas.</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_downgrade">Išjungti</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message">Balso paštas bus pasiekiamas tik paskambinus numeriu *86. Nustatykite naują balso pašto PIN kodą, kad galėtumėte tęsti.</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin">PIN kodo nustatymas</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/error/res/values-lv/strings.xml b/java/com/android/dialer/voicemail/listui/error/res/values-lv/strings.xml
new file mode 100644
index 0000000..d899114
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/error/res/values-lv/strings.xml
@@ -0,0 +1,102 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_error_activating_title">Vizuālā balss pasta aktivizēšana</string>
+  <string name="voicemail_error_activating_message">Kamēr vizuālais balss pasts nebūs pilnībā aktivizēts, iespējams, nesaņemsiet balss pasta paziņojumus. Lai izgūtu jaunus ziņojumus, kamēr balss pasts nav pilnībā aktivizēts, zvaniet balss pastam.</string>
+  <string name="voicemail_error_not_activate_no_signal_title">Nevar aktivizēt vizuālo balss pastu</string>
+  <string name="voicemail_error_not_activate_no_signal_message">Pārbaudiet, vai tālrunim ir mobilo datu savienojums, un mēģiniet vēlreiz.</string>
+  <string name="voicemail_error_not_activate_no_signal_airplane_mode_message">Izslēdziet lidojuma režīmu un mēģiniet vēlreiz.</string>
+  <string name="voicemail_error_no_signal_title">Nav savienojuma</string>
+  <string name="voicemail_error_no_signal_message">Jums netiks paziņots par jauniem balss pasta ziņojumiem. Ja ir izveidots Wi-Fi savienojums, varat pārbaudīt balss pastu, tagad veicot sinhronizāciju.</string>
+  <string name="voicemail_error_no_signal_airplane_mode_message">Jums netiks paziņots par jauniem balss pasta ziņojumiem. Lai sinhronizētu balss pastu, izslēdziet lidojuma režīmu.</string>
+  <string name="voicemail_error_no_signal_cellular_required_message">Lai pārbaudītu balss pastu, tālrunim ir nepieciešams mobilo datu savienojums.</string>
+  <string name="voicemail_error_activation_failed_title">Nevar aktivizēt vizuālo balss pastu</string>
+  <string name="voicemail_error_activation_failed_message">Joprojām varat piezvanīt, lai pārbaudītu balss pastu.</string>
+  <string name="voicemail_error_no_data_title">Nevar atjaunināt vizuālo balss pastu</string>
+  <string name="voicemail_error_no_data_message">Mēģiniet vēlreiz, kad būs spēcīgāks Wi-Fi vai mobilo datu savienojuma signāls. Joprojām varat piezvanīt, lai pārbaudītu balss pastu.</string>
+  <string name="voicemail_error_no_data_cellular_required_message">Mēģiniet vēlreiz, kad būs spēcīgāks mobilo datu savienojuma signāls. Joprojām varat piezvanīt, lai pārbaudītu balss pastu.</string>
+  <string name="voicemail_error_bad_config_title">Nevar atjaunināt vizuālo balss pastu</string>
+  <string name="voicemail_error_bad_config_message">Joprojām varat piezvanīt, lai pārbaudītu balss pastu.</string>
+  <string name="voicemail_error_communication_title">Nevar atjaunināt vizuālo balss pastu</string>
+  <string name="voicemail_error_communication_message">Joprojām varat piezvanīt, lai pārbaudītu balss pastu.</string>
+  <string name="voicemail_error_server_connection_title">Nevar atjaunināt vizuālo balss pastu</string>
+  <string name="voicemail_error_server_connection_message">Joprojām varat piezvanīt, lai pārbaudītu balss pastu.</string>
+  <string name="voicemail_error_server_title">Nevar atjaunināt vizuālo balss pastu</string>
+  <string name="voicemail_error_server_message">Joprojām varat piezvanīt, lai pārbaudītu balss pastu.</string>
+  <string name="voicemail_error_inbox_near_full_title">Iesūtne ir gandrīz pilna</string>
+  <string name="voicemail_error_inbox_near_full_message">Jūs nevarēsiet saņemt jaunus balss pasta ziņojumus, ja iesūtne ir pilna.</string>
+  <string name="voicemail_error_inbox_full_title">Nevar saņemt jaunus balss pasta ziņojumus</string>
+  <string name="voicemail_error_inbox_full_message">Iesūtne ir pilna. Izdzēsiet dažus ziņojumus, lai saņemtu jaunus balss pasta ziņojumus.</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_title">Papildu krātuves un dublēšanas aktivizēšana</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_message">Jūsu pastkaste ir pilna. Lai atbrīvotu vietu un Google varētu pārvaldīt un dublēt jūsu balss pasta ziņojumus, aktivizējiet papildu krātuvi.</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_title">Papildu krātuves un dublēšanas aktivizēšana</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_message">Jūsu pastkaste ir gandrīz pilna. Lai atbrīvotu vietu un Google varētu pārvaldīt un dublēt jūsu balss pasta ziņojumus, aktivizējiet papildu krātuvi.</string>
+  <string name="voicemail_error_pin_not_set_title">Balss pasta PIN iestatīšana</string>
+  <string name="voicemail_error_pin_not_set_message">Lai piekļūtu balss pastam zvanot, būs vajadzīgs balss pasta PIN.</string>
+  <string name="voicemail_action_turn_off_airplane_mode">Lidojuma režīma iestatījumi</string>
+  <string name="voicemail_action_set_pin">Iestatīt PIN</string>
+  <string name="voicemail_action_retry">Mēģināt vēlreiz</string>
+  <string name="voicemail_action_turn_archive_on">Ieslēgt</string>
+  <string name="voicemail_action_dimiss">Nē, paldies</string>
+  <string name="voicemail_action_sync">Sinhronizēt</string>
+  <string name="voicemail_action_call_voicemail">Zvanīt balss pastam</string>
+  <string name="voicemail_action_call_customer_support">Zvanīt klientu atbalsta dienestam</string>
+  <string name="vvm3_error_vms_dns_failure_title">Radās problēma</string>
+  <string name="vvm3_error_vms_dns_failure_message">Diemžēl radās problēma. Lūdzu, vēlāk mēģiniet vēlreiz. Ja problēma joprojām pastāv, sazinieties ar klientu apkalpošanas dienestu, izmantojot tālruņa numuru %1$s, un nosauciet kļūdas kodu “9001”.</string>
+  <string name="vvm3_error_vmg_dns_failure_title">Radās problēma</string>
+  <string name="vvm3_error_vmg_dns_failure_message">Diemžēl radās problēma. Lūdzu, vēlāk mēģiniet vēlreiz. Ja problēma joprojām pastāv, sazinieties ar klientu apkalpošanas dienestu, izmantojot tālruņa numuru %1$s, un nosauciet kļūdas kodu “9002”.</string>
+  <string name="vvm3_error_spg_dns_failure_title">Radās problēma</string>
+  <string name="vvm3_error_spg_dns_failure_message">Diemžēl radās problēma. Lūdzu, vēlāk mēģiniet vēlreiz. Ja problēma joprojām pastāv, sazinieties ar klientu apkalpošanas dienestu, izmantojot tālruņa numuru %1$s, un nosauciet kļūdas kodu “9003”.</string>
+  <string name="vvm3_error_vms_no_cellular_title">Nevar izveidot savienojumu ar jūsu balss pastkasti</string>
+  <string name="vvm3_error_vms_no_cellular_message">Diemžēl mums neizdodas izveidot savienojumu ar jūsu balss pastkasti. Ja atrodaties vietā, kur ir vājš signāls, gaidiet, līdz ir pieejams stiprs signāls, un mēģiniet vēlreiz. Ja problēma joprojām pastāv, sazinieties ar klientu apkalpošanas dienestu, izmantojot tālruņa numuru %1$s, un nosauciet kļūdas kodu “9004”.</string>
+  <string name="vvm3_error_vmg_no_cellular_title">Nevar izveidot savienojumu ar jūsu balss pastkasti</string>
+  <string name="vvm3_error_vmg_no_cellular_message">Diemžēl mums neizdodas izveidot savienojumu ar jūsu balss pastkasti. Ja atrodaties vietā, kur ir vājš signāls, gaidiet, līdz ir pieejams stiprs signāls, un mēģiniet vēlreiz. Ja problēma joprojām pastāv, sazinieties ar klientu apkalpošanas dienestu, izmantojot tālruņa numuru %1$s, un nosauciet kļūdas kodu “9005”.</string>
+  <string name="vvm3_error_spg_no_cellular_title">Nevar izveidot savienojumu ar jūsu balss pastkasti</string>
+  <string name="vvm3_error_spg_no_cellular_message">Diemžēl mums neizdodas izveidot savienojumu ar jūsu balss pastkasti. Ja atrodaties vietā, kur ir vājš signāls, gaidiet, līdz ir pieejams stiprs signāls, un mēģiniet vēlreiz. Ja problēma joprojām pastāv, sazinieties ar klientu apkalpošanas dienestu, izmantojot tālruņa numuru %1$s, un nosauciet kļūdas kodu “9006”.</string>
+  <string name="vvm3_error_vms_timeout_title">Radās problēma</string>
+  <string name="vvm3_error_vms_timeout_message">Diemžēl radās problēma. Lūdzu, vēlāk mēģiniet vēlreiz. Ja problēma joprojām pastāv, sazinieties ar klientu apkalpošanas dienestu, izmantojot tālruņa numuru %1$s, un nosauciet kļūdas kodu “9007”.</string>
+  <string name="vvm3_error_vmg_timeout_title">Radās problēma</string>
+  <string name="vvm3_error_vmg_timeout_message">Diemžēl radās problēma. Lūdzu, vēlāk mēģiniet vēlreiz. Ja problēma joprojām pastāv, sazinieties ar klientu apkalpošanas dienestu, izmantojot tālruņa numuru %1$s, un nosauciet kļūdas kodu “9008”.</string>
+  <string name="vvm3_error_status_sms_timeout_title">Radās problēma</string>
+  <string name="vvm3_error_status_sms_timeout_message">Diemžēl mums neizdodas iestatīt jūsu pakalpojumu. Lūdzu, vēlāk mēģiniet vēlreiz. Ja problēma joprojām pastāv, sazinieties ar klientu apkalpošanas dienestu, izmantojot tālruņa numuru %1$s, un nosauciet kļūdas kodu “9009”.</string>
+  <string name="vvm3_error_subscriber_blocked_title">Nevar izveidot savienojumu ar jūsu balss pastkasti</string>
+  <string name="vvm3_error_subscriber_blocked_message">Diemžēl pašlaik nevaram izveidot savienojumu ar jūsu balss pastkasti. Lūdzu, vēlāk mēģiniet vēlreiz. Ja problēma joprojām pastāv, sazinieties ar klientu apkalpošanas dienestu, izmantojot tālruņa numuru %1$s, un nosauciet kļūdas kodu “9990”.</string>
+  <string name="vvm3_error_unknown_user_title">Balss pasta iestatīšana</string>
+  <string name="vvm3_error_unknown_user_message">Jūsu kontā nav iestatīts balss pasts. Lūdzu, sazinieties ar klientu apkalpošanas dienestu, izmantojot tālruņa numuru %1$s, un nosauciet kļūdas kodu “9991”.</string>
+  <string name="vvm3_error_unknown_device_title">Balss pasts</string>
+  <string name="vvm3_error_unknown_device_message">Šajā ierīcē nevar izmantot vizuālo balss pastu. Lūdzu, sazinieties ar klientu apkalpošanas dienestu, izmantojot tālruņa numuru %1$s, un nosauciet kļūdas kodu “9992”.</string>
+  <string name="vvm3_error_invalid_password_title">Radās problēma</string>
+  <string name="vvm3_error_invalid_password_message">Lūdzu, sazinieties ar klientu apkalpošanas dienestu, izmantojot tālruņa numuru %1$s, un nosauciet kļūdas kodu “9993”.</string>
+  <string name="vvm3_error_mailbox_not_initialized_title">Vizuālais balss pasts</string>
+  <string name="vvm3_error_mailbox_not_initialized_message">Lai pabeigtu vizuālā balss pasta iestatīšanu, lūdzu, sazinieties ar klientu apkalpošanas dienestu, izmantojot tālruņa numuru %1$s, un nosauciet kļūdas kodu “9994”.</string>
+  <string name="vvm3_error_service_not_provisioned_title">Vizuālais balss pasts</string>
+  <string name="vvm3_error_service_not_provisioned_message">Lai pabeigtu vizuālā balss pasta iestatīšanu, lūdzu, sazinieties ar klientu apkalpošanas dienestu, izmantojot tālruņa numuru %1$s, un nosauciet kļūdas kodu “9995”.</string>
+  <string name="vvm3_error_service_not_activated_title">Vizuālais balss pasts</string>
+  <string name="vvm3_error_service_not_activated_message">Lai aktivizētu vizuālo balss pastu, lūdzu, sazinieties ar klientu apkalpošanas dienestu, izmantojot tālruņa numuru %1$s, un nosauciet kļūdas kodu “9996”.</string>
+  <string name="vvm3_error_user_blocked_title">Radās problēma</string>
+  <string name="vvm3_error_user_blocked_message">Lai pabeigtu vizuālā balss pasta iestatīšanu, lūdzu, sazinieties ar klientu apkalpošanas dienestu, izmantojot tālruņa numuru %1$s, un nosauciet kļūdas kodu “9998”.</string>
+  <string name="vvm3_error_subscriber_unknown_title">Vizuālais balss pasts ir atspējots</string>
+  <string name="vvm3_error_subscriber_unknown_message">Lai aktivizētu vizuālo balss pastu, lūdzu, sazinieties ar klientu apkalpošanas dienestu, izmantojot tālruņa numuru %1$s.</string>
+  <string name="vvm3_error_imap_getquota_error_title">Radās problēma</string>
+  <string name="vvm3_error_imap_getquota_error_message">Lūdzu, sazinieties ar klientu apkalpošanas dienestu, izmantojot tālruņa numuru %1$s, un nosauciet kļūdas kodu “9997”.</string>
+  <string name="vvm3_error_imap_select_error_title">Radās problēma</string>
+  <string name="vvm3_error_imap_select_error_message">Lūdzu, sazinieties ar klientu apkalpošanas dienestu, izmantojot tālruņa numuru %1$s, un nosauciet kļūdas kodu “9989”.</string>
+  <string name="vvm3_error_imap_error_title">Radās problēma</string>
+  <string name="vvm3_error_imap_error_message">Lūdzu, sazinieties ar klientu apkalpošanas dienestu, izmantojot tālruņa numuru %1$s, un nosauciet kļūdas kodu “9999”.</string>
+  <string name="verizon_terms_and_conditions_title">Vizuālā balss pasta ieslēgšana</string>
+  <string name="verizon_terms_and_conditions_message">%1$s Ieslēdzot vizuālo balss pastu, jūs piekrītat Verizon Wireless pakalpojumu sniegšanas noteikumiem:\n\n%2$s</string>
+  <string name="dialer_terms_and_conditions_title">Vizuālā balss pasta ieslēgšana</string>
+  <string name="dialer_terms_and_conditions_existing_user_title">Jaunums! Balss pasta lasīšana</string>
+  <string name="dialer_terms_and_conditions_message">%s</string>
+  <string name="dialer_terms_and_conditions_1.0">Skatiet un klausieties savus ziņojumus, nezvanot uz balss pastu. Balss pasta ziņojumu transkripciju nodrošina Google bezmaksas transkripcijas pakalpojums. Iestatījumos varat jebkurā brīdī izslēgt šo funkciju. %s</string>
+  <string name="dialer_terms_and_conditions_existing_user">Tagad balss pasta ziņojumu transkripciju nodrošina Google bezmaksas transkripcijas pakalpojums. Iestatījumos varat jebkurā brīdī izslēgt šo funkciju. %s</string>
+  <string name="dialer_terms_and_conditions_for_verizon_1.0">Skatiet un klausieties savus ziņojumus, nezvanot uz balss pastu.</string>
+  <string name="dialer_terms_and_conditions_learn_more">Uzzināt vairāk</string>
+  <string name="dialer_terms_and_conditions_existing_user_ack">Labi</string>
+  <string name="dialer_terms_and_conditions_existing_user_decline">Nē, paldies</string>
+  <string name="terms_and_conditions_decline_dialog_title">Vai atspējot vizuālo balss pastu?</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_message">Ja tiks noraidīti pakalpojumu sniegšanas noteikumi, vizuālais balss pasts tiks atspējots.</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_downgrade">Atspējot</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_message">Ja izslēgsiet vizuālo balss pastu, vizuālais balss pasts tiks atspējots.</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_downgrade">Atspējot</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message">Balss pasts būs pieejams, tikai zvanot uz numuru *86. Lai turpinātu, iestatiet jaunu balss pasta PIN.</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin">PIN iestatīšana</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/error/res/values-mk/strings.xml b/java/com/android/dialer/voicemail/listui/error/res/values-mk/strings.xml
new file mode 100644
index 0000000..0ca3e5f
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/error/res/values-mk/strings.xml
@@ -0,0 +1,102 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_error_activating_title">Се активира визуелна говорна пошта</string>
+  <string name="voicemail_error_activating_message">Може да не добивате известувања за говорна пошта сѐ додека говорната пошта не се активира во целост. Дотогаш, повикувајте ја говорната пошта за преслушување на новите пораки.</string>
+  <string name="voicemail_error_not_activate_no_signal_title">Не може да се активира визуелна говорна пошта</string>
+  <string name="voicemail_error_not_activate_no_signal_message">Проверете дали телефонот е поврзан на мобилна мрежа и обидете се повторно.</string>
+  <string name="voicemail_error_not_activate_no_signal_airplane_mode_message">Исклучете го авионскиот режим и обидете се повторно.</string>
+  <string name="voicemail_error_no_signal_title">Нема мрежа</string>
+  <string name="voicemail_error_no_signal_message">Нема да добивате известувања за нови говорни пораки. Ако сте поврзани на Wi-Fi, може да ја проверите говорната пошта со синхронизирање сега.</string>
+  <string name="voicemail_error_no_signal_airplane_mode_message">Нема да добивате известувања за нови говорни пораки. Исклучете го авионскиот режим за синхронизирање на говорната пошта.</string>
+  <string name="voicemail_error_no_signal_cellular_required_message">За проверување говорна пошта, телефонот треба да се поврзе на мобилен интернет.</string>
+  <string name="voicemail_error_activation_failed_title">Не може да се активира визуелна говорна пошта</string>
+  <string name="voicemail_error_activation_failed_message">Сѐ уште може да повикате за да ја проверите говорната пошта.</string>
+  <string name="voicemail_error_no_data_title">Не може да се ажурира визуелната говорна пошта</string>
+  <string name="voicemail_error_no_data_message">Обидете се повторно кога Wi-Fi-мрежата или мобилниот интернет ќе се подобрат. Сѐ уште може да повикате за да ја проверите говорната пошта.</string>
+  <string name="voicemail_error_no_data_cellular_required_message">Обидете се повторно кога ќе се подобри мобилниот интернет. Сѐ уште може да повикате за да ја проверите говорната пошта.</string>
+  <string name="voicemail_error_bad_config_title">Не може да се ажурира визуелната говорна пошта</string>
+  <string name="voicemail_error_bad_config_message">Сѐ уште може да повикате за да ја проверите говорната пошта.</string>
+  <string name="voicemail_error_communication_title">Не може да се ажурира визуелната говорна пошта</string>
+  <string name="voicemail_error_communication_message">Сѐ уште може да повикате за да ја проверите говорната пошта.</string>
+  <string name="voicemail_error_server_connection_title">Не може да се ажурира визуелната говорна пошта</string>
+  <string name="voicemail_error_server_connection_message">Сѐ уште може да повикате за да ја проверите говорната пошта.</string>
+  <string name="voicemail_error_server_title">Не може да се ажурира визуелната говорна пошта</string>
+  <string name="voicemail_error_server_message">Сѐ уште може да повикате за да ја проверите говорната пошта.</string>
+  <string name="voicemail_error_inbox_near_full_title">Приемното сандаче е речиси полно</string>
+  <string name="voicemail_error_inbox_near_full_message">Нема да може да добивате нова говорна пошта ако вашето приемно сандаче е полно.</string>
+  <string name="voicemail_error_inbox_full_title">Не може да добивате нова говорна пошта</string>
+  <string name="voicemail_error_inbox_full_message">Вашето приемно сандаче е полно. Обидете се да избришете неколку пораки за да добиете нова говорна пошта.</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_title">Вклучете дополнителен простор и бекап</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_message">Вашето поштенско сандаче е полно. За да ослободите простор, вклучете дополнителен простор за да може Google да управува и да прави бекап на пораките од вашата говорна пошта.</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_title">Вклучете дополнителен простор и бекап</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_message">Вашето поштенско сандаче е речиси полно. За да ослободите простор, вклучете дополнителен простор за да може Google да управува и да прави бекап на пораките од вашата говорна пошта.</string>
+  <string name="voicemail_error_pin_not_set_title">Поставете PIN за говорната пошта</string>
+  <string name="voicemail_error_pin_not_set_message">Секогаш кога ќе повикате за да пристапите до говорната пошта, ќе треба да внесете PIN за говорна пошта.</string>
+  <string name="voicemail_action_turn_off_airplane_mode">Поставки за авионски режим</string>
+  <string name="voicemail_action_set_pin">Поставете PIN</string>
+  <string name="voicemail_action_retry">Обидете се повторно</string>
+  <string name="voicemail_action_turn_archive_on">Вклучете</string>
+  <string name="voicemail_action_dimiss">Не, фала</string>
+  <string name="voicemail_action_sync">Синхронизирајте</string>
+  <string name="voicemail_action_call_voicemail">Повикајте ја говорната пошта</string>
+  <string name="voicemail_action_call_customer_support">Повикајте ја Поддршката на корисници</string>
+  <string name="vvm3_error_vms_dns_failure_title">Нешто тргна наопаку</string>
+  <string name="vvm3_error_vms_dns_failure_message">За жал, наидовме на проблем. Обидете се повторно подоцна. Ако и понатаму постои проблем, контактирајте со Грижа за корисници на %1$s и кажете им дека кодот за грешка е 9001.</string>
+  <string name="vvm3_error_vmg_dns_failure_title">Нешто тргна наопаку</string>
+  <string name="vvm3_error_vmg_dns_failure_message">За жал, наидовме на проблем. Обидете се повторно подоцна. Ако и понатаму постои проблем, контактирајте со Грижа за корисници на %1$s и кажете им дека кодот за грешка е 9002.</string>
+  <string name="vvm3_error_spg_dns_failure_title">Нешто тргна наопаку</string>
+  <string name="vvm3_error_spg_dns_failure_message">За жал, наидовме на проблем. Обидете се повторно подоцна. Ако и понатаму постои проблем, контактирајте со Грижа за корисници на %1$s и кажете им дека кодот за грешка е 9003.</string>
+  <string name="vvm3_error_vms_no_cellular_title">Не може да се поврзе со вашето сандаче за говорна пошта</string>
+  <string name="vvm3_error_vms_no_cellular_message">За жал, имаме проблем при поврзување со вашето сандаче за говорна пошта. Ако сте во област со слаб сигнал, почекајте додека да добиете јак сигнал и обидете се повторно. Ако и понатаму постои проблем, контактирајте со Грижа за корисници на %1$s и кажете им дека кодот за грешка е 9004.</string>
+  <string name="vvm3_error_vmg_no_cellular_title">Не може да се поврзе со вашето сандаче за говорна пошта</string>
+  <string name="vvm3_error_vmg_no_cellular_message">За жал, имаме проблем при поврзување со вашето сандаче за говорна пошта. Ако сте во област со слаб сигнал, почекајте додека да добиете јак сигнал и обидете се повторно. Ако и понатаму постои проблем, контактирајте со Грижа за корисници на %1$s и кажете им дека кодот за грешка е 9005.</string>
+  <string name="vvm3_error_spg_no_cellular_title">Не може да се поврзе со вашето сандаче за говорна пошта</string>
+  <string name="vvm3_error_spg_no_cellular_message">За жал, имаме проблем при поврзување со вашето сандаче за говорна пошта. Ако сте во област со слаб сигнал, почекајте додека да добиете јак сигнал и обидете се повторно. Ако и понатаму постои проблем, контактирајте со Грижа за корисници на %1$s и кажете им дека кодот за грешка е 9006.</string>
+  <string name="vvm3_error_vms_timeout_title">Нешто тргна наопаку</string>
+  <string name="vvm3_error_vms_timeout_message">За жал, наидовме на проблем. Обидете се повторно подоцна. Ако и понатаму постои проблем, контактирајте со Грижа за корисници на %1$s и кажете им дека кодот за грешка е 9007.</string>
+  <string name="vvm3_error_vmg_timeout_title">Нешто тргна наопаку</string>
+  <string name="vvm3_error_vmg_timeout_message">За жал, наидовме на проблем. Обидете се повторно подоцна. Ако и понатаму постои проблем, контактирајте со Грижа за корисници на %1$s и кажете им дека кодот за грешка е 9008.</string>
+  <string name="vvm3_error_status_sms_timeout_title">Нешто тргна наопаку</string>
+  <string name="vvm3_error_status_sms_timeout_message">За жал, имаме проблем при поставување на вашата услуга. Обидете се повторно подоцна. Ако и понатаму постои проблем, контактирајте со Грижа за корисници на %1$s и кажете им дека кодот за грешка е 9009.</string>
+  <string name="vvm3_error_subscriber_blocked_title">Не може да се поврзе со вашето сандаче за говорна пошта</string>
+  <string name="vvm3_error_subscriber_blocked_message">За жал, не сме во можност да се поврземе со вашето сандаче за говорна пошта во моментов. Обидете се повторно подоцна. Ако и понатаму постои проблем, контактирајте со Грижа за корисници на %1$s и кажете им дека кодот за грешка е 9990.</string>
+  <string name="vvm3_error_unknown_user_title">Поставете говорна пошта</string>
+  <string name="vvm3_error_unknown_user_message">Говорната пошта не е поставена на вашата сметка. Контактирајте со Грижа за корисници на %1$s и кажете им дека кодот за грешка е 9991.</string>
+  <string name="vvm3_error_unknown_device_title">Говорна пошта</string>
+  <string name="vvm3_error_unknown_device_message">На уредов не може да се користи визуелна говорна пошта. Контактирајте со Грижа за корисници на %1$s и кажете им дека кодот за грешка е 9992.</string>
+  <string name="vvm3_error_invalid_password_title">Нешто тргна наопаку</string>
+  <string name="vvm3_error_invalid_password_message">Контактирајте со Грижа за корисници на %1$s и кажете им дека кодот за грешка е 9993.</string>
+  <string name="vvm3_error_mailbox_not_initialized_title">Визуелна говорна пошта</string>
+  <string name="vvm3_error_mailbox_not_initialized_message">За да го завршите поставувањето на визуелната говорна пошта, контактирајте со Грижа за корисници на %1$s и кажете им дека кодот за грешка е 9994.</string>
+  <string name="vvm3_error_service_not_provisioned_title">Визуелна говорна пошта</string>
+  <string name="vvm3_error_service_not_provisioned_message">За да го завршите поставувањето на визуелната говорна пошта, контактирајте со Грижа за корисници на %1$s и кажете им дека кодот за грешка е 9995.</string>
+  <string name="vvm3_error_service_not_activated_title">Визуелна говорна пошта</string>
+  <string name="vvm3_error_service_not_activated_message">За да ја активирате визуелната говорна пошта, контактирајте со Грижа за корисници на %1$s и кажете им дека кодот за грешка е 9996.</string>
+  <string name="vvm3_error_user_blocked_title">Нешто тргна наопаку</string>
+  <string name="vvm3_error_user_blocked_message">За да го завршите поставувањето на визуелната говорна пошта, контактирајте со Грижа за корисници на %1$s и кажете им дека кодот за грешка е 9998.</string>
+  <string name="vvm3_error_subscriber_unknown_title">Визуелната говорна пошта е оневозможена</string>
+  <string name="vvm3_error_subscriber_unknown_message">Контактирајте со Грижа за корисници на %1$s за активирање на визуелната говорна пошта.</string>
+  <string name="vvm3_error_imap_getquota_error_title">Нешто тргна наопаку</string>
+  <string name="vvm3_error_imap_getquota_error_message">Контактирајте со Грижа за корисници на %1$s и кажете им дека кодот за грешка е 9997.</string>
+  <string name="vvm3_error_imap_select_error_title">Нешто тргна наопаку</string>
+  <string name="vvm3_error_imap_select_error_message">Контактирајте со Грижа за корисници на %1$s и кажете им дека кодот за грешка е 9989.</string>
+  <string name="vvm3_error_imap_error_title">Нешто тргна наопаку</string>
+  <string name="vvm3_error_imap_error_message">Контактирајте со Грижа за корисници на %1$s и кажете им дека кодот за грешка е 9999.</string>
+  <string name="verizon_terms_and_conditions_title">Вклучете визуелна говорна пошта</string>
+  <string name="verizon_terms_and_conditions_message">%1$s Ако вклучите визуелна говорна пошта, се согласувате со Правилата и условите на Verizon Wireless:\n\n%2$s</string>
+  <string name="dialer_terms_and_conditions_title">Вклучете визуелна говорна пошта</string>
+  <string name="dialer_terms_and_conditions_existing_user_title">Ново! Читајте ја вашата говорна пошта</string>
+  <string name="dialer_terms_and_conditions_message">%s</string>
+  <string name="dialer_terms_and_conditions_1.0">Гледајте и слушајте ги вашите пораки без да треба да ја повикате говорната пошта. Бесплатната услуга за транскрипција на Google обезбедува преписи од вашата говорна пошта. Може да ја исклучите во „Поставки“ во секое време. %s</string>
+  <string name="dialer_terms_and_conditions_existing_user">Бесплатната услуга за транскрипција на Google обезбедува преписи од вашата говорна пошта. Тоа може да го исклучите во секое време. %s</string>
+  <string name="dialer_terms_and_conditions_for_verizon_1.0">Гледајте и слушајте ги вашите пораки без да ја повикувате говорната пошта.</string>
+  <string name="dialer_terms_and_conditions_learn_more">Дознајте повеќе</string>
+  <string name="dialer_terms_and_conditions_existing_user_ack">Во ред, сфатив</string>
+  <string name="dialer_terms_and_conditions_existing_user_decline">Не, фала</string>
+  <string name="terms_and_conditions_decline_dialog_title">Да се оневозможи визуелната говорна пошта?</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_message">Ако ги одбиете Правилата и условите, визуелната говорна пошта ќе се оневозможи.</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_downgrade">Оневозможи</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_message">Ако ја исклучите, визуелната говорна пошта ќе се оневозможи.</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_downgrade">Оневозможи</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message">Говорната пошта ќе биде достапна само со повикување *86. За да продолжите, поставете нов PIN на говорната пошта.</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin">Поставете PIN</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/error/res/values-ml/strings.xml b/java/com/android/dialer/voicemail/listui/error/res/values-ml/strings.xml
new file mode 100644
index 0000000..9dfcbbb
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/error/res/values-ml/strings.xml
@@ -0,0 +1,102 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_error_activating_title">വിഷ്വൽ വോയ്‌സ്മെയിൽ സജീവമാക്കുന്നു</string>
+  <string name="voicemail_error_activating_message">വിഷ്വൽ വോയ്‌സ്‌മെയിൽ പൂർണ്ണമായും സജീവമാകുന്നത് വരെ നിങ്ങൾക്ക് വോയ്‌സ്‌മെയിൽ അറിയിപ്പുകൾ ലഭിക്കാനിടയില്ല. വോയ്‌സ്‌മെയിൽ പൂർണ്ണമായും സജീവമാകുന്നത് വരെ പുതിയ സന്ദേശങ്ങൾ വീണ്ടെടുക്കാൻ വോയ്‌സ്‌മെയിലിലേക്ക് വിളിക്കുക.</string>
+  <string name="voicemail_error_not_activate_no_signal_title">വിഷ്വൽ വോയ്‌സ്‌മെയിൽ സജീവമാക്കാനാവുന്നില്ല</string>
+  <string name="voicemail_error_not_activate_no_signal_message">നിങ്ങളുടെ ഫോണിന് മൊബൈൽ നെറ്റ്‌വർക്ക് കണക്ഷനുണ്ടെന്ന് ഉറപ്പാക്കിയശേഷം വീണ്ടും ശ്രമിക്കുക.</string>
+  <string name="voicemail_error_not_activate_no_signal_airplane_mode_message">ഫ്ലൈറ്റ് മോഡ് ഓഫാക്കി, വീണ്ടും ശ്രമിക്കുക.</string>
+  <string name="voicemail_error_no_signal_title">നെറ്റ് ഇല്ല</string>
+  <string name="voicemail_error_no_signal_message">പുതിയ വോയ്‌സ്‌മെയിലുകൾ വരുമ്പോൾ നിങ്ങളെ അറിയിക്കില്ല. നിങ്ങൾ വൈഫൈ ഉപയോഗിക്കുകയാണെങ്കിൽ, ഇപ്പോൾ സമന്വയിപ്പിക്കുന്നതിലൂടെ വോയ്‌സ്‌മെയിൽ പരിശോധിക്കാനാവും.</string>
+  <string name="voicemail_error_no_signal_airplane_mode_message">പുതിയ വോയ്‌സ്‌മെയിലുകൾ വരുമ്പോൾ നിങ്ങളെ അറിയിക്കില്ല. വോയ്‌സ്‌മെയിൽ സമന്വയിപ്പിക്കാൻ ഫ്ലൈറ്റ് മോഡ് ഓഫാക്കുക.</string>
+  <string name="voicemail_error_no_signal_cellular_required_message">വോയ്‌സ്‌മെയിൽ പരിശോധിക്കാൻ നിങ്ങളുടെ ഫോണിന് ഒരു മൊബൈൽ ഡാറ്റ കണക്ഷൻ ആവശ്യമാണ്.</string>
+  <string name="voicemail_error_activation_failed_title">വിഷ്വൽ വോയ്‌സ്‌മെയിൽ സജീവമാക്കാനാവുന്നില്ല</string>
+  <string name="voicemail_error_activation_failed_message">വോയ്‌സ്‌മെയിൽ പരിശോധിക്കാൻ തുടർന്നും നിങ്ങൾക്ക് കോൾ ചെയ്യാനാവും.</string>
+  <string name="voicemail_error_no_data_title">വിഷ്വൽ വോയ്‌സ്‌മെയിൽ അപ്‌ഡേറ്റ് ചെയ്യാനാകുന്നില്ല</string>
+  <string name="voicemail_error_no_data_message">നിങ്ങൾക്ക് മെച്ചപ്പെട്ട വൈഫൈ അല്ലെങ്കിൽ മൊബൈൽ ഡാറ്റ കണക്ഷൻ ലഭിക്കുമ്പോൾ, വീണ്ടും ശ്രമിക്കുക. വോയ്‌സ്‌മെയിൽ പരിശോധിക്കാൻ തുടർന്നും നിങ്ങൾക്ക് കോൾ ചെയ്യാനാവും.</string>
+  <string name="voicemail_error_no_data_cellular_required_message">നിങ്ങൾക്ക് മെച്ചപ്പെട്ട മൊബൈൽ ഡാറ്റ കണക്ഷൻ ലഭിക്കുമ്പോൾ വീണ്ടും ശ്രമിക്കുക. വോയ്‌സ്‌മെയിൽ പരിശോധിക്കാൻ തുടർന്നും നിങ്ങൾക്ക് കോൾ ചെയ്യാനാവും.</string>
+  <string name="voicemail_error_bad_config_title">വിഷ്വൽ വോയ്‌സ്‌മെയിൽ അപ്‌ഡേറ്റ് ചെയ്യാനാകുന്നില്ല</string>
+  <string name="voicemail_error_bad_config_message">വോയ്‌സ്‌മെയിൽ പരിശോധിക്കാൻ തുടർന്നും നിങ്ങൾക്ക് കോൾ ചെയ്യാനാവും.</string>
+  <string name="voicemail_error_communication_title">വിഷ്വൽ വോയ്‌സ്‌മെയിൽ അപ്‌ഡേറ്റ് ചെയ്യാനാകുന്നില്ല</string>
+  <string name="voicemail_error_communication_message">വോയ്‌സ്‌മെയിൽ പരിശോധിക്കാൻ തുടർന്നും നിങ്ങൾക്ക് കോൾ ചെയ്യാനാവും.</string>
+  <string name="voicemail_error_server_connection_title">വിഷ്വൽ വോയ്‌സ്‌മെയിൽ അപ്‌ഡേറ്റ് ചെയ്യാനാകുന്നില്ല</string>
+  <string name="voicemail_error_server_connection_message">വോയ്‌സ്‌മെയിൽ പരിശോധിക്കാൻ തുടർന്നും നിങ്ങൾക്ക് കോൾ ചെയ്യാനാവും.</string>
+  <string name="voicemail_error_server_title">വിഷ്വൽ വോയ്‌സ്‌മെയിൽ അപ്‌ഡേറ്റ് ചെയ്യാനാകുന്നില്ല</string>
+  <string name="voicemail_error_server_message">വോയ്‌സ്‌മെയിൽ പരിശോധിക്കാൻ തുടർന്നും നിങ്ങൾക്ക് കോൾ ചെയ്യാനാവും.</string>
+  <string name="voicemail_error_inbox_near_full_title">ഇൻ‌ബോക്‌സ് ഏകദേശം നിറഞ്ഞു</string>
+  <string name="voicemail_error_inbox_near_full_message">ഇൻബോക്‌സ്‌ നിറഞ്ഞിരിക്കുകയാണെങ്കിൽ നിങ്ങൾക്ക് പുതിയ വോയ്‌സ്‌മെയിൽ സ്വീകരിക്കാനാവില്ല.</string>
+  <string name="voicemail_error_inbox_full_title">പുതിയ വോയ്‌സ്‌മെയിലുകൾ സ്വീകരിക്കാനാകുന്നില്ല</string>
+  <string name="voicemail_error_inbox_full_message">നിങ്ങളുടെ ഇൻബോക്‌സ്‌ നിറഞ്ഞിരിക്കുകയാണ്. പുതിയ വോയ്‌സ്‌മെയിൽ സ്വീകരിക്കാൻ ചില സന്ദേശങ്ങൾ ഇല്ലാതാക്കുന്നത് പരീക്ഷിച്ചുനോക്കൂ.</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_title">അധിക സ്‌റ്റോറേജും ബായ്‌ക്കപ്പും ഓണാക്കുക</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_message">നിങ്ങളുടെ മെയിൽബോക്‌സ് നിറഞ്ഞിരിക്കുന്നു. ഇടം സൃഷ്‌ടിക്കാൻ, അധിക സ്‌റ്റോറേജ് ഓണാക്കുക, തുടർന്ന് Google-ന് നിങ്ങളുടെ വോയ്‌സ്‌മെയിൽ സന്ദേശങ്ങൾ നിയന്ത്രിക്കാനും ബാക്കപ്പ് എടുക്കാനുമാകും.</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_title">അധിക സ്‌റ്റോറേജും ബായ്‌ക്കപ്പും ഓണാക്കുക</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_message">നിങ്ങളുടെ മെയിൽബോക്‌സ്‌ ഏകദേശം നിറഞ്ഞിരിക്കുന്നു. ഇടം സൃഷ്‌ടിക്കാൻ അധിക സ്‌റ്റോറേജ് ഓണാക്കുക, തുടർന്ന് Google-ന് നിങ്ങളുടെ വോയ്‌സ്‌മെയിൽ സന്ദേശങ്ങൾ നിയന്ത്രിക്കാനും ബാക്കപ്പ് എടുക്കാനുമാകും.</string>
+  <string name="voicemail_error_pin_not_set_title">നിങ്ങളുടെ വോയ്‌സ്മെയിൽ പിൻ സജ്ജമാക്കുക</string>
+  <string name="voicemail_error_pin_not_set_message">വോയ്‌സ്മെയിൽ ആക്‌സസ് ചെയ്യാൻ ശ്രമിക്കുമ്പോഴെല്ലാം നിങ്ങൾക്കൊരു വോയ്‌സ്‌മെയിൽ പിൻ ആവശ്യമാണ്.</string>
+  <string name="voicemail_action_turn_off_airplane_mode">ഫ്ലൈറ്റ് മോഡ് ക്രമീകരണം</string>
+  <string name="voicemail_action_set_pin">പിൻ സജ്ജമാക്കുക</string>
+  <string name="voicemail_action_retry">വീണ്ടും ശ്രമിക്കുക</string>
+  <string name="voicemail_action_turn_archive_on">ഓണാക്കുക</string>
+  <string name="voicemail_action_dimiss">വേണ്ട</string>
+  <string name="voicemail_action_sync">സമന്വയിപ്പിക്കുക</string>
+  <string name="voicemail_action_call_voicemail">വോയ്‌സ്‌മെയിലിലേക്ക് വിളിക്കുക</string>
+  <string name="voicemail_action_call_customer_support">കസ്‌റ്റമർ സപ്പോർട്ടിനെ വിളിക്കുക</string>
+  <string name="vvm3_error_vms_dns_failure_title">എന്തോ കുഴപ്പം സംഭവിച്ചു</string>
+  <string name="vvm3_error_vms_dns_failure_message">ക്ഷമിക്കണം, ഒരു പ്രശ്‌നമുണ്ടായി. പിന്നീട് വീണ്ടും ശ്രമിക്കുക. പ്രശ്‌നം നിലനിൽക്കുകയാണെങ്കിൽ, %1$s എന്ന നമ്പറിൽ ഉപയോക്തൃ സേവനവുമായി ബന്ധപ്പെട്ട്, പിശക് കോഡ് 9001 ആണെന്ന് പറയുക.</string>
+  <string name="vvm3_error_vmg_dns_failure_title">എന്തോ കുഴപ്പം സംഭവിച്ചു</string>
+  <string name="vvm3_error_vmg_dns_failure_message">ക്ഷമിക്കണം, ഒരു പ്രശ്‌നമുണ്ടായി. പിന്നീട് വീണ്ടും ശ്രമിക്കുക. പ്രശ്‌നം നിലനിൽക്കുകയാണെങ്കിൽ, %1$s എന്ന നമ്പറിൽ ഉപയോക്തൃ സേവനവുമായി ബന്ധപ്പെട്ട്, പിശക് കോഡ് 9002 ആണെന്ന് പറയുക.</string>
+  <string name="vvm3_error_spg_dns_failure_title">എന്തോ കുഴപ്പം സംഭവിച്ചു</string>
+  <string name="vvm3_error_spg_dns_failure_message">ക്ഷമിക്കണം, ഒരു പ്രശ്‌നമുണ്ടായി. പിന്നീട് വീണ്ടും ശ്രമിക്കുക. പ്രശ്‌നം നിലനിൽക്കുകയാണെങ്കിൽ, %1$s എന്ന നമ്പറിൽ ഉപയോക്തൃ സേവനവുമായി ബന്ധപ്പെട്ട്, പിശക് കോഡ് 9003 ആണെന്ന് പറയുക.</string>
+  <string name="vvm3_error_vms_no_cellular_title">നിങ്ങളുടെ വോയ്‌സ് മെയിൽബോക്‌സിൽ കണക്‌റ്റ് ചെയ്യാനാവുന്നില്ല</string>
+  <string name="vvm3_error_vms_no_cellular_message">ക്ഷമിക്കണം, നിങ്ങളുടെ വോയ്‌സ് മെയിൽബോക്‌സിൽ കണക്‌റ്റ് ചെയ്യുന്നതിൽ പ്രശ്‌നം നേരിട്ടു. വളരെ മോശം സിഗ്നലുള്ള ഒരിടത്താണ് നിങ്ങളെങ്കിൽ, സിഗ്നൽ ദൃഢത വർദ്ധിക്കുന്നത് വരെ കാത്തിരിക്കുക. തുടർന്ന് വീണ്ടും ശ്രമിക്കുക. പ്രശ്‌നം നിലനിൽക്കുകയാണെങ്കിൽ, %1$s എന്ന നമ്പറിൽ ഉപയോക്തൃ സേവനവുമായി ബന്ധപ്പെട്ട്, പിശക് കോഡ് 9004 ആണെന്ന് പറയുക.</string>
+  <string name="vvm3_error_vmg_no_cellular_title">നിങ്ങളുടെ വോയ്‌സ് മെയിൽബോക്‌സിൽ കണക്‌റ്റ് ചെയ്യാനാവുന്നില്ല</string>
+  <string name="vvm3_error_vmg_no_cellular_message">ക്ഷമിക്കണം, നിങ്ങളുടെ വോയ്‌സ് മെയിൽബോക്‌സിൽ കണക്‌റ്റ് ചെയ്യുന്നതിൽ പ്രശ്‌നം നേരിട്ടു. വളരെ മോശം സിഗ്നലുള്ള ഒരിടത്താണ് നിങ്ങളെങ്കിൽ, സിഗ്നൽ ദൃഢത വർദ്ധിക്കുന്നത് വരെ കാത്തിരിക്കുക. തുടർന്ന് വീണ്ടും ശ്രമിക്കുക. പ്രശ്‌നം നിലനിൽക്കുകയാണെങ്കിൽ, %1$s എന്ന നമ്പറിൽ ഉപയോക്തൃ സേവനവുമായി ബന്ധപ്പെട്ട്, പിശക് കോഡ് 9005 ആണെന്ന് പറയുക.</string>
+  <string name="vvm3_error_spg_no_cellular_title">നിങ്ങളുടെ വോയ്‌സ് മെയിൽബോക്‌സിൽ കണക്‌റ്റ് ചെയ്യാനാവുന്നില്ല</string>
+  <string name="vvm3_error_spg_no_cellular_message">ക്ഷമിക്കണം, നിങ്ങളുടെ വോയ്‌സ് മെയിൽബോക്‌സിൽ കണക്‌റ്റ് ചെയ്യുന്നതിൽ പ്രശ്‌നം നേരിട്ടു. വളരെ മോശം സിഗ്നലുള്ള ഒരിടത്താണ് നിങ്ങളെങ്കിൽ, സിഗ്നൽ ദൃഢത വർദ്ധിക്കുന്നത് വരെ കാത്തിരിക്കുക. തുടർന്ന് വീണ്ടും ശ്രമിക്കുക. പ്രശ്‌നം നിലനിൽക്കുകയാണെങ്കിൽ, %1$s എന്ന നമ്പറിൽ ഉപയോക്തൃ സേവനവുമായി ബന്ധപ്പെട്ട്, പിശക് കോഡ് 9006 ആണെന്ന് പറയുക.</string>
+  <string name="vvm3_error_vms_timeout_title">എന്തോ കുഴപ്പം സംഭവിച്ചു</string>
+  <string name="vvm3_error_vms_timeout_message">ക്ഷമിക്കണം, ഒരു പ്രശ്‌നമുണ്ടായി. പിന്നീട് വീണ്ടും ശ്രമിക്കുക. പ്രശ്‌നം നിലനിൽക്കുകയാണെങ്കിൽ, %1$s എന്ന നമ്പറിൽ ഉപയോക്തൃ സേവനവുമായി ബന്ധപ്പെട്ട്, പിശക് കോഡ് 9007 ആണെന്ന് പറയുക.</string>
+  <string name="vvm3_error_vmg_timeout_title">എന്തോ കുഴപ്പം സംഭവിച്ചു</string>
+  <string name="vvm3_error_vmg_timeout_message">ക്ഷമിക്കണം, ഒരു പ്രശ്‌നമുണ്ടായി. പിന്നീട് വീണ്ടും ശ്രമിക്കുക. പ്രശ്‌നം നിലനിൽക്കുകയാണെങ്കിൽ, %1$s എന്ന നമ്പറിൽ ഉപയോക്തൃ സേവനവുമായി ബന്ധപ്പെട്ട്, പിശക് കോഡ് 9008 ആണെന്ന് പറയുക.</string>
+  <string name="vvm3_error_status_sms_timeout_title">എന്തോ കുഴപ്പം സംഭവിച്ചു</string>
+  <string name="vvm3_error_status_sms_timeout_message">ക്ഷമിക്കണം, നിങ്ങൾക്കുള്ള സേവനം സജ്ജമാക്കുന്നതിൽ പ്രശ്‌നം നേരിട്ടു. പിന്നീട് വീണ്ടും ശ്രമിക്കുക. പ്രശ്‌നം നിലനിൽക്കുകയാണെങ്കിൽ, %1$s എന്ന നമ്പറിൽ ഉപയോക്തൃ സേവനവുമായി ബന്ധപ്പെട്ട്, പിശക് കോഡ് 9009 ആണെന്ന് പറയുക.</string>
+  <string name="vvm3_error_subscriber_blocked_title">നിങ്ങളുടെ വോയ്‌സ് മെയിൽബോക്‌സിൽ കണക്‌റ്റ് ചെയ്യാനാവുന്നില്ല</string>
+  <string name="vvm3_error_subscriber_blocked_message">ക്ഷമിക്കണം, ഇപ്പോൾ നിങ്ങളുടെ വോയ്‌സ് മെയിൽബോക്‌സുമായി കണക്‌റ്റ് ചെയ്യാനാവുന്നില്ല. പിന്നീട് വീണ്ടും ശ്രമിക്കുക. പ്രശ്‌നം നിലനിൽക്കുകയാണെങ്കിൽ, %1$s എന്ന നമ്പറിൽ ഉപയോക്തൃ സേവനവുമായി ബന്ധപ്പെട്ട്, പിശക് കോഡ് 9990 ആണെന്ന് പറയുക.</string>
+  <string name="vvm3_error_unknown_user_title">വോയ്‌സ്‌മെയിൽ സജ്ജീകരിക്കുക</string>
+  <string name="vvm3_error_unknown_user_message">നിങ്ങളുടെ അക്കൗണ്ടിൽ വോയ്‌സ്‌മെയിൽ സജ്ജമാക്കിയിട്ടില്ല. %1$s എന്ന നമ്പറിൽ ഉപയോക്തൃ സേവനവുമായി ബന്ധപ്പെട്ട്, പിശക് കോഡ് 9991 ആണെന്ന് പറയുക.</string>
+  <string name="vvm3_error_unknown_device_title">വോയ്‌സ്‌മെയിൽ</string>
+  <string name="vvm3_error_unknown_device_message">ഈ ഉപകരണത്തിൽ വിഷ്വൽ വോയ്‌സ്‌മെയിൽ ഉപയോഗിക്കാനാകുന്നില്ല. %1$s എന്ന നമ്പറിൽ ഉപയോക്തൃ സേവനവുമായി ബന്ധപ്പെട്ട്, പിശക് കോഡ് 9992 ആണെന്ന് പറയുക.</string>
+  <string name="vvm3_error_invalid_password_title">എന്തോ കുഴപ്പം സംഭവിച്ചു</string>
+  <string name="vvm3_error_invalid_password_message">%1$s എന്ന നമ്പറിൽ ഉപയോക്തൃ സേവനവുമായി ബന്ധപ്പെട്ട്, പിശക് കോഡ് 9993 ആണെന്ന് പറയുക.</string>
+  <string name="vvm3_error_mailbox_not_initialized_title">വിഷ്വൽ വോയ്‌സ്‌മെയിൽ</string>
+  <string name="vvm3_error_mailbox_not_initialized_message">വിഷ്വൽ വോയ്‌സ്‌മെയിൽ സജ്ജീകരിക്കുന്നത് പൂർത്തിയാക്കാൻ, %1$s എന്ന നമ്പറിൽ ഉപയോക്തൃ സേവനവുമായി ബന്ധപ്പെട്ട്, പിശക് കോഡ് 9994 ആണെന്ന് പറയുക.</string>
+  <string name="vvm3_error_service_not_provisioned_title">വിഷ്വൽ വോയ്‌സ്‌മെയിൽ</string>
+  <string name="vvm3_error_service_not_provisioned_message">വിഷ്വൽ വോയ്‌സ്‌മെയിൽ സജ്ജീകരിക്കുന്നത് പൂർത്തിയാക്കാൻ, %1$s എന്ന നമ്പറിൽ ഉപയോക്തൃ സേവനവുമായി ബന്ധപ്പെട്ട്, പിശക് കോഡ് 9995 ആണെന്ന് പറയുക.</string>
+  <string name="vvm3_error_service_not_activated_title">വിഷ്വൽ വോയ്‌സ്‌മെയിൽ</string>
+  <string name="vvm3_error_service_not_activated_message">വിഷ്വൽ വോയ്‌സ്‌മെയിൽ സജീവമാക്കാൻ, %1$s എന്ന നമ്പറിൽ ഉപയോക്തൃ സേവനവുമായി ബന്ധപ്പെട്ട്, പിശക് കോഡ് 9996 ആണെന്ന് പറയുക.</string>
+  <string name="vvm3_error_user_blocked_title">എന്തോ കുഴപ്പം സംഭവിച്ചു</string>
+  <string name="vvm3_error_user_blocked_message">വിഷ്വൽ വോയ്‌സ്‌മെയിൽ സജ്ജീകരിക്കുന്നത് പൂർത്തിയാക്കാൻ, %1$s എന്ന നമ്പറിൽ ഉപയോക്തൃ സേവനവുമായി ബന്ധപ്പെട്ട്, പിശക് കോഡ് 9998 ആണെന്ന് പറയുക.</string>
+  <string name="vvm3_error_subscriber_unknown_title">വിഷ്വൽ വോയ്‌സ്‌മെയിൽ പ്രവർത്തനരഹിതമാക്കി</string>
+  <string name="vvm3_error_subscriber_unknown_message">വിഷ്വൽ വോയ്‌സ്‌മെയിൽ സജീവമാക്കാൻ %1$s എന്ന നമ്പറിൽ ഉപയോക്തൃ സേവനവുമായി ബന്ധപ്പെടുക.</string>
+  <string name="vvm3_error_imap_getquota_error_title">എന്തോ കുഴപ്പം സംഭവിച്ചു</string>
+  <string name="vvm3_error_imap_getquota_error_message">%1$s എന്ന നമ്പറിൽ ഉപയോക്തൃ സേവനവുമായി ബന്ധപ്പെട്ട്, പിശക് കോഡ് 9997 ആണെന്ന് പറയുക.</string>
+  <string name="vvm3_error_imap_select_error_title">എന്തോ കുഴപ്പം സംഭവിച്ചു</string>
+  <string name="vvm3_error_imap_select_error_message">%1$s എന്ന നമ്പറിൽ ഉപയോക്തൃ സേവനവുമായി ബന്ധപ്പെട്ട്, പിശക് കോഡ് 9989 ആണെന്ന് പറയുക.</string>
+  <string name="vvm3_error_imap_error_title">എന്തോ കുഴപ്പം സംഭവിച്ചു</string>
+  <string name="vvm3_error_imap_error_message">%1$s എന്ന നമ്പറിൽ ഉപയോക്തൃ സേവനവുമായി ബന്ധപ്പെട്ട്, പിശക് കോഡ് 9999 ആണെന്ന് പറയുക.</string>
+  <string name="verizon_terms_and_conditions_title">വിഷ്വൽ വോയ്‌സ്‌മെയിൽ ഓണാക്കുക</string>
+  <string name="verizon_terms_and_conditions_message">%1$s വിഷ്വൽ വോയ്‌സ് മെയിൽ ഓണാക്കുന്നതിലൂടെ നിങ്ങൾ Verizon Wireless-ന്‍റെ നിബന്ധനകളും വ്യവസ്ഥകളും അംഗീകരിക്കുന്നു:\n\n%2$s</string>
+  <string name="dialer_terms_and_conditions_title">വിഷ്വൽ വോയ്‌സ്‌മെയിൽ ഓണാക്കുക</string>
+  <string name="dialer_terms_and_conditions_existing_user_title">പുതിയത്! വോയ്‌സ്മെയിൽ വായിക്കുക</string>
+  <string name="dialer_terms_and_conditions_message">%s</string>
+  <string name="dialer_terms_and_conditions_1.0">വോയ്‌സ്‌മെയിലിൽ ‌വിളിക്കാതെ തന്നെ, സന്ദേശങ്ങൾ കാണുക, കേൾക്കുക. Google-ന്‍റെ സൗജന്യ ട്രാൻസ്‌ക്രിപ്ഷൻ സേവനമാണ് നിങ്ങളുടെ വോയ്‌സ്‌മെയിലിന്‍റെ ട്രാൻസ്‌ക്രിപ്റ്റുകൾ നൽകുന്നത്. ഇവയിലേതും ഏത് സമയത്തും ക്രമീകരണത്തിൽ ഓഫാക്കാവുന്നതാണ്. %s</string>
+  <string name="dialer_terms_and_conditions_existing_user">Google-ന്‍റെ സൗജന്യ ട്രാൻസ്‌ക്രിപ്ഷൻ സേവനമാണ് നിങ്ങളുടെ വോയ്‌സ്‌മെയിലിന്‍റെ ട്രാൻസ്‌ക്രിപ്റ്റുകൾ നൽകുന്നത്. ഏത് സമയത്തും ഇത് ക്രമീകരണത്തിൽ ഓഫാക്കാവുന്നതാണ്. %s</string>
+  <string name="dialer_terms_and_conditions_for_verizon_1.0">വോയ്‌സ്‌മെയിലിൽ ‌വിളിക്കാതെ തന്നെ, സന്ദേശങ്ങൾ കാണുക, കേൾക്കുക.</string>
+  <string name="dialer_terms_and_conditions_learn_more">കൂടുതലറിയുക</string>
+  <string name="dialer_terms_and_conditions_existing_user_ack">മനസ്സിലായി</string>
+  <string name="dialer_terms_and_conditions_existing_user_decline">വേണ്ട</string>
+  <string name="terms_and_conditions_decline_dialog_title">വിഷ്വൽ വോയ്‌സ്‌‌മെയിൽ പ്രവർത്തനരഹിതമാക്കണോ?</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_message">നിബന്ധനകളും വ്യവസ്ഥകളും നിരസിക്കപ്പെട്ടാൽ വിഷ്വൽ വോയ്‌സ്‌ മെയിൽ പ്രവർത്തനരഹിതമാവും.</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_downgrade">പ്രവർത്തനരഹിതമാക്കുക</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_message">വിഷ്വൽ വോയ്‌സ്‌ മെയിൽ ഓഫ്‌ ചെയ്യുകയാണെങ്കിൽ അത് പ്രവർത്തനരഹിതമാവും.</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_downgrade">പ്രവർത്തനരഹിതമാക്കുക</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message">*86-ൽ വിളിച്ച്‌ മാത്രമേ വോയ്‌സ്‌മെയിൽ ആക്‌സസ്‌ ചെയ്യാനാവൂ. തുടരാൻ, പുതിയൊരു വോയ്‌സ്‌മെയിൽ പിൻ‌ നമ്പർ‌ സജ്ജമാക്കുക.</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin">പിൻ സജ്ജമാക്കുക</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/error/res/values-mn/strings.xml b/java/com/android/dialer/voicemail/listui/error/res/values-mn/strings.xml
new file mode 100644
index 0000000..a6a8904
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/error/res/values-mn/strings.xml
@@ -0,0 +1,102 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_error_activating_title">Уншиж болох дуут шууданг идэвхжүүлж байна</string>
+  <string name="voicemail_error_activating_message">Уншиж болох дуут шууданг бүрэн идэвхжүүлэхээс өмнө танд дуут шуудангийн мэдэгдэл ирэхгүй байж магадгүй. Дуут шууданг бүрэн идэвхжих хүртэл шинэ зурвас авахын тулд дуут шуудан руу залгана уу.</string>
+  <string name="voicemail_error_not_activate_no_signal_title">Уншиж болох дуут шууданг идэвхжүүлэх боломжгүй</string>
+  <string name="voicemail_error_not_activate_no_signal_message">Утасны мобайл холболт байгаа эсэхийг шалгаад дахин оролдоно уу.</string>
+  <string name="voicemail_error_not_activate_no_signal_airplane_mode_message">Нислэгийн горимыг идэвхгүй болгоод дахин оролдоно уу.</string>
+  <string name="voicemail_error_no_signal_title">Холболт байхгүй</string>
+  <string name="voicemail_error_no_signal_message">Шинэ дуут шуудангийн талаар танд мэдэгдэхгүй. Хэрэв та Wi-Fi-тай холбогдсон бол одоо синк хийж дуут шуудангаа шалгана уу.</string>
+  <string name="voicemail_error_no_signal_airplane_mode_message">Шинэ дуут шуудангийн талаар танд мэдэгдэхгүй. Дуут шуудангаа синк хийхийн тулд нислэгийн горимыг идэвхгүй болгоно уу.</string>
+  <string name="voicemail_error_no_signal_cellular_required_message">Дуут шууданг шалгахын тулд таны утсанд мобайл датаны холболт шаардлагатай.</string>
+  <string name="voicemail_error_activation_failed_title">Уншиж болох дуут шууданг идэвхжүүлэх боломжгүй</string>
+  <string name="voicemail_error_activation_failed_message">Та дуудлага хийж дуут шуудангаа сонсох боломжтой хэвээр байна.</string>
+  <string name="voicemail_error_no_data_title">Уншиж болох дуут шууданг шинэчлэх боломжгүй</string>
+  <string name="voicemail_error_no_data_message">Та Wi-Fi эсвэл мобайл холболт илүү сайн үед дахин оролдоно уу. Та дуудлага хийж дуут шуудангаа сонсох боломжтой хэвээр байна.</string>
+  <string name="voicemail_error_no_data_cellular_required_message">Таны мобайл датаны холболт илүү сайн үед дахин оролдоно уу. Та дуудлага хийж дуут шуудангаа сонсох боломжтой хэвээр байна.</string>
+  <string name="voicemail_error_bad_config_title">Уншиж болох дуут шууданг шинэчлэх боломжгүй</string>
+  <string name="voicemail_error_bad_config_message">Та дуудлага хийж дуут шуудангаа сонсох боломжтой хэвээр байна.</string>
+  <string name="voicemail_error_communication_title">Уншиж болох дуут шууданг шинэчлэх боломжгүй</string>
+  <string name="voicemail_error_communication_message">Та дуудлага хийж дуут шуудангаа сонсох боломжтой хэвээр байна.</string>
+  <string name="voicemail_error_server_connection_title">Уншиж болох дуут шууданг шинэчлэх боломжгүй</string>
+  <string name="voicemail_error_server_connection_message">Та дуудлага хийж дуут шуудангаа сонсох боломжтой хэвээр байна.</string>
+  <string name="voicemail_error_server_title">Уншиж болох дуут шууданг шинэчлэх боломжгүй</string>
+  <string name="voicemail_error_server_message">Та дуудлага хийж дуут шуудангаа сонсох боломжтой хэвээр байна.</string>
+  <string name="voicemail_error_inbox_near_full_title">Ирсэн имэйл хайрцаг бараг дүүрсэн</string>
+  <string name="voicemail_error_inbox_near_full_message">Ирсэн имэйл хайрцаг дүүрсэн бол та шинэ дуут шуудан хүлээж авах боломжгүй.</string>
+  <string name="voicemail_error_inbox_full_title">Шинэ дуут шуудан хүлээж авах боломжгүй</string>
+  <string name="voicemail_error_inbox_full_message">Таны ирсэн имэйл хайрцаг дүүрэн байна. Шинэ дуут шуудан авахын тулд зарим зурвасыг устгаж үзнэ үү.</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_title">Гадаад хадгалах сан болон нөөцлөлтийг асаана уу</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_message">Таны имэйл хайрцаг дүүрсэн байна. Сул зай гаргахын тулд гадаад хадгалах санг асааж өөрийн дуут шуудангийн зурвасуудыг удирдах, нөөцлөх боломжийг Google-д олгоно уу.</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_title">Гадаад хадгалах сан болон нөөцлөлтийг асаана уу</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_message">Таны имэйл хайрцаг бараг дүүрсэн байна. Сул зай гаргахын тулд гадаад хадгалах санг асааж өөрийн дуут шуудангийн зурвасуудыг удирдах, нөөцлөх боломжийг Google-д олгоно уу.</string>
+  <string name="voicemail_error_pin_not_set_title">Өөрийн дуут шуудангийн PIN-г тохируулна уу</string>
+  <string name="voicemail_error_pin_not_set_message">Та дуут шуудандаа хандахаар дуудлага хийх бүрт дуут шуудангийн PIN шаардлагатай болно.</string>
+  <string name="voicemail_action_turn_off_airplane_mode">Нислэгийн горимын тохиргоо</string>
+  <string name="voicemail_action_set_pin">PIN тохируулах</string>
+  <string name="voicemail_action_retry">Дахин оролдох</string>
+  <string name="voicemail_action_turn_archive_on">Асаах</string>
+  <string name="voicemail_action_dimiss">Үгүй, баярлалаа</string>
+  <string name="voicemail_action_sync">Синк</string>
+  <string name="voicemail_action_call_voicemail">Дуут шуудан руу залгах</string>
+  <string name="voicemail_action_call_customer_support">Хэрэглэгчийн Дэмжлэг рүү залгах</string>
+  <string name="vvm3_error_vms_dns_failure_title">Ямар нэг алдаа гарлаа</string>
+  <string name="vvm3_error_vms_dns_failure_message">Уучлаарай, гэнэтийн алдаа гарлаа. Дараа дахин оролдоно уу. Хэрэв асуудал хэвээр байвал Хэрэглэгчийн үйлчилгээ %1$s руу залгаж алдааны код 9001 гэж хэлнэ үү.</string>
+  <string name="vvm3_error_vmg_dns_failure_title">Ямар нэг алдаа гарлаа</string>
+  <string name="vvm3_error_vmg_dns_failure_message">Уучлаарай, гэнэтийн алдаа гарлаа. Дараа дахин оролдоно уу. Хэрэв асуудал хэвээр байвал Хэрэглэгчийн үйлчилгээ %1$s руу залгаж алдааны код 9002 гэж хэлнэ үү.</string>
+  <string name="vvm3_error_spg_dns_failure_title">Ямар нэг алдаа гарлаа</string>
+  <string name="vvm3_error_spg_dns_failure_message">Уучлаарай, гэнэтийн алдаа гарлаа. Дараа дахин оролдоно уу. Хэрэв асуудал хэвээр байвал Хэрэглэгчийн үйлчилгээ %1$s руу залгаж алдааны код 9003 гэж хэлнэ үү.</string>
+  <string name="vvm3_error_vms_no_cellular_title">Таны Дуут шуудангийн хайрцагтай холбогдох боломжгүй</string>
+  <string name="vvm3_error_vms_no_cellular_message">Уучлаарай, таны дуут шуудангийн хайрцагтай холбогдоход асуудалтай байна. Хэрэв та холболтын дохио сул газар байгаа бол дохио сайн болтол хүлээгээд дахин оролдоно уу. Хэрэв асуудал хэвээр байвал Хэрэглэгчийн үйлчилгээ %1$s руу залгаж алдааны код 9004 гэж хэлнэ үү.</string>
+  <string name="vvm3_error_vmg_no_cellular_title">Таны Дуут шуудангийн хайрцагтай холбогдох боломжгүй</string>
+  <string name="vvm3_error_vmg_no_cellular_message">Уучлаарай, таны дуут шуудангийн хайрцагтай холбогдоход асуудалтай байна. Хэрэв та холболтын дохио сул газар байгаа бол дохио сайн болтол хүлээгээд дахин оролдоно уу. Хэрэв асуудал хэвээр байвал Хэрэглэгчийн үйлчилгээ %1$s руу залгаж алдааны код 9005 гэж хэлнэ үү.</string>
+  <string name="vvm3_error_spg_no_cellular_title">Таны Дуут шуудангийн хайрцагтай холбогдох боломжгүй</string>
+  <string name="vvm3_error_spg_no_cellular_message">Уучлаарай, таны дуут шуудангийн хайрцагтай холбогдоход асуудалтай байна. Хэрэв та холболтын дохио сул газар байгаа бол дохио сайн болтол хүлээгээд дахин оролдоно уу. Хэрэв асуудал хэвээр байвал Хэрэглэгчийн үйлчилгээ %1$s руу залгаж алдааны код 9006 гэж хэлнэ үү.</string>
+  <string name="vvm3_error_vms_timeout_title">Ямар нэг алдаа гарлаа</string>
+  <string name="vvm3_error_vms_timeout_message">Уучлаарай, гэнэтийн алдаа гарлаа. Дараа дахин оролдоно уу. Хэрэв асуудал хэвээр байвал Хэрэглэгчийн үйлчилгээ %1$s руу залгаж алдааны код 9007 гэж хэлнэ үү.</string>
+  <string name="vvm3_error_vmg_timeout_title">Ямар нэг алдаа гарлаа</string>
+  <string name="vvm3_error_vmg_timeout_message">Уучлаарай, гэнэтийн алдаа гарлаа. Дараа дахин оролдоно уу. Хэрэв асуудал хэвээр байвал Хэрэглэгчийн үйлчилгээ %1$s руу залгаж алдааны код 9008 гэж хэлнэ үү.</string>
+  <string name="vvm3_error_status_sms_timeout_title">Ямар нэг алдаа гарлаа</string>
+  <string name="vvm3_error_status_sms_timeout_message">Уучлаарай, таны үйлчилгээг тохируулах явцад алдаа гарлаа. Дараа дахин оролдоно уу. Хэрэв асуудал хэвээр байвал Хэрэглэгчийн үйлчилгээ %1$s руу залгаж алдааны код 9009 гэж хэлнэ үү.</string>
+  <string name="vvm3_error_subscriber_blocked_title">Таны Дуут шуудангийн хайрцагтай холбогдох боломжгүй</string>
+  <string name="vvm3_error_subscriber_blocked_message">Уучлаарай, таны дуут шуудангийн хайрцагтай холбогдох явцад алдаа гарлаа. Дараа дахин оролдоно уу. Хэрэв асуудал хэвээр байвал Хэрэглэгчийн үйлчилгээ %1$s руу залгаж алдааны код 9990 гэж хэлнэ үү.</string>
+  <string name="vvm3_error_unknown_user_title">Дуут шуудан тохируулах</string>
+  <string name="vvm3_error_unknown_user_message">Таны бүртгэлд дуут шууданг тохируулаагүй байна. Хэрэглэгчийн үйлчилгээ %1$s руу залгаж алдааны код 9991 гэж хэлнэ үү.</string>
+  <string name="vvm3_error_unknown_device_title">Дуут шуудан</string>
+  <string name="vvm3_error_unknown_device_message">Энэ төхөөрөмж дээр уншиж болох дуут шууданг ашиглах боломжгүй. Хэрэглэгчийн үйлчилгээ %1$s руу залгаж алдааны код 9992 гэж хэлнэ үү.</string>
+  <string name="vvm3_error_invalid_password_title">Ямар нэг алдаа гарлаа</string>
+  <string name="vvm3_error_invalid_password_message">Хэрэглэгчийн үйлчилгээ %1$s руу залгаж алдааны код 9993 гэж хэлнэ үү.</string>
+  <string name="vvm3_error_mailbox_not_initialized_title">Уншиж болох дуут шуудан</string>
+  <string name="vvm3_error_mailbox_not_initialized_message">Уншиж болох дуут шуудангийн тохируулгыг дуусгахын тулд Хэрэглэгчийн үйлчилгээ %1$s руу залгаж алдааны код 9994 гэж хэлнэ үү.</string>
+  <string name="vvm3_error_service_not_provisioned_title">Уншиж болох дуут шуудан</string>
+  <string name="vvm3_error_service_not_provisioned_message">Уншиж болох дуут шуудангийн тохируулгыг дуусгахын тулд Хэрэглэгчийн үйлчилгээ %1$s руу залгаж алдааны код 9994 гэж хэлнэ үү.</string>
+  <string name="vvm3_error_service_not_activated_title">Уншиж болох дуут шуудан</string>
+  <string name="vvm3_error_service_not_activated_message">Уншиж болох дуут шууданг идэвхжүүлэхийн тулд Хэрэглэгчийн үйлчилгээ %1$s руу залгаж алдааны код 9996 гэж хэлнэ үү.</string>
+  <string name="vvm3_error_user_blocked_title">Ямар нэг алдаа гарлаа</string>
+  <string name="vvm3_error_user_blocked_message">Уншиж болох дуут шуудангийн тохируулгыг дуусгахын тулд Хэрэглэгчийн үйлчилгээ %1$s руу залгаж алдааны код 9998 гэж хэлнэ үү.</string>
+  <string name="vvm3_error_subscriber_unknown_title">Уншиж болох дуут шууданг идэвхгүй болгосон</string>
+  <string name="vvm3_error_subscriber_unknown_message">Уншиж болох дуут шууданг идэвхжүүлэхийн тулд Хэрэглэгчийн үйлчилгээ %1$s руу холбоо барина уу.</string>
+  <string name="vvm3_error_imap_getquota_error_title">Ямар нэг алдаа гарлаа</string>
+  <string name="vvm3_error_imap_getquota_error_message">Хэрэглэгчийн үйлчилгээ %1$s руу залгаж алдааны код 9997 гэж хэлнэ үү.</string>
+  <string name="vvm3_error_imap_select_error_title">Ямар нэг алдаа гарлаа</string>
+  <string name="vvm3_error_imap_select_error_message">Хэрэглэгчийн үйлчилгээ %1$s руу залгаж алдааны код 9989 гэж хэлнэ үү.</string>
+  <string name="vvm3_error_imap_error_title">Ямар нэг алдаа гарлаа</string>
+  <string name="vvm3_error_imap_error_message">Хэрэглэгчийн үйлчилгээ %1$s руу залгаж алдааны код 9999 гэж хэлнэ үү.</string>
+  <string name="verizon_terms_and_conditions_title">Уншиж болох дуут шууданг идэвхжүүлэх</string>
+  <string name="verizon_terms_and_conditions_message">%1$s Уншиж болох дуут шууданг асааснаар та Verizon Wireless-н үйлчилгээний нөхцөл, болзлыг зөвшөөрнө:\n\n%2$s</string>
+  <string name="dialer_terms_and_conditions_title">Уншиж болох дуут шууданг идэвхжүүлэх</string>
+  <string name="dialer_terms_and_conditions_existing_user_title">Шинэ! Өөрийн дуут шууданг уншина уу</string>
+  <string name="dialer_terms_and_conditions_message">%s</string>
+  <string name="dialer_terms_and_conditions_1.0">Дуут шуудан руу залгахгүйгээр зурвасуудаа харах, сонсох боломжтой. Таны дуут шуудангийн сийрүүлгийг Google-н үнэгүй орчуулгын үйлчилгээ үзүүлж байна. Та хүссэн үедээ Тохиргоо дотроос унтрааж болно. %s</string>
+  <string name="dialer_terms_and_conditions_existing_user">Таны дуут шуудангийн сийрүүлгийг Google-н үнэгүй орчуулгын үйлчилгээ үзүүлж байна. Та хүссэн үедээ Тохиргоо дотроос үүнийг унтрааж болно. %s</string>
+  <string name="dialer_terms_and_conditions_for_verizon_1.0">Дуутан шуудан руу залгах шаардлагагүйгээр зурваснуудаа харах, сонсох боломжтой.</string>
+  <string name="dialer_terms_and_conditions_learn_more">Дэлгэрэнгүй үзэх</string>
+  <string name="dialer_terms_and_conditions_existing_user_ack">За, ойлголоо</string>
+  <string name="dialer_terms_and_conditions_existing_user_decline">Үгүй, баярлалаа</string>
+  <string name="terms_and_conditions_decline_dialog_title">Уншиж болохуйц дуут шууданг идэвхгүй болгох уу?</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_message">Нөхцөлийг зөвшөөрөхгүй бол уншиж болохуйц дуут шууданг идэвхгүй болгоно.</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_downgrade">Цуцлах</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_message">Хэрэв та уншиж болох дуут шууданг унтраавал Уншиж болох дуут шуудан идэвхгүй болно.</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_downgrade">Цуцлах</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message">Дуут шууданд зөвхөн *86 руу залгаж хандах боломжтой. Үргэлжлүүлэхийн тулд шинэ дуут шуудангийн PIN тохируулна уу.</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin">PIN тохируулах</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/error/res/values-mr/strings.xml b/java/com/android/dialer/voicemail/listui/error/res/values-mr/strings.xml
new file mode 100644
index 0000000..c46ce78
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/error/res/values-mr/strings.xml
@@ -0,0 +1,102 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_error_activating_title">व्हिज्युअल व्हॉइसमेल सुरू करत आहे</string>
+  <string name="voicemail_error_activating_message">व्हिज्युअल व्हॉइसमेल पूर्णपणे सुरू होईपर्यंत तुम्हाला कदाचित व्हॉइसमेल सूचना मिळणार नाहीत. व्हॉइसमेल पूर्णपणे सुरू होईपर्यंत नवीन मेसेज पुन्हा मिळवण्यासाठी व्हॉइसमेलवर कॉल करा.</string>
+  <string name="voicemail_error_not_activate_no_signal_title">व्हिज्युअल व्हॉइसमेल सुरू करू शकत नाही</string>
+  <string name="voicemail_error_not_activate_no_signal_message">तुमच्या फोनमध्‍ये मोबाइल नेटवर्क कनेक्शन आहे याची खात्री करा आणि पुन्हा प्रयत्न करा.</string>
+  <string name="voicemail_error_not_activate_no_signal_airplane_mode_message">विमान मोड बंद करा आणि पुन्हा प्रयत्न करा.</string>
+  <string name="voicemail_error_no_signal_title">कनेक्शन नाही</string>
+  <string name="voicemail_error_no_signal_message">तुम्हाला नवीन व्हॉइसमेलसाठी सूचित केले जाणार नाही. तुम्ही वाय-फायवर असल्यास, आता सिंक करून व्हॉइसमेल तपासू शकता.</string>
+  <string name="voicemail_error_no_signal_airplane_mode_message">तुम्हाला नवीन व्हॉइसमेलसाठी सूचित केले जाणार नाही. तुमचा व्हॉइसमेल सिंक करण्यासाठी विमान मोड बंद करा.</string>
+  <string name="voicemail_error_no_signal_cellular_required_message">व्हॉइसमेल तपासण्यासाठी तुमच्या फोनला मोबाइल डेटा कनेक्शनची गरज आहे.</string>
+  <string name="voicemail_error_activation_failed_title">व्हिज्युअल व्हॉइसमेल सुरू करू शकत नाही</string>
+  <string name="voicemail_error_activation_failed_message">व्हॉइसमेल तपासण्यासाठी तुम्ही तरीही कॉल करू शकता.</string>
+  <string name="voicemail_error_no_data_title">व्हिज्युअल व्हॉइसमेल अपडेट करू शकत नाही</string>
+  <string name="voicemail_error_no_data_message">तुमचे वाय‑फाय किंवा मोबाइल डेटा कनेक्शन आणखी चांगले असताना पुन्हा प्रयत्न करा. व्हॉइसमेल तपासण्यासाठी तुम्ही तरीही कॉल करू शकता.</string>
+  <string name="voicemail_error_no_data_cellular_required_message">तुमचे मोबाइल डेटा कनेक्शन आणखी चांगले असताना पुन्हा प्रयत्न करा. व्हॉइसमेल तपासण्यासाठी तुम्ही तरीही कॉल करू शकता.</string>
+  <string name="voicemail_error_bad_config_title">व्हिज्युअल व्हॉइसमेल अपडेट करू शकत नाही</string>
+  <string name="voicemail_error_bad_config_message">व्हॉइसमेल तपासण्यासाठी तुम्ही तरीही कॉल करू शकता.</string>
+  <string name="voicemail_error_communication_title">व्हिज्युअल व्हॉइसमेल अपडेट करू शकत नाही</string>
+  <string name="voicemail_error_communication_message">व्हॉइसमेल तपासण्यासाठी तुम्ही तरीही कॉल करू शकता.</string>
+  <string name="voicemail_error_server_connection_title">व्हिज्युअल व्हॉइसमेल अपडेट करू शकत नाही</string>
+  <string name="voicemail_error_server_connection_message">व्हॉइसमेल तपासण्यासाठी तुम्ही तरीही कॉल करू शकता.</string>
+  <string name="voicemail_error_server_title">व्हिज्युअल व्हॉइसमेल अपडेट करू शकत नाही</string>
+  <string name="voicemail_error_server_message">व्हॉइसमेल तपासण्यासाठी तुम्ही तरीही कॉल करू शकता.</string>
+  <string name="voicemail_error_inbox_near_full_title">इनबॉक्स जवळजवळ भरलेला आहे</string>
+  <string name="voicemail_error_inbox_near_full_message">तुमचा इनबॉक्स भरलेला असल्यास तुम्हाला नवीन व्हॉइसमेल मिळवता येणार नाही.</string>
+  <string name="voicemail_error_inbox_full_title">नवीन व्हॉइसमेल मिळवू शकत नाही</string>
+  <string name="voicemail_error_inbox_full_message">तुमचा इनबॉक्स भरलेला आहे. नवीन व्हॉइसमेल मिळवण्यासाठी काही मेसेज हटवून पहा.</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_title">अतिरिक्त स्टोरेज आणि बॅकअप चालू करा</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_message">तुमचा मेलबॉक्स भरलेला आहे. जागा मोकळी करण्यासाठी, अतिरिक्त स्टोरेज चालू करा, ज्यामुळे Google ला तुमचे व्हॉइसमेल मेसेज व्यवस्थापित करता येतील आणि त्यांचा बॅकअप घेता येईल.</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_title">अतिरिक्त स्टोरेज आणि बॅकअप चालू करा</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_message">तुमचा मेलबॉक्स जवळजवळ भरलेला आहे. जागा मोकळी करण्यासाठी, अतिरिक्त स्टोरेज चालू करा, ज्यामुळे Google ला तुमचे व्हॉइसमेल मेसेज व्यवस्थापित करता येतील आणि त्यांचा बॅकअप घेता येईल.</string>
+  <string name="voicemail_error_pin_not_set_title">तुमचा व्हॉइसमेल पिन सेट करा</string>
+  <string name="voicemail_error_pin_not_set_message">तुम्ही कधीही कॉल करता तेव्हा तुमचा व्हॉइसमेल अॅक्सेस करण्यासाठी तुम्हाला व्हॉइसमेल पिन लागेल.</string>
+  <string name="voicemail_action_turn_off_airplane_mode">विमान मोड सेटिंग्ज</string>
+  <string name="voicemail_action_set_pin">पिन सेट करा</string>
+  <string name="voicemail_action_retry">पुन्हा प्रयत्न करा</string>
+  <string name="voicemail_action_turn_archive_on">चालू करा</string>
+  <string name="voicemail_action_dimiss">नको, धन्यवाद</string>
+  <string name="voicemail_action_sync">सिंक करा</string>
+  <string name="voicemail_action_call_voicemail">व्हॉइसमेलवर कॉल करा</string>
+  <string name="voicemail_action_call_customer_support">ग्राहक साहाय्यला कॉल करा</string>
+  <string name="vvm3_error_vms_dns_failure_title">काहीतरी चूक झाली</string>
+  <string name="vvm3_error_vms_dns_failure_message">क्षमस्व, आम्हाला एक समस्या आली आहे. कृपया नंतर पुन्हा प्रयत्न करा. तरीही समस्या असल्यास, %1$s वर ग्राहक सेवेशी संपर्क साधा आणि त्यांना एरर कोड 9001 असल्याचे सांगा.</string>
+  <string name="vvm3_error_vmg_dns_failure_title">काहीतरी चूक झाली</string>
+  <string name="vvm3_error_vmg_dns_failure_message">क्षमस्व, आम्हाला एक समस्या आली आहे. कृपया नंतर पुन्हा प्रयत्न करा. तरीही समस्या असल्यास, %1$s वर ग्राहक सेवेशी संपर्क साधा आणि त्यांना एरर कोड 9002 असल्याचे सांगा.</string>
+  <string name="vvm3_error_spg_dns_failure_title">काहीतरी चूक झाली</string>
+  <string name="vvm3_error_spg_dns_failure_message">क्षमस्व, आम्हाला एक समस्या आली आहे. कृपया नंतर पुन्हा प्रयत्न करा. तरीही समस्या असल्यास, %1$s वर ग्राहक सेवेशी संपर्क साधा आणि त्यांना एरर कोड 9003 असल्याचे सांगा.</string>
+  <string name="vvm3_error_vms_no_cellular_title">तुमच्या व्हॉइस मेलबॉक्सशी कनेक्ट करू शकत नाही</string>
+  <string name="vvm3_error_vms_no_cellular_message">क्षमस्व, आम्हाला तुमच्या व्हॉइस मेलबॉक्सशी कनेक्ट करताना अडचण येत आहे. तुम्ही खराब सिग्नल असलेल्या भागात असल्यास, सिग्नल सुरळीत होईपर्यंत वाट पहा आणि पुन्हा प्रयत्न करा. तरीही समस्या असल्यास, %1$s वर ग्राहक सेवेशी संपर्क साधा आणि त्यांना एरर कोड 9004 असल्याचे सांगा.</string>
+  <string name="vvm3_error_vmg_no_cellular_title">तुमच्या व्हॉइस मेलबॉक्सशी कनेक्ट करू शकत नाही</string>
+  <string name="vvm3_error_vmg_no_cellular_message">क्षमस्व, आम्हाला तुमच्या व्हॉइस मेलबॉक्सशी कनेक्ट करताना अडचण येत आहे. तुम्ही खराब सिग्नल असलेल्या भागात असल्यास, सिग्नल सुरळीत होईपर्यंत वाट पहा आणि पुन्हा प्रयत्न करा. तरीही समस्या असल्यास, %1$s वर ग्राहक सेवेशी संपर्क साधा आणि त्यांना एरर कोड 9005 असल्याचे सांगा.</string>
+  <string name="vvm3_error_spg_no_cellular_title">तुमच्या व्हॉइस मेलबॉक्सशी कनेक्ट करू शकत नाही</string>
+  <string name="vvm3_error_spg_no_cellular_message">क्षमस्व, आम्हाला तुमच्या व्हॉइस मेलबॉक्सशी कनेक्ट करताना अडचण येत आहे. तुम्ही खराब सिग्नल असलेल्या भागात असल्यास, सिग्नल सुरळीत होईपर्यंत वाट पहा आणि पुन्हा प्रयत्न करा. तरीही समस्या असल्यास, %1$s वर ग्राहक सेवेशी संपर्क साधा आणि त्यांना एरर कोड 9006 असल्याचे सांगा.</string>
+  <string name="vvm3_error_vms_timeout_title">काहीतरी चूक झाली</string>
+  <string name="vvm3_error_vms_timeout_message">क्षमस्व, आम्हाला एक समस्या आली आहे. कृपया नंतर पुन्हा प्रयत्न करा. तरीही समस्या असल्यास, %1$s वर ग्राहक सेवेशी संपर्क साधा आणि त्यांना एरर कोड 9007 असल्याचे सांगा.</string>
+  <string name="vvm3_error_vmg_timeout_title">काहीतरी चूक झाली</string>
+  <string name="vvm3_error_vmg_timeout_message">क्षमस्व, आम्हाला एक समस्या आली आहे. कृपया नंतर पुन्हा प्रयत्न करा. तरीही समस्या असल्यास, %1$s वर ग्राहक सेवेशी संपर्क साधा आणि त्यांना एरर कोड 9008 असल्याचे सांगा.</string>
+  <string name="vvm3_error_status_sms_timeout_title">काहीतरी चूक झाली</string>
+  <string name="vvm3_error_status_sms_timeout_message">क्षमस्व, आम्हाला तुमची सेवा सेट करताना अडचण येत आहे. कृपया नंतर पुन्हा प्रयत्न करा. तरीही समस्या असल्यास, %1$s वर ग्राहक सेवेशी संपर्क साधा आणि त्यांना एरर कोड 9009 असल्याचे सांगा.</string>
+  <string name="vvm3_error_subscriber_blocked_title">तुमच्या व्हॉइस मेलबॉक्सशी कनेक्ट करू शकत नाही</string>
+  <string name="vvm3_error_subscriber_blocked_message">क्षमस्व, आम्ही या वेळी तुमच्या व्हॉइस मेलबॉक्सशी कनेक्ट करू शकत नाही. कृपया नंतर पुन्हा प्रयत्न करा. तरीही समस्या असल्यास, %1$s वर ग्राहक सेवेशी संपर्क साधा आणि त्यांना एरर कोड 9990 असल्याचे सांगा.</string>
+  <string name="vvm3_error_unknown_user_title">व्हॉइसमेल सेट करा</string>
+  <string name="vvm3_error_unknown_user_message">तुमच्या खात्यावर व्हॉइसमेल सेट केलेला नाही. कृपया %1$s वर ग्राहक सेवेशी संपर्क साधा आणि त्यांना एरर कोड 9991 असल्याचे सांगा.</string>
+  <string name="vvm3_error_unknown_device_title">व्हॉइसमेल</string>
+  <string name="vvm3_error_unknown_device_message">व्हिज्युअल व्हॉइसमेल या डिव्हाइसवर वापरला जाऊ शकत नाही. कृपया %1$s वर ग्राहक सेवेशी संपर्क साधा आणि त्यांना एरर कोड 9992 असल्याचे सांगा.</string>
+  <string name="vvm3_error_invalid_password_title">काहीतरी चूक झाली</string>
+  <string name="vvm3_error_invalid_password_message">कृपया %1$s वर ग्राहक सेवेशी संपर्क साधा आणि त्यांना एरर कोड 9993 असल्याचे सांगा.</string>
+  <string name="vvm3_error_mailbox_not_initialized_title">व्हिज्युअल व्हॉइसमेल</string>
+  <string name="vvm3_error_mailbox_not_initialized_message">व्हिज्युअल व्हॉइसमेल सेट अप पूर्ण करण्यासाठी, कृपया %1$s वर ग्राहक सेवेशी संपर्क साधा आणि त्यांना एरर कोड 9994 असल्याचे सांगा.</string>
+  <string name="vvm3_error_service_not_provisioned_title">व्हिज्युअल व्हॉइसमेल</string>
+  <string name="vvm3_error_service_not_provisioned_message">व्हिज्युअल व्हॉइसमेल सेटअप पूर्ण करण्यासाठी, कृपया %1$s वर ग्राहक सेवेशी संपर्क साधा आणि त्यांना एरर कोड 9995 असल्याचे सांगा.</string>
+  <string name="vvm3_error_service_not_activated_title">व्हिज्युअल व्हॉइसमेल</string>
+  <string name="vvm3_error_service_not_activated_message">व्हिज्युअल व्हॉइसमेल सुरू करण्यासाठी, कृपया %1$s वर ग्राहक सेवेशी संपर्क साधा आणि त्यांना एरर कोड 9996 असल्याचे सांगा.</string>
+  <string name="vvm3_error_user_blocked_title">काहीतरी चूक झाली</string>
+  <string name="vvm3_error_user_blocked_message">व्हिज्युअल व्हॉइसमेल सेटअप पूर्ण करण्यासाठी, कृपया %1$s वर ग्राहक सेवेशी संपर्क साधा आणि त्यांना एरर कोड 9998 असल्याचे सांगा.</string>
+  <string name="vvm3_error_subscriber_unknown_title">व्हिज्युअल व्हॉइसमेल बंद केलेला आहे</string>
+  <string name="vvm3_error_subscriber_unknown_message">व्हिज्युअल व्हॉइसमेल सुरू करण्यासाठी कृपया %1$s वर ग्राहक सेवेशी संपर्क साधा.</string>
+  <string name="vvm3_error_imap_getquota_error_title">काहीतरी चूक झाली</string>
+  <string name="vvm3_error_imap_getquota_error_message">कृपया %1$s वर ग्राहक सेवेशी संपर्क साधा आणि त्यांना एरर कोड 9997 असल्याचे सांगा.</string>
+  <string name="vvm3_error_imap_select_error_title">काहीतरी चूक झाली</string>
+  <string name="vvm3_error_imap_select_error_message">कृपया %1$s वर ग्राहक सेवेशी संपर्क साधा आणि त्यांना एरर कोड 9989 असल्याचे सांगा.</string>
+  <string name="vvm3_error_imap_error_title">काहीतरी चूक झाली</string>
+  <string name="vvm3_error_imap_error_message">कृपया %1$s वर ग्राहक सेवेशी संपर्क साधा आणि त्यांना एरर कोड 9999 असल्याचे सांगा.</string>
+  <string name="verizon_terms_and_conditions_title">व्हिज्युअल व्हॉइसमेल चालू करा</string>
+  <string name="verizon_terms_and_conditions_message">%1$s व्हिज्युअल व्हॉइसमेल चालू करून तुम्ही Verizon वायरलेसच्या अटी आणि नियमांना सहमती दर्शवता:\n\n%2$s</string>
+  <string name="dialer_terms_and_conditions_title">व्हिज्युअल व्हॉइसमेल चालू करा</string>
+  <string name="dialer_terms_and_conditions_existing_user_title">नवीन! तुमचा व्‍हॉइसमेल वाचा</string>
+  <string name="dialer_terms_and_conditions_message">%s</string>
+  <string name="dialer_terms_and_conditions_1.0">व्‍हॉइसमेलवर कॉल करावा न लागता, तुमचे मेसेज पाहा आणि ऐका. Google च्या मोफत प्रतिलेखन सेवेद्वारे तुमच्‍या व्‍हॉइसमेलचे प्रतिलेख पुरवले जातात. तुम्ही सेटिंग्जमध्ये दोन्ही कधीही बंद करू शकता %s</string>
+  <string name="dialer_terms_and_conditions_existing_user">आता Google च्या मोफत प्रतिलेखन सेवेद्वारे तुमच्‍या व्‍हॉइसमेलचे प्रतिलेख पुरवले जातात. तुम्‍ही हे सेटिंग्जमध्ये कधीही बंद करू शकता. %s</string>
+  <string name="dialer_terms_and_conditions_for_verizon_1.0">व्हॉइसमेलवर कॉल न करताच, तुमचे मेसेज पहा आणि ऐका.</string>
+  <string name="dialer_terms_and_conditions_learn_more">अधिक जाणून घ्या</string>
+  <string name="dialer_terms_and_conditions_existing_user_ack">ठीक आहे, समजले</string>
+  <string name="dialer_terms_and_conditions_existing_user_decline">नाही नको</string>
+  <string name="terms_and_conditions_decline_dialog_title">व्हिज्युअल व्हॉइसमेल बंद करायचा?</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_message">अटी आणि नियम नाकारल्यास व्हिज्युअल व्हॉइसमेल बंद केला जाईल.</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_downgrade">बंद करा</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_message">तुम्ही व्हिज्युअल व्हॉइसमेल बंद केल्यास व्हिज्युअल व्हॉइसमेल बंद होईल.</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_downgrade">बंद करा</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message">व्हॉइसमेल केवळ *86 वर कॉल करून अ‍ॅक्सेस करता येईल. पुढे सुरू ठेवण्यासाठी नवीन व्हॉइसमेल पिन सेट करा.</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin">पिन सेट करा</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/error/res/values-ms/strings.xml b/java/com/android/dialer/voicemail/listui/error/res/values-ms/strings.xml
new file mode 100644
index 0000000..b9f14ee
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/error/res/values-ms/strings.xml
@@ -0,0 +1,102 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_error_activating_title">Mengaktifkan mel suara visual</string>
+  <string name="voicemail_error_activating_message">Anda mungkin tidak menerima pemberitahuan mel suara sehingga mel suara visual diaktifkan sepenuhnya. Panggil mel suara untuk mengambil mesej baharu sehingga mel suara diaktifkan sepenuhnya.</string>
+  <string name="voicemail_error_not_activate_no_signal_title">Tidak dapat mengaktifkan mel suara visual</string>
+  <string name="voicemail_error_not_activate_no_signal_message">Pastikan telefon anda mempunyai sambungan rangkaian mudah alih, kemudian cuba lagi.</string>
+  <string name="voicemail_error_not_activate_no_signal_airplane_mode_message">Matikan mod pesawat, kemudian cuba lagi.</string>
+  <string name="voicemail_error_no_signal_title">Tiada sambungan</string>
+  <string name="voicemail_error_no_signal_message">Anda tidak akan dimaklumi tentang mel suara baharu. Jika anda menggunakan Wi-Fi, anda boleh menyemak mel suara dengan menyegerak sekarang.</string>
+  <string name="voicemail_error_no_signal_airplane_mode_message">Anda tidak akan diberitahu tentang mel suara baharu. Matikan mod pesawat untuk menyegerakkan mel suara anda.</string>
+  <string name="voicemail_error_no_signal_cellular_required_message">Telefon anda memerlukan sambungan data mudah alih untuk menyemak mel suara.</string>
+  <string name="voicemail_error_activation_failed_title">Tidak dapat mengaktifkan mel suara visual</string>
+  <string name="voicemail_error_activation_failed_message">Anda masih dapat membuat panggilan untuk menyemak mel suara.</string>
+  <string name="voicemail_error_no_data_title">Tidak dapat mengemas kini mel suara visual</string>
+  <string name="voicemail_error_no_data_message">Cuba lagi apabila sambungan Wi-Fi atau data mudah alih anda lebih bagus. Anda masih dapat membuat panggilan untuk menyemak mel suara.</string>
+  <string name="voicemail_error_no_data_cellular_required_message">Cuba lagi apabila sambungan data mudah alih anda lebih bagus. Anda masih dapat membuat panggilan untuk menyemak mel suara.</string>
+  <string name="voicemail_error_bad_config_title">Tidak dapat mengemas kini mel suara visual</string>
+  <string name="voicemail_error_bad_config_message">Anda masih dapat membuat panggilan untuk menyemak mel suara.</string>
+  <string name="voicemail_error_communication_title">Tidak dapat mengemas kini mel suara visual</string>
+  <string name="voicemail_error_communication_message">Anda masih dapat membuat panggilan untuk menyemak mel suara.</string>
+  <string name="voicemail_error_server_connection_title">Tidak dapat mengemas kini mel suara visual</string>
+  <string name="voicemail_error_server_connection_message">Anda masih dapat membuat panggilan untuk menyemak mel suara.</string>
+  <string name="voicemail_error_server_title">Tidak dapat mengemas kini mel suara visual</string>
+  <string name="voicemail_error_server_message">Anda masih dapat membuat panggilan untuk menyemak mel suara.</string>
+  <string name="voicemail_error_inbox_near_full_title">Peti masuk hampir penuh</string>
+  <string name="voicemail_error_inbox_near_full_message">Anda tidak akan dapat menerima mel suara baharu jika peti masuk anda penuh.</string>
+  <string name="voicemail_error_inbox_full_title">Tidak dapat menerima mel suara baharu</string>
+  <string name="voicemail_error_inbox_full_message">Peti masuk anda penuh. Cuba padamkan beberapa mesej untuk menerima mel suara baharu.</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_title">Hidupkan storan tambahan dan sandaran</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_message">Peti mel anda penuh. Untuk mengosongkan ruang, hidupkan storan tambahan supaya Google dapat mengurus dan menyandarkan mesej mel suara anda.</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_title">Hidupkan storan tambahan dan sandaran</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_message">Peti mel anda hampir penuh. Untuk mengosongkan ruang, hidupkan storan tambahan supaya Google dapat mengurus dan menyandarkan mesej mel suara anda.</string>
+  <string name="voicemail_error_pin_not_set_title">Tetapkan PIN mel suara anda</string>
+  <string name="voicemail_error_pin_not_set_message">Anda memerlukan PIN mel suara setiap kali anda memanggil untuk mengakses mel suara anda.</string>
+  <string name="voicemail_action_turn_off_airplane_mode">Tetapan Mod Pesawat</string>
+  <string name="voicemail_action_set_pin">Tetapkan PIN</string>
+  <string name="voicemail_action_retry">Cuba Lagi</string>
+  <string name="voicemail_action_turn_archive_on">Hidupkan</string>
+  <string name="voicemail_action_dimiss">Tidak Perlu</string>
+  <string name="voicemail_action_sync">Segerakkan</string>
+  <string name="voicemail_action_call_voicemail">Panggil Mel Suara</string>
+  <string name="voicemail_action_call_customer_support">Panggil Sokongan Pelanggan</string>
+  <string name="vvm3_error_vms_dns_failure_title">Kesilapan Telah Berlaku</string>
+  <string name="vvm3_error_vms_dns_failure_message">Harap maaf, kami menghadapi masalah. Sila cuba sebentar lagi. Jika masih terdapat masalah, sila hubungi Khidmat Pelanggan melalui %1$s dan beritahu mereka kod ralatnya ialah 9001.</string>
+  <string name="vvm3_error_vmg_dns_failure_title">Kesilapan Telah Berlaku</string>
+  <string name="vvm3_error_vmg_dns_failure_message">Harap maaf, kami menghadapi masalah. Sila cuba sebentar lagi. Jika masih terdapat masalah, sila hubungi Khidmat Pelanggan melalui %1$s dan beritahu mereka kod ralatnya ialah 9002.</string>
+  <string name="vvm3_error_spg_dns_failure_title">Kesilapan Telah Berlaku</string>
+  <string name="vvm3_error_spg_dns_failure_message">Harap maaf, kami menghadapi masalah. Sila cuba sebentar lagi. Jika masih terdapat masalah, sila hubungi Khidmat Pelanggan melalui %1$s dan beritahu mereka kod ralatnya ialah 9003.</string>
+  <string name="vvm3_error_vms_no_cellular_title">Tidak Dapat Menyambung ke Peti Mel Suara Anda</string>
+  <string name="vvm3_error_vms_no_cellular_message">Harap maaf, kami menghadapi masalah menyambung ke peti mel suara anda. Jika isyarat lemah di kawasan anda, sila tunggu sehingga isyarat kuat dan cuba lagi. Jika masih terdapat masalah, sila hubungi Khidmat Pelanggan melalui %1$s dan beritahu mereka kod ralatnya ialah 9004.</string>
+  <string name="vvm3_error_vmg_no_cellular_title">Tidak Dapat Menyambung ke Peti Mel Suara Anda</string>
+  <string name="vvm3_error_vmg_no_cellular_message">Harap maaf, kami menghadapi masalah menyambung ke peti mel suara anda. Jika isyarat lemah di kawasan anda, sila tunggu sehingga isyarat kuat dan cuba lagi. Jika masih terdapat masalah, sila hubungi Khidmat Pelanggan melalui %1$s dan beritahu mereka kod ralatnya ialah 9005.</string>
+  <string name="vvm3_error_spg_no_cellular_title">Tidak Dapat Menyambung ke Peti Mel Suara Anda</string>
+  <string name="vvm3_error_spg_no_cellular_message">Harap maaf, kami menghadapi masalah menyambung ke peti mel suara anda. Jika isyarat lemah di kawasan anda, sila tunggu sehingga isyarat kuat dan cuba lagi. Jika masih terdapat masalah, sila hubungi Khidmat Pelanggan melalui %1$s dan beritahu mereka kod ralatnya ialah 9006.</string>
+  <string name="vvm3_error_vms_timeout_title">Kesilapan Telah Berlaku</string>
+  <string name="vvm3_error_vms_timeout_message">Harap maaf, kami menghadapi masalah. Sila cuba sebentar lagi. Jika masih terdapat masalah, sila hubungi Khidmat Pelanggan melalui %1$s dan beritahu mereka kod ralatnya ialah 9007.</string>
+  <string name="vvm3_error_vmg_timeout_title">Kesilapan Telah Berlaku</string>
+  <string name="vvm3_error_vmg_timeout_message">Harap maaf, kami menghadapi masalah. Sila cuba sebentar lagi. Jika masih terdapat masalah, sila hubungi Khidmat Pelanggan melalui %1$s dan beritahu mereka kod ralatnya ialah 9008.</string>
+  <string name="vvm3_error_status_sms_timeout_title">Kesilapan Telah Berlaku</string>
+  <string name="vvm3_error_status_sms_timeout_message">Harap maaf, kami menghadapi masalah menyediakan perkhidmatan anda. Sila cuba sebentar lagi. Jika masih terdapat masalah, sila hubungi Khidmat Pelanggan melalui %1$s dan beritahu mereka kod ralatnya ialah 9009.</string>
+  <string name="vvm3_error_subscriber_blocked_title">Tidak Dapat Menyambung ke Peti Mel Suara Anda</string>
+  <string name="vvm3_error_subscriber_blocked_message">Harap maaf, kami tidak dapat menyambung ke peti mel suara anda pada masa ini. Sila cuba sebentar lagi. Jika masih terdapat masalah, sila hubungi Khidmat Pelanggan melalui %1$s dan beritahu mereka kod ralatnya ialah 9990.</string>
+  <string name="vvm3_error_unknown_user_title">Sediakan Mel Suara</string>
+  <string name="vvm3_error_unknown_user_message">Mel suara tidak disediakan pada akaun anda. Sila hubungi Khidmat Pelanggan melalui %1$s dan beritahu mereka kod ralatnya ialah 9991.</string>
+  <string name="vvm3_error_unknown_device_title">Mel suara</string>
+  <string name="vvm3_error_unknown_device_message">Mel Suara Visual tidak dapat digunakan pada peranti ini. Sila hubungi Khidmat Pelanggan melalui %1$s dan beritahu mereka kod ralatnya ialah 9992.</string>
+  <string name="vvm3_error_invalid_password_title">Kesilapan Telah Berlaku</string>
+  <string name="vvm3_error_invalid_password_message">Sila hubungi Khidmat Pelanggan melalui %1$s dan beritahu mereka kod ralatnya ialah 9993.</string>
+  <string name="vvm3_error_mailbox_not_initialized_title">Mel suara visual</string>
+  <string name="vvm3_error_mailbox_not_initialized_message">Untuk melengkapkan persediaan mel suara visual, sila hubungi Khidmat Pelanggan melalui %1$s dan beritahu mereka kod ralatnya ialah 9994.</string>
+  <string name="vvm3_error_service_not_provisioned_title">Mel suara visual</string>
+  <string name="vvm3_error_service_not_provisioned_message">Untuk melengkapkan persediaan mel suara visual, sila hubungi Khidmat Pelanggan melalui %1$s dan beritahu mereka kod ralatnya ialah 9995.</string>
+  <string name="vvm3_error_service_not_activated_title">Mel suara visual</string>
+  <string name="vvm3_error_service_not_activated_message">Untuk mengaktifkan mel suara visual, sila hubungi Khidmat Pelanggan di %1$s dan beritahu mereka kod ralatnya ialah 9996.</string>
+  <string name="vvm3_error_user_blocked_title">Kesilapan Telah Berlaku</string>
+  <string name="vvm3_error_user_blocked_message">Untuk melengkapkan persediaan mel suara visual, sila hubungi Khidmat Pelanggan melalui %1$s dan beritahu mereka kod ralatnya ialah 9998.</string>
+  <string name="vvm3_error_subscriber_unknown_title">Mel suara visual dilumpuhkan</string>
+  <string name="vvm3_error_subscriber_unknown_message">Sila hubungi Khidmat Pelanggan melalui %1$s untuk mengaktifkan mel suara visual.</string>
+  <string name="vvm3_error_imap_getquota_error_title">Kesilapan Telah Berlaku</string>
+  <string name="vvm3_error_imap_getquota_error_message">Sila hubungi Khidmat Pelanggan melalui %1$s dan beritahu mereka bahawa kod ralatnya ialah 9997.</string>
+  <string name="vvm3_error_imap_select_error_title">Kesilapan Telah Berlaku</string>
+  <string name="vvm3_error_imap_select_error_message">Sila hubungi Khidmat Pelanggan melalui %1$s dan beritahu mereka kod ralatnya ialah 9989.</string>
+  <string name="vvm3_error_imap_error_title">Kesilapan Telah Berlaku</string>
+  <string name="vvm3_error_imap_error_message">Sila hubungi Khidmat Pelanggan melalui %1$s dan beritahu mereka kod ralatnya ialah 9999.</string>
+  <string name="verizon_terms_and_conditions_title">Hidupkan mel suara visual</string>
+  <string name="verizon_terms_and_conditions_message">%1$s Dengan menghidupkan mel suara visual, anda bersetuju menerima terma dan syarat Verizon Wireless:\n\n%2$s</string>
+  <string name="dialer_terms_and_conditions_title">Hidupkan mel suara visual</string>
+  <string name="dialer_terms_and_conditions_existing_user_title">Baharu! Baca mel suara anda</string>
+  <string name="dialer_terms_and_conditions_message">%s</string>
+  <string name="dialer_terms_and_conditions_1.0">Lihat dan dengar mesej anda tanpa memanggil mel suara. Transkrip mel suara anda disediakan oleh perkhidmatan transkripsi percuma Google. Anda boleh mematikan mana-mana pilihan ini dalam Tetapan pada bila-bila masa. %s</string>
+  <string name="dialer_terms_and_conditions_existing_user">Transkrip mel suara anda kini disediakan oleh perkhidmatan transkripsi percuma Google. Anda boleh mematikan pilihan ini pada bila-bila masa dalam Tetapan. %s</string>
+  <string name="dialer_terms_and_conditions_for_verizon_1.0">Lihat dan dengar mesej anda tanpa memanggil mel suara.</string>
+  <string name="dialer_terms_and_conditions_learn_more">Ketahui lebih lanjut</string>
+  <string name="dialer_terms_and_conditions_existing_user_ack">OK</string>
+  <string name="dialer_terms_and_conditions_existing_user_decline">Tidak Perlu</string>
+  <string name="terms_and_conditions_decline_dialog_title">Lumpuhkan mel suara visual?</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_message">Mel suara visual akan dilumpuhkan jika terma dan syarat ditolak.</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_downgrade">Lumpuhkan</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_message">Mel suara visual akan dilumpuhkan jika anda mematikan mel suara visual.</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_downgrade">Lumpuhkan</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message">Mel suara hanya dapat diakses dengan memanggil *86. Tetapkan PIN mel suara baharu untuk meneruskan.</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin">Tetapkan PIN</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/error/res/values-my/strings.xml b/java/com/android/dialer/voicemail/listui/error/res/values-my/strings.xml
new file mode 100644
index 0000000..03821b6
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/error/res/values-my/strings.xml
@@ -0,0 +1,102 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_error_activating_title">ကြည့်ရှုစီမံနိုင်သော အသံမေးလ်ကို ဖွင့်နေသည်</string>
+  <string name="voicemail_error_activating_message">ကြည့်ရှုစီမံနိုင်သောအသံမေးလ်ကို ဖွင့်၍မပြီးသေးမီ အသံမေးလ်အသိပေးချက်များကို လက်ခံနိုင်မည် မဟုတ်ပါ။ အသံမေးလ်မပွင့်မီ မက်ဆေ့ဂျ်အသစ်များကို ရယူရန် အသံမေးလ် ခေါ်ဆိုပါ။</string>
+  <string name="voicemail_error_not_activate_no_signal_title">ကြည့်ရှုစီမံနိုင်သော အသံမေးလ်ကို ဖွင့်၍မရပါ</string>
+  <string name="voicemail_error_not_activate_no_signal_message">သင့်ဖုန်းကို မိုဘိုင်းကွန်ရက်နှင့် ချိတ်ဆက်ထားခြင်းရှိ-မရှိ စစ်ဆေး၍ ထပ်လုပ်ကြည့်ပါ။</string>
+  <string name="voicemail_error_not_activate_no_signal_airplane_mode_message">လေယာဉ်ပျံမုဒ်ကို ပိတ်၍ ထပ်လုပ်ကြည့်ပါ။</string>
+  <string name="voicemail_error_no_signal_title">ချိတ်ဆက်မှု မရှိပါ</string>
+  <string name="voicemail_error_no_signal_message">အသံမေးလ်အသစ်များအတွက် သင့်ကို အသိပေးမည် မဟုတ်ပါ။ Wi‑Fi သုံးနေပါက စင့်ခ်လုပ်၍ အသံမေးလ်ကို ကြည့်နိုင်ပါပြီ။</string>
+  <string name="voicemail_error_no_signal_airplane_mode_message">အသံမေးလ်အသစ်များအတွက် သင့်ကို အသိပေးမည် မဟုတ်ပါ။ သင့်အသံမေးလ်ကို စင့်ခ်လုပ်ရန် လေယာဉ်ပျံမုဒ်ကို ပိတ်ပါ။</string>
+  <string name="voicemail_error_no_signal_cellular_required_message">အသံမေးလ်ကြည့်ရန်အတွက် သင့်ဖုန်းကို မိုဘိုင်းဒေတာနှင့် ချိတ်ဆက်ရပါမည်။</string>
+  <string name="voicemail_error_activation_failed_title">ကြည့်ရှုစီမံနိုင်သော အသံမေးလ်ကို ဖွင့်၍မရပါ</string>
+  <string name="voicemail_error_activation_failed_message">အသံမေးလ်ကြည့်ရန် ဖုန်းခေါ်နိုင်ပါသေးသည်။</string>
+  <string name="voicemail_error_no_data_title">ကြည့်ရှုစီမံနိုင်သော အသံမေးလ်ကို အပ်ဒိတ်လုပ်၍မရပါ</string>
+  <string name="voicemail_error_no_data_message">သင်၏ Wi‑Fi (သို့) မိုဘိုင်းဒေတာချိတ်ဆက်မှု ပိုကောင်းလာလျှင် ထပ်လုပ်ကြည့်ပါ။ အသံမေးလ်ကြည့်ရန် ဖုန်းခေါ်နိုင်ပါသေးသည်။</string>
+  <string name="voicemail_error_no_data_cellular_required_message">သင်၏ မိုဘိုင်းဒေတာချိတ်ဆက်မှု ပိုကောင်းလာလျှင် ထပ်လုပ်ကြည့်ပါ။ အသံမေးလ်ကြည့်ရန် ဖုန်းခေါ်နိုင်ပါသေးသည်။</string>
+  <string name="voicemail_error_bad_config_title">ကြည့်ရှုစီမံနိုင်သော အသံမေးလ်ကို အပ်ဒိတ်လုပ်၍မရပါ</string>
+  <string name="voicemail_error_bad_config_message">အသံမေးလ်ကြည့်ရန် ဖုန်းခေါ်နိုင်ပါသေးသည်။</string>
+  <string name="voicemail_error_communication_title">ကြည့်ရှုစီမံနိုင်သော အသံမေးလ်ကို အပ်ဒိတ်လုပ်၍မရပါ</string>
+  <string name="voicemail_error_communication_message">အသံမေးလ်ကြည့်ရန် ဖုန်းခေါ်နိုင်ပါသေးသည်။</string>
+  <string name="voicemail_error_server_connection_title">ကြည့်ရှုစီမံနိုင်သော အသံမေးလ်ကို အပ်ဒိတ်လုပ်၍မရပါ</string>
+  <string name="voicemail_error_server_connection_message">အသံမေးလ်ကြည့်ရန် ဖုန်းခေါ်နိုင်ပါသေးသည်။</string>
+  <string name="voicemail_error_server_title">ကြည့်ရှုစီမံနိုင်သော အသံမေးလ်ကို အပ်ဒိတ်လုပ်၍မရပါ</string>
+  <string name="voicemail_error_server_message">အသံမေးလ်ကြည့်ရန် ဖုန်းခေါ်နိုင်ပါသေးသည်။</string>
+  <string name="voicemail_error_inbox_near_full_title">ဝင်စာ ပြည့်ခါနီးပါပြီ</string>
+  <string name="voicemail_error_inbox_near_full_message">သင့်ဝင်စာပြည့်နေပါက အသံမေးလ်အသစ်ကို လက်ခံနိုင်မည် မဟုတ်ပါ။</string>
+  <string name="voicemail_error_inbox_full_title">အသံမေးလ်အသစ်များကို လက်မခံနိုင်ပါ</string>
+  <string name="voicemail_error_inbox_full_message">သင့်ဝင်စာ ပြည့်နေပါပြီ။ အသံမေးလ်အသစ်ကို လက်ခံရန် မက်ဆေ့ဂျ်အချို့ ဖျက်ကြည့်ပါ။</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_title">အပိုသိုလှောင်မှုနှင့် မိတ္တူတို့ကို ဖွင့်ခြင်း</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_message">သင့်ဝင်စာ ပြည့်နေပါပြီ။ နေရာလွတ်ရရှိရန်အတွက် အပိုသိုလှောင်မှုဖွင့်ပါက Google သည် သင်၏ အသံမေးလ်မက်ဆေ့ဂျ်များကို စီမံခန့်ခွဲ၍ မိတ္တူကူးနိုင်ပါမည်။</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_title">အပိုသိုလှောင်မှုနှင့် မိတ္တူတို့ကို ဖွင့်ခြင်း</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_message">သင့်ဝင်စာ ပြည့်ခါနီးပါပြီ။ နေရာလွတ်ရရှိရန်အတွက် အပိုသိုလှောင်မှုဖွင့်ပါက Google သည် သင်၏ အသံမေးလ်မက်ဆေ့ဂျ်များကို စီမံခန့်ခွဲ၍ မိတ္တူကူးနိုင်ပါမည်။</string>
+  <string name="voicemail_error_pin_not_set_title">အသံမေးလ်ပင်နံပါတ် သတ်မှတ်ခြင်း</string>
+  <string name="voicemail_error_pin_not_set_message">သင့်အသံမေးလ်သို့ ဝင်ရန် ဖုန်းခေါ်ချိန်တိုင်း အသံမေးလ်ပင်နံပါတ် လိုအပ်ပါမည်။</string>
+  <string name="voicemail_action_turn_off_airplane_mode">လေယာဉ်ပျံမုဒ် ဆက်တင်များ</string>
+  <string name="voicemail_action_set_pin">ပင်နံပါတ် သတ်မှတ်ရန်</string>
+  <string name="voicemail_action_retry">ထပ်လုပ်ကြည့်ရန်</string>
+  <string name="voicemail_action_turn_archive_on">ဖွင့်ရန်</string>
+  <string name="voicemail_action_dimiss">မလိုတော့ပါ</string>
+  <string name="voicemail_action_sync">စင့်ခ်လုပ်ရန်</string>
+  <string name="voicemail_action_call_voicemail">အသံမေးလ် ခေါ်ဆိုရန်</string>
+  <string name="voicemail_action_call_customer_support">အကူအညီပေးရေးဌာနကို ဖုန်းခေါ်ရန်</string>
+  <string name="vvm3_error_vms_dns_failure_title">တစ်ခုခု မှားသွားပါသည်</string>
+  <string name="vvm3_error_vms_dns_failure_message">ဝမ်းနည်းပါသည်၊ ပြဿနာတစ်ခု ဖြစ်သွားပါသည်။ နောက်မှ ထပ်လုပ်ကြည့်ပါ။ ပြဿနာဖြစ်နေသေးပါက ဝန်ဆောင်မှုဌာနထံ %1$s ဖြင့် ဆက်သွယ်၍ အမှားကုဒ်မှာ ၉၀၀၁ ဖြစ်ကြောင်း ပြောပြပါ။</string>
+  <string name="vvm3_error_vmg_dns_failure_title">တစ်ခုခု မှားသွားပါသည်</string>
+  <string name="vvm3_error_vmg_dns_failure_message">ဝမ်းနည်းပါသည်၊ ပြဿနာတစ်ခု ဖြစ်သွားပါသည်။ နောက်မှ ထပ်လုပ်ကြည့်ပါ။ ပြဿနာဖြစ်နေသေးပါက ဝန်ဆောင်မှုဌာနထံ %1$s ဖြင့် ဆက်သွယ်၍ အမှားကုဒ်မှာ ၉၀၀၂ ဖြစ်ကြောင်း ပြောပြပါ။</string>
+  <string name="vvm3_error_spg_dns_failure_title">တစ်ခုခု မှားသွားပါသည်</string>
+  <string name="vvm3_error_spg_dns_failure_message">ဝမ်းနည်းပါသည်၊ ပြဿနာတစ်ခု ဖြစ်သွားပါသည်။ နောက်မှ ထပ်လုပ်ကြည့်ပါ။ ပြဿနာဖြစ်နေသေးပါက ဝန်ဆောင်မှုဌာနထံ %1$s ဖြင့် ဆက်သွယ်၍ အမှားကုဒ်မှာ ၉၀၀၃ ဖြစ်ကြောင်း ပြောပြပါ။</string>
+  <string name="vvm3_error_vms_no_cellular_title">သင်၏ အသံဝင်စာနှင့် ချိတ်ဆက်၍မရပါ</string>
+  <string name="vvm3_error_vms_no_cellular_message">ဝမ်းနည်းပါသည်၊ သင်၏ အသံဝင်စာနှင့် ချိတ်ဆက်ရာတွင် အခက်အခဲရှိနေပါသည်။ ချိတ်ဆက်မှုအားမကောင်းသောနေရာ၌ သင်ရှိနေပါက အားကောင်းလာသည်အထိ စောင့်ပြီး ထပ်လုပ်ပါ။ ပြဿနာဖြစ်နေသေးပါက ဝန်ဆောင်မှုဌာနထံ %1$s ဖြင့် ဆက်သွယ်၍ အမှားကုဒ်မှာ ၉၀၀၄ ဖြစ်ကြောင်း ပြောပြပါ။</string>
+  <string name="vvm3_error_vmg_no_cellular_title">သင်၏ အသံဝင်စာနှင့် ချိတ်ဆက်၍မရပါ</string>
+  <string name="vvm3_error_vmg_no_cellular_message">ဝမ်းနည်းပါသည်၊ သင်၏ အသံဝင်စာနှင့် ချိတ်ဆက်ရာတွင် အခက်အခဲရှိနေပါသည်။ ချိတ်ဆက်မှုအားမကောင်းသောနေရာ၌ သင်ရှိနေပါက အားကောင်းလာသည်အထိ စောင့်ပြီး ထပ်လုပ်ပါ။ ပြဿနာဖြစ်နေသေးပါက ဝန်ဆောင်မှုဌာနထံ %1$s ဖြင့် ဆက်သွယ်၍ အမှားကုဒ်မှာ ၉၀၀၅ ဖြစ်ကြောင်း ပြောပြပါ။</string>
+  <string name="vvm3_error_spg_no_cellular_title">သင်၏ အသံဝင်စာနှင့် ချိတ်ဆက်၍မရပါ</string>
+  <string name="vvm3_error_spg_no_cellular_message">ဝမ်းနည်းပါသည်၊ သင်၏ အသံဝင်စာနှင့် ချိတ်ဆက်ရာတွင် အခက်အခဲရှိနေပါသည်။ ချိတ်ဆက်မှုအားမကောင်းသောနေရာ၌ သင်ရှိနေပါက အားကောင်းလာသည်အထိ စောင့်ပြီး ထပ်လုပ်ပါ။ ပြဿနာဖြစ်နေသေးပါက ဝန်ဆောင်မှုဌာနထံ %1$s ဖြင့် ဆက်သွယ်၍ အမှားကုဒ်မှာ ၉၀၀၆ ဖြစ်ကြောင်း ပြောပြပါ။</string>
+  <string name="vvm3_error_vms_timeout_title">တစ်ခုခု မှားသွားပါသည်</string>
+  <string name="vvm3_error_vms_timeout_message">ဝမ်းနည်းပါသည်၊ ပြဿနာတစ်ခု ဖြစ်သွားပါသည်။ နောက်မှ ထပ်လုပ်ကြည့်ပါ။ ပြဿနာဖြစ်နေသေးပါက ဝန်ဆောင်မှုဌာနထံ %1$s ဖြင့် ဆက်သွယ်၍ အမှားကုဒ်မှာ ၉၀၀၇ ဖြစ်ကြောင်း ပြောပြပါ။</string>
+  <string name="vvm3_error_vmg_timeout_title">တစ်ခုခု မှားသွားပါသည်</string>
+  <string name="vvm3_error_vmg_timeout_message">ဝမ်းနည်းပါသည်၊ ပြဿနာတစ်ခု ဖြစ်သွားပါသည်။ နောက်မှ ထပ်လုပ်ကြည့်ပါ။ ပြဿနာဖြစ်နေသေးပါက ဝန်ဆောင်မှုဌာနထံ %1$s ဖြင့် ဆက်သွယ်၍ အမှားကုဒ်မှာ ၉၀၀၈ ဖြစ်ကြောင်း ပြောပြပါ။</string>
+  <string name="vvm3_error_status_sms_timeout_title">တစ်ခုခု မှားသွားပါသည်</string>
+  <string name="vvm3_error_status_sms_timeout_message">ဝမ်းနည်းပါသည်၊ သင့်အတွက် ဝန်ဆောင်မှုကို စီစဉ်သတ်မှတ်ရာတွင် အခက်အခဲရှိနေပါသည်။ ပြဿနာဖြစ်နေသေးပါက ဝန်ဆောင်မှုဌာနထံ %1$s ဖြင့် ဆက်သွယ်၍ အမှားကုဒ်မှာ ၉၀၀၉ ဖြစ်ကြောင်း ပြောပြပါ။</string>
+  <string name="vvm3_error_subscriber_blocked_title">သင်၏ အသံဝင်စာနှင့် ချိတ်ဆက်၍မရပါ</string>
+  <string name="vvm3_error_subscriber_blocked_message">ဝမ်းနည်းပါသည်၊ လတ်တလောတွင် သင်၏ အသံဝင်စာနှင့် ချိတ်ဆက်မပေးနိုင်ပါ။ နောက်မှ ထပ်လုပ်ကြည့်ပါ။ ပြဿနာဖြစ်နေသေးပါက ဝန်ဆောင်မှုဌာနထံ %1$s ဖြင့် ဆက်သွယ်၍ အမှားကုဒ်မှာ ၉၉၉၀ ဖြစ်ကြောင်း ပြောပြပါ။</string>
+  <string name="vvm3_error_unknown_user_title">အသံမေးလ် စီစဉ်သတ်မှတ်ခြင်း</string>
+  <string name="vvm3_error_unknown_user_message">သင့်အကောင့်တွင် အသံမေးလ်ကို စီစဉ်သတ်မှတ်မထားပါ။  ဝန်ဆောင်မှုဌာနထံ %1$s ဖြင့် ဆက်သွယ်၍ အမှားကုဒ်မှာ ၉၉၉၁ ဖြစ်ကြောင်း ပြောပြပါ။</string>
+  <string name="vvm3_error_unknown_device_title">အသံမေးလ်</string>
+  <string name="vvm3_error_unknown_device_message">ဤစက်တွင် ကြည့်ရှုစီမံနိုင်သော အသံမေးလ်ကို အသုံးမပြုနိုင်ပါ။ ဝန်ဆောင်မှုဌာနထံ %1$s ဖြင့် ဆက်သွယ်၍ အမှားကုဒ်မှာ ၉၉၉၂ ဖြစ်ကြောင်း ပြောပြပါ။</string>
+  <string name="vvm3_error_invalid_password_title">တစ်ခုခု မှားသွားပါသည်</string>
+  <string name="vvm3_error_invalid_password_message">ဝန်ဆောင်မှုဌာနထံ %1$s ဖြင့် ဆက်သွယ်၍ အမှားကုဒ်မှာ ၉၉၉၃ ဖြစ်ကြောင်း ပြောပြပါ။</string>
+  <string name="vvm3_error_mailbox_not_initialized_title">ကြည့်ရှုစီမံနိုင်သော အသံမေးလ်</string>
+  <string name="vvm3_error_mailbox_not_initialized_message">ကြည့်ရှုစီမံနိုင်သောအသံမေးလ် စီစဉ်သတ်မှတ်မှုကို အပြီးသတ်ရန် ဝန်ဆောင်မှုဌာနထံ %1$s ဖြင့် ဆက်သွယ်၍ အမှားကုဒ်မှာ ၉၉၉၄ ဖြစ်ကြောင်း ပြောပြပါ။</string>
+  <string name="vvm3_error_service_not_provisioned_title">ကြည့်ရှုစီမံနိုင်သော အသံမေးလ်</string>
+  <string name="vvm3_error_service_not_provisioned_message">ကြည့်ရှုစီမံနိုင်သောအသံမေးလ် စီစဉ်သတ်မှတ်မှုကို အပြီးသတ်ရန် ဝန်ဆောင်မှုဌာနထံ %1$s ဖြင့် ဆက်သွယ်၍ အမှားကုဒ်မှာ ၉၉၉၅ ဖြစ်ကြောင်း ပြောပြပါ။</string>
+  <string name="vvm3_error_service_not_activated_title">ကြည့်ရှုစီမံနိုင်သော အသံမေးလ်</string>
+  <string name="vvm3_error_service_not_activated_message">ကြည့်ရှုစီမံနိုင်သောအသံမေးလ်ကို ဖွင့်ရန် ဝန်ဆောင်မှုဌာနထံ %1$s ဖြင့် ဆက်သွယ်၍ အမှားကုဒ်မှာ ၉၉၉၆ ဖြစ်ကြောင်း ပြောပြပါ။</string>
+  <string name="vvm3_error_user_blocked_title">တစ်ခုခု မှားသွားပါသည်</string>
+  <string name="vvm3_error_user_blocked_message">ကြည့်ရှုစီမံနိုင်သောအသံမေးလ် စီစဉ်သတ်မှတ်မှုကို အပြီးသတ်ရန် ဝန်ဆောင်မှုဌာနထံ %1$s ဖြင့် ဆက်သွယ်၍ အမှားကုဒ်မှာ ၉၉၉၈ ဖြစ်ကြောင်း ပြောပြပါ။</string>
+  <string name="vvm3_error_subscriber_unknown_title">ကြည့်ရှုစီမံနိုင်သော အသံမေးလ်ကို ပိတ်ထားပါသည်</string>
+  <string name="vvm3_error_subscriber_unknown_message">ကြည့်ရှုစီမံနိုင်သောအသံမေးလ်ကို ဖွင့်ရန် ဝန်ဆောင်မှုဌာနထံ %1$s ဖြင့် ဆက်သွယ်ပါ။</string>
+  <string name="vvm3_error_imap_getquota_error_title">တစ်ခုခု မှားသွားပါသည်</string>
+  <string name="vvm3_error_imap_getquota_error_message">ဝန်ဆောင်မှုဌာနထံ %1$s ဖြင့် ဆက်သွယ်၍ အမှားကုဒ်မှာ ၉၉၉၇ ဖြစ်ကြောင်း ပြောပြပါ။</string>
+  <string name="vvm3_error_imap_select_error_title">တစ်ခုခု မှားသွားပါသည်</string>
+  <string name="vvm3_error_imap_select_error_message">ဝန်ဆောင်မှုဌာနထံ %1$s ဖြင့် ဆက်သွယ်၍ အမှားကုဒ်မှာ ၉၉၈၉ ဖြစ်ကြောင်း ပြောပြပါ။</string>
+  <string name="vvm3_error_imap_error_title">တစ်ခုခု မှားသွားပါသည်</string>
+  <string name="vvm3_error_imap_error_message">ဝန်ဆောင်မှုဌာနထံ %1$s ဖြင့် ဆက်သွယ်၍ အမှားကုဒ်မှာ ၉၉၉၉ ဖြစ်ကြောင်း ပြောပြပါ။</string>
+  <string name="verizon_terms_and_conditions_title">ကြည့်ရှုစီမံနိုင်သော အသံမေးလ်ကို ဖွင့်ခြင်း</string>
+  <string name="verizon_terms_and_conditions_message">%1$s ကြည့်ရှုစီမံနိုင်သော အသံမေးလ်ကို ဖွင့်ခြင်းဖြင့် Verizon Wireless ဝန်ဆောင်မှုဆိုင်ရာ စည်းမျဉ်းများကို သင်သဘောတူပြီးဖြစ်ပါသည် - \n\n%2$s</string>
+  <string name="dialer_terms_and_conditions_title">ကြည့်ရှုစီမံနိုင်သော အသံမေးလ်ကို ဖွင့်ခြင်း</string>
+  <string name="dialer_terms_and_conditions_existing_user_title">အသစ်။ သင့်အသံမေးလ်ကို ဖတ်လိုက်ပါ</string>
+  <string name="dialer_terms_and_conditions_message">%s</string>
+  <string name="dialer_terms_and_conditions_1.0">အသံမေးလ်ခေါ်ဆိုစရာမလိုဘဲ သင့်မက်ဆေ့ဂျ်များကို ကြည့်ရှုနားဆင်ပါ။ သင့်အသံမေးလ်၏ စာသားမှတ်တမ်းများကို Google အခမဲ့ စာသားမှတ်တမ်းဝန်ဆောင်မှုက ပံ့ပိုးပေးပါသည်။ \'ဆက်တင်များ\' တွင် အချိန်မရွေး ပိတ်နိုင်ပါသည်။ %s</string>
+  <string name="dialer_terms_and_conditions_existing_user">သင့်အသံမေးလ်၏ စာသားမှတ်တမ်းများကို Google အခမဲ့ စာသားမှတ်တမ်းဝန်ဆောင်မှုက ပံ့ပိုးပေးနေပါပြီ။ ဤအရာကို \'ဆက်တင်များ\' တွင်အချိန်မရွေး ပိတ်နိုင်ပါသည်။ %s</string>
+  <string name="dialer_terms_and_conditions_for_verizon_1.0">အသံမေးလ်ခေါ်ဆိုစရာမလိုဘဲ သင့်မက်ဆေ့ဂျ်များကို ကြည့်ရှုနားထောင်ပါ။</string>
+  <string name="dialer_terms_and_conditions_learn_more">ပိုမိုလေ့လာရန်</string>
+  <string name="dialer_terms_and_conditions_existing_user_ack">OK</string>
+  <string name="dialer_terms_and_conditions_existing_user_decline">မလိုတော့ပါ</string>
+  <string name="terms_and_conditions_decline_dialog_title">ကြည့်ရှုစီမံနိုင်သော အသံမေးလ်ကို ပိတ်မလား။</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_message">ဝန်ဆောင်မှုဆိုင်ရာစည်းမျဉ်းများကို ငြင်းပယ်ပါက ကြည့်ရှုစီမံနိုင်သော အသံမေးလ် ပိတ်သွားပါမည်။</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_downgrade">ပိတ်ရန်</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_message">ကြည့်ရှုစီမံနိုင်သော အသံမေးလ်ကို ပိတ်ပါက ၎င်းအလုပ်လုပ်တော့မည် မဟုတ်ပါ။</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_downgrade">ပိတ်ရန်</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message">*၈၆ သို့ ဖုန်းခေါ်မှသာ အသံမေးလ်ကို သုံးနိုင်ပါမည်။ ဆက်လုပ်ရန် အသံမေးလ်ပင်နံပါတ်အသစ်ကို သတ်မှတ်ပါ။</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin">ပင်နံပါတ် သတ်မှတ်ရန်</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/error/res/values-nb/strings.xml b/java/com/android/dialer/voicemail/listui/error/res/values-nb/strings.xml
new file mode 100644
index 0000000..1a45c77
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/error/res/values-nb/strings.xml
@@ -0,0 +1,102 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_error_activating_title">Slår på visuell talepostkasse</string>
+  <string name="voicemail_error_activating_message">Det er ikke sikkert at du kan motta talepostvarsler før visuell talepost er helt aktivert. Ring talepost for å hente nye meldinger før aktiveringen er fullført.</string>
+  <string name="voicemail_error_not_activate_no_signal_title">Kan ikke slå på visuell talepost</string>
+  <string name="voicemail_error_not_activate_no_signal_message">Sjekk at telefonen din har mobilforbindelse, og prøv på nytt.</string>
+  <string name="voicemail_error_not_activate_no_signal_airplane_mode_message">Slå av flymodus og prøv på nytt.</string>
+  <string name="voicemail_error_no_signal_title">Ingen tilkobling</string>
+  <string name="voicemail_error_no_signal_message">Du blir ikke varslet om nye talemeldinger. Hvis du er på Wi-Fi, kan du sjekke taleposten ved å synkronisere nå.</string>
+  <string name="voicemail_error_no_signal_airplane_mode_message">Du blir ikke varslet om nye talemeldinger. Slå av flymodus for å synkronisere talepost.</string>
+  <string name="voicemail_error_no_signal_cellular_required_message">Telefonen må ha mobildataforbindelse for at du skal kunne sjekke talepost.</string>
+  <string name="voicemail_error_activation_failed_title">Kan ikke slå på visuell talepost</string>
+  <string name="voicemail_error_activation_failed_message">Du kan fortsatt ringe for å sjekke talepost.</string>
+  <string name="voicemail_error_no_data_title">Kan ikke oppdatere visuell talepost</string>
+  <string name="voicemail_error_no_data_message">Prøv på nytt når Wi‑Fi- eller mobildatadekningen er bedre. Du kan fortsatt ringe for å sjekke talepost.</string>
+  <string name="voicemail_error_no_data_cellular_required_message">Prøv på nytt når mobildatadekningen er bedre. Du kan fortsatt ringe for å sjekke talepost.</string>
+  <string name="voicemail_error_bad_config_title">Kan ikke oppdatere visuell talepost</string>
+  <string name="voicemail_error_bad_config_message">Du kan fortsatt ringe for å sjekke talepost.</string>
+  <string name="voicemail_error_communication_title">Kan ikke oppdatere visuell talepost</string>
+  <string name="voicemail_error_communication_message">Du kan fortsatt ringe for å sjekke talepost.</string>
+  <string name="voicemail_error_server_connection_title">Kan ikke oppdatere visuell talepost</string>
+  <string name="voicemail_error_server_connection_message">Du kan fortsatt ringe for å sjekke talepost.</string>
+  <string name="voicemail_error_server_title">Kan ikke oppdatere visuell talepost</string>
+  <string name="voicemail_error_server_message">Du kan fortsatt ringe for å sjekke talepost.</string>
+  <string name="voicemail_error_inbox_near_full_title">Innboksen er nesten full</string>
+  <string name="voicemail_error_inbox_near_full_message">Du kan ikke motta ny talepost hvis innboksen din er full.</string>
+  <string name="voicemail_error_inbox_full_title">Kan ikke motta ny talepost</string>
+  <string name="voicemail_error_inbox_full_message">Innboksen din er full. Prøv å slette noen meldinger for å motta ny talepost.</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_title">Slå på ekstra lagringsplass og sikkerhetskopiering</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_message">Talepostkassen din er full. Frigjør plass ved å slå på ekstra lagringsplass og la Google administrere og ta sikkerhetskopi av taleposten din.</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_title">Slå på ekstra lagringsplass og sikkerhetskopiering</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_message">Talepostkassen din er nesten full. Frigjør plass ved å slå på ekstra lagringsplass og la Google administrere og ta sikkerhetskopi av taleposten din.</string>
+  <string name="voicemail_error_pin_not_set_title">Angi PIN-koden din for talepost</string>
+  <string name="voicemail_error_pin_not_set_message">Du trenger PIN-koden hver gang du ringer for å sjekke taleposten din.</string>
+  <string name="voicemail_action_turn_off_airplane_mode">Flymodus-innstillinger</string>
+  <string name="voicemail_action_set_pin">Angi PIN-kode</string>
+  <string name="voicemail_action_retry">Prøv igjen</string>
+  <string name="voicemail_action_turn_archive_on">Slå på</string>
+  <string name="voicemail_action_dimiss">Nei takk</string>
+  <string name="voicemail_action_sync">Oppdater</string>
+  <string name="voicemail_action_call_voicemail">Ring talepostkassen</string>
+  <string name="voicemail_action_call_customer_support">Ring kundeservice</string>
+  <string name="vvm3_error_vms_dns_failure_title">Noe gikk galt</string>
+  <string name="vvm3_error_vms_dns_failure_message">Beklager, det oppsto et problem. Prøv på nytt senere, eller kontakt kundeservice på %1$s og oppgi feilkode 9001.</string>
+  <string name="vvm3_error_vmg_dns_failure_title">Noe gikk galt</string>
+  <string name="vvm3_error_vmg_dns_failure_message">Beklager, det oppsto et problem. Prøv igjen senere, eller kontakt kundeservice på %1$s og oppgi feilkode 9002.</string>
+  <string name="vvm3_error_spg_dns_failure_title">Noe gikk galt</string>
+  <string name="vvm3_error_spg_dns_failure_message">Beklager, det oppsto et problem. Prøv igjen senere, eller kontakt kundeservice på %1$s og oppgi feilkode 9003.</string>
+  <string name="vvm3_error_vms_no_cellular_title">Kan ikke koble til talepostkassen</string>
+  <string name="vvm3_error_vms_no_cellular_message">Beklager, vi har problemer med å koble til talepostkassen. Hvis du er i et område med dårlig signalstyrke, må du vente til du har et sterkt signal og prøve igjen. Hvis problemet vedvarer, kan du kontakte kundeservice på %1$s og oppgi feilkode 9004.</string>
+  <string name="vvm3_error_vmg_no_cellular_title">Kan ikke koble til talepostkassen</string>
+  <string name="vvm3_error_vmg_no_cellular_message">Beklager, vi har problemer med å koble til talepostkassen. Hvis du er i et område med dårlig signalstyrke, må du vente til du har et sterkt signal og prøve igjen. Hvis problemet vedvarer, kan du kontakte kundeservice på %1$s og oppgi feilkode 9005.</string>
+  <string name="vvm3_error_spg_no_cellular_title">Kan ikke koble til talepostkassen</string>
+  <string name="vvm3_error_spg_no_cellular_message">Beklager, vi har problemer med å koble til talepostkassen. Hvis du er i et område med dårlig signalstyrke, må du vente til du har et sterkt signal og prøve igjen. Hvis problemet vedvarer, kan du kontakte kundeservice på %1$s og oppgi feilkode 9006.</string>
+  <string name="vvm3_error_vms_timeout_title">Noe gikk galt</string>
+  <string name="vvm3_error_vms_timeout_message">Beklager, det oppsto et problem. Prøv igjen senere, eller kontakt kundeservice på %1$s og oppgi feilkode 9007.</string>
+  <string name="vvm3_error_vmg_timeout_title">Noe gikk galt</string>
+  <string name="vvm3_error_vmg_timeout_message">Beklager, det oppsto et problem. Prøv igjen senere, eller kontakt kundeservice på %1$s og oppgi feilkode 9008.</string>
+  <string name="vvm3_error_status_sms_timeout_title">Noe gikk galt</string>
+  <string name="vvm3_error_status_sms_timeout_message">Beklager, vi har problemer med å opprette tjenesten. Prøv igjen senere, eller kontakt kundeservice på %1$s og oppgi feilkode 9009.</string>
+  <string name="vvm3_error_subscriber_blocked_title">Kan ikke koble til talepostkassen</string>
+  <string name="vvm3_error_subscriber_blocked_message">Beklager, vi kunne ikke koble til talepostkassen akkurat nå. Prøv igjen senere, eller kontakt kundeservice på %1$s og oppgi feilkode 9990.</string>
+  <string name="vvm3_error_unknown_user_title">Konfigurer talepost</string>
+  <string name="vvm3_error_unknown_user_message">Talepost er ikke satt opp på din konto. Kontakt kundeservice på %1$s og oppgi feilkode 9991.</string>
+  <string name="vvm3_error_unknown_device_title">Talepost</string>
+  <string name="vvm3_error_unknown_device_message">Visuell talepost kan ikke brukes på denne enheten. Kontakt kundeservice på %1$s og oppgi feilkode 9992.</string>
+  <string name="vvm3_error_invalid_password_title">Noe gikk galt</string>
+  <string name="vvm3_error_invalid_password_message">Kontakt kundeservice på %1$s og oppgi feilkode 9993.</string>
+  <string name="vvm3_error_mailbox_not_initialized_title">Visuell talepost</string>
+  <string name="vvm3_error_mailbox_not_initialized_message">Kontakt kundeservice på %1$s og oppgi feilkode 9994 for å fullføre konfigureringen av visuell talepost.</string>
+  <string name="vvm3_error_service_not_provisioned_title">Visuell talepost</string>
+  <string name="vvm3_error_service_not_provisioned_message">Kontakt kundeservice på %1$s og oppgi feilkode 9995 for å fullføre konfigureringen av visuell talepost.</string>
+  <string name="vvm3_error_service_not_activated_title">Visuell talepost</string>
+  <string name="vvm3_error_service_not_activated_message">Kontakt kundeservice på %1$s og oppgi feilkode 9996 for å fullføre konfigureringen av visuell talepost.</string>
+  <string name="vvm3_error_user_blocked_title">Noe gikk galt</string>
+  <string name="vvm3_error_user_blocked_message">Kontakt kundeservice på %1$s og oppgi feilkode 9998 for å fullføre konfigureringen av visuell talepost.</string>
+  <string name="vvm3_error_subscriber_unknown_title">Visuell talepost er slått av</string>
+  <string name="vvm3_error_subscriber_unknown_message">Kontakt kundeservice på %1$s for å slå på visuell talepost.</string>
+  <string name="vvm3_error_imap_getquota_error_title">Noe gikk galt</string>
+  <string name="vvm3_error_imap_getquota_error_message">Kontakt kundeservice på %1$s og oppgi feilkode 9997.</string>
+  <string name="vvm3_error_imap_select_error_title">Noe gikk galt</string>
+  <string name="vvm3_error_imap_select_error_message">Kontakt kundeservice på %1$s og oppgi feilkode 9989.</string>
+  <string name="vvm3_error_imap_error_title">Noe gikk galt</string>
+  <string name="vvm3_error_imap_error_message">Kontakt kundeservice på %1$s og oppgi feilkode 9999.</string>
+  <string name="verizon_terms_and_conditions_title">Slå på visuell talepost</string>
+  <string name="verizon_terms_and_conditions_message">%1$s Ved å slå på visuell talepost samtykker du i vilkårene til Verizon Wireless:\n\n%2$s</string>
+  <string name="dialer_terms_and_conditions_title">Slå på visuell talepost</string>
+  <string name="dialer_terms_and_conditions_existing_user_title">Nyhet! Les taleposten din</string>
+  <string name="dialer_terms_and_conditions_message">%s</string>
+  <string name="dialer_terms_and_conditions_1.0">Se og hør på meldingene dine uten å måtte ringe talepostkassen. Transkripsjoner av talemeldingene dine leveres av Googles gratistjeneste for transkripsjoner. Du kan slå av begge deler i innstillingene når som helst. %s</string>
+  <string name="dialer_terms_and_conditions_existing_user">Transkripsjoner av talemeldingene dine leveres nå av Googles gratistjeneste for transkripsjoner. Du kan slå av dette i innstillingene når som helst. %s</string>
+  <string name="dialer_terms_and_conditions_for_verizon_1.0">Se og hør meldingene dine, uten å måtte ringe til talepostkassen.</string>
+  <string name="dialer_terms_and_conditions_learn_more">Finn ut mer</string>
+  <string name="dialer_terms_and_conditions_existing_user_ack">Greit</string>
+  <string name="dialer_terms_and_conditions_existing_user_decline">Nei takk</string>
+  <string name="terms_and_conditions_decline_dialog_title">Vil du slå av visuell talepost?</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_message">Visuell talepost blir slått av hvis vilkårene ikke godtas.</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_downgrade">Slå av</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_message">Visuell talepost blir deaktivert hvis du slår av visuell talepost.</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_downgrade">Slå av</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message">Talemeldinger er bare tilgjengelig ved å ringe *86. Angi en ny PIN-kode for å fortsette.</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin">Angi PIN-kode</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/error/res/values-ne/strings.xml b/java/com/android/dialer/voicemail/listui/error/res/values-ne/strings.xml
new file mode 100644
index 0000000..10cc917
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/error/res/values-ne/strings.xml
@@ -0,0 +1,102 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_error_activating_title">भिजुअल भ्वाइस मेल सक्रिय गर्दै</string>
+  <string name="voicemail_error_activating_message">भिजुअल भ्वाइस मेल पूर्णतया सक्रिय नभएसम्म तपाईंले भ्वाइस मेलका सूचनाहरू प्राप्त नगर्न सक्नुहुन्छ। भ्वाइस मेल पूर्णतया सक्रिय नहुन्जेल नयाँ सन्देशहरू प्राप्त गर्न भ्वाइस मेल सेवामा कल गर्नुहोस्।</string>
+  <string name="voicemail_error_not_activate_no_signal_title">भिजुअल भ्वाइस मेल सक्रिय गर्न सकिएन</string>
+  <string name="voicemail_error_not_activate_no_signal_message">आफ्नो फोन कुनै मोबाइल नेटवर्कमा जडान भएको कुरा निश्चित गरी फेरि प्रयास गर्नुहोस्।</string>
+  <string name="voicemail_error_not_activate_no_signal_airplane_mode_message">हवाइजहाज मोड निष्क्रिय पारी फेरि प्रयास गर्नुहोस्।</string>
+  <string name="voicemail_error_no_signal_title">कुनै पनि जडान छैन</string>
+  <string name="voicemail_error_no_signal_message">तपाईंले भ्वाइस मेलसम्बन्धी नयाँ सूचनाहरू प्राप्त गर्नु हुने छैन। तपाईं Wi-Fi चलाउँदै हुनुहुन्छ भने अहिले सिंक गरी भ्वाइस मेल जाँच गर्न सक्नुहुन्छ।</string>
+  <string name="voicemail_error_no_signal_airplane_mode_message">तपाईंले भ्वाइस मेलसम्बन्धी नयाँ सूचनाहरू प्राप्त गर्नु हुने छैन। आफ्नो भ्वाइस मेल सिंक गर्न हवाइजहाज मोड निष्क्रिय पार्नुहोस्।</string>
+  <string name="voicemail_error_no_signal_cellular_required_message">भ्वाइस मेल जाँच गर्न तपाईंको फोनमा कुनै मोबाइल डेटा जडानको आवश्यकता पर्छ।</string>
+  <string name="voicemail_error_activation_failed_title">भिजुअल भ्वाइस मेल सक्रिय गर्न सकिएन</string>
+  <string name="voicemail_error_activation_failed_message">तपाईं अझै पनि कल गरी भ्वाइस मेलको जाँच गर्न सक्नुहुन्छ।</string>
+  <string name="voicemail_error_no_data_title">भिजुअल भ्वाइस मेल अद्यावधिक गर्न सकिएन</string>
+  <string name="voicemail_error_no_data_message">आफ्नो Wi-Fi वा मोबाइल डेटाको जडान अझ राम्रो भएका बेला फेरि प्रयास गर्नुहोस्। तपाईं अझै पनि कल गरी भ्वाइस मेलको जाँच गर्न सक्नुहुन्छ।</string>
+  <string name="voicemail_error_no_data_cellular_required_message">आफ्नो मोबाइल डेटाको जडान अझ राम्रो भएका बेला फेरि प्रयास गर्नुहोस्। तपाईं अझै पनि कल गरी भ्वाइस मेलको जाँच गर्न सक्नुहुन्छ।</string>
+  <string name="voicemail_error_bad_config_title">भिजुअल भ्वाइस मेल अद्यावधिक गर्न सकिएन</string>
+  <string name="voicemail_error_bad_config_message">तपाईं अझै पनि कल गरी भ्वाइस मेलको जाँच गर्न सक्नुहुन्छ।</string>
+  <string name="voicemail_error_communication_title">भिजुअल भ्वाइस मेल अद्यावधिक गर्न सकिएन</string>
+  <string name="voicemail_error_communication_message">तपाईं अझै पनि कल गरी भ्वाइस मेलको जाँच गर्न सक्नुहुन्छ।</string>
+  <string name="voicemail_error_server_connection_title">भिजुअल भ्वाइस मेल अद्यावधिक गर्न सकिएन</string>
+  <string name="voicemail_error_server_connection_message">तपाईं अझै पनि कल गरी भ्वाइस मेलको जाँच गर्न सक्नुहुन्छ।</string>
+  <string name="voicemail_error_server_title">भिजुअल भ्वाइस मेल अद्यावधिक गर्न सकिएन</string>
+  <string name="voicemail_error_server_message">तपाईं अझै पनि कल गरी भ्वाइस मेलको जाँच गर्न सक्नुहुन्छ।</string>
+  <string name="voicemail_error_inbox_near_full_title">इनबक्स लगभग भरिएको छ</string>
+  <string name="voicemail_error_inbox_near_full_message">तपाईंको इनबक्स भरिएको खण्डमा तपाईं नयाँ भ्वाइस मेल प्राप्त गर्न सक्नु हुने छैन।</string>
+  <string name="voicemail_error_inbox_full_title">नयाँ भ्वाइस मेलहरू प्राप्त गर्न सकिएन</string>
+  <string name="voicemail_error_inbox_full_message">तपाईंको इनबक्स भरिएको छ। नयाँ भ्वाइस मेलहरू प्राप्त गर्न कृपया केही सन्देशहरू मेटी हेर्नुहोस्।</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_title">अतिरिक्त भण्डारण र ब्याकअप सेवा सक्रिय गर्नुहोस्</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_message">तपाईंको मेल बक्स भरिएको छ। ठाउँ खाली गर्न Google ले तपाईंका भ्वाइस मेल सन्देशहरूको व्यवस्थापन र ब्याकअप गर्न सकोस् भन्नाका खातिर अतिरिक्त भण्डारणलाई सक्रिय गर्नुहोस्।</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_title">अतिरिक्त भण्डारण र ब्याकअप सेवा सक्रिय गर्नुहोस्</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_message">तपाईंको मेल बक्स लगभग भरिएको छ। ठाउँ खाली गर्न Google ले तपाईंका भ्वाइस मेल सन्देशहरूको व्यवस्थापन र ब्याकअप गर्न सकोस् भन्नाका खातिर अतिरिक्त भण्डारणलाई सक्रिय गर्नुहोस्।</string>
+  <string name="voicemail_error_pin_not_set_title">आफ्नो भ्वाइस मेलको PIN सेट गर्नुहोस्</string>
+  <string name="voicemail_error_pin_not_set_message">तपाईंले जुनसुकै बेला आफ्नो भ्वाइस मेलमाथि पहुँच गर्न कल गर्दा भ्वाइस मेलको PIN आवश्यक पर्छ।</string>
+  <string name="voicemail_action_turn_off_airplane_mode">हवाइजहाज मोडसम्बन्धी सेटिङहरू</string>
+  <string name="voicemail_action_set_pin">PIN सेट गर्नुहोस्</string>
+  <string name="voicemail_action_retry">फेरि प्रयास गर्नुहोस्</string>
+  <string name="voicemail_action_turn_archive_on">सक्रिय गर्नुहोस्</string>
+  <string name="voicemail_action_dimiss">पर्दैन, धन्यवाद</string>
+  <string name="voicemail_action_sync">सिंक गर्नुहोस्</string>
+  <string name="voicemail_action_call_voicemail">भ्वाइस मेल सेवामा कल गर्नुहोस्</string>
+  <string name="voicemail_action_call_customer_support">ग्राहक सहायता सेवामा कल गर्नुहोस्</string>
+  <string name="vvm3_error_vms_dns_failure_title">केही चिज गडबड भयो</string>
+  <string name="vvm3_error_vms_dns_failure_message">माफ गर्नुहोस्, हामी कुनै समस्यामा पर्‍याैं। कृपया पछि फेरि प्रयास गर्नुहोस्। अझै पनि कुनै समस्या भएको खण्डमा कृपया ग्राहक सहायता सेवाको नम्बर %1$s मा सम्पर्क गरी उनीहरूलाई त्रुटिको कोड ९००१ हो भनी बताउनुहोस्।</string>
+  <string name="vvm3_error_vmg_dns_failure_title">केही चिज गडबड भयो</string>
+  <string name="vvm3_error_vmg_dns_failure_message">माफ गर्नुहोस्, हामी कुनै समस्यामा पर्‍याैं। कृपया पछि फेरि प्रयास गर्नुहोस्। अझै पनि कुनै समस्या भएको खण्डमा कृपया ग्राहक सहायता सेवाको नम्बर %1$s मा सम्पर्क गरी उनीहरूलाई त्रुटिको कोड ९००२ हो भनी बताउनुहोस्।</string>
+  <string name="vvm3_error_spg_dns_failure_title">केही चिज गडबड भयो</string>
+  <string name="vvm3_error_spg_dns_failure_message">माफ गर्नुहोस्, हामी कुनै समस्यामा पर्‍याैं। कृपया पछि फेरि प्रयास गर्नुहोस्। अझै पनि कुनै समस्या भएको खण्डमा कृपया ग्राहक सहायता सेवाको नम्बर %1$s मा सम्पर्क गरी उनीहरूलाई त्रुटिको कोड ९००३ हो भनी बताउनुहोस्।</string>
+  <string name="vvm3_error_vms_no_cellular_title">तपाईंको भ्वाइस मेलबक्समा जडान गर्न सकिएन</string>
+  <string name="vvm3_error_vms_no_cellular_message">माफ गर्नुहोस्, हामीलाई तपाईंको भ्वाइस मेलबक्समा जडान गर्ने क्रममा समस्या भइरहेको छ। तपाईं कमजोर सिग्नल भएको कुनै क्षेत्रमा हुनुहुन्छ भने बलियो सिग्नल नभएसम्म प्रतीक्षा गरी फेरि प्रयास गर्नुहोस्। अझै पनि कुनै समस्या भएको खण्डमा कृपया ग्राहक सहायता सेवाको नम्बर %1$s मा सम्पर्क गरी उनीहरूलाई त्रुटिको कोड ९००४ हो भनी बताउनुहोस्।</string>
+  <string name="vvm3_error_vmg_no_cellular_title">तपाईंको भ्वाइस मेलबक्समा जडान गर्न सकिएन</string>
+  <string name="vvm3_error_vmg_no_cellular_message">माफ गर्नुहोस्, हामीलाई तपाईंको भ्वाइस मेलबक्समा जडान गर्ने क्रममा समस्या भइरहेको छ। तपाईं कमजोर सिग्नल भएको कुनै क्षेत्रमा हुनुहुन्छ भने बलियो सिग्नल नभएसम्म प्रतीक्षा गरी फेरि प्रयास गर्नुहोस्। अझै पनि कुनै समस्या भएको खण्डमा कृपया ग्राहक सहायता सेवाको नम्बर %1$s मा सम्पर्क गरी उनीहरूलाई त्रुटिको कोड ९००५ हो भनी बताउनुहोस्।</string>
+  <string name="vvm3_error_spg_no_cellular_title">तपाईंको भ्वाइस मेलबक्समा जडान गर्न सकिएन</string>
+  <string name="vvm3_error_spg_no_cellular_message">माफ गर्नुहोस्, हामीलाई तपाईंको भ्वाइस मेलबक्समा जडान गर्ने क्रममा समस्या भइरहेको छ। तपाईं कमजोर सिग्नल भएको कुनै क्षेत्रमा हुनुहुन्छ भने बलियो सिग्नल नभएसम्म प्रतीक्षा गरी फेरि प्रयास गर्नुहोस्। अझै पनि कुनै समस्या भएको खण्डमा कृपया ग्राहक सहायता सेवाको नम्बर %1$s मा सम्पर्क गरी उनीहरूलाई त्रुटिको कोड ९००६ हो भनी बताउनुहोस्।</string>
+  <string name="vvm3_error_vms_timeout_title">केही चिज गडबड भयो</string>
+  <string name="vvm3_error_vms_timeout_message">माफ गर्नुहोस्, हामी कुनै समस्यामा पर्‍याैं। कृपया पछि फेरि प्रयास गर्नुहोस्। अझै पनि कुनै समस्या भएको खण्डमा कृपया ग्राहक सहायता सेवाको नम्बर %1$s मा सम्पर्क गरी उनीहरूलाई त्रुटिको कोड ९००७ हो भनी बताउनुहोस्।</string>
+  <string name="vvm3_error_vmg_timeout_title">केही चिज गडबड भयो</string>
+  <string name="vvm3_error_vmg_timeout_message">माफ गर्नुहोस्, हामी कुनै समस्यामा पर्‍याैं। कृपया पछि फेरि प्रयास गर्नुहोस्। अझै पनि कुनै समस्या भएको खण्डमा कृपया ग्राहक सहायता सेवाको नम्बर %1$s मा सम्पर्क गरी उनीहरूलाई त्रुटिको कोड ९००८ हो भनी बताउनुहोस्।</string>
+  <string name="vvm3_error_status_sms_timeout_title">केही चिज गडबड भयो</string>
+  <string name="vvm3_error_status_sms_timeout_message">माफ गर्नुहोस्, हामीलाई तपाईंको सेवा सेटअप गर्ने क्रममा समस्या भइरहेको छ। कृपया पछि फेरि प्रयास गर्नुहोस्। अझै पनि कुनै समस्या भएको खण्डमा कृपया ग्राहक सहायता सेवाको नम्बर %1$s मा सम्पर्क गरी उनीहरूलाई त्रुटिको कोड ९००९ हो भनी बताउनुहोस्।</string>
+  <string name="vvm3_error_subscriber_blocked_title">तपाईंको भ्वाइस मेलबक्समा जडान गर्न सकिएन</string>
+  <string name="vvm3_error_subscriber_blocked_message">माफ गर्नुहोस्, हामी यसबखत तपाईंको भ्वाइस मेलबक्समा जडान गर्न सकेनाैं। कृपया पछि फेरि प्रयास गर्नुहोस्। अझै पनि कुनै समस्या भएको खण्डमा कृपया ग्राहक सहायता सेवाको नम्बर %1$s मा सम्पर्क गरी उनीहरूलाई त्रुटिको कोड ९९९० हो भनी बताउनुहोस्।</string>
+  <string name="vvm3_error_unknown_user_title">भ्वाइस मेल सेटअप गर्नुहोस्</string>
+  <string name="vvm3_error_unknown_user_message">तपाईंको खातामा भ्वाइस मेल सेटअप गरिएको छैन। कृपया ग्राहक सहायता सेवाको नम्बर %1$s मा सम्पर्क गरी उनीहरूलाई त्रुटिको कोड ९९९१ हो भनी बताउनुहोस्।</string>
+  <string name="vvm3_error_unknown_device_title">भ्वाइस मेल</string>
+  <string name="vvm3_error_unknown_device_message">यस यन्त्रमा भिजुअल भ्वाइस मेल प्रयोग गर्न सकिँदैन। कृपया ग्राहक सहायता सेवाको नम्बर %1$s मा सम्पर्क गरी उनीहरूलाई त्रुटिको कोड ९९९२ हो भनी बताउनुहोस्।</string>
+  <string name="vvm3_error_invalid_password_title">केही चिज गडबड भयो</string>
+  <string name="vvm3_error_invalid_password_message">कृपया ग्राहक सहायता सेवाको नम्बर %1$s मा सम्पर्क गरी उनीहरूलाई त्रुटिको कोड ९९९३ हो भनी बताउनुहोस्।</string>
+  <string name="vvm3_error_mailbox_not_initialized_title">भिजुअल भ्वाइस मेल</string>
+  <string name="vvm3_error_mailbox_not_initialized_message">भिजुअल भ्वाइस मेलको सेटअप पूरा गर्न कृपया ग्राहक सहायता सेवाको नम्बर %1$s मा सम्पर्क गरी उनीहरूलाई त्रुटिको कोड ९९९४ हो भनी बताउनुहोस्।</string>
+  <string name="vvm3_error_service_not_provisioned_title">भिजुअल भ्वाइस मेल</string>
+  <string name="vvm3_error_service_not_provisioned_message">भिजुअल भ्वाइस मेलको सेटअप पूरा गर्न कृपया ग्राहक सहायता सेवाको नम्बर %1$s मा सम्पर्क गरी उनीहरूलाई त्रुटिको कोड ९९९५ हो भनी बताउनुहोस्।</string>
+  <string name="vvm3_error_service_not_activated_title">भिजुअल भ्वाइस मेल</string>
+  <string name="vvm3_error_service_not_activated_message">भिजुअल भ्वाइस मेल सक्रिय गर्न कृपया ग्राहक सहायता सेवाको नम्बर %1$s मा सम्पर्क गरी उनीहरूलाई त्रुटिको कोड ९९९६ हो भनी बताउनुहोस्।</string>
+  <string name="vvm3_error_user_blocked_title">केही चिज गडबड भयो</string>
+  <string name="vvm3_error_user_blocked_message">भिजुअल भ्वाइस मेलको सेटअप पूरा गर्न कृपया ग्राहक सहायता सेवाको नम्बर %1$s मा सम्पर्क गरी उनीहरूलाई त्रुटिको कोड ९९९८ हो भनी बताउनुहोस्।</string>
+  <string name="vvm3_error_subscriber_unknown_title">भिजुअल भ्वाइस मेल असक्षम पारिएको छ</string>
+  <string name="vvm3_error_subscriber_unknown_message">भिजुअल भ्वाइस मेल सक्रिय गर्न कृपया ग्राहक सहायता सेवाको नम्बर %1$s मा सम्पर्क गर्नुहोस्।</string>
+  <string name="vvm3_error_imap_getquota_error_title">केही चिज गडबड भयो</string>
+  <string name="vvm3_error_imap_getquota_error_message">कृपया ग्राहक सहायता सेवाको नम्बर %1$s मा सम्पर्क गरी उनीहरूलाई त्रुटिको कोड ९९९७ हो भनी बताउनुहोस्।</string>
+  <string name="vvm3_error_imap_select_error_title">केही चिज गडबड भयो</string>
+  <string name="vvm3_error_imap_select_error_message">कृपया ग्राहक सहायता सेवाको नम्बर %1$s मा सम्पर्क गरी उनीहरूलाई त्रुटिको कोड ९९८९ हो भनी बताउनुहोस्।</string>
+  <string name="vvm3_error_imap_error_title">केही चिज गडबड भयो</string>
+  <string name="vvm3_error_imap_error_message">कृपया ग्राहक सहायता सेवाको नम्बर %1$s मा सम्पर्क गरी उनीहरूलाई त्रुटिको कोड ९९९९ हो भनी बताउनुहोस्।</string>
+  <string name="verizon_terms_and_conditions_title">भिजुअल भ्वाइस मेल सक्रिय गर्नुहोस्</string>
+  <string name="verizon_terms_and_conditions_message">%1$s भिजुअल भ्वाइस मेल सक्रिय गरेर तपाईं Verizon Wireless का सेवाका सर्तहरूमा सहमत हुनुहुन्छ:\n\n%2$s</string>
+  <string name="dialer_terms_and_conditions_title">भिजुअल भ्वाइस मेल सक्रिय गर्नुहोस्</string>
+  <string name="dialer_terms_and_conditions_existing_user_title">नयाँ! आफ्नो भ्वाइस मेल पढ्नुहोस्</string>
+  <string name="dialer_terms_and_conditions_message">%s</string>
+  <string name="dialer_terms_and_conditions_1.0">भ्वाइस मेलमा कल नगरिकनै आफ्ना सन्देशहरू हेर्नुहोस् र सुन्नुहोस्। तपाईंको भ्वाइस मेलका ट्रान्स्क्रिप्टहरू Google को निःशुल्क ट्रान्स्क्रिप्सन सेवाले उपलब्ध गराउँछ। तपाईं सेटिङहरूमा गई यसलाई जुनसुकै बेला निष्क्रिय पार्न सक्नुहुन्छ। %s</string>
+  <string name="dialer_terms_and_conditions_existing_user">तपाईंको भ्वाइस मेलका ट्रान्स्क्रिप्टहरू अब Google को निःशुल्क ट्रान्स्क्रिप्सन सेवाले उपलब्ध गराउँछ। तपाईं सेटिङहरूमा गई यसलाई जुनसुकै बेला निष्क्रिय पार्न सक्नुहुन्छ। %s</string>
+  <string name="dialer_terms_and_conditions_for_verizon_1.0">भ्वाइस मेलमा कल नगरिकनै आफ्ना सन्देशहरू हेर्नुहोस् र सुन्नुहोस्।</string>
+  <string name="dialer_terms_and_conditions_learn_more">थप जान्नुहोस्</string>
+  <string name="dialer_terms_and_conditions_existing_user_ack">ठिक छ, बुझेँ</string>
+  <string name="dialer_terms_and_conditions_existing_user_decline">पर्दैन, धन्यवाद</string>
+  <string name="terms_and_conditions_decline_dialog_title">भिजुअल भ्वाइस मेल असक्षम पार्ने हो?</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_message">सेवाका सर्तहरू अस्वीकार गरिएको खण्डमा भिजुअल भ्वाइस मेल असक्षम पारिने छ।</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_downgrade">असक्षम पार्नुहोस्</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_message">तपाईंले भिजुअल भ्वाइस मेल निष्क्रिय पार्नुभएको खण्डमा भ्वाइस मेल असक्षम पारिने छ।</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_downgrade">असक्षम पार्नुहोस्</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message">*८६ मा कल गरेर मात्र भ्वाइस मेलमाथि पहुँच राख्न सकिने छ। अघि बढ्न भ्वाइस मेलको नयाँ PIN सेट गर्नुहोस्।</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin">PIN सेट गर्नुहोस्</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/error/res/values-nl/strings.xml b/java/com/android/dialer/voicemail/listui/error/res/values-nl/strings.xml
new file mode 100644
index 0000000..8f59550
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/error/res/values-nl/strings.xml
@@ -0,0 +1,102 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_error_activating_title">Visuele voicemail activeren</string>
+  <string name="voicemail_error_activating_message">Je ontvangt mogelijk geen voicemailmeldingen totdat visuele voicemail volledig is geactiveerd. Bel je voicemail om nieuwe berichten op te halen totdat visuele voicemail volledig is geactiveerd.</string>
+  <string name="voicemail_error_not_activate_no_signal_title">Kan visuele voicemail niet activeren</string>
+  <string name="voicemail_error_not_activate_no_signal_message">Zorg dat je telefoon een mobiele netwerkverbinding heeft en probeer het opnieuw.</string>
+  <string name="voicemail_error_not_activate_no_signal_airplane_mode_message">Schakel de vliegtuigmodus uit en probeer het opnieuw.</string>
+  <string name="voicemail_error_no_signal_title">Geen verbinding</string>
+  <string name="voicemail_error_no_signal_message">Je ontvangt geen meldingen voor nieuwe voicemails. Als je wifi gebruikt, kun je je voicemail controleren door nu te synchroniseren.</string>
+  <string name="voicemail_error_no_signal_airplane_mode_message">Je ontvangt geen meldingen voor nieuwe voicemails. Schakel de vliegtuigmodus uit om je voicemail te synchroniseren.</string>
+  <string name="voicemail_error_no_signal_cellular_required_message">Je telefoon heeft een mobiele dataverbinding nodig om je voicemail te controleren.</string>
+  <string name="voicemail_error_activation_failed_title">Kan visuele voicemail niet activeren</string>
+  <string name="voicemail_error_activation_failed_message">Je kunt nog steeds bellen om je voicemail te controleren.</string>
+  <string name="voicemail_error_no_data_title">Kan visuele voicemail niet updaten</string>
+  <string name="voicemail_error_no_data_message">Probeer het opnieuw als er een betere wifi- of mobiele dataverbinding beschikbaar is. Je kunt nog steeds bellen om je voicemail te controleren.</string>
+  <string name="voicemail_error_no_data_cellular_required_message">Probeer het opnieuw wanneer er een betere mobiele dataverbinding beschikbaar is. Je kunt nog steeds bellen om je voicemail te controleren.</string>
+  <string name="voicemail_error_bad_config_title">Kan visuele voicemail niet updaten</string>
+  <string name="voicemail_error_bad_config_message">Je kunt nog steeds bellen om je voicemail te controleren.</string>
+  <string name="voicemail_error_communication_title">Kan visuele voicemail niet updaten</string>
+  <string name="voicemail_error_communication_message">Je kunt nog steeds bellen om je voicemail te controleren.</string>
+  <string name="voicemail_error_server_connection_title">Kan visuele voicemail niet updaten</string>
+  <string name="voicemail_error_server_connection_message">Je kunt nog steeds bellen om je voicemail te controleren.</string>
+  <string name="voicemail_error_server_title">Kan visuele voicemail niet updaten</string>
+  <string name="voicemail_error_server_message">Je kunt nog steeds bellen om je voicemail te controleren.</string>
+  <string name="voicemail_error_inbox_near_full_title">Inbox bijna vol</string>
+  <string name="voicemail_error_inbox_near_full_message">Je kunt geen nieuwe voicemails ontvangen als je inbox vol is.</string>
+  <string name="voicemail_error_inbox_full_title">Kan geen nieuwe voicemails ontvangen</string>
+  <string name="voicemail_error_inbox_full_message">Je inbox is vol. Verwijder enkele berichten om nieuwe voicemails te ontvangen.</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_title">Extra opslag en back-up inschakelen</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_message">Je mailbox is vol. Als je ruimte wilt vrijmaken, schakel je extra opslagruimte in zodat Google je voicemailberichten kan beheren en er back-ups van kan maken.</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_title">Extra opslag en back-up inschakelen</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_message">Je mailbox is bijna vol. Als je ruimte wilt vrijmaken, schakel je extra opslagruimte in zodat Google je voicemailberichten kan beheren en er back-ups van kan maken.</string>
+  <string name="voicemail_error_pin_not_set_title">Een pincode voor je voicemail instellen</string>
+  <string name="voicemail_error_pin_not_set_message">Je hebt een pincode voor de voicemail nodig wanneer je belt om toegang tot je voicemail te krijgen.</string>
+  <string name="voicemail_action_turn_off_airplane_mode">Instellingen voor vliegtuigmodus</string>
+  <string name="voicemail_action_set_pin">Pincode instellen</string>
+  <string name="voicemail_action_retry">Opnieuw</string>
+  <string name="voicemail_action_turn_archive_on">Inschakelen</string>
+  <string name="voicemail_action_dimiss">Nee, bedankt</string>
+  <string name="voicemail_action_sync">Synchroniseren</string>
+  <string name="voicemail_action_call_voicemail">Voicemail bellen</string>
+  <string name="voicemail_action_call_customer_support">Klantenondersteuning bellen</string>
+  <string name="vvm3_error_vms_dns_failure_title">Er is iets misgegaan</string>
+  <string name="vvm3_error_vms_dns_failure_message">Er is een probleem opgetreden. Probeer het later opnieuw. Blijft het probleem optreden, neem dan via %1$s contact op met de klantenservice en geef de foutcode 9001 door.</string>
+  <string name="vvm3_error_vmg_dns_failure_title">Er is iets misgegaan</string>
+  <string name="vvm3_error_vmg_dns_failure_message">Er is een probleem opgetreden. Probeer het later opnieuw. Blijft het probleem optreden, neem dan via %1$s contact op met de klantenservice en geef de foutcode 9002 door.</string>
+  <string name="vvm3_error_spg_dns_failure_title">Er is iets misgegaan</string>
+  <string name="vvm3_error_spg_dns_failure_message">Er is een probleem opgetreden. Probeer het later opnieuw. Blijft het probleem optreden, neem dan via %1$s contact op met de klantenservice en geef de foutcode 9003 door.</string>
+  <string name="vvm3_error_vms_no_cellular_title">Kan geen verbinding maken met je voicemailbox</string>
+  <string name="vvm3_error_vms_no_cellular_message">Er is een probleem opgetreden bij het maken van verbinding met je voicemailbox. Ben je in een gebied met een zwak signaal, wacht dan totdat je een sterk signaal hebt en probeer het opnieuw. Blijft het probleem optreden, neem dan via %1$s contact op met de klantenservice en geef de foutcode 9004 door.</string>
+  <string name="vvm3_error_vmg_no_cellular_title">Kan geen verbinding maken met je voicemailbox</string>
+  <string name="vvm3_error_vmg_no_cellular_message">Er is een probleem opgetreden bij het maken van verbinding met je voicemailbox. Ben je in een gebied met een zwak signaal, wacht dan totdat je een sterk signaal hebt en probeer het opnieuw. Blijft het probleem optreden, neem dan via %1$s contact op met de klantenservice en geef de foutcode 9005 door.</string>
+  <string name="vvm3_error_spg_no_cellular_title">Kan geen verbinding maken met je voicemailbox</string>
+  <string name="vvm3_error_spg_no_cellular_message">Er is een probleem opgetreden bij het maken van verbinding met je voicemailbox. Ben je in een gebied met een zwak signaal, wacht dan totdat je een sterk signaal hebt en probeer het opnieuw. Blijft het probleem optreden, neem dan via %1$s contact op met de klantenservice en geef de foutcode 9006 door.</string>
+  <string name="vvm3_error_vms_timeout_title">Er is iets misgegaan</string>
+  <string name="vvm3_error_vms_timeout_message">Er is een probleem opgetreden. Probeer het later opnieuw. Blijft het probleem optreden, neem dan via %1$s contact op met de klantenservice en geef de foutcode 9007 door.</string>
+  <string name="vvm3_error_vmg_timeout_title">Er is iets misgegaan</string>
+  <string name="vvm3_error_vmg_timeout_message">Er is een probleem opgetreden. Probeer het later opnieuw. Blijft het probleem optreden, neem dan via %1$s contact op met de klantenservice en geef de foutcode 9008 door.</string>
+  <string name="vvm3_error_status_sms_timeout_title">Er is iets misgegaan</string>
+  <string name="vvm3_error_status_sms_timeout_message">Er is een probleem opgetreden bij het instellen van je service. Probeer het later opnieuw. Blijft het probleem optreden, neem dan via %1$s contact op met de klantenservice en geef de foutcode 9009 door.</string>
+  <string name="vvm3_error_subscriber_blocked_title">Kan geen verbinding maken met je voicemailbox</string>
+  <string name="vvm3_error_subscriber_blocked_message">Er kan momenteel geen verbinding worden gemaakt met je voicemailbox. Probeer het later opnieuw. Blijft het probleem optreden, neem dan via %1$s contact op met de klantenservice en geef de foutcode 9990 door.</string>
+  <string name="vvm3_error_unknown_user_title">Voicemail instellen</string>
+  <string name="vvm3_error_unknown_user_message">Voicemail is niet ingesteld in je account. Neem via %1$s contact op met de klantenservice en geef de foutcode 9991 door.</string>
+  <string name="vvm3_error_unknown_device_title">Voicemail</string>
+  <string name="vvm3_error_unknown_device_message">Visuele voicemail kan niet worden gebruikt op dit apparaat. Neem via %1$s contact op met de klantenservice en geef de foutcode 9992 door.</string>
+  <string name="vvm3_error_invalid_password_title">Er is iets misgegaan</string>
+  <string name="vvm3_error_invalid_password_message">Neem via %1$s contact op met de klantenservice en geef de foutcode 9993 door.</string>
+  <string name="vvm3_error_mailbox_not_initialized_title">Visuele voicemail</string>
+  <string name="vvm3_error_mailbox_not_initialized_message">Neem via %1$s contact op met de klantenservice en geef de foutcode 9994 door om het instellen van visuele voicemail te voltooien.</string>
+  <string name="vvm3_error_service_not_provisioned_title">Visuele voicemail</string>
+  <string name="vvm3_error_service_not_provisioned_message">Neem via %1$s contact op met de klantenservice en geef de foutcode 9995 door om het instellen van visuele voicemail te voltooien.</string>
+  <string name="vvm3_error_service_not_activated_title">Visuele voicemail</string>
+  <string name="vvm3_error_service_not_activated_message">Neem via %1$s contact op met de klantenservice en geef de foutcode 9996 door om visuele voicemail te activeren.</string>
+  <string name="vvm3_error_user_blocked_title">Er is iets misgegaan</string>
+  <string name="vvm3_error_user_blocked_message">Neem via %1$s contact op met de klantenservice en geef de foutcode 9998 door om het instellen van visuele voicemail te voltooien.</string>
+  <string name="vvm3_error_subscriber_unknown_title">Visuele voicemail is uitgeschakeld</string>
+  <string name="vvm3_error_subscriber_unknown_message">Neem via %1$s contact op met de klantenservice om visuele voicemail te activeren.</string>
+  <string name="vvm3_error_imap_getquota_error_title">Er is iets misgegaan</string>
+  <string name="vvm3_error_imap_getquota_error_message">Neem via %1$s contact op met de klantenservice en geef de foutcode 9997 door.</string>
+  <string name="vvm3_error_imap_select_error_title">Er is iets misgegaan</string>
+  <string name="vvm3_error_imap_select_error_message">Neem via %1$s contact op met de klantenservice en geef de foutcode 9989 door.</string>
+  <string name="vvm3_error_imap_error_title">Er is iets misgegaan</string>
+  <string name="vvm3_error_imap_error_message">Neem via %1$s contact op met de klantenservice en geef de foutcode 9999 door.</string>
+  <string name="verizon_terms_and_conditions_title">Visuele voicemail inschakelen</string>
+  <string name="verizon_terms_and_conditions_message">%1$s Als je visuele voicemail inschakelt, ga je akkoord met de algemene voorwaarden van Verizon Wireless:\n\n%2$s</string>
+  <string name="dialer_terms_and_conditions_title">Visuele voicemail inschakelen</string>
+  <string name="dialer_terms_and_conditions_existing_user_title">Nieuw! Je voicemail lezen</string>
+  <string name="dialer_terms_and_conditions_message">%s</string>
+  <string name="dialer_terms_and_conditions_1.0">Bekijk en beluister je berichten, zonder dat je je voicemail hoeft te bellen. Transcripten van je voicemail worden geleverd via de gratis transcriptieservice van Google. Je kunt deze op elk gewenst moment bij Instellingen uitschakelen. %s</string>
+  <string name="dialer_terms_and_conditions_existing_user">Transcripten van je voicemail worden nu geleverd via de gratis transcriptieservice van Google. Je kunt deze op elk gewenst moment bij Instellingen uitschakelen. %s</string>
+  <string name="dialer_terms_and_conditions_for_verizon_1.0">Bekijk en beluister je berichten, zonder dat je je voicemail hoeft te bellen.</string>
+  <string name="dialer_terms_and_conditions_learn_more">Meer informatie</string>
+  <string name="dialer_terms_and_conditions_existing_user_ack">OK</string>
+  <string name="dialer_terms_and_conditions_existing_user_decline">Nee, bedankt</string>
+  <string name="terms_and_conditions_decline_dialog_title">Visuele voicemail uitschakelen?</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_message">Visuele voicemail wordt uitgeschakeld als de Algemene voorwaarden worden geweigerd.</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_downgrade">Uitschakelen</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_message">Als je visuele voicemail uitschakelt, wordt er geen visuele voicemail meer weergegeven.</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_downgrade">Uitschakelen</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message">Voicemail is alleen toegankelijk door *86 te bellen. Stel een nieuwe pincode voor de voicemail in om door te gaan.</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin">Pincode instellen</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/error/res/values-no/strings.xml b/java/com/android/dialer/voicemail/listui/error/res/values-no/strings.xml
new file mode 100644
index 0000000..1a45c77
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/error/res/values-no/strings.xml
@@ -0,0 +1,102 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_error_activating_title">Slår på visuell talepostkasse</string>
+  <string name="voicemail_error_activating_message">Det er ikke sikkert at du kan motta talepostvarsler før visuell talepost er helt aktivert. Ring talepost for å hente nye meldinger før aktiveringen er fullført.</string>
+  <string name="voicemail_error_not_activate_no_signal_title">Kan ikke slå på visuell talepost</string>
+  <string name="voicemail_error_not_activate_no_signal_message">Sjekk at telefonen din har mobilforbindelse, og prøv på nytt.</string>
+  <string name="voicemail_error_not_activate_no_signal_airplane_mode_message">Slå av flymodus og prøv på nytt.</string>
+  <string name="voicemail_error_no_signal_title">Ingen tilkobling</string>
+  <string name="voicemail_error_no_signal_message">Du blir ikke varslet om nye talemeldinger. Hvis du er på Wi-Fi, kan du sjekke taleposten ved å synkronisere nå.</string>
+  <string name="voicemail_error_no_signal_airplane_mode_message">Du blir ikke varslet om nye talemeldinger. Slå av flymodus for å synkronisere talepost.</string>
+  <string name="voicemail_error_no_signal_cellular_required_message">Telefonen må ha mobildataforbindelse for at du skal kunne sjekke talepost.</string>
+  <string name="voicemail_error_activation_failed_title">Kan ikke slå på visuell talepost</string>
+  <string name="voicemail_error_activation_failed_message">Du kan fortsatt ringe for å sjekke talepost.</string>
+  <string name="voicemail_error_no_data_title">Kan ikke oppdatere visuell talepost</string>
+  <string name="voicemail_error_no_data_message">Prøv på nytt når Wi‑Fi- eller mobildatadekningen er bedre. Du kan fortsatt ringe for å sjekke talepost.</string>
+  <string name="voicemail_error_no_data_cellular_required_message">Prøv på nytt når mobildatadekningen er bedre. Du kan fortsatt ringe for å sjekke talepost.</string>
+  <string name="voicemail_error_bad_config_title">Kan ikke oppdatere visuell talepost</string>
+  <string name="voicemail_error_bad_config_message">Du kan fortsatt ringe for å sjekke talepost.</string>
+  <string name="voicemail_error_communication_title">Kan ikke oppdatere visuell talepost</string>
+  <string name="voicemail_error_communication_message">Du kan fortsatt ringe for å sjekke talepost.</string>
+  <string name="voicemail_error_server_connection_title">Kan ikke oppdatere visuell talepost</string>
+  <string name="voicemail_error_server_connection_message">Du kan fortsatt ringe for å sjekke talepost.</string>
+  <string name="voicemail_error_server_title">Kan ikke oppdatere visuell talepost</string>
+  <string name="voicemail_error_server_message">Du kan fortsatt ringe for å sjekke talepost.</string>
+  <string name="voicemail_error_inbox_near_full_title">Innboksen er nesten full</string>
+  <string name="voicemail_error_inbox_near_full_message">Du kan ikke motta ny talepost hvis innboksen din er full.</string>
+  <string name="voicemail_error_inbox_full_title">Kan ikke motta ny talepost</string>
+  <string name="voicemail_error_inbox_full_message">Innboksen din er full. Prøv å slette noen meldinger for å motta ny talepost.</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_title">Slå på ekstra lagringsplass og sikkerhetskopiering</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_message">Talepostkassen din er full. Frigjør plass ved å slå på ekstra lagringsplass og la Google administrere og ta sikkerhetskopi av taleposten din.</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_title">Slå på ekstra lagringsplass og sikkerhetskopiering</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_message">Talepostkassen din er nesten full. Frigjør plass ved å slå på ekstra lagringsplass og la Google administrere og ta sikkerhetskopi av taleposten din.</string>
+  <string name="voicemail_error_pin_not_set_title">Angi PIN-koden din for talepost</string>
+  <string name="voicemail_error_pin_not_set_message">Du trenger PIN-koden hver gang du ringer for å sjekke taleposten din.</string>
+  <string name="voicemail_action_turn_off_airplane_mode">Flymodus-innstillinger</string>
+  <string name="voicemail_action_set_pin">Angi PIN-kode</string>
+  <string name="voicemail_action_retry">Prøv igjen</string>
+  <string name="voicemail_action_turn_archive_on">Slå på</string>
+  <string name="voicemail_action_dimiss">Nei takk</string>
+  <string name="voicemail_action_sync">Oppdater</string>
+  <string name="voicemail_action_call_voicemail">Ring talepostkassen</string>
+  <string name="voicemail_action_call_customer_support">Ring kundeservice</string>
+  <string name="vvm3_error_vms_dns_failure_title">Noe gikk galt</string>
+  <string name="vvm3_error_vms_dns_failure_message">Beklager, det oppsto et problem. Prøv på nytt senere, eller kontakt kundeservice på %1$s og oppgi feilkode 9001.</string>
+  <string name="vvm3_error_vmg_dns_failure_title">Noe gikk galt</string>
+  <string name="vvm3_error_vmg_dns_failure_message">Beklager, det oppsto et problem. Prøv igjen senere, eller kontakt kundeservice på %1$s og oppgi feilkode 9002.</string>
+  <string name="vvm3_error_spg_dns_failure_title">Noe gikk galt</string>
+  <string name="vvm3_error_spg_dns_failure_message">Beklager, det oppsto et problem. Prøv igjen senere, eller kontakt kundeservice på %1$s og oppgi feilkode 9003.</string>
+  <string name="vvm3_error_vms_no_cellular_title">Kan ikke koble til talepostkassen</string>
+  <string name="vvm3_error_vms_no_cellular_message">Beklager, vi har problemer med å koble til talepostkassen. Hvis du er i et område med dårlig signalstyrke, må du vente til du har et sterkt signal og prøve igjen. Hvis problemet vedvarer, kan du kontakte kundeservice på %1$s og oppgi feilkode 9004.</string>
+  <string name="vvm3_error_vmg_no_cellular_title">Kan ikke koble til talepostkassen</string>
+  <string name="vvm3_error_vmg_no_cellular_message">Beklager, vi har problemer med å koble til talepostkassen. Hvis du er i et område med dårlig signalstyrke, må du vente til du har et sterkt signal og prøve igjen. Hvis problemet vedvarer, kan du kontakte kundeservice på %1$s og oppgi feilkode 9005.</string>
+  <string name="vvm3_error_spg_no_cellular_title">Kan ikke koble til talepostkassen</string>
+  <string name="vvm3_error_spg_no_cellular_message">Beklager, vi har problemer med å koble til talepostkassen. Hvis du er i et område med dårlig signalstyrke, må du vente til du har et sterkt signal og prøve igjen. Hvis problemet vedvarer, kan du kontakte kundeservice på %1$s og oppgi feilkode 9006.</string>
+  <string name="vvm3_error_vms_timeout_title">Noe gikk galt</string>
+  <string name="vvm3_error_vms_timeout_message">Beklager, det oppsto et problem. Prøv igjen senere, eller kontakt kundeservice på %1$s og oppgi feilkode 9007.</string>
+  <string name="vvm3_error_vmg_timeout_title">Noe gikk galt</string>
+  <string name="vvm3_error_vmg_timeout_message">Beklager, det oppsto et problem. Prøv igjen senere, eller kontakt kundeservice på %1$s og oppgi feilkode 9008.</string>
+  <string name="vvm3_error_status_sms_timeout_title">Noe gikk galt</string>
+  <string name="vvm3_error_status_sms_timeout_message">Beklager, vi har problemer med å opprette tjenesten. Prøv igjen senere, eller kontakt kundeservice på %1$s og oppgi feilkode 9009.</string>
+  <string name="vvm3_error_subscriber_blocked_title">Kan ikke koble til talepostkassen</string>
+  <string name="vvm3_error_subscriber_blocked_message">Beklager, vi kunne ikke koble til talepostkassen akkurat nå. Prøv igjen senere, eller kontakt kundeservice på %1$s og oppgi feilkode 9990.</string>
+  <string name="vvm3_error_unknown_user_title">Konfigurer talepost</string>
+  <string name="vvm3_error_unknown_user_message">Talepost er ikke satt opp på din konto. Kontakt kundeservice på %1$s og oppgi feilkode 9991.</string>
+  <string name="vvm3_error_unknown_device_title">Talepost</string>
+  <string name="vvm3_error_unknown_device_message">Visuell talepost kan ikke brukes på denne enheten. Kontakt kundeservice på %1$s og oppgi feilkode 9992.</string>
+  <string name="vvm3_error_invalid_password_title">Noe gikk galt</string>
+  <string name="vvm3_error_invalid_password_message">Kontakt kundeservice på %1$s og oppgi feilkode 9993.</string>
+  <string name="vvm3_error_mailbox_not_initialized_title">Visuell talepost</string>
+  <string name="vvm3_error_mailbox_not_initialized_message">Kontakt kundeservice på %1$s og oppgi feilkode 9994 for å fullføre konfigureringen av visuell talepost.</string>
+  <string name="vvm3_error_service_not_provisioned_title">Visuell talepost</string>
+  <string name="vvm3_error_service_not_provisioned_message">Kontakt kundeservice på %1$s og oppgi feilkode 9995 for å fullføre konfigureringen av visuell talepost.</string>
+  <string name="vvm3_error_service_not_activated_title">Visuell talepost</string>
+  <string name="vvm3_error_service_not_activated_message">Kontakt kundeservice på %1$s og oppgi feilkode 9996 for å fullføre konfigureringen av visuell talepost.</string>
+  <string name="vvm3_error_user_blocked_title">Noe gikk galt</string>
+  <string name="vvm3_error_user_blocked_message">Kontakt kundeservice på %1$s og oppgi feilkode 9998 for å fullføre konfigureringen av visuell talepost.</string>
+  <string name="vvm3_error_subscriber_unknown_title">Visuell talepost er slått av</string>
+  <string name="vvm3_error_subscriber_unknown_message">Kontakt kundeservice på %1$s for å slå på visuell talepost.</string>
+  <string name="vvm3_error_imap_getquota_error_title">Noe gikk galt</string>
+  <string name="vvm3_error_imap_getquota_error_message">Kontakt kundeservice på %1$s og oppgi feilkode 9997.</string>
+  <string name="vvm3_error_imap_select_error_title">Noe gikk galt</string>
+  <string name="vvm3_error_imap_select_error_message">Kontakt kundeservice på %1$s og oppgi feilkode 9989.</string>
+  <string name="vvm3_error_imap_error_title">Noe gikk galt</string>
+  <string name="vvm3_error_imap_error_message">Kontakt kundeservice på %1$s og oppgi feilkode 9999.</string>
+  <string name="verizon_terms_and_conditions_title">Slå på visuell talepost</string>
+  <string name="verizon_terms_and_conditions_message">%1$s Ved å slå på visuell talepost samtykker du i vilkårene til Verizon Wireless:\n\n%2$s</string>
+  <string name="dialer_terms_and_conditions_title">Slå på visuell talepost</string>
+  <string name="dialer_terms_and_conditions_existing_user_title">Nyhet! Les taleposten din</string>
+  <string name="dialer_terms_and_conditions_message">%s</string>
+  <string name="dialer_terms_and_conditions_1.0">Se og hør på meldingene dine uten å måtte ringe talepostkassen. Transkripsjoner av talemeldingene dine leveres av Googles gratistjeneste for transkripsjoner. Du kan slå av begge deler i innstillingene når som helst. %s</string>
+  <string name="dialer_terms_and_conditions_existing_user">Transkripsjoner av talemeldingene dine leveres nå av Googles gratistjeneste for transkripsjoner. Du kan slå av dette i innstillingene når som helst. %s</string>
+  <string name="dialer_terms_and_conditions_for_verizon_1.0">Se og hør meldingene dine, uten å måtte ringe til talepostkassen.</string>
+  <string name="dialer_terms_and_conditions_learn_more">Finn ut mer</string>
+  <string name="dialer_terms_and_conditions_existing_user_ack">Greit</string>
+  <string name="dialer_terms_and_conditions_existing_user_decline">Nei takk</string>
+  <string name="terms_and_conditions_decline_dialog_title">Vil du slå av visuell talepost?</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_message">Visuell talepost blir slått av hvis vilkårene ikke godtas.</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_downgrade">Slå av</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_message">Visuell talepost blir deaktivert hvis du slår av visuell talepost.</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_downgrade">Slå av</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message">Talemeldinger er bare tilgjengelig ved å ringe *86. Angi en ny PIN-kode for å fortsette.</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin">Angi PIN-kode</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/error/res/values-pa/strings.xml b/java/com/android/dialer/voicemail/listui/error/res/values-pa/strings.xml
new file mode 100644
index 0000000..f48a924
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/error/res/values-pa/strings.xml
@@ -0,0 +1,102 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_error_activating_title">ਦ੍ਰਿਸ਼ਟੀਗਤ ਵੌਇਸਮੇਲ ਕਿਰਿਆਸ਼ੀਲ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ</string>
+  <string name="voicemail_error_activating_message">ਜਦੋਂ ਤੱਕ ਦ੍ਰਿਸ਼ਟੀਗਤ ਵੌਇਸਮੇਲ ਪੂਰੀ ਤਰ੍ਹਾਂ ਕਿਰਿਆਸ਼ੀਲ ਹੋਣ ਤੱਕ ਸ਼ਾਇਦ ਤੁਹਾਨੂੰ ਵੌਇਸਮੇਲ ਸੂਚਨਾਵਾਂ ਪ੍ਰਾਪਤ ਨਾ ਹੋਣ। ਵੌਇਸਮੇਲ ਦੇ ਪੂਰੀ ਤਰ੍ਹਾਂ ਕਿਰਿਆਸ਼ੀਲ ਹੋਣ ਤੱਕ ਨਵੇਂ ਸੁਨੇਹੇ ਪ੍ਰਾਪਤ ਕਰਨ ਲਈ ਵੌਇਸਮੇਲ ਨੂੰ ਕਾਲ ਕਰੋ।</string>
+  <string name="voicemail_error_not_activate_no_signal_title">ਦ੍ਰਿਸ਼ਟੀਗਤ ਵੌਇਸਮੇਲ ਨੂੰ ਕਿਰਿਆਸ਼ੀਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ</string>
+  <string name="voicemail_error_not_activate_no_signal_message">ਪੱਕਾ ਕਰੋ ਕਿ ਤੁਹਾਡੇ ਫ਼ੋਨ \'ਤੇ ਮੋਬਾਈਲ ਨੈੱਟਵਰਕ ਕਨੈਕਸ਼ਨ ਹੈ ਅਤੇ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ।</string>
+  <string name="voicemail_error_not_activate_no_signal_airplane_mode_message">ਜਹਾਜ਼ ਮੋਡ ਬੰਦ ਕਰੋ ਅਤੇ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ।</string>
+  <string name="voicemail_error_no_signal_title">ਕੋਈ ਕਨੈਕਸ਼ਨ ਨਹੀਂ</string>
+  <string name="voicemail_error_no_signal_message">ਤੁਹਾਨੂੰ ਨਵੀਆਂ ਵੌਇਸਮੇਲਾਂ ਲਈ ਸੂਚਿਤ ਨਹੀਂ ਕੀਤਾ ਜਾਵੇਗਾ। ਜੇਕਰ ਤੁਸੀਂ ਵਾਈ-ਫਾਈ \'ਤੇ ਹੋ, ਤਾਂ ਹੁਣੇ ਸਮਕਾਲੀਕਰਨ ਕਰਕੇ ਵੌਇਸਮੇਲ ਦੀ ਜਾਂਚ ਕਰ ਸਕਦੇ ਹੋ।</string>
+  <string name="voicemail_error_no_signal_airplane_mode_message">ਤੁਹਾਨੂੰ ਨਵੀਆਂ ਵੌਇਸਮੇਲਾਂ ਲਈ ਸੂਚਿਤ ਨਹੀਂ ਕੀਤਾ ਜਾਵੇਗਾ। ਆਪਣੀਆਂ ਵੌਇਸਮੇਲਾਂ ਸਮਕਾਲੀਕਿਰਤ ਕਰਨ ਲਈ ਜਹਾਜ਼ ਮੋਡ ਬੰਦ ਕਰੋ।</string>
+  <string name="voicemail_error_no_signal_cellular_required_message">ਵੌਇਸਮੇਲ ਦੀ ਜਾਂਚ ਕਰਨ ਲਈ ਤੁਹਾਡੇ ਫ਼ੋਨ ਨੂੰ ਇੱਕ ਮੋਬਾਈਲ ਡਾਟਾ ਕਨੈਕਸ਼ਨ ਦੀ ਲੋੜ ਹੈ।</string>
+  <string name="voicemail_error_activation_failed_title">ਦ੍ਰਿਸ਼ਟੀਗਤ ਵੌਇਸਮੇਲ ਨੂੰ ਕਿਰਿਆਸ਼ੀਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ</string>
+  <string name="voicemail_error_activation_failed_message">ਤੁਸੀਂ ਹਾਲੇ ਵੀ ਵੌਇਸਮੇਲ ਦੀ ਜਾਂਚ ਕਰਨ ਲਈ ਕਾਲ ਕਰ ਸਕਦੇ ਹੋ।</string>
+  <string name="voicemail_error_no_data_title">ਦ੍ਰਿਸ਼ਟੀਗਤ ਵੌਇਸਮੇਲ ਨੂੰ ਅੱਪਡੇਟ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ</string>
+  <string name="voicemail_error_no_data_message">ਤੁਹਾਡੇ ਵਾਈ-ਫਾਈ ਜਾਂ ਮੋਬਾਈਲ ਡਾਟਾ ਕਨੈਕਸ਼ਨ ਬਿਹਤਰ ਹੋਣ \'ਤੇ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ। ਤੁਸੀਂ ਹਾਲੇ ਵੀ ਵੌਇਸਮੇਲ ਦੀ ਜਾਂਚ ਕਰਨ ਲਈ ਕਾਲ ਕਰ ਸਕਦੇ ਹੋ।</string>
+  <string name="voicemail_error_no_data_cellular_required_message">ਤੁਹਾਡੇ ਮੋਬਾਈਲ ਡਾਟਾ ਕਨੈਕਸ਼ਨ ਬਿਹਤਰ ਹੋਣ \'ਤੇ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ। ਤੁਸੀਂ ਹਾਲੇ ਵੀ ਵੌਇਸਮੇਲ ਦੀ ਜਾਂਚ ਕਰਨ ਲਈ ਕਾਲ ਕਰ ਸਕਦੇ ਹੋ।</string>
+  <string name="voicemail_error_bad_config_title">ਦ੍ਰਿਸ਼ਟੀਗਤ ਵੌਇਸਮੇਲ ਨੂੰ ਅੱਪਡੇਟ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ</string>
+  <string name="voicemail_error_bad_config_message">ਤੁਸੀਂ ਹਾਲੇ ਵੀ ਵੌਇਸਮੇਲ ਦੀ ਜਾਂਚ ਕਰਨ ਲਈ ਕਾਲ ਕਰ ਸਕਦੇ ਹੋ।</string>
+  <string name="voicemail_error_communication_title">ਦ੍ਰਿਸ਼ਟੀਗਤ ਵੌਇਸਮੇਲ ਨੂੰ ਅੱਪਡੇਟ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ</string>
+  <string name="voicemail_error_communication_message">ਤੁਸੀਂ ਹਾਲੇ ਵੀ ਵੌਇਸਮੇਲ ਦੀ ਜਾਂਚ ਕਰਨ ਲਈ ਕਾਲ ਕਰ ਸਕਦੇ ਹੋ।</string>
+  <string name="voicemail_error_server_connection_title">ਦ੍ਰਿਸ਼ਟੀਗਤ ਵੌਇਸਮੇਲ ਨੂੰ ਅੱਪਡੇਟ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ</string>
+  <string name="voicemail_error_server_connection_message">ਤੁਸੀਂ ਹਾਲੇ ਵੀ ਵੌਇਸਮੇਲ ਦੀ ਜਾਂਚ ਕਰਨ ਲਈ ਕਾਲ ਕਰ ਸਕਦੇ ਹੋ।</string>
+  <string name="voicemail_error_server_title">ਦ੍ਰਿਸ਼ਟੀਗਤ ਵੌਇਸਮੇਲ ਨੂੰ ਅੱਪਡੇਟ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ</string>
+  <string name="voicemail_error_server_message">ਤੁਸੀਂ ਹਾਲੇ ਵੀ ਵੌਇਸਮੇਲ ਦੀ ਜਾਂਚ ਕਰਨ ਲਈ ਕਾਲ ਕਰ ਸਕਦੇ ਹੋ।</string>
+  <string name="voicemail_error_inbox_near_full_title">ਇਨਬਾਕਸ ਲਗਭਗ ਭਰ ਗਿਆ ਹੈ</string>
+  <string name="voicemail_error_inbox_near_full_message">ਜੇਕਰ ਤੁਹਾਡਾ ਇਨਬਾਕਸ ਭਰਿਆ ਹੋਇਆ ਹੈ, ਤਾਂ ਤੁਸੀਂ ਨਵੀਂ ਵੌਇਸਮੇਲ ਪ੍ਰਾਪਤ ਨਹੀਂ ਕਰ ਸਕੋਂਗੇ।</string>
+  <string name="voicemail_error_inbox_full_title">ਨਵੀਆਂ ਵੌਇਸਮੇਲਾਂ ਨੂੰ ਪ੍ਰਾਪਤ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ</string>
+  <string name="voicemail_error_inbox_full_message">ਤੁਹਾਡਾ ਇਨਬਾਕਸ ਭਰਿਆ ਹੋਇਆ ਹੈ। ਨਵੀਂ ਵੌਇਸਮੇਲ ਪ੍ਰਾਪਤ ਕਰਨ ਲਈ ਕੁਝ ਸੁਨੇਹਿਆਂ ਨੂੰ ਮਿਟਾਉਣ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰੋ।</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_title">ਵਾਧੂ ਸਟੋਰੇਜ ਨੂੰ ਚਾਲੂ ਕਰੋ ਅਤੇ ਬੈਕਅੱਪ ਲਓ</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_message">ਤੁਹਾਡਾ ਮੇਲਬਾਕਸ ਭਰਿਆ ਹੋਇਆ ਹੈ। ਜਗ੍ਹਾ ਖਾਲੀ ਕਰਨ ਲਈ, ਵਾਧੂ ਸਟੋਰੇਜ ਨੂੰ ਚਾਲੂ ਕਰੋ ਤਾਂ ਕਿ Google ਤੁਹਾਡੇ ਵੌਇਸਮੇਲ ਸੁਨੇਹਿਆਂ ਦਾ ਪ੍ਰਬੰਧਨ ਕਰ ਸਕੇ ਅਤੇ ਬੈਕਅੱਪ ਲੈ ਸਕੇ।</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_title">ਵਾਧੂ ਸਟੋਰੇਜ ਨੂੰ ਚਾਲੂ ਕਰੋ ਅਤੇ ਬੈਕਅੱਪ ਲਓ</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_message">ਤੁਹਾਡਾ ਮੇਲਬਾਕਸ ਲਗਭਗ ਭਰਿਆ ਹੋਇਆ ਹੈ। ਜਗ੍ਹਾ ਖਾਲੀ ਕਰਨ ਲਈ, ਵਾਧੂ ਸਟੋਰੇਜ ਨੂੰ ਚਾਲੂ ਕਰੋ ਤਾਂ ਕਿ Google ਤੁਹਾਡੇ ਵੌਇਸਮੇਲ ਸੁਨੇਹਿਆਂ ਦਾ ਪ੍ਰਬੰਧਨ ਕਰ ਸਕੇ ਅਤੇ ਬੈਕਅੱਪ ਲੈ ਸਕੇ।</string>
+  <string name="voicemail_error_pin_not_set_title">ਆਪਣਾ ਵੌਇਸਮੇਲ ਪਿੰਨ ਸੈੱਟ ਕਰੋ</string>
+  <string name="voicemail_error_pin_not_set_message">ਜਦੋਂ ਵੀ ਤੁਸੀਂ ਆਪਣੇ ਵੌਇਸਮੇਲ ਤੱਕ ਪਹੁੰਚ ਕਰਨ ਲਈ ਕਾਲ ਕਰੋਂਗੇ ਤਾਂ ਤੁਹਾਨੂੰ ਇੱਕ ਵੌਇਸਮੇਲ ਪਿੰਨ ਦੀ ਲੋੜ ਪਵੇਗੀ।</string>
+  <string name="voicemail_action_turn_off_airplane_mode">ਜਹਾਜ਼ ਮੋਡ ਸੈਟਿੰਗਾਂ</string>
+  <string name="voicemail_action_set_pin">ਪਿੰਨ ਸੈੱਟ ਕਰੋ</string>
+  <string name="voicemail_action_retry">ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ</string>
+  <string name="voicemail_action_turn_archive_on">ਚਾਲੂ ਕਰੋ</string>
+  <string name="voicemail_action_dimiss">ਨਹੀਂ ਧੰਨਵਾਦ</string>
+  <string name="voicemail_action_sync">ਸਮਕਾਲੀਕਿਰਤ ਕਰੋ</string>
+  <string name="voicemail_action_call_voicemail">ਵੌਇਸਮੇਲ ਨੂੰ ਕਾਲ ਕਰੋ</string>
+  <string name="voicemail_action_call_customer_support">ਗਾਹਕ ਸਹਾਇਤਾ ਨੂੰ ਕਾਲ ਕਰੋ</string>
+  <string name="vvm3_error_vms_dns_failure_title">ਕੋਈ ਗੜਬੜ ਹੋ ਗਈ</string>
+  <string name="vvm3_error_vms_dns_failure_message">ਮਾਫ਼ ਕਰਨਾ, ਸਾਨੂੰ ਕਿਸੇ ਸਮੱਸਿਆ ਦਾ ਸਾਹਮਣਾ ਕਰਨਾ ਪਿਆ। ਕਿਰਪਾ ਕਰਕੇ ਬਾਅਦ ਵਿੱਚ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ। ਜੇਕਰ ਫਿਰ ਵੀ ਸਮੱਸਿਆ ਜਾਰੀ ਰਹਿੰਦੀ ਹੈ, ਤਾਂ ਕਿਰਪਾ ਕਰਕੇ %1$s \'ਤੇ ਗਾਹਕ ਸੇਵਾ ਨੂੰ ਸੰਪਰਕ ਕਰੋ ਅਤੇ ਉਹਨਾਂ ਨੂੰ ਦੱਸੋ ਕਿ ਗੜਬੜ ਕੋਡ 9001 ਹੈ।</string>
+  <string name="vvm3_error_vmg_dns_failure_title">ਕੋਈ ਗੜਬੜ ਹੋ ਗਈ</string>
+  <string name="vvm3_error_vmg_dns_failure_message">ਮਾਫ਼ ਕਰਨਾ, ਸਾਨੂੰ ਕਿਸੇ ਸਮੱਸਿਆ ਦਾ ਸਾਹਮਣਾ ਕਰਨਾ ਪਿਆ। ਕਿਰਪਾ ਕਰਕੇ ਬਾਅਦ ਵਿੱਚ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ। ਜੇਕਰ ਫਿਰ ਵੀ ਸਮੱਸਿਆ ਜਾਰੀ ਰਹਿੰਦੀ ਹੈ, ਤਾਂ ਕਿਰਪਾ ਕਰਕੇ %1$s \'ਤੇ ਗਾਹਕ ਸੇਵਾ ਨੂੰ ਸੰਪਰਕ ਕਰੋ ਅਤੇ ਉਹਨਾਂ ਨੂੰ ਦੱਸੋ ਕਿ ਗੜਬੜ ਕੋਡ 9002 ਹੈ।</string>
+  <string name="vvm3_error_spg_dns_failure_title">ਕੋਈ ਗੜਬੜ ਹੋ ਗਈ</string>
+  <string name="vvm3_error_spg_dns_failure_message">ਮਾਫ਼ ਕਰਨਾ, ਸਾਨੂੰ ਕਿਸੇ ਸਮੱਸਿਆ ਦਾ ਸਾਹਮਣਾ ਕਰਨਾ ਪਿਆ। ਕਿਰਪਾ ਕਰਕੇ ਬਾਅਦ ਵਿੱਚ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ। ਜੇਕਰ ਫਿਰ ਵੀ ਸਮੱਸਿਆ ਜਾਰੀ ਰਹਿੰਦੀ ਹੈ, ਤਾਂ ਕਿਰਪਾ ਕਰਕੇ %1$s \'ਤੇ ਗਾਹਕ ਸੇਵਾ ਨੂੰ ਸੰਪਰਕ ਕਰੋ ਅਤੇ ਉਹਨਾਂ ਨੂੰ ਦੱਸੋ ਕਿ ਗੜਬੜ ਕੋਡ 9003 ਹੈ।</string>
+  <string name="vvm3_error_vms_no_cellular_title">ਤੁਹਾਡੇ ਵੌਇਸ ਮੇਲਬਾਕਸ ਨਾਲ ਕਨੈਕਟ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ</string>
+  <string name="vvm3_error_vms_no_cellular_message">ਮਾਫ਼ ਕਰਨਾ, ਸਾਨੂੰ ਤੁਹਾਡੇ ਵੌਇਸ ਮੇਲਬਾਕਸ ਨਾਲ ਕਨੈਕਟ ਕਰਨ ਵਿੱਚ ਸਮੱਸਿਆ ਆ ਰਹੀ ਹੈ। ਜੇਕਰ ਤੁਸੀਂ ਅਜਿਹੇ ਖੇਤਰ ਵਿੱਚ ਹੋ, ਜਿੱਥੇ ਸਿਗਨਲ ਸ਼ਕਤੀ ਕਮਜ਼ੋਰ ਹੈ, ਤਾਂ ਜਦੋਂ ਤੱਕ ਤੁਹਾਡੇ ਕੋਲ ਮਜ਼ਬੂਤ ਸਿਗਨਲ ਨਾ ਆ ਜਾਵੇ, ਉਦੋਂ ਤੱਕ ਉਡੀਕ ਕਰੋ ਅਤੇ ਫਿਰ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ। ਜੇਕਰ ਫਿਰ ਵੀ ਸਮੱਸਿਆ ਜਾਰੀ ਰਹਿੰਦੀ ਹੈ, ਤਾਂ ਕਿਰਪਾ ਕਰਕੇ %1$s \'ਤੇ ਗਾਹਕ ਸੇਵਾ ਨੂੰ ਸੰਪਰਕ ਕਰੋ ਅਤੇ ਉਹਨਾਂ ਨੂੰ ਦੱਸੋ ਕਿ ਗੜਬੜ ਕੋਡ 9004 ਹੈ।</string>
+  <string name="vvm3_error_vmg_no_cellular_title">ਤੁਹਾਡੇ ਵੌਇਸ ਮੇਲਬਾਕਸ ਨਾਲ ਕਨੈਕਟ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ</string>
+  <string name="vvm3_error_vmg_no_cellular_message">ਮਾਫ਼ ਕਰਨਾ, ਸਾਨੂੰ ਤੁਹਾਡੇ ਵੌਇਸ ਮੇਲਬਾਕਸ ਨਾਲ ਕਨੈਕਟ ਕਰਨ ਵਿੱਚ ਸਮੱਸਿਆ ਆ ਰਹੀ ਹੈ। ਜੇਕਰ ਤੁਸੀਂ ਅਜਿਹੇ ਖੇਤਰ ਵਿੱਚ ਹੋ, ਜਿੱਥੇ ਸਿਗਨਲ ਸ਼ਕਤੀ ਕਮਜ਼ੋਰ ਹੈ, ਤਾਂ ਜਦੋਂ ਤੱਕ ਤੁਹਾਡੇ ਕੋਲ ਮਜ਼ਬੂਤ ਸਿਗਨਲ ਨਾ ਆ ਜਾਵੇ, ਉਦੋਂ ਤੱਕ ਉਡੀਕ ਕਰੋ ਅਤੇ ਫਿਰ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ। ਜੇਕਰ ਫਿਰ ਵੀ ਸਮੱਸਿਆ ਜਾਰੀ ਰਹਿੰਦੀ ਹੈ, ਤਾਂ ਕਿਰਪਾ ਕਰਕੇ %1$s \'ਤੇ ਗਾਹਕ ਸੇਵਾ ਨੂੰ ਸੰਪਰਕ ਕਰੋ ਅਤੇ ਉਹਨਾਂ ਨੂੰ ਦੱਸੋ ਕਿ ਗੜਬੜ ਕੋਡ 9005 ਹੈ।</string>
+  <string name="vvm3_error_spg_no_cellular_title">ਤੁਹਾਡੇ ਵੌਇਸ ਮੇਲਬਾਕਸ ਨਾਲ ਕਨੈਕਟ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ</string>
+  <string name="vvm3_error_spg_no_cellular_message">ਮਾਫ਼ ਕਰਨਾ, ਸਾਨੂੰ ਤੁਹਾਡੇ ਵੌਇਸ ਮੇਲਬਾਕਸ ਨਾਲ ਕਨੈਕਟ ਕਰਨ ਵਿੱਚ ਸਮੱਸਿਆ ਆ ਰਹੀ ਹੈ। ਜੇਕਰ ਤੁਸੀਂ ਅਜਿਹੇ ਖੇਤਰ ਵਿੱਚ ਹੋ, ਜਿੱਥੇ ਸਿਗਨਲ ਸ਼ਕਤੀ ਕਮਜ਼ੋਰ ਹੈ, ਤਾਂ ਜਦੋਂ ਤੱਕ ਤੁਹਾਡੇ ਕੋਲ ਮਜ਼ਬੂਤ ਸਿਗਨਲ ਨਾ ਆ ਜਾਵੇ, ਉਦੋਂ ਤੱਕ ਉਡੀਕ ਕਰੋ ਅਤੇ ਫਿਰ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ। ਜੇਕਰ ਫਿਰ ਵੀ ਸਮੱਸਿਆ ਜਾਰੀ ਰਹਿੰਦੀ ਹੈ, ਤਾਂ ਕਿਰਪਾ ਕਰਕੇ %1$s \'ਤੇ ਗਾਹਕ ਸੇਵਾ ਨੂੰ ਸੰਪਰਕ ਕਰੋ ਅਤੇ ਉਹਨਾਂ ਨੂੰ ਦੱਸੋ ਕਿ ਗੜਬੜ ਕੋਡ 9006 ਹੈ।</string>
+  <string name="vvm3_error_vms_timeout_title">ਕੋਈ ਗੜਬੜ ਹੋ ਗਈ</string>
+  <string name="vvm3_error_vms_timeout_message">ਮਾਫ਼ ਕਰਨਾ, ਸਾਨੂੰ ਇੱਕ ਸਮੱਸਿਆ ਦਾ ਸਾਹਮਣਾ ਕਰਨਾ ਪਿਆ। ਕਿਰਪਾ ਕਰਕੇ ਬਾਅਦ ਵਿੱਚ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ। ਜੇਕਰ ਫਿਰ ਵੀ ਸਮੱਸਿਆ ਜਾਰੀ ਰਹਿੰਦੀ ਹੈ, ਤਾਂ ਕਿਰਪਾ ਕਰਕੇ %1$s \'ਤੇ ਗਾਹਕ ਸੇਵਾ ਨੂੰ ਸੰਪਰਕ ਕਰੋ ਅਤੇ ਉਹਨਾਂ ਨੂੰ ਦੱਸੋ ਕਿ ਗੜਬੜ ਕੋਡ 9007 ਹੈ।</string>
+  <string name="vvm3_error_vmg_timeout_title">ਕੋਈ ਗੜਬੜ ਹੋ ਗਈ</string>
+  <string name="vvm3_error_vmg_timeout_message">ਮਾਫ਼ ਕਰਨਾ, ਸਾਨੂੰ ਇੱਕ ਸਮੱਸਿਆ ਦਾ ਸਾਹਮਣਾ ਕਰਨਾ ਪਿਆ। ਕਿਰਪਾ ਕਰਕੇ ਬਾਅਦ ਵਿੱਚ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ। ਜੇਕਰ ਫਿਰ ਵੀ ਸਮੱਸਿਆ ਜਾਰੀ ਰਹਿੰਦੀ ਹੈ, ਤਾਂ ਕਿਰਪਾ ਕਰਕੇ %1$s \'ਤੇ ਗਾਹਕ ਸੇਵਾ ਨੂੰ ਸੰਪਰਕ ਕਰੋ ਅਤੇ ਉਹਨਾਂ ਨੂੰ ਦੱਸੋ ਕਿ ਗੜਬੜ ਕੋਡ 9008 ਹੈ।</string>
+  <string name="vvm3_error_status_sms_timeout_title">ਕੋਈ ਗੜਬੜ ਹੋ ਗਈ</string>
+  <string name="vvm3_error_status_sms_timeout_message">ਮਾਫ਼ ਕਰਨਾ, ਸਾਨੂੰ ਤੁਹਾਡੀ ਸੇਵਾ ਸਥਾਪਤ ਕਰਨ ਦੌਰਾਨ ਸਮੱਸਿਆ ਆ ਰਹੀ ਹੈ। ਕਿਰਪਾ ਕਰਕੇ ਬਾਅਦ ਵਿੱਚ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ। ਜੇਕਰ ਫਿਰ ਵੀ ਸਮੱਸਿਆ ਜਾਰੀ ਰਹਿੰਦੀ ਹੈ, ਤਾਂ ਕਿਰਪਾ ਕਰਕੇ %1$s \'ਤੇ ਗਾਹਕ ਸੇਵਾ ਨੂੰ ਸੰਪਰਕ ਕਰੋ ਅਤੇ ਉਹਨਾਂ ਨੂੰ ਦੱਸੋ ਕਿ ਗੜਬੜ ਕੋਡ 9009 ਹੈ।</string>
+  <string name="vvm3_error_subscriber_blocked_title">ਤੁਹਾਡੇ ਵੌਇਸ ਮੇਲਬਾਕਸ ਨਾਲ ਕਨੈਕਟ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ</string>
+  <string name="vvm3_error_subscriber_blocked_message">ਮਾਫ਼ ਕਰਨਾ, ਅਸੀਂ ਇਸ ਸਮੇਂ ਤੁਹਾਡੇ ਵੌਇਸ ਮੇਲਬਾਕਸ ਨਾਲ ਕਨੈਕਟ ਕਰਨ ਨਹੀਂ ਕਰ ਸਕਦੇ। ਕਿਰਪਾ ਕਰਕੇ ਬਾਅਦ ਵਿੱਚ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ। ਜੇਕਰ ਫਿਰ ਵੀ ਸਮੱਸਿਆ ਜਾਰੀ ਰਹਿੰਦੀ ਹੈ, ਤਾਂ ਕਿਰਪਾ ਕਰਕੇ %1$s \'ਤੇ ਗਾਹਕ ਸੇਵਾ ਨੂੰ ਸੰਪਰਕ ਕਰੋ ਅਤੇ ਉਹਨਾਂ ਨੂੰ ਦੱਸੋ ਕਿ ਗੜਬੜ ਕੋਡ 9990 ਹੈ।</string>
+  <string name="vvm3_error_unknown_user_title">ਵੌਇਸਮੇਲ ਸੈੱਟਅੱਪ ਕਰੋ</string>
+  <string name="vvm3_error_unknown_user_message">ਤੁਹਾਡੇ ਖਾਤੇ ਲਈ ਵੌਇਸਮੇਲ ਨੂੰ ਸਥਾਪਤ ਨਹੀਂ ਕੀਤਾ ਗਿਆ ਹੈ। ਕਿਰਪਾ ਕਰਕੇ %1$s \'ਤੇ ਗਾਹਕ ਸੇਵਾ ਨੂੰ ਸੰਪਰਕ ਕਰੋ ਅਤੇ ਉਹਨਾਂ ਨੂੰ ਦੱਸੋ ਕਿ ਗੜਬੜ ਕੋਡ 9991 ਹੈ।</string>
+  <string name="vvm3_error_unknown_device_title">ਵੌਇਸਮੇਲ</string>
+  <string name="vvm3_error_unknown_device_message">ਦ੍ਰਿਸ਼ਟੀਗਤ ਵੌਇਸਮੇਲ ਨੂੰ ਇਸ ਡੀਵਾਈਸ \'ਤੇ ਨਹੀਂ ਵਰਤਿਆ ਜਾ ਸਕਦਾ। ਕਿਰਪਾ ਕਰਕੇ %1$s \'ਤੇ ਗਾਹਕ ਸੇਵਾ ਨੂੰ ਸੰਪਰਕ ਕਰੋ ਅਤੇ ਉਹਨਾਂ ਨੂੰ ਦੱਸੋ ਕਿ ਗੜਬੜ ਕੋਡ 9992 ਹੈ।</string>
+  <string name="vvm3_error_invalid_password_title">ਕੋਈ ਗੜਬੜ ਹੋ ਗਈ</string>
+  <string name="vvm3_error_invalid_password_message">ਕਿਰਪਾ ਕਰਕੇ %1$s \'ਤੇ ਗਾਹਕ ਸੇਵਾ ਨੂੰ ਸੰਪਰਕ ਕਰੋ ਅਤੇ ਉਹਨਾਂ ਨੂੰ ਦੱਸੋ ਕਿ ਗੜਬੜ ਕੋਡ 9993 ਹੈ।</string>
+  <string name="vvm3_error_mailbox_not_initialized_title">ਦ੍ਰਿਸ਼ਟੀਗਤ ਵੌਇਸਮੇਲ</string>
+  <string name="vvm3_error_mailbox_not_initialized_message">ਦ੍ਰਿਸ਼ਟੀਗਤ ਵੌਇਸਮੇਲ ਦਾ ਸੈੱਟਅੱਪ ਪੂਰਾ ਕਰਨ ਲਈ, ਕਿਰਪਾ ਕਰਕੇ %1$s \'ਤੇ ਗਾਹਕ ਸੇਵਾ ਨੂੰ ਸੰਪਰਕ ਕਰੋ ਅਤੇ ਉਹਨਾਂ ਨੂੰ ਦੱਸੋ ਕਿ ਗੜਬੜ ਕੋਡ 9994 ਹੈ।</string>
+  <string name="vvm3_error_service_not_provisioned_title">ਦ੍ਰਿਸ਼ਟੀਗਤ ਵੌਇਸਮੇਲ</string>
+  <string name="vvm3_error_service_not_provisioned_message">ਦ੍ਰਿਸ਼ਟੀਗਤ ਵੌਇਸਮੇਲ ਦਾ ਸੈੱਟਅੱਪ ਪੂਰਾ ਕਰਨ ਲਈ, ਕਿਰਪਾ ਕਰਕੇ %1$s \'ਤੇ ਗਾਹਕ ਸੇਵਾ ਨੂੰ ਸੰਪਰਕ ਕਰੋ ਅਤੇ ਉਹਨਾਂ ਨੂੰ ਦੱਸੋ ਕਿ ਗੜਬੜ ਕੋਡ 9995 ਹੈ।</string>
+  <string name="vvm3_error_service_not_activated_title">ਦ੍ਰਿਸ਼ਟੀਗਤ ਵੌਇਸਮੇਲ</string>
+  <string name="vvm3_error_service_not_activated_message">ਦ੍ਰਿਸ਼ਟੀਗਤ ਵੌਇਸਮੇਲ ਨੂੰ ਕਿਰਿਆਸ਼ੀਲ ਕਰਨ ਲਈ, ਕਿਰਪਾ ਕਰਕੇ %1$s \'ਤੇ ਗਾਹਕ ਸੇਵਾ ਨੂੰ ਸੰਪਰਕ ਕਰੋ ਅਤੇ ਉਹਨਾਂ ਨੂੰ ਦੱਸੋ ਕਿ ਗੜਬੜ ਕੋਡ 9996 ਹੈ।</string>
+  <string name="vvm3_error_user_blocked_title">ਕੋਈ ਗੜਬੜ ਹੋ ਗਈ</string>
+  <string name="vvm3_error_user_blocked_message">ਦ੍ਰਿਸ਼ਟੀਗਤ ਵੌਇਸਮੇਲ ਦਾ ਸੈੱਟਅੱਪ ਪੂਰਾ ਕਰਨ ਲਈ, ਕਿਰਪਾ ਕਰਕੇ %1$s \'ਤੇ ਗਾਹਕ ਸੇਵਾ ਨੂੰ ਸੰਪਰਕ ਕਰੋ ਅਤੇ ਉਹਨਾਂ ਨੂੰ ਦੱਸੋ ਕਿ ਗੜਬੜ ਕੋਡ 9998 ਹੈ।</string>
+  <string name="vvm3_error_subscriber_unknown_title">ਦ੍ਰਿਸ਼ਟੀਗਤ ਵੌਇਸਮੇਲ ਬੰਦ ਹੈ</string>
+  <string name="vvm3_error_subscriber_unknown_message">ਕਿਰਪਾ ਕਰਕੇ ਦ੍ਰਿਸ਼ਟੀਗਤ ਵੌਇਸਮੇਲ ਨੂੰ ਕਿਰਿਆਸ਼ੀਲ ਕਰਨ ਲਈ %1$s \'ਤੇ ਗਾਹਕ ਸੇਵਾ ਨੂੰ ਸੰਪਰਕ ਕਰੋ।</string>
+  <string name="vvm3_error_imap_getquota_error_title">ਕੋਈ ਗੜਬੜ ਹੋ ਗਈ</string>
+  <string name="vvm3_error_imap_getquota_error_message">ਕਿਰਪਾ ਕਰਕੇ %1$s \'ਤੇ ਗਾਹਕ ਸੇਵਾ ਨੂੰ ਸੰਪਰਕ ਕਰੋ ਅਤੇ ਉਹਨਾਂ ਨੂੰ ਦੱਸੋ ਕਿ ਗੜਬੜ ਕੋਡ 9997 ਹੈ।</string>
+  <string name="vvm3_error_imap_select_error_title">ਕੋਈ ਗੜਬੜ ਹੋ ਗਈ</string>
+  <string name="vvm3_error_imap_select_error_message">ਕਿਰਪਾ ਕਰਕੇ %1$s \'ਤੇ ਗਾਹਕ ਸੇਵਾ ਨੂੰ ਸੰਪਰਕ ਕਰੋ ਅਤੇ ਉਹਨਾਂ ਨੂੰ ਦੱਸੋ ਕਿ ਗੜਬੜ ਕੋਡ 9989 ਹੈ।</string>
+  <string name="vvm3_error_imap_error_title">ਕੋਈ ਗੜਬੜ ਹੋ ਗਈ</string>
+  <string name="vvm3_error_imap_error_message">ਕਿਰਪਾ ਕਰਕੇ %1$s \'ਤੇ ਗਾਹਕ ਸੇਵਾ ਨੂੰ ਸੰਪਰਕ ਕਰੋ ਅਤੇ ਉਹਨਾਂ ਨੂੰ ਦੱਸੋ ਕਿ ਗੜਬੜ ਕੋਡ 9999 ਹੈ।</string>
+  <string name="verizon_terms_and_conditions_title">ਦ੍ਰਿਸ਼ਟੀਗਤ ਵੌਇਸਮੇਲ ਨੂੰ ਚਾਲੂ ਕਰੋ</string>
+  <string name="verizon_terms_and_conditions_message">%1$s ਦ੍ਰਿਸ਼ਟੀਗਤ ਵੌਇਸਮੇਲ ਚਾਲੂ ਕਰਕੇ ਤੁਸੀਂ Verizon Wireless ਦੀ ਸੇਵਾ ਦੇ ਨਿਯਮਾਂ ਅਤੇ ਸ਼ਰਤਾਂ ਨਾਲ ਸਹਿਮਤ ਹੁੰਦੇ ਹੋ:\n\n%2$s</string>
+  <string name="dialer_terms_and_conditions_title">ਦ੍ਰਿਸ਼ਟੀਗਤ ਵੌਇਸਮੇਲ ਨੂੰ ਚਾਲੂ ਕਰੋ</string>
+  <string name="dialer_terms_and_conditions_existing_user_title">ਨਵਾਂ! ਆਪਣੀ ਵੌਇਸਮੇਲ ਪੜ੍ਹੋ</string>
+  <string name="dialer_terms_and_conditions_message">%s</string>
+  <string name="dialer_terms_and_conditions_1.0">ਵੌਇਸਮੇਲ \'ਤੇ ਕਾਲ ਕੀਤੇ ਬਿਨਾਂ, ਆਪਣੇ ਸੁਨੇਹੇ ਦੇਖੋ ਅਤੇ ਸੁਣੋ। ਤੁਹਾਡੀ ਵੌਇਸਮੇਲ ਦੀਆਂ ਪ੍ਰਤਿਲਿਪੀਆਂ Google ਦੀ ਮੁਫ਼ਤ ਪ੍ਰਤਿਲਿਪੀ ਸੇਵਾ ਵੱਲੋਂ ਮੁਹੱਈਆ ਕਰਵਾਈਆਂ ਜਾਂਦੀਆਂ ਹਨ। ਤੁਸੀਂ ਕਿਸੇ ਸਮੇਂ ਵੀ ਇਸਨੂੰ ਸੈਟਿੰਗਾਂ ਵਿੱਚ ਬੰਦ ਕਰ ਸਕਦੇ ਹੋ। %s</string>
+  <string name="dialer_terms_and_conditions_existing_user">ਹੁਣ ਤੁਹਾਡੀ ਵੌਇਸਮੇਲ ਦੀਆਂ ਪ੍ਰਤੀਲਿਪੀਆਂ Google ਦੀ ਮੁਫ਼ਤ ਪ੍ਰਤੀਲਿਪੀ ਸੇਵਾ ਵੱਲੋਂ ਮੁਹੱਈਆ ਕਰਵਾਈਆਂ ਜਾਂਦੀਆਂ ਹਨ। ਤੁਸੀਂ ਕਿਸੇ ਵੇਲੇ ਵੀ ਇਸਨੂੰ ਸੈਟਿੰਗਾਂ ਵਿੱਚ ਬੰਦ ਕਰ ਸਕਦੇ ਹੋ। %s</string>
+  <string name="dialer_terms_and_conditions_for_verizon_1.0">ਵੌਇਸਮੇਲ ਨੂੰ ਕਾਲ ਕੀਤੇ ਬਿਨਾਂ ਆਪਣੇ ਸੁਨੇਹੇ ਦੇਖੋ ਅਤੇ ਸੁਣੋ।</string>
+  <string name="dialer_terms_and_conditions_learn_more">ਹੋਰ ਜਾਣੋ</string>
+  <string name="dialer_terms_and_conditions_existing_user_ack">ਠੀਕ, ਸਮਝ ਲਿਆ</string>
+  <string name="dialer_terms_and_conditions_existing_user_decline">ਨਹੀਂ ਧੰਨਵਾਦ</string>
+  <string name="terms_and_conditions_decline_dialog_title">ਕੀ ਦ੍ਰਿਸ਼ਟੀਗਤ ਵੌਇਸਮੇਲ ਨੂੰ ਬੰਦ ਕਰਨਾ ਹੈ?</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_message">ਨਿਯਮ ਅਤੇ ਸ਼ਰਤਾਂ ਨਾ ਮੰਨਣ \'ਤੇ ਦ੍ਰਿਸ਼ਟੀਗਤ ਵੌਇਸਮੇਲ ਨੂੰ ਬੰਦ ਕੀਤਾ ਜਾਵੇਗਾ।</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_downgrade">ਬੰਦ ਕਰੋ</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_message">ਤੁਹਾਡੇ ਵੱਲੋਂ ਦ੍ਰਿਸ਼ਟੀਗਤ ਵੌਇਸਮੇਲ ਬੰਦ ਕਰਨ \'ਤੇ ਦ੍ਰਿਸ਼ਟੀਗਤ ਵੌਇਸਮੇਲ ਨੂੰ ਬੰਦ ਕੀਤਾ ਜਾਵੇਗਾ।</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_downgrade">ਬੰਦ ਕਰੋ</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message">ਵੌਇਸਮੇਲ ਸਿਰਫ਼ *86 \'ਤੇ ਕਾਲ ਕਰਨ ਰਾਹੀਂ ਪਹੁੰਚਯੋਗ ਹੋਵੇਗੀ। ਜਾਰੀ ਰੱਖਣ ਲਈ ਇੱਕ ਨਵਾਂ ਵੌਇਸਮੇਲ ਪਿੰਨ ਸੈੱਟ ਕਰੋ।</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin">ਪਿੰਨ ਸੈੱਟ ਕਰੋ</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/error/res/values-pl/strings.xml b/java/com/android/dialer/voicemail/listui/error/res/values-pl/strings.xml
new file mode 100644
index 0000000..d96a578
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/error/res/values-pl/strings.xml
@@ -0,0 +1,102 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_error_activating_title">Aktywuję wizualną pocztę głosową</string>
+  <string name="voicemail_error_activating_message">Powiadomienia poczty głosowej mogą być dostępne dopiero po pełnej aktywacji wizualnej poczty głosowej. Do tego momentu nowe wiadomości możesz pobierać, dzwoniąc na pocztę głosową.</string>
+  <string name="voicemail_error_not_activate_no_signal_title">Nie udało się aktywować wizualnej poczty głosowej</string>
+  <string name="voicemail_error_not_activate_no_signal_message">Upewnij się, że telefon ma połączenie z siecią komórkową, i spróbuj jeszcze raz.</string>
+  <string name="voicemail_error_not_activate_no_signal_airplane_mode_message">Wyłącz tryb samolotowy i spróbuj jeszcze raz.</string>
+  <string name="voicemail_error_no_signal_title">Brak połączenia</string>
+  <string name="voicemail_error_no_signal_message">Nie otrzymasz powiadomień o nowych wiadomościach głosowych. Jeśli masz połączenie Wi-Fi, możesz teraz sprawdzić dostępność nowych wiadomości przez zsynchronizowanie urządzenia.</string>
+  <string name="voicemail_error_no_signal_airplane_mode_message">Nie otrzymasz powiadomień o nowych wiadomościach głosowych. Wyłącz tryb samolotowy, aby zsynchronizować pocztę głosową.</string>
+  <string name="voicemail_error_no_signal_cellular_required_message">Aby sprawdzić pocztę głosową, telefon musi mieć połączenie z internetem.</string>
+  <string name="voicemail_error_activation_failed_title">Nie udało się aktywować wizualnej poczty głosowej</string>
+  <string name="voicemail_error_activation_failed_message">Możesz też zadzwonić na pocztę głosową, aby odsłuchać wiadomości.</string>
+  <string name="voicemail_error_no_data_title">Nie udało się zaktualizować wizualnej poczty głosowej</string>
+  <string name="voicemail_error_no_data_message">Spróbuj jeszcze raz, gdy znajdziesz lepszy zasięg sieci komórkowej lub Wi-Fi. Możesz też zadzwonić na pocztę głosową, aby odsłuchać wiadomości.</string>
+  <string name="voicemail_error_no_data_cellular_required_message">Spróbuj jeszcze raz, gdy znajdziesz lepszy zasięg sieci komórkowej. Możesz też zadzwonić na pocztę głosową, aby odsłuchać wiadomości.</string>
+  <string name="voicemail_error_bad_config_title">Nie udało się zaktualizować wizualnej poczty głosowej</string>
+  <string name="voicemail_error_bad_config_message">Możesz też zadzwonić na pocztę głosową, aby odsłuchać wiadomości.</string>
+  <string name="voicemail_error_communication_title">Nie udało się zaktualizować wizualnej poczty głosowej</string>
+  <string name="voicemail_error_communication_message">Możesz też zadzwonić na pocztę głosową, aby odsłuchać wiadomości.</string>
+  <string name="voicemail_error_server_connection_title">Nie udało się zaktualizować wizualnej poczty głosowej</string>
+  <string name="voicemail_error_server_connection_message">Możesz też zadzwonić na pocztę głosową, aby odsłuchać wiadomości.</string>
+  <string name="voicemail_error_server_title">Nie udało się zaktualizować wizualnej poczty głosowej</string>
+  <string name="voicemail_error_server_message">Możesz też zadzwonić na pocztę głosową, aby odsłuchać wiadomości.</string>
+  <string name="voicemail_error_inbox_near_full_title">Skrzynka odbiorcza jest prawie pełna</string>
+  <string name="voicemail_error_inbox_near_full_message">Nie otrzymasz nowych wiadomości głosowych, gdy Twoja skrzynka odbiorcza jest pełna.</string>
+  <string name="voicemail_error_inbox_full_title">Nie udało się odebrać nowych wiadomości głosowych</string>
+  <string name="voicemail_error_inbox_full_message">Twoja skrzynka odbiorcza jest pełna. Spróbuj usunąć kilka wiadomości głosowych, aby odebrać nowe.</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_title">Włącz dodatkowe miejsce i kopię zapasową</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_message">Twoja skrzynka pocztowa jest pełna. Jeśli chcesz zwolnić miejsce, włącz dodatkowe miejsce, aby umożliwić Google zarządzanie Twoimi wiadomościami głosowymi i tworzenie ich kopii zapasowej.</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_title">Włącz dodatkowe miejsce i kopię zapasową</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_message">Twoja skrzynka pocztowa jest prawie pełna. Jeśli chcesz zwolnić miejsce, włącz dodatkowe miejsce, aby umożliwić Google zarządzanie Twoimi wiadomościami głosowymi i tworzenie ich kopii zapasowej.</string>
+  <string name="voicemail_error_pin_not_set_title">Ustaw kod PIN do poczty głosowej</string>
+  <string name="voicemail_error_pin_not_set_message">Za każdym razem, gdy zadzwonisz pod numer poczty głosowej, będzie konieczne wpisanie kodu PIN.</string>
+  <string name="voicemail_action_turn_off_airplane_mode">Ustawienia trybu samolotowego</string>
+  <string name="voicemail_action_set_pin">Ustaw kod PIN</string>
+  <string name="voicemail_action_retry">Spróbuj jeszcze raz</string>
+  <string name="voicemail_action_turn_archive_on">Włącz</string>
+  <string name="voicemail_action_dimiss">Nie, dziękuję</string>
+  <string name="voicemail_action_sync">Synchronizuj</string>
+  <string name="voicemail_action_call_voicemail">Zadzwoń na pocztę głosową</string>
+  <string name="voicemail_action_call_customer_support">Zadzwoń do obsługi klienta</string>
+  <string name="vvm3_error_vms_dns_failure_title">Coś poszło nie tak</string>
+  <string name="vvm3_error_vms_dns_failure_message">Wystąpił problem. Spróbuj ponownie później. Jeśli problem będzie nadal występował, skontaktuj się z obsługą klienta pod numerem %1$s i podaj kod błędu 9001.</string>
+  <string name="vvm3_error_vmg_dns_failure_title">Coś poszło nie tak</string>
+  <string name="vvm3_error_vmg_dns_failure_message">Wystąpił problem. Spróbuj ponownie później. Jeśli problem będzie nadal występował, skontaktuj się z obsługą klienta pod numerem %1$s i podaj kod błędu 9002.</string>
+  <string name="vvm3_error_spg_dns_failure_title">Coś poszło nie tak</string>
+  <string name="vvm3_error_spg_dns_failure_message">Wystąpił problem. Spróbuj ponownie później. Jeśli problem będzie nadal występował, skontaktuj się z obsługą klienta pod numerem %1$s i podaj kod błędu 9003.</string>
+  <string name="vvm3_error_vms_no_cellular_title">Nie udało się połączyć ze skrzynką poczty głosowej</string>
+  <string name="vvm3_error_vms_no_cellular_message">Nie udało się połączyć ze skrzynką poczty głosowej. Jeśli znajdujesz się w miejscu ze słabym sygnałem, poczekaj aż sygnał będzie mocny i spróbuj ponownie. Jeśli problem będzie nadal występował, skontaktuj się z obsługą klienta pod numerem %1$s i podaj kod błędu 9004.</string>
+  <string name="vvm3_error_vmg_no_cellular_title">Nie udało się połączyć ze skrzynką poczty głosowej</string>
+  <string name="vvm3_error_vmg_no_cellular_message">Nie udało się połączyć ze skrzynką poczty głosowej. Jeśli znajdujesz się w miejscu ze słabym sygnałem, poczekaj aż sygnał będzie mocny i spróbuj ponownie. Jeśli problem będzie nadal występował, skontaktuj się z obsługą klienta pod numerem %1$s i podaj kod błędu 9005.</string>
+  <string name="vvm3_error_spg_no_cellular_title">Nie udało się połączyć ze skrzynką poczty głosowej</string>
+  <string name="vvm3_error_spg_no_cellular_message">Nie udało się połączyć ze skrzynką poczty głosowej. Jeśli znajdujesz się w miejscu ze słabym sygnałem, poczekaj aż sygnał będzie mocny i spróbuj ponownie. Jeśli problem będzie nadal występował, skontaktuj się z obsługą klienta pod numerem %1$s i podaj kod błędu 9006.</string>
+  <string name="vvm3_error_vms_timeout_title">Coś poszło nie tak</string>
+  <string name="vvm3_error_vms_timeout_message">Wystąpił problem. Spróbuj ponownie później. Jeśli problem będzie nadal występował, skontaktuj się z obsługą klienta pod numerem %1$s i podaj kod błędu 9007.</string>
+  <string name="vvm3_error_vmg_timeout_title">Coś poszło nie tak</string>
+  <string name="vvm3_error_vmg_timeout_message">Wystąpił problem. Spróbuj ponownie później. Jeśli problem będzie nadal występował, skontaktuj się z obsługą klienta pod numerem %1$s i podaj kod błędu 9008.</string>
+  <string name="vvm3_error_status_sms_timeout_title">Coś poszło nie tak</string>
+  <string name="vvm3_error_status_sms_timeout_message">Wystąpił problem podczas konfigurowania usługi. Spróbuj ponownie później. Jeśli problem będzie nadal występował, skontaktuj się z obsługą klienta pod numerem %1$s i podaj kod błędu 9009.</string>
+  <string name="vvm3_error_subscriber_blocked_title">Nie udało się połączyć ze skrzynką poczty głosowej</string>
+  <string name="vvm3_error_subscriber_blocked_message">Nie udało się połączyć ze skrzynką poczty głosowej. Spróbuj ponownie później. Jeśli problem będzie nadal występował, skontaktuj się z obsługą klienta pod numerem %1$s i podaj kod błędu 9990.</string>
+  <string name="vvm3_error_unknown_user_title">Skonfiguruj pocztę głosową</string>
+  <string name="vvm3_error_unknown_user_message">Poczta głosowa nie została skonfigurowana na Twoim koncie. Skontaktuj się z obsługą klienta pod numerem %1$s i podaj kod błędu 9991.</string>
+  <string name="vvm3_error_unknown_device_title">Poczta głosowa</string>
+  <string name="vvm3_error_unknown_device_message">Na tym urządzeniu nie można używać wizualnej poczty głosowej. Skontaktuj się z obsługą klienta pod numerem %1$s i podaj kod błędu 9992.</string>
+  <string name="vvm3_error_invalid_password_title">Coś poszło nie tak</string>
+  <string name="vvm3_error_invalid_password_message">Skontaktuj się z obsługą klienta pod numerem %1$s i podaj kod błędu 9993.</string>
+  <string name="vvm3_error_mailbox_not_initialized_title">Wizualna poczta głosowa</string>
+  <string name="vvm3_error_mailbox_not_initialized_message">Aby ukończyć konfigurację wizualnej poczty głosowej, skontaktuj się z obsługą klienta pod numerem %1$s i podaj kod błędu 9994.</string>
+  <string name="vvm3_error_service_not_provisioned_title">Wizualna poczta głosowa</string>
+  <string name="vvm3_error_service_not_provisioned_message">Aby ukończyć konfigurację wizualnej poczty głosowej, skontaktuj się z obsługą klienta pod numerem %1$s i podaj kod błędu 9995.</string>
+  <string name="vvm3_error_service_not_activated_title">Wizualna poczta głosowa</string>
+  <string name="vvm3_error_service_not_activated_message">Aby aktywować wizualną pocztę głosową, skontaktuj się z obsługą klienta pod numerem %1$s i podaj kod błędu 9996.</string>
+  <string name="vvm3_error_user_blocked_title">Coś poszło nie tak</string>
+  <string name="vvm3_error_user_blocked_message">Aby ukończyć konfigurację wizualnej poczty głosowej, skontaktuj się z obsługą klienta pod numerem %1$s i podaj kod błędu 9998.</string>
+  <string name="vvm3_error_subscriber_unknown_title">Wizualna poczta głosowa jest wyłączona</string>
+  <string name="vvm3_error_subscriber_unknown_message">Aby aktywować wizualną pocztę głosową, skontaktuj się z obsługą klienta pod numerem %1$s.</string>
+  <string name="vvm3_error_imap_getquota_error_title">Coś poszło nie tak</string>
+  <string name="vvm3_error_imap_getquota_error_message">Skontaktuj się z obsługą klienta pod numerem %1$s i podaj kod błędu 9997.</string>
+  <string name="vvm3_error_imap_select_error_title">Coś poszło nie tak</string>
+  <string name="vvm3_error_imap_select_error_message">Skontaktuj się z obsługą klienta pod numerem %1$s i podaj kod błędu 9989.</string>
+  <string name="vvm3_error_imap_error_title">Coś poszło nie tak</string>
+  <string name="vvm3_error_imap_error_message">Skontaktuj się z obsługą klienta pod numerem %1$s i podaj kod błędu 9999.</string>
+  <string name="verizon_terms_and_conditions_title">Włączanie wizualnej poczty głosowej</string>
+  <string name="verizon_terms_and_conditions_message">%1$s Włączając wizualną pocztę głosową, akceptujesz warunki operatora Verizon Wireless:\n\n%2$s</string>
+  <string name="dialer_terms_and_conditions_title">Włączanie wizualnej poczty głosowej</string>
+  <string name="dialer_terms_and_conditions_existing_user_title">Nowość! Przeczytaj pocztę głosową</string>
+  <string name="dialer_terms_and_conditions_message">%s</string>
+  <string name="dialer_terms_and_conditions_1.0">Sprawdź i odsłuchaj wiadomości bez dzwonienia na pocztę głosową. Zapisy wiadomości głosowych są udostępniane przez bezpłatną usługę transkrypcji Google. W każdej chwili możesz wyłączyć tę funkcję w ustawieniach. %s</string>
+  <string name="dialer_terms_and_conditions_existing_user">Zapisy wiadomości głosowych są udostępniane przez bezpłatną usługę transkrypcji Google. W każdej chwili możesz wyłączyć tę funkcję w ustawieniach. %s</string>
+  <string name="dialer_terms_and_conditions_for_verizon_1.0">Sprawdź i odsłuchaj wiadomości bez dzwonienia na pocztę głosową.</string>
+  <string name="dialer_terms_and_conditions_learn_more">Więcej informacji</string>
+  <string name="dialer_terms_and_conditions_existing_user_ack">OK</string>
+  <string name="dialer_terms_and_conditions_existing_user_decline">Nie, dziękuję</string>
+  <string name="terms_and_conditions_decline_dialog_title">Wyłączyć wizualną pocztę głosową?</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_message">Jeśli odrzucisz warunki korzystania z usługi, wizualna poczta głosowa zostanie wyłączona.</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_downgrade">Wyłącz</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_message">Jeśli odrzucisz warunki korzystania z usługi, wizualna poczta głosowa zostanie wyłączona.</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_downgrade">Wyłącz</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message">Poczta głosowa będzie dostępna tylko przez połączenie telefoniczne z numerem *86. Ustaw nowy kod PIN poczty głosowej, aby przejść dalej.</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin">Ustaw kod PIN</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/error/res/values-pt-rBR/strings.xml b/java/com/android/dialer/voicemail/listui/error/res/values-pt-rBR/strings.xml
new file mode 100644
index 0000000..6446ce7
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/error/res/values-pt-rBR/strings.xml
@@ -0,0 +1,102 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_error_activating_title">Ativando correio de voz visual</string>
+  <string name="voicemail_error_activating_message">Talvez você não receba notificações do correio de voz até que o correio de voz visual esteja totalmente ativado. Enquanto isso não acontecer, ligue para o correio de voz para receber as novas mensagens.</string>
+  <string name="voicemail_error_not_activate_no_signal_title">Não foi possível ativar o correio de voz visual</string>
+  <string name="voicemail_error_not_activate_no_signal_message">Verifique se seu smartphone tem uma conexão por rede móvel e tente novamente.</string>
+  <string name="voicemail_error_not_activate_no_signal_airplane_mode_message">Desative o modo avião e tente novamente.</string>
+  <string name="voicemail_error_no_signal_title">Sem conexão</string>
+  <string name="voicemail_error_no_signal_message">Você não será notificado sobre novos correios de voz. Se estiver usando Wi-Fi, sincronize agora para verificar o correio de voz.</string>
+  <string name="voicemail_error_no_signal_airplane_mode_message">Você não será notificado sobre novos correios de voz. Desative o modo avião para sincronizar seu correio de voz.</string>
+  <string name="voicemail_error_no_signal_cellular_required_message">Seu smartphone precisa de uma conexão de dados móveis para verificar o correio de voz.</string>
+  <string name="voicemail_error_activation_failed_title">Não foi possível ativar o correio de voz visual</string>
+  <string name="voicemail_error_activation_failed_message">Você ainda pode ligar para verificar o correio de voz.</string>
+  <string name="voicemail_error_no_data_title">Não foi possível atualizar o correio de voz visual</string>
+  <string name="voicemail_error_no_data_message">Tente novamente quando estiver com uma conexão de dados móveis ou Wi‑Fi melhor. Você ainda pode ligar para verificar o correio de voz.</string>
+  <string name="voicemail_error_no_data_cellular_required_message">Tente novamente quando estiver com uma conexão de dados móveis melhor. Você ainda pode ligar para verificar o correio de voz.</string>
+  <string name="voicemail_error_bad_config_title">Não foi possível atualizar o correio de voz visual</string>
+  <string name="voicemail_error_bad_config_message">Você ainda pode ligar para verificar o correio de voz.</string>
+  <string name="voicemail_error_communication_title">Não foi possível atualizar o correio de voz visual</string>
+  <string name="voicemail_error_communication_message">Você ainda pode ligar para verificar o correio de voz.</string>
+  <string name="voicemail_error_server_connection_title">Não foi possível atualizar o correio de voz visual</string>
+  <string name="voicemail_error_server_connection_message">Você ainda pode ligar para verificar o correio de voz.</string>
+  <string name="voicemail_error_server_title">Não foi possível atualizar o correio de voz visual</string>
+  <string name="voicemail_error_server_message">Você ainda pode ligar para verificar o correio de voz.</string>
+  <string name="voicemail_error_inbox_near_full_title">Caixa de entrada quase cheia</string>
+  <string name="voicemail_error_inbox_near_full_message">Não será possível receber novos correios de voz se sua Caixa de entrada estiver cheia.</string>
+  <string name="voicemail_error_inbox_full_title">Não é possível receber novos correios de voz</string>
+  <string name="voicemail_error_inbox_full_message">Sua Caixa de entrada está cheia. Exclua algumas mensagens para receber novos correios de voz.</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_title">Ativar armazenamento extra e fazer backup</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_message">Sua caixa de correio está cheia. Para liberar espaço, ative o armazenamento extra para que o Google possa gerenciar e fazer o backup das mensagens do correio de voz.</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_title">Ativar armazenamento extra e fazer backup</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_message">Sua caixa de correio está quase cheia. Para liberar espaço, ative o armazenamento extra para que o Google possa gerenciar e fazer o backup das mensagens do correio de voz.</string>
+  <string name="voicemail_error_pin_not_set_title">Definir seu PIN do correio de voz</string>
+  <string name="voicemail_error_pin_not_set_message">Você precisará de um PIN do correio de voz sempre que ligar para acessar seu correio de voz.</string>
+  <string name="voicemail_action_turn_off_airplane_mode">Configurações do modo avião</string>
+  <string name="voicemail_action_set_pin">Definir PIN</string>
+  <string name="voicemail_action_retry">Repetir</string>
+  <string name="voicemail_action_turn_archive_on">Ativar</string>
+  <string name="voicemail_action_dimiss">Não</string>
+  <string name="voicemail_action_sync">Sincronizar</string>
+  <string name="voicemail_action_call_voicemail">Ligar para o correio de voz</string>
+  <string name="voicemail_action_call_customer_support">Ligar para o Suporte ao Cliente</string>
+  <string name="vvm3_error_vms_dns_failure_title">Ocorreu um erro</string>
+  <string name="vvm3_error_vms_dns_failure_message">Há um problema. Tente novamente mais tarde. Caso o problema persista, entre em contato com o atendimento ao cliente pelo número %1$s e forneça o código de erro 9001.</string>
+  <string name="vvm3_error_vmg_dns_failure_title">Ocorreu um erro</string>
+  <string name="vvm3_error_vmg_dns_failure_message">Há um problema. Tente novamente mais tarde. Caso o problema persista, entre em contato com o atendimento ao cliente pelo número %1$s e forneça o código de erro 9002.</string>
+  <string name="vvm3_error_spg_dns_failure_title">Ocorreu um erro</string>
+  <string name="vvm3_error_spg_dns_failure_message">Há um problema. Tente novamente mais tarde. Caso o problema persista, entre em contato com o atendimento ao cliente pelo número %1$s e forneça o código de erro 9003.</string>
+  <string name="vvm3_error_vms_no_cellular_title">Não é possível a conexão com o correio de voz</string>
+  <string name="vvm3_error_vms_no_cellular_message">Há um problema na conexão com sua caixa de correio de voz. Se você estiver em uma área onde a intensidade do sinal é fraca, tente novamente quando tiver um sinal forte. Caso o problema persista, entre em contato com o atendimento ao cliente pelo número %1$s e forneça o código de erro 9004.</string>
+  <string name="vvm3_error_vmg_no_cellular_title">Não é possível a conexão com o correio de voz</string>
+  <string name="vvm3_error_vmg_no_cellular_message">Há um problema na conexão com sua caixa de correio de voz. Se você estiver em uma área onde a intensidade do sinal é fraca, tente novamente quando tiver um sinal forte. Caso o problema persista, entre em contato com o atendimento ao cliente pelo número %1$s e forneça o código de erro 9005.</string>
+  <string name="vvm3_error_spg_no_cellular_title">Não é possível a conexão com o correio de voz</string>
+  <string name="vvm3_error_spg_no_cellular_message">Há um problema na conexão com sua caixa de correio de voz. Se você estiver em uma área onde a intensidade do sinal é fraca, tente novamente quando tiver um sinal forte. Caso o problema persista, entre em contato com o atendimento ao cliente pelo número %1$s e forneça o código de erro 9006.</string>
+  <string name="vvm3_error_vms_timeout_title">Ocorreu um erro</string>
+  <string name="vvm3_error_vms_timeout_message">Há um problema. Tente novamente mais tarde. Caso o problema persista, entre em contato com o atendimento ao cliente pelo número %1$s e forneça o código de erro 9007.</string>
+  <string name="vvm3_error_vmg_timeout_title">Ocorreu um erro</string>
+  <string name="vvm3_error_vmg_timeout_message">Há um problema. Tente novamente mais tarde. Caso o problema persista, entre em contato com o atendimento ao cliente pelo número %1$s e forneça o código de erro 9008.</string>
+  <string name="vvm3_error_status_sms_timeout_title">Ocorreu um erro</string>
+  <string name="vvm3_error_status_sms_timeout_message">Há um problema para configurar o serviço. Tente novamente mais tarde. Caso o problema persista, entre em contato com o atendimento ao cliente pelo número %1$s e forneça o código de erro 9009.</string>
+  <string name="vvm3_error_subscriber_blocked_title">Não é possível a conexão com o correio de voz</string>
+  <string name="vvm3_error_subscriber_blocked_message">Não foi possível a conexão com sua caixa de correio de voz no momento. Tente novamente mais tarde. Caso o problema persista, entre em contato com o atendimento ao cliente pelo número %1$s e forneça o código de erro 9990.</string>
+  <string name="vvm3_error_unknown_user_title">Configurar correio de voz</string>
+  <string name="vvm3_error_unknown_user_message">O correio de voz não está configurado na conta. Entre em contato com o atendimento ao cliente pelo número %1$s e forneça o código de erro 9991.</string>
+  <string name="vvm3_error_unknown_device_title">Correio de voz</string>
+  <string name="vvm3_error_unknown_device_message">Não é possível usar o correio de voz visual neste dispositivo. Entre em contato com o atendimento ao cliente pelo número %1$s e forneça o código de erro 9992.</string>
+  <string name="vvm3_error_invalid_password_title">Ocorreu um erro</string>
+  <string name="vvm3_error_invalid_password_message">Entre em contato com o atendimento ao cliente pelo número %1$s e forneça o código de erro 9993.</string>
+  <string name="vvm3_error_mailbox_not_initialized_title">Correio de voz visual</string>
+  <string name="vvm3_error_mailbox_not_initialized_message">Para concluir a configuração do correio de voz visual, entre em contato com o atendimento ao cliente pelo número %1$s e forneça o código de erro 9994.</string>
+  <string name="vvm3_error_service_not_provisioned_title">Correio de voz visual</string>
+  <string name="vvm3_error_service_not_provisioned_message">Para concluir a configuração do correio de voz visual, entre em contato com o atendimento ao cliente pelo número %1$s e forneça o código de erro 9995.</string>
+  <string name="vvm3_error_service_not_activated_title">Correio de voz visual</string>
+  <string name="vvm3_error_service_not_activated_message">Para ativar o correio de voz visual, entre em contato com o atendimento ao cliente pelo número %1$s e forneça o código de erro 9996.</string>
+  <string name="vvm3_error_user_blocked_title">Ocorreu um erro</string>
+  <string name="vvm3_error_user_blocked_message">Para concluir a configuração do correio de voz visual, entre em contato com o atendimento ao cliente pelo número %1$s e forneça o código de erro 9998.</string>
+  <string name="vvm3_error_subscriber_unknown_title">Correio de voz visual desativado</string>
+  <string name="vvm3_error_subscriber_unknown_message">Entre em contato com o atendimento ao cliente pelo número %1$s para ativar o correio de voz visual.</string>
+  <string name="vvm3_error_imap_getquota_error_title">Ocorreu um erro</string>
+  <string name="vvm3_error_imap_getquota_error_message">Entre em contato com o atendimento ao cliente pelo número %1$s e forneça o código de erro 9997.</string>
+  <string name="vvm3_error_imap_select_error_title">Ocorreu um erro</string>
+  <string name="vvm3_error_imap_select_error_message">Entre em contato com o atendimento ao cliente pelo número %1$s e forneça o código de erro 9989.</string>
+  <string name="vvm3_error_imap_error_title">Ocorreu um erro</string>
+  <string name="vvm3_error_imap_error_message">Entre em contato com o atendimento ao cliente pelo número %1$s e forneça o código de erro 9999.</string>
+  <string name="verizon_terms_and_conditions_title">Ativar correio de voz visual</string>
+  <string name="verizon_terms_and_conditions_message">%1$s Ao ativar o correio de voz visual, você concorda com os Termos e Condições da Verizon Wireless:\n\n%2$s</string>
+  <string name="dialer_terms_and_conditions_title">Ativar correio de voz visual</string>
+  <string name="dialer_terms_and_conditions_existing_user_title">Novo: leia suas mensagens do correio de voz</string>
+  <string name="dialer_terms_and_conditions_message">%s</string>
+  <string name="dialer_terms_and_conditions_1.0">Veja e ouça suas mensagens sem precisar ligar para o correio de voz. As transcrições do correio de voz são feitas pelo serviço de transcrição gratuito do Google. Você pode desativá-lo a qualquer momento em Configurações. %s</string>
+  <string name="dialer_terms_and_conditions_existing_user">Agora as transcrições do correio de voz são feitas pelo serviço de transcrição gratuito do Google. Você pode desativá-lo a qualquer momento em Configurações. %s</string>
+  <string name="dialer_terms_and_conditions_for_verizon_1.0">Veja e ouça suas mensagens sem precisar ligar para o correio de voz.</string>
+  <string name="dialer_terms_and_conditions_learn_more">Saiba mais</string>
+  <string name="dialer_terms_and_conditions_existing_user_ack">Ok</string>
+  <string name="dialer_terms_and_conditions_existing_user_decline">Não</string>
+  <string name="terms_and_conditions_decline_dialog_title">Desativar o correio de voz visual?</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_message">O correio de voz visual será desativado se os Termos e Condições forem recusados.</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_downgrade">Desativar</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_message">O correio de voz visual não funcionará se você desativá-lo.</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_downgrade">Desativar</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message">O correio de voz só estará acessível quando você ligar para *86. Defina um novo PIN do correio de voz para continuar.</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin">Definir PIN</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/error/res/values-pt-rPT/strings.xml b/java/com/android/dialer/voicemail/listui/error/res/values-pt-rPT/strings.xml
new file mode 100644
index 0000000..a41675a
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/error/res/values-pt-rPT/strings.xml
@@ -0,0 +1,102 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_error_activating_title">A ativar o correio de voz visual</string>
+  <string name="voicemail_error_activating_message">Poderá não receber notificações de correio de voz até o correio de voz visual estar completamente ativado. Ligue para o correio de voz para obter novas mensagens até o correio de voz estar completamente ativado.</string>
+  <string name="voicemail_error_not_activate_no_signal_title">Não é possível ativar o correio de voz visual</string>
+  <string name="voicemail_error_not_activate_no_signal_message">Certifique-se de que o seu telemóvel tem uma ligação de rede móvel e tente novamente.</string>
+  <string name="voicemail_error_not_activate_no_signal_airplane_mode_message">Desative o modo de avião e tente novamente.</string>
+  <string name="voicemail_error_no_signal_title">Sem ligação</string>
+  <string name="voicemail_error_no_signal_message">Não será notificado quando receber novas mensagens de correio de voz. Se estiver numa ligação Wi-Fi, pode verificar se existem mensagens de correio de voz ao sincronizar agora.</string>
+  <string name="voicemail_error_no_signal_airplane_mode_message">Não será notificado quando receber novas mensagens de correio de voz. Desative o modo de avião para sincronizar as suas mensagens de correio de voz.</string>
+  <string name="voicemail_error_no_signal_cellular_required_message">O seu telemóvel precisa de uma ligação de dados móveis para verificar se existem mensagens de correio de voz.</string>
+  <string name="voicemail_error_activation_failed_title">Não é possível ativar o correio de voz visual</string>
+  <string name="voicemail_error_activation_failed_message">Ainda pode efetuar chamadas para consultar as mensagens de correio de voz.</string>
+  <string name="voicemail_error_no_data_title">Não é possível atualizar as mensagens de correio de voz visual</string>
+  <string name="voicemail_error_no_data_message">Tente novamente quando a sua ligação Wi-Fi ou de dados móveis for mais forte. Ainda pode efetuar chamadas para consultar as mensagens de correio de voz.</string>
+  <string name="voicemail_error_no_data_cellular_required_message">Tente novamente quando a sua ligação de dados móveis for mais forte. Ainda pode efetuar chamadas para consultar as mensagens de correio de voz.</string>
+  <string name="voicemail_error_bad_config_title">Não é possível atualizar as mensagens de correio de voz visual</string>
+  <string name="voicemail_error_bad_config_message">Ainda pode efetuar chamadas para consultar as mensagens de correio de voz.</string>
+  <string name="voicemail_error_communication_title">Não é possível atualizar as mensagens de correio de voz visual</string>
+  <string name="voicemail_error_communication_message">Ainda pode efetuar chamadas para consultar as mensagens de correio de voz.</string>
+  <string name="voicemail_error_server_connection_title">Não é possível atualizar as mensagens de correio de voz visual</string>
+  <string name="voicemail_error_server_connection_message">Ainda pode efetuar chamadas para consultar as mensagens de correio de voz.</string>
+  <string name="voicemail_error_server_title">Não é possível atualizar as mensagens de correio de voz visual</string>
+  <string name="voicemail_error_server_message">Ainda pode efetuar chamadas para consultar as mensagens de correio de voz.</string>
+  <string name="voicemail_error_inbox_near_full_title">A caixa de entrada está quase cheia</string>
+  <string name="voicemail_error_inbox_near_full_message">Se a sua caixa de entrada estiver cheia, não irá receber novas mensagens de correio de voz.</string>
+  <string name="voicemail_error_inbox_full_title">Não é possível receber novas mensagens de correio de voz</string>
+  <string name="voicemail_error_inbox_full_message">A sua caixa de entrada está cheia. Tente eliminar algumas mensagens para receber novas mensagens de correio de voz.</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_title">Ativar o armazenamento adicional e a cópia de segurança</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_message">A sua caixa de correio está cheia. Para libertar espaço, ative o armazenamento adicional para que a Google possa gerir e criar uma cópia de segurança das suas mensagens de correio de voz.</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_title">Ativar o armazenamento adicional e a cópia de segurança</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_message">A sua caixa de correio está quase cheia. Para libertar espaço, ative o armazenamento adicional para que a Google possa gerir e criar uma cópia de segurança das suas mensagens de correio de voz.</string>
+  <string name="voicemail_error_pin_not_set_title">Definir o seu PIN do correio de voz</string>
+  <string name="voicemail_error_pin_not_set_message">Irá precisar de um PIN do correio de voz sempre que efetuar uma chamada para aceder ao seu correio de voz.</string>
+  <string name="voicemail_action_turn_off_airplane_mode">Definições do modo de avião</string>
+  <string name="voicemail_action_set_pin">Definir PIN</string>
+  <string name="voicemail_action_retry">Tentar de novo</string>
+  <string name="voicemail_action_turn_archive_on">Ativar</string>
+  <string name="voicemail_action_dimiss">Não, obrigado</string>
+  <string name="voicemail_action_sync">Sincronizar</string>
+  <string name="voicemail_action_call_voicemail">Ligar para correio de voz</string>
+  <string name="voicemail_action_call_customer_support">Ligar para o Apoio ao cliente</string>
+  <string name="vvm3_error_vms_dns_failure_title">Ocorreu um erro</string>
+  <string name="vvm3_error_vms_dns_failure_message">Ocorreu um problema. Tente novamente mais tarde. Se o problema persistir, contacte o serviço de apoio ao cliente através do número %1$s e indique que o código de erro é 9001.</string>
+  <string name="vvm3_error_vmg_dns_failure_title">Ocorreu um erro</string>
+  <string name="vvm3_error_vmg_dns_failure_message">Ocorreu um problema. Tente novamente mais tarde. Se o problema persistir, contacte o serviço de apoio ao cliente através do número %1$s e indique que o código de erro é 9002.</string>
+  <string name="vvm3_error_spg_dns_failure_title">Ocorreu um erro</string>
+  <string name="vvm3_error_spg_dns_failure_message">Ocorreu um problema. Tente novamente mais tarde. Se o problema persistir, contacte o serviço de apoio ao cliente através do número %1$s e indique que o código de erro é 9003.</string>
+  <string name="vvm3_error_vms_no_cellular_title">Não é possível ligar para o seu correio de voz</string>
+  <string name="vvm3_error_vms_no_cellular_message">Estamos a ter problemas a ligar para o seu correio de voz. Se estiver numa área com um sinal fraco, aguarde até ter um sinal forte e tente novamente. Se o problema persistir, contacte o serviço de apoio ao cliente através do número %1$s e indique que o código de erro é 9004.</string>
+  <string name="vvm3_error_vmg_no_cellular_title">Não é possível ligar para o seu correio de voz</string>
+  <string name="vvm3_error_vmg_no_cellular_message">Estamos a ter problemas a ligar para o seu correio de voz. Se estiver numa área com um sinal fraco, aguarde até ter um sinal forte e tente novamente. Se o problema persistir, contacte o serviço de apoio ao cliente através do número %1$s e indique que o código de erro é 9005.</string>
+  <string name="vvm3_error_spg_no_cellular_title">Não é possível ligar para o seu correio de voz</string>
+  <string name="vvm3_error_spg_no_cellular_message">Estamos a ter problemas a ligar para o seu correio de voz. Se estiver numa área com um sinal fraco, aguarde até ter um sinal forte e tente novamente. Se o problema persistir, contacte o serviço de apoio ao cliente através do número %1$s e indique que o código de erro é 9006.</string>
+  <string name="vvm3_error_vms_timeout_title">Ocorreu um erro</string>
+  <string name="vvm3_error_vms_timeout_message">Ocorreu um problema. Tente novamente mais tarde. Se o problema persistir, contacte o serviço de apoio ao cliente através do número %1$s e indique que o código de erro é 9007.</string>
+  <string name="vvm3_error_vmg_timeout_title">Ocorreu um erro</string>
+  <string name="vvm3_error_vmg_timeout_message">Ocorreu um problema. Tente novamente mais tarde. Se o problema persistir, contacte o serviço de apoio ao cliente através do número %1$s e indique que o código de erro é 9008.</string>
+  <string name="vvm3_error_status_sms_timeout_title">Ocorreu um erro</string>
+  <string name="vvm3_error_status_sms_timeout_message">Estamos a ter problemas a configurar o seu serviço. Tente novamente mais tarde. Se o problema persistir, contacte o serviço de apoio ao cliente através do número %1$s e indique que o código de erro é 9009.</string>
+  <string name="vvm3_error_subscriber_blocked_title">Não é possível ligar para o seu correio de voz</string>
+  <string name="vvm3_error_subscriber_blocked_message">Não conseguimos ligar para o seu correio de voz neste momento. Tente novamente mais tarde. Se o problema persistir, contacte o serviço de apoio ao cliente através do número %1$s e indique que o código de erro é 9990.</string>
+  <string name="vvm3_error_unknown_user_title">Configurar correio de voz</string>
+  <string name="vvm3_error_unknown_user_message">O correio de voz não está configurado na sua conta. Contacte o serviço de apoio ao cliente através do número %1$s e indique que o código de erro é 9991.</string>
+  <string name="vvm3_error_unknown_device_title">Correio de voz</string>
+  <string name="vvm3_error_unknown_device_message">Não é possível utilizar o correio de voz visual neste dispositivo. Contacte o serviço de apoio ao cliente através do número %1$s e indique que o código de erro é 9992.</string>
+  <string name="vvm3_error_invalid_password_title">Ocorreu um erro</string>
+  <string name="vvm3_error_invalid_password_message">Contacte o serviço de apoio ao cliente através do número %1$s e indique que o código de erro é 9993.</string>
+  <string name="vvm3_error_mailbox_not_initialized_title">Correio de voz visual</string>
+  <string name="vvm3_error_mailbox_not_initialized_message">Para concluir a configuração do correio de voz visual, contacte o serviço de apoio ao cliente através do número %1$s e indique que o código de erro é 9994.</string>
+  <string name="vvm3_error_service_not_provisioned_title">Correio de voz visual</string>
+  <string name="vvm3_error_service_not_provisioned_message">Para concluir a configuração do correio de voz visual, contacte o serviço de apoio ao cliente através do número %1$s e indique que o código de erro é 9995.</string>
+  <string name="vvm3_error_service_not_activated_title">Correio de voz visual</string>
+  <string name="vvm3_error_service_not_activated_message">Para ativar o correio de voz visual, contacte o serviço de apoio ao cliente através do número %1$s e indique que o código de erro é 9996.</string>
+  <string name="vvm3_error_user_blocked_title">Ocorreu um erro</string>
+  <string name="vvm3_error_user_blocked_message">Para concluir a configuração do correio de voz visual, contacte o serviço de apoio ao cliente através do número %1$s e indique que o código de erro é 9998.</string>
+  <string name="vvm3_error_subscriber_unknown_title">O correio de voz visual está desativado</string>
+  <string name="vvm3_error_subscriber_unknown_message">Contacte o serviço de apoio ao cliente através do número %1$s para ativar o correio de voz visual.</string>
+  <string name="vvm3_error_imap_getquota_error_title">Ocorreu um erro</string>
+  <string name="vvm3_error_imap_getquota_error_message">Contacte o serviço de apoio ao cliente através do número %1$s e indique que o código de erro é 9997.</string>
+  <string name="vvm3_error_imap_select_error_title">Ocorreu um erro</string>
+  <string name="vvm3_error_imap_select_error_message">Contacte o serviço de apoio ao cliente através do número %1$s e indique que o código de erro é 9989.</string>
+  <string name="vvm3_error_imap_error_title">Ocorreu um erro</string>
+  <string name="vvm3_error_imap_error_message">Contacte o serviço de apoio ao cliente através do número %1$s e indique que o código de erro é 9999.</string>
+  <string name="verizon_terms_and_conditions_title">Ativar correio de voz visual</string>
+  <string name="verizon_terms_and_conditions_message">%1$s Ao ativar o correio de voz visual, o utilizador aceita os Termos de Utilização da Verizon Wireless:\n\n%2$s</string>
+  <string name="dialer_terms_and_conditions_title">Ativar correio de voz visual</string>
+  <string name="dialer_terms_and_conditions_existing_user_title">Novidade! Leia o seu correio de voz</string>
+  <string name="dialer_terms_and_conditions_message">%s</string>
+  <string name="dialer_terms_and_conditions_1.0">Veja e ouça as suas mensagens sem ter de ligar para o correio de voz. As transcrições do seu correio de voz são fornecidas pelo serviço de transcrição gratuito da Google. Pode desativar estas duas opções nas Definições a qualquer momento. %s</string>
+  <string name="dialer_terms_and_conditions_existing_user">As transcrições do seu correio de voz são agora fornecidas pelo serviço de transcrição gratuito da Google. Pode desativar esta opção nas Definições a qualquer momento. %s</string>
+  <string name="dialer_terms_and_conditions_for_verizon_1.0">Veja e ouça as suas mensagens sem ter de ligar para o correio de voz.</string>
+  <string name="dialer_terms_and_conditions_learn_more">Saiba mais</string>
+  <string name="dialer_terms_and_conditions_existing_user_ack">Ok, compreendi</string>
+  <string name="dialer_terms_and_conditions_existing_user_decline">Não, obrigado</string>
+  <string name="terms_and_conditions_decline_dialog_title">Pretende desativar o correio de voz visual?</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_message">O correio de voz visual será desativado se os Termos de Utilização forem recusados.</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_downgrade">Desativar</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_message">O correio de voz visual será desativado se desligar o correio de voz visual.</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_downgrade">Desativar</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message">O correio de voz está apenas disponível ao ligar para *86. Defina um novo PIN do correio de voz para continuar.</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin">Definir PIN</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/error/res/values-pt/strings.xml b/java/com/android/dialer/voicemail/listui/error/res/values-pt/strings.xml
new file mode 100644
index 0000000..6446ce7
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/error/res/values-pt/strings.xml
@@ -0,0 +1,102 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_error_activating_title">Ativando correio de voz visual</string>
+  <string name="voicemail_error_activating_message">Talvez você não receba notificações do correio de voz até que o correio de voz visual esteja totalmente ativado. Enquanto isso não acontecer, ligue para o correio de voz para receber as novas mensagens.</string>
+  <string name="voicemail_error_not_activate_no_signal_title">Não foi possível ativar o correio de voz visual</string>
+  <string name="voicemail_error_not_activate_no_signal_message">Verifique se seu smartphone tem uma conexão por rede móvel e tente novamente.</string>
+  <string name="voicemail_error_not_activate_no_signal_airplane_mode_message">Desative o modo avião e tente novamente.</string>
+  <string name="voicemail_error_no_signal_title">Sem conexão</string>
+  <string name="voicemail_error_no_signal_message">Você não será notificado sobre novos correios de voz. Se estiver usando Wi-Fi, sincronize agora para verificar o correio de voz.</string>
+  <string name="voicemail_error_no_signal_airplane_mode_message">Você não será notificado sobre novos correios de voz. Desative o modo avião para sincronizar seu correio de voz.</string>
+  <string name="voicemail_error_no_signal_cellular_required_message">Seu smartphone precisa de uma conexão de dados móveis para verificar o correio de voz.</string>
+  <string name="voicemail_error_activation_failed_title">Não foi possível ativar o correio de voz visual</string>
+  <string name="voicemail_error_activation_failed_message">Você ainda pode ligar para verificar o correio de voz.</string>
+  <string name="voicemail_error_no_data_title">Não foi possível atualizar o correio de voz visual</string>
+  <string name="voicemail_error_no_data_message">Tente novamente quando estiver com uma conexão de dados móveis ou Wi‑Fi melhor. Você ainda pode ligar para verificar o correio de voz.</string>
+  <string name="voicemail_error_no_data_cellular_required_message">Tente novamente quando estiver com uma conexão de dados móveis melhor. Você ainda pode ligar para verificar o correio de voz.</string>
+  <string name="voicemail_error_bad_config_title">Não foi possível atualizar o correio de voz visual</string>
+  <string name="voicemail_error_bad_config_message">Você ainda pode ligar para verificar o correio de voz.</string>
+  <string name="voicemail_error_communication_title">Não foi possível atualizar o correio de voz visual</string>
+  <string name="voicemail_error_communication_message">Você ainda pode ligar para verificar o correio de voz.</string>
+  <string name="voicemail_error_server_connection_title">Não foi possível atualizar o correio de voz visual</string>
+  <string name="voicemail_error_server_connection_message">Você ainda pode ligar para verificar o correio de voz.</string>
+  <string name="voicemail_error_server_title">Não foi possível atualizar o correio de voz visual</string>
+  <string name="voicemail_error_server_message">Você ainda pode ligar para verificar o correio de voz.</string>
+  <string name="voicemail_error_inbox_near_full_title">Caixa de entrada quase cheia</string>
+  <string name="voicemail_error_inbox_near_full_message">Não será possível receber novos correios de voz se sua Caixa de entrada estiver cheia.</string>
+  <string name="voicemail_error_inbox_full_title">Não é possível receber novos correios de voz</string>
+  <string name="voicemail_error_inbox_full_message">Sua Caixa de entrada está cheia. Exclua algumas mensagens para receber novos correios de voz.</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_title">Ativar armazenamento extra e fazer backup</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_message">Sua caixa de correio está cheia. Para liberar espaço, ative o armazenamento extra para que o Google possa gerenciar e fazer o backup das mensagens do correio de voz.</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_title">Ativar armazenamento extra e fazer backup</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_message">Sua caixa de correio está quase cheia. Para liberar espaço, ative o armazenamento extra para que o Google possa gerenciar e fazer o backup das mensagens do correio de voz.</string>
+  <string name="voicemail_error_pin_not_set_title">Definir seu PIN do correio de voz</string>
+  <string name="voicemail_error_pin_not_set_message">Você precisará de um PIN do correio de voz sempre que ligar para acessar seu correio de voz.</string>
+  <string name="voicemail_action_turn_off_airplane_mode">Configurações do modo avião</string>
+  <string name="voicemail_action_set_pin">Definir PIN</string>
+  <string name="voicemail_action_retry">Repetir</string>
+  <string name="voicemail_action_turn_archive_on">Ativar</string>
+  <string name="voicemail_action_dimiss">Não</string>
+  <string name="voicemail_action_sync">Sincronizar</string>
+  <string name="voicemail_action_call_voicemail">Ligar para o correio de voz</string>
+  <string name="voicemail_action_call_customer_support">Ligar para o Suporte ao Cliente</string>
+  <string name="vvm3_error_vms_dns_failure_title">Ocorreu um erro</string>
+  <string name="vvm3_error_vms_dns_failure_message">Há um problema. Tente novamente mais tarde. Caso o problema persista, entre em contato com o atendimento ao cliente pelo número %1$s e forneça o código de erro 9001.</string>
+  <string name="vvm3_error_vmg_dns_failure_title">Ocorreu um erro</string>
+  <string name="vvm3_error_vmg_dns_failure_message">Há um problema. Tente novamente mais tarde. Caso o problema persista, entre em contato com o atendimento ao cliente pelo número %1$s e forneça o código de erro 9002.</string>
+  <string name="vvm3_error_spg_dns_failure_title">Ocorreu um erro</string>
+  <string name="vvm3_error_spg_dns_failure_message">Há um problema. Tente novamente mais tarde. Caso o problema persista, entre em contato com o atendimento ao cliente pelo número %1$s e forneça o código de erro 9003.</string>
+  <string name="vvm3_error_vms_no_cellular_title">Não é possível a conexão com o correio de voz</string>
+  <string name="vvm3_error_vms_no_cellular_message">Há um problema na conexão com sua caixa de correio de voz. Se você estiver em uma área onde a intensidade do sinal é fraca, tente novamente quando tiver um sinal forte. Caso o problema persista, entre em contato com o atendimento ao cliente pelo número %1$s e forneça o código de erro 9004.</string>
+  <string name="vvm3_error_vmg_no_cellular_title">Não é possível a conexão com o correio de voz</string>
+  <string name="vvm3_error_vmg_no_cellular_message">Há um problema na conexão com sua caixa de correio de voz. Se você estiver em uma área onde a intensidade do sinal é fraca, tente novamente quando tiver um sinal forte. Caso o problema persista, entre em contato com o atendimento ao cliente pelo número %1$s e forneça o código de erro 9005.</string>
+  <string name="vvm3_error_spg_no_cellular_title">Não é possível a conexão com o correio de voz</string>
+  <string name="vvm3_error_spg_no_cellular_message">Há um problema na conexão com sua caixa de correio de voz. Se você estiver em uma área onde a intensidade do sinal é fraca, tente novamente quando tiver um sinal forte. Caso o problema persista, entre em contato com o atendimento ao cliente pelo número %1$s e forneça o código de erro 9006.</string>
+  <string name="vvm3_error_vms_timeout_title">Ocorreu um erro</string>
+  <string name="vvm3_error_vms_timeout_message">Há um problema. Tente novamente mais tarde. Caso o problema persista, entre em contato com o atendimento ao cliente pelo número %1$s e forneça o código de erro 9007.</string>
+  <string name="vvm3_error_vmg_timeout_title">Ocorreu um erro</string>
+  <string name="vvm3_error_vmg_timeout_message">Há um problema. Tente novamente mais tarde. Caso o problema persista, entre em contato com o atendimento ao cliente pelo número %1$s e forneça o código de erro 9008.</string>
+  <string name="vvm3_error_status_sms_timeout_title">Ocorreu um erro</string>
+  <string name="vvm3_error_status_sms_timeout_message">Há um problema para configurar o serviço. Tente novamente mais tarde. Caso o problema persista, entre em contato com o atendimento ao cliente pelo número %1$s e forneça o código de erro 9009.</string>
+  <string name="vvm3_error_subscriber_blocked_title">Não é possível a conexão com o correio de voz</string>
+  <string name="vvm3_error_subscriber_blocked_message">Não foi possível a conexão com sua caixa de correio de voz no momento. Tente novamente mais tarde. Caso o problema persista, entre em contato com o atendimento ao cliente pelo número %1$s e forneça o código de erro 9990.</string>
+  <string name="vvm3_error_unknown_user_title">Configurar correio de voz</string>
+  <string name="vvm3_error_unknown_user_message">O correio de voz não está configurado na conta. Entre em contato com o atendimento ao cliente pelo número %1$s e forneça o código de erro 9991.</string>
+  <string name="vvm3_error_unknown_device_title">Correio de voz</string>
+  <string name="vvm3_error_unknown_device_message">Não é possível usar o correio de voz visual neste dispositivo. Entre em contato com o atendimento ao cliente pelo número %1$s e forneça o código de erro 9992.</string>
+  <string name="vvm3_error_invalid_password_title">Ocorreu um erro</string>
+  <string name="vvm3_error_invalid_password_message">Entre em contato com o atendimento ao cliente pelo número %1$s e forneça o código de erro 9993.</string>
+  <string name="vvm3_error_mailbox_not_initialized_title">Correio de voz visual</string>
+  <string name="vvm3_error_mailbox_not_initialized_message">Para concluir a configuração do correio de voz visual, entre em contato com o atendimento ao cliente pelo número %1$s e forneça o código de erro 9994.</string>
+  <string name="vvm3_error_service_not_provisioned_title">Correio de voz visual</string>
+  <string name="vvm3_error_service_not_provisioned_message">Para concluir a configuração do correio de voz visual, entre em contato com o atendimento ao cliente pelo número %1$s e forneça o código de erro 9995.</string>
+  <string name="vvm3_error_service_not_activated_title">Correio de voz visual</string>
+  <string name="vvm3_error_service_not_activated_message">Para ativar o correio de voz visual, entre em contato com o atendimento ao cliente pelo número %1$s e forneça o código de erro 9996.</string>
+  <string name="vvm3_error_user_blocked_title">Ocorreu um erro</string>
+  <string name="vvm3_error_user_blocked_message">Para concluir a configuração do correio de voz visual, entre em contato com o atendimento ao cliente pelo número %1$s e forneça o código de erro 9998.</string>
+  <string name="vvm3_error_subscriber_unknown_title">Correio de voz visual desativado</string>
+  <string name="vvm3_error_subscriber_unknown_message">Entre em contato com o atendimento ao cliente pelo número %1$s para ativar o correio de voz visual.</string>
+  <string name="vvm3_error_imap_getquota_error_title">Ocorreu um erro</string>
+  <string name="vvm3_error_imap_getquota_error_message">Entre em contato com o atendimento ao cliente pelo número %1$s e forneça o código de erro 9997.</string>
+  <string name="vvm3_error_imap_select_error_title">Ocorreu um erro</string>
+  <string name="vvm3_error_imap_select_error_message">Entre em contato com o atendimento ao cliente pelo número %1$s e forneça o código de erro 9989.</string>
+  <string name="vvm3_error_imap_error_title">Ocorreu um erro</string>
+  <string name="vvm3_error_imap_error_message">Entre em contato com o atendimento ao cliente pelo número %1$s e forneça o código de erro 9999.</string>
+  <string name="verizon_terms_and_conditions_title">Ativar correio de voz visual</string>
+  <string name="verizon_terms_and_conditions_message">%1$s Ao ativar o correio de voz visual, você concorda com os Termos e Condições da Verizon Wireless:\n\n%2$s</string>
+  <string name="dialer_terms_and_conditions_title">Ativar correio de voz visual</string>
+  <string name="dialer_terms_and_conditions_existing_user_title">Novo: leia suas mensagens do correio de voz</string>
+  <string name="dialer_terms_and_conditions_message">%s</string>
+  <string name="dialer_terms_and_conditions_1.0">Veja e ouça suas mensagens sem precisar ligar para o correio de voz. As transcrições do correio de voz são feitas pelo serviço de transcrição gratuito do Google. Você pode desativá-lo a qualquer momento em Configurações. %s</string>
+  <string name="dialer_terms_and_conditions_existing_user">Agora as transcrições do correio de voz são feitas pelo serviço de transcrição gratuito do Google. Você pode desativá-lo a qualquer momento em Configurações. %s</string>
+  <string name="dialer_terms_and_conditions_for_verizon_1.0">Veja e ouça suas mensagens sem precisar ligar para o correio de voz.</string>
+  <string name="dialer_terms_and_conditions_learn_more">Saiba mais</string>
+  <string name="dialer_terms_and_conditions_existing_user_ack">Ok</string>
+  <string name="dialer_terms_and_conditions_existing_user_decline">Não</string>
+  <string name="terms_and_conditions_decline_dialog_title">Desativar o correio de voz visual?</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_message">O correio de voz visual será desativado se os Termos e Condições forem recusados.</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_downgrade">Desativar</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_message">O correio de voz visual não funcionará se você desativá-lo.</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_downgrade">Desativar</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message">O correio de voz só estará acessível quando você ligar para *86. Defina um novo PIN do correio de voz para continuar.</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin">Definir PIN</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/error/res/values-ro/strings.xml b/java/com/android/dialer/voicemail/listui/error/res/values-ro/strings.xml
new file mode 100644
index 0000000..1073dce
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/error/res/values-ro/strings.xml
@@ -0,0 +1,102 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_error_activating_title">Se activează mesageria vocală vizuală</string>
+  <string name="voicemail_error_activating_message">E posibil să nu primiți notificări de la mesageria vocală până când mesageria vocală vizuală nu este activată complet. Apelați mesageria vocală pentru a prelua mesajele noi până la activarea completă a mesageriei.</string>
+  <string name="voicemail_error_not_activate_no_signal_title">Nu se poate activa mesageria vocală vizuală</string>
+  <string name="voicemail_error_not_activate_no_signal_message">Asigurați-vă că telefonul are o conexiune la o rețea mobilă și încercați din nou.</string>
+  <string name="voicemail_error_not_activate_no_signal_airplane_mode_message">Dezactivați modul avion și încercați din nou.</string>
+  <string name="voicemail_error_no_signal_title">Nicio conexiune</string>
+  <string name="voicemail_error_no_signal_message">Nu veți primi notificări pentru mesaje vocale noi. Dacă folosiți Wi-Fi, puteți verifica mesageria sincronizând acum.</string>
+  <string name="voicemail_error_no_signal_airplane_mode_message">Nu veți primi notificări pentru mesajele vocale noi. Dezactivați modul avion pentru a vă sincroniza mesageria.</string>
+  <string name="voicemail_error_no_signal_cellular_required_message">Telefonul dvs. are nevoie de conexiune mobilă pentru a verifica mesageria vocală.</string>
+  <string name="voicemail_error_activation_failed_title">Nu se poate activa mesageria vocală vizuală</string>
+  <string name="voicemail_error_activation_failed_message">Puteți totuși să apelați pentru a verifica mesageria vocală.</string>
+  <string name="voicemail_error_no_data_title">Nu se poate actualiza mesageria vocală vizuală</string>
+  <string name="voicemail_error_no_data_message">Încercați din nou când aveți o conexiune Wi-Fi sau mobilă mai bună. Puteți totuși să apelați pentru a verifica mesageria vocală.</string>
+  <string name="voicemail_error_no_data_cellular_required_message">Încercați din nou când aveți o conexiune mobilă mai bună. Puteți totuși să apelați pentru a verifica mesageria vocală.</string>
+  <string name="voicemail_error_bad_config_title">Nu se poate actualiza mesageria vocală vizuală</string>
+  <string name="voicemail_error_bad_config_message">Puteți totuși să apelați pentru a verifica mesageria vocală.</string>
+  <string name="voicemail_error_communication_title">Nu se poate actualiza mesageria vocală vizuală</string>
+  <string name="voicemail_error_communication_message">Puteți totuși să apelați pentru a verifica mesageria vocală.</string>
+  <string name="voicemail_error_server_connection_title">Nu se poate actualiza mesageria vocală vizuală</string>
+  <string name="voicemail_error_server_connection_message">Puteți totuși să apelați pentru a verifica mesageria vocală.</string>
+  <string name="voicemail_error_server_title">Nu se poate actualiza mesageria vocală vizuală</string>
+  <string name="voicemail_error_server_message">Puteți totuși să apelați pentru a verifica mesageria vocală.</string>
+  <string name="voicemail_error_inbox_near_full_title">Căsuța de mesaje este aproape plină</string>
+  <string name="voicemail_error_inbox_near_full_message">Nu veți putea primi mesaje vocale noi dacă aveți căsuța de mesaje plină.</string>
+  <string name="voicemail_error_inbox_full_title">Nu puteți primi mesaje vocale noi</string>
+  <string name="voicemail_error_inbox_full_message">Căsuța de mesaje este plină. Încercați să ștergeți câteva mesaje pentru a putea primi unele noi.</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_title">Activați spațiul de stocare suplimentar și backupul</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_message">Căsuța dvs. de e-mail este plină. Pentru a elibera spațiu, activați spațiul de stocare suplimentar și astfel Google poate să vă gestioneze mesajele vocale și să facă backup pentru acestea.</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_title">Activați spațiul de stocare suplimentar și backupul</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_message">Căsuța dvs. de e-mail este aproape plină. Pentru a elibera spațiu, activați spațiul de stocare suplimentar și astfel Google poate să vă gestioneze mesajele vocale și să facă backup pentru acestea.</string>
+  <string name="voicemail_error_pin_not_set_title">Setați un cod PIN pentru mesageria vocală</string>
+  <string name="voicemail_error_pin_not_set_message">Aveți nevoie de un cod PIN pentru mesageria vocală când sunați pentru a o accesa.</string>
+  <string name="voicemail_action_turn_off_airplane_mode">Setări pentru modul avion</string>
+  <string name="voicemail_action_set_pin">Setați codul PIN</string>
+  <string name="voicemail_action_retry">Reîncercați</string>
+  <string name="voicemail_action_turn_archive_on">Activați</string>
+  <string name="voicemail_action_dimiss">Nu, mulțumesc</string>
+  <string name="voicemail_action_sync">Sincronizați</string>
+  <string name="voicemail_action_call_voicemail">Apelați mesageria vocală</string>
+  <string name="voicemail_action_call_customer_support">Apelați serviciul de asistență pentru clienți</string>
+  <string name="vvm3_error_vms_dns_failure_title">A apărut o eroare</string>
+  <string name="vvm3_error_vms_dns_failure_message">A apărut o problemă. Încercați din nou mai târziu. Dacă problema persistă, contactați Serviciul de asistență pentru clienți la %1$s și comunicați-le codul erorii: 9001.</string>
+  <string name="vvm3_error_vmg_dns_failure_title">A apărut o eroare</string>
+  <string name="vvm3_error_vmg_dns_failure_message">A apărut o problemă. Încercați din nou mai târziu. Dacă problema persistă, contactați Serviciul de asistență pentru clienți la %1$s și comunicați-le codul erorii: 9002.</string>
+  <string name="vvm3_error_spg_dns_failure_title">A apărut o eroare</string>
+  <string name="vvm3_error_spg_dns_failure_message">A apărut o problemă. Încercați din nou mai târziu. Dacă problema persistă, contactați Serviciul de asistență pentru clienți la %1$s și comunicați-le codul erorii: 9003.</string>
+  <string name="vvm3_error_vms_no_cellular_title">Nu vă puteți conecta la căsuța de mesaje vocale</string>
+  <string name="vvm3_error_vms_no_cellular_message">A apărut o problemă de conectare la căsuța de mesaje vocale. Dacă vă aflați într-o zonă cu semnal slab, așteptați până aveți semnal puternic și încercați din nou. Dacă problema persistă, contactați Serviciul de asistență pentru clienți la %1$s și comunicați-le codul erorii: 9004.</string>
+  <string name="vvm3_error_vmg_no_cellular_title">Nu vă puteți conecta la căsuța de mesaje vocale</string>
+  <string name="vvm3_error_vmg_no_cellular_message">A apărut o problemă de conectare la căsuța de mesaje vocale. Dacă vă aflați într-o zonă cu semnal slab, așteptați până aveți semnal puternic și încercați din nou. Dacă problema persistă, contactați Serviciul de asistență pentru clienți la %1$s și comunicați-le codul erorii: 9005.</string>
+  <string name="vvm3_error_spg_no_cellular_title">Nu vă puteți conecta la căsuța de mesaje vocale</string>
+  <string name="vvm3_error_spg_no_cellular_message">A apărut o problemă de conectare la căsuța de mesaje vocale. Dacă vă aflați într-o zonă cu semnal slab, așteptați până aveți semnal puternic și încercați din nou. Dacă problema persistă, contactați Serviciul de asistență pentru clienți la %1$s și comunicați-le codul erorii: 9006.</string>
+  <string name="vvm3_error_vms_timeout_title">A apărut o eroare</string>
+  <string name="vvm3_error_vms_timeout_message">A apărut o problemă. Încercați din nou mai târziu. Dacă problema persistă, contactați Serviciul de asistență pentru clienți la %1$s și comunicați-le codul erorii: 9007.</string>
+  <string name="vvm3_error_vmg_timeout_title">A apărut o eroare</string>
+  <string name="vvm3_error_vmg_timeout_message">A apărut o problemă. Încercați din nou mai târziu. Dacă problema persistă, contactați Serviciul de asistență pentru clienți la %1$s și comunicați-le codul erorii: 9008.</string>
+  <string name="vvm3_error_status_sms_timeout_title">A apărut o eroare</string>
+  <string name="vvm3_error_status_sms_timeout_message">A apărut o problemă la configurarea serviciului. Încercați din nou mai târziu. Dacă problema persistă, contactați Serviciul de asistență pentru clienți la %1$s și comunicați-le codul erorii: 9009.</string>
+  <string name="vvm3_error_subscriber_blocked_title">Nu vă puteți conecta la căsuța de mesaje vocale</string>
+  <string name="vvm3_error_subscriber_blocked_message">Nu s-a putut face conectarea la căsuța de mesaje vocale în acest moment. Încercați din nou mai târziu. Dacă problema persistă, contactați Serviciul de asistență pentru clienți la %1$s și comunicați-le codul erorii: 9990.</string>
+  <string name="vvm3_error_unknown_user_title">Configurați mesageria vocală</string>
+  <string name="vvm3_error_unknown_user_message">Mesageria vocală nu este configurată pentru contul dvs. Contactați Serviciul de asistență pentru clienți la %1$s și comunicați-le codul erorii: 9991.</string>
+  <string name="vvm3_error_unknown_device_title">Mesagerie vocală</string>
+  <string name="vvm3_error_unknown_device_message">Nu puteți folosi mesageria vocală vizuală pe acest dispozitiv. Contactați Serviciul de asistență pentru clienți la %1$s și comunicați-le codul erorii: 9992.</string>
+  <string name="vvm3_error_invalid_password_title">A apărut o eroare</string>
+  <string name="vvm3_error_invalid_password_message">Contactați Serviciul de asistență pentru clienți la %1$s și comunicați-le codul erorii: 9993.</string>
+  <string name="vvm3_error_mailbox_not_initialized_title">Mesagerie vocală vizuală</string>
+  <string name="vvm3_error_mailbox_not_initialized_message">Pentru a finaliza configurarea mesageriei vocale vizuale, contactați Serviciul de asistență pentru clienți la %1$s și comunicați-le codul erorii: 9994.</string>
+  <string name="vvm3_error_service_not_provisioned_title">Mesagerie vocală vizuală</string>
+  <string name="vvm3_error_service_not_provisioned_message">Pentru a finaliza configurarea mesageriei vocale vizuale, contactați Serviciul de asistență pentru clienți la %1$s și comunicați-le codul erorii: 9995.</string>
+  <string name="vvm3_error_service_not_activated_title">Mesagerie vocală vizuală</string>
+  <string name="vvm3_error_service_not_activated_message">Pentru a activa mesageria vocală vizuală, contactați Serviciul de asistență pentru clienți la %1$s și comunicați-le codul erorii: 9996.</string>
+  <string name="vvm3_error_user_blocked_title">A apărut o eroare</string>
+  <string name="vvm3_error_user_blocked_message">Pentru a finaliza configurarea mesageriei vocale vizuale, contactați Serviciul de asistență pentru clienți la %1$s și comunicați-le codul erorii: 9998.</string>
+  <string name="vvm3_error_subscriber_unknown_title">Mesageria vocală vizuală e dezactivată</string>
+  <string name="vvm3_error_subscriber_unknown_message">Contactați Serviciul de asistență pentru clienți la %1$s pentru a activa mesageria vocală vizuală.</string>
+  <string name="vvm3_error_imap_getquota_error_title">A apărut o eroare</string>
+  <string name="vvm3_error_imap_getquota_error_message">Contactați Serviciul de asistență pentru clienți la %1$s și comunicați-le codul erorii: 9997.</string>
+  <string name="vvm3_error_imap_select_error_title">A apărut o eroare</string>
+  <string name="vvm3_error_imap_select_error_message">Contactați Serviciul de asistență pentru clienți la %1$s și comunicați-le codul erorii: 9989.</string>
+  <string name="vvm3_error_imap_error_title">A apărut o eroare</string>
+  <string name="vvm3_error_imap_error_message">Contactați Serviciul de asistență pentru clienți la %1$s și comunicați-le codul erorii: 9999.</string>
+  <string name="verizon_terms_and_conditions_title">Activați mesageria vocală vizuală</string>
+  <string name="verizon_terms_and_conditions_message">%1$s Dacă activați mesageria vocală vizuală, sunteți de acord să respectați termenii și condițiile Verizon Wireless:\n\n%2$s</string>
+  <string name="dialer_terms_and_conditions_title">Activați mesageria vocală vizuală</string>
+  <string name="dialer_terms_and_conditions_existing_user_title">Nou! Citiți mesajele vocale</string>
+  <string name="dialer_terms_and_conditions_message">%s</string>
+  <string name="dialer_terms_and_conditions_1.0">Vedeți și ascultați mesajele, fără să fie necesar să apelați mesageria vocală. Transcrierile mesajelor vocale sunt oferite de serviciul gratuit de transcriere de la Google. Puteți dezactiva opțiunea oricând în Setări. %s</string>
+  <string name="dialer_terms_and_conditions_existing_user">Transcrierile mesajelor vocale sunt oferite de serviciul gratuit de transcriere de la Google. Puteți dezactiva opțiunea oricând în Setări. %s</string>
+  <string name="dialer_terms_and_conditions_for_verizon_1.0">Vedeți și ascultați mesajele, fără să fie necesar să apelați mesageria vocală.</string>
+  <string name="dialer_terms_and_conditions_learn_more">Aflați mai multe</string>
+  <string name="dialer_terms_and_conditions_existing_user_ack">Ok, am înțeles</string>
+  <string name="dialer_terms_and_conditions_existing_user_decline">Nu, mulțumesc</string>
+  <string name="terms_and_conditions_decline_dialog_title">Dezactivați mesageria vocală vizuală?</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_message">Mesageria vocală vizuală va fi dezactivată dacă nu acceptați termenii și condițiile.</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_downgrade">Dezactivați</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_message">Mesageria vocală vizuală va fi dezactivată dacă nu acceptați termenii și condițiile.</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_downgrade">Dezactivați</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message">Mesageria vocală va fi accesibilă numai apelând *86. Setați un cod PIN nou pentru mesageria vocală pentru a continua.</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin">Setați codul PIN</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/error/res/values-ru/strings.xml b/java/com/android/dialer/voicemail/listui/error/res/values-ru/strings.xml
new file mode 100644
index 0000000..e3a05da
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/error/res/values-ru/strings.xml
@@ -0,0 +1,102 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_error_activating_title">Включение визуальной голосовой почты</string>
+  <string name="voicemail_error_activating_message">Вы не будете получать уведомления, пока не включите визуальную голосовую почту. Позвоните, чтобы прослушать новые сообщения.</string>
+  <string name="voicemail_error_not_activate_no_signal_title">Не удалось включить визуальную голосовую почту</string>
+  <string name="voicemail_error_not_activate_no_signal_message">Убедитесь, что телефон подключен к мобильной сети, и повторите попытку.</string>
+  <string name="voicemail_error_not_activate_no_signal_airplane_mode_message">Отключите режим полета и повторите попытку.</string>
+  <string name="voicemail_error_no_signal_title">Нет соединения</string>
+  <string name="voicemail_error_no_signal_message">Вы не будете получать оповещения о новых голосовых сообщениях. Если телефон подключен к Wi-Fi, то вы можете выполнить синхронизацию и проверить голосовую почту.</string>
+  <string name="voicemail_error_no_signal_airplane_mode_message">Вы не будете получать оповещения о новых сообщениях. Чтобы выполнить синхронизацию, отключите режим полета.</string>
+  <string name="voicemail_error_no_signal_cellular_required_message">Чтобы проверить голосовую почту, подключитесь к мобильному Интернету.</string>
+  <string name="voicemail_error_activation_failed_title">Не удалось включить просмотр голосовой почты</string>
+  <string name="voicemail_error_activation_failed_message">Чтобы проверить голосовую почту, вы можете позвонить на специальный номер.</string>
+  <string name="voicemail_error_no_data_title">Не удалось обновить страницу просмотра голосовой почты</string>
+  <string name="voicemail_error_no_data_message">Дождитесь стабильного сигнала Wi-Fi или мобильного Интернета и повторите попытку. Если вы хотите проверить голосовую почту сейчас, позвоните на специальный номер.</string>
+  <string name="voicemail_error_no_data_cellular_required_message">Дождитесь стабильного сигнала мобильного Интернета и повторите попытку. Если вы хотите проверить голосовую почту сейчас, позвоните на специальный номер.</string>
+  <string name="voicemail_error_bad_config_title">Не удалось обновить страницу просмотра голосовой почты</string>
+  <string name="voicemail_error_bad_config_message">Чтобы проверить голосовую почту, вы можете позвонить на специальный номер.</string>
+  <string name="voicemail_error_communication_title">Не удалось обновить страницу просмотра голосовой почты</string>
+  <string name="voicemail_error_communication_message">Чтобы проверить голосовую почту, вы можете позвонить на специальный номер.</string>
+  <string name="voicemail_error_server_connection_title">Не удалось обновить страницу просмотра голосовой почты</string>
+  <string name="voicemail_error_server_connection_message">Чтобы проверить голосовую почту, вы можете позвонить на специальный номер.</string>
+  <string name="voicemail_error_server_title">Не удалось обновить страницу просмотра голосовой почты</string>
+  <string name="voicemail_error_server_message">Чтобы проверить голосовую почту, вы можете позвонить на специальный номер.</string>
+  <string name="voicemail_error_inbox_near_full_title">Почтовый ящик почти заполнен</string>
+  <string name="voicemail_error_inbox_near_full_message">Когда почтовый ящик будет заполнен, вы не сможете получать новые голосовые сообщения.</string>
+  <string name="voicemail_error_inbox_full_title">Нет свободного места</string>
+  <string name="voicemail_error_inbox_full_message">Почтовый ящик заполнен. Чтобы получать новые голосовые сообщения, удалите старые.</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_title">Требуется дополнительное пространство</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_message">Почтовый ящик заполнен. Чтобы освободить место, активируйте дополнительное пространство. После этого Google сможет управлять вашими голосовыми сообщениями и сохранять их резервные копии.</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_title">Требуется дополнительное пространство</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_message">Почтовый ящик почти заполнен. Чтобы освободить место, активируйте дополнительное пространство. После этого Google сможет управлять вашими голосовыми сообщениями и сохранять их резервные копии.</string>
+  <string name="voicemail_error_pin_not_set_title">Установите PIN-код голосовой почты</string>
+  <string name="voicemail_error_pin_not_set_message">Он будет нужен вам каждый раз, когда вы звоните, чтобы прослушать голосовую почту.</string>
+  <string name="voicemail_action_turn_off_airplane_mode">Настройки режима полета</string>
+  <string name="voicemail_action_set_pin">Установить PIN-код</string>
+  <string name="voicemail_action_retry">Повторить</string>
+  <string name="voicemail_action_turn_archive_on">Да</string>
+  <string name="voicemail_action_dimiss">Закрыть</string>
+  <string name="voicemail_action_sync">Синхронизировать</string>
+  <string name="voicemail_action_call_voicemail">Получить почту</string>
+  <string name="voicemail_action_call_customer_support">Позвонить в службу поддержки</string>
+  <string name="vvm3_error_vms_dns_failure_title">Ошибка</string>
+  <string name="vvm3_error_vms_dns_failure_message">Произошла ошибка. Повторите попытку позже. Если проблема не исчезнет, обратитесь в службу поддержки по номеру %1$s и сообщите код ошибки: 9001.</string>
+  <string name="vvm3_error_vmg_dns_failure_title">Ошибка</string>
+  <string name="vvm3_error_vmg_dns_failure_message">Произошла ошибка. Повторите попытку позже. Если проблема не исчезнет, обратитесь в службу поддержки по номеру %1$s и сообщите код ошибки: 9002.</string>
+  <string name="vvm3_error_spg_dns_failure_title">Ошибка</string>
+  <string name="vvm3_error_spg_dns_failure_message">Произошла ошибка. Повторите попытку позже. Если проблема не исчезнет, обратитесь в службу поддержки по номеру %1$s и сообщите код ошибки: 9003.</string>
+  <string name="vvm3_error_vms_no_cellular_title">Не удается подключиться к голосовой почте</string>
+  <string name="vvm3_error_vms_no_cellular_message">Не удается подключиться к голосовой почте. Попробуйте найти место с более сильным сигналом и повторите попытку. Если проблема не исчезнет, обратитесь в службу поддержки по номеру %1$s и сообщите код ошибки: 9004.</string>
+  <string name="vvm3_error_vmg_no_cellular_title">Не удается подключиться к голосовой почте</string>
+  <string name="vvm3_error_vmg_no_cellular_message">Не удается подключиться к голосовой почте. Попробуйте найти место с более сильным сигналом и повторите попытку. Если проблема не исчезнет, обратитесь в службу поддержки по номеру %1$s и сообщите код ошибки: 9005.</string>
+  <string name="vvm3_error_spg_no_cellular_title">Не удается подключиться к голосовой почте</string>
+  <string name="vvm3_error_spg_no_cellular_message">Не удается подключиться к голосовой почте. Попробуйте найти место с более сильным сигналом и повторите попытку. Если проблема не исчезнет, обратитесь в службу поддержки по номеру %1$s и сообщите код ошибки: 9006.</string>
+  <string name="vvm3_error_vms_timeout_title">Ошибка</string>
+  <string name="vvm3_error_vms_timeout_message">Произошла ошибка. Повторите попытку позже. Если проблема не исчезнет, обратитесь в службу поддержки по номеру %1$s и сообщите код ошибки: 9007.</string>
+  <string name="vvm3_error_vmg_timeout_title">Ошибка</string>
+  <string name="vvm3_error_vmg_timeout_message">Произошла ошибка. Повторите попытку позже. Если проблема не исчезнет, обратитесь в службу поддержки по номеру %1$s и сообщите код ошибки: 9008.</string>
+  <string name="vvm3_error_status_sms_timeout_title">Ошибка</string>
+  <string name="vvm3_error_status_sms_timeout_message">Не удается настроить услугу. Повторите попытку позже. Если проблема не исчезнет, обратитесь в службу поддержки по номеру %1$s и сообщите код ошибки: 9009.</string>
+  <string name="vvm3_error_subscriber_blocked_title">Не удается подключиться к голосовой почте</string>
+  <string name="vvm3_error_subscriber_blocked_message">Не удается подключиться к голосовой почте. Повторите попытку позже. Если проблема не исчезнет, обратитесь в службу поддержки по номеру %1$s и сообщите код ошибки: 9990.</string>
+  <string name="vvm3_error_unknown_user_title">Настройте голосовую почту</string>
+  <string name="vvm3_error_unknown_user_message">В вашем аккаунте не настроена голосовая почта. Обратитесь в службу поддержки по номеру %1$s и сообщите код ошибки: 9991.</string>
+  <string name="vvm3_error_unknown_device_title">Голосовая почта</string>
+  <string name="vvm3_error_unknown_device_message">На этом устройстве нельзя использовать визуальную голосовую почту. Обратитесь в службу поддержки по номеру %1$s и сообщите код ошибки: 9992.</string>
+  <string name="vvm3_error_invalid_password_title">Ошибка</string>
+  <string name="vvm3_error_invalid_password_message">Обратитесь в службу поддержки по номеру %1$s и сообщите код ошибки: 9993.</string>
+  <string name="vvm3_error_mailbox_not_initialized_title">Визуальная голосовая почта</string>
+  <string name="vvm3_error_mailbox_not_initialized_message">Чтобы завершить настройку визуальной голосовой почты, обратитесь в службу поддержки по номеру %1$s и сообщите код ошибки: 9994.</string>
+  <string name="vvm3_error_service_not_provisioned_title">Визуальная голосовая почта</string>
+  <string name="vvm3_error_service_not_provisioned_message">Чтобы завершить настройку визуальной голосовой почты, обратитесь в службу поддержки по номеру %1$s и сообщите код ошибки: 9995.</string>
+  <string name="vvm3_error_service_not_activated_title">Визуальная голосовая почта</string>
+  <string name="vvm3_error_service_not_activated_message">Чтобы активировать визуальную голосовую почту, обратитесь в службу поддержки по номеру %1$s и сообщите код ошибки: 9996.</string>
+  <string name="vvm3_error_user_blocked_title">Ошибка</string>
+  <string name="vvm3_error_user_blocked_message">Чтобы завершить настройку визуальной голосовой почты, обратитесь в службу поддержки по номеру %1$s и сообщите код ошибки: 9998.</string>
+  <string name="vvm3_error_subscriber_unknown_title">Визуальная голосовая почта отключена</string>
+  <string name="vvm3_error_subscriber_unknown_message">Чтобы активировать визуальную голосовую почту, обратитесь в службу поддержки по номеру %1$s.</string>
+  <string name="vvm3_error_imap_getquota_error_title">Ошибка</string>
+  <string name="vvm3_error_imap_getquota_error_message">Обратитесь в службу поддержки по номеру %1$s и сообщите код ошибки: 9997.</string>
+  <string name="vvm3_error_imap_select_error_title">Ошибка</string>
+  <string name="vvm3_error_imap_select_error_message">Обратитесь в службу поддержки по номеру %1$s и сообщите код ошибки: 9989.</string>
+  <string name="vvm3_error_imap_error_title">Ошибка</string>
+  <string name="vvm3_error_imap_error_message">Обратитесь в службу поддержки по номеру %1$s и сообщите код ошибки: 9999.</string>
+  <string name="verizon_terms_and_conditions_title">Включите визуальную голосовую почту</string>
+  <string name="verizon_terms_and_conditions_message">%1$s Включая визуальную голосовую почту, вы соглашаетесь с Условиями использования Verizon Wireless:\n\n%2$s</string>
+  <string name="dialer_terms_and_conditions_title">Включите визуальную голосовую почту</string>
+  <string name="dialer_terms_and_conditions_existing_user_title">Новинка! Голосовые сообщения теперь можно читать</string>
+  <string name="dialer_terms_and_conditions_message">%s</string>
+  <string name="dialer_terms_and_conditions_1.0">Просматривайте и прослушивайте сообщения голосовой почты без лишних звонков. Расшифровки аудиозаписей создаются с помощью специального бесплатного сервиса Google. Эта функция включается и выключается в настройках. %s</string>
+  <string name="dialer_terms_and_conditions_existing_user">Расшифровки голосовых сообщений теперь создаются с помощью специального бесплатного сервиса Google. Вы можете отключить эту функцию в настройках. %s</string>
+  <string name="dialer_terms_and_conditions_for_verizon_1.0">Просматривайте и прослушивайте голосовые сообщения без лишних звонков.</string>
+  <string name="dialer_terms_and_conditions_learn_more">Подробнее…</string>
+  <string name="dialer_terms_and_conditions_existing_user_ack">ОК</string>
+  <string name="dialer_terms_and_conditions_existing_user_decline">Нет, спасибо</string>
+  <string name="terms_and_conditions_decline_dialog_title">Отключить визуальную голосовую почту?</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_message">Если вы не примете Условия использования, визуальная голосовая почта будет отключена.</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_downgrade">Отключить</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_message">Визуальная голосовая почта будет отключена.</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_downgrade">Отключить</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message">Для прослушивания голосовой почты необходимо будет позвонить по номеру *86. Чтобы продолжить, установите новый PIN-код голосовой почты.</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin">Установить PIN-код</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/error/res/values-si/strings.xml b/java/com/android/dialer/voicemail/listui/error/res/values-si/strings.xml
new file mode 100644
index 0000000..4bddbab
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/error/res/values-si/strings.xml
@@ -0,0 +1,102 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_error_activating_title">දෘශ්‍ය හඬ තැපෑල ක්‍රියාත්මක කිරීම</string>
+  <string name="voicemail_error_activating_message">දෘශ්‍ය හඬ තැපෑල සම්පූර්ණයෙන් සක්‍රිය කරන තෙක් ඔබට හඩ තැපැල් දැනුම් දීම් නොලැබීමට හැකිය. දෘශ්‍ය හඬ තැපෑල සම්පූර්ණයෙන් සක්‍රිය කරන තෙක් නව පණිවිඩ යළි ලබා ගැනීමට හඬ තැපෑල අමතන්න.</string>
+  <string name="voicemail_error_not_activate_no_signal_title">දෘශ්‍ය හඬ තැපෑල ක්‍රියාත්මක කළ නොහැකිය</string>
+  <string name="voicemail_error_not_activate_no_signal_message">ඔබේ දුරකථනයට ජංගම ජාල සම්බන්ධතාවක් ඇති බව සහතික කරගෙන නැවත උත්සාහ කරන්න.</string>
+  <string name="voicemail_error_not_activate_no_signal_airplane_mode_message">ගුවන් යානා ප්‍රකාරය ක්‍රියාවිරහිත කර නැවත උත්සාහ කරන්න.</string>
+  <string name="voicemail_error_no_signal_title">සබැඳුමක් නැත</string>
+  <string name="voicemail_error_no_signal_message">ඔබට නව හඬ තැපැල් සඳහා දැනුම් දීම් නොලැබෙනු ඇත. ඔබ Wi-Fi වල සිටින්නේ නම්, ඔබට දැන් සමමුහුර්ත කිරීමෙන් හඬ තැපෑල සඳහා පරීක්ෂා කළ හැකිය.</string>
+  <string name="voicemail_error_no_signal_airplane_mode_message">ඔබට නව හඬ තැපැල් සඳහා දැනුම් දීම් නොලැබෙනු ඇත. ඔබේ හඬ තැපැල් සමමුහුර්ත කිරීමට ගුවන් යානා ප්‍රකාරය ක්‍රියාවිරහිත කරන්න.</string>
+  <string name="voicemail_error_no_signal_cellular_required_message">හඬ තැපෑල පරීක්ෂා කිරීමට ඔබේ දුරකථනයට ජංගම දත්ත සම්බන්ධතාවක් අවශ්‍යයි.</string>
+  <string name="voicemail_error_activation_failed_title">දෘශ්‍ය හඬ තැපෑල ක්‍රියාත්මක කළ නොහැකිය</string>
+  <string name="voicemail_error_activation_failed_message">ඔබට තවම හඬ තැපෑල පරීක්ෂා කිරීමට ඇමතිය හැකිය.</string>
+  <string name="voicemail_error_no_data_title">දෘශ්‍ය හඬ තැපෑල යාවත්කාලීන කළ නොහැකිය</string>
+  <string name="voicemail_error_no_data_message">ඔබේ Wi-Fi හෝ ජංගම දත්ත සම්බන්ධතාව වඩා යහපත් විට නැවත උත්සාහ කරන්න. ඔබට තවම හඬ තැපෑල පරීක්ෂා කිරීමට ඇමතිය හැකිය.</string>
+  <string name="voicemail_error_no_data_cellular_required_message">ඔබේ ජංගම දත්ත සම්බන්ධතාව වඩා යහපත් විට නැවත උත්සාහ කරන්න. ඔබට තවම හඬ තැපෑල පරීක්ෂා කිරීමට ඇමතිය හැකිය.</string>
+  <string name="voicemail_error_bad_config_title">දෘශ්‍ය හඬ තැපෑල යාවත්කාලීන කළ නොහැකිය</string>
+  <string name="voicemail_error_bad_config_message">ඔබට තවම හඬ තැපෑල පරීක්ෂා කිරීමට ඇමතිය හැකිය.</string>
+  <string name="voicemail_error_communication_title">දෘශ්‍ය හඬ තැපෑල යාවත්කාලීන කළ නොහැකිය</string>
+  <string name="voicemail_error_communication_message">ඔබට තවම හඬ තැපෑල පරීක්ෂා කිරීමට ඇමතිය හැකිය.</string>
+  <string name="voicemail_error_server_connection_title">දෘශ්‍ය හඬ තැපෑල යාවත්කාලීන කළ නොහැකිය</string>
+  <string name="voicemail_error_server_connection_message">ඔබට තවම හඬ තැපෑල පරීක්ෂා කිරීමට ඇමතිය හැකිය.</string>
+  <string name="voicemail_error_server_title">දෘශ්‍ය හඬ තැපෑල යාවත්කාලීන කළ නොහැකිය</string>
+  <string name="voicemail_error_server_message">ඔබට තවම හඬ තැපෑල පරීක්ෂා කිරීමට ඇමතිය හැකිය.</string>
+  <string name="voicemail_error_inbox_near_full_title">එන ලිපි මුළුමනින්ම පාහේ පිරී ඇත</string>
+  <string name="voicemail_error_inbox_near_full_message">ඔබේ එන ලිපි පිරී ඇති නම් ඔබට නව හඩ තැපැල් ලැබීමට නොහැකි වනු ඇත.</string>
+  <string name="voicemail_error_inbox_full_title">නව හඬ තැපැල් ලැබීමට නොහැකිය</string>
+  <string name="voicemail_error_inbox_full_message">ඔබේ එන ලිපි පිරී ඇත. නව හඬ තැපැල් ලබා ගැනීමට පණිවිඩ සමහරක් මැකීම උත්සාහ කරන්න.</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_title">අතිරේක ගබඩාව සහ උපස්ථය ක්‍රියාත්මක කරන්න</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_message">ඔබේ තැපැල් පෙට්ටිය පිරී ඇත. ඉඩ නිදහස් කර ගැනීමට, අතිරේක ගබඩාව ක්‍රියාත්මක කරන්න. එවිට Google හට ඔබේ හඬ තැපැල් පණිවිඩ කළමනාකරණය කිරීමට සහ උපස්ථ කිරීමට හැකිය.</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_title">අතිරේක ගබඩාව සහ උපස්ථය ක්‍රියාත්මක කරන්න</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_message">ඔබේ තැපැල් පෙට්ටිය මුළුමනින්ම පාහේ පිරී ඇත. ඉඩ නිදහස් කර ගැනීමට, අතිරේක ගබඩාව ක්‍රියාත්මක කරන්න. එවිට Google හට ඔබේ හඬ තැපැල් පණිවිඩ කළමනාකරණය කිරීමට සහ උපස්ථ කිරීමට හැකිය.</string>
+  <string name="voicemail_error_pin_not_set_title">ඔබේ හඬ තැපැල් PIN අංකය සකසන්න</string>
+  <string name="voicemail_error_pin_not_set_message">ඔබ ඔබේ හඬ තැපෑලට ප්‍රවේශ වීමට අමතන ඕනෑම අවස්ථාවක ඔබට හඬ තැපැල් PIN අංකයක් අවශ්‍ය වනු ඇත.</string>
+  <string name="voicemail_action_turn_off_airplane_mode">ගුවන් යානා ප්‍රකාර සැකසීම්</string>
+  <string name="voicemail_action_set_pin">PIN අංකය සකසන්න</string>
+  <string name="voicemail_action_retry">නැවත උත්සහ කරන්න</string>
+  <string name="voicemail_action_turn_archive_on">ක්‍රියාත්මක කර.</string>
+  <string name="voicemail_action_dimiss">එපා ස්තූතියි</string>
+  <string name="voicemail_action_sync">සමමුහුර්ත කරන්න</string>
+  <string name="voicemail_action_call_voicemail">හඬ තැපැල් අමතන්න</string>
+  <string name="voicemail_action_call_customer_support">පාරිභෝගික සහාය අමතන්න</string>
+  <string name="vvm3_error_vms_dns_failure_title">යම් දෙයක් වැරදිණි</string>
+  <string name="vvm3_error_vms_dns_failure_message">කනගාටුයි, අපට දෝෂයක් ඇති විය. කරුණාකර පසුව නැවත උත්සාහ කරන්න. තවම ගැටලුවක් තිබේ නම්, කරුණාකර %1$s අංකයට පාරිභෝගික සේවාව අමතා දෝෂ කේතය 9001 බව ඔවුන්ට පවසන්න.</string>
+  <string name="vvm3_error_vmg_dns_failure_title">යම් දෙයක් වැරදිණි</string>
+  <string name="vvm3_error_vmg_dns_failure_message">කනගාටුයි, අපට දෝෂයක් ඇති විය. කරුණාකර පසුව නැවත උත්සාහ කරන්න. තවම ගැටලුවක් තිබේ නම්, කරුණාකර %1$s අංකයට පාරිභෝගික සේවාව අමතා දෝෂ කේතය 9002 බව ඔවුන්ට පවසන්න.</string>
+  <string name="vvm3_error_spg_dns_failure_title">යම් දෙයක් වැරදිණි</string>
+  <string name="vvm3_error_spg_dns_failure_message">කනගාටුයි, අපට දෝෂයක් ඇති විය. කරුණාකර පසුව නැවත උත්සාහ කරන්න. තවම ගැටලුවක් තිබේ නම්, කරුණාකර %1$s අංකයට පාරිභෝගික සේවාව අමතා දෝෂ කේතය 9003 බව ඔවුන්ට පවසන්න.</string>
+  <string name="vvm3_error_vms_no_cellular_title">ඔබේ හඬ තැපැල් පෙට්ටිය වෙත සම්බන්ධ විය නොහැකිය</string>
+  <string name="vvm3_error_vms_no_cellular_message">කනගාටුයි, අපට ඔබේ හඬ තැපැල් පෙට්ටියට සම්බන්ධ වීමේ ගැටලු ඇත. ඔබ දුර්වල සංඥා ප්‍රබලතාවක් ඇති ප්‍රදේශයක සිටින්නේ නම්, ඔබේ සංඥා ප්‍රබල වන තෙක් රැඳී සිට නැවත උත්සාහ කරන්න. තවම ගැටලුවක් තිබේ නම්, කරුණාකර %1$s අංකයට පාරිභෝගික සේවාව අමතා දෝෂ කේතය 9004 බව ඔවුන්ට පවසන්න.</string>
+  <string name="vvm3_error_vmg_no_cellular_title">ඔබේ හඬ තැපැල් පෙට්ටිය වෙත සම්බන්ධ විය නොහැකිය</string>
+  <string name="vvm3_error_vmg_no_cellular_message">කනගාටුයි, අපට ඔබේ හඬ තැපැල් පෙට්ටියට සම්බන්ධ වීමේ ගැටලු ඇත. ඔබ දුර්වල සංඥා ප්‍රබලතාවක් ඇති ප්‍රදේශයක සිටින්නේ නම්, ඔබේ සංඥා ප්‍රබල වන තෙක් රැඳී සිට නැවත උත්සාහ කරන්න. තවම ගැටලුවක් තිබේ නම්, කරුණාකර %1$s අංකයට පාරිභෝගික සේවාව අමතා දෝෂ කේතය 9005 බව ඔවුන්ට පවසන්න.</string>
+  <string name="vvm3_error_spg_no_cellular_title">ඔබේ හඬ තැපැල් පෙට්ටිය වෙත සම්බන්ධ විය නොහැකිය</string>
+  <string name="vvm3_error_spg_no_cellular_message">කනගාටුයි, අපට ඔබේ හඬ තැපැල් පෙට්ටියට සම්බන්ධ වීමේ ගැටලු ඇත. ඔබ දුර්වල සංඥා ප්‍රබලතාවක් ඇති ප්‍රදේශයක සිටින්නේ නම්, ඔබේ සංඥා ප්‍රබල වන තෙක් රැඳී සිට නැවත උත්සාහ කරන්න. තවම ගැටලුවක් තිබේ නම්, කරුණාකර %1$s අංකයට පාරිභෝගික සේවාව අමතා දෝෂ කේතය 9006 බව ඔවුන්ට පවසන්න.</string>
+  <string name="vvm3_error_vms_timeout_title">යම් දෙයක් වැරදිණි</string>
+  <string name="vvm3_error_vms_timeout_message">කනගාටුයි, අපට දෝෂයක් ඇති විය. කරුණාකර පසුව නැවත උත්සාහ කරන්න. තවම ගැටලුවක් තිබේ නම්, කරුණාකර %1$s අංකයට පාරිභෝගික සේවාව අමතා දෝෂ කේතය 9007 බව ඔවුන්ට පවසන්න.</string>
+  <string name="vvm3_error_vmg_timeout_title">යම් දෙයක් වැරදිණි</string>
+  <string name="vvm3_error_vmg_timeout_message">කනගාටුයි, අපට දෝෂයක් ඇති විය. කරුණාකර පසුව නැවත උත්සාහ කරන්න. තවම ගැටලුවක් තිබේ නම්, කරුණාකර %1$s අංකයට පාරිභෝගික සේවාව අමතා දෝෂ කේතය 9008 බව ඔවුන්ට පවසන්න.</string>
+  <string name="vvm3_error_status_sms_timeout_title">යම් දෙයක් වැරදිණි</string>
+  <string name="vvm3_error_status_sms_timeout_message">කනගාටුයි, අපට ඔබේ සේවාව පිහිටුවීමේ දෝෂයක් ඇති විය. කරුණාකර පසුව නැවත උත්සාහ කරන්න. තවම ගැටලුවක් තිබේ නම්, කරුණාකර %1$s අංකයට පාරිභෝගික සේවාව අමතා දෝෂ කේතය 9009 බව ඔවුන්ට පවසන්න.</string>
+  <string name="vvm3_error_subscriber_blocked_title">ඔබේ හඬ තැපැල් පෙට්ටිය වෙත සම්බන්ධ විය නොහැකිය</string>
+  <string name="vvm3_error_subscriber_blocked_message">කනගාටුයි, අපට මේ අවස්ථාවේදී ඔබේ හඬ තැපැල් පෙට්ටිය වෙත සම්බන්ධ විය නොහැකිය. කරුණාකර පසුව නැවත උත්සාහ කරන්න. තවම ගැටලුවක් තිබේ නම්, කරුණාකර %1$s අංකයට පාරිභෝගික සේවාව අමතා දෝෂ කේතය 9990 බව ඔවුන්ට පවසන්න.</string>
+  <string name="vvm3_error_unknown_user_title">හඬ තැපෑල පිහිටුවන්න</string>
+  <string name="vvm3_error_unknown_user_message">ඔබේ ගිණුම මත හඬ තැපෑල පිහිටුවා නැත. කරුණාකර %1$s අංකයට පාරිභෝගික සේවාව අමතා දෝෂ කේතය 9991 බව ඔවුන්ට පවසන්න.</string>
+  <string name="vvm3_error_unknown_device_title">හඬ තැපෑල</string>
+  <string name="vvm3_error_unknown_device_message">දෘශ්‍ය හඬ තැපෑල මෙම උපාංගයේ භාවිත කළ නොහැකිය. කරුණාකර %1$s අංකයට පාරිභෝගික සේවාව අමතා දෝෂ කේතය 9992 බව ඔවුන්ට පවසන්න.</string>
+  <string name="vvm3_error_invalid_password_title">යම් දෙයක් වැරදිණි</string>
+  <string name="vvm3_error_invalid_password_message">කරුණාකර %1$s අංකයට පාරිභෝගික සේවාව අමතා දෝෂ කේතය 9993 බව ඔවුන්ට පවසන්න.</string>
+  <string name="vvm3_error_mailbox_not_initialized_title">දෘශ්‍ය හඬ තැපෑල</string>
+  <string name="vvm3_error_mailbox_not_initialized_message">දෘශ්‍ය හඬ තැපෑල පිහිටුවීම සම්පූර්ණ කිරීමට, කරුණාකර %1$s අංකයට පාරිභෝගික සේවාව අමතා දෝෂ කේතය 9994 බව ඔවුන්ට පවසන්න.</string>
+  <string name="vvm3_error_service_not_provisioned_title">දෘශ්‍ය හඬ තැපෑල</string>
+  <string name="vvm3_error_service_not_provisioned_message">දෘශ්‍ය හඬ තැපෑල පිහිටුවීම සම්පූර්ණ කිරීමට, කරුණාකර %1$s අංකයට පාරිභෝගික සේවාව අමතා දෝෂ කේතය 9995 බව ඔවුන්ට පවසන්න.</string>
+  <string name="vvm3_error_service_not_activated_title">දෘශ්‍ය හඬ තැපෑල</string>
+  <string name="vvm3_error_service_not_activated_message">දෘශ්‍ය හඬ තැපෑල සක්‍රිය කිරීමට, කරුණාකර %1$s අංකයට පාරිභෝගික සේවාව අමතා දෝෂ කේතය 9996 බව ඔවුන්ට පවසන්න.</string>
+  <string name="vvm3_error_user_blocked_title">යම් දෙයක් වැරදිණි</string>
+  <string name="vvm3_error_user_blocked_message">දෘශ්‍ය හඬ තැපෑල පිහිටුවීම සම්පූර්ණ කිරීමට, කරුණාකර %1$s අංකයට පාරිභෝගික සේවාව අමතා දෝෂ කේතය 9998 බව ඔවුන්ට පවසන්න.</string>
+  <string name="vvm3_error_subscriber_unknown_title">දෘශ්‍ය හඬ තැපෑල අබලයි</string>
+  <string name="vvm3_error_subscriber_unknown_message">දෘශ්‍ය හඬ තැපෑල සක්‍රිය කිරීමට, කරුණාකර %1$s අංකයට පාරිභෝගික සේවාව අමතන්න.</string>
+  <string name="vvm3_error_imap_getquota_error_title">යම් දෙයක් වැරදිණි</string>
+  <string name="vvm3_error_imap_getquota_error_message">කරුණාකර %1$s අංකයට පාරිභෝගික සේවාව අමතා දෝෂ කේතය 9997 බව ඔවුන්ට පවසන්න.</string>
+  <string name="vvm3_error_imap_select_error_title">යම් දෙයක් වැරදිණි</string>
+  <string name="vvm3_error_imap_select_error_message">කරුණාකර %1$s අංකයට පාරිභෝගික සේවාව අමතා දෝෂ කේතය 9989 බව ඔවුන්ට පවසන්න.</string>
+  <string name="vvm3_error_imap_error_title">යම් දෙයක් වැරදිණි</string>
+  <string name="vvm3_error_imap_error_message">කරුණාකර %1$s අංකයට පාරිභෝගික සේවාව අමතා දෝෂ කේතය 9999 බව ඔවුන්ට පවසන්න.</string>
+  <string name="verizon_terms_and_conditions_title">දෘශ්‍ය හඬ තැපෑල ක්‍රියාත්මක කරන්න</string>
+  <string name="verizon_terms_and_conditions_message">%1$s දෘශ්‍ය හඬ තැපෑල ක්‍රියාත්මක කිරීමෙන් ඔබ Verizon Wireless නියම සහ කොන්දේසිවලට එකඟ වේ:\n\n%2$s</string>
+  <string name="dialer_terms_and_conditions_title">දෘශ්‍ය හඬ තැපෑල ක්‍රියාත්මක කරන්න</string>
+  <string name="dialer_terms_and_conditions_existing_user_title">අලුත්! ඔබගේ හඬ තැපැල් කියවන්න</string>
+  <string name="dialer_terms_and_conditions_message">%s</string>
+  <string name="dialer_terms_and_conditions_1.0">හඬ තැපෑලට ඇමතීමෙන් තොරව ඔබේ පණිවිඩ බලා ඒවාට සවන් දෙන්න. ඔබේ හඬ තැපෑලේ පිටපත් Google ගාස්තු රහිත පිටපත් කිරීමේ සේවාව මගින් සපයයි. ඔබට මෙය ඕනෑම වේලාවක සැකසීම්වලදී ක්‍රියාවිරහිත කළ හැකිය. %s</string>
+  <string name="dialer_terms_and_conditions_existing_user">ඔබේ හඬ තැපෑලේ පිටපත් දැන් Google ගාස්තු රහිත පිටපත් කිරීමේ සේවාව මගින් සපයයි. ඔබට මෙය ඕනෑම වේලාවක සැකසීම්වලදී ක්‍රියාවිරහිත කළ හැකිය. %s</string>
+  <string name="dialer_terms_and_conditions_for_verizon_1.0">හඬ තැපෑලට ඇමතීමෙන් තොරව ඔබේ හඬ තැපෑල බලා ඒවාට සවන් දෙන්න</string>
+  <string name="dialer_terms_and_conditions_learn_more">තව දැන ගන්න</string>
+  <string name="dialer_terms_and_conditions_existing_user_ack">හරි, තේරුණා</string>
+  <string name="dialer_terms_and_conditions_existing_user_decline">එපා ස්තුතියි</string>
+  <string name="terms_and_conditions_decline_dialog_title">දෘශ්‍ය හඬ තැපෑල අබල කරන්න</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_message">නියම සහ කොන්දේසි ප්‍රතික්ෂේප කර ඇති නම් දෘශ්‍ය හඬ තැපෑල අබල කරනු ඇත.</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_downgrade">අබල කරන්න</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_message">ඔබ දෘශ්‍ය හඬ තැපෑල ක්‍රියාවිරහිත කළහොත් දෘශ්‍ය හඬ තැපෑල අබල වනු ඇත.</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_downgrade">අබල කරන්න</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message">හඩ තැපෑල *86 වෙත ඇමතීමෙන් පමණක් ලබා ගත හැකිය. ඉදිරියට යාමට නව හඩ තැපැල් PIN එකක් පිහිටුවන්න.</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin">PIN අංකය සකසන්න</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/error/res/values-sk/strings.xml b/java/com/android/dialer/voicemail/listui/error/res/values-sk/strings.xml
new file mode 100644
index 0000000..a64bad9
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/error/res/values-sk/strings.xml
@@ -0,0 +1,102 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_error_activating_title">Aktivuje sa vizuálna hlasová schránka</string>
+  <string name="voicemail_error_activating_message">Kým nebude vizuálna hlasová schránka úplne aktivovaná, pravdepodobne nebudete dostávať upozornenia hlasovej schránky. Kým nebude hlasová schránka úplne aktivovaná, nové správy si môžete načítať zavolaním do hlasovej schránky.</string>
+  <string name="voicemail_error_not_activate_no_signal_title">Vizuálna hlasová schránka sa nedá aktivovať</string>
+  <string name="voicemail_error_not_activate_no_signal_message">Skontrolujte, či má telefón pripojenie k mobilnej sieti, a skúste to znova.</string>
+  <string name="voicemail_error_not_activate_no_signal_airplane_mode_message">Vypnite režim v lietadle a skúste to znova.</string>
+  <string name="voicemail_error_no_signal_title">Bez pripojenia</string>
+  <string name="voicemail_error_no_signal_message">Nedostanete upozornenia na nové hlasové správy. Ak používate Wi‑Fi, hlasovú schránku môžete skontrolovať synchronizáciou.</string>
+  <string name="voicemail_error_no_signal_airplane_mode_message">Nedostanete upozornenia na nové hlasové správy. Vypnite režim v lietadle a synchronizujte hlasovú schránku.</string>
+  <string name="voicemail_error_no_signal_cellular_required_message">Ak má prebehnúť kontrola hlasovej schránky, telefón potrebuje mobilné dátové pripojenie.</string>
+  <string name="voicemail_error_activation_failed_title">Vizuálna hlasová schránka sa nedá aktivovať</string>
+  <string name="voicemail_error_activation_failed_message">Hlasovú schránku si stále môžete skontrolovať zavolaním.</string>
+  <string name="voicemail_error_no_data_title">Vizuálna hlasová schránka sa nedá aktualizovať</string>
+  <string name="voicemail_error_no_data_message">Skúste to znova, keď budete mať lepšie pripojenie cez Wi‑Fi alebo lepšie mobilné dátové pripojenie. Hlasovú schránku si stále môžete skontrolovať zavolaním.</string>
+  <string name="voicemail_error_no_data_cellular_required_message">Skúste to znova, keď budete mať lepšie mobilné dátové pripojenie. Hlasovú schránku si stále môžete skontrolovať zavolaním.</string>
+  <string name="voicemail_error_bad_config_title">Vizuálna hlasová schránka sa nedá aktualizovať</string>
+  <string name="voicemail_error_bad_config_message">Hlasovú schránku si stále môžete skontrolovať zavolaním.</string>
+  <string name="voicemail_error_communication_title">Vizuálna hlasová schránka sa nedá aktualizovať</string>
+  <string name="voicemail_error_communication_message">Hlasovú schránku si stále môžete skontrolovať zavolaním.</string>
+  <string name="voicemail_error_server_connection_title">Vizuálna hlasová schránka sa nedá aktualizovať</string>
+  <string name="voicemail_error_server_connection_message">Hlasovú schránku si stále môžete skontrolovať zavolaním.</string>
+  <string name="voicemail_error_server_title">Vizuálna hlasová schránka sa nedá aktualizovať</string>
+  <string name="voicemail_error_server_message">Hlasovú schránku si stále môžete skontrolovať zavolaním.</string>
+  <string name="voicemail_error_inbox_near_full_title">Doručená pošta je takmer plná</string>
+  <string name="voicemail_error_inbox_near_full_message">S plnou doručenou poštou nebudete môcť prijímať nové hlasové správy.</string>
+  <string name="voicemail_error_inbox_full_title">Nemôžete prijímať nové hlasové správy</string>
+  <string name="voicemail_error_inbox_full_message">Máte plnú doručenú poštu. Skúste odstrániť niekoľko správ, aby ste mohli prijať novú hlasovú správu.</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_title">Zapnite si ďalšie úložisko a zálohovanie</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_message">Poštovú schránku máte plnú. Ak chcete uvoľniť miesto, zapnite si ďalšie úložisko, aby mohol Google spravovať a zálohovať vaše hlasové správy.</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_title">Zapnite si ďalšie úložisko a zálohovanie</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_message">Poštovú schránku máte takmer plnú. Ak chcete uvoľniť miesto, zapnite si ďalšie úložisko, aby mohol Google spravovať a zálohovať vaše hlasové správy.</string>
+  <string name="voicemail_error_pin_not_set_title">Nastavte si kód PIN hlasovej schránky</string>
+  <string name="voicemail_error_pin_not_set_message">Kód PIN hlasovej schránky budete potrebovať vždy, keď zavoláte do svojej hlasovej schránky.</string>
+  <string name="voicemail_action_turn_off_airplane_mode">Nastavenia režimu v lietadle</string>
+  <string name="voicemail_action_set_pin">Nastavenie kódu PIN</string>
+  <string name="voicemail_action_retry">Skúsiť znova</string>
+  <string name="voicemail_action_turn_archive_on">Zapnúť</string>
+  <string name="voicemail_action_dimiss">Nie, ďakujem</string>
+  <string name="voicemail_action_sync">Synchronizovať</string>
+  <string name="voicemail_action_call_voicemail">Volať do hlasovej schránky</string>
+  <string name="voicemail_action_call_customer_support">Volať zákaznícku podporu</string>
+  <string name="vvm3_error_vms_dns_failure_title">Vyskytol sa problém</string>
+  <string name="vvm3_error_vms_dns_failure_message">Ľutujeme, vyskytol sa problém. Skúste to znova neskôr. Ak bude problém pretrvávať, obráťte sa na služby zákazníkom na čísle %1$s a oznámte kód chyby 9001.</string>
+  <string name="vvm3_error_vmg_dns_failure_title">Vyskytol sa problém</string>
+  <string name="vvm3_error_vmg_dns_failure_message">Ľutujeme, vyskytol sa problém. Skúste to znova neskôr. Ak bude problém pretrvávať, obráťte sa na služby zákazníkom na čísle %1$s a oznámte kód chyby 9002.</string>
+  <string name="vvm3_error_spg_dns_failure_title">Vyskytol sa problém</string>
+  <string name="vvm3_error_spg_dns_failure_message">Ľutujeme, vyskytol sa problém. Skúste to znova neskôr. Ak bude problém pretrvávať, obráťte sa na služby zákazníkom na čísle %1$s a oznámte kód chyby 9003.</string>
+  <string name="vvm3_error_vms_no_cellular_title">Nedá sa pripojiť k vašej hlasovej poštovej schránke</string>
+  <string name="vvm3_error_vms_no_cellular_message">Ľutujeme, máme problémy s pripojením k vašej hlasovej poštovej schránke. Ak sa nachádzate v oblasti so slabým signálom, počkajte, kým nebudete mať silný signál, a skúste to znova. Ak bude problém pretrvávať, obráťte sa na služby zákazníkom na čísle %1$s a oznámte kód chyby 9004.</string>
+  <string name="vvm3_error_vmg_no_cellular_title">Nedá sa pripojiť k vašej hlasovej poštovej schránke</string>
+  <string name="vvm3_error_vmg_no_cellular_message">Ľutujeme, máme problémy s pripojením k vašej hlasovej poštovej schránke. Ak sa nachádzate v oblasti so slabým signálom, počkajte, kým nebudete mať silný signál, a skúste to znova. Ak bude problém pretrvávať, obráťte sa na služby zákazníkom na čísle %1$s a oznámte kód chyby 9005.</string>
+  <string name="vvm3_error_spg_no_cellular_title">Nedá sa pripojiť k vašej hlasovej poštovej schránke</string>
+  <string name="vvm3_error_spg_no_cellular_message">Ľutujeme, máme problémy s pripojením k vašej hlasovej poštovej schránke. Ak sa nachádzate v oblasti so slabým signálom, počkajte, kým nebudete mať silný signál, a skúste to znova. Ak bude problém pretrvávať, obráťte sa na služby zákazníkom na čísle %1$s a oznámte kód chyby 9006.</string>
+  <string name="vvm3_error_vms_timeout_title">Vyskytol sa problém</string>
+  <string name="vvm3_error_vms_timeout_message">Ľutujeme, vyskytol sa problém. Skúste to znova neskôr. Ak bude problém pretrvávať, obráťte sa na služby zákazníkom na čísle %1$s a oznámte kód chyby 9007.</string>
+  <string name="vvm3_error_vmg_timeout_title">Vyskytol sa problém</string>
+  <string name="vvm3_error_vmg_timeout_message">Ľutujeme, vyskytol sa problém. Skúste to znova neskôr. Ak bude problém pretrvávať, obráťte sa na služby zákazníkom na čísle %1$s a oznámte kód chyby 9008.</string>
+  <string name="vvm3_error_status_sms_timeout_title">Vyskytol sa problém</string>
+  <string name="vvm3_error_status_sms_timeout_message">Ľutujeme, máme problémy s nastavením vašej služby. Skúste to znova neskôr. Ak bude problém pretrvávať, obráťte sa na služby zákazníkom na čísle %1$s a oznámte kód chyby 9009.</string>
+  <string name="vvm3_error_subscriber_blocked_title">Nedá sa pripojiť k vašej hlasovej poštovej schránke</string>
+  <string name="vvm3_error_subscriber_blocked_message">Ľutujeme, momentálne sa nemôžeme pripojiť k vašej hlasovej poštovej schránke. Skúste to znova neskôr. Ak bude problém pretrvávať, obráťte sa na služby zákazníkom na čísle %1$s a oznámte kód chyby 9990.</string>
+  <string name="vvm3_error_unknown_user_title">Nastavenie hlasovej schránky</string>
+  <string name="vvm3_error_unknown_user_message">Váš účet nemá nastavenú hlasovú schránku. Obráťte sa na služby zákazníkom na čísle %1$s a oznámte kód chyby 9991.</string>
+  <string name="vvm3_error_unknown_device_title">Hlasová schránka</string>
+  <string name="vvm3_error_unknown_device_message">V tomto zariadení sa nedá používať vizuálna hlasová schránka. Obráťte sa na služby zákazníkom na čísle %1$s a oznámte kód chyby 9992.</string>
+  <string name="vvm3_error_invalid_password_title">Vyskytol sa problém</string>
+  <string name="vvm3_error_invalid_password_message">Obráťte sa na služby zákazníkom na čísle %1$s a oznámte kód chyby 9993.</string>
+  <string name="vvm3_error_mailbox_not_initialized_title">Vizuálna hlasová schránka</string>
+  <string name="vvm3_error_mailbox_not_initialized_message">Ak chcete dokončiť nastavenie vizuálnej hlasovej schránky, obráťte sa na služby zákazníkom na čísle %1$s a oznámte kód chyby 9994.</string>
+  <string name="vvm3_error_service_not_provisioned_title">Vizuálna hlasová schránka</string>
+  <string name="vvm3_error_service_not_provisioned_message">Ak chcete dokončiť nastavenie vizuálnej hlasovej schránky, obráťte sa na služby zákazníkom na čísle %1$s a oznámte kód chyby 9995.</string>
+  <string name="vvm3_error_service_not_activated_title">Vizuálna hlasová schránka</string>
+  <string name="vvm3_error_service_not_activated_message">Ak chcete aktivovať vizuálnu hlasovú schránku, obráťte sa na služby zákazníkom na čísle %1$s a oznámte kód chyby 9996.</string>
+  <string name="vvm3_error_user_blocked_title">Vyskytol sa problém</string>
+  <string name="vvm3_error_user_blocked_message">Ak chcete dokončiť nastavenie vizuálnej hlasovej schránky, obráťte sa na služby zákazníkom na čísle %1$s a oznámte kód chyby 9998.</string>
+  <string name="vvm3_error_subscriber_unknown_title">Vizuálna hlasová schránka je deaktivovaná</string>
+  <string name="vvm3_error_subscriber_unknown_message">Obráťte sa na služby zákazníkom na čísle %1$s a požiadajte o aktiváciu vizuálnej hlasovej schránky.</string>
+  <string name="vvm3_error_imap_getquota_error_title">Vyskytol sa problém</string>
+  <string name="vvm3_error_imap_getquota_error_message">Obráťte sa na služby zákazníkom na čísle %1$s a oznámte kód chyby 9997.</string>
+  <string name="vvm3_error_imap_select_error_title">Vyskytol sa problém</string>
+  <string name="vvm3_error_imap_select_error_message">Obráťte sa na služby zákazníkom na čísle %1$s a oznámte kód chyby 9989.</string>
+  <string name="vvm3_error_imap_error_title">Vyskytol sa problém</string>
+  <string name="vvm3_error_imap_error_message">Obráťte sa na služby zákazníkom na čísle %1$s a oznámte kód chyby 9999.</string>
+  <string name="verizon_terms_and_conditions_title">Zapnutie vizuálnej hlasovej schránky</string>
+  <string name="verizon_terms_and_conditions_message">%1$s Zapnutím vizuálnej hlasovej schránky súhlasíte so zmluvnými podmienkami spoločnosti Verizon Wireless:\n\n%2$s</string>
+  <string name="dialer_terms_and_conditions_title">Zapnutie vizuálnej hlasovej schránky</string>
+  <string name="dialer_terms_and_conditions_existing_user_title">Novinka! Svoju hlasovú správu si môžete prečítať.</string>
+  <string name="dialer_terms_and_conditions_message">%s</string>
+  <string name="dialer_terms_and_conditions_1.0">Zobrazte a vypočujte si správy bez toho, aby ste museli zavolať do hlasovej schránky. Prepisy vašich hlasových správ poskytuje bezplatná prepisovacia služba Googlu. Tieto funkcie môžete kedykoľvek vypnúť v nastaveniach. %s</string>
+  <string name="dialer_terms_and_conditions_existing_user">Bezplatná prepisovacia služba Googlu teraz poskytuje prepisy vašich hlasových správ. Kedykoľvek ich môžete vypnúť v nastaveniach. %s</string>
+  <string name="dialer_terms_and_conditions_for_verizon_1.0">Zobrazte a vypočujte si správy bez toho, aby ste museli zavolať do hlasovej schránky.</string>
+  <string name="dialer_terms_and_conditions_learn_more">Ďalšie informácie</string>
+  <string name="dialer_terms_and_conditions_existing_user_ack">OK, dobre</string>
+  <string name="dialer_terms_and_conditions_existing_user_decline">Nie, ďakujem</string>
+  <string name="terms_and_conditions_decline_dialog_title">Chcete deaktivovať vizuálnu hlasovú schránku?</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_message">V prípade odmietnutia zmluvných podmienok bude vizuálna hlasová schránka deaktivovaná.</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_downgrade">Deaktivovať</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_message">Ak vizuálnu hlasovú schránku vypnete, bude deaktivovaná.</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_downgrade">Deaktivovať</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message">Hlasová schránka bude k dispozícii len po zavolaní na číslo *86. Ak chcete pokračovať, nastavte nový kód PIN hlasovej schránky.</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin">Nastavenie kódu PIN</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/error/res/values-sl/strings.xml b/java/com/android/dialer/voicemail/listui/error/res/values-sl/strings.xml
new file mode 100644
index 0000000..463001a
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/error/res/values-sl/strings.xml
@@ -0,0 +1,102 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_error_activating_title">Aktiviranje vizualnih sporočil v odzivniku</string>
+  <string name="voicemail_error_activating_message">Dokler niso vizualna sporočila v odzivniku v celoti aktivirana, morda ne boste prejemali obvestil o sporočilih v odzivniku. Pokličite odzivnik, da prenesete nova sporočila, dokler niso sporočila v odzivniku v celoti aktivirana.</string>
+  <string name="voicemail_error_not_activate_no_signal_title">Vizualnih sporočil v odzivniku ni mogoče aktivirati</string>
+  <string name="voicemail_error_not_activate_no_signal_message">Preverite, ali je v telefonu vzpostavljena povezava z mobilnim omrežjem, in poskusite znova.</string>
+  <string name="voicemail_error_not_activate_no_signal_airplane_mode_message">Izklopite način za letalo in poskusite znova.</string>
+  <string name="voicemail_error_no_signal_title">Ni povezave</string>
+  <string name="voicemail_error_no_signal_message">Obvestil o novih sporočilih v odzivniku ne boste prejemali. Če ste v omrežju Wi-Fi, lahko zdaj zaženete sinhronizacijo in preverite, ali ste prejeli sporočila v odzivniku.</string>
+  <string name="voicemail_error_no_signal_airplane_mode_message">Obvestil o novih sporočilih v odzivniku ne boste prejemali. Če želite sinhronizirati sporočila v odzivniku, izklopite način za letalo.</string>
+  <string name="voicemail_error_no_signal_cellular_required_message">Če želite preveriti sporočila v odzivniku, je treba v telefonu vzpostaviti povezavo za prenos podatkov v mobilnem omrežju.</string>
+  <string name="voicemail_error_activation_failed_title">Vizualnih sporočil v odzivniku ni mogoče aktivirati</string>
+  <string name="voicemail_error_activation_failed_message">Sporočila v odzivniku lahko še vedno preverite tako, da pokličete.</string>
+  <string name="voicemail_error_no_data_title">Vizualnih sporočil v odzivniku ni mogoče posodobiti</string>
+  <string name="voicemail_error_no_data_message">Poskusite znova, ko bo povezava z omrežjem Wi-Fi ali povezava za prenos podatkov v mobilnem omrežju boljša. Sporočila v odzivniku lahko še vedno preverite tako, da pokličete.</string>
+  <string name="voicemail_error_no_data_cellular_required_message">Poskusite znova, ko bo povezava za prenos podatkov v mobilnem omrežju boljša. Sporočila v odzivniku lahko še vedno preverite tako, da pokličete.</string>
+  <string name="voicemail_error_bad_config_title">Vizualnih sporočil v odzivniku ni mogoče posodobiti</string>
+  <string name="voicemail_error_bad_config_message">Sporočila v odzivniku lahko še vedno preverite tako, da pokličete.</string>
+  <string name="voicemail_error_communication_title">Vizualnih sporočil v odzivniku ni mogoče posodobiti</string>
+  <string name="voicemail_error_communication_message">Sporočila v odzivniku lahko še vedno preverite tako, da pokličete.</string>
+  <string name="voicemail_error_server_connection_title">Vizualnih sporočil v odzivniku ni mogoče posodobiti</string>
+  <string name="voicemail_error_server_connection_message">Sporočila v odzivniku lahko še vedno preverite tako, da pokličete.</string>
+  <string name="voicemail_error_server_title">Vizualnih sporočil v odzivniku ni mogoče posodobiti</string>
+  <string name="voicemail_error_server_message">Sporočila v odzivniku lahko še vedno preverite tako, da pokličete.</string>
+  <string name="voicemail_error_inbox_near_full_title">Nabiralnik je skoraj poln</string>
+  <string name="voicemail_error_inbox_near_full_message">Če je nabiralnik poln, ne boste mogli prejemati novih sporočil v odzivniku.</string>
+  <string name="voicemail_error_inbox_full_title">Vizualnih sporočil v odzivniku ni mogoče prejemati</string>
+  <string name="voicemail_error_inbox_full_message">Nabiralnik je poln. Poskusite izbrisati nekaj sporočil, da bo mogoče prejeti nova sporočila v odzivniku.</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_title">Vklop dodatnega prostora za shranjevanje in varnostno kopiranje</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_message">Odzivnik je poln. Če želite sprostiti prostor, vklopite dodaten prostor za shranjevanje, da bo Google lahko upravljal vaša sporočila v odzivniku in jih varnostno kopiral.</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_title">Vklop dodatnega prostora za shranjevanje in varnostno kopiranje</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_message">Odzivnik je skoraj poln. Če želite sprostiti prostor, vklopite dodaten prostor za shranjevanje, da bo Google lahko upravljal vaša sporočila v odzivniku in jih varnostno kopiral.</string>
+  <string name="voicemail_error_pin_not_set_title">Nastavite kodo PIN za sporočila v odzivniku</string>
+  <string name="voicemail_error_pin_not_set_message">Kodo PIN za sporočila v odzivniku boste potrebovali ob vsakem klicu za dostop do sporočil v odzivniku.</string>
+  <string name="voicemail_action_turn_off_airplane_mode">Nastavi načina za letalo</string>
+  <string name="voicemail_action_set_pin">Nastavi kodo PIN</string>
+  <string name="voicemail_action_retry">Poskusi znova</string>
+  <string name="voicemail_action_turn_archive_on">Vklopi</string>
+  <string name="voicemail_action_dimiss">Ne, hvala</string>
+  <string name="voicemail_action_sync">Sinhroniziraj</string>
+  <string name="voicemail_action_call_voicemail">Pokliči odzivnik</string>
+  <string name="voicemail_action_call_customer_support">Pokliči podporo za stranke</string>
+  <string name="vvm3_error_vms_dns_failure_title">Prišlo je do napake</string>
+  <string name="vvm3_error_vms_dns_failure_message">Žal je prišlo do težave. Poskusite znova pozneje. Če se težava ponovi, se obrnite na podporo za stranke na številki %1$s in jim sporočite to kodo napake: 9001.</string>
+  <string name="vvm3_error_vmg_dns_failure_title">Prišlo je do napake</string>
+  <string name="vvm3_error_vmg_dns_failure_message">Žal je prišlo do težave. Poskusite znova pozneje. Če se težava ponovi, se obrnite na podporo za stranke na številki %1$s in jim sporočite to kodo napake: 9002.</string>
+  <string name="vvm3_error_spg_dns_failure_title">Prišlo je do napake</string>
+  <string name="vvm3_error_spg_dns_failure_message">Žal je prišlo do težave. Poskusite znova pozneje. Če se težava ponovi, se obrnite na podporo za stranke na številki %1$s in jim sporočite to kodo napake: 9003.</string>
+  <string name="vvm3_error_vms_no_cellular_title">Povezave z odzivnikom ni mogoče vzpostaviti</string>
+  <string name="vvm3_error_vms_no_cellular_message">Žal je prišlo do težav pri vzpostavljanju povezave z odzivnikom. Če ste na območju s slabim signalom, počakajte, da bo signal močnejši, in nato poskusite znova. Če se težava ponovi, se obrnite na podporo za stranke na številki %1$s in jim sporočite to kodo napake: 9004.</string>
+  <string name="vvm3_error_vmg_no_cellular_title">Povezave z odzivnikom ni mogoče vzpostaviti</string>
+  <string name="vvm3_error_vmg_no_cellular_message">Žal je prišlo do težav pri vzpostavljanju povezave z odzivnikom. Če ste na območju s slabim signalom, počakajte, da bo signal močnejši, in nato poskusite znova. Če se težava ponovi, se obrnite na podporo za stranke na številki %1$s in jim sporočite to kodo napake: 9005.</string>
+  <string name="vvm3_error_spg_no_cellular_title">Povezave z odzivnikom ni mogoče vzpostaviti</string>
+  <string name="vvm3_error_spg_no_cellular_message">Žal je prišlo do težav pri vzpostavljanju povezave z odzivnikom. Če ste na območju s slabim signalom, počakajte, da bo signal močnejši, in nato poskusite znova. Če se težava ponovi, se obrnite na podporo za stranke na številki %1$s in jim sporočite to kodo napake: 9006.</string>
+  <string name="vvm3_error_vms_timeout_title">Prišlo je do napake</string>
+  <string name="vvm3_error_vms_timeout_message">Žal je prišlo do težave. Poskusite znova pozneje. Če se težava ponovi, se obrnite na podporo za stranke na številki %1$s in jim sporočite to kodo napake: 9007.</string>
+  <string name="vvm3_error_vmg_timeout_title">Prišlo je do napake</string>
+  <string name="vvm3_error_vmg_timeout_message">Žal je prišlo do težave. Poskusite znova pozneje. Če se težava ponovi, se obrnite na podporo za stranke na številki %1$s in jim sporočite to kodo napake: 9008.</string>
+  <string name="vvm3_error_status_sms_timeout_title">Prišlo je do napake</string>
+  <string name="vvm3_error_status_sms_timeout_message">Žal je prišlo do težave pri nastavitvi storitve. Poskusite znova pozneje. Če se težava ponovi, se obrnite na podporo za stranke na številki %1$s in jim sporočite to kodo napake: 9009.</string>
+  <string name="vvm3_error_subscriber_blocked_title">Povezave z odzivnikom ni mogoče vzpostaviti</string>
+  <string name="vvm3_error_subscriber_blocked_message">Žal trenutno ne moremo vzpostaviti povezave z vašim odzivnikom. Poskusite znova pozneje. Če se težava ponovi, se obrnite na podporo za stranke na številki %1$s in jim sporočite to kodo napake: 9990.</string>
+  <string name="vvm3_error_unknown_user_title">Nastavitev sporočil v odzivniku</string>
+  <string name="vvm3_error_unknown_user_message">Odzivnik ni nastavljen za vaš račun. Obrnite se na podporo za stranke na številki %1$s in jim sporočite to kodo napake: 9991.</string>
+  <string name="vvm3_error_unknown_device_title">Sporočila v odzivniku</string>
+  <string name="vvm3_error_unknown_device_message">V tej napravi ni mogoče uporabljati vizualnih sporočil v odzivniku. Obrnite se na podporo za stranke na številki %1$s in jim sporočite to kodo napake: 9992.</string>
+  <string name="vvm3_error_invalid_password_title">Prišlo je do napake</string>
+  <string name="vvm3_error_invalid_password_message">Obrnite se na podporo za stranke na številki %1$s in jim sporočite to kodo napake: 9993.</string>
+  <string name="vvm3_error_mailbox_not_initialized_title">Vizualna sporočila v odzivniku</string>
+  <string name="vvm3_error_mailbox_not_initialized_message">Če želite dokončati nastavitev vizualnih sporočil v odzivniku, se obrnite na podporo za stranke na številki %1$s in jim sporočite to kodo napake: 9994.</string>
+  <string name="vvm3_error_service_not_provisioned_title">Vizualna sporočila v odzivniku</string>
+  <string name="vvm3_error_service_not_provisioned_message">Če želite dokončati nastavitev vizualnih sporočil v odzivniku, se obrnite na podporo za stranke na številki %1$s in jim sporočite to kodo napake: 9995.</string>
+  <string name="vvm3_error_service_not_activated_title">Vizualna sporočila v odzivniku</string>
+  <string name="vvm3_error_service_not_activated_message">Če želite aktivirati vizualna sporočila v odzivniku, se obrnite na podporo za stranke na številki %1$s in jim sporočite to kodo napake: 9996.</string>
+  <string name="vvm3_error_user_blocked_title">Prišlo je do napake</string>
+  <string name="vvm3_error_user_blocked_message">Če želite dokončati nastavitev vizualnih sporočil v odzivniku, se obrnite na podporo za stranke na številki %1$s in jim sporočite to kodo napake: 9998.</string>
+  <string name="vvm3_error_subscriber_unknown_title">Vizualna sporočila v odzivniku so onemogočena</string>
+  <string name="vvm3_error_subscriber_unknown_message">Če želite aktivirati vizualna sporočila v odzivniku, se obrnite na podporo za stranke na številki %1$s.</string>
+  <string name="vvm3_error_imap_getquota_error_title">Prišlo je do napake</string>
+  <string name="vvm3_error_imap_getquota_error_message">Obrnite se na podporo za stranke na številki %1$s in jim sporočite to kodo napake: 9997.</string>
+  <string name="vvm3_error_imap_select_error_title">Prišlo je do napake</string>
+  <string name="vvm3_error_imap_select_error_message">Obrnite se na podporo za stranke na številki %1$s in jim sporočite to kodo napake: 9989.</string>
+  <string name="vvm3_error_imap_error_title">Prišlo je do napake</string>
+  <string name="vvm3_error_imap_error_message">Obrnite se na podporo za stranke na številki %1$s in jim sporočite to kodo napake: 9999.</string>
+  <string name="verizon_terms_and_conditions_title">Vklop vizualnih sporočil v odzivniku</string>
+  <string name="verizon_terms_and_conditions_message">%1$s Če vklopite vizualna sporočila v odzivniku, se strinjate z določili in pogoji za Verizon Wireless:\n\n%2$s</string>
+  <string name="dialer_terms_and_conditions_title">Vklop vizualnih sporočil v odzivniku</string>
+  <string name="dialer_terms_and_conditions_existing_user_title">Novo. Branje sporočil v odzivniku.</string>
+  <string name="dialer_terms_and_conditions_message">%s</string>
+  <string name="dialer_terms_and_conditions_1.0">Oglejte si sporočila in jih poslušajte, ne da bi vam bilo treba klicati odzivnik. Prepise sporočil v odzivniku zagotavlja Googlova brezplačna storitev za prepise. Obe možnosti lahko kadar koli izklopite v nastavitvah. %s</string>
+  <string name="dialer_terms_and_conditions_existing_user">Prepise sporočil v odzivniku zdaj zagotavlja Googlova brezplačna storitev za prepise. To možnost lahko kadar koli izklopite v nastavitvah. %s</string>
+  <string name="dialer_terms_and_conditions_for_verizon_1.0">Ogledujte si in poslušajte sporočila, ne da bi vam bilo treba klicati odzivnik.</string>
+  <string name="dialer_terms_and_conditions_learn_more">Več o tem</string>
+  <string name="dialer_terms_and_conditions_existing_user_ack">V redu, razumem</string>
+  <string name="dialer_terms_and_conditions_existing_user_decline">Ne, hvala</string>
+  <string name="terms_and_conditions_decline_dialog_title">Želite onemogočiti vizualna sporočila v odzivniku?</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_message">Če zavrnete določila in pogoje, bodo vizualna sporočila v odzivniku onemogočena.</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_downgrade">Onemogoči</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_message">Če izklopite vizualna sporočila v odzivniku, bodo onemogočena.</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_downgrade">Onemogoči</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message">Sporočila v odzivniku so na voljo samo tako, da pokličete *86. Če želite nadaljevati, nastavite novo kodo PIN za sporočila v odzivniku.</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin">Nastavi kodo PIN</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/error/res/values-sq/strings.xml b/java/com/android/dialer/voicemail/listui/error/res/values-sq/strings.xml
new file mode 100644
index 0000000..ce8b300
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/error/res/values-sq/strings.xml
@@ -0,0 +1,102 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_error_activating_title">Po aktivizon postën zanore vizuale</string>
+  <string name="voicemail_error_activating_message">Mund të mos marrësh njoftime të postës zanore derisa posta zanore vizuale të aktivizohet plotësisht. Merr në telefon te posta zanore për të marrë mesazhet e reja derisa posta zanore të aktivizohet plotësisht.</string>
+  <string name="voicemail_error_not_activate_no_signal_title">Posta zanore vizuale nuk mund të aktivizohet</string>
+  <string name="voicemail_error_not_activate_no_signal_message">Sigurohu që telefoni yt të ketë një lidhje rrjeti celular dhe provo përsëri.</string>
+  <string name="voicemail_error_not_activate_no_signal_airplane_mode_message">Çaktivizo modalitetin e aeroplanit dhe provo përsëri.</string>
+  <string name="voicemail_error_no_signal_title">Nuk ka lidhje</string>
+  <string name="voicemail_error_no_signal_message">Nuk do të njoftohesh për postat e reja zanore. Nëse je në rrjetin Wi-Fi, mund të kontrollosh për postën zanore duke e sinkronizuar tani.</string>
+  <string name="voicemail_error_no_signal_airplane_mode_message">Nuk do të njoftohesh për postë zanore të re. Çaktivizo modalitetin në aeroplan për të sinkronizuar postën zanore.</string>
+  <string name="voicemail_error_no_signal_cellular_required_message">Telefoni yt ka nevojë për një lidhje të të dhënave celulare për të kontrolluar postën zanore.</string>
+  <string name="voicemail_error_activation_failed_title">Posta zanore vizuale nuk mund të aktivizohet</string>
+  <string name="voicemail_error_activation_failed_message">Mund të telefonosh përsëri për të kontrolluar postën zanore.</string>
+  <string name="voicemail_error_no_data_title">Posta zanore vizuale nuk mund të përditësohet</string>
+  <string name="voicemail_error_no_data_message">Provo përsëri kur lidhja Wi-Fi ose e të dhënave celulare të jetë më e mirë. Mund të telefonosh përsëri për të kontrolluar postën zanore.</string>
+  <string name="voicemail_error_no_data_cellular_required_message">Provo përsëri kur lidhja e të dhënave celulare të jetë më e mirë. Mund të telefonosh përsëri për të kontrolluar postën zanore.</string>
+  <string name="voicemail_error_bad_config_title">Posta zanore vizuale nuk mund të përditësohet</string>
+  <string name="voicemail_error_bad_config_message">Mund të telefonosh përsëri për të kontrolluar postën zanore.</string>
+  <string name="voicemail_error_communication_title">Posta zanore vizuale nuk mund të përditësohet</string>
+  <string name="voicemail_error_communication_message">Mund të telefonosh përsëri për të kontrolluar postën zanore.</string>
+  <string name="voicemail_error_server_connection_title">Posta zanore vizuale nuk mund të përditësohet</string>
+  <string name="voicemail_error_server_connection_message">Mund të telefonosh përsëri për të kontrolluar postën zanore.</string>
+  <string name="voicemail_error_server_title">Posta zanore vizuale nuk mund të përditësohet</string>
+  <string name="voicemail_error_server_message">Mund të telefonosh përsëri për të kontrolluar postën zanore.</string>
+  <string name="voicemail_error_inbox_near_full_title">Kutia hyrëse është pothuajse plot</string>
+  <string name="voicemail_error_inbox_near_full_message">Nuk do të mund të marrësh postë zanore të re nëse kutia hyrëse është plot.</string>
+  <string name="voicemail_error_inbox_full_title">Posta zanore e re nuk mund të merret</string>
+  <string name="voicemail_error_inbox_full_message">Kutia hyrëse është plot. Provo të fshish disa mesazhe për të marrë postë zanore të re.</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_title">Aktivizo hapësirën ruajtëse shtesë dhe rezervimin</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_message">Kutia jote postare është plot. Për të liruar hapësirën, aktivizo hapësirën ruajtëse shtesë që Google të mund të menaxhojë dhe të rezervojë mesazhet e tua të postës zanore.</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_title">Aktivizo hapësirën ruajtëse shtesë dhe rezervimin</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_message">Kutia jote postare është thuajse plot. Për të liruar hapësirën, aktivizo hapësirën ruajtëse shtesë që Google të mund të menaxhojë dhe të rezervojë mesazhet e tua të postës zanore.</string>
+  <string name="voicemail_error_pin_not_set_title">Vendos kodin PIN të postës zanore</string>
+  <string name="voicemail_error_pin_not_set_message">Do të të duhet një kod PIN për postën zanore sa herë që telefonon për të pasur qasje te posta zanore.</string>
+  <string name="voicemail_action_turn_off_airplane_mode">Cilësimet e modalitetit në aeroplan</string>
+  <string name="voicemail_action_set_pin">Cakto kodin PIN</string>
+  <string name="voicemail_action_retry">Provo përsëri</string>
+  <string name="voicemail_action_turn_archive_on">Aktivizo</string>
+  <string name="voicemail_action_dimiss">Jo, faleminderit</string>
+  <string name="voicemail_action_sync">Sinkronizo</string>
+  <string name="voicemail_action_call_voicemail">Telefono postën zanore</string>
+  <string name="voicemail_action_call_customer_support">Telefono \"Mbështetjen e klientit\"</string>
+  <string name="vvm3_error_vms_dns_failure_title">Ndodhi një gabim</string>
+  <string name="vvm3_error_vms_dns_failure_message">Na vjen keq, por kishim një problem. Provo përsëri më vonë. Nëse ka përsëri një problem, kontakto me \"Shërbimin e klientit\" në numrin %1$s dhe tregoju se kodi i gabimit është 9001.</string>
+  <string name="vvm3_error_vmg_dns_failure_title">Ndodhi një gabim</string>
+  <string name="vvm3_error_vmg_dns_failure_message">Na vjen keq, por kishim një problem. Provo përsëri më vonë. Nëse ka përsëri një problem, kontakto me \"Shërbimin e klientit\" në numrin %1$s dhe tregoju se kodi i gabimit është 9002.</string>
+  <string name="vvm3_error_spg_dns_failure_title">Ndodhi një gabim</string>
+  <string name="vvm3_error_spg_dns_failure_message">Na vjen keq, por kishim një problem. Provo përsëri më vonë. Nëse ka përsëri një problem, kontakto me \"Shërbimin e klientit\" në numrin %1$s dhe tregoju se kodi i gabimit është 9003.</string>
+  <string name="vvm3_error_vms_no_cellular_title">Nuk mund të lidhet me kutinë postare zanore</string>
+  <string name="vvm3_error_vms_no_cellular_message">Na vjen keq, por kemi një problem me lidhjen me kutinë e postës zanore. Nëse je në një zonë me sinjal të dobët, prit derisa të kesh sinjal më të fortë dhe provo përsëri. Nëse ka përsëri një problem, kontakto me \"Shërbimin e klientit\" në numrin %1$s dhe tregoju se kodi i gabimit është 9004.</string>
+  <string name="vvm3_error_vmg_no_cellular_title">Nuk mund të lidhet me kutinë postare zanore</string>
+  <string name="vvm3_error_vmg_no_cellular_message">Na vjen keq, por kemi një problem me lidhjen me kutinë e postës zanore. Nëse je në një zonë me sinjal të dobët, prit derisa të kesh sinjal më të fortë dhe provo përsëri. Nëse ka përsëri një problem, kontakto me \"Shërbimin e klientit\" në numrin %1$s dhe tregoju se kodi i gabimit është 9005.</string>
+  <string name="vvm3_error_spg_no_cellular_title">Nuk mund të lidhet me kutinë postare zanore</string>
+  <string name="vvm3_error_spg_no_cellular_message">Na vjen keq, por kemi një problem me lidhjen me kutinë e postës zanore. Nëse je në një zonë me sinjal të dobët, prit derisa të kesh sinjal më të fortë dhe provo përsëri. Nëse ka përsëri një problem, kontakto me \"Shërbimin e klientit\" në numrin %1$s dhe tregoju se kodi i gabimit është 9006.</string>
+  <string name="vvm3_error_vms_timeout_title">Ndodhi një gabim</string>
+  <string name="vvm3_error_vms_timeout_message">Na vjen keq, por kishim një problem. Provo përsëri më vonë. Nëse ka përsëri një problem, kontakto me \"Shërbimin e klientit\" në numrin %1$s dhe tregoju se kodi i gabimit është 9007.</string>
+  <string name="vvm3_error_vmg_timeout_title">Ndodhi një gabim</string>
+  <string name="vvm3_error_vmg_timeout_message">Na vjen keq, por kishim një problem. Provo përsëri më vonë. Nëse ka përsëri një problem, kontakto me \"Shërbimin e klientit\" në numrin %1$s dhe tregoju se kodi i gabimit është 9008.</string>
+  <string name="vvm3_error_status_sms_timeout_title">Ndodhi një gabim</string>
+  <string name="vvm3_error_status_sms_timeout_message">Na vjen keq, por kishim një problem me konfigurimin e shërbimit tënd. Provo përsëri më vonë. Nëse ka përsëri një problem, kontakto me \"Shërbimin e klientit\" në numrin %1$s dhe tregoju se kodi i gabimit është 9009.</string>
+  <string name="vvm3_error_subscriber_blocked_title">Nuk mund të lidhet me kutinë postare zanore</string>
+  <string name="vvm3_error_subscriber_blocked_message">Na vjen keq, nuk mund të lidheshim me kutinë postare zanore në këtë moment. Provo përsëri më vonë. Nëse ka përsëri një problem, kontakto me \"Shërbimin e klientit\" në numrin %1$s dhe tregoju se kodi i gabimit është 9990.</string>
+  <string name="vvm3_error_unknown_user_title">Konfiguro postën zanore</string>
+  <string name="vvm3_error_unknown_user_message">Posta zanore nuk është konfiguruar në llogarinë tënde. Kontakto me \"Shërbimin e klientit\" në numrin %1$s dhe tregoju se kodi i gabimit është 9991.</string>
+  <string name="vvm3_error_unknown_device_title">Posta zanore</string>
+  <string name="vvm3_error_unknown_device_message">Posta zanore vizuale nuk mund të përdoret në këtë pajisje. Kontakto me \"Shërbimin e klientit\" në numrin %1$s dhe tregoju se kodi i gabimit është 9992.</string>
+  <string name="vvm3_error_invalid_password_title">Ndodhi një gabim</string>
+  <string name="vvm3_error_invalid_password_message">Kontakto me \"Shërbimin e klientit\" në numrin %1$s dhe tregoju se kodi i gabimit është 9993.</string>
+  <string name="vvm3_error_mailbox_not_initialized_title">Posta zanore vizuale</string>
+  <string name="vvm3_error_mailbox_not_initialized_message">Për të përfunduar konfigurimin e postës zanore vizuale, kontakto me \"Shërbimin e klientit\" në numrin %1$s dhe tregoju se kodi i gabimit është 9994.</string>
+  <string name="vvm3_error_service_not_provisioned_title">Posta zanore vizuale</string>
+  <string name="vvm3_error_service_not_provisioned_message">Për të përfunduar konfigurimin e postës zanore vizuale, kontakto me \"Shërbimin e klientit\" në numrin %1$s dhe tregoju se kodi i gabimit është 9995.</string>
+  <string name="vvm3_error_service_not_activated_title">Posta zanore vizuale</string>
+  <string name="vvm3_error_service_not_activated_message">Për të aktivizuar postën zanore vizuale, kontakto me \"Shërbimin e klientit\" në numrin %1$s dhe tregoju se kodi i gabimit është 9996.</string>
+  <string name="vvm3_error_user_blocked_title">Ndodhi një gabim</string>
+  <string name="vvm3_error_user_blocked_message">Për të përfunduar konfigurimin e postës zanore vizuale, kontakto me \"Shërbimin e klientit\" në numrin %1$s dhe tregoju se kodi i gabimit është 9998.</string>
+  <string name="vvm3_error_subscriber_unknown_title">Posta zanore vizuale u çaktivizua</string>
+  <string name="vvm3_error_subscriber_unknown_message">Kontakto me \"Shërbimin e klientit\" në numrin %1$s për të aktivizuar postën zanore vizuale.</string>
+  <string name="vvm3_error_imap_getquota_error_title">Ndodhi një gabim</string>
+  <string name="vvm3_error_imap_getquota_error_message">Kontakto me \"Shërbimin e klientit\" në numrin %1$s dhe tregoju se kodi i gabimit është 9997.</string>
+  <string name="vvm3_error_imap_select_error_title">Ndodhi një gabim</string>
+  <string name="vvm3_error_imap_select_error_message">Kontakto me \"Shërbimin e klientit\" në numrin %1$s dhe tregoju se kodi i gabimit është 9989.</string>
+  <string name="vvm3_error_imap_error_title">Ndodhi një gabim</string>
+  <string name="vvm3_error_imap_error_message">Kontakto me \"Shërbimin e klientit\" në %1$s dhe tregoju se kodi i gabimit është 9999.</string>
+  <string name="verizon_terms_and_conditions_title">Aktivizo postën zanore vizuale</string>
+  <string name="verizon_terms_and_conditions_message">%1$s Duke aktivizuar postën zanore vizuale, ti pranon kushtet e përgjithshme të Verizon Wireless:\n\n%2$s</string>
+  <string name="dialer_terms_and_conditions_title">Aktivizo postën zanore vizuale</string>
+  <string name="dialer_terms_and_conditions_existing_user_title">E re! Lexo postën tënde zanore</string>
+  <string name="dialer_terms_and_conditions_message">%s</string>
+  <string name="dialer_terms_and_conditions_1.0">Shiko dhe dëgjo mesazhet e tua, pa pasur nevojë të telefonosh postën zanore. Transkriptet e postës zanore ofrohen nga shërbimi falas i transkriptimit të Google. Mund ta çaktivizosh secilin prej tyre te \"Cilësimet\" në çdo kohë. %s</string>
+  <string name="dialer_terms_and_conditions_existing_user">Transkriptet e postës zanore tani ofrohen nga shërbimi falas i transkriptimit të Google. Këtë mund ta çaktivizosh te \"Cilësimet\" në çdo kohë. %s</string>
+  <string name="dialer_terms_and_conditions_for_verizon_1.0">Shiko dhe dëgjo mesazhet e tua, pa pasur nevojë të telefonosh postën zanore.</string>
+  <string name="dialer_terms_and_conditions_learn_more">Mëso më shumë</string>
+  <string name="dialer_terms_and_conditions_existing_user_ack">Në rregull, e kuptova</string>
+  <string name="dialer_terms_and_conditions_existing_user_decline">Jo, faleminderit</string>
+  <string name="terms_and_conditions_decline_dialog_title">Të çaktivizohet posta zanore vizuale?</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_message">Posta zanore vizuale do të çaktivizohet nëse refuzohen kushtet e përgjithshme.</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_downgrade">Çaktivizo</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_message">Posta zanore vizuale do të çaktivizohet nëse e bën joaktive postën zanore vizuale.</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_downgrade">Çaktivizo</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message">Do të mund të qasesh te posta zanore vetëm duke telefonuar në *86. Cakto një kod PIN të ri për postën zanore për të vazhduar.</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin">Cakto kodin PIN</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/error/res/values-sr/strings.xml b/java/com/android/dialer/voicemail/listui/error/res/values-sr/strings.xml
new file mode 100644
index 0000000..2986fae
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/error/res/values-sr/strings.xml
@@ -0,0 +1,102 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_error_activating_title">Активира се визуелна говорна пошта</string>
+  <string name="voicemail_error_activating_message">Можда нећете добијати обавештења о говорној пошти док потпуно не активирате визуелну говорну пошту. Позовите говорну пошту да бисте преузели нове поруке док говорна пошта не буде потпуно активирана.</string>
+  <string name="voicemail_error_not_activate_no_signal_title">Активирање визуелне говорне поште није успело</string>
+  <string name="voicemail_error_not_activate_no_signal_message">Проверите да ли телефон има везу преко мобилне мреже и пробајте поново.</string>
+  <string name="voicemail_error_not_activate_no_signal_airplane_mode_message">Искључите режим рада у авиону и пробајте поново.</string>
+  <string name="voicemail_error_no_signal_title">Веза није успостављена</string>
+  <string name="voicemail_error_no_signal_message">Нећете добијати обавештења о новим говорним порукама. Ако сте на Wi‑Fi мрежи, можете да синхронизујете да бисте проверили говорну пошту.</string>
+  <string name="voicemail_error_no_signal_airplane_mode_message">Нећете добијати обавештења о новим говорним порукама. Искључите режим рада у авиону да бисте синхронизовали говорну пошту.</string>
+  <string name="voicemail_error_no_signal_cellular_required_message">Телефону је за проверу говорне поште потребна веза за пренос података преко мобилног оператера.</string>
+  <string name="voicemail_error_activation_failed_title">Активирање визуелне говорне поште није успело</string>
+  <string name="voicemail_error_activation_failed_message">И даље можете да позовете говорну пошту да бисте је проверили.</string>
+  <string name="voicemail_error_no_data_title">Ажурирање визуелне говорне поште није успело</string>
+  <string name="voicemail_error_no_data_message">Пробајте поново кад будете имали бољу Wi‑Fi или везу за пренос података преко мобилног оператера. И даље можете да позовете говорну пошту да бисте је проверили.</string>
+  <string name="voicemail_error_no_data_cellular_required_message">Пробајте поново кад будете имали бољу везу за пренос података преко мобилног оператера. И даље можете да позовете говорну пошту да бисте је проверили.</string>
+  <string name="voicemail_error_bad_config_title">Ажурирање визуелне говорне поште није успело</string>
+  <string name="voicemail_error_bad_config_message">И даље можете да позовете говорну пошту да бисте је проверили.</string>
+  <string name="voicemail_error_communication_title">Ажурирање визуелне говорне поште није успело</string>
+  <string name="voicemail_error_communication_message">И даље можете да позовете говорну пошту да бисте је проверили.</string>
+  <string name="voicemail_error_server_connection_title">Ажурирање визуелне говорне поште није успело</string>
+  <string name="voicemail_error_server_connection_message">И даље можете да позовете говорну пошту да бисте је проверили.</string>
+  <string name="voicemail_error_server_title">Ажурирање визуелне говорне поште није успело</string>
+  <string name="voicemail_error_server_message">И даље можете да позовете говорну пошту да бисте је проверили.</string>
+  <string name="voicemail_error_inbox_near_full_title">Пријемно сандуче је скоро пуно</string>
+  <string name="voicemail_error_inbox_near_full_message">Нећете моћи да примате нову говорну пошту ако је пријемно сандуче пуно.</string>
+  <string name="voicemail_error_inbox_full_title">Не можете да примате нове говорне поруке</string>
+  <string name="voicemail_error_inbox_full_message">Пријемно сандуче је пуно. Избришите неке поруке да бисте примили нову говорну пошту.</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_title">Укључите додатни меморијски простор и резервне копије</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_message">Поштанско сандуче је пуно. Да бисте ослободили простор, укључите додатни меморијски простор, па ће Google моћи да управља вашим говорним порукама и прави њихове резервне копије.</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_title">Укључите додатни меморијски простор и резервне копије</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_message">Поштанско сандуче је скоро пуно. Да бисте ослободили простор, укључите додатни меморијски простор, па ће Google моћи да управља вашим говорним порукама и прави њихове резервне копије.</string>
+  <string name="voicemail_error_pin_not_set_title">Подесите PIN кôд говорне поште</string>
+  <string name="voicemail_error_pin_not_set_message">PIN кôд говорне поште вам треба сваки пут кад упућујете позив да бисте приступили говорној пошти.</string>
+  <string name="voicemail_action_turn_off_airplane_mode">Подешавања режима рада у авиону</string>
+  <string name="voicemail_action_set_pin">Подеси PIN</string>
+  <string name="voicemail_action_retry">Пробај поново</string>
+  <string name="voicemail_action_turn_archive_on">Укључи</string>
+  <string name="voicemail_action_dimiss">Не, хвала</string>
+  <string name="voicemail_action_sync">Синхронизуј</string>
+  <string name="voicemail_action_call_voicemail">Позови говорну пошту</string>
+  <string name="voicemail_action_call_customer_support">Позови корисничку подршку</string>
+  <string name="vvm3_error_vms_dns_failure_title">Нешто није у реду</string>
+  <string name="vvm3_error_vms_dns_failure_message">Жао нам је, наишли смо на проблем. Пробајте поново касније. Ако и даље буде проблема, контактирајте корисничку подршку на %1$s и реците им да је кôд грешке 9001.</string>
+  <string name="vvm3_error_vmg_dns_failure_title">Нешто није у реду</string>
+  <string name="vvm3_error_vmg_dns_failure_message">Жао нам је, наишли смо на проблем. Пробајте поново касније. Ако и даље буде проблема, контактирајте корисничку подршку на %1$s и реците им да је кôд грешке 9002.</string>
+  <string name="vvm3_error_spg_dns_failure_title">Нешто није у реду</string>
+  <string name="vvm3_error_spg_dns_failure_message">Жао нам је, наишли смо на проблем. Пробајте поново касније. Ако и даље буде проблема, контактирајте корисничку подршку на %1$s и реците им да је кôд грешке 9003.</string>
+  <string name="vvm3_error_vms_no_cellular_title">Повезивање са сандучетом говорне поште није успело</string>
+  <string name="vvm3_error_vms_no_cellular_message">Жао нам је, имамо проблеме при повезивању са сандучетом говорне поште. Ако сте у области са слабим сигналом, сачекајте док не будете имали јак сигнал и пробајте поново. Ако и даље буде проблема, контактирајте корисничку подршку на %1$s и реците им да је кôд грешке 9004.</string>
+  <string name="vvm3_error_vmg_no_cellular_title">Повезивање са сандучетом говорне поште није успело</string>
+  <string name="vvm3_error_vmg_no_cellular_message">Жао нам је, имамо проблеме при повезивању са сандучетом говорне поште. Ако сте у области са слабим сигналом, сачекајте док не будете имали јак сигнал и пробајте поново. Ако и даље буде проблема, контактирајте корисничку подршку на %1$s и реците им да је кôд грешке 9005.</string>
+  <string name="vvm3_error_spg_no_cellular_title">Повезивање са сандучетом говорне поште није успело</string>
+  <string name="vvm3_error_spg_no_cellular_message">Жао нам је, имамо проблеме при повезивању са сандучетом говорне поште. Ако сте у области са слабим сигналом, сачекајте док не будете имали јак сигнал и пробајте поново. Ако и даље буде проблема, контактирајте корисничку подршку на %1$s и реците им да је кôд грешке 9006.</string>
+  <string name="vvm3_error_vms_timeout_title">Нешто није у реду</string>
+  <string name="vvm3_error_vms_timeout_message">Жао нам је, наишли смо на проблем. Пробајте поново касније. Ако и даље буде проблема, контактирајте корисничку подршку на %1$s и реците им да је кôд грешке 9007.</string>
+  <string name="vvm3_error_vmg_timeout_title">Нешто није у реду</string>
+  <string name="vvm3_error_vmg_timeout_message">Жао нам је, наишли смо на проблем. Пробајте поново касније. Ако и даље буде проблема, контактирајте корисничку подршку на %1$s и реците им да је кôд грешке 9008.</string>
+  <string name="vvm3_error_status_sms_timeout_title">Нешто није у реду</string>
+  <string name="vvm3_error_status_sms_timeout_message">Жао нам је, имамо проблеме при подешавању услуге. Пробајте поново касније. Ако и даље буде проблема, контактирајте корисничку подршку на %1$s и реците им да је кôд грешке 9009.</string>
+  <string name="vvm3_error_subscriber_blocked_title">Повезивање са сандучетом говорне поште није успело</string>
+  <string name="vvm3_error_subscriber_blocked_message">Жао нам је, тренутно не можемо да се повежемо са сандучетом говорне поште. Пробајте поново касније. Ако и даље буде проблема, контактирајте корисничку подршку на %1$s и реците им да је кôд грешке 9990.</string>
+  <string name="vvm3_error_unknown_user_title">Подесите говорну пошту</string>
+  <string name="vvm3_error_unknown_user_message">Говорна пошта није подешена на налогу. Контактирајте корисничку подршку на %1$s и реците им да је кôд грешке 9991.</string>
+  <string name="vvm3_error_unknown_device_title">Говорна пошта</string>
+  <string name="vvm3_error_unknown_device_message">Не можете да користите визуелну говорну пошту на овом уређају. Контактирајте корисничку подршку на %1$s и реците им да је кôд грешке 9992.</string>
+  <string name="vvm3_error_invalid_password_title">Нешто није у реду</string>
+  <string name="vvm3_error_invalid_password_message">Контактирајте корисничку подршку на %1$s и реците им да је кôд грешке 9993.</string>
+  <string name="vvm3_error_mailbox_not_initialized_title">Визуелна говорна пошта</string>
+  <string name="vvm3_error_mailbox_not_initialized_message">Да бисте завршили подешавање визуелне говорне поште, контактирајте корисничку подршку на %1$s и реците им да је кôд грешке 9994.</string>
+  <string name="vvm3_error_service_not_provisioned_title">Визуелна говорна пошта</string>
+  <string name="vvm3_error_service_not_provisioned_message">Да бисте завршили подешавање визуелне говорне поште, контактирајте корисничку подршку на %1$s и реците им да је кôд грешке 9995.</string>
+  <string name="vvm3_error_service_not_activated_title">Визуелна говорна пошта</string>
+  <string name="vvm3_error_service_not_activated_message">Да бисте активирали визуелну говорну пошту, контактирајте корисничку подршку на %1$s и реците им да је кôд грешке 9996.</string>
+  <string name="vvm3_error_user_blocked_title">Нешто није у реду</string>
+  <string name="vvm3_error_user_blocked_message">Да бисте завршили подешавање визуелне говорне поште, контактирајте корисничку подршку на %1$s и реците им да је кôд грешке 9998.</string>
+  <string name="vvm3_error_subscriber_unknown_title">Визуелна говорна пошта је онемогућена</string>
+  <string name="vvm3_error_subscriber_unknown_message">Контактирајте корисничку подршку на %1$s да бисте активирали визуелну говорну пошту.</string>
+  <string name="vvm3_error_imap_getquota_error_title">Нешто није у реду</string>
+  <string name="vvm3_error_imap_getquota_error_message">Контактирајте корисничку подршку на %1$s и реците им да је кôд грешке 9997.</string>
+  <string name="vvm3_error_imap_select_error_title">Нешто није у реду</string>
+  <string name="vvm3_error_imap_select_error_message">Контактирајте корисничку подршку на %1$s и реците им да је кôд грешке 9989.</string>
+  <string name="vvm3_error_imap_error_title">Нешто није у реду</string>
+  <string name="vvm3_error_imap_error_message">Контактирајте корисничку подршку на %1$s и реците им да је кôд грешке 9999.</string>
+  <string name="verizon_terms_and_conditions_title">Укључите визуелну говорну пошту</string>
+  <string name="verizon_terms_and_conditions_message">%1$s Ако укључите визуелну говорну пошту, прихватате услове и одредбе за Verizon Wireless:\n\n%2$s</string>
+  <string name="dialer_terms_and_conditions_title">Укључите визуелну говорну пошту</string>
+  <string name="dialer_terms_and_conditions_existing_user_title">Ново! Прочитајте говорну пошту.</string>
+  <string name="dialer_terms_and_conditions_message">%s</string>
+  <string name="dialer_terms_and_conditions_1.0">Прегледајте и слушајте поруке без позивања говорне поште. Транскрипте говорних порука добијате помоћу Google-ове бесплатне услуге транскрипције. Обе опције увек можете да искључите у Подешавањима. %s</string>
+  <string name="dialer_terms_and_conditions_existing_user">Транскрипте говорних порука добијате помоћу Google-ове бесплатне услуге транскрипције. Ово увек можете да искључите у Подешавањима. %s</string>
+  <string name="dialer_terms_and_conditions_for_verizon_1.0">Прегледајте и слушајте поруке без позивања говорне поште.</string>
+  <string name="dialer_terms_and_conditions_learn_more">Сазнајте више</string>
+  <string name="dialer_terms_and_conditions_existing_user_ack">Важи</string>
+  <string name="dialer_terms_and_conditions_existing_user_decline">Не, хвала</string>
+  <string name="terms_and_conditions_decline_dialog_title">Желите ли да онемогућите визуелну говорну пошту?</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_message">Ако одбијете услове и одредбе, онемогућићете визуелну говорну пошту.</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_downgrade">Онемогући</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_message">Визуелна говорна пошта ће бити онемогућена ако је искључите.</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_downgrade">Онемогући</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message">Говорној пошти ћете моћи да приступите само ако позовете *86. Подесите нови PIN кôд говорне поште да бисте наставили.</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin">Подесите PIN</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/error/res/values-sv/strings.xml b/java/com/android/dialer/voicemail/listui/error/res/values-sv/strings.xml
new file mode 100644
index 0000000..9fd7ee9
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/error/res/values-sv/strings.xml
@@ -0,0 +1,102 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_error_activating_title">Aktiverar visuell röstbrevlåda</string>
+  <string name="voicemail_error_activating_message">Du får kanske inte röstmeddelanden tills visuell röstbrevlåda är helt aktiverad. Ring röstbrevlådan för att hämta nya meddelanden innan den är helt aktiverad.</string>
+  <string name="voicemail_error_not_activate_no_signal_title">Det går inte att aktivera visuell röstbrevlåda</string>
+  <string name="voicemail_error_not_activate_no_signal_message">Se till att mobilen har en mobilnätverksanslutning och försök igen.</string>
+  <string name="voicemail_error_not_activate_no_signal_airplane_mode_message">Inaktivera flygplansläget och försök igen.</string>
+  <string name="voicemail_error_no_signal_title">Ingen anslutning</string>
+  <string name="voicemail_error_no_signal_message">Du meddelas inte om nya röstmeddelanden. Om du är ansluten till Wi-Fi kan du lyssna på nya röstmeddelanden genom att synkronisera nu.</string>
+  <string name="voicemail_error_no_signal_airplane_mode_message">Du blir inte meddelad om nya röstmeddelanden. Inaktivera flygplansläget om du vill synkronisera röstbrevlådan.</string>
+  <string name="voicemail_error_no_signal_cellular_required_message">Mobilen måste ha en mobildataanslutning för att lyssna av röstbrevlådan.</string>
+  <string name="voicemail_error_activation_failed_title">Det går inte att aktivera visuell röstbrevlåda</string>
+  <string name="voicemail_error_activation_failed_message">Du kan fortfarande lyssna av röstbrevlådan genom att ringa.</string>
+  <string name="voicemail_error_no_data_title">Det går inte att uppdatera den visuella röstbrevlådan</string>
+  <string name="voicemail_error_no_data_message">Försök igen när du har en bättre Wi-Fi- eller mobildataanslutning. Det går fortfarande att lyssna av röstbrevlådan.</string>
+  <string name="voicemail_error_no_data_cellular_required_message">Försök igen när du har en bättre mobildataanslutning. Det går fortfarande att lyssna av röstbrevlådan.</string>
+  <string name="voicemail_error_bad_config_title">Det går inte att uppdatera den visuella röstbrevlådan</string>
+  <string name="voicemail_error_bad_config_message">Du kan fortfarande lyssna av röstbrevlådan genom att ringa.</string>
+  <string name="voicemail_error_communication_title">Det går inte att uppdatera den visuella röstbrevlådan</string>
+  <string name="voicemail_error_communication_message">Du kan fortfarande lyssna av röstbrevlådan genom att ringa.</string>
+  <string name="voicemail_error_server_connection_title">Det går inte att uppdatera den visuella röstbrevlådan</string>
+  <string name="voicemail_error_server_connection_message">Du kan fortfarande lyssna av röstbrevlådan genom att ringa.</string>
+  <string name="voicemail_error_server_title">Det går inte att uppdatera den visuella röstbrevlådan</string>
+  <string name="voicemail_error_server_message">Du kan fortfarande lyssna av röstbrevlådan genom att ringa.</string>
+  <string name="voicemail_error_inbox_near_full_title">Inkorgen nästan full</string>
+  <string name="voicemail_error_inbox_near_full_message">Du kan inte ta emot nya röstmeddelanden om inkorgen är full.</string>
+  <string name="voicemail_error_inbox_full_title">Du kan inte ta emot nya röstmeddelanden.</string>
+  <string name="voicemail_error_inbox_full_message">Inkorgen är full. Radera några meddelanden om du vill ta emot nya röstmeddelanden.</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_title">Aktivera extra lagring och säkerhetskopiering</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_message">Din postlåda är full. Frigör utrymme genom att aktivera extra lagringsutrymme så att Google kan hantera och säkerhetskopiera dina röstmeddelanden.</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_title">Aktivera extra lagring och säkerhetskopiering</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_message">Din postlåda är nästan full. Frigör utrymme genom att aktivera extra lagringsutrymme så att Google kan hantera och säkerhetskopiera dina röstmeddelanden.</string>
+  <string name="voicemail_error_pin_not_set_title">Ange PIN-kod till röstbrevlådan</string>
+  <string name="voicemail_error_pin_not_set_message">Du måste ha en PIN-kod till röstbrevlådan varje gång du ringer till den.</string>
+  <string name="voicemail_action_turn_off_airplane_mode">Inställningar för flygplansläge</string>
+  <string name="voicemail_action_set_pin">Ställ in pinkod</string>
+  <string name="voicemail_action_retry">Försök igen</string>
+  <string name="voicemail_action_turn_archive_on">Aktivera</string>
+  <string name="voicemail_action_dimiss">Nej tack</string>
+  <string name="voicemail_action_sync">Synkronisera</string>
+  <string name="voicemail_action_call_voicemail">Ring röstbrevlådan</string>
+  <string name="voicemail_action_call_customer_support">Ring kundsupport</string>
+  <string name="vvm3_error_vms_dns_failure_title">Något gick fel</string>
+  <string name="vvm3_error_vms_dns_failure_message">Tyvärr uppstod ​​ett problem. Försök igen senare. Om problemet kvarstår, kontakta kundtjänst på %1$s och ange felkoden 9001.</string>
+  <string name="vvm3_error_vmg_dns_failure_title">Något gick fel</string>
+  <string name="vvm3_error_vmg_dns_failure_message">Tyvärr uppstod ​​ett problem. Försök igen senare. Om problemet kvarstår, kontakta kundtjänst på %1$s och ange felkoden 9002.</string>
+  <string name="vvm3_error_spg_dns_failure_title">Något gick fel</string>
+  <string name="vvm3_error_spg_dns_failure_message">Tyvärr uppstod ​​ett problem. Försök igen senare. Om problemet kvarstår, kontakta kundtjänst på %1$s och ange felkoden 9003.</string>
+  <string name="vvm3_error_vms_no_cellular_title">Det går inte att ansluta till röstbrevlådan</string>
+  <string name="vvm3_error_vms_no_cellular_message">Tyvärr har vi problem med att ansluta till röstbrevlådan. Om du har svag signalstyrka, vänta tills signalen blir starkare och försök igen. Om problemet kvarstår, kontakta kundtjänst på %1$s och ange felkoden 9004.</string>
+  <string name="vvm3_error_vmg_no_cellular_title">Det går inte att ansluta till röstbrevlådan</string>
+  <string name="vvm3_error_vmg_no_cellular_message">Tyvärr har vi problem med att ansluta till röstbrevlådan. Om du har svag signalstyrka, vänta tills signalen blir starkare och försök igen. Om problemet kvarstår, kontakta kundtjänst på %1$s och ange felkoden 9005.</string>
+  <string name="vvm3_error_spg_no_cellular_title">Det går inte att ansluta till röstbrevlådan</string>
+  <string name="vvm3_error_spg_no_cellular_message">Tyvärr har vi problem med att ansluta till röstbrevlådan. Om du har svag signalstyrka, vänta tills signalen blir starkare och försök igen. Om problemet kvarstår, kontakta kundtjänst på %1$s och ange felkoden 9006.</string>
+  <string name="vvm3_error_vms_timeout_title">Något gick fel</string>
+  <string name="vvm3_error_vms_timeout_message">Tyvärr uppstod ​​ett problem. Försök igen senare. Om problemet kvarstår, kontakta kundtjänst på %1$s och ange felkoden 9007.</string>
+  <string name="vvm3_error_vmg_timeout_title">Något gick fel</string>
+  <string name="vvm3_error_vmg_timeout_message">Tyvärr uppstod ​​ett problem. Försök igen senare. Om problemet kvarstår, kontakta kundtjänst på %1$s och ange felkoden 9008.</string>
+  <string name="vvm3_error_status_sms_timeout_title">Något gick fel</string>
+  <string name="vvm3_error_status_sms_timeout_message">Vi har problem med att konfigurera tjänsten. Försök igen senare. Om problemet kvarstår, kontakta kundtjänst på %1$s och ange felkoden 9009.</string>
+  <string name="vvm3_error_subscriber_blocked_title">Det går inte att ansluta till röstbrevlådan</string>
+  <string name="vvm3_error_subscriber_blocked_message">Det går för närvarande tyvärr inte att ansluta till röstbrevlådan. Försök igen senare. Om problemet kvarstår, kontakta kundtjänst på %1$s och ange felkoden 9990.</string>
+  <string name="vvm3_error_unknown_user_title">Konfigurera röstbrevlåda</string>
+  <string name="vvm3_error_unknown_user_message">Röstbrevlådan är inte konfigurerad på ditt konto. Kontakta kundtjänst på %1$s och ange felkoden 9991.</string>
+  <string name="vvm3_error_unknown_device_title">Röstbrevlåda</string>
+  <string name="vvm3_error_unknown_device_message">Det går inte att använda visuell röstbrevlåda på den här enheten. Kontakta kundtjänst på %1$s och ange felkoden 9992.</string>
+  <string name="vvm3_error_invalid_password_title">Något gick fel</string>
+  <string name="vvm3_error_invalid_password_message">Kontakta kundtjänst på %1$s och ange felkoden 9993.</string>
+  <string name="vvm3_error_mailbox_not_initialized_title">Visuell röstbrevlåda</string>
+  <string name="vvm3_error_mailbox_not_initialized_message">Slutför konfiguration av visuell röstbrevlåda genom att kontakta kundtjänst på %1$s och ange felkoden 9994.</string>
+  <string name="vvm3_error_service_not_provisioned_title">Visuell röstbrevlåda</string>
+  <string name="vvm3_error_service_not_provisioned_message">Slutför konfiguration av visuell röstbrevlåda genom att kontakta kundtjänst på %1$s och ange felkoden 9995.</string>
+  <string name="vvm3_error_service_not_activated_title">Visuell röstbrevlåda</string>
+  <string name="vvm3_error_service_not_activated_message">Aktivera visuell röstbrevlåda genom att kontakta kundtjänst på %1$s och ange felkoden 9996.</string>
+  <string name="vvm3_error_user_blocked_title">Något gick fel</string>
+  <string name="vvm3_error_user_blocked_message">Slutför konfiguration av visuell röstbrevlåda genom att kontakta kundtjänst på %1$s och ange felkoden 9998.</string>
+  <string name="vvm3_error_subscriber_unknown_title">Visuell röstbrevlåda inaktiverad</string>
+  <string name="vvm3_error_subscriber_unknown_message">Aktivera visuell röstbrevlåda genom att kontakta kundtjänst på %1$s.</string>
+  <string name="vvm3_error_imap_getquota_error_title">Något gick fel</string>
+  <string name="vvm3_error_imap_getquota_error_message">Kontakta kundtjänst på %1$s och ange felkoden 9997.</string>
+  <string name="vvm3_error_imap_select_error_title">Något gick fel</string>
+  <string name="vvm3_error_imap_select_error_message">Slutför konfiguration av visuell röstbrevlåda genom att kontakta kundtjänst på %1$s och ange felkoden 9989.</string>
+  <string name="vvm3_error_imap_error_title">Något gick fel</string>
+  <string name="vvm3_error_imap_error_message">Kontakta kundtjänst på %1$s och ange felkoden 9999.</string>
+  <string name="verizon_terms_and_conditions_title">Aktivera visuell röstbrevlåda</string>
+  <string name="verizon_terms_and_conditions_message">%1$s Genom att aktivera visuell röstbrevlåda godkänner du Verizon Wireless användarvillkor:\n\n%2$s</string>
+  <string name="dialer_terms_and_conditions_title">Aktivera visuell röstbrevlåda</string>
+  <string name="dialer_terms_and_conditions_existing_user_title">Nyhet! Lyssna på din röstbrevlåda</string>
+  <string name="dialer_terms_and_conditions_message">%s</string>
+  <string name="dialer_terms_and_conditions_1.0">Visa och lyssna på röstmeddelanden utan att ringa röstbrevlådan. Transkription av röstmeddelanden tillhandahålls av Googles kostnadsfria transkriberingstjänst. Funktionerna kan inaktiveras i Inställningar när som helst. %s</string>
+  <string name="dialer_terms_and_conditions_existing_user">Transkription av röstmeddelanden tillhandahålls av Googles kostnadsfria transkriberingstjänst. Funktionen kan inaktiveras i Inställningar när som helst. %s</string>
+  <string name="dialer_terms_and_conditions_for_verizon_1.0">Visa och lyssna på dina röstmeddelanden utan att ringa till röstbrevlådan.</string>
+  <string name="dialer_terms_and_conditions_learn_more">Läs mer</string>
+  <string name="dialer_terms_and_conditions_existing_user_ack">Jag förstår</string>
+  <string name="dialer_terms_and_conditions_existing_user_decline">Nej tack</string>
+  <string name="terms_and_conditions_decline_dialog_title">Inaktivera visuell röstbrevlåda?</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_message">Visuell röstbrevlåda inaktiveras om användarvillkoren avböjs.</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_downgrade">Inaktivera</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_message">Visuell röstbrevlåda inaktiveras om du stänger av visuell röstbrevlåda.</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_downgrade">Inaktivera</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message">Röstbrevlådan är endast tillgänglig genom att ringa *86. Fortsätt genom att ställa in en ny PIN-kod till röstbrevlådan.</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin">Ställ in pinkod</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/error/res/values-sw/strings.xml b/java/com/android/dialer/voicemail/listui/error/res/values-sw/strings.xml
new file mode 100644
index 0000000..5e01638
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/error/res/values-sw/strings.xml
@@ -0,0 +1,102 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_error_activating_title">Inawasha kipengele cha ujumbe wa sauti unaoonekana</string>
+  <string name="voicemail_error_activating_message">Huenda usipokee arifa za ujumbe wa sauti mpaka kipengele cha ujumbe wa sauti unaoonekana kiwe kimewashwa kabisa. Piga nambari ya ujumbe wa sauti ili upate ujumbe mpya mpaka kipengele hicho kitakapokuwa kimewashwa kabisa.</string>
+  <string name="voicemail_error_not_activate_no_signal_title">Imeshindwa kuwasha kipengele cha ujumbe wa sauti unaoonekana</string>
+  <string name="voicemail_error_not_activate_no_signal_message">Hakikisha kwamba simu yako ina muunganisho wa mtandao wa simu kisha ujaribu tena.</string>
+  <string name="voicemail_error_not_activate_no_signal_airplane_mode_message">Zima hali ya ndegeni kisha ujaribu tena.</string>
+  <string name="voicemail_error_no_signal_title">Hakuna muunganisho</string>
+  <string name="voicemail_error_no_signal_message">Hutaarifiwa ukipata ujumbe mpya wa sauti. Kama unatumia Wi-Fi sasa hivi, unaweza kuangalia kama una ujumbe wa sauti kwa kusawazisha sasa.</string>
+  <string name="voicemail_error_no_signal_airplane_mode_message">Hutaarifiwa ukipata ujumbe mpya wa sauti. Zima hali ya ndegeni ili usawazishe ujumbe wa sauti.</string>
+  <string name="voicemail_error_no_signal_cellular_required_message">Simu yako inahitaji muunganisho wa data kwa simu za mkononi ili kufungua ujumbe wa sauti.</string>
+  <string name="voicemail_error_activation_failed_title">Imeshindwa kuwasha kipengele cha ujumbe wa sauti unaoonekana</string>
+  <string name="voicemail_error_activation_failed_message">Bado unaweza kupiga simu ili usikilize ujumbe wa sauti.</string>
+  <string name="voicemail_error_no_data_title">Imeshindwa kusasisha kipengele cha ujumbe wa sauti unaoonekana</string>
+  <string name="voicemail_error_no_data_message">Jaribu tena baadaye muunganisho wako wa Wi-Fi au muunganisho wa data kwa simu za mkononi ukiimarika. Bado unaweza kupiga simu usikilize ujumbe wa sauti.</string>
+  <string name="voicemail_error_no_data_cellular_required_message">Jaribu tena baadaye muunganisho wa data kwa simu za mkononi ukiimarika. Bado unaweza kupiga simu usikilize ujumbe wa sauti.</string>
+  <string name="voicemail_error_bad_config_title">Imeshindwa kusasisha kipengele cha ujumbe wa sauti unaoonekana</string>
+  <string name="voicemail_error_bad_config_message">Bado unaweza kupiga simu ili usikilize ujumbe wa sauti.</string>
+  <string name="voicemail_error_communication_title">Imeshindwa kusasisha kipengele cha ujumbe wa sauti unaoonekana</string>
+  <string name="voicemail_error_communication_message">Bado unaweza kupiga simu ili usikilize ujumbe wa sauti.</string>
+  <string name="voicemail_error_server_connection_title">Imeshindwa kusasisha kipengele cha ujumbe wa sauti unaoonekana</string>
+  <string name="voicemail_error_server_connection_message">Bado unaweza kupiga simu ili usikilize ujumbe wa sauti.</string>
+  <string name="voicemail_error_server_title">Imeshindwa kusasisha kipengele cha ujumbe wa sauti unaoonekana</string>
+  <string name="voicemail_error_server_message">Bado unaweza kupiga simu ili usikilize ujumbe wa sauti.</string>
+  <string name="voicemail_error_inbox_near_full_title">Kikasha kinakaribia kujaa</string>
+  <string name="voicemail_error_inbox_near_full_message">Hutaweza kupokea ujumbe mpya wa sauti kama kikasha chako kimejaa.</string>
+  <string name="voicemail_error_inbox_full_title">Huwezi kupokea ujumbe mpya wa sauti</string>
+  <string name="voicemail_error_inbox_full_message">Kikasha chako kimejaa. Jaribu kufuta baadhi ili uweze kupokea ujumbe mpya wa sauti.</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_title">Washa nafasi ya ziada halafu uhifadhi nakala rudufu</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_message">Kikasha chako cha ujumbe wa sauti kimejaa. Ili upate nafasi, washa hifadhi ya ziada ili Google idhibiti na kuweka nakala rudufu ya ujumbe wako wa sauti.</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_title">Washa nafasi ya ziada halafu uhifadhi nakala rudufu</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_message">Kikasha chako cha ujumbe wa sauti kinakaribia kujaa. Ili upate nafasi, washa hifadhi ya ziada ili Google idhibiti na kuweka nakala rudufu ya ujumbe wako wa sauti.</string>
+  <string name="voicemail_error_pin_not_set_title">Weka PIN yako ya ujumbe wa sauti</string>
+  <string name="voicemail_error_pin_not_set_message">Utahitaji PIN ya ujumbe wa sauti wakati wowote unapopiga simu ili ufikie ujumbe wako wa sauti.</string>
+  <string name="voicemail_action_turn_off_airplane_mode">Mipangilio ya Hali ya Ndegeni</string>
+  <string name="voicemail_action_set_pin">Weka PIN</string>
+  <string name="voicemail_action_retry">Jaribu Tena</string>
+  <string name="voicemail_action_turn_archive_on">Washa</string>
+  <string name="voicemail_action_dimiss">Hapana, asante</string>
+  <string name="voicemail_action_sync">Sawazisha</string>
+  <string name="voicemail_action_call_voicemail">Piga nambari ya Ujumbe wa sauti</string>
+  <string name="voicemail_action_call_customer_support">Pigia Kituo cha Usaidizi kwa Wateja</string>
+  <string name="vvm3_error_vms_dns_failure_title">Hitilafu Fulani Imetokea</string>
+  <string name="vvm3_error_vms_dns_failure_message">Samahani, tatizo fulani limetokea. Tafadhali jaribu tena baadaye. Tatizo hili likiendelea, tafadhali wasiliana na Kituo cha Huduma kwa Wateja kupitia nambari %1$s na uwaambie kwamba msimbo wa hitilafu ni 9001.</string>
+  <string name="vvm3_error_vmg_dns_failure_title">Hitilafu Fulani Imetokea</string>
+  <string name="vvm3_error_vmg_dns_failure_message">Samahani, tatizo fulani limetokea. Tafadhali jaribu tena baadaye. Tatizo hili likiendelea, tafadhali wasiliana na Kituo cha Huduma kwa Wateja kupitia nambari %1$s na uwaambie kwamba msimbo wa hitilafu ni 9002.</string>
+  <string name="vvm3_error_spg_dns_failure_title">Hitilafu Fulani Imetokea</string>
+  <string name="vvm3_error_spg_dns_failure_message">Samahani, tatizo fulani limetokea. Tafadhali jaribu tena baadaye. Tatizo hili likiendelea, tafadhali wasiliana na Kituo cha Huduma kwa Wateja kupitia nambari %1$s na uwaambie kwamba msimbo wa hitilafu ni 9003.</string>
+  <string name="vvm3_error_vms_no_cellular_title">Imeshindwa kuunganisha kwenye Kikasha chako cha Ujumbe wa Sauti</string>
+  <string name="vvm3_error_vms_no_cellular_message">Samahani, tunatatizika kuunganisha kwenye kikasha chako cha ujumbe wa sauti kwa sasa. Kama upo mahali penye muunganisho hafifu wa mtandao, subiri hadi upate muunganisho mzuri kisha ujaribu tena. Tatizo hili likiendelea, tafadhali wasiliana na Kituo cha Huduma kwa Wateja kupitia nambari %1$s na uwaambie kwamba msimbo wa hitilafu ni 9004.</string>
+  <string name="vvm3_error_vmg_no_cellular_title">Imeshindwa kuunganisha kwenye Kikasha chako cha Ujumbe wa Sauti</string>
+  <string name="vvm3_error_vmg_no_cellular_message">Samahani, tunatatizika kuunganisha kwenye kikasha chako cha ujumbe wa sauti kwa sasa. Kama upo mahali penye muunganisho hafifu wa mtandao, subiri hadi upate muunganisho mzuri kisha ujaribu tena. Tatizo hili likiendelea, tafadhali wasiliana na Kituo cha Huduma kwa Wateja kupitia nambari %1$s na uwaambie kwamba msimbo wa hitilafu ni 9005.</string>
+  <string name="vvm3_error_spg_no_cellular_title">Imeshindwa kuunganisha kwenye Kikasha chako cha Ujumbe wa Sauti</string>
+  <string name="vvm3_error_spg_no_cellular_message">Samahani, tunatatizika kuunganisha kwenye kikasha chako cha ujumbe wa sauti kwa sasa. Kama upo mahali penye muunganisho hafifu wa mtandao, subiri hadi upate muunganisho mzuri kisha ujaribu tena. Tatizo hili likiendelea, tafadhali wasiliana na Kituo cha Huduma kwa Wateja kupitia nambari %1$s na uwaambie kwamba msimbo wa hitilafu ni 9006.</string>
+  <string name="vvm3_error_vms_timeout_title">Hitilafu Fulani Imetokea</string>
+  <string name="vvm3_error_vms_timeout_message">Samahani, tatizo fulani limetokea. Tafadhali jaribu tena baadaye. Tatizo hili likiendelea, tafadhali wasiliana na Kituo cha Huduma kwa Wateja kupitia nambari %1$s na uwaambie kwamba msimbo wa hitilafu ni 9007.</string>
+  <string name="vvm3_error_vmg_timeout_title">Hitilafu Fulani Imetokea</string>
+  <string name="vvm3_error_vmg_timeout_message">Samahani, tatizo fulani limetokea. Tafadhali jaribu tena baadaye. Tatizo hili likiendelea, tafadhali wasiliana na Kituo cha Huduma kwa Wateja kupitia nambari %1$s na uwaambie kwamba msimbo wa hitilafu ni 9008.</string>
+  <string name="vvm3_error_status_sms_timeout_title">Hitilafu Fulani Imetokea</string>
+  <string name="vvm3_error_status_sms_timeout_message">Samahani, tatizo limetokea wakati wa kuweka mipangilio katika kifaa chako. Tafadhali jaribu tena baadaye. Tatizo hili likiendelea, tafadhali wasiliana na Kituo cha Huduma kwa Wateja kupitia nambari %1$s na uwaambie kwamba msimbo wa hitilafu ni 9009.</string>
+  <string name="vvm3_error_subscriber_blocked_title">Imeshindwa kuunganisha kwenye Kikasha chako cha Ujumbe wa Sauti</string>
+  <string name="vvm3_error_subscriber_blocked_message">Samahani, tumeshindwa kuunganisha kwenye kikasha chako cha ujumbe wa sauti kwa sasa. Tafadhali jaribu tena baadaye. Tatizo hili likiendelea, tafadhali wasiliana na Kituo cha Huduma kwa Wateja kupitia nambari %1$s na uwaambie kwamba msimbo wa hitilafu ni 9990.</string>
+  <string name="vvm3_error_unknown_user_title">Weka mipangilio ya Kipengele cha Ujumbe wa Sauti</string>
+  <string name="vvm3_error_unknown_user_message">Kipengele cha Ujumbe wa Sauti hakijawekwa kwenye akaunti yako. Tafadhali wasiliana na Kituo cha Huduma kwa Wateja kupitia nambari %1$s na uwaambie kwamba msimbo wa hitilafu ni 9991.</string>
+  <string name="vvm3_error_unknown_device_title">Ujumbe wa sauti</string>
+  <string name="vvm3_error_unknown_device_message">Kipengele cha ujumbe wa sauti unaoonekana hakiwezi kutumika kwenye kifaa hiki. Tafadhali wasiliana na Kituo cha Huduma kwa Wateja kupitia nambari %1$s na uwaambie kwamba msimbo wa hitilafu ni 9992.</string>
+  <string name="vvm3_error_invalid_password_title">Hitilafu Fulani Imetokea</string>
+  <string name="vvm3_error_invalid_password_message">Tafadhali wasiliana na Kituo cha Huduma kwa Wateja kupitia nambari %1$s na uwaambie kwamba msimbo wa hitilafu ni 9993.</string>
+  <string name="vvm3_error_mailbox_not_initialized_title">Ujumbe wa sauti unaoonekana</string>
+  <string name="vvm3_error_mailbox_not_initialized_message">Ili ukamilishe kuweka mipangilio ya kipengele cha ujumbe wa sauti unaoonekana, tafadhali wasiliana na Kituo cha Huduma kwa Wateja kupitia nambari %1$s na uwaambie kwamba msimbo wa hitilafu ni 9994.</string>
+  <string name="vvm3_error_service_not_provisioned_title">Ujumbe wa sauti unaoonekana</string>
+  <string name="vvm3_error_service_not_provisioned_message">Ili ukamilishe kuweka mipangilio ya kipengele cha ujumbe wa sauti unaoonekana, tafadhali wasiliana na Kituo cha Huduma kwa Wateja kupitia nambari %1$s na uwaambie kwamba msimbo wa hitilafu ni 9995.</string>
+  <string name="vvm3_error_service_not_activated_title">Ujumbe wa sauti unaoonekana</string>
+  <string name="vvm3_error_service_not_activated_message">Ili uwashe kipengele cha ujumbe wa sauti unaoonekana, tafadhali wasiliana na Kituo cha Huduma kwa Wateja kupitia nambari %1$s na uwaambie kwamba msimbo wa hitilafu ni 9996.</string>
+  <string name="vvm3_error_user_blocked_title">Hitilafu Fulani Imetokea</string>
+  <string name="vvm3_error_user_blocked_message">Ili ukamilishe kuweka mipangilio ya kipengele cha ujumbe wa sauti unaoonekana, tafadhali wasiliana na Kituo cha Huduma kwa Wateja kupitia nambari %1$s na uwaambie kwamba msimbo wa hitilafu ni 9998.</string>
+  <string name="vvm3_error_subscriber_unknown_title">Kipengele cha ujumbe wa sauti unaoonekana kimezimwa</string>
+  <string name="vvm3_error_subscriber_unknown_message">Tafadhali wasiliana na Kituo cha Huduma kwa Wateja kupitia nambari %1$s ili wakuwashie kipengele cha ujumbe wa sauti unaoonekana.</string>
+  <string name="vvm3_error_imap_getquota_error_title">Hitilafu Fulani Imetokea</string>
+  <string name="vvm3_error_imap_getquota_error_message">Tafadhali wasiliana na Kituo cha Huduma kwa Wateja kupitia nambari %1$s na uwaambie kwamba msimbo wa hitilafu ni 9997.</string>
+  <string name="vvm3_error_imap_select_error_title">Hitilafu Fulani Imetokea</string>
+  <string name="vvm3_error_imap_select_error_message">Tafadhali wasiliana na Kituo cha Huduma kwa Wateja kupitia nambari %1$s na uwaambie kwamba msimbo wa hitilafu ni 9989.</string>
+  <string name="vvm3_error_imap_error_title">Hitilafu Fulani Imetokea</string>
+  <string name="vvm3_error_imap_error_message">Tafadhali wasiliana na Kituo cha Huduma kwa Wateja kupitia nambari %1$s na uwaambie kwamba msimbo wa hitilafu ni 9999.</string>
+  <string name="verizon_terms_and_conditions_title">Washa kipengele cha ujumbe wa sauti unaoonekana</string>
+  <string name="verizon_terms_and_conditions_message">%1$s Kwa kuwasha kipengele cha ujumbe wa sauti unaoonekana, unakubali sheria na masharti ya Verizon Wireless:\n\n%2$s</string>
+  <string name="dialer_terms_and_conditions_title">Washa kipengele cha ujumbe wa sauti unaoonekana</string>
+  <string name="dialer_terms_and_conditions_existing_user_title">Mpya! Soma ujumbe wako wa sauti</string>
+  <string name="dialer_terms_and_conditions_message">%s</string>
+  <string name="dialer_terms_and_conditions_1.0">Angalia na usikilize ujumbe wako bila kulazimika kupiga kupitia ujumbe wa sauti. Nukuu za ujumbe wako wa sauti zinatolewa kupitia huduma ya Google ya kutoa nukuu bila malipo. Unaweza kuzima kila mojawapo ya huduma hizi kwenye Mipangilio wakati wowote. %s</string>
+  <string name="dialer_terms_and_conditions_existing_user">Nukuu za ujumbe wako wa sauti zinatolewa kupitia huduma ya Google ya kutoa nukuu bila malipo. Unaweza kuzima huduma hii kwenye Mipangilio wakati wowote. %s</string>
+  <string name="dialer_terms_and_conditions_for_verizon_1.0">Ona na usikilize ujumbe wako bila kupigia ujumbe wa sauti.</string>
+  <string name="dialer_terms_and_conditions_learn_more">Pata maelezo zaidi</string>
+  <string name="dialer_terms_and_conditions_existing_user_ack">Sawa, nimeelewa</string>
+  <string name="dialer_terms_and_conditions_existing_user_decline">Hapana, asante</string>
+  <string name="terms_and_conditions_decline_dialog_title">Je, ungependa kuzima kipengele cha ujumbe wa sauti unaoonekana?</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_message">Kipengele cha ujumbe wa sauti unaoonekana kitazimwa ukikataa sheria na masharti.</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_downgrade">Zima</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_message">Kipengele cha ujumbe wa sauti unaoonekana kitazimwa ikiwa utakizima.</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_downgrade">Zima</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message">Utaweza kupata ujumbe wa sauti kwa kupiga *86 tu. Weka PIN mpya ya ujumbe wa sauti ili uweze kuendelea.</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin">Weka PIN</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/error/res/values-ta/strings.xml b/java/com/android/dialer/voicemail/listui/error/res/values-ta/strings.xml
new file mode 100644
index 0000000..e56ca55
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/error/res/values-ta/strings.xml
@@ -0,0 +1,102 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_error_activating_title">விஷுவல் குரலஞ்சலைச் செயல்படுத்துகிறது</string>
+  <string name="voicemail_error_activating_message">விஷுவல் குரலஞ்சலை முழுவதுமாகச் செயல்படுத்தும் வரை, உங்களால் குரலஞ்சல் அறிவிப்புகளைப் பெற முடியாமல் போகலாம். குரலஞ்சலை முழுவதுமாகச் செயல்படுத்தும் வரை புதிய செய்திகளைப் பெற, குரலஞ்சலை அழைக்கவும்.</string>
+  <string name="voicemail_error_not_activate_no_signal_title">விஷுவல் குரலஞ்சலைச் செயல்படுத்த முடியவில்லை</string>
+  <string name="voicemail_error_not_activate_no_signal_message">உங்கள் மொபைலில் மொபைல் நெட்வொர்க் இணைப்பு உள்ளதை உறுதிசெய்து, மீண்டும் முயலவும்.</string>
+  <string name="voicemail_error_not_activate_no_signal_airplane_mode_message">விமானப் பயன்முறையை முடக்கி, மீண்டும் முயலவும்.</string>
+  <string name="voicemail_error_no_signal_title">இணைப்பு இல்லை</string>
+  <string name="voicemail_error_no_signal_message">புதிய குரலஞ்சல்கள் குறித்த அறிவிப்புகளைப் பெறமாட்டீர்கள். வைஃபை இணைப்பைப் பயன்படுத்திக்கொண்டிருந்தால், இப்போதே ஒத்திசைத்து குரலஞ்சல் உள்ளதா எனப் பார்க்கலாம்.</string>
+  <string name="voicemail_error_no_signal_airplane_mode_message">புதிய குரலஞ்சல்கள் குறித்த அறிவிப்புகளைப் பெறமாட்டீர்கள். குரலஞ்சலை ஒத்திசைக்க, விமானப் பயன்முறையை முடக்கவும்.</string>
+  <string name="voicemail_error_no_signal_cellular_required_message">குரலஞ்சலைக் கேட்க, உங்கள் மொபைலில் மொபைல் டேட்டா இணைப்பு இருக்க வேண்டும்.</string>
+  <string name="voicemail_error_activation_failed_title">விஷுவல் குரலஞ்சலைச் செயல்படுத்த முடியவில்லை</string>
+  <string name="voicemail_error_activation_failed_message">குரலஞ்சலைக் கேட்க, இப்போதும் நீங்கள் குரலஞ்சல் எண்ணிற்கு அழைக்கலாம்.</string>
+  <string name="voicemail_error_no_data_title">விஷுவல் குரலஞ்சலைப் புதுப்பிக்க முடியவில்லை</string>
+  <string name="voicemail_error_no_data_message">வைஃபை அல்லது மொபைல் டேட்டா இணைப்பின் வேகம் முன்பை விட அதிகமாகும் போது, மீண்டும் முயலவும். குரலஞ்சலைக் கேட்க, இப்போதும் நீங்கள் குரலஞ்சல் எண்ணிற்கு அழைக்கலாம்.</string>
+  <string name="voicemail_error_no_data_cellular_required_message">மொபைல் டேட்டா இணைப்பின் வேகம் முன்பை விட அதிகமாகும் போது, மீண்டும் முயலவும். குரலஞ்சலைக் கேட்க, இப்போதும் நீங்கள் குரலஞ்சல் எண்ணிற்கு அழைக்கலாம்.</string>
+  <string name="voicemail_error_bad_config_title">விஷுவல் குரலஞ்சலைப் புதுப்பிக்க முடியவில்லை</string>
+  <string name="voicemail_error_bad_config_message">குரலஞ்சலைக் கேட்க, இப்போதும் நீங்கள் குரலஞ்சல் எண்ணிற்கு அழைக்கலாம்.</string>
+  <string name="voicemail_error_communication_title">விஷுவல் குரலஞ்சலைப் புதுப்பிக்க முடியவில்லை</string>
+  <string name="voicemail_error_communication_message">குரலஞ்சலைக் கேட்க, இப்போதும் நீங்கள் குரலஞ்சல் எண்ணிற்கு அழைக்கலாம்.</string>
+  <string name="voicemail_error_server_connection_title">விஷுவல் குரலஞ்சலைப் புதுப்பிக்க முடியவில்லை</string>
+  <string name="voicemail_error_server_connection_message">குரலஞ்சலைக் கேட்க, இப்போதும் நீங்கள் குரலஞ்சல் எண்ணிற்கு அழைக்கலாம்.</string>
+  <string name="voicemail_error_server_title">விஷுவல் குரலஞ்சலைப் புதுப்பிக்க முடியவில்லை</string>
+  <string name="voicemail_error_server_message">குரலஞ்சலைக் கேட்க, இப்போதும் நீங்கள் குரலஞ்சல் எண்ணிற்கு அழைக்கலாம்.</string>
+  <string name="voicemail_error_inbox_near_full_title">இன்பாக்ஸ் கிட்டத்தட்ட நிரம்பிவிட்டது</string>
+  <string name="voicemail_error_inbox_near_full_message">இன்பாக்ஸ் நிரம்பியிருந்தால், புதிய குரலஞ்சலைப் பெற முடியாது.</string>
+  <string name="voicemail_error_inbox_full_title">புதிய குரலஞ்சல்களைப் பெற முடியவில்லை</string>
+  <string name="voicemail_error_inbox_full_message">இன்பாக்ஸ் நிரம்பிவிட்டது. புதிய குரலஞ்சல்களைப் பெற, சில செய்திகளை நீக்கவும்.</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_title">கூடுதல் சேமிப்பகத்தையும் காப்புப் பிரதியையும் இயக்கு</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_message">உங்கள் அஞ்சல்பெட்டி நிரம்பிவிட்டது. இடத்தைக் காலியாக்க, கூடுதல் சேமிப்பகத்தை இயக்கவும். இதன் மூலம் Google உங்கள் குரலஞ்சல் செய்திகளை நிர்வகித்து, காப்புப் பிரதி எடுக்கலாம்.</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_title">கூடுதல் சேமிப்பகத்தையும் காப்புப் பிரதியையும் இயக்கு</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_message">உங்கள் அஞ்சல்பெட்டி கிட்டத்தட்ட நிரம்பிவிட்டது. இடத்தைக் காலியாக்க, கூடுதல் சேமிப்பகத்தை இயக்கவும். இதன் மூலம் Google உங்கள் குரலஞ்சல் செய்திகளை நிர்வகித்து, காப்புப் பிரதி எடுக்கலாம்.</string>
+  <string name="voicemail_error_pin_not_set_title">உங்கள் குரலஞ்சல் பின்னை அமைக்கவும்</string>
+  <string name="voicemail_error_pin_not_set_message">உங்கள் குரலஞ்சலை அணுகுவதற்கு நீங்கள் எப்போது அழைத்தாலும் குரலஞ்சல் பின் அவசியம்.</string>
+  <string name="voicemail_action_turn_off_airplane_mode">விமானப் பயன்முறை அமைப்புகள்</string>
+  <string name="voicemail_action_set_pin">பின்னை அமை</string>
+  <string name="voicemail_action_retry">மீண்டும் முயல்க</string>
+  <string name="voicemail_action_turn_archive_on">இயக்கு</string>
+  <string name="voicemail_action_dimiss">வேண்டாம்</string>
+  <string name="voicemail_action_sync">ஒத்திசை</string>
+  <string name="voicemail_action_call_voicemail">குரலஞ்சலை அழை</string>
+  <string name="voicemail_action_call_customer_support">வாடிக்கையாளர் ஆதரவை அழை</string>
+  <string name="vvm3_error_vms_dns_failure_title">ஏதோ தவறாகிவிட்டது</string>
+  <string name="vvm3_error_vms_dns_failure_message">சிக்கல் ஏற்பட்டது. பிறகு முயலவும். சிக்கல் தொடர்ந்தால், %1$s என்ற எண்ணில் வாடிக்கையாளர் சேவையை அழைத்து, அவர்களிடம் பிழையின் குறியீடு 9001 எனக் கூறவும்.</string>
+  <string name="vvm3_error_vmg_dns_failure_title">ஏதோ தவறாகிவிட்டது</string>
+  <string name="vvm3_error_vmg_dns_failure_message">சிக்கல் ஏற்பட்டது. பிறகு முயலவும். சிக்கல் தொடர்ந்தால், %1$s என்ற எண்ணில் வாடிக்கையாளர் சேவையை அழைத்து, அவர்களிடம் பிழையின் குறியீடு 9002 எனக் கூறவும்.</string>
+  <string name="vvm3_error_spg_dns_failure_title">ஏதோ தவறாகிவிட்டது</string>
+  <string name="vvm3_error_spg_dns_failure_message">சிக்கல் ஏற்பட்டது. பிறகு முயலவும். சிக்கல் தொடர்ந்தால், %1$s என்ற எண்ணில் வாடிக்கையாளர் சேவையை அழைத்து, அவர்களிடம் பிழையின் குறியீடு 9003 எனக் கூறவும்.</string>
+  <string name="vvm3_error_vms_no_cellular_title">குரல் அஞ்சல்பெட்டியுடன் இணைக்க முடியவில்லை</string>
+  <string name="vvm3_error_vms_no_cellular_message">குரல் அஞ்சல்பெட்டியுடன் இணைப்பதில் சிக்கலை எதிர்கொள்கிறோம். சிக்னலின் வலிமை குறைவாக உள்ள இடத்தில் இருந்தால், சிக்னலின் வலிமை அதிகரிக்கும் வரை காத்திருந்து மீண்டும் முயலவும். சிக்கல் தொடர்ந்தால், %1$s என்ற எண்ணில் வாடிக்கையாளர் சேவையை அழைத்து, அவர்களிடம் பிழையின் குறியீடு 9004 எனக் கூறவும்.</string>
+  <string name="vvm3_error_vmg_no_cellular_title">குரல் அஞ்சல்பெட்டியுடன் இணைக்க முடியவில்லை</string>
+  <string name="vvm3_error_vmg_no_cellular_message">குரல் அஞ்சல்பெட்டியுடன் இணைப்பதில் சிக்கலை எதிர்கொள்கிறோம். சிக்னலின் வலிமை குறைவாக உள்ள இடத்தில் இருந்தால், சிக்னலின் வலிமை அதிகரிக்கும் வரை காத்திருந்து மீண்டும் முயலவும். சிக்கல் தொடர்ந்தால், %1$s என்ற எண்ணில் வாடிக்கையாளர் சேவையை அழைத்து, அவர்களிடம் பிழையின் குறியீடு 9005 எனக் கூறவும்.</string>
+  <string name="vvm3_error_spg_no_cellular_title">குரல் அஞ்சல்பெட்டியுடன் இணைக்க முடியவில்லை</string>
+  <string name="vvm3_error_spg_no_cellular_message">குரல் அஞ்சல்பெட்டியுடன் இணைப்பதில் சிக்கலை எதிர்கொள்கிறோம். சிக்னலின் வலிமை குறைவாக உள்ள இடத்தில் இருந்தால், சிக்னலின் வலிமை அதிகரிக்கும் வரை காத்திருந்து மீண்டும் முயலவும். சிக்கல் தொடர்ந்தால், %1$s என்ற எண்ணில் வாடிக்கையாளர் சேவையை அழைத்து, அவர்களிடம் பிழையின் குறியீடு 9006 எனக் கூறவும்.</string>
+  <string name="vvm3_error_vms_timeout_title">ஏதோ தவறாகிவிட்டது</string>
+  <string name="vvm3_error_vms_timeout_message">சிக்கல் ஏற்பட்டது. பிறகு முயலவும். சிக்கல் தொடர்ந்தால், %1$s என்ற எண்ணில் வாடிக்கையாளர் சேவையை அழைத்து, அவர்களிடம் பிழையின் குறியீடு 9007 எனக் கூறவும்.</string>
+  <string name="vvm3_error_vmg_timeout_title">ஏதோ தவறாகிவிட்டது</string>
+  <string name="vvm3_error_vmg_timeout_message">சிக்கல் ஏற்பட்டது. பிறகு முயலவும். சிக்கல் தொடர்ந்தால், %1$s என்ற எண்ணில் வாடிக்கையாளர் சேவையை அழைத்து, அவர்களிடம் பிழையின் குறியீடு 9008 எனக் கூறவும்.</string>
+  <string name="vvm3_error_status_sms_timeout_title">ஏதோ தவறாகிவிட்டது</string>
+  <string name="vvm3_error_status_sms_timeout_message">உங்கள் சேவையை அமைப்பதில் சிக்கலை எதிர்கொள்கிறோம். பிறகு முயலவும். சிக்கல் தொடர்ந்தால், %1$s என்ற எண்ணில் வாடிக்கையாளர் சேவையை அழைத்து, அவர்களிடம் பிழையின் குறியீடு 9009 எனக் கூறவும்.</string>
+  <string name="vvm3_error_subscriber_blocked_title">குரல் அஞ்சல்பெட்டியுடன் இணைக்க முடியவில்லை</string>
+  <string name="vvm3_error_subscriber_blocked_message">இந்த நேரத்தில், உங்கள் குரல் அஞ்சல்பெட்டியுடன் இணைக்க முடியவில்லை. பிறகு முயலவும். சிக்கல் தொடர்ந்தால், %1$s என்ற எண்ணில் வாடிக்கையாளர் சேவையை அழைத்து, அவர்களிடம் பிழையின் குறியீடு 9990 எனக் கூறவும்.</string>
+  <string name="vvm3_error_unknown_user_title">குரலஞ்சலை அமைக்கவும்</string>
+  <string name="vvm3_error_unknown_user_message">உங்கள் கணக்கில் குரலஞ்சல் அமைக்கப்படவில்லை. %1$s என்ற எண்ணில் வாடிக்கையாளர் சேவையை அழைத்து, அவர்களிடம் பிழையின் குறியீடு 9991 எனக் கூறவும்.</string>
+  <string name="vvm3_error_unknown_device_title">குரலஞ்சல்</string>
+  <string name="vvm3_error_unknown_device_message">இந்தச் சாதனத்தில் விஷுவல் குரலஞ்சலைப் பயன்படுத்த முடியாது. %1$s என்ற எண்ணில் வாடிக்கையாளர் சேவையை அழைத்து, அவர்களிடம் பிழையின் குறியீடு 9992 எனக் கூறவும்.</string>
+  <string name="vvm3_error_invalid_password_title">ஏதோ தவறாகிவிட்டது</string>
+  <string name="vvm3_error_invalid_password_message">%1$s என்ற எண்ணில் வாடிக்கையாளர் சேவையை அழைத்து, அவர்களிடம் பிழையின் குறியீடு 9993 எனக் கூறவும்.</string>
+  <string name="vvm3_error_mailbox_not_initialized_title">விஷுவல் குரலஞ்சல்</string>
+  <string name="vvm3_error_mailbox_not_initialized_message">விஷுவல் குரலஞ்சல் அமைவை நிறைவுசெய்ய, %1$s என்ற எண்ணில் வாடிக்கையாளர் சேவையை அழைத்து, அவர்களிடம் பிழையின் குறியீடு 9994 எனக் கூறவும்.</string>
+  <string name="vvm3_error_service_not_provisioned_title">விஷுவல் குரலஞ்சல்</string>
+  <string name="vvm3_error_service_not_provisioned_message">விஷுவல் குரலஞ்சல் அமைவை நிறைவுசெய்ய, %1$s என்ற எண்ணில் வாடிக்கையாளர் சேவையை அழைத்து, அவர்களிடம் பிழையின் குறியீடு 9995 எனக் கூறவும்.</string>
+  <string name="vvm3_error_service_not_activated_title">விஷுவல் குரலஞ்சல்</string>
+  <string name="vvm3_error_service_not_activated_message">விஷுவல் குரலஞ்சலைச் செயல்படுத்த, %1$s என்ற எண்ணில் வாடிக்கையாளர் சேவையை அழைத்து, அவர்களிடம் பிழையின் குறியீடு 9996 எனக் கூறவும்.</string>
+  <string name="vvm3_error_user_blocked_title">ஏதோ தவறாகிவிட்டது</string>
+  <string name="vvm3_error_user_blocked_message">விஷுவல் குரலஞ்சல் அமைவை நிறைவுசெய்ய, %1$s என்ற எண்ணில் வாடிக்கையாளர் சேவையை அழைத்து, அவர்களிடம் பிழையின் குறியீடு 9998 எனக் கூறவும்.</string>
+  <string name="vvm3_error_subscriber_unknown_title">விஷுவல் குரலஞ்சல் முடக்கப்பட்டுள்ளது</string>
+  <string name="vvm3_error_subscriber_unknown_message">விஷுவல் குரலஞ்சலைச் செயல்படுத்த, %1$s என்ற எண்ணில் வாடிக்கையாளர் சேவையை அழைக்கவும்.</string>
+  <string name="vvm3_error_imap_getquota_error_title">ஏதோ தவறாகிவிட்டது</string>
+  <string name="vvm3_error_imap_getquota_error_message">%1$s என்ற எண்ணில் வாடிக்கையாளர் சேவையை அழைத்து, அவர்களிடம் பிழையின் குறியீடு 9997 எனக் கூறவும்.</string>
+  <string name="vvm3_error_imap_select_error_title">ஏதோ தவறாகிவிட்டது</string>
+  <string name="vvm3_error_imap_select_error_message">%1$s என்ற எண்ணில் வாடிக்கையாளர் சேவையை அழைத்து, அவர்களிடம் பிழையின் குறியீடு 9989 எனக் கூறவும்.</string>
+  <string name="vvm3_error_imap_error_title">ஏதோ தவறாகிவிட்டது</string>
+  <string name="vvm3_error_imap_error_message">%1$s என்ற எண்ணில் வாடிக்கையாளர் சேவையை அழைத்து, அவர்களிடம் பிழையின் குறியீடு 9999 எனக் கூறவும்.</string>
+  <string name="verizon_terms_and_conditions_title">விஷுவல் குரலஞ்சலை இயக்கவும்</string>
+  <string name="verizon_terms_and_conditions_message">%1$s விஷுவல் குரலஞ்சலை இயக்குவதன் மூலம், Verizon Wireless விதிமுறைகள் மற்றும் நிபந்தனைகளை ஏற்கிறீர்கள்:\n\n%2$s</string>
+  <string name="dialer_terms_and_conditions_title">விஷுவல் குரலஞ்சலை இயக்கவும்</string>
+  <string name="dialer_terms_and_conditions_existing_user_title">புதியது! உங்கள் குரலஞ்சலைப் படிக்கலாம்</string>
+  <string name="dialer_terms_and_conditions_message">%s</string>
+  <string name="dialer_terms_and_conditions_1.0">குரலஞ்சலை அழைக்காமலே, உங்கள் செய்திகளைப் பார்க்கலாம், கேட்கலாம். உங்கள் குரலஞ்சலின் டிரான்ஸ்கிரிப்ட்டுகளை, Google இன் இலவச டிரான்ஸ்கிரிப்ஷன் சேவை வழங்குகிறது. அமைப்புகளில் இதை எப்போது வேண்டுமானாலும் நீங்கள் முடக்கலாம். %s</string>
+  <string name="dialer_terms_and_conditions_existing_user">உங்கள் குரலஞ்சலின் டிரான்ஸ்கிரிப்ட்டுகளை, இப்போது Google இன் இலவச டிரான்ஸ்கிரிப்ஷன் சேவை வழங்குகிறது. அமைப்புகளில் இதை எப்போது வேண்டுமானாலும் நீங்கள் முடக்கலாம். %s</string>
+  <string name="dialer_terms_and_conditions_for_verizon_1.0">குரலஞ்சலை அழைக்காமலே, உங்கள் செய்திகளைப் பார்க்கலாம், கேட்கலாம்.</string>
+  <string name="dialer_terms_and_conditions_learn_more">மேலும் அறிக</string>
+  <string name="dialer_terms_and_conditions_existing_user_ack">சரி</string>
+  <string name="dialer_terms_and_conditions_existing_user_decline">வேண்டாம்</string>
+  <string name="terms_and_conditions_decline_dialog_title">விஷுவல் குரலஞ்சலை முடக்கவா?</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_message">விதிமுறைகள் மற்றும் நிபந்தனைகளை நிராகரித்தால், விஷுவல் குரலஞ்சல் முடக்கப்படும்.</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_downgrade">முடக்கு</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_message">விஷுவல் குரலஞ்சலை முடக்கினால், விஷுவல் குரலஞ்சல் முடக்கப்படும்.</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_downgrade">முடக்கு</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message">*86ஐ அழைத்தால் மட்டுமே, குரலஞ்சலை அணுக முடியும். தொடர, புதிய குரலஞ்சல் பின்னை அமைக்கவும்.</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin">பின்னை அமை</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/error/res/values-te/strings.xml b/java/com/android/dialer/voicemail/listui/error/res/values-te/strings.xml
new file mode 100644
index 0000000..53dfbef
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/error/res/values-te/strings.xml
@@ -0,0 +1,102 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_error_activating_title">దృశ్య వాయిస్ మెయిల్‌ను సక్రియం చేస్తోంది</string>
+  <string name="voicemail_error_activating_message">దృశ్య వాయిస్ మెయిల్ పూర్తిగా సక్రియం అయ్యే వరకు మీరు వాయిస్ మెయిల్ నోటిఫికేషన్‌లను స్వీకరించలేకపోవచ్చు. వాయిస్ మెయిల్ పూర్తిగా సక్రియం అయ్యే వరకు కొత్త సందేశాలను తిరిగి పొందడానికి వాయిస్ మెయిల్‌కి కాల్ చేయండి.</string>
+  <string name="voicemail_error_not_activate_no_signal_title">దృశ్య వాయిస్ మెయిల్‌ను సక్రియం చేయడం సాధ్యపడదు</string>
+  <string name="voicemail_error_not_activate_no_signal_message">మీ ఫోన్‌కు మొబైల్ నెట్‌వర్క్ కనెక్షన్ ఉన్నట్లు నిర్ధారించుకొని, ఆపై మళ్లీ ప్రయత్నించండి.</string>
+  <string name="voicemail_error_not_activate_no_signal_airplane_mode_message">ఎయిర్‌ప్లైన్ మోడ్‌ను ఆఫ్ చేసి, ఆపై మళ్లీ ప్రయత్నించండి.</string>
+  <string name="voicemail_error_no_signal_title">కనెక్షన్ లేదు</string>
+  <string name="voicemail_error_no_signal_message">మీకు కొత్త వాయిస్ మెయిల్‌ల గురించి తెలియజేయబడదు. మీరు Wi-Fiలో ఉంటే, ఇప్పుడే సమకాలీకరించడం ద్వారా వాయిస్ మెయిల్‌‍ను తనిఖీ చేయవచ్చు.</string>
+  <string name="voicemail_error_no_signal_airplane_mode_message">మీకు కొత్త వాయిస్ మెయిల్‌ల గురించి తెలియజేయబడదు. మీ వాయిస్ మెయిల్‌‍ను సమకాలీకరించడానికి ఎయిర్‌ప్లైన్ మోడ్‌ను ఆఫ్ చేయండి.</string>
+  <string name="voicemail_error_no_signal_cellular_required_message">వాయిస్ మెయిల్‌ను తనిఖీ చేయడానికి మీ ఫోన్‌కు మొబైల్ డేటా కనెక్షన్ అవసరం.</string>
+  <string name="voicemail_error_activation_failed_title">దృశ్య వాయిస్ మెయిల్‌ను సక్రియం చేయడం సాధ్యపడదు</string>
+  <string name="voicemail_error_activation_failed_message">మీరు ఇప్పటికీ వాయిస్ మెయిల్‌ను తనిఖీ చేయడానికి కాల్ చేయవచ్చు.</string>
+  <string name="voicemail_error_no_data_title">దృశ్య వాయిస్ మెయిల్‌ను నవీకరించడం సాధ్యపడదు</string>
+  <string name="voicemail_error_no_data_message">మీ Wi-Fi లేదా మొబైల్ డేటా కనెక్షన్ మెరుగైనప్పుడు మళ్లీ ప్రయత్నించండి. మీరు ఇప్పటికీ వాయిస్ మెయిల్‌ను తనిఖీ చేయడానికి కాల్ చేయవచ్చు.</string>
+  <string name="voicemail_error_no_data_cellular_required_message">మీ మొబైల్ డేటా కనెక్షన్ మెరుగైనప్పుడు మళ్లీ ప్రయత్నించండి. మీరు ఇప్పటికీ వాయిస్ మెయిల్‌ను తనిఖీ చేయడానికి కాల్ చేయవచ్చు.</string>
+  <string name="voicemail_error_bad_config_title">దృశ్య వాయిస్ మెయిల్‌ను నవీకరించడం సాధ్యపడదు</string>
+  <string name="voicemail_error_bad_config_message">మీరు ఇప్పటికీ వాయిస్ మెయిల్‌ను తనిఖీ చేయడానికి కాల్ చేయవచ్చు.</string>
+  <string name="voicemail_error_communication_title">దృశ్య వాయిస్ మెయిల్‌ను నవీకరించడం సాధ్యపడదు</string>
+  <string name="voicemail_error_communication_message">మీరు ఇప్పటికీ వాయిస్ మెయిల్‌ను తనిఖీ చేయడానికి కాల్ చేయవచ్చు.</string>
+  <string name="voicemail_error_server_connection_title">దృశ్య వాయిస్ మెయిల్‌ను నవీకరించడం సాధ్యపడదు</string>
+  <string name="voicemail_error_server_connection_message">మీరు ఇప్పటికీ వాయిస్ మెయిల్‌ను తనిఖీ చేయడానికి కాల్ చేయవచ్చు.</string>
+  <string name="voicemail_error_server_title">దృశ్య వాయిస్ మెయిల్‌ను నవీకరించడం సాధ్యపడదు</string>
+  <string name="voicemail_error_server_message">మీరు ఇప్పటికీ వాయిస్ మెయిల్‌ను తనిఖీ చేయడానికి కాల్ చేయవచ్చు.</string>
+  <string name="voicemail_error_inbox_near_full_title">ఇన్‌బాక్స్‌ దాదాపు నిండింది</string>
+  <string name="voicemail_error_inbox_near_full_message">మీ ఇన్‌బాక్స్ నిండిపోయి ఉంటే, కొత్త వాయిస్ మెయిల్‌ను స్వీకరించలేరు.</string>
+  <string name="voicemail_error_inbox_full_title">కొత్త వాయిస్ మెయిల్‌లను స్వీకరించలేరు</string>
+  <string name="voicemail_error_inbox_full_message">మీ ఇన్‌బాక్స్ నిండింది. కొత్త వాయిస్ మెయిల్‌ను స్వీకరించడానికి కొన్ని సందేశాలను తొలగించడానికి ప్రయత్నించండి.</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_title">అదనపు నిల్వ మరియు బ్యాకప్‌ను ఆన్ చేయండి</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_message">మీ మెయిల్‌బాక్స్ నిండింది. స్థలాన్ని ఖాళీ చేసేందుకు అదనపు నిల్వను ఆన్ చేయండి, దీని వలన Google మీ వాయిస్ మెయిల్ సందేశాలను నిర్వహించగలదు మరియు బ్యాకప్ చేయగలదు.</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_title">అదనపు నిల్వ మరియు బ్యాకప్‌ను ఆన్ చేయండి</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_message">మీ మెయిల్‌బాక్స్ దాదాపు నిండిపోయింది. స్థలాన్ని ఖాళీ చేసేందుకు అదనపు నిల్వను ఆన్ చేయండి, దీని వలన Google మీ వాయిస్ మెయిల్ సందేశాలను నిర్వహించగలదు మరియు బ్యాకప్ చేయగలదు.</string>
+  <string name="voicemail_error_pin_not_set_title">మీ వాయిస్ మెయిల్ పిన్ సెట్ చేయండి</string>
+  <string name="voicemail_error_pin_not_set_message">మీరు మీ వాయిస్ మెయిల్‌ను యాక్సెస్ చేయడానికి కాల్ చేసే ప్రతిసారి మీకు వాయిస్ మెయిల్ పిన్ అవసరమవుతుంది.</string>
+  <string name="voicemail_action_turn_off_airplane_mode">ఎయిర్‌ప్లైన్ మోడ్ సెట్టింగ్‌లు</string>
+  <string name="voicemail_action_set_pin">పిన్‌ని సెట్ చేయండి</string>
+  <string name="voicemail_action_retry">మళ్లీ ప్రయత్నించు</string>
+  <string name="voicemail_action_turn_archive_on">ఆన్ చేయి</string>
+  <string name="voicemail_action_dimiss">వద్దు, ధన్యవాదాలు</string>
+  <string name="voicemail_action_sync">సమకాలీకరణ</string>
+  <string name="voicemail_action_call_voicemail">వాయిస్ మెయిల్‌కు కాల్ చేయి</string>
+  <string name="voicemail_action_call_customer_support">వినియోగదారు సేవా కేంద్రానికి కాల్ చేయి</string>
+  <string name="vvm3_error_vms_dns_failure_title">ఏదో తప్పు జరిగింది</string>
+  <string name="vvm3_error_vms_dns_failure_message">క్షమించండి, ఒక సమస్య ఏర్పడింది. దయచేసి తర్వాత మళ్లీ ప్రయత్నించండి. అప్పటికీ సమస్య ఉంటే, దయచేసి %1$s నంబర్‌లో వినియోగదారు సేవా కేంద్రానికి కాల్ చేసి, వారికి ఎర్రర్ కోడ్ సంఖ్య 9001 అని తెలపండి.</string>
+  <string name="vvm3_error_vmg_dns_failure_title">ఏదో తప్పు జరిగింది</string>
+  <string name="vvm3_error_vmg_dns_failure_message">క్షమించండి, ఒక సమస్య ఏర్పడింది. దయచేసి తర్వాత మళ్లీ ప్రయత్నించండి. అప్పటికీ సమస్య ఉంటే, దయచేసి %1$s నంబర్‌లో వినియోగదారు సేవా కేంద్రానికి కాల్ చేసి, వారికి ఎర్రర్ కోడ్ సంఖ్య 9002 అని తెలపండి.</string>
+  <string name="vvm3_error_spg_dns_failure_title">ఏదో తప్పు జరిగింది</string>
+  <string name="vvm3_error_spg_dns_failure_message">క్షమించండి, ఒక సమస్య ఏర్పడింది. దయచేసి తర్వాత మళ్లీ ప్రయత్నించండి. అప్పటికీ సమస్య ఉంటే, దయచేసి %1$s నంబర్‌లో వినియోగదారు సేవా కేంద్రానికి కాల్ చేసి, వారికి ఎర్రర్ కోడ్ సంఖ్య 9003 అని తెలపండి.</string>
+  <string name="vvm3_error_vms_no_cellular_title">మీ వాయిస్‌ మెయిల్‌బాక్స్‌కు కనెక్ట్ చేయడం సాధ్యపడదు</string>
+  <string name="vvm3_error_vms_no_cellular_message">క్షమించండి, మీ వాయిస్ మెయిల్‌బాక్స్‌కు కనెక్ట్ చేయడంలో సమస్య ఎదుర్కొంటున్నాము. మీరు సిగ్నల్ బలహీనంగా ఉన్న ప్రాంతంలో ఉన్నట్లయితే, శక్తివంతమైన సిగ్నల్ పొందే వరకు వేచి ఉండి, ఆపై మళ్లీ ప్రయత్నించండి. అప్పటికీ సమస్య ఉన్నట్లయితే, దయచేసి %1$s నంబర్‌లో వినియోగదారు సేవా కేంద్రానికి కాల్ చేసి, వారికి ఎర్రర్ కోడ్ సంఖ్య 9004 అని తెలపండి.</string>
+  <string name="vvm3_error_vmg_no_cellular_title">మీ వాయిస్‌ మెయిల్‌బాక్స్‌కు కనెక్ట్ చేయడం సాధ్యపడదు</string>
+  <string name="vvm3_error_vmg_no_cellular_message">క్షమించండి, మీ వాయిస్ మెయిల్‌బాక్స్‌కు కనెక్ట్ చేయడంలో సమస్య ఎదుర్కొంటున్నాము. మీరు సిగ్నల్ బలహీనంగా ఉన్న ప్రాంతంలో ఉన్నట్లయితే, శక్తివంతమైన సిగ్నల్ పొందే వరకు వేచి ఉండి, ఆపై మళ్లీ ప్రయత్నించండి. అప్పటికీ సమస్య ఉన్నట్లయితే, దయచేసి %1$s నంబర్‌లో వినియోగదారు సేవా కేంద్రానికి కాల్ చేసి, వారికి ఎర్రర్ కోడ్ సంఖ్య 9005 అని తెలపండి.</string>
+  <string name="vvm3_error_spg_no_cellular_title">మీ వాయిస్‌ మెయిల్‌బాక్స్‌కు కనెక్ట్ చేయడం సాధ్యపడదు</string>
+  <string name="vvm3_error_spg_no_cellular_message">క్షమించండి, మీ వాయిస్ మెయిల్‌బాక్స్‌కు కనెక్ట్ చేయడంలో సమస్య ఎదుర్కొంటున్నాము. మీరు సిగ్నల్ బలహీనంగా ఉన్న ప్రాంతంలో ఉన్నట్లయితే, శక్తివంతమైన సిగ్నల్ పొందే వరకు వేచి ఉండి, ఆపై మళ్లీ ప్రయత్నించండి. అప్పటికీ సమస్య ఉన్నట్లయితే, దయచేసి %1$s నంబర్‌లో వినియోగదారు సేవా కేంద్రానికి కాల్ చేసి, వారికి ఎర్రర్ కోడ్ సంఖ్య 9006 అని తెలపండి.</string>
+  <string name="vvm3_error_vms_timeout_title">ఏదో తప్పు జరిగింది</string>
+  <string name="vvm3_error_vms_timeout_message">క్షమించండి, ఒక సమస్య ఏర్పడింది. దయచేసి తర్వాత మళ్లీ ప్రయత్నించండి. అప్పటికీ సమస్య ఉంటే, దయచేసి %1$s నంబర్‌లో వినియోగదారు సేవా కేంద్రానికి కాల్ చేసి, వారికి ఎర్రర్ కోడ్ సంఖ్య 9007 అని తెలపండి.</string>
+  <string name="vvm3_error_vmg_timeout_title">ఏదో తప్పు జరిగింది</string>
+  <string name="vvm3_error_vmg_timeout_message">క్షమించండి, ఒక సమస్య ఏర్పడింది. దయచేసి తర్వాత మళ్లీ ప్రయత్నించండి. అప్పటికీ సమస్య ఉంటే, దయచేసి %1$s నంబర్‌లో వినియోగదారు సేవా కేంద్రానికి కాల్ చేసి, వారికి ఎర్రర్ కోడ్ సంఖ్య 9008 అని తెలపండి.</string>
+  <string name="vvm3_error_status_sms_timeout_title">ఏదో తప్పు జరిగింది</string>
+  <string name="vvm3_error_status_sms_timeout_message">క్షమించండి, మీకు సేవ ఏర్పాటు చేయడంలో సమస్య ఎదుర్కొంటున్నాము. దయచేసి తర్వాత మళ్లీ ప్రయత్నించండి. అప్పటికీ సమస్య ఉంటే, దయచేసి %1$s నంబర్‌లో వినియోగదారు సేవా కేంద్రానికి కాల్ చేసి, వారికి ఎర్రర్ కోడ్ సంఖ్య 9009 అని తెలపండి.</string>
+  <string name="vvm3_error_subscriber_blocked_title">మీ వాయిస్‌ మెయిల్‌బాక్స్‌కు కనెక్ట్ చేయడం సాధ్యపడదు</string>
+  <string name="vvm3_error_subscriber_blocked_message">క్షమించండి, ఈ సమయంలో మేము మీ ఇన్‌బాక్స్‌కు కనెక్ట్ చేయలేకపోతున్నాము. దయచేసి తర్వాత మళ్లీ ప్రయత్నించండి. అప్పటికీ సమస్య ఉంటే, దయచేసి %1$s నంబర్‌లో వినియోగదారు సేవా కేంద్రానికి కాల్ చేసి, వారికి ఎర్రర్ కోడ్ సంఖ్య 9990 అని తెలపండి.</string>
+  <string name="vvm3_error_unknown_user_title">వాయిస్ మెయిల్ సెటప్ చేయండి</string>
+  <string name="vvm3_error_unknown_user_message">మీ ఖాతాలో వాయిస్ మెయిల్ సెటప్ చేయబడలేదు. దయచేసి %1$s నంబర్‌లో వినియోగదారు సేవా కేంద్రానికి కాల్ చేసి, వారికి ఎర్రర్ కోడ్ 9991 అని తెలపండి.</string>
+  <string name="vvm3_error_unknown_device_title">వాయిస్ మెయిల్</string>
+  <string name="vvm3_error_unknown_device_message">ఈ పరికరంలో దృశ్య వాయిస్ మెయిల్‌ను ఉపయోగించలేరు. దయచేసి %1$s నంబర్‌లో వినియోగదారు సేవా కేంద్రానికి కాల్ చేసి, వారికి ఎర్రర్ కోడ్ 9992 అని తెలపండి.</string>
+  <string name="vvm3_error_invalid_password_title">ఏదో తప్పు జరిగింది</string>
+  <string name="vvm3_error_invalid_password_message">దయచేసి %1$s నంబర్‌లో వినియోగదారు సేవా కేంద్రానికి కాల్ చేసి, వారికి ఎర్రర్ కోడ్ 9993 అని తెలపండి.</string>
+  <string name="vvm3_error_mailbox_not_initialized_title">దృశ్య వాయిస్ మెయిల్</string>
+  <string name="vvm3_error_mailbox_not_initialized_message">దృశ్య వాయిస్ మెయిల్ సెటప్‌ను పూర్తి చేయడానికి, దయచేసి %1$s నంబర్‌లో వినియోగదారు సేవా కేంద్రానికి కాల్ చేసి, వారికి ఎర్రర్ కోడ్ 9994 అని తెలపండి.</string>
+  <string name="vvm3_error_service_not_provisioned_title">దృశ్య వాయిస్ మెయిల్</string>
+  <string name="vvm3_error_service_not_provisioned_message">దృశ్య వాయిస్ మెయిల్ సెటప్‌ను పూర్తి చేయడానికి, దయచేసి %1$s నంబర్‌లో వినియోగదారు సేవా కేంద్రానికి కాల్ చేసి, వారికి ఎర్రర్ కోడ్ 9995 అని తెలపండి.</string>
+  <string name="vvm3_error_service_not_activated_title">దృశ్య వాయిస్ మెయిల్</string>
+  <string name="vvm3_error_service_not_activated_message">దృశ్య వాయిస్ మెయిల్‌ను సక్రియం చేయడానికి, దయచేసి %1$s నంబర్‌లో వినియోగదారు సేవా కేంద్రానికి కాల్ చేసి, వారికి ఎర్రర్ కోడ్ 9996 అని తెలపండి.</string>
+  <string name="vvm3_error_user_blocked_title">ఏదో తప్పు జరిగింది</string>
+  <string name="vvm3_error_user_blocked_message">దృశ్య వాయిస్ మెయిల్ సెటప్‌ను పూర్తి చేయడానికి, దయచేసి %1$s నంబర్‌లో వినియోగదారు సేవా కేంద్రానికి కాల్ చేసి, వారికి ఎర్రర్ కోడ్ 9998 అని తెలపండి.</string>
+  <string name="vvm3_error_subscriber_unknown_title">దృశ్య వాయిస్ మెయిల్ నిలిపివేయబడింది</string>
+  <string name="vvm3_error_subscriber_unknown_message">దృశ్య వాయిస్ మెయిల్‌ను సక్రియం చేయడానికి దయచేసి %1$s నంబర్‌లో వినియోగదారు సేవా కేంద్రానికి కాల్ చేయండి.</string>
+  <string name="vvm3_error_imap_getquota_error_title">ఏదో తప్పు జరిగింది</string>
+  <string name="vvm3_error_imap_getquota_error_message">దయచేసి %1$s నంబర్‌లో వినియోగదారు సేవా కేంద్రానికి కాల్ చేసి, వారికి ఎర్రర్ కోడ్ 9997 అని తెలపండి.</string>
+  <string name="vvm3_error_imap_select_error_title">ఏదో తప్పు జరిగింది</string>
+  <string name="vvm3_error_imap_select_error_message">దయచేసి %1$s నంబర్‌లో వినియోగదారు సేవా కేంద్రానికి కాల్ చేసి, వారికి ఎర్రర్ కోడ్ 9989 అని తెలపండి.</string>
+  <string name="vvm3_error_imap_error_title">ఏదో తప్పు జరిగింది</string>
+  <string name="vvm3_error_imap_error_message">దయచేసి %1$s నంబర్‌లో వినియోగదారు సేవా కేంద్రానికి కాల్ చేసి, వారికి ఎర్రర్ కోడ్ 9999 అని తెలపండి.</string>
+  <string name="verizon_terms_and_conditions_title">దృశ్య వాయిస్ మెయిల్‌ను ఆన్ చేయండి</string>
+  <string name="verizon_terms_and_conditions_message">%1$s దృశ్య వాయిస్ మెయిల్‌ని ఆన్ చేయడం ద్వారా మీరు Verizon వైర్‌లెస్ నిబంధనలు మరియు షరతులకు అంగీకరిస్తున్నారు:\n\n%2$s</string>
+  <string name="dialer_terms_and_conditions_title">దృశ్య వాయిస్ మెయిల్‌ను ఆన్ చేయండి</string>
+  <string name="dialer_terms_and_conditions_existing_user_title">కొత్తది! మీ వాయిస్ మెయిల్‌ని చదవండి</string>
+  <string name="dialer_terms_and_conditions_message">%s</string>
+  <string name="dialer_terms_and_conditions_1.0">వాయిస్‌మెయిల్‌కి కాల్ చేయాల్సిన అవసరం లేకుండానే మీ సందేశాలను చూడండి మరియు వినండి. Google యొక్క ఉచిత లిపి మార్పు సేవ ద్వారా మీ వాయిస్‌మెయిల్ లిపి మార్పులు అందించబడతాయి. మీరు ఏ సమయంలోనైనా సెట్టింగులలో దీనిని ఆఫ్ చేయవచ్చు. %s</string>
+  <string name="dialer_terms_and_conditions_existing_user">ఇప్పుడు Google యొక్క ఉచిత లిపి మార్పు సేవ ద్వారా మీ వాయిస్‌మెయిల్ లిపి మార్పులు అందించబడతాయి. మీరు ఏ సమయంలోనైనా సెట్టింగులలో దీనిని ఆఫ్ చేయవచ్చు. %s</string>
+  <string name="dialer_terms_and_conditions_for_verizon_1.0">వాయిస్ మెయిల్‌కి కాల్ చేయకుండానే మీ సందేశాలను చూడండి మరియు వినండి.</string>
+  <string name="dialer_terms_and_conditions_learn_more">మరింత తెలుసుకోండి</string>
+  <string name="dialer_terms_and_conditions_existing_user_ack">సరే, అర్థమైంది</string>
+  <string name="dialer_terms_and_conditions_existing_user_decline">వద్దు, ధన్యవాదాలు</string>
+  <string name="terms_and_conditions_decline_dialog_title">దృశ్య వాయిస్ మెయిల్‌ను నిలిపివేయాలా?</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_message">నిబంధనలు మరియు షరతులను తిరస్కరిస్తే దృశ్య వాయిస్ మెయిల్ నిలిపివేయబడుతుంది.</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_downgrade">నిలిపివేయి</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_message">మీరు దృశ్య వాయిస్ మెయిల్‌ని నిలిపివేసినట్లయితే దృశ్య వాయిస్ మెయిల్ ఆఫ్ చేయబడుతుంది.</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_downgrade">నిలిపివేయి</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message">వాయిస్ మెయిల్‌ను కేవలం *86కి కాల్ చేయడం ద్వారా మాత్రమే యాక్సెస్ చేయగలరు. కొనసాగించడానికి కొత్త వాయిస్ మెయిల్ పిన్‌ని సెట్ చేయండి.</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin">పిన్‌ని సెట్ చేయండి</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/error/res/values-th/strings.xml b/java/com/android/dialer/voicemail/listui/error/res/values-th/strings.xml
new file mode 100644
index 0000000..0390903
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/error/res/values-th/strings.xml
@@ -0,0 +1,102 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_error_activating_title">กำลังเปิดใช้ข้อความเสียงพร้อมภาพ</string>
+  <string name="voicemail_error_activating_message">คุณอาจไม่ได้รับการแจ้งเตือนข้อความเสียงจนกว่าจะเปิดใช้ข้อความเสียงพร้อมภาพแบบเต็มรูปแบบ โทรฟังข้อความเสียงเพื่อเรียกข้อความใหม่จนกว่าจะเปิดใช้ข้อความเสียงพร้อมภาพแบบเต็มรูปแบบ</string>
+  <string name="voicemail_error_not_activate_no_signal_title">เปิดใช้ข้อความเสียงพร้อมภาพไม่ได้</string>
+  <string name="voicemail_error_not_activate_no_signal_message">โปรดตรวจสอบว่าโทรศัพท์เชื่อมต่อเครือข่ายมือถืออยู่ แล้วลองใหม่</string>
+  <string name="voicemail_error_not_activate_no_signal_airplane_mode_message">ปิดโหมดบนเครื่องบินและลองใหม่</string>
+  <string name="voicemail_error_no_signal_title">ไม่มีการเชื่อมต่อ</string>
+  <string name="voicemail_error_no_signal_message">คุณจะไม่ได้รับข้อความเสียงใหม่ หากใช้เครือข่าย Wi-Fi อยู่ จะตรวจสอบข้อความเสียงได้ด้วยการซิงค์เดี๋ยวนี้</string>
+  <string name="voicemail_error_no_signal_airplane_mode_message">คุณจะไม่ได้รับข้อความเสียงใหม่ ปิดโหมดบนเครื่องบินเพื่อซิงค์ข้อความเสียง</string>
+  <string name="voicemail_error_no_signal_cellular_required_message">โทรศัพท์ต้องเชื่อมต่ออินเทอร์เน็ตมือถือจึงจะตรวจสอบข้อความเสียงได้</string>
+  <string name="voicemail_error_activation_failed_title">เปิดใช้ข้อความเสียงพร้อมภาพไม่ได้</string>
+  <string name="voicemail_error_activation_failed_message">คุณยังโทรเพื่อตรวจสอบข้อความเสียงได้</string>
+  <string name="voicemail_error_no_data_title">อัปเดตข้อความเสียงพร้อมภาพไม่ได้</string>
+  <string name="voicemail_error_no_data_message">ลองใหม่เมื่อการเชื่อมต่อ Wi-Fi หรืออินเทอร์เน็ตมือถือถือดีขึ้น คุณยังโทรเพื่อตรวจสอบข้อความเสียงได้</string>
+  <string name="voicemail_error_no_data_cellular_required_message">ลองใหม่เมื่อการเชื่อมต่ออินเทอร์เน็ตมือถือดีขึ้น คุณยังโทรเพื่อตรวจสอบข้อความเสียงได้</string>
+  <string name="voicemail_error_bad_config_title">อัปเดตข้อความเสียงพร้อมภาพไม่ได้</string>
+  <string name="voicemail_error_bad_config_message">คุณยังโทรเพื่อตรวจสอบข้อความเสียงได้</string>
+  <string name="voicemail_error_communication_title">อัปเดตข้อความเสียงพร้อมภาพไม่ได้</string>
+  <string name="voicemail_error_communication_message">คุณยังโทรเพื่อตรวจสอบข้อความเสียงได้</string>
+  <string name="voicemail_error_server_connection_title">อัปเดตข้อความเสียงพร้อมภาพไม่ได้</string>
+  <string name="voicemail_error_server_connection_message">คุณยังโทรเพื่อตรวจสอบข้อความเสียงได้</string>
+  <string name="voicemail_error_server_title">อัปเดตข้อความเสียงพร้อมภาพไม่ได้</string>
+  <string name="voicemail_error_server_message">คุณยังโทรเพื่อตรวจสอบข้อความเสียงได้</string>
+  <string name="voicemail_error_inbox_near_full_title">กล่องจดหมายเกือบเต็มแล้ว</string>
+  <string name="voicemail_error_inbox_near_full_message">คุณจะรับข้อความเสียงใหม่ไม่ได้ หากกล่องจดหมายเต็ม</string>
+  <string name="voicemail_error_inbox_full_title">รับข้อความเสียงใหม่ไม่ได้</string>
+  <string name="voicemail_error_inbox_full_message">กล่องจดหมายเต็ม ลองลบข้อความบางส่วนออกเพื่อรับข้อความเสียงใหม่</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_title">เปิดพื้นที่เก็บข้อมูลเพิ่มเติมและการสำรองข้อมูล</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_message">กล่องจดหมายของคุณเต็มแล้ว หากต้องการเพิ่มพื้นที่ว่าง โปรดเปิดพื้นที่เก็บข้อมูลเพิ่มเติมเพื่อให้ Google จัดการและเก็บสำรองข้อความเสียงได้</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_title">เปิดพื้นที่เก็บข้อมูลเพิ่มเติมและการสำรองข้อมูล</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_message">กล่องจดหมายของคุณใกล้เต็มแล้ว หากต้องการเพิ่มพื้นที่ว่าง โปรดเปิดพื้นที่เก็บข้อมูลเพิ่มเติมเพื่อให้ Google จัดการและเก็บสำรองข้อความเสียงได้</string>
+  <string name="voicemail_error_pin_not_set_title">ตั้งค่า PIN ข้อความเสียง</string>
+  <string name="voicemail_error_pin_not_set_message">คุณต้องใช้ PIN ข้อความเสียงทุกครั้งที่โทรหาบริการข้อความเสียง</string>
+  <string name="voicemail_action_turn_off_airplane_mode">การตั้งค่าโหมดบนเครื่องบิน</string>
+  <string name="voicemail_action_set_pin">ตั้งค่า PIN</string>
+  <string name="voicemail_action_retry">ลองอีกครั้ง</string>
+  <string name="voicemail_action_turn_archive_on">เปิด</string>
+  <string name="voicemail_action_dimiss">ไม่เป็นไร</string>
+  <string name="voicemail_action_sync">ซิงค์</string>
+  <string name="voicemail_action_call_voicemail">เรียกข้อความเสียง</string>
+  <string name="voicemail_action_call_customer_support">โทรติดต่อฝ่ายสนับสนุนลูกค้า</string>
+  <string name="vvm3_error_vms_dns_failure_title">เกิดข้อผิดพลาด</string>
+  <string name="vvm3_error_vms_dns_failure_message">ขออภัย เราพบว่ามีปัญหาเกิดขึ้น โปรดลองอีกครั้งในภายหลัง หากยังพบปัญหาอยู่ โปรดติดต่อฝ่ายสนับสนุนลูกค้าที่หมายเลข %1$s และแจ้งรหัสข้อผิดพลาด 9001</string>
+  <string name="vvm3_error_vmg_dns_failure_title">เกิดข้อผิดพลาด</string>
+  <string name="vvm3_error_vmg_dns_failure_message">ขออภัย เราพบว่ามีปัญหาเกิดขึ้น โปรดลองอีกครั้งในภายหลัง หากยังพบปัญหาอยู่ โปรดติดต่อฝ่ายสนับสนุนลูกค้าที่หมายเลข %1$s และแจ้งรหัสข้อผิดพลาด 9002</string>
+  <string name="vvm3_error_spg_dns_failure_title">เกิดข้อผิดพลาด</string>
+  <string name="vvm3_error_spg_dns_failure_message">ขออภัย เราพบว่ามีปัญหาเกิดขึ้น โปรดลองอีกครั้งในภายหลัง หากยังพบปัญหาอยู่ โปรดติดต่อฝ่ายสนับสนุนลูกค้าที่หมายเลข %1$s และแจ้งรหัสข้อผิดพลาด 9003</string>
+  <string name="vvm3_error_vms_no_cellular_title">เชื่อมต่อกล่องข้อความเสียงไม่ได้</string>
+  <string name="vvm3_error_vms_no_cellular_message">ขออภัย เราพบปัญหาในการเชื่อมต่อกล่องข้อความเสียง หากคุณอยู่ในพื้นที่ที่สัญญาณอ่อน ขอให้รอจนกว่าสัญญาณแรงแล้วลองอีกครั้ง หากยังพบปัญหาอยู่ โปรดติดต่อฝ่ายสนับสนุนลูกค้าที่หมายเลข %1$s และแจ้งรหัสข้อผิดพลาด 9004</string>
+  <string name="vvm3_error_vmg_no_cellular_title">เชื่อมต่อกล่องข้อความเสียงไม่ได้</string>
+  <string name="vvm3_error_vmg_no_cellular_message">ขออภัย เราพบปัญหาในการเชื่อมต่อกล่องข้อความเสียง หากคุณอยู่ในพื้นที่ที่สัญญาณอ่อน ขอให้รอจนกว่าสัญญาณแรงแล้วลองอีกครั้ง หากยังพบปัญหาอยู่ โปรดติดต่อฝ่ายสนับสนุนลูกค้าที่หมายเลข %1$s และแจ้งรหัสข้อผิดพลาด 9005</string>
+  <string name="vvm3_error_spg_no_cellular_title">เชื่อมต่อกล่องข้อความเสียงไม่ได้</string>
+  <string name="vvm3_error_spg_no_cellular_message">ขออภัย เราพบปัญหาในการเชื่อมต่อกล่องข้อความเสียง หากคุณอยู่ในพื้นที่ที่สัญญาณอ่อน ขอให้รอจนกว่าสัญญาณแรงแล้วลองอีกครั้ง หากยังพบปัญหาอยู่ โปรดติดต่อฝ่ายสนับสนุนลูกค้าที่หมายเลข %1$s และแจ้งรหัสข้อผิดพลาด 9006</string>
+  <string name="vvm3_error_vms_timeout_title">เกิดข้อผิดพลาด</string>
+  <string name="vvm3_error_vms_timeout_message">ขออภัย เราพบว่ามีปัญหาเกิดขึ้น โปรดลองอีกครั้งในภายหลัง หากยังพบปัญหาอยู่ โปรดติดต่อฝ่ายสนับสนุนลูกค้าที่หมายเลข %1$s และแจ้งรหัสข้อผิดพลาด 9007</string>
+  <string name="vvm3_error_vmg_timeout_title">เกิดข้อผิดพลาด</string>
+  <string name="vvm3_error_vmg_timeout_message">ขออภัย เราพบว่ามีปัญหาเกิดขึ้น โปรดลองอีกครั้งในภายหลัง หากยังพบปัญหาอยู่ โปรดติดต่อฝ่ายสนับสนุนลูกค้าที่หมายเลข %1$s และแจ้งรหัสข้อผิดพลาด 9008</string>
+  <string name="vvm3_error_status_sms_timeout_title">เกิดข้อผิดพลาด</string>
+  <string name="vvm3_error_status_sms_timeout_message">ขออภัย เราพบว่ามีปัญหาเกิดขึ้น โปรดลองอีกครั้งในภายหลัง หากยังพบปัญหาอยู่ โปรดติดต่อฝ่ายสนับสนุนลูกค้าที่หมายเลข %1$s และแจ้งรหัสข้อผิดพลาด 9009</string>
+  <string name="vvm3_error_subscriber_blocked_title">เชื่อมต่อกล่องข้อความเสียงไม่ได้</string>
+  <string name="vvm3_error_subscriber_blocked_message">ขออภัย เราเชื่อมต่อกับกล่องข้อความเสียงไม่ได้ในขณะนี้ โปรดลองอีกครั้งในภายหลัง หากยังพบปัญหาอยู่ โปรดติดต่อฝ่ายสนับสนุนลูกค้าที่หมายเลข %1$s และแจ้งรหัสข้อผิดพลาด 9990</string>
+  <string name="vvm3_error_unknown_user_title">ตั้งค่าข้อความเสียง</string>
+  <string name="vvm3_error_unknown_user_message">ยังไม่ได้ตั้งค่าข้อความเสียงในบัญชี โปรดติดต่อฝ่ายสนับสนุนลูกค้าที่หมายเลข %1$s และแจ้งรหัสข้อผิดพลาด 9991</string>
+  <string name="vvm3_error_unknown_device_title">ข้อความเสียง</string>
+  <string name="vvm3_error_unknown_device_message">ใช้ข้อความเสียงพร้อมภาพในอุปกรณ์เครื่องนี้ไม่ได้ โปรดติดต่อฝ่ายบริการลูกค้าที่หมายเลข %1$s แล้วแจ้งรหัสข้อผิดพลาด 9992</string>
+  <string name="vvm3_error_invalid_password_title">เกิดข้อผิดพลาด</string>
+  <string name="vvm3_error_invalid_password_message">โปรดติดต่อฝ่ายสนับสนุนลูกค้าที่หมายเลข %1$s และแจ้งรหัสข้อผิดพลาด 9993</string>
+  <string name="vvm3_error_mailbox_not_initialized_title">ข้อความเสียงพร้อมภาพ</string>
+  <string name="vvm3_error_mailbox_not_initialized_message">หากต้องการตั้งค่าข้อความเสียงพร้อมภาพให้เสร็จสมบูรณ์ โปรดติดต่อฝ่ายบริการลูกค้าที่หมายเลข %1$s แล้วแจ้งรหัสข้อผิดพลาด 9994</string>
+  <string name="vvm3_error_service_not_provisioned_title">ข้อความเสียงพร้อมภาพ</string>
+  <string name="vvm3_error_service_not_provisioned_message">หากต้องการตั้งค่าข้อความเสียงพร้อมภาพ โปรดติดต่อฝ่ายบริการลูกค้าที่หมายเลข %1$s แล้วแจ้งรหัสข้อผิดพลาด 9995</string>
+  <string name="vvm3_error_service_not_activated_title">ข้อความเสียงพร้อมภาพ</string>
+  <string name="vvm3_error_service_not_activated_message">หากต้องการเปิดใช้งานข้อความเสียงพร้อมภาพ โปรดติดต่อฝ่ายบริการลูกค้าที่หมายเลข %1$s แล้วแจ้งรหัสข้อผิดพลาด 9996</string>
+  <string name="vvm3_error_user_blocked_title">เกิดข้อผิดพลาด</string>
+  <string name="vvm3_error_user_blocked_message">หากต้องการตั้งค่าข้อความเสียงพร้อมภาพให้เสร็จสมบูรณ์ โปรดติดต่อฝ่ายบริการลูกค้าที่หมายเลข %1$s แล้วแจ้งรหัสข้อผิดพลาด 9998</string>
+  <string name="vvm3_error_subscriber_unknown_title">ปิดใช้ข้อความเสียงพร้อมภาพ</string>
+  <string name="vvm3_error_subscriber_unknown_message">โปรดติดต่อฝ่ายสนับสนุนลูกค้าที่หมายเลข %1$s เพื่อเปิดใช้ข้อความเสียงพร้อมภาพ</string>
+  <string name="vvm3_error_imap_getquota_error_title">เกิดข้อผิดพลาด</string>
+  <string name="vvm3_error_imap_getquota_error_message">โปรดติดต่อฝ่ายสนับสนุนลูกค้าที่หมายเลข %1$s และแจ้งรหัสข้อผิดพลาด 9997</string>
+  <string name="vvm3_error_imap_select_error_title">เกิดข้อผิดพลาด</string>
+  <string name="vvm3_error_imap_select_error_message">โปรดติดต่อฝ่ายสนับสนุนลูกค้าที่หมายเลข %1$s และแจ้งรหัสข้อผิดพลาด 9989</string>
+  <string name="vvm3_error_imap_error_title">เกิดข้อผิดพลาด</string>
+  <string name="vvm3_error_imap_error_message">โปรดติดต่อฝ่ายสนับสนุนลูกค้าที่หมายเลข %1$s และแจ้งรหัสข้อผิดพลาด 9999</string>
+  <string name="verizon_terms_and_conditions_title">เปิดข้อความเสียงพร้อมภาพ</string>
+  <string name="verizon_terms_and_conditions_message">%1$s การเปิดข้อความเสียงพร้อมภาพหมายความว่าคุณยอมรับข้อกำหนดในการให้บริการของ Verizon Wireless\n\n%2$s</string>
+  <string name="dialer_terms_and_conditions_title">เปิดข้อความเสียงพร้อมภาพ</string>
+  <string name="dialer_terms_and_conditions_existing_user_title">ใหม่! อ่านข้อความเสียง</string>
+  <string name="dialer_terms_and_conditions_message">%s</string>
+  <string name="dialer_terms_and_conditions_1.0">ดูและฟังข้อความได้โดยไม่ต้องโทรไปฟังข้อความเสียงเอง บริการถอดเสียงฟรีของ Google ถอดเสียงข้อความให้คุณแล้ว โดยเลือกปิดฟีเจอร์นี้ในการตั้งค่าได้ทุกเมื่อ %s</string>
+  <string name="dialer_terms_and_conditions_existing_user">บริการถอดเสียงฟรีของ Google ถอดเสียงข้อความให้คุณแล้ว โดยเลือกปิดฟีเจอร์นี้ในการตั้งค่าได้ทุกเมื่อ %s</string>
+  <string name="dialer_terms_and_conditions_for_verizon_1.0">ดูและฟังข้อความโดยไม่ต้องโทรไปฟังข้อความเสียงเอง %s</string>
+  <string name="dialer_terms_and_conditions_learn_more">ดูข้อมูลเพิ่มเติม</string>
+  <string name="dialer_terms_and_conditions_existing_user_ack">รับทราบ</string>
+  <string name="dialer_terms_and_conditions_existing_user_decline">ไม่เป็นไร</string>
+  <string name="terms_and_conditions_decline_dialog_title">ปิดใช้ข้อความเสียงพร้อมภาพไหม</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_message">ระบบจะปิดใช้ข้อความเสียงพร้อมภาพ หากคุณไม่ยอมรับข้อกำหนดในการใช้บริการ</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_downgrade">ปิดใช้</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_message">ระบบจะปิดใช้ข้อความเสียงพร้อมภาพ หากคุณปิดข้อความเสียงพร้อมภาพ</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_downgrade">ปิดใช้</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message">คุณรับฟังข้อความเสียงได้ด้วยการโทรไป *86 เท่านั้น และตั้งค่า PIN ข้อความเสียงใหม่เพื่อดำเนินการต่อ</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin">ตั้งค่า PIN</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/error/res/values-tl/strings.xml b/java/com/android/dialer/voicemail/listui/error/res/values-tl/strings.xml
new file mode 100644
index 0000000..82dfc8e
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/error/res/values-tl/strings.xml
@@ -0,0 +1,102 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_error_activating_title">Ina-activate ang visual na voicemail</string>
+  <string name="voicemail_error_activating_message">Maaaring hindi ka makatanggap ng mga notification sa voicemail hanggang sa ganap na ma-activate ang visual na voicemail. Tawagan ang voicemail para makuha ang mga bagong mensahe hanggang sa ganap na ma-activate ang voicemail.</string>
+  <string name="voicemail_error_not_activate_no_signal_title">Hindi ma-activate ang visual na voicemail</string>
+  <string name="voicemail_error_not_activate_no_signal_message">Tiyaking mayroong koneksyon sa mobile network ang iyong telepono at subukang muli.</string>
+  <string name="voicemail_error_not_activate_no_signal_airplane_mode_message">I-off ang airplane mode at subukang muli.</string>
+  <string name="voicemail_error_no_signal_title">Walang koneksyon</string>
+  <string name="voicemail_error_no_signal_message">Hindi ka aabisuhan para sa mga bagong voicemail. Kung nasa Wi-Fi ka, maaari mong tingnan ang voicemail sa pamamagitan ng pag-sync ngayon.</string>
+  <string name="voicemail_error_no_signal_airplane_mode_message">Hindi ka aabisuhan para sa mga bagong voicemail. I-off ang airplane mode para i-sync ang iyong voicemail.</string>
+  <string name="voicemail_error_no_signal_cellular_required_message">Kailangan ng koneksyon ng mobile data ng iyong telepono para tingnan ang voicemail.</string>
+  <string name="voicemail_error_activation_failed_title">Hindi ma-activate ang visual na voicemail</string>
+  <string name="voicemail_error_activation_failed_message">Maaari ka pa ring tumawag para tingnan ang voicemail.</string>
+  <string name="voicemail_error_no_data_title">Hindi ma-update ang visual na voicemail</string>
+  <string name="voicemail_error_no_data_message">Subukang muli kapag mas maganda na ang iyong Wi-Fi o koneksyon ng mobile data. Maaari ka pa ring tumawag para tingnan ang voicemail.</string>
+  <string name="voicemail_error_no_data_cellular_required_message">Subukang muli kapag mas maganda na ang iyong koneksyon ng mobile data. Maaari ka pa ring tumawag para tingnan ang voicemail.</string>
+  <string name="voicemail_error_bad_config_title">Hindi ma-update ang visual na voicemail</string>
+  <string name="voicemail_error_bad_config_message">Maaari ka pa ring tumawag para tingnan ang voicemail.</string>
+  <string name="voicemail_error_communication_title">Hindi ma-update ang visual na voicemail</string>
+  <string name="voicemail_error_communication_message">Maaari ka pa ring tumawag para tingnan ang voicemail.</string>
+  <string name="voicemail_error_server_connection_title">Hindi ma-update ang visual na voicemail</string>
+  <string name="voicemail_error_server_connection_message">Maaari ka pa ring tumawag para tingnan ang voicemail.</string>
+  <string name="voicemail_error_server_title">Hindi ma-update ang visual na voicemail</string>
+  <string name="voicemail_error_server_message">Maaari ka pa ring tumawag para tingnan ang voicemail.</string>
+  <string name="voicemail_error_inbox_near_full_title">Malapit nang mapuno ang inbox</string>
+  <string name="voicemail_error_inbox_near_full_message">Hindi ka makakatanggap ng bagong voicemail kung puno na ang inbox mo.</string>
+  <string name="voicemail_error_inbox_full_title">Hindi makatanggap ng mga bagong voicemail</string>
+  <string name="voicemail_error_inbox_full_message">Puno na ang inbox mo. Subukang i-delete ang ilang mensahe para makatanggap ng bagong voicemail.</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_title">I-on ang karagdagang storage at backup</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_message">Puno na ang iyong mailbox. Para magbakante ng space, i-on ang karagdagang storage para pamahalaan at i-back up ng Google ang iyong mga mensahe sa voicemail.</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_title">I-on ang karagdagang storage at backup</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_message">Malapit nang mapuno ang iyong mailbox. Para magbakante ng space, i-on ang karagdagang storage para pamahalaan at i-back up ng Google ang iyong mga mensahe sa voicemail.</string>
+  <string name="voicemail_error_pin_not_set_title">Itakda ang iyong PIN sa voicemail</string>
+  <string name="voicemail_error_pin_not_set_message">Kakailanganin mo ng isang PIN sa voicemail sa tuwing tatawag ka para ma-access ang iyong voicemail.</string>
+  <string name="voicemail_action_turn_off_airplane_mode">Mga Setting ng Airplane Mode</string>
+  <string name="voicemail_action_set_pin">Magtakda ng PIN</string>
+  <string name="voicemail_action_retry">Subukang Muli</string>
+  <string name="voicemail_action_turn_archive_on">I-on</string>
+  <string name="voicemail_action_dimiss">Hindi, Salamat</string>
+  <string name="voicemail_action_sync">I-sync</string>
+  <string name="voicemail_action_call_voicemail">Tawagan ang Voicemail</string>
+  <string name="voicemail_action_call_customer_support">Tumawag sa Customer Support</string>
+  <string name="vvm3_error_vms_dns_failure_title">Nagkaroon ng Problema</string>
+  <string name="vvm3_error_vms_dns_failure_message">Paumanhin, nagkaroon kami ng problema. Pakisubukang muli sa ibang pagkakataon. Kung mayroon pa ring problema, pakikontak ang Customer Service sa %1$s at sabihin sa kanila na ang code ng error ay 9001.</string>
+  <string name="vvm3_error_vmg_dns_failure_title">Nagkaroon ng Problema</string>
+  <string name="vvm3_error_vmg_dns_failure_message">Paumanhin, nagkaroon kami ng problema. Pakisubukang muli sa ibang pagkakataon. Kung mayroon pa ring problema, pakikontak ang Customer Service sa %1$s at sabihin sa kanila na ang code ng error ay 9002.</string>
+  <string name="vvm3_error_spg_dns_failure_title">Nagkaroon ng Problema</string>
+  <string name="vvm3_error_spg_dns_failure_message">Paumanhin, nagkaroon kami ng problema. Pakisubukang muli sa ibang pagkakataon. Kung mayroon pa ring problema, pakikontak ang Customer Service sa %1$s at sabihin sa kanila na ang code ng error ay 9003.</string>
+  <string name="vvm3_error_vms_no_cellular_title">Hindi Makakonekta sa Iyong Voice Mailbox</string>
+  <string name="vvm3_error_vms_no_cellular_message">Paumanhin, nagkakaproblema kami sa pagkonekta sa iyong voice mailbox. Kung nasa isang lugar ka na mahina ang signal, maghintay hanggang sa magkaroon ka ng malakas na signal at subukang muli. Kung mayroon pa ring problema, pakikontak ang Customer Service sa %1$s at sabihin sa kanila na ang code ng error ay 9004.</string>
+  <string name="vvm3_error_vmg_no_cellular_title">Hindi Makakonekta sa Iyong Voice Mailbox</string>
+  <string name="vvm3_error_vmg_no_cellular_message">Paumanhin, nagkakaproblema kami sa pagkonekta sa iyong voice mailbox. Kung nasa isang lugar ka na mahina ang signal, maghintay hanggang sa magkaroon ka ng malakas na signal at subukang muli. Kung mayroon pa ring problema, pakikontak ang Customer Service sa %1$s at sabihin sa kanila na ang code ng error ay 9005.</string>
+  <string name="vvm3_error_spg_no_cellular_title">Hindi Makakonekta sa Iyong Voice Mailbox</string>
+  <string name="vvm3_error_spg_no_cellular_message">Paumanhin, nagkakaproblema kami sa pagkonekta sa iyong voice mailbox. Kung nasa isang lugar ka na mahina ang signal, maghintay hanggang sa magkaroon ka ng malakas na signal at subukang muli. Kung mayroon pa ring problema, pakikontak ang Customer Service sa %1$s at sabihin sa kanila na ang code ng error ay 9006.</string>
+  <string name="vvm3_error_vms_timeout_title">Nagkaroon ng Problema</string>
+  <string name="vvm3_error_vms_timeout_message">Paumanhin, nagkaroon kami ng problema. Pakisubukang muli sa ibang pagkakataon. Kung mayroon pa ring problema, pakikontak ang Customer Service sa %1$s at sabihin sa kanila na ang code ng error ay 9007.</string>
+  <string name="vvm3_error_vmg_timeout_title">Nagkaroon ng Problema</string>
+  <string name="vvm3_error_vmg_timeout_message">Paumanhin, nagkaroon kami ng problema. Pakisubukang muli sa ibang pagkakataon. Kung mayroon pa ring problema, pakikontak ang Customer Service sa %1$s at sabihin sa kanila na ang code ng error ay 9008.</string>
+  <string name="vvm3_error_status_sms_timeout_title">Nagkaroon ng Problema</string>
+  <string name="vvm3_error_status_sms_timeout_message">Paumanhin, nagkakaproblema kami sa pag-set up ng iyong serbisyo. Pakisubukang muli sa ibang pagkakataon. Kung mayroon pa ring problema, pakikontak ang Customer Service sa %1$s at sabihin sa kanila na ang code ng error ay 9009.</string>
+  <string name="vvm3_error_subscriber_blocked_title">Hindi Makakonekta sa Iyong Voice Mailbox</string>
+  <string name="vvm3_error_subscriber_blocked_message">Paumanhin, hindi ka namin naikonekta sa ngayon sa iyong voice mailbox. Pakisubukang muli sa ibang pagkakataon. Kung mayroon pa ring problema, pakikontak ang Customer Service sa %1$s at sabihin sa kanila na ang code ng error ay 9990.</string>
+  <string name="vvm3_error_unknown_user_title">I-set Up ang Voicemail</string>
+  <string name="vvm3_error_unknown_user_message">Hindi naka-set up ang voicemail sa iyong account. Pakikontak ang Customer Service sa %1$s at sabihin sa kanila na ang code ng error ay 9991.</string>
+  <string name="vvm3_error_unknown_device_title">Voicemail</string>
+  <string name="vvm3_error_unknown_device_message">Hindi maaaring gamitin ang visual na voicemail sa device na ito. Pakikontak ang Customer Service sa %1$s at sabihin sa kanila na ang code ng error ay 9992.</string>
+  <string name="vvm3_error_invalid_password_title">Nagkaroon ng Problema</string>
+  <string name="vvm3_error_invalid_password_message">Pakikontak ang Customer Service sa %1$s at sabihin sa kanila na ang code ng error ay 9993.</string>
+  <string name="vvm3_error_mailbox_not_initialized_title">Visual na voicemail</string>
+  <string name="vvm3_error_mailbox_not_initialized_message">Para makumpleto ang pag-set up ng visual na voicemail, pakikontak ang Customer Service sa %1$s at sabihin sa kanila na ang code ng error ay 9994.</string>
+  <string name="vvm3_error_service_not_provisioned_title">Visual na voicemail</string>
+  <string name="vvm3_error_service_not_provisioned_message">Para makumpleto ang pag-set up ng visual na voicemail, pakikontak ang Customer Service sa %1$s at sabihin sa kanila na ang code ng error ay 9995.</string>
+  <string name="vvm3_error_service_not_activated_title">Visual na voicemail</string>
+  <string name="vvm3_error_service_not_activated_message">Para i-activate ang visual na voicemail, pakikontak ang Customer Service sa %1$s at sabihin sa kanila na ang code ng error ay 9996.</string>
+  <string name="vvm3_error_user_blocked_title">Nagkaroon ng Problema</string>
+  <string name="vvm3_error_user_blocked_message">Para makumpleto ang pag-set up ng visual na voicemail, pakikontak ang Customer Service sa %1$s at sabihin sa kanila na ang code ng error ay 9998.</string>
+  <string name="vvm3_error_subscriber_unknown_title">Na-disable ang visual na voicemail</string>
+  <string name="vvm3_error_subscriber_unknown_message">Pakikontak ang Customer Service sa %1$s para i-activate ang visual na voicemail.</string>
+  <string name="vvm3_error_imap_getquota_error_title">Nagkaroon ng Problema</string>
+  <string name="vvm3_error_imap_getquota_error_message">Pakikontak ang Customer Service sa %1$s at sabihin sa kanila na ang code ng error ay 9997.</string>
+  <string name="vvm3_error_imap_select_error_title">Nagkaroon ng Problema</string>
+  <string name="vvm3_error_imap_select_error_message">Pakikontak ang Customer Service sa %1$s at sabihin sa kanila na ang code ng error ay 9989.</string>
+  <string name="vvm3_error_imap_error_title">Nagkaroon ng Problema</string>
+  <string name="vvm3_error_imap_error_message">Pakikontak ang Customer Service sa %1$s at sabihin sa kanila na ang code ng error ay 9999.</string>
+  <string name="verizon_terms_and_conditions_title">I-on ang visual na voicemail</string>
+  <string name="verizon_terms_and_conditions_message">%1$s Sa pamamagitan ng pag-on sa visual na voicemail, sumasang-ayon ka sa mga tuntunin at kundisyon ng Verizon Wireless:\n\n%2$s</string>
+  <string name="dialer_terms_and_conditions_title">I-on ang visual na voicemail</string>
+  <string name="dialer_terms_and_conditions_existing_user_title">Bago! Basahin ang iyong voicemail</string>
+  <string name="dialer_terms_and_conditions_message">%s</string>
+  <string name="dialer_terms_and_conditions_1.0">Tingnan at pakinggan ang iyong mga mensahe, nang hindi tinatawagan ang voicemail. Ang mga transcript ng iyong voicemail ay ibinibigay ng libreng serbisyo ng transkripsyon ng Google. Maaari mong i-off ang alinman sa mga ito sa Mga Setting anumang oras. %s</string>
+  <string name="dialer_terms_and_conditions_existing_user">Ang mga transcript ng iyong voicemail ay ibinibigay na ngayon ng libreng serbisyo ng transkripsyon ng Google. Maaari mo itong i-off sa Mga Setting anumang oras. %s</string>
+  <string name="dialer_terms_and_conditions_for_verizon_1.0">Tingnan at pakinggan ang iyong mga mensahe, nang hindi kailangang tawagan ang voicemail.</string>
+  <string name="dialer_terms_and_conditions_learn_more">Matuto pa</string>
+  <string name="dialer_terms_and_conditions_existing_user_ack">Ok</string>
+  <string name="dialer_terms_and_conditions_existing_user_decline">Hindi, Salamat na Lang</string>
+  <string name="terms_and_conditions_decline_dialog_title">I-disable ang visual na voicemail?</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_message">Idi-disable ang visual na voicemail kung tatanggihan ang mga tuntunin at kundisyon.</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_downgrade">I-disable</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_message">Idi-disable ang visual na voicemail kung io-off mo ang visual na voicemail.</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_downgrade">I-disable</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message">Maa-access lang ang voicemail sa pamamagitan ng pagtawag sa *86. Magtakda ng bagong PIN sa voicemail para magpatuloy.</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin">Magtakda ng PIN</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/error/res/values-tr/strings.xml b/java/com/android/dialer/voicemail/listui/error/res/values-tr/strings.xml
new file mode 100644
index 0000000..9c5ac29
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/error/res/values-tr/strings.xml
@@ -0,0 +1,102 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_error_activating_title">Görsel sesli mesajı etkinleştirme</string>
+  <string name="voicemail_error_activating_message">Görsel sesli mesaj tam olarak etkinleştirilene dek sesli mesaj bildirimlerini almayabilirsiniz. Sesli mesaj tam olarak etkinleştirilene kadar, yeni mesajları almak için sesli mesaj hizmetini arayın.</string>
+  <string name="voicemail_error_not_activate_no_signal_title">Görsel sesli mesaj etkinleştirilemiyor</string>
+  <string name="voicemail_error_not_activate_no_signal_message">Telefonunuzda mobil ağ bağlantısı olduğundan emin olup tekrar deneyin.</string>
+  <string name="voicemail_error_not_activate_no_signal_airplane_mode_message">Uçak modunu kapatıp tekrar deneyin.</string>
+  <string name="voicemail_error_no_signal_title">Bağlantı yok</string>
+  <string name="voicemail_error_no_signal_message">Yeni sesli mesajlarla ilgili olarak bilgilendirilmeyeceksiniz. Kablosuz bağlantınız varsa şimdi senkronizasyon gerçekleştirerek sesli mesajlarınızı kontrol edebilirsiniz.</string>
+  <string name="voicemail_error_no_signal_airplane_mode_message">Yeni sesli mesajlarla ilgili olarak bilgilendirilmeyeceksiniz. Sesli mesajlarınızı senkronize etmek için uçak modunu kapatın.</string>
+  <string name="voicemail_error_no_signal_cellular_required_message">Sesli mesaj kontrolü için telefonunuzda mobil veri bağlantısı olmalıdır.</string>
+  <string name="voicemail_error_activation_failed_title">Görsel sesli mesaj etkinleştirilemiyor</string>
+  <string name="voicemail_error_activation_failed_message">Hâlâ arayarak sesli mesajlarınızı kontrol edebilirsiniz.</string>
+  <string name="voicemail_error_no_data_title">Görsel sesli mesaj güncellenemiyor</string>
+  <string name="voicemail_error_no_data_message">Kablosuz veya mobil veri bağlantısı kalitesi daha iyi olduğunda tekrar deneyin. Hâlâ arayarak sesli mesajlarınızı kontrol edebilirsiniz.</string>
+  <string name="voicemail_error_no_data_cellular_required_message">Mobil veri bağlantısı kalitesi daha iyi olduğunda tekrar deneyin. Hâlâ arayarak sesli mesajlarınızı kontrol edebilirsiniz.</string>
+  <string name="voicemail_error_bad_config_title">Görsel sesli mesaj güncellenemiyor</string>
+  <string name="voicemail_error_bad_config_message">Hâlâ arayarak sesli mesajlarınızı kontrol edebilirsiniz.</string>
+  <string name="voicemail_error_communication_title">Görsel sesli mesaj güncellenemiyor</string>
+  <string name="voicemail_error_communication_message">Hâlâ arayarak sesli mesajlarınızı kontrol edebilirsiniz.</string>
+  <string name="voicemail_error_server_connection_title">Görsel sesli mesaj güncellenemiyor</string>
+  <string name="voicemail_error_server_connection_message">Hâlâ arayarak sesli mesajlarınızı kontrol edebilirsiniz.</string>
+  <string name="voicemail_error_server_title">Görsel sesli mesaj güncellenemiyor</string>
+  <string name="voicemail_error_server_message">Hâlâ arayarak sesli mesajlarınızı kontrol edebilirsiniz.</string>
+  <string name="voicemail_error_inbox_near_full_title">Gelen kutusu dolmak üzere</string>
+  <string name="voicemail_error_inbox_near_full_message">Gelen kutunuz dolarsa yeni sesli mesajları alamayacaksınız.</string>
+  <string name="voicemail_error_inbox_full_title">Yeni sesli mesajlar alınamıyor</string>
+  <string name="voicemail_error_inbox_full_message">Gelen kutunuz doldu. Yeni sesli mesajları almak için bazı mesajları silmeyi deneyin.</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_title">Ekstra depolama alanını ve yedeklemeyi etkinleştirin</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_message">Posta kutunuz dolu. Google\'ın sesli mesajlarınızı yönetebileceği ve yedekleyebileceği şekilde yer açmak için ekstra depolama alanını etkinleştirin.</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_title">Ekstra depolama alanını ve yedeklemeyi etkinleştirin</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_message">Posta kutunuz dolmak üzere. Google\'ın sesli mesajlarınızı yönetebileceği ve yedekleyebileceği şekilde yer açmak için ekstra depolama alanını etkinleştirin.</string>
+  <string name="voicemail_error_pin_not_set_title">Sesli mesaj PIN\'inizi belirleyin</string>
+  <string name="voicemail_error_pin_not_set_message">Sesli mesajlarınıza erişmek için her aradığınızda bir sesli mesaj PIN\'i girmeniz gerekecek.</string>
+  <string name="voicemail_action_turn_off_airplane_mode">Uçak Modu Ayarları</string>
+  <string name="voicemail_action_set_pin">PIN Belirle</string>
+  <string name="voicemail_action_retry">Tekrar Dene</string>
+  <string name="voicemail_action_turn_archive_on">Etkinleştir</string>
+  <string name="voicemail_action_dimiss">Hayır, Teşekkürler</string>
+  <string name="voicemail_action_sync">Senkronize Et</string>
+  <string name="voicemail_action_call_voicemail">Sesli Mesaj Hizmetini Ara</string>
+  <string name="voicemail_action_call_customer_support">Müşteri Desteğini Ara</string>
+  <string name="vvm3_error_vms_dns_failure_title">Bir Sorun Oluştu</string>
+  <string name="vvm3_error_vms_dns_failure_message">Maalesef bir sorunla karşılaştık. Lütfen daha sonra tekrar deneyin. Sorun devam ederse lütfen %1$s numaralı telefondan Müşteri Hizmetleri ile iletişime geçerek hata kodunun 9001 olduğunu bildirin.</string>
+  <string name="vvm3_error_vmg_dns_failure_title">Bir Sorun Oluştu</string>
+  <string name="vvm3_error_vmg_dns_failure_message">Maalesef bir sorunla karşılaştık. Lütfen daha sonra tekrar deneyin. Sorun devam ederse lütfen %1$s numaralı telefondan Müşteri Hizmetleri ile iletişime geçerek hata kodunun 9002 olduğunu bildirin.</string>
+  <string name="vvm3_error_spg_dns_failure_title">Bir Sorun Oluştu</string>
+  <string name="vvm3_error_spg_dns_failure_message">Maalesef bir sorunla karşılaştık. Lütfen daha sonra tekrar deneyin. Sorun devam ederse lütfen %1$s numaralı telefondan Müşteri Hizmetleri ile iletişime geçerek hata kodunun 9003 olduğunu bildirin.</string>
+  <string name="vvm3_error_vms_no_cellular_title">Sesli Mesaj Kutunuza Bağlanılamıyor</string>
+  <string name="vvm3_error_vms_no_cellular_message">Maalesef sesli mesaj kutunuza bağlanmada sorun yaşıyoruz. Sinyal gücünün zayıf olduğu bir alandaysanız sinyal gücü kuvvetlenene kadar bekleyin ve tekrar deneyin. Sorun devam ederse lütfen %1$s numaralı telefondan Müşteri Hizmetleri ile iletişime geçerek hata kodunun 9004 olduğunu bildirin.</string>
+  <string name="vvm3_error_vmg_no_cellular_title">Sesli Mesaj Kutunuza Bağlanılamıyor</string>
+  <string name="vvm3_error_vmg_no_cellular_message">Maalesef sesli mesaj kutunuza bağlanmada sorun yaşıyoruz. Sinyal gücünün zayıf olduğu bir alandaysanız sinyal gücü kuvvetlenene kadar bekleyin ve tekrar deneyin. Sorun devam ederse lütfen %1$s numaralı telefondan Müşteri Hizmetleri ile iletişime geçerek hata kodunun 9005 olduğunu bildirin.</string>
+  <string name="vvm3_error_spg_no_cellular_title">Sesli Mesaj Kutunuza Bağlanılamıyor</string>
+  <string name="vvm3_error_spg_no_cellular_message">Maalesef sesli mesaj kutunuza bağlanmada sorun yaşıyoruz. Sinyal gücünün zayıf olduğu bir alandaysanız sinyal gücü kuvvetlenene kadar bekleyin ve tekrar deneyin. Sorun devam ederse lütfen %1$s numaralı telefondan Müşteri Hizmetleri ile iletişime geçerek hata kodunun 9006 olduğunu bildirin.</string>
+  <string name="vvm3_error_vms_timeout_title">Bir Sorun Oluştu</string>
+  <string name="vvm3_error_vms_timeout_message">Maalesef bir sorunla karşılaştık. Lütfen daha sonra tekrar deneyin. Sorun devam ederse lütfen %1$s numaralı telefondan Müşteri Hizmetleri ile iletişime geçerek hata kodunun 9007 olduğunu bildirin.</string>
+  <string name="vvm3_error_vmg_timeout_title">Bir Sorun Oluştu</string>
+  <string name="vvm3_error_vmg_timeout_message">Maalesef bir sorunla karşılaştık. Lütfen daha sonra tekrar deneyin. Sorun devam ederse lütfen %1$s numaralı telefondan Müşteri Hizmetleri ile iletişime geçerek hata kodunun 9008 olduğunu bildirin.</string>
+  <string name="vvm3_error_status_sms_timeout_title">Bir Sorun Oluştu</string>
+  <string name="vvm3_error_status_sms_timeout_message">Maalesef hizmetin ayarlanmasında sorun yaşıyoruz. Lütfen daha sonra tekrar deneyin. Sorun devam ederse lütfen %1$s numaralı telefondan Müşteri Hizmetleri ile iletişime geçerek hata kodunun 9009 olduğunu bildirin.</string>
+  <string name="vvm3_error_subscriber_blocked_title">Sesli Mesaj Kutunuza Bağlanılamıyor</string>
+  <string name="vvm3_error_subscriber_blocked_message">Maalesef şu anda sesli mesaj kutunuza bağlanamadık. Lütfen daha sonra tekrar deneyin. Sorun devam ederse lütfen %1$s numaralı telefondan Müşteri Hizmetleri ile iletişime geçerek hata kodunun 9990 olduğunu bildirin.</string>
+  <string name="vvm3_error_unknown_user_title">Sesli Mesajı Ayarlayın</string>
+  <string name="vvm3_error_unknown_user_message">Hesabınızda sesli mesaj ayarlanmadı. Lütfen %1$s numaralı telefondan Müşteri Hizmetleri ile iletişime geçerek hata kodunun 9991 olduğunu bildirin.</string>
+  <string name="vvm3_error_unknown_device_title">Sesli Mesaj</string>
+  <string name="vvm3_error_unknown_device_message">Görsel sesli mesaj bu cihazda kullanılamıyor. Lütfen %1$s numaralı telefondan Müşteri Hizmetleri ile iletişime geçerek hata kodunun 9992 olduğunu bildirin.</string>
+  <string name="vvm3_error_invalid_password_title">Bir Sorun Oluştu</string>
+  <string name="vvm3_error_invalid_password_message">Lütfen %1$s numaralı telefondan Müşteri Hizmetleri ile iletişime geçerek hata kodunun 9993 olduğunu bildirin.</string>
+  <string name="vvm3_error_mailbox_not_initialized_title">Görsel sesli mesaj</string>
+  <string name="vvm3_error_mailbox_not_initialized_message">Görsel sesli mesaj kurulumunu tamamlamak için lütfen %1$s numaralı telefondan Müşteri Hizmetleri ile iletişime geçerek hata kodunun 9994 olduğunu bildirin.</string>
+  <string name="vvm3_error_service_not_provisioned_title">Görsel sesli mesaj</string>
+  <string name="vvm3_error_service_not_provisioned_message">Görsel sesli mesaj kurulumunu tamamlamak için lütfen %1$s numaralı telefondan Müşteri Hizmetleri ile iletişime geçerek hata kodunun 9995 olduğunu bildirin.</string>
+  <string name="vvm3_error_service_not_activated_title">Görsel sesli mesaj</string>
+  <string name="vvm3_error_service_not_activated_message">Görsel sesli mesajı etkinleştirmek için lütfen %1$s numaralı telefondan Müşteri Hizmetleri ile iletişime geçerek hata kodunun 9996 olduğunu bildirin.</string>
+  <string name="vvm3_error_user_blocked_title">Bir Sorun Oluştu</string>
+  <string name="vvm3_error_user_blocked_message">Görsel sesli mesaj kurulumunu tamamlamak için lütfen %1$s numaralı telefondan Müşteri Hizmetleri ile iletişime geçerek hata kodunun 9998 olduğunu bildirin.</string>
+  <string name="vvm3_error_subscriber_unknown_title">Görsel sesli mesaj devre dışı bırakıldı</string>
+  <string name="vvm3_error_subscriber_unknown_message">Görsel sesli mesajı etkinleştirmek için lütfen %1$s numaralı telefondan Müşteri Hizmetleri ile iletişime geçin.</string>
+  <string name="vvm3_error_imap_getquota_error_title">Bir Sorun Oluştu</string>
+  <string name="vvm3_error_imap_getquota_error_message">Lütfen %1$s numaralı telefondan Müşteri Hizmetleri ile iletişime geçerek hata kodunun 9997 olduğunu bildirin.</string>
+  <string name="vvm3_error_imap_select_error_title">Bir Sorun Oluştu</string>
+  <string name="vvm3_error_imap_select_error_message">Lütfen %1$s numaralı telefondan Müşteri Hizmetleri ile iletişime geçerek hata kodunun 9989 olduğunu bildirin.</string>
+  <string name="vvm3_error_imap_error_title">Bir Sorun Oluştu</string>
+  <string name="vvm3_error_imap_error_message">Lütfen %1$s numaralı telefondan Müşteri Hizmetleri ile iletişime geçerek hata kodunun 9999 olduğunu bildirin.</string>
+  <string name="verizon_terms_and_conditions_title">Görsel sesli mesajı etkinleştirme</string>
+  <string name="verizon_terms_and_conditions_message">%1$s Görsel sesli mesajı etkinleştirerek Verizon Wireless şartlar ve koşullarına uymayı kabul etmiş olursunuz:\n\n%2$s</string>
+  <string name="dialer_terms_and_conditions_title">Görsel sesli mesajı etkinleştirme</string>
+  <string name="dialer_terms_and_conditions_existing_user_title">Yeni! Sesli mesajlarınızı okuma</string>
+  <string name="dialer_terms_and_conditions_message">%s</string>
+  <string name="dialer_terms_and_conditions_1.0">Sesli mesaj hizmetini aramak zorunda kalmadan mesajlarınızı görün ve dinleyin. Sesli mesajlarınızın çeviri yazıları Google\'ın ücretsiz çeviri yazı hizmeti tarafından sağlanır. Bu özelliklerin herhangi birini dilediğiniz zaman Ayarlar\'da devre dışı bırakabilirsiniz. %s</string>
+  <string name="dialer_terms_and_conditions_existing_user">Sesli mesajlarınızın çeviri yazıları artık Google\'ın ücretsiz çeviri yazı hizmeti tarafından sağlanır. Bu özelliği dilediğiniz zaman Ayarlar\'da devre dışı bırakabilirsiniz. %s</string>
+  <string name="dialer_terms_and_conditions_for_verizon_1.0">Sesli mesaj hizmetini aramak zorunda kalmadan mesajlarınızı görün ve dinleyin.</string>
+  <string name="dialer_terms_and_conditions_learn_more">Daha fazla bilgi</string>
+  <string name="dialer_terms_and_conditions_existing_user_ack">Tamam, anladım</string>
+  <string name="dialer_terms_and_conditions_existing_user_decline">Hayır, teşekkürler</string>
+  <string name="terms_and_conditions_decline_dialog_title">Görsel sesli mesaj devre dışı bırakılsın mı?</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_message">Şartlar ve koşullar reddedilirse görsel sesli mesaj devre dışı bırakılır.</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_downgrade">Devre dışı bırak</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_message">Görsel sesli mesajı kapatırsanız görsel sesli mesaj devre dışı bırakılır.</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_downgrade">Devre dışı bırak</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message">Sesli mesajlara yalnızca *86 aranarak erişilebilir. Devam etmek için yeni bir sesli mesaj PIN\'i belirleyin.</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin">PIN belirle</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/error/res/values-uk/strings.xml b/java/com/android/dialer/voicemail/listui/error/res/values-uk/strings.xml
new file mode 100644
index 0000000..4097d42
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/error/res/values-uk/strings.xml
@@ -0,0 +1,102 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_error_activating_title">Активація візуальної голосової пошти</string>
+  <string name="voicemail_error_activating_message">Якщо візуальну голосову пошту активовано неповністю, сповіщення можуть не надходити. У такому разі прослухати нові повідомлення можна, зателефонувавши на номер голосової пошти.</string>
+  <string name="voicemail_error_not_activate_no_signal_title">Не вдалось активувати візуальну голосову пошту</string>
+  <string name="voicemail_error_not_activate_no_signal_message">Переконайтеся, що мобільний Інтернет увімкнено, і повторіть спробу.</string>
+  <string name="voicemail_error_not_activate_no_signal_airplane_mode_message">Вимкніть режим польоту та повторіть спробу.</string>
+  <string name="voicemail_error_no_signal_title">Немає з’єднання</string>
+  <string name="voicemail_error_no_signal_message">Ви не отримуватимете сповіщення про нові повідомлення голосової пошти. Якщо Wi-Fi увімкнено, виконайте синхронізацію, і нові повідомлення завантажаться.</string>
+  <string name="voicemail_error_no_signal_airplane_mode_message">Ви не отримуватимете сповіщення про нові повідомлення голосової пошти. Щоб синхронізувати голосову пошту, вимкніть режим польоту.</string>
+  <string name="voicemail_error_no_signal_cellular_required_message">Щоб перевірити голосову пошту, увімкніть мобільний Інтернет.</string>
+  <string name="voicemail_error_activation_failed_title">Не вдалось активувати візуальну голосову пошту</string>
+  <string name="voicemail_error_activation_failed_message">Щоб перевірити голосову пошту, ви також можете зателефонувати.</string>
+  <string name="voicemail_error_no_data_title">Не вдалось оновити візуальну голосову пошту</string>
+  <string name="voicemail_error_no_data_message">Повторіть спробу, коли буде більша швидкість мобільного Інтернету або кращий сигнал Wi-Fi. Щоб перевірити голосову пошту, ви також можете зателефонувати.</string>
+  <string name="voicemail_error_no_data_cellular_required_message">Повторіть спробу, коли буде більша швидкість мобільного Інтернету. Щоб перевірити голосову пошту, ви також можете зателефонувати.</string>
+  <string name="voicemail_error_bad_config_title">Не вдалось оновити візуальну голосову пошту</string>
+  <string name="voicemail_error_bad_config_message">Щоб перевірити голосову пошту, ви також можете зателефонувати.</string>
+  <string name="voicemail_error_communication_title">Не вдалось оновити візуальну голосову пошту</string>
+  <string name="voicemail_error_communication_message">Щоб перевірити голосову пошту, ви також можете зателефонувати.</string>
+  <string name="voicemail_error_server_connection_title">Не вдалось оновити візуальну голосову пошту</string>
+  <string name="voicemail_error_server_connection_message">Щоб перевірити голосову пошту, ви також можете зателефонувати.</string>
+  <string name="voicemail_error_server_title">Не вдалось оновити візуальну голосову пошту</string>
+  <string name="voicemail_error_server_message">Щоб перевірити голосову пошту, ви також можете зателефонувати.</string>
+  <string name="voicemail_error_inbox_near_full_title">Папка вхідної голосової пошти майже заповнена</string>
+  <string name="voicemail_error_inbox_near_full_message">Якщо папка вхідної голосової пошти заповнена, нові повідомлення не надходитимуть.</string>
+  <string name="voicemail_error_inbox_full_title">Неможливо отримати нові голосові повідомлення</string>
+  <string name="voicemail_error_inbox_full_message">Папка вхідної голосової пошти заповнена. Видаліть деякі повідомлення.</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_title">Увімкніть додаткову пам’ять і резервне копіювання</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_message">У поштовій скриньці не залишилося місця. Щоб звільнити його, увімкніть додаткову пам’ять. Після цього Google зможе робити резервні копії повідомлень голосової пошти й керувати нею.</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_title">Увімкніть додаткову пам’ять і резервне копіювання</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_message">У поштовій скриньці майже не залишилося місця. Щоб звільнити його, увімкніть додаткову пам’ять. Після цього Google зможе робити резервні копії повідомлень голосової пошти й керувати нею.</string>
+  <string name="voicemail_error_pin_not_set_title">Установіть PIN-код голосової пошти</string>
+  <string name="voicemail_error_pin_not_set_message">PIN-код буде потрібен під час кожного дзвінка на голосову пошту.</string>
+  <string name="voicemail_action_turn_off_airplane_mode">Налаштування режиму польоту</string>
+  <string name="voicemail_action_set_pin">Установити PIN-код</string>
+  <string name="voicemail_action_retry">Повторити</string>
+  <string name="voicemail_action_turn_archive_on">Увімкнути</string>
+  <string name="voicemail_action_dimiss">Не вмикати</string>
+  <string name="voicemail_action_sync">Синхронізувати</string>
+  <string name="voicemail_action_call_voicemail">Зателефонувати на голосову пошту</string>
+  <string name="voicemail_action_call_customer_support">Зателефонувати в службу підтримки користувачів</string>
+  <string name="vvm3_error_vms_dns_failure_title">Сталася помилка</string>
+  <string name="vvm3_error_vms_dns_failure_message">Сталася помилка. Спробуйте пізніше. Якщо проблема не зникне, зв’яжіться зі службою обслуговування клієнтів за номером %1$s і повідомте код помилки: 9001.</string>
+  <string name="vvm3_error_vmg_dns_failure_title">Сталася помилка</string>
+  <string name="vvm3_error_vmg_dns_failure_message">Сталася помилка. Спробуйте пізніше. Якщо проблема не зникне, зв’яжіться зі службою обслуговування клієнтів за номером %1$s і повідомте код помилки: 9002.</string>
+  <string name="vvm3_error_spg_dns_failure_title">Сталася помилка</string>
+  <string name="vvm3_error_spg_dns_failure_message">Сталася помилка. Спробуйте пізніше. Якщо проблема не зникне, зв’яжіться зі службою обслуговування клієнтів за номером %1$s і повідомте код помилки: 9003.</string>
+  <string name="vvm3_error_vms_no_cellular_title">Не вдалося підключитися до скриньки голосової пошти</string>
+  <string name="vvm3_error_vms_no_cellular_message">Не вдалося підключитися до скриньки голосової пошти. Якщо сигнал мобільної мережі слабкий, зачекайте, доки він покращиться, і повторіть спробу. Якщо проблема не зникне, зв’яжіться зі службою обслуговування клієнтів за номером %1$s і повідомте код помилки: 9004.</string>
+  <string name="vvm3_error_vmg_no_cellular_title">Не вдалося підключитися до скриньки голосової пошти</string>
+  <string name="vvm3_error_vmg_no_cellular_message">Не вдалося підключитися до скриньки голосової пошти. Якщо сигнал мобільної мережі слабкий, зачекайте, доки він покращиться, і повторіть спробу. Якщо проблема не зникне, зв’яжіться зі службою обслуговування клієнтів за номером %1$s і повідомте код помилки: 9005.</string>
+  <string name="vvm3_error_spg_no_cellular_title">Не вдалося підключитися до скриньки голосової пошти</string>
+  <string name="vvm3_error_spg_no_cellular_message">Не вдалося підключитися до скриньки голосової пошти. Якщо сигнал мобільної мережі слабкий, зачекайте, доки він покращиться, і повторіть спробу. Якщо проблема не зникне, зв’яжіться зі службою обслуговування клієнтів за номером %1$s і повідомте код помилки: 9006.</string>
+  <string name="vvm3_error_vms_timeout_title">Сталася помилка</string>
+  <string name="vvm3_error_vms_timeout_message">Сталася помилка. Спробуйте пізніше. Якщо проблема не зникне, зв’яжіться зі службою обслуговування клієнтів за номером %1$s і повідомте код помилки: 9007.</string>
+  <string name="vvm3_error_vmg_timeout_title">Сталася помилка</string>
+  <string name="vvm3_error_vmg_timeout_message">Сталася помилка. Спробуйте пізніше. Якщо проблема не зникне, зв’яжіться зі службою обслуговування клієнтів за номером %1$s і повідомте код помилки: 9008.</string>
+  <string name="vvm3_error_status_sms_timeout_title">Сталася помилка</string>
+  <string name="vvm3_error_status_sms_timeout_message">Під час налаштування сервісу сталася помилка. Спробуйте пізніше. Якщо проблема не зникне, зв’яжіться зі службою обслуговування клієнтів за номером %1$s і повідомте код помилки: 9009.</string>
+  <string name="vvm3_error_subscriber_blocked_title">Не вдалося підключитися до скриньки голосової пошти</string>
+  <string name="vvm3_error_subscriber_blocked_message">Наразі не вдається підключитися до скриньки голосової пошти. Спробуйте пізніше. Якщо проблема не зникне, зв’яжіться зі службою обслуговування клієнтів за номером %1$s і повідомте код помилки: 9990.</string>
+  <string name="vvm3_error_unknown_user_title">Налаштувати голосову пошту</string>
+  <string name="vvm3_error_unknown_user_message">У вашому обліковому записі не налаштовано голосову пошту. Зв’яжіться зі службою обслуговування клієнтів за номером %1$s і повідомте код помилки: 9991.</string>
+  <string name="vvm3_error_unknown_device_title">Голосова пошта</string>
+  <string name="vvm3_error_unknown_device_message">Візуальна голосова пошта недоступна на цьому пристрої. Зв’яжіться зі службою обслуговування клієнтів за номером %1$s і повідомте код помилки: 9992.</string>
+  <string name="vvm3_error_invalid_password_title">Сталася помилка</string>
+  <string name="vvm3_error_invalid_password_message">Зв’яжіться зі службою обслуговування клієнтів за номером %1$s і повідомте код помилки: 9993.</string>
+  <string name="vvm3_error_mailbox_not_initialized_title">Візуальна голосова пошта</string>
+  <string name="vvm3_error_mailbox_not_initialized_message">Щоб завершити налаштування візуальної голосової пошти, зв’яжіться зі службою обслуговування клієнтів за номером %1$s і повідомте код помилки: 9994.</string>
+  <string name="vvm3_error_service_not_provisioned_title">Візуальна голосова пошта</string>
+  <string name="vvm3_error_service_not_provisioned_message">Щоб завершити налаштування візуальної голосової пошти, зв’яжіться зі службою обслуговування клієнтів за номером %1$s і повідомте код помилки: 9995.</string>
+  <string name="vvm3_error_service_not_activated_title">Візуальна голосова пошта</string>
+  <string name="vvm3_error_service_not_activated_message">Щоб активувати візуальну голосову пошту, зв’яжіться зі службою обслуговування клієнтів за номером %1$s і повідомте код помилки: 9996.</string>
+  <string name="vvm3_error_user_blocked_title">Сталася помилка</string>
+  <string name="vvm3_error_user_blocked_message">Щоб завершити налаштування візуальної голосової пошти, зв’яжіться зі службою обслуговування клієнтів за номером %1$s і повідомте код помилки: 9998.</string>
+  <string name="vvm3_error_subscriber_unknown_title">Візуальну голосову пошту вимкнено</string>
+  <string name="vvm3_error_subscriber_unknown_message">Щоб активувати візуальну голосову пошту, зв’яжіться зі службою обслуговування клієнтів за номером %1$s.</string>
+  <string name="vvm3_error_imap_getquota_error_title">Сталася помилка</string>
+  <string name="vvm3_error_imap_getquota_error_message">Зв’яжіться зі службою обслуговування клієнтів за номером %1$s і повідомте код помилки: 9997.</string>
+  <string name="vvm3_error_imap_select_error_title">Сталася помилка</string>
+  <string name="vvm3_error_imap_select_error_message">Зв’яжіться зі службою обслуговування клієнтів за номером %1$s і повідомте код помилки: 9989.</string>
+  <string name="vvm3_error_imap_error_title">Сталася помилка</string>
+  <string name="vvm3_error_imap_error_message">Зв’яжіться зі службою обслуговування клієнтів за номером %1$s і повідомте код помилки: 9999.</string>
+  <string name="verizon_terms_and_conditions_title">Як увімкнути візуальну голосову пошту</string>
+  <string name="verizon_terms_and_conditions_message">%1$s Вмикаючи візуальну голосову пошту, ви приймаєте Умови використання Verizon Wireless:\n\n%2$s</string>
+  <string name="dialer_terms_and_conditions_title">Як увімкнути візуальну голосову пошту</string>
+  <string name="dialer_terms_and_conditions_existing_user_title">Новинка! Читайте свою голосову пошту</string>
+  <string name="dialer_terms_and_conditions_message">%s</string>
+  <string name="dialer_terms_and_conditions_1.0">Переглядайте та прослуховуйте повідомлення, не телефонуючи на номер голосової пошти. Тексти голосових повідомлень надаються безкоштовною службою транскрипції Google. Ці функції можна будь-коли вимкнути в налаштуваннях. %s</string>
+  <string name="dialer_terms_and_conditions_existing_user">Тепер тексти голосових повідомлень надаються безкоштовною службою транскрипції Google. Цю функцію можна будь-коли вимкнути в налаштуваннях. %s</string>
+  <string name="dialer_terms_and_conditions_for_verizon_1.0">Переглядайте та прослуховуйте повідомлення, не телефонуючи на номер голосової пошти.</string>
+  <string name="dialer_terms_and_conditions_learn_more">Докладніше</string>
+  <string name="dialer_terms_and_conditions_existing_user_ack">OK</string>
+  <string name="dialer_terms_and_conditions_existing_user_decline">Ні, дякую</string>
+  <string name="terms_and_conditions_decline_dialog_title">Вимкнути візуальну голосову пошту?</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_message">Якщо не прийняти умови використання, візуальну голосову пошту буде вимкнено.</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_downgrade">Вимкнути</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_message">Візуальну голосову пошту буде вимкнено.</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_downgrade">Вимкнути</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message">Прослухати голосову пошту можна буде, лише набравши *86. Установіть новий PIN-код для голосової пошти, щоб продовжити.</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin">Установити PIN-код</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/error/res/values-ur/strings.xml b/java/com/android/dialer/voicemail/listui/error/res/values-ur/strings.xml
new file mode 100644
index 0000000..e0c2cbb
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/error/res/values-ur/strings.xml
@@ -0,0 +1,102 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_error_activating_title">بصری صوتی میل کو فعال کرنا</string>
+  <string name="voicemail_error_activating_message">بصری صوتی میل کے مکمل طور پر فعال ہونے تک ہو سکتا ہے آپ کو صوتی میل کی اطلاعات موصول نہ ہوں۔ صوتی میل کے مکمل طور پر فعال ہونے تک نئے پیغامات کی بازیافت کیلئے صوتی میل پر کال کریں۔</string>
+  <string name="voicemail_error_not_activate_no_signal_title">بصری صوتی میل کو فعال نہیں کیا جا سکتا</string>
+  <string name="voicemail_error_not_activate_no_signal_message">یقینی بنائیں کہ آپ کے فون میں ایک موبائل نیٹ ورک کنکشن موجود ہے اور دوبارہ کوشش کریں۔</string>
+  <string name="voicemail_error_not_activate_no_signal_airplane_mode_message">ہوائی جہاز وضع آف کریں اور دوبارہ کوشش کریں۔</string>
+  <string name="voicemail_error_no_signal_title">کوئی کنکشن نہیں</string>
+  <string name="voicemail_error_no_signal_message">‏آپ کو نئے صوتی میلز سے مطلع نہیں کیا جائے گا۔ اگر آپ Wi-Fi پر ہیں، تو آپ ابھی مطابقت پذیری کر کے صوتی میل کیلئے چیک کر سکتے ہیں۔</string>
+  <string name="voicemail_error_no_signal_airplane_mode_message">آپ کو نئے صوتی میلز سے مطلع نہیں کیا جائے گا۔ اپنی صوتی میل کو مطابقت پذیر بنانے کیلئے ہوائی جہاز وضع آف کریں۔</string>
+  <string name="voicemail_error_no_signal_cellular_required_message">صوتی میل چیک کرنے کیلئے آپ کے فون کو موبائل ڈیٹا کنکشن کی ضرورت ہے۔</string>
+  <string name="voicemail_error_activation_failed_title">بصری صوتی میل کو فعال نہیں کیا جا سکتا</string>
+  <string name="voicemail_error_activation_failed_message">صوتی میل چیک کرنے کیلئے آپ ابھی بھی کال کر سکتے ہیں۔</string>
+  <string name="voicemail_error_no_data_title">بصری صوتی میل کو اپ ڈیٹ نہیں کیا جا سکتا</string>
+  <string name="voicemail_error_no_data_message">‏جب آپ کا Wi-Fi یا موبائل ڈیٹا کنکشن بہتر ہو، تو دوبارہ کوشش کریں۔ صوتی میل چیک کرنے کیلئے آپ ابھی بھی کال کر سکتے ہیں۔</string>
+  <string name="voicemail_error_no_data_cellular_required_message">جب آپ کا موبائل ڈیٹا کنکشن بہتر ہو تو دوبارہ کوشش کریں۔ صوتی میل چیک کرنے کیلئے آپ ابھی بھی کال کر سکتے ہیں۔</string>
+  <string name="voicemail_error_bad_config_title">بصری صوتی میل کو اپ ڈیٹ نہیں کیا جا سکتا</string>
+  <string name="voicemail_error_bad_config_message">صوتی میل چیک کرنے کیلئے آپ ابھی بھی کال کر سکتے ہیں۔</string>
+  <string name="voicemail_error_communication_title">بصری صوتی میل کو اپ ڈیٹ نہیں کیا جا سکتا</string>
+  <string name="voicemail_error_communication_message">صوتی میل چیک کرنے کیلئے آپ ابھی بھی کال کر سکتے ہیں۔</string>
+  <string name="voicemail_error_server_connection_title">بصری صوتی میل کو اپ ڈیٹ نہیں کیا جا سکتا</string>
+  <string name="voicemail_error_server_connection_message">صوتی میل چیک کرنے کیلئے آپ ابھی بھی کال کر سکتے ہیں۔</string>
+  <string name="voicemail_error_server_title">بصری صوتی میل کو اپ ڈیٹ نہیں کیا جا سکتا</string>
+  <string name="voicemail_error_server_message">صوتی میل چیک کرنے کیلئے آپ ابھی بھی کال کر سکتے ہیں۔</string>
+  <string name="voicemail_error_inbox_near_full_title">ان باکس تقریباً بھرا ہوا ہے</string>
+  <string name="voicemail_error_inbox_near_full_message">اگر آپ کا ان باکس بھرا ہوا ہوگا، تو آپ نئی صوتی میل موصول نہیں کر پائیں گے۔</string>
+  <string name="voicemail_error_inbox_full_title">نئے صوتی میلز موصول نہیں ہو سکتے</string>
+  <string name="voicemail_error_inbox_full_message">آپ کا ان باکس بھرا ہوا ہے۔ نئی صوتی میل موصول کرنے کیلئے کچھ پیغامات حذف کرنے کی کوشش کریں۔</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_title">اضافی اسٹوریج اور بیک اپ آن کریں</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_message">‏آپ کا میل باکس بھر گیا ہے۔ جگہ خالی کرنے کیلئے، اضافی اسٹوریج آن کریں تاکہ Google آپ کے صوتی میل پیغامات کا نظم کر سکے اور ان کا بیک اپ لے سکے۔</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_title">اضافی اسٹوریج اور بیک اپ آن کریں</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_message">‏آپ کا میل باکس تقریباً بھر گیا ہے۔ جگہ خالی کرنے کیلئے، اضافی اسٹوریج آن کریں تاکہ Google آپ کے صوتی میل پیغامات کا نظم کر سکے اور ان کا بیک اپ لے سکے۔</string>
+  <string name="voicemail_error_pin_not_set_title">‏اپنی صوتی میل PIN سیٹ کریں</string>
+  <string name="voicemail_error_pin_not_set_message">‏آپ جب بھی صوتی میل تک رسائی کیلئے کال کریں گے تو آپ کو صوتی میل PIN درکار ہوگی۔</string>
+  <string name="voicemail_action_turn_off_airplane_mode">ہوائی جہاز وضع کی ترتیبات</string>
+  <string name="voicemail_action_set_pin">‏PIN سیٹ کریں</string>
+  <string name="voicemail_action_retry">دوبارہ کوشش کریں</string>
+  <string name="voicemail_action_turn_archive_on">آن کریں</string>
+  <string name="voicemail_action_dimiss">نہیں شکریہ</string>
+  <string name="voicemail_action_sync">مطابقت پذیری کریں</string>
+  <string name="voicemail_action_call_voicemail">صوتی میل پر کال کریں</string>
+  <string name="voicemail_action_call_customer_support">کسٹمر سپورٹ کو کال کریں</string>
+  <string name="vvm3_error_vms_dns_failure_title">کچھ غلط ہو گیا</string>
+  <string name="vvm3_error_vms_dns_failure_message">معذرت، ہمیں کچھ مسئلہ پیش آ گیا۔ براہ کرم بعد میں دوبارہ کوشش کریں۔ اگر مسئلہ برقرار رہتا ہے، تو براہ کرم %1$s پر کسٹمر سروس سے رابطہ کریں اور انہیں بتائیں کہ خرابی کا کوڈ 9001 ہے۔</string>
+  <string name="vvm3_error_vmg_dns_failure_title">کچھ غلط ہو گیا</string>
+  <string name="vvm3_error_vmg_dns_failure_message">معذرت، ہمیں کچھ مسئلہ پیش آ گیا۔ براہ کرم بعد میں دوبارہ کوشش کریں۔ اگر مسئلہ برقرار رہتا ہے، تو براہ کرم %1$s پر کسٹمر سروس سے رابطہ کریں اور انہیں بتائیں کہ خرابی کا کوڈ 9002 ہے۔</string>
+  <string name="vvm3_error_spg_dns_failure_title">کچھ غلط ہو گیا</string>
+  <string name="vvm3_error_spg_dns_failure_message">معذرت، ہمیں کچھ مسئلہ پیش آ گیا۔ براہ کرم بعد میں دوبارہ کوشش کریں۔ اگر مسئلہ برقرار رہتا ہے، تو براہ کرم %1$s پر کسٹمر سروس سے رابطہ کریں اور انہیں بتائیں کہ خرابی کا کوڈ 9003 ہے۔</string>
+  <string name="vvm3_error_vms_no_cellular_title">آپ کے صوتی میل باکس سے منسلک نہیں ہو سکتا</string>
+  <string name="vvm3_error_vms_no_cellular_message">معذرت، ہمیں آپ کے صوتی میل باکس سے منسلک ہونے میں دشواری پیش آ رہی ہے۔ اگر آپ کسی ایسے علاقے میں ہیں جہاں سگنل کی قوت کم ہے، تو مضبوط سگنل آنے تک انتظار کریں اور دوبارہ کوشش کریں۔ اگر مسئلہ برقرار رہتا ہے، تو براہ کرم %1$s پر کسٹمر سروس سے رابطہ کریں اور انہیں بتائیں کہ خرابی کا کوڈ 9004 ہے۔</string>
+  <string name="vvm3_error_vmg_no_cellular_title">آپ کے صوتی میل باکس سے منسلک نہیں ہو سکتا</string>
+  <string name="vvm3_error_vmg_no_cellular_message">معذرت، ہمیں آپ کے صوتی میل باکس سے منسلک ہونے میں دشواری پیش آ رہی ہے۔ اگر آپ کسی ایسے علاقے میں ہیں جہاں سگنل کی قوت کم ہے، تو مضبوط سگنل آنے تک انتظار کریں اور دوبارہ کوشش کریں۔ اگر مسئلہ برقرار رہتا ہے، تو براہ کرم %1$s پر کسٹمر سروس سے رابطہ کریں اور انہیں بتائیں کہ خرابی کا کوڈ 9005 ہے۔</string>
+  <string name="vvm3_error_spg_no_cellular_title">آپ کے صوتی میل باکس سے منسلک نہیں ہو سکتا</string>
+  <string name="vvm3_error_spg_no_cellular_message">معذرت، ہمیں آپ کے صوتی میل باکس سے منسلک ہونے میں دشواری پیش آ رہی ہے۔ اگر آپ کسی ایسے علاقے میں ہیں جہاں سگنل کی قوت کم ہے، تو مضبوط سگنل آنے تک انتظار کریں اور دوبارہ کوشش کریں۔ اگر مسئلہ برقرار رہتا ہے، تو براہ کرم %1$s پر کسٹمر سروس سے رابطہ کریں اور انہیں بتائیں کہ خرابی کا کوڈ 9006 ہے۔</string>
+  <string name="vvm3_error_vms_timeout_title">کچھ غلط ہو گیا</string>
+  <string name="vvm3_error_vms_timeout_message">معذرت، ہمیں ایک مسئلہ پیش آ گیا۔ براہ کرم بعد میں دوبارہ کوشش کریں۔ اگر مسئلہ برقرار رہتا ہے، تو براہ کرم %1$s پر کسٹمر سروس سے رابطہ کریں اور انہیں بتائیں کہ خرابی کا کوڈ 9007 ہے۔</string>
+  <string name="vvm3_error_vmg_timeout_title">کچھ غلط ہو گیا</string>
+  <string name="vvm3_error_vmg_timeout_message">معذرت، ہمیں ایک مسئلہ پیش آ گیا۔ براہ کرم بعد میں دوبارہ کوشش کریں۔ اگر مسئلہ برقرار رہتا ہے، تو براہ کرم %1$s پر کسٹمر سروس سے رابطہ کریں اور انہیں بتائیں کہ خرابی کا کوڈ 9008 ہے۔</string>
+  <string name="vvm3_error_status_sms_timeout_title">کچھ غلط ہو گیا</string>
+  <string name="vvm3_error_status_sms_timeout_message">معذرت، ہمیں آپ کی سروس سیٹ اپ کرنے میں دشواری پیش آ رہی ہے۔ براہ کرم بعد میں دوبارہ کوشش کریں۔ اگر مسئلہ برقرار رہتا ہے، تو براہ کرم %1$s پر کسٹمر سروس سے رابطہ کریں اور انہیں بتائیں کہ خرابی کا کوڈ 9009 ہے۔</string>
+  <string name="vvm3_error_subscriber_blocked_title">آپ کے صوتی میل باکس سے منسلک نہیں ہو سکتا</string>
+  <string name="vvm3_error_subscriber_blocked_message">معذرت، ہم اس وقت آپ کے میل باکس سے منسلک کرنے سے قاصر ہیں۔ براہ کرم بعد میں دوبارہ کوشش کریں۔ اگر مسئلہ برقرار رہتا ہے، تو براہ کرم %1$s پر کسٹمر سروس سے رابطہ کریں اور انہیں بتائیں کہ خرابی کا کوڈ 9990 ہے۔</string>
+  <string name="vvm3_error_unknown_user_title">صوتی میل ترتیب دیں</string>
+  <string name="vvm3_error_unknown_user_message">آپ کے اکاؤنٹ پر صوتی میل ترتیب نہیں دی گئی ہے۔ براہ کرم %1$s پر کسٹمر سروس سے رابطہ کریں اور انہیں بتائیں کہ خرابی کا کوڈ 9991 ہے۔</string>
+  <string name="vvm3_error_unknown_device_title">صوتی میل</string>
+  <string name="vvm3_error_unknown_device_message">اس آلے پر بصری صوتی میل کا استعمال نہیں کیا جا سکتا۔ براہ کرم %1$s پر کسٹمر سروس سے رابطہ کریں اور انہیں بتائیں کہ خرابی کا کوڈ 9992 ہے۔</string>
+  <string name="vvm3_error_invalid_password_title">کچھ غلط ہو گیا</string>
+  <string name="vvm3_error_invalid_password_message">براہ کرم %1$s پر کسٹمر سروس سے رابطہ کریں اور انہیں بتائیں کہ خرابی کا کوڈ 9993 ہے۔</string>
+  <string name="vvm3_error_mailbox_not_initialized_title">بصری صوتی میل</string>
+  <string name="vvm3_error_mailbox_not_initialized_message">بصری صوتی میل کا سیٹ اپ مکمل کرنے کیلئے، براہ کرم %1$s پر کسٹمر سروس سے رابطہ کریں اور انہیں بتائیں کہ خرابی کا کوڈ 9994 ہے۔</string>
+  <string name="vvm3_error_service_not_provisioned_title">بصری صوتی میل</string>
+  <string name="vvm3_error_service_not_provisioned_message">بصری صوتی میل کا سیٹ اپ مکمل کرنے کیلئے، براہ کرم %1$s پر کسٹمر سروس سے رابطہ کریں اور انہیں بتائیں کہ خرابی کا کوڈ 9995 ہے۔</string>
+  <string name="vvm3_error_service_not_activated_title">بصری صوتی میل</string>
+  <string name="vvm3_error_service_not_activated_message">بصری صوتی میل فعال کرنے کیلئے، براہ کرم %1$s پر کسٹمر سروس سے رابطہ کریں اور انہیں بتائیں کہ خرابی کا کوڈ 9996 ہے۔</string>
+  <string name="vvm3_error_user_blocked_title">کچھ غلط ہو گیا</string>
+  <string name="vvm3_error_user_blocked_message">بصری صوتی میل کا سیٹ اپ مکمل کرنے کیلئے، براہ کرم %1$s پر کسٹمر سروس سے رابطہ کریں اور انہیں بتائیں کہ خرابی کا کوڈ 9998 ہے۔</string>
+  <string name="vvm3_error_subscriber_unknown_title">بصری صوتی میل غیر فعال ہے</string>
+  <string name="vvm3_error_subscriber_unknown_message">بصری صوتی میل فعال کرنے کیلئے، %1$s پر کسٹمر سروس سے رابطہ کریں۔</string>
+  <string name="vvm3_error_imap_getquota_error_title">کچھ غلط ہو گیا</string>
+  <string name="vvm3_error_imap_getquota_error_message">براہ کرم %1$s پر کسٹمر سروس سے رابطہ کریں اور انہیں بتائیں کہ خرابی کا کوڈ 9997 ہے۔</string>
+  <string name="vvm3_error_imap_select_error_title">کچھ غلط ہو گیا</string>
+  <string name="vvm3_error_imap_select_error_message">براہ کرم %1$s پر کسٹمر سروس سے رابطہ کریں اور انہیں بتائیں کہ خرابی کا کوڈ 9989 ہے۔</string>
+  <string name="vvm3_error_imap_error_title">کچھ غلط ہو گیا</string>
+  <string name="vvm3_error_imap_error_message">براہ کرم %1$s پر کسٹمر سروس سے رابطہ کریں اور انہیں بتائیں کہ خرابی کا کوڈ 9999 ہے۔</string>
+  <string name="verizon_terms_and_conditions_title">بصری صوتی میل آن کریں</string>
+  <string name="verizon_terms_and_conditions_message">‏%1$s بصری صوتی میل آن کر کے، آپ Verizon Wireless کی شرائط و ضوابط سے اتفاق کرتے ہیں:\n\n%2$s</string>
+  <string name="dialer_terms_and_conditions_title">بصری صوتی میل آن کریں</string>
+  <string name="dialer_terms_and_conditions_existing_user_title">نیا! اپنی صوتی میل پڑھیں</string>
+  <string name="dialer_terms_and_conditions_message">%s</string>
+  <string name="dialer_terms_and_conditions_1.0">‏صوتی میل میں کال کئے بغیر، اپنے پیغامات دیکھیں اور سنیں۔ آپ کے صوتی میل کی ٹرانسکرپٹس Google کی مفت نقل حرفی کی سروس کے ذریعے فراہم کی جاتی ہیں۔ آپ ترتیبات میں اسے کسی بھی وقت آف بھی کر سکتے ہیں۔ %s</string>
+  <string name="dialer_terms_and_conditions_existing_user">‏آپ کے صوتی میل کی ٹرانسکرپٹس Google کی مفت نقل حرفی کی سروس کے ذریعے فراہم کی جاتی ہیں۔ آپ اسے کسی بھی وقت ترتیبات میں آف کر سکتے ہیں۔ ‎%s</string>
+  <string name="dialer_terms_and_conditions_for_verizon_1.0">صوتی میل میں کال کئے بغیر، اپنے پیغامات دیکھیں اور سنیں۔</string>
+  <string name="dialer_terms_and_conditions_learn_more">مزید جانیں</string>
+  <string name="dialer_terms_and_conditions_existing_user_ack">ٹھیک ہے، سمجھ آ گئی</string>
+  <string name="dialer_terms_and_conditions_existing_user_decline">نہیں شکریہ</string>
+  <string name="terms_and_conditions_decline_dialog_title">بصری صوتی میل کو غیر فعال کریں؟</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_message">شرائط و ضوابط مسترد کئے جانے کی صورت میں بصری صوتی میل غیر فعال کر دی جائے گی۔</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_downgrade">غیر فعال کریں</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_message">بصری صوتی میل آف کرنے پر بصری صوتی میل غیر فعال کر دی جائے گی۔</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_downgrade">غیر فعال کریں</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message">‏صوتی میل تک رسائی صرف ‎*86 کو کال کرنے سے ہوگی۔ آگے بڑھنے کیلئے، صوتی میل کی نئی PIN سیٹ کریں۔</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin">‏PIN سیٹ کریں</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/error/res/values-uz/strings.xml b/java/com/android/dialer/voicemail/listui/error/res/values-uz/strings.xml
new file mode 100644
index 0000000..a9aed4b
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/error/res/values-uz/strings.xml
@@ -0,0 +1,102 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_error_activating_title">Vizual ovozli pochta faollashtirilmoqda</string>
+  <string name="voicemail_error_activating_message">Vizual ovozli pochta xizmati faollashtirilmasa, yangi ovozli xabarlar haqida bildirishnoma kelmaydi. Ungacha ovozli pochta raqamiga terib, yangi xabarlarni tinglashingiz mumkin.</string>
+  <string name="voicemail_error_not_activate_no_signal_title">Vizual ovozli pochta faollashmadi</string>
+  <string name="voicemail_error_not_activate_no_signal_message">Telefoningizda mobil internet yoqilganligini tekshiring va qayta urining.</string>
+  <string name="voicemail_error_not_activate_no_signal_airplane_mode_message">Parvoz rejimini o‘chiring va qayta urining.</string>
+  <string name="voicemail_error_no_signal_title">Internetga ulanmagansiz</string>
+  <string name="voicemail_error_no_signal_message">Sizga yangi ovozli xabarlar haqida bildirishnoma kelmaydi. Wi-Fi tarmoqqa ulangan qurilmangizda sinxronizatsiya yoqilsa, xabarlar yuklanadi.</string>
+  <string name="voicemail_error_no_signal_airplane_mode_message">Sizga yangi ovozli pochta xabarlari haqida bildirishnoma kelmaydi. Ovozli pochtani sinxronlash uchun parvoz rejimini o‘chiring.</string>
+  <string name="voicemail_error_no_signal_cellular_required_message">Ovozli pochtani tekshirish uchun mobil internet yoqilgan bo‘lishi lozim.</string>
+  <string name="voicemail_error_activation_failed_title">Vizual ovozli pochta faollashmadi</string>
+  <string name="voicemail_error_activation_failed_message">Ovozli pochtani maxsus raqamga terib ham tekshirishingiz mumkin.</string>
+  <string name="voicemail_error_no_data_title">Vizual ovozli pochta yangilanmadi</string>
+  <string name="voicemail_error_no_data_message">Wi-Fi yoki mobil internet yaxshi ishlaganda qayta urining. Ovozli pochtani maxsus raqamga terib ham tekshirishingiz mumkin.</string>
+  <string name="voicemail_error_no_data_cellular_required_message">Mobil internet yaxshi ishlaganda qayta urining. Ovozli pochtani maxsus raqamga terib ham tekshirishingiz mumkin.</string>
+  <string name="voicemail_error_bad_config_title">Vizual ovozli pochta yangilanmadi</string>
+  <string name="voicemail_error_bad_config_message">Ovozli pochtani maxsus raqamga terib ham tekshirishingiz mumkin.</string>
+  <string name="voicemail_error_communication_title">Vizual ovozli pochta yangilanmadi</string>
+  <string name="voicemail_error_communication_message">Ovozli pochtani maxsus raqamga terib ham tekshirishingiz mumkin.</string>
+  <string name="voicemail_error_server_connection_title">Vizual ovozli pochta yangilanmadi</string>
+  <string name="voicemail_error_server_connection_message">Ovozli pochtani maxsus raqamga terib ham tekshirishingiz mumkin.</string>
+  <string name="voicemail_error_server_title">Vizual ovozli pochta yangilanmadi</string>
+  <string name="voicemail_error_server_message">Ovozli pochtani maxsus raqamga terib ham tekshirishingiz mumkin.</string>
+  <string name="voicemail_error_inbox_near_full_title">Ovozli pochta qutisi deyarli to‘lgan</string>
+  <string name="voicemail_error_inbox_near_full_message">Agar ovozli pochta qutisi to‘lib qolsa, yangi xabar qabul qilishning imkoni bo‘lmay qoladi.</string>
+  <string name="voicemail_error_inbox_full_title">Yangi ovozli pochta xabarini qabul qilib bo‘lmaydi</string>
+  <string name="voicemail_error_inbox_full_message">Ovozli pochta qutisi to‘lgan. Yangi xabar qabul qilish uchun bir nechta eski xabarlarni o‘chirib tashlang.</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_title">Qo‘shimcha xotira va avtomatik yuklash funksiyasini yoqing</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_message">Pochtangiz qutisi deyarli to‘lgan. Unda joy bo‘shatish uchun qo‘shimcha xotirani yoqing. Bu – Googlega ovozli xabarlaringizni boshqarish va ularning nusxasini avtomatik yuklashiga imkon beradi.</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_title">Qo‘shimcha xotira va avtomatik yuklash funksiyasini yoqing</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_message">Pochtangiz qutisi deyarli to‘lgan. Unda joy bo‘shatish uchun qo‘shimcha xotirani yoqing. Bu – Googlega ovozli xabarlaringizni boshqarish va ularning nusxasini avtomatik yuklashiga imkon beradi.</string>
+  <string name="voicemail_error_pin_not_set_title">Ovozli pochta uchun PIN kod o‘rnatish</string>
+  <string name="voicemail_error_pin_not_set_message">Ovozli pochta raqamiga har safar terilganida PIN kod talab qilinadi.</string>
+  <string name="voicemail_action_turn_off_airplane_mode">Parvoz rejimi sozlamalari</string>
+  <string name="voicemail_action_set_pin">PIN kod o‘rnatish</string>
+  <string name="voicemail_action_retry">Qayta urinish</string>
+  <string name="voicemail_action_turn_archive_on">Yoqish</string>
+  <string name="voicemail_action_dimiss">Kerak emas</string>
+  <string name="voicemail_action_sync">Sinxronlash</string>
+  <string name="voicemail_action_call_voicemail">Ovozli pochta raqamiga terish</string>
+  <string name="voicemail_action_call_customer_support">Mijozlarga ko‘mak xizmatiga terish</string>
+  <string name="vvm3_error_vms_dns_failure_title">Nimadir xato ketdi</string>
+  <string name="vvm3_error_vms_dns_failure_message">Xatolik yuz berdi. Keyinroq qayta urining. Agar bu muammo hal bo‘lmasa, %1$s raqami orqali mijozlarga ko‘mak xizmatiga murojaat qiling va ularga xatolik kodi haqida xabar bering (kod: 9001).</string>
+  <string name="vvm3_error_vmg_dns_failure_title">Nimadir xato ketdi</string>
+  <string name="vvm3_error_vmg_dns_failure_message">Xatolik yuz berdi. Keyinroq qayta urining. Agar bu muammo hal bo‘lmasa, %1$s raqami orqali mijozlarga ko‘mak xizmatiga murojaat qiling va ularga xatolik kodi haqida xabar bering (kod: 9002).</string>
+  <string name="vvm3_error_spg_dns_failure_title">Nimadir xato ketdi</string>
+  <string name="vvm3_error_spg_dns_failure_message">Xatolik yuz berdi. Keyinroq qayta urining. Agar bu muammo hal bo‘lmasa, %1$s raqami orqali mijozlarga ko‘mak xizmatiga murojaat qiling va ularga xatolik kodi haqida xabar bering (kod: 9003).</string>
+  <string name="vvm3_error_vms_no_cellular_title">Ovozli pochta qutisiga ulanib bo‘lmadi</string>
+  <string name="vvm3_error_vms_no_cellular_message">Ovozli pochta qutisiga ulanib bo‘lmayapti. Aloqa signali kuchliroq joyni qidirib ko‘ring va qayta ulaning. Agar bu muammo hal bo‘lmasa, %1$s raqami orqali mijozlarga ko‘mak xizmatiga murojaat qiling va ularga xatolik kodi haqida xabar bering (kod: 9004).</string>
+  <string name="vvm3_error_vmg_no_cellular_title">Ovozli pochta qutisiga ulanib bo‘lmadi</string>
+  <string name="vvm3_error_vmg_no_cellular_message">Ovozli pochta qutisiga ulanib bo‘lmayapti. Aloqa signali kuchliroq joyni qidirib ko‘ring va qayta ulaning. Agar bu muammo hal bo‘lmasa, %1$s raqami orqali mijozlarga ko‘mak xizmatiga murojaat qiling va ularga xatolik kodi haqida xabar bering (kod: 9005).</string>
+  <string name="vvm3_error_spg_no_cellular_title">Ovozli pochta qutisiga ulanib bo‘lmadi</string>
+  <string name="vvm3_error_spg_no_cellular_message">Ovozli pochta qutisiga ulanib bo‘lmayapti. Aloqa signali kuchliroq joyni qidirib ko‘ring va qayta ulaning. Agar bu muammo hal bo‘lmasa, %1$s raqami orqali mijozlarga ko‘mak xizmatiga murojaat qiling va ularga xatolik kodi haqida xabar bering (kod: 9006).</string>
+  <string name="vvm3_error_vms_timeout_title">Nimadir xato ketdi</string>
+  <string name="vvm3_error_vms_timeout_message">Xatolik yuz berdi. Keyinroq qayta urining. Agar bu muammo hal bo‘lmasa, %1$s raqami orqali mijozlarga ko‘mak xizmatiga murojaat qiling va ularga xatolik kodi haqida xabar bering (kod: 9007).</string>
+  <string name="vvm3_error_vmg_timeout_title">Nimadir xato ketdi</string>
+  <string name="vvm3_error_vmg_timeout_message">Xatolik yuz berdi. Keyinroq qayta urining. Agar bu muammo hal bo‘lmasa, %1$s raqami orqali mijozlarga ko‘mak xizmatiga murojaat qiling va ularga xatolik kodi haqida xabar bering (kod: 9008).</string>
+  <string name="vvm3_error_status_sms_timeout_title">Nimadir xato ketdi</string>
+  <string name="vvm3_error_status_sms_timeout_message">Xizmatni sozlab bo‘lmayapti. Keyinroq qayta urining. Agar bu muammo hal bo‘lmasa, %1$s raqami orqali mijozlarga ko‘mak xizmatiga murojaat qiling va ularga xatolik kodi haqida xabar bering (kod: 9009).</string>
+  <string name="vvm3_error_subscriber_blocked_title">Ovozli pochta qutisiga ulanib bo‘lmadi</string>
+  <string name="vvm3_error_subscriber_blocked_message">Ayni paytda ovozli pochta qutisiga ulanib bo‘lmayapti. Keyinroq qayta urining. Agar bu muammo hal bo‘lmasa, %1$s raqami orqali mijozlarga ko‘mak xizmatiga murojaat qiling va ularga xatolik kodi haqida xabar bering (kod: 9990).</string>
+  <string name="vvm3_error_unknown_user_title">Ovozli pochtani sozlash</string>
+  <string name="vvm3_error_unknown_user_message">Hisobingizda ovozli pochta xizmati sozlanmagan. %1$s raqami orqali mijozlarga ko‘mak xizmatiga murojaat qiling va ularga xatolik kodi haqida xabar bering (kod: 9991).</string>
+  <string name="vvm3_error_unknown_device_title">Ovozli pochta</string>
+  <string name="vvm3_error_unknown_device_message">Bu qurilmada vizual ovozli pochtadan foydalanib bo‘lmaydi. %1$s raqami orqali mijozlarga ko‘mak xizmatiga murojaat qiling va ularga xatolik kodi haqida xabar bering (kod: 9992).</string>
+  <string name="vvm3_error_invalid_password_title">Nimadir xato ketdi</string>
+  <string name="vvm3_error_invalid_password_message">%1$s raqami orqali mijozlarga ko‘mak xizmatiga murojaat qiling va ularga xatolik kodi haqida xabar bering (kod: 9993).</string>
+  <string name="vvm3_error_mailbox_not_initialized_title">Vizual ovozli pochta</string>
+  <string name="vvm3_error_mailbox_not_initialized_message">Vizual ovozli pochtani sozlashni tugallash uchun %1$s raqami orqali mijozlarga ko‘mak xizmatiga murojaat qiling va ularga xatolik kodi haqida xabar bering (kod: 9994).</string>
+  <string name="vvm3_error_service_not_provisioned_title">Vizual ovozli pochta</string>
+  <string name="vvm3_error_service_not_provisioned_message">Vizual ovozli pochtani sozlashni tugallash uchun %1$s raqami orqali mijozlarga ko‘mak xizmatiga murojaat qiling va ularga xatolik kodi haqida xabar bering (kod: 9995).</string>
+  <string name="vvm3_error_service_not_activated_title">Vizual ovozli pochta</string>
+  <string name="vvm3_error_service_not_activated_message">Vizual ovozli pochtani faollashtirish uchun %1$s raqami orqali mijozlarga ko‘mak xizmatiga murojaat qiling va ularga xatolik kodi haqida xabar bering (kod: 9996).</string>
+  <string name="vvm3_error_user_blocked_title">Nimadir xato ketdi</string>
+  <string name="vvm3_error_user_blocked_message">Vizual ovozli pochtani sozlashni tugallash uchun %1$s raqami orqali mijozlarga ko‘mak xizmatiga murojaat qiling va ularga xatolik kodi haqida xabar bering (kod: 9998).</string>
+  <string name="vvm3_error_subscriber_unknown_title">Vizual ovozli pochta yoqilmagan</string>
+  <string name="vvm3_error_subscriber_unknown_message">Vizual ovozli pochta xizmatini faollashtirish uchun %1$s raqami orqali mijozlarga ko‘mak xizmatiga murojaat qiling.</string>
+  <string name="vvm3_error_imap_getquota_error_title">Nimadir xato ketdi</string>
+  <string name="vvm3_error_imap_getquota_error_message">%1$s raqami orqali mijozlarga ko‘mak xizmatiga murojaat qiling va ularga xatolik kodi haqida xabar bering (kod: 9997).</string>
+  <string name="vvm3_error_imap_select_error_title">Nimadir xato ketdi</string>
+  <string name="vvm3_error_imap_select_error_message">%1$s raqami orqali mijozlarga ko‘mak xizmatiga murojaat qiling va ularga xatolik kodi haqida xabar bering (kod: 9989).</string>
+  <string name="vvm3_error_imap_error_title">Nimadir xato ketdi</string>
+  <string name="vvm3_error_imap_error_message">%1$s raqami orqali mijozlarga ko‘mak xizmatiga murojaat qiling va ularga xatolik kodi haqida xabar bering (kod: 9999).</string>
+  <string name="verizon_terms_and_conditions_title">Vizual ovozli pochtani faollashtirish</string>
+  <string name="verizon_terms_and_conditions_message">%1$s Vizual ovozli pochtani faollashtirish orqali siz Verizon Wireless xizmatidan foydalanish shartlarini qabul qilgan hisoblanasiz:\n\n%2$s</string>
+  <string name="dialer_terms_and_conditions_title">Vizual ovozli pochtani faollashtirish</string>
+  <string name="dialer_terms_and_conditions_existing_user_title">Yangi! Endi ovozli xabarlarni o‘qish mumkin!</string>
+  <string name="dialer_terms_and_conditions_message">%s</string>
+  <string name="dialer_terms_and_conditions_1.0">Ovozli pochta raqamiga termasdan turib, ovozli xabarlarni ko‘rish va tinglash imkoniyati paydo bo‘ldi. Ovozli xabarlar transkripsiyasi Googlening bepul transkripsiya xizmati tomonidan taqdim etiladi. Bu funksiyani Sozlamalar orqali o‘chirishingiz yoki yoqishingiz mumkin. %s</string>
+  <string name="dialer_terms_and_conditions_existing_user">Ovozli xabarlar transkripsiyasi endi Googlening bepul transkripsiya xizmati tomonidan taqdim etiladi. Bu funksiyani xohlagan vaqtda Sozlamalardan o‘chirib qo‘yish mumkin. %s</string>
+  <string name="dialer_terms_and_conditions_for_verizon_1.0">Ovozli pochta raqamiga termasdan turib, undagi ovozli xabarlarni endi ko‘rishingiz va tinglashingiz mumkin.</string>
+  <string name="dialer_terms_and_conditions_learn_more">Batafsil</string>
+  <string name="dialer_terms_and_conditions_existing_user_ack">OK</string>
+  <string name="dialer_terms_and_conditions_existing_user_decline">Kerak emas</string>
+  <string name="terms_and_conditions_decline_dialog_title">Vizual ovozli pochta faolsizlantirilsinmi?</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_message">Agar xizmatdan foydalanish shartlari qabul qilinmasa, vizual ovozli pochta faolsizlantiriladi.</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_downgrade">Faolsizlantirish</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_message">Vizual ovozli pochtani faolsizlantirsangiz, undan foydalanishning imkoni bo‘lmay qoladi.</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_downgrade">Faolsizlantirish</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message">Ovozli pochta xabarlarini *86 raqamigaterib tinglash mumkin. Davom etish uchun ovozli pochtaga yangi PIN kod o‘rnating.</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin">PIN kod o‘rnatish</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/error/res/values-vi/strings.xml b/java/com/android/dialer/voicemail/listui/error/res/values-vi/strings.xml
new file mode 100644
index 0000000..a1d2c11
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/error/res/values-vi/strings.xml
@@ -0,0 +1,102 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_error_activating_title">Đang kích hoạt thư thoại kèm theo hình ảnh</string>
+  <string name="voicemail_error_activating_message">Bạn có thể không nhận được thông báo thư thoại cho đến khi thư thoại kèm theo hình ảnh được kích hoạt hoàn toàn. Gọi thư thoại để tìm tin nhắn mới cho đến khi thư thoại được kích hoạt hoàn toàn.</string>
+  <string name="voicemail_error_not_activate_no_signal_title">Không kích hoạt được thư thoại kèm theo hình ảnh</string>
+  <string name="voicemail_error_not_activate_no_signal_message">Đảm bảo điện thoại của bạn có kết nối mạng di động và thử lại.</string>
+  <string name="voicemail_error_not_activate_no_signal_airplane_mode_message">Hãy tắt chế độ trên máy bay và thử lại.</string>
+  <string name="voicemail_error_no_signal_title">Không có kết nối</string>
+  <string name="voicemail_error_no_signal_message">Bạn sẽ không được thông báo về thư thoại mới. Nếu đang dùng Wi-Fi, bạn có thể kiểm tra thư thoại bằng cách đồng bộ hóa ngay bây giờ.</string>
+  <string name="voicemail_error_no_signal_airplane_mode_message">Bạn sẽ không được thông báo về thư thoại mới. Hãy tắt chế độ trên máy bay để đồng bộ hóa thư thoại của bạn.</string>
+  <string name="voicemail_error_no_signal_cellular_required_message">Điện thoại của bạn cần kết nối dữ liệu di động để kiểm tra thư thoại.</string>
+  <string name="voicemail_error_activation_failed_title">Không kích hoạt được thư thoại kèm theo hình ảnh</string>
+  <string name="voicemail_error_activation_failed_message">Bạn vẫn có thể gọi để kiểm tra thư thoại.</string>
+  <string name="voicemail_error_no_data_title">Không cập nhật được thư thoại kèm theo hình ảnh</string>
+  <string name="voicemail_error_no_data_message">Hãy thử lại khi Wi-Fi hoặc kết nối dữ liệu di động của bạn tốt hơn. Bạn vẫn có thể gọi để kiểm tra thư thoại.</string>
+  <string name="voicemail_error_no_data_cellular_required_message">Hãy thử lại khi kết nối dữ liệu di động của bạn tốt hơn. Bạn vẫn có thể gọi để kiểm tra thư thoại.</string>
+  <string name="voicemail_error_bad_config_title">Không cập nhật được thư thoại kèm theo hình ảnh</string>
+  <string name="voicemail_error_bad_config_message">Bạn vẫn có thể gọi để kiểm tra thư thoại.</string>
+  <string name="voicemail_error_communication_title">Không cập nhật được thư thoại kèm theo hình ảnh</string>
+  <string name="voicemail_error_communication_message">Bạn vẫn có thể gọi để kiểm tra thư thoại.</string>
+  <string name="voicemail_error_server_connection_title">Không cập nhật được thư thoại kèm theo hình ảnh</string>
+  <string name="voicemail_error_server_connection_message">Bạn vẫn có thể gọi để kiểm tra thư thoại.</string>
+  <string name="voicemail_error_server_title">Không cập nhật được thư thoại kèm theo hình ảnh</string>
+  <string name="voicemail_error_server_message">Bạn vẫn có thể gọi để kiểm tra thư thoại.</string>
+  <string name="voicemail_error_inbox_near_full_title">Hộp thư đến gần đầy</string>
+  <string name="voicemail_error_inbox_near_full_message">Bạn sẽ không thể nhận được thư thoại mới nếu hộp thư đến của bạn đã đầy.</string>
+  <string name="voicemail_error_inbox_full_title">Không nhận được thư thoại mới</string>
+  <string name="voicemail_error_inbox_full_message">Hộp thư đến của bạn đã đầy. Hãy thử xóa một vài thư để nhận thư thoại mới.</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_title">Bật sao lưu và bộ nhớ bổ sung</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_message">Hộp thư của bạn đã đầy. Để giải phóng dung lượng, hãy bật bộ nhớ bổ sung để Google có thể quản lý và sao lưu thư thoại của bạn.</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_title">Bật sao lưu và bộ nhớ bổ sung</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_message">Hộp thư của bạn đã gần đầy. Để giải phóng dung lượng, hãy bật bộ nhớ bổ sung để Google có thể quản lý và sao lưu thư thoại của bạn.</string>
+  <string name="voicemail_error_pin_not_set_title">Đặt mã PIN thư thoại của bạn</string>
+  <string name="voicemail_error_pin_not_set_message">Bạn cần có mã PIN thư thoại mỗi khi gọi để truy cập thư thoại của mình.</string>
+  <string name="voicemail_action_turn_off_airplane_mode">Cài đặt chế độ trên máy bay</string>
+  <string name="voicemail_action_set_pin">Đặt mã PIN</string>
+  <string name="voicemail_action_retry">Thử lại</string>
+  <string name="voicemail_action_turn_archive_on">Bật</string>
+  <string name="voicemail_action_dimiss">Không, cảm ơn</string>
+  <string name="voicemail_action_sync">Đồng bộ hóa</string>
+  <string name="voicemail_action_call_voicemail">Gọi thư thoại</string>
+  <string name="voicemail_action_call_customer_support">Gọi bộ phận hỗ trợ khách hàng</string>
+  <string name="vvm3_error_vms_dns_failure_title">Đã xảy ra lỗi</string>
+  <string name="vvm3_error_vms_dns_failure_message">Rất tiếc, chúng tôi đã gặp phải sự cố. Vui lòng thử lại sau. Nếu vẫn xảy ra sự cố, vui lòng liên hệ với bộ phận Dịch vụ khách hàng theo số %1$s và cho họ biết mã lỗi là 9001.</string>
+  <string name="vvm3_error_vmg_dns_failure_title">Đã xảy ra lỗi</string>
+  <string name="vvm3_error_vmg_dns_failure_message">Rất tiếc, chúng tôi đã gặp phải sự cố. Vui lòng thử lại sau. Nếu vẫn xảy ra sự cố, vui lòng liên hệ với bộ phận Dịch vụ khách hàng theo số %1$s và cho họ biết mã lỗi là 9002.</string>
+  <string name="vvm3_error_spg_dns_failure_title">Đã xảy ra lỗi</string>
+  <string name="vvm3_error_spg_dns_failure_message">Rất tiếc, chúng tôi đã gặp phải sự cố. Vui lòng thử lại sau. Nếu vẫn xảy ra sự cố, vui lòng liên hệ với bộ phận Dịch vụ khách hàng theo số %1$s và cho họ biết mã lỗi là 9003.</string>
+  <string name="vvm3_error_vms_no_cellular_title">Không thể kết nối với hộp thư thoại của bạn</string>
+  <string name="vvm3_error_vms_no_cellular_message">Rất tiếc, chúng tôi gặp phải sự cố khi kết nối với hộp thư thoại của bạn. Nếu bạn đang ở khu vực có cường độ tín hiệu yếu, hãy đợi cho đến khi bạn có tín hiệu mạnh và thử lại. Nếu vẫn xảy ra sự cố, vui lòng liên hệ với bộ phận Dịch vụ khách hàng theo số %1$s và cho họ biết mã lỗi là 9004.</string>
+  <string name="vvm3_error_vmg_no_cellular_title">Không thể kết nối với hộp thư thoại của bạn</string>
+  <string name="vvm3_error_vmg_no_cellular_message">Rất tiếc, chúng tôi gặp phải sự cố khi kết nối với hộp thư thoại của bạn. Nếu bạn đang ở khu vực có cường độ tín hiệu yếu, hãy đợi cho đến khi bạn có tín hiệu mạnh và thử lại. Nếu vẫn xảy ra sự cố, vui lòng liên hệ với bộ phận Dịch vụ khách hàng theo số %1$s và cho họ biết mã lỗi là 9005.</string>
+  <string name="vvm3_error_spg_no_cellular_title">Không thể kết nối với hộp thư thoại của bạn</string>
+  <string name="vvm3_error_spg_no_cellular_message">Rất tiếc, chúng tôi gặp phải sự cố khi kết nối với hộp thư thoại của bạn. Nếu bạn đang ở khu vực có cường độ tín hiệu yếu, hãy đợi cho đến khi bạn có tín hiệu mạnh và thử lại. Nếu vẫn xảy ra sự cố, vui lòng liên hệ với bộ phận Dịch vụ khách hàng theo số %1$s và cho họ biết mã lỗi là 9006.</string>
+  <string name="vvm3_error_vms_timeout_title">Đã xảy ra lỗi</string>
+  <string name="vvm3_error_vms_timeout_message">Rất tiếc, chúng tôi đã gặp phải sự cố. Vui lòng thử lại sau. Nếu vẫn xảy ra sự cố, vui lòng liên hệ với bộ phận Dịch vụ khách hàng theo số %1$s và cho họ biết mã lỗi là 9007.</string>
+  <string name="vvm3_error_vmg_timeout_title">Đã xảy ra lỗi</string>
+  <string name="vvm3_error_vmg_timeout_message">Rất tiếc, chúng tôi đã gặp phải sự cố. Vui lòng thử lại sau. Nếu vẫn xảy ra sự cố, vui lòng liên hệ với bộ phận Dịch vụ khách hàng theo số %1$s và cho họ biết mã lỗi là 9008.</string>
+  <string name="vvm3_error_status_sms_timeout_title">Đã xảy ra lỗi</string>
+  <string name="vvm3_error_status_sms_timeout_message">Rất tiếc, chúng tôi gặp phải sự cố khi thiết lập dịch vụ của bạn. Vui lòng thử lại sau. Nếu vẫn xảy ra sự cố, vui lòng liên hệ với bộ phận Dịch vụ khách hàng theo số %1$s và cho họ biết mã lỗi là 9009.</string>
+  <string name="vvm3_error_subscriber_blocked_title">Không thể kết nối với hộp thư thoại của bạn</string>
+  <string name="vvm3_error_subscriber_blocked_message">Rất tiếc, chúng tôi không thể kết nối với hộp thư thoại của bạn vào lúc này. Vui lòng thử lại sau. Nếu vẫn xảy ra sự cố, vui lòng liên hệ với bộ phận Dịch vụ khách hàng theo số %1$s và cho họ biết mã lỗi là 9990.</string>
+  <string name="vvm3_error_unknown_user_title">Thiết lập thư thoại</string>
+  <string name="vvm3_error_unknown_user_message">Thư thoại không được thiết lập trên tài khoản của bạn. Vui lòng liên hệ với bộ phận Dịch vụ khách hàng theo số %1$s và cho họ biết mã lỗi là 9991.</string>
+  <string name="vvm3_error_unknown_device_title">Thư thoại</string>
+  <string name="vvm3_error_unknown_device_message">Không thể sử dụng thư thoại kèm theo hình ảnh trên thiết bị này. Vui lòng liên hệ với bộ phận Dịch vụ khách hàng theo số %1$s và cho họ biết mã lỗi là 9992.</string>
+  <string name="vvm3_error_invalid_password_title">Đã xảy ra lỗi</string>
+  <string name="vvm3_error_invalid_password_message">Vui lòng liên hệ với bộ phận Dịch vụ khách hàng theo số %1$s và cho họ biết mã lỗi là 9993.</string>
+  <string name="vvm3_error_mailbox_not_initialized_title">Thư thoại kèm theo hình ảnh</string>
+  <string name="vvm3_error_mailbox_not_initialized_message">Để hoàn thành việc thiết lập thư thoại kèm theo hình ảnh, vui lòng liên hệ với bộ phận Dịch vụ khách hàng theo số %1$s và cho họ biết mã lỗi là 9994.</string>
+  <string name="vvm3_error_service_not_provisioned_title">Thư thoại kèm theo hình ảnh</string>
+  <string name="vvm3_error_service_not_provisioned_message">Để hoàn thành việc thiết lập thư thoại kèm theo hình ảnh, vui lòng liên hệ với bộ phận Dịch vụ khách hàng theo số %1$s và cho họ biết mã lỗi là 9995.</string>
+  <string name="vvm3_error_service_not_activated_title">Thư thoại kèm theo hình ảnh</string>
+  <string name="vvm3_error_service_not_activated_message">Để kích hoạt thư thoại kèm theo hình ảnh, vui lòng liên hệ với bộ phận Dịch vụ khách hàng theo số %1$s và cho họ biết mã lỗi là 9996.</string>
+  <string name="vvm3_error_user_blocked_title">Đã xảy ra lỗi</string>
+  <string name="vvm3_error_user_blocked_message">Để hoàn thành việc thiết lập thư thoại kèm theo hình ảnh, vui lòng liên hệ với bộ phận Dịch vụ khách hàng theo số %1$s và cho họ biết mã lỗi là 9998.</string>
+  <string name="vvm3_error_subscriber_unknown_title">Thư thoại kèm theo hình ảnh bị tắt</string>
+  <string name="vvm3_error_subscriber_unknown_message">Vui lòng liên hệ với bộ phận Dịch vụ khách hàng theo số %1$s để kích hoạt thư thoại kèm theo hình ảnh.</string>
+  <string name="vvm3_error_imap_getquota_error_title">Đã xảy ra lỗi</string>
+  <string name="vvm3_error_imap_getquota_error_message">Vui lòng liên hệ với bộ phận Dịch vụ khách hàng theo số %1$s và cho họ biết mã lỗi là 9997.</string>
+  <string name="vvm3_error_imap_select_error_title">Đã xảy ra lỗi</string>
+  <string name="vvm3_error_imap_select_error_message">Vui lòng liên hệ với bộ phận Dịch vụ khách hàng theo số %1$s và cho họ biết mã lỗi là 9989.</string>
+  <string name="vvm3_error_imap_error_title">Đã xảy ra lỗi</string>
+  <string name="vvm3_error_imap_error_message">Vui lòng liên hệ với bộ phận Dịch vụ khách hàng theo số %1$s và cho họ biết mã lỗi là 9999.</string>
+  <string name="verizon_terms_and_conditions_title">Bật thư thoại kèm theo hình ảnh</string>
+  <string name="verizon_terms_and_conditions_message">%1$s Bằng việc bật thư thoại kèm theo hình ảnh, bạn đồng ý với các điều khoản và điều kiện của Verizon Wireless:\n\n%2$s</string>
+  <string name="dialer_terms_and_conditions_title">Bật thư thoại kèm theo hình ảnh</string>
+  <string name="dialer_terms_and_conditions_existing_user_title">Mới! Đọc thư thoại của bạn</string>
+  <string name="dialer_terms_and_conditions_message">%s</string>
+  <string name="dialer_terms_and_conditions_1.0">Xem và nghe tin nhắn của bạn mà không phải gọi số dịch vụ thư thoại. Bản chép lời của thư thoại do dịch vụ chép lời miễn phí của Google cung cấp. Bạn có thể tắt dịch vụ này trong phần Cài đặt bất cứ lúc nào. %s</string>
+  <string name="dialer_terms_and_conditions_existing_user">Bản chép lời của thư thoại hiện do dịch vụ chép lời miễn phí của Google cung cấp. Bạn có thể tắt dịch vụ này trong phần Cài đặt bất cứ lúc nào. %s</string>
+  <string name="dialer_terms_and_conditions_for_verizon_1.0">Xem và nghe tin nhắn của bạn mà không phải gọi số dịch vụ thư thoại.</string>
+  <string name="dialer_terms_and_conditions_learn_more">Tìm hiểu thêm</string>
+  <string name="dialer_terms_and_conditions_existing_user_ack">OK, tôi đã hiểu</string>
+  <string name="dialer_terms_and_conditions_existing_user_decline">Không, cảm ơn</string>
+  <string name="terms_and_conditions_decline_dialog_title">Tắt thư thoại kèm theo hình ảnh?</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_message">Thư thoại kèm theo hình ảnh sẽ bị tắt nếu điều khoản và điều kiện bị từ chối.</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_downgrade">Tắt</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_message">Nếu bạn tắt thư thoại kèm theo hình ảnh, tính năng này sẽ bị vô hiệu hóa.</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_downgrade">Tắt</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message">Bạn chỉ có thể truy cập thư thoại bằng cách gọi *86. Hãy đặt mã PIN thư thoại mới để tiếp tục.</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin">Đặt mã PIN</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/error/res/values-zh-rCN/strings.xml b/java/com/android/dialer/voicemail/listui/error/res/values-zh-rCN/strings.xml
new file mode 100644
index 0000000..9f361b0
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/error/res/values-zh-rCN/strings.xml
@@ -0,0 +1,102 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_error_activating_title">正在激活可视语音信箱</string>
+  <string name="voicemail_error_activating_message">您必须完全激活可视语音信箱，才能收到语音邮件通知。在完全激活前，请呼叫语音信箱以检索新邮件。</string>
+  <string name="voicemail_error_not_activate_no_signal_title">无法激活可视语音信箱</string>
+  <string name="voicemail_error_not_activate_no_signal_message">请确保您的手机已连接到移动网络，然后重试。</string>
+  <string name="voicemail_error_not_activate_no_signal_airplane_mode_message">请关闭飞行模式，然后重试。</string>
+  <string name="voicemail_error_no_signal_title">无网络连接</string>
+  <string name="voicemail_error_no_signal_message">您将不会收到关于新语音邮件的通知。如果您已连接到 WLAN 网络，可以立即同步以查看语音邮件。</string>
+  <string name="voicemail_error_no_signal_airplane_mode_message">您将不会收到关于新语音邮件的通知。请关闭飞行模式以同步语音信箱。</string>
+  <string name="voicemail_error_no_signal_cellular_required_message">您的手机必须连接到移动网络，您才能查看语音邮件。</string>
+  <string name="voicemail_error_activation_failed_title">无法激活可视语音信箱</string>
+  <string name="voicemail_error_activation_failed_message">您仍然可以通过拨打电话来查看语音邮件。</string>
+  <string name="voicemail_error_no_data_title">无法更新可视语音信箱</string>
+  <string name="voicemail_error_no_data_message">请在 WLAN 或移动网络连接信号较强时重试。您仍然可以通过拨打电话来查看语音邮件。</string>
+  <string name="voicemail_error_no_data_cellular_required_message">请在移动数据网络连接信号较强时重试。您仍然可以通过拨打电话来查看语音邮件。</string>
+  <string name="voicemail_error_bad_config_title">无法更新可视语音信箱</string>
+  <string name="voicemail_error_bad_config_message">您仍然可以通过拨打电话来查看语音邮件。</string>
+  <string name="voicemail_error_communication_title">无法更新可视语音信箱</string>
+  <string name="voicemail_error_communication_message">您仍然可以通过拨打电话来查看语音邮件。</string>
+  <string name="voicemail_error_server_connection_title">无法更新可视语音信箱</string>
+  <string name="voicemail_error_server_connection_message">您仍然可以通过拨打电话来查看语音邮件。</string>
+  <string name="voicemail_error_server_title">无法更新可视语音信箱</string>
+  <string name="voicemail_error_server_message">您仍然可以通过拨打电话来查看语音邮件。</string>
+  <string name="voicemail_error_inbox_near_full_title">收件箱快满了</string>
+  <string name="voicemail_error_inbox_near_full_message">如果收件箱满了，您将无法接收新的语音邮件。</string>
+  <string name="voicemail_error_inbox_full_title">无法接收新的语音邮件</string>
+  <string name="voicemail_error_inbox_full_message">您的收件箱已满。请尝试删除部分邮件，以便接收新的语音邮件。</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_title">启用额外存储空间和备份功能</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_message">您的邮箱已满。如要释放空间，请启用额外存储空间，以便 Google 管理和备份您的语音邮件。</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_title">启用额外存储空间和备份功能</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_message">您的邮箱快满了。如要释放空间，请启用额外存储空间，以便 Google 管理和备份您的语音邮件。</string>
+  <string name="voicemail_error_pin_not_set_title">设置语音信箱 PIN 码</string>
+  <string name="voicemail_error_pin_not_set_message">您必须使用语音信箱 PIN 码，才能访问您的语音信箱。</string>
+  <string name="voicemail_action_turn_off_airplane_mode">飞行模式设置</string>
+  <string name="voicemail_action_set_pin">设置 PIN 码</string>
+  <string name="voicemail_action_retry">重试</string>
+  <string name="voicemail_action_turn_archive_on">启用</string>
+  <string name="voicemail_action_dimiss">不用了</string>
+  <string name="voicemail_action_sync">同步</string>
+  <string name="voicemail_action_call_voicemail">呼叫语音信箱</string>
+  <string name="voicemail_action_call_customer_support">致电客服人员</string>
+  <string name="vvm3_error_vms_dns_failure_title">出了点问题</string>
+  <string name="vvm3_error_vms_dns_failure_message">很抱歉，我们遇到了一个问题，请稍后重试。如果重试后仍然有问题，请拨打 %1$s 联系客户服务人员，并告诉他们错误代码是 9001。</string>
+  <string name="vvm3_error_vmg_dns_failure_title">出了点问题</string>
+  <string name="vvm3_error_vmg_dns_failure_message">很抱歉，我们遇到了一个问题，请稍后重试。如果重试后仍然有问题，请拨打 %1$s 联系客户服务人员，并告诉他们错误代码是 9002。</string>
+  <string name="vvm3_error_spg_dns_failure_title">出了点问题</string>
+  <string name="vvm3_error_spg_dns_failure_message">很抱歉，我们遇到了一个问题，请稍后重试。如果重试后仍然有问题，请拨打 %1$s 联系客户服务人员，并告诉他们错误代码是 9003。</string>
+  <string name="vvm3_error_vms_no_cellular_title">无法连接到您的语音信箱</string>
+  <string name="vvm3_error_vms_no_cellular_message">很抱歉，无法连接到您的语音信箱。如果您所在的位置信号差，请在信号强的时候重新尝试连接。如果重试后仍然有问题，请拨打 %1$s 联系客户服务人员，并告诉他们错误代码是 9004。</string>
+  <string name="vvm3_error_vmg_no_cellular_title">无法连接到您的语音信箱</string>
+  <string name="vvm3_error_vmg_no_cellular_message">很抱歉，无法连接到您的语音信箱。如果您所在的位置信号差，请在信号强的时候重新尝试连接。如果重试后仍然有问题，请拨打 %1$s 联系客户服务人员，并告诉他们错误代码是 9005。</string>
+  <string name="vvm3_error_spg_no_cellular_title">无法连接到您的语音信箱</string>
+  <string name="vvm3_error_spg_no_cellular_message">很抱歉，无法连接到您的语音信箱。如果您所在的位置信号差，请在信号强的时候重新尝试连接。如果重试后仍然有问题，请拨打 %1$s 联系客户服务人员，并告诉他们错误代码是 9006。</string>
+  <string name="vvm3_error_vms_timeout_title">出了点问题</string>
+  <string name="vvm3_error_vms_timeout_message">很抱歉，我们遇到了一个问题，请稍后重试。如果重试后仍然有问题，请拨打 %1$s 联系客户服务人员，并告诉他们错误代码是 9007。</string>
+  <string name="vvm3_error_vmg_timeout_title">出了点问题</string>
+  <string name="vvm3_error_vmg_timeout_message">很抱歉，我们遇到了一个问题，请稍后重试。如果重试后仍然有问题，请拨打 %1$s 联系客户服务人员，并告诉他们错误代码是 9008。</string>
+  <string name="vvm3_error_status_sms_timeout_title">出了点问题</string>
+  <string name="vvm3_error_status_sms_timeout_message">很抱歉，我们无法设置您的服务，请稍后重试。如果重试后仍然有问题，请拨打 %1$s 联系客户服务人员，并告诉他们错误代码是 9009。</string>
+  <string name="vvm3_error_subscriber_blocked_title">无法连接到您的语音信箱</string>
+  <string name="vvm3_error_subscriber_blocked_message">很抱歉，目前无法连接到您的语音信箱，请稍后重试。如果重试后仍然有问题，请拨打 %1$s 联系客户服务人员，并告诉他们错误代码是 9990。</string>
+  <string name="vvm3_error_unknown_user_title">设置语音信箱</string>
+  <string name="vvm3_error_unknown_user_message">您的帐号尚未设置语音信箱。请拨打 %1$s 联系客户服务人员，并告诉他们错误代码是 9991。</string>
+  <string name="vvm3_error_unknown_device_title">语音信箱</string>
+  <string name="vvm3_error_unknown_device_message">无法在此设备上使用可视语音信箱。请拨打 %1$s 联系客户服务人员，并告诉他们错误代码是 9992。</string>
+  <string name="vvm3_error_invalid_password_title">出了点问题</string>
+  <string name="vvm3_error_invalid_password_message">请拨打 %1$s 联系客户服务人员，并告诉他们错误代码是 9993。</string>
+  <string name="vvm3_error_mailbox_not_initialized_title">可视语音信箱</string>
+  <string name="vvm3_error_mailbox_not_initialized_message">要完成可视语音信箱设置，请拨打 %1$s 联系客户服务人员，并告诉他们错误代码是 9994。</string>
+  <string name="vvm3_error_service_not_provisioned_title">可视语音信箱</string>
+  <string name="vvm3_error_service_not_provisioned_message">要完成可视语音信箱设置，请拨打 %1$s 联系客户服务人员，并告诉他们错误代码是 9995。</string>
+  <string name="vvm3_error_service_not_activated_title">可视语音信箱</string>
+  <string name="vvm3_error_service_not_activated_message">要激活可视语音信箱，请拨打 %1$s 联系客户服务人员，并告诉他们错误代码是 9996。</string>
+  <string name="vvm3_error_user_blocked_title">出了点问题</string>
+  <string name="vvm3_error_user_blocked_message">要完成可视语音信箱设置，请拨打 %1$s 联系客户服务人员，并告诉他们错误代码是 9998。</string>
+  <string name="vvm3_error_subscriber_unknown_title">可视语音信箱已停用</string>
+  <string name="vvm3_error_subscriber_unknown_message">请拨打 %1$s 联系客户服务人员，以激活可视语音信箱。</string>
+  <string name="vvm3_error_imap_getquota_error_title">出了点问题</string>
+  <string name="vvm3_error_imap_getquota_error_message">请拨打 %1$s 联系客户服务人员，并告诉他们错误代码是 9997。</string>
+  <string name="vvm3_error_imap_select_error_title">出了点问题</string>
+  <string name="vvm3_error_imap_select_error_message">请拨打 %1$s 联系客户服务人员，并告诉他们错误代码是 9989。</string>
+  <string name="vvm3_error_imap_error_title">出了点问题</string>
+  <string name="vvm3_error_imap_error_message">请拨打 %1$s 联系客户服务人员，并告诉他们错误代码是 9999。</string>
+  <string name="verizon_terms_and_conditions_title">开启可视语音信箱</string>
+  <string name="verizon_terms_and_conditions_message">%1$s启用可视语音信箱即表示您同意 Verizon Wireless 的条款和条件：\n\n%2$s</string>
+  <string name="dialer_terms_and_conditions_title">启用可视语音信箱</string>
+  <string name="dialer_terms_and_conditions_existing_user_title">新功能！阅读语音邮件</string>
+  <string name="dialer_terms_and_conditions_message">%s</string>
+  <string name="dialer_terms_and_conditions_1.0">无需呼叫语音信箱便可查看和收听您的语音邮件。Google 的转录服务会免费为您提供语音邮件的转录文本。您可以随时在“设置”中停用任一功能。%s</string>
+  <string name="dialer_terms_and_conditions_existing_user">现在，Google 的转录服务会免费为您提供语音邮件的转录文本。您可以随时在“设置”中停用此功能。%s</string>
+  <string name="dialer_terms_and_conditions_for_verizon_1.0">无需呼叫语音信箱便可查看和收听您的语音邮件。</string>
+  <string name="dialer_terms_and_conditions_learn_more">了解详情</string>
+  <string name="dialer_terms_and_conditions_existing_user_ack">知道了</string>
+  <string name="dialer_terms_and_conditions_existing_user_decline">不用了</string>
+  <string name="terms_and_conditions_decline_dialog_title">要停用可视语音信箱吗？</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_message">如果您拒绝接受条款及条件，可视语音信箱将被停用。</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_downgrade">停用</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_message">如果您关闭可视语音信箱，可视语音信箱将被停用。</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_downgrade">停用</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message">您只能通过拨打 *86 来访问语音信箱。请先设置新的语音信箱 PIN 码再继续操作。</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin">设置 PIN 码</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/error/res/values-zh-rHK/strings.xml b/java/com/android/dialer/voicemail/listui/error/res/values-zh-rHK/strings.xml
new file mode 100644
index 0000000..3018b7b
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/error/res/values-zh-rHK/strings.xml
@@ -0,0 +1,102 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_error_activating_title">正在啟用視像留言</string>
+  <string name="voicemail_error_activating_message">視像留言完全啟用前，您可能無法接收留言通知。請致電留言信箱以取得新訊息，直至視像留言完全啟用。</string>
+  <string name="voicemail_error_not_activate_no_signal_title">無法啟用視像留言</string>
+  <string name="voicemail_error_not_activate_no_signal_message">請確定您的手機有數據連線，然後再試一次。</string>
+  <string name="voicemail_error_not_activate_no_signal_airplane_mode_message">關閉飛行模式，然後再試一次。</string>
+  <string name="voicemail_error_no_signal_title">沒有連線</string>
+  <string name="voicemail_error_no_signal_message">您不會收到新留言通知。如果您使用的是 Wi-Fi，可以立即透過同步處理的方式查看是否有留言。</string>
+  <string name="voicemail_error_no_signal_airplane_mode_message">您不會收到新留言通知。請關閉飛行模式，以便同步處理留言信箱。</string>
+  <string name="voicemail_error_no_signal_cellular_required_message">您的手機需要有流動數據連線，才能查看留言。</string>
+  <string name="voicemail_error_activation_failed_title">無法啟用視像留言</string>
+  <string name="voicemail_error_activation_failed_message">您仍可撥號以查看留言信箱。</string>
+  <string name="voicemail_error_no_data_title">無法更新視像留言信箱</string>
+  <string name="voicemail_error_no_data_message">請在您的 Wi-Fi 或數據連線品質較佳時再試一次。您仍可撥號以查看留言。</string>
+  <string name="voicemail_error_no_data_cellular_required_message">請在您的數據連線品質較佳時再試一次。您仍可撥號以查看留言。</string>
+  <string name="voicemail_error_bad_config_title">無法更新視像留言信箱</string>
+  <string name="voicemail_error_bad_config_message">您仍可撥號以查看留言信箱。</string>
+  <string name="voicemail_error_communication_title">無法更新視像留言信箱</string>
+  <string name="voicemail_error_communication_message">您仍可撥號以查看留言信箱。</string>
+  <string name="voicemail_error_server_connection_title">無法更新視像留言信箱</string>
+  <string name="voicemail_error_server_connection_message">您仍可撥號以查看留言信箱。</string>
+  <string name="voicemail_error_server_title">無法更新視像留言信箱</string>
+  <string name="voicemail_error_server_message">您仍可撥號以查看留言信箱。</string>
+  <string name="voicemail_error_inbox_near_full_title">收件箱快要滿了</string>
+  <string name="voicemail_error_inbox_near_full_message">如果您的收件箱已滿，就無法接收新留言。</string>
+  <string name="voicemail_error_inbox_full_title">無法接收新留言</string>
+  <string name="voicemail_error_inbox_full_message">您的收件箱已滿。建議您刪除部分訊息以接收新留言。</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_title">啟用額外儲存裝置和備份功能</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_message">您的信箱已滿。若要騰出空間，請啟用額外儲存裝置，以便 Google 管理並備份您的留言訊息。</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_title">啟用額外儲存裝置和備份功能</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_message">您的信箱快要滿了。若要騰出空間，請啟用額外儲存裝置，以便 Google 管理並備份您的留言訊息。</string>
+  <string name="voicemail_error_pin_not_set_title">設定留言信箱 PIN</string>
+  <string name="voicemail_error_pin_not_set_message">每次撥號聆聽留言時，您都必須輸入語音信箱 PIN 碼。</string>
+  <string name="voicemail_action_turn_off_airplane_mode">飛行模式設定</string>
+  <string name="voicemail_action_set_pin">設定 PIN</string>
+  <string name="voicemail_action_retry">再試一次</string>
+  <string name="voicemail_action_turn_archive_on">開啟</string>
+  <string name="voicemail_action_dimiss">不用了，謝謝</string>
+  <string name="voicemail_action_sync">同步處理</string>
+  <string name="voicemail_action_call_voicemail">致電留言信箱</string>
+  <string name="voicemail_action_call_customer_support">致電客戶支援</string>
+  <string name="vvm3_error_vms_dns_failure_title">發生問題</string>
+  <string name="vvm3_error_vms_dns_failure_message">抱歉，系統發生問題，請稍後再試。如果問題持續，請致電 %1$s 聯絡客戶服務，並提供錯誤代碼 9001。</string>
+  <string name="vvm3_error_vmg_dns_failure_title">發生問題</string>
+  <string name="vvm3_error_vmg_dns_failure_message">抱歉，系統發生問題，請稍後再試。如果問題持續，請致電 %1$s 聯絡客戶服務，並提供錯誤代碼 9002。</string>
+  <string name="vvm3_error_spg_dns_failure_title">發生問題</string>
+  <string name="vvm3_error_spg_dns_failure_message">抱歉，系統發生問題，請稍後再試。如果問題持續，請致電 %1$s 聯絡客戶服務，並提供錯誤代碼 9003。</string>
+  <string name="vvm3_error_vms_no_cellular_title">無法連接您的留言信箱</string>
+  <string name="vvm3_error_vms_no_cellular_message">抱歉，連接留言信箱時發生問題。如果您所在位置的訊號較差，請待訊號較佳時再試一次。如果問題持續，請致電 %1$s 聯絡客戶服務，並提供錯誤代碼 9004。</string>
+  <string name="vvm3_error_vmg_no_cellular_title">無法連接您的留言信箱</string>
+  <string name="vvm3_error_vmg_no_cellular_message">抱歉，連接留言信箱時發生問題。如果您所在位置的訊號較差，請待訊號較佳時再試一次。如果問題持續，請致電 %1$s 聯絡客戶服務，並提供錯誤代碼 9005。</string>
+  <string name="vvm3_error_spg_no_cellular_title">無法連接您的留言信箱</string>
+  <string name="vvm3_error_spg_no_cellular_message">抱歉，連接留言信箱時發生問題。如果您所在位置的訊號較差，請待訊號較佳時再試一次。如果問題持續，請致電 %1$s 聯絡客戶服務，並提供錯誤代碼 9006。</string>
+  <string name="vvm3_error_vms_timeout_title">發生問題</string>
+  <string name="vvm3_error_vms_timeout_message">抱歉，系統發生問題，請稍後再試。如果問題持續，請致電 %1$s 聯絡客戶服務，並提供錯誤代碼 9007。</string>
+  <string name="vvm3_error_vmg_timeout_title">發生問題</string>
+  <string name="vvm3_error_vmg_timeout_message">抱歉，系統發生問題，請稍後再試。如果問題持續，請致電 %1$s 聯絡客戶服務，並提供錯誤代碼 9008。</string>
+  <string name="vvm3_error_status_sms_timeout_title">發生問題</string>
+  <string name="vvm3_error_status_sms_timeout_message">抱歉，設定服務時發生問題，請稍後再試。如果問題持續，請致電 %1$s 聯絡客戶服務，並提供錯誤代碼 9009。</string>
+  <string name="vvm3_error_subscriber_blocked_title">無法連接您的留言信箱</string>
+  <string name="vvm3_error_subscriber_blocked_message">抱歉，我們目前無法連接您的留言信箱，請稍後再試。如果問題持續，請致電 %1$s 聯絡客戶服務，並提供錯誤代碼 9990。</string>
+  <string name="vvm3_error_unknown_user_title">設定留言信箱</string>
+  <string name="vvm3_error_unknown_user_message">您的帳戶尚未設定留言信箱。請致電 %1$s 聯絡客戶服務，並提供錯誤代碼 9991。</string>
+  <string name="vvm3_error_unknown_device_title">留言</string>
+  <string name="vvm3_error_unknown_device_message">無法在此裝置上使用視像留言。請致電 %1$s 聯絡客戶服務，並提供錯誤代碼 9992。</string>
+  <string name="vvm3_error_invalid_password_title">發生問題</string>
+  <string name="vvm3_error_invalid_password_message">請致電 %1$s 聯絡客戶服務，並提供錯誤代碼 9993。</string>
+  <string name="vvm3_error_mailbox_not_initialized_title">視像留言</string>
+  <string name="vvm3_error_mailbox_not_initialized_message">如要完成視像留言設定，請致電 %1$s 聯絡客戶服務，並提供錯誤代碼 9994。</string>
+  <string name="vvm3_error_service_not_provisioned_title">視像留言</string>
+  <string name="vvm3_error_service_not_provisioned_message">如要完成視像留言設定，請致電 %1$s 聯絡客戶服務，並提供錯誤代碼 9994。</string>
+  <string name="vvm3_error_service_not_activated_title">視像留言</string>
+  <string name="vvm3_error_service_not_activated_message">如要啟用視像留言，請致電 %1$s 聯絡客戶服務，並提供錯誤代碼 9996。</string>
+  <string name="vvm3_error_user_blocked_title">發生問題</string>
+  <string name="vvm3_error_user_blocked_message">如要完成視像留言設定，請致電 %1$s 聯絡客戶服務，並提供錯誤代碼 9994。</string>
+  <string name="vvm3_error_subscriber_unknown_title">已停用視像留言</string>
+  <string name="vvm3_error_subscriber_unknown_message">如要啟用視像留言，請致電 %1$s 聯絡客戶服務。</string>
+  <string name="vvm3_error_imap_getquota_error_title">發生問題</string>
+  <string name="vvm3_error_imap_getquota_error_message">請致電 %1$s 聯絡客戶服務，並提供錯誤代碼 9997。</string>
+  <string name="vvm3_error_imap_select_error_title">發生問題</string>
+  <string name="vvm3_error_imap_select_error_message">請致電 %1$s 聯絡客戶服務，並提供錯誤代碼 9989。</string>
+  <string name="vvm3_error_imap_error_title">發生問題</string>
+  <string name="vvm3_error_imap_error_message">請致電 %1$s 聯絡客戶服務，並提供錯誤代碼 9999。</string>
+  <string name="verizon_terms_and_conditions_title">開啟視覺留言</string>
+  <string name="verizon_terms_and_conditions_message">%1$s 開啟視覺留言即表示您同意 Verizon Wireless 條款及細則：\n\n%2$s</string>
+  <string name="dialer_terms_and_conditions_title">開啟視覺留言</string>
+  <string name="dialer_terms_and_conditions_existing_user_title">新功能登場：閱讀留言</string>
+  <string name="dialer_terms_and_conditions_message">%s</string>
+  <string name="dialer_terms_and_conditions_1.0">查看及聆聽訊息，無需致電留言信箱。您的留言轉錄內容是由 Google 的免費轉錄服務所提供。您可以隨時在「設定」中關閉這項功能。%s</string>
+  <string name="dialer_terms_and_conditions_existing_user">您的留言轉錄內容現在是由 Google 的免費轉錄服務所提供。您可以隨時在「設定」中關閉這項功能。%s</string>
+  <string name="dialer_terms_and_conditions_for_verizon_1.0">查看及聆聽訊息，無需致電留言信箱。</string>
+  <string name="dialer_terms_and_conditions_learn_more">瞭解詳情</string>
+  <string name="dialer_terms_and_conditions_existing_user_ack">好，知道了</string>
+  <string name="dialer_terms_and_conditions_existing_user_decline">不用了，謝謝</string>
+  <string name="terms_and_conditions_decline_dialog_title">要停用視像留言嗎？</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_message">如果拒絕條款及細則，視像留言將會停用。</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_downgrade">停用</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_message">如果關閉視像留言，視像留言將會停用。</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_downgrade">停用</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message">您只可以撥打 *86 使用留言信箱。請先設定新留言信箱 PIN 碼，然後繼續。</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin">設定 PIN</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/error/res/values-zh-rTW/strings.xml b/java/com/android/dialer/voicemail/listui/error/res/values-zh-rTW/strings.xml
new file mode 100644
index 0000000..dc65bb3
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/error/res/values-zh-rTW/strings.xml
@@ -0,0 +1,102 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_error_activating_title">啟用視覺化語音信箱</string>
+  <string name="voicemail_error_activating_message">你必須完成視覺化語音信箱的完整啟用程序，否則可能無法收到語音留言通知。在這項功能尚未完全啟用之前，請撥打語音信箱號碼來擷取新的留言。</string>
+  <string name="voicemail_error_not_activate_no_signal_title">無法啟用視覺化語音信箱</string>
+  <string name="voicemail_error_not_activate_no_signal_message">請確認你的手機已連上行動網路，然後再試一次。</string>
+  <string name="voicemail_error_not_activate_no_signal_airplane_mode_message">請關閉飛航模式，然後再試一次。</string>
+  <string name="voicemail_error_no_signal_title">沒有網路連線</string>
+  <string name="voicemail_error_no_signal_message">你不會收到新的語音留言通知。如果你已連上 Wi-Fi 網路，只要立即進行同步處理，就能檢查是否有語音留言。</string>
+  <string name="voicemail_error_no_signal_airplane_mode_message">你不會收到新的語音留言通知。請關閉飛航模式，以便同步處理語音留言。</string>
+  <string name="voicemail_error_no_signal_cellular_required_message">手機必須要有行動數據連線才能檢查語音留言。</string>
+  <string name="voicemail_error_activation_failed_title">無法啟用視覺化語音信箱</string>
+  <string name="voicemail_error_activation_failed_message">你也可以透過撥打電話的方式來檢查自己的語音留言。</string>
+  <string name="voicemail_error_no_data_title">無法更新視覺化語音信箱</string>
+  <string name="voicemail_error_no_data_message">請在 Wi‑Fi 或行動數據連線訊號較強時再試一次。你也可以透過撥打電話的方式來檢查自己的語音留言。</string>
+  <string name="voicemail_error_no_data_cellular_required_message">請在行動數據連線連線訊號較強時再試一次。你也可以透過撥打電話的方式來檢查自己的語音留言。</string>
+  <string name="voicemail_error_bad_config_title">無法更新視覺化語音信箱</string>
+  <string name="voicemail_error_bad_config_message">你也可以透過撥打電話的方式來檢查自己的語音留言。</string>
+  <string name="voicemail_error_communication_title">無法更新視覺化語音信箱</string>
+  <string name="voicemail_error_communication_message">你也可以透過撥打電話的方式來檢查自己的語音留言。</string>
+  <string name="voicemail_error_server_connection_title">無法更新視覺化語音信箱</string>
+  <string name="voicemail_error_server_connection_message">你也可以透過撥打電話的方式來檢查自己的語音留言。</string>
+  <string name="voicemail_error_server_title">無法更新視覺化語音信箱</string>
+  <string name="voicemail_error_server_message">你也可以透過撥打電話的方式來檢查自己的語音留言。</string>
+  <string name="voicemail_error_inbox_near_full_title">收件匣快滿了</string>
+  <string name="voicemail_error_inbox_near_full_message">收件匣已滿時無法接收新的語音留言。</string>
+  <string name="voicemail_error_inbox_full_title">無法接收新的語音留言</string>
+  <string name="voicemail_error_inbox_full_message">你的收件匣已滿。請刪除部分訊息，以便接收新的語音留言。</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_title">啟用額外的儲存空間和備份功能</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_message">你的信箱容量已滿。如要釋出空間，請啟用額外的儲存空間，方便 Google 管理及備份你的語音留言。</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_title">啟用額外的儲存空間和備份功能</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_message">你的信箱快滿了。如要釋出空間，請啟用額外的儲存空間，方便 Google 管理及備份你的語音留言。</string>
+  <string name="voicemail_error_pin_not_set_title">設定你的語音信箱密碼</string>
+  <string name="voicemail_error_pin_not_set_message">你必須輸入語音信箱密碼才能進入你的語音信箱。</string>
+  <string name="voicemail_action_turn_off_airplane_mode">飛航模式設定</string>
+  <string name="voicemail_action_set_pin">設定語音信箱密碼</string>
+  <string name="voicemail_action_retry">再試一次</string>
+  <string name="voicemail_action_turn_archive_on">開啟</string>
+  <string name="voicemail_action_dimiss">不用了，謝謝</string>
+  <string name="voicemail_action_sync">同步處理</string>
+  <string name="voicemail_action_call_voicemail">撥打語音信箱</string>
+  <string name="voicemail_action_call_customer_support">撥打客服電話</string>
+  <string name="vvm3_error_vms_dns_failure_title">發生錯誤</string>
+  <string name="vvm3_error_vms_dns_failure_message">抱歉，系統發生錯誤，請稍後再試。如果仍有問題，請撥打 %1$s 與客服人員聯絡，並告訴對方錯誤代碼為 9001。</string>
+  <string name="vvm3_error_vmg_dns_failure_title">發生錯誤</string>
+  <string name="vvm3_error_vmg_dns_failure_message">抱歉，系統發生錯誤，請稍後再試。如果仍有問題，請撥打 %1$s 與客服人員聯絡，並告訴對方錯誤代碼為 9002。</string>
+  <string name="vvm3_error_spg_dns_failure_title">發生錯誤</string>
+  <string name="vvm3_error_spg_dns_failure_message">抱歉，系統發生錯誤，請稍後再試。如果仍有問題，請撥打 %1$s 與客服人員聯絡，並告訴對方錯誤代碼為 9003。</string>
+  <string name="vvm3_error_vms_no_cellular_title">無法連線至你的語音信箱</string>
+  <string name="vvm3_error_vms_no_cellular_message">抱歉，目前無法連線至你的語音信箱。如果你所在區域的訊號不佳，請移至訊號較強的地方後再試一次。如果仍有問題，請撥打 %1$s 與客服人員聯絡，並告訴對方錯誤代碼為 9004。</string>
+  <string name="vvm3_error_vmg_no_cellular_title">無法連線至你的語音信箱</string>
+  <string name="vvm3_error_vmg_no_cellular_message">抱歉，目前無法連線至你的語音信箱。如果你所在區域的訊號不佳，請移至訊號較強的地方後再試一次。如果仍有問題，請撥打 %1$s 與客服人員聯絡，並告訴對方錯誤代碼為 9005。</string>
+  <string name="vvm3_error_spg_no_cellular_title">無法連線至你的語音信箱</string>
+  <string name="vvm3_error_spg_no_cellular_message">抱歉，目前無法連線至你的語音信箱。如果你所在區域的訊號不佳，請移至訊號較強的地方後再試一次。如果仍有問題，請撥打 %1$s 與客服人員聯絡，並告訴對方錯誤代碼為 9006。</string>
+  <string name="vvm3_error_vms_timeout_title">發生錯誤</string>
+  <string name="vvm3_error_vms_timeout_message">抱歉，系統發生錯誤，請稍後再試。如果仍有問題，請撥打 %1$s 與客服人員聯絡，並告訴對方錯誤代碼為 9007。</string>
+  <string name="vvm3_error_vmg_timeout_title">發生錯誤</string>
+  <string name="vvm3_error_vmg_timeout_message">抱歉，系統發生錯誤，請稍後再試。如果仍有問題，請撥打 %1$s 與客服人員聯絡，並告訴對方錯誤代碼為 9008。</string>
+  <string name="vvm3_error_status_sms_timeout_title">發生錯誤</string>
+  <string name="vvm3_error_status_sms_timeout_message">抱歉，目前無法為你設定服務，請稍後再試。如果仍有問題，請撥打 %1$s 與客服人員聯絡，並告訴對方錯誤代碼為 9009。</string>
+  <string name="vvm3_error_subscriber_blocked_title">無法連線至你的語音信箱</string>
+  <string name="vvm3_error_subscriber_blocked_message">抱歉，目前無法連線至你的語音信箱，請稍後再試。如果仍有問題，請撥打 %1$s 與客服人員聯絡，並告訴對方錯誤代碼為 9990。</string>
+  <string name="vvm3_error_unknown_user_title">設定語音信箱</string>
+  <string name="vvm3_error_unknown_user_message">你的帳戶未設定語音信箱。請撥打 %1$s 與客服人員聯絡，並告訴對方錯誤代碼為 9991。</string>
+  <string name="vvm3_error_unknown_device_title">語音信箱</string>
+  <string name="vvm3_error_unknown_device_message">這部裝置無法使用視覺化語音信箱。請撥打 %1$s 與客服人員聯絡，並告訴對方錯誤代碼為 9992。</string>
+  <string name="vvm3_error_invalid_password_title">發生錯誤</string>
+  <string name="vvm3_error_invalid_password_message">請撥打 %1$s 與客服人員聯絡，並告訴對方錯誤代碼為 9993。</string>
+  <string name="vvm3_error_mailbox_not_initialized_title">視覺化語音信箱</string>
+  <string name="vvm3_error_mailbox_not_initialized_message">如要完成視覺化語音信箱設定作業，請撥打 %1$s 與客服人員聯絡，並告訴對方錯誤代碼為 9994。</string>
+  <string name="vvm3_error_service_not_provisioned_title">視覺化語音信箱</string>
+  <string name="vvm3_error_service_not_provisioned_message">如要完成視覺化語音信箱設定作業，請撥打 %1$s 與客服人員聯絡，並告訴對方錯誤代碼為 9995。</string>
+  <string name="vvm3_error_service_not_activated_title">視覺化語音信箱</string>
+  <string name="vvm3_error_service_not_activated_message">如要啟用視覺化語音信箱，請撥打 %1$s 與客服人員聯絡，並告訴對方錯誤代碼為 9996。</string>
+  <string name="vvm3_error_user_blocked_title">發生錯誤</string>
+  <string name="vvm3_error_user_blocked_message">如要完成視覺化語音信箱設定作業，請撥打 %1$s 與客服人員聯絡，並告訴對方錯誤代碼為 9998。</string>
+  <string name="vvm3_error_subscriber_unknown_title">已停用視覺化語音信箱</string>
+  <string name="vvm3_error_subscriber_unknown_message">請撥打 %1$s 與客服人員聯絡，以啟用視覺化語音信箱。</string>
+  <string name="vvm3_error_imap_getquota_error_title">發生錯誤</string>
+  <string name="vvm3_error_imap_getquota_error_message">請撥打 %1$s 與客服人員聯絡，並告訴對方錯誤代碼為 9997。</string>
+  <string name="vvm3_error_imap_select_error_title">發生錯誤</string>
+  <string name="vvm3_error_imap_select_error_message">請撥打 %1$s 與客服人員聯絡，並告訴對方錯誤代碼為 9989。</string>
+  <string name="vvm3_error_imap_error_title">發生錯誤</string>
+  <string name="vvm3_error_imap_error_message">請撥打 %1$s 與客服人員聯絡，並告訴對方錯誤代碼為 9999。</string>
+  <string name="verizon_terms_and_conditions_title">啟用視覺化語音信箱</string>
+  <string name="verizon_terms_and_conditions_message">%1$s啟用視覺化語音信箱即表示您同意 Verizon Wireless 的條款及細則：\n\n%2$s</string>
+  <string name="dialer_terms_and_conditions_title">啟用視覺化語音信箱</string>
+  <string name="dialer_terms_and_conditions_existing_user_title">新功能！讀取語音留言</string>
+  <string name="dialer_terms_and_conditions_message">%s</string>
+  <string name="dialer_terms_and_conditions_1.0">不必撥打語音信箱即可查看及聽取留言。語音留言轉錄功能是由 Google 的免費留言轉錄服務所提供。你隨時可以前往 [設定] 關閉這項功能。%s</string>
+  <string name="dialer_terms_and_conditions_existing_user">語音留言轉錄功能目前是由 Google 的免費留言轉錄服務所提供。你隨時可以前往 [設定] 關閉這項功能。%s</string>
+  <string name="dialer_terms_and_conditions_for_verizon_1.0">不必撥打語音信箱即可查看及聽取留言。</string>
+  <string name="dialer_terms_and_conditions_learn_more">瞭解詳情</string>
+  <string name="dialer_terms_and_conditions_existing_user_ack">好，我知道了</string>
+  <string name="dialer_terms_and_conditions_existing_user_decline">不用了，謝謝</string>
+  <string name="terms_and_conditions_decline_dialog_title">要停用視覺化語音信箱嗎？</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_message">如果您拒絕接受相關條款及細則，系統將停用視覺化語音信箱功能。</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_downgrade">停用</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_message">如果關閉視覺化語音信箱，系統將會停用視覺化語音信箱功能。</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_downgrade">停用</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message">必須撥打 *86 才能聽取語音信箱。如要繼續進行，請先設定新的語音信箱密碼。</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin">設定語音信箱密碼</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/error/res/values-zu/strings.xml b/java/com/android/dialer/voicemail/listui/error/res/values-zu/strings.xml
new file mode 100644
index 0000000..cb15514
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/error/res/values-zu/strings.xml
@@ -0,0 +1,102 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_error_activating_title">Yenza kusebenze ivoyisimeyili ebonakalayo</string>
+  <string name="voicemail_error_activating_message">Kungenzeka ungatholi izaziso zevoyisimeyili kuze kwenziwe kusebenze ngokugcwele ivoyisimeyili ebonakalayo. Shayela ivoyisimeyili ukuze uthole imilayezo emisha kuze kwenziwe kusebenze ngokugcwele ivoyisimeyili.</string>
+  <string name="voicemail_error_not_activate_no_signal_title">Ayikwazi ukwenza kusebenze ivoyisimeyili ebonakalayo</string>
+  <string name="voicemail_error_not_activate_no_signal_message">Qiniseka ukuthi ifoni yakho inoxhumo lenethiwekhi leselula bese uyazama futhi.</string>
+  <string name="voicemail_error_not_activate_no_signal_airplane_mode_message">Vala imodi yendiza uphinde uzame futhi.</string>
+  <string name="voicemail_error_no_signal_title">Alukho uxhumano</string>
+  <string name="voicemail_error_no_signal_message">Ngeke uze waziswe ngamavoyisimeyili amasha. Uma uku-Wi-Fi, ungahlolela ivoyisimeyili ngokuvumelanisa manje.</string>
+  <string name="voicemail_error_no_signal_airplane_mode_message">Ngeke waziswe ngamavoyisimeyili amasha. Vala imodi yendiza ukuze uvumelanise ivoyisimeyili yakho.</string>
+  <string name="voicemail_error_no_signal_cellular_required_message">Ifoni yakho idinga ukuxhumeka kwedatha yeselula ukuze ihlole ivoyisimeyili.</string>
+  <string name="voicemail_error_activation_failed_title">Ayikwazi ukwenza kusebenze ivoyisimeyili ebonakalayo</string>
+  <string name="voicemail_error_activation_failed_message">Usengashaya ukuze uhlole ivoyisimeyili</string>
+  <string name="voicemail_error_no_data_title">Ayikwazi ukubuyekeza ivoyisimeyili ebonakalayo</string>
+  <string name="voicemail_error_no_data_message">Zama futhi uma i-Wi-Fi yakho noma ukuxhumeka kwakho kwedatha kungcono. Usengashaya ukuze uhlole ivoyisimeyili.</string>
+  <string name="voicemail_error_no_data_cellular_required_message">Zama futhi uma ukuxhumeka kwakho kwedaha sekungcono. Usengashaya ukuze uhlole ivoyisimeyili.</string>
+  <string name="voicemail_error_bad_config_title">Ayikwazi ukubuyekeza ivoyisimeyili ebonakalayo</string>
+  <string name="voicemail_error_bad_config_message">Usengashaya ukuze uhlole ivoyisimeyili</string>
+  <string name="voicemail_error_communication_title">Ayikwazi ukubuyekeza ivoyisimeyili ebonakalayo</string>
+  <string name="voicemail_error_communication_message">Usengashaya ukuze uhlole ivoyisimeyili</string>
+  <string name="voicemail_error_server_connection_title">Ayikwazi ukubuyekeza ivoyisimeyili ebonakalayo</string>
+  <string name="voicemail_error_server_connection_message">Usengashaya ukuze uhlole ivoyisimeyili</string>
+  <string name="voicemail_error_server_title">Ayikwazi ukubuyekeza ivoyisimeyili ebonakalayo</string>
+  <string name="voicemail_error_server_message">Usengashaya ukuze uhlole ivoyisimeyili</string>
+  <string name="voicemail_error_inbox_near_full_title">Ibhokisi lokungenayo licishe seligcwele</string>
+  <string name="voicemail_error_inbox_near_full_message">Ngeke uze ukwazi ukuthola ivoyisimeyili entsha uma ibhokisi lakho lokungenayo ligcwele.</string>
+  <string name="voicemail_error_inbox_full_title">Ayikwazi ukwamukela amavoyisimeyili amasha</string>
+  <string name="voicemail_error_inbox_full_message">Ibhokisi lakho lokungenayo ligcwele. Zama ukususa eminye imilayezo ukuze uthole ivoyisimeyili entsha.</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_title">Vula isitoreji esingeziwe nesipele</string>
+  <string name="voicemail_error_inbox_full_turn_archive_on_message">Ibhokisi lakho lemeyili ligcwele. Ukuze ukhulule isikhala, vula isitoreji esingeziwe ukuze i-Google ikwazi ukuphatha futhi yenze isipele imilTo free up space, turn on extra storage so Google can manage and backup your voicemail messages.</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_title">Vula isitoreji esingeziwe nesipele</string>
+  <string name="voicemail_error_inbox_almost_full_turn_archive_on_message">Ibhokisi lakho lemeyili cishe ligcwele. Ukuze ukhulule isikhala, vula isitoreji esingeziwe ukuze i-Google ikwazi ukuphatha nokwenza isipele imilayezo yakho yevoyisimeyili.</string>
+  <string name="voicemail_error_pin_not_set_title">Setha iphini yakho yevoyisimeyili</string>
+  <string name="voicemail_error_pin_not_set_message">Udinga iphini yevoyisimeyili noma kunini uma wenza ikholi ukufinyelela ivoyisimeyili yakho.</string>
+  <string name="voicemail_action_turn_off_airplane_mode">Izilungiselelo zemodi yendiza</string>
+  <string name="voicemail_action_set_pin">Setha i-PIN</string>
+  <string name="voicemail_action_retry">Zama futhi</string>
+  <string name="voicemail_action_turn_archive_on">Vula</string>
+  <string name="voicemail_action_dimiss">Cha Ngiyabonga</string>
+  <string name="voicemail_action_sync">Vumelanisa</string>
+  <string name="voicemail_action_call_voicemail">Shayela ivoyisimeyili</string>
+  <string name="voicemail_action_call_customer_support">Shayela Ukwesekelwa Kwamakhasimende</string>
+  <string name="vvm3_error_vms_dns_failure_title">Kukhona okungahambanga kahle</string>
+  <string name="vvm3_error_vms_dns_failure_message">Uxolo, sihlangabezane nenkinga. Sicela uzame futhi emuva kwesikhathi. Uma kusesekhona inkinga, sicela uxhumane Nesevisi Yekhasimende ku-%1$s uphinde ubatshele ukuthi ikhodi yephutha ngu-9001.</string>
+  <string name="vvm3_error_vmg_dns_failure_title">Kukhona okungahambanga kahle</string>
+  <string name="vvm3_error_vmg_dns_failure_message">Uxolo, sihlangabezane nenkinga. Sicela uzame futhi emuva kwesikhathi. Uma kusesekhona inkinga, sicela uxhumane Nesevisi Yekhasimende ku-%1$s uphinde ubatshele ukuthi ikhodi yephutha ngu-9002.</string>
+  <string name="vvm3_error_spg_dns_failure_title">Kukhona okungahambanga kahle</string>
+  <string name="vvm3_error_spg_dns_failure_message">Uxolo, sihlangabezane nenkinga. Sicela uphinde uzame futhi emuva kwesikhathi. Uma kusese nenkinga, sicela uxhumane Nesevisi Yekhasimende ku-%1$s uphinde ubatshele ukuthi ikhodi yephutha ngu-9003.</string>
+  <string name="vvm3_error_vms_no_cellular_title">Ayikwazi ukuxhumeka kubhokisi lakho lemeyili lezwi</string>
+  <string name="vvm3_error_vms_no_cellular_message">Uxolo, sinenkinga yokuxhumeka kubhokisi lemeyili lakho lezwi. Uma usendaweni enamandla esignali ebuthaka, linda uze ube nesignali eqinile uphinde uzame. Uma kusesekhona inkinga, sicela uxhumane Nesevisi Yekhasimende ku-%1$s uphinde ubatshele ukuthi ikhodi yephutha ngu-9004.</string>
+  <string name="vvm3_error_vmg_no_cellular_title">Ayikwazi ukuxhumeka kubhokisi lakho lemeyili lezwi</string>
+  <string name="vvm3_error_vmg_no_cellular_message">Uxolo, sinenkinga yokuxhumeka kubhokisi lakho lemeyili lezwi. Uma usendaweni enamandla esignali antulayo, linda uze ube nesignali eqinile uphinde uzame futhi. Uma kusesekhona inkinga, sicela uxhumane Nesevisi Yekhasimende ku-%1$s uphinde ubatshele ukuthi ikhodi yephutha ngu-9005.</string>
+  <string name="vvm3_error_spg_no_cellular_title">Ayikwazi ukuxhumeka kubhokisi lakho lemeyili lezwi</string>
+  <string name="vvm3_error_spg_no_cellular_message">Uxolo, sinenkinga yokuxhumeka kubhokisi lakho lemeyili lezwi. Uma usendaweni enamandla esignali antulayo, linda uze ube nesignali eqinile uphinde uzame futhi. Uma kusesekhona inkinga, sicela uxhumane Nesevisi Yekhasimende ku-%1$s uphinde ubatshele ukuthi ikhodi yephutha ngu-9006.</string>
+  <string name="vvm3_error_vms_timeout_title">Kukhona okungahambanga kahle</string>
+  <string name="vvm3_error_vms_timeout_message">Uxolo, sihlangabezane nenkinga. Sicela uzame futhi emuva kwesikhathi. Uma kusesekhona inkinga, sicela uxhumane Nesevisi Yekhasimende ku-%1$s uphinde ubatshele ukuthi ikhodi yephutha ngu-9007.</string>
+  <string name="vvm3_error_vmg_timeout_title">Kukhona okungahambanga kahle</string>
+  <string name="vvm3_error_vmg_timeout_message">Uxolo, sihlangabezane nenkinga. Sicela uzame futhi emuva kwesikhathi. Uma kusesekhona inkinga, sicela uxhumane Nesevisi Yekhasimende ku-%1$s uphinde ubatshele ukuthi ikhodi yephutha ngu-9008.</string>
+  <string name="vvm3_error_status_sms_timeout_title">Kukhona okungahambanga kahle</string>
+  <string name="vvm3_error_status_sms_timeout_message">Uxolo, sinenkinga yokusetha isevisi yakho. Sicela uzame futhi emuva kwesikhathi. Uma kusesekhona inkinga, sicela uxhumane Nesevisi Yekhasimende ku-%1$s uphinde ubatshele ukuthi ikhodi yephutha ngu-9009.</string>
+  <string name="vvm3_error_subscriber_blocked_title">Ayikwazi ukuxhumeka kubhokisi lakho lemeyili lezwi</string>
+  <string name="vvm3_error_subscriber_blocked_message">Uxolo, asikwazi ukuxhumeka kubhokisi lakho lemeyili lezwi ngalesi sikhathi. Sicela uzame futhi emuva kwesikhathi. Uma kusesekhona inkinga, sicela uxhumane Nesevisi Yekhasimende ku-%1$s uphinde ubatshele ukuthi ikhodi yephutha ngu-9990.</string>
+  <string name="vvm3_error_unknown_user_title">Setha ivoyisimeyili</string>
+  <string name="vvm3_error_unknown_user_message">Ivoyisimeyili ayisethiwe ku-akhawunti yakho. Sicela uxhumane Nesevisi Yekhasimende ku-%1$s uphinde ubatshele ukuthi ikhodi yephutha ngu-9991.</string>
+  <string name="vvm3_error_unknown_device_title">Ivoyisimeyili</string>
+  <string name="vvm3_error_unknown_device_message">Ivoyisimeyili ebonakalayo ayikwazi ukuphinda isetshenziswe kule divayisi. Sicela uxhumane Nesevisi Yekhasimende ku-%1$s uphinde ubatshele ukuthi ikhodi yephutha ngu-9992.</string>
+  <string name="vvm3_error_invalid_password_title">Kukhona okungahambanga kahle</string>
+  <string name="vvm3_error_invalid_password_message">Sicela uxhumane Nesevisi Yekhasimende ku-%1$s uphinde ubatshele ukuthi ikhodi yephutha ngu-9993.</string>
+  <string name="vvm3_error_mailbox_not_initialized_title">Ivoyisimeyili ebonakalayo</string>
+  <string name="vvm3_error_mailbox_not_initialized_message">Ukuze uqedele ukusethwa kwevoyisimeyili ebonakalayo, sicela uxhumane Nesevisi Yekhasimende ku-%1$s uphinde ubatshele ukuthi ikhodi yephutha ngu-9998.</string>
+  <string name="vvm3_error_service_not_provisioned_title">Ivoyisimeyili ebonakalayo</string>
+  <string name="vvm3_error_service_not_provisioned_message">Ukuze uqedele ukusethwa kwevoyisimeyili ebonakalayo, sicela uxhumane Nesevisi Yekhasimende ku-%1$s uphinde ubatshele ukuthi ikhodi yephutha ngu-9998.</string>
+  <string name="vvm3_error_service_not_activated_title">Ivoyisimeyili ebonakalayo</string>
+  <string name="vvm3_error_service_not_activated_message">Ukuze wenze kusebenze imeyili yevoyisi ebonakalayo, sicela uxhumane Nesevisi Yekhasimende ku-%1$s uphinde ubatshele ukuthi ikhodi yephutha ngu-9996.</string>
+  <string name="vvm3_error_user_blocked_title">Kukhona okungahambanga kahle</string>
+  <string name="vvm3_error_user_blocked_message">Ukuze uqedele ukusethwa kwevoyisimeyili ebonakalayo, sicela uxhumane Nesevisi Yekhasimende ku-%1$s uphinde ubatshele ukuthi ikhodi yephutha ngu-9998.</string>
+  <string name="vvm3_error_subscriber_unknown_title">Ivoyisimeyili ebonakalayo ikhutshaziwe</string>
+  <string name="vvm3_error_subscriber_unknown_message">Sicela uxhumane Nesevisi Yekhasimende ku-%1$s ukuze wenze kusebenze ivoyisimeyili ebonakalayo.</string>
+  <string name="vvm3_error_imap_getquota_error_title">Kukhona okungahambanga kahle</string>
+  <string name="vvm3_error_imap_getquota_error_message">Sicela uxhumane Nesevisi Yekhasimende ku-%1$s uphinde ubatshele ukuthi ikhodi yephutha ngu-9997.</string>
+  <string name="vvm3_error_imap_select_error_title">Kukhona okungahambanga kahle</string>
+  <string name="vvm3_error_imap_select_error_message">Sicela uxhumane Nesevisi Yekhasimende ku-%1$s uphinde ubatshele ukuthi ikhodi yephutha ngu-9989.</string>
+  <string name="vvm3_error_imap_error_title">Kukhona okungahambanga kahle</string>
+  <string name="vvm3_error_imap_error_message">Sicela uxhumane Nesevisi Yekhasimende ku-%1$s uphinde ubatshele ukuthi ikhodi yephutha ngu-9999.</string>
+  <string name="verizon_terms_and_conditions_title">Vula ivoyisimeyili yokubuka</string>
+  <string name="verizon_terms_and_conditions_message">%1$s Ngokuvula ivoyisimeyili yokubuka uyavumelana nemigomo nemibandela ye-Verizon Wireless:\n\n%2$s</string>
+  <string name="dialer_terms_and_conditions_title">Vula ivoyisimeyili yokubuka</string>
+  <string name="dialer_terms_and_conditions_existing_user_title">Okusha! Funda ivoyisimeyili yakho</string>
+  <string name="dialer_terms_and_conditions_message">%s</string>
+  <string name="dialer_terms_and_conditions_1.0">Bona futhi ulalele imilayezo yakho ngaphandle kokushayela ivoyisimeyili. Imibhalo yevoyisimeyili yakho inikezelwa yisevisi yokubhala emahhala ye-Google. Ungavala lokhu noma kunini kuzilungiselelo.%s</string>
+  <string name="dialer_terms_and_conditions_existing_user">Imibhalo yevoyisimeyili yakho inikezelwa yisevisi yokubhala emahhala ye-Google. Ungavala lokhu noma kunini. %s</string>
+  <string name="dialer_terms_and_conditions_for_verizon_1.0">Bona futhi ulalele imilayezo yakho, ngaphandle kokushayela ivoyisimeyili.</string>
+  <string name="dialer_terms_and_conditions_learn_more">Funda kabanzi</string>
+  <string name="dialer_terms_and_conditions_existing_user_ack">Kulungile, ngiyakwazi</string>
+  <string name="dialer_terms_and_conditions_existing_user_decline">Cha Ngiyabonga</string>
+  <string name="terms_and_conditions_decline_dialog_title">Khubaza ivoyisimeyili ebukwayo?</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_message">I-Visual voicemail izokhutshazwa uma imigomo nemibandela inqatshawa.</string>
+  <string name="verizon_terms_and_conditions_decline_dialog_downgrade">Khubaza</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_message">Ivoyisimeyili ebukwayo izokhutshazwa uma uvala ivoyisimeyili ebukwayo.</string>
+  <string name="dialer_terms_and_conditions_decline_dialog_downgrade">Khubaza</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_message">Ivoyisimeyili izofinyeleleka kuphela ngokushayela ku-*86. Setha iphinikhodi entsha yevoyisimeyili ukuze uqhubeke.</string>
+  <string name="verizon_terms_and_conditions_decline_set_pin_dialog_set_pin">Setha i-PIN</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/error/res/values/strings.xml b/java/com/android/dialer/voicemail/listui/error/res/values/strings.xml
index 05082d8..14e1cb3 100644
--- a/java/com/android/dialer/voicemail/listui/error/res/values/strings.xml
+++ b/java/com/android/dialer/voicemail/listui/error/res/values/strings.xml
@@ -133,8 +133,8 @@
   <string name="vvm3_error_imap_error_title">Something Went Wrong</string>
   <string name="vvm3_error_imap_error_message">Please contact Customer Service at <xliff:g example="(555) 555-5555" id="number">%1$s</xliff:g> and tell them the error code is 9999.</string>
 
-  <string translatable="false" name="verizon_domestic_customer_support_number">+18009220204</string>
-  <string translatable="false" name="verizon_domestic_customer_support_display_number">(800) 922–0204</string>
+  <string name="verizon_domestic_customer_support_number" translatable="false">+18009220204</string>
+  <string name="verizon_domestic_customer_support_display_number" translatable="false">(800) 922–0204</string>
 
   <string name="verizon_terms_and_conditions_title">Turn on visual voicemail</string>
   <string name="verizon_terms_and_conditions_message"><xliff:g>%1$s</xliff:g> By turning on visual voicemail you agree to the Verizon Wireless terms and conditions:\n\n<xliff:g>%2$s</xliff:g></string>
@@ -144,7 +144,7 @@
   <string name="dialer_terms_and_conditions_existing_user_title">New! Read your voicemail</string>
   <string name="dialer_terms_and_conditions_message"><xliff:g>%s</xliff:g></string>
 
-  <string translatable="false" name="verizon_terms_and_conditions_1.1_english">
+  <string name="verizon_terms_and_conditions_1.1_english" translatable="false">
 Visual Voice Mail (VVM) is a service that provides access to voice mail messages directly on the device, without the need to call *86. This service requires traditional Voice Mail but does not support all traditional Voice Mail features, which you can access by dialing *86 from your handset. Use of this feature will be billed on a per-megabyte basis, or according to any data package you have. Mobile to mobile minutes do not apply. Standard rates apply to any calls, emails or messages initiated from Visual Voice Mail.\n
 \n
 You may disable VVM in settings. This will revert you to basic voice mail. In some cases you may need to call customer care to cancel and if you cancel Visual Voice Mail you may lose all stored voice mails and information.\n
@@ -157,7 +157,7 @@
 \n
 If you do not accept all of these terms and conditions, do not use Visual Voice Mail.  </string>
 
-  <string translatable="false" name="verizon_terms_and_conditions_1.1_spanish">
+  <string name="verizon_terms_and_conditions_1.1_spanish" translatable="false">
 El buzón de voz visual (VVM) es un servicio que permite acceder a los mensajes del buzón de voz directamente en el dispositivo, sin necesidad de llamar al *86. Este servicio requiere el buzón de voz tradicional, pero no admite todas las funciones del buzón de voz tradicional, a las que se puede acceder marcando *86 en el teléfono. El uso de esta función se factura por megabyte o conforme a cualquier paquete de datos que tenga. No se aplican los minutos de un dispositivo móvil a otro. Se aplican tarifas estándar a todos los correos electrónicos, las llamadas o los mensajes originados en el buzón de voz visual.\n
 \n
 Puede inhabilitar el VVM en la configuración. Esto le permite volver al buzón de voz básico. En algunos casos, es posible que deba llamar al servicio de atención al cliente para cancelar el buzón de voz visual. Si lo cancela, puede perder la información y los mensajes de voz almacenados.\n
@@ -172,11 +172,11 @@
   </string>
 
   <string name="dialer_terms_and_conditions_1.0">
-  See and listen to your messages, without having to call voicemail. Transcripts of your voicemail are provided by Google’s free transcription service. <xliff:g>%s</xliff:g>
+  See and listen to your messages, without having to call voicemail. Transcripts of your voicemail are provided by Google’s free transcription service. You can turn either off in Settings any time. <xliff:g>%s</xliff:g>
   </string>
 
   <string name="dialer_terms_and_conditions_existing_user">
-  Transcripts of your voicemail are now provided by Google’s free transcription service. %s
+  Transcripts of your voicemail are now provided by Google’s free transcription service. You can turn this off in Settings any time. %s
   </string>
 
   <string name="dialer_terms_and_conditions_for_verizon_1.0">
@@ -184,22 +184,22 @@
   </string>
 
   <string name="dialer_terms_and_conditions_learn_more">Learn&#160;more</string>
-  <string translatable="false" name="dialer_terms_and_conditions_learn_more_url">https://support.google.com/phoneapp/answer/2811844?hl=en%26ref_topic=7539039</string>
+  <string name="dialer_terms_and_conditions_learn_more_url" translatable="false">https://support.google.com/phoneapp/answer/2811844?hl=en%26ref_topic=7539039</string>
 
-  <string translatable="false" name="verizon_terms_and_conditions_policy_url">http://www.verizon.com/about/privacy/policy/</string>
+  <string name="verizon_terms_and_conditions_policy_url" translatable="false">http://www.verizon.com/about/privacy/policy/</string>
 
-  <string translatable="false" name="verizon_terms_and_conditions_accept_english">Turn On</string>
-  <string translatable="false" name="verizon_terms_and_conditions_accept_spanish">Aceptar</string>
-  <string translatable="false" name="verizon_terms_and_conditions_decline_english">No Thanks</string>
-  <string translatable="false" name="verizon_terms_and_conditions_decline_spanish">Rechazar</string>
+  <string name="verizon_terms_and_conditions_accept_english" translatable="false">Turn On</string>
+  <string name="verizon_terms_and_conditions_accept_spanish" translatable="false">Aceptar</string>
+  <string name="verizon_terms_and_conditions_decline_english" translatable="false">No Thanks</string>
+  <string name="verizon_terms_and_conditions_decline_spanish" translatable="false">Rechazar</string>
 
-  <string translatable="false" name="dialer_terms_and_conditions_accept_english">Turn On</string>
-  <string translatable="false" name="dialer_terms_and_conditions_accept_spanish">Aceptar</string>
-  <string translatable="false" name="dialer_terms_and_conditions_decline_english">No Thanks</string>
-  <string translatable="false" name="dialer_terms_and_conditions_decline_spanish">Rechazar</string>
+  <string name="dialer_terms_and_conditions_accept_english" translatable="false">Turn On</string>
+  <string name="dialer_terms_and_conditions_accept_spanish" translatable="false">Aceptar</string>
+  <string name="dialer_terms_and_conditions_decline_english" translatable="false">No Thanks</string>
+  <string name="dialer_terms_and_conditions_decline_spanish" translatable="false">Rechazar</string>
 
   <string name="dialer_terms_and_conditions_existing_user_ack">Ok, got it</string>
-  <string name="dialer_terms_and_conditions_existing_user_setings">Settings</string>
+  <string name="dialer_terms_and_conditions_existing_user_decline">No Thanks</string>
 
   <string name="terms_and_conditions_decline_dialog_title">Disable visual voicemail?</string>
 
diff --git a/java/com/android/dialer/voicemail/listui/error/res/values/styles.xml b/java/com/android/dialer/voicemail/listui/error/res/values/styles.xml
index bf70240..4267e8c 100644
--- a/java/com/android/dialer/voicemail/listui/error/res/values/styles.xml
+++ b/java/com/android/dialer/voicemail/listui/error/res/values/styles.xml
@@ -23,7 +23,7 @@
     <item name="android:layout_marginStart">8dp</item>
     <item name="android:layout_marginEnd">8dp</item>
     <item name="android:padding">8dp</item>
-    <item name="android:textColor">@color/dialer_theme_color</item>
+    <item name="android:textColor">?android:attr/colorPrimary</item>
     <item name="android:fontFamily">"sans-serif-medium"</item>
     <item name="android:focusable">true</item>
     <item name="android:singleLine">true</item>
@@ -50,19 +50,19 @@
 
   <style name="RaisedErrorActionStyle" parent="Widget.AppCompat.Button.Colored">
     <item name="android:layout_width">wrap_content</item>
-    <item name="android:colorButtonNormal">@color/dialer_theme_color</item>
+    <item name="android:colorButtonNormal">?android:attr/colorPrimary</item>
     <item name="android:textSize">14sp</item>
     <item name="android:layout_height">@dimen/call_log_action_height</item>
   </style>
 
   <style name="TosTitleStyle">
-    <item name="android:textColor">@color/primary_text_color</item>
+    <item name="android:textColor">?android:attr/textColorPrimary</item>
     <item name="android:textSize">20sp</item>
     <item name="android:fontFamily">"sans-serif-medium"</item>
   </style>
 
   <style name="TosLinkStyle">
-    <item name="android:textColor">@color/dialer_theme_color</item>
+    <item name="android:textColor">?android:attr/colorPrimary</item>
     <item name="android:fontFamily">"sans-serif-medium"</item>
   </style>
 
@@ -75,7 +75,7 @@
 
   <style name="TosDetailsTextStyle">
     <item name="android:textSize">12sp</item>
-    <item name="android:textColor">@color/dialer_secondary_text_color</item>
+    <item name="android:textColor">?android:attr/textColorSecondary</item>
     <item name="android:fontFamily">"sans-serif-regular"</item>
     <item name="android:lineSpacingExtra">12sp</item>
   </style>
diff --git a/java/com/android/dialer/voicemail/listui/menu/BottomSheetHeader.java b/java/com/android/dialer/voicemail/listui/menu/BottomSheetHeader.java
new file mode 100644
index 0000000..deca7bd
--- /dev/null
+++ b/java/com/android/dialer/voicemail/listui/menu/BottomSheetHeader.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.dialer.voicemail.listui.menu;
+
+import android.text.TextUtils;
+import com.android.dialer.calllogutils.PhotoInfoBuilder;
+import com.android.dialer.historyitemactions.HistoryItemBottomSheetHeaderInfo;
+import com.android.dialer.voicemail.model.VoicemailEntry;
+
+/** Configures the top row in the bottom sheet for the Voicemail Tab */
+final class BottomSheetHeader {
+
+  static HistoryItemBottomSheetHeaderInfo fromVoicemailEntry(VoicemailEntry voicemailEntry) {
+    return HistoryItemBottomSheetHeaderInfo.newBuilder()
+        .setNumber(voicemailEntry.getNumber())
+        .setPhotoInfo(PhotoInfoBuilder.fromVoicemailEntry(voicemailEntry))
+        .setPrimaryText(buildPrimaryVoicemailText(voicemailEntry))
+        .setSecondaryText(buildSecondaryVoicemailText(voicemailEntry))
+        .build();
+  }
+
+  private static String buildSecondaryVoicemailText(VoicemailEntry voicemailEntry) {
+    return voicemailEntry.getGeocodedLocation();
+  }
+
+  private static String buildPrimaryVoicemailText(VoicemailEntry data) {
+    StringBuilder primaryText = new StringBuilder();
+    if (!TextUtils.isEmpty(data.getNumberAttributes().getName())) {
+      primaryText.append(data.getNumberAttributes().getName());
+    } else if (!TextUtils.isEmpty(data.getFormattedNumber())) {
+      primaryText.append(data.getFormattedNumber());
+    } else {
+      // TODO(uabdullah): Handle CallLog.Calls.PRESENTATION_*, including Verizon restricted numbers.
+      // primaryText.append(context.getText(R.string.voicemail_unknown));
+      // TODO(uabdullah): Figure out why http://gpaste/5980163120562176 error when using string
+      primaryText.append("Unknown");
+    }
+    return primaryText.toString();
+  }
+}
diff --git a/java/com/android/dialer/voicemail/listui/menu/Modules.java b/java/com/android/dialer/voicemail/listui/menu/Modules.java
index c3c883c..5a9a711 100644
--- a/java/com/android/dialer/voicemail/listui/menu/Modules.java
+++ b/java/com/android/dialer/voicemail/listui/menu/Modules.java
@@ -17,77 +17,54 @@
 package com.android.dialer.voicemail.listui.menu;
 
 import android.content.Context;
-import com.android.dialer.blockreportspam.BlockReportSpamDialogInfo;
-import com.android.dialer.historyitemactions.DividerModule;
+import android.text.TextUtils;
 import com.android.dialer.historyitemactions.HistoryItemActionModule;
-import com.android.dialer.historyitemactions.SharedModules;
-import com.android.dialer.logging.ReportingLocation;
+import com.android.dialer.historyitemactions.HistoryItemActionModuleInfo;
+import com.android.dialer.historyitemactions.HistoryItemActionModulesBuilder;
 import com.android.dialer.voicemail.model.VoicemailEntry;
-import com.google.common.base.Optional;
-import java.util.ArrayList;
 import java.util.List;
 
 /**
  * Configures the modules for the voicemail bottom sheet; these are the rows below the top row
- * (primary action) in the bottom sheet.
+ * (contact info) in the bottom sheet.
  */
-@SuppressWarnings("Guava")
 final class Modules {
 
   static List<HistoryItemActionModule> fromVoicemailEntry(
       Context context, VoicemailEntry voicemailEntry) {
-    // Conditionally add each module, which are items in the bottom sheet's menu.
-    List<HistoryItemActionModule> modules = new ArrayList<>();
+    return new HistoryItemActionModulesBuilder(context, buildModuleInfo(voicemailEntry))
+        // TODO(uabdullah): add module for calls.
+        .addModuleForAddingToContacts()
+        .addModuleForSendingTextMessage()
+        .addModuleForDivider()
+        .addModuleForBlockedOrSpamNumber()
+        .addModuleForCopyingNumber()
+        // TODO(zachh): Module for CallComposer.
+        .build();
+  }
 
-    // TODO(uabdullah): Handle maybeAddModuleForVideoOrAudioCall(context, modules, row);
-    Optional<HistoryItemActionModule> moduleForAddingContacts =
-        SharedModules.createModuleForAddingToContacts(
-            context,
-            voicemailEntry.number(),
-            voicemailEntry.numberAttributes().getName(),
-            voicemailEntry.numberAttributes().getLookupUri(),
-            voicemailEntry.numberAttributes().getIsBlocked(),
-            voicemailEntry.numberAttributes().getIsSpam());
-    if (moduleForAddingContacts.isPresent()) {
-      modules.add(moduleForAddingContacts.get());
-    }
-
-    Optional<HistoryItemActionModule> moduleForSendingTextMessage =
-        SharedModules.createModuleForSendingTextMessage(
-            context,
-            voicemailEntry.number().getNormalizedNumber(),
-            voicemailEntry.numberAttributes().getIsBlocked());
-    if (moduleForSendingTextMessage.isPresent()) {
-      modules.add(moduleForSendingTextMessage.get());
-    }
-
-    if (!modules.isEmpty()) {
-      modules.add(new DividerModule());
-    }
-
-    BlockReportSpamDialogInfo blockReportSpamDialogInfo =
-        BlockReportSpamDialogInfo.newBuilder()
-            .setNormalizedNumber(voicemailEntry.number().getNormalizedNumber())
-            .setCountryIso(voicemailEntry.number().getCountryIso())
-            .setCallType(voicemailEntry.callType())
-            .setReportingLocation(ReportingLocation.Type.VOICEMAIL_HISTORY)
-            .setContactSource(voicemailEntry.numberAttributes().getContactSource())
-            .build();
-    modules.addAll(
-        SharedModules.createModulesHandlingBlockedOrSpamNumber(
-            context,
-            blockReportSpamDialogInfo,
-            voicemailEntry.numberAttributes().getIsBlocked(),
-            voicemailEntry.numberAttributes().getIsSpam()));
-
-    // TODO(zachh): Module for CallComposer.
-    Optional<HistoryItemActionModule> moduleForCopyingNumber =
-        SharedModules.createModuleForCopyingNumber(
-            context, voicemailEntry.number().getNormalizedNumber());
-    if (moduleForCopyingNumber.isPresent()) {
-      modules.add(moduleForCopyingNumber.get());
-    }
-
-    return modules;
+  private static HistoryItemActionModuleInfo buildModuleInfo(VoicemailEntry voicemailEntry) {
+    return HistoryItemActionModuleInfo.newBuilder()
+        .setNormalizedNumber(voicemailEntry.getNumber().getNormalizedNumber())
+        .setCountryIso(voicemailEntry.getNumber().getCountryIso())
+        .setName(voicemailEntry.getNumberAttributes().getName())
+        .setCallType(voicemailEntry.getCallType())
+        .setLookupUri(voicemailEntry.getNumberAttributes().getLookupUri())
+        .setPhoneAccountComponentName(voicemailEntry.getPhoneAccountComponentName())
+        .setCanReportAsInvalidNumber(
+            voicemailEntry.getNumberAttributes().getCanReportAsInvalidNumber())
+        .setCanSupportAssistedDialing(
+            !TextUtils.isEmpty(voicemailEntry.getNumberAttributes().getLookupUri()))
+        .setCanSupportCarrierVideoCall(
+            voicemailEntry.getNumberAttributes().getCanSupportCarrierVideoCall())
+        .setIsBlocked(voicemailEntry.getNumberAttributes().getIsBlocked())
+        .setIsEmergencyNumber(voicemailEntry.getNumberAttributes().getIsEmergencyNumber())
+        .setIsSpam(voicemailEntry.getNumberAttributes().getIsSpam())
+        // A voicemail call is an outgoing call to the voicemail box.
+        // Voicemail entries are not voicemail calls.
+        .setIsVoicemailCall(false)
+        .setContactSource(voicemailEntry.getNumberAttributes().getContactSource())
+        .setHost(HistoryItemActionModuleInfo.Host.VOICEMAIL)
+        .build();
   }
 }
diff --git a/java/com/android/dialer/voicemail/listui/menu/NewVoicemailMenu.java b/java/com/android/dialer/voicemail/listui/menu/NewVoicemailMenu.java
index 7c669e1..6008059 100644
--- a/java/com/android/dialer/voicemail/listui/menu/NewVoicemailMenu.java
+++ b/java/com/android/dialer/voicemail/listui/menu/NewVoicemailMenu.java
@@ -18,7 +18,6 @@
 
 import android.content.Context;
 import android.view.View;
-import com.android.dialer.glidephotomanager.GlidePhotoManager;
 import com.android.dialer.historyitemactions.HistoryItemActionBottomSheet;
 import com.android.dialer.voicemail.model.VoicemailEntry;
 
@@ -27,12 +26,11 @@
 
   /** Creates and returns the OnClickListener which opens the menu for the provided row. */
   public static View.OnClickListener createOnClickListener(
-      Context context, VoicemailEntry voicemailEntry, GlidePhotoManager glidePhotoManager) {
+      Context context, VoicemailEntry voicemailEntry) {
     return (view) ->
         HistoryItemActionBottomSheet.show(
             context,
-            PrimaryAction.fromVoicemailEntry(context, voicemailEntry),
-            Modules.fromVoicemailEntry(context, voicemailEntry),
-            glidePhotoManager);
+            BottomSheetHeader.fromVoicemailEntry(voicemailEntry),
+            Modules.fromVoicemailEntry(context, voicemailEntry));
   }
 }
diff --git a/java/com/android/dialer/voicemail/listui/menu/PrimaryAction.java b/java/com/android/dialer/voicemail/listui/menu/PrimaryAction.java
deleted file mode 100644
index 9a5aa18..0000000
--- a/java/com/android/dialer/voicemail/listui/menu/PrimaryAction.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.dialer.voicemail.listui.menu;
-
-import android.content.Context;
-import android.text.TextUtils;
-import com.android.dialer.calllogutils.NumberAttributesConverter;
-import com.android.dialer.historyitemactions.HistoryItemPrimaryActionInfo;
-import com.android.dialer.voicemail.model.VoicemailEntry;
-
-/** Configures the primary action row (top row) for theottom sheet for the Voicemail Tab */
-final class PrimaryAction {
-
-  // TODO(uabdullah): Need to do the following:
-  // setIsVideo - check if is passing in voicemailEntry.features() is required
-  // setLookupUri - check if passing in voicemailEntry.lookupUri() is required
-  // setIntent - allow video calling
-  // setPrimaryText - check in with UX
-  // setSecondaryText - check in with UX
-  static HistoryItemPrimaryActionInfo fromVoicemailEntry(
-      Context context, VoicemailEntry voicemailEntry) {
-    return HistoryItemPrimaryActionInfo.builder()
-        .setNumber(voicemailEntry.number())
-        .setPhotoInfo(
-            NumberAttributesConverter.toPhotoInfoBuilder(voicemailEntry.numberAttributes())
-                .setFormattedNumber(voicemailEntry.formattedNumber())
-                .build())
-        .setPrimaryText(buildPrimaryVoicemailText(context, voicemailEntry))
-        .setSecondaryText(buildSecondaryVoicemailText(voicemailEntry))
-        .build();
-  }
-
-  private static CharSequence buildSecondaryVoicemailText(VoicemailEntry voicemailEntry) {
-    return voicemailEntry.geocodedLocation();
-  }
-
-  public static String buildPrimaryVoicemailText(Context context, VoicemailEntry data) {
-    StringBuilder primaryText = new StringBuilder();
-    if (!TextUtils.isEmpty(data.numberAttributes().getName())) {
-      primaryText.append(data.numberAttributes().getName());
-    } else if (!TextUtils.isEmpty(data.formattedNumber())) {
-      primaryText.append(data.formattedNumber());
-    } else {
-      // TODO(uabdullah): Handle CallLog.Calls.PRESENTATION_*, including Verizon restricted numbers.
-      // primaryText.append(context.getText(R.string.voicemail_unknown));
-      // TODO(uabdullah): Figure out why http://gpaste/5980163120562176 error when using string
-      primaryText.append("Unknown");
-    }
-    return primaryText.toString();
-  }
-}
diff --git a/java/com/android/dialer/voicemail/listui/res/layout/new_voicemail_call_log_fragment.xml b/java/com/android/dialer/voicemail/listui/res/layout/new_voicemail_call_log_fragment.xml
index fd9e0f2..a001bd6 100644
--- a/java/com/android/dialer/voicemail/listui/res/layout/new_voicemail_call_log_fragment.xml
+++ b/java/com/android/dialer/voicemail/listui/res/layout/new_voicemail_call_log_fragment.xml
@@ -19,6 +19,7 @@
     android:id="@+id/new_voicemail_frame_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="?android:attr/colorBackground"
     android:orientation="vertical">
 
   <android.support.v7.widget.RecyclerView
@@ -26,11 +27,8 @@
       android:id="@+id/new_voicemail_call_log_recycler_view"
       android:layout_width="match_parent"
       android:layout_height="match_parent"
-      android:paddingBottom="@dimen/floating_action_button_list_bottom_padding"
-      android:background="@color/background_dialer_light"
-      android:clipToPadding="false"
-      android:visibility="gone"
-      />
+      android:paddingBottom="88dp"
+      android:clipToPadding="false"/>
 
 
   <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
@@ -43,7 +41,6 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center"
         android:visibility="gone"/>
-
   </FrameLayout>
 
 </FrameLayout>
diff --git a/java/com/android/dialer/voicemail/listui/res/layout/new_voicemail_entry.xml b/java/com/android/dialer/voicemail/listui/res/layout/new_voicemail_entry.xml
index fc98f02..95711e0 100644
--- a/java/com/android/dialer/voicemail/listui/res/layout/new_voicemail_entry.xml
+++ b/java/com/android/dialer/voicemail/listui/res/layout/new_voicemail_entry.xml
@@ -17,78 +17,75 @@
 
 <RelativeLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginTop="@dimen/call_log_entry_top_margin"
-    android:paddingTop="@dimen/call_log_entry_padding_top_start"
-    android:paddingBottom="@dimen/call_log_entry_padding_bottom_end"
-    android:paddingStart="@dimen/call_log_entry_padding_top_start"
-    android:paddingEnd="@dimen/call_log_entry_padding_bottom_end"
-    android:gravity="center_vertical">
+    android:minHeight="72dp">
 
-  <QuickContactBadge
-      android:id="@+id/quick_contact_photo"
-      android:layout_width="@dimen/call_log_entry_photo_size"
-      android:layout_height="@dimen/call_log_entry_photo_size"
-      android:padding="@dimen/call_log_entry_photo_padding"
-      android:focusable="true"/>
+  <com.android.dialer.widget.ContactPhotoView
+      android:id="@+id/contact_photo_view"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_marginTop="12dp"
+      android:layout_marginStart="8dp"
+      android:layout_marginEnd="8dp"/>
 
   <LinearLayout
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:layout_centerVertical="true"
-      android:layout_toEndOf="@+id/quick_contact_photo"
+      android:layout_toEndOf="@+id/contact_photo_view"
       android:layout_toStartOf="@+id/menu_button"
       android:orientation="vertical">
 
     <TextView
         android:id="@+id/primary_text"
-        style="@style/PrimaryText"
+        style="@style/Dialer.TextAppearance.Primary.Ellipsize"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/call_log_entry_photo_text_margin"
-        android:layout_gravity="center_vertical"/>
+        android:layout_marginTop="14dp"
+        android:layout_marginEnd="6dp"
+        android:lineSpacingMultiplier="1.5"/>
 
     <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:orientation="horizontal">
+        android:orientation="horizontal"
+        tools:ignore="UseCompoundDrawables">
 
       <ImageView
-          android:layout_width="@dimen/voicemail_icon_size"
-          android:layout_height="@dimen/voicemail_icon_size"
-          android:layout_marginStart="@dimen/voicemail_icon_margin"
+          android:layout_width="wrap_content"
+          android:layout_height="18dp"
           android:layout_gravity="center_vertical"
+          android:importantForAccessibility="no"
           android:src="@drawable/quantum_ic_voicemail_vd_theme_24"
-          android:tint="@color/dialtacts_theme_color"
+          android:tint="?android:attr/colorPrimary"
           android:tintMode="multiply"
-          />
+          tools:ignore="ContentDescription"/>
 
       <TextView
           android:id="@+id/secondary_text"
-          style="@style/SecondaryText"
+          style="@style/Dialer.TextAppearance.Secondary.Ellipsize"
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"
-          android:layout_marginStart="@dimen/call_log_entry_photo_text_margin"/>
+          android:lineSpacingMultiplier="1.4"/>
     </LinearLayout>
 
-    <!-- TODO(a bug): Fix text cropping issue, make text selectable -->
+    <!-- TODO(a bug): Make text selectable -->
     <TextView
         android:id="@+id/transcription_text"
-        style="@style/PrimaryText"
+        style="@style/Dialer.TextAppearance.Primary"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/call_log_entry_photo_text_margin"
+        android:layout_marginTop="6dp"
         android:layout_gravity="center_vertical"
         android:textSize="@dimen/voicemail_transcription_text_size"
         android:visibility="gone"/>
 
     <TextView
         android:id="@+id/transcription_branding"
-        style="@style/SecondaryText"
+        style="@style/Dialer.TextAppearance.Secondary"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/call_log_entry_photo_text_margin"
         android:layout_gravity="center_vertical"
         android:text="@string/voicemail_transcription_branding_text"
         android:visibility="gone"/>
@@ -97,18 +94,17 @@
         android:id="@+id/new_voicemail_media_player"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:visibility="gone"
-        />
-
+        android:visibility="gone"/>
   </LinearLayout>
 
-  <!-- TODO(a bug): Add ripple effect -->
   <ImageView
       android:id="@+id/menu_button"
-      android:layout_width="@dimen/call_log_entry_menu_button_size"
-      android:layout_height="@dimen/call_log_entry_menu_button_size"
+      android:layout_width="56dp"
+      android:layout_height="72dp"
       android:layout_alignParentEnd="true"
+      android:background="?android:attr/selectableItemBackgroundBorderless"
+      android:contentDescription="@string/a11y_voicemail_entry_expand_menu"
       android:scaleType="center"
       android:src="@drawable/quantum_ic_more_vert_vd_theme_24"
-      android:tint="@color/dialer_secondary_text_color"/>
+      android:tint="?colorIcon"/>
 </RelativeLayout>
diff --git a/java/com/android/dialer/voicemail/listui/res/layout/new_voicemail_entry_alert.xml b/java/com/android/dialer/voicemail/listui/res/layout/new_voicemail_entry_alert.xml
index 28d6391..1df8b2c 100644
--- a/java/com/android/dialer/voicemail/listui/res/layout/new_voicemail_entry_alert.xml
+++ b/java/com/android/dialer/voicemail/listui/res/layout/new_voicemail_entry_alert.xml
@@ -38,6 +38,7 @@
         android:layout_width="@dimen/voicemail_promo_card_icon_size"
         android:layout_height="@dimen/voicemail_promo_card_icon_size"
         android:layout_gravity="top"
+        android:importantForAccessibility="no"
         android:src="@drawable/ic_voicemail_error_24px"/>
 
     <LinearLayout
@@ -49,23 +50,20 @@
 
       <TextView
           android:id="@+id/voicemail_alert_header"
-          android:textStyle="bold"
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"
           android:layout_marginBottom="@dimen/voicemail_promo_card_title_padding"
           android:layout_gravity="center_vertical"
-          android:singleLine="false"
           android:text="Voicemail Alert"
-          android:textSize="@dimen/voicemail_promo_card_title_text_size"/>
+          style="@style/Dialer.TextAppearance.Header2"/>
 
       <TextView
           android:id="@+id/voicemail_alert_details"
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"
           android:lineSpacingExtra="@dimen/voicemail_promo_card_line_spacing"
-          android:singleLine="false"
           android:text="This is a voicemail alert message."
-          android:textSize="@dimen/voicemail_promo_card_message_size"/>
+          style="@style/Dialer.TextAppearance.Secondary"/>
     </LinearLayout>
   </LinearLayout>
 
@@ -86,24 +84,21 @@
         style="@style/TosButtonStyle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textColor="@color/dialer_theme_color"/>
+        android:textColor="?android:attr/colorPrimary"/>
 
     <Button
         android:id="@+id/voicemail_alert_primary_button"
         style="@style/TosButtonStyle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textColor="@color/dialer_theme_color"/>
+        android:textColor="?android:attr/colorPrimary"/>
   </LinearLayout>
 
-  <LinearLayout
-      android:layout_width="0dip"
-      android:layout_height="match_parent"
-      android:layout_weight="1"
-      android:layout_gravity="center"
-      android:divider="?android:dividerHorizontal"
-      android:gravity="center"
-      android:orientation="vertical"
-      android:showDividers="middle">
-  </LinearLayout>
+  <View
+      xmlns:android="http://schemas.android.com/apk/res/android"
+      android:layout_width="match_parent"
+      android:layout_height="1dp"
+      android:layout_marginTop="8dp"
+      android:layout_marginBottom="8dp"
+      android:background="#12000000"/>
 </LinearLayout>
diff --git a/java/com/android/dialer/voicemail/listui/res/layout/new_voicemail_entry_header.xml b/java/com/android/dialer/voicemail/listui/res/layout/new_voicemail_entry_header.xml
index 84fcc37..70ca2ac 100644
--- a/java/com/android/dialer/voicemail/listui/res/layout/new_voicemail_entry_header.xml
+++ b/java/com/android/dialer/voicemail/listui/res/layout/new_voicemail_entry_header.xml
@@ -16,14 +16,16 @@
   -->
 <RelativeLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="48dp"
+    android:minHeight="48dp"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
   <TextView
       android:id="@+id/new_voicemail_header_text"
-      style="@style/SecondaryText"
+      style="@style/Dialer.TextAppearance.Secondary.Ellipsize"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:layout_marginStart="@dimen/voicemail_header_margin_start"
-      android:layout_centerVertical="true"/>
+      android:layout_marginStart="16dp"
+      android:layout_marginTop="8dp"
+      android:layout_centerVertical="true"
+      android:layout_gravity="center_vertical"/>
 </RelativeLayout>
diff --git a/java/com/android/dialer/voicemail/listui/res/layout/new_voicemail_media_player_layout.xml b/java/com/android/dialer/voicemail/listui/res/layout/new_voicemail_media_player_layout.xml
index 3efcea5..2796142 100644
--- a/java/com/android/dialer/voicemail/listui/res/layout/new_voicemail_media_player_layout.xml
+++ b/java/com/android/dialer/voicemail/listui/res/layout/new_voicemail_media_player_layout.xml
@@ -74,6 +74,7 @@
         android:id="@+id/pauseButton"
         style="@style/voicemail_media_player_buttons"
         android:layout_weight="1"
+        android:contentDescription="@string/a11y_voicemail_entry_pause"
         android:src="@drawable/quantum_ic_pause_vd_theme_24"
         android:visibility="gone"/>
 
@@ -81,6 +82,7 @@
         android:id="@+id/playButton"
         style="@style/voicemail_media_player_buttons"
         android:layout_weight="1"
+        android:contentDescription="@string/a11y_voicemail_entry_play"
         android:src="@drawable/quantum_ic_play_arrow_vd_theme_24"/>
 
 
@@ -88,6 +90,7 @@
         android:id="@+id/speakerButton"
         style="@style/voicemail_media_player_buttons"
         android:layout_weight="1"
+        android:contentDescription="@string/a11y_voicemail_entry_speaker"
         android:src="@drawable/quantum_ic_volume_up_vd_theme_24"/>
 
 
@@ -95,13 +98,14 @@
         android:id="@+id/phoneButton"
         style="@style/voicemail_media_player_buttons"
         android:layout_weight="1"
+        android:contentDescription="@string/a11y_voicemail_entry_call"
         android:src="@drawable/quantum_ic_phone_vd_theme_24"/>
 
     <ImageButton
         android:id="@+id/deleteButton"
         style="@style/voicemail_media_player_buttons"
         android:layout_weight="1"
+        android:contentDescription="@string/a11y_voicemail_entry_delete"
         android:src="@drawable/quantum_ic_delete_vd_theme_24"/>
-
   </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/java/com/android/dialer/voicemail/listui/res/layout/voicemail_tos_fragment.xml b/java/com/android/dialer/voicemail/listui/res/layout/voicemail_tos_fragment.xml
deleted file mode 100644
index dea41e7..0000000
--- a/java/com/android/dialer/voicemail/listui/res/layout/voicemail_tos_fragment.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  android:layout_width="match_parent"
-  android:layout_height="match_parent"
-  android:orientation="vertical">
-
-  <ScrollView
-    android:id="@+id/voicemail_tos_message"
-    android:layout_width="match_parent"
-    android:layout_height="0dp"
-    android:layout_weight="1"
-    android:orientation="vertical">
-    <LinearLayout
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:paddingLeft="16dp"
-      android:paddingRight="16dp"
-      android:paddingTop="32dp"
-      android:orientation="vertical">
-      <ImageView
-        android:id="@+id/voicemail_image"
-        android:layout_width="@dimen/voicemail_tos_image_size"
-        android:layout_height="@dimen/voicemail_tos_image_size"
-        android:layout_gravity="center"
-        android:paddingBottom="32dp"
-        android:importantForAccessibility="no"/>
-      <TextView
-        android:id="@+id/tos_message_title"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center_horizontal|top"
-        android:minHeight="20dp"
-        android:text="@string/verizon_terms_and_conditions_title"
-        style="@style/TosTitleStyle"/>
-      <TextView
-        android:id="@+id/tos_message_details"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingTop="16dp"
-        android:paddingBottom="16dp"
-        android:text="@string/verizon_terms_and_conditions_1.1_english"
-        style="@style/TosTextStyle"/>
-    </LinearLayout>
-  </ScrollView>
-
-  <View
-    android:layout_width="match_parent"
-    android:layout_height="0.5dp"
-    android:elevation="1dp"
-    android:background="@drawable/shadow"/>
-
-  <LinearLayout
-    android:id="@+id/voicemail_tos_button"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:gravity="center_vertical"
-    android:minHeight="56dp"
-    android:paddingStart="16dp"
-    android:paddingEnd="16dp"
-    android:paddingTop="10dp"
-    android:paddingBottom="10dp"
-    android:background="#ffffffff"
-    android:orientation="horizontal">
-    <Button
-        android:id="@+id/voicemail_tos_button_decline"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/verizon_terms_and_conditions_decline_english"
-        android:textColor="#757575"
-        style="@style/TosButtonStyle"/>
-
-    <android.support.v4.widget.Space
-      android:layout_width="8dp"
-      android:layout_height="match_parent"
-      android:layout_weight="1"/>
-
-
-    <Button
-        android:id="@+id/voicemail_tos_button_accept"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/verizon_terms_and_conditions_accept_english"
-        android:textColor="@color/dialer_theme_color"
-        style="@style/TosButtonStyle"/>
-
-  </LinearLayout>
-
-</LinearLayout>
diff --git a/java/com/android/dialer/voicemail/listui/res/values/dimens.xml b/java/com/android/dialer/voicemail/listui/res/values/dimens.xml
index e6fcb74..1fa308a 100644
--- a/java/com/android/dialer/voicemail/listui/res/values/dimens.xml
+++ b/java/com/android/dialer/voicemail/listui/res/values/dimens.xml
@@ -17,19 +17,8 @@
 <resources>
 
   <!-- TODO(uabdullah): These values are to be shared with the call log entries -->
-  <dimen name="call_log_entry_top_margin">6dp</dimen>
-  <dimen name="call_log_entry_padding_bottom_end">16dp</dimen>
-  <dimen name="call_log_entry_padding_top_start">12dp</dimen>
-  <dimen name="call_log_entry_photo_size">48dp</dimen>
-  <dimen name="call_log_entry_photo_padding">4dp</dimen>
-  <dimen name="call_log_entry_photo_text_margin">8dp</dimen>
   <dimen name="call_log_entry_menu_button_size">48dp</dimen>
-
   <dimen name="voicemail_transcription_text_size">14sp</dimen>
-
-  <dimen name="voicemail_icon_margin">12dp</dimen>
-  <dimen name="voicemail_icon_size">16dp</dimen>
-
   <dimen name="voicemail_playback_state_text_size">14sp</dimen>
   <!-- TODO(uabdullah): Work with UX on this value to ensure proper spacing between
   the seekbar and transcription -->
@@ -39,8 +28,6 @@
   <dimen name="voicemail_media_player_height">56dp</dimen>
   <dimen name="voicemail_media_player_width">0dp</dimen>
 
-  <dimen name="voicemail_header_margin_start">16dp</dimen>
-
   <dimen name="voicemail_tos_image_size">280dp</dimen>
 
   <!-- Dimensions for voicemail alert -->
diff --git a/java/com/android/dialer/voicemail/listui/res/values/strings.xml b/java/com/android/dialer/voicemail/listui/res/values/strings.xml
index d12a71e..bfa81f7 100644
--- a/java/com/android/dialer/voicemail/listui/res/values/strings.xml
+++ b/java/com/android/dialer/voicemail/listui/res/values/strings.xml
@@ -15,6 +15,35 @@
  ~ limitations under the License
  -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!--
+    A string to describe available action for accessibility user. It will be read as "call number".
+  -->
+  <string name="a11y_voicemail_entry_call">Call number</string>
+
+  <!--
+    A string to describe available action for accessibility user. It will be read as "delete".
+  -->
+  <string name="a11y_voicemail_entry_delete">Delete</string>
+
+  <!--
+    A string to describe available action for accessibility user.
+    It will be read as "expand menu for this voicemail entry".
+  -->
+  <string name="a11y_voicemail_entry_expand_menu">
+    Expand menu for this voicemail entry
+  </string>
+
+  <!-- A string to describe available action for accessibility user. It will be read as "pause". -->
+  <string name="a11y_voicemail_entry_pause">Pause</string>
+
+  <!-- A string to describe available action for accessibility user. It will be read as "play". -->
+  <string name="a11y_voicemail_entry_play">Play</string>
+
+  <!--
+    A string to describe available action for accessibility user. It will be read as "speaker".
+  -->
+  <string name="a11y_voicemail_entry_speaker">Speaker</string>
+
   <!-- String used to display voicemails from unknown numbers in the voicemail tab.  [CHAR LIMIT=30] -->
   <string name="voicemail_entry_unknown">Unknown</string>
 
@@ -35,8 +64,6 @@
   <!-- Header in voicemail tab to group calls from before yesterday.  [CHAR LIMIT=30] -->
   <string name="new_voicemail_header_older">Older</string>
 
-  <string name="verizon_terms_and_conditions_title" translatable="false">Turn on visual voicemail</string>
-
   <string translatable="false" name="verizon_terms_and_conditions_1.1_english">
 Visual Voice Mail (VVM) is a service that provides access to voice mail messages directly on the device, without the need to call *86. This service requires traditional Voice Mail but does not support all traditional Voice Mail features, which you can access by dialing *86 from your handset. Use of this feature will be billed on a per-megabyte basis, or according to any data package you have. Mobile to mobile minutes do not apply. Standard rates apply to any calls, emails or messages initiated from Visual Voice Mail.\n
 \n
@@ -60,4 +87,7 @@
   <!-- Text displayed when the list of voicemails is empty [CHAR LIMIT=NONE] -->
   <string name="empty_voicemail_tab_text">Your voicemail inbox is empty.</string>
 
+  <!-- Text for snackbar to undo a voicemail delete. [CHAR LIMIT=30] -->
+  <string name="snackbar_voicemail_deleted">Voicemail deleted</string>
+
 </resources>
diff --git a/java/com/android/dialer/voicemail/listui/res/values/styles.xml b/java/com/android/dialer/voicemail/listui/res/values/styles.xml
index 3869927..cbc0102 100644
--- a/java/com/android/dialer/voicemail/listui/res/values/styles.xml
+++ b/java/com/android/dialer/voicemail/listui/res/values/styles.xml
@@ -24,7 +24,7 @@
   </style>
 
   <style name="TosTitleStyle">
-    <item name="android:textColor">@color/primary_text_color</item>
+    <item name="android:textColor">?android:attr/textColorPrimary</item>
     <item name="android:textSize">20sp</item>
     <item name="android:fontFamily">"sans-serif-medium"</item>
   </style>
diff --git a/java/com/android/dialer/voicemail/model/VoicemailEntry.java b/java/com/android/dialer/voicemail/model/VoicemailEntry.java
deleted file mode 100644
index 2f554b1..0000000
--- a/java/com/android/dialer/voicemail/model/VoicemailEntry.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.dialer.voicemail.model;
-
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import com.android.dialer.DialerPhoneNumber;
-import com.android.dialer.NumberAttributes;
-import com.android.dialer.compat.android.provider.VoicemailCompat;
-import com.google.auto.value.AutoValue;
-
-/** Data class containing the contents of a voicemail entry from the AnnotatedCallLog. */
-@AutoValue
-public abstract class VoicemailEntry {
-
-  public static Builder builder() {
-    return new AutoValue_VoicemailEntry.Builder()
-        .setId(0)
-        .setTimestamp(0)
-        .setNumber(DialerPhoneNumber.getDefaultInstance())
-        .setNumberAttributes(NumberAttributes.getDefaultInstance())
-        .setDuration(0)
-        .setCallType(0)
-        .setIsRead(0)
-        .setTranscriptionState(VoicemailCompat.TRANSCRIPTION_NOT_STARTED);
-  }
-
-  public abstract int id();
-
-  public abstract long timestamp();
-
-  @NonNull
-  public abstract DialerPhoneNumber number();
-
-  @Nullable
-  public abstract String formattedNumber();
-
-  @Nullable
-  public abstract String geocodedLocation();
-
-  public abstract long duration();
-
-  @Nullable
-  public abstract String transcription();
-
-  @Nullable
-  public abstract String voicemailUri();
-
-  public abstract int callType();
-
-  public abstract int isRead();
-
-  public abstract NumberAttributes numberAttributes();
-
-  public abstract int transcriptionState();
-
-  @Nullable
-  public abstract String phoneAccountComponentName();
-
-  @Nullable
-  public abstract String phoneAccountId();
-
-  /** Builder for {@link VoicemailEntry}. */
-  @AutoValue.Builder
-  public abstract static class Builder {
-
-    public abstract Builder setId(int id);
-
-    public abstract Builder setTimestamp(long timestamp);
-
-    public abstract Builder setNumber(@NonNull DialerPhoneNumber number);
-
-    public abstract Builder setFormattedNumber(@Nullable String formattedNumber);
-
-    public abstract Builder setDuration(long duration);
-
-    public abstract Builder setTranscription(@Nullable String transcription);
-
-    public abstract Builder setVoicemailUri(@Nullable String voicemailUri);
-
-    public abstract Builder setGeocodedLocation(@Nullable String geocodedLocation);
-
-    public abstract Builder setCallType(int callType);
-
-    public abstract Builder setIsRead(int isRead);
-
-    public abstract Builder setNumberAttributes(NumberAttributes numberAttributes);
-
-    public abstract Builder setTranscriptionState(int transcriptionState);
-
-    public abstract Builder setPhoneAccountComponentName(
-        @Nullable String phoneAccountComponentName);
-
-    public abstract Builder setPhoneAccountId(@Nullable String phoneAccountId);
-
-    public abstract VoicemailEntry build();
-  }
-}
diff --git a/java/com/android/dialer/voicemail/model/voicemail_entry.proto b/java/com/android/dialer/voicemail/model/voicemail_entry.proto
new file mode 100644
index 0000000..c9ca352
--- /dev/null
+++ b/java/com/android/dialer/voicemail/model/voicemail_entry.proto
@@ -0,0 +1,56 @@
+syntax = "proto2";
+
+option java_package = "com.android.dialer.voicemail.model";
+option java_multiple_files = true;
+option optimize_for = LITE_RUNTIME;
+
+
+package com.android.dialer.voicemail.model;
+
+import "java/com/android/dialer/calllog/database/contract/number_attributes.proto";
+import "java/com/android/dialer/phonenumberproto/dialer_phone_number.proto";
+
+// Contains contents of a voicemail entry from the AnnotatedCallLog.
+message VoicemailEntry {
+  // Value in column AnnotatedCallLog._ID
+  optional int64 id = 1;
+
+  // Value in column AnnotatedCallLog.TIMESTAMP
+  optional int64 timestamp = 2;
+
+  // Value in column AnnotatedCallLog.NUMBER
+  optional com.android.dialer.DialerPhoneNumber number = 3;
+
+  // Value in column AnnotatedCallLog.FORMATTED_NUMBER
+  optional string formatted_number = 4;
+
+  // Value in column AnnotatedCallLog.GEOCODED_LOCATION
+  optional string geocoded_location = 5;
+
+  // Value in column AnnotatedCallLog.DURATION
+  optional int64 duration = 6;
+
+  // Value in column AnnotatedCallLog.TRANSCRIPTION
+  optional string transcription = 7;
+
+  // Value in column AnnotatedCallLog.VOICEMAIL_URI
+  optional string voicemail_uri = 8;
+
+  // Value in column AnnotatedCallLog.CALL_TYPE
+  optional int32 call_type = 9;
+
+  // Value in column AnnotatedCallLog.IS_READ
+  optional int32 is_read = 10;
+
+  // Value in column AnnotatedCallLog.NUMBER_ATTRIBUTES
+  optional com.android.dialer.NumberAttributes number_attributes = 11;
+
+  // Value in column AnnotatedCallLog.TRANSCRIPTION_STATE
+  optional int32 transcription_state = 12;
+
+  // Value in column AnnotatedCallLog.PHONE_ACCOUNT_COMPONENT_NAME
+  optional string phone_account_component_name = 13;
+
+  // Value in column AnnotatedCallLog.PHONE_ACCOUNT_ID
+  optional string phone_account_id = 14;
+}
diff --git a/java/com/android/dialer/voicemail/settings/AndroidManifest.xml b/java/com/android/dialer/voicemail/settings/AndroidManifest.xml
index 19eb6e5..f25858e 100644
--- a/java/com/android/dialer/voicemail/settings/AndroidManifest.xml
+++ b/java/com/android/dialer/voicemail/settings/AndroidManifest.xml
@@ -13,11 +13,15 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.android.dialer.voicemail.settings">
 
   <application>
+    <!-- Causes the "Voicemail" item under "Calls" setting to be hidden. The voicemail module will
+    be handling the settings. Has no effect before OC where dialer cannot provide voicemail
+    settings -->
+    <meta-data android:name="android.telephony.HIDE_VOICEMAIL_SETTINGS_MENU" android:value="true"/>
+
     <activity
         android:exported="false"
         android:label="@string/voicemail_change_pin_preference_title"
@@ -26,5 +30,20 @@
         android:theme="@style/SettingsStyle"
         android:windowSoftInputMode="stateVisible|adjustResize">
     </activity>
+    <activity
+        android:name=".RecordVoicemailGreetingActivity"
+        android:configChanges="orientation|screenSize|keyboardHidden"
+        android:label="@string/voicemail_change_greeting_preference_title"
+        android:parentActivityName="com.android.dialer.app.settings.DialerSettingsActivity"
+        android:theme="@style/SettingsStyle">
+    </activity>
+    <activity
+        android:name=".CurrentVoicemailGreetingActivity"
+        android:label="@string/voicemail_change_greeting_preference_title"
+        android:parentActivityName="com.android.dialer.app.settings.DialerSettingsActivity"
+        android:exported="true">
+    <!-- TODO(a bug): delete android:exported="true" closer to submitting  -->
+    </activity>
   </application>
+
 </manifest>
diff --git a/java/com/android/dialer/voicemail/settings/CurrentVoicemailGreetingActivity.java b/java/com/android/dialer/voicemail/settings/CurrentVoicemailGreetingActivity.java
new file mode 100644
index 0000000..ff7ae97
--- /dev/null
+++ b/java/com/android/dialer/voicemail/settings/CurrentVoicemailGreetingActivity.java
@@ -0,0 +1,169 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.dialer.voicemail.settings;
+
+import android.Manifest;
+import android.app.Activity;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.media.MediaPlayer;
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.v4.app.ActivityCompat;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.ImageButton;
+import android.widget.TextView;
+import com.android.dialer.common.LogUtil;
+import com.android.dialer.widget.DialerToolbar;
+import java.io.IOException;
+import java.util.Locale;
+
+/** Activity to display current voicemail greeting and allow user to navigate to record a new one */
+public class CurrentVoicemailGreetingActivity extends Activity {
+  public static final String VOICEMAIL_GREETING_FILEPATH_KEY = "canonVoicemailGreetingFilePathKey";
+
+  private static final int REQUEST_RECORD_AUDIO_PERMISSION = 200;
+
+  private boolean permissionToRecordAccepted = false;
+
+  private ImageButton changeGreetingButton;
+  private ImageButton playButton;
+
+  private DialerToolbar currentVoicemailGreetingDialerToolbar;
+
+  private int greetingDuration = -1;
+
+  private MediaPlayer mediaPlayer;
+
+  private TextView playbackProgressLabel;
+  private View playbackDisplay;
+
+  private String voicemailGreetingFilePath = "";
+
+  @Override
+  protected void onCreate(Bundle savedInstanceState) {
+    super.onCreate(savedInstanceState);
+    setContentView(R.layout.activity_current_voicemail_greeting);
+
+    playbackDisplay = findViewById(R.id.current_voicemail_greeting_recording_display);
+    playbackProgressLabel = (TextView) findViewById(R.id.playback_progress_text_view);
+    currentVoicemailGreetingDialerToolbar = (DialerToolbar) findViewById(R.id.toolbar);
+
+    currentVoicemailGreetingDialerToolbar.setTitle(
+        R.string.voicemail_change_greeting_preference_title);
+
+    changeGreetingButton = (ImageButton) findViewById(R.id.change_greeting_button);
+    changeGreetingButton.setOnClickListener(
+        new OnClickListener() {
+          @Override
+          public void onClick(View v) {
+            // TODO(sabowitz): Implement this in CL child beta01.
+          }
+        });
+
+    playButton = (ImageButton) findViewById(R.id.play_button);
+    playButton.setOnClickListener(
+        new OnClickListener() {
+          @Override
+          public void onClick(View v) {
+            // TODO(sabowitz): Finish implementing this in CL child beta02.
+          }
+        });
+
+    displayCurrentVoicemailGreetingStatus();
+  }
+
+  @Override
+  public void onStart() {
+    ActivityCompat.requestPermissions(
+        this, new String[] {Manifest.permission.RECORD_AUDIO}, REQUEST_RECORD_AUDIO_PERMISSION);
+
+    if (isGreetingRecorded()) {
+      mediaPlayer = new MediaPlayer();
+      try {
+        mediaPlayer.setDataSource(voicemailGreetingFilePath);
+        mediaPlayer.prepare();
+      } catch (IOException e) {
+        LogUtil.e("CurrentVoicemailGreetingActivity.onStart", "mediaPlayer setup failed.");
+      }
+    }
+    super.onStart();
+  }
+
+  @Override
+  public void onPause() {
+    if (isGreetingRecorded()) {
+      if (mediaPlayer.isPlaying()) {
+        mediaPlayer.release();
+        mediaPlayer = null;
+      }
+    }
+    super.onPause();
+  }
+
+  @Override
+  public void onRequestPermissionsResult(
+      int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+    super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+
+    if (requestCode == REQUEST_RECORD_AUDIO_PERMISSION) {
+      permissionToRecordAccepted = grantResults[0] == PackageManager.PERMISSION_GRANTED;
+    }
+    if (!permissionToRecordAccepted) {
+      LogUtil.w(
+          "CurrentVoicemailGreetingActivity.onRequestPermissionsResult",
+          "permissionToRecordAccepted = false.");
+      // TODO(sabowitz): Implement error dialog logic in a child CL.
+    }
+  }
+
+  private boolean isGreetingRecorded() {
+    Intent intent = getIntent();
+    if (intent.hasExtra(VOICEMAIL_GREETING_FILEPATH_KEY)) {
+      String filePathProxy = intent.getStringExtra(VOICEMAIL_GREETING_FILEPATH_KEY);
+      if (filePathProxy == null || filePathProxy.length() == 0) {
+        return false;
+      }
+      if (mediaPlayer == null) {
+        mediaPlayer = new MediaPlayer();
+      }
+      try {
+        mediaPlayer.setDataSource(filePathProxy);
+        int durationProxy = mediaPlayer.getDuration();
+        greetingDuration = durationProxy;
+        voicemailGreetingFilePath = filePathProxy;
+        mediaPlayer = null;
+        return true;
+      } catch (IOException e) {
+        LogUtil.e("CurrentVoicemailGreetingActivity.isGreetingRecorded", "bad filepath.");
+        mediaPlayer = null;
+        return false;
+      }
+    }
+    return false;
+  }
+
+  private void displayCurrentVoicemailGreetingStatus() {
+    if (isGreetingRecorded()) {
+      String durationLabel = String.format(Locale.US, "00:%d", greetingDuration);
+      playbackProgressLabel.setText(durationLabel);
+    } else {
+      playbackDisplay.setVisibility(View.GONE);
+    }
+  }
+}
diff --git a/java/com/android/dialer/voicemail/settings/RecordButton.java b/java/com/android/dialer/voicemail/settings/RecordButton.java
new file mode 100644
index 0000000..ac64cde
--- /dev/null
+++ b/java/com/android/dialer/voicemail/settings/RecordButton.java
@@ -0,0 +1,187 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.dialer.voicemail.settings;
+
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
+import android.graphics.Rect;
+import android.graphics.RectF;
+import android.graphics.drawable.Drawable;
+import android.graphics.drawable.LayerDrawable;
+import android.support.v4.content.ContextCompat;
+import android.util.AttributeSet;
+import android.widget.Button;
+import com.android.dialer.voicemail.settings.RecordVoicemailGreetingActivity.ButtonState;
+
+/** Custom Button View for Dialer voicemail greeting recording */
+public class RecordButton extends Button {
+
+  private final float trackWidth = getResources().getDimensionPixelSize(R.dimen.track_width);
+  private final int centerIconRadius =
+      getResources().getDimensionPixelSize(R.dimen.center_icon_radius);
+  private final int secondaryTrackAlpha = 64;
+
+  private float mainTrackFraction;
+  private float secondaryTrackFraction;
+
+  private Rect centerIconRect;
+  private RectF bodyRect;
+
+  private Drawable readyDrawable;
+  private Drawable recordingDrawable;
+  private Drawable recordedDrawable;
+  private Drawable playingDrawable;
+  private Drawable currentCenterDrawable;
+
+  private Paint mainTrackPaint;
+  private Paint secondaryTrackPaint;
+
+  public RecordButton(Context context) {
+    super(context);
+    init();
+  }
+
+  public RecordButton(Context context, AttributeSet attrs) {
+    super(context, attrs);
+    init();
+  }
+
+  public RecordButton(Context context, AttributeSet attrs, int defStyle) {
+    super(context, attrs, defStyle);
+    init();
+  }
+
+  /**
+   * Updates bounds for main and secondary tracks and the size of the center Drawable based on View
+   * resizing
+   */
+  @Override
+  protected void onSizeChanged(int width, int height, int oldWidth, int oldHeight) {
+    // Canvas.drawArc() method draws from center of stroke, so the trackWidth must be accounted for
+    float viewRadius = Math.min(width, height) / 2f - trackWidth;
+    float centerX = width / 2f;
+    float centerY = viewRadius + trackWidth / 2f;
+
+    bodyRect =
+        new RectF(
+            centerX - viewRadius, centerY - viewRadius, centerX + viewRadius, centerY + viewRadius);
+
+    centerIconRect =
+        new Rect(
+            (int) centerX - centerIconRadius,
+            (int) centerY - centerIconRadius,
+            (int) centerX + centerIconRadius,
+            (int) centerY + centerIconRadius);
+  }
+
+  private void init() {
+    readyDrawable = ContextCompat.getDrawable(getContext(), R.drawable.start_recording_drawable);
+    recordingDrawable = ContextCompat.getDrawable(getContext(), R.drawable.stop_recording_drawable);
+    recordedDrawable = ContextCompat.getDrawable(getContext(), R.drawable.start_playback_drawable);
+    playingDrawable = ContextCompat.getDrawable(getContext(), R.drawable.stop_playback_drawable);
+
+    fixQuantumIconTint(Color.WHITE);
+
+    mainTrackPaint = getBasePaint(R.color.dialer_call_green);
+    secondaryTrackPaint = getBasePaint(R.color.dialer_call_green);
+    secondaryTrackPaint.setAlpha(secondaryTrackAlpha);
+
+    setState(RecordVoicemailGreetingActivity.RECORD_GREETING_INIT);
+  }
+
+  private void fixQuantumIconTint(int color) {
+    Drawable playArrow = ((LayerDrawable) recordedDrawable).findDrawableByLayerId(R.id.play_icon);
+    playArrow.mutate().setTint(color);
+    ((LayerDrawable) recordedDrawable).setDrawableByLayerId(R.id.play_icon, playArrow);
+
+    Drawable micIcon = ((LayerDrawable) readyDrawable).findDrawableByLayerId(R.id.record_icon);
+    micIcon.mutate().setTint(color);
+    ((LayerDrawable) readyDrawable).setDrawableByLayerId(R.id.record_icon, micIcon);
+  }
+
+  /** Returns Paint with base attributes for drawing the main and secondary tracks */
+  private Paint getBasePaint(int id) {
+    Paint paint = new Paint();
+    paint.setAntiAlias(true);
+    paint.setStrokeWidth(trackWidth);
+    paint.setStrokeCap(Paint.Cap.ROUND);
+    paint.setStyle(Paint.Style.STROKE);
+    paint.setColor(ContextCompat.getColor(getContext(), id));
+    return paint;
+  }
+
+  /** Sets the fraction value of progress tracks, this will trigger a redraw of the button. */
+  public void setTracks(float mainTrackFraction, float secondaryTrackFraction) {
+    this.mainTrackFraction = mainTrackFraction;
+    this.secondaryTrackFraction = secondaryTrackFraction;
+    invalidate();
+  }
+
+  /**
+   * Sets internal state of RecordButton. This will also trigger UI refresh of the button to reflect
+   * the new state.
+   */
+  public void setState(@ButtonState int state) {
+    switch (state) {
+      case RecordVoicemailGreetingActivity.RECORD_GREETING_INIT:
+        mainTrackPaint = getBasePaint(R.color.dialer_call_green);
+        secondaryTrackPaint = getBasePaint(R.color.dialer_call_green);
+        secondaryTrackPaint.setAlpha(secondaryTrackAlpha);
+        currentCenterDrawable = readyDrawable;
+        break;
+      case RecordVoicemailGreetingActivity.RECORD_GREETING_PLAYING_BACK:
+        mainTrackPaint = getBasePaint(R.color.google_blue_500);
+        secondaryTrackPaint = getBasePaint(R.color.google_blue_50);
+        currentCenterDrawable = playingDrawable;
+        break;
+      case RecordVoicemailGreetingActivity.RECORD_GREETING_RECORDED:
+        mainTrackPaint = getBasePaint(R.color.google_blue_500);
+        secondaryTrackPaint = getBasePaint(R.color.google_blue_50);
+        currentCenterDrawable = recordedDrawable;
+        break;
+      case RecordVoicemailGreetingActivity.RECORD_GREETING_RECORDING:
+        mainTrackPaint = getBasePaint(R.color.dialer_red);
+        secondaryTrackPaint = getBasePaint(R.color.dialer_red);
+        secondaryTrackPaint.setAlpha(secondaryTrackAlpha);
+        currentCenterDrawable = recordingDrawable;
+        break;
+      default:
+        throw new RuntimeException("Invalid button state");
+    }
+    refreshDrawableState();
+    invalidate();
+  }
+
+  /**
+   * Handles drawing the main and secondary track arcs and the center Drawable image based on track
+   * fractions and the Button's current state
+   */
+  @Override
+  protected void onDraw(Canvas canvas) {
+    super.onDraw(canvas);
+
+    canvas.drawArc(bodyRect, -90, secondaryTrackFraction * 360, false, secondaryTrackPaint);
+    canvas.drawArc(bodyRect, -90, mainTrackFraction * 360, false, mainTrackPaint);
+
+    // TODO(marquelle) - Add pulse
+
+    currentCenterDrawable.setBounds(centerIconRect);
+    currentCenterDrawable.draw(canvas);
+  }
+}
diff --git a/java/com/android/dialer/voicemail/settings/RecordVoicemailGreetingActivity.java b/java/com/android/dialer/voicemail/settings/RecordVoicemailGreetingActivity.java
new file mode 100644
index 0000000..89e45dc
--- /dev/null
+++ b/java/com/android/dialer/voicemail/settings/RecordVoicemailGreetingActivity.java
@@ -0,0 +1,122 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.dialer.voicemail.settings;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.support.annotation.IntDef;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.Button;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+/** Activity for recording a new voicemail greeting */
+public class RecordVoicemailGreetingActivity extends Activity implements OnClickListener {
+
+  /** Possible states of RecordButton and RecordVoicemailGreetingActivity */
+  @Retention(RetentionPolicy.SOURCE)
+  @IntDef({
+    RECORD_GREETING_INIT,
+    RECORD_GREETING_RECORDING,
+    RECORD_GREETING_RECORDED,
+    RECORD_GREETING_PLAYING_BACK
+  })
+  public @interface ButtonState {}
+
+  public static final int RECORD_GREETING_INIT = 1;
+  public static final int RECORD_GREETING_RECORDING = 2;
+  public static final int RECORD_GREETING_RECORDED = 3;
+  public static final int RECORD_GREETING_PLAYING_BACK = 4;
+  public static final int MAX_GREETING_DURATION_MS = 45000;
+
+  private int currentState;
+  private int duration;
+  private RecordButton recordButton;
+  private Button saveButton;
+  private Button redoButton;
+
+  @Override
+  protected void onCreate(Bundle savedInstanceState) {
+    super.onCreate(savedInstanceState);
+    setContentView(R.layout.activity_record_voicemail_greeting);
+
+    recordButton = findViewById(R.id.record_button);
+    saveButton = findViewById(R.id.save_button);
+    redoButton = findViewById(R.id.redo_button);
+
+    duration = 0;
+    setState(RECORD_GREETING_INIT);
+    recordButton.setOnClickListener(this);
+  }
+
+  @Override
+  public void onClick(View v) {
+    if (v == recordButton) {
+      switch (currentState) {
+        case RECORD_GREETING_INIT:
+          setState(RECORD_GREETING_RECORDING);
+          break;
+        case RECORD_GREETING_RECORDED:
+          setState(RECORD_GREETING_PLAYING_BACK);
+          break;
+        case RECORD_GREETING_RECORDING:
+        case RECORD_GREETING_PLAYING_BACK:
+          setState(RECORD_GREETING_RECORDED);
+          break;
+        default:
+          break;
+      }
+    }
+  }
+
+  private void setState(@ButtonState int state) {
+    currentState = state;
+
+    switch (state) {
+      case RECORD_GREETING_INIT:
+        recordButton.setState(state);
+        recordButton.setTracks(0, 0);
+        setSaveRedoButtonsEnabled(false);
+        break;
+      case RECORD_GREETING_PLAYING_BACK:
+      case RECORD_GREETING_RECORDED:
+        recordButton.setState(state);
+        recordButton.setTracks(0, (float) duration / MAX_GREETING_DURATION_MS);
+        setSaveRedoButtonsEnabled(true);
+        break;
+      case RECORD_GREETING_RECORDING:
+        recordButton.setState(state);
+        recordButton.setTracks(0, 1f);
+        setSaveRedoButtonsEnabled(false);
+        break;
+      default:
+        break;
+    }
+  }
+
+  /** Enables/Disables save and redo buttons in the layout */
+  private void setSaveRedoButtonsEnabled(boolean enabled) {
+    if (enabled) {
+      saveButton.setVisibility(View.VISIBLE);
+      redoButton.setVisibility(View.VISIBLE);
+    } else {
+      saveButton.setVisibility(View.GONE);
+      redoButton.setVisibility(View.GONE);
+    }
+  }
+}
diff --git a/java/com/android/dialer/voicemail/settings/VoicemailSettingsFragment.java b/java/com/android/dialer/voicemail/settings/VoicemailSettingsFragment.java
index 5ae26f5..1eb831f 100644
--- a/java/com/android/dialer/voicemail/settings/VoicemailSettingsFragment.java
+++ b/java/com/android/dialer/voicemail/settings/VoicemailSettingsFragment.java
@@ -25,6 +25,7 @@
 import android.preference.PreferenceScreen;
 import android.preference.SwitchPreference;
 import android.provider.Settings;
+import android.support.annotation.IntDef;
 import android.support.annotation.Nullable;
 import android.support.annotation.VisibleForTesting;
 import android.telecom.PhoneAccount;
@@ -34,14 +35,19 @@
 import android.telephony.TelephonyManager;
 import com.android.dialer.common.Assert;
 import com.android.dialer.common.LogUtil;
+import com.android.dialer.common.preference.SwitchPreferenceWithClickableSummary;
+import com.android.dialer.configprovider.ConfigProviderComponent;
 import com.android.dialer.logging.DialerImpression;
 import com.android.dialer.logging.Logger;
 import com.android.dialer.notification.NotificationChannelManager;
+import com.android.dialer.spannable.ContentWithLearnMoreSpanner;
 import com.android.dialer.telecom.TelecomUtil;
 import com.android.voicemail.VoicemailClient;
 import com.android.voicemail.VoicemailClient.ActivationStateListener;
 import com.android.voicemail.VoicemailComponent;
 import com.google.common.base.Optional;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
 
 /**
  * Fragment for voicemail settings. Requires {@link VoicemailClient#PARAM_PHONE_ACCOUNT_HANDLE} set
@@ -51,8 +57,6 @@
 public class VoicemailSettingsFragment extends PreferenceFragment
     implements Preference.OnPreferenceChangeListener, ActivationStateListener {
 
-  private static final String TAG = "VmSettingsActivity";
-
   // Extras copied from com.android.phone.settings.VoicemailSettingsActivity,
   // it does not recognize EXTRA_PHONE_ACCOUNT_HANDLE in O.
   @VisibleForTesting
@@ -63,21 +67,24 @@
   static final String SUB_LABEL_EXTRA =
       "com.android.phone.settings.SubscriptionInfoHelper.SubscriptionLabel";
 
+  private static final String TAG = "VmSettingsActivity";
   @Nullable private PhoneAccountHandle phoneAccountHandle;
-
   private VoicemailClient voicemailClient;
-
+  // Settings that are independent of the carrier configurations
   private Preference voicemailNotificationPreference;
-  private SwitchPreference voicemailVisualVoicemail;
-  private SwitchPreference autoArchiveSwitchPreference;
-  private SwitchPreference donateVoicemailSwitchPreference;
+  private Preference changeGreetingPreference;
+  private PreferenceScreen advancedSettingsPreference;
+  // Settings that are supported by dialer only if the carrier configurations are valid.
+  private SwitchPreference visualVoicemailPreference;
+  private SwitchPreference voicemailAutoArchivePreference;
+  private SwitchPreferenceWithClickableSummary transcribeVoicemailPreference;
+  // Voicemail transcription analysis toggle
+  private SwitchPreferenceWithClickableSummary donateTranscribedVoicemailPreference;
   private Preference voicemailChangePinPreference;
-  private PreferenceScreen advancedSettings;
 
   @Override
   public void onCreate(Bundle icicle) {
     super.onCreate(icicle);
-
     phoneAccountHandle =
         Assert.isNotNull(getArguments().getParcelable(VoicemailClient.PARAM_PHONE_ACCOUNT_HANDLE));
     voicemailClient = VoicemailComponent.get(getContext()).getVoicemailClient();
@@ -95,10 +102,200 @@
 
     addPreferencesFromResource(R.xml.voicemail_settings);
 
-    PreferenceScreen prefSet = getPreferenceScreen();
+    initializeXmlPreferences();
 
+    setupVisualVoicemailPreferences();
+
+    setupNotificationsPreference();
+    setupChangeGreetingPreference();
+    setupAdvancedSettingsPreference();
+  }
+
+  private void setupVisualVoicemailPreferences() {
+    if (!voicemailClient.hasCarrierSupport(getContext(), phoneAccountHandle)) {
+      removeAllVisualVoicemailPreferences();
+      return;
+    }
+
+    setupVisualVoicemailPreference();
+
+    setupVisualVoicemailFeaturePreferences();
+
+    setupVoicemailChangePinPreference();
+  }
+
+  private void setupVisualVoicemailFeaturePreferences() {
+    if (!voicemailClient.isVoicemailEnabled(getContext(), phoneAccountHandle)
+        || !voicemailClient.isActivated(getContext(), phoneAccountHandle)) {
+      removeAllTranscriptionPreferences();
+      getPreferenceScreen().removePreference(voicemailAutoArchivePreference);
+      return;
+    }
+    setupAutoArchivePreference();
+    updateTranscriptionPreferences();
+  }
+
+  private void updateTranscriptionPreferences() {
+    if (!VoicemailComponent.get(getContext())
+        .getVoicemailClient()
+        .isVoicemailTranscriptionAvailable(getContext(), phoneAccountHandle)) {
+      removeAllTranscriptionPreferences();
+      return;
+    } else {
+      showTranscriptionEnabledPreference();
+      updateTranscriptionDonationPreference();
+    }
+  }
+
+  private void showTranscriptionEnabledPreference() {
+    transcribeVoicemailPreference.setOnPreferenceChangeListener(this);
+    transcribeVoicemailPreference.setChecked(
+        voicemailClient.isVoicemailTranscriptionEnabled(getContext(), phoneAccountHandle));
+    transcribeVoicemailPreference.setSummary(getVoicemailTranscriptionInformationalText());
+    transcribeVoicemailPreference.setEnabled(true);
+    getPreferenceScreen().addPreference(transcribeVoicemailPreference);
+  }
+
+  /**
+   * Builds a spannable string containing the voicemail transcription informational text containing
+   * the appropriate "Learn More" urls.
+   *
+   * @return The voicemail transcription information text.
+   */
+  private CharSequence getVoicemailTranscriptionInformationalText() {
+    return new ContentWithLearnMoreSpanner(getContext())
+        .create(
+            getContext().getString(R.string.voicemail_transcription_preference_summary_info),
+            getContext().getString(R.string.transcription_learn_more_url));
+  }
+
+  private void updateTranscriptionDonationPreference() {
+    if (!VoicemailComponent.get(getContext())
+        .getVoicemailClient()
+        .isVoicemailDonationAvailable(getContext(), phoneAccountHandle)) {
+      getPreferenceScreen().removePreference(donateTranscribedVoicemailPreference);
+    } else {
+      showTranscriptionDonationEnabledPreferences();
+    }
+  }
+
+  private void showTranscriptionDonationEnabledPreferences() {
+    donateTranscribedVoicemailPreference.setEnabled(true);
+    donateTranscribedVoicemailPreference.setChecked(
+        voicemailClient.isVoicemailDonationEnabled(getContext(), phoneAccountHandle));
+    donateTranscribedVoicemailPreference.setOnPreferenceChangeListener(this);
+    donateTranscribedVoicemailPreference.setSummary(
+        getVoicemailTranscriptionDonationInformationalText());
+    getPreferenceScreen().addPreference(donateTranscribedVoicemailPreference);
+  }
+
+  /**
+   * Builds a spannable string containing the voicemail donation informational text containing the
+   * appropriate "Learn More" urls.
+   *
+   * @return The voicemail donation information text.
+   */
+  private CharSequence getVoicemailTranscriptionDonationInformationalText() {
+    return new ContentWithLearnMoreSpanner(getContext())
+        .create(
+            getContext().getString(R.string.voicemail_donate_preference_summary_info),
+            getContext().getString(R.string.donation_learn_more_url));
+  }
+
+  private void removeAllTranscriptionPreferences() {
+    getPreferenceScreen().removePreference(transcribeVoicemailPreference);
+    getPreferenceScreen().removePreference(donateTranscribedVoicemailPreference);
+  }
+
+  private void setupAutoArchivePreference() {
+    if (!VoicemailComponent.get(getContext())
+        .getVoicemailClient()
+        .isVoicemailArchiveAvailable(getContext())) {
+      getPreferenceScreen().removePreference(voicemailAutoArchivePreference);
+    } else {
+      voicemailAutoArchivePreference.setOnPreferenceChangeListener(this);
+      voicemailAutoArchivePreference.setChecked(
+          voicemailClient.isVoicemailArchiveEnabled(getContext(), phoneAccountHandle));
+    }
+  }
+
+  private void setupVisualVoicemailPreference() {
+    visualVoicemailPreference.setOnPreferenceChangeListener(this);
+    visualVoicemailPreference.setChecked(
+        voicemailClient.isVoicemailEnabled(getContext(), phoneAccountHandle));
+    updateVoicemailSummaryMessage();
+  }
+
+  /** The preferences that are present in the voicemail_settings.xml file are initialized here. */
+  private void initializeXmlPreferences() {
     voicemailNotificationPreference =
         findPreference(getString(R.string.voicemail_notifications_key));
+    voicemailNotificationPreference.setOrder(VMSettingOrdering.NOTIFICATIONS);
+
+    changeGreetingPreference = findPreference(getString(R.string.voicemail_change_greeting_key));
+    changeGreetingPreference.setOrder(VMSettingOrdering.CHANGE_GREETING);
+
+    advancedSettingsPreference =
+        (PreferenceScreen) findPreference(getString(R.string.voicemail_advanced_settings_key));
+    advancedSettingsPreference.setOrder(VMSettingOrdering.ADVANCED_SETTING);
+
+    visualVoicemailPreference =
+        (SwitchPreference) findPreference(getString(R.string.voicemail_visual_voicemail_key));
+    visualVoicemailPreference.setOrder(VMSettingOrdering.VISUAL_VOICEMAIL);
+
+    voicemailAutoArchivePreference =
+        (SwitchPreference)
+            findPreference(getString(R.string.voicemail_visual_voicemail_archive_key));
+    voicemailAutoArchivePreference.setOrder(VMSettingOrdering.VOICEMAIL_AUTO_ARCHIVE);
+
+    transcribeVoicemailPreference =
+        (SwitchPreferenceWithClickableSummary)
+            findPreference(getString(R.string.voicemail_visual_voicemail_transcription_key));
+    transcribeVoicemailPreference.setOrder(VMSettingOrdering.VOICEMAIL_TRANSCRIPTION);
+
+    donateTranscribedVoicemailPreference =
+        (SwitchPreferenceWithClickableSummary)
+            findPreference(getString(R.string.voicemail_visual_voicemail_donation_key));
+    donateTranscribedVoicemailPreference.setOrder(
+        VMSettingOrdering.VOICEMAIL_TRANSCRIPTION_DONATION);
+
+    voicemailChangePinPreference = findPreference(getString(R.string.voicemail_change_pin_key));
+    voicemailChangePinPreference.setOrder(VMSettingOrdering.VOICEMAIL_CHANGE_PIN);
+  }
+
+  /** Removes vvm settings since the carrier setup is not supported by Dialer */
+  private void removeAllVisualVoicemailPreferences() {
+    PreferenceScreen prefSet = getPreferenceScreen();
+    prefSet.removePreference(visualVoicemailPreference);
+    prefSet.removePreference(voicemailAutoArchivePreference);
+    prefSet.removePreference(transcribeVoicemailPreference);
+    prefSet.removePreference(donateTranscribedVoicemailPreference);
+    prefSet.removePreference(voicemailChangePinPreference);
+  }
+
+  private void setupVoicemailChangePinPreference() {
+    Intent changePinIntent = new Intent(new Intent(getContext(), VoicemailChangePinActivity.class));
+    changePinIntent.putExtra(VoicemailClient.PARAM_PHONE_ACCOUNT_HANDLE, phoneAccountHandle);
+
+    voicemailChangePinPreference.setIntent(changePinIntent);
+    voicemailChangePinPreference.setOnPreferenceClickListener(
+        new OnPreferenceClickListener() {
+          @Override
+          public boolean onPreferenceClick(Preference preference) {
+            Logger.get(getContext()).logImpression(DialerImpression.Type.VVM_CHANGE_PIN_CLICKED);
+            // Let the preference handle the click.
+            return false;
+          }
+        });
+    if (VoicemailChangePinActivity.isPinScrambled(getContext(), phoneAccountHandle)) {
+      voicemailChangePinPreference.setTitle(R.string.voicemail_set_pin_preference_title);
+    } else {
+      voicemailChangePinPreference.setTitle(R.string.voicemail_change_pin_preference_title);
+    }
+    updateChangePinPreference();
+  }
+
+  private void setupNotificationsPreference() {
     voicemailNotificationPreference.setIntent(getNotificationSettingsIntent());
 
     voicemailNotificationPreference.setOnPreferenceClickListener(
@@ -106,81 +303,26 @@
           @Override
           public boolean onPreferenceClick(Preference preference) {
             Logger.get(getContext())
-                .logImpression(DialerImpression.Type.VVM_CHANGE_RINGTONE_CLICKED);
+                .logImpression(DialerImpression.Type.VVM_NOTIFICATIONS_SETTING_CLICKED);
             // Let the preference handle the click.
             return false;
           }
         });
+  }
 
-    voicemailVisualVoicemail =
-        (SwitchPreference) findPreference(getString(R.string.voicemail_visual_voicemail_key));
-
-    autoArchiveSwitchPreference =
-        (SwitchPreference)
-            findPreference(getString(R.string.voicemail_visual_voicemail_archive_key));
-
-    donateVoicemailSwitchPreference =
-        (SwitchPreference)
-            findPreference(getString(R.string.voicemail_visual_voicemail_donation_key));
-
-    if (!VoicemailComponent.get(getContext())
-        .getVoicemailClient()
-        .isVoicemailArchiveAvailable(getContext())) {
-      getPreferenceScreen().removePreference(autoArchiveSwitchPreference);
+  private void setupChangeGreetingPreference() {
+    if (!ConfigProviderComponent.get(getContext())
+        .getConfigProvider()
+        .getBoolean("voicemail_change_greeting_enabled", false)) {
+      getPreferenceScreen().removePreference(changeGreetingPreference);
+      return;
     }
 
-    if (!VoicemailComponent.get(getContext())
-        .getVoicemailClient()
-        .isVoicemailDonationAvailable(getContext())) {
-      getPreferenceScreen().removePreference(donateVoicemailSwitchPreference);
-    }
+    Intent changeGreetingIntent = new Intent(getContext(), CurrentVoicemailGreetingActivity.class);
+    changeGreetingPreference.setIntent(changeGreetingIntent);
+  }
 
-    voicemailChangePinPreference = findPreference(getString(R.string.voicemail_change_pin_key));
-
-    if (voicemailClient.hasCarrierSupport(getContext(), phoneAccountHandle)) {
-      Assert.isNotNull(phoneAccountHandle);
-      Intent changePinIntent =
-          new Intent(new Intent(getContext(), VoicemailChangePinActivity.class));
-      changePinIntent.putExtra(VoicemailClient.PARAM_PHONE_ACCOUNT_HANDLE, phoneAccountHandle);
-
-      voicemailChangePinPreference.setIntent(changePinIntent);
-      voicemailChangePinPreference.setOnPreferenceClickListener(
-          new OnPreferenceClickListener() {
-            @Override
-            public boolean onPreferenceClick(Preference preference) {
-              Logger.get(getContext()).logImpression(DialerImpression.Type.VVM_CHANGE_PIN_CLICKED);
-              // Let the preference handle the click.
-              return false;
-            }
-          });
-      if (VoicemailChangePinActivity.isPinScrambled(getContext(), phoneAccountHandle)) {
-        voicemailChangePinPreference.setTitle(R.string.voicemail_set_pin_preference_title);
-      } else {
-        voicemailChangePinPreference.setTitle(R.string.voicemail_change_pin_preference_title);
-      }
-      updateChangePin();
-
-      voicemailVisualVoicemail.setOnPreferenceChangeListener(this);
-      voicemailVisualVoicemail.setChecked(
-          voicemailClient.isVoicemailEnabled(getContext(), phoneAccountHandle));
-
-      autoArchiveSwitchPreference.setOnPreferenceChangeListener(this);
-      autoArchiveSwitchPreference.setChecked(
-          voicemailClient.isVoicemailArchiveEnabled(getContext(), phoneAccountHandle));
-
-      donateVoicemailSwitchPreference.setOnPreferenceChangeListener(this);
-      donateVoicemailSwitchPreference.setChecked(
-          voicemailClient.isVoicemailDonationEnabled(getContext(), phoneAccountHandle));
-      updateDonateVoicemail();
-    } else {
-      prefSet.removePreference(voicemailVisualVoicemail);
-      prefSet.removePreference(autoArchiveSwitchPreference);
-      prefSet.removePreference(donateVoicemailSwitchPreference);
-      prefSet.removePreference(voicemailChangePinPreference);
-    }
-
-    advancedSettings =
-        (PreferenceScreen) findPreference(getString(R.string.voicemail_advanced_settings_key));
+  private void setupAdvancedSettingsPreference() {
     Intent advancedSettingsIntent = new Intent(TelephonyManager.ACTION_CONFIGURE_VOICEMAIL);
     advancedSettingsIntent.putExtra(TelephonyManager.EXTRA_HIDE_PUBLIC_SETTINGS, true);
     advancedSettingsIntent.putExtra(
@@ -198,8 +340,9 @@
       }
     }
 
-    advancedSettings.setIntent(advancedSettingsIntent);
-    voicemailChangePinPreference.setOnPreferenceClickListener(
+    advancedSettingsPreference.setIntent(advancedSettingsIntent);
+
+    advancedSettingsPreference.setOnPreferenceClickListener(
         new OnPreferenceClickListener() {
           @Override
           public boolean onPreferenceClick(Preference preference) {
@@ -226,7 +369,7 @@
   @Override
   public boolean onPreferenceChange(Preference preference, Object objValue) {
     LogUtil.d(TAG, "onPreferenceChange: \"" + preference + "\" changed to \"" + objValue + "\"");
-    if (preference.getKey().equals(voicemailVisualVoicemail.getKey())) {
+    if (preference.getKey().equals(visualVoicemailPreference.getKey())) {
       boolean isEnabled = (boolean) objValue;
       if (!isEnabled) {
         showDisableConfirmationDialog();
@@ -235,12 +378,17 @@
       } else {
         updateVoicemailEnabled(true);
       }
-    } else if (preference.getKey().equals(autoArchiveSwitchPreference.getKey())) {
+    } else if (preference.getKey().equals(voicemailAutoArchivePreference.getKey())) {
       logArchiveToggle((boolean) objValue);
       voicemailClient.setVoicemailArchiveEnabled(
           getContext(), phoneAccountHandle, (boolean) objValue);
-    } else if (preference.getKey().equals(donateVoicemailSwitchPreference.getKey())) {
-      logArchiveToggle((boolean) objValue);
+    } else if (preference.getKey().equals(transcribeVoicemailPreference.getKey())) {
+      logTranscribeToggle((boolean) objValue);
+      voicemailClient.setVoicemailTranscriptionEnabled(
+          getContext(), phoneAccountHandle, (boolean) objValue);
+      updateTranscriptionDonationPreference();
+    } else if (preference.getKey().equals(donateTranscribedVoicemailPreference.getKey())) {
+      logDonationToggle((boolean) objValue);
       voicemailClient.setVoicemailDonationEnabled(
           getContext(), phoneAccountHandle, (boolean) objValue);
     }
@@ -251,19 +399,19 @@
 
   private void updateVoicemailEnabled(boolean isEnabled) {
     voicemailClient.setVoicemailEnabled(getContext(), phoneAccountHandle, isEnabled);
-    voicemailVisualVoicemail.setChecked(isEnabled);
+    visualVoicemailPreference.setChecked(isEnabled);
 
     if (isEnabled) {
       Logger.get(getContext()).logImpression(DialerImpression.Type.VVM_USER_ENABLED_IN_SETTINGS);
     } else {
       Logger.get(getContext()).logImpression(DialerImpression.Type.VVM_USER_DISABLED_IN_SETTINGS);
     }
-
-    updateChangePin();
-    updateDonateVoicemail();
+    updateVoicemailSummaryMessage();
+    updateTranscriptionPreferences();
+    updateChangePinPreference();
   }
 
-  private void updateChangePin() {
+  private void updateChangePinPreference() {
     if (!voicemailClient.isVoicemailEnabled(getContext(), phoneAccountHandle)) {
       voicemailChangePinPreference.setSummary(
           R.string.voicemail_change_pin_preference_summary_disable);
@@ -278,21 +426,6 @@
     }
   }
 
-  private void updateDonateVoicemail() {
-    if (!voicemailClient.isVoicemailEnabled(getContext(), phoneAccountHandle)) {
-      donateVoicemailSwitchPreference.setSummary(
-          R.string.voicemail_donate_preference_summary_disable);
-      donateVoicemailSwitchPreference.setEnabled(false);
-    } else if (!voicemailClient.isActivated(getContext(), phoneAccountHandle)) {
-      donateVoicemailSwitchPreference.setSummary(
-          R.string.voicemail_donate_preference_summary_not_activated);
-      donateVoicemailSwitchPreference.setEnabled(false);
-    } else {
-      donateVoicemailSwitchPreference.setSummary(R.string.voicemail_donate_preference_summary_info);
-      donateVoicemailSwitchPreference.setEnabled(true);
-    }
-  }
-
   private void logArchiveToggle(boolean userTurnedOn) {
     if (userTurnedOn) {
       Logger.get(getContext())
@@ -303,11 +436,45 @@
     }
   }
 
+  private void logTranscribeToggle(boolean userTurnedOn) {
+    if (userTurnedOn) {
+      Logger.get(getContext())
+          .logImpression(DialerImpression.Type.VVM_USER_TURNED_TRANSCRIBE_ON_FROM_SETTINGS);
+    } else {
+      Logger.get(getContext())
+          .logImpression(DialerImpression.Type.VVM_USER_TURNED_TRANSCRIBE_OFF_FROM_SETTINGS);
+    }
+  }
+
+  private void logDonationToggle(boolean userTurnedOn) {
+    if (userTurnedOn) {
+      Logger.get(getContext())
+          .logImpression(DialerImpression.Type.VVM_USER_TURNED_TRANSCRIBE_ON_FROM_SETTINGS);
+    } else {
+      Logger.get(getContext())
+          .logImpression(DialerImpression.Type.VVM_USER_TURNED_TRANSCRIBE_OFF_FROM_SETTINGS);
+    }
+  }
+
   @Override
   public void onActivationStateChanged(PhoneAccountHandle phoneAccountHandle, boolean isActivated) {
     if (this.phoneAccountHandle.equals(phoneAccountHandle)) {
-      updateChangePin();
-      updateDonateVoicemail();
+      updateVoicemailSummaryMessage();
+      updateTranscriptionPreferences();
+      updateChangePinPreference();
+    }
+  }
+
+  /**
+   * Shows the activating message while visual voicemail is being activated. This is useful, since
+   * some toggles do not show up, until voicemail is activated e.g transcription and rating.
+   */
+  private void updateVoicemailSummaryMessage() {
+    if (voicemailClient.isVoicemailEnabled(getContext(), phoneAccountHandle)
+        && !voicemailClient.isActivated(getContext(), phoneAccountHandle)) {
+      visualVoicemailPreference.setSummary(R.string.voicemail_activating_summary_info);
+    } else {
+      visualVoicemailPreference.setSummary("");
     }
   }
 
@@ -348,4 +515,27 @@
     builder.setCancelable(true);
     builder.show();
   }
+
+  /** The ordering in which to show the voicemail settings */
+  @Retention(RetentionPolicy.SOURCE)
+  @IntDef({
+    VMSettingOrdering.NOTIFICATIONS,
+    VMSettingOrdering.VISUAL_VOICEMAIL,
+    VMSettingOrdering.VOICEMAIL_TRANSCRIPTION,
+    VMSettingOrdering.VOICEMAIL_TRANSCRIPTION_DONATION,
+    VMSettingOrdering.VOICEMAIL_CHANGE_PIN,
+    VMSettingOrdering.VOICEMAIL_AUTO_ARCHIVE,
+    VMSettingOrdering.ADVANCED_SETTING,
+    VMSettingOrdering.CHANGE_GREETING
+  })
+  private @interface VMSettingOrdering {
+    int NOTIFICATIONS = 1;
+    int VISUAL_VOICEMAIL = 2;
+    int VOICEMAIL_TRANSCRIPTION = 3;
+    int VOICEMAIL_TRANSCRIPTION_DONATION = 4;
+    int VOICEMAIL_CHANGE_PIN = 5;
+    int VOICEMAIL_AUTO_ARCHIVE = 6;
+    int ADVANCED_SETTING = 7;
+    int CHANGE_GREETING = 8;
+  }
 }
diff --git a/java/com/android/dialer/voicemail/settings/res/drawable-xhdpi/ic_arrow_back_grey600_48dp.png b/java/com/android/dialer/voicemail/settings/res/drawable-xhdpi/ic_arrow_back_grey600_48dp.png
new file mode 100644
index 0000000..0a379b4
--- /dev/null
+++ b/java/com/android/dialer/voicemail/settings/res/drawable-xhdpi/ic_arrow_back_grey600_48dp.png
Binary files differ
diff --git a/java/com/android/dialer/voicemail/settings/res/drawable-xhdpi/ic_circles_add_googblue_48dp.png b/java/com/android/dialer/voicemail/settings/res/drawable-xhdpi/ic_circles_add_googblue_48dp.png
new file mode 100644
index 0000000..5ae5230
--- /dev/null
+++ b/java/com/android/dialer/voicemail/settings/res/drawable-xhdpi/ic_circles_add_googblue_48dp.png
Binary files differ
diff --git a/java/com/android/dialer/voicemail/settings/res/drawable-xhdpi/ic_play_circle_filled_googblue_48dp.png b/java/com/android/dialer/voicemail/settings/res/drawable-xhdpi/ic_play_circle_filled_googblue_48dp.png
new file mode 100644
index 0000000..0657758
--- /dev/null
+++ b/java/com/android/dialer/voicemail/settings/res/drawable-xhdpi/ic_play_circle_filled_googblue_48dp.png
Binary files differ
diff --git a/java/com/android/dialer/voicemail/settings/res/drawable-xhdpi/ic_stop_circle_filled_blue_24dp.png b/java/com/android/dialer/voicemail/settings/res/drawable-xhdpi/ic_stop_circle_filled_blue_24dp.png
new file mode 100644
index 0000000..520f860
--- /dev/null
+++ b/java/com/android/dialer/voicemail/settings/res/drawable-xhdpi/ic_stop_circle_filled_blue_24dp.png
Binary files differ
diff --git a/java/com/android/dialer/voicemail/settings/res/drawable/start_playback_drawable.xml b/java/com/android/dialer/voicemail/settings/res/drawable/start_playback_drawable.xml
new file mode 100644
index 0000000..9791746
--- /dev/null
+++ b/java/com/android/dialer/voicemail/settings/res/drawable/start_playback_drawable.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2018 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+  <item>
+    <shape android:shape="oval">
+      <solid android:color="@color/google_blue_500"/>
+    </shape>
+  </item>
+  <item
+      android:id="@+id/play_icon"
+      android:top="24dp"
+      android:bottom="24dp"
+      android:left="24dp"
+      android:right="24dp"
+      android:drawable="@drawable/quantum_ic_play_arrow_vd_theme_24"/>
+</layer-list>
diff --git a/java/com/android/dialer/voicemail/settings/res/drawable/start_recording_drawable.xml b/java/com/android/dialer/voicemail/settings/res/drawable/start_recording_drawable.xml
new file mode 100644
index 0000000..8a4d9e7
--- /dev/null
+++ b/java/com/android/dialer/voicemail/settings/res/drawable/start_recording_drawable.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2018 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+  <item>
+    <shape android:shape="oval">
+      <solid android:color="@color/dialer_call_green"/>
+    </shape>
+  </item>
+  <item
+      android:id="@+id/record_icon"
+      android:top="24dp"
+      android:bottom="24dp"
+      android:left="24dp"
+      android:right="24dp"
+      android:drawable="@drawable/quantum_ic_mic_vd_theme_24"/>
+</layer-list>
diff --git a/java/com/android/dialer/voicemail/settings/res/drawable/stop_playback_drawable.xml b/java/com/android/dialer/voicemail/settings/res/drawable/stop_playback_drawable.xml
new file mode 100644
index 0000000..24bf90b
--- /dev/null
+++ b/java/com/android/dialer/voicemail/settings/res/drawable/stop_playback_drawable.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2018 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+  <item>
+    <shape android:shape="oval">
+      <solid android:color="@color/google_blue_500"/>
+    </shape>
+  </item>
+  <item
+      android:width="24dp"
+      android:height="24dp"
+      android:gravity="center">
+    <shape android:shape="rectangle">
+      <solid android:color="@android:color/white"/>
+    </shape>
+  </item>
+</layer-list>
diff --git a/java/com/android/dialer/voicemail/settings/res/drawable/stop_recording_drawable.xml b/java/com/android/dialer/voicemail/settings/res/drawable/stop_recording_drawable.xml
new file mode 100644
index 0000000..cff539d
--- /dev/null
+++ b/java/com/android/dialer/voicemail/settings/res/drawable/stop_recording_drawable.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2018 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+  <item>
+    <shape android:shape="oval">
+      <solid android:color="@color/dialer_red"/>
+    </shape>
+  </item>
+  <item
+      android:width="24dp"
+      android:height="24dp"
+      android:gravity="center">
+    <shape android:shape="rectangle">
+      <solid android:color="@android:color/white"/>
+    </shape>
+  </item>
+</layer-list>
diff --git a/java/com/android/dialer/voicemail/settings/res/layout/activity_current_voicemail_greeting.xml b/java/com/android/dialer/voicemail/settings/res/layout/activity_current_voicemail_greeting.xml
new file mode 100644
index 0000000..3e90cf7
--- /dev/null
+++ b/java/com/android/dialer/voicemail/settings/res/layout/activity_current_voicemail_greeting.xml
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2018 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context="com.android.dialer.voicemail.settings.CurrentVoicemailGreetingActivity">
+  <LinearLayout
+      android:layout_width="match_parent"
+      android:layout_height="match_parent"
+      android:layout_alignParentTop="true"
+      android:layout_centerHorizontal="true"
+      android:orientation="vertical">
+    <com.android.dialer.widget.DialerToolbar
+        android:id="@+id/toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:title="@string/voicemail_change_greeting_preference_title">
+    </com.android.dialer.widget.DialerToolbar>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:background="@color/dialer_divider_line_color"
+        />
+
+    <!-- Change Greeting Panel -->
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="72dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginBottom="7dp"
+        android:orientation="horizontal"
+        android:visibility="visible">
+
+        <!-- Change Greeting Button -->
+      <ImageButton
+          android:id="@+id/change_greeting_button"
+          style="@android:style/Widget.Material.Light.ImageButton"
+          android:layout_width="40dp"
+          android:layout_height="40dp"
+          android:layout_marginStart="16dp"
+          android:layout_gravity="center_vertical"
+          android:background="?android:attr/colorBackground"
+          android:foregroundGravity="center_vertical"
+          android:scaleType="centerCrop"
+          android:src="@drawable/ic_circles_add_googblue_48dp"/>
+
+      <TextView
+          android:id="@+id/textView"
+          android:layout_width="0dp"
+          android:layout_height="wrap_content"
+          android:layout_weight="1"
+          android:layout_marginStart="17dp"
+          android:layout_gravity="center_vertical"
+          android:text="@string/current_voicemail_greeting_record_instruction"
+          style="@style/Dialer.TextAppearance.Primary"/>
+
+    </LinearLayout>
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:background="@color/dialer_divider_line_color"
+        />
+    <LinearLayout
+        android:id="@+id/current_voicemail_greeting_recording_display"
+        android:layout_width="match_parent"
+        android:layout_height="72dp"
+        android:background="?android:attr/colorBackground"
+        android:orientation="horizontal">
+        <!-- Play Button -->
+      <ImageButton
+          android:id="@+id/play_button"
+          style="@android:style/Widget.Material.Light.ImageButton"
+          android:layout_width="40dp"
+          android:layout_height="40dp"
+          android:layout_marginStart="16dp"
+          android:layout_gravity="center_vertical"
+          android:adjustViewBounds="false"
+          android:background="?android:attr/colorBackground"
+          android:cropToPadding="false"
+          android:scaleType="centerCrop"
+          android:src="@drawable/ic_play_circle_filled_googblue_48dp"/>
+
+      <LinearLayout
+          android:layout_width="232dp"
+          android:layout_height="wrap_content"
+          android:layout_weight="1"
+          android:layout_marginStart="16dp"
+          android:layout_gravity="center_vertical"
+          android:orientation="vertical">
+        <TextView
+            android:id="@+id/current_voicemail_greeting_recording_title_textview"
+            style="@style/Dialer.TextAppearance.Primary"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/current_voicemail_greeting_recording_title"/>
+        <TextView
+            android:id="@+id/playback_progress_text_view"
+            style="@style/Dialer.TextAppearance.Secondary"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"/>
+      </LinearLayout>
+    </LinearLayout>
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:background="@color/dialer_divider_line_color"
+        />
+  </LinearLayout>
+</RelativeLayout>
diff --git a/java/com/android/dialer/voicemail/settings/res/layout/activity_record_voicemail_greeting.xml b/java/com/android/dialer/voicemail/settings/res/layout/activity_record_voicemail_greeting.xml
new file mode 100644
index 0000000..022cd25
--- /dev/null
+++ b/java/com/android/dialer/voicemail/settings/res/layout/activity_record_voicemail_greeting.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2018 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context="com.android.dialer.voicemail.settings.RecordVoicemailGreetingActivity">
+
+  <LinearLayout
+      android:id="@+id/linearLayout"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:orientation="vertical"
+      android:gravity="center_horizontal"
+      android:layout_centerHorizontal="true"
+      android:layout_centerVertical="true"
+      android:layout_marginTop="120dp">
+
+    <com.android.dialer.voicemail.settings.RecordButton
+        android:id="@+id/record_button"
+        android:width="192dp"
+        android:height="192dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:background="@null"/>
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:layout_marginTop="40dp"
+        android:gravity="center_horizontal"
+        android:textAppearance="@style/Dialer.TextAppearance.Primary"
+        android:textAllCaps="true"
+        android:text="@string/change_greeting_text"/>
+  </LinearLayout>
+
+  <LinearLayout
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:layout_alignParentBottom="true"
+      android:layout_centerHorizontal="true"
+      android:orientation="horizontal"
+      style="?android:attr/buttonBarStyle">
+
+    <Button
+        android:id="@+id/save_button"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:text="@string/save_button_text"
+        android:visibility="gone"
+        style="?android:attr/buttonBarButtonStyle"/>
+
+    <Button
+        android:id="@+id/redo_button"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:text="@string/redo_button_text"
+        android:visibility="gone"
+        style="?android:attr/buttonBarButtonStyle"/>
+  </LinearLayout>
+</RelativeLayout>
diff --git a/java/com/android/dialer/voicemail/settings/res/values-af/strings.xml b/java/com/android/dialer/voicemail/settings/res/values-af/strings.xml
new file mode 100644
index 0000000..b512564
--- /dev/null
+++ b/java/com/android/dialer/voicemail/settings/res/values-af/strings.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_settings_with_label">Stemboodskap (%s)</string>
+  <string name="voicemail_settings_title">Stemboodskap</string>
+  <string name="voicemail_notifications_preference_title">Kennisgewings</string>
+  <string name="voicemail_change_greeting_preference_title">Stemboodskapgroet</string>
+  <string name="change_greeting_text">Tik om op te neem</string>
+  <string name="save_button_text">Stoor</string>
+  <string name="redo_button_text">Probeer weer</string>
+  <string name="voicemail_advanced_settings_title">Gevorderde instellings</string>
+  <string name="voicemail_visual_voicemail_switch_title">Visuele stemboodskap</string>
+  <string name="voicemail_visual_voicemail_auto_archive_switch_title">Ekstra rugsteun en berging</string>
+  <string name="voicemail_set_pin_preference_title">Stel PIN</string>
+  <string name="voicemail_change_pin_preference_title">Verander PIN</string>
+  <string name="voicemail_change_pin_preference_summary_disable">Visuele stemboodskap moet geaktiveer wees om PIN te verander</string>
+  <string name="voicemail_change_pin_preference_summary_not_activated">Visuele stemboodskap is nog nie geaktiveer nie, probeer asseblief later weer</string>
+  <string name="vm_change_pin_old_pin">Ou PIN</string>
+  <string name="vm_change_pin_new_pin">Nuwe PIN</string>
+  <string name="vm_change_pin_progress_message">Wag asseblief.</string>
+  <string name="vm_change_pin_error_too_short">Die nuwe PIN is te kort.</string>
+  <string name="vm_change_pin_error_too_long">Die nuwe PIN is te lank.</string>
+  <string name="vm_change_pin_error_too_weak">Die nuwe PIN is te swak. \'n Sterk wagwoord moenie daaropvolgend wees of syfers bevat wat herhaal nie.</string>
+  <string name="vm_change_pin_error_mismatch">Die ou PIN pas nie.</string>
+  <string name="vm_change_pin_error_invalid">Die nuwe PIN bevat ongeldige karakters.</string>
+  <string name="vm_change_pin_error_system_error">Kan nie PIN verander nie</string>
+  <string name="change_pin_title">Verander stemboodskap-PIN</string>
+  <string name="change_pin_continue_label">Gaan voort</string>
+  <string name="change_pin_cancel_label">Kanselleer</string>
+  <string name="change_pin_ok_label">OK</string>
+  <string name="change_pin_enter_old_pin_header">Bevestig jou ou PIN</string>
+  <string name="change_pin_enter_old_pin_hint">Voer jou stemboodskap-PIN in om voort te gaan.</string>
+  <string name="change_pin_enter_new_pin_header">Stel \'n nuwe PIN op</string>
+  <string name="change_pin_enter_new_pin_hint">PIN moet %1$d-%2$d syfers wees.</string>
+  <string name="change_pin_confirm_pin_header">Bevestig jou PIN</string>
+  <string name="change_pin_confirm_pins_dont_match">PIN\'s stem nie ooreen nie</string>
+  <string name="change_pin_succeeded">Stemboodskap-PIN is opgedateer</string>
+  <string name="change_pin_system_error">Kan nie PIN stel nie</string>
+  <string name="voicemail_visual_voicemail_transcription_switch_title">Stemboodskaptranskripsie</string>
+  <string name="voicemail_visual_voicemail_donation_switch_title">Ontleding van stemboodskaptranskripsie</string>
+  <string name="voicemail_activating_summary_info">Aktiveer tans stemboodskap</string>
+  <string name="voicemail_transcription_preference_summary_info">Kry transkripsies van jou stemboodskap deur Google se transkripsiediens te gebruik. %1$s</string>
+  <string name="voicemail_donate_preference_summary_info">Laat Google jou stemboodskapboodskappe hersien om transkripsiegehalte te verbeter. Jou stemboodskapboodskappe word anoniem geberg. %1$s</string>
+  <string name="confirm_disable_voicemail_dialog_title">Skakel visuele stemboodskap af</string>
+  <string name="confirm_disable_voicemail_dialog_message">Dit sal enige stemboodskap en Google-transkripsies wat in hierdie program geberg is, uitvee. Jou diensverskaffer kan dalk sy eie kopieë hou.</string>
+  <string name="confirm_disable_voicemail_accept_dialog_label">SKAKEL AF</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/settings/res/values-am/strings.xml b/java/com/android/dialer/voicemail/settings/res/values-am/strings.xml
new file mode 100644
index 0000000..e89c1da
--- /dev/null
+++ b/java/com/android/dialer/voicemail/settings/res/values-am/strings.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_settings_with_label">የድምፅ መልዕክት (%s)</string>
+  <string name="voicemail_settings_title">የድምፅ መልዕክት</string>
+  <string name="voicemail_notifications_preference_title">ማሳወቂያዎች</string>
+  <string name="voicemail_change_greeting_preference_title">የድምጽ መልዕክት ሰላምታ</string>
+  <string name="change_greeting_text">ለመቅረጽ መታ ያድርጉ</string>
+  <string name="save_button_text">አስቀምጥ</string>
+  <string name="redo_button_text">እንደገና ይሞክሩ</string>
+  <string name="voicemail_advanced_settings_title">የላቁ ቅንብሮች</string>
+  <string name="voicemail_visual_voicemail_switch_title">ዕይታዊ የድምጽ መልዕክት</string>
+  <string name="voicemail_visual_voicemail_auto_archive_switch_title">ተጨማሪ ምትኬ እና ማከማቻ</string>
+  <string name="voicemail_set_pin_preference_title">ፒን አዘጋጅ</string>
+  <string name="voicemail_change_pin_preference_title">ፒን ቀይር</string>
+  <string name="voicemail_change_pin_preference_summary_disable">ፒን ለመቀየር እይታዊ የድምጽ መልዕክት መንቃት አለበት</string>
+  <string name="voicemail_change_pin_preference_summary_not_activated">እይታዊ የድምጽ መልዕክት ገና ገቢር አልሆነም፣ እባክዎ ቆይተው እንደገና ይሞክሩ</string>
+  <string name="vm_change_pin_old_pin">የቀድሞ ፒን</string>
+  <string name="vm_change_pin_new_pin">አዲስ ፒን</string>
+  <string name="vm_change_pin_progress_message">እባክዎ ይጠብቁ።</string>
+  <string name="vm_change_pin_error_too_short">አዲሱ ፒን በጣም አጭር ነው።</string>
+  <string name="vm_change_pin_error_too_long">አዲሱ ፒን በጣም ረጅም ነው።</string>
+  <string name="vm_change_pin_error_too_weak">አዲሱ ፒን በጣም ደካማ ነው። ጠንካራ የይለፍ ቃል ተከታታይ ቅጥልጥል ወይም ተደጋጋሚ አኃዞች ሊኖሩት አይገባም።</string>
+  <string name="vm_change_pin_error_mismatch">የቀድሞው ፒን አይዛመድም።</string>
+  <string name="vm_change_pin_error_invalid">አዲሱ ፒን ልክ ያልሆኑ ቁምፊዎችን ይዟል።</string>
+  <string name="vm_change_pin_error_system_error">ፒን መቀየር አልተቻለም</string>
+  <string name="change_pin_title">የድምፅ መልዕክት ፒን ለውጥ</string>
+  <string name="change_pin_continue_label">ቀጥል</string>
+  <string name="change_pin_cancel_label">ይቅር</string>
+  <string name="change_pin_ok_label">እሺ</string>
+  <string name="change_pin_enter_old_pin_header">የቀድሞውን ፒንዎን ያረጋግጡ</string>
+  <string name="change_pin_enter_old_pin_hint">ለመቀጠል የድምፅ መልዕክት ፒንዎን ያስገቡ።</string>
+  <string name="change_pin_enter_new_pin_header">አዲስ ፒን ያዘጋጁ</string>
+  <string name="change_pin_enter_new_pin_hint">ፒን ከ %1$d-%2$d አኃዞች መሆን አለበት።</string>
+  <string name="change_pin_confirm_pin_header">የእርስዎን ፒን ያረጋግጡ</string>
+  <string name="change_pin_confirm_pins_dont_match">ፒኖች አይዛመዱም</string>
+  <string name="change_pin_succeeded">የድምፅ መልዕክት ፒን ዘምኗል</string>
+  <string name="change_pin_system_error">ፒን ማዘጋጀት አልተቻለም</string>
+  <string name="voicemail_visual_voicemail_transcription_switch_title">የድምጽ መልዕክትን ወደ ጽሁፍ ግልበጣ</string>
+  <string name="voicemail_visual_voicemail_donation_switch_title">የድምጽ መልዕክት ወደ ጽሁፍ መገልበጥ ትንታኔ</string>
+  <string name="voicemail_activating_summary_info">የድምጽ መልዕክትን ማግበር</string>
+  <string name="voicemail_transcription_preference_summary_info">የGoogleን ወደ ጽሁፍ የመገልበጥ አገልግሎት በመጠቀም የድምጽ መልዕክትዎን የጽሁፍ ግልባጭ ያግኙ። %1$s</string>
+  <string name="voicemail_donate_preference_summary_info">ወደ ጽሁፍ የመገልበጥን ትክክለኛነት ለማሻሻል የድምጽ መልዕክትዎን Google እንዲገመግመው ያድርጉ። የድምጽ መልዕክት መልዕክቶችዎ  በማይታወቅ መልኩ ይቀመጣሉ። %1$s</string>
+  <string name="confirm_disable_voicemail_dialog_title">ዕይታዊ የድምጽ መልዕክትን አጥፋ</string>
+  <string name="confirm_disable_voicemail_dialog_message">ይህ ማንኛውንም የድምጽ መልዕክት እና በዚህ መተግበሪያ ውስጥ የተቀመጡ የGoogle ወደ ጽሁፍ ግልባጮችን ይሰርዛል። አገልግሎት አቅራቢዎ የራሱን ቅጅ ሊያቆይ ይችላል።</string>
+  <string name="confirm_disable_voicemail_accept_dialog_label">አጥፋ</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/settings/res/values-ar/strings.xml b/java/com/android/dialer/voicemail/settings/res/values-ar/strings.xml
new file mode 100644
index 0000000..b1a980f
--- /dev/null
+++ b/java/com/android/dialer/voicemail/settings/res/values-ar/strings.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_settings_with_label">البريد الصوتي (%s)</string>
+  <string name="voicemail_settings_title">بريد صوتي</string>
+  <string name="voicemail_notifications_preference_title">الإشعارات</string>
+  <string name="voicemail_change_greeting_preference_title">رسالة ترحيب البريد الصوتي</string>
+  <string name="change_greeting_text">انقر لبدء التسجيل</string>
+  <string name="save_button_text">حفظ</string>
+  <string name="redo_button_text">إعادة</string>
+  <string name="voicemail_advanced_settings_title">الإعدادات المتقدمة</string>
+  <string name="voicemail_visual_voicemail_switch_title">بريد صوتي مرئي</string>
+  <string name="voicemail_visual_voicemail_auto_archive_switch_title">نسخة احتياطية وسعة تخزين إضافية</string>
+  <string name="voicemail_set_pin_preference_title">تعيين رقم التعريف الشخصي</string>
+  <string name="voicemail_change_pin_preference_title">تغيير رقم التعريف الشخصي</string>
+  <string name="voicemail_change_pin_preference_summary_disable">ينبغي تشغيل البريد الصوتي المرئي لتغيير رقم التعريف الشخصي</string>
+  <string name="voicemail_change_pin_preference_summary_not_activated">لم يتم تفعيل البريد الصوتي المرئي بعد، يُرجى المحاولة مرة أخرى لاحقًا</string>
+  <string name="vm_change_pin_old_pin">رقم التعريف الشخصي القديم</string>
+  <string name="vm_change_pin_new_pin">رقم التعريف الشخصي الجديد</string>
+  <string name="vm_change_pin_progress_message">يُرجى الانتظار.</string>
+  <string name="vm_change_pin_error_too_short">رقم التعريف الشخصي الجديد قصير جدًا.</string>
+  <string name="vm_change_pin_error_too_long">رقم التعريف الشخصي الجديد طويل جدًا.</string>
+  <string name="vm_change_pin_error_too_weak">رقم التعريف الشخصي الجديد ضعيف جدًا. لا ينبغي أن تكون كلمة المرور القوية عبارة عن تسلسل متتالٍ أو أرقام متكررة.</string>
+  <string name="vm_change_pin_error_mismatch">رقم التعريف الشخصي القديم غير مُطابِق.</string>
+  <string name="vm_change_pin_error_invalid">رقم التعريف الشخصي الجديد يحتوي على أحرف غير صالحة.</string>
+  <string name="vm_change_pin_error_system_error">يتعذّر تغيير رقم التعريف الشخصي</string>
+  <string name="change_pin_title">تغيير رقم التعريف الشخصي للبريد الصوتي</string>
+  <string name="change_pin_continue_label">متابعة</string>
+  <string name="change_pin_cancel_label">إلغاء</string>
+  <string name="change_pin_ok_label">موافق</string>
+  <string name="change_pin_enter_old_pin_header">تأكيد رقم التعريف الشخصي القديم</string>
+  <string name="change_pin_enter_old_pin_hint">أدخل رقم التعريف الشخصي لبريدك الصوتي للمتابعة.</string>
+  <string name="change_pin_enter_new_pin_header">تعيين رقم تعريف شخصي جديد</string>
+  <string name="change_pin_enter_new_pin_hint">ينبغي لرقم التعريف الشخصي أن يتكون من %1$d-%2$d أرقام.</string>
+  <string name="change_pin_confirm_pin_header">تأكيد رقم التعريف الشخصي</string>
+  <string name="change_pin_confirm_pins_dont_match">أرقام التعريف الشخصي غير متطابقة</string>
+  <string name="change_pin_succeeded">تمّ تحديث رقم التعريف الشخصي للبريد الصوتي</string>
+  <string name="change_pin_system_error">يتعذر تعيين رقم التعريف الشخصي</string>
+  <string name="voicemail_visual_voicemail_transcription_switch_title">تحويل رسائل البريد الصوتي إلى نصوص</string>
+  <string name="voicemail_visual_voicemail_donation_switch_title">تحليل نص التسجيل الصوتي للبريد الصوتي</string>
+  <string name="voicemail_activating_summary_info">تفعيل البريد الصوتي</string>
+  <string name="voicemail_transcription_preference_summary_info">‏حوّل بريدك الصوتي إلى نصوص باستخدام خدمة تحويل الصوت إلى نص من Google. %1$s</string>
+  <string name="voicemail_donate_preference_summary_info">‏اسمح لخدمة Google بمراجعة رسائل بريدك الصوتي لتحسين دقة تحويل الصوت إلى نص. يتم تخزين رسائل بريدك الصوتي بدون تحديد هويتك. %1$s</string>
+  <string name="confirm_disable_voicemail_dialog_title">إيقاف البريد الصوتي المرئي</string>
+  <string name="confirm_disable_voicemail_dialog_message">‏سيؤدي هذا إلى حذف أي بريد صوتي وأي نصوص رسائل صوتية على Google مخزّنة داخل هذا التطبيق. قد يحتفظ مشغل شبكة الجوال بنسخة لديه.</string>
+  <string name="confirm_disable_voicemail_accept_dialog_label">إيقاف</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/settings/res/values-az/strings.xml b/java/com/android/dialer/voicemail/settings/res/values-az/strings.xml
new file mode 100644
index 0000000..f459add
--- /dev/null
+++ b/java/com/android/dialer/voicemail/settings/res/values-az/strings.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_settings_with_label">Səsli e-poçt (%s)</string>
+  <string name="voicemail_settings_title">Səsli e-poçt</string>
+  <string name="voicemail_notifications_preference_title">Bildirişlər</string>
+  <string name="voicemail_change_greeting_preference_title">Səsli e-poçt salamlaması</string>
+  <string name="change_greeting_text">Klikləyib qeydə alın</string>
+  <string name="save_button_text">Saxlayın</string>
+  <string name="redo_button_text">Yenidən Cəhd Edin</string>
+  <string name="voicemail_advanced_settings_title">Qabaqcıl Ayarlar</string>
+  <string name="voicemail_visual_voicemail_switch_title">Vizual səsli e-poçt</string>
+  <string name="voicemail_visual_voicemail_auto_archive_switch_title">Əlavə yedəkləmə və yaddaş</string>
+  <string name="voicemail_set_pin_preference_title">PIN ayarlayın</string>
+  <string name="voicemail_change_pin_preference_title">PIN-i dəyişin</string>
+  <string name="voicemail_change_pin_preference_summary_disable">PIN-i dəyişmək üçün görünən səsli e-poçt aktiv olmalıdır</string>
+  <string name="voicemail_change_pin_preference_summary_not_activated">Görünən səsli e-poçt hələ aktiv edilməyib, daha sonra yenidən cəhd edin</string>
+  <string name="vm_change_pin_old_pin">Köhnə PIN</string>
+  <string name="vm_change_pin_new_pin">Yeni PIN</string>
+  <string name="vm_change_pin_progress_message">Gözləyin.</string>
+  <string name="vm_change_pin_error_too_short">Yeni PIN çox qısadır.</string>
+  <string name="vm_change_pin_error_too_long">Yeni PIN çox uzundur.</string>
+  <string name="vm_change_pin_error_too_weak">Yeni PIN çox zəifdir. Güclü parol ardıcıllıqdan və ya təkrarlanan rəqəmlərdən ibarət olmamalıdır.</string>
+  <string name="vm_change_pin_error_mismatch">Köhnə PIN uyğun gəlmir.</string>
+  <string name="vm_change_pin_error_invalid">Yeni PIN yanlış simvollardan ibarətdir.</string>
+  <string name="vm_change_pin_error_system_error">PIN-i dəyişmək mümkün olmadı</string>
+  <string name="change_pin_title">Səsli e-poçtun PIN kodunu dəyişin</string>
+  <string name="change_pin_continue_label">Davam edin</string>
+  <string name="change_pin_cancel_label">Ləğv edin</string>
+  <string name="change_pin_ok_label">Ok</string>
+  <string name="change_pin_enter_old_pin_header">Köhnə PIN-i təsdiq edin</string>
+  <string name="change_pin_enter_old_pin_hint">Davam etmək üçün səsli e-poçtun PIN kodunu daxil edin.</string>
+  <string name="change_pin_enter_new_pin_header">Yeni PIN ayarlayın</string>
+  <string name="change_pin_enter_new_pin_hint">PIN %1$d-%2$d rəqəmdən ibarət olmalıdır.</string>
+  <string name="change_pin_confirm_pin_header">PIN-i təsdiq edin</string>
+  <string name="change_pin_confirm_pins_dont_match">PIN-lər üst-üstə düşmür</string>
+  <string name="change_pin_succeeded">Səsli e-poçtun PIN-i yeniləndi</string>
+  <string name="change_pin_system_error">PIN ayarlamaq olmur</string>
+  <string name="voicemail_visual_voicemail_transcription_switch_title">Səsli e-poçt transkripsiyası</string>
+  <string name="voicemail_visual_voicemail_donation_switch_title">Səsli e-məktub transkripsiyası təhlili</string>
+  <string name="voicemail_activating_summary_info">Səsli e-poçt aktiv edilir</string>
+  <string name="voicemail_transcription_preference_summary_info">Google\'un transkripsiya xidmtindən istifadə edərək səsli e-məktubların transkripsiyasını əldə edin. %1$s</string>
+  <string name="voicemail_donate_preference_summary_info">Transkripsiya keyfiyyətini təkmilləşdirmək üçün Google\'a səsli e-poçt mesajlarınızı nəzərdən keçirmək icazəsi verin. Səsli e-poçt mesajlarınız anonim olaraq saxlanılacaq. %1$s</string>
+  <string name="confirm_disable_voicemail_dialog_title">Görünən səsli e-poçtu deaktiv edin</string>
+  <string name="confirm_disable_voicemail_dialog_message">Bununla bu tətbiq daxilində saxlanılan hər hansı səsli e-poçt və Google transkripsiyaları silinəcək. Operator onların nüsxələrini saxlaya bilər.</string>
+  <string name="confirm_disable_voicemail_accept_dialog_label">DEAKTİV EDİN</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/settings/res/values-b+sr+Latn/strings.xml b/java/com/android/dialer/voicemail/settings/res/values-b+sr+Latn/strings.xml
new file mode 100644
index 0000000..3b0ac9f
--- /dev/null
+++ b/java/com/android/dialer/voicemail/settings/res/values-b+sr+Latn/strings.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_settings_with_label">Govorna pošta (%s)</string>
+  <string name="voicemail_settings_title">Govorna pošta</string>
+  <string name="voicemail_notifications_preference_title">Obaveštenja</string>
+  <string name="voicemail_change_greeting_preference_title">Pozdravna poruka govorne pošte</string>
+  <string name="change_greeting_text">Dodirnite za snimanje</string>
+  <string name="save_button_text">Sačuvaj</string>
+  <string name="redo_button_text">Ponovi</string>
+  <string name="voicemail_advanced_settings_title">Napredna podešavanja</string>
+  <string name="voicemail_visual_voicemail_switch_title">Vizuelna govorna pošta</string>
+  <string name="voicemail_visual_voicemail_auto_archive_switch_title">Dodatne rezervne kopije i prostor</string>
+  <string name="voicemail_set_pin_preference_title">Podesite PIN</string>
+  <string name="voicemail_change_pin_preference_title">Promenite PIN</string>
+  <string name="voicemail_change_pin_preference_summary_disable">Morate da omogućite vizuelnu govornu poštu da biste promenili PIN</string>
+  <string name="voicemail_change_pin_preference_summary_not_activated">Vizuelna govorna pošta još uvek nije aktivirana, probajte ponovo kasnije</string>
+  <string name="vm_change_pin_old_pin">Stari PIN</string>
+  <string name="vm_change_pin_new_pin">Novi PIN</string>
+  <string name="vm_change_pin_progress_message">Sačekajte.</string>
+  <string name="vm_change_pin_error_too_short">Novi PIN je prekratak.</string>
+  <string name="vm_change_pin_error_too_long">Novi PIN je predugačak.</string>
+  <string name="vm_change_pin_error_too_weak">Novi PIN je preslab. Jaka lozinka ne treba da sadrži uzastopni niz ni ponovljene cifre.</string>
+  <string name="vm_change_pin_error_mismatch">Stari PIN se ne podudara.</string>
+  <string name="vm_change_pin_error_invalid">Novi PIN sadrži nevažeće znakove.</string>
+  <string name="vm_change_pin_error_system_error">Promena PIN-a nije uspela</string>
+  <string name="change_pin_title">Promenite PIN kôd govorne pošte</string>
+  <string name="change_pin_continue_label">Nastavi</string>
+  <string name="change_pin_cancel_label">Otkaži</string>
+  <string name="change_pin_ok_label">Potvrdi</string>
+  <string name="change_pin_enter_old_pin_header">Potvrdite stari PIN</string>
+  <string name="change_pin_enter_old_pin_hint">Unesite PIN kôd govorne pošte da biste nastavili.</string>
+  <string name="change_pin_enter_new_pin_header">Podesite novi PIN</string>
+  <string name="change_pin_enter_new_pin_hint">Broj cifara koje PIN mora da sadrži: %1$d–%2$d.</string>
+  <string name="change_pin_confirm_pin_header">Potvrdite PIN</string>
+  <string name="change_pin_confirm_pins_dont_match">PIN-ovi se ne podudaraju</string>
+  <string name="change_pin_succeeded">PIN kôd govorne pošte je ažuriran</string>
+  <string name="change_pin_system_error">Podešavanje PIN-a nije uspelo</string>
+  <string name="voicemail_visual_voicemail_transcription_switch_title">Transkripcija govorne pošte</string>
+  <string name="voicemail_visual_voicemail_donation_switch_title">Analiza transkripcije govorne pošte</string>
+  <string name="voicemail_activating_summary_info">Aktivira se vizuelna govorna pošta</string>
+  <string name="voicemail_transcription_preference_summary_info">Dobijajte transkripte govornih poruka pomoću Google-ove usluge transkripcije. %1$s</string>
+  <string name="voicemail_donate_preference_summary_info">Dozvolite Google-u da pregleda vaše govorne poruke da bi poboljšao tačnost transkripcije. Govorne poruke čuvamo anonimno. %1$s</string>
+  <string name="confirm_disable_voicemail_dialog_title">Isključite vizuelnu govornu poštu</string>
+  <string name="confirm_disable_voicemail_dialog_message">Ovo će izbrisati sve govorne poruke i Google transkripte sačuvane u ovoj aplikaciji. Mobilni operater može da zadrži svoje kopije.</string>
+  <string name="confirm_disable_voicemail_accept_dialog_label">ISKLJUČI</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/settings/res/values-be/strings.xml b/java/com/android/dialer/voicemail/settings/res/values-be/strings.xml
new file mode 100644
index 0000000..a4b88f5
--- /dev/null
+++ b/java/com/android/dialer/voicemail/settings/res/values-be/strings.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_settings_with_label">Галасавая пошта (%s)</string>
+  <string name="voicemail_settings_title">Галасавая пошта</string>
+  <string name="voicemail_notifications_preference_title">Апавяшчэнні</string>
+  <string name="voicemail_change_greeting_preference_title">Вітанне галасавой пошты</string>
+  <string name="change_greeting_text">Націсніце для запісу</string>
+  <string name="save_button_text">Захаваць</string>
+  <string name="redo_button_text">Паўтарыць</string>
+  <string name="voicemail_advanced_settings_title">Пашыраныя налады</string>
+  <string name="voicemail_visual_voicemail_switch_title">Візуальная галасавая пошта</string>
+  <string name="voicemail_visual_voicemail_auto_archive_switch_title">Дадатковае рэзервовае капір. і сховішча</string>
+  <string name="voicemail_set_pin_preference_title">Задаць PIN-код</string>
+  <string name="voicemail_change_pin_preference_title">Змяніць PIN-код</string>
+  <string name="voicemail_change_pin_preference_summary_disable">Каб змяніць PIN-код, трэба ўключыць візуальную галасавую пошту</string>
+  <string name="voicemail_change_pin_preference_summary_not_activated">Візуальная галасавая пошта пакуль не актываваная. Паўтарыце спробу пазней</string>
+  <string name="vm_change_pin_old_pin">Стары PIN-код</string>
+  <string name="vm_change_pin_new_pin">Новы PIN-код</string>
+  <string name="vm_change_pin_progress_message">Пачакайце.</string>
+  <string name="vm_change_pin_error_too_short">Новы PIN-код занадта кароткі.</string>
+  <string name="vm_change_pin_error_too_long">Новы PIN-код занадта доўгі.</string>
+  <string name="vm_change_pin_error_too_weak">Новы PIN-код занадта слабы. Моцны пароль не павінен змяшчаць знакаў, што ідуць па чарзе, або лічбы, якія паўтараюцца.</string>
+  <string name="vm_change_pin_error_mismatch">Стары PIN-код не падыходзіць.</string>
+  <string name="vm_change_pin_error_invalid">Новы PIN-код змяшчае няправільныя сімвалы.</string>
+  <string name="vm_change_pin_error_system_error">Немагчыма змяніць PIN-код</string>
+  <string name="change_pin_title">Змяніце PIN-код галасавой пошты</string>
+  <string name="change_pin_continue_label">Працягнуць</string>
+  <string name="change_pin_cancel_label">Скасаваць</string>
+  <string name="change_pin_ok_label">ОК</string>
+  <string name="change_pin_enter_old_pin_header">Пацвердзіце стары PIN-код</string>
+  <string name="change_pin_enter_old_pin_hint">Каб працягнуць, увядзіце PIN-код галасавой пошты.</string>
+  <string name="change_pin_enter_new_pin_header">Задайце новы PIN-код</string>
+  <string name="change_pin_enter_new_pin_hint">PIN-код павінен утрымліваць %1$d-%2$d лічбаў.</string>
+  <string name="change_pin_confirm_pin_header">Пацвердзіце PIN-код</string>
+  <string name="change_pin_confirm_pins_dont_match">PIN-коды не супадаюць</string>
+  <string name="change_pin_succeeded">PIN-код галасавой пошты абноўлены</string>
+  <string name="change_pin_system_error">Немагчыма задаць PIN-код</string>
+  <string name="voicemail_visual_voicemail_transcription_switch_title">Расшыфроўка галасавой пошты</string>
+  <string name="voicemail_visual_voicemail_donation_switch_title">Аналіз транскрыпцый галасавой пошты</string>
+  <string name="voicemail_activating_summary_info">Уключэнне галасавой пошты</string>
+  <string name="voicemail_transcription_preference_summary_info">Атрымайце расшыфроўкі галасавой пошты з дапамогай сэрвісу расшыфроўкі Google. %1$s</string>
+  <string name="voicemail_donate_preference_summary_info">Дазвольце Google праглядаць паведамленні галасавой пошты, каб палепшыць дакладнасць расшыфроўкі. Паведамленні галасавой пошты захоўваюцца ананімна. %1$s</string>
+  <string name="confirm_disable_voicemail_dialog_title">Выключыць візуальную галасавую пошту</string>
+  <string name="confirm_disable_voicemail_dialog_message">Гэта прывядзе да выдалення ўсіх паведамленняў галасавой пошты і расшыфровак Google, якія захоўваюцца ў гэтай праграме. Аператар можа пакінуць свае копіі.</string>
+  <string name="confirm_disable_voicemail_accept_dialog_label">ВЫКЛЮЧЫЦЬ</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/settings/res/values-bg/strings.xml b/java/com/android/dialer/voicemail/settings/res/values-bg/strings.xml
new file mode 100644
index 0000000..aadb66c
--- /dev/null
+++ b/java/com/android/dialer/voicemail/settings/res/values-bg/strings.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_settings_with_label">Гласова поща (%s)</string>
+  <string name="voicemail_settings_title">Гласова поща</string>
+  <string name="voicemail_notifications_preference_title">Известия</string>
+  <string name="voicemail_change_greeting_preference_title">Поздрав в гласовата поща</string>
+  <string name="change_greeting_text">Докоснете за запис</string>
+  <string name="save_button_text">Запазване</string>
+  <string name="redo_button_text">Нов опит</string>
+  <string name="voicemail_advanced_settings_title">Разширени настройки</string>
+  <string name="voicemail_visual_voicemail_switch_title">Визуална гласова поща</string>
+  <string name="voicemail_visual_voicemail_auto_archive_switch_title">Допълнителни резервни копия и хранилище</string>
+  <string name="voicemail_set_pin_preference_title">Задаване на ПИН</string>
+  <string name="voicemail_change_pin_preference_title">Промяна на вашия ПИН</string>
+  <string name="voicemail_change_pin_preference_summary_disable">За промяна на ПИН трябва да бъде активирана визуалната гласова поща</string>
+  <string name="voicemail_change_pin_preference_summary_not_activated">Визуалната гласова поща още не е активирана. Моля, опитайте отново по-късно</string>
+  <string name="vm_change_pin_old_pin">Стар ПИН</string>
+  <string name="vm_change_pin_new_pin">Нов ПИН</string>
+  <string name="vm_change_pin_progress_message">Моля, изчакайте.</string>
+  <string name="vm_change_pin_error_too_short">Новият ПИН е твърде къс.</string>
+  <string name="vm_change_pin_error_too_long">Новият ПИН е твърде дълъг.</string>
+  <string name="vm_change_pin_error_too_weak">Новият ПИН не е достатъчно надежден. Надеждната парола не бива да има последователни или повтарящи се цифри.</string>
+  <string name="vm_change_pin_error_mismatch">Старият ПИН не съответства.</string>
+  <string name="vm_change_pin_error_invalid">Новият ПИН съдържа невалидни знаци.</string>
+  <string name="vm_change_pin_error_system_error">Промяната на ПИН не е възможна</string>
+  <string name="change_pin_title">Промяна на ПИН за гласовата поща</string>
+  <string name="change_pin_continue_label">Напред</string>
+  <string name="change_pin_cancel_label">Отказ</string>
+  <string name="change_pin_ok_label">OK</string>
+  <string name="change_pin_enter_old_pin_header">Потвърдете стария си ПИН</string>
+  <string name="change_pin_enter_old_pin_hint">За да продължите, въведете своя ПИН за гласовата поща.</string>
+  <string name="change_pin_enter_new_pin_header">Задайте нов ПИН</string>
+  <string name="change_pin_enter_new_pin_hint">Вашият ПИН трябва да съдържа между %1$d и %2$d цифри.</string>
+  <string name="change_pin_confirm_pin_header">Потвърдете своя ПИН</string>
+  <string name="change_pin_confirm_pins_dont_match">ПИН кодовете не съвпадат</string>
+  <string name="change_pin_succeeded">ПИН за гласовата поща бе актуализиран</string>
+  <string name="change_pin_system_error">ПИН не може да бъде зададен</string>
+  <string name="voicemail_visual_voicemail_transcription_switch_title">Преписи на гласови съобщения</string>
+  <string name="voicemail_visual_voicemail_donation_switch_title">Анализ на преписите на гласовите съобщ.</string>
+  <string name="voicemail_activating_summary_info">Гласовата поща се активира</string>
+  <string name="voicemail_transcription_preference_summary_info">Получавайте преписи на гласовите си съобщения чрез услугата на Google. %1$s</string>
+  <string name="voicemail_donate_preference_summary_info">Позволете на Google да преглежда съобщенията в гласовата ви поща, за да подобри точността на преписите. Съобщенията ви се съхраняват анонимно. %1$s</string>
+  <string name="confirm_disable_voicemail_dialog_title">Изключване на визуалната гласова поща</string>
+  <string name="confirm_disable_voicemail_dialog_message">Това ще изтрие гласовите съобщения и преписите от Google, съхранявани в приложението. Операторът ви може да запази свои копия.</string>
+  <string name="confirm_disable_voicemail_accept_dialog_label">ИЗКЛЮЧВАНЕ</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/settings/res/values-bn/strings.xml b/java/com/android/dialer/voicemail/settings/res/values-bn/strings.xml
new file mode 100644
index 0000000..0b5f602
--- /dev/null
+++ b/java/com/android/dialer/voicemail/settings/res/values-bn/strings.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_settings_with_label">ভয়েসমেল (%s)</string>
+  <string name="voicemail_settings_title">ভয়েসমেল</string>
+  <string name="voicemail_notifications_preference_title">বিজ্ঞপ্তি</string>
+  <string name="voicemail_change_greeting_preference_title">ভয়েসমেলের অভিবাদন</string>
+  <string name="change_greeting_text">রেকর্ড করতে ট্যাপ</string>
+  <string name="save_button_text">সেভ করুন</string>
+  <string name="redo_button_text">আবার চেষ্টা করুন</string>
+  <string name="voicemail_advanced_settings_title">উন্নত সেটিংস</string>
+  <string name="voicemail_visual_voicemail_switch_title">ভিজুয়াল ভয়েসমেল</string>
+  <string name="voicemail_visual_voicemail_auto_archive_switch_title">অতিরিক্ত ব্যাক-আপ এবং স্টোরেজ</string>
+  <string name="voicemail_set_pin_preference_title">পিন সেট করুন</string>
+  <string name="voicemail_change_pin_preference_title">পিন পরিবর্তন করুন</string>
+  <string name="voicemail_change_pin_preference_summary_disable">পিন পরিবর্তন করতে হলে ভিজুয়াল ভয়েসমেল অবশ্যই সক্ষম করতে হবে</string>
+  <string name="voicemail_change_pin_preference_summary_not_activated">ভিজুয়াল ভয়েসমেল এখনও সক্রিয় করা হয়নি, অনুগ্রহ করে পরে আবার চেষ্টা করুন</string>
+  <string name="vm_change_pin_old_pin">পুরনো পিন</string>
+  <string name="vm_change_pin_new_pin">নতুন পিন</string>
+  <string name="vm_change_pin_progress_message">অনুগ্রহ করে অপেক্ষা করুন৷</string>
+  <string name="vm_change_pin_error_too_short">নতুন পিনটি খুব ছোট৷</string>
+  <string name="vm_change_pin_error_too_long">নতুন পিনটি বেশি বড়৷</string>
+  <string name="vm_change_pin_error_too_weak">নতুন পিনটি খুবই দুর্বল৷ শক্তিশালী পাসওয়ার্ডে ধারাবাহিক ক্রম বা একই সংখ্যা বারবার থাকা উচিত নয়৷</string>
+  <string name="vm_change_pin_error_mismatch">পুরনো পিনটি মিলছে না৷</string>
+  <string name="vm_change_pin_error_invalid">নতুন পিনে এমন অক্ষর রয়েছে যা ব্যবহার করা যাবে না৷</string>
+  <string name="vm_change_pin_error_system_error">পিন পরিবর্তন করা যায়নি</string>
+  <string name="change_pin_title">ভয়েসমেলের পিন পরিবর্তন করুন</string>
+  <string name="change_pin_continue_label">চালিয়ে যান</string>
+  <string name="change_pin_cancel_label">বাতিল করুন</string>
+  <string name="change_pin_ok_label">ঠিক আছে</string>
+  <string name="change_pin_enter_old_pin_header">আপনার পুরনো পিনটি নিশ্চিত করুন</string>
+  <string name="change_pin_enter_old_pin_hint">চালিয়ে যেতে আপনার ভয়েসমেলের পিন লিখুন৷</string>
+  <string name="change_pin_enter_new_pin_header">একটি নতুন পিন সেট করুন</string>
+  <string name="change_pin_enter_new_pin_hint">পিনে অবশ্যই %1$d-%2$dটি সংখ্যা থাকতে হবে৷</string>
+  <string name="change_pin_confirm_pin_header">আপনার পিন নিশ্চিত করুন</string>
+  <string name="change_pin_confirm_pins_dont_match">পিনগুলি মিলছে না</string>
+  <string name="change_pin_succeeded">ভয়েসমেলের পিন আপডেট করা হয়েছে</string>
+  <string name="change_pin_system_error">পিন সেট করা গেল না</string>
+  <string name="voicemail_visual_voicemail_transcription_switch_title">ভয়েসমেল ট্রান্সক্রিপশন</string>
+  <string name="voicemail_visual_voicemail_donation_switch_title">ভয়েসমেল ট্রান্সক্রিপশনের বিশ্লেষণ</string>
+  <string name="voicemail_activating_summary_info">ভয়েসমেল অ্যাক্টিভেট হচ্ছে</string>
+  <string name="voicemail_transcription_preference_summary_info">Google-এর ট্রান্সক্রিপশন পরিষেবা ব্যবহার করে ভয়েসমেলের ট্রান্সক্রিপ্ট পান। %1$s</string>
+  <string name="voicemail_donate_preference_summary_info">ট্রান্সক্রিপশনের গুণমান আরও উন্নত করতে Google-কে আপনার ভয়েসমেল মেসেজগুলি পর্যালোচনা করতে দিন। আপনার পরিচয় গোপন রেখে মেসেজগুলি স্টোর করা হবে। %1$s</string>
+  <string name="confirm_disable_voicemail_dialog_title">ভিজুয়াল ভয়েসমেল বন্ধ করুন</string>
+  <string name="confirm_disable_voicemail_dialog_message">এর ফলে এই অ্যাপের মধ্যে স্টোর করা যেকোনও ভয়েসমেল এবং Google ট্রান্সক্রিপ্ট মুছে যাবে। আপনার পরিষেবা প্রদানকারী সেগুলির একটি কপি রেখে দিতে পারে।</string>
+  <string name="confirm_disable_voicemail_accept_dialog_label">বন্ধ করুন</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/settings/res/values-bs/strings.xml b/java/com/android/dialer/voicemail/settings/res/values-bs/strings.xml
new file mode 100644
index 0000000..235f6f6
--- /dev/null
+++ b/java/com/android/dialer/voicemail/settings/res/values-bs/strings.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_settings_with_label">Govorna pošta (%s)</string>
+  <string name="voicemail_settings_title">Govorna pošta</string>
+  <string name="voicemail_notifications_preference_title">Obavještenja</string>
+  <string name="voicemail_change_greeting_preference_title">Pozdravna poruka govorne pošte</string>
+  <string name="change_greeting_text">Dodirnite da snimite</string>
+  <string name="save_button_text">Sačuvaj</string>
+  <string name="redo_button_text">Pokušaj ponovo</string>
+  <string name="voicemail_advanced_settings_title">Napredne postavke</string>
+  <string name="voicemail_visual_voicemail_switch_title">Vizuelna govorna pošta</string>
+  <string name="voicemail_visual_voicemail_auto_archive_switch_title">Dodatna sigurnosna kopija i pohrana</string>
+  <string name="voicemail_set_pin_preference_title">Postavite PIN</string>
+  <string name="voicemail_change_pin_preference_title">Promijenite PIN</string>
+  <string name="voicemail_change_pin_preference_summary_disable">Vizuelna govorna pošta mora biti omogućena za promjenu PIN-a</string>
+  <string name="voicemail_change_pin_preference_summary_not_activated">Vizuelna govorna pošta još uvijek nije aktivirana, pokušajte ponovo kasnije</string>
+  <string name="vm_change_pin_old_pin">Stari PIN</string>
+  <string name="vm_change_pin_new_pin">Novi PIN</string>
+  <string name="vm_change_pin_progress_message">Pričekajte.</string>
+  <string name="vm_change_pin_error_too_short">Novi PIN je prekratak.</string>
+  <string name="vm_change_pin_error_too_long">Novi PIN je predug.</string>
+  <string name="vm_change_pin_error_too_weak">Novi PIN je preslab. Jaka lozinka ne smije sadržavati uzastopni niz cifri ili ponovljene cifre.</string>
+  <string name="vm_change_pin_error_mismatch">Stari PIN se ne podudara.</string>
+  <string name="vm_change_pin_error_invalid">Novi PIN sadrži nevažeće znakove.</string>
+  <string name="vm_change_pin_error_system_error">Nije moguće promijeniti PIN</string>
+  <string name="change_pin_title">Promijenite PIN govorne pošte</string>
+  <string name="change_pin_continue_label">Nastavi</string>
+  <string name="change_pin_cancel_label">Otkaži</string>
+  <string name="change_pin_ok_label">Uredu</string>
+  <string name="change_pin_enter_old_pin_header">Potvrdite stari PIN</string>
+  <string name="change_pin_enter_old_pin_hint">Za nastavak unesite PIN govorne pošte.</string>
+  <string name="change_pin_enter_new_pin_header">Postavite novi PIN</string>
+  <string name="change_pin_enter_new_pin_hint">PIN mora imati između %1$d-%2$d cifri.</string>
+  <string name="change_pin_confirm_pin_header">Potvrdite PIN</string>
+  <string name="change_pin_confirm_pins_dont_match">PIN-ovi se ne podudaraju</string>
+  <string name="change_pin_succeeded">PIN govorne pošte je ažuriran</string>
+  <string name="change_pin_system_error">Nije moguće postaviti PIN</string>
+  <string name="voicemail_visual_voicemail_transcription_switch_title">Transkripcija govorne pošte</string>
+  <string name="voicemail_visual_voicemail_donation_switch_title">Analiza transkripcije govorne pošte</string>
+  <string name="voicemail_activating_summary_info">Aktiviranje govorne pošte</string>
+  <string name="voicemail_transcription_preference_summary_info">Preuzmite transkripte govorne pošte putem Googleove usluge transkripcije. %1$s</string>
+  <string name="voicemail_donate_preference_summary_info">Dozvolite da Google pregleda vaše poruke govorne pošte kako bi se poboljšala tačnost transkripcije. Poruke govorne pošte se pohranjuju anonimno. %1$s</string>
+  <string name="confirm_disable_voicemail_dialog_title">Isključivanje vizuelne govorne pošte</string>
+  <string name="confirm_disable_voicemail_dialog_message">Ovo će izbrisati svu govornu poštu i Googleove transkripte pohranjene u ovoj aplikaciji. Vaš mobilni operater može zadržati svoje kopije.</string>
+  <string name="confirm_disable_voicemail_accept_dialog_label">ISKLJUČI</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/settings/res/values-ca/strings.xml b/java/com/android/dialer/voicemail/settings/res/values-ca/strings.xml
new file mode 100644
index 0000000..d00e3a4
--- /dev/null
+++ b/java/com/android/dialer/voicemail/settings/res/values-ca/strings.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_settings_with_label">Bústia de veu (%s)</string>
+  <string name="voicemail_settings_title">Bústia de veu</string>
+  <string name="voicemail_notifications_preference_title">Notificacions</string>
+  <string name="voicemail_change_greeting_preference_title">Salutació de la bústia de veu</string>
+  <string name="change_greeting_text">Toca per gravar</string>
+  <string name="save_button_text">Desa</string>
+  <string name="redo_button_text">Torna-hi</string>
+  <string name="voicemail_advanced_settings_title">Configuració avançada</string>
+  <string name="voicemail_visual_voicemail_switch_title">Bústia de veu visual</string>
+  <string name="voicemail_visual_voicemail_auto_archive_switch_title">Còpia de seguretat i emmagatzematge addicional</string>
+  <string name="voicemail_set_pin_preference_title">Defineix el PIN</string>
+  <string name="voicemail_change_pin_preference_title">Canvia el PIN</string>
+  <string name="voicemail_change_pin_preference_summary_disable">La bústia de veu visual ha d\'estar activada per poder canviar el PIN</string>
+  <string name="voicemail_change_pin_preference_summary_not_activated">La bústia de veu visual encara no està activada; torna-ho a provar més tard</string>
+  <string name="vm_change_pin_old_pin">PIN antic</string>
+  <string name="vm_change_pin_new_pin">PIN nou</string>
+  <string name="vm_change_pin_progress_message">Un moment.</string>
+  <string name="vm_change_pin_error_too_short">El PIN nou és massa curt.</string>
+  <string name="vm_change_pin_error_too_long">El PIN nou és massa llarg.</string>
+  <string name="vm_change_pin_error_too_weak">El PIN nou no és prou segur. Les contrasenyes segures no poden contenir dígits repetits ni consecutius.</string>
+  <string name="vm_change_pin_error_mismatch">El PIN antic no coincideix.</string>
+  <string name="vm_change_pin_error_invalid">El PIN nou conté caràcters que no són vàlids.</string>
+  <string name="vm_change_pin_error_system_error">No es pot canviar el PIN</string>
+  <string name="change_pin_title">Canvia el PIN de la bústia de veu</string>
+  <string name="change_pin_continue_label">Continua</string>
+  <string name="change_pin_cancel_label">Cancel·la</string>
+  <string name="change_pin_ok_label">D\'acord</string>
+  <string name="change_pin_enter_old_pin_header">Confirma el teu PIN antic</string>
+  <string name="change_pin_enter_old_pin_hint">Introdueix el PIN de la bústia de veu per continuar.</string>
+  <string name="change_pin_enter_new_pin_header">Defineix un PIN nou</string>
+  <string name="change_pin_enter_new_pin_hint">El PIN ha de tenir entre %1$d i %2$d dígits.</string>
+  <string name="change_pin_confirm_pin_header">Confirma el teu PIN</string>
+  <string name="change_pin_confirm_pins_dont_match">Els PIN no coincideixen</string>
+  <string name="change_pin_succeeded">S\'ha actualitzat el PIN de la bústia de veu</string>
+  <string name="change_pin_system_error">No s\'ha pogut definir el PIN</string>
+  <string name="voicemail_visual_voicemail_transcription_switch_title">Transcripció de missatges de veu</string>
+  <string name="voicemail_visual_voicemail_donation_switch_title">Anàlisi de transcripció (missatges de veu)</string>
+  <string name="voicemail_activating_summary_info">S\'està activant la bústia de veu</string>
+  <string name="voicemail_transcription_preference_summary_info">Obtén transcripcions dels missatges de veu utilitzant el servei de transcripció de Google. %1$s</string>
+  <string name="voicemail_donate_preference_summary_info">Permet que Google accedeixi als missatges de la teva bústia de veu per millorar la precisió de les transcripcions. Aquests missatges s\'emmagatzemen de manera anònima. %1$s</string>
+  <string name="confirm_disable_voicemail_dialog_title">Desactiva la bústia de veu visual</string>
+  <string name="confirm_disable_voicemail_dialog_message">Se suprimiran els missatges de veu i les transcripcions de Google desats en aquesta aplicació. És possible que l\'operador de telefonia mòbil en conservi còpies.</string>
+  <string name="confirm_disable_voicemail_accept_dialog_label">DESACTIVA</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/settings/res/values-cs/strings.xml b/java/com/android/dialer/voicemail/settings/res/values-cs/strings.xml
new file mode 100644
index 0000000..917bf8f
--- /dev/null
+++ b/java/com/android/dialer/voicemail/settings/res/values-cs/strings.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_settings_with_label">Hlasová schránka (%s)</string>
+  <string name="voicemail_settings_title">Hlasová schránka</string>
+  <string name="voicemail_notifications_preference_title">Oznámení</string>
+  <string name="voicemail_change_greeting_preference_title">Pozdrav v hlasové schránce</string>
+  <string name="change_greeting_text">Klepnutím nahráváte</string>
+  <string name="save_button_text">Uložit</string>
+  <string name="redo_button_text">Znovu</string>
+  <string name="voicemail_advanced_settings_title">Pokročilá nastavení</string>
+  <string name="voicemail_visual_voicemail_switch_title">Vizuální hlasová schránka</string>
+  <string name="voicemail_visual_voicemail_auto_archive_switch_title">Další zálohování a úložiště</string>
+  <string name="voicemail_set_pin_preference_title">Nastavit kód PIN</string>
+  <string name="voicemail_change_pin_preference_title">Změnit kód PIN</string>
+  <string name="voicemail_change_pin_preference_summary_disable">Pokud chcete kód PIN změnit, musíte mít zapnutou vizuální hlasovou schránku</string>
+  <string name="voicemail_change_pin_preference_summary_not_activated">Vizuální hlasová schránka zatím není aktivovaná, zkuste to prosím znovu později</string>
+  <string name="vm_change_pin_old_pin">Starý kód PIN</string>
+  <string name="vm_change_pin_new_pin">Nový kód PIN</string>
+  <string name="vm_change_pin_progress_message">Počkejte prosím.</string>
+  <string name="vm_change_pin_error_too_short">Nový kód PIN je příliš krátký.</string>
+  <string name="vm_change_pin_error_too_long">Nový kód PIN je příliš dlouhý.</string>
+  <string name="vm_change_pin_error_too_weak">Nový kód PIN je příliš slabý. Silný kód by neměl obsahovat postupnou řadu čísel ani opakující se čísla.</string>
+  <string name="vm_change_pin_error_mismatch">Starý kód PIN se neshoduje.</string>
+  <string name="vm_change_pin_error_invalid">Nový kód PIN obsahuje neplatné znaky.</string>
+  <string name="vm_change_pin_error_system_error">Kód PIN se nepodařilo změnit</string>
+  <string name="change_pin_title">Změňte kód PIN hlasové schránky</string>
+  <string name="change_pin_continue_label">Pokračovat</string>
+  <string name="change_pin_cancel_label">Zrušit</string>
+  <string name="change_pin_ok_label">OK</string>
+  <string name="change_pin_enter_old_pin_header">Potvrďte starý kód PIN</string>
+  <string name="change_pin_enter_old_pin_hint">Pokud chcete pokračovat, zadejte kód PIN hlasové schránky.</string>
+  <string name="change_pin_enter_new_pin_header">Nastavte nový kód PIN</string>
+  <string name="change_pin_enter_new_pin_hint">PIN musí mít %1$d až %2$d číslic.</string>
+  <string name="change_pin_confirm_pin_header">Potvrďte svůj PIN</string>
+  <string name="change_pin_confirm_pins_dont_match">Kódy PIN se neshodují</string>
+  <string name="change_pin_succeeded">Kód PIN hlasové schránky byl změněn</string>
+  <string name="change_pin_system_error">Kód PIN se nepodařilo nastavit</string>
+  <string name="voicemail_visual_voicemail_transcription_switch_title">Přepis hlasových zpráv</string>
+  <string name="voicemail_visual_voicemail_donation_switch_title">Analýza přepisu hlasových zpráv</string>
+  <string name="voicemail_activating_summary_info">Aktivace hlasové schránky</string>
+  <string name="voicemail_transcription_preference_summary_info">Získejte přepisy svých hlasových zpráv poskytované přepisovací službou od Googlu. %1$s</string>
+  <string name="voicemail_donate_preference_summary_info">Dovolte Googlu kontrolovat vaše hlasové zprávy s cílem zlepšit kvalitu přepisu. Hlasové zprávy se ukládají anonymně. %1$s</string>
+  <string name="confirm_disable_voicemail_dialog_title">Vypnout vizuální hlasovou schránku</string>
+  <string name="confirm_disable_voicemail_dialog_message">Tím smažete všechny hlasové zprávy a přepisy od Googlu uložené v této aplikaci. Váš operátor si může uchovávat vlastní kopie.</string>
+  <string name="confirm_disable_voicemail_accept_dialog_label">VYPNOUT</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/settings/res/values-da/strings.xml b/java/com/android/dialer/voicemail/settings/res/values-da/strings.xml
new file mode 100644
index 0000000..cf143b4
--- /dev/null
+++ b/java/com/android/dialer/voicemail/settings/res/values-da/strings.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_settings_with_label">Telefonsvarer (%s)</string>
+  <string name="voicemail_settings_title">Telefonsvarer</string>
+  <string name="voicemail_notifications_preference_title">Underretninger</string>
+  <string name="voicemail_change_greeting_preference_title">Telefonsvarerhilsen</string>
+  <string name="change_greeting_text">Tryk for at optage</string>
+  <string name="save_button_text">Gem</string>
+  <string name="redo_button_text">Prøv igen</string>
+  <string name="voicemail_advanced_settings_title">Avancerede indstillinger</string>
+  <string name="voicemail_visual_voicemail_switch_title">Visuel telefonsvarer</string>
+  <string name="voicemail_visual_voicemail_auto_archive_switch_title">Ekstra sikkerhedskopiering og lagerplads</string>
+  <string name="voicemail_set_pin_preference_title">Angiv pinkode</string>
+  <string name="voicemail_change_pin_preference_title">Skift pinkode</string>
+  <string name="voicemail_change_pin_preference_summary_disable">Visuel telefonsvarer skal være aktiveret, for at du kan skifte pinkode</string>
+  <string name="voicemail_change_pin_preference_summary_not_activated">Visuel telefonsvarer er ikke aktiveret endnu. Prøv igen senere</string>
+  <string name="vm_change_pin_old_pin">Gammel pinkode</string>
+  <string name="vm_change_pin_new_pin">Ny pinkode</string>
+  <string name="vm_change_pin_progress_message">Vent et øjeblik.</string>
+  <string name="vm_change_pin_error_too_short">Den nye pinkode er for kort.</string>
+  <string name="vm_change_pin_error_too_long">Den nye pinkode er for lang.</string>
+  <string name="vm_change_pin_error_too_weak">Denne pinkode er for svag. En stærk adgangskode består ikke af en række tal og har ikke flere af de samme tal efter hinanden.</string>
+  <string name="vm_change_pin_error_mismatch">Den gamle pinkode er forkert.</string>
+  <string name="vm_change_pin_error_invalid">Den nye pinkode har ugyldige tegn.</string>
+  <string name="vm_change_pin_error_system_error">Pinkoden kunne ikke ændres</string>
+  <string name="change_pin_title">Skift pinkode til din telefonsvarer</string>
+  <string name="change_pin_continue_label">Fortsæt</string>
+  <string name="change_pin_cancel_label">Annuller</string>
+  <string name="change_pin_ok_label">OK</string>
+  <string name="change_pin_enter_old_pin_header">Bekræft din gamle pinkode</string>
+  <string name="change_pin_enter_old_pin_hint">Angiv din pinkode til din telefonsvarer for at fortsætte.</string>
+  <string name="change_pin_enter_new_pin_header">Angiv en ny pinkode</string>
+  <string name="change_pin_enter_new_pin_hint">Pinkoden skal være på %1$d-%2$d cifre.</string>
+  <string name="change_pin_confirm_pin_header">Bekræft din pinkode</string>
+  <string name="change_pin_confirm_pins_dont_match">Pinkoderne er ikke ens</string>
+  <string name="change_pin_succeeded">Pinkoden til din telefonsvarer blev opdateret</string>
+  <string name="change_pin_system_error">Pinkoden kunne ikke angives</string>
+  <string name="voicemail_visual_voicemail_transcription_switch_title">Transskription af talebeskeder</string>
+  <string name="voicemail_visual_voicemail_donation_switch_title">Analyse af talebeskedstransskription</string>
+  <string name="voicemail_activating_summary_info">Telefonsvareren aktiveres</string>
+  <string name="voicemail_transcription_preference_summary_info">Få transskription af dine talebeskeder ved hjælp af Googles transskriptionstjeneste. %1$s</string>
+  <string name="voicemail_donate_preference_summary_info">Tillad, at Google gennemgår dine talebeskeder for at forbedre nøjagtigheden af transskriptioner. Dine talebeskeder gemmes anonymt. %1$s</string>
+  <string name="confirm_disable_voicemail_dialog_title">Slå visuel telefonsvarer fra</string>
+  <string name="confirm_disable_voicemail_dialog_message">Dette sletter eventuelle talebeskeder og Google-transskriptioner, der er gemt i appen. Dit mobilselskab gemmer muligvis separate kopier.</string>
+  <string name="confirm_disable_voicemail_accept_dialog_label">SLÅ FRA</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/settings/res/values-de/strings.xml b/java/com/android/dialer/voicemail/settings/res/values-de/strings.xml
new file mode 100644
index 0000000..f56338a
--- /dev/null
+++ b/java/com/android/dialer/voicemail/settings/res/values-de/strings.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_settings_with_label">Mailbox (%s)</string>
+  <string name="voicemail_settings_title">Mailbox</string>
+  <string name="voicemail_notifications_preference_title">Benachrichtigungen</string>
+  <string name="voicemail_change_greeting_preference_title">Mailboxbegrüßung</string>
+  <string name="change_greeting_text">Zum Aufnehmen tippen</string>
+  <string name="save_button_text">Speichern</string>
+  <string name="redo_button_text">Wiederholen</string>
+  <string name="voicemail_advanced_settings_title">Erweiterte Einstellungen</string>
+  <string name="voicemail_visual_voicemail_switch_title">Visuelle Mailbox</string>
+  <string name="voicemail_visual_voicemail_auto_archive_switch_title">Zusätzliche Sicherung und mehr Speicher</string>
+  <string name="voicemail_set_pin_preference_title">PIN festlegen</string>
+  <string name="voicemail_change_pin_preference_title">PIN ändern</string>
+  <string name="voicemail_change_pin_preference_summary_disable">Die visuelle Mailbox muss aktiviert sein, um die PIN zu ändern</string>
+  <string name="voicemail_change_pin_preference_summary_not_activated">Die visuelle Mailbox wurde noch nicht aktiviert, bitte versuche es später noch einmal</string>
+  <string name="vm_change_pin_old_pin">Alte PIN</string>
+  <string name="vm_change_pin_new_pin">Neue PIN</string>
+  <string name="vm_change_pin_progress_message">Bitte warten.</string>
+  <string name="vm_change_pin_error_too_short">Die neue PIN ist zu kurz.</string>
+  <string name="vm_change_pin_error_too_long">Die neue PIN ist zu lang.</string>
+  <string name="vm_change_pin_error_too_weak">Die neue PIN ist zu unsicher. Damit ein Passwort sicher ist, sollte es nicht aus zusammenhängenden Zeichenabfolgen oder aus sich wiederholenden Zeichen bestehen.</string>
+  <string name="vm_change_pin_error_mismatch">Die alte PIN stimmt nicht.</string>
+  <string name="vm_change_pin_error_invalid">Die neue PIN enthält ungültige Zeichen.</string>
+  <string name="vm_change_pin_error_system_error">PIN kann nicht geändert werden</string>
+  <string name="change_pin_title">Mailbox-PIN ändern</string>
+  <string name="change_pin_continue_label">Weiter</string>
+  <string name="change_pin_cancel_label">Abbrechen</string>
+  <string name="change_pin_ok_label">OK</string>
+  <string name="change_pin_enter_old_pin_header">Alte PIN bestätigen</string>
+  <string name="change_pin_enter_old_pin_hint">Gib zum Fortfahren deine Mailbox-PIN ein.</string>
+  <string name="change_pin_enter_new_pin_header">Neue PIN festlegen</string>
+  <string name="change_pin_enter_new_pin_hint">PIN muss aus %1$d–%2$d Zeichen bestehen.</string>
+  <string name="change_pin_confirm_pin_header">PIN bestätigen</string>
+  <string name="change_pin_confirm_pins_dont_match">Die PINs stimmen nicht überein</string>
+  <string name="change_pin_succeeded">Mailbox-PIN aktualisiert</string>
+  <string name="change_pin_system_error">Festlegen der PIN nicht möglich</string>
+  <string name="voicemail_visual_voicemail_transcription_switch_title">Mailboxnachrichten transkribieren</string>
+  <string name="voicemail_visual_voicemail_donation_switch_title">Analyse transkribierter Mailboxnachrichten</string>
+  <string name="voicemail_activating_summary_info">Mailbox wird aktiviert</string>
+  <string name="voicemail_transcription_preference_summary_info">Der Transkriptionsdienst von Google liefert dir deine Mailboxnachrichten als geschriebenen Text. %1$s</string>
+  <string name="voicemail_donate_preference_summary_info">Google darf deine Mailboxnachrichten analysieren, damit die Genauigkeit der Transkriptionen verbessert werden kann. Deine Mailboxnachrichten werden anonym gespeichert. %1$s</string>
+  <string name="confirm_disable_voicemail_dialog_title">Visuelle Mailbox deaktivieren</string>
+  <string name="confirm_disable_voicemail_dialog_message">Hiermit werden alle Mailbox-Nachrichten und Google-Transkripte gelöscht, die in dieser App gespeichert wurden. Möglicherweise speichert dein Mobilfunkanbieter eigene Kopien.</string>
+  <string name="confirm_disable_voicemail_accept_dialog_label">DEAKTIVIEREN</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/settings/res/values-el/strings.xml b/java/com/android/dialer/voicemail/settings/res/values-el/strings.xml
new file mode 100644
index 0000000..cb90321
--- /dev/null
+++ b/java/com/android/dialer/voicemail/settings/res/values-el/strings.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_settings_with_label">Αυτόματος τηλεφωνητής (%s)</string>
+  <string name="voicemail_settings_title">Αυτόματος τηλεφωνητής</string>
+  <string name="voicemail_notifications_preference_title">Ειδοποιήσεις</string>
+  <string name="voicemail_change_greeting_preference_title">Χαιρετισμός αυτόματου τηλεφωνητή</string>
+  <string name="change_greeting_text">Πατήστε για εγγραφή</string>
+  <string name="save_button_text">Αποθήκευση</string>
+  <string name="redo_button_text">Επανάληψη</string>
+  <string name="voicemail_advanced_settings_title">Σύνθετες ρυθμίσεις</string>
+  <string name="voicemail_visual_voicemail_switch_title">Οπτικός αυτόματος τηλεφωνητής</string>
+  <string name="voicemail_visual_voicemail_auto_archive_switch_title">Επιπλέον αντίγραφα ασφ. και αποθήκευση</string>
+  <string name="voicemail_set_pin_preference_title">Ορισμός PIN</string>
+  <string name="voicemail_change_pin_preference_title">Αλλαγή κωδικού PIN</string>
+  <string name="voicemail_change_pin_preference_summary_disable">Για αλλαγή του PIN, ενεργοποιήστε τον οπτικό αυτόματο τηλεφωνητή</string>
+  <string name="voicemail_change_pin_preference_summary_not_activated">Ο οπτικός αυτόματος τηλεφωνητής δεν έχει ενεργοποιηθεί ακόμα. Δοκιμάστε ξανά αργότερα.</string>
+  <string name="vm_change_pin_old_pin">Παλιός αριθμός PIN</string>
+  <string name="vm_change_pin_new_pin">Νέος αριθμός PIN</string>
+  <string name="vm_change_pin_progress_message">Περιμένετε.</string>
+  <string name="vm_change_pin_error_too_short">Το νέο PIN είναι πολύ μικρό.</string>
+  <string name="vm_change_pin_error_too_long">Το νέο PIN είναι πολύ μεγάλo.</string>
+  <string name="vm_change_pin_error_too_weak">Το νέο PIN είναι πολύ αδύναμο. Ένας ισχυρός κωδικός πρόσβασης δεν θα πρέπει να αποτελείται από ακολουθίες χαρακτήρων ή επαναλαμβανόμενα ψηφία.</string>
+  <string name="vm_change_pin_error_mismatch">Το παλιό PIN δεν αντιστοιχεί.</string>
+  <string name="vm_change_pin_error_invalid">Το νέο PIN περιέχει μη έγκυρους χαρακτήρες.</string>
+  <string name="vm_change_pin_error_system_error">Δεν είναι δυνατή η αλλαγή του PIN</string>
+  <string name="change_pin_title">Αλλαγή PIN αυτόματου τηλεφωνητή</string>
+  <string name="change_pin_continue_label">Συνέχεια</string>
+  <string name="change_pin_cancel_label">Ακύρωση</string>
+  <string name="change_pin_ok_label">ΟΚ</string>
+  <string name="change_pin_enter_old_pin_header">Επιβεβαιώστε το παλιό σας PIN</string>
+  <string name="change_pin_enter_old_pin_hint">Εισαγάγετε το PIN του αυτόματου τηλεφωνητή σας για να συνεχίσετε.</string>
+  <string name="change_pin_enter_new_pin_header">Ορίστε ένα νέο PIN</string>
+  <string name="change_pin_enter_new_pin_hint">Το PIN πρέπει να αποτελείται από %1$d-%2$d ψηφία.</string>
+  <string name="change_pin_confirm_pin_header">Επιβεβαιώστε το PIN</string>
+  <string name="change_pin_confirm_pins_dont_match">Τα PIN δεν ταιριάζουν</string>
+  <string name="change_pin_succeeded">Το PIN αυτόματου τηλεφωνητή ενημερώθηκε</string>
+  <string name="change_pin_system_error">Δεν είναι δυνατή η ρύθμιση του PIN</string>
+  <string name="voicemail_visual_voicemail_transcription_switch_title">Μεταγραφή μηνυμάτων αυτόματου τηλεφωνητή</string>
+  <string name="voicemail_visual_voicemail_donation_switch_title">Ανάλυση μεταγραφής φωνητικού μηνύματος</string>
+  <string name="voicemail_activating_summary_info">Ενεργοποίηση αυτόματου τηλεφωνητή</string>
+  <string name="voicemail_transcription_preference_summary_info">Λάβετε μεταγραφές των φωνητικών μηνυμάτων του αυτόματου τηλεφωνητή σας, χρησιμοποιώντας την υπηρεσία μεταγραφής της Google. %1$s</string>
+  <string name="voicemail_donate_preference_summary_info">Επιτρέψτε στην Google να ελέγχει τα μηνύματά σας, για να βελτιώσει την ακρίβεια της μεταγραφής. Τα μηνύματα του αυτόματου τηλεφωνητή σας αποθηκεύονται ανώνυμα. %1$s</string>
+  <string name="confirm_disable_voicemail_dialog_title">Απενεργοπ. οπτικού αυτόματου τηλεφωνητή</string>
+  <string name="confirm_disable_voicemail_dialog_message">Αυτό θα διαγράψει τυχόν φωνητικά μηνύματα ή μεταγραφές Google που έχουν αποθηκευτεί εντός της εφαρμογής. Η εταιρεία κινητής τηλεφωνίας που χρησιμοποιείτε ενδέχεται να διατηρεί τα δικά της αντίγραφα.</string>
+  <string name="confirm_disable_voicemail_accept_dialog_label">ΑΠΕΝΕΡΓΟΠΟΙΗΣΗ</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/settings/res/values-en-rAU/strings.xml b/java/com/android/dialer/voicemail/settings/res/values-en-rAU/strings.xml
new file mode 100644
index 0000000..6323a5d
--- /dev/null
+++ b/java/com/android/dialer/voicemail/settings/res/values-en-rAU/strings.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_settings_with_label">Voicemail (%s)</string>
+  <string name="voicemail_settings_title">Voicemail</string>
+  <string name="voicemail_notifications_preference_title">Notifications</string>
+  <string name="voicemail_change_greeting_preference_title">Voicemail greeting</string>
+  <string name="change_greeting_text">Tap to record</string>
+  <string name="save_button_text">Save</string>
+  <string name="redo_button_text">Try again</string>
+  <string name="voicemail_advanced_settings_title">Advanced Settings</string>
+  <string name="voicemail_visual_voicemail_switch_title">Visual voicemail</string>
+  <string name="voicemail_visual_voicemail_auto_archive_switch_title">Extra backup and storage</string>
+  <string name="voicemail_set_pin_preference_title">Set PIN</string>
+  <string name="voicemail_change_pin_preference_title">Change PIN</string>
+  <string name="voicemail_change_pin_preference_summary_disable">Visual voicemail must be enabled to change PIN</string>
+  <string name="voicemail_change_pin_preference_summary_not_activated">Visual voicemail is not activated yet. Please try again later</string>
+  <string name="vm_change_pin_old_pin">Old PIN</string>
+  <string name="vm_change_pin_new_pin">New PIN</string>
+  <string name="vm_change_pin_progress_message">Please wait.</string>
+  <string name="vm_change_pin_error_too_short">The new PIN is too short.</string>
+  <string name="vm_change_pin_error_too_long">The new PIN is too long.</string>
+  <string name="vm_change_pin_error_too_weak">The new PIN is too weak. A strong password should not have a continuous sequence or repeated digits.</string>
+  <string name="vm_change_pin_error_mismatch">The old PIN doesn\'t match.</string>
+  <string name="vm_change_pin_error_invalid">The new PIN contains invalid characters.</string>
+  <string name="vm_change_pin_error_system_error">Unable to change PIN</string>
+  <string name="change_pin_title">Change voicemail PIN</string>
+  <string name="change_pin_continue_label">Continue</string>
+  <string name="change_pin_cancel_label">Cancel</string>
+  <string name="change_pin_ok_label">OK</string>
+  <string name="change_pin_enter_old_pin_header">Confirm your old PIN</string>
+  <string name="change_pin_enter_old_pin_hint">Enter your voicemail PIN to continue.</string>
+  <string name="change_pin_enter_new_pin_header">Set a new PIN</string>
+  <string name="change_pin_enter_new_pin_hint">PIN must be %1$d–%2$d digits long.</string>
+  <string name="change_pin_confirm_pin_header">Confirm your PIN</string>
+  <string name="change_pin_confirm_pins_dont_match">PINs don\'t match</string>
+  <string name="change_pin_succeeded">Voicemail PIN updated</string>
+  <string name="change_pin_system_error">Unable to set PIN</string>
+  <string name="voicemail_visual_voicemail_transcription_switch_title">Voicemail transcription</string>
+  <string name="voicemail_visual_voicemail_donation_switch_title">Voicemail transcription analysis</string>
+  <string name="voicemail_activating_summary_info">Activating voicemail</string>
+  <string name="voicemail_transcription_preference_summary_info">Get transcripts of your voicemail using Google\'s transcription service. %1$s</string>
+  <string name="voicemail_donate_preference_summary_info">Let Google review your voicemail messages to improve transcription accuracy. Your voicemail messages are stored anonymously. %1$s</string>
+  <string name="confirm_disable_voicemail_dialog_title">Turn off visual voicemail</string>
+  <string name="confirm_disable_voicemail_dialog_message">This will delete any voicemail and Google transcripts stored within this app. Your operator may keep its own copies.</string>
+  <string name="confirm_disable_voicemail_accept_dialog_label">TURN OFF</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/settings/res/values-en-rGB/strings.xml b/java/com/android/dialer/voicemail/settings/res/values-en-rGB/strings.xml
new file mode 100644
index 0000000..6323a5d
--- /dev/null
+++ b/java/com/android/dialer/voicemail/settings/res/values-en-rGB/strings.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_settings_with_label">Voicemail (%s)</string>
+  <string name="voicemail_settings_title">Voicemail</string>
+  <string name="voicemail_notifications_preference_title">Notifications</string>
+  <string name="voicemail_change_greeting_preference_title">Voicemail greeting</string>
+  <string name="change_greeting_text">Tap to record</string>
+  <string name="save_button_text">Save</string>
+  <string name="redo_button_text">Try again</string>
+  <string name="voicemail_advanced_settings_title">Advanced Settings</string>
+  <string name="voicemail_visual_voicemail_switch_title">Visual voicemail</string>
+  <string name="voicemail_visual_voicemail_auto_archive_switch_title">Extra backup and storage</string>
+  <string name="voicemail_set_pin_preference_title">Set PIN</string>
+  <string name="voicemail_change_pin_preference_title">Change PIN</string>
+  <string name="voicemail_change_pin_preference_summary_disable">Visual voicemail must be enabled to change PIN</string>
+  <string name="voicemail_change_pin_preference_summary_not_activated">Visual voicemail is not activated yet. Please try again later</string>
+  <string name="vm_change_pin_old_pin">Old PIN</string>
+  <string name="vm_change_pin_new_pin">New PIN</string>
+  <string name="vm_change_pin_progress_message">Please wait.</string>
+  <string name="vm_change_pin_error_too_short">The new PIN is too short.</string>
+  <string name="vm_change_pin_error_too_long">The new PIN is too long.</string>
+  <string name="vm_change_pin_error_too_weak">The new PIN is too weak. A strong password should not have a continuous sequence or repeated digits.</string>
+  <string name="vm_change_pin_error_mismatch">The old PIN doesn\'t match.</string>
+  <string name="vm_change_pin_error_invalid">The new PIN contains invalid characters.</string>
+  <string name="vm_change_pin_error_system_error">Unable to change PIN</string>
+  <string name="change_pin_title">Change voicemail PIN</string>
+  <string name="change_pin_continue_label">Continue</string>
+  <string name="change_pin_cancel_label">Cancel</string>
+  <string name="change_pin_ok_label">OK</string>
+  <string name="change_pin_enter_old_pin_header">Confirm your old PIN</string>
+  <string name="change_pin_enter_old_pin_hint">Enter your voicemail PIN to continue.</string>
+  <string name="change_pin_enter_new_pin_header">Set a new PIN</string>
+  <string name="change_pin_enter_new_pin_hint">PIN must be %1$d–%2$d digits long.</string>
+  <string name="change_pin_confirm_pin_header">Confirm your PIN</string>
+  <string name="change_pin_confirm_pins_dont_match">PINs don\'t match</string>
+  <string name="change_pin_succeeded">Voicemail PIN updated</string>
+  <string name="change_pin_system_error">Unable to set PIN</string>
+  <string name="voicemail_visual_voicemail_transcription_switch_title">Voicemail transcription</string>
+  <string name="voicemail_visual_voicemail_donation_switch_title">Voicemail transcription analysis</string>
+  <string name="voicemail_activating_summary_info">Activating voicemail</string>
+  <string name="voicemail_transcription_preference_summary_info">Get transcripts of your voicemail using Google\'s transcription service. %1$s</string>
+  <string name="voicemail_donate_preference_summary_info">Let Google review your voicemail messages to improve transcription accuracy. Your voicemail messages are stored anonymously. %1$s</string>
+  <string name="confirm_disable_voicemail_dialog_title">Turn off visual voicemail</string>
+  <string name="confirm_disable_voicemail_dialog_message">This will delete any voicemail and Google transcripts stored within this app. Your operator may keep its own copies.</string>
+  <string name="confirm_disable_voicemail_accept_dialog_label">TURN OFF</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/settings/res/values-en-rIN/strings.xml b/java/com/android/dialer/voicemail/settings/res/values-en-rIN/strings.xml
new file mode 100644
index 0000000..6323a5d
--- /dev/null
+++ b/java/com/android/dialer/voicemail/settings/res/values-en-rIN/strings.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_settings_with_label">Voicemail (%s)</string>
+  <string name="voicemail_settings_title">Voicemail</string>
+  <string name="voicemail_notifications_preference_title">Notifications</string>
+  <string name="voicemail_change_greeting_preference_title">Voicemail greeting</string>
+  <string name="change_greeting_text">Tap to record</string>
+  <string name="save_button_text">Save</string>
+  <string name="redo_button_text">Try again</string>
+  <string name="voicemail_advanced_settings_title">Advanced Settings</string>
+  <string name="voicemail_visual_voicemail_switch_title">Visual voicemail</string>
+  <string name="voicemail_visual_voicemail_auto_archive_switch_title">Extra backup and storage</string>
+  <string name="voicemail_set_pin_preference_title">Set PIN</string>
+  <string name="voicemail_change_pin_preference_title">Change PIN</string>
+  <string name="voicemail_change_pin_preference_summary_disable">Visual voicemail must be enabled to change PIN</string>
+  <string name="voicemail_change_pin_preference_summary_not_activated">Visual voicemail is not activated yet. Please try again later</string>
+  <string name="vm_change_pin_old_pin">Old PIN</string>
+  <string name="vm_change_pin_new_pin">New PIN</string>
+  <string name="vm_change_pin_progress_message">Please wait.</string>
+  <string name="vm_change_pin_error_too_short">The new PIN is too short.</string>
+  <string name="vm_change_pin_error_too_long">The new PIN is too long.</string>
+  <string name="vm_change_pin_error_too_weak">The new PIN is too weak. A strong password should not have a continuous sequence or repeated digits.</string>
+  <string name="vm_change_pin_error_mismatch">The old PIN doesn\'t match.</string>
+  <string name="vm_change_pin_error_invalid">The new PIN contains invalid characters.</string>
+  <string name="vm_change_pin_error_system_error">Unable to change PIN</string>
+  <string name="change_pin_title">Change voicemail PIN</string>
+  <string name="change_pin_continue_label">Continue</string>
+  <string name="change_pin_cancel_label">Cancel</string>
+  <string name="change_pin_ok_label">OK</string>
+  <string name="change_pin_enter_old_pin_header">Confirm your old PIN</string>
+  <string name="change_pin_enter_old_pin_hint">Enter your voicemail PIN to continue.</string>
+  <string name="change_pin_enter_new_pin_header">Set a new PIN</string>
+  <string name="change_pin_enter_new_pin_hint">PIN must be %1$d–%2$d digits long.</string>
+  <string name="change_pin_confirm_pin_header">Confirm your PIN</string>
+  <string name="change_pin_confirm_pins_dont_match">PINs don\'t match</string>
+  <string name="change_pin_succeeded">Voicemail PIN updated</string>
+  <string name="change_pin_system_error">Unable to set PIN</string>
+  <string name="voicemail_visual_voicemail_transcription_switch_title">Voicemail transcription</string>
+  <string name="voicemail_visual_voicemail_donation_switch_title">Voicemail transcription analysis</string>
+  <string name="voicemail_activating_summary_info">Activating voicemail</string>
+  <string name="voicemail_transcription_preference_summary_info">Get transcripts of your voicemail using Google\'s transcription service. %1$s</string>
+  <string name="voicemail_donate_preference_summary_info">Let Google review your voicemail messages to improve transcription accuracy. Your voicemail messages are stored anonymously. %1$s</string>
+  <string name="confirm_disable_voicemail_dialog_title">Turn off visual voicemail</string>
+  <string name="confirm_disable_voicemail_dialog_message">This will delete any voicemail and Google transcripts stored within this app. Your operator may keep its own copies.</string>
+  <string name="confirm_disable_voicemail_accept_dialog_label">TURN OFF</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/settings/res/values-es-rUS/strings.xml b/java/com/android/dialer/voicemail/settings/res/values-es-rUS/strings.xml
new file mode 100644
index 0000000..b76cfae
--- /dev/null
+++ b/java/com/android/dialer/voicemail/settings/res/values-es-rUS/strings.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_settings_with_label">Buzón de voz (%s)</string>
+  <string name="voicemail_settings_title">Buzón de voz</string>
+  <string name="voicemail_notifications_preference_title">Notificaciones</string>
+  <string name="voicemail_change_greeting_preference_title">Saludo del buzón de voz</string>
+  <string name="change_greeting_text">Toca para grabar</string>
+  <string name="save_button_text">Guardar</string>
+  <string name="redo_button_text">Reintentar</string>
+  <string name="voicemail_advanced_settings_title">Configuración avanzada</string>
+  <string name="voicemail_visual_voicemail_switch_title">Buzón de voz visual</string>
+  <string name="voicemail_visual_voicemail_auto_archive_switch_title">Más almacenamiento y copias de seguridad</string>
+  <string name="voicemail_set_pin_preference_title">Establecer PIN</string>
+  <string name="voicemail_change_pin_preference_title">Cambiar PIN</string>
+  <string name="voicemail_change_pin_preference_summary_disable">El buzón de voz visual debe estar habilitado para cambiar el PIN</string>
+  <string name="voicemail_change_pin_preference_summary_not_activated">El buzón de voz visual aún no está activado. Vuelve a intentarlo más tarde.</string>
+  <string name="vm_change_pin_old_pin">PIN anterior</string>
+  <string name="vm_change_pin_new_pin">PIN nuevo</string>
+  <string name="vm_change_pin_progress_message">Espera un momento.</string>
+  <string name="vm_change_pin_error_too_short">El PIN nuevo es demasiado corto.</string>
+  <string name="vm_change_pin_error_too_long">El PIN nuevo es demasiado largo.</string>
+  <string name="vm_change_pin_error_too_weak">El PIN nuevo es demasiado inseguro. Una contraseña segura no debe tener secuencias continuas ni dígitos repetidos.</string>
+  <string name="vm_change_pin_error_mismatch">El PIN anterior no coincide.</string>
+  <string name="vm_change_pin_error_invalid">El PIN nuevo contiene caracteres no válidos.</string>
+  <string name="vm_change_pin_error_system_error">No se puede cambiar el PIN</string>
+  <string name="change_pin_title">Cambiar el PIN del buzón de voz</string>
+  <string name="change_pin_continue_label">Continuar</string>
+  <string name="change_pin_cancel_label">Cancelar</string>
+  <string name="change_pin_ok_label">Aceptar</string>
+  <string name="change_pin_enter_old_pin_header">Confirmar el PIN anterior</string>
+  <string name="change_pin_enter_old_pin_hint">Ingresa el PIN del buzón de voz para continuar.</string>
+  <string name="change_pin_enter_new_pin_header">Establecer un PIN nuevo</string>
+  <string name="change_pin_enter_new_pin_hint">El PIN debe tener entre %1$d y %2$d dígitos.</string>
+  <string name="change_pin_confirm_pin_header">Confirma tu PIN</string>
+  <string name="change_pin_confirm_pins_dont_match">Los PIN no coinciden</string>
+  <string name="change_pin_succeeded">Se actualizó el PIN del buzón de voz</string>
+  <string name="change_pin_system_error">No se puede establecer el PIN</string>
+  <string name="voicemail_visual_voicemail_transcription_switch_title">Transcripción del buzón de voz</string>
+  <string name="voicemail_visual_voicemail_donation_switch_title">Análisis de transcr. del buzón de voz</string>
+  <string name="voicemail_activating_summary_info">Activando el buzón de voz</string>
+  <string name="voicemail_transcription_preference_summary_info">Recibir las transcripciones de tu buzón de voz por medio del servicio de transcripciones de Google. %1$s</string>
+  <string name="voicemail_donate_preference_summary_info">Permitir que Google acceda a los mensajes de tu buzón de voz para mejorar la calidad de las transcripciones. Estos mensajes se almacenan de forma anónima. %1$s</string>
+  <string name="confirm_disable_voicemail_dialog_title">Desactivar el buzón de voz visual</string>
+  <string name="confirm_disable_voicemail_dialog_message">Esta acción borrará todas las transcripciones de Google y los correos de voz almacenados en esta app. Es posible que tu proveedor conserve sus propias copias.</string>
+  <string name="confirm_disable_voicemail_accept_dialog_label">DESACTIVAR</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/settings/res/values-es/strings.xml b/java/com/android/dialer/voicemail/settings/res/values-es/strings.xml
new file mode 100644
index 0000000..eef0d66
--- /dev/null
+++ b/java/com/android/dialer/voicemail/settings/res/values-es/strings.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_settings_with_label">Buzón de voz (%s)</string>
+  <string name="voicemail_settings_title">Buzón de voz</string>
+  <string name="voicemail_notifications_preference_title">Notificaciones</string>
+  <string name="voicemail_change_greeting_preference_title">Saludo del buzón de voz</string>
+  <string name="change_greeting_text">Toca para grabar</string>
+  <string name="save_button_text">Guardar</string>
+  <string name="redo_button_text">Reintentar</string>
+  <string name="voicemail_advanced_settings_title">Ajustes avanzados</string>
+  <string name="voicemail_visual_voicemail_switch_title">Buzón de voz visual</string>
+  <string name="voicemail_visual_voicemail_auto_archive_switch_title">Copias de seguridad y almacenamiento extra</string>
+  <string name="voicemail_set_pin_preference_title">Configurar el PIN</string>
+  <string name="voicemail_change_pin_preference_title">Cambiar el PIN</string>
+  <string name="voicemail_change_pin_preference_summary_disable">Se debe habilitar el buzón de voz visual para cambiar el PIN</string>
+  <string name="voicemail_change_pin_preference_summary_not_activated">El buzón de voz visual aún no está activado; inténtalo de nuevo más tarde</string>
+  <string name="vm_change_pin_old_pin">PIN antiguo</string>
+  <string name="vm_change_pin_new_pin">PIN nuevo</string>
+  <string name="vm_change_pin_progress_message">Espera...</string>
+  <string name="vm_change_pin_error_too_short">El PIN nuevo es muy corto.</string>
+  <string name="vm_change_pin_error_too_long">El PIN nuevo es muy largo.</string>
+  <string name="vm_change_pin_error_too_weak">El PIN nuevo no es lo bastante seguro. Una contraseña segura no debe incluir secuencias continuas ni dígitos repetidos.</string>
+  <string name="vm_change_pin_error_mismatch">El PIN antiguo no coincide.</string>
+  <string name="vm_change_pin_error_invalid">El PIN nuevo contiene caracteres no válidos.</string>
+  <string name="vm_change_pin_error_system_error">No se ha podido cambiar el PIN</string>
+  <string name="change_pin_title">Cambiar el PIN del buzón de voz</string>
+  <string name="change_pin_continue_label">Continuar</string>
+  <string name="change_pin_cancel_label">Cancelar</string>
+  <string name="change_pin_ok_label">Aceptar</string>
+  <string name="change_pin_enter_old_pin_header">Confirma tu PIN antiguo</string>
+  <string name="change_pin_enter_old_pin_hint">Introduce el PIN de tu buzón de voz para continuar.</string>
+  <string name="change_pin_enter_new_pin_header">Configura un PIN nuevo</string>
+  <string name="change_pin_enter_new_pin_hint">El PIN debe tener entre %1$d y %2$d dígitos.</string>
+  <string name="change_pin_confirm_pin_header">Confirma tu PIN</string>
+  <string name="change_pin_confirm_pins_dont_match">Los PIN no coinciden</string>
+  <string name="change_pin_succeeded">Se ha cambiado el PIN del buzón de voz</string>
+  <string name="change_pin_system_error">No se ha podido configurar el PIN</string>
+  <string name="voicemail_visual_voicemail_transcription_switch_title">Transcripción de mensajes de voz</string>
+  <string name="voicemail_visual_voicemail_donation_switch_title">Análisis de transcripciones de mensajes</string>
+  <string name="voicemail_activating_summary_info">Activando el buzón de voz</string>
+  <string name="voicemail_transcription_preference_summary_info">Consulta transcripciones de tus mensajes de voz con el servicio de transcripción de Google. %1$s</string>
+  <string name="voicemail_donate_preference_summary_info">Deja que Google revise tus mensajes de voz para mejorar la precisión de las transcripciones. Estos mensajes se guardan de manera anónima. %1$s</string>
+  <string name="confirm_disable_voicemail_dialog_title">Desactivar el buzón de voz visual</string>
+  <string name="confirm_disable_voicemail_dialog_message">Esta acción eliminará las transcripciones de Google y los mensajes de voz almacenados en esta aplicación. Es posible que tu operador guarde una copia de ellos.</string>
+  <string name="confirm_disable_voicemail_accept_dialog_label">DESACTIVAR</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/settings/res/values-et/strings.xml b/java/com/android/dialer/voicemail/settings/res/values-et/strings.xml
new file mode 100644
index 0000000..2d32b9b
--- /dev/null
+++ b/java/com/android/dialer/voicemail/settings/res/values-et/strings.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_settings_with_label">Kõnepost (%s)</string>
+  <string name="voicemail_settings_title">Kõnepost</string>
+  <string name="voicemail_notifications_preference_title">Märguanded</string>
+  <string name="voicemail_change_greeting_preference_title">Kõneposti tervitus</string>
+  <string name="change_greeting_text">Puud. salvestamiseks</string>
+  <string name="save_button_text">Salvesta</string>
+  <string name="redo_button_text">Pr. uuesti</string>
+  <string name="voicemail_advanced_settings_title">Täpsemad seaded</string>
+  <string name="voicemail_visual_voicemail_switch_title">Visuaalne kõnepost</string>
+  <string name="voicemail_visual_voicemail_auto_archive_switch_title">Lisavarundus ja -salvestusruum</string>
+  <string name="voicemail_set_pin_preference_title">PIN-koodi määramine</string>
+  <string name="voicemail_change_pin_preference_title">PIN-koodi muutmine</string>
+  <string name="voicemail_change_pin_preference_summary_disable">PIN-koodi muutmiseks peab olema lubatud visuaalne kõnepost</string>
+  <string name="voicemail_change_pin_preference_summary_not_activated">Visuaalne kõnepost pole veel aktiveeritud, proovige hiljem uuesti</string>
+  <string name="vm_change_pin_old_pin">Vana PIN-kood</string>
+  <string name="vm_change_pin_new_pin">Uus PIN-kood</string>
+  <string name="vm_change_pin_progress_message">Oodake.</string>
+  <string name="vm_change_pin_error_too_short">Uus PIN-kood on liiga lühike.</string>
+  <string name="vm_change_pin_error_too_long">Uus PIN-kood on liiga pikk.</string>
+  <string name="vm_change_pin_error_too_weak">Uus PIN-kood on liiga nõrk. Tugevas paroolis ei tohi olla mitut järjestikust samasugust tähemärki ega korduvaid numbreid.</string>
+  <string name="vm_change_pin_error_mismatch">Vana PIN-kood ei ühti.</string>
+  <string name="vm_change_pin_error_invalid">Uus PIN-kood sisaldab sobimatuid tähemärke.</string>
+  <string name="vm_change_pin_error_system_error">PIN-koodi ei õnnestu muuta</string>
+  <string name="change_pin_title">Kõneposti PIN-koodi muutmine</string>
+  <string name="change_pin_continue_label">Jätka</string>
+  <string name="change_pin_cancel_label">Tühista</string>
+  <string name="change_pin_ok_label">OK</string>
+  <string name="change_pin_enter_old_pin_header">Kinnitage vana PIN-kood</string>
+  <string name="change_pin_enter_old_pin_hint">Jätkamiseks sisestage kõneposti PIN-kood.</string>
+  <string name="change_pin_enter_new_pin_header">Määrake uus PIN-kood</string>
+  <string name="change_pin_enter_new_pin_hint">PIN-kood peab olema vahemikus %1$d–%2$d numbrit.</string>
+  <string name="change_pin_confirm_pin_header">Kinnitage PIN-kood</string>
+  <string name="change_pin_confirm_pins_dont_match">PIN-koodid ei ühti</string>
+  <string name="change_pin_succeeded">Kõneposti PIN-koodi värskendati</string>
+  <string name="change_pin_system_error">PIN-koodi ei saa määrata</string>
+  <string name="voicemail_visual_voicemail_transcription_switch_title">Kõnepostisõnumite transkribeerimine</string>
+  <string name="voicemail_visual_voicemail_donation_switch_title">Kõnepostisõn. transkribeerimise analüüs</string>
+  <string name="voicemail_activating_summary_info">Kõneposti aktiveerimine</string>
+  <string name="voicemail_transcription_preference_summary_info">Hankige oma kõnepostisõnumite transkriptsioonid, kasutades Google\'i transkribeerimisteenust. %1$s</string>
+  <string name="voicemail_donate_preference_summary_info">Lubage Google\'il transkribeerimise täpsuse parandamiseks oma kõnepostisõnumid üle vaadata. Teie kõnepostisõnumid salvestatakse anonüümselt. %1$s</string>
+  <string name="confirm_disable_voicemail_dialog_title">Visuaalse kõneposti väljalülitamine</string>
+  <string name="confirm_disable_voicemail_dialog_message">See kustutab kõik selles rakenduses salvestatud kõnepostisõnumid ja Google\'i transkriptsioonid. Teie operaator võib säilitada oma koopiad.</string>
+  <string name="confirm_disable_voicemail_accept_dialog_label">LÜLITA VÄLJA</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/settings/res/values-eu/strings.xml b/java/com/android/dialer/voicemail/settings/res/values-eu/strings.xml
new file mode 100644
index 0000000..e4b7092
--- /dev/null
+++ b/java/com/android/dialer/voicemail/settings/res/values-eu/strings.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_settings_with_label">Erantzungailua (%s)</string>
+  <string name="voicemail_settings_title">Erantzungailua</string>
+  <string name="voicemail_notifications_preference_title">Jakinarazpenak</string>
+  <string name="voicemail_change_greeting_preference_title">Erantzungailuko agurra</string>
+  <string name="change_greeting_text">Sakatu grabatzeko</string>
+  <string name="save_button_text">Gorde</string>
+  <string name="redo_button_text">Saiatu berriro</string>
+  <string name="voicemail_advanced_settings_title">Ezarpen aurreratuak</string>
+  <string name="voicemail_visual_voicemail_switch_title">Ikusizko erantzungailua</string>
+  <string name="voicemail_visual_voicemail_auto_archive_switch_title">Babeskopiak eta edukia gordetzeko toki gehiago</string>
+  <string name="voicemail_set_pin_preference_title">Ezarri PIN kodea</string>
+  <string name="voicemail_change_pin_preference_title">Aldatu PIN kodea</string>
+  <string name="voicemail_change_pin_preference_summary_disable">Ikusizko erantzungailuak gaituta egon behar du PIN kodea aldatu ahal izateko</string>
+  <string name="voicemail_change_pin_preference_summary_not_activated">Oraindik ez dago aktibatuta ikusizko erantzungailua. Saiatu berriro geroago.</string>
+  <string name="vm_change_pin_old_pin">PIN kode zaharra</string>
+  <string name="vm_change_pin_new_pin">PIN kode berria</string>
+  <string name="vm_change_pin_progress_message">Itxaron, mesedez.</string>
+  <string name="vm_change_pin_error_too_short">Laburregia da PIN kode berria.</string>
+  <string name="vm_change_pin_error_too_long">Luzeegia da PIN kode berria.</string>
+  <string name="vm_change_pin_error_too_weak">Ez da batere segurua PIN kode berria. Pasahitza segurua izan dadin, ez du izan behar zenbaki-segidarik edo errepikatutako zenbakirik.</string>
+  <string name="vm_change_pin_error_mismatch">PIN kode zaharra ez dator bat.</string>
+  <string name="vm_change_pin_error_invalid">Balio ez duten karaktereak ditu PIN kode berriak.</string>
+  <string name="vm_change_pin_error_system_error">Ezin da aldatu PIN kodea</string>
+  <string name="change_pin_title">Aldatu ikusizko erantzungailuaren PIN kodea</string>
+  <string name="change_pin_continue_label">Egin aurrera</string>
+  <string name="change_pin_cancel_label">Utzi</string>
+  <string name="change_pin_ok_label">Ados</string>
+  <string name="change_pin_enter_old_pin_header">Berretsi PIN kode zaharra</string>
+  <string name="change_pin_enter_old_pin_hint">Aurrera egiteko, idatzi ikusizko erantzungailuaren PIN kodea.</string>
+  <string name="change_pin_enter_new_pin_header">Ezarri PIN kode berria</string>
+  <string name="change_pin_enter_new_pin_hint">%1$d eta %2$d digituren artean izan behar ditu PIN kodeak.</string>
+  <string name="change_pin_confirm_pin_header">Berretsi PIN kodea</string>
+  <string name="change_pin_confirm_pins_dont_match">PIN kodeak ez datoz bat</string>
+  <string name="change_pin_succeeded">Eguneratu da ikusizko erantzungailuaren PIN kodea</string>
+  <string name="change_pin_system_error">Ezin da ezarri PIN kodea</string>
+  <string name="voicemail_visual_voicemail_transcription_switch_title">Ahots-mezuen transkripzioa</string>
+  <string name="voicemail_visual_voicemail_donation_switch_title">Ahots-mezuen transkripzioen analisia</string>
+  <string name="voicemail_activating_summary_info">Erantzungailua aktibatzen</string>
+  <string name="voicemail_transcription_preference_summary_info">Lortu ahots-mezuen transkripzioak Google-ren transkripzio-zerbitzuaren bidez. %1$s</string>
+  <string name="voicemail_donate_preference_summary_info">Utzi Google-ri ahots-mezuak berrikusten, transkripzioak zehatzagoak izan daitezen. Erantzungailuko ahots-mezuak modu anonimoan gordeko dira. %1$s</string>
+  <string name="confirm_disable_voicemail_dialog_title">Desaktibatu ikusizko erantzungailua</string>
+  <string name="confirm_disable_voicemail_dialog_message">Aplikazio honetan gordetako ahots-mezu eta Google transkripzio guztiak ezabatuko dira. Baliteke operadoreak haien kopiak gordetzea.</string>
+  <string name="confirm_disable_voicemail_accept_dialog_label">DESAKTIBATU</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/settings/res/values-fa/strings.xml b/java/com/android/dialer/voicemail/settings/res/values-fa/strings.xml
new file mode 100644
index 0000000..90f3c48
--- /dev/null
+++ b/java/com/android/dialer/voicemail/settings/res/values-fa/strings.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_settings_with_label">پست صوتی (%s)</string>
+  <string name="voicemail_settings_title">پست صوتی</string>
+  <string name="voicemail_notifications_preference_title">اعلان‌ها</string>
+  <string name="voicemail_change_greeting_preference_title">خوشامدگویی پست صوتی</string>
+  <string name="change_greeting_text">ضربه برای ضبط</string>
+  <string name="save_button_text">ذخیره</string>
+  <string name="redo_button_text">امتحان مجدد</string>
+  <string name="voicemail_advanced_settings_title">تنظیمات پیشرفته</string>
+  <string name="voicemail_visual_voicemail_switch_title">پست صوتی تصویری</string>
+  <string name="voicemail_visual_voicemail_auto_archive_switch_title">پشتیبان‌گیری و فضای ذخیره‌سازی اضافی</string>
+  <string name="voicemail_set_pin_preference_title">تنظیم پین</string>
+  <string name="voicemail_change_pin_preference_title">تغییر پین</string>
+  <string name="voicemail_change_pin_preference_summary_disable">برای تغییر پین، پست صوتی تصویری باید فعال شود</string>
+  <string name="voicemail_change_pin_preference_summary_not_activated">پست صوتی تصویری هنوز فعال نشده است، لطفاً بعداً دوباره امتحان کنید</string>
+  <string name="vm_change_pin_old_pin">پین قدیمی</string>
+  <string name="vm_change_pin_new_pin">پین جدید</string>
+  <string name="vm_change_pin_progress_message">لطفاً منتظر بمانید.</string>
+  <string name="vm_change_pin_error_too_short">پین جدید خیلی کوتاه است.</string>
+  <string name="vm_change_pin_error_too_long">پین جدید خیلی طولانی است.</string>
+  <string name="vm_change_pin_error_too_weak">پین جدید خیلی ضعیف است. گذرواژه قوی نباید توالی عددی باشد یا عدد تکراری داشته باشد.</string>
+  <string name="vm_change_pin_error_mismatch">پین قدیمی مطابقت ندارد.</string>
+  <string name="vm_change_pin_error_invalid">پین جدید نویسه‌های نامعتبری دارد.</string>
+  <string name="vm_change_pin_error_system_error">پین تغییر نکرد</string>
+  <string name="change_pin_title">تغییر پین پست صوتی</string>
+  <string name="change_pin_continue_label">ادامه</string>
+  <string name="change_pin_cancel_label">لغو</string>
+  <string name="change_pin_ok_label">تأیید</string>
+  <string name="change_pin_enter_old_pin_header">تأیید پین قدیمی</string>
+  <string name="change_pin_enter_old_pin_hint">برای ادامه دادن، پین پست صوتی را وارد کنید.</string>
+  <string name="change_pin_enter_new_pin_header">تنظیم پین جدید</string>
+  <string name="change_pin_enter_new_pin_hint">پین باید %1$d تا %2$d رقم داشته باشد.</string>
+  <string name="change_pin_confirm_pin_header">تأیید پین</string>
+  <string name="change_pin_confirm_pins_dont_match">پین‌ها با یکدیگر مطابقت ندارند</string>
+  <string name="change_pin_succeeded">پین پست صوتی به‌روزرسانی شد</string>
+  <string name="change_pin_system_error">پین تنظیم نشد</string>
+  <string name="voicemail_visual_voicemail_transcription_switch_title">ترانویسی پست‌ صوتی</string>
+  <string name="voicemail_visual_voicemail_donation_switch_title">تجزیه‌وتحلیل ترانویسی پست صوتی</string>
+  <string name="voicemail_activating_summary_info">فعال کردن پست صوتی</string>
+  <string name="voicemail_transcription_preference_summary_info">‏با استفاده از سرویس ترانویسی Google، ترانوشت پست صوتی‌تان را دریافت کنید. %1$s</string>
+  <string name="voicemail_donate_preference_summary_info">‏برای بهبود دقت ترانویسی، به Google اجازه دهید پیام‌های پست صوتی شما را مرور کند. پیام‌های پست صوتی‌تان به‌صورت ناشناس ذخیره می‌شوند. %1$s</string>
+  <string name="confirm_disable_voicemail_dialog_title">خاموش کردن پست صوتی تصویری</string>
+  <string name="confirm_disable_voicemail_dialog_message">‏با این کار پست‌های صوتی و آوانویسی‌های Google ذخیره‌شده در این برنامه حذف خواهند شد. ممکن است شرکت مخابراتی‌تان نسخه‌های خود را نگه‌دارد.</string>
+  <string name="confirm_disable_voicemail_accept_dialog_label">خاموش کردن</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/settings/res/values-fi/strings.xml b/java/com/android/dialer/voicemail/settings/res/values-fi/strings.xml
new file mode 100644
index 0000000..fbdeb36
--- /dev/null
+++ b/java/com/android/dialer/voicemail/settings/res/values-fi/strings.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_settings_with_label">Vastaaja (%s)</string>
+  <string name="voicemail_settings_title">Vastaaja</string>
+  <string name="voicemail_notifications_preference_title">Ilmoitukset</string>
+  <string name="voicemail_change_greeting_preference_title">Vastaajatervehdys</string>
+  <string name="change_greeting_text">Napauta ja tallenna</string>
+  <string name="save_button_text">Tallenna</string>
+  <string name="redo_button_text">Uudelleen</string>
+  <string name="voicemail_advanced_settings_title">Lisäasetukset</string>
+  <string name="voicemail_visual_voicemail_switch_title">Visuaalinen vastaaja</string>
+  <string name="voicemail_visual_voicemail_auto_archive_switch_title">Lisävarmuuskopiointi ja ‑tallennustila</string>
+  <string name="voicemail_set_pin_preference_title">Aseta PIN-koodi</string>
+  <string name="voicemail_change_pin_preference_title">Vaihda PIN-koodi</string>
+  <string name="voicemail_change_pin_preference_summary_disable">Ota visuaalinen puhelinvastaaja käyttöön, jotta voit vaihtaa PIN-koodin.</string>
+  <string name="voicemail_change_pin_preference_summary_not_activated">Visuaalista puhelinvastaajaa ei ole vielä aktivoitu. Yritä myöhemmin uudelleen.</string>
+  <string name="vm_change_pin_old_pin">Vanha PIN-koodi</string>
+  <string name="vm_change_pin_new_pin">Uusi PIN-koodi</string>
+  <string name="vm_change_pin_progress_message">Odota.</string>
+  <string name="vm_change_pin_error_too_short">Uusi PIN-koodi on liian lyhyt.</string>
+  <string name="vm_change_pin_error_too_long">Uusi PIN-koodi on liian pitkä.</string>
+  <string name="vm_change_pin_error_too_weak">Uusi PIN-koodi on liian heikko. Vahvassa salasanassa ei saa olla peräkkäisiä tai toistuvia numeroita.</string>
+  <string name="vm_change_pin_error_mismatch">Vanha PIN-koodi ei täsmää.</string>
+  <string name="vm_change_pin_error_invalid">Uusi PIN-koodi sisältää virheellisiä merkkejä.</string>
+  <string name="vm_change_pin_error_system_error">PIN-koodin vaihtaminen epäonnistui.</string>
+  <string name="change_pin_title">Vaihda vastaajan PIN-koodi</string>
+  <string name="change_pin_continue_label">Jatka</string>
+  <string name="change_pin_cancel_label">Peruuta</string>
+  <string name="change_pin_ok_label">OK</string>
+  <string name="change_pin_enter_old_pin_header">Vahvista vanha PIN-koodi</string>
+  <string name="change_pin_enter_old_pin_hint">Jatka antamalla vastaajasi PIN-koodi.</string>
+  <string name="change_pin_enter_new_pin_header">Määritä uusi PIN-koodi</string>
+  <string name="change_pin_enter_new_pin_hint">PIN-koodissa on oltava %1$d–%2$d merkkiä.</string>
+  <string name="change_pin_confirm_pin_header">Vahvista PIN-koodisi</string>
+  <string name="change_pin_confirm_pins_dont_match">PIN-koodit eivät täsmää.</string>
+  <string name="change_pin_succeeded">Vastaajan PIN-koodi päivitetty</string>
+  <string name="change_pin_system_error">PIN-koodin määrittäminen epäonnistui.</string>
+  <string name="voicemail_visual_voicemail_transcription_switch_title">Puhelinvastaajan transkriptio</string>
+  <string name="voicemail_visual_voicemail_donation_switch_title">Vastaajaviestien transkriptioanalyysi</string>
+  <string name="voicemail_activating_summary_info">Aktivoidaan puhelinvastaajaa</string>
+  <string name="voicemail_transcription_preference_summary_info">Tilaa vastaajaviestiesi transkriptiot Googlen transkriptiopalvelun avulla. %1$s</string>
+  <string name="voicemail_donate_preference_summary_info">Myönnä Googlelle oikeus tarkastella vastaajaviestejäsi, jotta transkription tarkkuutta voidaan parantaa. Vastaajaviestit tallennetaan nimettöminä. %1$s</string>
+  <string name="confirm_disable_voicemail_dialog_title">Poista visuaalinen vastaaja käytöstä</string>
+  <string name="confirm_disable_voicemail_dialog_message">Kaikki tähän sovellukseen tallennetut vastaajaviestit ja Google-transkriptiot poistetaan. Operaattorisi saattaa säilyttää omat kopionsa.</string>
+  <string name="confirm_disable_voicemail_accept_dialog_label">POISTA KÄYTÖSTÄ</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/settings/res/values-fr-rCA/strings.xml b/java/com/android/dialer/voicemail/settings/res/values-fr-rCA/strings.xml
new file mode 100644
index 0000000..f10661b
--- /dev/null
+++ b/java/com/android/dialer/voicemail/settings/res/values-fr-rCA/strings.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_settings_with_label">Messagerie vocale (%s)</string>
+  <string name="voicemail_settings_title">Messagerie vocale</string>
+  <string name="voicemail_notifications_preference_title">Notifications</string>
+  <string name="voicemail_change_greeting_preference_title">Message d\'accueil de la messagerie vocale</string>
+  <string name="change_greeting_text">Touchez et enregistrez</string>
+  <string name="save_button_text">Enregistrer</string>
+  <string name="redo_button_text">Réessayer</string>
+  <string name="voicemail_advanced_settings_title">Paramètres avancés</string>
+  <string name="voicemail_visual_voicemail_switch_title">Messagerie vocale visuelle</string>
+  <string name="voicemail_visual_voicemail_auto_archive_switch_title">Espace suppl. de sauvegarde et stockage</string>
+  <string name="voicemail_set_pin_preference_title">Définir un NIP</string>
+  <string name="voicemail_change_pin_preference_title">Modifier le NIP</string>
+  <string name="voicemail_change_pin_preference_summary_disable">La messagerie vocale visuelle doit être activée pour que vous puissiez modifier votre NIP</string>
+  <string name="voicemail_change_pin_preference_summary_not_activated">La messagerie vocale visuelle n\'a pas encore été activée. Veuillez réessayer plus tard</string>
+  <string name="vm_change_pin_old_pin">Ancien NIP</string>
+  <string name="vm_change_pin_new_pin">Nouveau NIP</string>
+  <string name="vm_change_pin_progress_message">Veuillez patienter.</string>
+  <string name="vm_change_pin_error_too_short">Le nouveau NIP est trop court.</string>
+  <string name="vm_change_pin_error_too_long">Le nouveau NIP est trop long.</string>
+  <string name="vm_change_pin_error_too_weak">Le nouveau NIP n\'est pas assez robuste. Il ne devrait pas contenir de séquences continues ni de chiffres répétés.</string>
+  <string name="vm_change_pin_error_mismatch">Le NIP entré ne correspond pas à l\'ancien NIP.</string>
+  <string name="vm_change_pin_error_invalid">Le nouveau NIP contient des caractères incorrects.</string>
+  <string name="vm_change_pin_error_system_error">Impossible de modifier le NIP</string>
+  <string name="change_pin_title">Modifier le NIP de la messagerie vocale</string>
+  <string name="change_pin_continue_label">Continuer</string>
+  <string name="change_pin_cancel_label">Annuler</string>
+  <string name="change_pin_ok_label">OK</string>
+  <string name="change_pin_enter_old_pin_header">Confirmer votre ancien NIP</string>
+  <string name="change_pin_enter_old_pin_hint">Entrez votre NIP de messagerie vocale pour continuer.</string>
+  <string name="change_pin_enter_new_pin_header">Choisir un nouveau NIP</string>
+  <string name="change_pin_enter_new_pin_hint">Le NIP doit comporter entre %1$d et %2$d chiffres.</string>
+  <string name="change_pin_confirm_pin_header">Confirmer votre NIP</string>
+  <string name="change_pin_confirm_pins_dont_match">Les NIP ne correspondent pas</string>
+  <string name="change_pin_succeeded">NIP de messagerie vocale mis à jour</string>
+  <string name="change_pin_system_error">Impossible de définir le NIP</string>
+  <string name="voicemail_visual_voicemail_transcription_switch_title">Transcription des messages vocaux</string>
+  <string name="voicemail_visual_voicemail_donation_switch_title">Analyse/transcription de messages vocaux</string>
+  <string name="voicemail_activating_summary_info">Activation de la messagerie vocale en cours…</string>
+  <string name="voicemail_transcription_preference_summary_info">Obtenir des transcriptions de vos messages vocaux grâce au service de transcription de Google. %1$s</string>
+  <string name="voicemail_donate_preference_summary_info">Autoriser Google à accéder à vos messages vocaux pour que nous puissions améliorer l\'exactitude des transcriptions. Vos messages vocaux sont stockés de façon anonyme. %1$s</string>
+  <string name="confirm_disable_voicemail_dialog_title">Désactiver la messagerie vocale visuelle</string>
+  <string name="confirm_disable_voicemail_dialog_message">Cette action supprimera les messages vocaux et les transcriptions Google stockés dans cette application. Il se peut que votre fournisseur de services conserve ses propres copies.</string>
+  <string name="confirm_disable_voicemail_accept_dialog_label">DÉSACTIVER</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/settings/res/values-fr/strings.xml b/java/com/android/dialer/voicemail/settings/res/values-fr/strings.xml
new file mode 100644
index 0000000..bcd48d4
--- /dev/null
+++ b/java/com/android/dialer/voicemail/settings/res/values-fr/strings.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_settings_with_label">Messagerie vocale (%s)</string>
+  <string name="voicemail_settings_title">Messagerie</string>
+  <string name="voicemail_notifications_preference_title">Notifications</string>
+  <string name="voicemail_change_greeting_preference_title">Message d\'accueil</string>
+  <string name="change_greeting_text">Appuyez et enregistrez</string>
+  <string name="save_button_text">Enregistrer</string>
+  <string name="redo_button_text">Réessayer</string>
+  <string name="voicemail_advanced_settings_title">Paramètres avancés</string>
+  <string name="voicemail_visual_voicemail_switch_title">Messagerie vocale visuelle</string>
+  <string name="voicemail_visual_voicemail_auto_archive_switch_title">Espace suppl. de sauvegarde et stockage</string>
+  <string name="voicemail_set_pin_preference_title">Définir le code</string>
+  <string name="voicemail_change_pin_preference_title">Modifier le code</string>
+  <string name="voicemail_change_pin_preference_summary_disable">Pour que vous puissiez modifier le code, la messagerie vocale visuelle doit être activée</string>
+  <string name="voicemail_change_pin_preference_summary_not_activated">La messagerie vocale visuelle n\'est pas encore activée. Veuillez réessayer ultérieurement.</string>
+  <string name="vm_change_pin_old_pin">Ancien code</string>
+  <string name="vm_change_pin_new_pin">Nouveau code</string>
+  <string name="vm_change_pin_progress_message">Patientez.</string>
+  <string name="vm_change_pin_error_too_short">Le nouveau code est trop court.</string>
+  <string name="vm_change_pin_error_too_long">Le nouveau code est trop long.</string>
+  <string name="vm_change_pin_error_too_weak">Le nouveau code n\'est pas suffisamment sécurisé. Pour qu\'un mot de passe soit sûr, il ne doit pas contenir de chiffres qui se suivent ou qui se répètent.</string>
+  <string name="vm_change_pin_error_mismatch">L\'ancien code est erroné.</string>
+  <string name="vm_change_pin_error_invalid">Le nouveau code contient des caractères incorrects.</string>
+  <string name="vm_change_pin_error_system_error">Impossible de modifier le code</string>
+  <string name="change_pin_title">Modifier le code de la messagerie vocale</string>
+  <string name="change_pin_continue_label">Continuer</string>
+  <string name="change_pin_cancel_label">Annuler</string>
+  <string name="change_pin_ok_label">OK</string>
+  <string name="change_pin_enter_old_pin_header">Confirmer votre ancien code</string>
+  <string name="change_pin_enter_old_pin_hint">Pour continuer, saisissez le code de votre messagerie vocale.</string>
+  <string name="change_pin_enter_new_pin_header">Définir un nouveau code</string>
+  <string name="change_pin_enter_new_pin_hint">Le code ne peut être composé que de chiffres de %1$d à %2$d.</string>
+  <string name="change_pin_confirm_pin_header">Confirmez votre code</string>
+  <string name="change_pin_confirm_pins_dont_match">Les codes ne correspondent pas.</string>
+  <string name="change_pin_succeeded">Le code de votre messagerie vocale a été mis à jour</string>
+  <string name="change_pin_system_error">Impossible de définir le code</string>
+  <string name="voicemail_visual_voicemail_transcription_switch_title">Transcription des messages vocaux</string>
+  <string name="voicemail_visual_voicemail_donation_switch_title">Analyse des messages vocaux transcrits</string>
+  <string name="voicemail_activating_summary_info">Activation de la messagerie vocale</string>
+  <string name="voicemail_transcription_preference_summary_info">Recevez vos messages vocaux par écrit avec le service de transcription de Google. %1$s</string>
+  <string name="voicemail_donate_preference_summary_info">Autorisez Google à analyser vos messages vocaux pour améliorer la justesse de la transcription. Ceux-ci sont stockés de manière anonyme. %1$s</string>
+  <string name="confirm_disable_voicemail_dialog_title">Désactiver la messagerie vocale visuelle</string>
+  <string name="confirm_disable_voicemail_dialog_message">Cette opération entraînera la suppression des messages vocaux et des transcriptions Google stockés dans l\'application. Votre opérateur en conserve peut-être une copie.</string>
+  <string name="confirm_disable_voicemail_accept_dialog_label">DÉSACTIVER</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/settings/res/values-gl/strings.xml b/java/com/android/dialer/voicemail/settings/res/values-gl/strings.xml
new file mode 100644
index 0000000..8fd8ca2
--- /dev/null
+++ b/java/com/android/dialer/voicemail/settings/res/values-gl/strings.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_settings_with_label">Correo de voz (%s)</string>
+  <string name="voicemail_settings_title">Correo de voz</string>
+  <string name="voicemail_notifications_preference_title">Notificacións</string>
+  <string name="voicemail_change_greeting_preference_title">Saúdo do correo de voz</string>
+  <string name="change_greeting_text">Toca para gravar</string>
+  <string name="save_button_text">Gardar</string>
+  <string name="redo_button_text">Tentar de novo</string>
+  <string name="voicemail_advanced_settings_title">Configuración avanzada</string>
+  <string name="voicemail_visual_voicemail_switch_title">Correo de voz visual</string>
+  <string name="voicemail_visual_voicemail_auto_archive_switch_title">Copia de seguranza e almacenamento extra</string>
+  <string name="voicemail_set_pin_preference_title">Establecer PIN</string>
+  <string name="voicemail_change_pin_preference_title">Cambiar PIN</string>
+  <string name="voicemail_change_pin_preference_summary_disable">Para poder cambiar o PIN, o correo de voz visual ten que estar activado</string>
+  <string name="voicemail_change_pin_preference_summary_not_activated">O correo de voz visual aínda non está activado. Téntao de novo máis tarde</string>
+  <string name="vm_change_pin_old_pin">PIN antigo</string>
+  <string name="vm_change_pin_new_pin">PIN novo</string>
+  <string name="vm_change_pin_progress_message">Agarda.</string>
+  <string name="vm_change_pin_error_too_short">O novo PIN é demasiado curto.</string>
+  <string name="vm_change_pin_error_too_long">O novo PIN é demasiado longo.</string>
+  <string name="vm_change_pin_error_too_weak">O novo PIN é pouco seguro. Para que sexa seguro, non debe conter secuencias continuas nin díxitos repetidos.</string>
+  <string name="vm_change_pin_error_mismatch">O PIN antigo non coincide.</string>
+  <string name="vm_change_pin_error_invalid">O novo PIN contén caracteres non válidos.</string>
+  <string name="vm_change_pin_error_system_error">Non se puido cambiar o PIN</string>
+  <string name="change_pin_title">Cambiar PIN do correo de voz</string>
+  <string name="change_pin_continue_label">Continuar</string>
+  <string name="change_pin_cancel_label">Cancelar</string>
+  <string name="change_pin_ok_label">Aceptar</string>
+  <string name="change_pin_enter_old_pin_header">Confirmar o teu PIN antigo</string>
+  <string name="change_pin_enter_old_pin_hint">Introduce o PIN do teu correo de voz para continuar.</string>
+  <string name="change_pin_enter_new_pin_header">Establecer un PIN novo</string>
+  <string name="change_pin_enter_new_pin_hint">O PIN debe conter entre %1$d e %2$d díxitos.</string>
+  <string name="change_pin_confirm_pin_header">Confirmar o teu PIN</string>
+  <string name="change_pin_confirm_pins_dont_match">Os PIN non coinciden</string>
+  <string name="change_pin_succeeded">Actualizouse o PIN do correo de voz</string>
+  <string name="change_pin_system_error">Non se puido establecer o PIN</string>
+  <string name="voicemail_visual_voicemail_transcription_switch_title">Transcrición do correo de voz</string>
+  <string name="voicemail_visual_voicemail_donation_switch_title">Análise dos correos de voz transcritos</string>
+  <string name="voicemail_activating_summary_info">Activando correo de voz</string>
+  <string name="voicemail_transcription_preference_summary_info">Obtén transcricións dos teus correos de voz co servizo de transcrición de Google. %1$s</string>
+  <string name="voicemail_donate_preference_summary_info">Permite que Google revise as mensaxes do teu correo de voz para poder mellorar a precisión das transcricións. As mensaxes do teu correo de voz almacénanse de maneira anónima. %1$s</string>
+  <string name="confirm_disable_voicemail_dialog_title">Desactivar correo de voz visual</string>
+  <string name="confirm_disable_voicemail_dialog_message">Con esta acción, eliminaranse os correos de voz, así como as transcricións de Google almacenadas nesta aplicación. É posible que o teu operador garde as súas propias copias.</string>
+  <string name="confirm_disable_voicemail_accept_dialog_label">DESACTIVAR</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/settings/res/values-gu/strings.xml b/java/com/android/dialer/voicemail/settings/res/values-gu/strings.xml
new file mode 100644
index 0000000..1bee0e1
--- /dev/null
+++ b/java/com/android/dialer/voicemail/settings/res/values-gu/strings.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_settings_with_label">વૉઇસમેઇલ (%s)</string>
+  <string name="voicemail_settings_title">વૉઇસમેઇલ</string>
+  <string name="voicemail_notifications_preference_title">નોટિફિકેશનો</string>
+  <string name="voicemail_change_greeting_preference_title">વૉઇસમેઇલની શુભેચ્છા</string>
+  <string name="change_greeting_text">રેકોર્ડ કરવા ટૅપ કરો</string>
+  <string name="save_button_text">સાચવો</string>
+  <string name="redo_button_text">ફરી પ્રયાસ કરો</string>
+  <string name="voicemail_advanced_settings_title">વિગતવાર સેટિંગ</string>
+  <string name="voicemail_visual_voicemail_switch_title">વિઝ્યુઅલ વૉઇસમેઇલ</string>
+  <string name="voicemail_visual_voicemail_auto_archive_switch_title">વધારાનું બૅકઅપ અને સ્ટોરેજ</string>
+  <string name="voicemail_set_pin_preference_title">પિન સેટ કરો</string>
+  <string name="voicemail_change_pin_preference_title">પિન બદલો</string>
+  <string name="voicemail_change_pin_preference_summary_disable">પિન બદલવા માટે વિઝ્યુઅલ વૉઇસમેઇલ ચાલુ હોય તે આવશ્યક છે</string>
+  <string name="voicemail_change_pin_preference_summary_not_activated">વિઝ્યુઅલ વૉઇસમેઇલ હજી સુધી સક્રિય થયેલ નથી, કૃપા કરીને થોડા સમય પછી ફરી પ્રયાસ કરો</string>
+  <string name="vm_change_pin_old_pin">જૂનો પિન</string>
+  <string name="vm_change_pin_new_pin">નવો પિન</string>
+  <string name="vm_change_pin_progress_message">કૃપા કરીને રાહ જુઓ.</string>
+  <string name="vm_change_pin_error_too_short">નવો પિન ખૂબ ટૂંકો છે.</string>
+  <string name="vm_change_pin_error_too_long">નવો પિન ખૂબ લાંબો છે.</string>
+  <string name="vm_change_pin_error_too_weak">નવો પિન ખૂબ નબળો છે. સશક્ત પાસવર્ડમાં સતત ક્રમ અથવા પુનરાવર્તિત અંકો હોવા જોઈએ નહીં.</string>
+  <string name="vm_change_pin_error_mismatch">જૂનો પિન મેળ ખાતો નથી.</string>
+  <string name="vm_change_pin_error_invalid">નવા પિનમાં અમાન્ય અક્ષરો છે.</string>
+  <string name="vm_change_pin_error_system_error">પિન બદલી શકાતો નથી</string>
+  <string name="change_pin_title">વૉઇસમેઇલ પિન બદલો</string>
+  <string name="change_pin_continue_label">આગળ વધો</string>
+  <string name="change_pin_cancel_label">રદ કરો</string>
+  <string name="change_pin_ok_label">ઓકે</string>
+  <string name="change_pin_enter_old_pin_header">તમારા જૂના પિનની પુષ્ટિ કરો</string>
+  <string name="change_pin_enter_old_pin_hint">ચાલુ રાખવા માટે તમારો વૉઇસમેઇલ પિન દાખલ કરો.</string>
+  <string name="change_pin_enter_new_pin_header">એક નવો પિન સેટ કરો</string>
+  <string name="change_pin_enter_new_pin_hint">પિન %1$d-%2$d અંકનો હોવો આવશ્યક છે.</string>
+  <string name="change_pin_confirm_pin_header">તમારા પિનની પુષ્ટિ કરો</string>
+  <string name="change_pin_confirm_pins_dont_match">પિન મેળ ખાતા નથી</string>
+  <string name="change_pin_succeeded">વૉઇસમેઇલ પિન અપડેટ કર્યો</string>
+  <string name="change_pin_system_error">પિન સેટ કરી શકાતો નથી</string>
+  <string name="voicemail_visual_voicemail_transcription_switch_title">વૉઇસમેઇલ ટ્રાન્સક્રિપ્શન</string>
+  <string name="voicemail_visual_voicemail_donation_switch_title">વૉઇસમેઇલના ટ્રાન્સક્રિપ્શનનું વિશ્લેષણ</string>
+  <string name="voicemail_activating_summary_info">વૉઇસમેઇલ સક્રિય કરી રહ્યાં છીએ</string>
+  <string name="voicemail_transcription_preference_summary_info">Googleની ટ્રાન્સક્રિપ્શન સેવાનો ઉપયોગ કરીને તમારા વૉઇસમેઇલની ટ્રાન્સક્રિપ્ટ મેળવો. %1$s</string>
+  <string name="voicemail_donate_preference_summary_info">ટ્રાન્સક્રિપ્શનની સચોટતા વધુ બહેતર બનાવવા માટે Googleને તમારા વૉઇસમેઇલ સંદેશાનો રિવ્યૂ કરવા દો. તમારા વૉઇસમેઇલ સંદેશા અજ્ઞાત રૂપે સ્ટોર કરવામાં આવે છે. %1$s</string>
+  <string name="confirm_disable_voicemail_dialog_title">વિઝ્યુઅલ વૉઇસમેઇલ બંધ કરો</string>
+  <string name="confirm_disable_voicemail_dialog_message">આ ક્રિયા આ ઍપમાં સંગ્રહિત કોઈપણ વૉઇસમેઇલ અને Google ટ્રાન્સ્ક્રિપ્ટને ડિલીટ કરી નાખશે. તમારા કૅરિઅર તેમની કૉપિ કદાચ જાળવી રાખી શકે છે.</string>
+  <string name="confirm_disable_voicemail_accept_dialog_label">બંધ કરો</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/settings/res/values-hi/strings.xml b/java/com/android/dialer/voicemail/settings/res/values-hi/strings.xml
new file mode 100644
index 0000000..89f09df
--- /dev/null
+++ b/java/com/android/dialer/voicemail/settings/res/values-hi/strings.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_settings_with_label">वॉइसमेल (%s)</string>
+  <string name="voicemail_settings_title">वॉइसमेल</string>
+  <string name="voicemail_notifications_preference_title">सूचनाएं</string>
+  <string name="voicemail_change_greeting_preference_title">वॉइसमेल अभिवादन</string>
+  <string name="change_greeting_text">टैप से रिकॉर्ड करें</string>
+  <string name="save_button_text">सेव करें</string>
+  <string name="redo_button_text">फिर करें</string>
+  <string name="voicemail_advanced_settings_title">बेहतर सेटिंग</string>
+  <string name="voicemail_visual_voicemail_switch_title">विज़ुअल वॉइसमेल</string>
+  <string name="voicemail_visual_voicemail_auto_archive_switch_title">अतिरिक्त बैकअप और जगह</string>
+  <string name="voicemail_set_pin_preference_title">पिन सेट करें</string>
+  <string name="voicemail_change_pin_preference_title">पिन बदलें</string>
+  <string name="voicemail_change_pin_preference_summary_disable">पिन बदलने के लिए विज़ुअल वॉइसमेल चालू होना चाहिए</string>
+  <string name="voicemail_change_pin_preference_summary_not_activated">विज़ुअल वॉइसमेल अभी तक सक्रिय नहीं किया गया है, कृपया बाद में फिर कोशिश करें</string>
+  <string name="vm_change_pin_old_pin">पुराना पिन</string>
+  <string name="vm_change_pin_new_pin">नया पिन</string>
+  <string name="vm_change_pin_progress_message">कृपया इंतज़ार करें.</string>
+  <string name="vm_change_pin_error_too_short">नया पिन बहुत छोटा है.</string>
+  <string name="vm_change_pin_error_too_long">नया पिन बहुत बड़ा है.</string>
+  <string name="vm_change_pin_error_too_weak">नया पिन बहुत कमज़ोर है. किसी मजबूत पासवर्ड में लगातार क्रम में अंक या अंकों का दोहराव नहीं होना चाहिए.</string>
+  <string name="vm_change_pin_error_mismatch">पुराना पिन मेल नहीं खाता.</string>
+  <string name="vm_change_pin_error_invalid">नए पिन में अमान्य वर्ण शामिल हैं.</string>
+  <string name="vm_change_pin_error_system_error">पिन बदला नहीं जा सकता</string>
+  <string name="change_pin_title">वॉइसमेल पिन बदलें</string>
+  <string name="change_pin_continue_label">जारी रखें</string>
+  <string name="change_pin_cancel_label">अभी नहीं</string>
+  <string name="change_pin_ok_label">ठीक है</string>
+  <string name="change_pin_enter_old_pin_header">अपने पुराने पिन की पुष्टि करें</string>
+  <string name="change_pin_enter_old_pin_hint">जारी रखने के लिए अपना वॉइसमेल पिन डालें.</string>
+  <string name="change_pin_enter_new_pin_header">एक नया पिन सेट करें</string>
+  <string name="change_pin_enter_new_pin_hint">पिन में %1$d-%2$d अंक होने चाहिए.</string>
+  <string name="change_pin_confirm_pin_header">अपने पिन की पुष्टि करें</string>
+  <string name="change_pin_confirm_pins_dont_match">पिन मेल नहीं खाते</string>
+  <string name="change_pin_succeeded">वॉइसमेल पिन अपडेट किया गया</string>
+  <string name="change_pin_system_error">पिन सेट नहीं किया जा सकता</string>
+  <string name="voicemail_visual_voicemail_transcription_switch_title">वॉइसमेल को लेख में बदलना</string>
+  <string name="voicemail_visual_voicemail_donation_switch_title">वॉइसमेल ट्रांसक्रिप्शन विश्लेषण</string>
+  <string name="voicemail_activating_summary_info">वॉइसमेल सक्रिय किया जा रहा है</string>
+  <string name="voicemail_transcription_preference_summary_info">Google की वॉइसमेल को लेख में बदलने की सेवा का इस्तेमाल करके अपने वॉइसमेल को लेख में बदलें. %1$s</string>
+  <string name="voicemail_donate_preference_summary_info">Google को आपके वॉइसमेल मैसेज की समीक्षा करने दें, ताकि वॉइसमेल को लेख में बदलने के काम को और भी सटीक बनाया जा सके. आपके वॉइसमेल मैसेज गुमनाम रूप से संग्रहित किए जाते हैं. %1$s</string>
+  <string name="confirm_disable_voicemail_dialog_title">विज़ुअल वॉइसमेल बंद करें</string>
+  <string name="confirm_disable_voicemail_dialog_message">अगर आप इसे बंद करते हैं, तो इस ऐप में मौजूद वॉइसमेल और Google ट्रांसक्रिप्ट मिटा दिए जाएंगे. आपका वाहक अपने पास उनकी कॉपी रख सकता है.</string>
+  <string name="confirm_disable_voicemail_accept_dialog_label">बंद करें</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/settings/res/values-hr/strings.xml b/java/com/android/dialer/voicemail/settings/res/values-hr/strings.xml
new file mode 100644
index 0000000..9c1037b
--- /dev/null
+++ b/java/com/android/dialer/voicemail/settings/res/values-hr/strings.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_settings_with_label">Govorna pošta (%s)</string>
+  <string name="voicemail_settings_title">Govorna pošta</string>
+  <string name="voicemail_notifications_preference_title">Obavijesti</string>
+  <string name="voicemail_change_greeting_preference_title">Pozdravna poruka glasovne pošte</string>
+  <string name="change_greeting_text">Dodirnite za snim.</string>
+  <string name="save_button_text">Spremi</string>
+  <string name="redo_button_text">Ponovi</string>
+  <string name="voicemail_advanced_settings_title">Napredne postavke</string>
+  <string name="voicemail_visual_voicemail_switch_title">Vizualna govorna pošta</string>
+  <string name="voicemail_visual_voicemail_auto_archive_switch_title">Dodatno sigurnosno kopiranje i pohrana</string>
+  <string name="voicemail_set_pin_preference_title">Postavljanje PIN-a</string>
+  <string name="voicemail_change_pin_preference_title">Promjena PIN-a</string>
+  <string name="voicemail_change_pin_preference_summary_disable">Za promjenu PIN-a potrebno je omogućiti vizualnu govornu poštu</string>
+  <string name="voicemail_change_pin_preference_summary_not_activated">Vizualna govorna pošta još nije aktivirana, pokušajte ponovno kasnije</string>
+  <string name="vm_change_pin_old_pin">Stari PIN</string>
+  <string name="vm_change_pin_new_pin">Novi PIN</string>
+  <string name="vm_change_pin_progress_message">Pričekajte.</string>
+  <string name="vm_change_pin_error_too_short">Novi PIN je prekratak.</string>
+  <string name="vm_change_pin_error_too_long">Novi PIN je predugačak.</string>
+  <string name="vm_change_pin_error_too_weak">Novi je PIN preslab. Jaka zaporka ne smije sadržavati kontinuirani niz ili ponovljene znamenke.</string>
+  <string name="vm_change_pin_error_mismatch">Stari se PIN ne podudara.</string>
+  <string name="vm_change_pin_error_invalid">Novi PIN sadrži nevažeće znakove.</string>
+  <string name="vm_change_pin_error_system_error">PIN se ne može promijeniti</string>
+  <string name="change_pin_title">Promjena PIN-a govorne pošte</string>
+  <string name="change_pin_continue_label">Nastavi</string>
+  <string name="change_pin_cancel_label">Odustani</string>
+  <string name="change_pin_ok_label">U redu</string>
+  <string name="change_pin_enter_old_pin_header">Potvrda starog PIN-a</string>
+  <string name="change_pin_enter_old_pin_hint">Da biste nastavili, unesite PIN za govornu poštu.</string>
+  <string name="change_pin_enter_new_pin_header">Postavljanje novog PIN-a</string>
+  <string name="change_pin_enter_new_pin_hint">PIN mora sadržavati od %1$d do %2$d znamenki.</string>
+  <string name="change_pin_confirm_pin_header">Potvrdite PIN</string>
+  <string name="change_pin_confirm_pins_dont_match">PIN-ovi se ne podudaraju</string>
+  <string name="change_pin_succeeded">Ažuriran je PIN govorne pošte</string>
+  <string name="change_pin_system_error">PIN se ne može postaviti</string>
+  <string name="voicemail_visual_voicemail_transcription_switch_title">Prijepis govorne pošte</string>
+  <string name="voicemail_visual_voicemail_donation_switch_title">Analiza prijepisa govorne pošte</string>
+  <string name="voicemail_activating_summary_info">Aktivacija govorne pošte</string>
+  <string name="voicemail_transcription_preference_summary_info">Primajte prijepise poruka govorne pošte pomoću Googleove usluge prijepisa. %1$s</string>
+  <string name="voicemail_donate_preference_summary_info">Dopustite da Google pregleda vaše poruke govorne pošte radi poboljšanja točnosti prijepisa. Vaše se poruke govorne pošte anonimno spremaju. %1$s</string>
+  <string name="confirm_disable_voicemail_dialog_title">Isključivanje vizualne govorne pošte</string>
+  <string name="confirm_disable_voicemail_dialog_message">Time će se izbrisati sve poruke govorne pošte i Googleovi prijepisi spremljeni u ovoj aplikaciji. Vaš mobilni operater može sačuvati vlastite kopije.</string>
+  <string name="confirm_disable_voicemail_accept_dialog_label">ISKLJUČI</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/settings/res/values-hu/strings.xml b/java/com/android/dialer/voicemail/settings/res/values-hu/strings.xml
new file mode 100644
index 0000000..5d65b29
--- /dev/null
+++ b/java/com/android/dialer/voicemail/settings/res/values-hu/strings.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_settings_with_label">Hangposta (%s)</string>
+  <string name="voicemail_settings_title">Hangposta</string>
+  <string name="voicemail_notifications_preference_title">Értesítések</string>
+  <string name="voicemail_change_greeting_preference_title">Üdvözlőüzenet</string>
+  <string name="change_greeting_text">Felvétel: koppintás</string>
+  <string name="save_button_text">Mentés</string>
+  <string name="redo_button_text">Újra</string>
+  <string name="voicemail_advanced_settings_title">Speciális beállítások</string>
+  <string name="voicemail_visual_voicemail_switch_title">Vizuális hangposta</string>
+  <string name="voicemail_visual_voicemail_auto_archive_switch_title">Extra tárhely és biztonsági mentés</string>
+  <string name="voicemail_set_pin_preference_title">PIN-kód beállítása</string>
+  <string name="voicemail_change_pin_preference_title">PIN-kód módosítása</string>
+  <string name="voicemail_change_pin_preference_summary_disable">A PIN-kód módosításához engedélyezni kell a vizuális hangpostát.</string>
+  <string name="voicemail_change_pin_preference_summary_not_activated">A vizuális hangposta még nincs aktiválva. Engedélyezze később.</string>
+  <string name="vm_change_pin_old_pin">Régi PIN-kód</string>
+  <string name="vm_change_pin_new_pin">Új PIN-kód</string>
+  <string name="vm_change_pin_progress_message">Kérjük, várjon.</string>
+  <string name="vm_change_pin_error_too_short">Az új PIN-kód túl rövid.</string>
+  <string name="vm_change_pin_error_too_long">Az új PIN-kód túl hosszú.</string>
+  <string name="vm_change_pin_error_too_weak">Az új PIN-kód túl gyenge. Az erős jelszavakban nincsenek egymás után következő számok vagy ismétlődő számjegyek.</string>
+  <string name="vm_change_pin_error_mismatch">A régi PIN-kód nem egyezik a tárolttal.</string>
+  <string name="vm_change_pin_error_invalid">Az új PIN-kódban érvénytelen karakterek vannak.</string>
+  <string name="vm_change_pin_error_system_error">Nem sikerült módosítani a PIN-kódot</string>
+  <string name="change_pin_title">A hangposta PIN-kódjának módosítása</string>
+  <string name="change_pin_continue_label">Tovább</string>
+  <string name="change_pin_cancel_label">Mégse</string>
+  <string name="change_pin_ok_label">OK</string>
+  <string name="change_pin_enter_old_pin_header">A régi PIN-kód megerősítése</string>
+  <string name="change_pin_enter_old_pin_hint">A folytatáshoz írja be a hangpostához használt PIN-kódját.</string>
+  <string name="change_pin_enter_new_pin_header">Új PIN-kód beállítása</string>
+  <string name="change_pin_enter_new_pin_hint">A PIN-kódnak %1$d–%2$d számjegyből kell állnia.</string>
+  <string name="change_pin_confirm_pin_header">Erősítse meg a PIN-kódját</string>
+  <string name="change_pin_confirm_pins_dont_match">A PIN-kódok nem egyeznek</string>
+  <string name="change_pin_succeeded">A hangposta PIN-kódja megváltozott</string>
+  <string name="change_pin_system_error">Nem sikerült beállítani a PIN-kódot</string>
+  <string name="voicemail_visual_voicemail_transcription_switch_title">Hangpostaüzenetek átírása</string>
+  <string name="voicemail_visual_voicemail_donation_switch_title">Hangpostaüzenet-átirás elemzése</string>
+  <string name="voicemail_activating_summary_info">Hangposta aktiválása</string>
+  <string name="voicemail_transcription_preference_summary_info">A Google átírási szolgáltatásával lekérheti a hangpostaüzenetek átiratát. %1$s</string>
+  <string name="voicemail_donate_preference_summary_info">Engedélyezze, hogy a Google áttekinthesse a hangpostaüzeneteit az átiratok pontosságának javítása érdekében. A hangpostaüzeneteket anonim módon tároljuk. %1$s</string>
+  <string name="confirm_disable_voicemail_dialog_title">A vizuális hangposta kikapcsolása</string>
+  <string name="confirm_disable_voicemail_dialog_message">Ezzel törli az alkalmazásban tárolt hangpostaüzeneteket és Google-átiratokat. A szolgáltató megtarthatja a saját másolatokat.</string>
+  <string name="confirm_disable_voicemail_accept_dialog_label">KIKAPCSOLÁS</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/settings/res/values-hy/strings.xml b/java/com/android/dialer/voicemail/settings/res/values-hy/strings.xml
new file mode 100644
index 0000000..633539e
--- /dev/null
+++ b/java/com/android/dialer/voicemail/settings/res/values-hy/strings.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_settings_with_label">Ձայնային փոստ (%s)</string>
+  <string name="voicemail_settings_title">Ձայնային փոստ</string>
+  <string name="voicemail_notifications_preference_title">Ծանուցումներ</string>
+  <string name="voicemail_change_greeting_preference_title">Ձայնային փոստի ողջույն</string>
+  <string name="change_greeting_text">Սկսել ձայնագրումը</string>
+  <string name="save_button_text">Պահել</string>
+  <string name="redo_button_text">Կրկնել</string>
+  <string name="voicemail_advanced_settings_title">Ընդլայնված կարգավորումներ</string>
+  <string name="voicemail_visual_voicemail_switch_title">Ձայնային փոստի ցուցադրում</string>
+  <string name="voicemail_visual_voicemail_auto_archive_switch_title">Լրացուցիչ տարածք և պահուստավորում</string>
+  <string name="voicemail_set_pin_preference_title">Սահմանեք PIN կոդ</string>
+  <string name="voicemail_change_pin_preference_title">Փոխեք PIN կոդը</string>
+  <string name="voicemail_change_pin_preference_summary_disable">PIN կոդը փոխելու համար ձայնային փոստի ցուցադրումը պետք է միացված լինի</string>
+  <string name="voicemail_change_pin_preference_summary_not_activated">Ձայնային փոստի ցուցադրումը դեռ ակտիվացված չէ: Փորձեք ավելի ուշ:</string>
+  <string name="vm_change_pin_old_pin">Հին PIN կոդ</string>
+  <string name="vm_change_pin_new_pin">Նոր PIN կոդ</string>
+  <string name="vm_change_pin_progress_message">Սպասեք:</string>
+  <string name="vm_change_pin_error_too_short">Նոր PIN կոդը չափազանց կարճ է:</string>
+  <string name="vm_change_pin_error_too_long">Նոր PIN կոդը չափազանց երկար է:</string>
+  <string name="vm_change_pin_error_too_weak">Նոր PIN կոդը բավականաչափ հուսալի չէ: Հուսալի գաղտնաբառը չպետք է ունենա իրար հաջորդող կամ կրկնվող թվեր:</string>
+  <string name="vm_change_pin_error_mismatch">Հին PIN կոդը սխալ է:</string>
+  <string name="vm_change_pin_error_invalid">Նոր PIN կոդը պարունակում է անվավեր նիշեր:</string>
+  <string name="vm_change_pin_error_system_error">Չհաջողվեց փոխել PIN կոդը</string>
+  <string name="change_pin_title">Փոխեք ձայնային փոստի PIN կոդը</string>
+  <string name="change_pin_continue_label">Շարունակել</string>
+  <string name="change_pin_cancel_label">Չեղարկել</string>
+  <string name="change_pin_ok_label">Եղավ</string>
+  <string name="change_pin_enter_old_pin_header">Հաստատեք հին PIN կոդը</string>
+  <string name="change_pin_enter_old_pin_hint">Շարունակելու համար մուտքագրեք ձայնային փոստի PIN կոդը:</string>
+  <string name="change_pin_enter_new_pin_header">Ընտրեք նոր PIN կոդ</string>
+  <string name="change_pin_enter_new_pin_hint">PIN կոդը պետք է բաղկացած լինի %1$d-%2$d թվանշանից:</string>
+  <string name="change_pin_confirm_pin_header">Հաստատեք ձեր PIN կոդը</string>
+  <string name="change_pin_confirm_pins_dont_match">PIN կոդերը չեն համընկնում</string>
+  <string name="change_pin_succeeded">Ձայնային փոստի PIN կոդը թարմացվեց</string>
+  <string name="change_pin_system_error">Չհաջողվեց սահմանել PIN կոդ</string>
+  <string name="voicemail_visual_voicemail_transcription_switch_title">Ձայնային փոստի տառադրում</string>
+  <string name="voicemail_visual_voicemail_donation_switch_title">Ձայնային փոստի տառադրման վերլուծություն</string>
+  <string name="voicemail_activating_summary_info">Ձայնային փոստի ակտիվացում</string>
+  <string name="voicemail_transcription_preference_summary_info">Կատարեք ձայնային հաղորդագրությունների տառադրում Google-ի տառադրման ծառայության օգնությամբ: %1$s</string>
+  <string name="voicemail_donate_preference_summary_info">Թույլ տվեք Google-ին ստուգել ձեր ձայնային հաղորդագրությունները՝ տառադրման ճշգրտությունը բարելավելու համար: Ձեր ձայնային հաղորդագրությունները անանուն կերպով են պահվում: %1$s</string>
+  <string name="confirm_disable_voicemail_dialog_title">Անջատել ձայնային փոստի ցուցադրումը</string>
+  <string name="confirm_disable_voicemail_dialog_message">Կջնջվեն այս հավելվածում պահված ամբողջ ձայնային փոստն ու ձայնագրությունների տեքստերը՝ տառադրված Google-ի հատուկ ծառայության միջոցով: Դրանց պատճենները հնարավոր է մնան ձեր օպերատորի մոտ:</string>
+  <string name="confirm_disable_voicemail_accept_dialog_label">ԱՆՋԱՏԵԼ</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/settings/res/values-in/strings.xml b/java/com/android/dialer/voicemail/settings/res/values-in/strings.xml
new file mode 100644
index 0000000..a2b05e4
--- /dev/null
+++ b/java/com/android/dialer/voicemail/settings/res/values-in/strings.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_settings_with_label">Pesan Suara (%s)</string>
+  <string name="voicemail_settings_title">Pesan Suara</string>
+  <string name="voicemail_notifications_preference_title">Notifikasi</string>
+  <string name="voicemail_change_greeting_preference_title">Salam untuk pesan suara</string>
+  <string name="change_greeting_text">Tap untuk Merekam</string>
+  <string name="save_button_text">Simpan</string>
+  <string name="redo_button_text">Coba Lagi</string>
+  <string name="voicemail_advanced_settings_title">Setelan Lanjutan</string>
+  <string name="voicemail_visual_voicemail_switch_title">Pesan suara visual</string>
+  <string name="voicemail_visual_voicemail_auto_archive_switch_title">Penyimpanan dan backup ekstra</string>
+  <string name="voicemail_set_pin_preference_title">Setel PIN</string>
+  <string name="voicemail_change_pin_preference_title">Ubah PIN</string>
+  <string name="voicemail_change_pin_preference_summary_disable">Pesan suara visual harus diaktifkan untuk mengubah PIN</string>
+  <string name="voicemail_change_pin_preference_summary_not_activated">Pesan suara visual belum diaktifkan, coba lagi nanti</string>
+  <string name="vm_change_pin_old_pin">PIN Lama</string>
+  <string name="vm_change_pin_new_pin">PIN Baru</string>
+  <string name="vm_change_pin_progress_message">Harap tunggu.</string>
+  <string name="vm_change_pin_error_too_short">PIN baru terlalu pendek.</string>
+  <string name="vm_change_pin_error_too_long">PIN baru terlalu panjang.</string>
+  <string name="vm_change_pin_error_too_weak">PIN baru terlalu lemah. Sandi yang kuat tidak boleh memiliki urutan karakter kontinu atau digit berulang.</string>
+  <string name="vm_change_pin_error_mismatch">PIN lama tidak cocok.</string>
+  <string name="vm_change_pin_error_invalid">PIN baru berisi karakter yang tidak valid.</string>
+  <string name="vm_change_pin_error_system_error">Tidak dapat mengubah PIN</string>
+  <string name="change_pin_title">Ubah PIN Pesan Suara</string>
+  <string name="change_pin_continue_label">Lanjutkan</string>
+  <string name="change_pin_cancel_label">Batal</string>
+  <string name="change_pin_ok_label">Oke</string>
+  <string name="change_pin_enter_old_pin_header">Konfirmasi PIN lama Anda</string>
+  <string name="change_pin_enter_old_pin_hint">Masukkan PIN pesan suara Anda untuk melanjutkan.</string>
+  <string name="change_pin_enter_new_pin_header">Setel PIN baru</string>
+  <string name="change_pin_enter_new_pin_hint">PIN harus terdiri dari %1$d-%2$d digit.</string>
+  <string name="change_pin_confirm_pin_header">Konfirmasi PIN Anda</string>
+  <string name="change_pin_confirm_pins_dont_match">PIN tidak cocok</string>
+  <string name="change_pin_succeeded">PIN pesan suara diupdate</string>
+  <string name="change_pin_system_error">Tidak dapat menyetel PIN</string>
+  <string name="voicemail_visual_voicemail_transcription_switch_title">Transkripsi pesan suara</string>
+  <string name="voicemail_visual_voicemail_donation_switch_title">Analisis transkripsi pesan suara</string>
+  <string name="voicemail_activating_summary_info">Mengaktifkan pesan suara</string>
+  <string name="voicemail_transcription_preference_summary_info">Dapatkan transkrip pesan suara Anda menggunakan layanan transkripsi Google. %1$s</string>
+  <string name="voicemail_donate_preference_summary_info">Izinkan Google meninjau pesan suara Anda untuk menyempurnakan akurasi transkripsi. Pesan suara akan disimpan secara anonim. %1$s</string>
+  <string name="confirm_disable_voicemail_dialog_title">Menonaktifkan pesan suara visual</string>
+  <string name="confirm_disable_voicemail_dialog_message">Tindakan ini akan menghapus semua pesan suara dan transkrip Google yang tersimpan dalam aplikasi ini. Operator Anda mungkin menyimpan salinannya sendiri.</string>
+  <string name="confirm_disable_voicemail_accept_dialog_label">NONAKTIFKAN</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/settings/res/values-is/strings.xml b/java/com/android/dialer/voicemail/settings/res/values-is/strings.xml
new file mode 100644
index 0000000..0572928
--- /dev/null
+++ b/java/com/android/dialer/voicemail/settings/res/values-is/strings.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_settings_with_label">Talhólf (%s)</string>
+  <string name="voicemail_settings_title">Talhólf</string>
+  <string name="voicemail_notifications_preference_title">Tilkynningar</string>
+  <string name="voicemail_change_greeting_preference_title">Talhólfskveðja</string>
+  <string name="change_greeting_text">Ýta fyrir upptöku</string>
+  <string name="save_button_text">Vista</string>
+  <string name="redo_button_text">Reyna aftur</string>
+  <string name="voicemail_advanced_settings_title">Ítarlegar stillingar</string>
+  <string name="voicemail_visual_voicemail_switch_title">Myndrænt talhólf</string>
+  <string name="voicemail_visual_voicemail_auto_archive_switch_title">Viðbótaröryggisafritun og samstilling</string>
+  <string name="voicemail_set_pin_preference_title">Stilla PIN-númer</string>
+  <string name="voicemail_change_pin_preference_title">Breyta PIN-númeri</string>
+  <string name="voicemail_change_pin_preference_summary_disable">Kveikt þarf að vera á myndrænu talhólfi til að breyta PIN-númeri</string>
+  <string name="voicemail_change_pin_preference_summary_not_activated">Ekki er búið að virkja myndrænt talhólf. Reyndu aftur síðar</string>
+  <string name="vm_change_pin_old_pin">Gamla PIN-númerið</string>
+  <string name="vm_change_pin_new_pin">Nýtt PIN-númer</string>
+  <string name="vm_change_pin_progress_message">Augnablik.</string>
+  <string name="vm_change_pin_error_too_short">Nýja PIN-númerið er of stutt.</string>
+  <string name="vm_change_pin_error_too_long">Nýja PIN-númerið er of langt.</string>
+  <string name="vm_change_pin_error_too_weak">Nýja PIN-númerið er ekki nógu sterkt. Sterk aðgangsorð mega ekki vera með tölustafi í beinni röð eða endurtekna tölustafi.</string>
+  <string name="vm_change_pin_error_mismatch">Gamla PIN-númerið passar ekki.</string>
+  <string name="vm_change_pin_error_invalid">Nýja PIN-númerið inniheldur ógilda stafi.</string>
+  <string name="vm_change_pin_error_system_error">Ekki var hægt að breyta PIN-númerinu</string>
+  <string name="change_pin_title">Breyta PIN-númeri talhólfs</string>
+  <string name="change_pin_continue_label">Áfram</string>
+  <string name="change_pin_cancel_label">Hætta við</string>
+  <string name="change_pin_ok_label">Í lagi</string>
+  <string name="change_pin_enter_old_pin_header">Staðfestu gamla PIN-númerið</string>
+  <string name="change_pin_enter_old_pin_hint">Sláðu inn PIN-númerið fyrir talhólf til að halda áfram.</string>
+  <string name="change_pin_enter_new_pin_header">Veldu nýtt PIN-númer</string>
+  <string name="change_pin_enter_new_pin_hint">PIN-númerið verður að vera %1$d–%2$d tölustafir.</string>
+  <string name="change_pin_confirm_pin_header">Staðfestu PIN-númerið</string>
+  <string name="change_pin_confirm_pins_dont_match">PIN-númerin stemma ekki</string>
+  <string name="change_pin_succeeded">PIN-númer fyrir talhólf uppfært</string>
+  <string name="change_pin_system_error">Ekki hægt að stilla PIN-númer</string>
+  <string name="voicemail_visual_voicemail_transcription_switch_title">Uppskrift talhólfsskilaboða</string>
+  <string name="voicemail_visual_voicemail_donation_switch_title">Greining á umritun talhólfsskilaboða</string>
+  <string name="voicemail_activating_summary_info">Virkjar talhólf</string>
+  <string name="voicemail_transcription_preference_summary_info">Fáðu talhólfsskilaboðin skrifuð niður með uppskriftarþjónustu Google. %1$s</string>
+  <string name="voicemail_donate_preference_summary_info">Leyfðu Google að fara yfir talhólfsskilaboðin þín til að fá nákvæmari uppskrift. Talhólfsskilaboð eru geymd nafnlaust. %1$s</string>
+  <string name="confirm_disable_voicemail_dialog_title">Slökkva á myndrænu talhólfi</string>
+  <string name="confirm_disable_voicemail_dialog_message">Þetta eyðir öllum talhólfsskilaboðum og textauppskrift Google sem forritið geymir. Símafyrirtækið þitt gæti geymt sín eigin afrit.</string>
+  <string name="confirm_disable_voicemail_accept_dialog_label">SLÖKKVA</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/settings/res/values-it/strings.xml b/java/com/android/dialer/voicemail/settings/res/values-it/strings.xml
new file mode 100644
index 0000000..8644103
--- /dev/null
+++ b/java/com/android/dialer/voicemail/settings/res/values-it/strings.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_settings_with_label">Segreteria (%s)</string>
+  <string name="voicemail_settings_title">Segreteria</string>
+  <string name="voicemail_notifications_preference_title">Notifiche</string>
+  <string name="voicemail_change_greeting_preference_title">Annuncio della segreteria</string>
+  <string name="change_greeting_text">Tocca per registrare</string>
+  <string name="save_button_text">Salva</string>
+  <string name="redo_button_text">Riprova</string>
+  <string name="voicemail_advanced_settings_title">Impostazioni avanzate</string>
+  <string name="voicemail_visual_voicemail_switch_title">Lettura della segreteria</string>
+  <string name="voicemail_visual_voicemail_auto_archive_switch_title">Archiviazione supplementare e backup</string>
+  <string name="voicemail_set_pin_preference_title">Impostazione del PIN</string>
+  <string name="voicemail_change_pin_preference_title">Modifica del PIN</string>
+  <string name="voicemail_change_pin_preference_summary_disable">La lettura delle segreteria deve essere attivata per cambiare il PIN</string>
+  <string name="voicemail_change_pin_preference_summary_not_activated">Lettura della segreteria non attivata. Riprova più tardi</string>
+  <string name="vm_change_pin_old_pin">PIN attuale</string>
+  <string name="vm_change_pin_new_pin">Nuovo PIN</string>
+  <string name="vm_change_pin_progress_message">Attendi.</string>
+  <string name="vm_change_pin_error_too_short">Il nuovo PIN è troppo corto.</string>
+  <string name="vm_change_pin_error_too_long">Il nuovo PIN è troppo lungo.</string>
+  <string name="vm_change_pin_error_too_weak">Il nuovo PIN è troppo semplice. Una password efficace non deve contenere sequenze continue o cifre ripetute.</string>
+  <string name="vm_change_pin_error_mismatch">Il PIN attuale non corrisponde.</string>
+  <string name="vm_change_pin_error_invalid">Il nuovo PIN contiene caratteri non validi.</string>
+  <string name="vm_change_pin_error_system_error">Impossibile cambiare il PIN</string>
+  <string name="change_pin_title">Cambia PIN segreteria</string>
+  <string name="change_pin_continue_label">Continua</string>
+  <string name="change_pin_cancel_label">Annulla</string>
+  <string name="change_pin_ok_label">OK</string>
+  <string name="change_pin_enter_old_pin_header">Conferma il PIN attuale</string>
+  <string name="change_pin_enter_old_pin_hint">Inserisci il PIN della segreteria per continuare.</string>
+  <string name="change_pin_enter_new_pin_header">Imposta un nuovo PIN</string>
+  <string name="change_pin_enter_new_pin_hint">Il PIN deve contenere da %1$d a %2$d cifre.</string>
+  <string name="change_pin_confirm_pin_header">Conferma il PIN</string>
+  <string name="change_pin_confirm_pins_dont_match">I PIN non corrispondono</string>
+  <string name="change_pin_succeeded">PIN segreteria aggiornato</string>
+  <string name="change_pin_system_error">Impossibile impostare il PIN</string>
+  <string name="voicemail_visual_voicemail_transcription_switch_title">Trascrizione messaggio vocale</string>
+  <string name="voicemail_visual_voicemail_donation_switch_title">Analisi trascrizione segreteria</string>
+  <string name="voicemail_activating_summary_info">Attivazione della segretaria</string>
+  <string name="voicemail_transcription_preference_summary_info">Ricevi la trascrizione dei tuoi messaggi vocali utilizzando il servizio di trascrizione di Google. %1$s</string>
+  <string name="voicemail_donate_preference_summary_info">Consenti a Google di rivedere i messaggi della segreteria telefonica per migliorare la precisione della trascrizione. I messaggi della segreteria telefonica vengono memorizzati in modo anonimo. %1$s</string>
+  <string name="confirm_disable_voicemail_dialog_title">Disattiva la lettura dei messaggi vocali</string>
+  <string name="confirm_disable_voicemail_dialog_message">Tutti i messaggi vocali e le trascrizioni Google memorizzati all\'interno di questa app verranno eliminati. L\'operatore può conservare delle copie.</string>
+  <string name="confirm_disable_voicemail_accept_dialog_label">DISATTIVA</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/settings/res/values-iw/strings.xml b/java/com/android/dialer/voicemail/settings/res/values-iw/strings.xml
new file mode 100644
index 0000000..c4920b6
--- /dev/null
+++ b/java/com/android/dialer/voicemail/settings/res/values-iw/strings.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_settings_with_label">דואר קולי (%s)</string>
+  <string name="voicemail_settings_title">דואר קולי</string>
+  <string name="voicemail_notifications_preference_title">עדכונים</string>
+  <string name="voicemail_change_greeting_preference_title">פתיח לתא הקולי</string>
+  <string name="change_greeting_text">יש להקיש כדי להקליט</string>
+  <string name="save_button_text">שמירה</string>
+  <string name="redo_button_text">הקלטה מחדש</string>
+  <string name="voicemail_advanced_settings_title">הגדרות מתקדמות</string>
+  <string name="voicemail_visual_voicemail_switch_title">תא קולי ויזואלי</string>
+  <string name="voicemail_visual_voicemail_auto_archive_switch_title">גיבוי ופינוי מקום</string>
+  <string name="voicemail_set_pin_preference_title">הגדרת קוד גישה</string>
+  <string name="voicemail_change_pin_preference_title">שינוי קוד הגישה</string>
+  <string name="voicemail_change_pin_preference_summary_disable">צריך להפעיל את הדואר הקולי הוויזואלי כדי לשנות את קוד הגישה</string>
+  <string name="voicemail_change_pin_preference_summary_not_activated">הדואר הקולי הוויזואלי לא הופעל עדיין. אפשר לנסות שוב מאוחר יותר</string>
+  <string name="vm_change_pin_old_pin">קוד הגישה הישן</string>
+  <string name="vm_change_pin_new_pin">קוד הגישה החדש</string>
+  <string name="vm_change_pin_progress_message">רק רגע בבקשה.</string>
+  <string name="vm_change_pin_error_too_short">קוד הגישה החדש קצר מדי.</string>
+  <string name="vm_change_pin_error_too_long">קוד הגישה החדש ארוך מדי.</string>
+  <string name="vm_change_pin_error_too_weak">קוד הגישה החדש חלש מדי. בסיסמה חזקה אסור שיהיו ספרות ברצף מספרי או ספרות שחוזרות על עצמן.</string>
+  <string name="vm_change_pin_error_mismatch">קוד הגישה הישן לא נכון.</string>
+  <string name="vm_change_pin_error_invalid">קוד הגישה החדש מכיל תווים לא חוקיים.</string>
+  <string name="vm_change_pin_error_system_error">לא ניתן היה לשנות את קוד הגישה</string>
+  <string name="change_pin_title">שינוי של קוד הגישה לדואר הקולי</string>
+  <string name="change_pin_continue_label">המשך</string>
+  <string name="change_pin_cancel_label">ביטול</string>
+  <string name="change_pin_ok_label">אישור</string>
+  <string name="change_pin_enter_old_pin_header">אישור קוד הגישה הישן</string>
+  <string name="change_pin_enter_old_pin_hint">כדי להמשיך צריך להזין את קוד הגישה לדואר הקולי.</string>
+  <string name="change_pin_enter_new_pin_header">הגדרת קוד גישה חדש</string>
+  <string name="change_pin_enter_new_pin_hint">קוד הגישה חייב להיות באורך של %2$d-%1$d ספרות.</string>
+  <string name="change_pin_confirm_pin_header">אישור קוד הגישה</string>
+  <string name="change_pin_confirm_pins_dont_match">קודי הגישה אינם תואמים</string>
+  <string name="change_pin_succeeded">קוד הגישה לדואר הקולי עודכן</string>
+  <string name="change_pin_system_error">לא ניתן היה להגדיר את קוד הגישה</string>
+  <string name="voicemail_visual_voicemail_transcription_switch_title">תמלול הודעות קוליות</string>
+  <string name="voicemail_visual_voicemail_donation_switch_title">ניתוח התמלולים של ההודעות הקוליות</string>
+  <string name="voicemail_activating_summary_info">הפעלת הדואר הקולי מתבצעת</string>
+  <string name="voicemail_transcription_preference_summary_info">‏תמלול ההודעות הקוליות באמצעות שירותי התמלול של Google. %1$s</string>
+  <string name="voicemail_donate_preference_summary_info">‏אם נוכל לבדוק את ההודעות הקוליות שלך דיוק התמלול של Google ישתפר. ההודעות הקוליות נשמרות באופן אנונימי. %1$s</string>
+  <string name="confirm_disable_voicemail_dialog_title">השבתת הדואר הקולי הוויזואלי</string>
+  <string name="confirm_disable_voicemail_dialog_message">‏כל ההודעות הקוליות והתמלולים של Google שנשמרו באפליקציה יימחקו. ייתכן שיישארו עותקים שלהם אצל הספק הסלולרי שלך.</string>
+  <string name="confirm_disable_voicemail_accept_dialog_label">השבתה</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/settings/res/values-ja/strings.xml b/java/com/android/dialer/voicemail/settings/res/values-ja/strings.xml
new file mode 100644
index 0000000..b69f03a
--- /dev/null
+++ b/java/com/android/dialer/voicemail/settings/res/values-ja/strings.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_settings_with_label">ボイスメール（%s）</string>
+  <string name="voicemail_settings_title">ボイスメール</string>
+  <string name="voicemail_notifications_preference_title">通知</string>
+  <string name="voicemail_change_greeting_preference_title">ボイスメール応答メッセージ</string>
+  <string name="change_greeting_text">タップして録音</string>
+  <string name="save_button_text">保存</string>
+  <string name="redo_button_text">再試行</string>
+  <string name="voicemail_advanced_settings_title">詳細設定</string>
+  <string name="voicemail_visual_voicemail_switch_title">ビジュアル ボイスメール</string>
+  <string name="voicemail_visual_voicemail_auto_archive_switch_title">追加のバックアップと保存容量</string>
+  <string name="voicemail_set_pin_preference_title">PIN の設定</string>
+  <string name="voicemail_change_pin_preference_title">PIN の変更</string>
+  <string name="voicemail_change_pin_preference_summary_disable">PIN を変更するには、ビジュアル ボイスメールを有効にする必要があります</string>
+  <string name="voicemail_change_pin_preference_summary_not_activated">ビジュアル ボイスメールがまだ有効になっていません。しばらくしてからもう一度お試しください</string>
+  <string name="vm_change_pin_old_pin">古い PIN</string>
+  <string name="vm_change_pin_new_pin">新しい PIN</string>
+  <string name="vm_change_pin_progress_message">お待ちください。</string>
+  <string name="vm_change_pin_error_too_short">新しい PIN が短すぎます。</string>
+  <string name="vm_change_pin_error_too_long">新しい PIN が長すぎます。</string>
+  <string name="vm_change_pin_error_too_weak">新しい PIN の強度が弱すぎます。パスワードには連続する文字や、数字の繰り返しは使用しないでください。</string>
+  <string name="vm_change_pin_error_mismatch">古い PIN が一致しません。</string>
+  <string name="vm_change_pin_error_invalid">新しい PIN に無効な文字が含まれています。</string>
+  <string name="vm_change_pin_error_system_error">PIN を変更できませんでした</string>
+  <string name="change_pin_title">ボイスメール PIN の変更</string>
+  <string name="change_pin_continue_label">続行</string>
+  <string name="change_pin_cancel_label">キャンセル</string>
+  <string name="change_pin_ok_label">OK</string>
+  <string name="change_pin_enter_old_pin_header">古い PIN の確認</string>
+  <string name="change_pin_enter_old_pin_hint">続行するにはボイスメールの PIN を入力してください。</string>
+  <string name="change_pin_enter_new_pin_header">新しい PIN の設定</string>
+  <string name="change_pin_enter_new_pin_hint">PIN は %1$d～%2$d 桁にしてください。</string>
+  <string name="change_pin_confirm_pin_header">PIN の確認</string>
+  <string name="change_pin_confirm_pins_dont_match">PIN が一致しません</string>
+  <string name="change_pin_succeeded">ボイスメール PIN を更新しました</string>
+  <string name="change_pin_system_error">PIN を設定できません</string>
+  <string name="voicemail_visual_voicemail_transcription_switch_title">ボイスメールの音声文字変換</string>
+  <string name="voicemail_visual_voicemail_donation_switch_title">ボイスメールの音声文字変換結果の分析</string>
+  <string name="voicemail_activating_summary_info">ボイスメールを有効にしています</string>
+  <string name="voicemail_transcription_preference_summary_info">Google の音声文字変換サービスを使用してボイスメールが文字に変換されます。%1$s</string>
+  <string name="voicemail_donate_preference_summary_info">よろしければ Google によるボイスメール メッセージの分析にご協力ください。分析結果は音声文字変換機能の精度改善に役立てさせていただきます。分析にあたっては、ボイスメールのメッセージを匿名で保存させていただきます。%1$s</string>
+  <string name="confirm_disable_voicemail_dialog_title">ビジュアル ボイスメールを OFF にします</string>
+  <string name="confirm_disable_voicemail_dialog_message">OFF にすると、このアプリ内に保存されているボイスメールと Google による音声文字変換結果がすべて削除されます。ただし、ご利用の携帯通信会社がコピーを保存する可能性があります。</string>
+  <string name="confirm_disable_voicemail_accept_dialog_label">OFF にする</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/settings/res/values-ka/strings.xml b/java/com/android/dialer/voicemail/settings/res/values-ka/strings.xml
new file mode 100644
index 0000000..29a5f43
--- /dev/null
+++ b/java/com/android/dialer/voicemail/settings/res/values-ka/strings.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_settings_with_label">ხმოვანი ფოსტა (%s)</string>
+  <string name="voicemail_settings_title">ხმოვანი ფოსტა</string>
+  <string name="voicemail_notifications_preference_title">შეტყობინებები</string>
+  <string name="voicemail_change_greeting_preference_title">ხმოვანი ფოსტის მისალმება</string>
+  <string name="change_greeting_text">შეეხეთ ჩასაწერად</string>
+  <string name="save_button_text">შენახვა</string>
+  <string name="redo_button_text">კიდევ ცდა</string>
+  <string name="voicemail_advanced_settings_title">გაფართოებული პარამეტრები</string>
+  <string name="voicemail_visual_voicemail_switch_title">ვიზუალური ხმოვანი ფოსტა</string>
+  <string name="voicemail_visual_voicemail_auto_archive_switch_title">დამატებითი სარეზ. ასლები და მეხსიერება</string>
+  <string name="voicemail_set_pin_preference_title">PIN-კოდის დაყენება</string>
+  <string name="voicemail_change_pin_preference_title">PIN-კოდის შეცვლა</string>
+  <string name="voicemail_change_pin_preference_summary_disable">PIN-კოდის შესაცვლელად ჩართული უნდა იყოს ვიზუალური ხმოვანი ფოსტა</string>
+  <string name="voicemail_change_pin_preference_summary_not_activated">ვიზუალური ხმოვანი ფოსტა ჯერ გააქტიურებული არ არის. გთხოვთ, სცადოთ ხელახლა</string>
+  <string name="vm_change_pin_old_pin">ძველი PIN-კოდი</string>
+  <string name="vm_change_pin_new_pin">ახალი PIN-კოდი</string>
+  <string name="vm_change_pin_progress_message">გთხოვთ, დაელოდოთ.</string>
+  <string name="vm_change_pin_error_too_short">ახალი PIN-კოდი ძალიან მოკლეა.</string>
+  <string name="vm_change_pin_error_too_long">ახალი PIN-კოდი ძალიან გრძელია.</string>
+  <string name="vm_change_pin_error_too_weak">ახალი PIN-კოდი ძალიან სუსტია. ძლიერი პაროლი არ უნდა შეიცავდეს გამეორებულ ციფრებს ან გრძელ თანმიმდევრობას.</string>
+  <string name="vm_change_pin_error_mismatch">ძველი PIN-კოდი არ ემთხვევა.</string>
+  <string name="vm_change_pin_error_invalid">ახალი PIN-კოდი არასწორ სიმბოლოებს შეიცავს.</string>
+  <string name="vm_change_pin_error_system_error">PIN-კოდის შეცვლა შეუძლებელია</string>
+  <string name="change_pin_title">ხმოვანი ფოსტის PIN-კოდის შეცვლა</string>
+  <string name="change_pin_continue_label">გაგრძელება</string>
+  <string name="change_pin_cancel_label">გაუქმება</string>
+  <string name="change_pin_ok_label">კარგი</string>
+  <string name="change_pin_enter_old_pin_header">დაადასტურეთ თქვენი ძველი PIN-კოდი</string>
+  <string name="change_pin_enter_old_pin_hint">გასაგრძელებლად შეიყვანეთ თქვენი ხმოვანი ფოსტის PIN-კოდი.</string>
+  <string name="change_pin_enter_new_pin_header">დააყენეთ ახალი PIN-კოდი</string>
+  <string name="change_pin_enter_new_pin_hint">PIN-კოდი უნდა იყოს %1$d-დან %2$d ციფრამდე.</string>
+  <string name="change_pin_confirm_pin_header">დაადასტურეთ PIN-კოდი</string>
+  <string name="change_pin_confirm_pins_dont_match">PIN-კოდები არ ემთხვევა</string>
+  <string name="change_pin_succeeded">ხმოვანი ფოსტის PIN-კოდი განახლდა</string>
+  <string name="change_pin_system_error">PIN-კოდის დაყენება შეუძლებელია</string>
+  <string name="voicemail_visual_voicemail_transcription_switch_title">ხმოვანი ფოსტის ტრანსკრიბირება</string>
+  <string name="voicemail_visual_voicemail_donation_switch_title">ხმოვანი ფოსტის ტრანსკრიბირების ანალიზი</string>
+  <string name="voicemail_activating_summary_info">მიმდინარეობს ხმოვანი ფოსტის აქტივაცია</string>
+  <string name="voicemail_transcription_preference_summary_info">მიიღეთ თქვენი ხმოვანი ფოსტის ტრანსკრიპტები Google-ის ტრანსკრიბირების სერვისის გამოყენებით. %1$s</string>
+  <string name="voicemail_donate_preference_summary_info">მიეცით უფლება Google-ს, განიხილოს თქვენი ხმოვანი ფოსტის შეტყობინებები ტრანსკრიბირების სიზუსტის გასაუმჯობესებლად. თქვენი ხმოვანი ფოსტის შეტყობინებები ანონიმურად შეინახება. %1$s</string>
+  <string name="confirm_disable_voicemail_dialog_title">ვიზუალური ხმოვანი ფოსტის გამორთვა</string>
+  <string name="confirm_disable_voicemail_dialog_message">ეს წაშლის ამ აპში შენახულ ნებისმიერ ხმოვან შეტყობინებას და Google ტრანსკრიპტს. შესაძლოა თქვენმა ოპერატორმა შეინახოს თავისი ასლები.</string>
+  <string name="confirm_disable_voicemail_accept_dialog_label">გამორთვა</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/settings/res/values-kk/strings.xml b/java/com/android/dialer/voicemail/settings/res/values-kk/strings.xml
new file mode 100644
index 0000000..873b36c
--- /dev/null
+++ b/java/com/android/dialer/voicemail/settings/res/values-kk/strings.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_settings_with_label">Дауыстық хабар (%s)</string>
+  <string name="voicemail_settings_title">Дауыстық хабар</string>
+  <string name="voicemail_notifications_preference_title">Хабарландырулар</string>
+  <string name="voicemail_change_greeting_preference_title">Дауыстық поштаның сәлемдесу мәтіні</string>
+  <string name="change_greeting_text">Жазу үшін түртіңіз</string>
+  <string name="save_button_text">Сақтау</string>
+  <string name="redo_button_text">Қайталап көру</string>
+  <string name="voicemail_advanced_settings_title">Қосымша параметрлер</string>
+  <string name="voicemail_visual_voicemail_switch_title">Визуалды дауыстық хабар</string>
+  <string name="voicemail_visual_voicemail_auto_archive_switch_title">Қосымша сақтық көшірме және жад орны</string>
+  <string name="voicemail_set_pin_preference_title">PIN кодын орнату</string>
+  <string name="voicemail_change_pin_preference_title">PIN кодын өзгерту</string>
+  <string name="voicemail_change_pin_preference_summary_disable">PIN кодын өзгерту үшін, визуалды дауыстық хабар функциясын қосу қажет</string>
+  <string name="voicemail_change_pin_preference_summary_not_activated">Визуалды дауыстық хабар функциясы әлі қосылмаған. Кейінірек қайталап көріңіз</string>
+  <string name="vm_change_pin_old_pin">Ескі PIN коды</string>
+  <string name="vm_change_pin_new_pin">Жаңа PIN коды</string>
+  <string name="vm_change_pin_progress_message">Күте тұрыңыз.</string>
+  <string name="vm_change_pin_error_too_short">Жаңа PIN коды тым қысқа.</string>
+  <string name="vm_change_pin_error_too_long">Жаңа PIN коды тым ұзын.</string>
+  <string name="vm_change_pin_error_too_weak">Жаңа PIN коды тым әлсіз. Күшті құпия сөзде сандарды ретімен немесе қайталап қолдануға болмайды.</string>
+  <string name="vm_change_pin_error_mismatch">Ескі PIN коды сәйкес емес.</string>
+  <string name="vm_change_pin_error_invalid">Жаңа PIN кодының құрамында жарамсыз таңбалар бар.</string>
+  <string name="vm_change_pin_error_system_error">PIN кодын өзгерту мүмкін емес</string>
+  <string name="change_pin_title">Дауыстық пошта PIN кодын өзгерту</string>
+  <string name="change_pin_continue_label">Жалғастыру</string>
+  <string name="change_pin_cancel_label">Жабу</string>
+  <string name="change_pin_ok_label">Жарайды</string>
+  <string name="change_pin_enter_old_pin_header">Ескі PIN кодын растау</string>
+  <string name="change_pin_enter_old_pin_hint">Жалғастыру үшін дауыстық поштаның PIN кодын енгізіңіз.</string>
+  <string name="change_pin_enter_new_pin_header">Жаңа PIN кодын орнату</string>
+  <string name="change_pin_enter_new_pin_hint">PIN коды %1$d-%2$d саннан тұруы тиіс.</string>
+  <string name="change_pin_confirm_pin_header">PIN кодын растау</string>
+  <string name="change_pin_confirm_pins_dont_match">PIN кодтары сәйкес емес</string>
+  <string name="change_pin_succeeded">Дауыстық пошта PIN коды жаңартылды</string>
+  <string name="change_pin_system_error">PIN кодын орнату мүмкін болмады</string>
+  <string name="voicemail_visual_voicemail_transcription_switch_title">Дауыстық хабар транскрипциясы</string>
+  <string name="voicemail_visual_voicemail_donation_switch_title">Дауыстық хабар транскрипциясын сараптау</string>
+  <string name="voicemail_activating_summary_info">Дауыстық хабарды қосу</string>
+  <string name="voicemail_transcription_preference_summary_info">Google транскрипция қызметінің көмегімен дауыстық хабар транскрипцияларын оқыңыз.%1$s</string>
+  <string name="voicemail_donate_preference_summary_info">Транскрипция сапасын арттыру мақсатында дауыстық хабарлардың Google тарапынан тексерілуіне рұқсат беріңіз. Дауыстық хабарлардың құпиялылығы сақталады.%1$s</string>
+  <string name="confirm_disable_voicemail_dialog_title">Визуалдық дауыстық хабарды өшіру</string>
+  <string name="confirm_disable_voicemail_dialog_message">Бұл әрекет осы қолданбада сақталған дауыстық хабарлар мен Google транскрипцияларын жояды. Оператор өз көшірмелерін сақтауы мүмкін.</string>
+  <string name="confirm_disable_voicemail_accept_dialog_label">ӨШІРУ</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/settings/res/values-km/strings.xml b/java/com/android/dialer/voicemail/settings/res/values-km/strings.xml
new file mode 100644
index 0000000..d4bf0f7
--- /dev/null
+++ b/java/com/android/dialer/voicemail/settings/res/values-km/strings.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_settings_with_label">សារ​ជា​សំឡេង (%s)</string>
+  <string name="voicemail_settings_title">សារ​ជា​សំឡេង</string>
+  <string name="voicemail_notifications_preference_title">ការជូន​ដំណឹង</string>
+  <string name="voicemail_change_greeting_preference_title">សារ​ស្វាគមន៍​ជា​សំឡេង​</string>
+  <string name="change_greeting_text">ចុច​ដើម្បី​ថត</string>
+  <string name="save_button_text">រក្សាទុក</string>
+  <string name="redo_button_text">ព្យាយាម​ម្តងទៀត</string>
+  <string name="voicemail_advanced_settings_title">ការកំណត់​កម្រិត​ខ្ពស់</string>
+  <string name="voicemail_visual_voicemail_switch_title">សារ​ជា​សំឡេង​ដែល​មើល​ឃើញ</string>
+  <string name="voicemail_visual_voicemail_auto_archive_switch_title">ទំហំ​ផ្ទុក និង​ការបម្រុង​ទុក​បន្ថែម</string>
+  <string name="voicemail_set_pin_preference_title">កំណត់​កូដ PIN</string>
+  <string name="voicemail_change_pin_preference_title">ប្ដូរ​កូដ PIN</string>
+  <string name="voicemail_change_pin_preference_summary_disable">សារ​ជា​សំឡេង​ដែល​អាច​មើល​ឃើញ​ត្រូវ​តែ​បើក​ដំណើរការ ដើម្បី​ផ្លាស់​ប្ដូរ​កូដ PIN បាន</string>
+  <string name="voicemail_change_pin_preference_summary_not_activated">សារ​ជា​សំឡេង​ដែល​អាច​មើល​ឃើញ​មិន​ទាន់​​ត្រូវ​បាន​បើក​ដំណើរការ​នៅ​ឡើយ​ទេ សូម​ព្យាយាម​ម្ដង​ទៀត​នៅ​ពេល​ក្រោយ</string>
+  <string name="vm_change_pin_old_pin">កូដ PIN ចាស់</string>
+  <string name="vm_change_pin_new_pin">កូដ PIN ថ្មី</string>
+  <string name="vm_change_pin_progress_message">សូម​រង់ចាំ។</string>
+  <string name="vm_change_pin_error_too_short">កូដ PIN ថ្មី​ខ្លី​ពេក។</string>
+  <string name="vm_change_pin_error_too_long">កូដ PIN ថ្មី​វែង​ពេក។</string>
+  <string name="vm_change_pin_error_too_weak">កូដ PIN ថ្មី​​ខ្សោយ​ពេក។ ពាក្យ​សម្ងាត់​ខ្លាំង​មិន​គួរ​មាន​​លេខ​រៀង​ត​គ្នា ឬលេខ​ស្ទួន​គ្នា​ទេ។</string>
+  <string name="vm_change_pin_error_mismatch">កូដ PIN ចាស់​មិន​ត្រូវ​គ្នា​ទេ។</string>
+  <string name="vm_change_pin_error_invalid">កូដ PIN ថ្មី​មាន​តួ​អក្សរ​មិន​ត្រឹមត្រូវ។</string>
+  <string name="vm_change_pin_error_system_error">មិន​អាច​ប្ដូរ​កូដ PIN បាន​ទេ</string>
+  <string name="change_pin_title">ប្ដូរ​​កូដ PIN របស់​សារ​ជា​សំឡេង</string>
+  <string name="change_pin_continue_label">បន្ត</string>
+  <string name="change_pin_cancel_label">បោះបង់</string>
+  <string name="change_pin_ok_label">យល់ព្រម</string>
+  <string name="change_pin_enter_old_pin_header">បញ្ជាក់​កូដ PIN ចាស់​របស់​អ្នក</string>
+  <string name="change_pin_enter_old_pin_hint">បញ្ចូល​កូដ PIN សម្រាប់​សារ​ជា​សំឡេង​របស់​អ្នក ​​ដើម្បី​បន្ត។</string>
+  <string name="change_pin_enter_new_pin_header">កំណត់​កូដ PIN ថ្មី</string>
+  <string name="change_pin_enter_new_pin_hint">កូដ PIN ត្រូវ​តែ​មាន​ %1$d-%2$d ខ្ទង់។</string>
+  <string name="change_pin_confirm_pin_header">បញ្ជាក់​កូដ PIN របស់​អ្នក</string>
+  <string name="change_pin_confirm_pins_dont_match">កូដ PIN មិន​ត្រូវ​គ្នា</string>
+  <string name="change_pin_succeeded">បាន​កែ​កូដ PIN របស់​សារ​ជា​សំឡេង</string>
+  <string name="change_pin_system_error">មិន​អាច​កំណត់​កូដ PIN បាន​ទេ</string>
+  <string name="voicemail_visual_voicemail_transcription_switch_title">​ប្រតិចារឹក​សារ​ជា​សំឡេង</string>
+  <string name="voicemail_visual_voicemail_donation_switch_title">ការវិភាគ​ប្រតិចារឹក​សារ​ជា​សំឡេង</string>
+  <string name="voicemail_activating_summary_info">កំពុង​បើក​ដំណើរការ​សារ​ជា​សំឡេង</string>
+  <string name="voicemail_transcription_preference_summary_info">ទទួល​ប្រតិចារឹក​នៃ​សារ​ជា​សំឡេង​របស់​អ្នក​ដោយ​ប្រើប្រាស់​សេវាកម្ម​ប្រតិចារឹក​របស់ Google ។ %1$s</string>
+  <string name="voicemail_donate_preference_summary_info">អនុញ្ញាត​ឲ្យ Google ពិនិត្យមើល​សារ​ជា​សំឡេង​របស់​អ្នក ដើម្បី​ធ្វើ​ឲ្យភាពត្រឹមត្រូវ​​នៃប្រតិចារឹក​ប្រសើរ​ឡើង។ សារ​ជា​សំឡេង​របស់​អ្នក​នឹង​ត្រូវបាន​រក្សាទុក​ជា​លក្ខណៈ​អនាមិក។ %1$s</string>
+  <string name="confirm_disable_voicemail_dialog_title">បិទ​សារ​ជា​សំឡេង​ដែល​មើល​ឃើញ</string>
+  <string name="confirm_disable_voicemail_dialog_message">វា​នឹង​លុប​​សារ​ជា​សំឡេង​ណាមួយ និង​ប្រតិចារឹក Google ដែល​បាន​រក្សាទុក​នៅ​ក្នុង​កម្មវិធីនេះ។ ក្រុមហ៊ុន​សេវា​ទូរសព្ទ​របស់​អ្នក​អាច​រក្សាទុក​ច្បាប់​ចម្លង​ផ្ទាល់ខ្លួន។</string>
+  <string name="confirm_disable_voicemail_accept_dialog_label">បិទ</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/settings/res/values-kn/strings.xml b/java/com/android/dialer/voicemail/settings/res/values-kn/strings.xml
new file mode 100644
index 0000000..b73b938
--- /dev/null
+++ b/java/com/android/dialer/voicemail/settings/res/values-kn/strings.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_settings_with_label">ಧ್ವನಿಮೇಲ್ (%s)</string>
+  <string name="voicemail_settings_title">ಧ್ವನಿಮೇಲ್</string>
+  <string name="voicemail_notifications_preference_title">ಅಧಿಸೂಚನೆಗಳು</string>
+  <string name="voicemail_change_greeting_preference_title">ಧ್ವನಿಮೇಲ್ ಶುಭಾಶಯ</string>
+  <string name="change_greeting_text">ರೆಕಾರ್ಡ್‌ಗಾಗಿ ಟ್ಯಾಪ್</string>
+  <string name="save_button_text">ಉಳಿಸಿ</string>
+  <string name="redo_button_text">ಪುನಃ ಪ್ರಯತ್ನಿಸಿ</string>
+  <string name="voicemail_advanced_settings_title">ಸುಧಾರಿತ ಸೆಟ್ಟಿಂಗ್‌ಗಳು</string>
+  <string name="voicemail_visual_voicemail_switch_title">ದೃಶ್ಯ ಧ್ವನಿಮೇಲ್</string>
+  <string name="voicemail_visual_voicemail_auto_archive_switch_title">ಹೆಚ್ಚುವರಿ ಬ್ಯಾಕಪ್ ಮತ್ತು ಸಂಗ್ರಹಣೆ</string>
+  <string name="voicemail_set_pin_preference_title">ಪಿನ್ ಹೊಂದಿಸಿ</string>
+  <string name="voicemail_change_pin_preference_title">ಪಿನ್‌ ಬದಲಾಯಿಸಿ</string>
+  <string name="voicemail_change_pin_preference_summary_disable">ಪಿನ್ ಬದಲಾಯಿಸಲು ದೃಶ್ಯ ಧ್ವನಿಮೇಲ್ ಸಕ್ರಿಯಗೊಳಿಸಬೇಕು</string>
+  <string name="voicemail_change_pin_preference_summary_not_activated">ದೃಶ್ಯ ಧ್ವನಿಮೇಲ್ ಇನ್ನೂ ಸಕ್ರಿಯವಾಗಿಲ್ಲ, ದಯವಿಟ್ಟು ನಂತರ ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ</string>
+  <string name="vm_change_pin_old_pin">ಹಳೆಯ ಪಿನ್</string>
+  <string name="vm_change_pin_new_pin">ಹೊಸ ಪಿನ್‌</string>
+  <string name="vm_change_pin_progress_message">ದಯವಿಟ್ಟು ನಿರೀಕ್ಷಿಸಿ.</string>
+  <string name="vm_change_pin_error_too_short">ಹೊಸ ಪಿನ್ ತುಂಬಾ ಚಿಕ್ಕದಾಗಿದೆ.</string>
+  <string name="vm_change_pin_error_too_long">ಹೊಸ ಪಿನ್ ತುಂಬಾ ಉದ್ದವಾಗಿದೆ.</string>
+  <string name="vm_change_pin_error_too_weak">ಹೊಸ ಪಿನ್ ತುಂಬಾ ದುರ್ಬಲವಾಗಿದೆ. ಪ್ರಬಲ ಪಾಸ್‌ವರ್ಡ್ ನಿರಂತರ ಅನುಕ್ರಮ ಅಥವಾ ಪುನರಾವರ್ತಿತ ಅಂಕಿಗಳನ್ನು ಹೊಂದುವಂತಿಲ್ಲ.</string>
+  <string name="vm_change_pin_error_mismatch">ಹಳೆಯ ಪಿನ್ ಹೊಂದಾಣಿಕೆಯಾಗುತ್ತಿಲ್ಲ.</string>
+  <string name="vm_change_pin_error_invalid">ಹೊಸ ಪಿನ್ ಅಮಾನ್ಯವಾದ ಅಕ್ಷರಗಳನ್ನು ಒಳಗೊಂಡಿದೆ.</string>
+  <string name="vm_change_pin_error_system_error">ಪಿನ್ ಬದಲಾಯಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ</string>
+  <string name="change_pin_title">ಧ್ವನಿಮೇಲ್ ಪಿನ್‌ ಬದಲಾಯಿಸಿ</string>
+  <string name="change_pin_continue_label">ಮುಂದುವರಿಸಿ</string>
+  <string name="change_pin_cancel_label">ರದ್ದು</string>
+  <string name="change_pin_ok_label">ಸರಿ</string>
+  <string name="change_pin_enter_old_pin_header">ನಿಮ್ಮ ಹಳೆಯ ಪಿನ್‌ ಅನ್ನು ದೃಢೀಕರಿಸಿ</string>
+  <string name="change_pin_enter_old_pin_hint">ಮುಂದುವರಿಸಲು ನಿಮ್ಮ ಧ್ವನಿಮೇಲ್ ಪಿನ್ ಅನ್ನು ನಮೂದಿಸಿ.</string>
+  <string name="change_pin_enter_new_pin_header">ಹೊಸ ಪಿನ್ ಹೊಂದಿಸಿ</string>
+  <string name="change_pin_enter_new_pin_hint">ಪಿನ್ %1$d-%2$d ಅಂಕಿಗಳನ್ನು ಹೊಂದಿರಬೇಕು.</string>
+  <string name="change_pin_confirm_pin_header">ನಿಮ್ಮ ಪಿನ್‌ ಅನ್ನು ದೃಢೀಕರಿಸಿ</string>
+  <string name="change_pin_confirm_pins_dont_match">PIN ಗಳು ಹೊಂದಾಣಿಕೆಯಾಗುತ್ತಿಲ್ಲ</string>
+  <string name="change_pin_succeeded">ಧ್ವನಿಮೇಲ್ ಪಿನ್ ಅಪ್‌ಡೇಟ್‌ ಮಾಡಲಾಗಿದೆ</string>
+  <string name="change_pin_system_error">ಪಿನ್ ಹೊಂದಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ</string>
+  <string name="voicemail_visual_voicemail_transcription_switch_title">ಧ್ವನಿಮೇಲ್ ಪ್ರತಿಲೇಖನ</string>
+  <string name="voicemail_visual_voicemail_donation_switch_title">ಧ್ವನಿಮೇಲ್ ಟ್ರಾನ್ಸ್‌ಕ್ರಿಪ್ಷನ್ ವಿಶ್ಲೇಷಣೆ</string>
+  <string name="voicemail_activating_summary_info">ಧ್ವನಿಮೇಲ್ ಸಕ್ರಿಯಗೊಳಿಸಲಾಗುತ್ತಿದೆ</string>
+  <string name="voicemail_transcription_preference_summary_info">Google ನ ಪ್ರತಿಲೇಖನ ಸೇವೆ ಬಳಸಿಕೊಂಡು ನಿಮ್ಮ ಧ್ವನಿಮೇಲ್‌ ಪ್ರತಿಲೇಖನಗಳನ್ನು ಪಡೆದುಕೊಳ್ಳಿ. %1$s</string>
+  <string name="voicemail_donate_preference_summary_info">ಲಿಪ್ಯಂತರಗಳ ನಿಖರತೆಯನ್ನು ಸುಧಾರಿಸಲು ನಿಮ್ಮ ಧ್ವನಿಮೇಲ್ ಸಂದೇಶಗಳನ್ನು ಪರಿಶೀಲಿಸಲು Google ಗೆ ಅನುಮತಿಸಿ. %1$s</string>
+  <string name="confirm_disable_voicemail_dialog_title">ದೃಶ್ಯ ಧ್ವನಿಮೇಲ್ ಆಫ್ ಮಾಡಿ</string>
+  <string name="confirm_disable_voicemail_dialog_message">ಈ ಅಪ್ಲಿಕೇಶನ್‌ನಲ್ಲಿ ಸಂಗ್ರಹಿಸಲಾದ ಯಾವುದೇ ಧ್ವನಿಮೇಲ್ ಮತ್ತು Google ಲಿಪ್ಯಂತರಗಳನ್ನು ಇದು ಅಳಿಸುತ್ತದೆ. ನಿಮ್ಮ ವಾಹಕವು ತನ್ನದೇ ಆದ ನಕಲುಗಳನ್ನು ಇರಿಸಿಕೊಳ್ಳಬಹುದು.</string>
+  <string name="confirm_disable_voicemail_accept_dialog_label">ಆಫ್</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/settings/res/values-ko/strings.xml b/java/com/android/dialer/voicemail/settings/res/values-ko/strings.xml
new file mode 100644
index 0000000..44823cb
--- /dev/null
+++ b/java/com/android/dialer/voicemail/settings/res/values-ko/strings.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_settings_with_label">음성사서함(%s)</string>
+  <string name="voicemail_settings_title">음성사서함</string>
+  <string name="voicemail_notifications_preference_title">알림</string>
+  <string name="voicemail_change_greeting_preference_title">음성사서함 인사말</string>
+  <string name="change_greeting_text">탭하여 녹음</string>
+  <string name="save_button_text">저장</string>
+  <string name="redo_button_text">다시 시도</string>
+  <string name="voicemail_advanced_settings_title">고급 설정</string>
+  <string name="voicemail_visual_voicemail_switch_title">시각적 음성사서함</string>
+  <string name="voicemail_visual_voicemail_auto_archive_switch_title">추가 백업 및 저장용량</string>
+  <string name="voicemail_set_pin_preference_title">PIN 설정</string>
+  <string name="voicemail_change_pin_preference_title">PIN 변경</string>
+  <string name="voicemail_change_pin_preference_summary_disable">PIN을 변경하려면 시각적 음성사서함이 사용 설정되어 있어야 합니다</string>
+  <string name="voicemail_change_pin_preference_summary_not_activated">시각적 음성사서함이 아직 활성화되지 않았습니다. 나중에 다시 시도해 보세요</string>
+  <string name="vm_change_pin_old_pin">이전 PIN</string>
+  <string name="vm_change_pin_new_pin">새 PIN</string>
+  <string name="vm_change_pin_progress_message">기다려 주세요.</string>
+  <string name="vm_change_pin_error_too_short">새 PIN이 너무 짧습니다.</string>
+  <string name="vm_change_pin_error_too_long">새 PIN이 너무 깁니다.</string>
+  <string name="vm_change_pin_error_too_weak">새 PIN의 보안이 취약합니다. 안전한 비밀번호를 만들려면 연속적이거나 반복적인 숫자를 사용하지 않아야 합니다.</string>
+  <string name="vm_change_pin_error_mismatch">이전 PIN이 일치하지 않습니다.</string>
+  <string name="vm_change_pin_error_invalid">새 PIN에 잘못된 문자가 있습니다.</string>
+  <string name="vm_change_pin_error_system_error">PIN을 변경할 수 없습니다</string>
+  <string name="change_pin_title">음성사서함 PIN 변경</string>
+  <string name="change_pin_continue_label">계속</string>
+  <string name="change_pin_cancel_label">취소</string>
+  <string name="change_pin_ok_label">확인</string>
+  <string name="change_pin_enter_old_pin_header">이전 PIN 확인</string>
+  <string name="change_pin_enter_old_pin_hint">계속하려면 음성사서함 PIN을 입력하세요.</string>
+  <string name="change_pin_enter_new_pin_header">새 PIN 설정</string>
+  <string name="change_pin_enter_new_pin_hint">PIN은 %1$d~%2$d자 사이여야 합니다.</string>
+  <string name="change_pin_confirm_pin_header">PIN 확인</string>
+  <string name="change_pin_confirm_pins_dont_match">PIN이 일치하지 않습니다</string>
+  <string name="change_pin_succeeded">음성사서함 PIN이 업데이트되었습니다</string>
+  <string name="change_pin_system_error">PIN을 설정할 수 없습니다</string>
+  <string name="voicemail_visual_voicemail_transcription_switch_title">음성사서함 메시지 텍스트 변환</string>
+  <string name="voicemail_visual_voicemail_donation_switch_title">음성메일 텍스트 변환 분석</string>
+  <string name="voicemail_activating_summary_info">음성사서함 활성화 중</string>
+  <string name="voicemail_transcription_preference_summary_info">Google의 텍스트 변환 서비스를 통해 음성사서함 메시지가 스크립트로 제공됩니다. %1$s</string>
+  <string name="voicemail_donate_preference_summary_info">텍스트 변환 정확성을 개선하기 위해 Google에서 음성사서함 메시지를 검토하도록 허용해 주세요. 음성사서함 메시지는 익명으로 저장됩니다. %1$s</string>
+  <string name="confirm_disable_voicemail_dialog_title">시각적 음성사서함 사용 중지</string>
+  <string name="confirm_disable_voicemail_dialog_message">이렇게 하면 이 앱에 저장된 모든 음성사서함 메시지와 Google 텍스트 변환 파일이 삭제됩니다. 내 이동통신사에서 별도로 사본을 보관할 수 있습니다.</string>
+  <string name="confirm_disable_voicemail_accept_dialog_label">사용 중지</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/settings/res/values-ky/strings.xml b/java/com/android/dialer/voicemail/settings/res/values-ky/strings.xml
new file mode 100644
index 0000000..a9d30c3
--- /dev/null
+++ b/java/com/android/dialer/voicemail/settings/res/values-ky/strings.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_settings_with_label">Үн почтасы (%s)</string>
+  <string name="voicemail_settings_title">Үн почтасы</string>
+  <string name="voicemail_notifications_preference_title">Эскертмелер</string>
+  <string name="voicemail_change_greeting_preference_title">Үн почтасынын саламдашуусу</string>
+  <string name="change_greeting_text">Жаздыруу ү-н таптаңз</string>
+  <string name="save_button_text">Сактоо</string>
+  <string name="redo_button_text">Кайталоо</string>
+  <string name="voicemail_advanced_settings_title">Өркүндөтүлгөн жөндөөлөр</string>
+  <string name="voicemail_visual_voicemail_switch_title">Визуалдык үн почтасы</string>
+  <string name="voicemail_visual_voicemail_auto_archive_switch_title">Кошумча камдык көчүрмөнү сактоо жана сактагыч</string>
+  <string name="voicemail_set_pin_preference_title">PIN код коюу</string>
+  <string name="voicemail_change_pin_preference_title">PIN кодду өзгөртүү</string>
+  <string name="voicemail_change_pin_preference_summary_disable">PIN кодду өзгөртүү үчүн визуалдык үн почтасын иштетүү керек</string>
+  <string name="voicemail_change_pin_preference_summary_not_activated">Визуалдык үн почтаңыз күйгүзүлгөн жок. Кайра аракет кылыңыз.</string>
+  <string name="vm_change_pin_old_pin">Эски PIN код</string>
+  <string name="vm_change_pin_new_pin">Жаңы PIN код</string>
+  <string name="vm_change_pin_progress_message">Күтө туруңуз.</string>
+  <string name="vm_change_pin_error_too_short">Жаңы PIN код өтө эле кыска.</string>
+  <string name="vm_change_pin_error_too_long">Жаңы PIN код өтө эле узун.</string>
+  <string name="vm_change_pin_error_too_weak">Жаңы PIN код өтө эле жөнөкөй. Сырсөз күчтүү болушу үчүн сандар үзгүлтүксүз катардан турбашы же кайталанбашы керек.</string>
+  <string name="vm_change_pin_error_mismatch">Эски PIN код дал келген жок.</string>
+  <string name="vm_change_pin_error_invalid">Жаңы PIN коддо жараксыз белгилер бар.</string>
+  <string name="vm_change_pin_error_system_error">PIN код өзгөртүлгөн жок</string>
+  <string name="change_pin_title">Үн почтасынын PIN кодун өзгөртүү</string>
+  <string name="change_pin_continue_label">Улантуу</string>
+  <string name="change_pin_cancel_label">Жок</string>
+  <string name="change_pin_ok_label">Жарайт</string>
+  <string name="change_pin_enter_old_pin_header">Эски PIN кодуңузду ырастаңыз</string>
+  <string name="change_pin_enter_old_pin_hint">Улантуу үчүн үн почтаңыздын PIN кодун киргизиңиз.</string>
+  <string name="change_pin_enter_new_pin_header">Жаңы PIN коюңуз</string>
+  <string name="change_pin_enter_new_pin_hint">PIN %1$d-%2$d сандан турушу керек.</string>
+  <string name="change_pin_confirm_pin_header">PIN кодуңузду ырастаңыз</string>
+  <string name="change_pin_confirm_pins_dont_match">PIN коддор дал келген жок</string>
+  <string name="change_pin_succeeded">Үн почтасынын PIN коду жаңыртылды</string>
+  <string name="change_pin_system_error">PIN код коюлбайт</string>
+  <string name="voicemail_visual_voicemail_transcription_switch_title">Үн почтасынын транскрипциясы</string>
+  <string name="voicemail_visual_voicemail_donation_switch_title">Үн почтасынын транскрипциясын талдоо</string>
+  <string name="voicemail_activating_summary_info">Үн почтасын иштетүү</string>
+  <string name="voicemail_transcription_preference_summary_info">Google\'дун транскрипция кызматы аркылуу үн почтаңыздын транскрипцияларын алуу. %1$s</string>
+  <string name="voicemail_donate_preference_summary_info">Транскрипциянын тактыгын жакшыртуу үчүн үн почтаңыздын билдирүүлөрүн Google карап чыгышы керек. Үн почтаңыздын билдирүүлөрү жашыруун мүнөздө сакталат. %1$s</string>
+  <string name="confirm_disable_voicemail_dialog_title">Визуалдык үн почтасын өчүрүңүз</string>
+  <string name="confirm_disable_voicemail_dialog_message">Бул колдонмодо сакталган үн почтасын жана Google транскрипттерин жок кылат. Байланыш операторуңуз көчүрмөлөрүн өзүндө сактайт.</string>
+  <string name="confirm_disable_voicemail_accept_dialog_label">ӨЧҮРҮҮ</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/settings/res/values-lo/strings.xml b/java/com/android/dialer/voicemail/settings/res/values-lo/strings.xml
new file mode 100644
index 0000000..bfb8e79
--- /dev/null
+++ b/java/com/android/dialer/voicemail/settings/res/values-lo/strings.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_settings_with_label">ຂໍ້​ຄວາມ​ສຽງ (%s)</string>
+  <string name="voicemail_settings_title">ຂໍ້ຄວາມສຽງ</string>
+  <string name="voicemail_notifications_preference_title">ການແຈ້ງເຕືອນ</string>
+  <string name="voicemail_change_greeting_preference_title">ຄຳທັກທາຍຂໍ້ຄວາມສຽງ</string>
+  <string name="change_greeting_text">ແຕະເພື່ອບັນທຶກ</string>
+  <string name="save_button_text">ບັນທຶກ</string>
+  <string name="redo_button_text">ລອງໃໝ່</string>
+  <string name="voicemail_advanced_settings_title">ການຕັ້ງຄ່າຂັ້ນສູງ</string>
+  <string name="voicemail_visual_voicemail_switch_title">ຂໍ້ຄວາມສຽງສະເໝືອນ</string>
+  <string name="voicemail_visual_voicemail_auto_archive_switch_title">ການສຳຮອງ ແລະ ບ່ອນຈັດເກັບຂໍ້ມູນພິເສດ</string>
+  <string name="voicemail_set_pin_preference_title">ຕັ້ງລະຫັດ PIN</string>
+  <string name="voicemail_change_pin_preference_title">​ປ່ຽນ​ລະຫັດ PIN</string>
+  <string name="voicemail_change_pin_preference_summary_disable">ຈະຕ້ອງເປີດໃຊ້ຂໍ້ຄວາມສຽງສະເໝືອນເພື່ອປ່ຽນ PIN</string>
+  <string name="voicemail_change_pin_preference_summary_not_activated">ຍັງບໍໄດ້ເປີດໃຊ້ຂໍ້ຄວາມສຽງສະເໝືອນເທື່ອ, ກະລຸນາລອງໃໝ່ໃນພາຍຫຼັງ</string>
+  <string name="vm_change_pin_old_pin">ລະຫັດ PIN ເກົ່າ</string>
+  <string name="vm_change_pin_new_pin">ລະຫັດ PIN ໃໝ່</string>
+  <string name="vm_change_pin_progress_message">ກະລຸນາລໍຖ້າ.</string>
+  <string name="vm_change_pin_error_too_short">ລະຫັດ PIN ໃໝ່ສັ້ນເກີນໄປ.</string>
+  <string name="vm_change_pin_error_too_long">ລະຫັດ PIN ໃໝ່ຍາວເກີນໄປ.</string>
+  <string name="vm_change_pin_error_too_weak">ລະຫັດ PIN ໃໝ່ງ່າຍເກີນໄປ. ລະຫັດຜ່ານທີ່ຍາກບໍ່ຄວນຈະມີຕົວເລກຕໍ່ເນື່ອງ ຫຼື ຕົວເລກຊໍ້າໆກັນ.</string>
+  <string name="vm_change_pin_error_mismatch">ລະຫັດ PIN ເກົ່າບໍ່ກົງກັນ.</string>
+  <string name="vm_change_pin_error_invalid">ລະຫັດ PIN ໃໝ່ມີຕົວອັກສອນທີ່ບໍ່ຖືກຕ້ອງ.</string>
+  <string name="vm_change_pin_error_system_error">ບໍ່ສາມາດປ່ຽນລະຫັດ PIN ໄດ້</string>
+  <string name="change_pin_title">ປ່ຽນລະຫັດ PIN ຂໍ້ຄວາມສຽງ</string>
+  <string name="change_pin_continue_label">ສືບຕໍ່</string>
+  <string name="change_pin_cancel_label">ຍົກເລີກ</string>
+  <string name="change_pin_ok_label">ຕົກລົງ</string>
+  <string name="change_pin_enter_old_pin_header">ຢືນຢັນລະຫັດ PIN ເກົ່າຂອງທ່ານ</string>
+  <string name="change_pin_enter_old_pin_hint">ໃສ່ລະຫັດ PIN ຂໍ້ຄວາມສຽງຂອງທ່ານເພື່ອດຳເນີນການຕໍ່.</string>
+  <string name="change_pin_enter_new_pin_header">ຕັ້ງ​ເປັນ PIN ໃຫມ່</string>
+  <string name="change_pin_enter_new_pin_hint">ລະຫັດ PIN ຈະຕ້ອງມີ %1$d-%2$d ຕົວເລກ.</string>
+  <string name="change_pin_confirm_pin_header">ຢືນຢັນລະຫັດ PIN ຂອງທ່ານ</string>
+  <string name="change_pin_confirm_pins_dont_match">ລະຫັດ PIN ບໍ່ກົງກັນ</string>
+  <string name="change_pin_succeeded">ອັບເດດລະຫັດ PIN ຂໍ້ຄວາມສຽງແລ້ວ</string>
+  <string name="change_pin_system_error">ບໍ່ສາມາດຕັ້ງລະຫັດ PIN ໄດ້</string>
+  <string name="voicemail_visual_voicemail_transcription_switch_title">ການຖອດຂໍ້ຄວາມສຽງ</string>
+  <string name="voicemail_visual_voicemail_donation_switch_title">ການວິເຄາະການຖອດຂໍ້ຄວາມສຽງ</string>
+  <string name="voicemail_activating_summary_info">ກຳລັງເປີດໃຊ້ຂໍ້ຄວາມສຽງ</string>
+  <string name="voicemail_transcription_preference_summary_info">ຮັບການຖອດຂໍ້ຄວາມຂອງຂໍ້ຄວາມສຽງທ່ານໂດຍໃຊ້ບໍລິການຖອດຂໍ້ຄວາມຂອງ Google. %1$s</string>
+  <string name="voicemail_donate_preference_summary_info">ໃຫ້ Google ກວດສອບຂໍ້ຄວາມສຽງຂອງທ່ານເພື່ອປັບປຸງຄວາມຖືກຕ້ອງຂອງການຖອດຂໍ້ຄວາມ. ຂໍ້ຄວາມສຽງຂອງທ່ານຈະຖືກຈັດເກັບໂດຍບໍ່ລະບຸຊື່. %1$s</string>
+  <string name="confirm_disable_voicemail_dialog_title">ປິດຂໍ້ຄວາມສຽງສະເໝືອນ</string>
+  <string name="confirm_disable_voicemail_dialog_message">ນີ້ຈະເປັນການລຶບຂໍ້ຄວາມສຽງໃດກໍຕາມທີ່ມີ ແລະ ການຖອດຂໍ້ຄວາມສຽງ Google ທີ່ບັນທຶກໄວ້ພາຍໃນແອັບນີ້. ຜູ້ໃຫ້ບໍລິການຂອງທ່ານອາດມີສຳເນົາຂອງຕົວເອງໄວ້ຢູ່.</string>
+  <string name="confirm_disable_voicemail_accept_dialog_label">ປິດ</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/settings/res/values-lt/strings.xml b/java/com/android/dialer/voicemail/settings/res/values-lt/strings.xml
new file mode 100644
index 0000000..2439951
--- /dev/null
+++ b/java/com/android/dialer/voicemail/settings/res/values-lt/strings.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_settings_with_label">Balso paštas (%s)</string>
+  <string name="voicemail_settings_title">Balso paštas</string>
+  <string name="voicemail_notifications_preference_title">Pranešimai</string>
+  <string name="voicemail_change_greeting_preference_title">Balso pašto atsakiklio žinutė</string>
+  <string name="change_greeting_text">Paliesk., kad įraš.</string>
+  <string name="save_button_text">Išsaugoti</string>
+  <string name="redo_button_text">B. dar k.</string>
+  <string name="voicemail_advanced_settings_title">Išplėstiniai nustatymai</string>
+  <string name="voicemail_visual_voicemail_switch_title">Vaizdinis balso paštas</string>
+  <string name="voicemail_visual_voicemail_auto_archive_switch_title">Papild. saug. vt. ir ats. kop. kūr. f.</string>
+  <string name="voicemail_set_pin_preference_title">PIN kodo nustatymas</string>
+  <string name="voicemail_change_pin_preference_title">PIN kodo keitimas</string>
+  <string name="voicemail_change_pin_preference_summary_disable">Vaizdinis balso paštas turi būti įgalintas, kad būtų galima pakeisti PIN kodą</string>
+  <string name="voicemail_change_pin_preference_summary_not_activated">Vaizdinis balso paštas dar nesuaktyvintas, vėliau bandykite dar kartą</string>
+  <string name="vm_change_pin_old_pin">Senas PIN kodas</string>
+  <string name="vm_change_pin_new_pin">Naujas PIN kodas</string>
+  <string name="vm_change_pin_progress_message">Palaukite.</string>
+  <string name="vm_change_pin_error_too_short">Naujas PIN kodas per trumpas.</string>
+  <string name="vm_change_pin_error_too_long">Naujas PIN kodas per ilgas.</string>
+  <string name="vm_change_pin_error_too_weak">Naujas PIN kodas labai nesudėtingas. Sudėtingame slaptažodyje neturėtų būti kelių vienodų simbolių iš eilės ar pasikartojančių skaitmenų.</string>
+  <string name="vm_change_pin_error_mismatch">Senas PIN kodas nesutampa.</string>
+  <string name="vm_change_pin_error_invalid">Naujame PIN kode yra netinkamų simbolių.</string>
+  <string name="vm_change_pin_error_system_error">Nepavyko pakeisti PIN kodo</string>
+  <string name="change_pin_title">Balso pašto PIN kodo keitimas</string>
+  <string name="change_pin_continue_label">Tęsti</string>
+  <string name="change_pin_cancel_label">Atšaukti</string>
+  <string name="change_pin_ok_label">Gerai</string>
+  <string name="change_pin_enter_old_pin_header">Seno PIN kodo patvirtinimas</string>
+  <string name="change_pin_enter_old_pin_hint">Įveskite balso pašto PIN kodą, kad galėtumėte tęsti.</string>
+  <string name="change_pin_enter_new_pin_header">Naujo PIN kodo nustatymas</string>
+  <string name="change_pin_enter_new_pin_hint">PIN kodą turi sudaryti %1$d–%2$d skaitm.</string>
+  <string name="change_pin_confirm_pin_header">PIN kodo patvirtinimas</string>
+  <string name="change_pin_confirm_pins_dont_match">PIN kodai nesutampa</string>
+  <string name="change_pin_succeeded">Balso pašto PIN kodas atnaujintas</string>
+  <string name="change_pin_system_error">Nepavyksta nustatyti PIN kodo</string>
+  <string name="voicemail_visual_voicemail_transcription_switch_title">Balso pašto pranešimų transkribavimas</string>
+  <string name="voicemail_visual_voicemail_donation_switch_title">Balso pašto pranešimų transkrib. analizė</string>
+  <string name="voicemail_activating_summary_info">Suaktyvinamas balso paštas</string>
+  <string name="voicemail_transcription_preference_summary_info">Gaukite balso pašto pranešimų nuorašus naudodami „Google“ transkribavimo paslaugą. %1$s</string>
+  <string name="voicemail_donate_preference_summary_info">Leiskite „Google“ peržiūrėti balso pašto pranešimus, kad būtų galima patobulinti transkribavimo tikslumą. Jūsų balso pašto pranešimai saugomi anonimiškai. %1$s</string>
+  <string name="confirm_disable_voicemail_dialog_title">Vaizdinio balso pašto išjungimas</string>
+  <string name="confirm_disable_voicemail_dialog_message">Tai atlikus bus ištrinti visi balso pašto pranešimai ir „Google“ nuorašai, saugomi šioje programoje. Operatorius gali pasilikti savo kopijas.</string>
+  <string name="confirm_disable_voicemail_accept_dialog_label">IŠJUNGTI</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/settings/res/values-lv/strings.xml b/java/com/android/dialer/voicemail/settings/res/values-lv/strings.xml
new file mode 100644
index 0000000..1563b1c
--- /dev/null
+++ b/java/com/android/dialer/voicemail/settings/res/values-lv/strings.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_settings_with_label">Balss pasts (%s)</string>
+  <string name="voicemail_settings_title">Balss pasts</string>
+  <string name="voicemail_notifications_preference_title">Paziņojumi</string>
+  <string name="voicemail_change_greeting_preference_title">Balss pasta sveiciens</string>
+  <string name="change_greeting_text">Piesk., lai ierakst.</string>
+  <string name="save_button_text">Saglabāt</string>
+  <string name="redo_button_text">Atkārtot</string>
+  <string name="voicemail_advanced_settings_title">Papildu iestatījumi</string>
+  <string name="voicemail_visual_voicemail_switch_title">Vizuālais balss pasts</string>
+  <string name="voicemail_visual_voicemail_auto_archive_switch_title">Papildu dublēšana un krātuve</string>
+  <string name="voicemail_set_pin_preference_title">PIN iestatīšana</string>
+  <string name="voicemail_change_pin_preference_title">Mainīt PIN</string>
+  <string name="voicemail_change_pin_preference_summary_disable">Lai varētu mainīt PIN, ir jābūt iespējotam vizuālajam balss pastam.</string>
+  <string name="voicemail_change_pin_preference_summary_not_activated">Vizuālais balss pasts vēl nav aktivizēts. Lūdzu, vēlāk mēģiniet vēlreiz.</string>
+  <string name="vm_change_pin_old_pin">Iepriekšējais PIN</string>
+  <string name="vm_change_pin_new_pin">Jaunais PIN</string>
+  <string name="vm_change_pin_progress_message">Lūdzu, uzgaidiet!</string>
+  <string name="vm_change_pin_error_too_short">Jaunais PIN ir pārāk īss.</string>
+  <string name="vm_change_pin_error_too_long">Jaunais PIN ir pārāk garš.</string>
+  <string name="vm_change_pin_error_too_weak">Jaunais PIN nav pietiekami drošs. Droša parole nedrīkst ietvert secīgus vai atkārtotus ciparus.</string>
+  <string name="vm_change_pin_error_mismatch">Iepriekšējais PIN neatbilst.</string>
+  <string name="vm_change_pin_error_invalid">Jaunajā PIN ir ietvertas nederīgas rakstzīmes.</string>
+  <string name="vm_change_pin_error_system_error">Neizdevās nomainīt PIN.</string>
+  <string name="change_pin_title">Balss pasta PIN mainīšana</string>
+  <string name="change_pin_continue_label">Turpināt</string>
+  <string name="change_pin_cancel_label">Atcelt</string>
+  <string name="change_pin_ok_label">Labi</string>
+  <string name="change_pin_enter_old_pin_header">Iepriekšējā PIN apstiprināšana</string>
+  <string name="change_pin_enter_old_pin_hint">Lai turpinātu, ievadiet savu balss pasta PIN.</string>
+  <string name="change_pin_enter_new_pin_header">Jauna PIN iestatīšana</string>
+  <string name="change_pin_enter_new_pin_hint">PIN kodā ir jābūt %1$d–%2$d cipariem.</string>
+  <string name="change_pin_confirm_pin_header">PIN apstiprināšana</string>
+  <string name="change_pin_confirm_pins_dont_match">PIN kodi neatbilst.</string>
+  <string name="change_pin_succeeded">Balss pasta PIN atjaunināts</string>
+  <string name="change_pin_system_error">Nevar iestatīt PIN</string>
+  <string name="voicemail_visual_voicemail_transcription_switch_title">Balss pasta transkripcija</string>
+  <string name="voicemail_visual_voicemail_donation_switch_title">Balss pasta transkripcijas analīze</string>
+  <string name="voicemail_activating_summary_info">Notiek balss pasta aktivizēšana.</string>
+  <string name="voicemail_transcription_preference_summary_info">Iegūstiet sava balss pasta transkripciju, izmantojot Google transkripcijas pakalpojumu. %1$s</string>
+  <string name="voicemail_donate_preference_summary_info">Ļaujiet Google pārskatīt jūsu balss pasta ziņojumus, lai uzlabotu transkripcijas precizitāti. Jūsu balss pasta ziņojumi tiek glabāti anonīmi. %1$s</string>
+  <string name="confirm_disable_voicemail_dialog_title">Vizuālā balss pasta izslēgšana</string>
+  <string name="confirm_disable_voicemail_dialog_message">Tiks dzēsti visi balss pasta ziņojumi un Google transkripcijas, kas saglabātas šajā lietotnē. Iespējams, jūsu mobilo sakaru operators saglabās savas kopijas.</string>
+  <string name="confirm_disable_voicemail_accept_dialog_label">IZSLĒGT</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/settings/res/values-mk/strings.xml b/java/com/android/dialer/voicemail/settings/res/values-mk/strings.xml
new file mode 100644
index 0000000..554dd2e
--- /dev/null
+++ b/java/com/android/dialer/voicemail/settings/res/values-mk/strings.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_settings_with_label">Говорна пошта (%s)</string>
+  <string name="voicemail_settings_title">Говорна пошта</string>
+  <string name="voicemail_notifications_preference_title">Известувања</string>
+  <string name="voicemail_change_greeting_preference_title">Поздрав за говорната пошта</string>
+  <string name="change_greeting_text">Допрете за снимање</string>
+  <string name="save_button_text">Зачувај</string>
+  <string name="redo_button_text">Пробај пак</string>
+  <string name="voicemail_advanced_settings_title">Напредни поставки</string>
+  <string name="voicemail_visual_voicemail_switch_title">Визуелна говорна пошта</string>
+  <string name="voicemail_visual_voicemail_auto_archive_switch_title">Дополнителен бекап и простор</string>
+  <string name="voicemail_set_pin_preference_title">Поставете PIN</string>
+  <string name="voicemail_change_pin_preference_title">Променете PIN</string>
+  <string name="voicemail_change_pin_preference_summary_disable">За променување на PIN-кодот, мора да се овозможи визуелна говорна пошта</string>
+  <string name="voicemail_change_pin_preference_summary_not_activated">Визуелната говорна пошта сѐ уште не е активна. Обидете се повторно подоцна</string>
+  <string name="vm_change_pin_old_pin">Стар PIN</string>
+  <string name="vm_change_pin_new_pin">Нов PIN</string>
+  <string name="vm_change_pin_progress_message">Почекајте.</string>
+  <string name="vm_change_pin_error_too_short">Новиот PIN е премногу кус.</string>
+  <string name="vm_change_pin_error_too_long">Новиот PIN е премногу долг.</string>
+  <string name="vm_change_pin_error_too_weak">Новиот PIN е премногу слаб. Силна лозинка не треба да содржи непрекината серија или цифри што се повторуваат.</string>
+  <string name="vm_change_pin_error_mismatch">Стариот PIN не се совпаѓа.</string>
+  <string name="vm_change_pin_error_invalid">Новиот PIN содржи неважечки знаци.</string>
+  <string name="vm_change_pin_error_system_error">PIN-кодот не може да се промени</string>
+  <string name="change_pin_title">Променете го PIN-кодот на говорната пошта</string>
+  <string name="change_pin_continue_label">Продолжи</string>
+  <string name="change_pin_cancel_label">Откажи</string>
+  <string name="change_pin_ok_label">Во ред</string>
+  <string name="change_pin_enter_old_pin_header">Потврдете го стариот PIN</string>
+  <string name="change_pin_enter_old_pin_hint">Внесете го PIN-кодот на говорната пошта за да продолжите.</string>
+  <string name="change_pin_enter_new_pin_header">Поставете нов PIN</string>
+  <string name="change_pin_enter_new_pin_hint">PIN-кодот мора да содржи најмалку %1$d, а најмногу %2$d цифри.</string>
+  <string name="change_pin_confirm_pin_header">Потврдете го PIN-кодот</string>
+  <string name="change_pin_confirm_pins_dont_match">PIN-кодовите не се совпаѓаат</string>
+  <string name="change_pin_succeeded">PIN-кодот на говорната пошта е ажуриран</string>
+  <string name="change_pin_system_error">Не може да се постави PIN</string>
+  <string name="voicemail_visual_voicemail_transcription_switch_title">Транскрипција на говорна пошта</string>
+  <string name="voicemail_visual_voicemail_donation_switch_title">Анализа на транскрипција на гов. пошта</string>
+  <string name="voicemail_activating_summary_info">Се активира говорна пошта</string>
+  <string name="voicemail_transcription_preference_summary_info">Добивајте преписи од вашата говорна пошта со услугата за транскрипција на Google. %1$s</string>
+  <string name="voicemail_donate_preference_summary_info">Дозволете Google да ги прегледува вашите пораки од говорната пошта за зголемување на прецизноста на преписот. Пораките во говорната пошта се складираат анонимно. %1$s</string>
+  <string name="confirm_disable_voicemail_dialog_title">Исклучување визуелна говорна пошта</string>
+  <string name="confirm_disable_voicemail_dialog_message">Со ова ќе се избришат сите говорни пораки и преписите на Google складирани во апликацијава. Вашиот оператор може да ги зачува своите копии.</string>
+  <string name="confirm_disable_voicemail_accept_dialog_label">ИСКЛУЧИ</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/settings/res/values-ml/strings.xml b/java/com/android/dialer/voicemail/settings/res/values-ml/strings.xml
new file mode 100644
index 0000000..2b16d15
--- /dev/null
+++ b/java/com/android/dialer/voicemail/settings/res/values-ml/strings.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_settings_with_label">വോയ്‌സ്‌മെയിൽ (%s)</string>
+  <string name="voicemail_settings_title">വോയ്‌സ്‌മെയിൽ</string>
+  <string name="voicemail_notifications_preference_title">അറിയിപ്പുകൾ</string>
+  <string name="voicemail_change_greeting_preference_title">വോയ്‌സ്‌മെയിൽ ആശംസ</string>
+  <string name="change_greeting_text">റെക്കോർഡ് ചെയ്യാൻ ടാപ്പ് ചെയ്യുക</string>
+  <string name="save_button_text">സംരക്ഷിക്കുക</string>
+  <string name="redo_button_text">വീണ്ടും ശ്രമിക്കുക</string>
+  <string name="voicemail_advanced_settings_title">വിപുലമായ ക്രമീകരണം</string>
+  <string name="voicemail_visual_voicemail_switch_title">വിഷ്വൽ വോയ്‌സ്‌മെയിൽ</string>
+  <string name="voicemail_visual_voicemail_auto_archive_switch_title">അധിക ബായ്‌ക്കപ്പും സ്‌റ്റോറേജും</string>
+  <string name="voicemail_set_pin_preference_title">പിൻ സജ്ജമാക്കുക</string>
+  <string name="voicemail_change_pin_preference_title">പിൻ മാറ്റുക</string>
+  <string name="voicemail_change_pin_preference_summary_disable">പിൻ മാറ്റുന്നതിന് വിഷ്വൽ വോയ്‌സ്‌മെയിൽ പ്രവർത്തനക്ഷമമാക്കേണ്ടതുണ്ട്</string>
+  <string name="voicemail_change_pin_preference_summary_not_activated">വിഷ്വൽ വോയ്‌സ്‌മെയിൽ ഇതുവരെ സജീവമാക്കിയിട്ടില്ല, പിന്നീട് വീണ്ടും ശ്രമിച്ചുനോക്കുക</string>
+  <string name="vm_change_pin_old_pin">പഴയ പിൻ</string>
+  <string name="vm_change_pin_new_pin">പുതിയ പിൻ</string>
+  <string name="vm_change_pin_progress_message">കാത്തിരിക്കുക.</string>
+  <string name="vm_change_pin_error_too_short">പുതിയ പിൻ വളരെ ചെറുതാണ്.</string>
+  <string name="vm_change_pin_error_too_long">പുതിയ പിൻ വളരെ ദൈർഘ്യമേറിയതാണ്.</string>
+  <string name="vm_change_pin_error_too_weak">പുതിയ പിൻ വളരെ ദുർബലമാണ്. ഒരു ദൃഢമായ പാസ്‌വേഡിൽ തുടർച്ചയായി വരുന്നതോ ആവർത്തിച്ച് വരുന്നതോ ആയ അക്കങ്ങൾ ഉണ്ടാവരുത്.</string>
+  <string name="vm_change_pin_error_mismatch">പഴയ പിന്നുമായി യോജിക്കുന്നില്ല.</string>
+  <string name="vm_change_pin_error_invalid">പുതിയ പിന്നിൽ അസാധുവായ പ്രതീകങ്ങൾ അടങ്ങിയിരിക്കുന്നു.</string>
+  <string name="vm_change_pin_error_system_error">പിൻ മാറ്റാനായില്ല</string>
+  <string name="change_pin_title">വോയ്‌സ്മെയിൽ പിൻ മാറ്റുക</string>
+  <string name="change_pin_continue_label">തുടരുക</string>
+  <string name="change_pin_cancel_label">റദ്ദാക്കുക</string>
+  <string name="change_pin_ok_label">ശരി</string>
+  <string name="change_pin_enter_old_pin_header">നിങ്ങളുടെ പഴയ പിൻ സ്ഥിരീകരിക്കുക</string>
+  <string name="change_pin_enter_old_pin_hint">തുടരാൻ നിങ്ങളുടെ വോയ്‌സ്മെയിൽ പിൻ നൽകുക.</string>
+  <string name="change_pin_enter_new_pin_header">പുതിയ PIN സജ്ജമാക്കുക</string>
+  <string name="change_pin_enter_new_pin_hint">പിന്നിൽ %1$d-%2$d അക്കങ്ങൾ ഉണ്ടായിരിക്കണം.</string>
+  <string name="change_pin_confirm_pin_header">നിങ്ങളുടെ പിൻ സ്ഥിരീകരിക്കുക</string>
+  <string name="change_pin_confirm_pins_dont_match">PIN-കൾ പൊരുത്തപ്പെടുന്നില്ല</string>
+  <string name="change_pin_succeeded">വോയ്‌സ്‌മെയിൽ പിൻ അപ്‌ഡേറ്റുചെയ്‌തു</string>
+  <string name="change_pin_system_error">പിൻ സജ്ജമാക്കാൻ കഴിയുന്നില്ല</string>
+  <string name="voicemail_visual_voicemail_transcription_switch_title">വോയ്‌സ്‌മെയിൽ ട്രാൻസ്‌ക്രിപ്ഷൻ</string>
+  <string name="voicemail_visual_voicemail_donation_switch_title">വോയ്‌സ്‌മെയിൽ ട്രാൻസ്‌ക്രിപ്ഷൻ അനാലിസിസ്</string>
+  <string name="voicemail_activating_summary_info">വോയ്‌സ്‌മെയിൽ സജീവമാക്കുന്നു</string>
+  <string name="voicemail_transcription_preference_summary_info">Google-ന്റെ ട്രാൻസ്‌ക്രിപ്ഷൻ സേവനം ഉപയോഗിച്ച് നിങ്ങളുടെ വോയ്‌സ്‌മെയിലിന്റെ ട്രാൻസ്‌ക്രിപ്റ്റുകൾ നേടുക. %1$s</string>
+  <string name="voicemail_donate_preference_summary_info">ട്രാൻസ്‌ക്രിപ്ഷൻ നിലവാരം മെച്ചപ്പെടുത്താനായി, വോയ്‌സ്‌മെയിൽ സന്ദേശങ്ങൾ അവലോകനം ചെയ്യാൻ Google-നെ അനുവദിക്കുക. നിങ്ങളുടെ വോയ്‌സ്‌മെയിൽ സന്ദേശങ്ങൾ അജ്ഞാതമായി സംഭരിക്കപ്പെടും. %1$s</string>
+  <string name="confirm_disable_voicemail_dialog_title">വിഷ്വൽ വോയ്‌സ്‌മെയിൽ ഓഫാക്കുക</string>
+  <string name="confirm_disable_voicemail_dialog_message">ഇത്, ഈ ആപ്പിനുള്ളിൽ സംഭരിച്ചിരിക്കുന്ന എല്ലാ വോയ്‌സ്‌മെയിലും Google ട്രാൻസ്‌ക്രിപ്റ്റുകളും ഇല്ലാതാക്കും. നിങ്ങളുടെ കാരിയർ അതിന്റെ തന്നെ പകർപ്പുകൾ സൂക്ഷിച്ചേക്കാം.</string>
+  <string name="confirm_disable_voicemail_accept_dialog_label">ഓഫാക്കുക</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/settings/res/values-mn/strings.xml b/java/com/android/dialer/voicemail/settings/res/values-mn/strings.xml
new file mode 100644
index 0000000..6415e75
--- /dev/null
+++ b/java/com/android/dialer/voicemail/settings/res/values-mn/strings.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_settings_with_label">Дуут шуудан (%s)</string>
+  <string name="voicemail_settings_title">Дуут шуудан</string>
+  <string name="voicemail_notifications_preference_title">Мэдэгдэл</string>
+  <string name="voicemail_change_greeting_preference_title">Дуут шуудангийн мэндчилгээ</string>
+  <string name="change_greeting_text">Бичих бол товшино уу</string>
+  <string name="save_button_text">Хадгалах</string>
+  <string name="redo_button_text">Дахин оролдох</string>
+  <string name="voicemail_advanced_settings_title">Нарийвчилсан тохиргоо</string>
+  <string name="voicemail_visual_voicemail_switch_title">Уншиж болох дуут шуудан</string>
+  <string name="voicemail_visual_voicemail_auto_archive_switch_title">Нэмэлт нөөцлөлт болон хадгалах сан</string>
+  <string name="voicemail_set_pin_preference_title">PIN тохируулах</string>
+  <string name="voicemail_change_pin_preference_title">PIN өөрчлөх</string>
+  <string name="voicemail_change_pin_preference_summary_disable">Харагдах дуут шуудан PIN-г өөрчлөх боломжтой байх ёстой</string>
+  <string name="voicemail_change_pin_preference_summary_not_activated">Харагдах дуут шуудан хараахан идэвхжээгүй байна, дараа дахин оролдоно уу</string>
+  <string name="vm_change_pin_old_pin">Хуучин PIN</string>
+  <string name="vm_change_pin_new_pin">Шинэ PIN</string>
+  <string name="vm_change_pin_progress_message">Түр хүлээнэ үү.</string>
+  <string name="vm_change_pin_error_too_short">Шинэ PIN хэт богино байна.</string>
+  <string name="vm_change_pin_error_too_long">Шинэ PIN хэт урт байна.</string>
+  <string name="vm_change_pin_error_too_weak">Шинэ PIN хэт амархан байна. Сайн нууц үгэнд үргэлжилсэн дараалал буюу давтагдсан цифр ордоггүй.</string>
+  <string name="vm_change_pin_error_mismatch">Хуучин PIN таарахгүй байна.</string>
+  <string name="vm_change_pin_error_invalid">Шинэ PIN-д буруу тэмдэгт агуулагдаж байна.</string>
+  <string name="vm_change_pin_error_system_error">PIN-г өөрчлөх боломжгүй</string>
+  <string name="change_pin_title">Дуут шуудангийн PIN-г өөрчлөх</string>
+  <string name="change_pin_continue_label">Үргэлжлүүлэх</string>
+  <string name="change_pin_cancel_label">Цуцлах</string>
+  <string name="change_pin_ok_label">Ок</string>
+  <string name="change_pin_enter_old_pin_header">Хуучин PIN-ээ баталгаажуулна уу</string>
+  <string name="change_pin_enter_old_pin_hint">Үргэлжлүүлэхийн тулд дуут шуудангийн PIN оруулна уу.</string>
+  <string name="change_pin_enter_new_pin_header">Шинэ PIN тохируулах</string>
+  <string name="change_pin_enter_new_pin_hint">PIN %1$d - %2$d цифртэй байх ёстой.</string>
+  <string name="change_pin_confirm_pin_header">Өөрийн PIN-г баталгаажуулна уу</string>
+  <string name="change_pin_confirm_pins_dont_match">PIN код таарахгүй байна</string>
+  <string name="change_pin_succeeded">Дуут шуудангийн PIN шинэчлэгдсэн</string>
+  <string name="change_pin_system_error">PIN тохируулах боломжгүй</string>
+  <string name="voicemail_visual_voicemail_transcription_switch_title">Дуут шуудангийн сийрүүлэг</string>
+  <string name="voicemail_visual_voicemail_donation_switch_title">Дуут шуудангийн сийрүүлгийн анализ</string>
+  <string name="voicemail_activating_summary_info">Дуут шууданг идэвхжүүлж байна</string>
+  <string name="voicemail_transcription_preference_summary_info">Google сийрүүлгийн үйлчилгээ ашиглан өөрийн дуут шуудангийн сийрүүлгийг авна уу. %1$s</string>
+  <string name="voicemail_donate_preference_summary_info">Сийрүүлгийн нарийвчлалыг сайжруулахын тулд Google-д өөрийн дуут шуудангийн зурвасыг хянахыг зөвшөөрнө үү. Таны дуут шуудангийн зурвасыг нэргүйгээр хадгална. %1$s</string>
+  <string name="confirm_disable_voicemail_dialog_title">Уншиж болох дуут шууданг унтраах</string>
+  <string name="confirm_disable_voicemail_dialog_message">Ингэснээр энэ апп дотор хадгалсан аливаа дуут шуудан болон Google сийрүүлгийг устгах болно. Таны үүрэн холбооны компанид өөрийнх нь хуулбар хадгалагдаж байж магадгүй.</string>
+  <string name="confirm_disable_voicemail_accept_dialog_label">УНТРААХ</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/settings/res/values-mr/strings.xml b/java/com/android/dialer/voicemail/settings/res/values-mr/strings.xml
new file mode 100644
index 0000000..16459cb
--- /dev/null
+++ b/java/com/android/dialer/voicemail/settings/res/values-mr/strings.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_settings_with_label">व्हॉइसमेल (%s)</string>
+  <string name="voicemail_settings_title">व्हॉइसमेल</string>
+  <string name="voicemail_notifications_preference_title">सूचना</string>
+  <string name="voicemail_change_greeting_preference_title">व्‍हॉइसमेल ग्रीटिंग</string>
+  <string name="change_greeting_text">रेकॉर्डसाठी टॅप करा</string>
+  <string name="save_button_text">सेव्ह करा</string>
+  <string name="redo_button_text">पुन्हा प्रयत्न करा</string>
+  <string name="voicemail_advanced_settings_title">प्रगत सेटिंग्ज</string>
+  <string name="voicemail_visual_voicemail_switch_title">व्हिज्युअल व्हॉइसमेल</string>
+  <string name="voicemail_visual_voicemail_auto_archive_switch_title">अतिरिक्त बॅक अप आणि स्टोरेज</string>
+  <string name="voicemail_set_pin_preference_title">पिन सेट करा</string>
+  <string name="voicemail_change_pin_preference_title">पिन बदला</string>
+  <string name="voicemail_change_pin_preference_summary_disable">पिन बदलण्‍यासाठी व्हिज्युअल व्हॉइसमेल सुरू करणे आवश्‍यक आहे</string>
+  <string name="voicemail_change_pin_preference_summary_not_activated">व्हिज्युअल व्हॉइसमेल अजून चालू केले नाही, कृपया नंतर पुन्हा प्रयत्न करा</string>
+  <string name="vm_change_pin_old_pin">जुना पिन</string>
+  <string name="vm_change_pin_new_pin">नवीन पिन</string>
+  <string name="vm_change_pin_progress_message">कृपया वाट पाहा.</string>
+  <string name="vm_change_pin_error_too_short">नवीन पिन खूप लहान आहे.</string>
+  <string name="vm_change_pin_error_too_long">नवीन पिन खूप मोठा आहे.</string>
+  <string name="vm_change_pin_error_too_weak">नवीन पिन खूप कमकुवत आहे. मजबूत पासवर्डमध्ये अखंड क्रमवारी किंवा पुनरावृत्ती केलेले अंक नसावेत.</string>
+  <string name="vm_change_pin_error_mismatch">जुना पिन जुळत नाही.</string>
+  <string name="vm_change_pin_error_invalid">नवीन पिन मध्ये चुकीचे वर्ण आहेत.</string>
+  <string name="vm_change_pin_error_system_error">पिन बदलू शकत नाही</string>
+  <string name="change_pin_title">व्हॉइसमेल पिन बदला</string>
+  <string name="change_pin_continue_label">सुरू ठेवा</string>
+  <string name="change_pin_cancel_label">रद्द करा</string>
+  <string name="change_pin_ok_label">ठीक आहे</string>
+  <string name="change_pin_enter_old_pin_header">तुमच्या जुन्या पिनची खात्री पटवा</string>
+  <string name="change_pin_enter_old_pin_hint">सुरू ठेवण्‍यासाठी तुमचा व्हॉइसमेल पिन टाका.</string>
+  <string name="change_pin_enter_new_pin_header">नवीन पिन सेट करा</string>
+  <string name="change_pin_enter_new_pin_hint">पिन %1$d-%2$d अंकी असणे आवश्‍यक आहे.</string>
+  <string name="change_pin_confirm_pin_header">तुमच्या पिनची पुष्टी करा</string>
+  <string name="change_pin_confirm_pins_dont_match">पिन जुळत नाहीत</string>
+  <string name="change_pin_succeeded">व्हॉइसमेल पिन अपडेट केला</string>
+  <string name="change_pin_system_error">पिन सेट करू शकत नाही</string>
+  <string name="voicemail_visual_voicemail_transcription_switch_title">व्‍हॉइसमेल प्रतिलेखन</string>
+  <string name="voicemail_visual_voicemail_donation_switch_title">व्‍हॉइसमेल प्रतिलेख विश्‍लेषण</string>
+  <string name="voicemail_activating_summary_info">व्‍हॉइसमेल सक्रिय करत आहे</string>
+  <string name="voicemail_transcription_preference_summary_info">Google च्‍या प्रतिलेखन सेवा वापरून प्रतिलेखने मिळवा. %1$s</string>
+  <string name="voicemail_donate_preference_summary_info">प्रतिलेखन अचूकता सुधारण्‍यासाठी Google ला तुमचे व्‍हॉइसमेल मेसेजांचे पुनरावलोकन करू द्या. तुमचे व्‍हॉइसमेल मेसेज निनावी स्‍टोअर केले आहेत. %1$s</string>
+  <string name="confirm_disable_voicemail_dialog_title">व्हिज्युअल व्हॉइसमेल बंद करा</string>
+  <string name="confirm_disable_voicemail_dialog_message">हे या अ‍ॅपमध्ये स्टोअर केलेला प्रत्येक व्हॉइसमेल आणि Google प्रतिलेख हटवेल. तुमचा वाहक स्वत:साठी त्याच्या कॉपी ठेवून घेईल.</string>
+  <string name="confirm_disable_voicemail_accept_dialog_label">बंद करा</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/settings/res/values-ms/strings.xml b/java/com/android/dialer/voicemail/settings/res/values-ms/strings.xml
new file mode 100644
index 0000000..720274d
--- /dev/null
+++ b/java/com/android/dialer/voicemail/settings/res/values-ms/strings.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_settings_with_label">Mel suara (%s)</string>
+  <string name="voicemail_settings_title">Mel suara</string>
+  <string name="voicemail_notifications_preference_title">Pemberitahuan</string>
+  <string name="voicemail_change_greeting_preference_title">Sapaan mel suara</string>
+  <string name="change_greeting_text">Ketik untuk Rakam</string>
+  <string name="save_button_text">Simpan</string>
+  <string name="redo_button_text">Cuba Lagi</string>
+  <string name="voicemail_advanced_settings_title">Tetapan Terperinci</string>
+  <string name="voicemail_visual_voicemail_switch_title">Mel suara visual</string>
+  <string name="voicemail_visual_voicemail_auto_archive_switch_title">Sandaran dan storan tambahan</string>
+  <string name="voicemail_set_pin_preference_title">Tetapkan PIN</string>
+  <string name="voicemail_change_pin_preference_title">Tukar PIN</string>
+  <string name="voicemail_change_pin_preference_summary_disable">Mel suara visual mesti didayakan untuk menukar PIN</string>
+  <string name="voicemail_change_pin_preference_summary_not_activated">Mel suara visual belum diaktifkan. Sila cuba sebentar lagi</string>
+  <string name="vm_change_pin_old_pin">PIN lama</string>
+  <string name="vm_change_pin_new_pin">PIN baharu</string>
+  <string name="vm_change_pin_progress_message">Sila tunggu.</string>
+  <string name="vm_change_pin_error_too_short">PIN baharu terlalu pendek.</string>
+  <string name="vm_change_pin_error_too_long">PIN baharu terlalu panjang.</string>
+  <string name="vm_change_pin_error_too_weak">PIN baharu terlalu lemah. Kata laluan yang kukuh tidak seharusnya mengandungi digit yang berturutan atau berulangan.</string>
+  <string name="vm_change_pin_error_mismatch">PIN lama tidak sepadan.</string>
+  <string name="vm_change_pin_error_invalid">PIN baharu mengandungi aksara yang tidak sah.</string>
+  <string name="vm_change_pin_error_system_error">Tidak dapat menukar PIN</string>
+  <string name="change_pin_title">Tukar PIN Mel Suara</string>
+  <string name="change_pin_continue_label">Teruskan</string>
+  <string name="change_pin_cancel_label">Batal</string>
+  <string name="change_pin_ok_label">Ok</string>
+  <string name="change_pin_enter_old_pin_header">Sahkan PIN lama anda</string>
+  <string name="change_pin_enter_old_pin_hint">Masukkan PIN mel suara anda untuk meneruskan.</string>
+  <string name="change_pin_enter_new_pin_header">Tetapkan PIN baharu</string>
+  <string name="change_pin_enter_new_pin_hint">PIN mestilah %1$d-%2$d digit.</string>
+  <string name="change_pin_confirm_pin_header">Sahkan PIN anda</string>
+  <string name="change_pin_confirm_pins_dont_match">PIN tidak sepadan</string>
+  <string name="change_pin_succeeded">PIN mel suara dikemas kini</string>
+  <string name="change_pin_system_error">Tidak dapat menetapkan PIN</string>
+  <string name="voicemail_visual_voicemail_transcription_switch_title">Transkripsi mel suara</string>
+  <string name="voicemail_visual_voicemail_donation_switch_title">Analisis transkripsi mel suara</string>
+  <string name="voicemail_activating_summary_info">Mengaktifkan mel suara</string>
+  <string name="voicemail_transcription_preference_summary_info">Dapatkan transkrip mel suara anda menggunakan perkhidmatan transkripsi Google. %1$s</string>
+  <string name="voicemail_donate_preference_summary_info">Benarkan Google menyemak mesej mel suara anda bagi meningkatkan ketepatan transkripsi. Mesej mel suara anda disimpan secara awanama. %1$s</string>
+  <string name="confirm_disable_voicemail_dialog_title">Matikan mel suara visual</string>
+  <string name="confirm_disable_voicemail_dialog_message">Tindakan ini akan memadamkan sebarang mel suara dan transkrip Google yang disimpan dalam apl ini. Pembawa anda mungkin menyimpan salinannya sendiri.</string>
+  <string name="confirm_disable_voicemail_accept_dialog_label">MATIKAN</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/settings/res/values-my/strings.xml b/java/com/android/dialer/voicemail/settings/res/values-my/strings.xml
new file mode 100644
index 0000000..dd3e8d3
--- /dev/null
+++ b/java/com/android/dialer/voicemail/settings/res/values-my/strings.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_settings_with_label">အသံမေးလ် (%s)</string>
+  <string name="voicemail_settings_title">အသံမေးလ်</string>
+  <string name="voicemail_notifications_preference_title">အသိပေးချက်များ</string>
+  <string name="voicemail_change_greeting_preference_title">အသံမေးလ် နှုတ်ခွန်းဆက်သမှု</string>
+  <string name="change_greeting_text">အသံဖမ်းရန် တို့ပါ</string>
+  <string name="save_button_text">သိမ်းရန်</string>
+  <string name="redo_button_text">ထပ်လုပ်ရန်</string>
+  <string name="voicemail_advanced_settings_title">အဆင့်မြင့် ဆက်တင်များ</string>
+  <string name="voicemail_visual_voicemail_switch_title">ကြည့်ရှုစီမံနိုင်သော အသံမေးလ်</string>
+  <string name="voicemail_visual_voicemail_auto_archive_switch_title">အပိုဆောင်း မိတ္တူနှင့် သိုလှောင်မှု</string>
+  <string name="voicemail_set_pin_preference_title">ပင်နံပါတ် သတ်မှတ်ခြင်း</string>
+  <string name="voicemail_change_pin_preference_title">ပင်နံပါတ် ပြောင်းခြင်း</string>
+  <string name="voicemail_change_pin_preference_summary_disable">ပင်နံပါတ်ပြောင်းရန် ကြည့်ရှုစီမံနိုင်သော အသံမေးလ်ကို ဖွင့်ထားရပါမည်</string>
+  <string name="voicemail_change_pin_preference_summary_not_activated">ကြည့်ရှုစီမံနိုင်သော အသံမေးလ်ကို မဖွင့်ရသေးပါ၊ နောက်မှ ထပ်ဖွင့်ကြည့်ပါ</string>
+  <string name="vm_change_pin_old_pin">ပင်နံပါတ်အဟောင်း</string>
+  <string name="vm_change_pin_new_pin">ပင်နံပါတ်အသစ်</string>
+  <string name="vm_change_pin_progress_message">ခဏစောင့်ပါ။</string>
+  <string name="vm_change_pin_error_too_short">ပင်နံပါတ်အသစ်မှာ တိုလွန်းနေပါသည်။</string>
+  <string name="vm_change_pin_error_too_long">ပင်နံပါတ်အသစ်မှာ ရှည်လွန်းနေပါသည်။</string>
+  <string name="vm_change_pin_error_too_weak">ပင်နံပါတ်အသစ်မှာ အားနည်းလွန်းနေပါသည်။ အားကောင်းသော စကားဝှက်တစ်ခုတွင် အစဉ်လိုက်စာလုံးများ (သို့) ထပ်တလဲလဲသုံးထားသော ကိန်းဂဏန်းများ မပါသင့်ပါ။</string>
+  <string name="vm_change_pin_error_mismatch">ပင်နံပါတ်အဟောင်းမှာ ထပ်တူမကျပါ။</string>
+  <string name="vm_change_pin_error_invalid">ပင်နံပါတ်အသစ်တွင် မမှန်ကန်သောအက္ခရာများ ပါဝင်နေသည်။</string>
+  <string name="vm_change_pin_error_system_error">ပင်နံပါတ်ကို ပြောင်း၍ မရပါ</string>
+  <string name="change_pin_title">အသံမေးလ်ပင်နံပါတ်ကို ပြောင်းခြင်း</string>
+  <string name="change_pin_continue_label">ဆက်လုပ်ရန်</string>
+  <string name="change_pin_cancel_label">မလုပ်တော့</string>
+  <string name="change_pin_ok_label">OK</string>
+  <string name="change_pin_enter_old_pin_header">သင့်ပင်နံပါတ်အဟောင်းကို အတည်ပြုခြင်း</string>
+  <string name="change_pin_enter_old_pin_hint">ဆက်လုပ်ရန်အတွက် သင့်အသံမေးလ်ပင်နံပါတ်ကို ထည့်ပါ။</string>
+  <string name="change_pin_enter_new_pin_header">ပင်နံပါတ်အသစ်ကို သတ်မှတ်ခြင်း</string>
+  <string name="change_pin_enter_new_pin_hint">ပင်နံပါတ်တွင် ကိန်းဂဏန်း %1$d-%2$d လုံး ပါရှိရမည်။</string>
+  <string name="change_pin_confirm_pin_header">သင့်ပင်နံပါတ်ကို အတည်ပြုခြင်း</string>
+  <string name="change_pin_confirm_pins_dont_match">ပင်နံပါတ်များမှာ ထပ်တူမကျပါ</string>
+  <string name="change_pin_succeeded">အသံမေးလ်ပင်နံပါတ်ကို အပ်ဒိတ်လုပ်လိုက်ပါပြီ</string>
+  <string name="change_pin_system_error">ပင်နံပါတ်ကို သတ်မှတ်၍ မရပါ</string>
+  <string name="voicemail_visual_voicemail_transcription_switch_title">အသံမေးလ် စာသားမှတ်တမ်း</string>
+  <string name="voicemail_visual_voicemail_donation_switch_title">အသံမေးလ်စာသားမှတ်တမ်း စိစစ်ခြင်း</string>
+  <string name="voicemail_activating_summary_info">အသံမေးလ်ကို စတင်အသုံးပြုနေသည်</string>
+  <string name="voicemail_transcription_preference_summary_info">Google ၏ စာသားမှတ်တမ်း ဝန်ဆောင်မှုကို သုံးပြီး သင့်အသံမေးလ်၏ စာသားမှတ်တမ်းကို ရယူပါ %1$s</string>
+  <string name="voicemail_donate_preference_summary_info">စာသားမှတ်တမ်းတိကျမှု ပိုမိုကောင်းမွန်လာစေရန် Google အား သင်၏ အသံမေးလ်မက်ဆေ့ဂျ်များကို သုံးသပ်ခွင့်ပေးလိုက်ပါ။ သင်၏ အသံမေးလ်မက်ဆေ့ဂျ်များကို အမည်မဖော်ဘဲ သိမ်းထားပါသည်။ %1$s</string>
+  <string name="confirm_disable_voicemail_dialog_title">ကြည့်ရှုစီမံနိုင်သော အသံမေးလ်ကို ပိတ်ပါ</string>
+  <string name="confirm_disable_voicemail_dialog_message">ဤသည်က ဤအက်ပ်အတွင်း သိမ်းဆည်းထားသော မည်သည့်အသံမေးလ်နှင့် Google စာသားမှတ်တမ်းကိုမဆို ဖျက်ပစ်ပါမည်။ သင့်ဖုန်းကုမ္ပဏီသည် ၎င်း၏ကိုယ်ပိုင်မိတ္တူများကို သိမ်းဆည်းထားနိုင်သည်။</string>
+  <string name="confirm_disable_voicemail_accept_dialog_label">ပိတ်ရန်</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/settings/res/values-nb/strings.xml b/java/com/android/dialer/voicemail/settings/res/values-nb/strings.xml
new file mode 100644
index 0000000..7d11cc2
--- /dev/null
+++ b/java/com/android/dialer/voicemail/settings/res/values-nb/strings.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_settings_with_label">Talepostkasse (%s)</string>
+  <string name="voicemail_settings_title">Talepost</string>
+  <string name="voicemail_notifications_preference_title">Varsler</string>
+  <string name="voicemail_change_greeting_preference_title">Taleposthilsen</string>
+  <string name="change_greeting_text">Trykk for å ta opp</string>
+  <string name="save_button_text">Lagre</string>
+  <string name="redo_button_text">Prøv igjen</string>
+  <string name="voicemail_advanced_settings_title">Avanserte innstillinger</string>
+  <string name="voicemail_visual_voicemail_switch_title">Visuell talepost</string>
+  <string name="voicemail_visual_voicemail_auto_archive_switch_title">Ekstra sikkerhetskopi og lagring</string>
+  <string name="voicemail_set_pin_preference_title">Angi PIN-kode</string>
+  <string name="voicemail_change_pin_preference_title">Endre PIN-koden</string>
+  <string name="voicemail_change_pin_preference_summary_disable">Du må slå på visuell talepost for å endre PIN-koden</string>
+  <string name="voicemail_change_pin_preference_summary_not_activated">Visuell talepost er ikke slått på ennå – prøv igjen senere</string>
+  <string name="vm_change_pin_old_pin">Gammel PIN-kode</string>
+  <string name="vm_change_pin_new_pin">Ny PIN-kode</string>
+  <string name="vm_change_pin_progress_message">Vent litt.</string>
+  <string name="vm_change_pin_error_too_short">Den nye PIN-koden er for kort.</string>
+  <string name="vm_change_pin_error_too_long">Den nye PIN-koden er for lang.</string>
+  <string name="vm_change_pin_error_too_weak">Den nye PIN-koden er for svak. Sterke passord inneholder ikke sammenhengende sekvenser eller gjentatte sifre.</string>
+  <string name="vm_change_pin_error_mismatch">Den gamle PIN-koden er feil.</string>
+  <string name="vm_change_pin_error_invalid">Den nye PIN-koden inneholder ugyldige tegn.</string>
+  <string name="vm_change_pin_error_system_error">Kan ikke bytte PIN-kode</string>
+  <string name="change_pin_title">Endre PIN-kode for talemeldinger</string>
+  <string name="change_pin_continue_label">Fortsett</string>
+  <string name="change_pin_cancel_label">Avbryt</string>
+  <string name="change_pin_ok_label">OK</string>
+  <string name="change_pin_enter_old_pin_header">Bekreft den gamle PIN-koden din</string>
+  <string name="change_pin_enter_old_pin_hint">Skriv inn PIN-koden for talemeldinger for å fortsette.</string>
+  <string name="change_pin_enter_new_pin_header">Angi en ny PIN-kode</string>
+  <string name="change_pin_enter_new_pin_hint">PIN-koden må bestå av %1$d–%2$d sifre.</string>
+  <string name="change_pin_confirm_pin_header">Bekreft PIN-koden din</string>
+  <string name="change_pin_confirm_pins_dont_match">PIN-kodene stemmer ikke overens</string>
+  <string name="change_pin_succeeded">PIN-koden for talemeldinger ble oppdatert</string>
+  <string name="change_pin_system_error">Kan ikke angi PIN-kode</string>
+  <string name="voicemail_visual_voicemail_transcription_switch_title">Transkripsjon av talepost</string>
+  <string name="voicemail_visual_voicemail_donation_switch_title">Analyse av transkripsjoner av talepost</string>
+  <string name="voicemail_activating_summary_info">Slår på talepost</string>
+  <string name="voicemail_transcription_preference_summary_info">Få transkripsjoner av talemeldingene dine fra Googles transkripsjonstjeneste. %1$s</string>
+  <string name="voicemail_donate_preference_summary_info">Tillat at Google går gjennom talemeldingene dine for å forbedre nøyaktigheten for transkripsjoner. Talemeldingene dine blir lagret anonymt. %1$s</string>
+  <string name="confirm_disable_voicemail_dialog_title">Slå av visuell talepost</string>
+  <string name="confirm_disable_voicemail_dialog_message">Dette sletter eventuelle talemeldinger og Google-transkripsjoner som er lagret i denne appen. Det kan hende mobiloperatøren din har lagret egne kopier.</string>
+  <string name="confirm_disable_voicemail_accept_dialog_label">SLÅ AV</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/settings/res/values-ne/strings.xml b/java/com/android/dialer/voicemail/settings/res/values-ne/strings.xml
new file mode 100644
index 0000000..b4536da
--- /dev/null
+++ b/java/com/android/dialer/voicemail/settings/res/values-ne/strings.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_settings_with_label">भ्वाइस मेल (%s)</string>
+  <string name="voicemail_settings_title">भ्वाइस मेल</string>
+  <string name="voicemail_notifications_preference_title">सूचनाहरू</string>
+  <string name="voicemail_change_greeting_preference_title">भ्वाइस मेलको अभिभावदन</string>
+  <string name="change_greeting_text">रेकर्ड गर्न ट्याप गर्नु…</string>
+  <string name="save_button_text">सुरक्षित गर्नु…</string>
+  <string name="redo_button_text">फेरि प्रयास गर्नु…</string>
+  <string name="voicemail_advanced_settings_title">उन्नत सेटिङहरू</string>
+  <string name="voicemail_visual_voicemail_switch_title">भिजुअल भ्वाइस मेल</string>
+  <string name="voicemail_visual_voicemail_auto_archive_switch_title">अतिरिक्त ब्याकअप र भण्डारण</string>
+  <string name="voicemail_set_pin_preference_title">PIN सेट गर्नुहोस्</string>
+  <string name="voicemail_change_pin_preference_title">PIN परिवर्तन गर्नुहोस्</string>
+  <string name="voicemail_change_pin_preference_summary_disable">PIN परिवर्तन गर्न  भिजुअल भ्वाइस मेल अनिवार्य रूपमा सक्षम पारिएको हुनु पर्छ</string>
+  <string name="voicemail_change_pin_preference_summary_not_activated">भिजुअल भ्वाइस मेल अझै सक्रिय गरिएको छैन, कृपया पछि फेरि प्रयास गर्नुहोस्</string>
+  <string name="vm_change_pin_old_pin">पुरानो PIN</string>
+  <string name="vm_change_pin_new_pin">नयाँ PIN</string>
+  <string name="vm_change_pin_progress_message">कृपया प्रतीक्षा गर्नुहोस्।</string>
+  <string name="vm_change_pin_error_too_short">नयाँ PIN अत्यन्त छोटो छ।</string>
+  <string name="vm_change_pin_error_too_long">नयाँ PIN अत्यन्त लामो छ।</string>
+  <string name="vm_change_pin_error_too_weak">नयाँ PIN अत्यन्त कमजोर छ। बलियो पासवर्डमा एउटै क्रमका वा दोहोरिएका अङ्कहरू हुनु हुँदैन।</string>
+  <string name="vm_change_pin_error_mismatch">पुरानो PIN मेल खाँदैन।</string>
+  <string name="vm_change_pin_error_invalid">नयाँ PIN मा अमान्य वर्णहरू छन्।</string>
+  <string name="vm_change_pin_error_system_error">PIN परिवर्तन गर्न सकिएन</string>
+  <string name="change_pin_title">भ्वाइस मेलको PIN परिवर्तन गर्नुहोस्</string>
+  <string name="change_pin_continue_label">जारी राख्नुहोस्</string>
+  <string name="change_pin_cancel_label">रद्द गर्नुहोस्</string>
+  <string name="change_pin_ok_label">ठिक छ</string>
+  <string name="change_pin_enter_old_pin_header">आफ्नो पुरानो PIN को पुष्टि गर्नुहोस्</string>
+  <string name="change_pin_enter_old_pin_hint">जारी राख्नका लागि आफ्नो भ्वाइस मेलको PIN प्रविष्ट गर्नुहोस्।</string>
+  <string name="change_pin_enter_new_pin_header">कुनै नयाँ PIN सेट गर्नुहोस्</string>
+  <string name="change_pin_enter_new_pin_hint">PIN अनिवार्य रूपले %1$d-%2$d अङ्कको हुनु पर्छ।</string>
+  <string name="change_pin_confirm_pin_header">तपाईंको PIN को पुष्टि गर्नुहोस्</string>
+  <string name="change_pin_confirm_pins_dont_match">PIN हरू मेल खाँदैनन्</string>
+  <string name="change_pin_succeeded">भ्वाइस मेलको PIN अद्यावधिक गरियो</string>
+  <string name="change_pin_system_error">PIN सेट गर्न सकिएन</string>
+  <string name="voicemail_visual_voicemail_transcription_switch_title">भ्वाइस मेलको ट्रान्स्क्रिप्सन</string>
+  <string name="voicemail_visual_voicemail_donation_switch_title">भ्वाइस मेलको ट्रान्स्क्रिप्सनसम्बन्धी विश्लेषण</string>
+  <string name="voicemail_activating_summary_info">भ्वाइस मेल सक्रिय गरिँदै छ</string>
+  <string name="voicemail_transcription_preference_summary_info">Google को ट्रान्स्क्रिप्सन सेवा प्रयोग गरी आफ्नो भ्वाइस मेलका ट्रान्स्क्रिप्टहरू प्राप्त गर्नुहोस्। %1$s</string>
+  <string name="voicemail_donate_preference_summary_info">ट्रान्स्क्रिप्सनको शुद्धतामा सुधार गर्न Google लाई आफ्नो भ्वाइस मेलका सन्देशहरू समीक्षा गर्न दिनुहोस्। तपाईंको भ्वाइस मेलका सन्देशहरूलाई बेनामी रूपमा भण्डारण गरिन्छ। %1$s</string>
+  <string name="confirm_disable_voicemail_dialog_title">भिजुअल भ्वाइस मेल निष्क्रिय पार्नुहोस्</string>
+  <string name="confirm_disable_voicemail_dialog_message">यस कार्यले यो अनुप्रयोगमा भण्डारण गरिएको सबै भ्वाइस मेल र Google ट्रान्सक्रिप्टहरू मेट्नेछ। तपाईंको सेवा प्रदायकले आफ्ना प्रतिलिपिहरू आफूसँग राख्न पनि सक्नेछ।</string>
+  <string name="confirm_disable_voicemail_accept_dialog_label">निष्क्रिय पार्नु…</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/settings/res/values-nl/strings.xml b/java/com/android/dialer/voicemail/settings/res/values-nl/strings.xml
new file mode 100644
index 0000000..b6d8e84
--- /dev/null
+++ b/java/com/android/dialer/voicemail/settings/res/values-nl/strings.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_settings_with_label">Voicemail (%s)</string>
+  <string name="voicemail_settings_title">Voicemail</string>
+  <string name="voicemail_notifications_preference_title">Meldingen</string>
+  <string name="voicemail_change_greeting_preference_title">Voicemailbegroeting</string>
+  <string name="change_greeting_text">Tik om op te nemen</string>
+  <string name="save_button_text">Opslaan</string>
+  <string name="redo_button_text">Opnieuw</string>
+  <string name="voicemail_advanced_settings_title">Geavanceerde instellingen</string>
+  <string name="voicemail_visual_voicemail_switch_title">Visuele voicemail</string>
+  <string name="voicemail_visual_voicemail_auto_archive_switch_title">Extra back-up en opslag</string>
+  <string name="voicemail_set_pin_preference_title">Pincode instellen</string>
+  <string name="voicemail_change_pin_preference_title">Pincode wijzigen</string>
+  <string name="voicemail_change_pin_preference_summary_disable">Visuele voicemail moet zijn ingeschakeld om de pincode te wijzigen</string>
+  <string name="voicemail_change_pin_preference_summary_not_activated">Visuele voicemail is nog niet geactiveerd. Probeer het later opnieuw.</string>
+  <string name="vm_change_pin_old_pin">Oude pincode</string>
+  <string name="vm_change_pin_new_pin">Nieuwe pincode</string>
+  <string name="vm_change_pin_progress_message">Even geduld.</string>
+  <string name="vm_change_pin_error_too_short">De nieuwe pincode is te kort.</string>
+  <string name="vm_change_pin_error_too_long">De nieuwe pincode is te lang.</string>
+  <string name="vm_change_pin_error_too_weak">De nieuwe pincode is niet sterk genoeg. Een sterk wachtwoord mag geen opeenvolgende cijferreeks of herhaalde cijfers bevatten.</string>
+  <string name="vm_change_pin_error_mismatch">De oude pincode komt niet overeen.</string>
+  <string name="vm_change_pin_error_invalid">De nieuwe pincode bevat ongeldige tekens.</string>
+  <string name="vm_change_pin_error_system_error">Kan pincode niet wijzigen</string>
+  <string name="change_pin_title">Voicemailpincode wijzigen</string>
+  <string name="change_pin_continue_label">Doorgaan</string>
+  <string name="change_pin_cancel_label">Annuleren</string>
+  <string name="change_pin_ok_label">OK</string>
+  <string name="change_pin_enter_old_pin_header">Je oude pincode bevestigen</string>
+  <string name="change_pin_enter_old_pin_hint">Geef je voicemailpincode op om door te gaan.</string>
+  <string name="change_pin_enter_new_pin_header">Een nieuwe pincode instellen</string>
+  <string name="change_pin_enter_new_pin_hint">Pincode moet %1$d-%2$d cijfers zijn.</string>
+  <string name="change_pin_confirm_pin_header">De pincode bevestigen</string>
+  <string name="change_pin_confirm_pins_dont_match">Pincodes komen niet overeen</string>
+  <string name="change_pin_succeeded">Voicemailpincode geüpdatet</string>
+  <string name="change_pin_system_error">Kan pincode niet instellen</string>
+  <string name="voicemail_visual_voicemail_transcription_switch_title">Voicemail-transcriptie</string>
+  <string name="voicemail_visual_voicemail_donation_switch_title">Analyse van voicemail-transcriptie</string>
+  <string name="voicemail_activating_summary_info">Voicemail activeren</string>
+  <string name="voicemail_transcription_preference_summary_info">Ontvang transcripten van je voicemail met de transcriptieservice van Google. %1$s</string>
+  <string name="voicemail_donate_preference_summary_info">Laat Google je voicemailberichten controleren om de nauwkeurigheid van transcripties te verbeteren. Je voicemailberichten worden anoniem opgeslagen. %1$s</string>
+  <string name="confirm_disable_voicemail_dialog_title">Visuele voicemail uitschakelen</string>
+  <string name="confirm_disable_voicemail_dialog_message">Hiermee worden voicemails en Google-transcripten verwijderd die zijn opgeslagen in deze app. Mogelijk bewaart uw provider zelf nog kopieën.</string>
+  <string name="confirm_disable_voicemail_accept_dialog_label">UITSCHAKELEN</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/settings/res/values-no/strings.xml b/java/com/android/dialer/voicemail/settings/res/values-no/strings.xml
new file mode 100644
index 0000000..7d11cc2
--- /dev/null
+++ b/java/com/android/dialer/voicemail/settings/res/values-no/strings.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_settings_with_label">Talepostkasse (%s)</string>
+  <string name="voicemail_settings_title">Talepost</string>
+  <string name="voicemail_notifications_preference_title">Varsler</string>
+  <string name="voicemail_change_greeting_preference_title">Taleposthilsen</string>
+  <string name="change_greeting_text">Trykk for å ta opp</string>
+  <string name="save_button_text">Lagre</string>
+  <string name="redo_button_text">Prøv igjen</string>
+  <string name="voicemail_advanced_settings_title">Avanserte innstillinger</string>
+  <string name="voicemail_visual_voicemail_switch_title">Visuell talepost</string>
+  <string name="voicemail_visual_voicemail_auto_archive_switch_title">Ekstra sikkerhetskopi og lagring</string>
+  <string name="voicemail_set_pin_preference_title">Angi PIN-kode</string>
+  <string name="voicemail_change_pin_preference_title">Endre PIN-koden</string>
+  <string name="voicemail_change_pin_preference_summary_disable">Du må slå på visuell talepost for å endre PIN-koden</string>
+  <string name="voicemail_change_pin_preference_summary_not_activated">Visuell talepost er ikke slått på ennå – prøv igjen senere</string>
+  <string name="vm_change_pin_old_pin">Gammel PIN-kode</string>
+  <string name="vm_change_pin_new_pin">Ny PIN-kode</string>
+  <string name="vm_change_pin_progress_message">Vent litt.</string>
+  <string name="vm_change_pin_error_too_short">Den nye PIN-koden er for kort.</string>
+  <string name="vm_change_pin_error_too_long">Den nye PIN-koden er for lang.</string>
+  <string name="vm_change_pin_error_too_weak">Den nye PIN-koden er for svak. Sterke passord inneholder ikke sammenhengende sekvenser eller gjentatte sifre.</string>
+  <string name="vm_change_pin_error_mismatch">Den gamle PIN-koden er feil.</string>
+  <string name="vm_change_pin_error_invalid">Den nye PIN-koden inneholder ugyldige tegn.</string>
+  <string name="vm_change_pin_error_system_error">Kan ikke bytte PIN-kode</string>
+  <string name="change_pin_title">Endre PIN-kode for talemeldinger</string>
+  <string name="change_pin_continue_label">Fortsett</string>
+  <string name="change_pin_cancel_label">Avbryt</string>
+  <string name="change_pin_ok_label">OK</string>
+  <string name="change_pin_enter_old_pin_header">Bekreft den gamle PIN-koden din</string>
+  <string name="change_pin_enter_old_pin_hint">Skriv inn PIN-koden for talemeldinger for å fortsette.</string>
+  <string name="change_pin_enter_new_pin_header">Angi en ny PIN-kode</string>
+  <string name="change_pin_enter_new_pin_hint">PIN-koden må bestå av %1$d–%2$d sifre.</string>
+  <string name="change_pin_confirm_pin_header">Bekreft PIN-koden din</string>
+  <string name="change_pin_confirm_pins_dont_match">PIN-kodene stemmer ikke overens</string>
+  <string name="change_pin_succeeded">PIN-koden for talemeldinger ble oppdatert</string>
+  <string name="change_pin_system_error">Kan ikke angi PIN-kode</string>
+  <string name="voicemail_visual_voicemail_transcription_switch_title">Transkripsjon av talepost</string>
+  <string name="voicemail_visual_voicemail_donation_switch_title">Analyse av transkripsjoner av talepost</string>
+  <string name="voicemail_activating_summary_info">Slår på talepost</string>
+  <string name="voicemail_transcription_preference_summary_info">Få transkripsjoner av talemeldingene dine fra Googles transkripsjonstjeneste. %1$s</string>
+  <string name="voicemail_donate_preference_summary_info">Tillat at Google går gjennom talemeldingene dine for å forbedre nøyaktigheten for transkripsjoner. Talemeldingene dine blir lagret anonymt. %1$s</string>
+  <string name="confirm_disable_voicemail_dialog_title">Slå av visuell talepost</string>
+  <string name="confirm_disable_voicemail_dialog_message">Dette sletter eventuelle talemeldinger og Google-transkripsjoner som er lagret i denne appen. Det kan hende mobiloperatøren din har lagret egne kopier.</string>
+  <string name="confirm_disable_voicemail_accept_dialog_label">SLÅ AV</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/settings/res/values-pa/strings.xml b/java/com/android/dialer/voicemail/settings/res/values-pa/strings.xml
new file mode 100644
index 0000000..e983331
--- /dev/null
+++ b/java/com/android/dialer/voicemail/settings/res/values-pa/strings.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_settings_with_label">ਵੌਇਸਮੇਲ (%s)</string>
+  <string name="voicemail_settings_title">ਵੌਇਸਮੇਲ</string>
+  <string name="voicemail_notifications_preference_title">ਸੂਚਨਾਵਾਂ</string>
+  <string name="voicemail_change_greeting_preference_title">ਵੌਇਸਮੇਲ ਸੰਬੰਧੀ ਸੰਬੋਧਨ</string>
+  <string name="change_greeting_text">ਰਿਕਾਰਡ ਕਰਨ ਲਈ ਟੈਪ ਕਰੋ</string>
+  <string name="save_button_text">ਰੱਖਿਅਤ ਕਰੋ</string>
+  <string name="redo_button_text">ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ</string>
+  <string name="voicemail_advanced_settings_title">ਉੱਨਤ ਸੈਟਿੰਗਾਂ</string>
+  <string name="voicemail_visual_voicemail_switch_title">ਦ੍ਰਿਸ਼ਟੀਗਤ ਵੌਇਸਮੇਲ</string>
+  <string name="voicemail_visual_voicemail_auto_archive_switch_title">ਵਾਧੂ ਬੈਕਅੱਪ ਅਤੇ ਸਟੋਰੇਜ</string>
+  <string name="voicemail_set_pin_preference_title">ਪਿੰਨ ਸੈੱਟ ਕਰੋ</string>
+  <string name="voicemail_change_pin_preference_title">ਪਿੰਨ ਬਦਲੋ</string>
+  <string name="voicemail_change_pin_preference_summary_disable">ਦ੍ਰਿਸ਼ਟੀਗਤ ਵੌਇਸਮੇਲ ਨੂੰ ਪਿੰਨ ਬਦਲਣ ਲਈ ਚਾਲੂ ਕੀਤਾ ਜਾਣਾ ਲਾਜ਼ਮੀ ਹੈ</string>
+  <string name="voicemail_change_pin_preference_summary_not_activated">ਦ੍ਰਿਸ਼ਟੀਗਤ ਵੌਇਸਮੇਲ ਹਾਲੇ ਸਰਗਰਮ ਨਹੀਂ ਹੈ, ਕਿਰਪਾ ਕਰਕੇ ਬਾਅਦ ਵਿੱਚ ਮੁੜ-ਕੋਸ਼ਿਸ਼ ਕਰੋ</string>
+  <string name="vm_change_pin_old_pin">ਪੁਰਾਣਾ ਪਿੰਨ</string>
+  <string name="vm_change_pin_new_pin">ਨਵਾਂ ਪਿੰਨ</string>
+  <string name="vm_change_pin_progress_message">ਕਿਰਪਾ ਕਰਕੇ ਉਡੀਕ ਕਰੋ।</string>
+  <string name="vm_change_pin_error_too_short">ਨਵਾਂ ਪਿੰਨ ਬਹੁਤ ਹੀ ਛੋਟਾ ਹੈ।</string>
+  <string name="vm_change_pin_error_too_long">ਨਵਾਂ ਪਿੰਨ ਬਹੁਤ ਹੀ ਵੱਡਾ ਹੈ।</string>
+  <string name="vm_change_pin_error_too_weak">ਨਵਾਂ ਪਿੰਨ ਬਹੁਤ ਹੀ ਕਮਜ਼ੋਰ ਹੈ। ਮਜ਼ਬੂਤ ਪਾਸਵਰਡ ਵਿੱਚ ਅੰਕਾਂ ਦੀ ਨਿਰੰਤਰ ਲੜੀ ਜਾਂ ਦੁਹਰਾਏ ਗਏ ਅੰਕ ਨਹੀਂ ਹੋਣੇ ਚਾਹੀਦੇ ਹਨ।</string>
+  <string name="vm_change_pin_error_mismatch">ਪੁਰਾਣਾ ਪਿੰਨ ਮੇਲ ਨਹੀਂ ਖਾਂਦਾ।</string>
+  <string name="vm_change_pin_error_invalid">ਨਵੇਂ ਪਿੰਨ ਵਿੱਚ ਅਵੈਧ ਅੱਖਰ-ਚਿੰਨ੍ਹ ਸ਼ਾਮਲ ਹਨ।</string>
+  <string name="vm_change_pin_error_system_error">ਪਿੰਨ ਨੂੰ ਬਦਲਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ</string>
+  <string name="change_pin_title">ਵੌਇਸਮੇਲ ਪਿੰਨ ਬਦਲੋ</string>
+  <string name="change_pin_continue_label">ਜਾਰੀ ਰੱਖੋ</string>
+  <string name="change_pin_cancel_label">ਰੱਦ ਕਰੋ</string>
+  <string name="change_pin_ok_label">ਠੀਕ ਹੈ</string>
+  <string name="change_pin_enter_old_pin_header">ਆਪਣੇ ਪੁਰਾਣੇ ਪਿੰਨ ਦੀ ਪੁਸ਼ਟੀ ਕਰੋ</string>
+  <string name="change_pin_enter_old_pin_hint">ਜਾਰੀ ਰੱਖਣ ਲਈ ਆਪਣਾ ਵੌਇਸਮੇਲ ਪਿੰਨ ਦਾਖਲ ਕਰੋ।</string>
+  <string name="change_pin_enter_new_pin_header">ਇੱਕ ਨਵਾਂ ਪਿੰਨ ਸੈੱਟ ਕਰੋ</string>
+  <string name="change_pin_enter_new_pin_hint">ਪਿੰਨ ਵਿੱਚ %1$d-%2$d ਅੰਕ ਹੋਣਾ ਲਾਜ਼ਮੀ ਹੈ।</string>
+  <string name="change_pin_confirm_pin_header">ਆਪਣੇ ਪਿੰਨ ਦੀ ਪੁਸ਼ਟੀ ਕਰੋ</string>
+  <string name="change_pin_confirm_pins_dont_match">ਪਿੰਨ ਮੇਲ ਨਹੀਂ ਖਾਂਦੇ</string>
+  <string name="change_pin_succeeded">ਵੌਇਸਮੇਲ ਪਿੰਨ ਅੱਪਡੇਟ ਕੀਤਾ ਗਿਆ</string>
+  <string name="change_pin_system_error">ਪਿੰਨ ਸੈੱਟ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ</string>
+  <string name="voicemail_visual_voicemail_transcription_switch_title">ਵੌਇਸਮੇਲ ਦੀ ਪ੍ਰਤੀਲਿਪੀ</string>
+  <string name="voicemail_visual_voicemail_donation_switch_title">ਵੌਇਸਮੇਲ ਪ੍ਰਤਿਲਿਪੀ ਦਾ ਵਿਸ਼ਲੇਸ਼ਣ</string>
+  <string name="voicemail_activating_summary_info">ਵੌਇਸਮੇਲ ਨੂੰ ਕਿਰਿਆਸ਼ੀਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ</string>
+  <string name="voicemail_transcription_preference_summary_info">Google ਦੀ ਪ੍ਰਤੀਲਿਪੀ ਸੇਵਾ ਦੀ ਵਰਤੋਂ ਨਾਲ ਆਪਣੀ ਵੌਇਸਮੇਲ ਦੀਆਂ ਪ੍ਰਤੀਲਿਪੀਆਂ ਪ੍ਰਾਪਤ ਕਰੋ। %1$s</string>
+  <string name="voicemail_donate_preference_summary_info">ਪ੍ਰਤੀਲਿਪੀਕਰਨ ਦੀ ਸਟੀਕਤਾ ਨੂੰ ਬਿਹਤਰ ਬਣਾਉਣ ਲਈ Google ਨੂੰ ਤੁਹਾਡੇ ਵੌਇਸਮੇਲ ਸੁਨੇਹਿਆਂ ਦੀ ਸਮੀਖਿਆ ਕਰਨ ਦਿਓ। ਤੁਹਾਡੇ ਵੌਇਸਮੇਲ ਸੁਨੇਹਿਆਂ ਨੂੰ ਗੁਮਨਾਮ ਤੌਰ \'ਤੇ ਸਟੋਰ ਕੀਤਾ ਜਾਂਦਾ ਹੈ। %1$s</string>
+  <string name="confirm_disable_voicemail_dialog_title">ਦ੍ਰਿਸ਼ਟੀਗਤ ਵੌਇਸਮੇਲ ਨੂੰ ਬੰਦ ਕਰੋ</string>
+  <string name="confirm_disable_voicemail_dialog_message">ਇਹ ਇਸ ਐਪ ਵਿੱਚ ਰੱਖਿਅਤ ਕੀਤੇ ਕਿਸੇ ਵੀ ਵੌਇਸਮੇਲ ਅਤੇ Google ਪ੍ਰਤਿਲਿਪੀਆਂ ਨੂੰ ਮਿਟਾ ਦੇਵੇਗਾ। ਤੁਹਾਡਾ ਕੈਰੀਅਰ ਇਸ ਦੀਆਂ ਕਾਪੀਆਂ ਆਪਣੇ ਕੋਲ ਰੱਖ ਸਕਦਾ ਹੈ।</string>
+  <string name="confirm_disable_voicemail_accept_dialog_label">ਬੰਦ ਕਰੋ</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/settings/res/values-pl/strings.xml b/java/com/android/dialer/voicemail/settings/res/values-pl/strings.xml
new file mode 100644
index 0000000..e1e5e1c
--- /dev/null
+++ b/java/com/android/dialer/voicemail/settings/res/values-pl/strings.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_settings_with_label">Poczta głosowa (%s)</string>
+  <string name="voicemail_settings_title">Poczta głosowa</string>
+  <string name="voicemail_notifications_preference_title">Powiadomienia</string>
+  <string name="voicemail_change_greeting_preference_title">Powitanie w poczcie głosowej</string>
+  <string name="change_greeting_text">Dotknij, aby nagrać</string>
+  <string name="save_button_text">Zapisz</string>
+  <string name="redo_button_text">Jeszcze raz</string>
+  <string name="voicemail_advanced_settings_title">Ustawienia zaawansowane</string>
+  <string name="voicemail_visual_voicemail_switch_title">Wizualna poczta głosowa</string>
+  <string name="voicemail_visual_voicemail_auto_archive_switch_title">Dodatkowe miejsce i kopia zapasowa</string>
+  <string name="voicemail_set_pin_preference_title">Ustaw kod PIN</string>
+  <string name="voicemail_change_pin_preference_title">Zmień kod PIN</string>
+  <string name="voicemail_change_pin_preference_summary_disable">Aby można było zmienić kod PIN, wizualna poczta głosowa musi być włączona</string>
+  <string name="voicemail_change_pin_preference_summary_not_activated">Wizualna poczta głosowa nie została jeszcze aktywowana – spróbuj ponownie później</string>
+  <string name="vm_change_pin_old_pin">Stary kod PIN</string>
+  <string name="vm_change_pin_new_pin">Nowy kod PIN</string>
+  <string name="vm_change_pin_progress_message">Poczekaj.</string>
+  <string name="vm_change_pin_error_too_short">Nowy kod PIN jest za krótki.</string>
+  <string name="vm_change_pin_error_too_long">Nowy kod PIN jest za długi.</string>
+  <string name="vm_change_pin_error_too_weak">Nowy kod PIN jest zbyt słaby. Silne hasło nie może zawierać ciągu kolejnych cyfr lub powtarzających się cyfr.</string>
+  <string name="vm_change_pin_error_mismatch">Stary kod PIN jest nieprawidłowy.</string>
+  <string name="vm_change_pin_error_invalid">Nowy kod PIN zawiera nieprawidłowe znaki.</string>
+  <string name="vm_change_pin_error_system_error">Nie udało się zmienić kodu PIN</string>
+  <string name="change_pin_title">Zmień kod PIN poczty głosowej</string>
+  <string name="change_pin_continue_label">Dalej</string>
+  <string name="change_pin_cancel_label">Anuluj</string>
+  <string name="change_pin_ok_label">OK</string>
+  <string name="change_pin_enter_old_pin_header">Potwierdź stary kod PIN</string>
+  <string name="change_pin_enter_old_pin_hint">Wpisz kod PIN poczty głosowej, aby przejść dalej.</string>
+  <string name="change_pin_enter_new_pin_header">Ustaw nowy kod PIN</string>
+  <string name="change_pin_enter_new_pin_hint">Kod PIN musi zawierać od %1$d do %2$d cyfr.</string>
+  <string name="change_pin_confirm_pin_header">Potwierdź kod PIN</string>
+  <string name="change_pin_confirm_pins_dont_match">Kody PIN nie są identyczne.</string>
+  <string name="change_pin_succeeded">Kod PIN poczty głosowej został zaktualizowany.</string>
+  <string name="change_pin_system_error">Nie udało się ustawić kodu PIN</string>
+  <string name="voicemail_visual_voicemail_transcription_switch_title">Transkrypcja poczty głosowej</string>
+  <string name="voicemail_visual_voicemail_donation_switch_title">Analiza transkrypcji poczty głosowej</string>
+  <string name="voicemail_activating_summary_info">Aktywuję pocztę głosową</string>
+  <string name="voicemail_transcription_preference_summary_info">Otrzymuj transkrypcje swojej poczty głosowej z usługi transkrypcji Google. %1$s</string>
+  <string name="voicemail_donate_preference_summary_info">Pozwól Google na sprawdzanie Twoich wiadomości głosowych w celu ulepszania jakości transkrypcji. Wiadomości głosowe są przechowywane anonimowo. %1$s</string>
+  <string name="confirm_disable_voicemail_dialog_title">Wyłączanie wizualnej poczty głosowej</string>
+  <string name="confirm_disable_voicemail_dialog_message">Spowoduje to usunięcie wszystkich wiadomości głosowych i transkrypcji Google przechowywanych w tej aplikacji. Operator może mieć oddzielne kopie.</string>
+  <string name="confirm_disable_voicemail_accept_dialog_label">WYŁĄCZ</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/settings/res/values-pt-rBR/strings.xml b/java/com/android/dialer/voicemail/settings/res/values-pt-rBR/strings.xml
new file mode 100644
index 0000000..8b26ba1
--- /dev/null
+++ b/java/com/android/dialer/voicemail/settings/res/values-pt-rBR/strings.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_settings_with_label">Correio de voz (%s)</string>
+  <string name="voicemail_settings_title">Correio de voz</string>
+  <string name="voicemail_notifications_preference_title">Notificações</string>
+  <string name="voicemail_change_greeting_preference_title">Saudação do correio de voz</string>
+  <string name="change_greeting_text">Toque para gravar</string>
+  <string name="save_button_text">Salvar</string>
+  <string name="redo_button_text">Repetir</string>
+  <string name="voicemail_advanced_settings_title">Configurações avançadas</string>
+  <string name="voicemail_visual_voicemail_switch_title">Correio de voz visual</string>
+  <string name="voicemail_visual_voicemail_auto_archive_switch_title">Backup e armazenamento extra</string>
+  <string name="voicemail_set_pin_preference_title">Definir PIN</string>
+  <string name="voicemail_change_pin_preference_title">Alterar PIN</string>
+  <string name="voicemail_change_pin_preference_summary_disable">O correio de voz visual precisa ser ativado para alterar o PIN</string>
+  <string name="voicemail_change_pin_preference_summary_not_activated">O correio de voz visual ainda não foi ativado, tente novamente mais tarde</string>
+  <string name="vm_change_pin_old_pin">PIN antigo</string>
+  <string name="vm_change_pin_new_pin">Novo PIN</string>
+  <string name="vm_change_pin_progress_message">Aguarde.</string>
+  <string name="vm_change_pin_error_too_short">O novo PIN é curto demais.</string>
+  <string name="vm_change_pin_error_too_long">O novo PIN é longo demais.</string>
+  <string name="vm_change_pin_error_too_weak">O novo PIN é fácil demais. Uma senha com sequência contínua ou dígitos repetidos não é segura.</string>
+  <string name="vm_change_pin_error_mismatch">O PIN antigo não corresponde.</string>
+  <string name="vm_change_pin_error_invalid">O novo PIN contém caracteres inválidos.</string>
+  <string name="vm_change_pin_error_system_error">Não foi possível alterar o PIN.</string>
+  <string name="change_pin_title">Alterar o PIN do correio de voz</string>
+  <string name="change_pin_continue_label">Continuar</string>
+  <string name="change_pin_cancel_label">Cancelar</string>
+  <string name="change_pin_ok_label">Ok</string>
+  <string name="change_pin_enter_old_pin_header">Confirmar seu PIN antigo</string>
+  <string name="change_pin_enter_old_pin_hint">Digite o PIN do correio de voz para continuar.</string>
+  <string name="change_pin_enter_new_pin_header">Definir um novo PIN</string>
+  <string name="change_pin_enter_new_pin_hint">O PIN precisa ter de %1$d a %2$d dígitos.</string>
+  <string name="change_pin_confirm_pin_header">Confirmar seu PIN</string>
+  <string name="change_pin_confirm_pins_dont_match">Os PINs não correspondem</string>
+  <string name="change_pin_succeeded">O PIN do correio de voz foi atualizado</string>
+  <string name="change_pin_system_error">Não foi possível definir o PIN</string>
+  <string name="voicemail_visual_voicemail_transcription_switch_title">Transcrição do correio de voz</string>
+  <string name="voicemail_visual_voicemail_donation_switch_title">Análise da transcrição do correio de voz</string>
+  <string name="voicemail_activating_summary_info">Ativando correio de voz</string>
+  <string name="voicemail_transcription_preference_summary_info">Transcreva seu correio de voz com o serviço de transcrição do Google. %1$s</string>
+  <string name="voicemail_donate_preference_summary_info">Permita que o Google analise suas mensagens do correio de voz para tornar a transcrição mais precisa. Essas mensagens são armazenadas anonimamente. %1$s</string>
+  <string name="confirm_disable_voicemail_dialog_title">Desativar o correio de voz visual</string>
+  <string name="confirm_disable_voicemail_dialog_message">Isto excluirá qualquer correio de voz e transcrição do Google armazenados neste aplicativo. Sua operadora talvez mantenha cópias.</string>
+  <string name="confirm_disable_voicemail_accept_dialog_label">DESATIVAR</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/settings/res/values-pt-rPT/strings.xml b/java/com/android/dialer/voicemail/settings/res/values-pt-rPT/strings.xml
new file mode 100644
index 0000000..476a635
--- /dev/null
+++ b/java/com/android/dialer/voicemail/settings/res/values-pt-rPT/strings.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_settings_with_label">Correio de voz (%s)</string>
+  <string name="voicemail_settings_title">Correio de voz</string>
+  <string name="voicemail_notifications_preference_title">Notificações</string>
+  <string name="voicemail_change_greeting_preference_title">Gravação do correio de voz</string>
+  <string name="change_greeting_text">Toque para gravar</string>
+  <string name="save_button_text">Guardar</string>
+  <string name="redo_button_text">Tentar de novo</string>
+  <string name="voicemail_advanced_settings_title">Definições avançadas</string>
+  <string name="voicemail_visual_voicemail_switch_title">Correio de voz visual</string>
+  <string name="voicemail_visual_voicemail_auto_archive_switch_title">Cópia de segurança e armazenamento extra</string>
+  <string name="voicemail_set_pin_preference_title">Definir PIN</string>
+  <string name="voicemail_change_pin_preference_title">Alterar PIN</string>
+  <string name="voicemail_change_pin_preference_summary_disable">É necessário ativar o correio de voz visual para alterar o PIN.</string>
+  <string name="voicemail_change_pin_preference_summary_not_activated">O correio de voz visual ainda não está ativado. Tente novamente mais tarde.</string>
+  <string name="vm_change_pin_old_pin">PIN antigo</string>
+  <string name="vm_change_pin_new_pin">Novo PIN</string>
+  <string name="vm_change_pin_progress_message">Aguarde.</string>
+  <string name="vm_change_pin_error_too_short">O novo PIN é demasiado curto.</string>
+  <string name="vm_change_pin_error_too_long">O novo PIN é demasiado longo.</string>
+  <string name="vm_change_pin_error_too_weak">O novo PIN é demasiado fraco. Uma palavra-passe forte não deve ter uma sequência contínua de dígitos nem dígitos repetidos.</string>
+  <string name="vm_change_pin_error_mismatch">O PIN antigo não corresponde.</string>
+  <string name="vm_change_pin_error_invalid">O novo PIN contém carateres inválidos.</string>
+  <string name="vm_change_pin_error_system_error">Não é possível alterar o PIN.</string>
+  <string name="change_pin_title">Alterar o PIN do correio de voz</string>
+  <string name="change_pin_continue_label">Continuar</string>
+  <string name="change_pin_cancel_label">Cancelar</string>
+  <string name="change_pin_ok_label">OK</string>
+  <string name="change_pin_enter_old_pin_header">Confirme o seu PIN antigo</string>
+  <string name="change_pin_enter_old_pin_hint">Introduza o PIN do seu correio de voz para continuar.</string>
+  <string name="change_pin_enter_new_pin_header">Defina um PIN novo</string>
+  <string name="change_pin_enter_new_pin_hint">O PIN tem de ter %1$d-%2$d dígitos.</string>
+  <string name="change_pin_confirm_pin_header">Confirme o seu PIN</string>
+  <string name="change_pin_confirm_pins_dont_match">Os PINs não correspondem.</string>
+  <string name="change_pin_succeeded">O PIN do correio de voz foi atualizado</string>
+  <string name="change_pin_system_error">Não é possível definir o PIN.</string>
+  <string name="voicemail_visual_voicemail_transcription_switch_title">Transcrição de correio de voz</string>
+  <string name="voicemail_visual_voicemail_donation_switch_title">Análise da transcrição de correio de voz</string>
+  <string name="voicemail_activating_summary_info">A ativar correio de voz</string>
+  <string name="voicemail_transcription_preference_summary_info">Obter transcrições do correio de voz através do serviço de transcrição da Google. %1$s</string>
+  <string name="voicemail_donate_preference_summary_info">Permitir que a Google reveja as suas mensagens de correio de voz para melhorar a precisão das transcrições. As suas mensagens de correio de voz são armazenadas anonimamente. %1$s</string>
+  <string name="confirm_disable_voicemail_dialog_title">Desativar correio de voz visual</string>
+  <string name="confirm_disable_voicemail_dialog_message">Esta ação irá eliminar correio de voz e transcrições do Google armazenados nesta aplicação. O seu operador pode manter as respetivas cópias.</string>
+  <string name="confirm_disable_voicemail_accept_dialog_label">DESATIVAR</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/settings/res/values-pt/strings.xml b/java/com/android/dialer/voicemail/settings/res/values-pt/strings.xml
new file mode 100644
index 0000000..8b26ba1
--- /dev/null
+++ b/java/com/android/dialer/voicemail/settings/res/values-pt/strings.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_settings_with_label">Correio de voz (%s)</string>
+  <string name="voicemail_settings_title">Correio de voz</string>
+  <string name="voicemail_notifications_preference_title">Notificações</string>
+  <string name="voicemail_change_greeting_preference_title">Saudação do correio de voz</string>
+  <string name="change_greeting_text">Toque para gravar</string>
+  <string name="save_button_text">Salvar</string>
+  <string name="redo_button_text">Repetir</string>
+  <string name="voicemail_advanced_settings_title">Configurações avançadas</string>
+  <string name="voicemail_visual_voicemail_switch_title">Correio de voz visual</string>
+  <string name="voicemail_visual_voicemail_auto_archive_switch_title">Backup e armazenamento extra</string>
+  <string name="voicemail_set_pin_preference_title">Definir PIN</string>
+  <string name="voicemail_change_pin_preference_title">Alterar PIN</string>
+  <string name="voicemail_change_pin_preference_summary_disable">O correio de voz visual precisa ser ativado para alterar o PIN</string>
+  <string name="voicemail_change_pin_preference_summary_not_activated">O correio de voz visual ainda não foi ativado, tente novamente mais tarde</string>
+  <string name="vm_change_pin_old_pin">PIN antigo</string>
+  <string name="vm_change_pin_new_pin">Novo PIN</string>
+  <string name="vm_change_pin_progress_message">Aguarde.</string>
+  <string name="vm_change_pin_error_too_short">O novo PIN é curto demais.</string>
+  <string name="vm_change_pin_error_too_long">O novo PIN é longo demais.</string>
+  <string name="vm_change_pin_error_too_weak">O novo PIN é fácil demais. Uma senha com sequência contínua ou dígitos repetidos não é segura.</string>
+  <string name="vm_change_pin_error_mismatch">O PIN antigo não corresponde.</string>
+  <string name="vm_change_pin_error_invalid">O novo PIN contém caracteres inválidos.</string>
+  <string name="vm_change_pin_error_system_error">Não foi possível alterar o PIN.</string>
+  <string name="change_pin_title">Alterar o PIN do correio de voz</string>
+  <string name="change_pin_continue_label">Continuar</string>
+  <string name="change_pin_cancel_label">Cancelar</string>
+  <string name="change_pin_ok_label">Ok</string>
+  <string name="change_pin_enter_old_pin_header">Confirmar seu PIN antigo</string>
+  <string name="change_pin_enter_old_pin_hint">Digite o PIN do correio de voz para continuar.</string>
+  <string name="change_pin_enter_new_pin_header">Definir um novo PIN</string>
+  <string name="change_pin_enter_new_pin_hint">O PIN precisa ter de %1$d a %2$d dígitos.</string>
+  <string name="change_pin_confirm_pin_header">Confirmar seu PIN</string>
+  <string name="change_pin_confirm_pins_dont_match">Os PINs não correspondem</string>
+  <string name="change_pin_succeeded">O PIN do correio de voz foi atualizado</string>
+  <string name="change_pin_system_error">Não foi possível definir o PIN</string>
+  <string name="voicemail_visual_voicemail_transcription_switch_title">Transcrição do correio de voz</string>
+  <string name="voicemail_visual_voicemail_donation_switch_title">Análise da transcrição do correio de voz</string>
+  <string name="voicemail_activating_summary_info">Ativando correio de voz</string>
+  <string name="voicemail_transcription_preference_summary_info">Transcreva seu correio de voz com o serviço de transcrição do Google. %1$s</string>
+  <string name="voicemail_donate_preference_summary_info">Permita que o Google analise suas mensagens do correio de voz para tornar a transcrição mais precisa. Essas mensagens são armazenadas anonimamente. %1$s</string>
+  <string name="confirm_disable_voicemail_dialog_title">Desativar o correio de voz visual</string>
+  <string name="confirm_disable_voicemail_dialog_message">Isto excluirá qualquer correio de voz e transcrição do Google armazenados neste aplicativo. Sua operadora talvez mantenha cópias.</string>
+  <string name="confirm_disable_voicemail_accept_dialog_label">DESATIVAR</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/settings/res/values-ro/strings.xml b/java/com/android/dialer/voicemail/settings/res/values-ro/strings.xml
new file mode 100644
index 0000000..24a99ba
--- /dev/null
+++ b/java/com/android/dialer/voicemail/settings/res/values-ro/strings.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_settings_with_label">Mesagerie vocală (%s)</string>
+  <string name="voicemail_settings_title">Mesagerie vocală</string>
+  <string name="voicemail_notifications_preference_title">Notificări</string>
+  <string name="voicemail_change_greeting_preference_title">Mesaj mesagerie vocală</string>
+  <string name="change_greeting_text">Înregistrați</string>
+  <string name="save_button_text">Salvați</string>
+  <string name="redo_button_text">Reîncercați</string>
+  <string name="voicemail_advanced_settings_title">Setări avansate</string>
+  <string name="voicemail_visual_voicemail_switch_title">Mesagerie vocală vizuală</string>
+  <string name="voicemail_visual_voicemail_auto_archive_switch_title">Backup și spațiu de stocare suplimentare</string>
+  <string name="voicemail_set_pin_preference_title">Setați codul PIN</string>
+  <string name="voicemail_change_pin_preference_title">Schimbați codul PIN</string>
+  <string name="voicemail_change_pin_preference_summary_disable">Mesageria vocală vizuală trebuie activată pentru a schimba codul PIN.</string>
+  <string name="voicemail_change_pin_preference_summary_not_activated">Mesageria vocală vizuală nu este activată încă. Încercați din nou mai târziu.</string>
+  <string name="vm_change_pin_old_pin">Codul PIN vechi</string>
+  <string name="vm_change_pin_new_pin">Codul PIN nou</string>
+  <string name="vm_change_pin_progress_message">Așteptați.</string>
+  <string name="vm_change_pin_error_too_short">Codul PIN nou este prea scurt.</string>
+  <string name="vm_change_pin_error_too_long">Codul PIN nou este prea lung.</string>
+  <string name="vm_change_pin_error_too_weak">Codul PIN nou este prea slab. O parolă eficientă nu ar trebui să aibă o secvență continuă sau cifre repetitive.</string>
+  <string name="vm_change_pin_error_mismatch">Codul PIN vechi nu corespunde.</string>
+  <string name="vm_change_pin_error_invalid">Codul PIN nou conține caractere nevalide.</string>
+  <string name="vm_change_pin_error_system_error">Nu se poate schimba codul PIN</string>
+  <string name="change_pin_title">Schimbați codul PIN pentru mesageria vocală</string>
+  <string name="change_pin_continue_label">Continuați</string>
+  <string name="change_pin_cancel_label">Anulați</string>
+  <string name="change_pin_ok_label">Ok</string>
+  <string name="change_pin_enter_old_pin_header">Confirmați vechiul cod PIN</string>
+  <string name="change_pin_enter_old_pin_hint">Introduceți codul PIN pentru mesageria vocală pentru a continua.</string>
+  <string name="change_pin_enter_new_pin_header">Setați un cod PIN nou</string>
+  <string name="change_pin_enter_new_pin_hint">Codul PIN trebuie să aibă %1$d - %2$d cifre.</string>
+  <string name="change_pin_confirm_pin_header">Confirmați codul PIN</string>
+  <string name="change_pin_confirm_pins_dont_match">Codurile PIN nu corespund</string>
+  <string name="change_pin_succeeded">Codul PIN pentru mesageria vocală a fost actualizat.</string>
+  <string name="change_pin_system_error">Nu s-a putut seta codul PIN</string>
+  <string name="voicemail_visual_voicemail_transcription_switch_title">Transcrierea mesajelor vocale</string>
+  <string name="voicemail_visual_voicemail_donation_switch_title">Analiza transcrierii mesajelor vocale</string>
+  <string name="voicemail_activating_summary_info">Se activează mesageria vocală</string>
+  <string name="voicemail_transcription_preference_summary_info">Obțineți transcrierile mesajelor vocale folosind serviciul de transcriere de la Google. %1$s</string>
+  <string name="voicemail_donate_preference_summary_info">Permiteți serviciului Google să vă examineze mesajele vocale pentru a îmbunătăți calitatea transcrierilor. Mesajele vocale sunt stocate anonim. %1$s</string>
+  <string name="confirm_disable_voicemail_dialog_title">Dezactivați mesageria vocală vizuală</string>
+  <string name="confirm_disable_voicemail_dialog_message">Astfel, se vor șterge mesajele vocale și transcrierile Google stocate în această aplicație. E posibil ca operatorul să păstreze o copie.</string>
+  <string name="confirm_disable_voicemail_accept_dialog_label">DEZACTIVAȚI</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/settings/res/values-ru/strings.xml b/java/com/android/dialer/voicemail/settings/res/values-ru/strings.xml
new file mode 100644
index 0000000..59f112f
--- /dev/null
+++ b/java/com/android/dialer/voicemail/settings/res/values-ru/strings.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_settings_with_label">Голосовая почта (%s)</string>
+  <string name="voicemail_settings_title">Голосовая почта</string>
+  <string name="voicemail_notifications_preference_title">Уведомления</string>
+  <string name="voicemail_change_greeting_preference_title">Приветствие в голосовой почте</string>
+  <string name="change_greeting_text">Начать запись</string>
+  <string name="save_button_text">Сохранить</string>
+  <string name="redo_button_text">Повторить</string>
+  <string name="voicemail_advanced_settings_title">Расширенные настройки</string>
+  <string name="voicemail_visual_voicemail_switch_title">Визуальная голосовая почта</string>
+  <string name="voicemail_visual_voicemail_auto_archive_switch_title">Дополнительное пространство</string>
+  <string name="voicemail_set_pin_preference_title">Установка PIN-кода</string>
+  <string name="voicemail_change_pin_preference_title">Изменение PIN-кода</string>
+  <string name="voicemail_change_pin_preference_summary_disable">Чтобы изменить PIN-код, включите визуальную голосовую почту</string>
+  <string name="voicemail_change_pin_preference_summary_not_activated">Визуальная голосовая почта пока не активирована, повторите попытку позже</string>
+  <string name="vm_change_pin_old_pin">Прежний PIN-код</string>
+  <string name="vm_change_pin_new_pin">Новый PIN-код</string>
+  <string name="vm_change_pin_progress_message">Подождите…</string>
+  <string name="vm_change_pin_error_too_short">Новый PIN-код слишком короткий.</string>
+  <string name="vm_change_pin_error_too_long">Новый PIN-код слишком длинный.</string>
+  <string name="vm_change_pin_error_too_weak">Новый PIN-код слишком простой. Чтобы пароль был надежным, он не должен содержать последовательных или повторяющихся цифр.</string>
+  <string name="vm_change_pin_error_mismatch">Старый PIN-код указан неверно.</string>
+  <string name="vm_change_pin_error_invalid">Новый PIN-код содержит недопустимые символы.</string>
+  <string name="vm_change_pin_error_system_error">Не удалось сменить PIN-код</string>
+  <string name="change_pin_title">Сменить PIN-код голосовой почты</string>
+  <string name="change_pin_continue_label">Далее</string>
+  <string name="change_pin_cancel_label">Отмена</string>
+  <string name="change_pin_ok_label">ОК</string>
+  <string name="change_pin_enter_old_pin_header">Подтвердите предыдущий PIN-код</string>
+  <string name="change_pin_enter_old_pin_hint">Чтобы продолжить, введите PIN-код голосовой почты.</string>
+  <string name="change_pin_enter_new_pin_header">Задайте новый PIN-код</string>
+  <string name="change_pin_enter_new_pin_hint">PIN-код должен содержать %1$d–%2$d зн.</string>
+  <string name="change_pin_confirm_pin_header">Подтвердите PIN-код</string>
+  <string name="change_pin_confirm_pins_dont_match">PIN-коды не совпадают.</string>
+  <string name="change_pin_succeeded">PIN-код голосовой почты обновлен</string>
+  <string name="change_pin_system_error">Не удалось установить PIN-код</string>
+  <string name="voicemail_visual_voicemail_transcription_switch_title">Транскрипция голосовой почты</string>
+  <string name="voicemail_visual_voicemail_donation_switch_title">Анализ транскрипций голосовой почты</string>
+  <string name="voicemail_activating_summary_info">Активация голосовой почты</string>
+  <string name="voicemail_transcription_preference_summary_info">Разрешить расшифровку голосовых сообщений с помощью специального сервиса Google. %1$s</string>
+  <string name="voicemail_donate_preference_summary_info">Разрешить Google просматривать ваши расшифрованные сообщения голосовой почты, чтобы улучшить качество транскрипции. Сообщения хранятся анонимно. %1$s</string>
+  <string name="confirm_disable_voicemail_dialog_title">Отключить визуальную голосовую почту?</string>
+  <string name="confirm_disable_voicemail_dialog_message">Будут удалены все сохраненные в этом приложении голосовые сообщения и расшифровки аудиозаписей, которые были созданы с помощью специальной службы Google. У вашего оператора связи могут сохраниться копии этих данных.</string>
+  <string name="confirm_disable_voicemail_accept_dialog_label">ОТКЛЮЧИТЬ</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/settings/res/values-si/strings.xml b/java/com/android/dialer/voicemail/settings/res/values-si/strings.xml
new file mode 100644
index 0000000..9e101ec
--- /dev/null
+++ b/java/com/android/dialer/voicemail/settings/res/values-si/strings.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_settings_with_label">හඬ තැපෑල (%s)</string>
+  <string name="voicemail_settings_title">හඬ තැපෑල</string>
+  <string name="voicemail_notifications_preference_title">දැනුම්දීම්</string>
+  <string name="voicemail_change_greeting_preference_title">හඬ තැපැල් සුබ පැතුම</string>
+  <string name="change_greeting_text">පටිගත කිරී. තට්ටු ක.</string>
+  <string name="save_button_text">සුරකින්න</string>
+  <string name="redo_button_text">උත්සාහ කර.</string>
+  <string name="voicemail_advanced_settings_title">උසස් සැකසීම්</string>
+  <string name="voicemail_visual_voicemail_switch_title">දෘශ්‍ය හඬ තැපෑල</string>
+  <string name="voicemail_visual_voicemail_auto_archive_switch_title">අතිරේක උපස්ථය සහ ගබඩාව</string>
+  <string name="voicemail_set_pin_preference_title">PIN අංකය සකසන්න</string>
+  <string name="voicemail_change_pin_preference_title">PIN අංකය වෙනස් කරන්න</string>
+  <string name="voicemail_change_pin_preference_summary_disable">PIN අංකය වෙනස් කිරීමට දෘශ්‍ය හඬ තැපෑල සබල කළ යුතුය</string>
+  <string name="voicemail_change_pin_preference_summary_not_activated">දෘශ්‍ය හඬ තැපෑල තවම සක්‍රිය කර නැත, කරුණාකර පසුව නැවත උත්සාහ කරන්න</string>
+  <string name="vm_change_pin_old_pin">පැරණි PIN අංකය</string>
+  <string name="vm_change_pin_new_pin">නව PIN අංකය</string>
+  <string name="vm_change_pin_progress_message">කරුණාකර රැඳී සිටින්න.</string>
+  <string name="vm_change_pin_error_too_short">නව PIN අංකය කෙටි වැඩිය.</string>
+  <string name="vm_change_pin_error_too_long">නව PIN අංකය දිග වැඩිය.</string>
+  <string name="vm_change_pin_error_too_weak">නව PIN අංකය දුර්වල වැඩිය. ශක්තිමත් මුරපදයක අඛණ්ඩ අනුපිළිවෙළක් හෝ පුනරාවර්ත ඉලක්කම් නොතිබිය යුතුය.</string>
+  <string name="vm_change_pin_error_mismatch">පැරණි PIN අංකය නොගැළපේ.</string>
+  <string name="vm_change_pin_error_invalid">නව PIN අංකයෙහි අවලංගු අනුලකුණු අන්තර්ගත වේ.</string>
+  <string name="vm_change_pin_error_system_error">PIN අංකය මාරු කිරීමට නොහැකිය</string>
+  <string name="change_pin_title">හඬ තැපැල් PIN අංකය වෙනස් කරන්න</string>
+  <string name="change_pin_continue_label">ඉදිරියට යන්න</string>
+  <string name="change_pin_cancel_label">අවලංගු කරන්න</string>
+  <string name="change_pin_ok_label">හරි</string>
+  <string name="change_pin_enter_old_pin_header">ඔබේ පැරණි PIN අංකය තහවුරු කරන්න</string>
+  <string name="change_pin_enter_old_pin_hint">දිගටම කරගෙන යාමට ඔබ හඬ තැපැල් PIN අංකය ඇතුළු කරන්න.</string>
+  <string name="change_pin_enter_new_pin_header">නව PIN අංකයක් සකසන්න</string>
+  <string name="change_pin_enter_new_pin_hint">PIN අංකය ඉලක්කම් %1$d-%2$d අතර විය යුතුය.</string>
+  <string name="change_pin_confirm_pin_header">ඔබගේ PIN තහවුරු කරන්න</string>
+  <string name="change_pin_confirm_pins_dont_match">PIN අංක නොගැළපේ</string>
+  <string name="change_pin_succeeded">හඬ තැපැල් PIN අංකය යාවත්කාලීන කරන ලදී</string>
+  <string name="change_pin_system_error">PIN අංකය සැකසීමට නොහැකිය</string>
+  <string name="voicemail_visual_voicemail_transcription_switch_title">හඬ තැපැල් පිටපත</string>
+  <string name="voicemail_visual_voicemail_donation_switch_title">හඬ තැපැල් පිටපත විශ්ලේෂණය</string>
+  <string name="voicemail_activating_summary_info">හඬ තැපැල් ක්‍රියාත්මක කිරීම</string>
+  <string name="voicemail_transcription_preference_summary_info">Google පිටපත් කිරීමේ සේවාව භාවිතයෙන් ඔබේ හඬ තැපෑලෙහි පිටපත් ලබා ගන්න. %1$s</string>
+  <string name="voicemail_donate_preference_summary_info">පිටපත්වල නිරවද්‍යතාව වැඩි දියුණු කිරීම සඳහා Google හට ඔබේ හඬ තැපැල් පණිවිඩ සමාලෝචනය කිරීමට ඉඩ දෙන්න. ඔබගේ හඬ තැපැල් පණිවිඩ නිර්නාමිකව ගබඩා කරයි. %1$s</string>
+  <string name="confirm_disable_voicemail_dialog_title">දෘශ්‍ය හඬ තැපෑල ක්‍රියාවිරහිත කරන්න</string>
+  <string name="confirm_disable_voicemail_dialog_message">මෙම යෙදුම තුළ ගබඩා කර ඇති ඕනෑම හඬ තැපැල් සහ Google පිටපත් මකනු ඇත. ඔබගේ වාහකය තමන්ගේම පිටපත් තබා ගත හැකිය.</string>
+  <string name="confirm_disable_voicemail_accept_dialog_label">ක්‍රියාවිරහිත කරන්න</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/settings/res/values-sk/strings.xml b/java/com/android/dialer/voicemail/settings/res/values-sk/strings.xml
new file mode 100644
index 0000000..f7bbb03
--- /dev/null
+++ b/java/com/android/dialer/voicemail/settings/res/values-sk/strings.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_settings_with_label">Hlasová správa %s</string>
+  <string name="voicemail_settings_title">Hlasová správa</string>
+  <string name="voicemail_notifications_preference_title">Upozornenia</string>
+  <string name="voicemail_change_greeting_preference_title">Pozdrav hlasovej schránky</string>
+  <string name="change_greeting_text">Klepnutím nahrávate</string>
+  <string name="save_button_text">Uložiť</string>
+  <string name="redo_button_text">Znova</string>
+  <string name="voicemail_advanced_settings_title">Rozšírené nastavenia</string>
+  <string name="voicemail_visual_voicemail_switch_title">Vizuálna hlasová schránka</string>
+  <string name="voicemail_visual_voicemail_auto_archive_switch_title">Ďalšie zálohovanie a úložisko</string>
+  <string name="voicemail_set_pin_preference_title">Nastavenie kódu PIN</string>
+  <string name="voicemail_change_pin_preference_title">Zmena kódu PIN</string>
+  <string name="voicemail_change_pin_preference_summary_disable">PIN možno zmeniť až po povolení vizuálnej hlasovej schránky</string>
+  <string name="voicemail_change_pin_preference_summary_not_activated">Vizuálna hlasová schránka ešte nie je aktivovaná, skúste to znova neskôr</string>
+  <string name="vm_change_pin_old_pin">Starý PIN</string>
+  <string name="vm_change_pin_new_pin">Nový PIN</string>
+  <string name="vm_change_pin_progress_message">Čakajte.</string>
+  <string name="vm_change_pin_error_too_short">Nový PIN je príliš krátky.</string>
+  <string name="vm_change_pin_error_too_long">Nový PIN je príliš dlhý.</string>
+  <string name="vm_change_pin_error_too_weak">Nový PIN je príliš slabý. Silné heslo by nemalo obsahovať postupnosť ani opakujúce sa číslice.</string>
+  <string name="vm_change_pin_error_mismatch">Starý PIN sa nezhoduje.</string>
+  <string name="vm_change_pin_error_invalid">Nový PIN obsahuje neplatné znaky.</string>
+  <string name="vm_change_pin_error_system_error">PIN sa nedá zmeniť</string>
+  <string name="change_pin_title">Zmena kódu PIN hlasovej schránky</string>
+  <string name="change_pin_continue_label">Pokračovať</string>
+  <string name="change_pin_cancel_label">Zrušiť</string>
+  <string name="change_pin_ok_label">OK</string>
+  <string name="change_pin_enter_old_pin_header">Potvrďte starý PIN</string>
+  <string name="change_pin_enter_old_pin_hint">Ak chcete pokračovať, zadajte PIN hlasovej schránky.</string>
+  <string name="change_pin_enter_new_pin_header">Nastavte nový PIN</string>
+  <string name="change_pin_enter_new_pin_hint">PIN musí mať tento počet číslic: %1$d – %2$d.</string>
+  <string name="change_pin_confirm_pin_header">Potvrďte PIN</string>
+  <string name="change_pin_confirm_pins_dont_match">Kódy PIN sa nezhodujú</string>
+  <string name="change_pin_succeeded">PIN hlasovej schránky bol aktualizovaný</string>
+  <string name="change_pin_system_error">PIN sa nedá nastaviť</string>
+  <string name="voicemail_visual_voicemail_transcription_switch_title">Prepis hlasovej správy</string>
+  <string name="voicemail_visual_voicemail_donation_switch_title">Analýza prepisu hlasovej správy</string>
+  <string name="voicemail_activating_summary_info">Aktivuje sa hlasová schránka</string>
+  <string name="voicemail_transcription_preference_summary_info">Získajte prepisy svojich hlasových správ vďaka prepisovacej službe od Googlu. %1$s</string>
+  <string name="voicemail_donate_preference_summary_info">Umožnite Googlu kontrolovať vaše hlasové správy, aby mohol zlepšovať presnosť prepisov. Hlasové správy budú ukladané anonymne. %1$s</string>
+  <string name="confirm_disable_voicemail_dialog_title">Vypnutie vizuálnej hlasovej schránky</string>
+  <string name="confirm_disable_voicemail_dialog_message">Odstránite tým všetky hlasové správy a prepisy od Googlu uložené v tejto aplikácii. Váš operátor si môže uchovávať vlastné kópie.</string>
+  <string name="confirm_disable_voicemail_accept_dialog_label">VYPNÚŤ</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/settings/res/values-sl/strings.xml b/java/com/android/dialer/voicemail/settings/res/values-sl/strings.xml
new file mode 100644
index 0000000..943c0b9
--- /dev/null
+++ b/java/com/android/dialer/voicemail/settings/res/values-sl/strings.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_settings_with_label">Sporočilo v odzivniku (%s)</string>
+  <string name="voicemail_settings_title">Odzivnik</string>
+  <string name="voicemail_notifications_preference_title">Obvestila</string>
+  <string name="voicemail_change_greeting_preference_title">Pozdravno sporočilo v odzivniku</string>
+  <string name="change_greeting_text">Dotak. se za sneman.</string>
+  <string name="save_button_text">Shrani</string>
+  <string name="redo_button_text">Znova</string>
+  <string name="voicemail_advanced_settings_title">Dodatne nastavitve</string>
+  <string name="voicemail_visual_voicemail_switch_title">Vizualna sporočila v odzivniku</string>
+  <string name="voicemail_visual_voicemail_auto_archive_switch_title">Dodatno varnostno kopiranje in shramba</string>
+  <string name="voicemail_set_pin_preference_title">Nastavitev kode PIN</string>
+  <string name="voicemail_change_pin_preference_title">Sprememba kode PIN</string>
+  <string name="voicemail_change_pin_preference_summary_disable">Če želite spremeniti kodo PIN, morajo biti vizualna sporočila v odzivniku omogočena</string>
+  <string name="voicemail_change_pin_preference_summary_not_activated">Vizualna sporočila v odzivniku še niso aktivirana. Poskusite znova pozneje</string>
+  <string name="vm_change_pin_old_pin">Stara koda PIN</string>
+  <string name="vm_change_pin_new_pin">Nova koda PIN</string>
+  <string name="vm_change_pin_progress_message">Počakajte.</string>
+  <string name="vm_change_pin_error_too_short">Nova koda PIN je prekratka.</string>
+  <string name="vm_change_pin_error_too_long">Nova koda PIN je predolga.</string>
+  <string name="vm_change_pin_error_too_weak">Nova koda PIN je prešibka. Zapleteno geslo ne sme vsebovati zaporednih ali ponavljajočih se števk.</string>
+  <string name="vm_change_pin_error_mismatch">Stara koda PIN se ne ujema.</string>
+  <string name="vm_change_pin_error_invalid">Nova koda PIN vsebuje neveljavne znake.</string>
+  <string name="vm_change_pin_error_system_error">Ni mogoče spremeniti kode PIN</string>
+  <string name="change_pin_title">Sprememba kode PIN za sporočila v odzivniku</string>
+  <string name="change_pin_continue_label">Naprej</string>
+  <string name="change_pin_cancel_label">Prekliči</string>
+  <string name="change_pin_ok_label">V redu</string>
+  <string name="change_pin_enter_old_pin_header">Potrditev stare kode PIN</string>
+  <string name="change_pin_enter_old_pin_hint">Če želite nadaljevati, vnesite kodo PIN za sporočila v odzivniku.</string>
+  <string name="change_pin_enter_new_pin_header">Nastavitev nove kode PIN</string>
+  <string name="change_pin_enter_new_pin_hint">Koda PIN mora imeti %1$d–%2$d števk.</string>
+  <string name="change_pin_confirm_pin_header">Potrdite PIN</string>
+  <string name="change_pin_confirm_pins_dont_match">Kodi PIN se ne ujemata</string>
+  <string name="change_pin_succeeded">Koda PIN za sporočila v odzivniku je posodobljena</string>
+  <string name="change_pin_system_error">Kode PIN ni mogoče nastaviti</string>
+  <string name="voicemail_visual_voicemail_transcription_switch_title">Prepis sporočil v odzivniku</string>
+  <string name="voicemail_visual_voicemail_donation_switch_title">Analiza prepisa sporočil v odzivniku</string>
+  <string name="voicemail_activating_summary_info">Aktiviranje sporočil v odzivniku</string>
+  <string name="voicemail_transcription_preference_summary_info">Za prepise sporočil v odzivniku uporabite Googlovo storitev za prepise. %1$s</string>
+  <string name="voicemail_donate_preference_summary_info">Dovolite Googlu, da pregleda vaša sporočila v odzivniku in na podlagi njih izboljša natančnost prepisov. Sporočila v odzivniku so shranjena anonimno. %1$s</string>
+  <string name="confirm_disable_voicemail_dialog_title">Izklop vizualnih sporočil v odzivniku</string>
+  <string name="confirm_disable_voicemail_dialog_message">S tem bodo izbrisana vsa sporočila v odzivniku in Googlovi prepisi, shranjeni v tej aplikaciji. Operater bo morda obdržal svoje kopije.</string>
+  <string name="confirm_disable_voicemail_accept_dialog_label">IZKLOPI</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/settings/res/values-sq/strings.xml b/java/com/android/dialer/voicemail/settings/res/values-sq/strings.xml
new file mode 100644
index 0000000..fc4d273
--- /dev/null
+++ b/java/com/android/dialer/voicemail/settings/res/values-sq/strings.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_settings_with_label">Posta zanore (%s)</string>
+  <string name="voicemail_settings_title">Posta zanore</string>
+  <string name="voicemail_notifications_preference_title">Njoftimet</string>
+  <string name="voicemail_change_greeting_preference_title">Përshëndetja e postës zanore</string>
+  <string name="change_greeting_text">Trokit për të regjistruar</string>
+  <string name="save_button_text">Ruaj</string>
+  <string name="redo_button_text">Provo përsëri</string>
+  <string name="voicemail_advanced_settings_title">Cilësimet e përparuara</string>
+  <string name="voicemail_visual_voicemail_switch_title">Posta zanore vizuale</string>
+  <string name="voicemail_visual_voicemail_auto_archive_switch_title">Rezervimi dhe hapësira ruajtëse shtesë</string>
+  <string name="voicemail_set_pin_preference_title">Konfiguro kodin PIN</string>
+  <string name="voicemail_change_pin_preference_title">Ndrysho kodin PIN</string>
+  <string name="voicemail_change_pin_preference_summary_disable">Duhet të aktivizohet posta zanore vizuale për të ndryshuar kodin PIN</string>
+  <string name="voicemail_change_pin_preference_summary_not_activated">Posta zanore vizuale nuk është aktivizuar ende. Provo përsëri më vonë</string>
+  <string name="vm_change_pin_old_pin">Kodi PIN i vjetër</string>
+  <string name="vm_change_pin_new_pin">Kodi PIN i ri</string>
+  <string name="vm_change_pin_progress_message">Prit...</string>
+  <string name="vm_change_pin_error_too_short">Kodi i ri PIN është shumë i shkurtër.</string>
+  <string name="vm_change_pin_error_too_long">Kodi i ri PIN është shumë i gjatë.</string>
+  <string name="vm_change_pin_error_too_weak">Kodi i ri PIN është shumë i dobët. Një fjalëkalim i fortë nuk duhet të ketë shifra të përsëritura ose në rend të vazhduar.</string>
+  <string name="vm_change_pin_error_mismatch">Kodi PIN i vjetër nuk përputhet.</string>
+  <string name="vm_change_pin_error_invalid">Kodi PIN i ri përmban karaktere të pavlefshme.</string>
+  <string name="vm_change_pin_error_system_error">Kodi PIN nuk mund të ndryshohet.</string>
+  <string name="change_pin_title">Ndrysho kodin PIN të postës zanore</string>
+  <string name="change_pin_continue_label">Vazhdo</string>
+  <string name="change_pin_cancel_label">Anulo</string>
+  <string name="change_pin_ok_label">Në rregull</string>
+  <string name="change_pin_enter_old_pin_header">Konfirmo kodin PIN të vjetër</string>
+  <string name="change_pin_enter_old_pin_hint">Shkruaj kodin PIN të postës zanore për të vazhduar.</string>
+  <string name="change_pin_enter_new_pin_header">Cakto një kod të ri PIN.</string>
+  <string name="change_pin_enter_new_pin_hint">Kodi PIN duhet të ketë %1$d-%2$d shifra.</string>
+  <string name="change_pin_confirm_pin_header">Konfirmo kodin tënd PIN</string>
+  <string name="change_pin_confirm_pins_dont_match">Kodet PIN nuk përputhen</string>
+  <string name="change_pin_succeeded">Kodi PIN i postës zanore u përditësua</string>
+  <string name="change_pin_system_error">Kodi PIN nuk mund të caktohet</string>
+  <string name="voicemail_visual_voicemail_transcription_switch_title">Transkriptimi i postës zanore</string>
+  <string name="voicemail_visual_voicemail_donation_switch_title">Analiza e transkriptimit të postës zanore</string>
+  <string name="voicemail_activating_summary_info">Posta zanore po aktivizohet</string>
+  <string name="voicemail_transcription_preference_summary_info">Merr transkriptet e postës zanore duke përdorur shërbimin e transkriptimit të Google. %1$s</string>
+  <string name="voicemail_donate_preference_summary_info">Lejo që Google të rishikojë mesazhet e postës zanore për të përmirësuar saktësinë e transkriptimit. Mesazhet e tua të postës zanore ruhen në mënyrë anonime. %1$s</string>
+  <string name="confirm_disable_voicemail_dialog_title">Çaktivizo postën zanore vizuale</string>
+  <string name="confirm_disable_voicemail_dialog_message">Kjo do të fshijë çdo postë zanore dhe transkriptet e Google të ruajtura në këtë aplikacion. Operatori yt celular mund të mbajë kopjet e veta.</string>
+  <string name="confirm_disable_voicemail_accept_dialog_label">ÇAKTIVIZO</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/settings/res/values-sr/strings.xml b/java/com/android/dialer/voicemail/settings/res/values-sr/strings.xml
new file mode 100644
index 0000000..509e916
--- /dev/null
+++ b/java/com/android/dialer/voicemail/settings/res/values-sr/strings.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_settings_with_label">Говорна пошта (%s)</string>
+  <string name="voicemail_settings_title">Говорна пошта</string>
+  <string name="voicemail_notifications_preference_title">Обавештења</string>
+  <string name="voicemail_change_greeting_preference_title">Поздравна порука говорне поште</string>
+  <string name="change_greeting_text">Додирните за снимање</string>
+  <string name="save_button_text">Сачувај</string>
+  <string name="redo_button_text">Понови</string>
+  <string name="voicemail_advanced_settings_title">Напредна подешавања</string>
+  <string name="voicemail_visual_voicemail_switch_title">Визуелна говорна пошта</string>
+  <string name="voicemail_visual_voicemail_auto_archive_switch_title">Додатне резервне копије и простор</string>
+  <string name="voicemail_set_pin_preference_title">Подесите PIN</string>
+  <string name="voicemail_change_pin_preference_title">Промените PIN</string>
+  <string name="voicemail_change_pin_preference_summary_disable">Морате да омогућите визуелну говорну пошту да бисте променили PIN</string>
+  <string name="voicemail_change_pin_preference_summary_not_activated">Визуелна говорна пошта још увек није активирана, пробајте поново касније</string>
+  <string name="vm_change_pin_old_pin">Стари PIN</string>
+  <string name="vm_change_pin_new_pin">Нови PIN</string>
+  <string name="vm_change_pin_progress_message">Сачекајте.</string>
+  <string name="vm_change_pin_error_too_short">Нови PIN је прекратак.</string>
+  <string name="vm_change_pin_error_too_long">Нови PIN је предугачак.</string>
+  <string name="vm_change_pin_error_too_weak">Нови PIN је преслаб. Јака лозинка не треба да садржи узастопни низ ни поновљене цифре.</string>
+  <string name="vm_change_pin_error_mismatch">Стари PIN се не подудара.</string>
+  <string name="vm_change_pin_error_invalid">Нови PIN садржи неважеће знакове.</string>
+  <string name="vm_change_pin_error_system_error">Промена PIN-а није успела</string>
+  <string name="change_pin_title">Промените PIN кôд говорне поште</string>
+  <string name="change_pin_continue_label">Настави</string>
+  <string name="change_pin_cancel_label">Откажи</string>
+  <string name="change_pin_ok_label">Потврди</string>
+  <string name="change_pin_enter_old_pin_header">Потврдите стари PIN</string>
+  <string name="change_pin_enter_old_pin_hint">Унесите PIN кôд говорне поште да бисте наставили.</string>
+  <string name="change_pin_enter_new_pin_header">Подесите нови PIN</string>
+  <string name="change_pin_enter_new_pin_hint">Број цифара које PIN мора да садржи: %1$d–%2$d.</string>
+  <string name="change_pin_confirm_pin_header">Потврдите PIN</string>
+  <string name="change_pin_confirm_pins_dont_match">PIN-ови се не подударају</string>
+  <string name="change_pin_succeeded">PIN кôд говорне поште је ажуриран</string>
+  <string name="change_pin_system_error">Подешавање PIN-а није успело</string>
+  <string name="voicemail_visual_voicemail_transcription_switch_title">Транскрипција говорне поште</string>
+  <string name="voicemail_visual_voicemail_donation_switch_title">Анализа транскрипције говорне поште</string>
+  <string name="voicemail_activating_summary_info">Активира се визуелна говорна пошта</string>
+  <string name="voicemail_transcription_preference_summary_info">Добијајте транскрипте говорних порука помоћу Google-ове услуге транскрипције. %1$s</string>
+  <string name="voicemail_donate_preference_summary_info">Дозволите Google-у да прегледа ваше говорне поруке да би побољшао тачност транскрипције. Говорне поруке чувамо анонимно. %1$s</string>
+  <string name="confirm_disable_voicemail_dialog_title">Искључите визуелну говорну пошту</string>
+  <string name="confirm_disable_voicemail_dialog_message">Ово ће избрисати све говорне поруке и Google транскрипте сачуване у овој апликацији. Мобилни оператер може да задржи своје копије.</string>
+  <string name="confirm_disable_voicemail_accept_dialog_label">ИСКЉУЧИ</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/settings/res/values-sv/strings.xml b/java/com/android/dialer/voicemail/settings/res/values-sv/strings.xml
new file mode 100644
index 0000000..ea66ca8
--- /dev/null
+++ b/java/com/android/dialer/voicemail/settings/res/values-sv/strings.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_settings_with_label">Röstbrevlåda (%s)</string>
+  <string name="voicemail_settings_title">Röstbrevlåda</string>
+  <string name="voicemail_notifications_preference_title">Aviseringar</string>
+  <string name="voicemail_change_greeting_preference_title">Hälsningsmeddelande</string>
+  <string name="change_greeting_text">Tryck och spela in</string>
+  <string name="save_button_text">Spara</string>
+  <string name="redo_button_text">Förs. igen</string>
+  <string name="voicemail_advanced_settings_title">Avancerade inställningar</string>
+  <string name="voicemail_visual_voicemail_switch_title">Visuell röstbrevlåda</string>
+  <string name="voicemail_visual_voicemail_auto_archive_switch_title">Extra säkerhetskopiering och lagring</string>
+  <string name="voicemail_set_pin_preference_title">Ställ in pinkod</string>
+  <string name="voicemail_change_pin_preference_title">Ändra pinkod</string>
+  <string name="voicemail_change_pin_preference_summary_disable">Visuell röstbrevlåda måste vara aktiverad för att ändra pinkoden</string>
+  <string name="voicemail_change_pin_preference_summary_not_activated">Visuell röstbrevlåda är ännu inte aktiverad, försök igen senare</string>
+  <string name="vm_change_pin_old_pin">Gammal pinkod</string>
+  <string name="vm_change_pin_new_pin">Ny pinkod</string>
+  <string name="vm_change_pin_progress_message">Vänta.</string>
+  <string name="vm_change_pin_error_too_short">Den nya pinkoden är för kort.</string>
+  <string name="vm_change_pin_error_too_long">Den nya pinkoden är för lång.</string>
+  <string name="vm_change_pin_error_too_weak">Den nya pinkoden är för svag. Ett starkt lösenord får inte ha siffror i ordningsföljd eller upprepade siffror.</string>
+  <string name="vm_change_pin_error_mismatch">Den gamla pinkoden stämmer inte.</string>
+  <string name="vm_change_pin_error_invalid">Den nya pinkoden innehåller ogiltiga tecken.</string>
+  <string name="vm_change_pin_error_system_error">Det gick inte att ändra pinkoden</string>
+  <string name="change_pin_title">Ändra röstbrevlådans pinkod</string>
+  <string name="change_pin_continue_label">Fortsätt</string>
+  <string name="change_pin_cancel_label">Avbryt</string>
+  <string name="change_pin_ok_label">OK</string>
+  <string name="change_pin_enter_old_pin_header">Bekräfta den gamla pinkoden</string>
+  <string name="change_pin_enter_old_pin_hint">Ange pinkoden till röstbrevlådan för att fortsätta.</string>
+  <string name="change_pin_enter_new_pin_header">Ange en ny pinkod</string>
+  <string name="change_pin_enter_new_pin_hint">Pinkoden måste ha %1$d-%2$d siffror.</string>
+  <string name="change_pin_confirm_pin_header">Bekräfta pinkoden</string>
+  <string name="change_pin_confirm_pins_dont_match">Pinkoderna matchar inte</string>
+  <string name="change_pin_succeeded">Röstbrevlådans pinkod bekräftad</string>
+  <string name="change_pin_system_error">Det går inte att ställa in pinkod</string>
+  <string name="voicemail_visual_voicemail_transcription_switch_title">Transkribering av röstmeddelanden</string>
+  <string name="voicemail_visual_voicemail_donation_switch_title">Transkriptionsanalys för röstbrevlåda</string>
+  <string name="voicemail_activating_summary_info">Aktiverar röstbrevlåda</string>
+  <string name="voicemail_transcription_preference_summary_info">Transkribera röstmeddelanden med Googles kostnadsfria transkriberingstjänst. %1$s</string>
+  <string name="voicemail_donate_preference_summary_info">Låt Google granska dina röstmeddelanden för att förbättra transkriptionsnoggrannheten. Röstmeddelandena lagras anonymt. %1$s</string>
+  <string name="confirm_disable_voicemail_dialog_title">Stäng av visuell röstbrevlåda</string>
+  <string name="confirm_disable_voicemail_dialog_message">Det tar bort alla röstmeddelanden och lagrade Google-transkript i den här appen. Din operatör kanske behåller egna kopior.</string>
+  <string name="confirm_disable_voicemail_accept_dialog_label">INAKTIVERA</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/settings/res/values-sw/strings.xml b/java/com/android/dialer/voicemail/settings/res/values-sw/strings.xml
new file mode 100644
index 0000000..deaf531
--- /dev/null
+++ b/java/com/android/dialer/voicemail/settings/res/values-sw/strings.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_settings_with_label">Ujumbe wa sauti (%s)</string>
+  <string name="voicemail_settings_title">Ujumbe wa sauti</string>
+  <string name="voicemail_notifications_preference_title">Arifa</string>
+  <string name="voicemail_change_greeting_preference_title">Salamu za ujumbe wa sauti</string>
+  <string name="change_greeting_text">Gusa ili Urekodi</string>
+  <string name="save_button_text">Hifadhi</string>
+  <string name="redo_button_text">Jaribu Tena</string>
+  <string name="voicemail_advanced_settings_title">Mipangilio ya Kina</string>
+  <string name="voicemail_visual_voicemail_switch_title">Ujumbe wa sauti unaoonekana</string>
+  <string name="voicemail_visual_voicemail_auto_archive_switch_title">Nafasi ya ziada na hifadhi rudufu</string>
+  <string name="voicemail_set_pin_preference_title">Weka PIN</string>
+  <string name="voicemail_change_pin_preference_title">Badilisha PIN</string>
+  <string name="voicemail_change_pin_preference_summary_disable">Lazima uruhusu kipengele cha ujumbe wa sauti unaoonekana ili ubadilishe PIN</string>
+  <string name="voicemail_change_pin_preference_summary_not_activated">Kipengele cha ujumbe wa sauti unaoonekana bado hakijawashwa, tafadhali jaribu tena baadaye</string>
+  <string name="vm_change_pin_old_pin">PIN ya zamani</string>
+  <string name="vm_change_pin_new_pin">PIN mpya</string>
+  <string name="vm_change_pin_progress_message">Tafadhali subiri.</string>
+  <string name="vm_change_pin_error_too_short">PIN mpya ni fupi mno.</string>
+  <string name="vm_change_pin_error_too_long">PIN mpya ni ndefu mno.</string>
+  <string name="vm_change_pin_error_too_weak">PIN mpya ni dhaifu mno. Nenosiri thabiti halifai kuwa na herufi zinazofuatana mfululizo au tarakimu zinazorudiwa.</string>
+  <string name="vm_change_pin_error_mismatch">PIN ya zamani si sahihi.</string>
+  <string name="vm_change_pin_error_invalid">PIN mpya ina herufi zisizostahiki.</string>
+  <string name="vm_change_pin_error_system_error">Imeshindwa kubadilisha PIN</string>
+  <string name="change_pin_title">Badilisha PIN ya Ujumbe wa Sauti</string>
+  <string name="change_pin_continue_label">Endelea</string>
+  <string name="change_pin_cancel_label">Ghairi</string>
+  <string name="change_pin_ok_label">Sawa</string>
+  <string name="change_pin_enter_old_pin_header">Thibitisha PIN yako ya awali</string>
+  <string name="change_pin_enter_old_pin_hint">Weka PIN yako ya ujumbe wa sauti ili uendelee.</string>
+  <string name="change_pin_enter_new_pin_header">Weka PIN mpya</string>
+  <string name="change_pin_enter_new_pin_hint">PIN lazima iwe na nambari %1$d-%2$d.</string>
+  <string name="change_pin_confirm_pin_header">Thibitisha PIN yako</string>
+  <string name="change_pin_confirm_pins_dont_match">PIN hazilingani</string>
+  <string name="change_pin_succeeded">PIN ya ujumbe wa sauti imesasishwa</string>
+  <string name="change_pin_system_error">Imeshindwa kuweka PIN</string>
+  <string name="voicemail_visual_voicemail_transcription_switch_title">Unukuzi wa ujumbe wa sauti</string>
+  <string name="voicemail_visual_voicemail_donation_switch_title">Uchanganuzi wa nukuu za ujumbe wa sauti</string>
+  <string name="voicemail_activating_summary_info">Inawasha kipengele cha ujumbe wa sauti</string>
+  <string name="voicemail_transcription_preference_summary_info">Pata manukuu ya ujumbe wako wa sauti ukitumia huduma ya manukuu kutoka Google. %1$s</string>
+  <string name="voicemail_donate_preference_summary_info">Ruhusu Google ikague ujumbe wako wa sauti ili iimarishe usahihi wa manukuu. Ujumbe wako wa sauti huhifadhiwa bila maelezo yanayoweza kukutambulisha. %1$s</string>
+  <string name="confirm_disable_voicemail_dialog_title">Zima ujumbe wa sauti unaoonekana</string>
+  <string name="confirm_disable_voicemail_dialog_message">Huenda hii ikafuta ujumbe wa sauti na nukuu za Google zilizohifadhiwa kwenye programu hii. Mtoa huduma za mtandao unaotumia anaweza kuhifadhi nakala zake.</string>
+  <string name="confirm_disable_voicemail_accept_dialog_label">ZIMA</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/settings/res/values-ta/strings.xml b/java/com/android/dialer/voicemail/settings/res/values-ta/strings.xml
new file mode 100644
index 0000000..b1bdc2b
--- /dev/null
+++ b/java/com/android/dialer/voicemail/settings/res/values-ta/strings.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_settings_with_label">குரலஞ்சல் (%s)</string>
+  <string name="voicemail_settings_title">குரலஞ்சல்</string>
+  <string name="voicemail_notifications_preference_title">அறிவிப்புகள்</string>
+  <string name="voicemail_change_greeting_preference_title">குரலஞ்சல் வாழ்த்து</string>
+  <string name="change_greeting_text">பதிவுசெய்ய, தட்டவும்</string>
+  <string name="save_button_text">சேமி</string>
+  <string name="redo_button_text">முயல்க</string>
+  <string name="voicemail_advanced_settings_title">மேம்பட்ட அமைப்புகள்</string>
+  <string name="voicemail_visual_voicemail_switch_title">விஷுவல் குரலஞ்சல்</string>
+  <string name="voicemail_visual_voicemail_auto_archive_switch_title">கூடுதல் காப்புப் பிரதியும் சேமிப்பகமும்</string>
+  <string name="voicemail_set_pin_preference_title">பின்னை அமை</string>
+  <string name="voicemail_change_pin_preference_title">பின்னை மாற்று</string>
+  <string name="voicemail_change_pin_preference_summary_disable">பின்னை மாற்ற, விஷுவல் குரலஞ்சலை இயக்க வேண்டும்</string>
+  <string name="voicemail_change_pin_preference_summary_not_activated">விஷுவல் குரலஞ்சல் இன்னும் இயக்கப்படவில்லை. பிறகு முயலவும்</string>
+  <string name="vm_change_pin_old_pin">பழைய பின்</string>
+  <string name="vm_change_pin_new_pin">புதிய பின்</string>
+  <string name="vm_change_pin_progress_message">காத்திருக்கவும்.</string>
+  <string name="vm_change_pin_error_too_short">புதிய பின் மிகவும் சிறியதாக உள்ளது.</string>
+  <string name="vm_change_pin_error_too_long">புதிய பின் மிகவும் நீளமாக உள்ளது.</string>
+  <string name="vm_change_pin_error_too_weak">புதிய பின் மிகவும் வலுவற்றதாக உள்ளது. வலுவான கடவுச்சொல்லில் தொடர்வரிசையோ மீண்டும் மீண்டும் வரும் இலக்கங்களோ இருக்கக்கூடாது.</string>
+  <string name="vm_change_pin_error_mismatch">பழைய பின் பொருந்தவில்லை.</string>
+  <string name="vm_change_pin_error_invalid">புதிய பின்னில் தவறான எழுத்துகள் உள்ளன.</string>
+  <string name="vm_change_pin_error_system_error">பின்னை மாற்ற முடியவில்லை</string>
+  <string name="change_pin_title">குரலஞ்சல் பின்னை மாற்றவும்</string>
+  <string name="change_pin_continue_label">தொடர்க</string>
+  <string name="change_pin_cancel_label">ரத்துசெய்</string>
+  <string name="change_pin_ok_label">சரி</string>
+  <string name="change_pin_enter_old_pin_header">பழைய பின்னை உறுதிப்படுத்தவும்</string>
+  <string name="change_pin_enter_old_pin_hint">தொடர, குரலஞ்சல் பின்னை உள்ளிடவும்.</string>
+  <string name="change_pin_enter_new_pin_header">புதிய பின்னை அமைக்கவும்</string>
+  <string name="change_pin_enter_new_pin_hint">பின்னில் %1$d-%2$d இலக்கங்கள் இருக்க வேண்டும்.</string>
+  <string name="change_pin_confirm_pin_header">பின்னை உறுதிசெய்யவும்</string>
+  <string name="change_pin_confirm_pins_dont_match">பின்கள் பொருந்தவில்லை</string>
+  <string name="change_pin_succeeded">குரலஞ்சல் பின் மாற்றப்பட்டது</string>
+  <string name="change_pin_system_error">பின்னை அமைக்க முடியவில்லை</string>
+  <string name="voicemail_visual_voicemail_transcription_switch_title">குரலஞ்சல் டிரான்ஸ்கிரிப்ஷன்</string>
+  <string name="voicemail_visual_voicemail_donation_switch_title">குரலஞ்சல் டிரான்ஸ்கிரிப்ஷன் பகுப்பாய்வு</string>
+  <string name="voicemail_activating_summary_info">குரலஞ்சலைச் செயல்படுத்துகிறது</string>
+  <string name="voicemail_transcription_preference_summary_info">Google இன் டிரான்ஸ்கிரிப்ஷன் சேவையைப் பயன்படுத்தி, உங்கள் குரலஞ்சலுக்கான டிரான்ஸ்கிரிப்ட்டுகளைப் பெறலாம். %1$s</string>
+  <string name="voicemail_donate_preference_summary_info">டிரான்ஸ்கிரிப்ஷனின் துல்லியத்தன்மையை மேம்படுத்த, உங்கள் குரலஞ்சல் செய்திகளை மதிப்பாய்வு செய்வதற்கு Googleஐ அனுமதிக்கவும். உங்கள் குரலஞ்சல் செய்திகள் பெயரற்ற முறையில் சேமிக்கப்படும். %1$s</string>
+  <string name="confirm_disable_voicemail_dialog_title">விஷூவல் குரலஞ்சலை முடக்கு</string>
+  <string name="confirm_disable_voicemail_dialog_message">முடக்கினால், இந்தப் பயன்பாட்டில் சேமித்திருக்கும் குரலஞ்சல் மற்றும் Google டிரான்ஸ்கிரிப்ட்டுகள் அனைத்தும் நீக்கப்படும். உங்கள் தொலைத்தொடர்பு நிறுவனத்திடம் அவற்றின் சொந்த நகல்கள் இருக்கலாம்.</string>
+  <string name="confirm_disable_voicemail_accept_dialog_label">முடக்கு</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/settings/res/values-te/strings.xml b/java/com/android/dialer/voicemail/settings/res/values-te/strings.xml
new file mode 100644
index 0000000..e493022
--- /dev/null
+++ b/java/com/android/dialer/voicemail/settings/res/values-te/strings.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_settings_with_label">వాయిస్ మెయిల్ (%s)</string>
+  <string name="voicemail_settings_title">వాయిస్ మెయిల్</string>
+  <string name="voicemail_notifications_preference_title">నోటిఫికేషన్‌లు</string>
+  <string name="voicemail_change_greeting_preference_title">వాయిస్‌మెయిల్ శుభాకాంక్షలు</string>
+  <string name="change_greeting_text">రికార్డ్ చేయడానికి నొక్కండి</string>
+  <string name="save_button_text">సేవ్ చేయి</string>
+  <string name="redo_button_text">మళ్లీ ప్రయత్నించు</string>
+  <string name="voicemail_advanced_settings_title">అధునాతన సెట్టింగ్‌లు</string>
+  <string name="voicemail_visual_voicemail_switch_title">దృశ్య వాయిస్ మెయిల్</string>
+  <string name="voicemail_visual_voicemail_auto_archive_switch_title">అదనపు బ్యాకప్ మరియు నిల్వ</string>
+  <string name="voicemail_set_pin_preference_title">పిన్‌ని సెట్ చేయండి</string>
+  <string name="voicemail_change_pin_preference_title">పిన్‌ని మార్చండి</string>
+  <string name="voicemail_change_pin_preference_summary_disable">పిన్‌ని మార్చడానికి తప్పనిసరిగా దృశ్యమాన వాయిస్ మెయిల్‌ను ప్రారంభించాలి</string>
+  <string name="voicemail_change_pin_preference_summary_not_activated">దృశ్యమాన వాయిస్ మెయిల్‌ ఇంకా సక్రియం కాలేదు, దయచేసి తర్వాత మళ్లీ ప్రయత్నించండి</string>
+  <string name="vm_change_pin_old_pin">పాత పిన్</string>
+  <string name="vm_change_pin_new_pin">కొత్త పిన్</string>
+  <string name="vm_change_pin_progress_message">దయచేసి వేచి ఉండండి.</string>
+  <string name="vm_change_pin_error_too_short">కొత్త పిన్ చాలా చిన్నదిగా ఉంది.</string>
+  <string name="vm_change_pin_error_too_long">కొత్త పిన్ చాలా పొడవుగా ఉంది.</string>
+  <string name="vm_change_pin_error_too_weak">కొత్త పిన్ చాలా బలహీనంగా ఉంది. శక్తివంతమైన పాస్‌వర్డ్‌లో వరుస శ్రేణిలో అక్షరాలు/అంకెలు లేదా పునరావృత అంకెలు ఉండకూడదు.</string>
+  <string name="vm_change_pin_error_mismatch">పాత పిన్ సరిపోలలేదు.</string>
+  <string name="vm_change_pin_error_invalid">కొత్త పిన్ చెల్లని అక్షరాలను కలిగి ఉంది.</string>
+  <string name="vm_change_pin_error_system_error">పిన్‌ని మార్చడం సాధ్యపడలేదు</string>
+  <string name="change_pin_title">వాయిస్ మెయిల్ పిన్‌ని మార్చండి</string>
+  <string name="change_pin_continue_label">కొనసాగించు</string>
+  <string name="change_pin_cancel_label">రద్దు చేయి</string>
+  <string name="change_pin_ok_label">సరే</string>
+  <string name="change_pin_enter_old_pin_header">మీ పాత పిన్‌ని నిర్ధారించండి</string>
+  <string name="change_pin_enter_old_pin_hint">కొనసాగించడానికి మీ వాయిస్ మెయిల్ పిన్‌ని నమోదు చేయండి.</string>
+  <string name="change_pin_enter_new_pin_header">కొత్త పిన్‌ని సెట్ చేయండి</string>
+  <string name="change_pin_enter_new_pin_hint">పిన్ తప్పనిసరిగా %1$d-%2$d అంకెల మధ్య ఉండాలి.</string>
+  <string name="change_pin_confirm_pin_header">మీ పిన్‌ని నిర్ధారించండి</string>
+  <string name="change_pin_confirm_pins_dont_match">పిన్‌లు సరిపోలలేదు</string>
+  <string name="change_pin_succeeded">వాయిస్ మెయిల్ పిన్ అప్‌డేట్ చేయబడింది</string>
+  <string name="change_pin_system_error">పిన్‌ని సెట్ చేయడం సాధ్యపడలేదు</string>
+  <string name="voicemail_visual_voicemail_transcription_switch_title">వాయిస్ మెయిల్ లిప్యంతరీకరణ</string>
+  <string name="voicemail_visual_voicemail_donation_switch_title">వాయిస్ మెయిల్ లిప్యంతరీకరణ విశ్లేషణ</string>
+  <string name="voicemail_activating_summary_info">వాయిస్‌ మెయిల్‌ను యాక్టివేట్ చేస్తోంది</string>
+  <string name="voicemail_transcription_preference_summary_info">Google లిప్యంతరీకరణ సేవను ఉపయోగించి మీ వాయిస్‌ మెయిల్ యొక్క లిప్యంతరీకరణలను పొందండి. %1$s</string>
+  <string name="voicemail_donate_preference_summary_info">లిప్యంతరీకరణ నాణ్యతను మెరుగుపరచడం కోసం మీ వాయిస్ మెయిల్ సందేశాలను సమీక్షించడానికి Googleని అనుమతించండి. మీ వాయిస్ మెయిల్ సందేశాలు అనామకంగా నిల్వ చేయబడతాయి. %1$s</string>
+  <string name="confirm_disable_voicemail_dialog_title">దృశ్య వాయిస్ మెయిల్‌ని ఆఫ్ చేయండి</string>
+  <string name="confirm_disable_voicemail_dialog_message">ఇది ఈ యాప్‌లో నిల్వ చేయబడిన ఏవైనా వాయిస్ మెయిల్‌ మరియు Google లిప్యంతరీకరణలను తొలగిస్తుంది. మీ క్యారియర్ దాని స్వంత కాపీలను భద్రపరచుకోవచ్చు.</string>
+  <string name="confirm_disable_voicemail_accept_dialog_label">ఆఫ్ చేయండి</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/settings/res/values-th/strings.xml b/java/com/android/dialer/voicemail/settings/res/values-th/strings.xml
new file mode 100644
index 0000000..727b536
--- /dev/null
+++ b/java/com/android/dialer/voicemail/settings/res/values-th/strings.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_settings_with_label">ข้อความเสียง (%s)</string>
+  <string name="voicemail_settings_title">ข้อความเสียง</string>
+  <string name="voicemail_notifications_preference_title">การแจ้งเตือน</string>
+  <string name="voicemail_change_greeting_preference_title">คำทักทายผู้ฝากข้อความเสียง</string>
+  <string name="change_greeting_text">แตะเพื่อบันทึก</string>
+  <string name="save_button_text">บันทึก</string>
+  <string name="redo_button_text">ลองอีกครั้ง</string>
+  <string name="voicemail_advanced_settings_title">การตั้งค่าขั้นสูง</string>
+  <string name="voicemail_visual_voicemail_switch_title">ข้อความเสียงพร้อมภาพ</string>
+  <string name="voicemail_visual_voicemail_auto_archive_switch_title">การสำรองข้อมูลและพื้นที่เก็บข้อมูลเพิ่มเติม</string>
+  <string name="voicemail_set_pin_preference_title">ตั้งค่า PIN</string>
+  <string name="voicemail_change_pin_preference_title">เปลี่ยน PIN</string>
+  <string name="voicemail_change_pin_preference_summary_disable">ต้องเปิดใช้ข้อความเสียงพร้อมภาพเพื่อเปลี่ยน PIN</string>
+  <string name="voicemail_change_pin_preference_summary_not_activated">ยังไม่ได้เปิดใช้งานข้อความเสียงพร้อมภาพ โปรดลองอีกครั้งในภายหลัง</string>
+  <string name="vm_change_pin_old_pin">PIN เก่า</string>
+  <string name="vm_change_pin_new_pin">PIN ใหม่</string>
+  <string name="vm_change_pin_progress_message">โปรดรอสักครู่</string>
+  <string name="vm_change_pin_error_too_short">PIN ใหม่สั้นเกินไป</string>
+  <string name="vm_change_pin_error_too_long">PIN ใหม่ยาวเกินไป</string>
+  <string name="vm_change_pin_error_too_weak">PIN ใหม่เดาง่ายเกินไป รหัสผ่านที่เดายากไม่ควรมีตัวเลขที่เรียงค่ากันหรือตัวเลขซ้ำๆ</string>
+  <string name="vm_change_pin_error_mismatch">PIN เก่าไม่ถูกต้อง</string>
+  <string name="vm_change_pin_error_invalid">PIN ใหม่มีอักขระที่ไม่ถูกต้อง</string>
+  <string name="vm_change_pin_error_system_error">เปลี่ยน PIN ไม่ได้</string>
+  <string name="change_pin_title">เปลี่ยน PIN ข้อความเสียง</string>
+  <string name="change_pin_continue_label">ต่อไป</string>
+  <string name="change_pin_cancel_label">ยกเลิก</string>
+  <string name="change_pin_ok_label">ตกลง</string>
+  <string name="change_pin_enter_old_pin_header">ยืนยัน PIN เก่า</string>
+  <string name="change_pin_enter_old_pin_hint">ป้อน PIN ข้อความเสียงเพื่อดำเนินการต่อ</string>
+  <string name="change_pin_enter_new_pin_header">ตั้งค่า PIN ใหม่</string>
+  <string name="change_pin_enter_new_pin_hint">PIN ต้องเป็นตัวเลข %1$d-%2$d หลัก</string>
+  <string name="change_pin_confirm_pin_header">ยืนยัน PIN</string>
+  <string name="change_pin_confirm_pins_dont_match">PIN ไม่ตรงกัน</string>
+  <string name="change_pin_succeeded">อัปเดต PIN ข้อความเสียงแล้ว</string>
+  <string name="change_pin_system_error">ตั้งค่า PIN ไม่</string>
+  <string name="voicemail_visual_voicemail_transcription_switch_title">การถอดข้อความเสียง</string>
+  <string name="voicemail_visual_voicemail_donation_switch_title">การวิเคราะห์การถอดข้อความเสียง</string>
+  <string name="voicemail_activating_summary_info">กำลังเปิดใช้ข้อความเสียง</string>
+  <string name="voicemail_transcription_preference_summary_info">รับบริการถอดข้อความเสียงของคุณเมื่อใช้บริการถอดเสียงของ Google%1$s</string>
+  <string name="voicemail_donate_preference_summary_info">ให้ Google ตรวจสอบข้อความเสียงเพื่อปรับปรุงความถูกต้องของการถอดเสียง ระบบจะจัดเก็บข้อความเสียงของคุณในแบบไม่ระบุตัวตน%1$s</string>
+  <string name="confirm_disable_voicemail_dialog_title">ปิดข้อความเสียงพร้อมภาพ</string>
+  <string name="confirm_disable_voicemail_dialog_message">วิธีนี้จะลบข้อความเสียงและการถอดเสียงของ Google ที่เก็บในแอปนี้ แต่ผู้ให้บริการอาจเก็บสำเนาของตนเองไว้ได้</string>
+  <string name="confirm_disable_voicemail_accept_dialog_label">ปิด</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/settings/res/values-tl/strings.xml b/java/com/android/dialer/voicemail/settings/res/values-tl/strings.xml
new file mode 100644
index 0000000..756416a
--- /dev/null
+++ b/java/com/android/dialer/voicemail/settings/res/values-tl/strings.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_settings_with_label">Voicemail (%s)</string>
+  <string name="voicemail_settings_title">Voicemail</string>
+  <string name="voicemail_notifications_preference_title">Mga Notification</string>
+  <string name="voicemail_change_greeting_preference_title">Voicemail greeting</string>
+  <string name="change_greeting_text">I-tap para Mag-record</string>
+  <string name="save_button_text">I-save</string>
+  <string name="redo_button_text">Subukang Muli</string>
+  <string name="voicemail_advanced_settings_title">Mga Advanced na Setting</string>
+  <string name="voicemail_visual_voicemail_switch_title">Visual na voicemail</string>
+  <string name="voicemail_visual_voicemail_auto_archive_switch_title">Karagdagang backup at storage</string>
+  <string name="voicemail_set_pin_preference_title">Magtakda ng PIN</string>
+  <string name="voicemail_change_pin_preference_title">Palitan ang PIN</string>
+  <string name="voicemail_change_pin_preference_summary_disable">Dapat naka-enable ang visual na voicemail upang palitan ang PIN</string>
+  <string name="voicemail_change_pin_preference_summary_not_activated">Hindi pa naka-activate ang visual na voicemail, pakisubukang muli sa ibang pagkakataon</string>
+  <string name="vm_change_pin_old_pin">Lumang PIN</string>
+  <string name="vm_change_pin_new_pin">Bagong PIN</string>
+  <string name="vm_change_pin_progress_message">Pakihintay.</string>
+  <string name="vm_change_pin_error_too_short">Masyadong maikli ang bagong PIN.</string>
+  <string name="vm_change_pin_error_too_long">Masyadong mahaba ang bagong PIN.</string>
+  <string name="vm_change_pin_error_too_weak">Masyadong mahina ang bagong PIN. Ang isang malakas na password ay hindi dapat magkaroon ng tuloy-tuloy na sequence o paulit-ulit na mga digit.</string>
+  <string name="vm_change_pin_error_mismatch">Hindi tumutugma ang lumang PIN.</string>
+  <string name="vm_change_pin_error_invalid">Ang bagong PIN ay naglalaman ng mga di-wastong character.</string>
+  <string name="vm_change_pin_error_system_error">Hindi nabago ang PIN</string>
+  <string name="change_pin_title">Baguhin ang PIN sa Voicemail</string>
+  <string name="change_pin_continue_label">Magpatuloy</string>
+  <string name="change_pin_cancel_label">Kanselahin</string>
+  <string name="change_pin_ok_label">Ok</string>
+  <string name="change_pin_enter_old_pin_header">Kumpirmahin ang luma mong PIN</string>
+  <string name="change_pin_enter_old_pin_hint">Ilagay ang iyong PIN sa voicemail upang magpatuloy.</string>
+  <string name="change_pin_enter_new_pin_header">Magtakda ng bagong PIN</string>
+  <string name="change_pin_enter_new_pin_hint">Ang PIN ay dapat %1$d-%2$d (na) digit.</string>
+  <string name="change_pin_confirm_pin_header">Kumpirmahin ang iyong PIN</string>
+  <string name="change_pin_confirm_pins_dont_match">Hindi tugma ang mga PIN</string>
+  <string name="change_pin_succeeded">In-update ang PIN sa voicemail</string>
+  <string name="change_pin_system_error">Hindi naitakda ang PIN</string>
+  <string name="voicemail_visual_voicemail_transcription_switch_title">Transkripsyon ng voicemail</string>
+  <string name="voicemail_visual_voicemail_donation_switch_title">Pagsusuri ng transkripsyon ng voicemail</string>
+  <string name="voicemail_activating_summary_info">Ina-activate ang voicemail</string>
+  <string name="voicemail_transcription_preference_summary_info">Kumuha ng mga transcript ng iyong voicemail gamit ang serbisyo ng transcription ng Google. %1$s</string>
+  <string name="voicemail_donate_preference_summary_info">Hayaang suriin ng Google ang iyong mga mensahe sa voicemail para mapaganda ang katumpakan ng transkripsyon. Ini-store nang anonymous ang iyong mga mensahe sa voicemail. %1$s</string>
+  <string name="confirm_disable_voicemail_dialog_title">I-off ang visual na voicemail</string>
+  <string name="confirm_disable_voicemail_dialog_message">Ide-delete nito ang anumang voicemail at mga transcript ng Google na naka-store sa app na ito. Maaaring magpanatili ang iyong carrier ng sarili nitong mga kopya.</string>
+  <string name="confirm_disable_voicemail_accept_dialog_label">I-OFF</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/settings/res/values-tr/strings.xml b/java/com/android/dialer/voicemail/settings/res/values-tr/strings.xml
new file mode 100644
index 0000000..30a9703
--- /dev/null
+++ b/java/com/android/dialer/voicemail/settings/res/values-tr/strings.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_settings_with_label">Sesli mesaj (%s)</string>
+  <string name="voicemail_settings_title">Sesli mesaj</string>
+  <string name="voicemail_notifications_preference_title">Bildirimler</string>
+  <string name="voicemail_change_greeting_preference_title">Sesli karşılama mesajı</string>
+  <string name="change_greeting_text">Kayıt İçin Dokunun</string>
+  <string name="save_button_text">Kaydet</string>
+  <string name="redo_button_text">Tekrar Dene</string>
+  <string name="voicemail_advanced_settings_title">Gelişmiş Ayarlar</string>
+  <string name="voicemail_visual_voicemail_switch_title">Görsel sesli mesaj</string>
+  <string name="voicemail_visual_voicemail_auto_archive_switch_title">Ekstra yedekleme ve depolama alanı</string>
+  <string name="voicemail_set_pin_preference_title">PIN belirleyin</string>
+  <string name="voicemail_change_pin_preference_title">PIN\'i değiştirin</string>
+  <string name="voicemail_change_pin_preference_summary_disable">PIN\'i değiştirebilmek için görsel sesli mesaj etkinleştirilmelidir</string>
+  <string name="voicemail_change_pin_preference_summary_not_activated">Görsel sesli mesaj henüz etkinleştirilmedi. Lütfen daha sonra tekrar deneyin.</string>
+  <string name="vm_change_pin_old_pin">Eski PIN</string>
+  <string name="vm_change_pin_new_pin">Yeni PIN</string>
+  <string name="vm_change_pin_progress_message">Lütfen bekleyin.</string>
+  <string name="vm_change_pin_error_too_short">Yeni PIN çok kısa.</string>
+  <string name="vm_change_pin_error_too_long">Yeni PIN çok uzun.</string>
+  <string name="vm_change_pin_error_too_weak">Yeni PIN çok zayıf. Güçlü bir şifrede birbirini sıralı şekilde takip eden veya yinelenen rakamlar bulunmamalıdır.</string>
+  <string name="vm_change_pin_error_mismatch">Eski PIN eşleşmiyor.</string>
+  <string name="vm_change_pin_error_invalid">Yeni PIN, geçersiz karakterler içeriyor.</string>
+  <string name="vm_change_pin_error_system_error">PIN değiştirilemedi</string>
+  <string name="change_pin_title">Sesli Mesaj PIN\'ini Değiştirin</string>
+  <string name="change_pin_continue_label">Devam</string>
+  <string name="change_pin_cancel_label">İptal</string>
+  <string name="change_pin_ok_label">Tamam</string>
+  <string name="change_pin_enter_old_pin_header">Eski PIN\'inizi onaylayın</string>
+  <string name="change_pin_enter_old_pin_hint">Devam etmek için sesli mesaj PIN\'inizi girin.</string>
+  <string name="change_pin_enter_new_pin_header">Yeni PIN belirleyin</string>
+  <string name="change_pin_enter_new_pin_hint">PIN, %1$d ila %2$d basamaklı olmalıdır.</string>
+  <string name="change_pin_confirm_pin_header">PIN\'inizi onaylayın</string>
+  <string name="change_pin_confirm_pins_dont_match">PIN\'ler eşleşmiyor</string>
+  <string name="change_pin_succeeded">Sesli mesaj PIN\'i güncellendi</string>
+  <string name="change_pin_system_error">PIN belirlenemedi</string>
+  <string name="voicemail_visual_voicemail_transcription_switch_title">Sesli mesaj çeviri yazısı</string>
+  <string name="voicemail_visual_voicemail_donation_switch_title">Sesli mesaj çeviri yazısı analizi</string>
+  <string name="voicemail_activating_summary_info">Sesli mesaj etkinleştiriliyor</string>
+  <string name="voicemail_transcription_preference_summary_info">Google\'ın çeviri yazı hizmetini kullanarak sesli mesajlarınızın çeviri yazılarını alın. %1$s</string>
+  <string name="voicemail_donate_preference_summary_info">Çeviri yazı doğruluğunun iyileştirilmesi için Google\'a sesli mesajlarınızı inceleme izni verin. Sesli mesajlarınız anonim olarak depolanır. %1$s</string>
+  <string name="confirm_disable_voicemail_dialog_title">Görsel sesli mesaj özelliğini kapatın</string>
+  <string name="confirm_disable_voicemail_dialog_message">Bu işlemle, bu uygulamada depolanan tüm sesli mesajlar ve Google çeviri yazıları silinecek. Operatörünüz bunların birer kopyasını saklayabilir.</string>
+  <string name="confirm_disable_voicemail_accept_dialog_label">KAPAT</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/settings/res/values-uk/strings.xml b/java/com/android/dialer/voicemail/settings/res/values-uk/strings.xml
new file mode 100644
index 0000000..0d9d7ac
--- /dev/null
+++ b/java/com/android/dialer/voicemail/settings/res/values-uk/strings.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_settings_with_label">Голосова пошта (%s)</string>
+  <string name="voicemail_settings_title">Голосова пошта</string>
+  <string name="voicemail_notifications_preference_title">Сповіщення</string>
+  <string name="voicemail_change_greeting_preference_title">Привітання в голосовій пошті</string>
+  <string name="change_greeting_text">Торкніться для запису</string>
+  <string name="save_button_text">Зберегти</string>
+  <string name="redo_button_text">Повторити</string>
+  <string name="voicemail_advanced_settings_title">Розширені налаштування</string>
+  <string name="voicemail_visual_voicemail_switch_title">Візуальна голосова пошта</string>
+  <string name="voicemail_visual_voicemail_auto_archive_switch_title">Додаткова пам’ять і резервне копіювання</string>
+  <string name="voicemail_set_pin_preference_title">Установити PIN-код</string>
+  <string name="voicemail_change_pin_preference_title">Змінити PIN-код</string>
+  <string name="voicemail_change_pin_preference_summary_disable">Щоб змінити PIN-код, потрібно ввімкнути візуальну голосову пошту</string>
+  <string name="voicemail_change_pin_preference_summary_not_activated">Візуальну голосову пошту ще не активовано, повторіть спробу пізніше</string>
+  <string name="vm_change_pin_old_pin">Старий PIN-код</string>
+  <string name="vm_change_pin_new_pin">Новий PIN-код</string>
+  <string name="vm_change_pin_progress_message">Зачекайте.</string>
+  <string name="vm_change_pin_error_too_short">Новий PIN-код закороткий.</string>
+  <string name="vm_change_pin_error_too_long">Новий PIN-код задовгий.</string>
+  <string name="vm_change_pin_error_too_weak">Новий PIN-код недостатньо надійний. Надійний PIN-код не має містити прямих послідовностей або повторюваних цифр.</string>
+  <string name="vm_change_pin_error_mismatch">Старий PIN-код неправильний.</string>
+  <string name="vm_change_pin_error_invalid">Новий PIN-код містить недійсні символи.</string>
+  <string name="vm_change_pin_error_system_error">Не вдалося змінити PIN-код</string>
+  <string name="change_pin_title">Зміна PIN-коду голосової пошти</string>
+  <string name="change_pin_continue_label">Продовжити</string>
+  <string name="change_pin_cancel_label">Скасувати</string>
+  <string name="change_pin_ok_label">ОK</string>
+  <string name="change_pin_enter_old_pin_header">Підтвердьте старий PIN-код</string>
+  <string name="change_pin_enter_old_pin_hint">Щоб продовжити, введіть PIN-код голосової пошти.</string>
+  <string name="change_pin_enter_new_pin_header">Введіть новий PIN-код</string>
+  <string name="change_pin_enter_new_pin_hint">Рекомендована кількість цифр у PIN-коді: %1$d–%2$d.</string>
+  <string name="change_pin_confirm_pin_header">Підтвердьте PIN-код</string>
+  <string name="change_pin_confirm_pins_dont_match">PIN-коди не збігаються</string>
+  <string name="change_pin_succeeded">PIN-код голосової пошти змінено</string>
+  <string name="change_pin_system_error">Не вдалося встановити PIN-код</string>
+  <string name="voicemail_visual_voicemail_transcription_switch_title">Транскрипція голосової пошти</string>
+  <string name="voicemail_visual_voicemail_donation_switch_title">Аналіз транскрипції голосової пошти</string>
+  <string name="voicemail_activating_summary_info">Увімкнення голосової пошти</string>
+  <string name="voicemail_transcription_preference_summary_info">Отримуйте тексти повідомлень голосової пошти за допомогою сервісу транскрипції від Google. %1$s</string>
+  <string name="voicemail_donate_preference_summary_info">Дозвольте Google перевіряти ваші повідомлення голосової пошти, щоб покращувати точність транскрипції. Ваші повідомлення голосової пошти зберігатимуться анонімно. %1$s</string>
+  <string name="confirm_disable_voicemail_dialog_title">Вимкнути візуальну голосову пошту</string>
+  <string name="confirm_disable_voicemail_dialog_message">Буде видалено всю голосову пошту та транскрипції Google, які зберігаються в цьому додатку. Ваш оператор може зберегти для себе копії.</string>
+  <string name="confirm_disable_voicemail_accept_dialog_label">ВИМКНУТИ</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/settings/res/values-ur/strings.xml b/java/com/android/dialer/voicemail/settings/res/values-ur/strings.xml
new file mode 100644
index 0000000..69ab070
--- /dev/null
+++ b/java/com/android/dialer/voicemail/settings/res/values-ur/strings.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_settings_with_label">صوتی میل (%s)</string>
+  <string name="voicemail_settings_title">صوتی میل</string>
+  <string name="voicemail_notifications_preference_title">اطلاعات</string>
+  <string name="voicemail_change_greeting_preference_title">صوتی میل استقبالیہ</string>
+  <string name="change_greeting_text">ریکارڈ کیلئے تھپتھپائیں</string>
+  <string name="save_button_text">محفوظ کریں</string>
+  <string name="redo_button_text">پھر کوشش کریں</string>
+  <string name="voicemail_advanced_settings_title">جدید ترین ترتیبات</string>
+  <string name="voicemail_visual_voicemail_switch_title">بصری صوتی میل</string>
+  <string name="voicemail_visual_voicemail_auto_archive_switch_title">اضافی بیک اپ اور اسٹوریج</string>
+  <string name="voicemail_set_pin_preference_title">‏PIN سیٹ کریں</string>
+  <string name="voicemail_change_pin_preference_title">‏PIN تبدیل کریں</string>
+  <string name="voicemail_change_pin_preference_summary_disable">‏PIN تبدیل کرنے کیلئے بصری صوتی میل کا فعال ہونا لازمی ہے</string>
+  <string name="voicemail_change_pin_preference_summary_not_activated">بصری صوتی میل ابھی فعال نہیں ہے، براہ کرم بعد میں دوبارہ کوشش کریں</string>
+  <string name="vm_change_pin_old_pin">‏پرانا PIN</string>
+  <string name="vm_change_pin_new_pin">‏نیا PIN</string>
+  <string name="vm_change_pin_progress_message">براہ کرم انتظار کریں۔</string>
+  <string name="vm_change_pin_error_too_short">‏نیا PIN بہت مختصر ہے۔</string>
+  <string name="vm_change_pin_error_too_long">‏نیا PIN بہت طویل ہے۔</string>
+  <string name="vm_change_pin_error_too_weak">‏نیا PIN بہت کمزور ہے۔ مضبوط پاسورڈ میں مسلسل ترتیب یا مکرر ہندسے نہیں ہونے چاہئیں۔</string>
+  <string name="vm_change_pin_error_mismatch">‏پرانا PIN مماثل نہیں ہے۔</string>
+  <string name="vm_change_pin_error_invalid">‏نئے PIN میں غلط حروف شامل ہیں۔</string>
+  <string name="vm_change_pin_error_system_error">‏PIN تبدیل کرنے سے قاصر</string>
+  <string name="change_pin_title">‏صوتی میل کا PIN تبدیل کریں</string>
+  <string name="change_pin_continue_label">جاری رکھیں</string>
+  <string name="change_pin_cancel_label">منسوخ کریں</string>
+  <string name="change_pin_ok_label">ٹھیک ہے</string>
+  <string name="change_pin_enter_old_pin_header">‏اپنے پرانے PIN کی تصدیق کریں</string>
+  <string name="change_pin_enter_old_pin_hint">‏جاری رکھنے کیلئے اپنے صوتی میل کا PIN درج کریں۔</string>
+  <string name="change_pin_enter_new_pin_header">‏ایک نیا PIN سیٹ کریں</string>
+  <string name="change_pin_enter_new_pin_hint">‏PIN کا %1$d-%2$d‎ ہندسوں پر مشتمل ہونا لازمی ہے۔</string>
+  <string name="change_pin_confirm_pin_header">‏اپنے PIN کی تصدیق کریں</string>
+  <string name="change_pin_confirm_pins_dont_match">‏PINs مماثل نہیں ہیں</string>
+  <string name="change_pin_succeeded">‏صوتی میل کا PIN اپ ڈیٹ ہو گیا</string>
+  <string name="change_pin_system_error">‏PIN سیٹ کرنے سے قاصر</string>
+  <string name="voicemail_visual_voicemail_transcription_switch_title">صوتی میل کی ٹرانسکرپشن</string>
+  <string name="voicemail_visual_voicemail_donation_switch_title">صوتی میل کی نقل حرفی کا تجزیہ</string>
+  <string name="voicemail_activating_summary_info">صوتی میل کو فعال کیا جا رہا ہے</string>
+  <string name="voicemail_transcription_preference_summary_info">‏Google کی ٹرانسکرپشن سروس کا استعمال کر کے اپنے صوتی میل کی ٹرانسکرپٹس حاصل کریں۔ %1$s</string>
+  <string name="voicemail_donate_preference_summary_info">‏ٹرانسکرپشن کی درستگی بہتر بنانے کیلئے Google کو اپنے صوتی میل کے پیغامات کا جائزہ لینے دیں۔ آپ کے صوتی میل کے پیغامات گمنام طریقے سے اسٹور کئے جاتے ہیں۔ %1$s</string>
+  <string name="confirm_disable_voicemail_dialog_title">بصری صوتی میل آف کریں</string>
+  <string name="confirm_disable_voicemail_dialog_message">‏یہ اس ایپ میں اسٹور کردہ کسی بھی صوتی میل اور Google ٹرانسکرپٹ کو حذف کر دے گا۔ آپ کا کیریئر خود اپنی کاپیاں رکھ سکتا ہے۔</string>
+  <string name="confirm_disable_voicemail_accept_dialog_label">آف کریں</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/settings/res/values-uz/strings.xml b/java/com/android/dialer/voicemail/settings/res/values-uz/strings.xml
new file mode 100644
index 0000000..a8ae303
--- /dev/null
+++ b/java/com/android/dialer/voicemail/settings/res/values-uz/strings.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_settings_with_label">Ovozli pochta (%s)</string>
+  <string name="voicemail_settings_title">Ovozli pochta</string>
+  <string name="voicemail_notifications_preference_title">Bildirishnomalar</string>
+  <string name="voicemail_change_greeting_preference_title">Ovozli pochta salomlashuvi</string>
+  <string name="change_greeting_text">Yozib olish</string>
+  <string name="save_button_text">Saqlash</string>
+  <string name="redo_button_text">Qaytadan</string>
+  <string name="voicemail_advanced_settings_title">Kengaytirilgan sozlamalar</string>
+  <string name="voicemail_visual_voicemail_switch_title">Vizual ovozli pochta</string>
+  <string name="voicemail_visual_voicemail_auto_archive_switch_title">Qo‘shimcha xotira</string>
+  <string name="voicemail_set_pin_preference_title">PIN kod o‘rnatish</string>
+  <string name="voicemail_change_pin_preference_title">PIN kodni o‘zgartirish</string>
+  <string name="voicemail_change_pin_preference_summary_disable">PIN kodni o‘zgartirish uchun vizual ovozli pochtani yoqing.</string>
+  <string name="voicemail_change_pin_preference_summary_not_activated">Vizual ovozli pochta hali yoqilmadi. Keyinroq qayta urining.</string>
+  <string name="vm_change_pin_old_pin">Eski PIN kod</string>
+  <string name="vm_change_pin_new_pin">Yangi PIN kod</string>
+  <string name="vm_change_pin_progress_message">Iltimos, kuting…</string>
+  <string name="vm_change_pin_error_too_short">Yangi PIN kod juda qisqa.</string>
+  <string name="vm_change_pin_error_too_long">Yangi PIN kod juda uzun.</string>
+  <string name="vm_change_pin_error_too_weak">Yangi PIN kod juda oddiy. Kuchli PIN kodda raqamlar odatiy tartibda bo‘lmasligi yoki takrorlanmasligi lozim.</string>
+  <string name="vm_change_pin_error_mismatch">Eski PIN kod mos kelmayapti.</string>
+  <string name="vm_change_pin_error_invalid">Yangi PIN kodda yaroqsiz belgilari bor.</string>
+  <string name="vm_change_pin_error_system_error">PIN kodni o‘zgartirib bo‘lmadi.</string>
+  <string name="change_pin_title">Ovozli pochta PIN kodini o‘zgartirish</string>
+  <string name="change_pin_continue_label">Davom etish</string>
+  <string name="change_pin_cancel_label">Bekor qilish</string>
+  <string name="change_pin_ok_label">OK</string>
+  <string name="change_pin_enter_old_pin_header">Eski PIN kodni tasdiqlang</string>
+  <string name="change_pin_enter_old_pin_hint">Davom etish uchun ovozli pochta PIN kodini kiriting.</string>
+  <string name="change_pin_enter_new_pin_header">Yangi PIN kod o‘rnatish</string>
+  <string name="change_pin_enter_new_pin_hint">PIN kod %1$d – %2$d ta raqamdan iborat bo‘lishi lozim.</string>
+  <string name="change_pin_confirm_pin_header">PIN kodni tasdiqlang</string>
+  <string name="change_pin_confirm_pins_dont_match">PIN kodlar bir-biriga mos kelmayapti.</string>
+  <string name="change_pin_succeeded">Ovozli pochta PIN kodi yangilandi.</string>
+  <string name="change_pin_system_error">PIN kodni o‘rnatib bo‘lmadi.</string>
+  <string name="voicemail_visual_voicemail_transcription_switch_title">Ovozli xabarlar transkripsiyasi</string>
+  <string name="voicemail_visual_voicemail_donation_switch_title">Ovozli xabarlar transkripsiyasi tahlili</string>
+  <string name="voicemail_activating_summary_info">Ovozli pochta yoqilmoqda</string>
+  <string name="voicemail_transcription_preference_summary_info">Ovozli xabarlarni maxsus Google xizmati yordamida transkripsiya qilishga ruxsat berilsin. %1$s</string>
+  <string name="voicemail_donate_preference_summary_info">Transkripsiya sifatini yaxshilash maqsadida Googlega ovozli xabarlaringizni tekshirishiga ruxsat bering. Ovozli xabarlar anonim saqlanadi.%1$s</string>
+  <string name="confirm_disable_voicemail_dialog_title">Vizual ovozli pochtani o‘chirib qo‘yish</string>
+  <string name="confirm_disable_voicemail_dialog_message">Shu ilovada saqlanayotgan barcha ovozli xabarlar va Google transkripsiyalari o‘chirib tashlanadi. Operatoringiz ularning nusxalarini saqlab qolishi mumkin.</string>
+  <string name="confirm_disable_voicemail_accept_dialog_label">O‘CHIRIB QO‘YISH</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/settings/res/values-vi/strings.xml b/java/com/android/dialer/voicemail/settings/res/values-vi/strings.xml
new file mode 100644
index 0000000..3474853
--- /dev/null
+++ b/java/com/android/dialer/voicemail/settings/res/values-vi/strings.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_settings_with_label">Thư thoại %s</string>
+  <string name="voicemail_settings_title">Thư thoại</string>
+  <string name="voicemail_notifications_preference_title">Thông báo</string>
+  <string name="voicemail_change_greeting_preference_title">Lời chào thư thoại</string>
+  <string name="change_greeting_text">Nhấn để ghi</string>
+  <string name="save_button_text">Lưu</string>
+  <string name="redo_button_text">Thử lại</string>
+  <string name="voicemail_advanced_settings_title">Cài đặt nâng cao</string>
+  <string name="voicemail_visual_voicemail_switch_title">Thư thoại kèm theo hình ảnh</string>
+  <string name="voicemail_visual_voicemail_auto_archive_switch_title">Bộ nhớ và bản sao lưu bổ sung</string>
+  <string name="voicemail_set_pin_preference_title">Đặt mã PIN</string>
+  <string name="voicemail_change_pin_preference_title">Thay đổi mã PIN</string>
+  <string name="voicemail_change_pin_preference_summary_disable">Phải bật thư thoại kèm theo hình ảnh để thay đổi mã PIN</string>
+  <string name="voicemail_change_pin_preference_summary_not_activated">Thư thoại kèm theo hình ảnh chưa được kích hoạt, hãy thử lại sau</string>
+  <string name="vm_change_pin_old_pin">Mã PIN cũ</string>
+  <string name="vm_change_pin_new_pin">Mã PIN mới</string>
+  <string name="vm_change_pin_progress_message">Vui lòng đợi.</string>
+  <string name="vm_change_pin_error_too_short">Mã PIN mới quá ngắn.</string>
+  <string name="vm_change_pin_error_too_long">Mã PIN mới quá dài.</string>
+  <string name="vm_change_pin_error_too_weak">Mã PIN mới quá yếu. Một mật khẩu mạnh không nên có các chữ số lặp lại hoặc chuỗi liên tiếp.</string>
+  <string name="vm_change_pin_error_mismatch">Mã PIN cũ không khớp.</string>
+  <string name="vm_change_pin_error_invalid">Mã PIN mới chứa các ký tự không hợp lệ.</string>
+  <string name="vm_change_pin_error_system_error">Không thể thay đổi mã PIN</string>
+  <string name="change_pin_title">Thay đổi mã PIN thư thoại</string>
+  <string name="change_pin_continue_label">Tiếp tục</string>
+  <string name="change_pin_cancel_label">Hủy</string>
+  <string name="change_pin_ok_label">Ok</string>
+  <string name="change_pin_enter_old_pin_header">Xác nhận mã PIN cũ của bạn</string>
+  <string name="change_pin_enter_old_pin_hint">Hãy nhập mã PIN thư thoại của bạn để tiếp tục.</string>
+  <string name="change_pin_enter_new_pin_header">Đặt mã PIN mới</string>
+  <string name="change_pin_enter_new_pin_hint">Mã PIN phải bao gồm %1$d-%2$d chữ số.</string>
+  <string name="change_pin_confirm_pin_header">Xác nhận mã PIN của bạn</string>
+  <string name="change_pin_confirm_pins_dont_match">Các mã PIN không khớp</string>
+  <string name="change_pin_succeeded">Đã cập nhật mã PIN thư thoại</string>
+  <string name="change_pin_system_error">Không thể đặt mã PIN</string>
+  <string name="voicemail_visual_voicemail_transcription_switch_title">Bản chép lời thư thoại</string>
+  <string name="voicemail_visual_voicemail_donation_switch_title">Phân tích bản ghi âm thư thoại</string>
+  <string name="voicemail_activating_summary_info">Đang kích hoạt thư thoại</string>
+  <string name="voicemail_transcription_preference_summary_info">Nhận bản chép lời thư thoại của bạn bằng cách sử dụng dịch vụ chép lời của Google. %1$s</string>
+  <string name="voicemail_donate_preference_summary_info">Cho phép Google xem xét thư thoại của bạn để cải thiện độ chính xác của bản chép lời. Thư thoại của bạn được lưu trữ ẩn danh. %1$s</string>
+  <string name="confirm_disable_voicemail_dialog_title">Tắt thư thoại kèm theo hình ảnh</string>
+  <string name="confirm_disable_voicemail_dialog_message">Thao tác này sẽ xóa bất kỳ thư thoại và bản ghi âm Google nào được lưu trữ trong ứng dụng này. Nhà mạng của bạn có thể giữ bản sao riêng.</string>
+  <string name="confirm_disable_voicemail_accept_dialog_label">TẮT</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/settings/res/values-zh-rCN/strings.xml b/java/com/android/dialer/voicemail/settings/res/values-zh-rCN/strings.xml
new file mode 100644
index 0000000..33229ff
--- /dev/null
+++ b/java/com/android/dialer/voicemail/settings/res/values-zh-rCN/strings.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_settings_with_label">语音邮件（%s）</string>
+  <string name="voicemail_settings_title">语音邮件</string>
+  <string name="voicemail_notifications_preference_title">通知</string>
+  <string name="voicemail_change_greeting_preference_title">语音信箱问候语</string>
+  <string name="change_greeting_text">点按即可开始录制</string>
+  <string name="save_button_text">保存</string>
+  <string name="redo_button_text">重试</string>
+  <string name="voicemail_advanced_settings_title">高级设置</string>
+  <string name="voicemail_visual_voicemail_switch_title">可视语音信箱</string>
+  <string name="voicemail_visual_voicemail_auto_archive_switch_title">额外的备份功能和存储空间</string>
+  <string name="voicemail_set_pin_preference_title">设置 PIN 码</string>
+  <string name="voicemail_change_pin_preference_title">更改 PIN 码</string>
+  <string name="voicemail_change_pin_preference_summary_disable">必须启用可视语音信箱才能更改 PIN 码</string>
+  <string name="voicemail_change_pin_preference_summary_not_activated">可视语音信箱尚未激活，请稍后再试</string>
+  <string name="vm_change_pin_old_pin">旧 PIN 码</string>
+  <string name="vm_change_pin_new_pin">新 PIN 码</string>
+  <string name="vm_change_pin_progress_message">请稍候。</string>
+  <string name="vm_change_pin_error_too_short">新的 PIN 码太短。</string>
+  <string name="vm_change_pin_error_too_long">新的 PIN 码太长。</string>
+  <string name="vm_change_pin_error_too_weak">新的 PIN 码安全系数太低。如要提高密码强度，请勿使用连续或重复的数字。</string>
+  <string name="vm_change_pin_error_mismatch">旧的 PIN 码不匹配。</string>
+  <string name="vm_change_pin_error_invalid">新的 PIN 码包含无效字符。</string>
+  <string name="vm_change_pin_error_system_error">无法更改 PIN 码</string>
+  <string name="change_pin_title">更改语音信箱 PIN 码</string>
+  <string name="change_pin_continue_label">继续</string>
+  <string name="change_pin_cancel_label">取消</string>
+  <string name="change_pin_ok_label">确定</string>
+  <string name="change_pin_enter_old_pin_header">确认旧 PIN 码</string>
+  <string name="change_pin_enter_old_pin_hint">输入语音信箱 PIN 码以继续操作。</string>
+  <string name="change_pin_enter_new_pin_header">设置新 PIN 码</string>
+  <string name="change_pin_enter_new_pin_hint">PIN 码必须包含 %1$d 到 %2$d 位数。</string>
+  <string name="change_pin_confirm_pin_header">请确认您的 PIN 码</string>
+  <string name="change_pin_confirm_pins_dont_match">PIN 码不一致</string>
+  <string name="change_pin_succeeded">语音信箱 PIN 码已更新</string>
+  <string name="change_pin_system_error">无法设置 PIN 码</string>
+  <string name="voicemail_visual_voicemail_transcription_switch_title">语音邮件转录</string>
+  <string name="voicemail_visual_voicemail_donation_switch_title">语音邮件转录分析</string>
+  <string name="voicemail_activating_summary_info">正在激活语音信箱</string>
+  <string name="voicemail_transcription_preference_summary_info">借助 Google 的转录服务获取语音邮件的转录文本。%1$s</string>
+  <string name="voicemail_donate_preference_summary_info">允许 Google 查看您的语音邮件，以提高转录准确度。您的语音邮件会以匿名形式存储。%1$s</string>
+  <string name="confirm_disable_voicemail_dialog_title">关闭可视语音信箱</string>
+  <string name="confirm_disable_voicemail_dialog_message">这会删除此应用中存储的所有语音邮件和 Google 转录的内容。您的运营商可能会保留自己的副本。</string>
+  <string name="confirm_disable_voicemail_accept_dialog_label">关闭</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/settings/res/values-zh-rHK/strings.xml b/java/com/android/dialer/voicemail/settings/res/values-zh-rHK/strings.xml
new file mode 100644
index 0000000..3d160d8
--- /dev/null
+++ b/java/com/android/dialer/voicemail/settings/res/values-zh-rHK/strings.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_settings_with_label">留言 (%s)</string>
+  <string name="voicemail_settings_title">留言</string>
+  <string name="voicemail_notifications_preference_title">通知</string>
+  <string name="voicemail_change_greeting_preference_title">留言信箱問候語</string>
+  <string name="change_greeting_text">輕按即可錄音</string>
+  <string name="save_button_text">儲存</string>
+  <string name="redo_button_text">再試一次</string>
+  <string name="voicemail_advanced_settings_title">進階設定</string>
+  <string name="voicemail_visual_voicemail_switch_title">視像留言</string>
+  <string name="voicemail_visual_voicemail_auto_archive_switch_title">額外備份功能和儲存空間</string>
+  <string name="voicemail_set_pin_preference_title">設定 PIN</string>
+  <string name="voicemail_change_pin_preference_title">變更 PIN</string>
+  <string name="voicemail_change_pin_preference_summary_disable">必須啟用視像留言才能變更 PIN</string>
+  <string name="voicemail_change_pin_preference_summary_not_activated">視像留言尚未啟用，請稍後再試</string>
+  <string name="vm_change_pin_old_pin">舊的 PIN</string>
+  <string name="vm_change_pin_new_pin">新的 PIN</string>
+  <string name="vm_change_pin_progress_message">請稍候。</string>
+  <string name="vm_change_pin_error_too_short">新的 PIN 太短。</string>
+  <string name="vm_change_pin_error_too_long">新的 PIN 太長。</string>
+  <string name="vm_change_pin_error_too_weak">新的 PIN 太弱。強效密碼不應包含連續序列或重複數字。</string>
+  <string name="vm_change_pin_error_mismatch">舊的 PIN 不符。</string>
+  <string name="vm_change_pin_error_invalid">新的 PIN 包含無效字元。</string>
+  <string name="vm_change_pin_error_system_error">無法變更 PIN</string>
+  <string name="change_pin_title">變更留言 PIN</string>
+  <string name="change_pin_continue_label">繼續</string>
+  <string name="change_pin_cancel_label">取消</string>
+  <string name="change_pin_ok_label">確定</string>
+  <string name="change_pin_enter_old_pin_header">確認舊的 PIN</string>
+  <string name="change_pin_enter_old_pin_hint">請輸入留言 PIN 以繼續。</string>
+  <string name="change_pin_enter_new_pin_header">設定新的 PIN</string>
+  <string name="change_pin_enter_new_pin_hint">PIN 長度必須介乎 %1$d-%2$d 個數字。</string>
+  <string name="change_pin_confirm_pin_header">確認 PIN</string>
+  <string name="change_pin_confirm_pins_dont_match">PIN 不符</string>
+  <string name="change_pin_succeeded">已更新留言 PIN</string>
+  <string name="change_pin_system_error">無法設定 PIN</string>
+  <string name="voicemail_visual_voicemail_transcription_switch_title">留言轉錄</string>
+  <string name="voicemail_visual_voicemail_donation_switch_title">留言轉錄分析</string>
+  <string name="voicemail_activating_summary_info">正在啟用留言</string>
+  <string name="voicemail_transcription_preference_summary_info">使用 Google 轉錄服務轉錄您的留言。%1$s</string>
+  <string name="voicemail_donate_preference_summary_info">讓 Google 審查您的留言訊息，以提高轉錄準確度。系統會以匿名方式儲存您的留言訊息。%1$s</string>
+  <string name="confirm_disable_voicemail_dialog_title">關閉視像留言</string>
+  <string name="confirm_disable_voicemail_dialog_message">這樣會刪除所有儲存在這個應用程式中的留言和 Google 轉錄內容。您的流動網絡供應商可能會保留自己的副本。</string>
+  <string name="confirm_disable_voicemail_accept_dialog_label">關閉</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/settings/res/values-zh-rTW/strings.xml b/java/com/android/dialer/voicemail/settings/res/values-zh-rTW/strings.xml
new file mode 100644
index 0000000..1bacd7c
--- /dev/null
+++ b/java/com/android/dialer/voicemail/settings/res/values-zh-rTW/strings.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_settings_with_label">語音信箱 (%s)</string>
+  <string name="voicemail_settings_title">語音信箱</string>
+  <string name="voicemail_notifications_preference_title">通知</string>
+  <string name="voicemail_change_greeting_preference_title">語音信箱問候語</string>
+  <string name="change_greeting_text">輕觸即可錄音</string>
+  <string name="save_button_text">儲存</string>
+  <string name="redo_button_text">再試一次</string>
+  <string name="voicemail_advanced_settings_title">進階設定</string>
+  <string name="voicemail_visual_voicemail_switch_title">視覺化語音信箱</string>
+  <string name="voicemail_visual_voicemail_auto_archive_switch_title">額外的備份功能和儲存空間</string>
+  <string name="voicemail_set_pin_preference_title">設定語音信箱密碼</string>
+  <string name="voicemail_change_pin_preference_title">變更語音信箱密碼</string>
+  <string name="voicemail_change_pin_preference_summary_disable">必須啟用視覺化語音信箱才能變更語音信箱密碼</string>
+  <string name="voicemail_change_pin_preference_summary_not_activated">尚未啟用視覺化語音信箱，請稍後再試</string>
+  <string name="vm_change_pin_old_pin">舊的語音信箱密碼</string>
+  <string name="vm_change_pin_new_pin">新的語音信箱密碼</string>
+  <string name="vm_change_pin_progress_message">請稍候。</string>
+  <string name="vm_change_pin_error_too_short">新的語音信箱密碼太短。</string>
+  <string name="vm_change_pin_error_too_long">新的語音信箱密碼太長。</string>
+  <string name="vm_change_pin_error_too_weak">新的語音信箱密碼不夠安全。安全強度高的密碼不得使用連續或重複的數字。</string>
+  <string name="vm_change_pin_error_mismatch">舊的語音信箱密碼不符。</string>
+  <string name="vm_change_pin_error_invalid">新的語音信箱密碼包含無效字元。</string>
+  <string name="vm_change_pin_error_system_error">無法變更語音信箱密碼</string>
+  <string name="change_pin_title">變更語音信箱密碼</string>
+  <string name="change_pin_continue_label">繼續</string>
+  <string name="change_pin_cancel_label">取消</string>
+  <string name="change_pin_ok_label">確定</string>
+  <string name="change_pin_enter_old_pin_header">確認舊的語音信箱密碼</string>
+  <string name="change_pin_enter_old_pin_hint">請輸入你的語音信箱密碼，然後才能繼續接下來的步驟。</string>
+  <string name="change_pin_enter_new_pin_header">設定新的語音信箱密碼</string>
+  <string name="change_pin_enter_new_pin_hint">語音信箱密碼長度必須介於 %1$d 到 %2$d 位數。</string>
+  <string name="change_pin_confirm_pin_header">確認語音信箱密碼</string>
+  <string name="change_pin_confirm_pins_dont_match">語音信箱密碼不符</string>
+  <string name="change_pin_succeeded">已更新語音信箱密碼</string>
+  <string name="change_pin_system_error">無法設定語音信箱密碼</string>
+  <string name="voicemail_visual_voicemail_transcription_switch_title">語音留言轉錄</string>
+  <string name="voicemail_visual_voicemail_donation_switch_title">語音留言轉錄分析</string>
+  <string name="voicemail_activating_summary_info">正在啟用語音信箱</string>
+  <string name="voicemail_transcription_preference_summary_info">使用 Google 的留言轉錄服務取得你的語音留言轉錄。%1$s</string>
+  <string name="voicemail_donate_preference_summary_info">允許 Google 聽取你的語音留言，以改善轉錄精確度。系統會以匿名方式儲存你的語音留言。%1$s</string>
+  <string name="confirm_disable_voicemail_dialog_title">停用視覺化語音信箱</string>
+  <string name="confirm_disable_voicemail_dialog_message">這項操作將會刪除儲存在這個應用程式中的所有語音留言和 Google 留言轉錄。請注意，你的電信業者可能會保留複本。</string>
+  <string name="confirm_disable_voicemail_accept_dialog_label">停用</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/settings/res/values-zu/strings.xml b/java/com/android/dialer/voicemail/settings/res/values-zu/strings.xml
new file mode 100644
index 0000000..352f16e
--- /dev/null
+++ b/java/com/android/dialer/voicemail/settings/res/values-zu/strings.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="voicemail_settings_with_label">Ivoyisimeyili (%s)</string>
+  <string name="voicemail_settings_title">Ivoyisimeyili</string>
+  <string name="voicemail_notifications_preference_title">Izaziso</string>
+  <string name="voicemail_change_greeting_preference_title">Ukubingelela kwevoyisimeyili</string>
+  <string name="change_greeting_text">Thepha ukuze urekhode</string>
+  <string name="save_button_text">Londoloza</string>
+  <string name="redo_button_text">Zama futhi</string>
+  <string name="voicemail_advanced_settings_title">Izilungiselelo ezithuthukisiwe</string>
+  <string name="voicemail_visual_voicemail_switch_title">Ivoyisimeyili ebonakalayo</string>
+  <string name="voicemail_visual_voicemail_auto_archive_switch_title">Isipele esingeziwe nesitoreji</string>
+  <string name="voicemail_set_pin_preference_title">Setha i-PIN</string>
+  <string name="voicemail_change_pin_preference_title">Shintsha i-PIN</string>
+  <string name="voicemail_change_pin_preference_summary_disable">Ivoyisimeyili ebonakalayo kumele inikwe amandla ukuze ishintshe i-PIN</string>
+  <string name="voicemail_change_pin_preference_summary_not_activated">Ivoyisimeyili ebonakalayo ayisebenzi okwamanje, sicela uzame futhi emuva kwesikhathi</string>
+  <string name="vm_change_pin_old_pin">I-PIN endala</string>
+  <string name="vm_change_pin_new_pin">I-PIN entsha</string>
+  <string name="vm_change_pin_progress_message">Sicela ulinde.</string>
+  <string name="vm_change_pin_error_too_short">I-PIN entsha imfushane kakhulu.</string>
+  <string name="vm_change_pin_error_too_long">I-PIN entsha yinde kakhulu.</string>
+  <string name="vm_change_pin_error_too_weak">I-PIN entsha ibuthakathaka. Iphasiwedi eqinile akufanele ibe nokulandelana okuqhubekayo noma amadijithi aphindaphindiwe.</string>
+  <string name="vm_change_pin_error_mismatch">I-PIN endala ayifani.</string>
+  <string name="vm_change_pin_error_invalid">I-PIN entsha iqukethe izinhlamvu ezingavumelekile.</string>
+  <string name="vm_change_pin_error_system_error">Ayikwazi ukushintsha i-PIN</string>
+  <string name="change_pin_title">Shintsha IPHINI yevoyisimeyili</string>
+  <string name="change_pin_continue_label">Qhubeka</string>
+  <string name="change_pin_cancel_label">Khansela</string>
+  <string name="change_pin_ok_label">Kulungile</string>
+  <string name="change_pin_enter_old_pin_header">Qinisekisa i-PIN yakho endala</string>
+  <string name="change_pin_enter_old_pin_hint">Faka i-PIN yakho yevoyisimeyili ukuze uqhubeke.</string>
+  <string name="change_pin_enter_new_pin_header">Setha i-PIN entsha</string>
+  <string name="change_pin_enter_new_pin_hint">I-PIN kufanele ibe amadijithi angu-%1$d-%2$d.</string>
+  <string name="change_pin_confirm_pin_header">Qinisekisa i-PIN yakho</string>
+  <string name="change_pin_confirm_pins_dont_match">Ama-PIN awafani</string>
+  <string name="change_pin_succeeded">I-PIN yevoyisimeyili ibuyekeziwe</string>
+  <string name="change_pin_system_error">Ayikwazi ukusetha i-PIN</string>
+  <string name="voicemail_visual_voicemail_transcription_switch_title">Ukulotshwa kwevoyisimeyili</string>
+  <string name="voicemail_visual_voicemail_donation_switch_title">Ukuhlaziywa kokubhala ngokuloba kwevoyisimeyili</string>
+  <string name="voicemail_activating_summary_info">Yenza kusebenze ivoyisimeyili</string>
+  <string name="voicemail_transcription_preference_summary_info">Thola ukuloba kwevoyisimeyili yakho usebenzisa isevisi yokuloba ye-Google. %1$s</string>
+  <string name="voicemail_donate_preference_summary_info">Vumela i-Google ibuyekeze imilayezo yakho yevoyisimeyili ukuze ithuthukise ukunemba kokuloba. Imilayezo yakho yevoyisimeyili igcinwa ngokungaziwa. %1$s</string>
+  <string name="confirm_disable_voicemail_dialog_title">Vala ivoyisimeyili yokubuka</string>
+  <string name="confirm_disable_voicemail_dialog_message">Lokhu kuzosula noma iyiphi ivoyisimeyili nemibhalo ye-Google elondolozwe ngaphakathi kwalolu hlelo lokusebenza. Inkampani yakho yenethiwekhi ikugcina kumakhophi ayo.</string>
+  <string name="confirm_disable_voicemail_accept_dialog_label">VALA</string>
+</resources>
diff --git a/java/com/android/dialer/voicemail/settings/res/values/dimens_record_button.xml b/java/com/android/dialer/voicemail/settings/res/values/dimens_record_button.xml
new file mode 100644
index 0000000..a45f987
--- /dev/null
+++ b/java/com/android/dialer/voicemail/settings/res/values/dimens_record_button.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2018 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<resources>
+  <dimen name="track_width">15dp</dimen>
+  <dimen name="center_icon_radius">48dp</dimen>
+</resources>
diff --git a/java/com/android/dialer/voicemail/settings/res/values/strings.xml b/java/com/android/dialer/voicemail/settings/res/values/strings.xml
index 1d2c104..971f37a 100644
--- a/java/com/android/dialer/voicemail/settings/res/values/strings.xml
+++ b/java/com/android/dialer/voicemail/settings/res/values/strings.xml
@@ -29,6 +29,28 @@
          which sound to play and whether to vibrate when a voicemail notification is received.
          [CHAR LIMIT=30] -->
   <string name="voicemail_notifications_preference_title">Notifications</string>
+
+  <!-- Internal key for a preference to change greeting -->
+  <string name="voicemail_change_greeting_key" translatable="false">voicemail_change_greeting_key</string>
+
+  <!-- Title for changing voicemail greeting activity [CHAR LIMIT=40] -->
+  <string name="voicemail_change_greeting_preference_title">Voicemail greeting</string>
+
+  <!-- Text instruction shown on the current voicemail greeting display screen [CHAR LIMIT=20] -->
+  <string name="current_voicemail_greeting_record_instruction">Record a greeting</string>
+
+  <!-- Title for voicemail greeting, if one is already recorded. -->
+  <string name="current_voicemail_greeting_recording_title">My voicemail greeting</string>
+
+  <!-- Text shown on the record voicemail activity [CHAR LIMIT=20] -->
+  <string name="change_greeting_text">Tap to Record</string>
+
+  <!-- Text shown on save button in record voicemail activity [CHAR LIMIT=20] -->
+  <string name="save_button_text">Save</string>
+
+  <!-- Text shown on redo button in record voicemail activity [CHAR LIMIT=20] -->
+  <string name="redo_button_text">Try Again</string>
+
   <string name="voicemail_advanced_settings_key" translatable="false">voicemail_advanced_settings_key</string>
 
   <!-- Title for advanced settings in the voicemail settings -->
@@ -102,21 +124,26 @@
   <!-- The error message to show if the server reported an error while attempting to change the voicemail PIN -->
   <string name="change_pin_system_error">Unable to set PIN</string>
 
+  <string name="voicemail_visual_voicemail_transcription_key" translatable="false">transcribe_voicemails</string>
   <string name="voicemail_visual_voicemail_donation_key" translatable="false">donate_voicemails</string>
 
+  <!-- Title for visual voicemail setting that enables users voicemails to be transcribed by Google.
+       [CHAR LIMIT=40] -->
+  <string name="voicemail_visual_voicemail_transcription_switch_title">
+    Voicemail transcription
+  </string>
   <!-- Title for visual voicemail setting that enables user to donate their voicemails for analysis.
        [CHAR LIMIT=40] -->
   <string name="voicemail_visual_voicemail_donation_switch_title">
     Voicemail transcription analysis
   </string>
-  <!-- Summary information for visual voicemail donation setting when visual voicemail is not enabled
-       [CHAR LIMIT=NONE] -->
-  <string name="voicemail_donate_preference_summary_disable">Visual voicemail must be enabled to donate voicemails</string>
-  <!-- Summary information for visual voicemail donation setting when visual voicemail is not activated
-       [CHAR LIMIT=NONE] -->
-  <string name="voicemail_donate_preference_summary_not_activated">Visual voicemail is not activated yet, please try again later</string>
+  <!-- Summary information while visual voicemail is activating after turning it on [CHAR LIMIT=NONE] -->
+  <string name="voicemail_activating_summary_info">Activating voicemail</string>
+
+  <!-- Summary information for visual voicemail transcription setting [CHAR LIMIT=NONE] -->
+  <string name="voicemail_transcription_preference_summary_info">Get transcripts of your voicemail using Google\'s transcription service. <xliff:g example="Learn more">%1$s</xliff:g></string>
   <!-- Summary information for visual voicemail donation setting [CHAR LIMIT=NONE] -->
-  <string name="voicemail_donate_preference_summary_info">Let Google review your voicemail messages to improve transcription accuracy</string>
+  <string name="voicemail_donate_preference_summary_info">Let Google review your voicemail messages to improve transcription accuracy. Your voicemail messages are stored anonymously. <xliff:g example="Learn more">%1$s</xliff:g></string>
 
   <!-- Title for disable visual voicemail confirmation dialog [CHAR LIMIT=40] -->
   <string name="confirm_disable_voicemail_dialog_title">Turn off visual voicemail</string>
@@ -125,7 +152,7 @@
   <!-- The label for the confirm-disable-voicemail button [CHAR LIMIT=16] -->
   <string name="confirm_disable_voicemail_accept_dialog_label">TURN OFF</string>
 
-  <string translatable="false" name="transcription_learn_more_url">https://support.google.com/phoneapp/answer/2811844?hl=en%26ref_topic=7539039</string>
-  <string translatable="false" name="donation_learn_more_url">https://support.google.com/phoneapp/answer/2811844#voicemail_transcript</string>
+  <string name="transcription_learn_more_url" translatable="false">https://support.google.com/phoneapp/answer/2811844?hl=en%26ref_topic=7539039</string>
+  <string name="donation_learn_more_url" translatable="false">https://support.google.com/phoneapp/answer/2811844#voicemail_transcript</string>
 
 </resources>
diff --git a/java/com/android/dialer/voicemail/settings/res/xml/voicemail_settings.xml b/java/com/android/dialer/voicemail/settings/res/xml/voicemail_settings.xml
index e558985..9dff2cb 100644
--- a/java/com/android/dialer/voicemail/settings/res/xml/voicemail_settings.xml
+++ b/java/com/android/dialer/voicemail/settings/res/xml/voicemail_settings.xml
@@ -15,33 +15,45 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-  android:title="@string/voicemail_settings_title">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:title="@string/voicemail_settings_title">
 
   <Preference
       android:key="@string/voicemail_notifications_key"
       android:title="@string/voicemail_notifications_preference_title"/>
 
-  <SwitchPreference
-    android:key="@string/voicemail_visual_voicemail_key"
-    android:title="@string/voicemail_visual_voicemail_switch_title"/>"
+  <Preference
+    android:key="@string/voicemail_change_greeting_key"
+    android:title = "@string/voicemail_change_greeting_preference_title"/>
 
   <SwitchPreference
-    android:key="@string/voicemail_visual_voicemail_archive_key"
-    android:dependency="@string/voicemail_visual_voicemail_key"
-    android:title="@string/voicemail_visual_voicemail_auto_archive_switch_title"/>"
+      android:key="@string/voicemail_visual_voicemail_key"
+      android:title="@string/voicemail_visual_voicemail_switch_title"/>"
 
   <SwitchPreference
-    android:key="@string/voicemail_visual_voicemail_donation_key"
-    android:dependency="@string/voicemail_visual_voicemail_key"
-    android:title="@string/voicemail_visual_voicemail_donation_switch_title"/>"
+      android:dependency="@string/voicemail_visual_voicemail_key"
+      android:key="@string/voicemail_visual_voicemail_archive_key"
+      android:title="@string/voicemail_visual_voicemail_auto_archive_switch_title"/>"
+
+  <com.android.dialer.common.preference.SwitchPreferenceWithClickableSummary
+      android:dependency="@string/voicemail_visual_voicemail_key"
+      android:key="@string/voicemail_visual_voicemail_transcription_key"
+      android:title="@string/voicemail_visual_voicemail_transcription_switch_title"
+      app:urlToOpen="@string/transcription_learn_more_url"/>
+
+  <com.android.dialer.common.preference.SwitchPreferenceWithClickableSummary
+      android:dependency="@string/voicemail_visual_voicemail_transcription_key"
+      android:key="@string/voicemail_visual_voicemail_donation_key"
+      android:title="@string/voicemail_visual_voicemail_donation_switch_title"
+      app:urlToOpen="@string/donation_learn_more_url"/>
 
   <Preference
-    android:key="@string/voicemail_change_pin_key"
-    android:title="@string/voicemail_change_pin_preference_title"/>
+      android:key="@string/voicemail_change_pin_key"
+      android:title="@string/voicemail_change_pin_preference_title"/>
 
   <PreferenceScreen
-    android:key="@string/voicemail_advanced_settings_key"
-    android:title="@string/voicemail_advanced_settings_title">
-    </PreferenceScreen>
+      android:key="@string/voicemail_advanced_settings_key"
+      android:title="@string/voicemail_advanced_settings_title">
+  </PreferenceScreen>
 
 </PreferenceScreen>
diff --git a/java/com/android/dialer/voicemailstatus/VoicemailStatusQuery.java b/java/com/android/dialer/voicemailstatus/VoicemailStatusQuery.java
index 4a6e9f7..7264afe 100644
--- a/java/com/android/dialer/voicemailstatus/VoicemailStatusQuery.java
+++ b/java/com/android/dialer/voicemailstatus/VoicemailStatusQuery.java
@@ -34,11 +34,7 @@
   public static final int CONFIGURATION_STATE_INDEX = 3;
   public static final int DATA_CHANNEL_STATE_INDEX = 4;
   public static final int NOTIFICATION_CHANNEL_STATE_INDEX = 5;
-
-  @RequiresApi(VERSION_CODES.N)
   public static final int QUOTA_OCCUPIED_INDEX = 6;
-
-  @RequiresApi(VERSION_CODES.N)
   public static final int QUOTA_TOTAL_INDEX = 7;
 
   @RequiresApi(VERSION_CODES.N_MR1)
@@ -51,28 +47,24 @@
   @RequiresApi(VERSION_CODES.N_MR1)
   public static final int SOURCE_TYPE_INDEX = 10;
 
-  private static final String[] PROJECTION_M =
+  @RequiresApi(VERSION_CODES.N)
+  private static final String[] PROJECTION_N =
       new String[] {
         Status.SOURCE_PACKAGE, // 0
         Status.SETTINGS_URI, // 1
         Status.VOICEMAIL_ACCESS_URI, // 2
         Status.CONFIGURATION_STATE, // 3
         Status.DATA_CHANNEL_STATE, // 4
-        Status.NOTIFICATION_CHANNEL_STATE // 5
+        Status.NOTIFICATION_CHANNEL_STATE, // 5
+        Status.QUOTA_OCCUPIED, // 6
+        Status.QUOTA_TOTAL // 7
       };
 
-  @RequiresApi(VERSION_CODES.N)
-  private static final String[] PROJECTION_N;
-
   @RequiresApi(VERSION_CODES.N_MR1)
   private static final String[] PROJECTION_NMR1;
 
   static {
-    List<String> projectionList = new ArrayList<>(Arrays.asList(PROJECTION_M));
-    projectionList.add(Status.QUOTA_OCCUPIED); // 6
-    projectionList.add(Status.QUOTA_TOTAL); // 7
-    PROJECTION_N = projectionList.toArray(new String[projectionList.size()]);
-
+    List<String> projectionList = new ArrayList<>(Arrays.asList(PROJECTION_N));
     projectionList.add(Status.PHONE_ACCOUNT_COMPONENT_NAME); // 8
     projectionList.add(Status.PHONE_ACCOUNT_ID); // 9
     projectionList.add(Status.SOURCE_TYPE); // 10
@@ -80,12 +72,6 @@
   }
 
   public static String[] getProjection() {
-    if (VERSION.SDK_INT >= VERSION_CODES.N_MR1) {
-      return PROJECTION_NMR1;
-    }
-    if (VERSION.SDK_INT >= VERSION_CODES.N) {
-      return PROJECTION_N;
-    }
-    return PROJECTION_M;
+    return VERSION.SDK_INT >= VERSION_CODES.N_MR1 ? PROJECTION_NMR1 : PROJECTION_N;
   }
 }
diff --git a/java/com/android/dialer/widget/BidiTextView.java b/java/com/android/dialer/widget/BidiTextView.java
new file mode 100644
index 0000000..5dd15de
--- /dev/null
+++ b/java/com/android/dialer/widget/BidiTextView.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.dialer.widget;
+
+import android.content.Context;
+import android.support.annotation.Nullable;
+import android.util.AttributeSet;
+import android.widget.TextView;
+import com.android.dialer.i18n.DialerBidiFormatter;
+
+/** A {@link TextView} that applies bidirectional formatting to its text. */
+public final class BidiTextView extends TextView {
+
+  public BidiTextView(Context context) {
+    super(context);
+  }
+
+  public BidiTextView(Context context, @Nullable AttributeSet attrs) {
+    super(context, attrs);
+  }
+
+  @Override
+  public void setText(CharSequence text, BufferType type) {
+    super.setText(DialerBidiFormatter.format(text), type);
+  }
+}
diff --git a/java/com/android/dialer/widget/ContactPhotoView.java b/java/com/android/dialer/widget/ContactPhotoView.java
new file mode 100644
index 0000000..c0c9be7
--- /dev/null
+++ b/java/com/android/dialer/widget/ContactPhotoView.java
@@ -0,0 +1,128 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.dialer.widget;
+
+import android.content.Context;
+import android.support.annotation.Nullable;
+import android.util.AttributeSet;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.FrameLayout;
+import android.widget.ImageView;
+import android.widget.QuickContactBadge;
+import com.android.dialer.common.Assert;
+import com.android.dialer.glidephotomanager.GlidePhotoManager;
+import com.android.dialer.glidephotomanager.GlidePhotoManagerComponent;
+import com.android.dialer.glidephotomanager.PhotoInfo;
+
+/**
+ * A {@link FrameLayout} for displaying a contact photo and its optional badge (such as one for a
+ * video call).
+ */
+public final class ContactPhotoView extends FrameLayout {
+  private final QuickContactBadge contactPhoto;
+  private final FrameLayout contactBadgeContainer;
+  private final ImageView videoCallBadge;
+  private final ImageView rttCallBadge;
+
+  private final GlidePhotoManager glidePhotoManager;
+
+  public ContactPhotoView(Context context) {
+    this(context, /* attrs = */ null);
+  }
+
+  public ContactPhotoView(Context context, @Nullable AttributeSet attrs) {
+    this(context, attrs, /* defStyleAttr = */ 0);
+  }
+
+  public ContactPhotoView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+    this(context, attrs, defStyleAttr, /* defStyleRes = */ 0);
+  }
+
+  public ContactPhotoView(
+      Context context, @Nullable AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+    super(context, attrs, defStyleAttr, defStyleRes);
+
+    inflateLayout();
+
+    contactPhoto = findViewById(R.id.quick_contact_photo);
+    contactBadgeContainer = findViewById(R.id.contact_badge_container);
+    videoCallBadge = findViewById(R.id.video_call_badge);
+    rttCallBadge = findViewById(R.id.rtt_call_badge);
+
+    glidePhotoManager = GlidePhotoManagerComponent.get(context).glidePhotoManager();
+
+    hideBadge(); // Hide badges by default.
+  }
+
+  @Override
+  protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+    super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+
+    // We require both the height and the width to be WRAP_CONTENT to prevent users of
+    // this widget from clipping the view (by setting a size that is too small) or altering the
+    // relative position of the contact photo and its badge (by setting a size that is too large).
+    ViewGroup.LayoutParams layoutParams = Assert.isNotNull(getLayoutParams());
+    Assert.checkState(
+        layoutParams.height == LayoutParams.WRAP_CONTENT,
+        "The layout height must be WRAP_CONTENT!");
+    Assert.checkState(
+        layoutParams.width == LayoutParams.WRAP_CONTENT, "The layout width must be WRAP_CONTENT!");
+  }
+
+  private void inflateLayout() {
+    LayoutInflater inflater = Assert.isNotNull(getContext().getSystemService(LayoutInflater.class));
+    inflater.inflate(R.layout.contact_photo_view, /* root = */ this);
+  }
+
+  private void hideBadge() {
+    contactBadgeContainer.setVisibility(View.GONE);
+    videoCallBadge.setVisibility(View.GONE);
+    rttCallBadge.setVisibility(View.GONE);
+  }
+
+  /** Sets the contact photo and its badge to be displayed. */
+  public void setPhoto(PhotoInfo photoInfo) {
+    glidePhotoManager.loadQuickContactBadge(contactPhoto, photoInfo);
+    setBadge(photoInfo);
+  }
+
+  private void setBadge(PhotoInfo photoInfo) {
+    // No badge for spam numbers.
+    if (photoInfo.getIsSpam()) {
+      hideBadge();
+      return;
+    }
+
+    if (photoInfo.getIsVideo()) {
+      contactBadgeContainer.setVisibility(View.VISIBLE);
+      videoCallBadge.setVisibility(View.VISIBLE);
+      // Normally a video call can't be RTT call and vice versa.
+      // (a bug): In theory a video call could be downgraded to voice and upgraded to RTT call
+      // again, this might end up a call with video and RTT features both set. Update logic here if
+      // that could happen. Also update {@link Coalescer#meetsCallFeatureCriteria}.
+      rttCallBadge.setVisibility(View.GONE);
+    } else if (photoInfo.getIsRtt()) {
+      contactBadgeContainer.setVisibility(View.VISIBLE);
+      videoCallBadge.setVisibility(View.GONE);
+      rttCallBadge.setVisibility(View.VISIBLE);
+    } else {
+      hideBadge();
+    }
+  }
+}
diff --git a/java/com/android/dialer/widget/DialerToolbar.java b/java/com/android/dialer/widget/DialerToolbar.java
index fe0e861..40dabe8 100644
--- a/java/com/android/dialer/widget/DialerToolbar.java
+++ b/java/com/android/dialer/widget/DialerToolbar.java
@@ -23,21 +23,22 @@
 import android.support.v7.widget.Toolbar;
 import android.util.AttributeSet;
 import android.widget.TextView;
+import com.android.dialer.theme.base.ThemeComponent;
 
 /** Toolbar widget for Dialer. */
 public class DialerToolbar extends Toolbar {
 
   private final TextView title;
-  private final TextView subtitle;
+  private final BidiTextView subtitle;
 
   public DialerToolbar(Context context, @Nullable AttributeSet attributeSet) {
     super(context, attributeSet);
     inflate(context, R.layout.dialer_toolbar, this);
     title = (TextView) findViewById(R.id.title);
-    subtitle = (TextView) findViewById(R.id.subtitle);
+    subtitle = (BidiTextView) findViewById(R.id.subtitle);
 
     setElevation(getResources().getDimensionPixelSize(R.dimen.toolbar_elevation));
-    setBackgroundColor(getResources().getColor(R.color.dialer_theme_color));
+    setBackgroundColor(ThemeComponent.get(context).theme().getColorPrimary());
     setNavigationIcon(R.drawable.quantum_ic_close_white_24);
     setNavigationContentDescription(R.string.toolbar_close);
     setNavigationOnClickListener(v -> ((Activity) context).finish());
diff --git a/java/com/android/dialer/widget/EmptyContentView.java b/java/com/android/dialer/widget/EmptyContentView.java
index b99657a..c0f9c9c 100644
--- a/java/com/android/dialer/widget/EmptyContentView.java
+++ b/java/com/android/dialer/widget/EmptyContentView.java
@@ -18,9 +18,6 @@
 
 import android.content.Context;
 import android.content.res.ColorStateList;
-import android.content.res.Resources.Theme;
-import android.support.annotation.ColorRes;
-import android.support.annotation.Nullable;
 import android.support.annotation.StringRes;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
@@ -28,6 +25,7 @@
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
+import com.android.dialer.theme.base.ThemeComponent;
 
 public class EmptyContentView extends LinearLayout implements View.OnClickListener {
 
@@ -68,6 +66,9 @@
     descriptionView = (TextView) findViewById(R.id.empty_list_view_message);
     actionView = (TextView) findViewById(R.id.empty_list_view_action);
     actionView.setOnClickListener(this);
+
+    imageView.setImageTintList(
+        ColorStateList.valueOf(ThemeComponent.get(context).theme().getColorIconSecondary()));
   }
 
   public void setDescription(int resourceId) {
@@ -90,11 +91,6 @@
     }
   }
 
-  public void setImageTint(@ColorRes int color, @Nullable Theme theme) {
-    imageView.setImageTintList(
-        (ColorStateList.valueOf(getContext().getResources().getColor(color, theme))));
-  }
-
   public void setActionLabel(@StringRes int resourceId) {
     actionLabel = resourceId;
     if (resourceId == NO_LABEL) {
diff --git a/java/com/android/dialer/widget/FloatingActionButtonController.java b/java/com/android/dialer/widget/FloatingActionButtonController.java
index c89c1a8..eea0b59 100644
--- a/java/com/android/dialer/widget/FloatingActionButtonController.java
+++ b/java/com/android/dialer/widget/FloatingActionButtonController.java
@@ -26,7 +26,6 @@
 import android.view.View;
 import android.view.animation.AnimationUtils;
 import android.view.animation.Interpolator;
-import com.android.contacts.common.R;
 import com.android.dialer.common.Assert;
 
 /** Controls the movement and appearance of the FAB (Floating Action Button). */
diff --git a/java/com/android/dialer/widget/MaxHeightScrollView.java b/java/com/android/dialer/widget/MaxHeightScrollView.java
new file mode 100644
index 0000000..cec8f8f
--- /dev/null
+++ b/java/com/android/dialer/widget/MaxHeightScrollView.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.dialer.widget;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.support.annotation.Nullable;
+import android.util.AttributeSet;
+import android.widget.ScrollView;
+
+/** {@link ScrollView} with a max height attribute. */
+public class MaxHeightScrollView extends ScrollView {
+
+  private final int maxHeight;
+
+  public MaxHeightScrollView(Context context, @Nullable AttributeSet attrs) {
+    this(context, attrs, 0);
+  }
+
+  public MaxHeightScrollView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+    this(context, attrs, defStyleAttr, 0);
+  }
+
+  public MaxHeightScrollView(
+      Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+    super(context, attrs, defStyleAttr, defStyleRes);
+    if (isInEditMode()) {
+      maxHeight = -1;
+      return;
+    }
+
+    TypedArray array =
+        context.getTheme().obtainStyledAttributes(attrs, R.styleable.MaxHeightScrollView, 0, 0);
+    try {
+      maxHeight = array.getDimensionPixelSize(R.styleable.MaxHeightScrollView_maxHeight, -1);
+    } finally {
+      array.recycle();
+    }
+  }
+
+  @Override
+  protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+    if (maxHeight < 0) {
+      super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+    } else {
+      super.onMeasure(
+          widthMeasureSpec, MeasureSpec.makeMeasureSpec(maxHeight, MeasureSpec.AT_MOST));
+    }
+  }
+}
diff --git a/java/com/android/dialer/widget/TextViewPreference.java b/java/com/android/dialer/widget/TextViewPreference.java
index 2c1885c..1c479d4 100644
--- a/java/com/android/dialer/widget/TextViewPreference.java
+++ b/java/com/android/dialer/widget/TextViewPreference.java
@@ -108,6 +108,8 @@
       setTitle(textResourceId);
     } else if (text != null) {
       setTitle(text);
+    } else if (getTitleRes() != 0) {
+      setTitle(getTitleRes());
     }
   }
 
diff --git a/java/com/android/dialer/widget/res/color/dialer_tint_state.xml b/java/com/android/dialer/widget/res/color/dialer_tint_state.xml
index c29f334..84b2bc0 100644
--- a/java/com/android/dialer/widget/res/color/dialer_tint_state.xml
+++ b/java/com/android/dialer/widget/res/color/dialer_tint_state.xml
@@ -18,6 +18,6 @@
 -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-  <item android:color="@color/dialer_edit_text_hint_color" android:state_enabled="false"/>
-  <item android:color="@color/dialer_theme_color"/>
+  <item android:color="?android:attr/textColorHint" android:state_enabled="false"/>
+  <item android:color="?android:attr/colorPrimary"/>
 </selector>
\ No newline at end of file
diff --git a/java/com/android/dialer/widget/res/drawable-hdpi/empty_contacts.png b/java/com/android/dialer/widget/res/drawable-hdpi/empty_contacts.png
index d3c0378..628f301 100644
--- a/java/com/android/dialer/widget/res/drawable-hdpi/empty_contacts.png
+++ b/java/com/android/dialer/widget/res/drawable-hdpi/empty_contacts.png
Binary files differ
diff --git a/java/com/android/dialer/widget/res/drawable-mdpi/empty_contacts.png b/java/com/android/dialer/widget/res/drawable-mdpi/empty_contacts.png
index 2ce7eae..bb2a133 100644
--- a/java/com/android/dialer/widget/res/drawable-mdpi/empty_contacts.png
+++ b/java/com/android/dialer/widget/res/drawable-mdpi/empty_contacts.png
Binary files differ
diff --git a/java/com/android/dialer/widget/res/drawable-xhdpi/empty_contacts.png b/java/com/android/dialer/widget/res/drawable-xhdpi/empty_contacts.png
index 65b1de3..5edeab2 100644
--- a/java/com/android/dialer/widget/res/drawable-xhdpi/empty_contacts.png
+++ b/java/com/android/dialer/widget/res/drawable-xhdpi/empty_contacts.png
Binary files differ
diff --git a/java/com/android/dialer/widget/res/drawable-xxhdpi/empty_contacts.png b/java/com/android/dialer/widget/res/drawable-xxhdpi/empty_contacts.png
index 407d78c..7d6c059 100644
--- a/java/com/android/dialer/widget/res/drawable-xxhdpi/empty_contacts.png
+++ b/java/com/android/dialer/widget/res/drawable-xxhdpi/empty_contacts.png
Binary files differ
diff --git a/java/com/android/dialer/widget/res/drawable-xxxhdpi/empty_contacts.png b/java/com/android/dialer/widget/res/drawable-xxxhdpi/empty_contacts.png
index 5893965..ad44d24 100644
--- a/java/com/android/dialer/widget/res/drawable-xxxhdpi/empty_contacts.png
+++ b/java/com/android/dialer/widget/res/drawable-xxxhdpi/empty_contacts.png
Binary files differ
diff --git a/java/com/android/dialer/widget/res/drawable/contact_photo_badge_background.xml b/java/com/android/dialer/widget/res/drawable/contact_photo_badge_background.xml
new file mode 100644
index 0000000..76af600
--- /dev/null
+++ b/java/com/android/dialer/widget/res/drawable/contact_photo_badge_background.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2018 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+
+  <solid android:color="?android:attr/colorPrimary"/>
+  <stroke android:color="?android:attr/colorBackground" android:width="2dp"/>
+</shape>
\ No newline at end of file
diff --git a/java/com/android/dialer/widget/res/drawable/edittext_custom_cursor.xml b/java/com/android/dialer/widget/res/drawable/edittext_custom_cursor.xml
new file mode 100644
index 0000000..62cd9ab
--- /dev/null
+++ b/java/com/android/dialer/widget/res/drawable/edittext_custom_cursor.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2014 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+  <size android:width="2dp"/>
+  <solid android:color="?android:attr/colorPrimary"/>
+</shape>
\ No newline at end of file
diff --git a/java/com/android/dialer/widget/res/layout-land/empty_content_view.xml b/java/com/android/dialer/widget/res/layout-land/empty_content_view.xml
index 3a7574f..84e6fc8 100644
--- a/java/com/android/dialer/widget/res/layout-land/empty_content_view.xml
+++ b/java/com/android/dialer/widget/res/layout-land/empty_content_view.xml
@@ -32,7 +32,7 @@
       android:paddingLeft="16dp"
       android:paddingRight="16dp"
       android:gravity="center_horizontal|top"
-      android:textColor="@color/empty_list_text_color"
+      android:textColor="?android:attr/textColorSecondary"
       android:textSize="@dimen/empty_list_message_text_size"/>
 
   <TextView
diff --git a/java/com/android/dialer/widget/res/layout/contact_photo_view.xml b/java/com/android/dialer/widget/res/layout/contact_photo_view.xml
new file mode 100644
index 0000000..e133886
--- /dev/null
+++ b/java/com/android/dialer/widget/res/layout/contact_photo_view.xml
@@ -0,0 +1,74 @@
+<!--
+  ~ Copyright (C) 2018 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+
+<!-- A FrameLayout for displaying a contact photo and its optional badge -->
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="56dp"
+    android:layout_height="48dp"
+    android:layout_gravity="center"
+    android:focusable="false">
+
+  <QuickContactBadge
+      android:id="@+id/quick_contact_photo"
+      android:layout_width="48dp"
+      android:layout_height="48dp"
+      android:layout_gravity="center"
+      android:padding="4dp"/>
+
+  <!--
+      A container layout that contains a background and badges
+      (video call badge, RTT call badge, etc)
+
+      The container and its children are too small to meet the accessibility requirement that the
+      touchable area of focusable items should be at least 48dp x 48dp. We have to mark all of them
+      as not important for accessibility.
+  -->
+  <FrameLayout
+      android:id="@+id/contact_badge_container"
+      android:layout_width="22dp"
+      android:layout_height="22dp"
+      android:layout_marginBottom="2dp"
+      android:layout_marginEnd="2dp"
+      android:layout_gravity="bottom|end"
+      android:importantForAccessibility="noHideDescendants">
+
+    <ImageView
+        android:id="@+id/contact_badge_background"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:src="@drawable/contact_photo_badge_background"
+        tools:ignore="ContentDescription"/>
+
+    <ImageView
+        android:id="@+id/video_call_badge"
+        android:layout_width="13dp"
+        android:layout_height="13dp"
+        android:layout_gravity="center"
+        android:src="@drawable/quantum_ic_videocam_vd_white_24"
+        tools:ignore="ContentDescription"/>
+
+    <ImageView
+        android:id="@+id/rtt_call_badge"
+        android:layout_width="13dp"
+        android:layout_height="13dp"
+        android:layout_gravity="center"
+        android:src="@drawable/quantum_ic_rtt_vd_theme_24"
+        android:tint="?android:attr/colorBackground"
+        tools:ignore="ContentDescription"/>
+  </FrameLayout>
+</FrameLayout>
\ No newline at end of file
diff --git a/java/com/android/dialer/widget/res/layout/dialer_toolbar.xml b/java/com/android/dialer/widget/res/layout/dialer_toolbar.xml
old mode 100644
new mode 100755
index 023b0ff..3b4d136
--- a/java/com/android/dialer/widget/res/layout/dialer_toolbar.xml
+++ b/java/com/android/dialer/widget/res/layout/dialer_toolbar.xml
@@ -28,19 +28,15 @@
         android:layout_height="wrap_content"
         android:gravity="top"
         android:textSize="@dimen/toolbar_title_text_size"
-        android:textColor="@color/background_dialer_white"
-        android:fontFamily="sans-serif-medium"
-        android:maxLines="1"
-        android:ellipsize="end"/>
+        android:textColor="?android:attr/textColorPrimaryInverse"
+        style="@style/Dialer.TextAppearance.Header2"/>
 
-    <TextView
+    <com.android.dialer.widget.BidiTextView
         android:id="@+id/subtitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textSize="@dimen/toolbar_subtitle_text_size"
-        android:textColor="@color/background_dialer_white"
+        android:textColor="?android:attr/textColorPrimaryInverse"
         android:visibility="gone"
-        android:maxLines="1"
-        android:ellipsize="end"/>
+        style="@style/Dialer.TextAppearance.Secondary.Ellipsize"/>
   </LinearLayout>
 </merge>
\ No newline at end of file
diff --git a/java/com/android/dialer/widget/res/layout/empty_content_view.xml b/java/com/android/dialer/widget/res/layout/empty_content_view.xml
index 9aac6f4..57bb2fd 100644
--- a/java/com/android/dialer/widget/res/layout/empty_content_view.xml
+++ b/java/com/android/dialer/widget/res/layout/empty_content_view.xml
@@ -30,7 +30,7 @@
     android:paddingLeft="16dp"
     android:paddingRight="16dp"
     android:gravity="center_horizontal|top"
-    android:textColor="@color/empty_list_text_color"
+    android:textColor="?android:attr/textColorSecondary"
     android:textSize="@dimen/empty_list_message_text_size"/>
 
   <TextView
diff --git a/java/com/android/dialer/widget/res/layout/fragment_message.xml b/java/com/android/dialer/widget/res/layout/fragment_message.xml
index bdb85fa..1004fa8 100644
--- a/java/com/android/dialer/widget/res/layout/fragment_message.xml
+++ b/java/com/android/dialer/widget/res/layout/fragment_message.xml
@@ -18,7 +18,7 @@
   xmlns:android="http://schemas.android.com/apk/res/android"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
-  android:background="@color/background_dialer_white">
+  android:background="?android:attr/colorBackground">
 
   <ScrollView
       android:layout_width="match_parent"
@@ -52,10 +52,10 @@
       android:padding="@dimen/textview_item_padding"
       android:textSize="@dimen/message_item_text_size"
       android:hint="@string/custom_message_hint"
-      android:textColor="@color/dialer_primary_text_color"
-      android:textColorHint="@color/dialer_edit_text_hint_color"
-      android:background="@color/background_dialer_white"
-      android:textCursorDrawable="@drawable/searchedittext_custom_cursor"
+      android:textColor="?android:attr/textColorPrimary"
+      android:textColorHint="?android:attr/textColorHint"
+      android:background="?android:attr/colorBackground"
+      android:textCursorDrawable="@drawable/edittext_custom_cursor"
       android:layout_toStartOf="@+id/count_and_send_container"
       android:inputType="textShortMessage|textCapSentences"
       android:imeOptions="flagNoExtractUi|actionSend"/>
@@ -85,7 +85,7 @@
         android:layout_height="wrap_content"
         android:visibility="gone"
         android:textSize="@dimen/message_remaining_char_text_size"
-        android:textColor="@color/dialer_edit_text_hint_color"/>
+        android:textColor="?android:attr/textColorHint"/>
     </LinearLayout>
   </RelativeLayout>
 </RelativeLayout>
\ No newline at end of file
diff --git a/java/com/android/dialer/widget/res/layout/selectable_text_view.xml b/java/com/android/dialer/widget/res/layout/selectable_text_view.xml
index 3d120d1..5e13d9a 100644
--- a/java/com/android/dialer/widget/res/layout/selectable_text_view.xml
+++ b/java/com/android/dialer/widget/res/layout/selectable_text_view.xml
@@ -19,7 +19,6 @@
   android:id="@+id/selectable_text_view"
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
-  android:textSize="16sp"
-  android:textColor="@color/dialer_primary_text_color"
+  style="@style/Dialer.TextAppearance.Primary"
   android:padding="16dp"
-  android:background="@drawable/item_background_material_light"/>
\ No newline at end of file
+  android:background="?android:selectableItemBackground"/>
\ No newline at end of file
diff --git a/java/com/android/dialer/widget/res/values-af/strings.xml b/java/com/android/dialer/widget/res/values-af/strings.xml
index 0c21ae9..403a78b 100644
--- a/java/com/android/dialer/widget/res/values-af/strings.xml
+++ b/java/com/android/dialer/widget/res/values-af/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="custom_message_hint" msgid="2179012696339457461">"Skryf \'n gepasmaakte boodskap"</string>
-    <string name="toolbar_close" msgid="1081308076149879833">"Maak toe"</string>
-    <string name="all_contacts_empty" msgid="4260556610403994011">"Jy het nog nie enige kontakte nie"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Skep nuwe kontak"</string>
-    <string name="permission_single_turn_on" msgid="1306416016676232584">"Skakel aan"</string>
-    <string name="permission_no_contacts" msgid="2388204904477299207">"Skakel die kontaktetoestemming aan om jou kontakte te sien."</string>
-    <string name="add_contact_not_available" msgid="3083256438899321502">"Geen kontakte-program beskikbaar nie"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="custom_message_hint">Skryf \'n gepasmaakte boodskap</string>
+  <string name="toolbar_close">Maak toe</string>
+  <string name="all_contacts_empty">Jy het nog nie enige kontakte nie</string>
+  <string name="all_contacts_empty_add_contact_action">Skep nuwe kontak</string>
+  <string name="permission_single_turn_on">Skakel aan</string>
+  <string name="permission_no_contacts">Skakel die kontaktetoestemming aan om jou kontakte te sien.</string>
+  <string name="add_contact_not_available">Geen kontakte-program beskikbaar nie</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-am/strings.xml b/java/com/android/dialer/widget/res/values-am/strings.xml
index 8c2ae43..71a2f96 100644
--- a/java/com/android/dialer/widget/res/values-am/strings.xml
+++ b/java/com/android/dialer/widget/res/values-am/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="custom_message_hint" msgid="2179012696339457461">"ብጁ መልዕክት ይጻፉ"</string>
-    <string name="toolbar_close" msgid="1081308076149879833">"ዝጋ"</string>
-    <string name="all_contacts_empty" msgid="4260556610403994011">"ገና ምንም እውቂያዎች የሉዎትም"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"አዲስ እውቂያ ይፍጠሩ"</string>
-    <string name="permission_single_turn_on" msgid="1306416016676232584">"አብራ"</string>
-    <string name="permission_no_contacts" msgid="2388204904477299207">"የእርስዎን እውቂያዎች ለማየት፣ የእውቂያዎች ፍቃዱን ያብሩ።"</string>
-    <string name="add_contact_not_available" msgid="3083256438899321502">"ምንም የእውቂያዎች መተግበሪያ አይገኝም"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="custom_message_hint">ብጁ መልዕክት ይጻፉ</string>
+  <string name="toolbar_close">ዝጋ</string>
+  <string name="all_contacts_empty">ገና ምንም እውቂያዎች የሉዎትም</string>
+  <string name="all_contacts_empty_add_contact_action">አዲስ እውቂያ ይፍጠሩ</string>
+  <string name="permission_single_turn_on">አብራ</string>
+  <string name="permission_no_contacts">የእርስዎን እውቂያዎች ለማየት፣ የእውቂያዎች ፍቃዱን ያብሩ።</string>
+  <string name="add_contact_not_available">ምንም የእውቂያዎች መተግበሪያ አይገኝም</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-ar/strings.xml b/java/com/android/dialer/widget/res/values-ar/strings.xml
index 26ed748..9c03b31 100644
--- a/java/com/android/dialer/widget/res/values-ar/strings.xml
+++ b/java/com/android/dialer/widget/res/values-ar/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="custom_message_hint" msgid="2179012696339457461">"كتابة رسالة مخصصة"</string>
-    <string name="toolbar_close" msgid="1081308076149879833">"إغلاق"</string>
-    <string name="all_contacts_empty" msgid="4260556610403994011">"ليست لديك أية جهات اتصال حتى الآن"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"إنشاء جهة اتصال"</string>
-    <string name="permission_single_turn_on" msgid="1306416016676232584">"تشغيل"</string>
-    <string name="permission_no_contacts" msgid="2388204904477299207">"للاطلاع على جهات الاتصال، شغِّل إذن جهات الاتصال."</string>
-    <string name="add_contact_not_available" msgid="3083256438899321502">"لا يتوفر تطبيق لجهات الاتصال"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="custom_message_hint">كتابة رسالة مخصصة</string>
+  <string name="toolbar_close">إغلاق</string>
+  <string name="all_contacts_empty">ليست لديك أي جهات اتصال حتى الآن</string>
+  <string name="all_contacts_empty_add_contact_action">إنشاء جهة اتصال</string>
+  <string name="permission_single_turn_on">تشغيل</string>
+  <string name="permission_no_contacts">للاطلاع على جهات الاتصال، شغِّل إذن جهات الاتصال.</string>
+  <string name="add_contact_not_available">لا يتوفر تطبيق لجهات الاتصال</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-az/strings.xml b/java/com/android/dialer/widget/res/values-az/strings.xml
index aa3344d..b8e0744 100644
--- a/java/com/android/dialer/widget/res/values-az/strings.xml
+++ b/java/com/android/dialer/widget/res/values-az/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="custom_message_hint" msgid="2179012696339457461">"Fərdi mesaj yazın"</string>
-    <string name="toolbar_close" msgid="1081308076149879833">"Bağlayın"</string>
-    <string name="all_contacts_empty" msgid="4260556610403994011">"Hələ heç bir kontakt yoxdur"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Yeni kontakt yaradın"</string>
-    <string name="permission_single_turn_on" msgid="1306416016676232584">"Aktiv edin"</string>
-    <string name="permission_no_contacts" msgid="2388204904477299207">"Kontaktları görmək üçün Kontakt icazəsini aktiv edin."</string>
-    <string name="add_contact_not_available" msgid="3083256438899321502">"Kontakt tətbiqi əlçatan deyil"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="custom_message_hint">Fərdi mesaj yazın</string>
+  <string name="toolbar_close">Bağlayın</string>
+  <string name="all_contacts_empty">Hələ heç bir kontakt yoxdur</string>
+  <string name="all_contacts_empty_add_contact_action">Yeni kontakt yaradın</string>
+  <string name="permission_single_turn_on">Aktiv edin</string>
+  <string name="permission_no_contacts">Kontaktları görmək üçün Kontakt icazəsini aktiv edin.</string>
+  <string name="add_contact_not_available">Kontakt tətbiqi əlçatan deyil</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-b+sr+Latn/strings.xml b/java/com/android/dialer/widget/res/values-b+sr+Latn/strings.xml
index fea3cb0..f457ab5 100644
--- a/java/com/android/dialer/widget/res/values-b+sr+Latn/strings.xml
+++ b/java/com/android/dialer/widget/res/values-b+sr+Latn/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="custom_message_hint" msgid="2179012696339457461">"Napišite prilagođenu poruku"</string>
-    <string name="toolbar_close" msgid="1081308076149879833">"Zatvorite"</string>
-    <string name="all_contacts_empty" msgid="4260556610403994011">"Još uvek nemate nijedan kontakt"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Napravi novi kontakt"</string>
-    <string name="permission_single_turn_on" msgid="1306416016676232584">"Uključi"</string>
-    <string name="permission_no_contacts" msgid="2388204904477299207">"Da biste videli kontakte, uključite dozvolu za Kontakte."</string>
-    <string name="add_contact_not_available" msgid="3083256438899321502">"Nema dostupne aplikacije za kontakte"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="custom_message_hint">Napišite prilagođenu poruku</string>
+  <string name="toolbar_close">Zatvorite</string>
+  <string name="all_contacts_empty">Još uvek nemate nijedan kontakt</string>
+  <string name="all_contacts_empty_add_contact_action">Napravi novi kontakt</string>
+  <string name="permission_single_turn_on">Uključi</string>
+  <string name="permission_no_contacts">Da biste videli kontakte, uključite dozvolu za Kontakte.</string>
+  <string name="add_contact_not_available">Nema dostupne aplikacije za kontakte</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-be/strings.xml b/java/com/android/dialer/widget/res/values-be/strings.xml
index 3e3b370..dadab3b 100644
--- a/java/com/android/dialer/widget/res/values-be/strings.xml
+++ b/java/com/android/dialer/widget/res/values-be/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="custom_message_hint" msgid="2179012696339457461">"Напісаць карыстальніцкае паведамленне"</string>
-    <string name="toolbar_close" msgid="1081308076149879833">"Закрыць"</string>
-    <string name="all_contacts_empty" msgid="4260556610403994011">"У вас пакуль няма ніякіх кантактаў"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Новы кантакт"</string>
-    <string name="permission_single_turn_on" msgid="1306416016676232584">"Уключыць"</string>
-    <string name="permission_no_contacts" msgid="2388204904477299207">"Каб бачыць свае кантакты, уключыце дазвол для Кантактаў."</string>
-    <string name="add_contact_not_available" msgid="3083256438899321502">"Праграмы для аперацый з кантактамі няма"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="custom_message_hint">Напісаць карыстальніцкае паведамленне</string>
+  <string name="toolbar_close">Закрыць</string>
+  <string name="all_contacts_empty">У вас пакуль няма ніякіх кантактаў</string>
+  <string name="all_contacts_empty_add_contact_action">Новы кантакт</string>
+  <string name="permission_single_turn_on">Уключыць</string>
+  <string name="permission_no_contacts">Каб бачыць свае кантакты, уключыце дазвол для Кантактаў.</string>
+  <string name="add_contact_not_available">Праграмы для аперацый з кантактамі няма</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-bg/strings.xml b/java/com/android/dialer/widget/res/values-bg/strings.xml
index fbb87d0..bd3d15b 100644
--- a/java/com/android/dialer/widget/res/values-bg/strings.xml
+++ b/java/com/android/dialer/widget/res/values-bg/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="custom_message_hint" msgid="2179012696339457461">"Напишете свое съобщение"</string>
-    <string name="toolbar_close" msgid="1081308076149879833">"Затваряне"</string>
-    <string name="all_contacts_empty" msgid="4260556610403994011">"Още нямате контакти"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Създаване на нов контакт"</string>
-    <string name="permission_single_turn_on" msgid="1306416016676232584">"Включване"</string>
-    <string name="permission_no_contacts" msgid="2388204904477299207">"За да видите контактите си, включете разрешението за Контакти."</string>
-    <string name="add_contact_not_available" msgid="3083256438899321502">"Няма налично приложение за контакти"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="custom_message_hint">Напишете свое съобщение</string>
+  <string name="toolbar_close">Затваряне</string>
+  <string name="all_contacts_empty">Още нямате контакти</string>
+  <string name="all_contacts_empty_add_contact_action">Създаване на нов контакт</string>
+  <string name="permission_single_turn_on">Включване</string>
+  <string name="permission_no_contacts">За да видите контактите си, включете разрешението за Контакти.</string>
+  <string name="add_contact_not_available">Няма налично приложение за контакти</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-bn/strings.xml b/java/com/android/dialer/widget/res/values-bn/strings.xml
index 58bf44c..5f5f8cb 100644
--- a/java/com/android/dialer/widget/res/values-bn/strings.xml
+++ b/java/com/android/dialer/widget/res/values-bn/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="custom_message_hint" msgid="2179012696339457461">"একটি কাস্টম বার্তা লিখুন"</string>
-    <string name="toolbar_close" msgid="1081308076149879833">"বন্ধ করুন"</string>
-    <string name="all_contacts_empty" msgid="4260556610403994011">"আপনার এখনও পর্যন্ত কোনো পরিচিতি নেই"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"নতুন পরিচিতি তৈরি করুন"</string>
-    <string name="permission_single_turn_on" msgid="1306416016676232584">"চালু করুন"</string>
-    <string name="permission_no_contacts" msgid="2388204904477299207">"আপনার পরিচিতিগুলি দেখতে, পরিচিতিগুলির অনুমতি চালু করুন।"</string>
-    <string name="add_contact_not_available" msgid="3083256438899321502">"কোনো পরিচিতি অ্যাপ্লিকেশান উপলব্ধ নয়"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="custom_message_hint">একটি কাস্টম বার্তা লিখুন</string>
+  <string name="toolbar_close">বন্ধ করুন</string>
+  <string name="all_contacts_empty">আপনার এখনও পর্যন্ত কোনো পরিচিতি নেই</string>
+  <string name="all_contacts_empty_add_contact_action">নতুন পরিচিতি তৈরি করুন</string>
+  <string name="permission_single_turn_on">চালু করুন</string>
+  <string name="permission_no_contacts">আপনার পরিচিতিগুলি দেখতে, পরিচিতিগুলির অনুমতি চালু করুন।</string>
+  <string name="add_contact_not_available">কোনো পরিচিতি অ্যাপ্লিকেশান উপলব্ধ নয়</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-bs/strings.xml b/java/com/android/dialer/widget/res/values-bs/strings.xml
index 539d5b4..4efaf36 100644
--- a/java/com/android/dialer/widget/res/values-bs/strings.xml
+++ b/java/com/android/dialer/widget/res/values-bs/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="custom_message_hint" msgid="2179012696339457461">"Napišite prilagođenu poruku"</string>
-    <string name="toolbar_close" msgid="1081308076149879833">"Zatvori"</string>
-    <string name="all_contacts_empty" msgid="4260556610403994011">"Još nemate nijedan kontakt"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Kreiraj novi kontakt"</string>
-    <string name="permission_single_turn_on" msgid="1306416016676232584">"Uključi"</string>
-    <string name="permission_no_contacts" msgid="2388204904477299207">"Da vidite kontakte, uključite dozvolu za Kontakte."</string>
-    <string name="add_contact_not_available" msgid="3083256438899321502">"Nije dostupna nijedna aplikacija za kontakte"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="custom_message_hint">Napišite prilagođenu poruku</string>
+  <string name="toolbar_close">Zatvori</string>
+  <string name="all_contacts_empty">Još nemate nijedan kontakt</string>
+  <string name="all_contacts_empty_add_contact_action">Kreiraj novi kontakt</string>
+  <string name="permission_single_turn_on">Uključi</string>
+  <string name="permission_no_contacts">Da vidite kontakte, uključite odobrenje za Kontakte.</string>
+  <string name="add_contact_not_available">Nije dostupna nijedna aplikacija za kontakte</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-ca/strings.xml b/java/com/android/dialer/widget/res/values-ca/strings.xml
index 3b24947..9a83ff1 100644
--- a/java/com/android/dialer/widget/res/values-ca/strings.xml
+++ b/java/com/android/dialer/widget/res/values-ca/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="custom_message_hint" msgid="2179012696339457461">"Escriu un miss. personalitzat"</string>
-    <string name="toolbar_close" msgid="1081308076149879833">"Tanca"</string>
-    <string name="all_contacts_empty" msgid="4260556610403994011">"Encara no tens cap contacte"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Crea un contacte"</string>
-    <string name="permission_single_turn_on" msgid="1306416016676232584">"Activa"</string>
-    <string name="permission_no_contacts" msgid="2388204904477299207">"Activa el permís Contactes per veure els teus contactes."</string>
-    <string name="add_contact_not_available" msgid="3083256438899321502">"No hi ha cap contacte disponible"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="custom_message_hint">Escriu un miss. personalitzat</string>
+  <string name="toolbar_close">Tanca</string>
+  <string name="all_contacts_empty">Encara no tens cap contacte</string>
+  <string name="all_contacts_empty_add_contact_action">Crea un contacte</string>
+  <string name="permission_single_turn_on">Activa</string>
+  <string name="permission_no_contacts">Activa el permís Contactes per veure els teus contactes.</string>
+  <string name="add_contact_not_available">No hi ha cap contacte disponible</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-cs/strings.xml b/java/com/android/dialer/widget/res/values-cs/strings.xml
index b2cbd5b..5616ed3 100644
--- a/java/com/android/dialer/widget/res/values-cs/strings.xml
+++ b/java/com/android/dialer/widget/res/values-cs/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="custom_message_hint" msgid="2179012696339457461">"Napište vlastní zprávu"</string>
-    <string name="toolbar_close" msgid="1081308076149879833">"Zavřít"</string>
-    <string name="all_contacts_empty" msgid="4260556610403994011">"Zatím nemáte žádné kontakty"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Vytvořit nový kontakt"</string>
-    <string name="permission_single_turn_on" msgid="1306416016676232584">"Povolit"</string>
-    <string name="permission_no_contacts" msgid="2388204904477299207">"Pokud chcete zobrazit kontakty, povolte aplikaci přístup ke Kontaktům."</string>
-    <string name="add_contact_not_available" msgid="3083256438899321502">"Není k dispozici žádná aplikace pro práci s kontakty"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="custom_message_hint">Napište vlastní zprávu</string>
+  <string name="toolbar_close">Zavřít</string>
+  <string name="all_contacts_empty">Zatím nemáte žádné kontakty</string>
+  <string name="all_contacts_empty_add_contact_action">Vytvořit nový kontakt</string>
+  <string name="permission_single_turn_on">Povolit</string>
+  <string name="permission_no_contacts">Pokud chcete zobrazit kontakty, povolte aplikaci přístup ke Kontaktům.</string>
+  <string name="add_contact_not_available">Není k dispozici žádná aplikace pro práci s kontakty</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-da/strings.xml b/java/com/android/dialer/widget/res/values-da/strings.xml
index 3f2e844..7e614f1 100644
--- a/java/com/android/dialer/widget/res/values-da/strings.xml
+++ b/java/com/android/dialer/widget/res/values-da/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="custom_message_hint" msgid="2179012696339457461">"Skriv en tilpasset besked"</string>
-    <string name="toolbar_close" msgid="1081308076149879833">"Luk"</string>
-    <string name="all_contacts_empty" msgid="4260556610403994011">"Du har endnu ikke nogen kontaktpersoner"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Opret ny kontaktperson"</string>
-    <string name="permission_single_turn_on" msgid="1306416016676232584">"Slå til"</string>
-    <string name="permission_no_contacts" msgid="2388204904477299207">"Slå tilladelsen Kontaktpersoner til for at se dine kontaktpersoner."</string>
-    <string name="add_contact_not_available" msgid="3083256438899321502">"Der er ingen tilgængelig app til kontaktpersoner"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="custom_message_hint">Skriv en tilpasset besked</string>
+  <string name="toolbar_close">Luk</string>
+  <string name="all_contacts_empty">Du har endnu ikke nogen kontaktpersoner</string>
+  <string name="all_contacts_empty_add_contact_action">Opret ny kontaktperson</string>
+  <string name="permission_single_turn_on">Slå til</string>
+  <string name="permission_no_contacts">Slå tilladelsen Kontaktpersoner til for at se dine kontaktpersoner.</string>
+  <string name="add_contact_not_available">Der er ingen tilgængelig app til kontaktpersoner</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-de/strings.xml b/java/com/android/dialer/widget/res/values-de/strings.xml
index f650df9..d0c7d58 100644
--- a/java/com/android/dialer/widget/res/values-de/strings.xml
+++ b/java/com/android/dialer/widget/res/values-de/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="custom_message_hint" msgid="2179012696339457461">"Eigene Nachricht schreiben"</string>
-    <string name="toolbar_close" msgid="1081308076149879833">"Schließen"</string>
-    <string name="all_contacts_empty" msgid="4260556610403994011">"Du hast noch keine Kontakte"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Neuen Kontakt erstellen"</string>
-    <string name="permission_single_turn_on" msgid="1306416016676232584">"Aktivieren"</string>
-    <string name="permission_no_contacts" msgid="2388204904477299207">"Aktiviere die Berechtigung \"Kontakte\", um deine Kontakte abzurufen."</string>
-    <string name="add_contact_not_available" msgid="3083256438899321502">"Keine Kontakte-App verfügbar"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="custom_message_hint">Eigene Nachricht schreiben</string>
+  <string name="toolbar_close">Schließen</string>
+  <string name="all_contacts_empty">Du hast noch keine Kontakte</string>
+  <string name="all_contacts_empty_add_contact_action">Neuen Kontakt erstellen</string>
+  <string name="permission_single_turn_on">Aktivieren</string>
+  <string name="permission_no_contacts">Aktiviere die Berechtigung \"Kontakte\", um deine Kontakte abzurufen.</string>
+  <string name="add_contact_not_available">Keine Kontakte-App verfügbar</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-el/strings.xml b/java/com/android/dialer/widget/res/values-el/strings.xml
index b095c85..bde8407 100644
--- a/java/com/android/dialer/widget/res/values-el/strings.xml
+++ b/java/com/android/dialer/widget/res/values-el/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="custom_message_hint" msgid="2179012696339457461">"Γράψτε ένα προσαρμ. μήνυμα"</string>
-    <string name="toolbar_close" msgid="1081308076149879833">"Κλείσιμο"</string>
-    <string name="all_contacts_empty" msgid="4260556610403994011">"Δεν έχετε επαφές ακόμη"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Δημιουργία νέας επαφής"</string>
-    <string name="permission_single_turn_on" msgid="1306416016676232584">"Ενεργοποίηση"</string>
-    <string name="permission_no_contacts" msgid="2388204904477299207">"Για να δείτε τις επαφές σας, ενεργοποιήστε την άδεια πρόσβασης στις Επαφές."</string>
-    <string name="add_contact_not_available" msgid="3083256438899321502">"Δεν υπάρχει διαθέσιμη εφαρμογή επαφών"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="custom_message_hint">Γράψτε ένα προσαρμ. μήνυμα</string>
+  <string name="toolbar_close">Κλείσιμο</string>
+  <string name="all_contacts_empty">Δεν έχετε επαφές ακόμη</string>
+  <string name="all_contacts_empty_add_contact_action">Δημιουργία νέας επαφής</string>
+  <string name="permission_single_turn_on">Ενεργοποίηση</string>
+  <string name="permission_no_contacts">Για να δείτε τις επαφές σας, ενεργοποιήστε την άδεια πρόσβασης στις Επαφές.</string>
+  <string name="add_contact_not_available">Δεν υπάρχει διαθέσιμη εφαρμογή επαφών</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-en-rAU/strings.xml b/java/com/android/dialer/widget/res/values-en-rAU/strings.xml
index 33cba33..120ea48 100644
--- a/java/com/android/dialer/widget/res/values-en-rAU/strings.xml
+++ b/java/com/android/dialer/widget/res/values-en-rAU/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="custom_message_hint" msgid="2179012696339457461">"Write a custom message"</string>
-    <string name="toolbar_close" msgid="1081308076149879833">"Close"</string>
-    <string name="all_contacts_empty" msgid="4260556610403994011">"You don\'t have any contacts yet"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Create new contact"</string>
-    <string name="permission_single_turn_on" msgid="1306416016676232584">"Turn on"</string>
-    <string name="permission_no_contacts" msgid="2388204904477299207">"To see your contacts, turn on the Contacts permission."</string>
-    <string name="add_contact_not_available" msgid="3083256438899321502">"No contacts app available"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="custom_message_hint">Write a custom message</string>
+  <string name="toolbar_close">Close</string>
+  <string name="all_contacts_empty">You don\'t have any contacts yet</string>
+  <string name="all_contacts_empty_add_contact_action">Create new contact</string>
+  <string name="permission_single_turn_on">Turn on</string>
+  <string name="permission_no_contacts">To see your contacts, turn on the Contacts permission.</string>
+  <string name="add_contact_not_available">No contacts app available</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-en-rGB/strings.xml b/java/com/android/dialer/widget/res/values-en-rGB/strings.xml
index 33cba33..120ea48 100644
--- a/java/com/android/dialer/widget/res/values-en-rGB/strings.xml
+++ b/java/com/android/dialer/widget/res/values-en-rGB/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="custom_message_hint" msgid="2179012696339457461">"Write a custom message"</string>
-    <string name="toolbar_close" msgid="1081308076149879833">"Close"</string>
-    <string name="all_contacts_empty" msgid="4260556610403994011">"You don\'t have any contacts yet"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Create new contact"</string>
-    <string name="permission_single_turn_on" msgid="1306416016676232584">"Turn on"</string>
-    <string name="permission_no_contacts" msgid="2388204904477299207">"To see your contacts, turn on the Contacts permission."</string>
-    <string name="add_contact_not_available" msgid="3083256438899321502">"No contacts app available"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="custom_message_hint">Write a custom message</string>
+  <string name="toolbar_close">Close</string>
+  <string name="all_contacts_empty">You don\'t have any contacts yet</string>
+  <string name="all_contacts_empty_add_contact_action">Create new contact</string>
+  <string name="permission_single_turn_on">Turn on</string>
+  <string name="permission_no_contacts">To see your contacts, turn on the Contacts permission.</string>
+  <string name="add_contact_not_available">No contacts app available</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-en-rIN/strings.xml b/java/com/android/dialer/widget/res/values-en-rIN/strings.xml
index 33cba33..120ea48 100644
--- a/java/com/android/dialer/widget/res/values-en-rIN/strings.xml
+++ b/java/com/android/dialer/widget/res/values-en-rIN/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="custom_message_hint" msgid="2179012696339457461">"Write a custom message"</string>
-    <string name="toolbar_close" msgid="1081308076149879833">"Close"</string>
-    <string name="all_contacts_empty" msgid="4260556610403994011">"You don\'t have any contacts yet"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Create new contact"</string>
-    <string name="permission_single_turn_on" msgid="1306416016676232584">"Turn on"</string>
-    <string name="permission_no_contacts" msgid="2388204904477299207">"To see your contacts, turn on the Contacts permission."</string>
-    <string name="add_contact_not_available" msgid="3083256438899321502">"No contacts app available"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="custom_message_hint">Write a custom message</string>
+  <string name="toolbar_close">Close</string>
+  <string name="all_contacts_empty">You don\'t have any contacts yet</string>
+  <string name="all_contacts_empty_add_contact_action">Create new contact</string>
+  <string name="permission_single_turn_on">Turn on</string>
+  <string name="permission_no_contacts">To see your contacts, turn on the Contacts permission.</string>
+  <string name="add_contact_not_available">No contacts app available</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-es-rUS/strings.xml b/java/com/android/dialer/widget/res/values-es-rUS/strings.xml
index 2d60728..da698f5 100644
--- a/java/com/android/dialer/widget/res/values-es-rUS/strings.xml
+++ b/java/com/android/dialer/widget/res/values-es-rUS/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="custom_message_hint" msgid="2179012696339457461">"Escribe tu propio mensaje"</string>
-    <string name="toolbar_close" msgid="1081308076149879833">"Cerrar"</string>
-    <string name="all_contacts_empty" msgid="4260556610403994011">"Aún no tienes contactos"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Crear contacto nuevo"</string>
-    <string name="permission_single_turn_on" msgid="1306416016676232584">"Activar"</string>
-    <string name="permission_no_contacts" msgid="2388204904477299207">"Para ver los contactos, activa el permiso Contactos."</string>
-    <string name="add_contact_not_available" msgid="3083256438899321502">"No hay ninguna app de contactos disponible"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="custom_message_hint">Escribe tu propio mensaje</string>
+  <string name="toolbar_close">Cerrar</string>
+  <string name="all_contacts_empty">Aún no tienes contactos</string>
+  <string name="all_contacts_empty_add_contact_action">Crear contacto nuevo</string>
+  <string name="permission_single_turn_on">Activar</string>
+  <string name="permission_no_contacts">Para ver los contactos, activa el permiso Contactos.</string>
+  <string name="add_contact_not_available">No hay aplicaciones de contactos disponibles.</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-es/strings.xml b/java/com/android/dialer/widget/res/values-es/strings.xml
index dcb695e..3a5f91e 100644
--- a/java/com/android/dialer/widget/res/values-es/strings.xml
+++ b/java/com/android/dialer/widget/res/values-es/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="custom_message_hint" msgid="2179012696339457461">"Mensaje personalizado"</string>
-    <string name="toolbar_close" msgid="1081308076149879833">"Cerrar"</string>
-    <string name="all_contacts_empty" msgid="4260556610403994011">"Aún no tienes contactos"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Crear un contacto"</string>
-    <string name="permission_single_turn_on" msgid="1306416016676232584">"Activar"</string>
-    <string name="permission_no_contacts" msgid="2388204904477299207">"Para ver tus contactos, activa el permiso de Contactos."</string>
-    <string name="add_contact_not_available" msgid="3083256438899321502">"No hay aplicaciones de contactos disponibles"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="custom_message_hint">Mensaje personalizado</string>
+  <string name="toolbar_close">Cerrar</string>
+  <string name="all_contacts_empty">Aún no tienes contactos</string>
+  <string name="all_contacts_empty_add_contact_action">Crear un contacto</string>
+  <string name="permission_single_turn_on">Activar</string>
+  <string name="permission_no_contacts">Para ver tus contactos, activa el permiso de Contactos.</string>
+  <string name="add_contact_not_available">No hay aplicaciones de contactos disponibles</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-et/strings.xml b/java/com/android/dialer/widget/res/values-et/strings.xml
index c67e53e..aa092d2 100644
--- a/java/com/android/dialer/widget/res/values-et/strings.xml
+++ b/java/com/android/dialer/widget/res/values-et/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="custom_message_hint" msgid="2179012696339457461">"Kirjutage kohandatud sõnum"</string>
-    <string name="toolbar_close" msgid="1081308076149879833">"Sule"</string>
-    <string name="all_contacts_empty" msgid="4260556610403994011">"Teil pole veel kontakte"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Looge uus kontakt"</string>
-    <string name="permission_single_turn_on" msgid="1306416016676232584">"Lülita sisse"</string>
-    <string name="permission_no_contacts" msgid="2388204904477299207">"Kontaktide vaatamiseks lülitage sisse kontaktide luba."</string>
-    <string name="add_contact_not_available" msgid="3083256438899321502">"Kontaktide rakendus pole saadaval"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="custom_message_hint">Kirjutage kohandatud sõnum</string>
+  <string name="toolbar_close">Sule</string>
+  <string name="all_contacts_empty">Teil pole veel kontakte</string>
+  <string name="all_contacts_empty_add_contact_action">Looge uus kontakt</string>
+  <string name="permission_single_turn_on">Lülita sisse</string>
+  <string name="permission_no_contacts">Kontaktide vaatamiseks lülitage sisse kontaktide luba.</string>
+  <string name="add_contact_not_available">Kontaktide rakendus pole saadaval</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-eu/strings.xml b/java/com/android/dialer/widget/res/values-eu/strings.xml
index 2d81cc6..ab012b3 100644
--- a/java/com/android/dialer/widget/res/values-eu/strings.xml
+++ b/java/com/android/dialer/widget/res/values-eu/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="custom_message_hint" msgid="2179012696339457461">"Idatzi mezu bat"</string>
-    <string name="toolbar_close" msgid="1081308076149879833">"Itxi"</string>
-    <string name="all_contacts_empty" msgid="4260556610403994011">"Oraindik ez duzu kontakturik"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Sortu kontaktu bat"</string>
-    <string name="permission_single_turn_on" msgid="1306416016676232584">"Aktibatu"</string>
-    <string name="permission_no_contacts" msgid="2388204904477299207">"Kontaktuak ikusteko, aktibatu Kontaktuak atzitzeko baimena."</string>
-    <string name="add_contact_not_available" msgid="3083256438899321502">"Ez dago kontaktu-aplikaziorik erabilgarri"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="custom_message_hint">Idatzi mezu bat</string>
+  <string name="toolbar_close">Itxi</string>
+  <string name="all_contacts_empty">Oraindik ez duzu kontakturik</string>
+  <string name="all_contacts_empty_add_contact_action">Sortu kontaktu bat</string>
+  <string name="permission_single_turn_on">Aktibatu</string>
+  <string name="permission_no_contacts">Kontaktuak ikusteko, aktibatu Kontaktuak atzitzeko baimena.</string>
+  <string name="add_contact_not_available">Ez dago kontaktu-aplikaziorik erabilgarri</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-fa/strings.xml b/java/com/android/dialer/widget/res/values-fa/strings.xml
index 24f78af..0044036 100644
--- a/java/com/android/dialer/widget/res/values-fa/strings.xml
+++ b/java/com/android/dialer/widget/res/values-fa/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="custom_message_hint" msgid="2179012696339457461">"پیام سفارشی بنویسید"</string>
-    <string name="toolbar_close" msgid="1081308076149879833">"بستن"</string>
-    <string name="all_contacts_empty" msgid="4260556610403994011">"هنوز هیچ مخاطبی ندارید"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"ایجاد مخاطب جدید"</string>
-    <string name="permission_single_turn_on" msgid="1306416016676232584">"فعال‌سازی"</string>
-    <string name="permission_no_contacts" msgid="2388204904477299207">"برای دیدن مخاطبینتان، مجوز «مخاطبین» را روشن کنید."</string>
-    <string name="add_contact_not_available" msgid="3083256438899321502">"هیچ برنامه مخاطبی در دسترس نیست"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="custom_message_hint">پیام سفارشی بنویسید</string>
+  <string name="toolbar_close">بستن</string>
+  <string name="all_contacts_empty">هنوز هیچ مخاطبی ندارید</string>
+  <string name="all_contacts_empty_add_contact_action">ایجاد مخاطب جدید</string>
+  <string name="permission_single_turn_on">فعال‌سازی</string>
+  <string name="permission_no_contacts">برای دیدن مخاطبینتان، مجوز «مخاطبین» را روشن کنید.</string>
+  <string name="add_contact_not_available">هیچ برنامه مخاطبی در دسترس نیست</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-fi/strings.xml b/java/com/android/dialer/widget/res/values-fi/strings.xml
index a754079..e6049c0 100644
--- a/java/com/android/dialer/widget/res/values-fi/strings.xml
+++ b/java/com/android/dialer/widget/res/values-fi/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="custom_message_hint" msgid="2179012696339457461">"Kirjoita oma viesti"</string>
-    <string name="toolbar_close" msgid="1081308076149879833">"Sulje"</string>
-    <string name="all_contacts_empty" msgid="4260556610403994011">"Sinulla ei ole vielä yhteystietoja."</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Luo uusi yhteystieto"</string>
-    <string name="permission_single_turn_on" msgid="1306416016676232584">"Ota käyttöön"</string>
-    <string name="permission_no_contacts" msgid="2388204904477299207">"Jos haluat katsella yhteystietojasi, ota Yhteystiedot-käyttöoikeus käyttöön."</string>
-    <string name="add_contact_not_available" msgid="3083256438899321502">"Yhteystietosovellusta ei ole käytettävissä."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="custom_message_hint">Kirjoita oma viesti</string>
+  <string name="toolbar_close">Sulje</string>
+  <string name="all_contacts_empty">Sinulla ei ole vielä yhteystietoja.</string>
+  <string name="all_contacts_empty_add_contact_action">Luo uusi yhteystieto</string>
+  <string name="permission_single_turn_on">Ota käyttöön</string>
+  <string name="permission_no_contacts">Jos haluat katsella yhteystietojasi, ota Yhteystiedot-käyttöoikeus käyttöön.</string>
+  <string name="add_contact_not_available">Yhteystietosovellusta ei ole käytettävissä.</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-fr-rCA/strings.xml b/java/com/android/dialer/widget/res/values-fr-rCA/strings.xml
index 7785509..e1aee4f 100644
--- a/java/com/android/dialer/widget/res/values-fr-rCA/strings.xml
+++ b/java/com/android/dialer/widget/res/values-fr-rCA/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="custom_message_hint" msgid="2179012696339457461">"Rédiger message personnalisé"</string>
-    <string name="toolbar_close" msgid="1081308076149879833">"Fermer"</string>
-    <string name="all_contacts_empty" msgid="4260556610403994011">"Vous n\'avez pas encore de contacts"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Créer un contact"</string>
-    <string name="permission_single_turn_on" msgid="1306416016676232584">"Activer"</string>
-    <string name="permission_no_contacts" msgid="2388204904477299207">"Pour consulter vos contacts, activez l\'autorisation Contacts."</string>
-    <string name="add_contact_not_available" msgid="3083256438899321502">"Aucune application Contacts n\'est disponible"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="custom_message_hint">Rédiger message personnalisé</string>
+  <string name="toolbar_close">Fermer</string>
+  <string name="all_contacts_empty">Vous n\'avez pas encore de contacts</string>
+  <string name="all_contacts_empty_add_contact_action">Créer un contact</string>
+  <string name="permission_single_turn_on">Activer</string>
+  <string name="permission_no_contacts">Pour consulter vos contacts, activez l\'autorisation Contacts.</string>
+  <string name="add_contact_not_available">Aucune application Contacts n\'est disponible</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-fr/strings.xml b/java/com/android/dialer/widget/res/values-fr/strings.xml
index be8810f..1b24e81 100644
--- a/java/com/android/dialer/widget/res/values-fr/strings.xml
+++ b/java/com/android/dialer/widget/res/values-fr/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="custom_message_hint" msgid="2179012696339457461">"Écrire mon propre message"</string>
-    <string name="toolbar_close" msgid="1081308076149879833">"Fermer"</string>
-    <string name="all_contacts_empty" msgid="4260556610403994011">"Vous n\'avez pas encore de contacts."</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Créer un contact"</string>
-    <string name="permission_single_turn_on" msgid="1306416016676232584">"Activer"</string>
-    <string name="permission_no_contacts" msgid="2388204904477299207">"Pour consulter vos contacts, activez l\'autorisation Contacts."</string>
-    <string name="add_contact_not_available" msgid="3083256438899321502">"Aucune application de gestion des contacts n\'est disponible"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="custom_message_hint">Écrire mon propre message</string>
+  <string name="toolbar_close">Fermer</string>
+  <string name="all_contacts_empty">Vous n\'avez pas encore de contacts.</string>
+  <string name="all_contacts_empty_add_contact_action">Créer un contact</string>
+  <string name="permission_single_turn_on">Activer</string>
+  <string name="permission_no_contacts">Pour consulter vos contacts, activez l\'autorisation Contacts.</string>
+  <string name="add_contact_not_available">Aucune application de gestion des contacts n\'est disponible</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-gl/strings.xml b/java/com/android/dialer/widget/res/values-gl/strings.xml
index a519e68..c6cec04 100644
--- a/java/com/android/dialer/widget/res/values-gl/strings.xml
+++ b/java/com/android/dialer/widget/res/values-gl/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="custom_message_hint" msgid="2179012696339457461">"Escribe unha mensaxe personalizada"</string>
-    <string name="toolbar_close" msgid="1081308076149879833">"Pechar"</string>
-    <string name="all_contacts_empty" msgid="4260556610403994011">"Aínda non tes ningún contacto"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Crear novo contacto"</string>
-    <string name="permission_single_turn_on" msgid="1306416016676232584">"Activar"</string>
-    <string name="permission_no_contacts" msgid="2388204904477299207">"Para ver os teus contactos, activa o permiso de Contactos."</string>
-    <string name="add_contact_not_available" msgid="3083256438899321502">"Non hai ningunha aplicación de contactos dispoñible"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="custom_message_hint">Escribe unha mensaxe personalizada</string>
+  <string name="toolbar_close">Pechar</string>
+  <string name="all_contacts_empty">Aínda non tes ningún contacto</string>
+  <string name="all_contacts_empty_add_contact_action">Crear novo contacto</string>
+  <string name="permission_single_turn_on">Activar</string>
+  <string name="permission_no_contacts">Para ver os teus contactos, activa o permiso de Contactos.</string>
+  <string name="add_contact_not_available">Non hai ningunha aplicación de contactos dispoñible</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-gu/strings.xml b/java/com/android/dialer/widget/res/values-gu/strings.xml
index 81e6f10..a461a4a 100644
--- a/java/com/android/dialer/widget/res/values-gu/strings.xml
+++ b/java/com/android/dialer/widget/res/values-gu/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="custom_message_hint" msgid="2179012696339457461">"એક કસ્ટમ સંદેશ લખો"</string>
-    <string name="toolbar_close" msgid="1081308076149879833">"બંધ કરો"</string>
-    <string name="all_contacts_empty" msgid="4260556610403994011">"તમે હજી સુધી કોઇપણ સંપર્કો ધરાવતાં નથી"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"નવો સંપર્ક બનાવો"</string>
-    <string name="permission_single_turn_on" msgid="1306416016676232584">"ચાલુ કરો"</string>
-    <string name="permission_no_contacts" msgid="2388204904477299207">"તમારા સંપર્કો જોવા માટે, સંપર્કોની પરવાનગી ચાલુ કરો."</string>
-    <string name="add_contact_not_available" msgid="3083256438899321502">"કોઈ સંપર્કો ઍપ્લિકેશન ઉપલબ્ધ નથી"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="custom_message_hint">એક કસ્ટમ સંદેશ લખો</string>
+  <string name="toolbar_close">બંધ કરો</string>
+  <string name="all_contacts_empty">તમે હજી સુધી કોઇપણ સંપર્કો ધરાવતાં નથી</string>
+  <string name="all_contacts_empty_add_contact_action">નવો સંપર્ક બનાવો</string>
+  <string name="permission_single_turn_on">ચાલુ કરો</string>
+  <string name="permission_no_contacts">તમારા સંપર્કો જોવા માટે, સંપર્કોની પરવાનગી ચાલુ કરો.</string>
+  <string name="add_contact_not_available">કોઈ સંપર્કો ઍપ્લિકેશન ઉપલબ્ધ નથી</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-hi/strings.xml b/java/com/android/dialer/widget/res/values-hi/strings.xml
index 622cdca..e263db4 100644
--- a/java/com/android/dialer/widget/res/values-hi/strings.xml
+++ b/java/com/android/dialer/widget/res/values-hi/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="custom_message_hint" msgid="2179012696339457461">"कोई कस्टम संदेश लिखें"</string>
-    <string name="toolbar_close" msgid="1081308076149879833">"बंद करें"</string>
-    <string name="all_contacts_empty" msgid="4260556610403994011">"आपके पास अभी कोई भी संपर्क नहीं है"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"नया संपर्क बनाएं"</string>
-    <string name="permission_single_turn_on" msgid="1306416016676232584">"चालू करें"</string>
-    <string name="permission_no_contacts" msgid="2388204904477299207">"अपने संपर्क देखने के लिए, संपर्क अनुमति चालू करें."</string>
-    <string name="add_contact_not_available" msgid="3083256438899321502">"कोई भी संपर्क ऐप उपलब्‍ध नहीं है"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="custom_message_hint">कोई कस्टम संदेश लिखें</string>
+  <string name="toolbar_close">बंद करें</string>
+  <string name="all_contacts_empty">आपके पास अभी कोई भी संपर्क नहीं है</string>
+  <string name="all_contacts_empty_add_contact_action">नया संपर्क बनाएं</string>
+  <string name="permission_single_turn_on">चालू करें</string>
+  <string name="permission_no_contacts">अपने संपर्क देखने के लिए, संपर्क अनुमति चालू करें.</string>
+  <string name="add_contact_not_available">कोई भी संपर्क ऐप उपलब्‍ध नहीं है</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-hr/strings.xml b/java/com/android/dialer/widget/res/values-hr/strings.xml
index 92fc688..ca7bad5 100644
--- a/java/com/android/dialer/widget/res/values-hr/strings.xml
+++ b/java/com/android/dialer/widget/res/values-hr/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="custom_message_hint" msgid="2179012696339457461">"Napišite prilagođenu poruku"</string>
-    <string name="toolbar_close" msgid="1081308076149879833">"Zatvaranje"</string>
-    <string name="all_contacts_empty" msgid="4260556610403994011">"Još nemate nijedan kontakt"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Izradi novi kontakt"</string>
-    <string name="permission_single_turn_on" msgid="1306416016676232584">"Uključi"</string>
-    <string name="permission_no_contacts" msgid="2388204904477299207">"Da biste vidjeli svoje kontakte, uključite dopuštenje za kontakte."</string>
-    <string name="add_contact_not_available" msgid="3083256438899321502">"Nije dostupna nijedna aplikacija za kontakte"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="custom_message_hint">Napišite prilagođenu poruku</string>
+  <string name="toolbar_close">Zatvaranje</string>
+  <string name="all_contacts_empty">Još nemate nijedan kontakt</string>
+  <string name="all_contacts_empty_add_contact_action">Izradi novi kontakt</string>
+  <string name="permission_single_turn_on">Uključi</string>
+  <string name="permission_no_contacts">Da biste vidjeli svoje kontakte, uključite dopuštenje za kontakte.</string>
+  <string name="add_contact_not_available">Nije dostupna nijedna aplikacija za kontakte</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-hu/strings.xml b/java/com/android/dialer/widget/res/values-hu/strings.xml
index 62d74fb..af42ada 100644
--- a/java/com/android/dialer/widget/res/values-hu/strings.xml
+++ b/java/com/android/dialer/widget/res/values-hu/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="custom_message_hint" msgid="2179012696339457461">"Egyéni üzenet írása"</string>
-    <string name="toolbar_close" msgid="1081308076149879833">"Bezárás"</string>
-    <string name="all_contacts_empty" msgid="4260556610403994011">"Még nem rendelkezik egyetlen névjeggyel sem"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Új névjegy"</string>
-    <string name="permission_single_turn_on" msgid="1306416016676232584">"Bekapcsolás"</string>
-    <string name="permission_no_contacts" msgid="2388204904477299207">"A névjegyek megtekintéséhez kapcsolja be a Névjegyek engedélyt."</string>
-    <string name="add_contact_not_available" msgid="3083256438899321502">"Nincs elérhető névjegykezelő alkalmazás"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="custom_message_hint">Egyéni üzenet írása</string>
+  <string name="toolbar_close">Bezárás</string>
+  <string name="all_contacts_empty">Még nem rendelkezik egyetlen névjeggyel sem</string>
+  <string name="all_contacts_empty_add_contact_action">Új névjegy</string>
+  <string name="permission_single_turn_on">Bekapcsolás</string>
+  <string name="permission_no_contacts">A névjegyek megtekintéséhez kapcsolja be a Névjegyek engedélyt.</string>
+  <string name="add_contact_not_available">Nincs elérhető névjegykezelő alkalmazás</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-hy/strings.xml b/java/com/android/dialer/widget/res/values-hy/strings.xml
index 95d0b73..0520f11 100644
--- a/java/com/android/dialer/widget/res/values-hy/strings.xml
+++ b/java/com/android/dialer/widget/res/values-hy/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="custom_message_hint" msgid="2179012696339457461">"Գրել տեքստն ինքնուրույն"</string>
-    <string name="toolbar_close" msgid="1081308076149879833">"Փակել"</string>
-    <string name="all_contacts_empty" msgid="4260556610403994011">"Դեռ կոնտակտներ չունեք"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Ստեղծել նոր կոնտակտ"</string>
-    <string name="permission_single_turn_on" msgid="1306416016676232584">"Միացնել"</string>
-    <string name="permission_no_contacts" msgid="2388204904477299207">"Ձեր կոնտակտները տեսնելու համար միացրեք Կոնտակտների թույլտվությունը:"</string>
-    <string name="add_contact_not_available" msgid="3083256438899321502">"Կոնտակտների հավելված չկա"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="custom_message_hint">Գրել տեքստն ինքնուրույն</string>
+  <string name="toolbar_close">Փակել</string>
+  <string name="all_contacts_empty">Դեռ կոնտակտներ չունեք</string>
+  <string name="all_contacts_empty_add_contact_action">Ստեղծել նոր կոնտակտ</string>
+  <string name="permission_single_turn_on">Միացնել</string>
+  <string name="permission_no_contacts">Ձեր կոնտակտները տեսնելու համար միացրեք Կոնտակտների թույլտվությունը:</string>
+  <string name="add_contact_not_available">Կոնտակտների հավելված չկա</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-in/strings.xml b/java/com/android/dialer/widget/res/values-in/strings.xml
index 90017b0..72c62f4 100644
--- a/java/com/android/dialer/widget/res/values-in/strings.xml
+++ b/java/com/android/dialer/widget/res/values-in/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="custom_message_hint" msgid="2179012696339457461">"Tulis pesan khusus"</string>
-    <string name="toolbar_close" msgid="1081308076149879833">"Tutup"</string>
-    <string name="all_contacts_empty" msgid="4260556610403994011">"Anda belum memiliki kontak"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Buat kontak baru"</string>
-    <string name="permission_single_turn_on" msgid="1306416016676232584">"Aktifkan"</string>
-    <string name="permission_no_contacts" msgid="2388204904477299207">"Untuk melihat kontak, aktifkan izin Kontak."</string>
-    <string name="add_contact_not_available" msgid="3083256438899321502">"Aplikasi kontak tidak tersedia"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="custom_message_hint">Tulis pesan khusus</string>
+  <string name="toolbar_close">Tutup</string>
+  <string name="all_contacts_empty">Anda belum memiliki kontak</string>
+  <string name="all_contacts_empty_add_contact_action">Buat kontak baru</string>
+  <string name="permission_single_turn_on">Aktifkan</string>
+  <string name="permission_no_contacts">Untuk melihat kontak, aktifkan izin Kontak.</string>
+  <string name="add_contact_not_available">Aplikasi kontak tidak tersedia</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-is/strings.xml b/java/com/android/dialer/widget/res/values-is/strings.xml
index de7664d..97da7e2 100644
--- a/java/com/android/dialer/widget/res/values-is/strings.xml
+++ b/java/com/android/dialer/widget/res/values-is/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="custom_message_hint" msgid="2179012696339457461">"Skrifa sérsniðin skilaboð"</string>
-    <string name="toolbar_close" msgid="1081308076149879833">"Loka"</string>
-    <string name="all_contacts_empty" msgid="4260556610403994011">"Þú ert ekki með neina tengiliði enn sem komið er"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Búa til nýjan tengilið"</string>
-    <string name="permission_single_turn_on" msgid="1306416016676232584">"Kveikja"</string>
-    <string name="permission_no_contacts" msgid="2388204904477299207">"Kveiktu á tengiliðaheimildinni til að sjá tengiliðina þína."</string>
-    <string name="add_contact_not_available" msgid="3083256438899321502">"Ekkert tengiliðaforrit í boði"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="custom_message_hint">Skrifa sérsniðin skilaboð</string>
+  <string name="toolbar_close">Loka</string>
+  <string name="all_contacts_empty">Þú ert ekki með neina tengiliði enn sem komið er</string>
+  <string name="all_contacts_empty_add_contact_action">Búa til nýjan tengilið</string>
+  <string name="permission_single_turn_on">Kveikja</string>
+  <string name="permission_no_contacts">Kveiktu á tengiliðaheimildinni til að sjá tengiliðina þína.</string>
+  <string name="add_contact_not_available">Ekkert tengiliðaforrit í boði</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-it/strings.xml b/java/com/android/dialer/widget/res/values-it/strings.xml
index 36022ce..ee7748e 100644
--- a/java/com/android/dialer/widget/res/values-it/strings.xml
+++ b/java/com/android/dialer/widget/res/values-it/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="custom_message_hint" msgid="2179012696339457461">"Scrivi un messaggio personalizzato"</string>
-    <string name="toolbar_close" msgid="1081308076149879833">"Chiudi"</string>
-    <string name="all_contacts_empty" msgid="4260556610403994011">"Nessun contatto disponibile"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Crea nuovo contatto"</string>
-    <string name="permission_single_turn_on" msgid="1306416016676232584">"Attiva"</string>
-    <string name="permission_no_contacts" msgid="2388204904477299207">"Per accedere ai tuoi contatti, attiva l\'autorizzazione Contatti."</string>
-    <string name="add_contact_not_available" msgid="3083256438899321502">"Nessuna app di contatti disponibile"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="custom_message_hint">Scrivi un messaggio personalizzato</string>
+  <string name="toolbar_close">Chiudi</string>
+  <string name="all_contacts_empty">Nessun contatto disponibile</string>
+  <string name="all_contacts_empty_add_contact_action">Crea nuovo contatto</string>
+  <string name="permission_single_turn_on">Attiva</string>
+  <string name="permission_no_contacts">Per accedere ai tuoi contatti, attiva l\'autorizzazione Contatti.</string>
+  <string name="add_contact_not_available">Nessuna app di contatti disponibile</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-iw/strings.xml b/java/com/android/dialer/widget/res/values-iw/strings.xml
index 48bf219..fc8d536 100644
--- a/java/com/android/dialer/widget/res/values-iw/strings.xml
+++ b/java/com/android/dialer/widget/res/values-iw/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="custom_message_hint" msgid="2179012696339457461">"כתוב הודעה מותאמת אישית"</string>
-    <string name="toolbar_close" msgid="1081308076149879833">"סגירה"</string>
-    <string name="all_contacts_empty" msgid="4260556610403994011">"עדיין אין לך אנשי קשר"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"איש קשר חדש"</string>
-    <string name="permission_single_turn_on" msgid="1306416016676232584">"הפעלה"</string>
-    <string name="permission_no_contacts" msgid="2388204904477299207">"עליך להפעיל את ההרשאה \'אנשי קשר\' כדי להציג את אנשי הקשר שלך."</string>
-    <string name="add_contact_not_available" msgid="3083256438899321502">"אין אף אפליקציה לניהול אנשי קשר"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="custom_message_hint">כתוב הודעה מותאמת אישית</string>
+  <string name="toolbar_close">סגירה</string>
+  <string name="all_contacts_empty">עדיין אין לך אנשי קשר</string>
+  <string name="all_contacts_empty_add_contact_action">איש קשר חדש</string>
+  <string name="permission_single_turn_on">הפעלה</string>
+  <string name="permission_no_contacts">עליך להפעיל את ההרשאה \'אנשי קשר\' כדי להציג את אנשי הקשר שלך.</string>
+  <string name="add_contact_not_available">אין אף אפליקציה לניהול אנשי קשר</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-ja/strings.xml b/java/com/android/dialer/widget/res/values-ja/strings.xml
index 99eb93b..71946db 100644
--- a/java/com/android/dialer/widget/res/values-ja/strings.xml
+++ b/java/com/android/dialer/widget/res/values-ja/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="custom_message_hint" msgid="2179012696339457461">"カスタム メッセージを入力"</string>
-    <string name="toolbar_close" msgid="1081308076149879833">"閉じる"</string>
-    <string name="all_contacts_empty" msgid="4260556610403994011">"連絡先はまだありません"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"新しい連絡先を作成"</string>
-    <string name="permission_single_turn_on" msgid="1306416016676232584">"ON にする"</string>
-    <string name="permission_no_contacts" msgid="2388204904477299207">"連絡先を表示するには、連絡先へのアクセスを許可する設定を ON にしてください。"</string>
-    <string name="add_contact_not_available" msgid="3083256438899321502">"利用できる連絡先アプリがありません"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="custom_message_hint">カスタム メッセージを入力</string>
+  <string name="toolbar_close">閉じる</string>
+  <string name="all_contacts_empty">連絡先はありません</string>
+  <string name="all_contacts_empty_add_contact_action">新しい連絡先を作成</string>
+  <string name="permission_single_turn_on">ON にする</string>
+  <string name="permission_no_contacts">連絡先を表示するには、連絡先へのアクセスを許可する設定を ON にしてください。</string>
+  <string name="add_contact_not_available">利用できる連絡先アプリがありません</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-ka/strings.xml b/java/com/android/dialer/widget/res/values-ka/strings.xml
index 6645a38..89b3316 100644
--- a/java/com/android/dialer/widget/res/values-ka/strings.xml
+++ b/java/com/android/dialer/widget/res/values-ka/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="custom_message_hint" msgid="2179012696339457461">"დაწერეთ მორგებ. შეტყობინება"</string>
-    <string name="toolbar_close" msgid="1081308076149879833">"დახურვა"</string>
-    <string name="all_contacts_empty" msgid="4260556610403994011">"კონტაქტები ჯერ არ გაქვთ"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"ახალი კონტაქტის შექმნა"</string>
-    <string name="permission_single_turn_on" msgid="1306416016676232584">"ჩართვა"</string>
-    <string name="permission_no_contacts" msgid="2388204904477299207">"კონტაქტების სანახავად ჩართეთ კონტაქტების ნებართვა."</string>
-    <string name="add_contact_not_available" msgid="3083256438899321502">"კონტაქტების აპი მიუწვდომელია"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="custom_message_hint">დაწერეთ მორგებ. შეტყობინება</string>
+  <string name="toolbar_close">დახურვა</string>
+  <string name="all_contacts_empty">კონტაქტები ჯერ არ გაქვთ</string>
+  <string name="all_contacts_empty_add_contact_action">ახალი კონტაქტის შექმნა</string>
+  <string name="permission_single_turn_on">ჩართვა</string>
+  <string name="permission_no_contacts">კონტაქტების სანახავად ჩართეთ კონტაქტების ნებართვა.</string>
+  <string name="add_contact_not_available">კონტაქტების აპი მიუწვდომელია</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-kk/strings.xml b/java/com/android/dialer/widget/res/values-kk/strings.xml
index e3793ae..23095b8 100644
--- a/java/com/android/dialer/widget/res/values-kk/strings.xml
+++ b/java/com/android/dialer/widget/res/values-kk/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="custom_message_hint" msgid="2179012696339457461">"Арнаулы хабар жазу"</string>
-    <string name="toolbar_close" msgid="1081308076149879833">"Жабу"</string>
-    <string name="all_contacts_empty" msgid="4260556610403994011">"Әлі ешқандай контактілер жоқ"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Жаңа контакт қосу"</string>
-    <string name="permission_single_turn_on" msgid="1306416016676232584">"Қосу"</string>
-    <string name="permission_no_contacts" msgid="2388204904477299207">"Контактілерді көру үшін \"Контактілер\" рұқсатын қосыңыз."</string>
-    <string name="add_contact_not_available" msgid="3083256438899321502">"Контактілер қолданбасы қолжетімді емес"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="custom_message_hint">Арнаулы хабар жазу</string>
+  <string name="toolbar_close">Жабу</string>
+  <string name="all_contacts_empty">Әлі ешқандай контактілер жоқ</string>
+  <string name="all_contacts_empty_add_contact_action">Жаңа контакт қосу</string>
+  <string name="permission_single_turn_on">Қосу</string>
+  <string name="permission_no_contacts">Контактілерді көру үшін \"Контактілер\" рұқсатын қосыңыз.</string>
+  <string name="add_contact_not_available">Контактілер қолданбасы қолжетімді емес</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-km/strings.xml b/java/com/android/dialer/widget/res/values-km/strings.xml
index 6739f0d..14b69c3 100644
--- a/java/com/android/dialer/widget/res/values-km/strings.xml
+++ b/java/com/android/dialer/widget/res/values-km/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="custom_message_hint" msgid="2179012696339457461">"សរសេរ​សារ​ផ្ទាល់ខ្លួន"</string>
-    <string name="toolbar_close" msgid="1081308076149879833">"បិទ"</string>
-    <string name="all_contacts_empty" msgid="4260556610403994011">"អ្នកមិនទាន់មានទំនាក់ទំនងនៅឡើយទេ"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"បង្កើត​ទំនាក់ទំនង​ថ្មី"</string>
-    <string name="permission_single_turn_on" msgid="1306416016676232584">"បើក"</string>
-    <string name="permission_no_contacts" msgid="2388204904477299207">"ដើម្បីមើលទំនាក់ទំនងរបស់អ្នក សូមបើកការ​អនុញ្ញាតកម្មវិធីទំនាក់ទំនង។"</string>
-    <string name="add_contact_not_available" msgid="3083256438899321502">"មិនមានកម្មវិធីទំនាក់ទំនងទេ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="custom_message_hint">សរសេរ​សារ​ផ្ទាល់ខ្លួន</string>
+  <string name="toolbar_close">បិទ</string>
+  <string name="all_contacts_empty">អ្នកមិនទាន់មានទំនាក់ទំនងនៅឡើយទេ</string>
+  <string name="all_contacts_empty_add_contact_action">បង្កើត​ទំនាក់ទំនង​ថ្មី</string>
+  <string name="permission_single_turn_on">បើក</string>
+  <string name="permission_no_contacts">ដើម្បីមើលទំនាក់ទំនងរបស់អ្នក សូមបើកការ​អនុញ្ញាតកម្មវិធីទំនាក់ទំនង។</string>
+  <string name="add_contact_not_available">មិនមានកម្មវិធីទំនាក់ទំនងទេ</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-kn/strings.xml b/java/com/android/dialer/widget/res/values-kn/strings.xml
index 45f879a..a048773 100644
--- a/java/com/android/dialer/widget/res/values-kn/strings.xml
+++ b/java/com/android/dialer/widget/res/values-kn/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="custom_message_hint" msgid="2179012696339457461">"ಕಸ್ಟಮ್ ಸಂದೇಶವನ್ನು ಬರೆಯಿರಿ"</string>
-    <string name="toolbar_close" msgid="1081308076149879833">"ಮುಚ್ಚಿ"</string>
-    <string name="all_contacts_empty" msgid="4260556610403994011">"ನಿಮ್ಮ ಬಳಿ ಇನ್ನೂ ಯಾವುದೇ ಸಂಪರ್ಕಗಳಿಲ್ಲ"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"ಹೊಸ ಸಂಪರ್ಕ ರಚಿಸಿ"</string>
-    <string name="permission_single_turn_on" msgid="1306416016676232584">"ಆನ್ ಮಾಡಿ"</string>
-    <string name="permission_no_contacts" msgid="2388204904477299207">"ನಿಮ್ಮ ಸಂಪರ್ಕಗಳನ್ನು ವೀಕ್ಷಿಸಲು, ಸಂಪರ್ಕಗಳ ಅನುಮತಿಯನ್ನು ಆನ್ ಮಾಡಿ."</string>
-    <string name="add_contact_not_available" msgid="3083256438899321502">"ಯಾವುದೇ ಸಂಪರ್ಕಗಳ ಅಪ್ಲಿಕೇಶನ್‌ ಲಭ್ಯವಿಲ್ಲ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="custom_message_hint">ಕಸ್ಟಮ್ ಸಂದೇಶವನ್ನು ಬರೆಯಿರಿ</string>
+  <string name="toolbar_close">ಮುಚ್ಚಿ</string>
+  <string name="all_contacts_empty">ನಿಮ್ಮ ಬಳಿ ಇನ್ನೂ ಯಾವುದೇ ಸಂಪರ್ಕಗಳಿಲ್ಲ</string>
+  <string name="all_contacts_empty_add_contact_action">ಹೊಸ ಸಂಪರ್ಕ ರಚಿಸಿ</string>
+  <string name="permission_single_turn_on">ಆನ್ ಮಾಡಿ</string>
+  <string name="permission_no_contacts">ನಿಮ್ಮ ಸಂಪರ್ಕಗಳನ್ನು ವೀಕ್ಷಿಸಲು, ಸಂಪರ್ಕಗಳ ಅನುಮತಿಯನ್ನು ಆನ್ ಮಾಡಿ.</string>
+  <string name="add_contact_not_available">ಯಾವುದೇ ಸಂಪರ್ಕಗಳ ಅಪ್ಲಿಕೇಶನ್‌ ಲಭ್ಯವಿಲ್ಲ</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-ko/strings.xml b/java/com/android/dialer/widget/res/values-ko/strings.xml
index 0827d36..e53f684 100644
--- a/java/com/android/dialer/widget/res/values-ko/strings.xml
+++ b/java/com/android/dialer/widget/res/values-ko/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="custom_message_hint" msgid="2179012696339457461">"맞춤 메시지를 작성하세요."</string>
-    <string name="toolbar_close" msgid="1081308076149879833">"닫기"</string>
-    <string name="all_contacts_empty" msgid="4260556610403994011">"아직 연락처가 없습니다."</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"새 연락처 만들기"</string>
-    <string name="permission_single_turn_on" msgid="1306416016676232584">"사용"</string>
-    <string name="permission_no_contacts" msgid="2388204904477299207">"연락처를 보려면 연락처에 액세스할 권한을 부여하세요."</string>
-    <string name="add_contact_not_available" msgid="3083256438899321502">"사용할 수 있는 연락처 앱이 없습니다."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="custom_message_hint">맞춤 메시지를 작성하세요.</string>
+  <string name="toolbar_close">닫기</string>
+  <string name="all_contacts_empty">아직 연락처가 없습니다.</string>
+  <string name="all_contacts_empty_add_contact_action">새 연락처 만들기</string>
+  <string name="permission_single_turn_on">사용</string>
+  <string name="permission_no_contacts">연락처를 보려면 연락처에 액세스할 권한을 부여하세요.</string>
+  <string name="add_contact_not_available">사용할 수 있는 연락처 앱이 없습니다.</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-ky/strings.xml b/java/com/android/dialer/widget/res/values-ky/strings.xml
index 3413b57..2e52fb5 100644
--- a/java/com/android/dialer/widget/res/values-ky/strings.xml
+++ b/java/com/android/dialer/widget/res/values-ky/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="custom_message_hint" msgid="2179012696339457461">"Башка билдирүүнү жазыңыз"</string>
-    <string name="toolbar_close" msgid="1081308076149879833">"Жабуу"</string>
-    <string name="all_contacts_empty" msgid="4260556610403994011">"Азырынча эч байланышыңыз жок"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Жаңы байланыш түзүү"</string>
-    <string name="permission_single_turn_on" msgid="1306416016676232584">"Күйгүзүү"</string>
-    <string name="permission_no_contacts" msgid="2388204904477299207">"Байланыштарыңызды көрүү үчүн, \"Байланыштар\" уруксатын күйгүзүңүз."</string>
-    <string name="add_contact_not_available" msgid="3083256438899321502">"Жеткиликтүү байланыштар колдонмосу жок"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="custom_message_hint">Башка билдирүүнү жазыңыз</string>
+  <string name="toolbar_close">Жабуу</string>
+  <string name="all_contacts_empty">Азырынча эч байланышыңыз жок</string>
+  <string name="all_contacts_empty_add_contact_action">Жаңы байланыш түзүү</string>
+  <string name="permission_single_turn_on">Күйгүзүү</string>
+  <string name="permission_no_contacts">Байланыштарыңызды көрүү үчүн, \"Байланыштар\" уруксатын күйгүзүңүз.</string>
+  <string name="add_contact_not_available">Жеткиликтүү байланыштар колдонмосу жок</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-lo/strings.xml b/java/com/android/dialer/widget/res/values-lo/strings.xml
index 8b7e476..03fc321 100644
--- a/java/com/android/dialer/widget/res/values-lo/strings.xml
+++ b/java/com/android/dialer/widget/res/values-lo/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="custom_message_hint" msgid="2179012696339457461">"ຂຽນຂໍ້ຄວາມດ້ວຍຕົນເອງ"</string>
-    <string name="toolbar_close" msgid="1081308076149879833">"ປິດ"</string>
-    <string name="all_contacts_empty" msgid="4260556610403994011">"ທ່ານຍັງບໍ່ມີລາຍຊື່ຜູ້ຕິດຕໍ່ເທື່ອ"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"ສ້າງລາຍຊື່ຜູ້ຕິດຕໍ່ໃໝ່"</string>
-    <string name="permission_single_turn_on" msgid="1306416016676232584">"ເປີດໃຊ້"</string>
-    <string name="permission_no_contacts" msgid="2388204904477299207">"ເພື່ອເບິ່ງລາຍຊື່ຜູ້ຕິດຕໍ່ຂອງທ່ານ, ໃຫ້ເປີດການອະນຸຍາດລາຍຊື່ຜູ້ຕິດຕໍ່ກ່ອນ"</string>
-    <string name="add_contact_not_available" msgid="3083256438899321502">"ບໍ່ມີແອັບລາຍຊື່ຜູ້ຕິດຕໍ່ທີ່ສາມາດໃຊ້ໄດ້"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="custom_message_hint">ຂຽນຂໍ້ຄວາມດ້ວຍຕົນເອງ</string>
+  <string name="toolbar_close">ປິດ</string>
+  <string name="all_contacts_empty">ທ່ານຍັງບໍ່ມີລາຍຊື່ຜູ້ຕິດຕໍ່ເທື່ອ</string>
+  <string name="all_contacts_empty_add_contact_action">ສ້າງລາຍຊື່ຜູ້ຕິດຕໍ່ໃໝ່</string>
+  <string name="permission_single_turn_on">ເປີດໃຊ້</string>
+  <string name="permission_no_contacts">ເພື່ອເບິ່ງລາຍຊື່ຜູ້ຕິດຕໍ່ຂອງທ່ານ, ໃຫ້ເປີດການອະນຸຍາດລາຍຊື່ຜູ້ຕິດຕໍ່ກ່ອນ</string>
+  <string name="add_contact_not_available">ບໍ່ມີແອັບລາຍຊື່ຜູ້ຕິດຕໍ່ທີ່ສາມາດໃຊ້ໄດ້</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-lt/strings.xml b/java/com/android/dialer/widget/res/values-lt/strings.xml
index 30cc0ad..d5b9973 100644
--- a/java/com/android/dialer/widget/res/values-lt/strings.xml
+++ b/java/com/android/dialer/widget/res/values-lt/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="custom_message_hint" msgid="2179012696339457461">"Parašykite tinkintą praneš."</string>
-    <string name="toolbar_close" msgid="1081308076149879833">"Uždaryti"</string>
-    <string name="all_contacts_empty" msgid="4260556610403994011">"Dar neturite jokių kontaktų"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Sukurti naują kontaktą"</string>
-    <string name="permission_single_turn_on" msgid="1306416016676232584">"Įjungti"</string>
-    <string name="permission_no_contacts" msgid="2388204904477299207">"Jei norite peržiūrėti kontaktus, įjunkite Kontaktų leidimą."</string>
-    <string name="add_contact_not_available" msgid="3083256438899321502">"Nepasiekiama jokia kontaktų programa"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="custom_message_hint">Parašykite tinkintą praneš.</string>
+  <string name="toolbar_close">Uždaryti</string>
+  <string name="all_contacts_empty">Dar neturite jokių kontaktų</string>
+  <string name="all_contacts_empty_add_contact_action">Sukurti naują kontaktą</string>
+  <string name="permission_single_turn_on">Įjungti</string>
+  <string name="permission_no_contacts">Jei norite peržiūrėti kontaktus, įjunkite Kontaktų leidimą.</string>
+  <string name="add_contact_not_available">Nepasiekiama jokia kontaktų programa</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-lv/strings.xml b/java/com/android/dialer/widget/res/values-lv/strings.xml
index 6245835..bc76944 100644
--- a/java/com/android/dialer/widget/res/values-lv/strings.xml
+++ b/java/com/android/dialer/widget/res/values-lv/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="custom_message_hint" msgid="2179012696339457461">"Rakstīt pielāgotu ziņojumu"</string>
-    <string name="toolbar_close" msgid="1081308076149879833">"Aizvērt"</string>
-    <string name="all_contacts_empty" msgid="4260556610403994011">"Jums vēl nav nevienas kontaktpersonas."</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Izveidot jaunu kontaktpersonu"</string>
-    <string name="permission_single_turn_on" msgid="1306416016676232584">"Ieslēgt"</string>
-    <string name="permission_no_contacts" msgid="2388204904477299207">"Lai skatītu savas kontaktpersonas, ieslēdziet atļauju Kontaktpersonas."</string>
-    <string name="add_contact_not_available" msgid="3083256438899321502">"Nav pieejama neviena kontaktpersonu lietotne."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="custom_message_hint">Rakstīt pielāgotu ziņojumu</string>
+  <string name="toolbar_close">Aizvērt</string>
+  <string name="all_contacts_empty">Jums vēl nav nevienas kontaktpersonas.</string>
+  <string name="all_contacts_empty_add_contact_action">Izveidot jaunu kontaktpersonu</string>
+  <string name="permission_single_turn_on">Ieslēgt</string>
+  <string name="permission_no_contacts">Lai skatītu savas kontaktpersonas, ieslēdziet atļauju Kontaktpersonas.</string>
+  <string name="add_contact_not_available">Nav pieejama neviena kontaktpersonu lietotne.</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-mk/strings.xml b/java/com/android/dialer/widget/res/values-mk/strings.xml
index 108cf7a..a91db72 100644
--- a/java/com/android/dialer/widget/res/values-mk/strings.xml
+++ b/java/com/android/dialer/widget/res/values-mk/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="custom_message_hint" msgid="2179012696339457461">"Напиши приспособена порака"</string>
-    <string name="toolbar_close" msgid="1081308076149879833">"Затвори"</string>
-    <string name="all_contacts_empty" msgid="4260556610403994011">"Сè уште немате контакти"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Создајте нов контакт"</string>
-    <string name="permission_single_turn_on" msgid="1306416016676232584">"Вклучи"</string>
-    <string name="permission_no_contacts" msgid="2388204904477299207">"За да ги видите контактите, вклучете ја дозволата за контакти."</string>
-    <string name="add_contact_not_available" msgid="3083256438899321502">"Нема достапна апликација за контакти"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="custom_message_hint">Напиши приспособена порака</string>
+  <string name="toolbar_close">Затвори</string>
+  <string name="all_contacts_empty">Сè уште немате контакти</string>
+  <string name="all_contacts_empty_add_contact_action">Создајте нов контакт</string>
+  <string name="permission_single_turn_on">Вклучи</string>
+  <string name="permission_no_contacts">За да ги видите контактите, вклучете ја дозволата за контакти.</string>
+  <string name="add_contact_not_available">Нема достапна апликација за контакти</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-ml/strings.xml b/java/com/android/dialer/widget/res/values-ml/strings.xml
index 1cbb3f4..2f4ef1e 100644
--- a/java/com/android/dialer/widget/res/values-ml/strings.xml
+++ b/java/com/android/dialer/widget/res/values-ml/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="custom_message_hint" msgid="2179012696339457461">"ഒരു ഇ‌ഷ്‌ടാനുസൃത സന്ദേശം രചിക്കൂ"</string>
-    <string name="toolbar_close" msgid="1081308076149879833">"അടയ്‌ക്കുക"</string>
-    <string name="all_contacts_empty" msgid="4260556610403994011">"നിങ്ങൾക്ക് ഇതുവരെയും കോൺടാക്റ്റുകൾ ഒന്നുമില്ല."</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"പുതിയ കോൺടാക്‌റ്റ് സൃഷ്‌ടിക്കൂ"</string>
-    <string name="permission_single_turn_on" msgid="1306416016676232584">"ഓൺ ചെയ്യുക"</string>
-    <string name="permission_no_contacts" msgid="2388204904477299207">"നിങ്ങളുടെ കോൺടാക്റ്റുകൾ കാണുന്നതിന്, \'കോൺടാക്റ്റുകൾ\' അനുമതി ഓണാക്കുക."</string>
-    <string name="add_contact_not_available" msgid="3083256438899321502">"കോൺടാക്റ്റ് അപ്ലിക്കേഷനൊന്നും ലഭ്യമല്ല"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="custom_message_hint">ഒരു ഇ‌ഷ്‌ടാനുസൃത സന്ദേശം രചിക്കൂ</string>
+  <string name="toolbar_close">അടയ്‌ക്കുക</string>
+  <string name="all_contacts_empty">നിങ്ങൾക്ക് ഇതുവരെയും കോൺടാക്റ്റുകൾ ഒന്നുമില്ല.</string>
+  <string name="all_contacts_empty_add_contact_action">പുതിയ കോൺടാക്‌റ്റ് സൃഷ്‌ടിക്കൂ</string>
+  <string name="permission_single_turn_on">ഓൺ ചെയ്യുക</string>
+  <string name="permission_no_contacts">നിങ്ങളുടെ കോൺടാക്റ്റുകൾ കാണുന്നതിന്, \'കോൺടാക്റ്റുകൾ\' അനുമതി ഓണാക്കുക.</string>
+  <string name="add_contact_not_available">കോൺടാക്റ്റ് അപ്ലിക്കേഷനൊന്നും ലഭ്യമല്ല</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-mn/strings.xml b/java/com/android/dialer/widget/res/values-mn/strings.xml
index e5f5c21..3790a66 100644
--- a/java/com/android/dialer/widget/res/values-mn/strings.xml
+++ b/java/com/android/dialer/widget/res/values-mn/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="custom_message_hint" msgid="2179012696339457461">"Тусгай зурвас бичих"</string>
-    <string name="toolbar_close" msgid="1081308076149879833">"Хаах"</string>
-    <string name="all_contacts_empty" msgid="4260556610403994011">"Танд одоогоор харилцагч байхгүй байна"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Шинэ харилцагч үүсгэх"</string>
-    <string name="permission_single_turn_on" msgid="1306416016676232584">"Асаах"</string>
-    <string name="permission_no_contacts" msgid="2388204904477299207">"Харилцагчдаа харахын тулд Харилцагчдын зөвшөөрлийг идэвхжүүлнэ үү."</string>
-    <string name="add_contact_not_available" msgid="3083256438899321502">"Ямар ч харилцагчдын апликейшн байхгүй байна"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="custom_message_hint">Тусгай зурвас бичих</string>
+  <string name="toolbar_close">Хаах</string>
+  <string name="all_contacts_empty">Танд одоогоор харилцагч байхгүй байна</string>
+  <string name="all_contacts_empty_add_contact_action">Шинэ харилцагч үүсгэх</string>
+  <string name="permission_single_turn_on">Асаах</string>
+  <string name="permission_no_contacts">Харилцагчдаа харахын тулд Харилцагчдын зөвшөөрлийг идэвхжүүлнэ үү.</string>
+  <string name="add_contact_not_available">Ямар ч харилцагчдын апликейшн байхгүй байна</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-mr/strings.xml b/java/com/android/dialer/widget/res/values-mr/strings.xml
index 63239d2..666ebf5 100644
--- a/java/com/android/dialer/widget/res/values-mr/strings.xml
+++ b/java/com/android/dialer/widget/res/values-mr/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="custom_message_hint" msgid="2179012696339457461">"एक सानुकूल संदेश लिहा"</string>
-    <string name="toolbar_close" msgid="1081308076149879833">"बंद करा"</string>
-    <string name="all_contacts_empty" msgid="4260556610403994011">"आपल्‍याकडे अद्याप कोणतेही संपर्क नाहीत"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"नवीन संपर्क तयार करा"</string>
-    <string name="permission_single_turn_on" msgid="1306416016676232584">"चालू करा"</string>
-    <string name="permission_no_contacts" msgid="2388204904477299207">"आपले संपर्क पाहण्‍यासाठी, संपर्क परवानगी चालू करा."</string>
-    <string name="add_contact_not_available" msgid="3083256438899321502">"कोणताही संपर्क अॅप उपलब्ध नाही"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="custom_message_hint">एक सानुकूल मेसेज लिहा</string>
+  <string name="toolbar_close">बंद करा</string>
+  <string name="all_contacts_empty">आपल्‍याकडे अद्याप कोणतेही संपर्क नाहीत</string>
+  <string name="all_contacts_empty_add_contact_action">नवीन संपर्क तयार करा</string>
+  <string name="permission_single_turn_on">चालू करा</string>
+  <string name="permission_no_contacts">आपले संपर्क पाहण्‍यासाठी, संपर्क परवानगी चालू करा.</string>
+  <string name="add_contact_not_available">कोणताही संपर्क अॅप उपलब्ध नाही</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-ms/strings.xml b/java/com/android/dialer/widget/res/values-ms/strings.xml
index cf61fc1..030f217 100644
--- a/java/com/android/dialer/widget/res/values-ms/strings.xml
+++ b/java/com/android/dialer/widget/res/values-ms/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="custom_message_hint" msgid="2179012696339457461">"Tulis mesej tersuai"</string>
-    <string name="toolbar_close" msgid="1081308076149879833">"Tutup"</string>
-    <string name="all_contacts_empty" msgid="4260556610403994011">"Anda belum mempunyai sebarang kenalan"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Buat kenalan baharu"</string>
-    <string name="permission_single_turn_on" msgid="1306416016676232584">"Hidupkan"</string>
-    <string name="permission_no_contacts" msgid="2388204904477299207">"Untuk melihat kenalan anda, hidupkan kebenaran Kenalan."</string>
-    <string name="add_contact_not_available" msgid="3083256438899321502">"Tiada apl kenalan yang tersedia"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="custom_message_hint">Tulis mesej tersuai</string>
+  <string name="toolbar_close">Tutup</string>
+  <string name="all_contacts_empty">Anda belum mempunyai sebarang kenalan</string>
+  <string name="all_contacts_empty_add_contact_action">Buat kenalan baharu</string>
+  <string name="permission_single_turn_on">Hidupkan</string>
+  <string name="permission_no_contacts">Untuk melihat kenalan anda, hidupkan kebenaran Kenalan.</string>
+  <string name="add_contact_not_available">Tiada apl kenalan yang tersedia</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-my/strings.xml b/java/com/android/dialer/widget/res/values-my/strings.xml
index 5d3d9eb..1a3fdda 100644
--- a/java/com/android/dialer/widget/res/values-my/strings.xml
+++ b/java/com/android/dialer/widget/res/values-my/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="custom_message_hint" msgid="2179012696339457461">"စိတ်ကြိုက် မက်ဆေ့ဂျ်တစ်ခု ရေးပါ"</string>
-    <string name="toolbar_close" msgid="1081308076149879833">"ပိတ်ရန်"</string>
-    <string name="all_contacts_empty" msgid="4260556610403994011">"သင့်တွင် မည်သည့်အဆက်အသွယ်မျှ မရှိသေးပါ"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"အဆက်အသွယ်အသစ် ပြုလုပ်ရန်"</string>
-    <string name="permission_single_turn_on" msgid="1306416016676232584">"ဖွင့်ရန်"</string>
-    <string name="permission_no_contacts" msgid="2388204904477299207">"အဆက်အသွယ်များကိုကြည့်ရန်၊ အဆက်အသွယ်ခွင့်ပြုချက်ကို ဖွင့်ပါ။"</string>
-    <string name="add_contact_not_available" msgid="3083256438899321502">"အဆက်အသွယ်များ app မရှိပါ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="custom_message_hint">စိတ်ကြိုက် မက်ဆေ့ဂျ်တစ်ခု ရေးပါ</string>
+  <string name="toolbar_close">ပိတ်ရန်</string>
+  <string name="all_contacts_empty">သင့်တွင် မည်သည့်အဆက်အသွယ်မျှ မရှိသေးပါ</string>
+  <string name="all_contacts_empty_add_contact_action">အဆက်အသွယ်အသစ် ပြုလုပ်ရန်</string>
+  <string name="permission_single_turn_on">ဖွင့်ရန်</string>
+  <string name="permission_no_contacts">အဆက်အသွယ်များကိုကြည့်ရန်၊ အဆက်အသွယ်ခွင့်ပြုချက်ကို ဖွင့်ပါ။</string>
+  <string name="add_contact_not_available">အဆက်အသွယ်များ app မရှိပါ</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-nb/strings.xml b/java/com/android/dialer/widget/res/values-nb/strings.xml
index 6665efe..5e69491 100644
--- a/java/com/android/dialer/widget/res/values-nb/strings.xml
+++ b/java/com/android/dialer/widget/res/values-nb/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="custom_message_hint" msgid="2179012696339457461">"Skriv egendefinert melding"</string>
-    <string name="toolbar_close" msgid="1081308076149879833">"Lukk"</string>
-    <string name="all_contacts_empty" msgid="4260556610403994011">"Du har ingen kontakter ennå"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Opprett en ny kontakt"</string>
-    <string name="permission_single_turn_on" msgid="1306416016676232584">"Slå på"</string>
-    <string name="permission_no_contacts" msgid="2388204904477299207">"For å se kontaktene dine må du slå på Kontakter-tillatelsen."</string>
-    <string name="add_contact_not_available" msgid="3083256438899321502">"Ingen kontaktapper er tilgjengelige"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="custom_message_hint">Skriv egendefinert melding</string>
+  <string name="toolbar_close">Lukk</string>
+  <string name="all_contacts_empty">Du har ingen kontakter ennå</string>
+  <string name="all_contacts_empty_add_contact_action">Opprett en ny kontakt</string>
+  <string name="permission_single_turn_on">Slå på</string>
+  <string name="permission_no_contacts">For å se kontaktene dine må du slå på Kontakter-tillatelsen.</string>
+  <string name="add_contact_not_available">Ingen kontaktapper er tilgjengelige</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-ne/strings.xml b/java/com/android/dialer/widget/res/values-ne/strings.xml
index e1f6e95..fed75cb 100644
--- a/java/com/android/dialer/widget/res/values-ne/strings.xml
+++ b/java/com/android/dialer/widget/res/values-ne/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="custom_message_hint" msgid="2179012696339457461">"आफू अनुकूल सन्देश लेख्‍ने"</string>
-    <string name="toolbar_close" msgid="1081308076149879833">"बन्द गर्नुहोस्"</string>
-    <string name="all_contacts_empty" msgid="4260556610403994011">"अहिलेसम्म तपाईंसँग कुनै सम्पर्कहरू छैनन्"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"नयाँ सम्पर्क सिर्जना गर्नुहोस्"</string>
-    <string name="permission_single_turn_on" msgid="1306416016676232584">"सक्रिय गर्नुहोस्"</string>
-    <string name="permission_no_contacts" msgid="2388204904477299207">"आफ्ना सम्पर्कहरू हेर्न सम्पर्क सम्बन्धी अनुमतिलाई सक्रिय गर्नुहोस्।"</string>
-    <string name="add_contact_not_available" msgid="3083256438899321502">"सम्पर्क सम्बन्धी कुनै अनुप्रयोग उपलब्ध छैन"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="custom_message_hint">आफू अनुकूल सन्देश लेख्‍ने</string>
+  <string name="toolbar_close">बन्द गर्नुहोस्</string>
+  <string name="all_contacts_empty">अहिलेसम्म तपाईंसँग कुनै सम्पर्कहरू छैनन्</string>
+  <string name="all_contacts_empty_add_contact_action">नयाँ सम्पर्क सिर्जना गर्नुहोस्</string>
+  <string name="permission_single_turn_on">सक्रिय गर्नुहोस्</string>
+  <string name="permission_no_contacts">आफ्ना सम्पर्कहरू हेर्न सम्पर्क सम्बन्धी अनुमतिलाई सक्रिय गर्नुहोस्।</string>
+  <string name="add_contact_not_available">सम्पर्क सम्बन्धी कुनै अनुप्रयोग उपलब्ध छैन</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-nl/strings.xml b/java/com/android/dialer/widget/res/values-nl/strings.xml
index 036be47..0b59a5a 100644
--- a/java/com/android/dialer/widget/res/values-nl/strings.xml
+++ b/java/com/android/dialer/widget/res/values-nl/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="custom_message_hint" msgid="2179012696339457461">"Schrijf zelf een bericht"</string>
-    <string name="toolbar_close" msgid="1081308076149879833">"Sluiten"</string>
-    <string name="all_contacts_empty" msgid="4260556610403994011">"Je hebt nog geen contacten"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Nieuw contact maken"</string>
-    <string name="permission_single_turn_on" msgid="1306416016676232584">"Inschakelen"</string>
-    <string name="permission_no_contacts" msgid="2388204904477299207">"Als je je contacten wilt bekijken, schakel je de machtiging voor Contacten in."</string>
-    <string name="add_contact_not_available" msgid="3083256438899321502">"Geen app voor contacten beschikbaar"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="custom_message_hint">Schrijf zelf een bericht</string>
+  <string name="toolbar_close">Sluiten</string>
+  <string name="all_contacts_empty">Je hebt nog geen contacten</string>
+  <string name="all_contacts_empty_add_contact_action">Nieuw contact maken</string>
+  <string name="permission_single_turn_on">Inschakelen</string>
+  <string name="permission_no_contacts">Als je je contacten wilt bekijken, schakel je de machtiging voor Contacten in.</string>
+  <string name="add_contact_not_available">Geen app voor contacten beschikbaar</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-no/strings.xml b/java/com/android/dialer/widget/res/values-no/strings.xml
index 6665efe..5e69491 100644
--- a/java/com/android/dialer/widget/res/values-no/strings.xml
+++ b/java/com/android/dialer/widget/res/values-no/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="custom_message_hint" msgid="2179012696339457461">"Skriv egendefinert melding"</string>
-    <string name="toolbar_close" msgid="1081308076149879833">"Lukk"</string>
-    <string name="all_contacts_empty" msgid="4260556610403994011">"Du har ingen kontakter ennå"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Opprett en ny kontakt"</string>
-    <string name="permission_single_turn_on" msgid="1306416016676232584">"Slå på"</string>
-    <string name="permission_no_contacts" msgid="2388204904477299207">"For å se kontaktene dine må du slå på Kontakter-tillatelsen."</string>
-    <string name="add_contact_not_available" msgid="3083256438899321502">"Ingen kontaktapper er tilgjengelige"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="custom_message_hint">Skriv egendefinert melding</string>
+  <string name="toolbar_close">Lukk</string>
+  <string name="all_contacts_empty">Du har ingen kontakter ennå</string>
+  <string name="all_contacts_empty_add_contact_action">Opprett en ny kontakt</string>
+  <string name="permission_single_turn_on">Slå på</string>
+  <string name="permission_no_contacts">For å se kontaktene dine må du slå på Kontakter-tillatelsen.</string>
+  <string name="add_contact_not_available">Ingen kontaktapper er tilgjengelige</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-pa/strings.xml b/java/com/android/dialer/widget/res/values-pa/strings.xml
index c0326d7..9393f10 100644
--- a/java/com/android/dialer/widget/res/values-pa/strings.xml
+++ b/java/com/android/dialer/widget/res/values-pa/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="custom_message_hint" msgid="2179012696339457461">"ਵਿਸ਼ੇਸ਼-ਵਿਉਂਤਬੱਧ ਸੰਦੇਸ਼ ਲਿਖੋ"</string>
-    <string name="toolbar_close" msgid="1081308076149879833">"ਬੰਦ ਕਰੋ"</string>
-    <string name="all_contacts_empty" msgid="4260556610403994011">"ਤੁਹਾਡੇ ਕੋਲ ਹਾਲੇ ਕੋਈ ਸੰਪਰਕ ਨਹੀਂ ਹਨ"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"ਨਵਾਂ ਸੰਪਰਕ ਬਣਾਓ"</string>
-    <string name="permission_single_turn_on" msgid="1306416016676232584">"ਚਾਲੂ ਕਰੋ"</string>
-    <string name="permission_no_contacts" msgid="2388204904477299207">"ਆਪਣੇ ਸੰਪਰਕਾਂ ਨੂੰ  ਦੇਖਣ  ਲਈ, ਸੰਪਰਕ ਇਜਾਜ਼ਤ ਚਾਲੂ ਕਰੋ।"</string>
-    <string name="add_contact_not_available" msgid="3083256438899321502">"ਕੋਈ ਸੰਪਰਕ ਐਪ ਉਪਲਬਧ ਨਹੀਂ ਹੈ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="custom_message_hint">ਵਿਸ਼ੇਸ਼-ਵਿਉਂਤਬੱਧ ਸੰਦੇਸ਼ ਲਿਖੋ</string>
+  <string name="toolbar_close">ਬੰਦ ਕਰੋ</string>
+  <string name="all_contacts_empty">ਤੁਹਾਡੇ ਕੋਲ ਹਾਲੇ ਕੋਈ ਸੰਪਰਕ ਨਹੀਂ ਹਨ</string>
+  <string name="all_contacts_empty_add_contact_action">ਨਵਾਂ ਸੰਪਰਕ ਬਣਾਓ</string>
+  <string name="permission_single_turn_on">ਚਾਲੂ ਕਰੋ</string>
+  <string name="permission_no_contacts">ਆਪਣੇ ਸੰਪਰਕਾਂ ਨੂੰ  ਦੇਖਣ  ਲਈ, ਸੰਪਰਕ ਇਜਾਜ਼ਤ ਚਾਲੂ ਕਰੋ।</string>
+  <string name="add_contact_not_available">ਕੋਈ ਸੰਪਰਕ ਐਪ ਉਪਲਬਧ ਨਹੀਂ ਹੈ</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-pl/strings.xml b/java/com/android/dialer/widget/res/values-pl/strings.xml
index 3f0668c..8dd7ffd 100644
--- a/java/com/android/dialer/widget/res/values-pl/strings.xml
+++ b/java/com/android/dialer/widget/res/values-pl/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="custom_message_hint" msgid="2179012696339457461">"Wpisz wiadomość"</string>
-    <string name="toolbar_close" msgid="1081308076149879833">"Zamknij"</string>
-    <string name="all_contacts_empty" msgid="4260556610403994011">"Nie masz jeszcze żadnych kontaktów"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Utwórz nowy kontakt"</string>
-    <string name="permission_single_turn_on" msgid="1306416016676232584">"Włącz"</string>
-    <string name="permission_no_contacts" msgid="2388204904477299207">"Aby zobaczyć swoje kontakty, włącz uprawnienia Kontakty."</string>
-    <string name="add_contact_not_available" msgid="3083256438899321502">"Nie jest dostępna żadna aplikacja do obsługi kontaktów"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="custom_message_hint">Wpisz wiadomość</string>
+  <string name="toolbar_close">Zamknij</string>
+  <string name="all_contacts_empty">Nie masz jeszcze żadnych kontaktów</string>
+  <string name="all_contacts_empty_add_contact_action">Utwórz nowy kontakt</string>
+  <string name="permission_single_turn_on">Włącz</string>
+  <string name="permission_no_contacts">Aby zobaczyć swoje kontakty, włącz uprawnienia Kontakty.</string>
+  <string name="add_contact_not_available">Nie jest dostępna żadna aplikacja do obsługi kontaktów</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-pt-rBR/strings.xml b/java/com/android/dialer/widget/res/values-pt-rBR/strings.xml
index a6371a7..658561d 100644
--- a/java/com/android/dialer/widget/res/values-pt-rBR/strings.xml
+++ b/java/com/android/dialer/widget/res/values-pt-rBR/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="custom_message_hint" msgid="2179012696339457461">"Escreva sua mensagem"</string>
-    <string name="toolbar_close" msgid="1081308076149879833">"Fechar"</string>
-    <string name="all_contacts_empty" msgid="4260556610403994011">"Você ainda não tem contatos"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Criar novo contato"</string>
-    <string name="permission_single_turn_on" msgid="1306416016676232584">"Ativar"</string>
-    <string name="permission_no_contacts" msgid="2388204904477299207">"Para ver seus contatos, ative a permissão para o app Contatos."</string>
-    <string name="add_contact_not_available" msgid="3083256438899321502">"Nenhum app de contatos disponível"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="custom_message_hint">Escreva sua mensagem</string>
+  <string name="toolbar_close">Fechar</string>
+  <string name="all_contacts_empty">Você ainda não tem contatos</string>
+  <string name="all_contacts_empty_add_contact_action">Criar novo contato</string>
+  <string name="permission_single_turn_on">Ativar</string>
+  <string name="permission_no_contacts">Para ver seus contatos, ative a permissão para o app Contatos.</string>
+  <string name="add_contact_not_available">Nenhum app de contatos disponível</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-pt-rPT/strings.xml b/java/com/android/dialer/widget/res/values-pt-rPT/strings.xml
index fa206fb..fc86515 100644
--- a/java/com/android/dialer/widget/res/values-pt-rPT/strings.xml
+++ b/java/com/android/dialer/widget/res/values-pt-rPT/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="custom_message_hint" msgid="2179012696339457461">"Escreva uma mensagem"</string>
-    <string name="toolbar_close" msgid="1081308076149879833">"Fechar"</string>
-    <string name="all_contacts_empty" msgid="4260556610403994011">"Ainda não tem nenhum contacto"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Criar novo contacto"</string>
-    <string name="permission_single_turn_on" msgid="1306416016676232584">"Ativar"</string>
-    <string name="permission_no_contacts" msgid="2388204904477299207">"Para ver os seus contactos, ative a autorização Contactos."</string>
-    <string name="add_contact_not_available" msgid="3083256438899321502">"Não existe nenhuma aplicação de contactos disponível"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="custom_message_hint">Escreva uma mensagem</string>
+  <string name="toolbar_close">Fechar</string>
+  <string name="all_contacts_empty">Ainda não tem nenhum contacto</string>
+  <string name="all_contacts_empty_add_contact_action">Criar novo contacto</string>
+  <string name="permission_single_turn_on">Ativar</string>
+  <string name="permission_no_contacts">Para ver os seus contactos, ative a autorização Contactos.</string>
+  <string name="add_contact_not_available">Não existe nenhuma aplicação de contactos disponível</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-pt/strings.xml b/java/com/android/dialer/widget/res/values-pt/strings.xml
index a6371a7..658561d 100644
--- a/java/com/android/dialer/widget/res/values-pt/strings.xml
+++ b/java/com/android/dialer/widget/res/values-pt/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="custom_message_hint" msgid="2179012696339457461">"Escreva sua mensagem"</string>
-    <string name="toolbar_close" msgid="1081308076149879833">"Fechar"</string>
-    <string name="all_contacts_empty" msgid="4260556610403994011">"Você ainda não tem contatos"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Criar novo contato"</string>
-    <string name="permission_single_turn_on" msgid="1306416016676232584">"Ativar"</string>
-    <string name="permission_no_contacts" msgid="2388204904477299207">"Para ver seus contatos, ative a permissão para o app Contatos."</string>
-    <string name="add_contact_not_available" msgid="3083256438899321502">"Nenhum app de contatos disponível"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="custom_message_hint">Escreva sua mensagem</string>
+  <string name="toolbar_close">Fechar</string>
+  <string name="all_contacts_empty">Você ainda não tem contatos</string>
+  <string name="all_contacts_empty_add_contact_action">Criar novo contato</string>
+  <string name="permission_single_turn_on">Ativar</string>
+  <string name="permission_no_contacts">Para ver seus contatos, ative a permissão para o app Contatos.</string>
+  <string name="add_contact_not_available">Nenhum app de contatos disponível</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-ro/strings.xml b/java/com/android/dialer/widget/res/values-ro/strings.xml
index bc15805..b6fd007 100644
--- a/java/com/android/dialer/widget/res/values-ro/strings.xml
+++ b/java/com/android/dialer/widget/res/values-ro/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="custom_message_hint" msgid="2179012696339457461">"Scrieți mesaj personalizat"</string>
-    <string name="toolbar_close" msgid="1081308076149879833">"Închideți"</string>
-    <string name="all_contacts_empty" msgid="4260556610403994011">"Nu aveți încă persoane de contact."</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Creați o intrare nouă"</string>
-    <string name="permission_single_turn_on" msgid="1306416016676232584">"Activați"</string>
-    <string name="permission_no_contacts" msgid="2388204904477299207">"Pentru a vedea persoanele de contact, activați permisiunea pentru Agendă."</string>
-    <string name="add_contact_not_available" msgid="3083256438899321502">"Nu este disponibilă nicio aplicație pentru agendă"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="custom_message_hint">Scrieți mesaj personalizat</string>
+  <string name="toolbar_close">Închideți</string>
+  <string name="all_contacts_empty">Nu aveți încă persoane de contact.</string>
+  <string name="all_contacts_empty_add_contact_action">Creați o intrare nouă</string>
+  <string name="permission_single_turn_on">Activați</string>
+  <string name="permission_no_contacts">Pentru a vedea persoanele de contact, activați permisiunea pentru Agendă.</string>
+  <string name="add_contact_not_available">Nu este disponibilă nicio aplicație pentru agendă</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-ru/strings.xml b/java/com/android/dialer/widget/res/values-ru/strings.xml
index 12b8257..4962afb 100644
--- a/java/com/android/dialer/widget/res/values-ru/strings.xml
+++ b/java/com/android/dialer/widget/res/values-ru/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="custom_message_hint" msgid="2179012696339457461">"Добавьте свой текст"</string>
-    <string name="toolbar_close" msgid="1081308076149879833">"Закрыть"</string>
-    <string name="all_contacts_empty" msgid="4260556610403994011">"Контактов нет"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Создать контакт"</string>
-    <string name="permission_single_turn_on" msgid="1306416016676232584">"Предоставить разрешение"</string>
-    <string name="permission_no_contacts" msgid="2388204904477299207">"Чтобы открыть список контактов, предоставьте приложению разрешение \"Контакты\"."</string>
-    <string name="add_contact_not_available" msgid="3083256438899321502">"Нет приложения для работы с контактами"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="custom_message_hint">Добавьте свой текст</string>
+  <string name="toolbar_close">Закрыть</string>
+  <string name="all_contacts_empty">Контактов нет</string>
+  <string name="all_contacts_empty_add_contact_action">Создать контакт</string>
+  <string name="permission_single_turn_on">Предоставить разрешение</string>
+  <string name="permission_no_contacts">Чтобы открыть список контактов, предоставьте приложению разрешение \"Контакты\".</string>
+  <string name="add_contact_not_available">Нет приложения для работы с контактами</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-si/strings.xml b/java/com/android/dialer/widget/res/values-si/strings.xml
index 9870a76..a78f58d 100644
--- a/java/com/android/dialer/widget/res/values-si/strings.xml
+++ b/java/com/android/dialer/widget/res/values-si/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="custom_message_hint" msgid="2179012696339457461">"අභිරුචි පණිවිඩයක් ලියන්න"</string>
-    <string name="toolbar_close" msgid="1081308076149879833">"වසන්න"</string>
-    <string name="all_contacts_empty" msgid="4260556610403994011">"ඔබට තවම කිසිදු සම්බන්ධතාවක් නැත"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"නව සම්බන්ධතාවක් තනන්න"</string>
-    <string name="permission_single_turn_on" msgid="1306416016676232584">"ක්‍රියාත්මක කරන්න"</string>
-    <string name="permission_no_contacts" msgid="2388204904477299207">"ඔබේ සම්බන්ධතා බැලීමට, සම්බන්ධතා අවසරය ක්‍රියාත්මක කරන්න."</string>
-    <string name="add_contact_not_available" msgid="3083256438899321502">"සබඳතා යෙදුම ලබා ගැනීමට නොහැකිය"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="custom_message_hint">අභිරුචි පණිවිඩයක් ලියන්න</string>
+  <string name="toolbar_close">වසන්න</string>
+  <string name="all_contacts_empty">ඔබට තවම කිසිදු සම්බන්ධතාවක් නැත</string>
+  <string name="all_contacts_empty_add_contact_action">නව සම්බන්ධතාවක් තනන්න</string>
+  <string name="permission_single_turn_on">ක්‍රියාත්මක කරන්න</string>
+  <string name="permission_no_contacts">ඔබේ සම්බන්ධතා බැලීමට, සම්බන්ධතා අවසරය ක්‍රියාත්මක කරන්න.</string>
+  <string name="add_contact_not_available">සබඳතා යෙදුම ලබා ගැනීමට නොහැකිය</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-sk/strings.xml b/java/com/android/dialer/widget/res/values-sk/strings.xml
index 5b8596c..25fbb74 100644
--- a/java/com/android/dialer/widget/res/values-sk/strings.xml
+++ b/java/com/android/dialer/widget/res/values-sk/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="custom_message_hint" msgid="2179012696339457461">"Napíšte vlastnú správu"</string>
-    <string name="toolbar_close" msgid="1081308076149879833">"Zavrieť"</string>
-    <string name="all_contacts_empty" msgid="4260556610403994011">"Zatiaľ nemáte žiadne kontakty"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Vytvoriť nový kontakt"</string>
-    <string name="permission_single_turn_on" msgid="1306416016676232584">"Zapnúť"</string>
-    <string name="permission_no_contacts" msgid="2388204904477299207">"Ak si chcete zobraziť kontakty, zapnite povolenie Kontakty."</string>
-    <string name="add_contact_not_available" msgid="3083256438899321502">"Nie je k dispozícii žiadna aplikácia na prácu s kontaktmi"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="custom_message_hint">Napíšte vlastnú správu</string>
+  <string name="toolbar_close">Zavrieť</string>
+  <string name="all_contacts_empty">Zatiaľ nemáte žiadne kontakty</string>
+  <string name="all_contacts_empty_add_contact_action">Vytvoriť nový kontakt</string>
+  <string name="permission_single_turn_on">Zapnúť</string>
+  <string name="permission_no_contacts">Ak si chcete zobraziť kontakty, zapnite povolenie Kontakty.</string>
+  <string name="add_contact_not_available">Nie je k dispozícii žiadna aplikácia na prácu s kontaktmi</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-sl/strings.xml b/java/com/android/dialer/widget/res/values-sl/strings.xml
index 1d50619..f596704 100644
--- a/java/com/android/dialer/widget/res/values-sl/strings.xml
+++ b/java/com/android/dialer/widget/res/values-sl/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="custom_message_hint" msgid="2179012696339457461">"Napišite sporočilo po meri"</string>
-    <string name="toolbar_close" msgid="1081308076149879833">"Zapri"</string>
-    <string name="all_contacts_empty" msgid="4260556610403994011">"Nimate še nobenega stika"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Ustvari nov stik"</string>
-    <string name="permission_single_turn_on" msgid="1306416016676232584">"Vklopi"</string>
-    <string name="permission_no_contacts" msgid="2388204904477299207">"Če si želite ogledati stike, vklopite dovoljenje za stike."</string>
-    <string name="add_contact_not_available" msgid="3083256438899321502">"Na voljo ni nobene aplikacije za stike"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="custom_message_hint">Napišite sporočilo po meri</string>
+  <string name="toolbar_close">Zapri</string>
+  <string name="all_contacts_empty">Nimate še nobenega stika</string>
+  <string name="all_contacts_empty_add_contact_action">Ustvari nov stik</string>
+  <string name="permission_single_turn_on">Vklopi</string>
+  <string name="permission_no_contacts">Če si želite ogledati stike, vklopite dovoljenje za stike.</string>
+  <string name="add_contact_not_available">Na voljo ni nobene aplikacije za stike</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-sq/strings.xml b/java/com/android/dialer/widget/res/values-sq/strings.xml
index 2666415..e4a6a42 100644
--- a/java/com/android/dialer/widget/res/values-sq/strings.xml
+++ b/java/com/android/dialer/widget/res/values-sq/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="custom_message_hint" msgid="2179012696339457461">"Shkruaj mesazh të person."</string>
-    <string name="toolbar_close" msgid="1081308076149879833">"Mbyll"</string>
-    <string name="all_contacts_empty" msgid="4260556610403994011">"Nuk ke ende kontakte"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Krijo një kontakt të ri"</string>
-    <string name="permission_single_turn_on" msgid="1306416016676232584">"Aktivizo"</string>
-    <string name="permission_no_contacts" msgid="2388204904477299207">"Për të parë kontaktet, aktivizo lejen e Kontakteve."</string>
-    <string name="add_contact_not_available" msgid="3083256438899321502">"Nuk ka asnjë aplikacion për kontaktet"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="custom_message_hint">Shkruaj mesazh të person.</string>
+  <string name="toolbar_close">Mbyll</string>
+  <string name="all_contacts_empty">Nuk ke ende kontakte</string>
+  <string name="all_contacts_empty_add_contact_action">Krijo një kontakt të ri</string>
+  <string name="permission_single_turn_on">Aktivizo</string>
+  <string name="permission_no_contacts">Për të parë kontaktet, aktivizo lejen e Kontakteve.</string>
+  <string name="add_contact_not_available">Nuk ka asnjë aplikacion për kontaktet</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-sr/strings.xml b/java/com/android/dialer/widget/res/values-sr/strings.xml
index c2f269d..510e9ba 100644
--- a/java/com/android/dialer/widget/res/values-sr/strings.xml
+++ b/java/com/android/dialer/widget/res/values-sr/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="custom_message_hint" msgid="2179012696339457461">"Напишите прилагођену поруку"</string>
-    <string name="toolbar_close" msgid="1081308076149879833">"Затворите"</string>
-    <string name="all_contacts_empty" msgid="4260556610403994011">"Још увек немате ниједан контакт"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Направи нови контакт"</string>
-    <string name="permission_single_turn_on" msgid="1306416016676232584">"Укључи"</string>
-    <string name="permission_no_contacts" msgid="2388204904477299207">"Да бисте видели контакте, укључите дозволу за Контакте."</string>
-    <string name="add_contact_not_available" msgid="3083256438899321502">"Нема доступне апликације за контакте"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="custom_message_hint">Напишите прилагођену поруку</string>
+  <string name="toolbar_close">Затворите</string>
+  <string name="all_contacts_empty">Још увек немате ниједан контакт</string>
+  <string name="all_contacts_empty_add_contact_action">Направи нови контакт</string>
+  <string name="permission_single_turn_on">Укључи</string>
+  <string name="permission_no_contacts">Да бисте видели контакте, укључите дозволу за Контакте.</string>
+  <string name="add_contact_not_available">Нема доступне апликације за контакте</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-sv/strings.xml b/java/com/android/dialer/widget/res/values-sv/strings.xml
index 75add78..7046ba8 100644
--- a/java/com/android/dialer/widget/res/values-sv/strings.xml
+++ b/java/com/android/dialer/widget/res/values-sv/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="custom_message_hint" msgid="2179012696339457461">"Skriv anpassat meddelande"</string>
-    <string name="toolbar_close" msgid="1081308076149879833">"Stäng"</string>
-    <string name="all_contacts_empty" msgid="4260556610403994011">"Du har inga kontakter ännu"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Skapa ny kontakt"</string>
-    <string name="permission_single_turn_on" msgid="1306416016676232584">"Aktivera"</string>
-    <string name="permission_no_contacts" msgid="2388204904477299207">"Du måste aktivera behörigheten Kontakter för att visa kontakterna."</string>
-    <string name="add_contact_not_available" msgid="3083256438899321502">"Det finns inga appar för kontakter"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="custom_message_hint">Skriv anpassat meddelande</string>
+  <string name="toolbar_close">Stäng</string>
+  <string name="all_contacts_empty">Du har inga kontakter ännu</string>
+  <string name="all_contacts_empty_add_contact_action">Skapa ny kontakt</string>
+  <string name="permission_single_turn_on">Aktivera</string>
+  <string name="permission_no_contacts">Du måste aktivera behörigheten Kontakter för att visa kontakterna.</string>
+  <string name="add_contact_not_available">Det finns inga appar för kontakter</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-sw/strings.xml b/java/com/android/dialer/widget/res/values-sw/strings.xml
index 31539fa..2588bfc 100644
--- a/java/com/android/dialer/widget/res/values-sw/strings.xml
+++ b/java/com/android/dialer/widget/res/values-sw/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="custom_message_hint" msgid="2179012696339457461">"Andika ujumbe maalum"</string>
-    <string name="toolbar_close" msgid="1081308076149879833">"Funga"</string>
-    <string name="all_contacts_empty" msgid="4260556610403994011">"Bado huna anwani zozote"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Ongeza anwani mpya"</string>
-    <string name="permission_single_turn_on" msgid="1306416016676232584">"Washa"</string>
-    <string name="permission_no_contacts" msgid="2388204904477299207">"Ili uone anwani zako, washa ruhusa ya Anwani."</string>
-    <string name="add_contact_not_available" msgid="3083256438899321502">"Hakuna programu ya anwani iliyopatikana"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="custom_message_hint">Andika ujumbe maalum</string>
+  <string name="toolbar_close">Funga</string>
+  <string name="all_contacts_empty">Bado huna anwani zozote</string>
+  <string name="all_contacts_empty_add_contact_action">Ongeza anwani mpya</string>
+  <string name="permission_single_turn_on">Washa</string>
+  <string name="permission_no_contacts">Ili uone anwani zako, washa ruhusa ya Anwani.</string>
+  <string name="add_contact_not_available">Hakuna programu ya anwani iliyopatikana</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-ta/strings.xml b/java/com/android/dialer/widget/res/values-ta/strings.xml
index 1733330..c5cd37c 100644
--- a/java/com/android/dialer/widget/res/values-ta/strings.xml
+++ b/java/com/android/dialer/widget/res/values-ta/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="custom_message_hint" msgid="2179012696339457461">"தனிப்பயன் செய்தியை எழுதவும்"</string>
-    <string name="toolbar_close" msgid="1081308076149879833">"மூடு"</string>
-    <string name="all_contacts_empty" msgid="4260556610403994011">"இதுவரை தொடர்புகள் எதுவுமில்லை"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"புதிய தொடர்பை உருவாக்கு"</string>
-    <string name="permission_single_turn_on" msgid="1306416016676232584">"இயக்கு"</string>
-    <string name="permission_no_contacts" msgid="2388204904477299207">"தொடர்புகளைப் பார்க்க, தொடர்புகள் அனுமதியை இயக்கவும்."</string>
-    <string name="add_contact_not_available" msgid="3083256438899321502">"தொடர்புகள் பயன்பாடு எதுவுமில்லை"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="custom_message_hint">தனிப்பயன் செய்தியை எழுதவும்</string>
+  <string name="toolbar_close">மூடு</string>
+  <string name="all_contacts_empty">இதுவரை தொடர்புகள் எதுவுமில்லை</string>
+  <string name="all_contacts_empty_add_contact_action">புதிய தொடர்பை உருவாக்கு</string>
+  <string name="permission_single_turn_on">இயக்கு</string>
+  <string name="permission_no_contacts">தொடர்புகளைப் பார்க்க, தொடர்புகள் அனுமதியை இயக்கவும்.</string>
+  <string name="add_contact_not_available">தொடர்புகள் பயன்பாடு எதுவுமில்லை</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-te/strings.xml b/java/com/android/dialer/widget/res/values-te/strings.xml
index 27e6b05..b73c338 100644
--- a/java/com/android/dialer/widget/res/values-te/strings.xml
+++ b/java/com/android/dialer/widget/res/values-te/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="custom_message_hint" msgid="2179012696339457461">"అనుకూల సందేశాన్ని వ్రాయండి"</string>
-    <string name="toolbar_close" msgid="1081308076149879833">"మూసివేయి"</string>
-    <string name="all_contacts_empty" msgid="4260556610403994011">"మీకు ఇప్పటికీ పరిచయాలేవీ లేవు"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"కొత్త పరిచయాన్ని సృష్టించండి"</string>
-    <string name="permission_single_turn_on" msgid="1306416016676232584">"ఆన్ చేయి"</string>
-    <string name="permission_no_contacts" msgid="2388204904477299207">"మీ పరిచయాలను చూడటానికి, పరిచయాల అనుమతిని ఆన్ చేయండి."</string>
-    <string name="add_contact_not_available" msgid="3083256438899321502">"పరిచయాల అనువర్తనం ఏదీ అందుబాటులో లేదు"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="custom_message_hint">అనుకూల సందేశాన్ని వ్రాయండి</string>
+  <string name="toolbar_close">మూసివేయి</string>
+  <string name="all_contacts_empty">మీకు ఇప్పటికీ పరిచయాలేవీ లేవు</string>
+  <string name="all_contacts_empty_add_contact_action">కొత్త పరిచయాన్ని సృష్టించండి</string>
+  <string name="permission_single_turn_on">ఆన్ చేయి</string>
+  <string name="permission_no_contacts">మీ పరిచయాలను చూడటానికి, పరిచయాల అనుమతిని ఆన్ చేయండి.</string>
+  <string name="add_contact_not_available">పరిచయాల అనువర్తనం ఏదీ అందుబాటులో లేదు</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-th/strings.xml b/java/com/android/dialer/widget/res/values-th/strings.xml
index 40134c8..52c84af 100644
--- a/java/com/android/dialer/widget/res/values-th/strings.xml
+++ b/java/com/android/dialer/widget/res/values-th/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="custom_message_hint" msgid="2179012696339457461">"เขียนข้อความที่กำหนดเอง"</string>
-    <string name="toolbar_close" msgid="1081308076149879833">"ปิด"</string>
-    <string name="all_contacts_empty" msgid="4260556610403994011">"คุณยังไม่มีรายชื่อติดต่อ"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"สร้างรายชื่อติดต่อใหม่"</string>
-    <string name="permission_single_turn_on" msgid="1306416016676232584">"เปิด"</string>
-    <string name="permission_no_contacts" msgid="2388204904477299207">"หากต้องการดูรายชื่อติดต่อ ให้เปิดสิทธิ์เข้าถึงรายชื่อติดต่อ"</string>
-    <string name="add_contact_not_available" msgid="3083256438899321502">"ไม่มีแอปรายชื่อติดต่อที่พร้อมใช้งาน"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="custom_message_hint">เขียนข้อความที่กำหนดเอง</string>
+  <string name="toolbar_close">ปิด</string>
+  <string name="all_contacts_empty">คุณยังไม่มีรายชื่อติดต่อ</string>
+  <string name="all_contacts_empty_add_contact_action">สร้างรายชื่อติดต่อใหม่</string>
+  <string name="permission_single_turn_on">เปิด</string>
+  <string name="permission_no_contacts">หากต้องการดูรายชื่อติดต่อ ให้เปิดสิทธิ์เข้าถึงรายชื่อติดต่อ</string>
+  <string name="add_contact_not_available">ไม่มีแอปรายชื่อติดต่อที่พร้อมใช้งาน</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-tl/strings.xml b/java/com/android/dialer/widget/res/values-tl/strings.xml
index b114d38..abba6ea 100644
--- a/java/com/android/dialer/widget/res/values-tl/strings.xml
+++ b/java/com/android/dialer/widget/res/values-tl/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="custom_message_hint" msgid="2179012696339457461">"Sumulat ng custom na mensahe"</string>
-    <string name="toolbar_close" msgid="1081308076149879833">"Isara"</string>
-    <string name="all_contacts_empty" msgid="4260556610403994011">"Wala ka pang sinumang contact"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Gumawa ng bagong contact"</string>
-    <string name="permission_single_turn_on" msgid="1306416016676232584">"I-on"</string>
-    <string name="permission_no_contacts" msgid="2388204904477299207">"Upang makita ang iyong mga contact, i-on ang pahintulot ng Mga Contact."</string>
-    <string name="add_contact_not_available" msgid="3083256438899321502">"Walang available na app ng mga contact"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="custom_message_hint">Sumulat ng custom na mensahe</string>
+  <string name="toolbar_close">Isara</string>
+  <string name="all_contacts_empty">Wala ka pang sinumang contact</string>
+  <string name="all_contacts_empty_add_contact_action">Gumawa ng bagong contact</string>
+  <string name="permission_single_turn_on">I-on</string>
+  <string name="permission_no_contacts">Upang makita ang iyong mga contact, i-on ang pahintulot ng Mga Contact.</string>
+  <string name="add_contact_not_available">Walang available na app ng mga contact</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-tr/strings.xml b/java/com/android/dialer/widget/res/values-tr/strings.xml
index 6046e17..9024781 100644
--- a/java/com/android/dialer/widget/res/values-tr/strings.xml
+++ b/java/com/android/dialer/widget/res/values-tr/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="custom_message_hint" msgid="2179012696339457461">"Özel bir mesaj yazın"</string>
-    <string name="toolbar_close" msgid="1081308076149879833">"Kapat"</string>
-    <string name="all_contacts_empty" msgid="4260556610403994011">"Henüz hiç kişiniz yok"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Yeni kişi oluştur"</string>
-    <string name="permission_single_turn_on" msgid="1306416016676232584">"Etkinleştir"</string>
-    <string name="permission_no_contacts" msgid="2388204904477299207">"Kişilerinizi görmek için Kişiler iznini etkinleştirin."</string>
-    <string name="add_contact_not_available" msgid="3083256438899321502">"Kullanılabilir kişi uygulaması yok"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="custom_message_hint">Özel bir mesaj yazın</string>
+  <string name="toolbar_close">Kapat</string>
+  <string name="all_contacts_empty">Henüz hiç kişiniz yok</string>
+  <string name="all_contacts_empty_add_contact_action">Yeni kişi oluştur</string>
+  <string name="permission_single_turn_on">Etkinleştir</string>
+  <string name="permission_no_contacts">Kişilerinizi görmek için Kişiler iznini etkinleştirin.</string>
+  <string name="add_contact_not_available">Kullanılabilir kişi uygulaması yok</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-uk/strings.xml b/java/com/android/dialer/widget/res/values-uk/strings.xml
index d1a281c..32305ed 100644
--- a/java/com/android/dialer/widget/res/values-uk/strings.xml
+++ b/java/com/android/dialer/widget/res/values-uk/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="custom_message_hint" msgid="2179012696339457461">"Ваше власне повідомлення"</string>
-    <string name="toolbar_close" msgid="1081308076149879833">"Закрити"</string>
-    <string name="all_contacts_empty" msgid="4260556610403994011">"Ще немає контактів"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Створити контакт"</string>
-    <string name="permission_single_turn_on" msgid="1306416016676232584">"Увімкнути"</string>
-    <string name="permission_no_contacts" msgid="2388204904477299207">"Щоб переглянути контакти, увімкніть дозвіл \"Контакти\"."</string>
-    <string name="add_contact_not_available" msgid="3083256438899321502">"Немає додатка з контактами"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="custom_message_hint">Ваше власне повідомлення</string>
+  <string name="toolbar_close">Закрити</string>
+  <string name="all_contacts_empty">Ще немає контактів</string>
+  <string name="all_contacts_empty_add_contact_action">Створити контакт</string>
+  <string name="permission_single_turn_on">Увімкнути</string>
+  <string name="permission_no_contacts">Щоб переглянути контакти, увімкніть дозвіл \"Контакти\".</string>
+  <string name="add_contact_not_available">Немає додатка з контактами</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-ur/strings.xml b/java/com/android/dialer/widget/res/values-ur/strings.xml
index d5dcad0..05f3462 100644
--- a/java/com/android/dialer/widget/res/values-ur/strings.xml
+++ b/java/com/android/dialer/widget/res/values-ur/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="custom_message_hint" msgid="2179012696339457461">"ایک حسب ضرورت پیغام لکھیں"</string>
-    <string name="toolbar_close" msgid="1081308076149879833">"بند کریں"</string>
-    <string name="all_contacts_empty" msgid="4260556610403994011">"آپ کے پاس ابھی تک کوئی رابطے نہیں ہیں"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"نیا رابطہ بنائیں"</string>
-    <string name="permission_single_turn_on" msgid="1306416016676232584">"آن کریں"</string>
-    <string name="permission_no_contacts" msgid="2388204904477299207">"اپنے رابطے دیکھنے کیلئے رابطوں کی اجازت آن کریں۔"</string>
-    <string name="add_contact_not_available" msgid="3083256438899321502">"رابطوں کی کوئی ایپ دستیاب نہیں ہے"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="custom_message_hint">ایک حسب ضرورت پیغام لکھیں</string>
+  <string name="toolbar_close">بند کریں</string>
+  <string name="all_contacts_empty">آپ کے پاس ابھی تک کوئی رابطے نہیں ہیں</string>
+  <string name="all_contacts_empty_add_contact_action">نیا رابطہ بنائیں</string>
+  <string name="permission_single_turn_on">آن کریں</string>
+  <string name="permission_no_contacts">اپنے رابطے دیکھنے کیلئے رابطوں کی اجازت آن کریں۔</string>
+  <string name="add_contact_not_available">رابطوں کی کوئی ایپ دستیاب نہیں ہے</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-uz/strings.xml b/java/com/android/dialer/widget/res/values-uz/strings.xml
index d4a11d6..354782f 100644
--- a/java/com/android/dialer/widget/res/values-uz/strings.xml
+++ b/java/com/android/dialer/widget/res/values-uz/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="custom_message_hint" msgid="2179012696339457461">"Boshqa xabar yozing"</string>
-    <string name="toolbar_close" msgid="1081308076149879833">"Yopish"</string>
-    <string name="all_contacts_empty" msgid="4260556610403994011">"Kontaktlar yo‘q"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Yangi kontakt qo‘shish"</string>
-    <string name="permission_single_turn_on" msgid="1306416016676232584">"Ruxsat berish"</string>
-    <string name="permission_no_contacts" msgid="2388204904477299207">"Kontaktlar ro‘yxatini ko‘rish uchun ilovaga Kontaktlarga kirishga ruxsat bering."</string>
-    <string name="add_contact_not_available" msgid="3083256438899321502">"Kontaktlarni ochadigan ilova yo‘q"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="custom_message_hint">Boshqa xabar yozing</string>
+  <string name="toolbar_close">Yopish</string>
+  <string name="all_contacts_empty">Kontaktlar yo‘q</string>
+  <string name="all_contacts_empty_add_contact_action">Yangi kontakt qo‘shish</string>
+  <string name="permission_single_turn_on">Ruxsat berish</string>
+  <string name="permission_no_contacts">Kontaktlar ro‘yxatini ko‘rish uchun ilovaga Kontaktlarga kirishga ruxsat bering.</string>
+  <string name="add_contact_not_available">Kontaktlarni ochadigan ilova yo‘q</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-vi/strings.xml b/java/com/android/dialer/widget/res/values-vi/strings.xml
index 18b7091..9322194 100644
--- a/java/com/android/dialer/widget/res/values-vi/strings.xml
+++ b/java/com/android/dialer/widget/res/values-vi/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="custom_message_hint" msgid="2179012696339457461">"Viết tin nhắn tùy chỉnh"</string>
-    <string name="toolbar_close" msgid="1081308076149879833">"Đóng"</string>
-    <string name="all_contacts_empty" msgid="4260556610403994011">"Bạn chưa có bất kỳ liên hệ nào"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Tạo liên hệ mới"</string>
-    <string name="permission_single_turn_on" msgid="1306416016676232584">"Bật"</string>
-    <string name="permission_no_contacts" msgid="2388204904477299207">"Để xem danh bạ của bạn, bật quyền đối với Danh bạ."</string>
-    <string name="add_contact_not_available" msgid="3083256438899321502">"Không có ứng dụng danh bạ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="custom_message_hint">Viết tin nhắn tùy chỉnh</string>
+  <string name="toolbar_close">Đóng</string>
+  <string name="all_contacts_empty">Bạn chưa có bất kỳ liên hệ nào</string>
+  <string name="all_contacts_empty_add_contact_action">Tạo liên hệ mới</string>
+  <string name="permission_single_turn_on">Bật</string>
+  <string name="permission_no_contacts">Để xem danh bạ của bạn, bật quyền đối với Danh bạ.</string>
+  <string name="add_contact_not_available">Không có ứng dụng danh bạ</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-zh-rCN/strings.xml b/java/com/android/dialer/widget/res/values-zh-rCN/strings.xml
index 4a5e458..976a2dc 100644
--- a/java/com/android/dialer/widget/res/values-zh-rCN/strings.xml
+++ b/java/com/android/dialer/widget/res/values-zh-rCN/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="custom_message_hint" msgid="2179012696339457461">"自行撰写信息"</string>
-    <string name="toolbar_close" msgid="1081308076149879833">"关闭"</string>
-    <string name="all_contacts_empty" msgid="4260556610403994011">"您还没有任何联系人"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"创建新联系人"</string>
-    <string name="permission_single_turn_on" msgid="1306416016676232584">"开启"</string>
-    <string name="permission_no_contacts" msgid="2388204904477299207">"要查看您的联系人，请开启“通讯录”权限。"</string>
-    <string name="add_contact_not_available" msgid="3083256438899321502">"没有可用的通讯录应用"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="custom_message_hint">自行撰写信息</string>
+  <string name="toolbar_close">关闭</string>
+  <string name="all_contacts_empty">您还没有任何联系人</string>
+  <string name="all_contacts_empty_add_contact_action">创建新联系人</string>
+  <string name="permission_single_turn_on">开启</string>
+  <string name="permission_no_contacts">要查看您的联系人，请开启“通讯录”权限。</string>
+  <string name="add_contact_not_available">没有可用的通讯录应用</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-zh-rHK/strings.xml b/java/com/android/dialer/widget/res/values-zh-rHK/strings.xml
index 3d5fe6e..a3bbcf3 100644
--- a/java/com/android/dialer/widget/res/values-zh-rHK/strings.xml
+++ b/java/com/android/dialer/widget/res/values-zh-rHK/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="custom_message_hint" msgid="2179012696339457461">"撰寫自訂訊息"</string>
-    <string name="toolbar_close" msgid="1081308076149879833">"關閉"</string>
-    <string name="all_contacts_empty" msgid="4260556610403994011">"您尚無任何聯絡人"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"建立新聯絡人"</string>
-    <string name="permission_single_turn_on" msgid="1306416016676232584">"開放"</string>
-    <string name="permission_no_contacts" msgid="2388204904477299207">"如要查看聯絡人，請開放「通訊錄」權限。"</string>
-    <string name="add_contact_not_available" msgid="3083256438899321502">"沒有可用的聯絡人應用程式"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="custom_message_hint">撰寫自訂訊息</string>
+  <string name="toolbar_close">關閉</string>
+  <string name="all_contacts_empty">您尚無任何聯絡人</string>
+  <string name="all_contacts_empty_add_contact_action">建立新聯絡人</string>
+  <string name="permission_single_turn_on">開放</string>
+  <string name="permission_no_contacts">如要查看聯絡人，請開放「通訊錄」權限。</string>
+  <string name="add_contact_not_available">沒有可用的聯絡人應用程式</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-zh-rTW/strings.xml b/java/com/android/dialer/widget/res/values-zh-rTW/strings.xml
index 4bc68f2..fb55e81 100644
--- a/java/com/android/dialer/widget/res/values-zh-rTW/strings.xml
+++ b/java/com/android/dialer/widget/res/values-zh-rTW/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="custom_message_hint" msgid="2179012696339457461">"撰寫自訂訊息"</string>
-    <string name="toolbar_close" msgid="1081308076149879833">"關閉"</string>
-    <string name="all_contacts_empty" msgid="4260556610403994011">"你還沒有任何聯絡人"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"建立新聯絡人"</string>
-    <string name="permission_single_turn_on" msgid="1306416016676232584">"開啟"</string>
-    <string name="permission_no_contacts" msgid="2388204904477299207">"如要查看你的聯絡人，請開啟「聯絡人」存取權限。"</string>
-    <string name="add_contact_not_available" msgid="3083256438899321502">"沒有可用的聯絡人應用程式"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="custom_message_hint">撰寫自訂訊息</string>
+  <string name="toolbar_close">關閉</string>
+  <string name="all_contacts_empty">你還沒有任何聯絡人</string>
+  <string name="all_contacts_empty_add_contact_action">建立新聯絡人</string>
+  <string name="permission_single_turn_on">開啟</string>
+  <string name="permission_no_contacts">如要查看你的聯絡人，請開啟「聯絡人」存取權限。</string>
+  <string name="add_contact_not_available">沒有可用的聯絡人應用程式</string>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values-zu/strings.xml b/java/com/android/dialer/widget/res/values-zu/strings.xml
index 718bbbd..edb2b06 100644
--- a/java/com/android/dialer/widget/res/values-zu/strings.xml
+++ b/java/com/android/dialer/widget/res/values-zu/strings.xml
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="custom_message_hint" msgid="2179012696339457461">"Bhala umlayezo wangokwezifiso"</string>
-    <string name="toolbar_close" msgid="1081308076149879833">"Vala"</string>
-    <string name="all_contacts_empty" msgid="4260556610403994011">"Awunabo oxhumana nabo okwamanje"</string>
-    <string name="all_contacts_empty_add_contact_action" msgid="7850060327481179533">"Dala othintana naye omusha"</string>
-    <string name="permission_single_turn_on" msgid="1306416016676232584">"Vula"</string>
-    <string name="permission_no_contacts" msgid="2388204904477299207">"Ukuze ubone oxhumana nabo, vula imvume yoxhumana nabo."</string>
-    <string name="add_contact_not_available" msgid="3083256438899321502">"Alukho uhlelo lokusebenza loxhumana nabo olutholakalayo"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="custom_message_hint">Bhala umlayezo wangokwezifiso</string>
+  <string name="toolbar_close">Vala</string>
+  <string name="all_contacts_empty">Awunabo oxhumana nabo okwamanje</string>
+  <string name="all_contacts_empty_add_contact_action">Dala othintana naye omusha</string>
+  <string name="permission_single_turn_on">Vula</string>
+  <string name="permission_no_contacts">Ukuze ubone oxhumana nabo, vula imvume yoxhumana nabo.</string>
+  <string name="add_contact_not_available">Alukho uhlelo lokusebenza loxhumana nabo olutholakalayo</string>
 </resources>
diff --git a/java/com/android/contacts/common/res/values/animation_constants.xml b/java/com/android/dialer/widget/res/values/animation_constants.xml
similarity index 100%
rename from java/com/android/contacts/common/res/values/animation_constants.xml
rename to java/com/android/dialer/widget/res/values/animation_constants.xml
diff --git a/java/com/android/dialer/widget/res/values/attrs.xml b/java/com/android/dialer/widget/res/values/attrs.xml
index bd5c3a4..ecf92bf 100644
--- a/java/com/android/dialer/widget/res/values/attrs.xml
+++ b/java/com/android/dialer/widget/res/values/attrs.xml
@@ -20,4 +20,7 @@
     <attr format="dimension" name="resizing_text_min_size"/>
   </declare-styleable>
 
+  <declare-styleable name="MaxHeightScrollView">
+    <attr name="maxHeight" format="dimension"/>
+  </declare-styleable>
 </resources>
diff --git a/java/com/android/dialer/widget/res/values/colors.xml b/java/com/android/dialer/widget/res/values/colors.xml
deleted file mode 100644
index 12a5cb9..0000000
--- a/java/com/android/dialer/widget/res/values/colors.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2018 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-  -->
-<resources>
-  <color name="empty_list_text_color">#b2b2b2</color>
-  <color name="empty_voicemail_icon_tint_color">#E1E1E1</color>
-</resources>
\ No newline at end of file
diff --git a/java/com/android/dialer/widget/res/values/dimens.xml b/java/com/android/dialer/widget/res/values/dimens.xml
index 65963a6..d29f0fa 100644
--- a/java/com/android/dialer/widget/res/values/dimens.xml
+++ b/java/com/android/dialer/widget/res/values/dimens.xml
@@ -29,4 +29,8 @@
 
   <!-- Empty List -->
   <dimen name="empty_list_message_text_size">16sp</dimen>
+
+  <!-- Floating Action Button -->
+  <dimen name="floating_action_button_margin_right">16dp</dimen>
+  <dimen name="floating_action_button_width">56dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/java/com/android/incallui/ActiveCallsCallListListener.java b/java/com/android/incallui/ActiveCallsCallListListener.java
new file mode 100644
index 0000000..d94db88
--- /dev/null
+++ b/java/com/android/incallui/ActiveCallsCallListListener.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.incallui;
+
+import android.content.Context;
+import android.support.annotation.NonNull;
+import com.android.dialer.activecalls.ActiveCallInfo;
+import com.android.dialer.activecalls.ActiveCallsComponent;
+import com.android.incallui.call.CallList;
+import com.android.incallui.call.DialerCall;
+import com.android.incallui.call.state.DialerCallState;
+import com.google.common.base.Optional;
+import com.google.common.collect.ImmutableList;
+
+/** Updates {@link com.android.dialer.activecalls.ActiveCalls} */
+@SuppressWarnings("Guava")
+public class ActiveCallsCallListListener implements CallList.Listener {
+
+  private final Context appContext;
+
+  ActiveCallsCallListListener(Context appContext) {
+    this.appContext = appContext;
+  }
+
+  @Override
+  public void onIncomingCall(DialerCall call) {}
+
+  @Override
+  public void onUpgradeToVideo(DialerCall call) {}
+
+  @Override
+  public void onSessionModificationStateChange(DialerCall call) {}
+
+  @Override
+  public void onCallListChange(CallList callList) {
+    ImmutableList.Builder<ActiveCallInfo> activeCalls = ImmutableList.builder();
+    for (DialerCall call : callList.getAllCalls()) {
+      if (call.getState() != DialerCallState.DISCONNECTED && call.getAccountHandle() != null) {
+        activeCalls.add(
+            ActiveCallInfo.builder()
+                .setPhoneAccountHandle(Optional.of(call.getAccountHandle()))
+                .build());
+      }
+    }
+    ActiveCallsComponent.get(appContext).activeCalls().setActiveCalls(activeCalls.build());
+  }
+
+  @Override
+  public void onDisconnect(DialerCall call) {}
+
+  @Override
+  public void onWiFiToLteHandover(DialerCall call) {}
+
+  @Override
+  public void onHandoverToWifiFailed(DialerCall call) {}
+
+  @Override
+  public void onInternationalCallOnWifi(@NonNull DialerCall call) {}
+}
diff --git a/java/com/android/incallui/AndroidManifest.xml b/java/com/android/incallui/AndroidManifest.xml
index a45330b..4cb6001 100644
--- a/java/com/android/incallui/AndroidManifest.xml
+++ b/java/com/android/incallui/AndroidManifest.xml
@@ -18,8 +18,8 @@
     package="com.android.incallui">
 
   <uses-sdk
-      android:minSdkVersion="23"
-      android:targetSdkVersion="27"/>
+      android:minSdkVersion="24"
+      android:targetSdkVersion="28"/>
 
   <uses-permission android:name="android.permission.CONTROL_INCALL_EXPERIENCE"/>
   <!-- We use this to disable the status bar buttons of home, back and recent
@@ -40,16 +40,18 @@
   <!-- Testing location -->
   <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
 
+  <!-- Set Bluetooth device -->
+  <uses-permission android:name="android.permission.BLUETOOTH_ADMIN"/>
+
+  <!-- Set audio selector window type TYPE_APPLICATION_OVERLAY -->
+  <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
+
   <!-- Set android:taskAffinity="com.android.incallui" for all activities to ensure proper
-  navigation. Otherwise system could bring up DialtactsActivity instead, e.g. when user unmerge a
+  navigation. Otherwise system could bring up MainActivity instead, e.g. when user unmerge a
   call.
        Set taskAffinity for application is not working because it will be merged and the result is
   that all activities here still have same taskAffinity as activities under dialer. -->
   <application>
-    <meta-data
-        android:name="android.telephony.hide_voicemail_settings_menu"
-        android:value="true"/>
-
     <!-- Go variants need hardware acceleration for IMS video calls even though it is disabled at
     the application level -->
     <activity
@@ -107,6 +109,13 @@
         android:theme="@style/Theme.Incall.DialogHolder"
         />
 
+    <activity
+        android:excludeFromRecents="true"
+        android:exported="false"
+        android:name="com.android.incallui.PostCharDialogActivity"
+        android:noHistory="true"
+        android:theme="@style/Theme.Incall.DialogHolder"/>
+
     <!-- BroadcastReceiver for receiving Intents from Notification mechanism. -->
     <receiver
         android:directBootAware="true"
@@ -115,7 +124,7 @@
 
     <receiver
         android:exported="false"
-        android:name=".NewReturnToCallActionReceiver"/>
+        android:name=".ReturnToCallActionReceiver"/>
 
   </application>
 
diff --git a/java/com/android/incallui/AnswerScreenPresenter.java b/java/com/android/incallui/AnswerScreenPresenter.java
index b9a84ae..8b789f3 100644
--- a/java/com/android/incallui/AnswerScreenPresenter.java
+++ b/java/com/android/incallui/AnswerScreenPresenter.java
@@ -24,6 +24,7 @@
 import android.telecom.VideoProfile;
 import com.android.dialer.common.Assert;
 import com.android.dialer.common.LogUtil;
+import com.android.dialer.common.concurrent.DialerExecutorComponent;
 import com.android.dialer.common.concurrent.ThreadUtil;
 import com.android.dialer.logging.DialerImpression;
 import com.android.dialer.logging.Logger;
@@ -35,6 +36,9 @@
 import com.android.incallui.call.DialerCall;
 import com.android.incallui.call.DialerCallListener;
 import com.android.incallui.incalluilock.InCallUiLock;
+import com.google.common.util.concurrent.FutureCallback;
+import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.ListenableFuture;
 
 /** Manages changes for an incoming call screen. */
 public class AnswerScreenPresenter
@@ -90,6 +94,39 @@
 
   @Override
   public void onAnswer(boolean answerVideoAsAudio) {
+
+    DialerCall incomingCall = CallList.getInstance().getIncomingCall();
+    InCallActivity inCallActivity =
+        (InCallActivity) answerScreen.getAnswerScreenFragment().getActivity();
+    ListenableFuture<Void> answerPrecondition;
+
+    if (incomingCall != null && inCallActivity != null) {
+      answerPrecondition = inCallActivity.getSpeakEasyCallManager().onNewIncomingCall(incomingCall);
+    } else {
+      answerPrecondition = Futures.immediateFuture(null);
+    }
+
+    Futures.addCallback(
+        answerPrecondition,
+        new FutureCallback<Void>() {
+          @Override
+          public void onSuccess(Void result) {
+            onAnswerCallback(answerVideoAsAudio);
+          }
+
+          @Override
+          public void onFailure(Throwable t) {
+            onAnswerCallback(answerVideoAsAudio);
+            // TODO(erfanian): Enumerate all error states and specify recovery strategies.
+            throw new RuntimeException("Failed to successfully complete pre call tasks.", t);
+          }
+        },
+        DialerExecutorComponent.get(context).uiExecutor());
+    addTimeoutCheck();
+  }
+
+  private void onAnswerCallback(boolean answerVideoAsAudio) {
+
     if (answerScreen.isVideoUpgradeRequest()) {
       if (answerVideoAsAudio) {
         Logger.get(context)
@@ -113,7 +150,6 @@
         call.answer();
       }
     }
-    addTimeoutCheck();
   }
 
   @Override
@@ -132,6 +168,17 @@
   }
 
   @Override
+  public void onSpeakEasyCall() {
+    LogUtil.enterBlock("AnswerScreenPresenter.onSpeakEasyCall");
+    DialerCall incomingCall = CallList.getInstance().getIncomingCall();
+    if (incomingCall == null) {
+      LogUtil.i("AnswerScreenPresenter.onSpeakEasyCall", "incomingCall == null");
+      return;
+    }
+    incomingCall.setIsSpeakEasyCall(true);
+  }
+
+  @Override
   public void onAnswerAndReleaseCall() {
     LogUtil.enterBlock("AnswerScreenPresenter.onAnswerAndReleaseCall");
     DialerCall activeCall = CallList.getInstance().getActiveCall();
diff --git a/java/com/android/incallui/AnswerScreenPresenterStub.java b/java/com/android/incallui/AnswerScreenPresenterStub.java
index 99f1f2c..e85fdaa 100644
--- a/java/com/android/incallui/AnswerScreenPresenterStub.java
+++ b/java/com/android/incallui/AnswerScreenPresenterStub.java
@@ -38,6 +38,9 @@
   public void onReject() {}
 
   @Override
+  public void onSpeakEasyCall() {}
+
+  @Override
   public void onAnswerAndReleaseCall() {}
 
   @Override
diff --git a/java/com/android/incallui/CallButtonPresenter.java b/java/com/android/incallui/CallButtonPresenter.java
index 3854642..7d12d52 100644
--- a/java/com/android/incallui/CallButtonPresenter.java
+++ b/java/com/android/incallui/CallButtonPresenter.java
@@ -43,6 +43,7 @@
 import com.android.incallui.call.DialerCall;
 import com.android.incallui.call.DialerCall.CameraDirection;
 import com.android.incallui.call.TelecomAdapter;
+import com.android.incallui.call.state.DialerCallState;
 import com.android.incallui.incall.protocol.InCallButtonIds;
 import com.android.incallui.incall.protocol.InCallButtonUi;
 import com.android.incallui.incall.protocol.InCallButtonUiDelegate;
@@ -59,13 +60,14 @@
         Listener,
         InCallButtonUiDelegate {
 
-  private static final String KEY_AUTOMATICALLY_MUTED = "incall_key_automatically_muted";
+  private static final String KEY_AUTOMATICALLY_MUTED_BY_ADD_CALL =
+      "incall_key_automatically_muted_by_add_call";
   private static final String KEY_PREVIOUS_MUTE_STATE = "incall_key_previous_mute_state";
 
   private final Context context;
   private InCallButtonUi inCallButtonUi;
   private DialerCall call;
-  private boolean automaticallyMuted = false;
+  private boolean automaticallyMutedByAddCall = false;
   private boolean previousMuteState = false;
   private boolean isInCallButtonUiReady;
   private PhoneAccountHandle otherAccount;
@@ -273,8 +275,14 @@
             DialerImpression.Type.IN_CALL_ADD_CALL_BUTTON_PRESSED,
             call.getUniqueCallId(),
             call.getTimeAddedMs());
+    if (automaticallyMutedByAddCall) {
+      // Since clicking add call button brings user to MainActivity and coming back refreshes mute
+      // state, add call button should only be clicked once during InCallActivity shows. Otherwise,
+      // we set previousMuteState wrong.
+      return;
+    }
     // Automatically mute the current call
-    automaticallyMuted = true;
+    automaticallyMutedByAddCall = true;
     previousMuteState = AudioModeProvider.getInstance().getAudioState().isMuted();
     // Simulate a click on the mute button
     muteClicked(true /* checked */, false /* clickedByUser */);
@@ -304,6 +312,12 @@
   }
 
   @Override
+  public void changeToRttClicked() {
+    LogUtil.enterBlock("CallButtonPresenter.changeToRttClicked");
+    call.sendRttUpgradeRequest();
+  }
+
+  @Override
   public void onEndCallClicked() {
     LogUtil.i("CallButtonPresenter.onEndCallClicked", "call: " + call);
     if (call != null) {
@@ -434,7 +448,7 @@
    *
    * @param call The active call.
    */
-  @SuppressWarnings("MissingPermission")
+  @SuppressWarnings(value = {"MissingPermission"})
   private void updateButtonsState(DialerCall call) {
     LogUtil.v("CallButtonPresenter.updateButtonsState", "");
     final boolean isVideo = call.isVideoCall();
@@ -448,11 +462,19 @@
         !showSwap
             && call.can(android.telecom.Call.Details.CAPABILITY_SUPPORT_HOLD)
             && call.can(android.telecom.Call.Details.CAPABILITY_HOLD);
-    final boolean isCallOnHold = call.getState() == DialerCall.State.ONHOLD;
+    final boolean isCallOnHold = call.getState() == DialerCallState.ONHOLD;
 
     final boolean showAddCall =
         TelecomAdapter.getInstance().canAddCall() && UserManagerCompat.isUserUnlocked(context);
-    final boolean showMerge = call.can(android.telecom.Call.Details.CAPABILITY_MERGE_CONFERENCE);
+    // There can only be two calls so don't show the ability to merge when one of them
+    // is a speak easy call.
+    final boolean showMerge =
+        InCallPresenter.getInstance()
+                .getCallList()
+                .getAllCalls()
+                .stream()
+                .noneMatch(c -> c != null && c.isSpeakEasyCall())
+            && call.can(android.telecom.Call.Details.CAPABILITY_MERGE_CONFERENCE);
     final boolean showUpgradeToVideo = !isVideo && (hasVideoCallCapabilities(call));
     final boolean showDowngradeToAudio = isVideo && isDowngradeToAudioSupported(call);
     final boolean showMute = call.can(android.telecom.Call.Details.CAPABILITY_MUTE);
@@ -462,17 +484,21 @@
     // Disabling local video doesn't seem to work when dialing. See a bug.
     final boolean showPauseVideo =
         isVideo
-            && call.getState() != DialerCall.State.DIALING
-            && call.getState() != DialerCall.State.CONNECTING;
+            && call.getState() != DialerCallState.DIALING
+            && call.getState() != DialerCallState.CONNECTING;
 
     otherAccount = TelecomUtil.getOtherAccount(getContext(), call.getAccountHandle());
     boolean showSwapSim =
-        otherAccount != null
+        !call.isEmergencyCall()
+            && otherAccount != null
             && !call.isVoiceMailNumber()
-            && DialerCall.State.isDialing(call.getState())
+            && DialerCallState.isDialing(call.getState())
             // Most devices cannot make calls on 2 SIMs at the same time.
             && InCallPresenter.getInstance().getCallList().getAllCalls().size() == 1;
 
+    boolean showUpgradeToRtt = call.canUpgradeToRttCall();
+    boolean enableUpgradeToRtt = showUpgradeToRtt && call.getState() == DialerCallState.ACTIVE;
+
     inCallButtonUi.showButton(InCallButtonIds.BUTTON_AUDIO, true);
     inCallButtonUi.showButton(InCallButtonIds.BUTTON_SWAP, showSwap);
     inCallButtonUi.showButton(InCallButtonIds.BUTTON_HOLD, showHold);
@@ -482,6 +508,8 @@
     inCallButtonUi.showButton(InCallButtonIds.BUTTON_ADD_CALL, true);
     inCallButtonUi.enableButton(InCallButtonIds.BUTTON_ADD_CALL, showAddCall);
     inCallButtonUi.showButton(InCallButtonIds.BUTTON_UPGRADE_TO_VIDEO, showUpgradeToVideo);
+    inCallButtonUi.showButton(InCallButtonIds.BUTTON_UPGRADE_TO_RTT, showUpgradeToRtt);
+    inCallButtonUi.enableButton(InCallButtonIds.BUTTON_UPGRADE_TO_RTT, enableUpgradeToRtt);
     inCallButtonUi.showButton(InCallButtonIds.BUTTON_DOWNGRADE_TO_AUDIO, showDowngradeToAudio);
     inCallButtonUi.showButton(
         InCallButtonIds.BUTTON_SWITCH_CAMERA,
@@ -516,25 +544,27 @@
   @Override
   public void refreshMuteState() {
     // Restore the previous mute state
-    if (automaticallyMuted
+    if (automaticallyMutedByAddCall
         && AudioModeProvider.getInstance().getAudioState().isMuted() != previousMuteState) {
       if (inCallButtonUi == null) {
         return;
       }
       muteClicked(previousMuteState, false /* clickedByUser */);
     }
-    automaticallyMuted = false;
+    automaticallyMutedByAddCall = false;
   }
 
   @Override
   public void onSaveInstanceState(Bundle outState) {
-    outState.putBoolean(KEY_AUTOMATICALLY_MUTED, automaticallyMuted);
+    outState.putBoolean(KEY_AUTOMATICALLY_MUTED_BY_ADD_CALL, automaticallyMutedByAddCall);
     outState.putBoolean(KEY_PREVIOUS_MUTE_STATE, previousMuteState);
   }
 
   @Override
   public void onRestoreInstanceState(Bundle savedInstanceState) {
-    automaticallyMuted = savedInstanceState.getBoolean(KEY_AUTOMATICALLY_MUTED, automaticallyMuted);
+    automaticallyMutedByAddCall =
+        savedInstanceState.getBoolean(
+            KEY_AUTOMATICALLY_MUTED_BY_ADD_CALL, automaticallyMutedByAddCall);
     previousMuteState = savedInstanceState.getBoolean(KEY_PREVIOUS_MUTE_STATE, previousMuteState);
   }
 
diff --git a/java/com/android/incallui/CallCardPresenter.java b/java/com/android/incallui/CallCardPresenter.java
index 8eb07c5..dd1fc4f 100644
--- a/java/com/android/incallui/CallCardPresenter.java
+++ b/java/com/android/incallui/CallCardPresenter.java
@@ -36,24 +36,25 @@
 import android.telecom.Call.Details;
 import android.telecom.StatusHints;
 import android.telecom.TelecomManager;
+import android.text.BidiFormatter;
+import android.text.TextDirectionHeuristics;
 import android.text.TextUtils;
 import android.view.Display;
 import android.view.View;
 import android.view.accessibility.AccessibilityEvent;
 import android.view.accessibility.AccessibilityManager;
 import com.android.contacts.common.ContactsUtils;
-import com.android.contacts.common.preference.ContactsPreferences;
-import com.android.contacts.common.util.ContactDisplayUtils;
 import com.android.dialer.common.Assert;
 import com.android.dialer.common.LogUtil;
-import com.android.dialer.compat.ActivityCompat;
-import com.android.dialer.configprovider.ConfigProviderBindings;
+import com.android.dialer.configprovider.ConfigProviderComponent;
+import com.android.dialer.contacts.ContactsComponent;
 import com.android.dialer.logging.DialerImpression;
 import com.android.dialer.logging.Logger;
 import com.android.dialer.multimedia.MultimediaData;
 import com.android.dialer.oem.MotorolaUtils;
 import com.android.dialer.phonenumberutil.PhoneNumberHelper;
 import com.android.dialer.postcall.PostCall;
+import com.android.dialer.preferredsim.suggestion.SuggestionProvider;
 import com.android.incallui.ContactInfoCache.ContactCacheEntry;
 import com.android.incallui.ContactInfoCache.ContactInfoCacheCallback;
 import com.android.incallui.InCallPresenter.InCallDetailsListener;
@@ -63,8 +64,8 @@
 import com.android.incallui.InCallPresenter.IncomingCallListener;
 import com.android.incallui.call.CallList;
 import com.android.incallui.call.DialerCall;
-import com.android.incallui.call.DialerCall.State;
 import com.android.incallui.call.DialerCallListener;
+import com.android.incallui.call.state.DialerCallState;
 import com.android.incallui.calllocation.CallLocation;
 import com.android.incallui.calllocation.CallLocationComponent;
 import com.android.incallui.incall.protocol.ContactPhotoType;
@@ -121,7 +122,6 @@
   private String secondaryNumber;
   private ContactCacheEntry primaryContactInfo;
   private ContactCacheEntry secondaryContactInfo;
-  @Nullable private ContactsPreferences contactsPreferences;
   private boolean isFullscreen = false;
   private InCallScreen inCallScreen;
   private boolean isInCallScreenReady;
@@ -157,7 +157,6 @@
   public void onInCallScreenDelegateInit(InCallScreen inCallScreen) {
     Assert.isNotNull(inCallScreen);
     this.inCallScreen = inCallScreen;
-    contactsPreferences = ContactsPreferencesFactory.newContactsPreferences(context);
 
     // Call may be null if disconnect happened already.
     DialerCall call = CallList.getInstance().getFirstCall();
@@ -169,7 +168,7 @@
       call.addListener(this);
       // start processing lookups right away.
       if (!call.isConferenceCall()) {
-        startContactInfoSearch(call, true, call.getState() == DialerCall.State.INCOMING);
+        startContactInfoSearch(call, true, call.getState() == DialerCallState.INCOMING);
       } else {
         updateContactEntry(null, true);
       }
@@ -182,9 +181,6 @@
   public void onInCallScreenReady() {
     LogUtil.i("CallCardPresenter.onInCallScreenReady", null);
     Assert.checkState(!isInCallScreenReady);
-    if (contactsPreferences != null) {
-      contactsPreferences.refreshValue(ContactsPreferences.DISPLAY_ORDER_KEY);
-    }
 
     // Contact search may have completed before ui is ready.
     if (primaryContactInfo != null) {
@@ -271,10 +267,10 @@
 
       // getCallToDisplay doesn't go through outgoing or incoming calls. It will return the
       // highest priority call to display as the secondary call.
-      secondary = getCallToDisplay(callList, null, true);
+      secondary = InCallPresenter.getCallToDisplay(callList, null, true);
     } else if (newState == InCallState.INCALL) {
-      primary = getCallToDisplay(callList, null, false);
-      secondary = getCallToDisplay(callList, primary, true);
+      primary = InCallPresenter.getCallToDisplay(callList, null, false);
+      secondary = InCallPresenter.getCallToDisplay(callList, primary, true);
     }
 
     LogUtil.v("CallCardPresenter.onStateChange", "primary call: " + primary);
@@ -302,7 +298,6 @@
     this.primaryNumber = primaryNumber;
 
     if (this.primary != null) {
-      InCallPresenter.getInstance().onForegroundCallChanged(this.primary);
       inCallScreen.updateInCallScreenColors();
     }
 
@@ -320,9 +315,7 @@
       }
       this.primary.addListener(this);
 
-      primaryContactInfo =
-          ContactInfoCache.buildCacheEntryFromCall(
-              context, this.primary, this.primary.getState() == DialerCall.State.INCOMING);
+      primaryContactInfo = ContactInfoCache.buildCacheEntryFromCall(context, this.primary);
       updatePrimaryDisplayInfo();
       maybeStartSearch(this.primary, true);
     }
@@ -338,16 +331,14 @@
         updateSecondaryDisplayInfo();
       } else {
         // secondary call has changed
-        secondaryContactInfo =
-            ContactInfoCache.buildCacheEntryFromCall(
-                context, this.secondary, this.secondary.getState() == DialerCall.State.INCOMING);
+        secondaryContactInfo = ContactInfoCache.buildCacheEntryFromCall(context, this.secondary);
         updateSecondaryDisplayInfo();
         maybeStartSearch(this.secondary, false);
       }
     }
 
     // Set the call state
-    int callState = DialerCall.State.IDLE;
+    int callState = DialerCallState.IDLE;
     if (this.primary != null) {
       callState = this.primary.getState();
       updatePrimaryCallState();
@@ -361,7 +352,7 @@
     getUi()
         .setEndCallButtonEnabled(
             shouldShowEndCallButton(this.primary, callState),
-            callState != DialerCall.State.INCOMING /* animate */);
+            callState != DialerCallState.INCOMING /* animate */);
 
     maybeSendAccessibilityEvent(oldState, newState, primaryChanged);
     Trace.endSection();
@@ -478,6 +469,9 @@
                   .setSessionModificationState(primary.getVideoTech().getSessionModificationState())
                   .setDisconnectCause(primary.getDisconnectCause())
                   .setConnectionLabel(getConnectionLabel())
+                  .setPrimaryColor(
+                      InCallPresenter.getInstance().getThemeColorManager().getPrimaryColor())
+                  .setSimSuggestionReason(getSimSuggestionReason())
                   .setConnectionIcon(getCallStateIcon())
                   .setGatewayNumber(getGatewayNumber())
                   .setCallSubject(shouldShowCallSubject(primary) ? primary.getCallSubject() : null)
@@ -518,7 +512,7 @@
     if (secondary == null) {
       return ButtonState.NOT_SUPPORT;
     }
-    if (primary.getState() == State.ACTIVE) {
+    if (primary.getState() == DialerCallState.ACTIVE) {
       return ButtonState.ENABLED;
     }
     return ButtonState.DISABLED;
@@ -578,7 +572,7 @@
   private void maybeStartSearch(DialerCall call, boolean isPrimary) {
     // no need to start search for conference calls which show generic info.
     if (call != null && !call.isConferenceCall()) {
-      startContactInfoSearch(call, isPrimary, call.getState() == DialerCall.State.INCOMING);
+      startContactInfoSearch(call, isPrimary, call.getState() == DialerCallState.INCOMING);
     }
   }
 
@@ -635,54 +629,6 @@
     }
   }
 
-  /**
-   * Get the highest priority call to display. Goes through the calls and chooses which to return
-   * based on priority of which type of call to display to the user. Callers can use the "ignore"
-   * feature to get the second best call by passing a previously found primary call as ignore.
-   *
-   * @param ignore A call to ignore if found.
-   */
-  private DialerCall getCallToDisplay(
-      CallList callList, DialerCall ignore, boolean skipDisconnected) {
-    // Active calls come second.  An active call always gets precedent.
-    DialerCall retval = callList.getActiveCall();
-    if (retval != null && retval != ignore) {
-      return retval;
-    }
-
-    // Sometimes there is intemediate state that two calls are in active even one is about
-    // to be on hold.
-    retval = callList.getSecondActiveCall();
-    if (retval != null && retval != ignore) {
-      return retval;
-    }
-
-    // Disconnected calls get primary position if there are no active calls
-    // to let user know quickly what call has disconnected. Disconnected
-    // calls are very short lived.
-    if (!skipDisconnected) {
-      retval = callList.getDisconnectingCall();
-      if (retval != null && retval != ignore) {
-        return retval;
-      }
-      retval = callList.getDisconnectedCall();
-      if (retval != null && retval != ignore) {
-        return retval;
-      }
-    }
-
-    // Then we go to background call (calls on hold)
-    retval = callList.getBackgroundCall();
-    if (retval != null && retval != ignore) {
-      return retval;
-    }
-
-    // Lastly, we go to a second background call.
-    retval = callList.getSecondBackgroundCall();
-
-    return retval;
-  }
-
   private void updatePrimaryDisplayInfo() {
     if (inCallScreen == null) {
       // TODO: May also occur if search result comes back after ui is destroyed. Look into
@@ -766,13 +712,13 @@
               .setNumber(number)
               .setName(primary.updateNameIfRestricted(name))
               .setNameIsNumber(nameIsNumber)
-              .setLabel(
+              .setLocation(
                   shouldShowLocationAsLabel(nameIsNumber, primaryContactInfo.shouldShowLocation)
                       ? primaryContactInfo.location
                       : null)
-              .setLocation(
-                  isChildNumberShown || isCallSubjectShown ? null : primaryContactInfo.label)
+              .setLabel(isChildNumberShown || isCallSubjectShown ? null : primaryContactInfo.label)
               .setPhoto(primaryContactInfo.photo)
+              .setPhotoUri(primaryContactInfo.displayPhotoUri)
               .setPhotoType(primaryContactInfo.photoType)
               .setIsSipCall(primaryContactInfo.isSipCall)
               .setIsContactPhotoShown(showContactPhoto)
@@ -818,7 +764,8 @@
   }
 
   private boolean shouldShowLocation() {
-    if (!ConfigProviderBindings.get(context)
+    if (!ConfigProviderComponent.get(context)
+        .getConfigProvider()
         .getBoolean(CONFIG_ENABLE_EMERGENCY_LOCATION, CONFIG_ENABLE_EMERGENCY_LOCATION_DEFAULT)) {
       LogUtil.i("CallCardPresenter.getLocationFragment", "disabled by config.");
       return false;
@@ -835,7 +782,7 @@
       LogUtil.i("CallCardPresenter.getLocationFragment", "low battery.");
       return false;
     }
-    if (ActivityCompat.isInMultiWindowMode(inCallScreen.getInCallScreenFragment().getActivity())) {
+    if (inCallScreen.getInCallScreenFragment().getActivity().isInMultiWindowMode()) {
       LogUtil.i("CallCardPresenter.getLocationFragment", "in multi-window mode");
       return false;
     }
@@ -890,7 +837,8 @@
     int scale = batteryStatus.getIntExtra(BatteryManager.EXTRA_SCALE, -1);
     float batteryPercent = (100f * level) / scale;
     long threshold =
-        ConfigProviderBindings.get(context)
+        ConfigProviderComponent.get(context)
+            .getConfigProvider()
             .getLong(
                 CONFIG_MIN_BATTERY_PERCENT_FOR_EMERGENCY_LOCATION,
                 CONFIG_MIN_BATTERY_PERCENT_FOR_EMERGENCY_LOCATION_DEFAULT);
@@ -988,6 +936,21 @@
     return primary.getCallProviderLabel();
   }
 
+  @Nullable
+  private SuggestionProvider.Reason getSimSuggestionReason() {
+    String value =
+        primary.getIntentExtras().getString(SuggestionProvider.EXTRA_SIM_SUGGESTION_REASON);
+    if (value == null) {
+      return null;
+    }
+    try {
+      return SuggestionProvider.Reason.valueOf(value);
+    } catch (IllegalArgumentException e) {
+      LogUtil.e("CallCardPresenter.getConnectionLabel", "unknown reason " + value);
+      return null;
+    }
+  }
+
   private Drawable getCallStateIcon() {
     // Return connection icon if one exists.
     StatusHints statusHints = primary.getStatusHints();
@@ -1010,7 +973,7 @@
     if (primary == null) {
       return false;
     }
-    return DialerCall.State.isDialing(primary.getState())
+    return DialerCallState.isDialing(primary.getState())
         && primary.getGatewayInfo() != null
         && !primary.getGatewayInfo().isEmpty();
   }
@@ -1018,10 +981,14 @@
   /** Gets the name to display for the call. */
   private String getNameForCall(ContactCacheEntry contactInfo) {
     String preferredName =
-        ContactDisplayUtils.getPreferredDisplayName(
-            contactInfo.namePrimary, contactInfo.nameAlternative, contactsPreferences);
+        ContactsComponent.get(context)
+            .contactDisplayPreferences()
+            .getDisplayName(contactInfo.namePrimary, contactInfo.nameAlternative);
     if (TextUtils.isEmpty(preferredName)) {
-      return contactInfo.number;
+      return TextUtils.isEmpty(contactInfo.number)
+          ? null
+          : BidiFormatter.getInstance()
+              .unicodeWrap(contactInfo.number, TextDirectionHeuristics.LTR);
     }
     return preferredName;
   }
@@ -1069,17 +1036,17 @@
   }
 
   private boolean isPrimaryCallActive() {
-    return primary != null && primary.getState() == DialerCall.State.ACTIVE;
+    return primary != null && primary.getState() == DialerCallState.ACTIVE;
   }
 
   private boolean shouldShowEndCallButton(DialerCall primary, int callState) {
     if (primary == null) {
       return false;
     }
-    if ((!DialerCall.State.isConnectingOrConnected(callState)
-            && callState != DialerCall.State.DISCONNECTING
-            && callState != DialerCall.State.DISCONNECTED)
-        || callState == DialerCall.State.INCOMING) {
+    if ((!DialerCallState.isConnectingOrConnected(callState)
+            && callState != DialerCallState.DISCONNECTING
+            && callState != DialerCallState.DISCONNECTED)
+        || callState == DialerCallState.INCOMING) {
       return false;
     }
     if (this.primary.getVideoTech().getSessionModificationState()
@@ -1170,8 +1137,8 @@
     }
 
     boolean isIncomingOrWaiting =
-        primary.getState() == DialerCall.State.INCOMING
-            || primary.getState() == DialerCall.State.CALL_WAITING;
+        primary.getState() == DialerCallState.INCOMING
+            || primary.getState() == DialerCallState.CALL_WAITING;
     return isIncomingOrWaiting
         && !TextUtils.isEmpty(call.getCallSubject())
         && call.getNumberPresentation() == TelecomManager.PRESENTATION_ALLOWED
@@ -1188,8 +1155,8 @@
   private boolean shouldShowNoteSentToast(DialerCall call) {
     return call != null
         && hasCallSubject(call)
-        && (call.getState() == DialerCall.State.DIALING
-            || call.getState() == DialerCall.State.CONNECTING);
+        && (call.getState() == DialerCallState.DIALING
+            || call.getState() == DialerCallState.CONNECTING);
   }
 
   private InCallScreen getUi() {
diff --git a/java/com/android/incallui/CallerInfo.java b/java/com/android/incallui/CallerInfo.java
index 7a5002d..3ab3a77 100644
--- a/java/com/android/incallui/CallerInfo.java
+++ b/java/com/android/incallui/CallerInfo.java
@@ -21,22 +21,19 @@
 import android.graphics.Bitmap;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
-import android.os.Build.VERSION;
-import android.os.Build.VERSION_CODES;
 import android.provider.ContactsContract;
 import android.provider.ContactsContract.CommonDataKinds.Phone;
 import android.provider.ContactsContract.Contacts;
 import android.provider.ContactsContract.Data;
 import android.provider.ContactsContract.PhoneLookup;
 import android.provider.ContactsContract.RawContacts;
-import android.support.annotation.RequiresApi;
 import android.telephony.PhoneNumberUtils;
 import android.text.TextUtils;
 import com.android.contacts.common.ContactsUtils;
 import com.android.contacts.common.ContactsUtils.UserType;
 import com.android.contacts.common.util.TelephonyManagerUtils;
+import com.android.dialer.logging.ContactLookupResult;
 import com.android.dialer.phonenumbercache.ContactInfoHelper;
-import com.android.dialer.phonenumbercache.PhoneLookupUtil;
 import com.android.dialer.phonenumberutil.PhoneNumberHelper;
 
 /**
@@ -47,8 +44,6 @@
 
   private static final String TAG = "CallerInfo";
 
-  // We should always use this projection starting from N onward.
-  @RequiresApi(VERSION_CODES.N)
   private static final String[] DEFAULT_PHONELOOKUP_PROJECTION =
       new String[] {
         PhoneLookup.CONTACT_ID,
@@ -63,20 +58,6 @@
         PhoneLookup.SEND_TO_VOICEMAIL
       };
 
-  // In pre-N, contact id is stored in {@link PhoneLookup._ID} in non-sip query.
-  private static final String[] BACKWARD_COMPATIBLE_NON_SIP_DEFAULT_PHONELOOKUP_PROJECTION =
-      new String[] {
-        PhoneLookup._ID,
-        PhoneLookup.DISPLAY_NAME,
-        PhoneLookup.LOOKUP_KEY,
-        PhoneLookup.NUMBER,
-        PhoneLookup.NORMALIZED_NUMBER,
-        PhoneLookup.LABEL,
-        PhoneLookup.TYPE,
-        PhoneLookup.PHOTO_URI,
-        PhoneLookup.CUSTOM_RINGTONE,
-        PhoneLookup.SEND_TO_VOICEMAIL
-      };
   /**
    * Please note that, any one of these member variables can be null, and any accesses to them
    * should be prepared to handle such a case.
@@ -110,6 +91,7 @@
   public int numberPresentation;
   public int namePresentation;
   public boolean contactExists;
+  public ContactLookupResult.Type contactLookupResultType = ContactLookupResult.Type.NOT_FOUND;
   public String phoneLabel;
   /* Split up the phoneLabel into number type and label name */
   public int numberType;
@@ -174,17 +156,8 @@
     userType = ContactsUtils.USER_TYPE_CURRENT;
   }
 
-  public static String[] getDefaultPhoneLookupProjection(Uri phoneLookupUri) {
-    if (VERSION.SDK_INT >= VERSION_CODES.N) {
-      return DEFAULT_PHONELOOKUP_PROJECTION;
-    }
-    // Pre-N
-    boolean isSip =
-        phoneLookupUri.getBooleanQueryParameter(
-            ContactsContract.PhoneLookup.QUERY_PARAMETER_SIP_ADDRESS, false);
-    return (isSip)
-        ? DEFAULT_PHONELOOKUP_PROJECTION
-        : BACKWARD_COMPATIBLE_NON_SIP_DEFAULT_PHONELOOKUP_PROJECTION;
+  static String[] getDefaultPhoneLookupProjection() {
+    return DEFAULT_PHONELOOKUP_PROJECTION;
   }
 
   /**
@@ -274,9 +247,7 @@
     columnIndex = getColumnIndexForPersonId(contactRef, cursor);
     if (columnIndex != -1) {
       contactId = cursor.getLong(columnIndex);
-      // QuickContacts in M doesn't support enterprise contact id
-      if (contactId != 0
-          && (VERSION.SDK_INT >= VERSION_CODES.N || !Contacts.isEnterpriseContactId(contactId))) {
+      if (contactId != 0 && !Contacts.isEnterpriseContactId(contactId)) {
         info.contactIdOrZero = contactId;
         Log.v(TAG, "==> got info.contactIdOrZero: " + info.contactIdOrZero);
       }
@@ -315,6 +286,7 @@
     columnIndex = cursor.getColumnIndex(PhoneLookup.SEND_TO_VOICEMAIL);
     info.shouldSendToVoicemail = (columnIndex != -1) && ((cursor.getInt(columnIndex)) == 1);
     info.contactExists = true;
+    info.contactLookupResultType = ContactLookupResult.Type.LOCAL_CONTACT;
 
     // Determine userType by directoryId and contactId
     final String directory =
@@ -450,7 +422,7 @@
       // for phone numbers.
       // MIME type: PhoneLookup.CONTENT_TYPE (= "vnd.android.cursor.dir/phone_lookup")
       Log.v(TAG, "'phone_lookup' URI; using PhoneLookup._ID");
-      columnName = PhoneLookupUtil.getContactIdColumnNameForUri(contactRef);
+      columnName = PhoneLookup.CONTACT_ID;
     } else {
       Log.v(TAG, "Unexpected prefix for contactRef '" + url + "'");
     }
@@ -482,7 +454,7 @@
    * @return this instance.
    */
   /* package */ CallerInfo markAsEmergency(Context context) {
-    name = context.getString(R.string.emergency_call_dialog_number_for_display);
+    name = context.getString(R.string.emergency_number);
     phoneNumber = null;
 
     isEmergency = true;
diff --git a/java/com/android/incallui/CallerInfoAsyncQuery.java b/java/com/android/incallui/CallerInfoAsyncQuery.java
index 3358952..35011cb 100644
--- a/java/com/android/incallui/CallerInfoAsyncQuery.java
+++ b/java/com/android/incallui/CallerInfoAsyncQuery.java
@@ -17,15 +17,12 @@
 package com.android.incallui;
 
 import android.Manifest;
-import android.annotation.TargetApi;
 import android.content.AsyncQueryHandler;
 import android.content.ContentResolver;
 import android.content.Context;
 import android.database.Cursor;
 import android.database.SQLException;
 import android.net.Uri;
-import android.os.Build.VERSION;
-import android.os.Build.VERSION_CODES;
 import android.os.Handler;
 import android.os.Looper;
 import android.os.Message;
@@ -35,13 +32,12 @@
 import android.support.annotation.MainThread;
 import android.support.annotation.RequiresPermission;
 import android.support.annotation.WorkerThread;
-import android.telephony.PhoneNumberUtils;
 import android.text.TextUtils;
-import com.android.dialer.common.cp2.DirectoryCompat;
 import com.android.dialer.phonenumbercache.CachedNumberLookupService;
 import com.android.dialer.phonenumbercache.CachedNumberLookupService.CachedContactInfo;
 import com.android.dialer.phonenumbercache.ContactInfoHelper;
 import com.android.dialer.phonenumbercache.PhoneNumberCache;
+import com.android.dialer.phonenumberutil.PhoneNumberHelper;
 import com.android.dialer.strictmode.StrictModeUtils;
 import java.io.IOException;
 import java.io.InputStream;
@@ -53,7 +49,6 @@
  *
  * @see CallerInfo
  */
-@TargetApi(VERSION_CODES.M)
 public class CallerInfoAsyncQuery {
 
   /** Interface for a CallerInfoAsyncQueryHandler result return. */
@@ -166,7 +161,7 @@
     cw.countryIso = info.countryIso;
 
     // check to see if these are recognized numbers, and use shortcuts if we can.
-    if (PhoneNumberUtils.isLocalEmergencyNumber(context, info.phoneNumber)) {
+    if (PhoneNumberHelper.isLocalEmergencyNumber(context, info.phoneNumber)) {
       cw.event = EVENT_EMERGENCY_NUMBER;
     } else if (info.isVoiceMailNumber()) {
       cw.event = EVENT_VOICEMAIL_NUMBER;
@@ -174,7 +169,7 @@
       cw.event = EVENT_NEW_QUERY;
     }
 
-    String[] proejection = CallerInfo.getDefaultPhoneLookupProjection(contactRef);
+    String[] proejection = CallerInfo.getDefaultPhoneLookupProjection();
     handler.startQuery(
         token,
         cw, // cookie
@@ -223,10 +218,7 @@
   private static long[] getDirectoryIds(Context context) {
     ArrayList<Long> results = new ArrayList<>();
 
-    Uri uri = Directory.CONTENT_URI;
-    if (VERSION.SDK_INT >= VERSION_CODES.N) {
-      uri = Uri.withAppendedPath(ContactsContract.AUTHORITY_URI, "directories_enterprise");
-    }
+    Uri uri = Uri.withAppendedPath(ContactsContract.AUTHORITY_URI, "directories_enterprise");
 
     ContentResolver cr = context.getContentResolver();
     Cursor cursor = cr.query(uri, DIRECTORY_PROJECTION, null, null, null);
@@ -244,7 +236,7 @@
       int idIndex = cursor.getColumnIndex(Directory._ID);
       while (cursor.moveToNext()) {
         long id = cursor.getLong(idIndex);
-        if (DirectoryCompat.isRemoteDirectoryId(id)) {
+        if (Directory.isRemoteDirectoryId(id)) {
           results.add(id);
         }
       }
diff --git a/java/com/android/incallui/ConferenceParticipantListAdapter.java b/java/com/android/incallui/ConferenceParticipantListAdapter.java
index 4780974..d13bd3d 100644
--- a/java/com/android/incallui/ConferenceParticipantListAdapter.java
+++ b/java/com/android/incallui/ConferenceParticipantListAdapter.java
@@ -18,7 +18,6 @@
 
 import android.content.Context;
 import android.net.Uri;
-import android.support.annotation.Nullable;
 import android.support.v4.util.ArrayMap;
 import android.telephony.PhoneNumberUtils;
 import android.text.BidiFormatter;
@@ -33,14 +32,14 @@
 import android.widget.ImageView;
 import android.widget.ListView;
 import android.widget.TextView;
-import com.android.contacts.common.preference.ContactsPreferences;
-import com.android.contacts.common.util.ContactDisplayUtils;
 import com.android.dialer.common.LogUtil;
 import com.android.dialer.contactphoto.ContactPhotoManager;
 import com.android.dialer.contactphoto.ContactPhotoManager.DefaultImageRequest;
+import com.android.dialer.contacts.ContactsComponent;
 import com.android.incallui.ContactInfoCache.ContactCacheEntry;
 import com.android.incallui.call.CallList;
 import com.android.incallui.call.DialerCall;
+import com.android.incallui.call.state.DialerCallState;
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -58,8 +57,6 @@
   private final ListView listView;
   /** Hashmap to make accessing participant info by call Id faster. */
   private final Map<String, ParticipantInfo> participantsByCallId = new ArrayMap<>();
-  /** ContactsPreferences used to lookup displayName preferences */
-  @Nullable private final ContactsPreferences contactsPreferences;
   /** Contact photo manager to retrieve cached contact photo information. */
   private final ContactPhotoManager contactPhotoManager;
   /** Listener used to handle tap of the "disconnect' button for a participant. */
@@ -102,7 +99,6 @@
       ListView listView, ContactPhotoManager contactPhotoManager) {
 
     this.listView = listView;
-    contactsPreferences = ContactsPreferencesFactory.newContactsPreferences(getContext());
     this.contactPhotoManager = contactPhotoManager;
   }
 
@@ -115,10 +111,6 @@
    */
   public void updateParticipants(
       List<DialerCall> conferenceParticipants, boolean parentCanSeparate) {
-    if (contactsPreferences != null) {
-      contactsPreferences.refreshValue(ContactsPreferences.DISPLAY_ORDER_KEY);
-      contactsPreferences.refreshValue(ContactsPreferences.SORT_ORDER_KEY);
-    }
     this.parentCanSeparate = parentCanSeparate;
     updateParticipantInfo(conferenceParticipants);
   }
@@ -223,7 +215,7 @@
     if (!participantInfo.isCacheLookupComplete()) {
       cache.findInfo(
           participantInfo.getCall(),
-          participantInfo.getCall().getState() == DialerCall.State.INCOMING,
+          participantInfo.getCall().getState() == DialerCallState.INCOMING,
           new ContactLookupCallback(this));
     }
 
@@ -234,8 +226,9 @@
         call.can(android.telecom.Call.Details.CAPABILITY_DISCONNECT_FROM_CONFERENCE);
 
     String name =
-        ContactDisplayUtils.getPreferredDisplayName(
-            contactCache.namePrimary, contactCache.nameAlternative, contactsPreferences);
+        ContactsComponent.get(getContext())
+            .contactDisplayPreferences()
+            .getDisplayName(contactCache.namePrimary, contactCache.nameAlternative);
 
     setCallerInfoForRow(
         result,
@@ -299,7 +292,7 @@
     final View endButton = view.findViewById(R.id.conferenceCallerDisconnect);
     final View separateButton = view.findViewById(R.id.conferenceCallerSeparate);
 
-    if (callState == DialerCall.State.ONHOLD) {
+    if (callState == DialerCallState.ONHOLD) {
       setViewsOnHold(photoView, statusTextView, nameTextView, numberTextView);
     } else {
       setViewsNotOnHold(photoView, statusTextView, nameTextView, numberTextView);
@@ -356,9 +349,8 @@
     statusTextView.setText(onHoldText);
     statusTextView.setVisibility(View.VISIBLE);
 
-    int onHoldColor = getContext().getColor(R.color.dialer_secondary_text_color_hiden);
-    nameTextView.setTextColor(onHoldColor);
-    numberTextView.setTextColor(onHoldColor);
+    nameTextView.setEnabled(false);
+    numberTextView.setEnabled(false);
 
     TypedValue alpha = new TypedValue();
     getContext().getResources().getValue(R.dimen.alpha_hiden, alpha, true);
@@ -372,10 +364,8 @@
       TextView numberTextView) {
     statusTextView.setVisibility(View.GONE);
 
-    nameTextView.setTextColor(
-        getContext().getColor(R.color.conference_call_manager_caller_name_text_color));
-    numberTextView.setTextColor(
-        getContext().getColor(R.color.conference_call_manager_secondary_text_color));
+    nameTextView.setEnabled(true);
+    numberTextView.setEnabled(true);
 
     TypedValue alpha = new TypedValue();
     getContext().getResources().getValue(R.dimen.alpha_enabled, alpha, true);
@@ -399,9 +389,7 @@
       newCallIds.add(callId);
       ContactCacheEntry contactCache = cache.getInfo(callId);
       if (contactCache == null) {
-        contactCache =
-            ContactInfoCache.buildCacheEntryFromCall(
-                getContext(), call, call.getState() == DialerCall.State.INCOMING);
+        contactCache = ContactInfoCache.buildCacheEntryFromCall(getContext(), call);
       }
 
       if (participantsByCallId.containsKey(callId)) {
@@ -445,14 +433,16 @@
             // Contact names might be null, so replace with empty string.
             ContactCacheEntry c1 = p1.getContactCacheEntry();
             String p1Name =
-                ContactDisplayUtils.getPreferredSortName(
-                    c1.namePrimary, c1.nameAlternative, contactsPreferences);
+                ContactsComponent.get(getContext())
+                    .contactDisplayPreferences()
+                    .getSortName(c1.namePrimary, c1.nameAlternative);
             p1Name = p1Name != null ? p1Name : "";
 
             ContactCacheEntry c2 = p2.getContactCacheEntry();
             String p2Name =
-                ContactDisplayUtils.getPreferredSortName(
-                    c2.namePrimary, c2.nameAlternative, contactsPreferences);
+                ContactsComponent.get(getContext())
+                    .contactDisplayPreferences()
+                    .getSortName(c2.namePrimary, c2.nameAlternative);
             p2Name = p2Name != null ? p2Name : "";
 
             return p1Name.compareToIgnoreCase(p2Name);
diff --git a/java/com/android/incallui/ContactInfoCache.java b/java/com/android/incallui/ContactInfoCache.java
index 9051338..f01bddd 100644
--- a/java/com/android/incallui/ContactInfoCache.java
+++ b/java/com/android/incallui/ContactInfoCache.java
@@ -22,8 +22,6 @@
 import android.graphics.drawable.Drawable;
 import android.media.RingtoneManager;
 import android.net.Uri;
-import android.os.Build.VERSION;
-import android.os.Build.VERSION_CODES;
 import android.os.SystemClock;
 import android.os.Trace;
 import android.provider.ContactsContract.CommonDataKinds.Phone;
@@ -140,8 +138,7 @@
     return cache;
   }
 
-  static ContactCacheEntry buildCacheEntryFromCall(
-      Context context, DialerCall call, boolean isIncoming) {
+  static ContactCacheEntry buildCacheEntryFromCall(Context context, DialerCall call) {
     final ContactCacheEntry entry = new ContactCacheEntry();
 
     // TODO: get rid of caller info.
@@ -276,7 +273,7 @@
     cce.isVoicemailNumber = info.isVoiceMailNumber();
 
     if (info.contactExists) {
-      cce.contactLookupResult = ContactLookupResult.Type.LOCAL_CONTACT;
+      cce.contactLookupResult = info.contactLookupResultType;
     }
   }
 
@@ -516,7 +513,7 @@
       return;
     }
     CequintCallerIdContact cequintCallerIdContact =
-        CequintCallerIdManager.getCequintCallerIdContactForInCall(
+        CequintCallerIdManager.getCequintCallerIdContactForCall(
             context, callerInfo.phoneNumber, cnapName, isIncoming);
 
     if (cequintCallerIdContact == null) {
@@ -524,25 +521,26 @@
     }
     boolean hasUpdate = false;
 
-    if (TextUtils.isEmpty(callerInfo.name) && !TextUtils.isEmpty(cequintCallerIdContact.name)) {
-      callerInfo.name = cequintCallerIdContact.name;
+    if (TextUtils.isEmpty(callerInfo.name) && !TextUtils.isEmpty(cequintCallerIdContact.name())) {
+      callerInfo.name = cequintCallerIdContact.name();
       hasUpdate = true;
     }
-    if (!TextUtils.isEmpty(cequintCallerIdContact.geoDescription)) {
-      callerInfo.geoDescription = cequintCallerIdContact.geoDescription;
+    if (!TextUtils.isEmpty(cequintCallerIdContact.geolocation())) {
+      callerInfo.geoDescription = cequintCallerIdContact.geolocation();
       callerInfo.shouldShowGeoDescription = true;
       hasUpdate = true;
     }
     // Don't overwrite photo in local contacts.
     if (!callerInfo.contactExists
         && callerInfo.contactDisplayPhotoUri == null
-        && cequintCallerIdContact.imageUrl != null) {
-      callerInfo.contactDisplayPhotoUri = Uri.parse(cequintCallerIdContact.imageUrl);
+        && cequintCallerIdContact.photoUri() != null) {
+      callerInfo.contactDisplayPhotoUri = Uri.parse(cequintCallerIdContact.photoUri());
       hasUpdate = true;
     }
     // Set contact to exist to avoid phone number service lookup.
     if (hasUpdate) {
       callerInfo.contactExists = true;
+      callerInfo.contactLookupResultType = ContactLookupResult.Type.CEQUINT;
     }
   }
 
@@ -640,10 +638,7 @@
       cce.photo = null;
     }
 
-    // Support any contact id in N because QuickContacts in N starts supporting enterprise
-    // contact id
-    if (info.lookupKeyOrNull != null
-        && (VERSION.SDK_INT >= VERSION_CODES.N || info.contactIdOrZero != 0)) {
+    if (info.lookupKeyOrNull != null && info.contactIdOrZero != 0) {
       cce.lookupUri = Contacts.getLookupUri(info.contactIdOrZero, info.lookupKeyOrNull);
     } else {
       Log.v(TAG, "lookup key is null or contact ID is 0 on M. Don't create a lookup uri.");
@@ -841,7 +836,7 @@
         final PhoneNumberServiceListener listener =
             new PhoneNumberServiceListener(callId, queryToken.queryId);
         cacheEntry.hasPendingQuery = true;
-        phoneNumberService.getPhoneNumberInfo(cacheEntry.number, listener, listener, isIncoming);
+        phoneNumberService.getPhoneNumberInfo(cacheEntry.number, listener);
       }
       sendInfoNotifications(callId, cacheEntry);
       if (!cacheEntry.hasPendingQuery) {
@@ -859,8 +854,7 @@
     }
   }
 
-  class PhoneNumberServiceListener
-      implements PhoneNumberService.NumberLookupListener, PhoneNumberService.ImageLookupListener {
+  class PhoneNumberServiceListener implements PhoneNumberService.NumberLookupListener {
 
     private final String callId;
     private final int queryIdOfRemoteLookup;
@@ -928,17 +922,6 @@
         clearCallbacks(callId);
       }
     }
-
-    @Override
-    public void onImageFetchComplete(Bitmap bitmap) {
-      Log.d(TAG, "PhoneNumberServiceListener.onImageFetchComplete");
-      if (!isWaitingForThisQuery(callId, queryIdOfRemoteLookup)) {
-        return;
-      }
-      CallerInfoQueryToken queryToken = new CallerInfoQueryToken(queryIdOfRemoteLookup, callId);
-      loadImage(null, bitmap, queryToken);
-      onImageLoadComplete(TOKEN_UPDATE_PHOTO_FOR_CALL_STATE, null, bitmap, queryToken);
-    }
   }
 
   private boolean needForceQuery(DialerCall call, ContactCacheEntry cacheEntry) {
diff --git a/java/com/android/incallui/ContactsPreferencesFactory.java b/java/com/android/incallui/ContactsPreferencesFactory.java
deleted file mode 100644
index a9a2109..0000000
--- a/java/com/android/incallui/ContactsPreferencesFactory.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.incallui;
-
-import android.content.Context;
-import android.support.annotation.Nullable;
-import android.support.v4.os.UserManagerCompat;
-import com.android.contacts.common.preference.ContactsPreferences;
-
-/** Factory class for {@link ContactsPreferences}. */
-public class ContactsPreferencesFactory {
-
-  private static boolean useTestInstance;
-  private static ContactsPreferences testInstance;
-
-  /**
-   * Creates a new {@link ContactsPreferences} object if possible.
-   *
-   * @param context the context to use when creating the ContactsPreferences.
-   * @return a new ContactsPreferences object or {@code null} if the user is locked.
-   */
-  @Nullable
-  public static ContactsPreferences newContactsPreferences(Context context) {
-    if (useTestInstance) {
-      return testInstance;
-    }
-    if (UserManagerCompat.isUserUnlocked(context)) {
-      return new ContactsPreferences(context);
-    }
-    return null;
-  }
-
-  /**
-   * Sets the instance to be returned by all calls to {@link #newContactsPreferences(Context)}.
-   *
-   * @param testInstance the instance to return.
-   */
-  static void setTestInstance(ContactsPreferences testInstance) {
-    useTestInstance = true;
-    ContactsPreferencesFactory.testInstance = testInstance;
-  }
-}
diff --git a/java/com/android/incallui/DialpadFragment.java b/java/com/android/incallui/DialpadFragment.java
index 44eaf21..2ae2aca 100644
--- a/java/com/android/incallui/DialpadFragment.java
+++ b/java/com/android/incallui/DialpadFragment.java
@@ -21,6 +21,7 @@
 import android.telephony.PhoneNumberUtils;
 import android.util.ArrayMap;
 import android.util.AttributeSet;
+import android.view.ContextThemeWrapper;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -84,6 +85,8 @@
   private DtmfKeyListener dtmfKeyListener;
   private DialpadView dialpadView;
   private int currentTextColor;
+  private View endCallSpace;
+  private boolean shouldShowEndCallSpace = true;
 
   @Override
   public void onClick(View v) {
@@ -134,7 +137,9 @@
   @Override
   public View onCreateView(
       LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-    final View parent = inflater.inflate(R.layout.incall_dialpad_fragment, container, false);
+    Context contextThemeWrapper = new ContextThemeWrapper(getActivity(), R.style.Dialer_ThemeBase);
+    LayoutInflater layoutInflater = inflater.cloneInContext(contextThemeWrapper);
+    final View parent = layoutInflater.inflate(R.layout.incall_dialpad_fragment, container, false);
     dialpadView = (DialpadView) parent.findViewById(R.id.dialpad_view);
     dialpadView.setCanDigitsBeEdited(false);
     dialpadView.setBackgroundResource(R.color.incall_dialpad_background);
@@ -152,6 +157,7 @@
     View backButton = dialpadView.findViewById(R.id.dialpad_back);
     backButton.setVisibility(View.VISIBLE);
     backButton.setOnClickListener(this);
+    endCallSpace = dialpadView.findViewById(R.id.end_call_space);
 
     return parent;
   }
@@ -160,6 +166,7 @@
   public void onResume() {
     super.onResume();
     updateColors();
+    endCallSpace.setVisibility(shouldShowEndCallSpace ? View.VISIBLE : View.GONE);
   }
 
   public void updateColors() {
@@ -268,6 +275,10 @@
     }
   }
 
+  public void setShouldShowEndCallSpace(boolean show) {
+    shouldShowEndCallSpace = show;
+  }
+
   /**
    * LinearLayout with getter and setter methods for the translationY property using floats, for
    * animation purposes.
diff --git a/java/com/android/incallui/ExternalCallNotifier.java b/java/com/android/incallui/ExternalCallNotifier.java
index 8c882d2..160e250 100644
--- a/java/com/android/incallui/ExternalCallNotifier.java
+++ b/java/com/android/incallui/ExternalCallNotifier.java
@@ -38,13 +38,13 @@
 import android.util.ArrayMap;
 import com.android.contacts.common.ContactsUtils;
 import com.android.contacts.common.compat.CallCompat;
-import com.android.contacts.common.preference.ContactsPreferences;
-import com.android.contacts.common.util.ContactDisplayUtils;
 import com.android.dialer.common.Assert;
 import com.android.dialer.contactphoto.BitmapUtil;
+import com.android.dialer.contacts.ContactsComponent;
 import com.android.dialer.notification.DialerNotificationManager;
 import com.android.dialer.notification.NotificationChannelId;
 import com.android.dialer.telecom.TelecomCallUtil;
+import com.android.dialer.theme.base.ThemeComponent;
 import com.android.incallui.call.DialerCall;
 import com.android.incallui.call.DialerCallDelegate;
 import com.android.incallui.call.ExternalCallList;
@@ -77,13 +77,11 @@
   private final ContactInfoCache contactInfoCache;
   private Map<Call, NotificationInfo> notifications = new ArrayMap<>();
   private int nextUniqueNotificationId;
-  private ContactsPreferences contactsPreferences;
 
   /** Initializes a new instance of the external call notifier. */
   public ExternalCallNotifier(
       @NonNull Context context, @NonNull ContactInfoCache contactInfoCache) {
     this.context = context;
-    contactsPreferences = ContactsPreferencesFactory.newContactsPreferences(this.context);
     this.contactInfoCache = contactInfoCache;
   }
 
@@ -215,7 +213,7 @@
    * notification to the notification manager.
    */
   private void saveContactInfo(NotificationInfo info, ContactInfoCache.ContactCacheEntry entry) {
-    info.setContentTitle(getContentTitle(context, contactsPreferences, entry, info.getCall()));
+    info.setContentTitle(getContentTitle(context, entry, info.getCall()));
     info.setPersonReference(getPersonReference(entry, info.getCall()));
     postNotification(info);
   }
@@ -239,7 +237,7 @@
     builder.setSmallIcon(R.drawable.quantum_ic_call_white_24);
     builder.setContentTitle(info.getContentTitle());
     builder.setLargeIcon(info.getLargeIcon());
-    builder.setColor(context.getResources().getColor(R.color.dialer_theme_color));
+    builder.setColor(ThemeComponent.get(context).theme().getColorPrimary());
     builder.addPerson(info.getPersonReference());
     if (BuildCompat.isAtLeastO()) {
       builder.setChannelId(NotificationChannelId.DEFAULT);
@@ -275,7 +273,7 @@
      */
     Notification.Builder publicBuilder = new Notification.Builder(context);
     publicBuilder.setSmallIcon(R.drawable.quantum_ic_call_white_24);
-    publicBuilder.setColor(context.getResources().getColor(R.color.dialer_theme_color));
+    publicBuilder.setColor(ThemeComponent.get(context).theme().getColorPrimary());
     if (BuildCompat.isAtLeastO()) {
       publicBuilder.setChannelId(NotificationChannelId.DEFAULT);
     }
@@ -341,17 +339,12 @@
    * number.
    *
    * @param context The context.
-   * @param contactsPreferences Contacts preferences, used to determine the preferred formatting for
-   *     contact names.
    * @param contactInfo The contact info which was looked up in the contact cache.
    * @param call The call to generate a title for.
    * @return The content title.
    */
   private @Nullable String getContentTitle(
-      Context context,
-      @Nullable ContactsPreferences contactsPreferences,
-      ContactInfoCache.ContactCacheEntry contactInfo,
-      android.telecom.Call call) {
+      Context context, ContactInfoCache.ContactCacheEntry contactInfo, android.telecom.Call call) {
 
     if (call.getDetails().hasProperty(android.telecom.Call.Details.PROPERTY_CONFERENCE)) {
       return CallerInfoUtils.getConferenceString(
@@ -360,8 +353,9 @@
     }
 
     String preferredName =
-        ContactDisplayUtils.getPreferredDisplayName(
-            contactInfo.namePrimary, contactInfo.nameAlternative, contactsPreferences);
+        ContactsComponent.get(context)
+            .contactDisplayPreferences()
+            .getDisplayName(contactInfo.namePrimary, contactInfo.nameAlternative);
     if (TextUtils.isEmpty(preferredName)) {
       return TextUtils.isEmpty(contactInfo.number)
           ? null
diff --git a/java/com/android/incallui/InCallActivity.java b/java/com/android/incallui/InCallActivity.java
index f842aed..3ff1d26 100644
--- a/java/com/android/incallui/InCallActivity.java
+++ b/java/com/android/incallui/InCallActivity.java
@@ -35,10 +35,13 @@
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.annotation.VisibleForTesting;
+import android.support.v4.app.DialogFragment;
+import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentTransaction;
 import android.support.v4.content.res.ResourcesCompat;
 import android.support.v4.graphics.ColorUtils;
+import android.telecom.Call;
 import android.telecom.CallAudioState;
 import android.telecom.PhoneAccountHandle;
 import android.telephony.TelephonyManager;
@@ -56,14 +59,18 @@
 import com.android.dialer.animation.AnimationListenerAdapter;
 import com.android.dialer.common.Assert;
 import com.android.dialer.common.LogUtil;
+import com.android.dialer.common.concurrent.DialerExecutorComponent;
 import com.android.dialer.common.concurrent.ThreadUtil;
-import com.android.dialer.compat.ActivityCompat;
-import com.android.dialer.compat.CompatUtils;
-import com.android.dialer.configprovider.ConfigProviderBindings;
+import com.android.dialer.common.concurrent.UiListener;
+import com.android.dialer.configprovider.ConfigProviderComponent;
 import com.android.dialer.logging.Logger;
 import com.android.dialer.logging.ScreenEvent;
 import com.android.dialer.metrics.Metrics;
 import com.android.dialer.metrics.MetricsComponent;
+import com.android.dialer.preferredsim.PreferredAccountRecorder;
+import com.android.dialer.preferredsim.PreferredAccountWorker;
+import com.android.dialer.preferredsim.PreferredAccountWorker.Result;
+import com.android.dialer.preferredsim.PreferredSimComponent;
 import com.android.dialer.util.ViewUtil;
 import com.android.incallui.answer.bindings.AnswerBindings;
 import com.android.incallui.answer.protocol.AnswerScreen;
@@ -73,8 +80,8 @@
 import com.android.incallui.audiomode.AudioModeProvider;
 import com.android.incallui.call.CallList;
 import com.android.incallui.call.DialerCall;
-import com.android.incallui.call.DialerCall.State;
 import com.android.incallui.call.TelecomAdapter;
+import com.android.incallui.call.state.DialerCallState;
 import com.android.incallui.callpending.CallPendingActivity;
 import com.android.incallui.disconnectdialog.DisconnectMessage;
 import com.android.incallui.incall.bindings.InCallBindings;
@@ -88,16 +95,18 @@
 import com.android.incallui.rtt.protocol.RttCallScreen;
 import com.android.incallui.rtt.protocol.RttCallScreenDelegate;
 import com.android.incallui.rtt.protocol.RttCallScreenDelegateFactory;
+import com.android.incallui.speakeasy.SpeakEasyCallManager;
 import com.android.incallui.telecomeventui.InternationalCallOnWifiDialogFragment;
 import com.android.incallui.video.bindings.VideoBindings;
 import com.android.incallui.video.protocol.VideoCallScreen;
 import com.android.incallui.video.protocol.VideoCallScreenDelegate;
 import com.android.incallui.video.protocol.VideoCallScreenDelegateFactory;
-import com.google.common.base.Optional;
+import com.google.common.util.concurrent.ListenableFuture;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 
 /** Version of {@link InCallActivity} that shows the new UI */
 public class InCallActivity extends TransactionSafeFragmentActivity
@@ -120,12 +129,10 @@
   private static final int DIALPAD_REQUEST_SHOW = 2;
   private static final int DIALPAD_REQUEST_HIDE = 3;
 
-  private static Optional<Integer> audioRouteForTesting = Optional.absent();
+  private static Optional<Integer> audioRouteForTesting = Optional.empty();
 
-  private final InternationalCallOnWifiCallback internationalCallOnWifiCallback =
-      new InternationalCallOnWifiCallback();
-  private final SelectPhoneAccountListener selectPhoneAccountListener =
-      new SelectPhoneAccountListener();
+  private SelectPhoneAccountListener selectPhoneAccountListener;
+  private UiListener<Result> preferredAccountWorkerResultListener;
 
   private Animation dialpadSlideInAnimation;
   private Animation dialpadSlideOutAnimation;
@@ -135,23 +142,24 @@
   private View pseudoBlackScreenOverlay;
   private SelectPhoneAccountDialogFragment selectPhoneAccountDialogFragment;
   private String dtmfTextToPrepopulate;
-  private String showPostCharWaitDialogCallId;
-  private String showPostCharWaitDialogChars;
   private boolean allowOrientationChange;
   private boolean animateDialpadOnShow;
   private boolean didShowAnswerScreen;
   private boolean didShowInCallScreen;
   private boolean didShowVideoCallScreen;
   private boolean didShowRttCallScreen;
+  private boolean didShowSpeakEasyScreen;
+  private String lastShownSpeakEasyScreenUniqueCallid = "";
   private boolean dismissKeyguard;
   private boolean isInShowMainInCallFragment;
   private boolean isRecreating; // whether the activity is going to be recreated
   private boolean isVisible;
   private boolean needDismissPendingDialogs;
-  private boolean showPostCharWaitDialogOnResume;
   private boolean touchDownWhenPseudoScreenOff;
   private int[] backgroundDrawableColors;
   @DialpadRequestType private int showDialpadRequest = DIALPAD_REQUEST_NONE;
+  private SpeakEasyCallManager speakEasyCallManager;
+  private DialogFragment rttRequestDialogFragment;
 
   public static Intent getIntent(
       Context context, boolean showDialpad, boolean newOutgoingCall, boolean isForFullScreen) {
@@ -179,11 +187,18 @@
     Trace.beginSection("InCallActivity.onCreate");
     super.onCreate(bundle);
 
+    preferredAccountWorkerResultListener =
+        DialerExecutorComponent.get(this)
+            .createUiListener(getFragmentManager(), "preferredAccountWorkerResultListener");
+
+    selectPhoneAccountListener = new SelectPhoneAccountListener(getApplicationContext());
+
     if (bundle != null) {
       didShowAnswerScreen = bundle.getBoolean(KeysForSavedInstance.DID_SHOW_ANSWER_SCREEN);
       didShowInCallScreen = bundle.getBoolean(KeysForSavedInstance.DID_SHOW_IN_CALL_SCREEN);
       didShowVideoCallScreen = bundle.getBoolean(KeysForSavedInstance.DID_SHOW_VIDEO_CALL_SCREEN);
       didShowRttCallScreen = bundle.getBoolean(KeysForSavedInstance.DID_SHOW_RTT_CALL_SCREEN);
+      didShowSpeakEasyScreen = bundle.getBoolean(KeysForSavedInstance.DID_SHOW_SPEAK_EASY_SCREEN);
     }
 
     setWindowFlags();
@@ -233,13 +248,6 @@
       }
     }
 
-    InternationalCallOnWifiDialogFragment existingInternationalCallOnWifiDialogFragment =
-        (InternationalCallOnWifiDialogFragment)
-            getSupportFragmentManager().findFragmentByTag(Tags.INTERNATIONAL_CALL_ON_WIFI);
-    if (existingInternationalCallOnWifiDialogFragment != null) {
-      existingInternationalCallOnWifiDialogFragment.setCallback(internationalCallOnWifiCallback);
-    }
-
     inCallOrientationEventListener = new InCallOrientationEventListener(this);
 
     getWindow()
@@ -310,9 +318,7 @@
 
       // InCallActivity is responsible for disconnecting a new outgoing call if there is no way of
       // making it (i.e. no valid call capable accounts).
-      // If the version is not MSIM compatible, ignore this code.
-      if (CompatUtils.isMSIMCompatible()
-          && InCallPresenter.isCallWithNoValidAccounts(outgoingCall)) {
+      if (InCallPresenter.isCallWithNoValidAccounts(outgoingCall)) {
         LogUtil.i(
             "InCallActivity.internalResolveIntent", "Call with no valid accounts, disconnecting");
         outgoingCall.disconnect();
@@ -341,7 +347,7 @@
       // If there's only one line in use, AND it's on hold, then we're sure the user
       // wants to use the dialpad toward the exact line, so un-hold the holding line.
       DialerCall call = CallList.getInstance().getActiveOrBackgroundCall();
-      if (call != null && call.getState() == State.ONHOLD) {
+      if (call != null && call.getState() == DialerCallState.ONHOLD) {
         call.unhold();
       }
     }
@@ -358,22 +364,51 @@
       return false;
     }
 
+    PreferredAccountWorker preferredAccountWorker =
+        PreferredSimComponent.get(this).preferredAccountWorker();
+
     Bundle extras = waitingForAccountCall.getIntentExtras();
     List<PhoneAccountHandle> phoneAccountHandles =
         extras == null
             ? new ArrayList<>()
-            : extras.getParcelableArrayList(android.telecom.Call.AVAILABLE_PHONE_ACCOUNTS);
+            : extras.getParcelableArrayList(Call.AVAILABLE_PHONE_ACCOUNTS);
 
-    selectPhoneAccountDialogFragment =
-        SelectPhoneAccountDialogFragment.newInstance(
-            R.string.select_phone_account_for_calls,
-            true /* canSetDefault */,
-            0 /* setDefaultResId */,
-            phoneAccountHandles,
-            selectPhoneAccountListener,
-            waitingForAccountCall.getId(),
-            null /* hints */);
-    selectPhoneAccountDialogFragment.show(getFragmentManager(), Tags.SELECT_ACCOUNT_FRAGMENT);
+    ListenableFuture<PreferredAccountWorker.Result> preferredAccountFuture =
+        preferredAccountWorker.selectAccount(
+            waitingForAccountCall.getNumber(), phoneAccountHandles);
+    preferredAccountWorkerResultListener.listen(
+        this,
+        preferredAccountFuture,
+        result -> {
+          String callId = waitingForAccountCall.getId();
+          if (result.getSelectedPhoneAccountHandle().isPresent()) {
+            selectPhoneAccountListener.onPhoneAccountSelected(
+                result.getSelectedPhoneAccountHandle().get(), false, callId);
+            return;
+          }
+
+          if (!isVisible()) {
+            LogUtil.i(
+                "InCallActivity.showPhoneAccountSelectionDialog",
+                "activity ended before result returned");
+            return;
+          }
+
+          waitingForAccountCall.setPreferredAccountRecorder(
+              new PreferredAccountRecorder(
+                  waitingForAccountCall.getNumber(),
+                  result.getSuggestion().orNull(),
+                  result.getDataId().orNull()));
+          selectPhoneAccountDialogFragment =
+              SelectPhoneAccountDialogFragment.newInstance(
+                  result.getDialogOptionsBuilder().get().setCallId(callId).build(),
+                  selectPhoneAccountListener);
+          selectPhoneAccountDialogFragment.show(getFragmentManager(), Tags.SELECT_ACCOUNT_FRAGMENT);
+        },
+        throwable -> {
+          throw new RuntimeException(throwable);
+        });
+
     return true;
   }
 
@@ -392,6 +427,7 @@
     out.putBoolean(KeysForSavedInstance.DID_SHOW_IN_CALL_SCREEN, didShowInCallScreen);
     out.putBoolean(KeysForSavedInstance.DID_SHOW_VIDEO_CALL_SCREEN, didShowVideoCallScreen);
     out.putBoolean(KeysForSavedInstance.DID_SHOW_RTT_CALL_SCREEN, didShowRttCallScreen);
+    out.putBoolean(KeysForSavedInstance.DID_SHOW_SPEAK_EASY_SCREEN, didShowSpeakEasyScreen);
 
     super.onSaveInstanceState(out);
     isVisible = false;
@@ -415,8 +451,7 @@
       InCallPresenter.getInstance().onUiShowing(true);
     }
 
-    if (ActivityCompat.isInMultiWindowMode(this)
-        && !getResources().getBoolean(R.bool.incall_dialpad_allowed)) {
+    if (isInMultiWindowMode() && !getResources().getBoolean(R.bool.incall_dialpad_allowed)) {
       // Hide the dialpad because there may not be enough room
       showDialpadFragment(false, false);
     }
@@ -431,7 +466,6 @@
 
     if (!InCallPresenter.getInstance().isReadyForTearDown()) {
       updateTaskDescription();
-      InCallPresenter.getInstance().updateNotification();
     }
 
     // If there is a pending request to show or hide the dialpad, handle that now.
@@ -457,11 +491,6 @@
       }
       showDialpadRequest = DIALPAD_REQUEST_NONE;
     }
-    updateNavigationBar(isDialpadVisible());
-
-    if (showPostCharWaitDialogOnResume) {
-      showDialogForPostCharWait(showPostCharWaitDialogCallId, showPostCharWaitDialogChars);
-    }
 
     CallList.getInstance()
         .onInCallUiShown(getIntent().getBooleanExtra(IntentExtraNames.FOR_FULL_SCREEN, false));
@@ -489,8 +518,6 @@
       dialpadFragment.onDialerKeyUp(null);
     }
 
-    InCallPresenter.getInstance().updateNotification();
-
     InCallPresenter.getInstance().getPseudoScreenState().removeListener(this);
     Trace.endSection();
   }
@@ -519,9 +546,9 @@
     InCallPresenter.getInstance().onActivityStopped();
     if (!isRecreating) {
       InCallPresenter.getInstance().onUiShowing(false);
-      if (errorDialog != null) {
-        errorDialog.dismiss();
-      }
+    }
+    if (errorDialog != null) {
+      errorDialog.dismiss();
     }
 
     if (isFinishing()) {
@@ -782,10 +809,6 @@
       sensor.onDialpadVisible(show);
     }
     showDialpadRequest = DIALPAD_REQUEST_NONE;
-
-    // Note:  onInCallScreenDialpadVisibilityChange is called here to ensure that the dialpad FAB
-    // repositions itself.
-    getInCallScreen().onInCallScreenDialpadVisibilityChange(show);
   }
 
   private void showDialpadFragment() {
@@ -797,16 +820,20 @@
     FragmentTransaction transaction = dialpadFragmentManager.beginTransaction();
     DialpadFragment dialpadFragment = getDialpadFragment();
     if (dialpadFragment == null) {
-      transaction.add(getDialpadContainerId(), new DialpadFragment(), Tags.DIALPAD_FRAGMENT);
+      dialpadFragment = new DialpadFragment();
+      transaction.add(getDialpadContainerId(), dialpadFragment, Tags.DIALPAD_FRAGMENT);
     } else {
       transaction.show(dialpadFragment);
       dialpadFragment.setUserVisibleHint(true);
     }
+    // RTT call screen doesn't show end call button inside dialpad, thus the space reserved for end
+    // call button should be removed.
+    dialpadFragment.setShouldShowEndCallSpace(didShowInCallScreen);
     transaction.commitAllowingStateLoss();
     dialpadFragmentManager.executePendingTransactions();
 
     Logger.get(this).logScreenView(ScreenEvent.Type.INCALL_DIALPAD, this);
-    updateNavigationBar(true /* isDialpadVisible */);
+    getInCallOrRttCallScreen().onInCallScreenDialpadVisibilityChange(true);
   }
 
   private void hideDialpadFragment() {
@@ -822,8 +849,8 @@
       transaction.commitAllowingStateLoss();
       dialpadFragmentManager.executePendingTransactions();
       dialpadFragment.setUserVisibleHint(false);
+      getInCallOrRttCallScreen().onInCallScreenDialpadVisibilityChange(false);
     }
-    updateNavigationBar(false /* isDialpadVisible */);
   }
 
   public boolean isDialpadVisible() {
@@ -872,7 +899,7 @@
     @ColorInt int bottom;
     @ColorInt int gray = 0x66000000;
 
-    if (ActivityCompat.isInMultiWindowMode(this)) {
+    if (isInMultiWindowMode()) {
       top = themeColorManager.getBackgroundColorSolid();
       middle = themeColorManager.getBackgroundColorSolid();
       bottom = themeColorManager.getBackgroundColorSolid();
@@ -922,7 +949,10 @@
   }
 
   public boolean getCallCardFragmentVisible() {
-    return didShowInCallScreen || didShowVideoCallScreen;
+    return didShowInCallScreen
+        || didShowVideoCallScreen
+        || didShowRttCallScreen
+        || didShowSpeakEasyScreen;
   }
 
   public void dismissKeyguard(boolean dismiss) {
@@ -939,18 +969,8 @@
   }
 
   public void showDialogForPostCharWait(String callId, String chars) {
-    if (isVisible) {
-      PostCharDialogFragment fragment = new PostCharDialogFragment(callId, chars);
-      fragment.show(getSupportFragmentManager(), Tags.POST_CHAR_DIALOG_FRAGMENT);
-
-      showPostCharWaitDialogOnResume = false;
-      showPostCharWaitDialogCallId = null;
-      showPostCharWaitDialogChars = null;
-    } else {
-      showPostCharWaitDialogOnResume = true;
-      showPostCharWaitDialogCallId = callId;
-      showPostCharWaitDialogChars = chars;
-    }
+    PostCharDialogFragment fragment = new PostCharDialogFragment(callId, chars);
+    fragment.show(getSupportFragmentManager(), Tags.POST_CHAR_DIALOG_FRAGMENT);
   }
 
   public void showDialogOrToastForDisconnectedCall(DisconnectMessage disconnectMessage) {
@@ -1055,7 +1075,7 @@
 
   @Nullable
   public FragmentManager getDialpadFragmentManager() {
-    InCallScreen inCallScreen = getInCallScreen();
+    InCallScreen inCallScreen = getInCallOrRttCallScreen();
     if (inCallScreen != null) {
       return inCallScreen.getInCallScreenFragment().getChildFragmentManager();
     }
@@ -1063,7 +1083,7 @@
   }
 
   public int getDialpadContainerId() {
-    return getInCallScreen().getAnswerAndDialpadContainerResourceId();
+    return getInCallOrRttCallScreen().getAnswerAndDialpadContainerResourceId();
   }
 
   @Override
@@ -1111,15 +1131,6 @@
     Trace.endSection();
   }
 
-  public void showToastForWiFiToLteHandover(DialerCall call) {
-    if (call.hasShownWiFiToLteHandoverToast()) {
-      return;
-    }
-
-    Toast.makeText(this, R.string.video_call_wifi_to_lte_handover_toast, Toast.LENGTH_LONG).show();
-    call.setHasShownWiFiToLteHandoverToast();
-  }
-
   public void showDialogOrToastForWifiHandoverFailure(DialerCall call) {
     if (call.showWifiHandoverAlertAsToast()) {
       Toast.makeText(this, R.string.video_call_lte_to_wifi_failed_message, Toast.LENGTH_SHORT)
@@ -1159,34 +1170,15 @@
   }
 
   public void showDialogForInternationalCallOnWifi(@NonNull DialerCall call) {
-    if (!InternationalCallOnWifiDialogFragment.shouldShow(this)) {
-      LogUtil.i(
-          "InCallActivity.showDialogForInternationalCallOnWifi",
-          "InternationalCallOnWifiDialogFragment.shouldShow returned false");
-      return;
-    }
-
     InternationalCallOnWifiDialogFragment fragment =
-        InternationalCallOnWifiDialogFragment.newInstance(
-            call.getId(), internationalCallOnWifiCallback);
+        InternationalCallOnWifiDialogFragment.newInstance(call.getId());
     fragment.show(getSupportFragmentManager(), Tags.INTERNATIONAL_CALL_ON_WIFI);
   }
 
-  @Override
-  public void onMultiWindowModeChanged(boolean isInMultiWindowMode) {
-    super.onMultiWindowModeChanged(isInMultiWindowMode);
-    updateNavigationBar(isDialpadVisible());
-  }
-
-  private void updateNavigationBar(boolean isDialpadVisible) {
-    if (ActivityCompat.isInMultiWindowMode(this)) {
-      return;
-    }
-
-    View navigationBarBackground = getWindow().findViewById(R.id.navigation_bar_background);
-    if (navigationBarBackground != null) {
-      navigationBarBackground.setVisibility(isDialpadVisible ? View.VISIBLE : View.GONE);
-    }
+  public void showDialogForRttRequest(DialerCall call, int rttRequestId) {
+    LogUtil.enterBlock("InCallActivity.showDialogForRttRequest");
+    rttRequestDialogFragment = RttRequestDialogFragment.newInstance(call.getId(), rttRequestId);
+    rttRequestDialogFragment.show(getSupportFragmentManager(), Tags.RTT_REQUEST_DIALOG);
   }
 
   public void setAllowOrientationChange(boolean allowOrientationChange) {
@@ -1233,18 +1225,21 @@
     ShouldShowUiResult shouldShowAnswerUi = getShouldShowAnswerUi();
     ShouldShowUiResult shouldShowVideoUi = getShouldShowVideoUi();
     ShouldShowUiResult shouldShowRttUi = getShouldShowRttUi();
+    ShouldShowUiResult shouldShowSpeakEasyUi = getShouldShowSpeakEasyUi();
     LogUtil.i(
         "InCallActivity.showMainInCallFragment",
-        "shouldShowAnswerUi: %b, shouldShowRttUi: %b, shouldShowVideoUi: %b "
-            + "didShowAnswerScreen: %b, didShowInCallScreen: %b, didShowRttCallScreen: %b, "
-            + "didShowVideoCallScreen: %b",
+        "shouldShowAnswerUi: %b, shouldShowRttUi: %b, shouldShowVideoUi: %b, "
+            + "shouldShowSpeakEasyUi: %b, didShowAnswerScreen: %b, didShowInCallScreen: %b, "
+            + "didShowRttCallScreen: %b, didShowVideoCallScreen: %b, didShowSpeakEasyScreen: %b",
         shouldShowAnswerUi.shouldShow,
         shouldShowRttUi.shouldShow,
         shouldShowVideoUi.shouldShow,
+        shouldShowSpeakEasyUi.shouldShow,
         didShowAnswerScreen,
         didShowInCallScreen,
         didShowRttCallScreen,
-        didShowVideoCallScreen);
+        didShowVideoCallScreen,
+        didShowSpeakEasyScreen);
     // Only video call ui allows orientation change.
     setAllowOrientationChange(shouldShowVideoUi.shouldShow);
 
@@ -1254,21 +1249,31 @@
       didChange = hideInCallScreenFragment(transaction);
       didChange |= hideVideoCallScreenFragment(transaction);
       didChange |= hideRttCallScreenFragment(transaction);
+      didChange |= hideSpeakEasyFragment(transaction);
       didChange |= showAnswerScreenFragment(transaction, shouldShowAnswerUi.call);
     } else if (shouldShowVideoUi.shouldShow) {
       didChange = hideInCallScreenFragment(transaction);
       didChange |= showVideoCallScreenFragment(transaction, shouldShowVideoUi.call);
       didChange |= hideRttCallScreenFragment(transaction);
+      didChange |= hideSpeakEasyFragment(transaction);
       didChange |= hideAnswerScreenFragment(transaction);
     } else if (shouldShowRttUi.shouldShow) {
       didChange = hideInCallScreenFragment(transaction);
       didChange |= hideVideoCallScreenFragment(transaction);
       didChange |= hideAnswerScreenFragment(transaction);
+      didChange |= hideSpeakEasyFragment(transaction);
       didChange |= showRttCallScreenFragment(transaction, shouldShowRttUi.call);
+    } else if (shouldShowSpeakEasyUi.shouldShow) {
+      didChange = hideInCallScreenFragment(transaction);
+      didChange |= hideVideoCallScreenFragment(transaction);
+      didChange |= hideAnswerScreenFragment(transaction);
+      didChange |= hideRttCallScreenFragment(transaction);
+      didChange |= showSpeakEasyFragment(transaction, shouldShowSpeakEasyUi.call);
     } else {
       didChange = showInCallScreenFragment(transaction);
       didChange |= hideVideoCallScreenFragment(transaction);
       didChange |= hideRttCallScreenFragment(transaction);
+      didChange |= hideSpeakEasyFragment(transaction);
       didChange |= hideAnswerScreenFragment(transaction);
     }
 
@@ -1282,9 +1287,104 @@
     Trace.endSection();
   }
 
+  private boolean showSpeakEasyFragment(FragmentTransaction transaction, DialerCall call) {
+
+    if (didShowSpeakEasyScreen) {
+      if (lastShownSpeakEasyScreenUniqueCallid.equals(call.getUniqueCallId())) {
+        LogUtil.i("InCallActivity.showSpeakEasyFragment", "found existing fragment");
+        return false;
+      }
+      hideSpeakEasyFragment(transaction);
+      LogUtil.i("InCallActivity.showSpeakEasyFragment", "hid existing fragment");
+    }
+
+    Optional<Fragment> speakEasyFragment = speakEasyCallManager.getSpeakEasyFragment(call);
+    if (speakEasyFragment.isPresent()) {
+      transaction.add(R.id.main, speakEasyFragment.get(), Tags.SPEAK_EASY_SCREEN);
+      didShowSpeakEasyScreen = true;
+      lastShownSpeakEasyScreenUniqueCallid = call.getUniqueCallId();
+      LogUtil.i(
+          "InCallActivity.showSpeakEasyFragment",
+          "set fragment for call %s",
+          lastShownSpeakEasyScreenUniqueCallid);
+      return true;
+    }
+    return false;
+  }
+
+  private Fragment getSpeakEasyScreen() {
+    return getSupportFragmentManager().findFragmentByTag(Tags.SPEAK_EASY_SCREEN);
+  }
+
+  private boolean hideSpeakEasyFragment(FragmentTransaction transaction) {
+    if (!didShowSpeakEasyScreen) {
+      return false;
+    }
+
+    Fragment speakEasyFragment = getSpeakEasyScreen();
+
+    if (speakEasyFragment != null) {
+      transaction.remove(speakEasyFragment);
+      didShowSpeakEasyScreen = false;
+      return true;
+    }
+    return false;
+  }
+
+  @VisibleForTesting
+  public void setSpeakEasyCallManager(SpeakEasyCallManager speakEasyCallManager) {
+    this.speakEasyCallManager = speakEasyCallManager;
+  }
+
+  @Nullable
+  public SpeakEasyCallManager getSpeakEasyCallManager() {
+    if (this.speakEasyCallManager == null) {
+      this.speakEasyCallManager = InCallPresenter.getInstance().getSpeakEasyCallManager();
+    }
+    return speakEasyCallManager;
+  }
+
+  private ShouldShowUiResult getShouldShowSpeakEasyUi() {
+    SpeakEasyCallManager speakEasyCallManager = getSpeakEasyCallManager();
+
+    if (speakEasyCallManager == null) {
+      return new ShouldShowUiResult(false, null);
+    }
+
+    DialerCall call =
+        CallList.getInstance().getIncomingCall() != null
+            ? CallList.getInstance().getIncomingCall()
+            : CallList.getInstance().getActiveCall();
+
+    if (call == null) {
+      // This is a special case where the first call is not automatically resumed
+      // after the second active call is remotely disconnected.
+      DialerCall backgroundCall = CallList.getInstance().getBackgroundCall();
+      if (backgroundCall != null && backgroundCall.isSpeakEasyCall()) {
+        LogUtil.i("InCallActivity.getShouldShowSpeakEasyUi", "taking call off hold");
+
+        backgroundCall.unhold();
+        return new ShouldShowUiResult(true, backgroundCall);
+      }
+
+      return new ShouldShowUiResult(false, call);
+    }
+
+    if (!call.isSpeakEasyCall() || !call.isSpeakEasyEligible()) {
+      return new ShouldShowUiResult(false, call);
+    }
+
+    Optional<Fragment> speakEasyFragment = speakEasyCallManager.getSpeakEasyFragment(call);
+
+    if (!speakEasyFragment.isPresent()) {
+      return new ShouldShowUiResult(false, call);
+    }
+    return new ShouldShowUiResult(true, call);
+  }
+
   private ShouldShowUiResult getShouldShowAnswerUi() {
     DialerCall call = CallList.getInstance().getIncomingCall();
-    if (call != null) {
+    if (call != null && !call.isSpeakEasyCall()) {
       LogUtil.i("InCallActivity.getShouldShowAnswerUi", "found incoming call");
       return new ShouldShowUiResult(true, call);
     }
@@ -1302,7 +1402,7 @@
     if (call == null) {
       call = CallList.getInstance().getBackgroundCall();
     }
-    if (didShowAnswerScreen && (call == null || call.getState() == State.DISCONNECTED)) {
+    if (didShowAnswerScreen && (call == null || call.getState() == DialerCallState.DISCONNECTED)) {
       LogUtil.i("InCallActivity.getShouldShowAnswerUi", "found disconnecting incoming call");
       return new ShouldShowUiResult(true, call);
     }
@@ -1337,7 +1437,7 @@
       return new ShouldShowUiResult(false, null);
     }
 
-    if (call.isRttCall()) {
+    if (call.isActiveRttCall()) {
       LogUtil.i("InCallActivity.getShouldShowRttUi", "found rtt call");
       return new ShouldShowUiResult(true, call);
     }
@@ -1389,12 +1489,14 @@
     AnswerScreen answerScreen =
         AnswerBindings.createAnswerScreen(
             call.getId(),
-            call.isRttCall(),
+            call.isActiveRttCall(),
             call.isVideoCall(),
             isVideoUpgradeRequest,
             call.getVideoTech().isSelfManagedCamera(),
             shouldAllowAnswerAndRelease(call),
-            CallList.getInstance().getBackgroundCall() != null);
+            CallList.getInstance().getBackgroundCall() != null,
+            getSpeakEasyCallManager().isAvailable(getApplicationContext())
+                && call.isSpeakEasyEligible());
     transaction.add(R.id.main, answerScreen.getAnswerScreenFragment(), Tags.ANSWER_SCREEN);
 
     Logger.get(this).logScreenView(ScreenEvent.Type.INCOMING_CALL, this);
@@ -1416,7 +1518,8 @@
       LogUtil.i("InCallActivity.shouldAllowAnswerAndRelease", "video call");
       return false;
     }
-    if (!ConfigProviderBindings.get(this)
+    if (!ConfigProviderComponent.get(this)
+        .getConfigProvider()
         .getBoolean(ConfigNames.ANSWER_AND_RELEASE_ENABLED, true)) {
       LogUtil.i("InCallActivity.shouldAllowAnswerAndRelease", "disabled by config");
       return false;
@@ -1463,16 +1566,23 @@
 
   private boolean showRttCallScreenFragment(FragmentTransaction transaction, DialerCall call) {
     if (didShowRttCallScreen) {
-      // This shouldn't happen since only one RTT call is allow at same time.
-      if (!getRttCallScreen().getCallId().equals(call.getId())) {
-        LogUtil.e("InCallActivity.showRttCallScreenFragment", "RTT call id doesn't match");
+      if (getRttCallScreen().getCallId().equals(call.getId())) {
+        return false;
       }
-      return false;
+      LogUtil.i("InCallActivity.showRttCallScreenFragment", "RTT call id doesn't match");
+      hideRttCallScreenFragment(transaction);
     }
     RttCallScreen rttCallScreen = RttBindings.createRttCallScreen(call.getId());
     transaction.add(R.id.main, rttCallScreen.getRttCallScreenFragment(), Tags.RTT_CALL_SCREEN);
     Logger.get(this).logScreenView(ScreenEvent.Type.INCALL, this);
     didShowRttCallScreen = true;
+    // In some cases such as VZW, RTT request will be automatically accepted by modem. So the dialog
+    // won't make any sense and should be dismissed if it's already switched to RTT.
+    if (rttRequestDialogFragment != null) {
+      LogUtil.i("InCallActivity.showRttCallScreenFragment", "dismiss RTT request dialog");
+      rttRequestDialogFragment.dismiss();
+      rttRequestDialogFragment = null;
+    }
     return true;
   }
 
@@ -1541,6 +1651,17 @@
     return (RttCallScreen) getSupportFragmentManager().findFragmentByTag(Tags.RTT_CALL_SCREEN);
   }
 
+  private InCallScreen getInCallOrRttCallScreen() {
+    InCallScreen inCallScreen = null;
+    if (didShowInCallScreen) {
+      inCallScreen = getInCallScreen();
+    }
+    if (didShowRttCallScreen) {
+      inCallScreen = getRttCallScreen();
+    }
+    return inCallScreen;
+  }
+
   @Override
   public void onPseudoScreenStateChanged(boolean isOn) {
     LogUtil.i("InCallActivity.onPseudoScreenStateChanged", "isOn: " + isOn);
@@ -1600,6 +1721,7 @@
     static final String DID_SHOW_IN_CALL_SCREEN = "did_show_in_call_screen";
     static final String DID_SHOW_VIDEO_CALL_SCREEN = "did_show_video_call_screen";
     static final String DID_SHOW_RTT_CALL_SCREEN = "did_show_rtt_call_screen";
+    static final String DID_SHOW_SPEAK_EASY_SCREEN = "did_show_speak_easy_screen";
   }
 
   /** Request codes for pending intents. */
@@ -1618,38 +1740,24 @@
     static final String VIDEO_CALL_SCREEN = "tag_video_call_screen";
     static final String RTT_CALL_SCREEN = "tag_rtt_call_screen";
     static final String POST_CHAR_DIALOG_FRAGMENT = "tag_post_char_dialog_fragment";
+    static final String SPEAK_EASY_SCREEN = "tag_speak_easy_screen";
+    static final String RTT_REQUEST_DIALOG = "tag_rtt_request_dialog";
   }
 
   private static final class ConfigNames {
     static final String ANSWER_AND_RELEASE_ENABLED = "answer_and_release_enabled";
   }
 
-  private static final class InternationalCallOnWifiCallback
-      implements InternationalCallOnWifiDialogFragment.Callback {
-    private static final String TAG = InternationalCallOnWifiCallback.class.getCanonicalName();
-
-    @Override
-    public void continueCall(@NonNull String callId) {
-      LogUtil.i(TAG, "Continuing call with ID: %s", callId);
-    }
-
-    @Override
-    public void cancelCall(@NonNull String callId) {
-      DialerCall call = CallList.getInstance().getCallById(callId);
-      if (call == null) {
-        LogUtil.i(TAG, "Call destroyed before the dialog is closed");
-        return;
-      }
-
-      LogUtil.i(TAG, "Disconnecting international call on WiFi");
-      call.disconnect();
-    }
-  }
-
   private static final class SelectPhoneAccountListener
       extends SelectPhoneAccountDialogFragment.SelectPhoneAccountListener {
     private static final String TAG = SelectPhoneAccountListener.class.getCanonicalName();
 
+    private final Context appContext;
+
+    SelectPhoneAccountListener(Context appContext) {
+      this.appContext = appContext;
+    }
+
     @Override
     public void onPhoneAccountSelected(
         PhoneAccountHandle selectedAccountHandle, boolean setDefault, String callId) {
@@ -1657,7 +1765,10 @@
       LogUtil.i(TAG, "Phone account select with call:\n%s", call);
 
       if (call != null) {
-        call.phoneAccountSelected(selectedAccountHandle, setDefault);
+        call.phoneAccountSelected(selectedAccountHandle, false);
+        if (call.getPreferredAccountRecorder() != null) {
+          call.getPreferredAccountRecorder().record(appContext, selectedAccountHandle, setDefault);
+        }
       }
     }
 
diff --git a/java/com/android/incallui/InCallPresenter.java b/java/com/android/incallui/InCallPresenter.java
index 558ca33..150499f 100644
--- a/java/com/android/incallui/InCallPresenter.java
+++ b/java/com/android/incallui/InCallPresenter.java
@@ -39,7 +39,10 @@
 import android.util.ArraySet;
 import android.view.Window;
 import android.view.WindowManager;
+import android.widget.Toast;
 import com.android.contacts.common.compat.CallCompat;
+import com.android.dialer.CallConfiguration;
+import com.android.dialer.Mode;
 import com.android.dialer.blocking.FilteredNumberAsyncQueryHandler;
 import com.android.dialer.blocking.FilteredNumberAsyncQueryHandler.OnCheckBlockedListener;
 import com.android.dialer.blocking.FilteredNumberCompat;
@@ -49,6 +52,7 @@
 import com.android.dialer.common.concurrent.DialerExecutorComponent;
 import com.android.dialer.enrichedcall.EnrichedCallComponent;
 import com.android.dialer.location.GeoUtil;
+import com.android.dialer.logging.DialerImpression;
 import com.android.dialer.logging.InteractionEvent;
 import com.android.dialer.logging.Logger;
 import com.android.dialer.postcall.PostCall;
@@ -62,14 +66,19 @@
 import com.android.incallui.call.DialerCall;
 import com.android.incallui.call.ExternalCallList;
 import com.android.incallui.call.TelecomAdapter;
+import com.android.incallui.call.state.DialerCallState;
 import com.android.incallui.disconnectdialog.DisconnectMessage;
 import com.android.incallui.incalluilock.InCallUiLock;
 import com.android.incallui.latencyreport.LatencyReport;
 import com.android.incallui.legacyblocking.BlockedNumberContentObserver;
 import com.android.incallui.spam.SpamCallListListener;
+import com.android.incallui.speakeasy.SpeakEasyCallManager;
+import com.android.incallui.telecomeventui.InternationalCallOnWifiDialogActivity;
+import com.android.incallui.telecomeventui.InternationalCallOnWifiDialogFragment;
 import com.android.incallui.videosurface.bindings.VideoSurfaceBindings;
 import com.android.incallui.videosurface.protocol.VideoSurfaceTexture;
 import com.android.incallui.videotech.utils.VideoUtils;
+import com.google.protobuf.InvalidProtocolBufferException;
 import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
@@ -88,6 +97,7 @@
 public class InCallPresenter implements CallList.Listener, AudioModeProvider.AudioModeListener {
   private static final String PIXEL2017_SYSTEM_FEATURE =
       "com.google.android.feature.PIXEL_2017_EXPERIENCE";
+  private static final String CALL_CONFIGURATION_EXTRA = "call_configuration";
 
   private static final long BLOCK_QUERY_TIMEOUT_MS = 1000;
 
@@ -191,6 +201,7 @@
   private InCallCameraManager inCallCameraManager;
   private FilteredNumberAsyncQueryHandler filteredQueryHandler;
   private CallList.Listener spamCallListListener;
+  private CallList.Listener activeCallsListener;
   /** Whether or not we are currently bound and waiting for Telecom to send us a new call. */
   private boolean boundAndWaitingForOutgoingCall;
   /** Determines if the InCall UI is in fullscreen mode or not. */
@@ -260,7 +271,7 @@
   private VideoSurfaceTexture localVideoSurfaceTexture;
   private VideoSurfaceTexture remoteVideoSurfaceTexture;
 
-  private MotorolaInCallUiNotifier motorolaInCallUiNotifier;
+  private SpeakEasyCallManager speakEasyCallManager;
 
   /** Inaccessible constructor. Must use getRunningInstance() to get this singleton. */
   @VisibleForTesting
@@ -326,7 +337,8 @@
       ExternalCallNotifier externalCallNotifier,
       ContactInfoCache contactInfoCache,
       ProximitySensor proximitySensor,
-      FilteredNumberAsyncQueryHandler filteredNumberQueryHandler) {
+      FilteredNumberAsyncQueryHandler filteredNumberQueryHandler,
+      @NonNull SpeakEasyCallManager speakEasyCallManager) {
     Trace.beginSection("InCallPresenter.setUp");
     if (serviceConnected) {
       LogUtil.i("InCallPresenter.setUp", "New service connection replacing existing one.");
@@ -353,8 +365,7 @@
     addListener(this.proximitySensor);
 
     if (themeColorManager == null) {
-      themeColorManager =
-          new ThemeColorManager(new InCallUIMaterialColorMapUtils(this.context.getResources()));
+      themeColorManager = new ThemeColorManager(new InCallUIMaterialColorMapUtils(this.context));
     }
 
     this.callList = callList;
@@ -374,30 +385,91 @@
         new SpamCallListListener(
             context, DialerExecutorComponent.get(context).dialerExecutorFactory());
     this.callList.addListener(spamCallListListener);
+    activeCallsListener = new ActiveCallsCallListListener(context);
+    this.callList.addListener(activeCallsListener);
 
     VideoPauseController.getInstance().setUp(this);
 
     filteredQueryHandler = filteredNumberQueryHandler;
+    this.speakEasyCallManager = speakEasyCallManager;
     this.context
         .getSystemService(TelephonyManager.class)
         .listen(phoneStateListener, PhoneStateListener.LISTEN_CALL_STATE);
 
     AudioModeProvider.getInstance().addListener(this);
 
-    if (motorolaInCallUiNotifier == null) {
-      // Add listener to notify Telephony process when the incoming call screen is started or
-      // finished. This is for hiding USSD dialog because the incoming call screen should have
-      // higher precedence over this dialog.
-      motorolaInCallUiNotifier = new MotorolaInCallUiNotifier(context);
-      addInCallUiListener(motorolaInCallUiNotifier);
-      addListener(motorolaInCallUiNotifier);
-    }
+    // Add listener to notify Telephony process when the incoming call screen is started or
+    // finished. This is for hiding USSD dialog because the incoming call screen should have
+    // higher precedence over this dialog.
+    MotorolaInCallUiNotifier motorolaInCallUiNotifier = new MotorolaInCallUiNotifier(context);
+    addInCallUiListener(motorolaInCallUiNotifier);
+    addListener(motorolaInCallUiNotifier);
 
     LogUtil.d("InCallPresenter.setUp", "Finished InCallPresenter.setUp");
     Trace.endSection();
   }
 
   /**
+   * Return whether we should start call in bubble mode and not show InCallActivity. The call mode
+   * should be set in CallConfiguration in EXTRA_OUTGOING_CALL_EXTRAS when starting a call intent.
+   */
+  public boolean shouldStartInBubbleMode() {
+    if (!ReturnToCallController.isEnabled(context)) {
+      return false;
+    }
+
+    // We only start in Bubble mode for outgoing call
+    DialerCall dialerCall = callList.getPendingOutgoingCall();
+    if (dialerCall == null) {
+      dialerCall = callList.getOutgoingCall();
+    }
+    // Outgoing call can be disconnected and reason will be shown in toast
+    if (dialerCall == null) {
+      dialerCall = callList.getDisconnectedCall();
+    }
+    if (dialerCall == null) {
+      return false;
+    }
+    if (dialerCall.isEmergencyCall()) {
+      return false;
+    }
+
+    Bundle extras = dialerCall.getIntentExtras();
+    boolean result = shouldStartInBubbleModeWithExtras(extras);
+    if (result) {
+      Logger.get(context)
+          .logCallImpression(
+              DialerImpression.Type.START_CALL_IN_BUBBLE_MODE,
+              dialerCall.getUniqueCallId(),
+              dialerCall.getTimeAddedMs());
+    }
+    return result;
+  }
+
+  private boolean shouldStartInBubbleModeWithExtras(Bundle outgoingExtras) {
+    if (!ReturnToCallController.isEnabled(context)) {
+      return false;
+    }
+
+    if (outgoingExtras == null) {
+      return false;
+    }
+    byte[] callConfigurationByteArray = outgoingExtras.getByteArray(CALL_CONFIGURATION_EXTRA);
+    if (callConfigurationByteArray == null) {
+      return false;
+    }
+    try {
+      CallConfiguration callConfiguration = CallConfiguration.parseFrom(callConfigurationByteArray);
+      LogUtil.i(
+          "InCallPresenter.shouldStartInBubbleMode",
+          "call mode: " + callConfiguration.getCallMode());
+      return callConfiguration.getCallMode() == Mode.BUBBLE;
+    } catch (InvalidProtocolBufferException e) {
+      return false;
+    }
+  }
+
+  /**
    * Called when the telephony service has disconnected from us. This will happen when there are no
    * more active calls. However, we may still want to continue showing the UI for certain cases like
    * showing "Call Ended". What we really want is to wait for the activity and the service to both
@@ -529,6 +601,10 @@
     Trace.endSection();
   }
 
+  public SpeakEasyCallManager getSpeakEasyCallManager() {
+    return this.speakEasyCallManager;
+  }
+
   public void setManageConferenceActivity(
       @Nullable ManageConferenceActivity manageConferenceActivity) {
     this.manageConferenceActivity = manageConferenceActivity;
@@ -693,23 +769,44 @@
 
   @Override
   public void onWiFiToLteHandover(DialerCall call) {
-    if (inCallActivity != null) {
-      inCallActivity.showToastForWiFiToLteHandover(call);
+    if (call.hasShownWiFiToLteHandoverToast()) {
+      return;
     }
+
+    Toast.makeText(context, R.string.video_call_wifi_to_lte_handover_toast, Toast.LENGTH_LONG)
+        .show();
+    call.setHasShownWiFiToLteHandoverToast();
   }
 
   @Override
   public void onHandoverToWifiFailed(DialerCall call) {
     if (inCallActivity != null) {
       inCallActivity.showDialogOrToastForWifiHandoverFailure(call);
+    } else {
+      Toast.makeText(context, R.string.video_call_lte_to_wifi_failed_message, Toast.LENGTH_SHORT)
+          .show();
     }
   }
 
   @Override
   public void onInternationalCallOnWifi(@NonNull DialerCall call) {
     LogUtil.enterBlock("InCallPresenter.onInternationalCallOnWifi");
+
+    if (!InternationalCallOnWifiDialogFragment.shouldShow(context)) {
+      LogUtil.i(
+          "InCallPresenter.onInternationalCallOnWifi",
+          "InternationalCallOnWifiDialogFragment.shouldShow returned false");
+      return;
+    }
+
     if (inCallActivity != null) {
       inCallActivity.showDialogForInternationalCallOnWifi(call);
+    } else {
+      Intent intent = new Intent(context, InternationalCallOnWifiDialogActivity.class);
+      // Prevent showing MainActivity with InternationalCallOnWifiDialogActivity on above
+      intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_MULTIPLE_TASK);
+      intent.putExtra(InternationalCallOnWifiDialogActivity.EXTRA_CALL_ID, call.getId());
+      context.startActivity(intent);
     }
   }
 
@@ -765,6 +862,22 @@
         "Phone switching state: " + oldState + " -> " + newState);
     inCallState = newState;
 
+    // Foreground call changed
+    DialerCall primary = null;
+    if (newState == InCallState.INCOMING) {
+      primary = callList.getIncomingCall();
+    } else if (newState == InCallState.PENDING_OUTGOING || newState == InCallState.OUTGOING) {
+      primary = callList.getOutgoingCall();
+      if (primary == null) {
+        primary = callList.getPendingOutgoingCall();
+      }
+    } else if (newState == InCallState.INCALL) {
+      primary = getCallToDisplay(callList, null, false);
+    }
+    if (primary != null) {
+      onForegroundCallChanged(primary);
+    }
+
     // notify listeners of new state
     for (InCallStateListener listener : listeners) {
       LogUtil.d(
@@ -778,9 +891,58 @@
           callList.getActiveOrBackgroundCall() != null || callList.getOutgoingCall() != null;
       inCallActivity.dismissKeyguard(hasCall);
     }
+
     Trace.endSection();
   }
 
+  /**
+   * Get the highest priority call to display. Goes through the calls and chooses which to return
+   * based on priority of which type of call to display to the user. Callers can use the "ignore"
+   * feature to get the second best call by passing a previously found primary call as ignore.
+   *
+   * @param ignore A call to ignore if found.
+   */
+  static DialerCall getCallToDisplay(
+      CallList callList, DialerCall ignore, boolean skipDisconnected) {
+    // Active calls come second.  An active call always gets precedent.
+    DialerCall retval = callList.getActiveCall();
+    if (retval != null && retval != ignore) {
+      return retval;
+    }
+
+    // Sometimes there is intemediate state that two calls are in active even one is about
+    // to be on hold.
+    retval = callList.getSecondActiveCall();
+    if (retval != null && retval != ignore) {
+      return retval;
+    }
+
+    // Disconnected calls get primary position if there are no active calls
+    // to let user know quickly what call has disconnected. Disconnected
+    // calls are very short lived.
+    if (!skipDisconnected) {
+      retval = callList.getDisconnectingCall();
+      if (retval != null && retval != ignore) {
+        return retval;
+      }
+      retval = callList.getDisconnectedCall();
+      if (retval != null && retval != ignore) {
+        return retval;
+      }
+    }
+
+    // Then we go to background call (calls on hold)
+    retval = callList.getBackgroundCall();
+    if (retval != null && retval != ignore) {
+      return retval;
+    }
+
+    // Lastly, we go to a second background call.
+    retval = callList.getSecondBackgroundCall();
+
+    return retval;
+  }
+
   /** Called when there is a new incoming call. */
   @Override
   public void onIncomingCall(DialerCall call) {
@@ -824,6 +986,20 @@
   }
 
   @Override
+  public void onUpgradeToRtt(DialerCall call, int rttRequestId) {
+    if (inCallActivity != null) {
+      inCallActivity.showDialogForRttRequest(call, rttRequestId);
+    }
+  }
+
+  @Override
+  public void onSpeakEasyStateChange() {
+    if (inCallActivity != null) {
+      inCallActivity.onPrimaryCallStateChanged();
+    }
+  }
+
+  @Override
   public void onSessionModificationStateChange(DialerCall call) {
     int newState = call.getVideoTech().getSessionModificationState();
     LogUtil.i("InCallPresenter.onSessionModificationStateChange", "state: %d", newState);
@@ -1044,14 +1220,6 @@
         "updateIsChangingConfigurations = " + isChangingConfigurations);
   }
 
-  void updateNotification() {
-    // We need to update the notification bar when we leave the UI because that
-    // could trigger it to show again.
-    if (statusBarNotifier != null) {
-      statusBarNotifier.updateNotification();
-    }
-  }
-
   /** Called when the activity goes in/out of the foreground. */
   public void onUiShowing(boolean showing) {
     if (proximitySensor != null) {
@@ -1124,8 +1292,22 @@
   }
 
   public void onPostDialCharWait(String callId, String chars) {
-    if (isActivityStarted()) {
+    // If not visible, inCallActivity is stopped. Starting from P, calling recreate() will destroy
+    // the old activity instance and create a new instance immediately. Previously, the old activity
+    // went through its lifecycle from create to destroy before creating a new instance.
+    // So this case doesn't work now: make a call with char WAIT, leave in call UI, call gets
+    // connected, and go back to in call UI to see the dialog.
+    // So we should show dialog in an empty activity if inCallActivity is not visible. And it also
+    // helps with background calling.
+    if (isActivityStarted() && inCallActivity.isVisible()) {
       inCallActivity.showDialogForPostCharWait(callId, chars);
+    } else {
+      Intent intent = new Intent(context, PostCharDialogActivity.class);
+      // Prevent showing MainActivity with PostCharDialogActivity on above
+      intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_MULTIPLE_TASK);
+      intent.putExtra(PostCharDialogActivity.EXTRA_CALL_ID, callId);
+      intent.putExtra(PostCharDialogActivity.EXTRA_POST_DIAL_STRING, chars);
+      context.startActivity(intent);
     }
   }
 
@@ -1186,7 +1368,7 @@
       LogUtil.v("InCallPresenter.handleCallKey", "heldCall: " + heldCall + ", canHold: " + canHold);
 
       // (4) unhold call
-      if (heldCall.getState() == DialerCall.State.ONHOLD && canHold) {
+      if (heldCall.getState() == DialerCallState.ONHOLD && canHold) {
         heldCall.unhold();
         return true;
       }
@@ -1258,7 +1440,7 @@
 
   /** Instruct the in-call activity to show an error dialog or toast for a disconnected call. */
   private void showDialogOrToastForDisconnectedCall(DialerCall call) {
-    if (!isActivityStarted() || call.getState() != DialerCall.State.DISCONNECTED) {
+    if (call.getState() != DialerCallState.DISCONNECTED) {
       return;
     }
 
@@ -1267,8 +1449,15 @@
       setDisconnectCauseForMissingAccounts(call);
     }
 
-    inCallActivity.showDialogOrToastForDisconnectedCall(
-        new DisconnectMessage(inCallActivity, call));
+    if (isActivityStarted()) {
+      inCallActivity.showDialogOrToastForDisconnectedCall(
+          new DisconnectMessage(inCallActivity, call));
+    } else {
+      CharSequence message = new DisconnectMessage(context, call).toastMessage;
+      if (message != null) {
+        Toast.makeText(context, message, Toast.LENGTH_LONG).show();
+      }
+    }
   }
 
   /**
@@ -1310,11 +1499,6 @@
     //                        know that start-up is complete.
     //
     //          [ AND NOW YOU'RE IN THE CALL. voila! ]
-    //
-    // Our app is started using a fullScreen notification.  We need to do this whenever
-    // we get an incoming call. Depending on the current context of the device, either a
-    // incoming call HUN or the actual InCallActivity will be shown.
-    final boolean startIncomingCallSequence = (InCallState.INCOMING == newState);
 
     // A dialog to show on top of the InCallUI to select a PhoneAccount
     final boolean showAccountPicker = (InCallState.WAITING_FOR_ACCOUNT == newState);
@@ -1378,15 +1562,12 @@
       inCallActivity.dismissPendingDialogs();
     }
 
-    if (showCallUi || showAccountPicker) {
+    if ((showCallUi || showAccountPicker) && !shouldStartInBubbleMode()) {
       LogUtil.i("InCallPresenter.startOrFinishUi", "Start in call UI");
       showInCall(false /* showDialpad */, !showAccountPicker /* newOutgoingCall */);
-    } else if (startIncomingCallSequence) {
-      LogUtil.i("InCallPresenter.startOrFinishUi", "Start Full Screen in call UI");
-
-      statusBarNotifier.updateNotification();
     } else if (newState == InCallState.NO_CALLS) {
       // The new state is the no calls state.  Tear everything down.
+      inCallState = newState;
       attemptFinishActivity();
       attemptCleanup();
     }
@@ -1530,7 +1711,13 @@
         intent.getParcelableExtra(TelecomManager.EXTRA_PHONE_ACCOUNT_HANDLE);
     final Point touchPoint = extras.getParcelable(TouchPointManager.TOUCH_POINT);
 
-    InCallPresenter.getInstance().setBoundAndWaitingForOutgoingCall(true, accountHandle);
+    setBoundAndWaitingForOutgoingCall(true, accountHandle);
+
+    if (shouldStartInBubbleModeWithExtras(extras)) {
+      LogUtil.i("InCallPresenter.maybeStartRevealAnimation", "shouldStartInBubbleMode");
+      // Show bubble instead of in call UI
+      return;
+    }
 
     final Intent activityIntent =
         InCallActivity.getIntent(context, false, true, false /* forFullScreen */);
diff --git a/java/com/android/incallui/InCallServiceImpl.java b/java/com/android/incallui/InCallServiceImpl.java
index a7095f8..b9d0ecc 100644
--- a/java/com/android/incallui/InCallServiceImpl.java
+++ b/java/com/android/incallui/InCallServiceImpl.java
@@ -40,7 +40,7 @@
  */
 public class InCallServiceImpl extends InCallService {
 
-  private NewReturnToCallController newReturnToCallController;
+  private ReturnToCallController returnToCallController;
   private CallList.Listener feedbackListener;
   // We only expect there to be one speakEasyCallManager to be instantiated at a time.
   // We did not use a singleton SpeakEasyCallManager to avoid holding on to state beyond the
@@ -107,14 +107,13 @@
             contactInfoCache,
             new ProximitySensor(
                 context, AudioModeProvider.getInstance(), new AccelerometerListener(context)),
-            new FilteredNumberAsyncQueryHandler(context));
+            new FilteredNumberAsyncQueryHandler(context),
+            speakEasyCallManager);
     InCallPresenter.getInstance().onServiceBind();
     InCallPresenter.getInstance().maybeStartRevealAnimation(intent);
     TelecomAdapter.getInstance().setInCallService(this);
-    if (NewReturnToCallController.isEnabled(this)) {
-      newReturnToCallController =
-          new NewReturnToCallController(this, ContactInfoCache.getInstance(context));
-    }
+    returnToCallController =
+        new ReturnToCallController(this, ContactInfoCache.getInstance(context));
     feedbackListener = FeedbackComponent.get(context).getCallFeedbackListener();
     CallList.getInstance().addListener(feedbackListener);
 
@@ -141,9 +140,9 @@
     // Tear down the InCall system
     InCallPresenter.getInstance().tearDown();
     TelecomAdapter.getInstance().clearInCallService();
-    if (newReturnToCallController != null) {
-      newReturnToCallController.tearDown();
-      newReturnToCallController = null;
+    if (returnToCallController != null) {
+      returnToCallController.tearDown();
+      returnToCallController = null;
     }
     if (feedbackListener != null) {
       CallList.getInstance().removeListener(feedbackListener);
diff --git a/java/com/android/incallui/InCallUIMaterialColorMapUtils.java b/java/com/android/incallui/InCallUIMaterialColorMapUtils.java
index 945e9fb..c566f79 100644
--- a/java/com/android/incallui/InCallUIMaterialColorMapUtils.java
+++ b/java/com/android/incallui/InCallUIMaterialColorMapUtils.java
@@ -16,31 +16,35 @@
 
 package com.android.incallui;
 
+import android.content.Context;
 import android.content.res.Resources;
 import android.content.res.TypedArray;
 import android.telecom.PhoneAccount;
 import com.android.contacts.common.util.MaterialColorMapUtils;
+import com.android.dialer.theme.base.ThemeComponent;
 
 public class InCallUIMaterialColorMapUtils extends MaterialColorMapUtils {
 
   private final TypedArray primaryColors;
   private final TypedArray secondaryColors;
   private final Resources resources;
+  private final Context context;
 
-  public InCallUIMaterialColorMapUtils(Resources resources) {
-    super(resources);
+  public InCallUIMaterialColorMapUtils(Context context) {
+    super(context.getResources());
+    this.resources = context.getResources();
+    this.context = context;
     primaryColors = resources.obtainTypedArray(R.array.background_colors);
     secondaryColors = resources.obtainTypedArray(R.array.background_colors_dark);
-    this.resources = resources;
   }
 
   /**
    * {@link Resources#getColor(int) used for compatibility
    */
   @SuppressWarnings("deprecation")
-  public static MaterialPalette getDefaultPrimaryAndSecondaryColors(Resources resources) {
-    final int primaryColor = resources.getColor(R.color.dialer_theme_color);
-    final int secondaryColor = resources.getColor(R.color.dialer_theme_color_dark);
+  public static MaterialPalette getDefaultPrimaryAndSecondaryColors(Context context) {
+    final int primaryColor = ThemeComponent.get(context).theme().getColorPrimary();
+    final int secondaryColor = ThemeComponent.get(context).theme().getColorPrimaryDark();
     return new MaterialPalette(primaryColor, secondaryColor);
   }
 
@@ -52,7 +56,7 @@
   @Override
   public MaterialPalette calculatePrimaryAndSecondaryColor(int color) {
     if (color == PhoneAccount.NO_HIGHLIGHT_COLOR) {
-      return getDefaultPrimaryAndSecondaryColors(resources);
+      return getDefaultPrimaryAndSecondaryColors(context);
     }
 
     for (int i = 0; i < primaryColors.length(); i++) {
diff --git a/java/com/android/incallui/NewReturnToCallActionReceiver.java b/java/com/android/incallui/NewReturnToCallActionReceiver.java
deleted file mode 100644
index 527a79b..0000000
--- a/java/com/android/incallui/NewReturnToCallActionReceiver.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.incallui;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.telecom.CallAudioState;
-import com.android.dialer.common.Assert;
-import com.android.dialer.common.LogUtil;
-import com.android.dialer.logging.DialerImpression;
-import com.android.dialer.logging.Logger;
-import com.android.incallui.audiomode.AudioModeProvider;
-import com.android.incallui.call.CallList;
-import com.android.incallui.call.DialerCall;
-import com.android.incallui.call.TelecomAdapter;
-
-/** Handles clicks on the return-to-call bubble */
-public class NewReturnToCallActionReceiver extends BroadcastReceiver {
-
-  public static final String ACTION_RETURN_TO_CALL = "returnToCallV2";
-  public static final String ACTION_TOGGLE_SPEAKER = "toggleSpeakerV2";
-  public static final String ACTION_SHOW_AUDIO_ROUTE_SELECTOR = "showAudioRouteSelectorV2";
-  public static final String ACTION_TOGGLE_MUTE = "toggleMuteV2";
-  public static final String ACTION_END_CALL = "endCallV2";
-
-  @Override
-  public void onReceive(Context context, Intent intent) {
-    switch (intent.getAction()) {
-      case ACTION_RETURN_TO_CALL:
-        returnToCall(context);
-        break;
-      case ACTION_TOGGLE_SPEAKER:
-        toggleSpeaker(context);
-        break;
-      case ACTION_SHOW_AUDIO_ROUTE_SELECTOR:
-        showAudioRouteSelector(context);
-        break;
-      case ACTION_TOGGLE_MUTE:
-        toggleMute(context);
-        break;
-      case ACTION_END_CALL:
-        endCall(context);
-        break;
-      default:
-        throw Assert.createIllegalStateFailException(
-            "Invalid intent action: " + intent.getAction());
-    }
-  }
-
-  private void returnToCall(Context context) {
-    DialerCall call = getCall();
-    Logger.get(context)
-        .logCallImpression(
-            DialerImpression.Type.BUBBLE_V2_RETURN_TO_CALL,
-            call != null ? call.getUniqueCallId() : "",
-            call != null ? call.getTimeAddedMs() : 0);
-
-    Intent activityIntent = InCallActivity.getIntent(context, false, false, false);
-    activityIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-    context.startActivity(activityIntent);
-  }
-
-  private void toggleSpeaker(Context context) {
-    CallAudioState audioState = AudioModeProvider.getInstance().getAudioState();
-
-    if ((audioState.getSupportedRouteMask() & CallAudioState.ROUTE_BLUETOOTH)
-        == CallAudioState.ROUTE_BLUETOOTH) {
-      LogUtil.w(
-          "ReturnToCallActionReceiver.toggleSpeaker",
-          "toggleSpeaker() called when bluetooth available."
-              + " Probably should have shown audio route selector");
-    }
-
-    DialerCall call = getCall();
-
-    int newRoute;
-    if (audioState.getRoute() == CallAudioState.ROUTE_SPEAKER) {
-      newRoute = CallAudioState.ROUTE_WIRED_OR_EARPIECE;
-      Logger.get(context)
-          .logCallImpression(
-              DialerImpression.Type.BUBBLE_V2_WIRED_OR_EARPIECE,
-              call != null ? call.getUniqueCallId() : "",
-              call != null ? call.getTimeAddedMs() : 0);
-    } else {
-      newRoute = CallAudioState.ROUTE_SPEAKER;
-      Logger.get(context)
-          .logCallImpression(
-              DialerImpression.Type.BUBBLE_V2_SPEAKERPHONE,
-              call != null ? call.getUniqueCallId() : "",
-              call != null ? call.getTimeAddedMs() : 0);
-    }
-    TelecomAdapter.getInstance().setAudioRoute(newRoute);
-  }
-
-  public void showAudioRouteSelector(Context context) {
-    Intent intent = new Intent(context, AudioRouteSelectorActivity.class);
-    intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_MULTIPLE_TASK);
-    context.startActivity(intent);
-  }
-
-  private void toggleMute(Context context) {
-    DialerCall call = getCall();
-    boolean shouldMute = !AudioModeProvider.getInstance().getAudioState().isMuted();
-    Logger.get(context)
-        .logCallImpression(
-            shouldMute
-                ? DialerImpression.Type.BUBBLE_V2_MUTE_CALL
-                : DialerImpression.Type.BUBBLE_V2_UNMUTE_CALL,
-            call != null ? call.getUniqueCallId() : "",
-            call != null ? call.getTimeAddedMs() : 0);
-    TelecomAdapter.getInstance().mute(shouldMute);
-  }
-
-  private void endCall(Context context) {
-    DialerCall call = getCall();
-
-    Logger.get(context)
-        .logCallImpression(
-            DialerImpression.Type.BUBBLE_V2_END_CALL,
-            call != null ? call.getUniqueCallId() : "",
-            call != null ? call.getTimeAddedMs() : 0);
-    if (call != null) {
-      call.disconnect();
-    }
-  }
-
-  private DialerCall getCall() {
-    CallList callList = InCallPresenter.getInstance().getCallList();
-    if (callList != null) {
-      DialerCall call = callList.getOutgoingCall();
-      if (call == null) {
-        call = callList.getActiveOrBackgroundCall();
-      }
-      if (call != null) {
-        return call;
-      }
-    }
-    return null;
-  }
-}
diff --git a/java/com/android/incallui/NewReturnToCallController.java b/java/com/android/incallui/NewReturnToCallController.java
deleted file mode 100644
index c588dc4..0000000
--- a/java/com/android/incallui/NewReturnToCallController.java
+++ /dev/null
@@ -1,369 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.incallui;
-
-import android.app.PendingIntent;
-import android.content.Context;
-import android.content.Intent;
-import android.graphics.drawable.Drawable;
-import android.graphics.drawable.Icon;
-import android.provider.Settings;
-import android.support.annotation.NonNull;
-import android.support.annotation.VisibleForTesting;
-import android.telecom.CallAudioState;
-import android.text.TextUtils;
-import com.android.contacts.common.util.ContactDisplayUtils;
-import com.android.dialer.common.LogUtil;
-import com.android.dialer.configprovider.ConfigProviderBindings;
-import com.android.dialer.lettertile.LetterTileDrawable;
-import com.android.dialer.telecom.TelecomUtil;
-import com.android.incallui.ContactInfoCache.ContactCacheEntry;
-import com.android.incallui.ContactInfoCache.ContactInfoCacheCallback;
-import com.android.incallui.InCallPresenter.InCallUiListener;
-import com.android.incallui.audiomode.AudioModeProvider;
-import com.android.incallui.audiomode.AudioModeProvider.AudioModeListener;
-import com.android.incallui.call.CallList;
-import com.android.incallui.call.CallList.Listener;
-import com.android.incallui.call.DialerCall;
-import com.android.incallui.speakerbuttonlogic.SpeakerButtonInfo;
-import com.android.incallui.speakerbuttonlogic.SpeakerButtonInfo.IconSize;
-import com.android.newbubble.NewBubble;
-import com.android.newbubble.NewBubbleComponent;
-import com.android.newbubble.NewBubbleInfo;
-import com.android.newbubble.NewBubbleInfo.Action;
-import java.lang.ref.WeakReference;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Listens for events relevant to the return-to-call bubble and updates the bubble's state as
- * necessary
- */
-public class NewReturnToCallController implements InCallUiListener, Listener, AudioModeListener {
-
-  private final Context context;
-
-  @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
-  NewBubble bubble;
-
-  private static Boolean canShowBubblesForTesting = null;
-
-  private CallAudioState audioState;
-
-  private final PendingIntent toggleSpeaker;
-  private final PendingIntent showSpeakerSelect;
-  private final PendingIntent toggleMute;
-  private final PendingIntent endCall;
-  private final PendingIntent fullScreen;
-
-  private final ContactInfoCache contactInfoCache;
-
-  public static boolean isEnabled(Context context) {
-    return ConfigProviderBindings.get(context).getBoolean("enable_return_to_call_bubble_v2", false);
-  }
-
-  public NewReturnToCallController(Context context, ContactInfoCache contactInfoCache) {
-    this.context = context;
-    this.contactInfoCache = contactInfoCache;
-
-    toggleSpeaker = createActionIntent(NewReturnToCallActionReceiver.ACTION_TOGGLE_SPEAKER);
-    showSpeakerSelect =
-        createActionIntent(NewReturnToCallActionReceiver.ACTION_SHOW_AUDIO_ROUTE_SELECTOR);
-    toggleMute = createActionIntent(NewReturnToCallActionReceiver.ACTION_TOGGLE_MUTE);
-    endCall = createActionIntent(NewReturnToCallActionReceiver.ACTION_END_CALL);
-    fullScreen = createActionIntent(NewReturnToCallActionReceiver.ACTION_RETURN_TO_CALL);
-
-    InCallPresenter.getInstance().addInCallUiListener(this);
-    CallList.getInstance().addListener(this);
-    AudioModeProvider.getInstance().addListener(this);
-    audioState = AudioModeProvider.getInstance().getAudioState();
-  }
-
-  public void tearDown() {
-    hide();
-    InCallPresenter.getInstance().removeInCallUiListener(this);
-    CallList.getInstance().removeListener(this);
-    AudioModeProvider.getInstance().removeListener(this);
-  }
-
-  @Override
-  public void onUiShowing(boolean showing) {
-    if (showing) {
-      hide();
-    } else {
-      if (getCall() != null) {
-        show();
-      }
-    }
-  }
-
-  private void hide() {
-    if (bubble != null) {
-      bubble.hide();
-    } else {
-      LogUtil.i("ReturnToCallController.hide", "hide() called without calling show()");
-    }
-  }
-
-  private void show() {
-    if (bubble == null) {
-      bubble = startBubble();
-    } else {
-      bubble.show();
-    }
-    startContactInfoSearch();
-  }
-
-  /**
-   * Determines whether bubbles can be shown based on permissions obtained. This should be checked
-   * before attempting to create a Bubble.
-   *
-   * @return true iff bubbles are able to be shown.
-   * @see Settings#canDrawOverlays(Context)
-   */
-  private static boolean canShowBubbles(@NonNull Context context) {
-    return canShowBubblesForTesting != null
-        ? canShowBubblesForTesting
-        : Settings.canDrawOverlays(context);
-  }
-
-  @VisibleForTesting(otherwise = VisibleForTesting.NONE)
-  static void setCanShowBubblesForTesting(boolean canShowBubbles) {
-    canShowBubblesForTesting = canShowBubbles;
-  }
-
-  @VisibleForTesting
-  public NewBubble startBubble() {
-    if (!canShowBubbles(context)) {
-      LogUtil.i("ReturnToCallController.startNewBubble", "can't show bubble, no permission");
-      return null;
-    }
-    NewBubble returnToCallBubble = NewBubbleComponent.get(context).getNewBubble();
-    returnToCallBubble.setBubbleInfo(generateBubbleInfo());
-    returnToCallBubble.show();
-    return returnToCallBubble;
-  }
-
-  @Override
-  public void onIncomingCall(DialerCall call) {}
-
-  @Override
-  public void onUpgradeToVideo(DialerCall call) {}
-
-  @Override
-  public void onSessionModificationStateChange(DialerCall call) {}
-
-  @Override
-  public void onCallListChange(CallList callList) {}
-
-  @Override
-  public void onDisconnect(DialerCall call) {
-    LogUtil.enterBlock("ReturnToCallController.onDisconnect");
-    if (bubble != null && bubble.isVisible() && (getCall() == null)) {
-      // Show "Call ended" and hide bubble when there is no outgoing, active or background call
-      LogUtil.i("ReturnToCallController.onDisconnect", "show call ended and hide bubble");
-      // Don't show text if it's Duo upgrade
-      // It doesn't work for Duo fallback upgrade since we're not considered in call
-      if (!TelecomUtil.isInCall(context) || CallList.getInstance().getIncomingCall() != null) {
-        bubble.showText(context.getText(R.string.incall_call_ended));
-      }
-      hide();
-    } else {
-      startContactInfoSearch();
-    }
-  }
-
-  @Override
-  public void onWiFiToLteHandover(DialerCall call) {}
-
-  @Override
-  public void onHandoverToWifiFailed(DialerCall call) {}
-
-  @Override
-  public void onInternationalCallOnWifi(@NonNull DialerCall call) {}
-
-  @Override
-  public void onAudioStateChanged(CallAudioState audioState) {
-    this.audioState = audioState;
-    if (bubble != null) {
-      bubble.updateActions(generateActions());
-    }
-  }
-
-  private void startContactInfoSearch() {
-    DialerCall dialerCall = getCall();
-    if (dialerCall != null) {
-      contactInfoCache.findInfo(
-          dialerCall, false /* isIncoming */, new ReturnToCallContactInfoCacheCallback(this));
-    }
-  }
-
-  private DialerCall getCall() {
-    DialerCall dialerCall = CallList.getInstance().getOutgoingCall();
-    if (dialerCall == null) {
-      dialerCall = CallList.getInstance().getActiveOrBackgroundCall();
-    }
-    return dialerCall;
-  }
-
-  private void onPhotoAvatarReceived(@NonNull Drawable photo) {
-    if (bubble != null) {
-      bubble.updatePhotoAvatar(photo);
-    }
-  }
-
-  private void onLetterTileAvatarReceived(@NonNull Drawable photo) {
-    if (bubble != null) {
-      bubble.updateAvatar(photo);
-    }
-  }
-
-  private NewBubbleInfo generateBubbleInfo() {
-    return NewBubbleInfo.builder()
-        .setPrimaryColor(context.getResources().getColor(R.color.dialer_theme_color, null))
-        .setPrimaryIcon(Icon.createWithResource(context, R.drawable.on_going_call))
-        .setStartingYPosition(
-            context.getResources().getDimensionPixelOffset(R.dimen.return_to_call_initial_offset_y))
-        .setActions(generateActions())
-        .build();
-  }
-
-  @NonNull
-  private List<Action> generateActions() {
-    List<Action> actions = new ArrayList<>();
-    SpeakerButtonInfo speakerButtonInfo = new SpeakerButtonInfo(audioState, IconSize.SIZE_24_DP);
-
-    // Return to call
-    actions.add(
-        Action.builder()
-            .setIconDrawable(
-                context.getDrawable(R.drawable.quantum_ic_exit_to_app_flip_vd_theme_24))
-            .setIntent(fullScreen)
-            .setName(context.getText(R.string.bubble_return_to_call))
-            .setCheckable(false)
-            .build());
-    // Mute/unmute
-    actions.add(
-        Action.builder()
-            .setIconDrawable(context.getDrawable(R.drawable.quantum_ic_mic_off_white_24))
-            .setChecked(audioState.isMuted())
-            .setIntent(toggleMute)
-            .setName(context.getText(R.string.incall_label_mute))
-            .build());
-    // Speaker/audio selector
-    actions.add(
-        Action.builder()
-            .setIconDrawable(context.getDrawable(speakerButtonInfo.icon))
-            .setSecondaryIconDrawable(
-                speakerButtonInfo.checkable
-                    ? null
-                    : context.getDrawable(R.drawable.quantum_ic_arrow_drop_down_vd_theme_24))
-            .setName(context.getText(speakerButtonInfo.label))
-            .setCheckable(speakerButtonInfo.checkable)
-            .setChecked(speakerButtonInfo.isChecked)
-            .setIntent(speakerButtonInfo.checkable ? toggleSpeaker : showSpeakerSelect)
-            .build());
-    // End call
-    actions.add(
-        Action.builder()
-            .setIconDrawable(context.getDrawable(R.drawable.quantum_ic_call_end_vd_theme_24))
-            .setIntent(endCall)
-            .setName(context.getText(R.string.incall_label_end_call))
-            .setCheckable(false)
-            .build());
-    return actions;
-  }
-
-  @NonNull
-  private PendingIntent createActionIntent(String action) {
-    Intent intent = new Intent(context, NewReturnToCallActionReceiver.class);
-    intent.setAction(action);
-    return PendingIntent.getBroadcast(context, 0, intent, 0);
-  }
-
-  @NonNull
-  private LetterTileDrawable createLettleTileDrawable(
-      DialerCall dialerCall, ContactCacheEntry entry) {
-    String preferredName =
-        ContactDisplayUtils.getPreferredDisplayName(
-            entry.namePrimary,
-            entry.nameAlternative,
-            ContactsPreferencesFactory.newContactsPreferences(context));
-    if (TextUtils.isEmpty(preferredName)) {
-      preferredName = entry.number;
-    }
-
-    LetterTileDrawable letterTile = new LetterTileDrawable(context.getResources());
-    letterTile.setCanonicalDialerLetterTileDetails(
-        dialerCall.updateNameIfRestricted(preferredName),
-        entry.lookupKey,
-        LetterTileDrawable.SHAPE_CIRCLE,
-        LetterTileDrawable.getContactTypeFromPrimitives(
-            dialerCall.isVoiceMailNumber(),
-            dialerCall.isSpam(),
-            entry.isBusiness,
-            dialerCall.getNumberPresentation(),
-            dialerCall.isConferenceCall()));
-    return letterTile;
-  }
-
-  private static class ReturnToCallContactInfoCacheCallback implements ContactInfoCacheCallback {
-
-    private final WeakReference<NewReturnToCallController> newReturnToCallControllerWeakReference;
-
-    private ReturnToCallContactInfoCacheCallback(
-        NewReturnToCallController newReturnToCallController) {
-      newReturnToCallControllerWeakReference = new WeakReference<>(newReturnToCallController);
-    }
-
-    @Override
-    public void onContactInfoComplete(String callId, ContactCacheEntry entry) {
-      NewReturnToCallController newReturnToCallController =
-          newReturnToCallControllerWeakReference.get();
-      if (newReturnToCallController == null) {
-        return;
-      }
-      if (entry.photo != null) {
-        newReturnToCallController.onPhotoAvatarReceived(entry.photo);
-      } else {
-        DialerCall dialerCall = CallList.getInstance().getCallById(callId);
-        if (dialerCall != null) {
-          newReturnToCallController.onLetterTileAvatarReceived(
-              newReturnToCallController.createLettleTileDrawable(dialerCall, entry));
-        }
-      }
-    }
-
-    @Override
-    public void onImageLoadComplete(String callId, ContactCacheEntry entry) {
-      NewReturnToCallController newReturnToCallController =
-          newReturnToCallControllerWeakReference.get();
-      if (newReturnToCallController == null) {
-        return;
-      }
-      if (entry.photo != null) {
-        newReturnToCallController.onPhotoAvatarReceived(entry.photo);
-      } else {
-        DialerCall dialerCall = CallList.getInstance().getCallById(callId);
-        if (dialerCall != null) {
-          newReturnToCallController.onLetterTileAvatarReceived(
-              newReturnToCallController.createLettleTileDrawable(dialerCall, entry));
-        }
-      }
-    }
-  }
-}
diff --git a/java/com/android/incallui/NotificationBroadcastReceiver.java b/java/com/android/incallui/NotificationBroadcastReceiver.java
index 52d01f5..241d8ed 100644
--- a/java/com/android/incallui/NotificationBroadcastReceiver.java
+++ b/java/com/android/incallui/NotificationBroadcastReceiver.java
@@ -20,15 +20,21 @@
 import android.content.Context;
 import android.content.Intent;
 import android.os.Build.VERSION_CODES;
+import android.support.annotation.NonNull;
 import android.support.annotation.RequiresApi;
 import android.telecom.CallAudioState;
 import android.telecom.VideoProfile;
 import com.android.dialer.common.LogUtil;
+import com.android.dialer.common.concurrent.DialerExecutorComponent;
 import com.android.dialer.logging.DialerImpression;
 import com.android.dialer.logging.Logger;
 import com.android.incallui.call.CallList;
 import com.android.incallui.call.DialerCall;
 import com.android.incallui.call.TelecomAdapter;
+import com.android.incallui.speakeasy.SpeakEasyCallManager;
+import com.google.common.util.concurrent.FutureCallback;
+import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.ListenableFuture;
 
 /**
  * Accepts broadcast Intents which will be prepared by {@link StatusBarNotifier} and thus sent from
@@ -57,6 +63,8 @@
   public static final String ACTION_TURN_ON_SPEAKER = "com.android.incallui.ACTION_TURN_ON_SPEAKER";
   public static final String ACTION_TURN_OFF_SPEAKER =
       "com.android.incallui.ACTION_TURN_OFF_SPEAKER";
+  public static final String ACTION_ANSWER_SPEAKEASY_CALL =
+      "com.android.incallui.ACTION_ANSWER_SPEAKEASY_CALL";
 
   @RequiresApi(VERSION_CODES.N_MR1)
   public static final String ACTION_PULL_EXTERNAL_CALL =
@@ -72,9 +80,12 @@
 
     // TODO: Commands of this nature should exist in the CallList.
     if (action.equals(ACTION_ANSWER_VIDEO_INCOMING_CALL)) {
-      answerIncomingCall(VideoProfile.STATE_BIDIRECTIONAL);
+      answerIncomingCall(VideoProfile.STATE_BIDIRECTIONAL, context);
     } else if (action.equals(ACTION_ANSWER_VOICE_INCOMING_CALL)) {
-      answerIncomingCall(VideoProfile.STATE_AUDIO_ONLY);
+      answerIncomingCall(VideoProfile.STATE_AUDIO_ONLY, context);
+    } else if (action.equals(ACTION_ANSWER_SPEAKEASY_CALL)) {
+      markIncomingCallAsSpeakeasyCall();
+      answerIncomingCall(VideoProfile.STATE_AUDIO_ONLY, context);
     } else if (action.equals(ACTION_DECLINE_INCOMING_CALL)) {
       Logger.get(context)
           .logImpression(DialerImpression.Type.REJECT_INCOMING_CALL_FROM_NOTIFICATION);
@@ -140,7 +151,20 @@
     }
   }
 
-  private void answerIncomingCall(int videoState) {
+  private void markIncomingCallAsSpeakeasyCall() {
+    CallList callList = InCallPresenter.getInstance().getCallList();
+    if (callList == null) {
+      LogUtil.e(
+          "NotificationBroadcastReceiver.markIncomingCallAsSpeakeasyCall", "call list is empty");
+    } else {
+      DialerCall call = callList.getIncomingCall();
+      if (call != null) {
+        call.setIsSpeakEasyCall(true);
+      }
+    }
+  }
+
+  private void answerIncomingCall(int videoState, @NonNull Context context) {
     CallList callList = InCallPresenter.getInstance().getCallList();
     if (callList == null) {
       StatusBarNotifier.clearAllCallNotifications();
@@ -148,13 +172,42 @@
     } else {
       DialerCall call = callList.getIncomingCall();
       if (call != null) {
-        call.answer(videoState);
-        InCallPresenter.getInstance()
-            .showInCall(false /* showDialpad */, false /* newOutgoingCall */);
+
+        SpeakEasyCallManager speakEasyCallManager =
+            InCallPresenter.getInstance().getSpeakEasyCallManager();
+        ListenableFuture<Void> answerPrecondition;
+
+        if (speakEasyCallManager != null) {
+          answerPrecondition = speakEasyCallManager.onNewIncomingCall(call);
+        } else {
+          answerPrecondition = Futures.immediateFuture(null);
+        }
+
+        Futures.addCallback(
+            answerPrecondition,
+            new FutureCallback<Void>() {
+              @Override
+              public void onSuccess(Void result) {
+                answerIncomingCallCallback(call, videoState);
+              }
+
+              @Override
+              public void onFailure(Throwable t) {
+                answerIncomingCallCallback(call, videoState);
+                // TODO(erfanian): Enumerate all error states and specify recovery strategies.
+                throw new RuntimeException("Failed to successfully complete pre call tasks.", t);
+              }
+            },
+            DialerExecutorComponent.get(context).uiExecutor());
       }
     }
   }
 
+  private void answerIncomingCallCallback(@NonNull DialerCall call, int videoState) {
+    call.answer(videoState);
+    InCallPresenter.getInstance().showInCall(false /* showDialpad */, false /* newOutgoingCall */);
+  }
+
   private void declineIncomingCall() {
     CallList callList = InCallPresenter.getInstance().getCallList();
     if (callList == null) {
diff --git a/java/com/android/incallui/PhoneLookupHistoryRecorder.java b/java/com/android/incallui/PhoneLookupHistoryRecorder.java
index 802bf63..4c5cf8a 100644
--- a/java/com/android/incallui/PhoneLookupHistoryRecorder.java
+++ b/java/com/android/incallui/PhoneLookupHistoryRecorder.java
@@ -19,23 +19,18 @@
 import android.content.Context;
 import android.support.annotation.Nullable;
 import android.telecom.Call;
-import com.android.dialer.DialerPhoneNumber;
+import com.android.dialer.calllog.config.CallLogConfigComponent;
 import com.android.dialer.common.Assert;
 import com.android.dialer.common.LogUtil;
 import com.android.dialer.common.concurrent.DialerExecutorComponent;
-import com.android.dialer.configprovider.ConfigProviderBindings;
 import com.android.dialer.phonelookup.PhoneLookupComponent;
 import com.android.dialer.phonelookup.PhoneLookupInfo;
 import com.android.dialer.phonelookup.database.contract.PhoneLookupHistoryContract.PhoneLookupHistory;
-import com.android.dialer.phonenumberproto.DialerPhoneNumberUtil;
 import com.android.dialer.telecom.TelecomCallUtil;
 import com.google.common.base.Optional;
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
-import com.google.common.util.concurrent.ListeningExecutorService;
-import com.google.common.util.concurrent.MoreExecutors;
-import com.google.i18n.phonenumbers.PhoneNumberUtil;
 
 /**
  * Fetches the current {@link PhoneLookupInfo} for the provided call and writes it to the
@@ -44,35 +39,16 @@
 final class PhoneLookupHistoryRecorder {
 
   /**
-   * If the new UI is enabled, fetches the current {@link PhoneLookupInfo} for the provided call and
-   * writes it to the PhoneLookupHistory. Otherwise does nothing.
+   * If the call log framework is enabled, fetches the current {@link PhoneLookupInfo} for the
+   * provided call and writes it to the PhoneLookupHistory. Otherwise does nothing.
    */
   static void recordPhoneLookupInfo(Context appContext, Call call) {
-    if (!(ConfigProviderBindings.get(appContext).getBoolean("is_nui_shortcut_enabled", false))) {
+    if (!CallLogConfigComponent.get(appContext).callLogConfig().isCallLogFrameworkEnabled()) {
       return;
     }
 
-    ListeningExecutorService backgroundExecutor =
-        DialerExecutorComponent.get(appContext).backgroundExecutor();
-
-    ListenableFuture<DialerPhoneNumber> numberFuture =
-        backgroundExecutor.submit(
-            () -> {
-              DialerPhoneNumberUtil dialerPhoneNumberUtil =
-                  new DialerPhoneNumberUtil(PhoneNumberUtil.getInstance());
-              return dialerPhoneNumberUtil.parse(
-                  TelecomCallUtil.getNumber(call),
-                  TelecomCallUtil.getCountryCode(appContext, call).orNull());
-            });
-
     ListenableFuture<PhoneLookupInfo> infoFuture =
-        Futures.transformAsync(
-            numberFuture,
-            dialerPhoneNumber ->
-                PhoneLookupComponent.get(appContext)
-                    .compositePhoneLookup()
-                    .lookup(dialerPhoneNumber),
-            MoreExecutors.directExecutor());
+        PhoneLookupComponent.get(appContext).compositePhoneLookup().lookup(call);
 
     Futures.addCallback(
         infoFuture,
@@ -105,6 +81,6 @@
                 "PhoneLookupHistoryRecorder.onFailure", "could not write PhoneLookupHistory", t);
           }
         },
-        backgroundExecutor);
+        DialerExecutorComponent.get(appContext).backgroundExecutor());
   }
 }
diff --git a/java/com/android/incallui/PostCharDialogActivity.java b/java/com/android/incallui/PostCharDialogActivity.java
new file mode 100644
index 0000000..dcdc9d6
--- /dev/null
+++ b/java/com/android/incallui/PostCharDialogActivity.java
@@ -0,0 +1,100 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.incallui;
+
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.v7.app.AppCompatActivity;
+import com.android.incallui.call.CallList;
+import com.android.incallui.call.DialerCall;
+
+/**
+ * Activity that contains an alert dialog with OK and Cancel buttons to allow user to Accept or
+ * Reject the WAIT inserted as part of the Dial string.
+ */
+public class PostCharDialogActivity extends AppCompatActivity implements CallList.Listener {
+
+  public static final String EXTRA_CALL_ID = "extra_call_id";
+  public static final String EXTRA_POST_DIAL_STRING = "extra_post_dial_string";
+  private static final String TAG_INTERNATIONAL_CALL_ON_WIFI = "tag_international_call_on_wifi";
+
+  private String callId;
+
+  @Override
+  protected void onCreate(@Nullable Bundle bundle) {
+    super.onCreate(bundle);
+
+    callId = getIntent().getStringExtra(EXTRA_CALL_ID);
+    String postDialString = getIntent().getStringExtra(EXTRA_POST_DIAL_STRING);
+    if (callId == null || postDialString == null) {
+      finish();
+      return;
+    }
+
+    PostCharDialogFragment fragment = new PostCharDialogFragment(callId, postDialString);
+    fragment.show(getSupportFragmentManager(), TAG_INTERNATIONAL_CALL_ON_WIFI);
+
+    CallList.getInstance().addListener(this);
+  }
+
+  @Override
+  protected void onDestroy() {
+    super.onDestroy();
+    CallList.getInstance().removeListener(this);
+  }
+
+  @Override
+  protected void onPause() {
+    super.onPause();
+    // We don't expect the activity to resume, except for orientation change.
+    if (!isChangingConfigurations()) {
+      finish();
+    }
+  }
+
+  @Override
+  public void onDisconnect(DialerCall call) {
+    if (callId.equals(call.getId())) {
+      finish();
+    }
+  }
+
+  @Override
+  public void onIncomingCall(DialerCall call) {}
+
+  @Override
+  public void onUpgradeToVideo(DialerCall call) {}
+
+  @Override
+  public void onUpgradeToRtt(DialerCall call, int rttRequestId) {}
+
+  @Override
+  public void onSessionModificationStateChange(DialerCall call) {}
+
+  @Override
+  public void onCallListChange(CallList callList) {}
+
+  @Override
+  public void onWiFiToLteHandover(DialerCall call) {}
+
+  @Override
+  public void onHandoverToWifiFailed(DialerCall call) {}
+
+  @Override
+  public void onInternationalCallOnWifi(@NonNull DialerCall call) {}
+}
diff --git a/java/com/android/incallui/ProximitySensor.java b/java/com/android/incallui/ProximitySensor.java
index 4b03344..9719e5d 100644
--- a/java/com/android/incallui/ProximitySensor.java
+++ b/java/com/android/incallui/ProximitySensor.java
@@ -113,7 +113,7 @@
 
     DialerCall activeCall = callList.getActiveCall();
     boolean isVideoCall = activeCall != null && activeCall.isVideoCall();
-    boolean isRttCall = activeCall != null && activeCall.isRttCall();
+    boolean isRttCall = activeCall != null && activeCall.isActiveRttCall();
 
     if (isOffhook != isPhoneOffhook
         || this.isVideoCall != isVideoCall
diff --git a/java/com/android/incallui/ReturnToCallActionReceiver.java b/java/com/android/incallui/ReturnToCallActionReceiver.java
new file mode 100644
index 0000000..d6014aa
--- /dev/null
+++ b/java/com/android/incallui/ReturnToCallActionReceiver.java
@@ -0,0 +1,155 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.incallui;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.telecom.CallAudioState;
+import com.android.dialer.common.Assert;
+import com.android.dialer.common.LogUtil;
+import com.android.dialer.logging.DialerImpression;
+import com.android.dialer.logging.Logger;
+import com.android.incallui.audiomode.AudioModeProvider;
+import com.android.incallui.call.CallList;
+import com.android.incallui.call.DialerCall;
+import com.android.incallui.call.TelecomAdapter;
+
+/** Handles clicks on the return-to-call bubble */
+public class ReturnToCallActionReceiver extends BroadcastReceiver {
+
+  public static final String ACTION_RETURN_TO_CALL = "returnToCallV2";
+  public static final String ACTION_TOGGLE_SPEAKER = "toggleSpeakerV2";
+  public static final String ACTION_SHOW_AUDIO_ROUTE_SELECTOR = "showAudioRouteSelectorV2";
+  public static final String ACTION_TOGGLE_MUTE = "toggleMuteV2";
+  public static final String ACTION_END_CALL = "endCallV2";
+
+  @Override
+  public void onReceive(Context context, Intent intent) {
+    switch (intent.getAction()) {
+      case ACTION_RETURN_TO_CALL:
+        returnToCall(context);
+        break;
+      case ACTION_TOGGLE_SPEAKER:
+        toggleSpeaker(context);
+        break;
+      case ACTION_SHOW_AUDIO_ROUTE_SELECTOR:
+        showAudioRouteSelector(context);
+        break;
+      case ACTION_TOGGLE_MUTE:
+        toggleMute(context);
+        break;
+      case ACTION_END_CALL:
+        endCall(context);
+        break;
+      default:
+        throw Assert.createIllegalStateFailException(
+            "Invalid intent action: " + intent.getAction());
+    }
+  }
+
+  private void returnToCall(Context context) {
+    DialerCall call = getCall();
+    Logger.get(context)
+        .logCallImpression(
+            DialerImpression.Type.BUBBLE_V2_RETURN_TO_CALL,
+            call != null ? call.getUniqueCallId() : "",
+            call != null ? call.getTimeAddedMs() : 0);
+
+    Intent activityIntent = InCallActivity.getIntent(context, false, false, false);
+    activityIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+    context.startActivity(activityIntent);
+  }
+
+  private void toggleSpeaker(Context context) {
+    CallAudioState audioState = AudioModeProvider.getInstance().getAudioState();
+
+    if ((audioState.getSupportedRouteMask() & CallAudioState.ROUTE_BLUETOOTH)
+        == CallAudioState.ROUTE_BLUETOOTH) {
+      LogUtil.w(
+          "ReturnToCallActionReceiver.toggleSpeaker",
+          "toggleSpeaker() called when bluetooth available."
+              + " Probably should have shown audio route selector");
+    }
+
+    DialerCall call = getCall();
+
+    int newRoute;
+    if (audioState.getRoute() == CallAudioState.ROUTE_SPEAKER) {
+      newRoute = CallAudioState.ROUTE_WIRED_OR_EARPIECE;
+      Logger.get(context)
+          .logCallImpression(
+              DialerImpression.Type.BUBBLE_V2_WIRED_OR_EARPIECE,
+              call != null ? call.getUniqueCallId() : "",
+              call != null ? call.getTimeAddedMs() : 0);
+    } else {
+      newRoute = CallAudioState.ROUTE_SPEAKER;
+      Logger.get(context)
+          .logCallImpression(
+              DialerImpression.Type.BUBBLE_V2_SPEAKERPHONE,
+              call != null ? call.getUniqueCallId() : "",
+              call != null ? call.getTimeAddedMs() : 0);
+    }
+    TelecomAdapter.getInstance().setAudioRoute(newRoute);
+  }
+
+  public void showAudioRouteSelector(Context context) {
+    Intent intent = new Intent(context, AudioRouteSelectorActivity.class);
+    intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_MULTIPLE_TASK);
+    context.startActivity(intent);
+  }
+
+  private void toggleMute(Context context) {
+    DialerCall call = getCall();
+    boolean shouldMute = !AudioModeProvider.getInstance().getAudioState().isMuted();
+    Logger.get(context)
+        .logCallImpression(
+            shouldMute
+                ? DialerImpression.Type.BUBBLE_V2_MUTE_CALL
+                : DialerImpression.Type.BUBBLE_V2_UNMUTE_CALL,
+            call != null ? call.getUniqueCallId() : "",
+            call != null ? call.getTimeAddedMs() : 0);
+    TelecomAdapter.getInstance().mute(shouldMute);
+  }
+
+  private void endCall(Context context) {
+    DialerCall call = getCall();
+
+    Logger.get(context)
+        .logCallImpression(
+            DialerImpression.Type.BUBBLE_V2_END_CALL,
+            call != null ? call.getUniqueCallId() : "",
+            call != null ? call.getTimeAddedMs() : 0);
+    if (call != null) {
+      call.disconnect();
+    }
+  }
+
+  private DialerCall getCall() {
+    CallList callList = InCallPresenter.getInstance().getCallList();
+    if (callList != null) {
+      DialerCall call = callList.getOutgoingCall();
+      if (call == null) {
+        call = callList.getActiveOrBackgroundCall();
+      }
+      if (call != null) {
+        return call;
+      }
+    }
+    return null;
+  }
+}
diff --git a/java/com/android/incallui/ReturnToCallController.java b/java/com/android/incallui/ReturnToCallController.java
new file mode 100644
index 0000000..addde55
--- /dev/null
+++ b/java/com/android/incallui/ReturnToCallController.java
@@ -0,0 +1,435 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.incallui;
+
+import android.app.PendingIntent;
+import android.content.Context;
+import android.content.Intent;
+import android.graphics.drawable.Drawable;
+import android.graphics.drawable.Icon;
+import android.provider.Settings;
+import android.support.annotation.NonNull;
+import android.support.annotation.VisibleForTesting;
+import android.telecom.CallAudioState;
+import android.text.TextUtils;
+import com.android.bubble.Bubble;
+import com.android.bubble.BubbleComponent;
+import com.android.bubble.BubbleInfo;
+import com.android.bubble.BubbleInfo.Action;
+import com.android.dialer.common.LogUtil;
+import com.android.dialer.configprovider.ConfigProviderComponent;
+import com.android.dialer.contacts.ContactsComponent;
+import com.android.dialer.lettertile.LetterTileDrawable;
+import com.android.dialer.telecom.TelecomUtil;
+import com.android.dialer.theme.base.ThemeComponent;
+import com.android.incallui.ContactInfoCache.ContactCacheEntry;
+import com.android.incallui.ContactInfoCache.ContactInfoCacheCallback;
+import com.android.incallui.InCallPresenter.InCallState;
+import com.android.incallui.InCallPresenter.InCallUiListener;
+import com.android.incallui.audiomode.AudioModeProvider;
+import com.android.incallui.audiomode.AudioModeProvider.AudioModeListener;
+import com.android.incallui.call.CallList;
+import com.android.incallui.call.CallList.Listener;
+import com.android.incallui.call.DialerCall;
+import com.android.incallui.speakerbuttonlogic.SpeakerButtonInfo;
+import java.lang.ref.WeakReference;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Listens for events relevant to the return-to-call bubble and updates the bubble's state as
+ * necessary.
+ *
+ * <p>Bubble shows when one of following happens: 1. a new outgoing/ongoing call appears 2. leave
+ * in-call UI with an outgoing/ongoing call
+ *
+ * <p>Bubble hides when one of following happens: 1. a call disconnect and there is no more
+ * outgoing/ongoing call 2. show in-call UI
+ */
+public class ReturnToCallController implements InCallUiListener, Listener, AudioModeListener {
+
+  private final Context context;
+
+  @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
+  Bubble bubble;
+
+  private static Boolean canShowBubblesForTesting = null;
+
+  private CallAudioState audioState;
+
+  private final PendingIntent toggleSpeaker;
+  private final PendingIntent showSpeakerSelect;
+  private final PendingIntent toggleMute;
+  private final PendingIntent endCall;
+  private final PendingIntent fullScreen;
+
+  private final ContactInfoCache contactInfoCache;
+
+  private InCallState inCallState;
+
+  public static boolean isEnabled(Context context) {
+    return ConfigProviderComponent.get(context)
+        .getConfigProvider()
+        .getBoolean("enable_return_to_call_bubble_v2", false);
+  }
+
+  public ReturnToCallController(Context context, ContactInfoCache contactInfoCache) {
+    this.context = context;
+    this.contactInfoCache = contactInfoCache;
+
+    toggleSpeaker = createActionIntent(ReturnToCallActionReceiver.ACTION_TOGGLE_SPEAKER);
+    showSpeakerSelect =
+        createActionIntent(ReturnToCallActionReceiver.ACTION_SHOW_AUDIO_ROUTE_SELECTOR);
+    toggleMute = createActionIntent(ReturnToCallActionReceiver.ACTION_TOGGLE_MUTE);
+    endCall = createActionIntent(ReturnToCallActionReceiver.ACTION_END_CALL);
+    fullScreen = createActionIntent(ReturnToCallActionReceiver.ACTION_RETURN_TO_CALL);
+
+    AudioModeProvider.getInstance().addListener(this);
+    audioState = AudioModeProvider.getInstance().getAudioState();
+    InCallPresenter.getInstance().addInCallUiListener(this);
+    CallList.getInstance().addListener(this);
+  }
+
+  public void tearDown() {
+    hide();
+    InCallPresenter.getInstance().removeInCallUiListener(this);
+    CallList.getInstance().removeListener(this);
+    AudioModeProvider.getInstance().removeListener(this);
+  }
+
+  @Override
+  public void onUiShowing(boolean showing) {
+    if (!isEnabled(context)) {
+      hide();
+      return;
+    }
+
+    LogUtil.i("ReturnToCallController.onUiShowing", "showing: " + showing);
+    if (showing) {
+      LogUtil.i("ReturnToCallController.onUiShowing", "going to hide");
+      hide();
+    } else {
+      if (getCall() != null) {
+        LogUtil.i("ReturnToCallController.onUiShowing", "going to show");
+        show();
+      }
+    }
+  }
+
+  private void hide() {
+    if (bubble != null) {
+      bubble.hide();
+    } else {
+      LogUtil.i("ReturnToCallController.hide", "hide() called without calling show()");
+    }
+  }
+
+  private void show() {
+    if (bubble == null) {
+      bubble = startBubble();
+    } else {
+      bubble.show();
+    }
+    startContactInfoSearch();
+  }
+
+  /**
+   * Determines whether bubbles can be shown based on permissions obtained. This should be checked
+   * before attempting to create a Bubble.
+   *
+   * @return true iff bubbles are able to be shown.
+   * @see Settings#canDrawOverlays(Context)
+   */
+  private static boolean canShowBubbles(@NonNull Context context) {
+    return canShowBubblesForTesting != null
+        ? canShowBubblesForTesting
+        : Settings.canDrawOverlays(context);
+  }
+
+  @VisibleForTesting(otherwise = VisibleForTesting.NONE)
+  static void setCanShowBubblesForTesting(boolean canShowBubbles) {
+    canShowBubblesForTesting = canShowBubbles;
+  }
+
+  private Bubble startBubble() {
+    if (!canShowBubbles(context)) {
+      LogUtil.i("ReturnToCallController.startBubble", "can't show bubble, no permission");
+      return null;
+    }
+    Bubble returnToCallBubble = BubbleComponent.get(context).getBubble();
+    returnToCallBubble.setBubbleInfo(generateBubbleInfo());
+    returnToCallBubble.show();
+    return returnToCallBubble;
+  }
+
+  @Override
+  public void onIncomingCall(DialerCall call) {}
+
+  @Override
+  public void onUpgradeToVideo(DialerCall call) {}
+
+  @Override
+  public void onSessionModificationStateChange(DialerCall call) {}
+
+  @Override
+  public void onCallListChange(CallList callList) {
+    if (!isEnabled(context)) {
+      hide();
+      return;
+    }
+
+    boolean shouldStartInBubbleMode = InCallPresenter.getInstance().shouldStartInBubbleMode();
+    InCallState newInCallState =
+        InCallPresenter.getInstance().getPotentialStateFromCallList(callList);
+    boolean isNewBackgroundCall =
+        newInCallState != inCallState
+            && newInCallState == InCallState.OUTGOING
+            && shouldStartInBubbleMode;
+    boolean bubbleNeverVisible = (bubble == null || !(bubble.isVisible() || bubble.isDismissed()));
+    if (bubble != null && isNewBackgroundCall) {
+      // If new outgoing call is in bubble mode, update bubble info.
+      // We don't update if new call is not in bubble mode even if the existing call is.
+      bubble.setBubbleInfo(generateBubbleInfoForBackgroundCalling());
+    }
+    if (((bubbleNeverVisible && newInCallState != InCallState.OUTGOING) || isNewBackgroundCall)
+        && getCall() != null
+        && !InCallPresenter.getInstance().isShowingInCallUi()) {
+      LogUtil.i("ReturnToCallController.onCallListChange", "going to show bubble");
+      show();
+    } else {
+      // The call to display might be different for the existing bubble
+      startContactInfoSearch();
+    }
+    inCallState = newInCallState;
+  }
+
+  @Override
+  public void onDisconnect(DialerCall call) {
+    if (!isEnabled(context)) {
+      hide();
+      return;
+    }
+
+    LogUtil.enterBlock("ReturnToCallController.onDisconnect");
+    if (bubble != null && bubble.isVisible() && (getCall() == null)) {
+      // Show "Call ended" and hide bubble when there is no outgoing, active or background call
+      LogUtil.i("ReturnToCallController.onDisconnect", "show call ended and hide bubble");
+      // Don't show text if it's Duo upgrade
+      // It doesn't work for Duo fallback upgrade since we're not considered in call
+      if (!TelecomUtil.isInCall(context) || CallList.getInstance().getIncomingCall() != null) {
+        bubble.showText(context.getText(R.string.incall_call_ended));
+      }
+      hide();
+    } else {
+      startContactInfoSearch();
+    }
+  }
+
+  @Override
+  public void onWiFiToLteHandover(DialerCall call) {}
+
+  @Override
+  public void onHandoverToWifiFailed(DialerCall call) {}
+
+  @Override
+  public void onInternationalCallOnWifi(@NonNull DialerCall call) {}
+
+  @Override
+  public void onAudioStateChanged(CallAudioState audioState) {
+    if (!isEnabled(context)) {
+      hide();
+      return;
+    }
+
+    this.audioState = audioState;
+    if (bubble != null) {
+      bubble.updateActions(generateActions());
+    }
+  }
+
+  private void startContactInfoSearch() {
+    DialerCall dialerCall = getCall();
+    if (dialerCall != null) {
+      contactInfoCache.findInfo(
+          dialerCall, false /* isIncoming */, new ReturnToCallContactInfoCacheCallback(this));
+    }
+  }
+
+  private DialerCall getCall() {
+    DialerCall dialerCall = CallList.getInstance().getOutgoingCall();
+    if (dialerCall == null) {
+      dialerCall = CallList.getInstance().getActiveOrBackgroundCall();
+    }
+    return dialerCall;
+  }
+
+  private void onPhotoAvatarReceived(@NonNull Drawable photo) {
+    if (bubble != null) {
+      bubble.updatePhotoAvatar(photo);
+    }
+  }
+
+  private void onLetterTileAvatarReceived(@NonNull Drawable photo) {
+    if (bubble != null) {
+      bubble.updateAvatar(photo);
+    }
+  }
+
+  private BubbleInfo generateBubbleInfo() {
+    return BubbleInfo.builder()
+        .setPrimaryColor(ThemeComponent.get(context).theme().getColorPrimary())
+        .setPrimaryIcon(Icon.createWithResource(context, R.drawable.on_going_call))
+        .setStartingYPosition(
+            InCallPresenter.getInstance().shouldStartInBubbleMode()
+                ? context.getResources().getDisplayMetrics().heightPixels / 2
+                : context
+                    .getResources()
+                    .getDimensionPixelOffset(R.dimen.return_to_call_initial_offset_y))
+        .setActions(generateActions())
+        .build();
+  }
+
+  private BubbleInfo generateBubbleInfoForBackgroundCalling() {
+    return BubbleInfo.builder()
+        .setPrimaryColor(ThemeComponent.get(context).theme().getColorPrimary())
+        .setPrimaryIcon(Icon.createWithResource(context, R.drawable.on_going_call))
+        .setStartingYPosition(context.getResources().getDisplayMetrics().heightPixels / 2)
+        .setActions(generateActions())
+        .build();
+  }
+
+  @NonNull
+  private List<Action> generateActions() {
+    List<Action> actions = new ArrayList<>();
+    SpeakerButtonInfo speakerButtonInfo = new SpeakerButtonInfo(audioState);
+
+    // Return to call
+    actions.add(
+        Action.builder()
+            .setIconDrawable(
+                context.getDrawable(R.drawable.quantum_ic_exit_to_app_flip_vd_theme_24))
+            .setIntent(fullScreen)
+            .setName(context.getText(R.string.bubble_return_to_call))
+            .setCheckable(false)
+            .build());
+    // Mute/unmute
+    actions.add(
+        Action.builder()
+            .setIconDrawable(context.getDrawable(R.drawable.quantum_ic_mic_off_vd_theme_24))
+            .setChecked(audioState.isMuted())
+            .setIntent(toggleMute)
+            .setName(context.getText(R.string.incall_label_mute))
+            .build());
+    // Speaker/audio selector
+    actions.add(
+        Action.builder()
+            .setIconDrawable(context.getDrawable(speakerButtonInfo.icon))
+            .setSecondaryIconDrawable(
+                speakerButtonInfo.nonBluetoothMode
+                    ? null
+                    : context.getDrawable(R.drawable.quantum_ic_arrow_drop_down_vd_theme_24))
+            .setName(context.getText(speakerButtonInfo.label))
+            .setCheckable(speakerButtonInfo.nonBluetoothMode)
+            .setChecked(speakerButtonInfo.isChecked)
+            .setIntent(speakerButtonInfo.nonBluetoothMode ? toggleSpeaker : showSpeakerSelect)
+            .build());
+    // End call
+    actions.add(
+        Action.builder()
+            .setIconDrawable(context.getDrawable(R.drawable.quantum_ic_call_end_vd_theme_24))
+            .setIntent(endCall)
+            .setName(context.getText(R.string.incall_label_end_call))
+            .setCheckable(false)
+            .build());
+    return actions;
+  }
+
+  @NonNull
+  private PendingIntent createActionIntent(String action) {
+    Intent intent = new Intent(context, ReturnToCallActionReceiver.class);
+    intent.setAction(action);
+    return PendingIntent.getBroadcast(context, 0, intent, 0);
+  }
+
+  @NonNull
+  private LetterTileDrawable createLettleTileDrawable(
+      DialerCall dialerCall, ContactCacheEntry entry) {
+    String preferredName =
+        ContactsComponent.get(context)
+            .contactDisplayPreferences()
+            .getDisplayName(entry.namePrimary, entry.nameAlternative);
+    if (TextUtils.isEmpty(preferredName)) {
+      preferredName = entry.number;
+    }
+
+    LetterTileDrawable letterTile = new LetterTileDrawable(context.getResources());
+    letterTile.setCanonicalDialerLetterTileDetails(
+        dialerCall.updateNameIfRestricted(preferredName),
+        entry.lookupKey,
+        LetterTileDrawable.SHAPE_CIRCLE,
+        LetterTileDrawable.getContactTypeFromPrimitives(
+            dialerCall.isVoiceMailNumber(),
+            dialerCall.isSpam(),
+            entry.isBusiness,
+            dialerCall.getNumberPresentation(),
+            dialerCall.isConferenceCall()));
+    return letterTile;
+  }
+
+  private static class ReturnToCallContactInfoCacheCallback implements ContactInfoCacheCallback {
+
+    private final WeakReference<ReturnToCallController> returnToCallControllerWeakReference;
+
+    private ReturnToCallContactInfoCacheCallback(ReturnToCallController returnToCallController) {
+      returnToCallControllerWeakReference = new WeakReference<>(returnToCallController);
+    }
+
+    @Override
+    public void onContactInfoComplete(String callId, ContactCacheEntry entry) {
+      ReturnToCallController returnToCallController = returnToCallControllerWeakReference.get();
+      if (returnToCallController == null) {
+        return;
+      }
+      if (entry.photo != null) {
+        returnToCallController.onPhotoAvatarReceived(entry.photo);
+      } else {
+        DialerCall dialerCall = CallList.getInstance().getCallById(callId);
+        if (dialerCall != null) {
+          returnToCallController.onLetterTileAvatarReceived(
+              returnToCallController.createLettleTileDrawable(dialerCall, entry));
+        }
+      }
+    }
+
+    @Override
+    public void onImageLoadComplete(String callId, ContactCacheEntry entry) {
+      ReturnToCallController returnToCallController = returnToCallControllerWeakReference.get();
+      if (returnToCallController == null) {
+        return;
+      }
+      if (entry.photo != null) {
+        returnToCallController.onPhotoAvatarReceived(entry.photo);
+      } else {
+        DialerCall dialerCall = CallList.getInstance().getCallById(callId);
+        if (dialerCall != null) {
+          returnToCallController.onLetterTileAvatarReceived(
+              returnToCallController.createLettleTileDrawable(dialerCall, entry));
+        }
+      }
+    }
+  }
+}
diff --git a/java/com/android/incallui/RttCallPresenter.java b/java/com/android/incallui/RttCallPresenter.java
index 939c9d0..2114691 100644
--- a/java/com/android/incallui/RttCallPresenter.java
+++ b/java/com/android/incallui/RttCallPresenter.java
@@ -23,6 +23,7 @@
 import android.telecom.Call.RttCall;
 import com.android.dialer.common.LogUtil;
 import com.android.dialer.common.concurrent.ThreadUtil;
+import com.android.dialer.rtt.RttTranscript;
 import com.android.incallui.InCallPresenter.InCallState;
 import com.android.incallui.InCallPresenter.InCallStateListener;
 import com.android.incallui.call.CallList;
@@ -62,6 +63,19 @@
     LogUtil.enterBlock("RttCallPresenter.onRttCallScreenUiReady");
     InCallPresenter.getInstance().addListener(this);
     startListenOnRemoteMessage();
+    DialerCall call = CallList.getInstance().getCallById(rttCallScreen.getCallId());
+    if (call != null) {
+      rttCallScreen.onRestoreRttChat(call.getRttTranscript());
+    }
+  }
+
+  @Override
+  public void onSaveRttTranscript() {
+    LogUtil.enterBlock("RttCallPresenter.onSaveRttTranscript");
+    DialerCall call = CallList.getInstance().getCallById(rttCallScreen.getCallId());
+    if (call != null) {
+      saveTranscript(call);
+    }
   }
 
   @Override
@@ -69,6 +83,20 @@
     LogUtil.enterBlock("RttCallPresenter.onRttCallScreenUiUnready");
     InCallPresenter.getInstance().removeListener(this);
     stopListenOnRemoteMessage();
+    onSaveRttTranscript();
+  }
+
+  private void saveTranscript(DialerCall dialerCall) {
+    LogUtil.enterBlock("RttCallPresenter.saveTranscript");
+    RttTranscript.Builder builder = RttTranscript.newBuilder();
+    builder
+
+        .setId(String.valueOf(dialerCall.getCreationTimeMillis()))
+
+        .setTimestamp(dialerCall.getCreationTimeMillis())
+        .setNumber(dialerCall.getNumber())
+        .addAllMessages(rttCallScreen.getRttTranscriptMessageList());
+    dialerCall.setRttTranscript(builder.build());
   }
 
   @Override
@@ -80,9 +108,9 @@
   }
 
   private void startListenOnRemoteMessage() {
-    DialerCall call = CallList.getInstance().getActiveCall();
+    DialerCall call = CallList.getInstance().getCallById(rttCallScreen.getCallId());
     if (call == null) {
-      LogUtil.i("RttCallPresenter.startListenOnRemoteMessage", "call is active yet");
+      LogUtil.i("RttCallPresenter.startListenOnRemoteMessage", "call does not exist");
       return;
     }
     rttCall = call.getRttCall();
diff --git a/java/com/android/incallui/RttRequestDialogFragment.java b/java/com/android/incallui/RttRequestDialogFragment.java
new file mode 100644
index 0000000..589625b
--- /dev/null
+++ b/java/com/android/incallui/RttRequestDialogFragment.java
@@ -0,0 +1,148 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.incallui;
+
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.content.Context;
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.v4.app.DialogFragment;
+import android.telephony.PhoneNumberUtils;
+import android.text.BidiFormatter;
+import android.text.TextDirectionHeuristics;
+import android.text.TextUtils;
+import android.view.View;
+import android.widget.TextView;
+import com.android.dialer.common.Assert;
+import com.android.dialer.common.LogUtil;
+import com.android.dialer.contacts.ContactsComponent;
+import com.android.incallui.ContactInfoCache.ContactCacheEntry;
+import com.android.incallui.ContactInfoCache.ContactInfoCacheCallback;
+import com.android.incallui.call.CallList;
+import com.android.incallui.call.DialerCall;
+import java.lang.ref.WeakReference;
+
+/** Dialog that shown to user when receiving RTT request mid call. */
+public class RttRequestDialogFragment extends DialogFragment {
+
+  /**
+   * Returns a new instance of {@link RttRequestDialogFragment} with the given callback.
+   *
+   * <p>Prefer this method over the default constructor.
+   */
+  public static RttRequestDialogFragment newInstance(String callId, int rttRequestId) {
+    RttRequestDialogFragment fragment = new RttRequestDialogFragment();
+    Bundle args = new Bundle();
+    args.putString(ARG_CALL_ID, Assert.isNotNull(callId));
+    args.putInt(ARG_RTT_REQUEST_ID, rttRequestId);
+    fragment.setArguments(args);
+    return fragment;
+  }
+
+  /** Key in the arguments bundle for call id. */
+  private static final String ARG_CALL_ID = "call_id";
+
+  private static final String ARG_RTT_REQUEST_ID = "rtt_request_id";
+
+  private TextView detailsTextView;
+
+  @NonNull
+  @Override
+  public Dialog onCreateDialog(Bundle bundle) {
+    super.onCreateDialog(bundle);
+    LogUtil.enterBlock("RttRequestDialogFragment.onCreateDialog");
+
+    View dialogView = View.inflate(getActivity(), R.layout.frag_rtt_request_dialog, null);
+    detailsTextView = dialogView.findViewById(R.id.details);
+
+    ContactInfoCache cache = ContactInfoCache.getInstance(getContext());
+    DialerCall dialerCall =
+        CallList.getInstance().getCallById(getArguments().getString(ARG_CALL_ID));
+    cache.findInfo(dialerCall, false, new ContactLookupCallback(this));
+
+    dialogView
+        .findViewById(R.id.rtt_button_decline_request)
+        .setOnClickListener(v -> onNegativeButtonClick());
+    dialogView
+        .findViewById(R.id.rtt_button_accept_request)
+        .setOnClickListener(v -> onPositiveButtonClick());
+
+    AlertDialog alertDialog =
+        new AlertDialog.Builder(getActivity())
+            .setCancelable(false)
+            .setView(dialogView)
+            .setTitle(R.string.rtt_request_dialog_title)
+            .create();
+
+    alertDialog.setCanceledOnTouchOutside(false);
+    return alertDialog;
+  }
+
+  private void onPositiveButtonClick() {
+    LogUtil.enterBlock("RttRequestDialogFragment.onPositiveButtonClick");
+
+    DialerCall call = CallList.getInstance().getCallById(getArguments().getString(ARG_CALL_ID));
+    call.respondToRttRequest(true, getArguments().getInt(ARG_RTT_REQUEST_ID));
+    dismiss();
+  }
+
+  private void onNegativeButtonClick() {
+    LogUtil.enterBlock("RttRequestDialogFragment.onNegativeButtonClick");
+
+    DialerCall call = CallList.getInstance().getCallById(getArguments().getString(ARG_CALL_ID));
+    call.respondToRttRequest(false, getArguments().getInt(ARG_RTT_REQUEST_ID));
+    dismiss();
+  }
+
+  private void setNameOrNumber(CharSequence nameOrNumber) {
+    detailsTextView.setText(getString(R.string.rtt_request_dialog_details, nameOrNumber));
+  }
+
+  private static class ContactLookupCallback implements ContactInfoCacheCallback {
+    private final WeakReference<RttRequestDialogFragment> rttRequestDialogFragmentWeakReference;
+
+    private ContactLookupCallback(RttRequestDialogFragment rttRequestDialogFragment) {
+      rttRequestDialogFragmentWeakReference = new WeakReference<>(rttRequestDialogFragment);
+    }
+
+    @Override
+    public void onContactInfoComplete(String callId, ContactCacheEntry entry) {
+      RttRequestDialogFragment fragment = rttRequestDialogFragmentWeakReference.get();
+      if (fragment != null) {
+        fragment.setNameOrNumber(getNameOrNumber(entry, fragment.getContext()));
+      }
+    }
+
+    private CharSequence getNameOrNumber(ContactCacheEntry entry, Context context) {
+      String preferredName =
+          ContactsComponent.get(context)
+              .contactDisplayPreferences()
+              .getDisplayName(entry.namePrimary, entry.nameAlternative);
+      if (TextUtils.isEmpty(preferredName)) {
+        return TextUtils.isEmpty(entry.number)
+            ? null
+            : PhoneNumberUtils.createTtsSpannable(
+                BidiFormatter.getInstance().unicodeWrap(entry.number, TextDirectionHeuristics.LTR));
+      }
+      return preferredName;
+    }
+
+    @Override
+    public void onImageLoadComplete(String callId, ContactCacheEntry entry) {}
+  }
+}
diff --git a/java/com/android/incallui/StatusBarNotifier.java b/java/com/android/incallui/StatusBarNotifier.java
index 87f332a..99ff725 100644
--- a/java/com/android/incallui/StatusBarNotifier.java
+++ b/java/com/android/incallui/StatusBarNotifier.java
@@ -19,6 +19,7 @@
 import static android.telecom.Call.Details.PROPERTY_HIGH_DEF_AUDIO;
 import static com.android.contacts.common.compat.CallCompat.Details.PROPERTY_ENTERPRISE_CALL;
 import static com.android.incallui.NotificationBroadcastReceiver.ACTION_ACCEPT_VIDEO_UPGRADE_REQUEST;
+import static com.android.incallui.NotificationBroadcastReceiver.ACTION_ANSWER_SPEAKEASY_CALL;
 import static com.android.incallui.NotificationBroadcastReceiver.ACTION_ANSWER_VIDEO_INCOMING_CALL;
 import static com.android.incallui.NotificationBroadcastReceiver.ACTION_ANSWER_VOICE_INCOMING_CALL;
 import static com.android.incallui.NotificationBroadcastReceiver.ACTION_DECLINE_INCOMING_CALL;
@@ -57,17 +58,17 @@
 import android.text.BidiFormatter;
 import android.text.Spannable;
 import android.text.SpannableString;
+import android.text.Spanned;
 import android.text.TextDirectionHeuristics;
 import android.text.TextUtils;
 import android.text.style.ForegroundColorSpan;
 import com.android.contacts.common.ContactsUtils;
 import com.android.contacts.common.ContactsUtils.UserType;
-import com.android.contacts.common.preference.ContactsPreferences;
-import com.android.contacts.common.util.ContactDisplayUtils;
 import com.android.dialer.common.Assert;
 import com.android.dialer.common.LogUtil;
-import com.android.dialer.configprovider.ConfigProviderBindings;
+import com.android.dialer.configprovider.ConfigProviderComponent;
 import com.android.dialer.contactphoto.BitmapUtil;
+import com.android.dialer.contacts.ContactsComponent;
 import com.android.dialer.enrichedcall.EnrichedCallManager;
 import com.android.dialer.enrichedcall.Session;
 import com.android.dialer.lettertile.LetterTileDrawable;
@@ -75,6 +76,7 @@
 import com.android.dialer.multimedia.MultimediaData;
 import com.android.dialer.notification.NotificationChannelId;
 import com.android.dialer.oem.MotorolaUtils;
+import com.android.dialer.theme.base.ThemeComponent;
 import com.android.dialer.util.DrawableConverter;
 import com.android.incallui.ContactInfoCache.ContactCacheEntry;
 import com.android.incallui.ContactInfoCache.ContactInfoCacheCallback;
@@ -85,10 +87,13 @@
 import com.android.incallui.call.DialerCall;
 import com.android.incallui.call.DialerCallListener;
 import com.android.incallui.call.TelecomAdapter;
+import com.android.incallui.call.state.DialerCallState;
 import com.android.incallui.ringtone.DialerRingtoneManager;
 import com.android.incallui.ringtone.InCallTonePlayer;
 import com.android.incallui.ringtone.ToneGeneratorFactory;
+import com.android.incallui.speakeasy.SpeakEasyComponent;
 import com.android.incallui.videotech.utils.SessionModificationState;
+import com.google.common.base.Optional;
 import java.util.Objects;
 
 /** This class adds Notifications to the status bar for the in-call experience. */
@@ -115,9 +120,8 @@
   private final Context context;
   private final ContactInfoCache contactInfoCache;
   private final DialerRingtoneManager dialerRingtoneManager;
-  @Nullable private ContactsPreferences contactsPreferences;
   private int currentNotification = NOTIFICATION_NONE;
-  private int callState = DialerCall.State.INVALID;
+  private int callState = DialerCallState.INVALID;
   private int videoState = VideoProfile.STATE_AUDIO_ONLY;
   private int savedIcon = 0;
   private String savedContent = null;
@@ -130,7 +134,6 @@
   public StatusBarNotifier(@NonNull Context context, @NonNull ContactInfoCache contactInfoCache) {
     Trace.beginSection("StatusBarNotifier.Constructor");
     this.context = Assert.isNotNull(context);
-    contactsPreferences = ContactsPreferencesFactory.newContactsPreferences(this.context);
     this.contactInfoCache = contactInfoCache;
     dialerRingtoneManager =
         new DialerRingtoneManager(
@@ -244,8 +247,8 @@
   private void showNotification(final DialerCall call) {
     Trace.beginSection("StatusBarNotifier.showNotification");
     final boolean isIncoming =
-        (call.getState() == DialerCall.State.INCOMING
-            || call.getState() == DialerCall.State.CALL_WAITING);
+        (call.getState() == DialerCallState.INCOMING
+            || call.getState() == DialerCallState.CALL_WAITING);
     setStatusBarCallListener(new StatusBarCallListener(call));
 
     // we make a call to the contact info cache to query for supplemental data to what the
@@ -287,10 +290,11 @@
         call.getVideoTech().getSessionModificationState()
             == SessionModificationState.RECEIVED_UPGRADE_TO_VIDEO_REQUEST;
     final int notificationType;
-    if (callState == DialerCall.State.INCOMING
-        || callState == DialerCall.State.CALL_WAITING
+    if (callState == DialerCallState.INCOMING
+        || callState == DialerCallState.CALL_WAITING
         || isVideoUpgradeRequest) {
-      if (ConfigProviderBindings.get(context)
+      if (ConfigProviderComponent.get(context)
+          .getConfigProvider()
           .getBoolean("quiet_incoming_call_if_ui_showing", true)) {
         notificationType =
             InCallPresenter.getInstance().isShowingInCallUi()
@@ -332,7 +336,7 @@
     Notification.Builder publicBuilder = new Notification.Builder(context);
     publicBuilder
         .setSmallIcon(iconResId)
-        .setColor(context.getResources().getColor(R.color.dialer_theme_color, context.getTheme()))
+        .setColor(ThemeComponent.get(context).theme().getColorPrimary())
         // Hide work call state for the lock screen notification
         .setContentTitle(getContentString(call, ContactsUtils.USER_TYPE_CURRENT));
     setNotificationWhen(call, callState, publicBuilder);
@@ -437,17 +441,18 @@
     setNotificationWhen(call, state, builder);
 
     // Add hang up option for any active calls (active | onhold), outgoing calls (dialing).
-    if (state == DialerCall.State.ACTIVE
-        || state == DialerCall.State.ONHOLD
-        || DialerCall.State.isDialing(state)) {
+    if (state == DialerCallState.ACTIVE
+        || state == DialerCallState.ONHOLD
+        || DialerCallState.isDialing(state)) {
       addHangupAction(builder);
       addSpeakerAction(builder, callAudioState);
-    } else if (state == DialerCall.State.INCOMING || state == DialerCall.State.CALL_WAITING) {
+    } else if (state == DialerCallState.INCOMING || state == DialerCallState.CALL_WAITING) {
       addDismissAction(builder);
       if (call.isVideoCall()) {
         addVideoCallAction(builder);
       } else {
         addAnswerAction(builder);
+        addSpeakeasyAnswerAction(builder, call);
       }
     }
   }
@@ -458,7 +463,7 @@
    * at which the notification was created.
    */
   private void setNotificationWhen(DialerCall call, int state, Notification.Builder builder) {
-    if (state == DialerCall.State.ACTIVE) {
+    if (state == DialerCallState.ACTIVE) {
       builder.setUsesChronometer(true);
       builder.setWhen(call.getConnectTimeMillis());
     } else {
@@ -557,8 +562,9 @@
     }
 
     String preferredName =
-        ContactDisplayUtils.getPreferredDisplayName(
-            contactInfo.namePrimary, contactInfo.nameAlternative, contactsPreferences);
+        ContactsComponent.get(context)
+            .contactDisplayPreferences()
+            .getDisplayName(contactInfo.namePrimary, contactInfo.nameAlternative);
     if (TextUtils.isEmpty(preferredName)) {
       return TextUtils.isEmpty(contactInfo.number)
           ? null
@@ -642,12 +648,12 @@
     // different calls.  So if both lines are in use, display info
     // from the foreground call.  And if there's a ringing call,
     // display that regardless of the state of the other calls.
-    if (call.getState() == DialerCall.State.ONHOLD) {
+    if (call.getState() == DialerCallState.ONHOLD) {
       return R.drawable.quantum_ic_phone_paused_vd_theme_24;
     } else if (call.getVideoTech().getSessionModificationState()
             == SessionModificationState.RECEIVED_UPGRADE_TO_VIDEO_REQUEST
         || call.isVideoCall()) {
-      return R.drawable.quantum_ic_videocam_white_24;
+      return R.drawable.quantum_ic_videocam_vd_white_24;
     } else if (call.hasProperty(PROPERTY_HIGH_DEF_AUDIO)
         && MotorolaUtils.shouldShowHdIconInNotification(context)) {
       // Normally when a call is ongoing the status bar displays an icon of a phone. This is a
@@ -657,8 +663,8 @@
     } else if (call.hasProperty(Details.PROPERTY_HAS_CDMA_VOICE_PRIVACY)) {
       return R.drawable.quantum_ic_phone_locked_vd_theme_24;
     }
-    // If NewReturnToCall is enabled, use the static icon. The animated one will show in the bubble.
-    if (NewReturnToCallController.isEnabled(context)) {
+    // If ReturnToCall is enabled, use the static icon. The animated one will show in the bubble.
+    if (ReturnToCallController.isEnabled(context)) {
       return R.drawable.quantum_ic_call_vd_theme_24;
     } else {
       return R.drawable.on_going_call;
@@ -668,8 +674,8 @@
   /** Returns the message to use with the notification. */
   private CharSequence getContentString(DialerCall call, @UserType long userType) {
     boolean isIncomingOrWaiting =
-        call.getState() == DialerCall.State.INCOMING
-            || call.getState() == DialerCall.State.CALL_WAITING;
+        call.getState() == DialerCallState.INCOMING
+            || call.getState() == DialerCallState.CALL_WAITING;
 
     if (isIncomingOrWaiting
         && call.getNumberPresentation() == TelecomManager.PRESENTATION_ALLOWED) {
@@ -701,15 +707,15 @@
       } else {
         resId = R.string.notification_incoming_call;
       }
-    } else if (call.getState() == DialerCall.State.ONHOLD) {
+    } else if (call.getState() == DialerCallState.ONHOLD) {
       resId = R.string.notification_on_hold;
+    } else if (DialerCallState.isDialing(call.getState())) {
+      resId = R.string.notification_dialing;
     } else if (call.isVideoCall()) {
       resId =
           call.getVideoTech().isPaused()
               ? R.string.notification_ongoing_paused_video_call
               : R.string.notification_ongoing_video_call;
-    } else if (DialerCall.State.isDialing(call.getState())) {
-      resId = R.string.notification_dialing;
     } else if (call.getVideoTech().getSessionModificationState()
         == SessionModificationState.RECEIVED_UPGRADE_TO_VIDEO_REQUEST) {
       resId = R.string.notification_requesting_video_call;
@@ -803,6 +809,9 @@
   private CharSequence getMultiSimIncomingText(DialerCall call) {
     PhoneAccount phoneAccount =
         context.getSystemService(TelecomManager.class).getPhoneAccount(call.getAccountHandle());
+    if (phoneAccount == null) {
+      return context.getString(R.string.notification_incoming_call);
+    }
     SpannableString string =
         new SpannableString(
             context.getString(
@@ -863,6 +872,48 @@
             .build());
   }
 
+  private void addSpeakeasyAnswerAction(Notification.Builder builder, DialerCall call) {
+    if (!call.isSpeakEasyEligible()) {
+      return;
+    }
+
+    if (!ConfigProviderComponent.get(context)
+        .getConfigProvider()
+        .getBoolean("enable_speakeasy_notification_button", false)) {
+      return;
+    }
+
+    if (!SpeakEasyComponent.get(context).speakEasyCallManager().isAvailable(context)) {
+      return;
+    }
+
+    Optional<Integer> buttonText = SpeakEasyComponent.get(context).speakEasyTextResource();
+    if (!buttonText.isPresent()) {
+      return;
+    }
+
+    LogUtil.d("StatusBarNotifier.addSpeakeasyAnswerAction", "showing button");
+    PendingIntent answerVoicePendingIntent =
+        createNotificationPendingIntent(context, ACTION_ANSWER_SPEAKEASY_CALL);
+
+    Spannable spannable = new SpannableString(context.getText(buttonText.get()));
+    // TODO(erfanian): Migrate these color values to somewhere more permanent in subsequent
+    // implementation.
+    spannable.setSpan(
+        new ForegroundColorSpan(
+            context.getColor(R.color.DO_NOT_USE_OR_I_WILL_BREAK_YOU_text_span_tertiary_button)),
+        0,
+        spannable.length(),
+        Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+
+    builder.addAction(
+        new Notification.Action.Builder(
+                Icon.createWithResource(context, R.drawable.quantum_ic_call_white_24),
+                spannable,
+                answerVoicePendingIntent)
+            .build());
+  }
+
   private void addDismissAction(Notification.Builder builder) {
     LogUtil.d(
         "StatusBarNotifier.addDismissAction",
@@ -913,7 +964,7 @@
         createNotificationPendingIntent(context, ACTION_TURN_ON_SPEAKER);
     builder.addAction(
         new Notification.Action.Builder(
-                Icon.createWithResource(context, R.drawable.quantum_ic_volume_up_white_24),
+                Icon.createWithResource(context, R.drawable.quantum_ic_volume_up_vd_theme_24),
                 context.getText(R.string.notification_action_speaker_on),
                 speakerOnPendingIntent)
             .build());
@@ -927,7 +978,7 @@
         createNotificationPendingIntent(context, ACTION_TURN_OFF_SPEAKER);
     builder.addAction(
         new Notification.Action.Builder(
-                Icon.createWithResource(context, R.drawable.quantum_ic_phone_in_talk_white_24),
+                Icon.createWithResource(context, R.drawable.quantum_ic_phone_in_talk_vd_theme_24),
                 context.getText(R.string.notification_action_speaker_off),
                 speakerOffPendingIntent)
             .build());
@@ -941,7 +992,7 @@
         createNotificationPendingIntent(context, ACTION_ANSWER_VIDEO_INCOMING_CALL);
     builder.addAction(
         new Notification.Action.Builder(
-                Icon.createWithResource(context, R.drawable.quantum_ic_videocam_white_24),
+                Icon.createWithResource(context, R.drawable.quantum_ic_videocam_vd_white_24),
                 getActionText(
                     R.string.notification_action_answer_video,
                     R.color.notification_action_answer_video),
@@ -957,7 +1008,7 @@
         createNotificationPendingIntent(context, ACTION_ACCEPT_VIDEO_UPGRADE_REQUEST);
     builder.addAction(
         new Notification.Action.Builder(
-                Icon.createWithResource(context, R.drawable.quantum_ic_videocam_white_24),
+                Icon.createWithResource(context, R.drawable.quantum_ic_videocam_vd_white_24),
                 getActionText(
                     R.string.notification_action_accept, R.color.notification_action_accept),
                 acceptVideoPendingIntent)
@@ -972,7 +1023,7 @@
         createNotificationPendingIntent(context, ACTION_DECLINE_VIDEO_UPGRADE_REQUEST);
     builder.addAction(
         new Notification.Action.Builder(
-                Icon.createWithResource(context, R.drawable.quantum_ic_videocam_white_24),
+                Icon.createWithResource(context, R.drawable.quantum_ic_videocam_vd_white_24),
                 getActionText(
                     R.string.notification_action_dismiss, R.color.notification_action_dismiss),
                 declineVideoPendingIntent)
diff --git a/java/com/android/incallui/VideoCallPresenter.java b/java/com/android/incallui/VideoCallPresenter.java
index a19d45f..5bdcd7a 100644
--- a/java/com/android/incallui/VideoCallPresenter.java
+++ b/java/com/android/incallui/VideoCallPresenter.java
@@ -20,6 +20,7 @@
 import android.content.Context;
 import android.graphics.Point;
 import android.os.Handler;
+import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.telecom.InCallService.VideoCall;
 import android.telecom.VideoProfile;
@@ -28,8 +29,7 @@
 import android.view.SurfaceView;
 import com.android.dialer.common.Assert;
 import com.android.dialer.common.LogUtil;
-import com.android.dialer.compat.CompatUtils;
-import com.android.dialer.configprovider.ConfigProviderBindings;
+import com.android.dialer.configprovider.ConfigProviderComponent;
 import com.android.dialer.util.PermissionsUtil;
 import com.android.incallui.InCallPresenter.InCallDetailsListener;
 import com.android.incallui.InCallPresenter.InCallOrientationListener;
@@ -38,9 +38,9 @@
 import com.android.incallui.call.CallList;
 import com.android.incallui.call.DialerCall;
 import com.android.incallui.call.DialerCall.CameraDirection;
-import com.android.incallui.call.DialerCall.State;
 import com.android.incallui.call.InCallVideoCallCallbackNotifier;
 import com.android.incallui.call.InCallVideoCallCallbackNotifier.SurfaceChangeListener;
+import com.android.incallui.call.state.DialerCallState;
 import com.android.incallui.util.AccessibilityUtil;
 import com.android.incallui.video.protocol.VideoCallScreen;
 import com.android.incallui.video.protocol.VideoCallScreenDelegate;
@@ -80,7 +80,8 @@
         InCallDetailsListener,
         SurfaceChangeListener,
         InCallPresenter.InCallEventListener,
-        VideoCallScreenDelegate {
+        VideoCallScreenDelegate,
+        CallList.Listener {
 
   private static boolean isVideoMode = false;
 
@@ -100,7 +101,7 @@
   /** Determines if the current UI state represents a video call. */
   private int currentVideoState;
   /** DialerCall's current state */
-  private int currentCallState = DialerCall.State.INVALID;
+  private int currentCallState = DialerCallState.INVALID;
   /** Determines the device orientation (portrait/lanscape). */
   private int deviceOrientation = InCallOrientationEventListener.SCREEN_ORIENTATION_UNKNOWN;
   /** Tracks the state of the preview surface negotiation with the telephony layer. */
@@ -162,16 +163,13 @@
    * @param callState The current call state.
    * @return {@code true} if the incoming video surface should be shown, {@code false} otherwise.
    */
-  public static boolean showIncomingVideo(int videoState, int callState) {
-    if (!CompatUtils.isVideoCompatible()) {
-      return false;
-    }
+  static boolean showIncomingVideo(int videoState, int callState) {
 
     boolean isPaused = VideoProfile.isPaused(videoState);
-    boolean isCallActive = callState == DialerCall.State.ACTIVE;
+    boolean isCallActive = callState == DialerCallState.ACTIVE;
     // Show incoming Video for dialing calls to support early media
     boolean isCallOutgoingPending =
-        DialerCall.State.isDialing(callState) || callState == DialerCall.State.CONNECTING;
+        DialerCallState.isDialing(callState) || callState == DialerCallState.CONNECTING;
 
     return !isPaused
         && (isCallActive || isCallOutgoingPending)
@@ -185,17 +183,13 @@
    * @return {@code true} if the the outgoing video surface should be shown, {@code false}
    *     otherwise.
    */
-  public static boolean showOutgoingVideo(
+  private static boolean showOutgoingVideo(
       Context context, int videoState, int sessionModificationState) {
     if (!VideoUtils.hasCameraPermissionAndShownPrivacyToast(context)) {
       LogUtil.i("VideoCallPresenter.showOutgoingVideo", "Camera permission is disabled by user.");
       return false;
     }
 
-    if (!CompatUtils.isVideoCompatible()) {
-      return false;
-    }
-
     return VideoProfile.isTransmissionEnabled(videoState)
         || isVideoUpgrade(sessionModificationState);
   }
@@ -307,12 +301,6 @@
     LogUtil.v("VideoCallPresenter.onVideoCallScreenUiReady", "");
     Assert.checkState(!isVideoCallScreenUiReady);
 
-    // Do not register any listeners if video calling is not compatible to safeguard against
-    // any accidental calls of video calling code.
-    if (!CompatUtils.isVideoCompatible()) {
-      return;
-    }
-
     deviceOrientation = InCallOrientationEventListener.getCurrentOrientation();
 
     // Register for call state changes last
@@ -325,10 +313,12 @@
     InCallPresenter.getInstance().getLocalVideoSurfaceTexture().setDelegate(new LocalDelegate());
     InCallPresenter.getInstance().getRemoteVideoSurfaceTexture().setDelegate(new RemoteDelegate());
 
+    CallList.getInstance().addListener(this);
+
     // Register for surface and video events from {@link InCallVideoCallListener}s.
     InCallVideoCallCallbackNotifier.getInstance().addSurfaceChangeListener(this);
     currentVideoState = VideoProfile.STATE_AUDIO_ONLY;
-    currentCallState = DialerCall.State.INVALID;
+    currentCallState = DialerCallState.INVALID;
 
     InCallPresenter.InCallState inCallState = InCallPresenter.getInstance().getInCallState();
     onStateChange(inCallState, inCallState, CallList.getInstance());
@@ -341,10 +331,6 @@
     LogUtil.v("VideoCallPresenter.onVideoCallScreenUiUnready", "");
     Assert.checkState(isVideoCallScreenUiReady);
 
-    if (!CompatUtils.isVideoCompatible()) {
-      return;
-    }
-
     cancelAutoFullScreen();
 
     InCallPresenter.getInstance().removeListener(this);
@@ -354,6 +340,8 @@
     InCallPresenter.getInstance().removeInCallEventListener(this);
     InCallPresenter.getInstance().getLocalVideoSurfaceTexture().setDelegate(null);
 
+    CallList.getInstance().removeListener(this);
+
     InCallVideoCallCallbackNotifier.getInstance().removeSurfaceChangeListener(this);
 
     // Ensure that the call's camera direction is updated (most likely to UNKNOWN). Normally this
@@ -553,7 +541,8 @@
       updateFullscreenAndGreenScreenMode(
           primaryCall.getState(), primaryCall.getVideoTech().getSessionModificationState());
     } else {
-      updateFullscreenAndGreenScreenMode(State.INVALID, SessionModificationState.NO_REQUEST);
+      updateFullscreenAndGreenScreenMode(
+          DialerCallState.INVALID, SessionModificationState.NO_REQUEST);
     }
   }
 
@@ -652,7 +641,7 @@
   private void updateCallCache(DialerCall call) {
     if (call == null) {
       currentVideoState = VideoProfile.STATE_AUDIO_ONLY;
-      currentCallState = DialerCall.State.INVALID;
+      currentCallState = DialerCallState.INVALID;
       videoCall = null;
       primaryCall = null;
     } else {
@@ -702,8 +691,12 @@
   }
 
   private void checkForOrientationAllowedChange(@Nullable DialerCall call) {
-    InCallPresenter.getInstance()
-        .setInCallAllowsOrientationChange(isVideoCall(call) || isVideoUpgrade(call));
+    // Call could be null when video call ended. This check could prevent unwanted orientation
+    // change before incall UI gets destroyed.
+    if (call != null) {
+      InCallPresenter.getInstance()
+          .setInCallAllowsOrientationChange(isVideoCall(call) || isVideoUpgrade(call));
+    }
   }
 
   private void updateFullscreenAndGreenScreenMode(
@@ -711,9 +704,9 @@
     if (videoCallScreen != null) {
       boolean shouldShowFullscreen = InCallPresenter.getInstance().isFullscreen();
       boolean shouldShowGreenScreen =
-          callState == State.DIALING
-              || callState == State.CONNECTING
-              || callState == State.INCOMING
+          callState == DialerCallState.DIALING
+              || callState == DialerCallState.CONNECTING
+              || callState == DialerCallState.INCOMING
               || isVideoUpgrade(sessionModificationState);
       videoCallScreen.updateFullscreenAndGreenScreenMode(
           shouldShowFullscreen, shouldShowGreenScreen);
@@ -862,7 +855,7 @@
 
     showVideoUi(
         VideoProfile.STATE_AUDIO_ONLY,
-        DialerCall.State.ACTIVE,
+        DialerCallState.ACTIVE,
         SessionModificationState.NO_REQUEST,
         false /* isRemotelyHeld */);
     enableCamera(primaryCall, false);
@@ -1031,7 +1024,7 @@
       return;
     }
 
-    if (!isVideoCall(call) || call.getState() == DialerCall.State.INCOMING) {
+    if (!isVideoCall(call) || call.getState() == DialerCallState.INCOMING) {
       LogUtil.i("VideoCallPresenter.maybeExitFullscreen", "exiting fullscreen");
       InCallPresenter.getInstance().setFullScreen(false);
     }
@@ -1050,7 +1043,7 @@
     }
 
     if (call == null
-        || call.getState() != DialerCall.State.ACTIVE
+        || call.getState() != DialerCallState.ACTIVE
         || !isBidirectionalVideoCall(call)
         || InCallPresenter.getInstance().isFullscreen()
         || (context != null && AccessibilityUtil.isTouchExplorationEnabled(context))) {
@@ -1092,7 +1085,9 @@
           "VideoCallPresenter.shouldShowCameraPermissionToast", "already shown for this call");
       return false;
     }
-    if (!ConfigProviderBindings.get(context).getBoolean("camera_permission_dialog_allowed", true)) {
+    if (!ConfigProviderComponent.get(context)
+        .getConfigProvider()
+        .getBoolean("camera_permission_dialog_allowed", true)) {
       LogUtil.i("VideoCallPresenter.shouldShowCameraPermissionToast", "disabled by config");
       return false;
     }
@@ -1126,6 +1121,34 @@
         || VideoUtils.hasReceivedVideoUpgradeRequest(state);
   }
 
+  @Override
+  public void onIncomingCall(DialerCall call) {}
+
+  @Override
+  public void onUpgradeToVideo(DialerCall call) {}
+
+  @Override
+  public void onSessionModificationStateChange(DialerCall call) {}
+
+  @Override
+  public void onCallListChange(CallList callList) {}
+
+  @Override
+  public void onDisconnect(DialerCall call) {}
+
+  @Override
+  public void onWiFiToLteHandover(DialerCall call) {
+    if (call.isVideoCall() || call.hasSentVideoUpgradeRequest()) {
+      videoCallScreen.onHandoverFromWiFiToLte();
+    }
+  }
+
+  @Override
+  public void onHandoverToWifiFailed(DialerCall call) {}
+
+  @Override
+  public void onInternationalCallOnWifi(@NonNull DialerCall call) {}
+
   private class LocalDelegate implements VideoSurfaceDelegate {
     @Override
     public void onSurfaceCreated(VideoSurfaceTexture videoCallSurface) {
@@ -1239,7 +1262,7 @@
   }
 
   private static boolean isBidirectionalVideoCall(DialerCall call) {
-    return CompatUtils.isVideoCompatible() && VideoProfile.isBidirectional(call.getVideoState());
+    return VideoProfile.isBidirectional(call.getVideoState());
   }
 
   private static boolean isIncomingVideoCall(DialerCall call) {
@@ -1247,11 +1270,11 @@
       return false;
     }
     final int state = call.getState();
-    return (state == DialerCall.State.INCOMING) || (state == DialerCall.State.CALL_WAITING);
+    return (state == DialerCallState.INCOMING) || (state == DialerCallState.CALL_WAITING);
   }
 
   private static boolean isActiveVideoCall(DialerCall call) {
-    return isVideoCall(call) && call.getState() == DialerCall.State.ACTIVE;
+    return isVideoCall(call) && call.getState() == DialerCallState.ACTIVE;
   }
 
   private static boolean isOutgoingVideoCall(DialerCall call) {
@@ -1259,16 +1282,12 @@
       return false;
     }
     final int state = call.getState();
-    return DialerCall.State.isDialing(state)
-        || state == DialerCall.State.CONNECTING
-        || state == DialerCall.State.SELECT_PHONE_ACCOUNT;
+    return DialerCallState.isDialing(state)
+        || state == DialerCallState.CONNECTING
+        || state == DialerCallState.SELECT_PHONE_ACCOUNT;
   }
 
   private static boolean isAudioCall(DialerCall call) {
-    if (!CompatUtils.isVideoCompatible()) {
-      return true;
-    }
-
     return call != null && VideoProfile.isAudioOnly(call.getVideoState());
   }
 
@@ -1277,8 +1296,7 @@
   }
 
   private static boolean isVideoCall(int videoState) {
-    return CompatUtils.isVideoCompatible()
-        && (VideoProfile.isTransmissionEnabled(videoState)
-            || VideoProfile.isReceptionEnabled(videoState));
+    return VideoProfile.isTransmissionEnabled(videoState)
+        || VideoProfile.isReceptionEnabled(videoState);
   }
 }
diff --git a/java/com/android/incallui/VideoPauseController.java b/java/com/android/incallui/VideoPauseController.java
index 1a65010..2bdbce3 100644
--- a/java/com/android/incallui/VideoPauseController.java
+++ b/java/com/android/incallui/VideoPauseController.java
@@ -24,7 +24,7 @@
 import com.android.incallui.InCallPresenter.IncomingCallListener;
 import com.android.incallui.call.CallList;
 import com.android.incallui.call.DialerCall;
-import com.android.incallui.call.DialerCall.State;
+import com.android.incallui.call.state.DialerCallState;
 import java.util.Objects;
 
 /**
@@ -43,7 +43,7 @@
    *
    * <p>These values are stored to detect specific changes in state between onStateChange calls.
    */
-  private int prevCallState = State.INVALID;
+  private int prevCallState = DialerCallState.INVALID;
 
   private boolean wasVideoCall = false;
 
@@ -74,8 +74,8 @@
    */
   private static boolean isIncomingCall(DialerCall call) {
     return call != null
-        && (call.getState() == DialerCall.State.CALL_WAITING
-            || call.getState() == DialerCall.State.INCOMING);
+        && (call.getState() == DialerCallState.CALL_WAITING
+            || call.getState() == DialerCallState.INCOMING);
   }
 
   /**
@@ -84,7 +84,7 @@
    * @return {@code true} if the call is dialing, {@code false} otherwise.
    */
   private boolean wasDialing() {
-    return DialerCall.State.isDialing(prevCallState);
+    return DialerCallState.isDialing(prevCallState);
   }
 
   /**
@@ -115,7 +115,7 @@
   private void clear() {
     inCallPresenter = null;
     primaryCall = null;
-    prevCallState = State.INVALID;
+    prevCallState = DialerCallState.INVALID;
     wasVideoCall = false;
     isInBackground = false;
   }
@@ -237,7 +237,7 @@
   private void updatePrimaryCallContext(DialerCall call) {
     if (call == null) {
       primaryCall = null;
-      prevCallState = State.INVALID;
+      prevCallState = DialerCallState.INVALID;
       wasVideoCall = false;
     } else {
       primaryCall = call;
@@ -322,6 +322,6 @@
   }
 
   private static boolean videoCanPause(DialerCall call) {
-    return call != null && call.isVideoCall() && call.getState() == DialerCall.State.ACTIVE;
+    return call != null && call.isVideoCall() && call.getState() == DialerCallState.ACTIVE;
   }
 }
diff --git a/java/com/android/incallui/answer/bindings/AnswerBindings.java b/java/com/android/incallui/answer/bindings/AnswerBindings.java
index 9f4199b..c370d74 100644
--- a/java/com/android/incallui/answer/bindings/AnswerBindings.java
+++ b/java/com/android/incallui/answer/bindings/AnswerBindings.java
@@ -29,7 +29,8 @@
       boolean isVideoUpgradeRequest,
       boolean isSelfManagedCamera,
       boolean allowAnswerAndRelease,
-      boolean hasCallOnHold) {
+      boolean hasCallOnHold,
+      boolean allowSpeakEasy) {
     return AnswerFragment.newInstance(
         callId,
         isRttCall,
@@ -37,6 +38,7 @@
         isVideoUpgradeRequest,
         isSelfManagedCamera,
         allowAnswerAndRelease,
-        hasCallOnHold);
+        hasCallOnHold,
+        allowSpeakEasy);
   }
 }
diff --git a/java/com/android/incallui/answer/impl/AnswerFragment.java b/java/com/android/incallui/answer/impl/AnswerFragment.java
index 4729b41..8d8b087 100644
--- a/java/com/android/incallui/answer/impl/AnswerFragment.java
+++ b/java/com/android/incallui/answer/impl/AnswerFragment.java
@@ -49,11 +49,11 @@
 import android.view.accessibility.AccessibilityNodeInfo;
 import android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction;
 import android.widget.ImageView;
+import android.widget.LinearLayout;
 import com.android.dialer.common.Assert;
 import com.android.dialer.common.FragmentUtils;
 import com.android.dialer.common.LogUtil;
 import com.android.dialer.common.MathUtil;
-import com.android.dialer.compat.ActivityCompat;
 import com.android.dialer.logging.DialerImpression;
 import com.android.dialer.logging.Logger;
 import com.android.dialer.multimedia.MultimediaData;
@@ -70,7 +70,7 @@
 import com.android.incallui.answer.protocol.AnswerScreen;
 import com.android.incallui.answer.protocol.AnswerScreenDelegate;
 import com.android.incallui.answer.protocol.AnswerScreenDelegateFactory;
-import com.android.incallui.call.DialerCall.State;
+import com.android.incallui.call.state.DialerCallState;
 import com.android.incallui.contactgrid.ContactGridManager;
 import com.android.incallui.incall.protocol.ContactPhotoType;
 import com.android.incallui.incall.protocol.InCallScreen;
@@ -83,9 +83,12 @@
 import com.android.incallui.maps.MapsComponent;
 import com.android.incallui.sessiondata.AvatarPresenter;
 import com.android.incallui.sessiondata.MultimediaFragment;
+import com.android.incallui.speakeasy.Annotations.SpeakEasyChipResourceId;
+import com.android.incallui.speakeasy.SpeakEasyComponent;
 import com.android.incallui.util.AccessibilityUtil;
 import com.android.incallui.video.protocol.VideoCallScreen;
 import com.android.incallui.videotech.utils.VideoUtils;
+import com.google.common.base.Optional;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
@@ -118,6 +121,8 @@
   @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
   static final String ARG_IS_SELF_MANAGED_CAMERA = "is_self_managed_camera";
 
+  static final String ARG_ALLOW_SPEAK_EASY = "allow_speak_easy";
+
   private static final String STATE_HAS_ANIMATED_ENTRY = "hasAnimated";
 
   private static final int HINT_SECONDARY_SHOW_DURATION_MILLIS = 5000;
@@ -142,6 +147,7 @@
   private SwipeButtonView secondaryButton;
   private SwipeButtonView answerAndReleaseButton;
   private AffordanceHolderLayout affordanceHolderLayout;
+  private LinearLayout chipContainer;
   // Use these flags to prevent user from clicking accept/reject buttons multiple times.
   // We use separate flags because in some rare cases accepting a call may fail to join the room,
   // and then user is stuck in the incoming call view until it times out. Two flags at least give
@@ -173,7 +179,7 @@
     },
 
     ANSWER_VIDEO_AS_AUDIO(
-        R.drawable.quantum_ic_videocam_off_white_24,
+        R.drawable.quantum_ic_videocam_off_vd_theme_24,
         R.string.a11y_description_incoming_call_answer_video_as_audio,
         R.string.a11y_incoming_call_answer_video_as_audio,
         R.string.call_incoming_swipe_to_answer_video_as_audio) {
@@ -194,7 +200,7 @@
       }
     };
 
-    @DrawableRes public final int icon;
+    @DrawableRes public int icon;
     @StringRes public final int contentDescription;
     @StringRes public final int accessibilityLabel;
     @StringRes public final int hintText;
@@ -218,6 +224,11 @@
     }
   }
 
+  private void performSpeakEasy(View unused) {
+    answerScreenDelegate.onSpeakEasyCall();
+    buttonAcceptClicked = true;
+  }
+
   private void performAnswerAndRelease() {
     restoreAnswerAndReleaseButtonAnimation();
     answerScreenDelegate.onAnswerAndReleaseCall();
@@ -351,7 +362,8 @@
       boolean isVideoUpgradeRequest,
       boolean isSelfManagedCamera,
       boolean allowAnswerAndRelease,
-      boolean hasCallOnHold) {
+      boolean hasCallOnHold,
+      boolean allowSpeakEasy) {
     Bundle bundle = new Bundle();
     bundle.putString(ARG_CALL_ID, Assert.isNotNull(callId));
     bundle.putBoolean(ARG_IS_RTT_CALL, isRttCall);
@@ -360,6 +372,7 @@
     bundle.putBoolean(ARG_IS_SELF_MANAGED_CAMERA, isSelfManagedCamera);
     bundle.putBoolean(ARG_ALLOW_ANSWER_AND_RELEASE, allowAnswerAndRelease);
     bundle.putBoolean(ARG_HAS_CALL_ON_HOLD, hasCallOnHold);
+    bundle.putBoolean(ARG_ALLOW_SPEAK_EASY, allowSpeakEasy);
 
     AnswerFragment instance = new AnswerFragment();
     instance.setArguments(bundle);
@@ -390,7 +403,7 @@
       LogUtil.i("AnswerFragment.setTextResponses", "no text responses, hiding secondary button");
       this.textResponses = null;
       secondaryButton.setVisibility(View.INVISIBLE);
-    } else if (ActivityCompat.isInMultiWindowMode(getActivity())) {
+    } else if (getActivity().isInMultiWindowMode()) {
       LogUtil.i("AnswerFragment.setTextResponses", "in multiwindow, hiding secondary button");
       this.textResponses = null;
       secondaryButton.setVisibility(View.INVISIBLE);
@@ -427,13 +440,7 @@
 
     answerAndReleaseBehavior = SecondaryBehavior.ANSWER_AND_RELEASE;
     answerAndReleaseBehavior.applyToView(answerAndReleaseButton);
-    answerAndReleaseButton.setOnClickListener(
-        new OnClickListener() {
-          @Override
-          public void onClick(View v) {
-            performAnswerAndReleaseButtonAction();
-          }
-        });
+
     answerAndReleaseButton.setClickable(AccessibilityUtil.isAccessibilityEnabled(getContext()));
     answerAndReleaseButton.setFocusable(AccessibilityUtil.isAccessibilityEnabled(getContext()));
     answerAndReleaseButton.setAccessibilityDelegate(accessibilityDelegate);
@@ -445,6 +452,35 @@
       answerAndReleaseButton.setVisibility(View.INVISIBLE);
       answerScreenDelegate.onAnswerAndReleaseButtonDisabled();
     }
+    answerAndReleaseButton.setOnClickListener(
+        new OnClickListener() {
+          @Override
+          public void onClick(View v) {
+            performAnswerAndReleaseButtonAction();
+          }
+        });
+  }
+
+  /** Initialize chip buttons */
+  private void initChips() {
+
+    if (!allowSpeakEasy()) {
+      chipContainer.setVisibility(View.GONE);
+      return;
+    }
+    chipContainer.setVisibility(View.VISIBLE);
+
+    @SpeakEasyChipResourceId
+    Optional<Integer> chipLayoutOptional = SpeakEasyComponent.get(getContext()).speakEasyChip();
+    if (chipLayoutOptional.isPresent()) {
+
+      LinearLayout chipLayout =
+          (LinearLayout) getLayoutInflater().inflate(chipLayoutOptional.get(), null);
+
+      chipLayout.setOnClickListener(this::performSpeakEasy);
+
+      chipContainer.addView(chipLayout);
+    }
   }
 
   @Override
@@ -452,6 +488,11 @@
     return getArguments().getBoolean(ARG_ALLOW_ANSWER_AND_RELEASE);
   }
 
+  @Override
+  public boolean allowSpeakEasy() {
+    return getArguments().getBoolean(ARG_ALLOW_SPEAK_EASY);
+  }
+
   private boolean hasCallOnHold() {
     return getArguments().getBoolean(ARG_HAS_CALL_ON_HOLD);
   }
@@ -681,6 +722,8 @@
     affordanceHolderLayout = (AffordanceHolderLayout) view.findViewById(R.id.incoming_container);
     affordanceHolderLayout.setAffordanceCallback(affordanceCallback);
 
+    chipContainer = view.findViewById(R.id.incall_data_container_chip_container);
+
     importanceBadge = view.findViewById(R.id.incall_important_call_badge);
     importanceBadge
         .getViewTreeObserver()
@@ -699,7 +742,7 @@
     updateImportanceBadgeVisibility();
 
     contactGridManager = new ContactGridManager(view, null, 0, false /* showAnonymousAvatar */);
-    boolean isInMultiWindowMode = ActivityCompat.isInMultiWindowMode(getActivity());
+    boolean isInMultiWindowMode = getActivity().isInMultiWindowMode();
     contactGridManager.onMultiWindowModeChanged(isInMultiWindowMode);
 
     Fragment answerMethod =
@@ -717,6 +760,7 @@
             .newAnswerScreenDelegate(this);
 
     initSecondaryButton();
+    initChips();
 
     int flags = View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION;
     if (!isInMultiWindowMode
@@ -858,7 +902,7 @@
   public void onAnswerProgressUpdate(@FloatRange(from = -1f, to = 1f) float answerProgress) {
     // Don't fade the window background for call waiting or video upgrades. Fading the background
     // shows the system wallpaper which looks bad because on reject we switch to another call.
-    if (primaryCallState.state() == State.INCOMING && !isVideoCall()) {
+    if (primaryCallState.state() == DialerCallState.INCOMING && !isVideoCall()) {
       answerScreenDelegate.updateWindowBackgroundColor(answerProgress);
     }
 
@@ -1048,9 +1092,9 @@
 
   private boolean canRejectCallWithSms() {
     return primaryCallState != null
-        && !(primaryCallState.state() == State.DISCONNECTED
-            || primaryCallState.state() == State.DISCONNECTING
-            || primaryCallState.state() == State.IDLE);
+        && !(primaryCallState.state() == DialerCallState.DISCONNECTED
+            || primaryCallState.state() == DialerCallState.DISCONNECTING
+            || primaryCallState.state() == DialerCallState.IDLE);
   }
 
   private void createInCallScreenDelegate() {
diff --git a/java/com/android/incallui/answer/impl/AnswerVideoCallScreen.java b/java/com/android/incallui/answer/impl/AnswerVideoCallScreen.java
index 2f10a5b..7a21676 100644
--- a/java/com/android/incallui/answer/impl/AnswerVideoCallScreen.java
+++ b/java/com/android/incallui/answer/impl/AnswerVideoCallScreen.java
@@ -109,6 +109,9 @@
     return callId;
   }
 
+  @Override
+  public void onHandoverFromWiFiToLte() {}
+
   private void updatePreviewVideoScaling() {
     if (textureView.getWidth() == 0 || textureView.getHeight() == 0) {
       LogUtil.i(
diff --git a/java/com/android/incallui/answer/impl/SelfManagedAnswerVideoCallScreen.java b/java/com/android/incallui/answer/impl/SelfManagedAnswerVideoCallScreen.java
index 522d772..b74c1ec 100644
--- a/java/com/android/incallui/answer/impl/SelfManagedAnswerVideoCallScreen.java
+++ b/java/com/android/incallui/answer/impl/SelfManagedAnswerVideoCallScreen.java
@@ -110,6 +110,9 @@
     return callId;
   }
 
+  @Override
+  public void onHandoverFromWiFiToLte() {}
+
   /**
    * Opens the first front facing camera on the device into a {@link SurfaceView} while preserving
    * aspect ratio.
diff --git a/java/com/android/incallui/answer/impl/answermethod/AnswerMethodFactory.java b/java/com/android/incallui/answer/impl/answermethod/AnswerMethodFactory.java
index ccb132b..f318f08 100644
--- a/java/com/android/incallui/answer/impl/answermethod/AnswerMethodFactory.java
+++ b/java/com/android/incallui/answer/impl/answermethod/AnswerMethodFactory.java
@@ -22,7 +22,6 @@
 import android.support.annotation.VisibleForTesting;
 import android.support.v4.app.Fragment;
 import com.android.dialer.common.LogUtil;
-import com.android.dialer.compat.ActivityCompat;
 import com.android.incallui.util.AccessibilityUtil;
 
 /** Creates the appropriate {@link AnswerMethod} for the circumstances. */
@@ -59,7 +58,6 @@
       return true;
     }
 
-    return AccessibilityUtil.isTouchExplorationEnabled(activity)
-        || ActivityCompat.isInMultiWindowMode(activity);
+    return AccessibilityUtil.isTouchExplorationEnabled(activity) || activity.isInMultiWindowMode();
   }
 }
diff --git a/java/com/android/incallui/answer/impl/answermethod/FlingUpDownMethod.java b/java/com/android/incallui/answer/impl/answermethod/FlingUpDownMethod.java
index 2eeecc3..8928dd6 100644
--- a/java/com/android/incallui/answer/impl/answermethod/FlingUpDownMethod.java
+++ b/java/com/android/incallui/answer/impl/answermethod/FlingUpDownMethod.java
@@ -334,7 +334,7 @@
       return;
     }
     if (getParent().isVideoCall() || getParent().isVideoUpgradeRequest()) {
-      contactPuckIcon.setImageResource(R.drawable.quantum_ic_videocam_white_24);
+      contactPuckIcon.setImageResource(R.drawable.quantum_ic_videocam_vd_white_24);
     } else if (getParent().isRttCall()) {
       contactPuckIcon.setImageResource(R.drawable.quantum_ic_rtt_vd_theme_24);
     } else {
diff --git a/java/com/android/incallui/answer/impl/answermethod/TwoButtonMethod.java b/java/com/android/incallui/answer/impl/answermethod/TwoButtonMethod.java
index 67b1b96..1086449 100644
--- a/java/com/android/incallui/answer/impl/answermethod/TwoButtonMethod.java
+++ b/java/com/android/incallui/answer/impl/answermethod/TwoButtonMethod.java
@@ -36,7 +36,6 @@
 import android.widget.TextView;
 import com.android.dialer.common.Assert;
 import com.android.dialer.common.LogUtil;
-import com.android.dialer.compat.ActivityCompat;
 import com.android.incallui.answer.impl.answermethod.FlingUpDownTouchHandler.OnProgressChangedListener;
 import com.android.incallui.util.AccessibilityUtil;
 
@@ -157,8 +156,7 @@
     if (hintTextView == null) {
       return;
     }
-    hintTextView.setVisibility(
-        ActivityCompat.isInMultiWindowMode(getActivity()) ? View.GONE : View.VISIBLE);
+    hintTextView.setVisibility(getActivity().isInMultiWindowMode() ? View.GONE : View.VISIBLE);
     if (!TextUtils.isEmpty(hintText) && !buttonClicked) {
       hintTextView.setText(hintText);
       hintTextView.animate().alpha(1f).start();
diff --git a/java/com/android/incallui/answer/impl/answermethod/res/layout/swipe_up_down_method.xml b/java/com/android/incallui/answer/impl/answermethod/res/layout/swipe_up_down_method.xml
index 600115e..2b3391d 100644
--- a/java/com/android/incallui/answer/impl/answermethod/res/layout/swipe_up_down_method.xml
+++ b/java/com/android/incallui/answer/impl/answermethod/res/layout/swipe_up_down_method.xml
@@ -99,7 +99,7 @@
           android:focusable="false"
           android:outlineProvider="none"
           android:src="@drawable/quantum_ic_call_white_24"
-          android:tint="@color/incoming_answer_icon"
+          android:tint="@color/dialer_call_green"
           android:tintMode="src_atop"
           tools:outlineProvider="background"/>
 
diff --git a/java/com/android/incallui/answer/impl/answermethod/res/values-af/strings.xml b/java/com/android/incallui/answer/impl/answermethod/res/values-af/strings.xml
index e8fda46..2ebe728 100644
--- a/java/com/android/incallui/answer/impl/answermethod/res/values-af/strings.xml
+++ b/java/com/android/incallui/answer/impl/answermethod/res/values-af/strings.xml
@@ -1,12 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_answer" msgid="2959042172304267183">"Swiep na bo om te antwoord"</string>
-    <string name="call_incoming_swipe_to_reject" msgid="463322705441386885">"Swiep af om te weier"</string>
-    <string name="a11y_incoming_call_swipe_to_answer" msgid="6992663569851713736">"Swiep op met twee vingers om te beantwoord of af om die oproep te weier"</string>
-    <string name="call_incoming_will_disconnect" msgid="7095934149229485541">"As jy hierdie oproep antwoord sal jou video-oproep eindig"</string>
-    <string name="a11y_call_incoming_decline_description" msgid="4441041052558364987">"Wys af"</string>
-    <string name="call_incoming_decline" msgid="2982110738106661231">"Wys af"</string>
-    <string name="a11y_call_incoming_answer_description" msgid="1623200501347799736">"Antwoord"</string>
-    <string name="call_incoming_answer" msgid="841798555883717852">"Antwoord"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_answer">Swiep na bo om te antwoord</string>
+  <string name="call_incoming_swipe_to_reject">Swiep af om te weier</string>
+  <string name="a11y_incoming_call_swipe_to_answer">Swiep op met twee vingers om te beantwoord of af om die oproep te weier</string>
+  <string name="call_incoming_will_disconnect">As jy hierdie oproep antwoord sal jou video-oproep eindig</string>
+  <string name="a11y_call_incoming_decline_description">Wys af</string>
+  <string name="call_incoming_decline">Wys af</string>
+  <string name="a11y_call_incoming_answer_description">Antwoord</string>
+  <string name="call_incoming_answer">Antwoord</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/answermethod/res/values-am/strings.xml b/java/com/android/incallui/answer/impl/answermethod/res/values-am/strings.xml
index a272257..126bebb 100644
--- a/java/com/android/incallui/answer/impl/answermethod/res/values-am/strings.xml
+++ b/java/com/android/incallui/answer/impl/answermethod/res/values-am/strings.xml
@@ -1,12 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_answer" msgid="2959042172304267183">"ለመመለስ ወደላይ ያንሸራቱ"</string>
-    <string name="call_incoming_swipe_to_reject" msgid="463322705441386885">"ላለመቀበል ወደ ታች ያንሸራቱ"</string>
-    <string name="a11y_incoming_call_swipe_to_answer" msgid="6992663569851713736">"ጥሪውን ለመመለስ በሁለት ጣትዎ ወደላይ ይጥረጉ፣ ላለመቀበል ደግሞ ወደታች ይጥረጉ።"</string>
-    <string name="call_incoming_will_disconnect" msgid="7095934149229485541">"ይህን ጥሪ መመለስ የቪዲዮ ጥሪዎን ያቋርጣል።"</string>
-    <string name="a11y_call_incoming_decline_description" msgid="4441041052558364987">"አይቀበሉ"</string>
-    <string name="call_incoming_decline" msgid="2982110738106661231">"አይቀበሉ"</string>
-    <string name="a11y_call_incoming_answer_description" msgid="1623200501347799736">"ይመልሱ"</string>
-    <string name="call_incoming_answer" msgid="841798555883717852">"ይመልሱ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_answer">ለመመለስ ወደላይ ያንሸራቱ</string>
+  <string name="call_incoming_swipe_to_reject">ላለመቀበል ወደ ታች ያንሸራቱ</string>
+  <string name="a11y_incoming_call_swipe_to_answer">ጥሪውን ለመመለስ በሁለት ጣትዎ ወደላይ ይጥረጉ፣ ላለመቀበል ደግሞ ወደታች ይጥረጉ።</string>
+  <string name="call_incoming_will_disconnect">ይህን ጥሪ መመለስ የቪዲዮ ጥሪዎን ያቋርጣል።</string>
+  <string name="a11y_call_incoming_decline_description">አይቀበሉ</string>
+  <string name="call_incoming_decline">አይቀበሉ</string>
+  <string name="a11y_call_incoming_answer_description">ይመልሱ</string>
+  <string name="call_incoming_answer">ይመልሱ</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/answermethod/res/values-ar/strings.xml b/java/com/android/incallui/answer/impl/answermethod/res/values-ar/strings.xml
index 51e9aff..6611407 100644
--- a/java/com/android/incallui/answer/impl/answermethod/res/values-ar/strings.xml
+++ b/java/com/android/incallui/answer/impl/answermethod/res/values-ar/strings.xml
@@ -1,12 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_answer" msgid="2959042172304267183">"التمرير لأعلى للرد"</string>
-    <string name="call_incoming_swipe_to_reject" msgid="463322705441386885">"التمرير لأسفل للرفض"</string>
-    <string name="a11y_incoming_call_swipe_to_answer" msgid="6992663569851713736">"مرر لأعلى بأصبعين للرد على المكالمة أو لأسفل لرفضها"</string>
-    <string name="call_incoming_will_disconnect" msgid="7095934149229485541">"إنهاء مكالمة الفيديو في حالة الرد على هذه المكالمة"</string>
-    <string name="a11y_call_incoming_decline_description" msgid="4441041052558364987">"رفض"</string>
-    <string name="call_incoming_decline" msgid="2982110738106661231">"رفض"</string>
-    <string name="a11y_call_incoming_answer_description" msgid="1623200501347799736">"رد"</string>
-    <string name="call_incoming_answer" msgid="841798555883717852">"رد"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_answer">التمرير للأعلى للرد</string>
+  <string name="call_incoming_swipe_to_reject">التمرير للأسفل للرفض</string>
+  <string name="a11y_incoming_call_swipe_to_answer">مرر لأعلى بأصبعين للرد على المكالمة أو لأسفل لرفضها</string>
+  <string name="call_incoming_will_disconnect">إنهاء مكالمة الفيديو في حالة الرد على هذه المكالمة</string>
+  <string name="a11y_call_incoming_decline_description">رفض</string>
+  <string name="call_incoming_decline">رفض</string>
+  <string name="a11y_call_incoming_answer_description">رد</string>
+  <string name="call_incoming_answer">رد</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/answermethod/res/values-az/strings.xml b/java/com/android/incallui/answer/impl/answermethod/res/values-az/strings.xml
index 025d2a0..1c44e9a 100644
--- a/java/com/android/incallui/answer/impl/answermethod/res/values-az/strings.xml
+++ b/java/com/android/incallui/answer/impl/answermethod/res/values-az/strings.xml
@@ -1,12 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_answer" msgid="2959042172304267183">"Cavab vermək üçün sürüşdürün"</string>
-    <string name="call_incoming_swipe_to_reject" msgid="463322705441386885">"İmtina etmək üçün aşağı sürüşdürün"</string>
-    <string name="a11y_incoming_call_swipe_to_answer" msgid="6992663569851713736">"Cavab vermək üçün iki barmaq ilə yuxarı, zəngi rədd etmək üçün aşağı sürüşdürün"</string>
-    <string name="call_incoming_will_disconnect" msgid="7095934149229485541">"Bu zəngə cavab versəniz video zəng sonlandırılacaq"</string>
-    <string name="a11y_call_incoming_decline_description" msgid="4441041052558364987">"Rədd edin"</string>
-    <string name="call_incoming_decline" msgid="2982110738106661231">"Rədd edin"</string>
-    <string name="a11y_call_incoming_answer_description" msgid="1623200501347799736">"Cavab"</string>
-    <string name="call_incoming_answer" msgid="841798555883717852">"Cavab"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_answer">Cavab vermək üçün sürüşdürün</string>
+  <string name="call_incoming_swipe_to_reject">İmtina etmək üçün aşağı sürüşdürün</string>
+  <string name="a11y_incoming_call_swipe_to_answer">Cavab vermək üçün iki barmaq ilə yuxarı, zəngi rədd etmək üçün aşağı sürüşdürün</string>
+  <string name="call_incoming_will_disconnect">Bu zəngə cavab versəniz video zəng sonlandırılacaq</string>
+  <string name="a11y_call_incoming_decline_description">Rədd edin</string>
+  <string name="call_incoming_decline">Rədd edin</string>
+  <string name="a11y_call_incoming_answer_description">Cavab</string>
+  <string name="call_incoming_answer">Cavab</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/answermethod/res/values-b+sr+Latn/strings.xml b/java/com/android/incallui/answer/impl/answermethod/res/values-b+sr+Latn/strings.xml
index 3f8ad95..840d664 100644
--- a/java/com/android/incallui/answer/impl/answermethod/res/values-b+sr+Latn/strings.xml
+++ b/java/com/android/incallui/answer/impl/answermethod/res/values-b+sr+Latn/strings.xml
@@ -1,12 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_answer" msgid="2959042172304267183">"Prevucite nagore da biste odgovorili"</string>
-    <string name="call_incoming_swipe_to_reject" msgid="463322705441386885">"Prevucite nadole da biste odbili"</string>
-    <string name="a11y_incoming_call_swipe_to_answer" msgid="6992663569851713736">"Pomoću dva prsta prevucite nagore da biste odgovorili na poziv ili nadole da biste ga odbili"</string>
-    <string name="call_incoming_will_disconnect" msgid="7095934149229485541">"Ako odgovorite na ovaj poziv, prekinućete video poziv"</string>
-    <string name="a11y_call_incoming_decline_description" msgid="4441041052558364987">"Odbijte"</string>
-    <string name="call_incoming_decline" msgid="2982110738106661231">"Odbij"</string>
-    <string name="a11y_call_incoming_answer_description" msgid="1623200501347799736">"Odgovorite"</string>
-    <string name="call_incoming_answer" msgid="841798555883717852">"Odgovori"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_answer">Prevucite nagore da biste odgovorili</string>
+  <string name="call_incoming_swipe_to_reject">Prevucite nadole da biste odbili</string>
+  <string name="a11y_incoming_call_swipe_to_answer">Pomoću dva prsta prevucite nagore da biste odgovorili na poziv ili nadole da biste ga odbili</string>
+  <string name="call_incoming_will_disconnect">Ako odgovorite na ovaj poziv, prekinućete video poziv</string>
+  <string name="a11y_call_incoming_decline_description">Odbijte</string>
+  <string name="call_incoming_decline">Odbij</string>
+  <string name="a11y_call_incoming_answer_description">Odgovorite</string>
+  <string name="call_incoming_answer">Odgovori</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/answermethod/res/values-be/strings.xml b/java/com/android/incallui/answer/impl/answermethod/res/values-be/strings.xml
index d52853d..3b42a0e 100644
--- a/java/com/android/incallui/answer/impl/answermethod/res/values-be/strings.xml
+++ b/java/com/android/incallui/answer/impl/answermethod/res/values-be/strings.xml
@@ -1,12 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_answer" msgid="2959042172304267183">"Правядзіце пальцам уверх, каб адказаць"</string>
-    <string name="call_incoming_swipe_to_reject" msgid="463322705441386885">"Правядзіце пальцам уніз, каб адхіліць"</string>
-    <string name="a11y_incoming_call_swipe_to_answer" msgid="6992663569851713736">"Правядзіце двума пальцамі ўверх, каб адказаць, ці ўніз, каб адхіліць выклік"</string>
-    <string name="call_incoming_will_disconnect" msgid="7095934149229485541">"Калі адказаць на гэты выклік, то відэавыклік завершыцца"</string>
-    <string name="a11y_call_incoming_decline_description" msgid="4441041052558364987">"Адхіліць"</string>
-    <string name="call_incoming_decline" msgid="2982110738106661231">"Адхіліць"</string>
-    <string name="a11y_call_incoming_answer_description" msgid="1623200501347799736">"Адказаць"</string>
-    <string name="call_incoming_answer" msgid="841798555883717852">"Адказаць"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_answer">Правядзіце пальцам уверх, каб адказаць</string>
+  <string name="call_incoming_swipe_to_reject">Правядзіце пальцам уніз, каб адхіліць</string>
+  <string name="a11y_incoming_call_swipe_to_answer">Правядзіце двума пальцамі ўверх, каб адказаць, ці ўніз, каб адхіліць выклік</string>
+  <string name="call_incoming_will_disconnect">Калі адказаць на гэты выклік, то відэавыклік завершыцца</string>
+  <string name="a11y_call_incoming_decline_description">Адхіліць</string>
+  <string name="call_incoming_decline">Адхіліць</string>
+  <string name="a11y_call_incoming_answer_description">Адказаць</string>
+  <string name="call_incoming_answer">Адказаць</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/answermethod/res/values-bg/strings.xml b/java/com/android/incallui/answer/impl/answermethod/res/values-bg/strings.xml
index b4e7d1f..1852b71 100644
--- a/java/com/android/incallui/answer/impl/answermethod/res/values-bg/strings.xml
+++ b/java/com/android/incallui/answer/impl/answermethod/res/values-bg/strings.xml
@@ -1,12 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_answer" msgid="2959042172304267183">"Прекарайте пръст нагоре за отговаряне"</string>
-    <string name="call_incoming_swipe_to_reject" msgid="463322705441386885">"Прекарайте пръст надолу за отхвърляне"</string>
-    <string name="a11y_incoming_call_swipe_to_answer" msgid="6992663569851713736">"Прекарайте два пръста нагоре, за да отговорите, или надолу, за да отхвърлите това обаждане"</string>
-    <string name="call_incoming_will_disconnect" msgid="7095934149229485541">"Ако отговорите на това обаждане, видеообаждането ви ще прекъсне"</string>
-    <string name="a11y_call_incoming_decline_description" msgid="4441041052558364987">"Отхвърляне"</string>
-    <string name="call_incoming_decline" msgid="2982110738106661231">"Отхвърляне"</string>
-    <string name="a11y_call_incoming_answer_description" msgid="1623200501347799736">"Отговаряне"</string>
-    <string name="call_incoming_answer" msgid="841798555883717852">"Отговаряне"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_answer">Прекарайте пръст нагоре за отговаряне</string>
+  <string name="call_incoming_swipe_to_reject">Прекарайте пръст надолу за отхвърляне</string>
+  <string name="a11y_incoming_call_swipe_to_answer">Прекарайте два пръста нагоре, за да отговорите, или надолу, за да отхвърлите това обаждане</string>
+  <string name="call_incoming_will_disconnect">Ако отговорите на това обаждане, видеообаждането ви ще прекъсне</string>
+  <string name="a11y_call_incoming_decline_description">Отхвърляне</string>
+  <string name="call_incoming_decline">Отхвърляне</string>
+  <string name="a11y_call_incoming_answer_description">Отговаряне</string>
+  <string name="call_incoming_answer">Отговаряне</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/answermethod/res/values-bn/strings.xml b/java/com/android/incallui/answer/impl/answermethod/res/values-bn/strings.xml
index 12f938a..758eace 100644
--- a/java/com/android/incallui/answer/impl/answermethod/res/values-bn/strings.xml
+++ b/java/com/android/incallui/answer/impl/answermethod/res/values-bn/strings.xml
@@ -1,12 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_answer" msgid="2959042172304267183">"উত্তর দিতে উপরের দিকে সোয়াইপ করুন"</string>
-    <string name="call_incoming_swipe_to_reject" msgid="463322705441386885">"প্রত্যাখ্যান করতে নীচের দিকে সোয়াইপ করুন"</string>
-    <string name="a11y_incoming_call_swipe_to_answer" msgid="6992663569851713736">"কলটির উত্তর দিতে দুই আঙুল দিয়ে উপরের দিকে সোয়াইপ করুন বা প্রত্যাখ্যান করতে নীচের দিকে সোয়াইপ করুন"</string>
-    <string name="call_incoming_will_disconnect" msgid="7095934149229485541">"এই কলটির উত্তর দেওয়া হলে আপনার ভিডিও কলটি কেটে যাবে"</string>
-    <string name="a11y_call_incoming_decline_description" msgid="4441041052558364987">"প্রত্যাখ্যান করুন"</string>
-    <string name="call_incoming_decline" msgid="2982110738106661231">"প্রত্যাখ্যান করুন"</string>
-    <string name="a11y_call_incoming_answer_description" msgid="1623200501347799736">"উত্তর দিন"</string>
-    <string name="call_incoming_answer" msgid="841798555883717852">"উত্তর দিন"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_answer">উত্তর দিতে উপরের দিকে সোয়াইপ করুন</string>
+  <string name="call_incoming_swipe_to_reject">প্রত্যাখ্যান করতে নীচের দিকে সোয়াইপ করুন</string>
+  <string name="a11y_incoming_call_swipe_to_answer">কলটির উত্তর দিতে দুই আঙুল দিয়ে উপরের দিকে সোয়াইপ করুন বা প্রত্যাখ্যান করতে নীচের দিকে সোয়াইপ করুন</string>
+  <string name="call_incoming_will_disconnect">এই কলটির উত্তর দেওয়া হলে আপনার ভিডিও কলটি কেটে যাবে</string>
+  <string name="a11y_call_incoming_decline_description">প্রত্যাখ্যান করুন</string>
+  <string name="call_incoming_decline">প্রত্যাখ্যান করুন</string>
+  <string name="a11y_call_incoming_answer_description">উত্তর দিন</string>
+  <string name="call_incoming_answer">উত্তর দিন</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/answermethod/res/values-bs/strings.xml b/java/com/android/incallui/answer/impl/answermethod/res/values-bs/strings.xml
index 5d708dd..8841e81 100644
--- a/java/com/android/incallui/answer/impl/answermethod/res/values-bs/strings.xml
+++ b/java/com/android/incallui/answer/impl/answermethod/res/values-bs/strings.xml
@@ -1,12 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_answer" msgid="2959042172304267183">"Prevucite gore da odgovorite"</string>
-    <string name="call_incoming_swipe_to_reject" msgid="463322705441386885">"Prevucite dolje da odbijete"</string>
-    <string name="a11y_incoming_call_swipe_to_answer" msgid="6992663569851713736">"Pomoću dva prsta prevucite prema gore da se javite ili prema dolje da odbijete poziv"</string>
-    <string name="call_incoming_will_disconnect" msgid="7095934149229485541">"Javljanjem na ovaj poziv prekinut ćete videopoziv"</string>
-    <string name="a11y_call_incoming_decline_description" msgid="4441041052558364987">"Odbij"</string>
-    <string name="call_incoming_decline" msgid="2982110738106661231">"Odbij"</string>
-    <string name="a11y_call_incoming_answer_description" msgid="1623200501347799736">"Odgovori"</string>
-    <string name="call_incoming_answer" msgid="841798555883717852">"Odgovori"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_answer">Prevucite gore da odgovorite</string>
+  <string name="call_incoming_swipe_to_reject">Prevucite dolje da odbijete</string>
+  <string name="a11y_incoming_call_swipe_to_answer">Pomoću dva prsta prevucite prema gore da se javite ili prema dolje da odbijete poziv</string>
+  <string name="call_incoming_will_disconnect">Javljanjem na ovaj poziv prekinut ćete video poziv</string>
+  <string name="a11y_call_incoming_decline_description">Odbij</string>
+  <string name="call_incoming_decline">Odbij</string>
+  <string name="a11y_call_incoming_answer_description">Odgovori</string>
+  <string name="call_incoming_answer">Odgovori</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/answermethod/res/values-ca/strings.xml b/java/com/android/incallui/answer/impl/answermethod/res/values-ca/strings.xml
index 4bdda55..d284f27 100644
--- a/java/com/android/incallui/answer/impl/answermethod/res/values-ca/strings.xml
+++ b/java/com/android/incallui/answer/impl/answermethod/res/values-ca/strings.xml
@@ -1,12 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_answer" msgid="2959042172304267183">"Llisca cap amunt per respondre"</string>
-    <string name="call_incoming_swipe_to_reject" msgid="463322705441386885">"Llisca cap avall per rebutjar"</string>
-    <string name="a11y_incoming_call_swipe_to_answer" msgid="6992663569851713736">"Llisca cap amunt amb dos dits per respondre a la trucada o cap avall per rebutjar-la"</string>
-    <string name="call_incoming_will_disconnect" msgid="7095934149229485541">"Si respons a aquesta trucada, la videotrucada finalitzarà"</string>
-    <string name="a11y_call_incoming_decline_description" msgid="4441041052558364987">"Rebutja"</string>
-    <string name="call_incoming_decline" msgid="2982110738106661231">"Rebutja"</string>
-    <string name="a11y_call_incoming_answer_description" msgid="1623200501347799736">"Respon"</string>
-    <string name="call_incoming_answer" msgid="841798555883717852">"Respon"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_answer">Llisca cap amunt per respondre</string>
+  <string name="call_incoming_swipe_to_reject">Llisca cap avall per rebutjar</string>
+  <string name="a11y_incoming_call_swipe_to_answer">Llisca cap amunt amb dos dits per respondre a la trucada o cap avall per rebutjar-la</string>
+  <string name="call_incoming_will_disconnect">Si respons a aquesta trucada, la videotrucada finalitzarà</string>
+  <string name="a11y_call_incoming_decline_description">Rebutja</string>
+  <string name="call_incoming_decline">Rebutja</string>
+  <string name="a11y_call_incoming_answer_description">Respon</string>
+  <string name="call_incoming_answer">Respon</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/answermethod/res/values-cs/strings.xml b/java/com/android/incallui/answer/impl/answermethod/res/values-cs/strings.xml
index 39e4710..824f091 100644
--- a/java/com/android/incallui/answer/impl/answermethod/res/values-cs/strings.xml
+++ b/java/com/android/incallui/answer/impl/answermethod/res/values-cs/strings.xml
@@ -1,12 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_answer" msgid="2959042172304267183">"Přejetím prstu nahoru hovor přijmete"</string>
-    <string name="call_incoming_swipe_to_reject" msgid="463322705441386885">"Přejetím prstem dolů hovor odmítnete"</string>
-    <string name="a11y_incoming_call_swipe_to_answer" msgid="6992663569851713736">"Přejetím dvěma prsty po obrazovce nahoru hovor přijmete a dolů odmítnete"</string>
-    <string name="call_incoming_will_disconnect" msgid="7095934149229485541">"Pokud přijmete tento hovor, váš videohovor bude ukončen"</string>
-    <string name="a11y_call_incoming_decline_description" msgid="4441041052558364987">"Odmítnout"</string>
-    <string name="call_incoming_decline" msgid="2982110738106661231">"Odmítnout"</string>
-    <string name="a11y_call_incoming_answer_description" msgid="1623200501347799736">"Přijmout"</string>
-    <string name="call_incoming_answer" msgid="841798555883717852">"Přijmout"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_answer">Přejetím prstu nahoru hovor přijmete</string>
+  <string name="call_incoming_swipe_to_reject">Přejetím prstem dolů hovor odmítnete</string>
+  <string name="a11y_incoming_call_swipe_to_answer">Přejetím dvěma prsty po obrazovce nahoru hovor přijmete a dolů odmítnete</string>
+  <string name="call_incoming_will_disconnect">Pokud přijmete tento hovor, váš videohovor bude ukončen</string>
+  <string name="a11y_call_incoming_decline_description">Odmítnout</string>
+  <string name="call_incoming_decline">Odmítnout</string>
+  <string name="a11y_call_incoming_answer_description">Přijmout</string>
+  <string name="call_incoming_answer">Přijmout</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/answermethod/res/values-da/strings.xml b/java/com/android/incallui/answer/impl/answermethod/res/values-da/strings.xml
index b7d7fa9..15bcf6c 100644
--- a/java/com/android/incallui/answer/impl/answermethod/res/values-da/strings.xml
+++ b/java/com/android/incallui/answer/impl/answermethod/res/values-da/strings.xml
@@ -1,12 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_answer" msgid="2959042172304267183">"Stryg op for at besvare"</string>
-    <string name="call_incoming_swipe_to_reject" msgid="463322705441386885">"Stryg ned for at afvise"</string>
-    <string name="a11y_incoming_call_swipe_to_answer" msgid="6992663569851713736">"Stryg op med to fingre for at besvare eller ned for at afvise opkaldet"</string>
-    <string name="call_incoming_will_disconnect" msgid="7095934149229485541">"Hvis du besvarer dette opkald, afsluttes dit videoopkald"</string>
-    <string name="a11y_call_incoming_decline_description" msgid="4441041052558364987">"Afvis"</string>
-    <string name="call_incoming_decline" msgid="2982110738106661231">"Afvis"</string>
-    <string name="a11y_call_incoming_answer_description" msgid="1623200501347799736">"Besvar"</string>
-    <string name="call_incoming_answer" msgid="841798555883717852">"Besvar"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_answer">Stryg op for at besvare</string>
+  <string name="call_incoming_swipe_to_reject">Stryg ned for at afvise</string>
+  <string name="a11y_incoming_call_swipe_to_answer">Stryg op med to fingre for at besvare eller ned for at afvise opkaldet</string>
+  <string name="call_incoming_will_disconnect">Hvis du besvarer dette opkald, afsluttes dit videoopkald</string>
+  <string name="a11y_call_incoming_decline_description">Afvis</string>
+  <string name="call_incoming_decline">Afvis</string>
+  <string name="a11y_call_incoming_answer_description">Besvar</string>
+  <string name="call_incoming_answer">Besvar</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/answermethod/res/values-de/strings.xml b/java/com/android/incallui/answer/impl/answermethod/res/values-de/strings.xml
index 33e084e..32895ad 100644
--- a/java/com/android/incallui/answer/impl/answermethod/res/values-de/strings.xml
+++ b/java/com/android/incallui/answer/impl/answermethod/res/values-de/strings.xml
@@ -1,12 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_answer" msgid="2959042172304267183">"Zum Annehmen nach oben wischen"</string>
-    <string name="call_incoming_swipe_to_reject" msgid="463322705441386885">"Zum Ablehnen nach unten wischen"</string>
-    <string name="a11y_incoming_call_swipe_to_answer" msgid="6992663569851713736">"Wische mit zwei Fingern nach oben, um den Anruf anzunehmen, oder nach unten, um ihn abzulehnen"</string>
-    <string name="call_incoming_will_disconnect" msgid="7095934149229485541">"Wenn du diesen Anruf annimmst, wird der aktuelle Videoanruf beendet"</string>
-    <string name="a11y_call_incoming_decline_description" msgid="4441041052558364987">"Ablehnen"</string>
-    <string name="call_incoming_decline" msgid="2982110738106661231">"Ablehnen"</string>
-    <string name="a11y_call_incoming_answer_description" msgid="1623200501347799736">"Annehmen"</string>
-    <string name="call_incoming_answer" msgid="841798555883717852">"Annehmen"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_answer">Zum Annehmen nach oben wischen</string>
+  <string name="call_incoming_swipe_to_reject">Zum Ablehnen nach unten wischen</string>
+  <string name="a11y_incoming_call_swipe_to_answer">Wische mit zwei Fingern nach oben, um den Anruf anzunehmen, oder nach unten, um ihn abzulehnen</string>
+  <string name="call_incoming_will_disconnect">Wenn du diesen Anruf annimmst, wird der aktuelle Videoanruf beendet</string>
+  <string name="a11y_call_incoming_decline_description">Ablehnen</string>
+  <string name="call_incoming_decline">Ablehnen</string>
+  <string name="a11y_call_incoming_answer_description">Annehmen</string>
+  <string name="call_incoming_answer">Annehmen</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/answermethod/res/values-el/strings.xml b/java/com/android/incallui/answer/impl/answermethod/res/values-el/strings.xml
index 7307ea2..0ce61c7 100644
--- a/java/com/android/incallui/answer/impl/answermethod/res/values-el/strings.xml
+++ b/java/com/android/incallui/answer/impl/answermethod/res/values-el/strings.xml
@@ -1,12 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_answer" msgid="2959042172304267183">"Σύρετε προς τα επάνω για απάντηση"</string>
-    <string name="call_incoming_swipe_to_reject" msgid="463322705441386885">"Σύρετε προς τα κάτω για απόρριψη της κλήσης"</string>
-    <string name="a11y_incoming_call_swipe_to_answer" msgid="6992663569851713736">"Σύρετε με δύο δάχτυλα προς τα πάνω, για να απαντήσετε ή προς τα κάτω, για να απορρίψετε την κλήση."</string>
-    <string name="call_incoming_will_disconnect" msgid="7095934149229485541">"Αν απαντήσετε σε αυτήν την κλήση θα τερματιστεί η βιντεοκλήση σας"</string>
-    <string name="a11y_call_incoming_decline_description" msgid="4441041052558364987">"Απόρριψη"</string>
-    <string name="call_incoming_decline" msgid="2982110738106661231">"Απόρριψη"</string>
-    <string name="a11y_call_incoming_answer_description" msgid="1623200501347799736">"Απάντηση"</string>
-    <string name="call_incoming_answer" msgid="841798555883717852">"Απάντηση"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_answer">Σύρετε προς τα επάνω για απάντηση</string>
+  <string name="call_incoming_swipe_to_reject">Σύρετε προς τα κάτω για απόρριψη της κλήσης</string>
+  <string name="a11y_incoming_call_swipe_to_answer">Σύρετε με δύο δάχτυλα προς τα πάνω, για να απαντήσετε ή προς τα κάτω, για να απορρίψετε την κλήση.</string>
+  <string name="call_incoming_will_disconnect">Αν απαντήσετε σε αυτήν την κλήση θα τερματιστεί η βιντεοκλήση σας</string>
+  <string name="a11y_call_incoming_decline_description">Απόρριψη</string>
+  <string name="call_incoming_decline">Απόρριψη</string>
+  <string name="a11y_call_incoming_answer_description">Απάντηση</string>
+  <string name="call_incoming_answer">Απάντηση</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/answermethod/res/values-en-rAU/strings.xml b/java/com/android/incallui/answer/impl/answermethod/res/values-en-rAU/strings.xml
index 056fb4a..07e6083 100644
--- a/java/com/android/incallui/answer/impl/answermethod/res/values-en-rAU/strings.xml
+++ b/java/com/android/incallui/answer/impl/answermethod/res/values-en-rAU/strings.xml
@@ -1,12 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_answer" msgid="2959042172304267183">"Swipe up to answer"</string>
-    <string name="call_incoming_swipe_to_reject" msgid="463322705441386885">"Swipe down to reject"</string>
-    <string name="a11y_incoming_call_swipe_to_answer" msgid="6992663569851713736">"Swipe up with two fingers to answer, or down to reject the call"</string>
-    <string name="call_incoming_will_disconnect" msgid="7095934149229485541">"Answering this call will end your video call"</string>
-    <string name="a11y_call_incoming_decline_description" msgid="4441041052558364987">"Decline"</string>
-    <string name="call_incoming_decline" msgid="2982110738106661231">"Decline"</string>
-    <string name="a11y_call_incoming_answer_description" msgid="1623200501347799736">"Answer"</string>
-    <string name="call_incoming_answer" msgid="841798555883717852">"Answer"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_answer">Swipe up to answer</string>
+  <string name="call_incoming_swipe_to_reject">Swipe down to reject</string>
+  <string name="a11y_incoming_call_swipe_to_answer">Swipe up with two fingers to answer, or down to reject the call</string>
+  <string name="call_incoming_will_disconnect">Answering this call will end your video call</string>
+  <string name="a11y_call_incoming_decline_description">Decline</string>
+  <string name="call_incoming_decline">Decline</string>
+  <string name="a11y_call_incoming_answer_description">Answer</string>
+  <string name="call_incoming_answer">Answer</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/answermethod/res/values-en-rGB/strings.xml b/java/com/android/incallui/answer/impl/answermethod/res/values-en-rGB/strings.xml
index 056fb4a..07e6083 100644
--- a/java/com/android/incallui/answer/impl/answermethod/res/values-en-rGB/strings.xml
+++ b/java/com/android/incallui/answer/impl/answermethod/res/values-en-rGB/strings.xml
@@ -1,12 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_answer" msgid="2959042172304267183">"Swipe up to answer"</string>
-    <string name="call_incoming_swipe_to_reject" msgid="463322705441386885">"Swipe down to reject"</string>
-    <string name="a11y_incoming_call_swipe_to_answer" msgid="6992663569851713736">"Swipe up with two fingers to answer, or down to reject the call"</string>
-    <string name="call_incoming_will_disconnect" msgid="7095934149229485541">"Answering this call will end your video call"</string>
-    <string name="a11y_call_incoming_decline_description" msgid="4441041052558364987">"Decline"</string>
-    <string name="call_incoming_decline" msgid="2982110738106661231">"Decline"</string>
-    <string name="a11y_call_incoming_answer_description" msgid="1623200501347799736">"Answer"</string>
-    <string name="call_incoming_answer" msgid="841798555883717852">"Answer"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_answer">Swipe up to answer</string>
+  <string name="call_incoming_swipe_to_reject">Swipe down to reject</string>
+  <string name="a11y_incoming_call_swipe_to_answer">Swipe up with two fingers to answer, or down to reject the call</string>
+  <string name="call_incoming_will_disconnect">Answering this call will end your video call</string>
+  <string name="a11y_call_incoming_decline_description">Decline</string>
+  <string name="call_incoming_decline">Decline</string>
+  <string name="a11y_call_incoming_answer_description">Answer</string>
+  <string name="call_incoming_answer">Answer</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/answermethod/res/values-en-rIN/strings.xml b/java/com/android/incallui/answer/impl/answermethod/res/values-en-rIN/strings.xml
index 056fb4a..07e6083 100644
--- a/java/com/android/incallui/answer/impl/answermethod/res/values-en-rIN/strings.xml
+++ b/java/com/android/incallui/answer/impl/answermethod/res/values-en-rIN/strings.xml
@@ -1,12 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_answer" msgid="2959042172304267183">"Swipe up to answer"</string>
-    <string name="call_incoming_swipe_to_reject" msgid="463322705441386885">"Swipe down to reject"</string>
-    <string name="a11y_incoming_call_swipe_to_answer" msgid="6992663569851713736">"Swipe up with two fingers to answer, or down to reject the call"</string>
-    <string name="call_incoming_will_disconnect" msgid="7095934149229485541">"Answering this call will end your video call"</string>
-    <string name="a11y_call_incoming_decline_description" msgid="4441041052558364987">"Decline"</string>
-    <string name="call_incoming_decline" msgid="2982110738106661231">"Decline"</string>
-    <string name="a11y_call_incoming_answer_description" msgid="1623200501347799736">"Answer"</string>
-    <string name="call_incoming_answer" msgid="841798555883717852">"Answer"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_answer">Swipe up to answer</string>
+  <string name="call_incoming_swipe_to_reject">Swipe down to reject</string>
+  <string name="a11y_incoming_call_swipe_to_answer">Swipe up with two fingers to answer, or down to reject the call</string>
+  <string name="call_incoming_will_disconnect">Answering this call will end your video call</string>
+  <string name="a11y_call_incoming_decline_description">Decline</string>
+  <string name="call_incoming_decline">Decline</string>
+  <string name="a11y_call_incoming_answer_description">Answer</string>
+  <string name="call_incoming_answer">Answer</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/answermethod/res/values-es-rUS/strings.xml b/java/com/android/incallui/answer/impl/answermethod/res/values-es-rUS/strings.xml
index d3f0ed3..eba54c7 100644
--- a/java/com/android/incallui/answer/impl/answermethod/res/values-es-rUS/strings.xml
+++ b/java/com/android/incallui/answer/impl/answermethod/res/values-es-rUS/strings.xml
@@ -1,12 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_answer" msgid="2959042172304267183">"Desliza hacia arriba para responder"</string>
-    <string name="call_incoming_swipe_to_reject" msgid="463322705441386885">"Desliza hacia abajo para rechazar"</string>
-    <string name="a11y_incoming_call_swipe_to_answer" msgid="6992663569851713736">"Desliza dos dedos hacia arriba para responder la llamada o hacia abajo para rechazarla"</string>
-    <string name="call_incoming_will_disconnect" msgid="7095934149229485541">"Si respondes esta llamada, terminará la videollamada"</string>
-    <string name="a11y_call_incoming_decline_description" msgid="4441041052558364987">"Rechazar"</string>
-    <string name="call_incoming_decline" msgid="2982110738106661231">"Rechazar"</string>
-    <string name="a11y_call_incoming_answer_description" msgid="1623200501347799736">"Responder"</string>
-    <string name="call_incoming_answer" msgid="841798555883717852">"Responder"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_answer">Desliza hacia arriba para responder</string>
+  <string name="call_incoming_swipe_to_reject">Desliza hacia abajo para rechazar</string>
+  <string name="a11y_incoming_call_swipe_to_answer">Desliza dos dedos hacia arriba para responder la llamada o hacia abajo para rechazarla</string>
+  <string name="call_incoming_will_disconnect">Si respondes esta llamada, terminará la videollamada</string>
+  <string name="a11y_call_incoming_decline_description">Rechazar</string>
+  <string name="call_incoming_decline">Rechazar</string>
+  <string name="a11y_call_incoming_answer_description">Responder</string>
+  <string name="call_incoming_answer">Responder</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/answermethod/res/values-es/strings.xml b/java/com/android/incallui/answer/impl/answermethod/res/values-es/strings.xml
index d276e34..6f07aa6 100644
--- a/java/com/android/incallui/answer/impl/answermethod/res/values-es/strings.xml
+++ b/java/com/android/incallui/answer/impl/answermethod/res/values-es/strings.xml
@@ -1,12 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_answer" msgid="2959042172304267183">"Desliza hacia arriba para responder"</string>
-    <string name="call_incoming_swipe_to_reject" msgid="463322705441386885">"Desliza hacia abajo para rechazar"</string>
-    <string name="a11y_incoming_call_swipe_to_answer" msgid="6992663569851713736">"Desliza dos dedos hacia arriba para responder la llamada o hacia abajo para rechazarla"</string>
-    <string name="call_incoming_will_disconnect" msgid="7095934149229485541">"Si respondes esta llamada, la videollamada finalizará"</string>
-    <string name="a11y_call_incoming_decline_description" msgid="4441041052558364987">"Rechazar"</string>
-    <string name="call_incoming_decline" msgid="2982110738106661231">"Rechazar"</string>
-    <string name="a11y_call_incoming_answer_description" msgid="1623200501347799736">"Responder"</string>
-    <string name="call_incoming_answer" msgid="841798555883717852">"Responder"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_answer">Desliza hacia arriba para responder</string>
+  <string name="call_incoming_swipe_to_reject">Desliza hacia abajo para rechazar</string>
+  <string name="a11y_incoming_call_swipe_to_answer">Desliza dos dedos hacia arriba para responder la llamada o hacia abajo para rechazarla</string>
+  <string name="call_incoming_will_disconnect">Si respondes esta llamada, la videollamada finalizará</string>
+  <string name="a11y_call_incoming_decline_description">Rechazar</string>
+  <string name="call_incoming_decline">Rechazar</string>
+  <string name="a11y_call_incoming_answer_description">Responder</string>
+  <string name="call_incoming_answer">Responder</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/answermethod/res/values-et/strings.xml b/java/com/android/incallui/answer/impl/answermethod/res/values-et/strings.xml
index 86bb28a..619863f 100644
--- a/java/com/android/incallui/answer/impl/answermethod/res/values-et/strings.xml
+++ b/java/com/android/incallui/answer/impl/answermethod/res/values-et/strings.xml
@@ -1,12 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_answer" msgid="2959042172304267183">"Vastamiseks pühkige üles"</string>
-    <string name="call_incoming_swipe_to_reject" msgid="463322705441386885">"Keeldumiseks pühkige alla"</string>
-    <string name="a11y_incoming_call_swipe_to_answer" msgid="6992663569851713736">"Vastamiseks pühkige kahe sõrmega üles, kõnest keeldumiseks pühkige alla"</string>
-    <string name="call_incoming_will_disconnect" msgid="7095934149229485541">"Kõnele vastamisel katkestatakse teie videokõne"</string>
-    <string name="a11y_call_incoming_decline_description" msgid="4441041052558364987">"Keeldumine"</string>
-    <string name="call_incoming_decline" msgid="2982110738106661231">"Keeldu"</string>
-    <string name="a11y_call_incoming_answer_description" msgid="1623200501347799736">"Vastamine"</string>
-    <string name="call_incoming_answer" msgid="841798555883717852">"Vasta"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_answer">Vastamiseks pühkige üles</string>
+  <string name="call_incoming_swipe_to_reject">Keeldumiseks pühkige alla</string>
+  <string name="a11y_incoming_call_swipe_to_answer">Vastamiseks pühkige kahe sõrmega üles, kõnest keeldumiseks pühkige alla</string>
+  <string name="call_incoming_will_disconnect">Kõnele vastamisel katkestatakse teie videokõne</string>
+  <string name="a11y_call_incoming_decline_description">Keeldumine</string>
+  <string name="call_incoming_decline">Keeldu</string>
+  <string name="a11y_call_incoming_answer_description">Vastamine</string>
+  <string name="call_incoming_answer">Vasta</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/answermethod/res/values-eu/strings.xml b/java/com/android/incallui/answer/impl/answermethod/res/values-eu/strings.xml
index f08a5c3..228f412 100644
--- a/java/com/android/incallui/answer/impl/answermethod/res/values-eu/strings.xml
+++ b/java/com/android/incallui/answer/impl/answermethod/res/values-eu/strings.xml
@@ -1,12 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_answer" msgid="2959042172304267183">"Pasatu hatza gorantz erantzuteko"</string>
-    <string name="call_incoming_swipe_to_reject" msgid="463322705441386885">"Pasatu hatza beherantz baztertzeko"</string>
-    <string name="a11y_incoming_call_swipe_to_answer" msgid="6992663569851713736">"Pasatu bi hatz gorantz erantzuteko edo beherantz baztertzeko"</string>
-    <string name="call_incoming_will_disconnect" msgid="7095934149229485541">"Dei honi erantzuten badiozu, amaitu egingo da bideo-deia"</string>
-    <string name="a11y_call_incoming_decline_description" msgid="4441041052558364987">"Baztertu"</string>
-    <string name="call_incoming_decline" msgid="2982110738106661231">"Baztertu"</string>
-    <string name="a11y_call_incoming_answer_description" msgid="1623200501347799736">"Erantzun"</string>
-    <string name="call_incoming_answer" msgid="841798555883717852">"Erantzun"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_answer">Pasatu hatza gora erantzuteko</string>
+  <string name="call_incoming_swipe_to_reject">Pasatu hatza behera baztertzeko</string>
+  <string name="a11y_incoming_call_swipe_to_answer">Pasatu bi hatz gora erantzuteko edo behera baztertzeko</string>
+  <string name="call_incoming_will_disconnect">Dei honi erantzuten badiozu, amaitu egingo da bideo-deia</string>
+  <string name="a11y_call_incoming_decline_description">Baztertu</string>
+  <string name="call_incoming_decline">Baztertu</string>
+  <string name="a11y_call_incoming_answer_description">Erantzun</string>
+  <string name="call_incoming_answer">Erantzun</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/answermethod/res/values-fa/strings.xml b/java/com/android/incallui/answer/impl/answermethod/res/values-fa/strings.xml
index 29a0a55..e03c3bb 100644
--- a/java/com/android/incallui/answer/impl/answermethod/res/values-fa/strings.xml
+++ b/java/com/android/incallui/answer/impl/answermethod/res/values-fa/strings.xml
@@ -1,12 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_answer" msgid="2959042172304267183">"برای پاسخ‌گویی، انگشتتان را تند به بالا بکشید"</string>
-    <string name="call_incoming_swipe_to_reject" msgid="463322705441386885">"برای رد کردن، انگشتتان را تند به پایین بکشید"</string>
-    <string name="a11y_incoming_call_swipe_to_answer" msgid="6992663569851713736">"برای پاسخ دادن، با دو انگشت تند به بالا بکشید و برای رد کردن تماس، با دو انگشت تند به پایین بکشید"</string>
-    <string name="call_incoming_will_disconnect" msgid="7095934149229485541">"اگر به این تماس پاسخ دهید، تماس ویدیویی‌تان تمام می‌شود"</string>
-    <string name="a11y_call_incoming_decline_description" msgid="4441041052558364987">"رد کردن"</string>
-    <string name="call_incoming_decline" msgid="2982110738106661231">"رد کردن"</string>
-    <string name="a11y_call_incoming_answer_description" msgid="1623200501347799736">"پاسخ‌گویی"</string>
-    <string name="call_incoming_answer" msgid="841798555883717852">"پاسخ‌گویی"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_answer">برای پاسخ‌گویی، انگشتتان را تند به بالا بکشید</string>
+  <string name="call_incoming_swipe_to_reject">برای رد کردن، انگشتتان را تند به پایین بکشید</string>
+  <string name="a11y_incoming_call_swipe_to_answer">برای پاسخ دادن، با دو انگشت تند به بالا بکشید و برای رد کردن تماس، با دو انگشت تند به پایین بکشید</string>
+  <string name="call_incoming_will_disconnect">اگر به این تماس پاسخ دهید، تماس ویدیویی‌تان تمام می‌شود</string>
+  <string name="a11y_call_incoming_decline_description">رد کردن</string>
+  <string name="call_incoming_decline">رد کردن</string>
+  <string name="a11y_call_incoming_answer_description">پاسخ‌گویی</string>
+  <string name="call_incoming_answer">پاسخ‌گویی</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/answermethod/res/values-fi/strings.xml b/java/com/android/incallui/answer/impl/answermethod/res/values-fi/strings.xml
index e36250e..7b81e08 100644
--- a/java/com/android/incallui/answer/impl/answermethod/res/values-fi/strings.xml
+++ b/java/com/android/incallui/answer/impl/answermethod/res/values-fi/strings.xml
@@ -1,12 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_answer" msgid="2959042172304267183">"Vastaa pyyhkäisemällä ylös."</string>
-    <string name="call_incoming_swipe_to_reject" msgid="463322705441386885">"Hylkää pyyhkäisemällä alaspäin."</string>
-    <string name="a11y_incoming_call_swipe_to_answer" msgid="6992663569851713736">"Vastaa puheluun pyyhkäisemällä kahdella sormella ylöspäin tai hylkää se pyyhkäisemällä kahdella sormella alaspäin."</string>
-    <string name="call_incoming_will_disconnect" msgid="7095934149229485541">"Vastaaminen tähän puheluun päättää videopuhelun."</string>
-    <string name="a11y_call_incoming_decline_description" msgid="4441041052558364987">"Hylkää"</string>
-    <string name="call_incoming_decline" msgid="2982110738106661231">"Hylkää"</string>
-    <string name="a11y_call_incoming_answer_description" msgid="1623200501347799736">"Vastaa"</string>
-    <string name="call_incoming_answer" msgid="841798555883717852">"Vastaa"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_answer">Vastaa pyyhkäisemällä ylös.</string>
+  <string name="call_incoming_swipe_to_reject">Hylkää pyyhkäisemällä alaspäin.</string>
+  <string name="a11y_incoming_call_swipe_to_answer">Vastaa puheluun pyyhkäisemällä kahdella sormella ylöspäin tai hylkää se pyyhkäisemällä kahdella sormella alaspäin.</string>
+  <string name="call_incoming_will_disconnect">Vastaaminen tähän puheluun päättää videopuhelun.</string>
+  <string name="a11y_call_incoming_decline_description">Hylkää</string>
+  <string name="call_incoming_decline">Hylkää</string>
+  <string name="a11y_call_incoming_answer_description">Vastaa</string>
+  <string name="call_incoming_answer">Vastaa</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/answermethod/res/values-fr-rCA/strings.xml b/java/com/android/incallui/answer/impl/answermethod/res/values-fr-rCA/strings.xml
index 107e2bf..041a7d3 100644
--- a/java/com/android/incallui/answer/impl/answermethod/res/values-fr-rCA/strings.xml
+++ b/java/com/android/incallui/answer/impl/answermethod/res/values-fr-rCA/strings.xml
@@ -1,12 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_answer" msgid="2959042172304267183">"Balayez l\'écran vers le haut pour répondre"</string>
-    <string name="call_incoming_swipe_to_reject" msgid="463322705441386885">"Balayez l\'écran vers le bas pour refuser l\'appel"</string>
-    <string name="a11y_incoming_call_swipe_to_answer" msgid="6992663569851713736">"Faites glisser deux doigts vers le haut pour répondre ou vers le bas pour refuser l\'appel"</string>
-    <string name="call_incoming_will_disconnect" msgid="7095934149229485541">"Si vous répondez à cet appel, vous mettrez fin à l\'appel vidéo"</string>
-    <string name="a11y_call_incoming_decline_description" msgid="4441041052558364987">"Refuser"</string>
-    <string name="call_incoming_decline" msgid="2982110738106661231">"Refuser"</string>
-    <string name="a11y_call_incoming_answer_description" msgid="1623200501347799736">"Répondre"</string>
-    <string name="call_incoming_answer" msgid="841798555883717852">"Répondre"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_answer">Balayez l\'écran vers le haut pour répondre</string>
+  <string name="call_incoming_swipe_to_reject">Balayez l\'écran vers le bas pour refuser l\'appel</string>
+  <string name="a11y_incoming_call_swipe_to_answer">Faites glisser deux doigts vers le haut pour répondre ou vers le bas pour refuser l\'appel</string>
+  <string name="call_incoming_will_disconnect">Si vous répondez à cet appel, vous mettrez fin à l\'appel vidéo</string>
+  <string name="a11y_call_incoming_decline_description">Refuser</string>
+  <string name="call_incoming_decline">Refuser</string>
+  <string name="a11y_call_incoming_answer_description">Répondre</string>
+  <string name="call_incoming_answer">Répondre</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/answermethod/res/values-fr/strings.xml b/java/com/android/incallui/answer/impl/answermethod/res/values-fr/strings.xml
index 1be01ad..003b03f 100644
--- a/java/com/android/incallui/answer/impl/answermethod/res/values-fr/strings.xml
+++ b/java/com/android/incallui/answer/impl/answermethod/res/values-fr/strings.xml
@@ -1,12 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_answer" msgid="2959042172304267183">"Balayer l\'écran vers le haut pour répondre"</string>
-    <string name="call_incoming_swipe_to_reject" msgid="463322705441386885">"Balayer l\'écran vers le bas pour refuser l\'appel"</string>
-    <string name="a11y_incoming_call_swipe_to_answer" msgid="6992663569851713736">"Avec deux doigts, balayer l\'écran vers le haut pour répondre, ou vers le bas pour refuser l\'appel"</string>
-    <string name="call_incoming_will_disconnect" msgid="7095934149229485541">"Si vous répondez à cet appel, vous mettrez fin à l\'appel vidéo en cours."</string>
-    <string name="a11y_call_incoming_decline_description" msgid="4441041052558364987">"Refuser"</string>
-    <string name="call_incoming_decline" msgid="2982110738106661231">"Refuser"</string>
-    <string name="a11y_call_incoming_answer_description" msgid="1623200501347799736">"Répondre"</string>
-    <string name="call_incoming_answer" msgid="841798555883717852">"Répondre"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_answer">Balayer l\'écran vers le haut pour répondre</string>
+  <string name="call_incoming_swipe_to_reject">Balayer l\'écran vers le bas pour refuser l\'appel</string>
+  <string name="a11y_incoming_call_swipe_to_answer">Avec deux doigts, balayer l\'écran vers le haut pour répondre, ou vers le bas pour refuser l\'appel</string>
+  <string name="call_incoming_will_disconnect">Si vous répondez à cet appel, vous mettrez fin à l\'appel vidéo en cours.</string>
+  <string name="a11y_call_incoming_decline_description">Refuser</string>
+  <string name="call_incoming_decline">Refuser</string>
+  <string name="a11y_call_incoming_answer_description">Répondre</string>
+  <string name="call_incoming_answer">Répondre</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/answermethod/res/values-gl/strings.xml b/java/com/android/incallui/answer/impl/answermethod/res/values-gl/strings.xml
index ee40394..aa5e047 100644
--- a/java/com/android/incallui/answer/impl/answermethod/res/values-gl/strings.xml
+++ b/java/com/android/incallui/answer/impl/answermethod/res/values-gl/strings.xml
@@ -1,12 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_answer" msgid="2959042172304267183">"Pasar o dedo cara arriba para responder"</string>
-    <string name="call_incoming_swipe_to_reject" msgid="463322705441386885">"Pasar o dedo cara abaixo para rexeitar"</string>
-    <string name="a11y_incoming_call_swipe_to_answer" msgid="6992663569851713736">"Pasar dous dedos cara arriba para aceptar a chamada ou cara abaixo para rexeitala"</string>
-    <string name="call_incoming_will_disconnect" msgid="7095934149229485541">"Ao responder a esta chamada, finalizarase a videochamada"</string>
-    <string name="a11y_call_incoming_decline_description" msgid="4441041052558364987">"Rexeitar"</string>
-    <string name="call_incoming_decline" msgid="2982110738106661231">"Rexeitar"</string>
-    <string name="a11y_call_incoming_answer_description" msgid="1623200501347799736">"Responder"</string>
-    <string name="call_incoming_answer" msgid="841798555883717852">"Responder"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_answer">Pasar o dedo cara arriba para responder</string>
+  <string name="call_incoming_swipe_to_reject">Pasar o dedo cara abaixo para rexeitar</string>
+  <string name="a11y_incoming_call_swipe_to_answer">Pasar dous dedos cara arriba para aceptar a chamada ou cara abaixo para rexeitala</string>
+  <string name="call_incoming_will_disconnect">Ao responder a esta chamada, finalizarase a videochamada</string>
+  <string name="a11y_call_incoming_decline_description">Rexeitar</string>
+  <string name="call_incoming_decline">Rexeitar</string>
+  <string name="a11y_call_incoming_answer_description">Responder</string>
+  <string name="call_incoming_answer">Responder</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/answermethod/res/values-gu/strings.xml b/java/com/android/incallui/answer/impl/answermethod/res/values-gu/strings.xml
index e261128..d95ff53 100644
--- a/java/com/android/incallui/answer/impl/answermethod/res/values-gu/strings.xml
+++ b/java/com/android/incallui/answer/impl/answermethod/res/values-gu/strings.xml
@@ -1,12 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_answer" msgid="2959042172304267183">"જવાબ આપવા માટે ઉપર સ્વાઇપ કરો"</string>
-    <string name="call_incoming_swipe_to_reject" msgid="463322705441386885">"નકારવા માટે નીચે સ્વાઇપ કરો"</string>
-    <string name="a11y_incoming_call_swipe_to_answer" msgid="6992663569851713736">"જવાબ આપવા માટે બે આંગળી વડે ઉપર અથવા કૉલ નકારવા માટે નીચે સ્વાઇપ કરો"</string>
-    <string name="call_incoming_will_disconnect" msgid="7095934149229485541">"આ કૉલનો જવાબ આપવાથી તમારો વિડિઓ કૉલ સમાપ્ત થઈ જશે"</string>
-    <string name="a11y_call_incoming_decline_description" msgid="4441041052558364987">"નકારો"</string>
-    <string name="call_incoming_decline" msgid="2982110738106661231">"નકારો"</string>
-    <string name="a11y_call_incoming_answer_description" msgid="1623200501347799736">"જવાબ આપો"</string>
-    <string name="call_incoming_answer" msgid="841798555883717852">"જવાબ આપો"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_answer">જવાબ આપવા માટે ઉપર સ્વાઇપ કરો</string>
+  <string name="call_incoming_swipe_to_reject">નકારવા માટે નીચે સ્વાઇપ કરો</string>
+  <string name="a11y_incoming_call_swipe_to_answer">જવાબ આપવા માટે બે આંગળી વડે ઉપર અથવા કૉલ નકારવા માટે નીચે સ્વાઇપ કરો</string>
+  <string name="call_incoming_will_disconnect">આ કૉલનો જવાબ આપવાથી તમારો વિડિઓ કૉલ સમાપ્ત થઈ જશે</string>
+  <string name="a11y_call_incoming_decline_description">નકારો</string>
+  <string name="call_incoming_decline">નકારો</string>
+  <string name="a11y_call_incoming_answer_description">જવાબ આપો</string>
+  <string name="call_incoming_answer">જવાબ આપો</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/answermethod/res/values-hi/strings.xml b/java/com/android/incallui/answer/impl/answermethod/res/values-hi/strings.xml
index c7cd67e..3198112 100644
--- a/java/com/android/incallui/answer/impl/answermethod/res/values-hi/strings.xml
+++ b/java/com/android/incallui/answer/impl/answermethod/res/values-hi/strings.xml
@@ -1,12 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_answer" msgid="2959042172304267183">"उत्तर देने के लिए ऊपर स्वाइप करें"</string>
-    <string name="call_incoming_swipe_to_reject" msgid="463322705441386885">"अस्वीकार करने के लिए नीचे स्वाइप करें"</string>
-    <string name="a11y_incoming_call_swipe_to_answer" msgid="6992663569851713736">"कॉल का उत्तर देने के लिए दो अंगुलियों से ऊपर या उसे अस्वीकार करने के लिए नीचे स्वाइप करें"</string>
-    <string name="call_incoming_will_disconnect" msgid="7095934149229485541">"इस कॉल का उत्तर देने से आपका वीडियो कॉल समाप्त हो जाएगा"</string>
-    <string name="a11y_call_incoming_decline_description" msgid="4441041052558364987">"अस्वीकार करें"</string>
-    <string name="call_incoming_decline" msgid="2982110738106661231">"अस्वीकार करें"</string>
-    <string name="a11y_call_incoming_answer_description" msgid="1623200501347799736">"उत्तर दें"</string>
-    <string name="call_incoming_answer" msgid="841798555883717852">"उत्तर दें"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_answer">उत्तर देने के लिए ऊपर स्वाइप करें</string>
+  <string name="call_incoming_swipe_to_reject">अस्वीकार करने के लिए नीचे स्वाइप करें</string>
+  <string name="a11y_incoming_call_swipe_to_answer">कॉल का उत्तर देने के लिए दो अंगुलियों से ऊपर या उसे अस्वीकार करने के लिए नीचे स्वाइप करें</string>
+  <string name="call_incoming_will_disconnect">इस कॉल का उत्तर देने से आपका वीडियो कॉल समाप्त हो जाएगा</string>
+  <string name="a11y_call_incoming_decline_description">अस्वीकार करें</string>
+  <string name="call_incoming_decline">अस्वीकार करें</string>
+  <string name="a11y_call_incoming_answer_description">उत्तर दें</string>
+  <string name="call_incoming_answer">उत्तर दें</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/answermethod/res/values-hr/strings.xml b/java/com/android/incallui/answer/impl/answermethod/res/values-hr/strings.xml
index 7208098..51996e8 100644
--- a/java/com/android/incallui/answer/impl/answermethod/res/values-hr/strings.xml
+++ b/java/com/android/incallui/answer/impl/answermethod/res/values-hr/strings.xml
@@ -1,12 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_answer" msgid="2959042172304267183">"Prijeđite prstom prema gore za odgovor"</string>
-    <string name="call_incoming_swipe_to_reject" msgid="463322705441386885">"Prijeđite prstom prema dolje za odbijanje"</string>
-    <string name="a11y_incoming_call_swipe_to_answer" msgid="6992663569851713736">"Prijeđite dvama prstima prema gore kako biste odgovorili na poziv ili prema dolje da biste odbacili poziv"</string>
-    <string name="call_incoming_will_disconnect" msgid="7095934149229485541">"Odgovorom na ovaj poziv prekinut ćete videopoziv"</string>
-    <string name="a11y_call_incoming_decline_description" msgid="4441041052558364987">"Odbij"</string>
-    <string name="call_incoming_decline" msgid="2982110738106661231">"Odbij"</string>
-    <string name="a11y_call_incoming_answer_description" msgid="1623200501347799736">"Odgovori"</string>
-    <string name="call_incoming_answer" msgid="841798555883717852">"Odgovori"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_answer">Prijeđite prstom prema gore za odgovor</string>
+  <string name="call_incoming_swipe_to_reject">Prijeđite prstom prema dolje za odbijanje</string>
+  <string name="a11y_incoming_call_swipe_to_answer">Prijeđite dvama prstima prema gore kako biste odgovorili na poziv ili prema dolje da biste odbacili poziv</string>
+  <string name="call_incoming_will_disconnect">Odgovorom na ovaj poziv prekinut ćete videopoziv</string>
+  <string name="a11y_call_incoming_decline_description">Odbij</string>
+  <string name="call_incoming_decline">Odbij</string>
+  <string name="a11y_call_incoming_answer_description">Odgovori</string>
+  <string name="call_incoming_answer">Odgovori</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/answermethod/res/values-hu/strings.xml b/java/com/android/incallui/answer/impl/answermethod/res/values-hu/strings.xml
index 66174d6..26ef0fc 100644
--- a/java/com/android/incallui/answer/impl/answermethod/res/values-hu/strings.xml
+++ b/java/com/android/incallui/answer/impl/answermethod/res/values-hu/strings.xml
@@ -1,12 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_answer" msgid="2959042172304267183">"Csúsztassa felfelé az ujját a hívás fogadásához"</string>
-    <string name="call_incoming_swipe_to_reject" msgid="463322705441386885">"Az elutasításhoz csúsztassa lefelé az ujját"</string>
-    <string name="a11y_incoming_call_swipe_to_answer" msgid="6992663569851713736">"Csúsztassa két ujját felfelé a hívás fogadásához és lefelé az elutasításhoz"</string>
-    <string name="call_incoming_will_disconnect" msgid="7095934149229485541">"Ha válaszol erre a hívásra, azzal megszakítja az aktuális videohívást."</string>
-    <string name="a11y_call_incoming_decline_description" msgid="4441041052558364987">"Elutasítás"</string>
-    <string name="call_incoming_decline" msgid="2982110738106661231">"Elutasítás"</string>
-    <string name="a11y_call_incoming_answer_description" msgid="1623200501347799736">"Hívás fogadása"</string>
-    <string name="call_incoming_answer" msgid="841798555883717852">"Hívás fogadása"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_answer">Csúsztassa felfelé az ujját a hívás fogadásához</string>
+  <string name="call_incoming_swipe_to_reject">Az elutasításhoz csúsztassa lefelé az ujját</string>
+  <string name="a11y_incoming_call_swipe_to_answer">Csúsztassa két ujját felfelé a hívás fogadásához és lefelé az elutasításhoz</string>
+  <string name="call_incoming_will_disconnect">Ha válaszol erre a hívásra, azzal megszakítja az aktuális videohívást.</string>
+  <string name="a11y_call_incoming_decline_description">Elutasítás</string>
+  <string name="call_incoming_decline">Elutasítás</string>
+  <string name="a11y_call_incoming_answer_description">Hívás fogadása</string>
+  <string name="call_incoming_answer">Hívás fogadása</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/answermethod/res/values-hy/strings.xml b/java/com/android/incallui/answer/impl/answermethod/res/values-hy/strings.xml
index 5597701..03ef149 100644
--- a/java/com/android/incallui/answer/impl/answermethod/res/values-hy/strings.xml
+++ b/java/com/android/incallui/answer/impl/answermethod/res/values-hy/strings.xml
@@ -1,12 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_answer" msgid="2959042172304267183">"Պատասխանելու համար սահեցրեք վերև"</string>
-    <string name="call_incoming_swipe_to_reject" msgid="463322705441386885">"Մերժելու համար սահեցրեք ներքև"</string>
-    <string name="a11y_incoming_call_swipe_to_answer" msgid="6992663569851713736">"Երկու մատը սահեցրեք վերև՝ զանգն ընդունելու համար, ներքև՝ մերժելու համար"</string>
-    <string name="call_incoming_will_disconnect" msgid="7095934149229485541">"Եթե պատասխանեք այս զանգին, տեսազանգը կընդհատվի"</string>
-    <string name="a11y_call_incoming_decline_description" msgid="4441041052558364987">"Մերժել"</string>
-    <string name="call_incoming_decline" msgid="2982110738106661231">"Մերժել"</string>
-    <string name="a11y_call_incoming_answer_description" msgid="1623200501347799736">"Պատասխանել"</string>
-    <string name="call_incoming_answer" msgid="841798555883717852">"Պատասխանել"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_answer">Պատասխանելու համար սահեցրեք վերև</string>
+  <string name="call_incoming_swipe_to_reject">Մերժելու համար սահեցրեք ներքև</string>
+  <string name="a11y_incoming_call_swipe_to_answer">Երկու մատը սահեցրեք վերև՝ զանգն ընդունելու համար, ներքև՝ մերժելու համար</string>
+  <string name="call_incoming_will_disconnect">Եթե պատասխանեք այս զանգին, տեսազանգը կընդհատվի</string>
+  <string name="a11y_call_incoming_decline_description">Մերժել</string>
+  <string name="call_incoming_decline">Մերժել</string>
+  <string name="a11y_call_incoming_answer_description">Պատասխանել</string>
+  <string name="call_incoming_answer">Պատասխանել</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/answermethod/res/values-in/strings.xml b/java/com/android/incallui/answer/impl/answermethod/res/values-in/strings.xml
index 66b451e..052fce3 100644
--- a/java/com/android/incallui/answer/impl/answermethod/res/values-in/strings.xml
+++ b/java/com/android/incallui/answer/impl/answermethod/res/values-in/strings.xml
@@ -1,12 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_answer" msgid="2959042172304267183">"Geser ke atas untuk menjawab"</string>
-    <string name="call_incoming_swipe_to_reject" msgid="463322705441386885">"Geser ke bawah untuk menolak"</string>
-    <string name="a11y_incoming_call_swipe_to_answer" msgid="6992663569851713736">"Geser ke atas dengan dua jari untuk menjawab atau geser ke bawah untuk menolak panggilan"</string>
-    <string name="call_incoming_will_disconnect" msgid="7095934149229485541">"Menjawab panggilan ini akan mengakhiri video call"</string>
-    <string name="a11y_call_incoming_decline_description" msgid="4441041052558364987">"Tolak"</string>
-    <string name="call_incoming_decline" msgid="2982110738106661231">"Tolak"</string>
-    <string name="a11y_call_incoming_answer_description" msgid="1623200501347799736">"Jawab"</string>
-    <string name="call_incoming_answer" msgid="841798555883717852">"Jawab"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_answer">Geser ke atas untuk menjawab</string>
+  <string name="call_incoming_swipe_to_reject">Geser ke bawah untuk menolak</string>
+  <string name="a11y_incoming_call_swipe_to_answer">Geser ke atas dengan dua jari untuk menjawab atau geser ke bawah untuk menolak panggilan</string>
+  <string name="call_incoming_will_disconnect">Menjawab panggilan ini akan mengakhiri video call</string>
+  <string name="a11y_call_incoming_decline_description">Tolak</string>
+  <string name="call_incoming_decline">Tolak</string>
+  <string name="a11y_call_incoming_answer_description">Jawab</string>
+  <string name="call_incoming_answer">Jawab</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/answermethod/res/values-is/strings.xml b/java/com/android/incallui/answer/impl/answermethod/res/values-is/strings.xml
index 1f4e1ea..c4d05f2 100644
--- a/java/com/android/incallui/answer/impl/answermethod/res/values-is/strings.xml
+++ b/java/com/android/incallui/answer/impl/answermethod/res/values-is/strings.xml
@@ -1,12 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_answer" msgid="2959042172304267183">"Strjúktu upp til að svara"</string>
-    <string name="call_incoming_swipe_to_reject" msgid="463322705441386885">"Strjúktu niður til að hafna"</string>
-    <string name="a11y_incoming_call_swipe_to_answer" msgid="6992663569851713736">"Strjúktu upp með tveimur fingrum til að svara eða niður til að hafna símtalinu"</string>
-    <string name="call_incoming_will_disconnect" msgid="7095934149229485541">"Ef þessu símtali er svarað lýkur myndsímtalinu"</string>
-    <string name="a11y_call_incoming_decline_description" msgid="4441041052558364987">"Hafna"</string>
-    <string name="call_incoming_decline" msgid="2982110738106661231">"Hafna"</string>
-    <string name="a11y_call_incoming_answer_description" msgid="1623200501347799736">"Svara"</string>
-    <string name="call_incoming_answer" msgid="841798555883717852">"Svara"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_answer">Strjúktu upp til að svara</string>
+  <string name="call_incoming_swipe_to_reject">Strjúktu niður til að hafna</string>
+  <string name="a11y_incoming_call_swipe_to_answer">Strjúktu upp með tveimur fingrum til að svara eða niður til að hafna símtalinu</string>
+  <string name="call_incoming_will_disconnect">Ef þessu símtali er svarað lýkur myndsímtalinu</string>
+  <string name="a11y_call_incoming_decline_description">Hafna</string>
+  <string name="call_incoming_decline">Hafna</string>
+  <string name="a11y_call_incoming_answer_description">Svara</string>
+  <string name="call_incoming_answer">Svara</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/answermethod/res/values-it/strings.xml b/java/com/android/incallui/answer/impl/answermethod/res/values-it/strings.xml
index 7104832..91c82ff 100644
--- a/java/com/android/incallui/answer/impl/answermethod/res/values-it/strings.xml
+++ b/java/com/android/incallui/answer/impl/answermethod/res/values-it/strings.xml
@@ -1,12 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_answer" msgid="2959042172304267183">"Fai scorrere verso l\'alto per rispondere"</string>
-    <string name="call_incoming_swipe_to_reject" msgid="463322705441386885">"Fai scorrere verso il basso per rifiutare"</string>
-    <string name="a11y_incoming_call_swipe_to_answer" msgid="6992663569851713736">"Fai scorrere due dita verso l\'alto per rispondere alla chiamata o verso il basso per rifiutarla"</string>
-    <string name="call_incoming_will_disconnect" msgid="7095934149229485541">"Se rispondi a questa chiamata, la videochiamata verrà terminata"</string>
-    <string name="a11y_call_incoming_decline_description" msgid="4441041052558364987">"Rifiuta"</string>
-    <string name="call_incoming_decline" msgid="2982110738106661231">"Rifiuta"</string>
-    <string name="a11y_call_incoming_answer_description" msgid="1623200501347799736">"Rispondi"</string>
-    <string name="call_incoming_answer" msgid="841798555883717852">"Rispondi"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_answer">Fai scorrere verso l\'alto per rispondere</string>
+  <string name="call_incoming_swipe_to_reject">Fai scorrere verso il basso per rifiutare</string>
+  <string name="a11y_incoming_call_swipe_to_answer">Fai scorrere due dita verso l\'alto per rispondere alla chiamata o verso il basso per rifiutarla</string>
+  <string name="call_incoming_will_disconnect">Se rispondi a questa chiamata, la videochiamata verrà terminata</string>
+  <string name="a11y_call_incoming_decline_description">Rifiuta</string>
+  <string name="call_incoming_decline">Rifiuta</string>
+  <string name="a11y_call_incoming_answer_description">Rispondi</string>
+  <string name="call_incoming_answer">Rispondi</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/answermethod/res/values-iw/strings.xml b/java/com/android/incallui/answer/impl/answermethod/res/values-iw/strings.xml
index 0f34ade..df9946b 100644
--- a/java/com/android/incallui/answer/impl/answermethod/res/values-iw/strings.xml
+++ b/java/com/android/incallui/answer/impl/answermethod/res/values-iw/strings.xml
@@ -1,12 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_answer" msgid="2959042172304267183">"החלק למעלה כדי לענות"</string>
-    <string name="call_incoming_swipe_to_reject" msgid="463322705441386885">"החלק למטה כדי לדחות"</string>
-    <string name="a11y_incoming_call_swipe_to_answer" msgid="6992663569851713736">"החלק למעלה עם שתי אצבעות כדי לענות לשיחה או למטה כדי לדחות אותה"</string>
-    <string name="call_incoming_will_disconnect" msgid="7095934149229485541">"מענה לשיחה הזו יסיים את שיחת הווידאו"</string>
-    <string name="a11y_call_incoming_decline_description" msgid="4441041052558364987">"דחה"</string>
-    <string name="call_incoming_decline" msgid="2982110738106661231">"דחה"</string>
-    <string name="a11y_call_incoming_answer_description" msgid="1623200501347799736">"ענה"</string>
-    <string name="call_incoming_answer" msgid="841798555883717852">"ענה"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_answer">החלק למעלה כדי לענות</string>
+  <string name="call_incoming_swipe_to_reject">החלק למטה כדי לדחות</string>
+  <string name="a11y_incoming_call_swipe_to_answer">החלק למעלה עם שתי אצבעות כדי לענות לשיחה או למטה כדי לדחות אותה</string>
+  <string name="call_incoming_will_disconnect">מענה לשיחה הזו יסיים את שיחת הווידאו</string>
+  <string name="a11y_call_incoming_decline_description">דחה</string>
+  <string name="call_incoming_decline">דחה</string>
+  <string name="a11y_call_incoming_answer_description">ענה</string>
+  <string name="call_incoming_answer">ענה</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/answermethod/res/values-ja/strings.xml b/java/com/android/incallui/answer/impl/answermethod/res/values-ja/strings.xml
index 6693ccb..809cdeb 100644
--- a/java/com/android/incallui/answer/impl/answermethod/res/values-ja/strings.xml
+++ b/java/com/android/incallui/answer/impl/answermethod/res/values-ja/strings.xml
@@ -1,12 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_answer" msgid="2959042172304267183">"上にスワイプして応答"</string>
-    <string name="call_incoming_swipe_to_reject" msgid="463322705441386885">"下にスワイプして拒否"</string>
-    <string name="a11y_incoming_call_swipe_to_answer" msgid="6992663569851713736">"着信に応答するには上方向、着信を拒否するには下方向に 2 本の指でスワイプ"</string>
-    <string name="call_incoming_will_disconnect" msgid="7095934149229485541">"着信に応答するとビデオハングアウトは終了します"</string>
-    <string name="a11y_call_incoming_decline_description" msgid="4441041052558364987">"拒否"</string>
-    <string name="call_incoming_decline" msgid="2982110738106661231">"拒否"</string>
-    <string name="a11y_call_incoming_answer_description" msgid="1623200501347799736">"応答"</string>
-    <string name="call_incoming_answer" msgid="841798555883717852">"応答"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_answer">上にスワイプして応答</string>
+  <string name="call_incoming_swipe_to_reject">下にスワイプして拒否</string>
+  <string name="a11y_incoming_call_swipe_to_answer">着信に応答するには上方向、着信を拒否するには下方向に 2 本の指でスワイプ</string>
+  <string name="call_incoming_will_disconnect">着信に応答するとビデオハングアウトは終了します</string>
+  <string name="a11y_call_incoming_decline_description">拒否</string>
+  <string name="call_incoming_decline">拒否</string>
+  <string name="a11y_call_incoming_answer_description">応答</string>
+  <string name="call_incoming_answer">応答</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/answermethod/res/values-ka/strings.xml b/java/com/android/incallui/answer/impl/answermethod/res/values-ka/strings.xml
index ce17660..498dfa2 100644
--- a/java/com/android/incallui/answer/impl/answermethod/res/values-ka/strings.xml
+++ b/java/com/android/incallui/answer/impl/answermethod/res/values-ka/strings.xml
@@ -1,12 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_answer" msgid="2959042172304267183">"გადაფურცლეთ ზემოთ საპასუხოდ"</string>
-    <string name="call_incoming_swipe_to_reject" msgid="463322705441386885">"უარყოფისთვის გადაფურცლეთ ქვემოთ"</string>
-    <string name="a11y_incoming_call_swipe_to_answer" msgid="6992663569851713736">"პასუხის გასაცემად გადაფურცლეთ ზემოთ ორი თითით, ან ქვემოთ — ზარის უარყოფისთვის"</string>
-    <string name="call_incoming_will_disconnect" msgid="7095934149229485541">"ამ ზარზე პასუხი თქვენს ვიდეოზარს დაასრულებს"</string>
-    <string name="a11y_call_incoming_decline_description" msgid="4441041052558364987">"უარყოფა"</string>
-    <string name="call_incoming_decline" msgid="2982110738106661231">"უარყოფა"</string>
-    <string name="a11y_call_incoming_answer_description" msgid="1623200501347799736">"პასუხი"</string>
-    <string name="call_incoming_answer" msgid="841798555883717852">"პასუხი"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_answer">გადაფურცლეთ ზემოთ საპასუხოდ</string>
+  <string name="call_incoming_swipe_to_reject">უარყოფისთვის გადაფურცლეთ ქვემოთ</string>
+  <string name="a11y_incoming_call_swipe_to_answer">პასუხის გასაცემად გადაფურცლეთ ზემოთ ორი თითით, ან ქვემოთ — ზარის უარყოფისთვის</string>
+  <string name="call_incoming_will_disconnect">ამ ზარზე პასუხი თქვენს ვიდეოზარს დაასრულებს</string>
+  <string name="a11y_call_incoming_decline_description">უარყოფა</string>
+  <string name="call_incoming_decline">უარყოფა</string>
+  <string name="a11y_call_incoming_answer_description">პასუხი</string>
+  <string name="call_incoming_answer">პასუხი</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/answermethod/res/values-kk/strings.xml b/java/com/android/incallui/answer/impl/answermethod/res/values-kk/strings.xml
index 14785b3..7cc870f 100644
--- a/java/com/android/incallui/answer/impl/answermethod/res/values-kk/strings.xml
+++ b/java/com/android/incallui/answer/impl/answermethod/res/values-kk/strings.xml
@@ -1,12 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_answer" msgid="2959042172304267183">"Жауап беру үшін жоғары сырғытыңыз"</string>
-    <string name="call_incoming_swipe_to_reject" msgid="463322705441386885">"Қабылдамау үшін төмен сырғытыңыз"</string>
-    <string name="a11y_incoming_call_swipe_to_answer" msgid="6992663569851713736">"Қоңырауға жауап беру үшін екі саусақпен жоғары, ал қабылдамау үшін төмен сырғытыңыз"</string>
-    <string name="call_incoming_will_disconnect" msgid="7095934149229485541">"Бұл қоңырауға жауап беру бейне қоңырауыңызды аяқтайды"</string>
-    <string name="a11y_call_incoming_decline_description" msgid="4441041052558364987">"Қабылдамау"</string>
-    <string name="call_incoming_decline" msgid="2982110738106661231">"Қабылдамау"</string>
-    <string name="a11y_call_incoming_answer_description" msgid="1623200501347799736">"Жауап беру"</string>
-    <string name="call_incoming_answer" msgid="841798555883717852">"Жауап беру"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_answer">Жауап беру үшін жоғары сырғытыңыз</string>
+  <string name="call_incoming_swipe_to_reject">Қабылдамау үшін төмен сырғытыңыз</string>
+  <string name="a11y_incoming_call_swipe_to_answer">Қоңырауға жауап беру үшін екі саусақпен жоғары, ал қабылдамау үшін төмен сырғытыңыз</string>
+  <string name="call_incoming_will_disconnect">Бұл қоңырауға жауап беру бейне қоңырауыңызды аяқтайды</string>
+  <string name="a11y_call_incoming_decline_description">Қабылдамау</string>
+  <string name="call_incoming_decline">Қабылдамау</string>
+  <string name="a11y_call_incoming_answer_description">Жауап беру</string>
+  <string name="call_incoming_answer">Жауап беру</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/answermethod/res/values-km/strings.xml b/java/com/android/incallui/answer/impl/answermethod/res/values-km/strings.xml
index 798790f..44f6a83 100644
--- a/java/com/android/incallui/answer/impl/answermethod/res/values-km/strings.xml
+++ b/java/com/android/incallui/answer/impl/answermethod/res/values-km/strings.xml
@@ -1,12 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_answer" msgid="2959042172304267183">"អូស​ឡើង​លើ​ដើម្បី​ឆ្លើយ"</string>
-    <string name="call_incoming_swipe_to_reject" msgid="463322705441386885">"អូសចុះក្រោមដើម្បីបដិសេធ"</string>
-    <string name="a11y_incoming_call_swipe_to_answer" msgid="6992663569851713736">"អូស​ឡើងលើ​​ដោយ​ប្រើ​​ម្រាម​ដៃ​ពីរ​ដើម្បី​ឆ្លើយ ឬ​អូស​ចុះ​ក្រោម​ដើម្បី​បដិសេធ​ការ​ហៅ"</string>
-    <string name="call_incoming_will_disconnect" msgid="7095934149229485541">"ការ​ឆ្លើយ​ការ​ហៅ​នេះ​នឹង​បញ្ចប់​ការ​ហៅ​ជា​វីដេអូ​របស់​អ្នក"</string>
-    <string name="a11y_call_incoming_decline_description" msgid="4441041052558364987">"បដិសេធ"</string>
-    <string name="call_incoming_decline" msgid="2982110738106661231">"បដិសេធ"</string>
-    <string name="a11y_call_incoming_answer_description" msgid="1623200501347799736">"ឆ្លើយ"</string>
-    <string name="call_incoming_answer" msgid="841798555883717852">"ឆ្លើយ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_answer">អូស​ឡើង​លើ​ដើម្បី​ឆ្លើយ</string>
+  <string name="call_incoming_swipe_to_reject">អូសចុះក្រោមដើម្បីបដិសេធ</string>
+  <string name="a11y_incoming_call_swipe_to_answer">អូស​ឡើងលើ​​ដោយ​ប្រើ​​ម្រាម​ដៃ​ពីរ​ដើម្បី​ឆ្លើយ ឬ​អូស​ចុះ​ក្រោម​ដើម្បី​បដិសេធ​ការ​ហៅ</string>
+  <string name="call_incoming_will_disconnect">ការ​ឆ្លើយ​ការ​ហៅ​នេះ​នឹង​បញ្ចប់​ការ​ហៅ​ជា​វីដេអូ​របស់​អ្នក</string>
+  <string name="a11y_call_incoming_decline_description">បដិសេធ</string>
+  <string name="call_incoming_decline">បដិសេធ</string>
+  <string name="a11y_call_incoming_answer_description">ឆ្លើយ</string>
+  <string name="call_incoming_answer">ឆ្លើយ</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/answermethod/res/values-kn/strings.xml b/java/com/android/incallui/answer/impl/answermethod/res/values-kn/strings.xml
index fdb5b78..11da547 100644
--- a/java/com/android/incallui/answer/impl/answermethod/res/values-kn/strings.xml
+++ b/java/com/android/incallui/answer/impl/answermethod/res/values-kn/strings.xml
@@ -1,12 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_answer" msgid="2959042172304267183">"ಉತ್ತರಿಸಲು ಮೇಲಕ್ಕೆ ಸ್ವೈಪ್ ಮಾಡಿ"</string>
-    <string name="call_incoming_swipe_to_reject" msgid="463322705441386885">"ತಿರಸ್ಕರಿಸಲು ಕೆಳಕ್ಕೆ ಸ್ವೈಪ್ ಮಾಡಿ"</string>
-    <string name="a11y_incoming_call_swipe_to_answer" msgid="6992663569851713736">"ಕರೆಗೆ ಉತ್ತರಿಸಲು ಎರಡು ಬೆರಳುಗಳಿಂದ ಮೇಲಕ್ಕೆ ಸ್ವೈಪ್ ಮಾಡಿ ಅಥವಾ ತಿರಸ್ಕರಿಸಲು ಕೆಳಗೆ ಸ್ವೈಪ್ ಮಾಡಿ"</string>
-    <string name="call_incoming_will_disconnect" msgid="7095934149229485541">"ಈ ಕರೆಗೆ ಉತ್ತರಿಸುವುದರಿಂದ ನಿಮ್ಮ ವೀಡಿಯೊ ಕರೆಯು ಅಂತ್ಯಗೊಳ್ಳುತ್ತದೆ"</string>
-    <string name="a11y_call_incoming_decline_description" msgid="4441041052558364987">"ನಿರಾಕರಿಸಿ"</string>
-    <string name="call_incoming_decline" msgid="2982110738106661231">"ನಿರಾಕರಿಸಿ"</string>
-    <string name="a11y_call_incoming_answer_description" msgid="1623200501347799736">"ಉತ್ತರ"</string>
-    <string name="call_incoming_answer" msgid="841798555883717852">"ಉತ್ತರ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_answer">ಉತ್ತರಿಸಲು ಮೇಲಕ್ಕೆ ಸ್ವೈಪ್ ಮಾಡಿ</string>
+  <string name="call_incoming_swipe_to_reject">ತಿರಸ್ಕರಿಸಲು ಕೆಳಕ್ಕೆ ಸ್ವೈಪ್ ಮಾಡಿ</string>
+  <string name="a11y_incoming_call_swipe_to_answer">ಕರೆಗೆ ಉತ್ತರಿಸಲು ಎರಡು ಬೆರಳುಗಳಿಂದ ಮೇಲಕ್ಕೆ ಸ್ವೈಪ್ ಮಾಡಿ ಅಥವಾ ತಿರಸ್ಕರಿಸಲು ಕೆಳಗೆ ಸ್ವೈಪ್ ಮಾಡಿ</string>
+  <string name="call_incoming_will_disconnect">ಈ ಕರೆಗೆ ಉತ್ತರಿಸುವುದರಿಂದ ನಿಮ್ಮ ವೀಡಿಯೊ ಕರೆಯು ಅಂತ್ಯಗೊಳ್ಳುತ್ತದೆ</string>
+  <string name="a11y_call_incoming_decline_description">ನಿರಾಕರಿಸಿ</string>
+  <string name="call_incoming_decline">ನಿರಾಕರಿಸಿ</string>
+  <string name="a11y_call_incoming_answer_description">ಉತ್ತರ</string>
+  <string name="call_incoming_answer">ಉತ್ತರ</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/answermethod/res/values-ko/strings.xml b/java/com/android/incallui/answer/impl/answermethod/res/values-ko/strings.xml
index 1593702..ef16b9b 100644
--- a/java/com/android/incallui/answer/impl/answermethod/res/values-ko/strings.xml
+++ b/java/com/android/incallui/answer/impl/answermethod/res/values-ko/strings.xml
@@ -1,12 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_answer" msgid="2959042172304267183">"받으려면 위로 스와이프하세요."</string>
-    <string name="call_incoming_swipe_to_reject" msgid="463322705441386885">"거부하려면 아래로 스와이프하세요."</string>
-    <string name="a11y_incoming_call_swipe_to_answer" msgid="6992663569851713736">"전화를 받으려면 두 손가락을 사용하여 위로 스와이프하고 거부하려면 아래로 스와이프하세요."</string>
-    <string name="call_incoming_will_disconnect" msgid="7095934149229485541">"이 전화를 받으면 화상 통화가 종료됩니다."</string>
-    <string name="a11y_call_incoming_decline_description" msgid="4441041052558364987">"거부"</string>
-    <string name="call_incoming_decline" msgid="2982110738106661231">"거부"</string>
-    <string name="a11y_call_incoming_answer_description" msgid="1623200501347799736">"통화"</string>
-    <string name="call_incoming_answer" msgid="841798555883717852">"통화"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_answer">받으려면 위로 스와이프하세요.</string>
+  <string name="call_incoming_swipe_to_reject">거부하려면 아래로 스와이프하세요.</string>
+  <string name="a11y_incoming_call_swipe_to_answer">전화를 받으려면 두 손가락을 사용하여 위로 스와이프하고 거부하려면 아래로 스와이프하세요.</string>
+  <string name="call_incoming_will_disconnect">이 전화를 받으면 화상 통화가 종료됩니다.</string>
+  <string name="a11y_call_incoming_decline_description">거부</string>
+  <string name="call_incoming_decline">거부</string>
+  <string name="a11y_call_incoming_answer_description">통화</string>
+  <string name="call_incoming_answer">통화</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/answermethod/res/values-ky/strings.xml b/java/com/android/incallui/answer/impl/answermethod/res/values-ky/strings.xml
index 519b5f9..815c6f7 100644
--- a/java/com/android/incallui/answer/impl/answermethod/res/values-ky/strings.xml
+++ b/java/com/android/incallui/answer/impl/answermethod/res/values-ky/strings.xml
@@ -1,12 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_answer" msgid="2959042172304267183">"Жооп берүү үчүн экранды сүрүп коюңуз"</string>
-    <string name="call_incoming_swipe_to_reject" msgid="463322705441386885">"Жооп бергиңиз келбесе ылдый сүрүп коюңуз"</string>
-    <string name="a11y_incoming_call_swipe_to_answer" msgid="6992663569851713736">"Чалууга жооп берүү үчүн эки манжа менен өйдө сүрүңүз же жооп бергиңиз келбесе ылдый сүрүңүз"</string>
-    <string name="call_incoming_will_disconnect" msgid="7095934149229485541">"Бул чалууга жооп берсеңиз, видео чалууңуз бүтүп калат"</string>
-    <string name="a11y_call_incoming_decline_description" msgid="4441041052558364987">"Баш тартуу"</string>
-    <string name="call_incoming_decline" msgid="2982110738106661231">"Баш тартуу"</string>
-    <string name="a11y_call_incoming_answer_description" msgid="1623200501347799736">"Жооп берүү"</string>
-    <string name="call_incoming_answer" msgid="841798555883717852">"Жооп берүү"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_answer">Жооп берүү үчүн экранды сүрүп коюңуз</string>
+  <string name="call_incoming_swipe_to_reject">Жооп бергиңиз келбесе ылдый сүрүп коюңуз</string>
+  <string name="a11y_incoming_call_swipe_to_answer">Чалууга жооп берүү үчүн эки манжа менен өйдө сүрүңүз же жооп бергиңиз келбесе ылдый сүрүңүз</string>
+  <string name="call_incoming_will_disconnect">Бул чалууга жооп берсеңиз, видео чалууңуз бүтүп калат</string>
+  <string name="a11y_call_incoming_decline_description">Баш тартуу</string>
+  <string name="call_incoming_decline">Баш тартуу</string>
+  <string name="a11y_call_incoming_answer_description">Жооп берүү</string>
+  <string name="call_incoming_answer">Жооп берүү</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/answermethod/res/values-lo/strings.xml b/java/com/android/incallui/answer/impl/answermethod/res/values-lo/strings.xml
index 3e5b111..c10e12e 100644
--- a/java/com/android/incallui/answer/impl/answermethod/res/values-lo/strings.xml
+++ b/java/com/android/incallui/answer/impl/answermethod/res/values-lo/strings.xml
@@ -1,12 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_answer" msgid="2959042172304267183">"ປັດອອກຂ້າງເພື່ອຮັບສາຍ"</string>
-    <string name="call_incoming_swipe_to_reject" msgid="463322705441386885">"ປັດລົງເພື່ອປະຕິເສດ"</string>
-    <string name="a11y_incoming_call_swipe_to_answer" msgid="6992663569851713736">"ປັດຂຶ້ນດ້ວຍສອງນິ້ວເພື່ອຮັບສາຍ ຫຼື ປັດລົງເພື່ອປະຕິເສດສາຍ"</string>
-    <string name="call_incoming_will_disconnect" msgid="7095934149229485541">"ການຮັບສາຍນີ້ຈະເປັນການສິ້ນສຸດການໂທວິດີໂອຂອງທ່ານ"</string>
-    <string name="a11y_call_incoming_decline_description" msgid="4441041052558364987">"ປະຕິເສດ"</string>
-    <string name="call_incoming_decline" msgid="2982110738106661231">"ປະຕິເສດ"</string>
-    <string name="a11y_call_incoming_answer_description" msgid="1623200501347799736">"ຮັບສາຍ"</string>
-    <string name="call_incoming_answer" msgid="841798555883717852">"ຮັບສາຍ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_answer">ປັດອອກຂ້າງເພື່ອຮັບສາຍ</string>
+  <string name="call_incoming_swipe_to_reject">ປັດລົງເພື່ອປະຕິເສດ</string>
+  <string name="a11y_incoming_call_swipe_to_answer">ປັດຂຶ້ນດ້ວຍສອງນິ້ວເພື່ອຮັບສາຍ ຫຼື ປັດລົງເພື່ອປະຕິເສດສາຍ</string>
+  <string name="call_incoming_will_disconnect">ການຮັບສາຍນີ້ຈະເປັນການສິ້ນສຸດການໂທວິດີໂອຂອງທ່ານ</string>
+  <string name="a11y_call_incoming_decline_description">ປະຕິເສດ</string>
+  <string name="call_incoming_decline">ປະຕິເສດ</string>
+  <string name="a11y_call_incoming_answer_description">ຮັບສາຍ</string>
+  <string name="call_incoming_answer">ຮັບສາຍ</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/answermethod/res/values-lt/strings.xml b/java/com/android/incallui/answer/impl/answermethod/res/values-lt/strings.xml
index 8807096..b2ff871 100644
--- a/java/com/android/incallui/answer/impl/answermethod/res/values-lt/strings.xml
+++ b/java/com/android/incallui/answer/impl/answermethod/res/values-lt/strings.xml
@@ -1,12 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_answer" msgid="2959042172304267183">"Perbraukite, kad atsakytumėte"</string>
-    <string name="call_incoming_swipe_to_reject" msgid="463322705441386885">"Perbraukite žemyn, kad atmestumėte"</string>
-    <string name="a11y_incoming_call_swipe_to_answer" msgid="6992663569851713736">"Perbraukite dviem pirštais aukštyn, kad atsilieptumėte, arba žemyn, kad atmestumėte skambutį"</string>
-    <string name="call_incoming_will_disconnect" msgid="7095934149229485541">"Atsakius į šį skambutį, vaizdo skambutis bus baigtas"</string>
-    <string name="a11y_call_incoming_decline_description" msgid="4441041052558364987">"Atmesti"</string>
-    <string name="call_incoming_decline" msgid="2982110738106661231">"Atmesti"</string>
-    <string name="a11y_call_incoming_answer_description" msgid="1623200501347799736">"Atsakyti"</string>
-    <string name="call_incoming_answer" msgid="841798555883717852">"Atsakyti"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_answer">Perbraukite, kad atsakytumėte</string>
+  <string name="call_incoming_swipe_to_reject">Perbraukite žemyn, kad atmestumėte</string>
+  <string name="a11y_incoming_call_swipe_to_answer">Perbraukite dviem pirštais aukštyn, kad atsilieptumėte, arba žemyn, kad atmestumėte skambutį</string>
+  <string name="call_incoming_will_disconnect">Atsakius į šį skambutį, vaizdo skambutis bus baigtas</string>
+  <string name="a11y_call_incoming_decline_description">Atmesti</string>
+  <string name="call_incoming_decline">Atmesti</string>
+  <string name="a11y_call_incoming_answer_description">Atsakyti</string>
+  <string name="call_incoming_answer">Atsakyti</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/answermethod/res/values-lv/strings.xml b/java/com/android/incallui/answer/impl/answermethod/res/values-lv/strings.xml
index 5e53ad8..6aaa043 100644
--- a/java/com/android/incallui/answer/impl/answermethod/res/values-lv/strings.xml
+++ b/java/com/android/incallui/answer/impl/answermethod/res/values-lv/strings.xml
@@ -1,12 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_answer" msgid="2959042172304267183">"Velciet augšup, lai atbildētu"</string>
-    <string name="call_incoming_swipe_to_reject" msgid="463322705441386885">"Velciet lejup, lai noraidītu"</string>
-    <string name="a11y_incoming_call_swipe_to_answer" msgid="6992663569851713736">"Velciet augšup ar diviem pirkstiem, lai atbildētu uz zvanu, vai velciet lejup, lai noraidītu zvanu."</string>
-    <string name="call_incoming_will_disconnect" msgid="7095934149229485541">"Atbildot uz šo zvanu, tiks beigts videozvans."</string>
-    <string name="a11y_call_incoming_decline_description" msgid="4441041052558364987">"Noraidīt"</string>
-    <string name="call_incoming_decline" msgid="2982110738106661231">"Noraidīt"</string>
-    <string name="a11y_call_incoming_answer_description" msgid="1623200501347799736">"Atbildēt"</string>
-    <string name="call_incoming_answer" msgid="841798555883717852">"Atbildēt"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_answer">Velciet augšup, lai atbildētu</string>
+  <string name="call_incoming_swipe_to_reject">Velciet lejup, lai noraidītu</string>
+  <string name="a11y_incoming_call_swipe_to_answer">Velciet augšup ar diviem pirkstiem, lai atbildētu uz zvanu, vai velciet lejup, lai noraidītu zvanu.</string>
+  <string name="call_incoming_will_disconnect">Atbildot uz šo zvanu, tiks beigts videozvans.</string>
+  <string name="a11y_call_incoming_decline_description">Noraidīt</string>
+  <string name="call_incoming_decline">Noraidīt</string>
+  <string name="a11y_call_incoming_answer_description">Atbildēt</string>
+  <string name="call_incoming_answer">Atbildēt</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/answermethod/res/values-mk/strings.xml b/java/com/android/incallui/answer/impl/answermethod/res/values-mk/strings.xml
index 3312b91..aa5c67b 100644
--- a/java/com/android/incallui/answer/impl/answermethod/res/values-mk/strings.xml
+++ b/java/com/android/incallui/answer/impl/answermethod/res/values-mk/strings.xml
@@ -1,12 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_answer" msgid="2959042172304267183">"Повлечете нагоре за да одговорите"</string>
-    <string name="call_incoming_swipe_to_reject" msgid="463322705441386885">"Повлечете надолу за да отфрлите"</string>
-    <string name="a11y_incoming_call_swipe_to_answer" msgid="6992663569851713736">"Повлечете нагоре со два прста за да одговорите или надолу за да го одбиете повикот"</string>
-    <string name="call_incoming_will_disconnect" msgid="7095934149229485541">"Ако одговорите на повиков, ќе се прекине вашиот видеоповик"</string>
-    <string name="a11y_call_incoming_decline_description" msgid="4441041052558364987">"Одбиј"</string>
-    <string name="call_incoming_decline" msgid="2982110738106661231">"Одбиј"</string>
-    <string name="a11y_call_incoming_answer_description" msgid="1623200501347799736">"Одговори"</string>
-    <string name="call_incoming_answer" msgid="841798555883717852">"Одговори"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_answer">Повлечете нагоре за да одговорите</string>
+  <string name="call_incoming_swipe_to_reject">Повлечете надолу за да отфрлите</string>
+  <string name="a11y_incoming_call_swipe_to_answer">Повлечете нагоре со два прста за да одговорите или надолу за да го одбиете повикот</string>
+  <string name="call_incoming_will_disconnect">Ако одговорите на повиков, ќе се прекине вашиот видеоповик</string>
+  <string name="a11y_call_incoming_decline_description">Одбиј</string>
+  <string name="call_incoming_decline">Одбиј</string>
+  <string name="a11y_call_incoming_answer_description">Одговори</string>
+  <string name="call_incoming_answer">Одговори</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/answermethod/res/values-ml/strings.xml b/java/com/android/incallui/answer/impl/answermethod/res/values-ml/strings.xml
index fe2873d..caae614 100644
--- a/java/com/android/incallui/answer/impl/answermethod/res/values-ml/strings.xml
+++ b/java/com/android/incallui/answer/impl/answermethod/res/values-ml/strings.xml
@@ -1,12 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_answer" msgid="2959042172304267183">"മറുപടി നൽകാൻ മുകളിലേക്ക് സ്വൈപ്പുചെയ്യുക"</string>
-    <string name="call_incoming_swipe_to_reject" msgid="463322705441386885">"നിരസിക്കാൻ താഴേക്ക് സ്വൈപ്പുചെയ്യുക"</string>
-    <string name="a11y_incoming_call_swipe_to_answer" msgid="6992663569851713736">"കോൾ സ്വീകരിക്കാൻ രണ്ടുവിരലുകൾ ഉപയോഗിച്ച് മുകളിലേക്കും നിരസിക്കാൻ താഴേക്കും സ്വൈപ്പുചെയ്യുക"</string>
-    <string name="call_incoming_will_disconnect" msgid="7095934149229485541">"ഈ കോൾ സ്വീകരിക്കുന്നത് നിങ്ങളുടെ വീഡിയോ കോൾ അവസാനിക്കാനിടയാക്കും"</string>
-    <string name="a11y_call_incoming_decline_description" msgid="4441041052558364987">"നിരസിക്കുക"</string>
-    <string name="call_incoming_decline" msgid="2982110738106661231">"നിരസിക്കുക"</string>
-    <string name="a11y_call_incoming_answer_description" msgid="1623200501347799736">"മറുപടി നൽകുക"</string>
-    <string name="call_incoming_answer" msgid="841798555883717852">"മറുപടി നൽകുക"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_answer">മറുപടി നൽകാൻ മുകളിലേക്ക് സ്വൈപ്പുചെയ്യുക</string>
+  <string name="call_incoming_swipe_to_reject">നിരസിക്കാൻ താഴേക്ക് സ്വൈപ്പുചെയ്യുക</string>
+  <string name="a11y_incoming_call_swipe_to_answer">കോൾ സ്വീകരിക്കാൻ രണ്ടുവിരലുകൾ ഉപയോഗിച്ച് മുകളിലേക്കും നിരസിക്കാൻ താഴേക്കും സ്വൈപ്പുചെയ്യുക</string>
+  <string name="call_incoming_will_disconnect">ഈ കോൾ സ്വീകരിക്കുന്നത് നിങ്ങളുടെ വീഡിയോ കോൾ അവസാനിക്കാനിടയാക്കും</string>
+  <string name="a11y_call_incoming_decline_description">നിരസിക്കുക</string>
+  <string name="call_incoming_decline">നിരസിക്കുക</string>
+  <string name="a11y_call_incoming_answer_description">മറുപടി നൽകുക</string>
+  <string name="call_incoming_answer">മറുപടി നൽകുക</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/answermethod/res/values-mn/strings.xml b/java/com/android/incallui/answer/impl/answermethod/res/values-mn/strings.xml
index eca44f4..f76b1e1 100644
--- a/java/com/android/incallui/answer/impl/answermethod/res/values-mn/strings.xml
+++ b/java/com/android/incallui/answer/impl/answermethod/res/values-mn/strings.xml
@@ -1,12 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_answer" msgid="2959042172304267183">"Хариулах бол дээш шударна уу"</string>
-    <string name="call_incoming_swipe_to_reject" msgid="463322705441386885">"Татгалзах бол доош шударна уу"</string>
-    <string name="a11y_incoming_call_swipe_to_answer" msgid="6992663569851713736">"Дуудлагад хариулахын тулд дээш, таслахын тулд доош хоёр хуруугаар шударна уу"</string>
-    <string name="call_incoming_will_disconnect" msgid="7095934149229485541">"Энэ дуудлагад хариулснаар таны видео дуудлагыг таслах болно"</string>
-    <string name="a11y_call_incoming_decline_description" msgid="4441041052558364987">"Татгалзах"</string>
-    <string name="call_incoming_decline" msgid="2982110738106661231">"Татгалзах"</string>
-    <string name="a11y_call_incoming_answer_description" msgid="1623200501347799736">"Хариулах"</string>
-    <string name="call_incoming_answer" msgid="841798555883717852">"Хариулах"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_answer">Хариулах бол дээш шударна уу</string>
+  <string name="call_incoming_swipe_to_reject">Татгалзах бол доош шударна уу</string>
+  <string name="a11y_incoming_call_swipe_to_answer">Дуудлагад хариулахын тулд дээш, таслахын тулд доош хоёр хуруугаар шударна уу</string>
+  <string name="call_incoming_will_disconnect">Энэ дуудлагад хариулснаар таны видео дуудлагыг таслах болно</string>
+  <string name="a11y_call_incoming_decline_description">Татгалзах</string>
+  <string name="call_incoming_decline">Татгалзах</string>
+  <string name="a11y_call_incoming_answer_description">Хариулах</string>
+  <string name="call_incoming_answer">Хариулах</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/answermethod/res/values-mr/strings.xml b/java/com/android/incallui/answer/impl/answermethod/res/values-mr/strings.xml
index a7c3d56..5374ea4 100644
--- a/java/com/android/incallui/answer/impl/answermethod/res/values-mr/strings.xml
+++ b/java/com/android/incallui/answer/impl/answermethod/res/values-mr/strings.xml
@@ -1,12 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_answer" msgid="2959042172304267183">"उत्तर देण्यासाठी वर स्वाइप करा"</string>
-    <string name="call_incoming_swipe_to_reject" msgid="463322705441386885">"नाकारण्यासाठी खाली स्वाइप करा"</string>
-    <string name="a11y_incoming_call_swipe_to_answer" msgid="6992663569851713736">"उत्तर देण्यासाठी दोन बोटांनी वर किंवा कॉलला नकार देण्यासाठी खाली स्वाइप करा"</string>
-    <string name="call_incoming_will_disconnect" msgid="7095934149229485541">"या कॉलला उत्तर देण्यामुळे आपला व्हिडिओ कॉल समाप्त होईल"</string>
-    <string name="a11y_call_incoming_decline_description" msgid="4441041052558364987">"नकार द्या"</string>
-    <string name="call_incoming_decline" msgid="2982110738106661231">"नकार द्या"</string>
-    <string name="a11y_call_incoming_answer_description" msgid="1623200501347799736">"उत्तर द्या"</string>
-    <string name="call_incoming_answer" msgid="841798555883717852">"उत्तर द्या"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_answer">उत्तर देण्यासाठी वर स्वाइप करा</string>
+  <string name="call_incoming_swipe_to_reject">नाकारण्यासाठी खाली स्वाइप करा</string>
+  <string name="a11y_incoming_call_swipe_to_answer">उत्तर देण्यासाठी दोन बोटांनी वर किंवा कॉलला नकार देण्यासाठी खाली स्वाइप करा</string>
+  <string name="call_incoming_will_disconnect">या कॉलला उत्तर देण्यामुळे आपला व्हिडिओ कॉल समाप्त होईल</string>
+  <string name="a11y_call_incoming_decline_description">नकार द्या</string>
+  <string name="call_incoming_decline">नकार द्या</string>
+  <string name="a11y_call_incoming_answer_description">उत्तर द्या</string>
+  <string name="call_incoming_answer">उत्तर द्या</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/answermethod/res/values-ms/strings.xml b/java/com/android/incallui/answer/impl/answermethod/res/values-ms/strings.xml
index 241ea63..991f87a 100644
--- a/java/com/android/incallui/answer/impl/answermethod/res/values-ms/strings.xml
+++ b/java/com/android/incallui/answer/impl/answermethod/res/values-ms/strings.xml
@@ -1,12 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_answer" msgid="2959042172304267183">"Leret ke atas untuk menjawab"</string>
-    <string name="call_incoming_swipe_to_reject" msgid="463322705441386885">"Leret ke bawah untuk menolak"</string>
-    <string name="a11y_incoming_call_swipe_to_answer" msgid="6992663569851713736">"Leret ke atas menggunakan dua jari untuk menjawab panggilan atau ke bawah untuk menolak panggilan"</string>
-    <string name="call_incoming_will_disconnect" msgid="7095934149229485541">"Panggilan video anda akan ditamatkan apabila anda menjawab panggilan ini"</string>
-    <string name="a11y_call_incoming_decline_description" msgid="4441041052558364987">"Tolak"</string>
-    <string name="call_incoming_decline" msgid="2982110738106661231">"Tolak"</string>
-    <string name="a11y_call_incoming_answer_description" msgid="1623200501347799736">"Jawab"</string>
-    <string name="call_incoming_answer" msgid="841798555883717852">"Jawab"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_answer">Leret ke atas untuk menjawab</string>
+  <string name="call_incoming_swipe_to_reject">Leret ke bawah untuk menolak</string>
+  <string name="a11y_incoming_call_swipe_to_answer">Leret ke atas menggunakan dua jari untuk menjawab panggilan atau ke bawah untuk menolak panggilan</string>
+  <string name="call_incoming_will_disconnect">Panggilan video anda akan ditamatkan apabila anda menjawab panggilan ini</string>
+  <string name="a11y_call_incoming_decline_description">Tolak</string>
+  <string name="call_incoming_decline">Tolak</string>
+  <string name="a11y_call_incoming_answer_description">Jawab</string>
+  <string name="call_incoming_answer">Jawab</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/answermethod/res/values-my/strings.xml b/java/com/android/incallui/answer/impl/answermethod/res/values-my/strings.xml
index 6f98778..3a1a285 100644
--- a/java/com/android/incallui/answer/impl/answermethod/res/values-my/strings.xml
+++ b/java/com/android/incallui/answer/impl/answermethod/res/values-my/strings.xml
@@ -1,12 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_answer" msgid="2959042172304267183">"ဖြေကြားရန် အပေါ်သို့ပွတ်ဆွဲပါ"</string>
-    <string name="call_incoming_swipe_to_reject" msgid="463322705441386885">"ငြင်းဆိုရန် အောက်သို့ပွတ်ဆွဲပါ"</string>
-    <string name="a11y_incoming_call_swipe_to_answer" msgid="6992663569851713736">"ခေါ်ဆိုမှုကို ဖြေကြားရန် လက်နှစ်ချောင်းဖြင့် အပေါ်သို့ပွတ်ဆွဲပါ (သို့) ငြင်းဆိုရန် အောက်သို့ပွတ်ဆွဲပါ"</string>
-    <string name="call_incoming_will_disconnect" msgid="7095934149229485541">"ဤခေါ်ဆိုမှုကိုဖြေကြားခြင်းက သင့်ဗီဒီယိုခေါ်ဆိုမှုကို ဖြတ်တောက်ပါလိမ့်မည်"</string>
-    <string name="a11y_call_incoming_decline_description" msgid="4441041052558364987">"ငြင်းပယ်ပါ"</string>
-    <string name="call_incoming_decline" msgid="2982110738106661231">"ငြင်းပယ်ရန်"</string>
-    <string name="a11y_call_incoming_answer_description" msgid="1623200501347799736">"ဖြေကြားပါ"</string>
-    <string name="call_incoming_answer" msgid="841798555883717852">"ဖြေကြားရန်"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_answer">ဖြေကြားရန် အပေါ်သို့ပွတ်ဆွဲပါ</string>
+  <string name="call_incoming_swipe_to_reject">ငြင်းဆိုရန် အောက်သို့ပွတ်ဆွဲပါ</string>
+  <string name="a11y_incoming_call_swipe_to_answer">ခေါ်ဆိုမှုကို ဖြေကြားရန် လက်နှစ်ချောင်းဖြင့် အပေါ်သို့ပွတ်ဆွဲပါ (သို့) ငြင်းဆိုရန် အောက်သို့ပွတ်ဆွဲပါ</string>
+  <string name="call_incoming_will_disconnect">ဤခေါ်ဆိုမှုကိုဖြေကြားခြင်းက သင့်ဗီဒီယိုခေါ်ဆိုမှုကို ဖြတ်တောက်ပါလိမ့်မည်</string>
+  <string name="a11y_call_incoming_decline_description">ငြင်းပယ်ပါ</string>
+  <string name="call_incoming_decline">ငြင်းပယ်ရန်</string>
+  <string name="a11y_call_incoming_answer_description">ဖြေကြားပါ</string>
+  <string name="call_incoming_answer">ဖြေကြားရန်</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/answermethod/res/values-nb/strings.xml b/java/com/android/incallui/answer/impl/answermethod/res/values-nb/strings.xml
index 7c2b334..9818bee 100644
--- a/java/com/android/incallui/answer/impl/answermethod/res/values-nb/strings.xml
+++ b/java/com/android/incallui/answer/impl/answermethod/res/values-nb/strings.xml
@@ -1,12 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_answer" msgid="2959042172304267183">"Sveip oppover for å svare"</string>
-    <string name="call_incoming_swipe_to_reject" msgid="463322705441386885">"Sveip nedover for å avvise"</string>
-    <string name="a11y_incoming_call_swipe_to_answer" msgid="6992663569851713736">"Sveip oppover med to fingre for å svare på anropet, eller sveip nedover for å avvise det"</string>
-    <string name="call_incoming_will_disconnect" msgid="7095934149229485541">"Hvis du svarer på dette anropet, avsluttes videosamtalen"</string>
-    <string name="a11y_call_incoming_decline_description" msgid="4441041052558364987">"Avslå"</string>
-    <string name="call_incoming_decline" msgid="2982110738106661231">"Avslå"</string>
-    <string name="a11y_call_incoming_answer_description" msgid="1623200501347799736">"Svar"</string>
-    <string name="call_incoming_answer" msgid="841798555883717852">"Svar"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_answer">Sveip oppover for å svare</string>
+  <string name="call_incoming_swipe_to_reject">Sveip nedover for å avvise</string>
+  <string name="a11y_incoming_call_swipe_to_answer">Sveip oppover med to fingre for å svare på anropet, eller sveip nedover for å avvise det</string>
+  <string name="call_incoming_will_disconnect">Hvis du svarer på dette anropet, avsluttes videosamtalen</string>
+  <string name="a11y_call_incoming_decline_description">Avslå</string>
+  <string name="call_incoming_decline">Avslå</string>
+  <string name="a11y_call_incoming_answer_description">Svar</string>
+  <string name="call_incoming_answer">Svar</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/answermethod/res/values-ne/strings.xml b/java/com/android/incallui/answer/impl/answermethod/res/values-ne/strings.xml
index f20851d..1547fe8 100644
--- a/java/com/android/incallui/answer/impl/answermethod/res/values-ne/strings.xml
+++ b/java/com/android/incallui/answer/impl/answermethod/res/values-ne/strings.xml
@@ -1,12 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_answer" msgid="2959042172304267183">"जवाफ दिन माथितिर स्वाइप गर्नुहोस्"</string>
-    <string name="call_incoming_swipe_to_reject" msgid="463322705441386885">"अस्वीकार गर्न तलतिर स्वाइप गर्नुहोस्"</string>
-    <string name="a11y_incoming_call_swipe_to_answer" msgid="6992663569851713736">"कलको जवाफ फर्काउन माथितिर वा अस्वीकार गर्न तलतिर दुई औंलाले स्वाइप गर्नुहोस्"</string>
-    <string name="call_incoming_will_disconnect" msgid="7095934149229485541">"यो कलको जवाफ फर्काउनुले तपाईंको भिडियो कल समाप्त हुनेछ"</string>
-    <string name="a11y_call_incoming_decline_description" msgid="4441041052558364987">"अस्वीकार गर्नुहोस्"</string>
-    <string name="call_incoming_decline" msgid="2982110738106661231">"अस्वीकार गर्नुहोस्"</string>
-    <string name="a11y_call_incoming_answer_description" msgid="1623200501347799736">"जवाफ दिनुहोस्"</string>
-    <string name="call_incoming_answer" msgid="841798555883717852">"जवाफ दिनुहोस्"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_answer">जवाफ दिन माथितिर स्वाइप गर्नुहोस्</string>
+  <string name="call_incoming_swipe_to_reject">अस्वीकार गर्न तलतिर स्वाइप गर्नुहोस्</string>
+  <string name="a11y_incoming_call_swipe_to_answer">कलको जवाफ फर्काउन माथितिर वा अस्वीकार गर्न तलतिर दुई औंलाले स्वाइप गर्नुहोस्</string>
+  <string name="call_incoming_will_disconnect">यो कलको जवाफ फर्काउनुले तपाईंको भिडियो कल समाप्त हुनेछ</string>
+  <string name="a11y_call_incoming_decline_description">अस्वीकार गर्नुहोस्</string>
+  <string name="call_incoming_decline">अस्वीकार गर्नुहोस्</string>
+  <string name="a11y_call_incoming_answer_description">जवाफ दिनुहोस्</string>
+  <string name="call_incoming_answer">जवाफ दिनुहोस्</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/answermethod/res/values-nl/strings.xml b/java/com/android/incallui/answer/impl/answermethod/res/values-nl/strings.xml
index 63167cb..46c6d29 100644
--- a/java/com/android/incallui/answer/impl/answermethod/res/values-nl/strings.xml
+++ b/java/com/android/incallui/answer/impl/answermethod/res/values-nl/strings.xml
@@ -1,12 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_answer" msgid="2959042172304267183">"Veeg omhoog om te beantwoorden"</string>
-    <string name="call_incoming_swipe_to_reject" msgid="463322705441386885">"Veeg omlaag om te weigeren"</string>
-    <string name="a11y_incoming_call_swipe_to_answer" msgid="6992663569851713736">"Veeg met twee vingers omhoog om de oproep te beantwoorden of omlaag om de oproep te weigeren"</string>
-    <string name="call_incoming_will_disconnect" msgid="7095934149229485541">"Als je deze oproep beantwoordt, wordt je videogesprek beëindigd"</string>
-    <string name="a11y_call_incoming_decline_description" msgid="4441041052558364987">"Weigeren"</string>
-    <string name="call_incoming_decline" msgid="2982110738106661231">"Weigeren"</string>
-    <string name="a11y_call_incoming_answer_description" msgid="1623200501347799736">"Beantwoorden"</string>
-    <string name="call_incoming_answer" msgid="841798555883717852">"Beantwoorden"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_answer">Veeg omhoog om te beantwoorden</string>
+  <string name="call_incoming_swipe_to_reject">Veeg omlaag om te weigeren</string>
+  <string name="a11y_incoming_call_swipe_to_answer">Veeg met twee vingers omhoog om de oproep te beantwoorden of omlaag om de oproep te weigeren</string>
+  <string name="call_incoming_will_disconnect">Als je deze oproep beantwoordt, wordt je videogesprek beëindigd</string>
+  <string name="a11y_call_incoming_decline_description">Weigeren</string>
+  <string name="call_incoming_decline">Weigeren</string>
+  <string name="a11y_call_incoming_answer_description">Beantwoorden</string>
+  <string name="call_incoming_answer">Beantwoorden</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/answermethod/res/values-no/strings.xml b/java/com/android/incallui/answer/impl/answermethod/res/values-no/strings.xml
index 7c2b334..9818bee 100644
--- a/java/com/android/incallui/answer/impl/answermethod/res/values-no/strings.xml
+++ b/java/com/android/incallui/answer/impl/answermethod/res/values-no/strings.xml
@@ -1,12 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_answer" msgid="2959042172304267183">"Sveip oppover for å svare"</string>
-    <string name="call_incoming_swipe_to_reject" msgid="463322705441386885">"Sveip nedover for å avvise"</string>
-    <string name="a11y_incoming_call_swipe_to_answer" msgid="6992663569851713736">"Sveip oppover med to fingre for å svare på anropet, eller sveip nedover for å avvise det"</string>
-    <string name="call_incoming_will_disconnect" msgid="7095934149229485541">"Hvis du svarer på dette anropet, avsluttes videosamtalen"</string>
-    <string name="a11y_call_incoming_decline_description" msgid="4441041052558364987">"Avslå"</string>
-    <string name="call_incoming_decline" msgid="2982110738106661231">"Avslå"</string>
-    <string name="a11y_call_incoming_answer_description" msgid="1623200501347799736">"Svar"</string>
-    <string name="call_incoming_answer" msgid="841798555883717852">"Svar"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_answer">Sveip oppover for å svare</string>
+  <string name="call_incoming_swipe_to_reject">Sveip nedover for å avvise</string>
+  <string name="a11y_incoming_call_swipe_to_answer">Sveip oppover med to fingre for å svare på anropet, eller sveip nedover for å avvise det</string>
+  <string name="call_incoming_will_disconnect">Hvis du svarer på dette anropet, avsluttes videosamtalen</string>
+  <string name="a11y_call_incoming_decline_description">Avslå</string>
+  <string name="call_incoming_decline">Avslå</string>
+  <string name="a11y_call_incoming_answer_description">Svar</string>
+  <string name="call_incoming_answer">Svar</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/answermethod/res/values-pa/strings.xml b/java/com/android/incallui/answer/impl/answermethod/res/values-pa/strings.xml
index d4a80f0..3931456 100644
--- a/java/com/android/incallui/answer/impl/answermethod/res/values-pa/strings.xml
+++ b/java/com/android/incallui/answer/impl/answermethod/res/values-pa/strings.xml
@@ -1,12 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_answer" msgid="2959042172304267183">"ਜਵਾਬ ਦੇਣ ਲਈ ਉੱਪਰ ਵੱਲ ਸਵਾਈਪ ਕਰੋ"</string>
-    <string name="call_incoming_swipe_to_reject" msgid="463322705441386885">"ਰੱਦ ਕਰਨ ਲਈ ਹੇਠਾਂਂ ਸਵਾਈਪ ਕਰੋ"</string>
-    <string name="a11y_incoming_call_swipe_to_answer" msgid="6992663569851713736">"ਕਾਲ ਦਾ ਜਵਾਬ ਦੇਣ ਲਈ ਦੋ ਉਂਗਲਾਂ ਨਾਲ ਉੱਪਰ ਵੱਲ ਜਾਂ ਰੱਦ ਕਰਨ ਲਈ ਦੋ ਉਂਗਲਾਂ ਨਾਲ ਹੇਠਾਂ ਵੱਲ ਸਵਾਈਪ ਕਰੋ"</string>
-    <string name="call_incoming_will_disconnect" msgid="7095934149229485541">"ਇਸ ਕਾਲ ਦਾ ਜਵਾਬ ਦੇਣ ਨਾਲ ਤੁਹਾਡੀ ਵੀਡੀਓ ਕਾਲ ਸਮਾਪਤ ਹੋ ਜਾਵੇਗੀ"</string>
-    <string name="a11y_call_incoming_decline_description" msgid="4441041052558364987">"ਅਸਵੀਕਾਰ ਕਰੋ"</string>
-    <string name="call_incoming_decline" msgid="2982110738106661231">"ਅਸਵੀਕਾਰ ਕਰੋ"</string>
-    <string name="a11y_call_incoming_answer_description" msgid="1623200501347799736">"ਜਵਾਬ ਦਿਓ"</string>
-    <string name="call_incoming_answer" msgid="841798555883717852">"ਜਵਾਬ ਦਿਓ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_answer">ਜਵਾਬ ਦੇਣ ਲਈ ਉੱਪਰ ਵੱਲ ਸਵਾਈਪ ਕਰੋ</string>
+  <string name="call_incoming_swipe_to_reject">ਰੱਦ ਕਰਨ ਲਈ ਹੇਠਾਂਂ ਸਵਾਈਪ ਕਰੋ</string>
+  <string name="a11y_incoming_call_swipe_to_answer">ਕਾਲ ਦਾ ਜਵਾਬ ਦੇਣ ਲਈ ਦੋ ਉਂਗਲਾਂ ਨਾਲ ਉੱਪਰ ਵੱਲ ਜਾਂ ਰੱਦ ਕਰਨ ਲਈ ਦੋ ਉਂਗਲਾਂ ਨਾਲ ਹੇਠਾਂ ਵੱਲ ਸਵਾਈਪ ਕਰੋ</string>
+  <string name="call_incoming_will_disconnect">ਇਸ ਕਾਲ ਦਾ ਜਵਾਬ ਦੇਣ ਨਾਲ ਤੁਹਾਡੀ ਵੀਡੀਓ ਕਾਲ ਸਮਾਪਤ ਹੋ ਜਾਵੇਗੀ</string>
+  <string name="a11y_call_incoming_decline_description">ਅਸਵੀਕਾਰ ਕਰੋ</string>
+  <string name="call_incoming_decline">ਅਸਵੀਕਾਰ ਕਰੋ</string>
+  <string name="a11y_call_incoming_answer_description">ਜਵਾਬ ਦਿਓ</string>
+  <string name="call_incoming_answer">ਜਵਾਬ ਦਿਓ</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/answermethod/res/values-pl/strings.xml b/java/com/android/incallui/answer/impl/answermethod/res/values-pl/strings.xml
index b0ea357..74ce035 100644
--- a/java/com/android/incallui/answer/impl/answermethod/res/values-pl/strings.xml
+++ b/java/com/android/incallui/answer/impl/answermethod/res/values-pl/strings.xml
@@ -1,12 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_answer" msgid="2959042172304267183">"Przesuń palcem w górę, aby odebrać"</string>
-    <string name="call_incoming_swipe_to_reject" msgid="463322705441386885">"Przesuń palcem w dół, aby odrzucić"</string>
-    <string name="a11y_incoming_call_swipe_to_answer" msgid="6992663569851713736">"Przesuń dwoma palcami w górę, aby odebrać połączenie, lub w dół, aby je odrzucić"</string>
-    <string name="call_incoming_will_disconnect" msgid="7095934149229485541">"Jeśli odbierzesz to połączenie, rozmowa wideo zostanie zakończona"</string>
-    <string name="a11y_call_incoming_decline_description" msgid="4441041052558364987">"Odrzuć"</string>
-    <string name="call_incoming_decline" msgid="2982110738106661231">"Odrzuć"</string>
-    <string name="a11y_call_incoming_answer_description" msgid="1623200501347799736">"Odbierz"</string>
-    <string name="call_incoming_answer" msgid="841798555883717852">"Odbierz"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_answer">Przesuń palcem w górę, aby odebrać</string>
+  <string name="call_incoming_swipe_to_reject">Przesuń palcem w dół, aby odrzucić</string>
+  <string name="a11y_incoming_call_swipe_to_answer">Przesuń dwoma palcami w górę, aby odebrać połączenie, lub w dół, aby je odrzucić</string>
+  <string name="call_incoming_will_disconnect">Jeśli odbierzesz to połączenie, rozmowa wideo zostanie zakończona</string>
+  <string name="a11y_call_incoming_decline_description">Odrzuć</string>
+  <string name="call_incoming_decline">Odrzuć</string>
+  <string name="a11y_call_incoming_answer_description">Odbierz</string>
+  <string name="call_incoming_answer">Odbierz</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/answermethod/res/values-pt-rBR/strings.xml b/java/com/android/incallui/answer/impl/answermethod/res/values-pt-rBR/strings.xml
index 602b1f3..9b93292 100644
--- a/java/com/android/incallui/answer/impl/answermethod/res/values-pt-rBR/strings.xml
+++ b/java/com/android/incallui/answer/impl/answermethod/res/values-pt-rBR/strings.xml
@@ -1,12 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_answer" msgid="2959042172304267183">"Deslize para cima para atender"</string>
-    <string name="call_incoming_swipe_to_reject" msgid="463322705441386885">"Deslize para baixo para rejeitar"</string>
-    <string name="a11y_incoming_call_swipe_to_answer" msgid="6992663569851713736">"Deslize com dois dedos para cima para atender ou para baixo para rejeitar a chamada"</string>
-    <string name="call_incoming_will_disconnect" msgid="7095934149229485541">"A videochamada será encerrada se você atender a esta chamada"</string>
-    <string name="a11y_call_incoming_decline_description" msgid="4441041052558364987">"Recusar"</string>
-    <string name="call_incoming_decline" msgid="2982110738106661231">"Recusar"</string>
-    <string name="a11y_call_incoming_answer_description" msgid="1623200501347799736">"Atender"</string>
-    <string name="call_incoming_answer" msgid="841798555883717852">"Atender"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_answer">Deslize para cima para atender</string>
+  <string name="call_incoming_swipe_to_reject">Deslize para baixo para rejeitar</string>
+  <string name="a11y_incoming_call_swipe_to_answer">Deslize com dois dedos para cima para atender ou para baixo para rejeitar a chamada</string>
+  <string name="call_incoming_will_disconnect">A videochamada será encerrada se você atender a esta chamada</string>
+  <string name="a11y_call_incoming_decline_description">Recusar</string>
+  <string name="call_incoming_decline">Recusar</string>
+  <string name="a11y_call_incoming_answer_description">Atender</string>
+  <string name="call_incoming_answer">Atender</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/answermethod/res/values-pt-rPT/strings.xml b/java/com/android/incallui/answer/impl/answermethod/res/values-pt-rPT/strings.xml
index 5811ac2..a19345d 100644
--- a/java/com/android/incallui/answer/impl/answermethod/res/values-pt-rPT/strings.xml
+++ b/java/com/android/incallui/answer/impl/answermethod/res/values-pt-rPT/strings.xml
@@ -1,12 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_answer" msgid="2959042172304267183">"Deslize rapidamente para cima para responder"</string>
-    <string name="call_incoming_swipe_to_reject" msgid="463322705441386885">"Deslize rapidamente para baixo para rejeitar"</string>
-    <string name="a11y_incoming_call_swipe_to_answer" msgid="6992663569851713736">"Deslize rapidamente com dois dedos para cima para atender ou para baixo para rejeitar a chamada"</string>
-    <string name="call_incoming_will_disconnect" msgid="7095934149229485541">"Ao atender esta chamada, a videochamada será terminada"</string>
-    <string name="a11y_call_incoming_decline_description" msgid="4441041052558364987">"Recusar"</string>
-    <string name="call_incoming_decline" msgid="2982110738106661231">"Recusar"</string>
-    <string name="a11y_call_incoming_answer_description" msgid="1623200501347799736">"Atender"</string>
-    <string name="call_incoming_answer" msgid="841798555883717852">"Atender"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_answer">Deslize rapidamente para cima para responder</string>
+  <string name="call_incoming_swipe_to_reject">Deslize rapidamente para baixo para rejeitar</string>
+  <string name="a11y_incoming_call_swipe_to_answer">Deslize rapidamente com dois dedos para cima para atender ou para baixo para rejeitar a chamada</string>
+  <string name="call_incoming_will_disconnect">Ao atender esta chamada, a videochamada será terminada</string>
+  <string name="a11y_call_incoming_decline_description">Recusar</string>
+  <string name="call_incoming_decline">Recusar</string>
+  <string name="a11y_call_incoming_answer_description">Atender</string>
+  <string name="call_incoming_answer">Atender</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/answermethod/res/values-pt/strings.xml b/java/com/android/incallui/answer/impl/answermethod/res/values-pt/strings.xml
index 602b1f3..9b93292 100644
--- a/java/com/android/incallui/answer/impl/answermethod/res/values-pt/strings.xml
+++ b/java/com/android/incallui/answer/impl/answermethod/res/values-pt/strings.xml
@@ -1,12 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_answer" msgid="2959042172304267183">"Deslize para cima para atender"</string>
-    <string name="call_incoming_swipe_to_reject" msgid="463322705441386885">"Deslize para baixo para rejeitar"</string>
-    <string name="a11y_incoming_call_swipe_to_answer" msgid="6992663569851713736">"Deslize com dois dedos para cima para atender ou para baixo para rejeitar a chamada"</string>
-    <string name="call_incoming_will_disconnect" msgid="7095934149229485541">"A videochamada será encerrada se você atender a esta chamada"</string>
-    <string name="a11y_call_incoming_decline_description" msgid="4441041052558364987">"Recusar"</string>
-    <string name="call_incoming_decline" msgid="2982110738106661231">"Recusar"</string>
-    <string name="a11y_call_incoming_answer_description" msgid="1623200501347799736">"Atender"</string>
-    <string name="call_incoming_answer" msgid="841798555883717852">"Atender"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_answer">Deslize para cima para atender</string>
+  <string name="call_incoming_swipe_to_reject">Deslize para baixo para rejeitar</string>
+  <string name="a11y_incoming_call_swipe_to_answer">Deslize com dois dedos para cima para atender ou para baixo para rejeitar a chamada</string>
+  <string name="call_incoming_will_disconnect">A videochamada será encerrada se você atender a esta chamada</string>
+  <string name="a11y_call_incoming_decline_description">Recusar</string>
+  <string name="call_incoming_decline">Recusar</string>
+  <string name="a11y_call_incoming_answer_description">Atender</string>
+  <string name="call_incoming_answer">Atender</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/answermethod/res/values-ro/strings.xml b/java/com/android/incallui/answer/impl/answermethod/res/values-ro/strings.xml
index 706b359..8dc9272 100644
--- a/java/com/android/incallui/answer/impl/answermethod/res/values-ro/strings.xml
+++ b/java/com/android/incallui/answer/impl/answermethod/res/values-ro/strings.xml
@@ -1,12 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_answer" msgid="2959042172304267183">"Glisați în sus pentru a răspunde"</string>
-    <string name="call_incoming_swipe_to_reject" msgid="463322705441386885">"Glisați în jos pentru a respinge"</string>
-    <string name="a11y_incoming_call_swipe_to_answer" msgid="6992663569851713736">"Glisați în sus cu două degete pentru a răspunde sau glisați în jos pentru a respinge apelul."</string>
-    <string name="call_incoming_will_disconnect" msgid="7095934149229485541">"Dacă răspundeți la acest apel, se va încheia apelul video."</string>
-    <string name="a11y_call_incoming_decline_description" msgid="4441041052558364987">"Respingeți"</string>
-    <string name="call_incoming_decline" msgid="2982110738106661231">"Respingeți"</string>
-    <string name="a11y_call_incoming_answer_description" msgid="1623200501347799736">"Răspundeți"</string>
-    <string name="call_incoming_answer" msgid="841798555883717852">"Răspundeți"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_answer">Glisați în sus pentru a răspunde</string>
+  <string name="call_incoming_swipe_to_reject">Glisați în jos pentru a respinge</string>
+  <string name="a11y_incoming_call_swipe_to_answer">Glisați în sus cu două degete pentru a răspunde sau glisați în jos pentru a respinge apelul.</string>
+  <string name="call_incoming_will_disconnect">Dacă răspundeți la acest apel, se va încheia apelul video.</string>
+  <string name="a11y_call_incoming_decline_description">Respingeți</string>
+  <string name="call_incoming_decline">Respingeți</string>
+  <string name="a11y_call_incoming_answer_description">Răspundeți</string>
+  <string name="call_incoming_answer">Răspundeți</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/answermethod/res/values-ru/strings.xml b/java/com/android/incallui/answer/impl/answermethod/res/values-ru/strings.xml
index 759b69a..489c2ce 100644
--- a/java/com/android/incallui/answer/impl/answermethod/res/values-ru/strings.xml
+++ b/java/com/android/incallui/answer/impl/answermethod/res/values-ru/strings.xml
@@ -1,12 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_answer" msgid="2959042172304267183">"Чтобы ответить, проведите по экрану вверх"</string>
-    <string name="call_incoming_swipe_to_reject" msgid="463322705441386885">"Чтобы отклонить вызов, проведите по экрану вниз"</string>
-    <string name="a11y_incoming_call_swipe_to_answer" msgid="6992663569851713736">"Проведите двумя пальцами по экрану вверх, чтобы ответить, или вниз, чтобы отклонить вызов"</string>
-    <string name="call_incoming_will_disconnect" msgid="7095934149229485541">"Если вы ответите на этот вызов, видеовызов закончится"</string>
-    <string name="a11y_call_incoming_decline_description" msgid="4441041052558364987">"Отклонить"</string>
-    <string name="call_incoming_decline" msgid="2982110738106661231">"Отклонить"</string>
-    <string name="a11y_call_incoming_answer_description" msgid="1623200501347799736">"Ответить"</string>
-    <string name="call_incoming_answer" msgid="841798555883717852">"Ответить"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_answer">Чтобы ответить, проведите по экрану вверх</string>
+  <string name="call_incoming_swipe_to_reject">Чтобы отклонить вызов, проведите по экрану вниз</string>
+  <string name="a11y_incoming_call_swipe_to_answer">Проведите двумя пальцами по экрану вверх, чтобы ответить, или вниз, чтобы отклонить вызов</string>
+  <string name="call_incoming_will_disconnect">Если вы ответите на этот вызов, видеовызов закончится</string>
+  <string name="a11y_call_incoming_decline_description">Отклонить</string>
+  <string name="call_incoming_decline">Отклонить</string>
+  <string name="a11y_call_incoming_answer_description">Ответить</string>
+  <string name="call_incoming_answer">Ответить</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/answermethod/res/values-si/strings.xml b/java/com/android/incallui/answer/impl/answermethod/res/values-si/strings.xml
index 84844bb..645ab7b 100644
--- a/java/com/android/incallui/answer/impl/answermethod/res/values-si/strings.xml
+++ b/java/com/android/incallui/answer/impl/answermethod/res/values-si/strings.xml
@@ -1,12 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_answer" msgid="2959042172304267183">"පිළිතුරු දීමට ඉහළට ස්වයිප් කරන්න"</string>
-    <string name="call_incoming_swipe_to_reject" msgid="463322705441386885">"ප්‍රතික්ෂේප කිරීමට පහළට ස්වයිප් කරන්න"</string>
-    <string name="a11y_incoming_call_swipe_to_answer" msgid="6992663569851713736">"ඇමතුමට පිළිතුරු දීමට ඇඟිලි දෙකකින් ඉහළට ස්වයිප් කරන්න නැතහොත් ප්‍රතික්ෂේප කිරීමට පහළට ස්වයිප් කරන්න"</string>
-    <string name="call_incoming_will_disconnect" msgid="7095934149229485541">"මෙම ඇමතුමට පිළිතුරු දීම ඔබේ වීඩියෝ ඇමතුම අවසන් කරනු ඇත"</string>
-    <string name="a11y_call_incoming_decline_description" msgid="4441041052558364987">"ප්‍රතික්ෂේප කරන්න"</string>
-    <string name="call_incoming_decline" msgid="2982110738106661231">"ප්‍රතික්ෂේප කරන්න"</string>
-    <string name="a11y_call_incoming_answer_description" msgid="1623200501347799736">"පිළිතුරු දෙන්න"</string>
-    <string name="call_incoming_answer" msgid="841798555883717852">"පිළිතුරු දෙන්න"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_answer">පිළිතුරු දීමට ඉහළට ස්වයිප් කරන්න</string>
+  <string name="call_incoming_swipe_to_reject">ප්‍රතික්ෂේප කිරීමට පහළට ස්වයිප් කරන්න</string>
+  <string name="a11y_incoming_call_swipe_to_answer">ඇමතුමට පිළිතුරු දීමට ඇඟිලි දෙකකින් ඉහළට ස්වයිප් කරන්න නැතහොත් ප්‍රතික්ෂේප කිරීමට පහළට ස්වයිප් කරන්න</string>
+  <string name="call_incoming_will_disconnect">මෙම ඇමතුමට පිළිතුරු දීම ඔබේ වීඩියෝ ඇමතුම අවසන් කරනු ඇත</string>
+  <string name="a11y_call_incoming_decline_description">ප්‍රතික්ෂේප කරන්න</string>
+  <string name="call_incoming_decline">ප්‍රතික්ෂේප කරන්න</string>
+  <string name="a11y_call_incoming_answer_description">පිළිතුරු දෙන්න</string>
+  <string name="call_incoming_answer">පිළිතුරු දෙන්න</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/answermethod/res/values-sk/strings.xml b/java/com/android/incallui/answer/impl/answermethod/res/values-sk/strings.xml
index 7ed0dfb..067ea2e 100644
--- a/java/com/android/incallui/answer/impl/answermethod/res/values-sk/strings.xml
+++ b/java/com/android/incallui/answer/impl/answermethod/res/values-sk/strings.xml
@@ -1,12 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_answer" msgid="2959042172304267183">"Prijať prejdením prstom nahor"</string>
-    <string name="call_incoming_swipe_to_reject" msgid="463322705441386885">"Odmietnuť prejdením prstom nadol"</string>
-    <string name="a11y_incoming_call_swipe_to_answer" msgid="6992663569851713736">"Prejdením dvoma prstami nahor hovor prijať alebo ho prejdením dvoma prstami nadol odmietnuť"</string>
-    <string name="call_incoming_will_disconnect" msgid="7095934149229485541">"Prijatím tohto hovoru ukončíte videohovor"</string>
-    <string name="a11y_call_incoming_decline_description" msgid="4441041052558364987">"Odmietnuť"</string>
-    <string name="call_incoming_decline" msgid="2982110738106661231">"Odmietnuť"</string>
-    <string name="a11y_call_incoming_answer_description" msgid="1623200501347799736">"Prijať"</string>
-    <string name="call_incoming_answer" msgid="841798555883717852">"Prijať"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_answer">Prijať prejdením prstom nahor</string>
+  <string name="call_incoming_swipe_to_reject">Odmietnuť prejdením prstom nadol</string>
+  <string name="a11y_incoming_call_swipe_to_answer">Prejdením dvoma prstami nahor hovor prijať alebo ho prejdením dvoma prstami nadol odmietnuť</string>
+  <string name="call_incoming_will_disconnect">Prijatím tohto hovoru ukončíte videohovor</string>
+  <string name="a11y_call_incoming_decline_description">Odmietnuť</string>
+  <string name="call_incoming_decline">Odmietnuť</string>
+  <string name="a11y_call_incoming_answer_description">Prijať</string>
+  <string name="call_incoming_answer">Prijať</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/answermethod/res/values-sl/strings.xml b/java/com/android/incallui/answer/impl/answermethod/res/values-sl/strings.xml
index 7cb7fc3..dd0b43b 100644
--- a/java/com/android/incallui/answer/impl/answermethod/res/values-sl/strings.xml
+++ b/java/com/android/incallui/answer/impl/answermethod/res/values-sl/strings.xml
@@ -1,12 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_answer" msgid="2959042172304267183">"Povlecite navzgor, da sprejmete klic"</string>
-    <string name="call_incoming_swipe_to_reject" msgid="463322705441386885">"Povlecite navzdol, da zavrnete klic"</string>
-    <string name="a11y_incoming_call_swipe_to_answer" msgid="6992663569851713736">"Z dvema prstoma povlecite navzgor, če želite sprejeti klic, ali navzdol, če ga želite zavrniti"</string>
-    <string name="call_incoming_will_disconnect" msgid="7095934149229485541">"Če sprejmete ta klic, bo videoklic končan"</string>
-    <string name="a11y_call_incoming_decline_description" msgid="4441041052558364987">"Zavrnitev"</string>
-    <string name="call_incoming_decline" msgid="2982110738106661231">"Zavrni"</string>
-    <string name="a11y_call_incoming_answer_description" msgid="1623200501347799736">"Sprejetje"</string>
-    <string name="call_incoming_answer" msgid="841798555883717852">"Sprejmi"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_answer">Povlecite navzgor, da sprejmete klic</string>
+  <string name="call_incoming_swipe_to_reject">Povlecite navzdol, da zavrnete klic</string>
+  <string name="a11y_incoming_call_swipe_to_answer">Z dvema prstoma povlecite navzgor, če želite sprejeti klic, ali navzdol, če ga želite zavrniti</string>
+  <string name="call_incoming_will_disconnect">Če sprejmete ta klic, bo videoklic končan</string>
+  <string name="a11y_call_incoming_decline_description">Zavrnitev</string>
+  <string name="call_incoming_decline">Zavrni</string>
+  <string name="a11y_call_incoming_answer_description">Sprejetje</string>
+  <string name="call_incoming_answer">Sprejmi</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/answermethod/res/values-sq/strings.xml b/java/com/android/incallui/answer/impl/answermethod/res/values-sq/strings.xml
index b5de32e..bbf41d1 100644
--- a/java/com/android/incallui/answer/impl/answermethod/res/values-sq/strings.xml
+++ b/java/com/android/incallui/answer/impl/answermethod/res/values-sq/strings.xml
@@ -1,12 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_answer" msgid="2959042172304267183">"Rrëshqit për t\'u përgjigjur"</string>
-    <string name="call_incoming_swipe_to_reject" msgid="463322705441386885">"Rrëshqit poshtë për të refuzuar"</string>
-    <string name="a11y_incoming_call_swipe_to_answer" msgid="6992663569851713736">"Rrëshqit lart me dy gishta për t\'u përgjigjur ose refuzuar telefonatën"</string>
-    <string name="call_incoming_will_disconnect" msgid="7095934149229485541">"Përgjigjja e kësaj telefonate përfundon telefonatën me video"</string>
-    <string name="a11y_call_incoming_decline_description" msgid="4441041052558364987">"Refuzo"</string>
-    <string name="call_incoming_decline" msgid="2982110738106661231">"Refuzo"</string>
-    <string name="a11y_call_incoming_answer_description" msgid="1623200501347799736">"Përgjigju"</string>
-    <string name="call_incoming_answer" msgid="841798555883717852">"Përgjigju"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_answer">Rrëshqit për t\'u përgjigjur</string>
+  <string name="call_incoming_swipe_to_reject">Rrëshqit poshtë për të refuzuar</string>
+  <string name="a11y_incoming_call_swipe_to_answer">Rrëshqit lart me dy gishta për t\'u përgjigjur ose refuzuar telefonatën</string>
+  <string name="call_incoming_will_disconnect">Përgjigjja e kësaj telefonate përfundon telefonatën me video</string>
+  <string name="a11y_call_incoming_decline_description">Refuzo</string>
+  <string name="call_incoming_decline">Refuzo</string>
+  <string name="a11y_call_incoming_answer_description">Përgjigju</string>
+  <string name="call_incoming_answer">Përgjigju</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/answermethod/res/values-sr/strings.xml b/java/com/android/incallui/answer/impl/answermethod/res/values-sr/strings.xml
index 8afaeaa..b822fd0 100644
--- a/java/com/android/incallui/answer/impl/answermethod/res/values-sr/strings.xml
+++ b/java/com/android/incallui/answer/impl/answermethod/res/values-sr/strings.xml
@@ -1,12 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_answer" msgid="2959042172304267183">"Превуците нагоре да бисте одговорили"</string>
-    <string name="call_incoming_swipe_to_reject" msgid="463322705441386885">"Превуците надоле да бисте одбили"</string>
-    <string name="a11y_incoming_call_swipe_to_answer" msgid="6992663569851713736">"Помоћу два прста превуците нагоре да бисте одговорили на позив или надоле да бисте га одбили"</string>
-    <string name="call_incoming_will_disconnect" msgid="7095934149229485541">"Ако одговорите на овај позив, прекинућете видео позив"</string>
-    <string name="a11y_call_incoming_decline_description" msgid="4441041052558364987">"Одбијте"</string>
-    <string name="call_incoming_decline" msgid="2982110738106661231">"Одбиј"</string>
-    <string name="a11y_call_incoming_answer_description" msgid="1623200501347799736">"Одговорите"</string>
-    <string name="call_incoming_answer" msgid="841798555883717852">"Одговори"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_answer">Превуците нагоре да бисте одговорили</string>
+  <string name="call_incoming_swipe_to_reject">Превуците надоле да бисте одбили</string>
+  <string name="a11y_incoming_call_swipe_to_answer">Помоћу два прста превуците нагоре да бисте одговорили на позив или надоле да бисте га одбили</string>
+  <string name="call_incoming_will_disconnect">Ако одговорите на овај позив, прекинућете видео позив</string>
+  <string name="a11y_call_incoming_decline_description">Одбијте</string>
+  <string name="call_incoming_decline">Одбиј</string>
+  <string name="a11y_call_incoming_answer_description">Одговорите</string>
+  <string name="call_incoming_answer">Одговори</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/answermethod/res/values-sv/strings.xml b/java/com/android/incallui/answer/impl/answermethod/res/values-sv/strings.xml
index 580f3eb..00b30f7 100644
--- a/java/com/android/incallui/answer/impl/answermethod/res/values-sv/strings.xml
+++ b/java/com/android/incallui/answer/impl/answermethod/res/values-sv/strings.xml
@@ -1,12 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_answer" msgid="2959042172304267183">"Svep uppåt för att svara"</string>
-    <string name="call_incoming_swipe_to_reject" msgid="463322705441386885">"Svep nedåt för att avvisa"</string>
-    <string name="a11y_incoming_call_swipe_to_answer" msgid="6992663569851713736">"Svep uppåt med två fingrar för att svara eller nedåt för att avvisa samtalet"</string>
-    <string name="call_incoming_will_disconnect" msgid="7095934149229485541">"Videosamtalet avslutas om du svarar på det här samtalet"</string>
-    <string name="a11y_call_incoming_decline_description" msgid="4441041052558364987">"Godkänn inte"</string>
-    <string name="call_incoming_decline" msgid="2982110738106661231">"Godkänn inte"</string>
-    <string name="a11y_call_incoming_answer_description" msgid="1623200501347799736">"Svara"</string>
-    <string name="call_incoming_answer" msgid="841798555883717852">"Svara"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_answer">Svep uppåt för att svara</string>
+  <string name="call_incoming_swipe_to_reject">Svep nedåt för att avvisa</string>
+  <string name="a11y_incoming_call_swipe_to_answer">Svep uppåt med två fingrar för att svara eller nedåt för att avvisa samtalet</string>
+  <string name="call_incoming_will_disconnect">Videosamtalet avslutas om du svarar på det här samtalet</string>
+  <string name="a11y_call_incoming_decline_description">Godkänn inte</string>
+  <string name="call_incoming_decline">Godkänn inte</string>
+  <string name="a11y_call_incoming_answer_description">Svara</string>
+  <string name="call_incoming_answer">Svara</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/answermethod/res/values-sw/strings.xml b/java/com/android/incallui/answer/impl/answermethod/res/values-sw/strings.xml
index d3aaf4b..d375c9f 100644
--- a/java/com/android/incallui/answer/impl/answermethod/res/values-sw/strings.xml
+++ b/java/com/android/incallui/answer/impl/answermethod/res/values-sw/strings.xml
@@ -1,12 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_answer" msgid="2959042172304267183">"Telezesha kidole ili uipokee"</string>
-    <string name="call_incoming_swipe_to_reject" msgid="463322705441386885">"Telezesha kidole chini ili uikatae"</string>
-    <string name="a11y_incoming_call_swipe_to_answer" msgid="6992663569851713736">"Telezesha kwenda juu kwa vidole viwili ili upokee simu au kwenda chini ili ukatae"</string>
-    <string name="call_incoming_will_disconnect" msgid="7095934149229485541">"Ukipokea simu hii, simu yako ya video itakatika"</string>
-    <string name="a11y_call_incoming_decline_description" msgid="4441041052558364987">"Kataa"</string>
-    <string name="call_incoming_decline" msgid="2982110738106661231">"Kataa"</string>
-    <string name="a11y_call_incoming_answer_description" msgid="1623200501347799736">"Jibu"</string>
-    <string name="call_incoming_answer" msgid="841798555883717852">"Jibu"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_answer">Telezesha kidole ili uipokee</string>
+  <string name="call_incoming_swipe_to_reject">Telezesha kidole chini ili uikatae</string>
+  <string name="a11y_incoming_call_swipe_to_answer">Telezesha kwenda juu kwa vidole viwili ili upokee simu au kwenda chini ili ukatae</string>
+  <string name="call_incoming_will_disconnect">Ukipokea simu hii, simu yako ya video itakatika</string>
+  <string name="a11y_call_incoming_decline_description">Kataa</string>
+  <string name="call_incoming_decline">Kataa</string>
+  <string name="a11y_call_incoming_answer_description">Jibu</string>
+  <string name="call_incoming_answer">Jibu</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/answermethod/res/values-ta/strings.xml b/java/com/android/incallui/answer/impl/answermethod/res/values-ta/strings.xml
index 6ac1f6b..826868e 100644
--- a/java/com/android/incallui/answer/impl/answermethod/res/values-ta/strings.xml
+++ b/java/com/android/incallui/answer/impl/answermethod/res/values-ta/strings.xml
@@ -1,12 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_answer" msgid="2959042172304267183">"பதிலளிக்க, மேலே ஸ்வைப் செய்யவும்"</string>
-    <string name="call_incoming_swipe_to_reject" msgid="463322705441386885">"நிராகரிக்க, கீழே ஸ்வைப் செய்யவும்"</string>
-    <string name="a11y_incoming_call_swipe_to_answer" msgid="6992663569851713736">"அழைப்பிற்குப் பதிலளிக்க மேலேயும், நிராகரிக்க கீழேயும் இருவிரல்களால் ஸ்வைப் செய்யவும்"</string>
-    <string name="call_incoming_will_disconnect" msgid="7095934149229485541">"இந்த அழைப்பிற்குப் பதிலளித்தால், உங்கள் வீடியோ அழைப்பு துண்டிக்கப்படும்"</string>
-    <string name="a11y_call_incoming_decline_description" msgid="4441041052558364987">"நிராகரி"</string>
-    <string name="call_incoming_decline" msgid="2982110738106661231">"நிராகரி"</string>
-    <string name="a11y_call_incoming_answer_description" msgid="1623200501347799736">"பதிலளி"</string>
-    <string name="call_incoming_answer" msgid="841798555883717852">"பதிலளி"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_answer">பதிலளிக்க, மேலே ஸ்வைப் செய்யவும்</string>
+  <string name="call_incoming_swipe_to_reject">நிராகரிக்க, கீழே ஸ்வைப் செய்யவும்</string>
+  <string name="a11y_incoming_call_swipe_to_answer">அழைப்பிற்குப் பதிலளிக்க மேலேயும், நிராகரிக்க கீழேயும் இருவிரல்களால் ஸ்வைப் செய்யவும்</string>
+  <string name="call_incoming_will_disconnect">இந்த அழைப்பிற்குப் பதிலளித்தால், உங்கள் வீடியோ அழைப்பு துண்டிக்கப்படும்</string>
+  <string name="a11y_call_incoming_decline_description">நிராகரி</string>
+  <string name="call_incoming_decline">நிராகரி</string>
+  <string name="a11y_call_incoming_answer_description">பதிலளி</string>
+  <string name="call_incoming_answer">பதிலளி</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/answermethod/res/values-te/strings.xml b/java/com/android/incallui/answer/impl/answermethod/res/values-te/strings.xml
index 9d0589c..767916b 100644
--- a/java/com/android/incallui/answer/impl/answermethod/res/values-te/strings.xml
+++ b/java/com/android/incallui/answer/impl/answermethod/res/values-te/strings.xml
@@ -1,12 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_answer" msgid="2959042172304267183">"సమాధానం ఇవ్వడానికి పైకి స్వైప్ చేయండి"</string>
-    <string name="call_incoming_swipe_to_reject" msgid="463322705441386885">"తిరస్కరించడానికి క్రిందికి స్వైప్ చేయండి"</string>
-    <string name="a11y_incoming_call_swipe_to_answer" msgid="6992663569851713736">"కాల్‌కు సమాధానమివ్వడానికి రెండు వేళ్లతో పైకి స్వైప్ చేయండి లేదా కాల్‌ను తిరస్కరించడానికి రెండు వేళ్లతో కిందికి స్వైప్ చేయండి"</string>
-    <string name="call_incoming_will_disconnect" msgid="7095934149229485541">"ఈ కాల్‌కు సమాధానమిస్తే, మీ వీడియో కాల్ ముగుస్తుంది"</string>
-    <string name="a11y_call_incoming_decline_description" msgid="4441041052558364987">"తిరస్కరిస్తుంది"</string>
-    <string name="call_incoming_decline" msgid="2982110738106661231">"తిరస్కరించు"</string>
-    <string name="a11y_call_incoming_answer_description" msgid="1623200501347799736">"సమాధానం ఇస్తుంది"</string>
-    <string name="call_incoming_answer" msgid="841798555883717852">"సమాధానం ఇవ్వండి"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_answer">సమాధానం ఇవ్వడానికి పైకి స్వైప్ చేయండి</string>
+  <string name="call_incoming_swipe_to_reject">తిరస్కరించడానికి క్రిందికి స్వైప్ చేయండి</string>
+  <string name="a11y_incoming_call_swipe_to_answer">కాల్‌కు సమాధానమివ్వడానికి రెండు వేళ్లతో పైకి స్వైప్ చేయండి లేదా కాల్‌ను తిరస్కరించడానికి రెండు వేళ్లతో కిందికి స్వైప్ చేయండి</string>
+  <string name="call_incoming_will_disconnect">ఈ కాల్‌కు సమాధానమిస్తే, మీ వీడియో కాల్ ముగుస్తుంది</string>
+  <string name="a11y_call_incoming_decline_description">తిరస్కరిస్తుంది</string>
+  <string name="call_incoming_decline">తిరస్కరించు</string>
+  <string name="a11y_call_incoming_answer_description">సమాధానం ఇస్తుంది</string>
+  <string name="call_incoming_answer">సమాధానం ఇవ్వండి</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/answermethod/res/values-th/strings.xml b/java/com/android/incallui/answer/impl/answermethod/res/values-th/strings.xml
index cea611d..6072117 100644
--- a/java/com/android/incallui/answer/impl/answermethod/res/values-th/strings.xml
+++ b/java/com/android/incallui/answer/impl/answermethod/res/values-th/strings.xml
@@ -1,12 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_answer" msgid="2959042172304267183">"เลื่อนขึ้นเพื่อรับสาย"</string>
-    <string name="call_incoming_swipe_to_reject" msgid="463322705441386885">"เลื่อนลงเพื่อปฏิเสธ"</string>
-    <string name="a11y_incoming_call_swipe_to_answer" msgid="6992663569851713736">"ใช้ 2 นิ้วเลื่อนขึ้นเพื่อรับสายหรือเลื่อนลงเพื่อปฏิเสธ"</string>
-    <string name="call_incoming_will_disconnect" msgid="7095934149229485541">"แฮงเอาท์วิดีโอจะสิ้นสุดหากรับสายเรียกเข้านี้"</string>
-    <string name="a11y_call_incoming_decline_description" msgid="4441041052558364987">"ปฏิเสธ"</string>
-    <string name="call_incoming_decline" msgid="2982110738106661231">"ปฏิเสธ"</string>
-    <string name="a11y_call_incoming_answer_description" msgid="1623200501347799736">"รับสาย"</string>
-    <string name="call_incoming_answer" msgid="841798555883717852">"รับสาย"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_answer">เลื่อนขึ้นเพื่อรับสาย</string>
+  <string name="call_incoming_swipe_to_reject">เลื่อนลงเพื่อปฏิเสธ</string>
+  <string name="a11y_incoming_call_swipe_to_answer">ใช้ 2 นิ้วเลื่อนขึ้นเพื่อรับสายหรือเลื่อนลงเพื่อปฏิเสธ</string>
+  <string name="call_incoming_will_disconnect"> Hangouts วิดีโอจะสิ้นสุดหากรับสายเรียกเข้านี้</string>
+  <string name="a11y_call_incoming_decline_description">ปฏิเสธ</string>
+  <string name="call_incoming_decline">ปฏิเสธ</string>
+  <string name="a11y_call_incoming_answer_description">รับสาย</string>
+  <string name="call_incoming_answer">รับสาย</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/answermethod/res/values-tl/strings.xml b/java/com/android/incallui/answer/impl/answermethod/res/values-tl/strings.xml
index 3946a6b..734b38c 100644
--- a/java/com/android/incallui/answer/impl/answermethod/res/values-tl/strings.xml
+++ b/java/com/android/incallui/answer/impl/answermethod/res/values-tl/strings.xml
@@ -1,12 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_answer" msgid="2959042172304267183">"I-swipe nang pataas upang sagutin"</string>
-    <string name="call_incoming_swipe_to_reject" msgid="463322705441386885">"I-swipe nang pababa upang tanggihan"</string>
-    <string name="a11y_incoming_call_swipe_to_answer" msgid="6992663569851713736">"I-swipe nang pataas gamit ang dalawang daliri upang sagutin o nang pababa upang tanggihan ang tawag"</string>
-    <string name="call_incoming_will_disconnect" msgid="7095934149229485541">"Tatapusin ng pagsagot sa tawag na ito ang iyong video call"</string>
-    <string name="a11y_call_incoming_decline_description" msgid="4441041052558364987">"Tanggihan"</string>
-    <string name="call_incoming_decline" msgid="2982110738106661231">"Tanggihan"</string>
-    <string name="a11y_call_incoming_answer_description" msgid="1623200501347799736">"Sagutin"</string>
-    <string name="call_incoming_answer" msgid="841798555883717852">"Sagutin"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_answer">I-swipe nang pataas upang sagutin</string>
+  <string name="call_incoming_swipe_to_reject">I-swipe nang pababa upang tanggihan</string>
+  <string name="a11y_incoming_call_swipe_to_answer">I-swipe nang pataas gamit ang dalawang daliri upang sagutin o nang pababa upang tanggihan ang tawag</string>
+  <string name="call_incoming_will_disconnect">Tatapusin ng pagsagot sa tawag na ito ang iyong video call</string>
+  <string name="a11y_call_incoming_decline_description">Tanggihan</string>
+  <string name="call_incoming_decline">Tanggihan</string>
+  <string name="a11y_call_incoming_answer_description">Sagutin</string>
+  <string name="call_incoming_answer">Sagutin</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/answermethod/res/values-tr/strings.xml b/java/com/android/incallui/answer/impl/answermethod/res/values-tr/strings.xml
index 0f57e40..13f1c3b 100644
--- a/java/com/android/incallui/answer/impl/answermethod/res/values-tr/strings.xml
+++ b/java/com/android/incallui/answer/impl/answermethod/res/values-tr/strings.xml
@@ -1,12 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_answer" msgid="2959042172304267183">"Cevaplamak için hızlıca yukarı kaydırın"</string>
-    <string name="call_incoming_swipe_to_reject" msgid="463322705441386885">"Reddetmek için hızlıca aşağı kaydırın"</string>
-    <string name="a11y_incoming_call_swipe_to_answer" msgid="6992663569851713736">"Çağrıyı cevaplamak için iki parmağınızla yukarı doğru, reddetmek içinse aşağı doğru hızlıca kaydırın"</string>
-    <string name="call_incoming_will_disconnect" msgid="7095934149229485541">"Bu çağrıyı cevapladığınızda görüntülü görüşmeniz sonlandırılacak"</string>
-    <string name="a11y_call_incoming_decline_description" msgid="4441041052558364987">"Reddedin"</string>
-    <string name="call_incoming_decline" msgid="2982110738106661231">"Reddet"</string>
-    <string name="a11y_call_incoming_answer_description" msgid="1623200501347799736">"Cevaplayın"</string>
-    <string name="call_incoming_answer" msgid="841798555883717852">"Cevapla"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_answer">Cevaplamak için hızlıca yukarı kaydırın</string>
+  <string name="call_incoming_swipe_to_reject">Reddetmek için hızlıca aşağı kaydırın</string>
+  <string name="a11y_incoming_call_swipe_to_answer">Çağrıyı cevaplamak için iki parmağınızla yukarı doğru, reddetmek içinse aşağı doğru hızlıca kaydırın</string>
+  <string name="call_incoming_will_disconnect">Bu çağrıyı cevapladığınızda görüntülü görüşmeniz sonlandırılacak</string>
+  <string name="a11y_call_incoming_decline_description">Reddedin</string>
+  <string name="call_incoming_decline">Reddet</string>
+  <string name="a11y_call_incoming_answer_description">Cevaplayın</string>
+  <string name="call_incoming_answer">Cevapla</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/answermethod/res/values-uk/strings.xml b/java/com/android/incallui/answer/impl/answermethod/res/values-uk/strings.xml
index ba57a04..cdd8699 100644
--- a/java/com/android/incallui/answer/impl/answermethod/res/values-uk/strings.xml
+++ b/java/com/android/incallui/answer/impl/answermethod/res/values-uk/strings.xml
@@ -1,12 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_answer" msgid="2959042172304267183">"Проведіть пальцем угору, щоб відповісти"</string>
-    <string name="call_incoming_swipe_to_reject" msgid="463322705441386885">"Проведіть пальцем униз, щоб відхилити"</string>
-    <string name="a11y_incoming_call_swipe_to_answer" msgid="6992663569851713736">"Проведіть двома пальцями вгору, щоб відповісти, або вниз, щоб відхилити виклик"</string>
-    <string name="call_incoming_will_disconnect" msgid="7095934149229485541">"Якщо відповісти на цей виклик, буде завершено відеодзвінок"</string>
-    <string name="a11y_call_incoming_decline_description" msgid="4441041052558364987">"Відхилити"</string>
-    <string name="call_incoming_decline" msgid="2982110738106661231">"Відхилити"</string>
-    <string name="a11y_call_incoming_answer_description" msgid="1623200501347799736">"Відповісти"</string>
-    <string name="call_incoming_answer" msgid="841798555883717852">"Відповісти"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_answer">Проведіть пальцем угору, щоб відповісти</string>
+  <string name="call_incoming_swipe_to_reject">Проведіть пальцем униз, щоб відхилити</string>
+  <string name="a11y_incoming_call_swipe_to_answer">Проведіть двома пальцями вгору, щоб відповісти, або вниз, щоб відхилити виклик</string>
+  <string name="call_incoming_will_disconnect">Якщо відповісти на цей виклик, буде завершено відеодзвінок</string>
+  <string name="a11y_call_incoming_decline_description">Відхилити</string>
+  <string name="call_incoming_decline">Відхилити</string>
+  <string name="a11y_call_incoming_answer_description">Відповісти</string>
+  <string name="call_incoming_answer">Відповісти</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/answermethod/res/values-ur/strings.xml b/java/com/android/incallui/answer/impl/answermethod/res/values-ur/strings.xml
index e836ace..cafe06b 100644
--- a/java/com/android/incallui/answer/impl/answermethod/res/values-ur/strings.xml
+++ b/java/com/android/incallui/answer/impl/answermethod/res/values-ur/strings.xml
@@ -1,12 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_answer" msgid="2959042172304267183">"جواب دینے کیلئے اوپر سوائپ کریں"</string>
-    <string name="call_incoming_swipe_to_reject" msgid="463322705441386885">"رد کرنے کیلئے نیچے سوائپ کریں"</string>
-    <string name="a11y_incoming_call_swipe_to_answer" msgid="6992663569851713736">"جواب دینے کیلئے دو انگلیوں سے اوپر یا کال مسترد کرنے کیلئے نیچے سوائپ کریں"</string>
-    <string name="call_incoming_will_disconnect" msgid="7095934149229485541">"اس کال کا جواب دینے سے آپ کی ویڈیو کال ختم ہو جائے گی"</string>
-    <string name="a11y_call_incoming_decline_description" msgid="4441041052558364987">"مسترد کریں"</string>
-    <string name="call_incoming_decline" msgid="2982110738106661231">"مسترد کریں"</string>
-    <string name="a11y_call_incoming_answer_description" msgid="1623200501347799736">"جواب دیں"</string>
-    <string name="call_incoming_answer" msgid="841798555883717852">"جواب دیں"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_answer">جواب دینے کیلئے اوپر سوائپ کریں</string>
+  <string name="call_incoming_swipe_to_reject">رد کرنے کیلئے نیچے سوائپ کریں</string>
+  <string name="a11y_incoming_call_swipe_to_answer">جواب دینے کیلئے دو انگلیوں سے اوپر یا کال مسترد کرنے کیلئے نیچے سوائپ کریں</string>
+  <string name="call_incoming_will_disconnect">اس کال کا جواب دینے سے آپ کی ویڈیو کال ختم ہو جائے گی</string>
+  <string name="a11y_call_incoming_decline_description">مسترد کریں</string>
+  <string name="call_incoming_decline">مسترد کریں</string>
+  <string name="a11y_call_incoming_answer_description">جواب دیں</string>
+  <string name="call_incoming_answer">جواب دیں</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/answermethod/res/values-uz/strings.xml b/java/com/android/incallui/answer/impl/answermethod/res/values-uz/strings.xml
index c662326..db37571 100644
--- a/java/com/android/incallui/answer/impl/answermethod/res/values-uz/strings.xml
+++ b/java/com/android/incallui/answer/impl/answermethod/res/values-uz/strings.xml
@@ -1,12 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_answer" msgid="2959042172304267183">"Javob berish uchun suring"</string>
-    <string name="call_incoming_swipe_to_reject" msgid="463322705441386885">"Rad etish uchun pastga suring"</string>
-    <string name="a11y_incoming_call_swipe_to_answer" msgid="6992663569851713736">"Qo‘ng‘iroqqa javob berish uchun ikki barmoq bilan tepaga yoki rad etish uchun pastga suring."</string>
-    <string name="call_incoming_will_disconnect" msgid="7095934149229485541">"Bu qo‘ng‘iroqqa javob berilsa, davom etayotgan video qo‘ng‘iroq tugatiladi."</string>
-    <string name="a11y_call_incoming_decline_description" msgid="4441041052558364987">"Rad etish"</string>
-    <string name="call_incoming_decline" msgid="2982110738106661231">"Rad etish"</string>
-    <string name="a11y_call_incoming_answer_description" msgid="1623200501347799736">"Javob berish"</string>
-    <string name="call_incoming_answer" msgid="841798555883717852">"Javob berish"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_answer">Javob berish uchun suring</string>
+  <string name="call_incoming_swipe_to_reject">Rad etish uchun pastga suring</string>
+  <string name="a11y_incoming_call_swipe_to_answer">Qo‘ng‘iroqqa javob berish uchun ikki barmoq bilan tepaga yoki rad etish uchun pastga suring.</string>
+  <string name="call_incoming_will_disconnect">Bu qo‘ng‘iroqqa javob berilsa, davom etayotgan video qo‘ng‘iroq tugatiladi.</string>
+  <string name="a11y_call_incoming_decline_description">Rad etish</string>
+  <string name="call_incoming_decline">Rad etish</string>
+  <string name="a11y_call_incoming_answer_description">Javob berish</string>
+  <string name="call_incoming_answer">Javob berish</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/answermethod/res/values-vi/strings.xml b/java/com/android/incallui/answer/impl/answermethod/res/values-vi/strings.xml
index 003ad2f..390bd05 100644
--- a/java/com/android/incallui/answer/impl/answermethod/res/values-vi/strings.xml
+++ b/java/com/android/incallui/answer/impl/answermethod/res/values-vi/strings.xml
@@ -1,12 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_answer" msgid="2959042172304267183">"Vuốt lên để trả lời"</string>
-    <string name="call_incoming_swipe_to_reject" msgid="463322705441386885">"Vuốt xuống để từ chối"</string>
-    <string name="a11y_incoming_call_swipe_to_answer" msgid="6992663569851713736">"Dùng hai ngón tay vuốt lên để trả lời hoặc vuốt xuống để từ chối cuộc gọi"</string>
-    <string name="call_incoming_will_disconnect" msgid="7095934149229485541">"Trả lời cuộc gọi này sẽ kết thúc cuộc gọi điện video của bạn"</string>
-    <string name="a11y_call_incoming_decline_description" msgid="4441041052558364987">"Từ chối"</string>
-    <string name="call_incoming_decline" msgid="2982110738106661231">"Từ chối"</string>
-    <string name="a11y_call_incoming_answer_description" msgid="1623200501347799736">"Trả lời"</string>
-    <string name="call_incoming_answer" msgid="841798555883717852">"Trả lời"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_answer">Vuốt lên để trả lời</string>
+  <string name="call_incoming_swipe_to_reject">Vuốt xuống để từ chối</string>
+  <string name="a11y_incoming_call_swipe_to_answer">Dùng hai ngón tay vuốt lên để trả lời hoặc vuốt xuống để từ chối cuộc gọi</string>
+  <string name="call_incoming_will_disconnect">Trả lời cuộc gọi này sẽ kết thúc cuộc gọi điện video của bạn</string>
+  <string name="a11y_call_incoming_decline_description">Từ chối</string>
+  <string name="call_incoming_decline">Từ chối</string>
+  <string name="a11y_call_incoming_answer_description">Trả lời</string>
+  <string name="call_incoming_answer">Trả lời</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/answermethod/res/values-zh-rCN/strings.xml b/java/com/android/incallui/answer/impl/answermethod/res/values-zh-rCN/strings.xml
index 25e8cdf..648da1a 100644
--- a/java/com/android/incallui/answer/impl/answermethod/res/values-zh-rCN/strings.xml
+++ b/java/com/android/incallui/answer/impl/answermethod/res/values-zh-rCN/strings.xml
@@ -1,12 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_answer" msgid="2959042172304267183">"向上滑动即可接听"</string>
-    <string name="call_incoming_swipe_to_reject" msgid="463322705441386885">"向下滑动即可拒接"</string>
-    <string name="a11y_incoming_call_swipe_to_answer" msgid="6992663569851713736">"用双指向上滑动即可接听来电，向下滑动则可拒接来电"</string>
-    <string name="call_incoming_will_disconnect" msgid="7095934149229485541">"如果接听此来电，您的视频通话会中断"</string>
-    <string name="a11y_call_incoming_decline_description" msgid="4441041052558364987">"拒接"</string>
-    <string name="call_incoming_decline" msgid="2982110738106661231">"拒接"</string>
-    <string name="a11y_call_incoming_answer_description" msgid="1623200501347799736">"接听"</string>
-    <string name="call_incoming_answer" msgid="841798555883717852">"接听"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_answer">向上滑动即可接听</string>
+  <string name="call_incoming_swipe_to_reject">向下滑动即可拒接</string>
+  <string name="a11y_incoming_call_swipe_to_answer">用双指向上滑动即可接听来电，向下滑动则可拒接来电</string>
+  <string name="call_incoming_will_disconnect">如果接听此来电，您的视频通话会中断</string>
+  <string name="a11y_call_incoming_decline_description">拒接</string>
+  <string name="call_incoming_decline">拒接</string>
+  <string name="a11y_call_incoming_answer_description">接听</string>
+  <string name="call_incoming_answer">接听</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/answermethod/res/values-zh-rHK/strings.xml b/java/com/android/incallui/answer/impl/answermethod/res/values-zh-rHK/strings.xml
index ad8cb1b..64d377d 100644
--- a/java/com/android/incallui/answer/impl/answermethod/res/values-zh-rHK/strings.xml
+++ b/java/com/android/incallui/answer/impl/answermethod/res/values-zh-rHK/strings.xml
@@ -1,12 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_answer" msgid="2959042172304267183">"向上滑動即可接聽"</string>
-    <string name="call_incoming_swipe_to_reject" msgid="463322705441386885">"向下滑動即可拒絕"</string>
-    <string name="a11y_incoming_call_swipe_to_answer" msgid="6992663569851713736">"雙指向上滑動可接聽來電，向下滑動則可拒絕來電"</string>
-    <string name="call_incoming_will_disconnect" msgid="7095934149229485541">"如果接聽此來電，視像通話就會停止"</string>
-    <string name="a11y_call_incoming_decline_description" msgid="4441041052558364987">"拒絕"</string>
-    <string name="call_incoming_decline" msgid="2982110738106661231">"拒絕"</string>
-    <string name="a11y_call_incoming_answer_description" msgid="1623200501347799736">"接聽"</string>
-    <string name="call_incoming_answer" msgid="841798555883717852">"接聽"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_answer">向上滑動即可接聽</string>
+  <string name="call_incoming_swipe_to_reject">向下滑動即可拒絕</string>
+  <string name="a11y_incoming_call_swipe_to_answer">雙指向上滑動可接聽來電，向下滑動則可拒絕來電</string>
+  <string name="call_incoming_will_disconnect">如果接聽此來電，視像通話就會停止</string>
+  <string name="a11y_call_incoming_decline_description">拒絕</string>
+  <string name="call_incoming_decline">拒絕</string>
+  <string name="a11y_call_incoming_answer_description">接聽</string>
+  <string name="call_incoming_answer">接聽</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/answermethod/res/values-zh-rTW/strings.xml b/java/com/android/incallui/answer/impl/answermethod/res/values-zh-rTW/strings.xml
index 1364e57..17622e6 100644
--- a/java/com/android/incallui/answer/impl/answermethod/res/values-zh-rTW/strings.xml
+++ b/java/com/android/incallui/answer/impl/answermethod/res/values-zh-rTW/strings.xml
@@ -1,12 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_answer" msgid="2959042172304267183">"向上滑動接聽"</string>
-    <string name="call_incoming_swipe_to_reject" msgid="463322705441386885">"向下滑動拒接"</string>
-    <string name="a11y_incoming_call_swipe_to_answer" msgid="6992663569851713736">"用雙指向上滑動可接聽來電，向下滑動則可拒接來電"</string>
-    <string name="call_incoming_will_disconnect" msgid="7095934149229485541">"接聽這通來電會結束你的視訊通話"</string>
-    <string name="a11y_call_incoming_decline_description" msgid="4441041052558364987">"拒接"</string>
-    <string name="call_incoming_decline" msgid="2982110738106661231">"拒接"</string>
-    <string name="a11y_call_incoming_answer_description" msgid="1623200501347799736">"接聽"</string>
-    <string name="call_incoming_answer" msgid="841798555883717852">"接聽"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_answer">向上滑動接聽</string>
+  <string name="call_incoming_swipe_to_reject">向下滑動拒接</string>
+  <string name="a11y_incoming_call_swipe_to_answer">用雙指向上滑動可接聽來電，向下滑動則可拒接來電</string>
+  <string name="call_incoming_will_disconnect">接聽這通來電會結束你的視訊通話</string>
+  <string name="a11y_call_incoming_decline_description">拒接</string>
+  <string name="call_incoming_decline">拒接</string>
+  <string name="a11y_call_incoming_answer_description">接聽</string>
+  <string name="call_incoming_answer">接聽</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/answermethod/res/values-zu/strings.xml b/java/com/android/incallui/answer/impl/answermethod/res/values-zu/strings.xml
index 50f7454..dd24361 100644
--- a/java/com/android/incallui/answer/impl/answermethod/res/values-zu/strings.xml
+++ b/java/com/android/incallui/answer/impl/answermethod/res/values-zu/strings.xml
@@ -1,12 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_answer" msgid="2959042172304267183">"Swayiphela phezulu ukuze uphendule"</string>
-    <string name="call_incoming_swipe_to_reject" msgid="463322705441386885">"Swayiphela phansi ukuze unqabele"</string>
-    <string name="a11y_incoming_call_swipe_to_answer" msgid="6992663569851713736">"Swayiphela phezulu ngeminwe emibili ukuze uphendule noma phansi ukuze wenqabe ikholi"</string>
-    <string name="call_incoming_will_disconnect" msgid="7095934149229485541">"Ukuphendula le kholi kuzophelisa ikholi yakho yevidiyo"</string>
-    <string name="a11y_call_incoming_decline_description" msgid="4441041052558364987">"Yenqaba"</string>
-    <string name="call_incoming_decline" msgid="2982110738106661231">"Yenqaba"</string>
-    <string name="a11y_call_incoming_answer_description" msgid="1623200501347799736">"Phendula"</string>
-    <string name="call_incoming_answer" msgid="841798555883717852">"Phendula"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_answer">Swayiphela phezulu ukuze uphendule</string>
+  <string name="call_incoming_swipe_to_reject">Swayiphela phansi ukuze unqabele</string>
+  <string name="a11y_incoming_call_swipe_to_answer">Swayiphela phezulu ngeminwe emibili ukuze uphendule noma phansi ukuze wenqabe ikholi</string>
+  <string name="call_incoming_will_disconnect">Ukuphendula le kholi kuzophelisa ikholi yakho yevidiyo</string>
+  <string name="a11y_call_incoming_decline_description">Yenqaba</string>
+  <string name="call_incoming_decline">Yenqaba</string>
+  <string name="a11y_call_incoming_answer_description">Phendula</string>
+  <string name="call_incoming_answer">Phendula</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/classifier/HumanInteractionClassifier.java b/java/com/android/incallui/answer/impl/classifier/HumanInteractionClassifier.java
index b661579..494a622 100644
--- a/java/com/android/incallui/answer/impl/classifier/HumanInteractionClassifier.java
+++ b/java/com/android/incallui/answer/impl/classifier/HumanInteractionClassifier.java
@@ -20,7 +20,7 @@
 import android.hardware.SensorEvent;
 import android.util.DisplayMetrics;
 import android.view.MotionEvent;
-import com.android.dialer.configprovider.ConfigProviderBindings;
+import com.android.dialer.configprovider.ConfigProviderComponent;
 
 /** An classifier trying to determine whether it is a human interacting with the phone or not. */
 class HumanInteractionClassifier extends Classifier {
@@ -44,7 +44,8 @@
     classifierData = new ClassifierData(dpi, displayMetrics.heightPixels);
     historyEvaluator = new HistoryEvaluator();
     enabled =
-        ConfigProviderBindings.get(context)
+        ConfigProviderComponent.get(context)
+            .getConfigProvider()
             .getBoolean(CONFIG_ANSWER_FALSE_TOUCH_DETECTION_ENABLED, true);
 
     strokeClassifiers =
diff --git a/java/com/android/incallui/answer/impl/hint/AnswerHintFactory.java b/java/com/android/incallui/answer/impl/hint/AnswerHintFactory.java
index 2ed4346..734fa96 100644
--- a/java/com/android/incallui/answer/impl/hint/AnswerHintFactory.java
+++ b/java/com/android/incallui/answer/impl/hint/AnswerHintFactory.java
@@ -24,7 +24,7 @@
 import android.support.annotation.VisibleForTesting;
 import com.android.dialer.common.Assert;
 import com.android.dialer.common.LogUtil;
-import com.android.dialer.configprovider.ConfigProviderBindings;
+import com.android.dialer.configprovider.ConfigProviderComponent;
 import com.android.dialer.storage.StorageComponent;
 import com.android.incallui.util.AccessibilityUtil;
 
@@ -95,7 +95,9 @@
             .unencryptedSharedPrefs()
             .getInt(ANSWERED_COUNT_PREFERENCE_KEY, 0);
     long threshold =
-        ConfigProviderBindings.get(context).getLong(CONFIG_ANSWER_HINT_ANSWERED_THRESHOLD_KEY, 3);
+        ConfigProviderComponent.get(context)
+            .getConfigProvider()
+            .getLong(CONFIG_ANSWER_HINT_ANSWERED_THRESHOLD_KEY, 3);
     LogUtil.i(
         "AnswerHintFactory.shouldShowAnswerHint",
         "answerCount: %d, threshold: %d",
@@ -110,7 +112,8 @@
    *     string.
    */
   private static boolean isDeviceWhitelisted(Context context, String device) {
-    return ConfigProviderBindings.get(context)
+    return ConfigProviderComponent.get(context)
+        .getConfigProvider()
         .getString(CONFIG_ANSWER_HINT_WHITELISTED_DEVICES_KEY, DEFAULT_WHITELISTED_DEVICES_CSV)
         .contains("/" + device + "/");
   }
diff --git a/java/com/android/incallui/answer/impl/hint/PawImageLoaderImpl.java b/java/com/android/incallui/answer/impl/hint/PawImageLoaderImpl.java
index 31b1711..6e91307 100644
--- a/java/com/android/incallui/answer/impl/hint/PawImageLoaderImpl.java
+++ b/java/com/android/incallui/answer/impl/hint/PawImageLoaderImpl.java
@@ -16,11 +16,9 @@
 
 package com.android.incallui.answer.impl.hint;
 
-import android.annotation.TargetApi;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.graphics.drawable.Drawable;
-import android.os.Build.VERSION_CODES;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import com.android.dialer.common.Assert;
@@ -29,7 +27,6 @@
 import com.android.incallui.answer.impl.hint.PawSecretCodeListener.PawType;
 
 /** Decrypt the event payload to be shown if in a specific time range and the key is received. */
-@TargetApi(VERSION_CODES.M)
 public final class PawImageLoaderImpl implements PawImageLoader {
 
   @Override
diff --git a/java/com/android/incallui/answer/impl/hint/PawSecretCodeListener.java b/java/com/android/incallui/answer/impl/hint/PawSecretCodeListener.java
index f6444e5..e9d2c6f 100644
--- a/java/com/android/incallui/answer/impl/hint/PawSecretCodeListener.java
+++ b/java/com/android/incallui/answer/impl/hint/PawSecretCodeListener.java
@@ -25,7 +25,7 @@
 import android.text.TextUtils;
 import android.widget.Toast;
 import com.android.dialer.common.LogUtil;
-import com.android.dialer.configprovider.ConfigProviderBindings;
+import com.android.dialer.configprovider.ConfigProviderComponent;
 import com.android.dialer.logging.DialerImpression.Type;
 import com.android.dialer.logging.Logger;
 import com.android.dialer.storage.StorageComponent;
@@ -62,7 +62,9 @@
       return;
     }
     String secretCode =
-        ConfigProviderBindings.get(context).getString(CONFIG_PAW_SECRET_CODE, "729");
+        ConfigProviderComponent.get(context)
+            .getConfigProvider()
+            .getString(CONFIG_PAW_SECRET_CODE, "729");
     if (secretCode == null) {
       return;
     }
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-af/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-af/strings.xml
index 3a4b714..df8115f 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-af/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-af/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="event_deactivated" msgid="689994223349549274">"Troeteldiermodus af"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="event_deactivated">Troeteldiermodus af</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-am/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-am/strings.xml
index 4a13628..fb3d724 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-am/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-am/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="event_deactivated" msgid="689994223349549274">"የቤት እንስሳ ሁነታ ጠፍቷል"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="event_deactivated">የቤት እንስሳ ሁነታ ጠፍቷል</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-ar/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-ar/strings.xml
index d1b5b80..4edc22a 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-ar/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-ar/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="event_deactivated" msgid="689994223349549274">"وضع الحيوانات الأليفة قيد إيقاف التشغيل"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="event_deactivated">وضع الحيوانات الأليفة قيد إيقاف التشغيل</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-az/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-az/strings.xml
index 3ff2f84..66d8bca 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-az/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-az/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="event_deactivated" msgid="689994223349549274">"Sevimli rejim deaktivdir"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="event_deactivated">Sevimli rejim deaktivdir</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-b+sr+Latn/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-b+sr+Latn/strings.xml
index 7eddb2e..9deaef4 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-b+sr+Latn/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-b+sr+Latn/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="event_deactivated" msgid="689994223349549274">"Režim ljubimca je isključen"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="event_deactivated">Režim ljubimca je isključen</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-be/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-be/strings.xml
index 6fa8cea..637d598 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-be/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-be/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="event_deactivated" msgid="689994223349549274">"Рэжым хатняга гадаванца адключаны"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="event_deactivated">Рэжым хатняга гадаванца адключаны</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-bg/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-bg/strings.xml
index 946ccfe..111b015 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-bg/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-bg/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="event_deactivated" msgid="689994223349549274">"Режимът за домашен любимец е изключен"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="event_deactivated">Режимът за домашен любимец е изключен</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-bn/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-bn/strings.xml
index 9f14d62..48977d0 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-bn/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-bn/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="event_deactivated" msgid="689994223349549274">"পোষা প্রাণী মোড বন্ধ আছে"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="event_deactivated">পোষা প্রাণী মোড বন্ধ আছে</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-bs/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-bs/strings.xml
index a673497..62efdce 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-bs/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-bs/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="event_deactivated" msgid="689994223349549274">"Isključen je način kućnog ljubimca"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="event_deactivated">Isključen je način kućnog ljubimca</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-ca/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-ca/strings.xml
index fc06968..7cf7d59 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-ca/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-ca/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="event_deactivated" msgid="689994223349549274">"Mode de mascota desactivat"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="event_deactivated">Mode de mascota desactivat</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-cs/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-cs/strings.xml
index d879b31..a96420a 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-cs/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-cs/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="event_deactivated" msgid="689994223349549274">"Režim domácího mazlíčka vypnutý"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="event_deactivated">Režim domácího mazlíčka vypnutý</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-da/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-da/strings.xml
index 69af638..6fad202 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-da/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-da/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="event_deactivated" msgid="689994223349549274">"Dyretilstand er slået fra"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="event_deactivated">Dyretilstand er slået fra</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-de/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-de/strings.xml
index 1c07bf0..2fa60b0 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-de/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-de/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="event_deactivated" msgid="689994223349549274">"Tiermodus aus"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="event_deactivated">Tiermodus aus</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-el/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-el/strings.xml
index 88ccdb9..2b9c10c 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-el/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-el/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="event_deactivated" msgid="689994223349549274">"Απενεργοποίηση λειτουργίας κατοικίδιου"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="event_deactivated">Απενεργοποίηση λειτουργίας κατοικίδιου</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-en-rAU/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-en-rAU/strings.xml
index 0abb0cb..dafb46e 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-en-rAU/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-en-rAU/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="event_deactivated" msgid="689994223349549274">"Pet mode off"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="event_deactivated">Pet mode off</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-en-rGB/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-en-rGB/strings.xml
index 0abb0cb..dafb46e 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-en-rGB/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-en-rGB/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="event_deactivated" msgid="689994223349549274">"Pet mode off"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="event_deactivated">Pet mode off</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-en-rIN/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-en-rIN/strings.xml
index 0abb0cb..dafb46e 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-en-rIN/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-en-rIN/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="event_deactivated" msgid="689994223349549274">"Pet mode off"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="event_deactivated">Pet mode off</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-es-rUS/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-es-rUS/strings.xml
index 52f5d2b..99e1d7d 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-es-rUS/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-es-rUS/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="event_deactivated" msgid="689994223349549274">"Modo de mascotas desactivado"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="event_deactivated">Modo de mascotas desactivado</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-es/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-es/strings.xml
index 52f5d2b..99e1d7d 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-es/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-es/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="event_deactivated" msgid="689994223349549274">"Modo de mascotas desactivado"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="event_deactivated">Modo de mascotas desactivado</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-et/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-et/strings.xml
index eca2b40..6362154 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-et/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-et/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="event_deactivated" msgid="689994223349549274">"Lemmikloomarežiim on väljas"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="event_deactivated">Lemmikloomarežiim on väljas</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-eu/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-eu/strings.xml
index 514e5e2..ea06326 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-eu/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-eu/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="event_deactivated" msgid="689994223349549274">"Maskota modua desaktibatu da"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="event_deactivated">Maskota modua desaktibatu da</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-fa/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-fa/strings.xml
index d4f04a9..7061ba0 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-fa/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-fa/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="event_deactivated" msgid="689994223349549274">"حالت حیوان خانگی خاموش"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="event_deactivated">حالت حیوان خانگی خاموش</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-fi/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-fi/strings.xml
index 1221a67..fea1386 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-fi/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-fi/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="event_deactivated" msgid="689994223349549274">"Lemmikkitila pois käytöstä"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="event_deactivated">Lemmikkitila pois käytöstä</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-fr-rCA/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-fr-rCA/strings.xml
index 011ba08..4479c01 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-fr-rCA/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-fr-rCA/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="event_deactivated" msgid="689994223349549274">"Mode Animaux de compagnie désactivé"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="event_deactivated">Mode Animaux de compagnie désactivé</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-fr/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-fr/strings.xml
index 4f00453..dec59e6 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-fr/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-fr/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="event_deactivated" msgid="689994223349549274">"Mode animal de compagnie désactivé"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="event_deactivated">Mode animal de compagnie désactivé</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-gl/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-gl/strings.xml
index 034ffff..033dc5a 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-gl/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-gl/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="event_deactivated" msgid="689994223349549274">"Desactivouse o modo mascota"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="event_deactivated">Desactivouse o modo mascota</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-gu/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-gu/strings.xml
index 8feb3ac..8ccc5f9 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-gu/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-gu/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="event_deactivated" msgid="689994223349549274">"પાળતુ પ્રાણી મોડ બંધ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="event_deactivated">પાળતુ પ્રાણી મોડ બંધ</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-hi/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-hi/strings.xml
index 3a9a8d4..2baeb56 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-hi/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-hi/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="event_deactivated" msgid="689994223349549274">"पालतू मोड बंद है"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="event_deactivated">पालतू मोड बंद है</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-hr/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-hr/strings.xml
index 9497dc8..00b95cf 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-hr/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-hr/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="event_deactivated" msgid="689994223349549274">"Isključen je način animiranog ljubimca"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="event_deactivated">Isključen je način animiranog ljubimca</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-hu/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-hu/strings.xml
index aa6ef92..7678457 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-hu/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-hu/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="event_deactivated" msgid="689994223349549274">"Kisállat mód kikapcsolva"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="event_deactivated">Kisállat mód kikapcsolva</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-hy/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-hy/strings.xml
index bbbdfb7..318c55f 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-hy/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-hy/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="event_deactivated" msgid="689994223349549274">"Առանց թաթերի"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="event_deactivated">Առանց թաթերի</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-in/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-in/strings.xml
index 2dbd5cb..c045ab5 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-in/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-in/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="event_deactivated" msgid="689994223349549274">"Mode hewan peliharaan nonaktif"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="event_deactivated">Mode hewan peliharaan nonaktif</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-is/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-is/strings.xml
index 6d7e30c..a42efa3 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-is/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-is/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="event_deactivated" msgid="689994223349549274">"Slökkt á gæludýrastillingu"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="event_deactivated">Slökkt á gæludýrastillingu</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-it/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-it/strings.xml
index 151dd66..d3d6808 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-it/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-it/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="event_deactivated" msgid="689994223349549274">"Modalità animale domestico disattivata"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="event_deactivated">Modalità animale domestico disattivata</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-iw/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-iw/strings.xml
index a5e82c9..2d74a65 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-iw/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-iw/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="event_deactivated" msgid="689994223349549274">"מצב \'חיית מחמד\' מושבת"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="event_deactivated">מצב \'חיית מחמד\' מושבת</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-ja/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-ja/strings.xml
index 902ac60..4ddd1d3 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-ja/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-ja/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="event_deactivated" msgid="689994223349549274">"ペットモードは OFF になっています"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="event_deactivated">ペットモードは OFF になっています</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-ka/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-ka/strings.xml
index e8f02b8..fe39888 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-ka/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-ka/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="event_deactivated" msgid="689994223349549274">"ზოორეჟიმი გამორთულია"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="event_deactivated">ზოორეჟიმი გამორთულია</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-kk/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-kk/strings.xml
index 66c88e3..8e9d08c 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-kk/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-kk/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="event_deactivated" msgid="689994223349549274">"Жануарлар режимі өшірулі"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="event_deactivated">Жануарлар режимі өшірулі</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-km/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-km/strings.xml
index 6c0d5f7..82d00e4 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-km/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-km/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="event_deactivated" msgid="689994223349549274">"មុខងារ​សត្វចិញ្ចឹម​ត្រូវបាន​បិទ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="event_deactivated">មុខងារ​សត្វចិញ្ចឹម​ត្រូវបាន​បិទ</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-kn/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-kn/strings.xml
index b19a48b..c73887d 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-kn/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-kn/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="event_deactivated" msgid="689994223349549274">"ಪೆಟ್ ಮೋಡ್ ಆಫ್ ಆಗಿದೆ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="event_deactivated">ಪೆಟ್ ಮೋಡ್ ಆಫ್ ಆಗಿದೆ</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-ko/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-ko/strings.xml
index a99c781..2a5b63b 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-ko/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-ko/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="event_deactivated" msgid="689994223349549274">"펫 모드 사용 중지"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="event_deactivated">펫 모드 사용 중지</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-ky/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-ky/strings.xml
index b91eb1d..8d77ecb 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-ky/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-ky/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="event_deactivated" msgid="689994223349549274">"Үй жаныбар режими өчүк"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="event_deactivated">Үй жаныбар режими өчүк</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-lo/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-lo/strings.xml
index 20c34f7..92c87bd 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-lo/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-lo/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="event_deactivated" msgid="689994223349549274">"ປິດໂໝດສັດລ້ຽງ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="event_deactivated">ປິດໂໝດສັດລ້ຽງ</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-lt/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-lt/strings.xml
index fe4d4d2..f982c80 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-lt/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-lt/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="event_deactivated" msgid="689994223349549274">"Naminių gyvūnėlių režimas išjungtas"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="event_deactivated">Naminių gyvūnėlių režimas išjungtas</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-lv/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-lv/strings.xml
index 1c0fd82..cc83d12 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-lv/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-lv/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="event_deactivated" msgid="689994223349549274">"Mājdzīvnieka režīms izslēgts"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="event_deactivated">Mājdzīvnieka režīms izslēgts</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-mk/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-mk/strings.xml
index 860a5da..bb29a19 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-mk/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-mk/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="event_deactivated" msgid="689994223349549274">"Режимот на милениче е исклучен"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="event_deactivated">Режимот на милениче е исклучен</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-ml/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-ml/strings.xml
index e2767df..644adac 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-ml/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-ml/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="event_deactivated" msgid="689994223349549274">"പെറ്റ് മോഡ് ഓഫാക്കി"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="event_deactivated">പെറ്റ് മോഡ് ഓഫാക്കി</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-mn/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-mn/strings.xml
index 4566350..c46149f 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-mn/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-mn/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="event_deactivated" msgid="689994223349549274">"Тэжээвэр амьтны горим идэвхгүй"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="event_deactivated">Тэжээвэр амьтны горим идэвхгүй</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-mr/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-mr/strings.xml
index a7c951e..4764b49 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-mr/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-mr/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="event_deactivated" msgid="689994223349549274">"पाळीव प्राणी मोड बंद"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="event_deactivated">पाळीव प्राणी मोड बंद</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-ms/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-ms/strings.xml
index ed20c6c..0425e4d 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-ms/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-ms/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="event_deactivated" msgid="689994223349549274">"Mod haiwan dimatikan"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="event_deactivated">Mod haiwan dimatikan</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-my/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-my/strings.xml
index 546215b..ad2c1ce 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-my/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-my/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="event_deactivated" msgid="689994223349549274">"အိမ်မွေးတိရိစ္ဆာန်မုဒ်ကို ပိတ်ထားပါသည်"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="event_deactivated">အိမ်မွေးတိရိစ္ဆာန်မုဒ်ကို ပိတ်ထားပါသည်</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-nb/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-nb/strings.xml
index 8c9a2a4..a35b7f9 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-nb/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-nb/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="event_deactivated" msgid="689994223349549274">"Kjæledyrmodus er slått av"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="event_deactivated">Kjæledyrmodus er slått av</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-ne/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-ne/strings.xml
index 4cf54b2..fec875d 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-ne/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-ne/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="event_deactivated" msgid="689994223349549274">"पेेट मोड निष्क्रिय छ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="event_deactivated">पेेट मोड निष्क्रिय छ</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-nl/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-nl/strings.xml
index f8fde70..d7ad9cd 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-nl/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-nl/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="event_deactivated" msgid="689994223349549274">"Huisdiermodus uit"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="event_deactivated">Huisdiermodus uit</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-no/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-no/strings.xml
index 8c9a2a4..a35b7f9 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-no/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-no/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="event_deactivated" msgid="689994223349549274">"Kjæledyrmodus er slått av"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="event_deactivated">Kjæledyrmodus er slått av</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-pa/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-pa/strings.xml
index 03a8bfa..e5f33d4 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-pa/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-pa/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="event_deactivated" msgid="689994223349549274">"ਪਾਲਤੂ ਮੋਡ ਬੰਦ ਹੈ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="event_deactivated">ਪਾਲਤੂ ਮੋਡ ਬੰਦ ਹੈ</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-pl/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-pl/strings.xml
index bb6a7a0..14aaa86 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-pl/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-pl/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="event_deactivated" msgid="689994223349549274">"Tryb pupila wyłączony"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="event_deactivated">Tryb pupila wyłączony</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-pt-rBR/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-pt-rBR/strings.xml
index d364fb3..99c4f77 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-pt-rBR/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-pt-rBR/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="event_deactivated" msgid="689994223349549274">"Modo animal de estimação desativado"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="event_deactivated">Modo animal de estimação desativado</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-pt-rPT/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-pt-rPT/strings.xml
index d364fb3..99c4f77 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-pt-rPT/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-pt-rPT/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="event_deactivated" msgid="689994223349549274">"Modo animal de estimação desativado"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="event_deactivated">Modo animal de estimação desativado</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-pt/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-pt/strings.xml
index d364fb3..99c4f77 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-pt/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-pt/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="event_deactivated" msgid="689994223349549274">"Modo animal de estimação desativado"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="event_deactivated">Modo animal de estimação desativado</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-ro/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-ro/strings.xml
index 3852c47..1fd228a 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-ro/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-ro/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="event_deactivated" msgid="689994223349549274">"Modul Animal de companie este dezactivat."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="event_deactivated">Modul Animal de companie este dezactivat.</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-ru/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-ru/strings.xml
index 43a4de5..c3094e0 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-ru/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-ru/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="event_deactivated" msgid="689994223349549274">"Режим домашнего любимца отключен"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="event_deactivated">Режим домашнего любимца отключен</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-si/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-si/strings.xml
index 99ed893..5856b58 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-si/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-si/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="event_deactivated" msgid="689994223349549274">"සුරතලුන් ප්‍රකාරය ක්‍රියාවිරහිතයි"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="event_deactivated">සුරතලුන් ප්‍රකාරය ක්‍රියාවිරහිතයි</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-sk/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-sk/strings.xml
index d6fc27c..19262a2 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-sk/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-sk/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="event_deactivated" msgid="689994223349549274">"Režim domáceho miláčika je vypnutý"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="event_deactivated">Režim domáceho miláčika je vypnutý</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-sl/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-sl/strings.xml
index 78efcd6..0725d33 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-sl/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-sl/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="event_deactivated" msgid="689994223349549274">"Živalski način je izklopljen"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="event_deactivated">Živalski način je izklopljen</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-sq/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-sq/strings.xml
index dac7869..3922e1c 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-sq/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-sq/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="event_deactivated" msgid="689994223349549274">"Modaliteti i kafshëzës është joaktiv"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="event_deactivated">Modaliteti i kafshëzës është joaktiv</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-sr/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-sr/strings.xml
index 97c61f5..1dd17bc 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-sr/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-sr/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="event_deactivated" msgid="689994223349549274">"Режим љубимца је искључен"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="event_deactivated">Режим љубимца је искључен</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-sv/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-sv/strings.xml
index ff8346f..ae7544a 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-sv/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-sv/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="event_deactivated" msgid="689994223349549274">"Djurläge är inaktiverat"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="event_deactivated">Djurläge är inaktiverat</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-sw/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-sw/strings.xml
index 805aee7..51c89a5 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-sw/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-sw/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="event_deactivated" msgid="689994223349549274">"Hali ya mnyama kipenzi imezimwa"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="event_deactivated">Hali ya mnyama kipenzi imezimwa</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-ta/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-ta/strings.xml
index 025a9bf..01fee71 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-ta/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-ta/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="event_deactivated" msgid="689994223349549274">"செல்லப்பிராணிப் பயன்முறை முடக்கப்பட்டது"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="event_deactivated">செல்லப்பிராணிப் பயன்முறை முடக்கப்பட்டது</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-te/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-te/strings.xml
index e086f5e..5f01a50 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-te/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-te/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="event_deactivated" msgid="689994223349549274">"పెంపుడు జంతువుల మోడ్ ఆఫ్‌లో ఉంది"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="event_deactivated">పెంపుడు జంతువుల మోడ్ ఆఫ్‌లో ఉంది</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-th/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-th/strings.xml
index 55a776d..5edc378 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-th/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-th/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="event_deactivated" msgid="689994223349549274">"โหมดสัตว์เลี้ยงปิดอยู่"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="event_deactivated">โหมดสัตว์เลี้ยงปิดอยู่</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-tl/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-tl/strings.xml
index 5a04173..084a14e 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-tl/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-tl/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="event_deactivated" msgid="689994223349549274">"Naka-off ang pet mode"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="event_deactivated">Naka-off ang pet mode</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-tr/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-tr/strings.xml
index 32c90e0..fb11fdf 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-tr/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-tr/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="event_deactivated" msgid="689994223349549274">"Evcil hayvan modu kapalı"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="event_deactivated">Evcil hayvan modu kapalı</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-uk/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-uk/strings.xml
index be50e61..332ce22 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-uk/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-uk/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="event_deactivated" msgid="689994223349549274">"Режим домашньої тварини вимкнено"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="event_deactivated">Режим домашньої тварини вимкнено</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-ur/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-ur/strings.xml
index d1c0309..10239d7 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-ur/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-ur/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="event_deactivated" msgid="689994223349549274">"پالتو موڈ آف ہے"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="event_deactivated">پالتو موڈ آف ہے</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-uz/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-uz/strings.xml
index 4ce1a90..e9bd0fc 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-uz/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-uz/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="event_deactivated" msgid="689994223349549274">"Uy hayvoni rejimi o‘chiq"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="event_deactivated">Uy hayvoni rejimi o‘chiq</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-vi/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-vi/strings.xml
index 1e0f4f9..ad85e9d 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-vi/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-vi/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="event_deactivated" msgid="689994223349549274">"Chế độ thú cưng bị tắt"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="event_deactivated">Chế độ thú cưng bị tắt</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-zh-rCN/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-zh-rCN/strings.xml
index 46cbb8b..9d1a3dd 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-zh-rCN/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-zh-rCN/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="event_deactivated" msgid="689994223349549274">"宠物模式已关闭"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="event_deactivated">宠物模式已关闭</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-zh-rHK/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-zh-rHK/strings.xml
index 7f7fc94..2af5a34 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-zh-rHK/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-zh-rHK/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="event_deactivated" msgid="689994223349549274">"已關閉寵物模式"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="event_deactivated">已關閉寵物模式</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-zh-rTW/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-zh-rTW/strings.xml
index deb3203..4a5f9b4 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-zh-rTW/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-zh-rTW/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="event_deactivated" msgid="689994223349549274">"寵物模式已關閉"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="event_deactivated">寵物模式已關閉</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/hint/res/values-zu/strings.xml b/java/com/android/incallui/answer/impl/hint/res/values-zu/strings.xml
index 6c1c36b..0b76317 100644
--- a/java/com/android/incallui/answer/impl/hint/res/values-zu/strings.xml
+++ b/java/com/android/incallui/answer/impl/hint/res/values-zu/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="event_deactivated" msgid="689994223349549274">"Imodi yesilwanyana ivaliwe"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="event_deactivated">Imodi yesilwanyana ivaliwe</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/layout/fragment_incoming_call.xml b/java/com/android/incallui/answer/impl/res/layout/fragment_incoming_call.xml
index b17fc73..1672bf9 100644
--- a/java/com/android/incallui/answer/impl/res/layout/fragment_incoming_call.xml
+++ b/java/com/android/incallui/answer/impl/res/layout/fragment_incoming_call.xml
@@ -53,6 +53,13 @@
       android:layout_height="match_parent"
       android:fitsSystemWindows="true">
 
+    <FrameLayout
+        android:id="@+id/answer_method_container"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:clipChildren="false"
+        android:clipToPadding="false"/>
+
     <TextView
         android:id="@+id/videocall_video_off"
         android:layout_width="wrap_content"
@@ -74,6 +81,7 @@
         android:layout_marginTop="24dp"
         android:clipChildren="false"
         android:clipToPadding="false"
+        android:focusable="true"
         android:gravity="top|center_horizontal"
         android:orientation="vertical">
 
@@ -110,21 +118,22 @@
           android:layout_marginStart="24dp"
           android:layout_marginEnd="24dp"/>
 
+      <!-- TODO(a bug): textColorPrimary or textColorPrimaryInverse? -->
       <TextView
           android:id="@+id/incall_important_call_badge"
+          android:textStyle="bold"
           android:layout_width="wrap_content"
           android:layout_height="48dp"
           android:layout_marginTop="4dp"
           android:layout_marginBottom="@dimen/answer_importance_margin_bottom"
-          android:gravity="center"
+          android:background="@drawable/urgent_call_background"
           android:elevation="@dimen/answer_data_elevation"
+          android:gravity="center"
           android:maxLines="1"
           android:text="@string/call_incoming_important"
           android:textAllCaps="true"
-          android:textSize="14sp"
-          android:textStyle="bold"
-          android:textColor="@color/background_dialer_white"
-          android:background="@drawable/urgent_call_background"/>
+          android:textColor="?android:attr/colorBackground"
+          android:textSize="14sp"/>
 
       <FrameLayout
           android:id="@+id/incall_location_holder"
@@ -142,7 +151,16 @@
           android:layout_height="0dp"
           android:layout_weight="1"
           android:clipChildren="false"
-          android:clipToPadding="false"/>
+          android:clipToPadding="false">
+        <LinearLayout
+            android:id="@+id/incall_data_container_chip_container"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal|bottom"
+            android:orientation="horizontal"
+            android:visibility="gone">
+        </LinearLayout>
+      </FrameLayout>
 
       <!-- Space holder for answer method. This is used to get better scaling to make room for
       incall_data_container on different screen size. -->
@@ -151,14 +169,6 @@
           android:layout_height="220dp"/>
 
     </LinearLayout>
-
-    <FrameLayout
-        android:id="@+id/answer_method_container"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:clipChildren="false"
-        android:clipToPadding="false"/>
-
   </FrameLayout>
 
   <com.android.incallui.answer.impl.affordance.SwipeButtonView
diff --git a/java/com/android/incallui/answer/impl/res/values-af/strings.xml b/java/com/android/incallui/answer/impl/res/values-af/strings.xml
index bd20e64..dd10c8f 100644
--- a/java/com/android/incallui/answer/impl/res/values-af/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-af/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"Swiep vanaf ikoon om met boodskap af te wys"</string>
-    <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"Swiep vanaf ikoon om as \'n oudio-oproep te antwoord"</string>
-    <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"Swiep op om te antwoord en die voortgesette oproep aan te hou"</string>
-    <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Swiep op om te antwoord en die aangehoude oproep te beëindig"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Swiep van die ikoon af om te antwoord en die voortgesette oproep te beëindig"</string>
-    <string name="call_incoming_message_custom" msgid="5819492800418293238">"Skryf jou eie …"</string>
-    <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"Skryf jou eie …"</string>
-    <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"Kanselleer"</string>
-    <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Stuur"</string>
-    <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"Weier hierdie oproep met ’n boodskap"</string>
-    <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"Antwoord as oudio-oproep"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"Antwoord en beëindig die voortgesette oproep"</string>
-    <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"Weier met boodskap"</string>
-    <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"Antwoord as oudio-oproep"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Antwoord en beëindig die voortgesette oproep"</string>
-    <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Video is af"</string>
-    <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Swiep op met twee vingers om te antwoord. Swiep af met twee vingers om af te wys."</string>
-    <string name="call_incoming_important" msgid="3762352743365137090">"Belangrik"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_decline_with_message">Swiep vanaf ikoon om met boodskap af te wys</string>
+  <string name="call_incoming_swipe_to_answer_video_as_audio">Swiep vanaf ikoon om as \'n oudio-oproep te antwoord</string>
+  <string name="call_incoming_default_label_answer_and_release_second">Swiep op om te antwoord en die voortgesette oproep aan te hou</string>
+  <string name="call_incoming_default_label_answer_and_release_third">Swiep op om te antwoord en die aangehoude oproep te beëindig</string>
+  <string name="call_incoming_swipe_to_answer_and_release">Swiep van die ikoon af om te antwoord en die voortgesette oproep te beëindig</string>
+  <string name="call_incoming_message_custom">Skryf jou eie …</string>
+  <string name="call_incoming_respond_via_sms_custom_message">Skryf jou eie …</string>
+  <string name="call_incoming_custom_message_cancel">Kanselleer</string>
+  <string name="call_incoming_custom_message_send">Stuur</string>
+  <string name="a11y_incoming_call_reject_with_sms">Weier hierdie oproep met ’n boodskap</string>
+  <string name="a11y_incoming_call_answer_video_as_audio">Antwoord as oudio-oproep</string>
+  <string name="a11y_incoming_call_answer_and_release">Antwoord en beëindig die voortgesette oproep</string>
+  <string name="a11y_description_incoming_call_reject_with_sms">Weier met boodskap</string>
+  <string name="a11y_description_incoming_call_answer_video_as_audio">Antwoord as oudio-oproep</string>
+  <string name="a11y_description_incoming_call_answer_and_release">Antwoord en beëindig die voortgesette oproep</string>
+  <string name="call_incoming_video_is_off">Video is af</string>
+  <string name="a11y_incoming_call_swipe_gesture_prompt">Swiep op met twee vingers om te antwoord. Swiep af met twee vingers om af te wys.</string>
+  <string name="call_incoming_important">Belangrik</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-am/strings.xml b/java/com/android/incallui/answer/impl/res/values-am/strings.xml
index 328236c..59ae4a7 100644
--- a/java/com/android/incallui/answer/impl/res/values-am/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-am/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"በመልዕክት ላለመቀበል ከአዶ ያንሸራቱ"</string>
-    <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"እንደ ኦዲዮ ጥሪ ለመመለስ ከአዶ ያንሸራቱ"</string>
-    <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"በመካሄድ ላይ ያለ ጥሪ ለመመለስ እና ለመያዝ ወደ ላይ ያንሸራትቱ"</string>
-    <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"በይቆይ ላይ ያለ ጥሪ ለመመለስ እና ለመጨረስ ወደ ላይ ያንሸራትቱ"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"ለመመለስ እና በመካሄድ ላይ ያለ ጥሪን ለመጨረስ ከአዶ ያንሸራትቱ"</string>
-    <string name="call_incoming_message_custom" msgid="5819492800418293238">"የእራስዎን ይጻፉ…"</string>
-    <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"የእራስዎን ይጻፉ…"</string>
-    <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"ይቅር"</string>
-    <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"ላክ"</string>
-    <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"መልዕክት በመላክ ይህን ጥሪ አይቀበሉ"</string>
-    <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"እንደ ኦዲዮ ጥሪ ይመልሱ"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"ይመልሱ እና በመካሄድ ላይ ያለ ጥሪን ይጨርሱ"</string>
-    <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"መልዕክት በመላክ አይቀበሉ"</string>
-    <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"እንደ ኦዲዮ ጥሪ ይመልሱ"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"ይመልሱ እና በመካሄድ ላይ ያለ ጥሪን ይጨርሱ"</string>
-    <string name="call_incoming_video_is_off" msgid="3216603035158629403">"ቪዲዮ ጠፍቷል"</string>
-    <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"ለመመለስ በሁለት ጣት ወደ ላይ ያንሸራቱ። ላለመቀበል በሁለት ጣት ወደ ታች ያንሸራቱ።"</string>
-    <string name="call_incoming_important" msgid="3762352743365137090">"አስፈላጊ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_decline_with_message">በመልዕክት ላለመቀበል ከአዶ ያንሸራቱ</string>
+  <string name="call_incoming_swipe_to_answer_video_as_audio">እንደ ኦዲዮ ጥሪ ለመመለስ ከአዶ ያንሸራቱ</string>
+  <string name="call_incoming_default_label_answer_and_release_second">በመካሄድ ላይ ያለ ጥሪ ለመመለስ እና ለመያዝ ወደ ላይ ያንሸራትቱ</string>
+  <string name="call_incoming_default_label_answer_and_release_third">በይቆይ ላይ ያለ ጥሪ ለመመለስ እና ለመጨረስ ወደ ላይ ያንሸራትቱ</string>
+  <string name="call_incoming_swipe_to_answer_and_release">ለመመለስ እና በመካሄድ ላይ ያለ ጥሪን ለመጨረስ ከአዶ ያንሸራትቱ</string>
+  <string name="call_incoming_message_custom">የእራስዎን ይጻፉ…</string>
+  <string name="call_incoming_respond_via_sms_custom_message">የእራስዎን ይጻፉ…</string>
+  <string name="call_incoming_custom_message_cancel">ይቅር</string>
+  <string name="call_incoming_custom_message_send">ላክ</string>
+  <string name="a11y_incoming_call_reject_with_sms">መልዕክት በመላክ ይህን ጥሪ አይቀበሉ</string>
+  <string name="a11y_incoming_call_answer_video_as_audio">እንደ ኦዲዮ ጥሪ ይመልሱ</string>
+  <string name="a11y_incoming_call_answer_and_release">ይመልሱ እና በመካሄድ ላይ ያለ ጥሪን ይጨርሱ</string>
+  <string name="a11y_description_incoming_call_reject_with_sms">መልዕክት በመላክ አይቀበሉ</string>
+  <string name="a11y_description_incoming_call_answer_video_as_audio">እንደ ኦዲዮ ጥሪ ይመልሱ</string>
+  <string name="a11y_description_incoming_call_answer_and_release">ይመልሱ እና በመካሄድ ላይ ያለ ጥሪን ይጨርሱ</string>
+  <string name="call_incoming_video_is_off">ቪዲዮ ጠፍቷል</string>
+  <string name="a11y_incoming_call_swipe_gesture_prompt">ለመመለስ በሁለት ጣት ወደ ላይ ያንሸራቱ። ላለመቀበል በሁለት ጣት ወደ ታች ያንሸራቱ።</string>
+  <string name="call_incoming_important">አስፈላጊ</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-ar/strings.xml b/java/com/android/incallui/answer/impl/res/values-ar/strings.xml
index ea6d5da..6eeb934 100644
--- a/java/com/android/incallui/answer/impl/res/values-ar/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-ar/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"تمرير سريع من الرمز للرفض مع إرسال رسالة"</string>
-    <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"مرّر بشكل سريع من الرمز للرد بمكالمة صوتية"</string>
-    <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"التمرير السريع لأعلى للرد وتعليق المكالمة الجارية"</string>
-    <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"التمرير السريع لأعلى للرد وإنهاء المكالمة قيد التعليق"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"التمرير السريع على الرمز للرد وإنهاء مكالمة جارية"</string>
-    <string name="call_incoming_message_custom" msgid="5819492800418293238">"اكتب ردك…"</string>
-    <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"اكتب ردك…"</string>
-    <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"إلغاء"</string>
-    <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"إرسال"</string>
-    <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"رفض هذه المكالمة مع إرسال رسالة"</string>
-    <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"الرد بمكالمة صوتية"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"الرد وإنهاء مكالمة جارية"</string>
-    <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"الرفض مع إرسال رسالة"</string>
-    <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"الرد بمكالمة صوتية"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"الرد وإنهاء مكالمة جارية"</string>
-    <string name="call_incoming_video_is_off" msgid="3216603035158629403">"الفيديو قيد إيقاف التشغيل"</string>
-    <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"مرر بأصبعين لأعلى للرد. مرر بأصبعين لأسفل للرفض."</string>
-    <string name="call_incoming_important" msgid="3762352743365137090">"مهم"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_decline_with_message">تمرير سريع من الرمز للرفض مع إرسال رسالة</string>
+  <string name="call_incoming_swipe_to_answer_video_as_audio">مرّر بشكل سريع من الرمز للرد بمكالمة صوتية</string>
+  <string name="call_incoming_default_label_answer_and_release_second">التمرير السريع لأعلى للرد وتعليق المكالمة الجارية</string>
+  <string name="call_incoming_default_label_answer_and_release_third">التمرير السريع لأعلى للرد وإنهاء المكالمة قيد التعليق</string>
+  <string name="call_incoming_swipe_to_answer_and_release">التمرير السريع على الرمز للرد وإنهاء مكالمة جارية</string>
+  <string name="call_incoming_message_custom">اكتب ردك…</string>
+  <string name="call_incoming_respond_via_sms_custom_message">اكتب ردك…</string>
+  <string name="call_incoming_custom_message_cancel">إلغاء</string>
+  <string name="call_incoming_custom_message_send">إرسال</string>
+  <string name="a11y_incoming_call_reject_with_sms">رفض هذه المكالمة مع إرسال رسالة</string>
+  <string name="a11y_incoming_call_answer_video_as_audio">الرد بمكالمة صوتية</string>
+  <string name="a11y_incoming_call_answer_and_release">الرد وإنهاء مكالمة جارية</string>
+  <string name="a11y_description_incoming_call_reject_with_sms">الرفض مع إرسال رسالة</string>
+  <string name="a11y_description_incoming_call_answer_video_as_audio">الرد بمكالمة صوتية</string>
+  <string name="a11y_description_incoming_call_answer_and_release">الرد وإنهاء مكالمة جارية</string>
+  <string name="call_incoming_video_is_off">الفيديو قيد إيقاف التشغيل</string>
+  <string name="a11y_incoming_call_swipe_gesture_prompt">مرر بأصبعين لأعلى للرد. مرر بأصبعين لأسفل للرفض.</string>
+  <string name="call_incoming_important">مهم</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-az/strings.xml b/java/com/android/incallui/answer/impl/res/values-az/strings.xml
index 6994922..816ffa4 100644
--- a/java/com/android/incallui/answer/impl/res/values-az/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-az/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"Mesaj göndərərək imtina etmək üçün ikonadan sürüşdürün"</string>
-    <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"Audio çağrı kimi cavab vermək üçün ikonadan sürüşdürün"</string>
-    <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"Cavab vermək üçün yuxarı sürüşdürün və gedən zəngi gözlədin"</string>
-    <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Cavab vermək üçün yuxarı sürüşdürün və gözləmədə olan zəngi bitirin"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Cavab vermək üçün ikonadan sürüşdürün və gedən zəngi bitirin"</string>
-    <string name="call_incoming_message_custom" msgid="5819492800418293238">"Özünüzünkünü yazın…"</string>
-    <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"Özünüzünkünü yazın…"</string>
-    <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"Ləğv edin"</string>
-    <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Göndərin"</string>
-    <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"Bu zəngi mesajla rədd edin"</string>
-    <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"Audio çağrı olaraq cavab verin"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"Cavab verin və gedən zəngi bitirin"</string>
-    <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"Mesaj ilə rədd edin"</string>
-    <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"Audio çağrı olaraq cavab verin"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Cavab verin və gedən zəngi bitirin"</string>
-    <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Videoları deaktivdir"</string>
-    <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Cavab vermək üçün iki barmaq ilə yuxarı sürüşdürün. İmtina etmək üçün iki barmaq ilə aşağı sürüşdürün."</string>
-    <string name="call_incoming_important" msgid="3762352743365137090">"Önəmli"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_decline_with_message">Mesaj göndərərək imtina etmək üçün ikonadan sürüşdürün</string>
+  <string name="call_incoming_swipe_to_answer_video_as_audio">Audio çağrı kimi cavab vermək üçün ikonadan sürüşdürün</string>
+  <string name="call_incoming_default_label_answer_and_release_second">Cavab vermək üçün yuxarı sürüşdürün və gedən zəngi gözlədin</string>
+  <string name="call_incoming_default_label_answer_and_release_third">Cavab vermək üçün yuxarı sürüşdürün və gözləmədə olan zəngi bitirin</string>
+  <string name="call_incoming_swipe_to_answer_and_release">Cavab vermək üçün ikonadan sürüşdürün və gedən zəngi bitirin</string>
+  <string name="call_incoming_message_custom">Özünüzünkünü yazın…</string>
+  <string name="call_incoming_respond_via_sms_custom_message">Özünüzünkünü yazın…</string>
+  <string name="call_incoming_custom_message_cancel">Ləğv edin</string>
+  <string name="call_incoming_custom_message_send">Göndərin</string>
+  <string name="a11y_incoming_call_reject_with_sms">Bu zəngi mesajla rədd edin</string>
+  <string name="a11y_incoming_call_answer_video_as_audio">Audio çağrı olaraq cavab verin</string>
+  <string name="a11y_incoming_call_answer_and_release">Cavab verin və gedən zəngi bitirin</string>
+  <string name="a11y_description_incoming_call_reject_with_sms">Mesaj ilə rədd edin</string>
+  <string name="a11y_description_incoming_call_answer_video_as_audio">Audio çağrı olaraq cavab verin</string>
+  <string name="a11y_description_incoming_call_answer_and_release">Cavab verin və gedən zəngi bitirin</string>
+  <string name="call_incoming_video_is_off">Videoları deaktivdir</string>
+  <string name="a11y_incoming_call_swipe_gesture_prompt">Cavab vermək üçün iki barmaq ilə yuxarı sürüşdürün. İmtina etmək üçün iki barmaq ilə aşağı sürüşdürün.</string>
+  <string name="call_incoming_important">Önəmli</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-b+sr+Latn/strings.xml b/java/com/android/incallui/answer/impl/res/values-b+sr+Latn/strings.xml
index 3618613..4e65795 100644
--- a/java/com/android/incallui/answer/impl/res/values-b+sr+Latn/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-b+sr+Latn/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"Prevucite od ikone da biste odbili porukom"</string>
-    <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"Prevucite od ikone da biste odgovorili audio pozivom"</string>
-    <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"Prevucite nagore da biste odgovorili i zadržali poziv koji je u toku"</string>
-    <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Prevucite nagore da biste odgovorili i završili poziv koji je na čekanju"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Prevucite od ikone da biste se javili i završili poziv koji je u toku"</string>
-    <string name="call_incoming_message_custom" msgid="5819492800418293238">"Napišite sami…"</string>
-    <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"Napišite sami…"</string>
-    <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"Otkaži"</string>
-    <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Pošalji"</string>
-    <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"Odbijte ovaj poziv porukom"</string>
-    <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"Odgovorite audio pozivom"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"Javite se i završite poziv koji je u toku"</string>
-    <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"Odbijte porukom"</string>
-    <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"Odgovorite audio pozivom"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Javite se i završite poziv koji je u toku"</string>
-    <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Kamera je isključena"</string>
-    <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Prevucite nagore pomoću dva prsta da biste odgovorili. Prevucite nadole pomoću dva prsta da biste odbili."</string>
-    <string name="call_incoming_important" msgid="3762352743365137090">"Važno"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_decline_with_message">Prevucite od ikone da biste odbili porukom</string>
+  <string name="call_incoming_swipe_to_answer_video_as_audio">Prevucite od ikone da biste odgovorili audio pozivom</string>
+  <string name="call_incoming_default_label_answer_and_release_second">Prevucite nagore da biste odgovorili i zadržali poziv koji je u toku</string>
+  <string name="call_incoming_default_label_answer_and_release_third">Prevucite nagore da biste odgovorili i završili poziv koji je na čekanju</string>
+  <string name="call_incoming_swipe_to_answer_and_release">Prevucite od ikone da biste se javili i završili poziv koji je u toku</string>
+  <string name="call_incoming_message_custom">Napišite sami…</string>
+  <string name="call_incoming_respond_via_sms_custom_message">Napišite sami…</string>
+  <string name="call_incoming_custom_message_cancel">Otkaži</string>
+  <string name="call_incoming_custom_message_send">Pošalji</string>
+  <string name="a11y_incoming_call_reject_with_sms">Odbijte ovaj poziv porukom</string>
+  <string name="a11y_incoming_call_answer_video_as_audio">Odgovorite audio pozivom</string>
+  <string name="a11y_incoming_call_answer_and_release">Javite se i završite poziv koji je u toku</string>
+  <string name="a11y_description_incoming_call_reject_with_sms">Odbijte porukom</string>
+  <string name="a11y_description_incoming_call_answer_video_as_audio">Odgovorite audio pozivom</string>
+  <string name="a11y_description_incoming_call_answer_and_release">Javite se i završite poziv koji je u toku</string>
+  <string name="call_incoming_video_is_off">Kamera je isključena</string>
+  <string name="a11y_incoming_call_swipe_gesture_prompt">Prevucite nagore pomoću dva prsta da biste odgovorili. Prevucite nadole pomoću dva prsta da biste odbili.</string>
+  <string name="call_incoming_important">Važno</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-be/strings.xml b/java/com/android/incallui/answer/impl/res/values-be/strings.xml
index 908b2d2..a2fe887 100644
--- a/java/com/android/incallui/answer/impl/res/values-be/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-be/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"Правядзіце ад значка, каб адхіліць, адправіўшы SMS"</string>
-    <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"Правядзіце пальцам ад значка, каб адказаць на аўдыявыклік"</string>
-    <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"Правядзіце пальцам уверх, каб адказаць і ўтрымаць бягучы выклік"</string>
-    <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Правядзіце пальцам уверх, каб адказаць і завяршыць выклік на ўтрыманні"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Правядзіце пальцам ад значка, каб адказаць і скончыць бягучы выклік"</string>
-    <string name="call_incoming_message_custom" msgid="5819492800418293238">"Свой варыянт..."</string>
-    <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"Свой варыянт..."</string>
-    <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"Скасаваць"</string>
-    <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Адправіць"</string>
-    <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"Адхіліць гэты выклік, адправіўшы паведамленне"</string>
-    <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"Адказаць аўдыявыклікам"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"Адказаць і скончыць бягучы выклік"</string>
-    <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"Адхіліць, адправіўшы паведамленне"</string>
-    <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"Адказаць аўдыявыклікам"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Адказаць і скончыць бягучы выклік"</string>
-    <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Відэа адключана"</string>
-    <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Правядзіце двума пальцамі ўверх, каб адказаць; двума пальцамі ўніз – каб адхіліць."</string>
-    <string name="call_incoming_important" msgid="3762352743365137090">"Важны"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_decline_with_message">Правядзіце ад значка, каб адхіліць, адправіўшы SMS</string>
+  <string name="call_incoming_swipe_to_answer_video_as_audio">Правядзіце пальцам ад значка, каб адказаць на аўдыявыклік</string>
+  <string name="call_incoming_default_label_answer_and_release_second">Правядзіце пальцам уверх, каб адказаць і ўтрымаць бягучы выклік</string>
+  <string name="call_incoming_default_label_answer_and_release_third">Правядзіце пальцам уверх, каб адказаць і завяршыць выклік на ўтрыманні</string>
+  <string name="call_incoming_swipe_to_answer_and_release">Правядзіце пальцам ад значка, каб адказаць і скончыць бягучы выклік</string>
+  <string name="call_incoming_message_custom">Свой варыянт...</string>
+  <string name="call_incoming_respond_via_sms_custom_message">Свой варыянт...</string>
+  <string name="call_incoming_custom_message_cancel">Скасаваць</string>
+  <string name="call_incoming_custom_message_send">Адправіць</string>
+  <string name="a11y_incoming_call_reject_with_sms">Адхіліць гэты выклік, адправіўшы паведамленне</string>
+  <string name="a11y_incoming_call_answer_video_as_audio">Адказаць аўдыявыклікам</string>
+  <string name="a11y_incoming_call_answer_and_release">Адказаць і скончыць бягучы выклік</string>
+  <string name="a11y_description_incoming_call_reject_with_sms">Адхіліць, адправіўшы паведамленне</string>
+  <string name="a11y_description_incoming_call_answer_video_as_audio">Адказаць аўдыявыклікам</string>
+  <string name="a11y_description_incoming_call_answer_and_release">Адказаць і скончыць бягучы выклік</string>
+  <string name="call_incoming_video_is_off">Відэа адключана</string>
+  <string name="a11y_incoming_call_swipe_gesture_prompt">Правядзіце двума пальцамі ўверх, каб адказаць; двума пальцамі ўніз – каб адхіліць.</string>
+  <string name="call_incoming_important">Важны</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-bg/strings.xml b/java/com/android/incallui/answer/impl/res/values-bg/strings.xml
index d119ff7..9ac0c71 100644
--- a/java/com/android/incallui/answer/impl/res/values-bg/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-bg/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"Прекарайте пръст от иконата, за да отхвърлите със съобщение"</string>
-    <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"Прекарайте пръст от иконата, за да отговорите като аудиообаждане"</string>
-    <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"Прекарайте пръст нагоре, за да отговорите и да задържите текущото обаждане"</string>
-    <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Прекарайте пръст нагоре, за да отговорите и да завършите задържаното обаждане"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Прекарайте пръст от иконата, за да отговорите и да завършите текущото обаждане"</string>
-    <string name="call_incoming_message_custom" msgid="5819492800418293238">"Напишете свое собствено…"</string>
-    <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"Напишете свое собствено…"</string>
-    <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"Отказ"</string>
-    <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Изпращане"</string>
-    <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"Отхвърляне на това обаждане със съобщение"</string>
-    <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"Отговаряне като аудиообаждане"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"Отговор и завършване на текущото обаждане"</string>
-    <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"Отхвърляне със съобщение"</string>
-    <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"Отговаряне като аудиообаждане"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Отговор и завършване на текущото обаждане"</string>
-    <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Видеото е изключено"</string>
-    <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Прекарайте два пръста нагоре за отговаряне, надолу за отхвърляне."</string>
-    <string name="call_incoming_important" msgid="3762352743365137090">"Важно"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_decline_with_message">Прекарайте пръст от иконата, за да отхвърлите със съобщение</string>
+  <string name="call_incoming_swipe_to_answer_video_as_audio">Прекарайте пръст от иконата, за да отговорите като аудиообаждане</string>
+  <string name="call_incoming_default_label_answer_and_release_second">Прекарайте пръст нагоре, за да отговорите и да задържите текущото обаждане</string>
+  <string name="call_incoming_default_label_answer_and_release_third">Прекарайте пръст нагоре, за да отговорите и да завършите задържаното обаждане</string>
+  <string name="call_incoming_swipe_to_answer_and_release">Прекарайте пръст от иконата, за да отговорите и да завършите текущото обаждане</string>
+  <string name="call_incoming_message_custom">Напишете свое собствено…</string>
+  <string name="call_incoming_respond_via_sms_custom_message">Напишете свое собствено…</string>
+  <string name="call_incoming_custom_message_cancel">Отказ</string>
+  <string name="call_incoming_custom_message_send">Изпращане</string>
+  <string name="a11y_incoming_call_reject_with_sms">Отхвърляне на това обаждане със съобщение</string>
+  <string name="a11y_incoming_call_answer_video_as_audio">Отговаряне като аудиообаждане</string>
+  <string name="a11y_incoming_call_answer_and_release">Отговор и завършване на текущото обаждане</string>
+  <string name="a11y_description_incoming_call_reject_with_sms">Отхвърляне със съобщение</string>
+  <string name="a11y_description_incoming_call_answer_video_as_audio">Отговаряне като аудиообаждане</string>
+  <string name="a11y_description_incoming_call_answer_and_release">Отговор и завършване на текущото обаждане</string>
+  <string name="call_incoming_video_is_off">Видеото е изключено</string>
+  <string name="a11y_incoming_call_swipe_gesture_prompt">Прекарайте два пръста нагоре за отговаряне, надолу за отхвърляне.</string>
+  <string name="call_incoming_important">Важно</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-bn/strings.xml b/java/com/android/incallui/answer/impl/res/values-bn/strings.xml
index a46ec95..3067073 100644
--- a/java/com/android/incallui/answer/impl/res/values-bn/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-bn/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"বার্তা সহ প্রত্যাখ্যান করতে আইকন থেকে সোয়াইপ করুন"</string>
-    <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"একটি অডিও কল হিসেবে উত্তর দিতে আইকন থেকে সোয়াইপ করুন"</string>
-    <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"উত্তর দিতে এবং চালু থাকা কল হোল্ড করতে উপরের দিকে সোয়াইপ করুন"</string>
-    <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"উত্তর দিতে এবং হোল্ডে থাকা কল কেটে দিতে উপরের দিকে সোয়াইপ করুন"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"উত্তর দিতে এবং চলছে এমন কল কেটে দিতে আইকন থেকে সোয়াইপ করুন"</string>
-    <string name="call_incoming_message_custom" msgid="5819492800418293238">"আপনার নিজের পছন্দ মত লিখুন…"</string>
-    <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"আপনার নিজের পছন্দ মত লিখুন…"</string>
-    <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"বাতিল করুন"</string>
-    <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"পাঠান"</string>
-    <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"একটি বার্তা সহ এই কলটি প্রত্যাখ্যান করুন"</string>
-    <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"অডিও কল হিসেবে উত্তর দিন"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"উত্তর দিন এবং  চলছে এমন কল কেটে দিন"</string>
-    <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"বার্তা সহ প্রত্যাখ্যান করুন"</string>
-    <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"অডিও কল হিসেবে উত্তর দিন"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"উত্তর দিন এবং  চলছে এমন কল কেটে দিন"</string>
-    <string name="call_incoming_video_is_off" msgid="3216603035158629403">"ভিডিও বন্ধ আছে"</string>
-    <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"উত্তর দিতে উপরের দিকে, প্রত্যাখ্যান করতে নিচের দিকে দুই আঙুল দিয়ে সোয়াইপ করুন৷"</string>
-    <string name="call_incoming_important" msgid="3762352743365137090">"গুরুত্বপূর্ণ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_decline_with_message">বার্তা সহ প্রত্যাখ্যান করতে আইকন থেকে সোয়াইপ করুন</string>
+  <string name="call_incoming_swipe_to_answer_video_as_audio">একটি অডিও কল হিসেবে উত্তর দিতে আইকন থেকে সোয়াইপ করুন</string>
+  <string name="call_incoming_default_label_answer_and_release_second">উত্তর দিতে এবং চালু থাকা কল হোল্ড করতে উপরের দিকে সোয়াইপ করুন</string>
+  <string name="call_incoming_default_label_answer_and_release_third">উত্তর দিতে এবং হোল্ডে থাকা কল কেটে দিতে উপরের দিকে সোয়াইপ করুন</string>
+  <string name="call_incoming_swipe_to_answer_and_release">উত্তর দিতে এবং চলছে এমন কল কেটে দিতে আইকন থেকে সোয়াইপ করুন</string>
+  <string name="call_incoming_message_custom">আপনার নিজের পছন্দ মত লিখুন…</string>
+  <string name="call_incoming_respond_via_sms_custom_message">আপনার নিজের পছন্দ মত লিখুন…</string>
+  <string name="call_incoming_custom_message_cancel">বাতিল করুন</string>
+  <string name="call_incoming_custom_message_send">পাঠান</string>
+  <string name="a11y_incoming_call_reject_with_sms">একটি বার্তা সহ এই কলটি প্রত্যাখ্যান করুন</string>
+  <string name="a11y_incoming_call_answer_video_as_audio">অডিও কল হিসেবে উত্তর দিন</string>
+  <string name="a11y_incoming_call_answer_and_release">উত্তর দিন এবং  চলছে এমন কল কেটে দিন</string>
+  <string name="a11y_description_incoming_call_reject_with_sms">বার্তা সহ প্রত্যাখ্যান করুন</string>
+  <string name="a11y_description_incoming_call_answer_video_as_audio">অডিও কল হিসেবে উত্তর দিন</string>
+  <string name="a11y_description_incoming_call_answer_and_release">উত্তর দিন এবং  চলছে এমন কল কেটে দিন</string>
+  <string name="call_incoming_video_is_off">ভিডিও বন্ধ আছে</string>
+  <string name="a11y_incoming_call_swipe_gesture_prompt">উত্তর দিতে উপরের দিকে, প্রত্যাখ্যান করতে নিচের দিকে দুই আঙুল দিয়ে সোয়াইপ করুন৷</string>
+  <string name="call_incoming_important">গুরুত্বপূর্ণ</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-bs/strings.xml b/java/com/android/incallui/answer/impl/res/values-bs/strings.xml
index 38bc3d3..6813f22 100644
--- a/java/com/android/incallui/answer/impl/res/values-bs/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-bs/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"Prevucite preko ikone da odbijete porukom"</string>
-    <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"Prevucite preko ikone da prihvatite kao audiopoziv"</string>
-    <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"Prevucite nagore da odgovorite na poziv koji je u toku i da ga stavite na čekanje"</string>
-    <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Prevucite nagore da odgovorite na poziv i završite poziv koji je na čekanju"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Prevucite ikonu da odgovorite na poziv i završite ga"</string>
-    <string name="call_incoming_message_custom" msgid="5819492800418293238">"Napišite svoj…"</string>
-    <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"Napišite svoj…"</string>
-    <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"Otkaži"</string>
-    <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Pošalji"</string>
-    <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"Odbij poziv porukom"</string>
-    <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"Prihvati kao audiopoziv"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"Odgovorite na poziv i završite ga"</string>
-    <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"Odbij porukom"</string>
-    <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"Prihvati kao audiopoziv"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Odgovorite na poziv i završite ga"</string>
-    <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Kamera je isključena"</string>
-    <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Prevucite pomoću dva prsta prema gore da odgovorite. Prevucite pomoću dva prsta prema dolje da odbijete."</string>
-    <string name="call_incoming_important" msgid="3762352743365137090">"Važno"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_decline_with_message">Prevucite preko ikone da odbijete porukom</string>
+  <string name="call_incoming_swipe_to_answer_video_as_audio">Prevucite preko ikone da prihvatite kao audiopoziv</string>
+  <string name="call_incoming_default_label_answer_and_release_second">Prevucite nagore da odgovorite na poziv koji je u toku i da ga stavite na čekanje</string>
+  <string name="call_incoming_default_label_answer_and_release_third">Prevucite nagore da odgovorite na poziv i završite poziv koji je na čekanju</string>
+  <string name="call_incoming_swipe_to_answer_and_release">Prevucite ikonu da odgovorite na poziv i završite ga</string>
+  <string name="call_incoming_message_custom">Napišite svoj…</string>
+  <string name="call_incoming_respond_via_sms_custom_message">Napišite svoj…</string>
+  <string name="call_incoming_custom_message_cancel">Otkaži</string>
+  <string name="call_incoming_custom_message_send">Pošalji</string>
+  <string name="a11y_incoming_call_reject_with_sms">Odbij poziv porukom</string>
+  <string name="a11y_incoming_call_answer_video_as_audio">Prihvati kao audiopoziv</string>
+  <string name="a11y_incoming_call_answer_and_release">Odgovorite na poziv i završite ga</string>
+  <string name="a11y_description_incoming_call_reject_with_sms">Odbij porukom</string>
+  <string name="a11y_description_incoming_call_answer_video_as_audio">Prihvati kao audiopoziv</string>
+  <string name="a11y_description_incoming_call_answer_and_release">Odgovorite na poziv i završite ga</string>
+  <string name="call_incoming_video_is_off">Kamera je isključena</string>
+  <string name="a11y_incoming_call_swipe_gesture_prompt">Prevucite pomoću dva prsta prema gore da odgovorite. Prevucite pomoću dva prsta prema dolje da odbijete.</string>
+  <string name="call_incoming_important">Važno</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-ca/strings.xml b/java/com/android/incallui/answer/impl/res/values-ca/strings.xml
index 0989b02..e9cfe62 100644
--- a/java/com/android/incallui/answer/impl/res/values-ca/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-ca/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"Llisca des de la icona per rebutjar la trucada amb un missatge"</string>
-    <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"Llisca des de la icona per respondre amb una trucada d\'àudio"</string>
-    <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"Llisca cap amunt per respondre a la trucada i posar l\'actual en espera"</string>
-    <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Llisca cap amunt per respondre a la trucada i finalitzar la que està en espera"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Llisca des de la icona per respondre a la trucada i finalitzar l\'actual"</string>
-    <string name="call_incoming_message_custom" msgid="5819492800418293238">"Escriu la teva…"</string>
-    <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"Escriu la teva…"</string>
-    <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"Cancel·la"</string>
-    <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Envia"</string>
-    <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"Rebutja aquesta trucada amb un missatge"</string>
-    <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"Respon amb una trucada d\'àudio"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"Respon a la trucada i finalitza l\'actual"</string>
-    <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"Rebutja amb un missatge"</string>
-    <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"Respon amb una trucada d\'àudio"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Respon a la trucada i finalitza l\'actual"</string>
-    <string name="call_incoming_video_is_off" msgid="3216603035158629403">"El vídeo està desactivat"</string>
-    <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Llisca amb dos dits cap amunt per respondre a la trucada i cap avall per rebutjar-la."</string>
-    <string name="call_incoming_important" msgid="3762352743365137090">"Important"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_decline_with_message">Llisca des de la icona per rebutjar la trucada amb un missatge</string>
+  <string name="call_incoming_swipe_to_answer_video_as_audio">Llisca des de la icona per respondre amb una trucada d\'àudio</string>
+  <string name="call_incoming_default_label_answer_and_release_second">Llisca cap amunt per respondre a la trucada i posar l\'actual en espera</string>
+  <string name="call_incoming_default_label_answer_and_release_third">Llisca cap amunt per respondre a la trucada i finalitzar la que està en espera</string>
+  <string name="call_incoming_swipe_to_answer_and_release">Llisca des de la icona per respondre a la trucada i finalitzar l\'actual</string>
+  <string name="call_incoming_message_custom">Escriu la teva…</string>
+  <string name="call_incoming_respond_via_sms_custom_message">Escriu la teva…</string>
+  <string name="call_incoming_custom_message_cancel">Cancel·la</string>
+  <string name="call_incoming_custom_message_send">Envia</string>
+  <string name="a11y_incoming_call_reject_with_sms">Rebutja aquesta trucada amb un missatge</string>
+  <string name="a11y_incoming_call_answer_video_as_audio">Respon amb una trucada d\'àudio</string>
+  <string name="a11y_incoming_call_answer_and_release">Respon a la trucada i finalitza l\'actual</string>
+  <string name="a11y_description_incoming_call_reject_with_sms">Rebutja amb un missatge</string>
+  <string name="a11y_description_incoming_call_answer_video_as_audio">Respon amb una trucada d\'àudio</string>
+  <string name="a11y_description_incoming_call_answer_and_release">Respon a la trucada i finalitza l\'actual</string>
+  <string name="call_incoming_video_is_off">El vídeo està desactivat</string>
+  <string name="a11y_incoming_call_swipe_gesture_prompt">Llisca amb dos dits cap amunt per respondre a la trucada i cap avall per rebutjar-la.</string>
+  <string name="call_incoming_important">Important</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-cs/strings.xml b/java/com/android/incallui/answer/impl/res/values-cs/strings.xml
index effd45a..ef6d537 100644
--- a/java/com/android/incallui/answer/impl/res/values-cs/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-cs/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"Přejetím prstem od ikony hovor odmítnete a pošlete zprávu"</string>
-    <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"Přejetím prstem od ikony hovor přijmete jako hlasový hovor"</string>
-    <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"Přejetím prstem nahoru hovor přijmete a probíhající hovor podržíte"</string>
-    <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Přejetím prstem nahoru hovor přijmete a podržený hovor ukončíte"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Přejetím prstem od ikony hovor přijmete a probíhající hovor ukončíte"</string>
-    <string name="call_incoming_message_custom" msgid="5819492800418293238">"Napište vlastní odpověď…"</string>
-    <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"Napište vlastní odpověď…"</string>
-    <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"Zrušit"</string>
-    <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Odeslat"</string>
-    <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"Odmítnout hovor a poslat zprávu"</string>
-    <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"Přijmout jako hlasový hovor"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"Přijmout hovor a ukončit probíhající hovor"</string>
-    <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"Odmítnout a poslat zprávu"</string>
-    <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"Přijmout jako hlasový hovor"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Přijmout hovor a ukončit probíhající hovor"</string>
-    <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Video je vypnuté"</string>
-    <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Přejetím dvěma prsty nahoru hovor přijmete. Přejetím dvěma prsty dolů jej odmítnete."</string>
-    <string name="call_incoming_important" msgid="3762352743365137090">"Důležité"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_decline_with_message">Přejetím prstem od ikony hovor odmítnete a pošlete zprávu</string>
+  <string name="call_incoming_swipe_to_answer_video_as_audio">Přejetím prstem od ikony hovor přijmete jako hlasový hovor</string>
+  <string name="call_incoming_default_label_answer_and_release_second">Přejetím prstem nahoru hovor přijmete a probíhající hovor podržíte</string>
+  <string name="call_incoming_default_label_answer_and_release_third">Přejetím prstem nahoru hovor přijmete a podržený hovor ukončíte</string>
+  <string name="call_incoming_swipe_to_answer_and_release">Přejetím prstem od ikony hovor přijmete a probíhající hovor ukončíte</string>
+  <string name="call_incoming_message_custom">Napište vlastní odpověď…</string>
+  <string name="call_incoming_respond_via_sms_custom_message">Napište vlastní odpověď…</string>
+  <string name="call_incoming_custom_message_cancel">Zrušit</string>
+  <string name="call_incoming_custom_message_send">Odeslat</string>
+  <string name="a11y_incoming_call_reject_with_sms">Odmítnout hovor a poslat zprávu</string>
+  <string name="a11y_incoming_call_answer_video_as_audio">Přijmout jako hlasový hovor</string>
+  <string name="a11y_incoming_call_answer_and_release">Přijmout hovor a ukončit probíhající hovor</string>
+  <string name="a11y_description_incoming_call_reject_with_sms">Odmítnout a poslat zprávu</string>
+  <string name="a11y_description_incoming_call_answer_video_as_audio">Přijmout jako hlasový hovor</string>
+  <string name="a11y_description_incoming_call_answer_and_release">Přijmout hovor a ukončit probíhající hovor</string>
+  <string name="call_incoming_video_is_off">Video je vypnuté</string>
+  <string name="a11y_incoming_call_swipe_gesture_prompt">Přejetím dvěma prsty nahoru hovor přijmete. Přejetím dvěma prsty dolů jej odmítnete.</string>
+  <string name="call_incoming_important">Důležité</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-da/strings.xml b/java/com/android/incallui/answer/impl/res/values-da/strings.xml
index d174ab7..34e432b 100644
--- a/java/com/android/incallui/answer/impl/res/values-da/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-da/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"Stryg fra ikonet for at afvise med en besked"</string>
-    <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"Stryg fra ikonet for at besvare som et taleopkald"</string>
-    <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"Stryg op for at besvare og sætte det igangværende opkald i venteposition"</string>
-    <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Stryg op for at besvare og afslutte opkaldet i venteposition"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Stryg fra ikonet for at besvare og afslutte det igangværende opkald"</string>
-    <string name="call_incoming_message_custom" msgid="5819492800418293238">"Skriv dit eget…"</string>
-    <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"Skriv dit eget…"</string>
-    <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"Annuller"</string>
-    <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Send"</string>
-    <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"Afvis dette opkald med en besked"</string>
-    <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"Besvar som taleopkald"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"Besvar, og afslut det igangværende opkald"</string>
-    <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"Afvis med en besked"</string>
-    <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"Besvar som taleopkald"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Besvar, og afslut det igangværende opkald"</string>
-    <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Video er deaktiveret"</string>
-    <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Stryg op med to fingre for at besvare. Stryg ned med to fingre for at afvise."</string>
-    <string name="call_incoming_important" msgid="3762352743365137090">"Vigtigt"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_decline_with_message">Stryg fra ikonet for at afvise med en besked</string>
+  <string name="call_incoming_swipe_to_answer_video_as_audio">Stryg fra ikonet for at besvare som et taleopkald</string>
+  <string name="call_incoming_default_label_answer_and_release_second">Stryg op for at besvare og sætte det igangværende opkald i venteposition</string>
+  <string name="call_incoming_default_label_answer_and_release_third">Stryg op for at besvare og afslutte opkaldet i venteposition</string>
+  <string name="call_incoming_swipe_to_answer_and_release">Stryg fra ikonet for at besvare og afslutte det igangværende opkald</string>
+  <string name="call_incoming_message_custom">Skriv dit eget…</string>
+  <string name="call_incoming_respond_via_sms_custom_message">Skriv dit eget…</string>
+  <string name="call_incoming_custom_message_cancel">Annuller</string>
+  <string name="call_incoming_custom_message_send">Send</string>
+  <string name="a11y_incoming_call_reject_with_sms">Afvis dette opkald med en besked</string>
+  <string name="a11y_incoming_call_answer_video_as_audio">Besvar som taleopkald</string>
+  <string name="a11y_incoming_call_answer_and_release">Besvar, og afslut det igangværende opkald</string>
+  <string name="a11y_description_incoming_call_reject_with_sms">Afvis med en besked</string>
+  <string name="a11y_description_incoming_call_answer_video_as_audio">Besvar som taleopkald</string>
+  <string name="a11y_description_incoming_call_answer_and_release">Besvar, og afslut det igangværende opkald</string>
+  <string name="call_incoming_video_is_off">Video er deaktiveret</string>
+  <string name="a11y_incoming_call_swipe_gesture_prompt">Stryg op med to fingre for at besvare. Stryg ned med to fingre for at afvise.</string>
+  <string name="call_incoming_important">Vigtigt</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-de/strings.xml b/java/com/android/incallui/answer/impl/res/values-de/strings.xml
index 24f920c..dcf3879 100644
--- a/java/com/android/incallui/answer/impl/res/values-de/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-de/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"Zum Ablehnen mit Nachricht vom Symbol wegwischen"</string>
-    <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"Zum Annehmen als Sprachanruf vom Symbol wegwischen"</string>
-    <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"Wische nach oben, um den Anruf anzunehmen und den aktuellen Anruf zu halten"</string>
-    <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Wische nach oben, um den Anruf anzunehmen und den gehaltenen Anruf zu beenden"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Wische vom Symbol weg, um den Anruf anzunehmen und den aktuellen Anruf zu beenden"</string>
-    <string name="call_incoming_message_custom" msgid="5819492800418293238">"Eigene Antwort schreiben…"</string>
-    <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"Eigene Antwort schreiben…"</string>
-    <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"Abbrechen"</string>
-    <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Senden"</string>
-    <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"Diesen Anruf mit einer Nachricht ablehnen"</string>
-    <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"Als Sprachanruf annehmen"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"Nimm den Anruf an und beende den aktuellen Anruf"</string>
-    <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"Mit Nachricht ablehnen"</string>
-    <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"Als Sprachanruf annehmen"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Nimm den Anruf an und beende den aktuellen Anruf"</string>
-    <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Video deaktiviert"</string>
-    <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Zum Annehmen mit zwei Fingern nach oben wischen. Zum Ablehnen mit zwei Fingern nach unten wischen."</string>
-    <string name="call_incoming_important" msgid="3762352743365137090">"Wichtig"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_decline_with_message">Zum Ablehnen mit Nachricht vom Symbol wegwischen</string>
+  <string name="call_incoming_swipe_to_answer_video_as_audio">Zum Annehmen als Sprachanruf vom Symbol wegwischen</string>
+  <string name="call_incoming_default_label_answer_and_release_second">Wische nach oben, um den Anruf anzunehmen und den aktuellen Anruf zu halten</string>
+  <string name="call_incoming_default_label_answer_and_release_third">Wische nach oben, um den Anruf anzunehmen und den gehaltenen Anruf zu beenden</string>
+  <string name="call_incoming_swipe_to_answer_and_release">Wische vom Symbol weg, um den Anruf anzunehmen und den aktuellen Anruf zu beenden</string>
+  <string name="call_incoming_message_custom">Eigene Antwort schreiben…</string>
+  <string name="call_incoming_respond_via_sms_custom_message">Eigene Antwort schreiben…</string>
+  <string name="call_incoming_custom_message_cancel">Abbrechen</string>
+  <string name="call_incoming_custom_message_send">Senden</string>
+  <string name="a11y_incoming_call_reject_with_sms">Diesen Anruf mit einer Nachricht ablehnen</string>
+  <string name="a11y_incoming_call_answer_video_as_audio">Als Sprachanruf annehmen</string>
+  <string name="a11y_incoming_call_answer_and_release">Nimm den Anruf an und beende den aktuellen Anruf</string>
+  <string name="a11y_description_incoming_call_reject_with_sms">Mit Nachricht ablehnen</string>
+  <string name="a11y_description_incoming_call_answer_video_as_audio">Als Sprachanruf annehmen</string>
+  <string name="a11y_description_incoming_call_answer_and_release">Nimm den Anruf an und beende den aktuellen Anruf</string>
+  <string name="call_incoming_video_is_off">Video deaktiviert</string>
+  <string name="a11y_incoming_call_swipe_gesture_prompt">Zum Annehmen mit zwei Fingern nach oben wischen. Zum Ablehnen mit zwei Fingern nach unten wischen.</string>
+  <string name="call_incoming_important">Wichtig</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-el/strings.xml b/java/com/android/incallui/answer/impl/res/values-el/strings.xml
index a725b45..0c79753 100644
--- a/java/com/android/incallui/answer/impl/res/values-el/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-el/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"Σύρετε από το εικονίδιο προς τα έξω για απόρριψη του μηνύματος"</string>
-    <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"Σύρετε από το εικονίδιο προς τα έξω για απάντηση ως φωνητική κλήση"</string>
-    <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"Σύρετε προς τα επάνω για απάντηση και κράτηση της κλήσης σε εξέλιξη"</string>
-    <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Σύρετε προς τα επάνω για απάντηση και τερματισμό της κλήσης σε εξέλιξη"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Σύρετε από το εικονίδιο προς τα έξω για απάντηση και τερματισμό της κλήσης σε εξέλιξη"</string>
-    <string name="call_incoming_message_custom" msgid="5819492800418293238">"Συντάξτε το δικό σας…"</string>
-    <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"Συντάξτε το δικό σας…"</string>
-    <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"Ακύρωση"</string>
-    <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Αποστολή"</string>
-    <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"Απόρριψη αυτής της κλήσης με μήνυμα"</string>
-    <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"Απάντηση ως φωνητική κλήση"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"Απάντηση και τερματισμός κλήσης σε εξέλιξη"</string>
-    <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"Απόρριψη με μήνυμα"</string>
-    <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"Απάντηση ως φωνητική κλήση"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Απάντηση και τερματισμός κλήσης σε εξέλιξη"</string>
-    <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Το βίντεο είναι ανενεργό"</string>
-    <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Σύρετε με δύο δάχτυλα, προς τα επάνω για απάντηση και προς τα κάτω για απόρριψη."</string>
-    <string name="call_incoming_important" msgid="3762352743365137090">"Σημαντικό"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_decline_with_message">Σύρετε από το εικονίδιο προς τα έξω για απόρριψη του μηνύματος</string>
+  <string name="call_incoming_swipe_to_answer_video_as_audio">Σύρετε από το εικονίδιο προς τα έξω για απάντηση ως φωνητική κλήση</string>
+  <string name="call_incoming_default_label_answer_and_release_second">Σύρετε προς τα επάνω για απάντηση και κράτηση της κλήσης σε εξέλιξη</string>
+  <string name="call_incoming_default_label_answer_and_release_third">Σύρετε προς τα επάνω για απάντηση και τερματισμό της κλήσης σε εξέλιξη</string>
+  <string name="call_incoming_swipe_to_answer_and_release">Σύρετε από το εικονίδιο προς τα έξω για απάντηση και τερματισμό της κλήσης σε εξέλιξη</string>
+  <string name="call_incoming_message_custom">Συντάξτε το δικό σας…</string>
+  <string name="call_incoming_respond_via_sms_custom_message">Συντάξτε το δικό σας…</string>
+  <string name="call_incoming_custom_message_cancel">Ακύρωση</string>
+  <string name="call_incoming_custom_message_send">Αποστολή</string>
+  <string name="a11y_incoming_call_reject_with_sms">Απόρριψη αυτής της κλήσης με μήνυμα</string>
+  <string name="a11y_incoming_call_answer_video_as_audio">Απάντηση ως φωνητική κλήση</string>
+  <string name="a11y_incoming_call_answer_and_release">Απάντηση και τερματισμός κλήσης σε εξέλιξη</string>
+  <string name="a11y_description_incoming_call_reject_with_sms">Απόρριψη με μήνυμα</string>
+  <string name="a11y_description_incoming_call_answer_video_as_audio">Απάντηση ως φωνητική κλήση</string>
+  <string name="a11y_description_incoming_call_answer_and_release">Απάντηση και τερματισμός κλήσης σε εξέλιξη</string>
+  <string name="call_incoming_video_is_off">Το βίντεο είναι ανενεργό</string>
+  <string name="a11y_incoming_call_swipe_gesture_prompt">Σύρετε με δύο δάχτυλα, προς τα επάνω για απάντηση και προς τα κάτω για απόρριψη.</string>
+  <string name="call_incoming_important">Σημαντικό</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-en-rAU/strings.xml b/java/com/android/incallui/answer/impl/res/values-en-rAU/strings.xml
index 2bd3459..9b11e55 100644
--- a/java/com/android/incallui/answer/impl/res/values-en-rAU/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-en-rAU/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"Swipe from icon to decline with a message"</string>
-    <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"Swipe from icon to answer as an audio call"</string>
-    <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"Swipe up to answer and hold ongoing call"</string>
-    <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Swipe up to answer and end call on hold"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Swipe from icon to answer and end ongoing call"</string>
-    <string name="call_incoming_message_custom" msgid="5819492800418293238">"Write your own…"</string>
-    <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"Write your own…"</string>
-    <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"Cancel"</string>
-    <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Send"</string>
-    <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"Reject this call with a message"</string>
-    <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"Answer as an audio call"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"Answer and end ongoing call"</string>
-    <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"Reject with a message"</string>
-    <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"Answer as an audio call"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Answer and end ongoing call"</string>
-    <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Video is off"</string>
-    <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Swipe up with two fingers to answer. Swipe down with two fingers to decline."</string>
-    <string name="call_incoming_important" msgid="3762352743365137090">"Important"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_decline_with_message">Swipe from icon to decline with a message</string>
+  <string name="call_incoming_swipe_to_answer_video_as_audio">Swipe from icon to answer as an audio call</string>
+  <string name="call_incoming_default_label_answer_and_release_second">Swipe up to answer and hold ongoing call</string>
+  <string name="call_incoming_default_label_answer_and_release_third">Swipe up to answer and end call on hold</string>
+  <string name="call_incoming_swipe_to_answer_and_release">Swipe from icon to answer and end ongoing call</string>
+  <string name="call_incoming_message_custom">Write your own…</string>
+  <string name="call_incoming_respond_via_sms_custom_message">Write your own…</string>
+  <string name="call_incoming_custom_message_cancel">Cancel</string>
+  <string name="call_incoming_custom_message_send">Send</string>
+  <string name="a11y_incoming_call_reject_with_sms">Reject this call with a message</string>
+  <string name="a11y_incoming_call_answer_video_as_audio">Answer as an audio call</string>
+  <string name="a11y_incoming_call_answer_and_release">Answer and end ongoing call</string>
+  <string name="a11y_description_incoming_call_reject_with_sms">Reject with a message</string>
+  <string name="a11y_description_incoming_call_answer_video_as_audio">Answer as an audio call</string>
+  <string name="a11y_description_incoming_call_answer_and_release">Answer and end ongoing call</string>
+  <string name="call_incoming_video_is_off">Video is off</string>
+  <string name="a11y_incoming_call_swipe_gesture_prompt">Swipe up with two fingers to answer. Swipe down with two fingers to decline.</string>
+  <string name="call_incoming_important">Important</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-en-rGB/strings.xml b/java/com/android/incallui/answer/impl/res/values-en-rGB/strings.xml
index 2bd3459..9b11e55 100644
--- a/java/com/android/incallui/answer/impl/res/values-en-rGB/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-en-rGB/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"Swipe from icon to decline with a message"</string>
-    <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"Swipe from icon to answer as an audio call"</string>
-    <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"Swipe up to answer and hold ongoing call"</string>
-    <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Swipe up to answer and end call on hold"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Swipe from icon to answer and end ongoing call"</string>
-    <string name="call_incoming_message_custom" msgid="5819492800418293238">"Write your own…"</string>
-    <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"Write your own…"</string>
-    <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"Cancel"</string>
-    <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Send"</string>
-    <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"Reject this call with a message"</string>
-    <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"Answer as an audio call"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"Answer and end ongoing call"</string>
-    <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"Reject with a message"</string>
-    <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"Answer as an audio call"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Answer and end ongoing call"</string>
-    <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Video is off"</string>
-    <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Swipe up with two fingers to answer. Swipe down with two fingers to decline."</string>
-    <string name="call_incoming_important" msgid="3762352743365137090">"Important"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_decline_with_message">Swipe from icon to decline with a message</string>
+  <string name="call_incoming_swipe_to_answer_video_as_audio">Swipe from icon to answer as an audio call</string>
+  <string name="call_incoming_default_label_answer_and_release_second">Swipe up to answer and hold ongoing call</string>
+  <string name="call_incoming_default_label_answer_and_release_third">Swipe up to answer and end call on hold</string>
+  <string name="call_incoming_swipe_to_answer_and_release">Swipe from icon to answer and end ongoing call</string>
+  <string name="call_incoming_message_custom">Write your own…</string>
+  <string name="call_incoming_respond_via_sms_custom_message">Write your own…</string>
+  <string name="call_incoming_custom_message_cancel">Cancel</string>
+  <string name="call_incoming_custom_message_send">Send</string>
+  <string name="a11y_incoming_call_reject_with_sms">Reject this call with a message</string>
+  <string name="a11y_incoming_call_answer_video_as_audio">Answer as an audio call</string>
+  <string name="a11y_incoming_call_answer_and_release">Answer and end ongoing call</string>
+  <string name="a11y_description_incoming_call_reject_with_sms">Reject with a message</string>
+  <string name="a11y_description_incoming_call_answer_video_as_audio">Answer as an audio call</string>
+  <string name="a11y_description_incoming_call_answer_and_release">Answer and end ongoing call</string>
+  <string name="call_incoming_video_is_off">Video is off</string>
+  <string name="a11y_incoming_call_swipe_gesture_prompt">Swipe up with two fingers to answer. Swipe down with two fingers to decline.</string>
+  <string name="call_incoming_important">Important</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-en-rIN/strings.xml b/java/com/android/incallui/answer/impl/res/values-en-rIN/strings.xml
index 2bd3459..9b11e55 100644
--- a/java/com/android/incallui/answer/impl/res/values-en-rIN/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-en-rIN/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"Swipe from icon to decline with a message"</string>
-    <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"Swipe from icon to answer as an audio call"</string>
-    <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"Swipe up to answer and hold ongoing call"</string>
-    <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Swipe up to answer and end call on hold"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Swipe from icon to answer and end ongoing call"</string>
-    <string name="call_incoming_message_custom" msgid="5819492800418293238">"Write your own…"</string>
-    <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"Write your own…"</string>
-    <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"Cancel"</string>
-    <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Send"</string>
-    <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"Reject this call with a message"</string>
-    <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"Answer as an audio call"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"Answer and end ongoing call"</string>
-    <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"Reject with a message"</string>
-    <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"Answer as an audio call"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Answer and end ongoing call"</string>
-    <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Video is off"</string>
-    <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Swipe up with two fingers to answer. Swipe down with two fingers to decline."</string>
-    <string name="call_incoming_important" msgid="3762352743365137090">"Important"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_decline_with_message">Swipe from icon to decline with a message</string>
+  <string name="call_incoming_swipe_to_answer_video_as_audio">Swipe from icon to answer as an audio call</string>
+  <string name="call_incoming_default_label_answer_and_release_second">Swipe up to answer and hold ongoing call</string>
+  <string name="call_incoming_default_label_answer_and_release_third">Swipe up to answer and end call on hold</string>
+  <string name="call_incoming_swipe_to_answer_and_release">Swipe from icon to answer and end ongoing call</string>
+  <string name="call_incoming_message_custom">Write your own…</string>
+  <string name="call_incoming_respond_via_sms_custom_message">Write your own…</string>
+  <string name="call_incoming_custom_message_cancel">Cancel</string>
+  <string name="call_incoming_custom_message_send">Send</string>
+  <string name="a11y_incoming_call_reject_with_sms">Reject this call with a message</string>
+  <string name="a11y_incoming_call_answer_video_as_audio">Answer as an audio call</string>
+  <string name="a11y_incoming_call_answer_and_release">Answer and end ongoing call</string>
+  <string name="a11y_description_incoming_call_reject_with_sms">Reject with a message</string>
+  <string name="a11y_description_incoming_call_answer_video_as_audio">Answer as an audio call</string>
+  <string name="a11y_description_incoming_call_answer_and_release">Answer and end ongoing call</string>
+  <string name="call_incoming_video_is_off">Video is off</string>
+  <string name="a11y_incoming_call_swipe_gesture_prompt">Swipe up with two fingers to answer. Swipe down with two fingers to decline.</string>
+  <string name="call_incoming_important">Important</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-es-rUS/strings.xml b/java/com/android/incallui/answer/impl/res/values-es-rUS/strings.xml
index c159c57..f001c73 100644
--- a/java/com/android/incallui/answer/impl/res/values-es-rUS/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-es-rUS/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"Desliza desde el ícono para rechazar la llamada con un mensaje"</string>
-    <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"Desliza desde el ícono para responder como una llamada de audio"</string>
-    <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"Desliza el dedo hacia arriba para responder y poner en espera la llamada en curso"</string>
-    <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Desliza el dedo hacia arriba para responder y finalizar la llamada en espera"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Desliza el dedo desde el ícono para responder y finalizar la llamada en curso"</string>
-    <string name="call_incoming_message_custom" msgid="5819492800418293238">"Escribe tu propia respuesta…"</string>
-    <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"Escribe tu propia respuesta…"</string>
-    <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"Cancelar"</string>
-    <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Enviar"</string>
-    <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"Rechazar esta llamada con un mensaje"</string>
-    <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"Responder como llamada de audio"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"Responder y finalizar la llamada en curso"</string>
-    <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"Rechazar con un mensaje"</string>
-    <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"Responder como llamada de audio"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Responder y finalizar la llamada en curso"</string>
-    <string name="call_incoming_video_is_off" msgid="3216603035158629403">"El video está desactivado"</string>
-    <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Desliza dos dedos hacia arriba para responder la llamada o hacia abajo para rechazarla."</string>
-    <string name="call_incoming_important" msgid="3762352743365137090">"Importante"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_decline_with_message">Desliza desde el ícono para rechazar la llamada con un mensaje</string>
+  <string name="call_incoming_swipe_to_answer_video_as_audio">Desliza desde el ícono para responder como una llamada de audio</string>
+  <string name="call_incoming_default_label_answer_and_release_second">Desliza el dedo hacia arriba para responder y poner en espera la llamada en curso</string>
+  <string name="call_incoming_default_label_answer_and_release_third">Desliza el dedo hacia arriba para responder y finalizar la llamada en espera</string>
+  <string name="call_incoming_swipe_to_answer_and_release">Desliza el dedo desde el ícono para responder y finalizar la llamada en curso</string>
+  <string name="call_incoming_message_custom">Escribe tu propia respuesta…</string>
+  <string name="call_incoming_respond_via_sms_custom_message">Escribe tu propia respuesta…</string>
+  <string name="call_incoming_custom_message_cancel">Cancelar</string>
+  <string name="call_incoming_custom_message_send">Enviar</string>
+  <string name="a11y_incoming_call_reject_with_sms">Rechazar esta llamada con un mensaje</string>
+  <string name="a11y_incoming_call_answer_video_as_audio">Responder como llamada de audio</string>
+  <string name="a11y_incoming_call_answer_and_release">Responder y finalizar la llamada en curso</string>
+  <string name="a11y_description_incoming_call_reject_with_sms">Rechazar con un mensaje</string>
+  <string name="a11y_description_incoming_call_answer_video_as_audio">Responder como llamada de audio</string>
+  <string name="a11y_description_incoming_call_answer_and_release">Responder y finalizar la llamada en curso</string>
+  <string name="call_incoming_video_is_off">El video está desactivado</string>
+  <string name="a11y_incoming_call_swipe_gesture_prompt">Desliza dos dedos hacia arriba para responder la llamada o hacia abajo para rechazarla.</string>
+  <string name="call_incoming_important">Importante</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-es/strings.xml b/java/com/android/incallui/answer/impl/res/values-es/strings.xml
index 6d98929..2dc755d 100644
--- a/java/com/android/incallui/answer/impl/res/values-es/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-es/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"Desliza desde el icono para rechazar con mensaje"</string>
-    <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"Desliza desde el icono para responder como una llamada de audio"</string>
-    <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"Desliza el dedo hacia arriba para responder a una llamada y para poner en espera la llamada en curso"</string>
-    <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Desliza el dedo hacia arriba para responder a una llamada y para finalizar la llamada en espera"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Desliza el dedo desde el icono para responder a una llamada y para finalizar otra en curso"</string>
-    <string name="call_incoming_message_custom" msgid="5819492800418293238">"Escribe tu propia respuesta…"</string>
-    <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"Escribe tu propia respuesta…"</string>
-    <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"Cancelar"</string>
-    <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Enviar"</string>
-    <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"Rechaza esta llamada con un mensaje"</string>
-    <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"Responde como llamada de audio"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"Responder a una llamada y finalizar otra en curso"</string>
-    <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"Rechaza con un mensaje"</string>
-    <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"Responde como llamada de audio"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Responder a una llamada y finalizar otra en curso"</string>
-    <string name="call_incoming_video_is_off" msgid="3216603035158629403">"El vídeo está desconectado"</string>
-    <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Desliza dos dedos hacia arriba para responder o hacia abajo para rechazar la llamada."</string>
-    <string name="call_incoming_important" msgid="3762352743365137090">"Importante"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_decline_with_message">Desliza desde el icono para rechazar con mensaje</string>
+  <string name="call_incoming_swipe_to_answer_video_as_audio">Desliza desde el icono para responder como una llamada de audio</string>
+  <string name="call_incoming_default_label_answer_and_release_second">Desliza el dedo hacia arriba para responder a una llamada y para poner en espera la llamada en curso</string>
+  <string name="call_incoming_default_label_answer_and_release_third">Desliza el dedo hacia arriba para responder a una llamada y para finalizar la llamada en espera</string>
+  <string name="call_incoming_swipe_to_answer_and_release">Desliza el dedo desde el icono para responder a una llamada y para finalizar otra en curso</string>
+  <string name="call_incoming_message_custom">Escribe tu propia respuesta…</string>
+  <string name="call_incoming_respond_via_sms_custom_message">Escribe tu propia respuesta…</string>
+  <string name="call_incoming_custom_message_cancel">Cancelar</string>
+  <string name="call_incoming_custom_message_send">Enviar</string>
+  <string name="a11y_incoming_call_reject_with_sms">Rechaza esta llamada con un mensaje</string>
+  <string name="a11y_incoming_call_answer_video_as_audio">Responde como llamada de audio</string>
+  <string name="a11y_incoming_call_answer_and_release">Responder a una llamada y finalizar otra en curso</string>
+  <string name="a11y_description_incoming_call_reject_with_sms">Rechaza con un mensaje</string>
+  <string name="a11y_description_incoming_call_answer_video_as_audio">Responde como llamada de audio</string>
+  <string name="a11y_description_incoming_call_answer_and_release">Responder a una llamada y finalizar otra en curso</string>
+  <string name="call_incoming_video_is_off">El vídeo está desconectado</string>
+  <string name="a11y_incoming_call_swipe_gesture_prompt">Desliza dos dedos hacia arriba para responder o hacia abajo para rechazar la llamada.</string>
+  <string name="call_incoming_important">Importante</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-et/strings.xml b/java/com/android/incallui/answer/impl/res/values-et/strings.xml
index 103b796..3984c47 100644
--- a/java/com/android/incallui/answer/impl/res/values-et/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-et/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"Sõnumiga keeldumiseks pühkige ikoonilt eemale"</string>
-    <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"Helikõnena vastamiseks pühkige ikoonilt eemale"</string>
-    <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"Pühkige üles, et vastata ja käimasolev kõne ootele panna"</string>
-    <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Pühkige üles, et vastata ja ootel kõne lõpetada"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Pühkige ikoonilt eemale, et vastata ja käimasolev kõne lõpetada"</string>
-    <string name="call_incoming_message_custom" msgid="5819492800418293238">"Kirjutage ise …"</string>
-    <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"Kirjutage ise …"</string>
-    <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"Tühista"</string>
-    <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Saada"</string>
-    <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"Keeldu kõnest ja saada sõnum"</string>
-    <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"Vasta helikõnena"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"Vastake ja lõpetage käimasolev kõne"</string>
-    <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"Keeldumine ja sõnumi saatmine"</string>
-    <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"Vastamine helikõnena"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Vastake ja lõpetage käimasolev kõne"</string>
-    <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Video on välja lülitatud"</string>
-    <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Vastamiseks pühkige kahe sõrmega üles. Keeldumiseks pühkige kahe sõrmega alla."</string>
-    <string name="call_incoming_important" msgid="3762352743365137090">"Tähtis"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_decline_with_message">Sõnumiga keeldumiseks pühkige ikoonilt eemale</string>
+  <string name="call_incoming_swipe_to_answer_video_as_audio">Helikõnena vastamiseks pühkige ikoonilt eemale</string>
+  <string name="call_incoming_default_label_answer_and_release_second">Pühkige üles, et vastata ja käimasolev kõne ootele panna</string>
+  <string name="call_incoming_default_label_answer_and_release_third">Pühkige üles, et vastata ja ootel kõne lõpetada</string>
+  <string name="call_incoming_swipe_to_answer_and_release">Pühkige ikoonilt eemale, et vastata ja käimasolev kõne lõpetada</string>
+  <string name="call_incoming_message_custom">Kirjutage ise …</string>
+  <string name="call_incoming_respond_via_sms_custom_message">Kirjutage ise …</string>
+  <string name="call_incoming_custom_message_cancel">Tühista</string>
+  <string name="call_incoming_custom_message_send">Saada</string>
+  <string name="a11y_incoming_call_reject_with_sms">Keeldu kõnest ja saada sõnum</string>
+  <string name="a11y_incoming_call_answer_video_as_audio">Vasta helikõnena</string>
+  <string name="a11y_incoming_call_answer_and_release">Vastake ja lõpetage käimasolev kõne</string>
+  <string name="a11y_description_incoming_call_reject_with_sms">Keeldumine ja sõnumi saatmine</string>
+  <string name="a11y_description_incoming_call_answer_video_as_audio">Vastamine helikõnena</string>
+  <string name="a11y_description_incoming_call_answer_and_release">Vastake ja lõpetage käimasolev kõne</string>
+  <string name="call_incoming_video_is_off">Video on välja lülitatud</string>
+  <string name="a11y_incoming_call_swipe_gesture_prompt">Vastamiseks pühkige kahe sõrmega üles. Keeldumiseks pühkige kahe sõrmega alla.</string>
+  <string name="call_incoming_important">Tähtis</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-eu/strings.xml b/java/com/android/incallui/answer/impl/res/values-eu/strings.xml
index 98d9e22..8772fb4 100644
--- a/java/com/android/incallui/answer/impl/res/values-eu/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-eu/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"Pasatu hatza ikonotik baztertzeko eta mezu bat bidaltzeko"</string>
-    <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"Pasatu hatza ikonotik audio-dei gisa erantzuteko"</string>
-    <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"Pasatu hatza gorantz erantzuteko eta uneko deia zain jartzeko"</string>
-    <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Pasatu hatza gorantz erantzuteko eta zain dagoen deia amaitzeko"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Pasatu hatza ikonotik erantzuteko eta uneko deia amaitzeko"</string>
-    <string name="call_incoming_message_custom" msgid="5819492800418293238">"Idatzi erantzuna…"</string>
-    <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"Idatzi erantzuna…"</string>
-    <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"Utzi"</string>
-    <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Bidali"</string>
-    <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"Baztertu dei hau eta bidali mezu bat"</string>
-    <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"Erantzun audio-dei gisa"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"Erantzun eta amaitu uneko deia"</string>
-    <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"Baztertu eta bidali mezu bat"</string>
-    <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"Erantzun audio-dei gisa"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Erantzun eta amaitu uneko deia"</string>
-    <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Desaktibatuta dago kamera"</string>
-    <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Pasatu bi hatz gora erantzuteko; eta behera, baztertzeko."</string>
-    <string name="call_incoming_important" msgid="3762352743365137090">"Garrantzitsua"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_decline_with_message">Pasatu hatza ikonotik baztertzeko eta mezu bat bidaltzeko</string>
+  <string name="call_incoming_swipe_to_answer_video_as_audio">Pasatu hatza ikonotik audio-dei gisa erantzuteko</string>
+  <string name="call_incoming_default_label_answer_and_release_second">Pasatu hatza gora erantzuteko eta uneko deia zain jartzeko</string>
+  <string name="call_incoming_default_label_answer_and_release_third">Pasatu hatza gora erantzuteko eta zain dagoen deia amaitzeko</string>
+  <string name="call_incoming_swipe_to_answer_and_release">Pasatu hatza ikonotik erantzuteko eta uneko deia amaitzeko</string>
+  <string name="call_incoming_message_custom">Idatzi erantzuna…</string>
+  <string name="call_incoming_respond_via_sms_custom_message">Idatzi erantzuna…</string>
+  <string name="call_incoming_custom_message_cancel">Utzi</string>
+  <string name="call_incoming_custom_message_send">Bidali</string>
+  <string name="a11y_incoming_call_reject_with_sms">Baztertu dei hau eta bidali mezu bat</string>
+  <string name="a11y_incoming_call_answer_video_as_audio">Erantzun audio-dei gisa</string>
+  <string name="a11y_incoming_call_answer_and_release">Erantzun eta amaitu uneko deia</string>
+  <string name="a11y_description_incoming_call_reject_with_sms">Baztertu eta bidali mezu bat</string>
+  <string name="a11y_description_incoming_call_answer_video_as_audio">Erantzun audio-dei gisa</string>
+  <string name="a11y_description_incoming_call_answer_and_release">Erantzun eta amaitu uneko deia</string>
+  <string name="call_incoming_video_is_off">Desaktibatuta dago kamera</string>
+  <string name="a11y_incoming_call_swipe_gesture_prompt">Pasatu bi hatz gora erantzuteko; eta behera, baztertzeko.</string>
+  <string name="call_incoming_important">Garrantzitsua</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-fa/strings.xml b/java/com/android/incallui/answer/impl/res/values-fa/strings.xml
index 66818c3..745295e 100644
--- a/java/com/android/incallui/answer/impl/res/values-fa/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-fa/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"برای رد کردن با ارسال پیام، انگشتتان را تند از روی نماد بکشید"</string>
-    <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"برای پاسخ دادن با تماس صوتی، انگشتتان را تند از روی نماد بکشید"</string>
-    <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"برای پاسخ دادن و در انتظار نگه‌داشتن تماس درحال انجام، تند به بالا بکشید"</string>
-    <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"برای پاسخ دادن و پایان دادن به تماس در انتظار، تند به بالا بکشید"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"برای پاسخ دادن به تماس درحال انجام و پایان دادن به آن، انگشتتان را تند از روی نماد بکشید"</string>
-    <string name="call_incoming_message_custom" msgid="5819492800418293238">"بنویسید..."</string>
-    <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"بنویسید..."</string>
-    <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"لغو"</string>
-    <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"ارسال"</string>
-    <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"رد کردن تماس با ارسال پیام"</string>
-    <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"پاسخ با تماس صوتی"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"پاسخ دادن به تماس درحال انجام و پایان دادن به آن"</string>
-    <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"رد کردن با ارسال پیام"</string>
-    <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"پاسخ با تماس صوتی"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"پاسخ دادن به تماس درحال انجام و پایان دادن به آن"</string>
-    <string name="call_incoming_video_is_off" msgid="3216603035158629403">"ویدیو خاموش است"</string>
-    <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"برای پاسخ‌گویی، دو انگشتتان را تند به بالا بکشید و برای رد کردن به پایین بکشید."</string>
-    <string name="call_incoming_important" msgid="3762352743365137090">"مهم"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_decline_with_message">برای رد کردن با ارسال پیام، انگشتتان را تند از روی نماد بکشید</string>
+  <string name="call_incoming_swipe_to_answer_video_as_audio">برای پاسخ دادن با تماس صوتی، انگشتتان را تند از روی نماد بکشید</string>
+  <string name="call_incoming_default_label_answer_and_release_second">برای پاسخ دادن و در انتظار نگه‌داشتن تماس درحال انجام، تند به بالا بکشید</string>
+  <string name="call_incoming_default_label_answer_and_release_third">برای پاسخ دادن و پایان دادن به تماس در انتظار، تند به بالا بکشید</string>
+  <string name="call_incoming_swipe_to_answer_and_release">برای پاسخ دادن به تماس درحال انجام و پایان دادن به آن، انگشتتان را تند از روی نماد بکشید</string>
+  <string name="call_incoming_message_custom">بنویسید...</string>
+  <string name="call_incoming_respond_via_sms_custom_message">بنویسید...</string>
+  <string name="call_incoming_custom_message_cancel">لغو</string>
+  <string name="call_incoming_custom_message_send">ارسال</string>
+  <string name="a11y_incoming_call_reject_with_sms">رد کردن تماس با ارسال پیام</string>
+  <string name="a11y_incoming_call_answer_video_as_audio">پاسخ با تماس صوتی</string>
+  <string name="a11y_incoming_call_answer_and_release">پاسخ دادن به تماس درحال انجام و پایان دادن به آن</string>
+  <string name="a11y_description_incoming_call_reject_with_sms">رد کردن با ارسال پیام</string>
+  <string name="a11y_description_incoming_call_answer_video_as_audio">پاسخ با تماس صوتی</string>
+  <string name="a11y_description_incoming_call_answer_and_release">پاسخ دادن به تماس درحال انجام و پایان دادن به آن</string>
+  <string name="call_incoming_video_is_off">ویدیو خاموش است</string>
+  <string name="a11y_incoming_call_swipe_gesture_prompt">برای پاسخ‌گویی، دو انگشتتان را تند به بالا بکشید و برای رد کردن به پایین بکشید.</string>
+  <string name="call_incoming_important">مهم</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-fi/strings.xml b/java/com/android/incallui/answer/impl/res/values-fi/strings.xml
index 6a0dd9a..920759f 100644
--- a/java/com/android/incallui/answer/impl/res/values-fi/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-fi/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"Hylkää ja kirjoita viesti pyyhkäisemällä kuvaketta."</string>
-    <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"Vastaa äänipuheluna pyyhkäisemällä kuvaketta."</string>
-    <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"Laita nykyinen puhelu pitoon ja vastaa saapuvaan puheluun pyyhkäisemällä ylös"</string>
-    <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Lopeta nykyinen puhelu ja vastaa saapuvaan puheluun pyyhkäisemällä ylös"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Vastaa puheluun ja lopeta nykyinen puhelu pyyhkäisemällä kuvakkeesta."</string>
-    <string name="call_incoming_message_custom" msgid="5819492800418293238">"Kirjoita oma…"</string>
-    <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"Kirjoita oma…"</string>
-    <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"Peruuta"</string>
-    <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Lähetä"</string>
-    <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"Hylkää tämä puhelu viestillä."</string>
-    <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"Vastaa ja aloita äänipuhelu."</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"Vastaa puheluun ja lopeta nykyinen puhelu"</string>
-    <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"Hylkää viestillä"</string>
-    <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"Vastaa ja aloita äänipuhelu"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Vastaa puheluun ja lopeta nykyinen puhelu"</string>
-    <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Videokuva ei ole käytössä."</string>
-    <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Vastaa pyyhkäisemällä ylös kahdella sormella. Hylkää pyyhkäisemällä alas kahdella sormella."</string>
-    <string name="call_incoming_important" msgid="3762352743365137090">"Tärkeä"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_decline_with_message">Hylkää ja kirjoita viesti pyyhkäisemällä kuvaketta.</string>
+  <string name="call_incoming_swipe_to_answer_video_as_audio">Vastaa äänipuheluna pyyhkäisemällä kuvaketta.</string>
+  <string name="call_incoming_default_label_answer_and_release_second">Laita nykyinen puhelu pitoon ja vastaa saapuvaan puheluun pyyhkäisemällä ylös</string>
+  <string name="call_incoming_default_label_answer_and_release_third">Lopeta nykyinen puhelu ja vastaa saapuvaan puheluun pyyhkäisemällä ylös</string>
+  <string name="call_incoming_swipe_to_answer_and_release">Vastaa puheluun ja lopeta nykyinen puhelu pyyhkäisemällä kuvakkeesta.</string>
+  <string name="call_incoming_message_custom">Kirjoita oma…</string>
+  <string name="call_incoming_respond_via_sms_custom_message">Kirjoita oma…</string>
+  <string name="call_incoming_custom_message_cancel">Peruuta</string>
+  <string name="call_incoming_custom_message_send">Lähetä</string>
+  <string name="a11y_incoming_call_reject_with_sms">Hylkää tämä puhelu viestillä.</string>
+  <string name="a11y_incoming_call_answer_video_as_audio">Vastaa ja aloita äänipuhelu.</string>
+  <string name="a11y_incoming_call_answer_and_release">Vastaa puheluun ja lopeta nykyinen puhelu</string>
+  <string name="a11y_description_incoming_call_reject_with_sms">Hylkää viestillä</string>
+  <string name="a11y_description_incoming_call_answer_video_as_audio">Vastaa ja aloita äänipuhelu</string>
+  <string name="a11y_description_incoming_call_answer_and_release">Vastaa puheluun ja lopeta nykyinen puhelu</string>
+  <string name="call_incoming_video_is_off">Videokuva ei ole käytössä.</string>
+  <string name="a11y_incoming_call_swipe_gesture_prompt">Vastaa pyyhkäisemällä ylös kahdella sormella. Hylkää pyyhkäisemällä alas kahdella sormella.</string>
+  <string name="call_incoming_important">Tärkeä</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-fr-rCA/strings.xml b/java/com/android/incallui/answer/impl/res/values-fr-rCA/strings.xml
index f00da8b..d9f3167 100644
--- a/java/com/android/incallui/answer/impl/res/values-fr-rCA/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-fr-rCA/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"Balayez à partir de l\'icône pour refuser avec un message"</string>
-    <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"Balayez à partir de l\'icône pour répondre par appel audio"</string>
-    <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"Balayez l\'écran vers le haut pour répondre et mettre en attente l\'appel en cours"</string>
-    <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Balayez l\'écran vers le haut pour répondre et mettre fin à l\'appel en attente"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Balayez l\'écran à partir de l\'icône pour répondre et mettre fin à l\'appel en cours"</string>
-    <string name="call_incoming_message_custom" msgid="5819492800418293238">"Réponse personnalisée…"</string>
-    <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"Réponse personnalisée…"</string>
-    <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"Annuler"</string>
-    <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Envoyer"</string>
-    <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"Refuser l\'appel et envoyer un message à l\'appelant"</string>
-    <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"Répondre par appel audio"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"Répondre et mettre fin à l\'appel en cours"</string>
-    <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"Refuser avec un message"</string>
-    <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"Répondre par appel audio"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Répondre et mettre fin à l\'appel en cours"</string>
-    <string name="call_incoming_video_is_off" msgid="3216603035158629403">"La vidéo est désactivée"</string>
-    <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Balayez vers le haut avec deux doigts pour répondre. Balayez vers le bas avec deux doigts pour refuser."</string>
-    <string name="call_incoming_important" msgid="3762352743365137090">"Important"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_decline_with_message">Balayez à partir de l\'icône pour refuser avec un message</string>
+  <string name="call_incoming_swipe_to_answer_video_as_audio">Balayez à partir de l\'icône pour répondre par appel audio</string>
+  <string name="call_incoming_default_label_answer_and_release_second">Balayez l\'écran vers le haut pour répondre et mettre en attente l\'appel en cours</string>
+  <string name="call_incoming_default_label_answer_and_release_third">Balayez l\'écran vers le haut pour répondre et mettre fin à l\'appel en attente</string>
+  <string name="call_incoming_swipe_to_answer_and_release">Balayez l\'écran à partir de l\'icône pour répondre et mettre fin à l\'appel en cours</string>
+  <string name="call_incoming_message_custom">Réponse personnalisée…</string>
+  <string name="call_incoming_respond_via_sms_custom_message">Réponse personnalisée…</string>
+  <string name="call_incoming_custom_message_cancel">Annuler</string>
+  <string name="call_incoming_custom_message_send">Envoyer</string>
+  <string name="a11y_incoming_call_reject_with_sms">Refuser l\'appel et envoyer un message à l\'appelant</string>
+  <string name="a11y_incoming_call_answer_video_as_audio">Répondre par appel audio</string>
+  <string name="a11y_incoming_call_answer_and_release">Répondre et mettre fin à l\'appel en cours</string>
+  <string name="a11y_description_incoming_call_reject_with_sms">Refuser avec un message</string>
+  <string name="a11y_description_incoming_call_answer_video_as_audio">Répondre par appel audio</string>
+  <string name="a11y_description_incoming_call_answer_and_release">Répondre et mettre fin à l\'appel en cours</string>
+  <string name="call_incoming_video_is_off">La vidéo est désactivée</string>
+  <string name="a11y_incoming_call_swipe_gesture_prompt">Balayez vers le haut avec deux doigts pour répondre. Balayez vers le bas avec deux doigts pour refuser.</string>
+  <string name="call_incoming_important">Important</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-fr/strings.xml b/java/com/android/incallui/answer/impl/res/values-fr/strings.xml
index c10b584..00579c5 100644
--- a/java/com/android/incallui/answer/impl/res/values-fr/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-fr/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"Appuyer sur l\'icône, puis balayer l\'écran pour refuser l\'appel en envoyant un message"</string>
-    <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"Appuyer sur l\'icône, puis balayer l\'écran pour répondre via un appel audio"</string>
-    <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"Balayer l\'écran vers le haut pour répondre et mettre en attente l\'appel en cours"</string>
-    <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Balayer l\'écran vers le haut pour répondre et mettre fin à l\'appel en attente"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Appuyer sur l\'icône, puis balayer l\'écran pour répondre ou mettre fin à l\'appel en cours"</string>
-    <string name="call_incoming_message_custom" msgid="5819492800418293238">"Réponse personnalisée"</string>
-    <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"Réponse personnalisée"</string>
-    <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"Annuler"</string>
-    <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Envoyer"</string>
-    <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"Refuser cet appel et envoyer un message à l\'appelant"</string>
-    <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"Répondre via un appel audio"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"Répondre ou mettre fin à l\'appel en cours"</string>
-    <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"Refuser avec envoi de message"</string>
-    <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"Répondre via un appel audio"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Répondre ou mettre fin à l\'appel en cours"</string>
-    <string name="call_incoming_video_is_off" msgid="3216603035158629403">"La vidéo est désactivée."</string>
-    <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Balayez l\'écran avec deux doigts vers le haut pour répondre, ou vers le bas pour refuser l\'appel."</string>
-    <string name="call_incoming_important" msgid="3762352743365137090">"Importants"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_decline_with_message">Appuyer sur l\'icône, puis balayer l\'écran pour refuser l\'appel en envoyant un message</string>
+  <string name="call_incoming_swipe_to_answer_video_as_audio">Appuyer sur l\'icône, puis balayer l\'écran pour répondre via un appel audio</string>
+  <string name="call_incoming_default_label_answer_and_release_second">Balayer l\'écran vers le haut pour répondre et mettre en attente l\'appel en cours</string>
+  <string name="call_incoming_default_label_answer_and_release_third">Balayer l\'écran vers le haut pour répondre et mettre fin à l\'appel en attente</string>
+  <string name="call_incoming_swipe_to_answer_and_release">Appuyer sur l\'icône, puis balayer l\'écran pour répondre ou mettre fin à l\'appel en cours</string>
+  <string name="call_incoming_message_custom">Réponse personnalisée</string>
+  <string name="call_incoming_respond_via_sms_custom_message">Réponse personnalisée</string>
+  <string name="call_incoming_custom_message_cancel">Annuler</string>
+  <string name="call_incoming_custom_message_send">Envoyer</string>
+  <string name="a11y_incoming_call_reject_with_sms">Refuser cet appel et envoyer un message à l\'appelant</string>
+  <string name="a11y_incoming_call_answer_video_as_audio">Répondre via un appel audio</string>
+  <string name="a11y_incoming_call_answer_and_release">Répondre ou mettre fin à l\'appel en cours</string>
+  <string name="a11y_description_incoming_call_reject_with_sms">Refuser avec envoi de message</string>
+  <string name="a11y_description_incoming_call_answer_video_as_audio">Répondre via un appel audio</string>
+  <string name="a11y_description_incoming_call_answer_and_release">Répondre ou mettre fin à l\'appel en cours</string>
+  <string name="call_incoming_video_is_off">La vidéo est désactivée.</string>
+  <string name="a11y_incoming_call_swipe_gesture_prompt">Balayez l\'écran avec deux doigts vers le haut pour répondre, ou vers le bas pour refuser l\'appel.</string>
+  <string name="call_incoming_important">Importants</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-gl/strings.xml b/java/com/android/incallui/answer/impl/res/values-gl/strings.xml
index ed04437..b9927b0 100644
--- a/java/com/android/incallui/answer/impl/res/values-gl/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-gl/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"Pasar o dedo desde a icona para rexeitar cunha mensaxe"</string>
-    <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"Pasar o dedo desde a icona para responder como chamada de audio"</string>
-    <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"Pasa o dedo cara arriba para responder e poñer en espera a chamada en curso"</string>
-    <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Pasa o dedo cara arriba para responder e finalizar a chamada en espera"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Pasa o dedo desde a icona para responder á chamada entrante e finalizar a chamada en curso"</string>
-    <string name="call_incoming_message_custom" msgid="5819492800418293238">"Escribe a túa propia…"</string>
-    <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"Escribe a túa propia…"</string>
-    <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"Cancelar"</string>
-    <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Enviar"</string>
-    <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"Rexeitar a chamada cunha mensaxe"</string>
-    <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"Responder como chamada de audio"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"Responde á chamada entrante e finaliza a chamada en curso"</string>
-    <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"Rexeitar con mensaxe"</string>
-    <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"Responder como chamada de audio"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Responde á chamada entrante e finaliza a chamada en curso"</string>
-    <string name="call_incoming_video_is_off" msgid="3216603035158629403">"O vídeo está desactivado"</string>
-    <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Pasa dous dedos cara arriba para responder a chamada ou cara abaixo para rexeitala."</string>
-    <string name="call_incoming_important" msgid="3762352743365137090">"Importante"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_decline_with_message">Pasar o dedo desde a icona para rexeitar cunha mensaxe</string>
+  <string name="call_incoming_swipe_to_answer_video_as_audio">Pasar o dedo desde a icona para responder como chamada de audio</string>
+  <string name="call_incoming_default_label_answer_and_release_second">Pasa o dedo cara arriba para responder e poñer en espera a chamada en curso</string>
+  <string name="call_incoming_default_label_answer_and_release_third">Pasa o dedo cara arriba para responder e finalizar a chamada en espera</string>
+  <string name="call_incoming_swipe_to_answer_and_release">Pasa o dedo desde a icona para responder á chamada entrante e finalizar a chamada en curso</string>
+  <string name="call_incoming_message_custom">Escribe a túa propia…</string>
+  <string name="call_incoming_respond_via_sms_custom_message">Escribe a túa propia…</string>
+  <string name="call_incoming_custom_message_cancel">Cancelar</string>
+  <string name="call_incoming_custom_message_send">Enviar</string>
+  <string name="a11y_incoming_call_reject_with_sms">Rexeitar a chamada cunha mensaxe</string>
+  <string name="a11y_incoming_call_answer_video_as_audio">Responder como chamada de audio</string>
+  <string name="a11y_incoming_call_answer_and_release">Responde á chamada entrante e finaliza a chamada en curso</string>
+  <string name="a11y_description_incoming_call_reject_with_sms">Rexeitar con mensaxe</string>
+  <string name="a11y_description_incoming_call_answer_video_as_audio">Responder como chamada de audio</string>
+  <string name="a11y_description_incoming_call_answer_and_release">Responde á chamada entrante e finaliza a chamada en curso</string>
+  <string name="call_incoming_video_is_off">O vídeo está desactivado</string>
+  <string name="a11y_incoming_call_swipe_gesture_prompt">Pasa dous dedos cara arriba para responder a chamada ou cara abaixo para rexeitala.</string>
+  <string name="call_incoming_important">Importante</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-gu/strings.xml b/java/com/android/incallui/answer/impl/res/values-gu/strings.xml
index c7d31ec..fb80e13 100644
--- a/java/com/android/incallui/answer/impl/res/values-gu/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-gu/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"સંદેશ સાથે નકારવા માટે આઇકનથી સ્વાઇપ કરો"</string>
-    <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"ઑડિઓ કૉલનો જવાબ આપવા માટે આઇકનથી સ્વાઇપ કરો"</string>
-    <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"જવાબ આપવા અને ચાલુ કૉલ હૉલ્ડ પર રાખવા માટે ઉપર સ્વાઇપ કરો"</string>
-    <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"જવાબ આપવા અને હૉલ્ડ પરનો કૉલ સમાપ્ત કરવા માટે ઉપર સ્વાઇપ કરો"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"જવાબ આપવા અને ચાલુ કૉલ સમાપ્ત કરવા માટે આઇકનમાંથી સ્વાઇપ કરો"</string>
-    <string name="call_incoming_message_custom" msgid="5819492800418293238">"તમારો પોતાનો સંદેશ લખો…"</string>
-    <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"તમારો પોતાનો સંદેશ લખો…"</string>
-    <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"રદ કરો"</string>
-    <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"મોકલો"</string>
-    <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"આ કૉલને સંદેશ સાથે નકારો"</string>
-    <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"ઑડિઓ કૉલ તરીકે જવાબ આપો"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"જવાબ આપો અને ચાલુ કૉલ સમાપ્ત કરો"</string>
-    <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"સંદેશ સાથે નકારો"</string>
-    <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"ઑડિઓ કૉલ તરીકે જવાબ આપો"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"જવાબ આપો અને ચાલુ કૉલ સમાપ્ત કરો"</string>
-    <string name="call_incoming_video_is_off" msgid="3216603035158629403">"વિડિઓ બંધ છે"</string>
-    <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"જવાબ આપવા માટે બે આંગળી ઉપર સ્વાઇપ કરો. નકારવા માટે બે આંગળી નીચે સ્વાઇપ કરો."</string>
-    <string name="call_incoming_important" msgid="3762352743365137090">"મહત્વપૂર્ણ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_decline_with_message">સંદેશ સાથે નકારવા માટે આઇકનથી સ્વાઇપ કરો</string>
+  <string name="call_incoming_swipe_to_answer_video_as_audio">ઑડિઓ કૉલનો જવાબ આપવા માટે આઇકનથી સ્વાઇપ કરો</string>
+  <string name="call_incoming_default_label_answer_and_release_second">જવાબ આપવા અને ચાલુ કૉલ હૉલ્ડ પર રાખવા માટે ઉપર સ્વાઇપ કરો</string>
+  <string name="call_incoming_default_label_answer_and_release_third">જવાબ આપવા અને હૉલ્ડ પરનો કૉલ સમાપ્ત કરવા માટે ઉપર સ્વાઇપ કરો</string>
+  <string name="call_incoming_swipe_to_answer_and_release">જવાબ આપવા અને ચાલુ કૉલ સમાપ્ત કરવા માટે આઇકનમાંથી સ્વાઇપ કરો</string>
+  <string name="call_incoming_message_custom">તમારો પોતાનો સંદેશ લખો…</string>
+  <string name="call_incoming_respond_via_sms_custom_message">તમારો પોતાનો સંદેશ લખો…</string>
+  <string name="call_incoming_custom_message_cancel">રદ કરો</string>
+  <string name="call_incoming_custom_message_send">મોકલો</string>
+  <string name="a11y_incoming_call_reject_with_sms">આ કૉલને સંદેશ સાથે નકારો</string>
+  <string name="a11y_incoming_call_answer_video_as_audio">ઑડિઓ કૉલ તરીકે જવાબ આપો</string>
+  <string name="a11y_incoming_call_answer_and_release">જવાબ આપો અને ચાલુ કૉલ સમાપ્ત કરો</string>
+  <string name="a11y_description_incoming_call_reject_with_sms">સંદેશ સાથે નકારો</string>
+  <string name="a11y_description_incoming_call_answer_video_as_audio">ઑડિઓ કૉલ તરીકે જવાબ આપો</string>
+  <string name="a11y_description_incoming_call_answer_and_release">જવાબ આપો અને ચાલુ કૉલ સમાપ્ત કરો</string>
+  <string name="call_incoming_video_is_off">વિડિઓ બંધ છે</string>
+  <string name="a11y_incoming_call_swipe_gesture_prompt">જવાબ આપવા માટે બે આંગળી ઉપર સ્વાઇપ કરો. નકારવા માટે બે આંગળી નીચે સ્વાઇપ કરો.</string>
+  <string name="call_incoming_important">મહત્વપૂર્ણ</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-hi/strings.xml b/java/com/android/incallui/answer/impl/res/values-hi/strings.xml
index d940d3a..4884ea7 100644
--- a/java/com/android/incallui/answer/impl/res/values-hi/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-hi/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"संदेश के साथ अस्वीकार करने के लिए आइकन से स्वाइप करें"</string>
-    <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"ऑडियो कॉल के रूप में उत्तर देने के लिए आइकन से स्वाइप करें"</string>
-    <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"जवाब देने और जारी कॉल को होल्ड पर रखने के लिए ऊपर स्वाइप करें"</string>
-    <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"जवाब देने और होल्ड पर रखा कॉल समाप्त करने के लिए ऊपर स्वाइप करें"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"कॉल का जवाब देने और जारी कॉल समाप्त करने के लिए आइकन से स्वाइप करें"</string>
-    <string name="call_incoming_message_custom" msgid="5819492800418293238">"अपना स्वयं का लिखें…"</string>
-    <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"अपना स्वयं का लिखें…"</string>
-    <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"रद्द करें"</string>
-    <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"भेजें"</string>
-    <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"इस कॉल को संदेश के साथ अस्वीकार करें"</string>
-    <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"ऑडियो कॉल के रूप में उत्तर दें"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"कॉल का जवाब दें और जारी कॉल समाप्त करें"</string>
-    <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"संदेश के साथ अस्वीकार करें"</string>
-    <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"ऑडियो कॉल के रूप में उत्तर दें"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"कॉल का जवाब दें और जारी कॉल समाप्त करें"</string>
-    <string name="call_incoming_video_is_off" msgid="3216603035158629403">"वीडियो बंद है"</string>
-    <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"जवाब देने के लिए दो अंगुलियों से ऊपर स्वाइप करें. अस्वीकार करने के लिए दो अंगुलियों से नीचे स्वाइप करें."</string>
-    <string name="call_incoming_important" msgid="3762352743365137090">"महत्वपूर्ण"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_decline_with_message">संदेश के साथ अस्वीकार करने के लिए आइकन से स्वाइप करें</string>
+  <string name="call_incoming_swipe_to_answer_video_as_audio">ऑडियो कॉल के रूप में उत्तर देने के लिए आइकन से स्वाइप करें</string>
+  <string name="call_incoming_default_label_answer_and_release_second">जवाब देने और जारी कॉल को होल्ड पर रखने के लिए ऊपर स्वाइप करें</string>
+  <string name="call_incoming_default_label_answer_and_release_third">जवाब देने और होल्ड पर रखा कॉल समाप्त करने के लिए ऊपर स्वाइप करें</string>
+  <string name="call_incoming_swipe_to_answer_and_release">कॉल का जवाब देने और जारी कॉल समाप्त करने के लिए आइकन से स्वाइप करें</string>
+  <string name="call_incoming_message_custom">अपना स्वयं का लिखें…</string>
+  <string name="call_incoming_respond_via_sms_custom_message">अपना स्वयं का लिखें…</string>
+  <string name="call_incoming_custom_message_cancel">रद्द करें</string>
+  <string name="call_incoming_custom_message_send">भेजें</string>
+  <string name="a11y_incoming_call_reject_with_sms">इस कॉल को संदेश के साथ अस्वीकार करें</string>
+  <string name="a11y_incoming_call_answer_video_as_audio">ऑडियो कॉल के रूप में उत्तर दें</string>
+  <string name="a11y_incoming_call_answer_and_release">कॉल का जवाब दें और जारी कॉल समाप्त करें</string>
+  <string name="a11y_description_incoming_call_reject_with_sms">संदेश के साथ अस्वीकार करें</string>
+  <string name="a11y_description_incoming_call_answer_video_as_audio">ऑडियो कॉल के रूप में उत्तर दें</string>
+  <string name="a11y_description_incoming_call_answer_and_release">कॉल का जवाब दें और जारी कॉल समाप्त करें</string>
+  <string name="call_incoming_video_is_off">वीडियो बंद है</string>
+  <string name="a11y_incoming_call_swipe_gesture_prompt">जवाब देने के लिए दो अंगुलियों से ऊपर स्वाइप करें. अस्वीकार करने के लिए दो अंगुलियों से नीचे स्वाइप करें.</string>
+  <string name="call_incoming_important">महत्वपूर्ण</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-hr/strings.xml b/java/com/android/incallui/answer/impl/res/values-hr/strings.xml
index 14c30bf..cf6c7c0 100644
--- a/java/com/android/incallui/answer/impl/res/values-hr/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-hr/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"Prijeđite prstom od ikone da biste odbili poruku"</string>
-    <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"Prijeđite prstom od ikone da biste prihvatili kao audiopoziv"</string>
-    <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"Prijeđite prstom prema gore za odgovor na poziv i stavljanje poziva u tijeku na čekanje"</string>
-    <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Prijeđite prstom prema gore za odgovor na poziv i prekidanje poziva na čekanju"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Prijeđite prstom od ikone da biste prihvatili poziv i prekinuli poziv u tijeku"</string>
-    <string name="call_incoming_message_custom" msgid="5819492800418293238">"Napišite vlastiti…"</string>
-    <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"Napišite vlastiti…"</string>
-    <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"Odustani"</string>
-    <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Pošalji"</string>
-    <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"Odbijte ovaj poziv porukom"</string>
-    <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"Prihvatte kao audiopoziv"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"Odgovorite na poziv i prekinite poziv u tijeku"</string>
-    <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"Odbij pomoću poruke"</string>
-    <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"Prihvati kao audiopoziv"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Odgovorite na poziv i prekinite poziv u tijeku"</string>
-    <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Videokamera je isključena"</string>
-    <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Prijeđite dvama prstima prema gore za odgovor, a dvama prstima prema dolje za odbijanje."</string>
-    <string name="call_incoming_important" msgid="3762352743365137090">"Važno"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_decline_with_message">Prijeđite prstom od ikone da biste odbili poruku</string>
+  <string name="call_incoming_swipe_to_answer_video_as_audio">Prijeđite prstom od ikone da biste prihvatili kao audiopoziv</string>
+  <string name="call_incoming_default_label_answer_and_release_second">Prijeđite prstom prema gore za odgovor na poziv i stavljanje poziva u tijeku na čekanje</string>
+  <string name="call_incoming_default_label_answer_and_release_third">Prijeđite prstom prema gore za odgovor na poziv i prekidanje poziva na čekanju</string>
+  <string name="call_incoming_swipe_to_answer_and_release">Prijeđite prstom od ikone da biste prihvatili poziv i prekinuli poziv u tijeku</string>
+  <string name="call_incoming_message_custom">Napišite vlastiti…</string>
+  <string name="call_incoming_respond_via_sms_custom_message">Napišite vlastiti…</string>
+  <string name="call_incoming_custom_message_cancel">Odustani</string>
+  <string name="call_incoming_custom_message_send">Pošalji</string>
+  <string name="a11y_incoming_call_reject_with_sms">Odbijte ovaj poziv porukom</string>
+  <string name="a11y_incoming_call_answer_video_as_audio">Prihvatte kao audiopoziv</string>
+  <string name="a11y_incoming_call_answer_and_release">Odgovorite na poziv i prekinite poziv u tijeku</string>
+  <string name="a11y_description_incoming_call_reject_with_sms">Odbij pomoću poruke</string>
+  <string name="a11y_description_incoming_call_answer_video_as_audio">Prihvati kao audiopoziv</string>
+  <string name="a11y_description_incoming_call_answer_and_release">Odgovorite na poziv i prekinite poziv u tijeku</string>
+  <string name="call_incoming_video_is_off">Videokamera je isključena</string>
+  <string name="a11y_incoming_call_swipe_gesture_prompt">Prijeđite dvama prstima prema gore za odgovor, a dvama prstima prema dolje za odbijanje.</string>
+  <string name="call_incoming_important">Važno</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-hu/strings.xml b/java/com/android/incallui/answer/impl/res/values-hu/strings.xml
index abaa869..df94f3d 100644
--- a/java/com/android/incallui/answer/impl/res/values-hu/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-hu/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"Csúsztassa el az ujját az ikonról az üzenettel való elutasításhoz"</string>
-    <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"Csúsztassa el az ujját az ikonról a hanghívásként való fogadáshoz"</string>
-    <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"Csúsztassa felfelé az ujját a hívás fogadásához és a folyamatban lévő hívás tartásához"</string>
-    <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Csúsztassa felfelé az ujját a hívás fogadásához és a várakoztatott hívás befejezéséhez"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Csúsztassa el az ujját az ikontól a hívásfogadáshoz és a folyamatban lévő hívás befejezéséhez"</string>
-    <string name="call_incoming_message_custom" msgid="5819492800418293238">"Saját válasz írása…"</string>
-    <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"Saját válasz írása…"</string>
-    <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"Mégse"</string>
-    <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Küldés"</string>
-    <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"Hívás elutasítása üzenettel"</string>
-    <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"Fogadás hanghívásként"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"Hívásfogadás és a folyamatban lévő hívás befejezése"</string>
-    <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"Elutasítás üzenettel"</string>
-    <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"Fogadás hanghívásként"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Hívásfogadás és a folyamatban lévő hívás befejezése"</string>
-    <string name="call_incoming_video_is_off" msgid="3216603035158629403">"A videokép ki van kapcsolva"</string>
-    <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Csúsztassa felfelé két ujját a hívás fogadásához. Csúsztassa lefelé két ujját a hívás elutasításához."</string>
-    <string name="call_incoming_important" msgid="3762352743365137090">"Fontos"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_decline_with_message">Csúsztassa el az ujját az ikonról az üzenettel való elutasításhoz</string>
+  <string name="call_incoming_swipe_to_answer_video_as_audio">Csúsztassa el az ujját az ikonról a hanghívásként való fogadáshoz</string>
+  <string name="call_incoming_default_label_answer_and_release_second">Csúsztassa felfelé az ujját a hívás fogadásához és a folyamatban lévő hívás tartásához</string>
+  <string name="call_incoming_default_label_answer_and_release_third">Csúsztassa felfelé az ujját a hívás fogadásához és a várakoztatott hívás befejezéséhez</string>
+  <string name="call_incoming_swipe_to_answer_and_release">Csúsztassa el az ujját az ikontól a hívásfogadáshoz és a folyamatban lévő hívás befejezéséhez</string>
+  <string name="call_incoming_message_custom">Saját válasz írása…</string>
+  <string name="call_incoming_respond_via_sms_custom_message">Saját válasz írása…</string>
+  <string name="call_incoming_custom_message_cancel">Mégse</string>
+  <string name="call_incoming_custom_message_send">Küldés</string>
+  <string name="a11y_incoming_call_reject_with_sms">Hívás elutasítása üzenettel</string>
+  <string name="a11y_incoming_call_answer_video_as_audio">Fogadás hanghívásként</string>
+  <string name="a11y_incoming_call_answer_and_release">Hívásfogadás és a folyamatban lévő hívás befejezése</string>
+  <string name="a11y_description_incoming_call_reject_with_sms">Elutasítás üzenettel</string>
+  <string name="a11y_description_incoming_call_answer_video_as_audio">Fogadás hanghívásként</string>
+  <string name="a11y_description_incoming_call_answer_and_release">Hívásfogadás és a folyamatban lévő hívás befejezése</string>
+  <string name="call_incoming_video_is_off">A videokép ki van kapcsolva</string>
+  <string name="a11y_incoming_call_swipe_gesture_prompt">Csúsztassa felfelé két ujját a hívás fogadásához. Csúsztassa lefelé két ujját a hívás elutasításához.</string>
+  <string name="call_incoming_important">Fontos</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-hy/strings.xml b/java/com/android/incallui/answer/impl/res/values-hy/strings.xml
index ef601e2..9bcc1e2 100644
--- a/java/com/android/incallui/answer/impl/res/values-hy/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-hy/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"Զանգը մերժելու և հաղորդագրություն ուղարկելու համար պատկերակից մատով մի կողմ սահեցրեք"</string>
-    <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"Պատկերակից մատով մի կողմ սահեցրեք՝ զանգին անջատված տեսախցիկով պատասխանելու համար"</string>
-    <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"Սահեցրեք վերև՝ պատասխանելու և ընթացիկ զանգը պահելու համար"</string>
-    <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Սահեցրեք վերև՝ պատասխանելու և սպասման մեջ գտնվող զանգն ավարտելու համար"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Պատկերակից մատով մի կողմ սահեցրեք՝ պատասխանելու և ընթացիկ զանգն ավարտելու համար"</string>
-    <string name="call_incoming_message_custom" msgid="5819492800418293238">"Գրեք ձեր պատասխանը…"</string>
-    <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"Գրեք ձեր պատասխանը…"</string>
-    <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"Չեղարկել"</string>
-    <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Ուղարկել"</string>
-    <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"Մերժել զանգը՝ ուղարկելով հաղորդագրություն"</string>
-    <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"Պատասխանել անջատած տեսախցիկով"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"Պատասխանել և ավարտել ընթացիկ զանգը"</string>
-    <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"Մերժել՝ ուղարկելով հաղորդագրություն"</string>
-    <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"պատասխանել անջատված տեսախցիկով"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Պատասխանել և ավարտել ընթացիկ զանգը"</string>
-    <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Տեսախցիկն անջատած է"</string>
-    <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Պատասխանելու համար երկու մատով սահեցրեք վերև, մերժելու համար՝ ներքև:"</string>
-    <string name="call_incoming_important" msgid="3762352743365137090">"Կարևոր"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_decline_with_message">Զանգը մերժելու և հաղորդագրություն ուղարկելու համար պատկերակից մատով մի կողմ սահեցրեք</string>
+  <string name="call_incoming_swipe_to_answer_video_as_audio">Պատկերակից մատով մի կողմ սահեցրեք՝ զանգին անջատված տեսախցիկով պատասխանելու համար</string>
+  <string name="call_incoming_default_label_answer_and_release_second">Սահեցրեք վերև՝ պատասխանելու և ընթացիկ զանգը պահելու համար</string>
+  <string name="call_incoming_default_label_answer_and_release_third">Սահեցրեք վերև՝ պատասխանելու և սպասման մեջ գտնվող զանգն ավարտելու համար</string>
+  <string name="call_incoming_swipe_to_answer_and_release">Պատկերակից մատով մի կողմ սահեցրեք՝ պատասխանելու և ընթացիկ զանգն ավարտելու համար</string>
+  <string name="call_incoming_message_custom">Գրեք ձեր պատասխանը…</string>
+  <string name="call_incoming_respond_via_sms_custom_message">Գրեք ձեր պատասխանը…</string>
+  <string name="call_incoming_custom_message_cancel">Չեղարկել</string>
+  <string name="call_incoming_custom_message_send">Ուղարկել</string>
+  <string name="a11y_incoming_call_reject_with_sms">Մերժել զանգը՝ ուղարկելով հաղորդագրություն</string>
+  <string name="a11y_incoming_call_answer_video_as_audio">Պատասխանել անջատած տեսախցիկով</string>
+  <string name="a11y_incoming_call_answer_and_release">Պատասխանել և ավարտել ընթացիկ զանգը</string>
+  <string name="a11y_description_incoming_call_reject_with_sms">Մերժել՝ ուղարկելով հաղորդագրություն</string>
+  <string name="a11y_description_incoming_call_answer_video_as_audio">պատասխանել անջատված տեսախցիկով</string>
+  <string name="a11y_description_incoming_call_answer_and_release">Պատասխանել և ավարտել ընթացիկ զանգը</string>
+  <string name="call_incoming_video_is_off">Տեսախցիկն անջատած է</string>
+  <string name="a11y_incoming_call_swipe_gesture_prompt">Պատասխանելու համար երկու մատով սահեցրեք վերև, մերժելու համար՝ ներքև:</string>
+  <string name="call_incoming_important">Կարևոր</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-in/strings.xml b/java/com/android/incallui/answer/impl/res/values-in/strings.xml
index a259926..61c2f1b 100644
--- a/java/com/android/incallui/answer/impl/res/values-in/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-in/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"Gesek dari ikon untuk menolak dengan pesan"</string>
-    <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"Geser dari ikon untuk menjawab sebagai panggilan audio"</string>
-    <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"Geser ke atas untuk menjawab dan menangguhkan panggilan yang sedang berlangsung"</string>
-    <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Geser ke atas untuk menjawab dan mengakhiri panggilan yang ditangguhkan"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Geser dari ikon untuk menjawab dan mengakhiri panggilan yang sedang berlangsung"</string>
-    <string name="call_incoming_message_custom" msgid="5819492800418293238">"Tulis respons Anda sendiri…"</string>
-    <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"Tulis respons Anda sendiri…"</string>
-    <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"Batal"</string>
-    <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Kirim"</string>
-    <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"Tolak panggilan ini dengan pesan"</string>
-    <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"Jawab sebagai panggilan audio"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"Menjawab dan mengakhiri panggilan yang sedang berlangsung"</string>
-    <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"Tolak dengan pesan"</string>
-    <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"Jawab sebagai panggilan audio"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Menjawab dan mengakhiri panggilan yang sedang berlangsung"</string>
-    <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Video nonaktif"</string>
-    <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Geser ke atas dengan dua jari untuk menjawab. Geser ke bawah dengan dua jari untuk menolak."</string>
-    <string name="call_incoming_important" msgid="3762352743365137090">"Penting"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_decline_with_message">Geser dari ikon untuk menolak dengan pesan</string>
+  <string name="call_incoming_swipe_to_answer_video_as_audio">Geser dari ikon untuk menjawab sebagai panggilan audio</string>
+  <string name="call_incoming_default_label_answer_and_release_second">Geser ke atas untuk menjawab dan menangguhkan panggilan yang sedang berlangsung</string>
+  <string name="call_incoming_default_label_answer_and_release_third">Geser ke atas untuk menjawab dan mengakhiri panggilan yang ditangguhkan</string>
+  <string name="call_incoming_swipe_to_answer_and_release">Geser dari ikon untuk menjawab dan mengakhiri panggilan yang sedang berlangsung</string>
+  <string name="call_incoming_message_custom">Tulis respons Anda sendiri…</string>
+  <string name="call_incoming_respond_via_sms_custom_message">Tulis respons Anda sendiri…</string>
+  <string name="call_incoming_custom_message_cancel">Batal</string>
+  <string name="call_incoming_custom_message_send">Kirim</string>
+  <string name="a11y_incoming_call_reject_with_sms">Tolak panggilan ini dengan pesan</string>
+  <string name="a11y_incoming_call_answer_video_as_audio">Jawab sebagai panggilan audio</string>
+  <string name="a11y_incoming_call_answer_and_release">Menjawab dan mengakhiri panggilan yang sedang berlangsung</string>
+  <string name="a11y_description_incoming_call_reject_with_sms">Tolak dengan pesan</string>
+  <string name="a11y_description_incoming_call_answer_video_as_audio">Jawab sebagai panggilan audio</string>
+  <string name="a11y_description_incoming_call_answer_and_release">Menjawab dan mengakhiri panggilan yang sedang berlangsung</string>
+  <string name="call_incoming_video_is_off">Video nonaktif</string>
+  <string name="a11y_incoming_call_swipe_gesture_prompt">Geser ke atas dengan dua jari untuk menjawab. Geser ke bawah dengan dua jari untuk menolak.</string>
+  <string name="call_incoming_important">Penting</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-is/strings.xml b/java/com/android/incallui/answer/impl/res/values-is/strings.xml
index eb65362..ba6334f 100644
--- a/java/com/android/incallui/answer/impl/res/values-is/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-is/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"Strjúktu frá tákninu til að hafna með skilaboðum"</string>
-    <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"Strjúktu frá tákninu til að svara sem símtali"</string>
-    <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"Strjúktu upp til að svara og setja yfirstandandi símtal í bið"</string>
-    <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Strjúktu upp til að svara og ljúka símtali í bið"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Strjúktu frá tákninu til að svara og ljúka yfirstandandi símtali"</string>
-    <string name="call_incoming_message_custom" msgid="5819492800418293238">"Skrifaðu þitt eigið…"</string>
-    <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"Skrifaðu þitt eigið…"</string>
-    <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"Hætta við"</string>
-    <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Senda"</string>
-    <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"Hafna símtalinu með skilaboðum"</string>
-    <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"Svara sem símtali"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"Svara og ljúka yfirstandandi símtali"</string>
-    <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"Hafna með skilaboðum"</string>
-    <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"Svara sem símtali"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Svara og ljúka yfirstandandi símtali"</string>
-    <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Slökkt á myndavél"</string>
-    <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Strjúktu upp með tveimur fingrum til að svara. Strjúktu niður með tveimur fingrum til að hafna."</string>
-    <string name="call_incoming_important" msgid="3762352743365137090">"Mikilvægt"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_decline_with_message">Strjúktu frá tákninu til að hafna með skilaboðum</string>
+  <string name="call_incoming_swipe_to_answer_video_as_audio">Strjúktu frá tákninu til að svara sem símtali</string>
+  <string name="call_incoming_default_label_answer_and_release_second">Strjúktu upp til að svara og setja yfirstandandi símtal í bið</string>
+  <string name="call_incoming_default_label_answer_and_release_third">Strjúktu upp til að svara og ljúka símtali í bið</string>
+  <string name="call_incoming_swipe_to_answer_and_release">Strjúktu frá tákninu til að svara og ljúka yfirstandandi símtali</string>
+  <string name="call_incoming_message_custom">Skrifaðu þitt eigið…</string>
+  <string name="call_incoming_respond_via_sms_custom_message">Skrifaðu þitt eigið…</string>
+  <string name="call_incoming_custom_message_cancel">Hætta við</string>
+  <string name="call_incoming_custom_message_send">Senda</string>
+  <string name="a11y_incoming_call_reject_with_sms">Hafna símtalinu með skilaboðum</string>
+  <string name="a11y_incoming_call_answer_video_as_audio">Svara sem símtali</string>
+  <string name="a11y_incoming_call_answer_and_release">Svara og ljúka yfirstandandi símtali</string>
+  <string name="a11y_description_incoming_call_reject_with_sms">Hafna með skilaboðum</string>
+  <string name="a11y_description_incoming_call_answer_video_as_audio">Svara sem símtali</string>
+  <string name="a11y_description_incoming_call_answer_and_release">Svara og ljúka yfirstandandi símtali</string>
+  <string name="call_incoming_video_is_off">Slökkt á myndavél</string>
+  <string name="a11y_incoming_call_swipe_gesture_prompt">Strjúktu upp með tveimur fingrum til að svara. Strjúktu niður með tveimur fingrum til að hafna.</string>
+  <string name="call_incoming_important">Mikilvægt</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-it/strings.xml b/java/com/android/incallui/answer/impl/res/values-it/strings.xml
index 7bc17d5..146de54 100644
--- a/java/com/android/incallui/answer/impl/res/values-it/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-it/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"Fai scorrere dall\'icona per rifiutare e inviare un messaggio"</string>
-    <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"Fai scorrere dall\'icona per rispondere con una chiamata audio"</string>
-    <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"Fai scorrere verso l\'alto per rispondere e mettere in attesa la chiamata in corso"</string>
-    <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Fai scorrere verso l\'alto per rispondere e terminare la chiamata in attesa"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Fai scorrere dall\'icona per rispondere e terminare la chiamata in corso"</string>
-    <string name="call_incoming_message_custom" msgid="5819492800418293238">"Scrivi risposta personale…"</string>
-    <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"Scrivi risposta personale…"</string>
-    <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"Annulla"</string>
-    <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Invia"</string>
-    <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"Rifiuta questa chiamata con un messaggio"</string>
-    <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"Rispondi con chiamata audio"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"Rispondi e termina la chiamata in corso"</string>
-    <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"Rifiuta con messaggio"</string>
-    <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"Rispondi con chiamata audio"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Rispondi e termina la chiamata in corso"</string>
-    <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Il video è disattivato"</string>
-    <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Fai scorrere con due dita verso l\'alto per rispondere e verso il basso per rifiutare."</string>
-    <string name="call_incoming_important" msgid="3762352743365137090">"Importante"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_decline_with_message">Fai scorrere dall\'icona per rifiutare e inviare un messaggio</string>
+  <string name="call_incoming_swipe_to_answer_video_as_audio">Fai scorrere dall\'icona per rispondere con una chiamata audio</string>
+  <string name="call_incoming_default_label_answer_and_release_second">Fai scorrere verso l\'alto per rispondere e mettere in attesa la chiamata in corso</string>
+  <string name="call_incoming_default_label_answer_and_release_third">Fai scorrere verso l\'alto per rispondere e terminare la chiamata in attesa</string>
+  <string name="call_incoming_swipe_to_answer_and_release">Fai scorrere dall\'icona per rispondere e terminare la chiamata in corso</string>
+  <string name="call_incoming_message_custom">Scrivi risposta personale…</string>
+  <string name="call_incoming_respond_via_sms_custom_message">Scrivi risposta personale…</string>
+  <string name="call_incoming_custom_message_cancel">Annulla</string>
+  <string name="call_incoming_custom_message_send">Invia</string>
+  <string name="a11y_incoming_call_reject_with_sms">Rifiuta questa chiamata con un messaggio</string>
+  <string name="a11y_incoming_call_answer_video_as_audio">Rispondi con chiamata audio</string>
+  <string name="a11y_incoming_call_answer_and_release">Rispondi e termina la chiamata in corso</string>
+  <string name="a11y_description_incoming_call_reject_with_sms">Rifiuta con messaggio</string>
+  <string name="a11y_description_incoming_call_answer_video_as_audio">Rispondi con chiamata audio</string>
+  <string name="a11y_description_incoming_call_answer_and_release">Rispondi e termina la chiamata in corso</string>
+  <string name="call_incoming_video_is_off">Il video è disattivato</string>
+  <string name="a11y_incoming_call_swipe_gesture_prompt">Fai scorrere con due dita verso l\'alto per rispondere e verso il basso per rifiutare.</string>
+  <string name="call_incoming_important">Importante</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-iw/strings.xml b/java/com/android/incallui/answer/impl/res/values-iw/strings.xml
index 9118ff0..ee7893b 100644
--- a/java/com/android/incallui/answer/impl/res/values-iw/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-iw/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"החלק מהסמל כדי לדחות עם הודעה"</string>
-    <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"החלק מהסמל כדי לענות כשיחת אודיו"</string>
-    <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"החלק למעלה כדי לענות ולהעביר את השיחה הנוכחית להמתנה"</string>
-    <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"החלק למעלה כדי לענות ולסיים את השיחה שבהמתנה"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"החלק מהסמל כדי לענות ולסיים שיחה"</string>
-    <string name="call_incoming_message_custom" msgid="5819492800418293238">"כתוב אחת משלך…"</string>
-    <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"כתוב אחת משלך…"</string>
-    <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"ביטול"</string>
-    <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"שלח"</string>
-    <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"דחה את השיחה הזו עם הודעה"</string>
-    <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"ענה כשיחת אודיו"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"מענה וסיום שיחה"</string>
-    <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"דחה עם הודעה"</string>
-    <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"ענה כשיחת אודיו"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"מענה וסיום שיחה"</string>
-    <string name="call_incoming_video_is_off" msgid="3216603035158629403">"הווידאו מושבת"</string>
-    <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"החלק עם שתי אצבעות למעלה כדי לענות או למטה כדי לדחות."</string>
-    <string name="call_incoming_important" msgid="3762352743365137090">"חשוב"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_decline_with_message">החלק מהסמל כדי לדחות עם הודעה</string>
+  <string name="call_incoming_swipe_to_answer_video_as_audio">החלק מהסמל כדי לענות כשיחת אודיו</string>
+  <string name="call_incoming_default_label_answer_and_release_second">החלק למעלה כדי לענות ולהעביר את השיחה הנוכחית להמתנה</string>
+  <string name="call_incoming_default_label_answer_and_release_third">החלק למעלה כדי לענות ולסיים את השיחה שבהמתנה</string>
+  <string name="call_incoming_swipe_to_answer_and_release">החלק מהסמל כדי לענות ולסיים שיחה</string>
+  <string name="call_incoming_message_custom">כתוב אחת משלך…</string>
+  <string name="call_incoming_respond_via_sms_custom_message">כתוב אחת משלך…</string>
+  <string name="call_incoming_custom_message_cancel">ביטול</string>
+  <string name="call_incoming_custom_message_send">שלח</string>
+  <string name="a11y_incoming_call_reject_with_sms">דחה את השיחה הזו עם הודעה</string>
+  <string name="a11y_incoming_call_answer_video_as_audio">ענה כשיחת אודיו</string>
+  <string name="a11y_incoming_call_answer_and_release">מענה וסיום שיחה</string>
+  <string name="a11y_description_incoming_call_reject_with_sms">דחה עם הודעה</string>
+  <string name="a11y_description_incoming_call_answer_video_as_audio">ענה כשיחת אודיו</string>
+  <string name="a11y_description_incoming_call_answer_and_release">מענה וסיום שיחה</string>
+  <string name="call_incoming_video_is_off">הווידאו מושבת</string>
+  <string name="a11y_incoming_call_swipe_gesture_prompt">החלק עם שתי אצבעות למעלה כדי לענות או למטה כדי לדחות.</string>
+  <string name="call_incoming_important">חשוב</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-ja/strings.xml b/java/com/android/incallui/answer/impl/res/values-ja/strings.xml
index ac9c677..897ff5c 100644
--- a/java/com/android/incallui/answer/impl/res/values-ja/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-ja/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"アイコンをスワイプして着信を拒否し、メッセージを送信"</string>
-    <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"アイコンをスワイプして音声通話として応答"</string>
-    <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"上にスワイプして通話に応答し、進行中の通話を保留"</string>
-    <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"上にスワイプして通話に応答し、保留中の通話を終了"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"アイコンをスワイプして通話に応答し、進行中の通話を終了"</string>
-    <string name="call_incoming_message_custom" msgid="5819492800418293238">"カスタム返信を作成…"</string>
-    <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"カスタム返信を作成…"</string>
-    <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"キャンセル"</string>
-    <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"送信"</string>
-    <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"この着信を拒否してメッセージを送信"</string>
-    <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"音声通話として応答"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"通話に応答し、進行中の通話を終了"</string>
-    <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"拒否してメッセージを送信"</string>
-    <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"音声通話として応答"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"通話に応答し、進行中の通話を終了"</string>
-    <string name="call_incoming_video_is_off" msgid="3216603035158629403">"ビデオ: OFF"</string>
-    <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"応答するには 2 本の指で上にスワイプ、拒否するには 2 本の指で下にスワイプします。"</string>
-    <string name="call_incoming_important" msgid="3762352743365137090">"重要"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_decline_with_message">アイコンをスワイプして着信を拒否し、メッセージを送信</string>
+  <string name="call_incoming_swipe_to_answer_video_as_audio">アイコンをスワイプして音声通話として応答</string>
+  <string name="call_incoming_default_label_answer_and_release_second">上にスワイプして通話に応答し、進行中の通話を保留</string>
+  <string name="call_incoming_default_label_answer_and_release_third">上にスワイプして通話に応答し、保留中の通話を終了</string>
+  <string name="call_incoming_swipe_to_answer_and_release">アイコンをスワイプして通話に応答し、進行中の通話を終了</string>
+  <string name="call_incoming_message_custom">カスタム返信を作成…</string>
+  <string name="call_incoming_respond_via_sms_custom_message">カスタム返信を作成…</string>
+  <string name="call_incoming_custom_message_cancel">キャンセル</string>
+  <string name="call_incoming_custom_message_send">送信</string>
+  <string name="a11y_incoming_call_reject_with_sms">この着信を拒否してメッセージを送信</string>
+  <string name="a11y_incoming_call_answer_video_as_audio">音声通話として応答</string>
+  <string name="a11y_incoming_call_answer_and_release">通話に応答し、進行中の通話を終了</string>
+  <string name="a11y_description_incoming_call_reject_with_sms">拒否してメッセージを送信</string>
+  <string name="a11y_description_incoming_call_answer_video_as_audio">音声通話として応答</string>
+  <string name="a11y_description_incoming_call_answer_and_release">通話に応答し、進行中の通話を終了</string>
+  <string name="call_incoming_video_is_off">ビデオ: OFF</string>
+  <string name="a11y_incoming_call_swipe_gesture_prompt">応答するには 2 本の指で上にスワイプ、拒否するには 2 本の指で下にスワイプします。</string>
+  <string name="call_incoming_important">重要</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-ka/strings.xml b/java/com/android/incallui/answer/impl/res/values-ka/strings.xml
index fa01807..737885a 100644
--- a/java/com/android/incallui/answer/impl/res/values-ka/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-ka/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"გადაუსვით ხატულადან შეტყობინებით უარყოფისთვის"</string>
-    <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"გადაუსვით ხატულადან აუდიოზარით საპასუხოდ"</string>
-    <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"მიმდინარე ზარის საპასუხოდ და შესაყოვნებლად გადაფურცლეთ ზემოთ"</string>
-    <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"შეყოვნებული ზარის საპასუხოდ და დასასრულებლად გადაფურცლეთ ზემოთ"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"მიმდინარე ზარის საპასუხოდ და დასასრულებლად გადაუსვით ხატულას"</string>
-    <string name="call_incoming_message_custom" msgid="5819492800418293238">"დაწერეთ თქვენი საკუთარი…"</string>
-    <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"დაწერეთ თქვენი საკუთარი…"</string>
-    <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"გაუქმება"</string>
-    <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"გაგზავნა"</string>
-    <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"ამ ზარის უარყოფა შეტყობინებით"</string>
-    <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"პასუხი აუდიოზარის სახით"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"პასუხი და მიმდინარე ზარის დასრულება"</string>
-    <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"უარყოფა შეტყობინებით"</string>
-    <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"პასუხი აუდიოზარის სახით"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"პასუხი და მიმდინარე ზარის დასრულება"</string>
-    <string name="call_incoming_video_is_off" msgid="3216603035158629403">"ვიდეო გამორთულია"</string>
-    <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"საპასუხოდ გადაფურცლეთ ზემოთ ორი თითით. უარყოფისთვის გადაფურცლეთ ქვემოთ ორი თითით."</string>
-    <string name="call_incoming_important" msgid="3762352743365137090">"მნიშვნელოვანი"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_decline_with_message">გადაუსვით ხატულადან შეტყობინებით უარყოფისთვის</string>
+  <string name="call_incoming_swipe_to_answer_video_as_audio">გადაუსვით ხატულადან აუდიოზარით საპასუხოდ</string>
+  <string name="call_incoming_default_label_answer_and_release_second">მიმდინარე ზარის საპასუხოდ და შესაყოვნებლად გადაფურცლეთ ზემოთ</string>
+  <string name="call_incoming_default_label_answer_and_release_third">შეყოვნებული ზარის საპასუხოდ და დასასრულებლად გადაფურცლეთ ზემოთ</string>
+  <string name="call_incoming_swipe_to_answer_and_release">მიმდინარე ზარის საპასუხოდ და დასასრულებლად გადაუსვით ხატულას</string>
+  <string name="call_incoming_message_custom">დაწერეთ თქვენი საკუთარი…</string>
+  <string name="call_incoming_respond_via_sms_custom_message">დაწერეთ თქვენი საკუთარი…</string>
+  <string name="call_incoming_custom_message_cancel">გაუქმება</string>
+  <string name="call_incoming_custom_message_send">გაგზავნა</string>
+  <string name="a11y_incoming_call_reject_with_sms">ამ ზარის უარყოფა შეტყობინებით</string>
+  <string name="a11y_incoming_call_answer_video_as_audio">პასუხი აუდიოზარის სახით</string>
+  <string name="a11y_incoming_call_answer_and_release">პასუხი და მიმდინარე ზარის დასრულება</string>
+  <string name="a11y_description_incoming_call_reject_with_sms">უარყოფა შეტყობინებით</string>
+  <string name="a11y_description_incoming_call_answer_video_as_audio">პასუხი აუდიოზარის სახით</string>
+  <string name="a11y_description_incoming_call_answer_and_release">პასუხი და მიმდინარე ზარის დასრულება</string>
+  <string name="call_incoming_video_is_off">ვიდეო გამორთულია</string>
+  <string name="a11y_incoming_call_swipe_gesture_prompt">საპასუხოდ გადაფურცლეთ ზემოთ ორი თითით. უარყოფისთვის გადაფურცლეთ ქვემოთ ორი თითით.</string>
+  <string name="call_incoming_important">მნიშვნელოვანი</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-kk/strings.xml b/java/com/android/incallui/answer/impl/res/values-kk/strings.xml
index c03b6dc..6f82f7a 100644
--- a/java/com/android/incallui/answer/impl/res/values-kk/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-kk/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"Қабылдамай, жай хабар жіберу үшін, белгішеден әрі қарай сырғытыңыз"</string>
-    <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"Аудио қоңырау ретінде жауап беру үшін, белгішеден әрі қарай сырғытыңыз"</string>
-    <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"Ағымдағы қоңырауға жауап беру және оны ұстап тұру үшін жоғары сырғытыңыз"</string>
-    <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Күту күйіндегі қоңырауға жауап беру және оны аяқтау үшін жоғары сырғытыңыз"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Қоңырауға жауап беру үшін және ағымдағы қоңырауды аяқтау үшін белгішеден сырғытыңыз"</string>
-    <string name="call_incoming_message_custom" msgid="5819492800418293238">"Өзіңіз жазыңыз…"</string>
-    <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"Өзіңіз жазыңыз…"</string>
-    <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"Жабу"</string>
-    <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Жіберу"</string>
-    <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"Бұл қоңырауды қабылдамай, хабар жіберу"</string>
-    <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"Аудио қоңырау ретінде жауап беру"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"Қоңырауға жауап беру және ағымдағы қоңырауды аяқтау"</string>
-    <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"Қабылдамай, хабар жіберу"</string>
-    <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"Аудио қоңырау ретінде жауап беру"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Қоңырауға жауап беру және ағымдағы қоңырауды аяқтау"</string>
-    <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Бейне өшірулі"</string>
-    <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Жауап беру үшін екі саусақпен жоғары сырғытылады. Қабылдамау үшін екі саусақпен төмен сырғытылады."</string>
-    <string name="call_incoming_important" msgid="3762352743365137090">"Маңызды"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_decline_with_message">Қабылдамай, жай хабар жіберу үшін, белгішеден әрі қарай сырғытыңыз</string>
+  <string name="call_incoming_swipe_to_answer_video_as_audio">Аудио қоңырау ретінде жауап беру үшін, белгішеден әрі қарай сырғытыңыз</string>
+  <string name="call_incoming_default_label_answer_and_release_second">Ағымдағы қоңырауға жауап беру және оны ұстап тұру үшін жоғары сырғытыңыз</string>
+  <string name="call_incoming_default_label_answer_and_release_third">Күту күйіндегі қоңырауға жауап беру және оны аяқтау үшін жоғары сырғытыңыз</string>
+  <string name="call_incoming_swipe_to_answer_and_release">Қоңырауға жауап беру үшін және ағымдағы қоңырауды аяқтау үшін белгішеден сырғытыңыз</string>
+  <string name="call_incoming_message_custom">Өзіңіз жазыңыз…</string>
+  <string name="call_incoming_respond_via_sms_custom_message">Өзіңіз жазыңыз…</string>
+  <string name="call_incoming_custom_message_cancel">Жабу</string>
+  <string name="call_incoming_custom_message_send">Жіберу</string>
+  <string name="a11y_incoming_call_reject_with_sms">Бұл қоңырауды қабылдамай, хабар жіберу</string>
+  <string name="a11y_incoming_call_answer_video_as_audio">Аудио қоңырау ретінде жауап беру</string>
+  <string name="a11y_incoming_call_answer_and_release">Қоңырауға жауап беру және ағымдағы қоңырауды аяқтау</string>
+  <string name="a11y_description_incoming_call_reject_with_sms">Қабылдамай, хабар жіберу</string>
+  <string name="a11y_description_incoming_call_answer_video_as_audio">Аудио қоңырау ретінде жауап беру</string>
+  <string name="a11y_description_incoming_call_answer_and_release">Қоңырауға жауап беру және ағымдағы қоңырауды аяқтау</string>
+  <string name="call_incoming_video_is_off">Бейне өшірулі</string>
+  <string name="a11y_incoming_call_swipe_gesture_prompt">Жауап беру үшін екі саусақпен жоғары сырғытылады. Қабылдамау үшін екі саусақпен төмен сырғытылады.</string>
+  <string name="call_incoming_important">Маңызды</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-km/strings.xml b/java/com/android/incallui/answer/impl/res/values-km/strings.xml
index 854fcb7..d6fe2a8 100644
--- a/java/com/android/incallui/answer/impl/res/values-km/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-km/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"អូស​ចេញ​ពី​រូបតំណាង​ដើម្បី​បដិសេធ​​ដោយ​មាន​សារ"</string>
-    <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"អូស​ចេញ​ពី​រូបតំណាង​ដើម្បី​ឆ្លើយ​​​ជា​ការ​ហៅ​សំឡេង"</string>
-    <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"អូស​ឡើង​លើ ដើម្បី​ឆ្លើយ និង​រង់ចាំ​ការ​ហៅ​ដែល​កំពុង​ដំណើរការ"</string>
-    <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"អូស​ឡើង​លើ ដើម្បី​ឆ្លើយ និង​បញ្ចប់​ការ​ហៅ​ដែល​កំពុង​រង់ចាំ"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"អូស​ពី​រូបតំណាង ដើម្បី​ឆ្លើយ និង​បញ្ចប់​ការ​ហៅ​ទូរសព្ទ​ដែល​កំពុង​ដំណើរការ"</string>
-    <string name="call_incoming_message_custom" msgid="5819492800418293238">"សរសេរ​ផ្ទាល់ខ្លួន​​​អ្នក…"</string>
-    <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"សរសេរ​​ផ្ទាល់ខ្លួន​អ្នក…"</string>
-    <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"បោះបង់"</string>
-    <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"ផ្ញើ"</string>
-    <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"បដិសេធ​ការ​ហៅ​នេះ​​ដោយ​មាន​សារ​មួយ"</string>
-    <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"ឆ្លើយ​ជា​ការ​ហៅ​​​​សំឡេង"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"ឆ្លើយ និង​បញ្ចប់​ការ​ហៅ​ទូរសព្ទ​ដែល​កំពុង​ដំណើរការ"</string>
-    <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"បដិសេធ​​ដោយ​មាន​សារ"</string>
-    <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"ឆ្លើយ​ជា​ការ​ហៅ​​​​សំឡេង"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"ឆ្លើយ និង​បញ្ចប់​ការ​ហៅ​ទូរសព្ទ​ដែល​កំពុង​ដំណើរការ"</string>
-    <string name="call_incoming_video_is_off" msgid="3216603035158629403">"វីដេអូត្រូវបានបិទ"</string>
-    <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"អូស​ម្រាម​ដៃ​ពីរ​ឡើងលើ​ ដើម្បី​ឆ្លើយ។ អូស​ម្រាមដៃ​ពីរ​ចុះ​ក្រោម​ ដើម្បី​បដិសេធ។"</string>
-    <string name="call_incoming_important" msgid="3762352743365137090">"សំខាន់"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_decline_with_message">អូស​ចេញ​ពី​រូបតំណាង​ដើម្បី​បដិសេធ​​ដោយ​មាន​សារ</string>
+  <string name="call_incoming_swipe_to_answer_video_as_audio">អូស​ចេញ​ពី​រូបតំណាង​ដើម្បី​ឆ្លើយ​​​ជា​ការ​ហៅ​សំឡេង</string>
+  <string name="call_incoming_default_label_answer_and_release_second">អូស​ឡើង​លើ ដើម្បី​ឆ្លើយ និង​រង់ចាំ​ការ​ហៅ​ដែល​កំពុង​ដំណើរការ</string>
+  <string name="call_incoming_default_label_answer_and_release_third">អូស​ឡើង​លើ ដើម្បី​ឆ្លើយ និង​បញ្ចប់​ការ​ហៅ​ដែល​កំពុង​រង់ចាំ</string>
+  <string name="call_incoming_swipe_to_answer_and_release">អូស​ពី​រូបតំណាង ដើម្បី​ឆ្លើយ និង​បញ្ចប់​ការ​ហៅ​ទូរសព្ទ​ដែល​កំពុង​ដំណើរការ</string>
+  <string name="call_incoming_message_custom">សរសេរ​ផ្ទាល់ខ្លួន​​​អ្នក…</string>
+  <string name="call_incoming_respond_via_sms_custom_message">សរសេរ​​ផ្ទាល់ខ្លួន​អ្នក…</string>
+  <string name="call_incoming_custom_message_cancel">បោះបង់</string>
+  <string name="call_incoming_custom_message_send">ផ្ញើ</string>
+  <string name="a11y_incoming_call_reject_with_sms">បដិសេធ​ការ​ហៅ​នេះ​​ដោយ​មាន​សារ​មួយ</string>
+  <string name="a11y_incoming_call_answer_video_as_audio">ឆ្លើយ​ជា​ការ​ហៅ​​​​សំឡេង</string>
+  <string name="a11y_incoming_call_answer_and_release">ឆ្លើយ និង​បញ្ចប់​ការ​ហៅ​ទូរសព្ទ​ដែល​កំពុង​ដំណើរការ</string>
+  <string name="a11y_description_incoming_call_reject_with_sms">បដិសេធ​​ដោយ​មាន​សារ</string>
+  <string name="a11y_description_incoming_call_answer_video_as_audio">ឆ្លើយ​ជា​ការ​ហៅ​​​​សំឡេង</string>
+  <string name="a11y_description_incoming_call_answer_and_release">ឆ្លើយ និង​បញ្ចប់​ការ​ហៅ​ទូរសព្ទ​ដែល​កំពុង​ដំណើរការ</string>
+  <string name="call_incoming_video_is_off">វីដេអូត្រូវបានបិទ</string>
+  <string name="a11y_incoming_call_swipe_gesture_prompt">អូស​ម្រាម​ដៃ​ពីរ​ឡើងលើ​ ដើម្បី​ឆ្លើយ។ អូស​ម្រាមដៃ​ពីរ​ចុះ​ក្រោម​ ដើម្បី​បដិសេធ។</string>
+  <string name="call_incoming_important">សំខាន់</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-kn/strings.xml b/java/com/android/incallui/answer/impl/res/values-kn/strings.xml
index 0349450..50d6a75 100644
--- a/java/com/android/incallui/answer/impl/res/values-kn/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-kn/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"ಸಂದೇಶದ ಜೊತೆಗೆ ನಿರಾಕರಿಸಲು ಐಕಾನ್‌ನಿಂದ ಸ್ವೈಪ್ ಮಾಡಿ"</string>
-    <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"ಆಡಿಯೊ ಕರೆ ರೀತಿಯಲ್ಲಿ ಉತ್ತರಿಸಲು ಐಕಾನ್‌ನಿಂದ ಸ್ವೈಪ್ ಮಾಡಿ"</string>
-    <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"ಕರೆಯನ್ನು ಉತ್ತರಿಸಲು ಮತ್ತು ಚಾಲ್ತಿಯಲ್ಲಿರುವ ಕರೆಯನ್ನು ಹೋಲ್ಡ್ ಮಾಡಲು ಮೇಲಕ್ಕೆ ಸ್ವೈಪ್ ಮಾಡಿ"</string>
-    <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"ಕರೆಯನ್ನು ಉತ್ತರಿಸಲು ಮತ್ತು ಹೋಲ್ಡ್‌ನಲ್ಲಿರುವ ಕರೆಯನ್ನು ಅಂತ್ಯಗೊಳಿಸಲು ಮೇಲಕ್ಕೆ ಸ್ವೈಪ್ ಮಾಡಿ"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"ಚಾಲ್ತಿಯಲ್ಲಿರುವ ಕರೆಗೆ ಉತ್ತರಿಸಲು ಮತ್ತು ಅಂತ್ಯಗೊಳಿಸಲು ಐಕಾನ್‌ನಿಂದ ಸ್ವೈಪ್ ಮಾಡಿ"</string>
-    <string name="call_incoming_message_custom" msgid="5819492800418293238">"ನಿಮ್ಮ ಸ್ವಂತದ್ದನ್ನು ಬರೆಯಿರಿ…"</string>
-    <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"ನಿಮ್ಮ ಸ್ವಂತದ್ದನ್ನು ಬರೆಯಿರಿ…"</string>
-    <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"ರದ್ದುಮಾಡಿ"</string>
-    <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"ಕಳುಹಿಸು"</string>
-    <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"ಸಂದೇಶದ ಮೂಲಕ ಈ ಕರೆಯನ್ನು ತಿರಸ್ಕರಿಸಿ"</string>
-    <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"ಆಡಿಯೊ ಕರೆಯಂತೆ ಉತ್ತರಿಸಿ"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"ಚಾಲ್ತಿಯಲ್ಲಿರುವ ಕರೆಗೆ ಉತ್ತರಿಸಿ ಮತ್ತು ಅಂತ್ಯಗೊಳಿಸಿ"</string>
-    <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"ಸಂದೇಶದೊಂದಿಗೆ ತಿರಸ್ಕರಿಸು"</string>
-    <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"ಆಡಿಯೊ ಕರೆಯಂತೆ ಉತ್ತರಿಸಿ"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"ಚಾಲ್ತಿಯಲ್ಲಿರುವ ಕರೆಗೆ ಉತ್ತರಿಸಿ ಮತ್ತು ಅಂತ್ಯಗೊಳಿಸಿ"</string>
-    <string name="call_incoming_video_is_off" msgid="3216603035158629403">"ವೀಡಿಯೊ ಆಫ್ ಆಗಿದೆ"</string>
-    <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"ಉತ್ತರಿಸಲು ಎರಡು ಬೆರಳಿನಿಂದ ಮೇಲಕ್ಕೆ ಸ್ವೈಪ್ ಮಾಡಿ. ನಿರಾಕರಿಸಲು ಎರಡು ಬೆರಳಿನಿಂದ ಕೆಳಗೆ ಸ್ವೈಪ್ ಮಾಡಿ."</string>
-    <string name="call_incoming_important" msgid="3762352743365137090">"ಪ್ರಮುಖ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_decline_with_message">ಸಂದೇಶದ ಜೊತೆಗೆ ನಿರಾಕರಿಸಲು ಐಕಾನ್‌ನಿಂದ ಸ್ವೈಪ್ ಮಾಡಿ</string>
+  <string name="call_incoming_swipe_to_answer_video_as_audio">ಆಡಿಯೊ ಕರೆ ರೀತಿಯಲ್ಲಿ ಉತ್ತರಿಸಲು ಐಕಾನ್‌ನಿಂದ ಸ್ವೈಪ್ ಮಾಡಿ</string>
+  <string name="call_incoming_default_label_answer_and_release_second">ಕರೆಯನ್ನು ಉತ್ತರಿಸಲು ಮತ್ತು ಚಾಲ್ತಿಯಲ್ಲಿರುವ ಕರೆಯನ್ನು ಹೋಲ್ಡ್ ಮಾಡಲು ಮೇಲಕ್ಕೆ ಸ್ವೈಪ್ ಮಾಡಿ</string>
+  <string name="call_incoming_default_label_answer_and_release_third">ಕರೆಯನ್ನು ಉತ್ತರಿಸಲು ಮತ್ತು ಹೋಲ್ಡ್‌ನಲ್ಲಿರುವ ಕರೆಯನ್ನು ಅಂತ್ಯಗೊಳಿಸಲು ಮೇಲಕ್ಕೆ ಸ್ವೈಪ್ ಮಾಡಿ</string>
+  <string name="call_incoming_swipe_to_answer_and_release">ಚಾಲ್ತಿಯಲ್ಲಿರುವ ಕರೆಗೆ ಉತ್ತರಿಸಲು ಮತ್ತು ಅಂತ್ಯಗೊಳಿಸಲು ಐಕಾನ್‌ನಿಂದ ಸ್ವೈಪ್ ಮಾಡಿ</string>
+  <string name="call_incoming_message_custom">ನಿಮ್ಮ ಸ್ವಂತದ್ದನ್ನು ಬರೆಯಿರಿ…</string>
+  <string name="call_incoming_respond_via_sms_custom_message">ನಿಮ್ಮ ಸ್ವಂತದ್ದನ್ನು ಬರೆಯಿರಿ…</string>
+  <string name="call_incoming_custom_message_cancel">ರದ್ದುಮಾಡಿ</string>
+  <string name="call_incoming_custom_message_send">ಕಳುಹಿಸು</string>
+  <string name="a11y_incoming_call_reject_with_sms">ಸಂದೇಶದ ಮೂಲಕ ಈ ಕರೆಯನ್ನು ತಿರಸ್ಕರಿಸಿ</string>
+  <string name="a11y_incoming_call_answer_video_as_audio">ಆಡಿಯೊ ಕರೆಯಂತೆ ಉತ್ತರಿಸಿ</string>
+  <string name="a11y_incoming_call_answer_and_release">ಚಾಲ್ತಿಯಲ್ಲಿರುವ ಕರೆಗೆ ಉತ್ತರಿಸಿ ಮತ್ತು ಅಂತ್ಯಗೊಳಿಸಿ</string>
+  <string name="a11y_description_incoming_call_reject_with_sms">ಸಂದೇಶದೊಂದಿಗೆ ತಿರಸ್ಕರಿಸು</string>
+  <string name="a11y_description_incoming_call_answer_video_as_audio">ಆಡಿಯೊ ಕರೆಯಂತೆ ಉತ್ತರಿಸಿ</string>
+  <string name="a11y_description_incoming_call_answer_and_release">ಚಾಲ್ತಿಯಲ್ಲಿರುವ ಕರೆಗೆ ಉತ್ತರಿಸಿ ಮತ್ತು ಅಂತ್ಯಗೊಳಿಸಿ</string>
+  <string name="call_incoming_video_is_off">ವೀಡಿಯೊ ಆಫ್ ಆಗಿದೆ</string>
+  <string name="a11y_incoming_call_swipe_gesture_prompt">ಉತ್ತರಿಸಲು ಎರಡು ಬೆರಳಿನಿಂದ ಮೇಲಕ್ಕೆ ಸ್ವೈಪ್ ಮಾಡಿ. ನಿರಾಕರಿಸಲು ಎರಡು ಬೆರಳಿನಿಂದ ಕೆಳಗೆ ಸ್ವೈಪ್ ಮಾಡಿ.</string>
+  <string name="call_incoming_important">ಪ್ರಮುಖ</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-ko/strings.xml b/java/com/android/incallui/answer/impl/res/values-ko/strings.xml
index bc22246..f67349b 100644
--- a/java/com/android/incallui/answer/impl/res/values-ko/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-ko/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"메시지를 거부하려면 아이콘에서 스와이프하세요."</string>
-    <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"음성 통화로 받으려면 아이콘에서 스와이프하세요."</string>
-    <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"현재 통화를 끊지 않고 받으려면 위로 스와이프"</string>
-    <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"대기 중 통화를 종료하고 받으려면 위로 스와이프"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"현재 통화를 종료하고 전화를 받으려면 아이콘에서 스와이프하세요."</string>
-    <string name="call_incoming_message_custom" msgid="5819492800418293238">"직접 메시지 쓰기…"</string>
-    <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"직접 메시지 쓰기…"</string>
-    <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"취소"</string>
-    <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"보내기"</string>
-    <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"메시지를 사용하여 이 전화 거부"</string>
-    <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"음성 통화로 받기"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"현재 통화를 종료하고 전화 받기"</string>
-    <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"메시지를 사용하여 전화 거부"</string>
-    <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"음성 통화로 받기"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"현재 통화를 종료하고 전화 받기"</string>
-    <string name="call_incoming_video_is_off" msgid="3216603035158629403">"동영상이 꺼져 있습니다."</string>
-    <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"받으려면 두 손가락을 위로 스와이프하고 거부하려면 두 손가락을 아래로 스와이프하세요."</string>
-    <string name="call_incoming_important" msgid="3762352743365137090">"중요"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_decline_with_message">메시지를 거부하려면 아이콘에서 스와이프하세요.</string>
+  <string name="call_incoming_swipe_to_answer_video_as_audio">음성 통화로 받으려면 아이콘에서 스와이프하세요.</string>
+  <string name="call_incoming_default_label_answer_and_release_second">현재 통화를 끊지 않고 받으려면 위로 스와이프</string>
+  <string name="call_incoming_default_label_answer_and_release_third">대기 중 통화를 종료하고 받으려면 위로 스와이프</string>
+  <string name="call_incoming_swipe_to_answer_and_release">현재 통화를 종료하고 전화를 받으려면 아이콘에서 스와이프하세요.</string>
+  <string name="call_incoming_message_custom">직접 메시지 쓰기…</string>
+  <string name="call_incoming_respond_via_sms_custom_message">직접 메시지 쓰기…</string>
+  <string name="call_incoming_custom_message_cancel">취소</string>
+  <string name="call_incoming_custom_message_send">보내기</string>
+  <string name="a11y_incoming_call_reject_with_sms">메시지를 사용하여 이 전화 거부</string>
+  <string name="a11y_incoming_call_answer_video_as_audio">음성 통화로 받기</string>
+  <string name="a11y_incoming_call_answer_and_release">현재 통화를 종료하고 전화 받기</string>
+  <string name="a11y_description_incoming_call_reject_with_sms">메시지를 사용하여 전화 거부</string>
+  <string name="a11y_description_incoming_call_answer_video_as_audio">음성 통화로 받기</string>
+  <string name="a11y_description_incoming_call_answer_and_release">현재 통화를 종료하고 전화 받기</string>
+  <string name="call_incoming_video_is_off">동영상이 꺼져 있습니다.</string>
+  <string name="a11y_incoming_call_swipe_gesture_prompt">받으려면 두 손가락을 위로 스와이프하고 거부하려면 두 손가락을 아래로 스와이프하세요.</string>
+  <string name="call_incoming_important">중요</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-ky/strings.xml b/java/com/android/incallui/answer/impl/res/values-ky/strings.xml
index daea11a..c320956 100644
--- a/java/com/android/incallui/answer/impl/res/values-ky/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-ky/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"Чалууну билдирүү менен четке кагуу үчүн сүрөтчөнү сүрүңүз"</string>
-    <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"Аудио чалуу катары жооп берүү үчүн сүрөтчөдөн сүрүңүз"</string>
-    <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"Жооп берүү жана учурдагы чалууну кармоо үчүн экранды өйдө сүрүп коюңуз"</string>
-    <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Жооп берүү же кармалып турган чалууну бутүрүү үчүн экранды өйдө сүрүп коюңуз"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Чалууга жооп берүү же чалууну аяктоо үчүн сүрөтчөнү сүрүңүз"</string>
-    <string name="call_incoming_message_custom" msgid="5819492800418293238">"Сиздин жообуңуз..."</string>
-    <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"Сиздин жообуңуз..."</string>
-    <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"Баш тартуу"</string>
-    <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Жөнөтүү"</string>
-    <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"Бул чалууну билдирүү менен четке кагуу"</string>
-    <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"Аудио чалуу катары жооп берүү"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"Чалууга жооп бериңиз же учурдагы чалууну аяктаңыз"</string>
-    <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"Билдирүү менен четке кагуу"</string>
-    <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"Аудио чалуу катары жооп берүү"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Чалууга жооп бериңиз же учурдагы чалууну аяктаңыз"</string>
-    <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Видео өчүк"</string>
-    <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Жооп берүү үчүн экранды өйдө сүрүп, четке кагуу үчүн ылдый сүрүп коюңуз."</string>
-    <string name="call_incoming_important" msgid="3762352743365137090">"Маанилүү"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_decline_with_message">Чалууну билдирүү менен четке кагуу үчүн сүрөтчөнү сүрүңүз</string>
+  <string name="call_incoming_swipe_to_answer_video_as_audio">Аудио чалуу катары жооп берүү үчүн сүрөтчөдөн сүрүңүз</string>
+  <string name="call_incoming_default_label_answer_and_release_second">Жооп берүү жана учурдагы чалууну кармоо үчүн экранды өйдө сүрүп коюңуз</string>
+  <string name="call_incoming_default_label_answer_and_release_third">Жооп берүү же кармалып турган чалууну бутүрүү үчүн экранды өйдө сүрүп коюңуз</string>
+  <string name="call_incoming_swipe_to_answer_and_release">Чалууга жооп берүү же чалууну аяктоо үчүн сүрөтчөнү сүрүңүз</string>
+  <string name="call_incoming_message_custom">Сиздин жообуңуз...</string>
+  <string name="call_incoming_respond_via_sms_custom_message">Сиздин жообуңуз...</string>
+  <string name="call_incoming_custom_message_cancel">Баш тартуу</string>
+  <string name="call_incoming_custom_message_send">Жөнөтүү</string>
+  <string name="a11y_incoming_call_reject_with_sms">Бул чалууну билдирүү менен четке кагуу</string>
+  <string name="a11y_incoming_call_answer_video_as_audio">Аудио чалуу катары жооп берүү</string>
+  <string name="a11y_incoming_call_answer_and_release">Чалууга жооп бериңиз же учурдагы чалууну аяктаңыз</string>
+  <string name="a11y_description_incoming_call_reject_with_sms">Билдирүү менен четке кагуу</string>
+  <string name="a11y_description_incoming_call_answer_video_as_audio">Аудио чалуу катары жооп берүү</string>
+  <string name="a11y_description_incoming_call_answer_and_release">Чалууга жооп бериңиз же учурдагы чалууну аяктаңыз</string>
+  <string name="call_incoming_video_is_off">Видео өчүк</string>
+  <string name="a11y_incoming_call_swipe_gesture_prompt">Жооп берүү үчүн экранды өйдө сүрүп, четке кагуу үчүн ылдый сүрүп коюңуз.</string>
+  <string name="call_incoming_important">Маанилүү</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-lo/strings.xml b/java/com/android/incallui/answer/impl/res/values-lo/strings.xml
index 13dfe3a..baf561a 100644
--- a/java/com/android/incallui/answer/impl/res/values-lo/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-lo/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"ປັດຈາກໄອຄອນເພື່ອປະຕິເສດຂໍ້ຄວາມ"</string>
-    <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"ປັດຈາກໄອຄອນເພື່ອຮັບສາຍ"</string>
-    <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"ປັດຂຶ້ນເພື່ອຮັບສາຍ ແລະ ພັກສາຍທີ່ກຳລັງໂທອອກໄວ້ກ່ອນ"</string>
-    <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"ປັດຂຶ້ນເພື່ອຮັບສາຍ ແລະ ວາງສາຍທີ່ກຳລັງພັກຢູ່"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"ປັດຈາກໄອຄອນເພື່ອຮັບສາຍ ແລະ ວາງສາຍທີ່ກຳລັງໂທອອກ"</string>
-    <string name="call_incoming_message_custom" msgid="5819492800418293238">"ຂຽນຂໍ້ຄວາມຂອງທ່ານເອງ..."</string>
-    <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"ຂຽນຂໍ້ຄວາມຂອງທ່ານເອງ..."</string>
-    <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"ຍົກເລີກ"</string>
-    <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"ສົ່ງ"</string>
-    <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"ປະຕິເສດສາຍນີ້ພ້ອມສົ່ງຂໍ້ຄວາມ"</string>
-    <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"ຮັບສາຍສະເພາະສຽງ"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"ຮັບສາຍ ແລະ ວາງສາຍທີ່ກຳລັງໂທອອກ"</string>
-    <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"ປະຕິເສດພ້ອມສົ່ງຂໍ້ຄວາມ"</string>
-    <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"ຮັບສາຍສະເພາະສຽງ"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"ຮັບສາຍ ແລະ ວາງສາຍທີ່ກຳລັງໂທອອກ"</string>
-    <string name="call_incoming_video_is_off" msgid="3216603035158629403">"ວິດີໂອປິດຢູ່"</string>
-    <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"ປັດສອງນິ້ວຂຶ້ນເພື່ອຮັບສາຍ. ປັດສອງນິ້ວລົງເພື່ອປະຕິເສດ."</string>
-    <string name="call_incoming_important" msgid="3762352743365137090">"ສຳຄັນ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_decline_with_message">ປັດຈາກໄອຄອນເພື່ອປະຕິເສດຂໍ້ຄວາມ</string>
+  <string name="call_incoming_swipe_to_answer_video_as_audio">ປັດຈາກໄອຄອນເພື່ອຮັບສາຍ</string>
+  <string name="call_incoming_default_label_answer_and_release_second">ປັດຂຶ້ນເພື່ອຮັບສາຍ ແລະ ພັກສາຍທີ່ກຳລັງໂທອອກໄວ້ກ່ອນ</string>
+  <string name="call_incoming_default_label_answer_and_release_third">ປັດຂຶ້ນເພື່ອຮັບສາຍ ແລະ ວາງສາຍທີ່ກຳລັງພັກຢູ່</string>
+  <string name="call_incoming_swipe_to_answer_and_release">ປັດຈາກໄອຄອນເພື່ອຮັບສາຍ ແລະ ວາງສາຍທີ່ກຳລັງໂທອອກ</string>
+  <string name="call_incoming_message_custom">ຂຽນຂໍ້ຄວາມຂອງທ່ານເອງ...</string>
+  <string name="call_incoming_respond_via_sms_custom_message">ຂຽນຂໍ້ຄວາມຂອງທ່ານເອງ...</string>
+  <string name="call_incoming_custom_message_cancel">ຍົກເລີກ</string>
+  <string name="call_incoming_custom_message_send">ສົ່ງ</string>
+  <string name="a11y_incoming_call_reject_with_sms">ປະຕິເສດສາຍນີ້ພ້ອມສົ່ງຂໍ້ຄວາມ</string>
+  <string name="a11y_incoming_call_answer_video_as_audio">ຮັບສາຍສະເພາະສຽງ</string>
+  <string name="a11y_incoming_call_answer_and_release">ຮັບສາຍ ແລະ ວາງສາຍທີ່ກຳລັງໂທອອກ</string>
+  <string name="a11y_description_incoming_call_reject_with_sms">ປະຕິເສດພ້ອມສົ່ງຂໍ້ຄວາມ</string>
+  <string name="a11y_description_incoming_call_answer_video_as_audio">ຮັບສາຍສະເພາະສຽງ</string>
+  <string name="a11y_description_incoming_call_answer_and_release">ຮັບສາຍ ແລະ ວາງສາຍທີ່ກຳລັງໂທອອກ</string>
+  <string name="call_incoming_video_is_off">ວິດີໂອປິດຢູ່</string>
+  <string name="a11y_incoming_call_swipe_gesture_prompt">ປັດສອງນິ້ວຂຶ້ນເພື່ອຮັບສາຍ. ປັດສອງນິ້ວລົງເພື່ອປະຕິເສດ.</string>
+  <string name="call_incoming_important">ສຳຄັນ</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-lt/strings.xml b/java/com/android/incallui/answer/impl/res/values-lt/strings.xml
index 9edef8d..0a65abc 100644
--- a/java/com/android/incallui/answer/impl/res/values-lt/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-lt/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"Perbraukite iš piktogramos, kad atmestumėte išsiųsdami pranešimą"</string>
-    <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"Perbraukite iš piktogramos, kad atsilieptumėte kaip į garso skambutį"</string>
-    <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"Perbraukite aukštyn, kad atsakytumėte ir sulaikytumėte vykstantį skambutį"</string>
-    <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Perbraukite aukštyn, kad atsakytumėte ir užbaigtumėte sulaikytą skambutį"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Perbraukite iš piktogramos, kad atsakytumėte ir užbaigtumėte vykstantį skambutį"</string>
-    <string name="call_incoming_message_custom" msgid="5819492800418293238">"Parašykite savo…"</string>
-    <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"Parašykite savo…"</string>
-    <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"Atšaukti"</string>
-    <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Siųsti"</string>
-    <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"Atmesti šį skambutį su pranešimu"</string>
-    <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"Atsiliepti kaip į garso skambutį"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"Atsakykite ir užbaikite vykstantį skambutį"</string>
-    <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"Atmesti su pranešimu"</string>
-    <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"Atsiliepti kaip į garso skambutį"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Atsakykite ir užbaikite vykstantį skambutį"</string>
-    <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Vaizdas išjungtas"</string>
-    <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Perbraukite dviem pirštais aukštyn, kad atsakytumėte. Perbraukite dviem pirštais žemyn, kad atmestumėte."</string>
-    <string name="call_incoming_important" msgid="3762352743365137090">"Svarbu"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_decline_with_message">Perbraukite iš piktogramos, kad atmestumėte išsiųsdami pranešimą</string>
+  <string name="call_incoming_swipe_to_answer_video_as_audio">Perbraukite iš piktogramos, kad atsilieptumėte kaip į garso skambutį</string>
+  <string name="call_incoming_default_label_answer_and_release_second">Perbraukite aukštyn, kad atsakytumėte ir sulaikytumėte vykstantį skambutį</string>
+  <string name="call_incoming_default_label_answer_and_release_third">Perbraukite aukštyn, kad atsakytumėte ir užbaigtumėte sulaikytą skambutį</string>
+  <string name="call_incoming_swipe_to_answer_and_release">Perbraukite iš piktogramos, kad atsakytumėte ir užbaigtumėte vykstantį skambutį</string>
+  <string name="call_incoming_message_custom">Parašykite savo…</string>
+  <string name="call_incoming_respond_via_sms_custom_message">Parašykite savo…</string>
+  <string name="call_incoming_custom_message_cancel">Atšaukti</string>
+  <string name="call_incoming_custom_message_send">Siųsti</string>
+  <string name="a11y_incoming_call_reject_with_sms">Atmesti šį skambutį su pranešimu</string>
+  <string name="a11y_incoming_call_answer_video_as_audio">Atsiliepti kaip į garso skambutį</string>
+  <string name="a11y_incoming_call_answer_and_release">Atsakykite ir užbaikite vykstantį skambutį</string>
+  <string name="a11y_description_incoming_call_reject_with_sms">Atmesti su pranešimu</string>
+  <string name="a11y_description_incoming_call_answer_video_as_audio">Atsiliepti kaip į garso skambutį</string>
+  <string name="a11y_description_incoming_call_answer_and_release">Atsakykite ir užbaikite vykstantį skambutį</string>
+  <string name="call_incoming_video_is_off">Vaizdas išjungtas</string>
+  <string name="a11y_incoming_call_swipe_gesture_prompt">Perbraukite dviem pirštais aukštyn, kad atsakytumėte. Perbraukite dviem pirštais žemyn, kad atmestumėte.</string>
+  <string name="call_incoming_important">Svarbu</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-lv/strings.xml b/java/com/android/incallui/answer/impl/res/values-lv/strings.xml
index 36124ae..eb327df 100644
--- a/java/com/android/incallui/answer/impl/res/values-lv/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-lv/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"Lai noraidītu, izmantojot ziņojumu, velciet no ikonas"</string>
-    <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"Lai atbildētu audiozvanā, velciet no ikonas"</string>
-    <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"Velciet augšup, lai atbildētu un aizturētu notiekošo zvanu"</string>
-    <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Velciet augšup, lai atbildētu un beigtu aizturēto zvanu"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Velciet no ikonas, lai atbildētu un beigtu notiekošo zvanu"</string>
-    <string name="call_incoming_message_custom" msgid="5819492800418293238">"Rakstīt savu…"</string>
-    <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"Rakstīt savu…"</string>
-    <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"Atcelt"</string>
-    <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Sūtīt"</string>
-    <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"Noraidīt šo zvanu, izmantojot ziņojumu"</string>
-    <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"Atbildēt audiozvanā"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"Atbildiet un beidziet notiekošo zvanu"</string>
-    <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"Noraidīt, izmantojot ziņojumu"</string>
-    <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"Atbildēt audiozvanā"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Atbildiet un beidziet notiekošo zvanu"</string>
-    <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Video ir izslēgts"</string>
-    <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Ar diviem pirkstiem velciet augšup, lai atbildētu. Ar diviem pirkstiem velciet lejup, lai noraidītu."</string>
-    <string name="call_incoming_important" msgid="3762352743365137090">"Svarīgs"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_decline_with_message">Lai noraidītu, izmantojot ziņojumu, velciet no ikonas</string>
+  <string name="call_incoming_swipe_to_answer_video_as_audio">Lai atbildētu audiozvanā, velciet no ikonas</string>
+  <string name="call_incoming_default_label_answer_and_release_second">Velciet augšup, lai atbildētu un aizturētu notiekošo zvanu</string>
+  <string name="call_incoming_default_label_answer_and_release_third">Velciet augšup, lai atbildētu un beigtu aizturēto zvanu</string>
+  <string name="call_incoming_swipe_to_answer_and_release">Velciet no ikonas, lai atbildētu un beigtu notiekošo zvanu</string>
+  <string name="call_incoming_message_custom">Rakstīt savu…</string>
+  <string name="call_incoming_respond_via_sms_custom_message">Rakstīt savu…</string>
+  <string name="call_incoming_custom_message_cancel">Atcelt</string>
+  <string name="call_incoming_custom_message_send">Sūtīt</string>
+  <string name="a11y_incoming_call_reject_with_sms">Noraidīt šo zvanu, izmantojot ziņojumu</string>
+  <string name="a11y_incoming_call_answer_video_as_audio">Atbildēt audiozvanā</string>
+  <string name="a11y_incoming_call_answer_and_release">Atbildiet un beidziet notiekošo zvanu</string>
+  <string name="a11y_description_incoming_call_reject_with_sms">Noraidīt, izmantojot ziņojumu</string>
+  <string name="a11y_description_incoming_call_answer_video_as_audio">Atbildēt audiozvanā</string>
+  <string name="a11y_description_incoming_call_answer_and_release">Atbildiet un beidziet notiekošo zvanu</string>
+  <string name="call_incoming_video_is_off">Video ir izslēgts</string>
+  <string name="a11y_incoming_call_swipe_gesture_prompt">Ar diviem pirkstiem velciet augšup, lai atbildētu. Ar diviem pirkstiem velciet lejup, lai noraidītu.</string>
+  <string name="call_incoming_important">Svarīgs</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-mk/strings.xml b/java/com/android/incallui/answer/impl/res/values-mk/strings.xml
index c447106..f882938 100644
--- a/java/com/android/incallui/answer/impl/res/values-mk/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-mk/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"Повлечете од иконата за да одбиете со порака"</string>
-    <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"Повлечете од иконата за да одговорите на аудиоповик"</string>
-    <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"Повлечете нагоре за да одговорите и да ставите на чекање појдовен повик"</string>
-    <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Повлечете нагоре за да одговорите и да завршите повик на чекање"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Повлечете од иконата за да одговорите и да го завршите тековниот повик"</string>
-    <string name="call_incoming_message_custom" msgid="5819492800418293238">"Напишете сопствен…"</string>
-    <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"Напишете сопствен…"</string>
-    <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"Откажи"</string>
-    <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Испрати"</string>
-    <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"Одбијте го повиков со порака"</string>
-    <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"Одговорете со аудиоповик"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"Одговорете и завршете го тековниот повик"</string>
-    <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"Одбијте со порака"</string>
-    <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"Одговорете со аудиоповик"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Одговорете и завршете го тековниот повик"</string>
-    <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Видеото е исклучено"</string>
-    <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Повлечете нагоре со два прста за да одговорите. Повлечете надолу со два прста за да одбиете."</string>
-    <string name="call_incoming_important" msgid="3762352743365137090">"Важно"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_decline_with_message">Повлечете од иконата за да одбиете со порака</string>
+  <string name="call_incoming_swipe_to_answer_video_as_audio">Повлечете од иконата за да одговорите на аудиоповик</string>
+  <string name="call_incoming_default_label_answer_and_release_second">Повлечете нагоре за да одговорите и да ставите на чекање појдовен повик</string>
+  <string name="call_incoming_default_label_answer_and_release_third">Повлечете нагоре за да одговорите и да завршите повик на чекање</string>
+  <string name="call_incoming_swipe_to_answer_and_release">Повлечете од иконата за да одговорите и да го завршите тековниот повик</string>
+  <string name="call_incoming_message_custom">Напишете сопствен…</string>
+  <string name="call_incoming_respond_via_sms_custom_message">Напишете сопствен…</string>
+  <string name="call_incoming_custom_message_cancel">Откажи</string>
+  <string name="call_incoming_custom_message_send">Испрати</string>
+  <string name="a11y_incoming_call_reject_with_sms">Одбијте го повиков со порака</string>
+  <string name="a11y_incoming_call_answer_video_as_audio">Одговорете со аудиоповик</string>
+  <string name="a11y_incoming_call_answer_and_release">Одговорете и завршете го тековниот повик</string>
+  <string name="a11y_description_incoming_call_reject_with_sms">Одбијте со порака</string>
+  <string name="a11y_description_incoming_call_answer_video_as_audio">Одговорете со аудиоповик</string>
+  <string name="a11y_description_incoming_call_answer_and_release">Одговорете и завршете го тековниот повик</string>
+  <string name="call_incoming_video_is_off">Видеото е исклучено</string>
+  <string name="a11y_incoming_call_swipe_gesture_prompt">Повлечете нагоре со два прста за да одговорите. Повлечете надолу со два прста за да одбиете.</string>
+  <string name="call_incoming_important">Важно</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-ml/strings.xml b/java/com/android/incallui/answer/impl/res/values-ml/strings.xml
index 82362c6..9459a5d 100644
--- a/java/com/android/incallui/answer/impl/res/values-ml/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-ml/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"സന്ദേശമയച്ചുകൊണ്ട് നിരസിക്കാൻ ഐക്കണിൽ നിന്ന് സ്വൈപ്പുചെയ്യുക"</string>
-    <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"ഒരു ഓഡിയോ കോളായി മറുപടി നൽകാൻ ഐക്കണിൽ നിന്ന് സ്വൈപ്പുചെയ്യുക"</string>
-    <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"നിലവിലുള്ള കോളിന് മറുപടി നൽകാനും അത് ഹോൾഡുചെയ്യാനും മുകളിലേക്ക് സ്വൈപ്പുചെയ്യുക"</string>
-    <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"മറുപടി നൽകാനും ഹോൾഡിലുള്ള കോൾ അവസാനിപ്പിക്കാനും മുകളിലേക്ക് സ്വൈപ്പുചെയ്യുക"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"മറുപടി നൽകാനും നിലവിലുള്ള കോൾ അവസാനിപ്പിക്കാനും ഐക്കണിൽ നിന്ന് സ്വൈപ്പുചെയ്യുക"</string>
-    <string name="call_incoming_message_custom" msgid="5819492800418293238">"നിങ്ങളുടേതായത് എഴുതുക…"</string>
-    <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"നിങ്ങളുടേതായത് എഴുതുക…"</string>
-    <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"റദ്ദാക്കുക"</string>
-    <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"അയയ്‌ക്കുക"</string>
-    <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"ഒരു സന്ദേശം അയച്ചുകൊണ്ട് ഈ കോൾ നിരസിക്കുക"</string>
-    <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"ഓഡിയോ കോളായി മറുപടി നൽകുക"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"മറുപടി നൽകുകയും നിലവിലുള്ള കോൾ അവസാനിപ്പിക്കുകയും ചെയ്യൂ"</string>
-    <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"ഒരു സന്ദേശം അയച്ചുകൊണ്ട് നിരസിക്കുക"</string>
-    <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"ഓഡിയോ കോളായി മറുപടി നൽകുക"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"മറുപടി നൽകുകയും നിലവിലുള്ള കോൾ അവസാനിപ്പിക്കുകയും ചെയ്യൂ"</string>
-    <string name="call_incoming_video_is_off" msgid="3216603035158629403">"വീഡിയോ ഓഫാണ്"</string>
-    <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"മറുപടി നൽകാൻ രണ്ടുവിരലുകൾ ഉപയോഗിച്ച് മുകളിലേക്ക് സ്വൈപ്പുചെയ്യുക. നിരസിക്കാൻ രണ്ടുവിരലുകൾ ഉപയോഗിച്ച് താഴേക്ക് സ്വൈപ്പുചെയ്യുക."</string>
-    <string name="call_incoming_important" msgid="3762352743365137090">"പ്രധാനപ്പെട്ടവ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_decline_with_message">സന്ദേശമയച്ചുകൊണ്ട് നിരസിക്കാൻ ഐക്കണിൽ നിന്ന് സ്വൈപ്പുചെയ്യുക</string>
+  <string name="call_incoming_swipe_to_answer_video_as_audio">ഒരു ഓഡിയോ കോളായി മറുപടി നൽകാൻ ഐക്കണിൽ നിന്ന് സ്വൈപ്പുചെയ്യുക</string>
+  <string name="call_incoming_default_label_answer_and_release_second">നിലവിലുള്ള കോളിന് മറുപടി നൽകാനും അത് ഹോൾഡുചെയ്യാനും മുകളിലേക്ക് സ്വൈപ്പുചെയ്യുക</string>
+  <string name="call_incoming_default_label_answer_and_release_third">മറുപടി നൽകാനും ഹോൾഡിലുള്ള കോൾ അവസാനിപ്പിക്കാനും മുകളിലേക്ക് സ്വൈപ്പുചെയ്യുക</string>
+  <string name="call_incoming_swipe_to_answer_and_release">മറുപടി നൽകാനും നിലവിലുള്ള കോൾ അവസാനിപ്പിക്കാനും ഐക്കണിൽ നിന്ന് സ്വൈപ്പുചെയ്യുക</string>
+  <string name="call_incoming_message_custom">നിങ്ങളുടേതായത് എഴുതുക…</string>
+  <string name="call_incoming_respond_via_sms_custom_message">നിങ്ങളുടേതായത് എഴുതുക…</string>
+  <string name="call_incoming_custom_message_cancel">റദ്ദാക്കുക</string>
+  <string name="call_incoming_custom_message_send">അയയ്‌ക്കുക</string>
+  <string name="a11y_incoming_call_reject_with_sms">ഒരു സന്ദേശം അയച്ചുകൊണ്ട് ഈ കോൾ നിരസിക്കുക</string>
+  <string name="a11y_incoming_call_answer_video_as_audio">ഓഡിയോ കോളായി മറുപടി നൽകുക</string>
+  <string name="a11y_incoming_call_answer_and_release">മറുപടി നൽകുകയും നിലവിലുള്ള കോൾ അവസാനിപ്പിക്കുകയും ചെയ്യൂ</string>
+  <string name="a11y_description_incoming_call_reject_with_sms">ഒരു സന്ദേശം അയച്ചുകൊണ്ട് നിരസിക്കുക</string>
+  <string name="a11y_description_incoming_call_answer_video_as_audio">ഓഡിയോ കോളായി മറുപടി നൽകുക</string>
+  <string name="a11y_description_incoming_call_answer_and_release">മറുപടി നൽകുകയും നിലവിലുള്ള കോൾ അവസാനിപ്പിക്കുകയും ചെയ്യൂ</string>
+  <string name="call_incoming_video_is_off">വീഡിയോ ഓഫാണ്</string>
+  <string name="a11y_incoming_call_swipe_gesture_prompt">മറുപടി നൽകാൻ രണ്ടുവിരലുകൾ ഉപയോഗിച്ച് മുകളിലേക്ക് സ്വൈപ്പുചെയ്യുക. നിരസിക്കാൻ രണ്ടുവിരലുകൾ ഉപയോഗിച്ച് താഴേക്ക് സ്വൈപ്പുചെയ്യുക.</string>
+  <string name="call_incoming_important">പ്രധാനപ്പെട്ടവ</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-mn/strings.xml b/java/com/android/incallui/answer/impl/res/values-mn/strings.xml
index 648056b..442be06 100644
--- a/java/com/android/incallui/answer/impl/res/values-mn/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-mn/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"Зурвас явуулангаа татгалзах бол дүрснээс шударна уу"</string>
-    <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"Аудио дуудлагаар хариулах бол дүрснээс шударна уу"</string>
-    <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"Дээш шударч дуудлагыг аваад, одоогийн дуудлагыг түр хүлээлгэх"</string>
-    <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Дээш шударч дуудлагыг аваад, түр хүлээлгэсэн дуудлагыг таслах"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Дүрснээс шударч ирсэн дуудлагыг аваад одоогийн дуудлагыг таслах"</string>
-    <string name="call_incoming_message_custom" msgid="5819492800418293238">"Өөрийнхөөрөө бичнэ үү…"</string>
-    <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"Өөрийнхөөрөө бичнэ үү…"</string>
-    <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"Цуцлах"</string>
-    <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Илгээх"</string>
-    <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"Энэ дуудлагыг зурвас бичиж таслах"</string>
-    <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"Аудио дуудлагаар хариулах"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"Ирсэн дуудлагыг авч, одоогийн дуудлагыг таслах"</string>
-    <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"Зурвас бичиж таслах"</string>
-    <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"Аудио дуудлагаар хариулах"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Ирсэн дуудлагыг авч, одоогийн дуудлагыг таслах"</string>
-    <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Видео идэвхгүй байна"</string>
-    <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Хариулах бол хоёр хуруугаар дээш шударна уу. Таслах бол хоёр хуруугаар доош шударна уу."</string>
-    <string name="call_incoming_important" msgid="3762352743365137090">"Чухал"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_decline_with_message">Зурвас явуулангаа татгалзах бол дүрснээс шударна уу</string>
+  <string name="call_incoming_swipe_to_answer_video_as_audio">Аудио дуудлагаар хариулах бол дүрснээс шударна уу</string>
+  <string name="call_incoming_default_label_answer_and_release_second">Дээш шударч дуудлагыг аваад, одоогийн дуудлагыг түр хүлээлгэх</string>
+  <string name="call_incoming_default_label_answer_and_release_third">Дээш шударч дуудлагыг аваад, түр хүлээлгэсэн дуудлагыг таслах</string>
+  <string name="call_incoming_swipe_to_answer_and_release">Дүрснээс шударч ирсэн дуудлагыг аваад одоогийн дуудлагыг таслах</string>
+  <string name="call_incoming_message_custom">Өөрийнхөөрөө бичнэ үү…</string>
+  <string name="call_incoming_respond_via_sms_custom_message">Өөрийнхөөрөө бичнэ үү…</string>
+  <string name="call_incoming_custom_message_cancel">Цуцлах</string>
+  <string name="call_incoming_custom_message_send">Илгээх</string>
+  <string name="a11y_incoming_call_reject_with_sms">Энэ дуудлагыг зурвас бичиж таслах</string>
+  <string name="a11y_incoming_call_answer_video_as_audio">Аудио дуудлагаар хариулах</string>
+  <string name="a11y_incoming_call_answer_and_release">Ирсэн дуудлагыг авч, одоогийн дуудлагыг таслах</string>
+  <string name="a11y_description_incoming_call_reject_with_sms">Зурвас бичиж таслах</string>
+  <string name="a11y_description_incoming_call_answer_video_as_audio">Аудио дуудлагаар хариулах</string>
+  <string name="a11y_description_incoming_call_answer_and_release">Ирсэн дуудлагыг авч, одоогийн дуудлагыг таслах</string>
+  <string name="call_incoming_video_is_off">Видео идэвхгүй байна</string>
+  <string name="a11y_incoming_call_swipe_gesture_prompt">Хариулах бол хоёр хуруугаар дээш шударна уу. Таслах бол хоёр хуруугаар доош шударна уу.</string>
+  <string name="call_incoming_important">Чухал</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-mr/strings.xml b/java/com/android/incallui/answer/impl/res/values-mr/strings.xml
index c8f7d3f..e0982ed 100644
--- a/java/com/android/incallui/answer/impl/res/values-mr/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-mr/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"संदेशासह नाकारण्यासाठी आयकॉनपासून स्वाइप करा"</string>
-    <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"ऑडिओ कॉल म्हणून उत्तर देण्यासाठी चिन्हावरुन स्वाइप करा"</string>
-    <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"उत्तर देण्यासाठी आणि सुरु असलेला कॉल होल्ड करण्‍यासाठी वर स्वाइप करा"</string>
-    <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"उत्तर देण्यासाठी आणि होल्ड केलेला कॉल बंद करण्‍यासाठी वर स्वाइप करा"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"उत्तर देण्‍यासाठी आणि सुरु असलेला कॉल बंद करण्‍यासाठी चिन्हावरून स्वाइप करा"</string>
-    <string name="call_incoming_message_custom" msgid="5819492800418293238">"आपण स्वतःच लिहा…"</string>
-    <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"आपण स्वतःच लिहा…"</string>
-    <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"रद्द करा"</string>
-    <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"पाठवा"</string>
-    <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"एका संदेशासह या कॉलला नकार द्या"</string>
-    <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"ऑडिओ कॉल म्हणून उत्तर द्या"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"उत्तर द्या आणि सुरु असलेला कॉल बंद करा"</string>
-    <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"संदेशासह नकार द्या"</string>
-    <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"ऑडिओ कॉल म्हणून उत्तर द्या"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"उत्तर द्या आणि सुरु असलेला कॉल बंद करा"</string>
-    <string name="call_incoming_video_is_off" msgid="3216603035158629403">"व्हिडिओ बंद आहे"</string>
-    <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"उत्तर देण्यासाठी दोन बोटांनी वर स्वाइप करा. नकार देण्यासाठी दोन बोटांनी खाली स्वाइप करा."</string>
-    <string name="call_incoming_important" msgid="3762352743365137090">"महत्त्वाचे"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_decline_with_message">संदेशासह नाकारण्यासाठी आयकॉनपासून स्वाइप करा</string>
+  <string name="call_incoming_swipe_to_answer_video_as_audio">ऑडिओ कॉल म्हणून उत्तर देण्यासाठी चिन्हावरुन स्वाइप करा</string>
+  <string name="call_incoming_default_label_answer_and_release_second">उत्तर देण्यासाठी आणि सुरु असलेला कॉल होल्ड करण्‍यासाठी वर स्वाइप करा</string>
+  <string name="call_incoming_default_label_answer_and_release_third">उत्तर देण्यासाठी आणि होल्ड केलेला कॉल बंद करण्‍यासाठी वर स्वाइप करा</string>
+  <string name="call_incoming_swipe_to_answer_and_release">उत्तर देण्‍यासाठी आणि सुरु असलेला कॉल बंद करण्‍यासाठी चिन्हावरून स्वाइप करा</string>
+  <string name="call_incoming_message_custom">आपण स्वतःच लिहा…</string>
+  <string name="call_incoming_respond_via_sms_custom_message">आपण स्वतःच लिहा…</string>
+  <string name="call_incoming_custom_message_cancel">रद्द करा</string>
+  <string name="call_incoming_custom_message_send">पाठवा</string>
+  <string name="a11y_incoming_call_reject_with_sms">एका संदेशासह या कॉलला नकार द्या</string>
+  <string name="a11y_incoming_call_answer_video_as_audio">ऑडिओ कॉल म्हणून उत्तर द्या</string>
+  <string name="a11y_incoming_call_answer_and_release">उत्तर द्या आणि सुरु असलेला कॉल बंद करा</string>
+  <string name="a11y_description_incoming_call_reject_with_sms">संदेशासह नकार द्या</string>
+  <string name="a11y_description_incoming_call_answer_video_as_audio">ऑडिओ कॉल म्हणून उत्तर द्या</string>
+  <string name="a11y_description_incoming_call_answer_and_release">उत्तर द्या आणि सुरु असलेला कॉल बंद करा</string>
+  <string name="call_incoming_video_is_off">व्हिडिओ बंद आहे</string>
+  <string name="a11y_incoming_call_swipe_gesture_prompt">उत्तर देण्यासाठी दोन बोटांनी वर स्वाइप करा. नकार देण्यासाठी दोन बोटांनी खाली स्वाइप करा.</string>
+  <string name="call_incoming_important">महत्त्वाचे</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-ms/strings.xml b/java/com/android/incallui/answer/impl/res/values-ms/strings.xml
index 4361f8a..1ecf6a3 100644
--- a/java/com/android/incallui/answer/impl/res/values-ms/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-ms/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"Leret dari ikon untuk menolak dengan mesej"</string>
-    <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"Leret dari ikon untuk menjawab sebagai panggilan audio"</string>
-    <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"Leret ke atas untuk menjawab dan menahan panggilan aktif"</string>
-    <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Leret ke atas untuk menjawab dan menamatkan panggilan yang ditahan"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Leret dari ikon untuk menjawab dan menamatkan panggilan yang sedang berlangsung"</string>
-    <string name="call_incoming_message_custom" msgid="5819492800418293238">"Tulis mesej anda sendiri…"</string>
-    <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"Tulis mesej anda sendiri…"</string>
-    <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"Batal"</string>
-    <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Hantar"</string>
-    <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"Tolak panggilan ini dengan mesej"</string>
-    <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"Jawab sebagai panggilan audio"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"Jawab dan tamatkan panggilan yang sedang berlangsung"</string>
-    <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"Tolak dengan mesej"</string>
-    <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"Jawab sebagai panggilan audio"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Jawab dan tamatkan panggilan yang sedang berlangsung"</string>
-    <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Video dimatikan"</string>
-    <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Leret dua jari ke atas untuk menjawab. Leret dua jari ke bawah untuk menolak."</string>
-    <string name="call_incoming_important" msgid="3762352743365137090">"Penting"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_decline_with_message">Leret dari ikon untuk menolak dengan mesej</string>
+  <string name="call_incoming_swipe_to_answer_video_as_audio">Leret dari ikon untuk menjawab sebagai panggilan audio</string>
+  <string name="call_incoming_default_label_answer_and_release_second">Leret ke atas untuk menjawab dan menahan panggilan aktif</string>
+  <string name="call_incoming_default_label_answer_and_release_third">Leret ke atas untuk menjawab dan menamatkan panggilan yang ditahan</string>
+  <string name="call_incoming_swipe_to_answer_and_release">Leret dari ikon untuk menjawab dan menamatkan panggilan yang sedang berlangsung</string>
+  <string name="call_incoming_message_custom">Tulis mesej anda sendiri…</string>
+  <string name="call_incoming_respond_via_sms_custom_message">Tulis mesej anda sendiri…</string>
+  <string name="call_incoming_custom_message_cancel">Batal</string>
+  <string name="call_incoming_custom_message_send">Hantar</string>
+  <string name="a11y_incoming_call_reject_with_sms">Tolak panggilan ini dengan mesej</string>
+  <string name="a11y_incoming_call_answer_video_as_audio">Jawab sebagai panggilan audio</string>
+  <string name="a11y_incoming_call_answer_and_release">Jawab dan tamatkan panggilan yang sedang berlangsung</string>
+  <string name="a11y_description_incoming_call_reject_with_sms">Tolak dengan mesej</string>
+  <string name="a11y_description_incoming_call_answer_video_as_audio">Jawab sebagai panggilan audio</string>
+  <string name="a11y_description_incoming_call_answer_and_release">Jawab dan tamatkan panggilan yang sedang berlangsung</string>
+  <string name="call_incoming_video_is_off">Video dimatikan</string>
+  <string name="a11y_incoming_call_swipe_gesture_prompt">Leret dua jari ke atas untuk menjawab. Leret dua jari ke bawah untuk menolak.</string>
+  <string name="call_incoming_important">Penting</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-my/strings.xml b/java/com/android/incallui/answer/impl/res/values-my/strings.xml
index 444c4f7..2763e88 100644
--- a/java/com/android/incallui/answer/impl/res/values-my/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-my/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"မက်ဆေ့ဂျ်ဖြင့်ငြင်းပယ်ရန် သင်္ကေတမှ ပွတ်ဆွဲပါ"</string>
-    <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"အသံခေါ်ဆိုမှုအဖြစ်ဖြေကြားရန် သင်္ကေတမှ ပွတ်ဆွဲပါ"</string>
-    <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"ဖြေကြားရန် အပေါ်သို့ ပွတ်ဆွဲပြီး လက်ရှိခေါ်ဆိုမှုကို ခဏရပ်ထားပါ"</string>
-    <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"ဖြေကြားရန် အပေါ်သို့ ပွတ်ဆွဲပြီး ကိုင်ထားသောခေါ်ဆိုမှုကို အပြီးသတ်ပါ"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"ဖြေကြားရန် သင်္ကေတမှ ပွတ်ဆွဲပြီး လက်ရှိခေါ်ဆိုမှုကို အပြီးသတ်ပါ"</string>
-    <string name="call_incoming_message_custom" msgid="5819492800418293238">"သင့်ကိုယ်ပိုင်ရေးပါ…"</string>
-    <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"သင့်ကိုယ်ပိုင်ရေးပါ…"</string>
-    <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"မလုပ်တော့"</string>
-    <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"ပို့ရန်"</string>
-    <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"ဤခေါ်ဆိုမှုကို မက်ဆေ့ဂျ်ဖြင့် ငြင်းဆိုရန်"</string>
-    <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"အသံခေါ်ဆိုမှုအဖြစ် ဖြေကြားရန်"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"ဖြေကြားပြီး လက်ရှိခေါ်ဆိုမှုကို အပြီးသတ်ပါ"</string>
-    <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"မက်ဆေ့ဂျ်ဖြင့် ငြင်းပယ်ရန်"</string>
-    <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"အသံခေါ်ဆိုမှုအဖြစ် ဖြေကြားရန်"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"ဖြေကြားပြီး လက်ရှိခေါ်ဆိုမှုကို အပြီးသတ်ပါ"</string>
-    <string name="call_incoming_video_is_off" msgid="3216603035158629403">"ဗီဒီယို ပိတ်ထားပါသည်"</string>
-    <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"ဖြေကြားရန် လက်နှစ်ချောင်းဖြင့် အပေါ်သို့ ပွတ်ဆွဲပါ။ ငြင်းပယ်ရန် လက်နှစ်ချောင်းဖြင့် အောက်သို့ ပွတ်ဆွဲပါ။"</string>
-    <string name="call_incoming_important" msgid="3762352743365137090">"အရေးကြီး"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_decline_with_message">မက်ဆေ့ဂျ်ဖြင့်ငြင်းပယ်ရန် သင်္ကေတမှ ပွတ်ဆွဲပါ</string>
+  <string name="call_incoming_swipe_to_answer_video_as_audio">အသံခေါ်ဆိုမှုအဖြစ်ဖြေကြားရန် သင်္ကေတမှ ပွတ်ဆွဲပါ</string>
+  <string name="call_incoming_default_label_answer_and_release_second">ဖြေကြားရန် အပေါ်သို့ ပွတ်ဆွဲပြီး လက်ရှိခေါ်ဆိုမှုကို ခဏရပ်ထားပါ</string>
+  <string name="call_incoming_default_label_answer_and_release_third">ဖြေကြားရန် အပေါ်သို့ ပွတ်ဆွဲပြီး ကိုင်ထားသောခေါ်ဆိုမှုကို အပြီးသတ်ပါ</string>
+  <string name="call_incoming_swipe_to_answer_and_release">ဖြေကြားရန် သင်္ကေတမှ ပွတ်ဆွဲပြီး လက်ရှိခေါ်ဆိုမှုကို အပြီးသတ်ပါ</string>
+  <string name="call_incoming_message_custom">သင့်ကိုယ်ပိုင်ရေးပါ…</string>
+  <string name="call_incoming_respond_via_sms_custom_message">သင့်ကိုယ်ပိုင်ရေးပါ…</string>
+  <string name="call_incoming_custom_message_cancel">မလုပ်တော့</string>
+  <string name="call_incoming_custom_message_send">ပို့ရန်</string>
+  <string name="a11y_incoming_call_reject_with_sms">ဤခေါ်ဆိုမှုကို မက်ဆေ့ဂျ်ဖြင့် ငြင်းဆိုရန်</string>
+  <string name="a11y_incoming_call_answer_video_as_audio">အသံခေါ်ဆိုမှုအဖြစ် ဖြေကြားရန်</string>
+  <string name="a11y_incoming_call_answer_and_release">ဖြေကြားပြီး လက်ရှိခေါ်ဆိုမှုကို အပြီးသတ်ပါ</string>
+  <string name="a11y_description_incoming_call_reject_with_sms">မက်ဆေ့ဂျ်ဖြင့် ငြင်းပယ်ရန်</string>
+  <string name="a11y_description_incoming_call_answer_video_as_audio">အသံခေါ်ဆိုမှုအဖြစ် ဖြေကြားရန်</string>
+  <string name="a11y_description_incoming_call_answer_and_release">ဖြေကြားပြီး လက်ရှိခေါ်ဆိုမှုကို အပြီးသတ်ပါ</string>
+  <string name="call_incoming_video_is_off">ဗီဒီယို ပိတ်ထားပါသည်</string>
+  <string name="a11y_incoming_call_swipe_gesture_prompt">ဖြေကြားရန် လက်နှစ်ချောင်းဖြင့် အပေါ်သို့ ပွတ်ဆွဲပါ။ ငြင်းပယ်ရန် လက်နှစ်ချောင်းဖြင့် အောက်သို့ ပွတ်ဆွဲပါ။</string>
+  <string name="call_incoming_important">အရေးကြီး</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-nb/strings.xml b/java/com/android/incallui/answer/impl/res/values-nb/strings.xml
index 4b37234..3d6cd5e 100644
--- a/java/com/android/incallui/answer/impl/res/values-nb/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-nb/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"Sveip fra ikonet for å avslå med en melding"</string>
-    <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"Sveip fra ikonet for å svare med en lydsamtale"</string>
-    <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"Sveip oppover for å svare og sette samtalen som er i gang på vent"</string>
-    <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Sveip oppover for å svare og avslutte samtalen som står på vent"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Sveip fra ikonet for å svare – og avslutte samtalen som er i gang"</string>
-    <string name="call_incoming_message_custom" msgid="5819492800418293238">"Skriv noe selv …"</string>
-    <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"Skriv noe selv …"</string>
-    <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"Avbryt"</string>
-    <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Send"</string>
-    <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"Avvis anropet med en melding"</string>
-    <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"Svar med en lydsamtale"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"Svar, og avslutt samtalen som er i gang"</string>
-    <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"Avvis med en melding"</string>
-    <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"Svar med en lydsamtale"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Svar, og avslutt samtalen som er i gang"</string>
-    <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Video er av"</string>
-    <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Sveip oppover med to fingre for å svare. Sveip nedover med to fingre for å avvise."</string>
-    <string name="call_incoming_important" msgid="3762352743365137090">"Viktig"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_decline_with_message">Sveip fra ikonet for å avslå med en melding</string>
+  <string name="call_incoming_swipe_to_answer_video_as_audio">Sveip fra ikonet for å svare med en lydsamtale</string>
+  <string name="call_incoming_default_label_answer_and_release_second">Sveip oppover for å svare og sette samtalen som er i gang på vent</string>
+  <string name="call_incoming_default_label_answer_and_release_third">Sveip oppover for å svare og avslutte samtalen som står på vent</string>
+  <string name="call_incoming_swipe_to_answer_and_release">Sveip fra ikonet for å svare – og avslutte samtalen som er i gang</string>
+  <string name="call_incoming_message_custom">Skriv noe selv …</string>
+  <string name="call_incoming_respond_via_sms_custom_message">Skriv noe selv …</string>
+  <string name="call_incoming_custom_message_cancel">Avbryt</string>
+  <string name="call_incoming_custom_message_send">Send</string>
+  <string name="a11y_incoming_call_reject_with_sms">Avvis anropet med en melding</string>
+  <string name="a11y_incoming_call_answer_video_as_audio">Svar med en lydsamtale</string>
+  <string name="a11y_incoming_call_answer_and_release">Svar, og avslutt samtalen som er i gang</string>
+  <string name="a11y_description_incoming_call_reject_with_sms">Avvis med en melding</string>
+  <string name="a11y_description_incoming_call_answer_video_as_audio">Svar med en lydsamtale</string>
+  <string name="a11y_description_incoming_call_answer_and_release">Svar, og avslutt samtalen som er i gang</string>
+  <string name="call_incoming_video_is_off">Video er av</string>
+  <string name="a11y_incoming_call_swipe_gesture_prompt">Sveip oppover med to fingre for å svare. Sveip nedover med to fingre for å avvise.</string>
+  <string name="call_incoming_important">Viktig</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-ne/strings.xml b/java/com/android/incallui/answer/impl/res/values-ne/strings.xml
index 2577cbe..1da247e 100644
--- a/java/com/android/incallui/answer/impl/res/values-ne/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-ne/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"सन्देश सहित अस्वीकार गर्न आइकनबाट स्वाइप गर्नुहोस्"</string>
-    <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"अडियो कलका रूपमा जवाफ फर्काउन आइकनबाट स्वाइप गर्नुहोस्"</string>
-    <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"जारी कलको जवाफ दिन र होल्ड गर्न माथितिर स्वाइप गर्नुहोस्"</string>
-    <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"जवाफ दिन र होल्डमा रहेको कल अन्त्य गर्न माथितिर स्वाइप गर्नुहोस्"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"जवाफ फर्काउन र जारी कललाई अन्त्य गर्न आइकनबाट स्वाइप गर्नुहोस्"</string>
-    <string name="call_incoming_message_custom" msgid="5819492800418293238">"तपाईँको आफ्नै लेख्नुहोस्…"</string>
-    <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"तपाईँको आफ्नै लेख्नुहोस्…"</string>
-    <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"रद्द गर्नुहोस्"</string>
-    <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"पठाउनुहोस्"</string>
-    <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"एउटा सन्देश पठाउँदै यो कल अस्वीकार गर्नुहोस्"</string>
-    <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"अडियो कलका रूपमा जवाफ दिनुहोस्"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"जवाफ फर्काउनुहोस् र जारी कललाई अन्त्य गर्नुहोस्"</string>
-    <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"सन्देश सहित अस्वीकार गर्नुहोस्"</string>
-    <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"अडियो कलका रूपमा जवाफ दिनुहोस्"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"जवाफ फर्काउनुहोस् र जारी कललाई अन्त्य गर्नुहोस्"</string>
-    <string name="call_incoming_video_is_off" msgid="3216603035158629403">"भिडियो निष्क्रिय छ"</string>
-    <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"जवाफ दिन दुई औंलाले माथितिर स्वाइप गर्नुहोस्। अस्वीकार गर्न दुई औंलाले तलतिर स्वाइप गर्नुहोस्।"</string>
-    <string name="call_incoming_important" msgid="3762352743365137090">"महत्त्वपूर्ण"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_decline_with_message">सन्देश सहित अस्वीकार गर्न आइकनबाट स्वाइप गर्नुहोस्</string>
+  <string name="call_incoming_swipe_to_answer_video_as_audio">अडियो कलका रूपमा जवाफ फर्काउन आइकनबाट स्वाइप गर्नुहोस्</string>
+  <string name="call_incoming_default_label_answer_and_release_second">जारी कलको जवाफ दिन र होल्ड गर्न माथितिर स्वाइप गर्नुहोस्</string>
+  <string name="call_incoming_default_label_answer_and_release_third">जवाफ दिन र होल्डमा रहेको कल अन्त्य गर्न माथितिर स्वाइप गर्नुहोस्</string>
+  <string name="call_incoming_swipe_to_answer_and_release">जवाफ फर्काउन र जारी कललाई अन्त्य गर्न आइकनबाट स्वाइप गर्नुहोस्</string>
+  <string name="call_incoming_message_custom">तपाईँको आफ्नै लेख्नुहोस्…</string>
+  <string name="call_incoming_respond_via_sms_custom_message">तपाईँको आफ्नै लेख्नुहोस्…</string>
+  <string name="call_incoming_custom_message_cancel">रद्द गर्नुहोस्</string>
+  <string name="call_incoming_custom_message_send">पठाउनुहोस्</string>
+  <string name="a11y_incoming_call_reject_with_sms">एउटा सन्देश पठाउँदै यो कल अस्वीकार गर्नुहोस्</string>
+  <string name="a11y_incoming_call_answer_video_as_audio">अडियो कलका रूपमा जवाफ दिनुहोस्</string>
+  <string name="a11y_incoming_call_answer_and_release">जवाफ फर्काउनुहोस् र जारी कललाई अन्त्य गर्नुहोस्</string>
+  <string name="a11y_description_incoming_call_reject_with_sms">सन्देश सहित अस्वीकार गर्नुहोस्</string>
+  <string name="a11y_description_incoming_call_answer_video_as_audio">अडियो कलका रूपमा जवाफ दिनुहोस्</string>
+  <string name="a11y_description_incoming_call_answer_and_release">जवाफ फर्काउनुहोस् र जारी कललाई अन्त्य गर्नुहोस्</string>
+  <string name="call_incoming_video_is_off">भिडियो निष्क्रिय छ</string>
+  <string name="a11y_incoming_call_swipe_gesture_prompt">जवाफ दिन दुई औंलाले माथितिर स्वाइप गर्नुहोस्। अस्वीकार गर्न दुई औंलाले तलतिर स्वाइप गर्नुहोस्।</string>
+  <string name="call_incoming_important">महत्त्वपूर्ण</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-nl/strings.xml b/java/com/android/incallui/answer/impl/res/values-nl/strings.xml
index 1478890..ea0ec98 100644
--- a/java/com/android/incallui/answer/impl/res/values-nl/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-nl/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"Veeg vanaf pictogram om te weigeren met bericht"</string>
-    <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"Veeg vanaf pictogram om te beantwoorden als audiogesprek"</string>
-    <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"Veeg omhoog om op te nemen en actieve oproep in de wacht te plaatsen"</string>
-    <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Veeg omhoog om op te nemen en oproep in de wacht te beëindigen"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Veeg vanaf pictogram om op te nemen en actieve oproep te beëindigen"</string>
-    <string name="call_incoming_message_custom" msgid="5819492800418293238">"Eigen bericht opstellen…"</string>
-    <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"Eigen bericht opstellen…"</string>
-    <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"Annuleren"</string>
-    <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Verzenden"</string>
-    <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"Deze oproep weigeren met een bericht"</string>
-    <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"Beantwoorden als audiogesprek"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"Opnemen en actieve oproep beëindigen"</string>
-    <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"Weigeren met bericht"</string>
-    <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"Beantwoorden als audiogesprek"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Opnemen en actieve oproep beëindigen"</string>
-    <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Video is uit"</string>
-    <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Veeg met twee vingers omhoog om te beantwoorden. Veeg met twee vingers omlaag om te weigeren."</string>
-    <string name="call_incoming_important" msgid="3762352743365137090">"Belangrijk"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_decline_with_message">Veeg vanaf pictogram om te weigeren met bericht</string>
+  <string name="call_incoming_swipe_to_answer_video_as_audio">Veeg vanaf pictogram om te beantwoorden als audiogesprek</string>
+  <string name="call_incoming_default_label_answer_and_release_second">Veeg omhoog om op te nemen en actieve oproep in de wacht te plaatsen</string>
+  <string name="call_incoming_default_label_answer_and_release_third">Veeg omhoog om op te nemen en oproep in de wacht te beëindigen</string>
+  <string name="call_incoming_swipe_to_answer_and_release">Veeg vanaf pictogram om op te nemen en actieve oproep te beëindigen</string>
+  <string name="call_incoming_message_custom">Eigen bericht opstellen…</string>
+  <string name="call_incoming_respond_via_sms_custom_message">Eigen bericht opstellen…</string>
+  <string name="call_incoming_custom_message_cancel">Annuleren</string>
+  <string name="call_incoming_custom_message_send">Verzenden</string>
+  <string name="a11y_incoming_call_reject_with_sms">Deze oproep weigeren met een bericht</string>
+  <string name="a11y_incoming_call_answer_video_as_audio">Beantwoorden als audiogesprek</string>
+  <string name="a11y_incoming_call_answer_and_release">Opnemen en actieve oproep beëindigen</string>
+  <string name="a11y_description_incoming_call_reject_with_sms">Weigeren met bericht</string>
+  <string name="a11y_description_incoming_call_answer_video_as_audio">Beantwoorden als audiogesprek</string>
+  <string name="a11y_description_incoming_call_answer_and_release">Opnemen en actieve oproep beëindigen</string>
+  <string name="call_incoming_video_is_off">Video is uit</string>
+  <string name="a11y_incoming_call_swipe_gesture_prompt">Veeg met twee vingers omhoog om te beantwoorden. Veeg met twee vingers omlaag om te weigeren.</string>
+  <string name="call_incoming_important">Belangrijk</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-no/strings.xml b/java/com/android/incallui/answer/impl/res/values-no/strings.xml
index 4b37234..3d6cd5e 100644
--- a/java/com/android/incallui/answer/impl/res/values-no/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-no/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"Sveip fra ikonet for å avslå med en melding"</string>
-    <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"Sveip fra ikonet for å svare med en lydsamtale"</string>
-    <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"Sveip oppover for å svare og sette samtalen som er i gang på vent"</string>
-    <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Sveip oppover for å svare og avslutte samtalen som står på vent"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Sveip fra ikonet for å svare – og avslutte samtalen som er i gang"</string>
-    <string name="call_incoming_message_custom" msgid="5819492800418293238">"Skriv noe selv …"</string>
-    <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"Skriv noe selv …"</string>
-    <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"Avbryt"</string>
-    <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Send"</string>
-    <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"Avvis anropet med en melding"</string>
-    <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"Svar med en lydsamtale"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"Svar, og avslutt samtalen som er i gang"</string>
-    <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"Avvis med en melding"</string>
-    <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"Svar med en lydsamtale"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Svar, og avslutt samtalen som er i gang"</string>
-    <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Video er av"</string>
-    <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Sveip oppover med to fingre for å svare. Sveip nedover med to fingre for å avvise."</string>
-    <string name="call_incoming_important" msgid="3762352743365137090">"Viktig"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_decline_with_message">Sveip fra ikonet for å avslå med en melding</string>
+  <string name="call_incoming_swipe_to_answer_video_as_audio">Sveip fra ikonet for å svare med en lydsamtale</string>
+  <string name="call_incoming_default_label_answer_and_release_second">Sveip oppover for å svare og sette samtalen som er i gang på vent</string>
+  <string name="call_incoming_default_label_answer_and_release_third">Sveip oppover for å svare og avslutte samtalen som står på vent</string>
+  <string name="call_incoming_swipe_to_answer_and_release">Sveip fra ikonet for å svare – og avslutte samtalen som er i gang</string>
+  <string name="call_incoming_message_custom">Skriv noe selv …</string>
+  <string name="call_incoming_respond_via_sms_custom_message">Skriv noe selv …</string>
+  <string name="call_incoming_custom_message_cancel">Avbryt</string>
+  <string name="call_incoming_custom_message_send">Send</string>
+  <string name="a11y_incoming_call_reject_with_sms">Avvis anropet med en melding</string>
+  <string name="a11y_incoming_call_answer_video_as_audio">Svar med en lydsamtale</string>
+  <string name="a11y_incoming_call_answer_and_release">Svar, og avslutt samtalen som er i gang</string>
+  <string name="a11y_description_incoming_call_reject_with_sms">Avvis med en melding</string>
+  <string name="a11y_description_incoming_call_answer_video_as_audio">Svar med en lydsamtale</string>
+  <string name="a11y_description_incoming_call_answer_and_release">Svar, og avslutt samtalen som er i gang</string>
+  <string name="call_incoming_video_is_off">Video er av</string>
+  <string name="a11y_incoming_call_swipe_gesture_prompt">Sveip oppover med to fingre for å svare. Sveip nedover med to fingre for å avvise.</string>
+  <string name="call_incoming_important">Viktig</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-pa/strings.xml b/java/com/android/incallui/answer/impl/res/values-pa/strings.xml
index 51d4a44..2cc02b5 100644
--- a/java/com/android/incallui/answer/impl/res/values-pa/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-pa/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"ਸੁਨੇਹੇ ਦੇ ਨਾਲ ਅਸਵੀਕਾਰ ਕਰਨ ਲਈ ਚਿੰਨ੍ਹ ਤੋਂ ਸਵਾਈਪ ਕਰੋ"</string>
-    <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">" ਆਡੀਓ  ਕਾਲ ਵਜੋਂ ਜਵਾਬ ਦੇਣ ਲਈ ਚਿੰਨ੍ਹ ਤੋਂ ਸਵਾਈਪ ਕਰੋ"</string>
-    <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"ਜਵਾਬ ਦੇਣ ਲਈ ਅਤੇ ਜਾਰੀ ਕਾਲ ਨੂੰ ਰੋਕ ਕੇ ਰੱਖਣ ਲਈ ਉੱਪਰ ਵੱਲ ਸਵਾਈਪ ਕਰੋ"</string>
-    <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"ਜਵਾਬ ਦੇਣ ਲਈ ਅਤੇ ਰੋਕੀ ਗਈ ਕਾਲ ਸਮਾਪਤ ਕਰਨ ਲਈ ਉੱਪਰ ਵੱਲ ਸਵਾਈਪ ਕਰੋ"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"ਜਵਾਬ ਦੇਣ ਲਈ ਅਤੇ ਜਾਰੀ ਕਾਲ ਨੂੰ ਸਮਾਪਤ ਕਰਨ ਲਈ ਪ੍ਰਤੀਕ ਤੋਂ ਸਵਾਈਪ ਕਰੋ"</string>
-    <string name="call_incoming_message_custom" msgid="5819492800418293238">"ਆਪਣਾ ਖੁਦ ਦਾ ਲਿਖੋ..."</string>
-    <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"ਆਪਣਾ ਖੁਦ ਦਾ ਲਿਖੋ..."</string>
-    <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"ਰੱਦ ਕਰੋ"</string>
-    <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"ਭੇਜੋ"</string>
-    <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"ਇੱਕ ਸੁਨੇਹੇ ਨਾਲ ਇਸ ਕਾਲ ਨੂੰ ਰੱਦ ਕਰੋ"</string>
-    <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">" ਆਡੀਓ  ਕਾਲ ਵਜੋਂ ਜਵਾਬ ਦਿਓ"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"ਜਵਾਬ ਦਿਓ ਅਤੇ ਜਾਰੀ ਕਾਲ ਨੂੰ ਸਮਾਪਤ ਕਰੋ"</string>
-    <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"ਸੁਨੇਹੇ ਨਾਲ ਰੱਦ ਕਰੋ"</string>
-    <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">" ਆਡੀਓ  ਕਾਲ ਵਜੋਂ ਜਵਾਬ ਦਿਓ"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"ਜਵਾਬ ਦਿਓ ਅਤੇ ਜਾਰੀ ਕਾਲ ਨੂੰ ਸਮਾਪਤ ਕਰੋ"</string>
-    <string name="call_incoming_video_is_off" msgid="3216603035158629403">"ਵੀਡੀਓ ਬੰਦ ਹੈ"</string>
-    <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"ਜਵਾਬ ਦੇਣ ਲਈ ਦੋ ਉਂਗਲਾਂ ਨਾਲ ਉੱਪਰ ਵੱਲ ਸਵਾਈਪ ਕਰੋ। ਅਸਵੀਕਾਰ ਕਰਨ ਲਈ ਦੋ ਉਂਗਲਾਂ ਨਾਲ ਹੇਠਾਂ ਵੱਲ ਸਵਾਈਪ ਕਰੋ।"</string>
-    <string name="call_incoming_important" msgid="3762352743365137090">"ਮਹੱਤਵਪੂਰਨ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_decline_with_message">ਸੁਨੇਹੇ ਦੇ ਨਾਲ ਅਸਵੀਕਾਰ ਕਰਨ ਲਈ ਚਿੰਨ੍ਹ ਤੋਂ ਸਵਾਈਪ ਕਰੋ</string>
+  <string name="call_incoming_swipe_to_answer_video_as_audio"> ਆਡੀਓ  ਕਾਲ ਵਜੋਂ ਜਵਾਬ ਦੇਣ ਲਈ ਚਿੰਨ੍ਹ ਤੋਂ ਸਵਾਈਪ ਕਰੋ</string>
+  <string name="call_incoming_default_label_answer_and_release_second">ਜਵਾਬ ਦੇਣ ਲਈ ਅਤੇ ਜਾਰੀ ਕਾਲ ਨੂੰ ਰੋਕ ਕੇ ਰੱਖਣ ਲਈ ਉੱਪਰ ਵੱਲ ਸਵਾਈਪ ਕਰੋ</string>
+  <string name="call_incoming_default_label_answer_and_release_third">ਜਵਾਬ ਦੇਣ ਲਈ ਅਤੇ ਰੋਕੀ ਗਈ ਕਾਲ ਸਮਾਪਤ ਕਰਨ ਲਈ ਉੱਪਰ ਵੱਲ ਸਵਾਈਪ ਕਰੋ</string>
+  <string name="call_incoming_swipe_to_answer_and_release">ਜਵਾਬ ਦੇਣ ਲਈ ਅਤੇ ਜਾਰੀ ਕਾਲ ਨੂੰ ਸਮਾਪਤ ਕਰਨ ਲਈ ਪ੍ਰਤੀਕ ਤੋਂ ਸਵਾਈਪ ਕਰੋ</string>
+  <string name="call_incoming_message_custom">ਆਪਣਾ ਖੁਦ ਦਾ ਲਿਖੋ...</string>
+  <string name="call_incoming_respond_via_sms_custom_message">ਆਪਣਾ ਖੁਦ ਦਾ ਲਿਖੋ...</string>
+  <string name="call_incoming_custom_message_cancel">ਰੱਦ ਕਰੋ</string>
+  <string name="call_incoming_custom_message_send">ਭੇਜੋ</string>
+  <string name="a11y_incoming_call_reject_with_sms">ਇੱਕ ਸੁਨੇਹੇ ਨਾਲ ਇਸ ਕਾਲ ਨੂੰ ਰੱਦ ਕਰੋ</string>
+  <string name="a11y_incoming_call_answer_video_as_audio"> ਆਡੀਓ  ਕਾਲ ਵਜੋਂ ਜਵਾਬ ਦਿਓ</string>
+  <string name="a11y_incoming_call_answer_and_release">ਜਵਾਬ ਦਿਓ ਅਤੇ ਜਾਰੀ ਕਾਲ ਨੂੰ ਸਮਾਪਤ ਕਰੋ</string>
+  <string name="a11y_description_incoming_call_reject_with_sms">ਸੁਨੇਹੇ ਨਾਲ ਰੱਦ ਕਰੋ</string>
+  <string name="a11y_description_incoming_call_answer_video_as_audio"> ਆਡੀਓ  ਕਾਲ ਵਜੋਂ ਜਵਾਬ ਦਿਓ</string>
+  <string name="a11y_description_incoming_call_answer_and_release">ਜਵਾਬ ਦਿਓ ਅਤੇ ਜਾਰੀ ਕਾਲ ਨੂੰ ਸਮਾਪਤ ਕਰੋ</string>
+  <string name="call_incoming_video_is_off">ਵੀਡੀਓ ਬੰਦ ਹੈ</string>
+  <string name="a11y_incoming_call_swipe_gesture_prompt">ਜਵਾਬ ਦੇਣ ਲਈ ਦੋ ਉਂਗਲਾਂ ਨਾਲ ਉੱਪਰ ਵੱਲ ਸਵਾਈਪ ਕਰੋ। ਅਸਵੀਕਾਰ ਕਰਨ ਲਈ ਦੋ ਉਂਗਲਾਂ ਨਾਲ ਹੇਠਾਂ ਵੱਲ ਸਵਾਈਪ ਕਰੋ।</string>
+  <string name="call_incoming_important">ਮਹੱਤਵਪੂਰਨ</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-pl/strings.xml b/java/com/android/incallui/answer/impl/res/values-pl/strings.xml
index 5de5572..234220f 100644
--- a/java/com/android/incallui/answer/impl/res/values-pl/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-pl/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"Przesuń palcem od ikony, aby odrzucić połączenie i wysłać wiadomość"</string>
-    <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"Przesuń palcem od ikony, aby odebrać jako połączenie głosowe"</string>
-    <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"Przesuń w górę, aby odebrać połączenie i wstrzymać trwającą rozmowę"</string>
-    <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Przesuń w górę, aby odebrać połączenie i zakończyć wstrzymaną rozmowę"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Przesuń palcem od ikony, aby odebrać połączenie i zakończyć trwającą rozmowę"</string>
-    <string name="call_incoming_message_custom" msgid="5819492800418293238">"Napisz własną…"</string>
-    <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"Napisz własną…"</string>
-    <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"Anuluj"</string>
-    <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Wyślij"</string>
-    <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"Odrzuć to połączenie, wysyłając wiadomość"</string>
-    <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"Odbierz jako połączenie głosowe"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"Odbierz połączenie i zakończ trwającą rozmowę"</string>
-    <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"Odrzuć, wysyłając wiadomość"</string>
-    <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"Odbierz jako połączenie głosowe"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Odbierz połączenie i zakończ trwającą rozmowę"</string>
-    <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Wideo jest wyłączone"</string>
-    <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Przesuń dwoma palcami w górę, aby odebrać. Przesuń dwoma palcami w dół, aby odrzucić."</string>
-    <string name="call_incoming_important" msgid="3762352743365137090">"Ważne"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_decline_with_message">Przesuń palcem od ikony, aby odrzucić połączenie i wysłać wiadomość</string>
+  <string name="call_incoming_swipe_to_answer_video_as_audio">Przesuń palcem od ikony, aby odebrać jako rozmowę głosową</string>
+  <string name="call_incoming_default_label_answer_and_release_second">Przesuń w górę, aby odebrać połączenie i wstrzymać trwającą rozmowę</string>
+  <string name="call_incoming_default_label_answer_and_release_third">Przesuń w górę, aby odebrać połączenie i zakończyć wstrzymaną rozmowę</string>
+  <string name="call_incoming_swipe_to_answer_and_release">Przesuń palcem od ikony, aby odebrać połączenie i zakończyć trwającą rozmowę</string>
+  <string name="call_incoming_message_custom">Napisz własną…</string>
+  <string name="call_incoming_respond_via_sms_custom_message">Napisz własną…</string>
+  <string name="call_incoming_custom_message_cancel">Anuluj</string>
+  <string name="call_incoming_custom_message_send">Wyślij</string>
+  <string name="a11y_incoming_call_reject_with_sms">Odrzuć to połączenie, wysyłając wiadomość</string>
+  <string name="a11y_incoming_call_answer_video_as_audio">Odbierz jako rozmowę głosową</string>
+  <string name="a11y_incoming_call_answer_and_release">Odbierz połączenie i zakończ trwającą rozmowę</string>
+  <string name="a11y_description_incoming_call_reject_with_sms">Odrzuć, wysyłając wiadomość</string>
+  <string name="a11y_description_incoming_call_answer_video_as_audio">Odbierz jako rozmowę głosową</string>
+  <string name="a11y_description_incoming_call_answer_and_release">Odbierz połączenie i zakończ trwającą rozmowę</string>
+  <string name="call_incoming_video_is_off">Wideo jest wyłączone</string>
+  <string name="a11y_incoming_call_swipe_gesture_prompt">Przesuń dwoma palcami w górę, aby odebrać. Przesuń dwoma palcami w dół, aby odrzucić.</string>
+  <string name="call_incoming_important">Ważne</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-pt-rBR/strings.xml b/java/com/android/incallui/answer/impl/res/values-pt-rBR/strings.xml
index e6c3b06..5e1b6df 100644
--- a/java/com/android/incallui/answer/impl/res/values-pt-rBR/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-pt-rBR/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"Deslize a partir do ícone para recusar com uma mensagem"</string>
-    <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"Deslize a partir do ícone para atender como uma chamada de áudio"</string>
-    <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"Deslize para cima para atender uma chamada e colocar a outra em espera"</string>
-    <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Deslize para cima para atender e encerrar a chamada em espera"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Deslize a partir do ícone para atender e encerrar a chamada em andamento"</string>
-    <string name="call_incoming_message_custom" msgid="5819492800418293238">"Escreva sua resposta..."</string>
-    <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"Escreva sua resposta..."</string>
-    <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"Cancelar"</string>
-    <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Enviar"</string>
-    <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"Rejeitar esta chamada com uma mensagem"</string>
-    <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"Atender como chamada de áudio"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"Atender e encerrar a chamada em andamento"</string>
-    <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"Rejeitar com mensagem"</string>
-    <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"Atender como chamada de áudio"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Atender e encerrar a chamada em andamento"</string>
-    <string name="call_incoming_video_is_off" msgid="3216603035158629403">"O vídeo está desativado"</string>
-    <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Deslize com dois dedos para cima para atender. Deslize com dois dedos para baixo para recusar."</string>
-    <string name="call_incoming_important" msgid="3762352743365137090">"Importante"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_decline_with_message">Deslize a partir do ícone para recusar com uma mensagem</string>
+  <string name="call_incoming_swipe_to_answer_video_as_audio">Deslize a partir do ícone para atender como uma chamada de áudio</string>
+  <string name="call_incoming_default_label_answer_and_release_second">Deslize para cima para atender uma chamada e colocar a outra em espera</string>
+  <string name="call_incoming_default_label_answer_and_release_third">Deslize para cima para atender e encerrar a chamada em espera</string>
+  <string name="call_incoming_swipe_to_answer_and_release">Deslize a partir do ícone para atender e encerrar a chamada em andamento</string>
+  <string name="call_incoming_message_custom">Escreva sua resposta...</string>
+  <string name="call_incoming_respond_via_sms_custom_message">Escreva sua resposta...</string>
+  <string name="call_incoming_custom_message_cancel">Cancelar</string>
+  <string name="call_incoming_custom_message_send">Enviar</string>
+  <string name="a11y_incoming_call_reject_with_sms">Rejeitar esta chamada com uma mensagem</string>
+  <string name="a11y_incoming_call_answer_video_as_audio">Atender como chamada de áudio</string>
+  <string name="a11y_incoming_call_answer_and_release">Atender e encerrar a chamada em andamento</string>
+  <string name="a11y_description_incoming_call_reject_with_sms">Rejeitar com mensagem</string>
+  <string name="a11y_description_incoming_call_answer_video_as_audio">Atender como chamada de áudio</string>
+  <string name="a11y_description_incoming_call_answer_and_release">Atender e encerrar a chamada em andamento</string>
+  <string name="call_incoming_video_is_off">O vídeo está desativado</string>
+  <string name="a11y_incoming_call_swipe_gesture_prompt">Deslize com dois dedos para cima para atender. Deslize com dois dedos para baixo para recusar.</string>
+  <string name="call_incoming_important">Importante</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-pt-rPT/strings.xml b/java/com/android/incallui/answer/impl/res/values-pt-rPT/strings.xml
index d9a1549..0b3ce9f 100644
--- a/java/com/android/incallui/answer/impl/res/values-pt-rPT/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-pt-rPT/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"Deslize rapidamente a partir do ícone para recusar com uma mensagem"</string>
-    <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"Deslize rapidamente a partir do ícone para atender como uma chamada de voz"</string>
-    <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"Deslize rapidamente para cima para atender e colocar em espera uma chamada em curso"</string>
-    <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Deslize rapidamente para cima para atender e terminar uma chamada em espera"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Deslizar rapidamente a partir do ícone para atender e terminar uma chamada em curso"</string>
-    <string name="call_incoming_message_custom" msgid="5819492800418293238">"Escreva a sua própria…"</string>
-    <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"Escreva a sua própria…"</string>
-    <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"Cancelar"</string>
-    <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Enviar"</string>
-    <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"Rejeitar esta chamada com uma mensagem"</string>
-    <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"Atender como chamada de voz"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"Atender e terminar uma chamada em curso"</string>
-    <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"Rejeitar com mensagem"</string>
-    <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"Atender como chamada de voz"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Atender e terminar uma chamada em curso"</string>
-    <string name="call_incoming_video_is_off" msgid="3216603035158629403">"O vídeo está desativado"</string>
-    <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Deslize rapidamente com dois dedos para cima para responder. Deslize rapidamente com dois dedos para baixo para recusar."</string>
-    <string name="call_incoming_important" msgid="3762352743365137090">"Importante"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_decline_with_message">Deslize rapidamente a partir do ícone para recusar com uma mensagem</string>
+  <string name="call_incoming_swipe_to_answer_video_as_audio">Deslize rapidamente a partir do ícone para atender como uma chamada de voz</string>
+  <string name="call_incoming_default_label_answer_and_release_second">Deslize rapidamente para cima para atender e colocar em espera uma chamada em curso</string>
+  <string name="call_incoming_default_label_answer_and_release_third">Deslize rapidamente para cima para atender e terminar uma chamada em espera</string>
+  <string name="call_incoming_swipe_to_answer_and_release">Deslizar rapidamente a partir do ícone para atender e terminar uma chamada em curso</string>
+  <string name="call_incoming_message_custom">Escreva a sua própria…</string>
+  <string name="call_incoming_respond_via_sms_custom_message">Escreva a sua própria…</string>
+  <string name="call_incoming_custom_message_cancel">Cancelar</string>
+  <string name="call_incoming_custom_message_send">Enviar</string>
+  <string name="a11y_incoming_call_reject_with_sms">Rejeitar esta chamada com uma mensagem</string>
+  <string name="a11y_incoming_call_answer_video_as_audio">Atender como chamada de voz</string>
+  <string name="a11y_incoming_call_answer_and_release">Atender e terminar uma chamada em curso</string>
+  <string name="a11y_description_incoming_call_reject_with_sms">Rejeitar com mensagem</string>
+  <string name="a11y_description_incoming_call_answer_video_as_audio">Atender como chamada de voz</string>
+  <string name="a11y_description_incoming_call_answer_and_release">Atender e terminar uma chamada em curso</string>
+  <string name="call_incoming_video_is_off">O vídeo está desativado</string>
+  <string name="a11y_incoming_call_swipe_gesture_prompt">Deslize rapidamente com dois dedos para cima para responder. Deslize rapidamente com dois dedos para baixo para recusar.</string>
+  <string name="call_incoming_important">Importante</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-pt/strings.xml b/java/com/android/incallui/answer/impl/res/values-pt/strings.xml
index e6c3b06..5e1b6df 100644
--- a/java/com/android/incallui/answer/impl/res/values-pt/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-pt/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"Deslize a partir do ícone para recusar com uma mensagem"</string>
-    <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"Deslize a partir do ícone para atender como uma chamada de áudio"</string>
-    <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"Deslize para cima para atender uma chamada e colocar a outra em espera"</string>
-    <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Deslize para cima para atender e encerrar a chamada em espera"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Deslize a partir do ícone para atender e encerrar a chamada em andamento"</string>
-    <string name="call_incoming_message_custom" msgid="5819492800418293238">"Escreva sua resposta..."</string>
-    <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"Escreva sua resposta..."</string>
-    <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"Cancelar"</string>
-    <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Enviar"</string>
-    <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"Rejeitar esta chamada com uma mensagem"</string>
-    <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"Atender como chamada de áudio"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"Atender e encerrar a chamada em andamento"</string>
-    <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"Rejeitar com mensagem"</string>
-    <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"Atender como chamada de áudio"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Atender e encerrar a chamada em andamento"</string>
-    <string name="call_incoming_video_is_off" msgid="3216603035158629403">"O vídeo está desativado"</string>
-    <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Deslize com dois dedos para cima para atender. Deslize com dois dedos para baixo para recusar."</string>
-    <string name="call_incoming_important" msgid="3762352743365137090">"Importante"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_decline_with_message">Deslize a partir do ícone para recusar com uma mensagem</string>
+  <string name="call_incoming_swipe_to_answer_video_as_audio">Deslize a partir do ícone para atender como uma chamada de áudio</string>
+  <string name="call_incoming_default_label_answer_and_release_second">Deslize para cima para atender uma chamada e colocar a outra em espera</string>
+  <string name="call_incoming_default_label_answer_and_release_third">Deslize para cima para atender e encerrar a chamada em espera</string>
+  <string name="call_incoming_swipe_to_answer_and_release">Deslize a partir do ícone para atender e encerrar a chamada em andamento</string>
+  <string name="call_incoming_message_custom">Escreva sua resposta...</string>
+  <string name="call_incoming_respond_via_sms_custom_message">Escreva sua resposta...</string>
+  <string name="call_incoming_custom_message_cancel">Cancelar</string>
+  <string name="call_incoming_custom_message_send">Enviar</string>
+  <string name="a11y_incoming_call_reject_with_sms">Rejeitar esta chamada com uma mensagem</string>
+  <string name="a11y_incoming_call_answer_video_as_audio">Atender como chamada de áudio</string>
+  <string name="a11y_incoming_call_answer_and_release">Atender e encerrar a chamada em andamento</string>
+  <string name="a11y_description_incoming_call_reject_with_sms">Rejeitar com mensagem</string>
+  <string name="a11y_description_incoming_call_answer_video_as_audio">Atender como chamada de áudio</string>
+  <string name="a11y_description_incoming_call_answer_and_release">Atender e encerrar a chamada em andamento</string>
+  <string name="call_incoming_video_is_off">O vídeo está desativado</string>
+  <string name="a11y_incoming_call_swipe_gesture_prompt">Deslize com dois dedos para cima para atender. Deslize com dois dedos para baixo para recusar.</string>
+  <string name="call_incoming_important">Importante</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-ro/strings.xml b/java/com/android/incallui/answer/impl/res/values-ro/strings.xml
index 7986f38..049dfe2 100644
--- a/java/com/android/incallui/answer/impl/res/values-ro/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-ro/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"Glisați de pe pictogramă pentru a respinge cu un mesaj"</string>
-    <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"Glisați de pe pictogramă pentru a răspunde ca apel audio"</string>
-    <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"Glisați în sus ca să răspundeți și să puneți apelul actual în așteptare."</string>
-    <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Glisați în sus ca să răspundeți și să încheiați apelul în așteptare."</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Glisați din pictogramă ca să răspundeți și să încheiați apelul în curs"</string>
-    <string name="call_incoming_message_custom" msgid="5819492800418293238">"Scrieți propriul răspuns…"</string>
-    <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"Scrieți propriul răspuns…"</string>
-    <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"Anulați"</string>
-    <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Trimiteți"</string>
-    <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"Respingeți apelul cu un mesaj"</string>
-    <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"Răspundeți ca apel audio"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"Răspundeți și încheiați apelul în curs"</string>
-    <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"Respingeți cu un mesaj"</string>
-    <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"Răspundeți ca apel audio"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Răspundeți și încheiați apelul în curs"</string>
-    <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Camera video este dezactivată."</string>
-    <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Glisați cu două degete în sus pentru a răspunde și în jos pentru a respinge."</string>
-    <string name="call_incoming_important" msgid="3762352743365137090">"Important"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_decline_with_message">Glisați de pe pictogramă pentru a respinge cu un mesaj</string>
+  <string name="call_incoming_swipe_to_answer_video_as_audio">Glisați de pe pictogramă pentru a răspunde ca apel audio</string>
+  <string name="call_incoming_default_label_answer_and_release_second">Glisați în sus ca să răspundeți și să puneți apelul actual în așteptare.</string>
+  <string name="call_incoming_default_label_answer_and_release_third">Glisați în sus ca să răspundeți și să încheiați apelul în așteptare.</string>
+  <string name="call_incoming_swipe_to_answer_and_release">Glisați din pictogramă ca să răspundeți și să încheiați apelul în curs</string>
+  <string name="call_incoming_message_custom">Scrieți propriul răspuns…</string>
+  <string name="call_incoming_respond_via_sms_custom_message">Scrieți propriul răspuns…</string>
+  <string name="call_incoming_custom_message_cancel">Anulați</string>
+  <string name="call_incoming_custom_message_send">Trimiteți</string>
+  <string name="a11y_incoming_call_reject_with_sms">Respingeți apelul cu un mesaj</string>
+  <string name="a11y_incoming_call_answer_video_as_audio">Răspundeți ca apel audio</string>
+  <string name="a11y_incoming_call_answer_and_release">Răspundeți și încheiați apelul în curs</string>
+  <string name="a11y_description_incoming_call_reject_with_sms">Respingeți cu un mesaj</string>
+  <string name="a11y_description_incoming_call_answer_video_as_audio">Răspundeți ca apel audio</string>
+  <string name="a11y_description_incoming_call_answer_and_release">Răspundeți și încheiați apelul în curs</string>
+  <string name="call_incoming_video_is_off">Camera video este dezactivată.</string>
+  <string name="a11y_incoming_call_swipe_gesture_prompt">Glisați cu două degete în sus pentru a răspunde și în jos pentru a respinge.</string>
+  <string name="call_incoming_important">Important</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-ru/strings.xml b/java/com/android/incallui/answer/impl/res/values-ru/strings.xml
index 97baef5..0199c15 100644
--- a/java/com/android/incallui/answer/impl/res/values-ru/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-ru/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"Чтобы отклонить вызов и отправить SMS, проведите пальцем от значка"</string>
-    <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"Чтобы ответить в режиме голосового вызова, проведите пальцем от значка"</string>
-    <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"Чтобы ответить и поставить текущий вызов на удержание, проведите по экрану вверх"</string>
-    <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Чтобы ответить и завершить вызов на удержании, проведите по экрану вверх"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Чтобы ответить и завершить текущий вызов, проведите пальцем от значка"</string>
-    <string name="call_incoming_message_custom" msgid="5819492800418293238">"Ваш ответ…"</string>
-    <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"Ваш ответ…"</string>
-    <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"Отмена"</string>
-    <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Отправить"</string>
-    <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"Отклонить вызов и отправить SMS"</string>
-    <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"Ответить в режиме голосового вызова"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"Ответить и завершить текущий вызов"</string>
-    <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"Отклонить вызов и отправить SMS"</string>
-    <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"Ответить в режиме голосового вызова"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Ответить и завершить текущий вызов"</string>
-    <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Камера выключена"</string>
-    <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Проведите двумя пальцами по экрану вверх, чтобы ответить, или вниз, чтобы отклонить вызов."</string>
-    <string name="call_incoming_important" msgid="3762352743365137090">"Важный звонок"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_decline_with_message">Чтобы отклонить вызов и отправить SMS, проведите пальцем от значка</string>
+  <string name="call_incoming_swipe_to_answer_video_as_audio">Чтобы ответить в режиме голосового вызова, проведите пальцем от значка</string>
+  <string name="call_incoming_default_label_answer_and_release_second">Чтобы ответить и поставить текущий вызов на удержание, проведите по экрану вверх</string>
+  <string name="call_incoming_default_label_answer_and_release_third">Чтобы ответить и завершить вызов на удержании, проведите по экрану вверх</string>
+  <string name="call_incoming_swipe_to_answer_and_release">Чтобы ответить и завершить текущий вызов, проведите пальцем от значка</string>
+  <string name="call_incoming_message_custom">Ваш ответ…</string>
+  <string name="call_incoming_respond_via_sms_custom_message">Ваш ответ…</string>
+  <string name="call_incoming_custom_message_cancel">Отмена</string>
+  <string name="call_incoming_custom_message_send">Отправить</string>
+  <string name="a11y_incoming_call_reject_with_sms">Отклонить вызов и отправить SMS</string>
+  <string name="a11y_incoming_call_answer_video_as_audio">Ответить в режиме голосового вызова</string>
+  <string name="a11y_incoming_call_answer_and_release">Ответить и завершить текущий вызов</string>
+  <string name="a11y_description_incoming_call_reject_with_sms">Отклонить вызов и отправить SMS</string>
+  <string name="a11y_description_incoming_call_answer_video_as_audio">Ответить в режиме голосового вызова</string>
+  <string name="a11y_description_incoming_call_answer_and_release">Ответить и завершить текущий вызов</string>
+  <string name="call_incoming_video_is_off">Камера выключена</string>
+  <string name="a11y_incoming_call_swipe_gesture_prompt">Проведите двумя пальцами по экрану вверх, чтобы ответить, или вниз, чтобы отклонить вызов.</string>
+  <string name="call_incoming_important">Важный звонок</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-si/strings.xml b/java/com/android/incallui/answer/impl/res/values-si/strings.xml
index 70aa95b..8e8fa12 100644
--- a/java/com/android/incallui/answer/impl/res/values-si/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-si/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"පණිවිඩය සහිතව ප්‍රතික්ෂේප කිරීමට නිරූපකයේ සිට ස්වයිප් කරන්න"</string>
-    <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"ශ්‍රව්‍ය ඇමතුමක් ලෙස පිළිතුරු දීමට නිරූපකයේ සිට ස්වයිප් කරන්න"</string>
-    <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"කෙරෙමින් පවතින ඇමතුමට පිළිතුරු දීමට සහ රඳවා තබා ගැනීමට ඉහළට ස්වයිප් කරන්න"</string>
-    <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"රඳවා තබා ගෙන සිටින ඇමතුමට පිළිතුරු දීමට සහ අවසන් කිරීමට ඉහළට ස්වයිප් කරන්න"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"යන ඇමතුමට පිළිතුරු දී අවසන් කිරීමට නිරූපකයෙන් ස්වයිප් කරන්න"</string>
-    <string name="call_incoming_message_custom" msgid="5819492800418293238">"ඔබෙම එක ලියන්න…"</string>
-    <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"ඔබෙම එක ලියන්න…"</string>
-    <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"අවලංගු කරන්න"</string>
-    <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"යවන්න"</string>
-    <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"පණිවිඩයකින් මෙම ඇමතුම ප්‍රතික්ෂේප කරන්න"</string>
-    <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"ශ්‍රව්‍ය ඇමතුමක් ලෙස පිළිතුරු දෙන්න"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"යන අැමතුමට පිළිතරු දී අවසන් කරන්න"</string>
-    <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"පණිවිඩයකින් ප්‍රතික්ෂේප කරන්න"</string>
-    <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"ශ්‍රව්‍ය ඇමතුමක් ලෙස පිළිතුරු දෙන්න"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"යන අැමතුමට පිළිතරු දී අවසන් කරන්න"</string>
-    <string name="call_incoming_video_is_off" msgid="3216603035158629403">"වීඩියෝව ක්‍රියාවිරහිතයි"</string>
-    <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"පිළිතුරු දීමට ඇඟිලි දෙකකින් ඉහළට ස්වයිප් කරන්න, ප්‍රතික්ෂේප කිරීමට ඇඟිලි දෙකකින් පහළට ස්වයිප් කරන්න."</string>
-    <string name="call_incoming_important" msgid="3762352743365137090">"වැදගත්"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_decline_with_message">පණිවිඩය සහිතව ප්‍රතික්ෂේප කිරීමට නිරූපකයේ සිට ස්වයිප් කරන්න</string>
+  <string name="call_incoming_swipe_to_answer_video_as_audio">ශ්‍රව්‍ය ඇමතුමක් ලෙස පිළිතුරු දීමට නිරූපකයේ සිට ස්වයිප් කරන්න</string>
+  <string name="call_incoming_default_label_answer_and_release_second">කෙරෙමින් පවතින ඇමතුමට පිළිතුරු දීමට සහ රඳවා තබා ගැනීමට ඉහළට ස්වයිප් කරන්න</string>
+  <string name="call_incoming_default_label_answer_and_release_third">රඳවා තබා ගෙන සිටින ඇමතුමට පිළිතුරු දීමට සහ අවසන් කිරීමට ඉහළට ස්වයිප් කරන්න</string>
+  <string name="call_incoming_swipe_to_answer_and_release">යන ඇමතුමට පිළිතුරු දී අවසන් කිරීමට නිරූපකයෙන් ස්වයිප් කරන්න</string>
+  <string name="call_incoming_message_custom">ඔබෙම එක ලියන්න…</string>
+  <string name="call_incoming_respond_via_sms_custom_message">ඔබෙම එක ලියන්න…</string>
+  <string name="call_incoming_custom_message_cancel">අවලංගු කරන්න</string>
+  <string name="call_incoming_custom_message_send">යවන්න</string>
+  <string name="a11y_incoming_call_reject_with_sms">පණිවිඩයකින් මෙම ඇමතුම ප්‍රතික්ෂේප කරන්න</string>
+  <string name="a11y_incoming_call_answer_video_as_audio">ශ්‍රව්‍ය ඇමතුමක් ලෙස පිළිතුරු දෙන්න</string>
+  <string name="a11y_incoming_call_answer_and_release">යන අැමතුමට පිළිතරු දී අවසන් කරන්න</string>
+  <string name="a11y_description_incoming_call_reject_with_sms">පණිවිඩයකින් ප්‍රතික්ෂේප කරන්න</string>
+  <string name="a11y_description_incoming_call_answer_video_as_audio">ශ්‍රව්‍ය ඇමතුමක් ලෙස පිළිතුරු දෙන්න</string>
+  <string name="a11y_description_incoming_call_answer_and_release">යන අැමතුමට පිළිතරු දී අවසන් කරන්න</string>
+  <string name="call_incoming_video_is_off">වීඩියෝව ක්‍රියාවිරහිතයි</string>
+  <string name="a11y_incoming_call_swipe_gesture_prompt">පිළිතුරු දීමට ඇඟිලි දෙකකින් ඉහළට ස්වයිප් කරන්න, ප්‍රතික්ෂේප කිරීමට ඇඟිලි දෙකකින් පහළට ස්වයිප් කරන්න.</string>
+  <string name="call_incoming_important">වැදගත්</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-sk/strings.xml b/java/com/android/incallui/answer/impl/res/values-sk/strings.xml
index 2fbc79d..89026e5 100644
--- a/java/com/android/incallui/answer/impl/res/values-sk/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-sk/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"Prejdením prstom od ikony odmietnuť so správou"</string>
-    <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"Prejdením prstom od ikony prijať ako zvukový hovor"</string>
-    <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"Prejdením prstom nahor prijmete hovor a podržíte prebiehajúci hovor"</string>
-    <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Prejdením prstom nahor prijmete hovor a ukončíte podržaný hovor"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Prejdením prstom od ikony hovor prijmete a ukončíte prebiehajúci hovor"</string>
-    <string name="call_incoming_message_custom" msgid="5819492800418293238">"Napíšte vlastnú…"</string>
-    <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"Napíšte vlastnú…"</string>
-    <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"Zrušiť"</string>
-    <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Odoslať"</string>
-    <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"Odmietnuť tento hovor so správou"</string>
-    <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"Prijať ako zvukový hovor"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"Prijať hovor a ukončiť prebiehajúci hovor"</string>
-    <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"Odmietnuť so správou"</string>
-    <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"Prijať ako zvukový hovor"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Prijať hovor a ukončiť prebiehajúci hovor"</string>
-    <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Video je vypnuté"</string>
-    <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Ak chcete hovor prijať, prejdite dvomi prstami nahor. Ak ho chcete odmietnuť, prejdite dvomi prstami nadol."</string>
-    <string name="call_incoming_important" msgid="3762352743365137090">"Dôležité"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_decline_with_message">Prejdením prstom od ikony odmietnuť so správou</string>
+  <string name="call_incoming_swipe_to_answer_video_as_audio">Prejdením prstom od ikony prijať ako zvukový hovor</string>
+  <string name="call_incoming_default_label_answer_and_release_second">Prejdením prstom nahor prijmete hovor a podržíte prebiehajúci hovor</string>
+  <string name="call_incoming_default_label_answer_and_release_third">Prejdením prstom nahor prijmete hovor a ukončíte podržaný hovor</string>
+  <string name="call_incoming_swipe_to_answer_and_release">Prejdením prstom od ikony hovor prijmete a ukončíte prebiehajúci hovor</string>
+  <string name="call_incoming_message_custom">Napíšte vlastnú…</string>
+  <string name="call_incoming_respond_via_sms_custom_message">Napíšte vlastnú…</string>
+  <string name="call_incoming_custom_message_cancel">Zrušiť</string>
+  <string name="call_incoming_custom_message_send">Odoslať</string>
+  <string name="a11y_incoming_call_reject_with_sms">Odmietnuť tento hovor so správou</string>
+  <string name="a11y_incoming_call_answer_video_as_audio">Prijať ako zvukový hovor</string>
+  <string name="a11y_incoming_call_answer_and_release">Prijať hovor a ukončiť prebiehajúci hovor</string>
+  <string name="a11y_description_incoming_call_reject_with_sms">Odmietnuť so správou</string>
+  <string name="a11y_description_incoming_call_answer_video_as_audio">Prijať ako zvukový hovor</string>
+  <string name="a11y_description_incoming_call_answer_and_release">Prijať hovor a ukončiť prebiehajúci hovor</string>
+  <string name="call_incoming_video_is_off">Video je vypnuté</string>
+  <string name="a11y_incoming_call_swipe_gesture_prompt">Ak chcete hovor prijať, prejdite dvomi prstami nahor. Ak ho chcete odmietnuť, prejdite dvomi prstami nadol.</string>
+  <string name="call_incoming_important">Dôležité</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-sl/strings.xml b/java/com/android/incallui/answer/impl/res/values-sl/strings.xml
index 0279b10..878c4cb 100644
--- a/java/com/android/incallui/answer/impl/res/values-sl/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-sl/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"Povlecite z ikone, da klic zavrnete s sporočilom"</string>
-    <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"Povlecite z ikone, da klic sprejmete kot zvočni klic"</string>
-    <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"Povlecite navzgor, da sprejmete klic in zadržite aktivni klic"</string>
-    <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Povlecite navzgor, da sprejmete klic in končate zadržani klic"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Povlecite z ikone, da sprejmete klic in končate aktivni klic"</string>
-    <string name="call_incoming_message_custom" msgid="5819492800418293238">"Napišite lastno besedilo …"</string>
-    <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"Napišite lastno besedilo …"</string>
-    <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"Prekliči"</string>
-    <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Pošlji"</string>
-    <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"Zavrnite ta klic s sporočilom"</string>
-    <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"Sprejmite kot zvočni klic"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"Sprejmi klic in končaj aktivni klic"</string>
-    <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"Zavrnitev s sporočilom"</string>
-    <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"Sprejmite kot zvočni klic"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Sprejmi klic in končaj aktivni klic"</string>
-    <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Video je izklopljen"</string>
-    <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Z dvema prstoma povlecite navzgor, da sprejmete klic. Z dvema prstoma povlecite navzdol, da zavrnete klic."</string>
-    <string name="call_incoming_important" msgid="3762352743365137090">"Pomembno"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_decline_with_message">Povlecite z ikone, da klic zavrnete s sporočilom</string>
+  <string name="call_incoming_swipe_to_answer_video_as_audio">Povlecite z ikone, da klic sprejmete kot zvočni klic</string>
+  <string name="call_incoming_default_label_answer_and_release_second">Povlecite navzgor, da sprejmete klic in zadržite aktivni klic</string>
+  <string name="call_incoming_default_label_answer_and_release_third">Povlecite navzgor, da sprejmete klic in končate zadržani klic</string>
+  <string name="call_incoming_swipe_to_answer_and_release">Povlecite z ikone, da sprejmete klic in končate aktivni klic</string>
+  <string name="call_incoming_message_custom">Napišite lastno besedilo …</string>
+  <string name="call_incoming_respond_via_sms_custom_message">Napišite lastno besedilo …</string>
+  <string name="call_incoming_custom_message_cancel">Prekliči</string>
+  <string name="call_incoming_custom_message_send">Pošlji</string>
+  <string name="a11y_incoming_call_reject_with_sms">Zavrnite ta klic s sporočilom</string>
+  <string name="a11y_incoming_call_answer_video_as_audio">Sprejmite kot zvočni klic</string>
+  <string name="a11y_incoming_call_answer_and_release">Sprejmi klic in končaj aktivni klic</string>
+  <string name="a11y_description_incoming_call_reject_with_sms">Zavrnitev s sporočilom</string>
+  <string name="a11y_description_incoming_call_answer_video_as_audio">Sprejmite kot zvočni klic</string>
+  <string name="a11y_description_incoming_call_answer_and_release">Sprejmi klic in končaj aktivni klic</string>
+  <string name="call_incoming_video_is_off">Video je izklopljen</string>
+  <string name="a11y_incoming_call_swipe_gesture_prompt">Z dvema prstoma povlecite navzgor, da sprejmete klic. Z dvema prstoma povlecite navzdol, da zavrnete klic.</string>
+  <string name="call_incoming_important">Pomembno</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-sq/strings.xml b/java/com/android/incallui/answer/impl/res/values-sq/strings.xml
index 9a05402..ef10ad3 100644
--- a/java/com/android/incallui/answer/impl/res/values-sq/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-sq/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"Rrëshqit nga ikona për të refuzuar me mesazh"</string>
-    <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"Rrëshqite nga ikona për t\'u përgjigjur si telefonatë me audio"</string>
-    <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"Rrëshqit shpejt lart për t\'u përgjigjur dhe për të vendosur në pritje telefonatën në vazhdim"</string>
-    <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Rrëshqit shpejt lart për t\'u përgjigjur dhe për të mbyllur telefonatën në pritje"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Rrëshqit shpejt nga ikona për t\'u përgjigjur dhe për të mbyllur telefonatën në vazhdim"</string>
-    <string name="call_incoming_message_custom" msgid="5819492800418293238">"Shkruaj tënden…"</string>
-    <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"Shkruaj tënden…"</string>
-    <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"Anulo"</string>
-    <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Dërgo"</string>
-    <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"Refuzo këtë telefonatë me një mesazh"</string>
-    <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"Përgjigju si telefonatë me audio"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"Përgjigju dhe mbyll telefonatën në vazhdim"</string>
-    <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"Refuzo me mesazh"</string>
-    <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"Përgjigju si telefonatë me audio"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Përgjigju dhe mbyll telefonatën në vazhdim"</string>
-    <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Videoja është joaktive"</string>
-    <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Rrëshqit dy gishta lart për t\'u përgjigjur. Rrëshqit dy gishta poshtë për të refuzuar."</string>
-    <string name="call_incoming_important" msgid="3762352743365137090">"E rëndësishme"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_decline_with_message">Rrëshqit nga ikona për të refuzuar me mesazh</string>
+  <string name="call_incoming_swipe_to_answer_video_as_audio">Rrëshqite nga ikona për t\'u përgjigjur si telefonatë me audio</string>
+  <string name="call_incoming_default_label_answer_and_release_second">Rrëshqit shpejt lart për t\'u përgjigjur dhe për të vendosur në pritje telefonatën në vazhdim</string>
+  <string name="call_incoming_default_label_answer_and_release_third">Rrëshqit shpejt lart për t\'u përgjigjur dhe për të mbyllur telefonatën në pritje</string>
+  <string name="call_incoming_swipe_to_answer_and_release">Rrëshqit shpejt nga ikona për t\'u përgjigjur dhe për të mbyllur telefonatën në vazhdim</string>
+  <string name="call_incoming_message_custom">Shkruaj tënden…</string>
+  <string name="call_incoming_respond_via_sms_custom_message">Shkruaj tënden…</string>
+  <string name="call_incoming_custom_message_cancel">Anulo</string>
+  <string name="call_incoming_custom_message_send">Dërgo</string>
+  <string name="a11y_incoming_call_reject_with_sms">Refuzo këtë telefonatë me një mesazh</string>
+  <string name="a11y_incoming_call_answer_video_as_audio">Përgjigju si telefonatë me audio</string>
+  <string name="a11y_incoming_call_answer_and_release">Përgjigju dhe mbyll telefonatën në vazhdim</string>
+  <string name="a11y_description_incoming_call_reject_with_sms">Refuzo me mesazh</string>
+  <string name="a11y_description_incoming_call_answer_video_as_audio">Përgjigju si telefonatë me audio</string>
+  <string name="a11y_description_incoming_call_answer_and_release">Përgjigju dhe mbyll telefonatën në vazhdim</string>
+  <string name="call_incoming_video_is_off">Videoja është joaktive</string>
+  <string name="a11y_incoming_call_swipe_gesture_prompt">Rrëshqit dy gishta lart për t\'u përgjigjur. Rrëshqit dy gishta poshtë për të refuzuar.</string>
+  <string name="call_incoming_important">E rëndësishme</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-sr/strings.xml b/java/com/android/incallui/answer/impl/res/values-sr/strings.xml
index 8d20283..0633ecc 100644
--- a/java/com/android/incallui/answer/impl/res/values-sr/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-sr/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"Превуците од иконе да бисте одбили поруком"</string>
-    <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"Превуците од иконе да бисте одговорили аудио позивом"</string>
-    <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"Превуците нагоре да бисте одговорили и задржали позив који је у току"</string>
-    <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Превуците нагоре да бисте одговорили и завршили позив који је на чекању"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Превуците од иконе да бисте се јавили и завршили позив који је у току"</string>
-    <string name="call_incoming_message_custom" msgid="5819492800418293238">"Напишите сами…"</string>
-    <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"Напишите сами…"</string>
-    <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"Откажи"</string>
-    <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Пошаљи"</string>
-    <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"Одбијте овај позив поруком"</string>
-    <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"Одговорите аудио позивом"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"Јавите се и завршите позив који је у току"</string>
-    <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"Одбијте поруком"</string>
-    <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"Одговорите аудио позивом"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Јавите се и завршите позив који је у току"</string>
-    <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Камера је искључена"</string>
-    <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Превуците нагоре помоћу два прста да бисте одговорили. Превуците надоле помоћу два прста да бисте одбили."</string>
-    <string name="call_incoming_important" msgid="3762352743365137090">"Важно"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_decline_with_message">Превуците од иконе да бисте одбили поруком</string>
+  <string name="call_incoming_swipe_to_answer_video_as_audio">Превуците од иконе да бисте одговорили аудио позивом</string>
+  <string name="call_incoming_default_label_answer_and_release_second">Превуците нагоре да бисте одговорили и задржали позив који је у току</string>
+  <string name="call_incoming_default_label_answer_and_release_third">Превуците нагоре да бисте одговорили и завршили позив који је на чекању</string>
+  <string name="call_incoming_swipe_to_answer_and_release">Превуците од иконе да бисте се јавили и завршили позив који је у току</string>
+  <string name="call_incoming_message_custom">Напишите сами…</string>
+  <string name="call_incoming_respond_via_sms_custom_message">Напишите сами…</string>
+  <string name="call_incoming_custom_message_cancel">Откажи</string>
+  <string name="call_incoming_custom_message_send">Пошаљи</string>
+  <string name="a11y_incoming_call_reject_with_sms">Одбијте овај позив поруком</string>
+  <string name="a11y_incoming_call_answer_video_as_audio">Одговорите аудио позивом</string>
+  <string name="a11y_incoming_call_answer_and_release">Јавите се и завршите позив који је у току</string>
+  <string name="a11y_description_incoming_call_reject_with_sms">Одбијте поруком</string>
+  <string name="a11y_description_incoming_call_answer_video_as_audio">Одговорите аудио позивом</string>
+  <string name="a11y_description_incoming_call_answer_and_release">Јавите се и завршите позив који је у току</string>
+  <string name="call_incoming_video_is_off">Камера је искључена</string>
+  <string name="a11y_incoming_call_swipe_gesture_prompt">Превуците нагоре помоћу два прста да бисте одговорили. Превуците надоле помоћу два прста да бисте одбили.</string>
+  <string name="call_incoming_important">Важно</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-sv/strings.xml b/java/com/android/incallui/answer/impl/res/values-sv/strings.xml
index afd87e7..3875b73 100644
--- a/java/com/android/incallui/answer/impl/res/values-sv/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-sv/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"Svep från ikonen för att avvisa med meddelande"</string>
-    <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"Svep från ikonen för att svara som röstsamtal"</string>
-    <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"Svep uppåt för att svara och parkera pågående samtal"</string>
-    <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Svep uppåt för att svara och avsluta parkerat samtal"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Svep från ikonen för att svara och avsluta pågående samtal"</string>
-    <string name="call_incoming_message_custom" msgid="5819492800418293238">"Skriv eget …"</string>
-    <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"Skriv eget …"</string>
-    <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"Avbryt"</string>
-    <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Skicka"</string>
-    <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"Avvisa det här samtalet med ett meddelande"</string>
-    <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"Svara som röstsamtal"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"Svara och avsluta pågående samtal"</string>
-    <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"Avvisa med meddelande"</string>
-    <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"Svara som röstsamtal"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Svara och avsluta pågående samtal"</string>
-    <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Video avstängd"</string>
-    <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Dra två fingrar uppåt för att svara och två nedåt för att avvisa."</string>
-    <string name="call_incoming_important" msgid="3762352743365137090">"Viktigt"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_decline_with_message">Svep från ikonen för att avvisa med meddelande</string>
+  <string name="call_incoming_swipe_to_answer_video_as_audio">Svep från ikonen för att svara som röstsamtal</string>
+  <string name="call_incoming_default_label_answer_and_release_second">Svep uppåt för att svara och parkera pågående samtal</string>
+  <string name="call_incoming_default_label_answer_and_release_third">Svep uppåt för att svara och avsluta parkerat samtal</string>
+  <string name="call_incoming_swipe_to_answer_and_release">Svep från ikonen för att svara och avsluta pågående samtal</string>
+  <string name="call_incoming_message_custom">Skriv eget …</string>
+  <string name="call_incoming_respond_via_sms_custom_message">Skriv eget …</string>
+  <string name="call_incoming_custom_message_cancel">Avbryt</string>
+  <string name="call_incoming_custom_message_send">Skicka</string>
+  <string name="a11y_incoming_call_reject_with_sms">Avvisa det här samtalet med ett meddelande</string>
+  <string name="a11y_incoming_call_answer_video_as_audio">Svara som röstsamtal</string>
+  <string name="a11y_incoming_call_answer_and_release">Svara och avsluta pågående samtal</string>
+  <string name="a11y_description_incoming_call_reject_with_sms">Avvisa med meddelande</string>
+  <string name="a11y_description_incoming_call_answer_video_as_audio">Svara som röstsamtal</string>
+  <string name="a11y_description_incoming_call_answer_and_release">Svara och avsluta pågående samtal</string>
+  <string name="call_incoming_video_is_off">Video avstängd</string>
+  <string name="a11y_incoming_call_swipe_gesture_prompt">Dra två fingrar uppåt för att svara och två nedåt för att avvisa.</string>
+  <string name="call_incoming_important">Viktigt</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-sw/strings.xml b/java/com/android/incallui/answer/impl/res/values-sw/strings.xml
index 202cc78..b93b139 100644
--- a/java/com/android/incallui/answer/impl/res/values-sw/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-sw/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"Telezesha kidole ukianzia kwenye aikoni ili utume ujumbe wa kukataa"</string>
-    <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"Telezesha kidole ukianzia kwenye aikoni ili uijibu kama simu ya sauti"</string>
-    <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"Telezesha kidole ili upokee na usitishe kidogo simu inayoendelea"</string>
-    <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Telezesha kidole ili upokee na ukate simu iliyositishwa"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Telezesha kidole ukianzia kwenye aikoni ili ujibu na ukate simu inayoendelea"</string>
-    <string name="call_incoming_message_custom" msgid="5819492800418293238">"Andika yako mwenyewe…"</string>
-    <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"Andika yako mwenyewe…"</string>
-    <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"Ghairi"</string>
-    <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Tuma"</string>
-    <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"Kataa simu hii na utume ujumbe wa kueleza"</string>
-    <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"Ijibu kama simu ya sauti"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"Jibu na ukate simu inayoendelea"</string>
-    <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"Kataa na utume ujumbe"</string>
-    <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"Ijibu kama simu ya sauti"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Jibu na ukate simu inayoendelea"</string>
-    <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Video imezimwa"</string>
-    <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Telezesha juu kwa vidole viwili ili uijibu. Telezesha chini kwa vidole viwili ili uikate."</string>
-    <string name="call_incoming_important" msgid="3762352743365137090">"Muhimu"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_decline_with_message">Telezesha kidole ukianzia kwenye aikoni ili utume ujumbe wa kukataa</string>
+  <string name="call_incoming_swipe_to_answer_video_as_audio">Telezesha kidole ukianzia kwenye aikoni ili uijibu kama simu ya sauti</string>
+  <string name="call_incoming_default_label_answer_and_release_second">Telezesha kidole ili upokee na usitishe kidogo simu inayoendelea</string>
+  <string name="call_incoming_default_label_answer_and_release_third">Telezesha kidole ili upokee na ukate simu iliyositishwa</string>
+  <string name="call_incoming_swipe_to_answer_and_release">Telezesha kidole ukianzia kwenye aikoni ili ujibu na ukate simu inayoendelea</string>
+  <string name="call_incoming_message_custom">Andika yako mwenyewe…</string>
+  <string name="call_incoming_respond_via_sms_custom_message">Andika yako mwenyewe…</string>
+  <string name="call_incoming_custom_message_cancel">Ghairi</string>
+  <string name="call_incoming_custom_message_send">Tuma</string>
+  <string name="a11y_incoming_call_reject_with_sms">Kataa simu hii na utume ujumbe wa kueleza</string>
+  <string name="a11y_incoming_call_answer_video_as_audio">Ijibu kama simu ya sauti</string>
+  <string name="a11y_incoming_call_answer_and_release">Jibu na ukate simu inayoendelea</string>
+  <string name="a11y_description_incoming_call_reject_with_sms">Kataa na utume ujumbe</string>
+  <string name="a11y_description_incoming_call_answer_video_as_audio">Ijibu kama simu ya sauti</string>
+  <string name="a11y_description_incoming_call_answer_and_release">Jibu na ukate simu inayoendelea</string>
+  <string name="call_incoming_video_is_off">Video imezimwa</string>
+  <string name="a11y_incoming_call_swipe_gesture_prompt">Telezesha juu kwa vidole viwili ili uijibu. Telezesha chini kwa vidole viwili ili uikate.</string>
+  <string name="call_incoming_important">Muhimu</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-ta/strings.xml b/java/com/android/incallui/answer/impl/res/values-ta/strings.xml
index 8863fc1..1018879 100644
--- a/java/com/android/incallui/answer/impl/res/values-ta/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-ta/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"செய்தியுடன் நிராகரிக்க, ஐகானிலிருந்து ஸ்வைப் செய்யவும்"</string>
-    <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"ஆடியோ அழைப்பில் பதிலளிக்க, ஐகானிலிருந்து ஸ்வைப் செய்யவும்"</string>
-    <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"உள்வரும் அழைப்பிற்குப் பதிலளித்து, செயலிலுள்ள அழைப்பை ஹோல்டில் வைக்க, மேலே ஸ்வைப் செய்யவும்"</string>
-    <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"உள்வரும் அழைப்பிற்குப் பதிலளித்து, ஹோல்டில் உள்ள அழைப்பை முடிக்க, மேலே ஸ்வைப் செய்யவும்"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"உள்வரும் அழைப்பிற்குப் பதிலளித்து, செயலில் உள்ள அழைப்பை முடிக்க, ஐகானிலிருந்து ஸ்வைப் செய்யவும்"</string>
-    <string name="call_incoming_message_custom" msgid="5819492800418293238">"நீங்களே எழுதவும்…"</string>
-    <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"நீங்களே எழுதவும்…"</string>
-    <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"ரத்துசெய்"</string>
-    <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"அனுப்பு"</string>
-    <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"செய்தி அனுப்பி இந்த அழைப்பை நிராகரி"</string>
-    <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"ஆடியோ அழைப்பில் பதிலளி"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"உள்வரும் அழைப்பிற்குப் பதிலளித்து, செயலில் உள்ள அழைப்பை முடி"</string>
-    <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"செய்தியுடன் நிராகரி"</string>
-    <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"ஆடியோ அழைப்பில் பதிலளி"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"உள்வரும் அழைப்பிற்குப் பதிலளித்து, செயலில் உள்ள அழைப்பை முடிக்கும்"</string>
-    <string name="call_incoming_video_is_off" msgid="3216603035158629403">"வீடியோ முடக்கப்பட்டுள்ளது"</string>
-    <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"பதிலளிக்க, இரு விரல்களால் மேலே ஸ்வைப் செய்யவும். நிராகரிக்க, இரு விரல்களால் கீழே ஸ்வைப் செய்யவும்."</string>
-    <string name="call_incoming_important" msgid="3762352743365137090">"முக்கிய அழைப்பு"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_decline_with_message">செய்தியுடன் நிராகரிக்க, ஐகானிலிருந்து ஸ்வைப் செய்யவும்</string>
+  <string name="call_incoming_swipe_to_answer_video_as_audio">ஆடியோ அழைப்பில் பதிலளிக்க, ஐகானிலிருந்து ஸ்வைப் செய்யவும்</string>
+  <string name="call_incoming_default_label_answer_and_release_second">உள்வரும் அழைப்பிற்குப் பதிலளித்து, செயலிலுள்ள அழைப்பை ஹோல்டில் வைக்க, மேலே ஸ்வைப் செய்யவும்</string>
+  <string name="call_incoming_default_label_answer_and_release_third">உள்வரும் அழைப்பிற்குப் பதிலளித்து, ஹோல்டில் உள்ள அழைப்பை முடிக்க, மேலே ஸ்வைப் செய்யவும்</string>
+  <string name="call_incoming_swipe_to_answer_and_release">உள்வரும் அழைப்பிற்குப் பதிலளித்து, செயலில் உள்ள அழைப்பை முடிக்க, ஐகானிலிருந்து ஸ்வைப் செய்யவும்</string>
+  <string name="call_incoming_message_custom">நீங்களே எழுதவும்…</string>
+  <string name="call_incoming_respond_via_sms_custom_message">நீங்களே எழுதவும்…</string>
+  <string name="call_incoming_custom_message_cancel">ரத்துசெய்</string>
+  <string name="call_incoming_custom_message_send">அனுப்பு</string>
+  <string name="a11y_incoming_call_reject_with_sms">செய்தி அனுப்பி இந்த அழைப்பை நிராகரி</string>
+  <string name="a11y_incoming_call_answer_video_as_audio">ஆடியோ அழைப்பில் பதிலளி</string>
+  <string name="a11y_incoming_call_answer_and_release">உள்வரும் அழைப்பிற்குப் பதிலளித்து, செயலில் உள்ள அழைப்பை முடி</string>
+  <string name="a11y_description_incoming_call_reject_with_sms">செய்தியுடன் நிராகரி</string>
+  <string name="a11y_description_incoming_call_answer_video_as_audio">ஆடியோ அழைப்பில் பதிலளி</string>
+  <string name="a11y_description_incoming_call_answer_and_release">உள்வரும் அழைப்பிற்குப் பதிலளித்து, செயலில் உள்ள அழைப்பை முடிக்கும்</string>
+  <string name="call_incoming_video_is_off">வீடியோ முடக்கப்பட்டுள்ளது</string>
+  <string name="a11y_incoming_call_swipe_gesture_prompt">பதிலளிக்க, இரு விரல்களால் மேலே ஸ்வைப் செய்யவும். நிராகரிக்க, இரு விரல்களால் கீழே ஸ்வைப் செய்யவும்.</string>
+  <string name="call_incoming_important">முக்கிய அழைப்பு</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-te/strings.xml b/java/com/android/incallui/answer/impl/res/values-te/strings.xml
index 112cc1d..f0074e4 100644
--- a/java/com/android/incallui/answer/impl/res/values-te/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-te/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"సందేశంతో తిరస్కరించడానికి చిహ్నం నుండి స్వైప్ చేయండి"</string>
-    <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"ఆడియో కాల్ రూపంలో సమాధానం ఇవ్వడానికి చిహ్నం నుండి స్వైప్ చేయండి"</string>
-    <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"సమాధానం ఇవ్వడానికి మరియు కొనసాగుతున్న కాల్‌ను హోల్డ్‌లో ఉంచడానికి పైకి స్వైప్ చేయండి"</string>
-    <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"సమాధానం ఇవ్వడానికి మరియు హోల్డ్‌లో ఉన్న కాల్‌ను ముగించడానికి పైకి స్వైప్ చేయండి"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"సమాధానం ఇవ్వడానికి మరియు కొనసాగుతున్న కాల్‌ను ముగించడానికి చిహ్నం నుండి స్వైప్ చేయండి"</string>
-    <string name="call_incoming_message_custom" msgid="5819492800418293238">"మీ స్వంతంగా వ్రాయండి…"</string>
-    <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"మీ స్వంతంగా వ్రాయండి…"</string>
-    <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"రద్దు చేయి"</string>
-    <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"పంపు"</string>
-    <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"ఈ కాల్‌ను సందేశంతో తిరస్కరించండి"</string>
-    <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"ఆడియో కాల్ రూపంలో సమాధానమివ్వండి"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"సమాధానమివ్వండి మరియు కొనసాగుతున్న కాల్‌ను ముగించండి"</string>
-    <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"సందేశంతో తిరస్కరించండి"</string>
-    <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"ఆడియో కాల్ రూపంలో సమాధానమివ్వండి"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"సమాధానం ఇస్తుంది మరియు కొనసాగుతున్న కాల్‌ను ముగిస్తుంది"</string>
-    <string name="call_incoming_video_is_off" msgid="3216603035158629403">"వీడియో ఆఫ్‌లో ఉంది"</string>
-    <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"సమాధానం ఇవ్వడానికి రెండు వేళ్లతో పైకి స్వైప్ చేయండి. తిరస్కరించడానికి రెండు వేళ్లతో క్రిందికి స్వైప్ చేయండి."</string>
-    <string name="call_incoming_important" msgid="3762352743365137090">"ముఖ్యమైనది"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_decline_with_message">సందేశంతో తిరస్కరించడానికి చిహ్నం నుండి స్వైప్ చేయండి</string>
+  <string name="call_incoming_swipe_to_answer_video_as_audio">ఆడియో కాల్ రూపంలో సమాధానం ఇవ్వడానికి చిహ్నం నుండి స్వైప్ చేయండి</string>
+  <string name="call_incoming_default_label_answer_and_release_second">సమాధానం ఇవ్వడానికి మరియు కొనసాగుతున్న కాల్‌ను హోల్డ్‌లో ఉంచడానికి పైకి స్వైప్ చేయండి</string>
+  <string name="call_incoming_default_label_answer_and_release_third">సమాధానం ఇవ్వడానికి మరియు హోల్డ్‌లో ఉన్న కాల్‌ను ముగించడానికి పైకి స్వైప్ చేయండి</string>
+  <string name="call_incoming_swipe_to_answer_and_release">సమాధానం ఇవ్వడానికి మరియు కొనసాగుతున్న కాల్‌ను ముగించడానికి చిహ్నం నుండి స్వైప్ చేయండి</string>
+  <string name="call_incoming_message_custom">మీ స్వంతంగా వ్రాయండి…</string>
+  <string name="call_incoming_respond_via_sms_custom_message">మీ స్వంతంగా వ్రాయండి…</string>
+  <string name="call_incoming_custom_message_cancel">రద్దు చేయి</string>
+  <string name="call_incoming_custom_message_send">పంపు</string>
+  <string name="a11y_incoming_call_reject_with_sms">ఈ కాల్‌ను సందేశంతో తిరస్కరించండి</string>
+  <string name="a11y_incoming_call_answer_video_as_audio">ఆడియో కాల్ రూపంలో సమాధానమివ్వండి</string>
+  <string name="a11y_incoming_call_answer_and_release">సమాధానమివ్వండి మరియు కొనసాగుతున్న కాల్‌ను ముగించండి</string>
+  <string name="a11y_description_incoming_call_reject_with_sms">సందేశంతో తిరస్కరించండి</string>
+  <string name="a11y_description_incoming_call_answer_video_as_audio">ఆడియో కాల్ రూపంలో సమాధానమివ్వండి</string>
+  <string name="a11y_description_incoming_call_answer_and_release">సమాధానం ఇస్తుంది మరియు కొనసాగుతున్న కాల్‌ను ముగిస్తుంది</string>
+  <string name="call_incoming_video_is_off">వీడియో ఆఫ్‌లో ఉంది</string>
+  <string name="a11y_incoming_call_swipe_gesture_prompt">సమాధానం ఇవ్వడానికి రెండు వేళ్లతో పైకి స్వైప్ చేయండి. తిరస్కరించడానికి రెండు వేళ్లతో క్రిందికి స్వైప్ చేయండి.</string>
+  <string name="call_incoming_important">ముఖ్యమైనది</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-th/strings.xml b/java/com/android/incallui/answer/impl/res/values-th/strings.xml
index 5169ac4..b562cd7 100644
--- a/java/com/android/incallui/answer/impl/res/values-th/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-th/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"เลื่อนไอคอนเพื่อปฏิเสธสายด้วยข้อความ"</string>
-    <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"เลื่อนไอคอนเพื่อรับสายเป็นการโทรด้วยเสียง"</string>
-    <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"เลื่อนขึ้นเพื่อรับและพักสายปัจจุบัน"</string>
-    <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"เลื่อนขึ้นเพื่อรับและวางสายที่พักไว้"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"เลื่อนจากไอคอนเพื่อรับและวางสาย"</string>
-    <string name="call_incoming_message_custom" msgid="5819492800418293238">"เขียนคำตอบของคุณเอง…"</string>
-    <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"เขียนคำตอบของคุณเอง…"</string>
-    <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"ยกเลิก"</string>
-    <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"ส่ง"</string>
-    <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"ปฏิเสธสายเรียกเข้าด้วยข้อความ"</string>
-    <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"รับสายเป็นการโทรด้วยเสียง"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"รับและวางสาย"</string>
-    <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"ปฏิเสธด้วยข้อความ"</string>
-    <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"รับสายเป็นการโทรด้วยเสียง"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"รับและวางสาย"</string>
-    <string name="call_incoming_video_is_off" msgid="3216603035158629403">"วิดีโอปิดอยู่"</string>
-    <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"ใช้สองนิ้วเลื่อนขึ้นเพื่อรับสายและเลื่อนลงเพื่อตัดสาย"</string>
-    <string name="call_incoming_important" msgid="3762352743365137090">"สำคัญ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_decline_with_message">เลื่อนไอคอนเพื่อปฏิเสธสายด้วยข้อความ</string>
+  <string name="call_incoming_swipe_to_answer_video_as_audio">เลื่อนไอคอนเพื่อรับสายเป็นการโทรด้วยเสียง</string>
+  <string name="call_incoming_default_label_answer_and_release_second">เลื่อนขึ้นเพื่อรับและพักสายปัจจุบัน</string>
+  <string name="call_incoming_default_label_answer_and_release_third">เลื่อนขึ้นเพื่อรับและวางสายที่พักไว้</string>
+  <string name="call_incoming_swipe_to_answer_and_release">เลื่อนจากไอคอนเพื่อรับและวางสาย</string>
+  <string name="call_incoming_message_custom">เขียนคำตอบของคุณเอง…</string>
+  <string name="call_incoming_respond_via_sms_custom_message">เขียนคำตอบของคุณเอง…</string>
+  <string name="call_incoming_custom_message_cancel">ยกเลิก</string>
+  <string name="call_incoming_custom_message_send">ส่ง</string>
+  <string name="a11y_incoming_call_reject_with_sms">ปฏิเสธสายเรียกเข้าด้วยข้อความ</string>
+  <string name="a11y_incoming_call_answer_video_as_audio">รับสายเป็นการโทรด้วยเสียง</string>
+  <string name="a11y_incoming_call_answer_and_release">รับและวางสาย</string>
+  <string name="a11y_description_incoming_call_reject_with_sms">ปฏิเสธด้วยข้อความ</string>
+  <string name="a11y_description_incoming_call_answer_video_as_audio">รับสายเป็นการโทรด้วยเสียง</string>
+  <string name="a11y_description_incoming_call_answer_and_release">รับและวางสาย</string>
+  <string name="call_incoming_video_is_off">วิดีโอปิดอยู่</string>
+  <string name="a11y_incoming_call_swipe_gesture_prompt">ใช้สองนิ้วเลื่อนขึ้นเพื่อรับสายและเลื่อนลงเพื่อตัดสาย</string>
+  <string name="call_incoming_important">สำคัญ</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-tl/strings.xml b/java/com/android/incallui/answer/impl/res/values-tl/strings.xml
index 9a6c333..cb616f7 100644
--- a/java/com/android/incallui/answer/impl/res/values-tl/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-tl/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"I-swipe mula sa icon upang tanggihan gamit ang mensahe"</string>
-    <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"I-swipe mula sa icon upang sagutin bilang isang audio call"</string>
-    <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"I-swipe nang pataas upang sagutin at i-hold ang kasalukuyang tawag"</string>
-    <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"I-swipe nang pataas upang sagutin at tapusin ang tawag na naka-hold"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Mag-swipe mula sa icon upang sagutin at tapusin ang kasalukuyang tawag"</string>
-    <string name="call_incoming_message_custom" msgid="5819492800418293238">"Magsulat ng sarili mo…"</string>
-    <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"Magsulat ng sarili mo…"</string>
-    <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"Kanselahin"</string>
-    <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Ipadala"</string>
-    <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"Tanggihan ang tawag na ito gamit ang isang mensahe"</string>
-    <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"Sagutin bilang audio call"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"Sagutin at tapusin ang kasalukuyang tawag"</string>
-    <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"Tanggihan gamit ang mensahe"</string>
-    <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"Sagutin bilang audio call"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Sagutin at tapusin ang kasalukuyang tawag"</string>
-    <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Naka-off ang video"</string>
-    <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"I-swipe nang pataas gamit ang dalawang daliri upang sagutin. I-swipe nang pababa gamit ang dalawang daliri upang tanggihan."</string>
-    <string name="call_incoming_important" msgid="3762352743365137090">"Mahalaga"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_decline_with_message">I-swipe mula sa icon upang tanggihan gamit ang mensahe</string>
+  <string name="call_incoming_swipe_to_answer_video_as_audio">I-swipe mula sa icon upang sagutin bilang isang audio call</string>
+  <string name="call_incoming_default_label_answer_and_release_second">I-swipe nang pataas upang sagutin at i-hold ang kasalukuyang tawag</string>
+  <string name="call_incoming_default_label_answer_and_release_third">I-swipe nang pataas upang sagutin at tapusin ang tawag na naka-hold</string>
+  <string name="call_incoming_swipe_to_answer_and_release">Mag-swipe mula sa icon upang sagutin at tapusin ang kasalukuyang tawag</string>
+  <string name="call_incoming_message_custom">Magsulat ng sarili mo…</string>
+  <string name="call_incoming_respond_via_sms_custom_message">Magsulat ng sarili mo…</string>
+  <string name="call_incoming_custom_message_cancel">Kanselahin</string>
+  <string name="call_incoming_custom_message_send">Ipadala</string>
+  <string name="a11y_incoming_call_reject_with_sms">Tanggihan ang tawag na ito gamit ang isang mensahe</string>
+  <string name="a11y_incoming_call_answer_video_as_audio">Sagutin bilang audio call</string>
+  <string name="a11y_incoming_call_answer_and_release">Sagutin at tapusin ang kasalukuyang tawag</string>
+  <string name="a11y_description_incoming_call_reject_with_sms">Tanggihan gamit ang mensahe</string>
+  <string name="a11y_description_incoming_call_answer_video_as_audio">Sagutin bilang audio call</string>
+  <string name="a11y_description_incoming_call_answer_and_release">Sagutin at tapusin ang kasalukuyang tawag</string>
+  <string name="call_incoming_video_is_off">Naka-off ang video</string>
+  <string name="a11y_incoming_call_swipe_gesture_prompt">I-swipe nang pataas gamit ang dalawang daliri upang sagutin. I-swipe nang pababa gamit ang dalawang daliri upang tanggihan.</string>
+  <string name="call_incoming_important">Mahalaga</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-tr/strings.xml b/java/com/android/incallui/answer/impl/res/values-tr/strings.xml
index 8af5a21..a3211b3 100644
--- a/java/com/android/incallui/answer/impl/res/values-tr/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-tr/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"Mesajla reddetmek için, simgeden hızlıca kaydırın"</string>
-    <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"Sesli çağrı olarak cevaplamak için, simgeden hızlıca kaydırın"</string>
-    <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"Devam eden çağrı cevaplamak ve bekletmek için hızlıca yukarı kaydırın"</string>
-    <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Cevaplamak ve beklemedeki çağrıyı sona erdirmek için hızlıca yukarı kaydırın"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Bir çağrıyı cevaplamak ve devam eden çağrıyı sona erdirmek için simgeden hızlıca kaydırın"</string>
-    <string name="call_incoming_message_custom" msgid="5819492800418293238">"Kendi yanıtınızı oluşturun…"</string>
-    <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"Kendi yanıtınızı oluşturun…"</string>
-    <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"İptal"</string>
-    <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Gönder"</string>
-    <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"Bu çağrıyı mesajla reddedin"</string>
-    <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"Sesli çağrı olarak cevaplayın"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"Bir çağrıyı cevaplayın ve devam eden çağrıyı sona erdirin"</string>
-    <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"Çağrıyı, mesajla reddedin"</string>
-    <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"Sesli çağrı olarak cevaplayın"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Bir çağrı cevaplanır ve devam eden çağrı sona erdirilir"</string>
-    <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Video kapalı"</string>
-    <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Cevaplamak için iki parmağınızla hızlıca yukarı kaydırın. Reddetmek içinse iki parmağınızla hızlıca aşağı kaydırın."</string>
-    <string name="call_incoming_important" msgid="3762352743365137090">"Önemli"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_decline_with_message">Mesajla reddetmek için, simgeden hızlıca kaydırın</string>
+  <string name="call_incoming_swipe_to_answer_video_as_audio">Sesli çağrı olarak cevaplamak için, simgeden hızlıca kaydırın</string>
+  <string name="call_incoming_default_label_answer_and_release_second">Devam eden çağrı cevaplamak ve bekletmek için hızlıca yukarı kaydırın</string>
+  <string name="call_incoming_default_label_answer_and_release_third">Cevaplamak ve beklemedeki çağrıyı sona erdirmek için hızlıca yukarı kaydırın</string>
+  <string name="call_incoming_swipe_to_answer_and_release">Bir çağrıyı cevaplamak ve devam eden çağrıyı sona erdirmek için simgeden hızlıca kaydırın</string>
+  <string name="call_incoming_message_custom">Kendi yanıtınızı oluşturun…</string>
+  <string name="call_incoming_respond_via_sms_custom_message">Kendi yanıtınızı oluşturun…</string>
+  <string name="call_incoming_custom_message_cancel">İptal</string>
+  <string name="call_incoming_custom_message_send">Gönder</string>
+  <string name="a11y_incoming_call_reject_with_sms">Bu çağrıyı mesajla reddedin</string>
+  <string name="a11y_incoming_call_answer_video_as_audio">Sesli çağrı olarak cevaplayın</string>
+  <string name="a11y_incoming_call_answer_and_release">Bir çağrıyı cevaplayın ve devam eden çağrıyı sona erdirin</string>
+  <string name="a11y_description_incoming_call_reject_with_sms">Çağrıyı, mesajla reddedin</string>
+  <string name="a11y_description_incoming_call_answer_video_as_audio">Sesli çağrı olarak cevaplayın</string>
+  <string name="a11y_description_incoming_call_answer_and_release">Bir çağrı cevaplanır ve devam eden çağrı sona erdirilir</string>
+  <string name="call_incoming_video_is_off">Video kapalı</string>
+  <string name="a11y_incoming_call_swipe_gesture_prompt">Cevaplamak için iki parmağınızla hızlıca yukarı kaydırın. Reddetmek içinse iki parmağınızla hızlıca aşağı kaydırın.</string>
+  <string name="call_incoming_important">Önemli</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-uk/strings.xml b/java/com/android/incallui/answer/impl/res/values-uk/strings.xml
index ef3252c..e99d519 100644
--- a/java/com/android/incallui/answer/impl/res/values-uk/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-uk/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"Проведіть пальцем убік від значка, щоб відхилити з повідомленням"</string>
-    <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"Проведіть пальцем убік від значка, щоб відповісти в режимі аудіодзвінка"</string>
-    <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"Проведіть пальцем угору, щоб відповісти, утримуючи поточний виклик"</string>
-    <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Проведіть пальцем угору, щоб відповісти, завершивши утримуваний виклик"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Проведіть пальцем від значка, щоб відповісти на виклик, завершивши поточний"</string>
-    <string name="call_incoming_message_custom" msgid="5819492800418293238">"Напишіть власну відповідь…"</string>
-    <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"Напишіть власну відповідь…"</string>
-    <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"Скасувати"</string>
-    <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Надіслати"</string>
-    <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"Відхилити цей виклик, додавши повідомлення"</string>
-    <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"Відповісти в режимі аудіодзвінка"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"Відповісти на виклик, завершивши поточний"</string>
-    <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"Відхилити, додавши повідомлення"</string>
-    <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"Відповісти в режимі аудіодзвінка"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Відповісти на виклик, завершивши поточний"</string>
-    <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Відео вимкнено"</string>
-    <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Проведіть двома пальцями вгору, щоб відповісти, або вниз, щоб відхилити дзвінок."</string>
-    <string name="call_incoming_important" msgid="3762352743365137090">"Важливо"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_decline_with_message">Проведіть пальцем убік від значка, щоб відхилити з повідомленням</string>
+  <string name="call_incoming_swipe_to_answer_video_as_audio">Проведіть пальцем убік від значка, щоб відповісти в режимі аудіодзвінка</string>
+  <string name="call_incoming_default_label_answer_and_release_second">Проведіть пальцем угору, щоб відповісти, утримуючи поточний виклик</string>
+  <string name="call_incoming_default_label_answer_and_release_third">Проведіть пальцем угору, щоб відповісти, завершивши утримуваний виклик</string>
+  <string name="call_incoming_swipe_to_answer_and_release">Проведіть пальцем від значка, щоб відповісти на виклик, завершивши поточний</string>
+  <string name="call_incoming_message_custom">Напишіть власну відповідь…</string>
+  <string name="call_incoming_respond_via_sms_custom_message">Напишіть власну відповідь…</string>
+  <string name="call_incoming_custom_message_cancel">Скасувати</string>
+  <string name="call_incoming_custom_message_send">Надіслати</string>
+  <string name="a11y_incoming_call_reject_with_sms">Відхилити цей виклик, додавши повідомлення</string>
+  <string name="a11y_incoming_call_answer_video_as_audio">Відповісти в режимі аудіодзвінка</string>
+  <string name="a11y_incoming_call_answer_and_release">Відповісти на виклик, завершивши поточний</string>
+  <string name="a11y_description_incoming_call_reject_with_sms">Відхилити, додавши повідомлення</string>
+  <string name="a11y_description_incoming_call_answer_video_as_audio">Відповісти в режимі аудіодзвінка</string>
+  <string name="a11y_description_incoming_call_answer_and_release">Відповісти на виклик, завершивши поточний</string>
+  <string name="call_incoming_video_is_off">Відео вимкнено</string>
+  <string name="a11y_incoming_call_swipe_gesture_prompt">Проведіть двома пальцями вгору, щоб відповісти, або вниз, щоб відхилити дзвінок.</string>
+  <string name="call_incoming_important">Важливо</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-ur/strings.xml b/java/com/android/incallui/answer/impl/res/values-ur/strings.xml
index 1989465..f0b37a5 100644
--- a/java/com/android/incallui/answer/impl/res/values-ur/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-ur/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"پیغام کے ساتھ رد کرنے کیلئے آئیکن سے سوائپ کریں"</string>
-    <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"آڈیو کال کے بطور جواب دینے کیلئے آئیکن سے سوائپ کریں"</string>
-    <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"جواب دینے اور جاری کال کو ہولڈ کرنے کیلئے اوپر سوائپ کریں"</string>
-    <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"جواب دینے اور ہولڈ کردہ کال کو ختم کرنے کیلئے اوپر سوائپ کریں"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"جواب دینے اور جاری کال ختم کرنے کیلے آئیکن سے سوائپ کریں"</string>
-    <string name="call_incoming_message_custom" msgid="5819492800418293238">"خود اپنا تحریر کریں…"</string>
-    <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"خود اپنا تحریر کریں…"</string>
-    <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"منسوخ کریں"</string>
-    <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"بھیجیں"</string>
-    <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"اس کال کو ایک پیغام کے ساتھ مسترد کریں"</string>
-    <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"آڈیو کال کے بطور جواب دیں"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"جواب دیں اور جاری کال ختم کریں"</string>
-    <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"پیغام کے ساتھ مسترد کریں"</string>
-    <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"آڈیو کال کے بطور جواب دیں"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"جواب دیں اور جاری کال ختم کریں"</string>
-    <string name="call_incoming_video_is_off" msgid="3216603035158629403">"ویڈیو آف ہے"</string>
-    <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"جواب دینے کیلئے دوانگلیوں کے ساتھ اوپر سوائپ کریں۔ مسترد کرنے کیلئے دو انگلیوں کے ساتھ نیچے سوائپ کریں۔"</string>
-    <string name="call_incoming_important" msgid="3762352743365137090">"اہم"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_decline_with_message">پیغام کے ساتھ رد کرنے کیلئے آئیکن سے سوائپ کریں</string>
+  <string name="call_incoming_swipe_to_answer_video_as_audio">آڈیو کال کے بطور جواب دینے کیلئے آئیکن سے سوائپ کریں</string>
+  <string name="call_incoming_default_label_answer_and_release_second">جواب دینے اور جاری کال کو ہولڈ کرنے کیلئے اوپر سوائپ کریں</string>
+  <string name="call_incoming_default_label_answer_and_release_third">جواب دینے اور ہولڈ کردہ کال کو ختم کرنے کیلئے اوپر سوائپ کریں</string>
+  <string name="call_incoming_swipe_to_answer_and_release">جواب دینے اور جاری کال ختم کرنے کیلے آئیکن سے سوائپ کریں</string>
+  <string name="call_incoming_message_custom">خود اپنا تحریر کریں…</string>
+  <string name="call_incoming_respond_via_sms_custom_message">خود اپنا تحریر کریں…</string>
+  <string name="call_incoming_custom_message_cancel">منسوخ کریں</string>
+  <string name="call_incoming_custom_message_send">بھیجیں</string>
+  <string name="a11y_incoming_call_reject_with_sms">اس کال کو ایک پیغام کے ساتھ مسترد کریں</string>
+  <string name="a11y_incoming_call_answer_video_as_audio">آڈیو کال کے بطور جواب دیں</string>
+  <string name="a11y_incoming_call_answer_and_release">جواب دیں اور جاری کال ختم کریں</string>
+  <string name="a11y_description_incoming_call_reject_with_sms">پیغام کے ساتھ مسترد کریں</string>
+  <string name="a11y_description_incoming_call_answer_video_as_audio">آڈیو کال کے بطور جواب دیں</string>
+  <string name="a11y_description_incoming_call_answer_and_release">جواب دیں اور جاری کال ختم کریں</string>
+  <string name="call_incoming_video_is_off">ویڈیو آف ہے</string>
+  <string name="a11y_incoming_call_swipe_gesture_prompt">جواب دینے کیلئے دوانگلیوں کے ساتھ اوپر سوائپ کریں۔ مسترد کرنے کیلئے دو انگلیوں کے ساتھ نیچے سوائپ کریں۔</string>
+  <string name="call_incoming_important">اہم</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-uz/strings.xml b/java/com/android/incallui/answer/impl/res/values-uz/strings.xml
index 9f15af6..63cd2ba 100644
--- a/java/com/android/incallui/answer/impl/res/values-uz/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-uz/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"Qo‘ng‘iroqni SMS bilan rad etish uchun nishonchadan suring."</string>
-    <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"Ovozli qo‘ng‘iroq rejimida javob berish uchun nishonchadan suring."</string>
-    <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"Javob berish va joriy qo‘ng‘iroqni kutish rejimiga o‘tkazish uchun tepaga suring"</string>
-    <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Javob berish va kutish rejimidagi qo‘ng‘iroqni tugatish uchun tepaga suring"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Kiruvchi chaqiruvga javob berish va joriy qo‘ng‘iroqni tugatish uchun nishonchadan suring"</string>
-    <string name="call_incoming_message_custom" msgid="5819492800418293238">"Sizning javobingiz…"</string>
-    <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"Sizning javobingiz…"</string>
-    <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"Bekor qilish"</string>
-    <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Yuborish"</string>
-    <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"Bu qo‘ng‘iroqni xabar bilan rad etish"</string>
-    <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"Ovozli qo‘ng‘iroq rejimida javob berish"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"Kiruvchi chaqiruvga javob berish va joriy qo‘ng‘iroqni tugatish"</string>
-    <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"Xabar yuborib rad etish"</string>
-    <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"Ovozli qo‘ng‘iroq rejimida javob berish"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Kiruvchi chaqiruvga javob berish va joriy qo‘ng‘iroqni tugatish"</string>
-    <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Kamera o‘chiq"</string>
-    <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Chaqiruvga javob berish uchun ikki barmoq bilan tepaga, rad etish uchun ikki barmoq bilan pastga suring."</string>
-    <string name="call_incoming_important" msgid="3762352743365137090">"Muhim qo‘ng‘iroq"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_decline_with_message">Qo‘ng‘iroqni SMS bilan rad etish uchun nishonchadan suring.</string>
+  <string name="call_incoming_swipe_to_answer_video_as_audio">Ovozli qo‘ng‘iroq rejimida javob berish uchun nishonchadan suring.</string>
+  <string name="call_incoming_default_label_answer_and_release_second">Javob berish va joriy qo‘ng‘iroqni kutish rejimiga o‘tkazish uchun tepaga suring</string>
+  <string name="call_incoming_default_label_answer_and_release_third">Javob berish va kutish rejimidagi qo‘ng‘iroqni tugatish uchun tepaga suring</string>
+  <string name="call_incoming_swipe_to_answer_and_release">Kiruvchi chaqiruvga javob berish va joriy qo‘ng‘iroqni tugatish uchun nishonchadan suring</string>
+  <string name="call_incoming_message_custom">Sizning javobingiz…</string>
+  <string name="call_incoming_respond_via_sms_custom_message">Sizning javobingiz…</string>
+  <string name="call_incoming_custom_message_cancel">Bekor qilish</string>
+  <string name="call_incoming_custom_message_send">Yuborish</string>
+  <string name="a11y_incoming_call_reject_with_sms">Bu qo‘ng‘iroqni xabar bilan rad etish</string>
+  <string name="a11y_incoming_call_answer_video_as_audio">Ovozli qo‘ng‘iroq rejimida javob berish</string>
+  <string name="a11y_incoming_call_answer_and_release">Kiruvchi chaqiruvga javob berish va joriy qo‘ng‘iroqni tugatish</string>
+  <string name="a11y_description_incoming_call_reject_with_sms">Xabar yuborib rad etish</string>
+  <string name="a11y_description_incoming_call_answer_video_as_audio">Ovozli qo‘ng‘iroq rejimida javob berish</string>
+  <string name="a11y_description_incoming_call_answer_and_release">Kiruvchi chaqiruvga javob berish va joriy qo‘ng‘iroqni tugatish</string>
+  <string name="call_incoming_video_is_off">Kamera o‘chiq</string>
+  <string name="a11y_incoming_call_swipe_gesture_prompt">Chaqiruvga javob berish uchun ikki barmoq bilan tepaga, rad etish uchun ikki barmoq bilan pastga suring.</string>
+  <string name="call_incoming_important">Muhim qo‘ng‘iroq</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-vi/strings.xml b/java/com/android/incallui/answer/impl/res/values-vi/strings.xml
index 57b68cf..73e056e 100644
--- a/java/com/android/incallui/answer/impl/res/values-vi/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-vi/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"Vuốt từ biểu tượng để từ chối kèm thông báo"</string>
-    <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"Vuốt từ biểu tượng để trả lời dưới dạng cuộc gọi âm thanh"</string>
-    <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"Vuốt lên để trả lời và giữ cuộc gọi đang diễn ra"</string>
-    <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Vuốt lên để trả lời và kết thúc cuộc gọi đang chờ"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Vuốt từ biểu tượng để trả lời và kết thúc cuộc gọi đang diễn ra"</string>
-    <string name="call_incoming_message_custom" msgid="5819492800418293238">"Viết trả lời của riêng bạn…"</string>
-    <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"Viết trả lời của riêng bạn…"</string>
-    <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"Hủy"</string>
-    <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Gửi"</string>
-    <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"Từ chối cuộc gọi này bằng tin nhắn"</string>
-    <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"Trả lời dưới dạng cuộc gọi âm thanh"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"Trả lời và kết thúc cuộc gọi đang diễn ra"</string>
-    <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"Từ chối bằng tin nhắn"</string>
-    <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"Trả lời dưới dạng cuộc gọi âm thanh"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Trả lời và kết thúc cuộc gọi đang diễn ra"</string>
-    <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Video đã tắt"</string>
-    <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Vuốt hai ngón tay lên để trả lời. Vuốt hai ngón tay xuống để từ chối."</string>
-    <string name="call_incoming_important" msgid="3762352743365137090">"Quan trọng"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_decline_with_message">Vuốt từ biểu tượng để từ chối kèm thông báo</string>
+  <string name="call_incoming_swipe_to_answer_video_as_audio">Vuốt từ biểu tượng để trả lời dưới dạng cuộc gọi âm thanh</string>
+  <string name="call_incoming_default_label_answer_and_release_second">Vuốt lên để trả lời và giữ cuộc gọi đang diễn ra</string>
+  <string name="call_incoming_default_label_answer_and_release_third">Vuốt lên để trả lời và kết thúc cuộc gọi đang chờ</string>
+  <string name="call_incoming_swipe_to_answer_and_release">Vuốt từ biểu tượng để trả lời và kết thúc cuộc gọi đang diễn ra</string>
+  <string name="call_incoming_message_custom">Viết trả lời của riêng bạn…</string>
+  <string name="call_incoming_respond_via_sms_custom_message">Viết trả lời của riêng bạn…</string>
+  <string name="call_incoming_custom_message_cancel">Hủy</string>
+  <string name="call_incoming_custom_message_send">Gửi</string>
+  <string name="a11y_incoming_call_reject_with_sms">Từ chối cuộc gọi này bằng tin nhắn</string>
+  <string name="a11y_incoming_call_answer_video_as_audio">Trả lời dưới dạng cuộc gọi âm thanh</string>
+  <string name="a11y_incoming_call_answer_and_release">Trả lời và kết thúc cuộc gọi đang diễn ra</string>
+  <string name="a11y_description_incoming_call_reject_with_sms">Từ chối bằng tin nhắn</string>
+  <string name="a11y_description_incoming_call_answer_video_as_audio">Trả lời dưới dạng cuộc gọi âm thanh</string>
+  <string name="a11y_description_incoming_call_answer_and_release">Trả lời và kết thúc cuộc gọi đang diễn ra</string>
+  <string name="call_incoming_video_is_off">Video đã tắt</string>
+  <string name="a11y_incoming_call_swipe_gesture_prompt">Vuốt hai ngón tay lên để trả lời. Vuốt hai ngón tay xuống để từ chối.</string>
+  <string name="call_incoming_important">Quan trọng</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-zh-rCN/strings.xml b/java/com/android/incallui/answer/impl/res/values-zh-rCN/strings.xml
index 8f1cfc9..001f580 100644
--- a/java/com/android/incallui/answer/impl/res/values-zh-rCN/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-zh-rCN/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"滑动图标即可拒接来电并发送信息"</string>
-    <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"滑动图标即可以音频通话的形式接听"</string>
-    <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"向上滑动即可接听并保持当前通话"</string>
-    <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"向上滑动即可接听并结束保持的通话"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"滑动图标即可接听并结束当前通话"</string>
-    <string name="call_incoming_message_custom" msgid="5819492800418293238">"自行撰写回复…"</string>
-    <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"自行撰写回复…"</string>
-    <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"取消"</string>
-    <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"发送"</string>
-    <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"拒接此来电并发送信息"</string>
-    <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"以音频通话的形式接听"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"接听并结束当前通话"</string>
-    <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"拒接来电并发送信息"</string>
-    <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"以音频通话的形式接听"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"接听并结束当前通话"</string>
-    <string name="call_incoming_video_is_off" msgid="3216603035158629403">"摄像头处于关闭状态"</string>
-    <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"双指向上滑动即可接听，向下滑动则可拒接。"</string>
-    <string name="call_incoming_important" msgid="3762352743365137090">"重要"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_decline_with_message">滑动图标即可拒接来电并发送信息</string>
+  <string name="call_incoming_swipe_to_answer_video_as_audio">滑动图标即可以音频通话的形式接听</string>
+  <string name="call_incoming_default_label_answer_and_release_second">向上滑动即可接听并保持当前通话</string>
+  <string name="call_incoming_default_label_answer_and_release_third">向上滑动即可接听并结束保持的通话</string>
+  <string name="call_incoming_swipe_to_answer_and_release">滑动图标即可接听并结束当前通话</string>
+  <string name="call_incoming_message_custom">自行撰写回复…</string>
+  <string name="call_incoming_respond_via_sms_custom_message">自行撰写回复…</string>
+  <string name="call_incoming_custom_message_cancel">取消</string>
+  <string name="call_incoming_custom_message_send">发送</string>
+  <string name="a11y_incoming_call_reject_with_sms">拒接此来电并发送信息</string>
+  <string name="a11y_incoming_call_answer_video_as_audio">以音频通话的形式接听</string>
+  <string name="a11y_incoming_call_answer_and_release">接听并结束当前通话</string>
+  <string name="a11y_description_incoming_call_reject_with_sms">拒接来电并发送信息</string>
+  <string name="a11y_description_incoming_call_answer_video_as_audio">以音频通话的形式接听</string>
+  <string name="a11y_description_incoming_call_answer_and_release">接听并结束当前通话</string>
+  <string name="call_incoming_video_is_off">摄像头处于关闭状态</string>
+  <string name="a11y_incoming_call_swipe_gesture_prompt">双指向上滑动即可接听，向下滑动则可拒接。</string>
+  <string name="call_incoming_important">重要</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-zh-rHK/strings.xml b/java/com/android/incallui/answer/impl/res/values-zh-rHK/strings.xml
index aeffeef..85d7885 100644
--- a/java/com/android/incallui/answer/impl/res/values-zh-rHK/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-zh-rHK/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"從圖示快速滑動即可透過訊息拒絕"</string>
-    <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"從圖示快速滑動即可接聽語音通話"</string>
-    <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"向上滑動可接聽並保留進行中的通話"</string>
-    <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"向上滑動即可接聽並結束保留的通話"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"從圖示快速滑動即可接聽及結束進行中的通話"</string>
-    <string name="call_incoming_message_custom" msgid="5819492800418293238">"自行撰寫回覆…"</string>
-    <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"自行撰寫回覆…"</string>
-    <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"取消"</string>
-    <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"發送"</string>
-    <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"用訊息回絕此來電"</string>
-    <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"接聽語音通話"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"接聽及結束進行中的通話"</string>
-    <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"用訊息回絕"</string>
-    <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"接聽語音通話"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"接聽及結束進行中的通話"</string>
-    <string name="call_incoming_video_is_off" msgid="3216603035158629403">"視像已關閉"</string>
-    <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"兩指向上滑動可接聽，向下滑動則可拒接。"</string>
-    <string name="call_incoming_important" msgid="3762352743365137090">"重要事項"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_decline_with_message">從圖示快速滑動即可透過訊息拒絕</string>
+  <string name="call_incoming_swipe_to_answer_video_as_audio">從圖示快速滑動即可接聽語音通話</string>
+  <string name="call_incoming_default_label_answer_and_release_second">向上滑動可接聽並保留進行中的通話</string>
+  <string name="call_incoming_default_label_answer_and_release_third">向上滑動即可接聽並結束保留的通話</string>
+  <string name="call_incoming_swipe_to_answer_and_release">從圖示快速滑動即可接聽及結束進行中的通話</string>
+  <string name="call_incoming_message_custom">自行撰寫回覆…</string>
+  <string name="call_incoming_respond_via_sms_custom_message">自行撰寫回覆…</string>
+  <string name="call_incoming_custom_message_cancel">取消</string>
+  <string name="call_incoming_custom_message_send">發送</string>
+  <string name="a11y_incoming_call_reject_with_sms">用訊息回絕此來電</string>
+  <string name="a11y_incoming_call_answer_video_as_audio">接聽語音通話</string>
+  <string name="a11y_incoming_call_answer_and_release">接聽及結束進行中的通話</string>
+  <string name="a11y_description_incoming_call_reject_with_sms">用訊息回絕</string>
+  <string name="a11y_description_incoming_call_answer_video_as_audio">接聽語音通話</string>
+  <string name="a11y_description_incoming_call_answer_and_release">接聽及結束進行中的通話</string>
+  <string name="call_incoming_video_is_off">視像已關閉</string>
+  <string name="a11y_incoming_call_swipe_gesture_prompt">兩指向上滑動可接聽，向下滑動則可拒接。</string>
+  <string name="call_incoming_important">重要事項</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-zh-rTW/strings.xml b/java/com/android/incallui/answer/impl/res/values-zh-rTW/strings.xml
index 66624b2..fef731e 100644
--- a/java/com/android/incallui/answer/impl/res/values-zh-rTW/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-zh-rTW/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"滑動圖示即可拒接來電並傳送簡訊"</string>
-    <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"滑動圖示即可透過語音通話方式接聽來電"</string>
-    <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"向上滑動即可接聽及保留進行中的通話"</string>
-    <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"向上滑動即可接聽及結束保留中的通話"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"滑動圖示即可接聽來電及結束進行中的通話"</string>
-    <string name="call_incoming_message_custom" msgid="5819492800418293238">"自行撰寫回應…"</string>
-    <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"自行撰寫回應…"</string>
-    <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"取消"</string>
-    <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"傳送"</string>
-    <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"拒接這通來電並傳送簡訊"</string>
-    <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"透過語音通話方式接聽來電"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"接聽來電及結束進行中的通話"</string>
-    <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"拒接來電並傳送簡訊"</string>
-    <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"透過語音通話方式接聽來電"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"接聽來電及結束進行中的通話"</string>
-    <string name="call_incoming_video_is_off" msgid="3216603035158629403">"已關閉攝影機"</string>
-    <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"用雙指向上滑動可接聽，向下滑動可拒接。"</string>
-    <string name="call_incoming_important" msgid="3762352743365137090">"重要"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_decline_with_message">滑動圖示即可拒接來電並傳送簡訊</string>
+  <string name="call_incoming_swipe_to_answer_video_as_audio">滑動圖示即可透過語音通話方式接聽來電</string>
+  <string name="call_incoming_default_label_answer_and_release_second">向上滑動即可接聽及保留進行中的通話</string>
+  <string name="call_incoming_default_label_answer_and_release_third">向上滑動即可接聽及結束保留中的通話</string>
+  <string name="call_incoming_swipe_to_answer_and_release">滑動圖示即可接聽來電及結束進行中的通話</string>
+  <string name="call_incoming_message_custom">自行撰寫回應…</string>
+  <string name="call_incoming_respond_via_sms_custom_message">自行撰寫回應…</string>
+  <string name="call_incoming_custom_message_cancel">取消</string>
+  <string name="call_incoming_custom_message_send">傳送</string>
+  <string name="a11y_incoming_call_reject_with_sms">拒接這通來電並傳送簡訊</string>
+  <string name="a11y_incoming_call_answer_video_as_audio">透過語音通話方式接聽來電</string>
+  <string name="a11y_incoming_call_answer_and_release">接聽來電及結束進行中的通話</string>
+  <string name="a11y_description_incoming_call_reject_with_sms">拒接來電並傳送簡訊</string>
+  <string name="a11y_description_incoming_call_answer_video_as_audio">透過語音通話方式接聽來電</string>
+  <string name="a11y_description_incoming_call_answer_and_release">接聽來電及結束進行中的通話</string>
+  <string name="call_incoming_video_is_off">已關閉攝影機</string>
+  <string name="a11y_incoming_call_swipe_gesture_prompt">用雙指向上滑動可接聽，向下滑動可拒接。</string>
+  <string name="call_incoming_important">重要</string>
 </resources>
diff --git a/java/com/android/incallui/answer/impl/res/values-zu/strings.xml b/java/com/android/incallui/answer/impl/res/values-zu/strings.xml
index 6271d3b..7b2e00a 100644
--- a/java/com/android/incallui/answer/impl/res/values-zu/strings.xml
+++ b/java/com/android/incallui/answer/impl/res/values-zu/strings.xml
@@ -1,38 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="call_incoming_swipe_to_decline_with_message" msgid="2426342919316424240">"Swayipha isithonjana ukuze wenqabe ngomlayezo"</string>
-    <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"Swayipha kusuka esithonjaneni ukuze uphendule ikholi yomsindo"</string>
-    <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"Swayiphela phezulu ukuze uphendule futhi ubambe ikholi eqhubekayo"</string>
-    <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Swayiphela phezulu ukuze uphendule futhi uphelise ikholi ebanjiwe"</string>
-    <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Swayipha kusukela kusithonjana ukuze uphendule uphinde uqede ikholi eqhubekayo"</string>
-    <string name="call_incoming_message_custom" msgid="5819492800418293238">"Bhala okwakho…"</string>
-    <string name="call_incoming_respond_via_sms_custom_message" msgid="6808438125627371020">"Bhala okwakho…"</string>
-    <string name="call_incoming_custom_message_cancel" msgid="5231860339073505201">"Khansela"</string>
-    <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Thumela"</string>
-    <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"Yenqaba le kholi ngomlayezo"</string>
-    <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"Phendula njengekholi yomsindo"</string>
-    <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"Phendula uphinde uqede ikholi eqhubekayo"</string>
-    <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"Yenqaba ngomsebenzi"</string>
-    <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"Phendula njengekholi yomsindo"</string>
-    <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Phendula uphinde uqede ikholi eqhubekayo"</string>
-    <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Ividiyo ivaliwe"</string>
-    <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Swayiphela iminwe emibili phezulu ukuze uphendule. Swayiphela iminwe emibili phansi ukuze wenqabe."</string>
-    <string name="call_incoming_important" msgid="3762352743365137090">"Kubalulekile"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="call_incoming_swipe_to_decline_with_message">Swayipha isithonjana ukuze wenqabe ngomlayezo</string>
+  <string name="call_incoming_swipe_to_answer_video_as_audio">Swayipha kusuka esithonjaneni ukuze uphendule ikholi yomsindo</string>
+  <string name="call_incoming_default_label_answer_and_release_second">Swayiphela phezulu ukuze uphendule futhi ubambe ikholi eqhubekayo</string>
+  <string name="call_incoming_default_label_answer_and_release_third">Swayiphela phezulu ukuze uphendule futhi uphelise ikholi ebanjiwe</string>
+  <string name="call_incoming_swipe_to_answer_and_release">Swayipha kusukela kusithonjana ukuze uphendule uphinde uqede ikholi eqhubekayo</string>
+  <string name="call_incoming_message_custom">Bhala okwakho…</string>
+  <string name="call_incoming_respond_via_sms_custom_message">Bhala okwakho…</string>
+  <string name="call_incoming_custom_message_cancel">Khansela</string>
+  <string name="call_incoming_custom_message_send">Thumela</string>
+  <string name="a11y_incoming_call_reject_with_sms">Yenqaba le kholi ngomlayezo</string>
+  <string name="a11y_incoming_call_answer_video_as_audio">Phendula njengekholi yomsindo</string>
+  <string name="a11y_incoming_call_answer_and_release">Phendula uphinde uqede ikholi eqhubekayo</string>
+  <string name="a11y_description_incoming_call_reject_with_sms">Yenqaba ngomsebenzi</string>
+  <string name="a11y_description_incoming_call_answer_video_as_audio">Phendula njengekholi yomsindo</string>
+  <string name="a11y_description_incoming_call_answer_and_release">Phendula uphinde uqede ikholi eqhubekayo</string>
+  <string name="call_incoming_video_is_off">Ividiyo ivaliwe</string>
+  <string name="a11y_incoming_call_swipe_gesture_prompt">Swayiphela iminwe emibili phezulu ukuze uphendule. Swayiphela iminwe emibili phansi ukuze wenqabe.</string>
+  <string name="call_incoming_important">Kubalulekile</string>
 </resources>
diff --git a/java/com/android/incallui/answer/protocol/AnswerScreen.java b/java/com/android/incallui/answer/protocol/AnswerScreen.java
index f030ce9..38e4dc5 100644
--- a/java/com/android/incallui/answer/protocol/AnswerScreen.java
+++ b/java/com/android/incallui/answer/protocol/AnswerScreen.java
@@ -32,6 +32,8 @@
 
   boolean allowAnswerAndRelease();
 
+  boolean allowSpeakEasy();
+
   boolean isActionTimeout();
 
   void setTextResponses(List<String> textResponses);
diff --git a/java/com/android/incallui/answer/protocol/AnswerScreenDelegate.java b/java/com/android/incallui/answer/protocol/AnswerScreenDelegate.java
index 5710922..172d964 100644
--- a/java/com/android/incallui/answer/protocol/AnswerScreenDelegate.java
+++ b/java/com/android/incallui/answer/protocol/AnswerScreenDelegate.java
@@ -30,6 +30,8 @@
 
   void onReject();
 
+  void onSpeakEasyCall();
+
   void onAnswerAndReleaseCall();
 
   void onAnswerAndReleaseButtonEnabled();
diff --git a/java/com/android/incallui/answerproximitysensor/AnswerProximitySensor.java b/java/com/android/incallui/answerproximitysensor/AnswerProximitySensor.java
index 50f6ae6..8aeb05f 100644
--- a/java/com/android/incallui/answerproximitysensor/AnswerProximitySensor.java
+++ b/java/com/android/incallui/answerproximitysensor/AnswerProximitySensor.java
@@ -22,10 +22,10 @@
 import android.os.Trace;
 import android.view.Display;
 import com.android.dialer.common.LogUtil;
-import com.android.dialer.configprovider.ConfigProviderBindings;
+import com.android.dialer.configprovider.ConfigProviderComponent;
 import com.android.incallui.call.DialerCall;
-import com.android.incallui.call.DialerCall.State;
 import com.android.incallui.call.DialerCallListener;
+import com.android.incallui.call.state.DialerCallState;
 
 /**
  * This class prevents users from accidentally answering calls by keeping the screen off until the
@@ -47,13 +47,14 @@
     Trace.beginSection("AnswerProximitySensor.shouldUse");
     // Don't use the AnswerProximitySensor for call waiting and other states. Those states are
     // handled by the general ProximitySensor code.
-    if (call.getState() != State.INCOMING) {
+    if (call.getState() != DialerCallState.INCOMING) {
       LogUtil.i("AnswerProximitySensor.shouldUse", "call state is not incoming");
       Trace.endSection();
       return false;
     }
 
-    if (!ConfigProviderBindings.get(context)
+    if (!ConfigProviderComponent.get(context)
+        .getConfigProvider()
         .getBoolean(CONFIG_ANSWER_PROXIMITY_SENSOR_ENABLED, true)) {
       LogUtil.i("AnswerProximitySensor.shouldUse", "disabled by config");
       Trace.endSection();
@@ -84,7 +85,8 @@
     this.call = call;
 
     LogUtil.i("AnswerProximitySensor.constructor", "acquiring lock");
-    if (ConfigProviderBindings.get(context)
+    if (ConfigProviderComponent.get(context)
+        .getConfigProvider()
         .getBoolean(CONFIG_ANSWER_PSEUDO_PROXIMITY_WAKE_LOCK_ENABLED, true)) {
       answerProximityWakeLock = new PseudoProximityWakeLock(context, pseudoScreenState);
     } else {
@@ -129,7 +131,7 @@
 
   @Override
   public void onDialerCallUpdate() {
-    if (call.getState() != State.INCOMING) {
+    if (call.getState() != DialerCallState.INCOMING) {
       LogUtil.i("AnswerProximitySensor.onDialerCallUpdate", "no longer incoming, cleaning up");
       cleanup();
     }
diff --git a/java/com/android/incallui/audioroute/AudioRouteSelectorDialogFragment.java b/java/com/android/incallui/audioroute/AudioRouteSelectorDialogFragment.java
index d481f43..846834f 100644
--- a/java/com/android/incallui/audioroute/AudioRouteSelectorDialogFragment.java
+++ b/java/com/android/incallui/audioroute/AudioRouteSelectorDialogFragment.java
@@ -16,22 +16,36 @@
 
 package com.android.incallui.audioroute;
 
+import android.annotation.SuppressLint;
 import android.app.Dialog;
+import android.bluetooth.BluetoothDevice;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.res.ColorStateList;
 import android.graphics.PorterDuff.Mode;
 import android.os.Bundle;
+import android.provider.Settings;
 import android.support.annotation.Nullable;
 import android.support.design.widget.BottomSheetDialogFragment;
+import android.support.v4.os.BuildCompat;
 import android.telecom.CallAudioState;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.WindowManager;
+import android.widget.LinearLayout;
 import android.widget.TextView;
 import com.android.dialer.common.FragmentUtils;
 import com.android.dialer.common.LogUtil;
+import com.android.dialer.logging.DialerImpression;
+import com.android.dialer.logging.Logger;
+import com.android.dialer.theme.base.ThemeComponent;
+import com.android.incallui.call.CallList;
+import com.android.incallui.call.DialerCall;
+import com.android.incallui.call.TelecomAdapter;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.Collection;
 
 /** Shows picker for audio routes */
 public class AudioRouteSelectorDialogFragment extends BottomSheetDialogFragment {
@@ -65,32 +79,64 @@
     LogUtil.i("AudioRouteSelectorDialogFragment.onCreateDialog", null);
     Dialog dialog = super.onCreateDialog(savedInstanceState);
     dialog.getWindow().addFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED);
+    if (Settings.canDrawOverlays(getContext())) {
+      dialog
+          .getWindow()
+          .setType(
+              BuildCompat.isAtLeastO()
+                  ? WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY
+                  : WindowManager.LayoutParams.TYPE_PHONE);
+    }
     return dialog;
   }
 
   @Nullable
   @Override
+  @SuppressLint("NewApi")
   public View onCreateView(
       LayoutInflater layoutInflater, @Nullable ViewGroup viewGroup, @Nullable Bundle bundle) {
     View view = layoutInflater.inflate(R.layout.audioroute_selector, viewGroup, false);
     CallAudioState audioState = getArguments().getParcelable(ARG_AUDIO_STATE);
 
-    initItem(
-        (TextView) view.findViewById(R.id.audioroute_bluetooth),
-        CallAudioState.ROUTE_BLUETOOTH,
-        audioState);
+    if (BuildCompat.isAtLeastP()) {
+      // Create items for all connected Bluetooth devices
+      Collection<BluetoothDevice> bluetoothDeviceSet = audioState.getSupportedBluetoothDevices();
+      for (BluetoothDevice device : bluetoothDeviceSet) {
+        boolean selected =
+            (audioState.getRoute() == CallAudioState.ROUTE_BLUETOOTH)
+                && (bluetoothDeviceSet.size() == 1
+                    || device.equals(audioState.getActiveBluetoothDevice()));
+        TextView textView = createBluetoothItem(device, selected);
+        ((LinearLayout) view).addView(textView, 0);
+      }
+    } else {
+      // Only create Bluetooth audio route
+      TextView textView =
+          (TextView) getLayoutInflater().inflate(R.layout.audioroute_item, null, false);
+      textView.setText(getString(R.string.audioroute_bluetooth));
+      initItem(
+          textView,
+          CallAudioState.ROUTE_BLUETOOTH,
+          audioState,
+          DialerImpression.Type.IN_CALL_SWITCH_AUDIO_ROUTE_BLUETOOTH);
+      ((LinearLayout) view).addView(textView, 0);
+    }
+
     initItem(
         (TextView) view.findViewById(R.id.audioroute_speaker),
         CallAudioState.ROUTE_SPEAKER,
-        audioState);
+        audioState,
+        DialerImpression.Type.IN_CALL_SWITCH_AUDIO_ROUTE_SPEAKER);
     initItem(
         (TextView) view.findViewById(R.id.audioroute_headset),
         CallAudioState.ROUTE_WIRED_HEADSET,
-        audioState);
+        audioState,
+        DialerImpression.Type.IN_CALL_SWITCH_AUDIO_ROUTE_WIRED_HEADSET);
     initItem(
         (TextView) view.findViewById(R.id.audioroute_earpiece),
         CallAudioState.ROUTE_EARPIECE,
-        audioState);
+        audioState,
+        DialerImpression.Type.IN_CALL_SWITCH_AUDIO_ROUTE_EARPIECE);
 
     // TODO(a bug): set peak height correctly to fully expand it in landscape mode.
     return view;
@@ -104,21 +150,80 @@
         .onAudioRouteSelectorDismiss();
   }
 
-  private void initItem(TextView item, final int itemRoute, CallAudioState audioState) {
-    int selectedColor = getResources().getColor(R.color.dialer_theme_color);
+  private void initItem(
+      TextView item,
+      final int itemRoute,
+      CallAudioState audioState,
+      DialerImpression.Type impressionType) {
+    int selectedColor = ThemeComponent.get(getContext()).theme().getColorPrimary();
     if ((audioState.getSupportedRouteMask() & itemRoute) == 0) {
       item.setVisibility(View.GONE);
     } else if (audioState.getRoute() == itemRoute) {
+      item.setSelected(true);
       item.setTextColor(selectedColor);
       item.setCompoundDrawableTintList(ColorStateList.valueOf(selectedColor));
       item.setCompoundDrawableTintMode(Mode.SRC_ATOP);
     }
     item.setOnClickListener(
         (v) -> {
-          dismiss();
+          logCallAudioRouteImpression(impressionType);
           FragmentUtils.getParentUnsafe(
                   AudioRouteSelectorDialogFragment.this, AudioRouteSelectorPresenter.class)
               .onAudioRouteSelected(itemRoute);
+          dismiss();
         });
   }
+
+  private TextView createBluetoothItem(BluetoothDevice bluetoothDevice, boolean selected) {
+    int selectedColor = ThemeComponent.get(getContext()).theme().getColorPrimary();
+    TextView textView =
+        (TextView) getLayoutInflater().inflate(R.layout.audioroute_item, null, false);
+    textView.setText(getAliasName(bluetoothDevice));
+    if (selected) {
+      textView.setSelected(true);
+      textView.setTextColor(selectedColor);
+      textView.setCompoundDrawableTintList(ColorStateList.valueOf(selectedColor));
+      textView.setCompoundDrawableTintMode(Mode.SRC_ATOP);
+    }
+    textView.setOnClickListener(
+        (v) -> {
+          logCallAudioRouteImpression(DialerImpression.Type.IN_CALL_SWITCH_AUDIO_ROUTE_BLUETOOTH);
+          // Set Bluetooth audio route
+          FragmentUtils.getParentUnsafe(
+                  AudioRouteSelectorDialogFragment.this, AudioRouteSelectorPresenter.class)
+              .onAudioRouteSelected(CallAudioState.ROUTE_BLUETOOTH);
+          // Set active Bluetooth device
+          TelecomAdapter.getInstance().requestBluetoothAudio(bluetoothDevice);
+          dismiss();
+        });
+
+    return textView;
+  }
+
+  @SuppressLint("PrivateApi")
+  private String getAliasName(BluetoothDevice bluetoothDevice) {
+    try {
+      Method getActiveDeviceMethod = bluetoothDevice.getClass().getDeclaredMethod("getAliasName");
+      getActiveDeviceMethod.setAccessible(true);
+      return (String) getActiveDeviceMethod.invoke(bluetoothDevice);
+    } catch (NoSuchMethodException | InvocationTargetException | IllegalAccessException e) {
+      e.printStackTrace();
+      return bluetoothDevice.getName();
+    }
+  }
+
+  private void logCallAudioRouteImpression(DialerImpression.Type impressionType) {
+    DialerCall dialerCall = CallList.getInstance().getOutgoingCall();
+    if (dialerCall == null) {
+      dialerCall = CallList.getInstance().getActiveOrBackgroundCall();
+    }
+
+    if (dialerCall != null) {
+      Logger.get(getContext())
+          .logCallImpression(
+              impressionType, dialerCall.getUniqueCallId(), dialerCall.getTimeAddedMs());
+    } else {
+      Logger.get(getContext()).logImpression(impressionType);
+    }
+  }
 }
diff --git a/java/com/android/incallui/audioroute/res/layout/audioroute_item.xml b/java/com/android/incallui/audioroute/res/layout/audioroute_item.xml
new file mode 100644
index 0000000..844baa4
--- /dev/null
+++ b/java/com/android/incallui/audioroute/res/layout/audioroute_item.xml
@@ -0,0 +1,22 @@
+<!--
+~ Copyright (C) 2018 The Android Open Source Project
+~
+~ Licensed under the Apache License, Version 2.0 (the "License");
+~ you may not use this file except in compliance with the License.
+~ You may obtain a copy of the License at
+~
+~      http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" BASIS,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License
+-->
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    style="@style/AudioRouteItem"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:drawableStart="@drawable/quantum_ic_bluetooth_audio_vd_theme_24"
+    android:gravity="start"
+    android:textAlignment="viewStart"/>
\ No newline at end of file
diff --git a/java/com/android/incallui/audioroute/res/layout/audioroute_selector.xml b/java/com/android/incallui/audioroute/res/layout/audioroute_selector.xml
index ef2220e..b63f387 100644
--- a/java/com/android/incallui/audioroute/res/layout/audioroute_selector.xml
+++ b/java/com/android/incallui/audioroute/res/layout/audioroute_selector.xml
@@ -1,37 +1,47 @@
-<?xml version="1.0" encoding="utf-8"?>
+<!--
+~ Copyright (C) 2018 The Android Open Source Project
+~
+~ Licensed under the Apache License, Version 2.0 (the "License");
+~ you may not use this file except in compliance with the License.
+~ You may obtain a copy of the License at
+~
+~      http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" BASIS,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License
+-->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:tools="http://schemas.android.com/tools"
-  android:layout_width="match_parent"
-  android:layout_height="wrap_content"
-  android:orientation="vertical"
-  tools:layout_gravity="bottom">
-  <TextView
-    android:id="@+id/audioroute_bluetooth"
-    style="@style/AudioRouteItem"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:drawableStart="@drawable/quantum_ic_bluetooth_audio_grey600_24"
-    android:text="@string/audioroute_bluetooth"/>
+    android:orientation="vertical"
+    tools:layout_gravity="bottom">
   <TextView
-    android:id="@+id/audioroute_speaker"
-    style="@style/AudioRouteItem"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:drawableStart="@drawable/quantum_ic_volume_up_grey600_24"
-    android:text="@string/audioroute_speaker"/>
+      android:id="@+id/audioroute_speaker"
+      style="@style/AudioRouteItem"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:drawableStart="@drawable/quantum_ic_volume_up_grey600_24"
+      android:text="@string/audioroute_speaker"
+      android:textAlignment="viewStart"/>
   <TextView
-    android:id="@+id/audioroute_earpiece"
-    style="@style/AudioRouteItem"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:drawableStart="@drawable/ic_phone_audio_grey600_24dp"
-    android:text="@string/audioroute_phone"/>
+      android:id="@+id/audioroute_earpiece"
+      style="@style/AudioRouteItem"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:drawableStart="@drawable/ic_phone_audio_grey600_24dp"
+      android:text="@string/audioroute_phone"
+      android:textAlignment="viewStart"/>
   <TextView
-    android:id="@+id/audioroute_headset"
-    style="@style/AudioRouteItem"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:drawableStart="@drawable/quantum_ic_headset_grey600_24"
-    android:text="@string/audioroute_headset"/>
+      android:id="@+id/audioroute_headset"
+      style="@style/AudioRouteItem"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:drawableStart="@drawable/quantum_ic_headset_grey600_24"
+      android:text="@string/audioroute_headset"
+      android:textAlignment="viewStart"/>
 
 </LinearLayout>
diff --git a/java/com/android/incallui/audioroute/res/values-af/strings.xml b/java/com/android/incallui/audioroute/res/values-af/strings.xml
index 56b1306..1b41ad1 100644
--- a/java/com/android/incallui/audioroute/res/values-af/strings.xml
+++ b/java/com/android/incallui/audioroute/res/values-af/strings.xml
@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="audioroute_bluetooth" msgid="3426527851663711141">"Bluetooth"</string>
-    <string name="audioroute_speaker" msgid="3269659224838962927">"Spreker"</string>
-    <string name="audioroute_phone" msgid="4006113852056568310">"Foon"</string>
-    <string name="audioroute_headset" msgid="3911496379650036544">"Bedraade kopstuk"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="audioroute_bluetooth">Bluetooth</string>
+  <string name="audioroute_speaker">Spreker</string>
+  <string name="audioroute_phone">Foon</string>
+  <string name="audioroute_headset">Bedraade kopstuk</string>
 </resources>
diff --git a/java/com/android/incallui/audioroute/res/values-am/strings.xml b/java/com/android/incallui/audioroute/res/values-am/strings.xml
index 0550089..32bc097 100644
--- a/java/com/android/incallui/audioroute/res/values-am/strings.xml
+++ b/java/com/android/incallui/audioroute/res/values-am/strings.xml
@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="audioroute_bluetooth" msgid="3426527851663711141">"ብሉቱዝ"</string>
-    <string name="audioroute_speaker" msgid="3269659224838962927">"ድምፅ ማጉያ"</string>
-    <string name="audioroute_phone" msgid="4006113852056568310">"ስልክ"</string>
-    <string name="audioroute_headset" msgid="3911496379650036544">"ባለ ገመድ ማዳመጫ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="audioroute_bluetooth">ብሉቱዝ</string>
+  <string name="audioroute_speaker">ድምፅ ማጉያ</string>
+  <string name="audioroute_phone">ስልክ</string>
+  <string name="audioroute_headset">ባለ ገመድ ማዳመጫ</string>
 </resources>
diff --git a/java/com/android/incallui/audioroute/res/values-ar/strings.xml b/java/com/android/incallui/audioroute/res/values-ar/strings.xml
index 5765a17..1817227 100644
--- a/java/com/android/incallui/audioroute/res/values-ar/strings.xml
+++ b/java/com/android/incallui/audioroute/res/values-ar/strings.xml
@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="audioroute_bluetooth" msgid="3426527851663711141">"بلوتوث"</string>
-    <string name="audioroute_speaker" msgid="3269659224838962927">"السماعة"</string>
-    <string name="audioroute_phone" msgid="4006113852056568310">"هاتف"</string>
-    <string name="audioroute_headset" msgid="3911496379650036544">"سماعة رأس سلكية"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="audioroute_bluetooth">بلوتوث</string>
+  <string name="audioroute_speaker">السماعة</string>
+  <string name="audioroute_phone">هاتف</string>
+  <string name="audioroute_headset">سماعة رأس سلكية</string>
 </resources>
diff --git a/java/com/android/incallui/audioroute/res/values-az/strings.xml b/java/com/android/incallui/audioroute/res/values-az/strings.xml
index a20473a..23efce8 100644
--- a/java/com/android/incallui/audioroute/res/values-az/strings.xml
+++ b/java/com/android/incallui/audioroute/res/values-az/strings.xml
@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="audioroute_bluetooth" msgid="3426527851663711141">"Bluetooth"</string>
-    <string name="audioroute_speaker" msgid="3269659224838962927">"Dinamik"</string>
-    <string name="audioroute_phone" msgid="4006113852056568310">"Telefon"</string>
-    <string name="audioroute_headset" msgid="3911496379650036544">"Simli qulaqlıq"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="audioroute_bluetooth">Bluetooth</string>
+  <string name="audioroute_speaker">Dinamik</string>
+  <string name="audioroute_phone">Telefon</string>
+  <string name="audioroute_headset">Simli qulaqlıq</string>
 </resources>
diff --git a/java/com/android/incallui/audioroute/res/values-b+sr+Latn/strings.xml b/java/com/android/incallui/audioroute/res/values-b+sr+Latn/strings.xml
index 0df469f..d4f8fd2 100644
--- a/java/com/android/incallui/audioroute/res/values-b+sr+Latn/strings.xml
+++ b/java/com/android/incallui/audioroute/res/values-b+sr+Latn/strings.xml
@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="audioroute_bluetooth" msgid="3426527851663711141">"Bluetooth"</string>
-    <string name="audioroute_speaker" msgid="3269659224838962927">"Zvučnik"</string>
-    <string name="audioroute_phone" msgid="4006113852056568310">"Telefon"</string>
-    <string name="audioroute_headset" msgid="3911496379650036544">"Žičane slušalice"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="audioroute_bluetooth">Bluetooth</string>
+  <string name="audioroute_speaker">Zvučnik</string>
+  <string name="audioroute_phone">Telefon</string>
+  <string name="audioroute_headset">Žičane slušalice</string>
 </resources>
diff --git a/java/com/android/incallui/audioroute/res/values-be/strings.xml b/java/com/android/incallui/audioroute/res/values-be/strings.xml
index 9fc205a..494267d 100644
--- a/java/com/android/incallui/audioroute/res/values-be/strings.xml
+++ b/java/com/android/incallui/audioroute/res/values-be/strings.xml
@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="audioroute_bluetooth" msgid="3426527851663711141">"Bluetooth"</string>
-    <string name="audioroute_speaker" msgid="3269659224838962927">"Дынамік"</string>
-    <string name="audioroute_phone" msgid="4006113852056568310">"Тэлефон"</string>
-    <string name="audioroute_headset" msgid="3911496379650036544">"Правадная гарнітура"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="audioroute_bluetooth">Bluetooth</string>
+  <string name="audioroute_speaker">Дынамік</string>
+  <string name="audioroute_phone">Тэлефон</string>
+  <string name="audioroute_headset">Правадная гарнітура</string>
 </resources>
diff --git a/java/com/android/incallui/audioroute/res/values-bg/strings.xml b/java/com/android/incallui/audioroute/res/values-bg/strings.xml
index 0cd8b4b..3b98a1e 100644
--- a/java/com/android/incallui/audioroute/res/values-bg/strings.xml
+++ b/java/com/android/incallui/audioroute/res/values-bg/strings.xml
@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="audioroute_bluetooth" msgid="3426527851663711141">"Bluetooth"</string>
-    <string name="audioroute_speaker" msgid="3269659224838962927">"Високоговорител"</string>
-    <string name="audioroute_phone" msgid="4006113852056568310">"Телефон"</string>
-    <string name="audioroute_headset" msgid="3911496379650036544">"Слушалки с кабел"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="audioroute_bluetooth">Bluetooth</string>
+  <string name="audioroute_speaker">Високоговорител</string>
+  <string name="audioroute_phone">Телефон</string>
+  <string name="audioroute_headset">Слушалки с кабел</string>
 </resources>
diff --git a/java/com/android/incallui/audioroute/res/values-bn/strings.xml b/java/com/android/incallui/audioroute/res/values-bn/strings.xml
index e0b455f..3f69d9b 100644
--- a/java/com/android/incallui/audioroute/res/values-bn/strings.xml
+++ b/java/com/android/incallui/audioroute/res/values-bn/strings.xml
@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="audioroute_bluetooth" msgid="3426527851663711141">"ব্লুটুথ"</string>
-    <string name="audioroute_speaker" msgid="3269659224838962927">"স্পিকার"</string>
-    <string name="audioroute_phone" msgid="4006113852056568310">"ফোন"</string>
-    <string name="audioroute_headset" msgid="3911496379650036544">"তারযুক্ত হেডসেট"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="audioroute_bluetooth">ব্লুটুথ</string>
+  <string name="audioroute_speaker">স্পিকার</string>
+  <string name="audioroute_phone">ফোন</string>
+  <string name="audioroute_headset">তারযুক্ত হেডসেট</string>
 </resources>
diff --git a/java/com/android/incallui/audioroute/res/values-bs/strings.xml b/java/com/android/incallui/audioroute/res/values-bs/strings.xml
index 0df469f..d4f8fd2 100644
--- a/java/com/android/incallui/audioroute/res/values-bs/strings.xml
+++ b/java/com/android/incallui/audioroute/res/values-bs/strings.xml
@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="audioroute_bluetooth" msgid="3426527851663711141">"Bluetooth"</string>
-    <string name="audioroute_speaker" msgid="3269659224838962927">"Zvučnik"</string>
-    <string name="audioroute_phone" msgid="4006113852056568310">"Telefon"</string>
-    <string name="audioroute_headset" msgid="3911496379650036544">"Žičane slušalice"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="audioroute_bluetooth">Bluetooth</string>
+  <string name="audioroute_speaker">Zvučnik</string>
+  <string name="audioroute_phone">Telefon</string>
+  <string name="audioroute_headset">Žičane slušalice</string>
 </resources>
diff --git a/java/com/android/incallui/audioroute/res/values-ca/strings.xml b/java/com/android/incallui/audioroute/res/values-ca/strings.xml
index c3defc2..479b5cb 100644
--- a/java/com/android/incallui/audioroute/res/values-ca/strings.xml
+++ b/java/com/android/incallui/audioroute/res/values-ca/strings.xml
@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="audioroute_bluetooth" msgid="3426527851663711141">"Bluetooth"</string>
-    <string name="audioroute_speaker" msgid="3269659224838962927">"Altaveu"</string>
-    <string name="audioroute_phone" msgid="4006113852056568310">"Telèfon"</string>
-    <string name="audioroute_headset" msgid="3911496379650036544">"Auriculars amb cable"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="audioroute_bluetooth">Bluetooth</string>
+  <string name="audioroute_speaker">Altaveu</string>
+  <string name="audioroute_phone">Telèfon</string>
+  <string name="audioroute_headset">Auriculars amb cable</string>
 </resources>
diff --git a/java/com/android/incallui/audioroute/res/values-cs/strings.xml b/java/com/android/incallui/audioroute/res/values-cs/strings.xml
index 1a42945..ca5d1d0 100644
--- a/java/com/android/incallui/audioroute/res/values-cs/strings.xml
+++ b/java/com/android/incallui/audioroute/res/values-cs/strings.xml
@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="audioroute_bluetooth" msgid="3426527851663711141">"Bluetooth"</string>
-    <string name="audioroute_speaker" msgid="3269659224838962927">"Reproduktor"</string>
-    <string name="audioroute_phone" msgid="4006113852056568310">"Telefon"</string>
-    <string name="audioroute_headset" msgid="3911496379650036544">"Drátová náhlavní souprava"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="audioroute_bluetooth">Bluetooth</string>
+  <string name="audioroute_speaker">Reproduktor</string>
+  <string name="audioroute_phone">Telefon</string>
+  <string name="audioroute_headset">Drátová sluchátka</string>
 </resources>
diff --git a/java/com/android/incallui/audioroute/res/values-da/strings.xml b/java/com/android/incallui/audioroute/res/values-da/strings.xml
index 7afc000..68f8dbc 100644
--- a/java/com/android/incallui/audioroute/res/values-da/strings.xml
+++ b/java/com/android/incallui/audioroute/res/values-da/strings.xml
@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="audioroute_bluetooth" msgid="3426527851663711141">"Bluetooth"</string>
-    <string name="audioroute_speaker" msgid="3269659224838962927">"Højttaler"</string>
-    <string name="audioroute_phone" msgid="4006113852056568310">"Telefon"</string>
-    <string name="audioroute_headset" msgid="3911496379650036544">"Headset med ledning"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="audioroute_bluetooth">Bluetooth</string>
+  <string name="audioroute_speaker">Højttaler</string>
+  <string name="audioroute_phone">Telefon</string>
+  <string name="audioroute_headset">Headset med ledning</string>
 </resources>
diff --git a/java/com/android/incallui/audioroute/res/values-de/strings.xml b/java/com/android/incallui/audioroute/res/values-de/strings.xml
index 1e3e98c..bfbed56 100644
--- a/java/com/android/incallui/audioroute/res/values-de/strings.xml
+++ b/java/com/android/incallui/audioroute/res/values-de/strings.xml
@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="audioroute_bluetooth" msgid="3426527851663711141">"Bluetooth"</string>
-    <string name="audioroute_speaker" msgid="3269659224838962927">"Lautsprecher"</string>
-    <string name="audioroute_phone" msgid="4006113852056568310">"Telefon"</string>
-    <string name="audioroute_headset" msgid="3911496379650036544">"Kabelgebundenes Headset"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="audioroute_bluetooth">Bluetooth</string>
+  <string name="audioroute_speaker">Lautsprecher</string>
+  <string name="audioroute_phone">Telefon</string>
+  <string name="audioroute_headset">Kabelgebundenes Headset</string>
 </resources>
diff --git a/java/com/android/incallui/audioroute/res/values-el/strings.xml b/java/com/android/incallui/audioroute/res/values-el/strings.xml
index 7fac9e2..7798def 100644
--- a/java/com/android/incallui/audioroute/res/values-el/strings.xml
+++ b/java/com/android/incallui/audioroute/res/values-el/strings.xml
@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="audioroute_bluetooth" msgid="3426527851663711141">"Bluetooth"</string>
-    <string name="audioroute_speaker" msgid="3269659224838962927">"Ηχείο"</string>
-    <string name="audioroute_phone" msgid="4006113852056568310">"Τηλέφωνο"</string>
-    <string name="audioroute_headset" msgid="3911496379650036544">"Ενσύρματα ακουστικά"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="audioroute_bluetooth">Bluetooth</string>
+  <string name="audioroute_speaker">Ηχείο</string>
+  <string name="audioroute_phone">Τηλέφωνο</string>
+  <string name="audioroute_headset">Ενσύρματα ακουστικά</string>
 </resources>
diff --git a/java/com/android/incallui/audioroute/res/values-en-rAU/strings.xml b/java/com/android/incallui/audioroute/res/values-en-rAU/strings.xml
index dff9a01..b166393 100644
--- a/java/com/android/incallui/audioroute/res/values-en-rAU/strings.xml
+++ b/java/com/android/incallui/audioroute/res/values-en-rAU/strings.xml
@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="audioroute_bluetooth" msgid="3426527851663711141">"Bluetooth"</string>
-    <string name="audioroute_speaker" msgid="3269659224838962927">"Speaker"</string>
-    <string name="audioroute_phone" msgid="4006113852056568310">"Phone"</string>
-    <string name="audioroute_headset" msgid="3911496379650036544">"Wired headset"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="audioroute_bluetooth">Bluetooth</string>
+  <string name="audioroute_speaker">Speaker</string>
+  <string name="audioroute_phone">Phone</string>
+  <string name="audioroute_headset">Wired headset</string>
 </resources>
diff --git a/java/com/android/incallui/audioroute/res/values-en-rGB/strings.xml b/java/com/android/incallui/audioroute/res/values-en-rGB/strings.xml
index dff9a01..b166393 100644
--- a/java/com/android/incallui/audioroute/res/values-en-rGB/strings.xml
+++ b/java/com/android/incallui/audioroute/res/values-en-rGB/strings.xml
@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="audioroute_bluetooth" msgid="3426527851663711141">"Bluetooth"</string>
-    <string name="audioroute_speaker" msgid="3269659224838962927">"Speaker"</string>
-    <string name="audioroute_phone" msgid="4006113852056568310">"Phone"</string>
-    <string name="audioroute_headset" msgid="3911496379650036544">"Wired headset"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="audioroute_bluetooth">Bluetooth</string>
+  <string name="audioroute_speaker">Speaker</string>
+  <string name="audioroute_phone">Phone</string>
+  <string name="audioroute_headset">Wired headset</string>
 </resources>
diff --git a/java/com/android/incallui/audioroute/res/values-en-rIN/strings.xml b/java/com/android/incallui/audioroute/res/values-en-rIN/strings.xml
index dff9a01..b166393 100644
--- a/java/com/android/incallui/audioroute/res/values-en-rIN/strings.xml
+++ b/java/com/android/incallui/audioroute/res/values-en-rIN/strings.xml
@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="audioroute_bluetooth" msgid="3426527851663711141">"Bluetooth"</string>
-    <string name="audioroute_speaker" msgid="3269659224838962927">"Speaker"</string>
-    <string name="audioroute_phone" msgid="4006113852056568310">"Phone"</string>
-    <string name="audioroute_headset" msgid="3911496379650036544">"Wired headset"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="audioroute_bluetooth">Bluetooth</string>
+  <string name="audioroute_speaker">Speaker</string>
+  <string name="audioroute_phone">Phone</string>
+  <string name="audioroute_headset">Wired headset</string>
 </resources>
diff --git a/java/com/android/incallui/audioroute/res/values-es-rUS/strings.xml b/java/com/android/incallui/audioroute/res/values-es-rUS/strings.xml
index 0caf282..10208bd 100644
--- a/java/com/android/incallui/audioroute/res/values-es-rUS/strings.xml
+++ b/java/com/android/incallui/audioroute/res/values-es-rUS/strings.xml
@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="audioroute_bluetooth" msgid="3426527851663711141">"Bluetooth"</string>
-    <string name="audioroute_speaker" msgid="3269659224838962927">"Altavoz"</string>
-    <string name="audioroute_phone" msgid="4006113852056568310">"Teléfono"</string>
-    <string name="audioroute_headset" msgid="3911496379650036544">"Auriculares con cable"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="audioroute_bluetooth">Bluetooth</string>
+  <string name="audioroute_speaker">Altavoz</string>
+  <string name="audioroute_phone">Teléfono</string>
+  <string name="audioroute_headset">Auriculares con cable</string>
 </resources>
diff --git a/java/com/android/incallui/audioroute/res/values-es/strings.xml b/java/com/android/incallui/audioroute/res/values-es/strings.xml
index 0caf282..10208bd 100644
--- a/java/com/android/incallui/audioroute/res/values-es/strings.xml
+++ b/java/com/android/incallui/audioroute/res/values-es/strings.xml
@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="audioroute_bluetooth" msgid="3426527851663711141">"Bluetooth"</string>
-    <string name="audioroute_speaker" msgid="3269659224838962927">"Altavoz"</string>
-    <string name="audioroute_phone" msgid="4006113852056568310">"Teléfono"</string>
-    <string name="audioroute_headset" msgid="3911496379650036544">"Auriculares con cable"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="audioroute_bluetooth">Bluetooth</string>
+  <string name="audioroute_speaker">Altavoz</string>
+  <string name="audioroute_phone">Teléfono</string>
+  <string name="audioroute_headset">Auriculares con cable</string>
 </resources>
diff --git a/java/com/android/incallui/audioroute/res/values-et/strings.xml b/java/com/android/incallui/audioroute/res/values-et/strings.xml
index f391ee4..f80986e 100644
--- a/java/com/android/incallui/audioroute/res/values-et/strings.xml
+++ b/java/com/android/incallui/audioroute/res/values-et/strings.xml
@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="audioroute_bluetooth" msgid="3426527851663711141">"Bluetooth"</string>
-    <string name="audioroute_speaker" msgid="3269659224838962927">"Kõlar"</string>
-    <string name="audioroute_phone" msgid="4006113852056568310">"Telefon"</string>
-    <string name="audioroute_headset" msgid="3911496379650036544">"Juhtmega peakomplekt"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="audioroute_bluetooth">Bluetooth</string>
+  <string name="audioroute_speaker">Kõlar</string>
+  <string name="audioroute_phone">Telefon</string>
+  <string name="audioroute_headset">Juhtmega peakomplekt</string>
 </resources>
diff --git a/java/com/android/incallui/audioroute/res/values-eu/strings.xml b/java/com/android/incallui/audioroute/res/values-eu/strings.xml
index 7df954e..459c34f 100644
--- a/java/com/android/incallui/audioroute/res/values-eu/strings.xml
+++ b/java/com/android/incallui/audioroute/res/values-eu/strings.xml
@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="audioroute_bluetooth" msgid="3426527851663711141">"Bluetooth-a"</string>
-    <string name="audioroute_speaker" msgid="3269659224838962927">"Bozgorailua"</string>
-    <string name="audioroute_phone" msgid="4006113852056568310">"Telefonoa"</string>
-    <string name="audioroute_headset" msgid="3911496379650036544">"Kabledun entzungailua"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="audioroute_bluetooth">Bluetooth-a</string>
+  <string name="audioroute_speaker">Bozgorailua</string>
+  <string name="audioroute_phone">Telefonoa</string>
+  <string name="audioroute_headset">Kabledun entzungailua</string>
 </resources>
diff --git a/java/com/android/incallui/audioroute/res/values-fa/strings.xml b/java/com/android/incallui/audioroute/res/values-fa/strings.xml
index 25c9c4e..c26e5a5 100644
--- a/java/com/android/incallui/audioroute/res/values-fa/strings.xml
+++ b/java/com/android/incallui/audioroute/res/values-fa/strings.xml
@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="audioroute_bluetooth" msgid="3426527851663711141">"Bluetooth"</string>
-    <string name="audioroute_speaker" msgid="3269659224838962927">"بلندگو"</string>
-    <string name="audioroute_phone" msgid="4006113852056568310">"تلفن"</string>
-    <string name="audioroute_headset" msgid="3911496379650036544">"هدست سیم‌دار"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="audioroute_bluetooth">Bluetooth</string>
+  <string name="audioroute_speaker">بلندگو</string>
+  <string name="audioroute_phone">تلفن</string>
+  <string name="audioroute_headset">هدست سیم‌دار</string>
 </resources>
diff --git a/java/com/android/incallui/audioroute/res/values-fi/strings.xml b/java/com/android/incallui/audioroute/res/values-fi/strings.xml
index d6d40ab..c6bcd48 100644
--- a/java/com/android/incallui/audioroute/res/values-fi/strings.xml
+++ b/java/com/android/incallui/audioroute/res/values-fi/strings.xml
@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="audioroute_bluetooth" msgid="3426527851663711141">"Bluetooth"</string>
-    <string name="audioroute_speaker" msgid="3269659224838962927">"Kaiutin"</string>
-    <string name="audioroute_phone" msgid="4006113852056568310">"Puhelin"</string>
-    <string name="audioroute_headset" msgid="3911496379650036544">"Langalliset kuulokkeet"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="audioroute_bluetooth">Bluetooth</string>
+  <string name="audioroute_speaker">Kaiutin</string>
+  <string name="audioroute_phone">Puhelin</string>
+  <string name="audioroute_headset">Langalliset kuulokkeet</string>
 </resources>
diff --git a/java/com/android/incallui/audioroute/res/values-fr-rCA/strings.xml b/java/com/android/incallui/audioroute/res/values-fr-rCA/strings.xml
index 307f7cf..2749973 100644
--- a/java/com/android/incallui/audioroute/res/values-fr-rCA/strings.xml
+++ b/java/com/android/incallui/audioroute/res/values-fr-rCA/strings.xml
@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="audioroute_bluetooth" msgid="3426527851663711141">"Bluetooth"</string>
-    <string name="audioroute_speaker" msgid="3269659224838962927">"Haut-parleur"</string>
-    <string name="audioroute_phone" msgid="4006113852056568310">"Téléphone"</string>
-    <string name="audioroute_headset" msgid="3911496379650036544">"Casque filaire"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="audioroute_bluetooth">Bluetooth</string>
+  <string name="audioroute_speaker">Haut-parleur</string>
+  <string name="audioroute_phone">Téléphone</string>
+  <string name="audioroute_headset">Casque filaire</string>
 </resources>
diff --git a/java/com/android/incallui/audioroute/res/values-fr/strings.xml b/java/com/android/incallui/audioroute/res/values-fr/strings.xml
index de3f450..54e5f7e 100644
--- a/java/com/android/incallui/audioroute/res/values-fr/strings.xml
+++ b/java/com/android/incallui/audioroute/res/values-fr/strings.xml
@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="audioroute_bluetooth" msgid="3426527851663711141">"Bluetooth"</string>
-    <string name="audioroute_speaker" msgid="3269659224838962927">"Haut-parleur"</string>
-    <string name="audioroute_phone" msgid="4006113852056568310">"Téléphone"</string>
-    <string name="audioroute_headset" msgid="3911496379650036544">"Écouteurs filaires"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="audioroute_bluetooth">Bluetooth</string>
+  <string name="audioroute_speaker">Haut-parleur</string>
+  <string name="audioroute_phone">Téléphone</string>
+  <string name="audioroute_headset">Écouteurs filaires</string>
 </resources>
diff --git a/java/com/android/incallui/audioroute/res/values-gl/strings.xml b/java/com/android/incallui/audioroute/res/values-gl/strings.xml
index 120d9dc..7dfd732 100644
--- a/java/com/android/incallui/audioroute/res/values-gl/strings.xml
+++ b/java/com/android/incallui/audioroute/res/values-gl/strings.xml
@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="audioroute_bluetooth" msgid="3426527851663711141">"Bluetooth"</string>
-    <string name="audioroute_speaker" msgid="3269659224838962927">"Altofalante"</string>
-    <string name="audioroute_phone" msgid="4006113852056568310">"Teléfono"</string>
-    <string name="audioroute_headset" msgid="3911496379650036544">"Auriculares con cable"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="audioroute_bluetooth">Bluetooth</string>
+  <string name="audioroute_speaker">Altofalante</string>
+  <string name="audioroute_phone">Teléfono</string>
+  <string name="audioroute_headset">Auriculares con cable</string>
 </resources>
diff --git a/java/com/android/incallui/audioroute/res/values-gu/strings.xml b/java/com/android/incallui/audioroute/res/values-gu/strings.xml
index b6ed4fd..2b4b77c 100644
--- a/java/com/android/incallui/audioroute/res/values-gu/strings.xml
+++ b/java/com/android/incallui/audioroute/res/values-gu/strings.xml
@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="audioroute_bluetooth" msgid="3426527851663711141">"Bluetooth"</string>
-    <string name="audioroute_speaker" msgid="3269659224838962927">"સ્પીકર્સ"</string>
-    <string name="audioroute_phone" msgid="4006113852056568310">"ફોન"</string>
-    <string name="audioroute_headset" msgid="3911496379650036544">"વાયર્ડ હેડસેટ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="audioroute_bluetooth">Bluetooth</string>
+  <string name="audioroute_speaker">સ્પીકર્સ</string>
+  <string name="audioroute_phone">ફોન</string>
+  <string name="audioroute_headset">વાયર્ડ હેડસેટ</string>
 </resources>
diff --git a/java/com/android/incallui/audioroute/res/values-hi/strings.xml b/java/com/android/incallui/audioroute/res/values-hi/strings.xml
index 0622a95..f98d0aa 100644
--- a/java/com/android/incallui/audioroute/res/values-hi/strings.xml
+++ b/java/com/android/incallui/audioroute/res/values-hi/strings.xml
@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="audioroute_bluetooth" msgid="3426527851663711141">"ब्लूटूथ"</string>
-    <string name="audioroute_speaker" msgid="3269659224838962927">"स्‍पीकर"</string>
-    <string name="audioroute_phone" msgid="4006113852056568310">"फ़ोन"</string>
-    <string name="audioroute_headset" msgid="3911496379650036544">"वायर वाला हेडसेट"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="audioroute_bluetooth">ब्लूटूथ</string>
+  <string name="audioroute_speaker">स्‍पीकर</string>
+  <string name="audioroute_phone">फ़ोन</string>
+  <string name="audioroute_headset">वायर वाला हेडसेट</string>
 </resources>
diff --git a/java/com/android/incallui/audioroute/res/values-hr/strings.xml b/java/com/android/incallui/audioroute/res/values-hr/strings.xml
index 0df469f..d4f8fd2 100644
--- a/java/com/android/incallui/audioroute/res/values-hr/strings.xml
+++ b/java/com/android/incallui/audioroute/res/values-hr/strings.xml
@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="audioroute_bluetooth" msgid="3426527851663711141">"Bluetooth"</string>
-    <string name="audioroute_speaker" msgid="3269659224838962927">"Zvučnik"</string>
-    <string name="audioroute_phone" msgid="4006113852056568310">"Telefon"</string>
-    <string name="audioroute_headset" msgid="3911496379650036544">"Žičane slušalice"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="audioroute_bluetooth">Bluetooth</string>
+  <string name="audioroute_speaker">Zvučnik</string>
+  <string name="audioroute_phone">Telefon</string>
+  <string name="audioroute_headset">Žičane slušalice</string>
 </resources>
diff --git a/java/com/android/incallui/audioroute/res/values-hu/strings.xml b/java/com/android/incallui/audioroute/res/values-hu/strings.xml
index f9123c9..b5bd19e 100644
--- a/java/com/android/incallui/audioroute/res/values-hu/strings.xml
+++ b/java/com/android/incallui/audioroute/res/values-hu/strings.xml
@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="audioroute_bluetooth" msgid="3426527851663711141">"Bluetooth"</string>
-    <string name="audioroute_speaker" msgid="3269659224838962927">"Hangszóró"</string>
-    <string name="audioroute_phone" msgid="4006113852056568310">"Telefon"</string>
-    <string name="audioroute_headset" msgid="3911496379650036544">"Vezetékes headset"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="audioroute_bluetooth">Bluetooth</string>
+  <string name="audioroute_speaker">Hangszóró</string>
+  <string name="audioroute_phone">Telefon</string>
+  <string name="audioroute_headset">Vezetékes headset</string>
 </resources>
diff --git a/java/com/android/incallui/audioroute/res/values-hy/strings.xml b/java/com/android/incallui/audioroute/res/values-hy/strings.xml
index 47590cb..d1a875e 100644
--- a/java/com/android/incallui/audioroute/res/values-hy/strings.xml
+++ b/java/com/android/incallui/audioroute/res/values-hy/strings.xml
@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="audioroute_bluetooth" msgid="3426527851663711141">"Bluetooth"</string>
-    <string name="audioroute_speaker" msgid="3269659224838962927">"Բարձրախոս"</string>
-    <string name="audioroute_phone" msgid="4006113852056568310">"Հեռախոս"</string>
-    <string name="audioroute_headset" msgid="3911496379650036544">"Լարային ականջակալ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="audioroute_bluetooth">Bluetooth</string>
+  <string name="audioroute_speaker">Բարձրախոս</string>
+  <string name="audioroute_phone">Հեռախոս</string>
+  <string name="audioroute_headset">Լարային ականջակալ</string>
 </resources>
diff --git a/java/com/android/incallui/audioroute/res/values-in/strings.xml b/java/com/android/incallui/audioroute/res/values-in/strings.xml
index ff66562..3e19afd 100644
--- a/java/com/android/incallui/audioroute/res/values-in/strings.xml
+++ b/java/com/android/incallui/audioroute/res/values-in/strings.xml
@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="audioroute_bluetooth" msgid="3426527851663711141">"Bluetooth"</string>
-    <string name="audioroute_speaker" msgid="3269659224838962927">"Speaker"</string>
-    <string name="audioroute_phone" msgid="4006113852056568310">"Telepon"</string>
-    <string name="audioroute_headset" msgid="3911496379650036544">"Headset berkabel"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="audioroute_bluetooth">Bluetooth</string>
+  <string name="audioroute_speaker">Speaker</string>
+  <string name="audioroute_phone">Telepon</string>
+  <string name="audioroute_headset">Headset berkabel</string>
 </resources>
diff --git a/java/com/android/incallui/audioroute/res/values-is/strings.xml b/java/com/android/incallui/audioroute/res/values-is/strings.xml
index 4d3fec9..33ea0f3 100644
--- a/java/com/android/incallui/audioroute/res/values-is/strings.xml
+++ b/java/com/android/incallui/audioroute/res/values-is/strings.xml
@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="audioroute_bluetooth" msgid="3426527851663711141">"Bluetooth"</string>
-    <string name="audioroute_speaker" msgid="3269659224838962927">"Hátalari"</string>
-    <string name="audioroute_phone" msgid="4006113852056568310">"Sími"</string>
-    <string name="audioroute_headset" msgid="3911496379650036544">"Höfuðtól með snúru"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="audioroute_bluetooth">Bluetooth</string>
+  <string name="audioroute_speaker">Hátalari</string>
+  <string name="audioroute_phone">Sími</string>
+  <string name="audioroute_headset">Höfuðtól með snúru</string>
 </resources>
diff --git a/java/com/android/incallui/audioroute/res/values-it/strings.xml b/java/com/android/incallui/audioroute/res/values-it/strings.xml
index 217e410..4d35f5a 100644
--- a/java/com/android/incallui/audioroute/res/values-it/strings.xml
+++ b/java/com/android/incallui/audioroute/res/values-it/strings.xml
@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="audioroute_bluetooth" msgid="3426527851663711141">"Bluetooth"</string>
-    <string name="audioroute_speaker" msgid="3269659224838962927">"Altoparlante"</string>
-    <string name="audioroute_phone" msgid="4006113852056568310">"Telefono"</string>
-    <string name="audioroute_headset" msgid="3911496379650036544">"Auricolare con cavo"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="audioroute_bluetooth">Bluetooth</string>
+  <string name="audioroute_speaker">Altoparlante</string>
+  <string name="audioroute_phone">Telefono</string>
+  <string name="audioroute_headset">Auricolare con cavo</string>
 </resources>
diff --git a/java/com/android/incallui/audioroute/res/values-iw/strings.xml b/java/com/android/incallui/audioroute/res/values-iw/strings.xml
index ad0ddad..d2a5946 100644
--- a/java/com/android/incallui/audioroute/res/values-iw/strings.xml
+++ b/java/com/android/incallui/audioroute/res/values-iw/strings.xml
@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="audioroute_bluetooth" msgid="3426527851663711141">"Bluetooth"</string>
-    <string name="audioroute_speaker" msgid="3269659224838962927">"רמקול"</string>
-    <string name="audioroute_phone" msgid="4006113852056568310">"טלפון"</string>
-    <string name="audioroute_headset" msgid="3911496379650036544">"אוזניות עם חוט"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="audioroute_bluetooth">Bluetooth</string>
+  <string name="audioroute_speaker">רמקול</string>
+  <string name="audioroute_phone">טלפון</string>
+  <string name="audioroute_headset">אוזניות עם חוט</string>
 </resources>
diff --git a/java/com/android/incallui/audioroute/res/values-ja/strings.xml b/java/com/android/incallui/audioroute/res/values-ja/strings.xml
index da2f04b..c15cb0b 100644
--- a/java/com/android/incallui/audioroute/res/values-ja/strings.xml
+++ b/java/com/android/incallui/audioroute/res/values-ja/strings.xml
@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="audioroute_bluetooth" msgid="3426527851663711141">"Bluetooth"</string>
-    <string name="audioroute_speaker" msgid="3269659224838962927">"スピーカー"</string>
-    <string name="audioroute_phone" msgid="4006113852056568310">"電話"</string>
-    <string name="audioroute_headset" msgid="3911496379650036544">"有線ヘッドセット"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="audioroute_bluetooth">Bluetooth</string>
+  <string name="audioroute_speaker">スピーカー</string>
+  <string name="audioroute_phone">電話</string>
+  <string name="audioroute_headset">有線ヘッドセット</string>
 </resources>
diff --git a/java/com/android/incallui/audioroute/res/values-ka/strings.xml b/java/com/android/incallui/audioroute/res/values-ka/strings.xml
index aa72825..ac794be 100644
--- a/java/com/android/incallui/audioroute/res/values-ka/strings.xml
+++ b/java/com/android/incallui/audioroute/res/values-ka/strings.xml
@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="audioroute_bluetooth" msgid="3426527851663711141">"Bluetooth"</string>
-    <string name="audioroute_speaker" msgid="3269659224838962927">"სპიკერი"</string>
-    <string name="audioroute_phone" msgid="4006113852056568310">"ტელეფონი"</string>
-    <string name="audioroute_headset" msgid="3911496379650036544">"შნურიანი ყურსაცვამი"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="audioroute_bluetooth">Bluetooth</string>
+  <string name="audioroute_speaker">სპიკერი</string>
+  <string name="audioroute_phone">ტელეფონი</string>
+  <string name="audioroute_headset">შნურიანი ყურსაცვამი</string>
 </resources>
diff --git a/java/com/android/incallui/audioroute/res/values-kk/strings.xml b/java/com/android/incallui/audioroute/res/values-kk/strings.xml
index 2fdd5c2..a3db2ca 100644
--- a/java/com/android/incallui/audioroute/res/values-kk/strings.xml
+++ b/java/com/android/incallui/audioroute/res/values-kk/strings.xml
@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="audioroute_bluetooth" msgid="3426527851663711141">"Bluetooth"</string>
-    <string name="audioroute_speaker" msgid="3269659224838962927">"Динамик"</string>
-    <string name="audioroute_phone" msgid="4006113852056568310">"Телефон"</string>
-    <string name="audioroute_headset" msgid="3911496379650036544">"Сымды гарнитура"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="audioroute_bluetooth">Bluetooth</string>
+  <string name="audioroute_speaker">Динамик</string>
+  <string name="audioroute_phone">Телефон</string>
+  <string name="audioroute_headset">Сымды гарнитура</string>
 </resources>
diff --git a/java/com/android/incallui/audioroute/res/values-km/strings.xml b/java/com/android/incallui/audioroute/res/values-km/strings.xml
index 84cfb28..34d2e0e 100644
--- a/java/com/android/incallui/audioroute/res/values-km/strings.xml
+++ b/java/com/android/incallui/audioroute/res/values-km/strings.xml
@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="audioroute_bluetooth" msgid="3426527851663711141">"ប៊្លូធូស"</string>
-    <string name="audioroute_speaker" msgid="3269659224838962927">"ឧបករណ៍បំពងសម្លេង"</string>
-    <string name="audioroute_phone" msgid="4006113852056568310">"ទូរសព្ទ"</string>
-    <string name="audioroute_headset" msgid="3911496379650036544">"កាស​មាន​ខ្សែ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="audioroute_bluetooth">ប៊្លូធូស</string>
+  <string name="audioroute_speaker">ឧបករណ៍បំពងសម្លេង</string>
+  <string name="audioroute_phone">ទូរសព្ទ</string>
+  <string name="audioroute_headset">កាស​មាន​ខ្សែ</string>
 </resources>
diff --git a/java/com/android/incallui/audioroute/res/values-kn/strings.xml b/java/com/android/incallui/audioroute/res/values-kn/strings.xml
index 061e589..b431b97 100644
--- a/java/com/android/incallui/audioroute/res/values-kn/strings.xml
+++ b/java/com/android/incallui/audioroute/res/values-kn/strings.xml
@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="audioroute_bluetooth" msgid="3426527851663711141">"ಬ್ಲೂಟೂತ್‌"</string>
-    <string name="audioroute_speaker" msgid="3269659224838962927">"ಸ್ಪೀಕರ್‌"</string>
-    <string name="audioroute_phone" msgid="4006113852056568310">"ಫೋನ್"</string>
-    <string name="audioroute_headset" msgid="3911496379650036544">"ವೈರ್ಡ್ ಹೆಡ್‌ಸೆಟ್‌"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="audioroute_bluetooth">ಬ್ಲೂಟೂತ್‌</string>
+  <string name="audioroute_speaker">ಸ್ಪೀಕರ್‌</string>
+  <string name="audioroute_phone">ಫೋನ್</string>
+  <string name="audioroute_headset">ವೈರ್ಡ್ ಹೆಡ್‌ಸೆಟ್‌</string>
 </resources>
diff --git a/java/com/android/incallui/audioroute/res/values-ko/strings.xml b/java/com/android/incallui/audioroute/res/values-ko/strings.xml
index a7b6ac2..072c6b7 100644
--- a/java/com/android/incallui/audioroute/res/values-ko/strings.xml
+++ b/java/com/android/incallui/audioroute/res/values-ko/strings.xml
@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="audioroute_bluetooth" msgid="3426527851663711141">"블루투스"</string>
-    <string name="audioroute_speaker" msgid="3269659224838962927">"스피커"</string>
-    <string name="audioroute_phone" msgid="4006113852056568310">"휴대전화"</string>
-    <string name="audioroute_headset" msgid="3911496379650036544">"유선 헤드셋"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="audioroute_bluetooth">블루투스</string>
+  <string name="audioroute_speaker">스피커</string>
+  <string name="audioroute_phone">휴대전화</string>
+  <string name="audioroute_headset">유선 헤드셋</string>
 </resources>
diff --git a/java/com/android/incallui/audioroute/res/values-ky/strings.xml b/java/com/android/incallui/audioroute/res/values-ky/strings.xml
index 1ce1b8c..49b4716 100644
--- a/java/com/android/incallui/audioroute/res/values-ky/strings.xml
+++ b/java/com/android/incallui/audioroute/res/values-ky/strings.xml
@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="audioroute_bluetooth" msgid="3426527851663711141">"Bluetooth"</string>
-    <string name="audioroute_speaker" msgid="3269659224838962927">"Катуу сүйлөткүч"</string>
-    <string name="audioroute_phone" msgid="4006113852056568310">"Телефон"</string>
-    <string name="audioroute_headset" msgid="3911496379650036544">"Зымдуу гарнитура"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="audioroute_bluetooth">Bluetooth</string>
+  <string name="audioroute_speaker">Катуу сүйлөткүч</string>
+  <string name="audioroute_phone">Телефон</string>
+  <string name="audioroute_headset">Зымдуу гарнитура</string>
 </resources>
diff --git a/java/com/android/incallui/audioroute/res/values-lo/strings.xml b/java/com/android/incallui/audioroute/res/values-lo/strings.xml
index d1cc870..347f4ad 100644
--- a/java/com/android/incallui/audioroute/res/values-lo/strings.xml
+++ b/java/com/android/incallui/audioroute/res/values-lo/strings.xml
@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="audioroute_bluetooth" msgid="3426527851663711141">"Bluetooth"</string>
-    <string name="audioroute_speaker" msgid="3269659224838962927">"ລຳໂພງ"</string>
-    <string name="audioroute_phone" msgid="4006113852056568310">"ໂທລະສັບ"</string>
-    <string name="audioroute_headset" msgid="3911496379650036544">"ຊຸດຫູຟັງແບບມີສາຍ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="audioroute_bluetooth">Bluetooth</string>
+  <string name="audioroute_speaker">ລຳໂພງ</string>
+  <string name="audioroute_phone">ໂທລະສັບ</string>
+  <string name="audioroute_headset">ຊຸດຫູຟັງແບບມີສາຍ</string>
 </resources>
diff --git a/java/com/android/incallui/audioroute/res/values-lt/strings.xml b/java/com/android/incallui/audioroute/res/values-lt/strings.xml
index 4be7857..4cc93ef 100644
--- a/java/com/android/incallui/audioroute/res/values-lt/strings.xml
+++ b/java/com/android/incallui/audioroute/res/values-lt/strings.xml
@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="audioroute_bluetooth" msgid="3426527851663711141">"Bluetooth"</string>
-    <string name="audioroute_speaker" msgid="3269659224838962927">"Garsiakalbis"</string>
-    <string name="audioroute_phone" msgid="4006113852056568310">"Telefonas"</string>
-    <string name="audioroute_headset" msgid="3911496379650036544">"Laidinės ausinės"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="audioroute_bluetooth">Bluetooth</string>
+  <string name="audioroute_speaker">Garsiakalbis</string>
+  <string name="audioroute_phone">Telefonas</string>
+  <string name="audioroute_headset">Laidinės ausinės</string>
 </resources>
diff --git a/java/com/android/incallui/audioroute/res/values-lv/strings.xml b/java/com/android/incallui/audioroute/res/values-lv/strings.xml
index 874ef4f..d951e5b 100644
--- a/java/com/android/incallui/audioroute/res/values-lv/strings.xml
+++ b/java/com/android/incallui/audioroute/res/values-lv/strings.xml
@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="audioroute_bluetooth" msgid="3426527851663711141">"Bluetooth"</string>
-    <string name="audioroute_speaker" msgid="3269659224838962927">"Skaļrunis"</string>
-    <string name="audioroute_phone" msgid="4006113852056568310">"Tālrunis"</string>
-    <string name="audioroute_headset" msgid="3911496379650036544">"Austiņas ar vadu"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="audioroute_bluetooth">Bluetooth</string>
+  <string name="audioroute_speaker">Skaļrunis</string>
+  <string name="audioroute_phone">Tālrunis</string>
+  <string name="audioroute_headset">Austiņas ar vadu</string>
 </resources>
diff --git a/java/com/android/incallui/audioroute/res/values-mk/strings.xml b/java/com/android/incallui/audioroute/res/values-mk/strings.xml
index 3082a69..18fec2f 100644
--- a/java/com/android/incallui/audioroute/res/values-mk/strings.xml
+++ b/java/com/android/incallui/audioroute/res/values-mk/strings.xml
@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="audioroute_bluetooth" msgid="3426527851663711141">"Bluetooth"</string>
-    <string name="audioroute_speaker" msgid="3269659224838962927">"Звучник"</string>
-    <string name="audioroute_phone" msgid="4006113852056568310">"Телефон"</string>
-    <string name="audioroute_headset" msgid="3911496379650036544">"Жичени слушалки"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="audioroute_bluetooth">Bluetooth</string>
+  <string name="audioroute_speaker">Звучник</string>
+  <string name="audioroute_phone">Телефон</string>
+  <string name="audioroute_headset">Жичени слушалки</string>
 </resources>
diff --git a/java/com/android/incallui/audioroute/res/values-ml/strings.xml b/java/com/android/incallui/audioroute/res/values-ml/strings.xml
index 5147848..525146d 100644
--- a/java/com/android/incallui/audioroute/res/values-ml/strings.xml
+++ b/java/com/android/incallui/audioroute/res/values-ml/strings.xml
@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="audioroute_bluetooth" msgid="3426527851663711141">"Bluetooth"</string>
-    <string name="audioroute_speaker" msgid="3269659224838962927">"സ്പീക്കർ"</string>
-    <string name="audioroute_phone" msgid="4006113852056568310">"ഫോൺ"</string>
-    <string name="audioroute_headset" msgid="3911496379650036544">"വയർ മുഖേന ബന്ധിപ്പിച്ച ഹെഡ്‌സെറ്റ്"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="audioroute_bluetooth">Bluetooth</string>
+  <string name="audioroute_speaker">സ്പീക്കർ</string>
+  <string name="audioroute_phone">ഫോൺ</string>
+  <string name="audioroute_headset">വയർ മുഖേന ബന്ധിപ്പിച്ച ഹെഡ്‌സെറ്റ്</string>
 </resources>
diff --git a/java/com/android/incallui/audioroute/res/values-mn/strings.xml b/java/com/android/incallui/audioroute/res/values-mn/strings.xml
index e3868b7..dd626ed 100644
--- a/java/com/android/incallui/audioroute/res/values-mn/strings.xml
+++ b/java/com/android/incallui/audioroute/res/values-mn/strings.xml
@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="audioroute_bluetooth" msgid="3426527851663711141">"Блютүүт"</string>
-    <string name="audioroute_speaker" msgid="3269659224838962927">"Чанга яригч"</string>
-    <string name="audioroute_phone" msgid="4006113852056568310">"Гар утас"</string>
-    <string name="audioroute_headset" msgid="3911496379650036544">"Утастай чихэвч"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="audioroute_bluetooth">Блютүүт</string>
+  <string name="audioroute_speaker">Чанга яригч</string>
+  <string name="audioroute_phone">Гар утас</string>
+  <string name="audioroute_headset">Утастай чихэвч</string>
 </resources>
diff --git a/java/com/android/incallui/audioroute/res/values-mr/strings.xml b/java/com/android/incallui/audioroute/res/values-mr/strings.xml
index 86c7731..7257ac6 100644
--- a/java/com/android/incallui/audioroute/res/values-mr/strings.xml
+++ b/java/com/android/incallui/audioroute/res/values-mr/strings.xml
@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="audioroute_bluetooth" msgid="3426527851663711141">"ब्लूटुथ"</string>
-    <string name="audioroute_speaker" msgid="3269659224838962927">"स्पीकर"</string>
-    <string name="audioroute_phone" msgid="4006113852056568310">"फोन"</string>
-    <string name="audioroute_headset" msgid="3911496379650036544">"वायर्ड हेडसेट"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="audioroute_bluetooth">ब्लूटुथ</string>
+  <string name="audioroute_speaker">स्पीकर</string>
+  <string name="audioroute_phone">फोन</string>
+  <string name="audioroute_headset">वायर्ड हेडसेट</string>
 </resources>
diff --git a/java/com/android/incallui/audioroute/res/values-ms/strings.xml b/java/com/android/incallui/audioroute/res/values-ms/strings.xml
index 6527b99..0767339 100644
--- a/java/com/android/incallui/audioroute/res/values-ms/strings.xml
+++ b/java/com/android/incallui/audioroute/res/values-ms/strings.xml
@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="audioroute_bluetooth" msgid="3426527851663711141">"Bluetooth"</string>
-    <string name="audioroute_speaker" msgid="3269659224838962927">"Pembesar suara"</string>
-    <string name="audioroute_phone" msgid="4006113852056568310">"Telefon"</string>
-    <string name="audioroute_headset" msgid="3911496379650036544">"Set kepala berwayar"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="audioroute_bluetooth">Bluetooth</string>
+  <string name="audioroute_speaker">Pembesar suara</string>
+  <string name="audioroute_phone">Telefon</string>
+  <string name="audioroute_headset">Set kepala berwayar</string>
 </resources>
diff --git a/java/com/android/incallui/audioroute/res/values-my/strings.xml b/java/com/android/incallui/audioroute/res/values-my/strings.xml
index 7179d71..b182ee6 100644
--- a/java/com/android/incallui/audioroute/res/values-my/strings.xml
+++ b/java/com/android/incallui/audioroute/res/values-my/strings.xml
@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="audioroute_bluetooth" msgid="3426527851663711141">"ဘလူးတုသ်"</string>
-    <string name="audioroute_speaker" msgid="3269659224838962927">"စပီကာ"</string>
-    <string name="audioroute_phone" msgid="4006113852056568310">"ဖုန်း"</string>
-    <string name="audioroute_headset" msgid="3911496379650036544">"ကြိုးတပ်မိုက်ခွက်ပါနားကြပ်"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="audioroute_bluetooth">ဘလူးတုသ်</string>
+  <string name="audioroute_speaker">စပီကာ</string>
+  <string name="audioroute_phone">ဖုန်း</string>
+  <string name="audioroute_headset">ကြိုးတပ်မိုက်ခွက်ပါနားကြပ်</string>
 </resources>
diff --git a/java/com/android/incallui/audioroute/res/values-nb/strings.xml b/java/com/android/incallui/audioroute/res/values-nb/strings.xml
index 0c6ebc6..c4ea39e 100644
--- a/java/com/android/incallui/audioroute/res/values-nb/strings.xml
+++ b/java/com/android/incallui/audioroute/res/values-nb/strings.xml
@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="audioroute_bluetooth" msgid="3426527851663711141">"Bluetooth"</string>
-    <string name="audioroute_speaker" msgid="3269659224838962927">"Høyttaler"</string>
-    <string name="audioroute_phone" msgid="4006113852056568310">"Telefon"</string>
-    <string name="audioroute_headset" msgid="3911496379650036544">"Hodetelefon med kabel"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="audioroute_bluetooth">Bluetooth</string>
+  <string name="audioroute_speaker">Høyttaler</string>
+  <string name="audioroute_phone">Telefon</string>
+  <string name="audioroute_headset">Hodetelefon med kabel</string>
 </resources>
diff --git a/java/com/android/incallui/audioroute/res/values-ne/strings.xml b/java/com/android/incallui/audioroute/res/values-ne/strings.xml
index 8435c83..3ab13b1 100644
--- a/java/com/android/incallui/audioroute/res/values-ne/strings.xml
+++ b/java/com/android/incallui/audioroute/res/values-ne/strings.xml
@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="audioroute_bluetooth" msgid="3426527851663711141">"ब्लुटुथ"</string>
-    <string name="audioroute_speaker" msgid="3269659224838962927">"स्पिकर"</string>
-    <string name="audioroute_phone" msgid="4006113852056568310">"फोन"</string>
-    <string name="audioroute_headset" msgid="3911496379650036544">"तारसहितको हेडसेट"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="audioroute_bluetooth">ब्लुटुथ</string>
+  <string name="audioroute_speaker">स्पिकर</string>
+  <string name="audioroute_phone">फोन</string>
+  <string name="audioroute_headset">तारसहितको हेडसेट</string>
 </resources>
diff --git a/java/com/android/incallui/audioroute/res/values-nl/strings.xml b/java/com/android/incallui/audioroute/res/values-nl/strings.xml
index 2bf9cee..decfbb6 100644
--- a/java/com/android/incallui/audioroute/res/values-nl/strings.xml
+++ b/java/com/android/incallui/audioroute/res/values-nl/strings.xml
@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="audioroute_bluetooth" msgid="3426527851663711141">"Bluetooth"</string>
-    <string name="audioroute_speaker" msgid="3269659224838962927">"Luidspreker"</string>
-    <string name="audioroute_phone" msgid="4006113852056568310">"Telefoon"</string>
-    <string name="audioroute_headset" msgid="3911496379650036544">"Bedrade headset"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="audioroute_bluetooth">Bluetooth</string>
+  <string name="audioroute_speaker">Luidspreker</string>
+  <string name="audioroute_phone">Telefoon</string>
+  <string name="audioroute_headset">Bedrade headset</string>
 </resources>
diff --git a/java/com/android/incallui/audioroute/res/values-no/strings.xml b/java/com/android/incallui/audioroute/res/values-no/strings.xml
index 0c6ebc6..c4ea39e 100644
--- a/java/com/android/incallui/audioroute/res/values-no/strings.xml
+++ b/java/com/android/incallui/audioroute/res/values-no/strings.xml
@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="audioroute_bluetooth" msgid="3426527851663711141">"Bluetooth"</string>
-    <string name="audioroute_speaker" msgid="3269659224838962927">"Høyttaler"</string>
-    <string name="audioroute_phone" msgid="4006113852056568310">"Telefon"</string>
-    <string name="audioroute_headset" msgid="3911496379650036544">"Hodetelefon med kabel"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="audioroute_bluetooth">Bluetooth</string>
+  <string name="audioroute_speaker">Høyttaler</string>
+  <string name="audioroute_phone">Telefon</string>
+  <string name="audioroute_headset">Hodetelefon med kabel</string>
 </resources>
diff --git a/java/com/android/incallui/audioroute/res/values-pa/strings.xml b/java/com/android/incallui/audioroute/res/values-pa/strings.xml
index 84f0028..1c41089 100644
--- a/java/com/android/incallui/audioroute/res/values-pa/strings.xml
+++ b/java/com/android/incallui/audioroute/res/values-pa/strings.xml
@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="audioroute_bluetooth" msgid="3426527851663711141">"ਬਲੂਟੁੱਥ"</string>
-    <string name="audioroute_speaker" msgid="3269659224838962927">"ਸਪੀਕਰ"</string>
-    <string name="audioroute_phone" msgid="4006113852056568310">"ਫ਼ੋਨ"</string>
-    <string name="audioroute_headset" msgid="3911496379650036544">"ਤਾਰ ਵਾਲਾ ਹੈੱਡਸੈੱਟ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="audioroute_bluetooth">ਬਲੂਟੁੱਥ</string>
+  <string name="audioroute_speaker">ਸਪੀਕਰ</string>
+  <string name="audioroute_phone">ਫ਼ੋਨ</string>
+  <string name="audioroute_headset">ਤਾਰ ਵਾਲਾ ਹੈੱਡਸੈੱਟ</string>
 </resources>
diff --git a/java/com/android/incallui/audioroute/res/values-pl/strings.xml b/java/com/android/incallui/audioroute/res/values-pl/strings.xml
index 4e2c919..d4bb077 100644
--- a/java/com/android/incallui/audioroute/res/values-pl/strings.xml
+++ b/java/com/android/incallui/audioroute/res/values-pl/strings.xml
@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="audioroute_bluetooth" msgid="3426527851663711141">"Bluetooth"</string>
-    <string name="audioroute_speaker" msgid="3269659224838962927">"Głośnik"</string>
-    <string name="audioroute_phone" msgid="4006113852056568310">"Telefon"</string>
-    <string name="audioroute_headset" msgid="3911496379650036544">"Przewodowy zestaw słuchawkowy"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="audioroute_bluetooth">Bluetooth</string>
+  <string name="audioroute_speaker">Głośnik</string>
+  <string name="audioroute_phone">Telefon</string>
+  <string name="audioroute_headset">Przewodowy zestaw słuchawkowy</string>
 </resources>
diff --git a/java/com/android/incallui/audioroute/res/values-pt-rBR/strings.xml b/java/com/android/incallui/audioroute/res/values-pt-rBR/strings.xml
index e2d1644..537081f 100644
--- a/java/com/android/incallui/audioroute/res/values-pt-rBR/strings.xml
+++ b/java/com/android/incallui/audioroute/res/values-pt-rBR/strings.xml
@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="audioroute_bluetooth" msgid="3426527851663711141">"Bluetooth"</string>
-    <string name="audioroute_speaker" msgid="3269659224838962927">"Alto-falante"</string>
-    <string name="audioroute_phone" msgid="4006113852056568310">"Smartphone"</string>
-    <string name="audioroute_headset" msgid="3911496379650036544">"Fone de ouvido com fio"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="audioroute_bluetooth">Bluetooth</string>
+  <string name="audioroute_speaker">Alto-falante</string>
+  <string name="audioroute_phone">Smartphone</string>
+  <string name="audioroute_headset">Fone de ouvido com fio</string>
 </resources>
diff --git a/java/com/android/incallui/audioroute/res/values-pt-rPT/strings.xml b/java/com/android/incallui/audioroute/res/values-pt-rPT/strings.xml
index 1ad8ba6..4ba36cb 100644
--- a/java/com/android/incallui/audioroute/res/values-pt-rPT/strings.xml
+++ b/java/com/android/incallui/audioroute/res/values-pt-rPT/strings.xml
@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="audioroute_bluetooth" msgid="3426527851663711141">"Bluetooth"</string>
-    <string name="audioroute_speaker" msgid="3269659224838962927">"Altifalante"</string>
-    <string name="audioroute_phone" msgid="4006113852056568310">"Telemóvel"</string>
-    <string name="audioroute_headset" msgid="3911496379650036544">"Auscultadores com fios"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="audioroute_bluetooth">Bluetooth</string>
+  <string name="audioroute_speaker">Altifalante</string>
+  <string name="audioroute_phone">Telemóvel</string>
+  <string name="audioroute_headset">Auscultadores com fios</string>
 </resources>
diff --git a/java/com/android/incallui/audioroute/res/values-pt/strings.xml b/java/com/android/incallui/audioroute/res/values-pt/strings.xml
index e2d1644..537081f 100644
--- a/java/com/android/incallui/audioroute/res/values-pt/strings.xml
+++ b/java/com/android/incallui/audioroute/res/values-pt/strings.xml
@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="audioroute_bluetooth" msgid="3426527851663711141">"Bluetooth"</string>
-    <string name="audioroute_speaker" msgid="3269659224838962927">"Alto-falante"</string>
-    <string name="audioroute_phone" msgid="4006113852056568310">"Smartphone"</string>
-    <string name="audioroute_headset" msgid="3911496379650036544">"Fone de ouvido com fio"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="audioroute_bluetooth">Bluetooth</string>
+  <string name="audioroute_speaker">Alto-falante</string>
+  <string name="audioroute_phone">Smartphone</string>
+  <string name="audioroute_headset">Fone de ouvido com fio</string>
 </resources>
diff --git a/java/com/android/incallui/audioroute/res/values-ro/strings.xml b/java/com/android/incallui/audioroute/res/values-ro/strings.xml
index 5510062..5267a4c 100644
--- a/java/com/android/incallui/audioroute/res/values-ro/strings.xml
+++ b/java/com/android/incallui/audioroute/res/values-ro/strings.xml
@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="audioroute_bluetooth" msgid="3426527851663711141">"Bluetooth"</string>
-    <string name="audioroute_speaker" msgid="3269659224838962927">"Difuzor"</string>
-    <string name="audioroute_phone" msgid="4006113852056568310">"Telefon"</string>
-    <string name="audioroute_headset" msgid="3911496379650036544">"Set căști-microfon cu fir"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="audioroute_bluetooth">Bluetooth</string>
+  <string name="audioroute_speaker">Difuzor</string>
+  <string name="audioroute_phone">Telefon</string>
+  <string name="audioroute_headset">Set căști-microfon cu fir</string>
 </resources>
diff --git a/java/com/android/incallui/audioroute/res/values-ru/strings.xml b/java/com/android/incallui/audioroute/res/values-ru/strings.xml
index f35a4d8..5d442a9 100644
--- a/java/com/android/incallui/audioroute/res/values-ru/strings.xml
+++ b/java/com/android/incallui/audioroute/res/values-ru/strings.xml
@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="audioroute_bluetooth" msgid="3426527851663711141">"Bluetooth"</string>
-    <string name="audioroute_speaker" msgid="3269659224838962927">"Динамик"</string>
-    <string name="audioroute_phone" msgid="4006113852056568310">"Телефон"</string>
-    <string name="audioroute_headset" msgid="3911496379650036544">"Проводная гарнитура"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="audioroute_bluetooth">Bluetooth</string>
+  <string name="audioroute_speaker">Динамик</string>
+  <string name="audioroute_phone">Телефон</string>
+  <string name="audioroute_headset">Проводная гарнитура</string>
 </resources>
diff --git a/java/com/android/incallui/audioroute/res/values-si/strings.xml b/java/com/android/incallui/audioroute/res/values-si/strings.xml
index c89708a..0b8285e 100644
--- a/java/com/android/incallui/audioroute/res/values-si/strings.xml
+++ b/java/com/android/incallui/audioroute/res/values-si/strings.xml
@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="audioroute_bluetooth" msgid="3426527851663711141">"බ්ලූටූත්"</string>
-    <string name="audioroute_speaker" msgid="3269659224838962927">"ස්පීකරය"</string>
-    <string name="audioroute_phone" msgid="4006113852056568310">"දුරකථනය"</string>
-    <string name="audioroute_headset" msgid="3911496379650036544">"රැහැන්ගත කළ හෙඩ්සෙට්"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="audioroute_bluetooth">බ්ලූටූත්</string>
+  <string name="audioroute_speaker">ස්පීකරය</string>
+  <string name="audioroute_phone">දුරකථනය</string>
+  <string name="audioroute_headset">රැහැන්ගත කළ හෙඩ්සෙට්</string>
 </resources>
diff --git a/java/com/android/incallui/audioroute/res/values-sk/strings.xml b/java/com/android/incallui/audioroute/res/values-sk/strings.xml
index bf3d7b0..3897faf 100644
--- a/java/com/android/incallui/audioroute/res/values-sk/strings.xml
+++ b/java/com/android/incallui/audioroute/res/values-sk/strings.xml
@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="audioroute_bluetooth" msgid="3426527851663711141">"Bluetooth"</string>
-    <string name="audioroute_speaker" msgid="3269659224838962927">"Reproduktor"</string>
-    <string name="audioroute_phone" msgid="4006113852056568310">"Telefón"</string>
-    <string name="audioroute_headset" msgid="3911496379650036544">"Náhlavná súprava s káblom"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="audioroute_bluetooth">Bluetooth</string>
+  <string name="audioroute_speaker">Reproduktor</string>
+  <string name="audioroute_phone">Telefón</string>
+  <string name="audioroute_headset">Náhlavná súprava s káblom</string>
 </resources>
diff --git a/java/com/android/incallui/audioroute/res/values-sl/strings.xml b/java/com/android/incallui/audioroute/res/values-sl/strings.xml
index d30c0cc..edec825 100644
--- a/java/com/android/incallui/audioroute/res/values-sl/strings.xml
+++ b/java/com/android/incallui/audioroute/res/values-sl/strings.xml
@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="audioroute_bluetooth" msgid="3426527851663711141">"Bluetooth"</string>
-    <string name="audioroute_speaker" msgid="3269659224838962927">"Zvočnik"</string>
-    <string name="audioroute_phone" msgid="4006113852056568310">"Telefoniranje"</string>
-    <string name="audioroute_headset" msgid="3911496379650036544">"Žične slušalke"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="audioroute_bluetooth">Bluetooth</string>
+  <string name="audioroute_speaker">Zvočnik</string>
+  <string name="audioroute_phone">Telefoniranje</string>
+  <string name="audioroute_headset">Žične slušalke</string>
 </resources>
diff --git a/java/com/android/incallui/audioroute/res/values-sq/strings.xml b/java/com/android/incallui/audioroute/res/values-sq/strings.xml
index 231ba84..afbf32a 100644
--- a/java/com/android/incallui/audioroute/res/values-sq/strings.xml
+++ b/java/com/android/incallui/audioroute/res/values-sq/strings.xml
@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="audioroute_bluetooth" msgid="3426527851663711141">"Bluetooth-i"</string>
-    <string name="audioroute_speaker" msgid="3269659224838962927">"Altoparlant"</string>
-    <string name="audioroute_phone" msgid="4006113852056568310">"Telefoni"</string>
-    <string name="audioroute_headset" msgid="3911496379650036544">"Kufje me tel"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="audioroute_bluetooth">Bluetooth-i</string>
+  <string name="audioroute_speaker">Altoparlant</string>
+  <string name="audioroute_phone">Telefoni</string>
+  <string name="audioroute_headset">Kufje me tel</string>
 </resources>
diff --git a/java/com/android/incallui/audioroute/res/values-sr/strings.xml b/java/com/android/incallui/audioroute/res/values-sr/strings.xml
index 0566f53..a2a8728 100644
--- a/java/com/android/incallui/audioroute/res/values-sr/strings.xml
+++ b/java/com/android/incallui/audioroute/res/values-sr/strings.xml
@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="audioroute_bluetooth" msgid="3426527851663711141">"Bluetooth"</string>
-    <string name="audioroute_speaker" msgid="3269659224838962927">"Звучник"</string>
-    <string name="audioroute_phone" msgid="4006113852056568310">"Телефон"</string>
-    <string name="audioroute_headset" msgid="3911496379650036544">"Жичане слушалице"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="audioroute_bluetooth">Bluetooth</string>
+  <string name="audioroute_speaker">Звучник</string>
+  <string name="audioroute_phone">Телефон</string>
+  <string name="audioroute_headset">Жичане слушалице</string>
 </resources>
diff --git a/java/com/android/incallui/audioroute/res/values-sv/strings.xml b/java/com/android/incallui/audioroute/res/values-sv/strings.xml
index 657e0cf..66aed76 100644
--- a/java/com/android/incallui/audioroute/res/values-sv/strings.xml
+++ b/java/com/android/incallui/audioroute/res/values-sv/strings.xml
@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="audioroute_bluetooth" msgid="3426527851663711141">"Bluetooth"</string>
-    <string name="audioroute_speaker" msgid="3269659224838962927">"Högtalare"</string>
-    <string name="audioroute_phone" msgid="4006113852056568310">"Telefon"</string>
-    <string name="audioroute_headset" msgid="3911496379650036544">"Trådanslutet headset"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="audioroute_bluetooth">Bluetooth</string>
+  <string name="audioroute_speaker">Högtalare</string>
+  <string name="audioroute_phone">Telefon</string>
+  <string name="audioroute_headset">Trådanslutet headset</string>
 </resources>
diff --git a/java/com/android/incallui/audioroute/res/values-sw/strings.xml b/java/com/android/incallui/audioroute/res/values-sw/strings.xml
index 726272e..d3fddf4 100644
--- a/java/com/android/incallui/audioroute/res/values-sw/strings.xml
+++ b/java/com/android/incallui/audioroute/res/values-sw/strings.xml
@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="audioroute_bluetooth" msgid="3426527851663711141">"Bluetooth"</string>
-    <string name="audioroute_speaker" msgid="3269659224838962927">"Spika"</string>
-    <string name="audioroute_phone" msgid="4006113852056568310">"Simu"</string>
-    <string name="audioroute_headset" msgid="3911496379650036544">"Vifaa vya sauti vyenye waya"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="audioroute_bluetooth">Bluetooth</string>
+  <string name="audioroute_speaker">Spika</string>
+  <string name="audioroute_phone">Simu</string>
+  <string name="audioroute_headset">Vifaa vya sauti vyenye waya</string>
 </resources>
diff --git a/java/com/android/incallui/audioroute/res/values-ta/strings.xml b/java/com/android/incallui/audioroute/res/values-ta/strings.xml
index 48cc73d..f9f7f52 100644
--- a/java/com/android/incallui/audioroute/res/values-ta/strings.xml
+++ b/java/com/android/incallui/audioroute/res/values-ta/strings.xml
@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="audioroute_bluetooth" msgid="3426527851663711141">"புளூடூத்"</string>
-    <string name="audioroute_speaker" msgid="3269659224838962927">"ஸ்பீக்கர்"</string>
-    <string name="audioroute_phone" msgid="4006113852056568310">"ஃபோன்"</string>
-    <string name="audioroute_headset" msgid="3911496379650036544">"வயருடன்கூடிய ஹெட்செட்"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="audioroute_bluetooth">புளூடூத்</string>
+  <string name="audioroute_speaker">ஸ்பீக்கர்</string>
+  <string name="audioroute_phone">ஃபோன்</string>
+  <string name="audioroute_headset">வயருடன்கூடிய ஹெட்செட்</string>
 </resources>
diff --git a/java/com/android/incallui/audioroute/res/values-te/strings.xml b/java/com/android/incallui/audioroute/res/values-te/strings.xml
index ebbe2f0..fc9a67f 100644
--- a/java/com/android/incallui/audioroute/res/values-te/strings.xml
+++ b/java/com/android/incallui/audioroute/res/values-te/strings.xml
@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="audioroute_bluetooth" msgid="3426527851663711141">"బ్లూటూత్"</string>
-    <string name="audioroute_speaker" msgid="3269659224838962927">"స్పీకర్"</string>
-    <string name="audioroute_phone" msgid="4006113852056568310">"ఫోన్"</string>
-    <string name="audioroute_headset" msgid="3911496379650036544">"వైర్ గల హెడ్‌సెట్"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="audioroute_bluetooth">బ్లూటూత్</string>
+  <string name="audioroute_speaker">స్పీకర్</string>
+  <string name="audioroute_phone">ఫోన్</string>
+  <string name="audioroute_headset">వైర్ గల హెడ్‌సెట్</string>
 </resources>
diff --git a/java/com/android/incallui/audioroute/res/values-th/strings.xml b/java/com/android/incallui/audioroute/res/values-th/strings.xml
index da8f983..3e57f1a 100644
--- a/java/com/android/incallui/audioroute/res/values-th/strings.xml
+++ b/java/com/android/incallui/audioroute/res/values-th/strings.xml
@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="audioroute_bluetooth" msgid="3426527851663711141">"บลูทูธ"</string>
-    <string name="audioroute_speaker" msgid="3269659224838962927">"ลำโพง"</string>
-    <string name="audioroute_phone" msgid="4006113852056568310">"โทรศัพท์"</string>
-    <string name="audioroute_headset" msgid="3911496379650036544">"ชุดหูฟังแบบมีสาย"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="audioroute_bluetooth">บลูทูธ</string>
+  <string name="audioroute_speaker">ลำโพง</string>
+  <string name="audioroute_phone">โทรศัพท์</string>
+  <string name="audioroute_headset">ชุดหูฟังแบบมีสาย</string>
 </resources>
diff --git a/java/com/android/incallui/audioroute/res/values-tl/strings.xml b/java/com/android/incallui/audioroute/res/values-tl/strings.xml
index 4110d7e..341c9fc 100644
--- a/java/com/android/incallui/audioroute/res/values-tl/strings.xml
+++ b/java/com/android/incallui/audioroute/res/values-tl/strings.xml
@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="audioroute_bluetooth" msgid="3426527851663711141">"Bluetooth"</string>
-    <string name="audioroute_speaker" msgid="3269659224838962927">"Speaker"</string>
-    <string name="audioroute_phone" msgid="4006113852056568310">"Telepono"</string>
-    <string name="audioroute_headset" msgid="3911496379650036544">"Wired na headset"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="audioroute_bluetooth">Bluetooth</string>
+  <string name="audioroute_speaker">Speaker</string>
+  <string name="audioroute_phone">Telepono</string>
+  <string name="audioroute_headset">Wired na headset</string>
 </resources>
diff --git a/java/com/android/incallui/audioroute/res/values-tr/strings.xml b/java/com/android/incallui/audioroute/res/values-tr/strings.xml
index 391a42a..7764e80 100644
--- a/java/com/android/incallui/audioroute/res/values-tr/strings.xml
+++ b/java/com/android/incallui/audioroute/res/values-tr/strings.xml
@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="audioroute_bluetooth" msgid="3426527851663711141">"Bluetooth"</string>
-    <string name="audioroute_speaker" msgid="3269659224838962927">"Hoparlör"</string>
-    <string name="audioroute_phone" msgid="4006113852056568310">"Telefon"</string>
-    <string name="audioroute_headset" msgid="3911496379650036544">"Kablolu mikrofonlu kulaklık"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="audioroute_bluetooth">Bluetooth</string>
+  <string name="audioroute_speaker">Hoparlör</string>
+  <string name="audioroute_phone">Telefon</string>
+  <string name="audioroute_headset">Kablolu mikrofonlu kulaklık</string>
 </resources>
diff --git a/java/com/android/incallui/audioroute/res/values-uk/strings.xml b/java/com/android/incallui/audioroute/res/values-uk/strings.xml
index 13a4029..3f0f827 100644
--- a/java/com/android/incallui/audioroute/res/values-uk/strings.xml
+++ b/java/com/android/incallui/audioroute/res/values-uk/strings.xml
@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="audioroute_bluetooth" msgid="3426527851663711141">"Bluetooth"</string>
-    <string name="audioroute_speaker" msgid="3269659224838962927">"Динамік"</string>
-    <string name="audioroute_phone" msgid="4006113852056568310">"Телефон"</string>
-    <string name="audioroute_headset" msgid="3911496379650036544">"Дротова гарнітура"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="audioroute_bluetooth">Bluetooth</string>
+  <string name="audioroute_speaker">Динамік</string>
+  <string name="audioroute_phone">Телефон</string>
+  <string name="audioroute_headset">Дротова гарнітура</string>
 </resources>
diff --git a/java/com/android/incallui/audioroute/res/values-ur/strings.xml b/java/com/android/incallui/audioroute/res/values-ur/strings.xml
index 1ead511..c725b89 100644
--- a/java/com/android/incallui/audioroute/res/values-ur/strings.xml
+++ b/java/com/android/incallui/audioroute/res/values-ur/strings.xml
@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="audioroute_bluetooth" msgid="3426527851663711141">"بلوٹوتھ"</string>
-    <string name="audioroute_speaker" msgid="3269659224838962927">"اسپیکر"</string>
-    <string name="audioroute_phone" msgid="4006113852056568310">"فون"</string>
-    <string name="audioroute_headset" msgid="3911496379650036544">"تار والا ہیڈسیٹ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="audioroute_bluetooth">بلوٹوتھ</string>
+  <string name="audioroute_speaker">اسپیکر</string>
+  <string name="audioroute_phone">فون</string>
+  <string name="audioroute_headset">تار والا ہیڈسیٹ</string>
 </resources>
diff --git a/java/com/android/incallui/audioroute/res/values-uz/strings.xml b/java/com/android/incallui/audioroute/res/values-uz/strings.xml
index c676ed8..e764922 100644
--- a/java/com/android/incallui/audioroute/res/values-uz/strings.xml
+++ b/java/com/android/incallui/audioroute/res/values-uz/strings.xml
@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="audioroute_bluetooth" msgid="3426527851663711141">"Bluetooth"</string>
-    <string name="audioroute_speaker" msgid="3269659224838962927">"Karnay"</string>
-    <string name="audioroute_phone" msgid="4006113852056568310">"Telefon"</string>
-    <string name="audioroute_headset" msgid="3911496379650036544">"Simli garnitura"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="audioroute_bluetooth">Bluetooth</string>
+  <string name="audioroute_speaker">Karnay</string>
+  <string name="audioroute_phone">Telefon</string>
+  <string name="audioroute_headset">Simli garnitura</string>
 </resources>
diff --git a/java/com/android/incallui/audioroute/res/values-vi/strings.xml b/java/com/android/incallui/audioroute/res/values-vi/strings.xml
index a410374..ac71fe7 100644
--- a/java/com/android/incallui/audioroute/res/values-vi/strings.xml
+++ b/java/com/android/incallui/audioroute/res/values-vi/strings.xml
@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="audioroute_bluetooth" msgid="3426527851663711141">"Bluetooth"</string>
-    <string name="audioroute_speaker" msgid="3269659224838962927">"Loa"</string>
-    <string name="audioroute_phone" msgid="4006113852056568310">"Điện thoại"</string>
-    <string name="audioroute_headset" msgid="3911496379650036544">"Tai nghe có dây"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="audioroute_bluetooth">Bluetooth</string>
+  <string name="audioroute_speaker">Loa</string>
+  <string name="audioroute_phone">Điện thoại</string>
+  <string name="audioroute_headset">Tai nghe có dây</string>
 </resources>
diff --git a/java/com/android/incallui/audioroute/res/values-zh-rCN/strings.xml b/java/com/android/incallui/audioroute/res/values-zh-rCN/strings.xml
index 97f12bc..bc77390 100644
--- a/java/com/android/incallui/audioroute/res/values-zh-rCN/strings.xml
+++ b/java/com/android/incallui/audioroute/res/values-zh-rCN/strings.xml
@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="audioroute_bluetooth" msgid="3426527851663711141">"蓝牙"</string>
-    <string name="audioroute_speaker" msgid="3269659224838962927">"免提"</string>
-    <string name="audioroute_phone" msgid="4006113852056568310">"听筒"</string>
-    <string name="audioroute_headset" msgid="3911496379650036544">"有线耳机"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="audioroute_bluetooth">蓝牙</string>
+  <string name="audioroute_speaker">免提</string>
+  <string name="audioroute_phone">听筒</string>
+  <string name="audioroute_headset">有线耳机</string>
 </resources>
diff --git a/java/com/android/incallui/audioroute/res/values-zh-rHK/strings.xml b/java/com/android/incallui/audioroute/res/values-zh-rHK/strings.xml
index 121ec14..e60c935 100644
--- a/java/com/android/incallui/audioroute/res/values-zh-rHK/strings.xml
+++ b/java/com/android/incallui/audioroute/res/values-zh-rHK/strings.xml
@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="audioroute_bluetooth" msgid="3426527851663711141">"藍牙"</string>
-    <string name="audioroute_speaker" msgid="3269659224838962927">"喇叭"</string>
-    <string name="audioroute_phone" msgid="4006113852056568310">"手機"</string>
-    <string name="audioroute_headset" msgid="3911496379650036544">"有線頭戴式耳機"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="audioroute_bluetooth">藍牙</string>
+  <string name="audioroute_speaker">喇叭</string>
+  <string name="audioroute_phone">手機</string>
+  <string name="audioroute_headset">有線頭戴式耳機</string>
 </resources>
diff --git a/java/com/android/incallui/audioroute/res/values-zh-rTW/strings.xml b/java/com/android/incallui/audioroute/res/values-zh-rTW/strings.xml
index 88aef28..4b498a7 100644
--- a/java/com/android/incallui/audioroute/res/values-zh-rTW/strings.xml
+++ b/java/com/android/incallui/audioroute/res/values-zh-rTW/strings.xml
@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="audioroute_bluetooth" msgid="3426527851663711141">"藍牙"</string>
-    <string name="audioroute_speaker" msgid="3269659224838962927">"喇叭"</string>
-    <string name="audioroute_phone" msgid="4006113852056568310">"手機"</string>
-    <string name="audioroute_headset" msgid="3911496379650036544">"有線耳機"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="audioroute_bluetooth">藍牙</string>
+  <string name="audioroute_speaker">喇叭</string>
+  <string name="audioroute_phone">手機</string>
+  <string name="audioroute_headset">有線耳機</string>
 </resources>
diff --git a/java/com/android/incallui/audioroute/res/values-zu/strings.xml b/java/com/android/incallui/audioroute/res/values-zu/strings.xml
index ec8e30c..2417988 100644
--- a/java/com/android/incallui/audioroute/res/values-zu/strings.xml
+++ b/java/com/android/incallui/audioroute/res/values-zu/strings.xml
@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="audioroute_bluetooth" msgid="3426527851663711141">"I-Bluetooth"</string>
-    <string name="audioroute_speaker" msgid="3269659224838962927">"Isipikha"</string>
-    <string name="audioroute_phone" msgid="4006113852056568310">"Ifoni"</string>
-    <string name="audioroute_headset" msgid="3911496379650036544">"I-headset enezincingo"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="audioroute_bluetooth">I-Bluetooth</string>
+  <string name="audioroute_speaker">Isipikha</string>
+  <string name="audioroute_phone">Ifoni</string>
+  <string name="audioroute_headset">I-headset enezincingo</string>
 </resources>
diff --git a/java/com/android/incallui/audioroute/res/values/styles.xml b/java/com/android/incallui/audioroute/res/values/styles.xml
index 4484b70..5215bea 100644
--- a/java/com/android/incallui/audioroute/res/values/styles.xml
+++ b/java/com/android/incallui/audioroute/res/values/styles.xml
@@ -1,14 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2018 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
 <resources>
 
   <style name="AudioRouteItem">
     <item name="android:padding">16dp</item>
-    <item name="android:background">?android:selectableItemBackground</item>
+    <item name="android:background">?android:attr/selectableItemBackground</item>
     <item name="android:drawablePadding">24dp</item>
     <item name="android:gravity">center_vertical</item>
     <item name="android:textAppearance">
       @style/TextAppearance.AppCompat.Light.Widget.PopupMenu.Large
     </item>
-    <item name="android:textColor">?android:textColorSecondary</item>
+    <item name="android:textColor">?android:attr/textColorSecondary</item>
+    <item name="android:drawableTint">?android:attr/textColorSecondary</item>
   </style>
 </resources>
diff --git a/java/com/android/incallui/autoresizetext/AndroidManifest.xml b/java/com/android/incallui/autoresizetext/AndroidManifest.xml
index e26670e..f6eb34b 100644
--- a/java/com/android/incallui/autoresizetext/AndroidManifest.xml
+++ b/java/com/android/incallui/autoresizetext/AndroidManifest.xml
@@ -18,8 +18,8 @@
     package="com.android.incallui.autoresizetext">
 
   <uses-sdk
-      android:minSdkVersion="23"
-      android:targetSdkVersion="27"/>
+      android:minSdkVersion="24"
+      android:targetSdkVersion="28"/>
 
   <application />
 </manifest>
diff --git a/java/com/android/incallui/autoresizetext/AutoResizeTextView.java b/java/com/android/incallui/autoresizetext/AutoResizeTextView.java
index 487283a..c8647fc 100644
--- a/java/com/android/incallui/autoresizetext/AutoResizeTextView.java
+++ b/java/com/android/incallui/autoresizetext/AutoResizeTextView.java
@@ -19,8 +19,6 @@
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.RectF;
-import android.os.Build.VERSION;
-import android.os.Build.VERSION_CODES;
 import android.support.annotation.Nullable;
 import android.text.Layout.Alignment;
 import android.text.StaticLayout;
@@ -52,9 +50,6 @@
   private float minTextSize = DEFAULT_MIN_TEXT_SIZE;
   private float maxTextSize;
   private int maxWidth;
-  private int maxLines;
-  private float lineSpacingMultiplier = 1.0f;
-  private float lineSpacingExtra = 0.0f;
 
   public AutoResizeTextView(Context context) {
     super(context, null, 0);
@@ -86,53 +81,6 @@
     textPaint.set(getPaint());
   }
 
-  /** Overridden because getMaxLines is only defined in JB+. */
-  @Override
-  public final int getMaxLines() {
-    if (VERSION.SDK_INT >= VERSION_CODES.JELLY_BEAN) {
-      return super.getMaxLines();
-    } else {
-      return maxLines;
-    }
-  }
-
-  /** Overridden because getMaxLines is only defined in JB+. */
-  @Override
-  public final void setMaxLines(int maxLines) {
-    super.setMaxLines(maxLines);
-    this.maxLines = maxLines;
-  }
-
-  /** Overridden because getLineSpacingMultiplier is only defined in JB+. */
-  @Override
-  public final float getLineSpacingMultiplier() {
-    if (VERSION.SDK_INT >= VERSION_CODES.JELLY_BEAN) {
-      return super.getLineSpacingMultiplier();
-    } else {
-      return lineSpacingMultiplier;
-    }
-  }
-
-  /** Overridden because getLineSpacingExtra is only defined in JB+. */
-  @Override
-  public final float getLineSpacingExtra() {
-    if (VERSION.SDK_INT >= VERSION_CODES.JELLY_BEAN) {
-      return super.getLineSpacingExtra();
-    } else {
-      return lineSpacingExtra;
-    }
-  }
-
-  /**
-   * Overridden because getLineSpacingMultiplier and getLineSpacingExtra are only defined in JB+.
-   */
-  @Override
-  public final void setLineSpacing(float add, float mult) {
-    super.setLineSpacing(add, mult);
-    lineSpacingMultiplier = mult;
-    lineSpacingExtra = add;
-  }
-
   /**
    * Although this overrides the setTextSize method from the TextView base class, it changes the
    * semantics a bit: Calling setTextSize now specifies the maximum text size to be used by this
diff --git a/java/com/android/incallui/bindings/PhoneNumberService.java b/java/com/android/incallui/bindings/PhoneNumberService.java
index c40891a..2e1ae1f 100644
--- a/java/com/android/incallui/bindings/PhoneNumberService.java
+++ b/java/com/android/incallui/bindings/PhoneNumberService.java
@@ -16,7 +16,6 @@
 
 package com.android.incallui.bindings;
 
-import android.graphics.Bitmap;
 import com.android.dialer.logging.ContactLookupResult;
 
 /** Provides phone number lookup services. */
@@ -27,13 +26,8 @@
    *
    * @param phoneNumber The phone number to lookup.
    * @param listener The listener to notify when the phone number lookup is complete.
-   * @param imageListener The listener to notify when the image lookup is complete.
    */
-  void getPhoneNumberInfo(
-      String phoneNumber,
-      NumberLookupListener listener,
-      ImageLookupListener imageListener,
-      boolean isIncoming);
+  void getPhoneNumberInfo(String phoneNumber, NumberLookupListener listener);
 
   interface NumberLookupListener {
 
@@ -45,16 +39,6 @@
     void onPhoneNumberInfoComplete(PhoneNumberInfo info);
   }
 
-  interface ImageLookupListener {
-
-    /**
-     * Callback when a image has been fetched.
-     *
-     * @param bitmap The fetched image.
-     */
-    void onImageFetchComplete(Bitmap bitmap);
-  }
-
   interface PhoneNumberInfo {
 
     String getDisplayName();
diff --git a/java/com/android/incallui/call/CallList.java b/java/com/android/incallui/call/CallList.java
index 9a09026..634a302 100644
--- a/java/com/android/incallui/call/CallList.java
+++ b/java/com/android/incallui/call/CallList.java
@@ -23,28 +23,31 @@
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.annotation.VisibleForTesting;
-import android.support.v4.os.BuildCompat;
 import android.telecom.Call;
 import android.telecom.DisconnectCause;
 import android.telecom.PhoneAccount;
 import android.util.ArrayMap;
 import com.android.dialer.blocking.FilteredNumberAsyncQueryHandler;
-import com.android.dialer.blocking.FilteredNumbersUtil;
 import com.android.dialer.common.Assert;
 import com.android.dialer.common.LogUtil;
+import com.android.dialer.common.concurrent.DialerExecutorComponent;
 import com.android.dialer.enrichedcall.EnrichedCallComponent;
 import com.android.dialer.enrichedcall.EnrichedCallManager;
 import com.android.dialer.logging.DialerImpression;
 import com.android.dialer.logging.Logger;
 import com.android.dialer.metrics.Metrics;
 import com.android.dialer.metrics.MetricsComponent;
+import com.android.dialer.promotion.impl.RttPromotion;
 import com.android.dialer.shortcuts.ShortcutUsageReporter;
-import com.android.dialer.spam.Spam;
 import com.android.dialer.spam.SpamComponent;
+import com.android.dialer.spam.status.SpamStatus;
 import com.android.dialer.telecom.TelecomCallUtil;
-import com.android.incallui.call.DialerCall.State;
+import com.android.incallui.call.state.DialerCallState;
 import com.android.incallui.latencyreport.LatencyReport;
 import com.android.incallui.videotech.utils.SessionModificationState;
+import com.google.common.util.concurrent.FutureCallback;
+import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.ListenableFuture;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Iterator;
@@ -144,51 +147,43 @@
     Trace.beginSection("checkSpam");
     call.addListener(new DialerCallListenerImpl(call));
     LogUtil.d("CallList.onCallAdded", "callState=" + call.getState());
-    if (SpamComponent.get(context).spam().isSpamEnabled()) {
+    if (SpamComponent.get(context).spamSettings().isSpamEnabled()) {
       String number = TelecomCallUtil.getNumber(telecomCall);
-      SpamComponent.get(context)
-          .spam()
-          .checkSpamStatus(
-              number,
-              call.getCountryIso(),
-              new Spam.Listener() {
-                @Override
-                public void onComplete(boolean isSpam) {
-                  boolean isIncomingCall =
-                      call.getState() == DialerCall.State.INCOMING
-                          || call.getState() == DialerCall.State.CALL_WAITING;
-                  if (isSpam) {
-                    if (!isIncomingCall) {
-                      LogUtil.i(
-                          "CallList.onCallAdded",
-                          "marking spam call as not spam because it's not an incoming call");
-                      isSpam = false;
-                    } else if (isPotentialEmergencyCallback(context, call)) {
-                      LogUtil.i(
-                          "CallList.onCallAdded",
-                          "marking spam call as not spam because an emergency call was made on this"
-                              + " device recently");
-                      isSpam = false;
-                    }
-                  }
+      ListenableFuture<SpamStatus> futureSpamStatus =
+          SpamComponent.get(context).spam().checkSpamStatus(number, call.getCountryIso());
 
-                  if (isIncomingCall) {
-                    Logger.get(context)
-                        .logCallImpression(
-                            isSpam
-                                ? DialerImpression.Type.INCOMING_SPAM_CALL
-                                : DialerImpression.Type.INCOMING_NON_SPAM_CALL,
-                            call.getUniqueCallId(),
-                            call.getTimeAddedMs());
-                  }
-                  call.setSpam(isSpam);
-                  onUpdateCall(call);
-                  notifyGenericListeners();
-                }
-              });
+      Futures.addCallback(
+          futureSpamStatus,
+          new FutureCallback<SpamStatus>() {
+            @Override
+            public void onSuccess(@Nullable SpamStatus result) {
+              boolean isIncomingCall =
+                  call.getState() == DialerCallState.INCOMING
+                      || call.getState() == DialerCallState.CALL_WAITING;
+              boolean isSpam = result.isSpam();
+              call.setSpamStatus(result);
+
+              if (isIncomingCall) {
+                Logger.get(context)
+                    .logCallImpression(
+                        isSpam
+                            ? DialerImpression.Type.INCOMING_SPAM_CALL
+                            : DialerImpression.Type.INCOMING_NON_SPAM_CALL,
+                        call.getUniqueCallId(),
+                        call.getTimeAddedMs());
+              }
+              onUpdateCall(call);
+              notifyGenericListeners();
+            }
+
+            @Override
+            public void onFailure(Throwable t) {
+              LogUtil.e("CallList.onFailure", "unable to query spam status", t);
+            }
+          },
+          DialerExecutorComponent.get(context).uiExecutor());
 
       Trace.beginSection("updateUserMarkedSpamStatus");
-      updateUserMarkedSpamStatus(call, context, number);
       Trace.endSection();
     }
     Trace.endSection();
@@ -211,15 +206,32 @@
         call.getCountryIso());
     Trace.endSection();
 
-    if (call.getState() == DialerCall.State.INCOMING
-        || call.getState() == DialerCall.State.CALL_WAITING) {
+    if (call.getState() == DialerCallState.INCOMING
+        || call.getState() == DialerCallState.CALL_WAITING) {
+      if (call.isActiveRttCall()) {
+        if (!call.isPhoneAccountRttCapable()) {
+          RttPromotion.setEnabled(context);
+        }
+        Logger.get(context)
+            .logCallImpression(
+                DialerImpression.Type.INCOMING_RTT_CALL,
+                call.getUniqueCallId(),
+                call.getTimeAddedMs());
+      }
       onIncoming(call);
     } else {
+      if (call.isActiveRttCall()) {
+        Logger.get(context)
+            .logCallImpression(
+                DialerImpression.Type.OUTGOING_RTT_CALL,
+                call.getUniqueCallId(),
+                call.getTimeAddedMs());
+      }
       onUpdateCall(call);
       notifyGenericListeners();
     }
 
-    if (call.getState() != State.INCOMING) {
+    if (call.getState() != DialerCallState.INCOMING) {
       // Only report outgoing calls
       ShortcutUsageReporter.onOutgoingCallAdded(context, call.getNumber());
     }
@@ -249,60 +261,11 @@
             impression, incomingCall.getUniqueCallId(), incomingCall.getTimeAddedMs());
   }
 
-  private static boolean isPotentialEmergencyCallback(Context context, DialerCall call) {
-    if (BuildCompat.isAtLeastO()) {
-      return call.isPotentialEmergencyCallback();
-    } else {
-      long timestampMillis = FilteredNumbersUtil.getLastEmergencyCallTimeMillis(context);
-      return call.isInEmergencyCallbackWindow(timestampMillis);
-    }
-  }
-
   @Override
   public DialerCall getDialerCallFromTelecomCall(Call telecomCall) {
     return callByTelecomCall.get(telecomCall);
   }
 
-  private void updateUserMarkedSpamStatus(
-      final DialerCall call, final Context context, String number) {
-
-    SpamComponent.get(context)
-        .spam()
-        .checkUserMarkedNonSpamStatus(
-            number,
-            call.getCountryIso(),
-            new Spam.Listener() {
-              @Override
-              public void onComplete(boolean isInUserWhiteList) {
-                call.setIsInUserWhiteList(isInUserWhiteList);
-              }
-            });
-
-    SpamComponent.get(context)
-        .spam()
-        .checkGlobalSpamListStatus(
-            number,
-            call.getCountryIso(),
-            new Spam.Listener() {
-              @Override
-              public void onComplete(boolean isInGlobalSpamList) {
-                call.setIsInGlobalSpamList(isInGlobalSpamList);
-              }
-            });
-
-    SpamComponent.get(context)
-        .spam()
-        .checkUserMarkedSpamStatus(
-            number,
-            call.getCountryIso(),
-            new Spam.Listener() {
-              @Override
-              public void onComplete(boolean isInUserSpamList) {
-                call.setIsInUserSpamList(isInUserSpamList);
-              }
-            });
-  }
-
   public void onCallRemoved(Context context, android.telecom.Call telecomCall) {
     if (callByTelecomCall.containsKey(telecomCall)) {
       DialerCall call = callByTelecomCall.get(telecomCall);
@@ -430,46 +393,46 @@
 
   /** A call that is waiting for {@link PhoneAccount} selection */
   public DialerCall getWaitingForAccountCall() {
-    return getFirstCallWithState(DialerCall.State.SELECT_PHONE_ACCOUNT);
+    return getFirstCallWithState(DialerCallState.SELECT_PHONE_ACCOUNT);
   }
 
   public DialerCall getPendingOutgoingCall() {
-    return getFirstCallWithState(DialerCall.State.CONNECTING);
+    return getFirstCallWithState(DialerCallState.CONNECTING);
   }
 
   public DialerCall getOutgoingCall() {
-    DialerCall call = getFirstCallWithState(DialerCall.State.DIALING);
+    DialerCall call = getFirstCallWithState(DialerCallState.DIALING);
     if (call == null) {
-      call = getFirstCallWithState(DialerCall.State.REDIALING);
+      call = getFirstCallWithState(DialerCallState.REDIALING);
     }
     if (call == null) {
-      call = getFirstCallWithState(DialerCall.State.PULLING);
+      call = getFirstCallWithState(DialerCallState.PULLING);
     }
     return call;
   }
 
   public DialerCall getActiveCall() {
-    return getFirstCallWithState(DialerCall.State.ACTIVE);
+    return getFirstCallWithState(DialerCallState.ACTIVE);
   }
 
   public DialerCall getSecondActiveCall() {
-    return getCallWithState(DialerCall.State.ACTIVE, 1);
+    return getCallWithState(DialerCallState.ACTIVE, 1);
   }
 
   public DialerCall getBackgroundCall() {
-    return getFirstCallWithState(DialerCall.State.ONHOLD);
+    return getFirstCallWithState(DialerCallState.ONHOLD);
   }
 
   public DialerCall getDisconnectedCall() {
-    return getFirstCallWithState(DialerCall.State.DISCONNECTED);
+    return getFirstCallWithState(DialerCallState.DISCONNECTED);
   }
 
   public DialerCall getDisconnectingCall() {
-    return getFirstCallWithState(DialerCall.State.DISCONNECTING);
+    return getFirstCallWithState(DialerCallState.DISCONNECTING);
   }
 
   public DialerCall getSecondBackgroundCall() {
-    return getCallWithState(DialerCall.State.ONHOLD, 1);
+    return getCallWithState(DialerCallState.ONHOLD, 1);
   }
 
   public DialerCall getActiveOrBackgroundCall() {
@@ -481,9 +444,9 @@
   }
 
   public DialerCall getIncomingCall() {
-    DialerCall call = getFirstCallWithState(DialerCall.State.INCOMING);
+    DialerCall call = getFirstCallWithState(DialerCallState.INCOMING);
     if (call == null) {
-      call = getFirstCallWithState(DialerCall.State.CALL_WAITING);
+      call = getFirstCallWithState(DialerCallState.CALL_WAITING);
     }
 
     return call;
@@ -498,7 +461,7 @@
       result = getOutgoingCall();
     }
     if (result == null) {
-      result = getFirstCallWithState(DialerCall.State.ACTIVE);
+      result = getFirstCallWithState(DialerCallState.ACTIVE);
     }
     if (result == null) {
       result = getDisconnectingCall();
@@ -514,6 +477,15 @@
     return call != null && call != getDisconnectingCall() && call != getDisconnectedCall();
   }
 
+  boolean hasActiveRttCall() {
+    for (DialerCall call : getAllCalls()) {
+      if (call.isActiveRttCall()) {
+        return true;
+      }
+    }
+    return false;
+  }
+
   /**
    * Returns the first call found in the call map with the upgrade to video modification state.
    *
@@ -569,9 +541,9 @@
    */
   public boolean hasNonParentActiveOrBackgroundCall() {
     for (DialerCall call : callById.values()) {
-      if ((call.getState() == State.ACTIVE
-              || call.getState() == State.ONHOLD
-              || call.getState() == State.CONFERENCED)
+      if ((call.getState() == DialerCallState.ACTIVE
+              || call.getState() == DialerCallState.ONHOLD
+              || call.getState() == DialerCallState.CONFERENCED)
           && !call.wasParentCall()) {
         return true;
       }
@@ -588,11 +560,11 @@
   public void clearOnDisconnect() {
     for (DialerCall call : callById.values()) {
       final int state = call.getState();
-      if (state != DialerCall.State.IDLE
-          && state != DialerCall.State.INVALID
-          && state != DialerCall.State.DISCONNECTED) {
+      if (state != DialerCallState.IDLE
+          && state != DialerCallState.INVALID
+          && state != DialerCallState.DISCONNECTED) {
 
-        call.setState(DialerCall.State.DISCONNECTED);
+        call.setState(DialerCallState.DISCONNECTED);
         call.setDisconnectCause(new DisconnectCause(DisconnectCause.UNKNOWN));
         updateCallInMap(call);
       }
@@ -665,7 +637,7 @@
 
     boolean updated = false;
 
-    if (call.getState() == DialerCall.State.DISCONNECTED) {
+    if (call.getState() == DialerCallState.DISCONNECTED) {
       // update existing (but do not add!!) disconnected calls
       if (callById.containsKey(call.getId())) {
         // For disconnected calls, we want to keep them alive for a few seconds so that the
@@ -695,7 +667,7 @@
   }
 
   private int getDelayForDisconnect(DialerCall call) {
-    if (call.getState() != DialerCall.State.DISCONNECTED) {
+    if (call.getState() != DialerCallState.DISCONNECTED) {
       throw new IllegalStateException();
     }
 
@@ -725,7 +697,7 @@
 
   private boolean isCallDead(DialerCall call) {
     final int state = call.getState();
-    return DialerCall.State.IDLE == state || DialerCall.State.INVALID == state;
+    return DialerCallState.IDLE == state || DialerCallState.INVALID == state;
   }
 
   /** Sets up a call for deletion and notifies listeners of change. */
@@ -733,7 +705,7 @@
     if (pendingDisconnectCalls.contains(call)) {
       pendingDisconnectCalls.remove(call);
     }
-    call.setState(DialerCall.State.IDLE);
+    call.setState(DialerCallState.IDLE);
     updateCallInMap(call);
     notifyGenericListeners();
   }
@@ -775,6 +747,15 @@
      */
     void onUpgradeToVideo(DialerCall call);
 
+    /**
+     * Called when a new RTT call request comes in This is the only method that gets called for RTT
+     * requests.
+     */
+    default void onUpgradeToRtt(DialerCall call, int rttRequestId) {}
+
+    /** Called when the SpeakEasy state of a Dialer call is mutated. */
+    default void onSpeakEasyStateChange() {}
+
     /** Called when the session modification state of a call changes. */
     void onSessionModificationStateChange(DialerCall call);
 
@@ -846,6 +827,20 @@
     public void onDialerCallLastForwardedNumberChange() {}
 
     @Override
+    public void onDialerCallUpgradeToRtt(int rttRequestId) {
+      for (Listener listener : listeners) {
+        listener.onUpgradeToRtt(call, rttRequestId);
+      }
+    }
+
+    @Override
+    public void onDialerCallSpeakEasyStateChange() {
+      for (Listener listener : listeners) {
+        listener.onSpeakEasyStateChange();
+      }
+    }
+
+    @Override
     public void onDialerCallUpgradeToVideo() {
       for (Listener listener : listeners) {
         listener.onUpgradeToVideo(call);
diff --git a/java/com/android/incallui/call/DialerCall.java b/java/com/android/incallui/call/DialerCall.java
index d36b00d..1f4e49a 100644
--- a/java/com/android/incallui/call/DialerCall.java
+++ b/java/com/android/incallui/call/DialerCall.java
@@ -17,6 +17,7 @@
 package com.android.incallui.call;
 
 import android.Manifest.permission;
+import android.annotation.SuppressLint;
 import android.annotation.TargetApi;
 import android.content.Context;
 import android.hardware.camera2.CameraCharacteristics;
@@ -25,6 +26,8 @@
 import android.os.Build.VERSION;
 import android.os.Build.VERSION_CODES;
 import android.os.Bundle;
+import android.os.PersistableBundle;
+import android.os.SystemClock;
 import android.os.Trace;
 import android.support.annotation.IntDef;
 import android.support.annotation.NonNull;
@@ -45,17 +48,19 @@
 import android.telecom.TelecomManager;
 import android.telecom.VideoProfile;
 import android.text.TextUtils;
+import android.widget.Toast;
 import com.android.contacts.common.compat.CallCompat;
-import com.android.contacts.common.compat.telecom.TelecomManagerCompat;
 import com.android.dialer.assisteddialing.ConcreteCreator;
 import com.android.dialer.assisteddialing.TransformationInfo;
+import com.android.dialer.blocking.FilteredNumbersUtil;
 import com.android.dialer.callintent.CallInitiationType;
 import com.android.dialer.callintent.CallIntentParser;
 import com.android.dialer.callintent.CallSpecificAppData;
 import com.android.dialer.common.Assert;
 import com.android.dialer.common.LogUtil;
+import com.android.dialer.common.concurrent.DefaultFutureCallback;
 import com.android.dialer.compat.telephony.TelephonyManagerCompat;
-import com.android.dialer.configprovider.ConfigProviderBindings;
+import com.android.dialer.configprovider.ConfigProviderComponent;
 import com.android.dialer.duo.DuoComponent;
 import com.android.dialer.enrichedcall.EnrichedCallCapabilities;
 import com.android.dialer.enrichedcall.EnrichedCallComponent;
@@ -69,18 +74,29 @@
 import com.android.dialer.logging.ContactLookupResult.Type;
 import com.android.dialer.logging.DialerImpression;
 import com.android.dialer.logging.Logger;
+import com.android.dialer.preferredsim.PreferredAccountRecorder;
+import com.android.dialer.rtt.RttTranscript;
+import com.android.dialer.rtt.RttTranscriptUtil;
+import com.android.dialer.spam.status.SpamStatus;
 import com.android.dialer.telecom.TelecomCallUtil;
 import com.android.dialer.telecom.TelecomUtil;
-import com.android.dialer.theme.R;
+import com.android.dialer.theme.common.R;
+import com.android.dialer.time.Clock;
 import com.android.dialer.util.PermissionsUtil;
 import com.android.incallui.audiomode.AudioModeProvider;
+import com.android.incallui.call.state.DialerCallState;
 import com.android.incallui.latencyreport.LatencyReport;
+import com.android.incallui.rtt.protocol.RttChatMessage;
 import com.android.incallui.videotech.VideoTech;
 import com.android.incallui.videotech.VideoTech.VideoTechListener;
 import com.android.incallui.videotech.duo.DuoVideoTech;
 import com.android.incallui.videotech.empty.EmptyVideoTech;
 import com.android.incallui.videotech.ims.ImsVideoTech;
 import com.android.incallui.videotech.utils.VideoUtils;
+import com.google.common.base.Optional;
+import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.MoreExecutors;
+import java.io.IOException;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.util.ArrayList;
@@ -103,8 +119,11 @@
   public static final int PROPERTY_CODEC_KNOWN = 0x04000000;
 
   private static final String ID_PREFIX = "DialerCall_";
-  private static final String CONFIG_EMERGENCY_CALLBACK_WINDOW_MILLIS =
+
+  @VisibleForTesting
+  public static final String CONFIG_EMERGENCY_CALLBACK_WINDOW_MILLIS =
       "emergency_callback_window_millis";
+
   private static int idCounter = 0;
 
   /**
@@ -133,11 +152,13 @@
       new CopyOnWriteArrayList<>();
   private final VideoTechManager videoTechManager;
 
+  private boolean isSpeakEasyCall;
   private boolean isEmergencyCall;
   private Uri handle;
-  private int state = State.INVALID;
+  private int state = DialerCallState.INVALID;
   private DisconnectCause disconnectCause;
 
+  private boolean hasShownLteToWiFiHandoverToast;
   private boolean hasShownWiFiToLteHandoverToast;
   private boolean doNotShowDialogForHandoffToWifiFailure;
 
@@ -145,17 +166,15 @@
   private String lastForwardedNumber;
   private boolean isCallForwarded;
   private String callSubject;
-  private PhoneAccountHandle phoneAccountHandle;
+  @Nullable private PhoneAccountHandle phoneAccountHandle;
   @CallHistoryStatus private int callHistoryStatus = CALL_HISTORY_STATUS_UNKNOWN;
-  private boolean isSpam;
+
+  @Nullable private SpamStatus spamStatus;
   private boolean isBlocked;
 
-  @Nullable private Boolean isInUserSpamList;
-
-  @Nullable private Boolean isInUserWhiteList;
-
-  @Nullable private Boolean isInGlobalSpamList;
   private boolean didShowCameraPermission;
+  private boolean didDismissVideoChargesAlertDialog;
+  private PersistableBundle carrierConfig;
   private String callProviderLabel;
   private String callbackNumber;
   private int cameraDirection = CameraDirection.CAMERA_DIRECTION_UNKNOWN;
@@ -177,13 +196,19 @@
 
   private volatile boolean feedbackRequested = false;
 
+  private Clock clock = System::currentTimeMillis;
+
+  @Nullable private PreferredAccountRecorder preferredAccountRecorder;
+  private boolean isCallRemoved;
+
   public static String getNumberFromHandle(Uri handle) {
     return handle == null ? "" : handle.getSchemeSpecificPart();
   }
 
   /**
    * Whether the call is put on hold by remote party. This is different than the {@link
-   * State#ONHOLD} state which indicates that the call is being held locally on the device.
+   * DialerCallState#ONHOLD} state which indicates that the call is being held locally on the
+   * device.
    */
   private boolean isRemotelyHeld;
 
@@ -196,6 +221,16 @@
    */
   private boolean isCallSubjectSupported;
 
+  public RttTranscript getRttTranscript() {
+    return rttTranscript;
+  }
+
+  public void setRttTranscript(RttTranscript rttTranscript) {
+    this.rttTranscript = rttTranscript;
+  }
+
+  private RttTranscript rttTranscript;
+
   private final Call.Callback telecomCallCallback =
       new Call.Callback() {
         @Override
@@ -272,17 +307,28 @@
         @Override
         public void onRttRequest(Call call, int id) {
           LogUtil.v("TelecomCallCallback.onRttRequest", "id=%d", id);
+          for (DialerCallListener listener : listeners) {
+            listener.onDialerCallUpgradeToRtt(id);
+          }
         }
 
         @Override
         public void onRttInitiationFailure(Call call, int reason) {
           LogUtil.v("TelecomCallCallback.onRttInitiationFailure", "reason=%d", reason);
+          Toast.makeText(context, R.string.rtt_call_not_available_toast, Toast.LENGTH_LONG).show();
           update();
         }
 
         @Override
         public void onRttStatusChanged(Call call, boolean enabled, RttCall rttCall) {
           LogUtil.v("TelecomCallCallback.onRttStatusChanged", "enabled=%b", enabled);
+          if (enabled) {
+            Logger.get(context)
+                .logCallImpression(
+                    DialerImpression.Type.RTT_MID_CALL_ENABLED,
+                    getUniqueCallId(),
+                    getTimeAddedMs());
+          }
           update();
         }
 
@@ -301,6 +347,9 @@
             case TelephonyManagerCompat.EVENT_HANDOVER_VIDEO_FROM_WIFI_TO_LTE:
               notifyWiFiToLteHandover();
               break;
+            case TelephonyManagerCompat.EVENT_HANDOVER_VIDEO_FROM_LTE_TO_WIFI:
+              onLteToWifiHandover();
+              break;
             case TelephonyManagerCompat.EVENT_HANDOVER_TO_WIFI_FAILED:
               notifyHandoverToWifiFailed();
               break;
@@ -371,41 +420,29 @@
     updateEnrichedCallSession();
   }
 
-  /** Test only constructor to avoid initializing dependencies. */
-  @VisibleForTesting
-  DialerCall(Context context) {
-    this.context = context;
-    telecomCall = null;
-    latencyReport = null;
-    id = null;
-    hiddenId = 0;
-    dialerCallDelegate = null;
-    videoTechManager = null;
-  }
-
   private static int translateState(int state) {
     switch (state) {
       case Call.STATE_NEW:
       case Call.STATE_CONNECTING:
-        return DialerCall.State.CONNECTING;
+        return DialerCallState.CONNECTING;
       case Call.STATE_SELECT_PHONE_ACCOUNT:
-        return DialerCall.State.SELECT_PHONE_ACCOUNT;
+        return DialerCallState.SELECT_PHONE_ACCOUNT;
       case Call.STATE_DIALING:
-        return DialerCall.State.DIALING;
+        return DialerCallState.DIALING;
       case Call.STATE_PULLING_CALL:
-        return DialerCall.State.PULLING;
+        return DialerCallState.PULLING;
       case Call.STATE_RINGING:
-        return DialerCall.State.INCOMING;
+        return DialerCallState.INCOMING;
       case Call.STATE_ACTIVE:
-        return DialerCall.State.ACTIVE;
+        return DialerCallState.ACTIVE;
       case Call.STATE_HOLDING:
-        return DialerCall.State.ONHOLD;
+        return DialerCallState.ONHOLD;
       case Call.STATE_DISCONNECTED:
-        return DialerCall.State.DISCONNECTED;
+        return DialerCallState.DISCONNECTED;
       case Call.STATE_DISCONNECTING:
-        return DialerCall.State.DISCONNECTING;
+        return DialerCallState.DISCONNECTING;
       default:
-        return DialerCall.State.INVALID;
+        return DialerCallState.INVALID;
     }
   }
 
@@ -440,6 +477,17 @@
     cannedTextResponsesLoadedListeners.remove(listener);
   }
 
+  private void onLteToWifiHandover() {
+    LogUtil.enterBlock("DialerCall.onLteToWifiHandover");
+    if (hasShownLteToWiFiHandoverToast) {
+      return;
+    }
+
+    Toast.makeText(context, R.string.video_call_lte_to_wifi_handover_toast, Toast.LENGTH_LONG)
+        .show();
+    hasShownLteToWiFiHandoverToast = true;
+  }
+
   public void notifyWiFiToLteHandover() {
     LogUtil.i("DialerCall.notifyWiFiToLteHandover", "");
     for (DialerCallListener listener : listeners) {
@@ -464,7 +512,7 @@
   /* package-private */ Call getTelecomCall() {
     return telecomCall;
   }
-  
+
   public StatusHints getStatusHints() {
     return telecomCall.getDetails().getStatusHints();
   }
@@ -519,7 +567,7 @@
     videoTech = null;
     // We want to potentially register a video call callback here.
     updateFromTelecomCall();
-    if (oldState != getState() && getState() == DialerCall.State.DISCONNECTED) {
+    if (oldState != getState() && getState() == DialerCallState.DISCONNECTED) {
       for (DialerCallListener listener : listeners) {
         listener.onDialerCallDisconnect();
       }
@@ -545,7 +593,7 @@
     videoTechManager.dispatchCallStateChanged(telecomCall.getState(), getAccountHandle());
 
     final int translatedState = translateState(telecomCall.getState());
-    if (state != State.BLOCKED) {
+    if (state != DialerCallState.BLOCKED) {
       setState(translatedState);
       setDisconnectCause(telecomCall.getDetails().getDisconnectCause());
     }
@@ -585,6 +633,9 @@
         if (phoneAccount != null) {
           isCallSubjectSupported =
               phoneAccount.hasCapabilities(PhoneAccount.CAPABILITY_CALL_SUBJECT);
+          if (phoneAccount.hasCapabilities(PhoneAccount.CAPABILITY_SIM_SUBSCRIPTION)) {
+            cacheCarrierConfiguration(phoneAccountHandle);
+          }
         }
       }
     }
@@ -597,6 +648,26 @@
   }
 
   /**
+   * Caches frequently used carrier configuration locally.
+   *
+   * @param accountHandle The PhoneAccount handle.
+   */
+  @SuppressLint("MissingPermission")
+  private void cacheCarrierConfiguration(PhoneAccountHandle accountHandle) {
+    if (!PermissionsUtil.hasPermission(context, permission.READ_PHONE_STATE)) {
+      return;
+    }
+    if (VERSION.SDK_INT < VERSION_CODES.O) {
+      return;
+    }
+    // TODO(a bug): This may take several seconds to complete, revisit it to move it to worker
+    // thread.
+    carrierConfig =
+        TelephonyManagerCompat.getTelephonyManagerForPhoneAccountHandle(context, accountHandle)
+            .getCarrierConfig();
+  }
+
+  /**
    * Tests corruption of the {@code callExtras} bundle by calling {@link
    * Bundle#containsKey(String)}. If the bundle is corrupted a {@link IllegalArgumentException} will
    * be thrown and caught by this function.
@@ -712,6 +783,14 @@
     doNotShowDialogForHandoffToWifiFailure = bool;
   }
 
+  public boolean showVideoChargesAlertDialog() {
+    if (carrierConfig == null) {
+      return false;
+    }
+    return carrierConfig.getBoolean(
+        TelephonyManagerCompat.CARRIER_CONFIG_KEY_SHOW_VIDEO_CALL_CHARGES_ALERT_DIALOG_BOOL);
+  }
+
   public long getTimeAddedMs() {
     return timeAddedMs;
   }
@@ -723,7 +802,7 @@
 
   public void blockCall() {
     telecomCall.reject(false, null);
-    setState(State.BLOCKED);
+    setState(DialerCallState.BLOCKED);
   }
 
   @Nullable
@@ -741,13 +820,19 @@
     if (hasProperty(Details.PROPERTY_EMERGENCY_CALLBACK_MODE)) {
       return true;
     }
+
+    // Call.EXTRA_LAST_EMERGENCY_CALLBACK_TIME_MILLIS is available starting in O
+    if (VERSION.SDK_INT < VERSION_CODES.O) {
+      long timestampMillis = FilteredNumbersUtil.getLastEmergencyCallTimeMillis(context);
+      return isInEmergencyCallbackWindow(timestampMillis);
+    }
+
     // We want to treat any incoming call that arrives a short time after an outgoing emergency call
     // as a potential emergency callback.
     if (getExtras() != null
-        && getExtras().getLong(TelecomManagerCompat.EXTRA_LAST_EMERGENCY_CALLBACK_TIME_MILLIS, 0)
-            > 0) {
+        && getExtras().getLong(Call.EXTRA_LAST_EMERGENCY_CALLBACK_TIME_MILLIS, 0) > 0) {
       long lastEmergencyCallMillis =
-          getExtras().getLong(TelecomManagerCompat.EXTRA_LAST_EMERGENCY_CALLBACK_TIME_MILLIS, 0);
+          getExtras().getLong(Call.EXTRA_LAST_EMERGENCY_CALLBACK_TIME_MILLIS, 0);
       if (isInEmergencyCallbackWindow(lastEmergencyCallMillis)) {
         return true;
       }
@@ -757,14 +842,15 @@
 
   boolean isInEmergencyCallbackWindow(long timestampMillis) {
     long emergencyCallbackWindowMillis =
-        ConfigProviderBindings.get(context)
+        ConfigProviderComponent.get(context)
+            .getConfigProvider()
             .getLong(CONFIG_EMERGENCY_CALLBACK_WINDOW_MILLIS, TimeUnit.MINUTES.toMillis(5));
     return System.currentTimeMillis() - timestampMillis < emergencyCallbackWindowMillis;
   }
 
   public int getState() {
     if (telecomCall != null && telecomCall.getParent() != null) {
-      return State.CONFERENCED;
+      return DialerCallState.CONFERENCED;
     } else {
       return state;
     }
@@ -775,23 +861,51 @@
   }
 
   public void setState(int state) {
-    if (state == State.INCOMING) {
+    if (state == DialerCallState.INCOMING) {
       logState.isIncoming = true;
-    } else if (state == State.DISCONNECTED) {
+    }
+    updateCallTiming(state);
+
+    this.state = state;
+  }
+
+  private void updateCallTiming(int newState) {
+    if (newState == DialerCallState.ACTIVE) {
+      if (this.state == DialerCallState.ACTIVE) {
+        LogUtil.i("DialerCall.updateCallTiming", "state is already active");
+        return;
+      }
+      logState.dialerConnectTimeMillis = clock.currentTimeMillis();
+      logState.dialerConnectTimeMillisElapsedRealtime = SystemClock.elapsedRealtime();
+    }
+
+    if (newState == DialerCallState.DISCONNECTED) {
       long newDuration =
-          getConnectTimeMillis() == 0 ? 0 : System.currentTimeMillis() - getConnectTimeMillis();
-      if (this.state != state) {
-        logState.duration = newDuration;
-      } else {
+          getConnectTimeMillis() == 0 ? 0 : clock.currentTimeMillis() - getConnectTimeMillis();
+      if (this.state == DialerCallState.DISCONNECTED) {
         LogUtil.i(
             "DialerCall.setState",
             "ignoring state transition from DISCONNECTED to DISCONNECTED."
                 + " Duration would have changed from %s to %s",
-            logState.duration,
+            logState.telecomDurationMillis,
             newDuration);
+        return;
       }
+      logState.telecomDurationMillis = newDuration;
+      logState.dialerDurationMillis =
+          logState.dialerConnectTimeMillis == 0
+              ? 0
+              : clock.currentTimeMillis() - logState.dialerConnectTimeMillis;
+      logState.dialerDurationMillisElapsedRealtime =
+          logState.dialerConnectTimeMillisElapsedRealtime == 0
+              ? 0
+              : SystemClock.elapsedRealtime() - logState.dialerConnectTimeMillisElapsedRealtime;
     }
-    this.state = state;
+  }
+
+  @VisibleForTesting
+  void setClock(Clock clock) {
+    this.clock = clock;
   }
 
   public int getNumberPresentation() {
@@ -845,7 +959,7 @@
 
   /** Returns call disconnect cause, defined by {@link DisconnectCause}. */
   public DisconnectCause getDisconnectCause() {
-    if (state == State.DISCONNECTED || state == State.IDLE) {
+    if (state == DialerCallState.DISCONNECTED || state == DialerCallState.IDLE) {
       return disconnectCause;
     }
 
@@ -863,13 +977,23 @@
   }
 
   /** Checks if the call supports the given set of capabilities supplied as a bit mask. */
+  @TargetApi(28)
   public boolean can(int capabilities) {
     int supportedCapabilities = telecomCall.getDetails().getCallCapabilities();
 
     if ((capabilities & Call.Details.CAPABILITY_MERGE_CONFERENCE) != 0) {
+      boolean hasConferenceableCall = false;
+      // RTT call is not conferenceable, it's a bug (a bug) in Telecom and we work around it
+      // here before it's fixed in Telecom.
+      for (Call call : telecomCall.getConferenceableCalls()) {
+        if (!(BuildCompat.isAtLeastP() && call.isRttActive())) {
+          hasConferenceableCall = true;
+          break;
+        }
+      }
       // We allow you to merge if the capabilities allow it or if it is a call with
       // conferenceable calls.
-      if (telecomCall.getConferenceableCalls().isEmpty()
+      if (!hasConferenceableCall
           && ((Call.Details.CAPABILITY_MERGE_CONFERENCE & supportedCapabilities) == 0)) {
         // Cannot merge calls if there are no calls to merge with.
         return false;
@@ -893,6 +1017,16 @@
     return telecomCall.getDetails().getConnectTimeMillis();
   }
 
+  /**
+   * Gets the time when the call is created (see {@link Details#getCreationTimeMillis()}). This is
+   * the same time that is logged as the start time in the Call Log (see {@link
+   * android.provider.CallLog.Calls#DATE}).
+   */
+  @TargetApi(VERSION_CODES.O)
+  public long getCreationTimeMillis() {
+    return telecomCall.getDetails().getCreationTimeMillis();
+  }
+
   public boolean isConferenceCall() {
     return hasProperty(Call.Details.PROPERTY_CONFERENCE);
   }
@@ -933,7 +1067,7 @@
   }
 
   @TargetApi(28)
-  public boolean isRttCall() {
+  public boolean isActiveRttCall() {
     if (BuildCompat.isAtLeastP()) {
       return getTelecomCall().isRttActive();
     } else {
@@ -942,13 +1076,91 @@
   }
 
   @TargetApi(28)
+  @Nullable
   public RttCall getRttCall() {
-    if (!isRttCall()) {
+    if (!isActiveRttCall()) {
       return null;
     }
     return getTelecomCall().getRttCall();
   }
 
+  @TargetApi(28)
+  public boolean isPhoneAccountRttCapable() {
+    PhoneAccount phoneAccount = getPhoneAccount();
+    if (phoneAccount == null) {
+      return false;
+    }
+    if (!phoneAccount.hasCapabilities(PhoneAccount.CAPABILITY_RTT)) {
+      return false;
+    }
+    return true;
+  }
+
+  @TargetApi(28)
+  public boolean canUpgradeToRttCall() {
+    if (!isPhoneAccountRttCapable()) {
+      return false;
+    }
+    if (isActiveRttCall()) {
+      return false;
+    }
+    if (isVideoCall()) {
+      return false;
+    }
+    if (isConferenceCall()) {
+      return false;
+    }
+    if (CallList.getInstance().hasActiveRttCall()) {
+      return false;
+    }
+    return true;
+  }
+
+  @TargetApi(28)
+  public void sendRttUpgradeRequest() {
+    getTelecomCall().sendRttRequest();
+  }
+
+  @TargetApi(28)
+  public void respondToRttRequest(boolean accept, int rttRequestId) {
+    Logger.get(context)
+        .logCallImpression(
+            accept
+                ? DialerImpression.Type.RTT_MID_CALL_ACCEPTED
+                : DialerImpression.Type.RTT_MID_CALL_REJECTED,
+            getUniqueCallId(),
+            getTimeAddedMs());
+    getTelecomCall().respondToRttRequest(rttRequestId, accept);
+  }
+
+  @TargetApi(28)
+  private void saveRttTranscript() {
+    if (!BuildCompat.isAtLeastP()) {
+      return;
+    }
+    if (getRttCall() != null) {
+      // Save any remaining text in the buffer that's not shown by UI yet.
+      // This may happen when the call is switched to background before disconnect.
+      try {
+        String messageLeft = getRttCall().readImmediately();
+        if (!TextUtils.isEmpty(messageLeft)) {
+          rttTranscript =
+              RttChatMessage.getRttTranscriptWithNewRemoteMessage(rttTranscript, messageLeft);
+        }
+      } catch (IOException e) {
+        LogUtil.e("DialerCall.saveRttTranscript", "error when reading remaining message", e);
+      }
+    }
+    // Don't save transcript if it's empty.
+    if (rttTranscript.getMessagesCount() == 0) {
+      return;
+    }
+    Futures.addCallback(
+        RttTranscriptUtil.saveRttTranscript(context, rttTranscript),
+        new DefaultFutureCallback<>(),
+        MoreExecutors.directExecutor());
+  }
+
   public boolean hasReceivedVideoUpgradeRequest() {
     return VideoUtils.hasReceivedVideoUpgradeRequest(getVideoTech().getSessionModificationState());
   }
@@ -979,13 +1191,10 @@
    * <p>An external call is one which does not exist locally for the {@link
    * android.telecom.ConnectionService} it is associated with.
    *
-   * <p>External calls are only supported in N and higher.
-   *
    * @return {@code true} if the call is an external call, {@code false} otherwise.
    */
-  public boolean isExternalCall() {
-    return VERSION.SDK_INT >= VERSION_CODES.N
-        && hasProperty(CallCompat.Details.PROPERTY_IS_EXTERNAL_CALL);
+  boolean isExternalCall() {
+    return hasProperty(CallCompat.Details.PROPERTY_IS_EXTERNAL_CALL);
   }
 
   /**
@@ -1016,7 +1225,7 @@
               .setCallInitiationType(CallInitiationType.Type.EXTERNAL_INITIATION)
               .build();
     }
-    if (getState() == State.INCOMING) {
+    if (getState() == DialerCallState.INCOMING) {
       logState.callSpecificAppData =
           logState
               .callSpecificAppData
@@ -1039,7 +1248,7 @@
         "[%s, %s, %s, %s, children:%s, parent:%s, "
             + "conferenceable:%s, videoState:%s, mSessionModificationState:%d, CameraDir:%s]",
         id,
-        State.toString(getState()),
+        DialerCallState.toString(getState()),
         Details.capabilitiesToString(telecomCall.getDetails().getCallCapabilities()),
         Details.propertiesToString(telecomCall.getDetails().getCallProperties()),
         childCallIds,
@@ -1071,39 +1280,36 @@
     didShowCameraPermission = didShow;
   }
 
-  @Nullable
-  public Boolean isInGlobalSpamList() {
-    return isInGlobalSpamList;
+  public boolean didDismissVideoChargesAlertDialog() {
+    return didDismissVideoChargesAlertDialog;
   }
 
-  public void setIsInGlobalSpamList(boolean inSpamList) {
-    isInGlobalSpamList = inSpamList;
+  public void setDidDismissVideoChargesAlertDialog(boolean didDismiss) {
+    didDismissVideoChargesAlertDialog = didDismiss;
   }
 
-  @Nullable
-  public Boolean isInUserSpamList() {
-    return isInUserSpamList;
+  public void setSpamStatus(@Nullable SpamStatus spamStatus) {
+    this.spamStatus = spamStatus;
   }
 
-  public void setIsInUserSpamList(boolean inSpamList) {
-    isInUserSpamList = inSpamList;
-  }
-
-  @Nullable
-  public Boolean isInUserWhiteList() {
-    return isInUserWhiteList;
-  }
-
-  public void setIsInUserWhiteList(boolean inWhiteList) {
-    isInUserWhiteList = inWhiteList;
+  public Optional<SpamStatus> getSpamStatus() {
+    return Optional.fromNullable(spamStatus);
   }
 
   public boolean isSpam() {
-    return isSpam;
-  }
+    if (spamStatus == null || !spamStatus.isSpam()) {
+      return false;
+    }
 
-  public void setSpam(boolean isSpam) {
-    this.isSpam = isSpam;
+    if (!isIncoming()) {
+      return false;
+    }
+
+    if (isPotentialEmergencyCallback()) {
+      return false;
+    }
+
+    return true;
   }
 
   public boolean isBlocked() {
@@ -1228,7 +1434,7 @@
 
   public void disconnect() {
     LogUtil.i("DialerCall.disconnect", "");
-    setState(DialerCall.State.DISCONNECTING);
+    setState(DialerCallState.DISCONNECTING);
     for (DialerCallListener listener : listeners) {
       listener.onDialerCallUpdate();
     }
@@ -1469,8 +1675,16 @@
   }
 
   void onRemovedFromCallList() {
+    LogUtil.enterBlock("DialerCall.onRemovedFromCallList");
     // Ensure we clean up when this call is removed.
-    videoTechManager.dispatchRemovedFromCallList();
+    if (videoTechManager != null) {
+      videoTechManager.dispatchRemovedFromCallList();
+    }
+    // TODO(wangqi): Consider moving this to a DialerCallListener.
+    if (rttTranscript != null && !isCallRemoved) {
+      saveRttTranscript();
+    }
+    isCallRemoved = true;
   }
 
   public com.android.dialer.logging.VideoTech.Type getSelectedAvailableVideoTechType() {
@@ -1486,6 +1700,79 @@
   }
 
   /**
+   * If the in call UI has shown the phone account selection dialog for the call, the {@link
+   * PreferredAccountRecorder} to record the result from the dialog.
+   */
+  @Nullable
+  public PreferredAccountRecorder getPreferredAccountRecorder() {
+    return preferredAccountRecorder;
+  }
+
+  public void setPreferredAccountRecorder(PreferredAccountRecorder preferredAccountRecorder) {
+    this.preferredAccountRecorder = preferredAccountRecorder;
+  }
+
+  /** Indicates the call is eligible for SpeakEasy */
+  public boolean isSpeakEasyEligible() {
+
+    PhoneAccount phoneAccount = getPhoneAccount();
+
+    if (phoneAccount == null) {
+      return false;
+    }
+
+    if (!phoneAccount.hasCapabilities(PhoneAccount.CAPABILITY_SIM_SUBSCRIPTION)) {
+      return false;
+    }
+
+    return !isPotentialEmergencyCallback()
+        && !isEmergencyCall()
+        && !isActiveRttCall()
+        && !isConferenceCall()
+        && !isVideoCall()
+        && !isVoiceMailNumber()
+        && !hasReceivedVideoUpgradeRequest()
+        && !isVoipCallNotSupportedBySpeakeasy();
+  }
+
+  private boolean isVoipCallNotSupportedBySpeakeasy() {
+    Bundle extras = getIntentExtras();
+
+    if (extras == null) {
+      return false;
+    }
+
+    // Indicates an VOIP call.
+    String callid = extras.getString("callid");
+
+    if (TextUtils.isEmpty(callid)) {
+      LogUtil.i("DialerCall.isVoipCallNotSupportedBySpeakeasy", "callid was empty");
+      return false;
+    }
+
+    LogUtil.i("DialerCall.isVoipCallNotSupportedBySpeakeasy", "call is not eligible");
+    return true;
+  }
+
+  /** Indicates the user has selected SpeakEasy */
+  public boolean isSpeakEasyCall() {
+    if (!isSpeakEasyEligible()) {
+      return false;
+    }
+    return isSpeakEasyCall;
+  }
+
+  /** Sets the user preference for SpeakEasy */
+  public void setIsSpeakEasyCall(boolean isSpeakEasyCall) {
+    this.isSpeakEasyCall = isSpeakEasyCall;
+    if (listeners != null) {
+      for (DialerCallListener listener : listeners) {
+        listener.onDialerCallSpeakEasyStateChange();
+      }
+    }
+  }
+
+  /**
    * Specifies whether a number is in the call history or not. {@link #CALL_HISTORY_STATUS_UNKNOWN}
    * means there is no result.
    */
@@ -1497,88 +1784,6 @@
   @Retention(RetentionPolicy.SOURCE)
   public @interface CallHistoryStatus {}
 
-  /* Defines different states of this call */
-  public static class State {
-
-    public static final int INVALID = 0;
-    public static final int NEW = 1; /* The call is new. */
-    public static final int IDLE = 2; /* The call is idle.  Nothing active */
-    public static final int ACTIVE = 3; /* There is an active call */
-    public static final int INCOMING = 4; /* A normal incoming phone call */
-    public static final int CALL_WAITING = 5; /* Incoming call while another is active */
-    public static final int DIALING = 6; /* An outgoing call during dial phase */
-    public static final int REDIALING = 7; /* Subsequent dialing attempt after a failure */
-    public static final int ONHOLD = 8; /* An active phone call placed on hold */
-    public static final int DISCONNECTING = 9; /* A call is being ended. */
-    public static final int DISCONNECTED = 10; /* State after a call disconnects */
-    public static final int CONFERENCED = 11; /* DialerCall part of a conference call */
-    public static final int SELECT_PHONE_ACCOUNT = 12; /* Waiting for account selection */
-    public static final int CONNECTING = 13; /* Waiting for Telecom broadcast to finish */
-    public static final int BLOCKED = 14; /* The number was found on the block list */
-    public static final int PULLING = 15; /* An external call being pulled to the device */
-    public static final int CALL_PENDING = 16; /* A call is pending on a long process to finish */
-
-    public static boolean isConnectingOrConnected(int state) {
-      switch (state) {
-        case ACTIVE:
-        case INCOMING:
-        case CALL_WAITING:
-        case CONNECTING:
-        case DIALING:
-        case PULLING:
-        case REDIALING:
-        case ONHOLD:
-        case CONFERENCED:
-          return true;
-        default:
-          return false;
-      }
-    }
-
-    public static boolean isDialing(int state) {
-      return state == DIALING || state == PULLING || state == REDIALING;
-    }
-
-    public static String toString(int state) {
-      switch (state) {
-        case INVALID:
-          return "INVALID";
-        case NEW:
-          return "NEW";
-        case IDLE:
-          return "IDLE";
-        case ACTIVE:
-          return "ACTIVE";
-        case INCOMING:
-          return "INCOMING";
-        case CALL_WAITING:
-          return "CALL_WAITING";
-        case DIALING:
-          return "DIALING";
-        case PULLING:
-          return "PULLING";
-        case REDIALING:
-          return "REDIALING";
-        case ONHOLD:
-          return "ONHOLD";
-        case DISCONNECTING:
-          return "DISCONNECTING";
-        case DISCONNECTED:
-          return "DISCONNECTED";
-        case CONFERENCED:
-          return "CONFERENCED";
-        case SELECT_PHONE_ACCOUNT:
-          return "SELECT_PHONE_ACCOUNT";
-        case CONNECTING:
-          return "CONNECTING";
-        case BLOCKED:
-          return "BLOCKED";
-        default:
-          return "UNKNOWN";
-      }
-    }
-  }
-
   /** Camera direction constants */
   public static class CameraDirection {
     public static final int CAMERA_DIRECTION_UNKNOWN = -1;
@@ -1600,9 +1805,25 @@
     public CallSpecificAppData callSpecificAppData;
     // If this was a conference call, the total number of calls involved in the conference.
     public int conferencedCalls = 0;
-    public long duration = 0;
     public boolean isLogged = false;
 
+    // Result of subtracting android.telecom.Call.Details#getConnectTimeMillis from the current time
+    public long telecomDurationMillis = 0;
+
+    // Result of a call to System.currentTimeMillis when Dialer sees that a call
+    // moves to the ACTIVE state
+    long dialerConnectTimeMillis = 0;
+
+    // Same as dialer_connect_time_millis, using SystemClock.elapsedRealtime
+    // instead
+    long dialerConnectTimeMillisElapsedRealtime = 0;
+
+    // Result of subtracting dialer_connect_time_millis from System.currentTimeMillis
+    public long dialerDurationMillis = 0;
+
+    // Same as dialerDurationMillis, using SystemClock.elapsedRealtime instead
+    public long dialerDurationMillisElapsedRealtime = 0;
+
     private static String lookupToString(ContactLookupResult.Type lookupType) {
       switch (lookupType) {
         case LOCAL_CONTACT:
@@ -1671,7 +1892,7 @@
           isIncoming,
           lookupToString(contactLookupResult),
           initiationToString(callSpecificAppData),
-          duration);
+          telecomDurationMillis);
     }
   }
 
diff --git a/java/com/android/incallui/call/DialerCallListener.java b/java/com/android/incallui/call/DialerCallListener.java
index 5d24a4d..a42ccbd 100644
--- a/java/com/android/incallui/call/DialerCallListener.java
+++ b/java/com/android/incallui/call/DialerCallListener.java
@@ -29,6 +29,10 @@
 
   void onDialerCallUpgradeToVideo();
 
+  default void onDialerCallUpgradeToRtt(int rttRequestId) {}
+
+  default void onDialerCallSpeakEasyStateChange() {}
+
   void onDialerCallSessionModificationStateChange();
 
   void onWiFiToLteHandover();
diff --git a/java/com/android/incallui/call/TelecomAdapter.java b/java/com/android/incallui/call/TelecomAdapter.java
index a7e10d3..4ae1bc1 100644
--- a/java/com/android/incallui/call/TelecomAdapter.java
+++ b/java/com/android/incallui/call/TelecomAdapter.java
@@ -16,7 +16,9 @@
 
 package com.android.incallui.call;
 
+import android.annotation.TargetApi;
 import android.app.Notification;
+import android.bluetooth.BluetoothDevice;
 import android.content.ActivityNotFoundException;
 import android.content.Intent;
 import android.os.Looper;
@@ -193,4 +195,13 @@
           "no inCallService available for stopping foreground notification");
     }
   }
+
+  @TargetApi(28)
+  public void requestBluetoothAudio(BluetoothDevice bluetoothDevice) {
+    if (inCallService != null) {
+      inCallService.requestBluetoothAudio(bluetoothDevice);
+    } else {
+      LogUtil.e("TelecomAdapter.requestBluetoothAudio", "inCallService is null");
+    }
+  }
 }
diff --git a/java/com/android/incallui/call/state/DialerCallState.java b/java/com/android/incallui/call/state/DialerCallState.java
new file mode 100644
index 0000000..266d6d6
--- /dev/null
+++ b/java/com/android/incallui/call/state/DialerCallState.java
@@ -0,0 +1,99 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.incallui.call.state;
+
+/** Defines different states of {@link com.android.incallui.call.DialerCall} */
+public class DialerCallState {
+
+  public static final int INVALID = 0;
+  public static final int NEW = 1; /* The call is new. */
+  public static final int IDLE = 2; /* The call is idle.  Nothing active */
+  public static final int ACTIVE = 3; /* There is an active call */
+  public static final int INCOMING = 4; /* A normal incoming phone call */
+  public static final int CALL_WAITING = 5; /* Incoming call while another is active */
+  public static final int DIALING = 6; /* An outgoing call during dial phase */
+  public static final int REDIALING = 7; /* Subsequent dialing attempt after a failure */
+  public static final int ONHOLD = 8; /* An active phone call placed on hold */
+  public static final int DISCONNECTING = 9; /* A call is being ended. */
+  public static final int DISCONNECTED = 10; /* State after a call disconnects */
+  public static final int CONFERENCED = 11; /* DialerCall part of a conference call */
+  public static final int SELECT_PHONE_ACCOUNT = 12; /* Waiting for account selection */
+  public static final int CONNECTING = 13; /* Waiting for Telecom broadcast to finish */
+  public static final int BLOCKED = 14; /* The number was found on the block list */
+  public static final int PULLING = 15; /* An external call being pulled to the device */
+  public static final int CALL_PENDING = 16; /* A call is pending on a long process to finish */
+
+  public static boolean isConnectingOrConnected(int state) {
+    switch (state) {
+      case ACTIVE:
+      case INCOMING:
+      case CALL_WAITING:
+      case CONNECTING:
+      case DIALING:
+      case PULLING:
+      case REDIALING:
+      case ONHOLD:
+      case CONFERENCED:
+        return true;
+      default:
+        return false;
+    }
+  }
+
+  public static boolean isDialing(int state) {
+    return state == DIALING || state == PULLING || state == REDIALING;
+  }
+
+  public static String toString(int state) {
+    switch (state) {
+      case INVALID:
+        return "INVALID";
+      case NEW:
+        return "NEW";
+      case IDLE:
+        return "IDLE";
+      case ACTIVE:
+        return "ACTIVE";
+      case INCOMING:
+        return "INCOMING";
+      case CALL_WAITING:
+        return "CALL_WAITING";
+      case DIALING:
+        return "DIALING";
+      case PULLING:
+        return "PULLING";
+      case REDIALING:
+        return "REDIALING";
+      case ONHOLD:
+        return "ONHOLD";
+      case DISCONNECTING:
+        return "DISCONNECTING";
+      case DISCONNECTED:
+        return "DISCONNECTED";
+      case CONFERENCED:
+        return "CONFERENCED";
+      case SELECT_PHONE_ACCOUNT:
+        return "SELECT_PHONE_ACCOUNT";
+      case CONNECTING:
+        return "CONNECTING";
+      case BLOCKED:
+        return "BLOCKED";
+      default:
+        return "UNKNOWN";
+    }
+  }
+}
diff --git a/java/com/android/incallui/callconfiguration/call_configuration.proto b/java/com/android/incallui/callconfiguration/call_configuration.proto
new file mode 100644
index 0000000..2cf3c06
--- /dev/null
+++ b/java/com/android/incallui/callconfiguration/call_configuration.proto
@@ -0,0 +1,32 @@
+// Copyright (C) 2018 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License
+
+syntax = "proto2";
+
+option java_package = "com.android.dialer";
+option java_multiple_files = true;
+option optimize_for = LITE_RUNTIME;
+
+
+package com.android.dialer;
+
+// Configuration for starting a call
+message CallConfiguration {
+  optional Mode call_mode = 1;
+}
+
+enum Mode {
+  MODE_UNSPECIFIED = 0;
+  BUBBLE = 1;
+}
diff --git a/java/com/android/incallui/calllocation/impl/AndroidManifest.xml b/java/com/android/incallui/calllocation/impl/AndroidManifest.xml
index fda9404..3e5a6d0 100644
--- a/java/com/android/incallui/calllocation/impl/AndroidManifest.xml
+++ b/java/com/android/incallui/calllocation/impl/AndroidManifest.xml
@@ -19,6 +19,8 @@
   package="com.android.incallui.calllocation.impl">
 
   <application>
+    <!-- Fix for P -->
+    <uses-library android:name="org.apache.http.legacy" android:required="false" />
 
     <meta-data
       android:name="com.google.android.gms.version"
diff --git a/java/com/android/incallui/calllocation/impl/DownloadMapImageTask.java b/java/com/android/incallui/calllocation/impl/DownloadMapImageTask.java
deleted file mode 100644
index c7249e0..0000000
--- a/java/com/android/incallui/calllocation/impl/DownloadMapImageTask.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.incallui.calllocation.impl;
-
-import android.graphics.drawable.Drawable;
-import android.location.Location;
-import android.net.TrafficStats;
-import android.os.AsyncTask;
-import com.android.dialer.common.LogUtil;
-import com.android.dialer.constants.TrafficStatsTags;
-import com.android.incallui.calllocation.impl.LocationPresenter.LocationUi;
-import java.io.InputStream;
-import java.lang.ref.WeakReference;
-import java.net.URL;
-
-class DownloadMapImageTask extends AsyncTask<Location, Void, Drawable> {
-
-  private static final String STATIC_MAP_SRC_NAME = "src";
-
-  private final WeakReference<LocationUi> uiReference;
-
-  public DownloadMapImageTask(WeakReference<LocationUi> uiReference) {
-    this.uiReference = uiReference;
-  }
-
-  @Override
-  protected Drawable doInBackground(Location... locations) {
-    LocationUi ui = uiReference.get();
-    if (ui == null) {
-      return null;
-    }
-    if (locations == null || locations.length == 0) {
-      LogUtil.e("DownloadMapImageTask.doInBackground", "No location provided");
-      return null;
-    }
-
-    try {
-      URL mapUrl = new URL(LocationUrlBuilder.getStaticMapUrl(ui.getContext(), locations[0]));
-      TrafficStats.setThreadStatsTag(TrafficStatsTags.DOWNLOAD_LOCATION_MAP_TAG);
-      InputStream content = (InputStream) mapUrl.getContent();
-
-      return Drawable.createFromStream(content, STATIC_MAP_SRC_NAME);
-    } catch (Exception ex) {
-      LogUtil.e("DownloadMapImageTask.doInBackground", "Exception!!!", ex);
-      return null;
-    } finally {
-      TrafficStats.clearThreadStatsTag();
-    }
-  }
-
-  @Override
-  protected void onPostExecute(Drawable mapImage) {
-    LocationUi ui = uiReference.get();
-    if (ui == null) {
-      return;
-    }
-
-    try {
-      ui.setMap(mapImage);
-    } catch (Exception ex) {
-      LogUtil.e("DownloadMapImageTask.onPostExecute", "Exception!!!", ex);
-    }
-  }
-}
diff --git a/java/com/android/incallui/calllocation/impl/LocationFragment.java b/java/com/android/incallui/calllocation/impl/LocationFragment.java
index 77e4f7f..760829d 100644
--- a/java/com/android/incallui/calllocation/impl/LocationFragment.java
+++ b/java/com/android/incallui/calllocation/impl/LocationFragment.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 The Android Open Source Project
+ * Copyright (C) 2018 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,21 +18,26 @@
 
 import android.animation.LayoutTransition;
 import android.content.Context;
-import android.graphics.drawable.Drawable;
 import android.location.Location;
 import android.os.Bundle;
 import android.os.Handler;
+import android.support.annotation.NonNull;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.ViewAnimator;
+import com.android.dialer.common.Assert;
 import com.android.dialer.common.LogUtil;
 import com.android.dialer.logging.DialerImpression;
 import com.android.dialer.logging.Logger;
 import com.android.incallui.baseui.BaseFragment;
+import com.google.android.gms.maps.CameraUpdateFactory;
+import com.google.android.gms.maps.GoogleMap;
+import com.google.android.gms.maps.MapView;
+import com.google.android.gms.maps.model.LatLng;
+import com.google.android.gms.maps.model.MarkerOptions;
 import java.util.Objects;
 import java.util.concurrent.TimeUnit;
 
@@ -47,18 +52,23 @@
 
   private static final String ADDRESS_DELIMITER = ",";
 
-  // Indexes used to animate fading between views
-  private static final int LOADING_VIEW_INDEX = 0;
+  // Indexes used to animate fading between views, 0 for LOADING_VIEW_INDEX
   private static final int LOCATION_VIEW_INDEX = 1;
-  private static final long TIMEOUT_MILLIS = TimeUnit.SECONDS.toMillis(5);
+  private static final int LOCATION_ERROR_INDEX = 2;
+
+  private static final long FIND_LOCATION_SPINNING_TIMEOUT_MILLIS = TimeUnit.SECONDS.toMillis(5);
+  private static final long LOAD_DATA_TIMEOUT_MILLIS = TimeUnit.SECONDS.toMillis(5);
+
+  private static final float MAP_ZOOM_LEVEL = 15f;
 
   private ViewAnimator viewAnimator;
-  private ImageView locationMap;
+  private MapView locationMapView;
   private TextView addressLine1;
   private TextView addressLine2;
   private TextView latLongLine;
   private Location location;
   private ViewGroup locationLayout;
+  private GoogleMap savedGoogleMap;
 
   private boolean isMapSet;
   private boolean isAddressSet;
@@ -75,6 +85,14 @@
         showLocationNow();
       };
 
+  private final Runnable spinningTimeoutRunnable =
+      () -> {
+        if (!(isAddressSet || isLocationSet || isMapSet)) {
+          // No data received, show error
+          viewAnimator.setDisplayedChild(LOCATION_ERROR_INDEX);
+        }
+      };
+
   @Override
   public LocationPresenter createPresenter() {
     return new LocationPresenter();
@@ -91,30 +109,68 @@
     LogUtil.enterBlock("LocationFragment.onCreateView");
     final View view = inflater.inflate(R.layout.location_fragment, container, false);
     viewAnimator = (ViewAnimator) view.findViewById(R.id.location_view_animator);
-    locationMap = (ImageView) view.findViewById(R.id.location_map);
     addressLine1 = (TextView) view.findViewById(R.id.address_line_one);
     addressLine2 = (TextView) view.findViewById(R.id.address_line_two);
     latLongLine = (TextView) view.findViewById(R.id.lat_long_line);
     locationLayout = (ViewGroup) view.findViewById(R.id.location_layout);
+    locationMapView = (MapView) view.findViewById(R.id.location_map_view);
+    locationMapView.onCreate(savedInstanceState);
     return view;
   }
 
   @Override
+  public void onStart() {
+    super.onStart();
+    handler.postDelayed(spinningTimeoutRunnable, FIND_LOCATION_SPINNING_TIMEOUT_MILLIS);
+  }
+
+  @Override
   public void onDestroy() {
     super.onDestroy();
     handler.removeCallbacks(dataTimeoutRunnable);
+    handler.removeCallbacks(spinningTimeoutRunnable);
   }
 
-  @Override
-  public void setMap(Drawable mapImage) {
+  private void setMap(@NonNull Location location) {
     LogUtil.enterBlock("LocationFragment.setMap");
-    isMapSet = true;
-    locationMap.setVisibility(View.VISIBLE);
-    locationMap.setImageDrawable(mapImage);
+    Assert.isNotNull(location);
+
+    if (savedGoogleMap == null) {
+      locationMapView.getMapAsync(
+          (googleMap) -> {
+            LogUtil.enterBlock("LocationFragment.onMapReady");
+            savedGoogleMap = googleMap;
+            savedGoogleMap.getUiSettings().setMapToolbarEnabled(false);
+            updateMap(location);
+            isMapSet = true;
+            locationMapView.setVisibility(View.VISIBLE);
+
+            // Hide Google logo
+            View child = locationMapView.getChildAt(0);
+            if (child instanceof ViewGroup) {
+              // Only the first child (View) is useful.
+              // Google logo can be in any other child (ViewGroup).
+              for (int i = 1; i < ((ViewGroup) child).getChildCount(); ++i) {
+                ((ViewGroup) child).getChildAt(i).setVisibility(View.GONE);
+              }
+            }
+          });
+    } else {
+      updateMap(location);
+    }
     displayWhenReady();
     Logger.get(getContext()).logImpression(DialerImpression.Type.EMERGENCY_GOT_MAP);
   }
 
+  private void updateMap(@NonNull Location location) {
+    Assert.isNotNull(location);
+    Assert.isNotNull(savedGoogleMap);
+    LatLng latLng = new LatLng(location.getLatitude(), location.getLongitude());
+    savedGoogleMap.clear();
+    savedGoogleMap.addMarker(new MarkerOptions().position(latLng).flat(true).draggable(false));
+    savedGoogleMap.moveCamera(CameraUpdateFactory.newLatLngZoom(latLng, MAP_ZOOM_LEVEL));
+  }
+
   @Override
   public void setAddress(String address) {
     LogUtil.i("LocationFragment.setAddress", address);
@@ -158,6 +214,7 @@
                   R.string.lat_long_format, location.getLatitude(), location.getLongitude()));
 
       Logger.get(getContext()).logImpression(DialerImpression.Type.EMERGENCY_GOT_LOCATION);
+      setMap(location);
     }
     displayWhenReady();
   }
@@ -167,13 +224,14 @@
     if (isMapSet && isAddressSet && isLocationSet) {
       showLocationNow();
     } else if (!hasTimeoutStarted) {
-      handler.postDelayed(dataTimeoutRunnable, TIMEOUT_MILLIS);
+      handler.postDelayed(dataTimeoutRunnable, LOAD_DATA_TIMEOUT_MILLIS);
       hasTimeoutStarted = true;
     }
   }
 
   private void showLocationNow() {
     handler.removeCallbacks(dataTimeoutRunnable);
+    handler.removeCallbacks(spinningTimeoutRunnable);
     if (viewAnimator.getDisplayedChild() != LOCATION_VIEW_INDEX) {
       viewAnimator.setDisplayedChild(LOCATION_VIEW_INDEX);
       viewAnimator.setOnClickListener(v -> launchMap());
@@ -200,4 +258,16 @@
       view.setText(text);
     }
   }
+
+  @Override
+  public void onResume() {
+    super.onResume();
+    locationMapView.onResume();
+  }
+
+  @Override
+  public void onPause() {
+    locationMapView.onPause();
+    super.onPause();
+  }
 }
diff --git a/java/com/android/incallui/calllocation/impl/LocationHelper.java b/java/com/android/incallui/calllocation/impl/LocationHelper.java
index 7fbd60d..5c105e4 100644
--- a/java/com/android/incallui/calllocation/impl/LocationHelper.java
+++ b/java/com/android/incallui/calllocation/impl/LocationHelper.java
@@ -49,6 +49,7 @@
   public static final int LOCATION_STATUS_STALE = 2;
   public static final int LOCATION_STATUS_INACCURATE = 3;
   public static final int LOCATION_STATUS_NO_LOCATION = 4;
+  public static final int LOCATION_STATUS_MOCK = 5;
 
   /** Possible return values for {@code checkLocation()} */
   @IntDef({
@@ -56,7 +57,8 @@
     LOCATION_STATUS_OK,
     LOCATION_STATUS_STALE,
     LOCATION_STATUS_INACCURATE,
-    LOCATION_STATUS_NO_LOCATION
+    LOCATION_STATUS_NO_LOCATION,
+    LOCATION_STATUS_MOCK
   })
   @Retention(RetentionPolicy.SOURCE)
   public @interface LocationStatus {}
@@ -118,6 +120,11 @@
       return LOCATION_STATUS_INACCURATE;
     }
 
+    if (location.isFromMockProvider()) {
+      LogUtil.i("LocationHelper.checkLocation", "from mock provider");
+      return LOCATION_STATUS_MOCK;
+    }
+
     return LOCATION_STATUS_OK;
   }
 
diff --git a/java/com/android/incallui/calllocation/impl/LocationPresenter.java b/java/com/android/incallui/calllocation/impl/LocationPresenter.java
index 83195ba..94bd235 100644
--- a/java/com/android/incallui/calllocation/impl/LocationPresenter.java
+++ b/java/com/android/incallui/calllocation/impl/LocationPresenter.java
@@ -17,7 +17,6 @@
 package com.android.incallui.calllocation.impl;
 
 import android.content.Context;
-import android.graphics.drawable.Drawable;
 import android.location.Location;
 import android.os.AsyncTask;
 import com.android.dialer.common.LogUtil;
@@ -38,7 +37,6 @@
     implements LocationListener {
 
   private Location lastLocation;
-  private AsyncTask downloadMapTask;
   private AsyncTask reverseGeocodeTask;
 
   LocationPresenter() {}
@@ -55,9 +53,6 @@
     LogUtil.i("LocationPresenter.onUiUnready", "");
     super.onUiUnready(ui);
 
-    if (downloadMapTask != null) {
-      downloadMapTask.cancel(true);
-    }
     if (reverseGeocodeTask != null) {
       reverseGeocodeTask.cancel(true);
     }
@@ -76,7 +71,6 @@
       int status = LocationHelper.checkLocation(location);
       LocationUi ui = getUi();
       if (status == LocationHelper.LOCATION_STATUS_OK) {
-        downloadMapTask = new DownloadMapImageTask(new WeakReference<>(ui)).execute(location);
         reverseGeocodeTask = new ReverseGeocodeTask(new WeakReference<>(ui)).execute(location);
         if (ui != null) {
           ui.setLocation(location);
@@ -103,8 +97,6 @@
 
     void setAddress(String address);
 
-    void setMap(Drawable mapImage);
-
     void setLocation(Location location);
 
     Context getContext();
diff --git a/java/com/android/incallui/calllocation/impl/res/layout/location_fragment.xml b/java/com/android/incallui/calllocation/impl/res/layout/location_fragment.xml
deleted file mode 100644
index b1601f9..0000000
--- a/java/com/android/incallui/calllocation/impl/res/layout/location_fragment.xml
+++ /dev/null
@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-~ Copyright (C) 2015 The Android Open Source Project
-~
-~ Licensed under the Apache License, Version 2.0 (the "License");
-~ you may not use this file except in compliance with the License.
-~ You may obtain a copy of the License at
-~
-~      http://www.apache.org/licenses/LICENSE-2.0
-~
-~ Unless required by applicable law or agreed to in writing, software
-~ distributed under the License is distributed on an "AS IS" BASIS,
-~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-~ See the License for the specific language governing permissions and
-~ limitations under the License
--->
-
-<ViewAnimator xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/location_view_animator"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_marginTop="16dp"
-    android:background="@drawable/bg_location_card"
-    android:elevation="2dp"
-    android:inAnimation="@android:anim/fade_in"
-    android:measureAllChildren="true"
-    android:outAnimation="@android:anim/fade_out">
-
-  <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-      android:id="@+id/location_loading_layout"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:layout_gravity="center_vertical"
-      android:orientation="vertical">
-
-    <ProgressBar
-        android:id="@+id/location_loading_spinner"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="28dp"
-        android:layout_marginBottom="12dp"
-        android:layout_gravity="center_horizontal"/>
-
-    <TextView
-        android:id="@+id/location_loading_text"
-        style="@style/LocationLoadingTextStyle"
-        android:layout_width="match_parent"
-        android:layout_height="24sp"
-        android:layout_marginBottom="20dp"
-        android:layout_marginStart="24dp"
-        android:layout_marginEnd="24dp"
-        android:gravity="center"
-        android:text="@string/location_loading"/>
-
-  </LinearLayout>
-
-  <GridLayout xmlns:android="http://schemas.android.com/apk/res/android"
-      android:id="@+id/location_layout"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:layout_gravity="center"
-      android:columnCount="2"
-      android:orientation="horizontal">
-
-    <TextView
-        android:id="@+id/location_address_title"
-        style="@style/LocationAddressTitleTextStyle"
-        android:layout_width="0dp"
-        android:layout_height="20sp"
-        android:layout_marginTop="16dp"
-        android:layout_marginBottom="4dp"
-        android:layout_marginStart="16dp"
-        android:layout_columnWeight="1"
-        android:text="@string/location_title"/>
-
-    <ImageView
-        android:id="@+id/location_map"
-        android:layout_width="@dimen/location_map_width"
-        android:layout_height="@dimen/location_map_height"
-        android:layout_margin="16dp"
-        android:layout_gravity="end|center_vertical"
-        android:layout_rowSpan="4"
-        android:contentDescription="@string/location_map_description"
-        android:scaleType="centerCrop"
-        android:visibility="invisible"
-        tools:src="?android:colorPrimaryDark"
-        tools:visibility="visible"/>
-
-    <TextView
-        android:id="@+id/address_line_one"
-        style="@style/LocationAddressTextStyle"
-        android:layout_width="0dp"
-        android:layout_height="24sp"
-        android:layout_marginStart="16dp"
-        android:layout_columnWeight="1"
-        android:ellipsize="end"
-        android:lines="1"
-        android:visibility="invisible"
-        tools:text="1600 Amphitheatre Pkwy And a bit"
-        tools:visibility="visible"/>
-
-    <TextView
-        android:id="@+id/address_line_two"
-        style="@style/LocationAddressTextStyle"
-        android:layout_width="0dp"
-        android:layout_height="24sp"
-        android:layout_marginStart="16dp"
-        android:layout_columnWeight="1"
-        android:ellipsize="end"
-        android:lines="1"
-        android:visibility="invisible"
-        tools:text="Mountain View, CA 94043"
-        tools:visibility="visible"/>
-
-    <TextView
-        android:id="@+id/lat_long_line"
-        style="@style/LocationLatLongTextStyle"
-        android:layout_width="0dp"
-        android:layout_height="24sp"
-        android:layout_marginBottom="12dp"
-        android:layout_marginStart="16dp"
-        android:layout_columnWeight="1"
-        android:ellipsize="end"
-        android:lines="1"
-        android:visibility="invisible"
-        tools:text="Lat: 37.421719, Long: -122.085297"
-        tools:visibility="visible"/>
-
-  </GridLayout>
-
-</ViewAnimator>
diff --git a/java/com/android/incallui/calllocation/impl/res/values/strings.xml b/java/com/android/incallui/calllocation/impl/res/values/strings.xml
index 573f33c..1d15dba 100644
--- a/java/com/android/incallui/calllocation/impl/res/values/strings.xml
+++ b/java/com/android/incallui/calllocation/impl/res/values/strings.xml
@@ -24,9 +24,12 @@
   <!-- Label for the address and map shown during emergency calls. [CHAR LIMIT=40] -->
   <string name="location_title">Tell emergency services where you are</string>
 
-  <string name="lat_long_format"><xliff:g id="latitude">%f</xliff:g>, <xliff:g id="longitude">%f</xliff:g></string>
+  <string name="lat_long_format"><xliff:g id="latitude">%1$f</xliff:g>, <xliff:g id="longitude">%2$f</xliff:g></string>
 
   <!-- Progress indicator loading text. [CHAR LIMIT=20] -->
   <string name="location_loading">Finding your location&#8230;</string>
 
+  <!-- Error message shown when we can't get device location. [CHAR LIMIT=NONE] -->
+  <string name="location_error">Error, could not retrieve your location</string>
+
 </resources>
diff --git a/java/com/android/incallui/calllocation/impl/res/values/styles.xml b/java/com/android/incallui/calllocation/impl/res/values/styles.xml
index 866a4ed..45e9c98 100644
--- a/java/com/android/incallui/calllocation/impl/res/values/styles.xml
+++ b/java/com/android/incallui/calllocation/impl/res/values/styles.xml
@@ -1,5 +1,18 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2015 Google Inc. All Rights Reserved. -->
+<!--
+  ~ Copyright (C) 2018 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
 <resources>
 
   <style name="LocationAddressTitleTextStyle">
@@ -25,4 +38,10 @@
     <item name="android:textColor">#dd000000</item>
     <item name="android:fontFamily">sans-serif</item>
   </style>
+
+  <style name="LocationErrorTextStyle">
+    <item name="android:textSize">14sp</item>
+    <item name="android:textColor">#dd000000</item>
+    <item name="android:fontFamily">sans-serif</item>
+  </style>
 </resources>
diff --git a/java/com/android/incallui/calllocation/stub/StubCallLocationModule.java b/java/com/android/incallui/calllocation/stub/StubCallLocationModule.java
index 2046069..c60663b 100644
--- a/java/com/android/incallui/calllocation/stub/StubCallLocationModule.java
+++ b/java/com/android/incallui/calllocation/stub/StubCallLocationModule.java
@@ -20,12 +20,15 @@
 import android.support.annotation.NonNull;
 import android.support.v4.app.Fragment;
 import com.android.dialer.common.Assert;
+import com.android.dialer.inject.DialerVariant;
+import com.android.dialer.inject.InstallIn;
 import com.android.incallui.calllocation.CallLocation;
 import dagger.Binds;
 import dagger.Module;
 import javax.inject.Inject;
 
 /** This module provides an instance of call location. */
+@InstallIn(variants = {DialerVariant.DIALER_TEST})
 @Module
 public abstract class StubCallLocationModule {
 
diff --git a/java/com/android/incallui/callpending/AndroidManifest.xml b/java/com/android/incallui/callpending/AndroidManifest.xml
index 231553e..aa316a3 100644
--- a/java/com/android/incallui/callpending/AndroidManifest.xml
+++ b/java/com/android/incallui/callpending/AndroidManifest.xml
@@ -16,8 +16,8 @@
 <manifest
     xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.android.incallui.callpending">
-  <application android:theme="@style/Theme.AppCompat">
-    <!-- Identical to .InCallActivity except orientation is locked to portrait -->
+  <application>
+  <!-- Identical to .InCallActivity except orientation is locked to portrait -->
     <activity
         android:directBootAware="true"
         android:excludeFromRecents="true"
diff --git a/java/com/android/incallui/callpending/CallPendingActivity.java b/java/com/android/incallui/callpending/CallPendingActivity.java
index c7ce2b1..a686308 100644
--- a/java/com/android/incallui/callpending/CallPendingActivity.java
+++ b/java/com/android/incallui/callpending/CallPendingActivity.java
@@ -31,7 +31,7 @@
 import com.android.dialer.enrichedcall.Session;
 import com.android.dialer.multimedia.MultimediaData;
 import com.android.incallui.audiomode.AudioModeProvider;
-import com.android.incallui.call.DialerCall.State;
+import com.android.incallui.call.state.DialerCallState;
 import com.android.incallui.incall.bindings.InCallBindings;
 import com.android.incallui.incall.protocol.ContactPhotoType;
 import com.android.incallui.incall.protocol.InCallButtonIds;
@@ -148,7 +148,7 @@
     inCallScreen.setPrimary(createPrimaryInfo());
     inCallScreen.setCallState(
         PrimaryCallState.builder()
-            .setState(State.CALL_PENDING)
+            .setState(DialerCallState.CALL_PENDING)
             .setCustomLabel(getCallPendingLabel())
             .build());
     inCallScreen.setEndCallButtonEnabled(true, true);
@@ -166,9 +166,9 @@
     }
 
     Drawable photo = null;
+    Uri photoUri = getPhotoUri();
     try {
       // TODO(calderwoodra) move to background thread
-      Uri photoUri = getPhotoUri();
       InputStream is = getContentResolver().openInputStream(photoUri);
       photo = Drawable.createFromStream(is, photoUri.toString());
     } catch (FileNotFoundException e) {
@@ -185,6 +185,7 @@
         .setNameIsNumber(name != null && name.equals(number))
         .setLabel(getPhoneLabel())
         .setPhoto(photo)
+        .setPhotoUri(photoUri)
         .setPhotoType(ContactPhotoType.CONTACT)
         .setIsSipCall(false)
         .setIsContactPhotoShown(true)
@@ -255,6 +256,9 @@
           public void changeToVideoClicked() {}
 
           @Override
+          public void changeToRttClicked() {}
+
+          @Override
           public void switchCameraClicked(boolean useFrontFacingCamera) {}
 
           @Override
diff --git a/java/com/android/incallui/commontheme/res/values-af/strings.xml b/java/com/android/incallui/commontheme/res/values-af/strings.xml
index 0721869..44d69d9 100644
--- a/java/com/android/incallui/commontheme/res/values-af/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-af/strings.xml
@@ -1,36 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_content_description_end_call" msgid="8232796487777787200">"Beëindig oproep"</string>
-    <string name="incall_content_description_muted" msgid="2130133443150389474">"Gedemp"</string>
-    <string name="incall_content_description_unmuted" msgid="4023577547526525202">"Ontdemp"</string>
-    <string name="incall_content_description_swap_calls" msgid="5233257839262161417">"Verwissel oproepe"</string>
-    <string name="incall_content_description_merge_calls" msgid="5198778837993669729">"Voeg oproepe saam"</string>
-    <string name="incall_content_description_earpiece" msgid="2786221842272370555">"Selfoonoorstuk"</string>
-    <string name="incall_content_description_speaker" msgid="7837829930201265549">"Luidspreker"</string>
-    <string name="incall_content_description_bluetooth" msgid="6988919010980910001">"Bluetooth"</string>
-    <string name="incall_content_description_headset" msgid="3170439802944346719">"Bedraade kopstuk"</string>
-    <string name="incall_content_description_hold" msgid="3335508251734906019">"Hou oproep"</string>
-    <string name="incall_content_description_unhold" msgid="3862584118869933593">"Hervat oproep"</string>
-    <string name="incall_content_description_video_on" msgid="899266487647420613">"Video aan"</string>
-    <string name="incall_content_description_video_off" msgid="762985912616707076">"Video af"</string>
-    <string name="incall_content_description_swap_video" msgid="297943299827908998">"Verwissel video"</string>
-    <string name="incall_label_speaker" msgid="1814254833253409394">"Luidspreker"</string>
-    <string name="incall_label_audio" msgid="5923781170533336820">"Klank"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_content_description_end_call">Beëindig oproep</string>
+  <string name="incall_content_description_muted">Gedemp</string>
+  <string name="incall_content_description_unmuted">Ontdemp</string>
+  <string name="incall_content_description_swap_calls">Verwissel oproepe</string>
+  <string name="incall_content_description_swap_sim">Verander SIM</string>
+  <string name="incall_content_description_merge_calls">Voeg oproepe saam</string>
+  <string name="incall_content_description_earpiece">Selfoonoorstuk</string>
+  <string name="incall_content_description_speaker">Luidspreker</string>
+  <string name="incall_content_description_bluetooth">Bluetooth</string>
+  <string name="incall_content_description_headset">Bedraade kopstuk</string>
+  <string name="incall_content_description_hold">Hou oproep</string>
+  <string name="incall_content_description_unhold">Hervat oproep</string>
+  <string name="incall_content_description_video_on">Video aan</string>
+  <string name="incall_content_description_video_off">Video af</string>
+  <string name="incall_content_description_swap_video">Verwissel video</string>
+  <string name="incall_label_speaker">Luidspreker</string>
+  <string name="incall_label_audio">Klank</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-am/strings.xml b/java/com/android/incallui/commontheme/res/values-am/strings.xml
index 9d748e3..de239fc 100644
--- a/java/com/android/incallui/commontheme/res/values-am/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-am/strings.xml
@@ -1,36 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_content_description_end_call" msgid="8232796487777787200">"ጥሪ ጨርስ"</string>
-    <string name="incall_content_description_muted" msgid="2130133443150389474">"ድምፀ-ከል ተደርጎበታል"</string>
-    <string name="incall_content_description_unmuted" msgid="4023577547526525202">"ድምጸ-ከል ተነስቷል"</string>
-    <string name="incall_content_description_swap_calls" msgid="5233257839262161417">"ጥሪዎች አገላብጥ"</string>
-    <string name="incall_content_description_merge_calls" msgid="5198778837993669729">"ጥሪዎችን አዋህድ"</string>
-    <string name="incall_content_description_earpiece" msgid="2786221842272370555">"የስልክ እጀታ ማዳመጫ"</string>
-    <string name="incall_content_description_speaker" msgid="7837829930201265549">"የድምጽ ማጉያ"</string>
-    <string name="incall_content_description_bluetooth" msgid="6988919010980910001">"ብሉቱዝ"</string>
-    <string name="incall_content_description_headset" msgid="3170439802944346719">"ባለ ገመድ ማዳመጫ"</string>
-    <string name="incall_content_description_hold" msgid="3335508251734906019">"ጥሪ ይዘህ ቆይ"</string>
-    <string name="incall_content_description_unhold" msgid="3862584118869933593">"ጥሪ ከቆመበት ቀጥል"</string>
-    <string name="incall_content_description_video_on" msgid="899266487647420613">"ቪዲዮ በርቷል"</string>
-    <string name="incall_content_description_video_off" msgid="762985912616707076">"ቪዲዮ ጠፍቷል"</string>
-    <string name="incall_content_description_swap_video" msgid="297943299827908998">"ቪዲዮ አገላብጥ"</string>
-    <string name="incall_label_speaker" msgid="1814254833253409394">"የድምጽ ማጉያ"</string>
-    <string name="incall_label_audio" msgid="5923781170533336820">"ድምፅ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_content_description_end_call">ጥሪ ጨርስ</string>
+  <string name="incall_content_description_muted">ድምፀ-ከል ተደርጎበታል</string>
+  <string name="incall_content_description_unmuted">ድምጸ-ከል ተነስቷል</string>
+  <string name="incall_content_description_swap_calls">ጥሪዎች አገላብጥ</string>
+  <string name="incall_content_description_swap_sim">ሲም ቀይር</string>
+  <string name="incall_content_description_merge_calls">ጥሪዎችን አዋህድ</string>
+  <string name="incall_content_description_earpiece">የስልክ እጀታ ማዳመጫ</string>
+  <string name="incall_content_description_speaker">የድምጽ ማጉያ</string>
+  <string name="incall_content_description_bluetooth">ብሉቱዝ</string>
+  <string name="incall_content_description_headset">ባለ ገመድ ማዳመጫ</string>
+  <string name="incall_content_description_hold">ጥሪ ይዘህ ቆይ</string>
+  <string name="incall_content_description_unhold">ጥሪ ከቆመበት ቀጥል</string>
+  <string name="incall_content_description_video_on">ቪዲዮ በርቷል</string>
+  <string name="incall_content_description_video_off">ቪዲዮ ጠፍቷል</string>
+  <string name="incall_content_description_swap_video">ቪዲዮ አገላብጥ</string>
+  <string name="incall_label_speaker">የድምጽ ማጉያ</string>
+  <string name="incall_label_audio">ድምፅ</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-ar/strings.xml b/java/com/android/incallui/commontheme/res/values-ar/strings.xml
index 693bfc5..74104aa 100644
--- a/java/com/android/incallui/commontheme/res/values-ar/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-ar/strings.xml
@@ -1,36 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_content_description_end_call" msgid="8232796487777787200">"إنهاء المكالمة"</string>
-    <string name="incall_content_description_muted" msgid="2130133443150389474">"العناصر التي تم تجاهلها"</string>
-    <string name="incall_content_description_unmuted" msgid="4023577547526525202">"تمت إعادة الصوت"</string>
-    <string name="incall_content_description_swap_calls" msgid="5233257839262161417">"تبديل الاتصالات"</string>
-    <string name="incall_content_description_merge_calls" msgid="5198778837993669729">"دمج المكالمات"</string>
-    <string name="incall_content_description_earpiece" msgid="2786221842272370555">"سماعة الأذن للهاتف"</string>
-    <string name="incall_content_description_speaker" msgid="7837829930201265549">"مكبر الصوت"</string>
-    <string name="incall_content_description_bluetooth" msgid="6988919010980910001">"بلوتوث"</string>
-    <string name="incall_content_description_headset" msgid="3170439802944346719">"سماعة رأس سلكية"</string>
-    <string name="incall_content_description_hold" msgid="3335508251734906019">"تعطيل المكالمة مؤقتًا"</string>
-    <string name="incall_content_description_unhold" msgid="3862584118869933593">"استئناف المكالمة"</string>
-    <string name="incall_content_description_video_on" msgid="899266487647420613">"الفيديو قيد التشغيل"</string>
-    <string name="incall_content_description_video_off" msgid="762985912616707076">"الفيديو ليس قيد التشغيل"</string>
-    <string name="incall_content_description_swap_video" msgid="297943299827908998">"تبديل الفيديو"</string>
-    <string name="incall_label_speaker" msgid="1814254833253409394">"مكبر الصوت"</string>
-    <string name="incall_label_audio" msgid="5923781170533336820">"صوت"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_content_description_end_call">إنهاء المكالمة</string>
+  <string name="incall_content_description_muted">العناصر التي تم تجاهلها</string>
+  <string name="incall_content_description_unmuted">تمت إعادة الصوت</string>
+  <string name="incall_content_description_swap_calls">تبديل الاتصالات</string>
+  <string name="incall_content_description_swap_sim">‏تغيير SIM</string>
+  <string name="incall_content_description_merge_calls">دمج المكالمات</string>
+  <string name="incall_content_description_earpiece">سماعة الأذن للهاتف</string>
+  <string name="incall_content_description_speaker">مكبر الصوت</string>
+  <string name="incall_content_description_bluetooth">بلوتوث</string>
+  <string name="incall_content_description_headset">سماعة رأس سلكية</string>
+  <string name="incall_content_description_hold">إيقاف المكالمة مؤقتًا</string>
+  <string name="incall_content_description_unhold">استئناف المكالمة</string>
+  <string name="incall_content_description_video_on">الفيديو قيد التشغيل</string>
+  <string name="incall_content_description_video_off">الفيديو ليس قيد التشغيل</string>
+  <string name="incall_content_description_swap_video">تبديل الفيديو</string>
+  <string name="incall_label_speaker">مكبر الصوت</string>
+  <string name="incall_label_audio">صوت</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-az/strings.xml b/java/com/android/incallui/commontheme/res/values-az/strings.xml
index a1d88ce..833ad04 100644
--- a/java/com/android/incallui/commontheme/res/values-az/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-az/strings.xml
@@ -1,36 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_content_description_end_call" msgid="8232796487777787200">"Zəngi sonlandırın"</string>
-    <string name="incall_content_description_muted" msgid="2130133443150389474">"Səssiz"</string>
-    <string name="incall_content_description_unmuted" msgid="4023577547526525202">"Susma rejimindən çıxarıldı"</string>
-    <string name="incall_content_description_swap_calls" msgid="5233257839262161417">"Zəngləri dəyişdirin"</string>
-    <string name="incall_content_description_merge_calls" msgid="5198778837993669729">"Zəngləri birləşdirin"</string>
-    <string name="incall_content_description_earpiece" msgid="2786221842272370555">"Dəstək qulaqlığı"</string>
-    <string name="incall_content_description_speaker" msgid="7837829930201265549">"Dinamik"</string>
-    <string name="incall_content_description_bluetooth" msgid="6988919010980910001">"Bluetooth"</string>
-    <string name="incall_content_description_headset" msgid="3170439802944346719">"Simli qulaqlıq"</string>
-    <string name="incall_content_description_hold" msgid="3335508251734906019">"Zəngi gözlədin"</string>
-    <string name="incall_content_description_unhold" msgid="3862584118869933593">"Zəngə davam edin"</string>
-    <string name="incall_content_description_video_on" msgid="899266487647420613">"Video aktivdir"</string>
-    <string name="incall_content_description_video_off" msgid="762985912616707076">"Video deaktivdir"</string>
-    <string name="incall_content_description_swap_video" msgid="297943299827908998">"Videonu dəyişdirin"</string>
-    <string name="incall_label_speaker" msgid="1814254833253409394">"Dinamik"</string>
-    <string name="incall_label_audio" msgid="5923781170533336820">"Səs"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_content_description_end_call">Zəngi sonlandırın</string>
+  <string name="incall_content_description_muted">Səssiz</string>
+  <string name="incall_content_description_unmuted">Susma rejimindən çıxarıldı</string>
+  <string name="incall_content_description_swap_calls">Zəngləri dəyişdirin</string>
+  <string name="incall_content_description_swap_sim">SIM-i dəyişin</string>
+  <string name="incall_content_description_merge_calls">Zəngləri birləşdirin</string>
+  <string name="incall_content_description_earpiece">Dəstək qulaqlığı</string>
+  <string name="incall_content_description_speaker">Dinamik</string>
+  <string name="incall_content_description_bluetooth">Bluetooth</string>
+  <string name="incall_content_description_headset">Simli qulaqlıq</string>
+  <string name="incall_content_description_hold">Zəngi gözlədin</string>
+  <string name="incall_content_description_unhold">Zəngə davam edin</string>
+  <string name="incall_content_description_video_on">Video aktivdir</string>
+  <string name="incall_content_description_video_off">Video deaktivdir</string>
+  <string name="incall_content_description_swap_video">Videonu dəyişdirin</string>
+  <string name="incall_label_speaker">Dinamik</string>
+  <string name="incall_label_audio">Səs</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-b+sr+Latn/strings.xml b/java/com/android/incallui/commontheme/res/values-b+sr+Latn/strings.xml
index 05ae59c..41a7055 100644
--- a/java/com/android/incallui/commontheme/res/values-b+sr+Latn/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-b+sr+Latn/strings.xml
@@ -1,36 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_content_description_end_call" msgid="8232796487777787200">"Završi poziv"</string>
-    <string name="incall_content_description_muted" msgid="2130133443150389474">"Zvuk je isključen"</string>
-    <string name="incall_content_description_unmuted" msgid="4023577547526525202">"Zvuk je uključen"</string>
-    <string name="incall_content_description_swap_calls" msgid="5233257839262161417">"Zameni pozive"</string>
-    <string name="incall_content_description_merge_calls" msgid="5198778837993669729">"Objedini pozive"</string>
-    <string name="incall_content_description_earpiece" msgid="2786221842272370555">"Slušalica telefona"</string>
-    <string name="incall_content_description_speaker" msgid="7837829930201265549">"Zvučnik"</string>
-    <string name="incall_content_description_bluetooth" msgid="6988919010980910001">"Bluetooth"</string>
-    <string name="incall_content_description_headset" msgid="3170439802944346719">"Žičane slušalice"</string>
-    <string name="incall_content_description_hold" msgid="3335508251734906019">"Stavi poziv na čekanje"</string>
-    <string name="incall_content_description_unhold" msgid="3862584118869933593">"Nastavi poziv"</string>
-    <string name="incall_content_description_video_on" msgid="899266487647420613">"Uključi video"</string>
-    <string name="incall_content_description_video_off" msgid="762985912616707076">"Isključi video"</string>
-    <string name="incall_content_description_swap_video" msgid="297943299827908998">"Zameni video"</string>
-    <string name="incall_label_speaker" msgid="1814254833253409394">"Zvučnik"</string>
-    <string name="incall_label_audio" msgid="5923781170533336820">"Zvuk"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_content_description_end_call">Završi poziv</string>
+  <string name="incall_content_description_muted">Zvuk je isključen</string>
+  <string name="incall_content_description_unmuted">Zvuk je uključen</string>
+  <string name="incall_content_description_swap_calls">Zameni pozive</string>
+  <string name="incall_content_description_swap_sim">Promenite SIM</string>
+  <string name="incall_content_description_merge_calls">Objedini pozive</string>
+  <string name="incall_content_description_earpiece">Slušalica telefona</string>
+  <string name="incall_content_description_speaker">Zvučnik</string>
+  <string name="incall_content_description_bluetooth">Bluetooth</string>
+  <string name="incall_content_description_headset">Žičane slušalice</string>
+  <string name="incall_content_description_hold">Stavi poziv na čekanje</string>
+  <string name="incall_content_description_unhold">Nastavi poziv</string>
+  <string name="incall_content_description_video_on">Uključi video</string>
+  <string name="incall_content_description_video_off">Isključi video</string>
+  <string name="incall_content_description_swap_video">Zameni video</string>
+  <string name="incall_label_speaker">Zvučnik</string>
+  <string name="incall_label_audio">Zvuk</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-be/strings.xml b/java/com/android/incallui/commontheme/res/values-be/strings.xml
index e772e27..1abe942 100644
--- a/java/com/android/incallui/commontheme/res/values-be/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-be/strings.xml
@@ -1,36 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_content_description_end_call" msgid="8232796487777787200">"Завяршыць выклік"</string>
-    <string name="incall_content_description_muted" msgid="2130133443150389474">"Гук адключаны"</string>
-    <string name="incall_content_description_unmuted" msgid="4023577547526525202">"Гук уключаны"</string>
-    <string name="incall_content_description_swap_calls" msgid="5233257839262161417">"Пераключыць выклікі"</string>
-    <string name="incall_content_description_merge_calls" msgid="5198778837993669729">"Аб\'яднаць выклікі"</string>
-    <string name="incall_content_description_earpiece" msgid="2786221842272370555">"Дынамік тэлефона"</string>
-    <string name="incall_content_description_speaker" msgid="7837829930201265549">"Вонкавы дынамік"</string>
-    <string name="incall_content_description_bluetooth" msgid="6988919010980910001">"Bluetooth"</string>
-    <string name="incall_content_description_headset" msgid="3170439802944346719">"Правадная гарнітура"</string>
-    <string name="incall_content_description_hold" msgid="3335508251734906019">"Паставіць выклік на ўтрыманне"</string>
-    <string name="incall_content_description_unhold" msgid="3862584118869933593">"Узнавіць выклік"</string>
-    <string name="incall_content_description_video_on" msgid="899266487647420613">"Відэа ўкл."</string>
-    <string name="incall_content_description_video_off" msgid="762985912616707076">"Відэа выкл."</string>
-    <string name="incall_content_description_swap_video" msgid="297943299827908998">"Пераключыць відэа"</string>
-    <string name="incall_label_speaker" msgid="1814254833253409394">"Вонк.дынамік"</string>
-    <string name="incall_label_audio" msgid="5923781170533336820">"Гук"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_content_description_end_call">Завяршыць выклік</string>
+  <string name="incall_content_description_muted">Гук адключаны</string>
+  <string name="incall_content_description_unmuted">Гук уключаны</string>
+  <string name="incall_content_description_swap_calls">Пераключыць выклікі</string>
+  <string name="incall_content_description_swap_sim">Змяніць SIM-карту</string>
+  <string name="incall_content_description_merge_calls">Аб\'яднаць выклікі</string>
+  <string name="incall_content_description_earpiece">Дынамік тэлефона</string>
+  <string name="incall_content_description_speaker">Вонкавы дынамік</string>
+  <string name="incall_content_description_bluetooth">Bluetooth</string>
+  <string name="incall_content_description_headset">Правадная гарнітура</string>
+  <string name="incall_content_description_hold">Паставіць выклік на ўтрыманне</string>
+  <string name="incall_content_description_unhold">Узнавіць выклік</string>
+  <string name="incall_content_description_video_on">Відэа ўкл.</string>
+  <string name="incall_content_description_video_off">Відэа выкл.</string>
+  <string name="incall_content_description_swap_video">Пераключыць відэа</string>
+  <string name="incall_label_speaker">Вонк.дынамік</string>
+  <string name="incall_label_audio">Гук</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-bg/strings.xml b/java/com/android/incallui/commontheme/res/values-bg/strings.xml
index 63364f8..e12a7a1 100644
--- a/java/com/android/incallui/commontheme/res/values-bg/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-bg/strings.xml
@@ -1,36 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_content_description_end_call" msgid="8232796487777787200">"Край на обаждането"</string>
-    <string name="incall_content_description_muted" msgid="2130133443150389474">"Заглушено"</string>
-    <string name="incall_content_description_unmuted" msgid="4023577547526525202">"Пуснато"</string>
-    <string name="incall_content_description_swap_calls" msgid="5233257839262161417">"Размяна на обажданията"</string>
-    <string name="incall_content_description_merge_calls" msgid="5198778837993669729">"Обединяване на обаждания"</string>
-    <string name="incall_content_description_earpiece" msgid="2786221842272370555">"Телефонна слушалка"</string>
-    <string name="incall_content_description_speaker" msgid="7837829930201265549">"Високоговорител"</string>
-    <string name="incall_content_description_bluetooth" msgid="6988919010980910001">"Bluetooth"</string>
-    <string name="incall_content_description_headset" msgid="3170439802944346719">"Слушалки с кабел"</string>
-    <string name="incall_content_description_hold" msgid="3335508251734906019">"Задържане на обаждането"</string>
-    <string name="incall_content_description_unhold" msgid="3862584118869933593">"Възобновяване на обаждането"</string>
-    <string name="incall_content_description_video_on" msgid="899266487647420613">"Видеото е включено"</string>
-    <string name="incall_content_description_video_off" msgid="762985912616707076">"Видеото е изключено"</string>
-    <string name="incall_content_description_swap_video" msgid="297943299827908998">"Размяна на видеото"</string>
-    <string name="incall_label_speaker" msgid="1814254833253409394">"Високогов."</string>
-    <string name="incall_label_audio" msgid="5923781170533336820">"Звук"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_content_description_end_call">Край на обаждането</string>
+  <string name="incall_content_description_muted">Заглушено</string>
+  <string name="incall_content_description_unmuted">Пуснато</string>
+  <string name="incall_content_description_swap_calls">Размяна на обажданията</string>
+  <string name="incall_content_description_swap_sim">Смяна на SIM</string>
+  <string name="incall_content_description_merge_calls">Обединяване на обаждания</string>
+  <string name="incall_content_description_earpiece">Телефонна слушалка</string>
+  <string name="incall_content_description_speaker">Високоговорител</string>
+  <string name="incall_content_description_bluetooth">Bluetooth</string>
+  <string name="incall_content_description_headset">Слушалки с кабел</string>
+  <string name="incall_content_description_hold">Задържане на обаждането</string>
+  <string name="incall_content_description_unhold">Възобновяване на обаждането</string>
+  <string name="incall_content_description_video_on">Видеото е включено</string>
+  <string name="incall_content_description_video_off">Видеото е изключено</string>
+  <string name="incall_content_description_swap_video">Размяна на видеото</string>
+  <string name="incall_label_speaker">Високогов.</string>
+  <string name="incall_label_audio">Звук</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-bn/strings.xml b/java/com/android/incallui/commontheme/res/values-bn/strings.xml
index 9871ea4..050d90e 100644
--- a/java/com/android/incallui/commontheme/res/values-bn/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-bn/strings.xml
@@ -1,36 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_content_description_end_call" msgid="8232796487777787200">"কল কেটে দিন"</string>
-    <string name="incall_content_description_muted" msgid="2130133443150389474">"নিঃশব্দ করা হয়েছে"</string>
-    <string name="incall_content_description_unmuted" msgid="4023577547526525202">"সশব্দ করা হয়েছে"</string>
-    <string name="incall_content_description_swap_calls" msgid="5233257839262161417">"কল অদল বদল করুন"</string>
-    <string name="incall_content_description_merge_calls" msgid="5198778837993669729">"কলগুলি মার্জ করুন"</string>
-    <string name="incall_content_description_earpiece" msgid="2786221842272370555">"হ্যান্ডসেট ইয়ারপিস"</string>
-    <string name="incall_content_description_speaker" msgid="7837829930201265549">"স্পিকার"</string>
-    <string name="incall_content_description_bluetooth" msgid="6988919010980910001">"ব্লুটুথ"</string>
-    <string name="incall_content_description_headset" msgid="3170439802944346719">"তারযুক্ত হেডসেট"</string>
-    <string name="incall_content_description_hold" msgid="3335508251734906019">"কল হোল্ডে রাখুন"</string>
-    <string name="incall_content_description_unhold" msgid="3862584118869933593">"কল আবার শুরু করুন"</string>
-    <string name="incall_content_description_video_on" msgid="899266487647420613">"ভিডিও চালু আছে"</string>
-    <string name="incall_content_description_video_off" msgid="762985912616707076">"ভিডিও বন্ধ আছে"</string>
-    <string name="incall_content_description_swap_video" msgid="297943299827908998">"ভিডিও অদল বদল করুন"</string>
-    <string name="incall_label_speaker" msgid="1814254833253409394">"স্পিকার"</string>
-    <string name="incall_label_audio" msgid="5923781170533336820">"শব্দ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_content_description_end_call">কল কেটে দিন</string>
+  <string name="incall_content_description_muted">নিঃশব্দ করা হয়েছে</string>
+  <string name="incall_content_description_unmuted">সশব্দ করা হয়েছে</string>
+  <string name="incall_content_description_swap_calls">কল অদল বদল করুন</string>
+  <string name="incall_content_description_swap_sim">সিম পাল্টান</string>
+  <string name="incall_content_description_merge_calls">কলগুলি মার্জ করুন</string>
+  <string name="incall_content_description_earpiece">হ্যান্ডসেট ইয়ারপিস</string>
+  <string name="incall_content_description_speaker">স্পিকার</string>
+  <string name="incall_content_description_bluetooth">ব্লুটুথ</string>
+  <string name="incall_content_description_headset">তারযুক্ত হেডসেট</string>
+  <string name="incall_content_description_hold">কল হোল্ডে রাখুন</string>
+  <string name="incall_content_description_unhold">কল আবার শুরু করুন</string>
+  <string name="incall_content_description_video_on">ভিডিও চালু আছে</string>
+  <string name="incall_content_description_video_off">ভিডিও বন্ধ আছে</string>
+  <string name="incall_content_description_swap_video">ভিডিও অদল বদল করুন</string>
+  <string name="incall_label_speaker">স্পিকার</string>
+  <string name="incall_label_audio">শব্দ</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-bs/strings.xml b/java/com/android/incallui/commontheme/res/values-bs/strings.xml
index 76f991d..096bded 100644
--- a/java/com/android/incallui/commontheme/res/values-bs/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-bs/strings.xml
@@ -1,36 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_content_description_end_call" msgid="8232796487777787200">"Prekini poziv"</string>
-    <string name="incall_content_description_muted" msgid="2130133443150389474">"Isključen zvuk"</string>
-    <string name="incall_content_description_unmuted" msgid="4023577547526525202">"Uključen zvuk"</string>
-    <string name="incall_content_description_swap_calls" msgid="5233257839262161417">"Zamijeni pozive"</string>
-    <string name="incall_content_description_merge_calls" msgid="5198778837993669729">"Spoji pozive"</string>
-    <string name="incall_content_description_earpiece" msgid="2786221842272370555">"Slušalice telefona"</string>
-    <string name="incall_content_description_speaker" msgid="7837829930201265549">"Zvučnik"</string>
-    <string name="incall_content_description_bluetooth" msgid="6988919010980910001">"Bluetooth"</string>
-    <string name="incall_content_description_headset" msgid="3170439802944346719">"Žičane slušalice"</string>
-    <string name="incall_content_description_hold" msgid="3335508251734906019">"Stavi poziv na čekanje"</string>
-    <string name="incall_content_description_unhold" msgid="3862584118869933593">"Nastavi poziv"</string>
-    <string name="incall_content_description_video_on" msgid="899266487647420613">"Kamera je uključena"</string>
-    <string name="incall_content_description_video_off" msgid="762985912616707076">"Kamera je isključena"</string>
-    <string name="incall_content_description_swap_video" msgid="297943299827908998">"Zamijeni kameru"</string>
-    <string name="incall_label_speaker" msgid="1814254833253409394">"Zvučnik"</string>
-    <string name="incall_label_audio" msgid="5923781170533336820">"Zvuk"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_content_description_end_call">Prekini poziv</string>
+  <string name="incall_content_description_muted">Isključen zvuk</string>
+  <string name="incall_content_description_unmuted">Uključen zvuk</string>
+  <string name="incall_content_description_swap_calls">Zamijeni pozive</string>
+  <string name="incall_content_description_swap_sim">Promijeni SIM</string>
+  <string name="incall_content_description_merge_calls">Spoji pozive</string>
+  <string name="incall_content_description_earpiece">Slušalice telefona</string>
+  <string name="incall_content_description_speaker">Zvučnik</string>
+  <string name="incall_content_description_bluetooth">Bluetooth</string>
+  <string name="incall_content_description_headset">Žičane slušalice</string>
+  <string name="incall_content_description_hold">Stavi poziv na čekanje</string>
+  <string name="incall_content_description_unhold">Nastavi poziv</string>
+  <string name="incall_content_description_video_on">Kamera je uključena</string>
+  <string name="incall_content_description_video_off">Kamera je isključena</string>
+  <string name="incall_content_description_swap_video">Zamijeni kameru</string>
+  <string name="incall_label_speaker">Zvučnik</string>
+  <string name="incall_label_audio">Zvuk</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-ca/strings.xml b/java/com/android/incallui/commontheme/res/values-ca/strings.xml
index 832027d..e817bf4 100644
--- a/java/com/android/incallui/commontheme/res/values-ca/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-ca/strings.xml
@@ -1,36 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_content_description_end_call" msgid="8232796487777787200">"Finalitza la trucada"</string>
-    <string name="incall_content_description_muted" msgid="2130133443150389474">"Silenciada"</string>
-    <string name="incall_content_description_unmuted" msgid="4023577547526525202">"No silenciada"</string>
-    <string name="incall_content_description_swap_calls" msgid="5233257839262161417">"Canvia de trucada"</string>
-    <string name="incall_content_description_merge_calls" msgid="5198778837993669729">"Combina les trucades"</string>
-    <string name="incall_content_description_earpiece" msgid="2786221842272370555">"Auricular de microtelèfon"</string>
-    <string name="incall_content_description_speaker" msgid="7837829930201265549">"Altaveu"</string>
-    <string name="incall_content_description_bluetooth" msgid="6988919010980910001">"Bluetooth"</string>
-    <string name="incall_content_description_headset" msgid="3170439802944346719">"Auriculars amb cable"</string>
-    <string name="incall_content_description_hold" msgid="3335508251734906019">"Posa la trucada en espera"</string>
-    <string name="incall_content_description_unhold" msgid="3862584118869933593">"Reprèn la trucada"</string>
-    <string name="incall_content_description_video_on" msgid="899266487647420613">"Vídeo activat"</string>
-    <string name="incall_content_description_video_off" msgid="762985912616707076">"Vídeo desactivat"</string>
-    <string name="incall_content_description_swap_video" msgid="297943299827908998">"Canvia de vídeo"</string>
-    <string name="incall_label_speaker" msgid="1814254833253409394">"Altaveu"</string>
-    <string name="incall_label_audio" msgid="5923781170533336820">"So"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_content_description_end_call">Finalitza la trucada</string>
+  <string name="incall_content_description_muted">Silenciada</string>
+  <string name="incall_content_description_unmuted">No silenciada</string>
+  <string name="incall_content_description_swap_calls">Canvia de trucada</string>
+  <string name="incall_content_description_swap_sim">Canvia de SIM</string>
+  <string name="incall_content_description_merge_calls">Combina les trucades</string>
+  <string name="incall_content_description_earpiece">Auricular de microtelèfon</string>
+  <string name="incall_content_description_speaker">Altaveu</string>
+  <string name="incall_content_description_bluetooth">Bluetooth</string>
+  <string name="incall_content_description_headset">Auriculars amb cable</string>
+  <string name="incall_content_description_hold">Posa la trucada en espera</string>
+  <string name="incall_content_description_unhold">Reprèn la trucada</string>
+  <string name="incall_content_description_video_on">Vídeo activat</string>
+  <string name="incall_content_description_video_off">Vídeo desactivat</string>
+  <string name="incall_content_description_swap_video">Canvia de vídeo</string>
+  <string name="incall_label_speaker">Altaveu</string>
+  <string name="incall_label_audio">So</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-cs/strings.xml b/java/com/android/incallui/commontheme/res/values-cs/strings.xml
index 7afdcba..93ae51d 100644
--- a/java/com/android/incallui/commontheme/res/values-cs/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-cs/strings.xml
@@ -1,36 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_content_description_end_call" msgid="8232796487777787200">"Ukončit hovor"</string>
-    <string name="incall_content_description_muted" msgid="2130133443150389474">"Vypnutý mikrofon"</string>
-    <string name="incall_content_description_unmuted" msgid="4023577547526525202">"Zapnutý mikrofon"</string>
-    <string name="incall_content_description_swap_calls" msgid="5233257839262161417">"Přepnout hovory"</string>
-    <string name="incall_content_description_merge_calls" msgid="5198778837993669729">"Spojit hovory"</string>
-    <string name="incall_content_description_earpiece" msgid="2786221842272370555">"Sluchátko telefonu"</string>
-    <string name="incall_content_description_speaker" msgid="7837829930201265549">"Reproduktor"</string>
-    <string name="incall_content_description_bluetooth" msgid="6988919010980910001">"Bluetooth"</string>
-    <string name="incall_content_description_headset" msgid="3170439802944346719">"Drátová náhlavní souprava"</string>
-    <string name="incall_content_description_hold" msgid="3335508251734906019">"Podržet hovor"</string>
-    <string name="incall_content_description_unhold" msgid="3862584118869933593">"Obnovit hovor"</string>
-    <string name="incall_content_description_video_on" msgid="899266487647420613">"Zapnuté video"</string>
-    <string name="incall_content_description_video_off" msgid="762985912616707076">"Vypnuté video"</string>
-    <string name="incall_content_description_swap_video" msgid="297943299827908998">"Přepnout video"</string>
-    <string name="incall_label_speaker" msgid="1814254833253409394">"Reproduktor"</string>
-    <string name="incall_label_audio" msgid="5923781170533336820">"Zvuk"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_content_description_end_call">Ukončit hovor</string>
+  <string name="incall_content_description_muted">Vypnutý mikrofon</string>
+  <string name="incall_content_description_unmuted">Zapnutý mikrofon</string>
+  <string name="incall_content_description_swap_calls">Přepnout hovory</string>
+  <string name="incall_content_description_swap_sim">Změnit SIM kartu</string>
+  <string name="incall_content_description_merge_calls">Spojit hovory</string>
+  <string name="incall_content_description_earpiece">Sluchátko telefonu</string>
+  <string name="incall_content_description_speaker">Reproduktor</string>
+  <string name="incall_content_description_bluetooth">Bluetooth</string>
+  <string name="incall_content_description_headset">Drátová sluchátka</string>
+  <string name="incall_content_description_hold">Podržet hovor</string>
+  <string name="incall_content_description_unhold">Obnovit hovor</string>
+  <string name="incall_content_description_video_on">Zapnuté video</string>
+  <string name="incall_content_description_video_off">Vypnuté video</string>
+  <string name="incall_content_description_swap_video">Přepnout video</string>
+  <string name="incall_label_speaker">Reproduktor</string>
+  <string name="incall_label_audio">Zvuk</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-da/strings.xml b/java/com/android/incallui/commontheme/res/values-da/strings.xml
index bd26e90..f06cf61 100644
--- a/java/com/android/incallui/commontheme/res/values-da/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-da/strings.xml
@@ -1,36 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_content_description_end_call" msgid="8232796487777787200">"Afslut opkald"</string>
-    <string name="incall_content_description_muted" msgid="2130133443150389474">"Lyde blev slået fra"</string>
-    <string name="incall_content_description_unmuted" msgid="4023577547526525202">"Lyden blev slået til"</string>
-    <string name="incall_content_description_swap_calls" msgid="5233257839262161417">"Byt opkald"</string>
-    <string name="incall_content_description_merge_calls" msgid="5198778837993669729">"Flet opkald"</string>
-    <string name="incall_content_description_earpiece" msgid="2786221842272370555">"Ørestykke til håndsæt"</string>
-    <string name="incall_content_description_speaker" msgid="7837829930201265549">"Højttaler"</string>
-    <string name="incall_content_description_bluetooth" msgid="6988919010980910001">"Bluetooth"</string>
-    <string name="incall_content_description_headset" msgid="3170439802944346719">"Headset med ledning"</string>
-    <string name="incall_content_description_hold" msgid="3335508251734906019">"Parkér opkald"</string>
-    <string name="incall_content_description_unhold" msgid="3862584118869933593">"Genoptag opkald"</string>
-    <string name="incall_content_description_video_on" msgid="899266487647420613">"Video til"</string>
-    <string name="incall_content_description_video_off" msgid="762985912616707076">"Video fra"</string>
-    <string name="incall_content_description_swap_video" msgid="297943299827908998">"Byt video"</string>
-    <string name="incall_label_speaker" msgid="1814254833253409394">"Højttaler"</string>
-    <string name="incall_label_audio" msgid="5923781170533336820">"Lyd"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_content_description_end_call">Afslut opkald</string>
+  <string name="incall_content_description_muted">Lyde blev slået fra</string>
+  <string name="incall_content_description_unmuted">Lyden blev slået til</string>
+  <string name="incall_content_description_swap_calls">Byt opkald</string>
+  <string name="incall_content_description_swap_sim">Skift SIM-kort</string>
+  <string name="incall_content_description_merge_calls">Flet opkald</string>
+  <string name="incall_content_description_earpiece">Ørestykke til håndsæt</string>
+  <string name="incall_content_description_speaker">Højttaler</string>
+  <string name="incall_content_description_bluetooth">Bluetooth</string>
+  <string name="incall_content_description_headset">Headset med ledning</string>
+  <string name="incall_content_description_hold">Parkér opkald</string>
+  <string name="incall_content_description_unhold">Genoptag opkald</string>
+  <string name="incall_content_description_video_on">Video til</string>
+  <string name="incall_content_description_video_off">Video fra</string>
+  <string name="incall_content_description_swap_video">Byt video</string>
+  <string name="incall_label_speaker">Højttaler</string>
+  <string name="incall_label_audio">Lyd</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-de/strings.xml b/java/com/android/incallui/commontheme/res/values-de/strings.xml
index 3fd10f0..b6e9576 100644
--- a/java/com/android/incallui/commontheme/res/values-de/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-de/strings.xml
@@ -1,36 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_content_description_end_call" msgid="8232796487777787200">"Anruf beenden"</string>
-    <string name="incall_content_description_muted" msgid="2130133443150389474">"Stummgeschaltet"</string>
-    <string name="incall_content_description_unmuted" msgid="4023577547526525202">"Stummschaltung aufgehoben"</string>
-    <string name="incall_content_description_swap_calls" msgid="5233257839262161417">"Zwischen Anrufen wechseln"</string>
-    <string name="incall_content_description_merge_calls" msgid="5198778837993669729">"Anrufe zusammenführen"</string>
-    <string name="incall_content_description_earpiece" msgid="2786221842272370555">"Mobilgerät-Kopfhörer"</string>
-    <string name="incall_content_description_speaker" msgid="7837829930201265549">"Lautsprecher"</string>
-    <string name="incall_content_description_bluetooth" msgid="6988919010980910001">"Bluetooth"</string>
-    <string name="incall_content_description_headset" msgid="3170439802944346719">"Kabelgebundenes Headset"</string>
-    <string name="incall_content_description_hold" msgid="3335508251734906019">"Anruf halten"</string>
-    <string name="incall_content_description_unhold" msgid="3862584118869933593">"Anruf fortsetzen"</string>
-    <string name="incall_content_description_video_on" msgid="899266487647420613">"Video an"</string>
-    <string name="incall_content_description_video_off" msgid="762985912616707076">"Video aus"</string>
-    <string name="incall_content_description_swap_video" msgid="297943299827908998">"Video wechseln"</string>
-    <string name="incall_label_speaker" msgid="1814254833253409394">"Lautsprecher"</string>
-    <string name="incall_label_audio" msgid="5923781170533336820">"Tonausgabe"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_content_description_end_call">Anruf beenden</string>
+  <string name="incall_content_description_muted">Stummgeschaltet</string>
+  <string name="incall_content_description_unmuted">Stummschaltung aufgehoben</string>
+  <string name="incall_content_description_swap_calls">Zwischen Anrufen wechseln</string>
+  <string name="incall_content_description_swap_sim">SIM wechseln</string>
+  <string name="incall_content_description_merge_calls">Anrufe zusammenführen</string>
+  <string name="incall_content_description_earpiece">Mobilgerät-Kopfhörer</string>
+  <string name="incall_content_description_speaker">Lautsprecher</string>
+  <string name="incall_content_description_bluetooth">Bluetooth</string>
+  <string name="incall_content_description_headset">Kabelgebundenes Headset</string>
+  <string name="incall_content_description_hold">Anruf halten</string>
+  <string name="incall_content_description_unhold">Anruf fortsetzen</string>
+  <string name="incall_content_description_video_on">Video an</string>
+  <string name="incall_content_description_video_off">Video aus</string>
+  <string name="incall_content_description_swap_video">Video wechseln</string>
+  <string name="incall_label_speaker">Lautsprecher</string>
+  <string name="incall_label_audio">Tonausgabe</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-el/strings.xml b/java/com/android/incallui/commontheme/res/values-el/strings.xml
index 71c0be9..7564ee0 100644
--- a/java/com/android/incallui/commontheme/res/values-el/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-el/strings.xml
@@ -1,36 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_content_description_end_call" msgid="8232796487777787200">"Τερματισμός"</string>
-    <string name="incall_content_description_muted" msgid="2130133443150389474">"Σε σίγαση"</string>
-    <string name="incall_content_description_unmuted" msgid="4023577547526525202">"Κατάργηση σίγασης"</string>
-    <string name="incall_content_description_swap_calls" msgid="5233257839262161417">"Εναλλαγή κλήσεων"</string>
-    <string name="incall_content_description_merge_calls" msgid="5198778837993669729">"Συγχώνευση κλήσεων"</string>
-    <string name="incall_content_description_earpiece" msgid="2786221842272370555">"Ακουστικό"</string>
-    <string name="incall_content_description_speaker" msgid="7837829930201265549">"Ηχείο"</string>
-    <string name="incall_content_description_bluetooth" msgid="6988919010980910001">"Bluetooth"</string>
-    <string name="incall_content_description_headset" msgid="3170439802944346719">"Ενσύρματα ακουστικά"</string>
-    <string name="incall_content_description_hold" msgid="3335508251734906019">"Αναμονή κλήσης"</string>
-    <string name="incall_content_description_unhold" msgid="3862584118869933593">"Συνέχιση κλήσης"</string>
-    <string name="incall_content_description_video_on" msgid="899266487647420613">"Εικόνα βίντεο ενεργοποιημένη"</string>
-    <string name="incall_content_description_video_off" msgid="762985912616707076">"Εικόνα βίντεο απενεργοποιημένη"</string>
-    <string name="incall_content_description_swap_video" msgid="297943299827908998">"Εναλλαγή βίντεο"</string>
-    <string name="incall_label_speaker" msgid="1814254833253409394">"Ηχείο"</string>
-    <string name="incall_label_audio" msgid="5923781170533336820">"Ήχος"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_content_description_end_call">Τερματισμός</string>
+  <string name="incall_content_description_muted">Σε σίγαση</string>
+  <string name="incall_content_description_unmuted">Κατάργηση σίγασης</string>
+  <string name="incall_content_description_swap_calls">Εναλλαγή κλήσεων</string>
+  <string name="incall_content_description_swap_sim">Αλλαγή SIM</string>
+  <string name="incall_content_description_merge_calls">Συγχώνευση κλήσεων</string>
+  <string name="incall_content_description_earpiece">Ακουστικό</string>
+  <string name="incall_content_description_speaker">Ηχείο</string>
+  <string name="incall_content_description_bluetooth">Bluetooth</string>
+  <string name="incall_content_description_headset">Ενσύρματα ακουστικά</string>
+  <string name="incall_content_description_hold">Αναμονή κλήσης</string>
+  <string name="incall_content_description_unhold">Συνέχιση κλήσης</string>
+  <string name="incall_content_description_video_on">Εικόνα βίντεο ενεργοποιημένη</string>
+  <string name="incall_content_description_video_off">Εικόνα βίντεο απενεργοποιημένη</string>
+  <string name="incall_content_description_swap_video">Εναλλαγή βίντεο</string>
+  <string name="incall_label_speaker">Ηχείο</string>
+  <string name="incall_label_audio">Ήχος</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-en-rAU/strings.xml b/java/com/android/incallui/commontheme/res/values-en-rAU/strings.xml
index 4869c3f..afc4d2e 100644
--- a/java/com/android/incallui/commontheme/res/values-en-rAU/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-en-rAU/strings.xml
@@ -1,36 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_content_description_end_call" msgid="8232796487777787200">"End call"</string>
-    <string name="incall_content_description_muted" msgid="2130133443150389474">"Muted"</string>
-    <string name="incall_content_description_unmuted" msgid="4023577547526525202">"Unmuted"</string>
-    <string name="incall_content_description_swap_calls" msgid="5233257839262161417">"Swap calls"</string>
-    <string name="incall_content_description_merge_calls" msgid="5198778837993669729">"Merge calls"</string>
-    <string name="incall_content_description_earpiece" msgid="2786221842272370555">"Handset earpiece"</string>
-    <string name="incall_content_description_speaker" msgid="7837829930201265549">"Speaker"</string>
-    <string name="incall_content_description_bluetooth" msgid="6988919010980910001">"Bluetooth"</string>
-    <string name="incall_content_description_headset" msgid="3170439802944346719">"Wired headset"</string>
-    <string name="incall_content_description_hold" msgid="3335508251734906019">"Hold call"</string>
-    <string name="incall_content_description_unhold" msgid="3862584118869933593">"Resume call"</string>
-    <string name="incall_content_description_video_on" msgid="899266487647420613">"Video on"</string>
-    <string name="incall_content_description_video_off" msgid="762985912616707076">"Video off"</string>
-    <string name="incall_content_description_swap_video" msgid="297943299827908998">"Swap video"</string>
-    <string name="incall_label_speaker" msgid="1814254833253409394">"Speaker"</string>
-    <string name="incall_label_audio" msgid="5923781170533336820">"Sound"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_content_description_end_call">End call</string>
+  <string name="incall_content_description_muted">Muted</string>
+  <string name="incall_content_description_unmuted">Unmuted</string>
+  <string name="incall_content_description_swap_calls">Swap calls</string>
+  <string name="incall_content_description_swap_sim">Change SIM</string>
+  <string name="incall_content_description_merge_calls">Merge calls</string>
+  <string name="incall_content_description_earpiece">Handset earpiece</string>
+  <string name="incall_content_description_speaker">Speaker</string>
+  <string name="incall_content_description_bluetooth">Bluetooth</string>
+  <string name="incall_content_description_headset">Wired headset</string>
+  <string name="incall_content_description_hold">Hold call</string>
+  <string name="incall_content_description_unhold">Resume call</string>
+  <string name="incall_content_description_video_on">Video on</string>
+  <string name="incall_content_description_video_off">Video off</string>
+  <string name="incall_content_description_swap_video">Swap video</string>
+  <string name="incall_label_speaker">Speaker</string>
+  <string name="incall_label_audio">Sound</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-en-rGB/strings.xml b/java/com/android/incallui/commontheme/res/values-en-rGB/strings.xml
index 4869c3f..afc4d2e 100644
--- a/java/com/android/incallui/commontheme/res/values-en-rGB/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-en-rGB/strings.xml
@@ -1,36 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_content_description_end_call" msgid="8232796487777787200">"End call"</string>
-    <string name="incall_content_description_muted" msgid="2130133443150389474">"Muted"</string>
-    <string name="incall_content_description_unmuted" msgid="4023577547526525202">"Unmuted"</string>
-    <string name="incall_content_description_swap_calls" msgid="5233257839262161417">"Swap calls"</string>
-    <string name="incall_content_description_merge_calls" msgid="5198778837993669729">"Merge calls"</string>
-    <string name="incall_content_description_earpiece" msgid="2786221842272370555">"Handset earpiece"</string>
-    <string name="incall_content_description_speaker" msgid="7837829930201265549">"Speaker"</string>
-    <string name="incall_content_description_bluetooth" msgid="6988919010980910001">"Bluetooth"</string>
-    <string name="incall_content_description_headset" msgid="3170439802944346719">"Wired headset"</string>
-    <string name="incall_content_description_hold" msgid="3335508251734906019">"Hold call"</string>
-    <string name="incall_content_description_unhold" msgid="3862584118869933593">"Resume call"</string>
-    <string name="incall_content_description_video_on" msgid="899266487647420613">"Video on"</string>
-    <string name="incall_content_description_video_off" msgid="762985912616707076">"Video off"</string>
-    <string name="incall_content_description_swap_video" msgid="297943299827908998">"Swap video"</string>
-    <string name="incall_label_speaker" msgid="1814254833253409394">"Speaker"</string>
-    <string name="incall_label_audio" msgid="5923781170533336820">"Sound"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_content_description_end_call">End call</string>
+  <string name="incall_content_description_muted">Muted</string>
+  <string name="incall_content_description_unmuted">Unmuted</string>
+  <string name="incall_content_description_swap_calls">Swap calls</string>
+  <string name="incall_content_description_swap_sim">Change SIM</string>
+  <string name="incall_content_description_merge_calls">Merge calls</string>
+  <string name="incall_content_description_earpiece">Handset earpiece</string>
+  <string name="incall_content_description_speaker">Speaker</string>
+  <string name="incall_content_description_bluetooth">Bluetooth</string>
+  <string name="incall_content_description_headset">Wired headset</string>
+  <string name="incall_content_description_hold">Hold call</string>
+  <string name="incall_content_description_unhold">Resume call</string>
+  <string name="incall_content_description_video_on">Video on</string>
+  <string name="incall_content_description_video_off">Video off</string>
+  <string name="incall_content_description_swap_video">Swap video</string>
+  <string name="incall_label_speaker">Speaker</string>
+  <string name="incall_label_audio">Sound</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-en-rIN/strings.xml b/java/com/android/incallui/commontheme/res/values-en-rIN/strings.xml
index 4869c3f..afc4d2e 100644
--- a/java/com/android/incallui/commontheme/res/values-en-rIN/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-en-rIN/strings.xml
@@ -1,36 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_content_description_end_call" msgid="8232796487777787200">"End call"</string>
-    <string name="incall_content_description_muted" msgid="2130133443150389474">"Muted"</string>
-    <string name="incall_content_description_unmuted" msgid="4023577547526525202">"Unmuted"</string>
-    <string name="incall_content_description_swap_calls" msgid="5233257839262161417">"Swap calls"</string>
-    <string name="incall_content_description_merge_calls" msgid="5198778837993669729">"Merge calls"</string>
-    <string name="incall_content_description_earpiece" msgid="2786221842272370555">"Handset earpiece"</string>
-    <string name="incall_content_description_speaker" msgid="7837829930201265549">"Speaker"</string>
-    <string name="incall_content_description_bluetooth" msgid="6988919010980910001">"Bluetooth"</string>
-    <string name="incall_content_description_headset" msgid="3170439802944346719">"Wired headset"</string>
-    <string name="incall_content_description_hold" msgid="3335508251734906019">"Hold call"</string>
-    <string name="incall_content_description_unhold" msgid="3862584118869933593">"Resume call"</string>
-    <string name="incall_content_description_video_on" msgid="899266487647420613">"Video on"</string>
-    <string name="incall_content_description_video_off" msgid="762985912616707076">"Video off"</string>
-    <string name="incall_content_description_swap_video" msgid="297943299827908998">"Swap video"</string>
-    <string name="incall_label_speaker" msgid="1814254833253409394">"Speaker"</string>
-    <string name="incall_label_audio" msgid="5923781170533336820">"Sound"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_content_description_end_call">End call</string>
+  <string name="incall_content_description_muted">Muted</string>
+  <string name="incall_content_description_unmuted">Unmuted</string>
+  <string name="incall_content_description_swap_calls">Swap calls</string>
+  <string name="incall_content_description_swap_sim">Change SIM</string>
+  <string name="incall_content_description_merge_calls">Merge calls</string>
+  <string name="incall_content_description_earpiece">Handset earpiece</string>
+  <string name="incall_content_description_speaker">Speaker</string>
+  <string name="incall_content_description_bluetooth">Bluetooth</string>
+  <string name="incall_content_description_headset">Wired headset</string>
+  <string name="incall_content_description_hold">Hold call</string>
+  <string name="incall_content_description_unhold">Resume call</string>
+  <string name="incall_content_description_video_on">Video on</string>
+  <string name="incall_content_description_video_off">Video off</string>
+  <string name="incall_content_description_swap_video">Swap video</string>
+  <string name="incall_label_speaker">Speaker</string>
+  <string name="incall_label_audio">Sound</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-es-rUS/strings.xml b/java/com/android/incallui/commontheme/res/values-es-rUS/strings.xml
index a9596d9..5daf4ae 100644
--- a/java/com/android/incallui/commontheme/res/values-es-rUS/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-es-rUS/strings.xml
@@ -1,36 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_content_description_end_call" msgid="8232796487777787200">"Finalizar llamada"</string>
-    <string name="incall_content_description_muted" msgid="2130133443150389474">"Silenciado"</string>
-    <string name="incall_content_description_unmuted" msgid="4023577547526525202">"Sonido activado"</string>
-    <string name="incall_content_description_swap_calls" msgid="5233257839262161417">"Intercambiar llamadas"</string>
-    <string name="incall_content_description_merge_calls" msgid="5198778837993669729">"Combinar llamadas"</string>
-    <string name="incall_content_description_earpiece" msgid="2786221842272370555">"Auricular del dispositivo"</string>
-    <string name="incall_content_description_speaker" msgid="7837829930201265549">"Altavoz"</string>
-    <string name="incall_content_description_bluetooth" msgid="6988919010980910001">"Bluetooth"</string>
-    <string name="incall_content_description_headset" msgid="3170439802944346719">"Auriculares con cable"</string>
-    <string name="incall_content_description_hold" msgid="3335508251734906019">"Retener llamada"</string>
-    <string name="incall_content_description_unhold" msgid="3862584118869933593">"Reanudar llamada"</string>
-    <string name="incall_content_description_video_on" msgid="899266487647420613">"Video activado"</string>
-    <string name="incall_content_description_video_off" msgid="762985912616707076">"Video desactivado"</string>
-    <string name="incall_content_description_swap_video" msgid="297943299827908998">"Intercambiar video"</string>
-    <string name="incall_label_speaker" msgid="1814254833253409394">"Altavoz"</string>
-    <string name="incall_label_audio" msgid="5923781170533336820">"Sonido"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_content_description_end_call">Finalizar llamada</string>
+  <string name="incall_content_description_muted">Silenciado</string>
+  <string name="incall_content_description_unmuted">Sonido activado</string>
+  <string name="incall_content_description_swap_calls">Intercambiar llamadas</string>
+  <string name="incall_content_description_swap_sim">Cambiar SIM</string>
+  <string name="incall_content_description_merge_calls">Combinar llamadas</string>
+  <string name="incall_content_description_earpiece">Auricular del dispositivo</string>
+  <string name="incall_content_description_speaker">Altavoz</string>
+  <string name="incall_content_description_bluetooth">Bluetooth</string>
+  <string name="incall_content_description_headset">Auriculares con cable</string>
+  <string name="incall_content_description_hold">Retener llamada</string>
+  <string name="incall_content_description_unhold">Reanudar llamada</string>
+  <string name="incall_content_description_video_on">Video activado</string>
+  <string name="incall_content_description_video_off">Video desactivado</string>
+  <string name="incall_content_description_swap_video">Intercambiar video</string>
+  <string name="incall_label_speaker">Altavoz</string>
+  <string name="incall_label_audio">Sonido</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-es/strings.xml b/java/com/android/incallui/commontheme/res/values-es/strings.xml
index aa84c62..2e1c40e 100644
--- a/java/com/android/incallui/commontheme/res/values-es/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-es/strings.xml
@@ -1,36 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_content_description_end_call" msgid="8232796487777787200">"Finalizar llamada"</string>
-    <string name="incall_content_description_muted" msgid="2130133443150389474">"Silenciado"</string>
-    <string name="incall_content_description_unmuted" msgid="4023577547526525202">"No silenciado"</string>
-    <string name="incall_content_description_swap_calls" msgid="5233257839262161417">"Cambiar de llamada"</string>
-    <string name="incall_content_description_merge_calls" msgid="5198778837993669729">"Combinar llamadas"</string>
-    <string name="incall_content_description_earpiece" msgid="2786221842272370555">"Auricular de teléfono"</string>
-    <string name="incall_content_description_speaker" msgid="7837829930201265549">"Altavoz"</string>
-    <string name="incall_content_description_bluetooth" msgid="6988919010980910001">"Bluetooth"</string>
-    <string name="incall_content_description_headset" msgid="3170439802944346719">"Auriculares con cable"</string>
-    <string name="incall_content_description_hold" msgid="3335508251734906019">"Retener llamada"</string>
-    <string name="incall_content_description_unhold" msgid="3862584118869933593">"Reanudar llamada"</string>
-    <string name="incall_content_description_video_on" msgid="899266487647420613">"Vídeo activado"</string>
-    <string name="incall_content_description_video_off" msgid="762985912616707076">"Vídeo desactivado"</string>
-    <string name="incall_content_description_swap_video" msgid="297943299827908998">"Cambiar de vídeo"</string>
-    <string name="incall_label_speaker" msgid="1814254833253409394">"Altavoz"</string>
-    <string name="incall_label_audio" msgid="5923781170533336820">"Sonido"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_content_description_end_call">Finalizar llamada</string>
+  <string name="incall_content_description_muted">Silenciado</string>
+  <string name="incall_content_description_unmuted">No silenciado</string>
+  <string name="incall_content_description_swap_calls">Cambiar de llamada</string>
+  <string name="incall_content_description_swap_sim">Cambiar SIM</string>
+  <string name="incall_content_description_merge_calls">Combinar llamadas</string>
+  <string name="incall_content_description_earpiece">Auricular de teléfono</string>
+  <string name="incall_content_description_speaker">Altavoz</string>
+  <string name="incall_content_description_bluetooth">Bluetooth</string>
+  <string name="incall_content_description_headset">Auriculares con cable</string>
+  <string name="incall_content_description_hold">Retener llamada</string>
+  <string name="incall_content_description_unhold">Reanudar llamada</string>
+  <string name="incall_content_description_video_on">Vídeo activado</string>
+  <string name="incall_content_description_video_off">Vídeo desactivado</string>
+  <string name="incall_content_description_swap_video">Cambiar de vídeo</string>
+  <string name="incall_label_speaker">Altavoz</string>
+  <string name="incall_label_audio">Sonido</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-et/strings.xml b/java/com/android/incallui/commontheme/res/values-et/strings.xml
index ae2e1ba..67ff203 100644
--- a/java/com/android/incallui/commontheme/res/values-et/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-et/strings.xml
@@ -1,36 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_content_description_end_call" msgid="8232796487777787200">"Kõne lõpetamine"</string>
-    <string name="incall_content_description_muted" msgid="2130133443150389474">"Vaigistatud"</string>
-    <string name="incall_content_description_unmuted" msgid="4023577547526525202">"Vaigistus on tühistatud"</string>
-    <string name="incall_content_description_swap_calls" msgid="5233257839262161417">"Kõne vahetamine"</string>
-    <string name="incall_content_description_merge_calls" msgid="5198778837993669729">"Kõnede ühendamine"</string>
-    <string name="incall_content_description_earpiece" msgid="2786221842272370555">"Käsitelefoni kuular"</string>
-    <string name="incall_content_description_speaker" msgid="7837829930201265549">"Kõlar"</string>
-    <string name="incall_content_description_bluetooth" msgid="6988919010980910001">"Bluetooth"</string>
-    <string name="incall_content_description_headset" msgid="3170439802944346719">"Juhtmega peakomplekt"</string>
-    <string name="incall_content_description_hold" msgid="3335508251734906019">"Kõne ootele"</string>
-    <string name="incall_content_description_unhold" msgid="3862584118869933593">"Jätka kõnet"</string>
-    <string name="incall_content_description_video_on" msgid="899266487647420613">"Video on sees"</string>
-    <string name="incall_content_description_video_off" msgid="762985912616707076">"Video on väljas"</string>
-    <string name="incall_content_description_swap_video" msgid="297943299827908998">"Video vahetamine"</string>
-    <string name="incall_label_speaker" msgid="1814254833253409394">"Kõlar"</string>
-    <string name="incall_label_audio" msgid="5923781170533336820">"Heli"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_content_description_end_call">Kõne lõpetamine</string>
+  <string name="incall_content_description_muted">Vaigistatud</string>
+  <string name="incall_content_description_unmuted">Vaigistus on tühistatud</string>
+  <string name="incall_content_description_swap_calls">Kõne vahetamine</string>
+  <string name="incall_content_description_swap_sim">SIM-kaardi muutmine</string>
+  <string name="incall_content_description_merge_calls">Kõnede ühendamine</string>
+  <string name="incall_content_description_earpiece">Käsitelefoni kuular</string>
+  <string name="incall_content_description_speaker">Kõlar</string>
+  <string name="incall_content_description_bluetooth">Bluetooth</string>
+  <string name="incall_content_description_headset">Juhtmega peakomplekt</string>
+  <string name="incall_content_description_hold">Kõne ootele</string>
+  <string name="incall_content_description_unhold">Jätka kõnet</string>
+  <string name="incall_content_description_video_on">Video on sees</string>
+  <string name="incall_content_description_video_off">Video on väljas</string>
+  <string name="incall_content_description_swap_video">Video vahetamine</string>
+  <string name="incall_label_speaker">Kõlar</string>
+  <string name="incall_label_audio">Heli</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-eu/strings.xml b/java/com/android/incallui/commontheme/res/values-eu/strings.xml
index 0dd126c..c9caab6 100644
--- a/java/com/android/incallui/commontheme/res/values-eu/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-eu/strings.xml
@@ -1,36 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_content_description_end_call" msgid="8232796487777787200">"Amaitu deia"</string>
-    <string name="incall_content_description_muted" msgid="2130133443150389474">"Desaktibatuta dago audioa"</string>
-    <string name="incall_content_description_unmuted" msgid="4023577547526525202">"Aktibatuta dago audioa"</string>
-    <string name="incall_content_description_swap_calls" msgid="5233257839262161417">"Aldatu deia"</string>
-    <string name="incall_content_description_merge_calls" msgid="5198778837993669729">"Bateratu deiak"</string>
-    <string name="incall_content_description_earpiece" msgid="2786221842272370555">"Aurikularrak"</string>
-    <string name="incall_content_description_speaker" msgid="7837829930201265549">"Bozgorailua"</string>
-    <string name="incall_content_description_bluetooth" msgid="6988919010980910001">"Bluetooth konexioa"</string>
-    <string name="incall_content_description_headset" msgid="3170439802944346719">"Kabledun entzungailua"</string>
-    <string name="incall_content_description_hold" msgid="3335508251734906019">"Utzi deia zain"</string>
-    <string name="incall_content_description_unhold" msgid="3862584118869933593">"Berrekin deiari"</string>
-    <string name="incall_content_description_video_on" msgid="899266487647420613">"Aktibatuta dago bideoa"</string>
-    <string name="incall_content_description_video_off" msgid="762985912616707076">"Desaktibatuta dago bideoa"</string>
-    <string name="incall_content_description_swap_video" msgid="297943299827908998">"Aldatu bideoa"</string>
-    <string name="incall_label_speaker" msgid="1814254833253409394">"Bozgorailua"</string>
-    <string name="incall_label_audio" msgid="5923781170533336820">"Soinua"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_content_description_end_call">Amaitu deia</string>
+  <string name="incall_content_description_muted">Desaktibatuta dago audioa</string>
+  <string name="incall_content_description_unmuted">Aktibatuta dago audioa</string>
+  <string name="incall_content_description_swap_calls">Aldatu deia</string>
+  <string name="incall_content_description_swap_sim">Aldatu SIMa</string>
+  <string name="incall_content_description_merge_calls">Bateratu deiak</string>
+  <string name="incall_content_description_earpiece">Aurikularrak</string>
+  <string name="incall_content_description_speaker">Bozgorailua</string>
+  <string name="incall_content_description_bluetooth">Bluetooth konexioa</string>
+  <string name="incall_content_description_headset">Kabledun entzungailua</string>
+  <string name="incall_content_description_hold">Utzi deia zain</string>
+  <string name="incall_content_description_unhold">Berrekin deiari</string>
+  <string name="incall_content_description_video_on">Aktibatuta dago bideoa</string>
+  <string name="incall_content_description_video_off">Desaktibatuta dago bideoa</string>
+  <string name="incall_content_description_swap_video">Aldatu bideoa</string>
+  <string name="incall_label_speaker">Bozgorailua</string>
+  <string name="incall_label_audio">Soinua</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-fa/strings.xml b/java/com/android/incallui/commontheme/res/values-fa/strings.xml
index 1996ad4..6193813 100644
--- a/java/com/android/incallui/commontheme/res/values-fa/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-fa/strings.xml
@@ -1,36 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_content_description_end_call" msgid="8232796487777787200">"پایان تماس"</string>
-    <string name="incall_content_description_muted" msgid="2130133443150389474">"بی‌صدا شد"</string>
-    <string name="incall_content_description_unmuted" msgid="4023577547526525202">"باصدا شد"</string>
-    <string name="incall_content_description_swap_calls" msgid="5233257839262161417">"جابه‌جایی تماس‌ها"</string>
-    <string name="incall_content_description_merge_calls" msgid="5198778837993669729">"ادغام تماس‌ها"</string>
-    <string name="incall_content_description_earpiece" msgid="2786221842272370555">"گوشی"</string>
-    <string name="incall_content_description_speaker" msgid="7837829930201265549">"بلندگو"</string>
-    <string name="incall_content_description_bluetooth" msgid="6988919010980910001">"بلوتوث"</string>
-    <string name="incall_content_description_headset" msgid="3170439802944346719">"هدست سیم‌دار"</string>
-    <string name="incall_content_description_hold" msgid="3335508251734906019">"درانتظارنگه‌داشتن تماس"</string>
-    <string name="incall_content_description_unhold" msgid="3862584118869933593">"ازسرگیری تماس"</string>
-    <string name="incall_content_description_video_on" msgid="899266487647420613">"ویدئو فعال"</string>
-    <string name="incall_content_description_video_off" msgid="762985912616707076">"ویدئو غیرفعال"</string>
-    <string name="incall_content_description_swap_video" msgid="297943299827908998">"جابه‌جایی ویدئو"</string>
-    <string name="incall_label_speaker" msgid="1814254833253409394">"بلندگو"</string>
-    <string name="incall_label_audio" msgid="5923781170533336820">"صدا"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_content_description_end_call">پایان تماس</string>
+  <string name="incall_content_description_muted">بی‌صدا شد</string>
+  <string name="incall_content_description_unmuted">باصدا شد</string>
+  <string name="incall_content_description_swap_calls">جابه‌جایی تماس‌ها</string>
+  <string name="incall_content_description_swap_sim">تغییر سیم‌کارت</string>
+  <string name="incall_content_description_merge_calls">ادغام تماس‌ها</string>
+  <string name="incall_content_description_earpiece">گوشی</string>
+  <string name="incall_content_description_speaker">بلندگو</string>
+  <string name="incall_content_description_bluetooth">بلوتوث</string>
+  <string name="incall_content_description_headset">هدست سیم‌دار</string>
+  <string name="incall_content_description_hold">درانتظارنگه‌داشتن تماس</string>
+  <string name="incall_content_description_unhold">ازسرگیری تماس</string>
+  <string name="incall_content_description_video_on">ویدئو فعال</string>
+  <string name="incall_content_description_video_off">ویدئو غیرفعال</string>
+  <string name="incall_content_description_swap_video">جابه‌جایی ویدئو</string>
+  <string name="incall_label_speaker">بلندگو</string>
+  <string name="incall_label_audio">صدا</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-fi/strings.xml b/java/com/android/incallui/commontheme/res/values-fi/strings.xml
index 5a57981..f14d82f 100644
--- a/java/com/android/incallui/commontheme/res/values-fi/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-fi/strings.xml
@@ -1,36 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_content_description_end_call" msgid="8232796487777787200">"Päätä puhelu"</string>
-    <string name="incall_content_description_muted" msgid="2130133443150389474">"Mykistetty"</string>
-    <string name="incall_content_description_unmuted" msgid="4023577547526525202">"Mykistys poistettu"</string>
-    <string name="incall_content_description_swap_calls" msgid="5233257839262161417">"Vaihda puhelua"</string>
-    <string name="incall_content_description_merge_calls" msgid="5198778837993669729">"Yhdistä puhelut"</string>
-    <string name="incall_content_description_earpiece" msgid="2786221842272370555">"Puhelimen kaiutin"</string>
-    <string name="incall_content_description_speaker" msgid="7837829930201265549">"Kaiutin"</string>
-    <string name="incall_content_description_bluetooth" msgid="6988919010980910001">"Bluetooth"</string>
-    <string name="incall_content_description_headset" msgid="3170439802944346719">"Langalliset kuulokkeet"</string>
-    <string name="incall_content_description_hold" msgid="3335508251734906019">"Aseta puhelu pitoon"</string>
-    <string name="incall_content_description_unhold" msgid="3862584118869933593">"Jatka puhelua"</string>
-    <string name="incall_content_description_video_on" msgid="899266487647420613">"Videokuva käytössä"</string>
-    <string name="incall_content_description_video_off" msgid="762985912616707076">"Videokuva poissa käytöstä"</string>
-    <string name="incall_content_description_swap_video" msgid="297943299827908998">"Vaihda videota"</string>
-    <string name="incall_label_speaker" msgid="1814254833253409394">"Kaiutin"</string>
-    <string name="incall_label_audio" msgid="5923781170533336820">"Ääni"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_content_description_end_call">Päätä puhelu</string>
+  <string name="incall_content_description_muted">Mykistetty</string>
+  <string name="incall_content_description_unmuted">Mykistys poistettu</string>
+  <string name="incall_content_description_swap_calls">Vaihda puhelua</string>
+  <string name="incall_content_description_swap_sim">Vaihda SIM-kortti</string>
+  <string name="incall_content_description_merge_calls">Yhdistä puhelut</string>
+  <string name="incall_content_description_earpiece">Puhelimen kaiutin</string>
+  <string name="incall_content_description_speaker">Kaiutin</string>
+  <string name="incall_content_description_bluetooth">Bluetooth</string>
+  <string name="incall_content_description_headset">Langalliset kuulokkeet</string>
+  <string name="incall_content_description_hold">Aseta puhelu pitoon</string>
+  <string name="incall_content_description_unhold">Jatka puhelua</string>
+  <string name="incall_content_description_video_on">Videokuva käytössä</string>
+  <string name="incall_content_description_video_off">Videokuva poissa käytöstä</string>
+  <string name="incall_content_description_swap_video">Vaihda videota</string>
+  <string name="incall_label_speaker">Kaiutin</string>
+  <string name="incall_label_audio">Ääni</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-fr-rCA/strings.xml b/java/com/android/incallui/commontheme/res/values-fr-rCA/strings.xml
index a1db306..23b3adf 100644
--- a/java/com/android/incallui/commontheme/res/values-fr-rCA/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-fr-rCA/strings.xml
@@ -1,36 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_content_description_end_call" msgid="8232796487777787200">"Mettre fin à l\'appel"</string>
-    <string name="incall_content_description_muted" msgid="2130133443150389474">"Son désactivé"</string>
-    <string name="incall_content_description_unmuted" msgid="4023577547526525202">"Son réactivé"</string>
-    <string name="incall_content_description_swap_calls" msgid="5233257839262161417">"Permuter les appels"</string>
-    <string name="incall_content_description_merge_calls" msgid="5198778837993669729">"Fusionner les appels"</string>
-    <string name="incall_content_description_earpiece" msgid="2786221842272370555">"Écouteur du combiné"</string>
-    <string name="incall_content_description_speaker" msgid="7837829930201265549">"Haut-parleur"</string>
-    <string name="incall_content_description_bluetooth" msgid="6988919010980910001">"Bluetooth"</string>
-    <string name="incall_content_description_headset" msgid="3170439802944346719">"Casque filaire"</string>
-    <string name="incall_content_description_hold" msgid="3335508251734906019">"Mettre l\'appel en attente"</string>
-    <string name="incall_content_description_unhold" msgid="3862584118869933593">"Reprendre l\'appel"</string>
-    <string name="incall_content_description_video_on" msgid="899266487647420613">"Vidéo activée"</string>
-    <string name="incall_content_description_video_off" msgid="762985912616707076">"Vidéo désactivée"</string>
-    <string name="incall_content_description_swap_video" msgid="297943299827908998">"Permuter la vidéo"</string>
-    <string name="incall_label_speaker" msgid="1814254833253409394">"Haut-parleur"</string>
-    <string name="incall_label_audio" msgid="5923781170533336820">"Son"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_content_description_end_call">Mettre fin à l\'appel</string>
+  <string name="incall_content_description_muted">Son désactivé</string>
+  <string name="incall_content_description_unmuted">Son réactivé</string>
+  <string name="incall_content_description_swap_calls">Permuter les appels</string>
+  <string name="incall_content_description_swap_sim">Changer de carte SIM</string>
+  <string name="incall_content_description_merge_calls">Fusionner les appels</string>
+  <string name="incall_content_description_earpiece">Écouteur du combiné</string>
+  <string name="incall_content_description_speaker">Haut-parleur</string>
+  <string name="incall_content_description_bluetooth">Bluetooth</string>
+  <string name="incall_content_description_headset">Casque filaire</string>
+  <string name="incall_content_description_hold">Mettre l\'appel en attente</string>
+  <string name="incall_content_description_unhold">Reprendre l\'appel</string>
+  <string name="incall_content_description_video_on">Vidéo activée</string>
+  <string name="incall_content_description_video_off">Vidéo désactivée</string>
+  <string name="incall_content_description_swap_video">Permuter la vidéo</string>
+  <string name="incall_label_speaker">Haut-parleur</string>
+  <string name="incall_label_audio">Son</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-fr/strings.xml b/java/com/android/incallui/commontheme/res/values-fr/strings.xml
index e169a3d..5cf106f 100644
--- a/java/com/android/incallui/commontheme/res/values-fr/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-fr/strings.xml
@@ -1,36 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_content_description_end_call" msgid="8232796487777787200">"Mettre fin à l\'appel"</string>
-    <string name="incall_content_description_muted" msgid="2130133443150389474">"Son coupé"</string>
-    <string name="incall_content_description_unmuted" msgid="4023577547526525202">"Son réactivé"</string>
-    <string name="incall_content_description_swap_calls" msgid="5233257839262161417">"Permuter les appels"</string>
-    <string name="incall_content_description_merge_calls" msgid="5198778837993669729">"Fusionner les appels"</string>
-    <string name="incall_content_description_earpiece" msgid="2786221842272370555">"Écouteur du combiné"</string>
-    <string name="incall_content_description_speaker" msgid="7837829930201265549">"Haut-parleur"</string>
-    <string name="incall_content_description_bluetooth" msgid="6988919010980910001">"Bluetooth"</string>
-    <string name="incall_content_description_headset" msgid="3170439802944346719">"Casque filaire"</string>
-    <string name="incall_content_description_hold" msgid="3335508251734906019">"Mettre l\'appel en attente"</string>
-    <string name="incall_content_description_unhold" msgid="3862584118869933593">"Reprendre l\'appel"</string>
-    <string name="incall_content_description_video_on" msgid="899266487647420613">"Vidéo activée"</string>
-    <string name="incall_content_description_video_off" msgid="762985912616707076">"Vidéo désactivée"</string>
-    <string name="incall_content_description_swap_video" msgid="297943299827908998">"Permuter la vidéo"</string>
-    <string name="incall_label_speaker" msgid="1814254833253409394">"Haut-parleur"</string>
-    <string name="incall_label_audio" msgid="5923781170533336820">"Audio"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_content_description_end_call">Mettre fin à l\'appel</string>
+  <string name="incall_content_description_muted">Son coupé</string>
+  <string name="incall_content_description_unmuted">Son réactivé</string>
+  <string name="incall_content_description_swap_calls">Permuter les appels</string>
+  <string name="incall_content_description_swap_sim">Changer de carte SIM</string>
+  <string name="incall_content_description_merge_calls">Fusionner les appels</string>
+  <string name="incall_content_description_earpiece">Écouteur du combiné</string>
+  <string name="incall_content_description_speaker">Haut-parleur</string>
+  <string name="incall_content_description_bluetooth">Bluetooth</string>
+  <string name="incall_content_description_headset">Casque filaire</string>
+  <string name="incall_content_description_hold">Mettre l\'appel en attente</string>
+  <string name="incall_content_description_unhold">Reprendre l\'appel</string>
+  <string name="incall_content_description_video_on">Vidéo activée</string>
+  <string name="incall_content_description_video_off">Vidéo désactivée</string>
+  <string name="incall_content_description_swap_video">Permuter la vidéo</string>
+  <string name="incall_label_speaker">Haut-parleur</string>
+  <string name="incall_label_audio">Audio</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-gl/strings.xml b/java/com/android/incallui/commontheme/res/values-gl/strings.xml
index ba98a98..ebb6dc3 100644
--- a/java/com/android/incallui/commontheme/res/values-gl/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-gl/strings.xml
@@ -1,36 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_content_description_end_call" msgid="8232796487777787200">"Finalizar chamada"</string>
-    <string name="incall_content_description_muted" msgid="2130133443150389474">"Ignorada"</string>
-    <string name="incall_content_description_unmuted" msgid="4023577547526525202">"Deixouse de ignorar"</string>
-    <string name="incall_content_description_swap_calls" msgid="5233257839262161417">"Alternar chamadas"</string>
-    <string name="incall_content_description_merge_calls" msgid="5198778837993669729">"Combinar chamadas"</string>
-    <string name="incall_content_description_earpiece" msgid="2786221842272370555">"Auricular do teléfono"</string>
-    <string name="incall_content_description_speaker" msgid="7837829930201265549">"Altofalante"</string>
-    <string name="incall_content_description_bluetooth" msgid="6988919010980910001">"Bluetooth"</string>
-    <string name="incall_content_description_headset" msgid="3170439802944346719">"Auriculares con cable"</string>
-    <string name="incall_content_description_hold" msgid="3335508251734906019">"Poñer en espera"</string>
-    <string name="incall_content_description_unhold" msgid="3862584118869933593">"Retomar chamada"</string>
-    <string name="incall_content_description_video_on" msgid="899266487647420613">"Vídeo activado"</string>
-    <string name="incall_content_description_video_off" msgid="762985912616707076">"Vídeo desactivado"</string>
-    <string name="incall_content_description_swap_video" msgid="297943299827908998">"Alternar vídeo"</string>
-    <string name="incall_label_speaker" msgid="1814254833253409394">"Altofalante"</string>
-    <string name="incall_label_audio" msgid="5923781170533336820">"Son"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_content_description_end_call">Finalizar chamada</string>
+  <string name="incall_content_description_muted">Ignorada</string>
+  <string name="incall_content_description_unmuted">Deixouse de ignorar</string>
+  <string name="incall_content_description_swap_calls">Alternar chamadas</string>
+  <string name="incall_content_description_swap_sim">Cambia a SIM</string>
+  <string name="incall_content_description_merge_calls">Combinar chamadas</string>
+  <string name="incall_content_description_earpiece">Auricular do teléfono</string>
+  <string name="incall_content_description_speaker">Altofalante</string>
+  <string name="incall_content_description_bluetooth">Bluetooth</string>
+  <string name="incall_content_description_headset">Auriculares con cable</string>
+  <string name="incall_content_description_hold">Poñer en espera</string>
+  <string name="incall_content_description_unhold">Retomar chamada</string>
+  <string name="incall_content_description_video_on">Vídeo activado</string>
+  <string name="incall_content_description_video_off">Vídeo desactivado</string>
+  <string name="incall_content_description_swap_video">Alternar vídeo</string>
+  <string name="incall_label_speaker">Altofalante</string>
+  <string name="incall_label_audio">Son</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-gu/strings.xml b/java/com/android/incallui/commontheme/res/values-gu/strings.xml
index 194590c..7097d10 100644
--- a/java/com/android/incallui/commontheme/res/values-gu/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-gu/strings.xml
@@ -1,36 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_content_description_end_call" msgid="8232796487777787200">"કૉલ સમાપ્ત કરો"</string>
-    <string name="incall_content_description_muted" msgid="2130133443150389474">"મ્યૂટ કરેલ"</string>
-    <string name="incall_content_description_unmuted" msgid="4023577547526525202">"અનમ્યૂટ કરેલ"</string>
-    <string name="incall_content_description_swap_calls" msgid="5233257839262161417">"કૉલ્સ સ્વેપ કરો"</string>
-    <string name="incall_content_description_merge_calls" msgid="5198778837993669729">"કૉલ્સ મર્જ કરો"</string>
-    <string name="incall_content_description_earpiece" msgid="2786221842272370555">"હેન્ડસેટ ઇયરપીસ"</string>
-    <string name="incall_content_description_speaker" msgid="7837829930201265549">"સ્પીકર"</string>
-    <string name="incall_content_description_bluetooth" msgid="6988919010980910001">"Bluetooth"</string>
-    <string name="incall_content_description_headset" msgid="3170439802944346719">"વાયર્ડ હેડસેટ"</string>
-    <string name="incall_content_description_hold" msgid="3335508251734906019">"કૉલ હોલ્ડ કરો"</string>
-    <string name="incall_content_description_unhold" msgid="3862584118869933593">"કૉલ ફરી શરૂ કરો"</string>
-    <string name="incall_content_description_video_on" msgid="899266487647420613">"વિડિઓ ચાલુ"</string>
-    <string name="incall_content_description_video_off" msgid="762985912616707076">"વિડિઓ બંધ"</string>
-    <string name="incall_content_description_swap_video" msgid="297943299827908998">"વિડિઓ સ્વેપ કરો"</string>
-    <string name="incall_label_speaker" msgid="1814254833253409394">"સ્પીકર"</string>
-    <string name="incall_label_audio" msgid="5923781170533336820">"ધ્વનિ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_content_description_end_call">કૉલ સમાપ્ત કરો</string>
+  <string name="incall_content_description_muted">મ્યૂટ કરેલ</string>
+  <string name="incall_content_description_unmuted">અનમ્યૂટ કરેલ</string>
+  <string name="incall_content_description_swap_calls">કૉલ્સ સ્વેપ કરો</string>
+  <string name="incall_content_description_swap_sim">સિમ બદલો</string>
+  <string name="incall_content_description_merge_calls">કૉલ્સ મર્જ કરો</string>
+  <string name="incall_content_description_earpiece">હેન્ડસેટ ઇયરપીસ</string>
+  <string name="incall_content_description_speaker">સ્પીકર</string>
+  <string name="incall_content_description_bluetooth">Bluetooth</string>
+  <string name="incall_content_description_headset">વાયર્ડ હેડસેટ</string>
+  <string name="incall_content_description_hold">કૉલ હોલ્ડ કરો</string>
+  <string name="incall_content_description_unhold">કૉલ ફરી શરૂ કરો</string>
+  <string name="incall_content_description_video_on">વિડિઓ ચાલુ</string>
+  <string name="incall_content_description_video_off">વિડિઓ બંધ</string>
+  <string name="incall_content_description_swap_video">વિડિઓ સ્વેપ કરો</string>
+  <string name="incall_label_speaker">સ્પીકર</string>
+  <string name="incall_label_audio">ધ્વનિ</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-hi/strings.xml b/java/com/android/incallui/commontheme/res/values-hi/strings.xml
index 207bbf2..5a344fc 100644
--- a/java/com/android/incallui/commontheme/res/values-hi/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-hi/strings.xml
@@ -1,36 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_content_description_end_call" msgid="8232796487777787200">"कॉल समाप्त करें"</string>
-    <string name="incall_content_description_muted" msgid="2130133443150389474">"म्यूट किया गया"</string>
-    <string name="incall_content_description_unmuted" msgid="4023577547526525202">"अनम्यूट किया गया"</string>
-    <string name="incall_content_description_swap_calls" msgid="5233257839262161417">"कॉल स्वैप करें"</string>
-    <string name="incall_content_description_merge_calls" msgid="5198778837993669729">"कॉल एक करें"</string>
-    <string name="incall_content_description_earpiece" msgid="2786221842272370555">"हैंडसेट इयरपीस"</string>
-    <string name="incall_content_description_speaker" msgid="7837829930201265549">"स्‍पीकर"</string>
-    <string name="incall_content_description_bluetooth" msgid="6988919010980910001">"ब्लूटूथ"</string>
-    <string name="incall_content_description_headset" msgid="3170439802944346719">"वायर वाला हैडसेट"</string>
-    <string name="incall_content_description_hold" msgid="3335508251734906019">"कॉल होल्ड करें"</string>
-    <string name="incall_content_description_unhold" msgid="3862584118869933593">"कॉल फिर से शुरू करें"</string>
-    <string name="incall_content_description_video_on" msgid="899266487647420613">"वीडियो चालू"</string>
-    <string name="incall_content_description_video_off" msgid="762985912616707076">"वीडियो बंद"</string>
-    <string name="incall_content_description_swap_video" msgid="297943299827908998">"वीडियो स्वैप करें"</string>
-    <string name="incall_label_speaker" msgid="1814254833253409394">"स्‍पीकर"</string>
-    <string name="incall_label_audio" msgid="5923781170533336820">"ध्वनि"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_content_description_end_call">कॉल समाप्त करें</string>
+  <string name="incall_content_description_muted">म्यूट किया गया</string>
+  <string name="incall_content_description_unmuted">अनम्यूट किया गया</string>
+  <string name="incall_content_description_swap_calls">कॉल स्वैप करें</string>
+  <string name="incall_content_description_swap_sim">सिम बदलें</string>
+  <string name="incall_content_description_merge_calls">कॉल एक करें</string>
+  <string name="incall_content_description_earpiece">हैंडसेट इयरपीस</string>
+  <string name="incall_content_description_speaker">स्‍पीकर</string>
+  <string name="incall_content_description_bluetooth">ब्लूटूथ</string>
+  <string name="incall_content_description_headset">वायर वाला हैडसेट</string>
+  <string name="incall_content_description_hold">कॉल होल्ड करें</string>
+  <string name="incall_content_description_unhold">कॉल फिर से शुरू करें</string>
+  <string name="incall_content_description_video_on">वीडियो चालू</string>
+  <string name="incall_content_description_video_off">वीडियो बंद</string>
+  <string name="incall_content_description_swap_video">वीडियो स्वैप करें</string>
+  <string name="incall_label_speaker">स्‍पीकर</string>
+  <string name="incall_label_audio">साउंड</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-hr/strings.xml b/java/com/android/incallui/commontheme/res/values-hr/strings.xml
index c58ab85..96f1e16 100644
--- a/java/com/android/incallui/commontheme/res/values-hr/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-hr/strings.xml
@@ -1,36 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_content_description_end_call" msgid="8232796487777787200">"Prekid poziva"</string>
-    <string name="incall_content_description_muted" msgid="2130133443150389474">"Bez zvuka"</string>
-    <string name="incall_content_description_unmuted" msgid="4023577547526525202">"Zvuk uključen"</string>
-    <string name="incall_content_description_swap_calls" msgid="5233257839262161417">"Zamijeni pozive"</string>
-    <string name="incall_content_description_merge_calls" msgid="5198778837993669729">"Spoji pozive"</string>
-    <string name="incall_content_description_earpiece" msgid="2786221842272370555">"Slušalice"</string>
-    <string name="incall_content_description_speaker" msgid="7837829930201265549">"Zvučnik"</string>
-    <string name="incall_content_description_bluetooth" msgid="6988919010980910001">"Bluetooth"</string>
-    <string name="incall_content_description_headset" msgid="3170439802944346719">"Žičane slušalice"</string>
-    <string name="incall_content_description_hold" msgid="3335508251734906019">"Stavi poziv na čekanje"</string>
-    <string name="incall_content_description_unhold" msgid="3862584118869933593">"Nastavi poziv"</string>
-    <string name="incall_content_description_video_on" msgid="899266487647420613">"Videopoziv uključen"</string>
-    <string name="incall_content_description_video_off" msgid="762985912616707076">"Videopoziv isključen"</string>
-    <string name="incall_content_description_swap_video" msgid="297943299827908998">"Zamijeni videopoziv"</string>
-    <string name="incall_label_speaker" msgid="1814254833253409394">"Zvučnik"</string>
-    <string name="incall_label_audio" msgid="5923781170533336820">"Zvuk"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_content_description_end_call">Prekid poziva</string>
+  <string name="incall_content_description_muted">Bez zvuka</string>
+  <string name="incall_content_description_unmuted">Zvuk uključen</string>
+  <string name="incall_content_description_swap_calls">Zamijeni pozive</string>
+  <string name="incall_content_description_swap_sim">Promijeni SIM</string>
+  <string name="incall_content_description_merge_calls">Spoji pozive</string>
+  <string name="incall_content_description_earpiece">Slušalice</string>
+  <string name="incall_content_description_speaker">Zvučnik</string>
+  <string name="incall_content_description_bluetooth">Bluetooth</string>
+  <string name="incall_content_description_headset">Žičane slušalice</string>
+  <string name="incall_content_description_hold">Stavi poziv na čekanje</string>
+  <string name="incall_content_description_unhold">Nastavi poziv</string>
+  <string name="incall_content_description_video_on">Videopoziv uključen</string>
+  <string name="incall_content_description_video_off">Videopoziv isključen</string>
+  <string name="incall_content_description_swap_video">Zamijeni videopoziv</string>
+  <string name="incall_label_speaker">Zvučnik</string>
+  <string name="incall_label_audio">Zvuk</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-hu/strings.xml b/java/com/android/incallui/commontheme/res/values-hu/strings.xml
index ba7fec7..35ae2fe 100644
--- a/java/com/android/incallui/commontheme/res/values-hu/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-hu/strings.xml
@@ -1,36 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_content_description_end_call" msgid="8232796487777787200">"Hívás befejezése"</string>
-    <string name="incall_content_description_muted" msgid="2130133443150389474">"Némítva"</string>
-    <string name="incall_content_description_unmuted" msgid="4023577547526525202">"Némítás feloldva"</string>
-    <string name="incall_content_description_swap_calls" msgid="5233257839262161417">"Hívások cseréje"</string>
-    <string name="incall_content_description_merge_calls" msgid="5198778837993669729">"Hívások egyesítése"</string>
-    <string name="incall_content_description_earpiece" msgid="2786221842272370555">"Kézibeszélő fülhallgatója"</string>
-    <string name="incall_content_description_speaker" msgid="7837829930201265549">"Hangszóró"</string>
-    <string name="incall_content_description_bluetooth" msgid="6988919010980910001">"Bluetooth"</string>
-    <string name="incall_content_description_headset" msgid="3170439802944346719">"Vezetékes headset"</string>
-    <string name="incall_content_description_hold" msgid="3335508251734906019">"Hívás tartása"</string>
-    <string name="incall_content_description_unhold" msgid="3862584118869933593">"Hívás folytatása"</string>
-    <string name="incall_content_description_video_on" msgid="899266487647420613">"Videó be"</string>
-    <string name="incall_content_description_video_off" msgid="762985912616707076">"Videó ki"</string>
-    <string name="incall_content_description_swap_video" msgid="297943299827908998">"Videó cseréje"</string>
-    <string name="incall_label_speaker" msgid="1814254833253409394">"Hangszóró"</string>
-    <string name="incall_label_audio" msgid="5923781170533336820">"Hang"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_content_description_end_call">Hívás befejezése</string>
+  <string name="incall_content_description_muted">Némítva</string>
+  <string name="incall_content_description_unmuted">Némítás feloldva</string>
+  <string name="incall_content_description_swap_calls">Hívások cseréje</string>
+  <string name="incall_content_description_swap_sim">SIM-kártya módosítása</string>
+  <string name="incall_content_description_merge_calls">Hívások egyesítése</string>
+  <string name="incall_content_description_earpiece">Kézibeszélő fülhallgatója</string>
+  <string name="incall_content_description_speaker">Hangszóró</string>
+  <string name="incall_content_description_bluetooth">Bluetooth</string>
+  <string name="incall_content_description_headset">Vezetékes headset</string>
+  <string name="incall_content_description_hold">Hívás tartása</string>
+  <string name="incall_content_description_unhold">Hívás folytatása</string>
+  <string name="incall_content_description_video_on">Videó be</string>
+  <string name="incall_content_description_video_off">Videó ki</string>
+  <string name="incall_content_description_swap_video">Videó cseréje</string>
+  <string name="incall_label_speaker">Hangszóró</string>
+  <string name="incall_label_audio">Hang</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-hy/strings.xml b/java/com/android/incallui/commontheme/res/values-hy/strings.xml
index 81262e4..7881c77 100644
--- a/java/com/android/incallui/commontheme/res/values-hy/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-hy/strings.xml
@@ -1,36 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_content_description_end_call" msgid="8232796487777787200">"Ավարտել զանգը"</string>
-    <string name="incall_content_description_muted" msgid="2130133443150389474">"Ձայնն անջատած է"</string>
-    <string name="incall_content_description_unmuted" msgid="4023577547526525202">"Ձայնը միացած է"</string>
-    <string name="incall_content_description_swap_calls" msgid="5233257839262161417">"Փոխանջատել զանգերը"</string>
-    <string name="incall_content_description_merge_calls" msgid="5198778837993669729">"Միավորել զանգերը"</string>
-    <string name="incall_content_description_earpiece" msgid="2786221842272370555">"Հեռախոսի ականջակալ"</string>
-    <string name="incall_content_description_speaker" msgid="7837829930201265549">"Բարձրախոս"</string>
-    <string name="incall_content_description_bluetooth" msgid="6988919010980910001">"Bluetooth"</string>
-    <string name="incall_content_description_headset" msgid="3170439802944346719">"Լարով ականջակալ"</string>
-    <string name="incall_content_description_hold" msgid="3335508251734906019">"Պահել զանգը"</string>
-    <string name="incall_content_description_unhold" msgid="3862584118869933593">"Վերսկսել զանգը"</string>
-    <string name="incall_content_description_video_on" msgid="899266487647420613">"Տեսախցիկը միացած է"</string>
-    <string name="incall_content_description_video_off" msgid="762985912616707076">"Տեսախցիկն անջատած է"</string>
-    <string name="incall_content_description_swap_video" msgid="297943299827908998">"Փոխարկել խցիկը"</string>
-    <string name="incall_label_speaker" msgid="1814254833253409394">"Բարձրախոս"</string>
-    <string name="incall_label_audio" msgid="5923781170533336820">"Ձայն"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_content_description_end_call">Ավարտել զանգը</string>
+  <string name="incall_content_description_muted">Ձայնն անջատած է</string>
+  <string name="incall_content_description_unmuted">Ձայնը միացած է</string>
+  <string name="incall_content_description_swap_calls">Փոխանջատել զանգերը</string>
+  <string name="incall_content_description_swap_sim">Փոխել SIM քարտը</string>
+  <string name="incall_content_description_merge_calls">Միավորել զանգերը</string>
+  <string name="incall_content_description_earpiece">Հեռախոսի ականջակալ</string>
+  <string name="incall_content_description_speaker">Բարձրախոս</string>
+  <string name="incall_content_description_bluetooth">Bluetooth</string>
+  <string name="incall_content_description_headset">Լարով ականջակալ</string>
+  <string name="incall_content_description_hold">Պահել զանգը</string>
+  <string name="incall_content_description_unhold">Վերսկսել զանգը</string>
+  <string name="incall_content_description_video_on">Տեսախցիկը միացած է</string>
+  <string name="incall_content_description_video_off">Տեսախցիկն անջատած է</string>
+  <string name="incall_content_description_swap_video">Փոխարկել խցիկը</string>
+  <string name="incall_label_speaker">Բարձրախոս</string>
+  <string name="incall_label_audio">Ձայն</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-in/strings.xml b/java/com/android/incallui/commontheme/res/values-in/strings.xml
index fb3fc56..b1bbab4 100644
--- a/java/com/android/incallui/commontheme/res/values-in/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-in/strings.xml
@@ -1,36 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_content_description_end_call" msgid="8232796487777787200">"Akhiri panggilan"</string>
-    <string name="incall_content_description_muted" msgid="2130133443150389474">"Dibisukan"</string>
-    <string name="incall_content_description_unmuted" msgid="4023577547526525202">"Disuarakan"</string>
-    <string name="incall_content_description_swap_calls" msgid="5233257839262161417">"Tukar panggilan"</string>
-    <string name="incall_content_description_merge_calls" msgid="5198778837993669729">"Gabungkan panggilan"</string>
-    <string name="incall_content_description_earpiece" msgid="2786221842272370555">"Earpiece handset"</string>
-    <string name="incall_content_description_speaker" msgid="7837829930201265549">"Speaker"</string>
-    <string name="incall_content_description_bluetooth" msgid="6988919010980910001">"Bluetooth"</string>
-    <string name="incall_content_description_headset" msgid="3170439802944346719">"Headset berkabel"</string>
-    <string name="incall_content_description_hold" msgid="3335508251734906019">"Tahan panggilan"</string>
-    <string name="incall_content_description_unhold" msgid="3862584118869933593">"Lanjutkan panggilan"</string>
-    <string name="incall_content_description_video_on" msgid="899266487647420613">"Video aktif"</string>
-    <string name="incall_content_description_video_off" msgid="762985912616707076">"Video nonaktif"</string>
-    <string name="incall_content_description_swap_video" msgid="297943299827908998">"Tukar Video"</string>
-    <string name="incall_label_speaker" msgid="1814254833253409394">"Speaker"</string>
-    <string name="incall_label_audio" msgid="5923781170533336820">"Suara"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_content_description_end_call">Akhiri panggilan</string>
+  <string name="incall_content_description_muted">Dibisukan</string>
+  <string name="incall_content_description_unmuted">Disuarakan</string>
+  <string name="incall_content_description_swap_calls">Tukar panggilan</string>
+  <string name="incall_content_description_swap_sim">Ubah SIM</string>
+  <string name="incall_content_description_merge_calls">Gabungkan panggilan</string>
+  <string name="incall_content_description_earpiece">Earpiece handset</string>
+  <string name="incall_content_description_speaker">Speaker</string>
+  <string name="incall_content_description_bluetooth">Bluetooth</string>
+  <string name="incall_content_description_headset">Headset berkabel</string>
+  <string name="incall_content_description_hold">Tahan panggilan</string>
+  <string name="incall_content_description_unhold">Lanjutkan panggilan</string>
+  <string name="incall_content_description_video_on">Video aktif</string>
+  <string name="incall_content_description_video_off">Video nonaktif</string>
+  <string name="incall_content_description_swap_video">Tukar Video</string>
+  <string name="incall_label_speaker">Speaker</string>
+  <string name="incall_label_audio">Suara</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-is/strings.xml b/java/com/android/incallui/commontheme/res/values-is/strings.xml
index 438b143..736b79e 100644
--- a/java/com/android/incallui/commontheme/res/values-is/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-is/strings.xml
@@ -1,36 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_content_description_end_call" msgid="8232796487777787200">"Ljúka símtali"</string>
-    <string name="incall_content_description_muted" msgid="2130133443150389474">"Hljóð af"</string>
-    <string name="incall_content_description_unmuted" msgid="4023577547526525202">"Hljóð á"</string>
-    <string name="incall_content_description_swap_calls" msgid="5233257839262161417">"Skipta á milli símtala"</string>
-    <string name="incall_content_description_merge_calls" msgid="5198778837993669729">"Sameina símtöl"</string>
-    <string name="incall_content_description_earpiece" msgid="2786221842272370555">"Símahátalari"</string>
-    <string name="incall_content_description_speaker" msgid="7837829930201265549">"Hátalari"</string>
-    <string name="incall_content_description_bluetooth" msgid="6988919010980910001">"Bluetooth"</string>
-    <string name="incall_content_description_headset" msgid="3170439802944346719">"Höfuðtól með snúru"</string>
-    <string name="incall_content_description_hold" msgid="3335508251734906019">"Setja símtal í bið"</string>
-    <string name="incall_content_description_unhold" msgid="3862584118869933593">"Halda símtali áfram"</string>
-    <string name="incall_content_description_video_on" msgid="899266487647420613">"Kveikja á mynd"</string>
-    <string name="incall_content_description_video_off" msgid="762985912616707076">"Slökkva á mynd"</string>
-    <string name="incall_content_description_swap_video" msgid="297943299827908998">"Skipta um mynd"</string>
-    <string name="incall_label_speaker" msgid="1814254833253409394">"Hátalari"</string>
-    <string name="incall_label_audio" msgid="5923781170533336820">"Hljóð"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_content_description_end_call">Ljúka símtali</string>
+  <string name="incall_content_description_muted">Hljóð af</string>
+  <string name="incall_content_description_unmuted">Hljóð á</string>
+  <string name="incall_content_description_swap_calls">Skipta á milli símtala</string>
+  <string name="incall_content_description_swap_sim">Breyta SIM</string>
+  <string name="incall_content_description_merge_calls">Sameina símtöl</string>
+  <string name="incall_content_description_earpiece">Símahátalari</string>
+  <string name="incall_content_description_speaker">Hátalari</string>
+  <string name="incall_content_description_bluetooth">Bluetooth</string>
+  <string name="incall_content_description_headset">Höfuðtól með snúru</string>
+  <string name="incall_content_description_hold">Setja símtal í bið</string>
+  <string name="incall_content_description_unhold">Halda símtali áfram</string>
+  <string name="incall_content_description_video_on">Kveikja á mynd</string>
+  <string name="incall_content_description_video_off">Slökkva á mynd</string>
+  <string name="incall_content_description_swap_video">Skipta um mynd</string>
+  <string name="incall_label_speaker">Hátalari</string>
+  <string name="incall_label_audio">Hljóð</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-it/strings.xml b/java/com/android/incallui/commontheme/res/values-it/strings.xml
index b7c1d3f..3fd31bd 100644
--- a/java/com/android/incallui/commontheme/res/values-it/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-it/strings.xml
@@ -1,36 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_content_description_end_call" msgid="8232796487777787200">"Termina chiamata"</string>
-    <string name="incall_content_description_muted" msgid="2130133443150389474">"Disattivato"</string>
-    <string name="incall_content_description_unmuted" msgid="4023577547526525202">"Riattivato"</string>
-    <string name="incall_content_description_swap_calls" msgid="5233257839262161417">"Scambia chiamate"</string>
-    <string name="incall_content_description_merge_calls" msgid="5198778837993669729">"Unisci chiamate"</string>
-    <string name="incall_content_description_earpiece" msgid="2786221842272370555">"Auricolare telefono"</string>
-    <string name="incall_content_description_speaker" msgid="7837829930201265549">"Altoparlante"</string>
-    <string name="incall_content_description_bluetooth" msgid="6988919010980910001">"Bluetooth"</string>
-    <string name="incall_content_description_headset" msgid="3170439802944346719">"Auricolare con cavo"</string>
-    <string name="incall_content_description_hold" msgid="3335508251734906019">"Metti in attesa la chiamata"</string>
-    <string name="incall_content_description_unhold" msgid="3862584118869933593">"Riprendi la chiamata"</string>
-    <string name="incall_content_description_video_on" msgid="899266487647420613">"Video attivo"</string>
-    <string name="incall_content_description_video_off" msgid="762985912616707076">"Video non attivo"</string>
-    <string name="incall_content_description_swap_video" msgid="297943299827908998">"Scambia video"</string>
-    <string name="incall_label_speaker" msgid="1814254833253409394">"Altoparlante"</string>
-    <string name="incall_label_audio" msgid="5923781170533336820">"Suono"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_content_description_end_call">Termina chiamata</string>
+  <string name="incall_content_description_muted">Disattivato</string>
+  <string name="incall_content_description_unmuted">Riattivato</string>
+  <string name="incall_content_description_swap_calls">Scambia chiamate</string>
+  <string name="incall_content_description_swap_sim">Cambia SIM</string>
+  <string name="incall_content_description_merge_calls">Unisci chiamate</string>
+  <string name="incall_content_description_earpiece">Auricolare telefono</string>
+  <string name="incall_content_description_speaker">Altoparlante</string>
+  <string name="incall_content_description_bluetooth">Bluetooth</string>
+  <string name="incall_content_description_headset">Auricolare con cavo</string>
+  <string name="incall_content_description_hold">Metti in attesa la chiamata</string>
+  <string name="incall_content_description_unhold">Riprendi la chiamata</string>
+  <string name="incall_content_description_video_on">Video attivo</string>
+  <string name="incall_content_description_video_off">Video non attivo</string>
+  <string name="incall_content_description_swap_video">Scambia video</string>
+  <string name="incall_label_speaker">Altoparlante</string>
+  <string name="incall_label_audio">Suono</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-iw/strings.xml b/java/com/android/incallui/commontheme/res/values-iw/strings.xml
index cbd6d75..b18cba0 100644
--- a/java/com/android/incallui/commontheme/res/values-iw/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-iw/strings.xml
@@ -1,36 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_content_description_end_call" msgid="8232796487777787200">"סיים שיחה"</string>
-    <string name="incall_content_description_muted" msgid="2130133443150389474">"מושתקת"</string>
-    <string name="incall_content_description_unmuted" msgid="4023577547526525202">"ההשתקה בוטלה"</string>
-    <string name="incall_content_description_swap_calls" msgid="5233257839262161417">"החלף שיחות"</string>
-    <string name="incall_content_description_merge_calls" msgid="5198778837993669729">"מזג שיחות"</string>
-    <string name="incall_content_description_earpiece" msgid="2786221842272370555">"אוזניית דיבורית"</string>
-    <string name="incall_content_description_speaker" msgid="7837829930201265549">"רמקול"</string>
-    <string name="incall_content_description_bluetooth" msgid="6988919010980910001">"Bluetooth"</string>
-    <string name="incall_content_description_headset" msgid="3170439802944346719">"אוזניות עם חוט"</string>
-    <string name="incall_content_description_hold" msgid="3335508251734906019">"העברת השיחה להמתנה"</string>
-    <string name="incall_content_description_unhold" msgid="3862584118869933593">"המשך השיחה"</string>
-    <string name="incall_content_description_video_on" msgid="899266487647420613">"הווידאו מופעל"</string>
-    <string name="incall_content_description_video_off" msgid="762985912616707076">"הווידאו מושבת"</string>
-    <string name="incall_content_description_swap_video" msgid="297943299827908998">"החלף וידאו"</string>
-    <string name="incall_label_speaker" msgid="1814254833253409394">"רמקול"</string>
-    <string name="incall_label_audio" msgid="5923781170533336820">"קול"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_content_description_end_call">סיים שיחה</string>
+  <string name="incall_content_description_muted">מושתקת</string>
+  <string name="incall_content_description_unmuted">ההשתקה בוטלה</string>
+  <string name="incall_content_description_swap_calls">החלף שיחות</string>
+  <string name="incall_content_description_swap_sim">‏החלפת SIM</string>
+  <string name="incall_content_description_merge_calls">מזג שיחות</string>
+  <string name="incall_content_description_earpiece">אוזניית דיבורית</string>
+  <string name="incall_content_description_speaker">רמקול</string>
+  <string name="incall_content_description_bluetooth">Bluetooth</string>
+  <string name="incall_content_description_headset">אוזניות עם חוט</string>
+  <string name="incall_content_description_hold">העברת השיחה להמתנה</string>
+  <string name="incall_content_description_unhold">המשך השיחה</string>
+  <string name="incall_content_description_video_on">הווידאו מופעל</string>
+  <string name="incall_content_description_video_off">הווידאו מושבת</string>
+  <string name="incall_content_description_swap_video">החלף וידאו</string>
+  <string name="incall_label_speaker">רמקול</string>
+  <string name="incall_label_audio">קול</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-ja/strings.xml b/java/com/android/incallui/commontheme/res/values-ja/strings.xml
index 4ea9495..d2b548f 100644
--- a/java/com/android/incallui/commontheme/res/values-ja/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-ja/strings.xml
@@ -1,36 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_content_description_end_call" msgid="8232796487777787200">"通話を終了"</string>
-    <string name="incall_content_description_muted" msgid="2130133443150389474">"ミュートしました"</string>
-    <string name="incall_content_description_unmuted" msgid="4023577547526525202">"ミュートを解除しました"</string>
-    <string name="incall_content_description_swap_calls" msgid="5233257839262161417">"通話を切り替える"</string>
-    <string name="incall_content_description_merge_calls" msgid="5198778837993669729">"通話を統合"</string>
-    <string name="incall_content_description_earpiece" msgid="2786221842272370555">"端末の受話口"</string>
-    <string name="incall_content_description_speaker" msgid="7837829930201265549">"スピーカー"</string>
-    <string name="incall_content_description_bluetooth" msgid="6988919010980910001">"Bluetooth"</string>
-    <string name="incall_content_description_headset" msgid="3170439802944346719">"有線ヘッドセット"</string>
-    <string name="incall_content_description_hold" msgid="3335508251734906019">"通話を保留"</string>
-    <string name="incall_content_description_unhold" msgid="3862584118869933593">"通話を再開"</string>
-    <string name="incall_content_description_video_on" msgid="899266487647420613">"ビデオが ON になっています"</string>
-    <string name="incall_content_description_video_off" msgid="762985912616707076">"ビデオが OFF になっています"</string>
-    <string name="incall_content_description_swap_video" msgid="297943299827908998">"ビデオを切り替える"</string>
-    <string name="incall_label_speaker" msgid="1814254833253409394">"スピーカー"</string>
-    <string name="incall_label_audio" msgid="5923781170533336820">"音声"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_content_description_end_call">通話を終了</string>
+  <string name="incall_content_description_muted">ミュートしました</string>
+  <string name="incall_content_description_unmuted">ミュートを解除しました</string>
+  <string name="incall_content_description_swap_calls">通話を切り替える</string>
+  <string name="incall_content_description_swap_sim">SIM を変更</string>
+  <string name="incall_content_description_merge_calls">通話を統合</string>
+  <string name="incall_content_description_earpiece">端末の受話口</string>
+  <string name="incall_content_description_speaker">スピーカー</string>
+  <string name="incall_content_description_bluetooth">Bluetooth</string>
+  <string name="incall_content_description_headset">有線ヘッドセット</string>
+  <string name="incall_content_description_hold">通話を保留</string>
+  <string name="incall_content_description_unhold">通話を再開</string>
+  <string name="incall_content_description_video_on">ビデオが ON になっています</string>
+  <string name="incall_content_description_video_off">ビデオが OFF になっています</string>
+  <string name="incall_content_description_swap_video">ビデオを切り替える</string>
+  <string name="incall_label_speaker">スピーカー</string>
+  <string name="incall_label_audio">音声</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-ka/strings.xml b/java/com/android/incallui/commontheme/res/values-ka/strings.xml
index 3163476..4be15eb 100644
--- a/java/com/android/incallui/commontheme/res/values-ka/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-ka/strings.xml
@@ -1,36 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_content_description_end_call" msgid="8232796487777787200">"ზარის დასრულება"</string>
-    <string name="incall_content_description_muted" msgid="2130133443150389474">"დადუმებული"</string>
-    <string name="incall_content_description_unmuted" msgid="4023577547526525202">"დადუმება მოხსნილია"</string>
-    <string name="incall_content_description_swap_calls" msgid="5233257839262161417">"ზარების შენაცვლება"</string>
-    <string name="incall_content_description_merge_calls" msgid="5198778837993669729">"ზარების გაერთიანება"</string>
-    <string name="incall_content_description_earpiece" msgid="2786221842272370555">"ყურსაცვამის საყურისი"</string>
-    <string name="incall_content_description_speaker" msgid="7837829930201265549">"სპიკერი"</string>
-    <string name="incall_content_description_bluetooth" msgid="6988919010980910001">"Bluetooth"</string>
-    <string name="incall_content_description_headset" msgid="3170439802944346719">"კაბელიანი ყურსაცვამი"</string>
-    <string name="incall_content_description_hold" msgid="3335508251734906019">"ზარის დაკავება"</string>
-    <string name="incall_content_description_unhold" msgid="3862584118869933593">"ზარის განახლება"</string>
-    <string name="incall_content_description_video_on" msgid="899266487647420613">"ვიდეო ჩართულია"</string>
-    <string name="incall_content_description_video_off" msgid="762985912616707076">"ვიდეო გამორთულია"</string>
-    <string name="incall_content_description_swap_video" msgid="297943299827908998">"ვიდეოს შენაცვლება"</string>
-    <string name="incall_label_speaker" msgid="1814254833253409394">"სპიკერი"</string>
-    <string name="incall_label_audio" msgid="5923781170533336820">"ხმა"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_content_description_end_call">ზარის დასრულება</string>
+  <string name="incall_content_description_muted">დადუმებული</string>
+  <string name="incall_content_description_unmuted">დადუმება მოხსნილია</string>
+  <string name="incall_content_description_swap_calls">ზარების შენაცვლება</string>
+  <string name="incall_content_description_swap_sim">SIM-ის შეცვლა</string>
+  <string name="incall_content_description_merge_calls">ზარების გაერთიანება</string>
+  <string name="incall_content_description_earpiece">ყურსაცვამის საყურისი</string>
+  <string name="incall_content_description_speaker">სპიკერი</string>
+  <string name="incall_content_description_bluetooth">Bluetooth</string>
+  <string name="incall_content_description_headset">კაბელიანი ყურსაცვამი</string>
+  <string name="incall_content_description_hold">ზარის დაკავება</string>
+  <string name="incall_content_description_unhold">ზარის განახლება</string>
+  <string name="incall_content_description_video_on">ვიდეო ჩართულია</string>
+  <string name="incall_content_description_video_off">ვიდეო გამორთულია</string>
+  <string name="incall_content_description_swap_video">ვიდეოს შენაცვლება</string>
+  <string name="incall_label_speaker">სპიკერი</string>
+  <string name="incall_label_audio">ხმა</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-kk/strings.xml b/java/com/android/incallui/commontheme/res/values-kk/strings.xml
index 23b3a2a..efd2423 100644
--- a/java/com/android/incallui/commontheme/res/values-kk/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-kk/strings.xml
@@ -1,36 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_content_description_end_call" msgid="8232796487777787200">"Қоңырауды аяқтау"</string>
-    <string name="incall_content_description_muted" msgid="2130133443150389474">"Дыбысы өшірулі"</string>
-    <string name="incall_content_description_unmuted" msgid="4023577547526525202">"Дыбысы қосулы"</string>
-    <string name="incall_content_description_swap_calls" msgid="5233257839262161417">"Қоңырауларды ауыстыру"</string>
-    <string name="incall_content_description_merge_calls" msgid="5198778837993669729">"Қоңырауларды біріктіру"</string>
-    <string name="incall_content_description_earpiece" msgid="2786221842272370555">"Телефон динамигі"</string>
-    <string name="incall_content_description_speaker" msgid="7837829930201265549">"Динамик"</string>
-    <string name="incall_content_description_bluetooth" msgid="6988919010980910001">"Bluetooth"</string>
-    <string name="incall_content_description_headset" msgid="3170439802944346719">"Сымды гарнитура"</string>
-    <string name="incall_content_description_hold" msgid="3335508251734906019">"Күттіру"</string>
-    <string name="incall_content_description_unhold" msgid="3862584118869933593">"Қоңырауды жалғастыру"</string>
-    <string name="incall_content_description_video_on" msgid="899266487647420613">"Бейне қосулы"</string>
-    <string name="incall_content_description_video_off" msgid="762985912616707076">"Бейне өшірулі"</string>
-    <string name="incall_content_description_swap_video" msgid="297943299827908998">"Бейнені ауыстыру"</string>
-    <string name="incall_label_speaker" msgid="1814254833253409394">"Динамик"</string>
-    <string name="incall_label_audio" msgid="5923781170533336820">"Дыбыс"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_content_description_end_call">Қоңырауды аяқтау</string>
+  <string name="incall_content_description_muted">Дыбысы өшірулі</string>
+  <string name="incall_content_description_unmuted">Дыбысы қосулы</string>
+  <string name="incall_content_description_swap_calls">Қоңырауларды ауыстыру</string>
+  <string name="incall_content_description_swap_sim">SIM картасын ауыстыру</string>
+  <string name="incall_content_description_merge_calls">Қоңырауларды біріктіру</string>
+  <string name="incall_content_description_earpiece">Телефон динамигі</string>
+  <string name="incall_content_description_speaker">Динамик</string>
+  <string name="incall_content_description_bluetooth">Bluetooth</string>
+  <string name="incall_content_description_headset">Сымды гарнитура</string>
+  <string name="incall_content_description_hold">Күттіру</string>
+  <string name="incall_content_description_unhold">Қоңырауды жалғастыру</string>
+  <string name="incall_content_description_video_on">Бейне қосулы</string>
+  <string name="incall_content_description_video_off">Бейне өшірулі</string>
+  <string name="incall_content_description_swap_video">Бейнені ауыстыру</string>
+  <string name="incall_label_speaker">Динамик</string>
+  <string name="incall_label_audio">Дыбыс</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-km/strings.xml b/java/com/android/incallui/commontheme/res/values-km/strings.xml
index 55cfa0a..f2d27df 100644
--- a/java/com/android/incallui/commontheme/res/values-km/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-km/strings.xml
@@ -1,36 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_content_description_end_call" msgid="8232796487777787200">"បញ្ចប់​ការ​ហៅ"</string>
-    <string name="incall_content_description_muted" msgid="2130133443150389474">"បានបិទសំឡេង"</string>
-    <string name="incall_content_description_unmuted" msgid="4023577547526525202">"បានបើកសំឡេង"</string>
-    <string name="incall_content_description_swap_calls" msgid="5233257839262161417">"ប្ដូរ​ការ​ហៅ"</string>
-    <string name="incall_content_description_merge_calls" msgid="5198778837993669729">"បញ្ចូល​ការ​ហៅ​រួម​​គ្នា"</string>
-    <string name="incall_content_description_earpiece" msgid="2786221842272370555">"កាសស្ដាប់សំឡេង"</string>
-    <string name="incall_content_description_speaker" msgid="7837829930201265549">"ឧបករណ៍​បំពង​សំឡេង"</string>
-    <string name="incall_content_description_bluetooth" msgid="6988919010980910001">"ប៊្លូធូស"</string>
-    <string name="incall_content_description_headset" msgid="3170439802944346719">"កាស​មាន​ខ្សែ"</string>
-    <string name="incall_content_description_hold" msgid="3335508251734906019">"ដាក់​ការ​ហៅ​ឲ្យ​រង់ចាំ"</string>
-    <string name="incall_content_description_unhold" msgid="3862584118869933593">"បន្ត​ការហៅ"</string>
-    <string name="incall_content_description_video_on" msgid="899266487647420613">"បើក​វីដេអូ​"</string>
-    <string name="incall_content_description_video_off" msgid="762985912616707076">"បិទ​វីដេអូ"</string>
-    <string name="incall_content_description_swap_video" msgid="297943299827908998">"ប្ដូរ​វីដេអូ"</string>
-    <string name="incall_label_speaker" msgid="1814254833253409394">"ឧបករណ៍​បំពង​សំឡេង"</string>
-    <string name="incall_label_audio" msgid="5923781170533336820">"សំឡេង"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_content_description_end_call">បញ្ចប់​ការ​ហៅ</string>
+  <string name="incall_content_description_muted">បានបិទសំឡេង</string>
+  <string name="incall_content_description_unmuted">បានបើកសំឡេង</string>
+  <string name="incall_content_description_swap_calls">ប្ដូរ​ការ​ហៅ</string>
+  <string name="incall_content_description_swap_sim">ប្ដូរ SIM</string>
+  <string name="incall_content_description_merge_calls">បញ្ចូល​ការ​ហៅ​រួម​​គ្នា</string>
+  <string name="incall_content_description_earpiece">កាសស្ដាប់សំឡេង</string>
+  <string name="incall_content_description_speaker">ឧបករណ៍​បំពង​សំឡេង</string>
+  <string name="incall_content_description_bluetooth">ប៊្លូធូស</string>
+  <string name="incall_content_description_headset">កាស​មាន​ខ្សែ</string>
+  <string name="incall_content_description_hold">ដាក់​ការ​ហៅ​ឲ្យ​រង់ចាំ</string>
+  <string name="incall_content_description_unhold">បន្ត​ការហៅ</string>
+  <string name="incall_content_description_video_on">បើក​វីដេអូ​</string>
+  <string name="incall_content_description_video_off">បិទ​វីដេអូ</string>
+  <string name="incall_content_description_swap_video">ប្ដូរ​វីដេអូ</string>
+  <string name="incall_label_speaker">ឧបករណ៍​បំពង​សំឡេង</string>
+  <string name="incall_label_audio">សំឡេង</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-kn/strings.xml b/java/com/android/incallui/commontheme/res/values-kn/strings.xml
index 685ef64..2b8829c 100644
--- a/java/com/android/incallui/commontheme/res/values-kn/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-kn/strings.xml
@@ -1,36 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_content_description_end_call" msgid="8232796487777787200">"ಕರೆ ಅಂತ್ಯಗೊಳಿಸಿ"</string>
-    <string name="incall_content_description_muted" msgid="2130133443150389474">"ಮ್ಯೂಟ್‌ ಮಾಡಲಾಗಿದೆ"</string>
-    <string name="incall_content_description_unmuted" msgid="4023577547526525202">"ಅನ್‌ಮ್ಯೂಟ್ ಮಾಡಲಾಗಿದೆ"</string>
-    <string name="incall_content_description_swap_calls" msgid="5233257839262161417">"ಕರೆಗಳನ್ನು ಬದಲಾಯಿಸಿ"</string>
-    <string name="incall_content_description_merge_calls" msgid="5198778837993669729">"ಕರೆಗಳನ್ನು ವಿಲೀನಗೊಳಿಸು"</string>
-    <string name="incall_content_description_earpiece" msgid="2786221842272370555">"ಹ್ಯಾಂಡ್‌ಸೆಟ್ ಇಯರ್‌ಪೀಸ್"</string>
-    <string name="incall_content_description_speaker" msgid="7837829930201265549">"ಸ್ಪೀಕರ್‌"</string>
-    <string name="incall_content_description_bluetooth" msgid="6988919010980910001">"ಬ್ಲೂಟೂತ್‌"</string>
-    <string name="incall_content_description_headset" msgid="3170439802944346719">"ವೈರ್ಡ್ ಹೆಡ್‌ಸೆಟ್‌"</string>
-    <string name="incall_content_description_hold" msgid="3335508251734906019">"ಕರೆಯನ್ನು ಹೋಲ್ಡ್‌‌ ಮಾಡು"</string>
-    <string name="incall_content_description_unhold" msgid="3862584118869933593">"ಕರೆಯನ್ನು ಮುಂದುವರಿಸು"</string>
-    <string name="incall_content_description_video_on" msgid="899266487647420613">"ವೀಡಿಯೊ ಆನ್"</string>
-    <string name="incall_content_description_video_off" msgid="762985912616707076">"ವೀಡಿಯೊ ಆಫ್"</string>
-    <string name="incall_content_description_swap_video" msgid="297943299827908998">"ವೀಡಿಯೊ ಬದಲಾಯಿಸಿ"</string>
-    <string name="incall_label_speaker" msgid="1814254833253409394">"ಸ್ಪೀಕರ್‌"</string>
-    <string name="incall_label_audio" msgid="5923781170533336820">"ಶಬ್ದ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_content_description_end_call">ಕರೆ ಅಂತ್ಯಗೊಳಿಸಿ</string>
+  <string name="incall_content_description_muted">ಮ್ಯೂಟ್‌ ಮಾಡಲಾಗಿದೆ</string>
+  <string name="incall_content_description_unmuted">ಅನ್‌ಮ್ಯೂಟ್ ಮಾಡಲಾಗಿದೆ</string>
+  <string name="incall_content_description_swap_calls">ಕರೆಗಳನ್ನು ಬದಲಾಯಿಸಿ</string>
+  <string name="incall_content_description_swap_sim">ಸಿಮ್ ಬದಲಾಯಿಸಿ</string>
+  <string name="incall_content_description_merge_calls">ಕರೆಗಳನ್ನು ವಿಲೀನಗೊಳಿಸು</string>
+  <string name="incall_content_description_earpiece">ಹ್ಯಾಂಡ್‌ಸೆಟ್ ಇಯರ್‌ಪೀಸ್</string>
+  <string name="incall_content_description_speaker">ಸ್ಪೀಕರ್‌</string>
+  <string name="incall_content_description_bluetooth">ಬ್ಲೂಟೂತ್‌</string>
+  <string name="incall_content_description_headset">ವೈರ್ಡ್ ಹೆಡ್‌ಸೆಟ್‌</string>
+  <string name="incall_content_description_hold">ಕರೆಯನ್ನು ಹೋಲ್ಡ್‌‌ ಮಾಡು</string>
+  <string name="incall_content_description_unhold">ಕರೆಯನ್ನು ಮುಂದುವರಿಸು</string>
+  <string name="incall_content_description_video_on">ವೀಡಿಯೊ ಆನ್</string>
+  <string name="incall_content_description_video_off">ವೀಡಿಯೊ ಆಫ್</string>
+  <string name="incall_content_description_swap_video">ವೀಡಿಯೊ ಬದಲಾಯಿಸಿ</string>
+  <string name="incall_label_speaker">ಸ್ಪೀಕರ್‌</string>
+  <string name="incall_label_audio">ಶಬ್ದ</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-ko/strings.xml b/java/com/android/incallui/commontheme/res/values-ko/strings.xml
index 088746d..2cc08c1 100644
--- a/java/com/android/incallui/commontheme/res/values-ko/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-ko/strings.xml
@@ -1,36 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_content_description_end_call" msgid="8232796487777787200">"통화 종료"</string>
-    <string name="incall_content_description_muted" msgid="2130133443150389474">"음소거됨"</string>
-    <string name="incall_content_description_unmuted" msgid="4023577547526525202">"음소거 해제됨"</string>
-    <string name="incall_content_description_swap_calls" msgid="5233257839262161417">"통화 전환"</string>
-    <string name="incall_content_description_merge_calls" msgid="5198778837993669729">"통화 병합"</string>
-    <string name="incall_content_description_earpiece" msgid="2786221842272370555">"핸드셋 수화부"</string>
-    <string name="incall_content_description_speaker" msgid="7837829930201265549">"스피커"</string>
-    <string name="incall_content_description_bluetooth" msgid="6988919010980910001">"블루투스"</string>
-    <string name="incall_content_description_headset" msgid="3170439802944346719">"유선 헤드셋"</string>
-    <string name="incall_content_description_hold" msgid="3335508251734906019">"통화 대기"</string>
-    <string name="incall_content_description_unhold" msgid="3862584118869933593">"통화 재개"</string>
-    <string name="incall_content_description_video_on" msgid="899266487647420613">"동영상 켜짐"</string>
-    <string name="incall_content_description_video_off" msgid="762985912616707076">"동영상 꺼짐"</string>
-    <string name="incall_content_description_swap_video" msgid="297943299827908998">"동영상 전환"</string>
-    <string name="incall_label_speaker" msgid="1814254833253409394">"스피커"</string>
-    <string name="incall_label_audio" msgid="5923781170533336820">"소리"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_content_description_end_call">통화 종료</string>
+  <string name="incall_content_description_muted">음소거됨</string>
+  <string name="incall_content_description_unmuted">음소거 해제됨</string>
+  <string name="incall_content_description_swap_calls">통화 전환</string>
+  <string name="incall_content_description_swap_sim">SIM 변경</string>
+  <string name="incall_content_description_merge_calls">통화 병합</string>
+  <string name="incall_content_description_earpiece">핸드셋 수화부</string>
+  <string name="incall_content_description_speaker">스피커</string>
+  <string name="incall_content_description_bluetooth">블루투스</string>
+  <string name="incall_content_description_headset">유선 헤드셋</string>
+  <string name="incall_content_description_hold">통화 대기</string>
+  <string name="incall_content_description_unhold">통화 재개</string>
+  <string name="incall_content_description_video_on">동영상 켜짐</string>
+  <string name="incall_content_description_video_off">동영상 꺼짐</string>
+  <string name="incall_content_description_swap_video">동영상 전환</string>
+  <string name="incall_label_speaker">스피커</string>
+  <string name="incall_label_audio">소리</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-ky/strings.xml b/java/com/android/incallui/commontheme/res/values-ky/strings.xml
index 5dd4d0c..db56525 100644
--- a/java/com/android/incallui/commontheme/res/values-ky/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-ky/strings.xml
@@ -1,36 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_content_description_end_call" msgid="8232796487777787200">"Чалууну бүтүрүү"</string>
-    <string name="incall_content_description_muted" msgid="2130133443150389474">"Үнү өчүрүлдү"</string>
-    <string name="incall_content_description_unmuted" msgid="4023577547526525202">"Үнү күйгүзүлдү"</string>
-    <string name="incall_content_description_swap_calls" msgid="5233257839262161417">"Башка чалууга которулуу"</string>
-    <string name="incall_content_description_merge_calls" msgid="5198778837993669729">"Чалууларды бириктирүү"</string>
-    <string name="incall_content_description_earpiece" msgid="2786221842272370555">"Гарнитура"</string>
-    <string name="incall_content_description_speaker" msgid="7837829930201265549">"Катуу сүйлөткүч"</string>
-    <string name="incall_content_description_bluetooth" msgid="6988919010980910001">"Bluetooth"</string>
-    <string name="incall_content_description_headset" msgid="3170439802944346719">"Зымдуу гарнитура"</string>
-    <string name="incall_content_description_hold" msgid="3335508251734906019">"Чалууну кармап туруу"</string>
-    <string name="incall_content_description_unhold" msgid="3862584118869933593">"Чалууну улантуу"</string>
-    <string name="incall_content_description_video_on" msgid="899266487647420613">"Видео күйүк"</string>
-    <string name="incall_content_description_video_off" msgid="762985912616707076">"Видео өчүк"</string>
-    <string name="incall_content_description_swap_video" msgid="297943299827908998">"Видеону иштетүү/өчүрүү"</string>
-    <string name="incall_label_speaker" msgid="1814254833253409394">"Катуу сүйлөткүч"</string>
-    <string name="incall_label_audio" msgid="5923781170533336820">"Добуш"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_content_description_end_call">Чалууну бүтүрүү</string>
+  <string name="incall_content_description_muted">Үнү өчүрүлдү</string>
+  <string name="incall_content_description_unmuted">Үнү күйгүзүлдү</string>
+  <string name="incall_content_description_swap_calls">Башка чалууга которулуу</string>
+  <string name="incall_content_description_swap_sim">SIM-картаны өзгөртүү</string>
+  <string name="incall_content_description_merge_calls">Чалууларды бириктирүү</string>
+  <string name="incall_content_description_earpiece">Гарнитура</string>
+  <string name="incall_content_description_speaker">Катуу сүйлөткүч</string>
+  <string name="incall_content_description_bluetooth">Bluetooth</string>
+  <string name="incall_content_description_headset">Зымдуу гарнитура</string>
+  <string name="incall_content_description_hold">Чалууну кармап туруу</string>
+  <string name="incall_content_description_unhold">Чалууну улантуу</string>
+  <string name="incall_content_description_video_on">Видео күйүк</string>
+  <string name="incall_content_description_video_off">Видео өчүк</string>
+  <string name="incall_content_description_swap_video">Видеону иштетүү/өчүрүү</string>
+  <string name="incall_label_speaker">Катуу сүйлөткүч</string>
+  <string name="incall_label_audio">Добуш</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-lo/strings.xml b/java/com/android/incallui/commontheme/res/values-lo/strings.xml
index 2f0b94b..1b41dbd 100644
--- a/java/com/android/incallui/commontheme/res/values-lo/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-lo/strings.xml
@@ -1,36 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_content_description_end_call" msgid="8232796487777787200">"ວາງສາຍ"</string>
-    <string name="incall_content_description_muted" msgid="2130133443150389474">"ປິດສຽງແລ້ວ"</string>
-    <string name="incall_content_description_unmuted" msgid="4023577547526525202">"ເປີດສຽງແລ້ວ"</string>
-    <string name="incall_content_description_swap_calls" msgid="5233257839262161417">"ສະຫຼັບສາຍ"</string>
-    <string name="incall_content_description_merge_calls" msgid="5198778837993669729">"ຮວມສາຍ"</string>
-    <string name="incall_content_description_earpiece" msgid="2786221842272370555">"ຊຸດຫູຟັງ"</string>
-    <string name="incall_content_description_speaker" msgid="7837829930201265549">"ລຳໂພງ"</string>
-    <string name="incall_content_description_bluetooth" msgid="6988919010980910001">"Bluetooth"</string>
-    <string name="incall_content_description_headset" msgid="3170439802944346719">"ຊຸດຫູຟັງແບບມີສາຍ"</string>
-    <string name="incall_content_description_hold" msgid="3335508251734906019">"ພັກສາຍ"</string>
-    <string name="incall_content_description_unhold" msgid="3862584118869933593">"ສືບຕໍ່ສາຍ"</string>
-    <string name="incall_content_description_video_on" msgid="899266487647420613">"ວິດີໂອເປີດ"</string>
-    <string name="incall_content_description_video_off" msgid="762985912616707076">"ວິດີໂອປິດ"</string>
-    <string name="incall_content_description_swap_video" msgid="297943299827908998">"ສະຫຼັບວິດີໂອ"</string>
-    <string name="incall_label_speaker" msgid="1814254833253409394">"ລຳໂພງ"</string>
-    <string name="incall_label_audio" msgid="5923781170533336820">"ສຽງ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_content_description_end_call">ວາງສາຍ</string>
+  <string name="incall_content_description_muted">ປິດສຽງແລ້ວ</string>
+  <string name="incall_content_description_unmuted">ເປີດສຽງແລ້ວ</string>
+  <string name="incall_content_description_swap_calls">ສະຫຼັບສາຍ</string>
+  <string name="incall_content_description_swap_sim">ປ່ຽນຊິມ</string>
+  <string name="incall_content_description_merge_calls">ຮວມສາຍ</string>
+  <string name="incall_content_description_earpiece">ຊຸດຫູຟັງ</string>
+  <string name="incall_content_description_speaker">ລຳໂພງ</string>
+  <string name="incall_content_description_bluetooth">Bluetooth</string>
+  <string name="incall_content_description_headset">ຊຸດຫູຟັງແບບມີສາຍ</string>
+  <string name="incall_content_description_hold">ພັກສາຍ</string>
+  <string name="incall_content_description_unhold">ສືບຕໍ່ສາຍ</string>
+  <string name="incall_content_description_video_on">ວິດີໂອເປີດ</string>
+  <string name="incall_content_description_video_off">ວິດີໂອປິດ</string>
+  <string name="incall_content_description_swap_video">ສະຫຼັບວິດີໂອ</string>
+  <string name="incall_label_speaker">ລຳໂພງ</string>
+  <string name="incall_label_audio">ສຽງ</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-lt/strings.xml b/java/com/android/incallui/commontheme/res/values-lt/strings.xml
index d0a5e0d..7bd6862 100644
--- a/java/com/android/incallui/commontheme/res/values-lt/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-lt/strings.xml
@@ -1,36 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_content_description_end_call" msgid="8232796487777787200">"Baigti skambutį"</string>
-    <string name="incall_content_description_muted" msgid="2130133443150389474">"Nutildyta"</string>
-    <string name="incall_content_description_unmuted" msgid="4023577547526525202">"Garsas įjungtas"</string>
-    <string name="incall_content_description_swap_calls" msgid="5233257839262161417">"Sukeisti skambučius"</string>
-    <string name="incall_content_description_merge_calls" msgid="5198778837993669729">"Sujungti skambučius"</string>
-    <string name="incall_content_description_earpiece" msgid="2786221842272370555">"Telefono garsiakalbis prie ausies"</string>
-    <string name="incall_content_description_speaker" msgid="7837829930201265549">"Garsiakalbis"</string>
-    <string name="incall_content_description_bluetooth" msgid="6988919010980910001">"Bluetooth"</string>
-    <string name="incall_content_description_headset" msgid="3170439802944346719">"Laidinės ausinės"</string>
-    <string name="incall_content_description_hold" msgid="3335508251734906019">"Sulaikyti skambutį"</string>
-    <string name="incall_content_description_unhold" msgid="3862584118869933593">"Tęsti skambutį"</string>
-    <string name="incall_content_description_video_on" msgid="899266487647420613">"Vaizdas įjungtas"</string>
-    <string name="incall_content_description_video_off" msgid="762985912616707076">"Vaizdas išjungtas"</string>
-    <string name="incall_content_description_swap_video" msgid="297943299827908998">"Sukeisti vaizdą"</string>
-    <string name="incall_label_speaker" msgid="1814254833253409394">"Garsiakalbis"</string>
-    <string name="incall_label_audio" msgid="5923781170533336820">"Garsas"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_content_description_end_call">Baigti skambutį</string>
+  <string name="incall_content_description_muted">Nutildyta</string>
+  <string name="incall_content_description_unmuted">Garsas įjungtas</string>
+  <string name="incall_content_description_swap_calls">Sukeisti skambučius</string>
+  <string name="incall_content_description_swap_sim">Pakeisti SIM kortelę</string>
+  <string name="incall_content_description_merge_calls">Sujungti skambučius</string>
+  <string name="incall_content_description_earpiece">Telefono garsiakalbis prie ausies</string>
+  <string name="incall_content_description_speaker">Garsiakalbis</string>
+  <string name="incall_content_description_bluetooth">Bluetooth</string>
+  <string name="incall_content_description_headset">Laidinės ausinės</string>
+  <string name="incall_content_description_hold">Sulaikyti skambutį</string>
+  <string name="incall_content_description_unhold">Tęsti skambutį</string>
+  <string name="incall_content_description_video_on">Vaizdas įjungtas</string>
+  <string name="incall_content_description_video_off">Vaizdas išjungtas</string>
+  <string name="incall_content_description_swap_video">Sukeisti vaizdą</string>
+  <string name="incall_label_speaker">Garsiakalbis</string>
+  <string name="incall_label_audio">Garsas</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-lv/strings.xml b/java/com/android/incallui/commontheme/res/values-lv/strings.xml
index 443ac5e..56fd270 100644
--- a/java/com/android/incallui/commontheme/res/values-lv/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-lv/strings.xml
@@ -1,36 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_content_description_end_call" msgid="8232796487777787200">"Beigt zvanu"</string>
-    <string name="incall_content_description_muted" msgid="2130133443150389474">"Izslēgta skaņa"</string>
-    <string name="incall_content_description_unmuted" msgid="4023577547526525202">"Ieslēgta skaņa"</string>
-    <string name="incall_content_description_swap_calls" msgid="5233257839262161417">"Mainīt zvanus"</string>
-    <string name="incall_content_description_merge_calls" msgid="5198778837993669729">"Apvienot zvanus"</string>
-    <string name="incall_content_description_earpiece" msgid="2786221842272370555">"Austiņas"</string>
-    <string name="incall_content_description_speaker" msgid="7837829930201265549">"Skaļrunis"</string>
-    <string name="incall_content_description_bluetooth" msgid="6988919010980910001">"Bluetooth"</string>
-    <string name="incall_content_description_headset" msgid="3170439802944346719">"Austiņas ar vadu"</string>
-    <string name="incall_content_description_hold" msgid="3335508251734906019">"Aizturēt zvanu"</string>
-    <string name="incall_content_description_unhold" msgid="3862584118869933593">"Atsākt zvanu"</string>
-    <string name="incall_content_description_video_on" msgid="899266487647420613">"Video ieslēgts"</string>
-    <string name="incall_content_description_video_off" msgid="762985912616707076">"Video izslēgts"</string>
-    <string name="incall_content_description_swap_video" msgid="297943299827908998">"Mainīt video"</string>
-    <string name="incall_label_speaker" msgid="1814254833253409394">"Skaļrunis"</string>
-    <string name="incall_label_audio" msgid="5923781170533336820">"Skaņa"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_content_description_end_call">Beigt zvanu</string>
+  <string name="incall_content_description_muted">Izslēgta skaņa</string>
+  <string name="incall_content_description_unmuted">Ieslēgta skaņa</string>
+  <string name="incall_content_description_swap_calls">Mainīt zvanus</string>
+  <string name="incall_content_description_swap_sim">Mainīt SIM karti</string>
+  <string name="incall_content_description_merge_calls">Apvienot zvanus</string>
+  <string name="incall_content_description_earpiece">Austiņas</string>
+  <string name="incall_content_description_speaker">Skaļrunis</string>
+  <string name="incall_content_description_bluetooth">Bluetooth</string>
+  <string name="incall_content_description_headset">Austiņas ar vadu</string>
+  <string name="incall_content_description_hold">Aizturēt zvanu</string>
+  <string name="incall_content_description_unhold">Atsākt zvanu</string>
+  <string name="incall_content_description_video_on">Video ieslēgts</string>
+  <string name="incall_content_description_video_off">Video izslēgts</string>
+  <string name="incall_content_description_swap_video">Mainīt video</string>
+  <string name="incall_label_speaker">Skaļrunis</string>
+  <string name="incall_label_audio">Skaņa</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-mk/strings.xml b/java/com/android/incallui/commontheme/res/values-mk/strings.xml
index d9a339e..04f528d 100644
--- a/java/com/android/incallui/commontheme/res/values-mk/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-mk/strings.xml
@@ -1,36 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_content_description_end_call" msgid="8232796487777787200">"Завршете го повикот"</string>
-    <string name="incall_content_description_muted" msgid="2130133443150389474">"Звукот е исклучен"</string>
-    <string name="incall_content_description_unmuted" msgid="4023577547526525202">"Звукот е вклучен"</string>
-    <string name="incall_content_description_swap_calls" msgid="5233257839262161417">"Заменете повици"</string>
-    <string name="incall_content_description_merge_calls" msgid="5198778837993669729">"Спојте повици"</string>
-    <string name="incall_content_description_earpiece" msgid="2786221842272370555">"Слушалка"</string>
-    <string name="incall_content_description_speaker" msgid="7837829930201265549">"Звучник"</string>
-    <string name="incall_content_description_bluetooth" msgid="6988919010980910001">"Bluetooth"</string>
-    <string name="incall_content_description_headset" msgid="3170439802944346719">"Жичени слушалки"</string>
-    <string name="incall_content_description_hold" msgid="3335508251734906019">"Стави на чекање"</string>
-    <string name="incall_content_description_unhold" msgid="3862584118869933593">"Продолжи го повикот"</string>
-    <string name="incall_content_description_video_on" msgid="899266487647420613">"Видеото е вклучено"</string>
-    <string name="incall_content_description_video_off" msgid="762985912616707076">"Видеото е исклучено"</string>
-    <string name="incall_content_description_swap_video" msgid="297943299827908998">"Заменете го видеото"</string>
-    <string name="incall_label_speaker" msgid="1814254833253409394">"Звучник"</string>
-    <string name="incall_label_audio" msgid="5923781170533336820">"Звук"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_content_description_end_call">Завршете го повикот</string>
+  <string name="incall_content_description_muted">Звукот е исклучен</string>
+  <string name="incall_content_description_unmuted">Звукот е вклучен</string>
+  <string name="incall_content_description_swap_calls">Заменете повици</string>
+  <string name="incall_content_description_swap_sim">Променете SIM</string>
+  <string name="incall_content_description_merge_calls">Спојте повици</string>
+  <string name="incall_content_description_earpiece">Слушалка</string>
+  <string name="incall_content_description_speaker">Звучник</string>
+  <string name="incall_content_description_bluetooth">Bluetooth</string>
+  <string name="incall_content_description_headset">Жичени слушалки</string>
+  <string name="incall_content_description_hold">Стави на чекање</string>
+  <string name="incall_content_description_unhold">Продолжи го повикот</string>
+  <string name="incall_content_description_video_on">Видеото е вклучено</string>
+  <string name="incall_content_description_video_off">Видеото е исклучено</string>
+  <string name="incall_content_description_swap_video">Заменете го видеото</string>
+  <string name="incall_label_speaker">Звучник</string>
+  <string name="incall_label_audio">Звук</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-ml/strings.xml b/java/com/android/incallui/commontheme/res/values-ml/strings.xml
index 0f2d889..11dac6b 100644
--- a/java/com/android/incallui/commontheme/res/values-ml/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-ml/strings.xml
@@ -1,36 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_content_description_end_call" msgid="8232796487777787200">"കോള്‍ അവസാനിപ്പിക്കൂ"</string>
-    <string name="incall_content_description_muted" msgid="2130133443150389474">"മ്യൂട്ടുചെയ്‌തു"</string>
-    <string name="incall_content_description_unmuted" msgid="4023577547526525202">"അൺമ്യൂട്ടുചെയ്‌തു"</string>
-    <string name="incall_content_description_swap_calls" msgid="5233257839262161417">"കോളുകൾ സ്വാപ്പുചെയ്യുക"</string>
-    <string name="incall_content_description_merge_calls" msgid="5198778837993669729">"കോളുകൾ ലയിപ്പിക്കുക"</string>
-    <string name="incall_content_description_earpiece" msgid="2786221842272370555">"ഹാൻഡ്‌സെറ്റ് ഇയർപീസ്"</string>
-    <string name="incall_content_description_speaker" msgid="7837829930201265549">"സ്പീക്കർ"</string>
-    <string name="incall_content_description_bluetooth" msgid="6988919010980910001">"ബ്ലൂടൂത്ത്"</string>
-    <string name="incall_content_description_headset" msgid="3170439802944346719">"വയർ മുഖേന ബന്ധിപ്പിച്ച ഹെഡ്‌സെറ്റ്"</string>
-    <string name="incall_content_description_hold" msgid="3335508251734906019">"കോൾ ഹോൾഡുചെയ്യുക"</string>
-    <string name="incall_content_description_unhold" msgid="3862584118869933593">"കോൾ പുനരാരംഭിക്കുക"</string>
-    <string name="incall_content_description_video_on" msgid="899266487647420613">"വീഡിയോ ഓണാണ്"</string>
-    <string name="incall_content_description_video_off" msgid="762985912616707076">"വീഡിയോ ഓഫാണ്"</string>
-    <string name="incall_content_description_swap_video" msgid="297943299827908998">"വീഡിയോ സ്വാപ്പുചെയ്യുക"</string>
-    <string name="incall_label_speaker" msgid="1814254833253409394">"സ്പീക്കർ"</string>
-    <string name="incall_label_audio" msgid="5923781170533336820">"ശബ്‌ദം"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_content_description_end_call">കോള്‍ അവസാനിപ്പിക്കൂ</string>
+  <string name="incall_content_description_muted">മ്യൂട്ടുചെയ്‌തു</string>
+  <string name="incall_content_description_unmuted">അൺമ്യൂട്ടുചെയ്‌തു</string>
+  <string name="incall_content_description_swap_calls">കോളുകൾ സ്വാപ്പുചെയ്യുക</string>
+  <string name="incall_content_description_swap_sim">സിം മാറ്റുക</string>
+  <string name="incall_content_description_merge_calls">കോളുകൾ ലയിപ്പിക്കുക</string>
+  <string name="incall_content_description_earpiece">ഹാൻഡ്‌സെറ്റ് ഇയർപീസ്</string>
+  <string name="incall_content_description_speaker">സ്പീക്കർ</string>
+  <string name="incall_content_description_bluetooth">ബ്ലൂടൂത്ത്</string>
+  <string name="incall_content_description_headset">വയർ മുഖേന ബന്ധിപ്പിച്ച ഹെഡ്‌സെറ്റ്</string>
+  <string name="incall_content_description_hold">കോൾ ഹോൾഡുചെയ്യുക</string>
+  <string name="incall_content_description_unhold">കോൾ പുനരാരംഭിക്കുക</string>
+  <string name="incall_content_description_video_on">വീഡിയോ ഓണാണ്</string>
+  <string name="incall_content_description_video_off">വീഡിയോ ഓഫാണ്</string>
+  <string name="incall_content_description_swap_video">വീഡിയോ സ്വാപ്പുചെയ്യുക</string>
+  <string name="incall_label_speaker">സ്പീക്കർ</string>
+  <string name="incall_label_audio">ശബ്‌ദം</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-mn/strings.xml b/java/com/android/incallui/commontheme/res/values-mn/strings.xml
index 3665fcf..1378fa2 100644
--- a/java/com/android/incallui/commontheme/res/values-mn/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-mn/strings.xml
@@ -1,36 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_content_description_end_call" msgid="8232796487777787200">"Дуудлагыг таслах"</string>
-    <string name="incall_content_description_muted" msgid="2130133443150389474">"Дууг хаасан"</string>
-    <string name="incall_content_description_unmuted" msgid="4023577547526525202">"Дууг нээсэн"</string>
-    <string name="incall_content_description_swap_calls" msgid="5233257839262161417">"Дуудлага солих"</string>
-    <string name="incall_content_description_merge_calls" msgid="5198778837993669729">"Дуудлагуудыг нэгтгэх"</string>
-    <string name="incall_content_description_earpiece" msgid="2786221842272370555">"Утасны чихэвч"</string>
-    <string name="incall_content_description_speaker" msgid="7837829930201265549">"Чанга яригч"</string>
-    <string name="incall_content_description_bluetooth" msgid="6988919010980910001">"Bluetooth"</string>
-    <string name="incall_content_description_headset" msgid="3170439802944346719">"Утастай чихэвч"</string>
-    <string name="incall_content_description_hold" msgid="3335508251734906019">"Дуудлагыг хүлээлгэх"</string>
-    <string name="incall_content_description_unhold" msgid="3862584118869933593">"Дуудлагыг үргэлжлүүлэх"</string>
-    <string name="incall_content_description_video_on" msgid="899266487647420613">"Видео идэвхтэй"</string>
-    <string name="incall_content_description_video_off" msgid="762985912616707076">"Видео идэвхгүй"</string>
-    <string name="incall_content_description_swap_video" msgid="297943299827908998">"Видеог солих"</string>
-    <string name="incall_label_speaker" msgid="1814254833253409394">"Чанга яригч"</string>
-    <string name="incall_label_audio" msgid="5923781170533336820">"Дуу"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_content_description_end_call">Дуудлагыг таслах</string>
+  <string name="incall_content_description_muted">Дууг хаасан</string>
+  <string name="incall_content_description_unmuted">Дууг нээсэн</string>
+  <string name="incall_content_description_swap_calls">Дуудлага солих</string>
+  <string name="incall_content_description_swap_sim">SIM өөрчлөх</string>
+  <string name="incall_content_description_merge_calls">Дуудлагуудыг нэгтгэх</string>
+  <string name="incall_content_description_earpiece">Утасны чихэвч</string>
+  <string name="incall_content_description_speaker">Чанга яригч</string>
+  <string name="incall_content_description_bluetooth">Bluetooth</string>
+  <string name="incall_content_description_headset">Утастай чихэвч</string>
+  <string name="incall_content_description_hold">Дуудлагыг хүлээлгэх</string>
+  <string name="incall_content_description_unhold">Дуудлагыг үргэлжлүүлэх</string>
+  <string name="incall_content_description_video_on">Видео идэвхтэй</string>
+  <string name="incall_content_description_video_off">Видео идэвхгүй</string>
+  <string name="incall_content_description_swap_video">Видеог солих</string>
+  <string name="incall_label_speaker">Чанга яригч</string>
+  <string name="incall_label_audio">Дуу</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-mr/strings.xml b/java/com/android/incallui/commontheme/res/values-mr/strings.xml
index f749809..abfe102 100644
--- a/java/com/android/incallui/commontheme/res/values-mr/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-mr/strings.xml
@@ -1,36 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_content_description_end_call" msgid="8232796487777787200">"कॉल समाप्त करा"</string>
-    <string name="incall_content_description_muted" msgid="2130133443150389474">"नि:शब्द केले"</string>
-    <string name="incall_content_description_unmuted" msgid="4023577547526525202">"सशब्द केले"</string>
-    <string name="incall_content_description_swap_calls" msgid="5233257839262161417">"कॉल स्‍वॅप करा"</string>
-    <string name="incall_content_description_merge_calls" msgid="5198778837993669729">"कॉल विलीन करा"</string>
-    <string name="incall_content_description_earpiece" msgid="2786221842272370555">"हँडसेट इअरपीस"</string>
-    <string name="incall_content_description_speaker" msgid="7837829930201265549">"स्पीकर"</string>
-    <string name="incall_content_description_bluetooth" msgid="6988919010980910001">"ब्लूटुथ"</string>
-    <string name="incall_content_description_headset" msgid="3170439802944346719">"वायर्ड हेडसेट"</string>
-    <string name="incall_content_description_hold" msgid="3335508251734906019">"कॉल होल्‍ड करा"</string>
-    <string name="incall_content_description_unhold" msgid="3862584118869933593">"कॉल सुरु करा"</string>
-    <string name="incall_content_description_video_on" msgid="899266487647420613">"व्हिडिओ चालू"</string>
-    <string name="incall_content_description_video_off" msgid="762985912616707076">"व्हिडिओ बंद"</string>
-    <string name="incall_content_description_swap_video" msgid="297943299827908998">"व्हिडिओ बदला"</string>
-    <string name="incall_label_speaker" msgid="1814254833253409394">"स्पीकर"</string>
-    <string name="incall_label_audio" msgid="5923781170533336820">"ध्वनी"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_content_description_end_call">कॉल समाप्त करा</string>
+  <string name="incall_content_description_muted">नि:शब्द केले</string>
+  <string name="incall_content_description_unmuted">सशब्द केले</string>
+  <string name="incall_content_description_swap_calls">कॉल स्‍वॅप करा</string>
+  <string name="incall_content_description_swap_sim">सिम बदला</string>
+  <string name="incall_content_description_merge_calls">कॉल विलीन करा</string>
+  <string name="incall_content_description_earpiece">हँडसेट इअरपीस</string>
+  <string name="incall_content_description_speaker">स्पीकर</string>
+  <string name="incall_content_description_bluetooth">ब्लूटुथ</string>
+  <string name="incall_content_description_headset">वायर्ड हेडसेट</string>
+  <string name="incall_content_description_hold">कॉल होल्‍ड करा</string>
+  <string name="incall_content_description_unhold">कॉल सुरु करा</string>
+  <string name="incall_content_description_video_on">व्हिडिओ चालू</string>
+  <string name="incall_content_description_video_off">व्हिडिओ बंद</string>
+  <string name="incall_content_description_swap_video">व्हिडिओ बदला</string>
+  <string name="incall_label_speaker">स्पीकर</string>
+  <string name="incall_label_audio">ध्वनी</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-ms/strings.xml b/java/com/android/incallui/commontheme/res/values-ms/strings.xml
index fb38fa9d..08301d0 100644
--- a/java/com/android/incallui/commontheme/res/values-ms/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-ms/strings.xml
@@ -1,36 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_content_description_end_call" msgid="8232796487777787200">"Tamatkan panggilan"</string>
-    <string name="incall_content_description_muted" msgid="2130133443150389474">"Diredamkan"</string>
-    <string name="incall_content_description_unmuted" msgid="4023577547526525202">"Dinyahredamkan"</string>
-    <string name="incall_content_description_swap_calls" msgid="5233257839262161417">"Silih panggilan"</string>
-    <string name="incall_content_description_merge_calls" msgid="5198778837993669729">"Gabung panggilan"</string>
-    <string name="incall_content_description_earpiece" msgid="2786221842272370555">"Alat dengar telefon mudah alih"</string>
-    <string name="incall_content_description_speaker" msgid="7837829930201265549">"Pembesar suara"</string>
-    <string name="incall_content_description_bluetooth" msgid="6988919010980910001">"Bluetooth"</string>
-    <string name="incall_content_description_headset" msgid="3170439802944346719">"Set kepala berwayar"</string>
-    <string name="incall_content_description_hold" msgid="3335508251734906019">"Tunda panggilan"</string>
-    <string name="incall_content_description_unhold" msgid="3862584118869933593">"Sambung semula panggilan"</string>
-    <string name="incall_content_description_video_on" msgid="899266487647420613">"Video dihidupkan"</string>
-    <string name="incall_content_description_video_off" msgid="762985912616707076">"Video dimatikan"</string>
-    <string name="incall_content_description_swap_video" msgid="297943299827908998">"Silih video"</string>
-    <string name="incall_label_speaker" msgid="1814254833253409394">"Pmbsr suara"</string>
-    <string name="incall_label_audio" msgid="5923781170533336820">"Bunyi"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_content_description_end_call">Tamatkan panggilan</string>
+  <string name="incall_content_description_muted">Diredamkan</string>
+  <string name="incall_content_description_unmuted">Dinyahredamkan</string>
+  <string name="incall_content_description_swap_calls">Silih panggilan</string>
+  <string name="incall_content_description_swap_sim">Tukar SIM</string>
+  <string name="incall_content_description_merge_calls">Gabung panggilan</string>
+  <string name="incall_content_description_earpiece">Alat dengar telefon mudah alih</string>
+  <string name="incall_content_description_speaker">Pembesar suara</string>
+  <string name="incall_content_description_bluetooth">Bluetooth</string>
+  <string name="incall_content_description_headset">Set kepala berwayar</string>
+  <string name="incall_content_description_hold">Tunda panggilan</string>
+  <string name="incall_content_description_unhold">Sambung semula panggilan</string>
+  <string name="incall_content_description_video_on">Video dihidupkan</string>
+  <string name="incall_content_description_video_off">Video dimatikan</string>
+  <string name="incall_content_description_swap_video">Silih video</string>
+  <string name="incall_label_speaker">Pmbsr suara</string>
+  <string name="incall_label_audio">Bunyi</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-my/strings.xml b/java/com/android/incallui/commontheme/res/values-my/strings.xml
index 5b396be..dce79ef 100644
--- a/java/com/android/incallui/commontheme/res/values-my/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-my/strings.xml
@@ -1,36 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_content_description_end_call" msgid="8232796487777787200">"ခေါ်ဆိုမှုအပြီးသတ်ရန်"</string>
-    <string name="incall_content_description_muted" msgid="2130133443150389474">"အသံပိတ်ထားသည်"</string>
-    <string name="incall_content_description_unmuted" msgid="4023577547526525202">"အသံပြန်ဖွင့်လိုက်သည်"</string>
-    <string name="incall_content_description_swap_calls" msgid="5233257839262161417">"ခေါ်ဆိုမှုများကို ဖလှယ်ရန်"</string>
-    <string name="incall_content_description_merge_calls" msgid="5198778837993669729">"ခေါ်ဆိုမှုများပေါင်းရန်"</string>
-    <string name="incall_content_description_earpiece" msgid="2786221842272370555">"လက်ကိုင်ဖုန်းနားကြပ်"</string>
-    <string name="incall_content_description_speaker" msgid="7837829930201265549">"စပီကာ"</string>
-    <string name="incall_content_description_bluetooth" msgid="6988919010980910001">"ဘလူးတုသ်"</string>
-    <string name="incall_content_description_headset" msgid="3170439802944346719">"ကြိုးတပ်မိုက်ခွက်ပါနားကြပ်"</string>
-    <string name="incall_content_description_hold" msgid="3335508251734906019">"ခေါ်ဆိုမှုခဏရပ်ရန်"</string>
-    <string name="incall_content_description_unhold" msgid="3862584118869933593">"ခေါ်ဆိုမှုဆက်လုပ်ရန်"</string>
-    <string name="incall_content_description_video_on" msgid="899266487647420613">"ဗီဒီယိုဖွင့်ထားသည်"</string>
-    <string name="incall_content_description_video_off" msgid="762985912616707076">"ဗီဒီယိုပိတ်ထားသည်"</string>
-    <string name="incall_content_description_swap_video" msgid="297943299827908998">"ဗီဒီယိုဖလှယ်ရန်"</string>
-    <string name="incall_label_speaker" msgid="1814254833253409394">"စပီကာ"</string>
-    <string name="incall_label_audio" msgid="5923781170533336820">"အသံ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_content_description_end_call">ခေါ်ဆိုမှုအပြီးသတ်ရန်</string>
+  <string name="incall_content_description_muted">အသံပိတ်ထားသည်</string>
+  <string name="incall_content_description_unmuted">အသံပြန်ဖွင့်လိုက်သည်</string>
+  <string name="incall_content_description_swap_calls">ခေါ်ဆိုမှုများကို ဖလှယ်ရန်</string>
+  <string name="incall_content_description_swap_sim">ဆင်းမ်ကဒ် ပြောင်းပါ</string>
+  <string name="incall_content_description_merge_calls">ခေါ်ဆိုမှုများပေါင်းရန်</string>
+  <string name="incall_content_description_earpiece">လက်ကိုင်ဖုန်းနားကြပ်</string>
+  <string name="incall_content_description_speaker">စပီကာ</string>
+  <string name="incall_content_description_bluetooth">ဘလူးတုသ်</string>
+  <string name="incall_content_description_headset">ကြိုးတပ်မိုက်ခွက်ပါနားကြပ်</string>
+  <string name="incall_content_description_hold">ခေါ်ဆိုမှုခဏရပ်ရန်</string>
+  <string name="incall_content_description_unhold">ခေါ်ဆိုမှုဆက်လုပ်ရန်</string>
+  <string name="incall_content_description_video_on">ဗီဒီယိုဖွင့်ထားသည်</string>
+  <string name="incall_content_description_video_off">ဗီဒီယိုပိတ်ထားသည်</string>
+  <string name="incall_content_description_swap_video">ဗီဒီယိုဖလှယ်ရန်</string>
+  <string name="incall_label_speaker">စပီကာ</string>
+  <string name="incall_label_audio">အသံ</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-nb/strings.xml b/java/com/android/incallui/commontheme/res/values-nb/strings.xml
index 506b15e..3cb069d 100644
--- a/java/com/android/incallui/commontheme/res/values-nb/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-nb/strings.xml
@@ -1,36 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_content_description_end_call" msgid="8232796487777787200">"Avslutt samtalen"</string>
-    <string name="incall_content_description_muted" msgid="2130133443150389474">"Lyden er kuttet"</string>
-    <string name="incall_content_description_unmuted" msgid="4023577547526525202">"Lyden er slått på"</string>
-    <string name="incall_content_description_swap_calls" msgid="5233257839262161417">"Bytt samtaler"</string>
-    <string name="incall_content_description_merge_calls" msgid="5198778837993669729">"Slå sammen samtaler"</string>
-    <string name="incall_content_description_earpiece" msgid="2786221842272370555">"Telefonens høyttaler"</string>
-    <string name="incall_content_description_speaker" msgid="7837829930201265549">"Høyttaler"</string>
-    <string name="incall_content_description_bluetooth" msgid="6988919010980910001">"Bluetooth"</string>
-    <string name="incall_content_description_headset" msgid="3170439802944346719">"Hodetelefon med kabel"</string>
-    <string name="incall_content_description_hold" msgid="3335508251734906019">"Sett samtalen på vent"</string>
-    <string name="incall_content_description_unhold" msgid="3862584118869933593">"Gjenoppta samtalen"</string>
-    <string name="incall_content_description_video_on" msgid="899266487647420613">"Video på"</string>
-    <string name="incall_content_description_video_off" msgid="762985912616707076">"Video av"</string>
-    <string name="incall_content_description_swap_video" msgid="297943299827908998">"Bytt video"</string>
-    <string name="incall_label_speaker" msgid="1814254833253409394">"Høyttaler"</string>
-    <string name="incall_label_audio" msgid="5923781170533336820">"Lyd"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_content_description_end_call">Avslutt samtalen</string>
+  <string name="incall_content_description_muted">Lyden er kuttet</string>
+  <string name="incall_content_description_unmuted">Lyden er slått på</string>
+  <string name="incall_content_description_swap_calls">Bytt samtaler</string>
+  <string name="incall_content_description_swap_sim">Bytt SIM-kort</string>
+  <string name="incall_content_description_merge_calls">Slå sammen samtaler</string>
+  <string name="incall_content_description_earpiece">Telefonens høyttaler</string>
+  <string name="incall_content_description_speaker">Høyttaler</string>
+  <string name="incall_content_description_bluetooth">Bluetooth</string>
+  <string name="incall_content_description_headset">Hodetelefon med kabel</string>
+  <string name="incall_content_description_hold">Sett samtalen på vent</string>
+  <string name="incall_content_description_unhold">Gjenoppta samtalen</string>
+  <string name="incall_content_description_video_on">Video på</string>
+  <string name="incall_content_description_video_off">Video av</string>
+  <string name="incall_content_description_swap_video">Bytt video</string>
+  <string name="incall_label_speaker">Høyttaler</string>
+  <string name="incall_label_audio">Lyd</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-ne/strings.xml b/java/com/android/incallui/commontheme/res/values-ne/strings.xml
index fa9d87f..02cb1c3 100644
--- a/java/com/android/incallui/commontheme/res/values-ne/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-ne/strings.xml
@@ -1,36 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_content_description_end_call" msgid="8232796487777787200">"कल अन्त्य गर्नुहोस्"</string>
-    <string name="incall_content_description_muted" msgid="2130133443150389474">"म्यूट गरिएको"</string>
-    <string name="incall_content_description_unmuted" msgid="4023577547526525202">"आवाज खोलियो"</string>
-    <string name="incall_content_description_swap_calls" msgid="5233257839262161417">"कलहरू साट्नुहोस्"</string>
-    <string name="incall_content_description_merge_calls" msgid="5198778837993669729">"कलहरू मर्ज गर्नुहोस्"</string>
-    <string name="incall_content_description_earpiece" msgid="2786221842272370555">"हेन्डसेट इयरपिस"</string>
-    <string name="incall_content_description_speaker" msgid="7837829930201265549">"स्पिकर"</string>
-    <string name="incall_content_description_bluetooth" msgid="6988919010980910001">"ब्लुटुथ"</string>
-    <string name="incall_content_description_headset" msgid="3170439802944346719">"तारसहितको हेडसेट"</string>
-    <string name="incall_content_description_hold" msgid="3335508251734906019">"कल होल्ड गर्नुहोस्"</string>
-    <string name="incall_content_description_unhold" msgid="3862584118869933593">"कल जारी राख्नुहोस्"</string>
-    <string name="incall_content_description_video_on" msgid="899266487647420613">"सक्रिय भिडियो"</string>
-    <string name="incall_content_description_video_off" msgid="762985912616707076">"निष्क्रिय भिडियो"</string>
-    <string name="incall_content_description_swap_video" msgid="297943299827908998">"भिडियो साट्नुहोस्"</string>
-    <string name="incall_label_speaker" msgid="1814254833253409394">"स्पिकर"</string>
-    <string name="incall_label_audio" msgid="5923781170533336820">"आवाज"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_content_description_end_call">कल अन्त्य गर्नुहोस्</string>
+  <string name="incall_content_description_muted">म्यूट गरिएको</string>
+  <string name="incall_content_description_unmuted">आवाज खोलियो</string>
+  <string name="incall_content_description_swap_calls">कलहरू साट्नुहोस्</string>
+  <string name="incall_content_description_swap_sim">SIM बदल्नुहोस्</string>
+  <string name="incall_content_description_merge_calls">कलहरू मर्ज गर्नुहोस्</string>
+  <string name="incall_content_description_earpiece">हेन्डसेट इयरपिस</string>
+  <string name="incall_content_description_speaker">स्पिकर</string>
+  <string name="incall_content_description_bluetooth">ब्लुटुथ</string>
+  <string name="incall_content_description_headset">तारसहितको हेडसेट</string>
+  <string name="incall_content_description_hold">कल होल्ड गर्नुहोस्</string>
+  <string name="incall_content_description_unhold">कल जारी राख्नुहोस्</string>
+  <string name="incall_content_description_video_on">सक्रिय भिडियो</string>
+  <string name="incall_content_description_video_off">निष्क्रिय भिडियो</string>
+  <string name="incall_content_description_swap_video">भिडियो साट्नुहोस्</string>
+  <string name="incall_label_speaker">स्पिकर</string>
+  <string name="incall_label_audio">आवाज</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-nl/strings.xml b/java/com/android/incallui/commontheme/res/values-nl/strings.xml
index 192c47b..377b97a 100644
--- a/java/com/android/incallui/commontheme/res/values-nl/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-nl/strings.xml
@@ -1,36 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_content_description_end_call" msgid="8232796487777787200">"Oproep beëindigen"</string>
-    <string name="incall_content_description_muted" msgid="2130133443150389474">"Gedempt"</string>
-    <string name="incall_content_description_unmuted" msgid="4023577547526525202">"Dempen opgeheven"</string>
-    <string name="incall_content_description_swap_calls" msgid="5233257839262161417">"Oproepen wisselen"</string>
-    <string name="incall_content_description_merge_calls" msgid="5198778837993669729">"Oproepen samenvoegen"</string>
-    <string name="incall_content_description_earpiece" msgid="2786221842272370555">"Oortelefoon van handset"</string>
-    <string name="incall_content_description_speaker" msgid="7837829930201265549">"Luidspreker"</string>
-    <string name="incall_content_description_bluetooth" msgid="6988919010980910001">"Bluetooth"</string>
-    <string name="incall_content_description_headset" msgid="3170439802944346719">"Bedrade headset"</string>
-    <string name="incall_content_description_hold" msgid="3335508251734906019">"Gesprek in de wacht zetten"</string>
-    <string name="incall_content_description_unhold" msgid="3862584118869933593">"Gesprek hervatten"</string>
-    <string name="incall_content_description_video_on" msgid="899266487647420613">"Video aan"</string>
-    <string name="incall_content_description_video_off" msgid="762985912616707076">"Video uit"</string>
-    <string name="incall_content_description_swap_video" msgid="297943299827908998">"Video wisselen"</string>
-    <string name="incall_label_speaker" msgid="1814254833253409394">"Luidspreker"</string>
-    <string name="incall_label_audio" msgid="5923781170533336820">"Geluid"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_content_description_end_call">Oproep beëindigen</string>
+  <string name="incall_content_description_muted">Gedempt</string>
+  <string name="incall_content_description_unmuted">Dempen opgeheven</string>
+  <string name="incall_content_description_swap_calls">Oproepen wisselen</string>
+  <string name="incall_content_description_swap_sim">Simkaart wijzigen</string>
+  <string name="incall_content_description_merge_calls">Oproepen samenvoegen</string>
+  <string name="incall_content_description_earpiece">Oortelefoon van handset</string>
+  <string name="incall_content_description_speaker">Luidspreker</string>
+  <string name="incall_content_description_bluetooth">Bluetooth</string>
+  <string name="incall_content_description_headset">Bedrade headset</string>
+  <string name="incall_content_description_hold">Gesprek in de wacht zetten</string>
+  <string name="incall_content_description_unhold">Gesprek hervatten</string>
+  <string name="incall_content_description_video_on">Video aan</string>
+  <string name="incall_content_description_video_off">Video uit</string>
+  <string name="incall_content_description_swap_video">Video wisselen</string>
+  <string name="incall_label_speaker">Luidspreker</string>
+  <string name="incall_label_audio">Geluid</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-no/strings.xml b/java/com/android/incallui/commontheme/res/values-no/strings.xml
index 506b15e..3cb069d 100644
--- a/java/com/android/incallui/commontheme/res/values-no/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-no/strings.xml
@@ -1,36 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_content_description_end_call" msgid="8232796487777787200">"Avslutt samtalen"</string>
-    <string name="incall_content_description_muted" msgid="2130133443150389474">"Lyden er kuttet"</string>
-    <string name="incall_content_description_unmuted" msgid="4023577547526525202">"Lyden er slått på"</string>
-    <string name="incall_content_description_swap_calls" msgid="5233257839262161417">"Bytt samtaler"</string>
-    <string name="incall_content_description_merge_calls" msgid="5198778837993669729">"Slå sammen samtaler"</string>
-    <string name="incall_content_description_earpiece" msgid="2786221842272370555">"Telefonens høyttaler"</string>
-    <string name="incall_content_description_speaker" msgid="7837829930201265549">"Høyttaler"</string>
-    <string name="incall_content_description_bluetooth" msgid="6988919010980910001">"Bluetooth"</string>
-    <string name="incall_content_description_headset" msgid="3170439802944346719">"Hodetelefon med kabel"</string>
-    <string name="incall_content_description_hold" msgid="3335508251734906019">"Sett samtalen på vent"</string>
-    <string name="incall_content_description_unhold" msgid="3862584118869933593">"Gjenoppta samtalen"</string>
-    <string name="incall_content_description_video_on" msgid="899266487647420613">"Video på"</string>
-    <string name="incall_content_description_video_off" msgid="762985912616707076">"Video av"</string>
-    <string name="incall_content_description_swap_video" msgid="297943299827908998">"Bytt video"</string>
-    <string name="incall_label_speaker" msgid="1814254833253409394">"Høyttaler"</string>
-    <string name="incall_label_audio" msgid="5923781170533336820">"Lyd"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_content_description_end_call">Avslutt samtalen</string>
+  <string name="incall_content_description_muted">Lyden er kuttet</string>
+  <string name="incall_content_description_unmuted">Lyden er slått på</string>
+  <string name="incall_content_description_swap_calls">Bytt samtaler</string>
+  <string name="incall_content_description_swap_sim">Bytt SIM-kort</string>
+  <string name="incall_content_description_merge_calls">Slå sammen samtaler</string>
+  <string name="incall_content_description_earpiece">Telefonens høyttaler</string>
+  <string name="incall_content_description_speaker">Høyttaler</string>
+  <string name="incall_content_description_bluetooth">Bluetooth</string>
+  <string name="incall_content_description_headset">Hodetelefon med kabel</string>
+  <string name="incall_content_description_hold">Sett samtalen på vent</string>
+  <string name="incall_content_description_unhold">Gjenoppta samtalen</string>
+  <string name="incall_content_description_video_on">Video på</string>
+  <string name="incall_content_description_video_off">Video av</string>
+  <string name="incall_content_description_swap_video">Bytt video</string>
+  <string name="incall_label_speaker">Høyttaler</string>
+  <string name="incall_label_audio">Lyd</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-pa/strings.xml b/java/com/android/incallui/commontheme/res/values-pa/strings.xml
index 77ceb25..37c1f5f 100644
--- a/java/com/android/incallui/commontheme/res/values-pa/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-pa/strings.xml
@@ -1,36 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_content_description_end_call" msgid="8232796487777787200">"ਕਾਲ ਸਮਾਪਤ ਕਰੋ"</string>
-    <string name="incall_content_description_muted" msgid="2130133443150389474">"ਮਿਊਟ ਕੀਤਾ ਗਿਆ"</string>
-    <string name="incall_content_description_unmuted" msgid="4023577547526525202">"ਅਣਮਿਊਟ ਕੀਤਾ ਗਿਆ"</string>
-    <string name="incall_content_description_swap_calls" msgid="5233257839262161417">"ਕਾਲਾਂ ਦੀ ਅਦਲਾ ਬਦਲੀ ਕਰੋ"</string>
-    <string name="incall_content_description_merge_calls" msgid="5198778837993669729">"ਕਾਲਾਂ ਰਲਗੱਡ ਕਰੋ"</string>
-    <string name="incall_content_description_earpiece" msgid="2786221842272370555">"ਹੈੱਡਸੈੱਟ ਈਅਰਪੀਸ"</string>
-    <string name="incall_content_description_speaker" msgid="7837829930201265549">"ਸਪੀਕਰ"</string>
-    <string name="incall_content_description_bluetooth" msgid="6988919010980910001">"ਬਲੂਟੁੱਥ"</string>
-    <string name="incall_content_description_headset" msgid="3170439802944346719">"ਤਾਰਯੁਕਤ ਹੈੱਡਸੈੱਟ"</string>
-    <string name="incall_content_description_hold" msgid="3335508251734906019">"ਕਾਲ ਰੋਕ ਕੇ ਰੱਖੋ"</string>
-    <string name="incall_content_description_unhold" msgid="3862584118869933593">"ਕਾਲ ਮੁੜ-ਸ਼ੁਰੂ ਕਰੋ"</string>
-    <string name="incall_content_description_video_on" msgid="899266487647420613">"ਵੀਡੀਓ ਚਾਲੂ"</string>
-    <string name="incall_content_description_video_off" msgid="762985912616707076">"ਵੀਡੀਓ ਬੰਦ"</string>
-    <string name="incall_content_description_swap_video" msgid="297943299827908998">"ਵੀਡੀਓ ਦੀ ਅਦਲਾ ਬਦਲੀ ਕਰੋ"</string>
-    <string name="incall_label_speaker" msgid="1814254833253409394">"ਸਪੀਕਰ"</string>
-    <string name="incall_label_audio" msgid="5923781170533336820">"ਧੁਨੀ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_content_description_end_call">ਕਾਲ ਸਮਾਪਤ ਕਰੋ</string>
+  <string name="incall_content_description_muted">ਮਿਊਟ ਕੀਤਾ ਗਿਆ</string>
+  <string name="incall_content_description_unmuted">ਅਣਮਿਊਟ ਕੀਤਾ ਗਿਆ</string>
+  <string name="incall_content_description_swap_calls">ਕਾਲਾਂ ਦੀ ਅਦਲਾ ਬਦਲੀ ਕਰੋ</string>
+  <string name="incall_content_description_swap_sim">ਸਿਮ ਬਦਲੋ</string>
+  <string name="incall_content_description_merge_calls">ਕਾਲਾਂ ਰਲਗੱਡ ਕਰੋ</string>
+  <string name="incall_content_description_earpiece">ਹੈੱਡਸੈੱਟ ਈਅਰਪੀਸ</string>
+  <string name="incall_content_description_speaker">ਸਪੀਕਰ</string>
+  <string name="incall_content_description_bluetooth">ਬਲੂਟੁੱਥ</string>
+  <string name="incall_content_description_headset">ਤਾਰਯੁਕਤ ਹੈੱਡਸੈੱਟ</string>
+  <string name="incall_content_description_hold">ਕਾਲ ਰੋਕ ਕੇ ਰੱਖੋ</string>
+  <string name="incall_content_description_unhold">ਕਾਲ ਮੁੜ-ਸ਼ੁਰੂ ਕਰੋ</string>
+  <string name="incall_content_description_video_on">ਵੀਡੀਓ ਚਾਲੂ</string>
+  <string name="incall_content_description_video_off">ਵੀਡੀਓ ਬੰਦ</string>
+  <string name="incall_content_description_swap_video">ਵੀਡੀਓ ਦੀ ਅਦਲਾ ਬਦਲੀ ਕਰੋ</string>
+  <string name="incall_label_speaker">ਸਪੀਕਰ</string>
+  <string name="incall_label_audio">ਧੁਨੀ</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-pl/strings.xml b/java/com/android/incallui/commontheme/res/values-pl/strings.xml
index d9b037e..6842fcd 100644
--- a/java/com/android/incallui/commontheme/res/values-pl/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-pl/strings.xml
@@ -1,36 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_content_description_end_call" msgid="8232796487777787200">"Zakończ połączenie"</string>
-    <string name="incall_content_description_muted" msgid="2130133443150389474">"Wyciszono"</string>
-    <string name="incall_content_description_unmuted" msgid="4023577547526525202">"Wyłączono wyciszenie"</string>
-    <string name="incall_content_description_swap_calls" msgid="5233257839262161417">"Przełącz połączenie"</string>
-    <string name="incall_content_description_merge_calls" msgid="5198778837993669729">"Scal połączenia"</string>
-    <string name="incall_content_description_earpiece" msgid="2786221842272370555">"Słuchawka telefonu"</string>
-    <string name="incall_content_description_speaker" msgid="7837829930201265549">"Głośnik"</string>
-    <string name="incall_content_description_bluetooth" msgid="6988919010980910001">"Bluetooth"</string>
-    <string name="incall_content_description_headset" msgid="3170439802944346719">"Przewodowy zestaw słuchawkowy"</string>
-    <string name="incall_content_description_hold" msgid="3335508251734906019">"Wstrzymaj połączenie"</string>
-    <string name="incall_content_description_unhold" msgid="3862584118869933593">"Wznów połączenie"</string>
-    <string name="incall_content_description_video_on" msgid="899266487647420613">"Wideo włączone"</string>
-    <string name="incall_content_description_video_off" msgid="762985912616707076">"Wideo wyłączone"</string>
-    <string name="incall_content_description_swap_video" msgid="297943299827908998">"Przełącz wideo"</string>
-    <string name="incall_label_speaker" msgid="1814254833253409394">"Głośnik"</string>
-    <string name="incall_label_audio" msgid="5923781170533336820">"Dźwięk"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_content_description_end_call">Zakończ połączenie</string>
+  <string name="incall_content_description_muted">Wyciszono</string>
+  <string name="incall_content_description_unmuted">Wyłączono wyciszenie</string>
+  <string name="incall_content_description_swap_calls">Przełącz połączenie</string>
+  <string name="incall_content_description_swap_sim">Zmień kartę SIM</string>
+  <string name="incall_content_description_merge_calls">Scal połączenia</string>
+  <string name="incall_content_description_earpiece">Słuchawka telefonu</string>
+  <string name="incall_content_description_speaker">Głośnik</string>
+  <string name="incall_content_description_bluetooth">Bluetooth</string>
+  <string name="incall_content_description_headset">Przewodowy zestaw słuchawkowy</string>
+  <string name="incall_content_description_hold">Wstrzymaj połączenie</string>
+  <string name="incall_content_description_unhold">Wznów połączenie</string>
+  <string name="incall_content_description_video_on">Wideo włączone</string>
+  <string name="incall_content_description_video_off">Wideo wyłączone</string>
+  <string name="incall_content_description_swap_video">Przełącz wideo</string>
+  <string name="incall_label_speaker">Głośnik</string>
+  <string name="incall_label_audio">Dźwięk</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-pt-rBR/strings.xml b/java/com/android/incallui/commontheme/res/values-pt-rBR/strings.xml
index 2c1834e..1317763 100644
--- a/java/com/android/incallui/commontheme/res/values-pt-rBR/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-pt-rBR/strings.xml
@@ -1,36 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_content_description_end_call" msgid="8232796487777787200">"Encerrar chamada"</string>
-    <string name="incall_content_description_muted" msgid="2130133443150389474">"Som desativado"</string>
-    <string name="incall_content_description_unmuted" msgid="4023577547526525202">"Som ativado"</string>
-    <string name="incall_content_description_swap_calls" msgid="5233257839262161417">"Trocar chamadas"</string>
-    <string name="incall_content_description_merge_calls" msgid="5198778837993669729">"Mesclar chamadas"</string>
-    <string name="incall_content_description_earpiece" msgid="2786221842272370555">"Minifone do aparelho"</string>
-    <string name="incall_content_description_speaker" msgid="7837829930201265549">"Alto-falante"</string>
-    <string name="incall_content_description_bluetooth" msgid="6988919010980910001">"Bluetooth"</string>
-    <string name="incall_content_description_headset" msgid="3170439802944346719">"Fone de ouvido com fio"</string>
-    <string name="incall_content_description_hold" msgid="3335508251734906019">"Colocar chamada em espera"</string>
-    <string name="incall_content_description_unhold" msgid="3862584118869933593">"Retomar chamada"</string>
-    <string name="incall_content_description_video_on" msgid="899266487647420613">"Vídeo ativado"</string>
-    <string name="incall_content_description_video_off" msgid="762985912616707076">"Vídeo desativado"</string>
-    <string name="incall_content_description_swap_video" msgid="297943299827908998">"Trocar vídeo"</string>
-    <string name="incall_label_speaker" msgid="1814254833253409394">"Alto-falante"</string>
-    <string name="incall_label_audio" msgid="5923781170533336820">"Som"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_content_description_end_call">Encerrar chamada</string>
+  <string name="incall_content_description_muted">Som desativado</string>
+  <string name="incall_content_description_unmuted">Som ativado</string>
+  <string name="incall_content_description_swap_calls">Trocar chamadas</string>
+  <string name="incall_content_description_swap_sim">Alterar SIM</string>
+  <string name="incall_content_description_merge_calls">Mesclar chamadas</string>
+  <string name="incall_content_description_earpiece">Minifone do aparelho</string>
+  <string name="incall_content_description_speaker">Alto-falante</string>
+  <string name="incall_content_description_bluetooth">Bluetooth</string>
+  <string name="incall_content_description_headset">Fone de ouvido com fio</string>
+  <string name="incall_content_description_hold">Colocar chamada em espera</string>
+  <string name="incall_content_description_unhold">Retomar chamada</string>
+  <string name="incall_content_description_video_on">Vídeo ativado</string>
+  <string name="incall_content_description_video_off">Vídeo desativado</string>
+  <string name="incall_content_description_swap_video">Trocar vídeo</string>
+  <string name="incall_label_speaker">Alto-falante</string>
+  <string name="incall_label_audio">Som</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-pt-rPT/strings.xml b/java/com/android/incallui/commontheme/res/values-pt-rPT/strings.xml
index f0c14d0..43d1218 100644
--- a/java/com/android/incallui/commontheme/res/values-pt-rPT/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-pt-rPT/strings.xml
@@ -1,36 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_content_description_end_call" msgid="8232796487777787200">"Terminar chamada"</string>
-    <string name="incall_content_description_muted" msgid="2130133443150389474">"Som desativado"</string>
-    <string name="incall_content_description_unmuted" msgid="4023577547526525202">"Som reativado"</string>
-    <string name="incall_content_description_swap_calls" msgid="5233257839262161417">"Alternar entre chamadas"</string>
-    <string name="incall_content_description_merge_calls" msgid="5198778837993669729">"Unir chamadas"</string>
-    <string name="incall_content_description_earpiece" msgid="2786221842272370555">"Auricular do dispositivo"</string>
-    <string name="incall_content_description_speaker" msgid="7837829930201265549">"Altifalante"</string>
-    <string name="incall_content_description_bluetooth" msgid="6988919010980910001">"Bluetooth"</string>
-    <string name="incall_content_description_headset" msgid="3170439802944346719">"Auscultadores com fios"</string>
-    <string name="incall_content_description_hold" msgid="3335508251734906019">"Colocar a chamada em espera"</string>
-    <string name="incall_content_description_unhold" msgid="3862584118869933593">"Retomar a chamada"</string>
-    <string name="incall_content_description_video_on" msgid="899266487647420613">"Vídeo ativado"</string>
-    <string name="incall_content_description_video_off" msgid="762985912616707076">"Vídeo desativado"</string>
-    <string name="incall_content_description_swap_video" msgid="297943299827908998">"Alternar vídeo"</string>
-    <string name="incall_label_speaker" msgid="1814254833253409394">"Altifalante"</string>
-    <string name="incall_label_audio" msgid="5923781170533336820">"Som"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_content_description_end_call">Terminar chamada</string>
+  <string name="incall_content_description_muted">Som desativado</string>
+  <string name="incall_content_description_unmuted">Som reativado</string>
+  <string name="incall_content_description_swap_calls">Alternar entre chamadas</string>
+  <string name="incall_content_description_swap_sim">Alterar SIM</string>
+  <string name="incall_content_description_merge_calls">Unir chamadas</string>
+  <string name="incall_content_description_earpiece">Auricular do dispositivo</string>
+  <string name="incall_content_description_speaker">Altifalante</string>
+  <string name="incall_content_description_bluetooth">Bluetooth</string>
+  <string name="incall_content_description_headset">Auscultadores com fios</string>
+  <string name="incall_content_description_hold">Colocar a chamada em espera</string>
+  <string name="incall_content_description_unhold">Retomar a chamada</string>
+  <string name="incall_content_description_video_on">Vídeo ativado</string>
+  <string name="incall_content_description_video_off">Vídeo desativado</string>
+  <string name="incall_content_description_swap_video">Alternar vídeo</string>
+  <string name="incall_label_speaker">Altifalante</string>
+  <string name="incall_label_audio">Som</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-pt/strings.xml b/java/com/android/incallui/commontheme/res/values-pt/strings.xml
index 2c1834e..1317763 100644
--- a/java/com/android/incallui/commontheme/res/values-pt/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-pt/strings.xml
@@ -1,36 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_content_description_end_call" msgid="8232796487777787200">"Encerrar chamada"</string>
-    <string name="incall_content_description_muted" msgid="2130133443150389474">"Som desativado"</string>
-    <string name="incall_content_description_unmuted" msgid="4023577547526525202">"Som ativado"</string>
-    <string name="incall_content_description_swap_calls" msgid="5233257839262161417">"Trocar chamadas"</string>
-    <string name="incall_content_description_merge_calls" msgid="5198778837993669729">"Mesclar chamadas"</string>
-    <string name="incall_content_description_earpiece" msgid="2786221842272370555">"Minifone do aparelho"</string>
-    <string name="incall_content_description_speaker" msgid="7837829930201265549">"Alto-falante"</string>
-    <string name="incall_content_description_bluetooth" msgid="6988919010980910001">"Bluetooth"</string>
-    <string name="incall_content_description_headset" msgid="3170439802944346719">"Fone de ouvido com fio"</string>
-    <string name="incall_content_description_hold" msgid="3335508251734906019">"Colocar chamada em espera"</string>
-    <string name="incall_content_description_unhold" msgid="3862584118869933593">"Retomar chamada"</string>
-    <string name="incall_content_description_video_on" msgid="899266487647420613">"Vídeo ativado"</string>
-    <string name="incall_content_description_video_off" msgid="762985912616707076">"Vídeo desativado"</string>
-    <string name="incall_content_description_swap_video" msgid="297943299827908998">"Trocar vídeo"</string>
-    <string name="incall_label_speaker" msgid="1814254833253409394">"Alto-falante"</string>
-    <string name="incall_label_audio" msgid="5923781170533336820">"Som"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_content_description_end_call">Encerrar chamada</string>
+  <string name="incall_content_description_muted">Som desativado</string>
+  <string name="incall_content_description_unmuted">Som ativado</string>
+  <string name="incall_content_description_swap_calls">Trocar chamadas</string>
+  <string name="incall_content_description_swap_sim">Alterar SIM</string>
+  <string name="incall_content_description_merge_calls">Mesclar chamadas</string>
+  <string name="incall_content_description_earpiece">Minifone do aparelho</string>
+  <string name="incall_content_description_speaker">Alto-falante</string>
+  <string name="incall_content_description_bluetooth">Bluetooth</string>
+  <string name="incall_content_description_headset">Fone de ouvido com fio</string>
+  <string name="incall_content_description_hold">Colocar chamada em espera</string>
+  <string name="incall_content_description_unhold">Retomar chamada</string>
+  <string name="incall_content_description_video_on">Vídeo ativado</string>
+  <string name="incall_content_description_video_off">Vídeo desativado</string>
+  <string name="incall_content_description_swap_video">Trocar vídeo</string>
+  <string name="incall_label_speaker">Alto-falante</string>
+  <string name="incall_label_audio">Som</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-ro/strings.xml b/java/com/android/incallui/commontheme/res/values-ro/strings.xml
index f7c8f72..61794f6 100644
--- a/java/com/android/incallui/commontheme/res/values-ro/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-ro/strings.xml
@@ -1,36 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_content_description_end_call" msgid="8232796487777787200">"Încheiați apelul"</string>
-    <string name="incall_content_description_muted" msgid="2130133443150389474">"Dezactivat"</string>
-    <string name="incall_content_description_unmuted" msgid="4023577547526525202">"Activat"</string>
-    <string name="incall_content_description_swap_calls" msgid="5233257839262161417">"Comutați între apeluri"</string>
-    <string name="incall_content_description_merge_calls" msgid="5198778837993669729">"Îmbinați apelurile"</string>
-    <string name="incall_content_description_earpiece" msgid="2786221842272370555">"Casca dispozitivului"</string>
-    <string name="incall_content_description_speaker" msgid="7837829930201265549">"Difuzor"</string>
-    <string name="incall_content_description_bluetooth" msgid="6988919010980910001">"Bluetooth"</string>
-    <string name="incall_content_description_headset" msgid="3170439802944346719">"Set căști-microfon cu fir"</string>
-    <string name="incall_content_description_hold" msgid="3335508251734906019">"Puneți apelul în așteptare"</string>
-    <string name="incall_content_description_unhold" msgid="3862584118869933593">"Reluați apelul"</string>
-    <string name="incall_content_description_video_on" msgid="899266487647420613">"Imaginea video este activată"</string>
-    <string name="incall_content_description_video_off" msgid="762985912616707076">"Imaginea video este dezactivată"</string>
-    <string name="incall_content_description_swap_video" msgid="297943299827908998">"Schimbați imaginea video"</string>
-    <string name="incall_label_speaker" msgid="1814254833253409394">"Difuzor"</string>
-    <string name="incall_label_audio" msgid="5923781170533336820">"Sunet"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_content_description_end_call">Încheiați apelul</string>
+  <string name="incall_content_description_muted">Dezactivat</string>
+  <string name="incall_content_description_unmuted">Activat</string>
+  <string name="incall_content_description_swap_calls">Comutați între apeluri</string>
+  <string name="incall_content_description_swap_sim">Schimbați SIM-ul</string>
+  <string name="incall_content_description_merge_calls">Îmbinați apelurile</string>
+  <string name="incall_content_description_earpiece">Casca dispozitivului</string>
+  <string name="incall_content_description_speaker">Difuzor</string>
+  <string name="incall_content_description_bluetooth">Bluetooth</string>
+  <string name="incall_content_description_headset">Set căști-microfon cu fir</string>
+  <string name="incall_content_description_hold">Puneți apelul în așteptare</string>
+  <string name="incall_content_description_unhold">Reluați apelul</string>
+  <string name="incall_content_description_video_on">Imaginea video este activată</string>
+  <string name="incall_content_description_video_off">Imaginea video este dezactivată</string>
+  <string name="incall_content_description_swap_video">Schimbați imaginea video</string>
+  <string name="incall_label_speaker">Difuzor</string>
+  <string name="incall_label_audio">Sunet</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-ru/strings.xml b/java/com/android/incallui/commontheme/res/values-ru/strings.xml
index 1853ad2..9d43140 100644
--- a/java/com/android/incallui/commontheme/res/values-ru/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-ru/strings.xml
@@ -1,36 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_content_description_end_call" msgid="8232796487777787200">"Завершить вызов"</string>
-    <string name="incall_content_description_muted" msgid="2130133443150389474">"Звук выключен"</string>
-    <string name="incall_content_description_unmuted" msgid="4023577547526525202">"Звук включен"</string>
-    <string name="incall_content_description_swap_calls" msgid="5233257839262161417">"Переключиться на другой вызов"</string>
-    <string name="incall_content_description_merge_calls" msgid="5198778837993669729">"Объединить вызовы"</string>
-    <string name="incall_content_description_earpiece" msgid="2786221842272370555">"Динамик телефона"</string>
-    <string name="incall_content_description_speaker" msgid="7837829930201265549">"Динамик"</string>
-    <string name="incall_content_description_bluetooth" msgid="6988919010980910001">"Bluetooth"</string>
-    <string name="incall_content_description_headset" msgid="3170439802944346719">"Проводная гарнитура"</string>
-    <string name="incall_content_description_hold" msgid="3335508251734906019">"Удерживать вызов"</string>
-    <string name="incall_content_description_unhold" msgid="3862584118869933593">"Возобновить вызов"</string>
-    <string name="incall_content_description_video_on" msgid="899266487647420613">"Камера включена"</string>
-    <string name="incall_content_description_video_off" msgid="762985912616707076">"Камера выключена"</string>
-    <string name="incall_content_description_swap_video" msgid="297943299827908998">"Включить/выключить камеру"</string>
-    <string name="incall_label_speaker" msgid="1814254833253409394">"Динамик"</string>
-    <string name="incall_label_audio" msgid="5923781170533336820">"Звук"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_content_description_end_call">Завершить вызов</string>
+  <string name="incall_content_description_muted">Звук выключен</string>
+  <string name="incall_content_description_unmuted">Звук включен</string>
+  <string name="incall_content_description_swap_calls">Переключиться на другой вызов</string>
+  <string name="incall_content_description_swap_sim">Сменить SIM-карту</string>
+  <string name="incall_content_description_merge_calls">Объединить вызовы</string>
+  <string name="incall_content_description_earpiece">Динамик телефона</string>
+  <string name="incall_content_description_speaker">Динамик</string>
+  <string name="incall_content_description_bluetooth">Bluetooth</string>
+  <string name="incall_content_description_headset">Проводная гарнитура</string>
+  <string name="incall_content_description_hold">Удерживать вызов</string>
+  <string name="incall_content_description_unhold">Возобновить вызов</string>
+  <string name="incall_content_description_video_on">Камера включена</string>
+  <string name="incall_content_description_video_off">Камера выключена</string>
+  <string name="incall_content_description_swap_video">Включить/выключить камеру</string>
+  <string name="incall_label_speaker">Динамик</string>
+  <string name="incall_label_audio">Звук</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-si/strings.xml b/java/com/android/incallui/commontheme/res/values-si/strings.xml
index ae13cc4..fb95fb5 100644
--- a/java/com/android/incallui/commontheme/res/values-si/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-si/strings.xml
@@ -1,36 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_content_description_end_call" msgid="8232796487777787200">"ඇමතුම අවසන් කරන්න"</string>
-    <string name="incall_content_description_muted" msgid="2130133443150389474">"නිහඩ කරන ලදී"</string>
-    <string name="incall_content_description_unmuted" msgid="4023577547526525202">"නිහඬ කිරීමෙන් ඉවත් කෙරිණි"</string>
-    <string name="incall_content_description_swap_calls" msgid="5233257839262161417">"ඇමතුම් මාරු කරන්න"</string>
-    <string name="incall_content_description_merge_calls" msgid="5198778837993669729">"ඇමතුම් ඒකාබද්ධ කරන්න"</string>
-    <string name="incall_content_description_earpiece" msgid="2786221842272370555">"හෙඩ්සෙට් සවන්කඩ"</string>
-    <string name="incall_content_description_speaker" msgid="7837829930201265549">"ස්පීකරය"</string>
-    <string name="incall_content_description_bluetooth" msgid="6988919010980910001">"බ්ලූටූත්"</string>
-    <string name="incall_content_description_headset" msgid="3170439802944346719">"රැහැන්ගත කළ හෙඩ්සෙට්"</string>
-    <string name="incall_content_description_hold" msgid="3335508251734906019">"ඇමතුම රඳවා ගන්න"</string>
-    <string name="incall_content_description_unhold" msgid="3862584118869933593">"ඇමතුම නැවත අරඹන්න"</string>
-    <string name="incall_content_description_video_on" msgid="899266487647420613">"වීඩියෝව ක්‍රියාත්මකයි"</string>
-    <string name="incall_content_description_video_off" msgid="762985912616707076">"වීඩියෝව ක්‍රියාවිරහිතයි"</string>
-    <string name="incall_content_description_swap_video" msgid="297943299827908998">"වීඩියෝව මාරු කරන්න"</string>
-    <string name="incall_label_speaker" msgid="1814254833253409394">"ස්පීකරය"</string>
-    <string name="incall_label_audio" msgid="5923781170533336820">"හඬ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_content_description_end_call">ඇමතුම අවසන් කරන්න</string>
+  <string name="incall_content_description_muted">නිහඩ කරන ලදී</string>
+  <string name="incall_content_description_unmuted">නිහඬ කිරීමෙන් ඉවත් කෙරිණි</string>
+  <string name="incall_content_description_swap_calls">ඇමතුම් මාරු කරන්න</string>
+  <string name="incall_content_description_swap_sim">SIM වෙනස් කරන්න</string>
+  <string name="incall_content_description_merge_calls">ඇමතුම් ඒකාබද්ධ කරන්න</string>
+  <string name="incall_content_description_earpiece">හෙඩ්සෙට් සවන්කඩ</string>
+  <string name="incall_content_description_speaker">ස්පීකරය</string>
+  <string name="incall_content_description_bluetooth">බ්ලූටූත්</string>
+  <string name="incall_content_description_headset">රැහැන්ගත කළ හෙඩ්සෙට්</string>
+  <string name="incall_content_description_hold">ඇමතුම රඳවා ගන්න</string>
+  <string name="incall_content_description_unhold">ඇමතුම නැවත අරඹන්න</string>
+  <string name="incall_content_description_video_on">වීඩියෝව ක්‍රියාත්මකයි</string>
+  <string name="incall_content_description_video_off">වීඩියෝව ක්‍රියාවිරහිතයි</string>
+  <string name="incall_content_description_swap_video">වීඩියෝව මාරු කරන්න</string>
+  <string name="incall_label_speaker">ස්පීකරය</string>
+  <string name="incall_label_audio">හඬ</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-sk/strings.xml b/java/com/android/incallui/commontheme/res/values-sk/strings.xml
index cd9aa99..6d49fcc 100644
--- a/java/com/android/incallui/commontheme/res/values-sk/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-sk/strings.xml
@@ -1,36 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_content_description_end_call" msgid="8232796487777787200">"Ukončiť hovor"</string>
-    <string name="incall_content_description_muted" msgid="2130133443150389474">"Zvuk bol vypnutý"</string>
-    <string name="incall_content_description_unmuted" msgid="4023577547526525202">"Zvuk bol zapnutý"</string>
-    <string name="incall_content_description_swap_calls" msgid="5233257839262161417">"Zameniť hovory"</string>
-    <string name="incall_content_description_merge_calls" msgid="5198778837993669729">"Zlúčiť hovory"</string>
-    <string name="incall_content_description_earpiece" msgid="2786221842272370555">"Slúchadlo"</string>
-    <string name="incall_content_description_speaker" msgid="7837829930201265549">"Reproduktor"</string>
-    <string name="incall_content_description_bluetooth" msgid="6988919010980910001">"Bluetooth"</string>
-    <string name="incall_content_description_headset" msgid="3170439802944346719">"Náhlavná súprava s káblom"</string>
-    <string name="incall_content_description_hold" msgid="3335508251734906019">"Podržať hovor"</string>
-    <string name="incall_content_description_unhold" msgid="3862584118869933593">"Obnoviť hovor"</string>
-    <string name="incall_content_description_video_on" msgid="899266487647420613">"Video je zapnuté"</string>
-    <string name="incall_content_description_video_off" msgid="762985912616707076">"Video je vypnuté"</string>
-    <string name="incall_content_description_swap_video" msgid="297943299827908998">"Zameniť video"</string>
-    <string name="incall_label_speaker" msgid="1814254833253409394">"Reproduktor"</string>
-    <string name="incall_label_audio" msgid="5923781170533336820">"Zvuk"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_content_description_end_call">Ukončiť hovor</string>
+  <string name="incall_content_description_muted">Zvuk bol vypnutý</string>
+  <string name="incall_content_description_unmuted">Zvuk bol zapnutý</string>
+  <string name="incall_content_description_swap_calls">Zameniť hovory</string>
+  <string name="incall_content_description_swap_sim">Zmeniť SIM kartu</string>
+  <string name="incall_content_description_merge_calls">Zlúčiť hovory</string>
+  <string name="incall_content_description_earpiece">Slúchadlo</string>
+  <string name="incall_content_description_speaker">Reproduktor</string>
+  <string name="incall_content_description_bluetooth">Bluetooth</string>
+  <string name="incall_content_description_headset">Náhlavná súprava s káblom</string>
+  <string name="incall_content_description_hold">Podržať hovor</string>
+  <string name="incall_content_description_unhold">Obnoviť hovor</string>
+  <string name="incall_content_description_video_on">Video je zapnuté</string>
+  <string name="incall_content_description_video_off">Video je vypnuté</string>
+  <string name="incall_content_description_swap_video">Zameniť video</string>
+  <string name="incall_label_speaker">Reproduktor</string>
+  <string name="incall_label_audio">Zvuk</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-sl/strings.xml b/java/com/android/incallui/commontheme/res/values-sl/strings.xml
index 0aa6e69..d61f6a4 100644
--- a/java/com/android/incallui/commontheme/res/values-sl/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-sl/strings.xml
@@ -1,36 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_content_description_end_call" msgid="8232796487777787200">"Končaj klic"</string>
-    <string name="incall_content_description_muted" msgid="2130133443150389474">"Zvok je izklopljen"</string>
-    <string name="incall_content_description_unmuted" msgid="4023577547526525202">"Zvok je vklopljen"</string>
-    <string name="incall_content_description_swap_calls" msgid="5233257839262161417">"Zamenjaj klica"</string>
-    <string name="incall_content_description_merge_calls" msgid="5198778837993669729">"Združi klice"</string>
-    <string name="incall_content_description_earpiece" msgid="2786221842272370555">"Slušalka"</string>
-    <string name="incall_content_description_speaker" msgid="7837829930201265549">"Zvočnik"</string>
-    <string name="incall_content_description_bluetooth" msgid="6988919010980910001">"Bluetooth"</string>
-    <string name="incall_content_description_headset" msgid="3170439802944346719">"Žične slušalke"</string>
-    <string name="incall_content_description_hold" msgid="3335508251734906019">"Zadrži klic"</string>
-    <string name="incall_content_description_unhold" msgid="3862584118869933593">"Nadaljuj klic"</string>
-    <string name="incall_content_description_video_on" msgid="899266487647420613">"Vklopi video"</string>
-    <string name="incall_content_description_video_off" msgid="762985912616707076">"Izklopi video"</string>
-    <string name="incall_content_description_swap_video" msgid="297943299827908998">"Zamenjaj video"</string>
-    <string name="incall_label_speaker" msgid="1814254833253409394">"Zvočnik"</string>
-    <string name="incall_label_audio" msgid="5923781170533336820">"Zvok"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_content_description_end_call">Končaj klic</string>
+  <string name="incall_content_description_muted">Zvok je izklopljen</string>
+  <string name="incall_content_description_unmuted">Zvok je vklopljen</string>
+  <string name="incall_content_description_swap_calls">Zamenjaj klica</string>
+  <string name="incall_content_description_swap_sim">Zamenjaj kartico SIM</string>
+  <string name="incall_content_description_merge_calls">Združi klice</string>
+  <string name="incall_content_description_earpiece">Slušalka</string>
+  <string name="incall_content_description_speaker">Zvočnik</string>
+  <string name="incall_content_description_bluetooth">Bluetooth</string>
+  <string name="incall_content_description_headset">Žične slušalke</string>
+  <string name="incall_content_description_hold">Zadrži klic</string>
+  <string name="incall_content_description_unhold">Nadaljuj klic</string>
+  <string name="incall_content_description_video_on">Vklopi video</string>
+  <string name="incall_content_description_video_off">Izklopi video</string>
+  <string name="incall_content_description_swap_video">Zamenjaj video</string>
+  <string name="incall_label_speaker">Zvočnik</string>
+  <string name="incall_label_audio">Zvok</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-sq/strings.xml b/java/com/android/incallui/commontheme/res/values-sq/strings.xml
index b9c97d1..6b0f4aa 100644
--- a/java/com/android/incallui/commontheme/res/values-sq/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-sq/strings.xml
@@ -1,36 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_content_description_end_call" msgid="8232796487777787200">"Mbylle telefonatën"</string>
-    <string name="incall_content_description_muted" msgid="2130133443150389474">"Zëri i çaktivizuar"</string>
-    <string name="incall_content_description_unmuted" msgid="4023577547526525202">"Heqja e zërit u anulua"</string>
-    <string name="incall_content_description_swap_calls" msgid="5233257839262161417">"Shkëmbe telefonata"</string>
-    <string name="incall_content_description_merge_calls" msgid="5198778837993669729">"Shkri telefonatat"</string>
-    <string name="incall_content_description_earpiece" msgid="2786221842272370555">"Kufje"</string>
-    <string name="incall_content_description_speaker" msgid="7837829930201265549">"Altoparlant"</string>
-    <string name="incall_content_description_bluetooth" msgid="6988919010980910001">"Bluetooth-i"</string>
-    <string name="incall_content_description_headset" msgid="3170439802944346719">"Kufje me tel"</string>
-    <string name="incall_content_description_hold" msgid="3335508251734906019">"Vendos në pritje telefonatën"</string>
-    <string name="incall_content_description_unhold" msgid="3862584118869933593">"Rifillo telefonatën"</string>
-    <string name="incall_content_description_video_on" msgid="899266487647420613">"Videoja aktive"</string>
-    <string name="incall_content_description_video_off" msgid="762985912616707076">"Videoja joaktive"</string>
-    <string name="incall_content_description_swap_video" msgid="297943299827908998">"Shkëmbe video"</string>
-    <string name="incall_label_speaker" msgid="1814254833253409394">"Altoparlanti"</string>
-    <string name="incall_label_audio" msgid="5923781170533336820">"Tingulli"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_content_description_end_call">Mbylle telefonatën</string>
+  <string name="incall_content_description_muted">Zëri i çaktivizuar</string>
+  <string name="incall_content_description_unmuted">Heqja e zërit u anulua</string>
+  <string name="incall_content_description_swap_calls">Shkëmbe telefonata</string>
+  <string name="incall_content_description_swap_sim">Ndrysho kartën SIM</string>
+  <string name="incall_content_description_merge_calls">Shkri telefonatat</string>
+  <string name="incall_content_description_earpiece">Kufje</string>
+  <string name="incall_content_description_speaker">Altoparlant</string>
+  <string name="incall_content_description_bluetooth">Bluetooth-i</string>
+  <string name="incall_content_description_headset">Kufje me tel</string>
+  <string name="incall_content_description_hold">Vendos në pritje telefonatën</string>
+  <string name="incall_content_description_unhold">Rifillo telefonatën</string>
+  <string name="incall_content_description_video_on">Videoja aktive</string>
+  <string name="incall_content_description_video_off">Videoja joaktive</string>
+  <string name="incall_content_description_swap_video">Shkëmbe video</string>
+  <string name="incall_label_speaker">Altoparlanti</string>
+  <string name="incall_label_audio">Tingulli</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-sr/strings.xml b/java/com/android/incallui/commontheme/res/values-sr/strings.xml
index 67586b7..d2722d8 100644
--- a/java/com/android/incallui/commontheme/res/values-sr/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-sr/strings.xml
@@ -1,36 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_content_description_end_call" msgid="8232796487777787200">"Заврши позив"</string>
-    <string name="incall_content_description_muted" msgid="2130133443150389474">"Звук је искључен"</string>
-    <string name="incall_content_description_unmuted" msgid="4023577547526525202">"Звук је укључен"</string>
-    <string name="incall_content_description_swap_calls" msgid="5233257839262161417">"Замени позиве"</string>
-    <string name="incall_content_description_merge_calls" msgid="5198778837993669729">"Обједини позиве"</string>
-    <string name="incall_content_description_earpiece" msgid="2786221842272370555">"Слушалица телефона"</string>
-    <string name="incall_content_description_speaker" msgid="7837829930201265549">"Звучник"</string>
-    <string name="incall_content_description_bluetooth" msgid="6988919010980910001">"Bluetooth"</string>
-    <string name="incall_content_description_headset" msgid="3170439802944346719">"Жичане слушалице"</string>
-    <string name="incall_content_description_hold" msgid="3335508251734906019">"Стави позив на чекање"</string>
-    <string name="incall_content_description_unhold" msgid="3862584118869933593">"Настави позив"</string>
-    <string name="incall_content_description_video_on" msgid="899266487647420613">"Укључи видео"</string>
-    <string name="incall_content_description_video_off" msgid="762985912616707076">"Искључи видео"</string>
-    <string name="incall_content_description_swap_video" msgid="297943299827908998">"Замени видео"</string>
-    <string name="incall_label_speaker" msgid="1814254833253409394">"Звучник"</string>
-    <string name="incall_label_audio" msgid="5923781170533336820">"Звук"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_content_description_end_call">Заврши позив</string>
+  <string name="incall_content_description_muted">Звук је искључен</string>
+  <string name="incall_content_description_unmuted">Звук је укључен</string>
+  <string name="incall_content_description_swap_calls">Замени позиве</string>
+  <string name="incall_content_description_swap_sim">Промените SIM</string>
+  <string name="incall_content_description_merge_calls">Обједини позиве</string>
+  <string name="incall_content_description_earpiece">Слушалица телефона</string>
+  <string name="incall_content_description_speaker">Звучник</string>
+  <string name="incall_content_description_bluetooth">Bluetooth</string>
+  <string name="incall_content_description_headset">Жичане слушалице</string>
+  <string name="incall_content_description_hold">Стави позив на чекање</string>
+  <string name="incall_content_description_unhold">Настави позив</string>
+  <string name="incall_content_description_video_on">Укључи видео</string>
+  <string name="incall_content_description_video_off">Искључи видео</string>
+  <string name="incall_content_description_swap_video">Замени видео</string>
+  <string name="incall_label_speaker">Звучник</string>
+  <string name="incall_label_audio">Звук</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-sv/strings.xml b/java/com/android/incallui/commontheme/res/values-sv/strings.xml
index 957a2f8..b06a88c 100644
--- a/java/com/android/incallui/commontheme/res/values-sv/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-sv/strings.xml
@@ -1,36 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_content_description_end_call" msgid="8232796487777787200">"Avsluta samtal"</string>
-    <string name="incall_content_description_muted" msgid="2130133443150389474">"Ljud av"</string>
-    <string name="incall_content_description_unmuted" msgid="4023577547526525202">"Ljud på"</string>
-    <string name="incall_content_description_swap_calls" msgid="5233257839262161417">"Byt samtal"</string>
-    <string name="incall_content_description_merge_calls" msgid="5198778837993669729">"Koppla ihop samtal"</string>
-    <string name="incall_content_description_earpiece" msgid="2786221842272370555">"Telefonlur"</string>
-    <string name="incall_content_description_speaker" msgid="7837829930201265549">"Högtalare"</string>
-    <string name="incall_content_description_bluetooth" msgid="6988919010980910001">"Bluetooth"</string>
-    <string name="incall_content_description_headset" msgid="3170439802944346719">"Trådanslutet headset"</string>
-    <string name="incall_content_description_hold" msgid="3335508251734906019">"Parkera samtal"</string>
-    <string name="incall_content_description_unhold" msgid="3862584118869933593">"Återuppta samtal"</string>
-    <string name="incall_content_description_video_on" msgid="899266487647420613">"Video på"</string>
-    <string name="incall_content_description_video_off" msgid="762985912616707076">"Video av"</string>
-    <string name="incall_content_description_swap_video" msgid="297943299827908998">"Byt video"</string>
-    <string name="incall_label_speaker" msgid="1814254833253409394">"Högtalare"</string>
-    <string name="incall_label_audio" msgid="5923781170533336820">"Ljud"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_content_description_end_call">Avsluta samtal</string>
+  <string name="incall_content_description_muted">Ljud av</string>
+  <string name="incall_content_description_unmuted">Ljud på</string>
+  <string name="incall_content_description_swap_calls">Byt samtal</string>
+  <string name="incall_content_description_swap_sim">Ändra SIM</string>
+  <string name="incall_content_description_merge_calls">Koppla ihop samtal</string>
+  <string name="incall_content_description_earpiece">Telefonlur</string>
+  <string name="incall_content_description_speaker">Högtalare</string>
+  <string name="incall_content_description_bluetooth">Bluetooth</string>
+  <string name="incall_content_description_headset">Trådanslutet headset</string>
+  <string name="incall_content_description_hold">Parkera samtal</string>
+  <string name="incall_content_description_unhold">Återuppta samtal</string>
+  <string name="incall_content_description_video_on">Video på</string>
+  <string name="incall_content_description_video_off">Video av</string>
+  <string name="incall_content_description_swap_video">Byt video</string>
+  <string name="incall_label_speaker">Högtalare</string>
+  <string name="incall_label_audio">Ljud</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-sw/strings.xml b/java/com/android/incallui/commontheme/res/values-sw/strings.xml
index 8752c2d..4ec4a9f 100644
--- a/java/com/android/incallui/commontheme/res/values-sw/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-sw/strings.xml
@@ -1,36 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_content_description_end_call" msgid="8232796487777787200">"Kata simu"</string>
-    <string name="incall_content_description_muted" msgid="2130133443150389474">"Maikrofoni imezimwa"</string>
-    <string name="incall_content_description_unmuted" msgid="4023577547526525202">"Sauti imerejeshwa"</string>
-    <string name="incall_content_description_swap_calls" msgid="5233257839262161417">"Badilisha simu"</string>
-    <string name="incall_content_description_merge_calls" msgid="5198778837993669729">"Unganisha simu"</string>
-    <string name="incall_content_description_earpiece" msgid="2786221842272370555">"Spika ya simu"</string>
-    <string name="incall_content_description_speaker" msgid="7837829930201265549">"Spika"</string>
-    <string name="incall_content_description_bluetooth" msgid="6988919010980910001">"Bluetooth"</string>
-    <string name="incall_content_description_headset" msgid="3170439802944346719">"Vifaa vya sauti vyenye waya"</string>
-    <string name="incall_content_description_hold" msgid="3335508251734906019">"Sitisha simu"</string>
-    <string name="incall_content_description_unhold" msgid="3862584118869933593">"Endelea na simu"</string>
-    <string name="incall_content_description_video_on" msgid="899266487647420613">"Washa video"</string>
-    <string name="incall_content_description_video_off" msgid="762985912616707076">"Zima video"</string>
-    <string name="incall_content_description_swap_video" msgid="297943299827908998">"Badilisha video"</string>
-    <string name="incall_label_speaker" msgid="1814254833253409394">"Spika"</string>
-    <string name="incall_label_audio" msgid="5923781170533336820">"Sauti"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_content_description_end_call">Kata simu</string>
+  <string name="incall_content_description_muted">Maikrofoni imezimwa</string>
+  <string name="incall_content_description_unmuted">Sauti imerejeshwa</string>
+  <string name="incall_content_description_swap_calls">Badilisha simu</string>
+  <string name="incall_content_description_swap_sim">Badilisha SIM</string>
+  <string name="incall_content_description_merge_calls">Unganisha simu</string>
+  <string name="incall_content_description_earpiece">Spika ya simu</string>
+  <string name="incall_content_description_speaker">Spika</string>
+  <string name="incall_content_description_bluetooth">Bluetooth</string>
+  <string name="incall_content_description_headset">Vifaa vya sauti vyenye waya</string>
+  <string name="incall_content_description_hold">Sitisha simu</string>
+  <string name="incall_content_description_unhold">Endelea na simu</string>
+  <string name="incall_content_description_video_on">Washa video</string>
+  <string name="incall_content_description_video_off">Zima video</string>
+  <string name="incall_content_description_swap_video">Badilisha video</string>
+  <string name="incall_label_speaker">Spika</string>
+  <string name="incall_label_audio">Sauti</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-ta/strings.xml b/java/com/android/incallui/commontheme/res/values-ta/strings.xml
index 69258d2..34a66fb 100644
--- a/java/com/android/incallui/commontheme/res/values-ta/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-ta/strings.xml
@@ -1,36 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_content_description_end_call" msgid="8232796487777787200">"அழைப்பைத் துண்டிக்கும்"</string>
-    <string name="incall_content_description_muted" msgid="2130133443150389474">"ஒலியடக்கப்பட்டது"</string>
-    <string name="incall_content_description_unmuted" msgid="4023577547526525202">"ஒலி இயக்கப்பட்டது"</string>
-    <string name="incall_content_description_swap_calls" msgid="5233257839262161417">"அழைப்புகளை மாற்றும்"</string>
-    <string name="incall_content_description_merge_calls" msgid="5198778837993669729">"அழைப்புகளை இணைக்கும்"</string>
-    <string name="incall_content_description_earpiece" msgid="2786221842272370555">"ஹேண்ட்செட் இயர்பீஸ்"</string>
-    <string name="incall_content_description_speaker" msgid="7837829930201265549">"ஸ்பீக்கர்"</string>
-    <string name="incall_content_description_bluetooth" msgid="6988919010980910001">"புளூடூத்"</string>
-    <string name="incall_content_description_headset" msgid="3170439802944346719">"வயருடன்கூடிய ஹெட்செட்"</string>
-    <string name="incall_content_description_hold" msgid="3335508251734906019">"அழைப்பை ஹோல்டில் வைக்கும்"</string>
-    <string name="incall_content_description_unhold" msgid="3862584118869933593">"அழைப்பை மீண்டும் தொடங்கும்"</string>
-    <string name="incall_content_description_video_on" msgid="899266487647420613">"வீடியோ இயக்கப்பட்டது"</string>
-    <string name="incall_content_description_video_off" msgid="762985912616707076">"வீடியோ முடக்கப்பட்டது"</string>
-    <string name="incall_content_description_swap_video" msgid="297943299827908998">"வீடியோவிற்கு மாற்றும்"</string>
-    <string name="incall_label_speaker" msgid="1814254833253409394">"ஸ்பீக்கர்"</string>
-    <string name="incall_label_audio" msgid="5923781170533336820">"ஒலி"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_content_description_end_call">அழைப்பைத் துண்டிக்கும்</string>
+  <string name="incall_content_description_muted">ஒலியடக்கப்பட்டது</string>
+  <string name="incall_content_description_unmuted">ஒலி இயக்கப்பட்டது</string>
+  <string name="incall_content_description_swap_calls">அழைப்புகளை மாற்றும்</string>
+  <string name="incall_content_description_swap_sim">சிம்மை மாற்றும்</string>
+  <string name="incall_content_description_merge_calls">அழைப்புகளை இணைக்கும்</string>
+  <string name="incall_content_description_earpiece">ஹேண்ட்செட் இயர்பீஸ்</string>
+  <string name="incall_content_description_speaker">ஸ்பீக்கர்</string>
+  <string name="incall_content_description_bluetooth">புளூடூத்</string>
+  <string name="incall_content_description_headset">வயருடன்கூடிய ஹெட்செட்</string>
+  <string name="incall_content_description_hold">அழைப்பை ஹோல்டில் வைக்கும்</string>
+  <string name="incall_content_description_unhold">அழைப்பை மீண்டும் தொடங்கும்</string>
+  <string name="incall_content_description_video_on">வீடியோ இயக்கப்பட்டது</string>
+  <string name="incall_content_description_video_off">வீடியோ முடக்கப்பட்டது</string>
+  <string name="incall_content_description_swap_video">வீடியோவிற்கு மாற்றும்</string>
+  <string name="incall_label_speaker">ஸ்பீக்கர்</string>
+  <string name="incall_label_audio">ஒலி</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-te/strings.xml b/java/com/android/incallui/commontheme/res/values-te/strings.xml
index 9454e15..0f63fd9 100644
--- a/java/com/android/incallui/commontheme/res/values-te/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-te/strings.xml
@@ -1,36 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_content_description_end_call" msgid="8232796487777787200">"కాల్‌ను ముగిస్తుంది"</string>
-    <string name="incall_content_description_muted" msgid="2130133443150389474">"మ్యూట్ చేయబడింది"</string>
-    <string name="incall_content_description_unmuted" msgid="4023577547526525202">"అన్‌మ్యూట్ చేయబడింది"</string>
-    <string name="incall_content_description_swap_calls" msgid="5233257839262161417">"కాల్‌లను మారుస్తుంది"</string>
-    <string name="incall_content_description_merge_calls" msgid="5198778837993669729">"కాల్‌లను విలీనం చేస్తుంది"</string>
-    <string name="incall_content_description_earpiece" msgid="2786221842272370555">"హ్యాండ్‌సెట్ ఇయర్‌పీస్"</string>
-    <string name="incall_content_description_speaker" msgid="7837829930201265549">"స్పీకర్"</string>
-    <string name="incall_content_description_bluetooth" msgid="6988919010980910001">"బ్లూటూత్"</string>
-    <string name="incall_content_description_headset" msgid="3170439802944346719">"వైర్ గల హెడ్‌సెట్"</string>
-    <string name="incall_content_description_hold" msgid="3335508251734906019">"కాల్‌ను హోల్డ్ చేయి"</string>
-    <string name="incall_content_description_unhold" msgid="3862584118869933593">"కాల్‌ను పునఃప్రారంభించు"</string>
-    <string name="incall_content_description_video_on" msgid="899266487647420613">"వీడియో ఆన్‌లో ఉంది"</string>
-    <string name="incall_content_description_video_off" msgid="762985912616707076">"వీడియో ఆఫ్‌లో ఉంది"</string>
-    <string name="incall_content_description_swap_video" msgid="297943299827908998">"వీడియోను మారుస్తుంది"</string>
-    <string name="incall_label_speaker" msgid="1814254833253409394">"స్పీకర్"</string>
-    <string name="incall_label_audio" msgid="5923781170533336820">"ధ్వని"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_content_description_end_call">కాల్‌ను ముగిస్తుంది</string>
+  <string name="incall_content_description_muted">మ్యూట్ చేయబడింది</string>
+  <string name="incall_content_description_unmuted">అన్‌మ్యూట్ చేయబడింది</string>
+  <string name="incall_content_description_swap_calls">కాల్‌లను మారుస్తుంది</string>
+  <string name="incall_content_description_swap_sim">SIMని మార్చు</string>
+  <string name="incall_content_description_merge_calls">కాల్‌లను విలీనం చేస్తుంది</string>
+  <string name="incall_content_description_earpiece">హ్యాండ్‌సెట్ ఇయర్‌పీస్</string>
+  <string name="incall_content_description_speaker">స్పీకర్</string>
+  <string name="incall_content_description_bluetooth">బ్లూటూత్</string>
+  <string name="incall_content_description_headset">వైర్ గల హెడ్‌సెట్</string>
+  <string name="incall_content_description_hold">కాల్‌ను హోల్డ్ చేయి</string>
+  <string name="incall_content_description_unhold">కాల్‌ను పునఃప్రారంభించు</string>
+  <string name="incall_content_description_video_on">వీడియో ఆన్‌లో ఉంది</string>
+  <string name="incall_content_description_video_off">వీడియో ఆఫ్‌లో ఉంది</string>
+  <string name="incall_content_description_swap_video">వీడియోను మారుస్తుంది</string>
+  <string name="incall_label_speaker">స్పీకర్</string>
+  <string name="incall_label_audio">ధ్వని</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-th/strings.xml b/java/com/android/incallui/commontheme/res/values-th/strings.xml
index 8235310..c30f586 100644
--- a/java/com/android/incallui/commontheme/res/values-th/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-th/strings.xml
@@ -1,36 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_content_description_end_call" msgid="8232796487777787200">"วางสาย"</string>
-    <string name="incall_content_description_muted" msgid="2130133443150389474">"ปิดเสียงแล้ว"</string>
-    <string name="incall_content_description_unmuted" msgid="4023577547526525202">"เปิดเสียงแล้ว"</string>
-    <string name="incall_content_description_swap_calls" msgid="5233257839262161417">"สลับสาย"</string>
-    <string name="incall_content_description_merge_calls" msgid="5198778837993669729">"รวมสาย"</string>
-    <string name="incall_content_description_earpiece" msgid="2786221842272370555">"ชุดหูฟังโทรศัพท์"</string>
-    <string name="incall_content_description_speaker" msgid="7837829930201265549">"ลำโพง"</string>
-    <string name="incall_content_description_bluetooth" msgid="6988919010980910001">"บลูทูธ"</string>
-    <string name="incall_content_description_headset" msgid="3170439802944346719">"ชุดหูฟังแบบมีสาย"</string>
-    <string name="incall_content_description_hold" msgid="3335508251734906019">"พักสาย"</string>
-    <string name="incall_content_description_unhold" msgid="3862584118869933593">"โทรต่อ"</string>
-    <string name="incall_content_description_video_on" msgid="899266487647420613">"เปิดวิดีโอ"</string>
-    <string name="incall_content_description_video_off" msgid="762985912616707076">"ปิดวิดีโอ"</string>
-    <string name="incall_content_description_swap_video" msgid="297943299827908998">"สลับวิดีโอ"</string>
-    <string name="incall_label_speaker" msgid="1814254833253409394">"ลำโพง"</string>
-    <string name="incall_label_audio" msgid="5923781170533336820">"เสียง"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_content_description_end_call">วางสาย</string>
+  <string name="incall_content_description_muted">ปิดเสียงแล้ว</string>
+  <string name="incall_content_description_unmuted">เปิดเสียงแล้ว</string>
+  <string name="incall_content_description_swap_calls">สลับสาย</string>
+  <string name="incall_content_description_swap_sim">เปลี่ยนซิม</string>
+  <string name="incall_content_description_merge_calls">รวมสาย</string>
+  <string name="incall_content_description_earpiece">ชุดหูฟังโทรศัพท์</string>
+  <string name="incall_content_description_speaker">ลำโพง</string>
+  <string name="incall_content_description_bluetooth">บลูทูธ</string>
+  <string name="incall_content_description_headset">ชุดหูฟังแบบมีสาย</string>
+  <string name="incall_content_description_hold">พักสาย</string>
+  <string name="incall_content_description_unhold">โทรต่อ</string>
+  <string name="incall_content_description_video_on">เปิดวิดีโอ</string>
+  <string name="incall_content_description_video_off">ปิดวิดีโอ</string>
+  <string name="incall_content_description_swap_video">สลับวิดีโอ</string>
+  <string name="incall_label_speaker">ลำโพง</string>
+  <string name="incall_label_audio">เสียง</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-tl/strings.xml b/java/com/android/incallui/commontheme/res/values-tl/strings.xml
index f368e3a..d91e26f 100644
--- a/java/com/android/incallui/commontheme/res/values-tl/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-tl/strings.xml
@@ -1,36 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_content_description_end_call" msgid="8232796487777787200">"Tapusin ang tawag"</string>
-    <string name="incall_content_description_muted" msgid="2130133443150389474">"Naka-mute"</string>
-    <string name="incall_content_description_unmuted" msgid="4023577547526525202">"Alisin sa pagkaka-mute"</string>
-    <string name="incall_content_description_swap_calls" msgid="5233257839262161417">"Pagpalitin ang mga tawag"</string>
-    <string name="incall_content_description_merge_calls" msgid="5198778837993669729">"I-merge ang mga tawag"</string>
-    <string name="incall_content_description_earpiece" msgid="2786221842272370555">"Handset na earpiece"</string>
-    <string name="incall_content_description_speaker" msgid="7837829930201265549">"Speaker"</string>
-    <string name="incall_content_description_bluetooth" msgid="6988919010980910001">"Bluetooth"</string>
-    <string name="incall_content_description_headset" msgid="3170439802944346719">"Wired na headset"</string>
-    <string name="incall_content_description_hold" msgid="3335508251734906019">"I-hold ang tawag"</string>
-    <string name="incall_content_description_unhold" msgid="3862584118869933593">"Ituloy ang tawag"</string>
-    <string name="incall_content_description_video_on" msgid="899266487647420613">"Naka-on ang video"</string>
-    <string name="incall_content_description_video_off" msgid="762985912616707076">"Naka-off ang video"</string>
-    <string name="incall_content_description_swap_video" msgid="297943299827908998">"Pagpalitin ang video"</string>
-    <string name="incall_label_speaker" msgid="1814254833253409394">"Speaker"</string>
-    <string name="incall_label_audio" msgid="5923781170533336820">"Tunog"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_content_description_end_call">Tapusin ang tawag</string>
+  <string name="incall_content_description_muted">Naka-mute</string>
+  <string name="incall_content_description_unmuted">Na-unmute</string>
+  <string name="incall_content_description_swap_calls">Pagpalitin ang mga tawag</string>
+  <string name="incall_content_description_swap_sim">Baguhin ang SIM</string>
+  <string name="incall_content_description_merge_calls">I-merge ang mga tawag</string>
+  <string name="incall_content_description_earpiece">Handset na earpiece</string>
+  <string name="incall_content_description_speaker">Speaker</string>
+  <string name="incall_content_description_bluetooth">Bluetooth</string>
+  <string name="incall_content_description_headset">Wired na headset</string>
+  <string name="incall_content_description_hold">I-hold ang tawag</string>
+  <string name="incall_content_description_unhold">Ituloy ang tawag</string>
+  <string name="incall_content_description_video_on">Naka-on ang video</string>
+  <string name="incall_content_description_video_off">Naka-off ang video</string>
+  <string name="incall_content_description_swap_video">Pagpalitin ang video</string>
+  <string name="incall_label_speaker">Speaker</string>
+  <string name="incall_label_audio">Tunog</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-tr/strings.xml b/java/com/android/incallui/commontheme/res/values-tr/strings.xml
index cbf5502..ee65ed0 100644
--- a/java/com/android/incallui/commontheme/res/values-tr/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-tr/strings.xml
@@ -1,36 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_content_description_end_call" msgid="8232796487777787200">"Çağrıyı sonlandırın"</string>
-    <string name="incall_content_description_muted" msgid="2130133443150389474">"Ses kapatıldı"</string>
-    <string name="incall_content_description_unmuted" msgid="4023577547526525202">"Ses açıldı"</string>
-    <string name="incall_content_description_swap_calls" msgid="5233257839262161417">"Çağrılar arasında geçiş yapın"</string>
-    <string name="incall_content_description_merge_calls" msgid="5198778837993669729">"Çağrıları birleştirin"</string>
-    <string name="incall_content_description_earpiece" msgid="2786221842272370555">"Mobil cihaz kulaklığı"</string>
-    <string name="incall_content_description_speaker" msgid="7837829930201265549">"Hoparlör"</string>
-    <string name="incall_content_description_bluetooth" msgid="6988919010980910001">"Bluetooth"</string>
-    <string name="incall_content_description_headset" msgid="3170439802944346719">"Kablolu mikrofonlu kulaklık"</string>
-    <string name="incall_content_description_hold" msgid="3335508251734906019">"Çağrıyı beklet"</string>
-    <string name="incall_content_description_unhold" msgid="3862584118869933593">"Çağrıyı devam ettir"</string>
-    <string name="incall_content_description_video_on" msgid="899266487647420613">"Video açık"</string>
-    <string name="incall_content_description_video_off" msgid="762985912616707076">"Video kapalı"</string>
-    <string name="incall_content_description_swap_video" msgid="297943299827908998">"Videoyu değiştirin"</string>
-    <string name="incall_label_speaker" msgid="1814254833253409394">"Hoparlör"</string>
-    <string name="incall_label_audio" msgid="5923781170533336820">"Ses"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_content_description_end_call">Çağrıyı sonlandırın</string>
+  <string name="incall_content_description_muted">Ses kapatıldı</string>
+  <string name="incall_content_description_unmuted">Ses açıldı</string>
+  <string name="incall_content_description_swap_calls">Çağrılar arasında geçiş yapın</string>
+  <string name="incall_content_description_swap_sim">SIM\'i değiştirin</string>
+  <string name="incall_content_description_merge_calls">Çağrıları birleştirin</string>
+  <string name="incall_content_description_earpiece">Mobil cihaz kulaklığı</string>
+  <string name="incall_content_description_speaker">Hoparlör</string>
+  <string name="incall_content_description_bluetooth">Bluetooth</string>
+  <string name="incall_content_description_headset">Kablolu mikrofonlu kulaklık</string>
+  <string name="incall_content_description_hold">Çağrıyı beklet</string>
+  <string name="incall_content_description_unhold">Çağrıyı devam ettir</string>
+  <string name="incall_content_description_video_on">Video açık</string>
+  <string name="incall_content_description_video_off">Video kapalı</string>
+  <string name="incall_content_description_swap_video">Videoyu değiştirin</string>
+  <string name="incall_label_speaker">Hoparlör</string>
+  <string name="incall_label_audio">Ses</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-uk/strings.xml b/java/com/android/incallui/commontheme/res/values-uk/strings.xml
index 2bcd04c..3335750 100644
--- a/java/com/android/incallui/commontheme/res/values-uk/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-uk/strings.xml
@@ -1,36 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_content_description_end_call" msgid="8232796487777787200">"Завершити виклик"</string>
-    <string name="incall_content_description_muted" msgid="2130133443150389474">"Ігноруються"</string>
-    <string name="incall_content_description_unmuted" msgid="4023577547526525202">"Увімкнено звук"</string>
-    <string name="incall_content_description_swap_calls" msgid="5233257839262161417">"Поміняти виклики"</string>
-    <string name="incall_content_description_merge_calls" msgid="5198778837993669729">"Об’єднати виклики"</string>
-    <string name="incall_content_description_earpiece" msgid="2786221842272370555">"Динамік гарнітури"</string>
-    <string name="incall_content_description_speaker" msgid="7837829930201265549">"Динамік"</string>
-    <string name="incall_content_description_bluetooth" msgid="6988919010980910001">"Bluetooth"</string>
-    <string name="incall_content_description_headset" msgid="3170439802944346719">"Дротова гарнітура"</string>
-    <string name="incall_content_description_hold" msgid="3335508251734906019">"Утримувати виклик"</string>
-    <string name="incall_content_description_unhold" msgid="3862584118869933593">"Відновити виклик"</string>
-    <string name="incall_content_description_video_on" msgid="899266487647420613">"Відео ввімкнено"</string>
-    <string name="incall_content_description_video_off" msgid="762985912616707076">"Відео вимкнено"</string>
-    <string name="incall_content_description_swap_video" msgid="297943299827908998">"Поміняти відео"</string>
-    <string name="incall_label_speaker" msgid="1814254833253409394">"Динамік"</string>
-    <string name="incall_label_audio" msgid="5923781170533336820">"Звук"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_content_description_end_call">Завершити виклик</string>
+  <string name="incall_content_description_muted">Ігноруються</string>
+  <string name="incall_content_description_unmuted">Увімкнено звук</string>
+  <string name="incall_content_description_swap_calls">Поміняти виклики</string>
+  <string name="incall_content_description_swap_sim">Змінити SIM-карту</string>
+  <string name="incall_content_description_merge_calls">Об’єднати виклики</string>
+  <string name="incall_content_description_earpiece">Динамік гарнітури</string>
+  <string name="incall_content_description_speaker">Динамік</string>
+  <string name="incall_content_description_bluetooth">Bluetooth</string>
+  <string name="incall_content_description_headset">Дротова гарнітура</string>
+  <string name="incall_content_description_hold">Утримувати виклик</string>
+  <string name="incall_content_description_unhold">Відновити виклик</string>
+  <string name="incall_content_description_video_on">Відео ввімкнено</string>
+  <string name="incall_content_description_video_off">Відео вимкнено</string>
+  <string name="incall_content_description_swap_video">Поміняти відео</string>
+  <string name="incall_label_speaker">Динамік</string>
+  <string name="incall_label_audio">Звук</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-ur/strings.xml b/java/com/android/incallui/commontheme/res/values-ur/strings.xml
index bd8cf68..9e0e817 100644
--- a/java/com/android/incallui/commontheme/res/values-ur/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-ur/strings.xml
@@ -1,36 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_content_description_end_call" msgid="8232796487777787200">"کال ختم کریں"</string>
-    <string name="incall_content_description_muted" msgid="2130133443150389474">"‏خاموش کردہ"</string>
-    <string name="incall_content_description_unmuted" msgid="4023577547526525202">"آواز چالو ہو گئی"</string>
-    <string name="incall_content_description_swap_calls" msgid="5233257839262161417">"کالز کا تبادلہ کریں"</string>
-    <string name="incall_content_description_merge_calls" msgid="5198778837993669729">"کالیں ضم کریں"</string>
-    <string name="incall_content_description_earpiece" msgid="2786221842272370555">"ہینڈسیٹ ایئر پیس"</string>
-    <string name="incall_content_description_speaker" msgid="7837829930201265549">"اسپیکر"</string>
-    <string name="incall_content_description_bluetooth" msgid="6988919010980910001">"بلوٹوتھ"</string>
-    <string name="incall_content_description_headset" msgid="3170439802944346719">"تار والا ہیڈسیٹ"</string>
-    <string name="incall_content_description_hold" msgid="3335508251734906019">"کال کو ہولڈ کریں"</string>
-    <string name="incall_content_description_unhold" msgid="3862584118869933593">"کال کو دوبارہ شروع کریں"</string>
-    <string name="incall_content_description_video_on" msgid="899266487647420613">"ویڈیو آن ہے"</string>
-    <string name="incall_content_description_video_off" msgid="762985912616707076">"ویڈیو آف ہے"</string>
-    <string name="incall_content_description_swap_video" msgid="297943299827908998">"ویڈیو کا تبادلہ کریں"</string>
-    <string name="incall_label_speaker" msgid="1814254833253409394">"اسپیکر"</string>
-    <string name="incall_label_audio" msgid="5923781170533336820">"آواز"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_content_description_end_call">کال ختم کریں</string>
+  <string name="incall_content_description_muted">‏خاموش کردہ</string>
+  <string name="incall_content_description_unmuted">آواز چالو ہو گئی</string>
+  <string name="incall_content_description_swap_calls">کالز کا تبادلہ کریں</string>
+  <string name="incall_content_description_swap_sim">‏SIM تبدیل کریں</string>
+  <string name="incall_content_description_merge_calls">کالیں ضم کریں</string>
+  <string name="incall_content_description_earpiece">ہینڈسیٹ ایئر پیس</string>
+  <string name="incall_content_description_speaker">اسپیکر</string>
+  <string name="incall_content_description_bluetooth">بلوٹوتھ</string>
+  <string name="incall_content_description_headset">تار والا ہیڈسیٹ</string>
+  <string name="incall_content_description_hold">کال کو ہولڈ کریں</string>
+  <string name="incall_content_description_unhold">کال کو دوبارہ شروع کریں</string>
+  <string name="incall_content_description_video_on">ویڈیو آن ہے</string>
+  <string name="incall_content_description_video_off">ویڈیو آف ہے</string>
+  <string name="incall_content_description_swap_video">ویڈیو کا تبادلہ کریں</string>
+  <string name="incall_label_speaker">اسپیکر</string>
+  <string name="incall_label_audio">آواز</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-uz/strings.xml b/java/com/android/incallui/commontheme/res/values-uz/strings.xml
index 9bc995d..bc47ad0 100644
--- a/java/com/android/incallui/commontheme/res/values-uz/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-uz/strings.xml
@@ -1,36 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_content_description_end_call" msgid="8232796487777787200">"Qo‘ng‘iroqni tugatish"</string>
-    <string name="incall_content_description_muted" msgid="2130133443150389474">"Mikrofon o‘chirib qo‘yildi"</string>
-    <string name="incall_content_description_unmuted" msgid="4023577547526525202">"Mikrofon yoqildi"</string>
-    <string name="incall_content_description_swap_calls" msgid="5233257839262161417">"Boshqa qo‘ng‘iroqqa o‘tish"</string>
-    <string name="incall_content_description_merge_calls" msgid="5198778837993669729">"Qo‘ng‘iroqlarni birlashtirish"</string>
-    <string name="incall_content_description_earpiece" msgid="2786221842272370555">"Telefon quloq eshitgichi"</string>
-    <string name="incall_content_description_speaker" msgid="7837829930201265549">"Karnay"</string>
-    <string name="incall_content_description_bluetooth" msgid="6988919010980910001">"Bluetooth"</string>
-    <string name="incall_content_description_headset" msgid="3170439802944346719">"Simli garnitura"</string>
-    <string name="incall_content_description_hold" msgid="3335508251734906019">"Qo‘ng‘iroqni kutish rejimiga o‘tkazish"</string>
-    <string name="incall_content_description_unhold" msgid="3862584118869933593">"Qo‘ng‘iroqni davom ettirish"</string>
-    <string name="incall_content_description_video_on" msgid="899266487647420613">"Video yoniq"</string>
-    <string name="incall_content_description_video_off" msgid="762985912616707076">"Video o‘chiq"</string>
-    <string name="incall_content_description_swap_video" msgid="297943299827908998">"Videoni yoqish/ochirish"</string>
-    <string name="incall_label_speaker" msgid="1814254833253409394">"Karnay"</string>
-    <string name="incall_label_audio" msgid="5923781170533336820">"Tovush"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_content_description_end_call">Qo‘ng‘iroqni tugatish</string>
+  <string name="incall_content_description_muted">Mikrofon o‘chirib qo‘yildi</string>
+  <string name="incall_content_description_unmuted">Mikrofon yoqildi</string>
+  <string name="incall_content_description_swap_calls">Boshqa qo‘ng‘iroqqa o‘tish</string>
+  <string name="incall_content_description_swap_sim">SIM kartani o‘zgartirish</string>
+  <string name="incall_content_description_merge_calls">Qo‘ng‘iroqlarni birlashtirish</string>
+  <string name="incall_content_description_earpiece">Telefon quloq eshitgichi</string>
+  <string name="incall_content_description_speaker">Karnay</string>
+  <string name="incall_content_description_bluetooth">Bluetooth</string>
+  <string name="incall_content_description_headset">Simli garnitura</string>
+  <string name="incall_content_description_hold">Qo‘ng‘iroqni kutish rejimiga o‘tkazish</string>
+  <string name="incall_content_description_unhold">Qo‘ng‘iroqni davom ettirish</string>
+  <string name="incall_content_description_video_on">Video yoniq</string>
+  <string name="incall_content_description_video_off">Video o‘chiq</string>
+  <string name="incall_content_description_swap_video">Videoni yoqish/ochirish</string>
+  <string name="incall_label_speaker">Karnay</string>
+  <string name="incall_label_audio">Tovush</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-vi/strings.xml b/java/com/android/incallui/commontheme/res/values-vi/strings.xml
index caf8f34..4969339 100644
--- a/java/com/android/incallui/commontheme/res/values-vi/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-vi/strings.xml
@@ -1,36 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_content_description_end_call" msgid="8232796487777787200">"Kết thúc cuộc gọi"</string>
-    <string name="incall_content_description_muted" msgid="2130133443150389474">"Đã tắt tiếng"</string>
-    <string name="incall_content_description_unmuted" msgid="4023577547526525202">"Đã bật tiếng"</string>
-    <string name="incall_content_description_swap_calls" msgid="5233257839262161417">"Hoán đổi cuộc gọi"</string>
-    <string name="incall_content_description_merge_calls" msgid="5198778837993669729">"Hợp nhất cuộc gọi"</string>
-    <string name="incall_content_description_earpiece" msgid="2786221842272370555">"Tai nghe điện thoại di động"</string>
-    <string name="incall_content_description_speaker" msgid="7837829930201265549">"Loa"</string>
-    <string name="incall_content_description_bluetooth" msgid="6988919010980910001">"Bluetooth"</string>
-    <string name="incall_content_description_headset" msgid="3170439802944346719">"Tai nghe có dây"</string>
-    <string name="incall_content_description_hold" msgid="3335508251734906019">"Giữ cuộc gọi"</string>
-    <string name="incall_content_description_unhold" msgid="3862584118869933593">"Tiếp tục cuộc gọi"</string>
-    <string name="incall_content_description_video_on" msgid="899266487647420613">"Bật video"</string>
-    <string name="incall_content_description_video_off" msgid="762985912616707076">"Tắt video"</string>
-    <string name="incall_content_description_swap_video" msgid="297943299827908998">"Hoán đổi video"</string>
-    <string name="incall_label_speaker" msgid="1814254833253409394">"Loa"</string>
-    <string name="incall_label_audio" msgid="5923781170533336820">"Âm báo"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_content_description_end_call">Kết thúc cuộc gọi</string>
+  <string name="incall_content_description_muted">Đã tắt tiếng</string>
+  <string name="incall_content_description_unmuted">Đã bật tiếng</string>
+  <string name="incall_content_description_swap_calls">Hoán đổi cuộc gọi</string>
+  <string name="incall_content_description_swap_sim">Đổi SIM</string>
+  <string name="incall_content_description_merge_calls">Hợp nhất cuộc gọi</string>
+  <string name="incall_content_description_earpiece">Tai nghe điện thoại di động</string>
+  <string name="incall_content_description_speaker">Loa</string>
+  <string name="incall_content_description_bluetooth">Bluetooth</string>
+  <string name="incall_content_description_headset">Tai nghe có dây</string>
+  <string name="incall_content_description_hold">Giữ cuộc gọi</string>
+  <string name="incall_content_description_unhold">Tiếp tục cuộc gọi</string>
+  <string name="incall_content_description_video_on">Bật video</string>
+  <string name="incall_content_description_video_off">Tắt video</string>
+  <string name="incall_content_description_swap_video">Hoán đổi video</string>
+  <string name="incall_label_speaker">Loa</string>
+  <string name="incall_label_audio">Âm báo</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-zh-rCN/strings.xml b/java/com/android/incallui/commontheme/res/values-zh-rCN/strings.xml
index 4d8bda6..56d7de2 100644
--- a/java/com/android/incallui/commontheme/res/values-zh-rCN/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-zh-rCN/strings.xml
@@ -1,36 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_content_description_end_call" msgid="8232796487777787200">"结束通话"</string>
-    <string name="incall_content_description_muted" msgid="2130133443150389474">"已静音"</string>
-    <string name="incall_content_description_unmuted" msgid="4023577547526525202">"已取消静音"</string>
-    <string name="incall_content_description_swap_calls" msgid="5233257839262161417">"切换通话"</string>
-    <string name="incall_content_description_merge_calls" msgid="5198778837993669729">"合并通话"</string>
-    <string name="incall_content_description_earpiece" msgid="2786221842272370555">"手机听筒"</string>
-    <string name="incall_content_description_speaker" msgid="7837829930201265549">"免提"</string>
-    <string name="incall_content_description_bluetooth" msgid="6988919010980910001">"蓝牙"</string>
-    <string name="incall_content_description_headset" msgid="3170439802944346719">"有线耳机"</string>
-    <string name="incall_content_description_hold" msgid="3335508251734906019">"保持通话"</string>
-    <string name="incall_content_description_unhold" msgid="3862584118869933593">"恢复通话"</string>
-    <string name="incall_content_description_video_on" msgid="899266487647420613">"视频已开启"</string>
-    <string name="incall_content_description_video_off" msgid="762985912616707076">"视频已关闭"</string>
-    <string name="incall_content_description_swap_video" msgid="297943299827908998">"切换视频"</string>
-    <string name="incall_label_speaker" msgid="1814254833253409394">"免提"</string>
-    <string name="incall_label_audio" msgid="5923781170533336820">"音频路径"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_content_description_end_call">结束通话</string>
+  <string name="incall_content_description_muted">已静音</string>
+  <string name="incall_content_description_unmuted">已取消静音</string>
+  <string name="incall_content_description_swap_calls">切换通话</string>
+  <string name="incall_content_description_swap_sim">更改 SIM 卡</string>
+  <string name="incall_content_description_merge_calls">合并通话</string>
+  <string name="incall_content_description_earpiece">手机听筒</string>
+  <string name="incall_content_description_speaker">免提</string>
+  <string name="incall_content_description_bluetooth">蓝牙</string>
+  <string name="incall_content_description_headset">有线耳机</string>
+  <string name="incall_content_description_hold">保持通话</string>
+  <string name="incall_content_description_unhold">恢复通话</string>
+  <string name="incall_content_description_video_on">视频已开启</string>
+  <string name="incall_content_description_video_off">视频已关闭</string>
+  <string name="incall_content_description_swap_video">切换视频</string>
+  <string name="incall_label_speaker">免提</string>
+  <string name="incall_label_audio">音频路径</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-zh-rHK/strings.xml b/java/com/android/incallui/commontheme/res/values-zh-rHK/strings.xml
index 175b3e6..c19c99b 100644
--- a/java/com/android/incallui/commontheme/res/values-zh-rHK/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-zh-rHK/strings.xml
@@ -1,36 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_content_description_end_call" msgid="8232796487777787200">"結束通話"</string>
-    <string name="incall_content_description_muted" msgid="2130133443150389474">"已設為靜音"</string>
-    <string name="incall_content_description_unmuted" msgid="4023577547526525202">"已取消靜音"</string>
-    <string name="incall_content_description_swap_calls" msgid="5233257839262161417">"切換通話"</string>
-    <string name="incall_content_description_merge_calls" msgid="5198778837993669729">"合併通話"</string>
-    <string name="incall_content_description_earpiece" msgid="2786221842272370555">"免提聽筒"</string>
-    <string name="incall_content_description_speaker" msgid="7837829930201265549">"揚聲器"</string>
-    <string name="incall_content_description_bluetooth" msgid="6988919010980910001">"藍牙"</string>
-    <string name="incall_content_description_headset" msgid="3170439802944346719">"有線頭戴式耳機"</string>
-    <string name="incall_content_description_hold" msgid="3335508251734906019">"保留通話"</string>
-    <string name="incall_content_description_unhold" msgid="3862584118869933593">"恢復通話"</string>
-    <string name="incall_content_description_video_on" msgid="899266487647420613">"視像已開啟"</string>
-    <string name="incall_content_description_video_off" msgid="762985912616707076">"視像已關閉"</string>
-    <string name="incall_content_description_swap_video" msgid="297943299827908998">"切換視像"</string>
-    <string name="incall_label_speaker" msgid="1814254833253409394">"喇叭"</string>
-    <string name="incall_label_audio" msgid="5923781170533336820">"音效"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_content_description_end_call">結束通話</string>
+  <string name="incall_content_description_muted">已設為靜音</string>
+  <string name="incall_content_description_unmuted">已取消靜音</string>
+  <string name="incall_content_description_swap_calls">切換通話</string>
+  <string name="incall_content_description_swap_sim">變更 SIM</string>
+  <string name="incall_content_description_merge_calls">合併通話</string>
+  <string name="incall_content_description_earpiece">免提聽筒</string>
+  <string name="incall_content_description_speaker">揚聲器</string>
+  <string name="incall_content_description_bluetooth">藍牙</string>
+  <string name="incall_content_description_headset">有線頭戴式耳機</string>
+  <string name="incall_content_description_hold">保留通話</string>
+  <string name="incall_content_description_unhold">恢復通話</string>
+  <string name="incall_content_description_video_on">視像已開啟</string>
+  <string name="incall_content_description_video_off">視像已關閉</string>
+  <string name="incall_content_description_swap_video">切換視像</string>
+  <string name="incall_label_speaker">喇叭</string>
+  <string name="incall_label_audio">音效</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-zh-rTW/strings.xml b/java/com/android/incallui/commontheme/res/values-zh-rTW/strings.xml
index dee1b9c..6d7ee6d 100644
--- a/java/com/android/incallui/commontheme/res/values-zh-rTW/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-zh-rTW/strings.xml
@@ -1,36 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_content_description_end_call" msgid="8232796487777787200">"結束通話"</string>
-    <string name="incall_content_description_muted" msgid="2130133443150389474">"已設為靜音"</string>
-    <string name="incall_content_description_unmuted" msgid="4023577547526525202">"已取消靜音"</string>
-    <string name="incall_content_description_swap_calls" msgid="5233257839262161417">"切換通話"</string>
-    <string name="incall_content_description_merge_calls" msgid="5198778837993669729">"合併通話"</string>
-    <string name="incall_content_description_earpiece" msgid="2786221842272370555">"手機聽筒"</string>
-    <string name="incall_content_description_speaker" msgid="7837829930201265549">"喇叭"</string>
-    <string name="incall_content_description_bluetooth" msgid="6988919010980910001">"藍牙"</string>
-    <string name="incall_content_description_headset" msgid="3170439802944346719">"有線耳機"</string>
-    <string name="incall_content_description_hold" msgid="3335508251734906019">"保留通話"</string>
-    <string name="incall_content_description_unhold" msgid="3862584118869933593">"恢復通話"</string>
-    <string name="incall_content_description_video_on" msgid="899266487647420613">"開啟視訊畫面"</string>
-    <string name="incall_content_description_video_off" msgid="762985912616707076">"關閉視訊畫面"</string>
-    <string name="incall_content_description_swap_video" msgid="297943299827908998">"切換視訊畫面"</string>
-    <string name="incall_label_speaker" msgid="1814254833253409394">"擴音"</string>
-    <string name="incall_label_audio" msgid="5923781170533336820">"音訊"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_content_description_end_call">結束通話</string>
+  <string name="incall_content_description_muted">已設為靜音</string>
+  <string name="incall_content_description_unmuted">已取消靜音</string>
+  <string name="incall_content_description_swap_calls">切換通話</string>
+  <string name="incall_content_description_swap_sim">變更 SIM 卡</string>
+  <string name="incall_content_description_merge_calls">合併通話</string>
+  <string name="incall_content_description_earpiece">手機聽筒</string>
+  <string name="incall_content_description_speaker">喇叭</string>
+  <string name="incall_content_description_bluetooth">藍牙</string>
+  <string name="incall_content_description_headset">有線耳機</string>
+  <string name="incall_content_description_hold">保留通話</string>
+  <string name="incall_content_description_unhold">恢復通話</string>
+  <string name="incall_content_description_video_on">開啟視訊畫面</string>
+  <string name="incall_content_description_video_off">關閉視訊畫面</string>
+  <string name="incall_content_description_swap_video">切換視訊畫面</string>
+  <string name="incall_label_speaker">擴音</string>
+  <string name="incall_label_audio">音訊</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values-zu/strings.xml b/java/com/android/incallui/commontheme/res/values-zu/strings.xml
index 9535962..d8fee2a 100644
--- a/java/com/android/incallui/commontheme/res/values-zu/strings.xml
+++ b/java/com/android/incallui/commontheme/res/values-zu/strings.xml
@@ -1,36 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_content_description_end_call" msgid="8232796487777787200">"Qeda ikholi"</string>
-    <string name="incall_content_description_muted" msgid="2130133443150389474">"Kuthulisiwe"</string>
-    <string name="incall_content_description_unmuted" msgid="4023577547526525202">"Kususwe ukuthula"</string>
-    <string name="incall_content_description_swap_calls" msgid="5233257839262161417">"Shintsha amakholi"</string>
-    <string name="incall_content_description_merge_calls" msgid="5198778837993669729">"Hlanganisa amakholi"</string>
-    <string name="incall_content_description_earpiece" msgid="2786221842272370555">"Ucezulwendlebe lwe-Handset"</string>
-    <string name="incall_content_description_speaker" msgid="7837829930201265549">"Isipikha"</string>
-    <string name="incall_content_description_bluetooth" msgid="6988919010980910001">"I-Bluetooth"</string>
-    <string name="incall_content_description_headset" msgid="3170439802944346719">"I-headset enezincingo"</string>
-    <string name="incall_content_description_hold" msgid="3335508251734906019">"Bamba ikholi"</string>
-    <string name="incall_content_description_unhold" msgid="3862584118869933593">"Qhubekisa ikholi"</string>
-    <string name="incall_content_description_video_on" msgid="899266487647420613">"Ividiyo ivuliwe"</string>
-    <string name="incall_content_description_video_off" msgid="762985912616707076">"Ividiyo ivaliwe"</string>
-    <string name="incall_content_description_swap_video" msgid="297943299827908998">"Shintsha ividiyo"</string>
-    <string name="incall_label_speaker" msgid="1814254833253409394">"Isipikha"</string>
-    <string name="incall_label_audio" msgid="5923781170533336820">"Umsindo"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_content_description_end_call">Qeda ikholi</string>
+  <string name="incall_content_description_muted">Kuthulisiwe</string>
+  <string name="incall_content_description_unmuted">Kususwe ukuthula</string>
+  <string name="incall_content_description_swap_calls">Shintsha amakholi</string>
+  <string name="incall_content_description_swap_sim">Shintsha i-SIM</string>
+  <string name="incall_content_description_merge_calls">Hlanganisa amakholi</string>
+  <string name="incall_content_description_earpiece">Ucezulwendlebe lwe-Handset</string>
+  <string name="incall_content_description_speaker">Isipikha</string>
+  <string name="incall_content_description_bluetooth">I-Bluetooth</string>
+  <string name="incall_content_description_headset">I-headset enezincingo</string>
+  <string name="incall_content_description_hold">Bamba ikholi</string>
+  <string name="incall_content_description_unhold">Qhubekisa ikholi</string>
+  <string name="incall_content_description_video_on">Ividiyo ivuliwe</string>
+  <string name="incall_content_description_video_off">Ividiyo ivaliwe</string>
+  <string name="incall_content_description_swap_video">Shintsha ividiyo</string>
+  <string name="incall_label_speaker">Isipikha</string>
+  <string name="incall_label_audio">Umsindo</string>
 </resources>
diff --git a/java/com/android/incallui/commontheme/res/values/styles.xml b/java/com/android/incallui/commontheme/res/values/styles.xml
index a979cc3..464eda5 100644
--- a/java/com/android/incallui/commontheme/res/values/styles.xml
+++ b/java/com/android/incallui/commontheme/res/values/styles.xml
@@ -18,18 +18,18 @@
 <resources>
 
   <style name="Dialer.Incall.TextAppearance" parent="android:TextAppearance.Material">
-    <item name="android:textColor">?android:textColorSecondary</item>
+    <item name="android:textColor">?android:attr/textColorSecondary</item>
     <item name="android:textSize">18sp</item>
   </style>
 
   <style name="Dialer.Incall.TextAppearance.Large">
-    <item name="android:textColor">?android:textColorPrimary</item>
+    <item name="android:textColor">?android:attr/textColorPrimary</item>
     <item name="android:textSize">36sp</item>
     <item name="android:fontFamily">sans-serif-light</item>
   </style>
 
   <style name="Dialer.Incall.TextAppearance.Label">
-    <item name="android:textColor">?android:textColorPrimary</item>
+    <item name="android:textColor">?android:attr/textColorPrimary</item>
     <item name="android:textSize">12sp</item>
   </style>
 
@@ -38,7 +38,7 @@
     <item name="android:layout_width">24dp</item>
     <item name="android:layout_marginEnd">8dp</item>
     <item name="android:scaleType">fitCenter</item>
-    <item name="colorControlNormal">?android:textColorSecondary</item>
+    <item name="colorControlNormal">?android:attr/textColorSecondary</item>
   </style>
 
   <style name="Incall.Button.End" parent="android:Widget.Material.Button">
diff --git a/java/com/android/incallui/contactgrid/BottomRow.java b/java/com/android/incallui/contactgrid/BottomRow.java
index dc86d81..767d666 100644
--- a/java/com/android/incallui/contactgrid/BottomRow.java
+++ b/java/com/android/incallui/contactgrid/BottomRow.java
@@ -18,11 +18,8 @@
 
 import android.content.Context;
 import android.support.annotation.Nullable;
-import android.telephony.PhoneNumberUtils;
-import android.text.BidiFormatter;
-import android.text.TextDirectionHeuristics;
 import android.text.TextUtils;
-import com.android.incallui.call.DialerCall.State;
+import com.android.incallui.call.state.DialerCallState;
 import com.android.incallui.incall.protocol.PrimaryCallState;
 import com.android.incallui.incall.protocol.PrimaryInfo;
 
@@ -74,7 +71,7 @@
 
   public static Info getInfo(Context context, PrimaryCallState state, PrimaryInfo primaryInfo) {
     CharSequence label;
-    boolean isTimerVisible = state.state() == State.ACTIVE;
+    boolean isTimerVisible = state.state() == DialerCallState.ACTIVE;
     boolean isForwardIconVisible = state.isForwardedNumber();
     boolean isWorkIconVisible = state.isWorkCall();
     boolean isHdIconVisible = state.isHdAudioCall() && !isForwardIconVisible;
@@ -86,13 +83,13 @@
       label = context.getString(R.string.contact_grid_incoming_suspected_spam);
       isSpamIconVisible = true;
       isHdIconVisible = false;
-    } else if (state.state() == State.DISCONNECTING) {
+    } else if (state.state() == DialerCallState.DISCONNECTING) {
       // While in the DISCONNECTING state we display a "Hanging up" message in order to make the UI
       // feel more responsive.  (In GSM it's normal to see a delay of a couple of seconds while
       // negotiating the disconnect with the network, so the "Hanging up" state at least lets the
       // user know that we're doing something.  This state is currently not used with CDMA.)
       label = context.getString(R.string.incall_hanging_up);
-    } else if (state.state() == State.DISCONNECTED) {
+    } else if (state.state() == DialerCallState.DISCONNECTED) {
       label = state.disconnectCause().getLabel();
       if (TextUtils.isEmpty(label)) {
         label = context.getString(R.string.incall_call_ended);
@@ -118,22 +115,17 @@
       return primaryInfo.location();
     }
     if (!primaryInfo.nameIsNumber() && !TextUtils.isEmpty(primaryInfo.number())) {
-      CharSequence spannedNumber = spanDisplayNumber(primaryInfo.number());
       if (primaryInfo.label() == null) {
-        return spannedNumber;
+        return primaryInfo.number();
       } else {
-        return TextUtils.concat(primaryInfo.label(), " ", spannedNumber);
+        return TextUtils.concat(primaryInfo.label(), " ", primaryInfo.number());
       }
     }
     return null;
   }
 
-  private static CharSequence spanDisplayNumber(String displayNumber) {
-    return PhoneNumberUtils.createTtsSpannable(
-        BidiFormatter.getInstance().unicodeWrap(displayNumber, TextDirectionHeuristics.LTR));
-  }
-
   private static boolean isIncoming(PrimaryCallState state) {
-    return state.state() == State.INCOMING || state.state() == State.CALL_WAITING;
+    return state.state() == DialerCallState.INCOMING
+        || state.state() == DialerCallState.CALL_WAITING;
   }
 }
diff --git a/java/com/android/incallui/contactgrid/ContactGridManager.java b/java/com/android/incallui/contactgrid/ContactGridManager.java
index 327eaf2..189f6fe 100644
--- a/java/com/android/incallui/contactgrid/ContactGridManager.java
+++ b/java/com/android/incallui/contactgrid/ContactGridManager.java
@@ -23,6 +23,8 @@
 import android.support.annotation.Nullable;
 import android.support.v4.view.ViewCompat;
 import android.telephony.PhoneNumberUtils;
+import android.text.BidiFormatter;
+import android.text.TextDirectionHeuristics;
 import android.text.TextUtils;
 import android.view.View;
 import android.view.accessibility.AccessibilityEvent;
@@ -33,8 +35,12 @@
 import android.widget.ViewAnimator;
 import com.android.dialer.common.Assert;
 import com.android.dialer.common.LogUtil;
+import com.android.dialer.configprovider.ConfigProviderComponent;
+import com.android.dialer.glidephotomanager.GlidePhotoManagerComponent;
+import com.android.dialer.glidephotomanager.PhotoInfo;
 import com.android.dialer.lettertile.LetterTileDrawable;
 import com.android.dialer.util.DrawableConverter;
+import com.android.dialer.widget.BidiTextView;
 import com.android.incallui.incall.protocol.ContactPhotoType;
 import com.android.incallui.incall.protocol.PrimaryCallState;
 import com.android.incallui.incall.protocol.PrimaryInfo;
@@ -72,7 +78,7 @@
   private final TextView forwardedNumberView;
   private final ImageView spamIconImageView;
   private final ViewAnimator bottomTextSwitcher;
-  private final TextView bottomTextView;
+  private final BidiTextView bottomTextView;
   private final Chronometer bottomTimerView;
   private final Space topRowSpace;
   private int avatarSize;
@@ -213,7 +219,8 @@
     }
 
     boolean hasPhoto =
-        primaryInfo.photo() != null && primaryInfo.photoType() == ContactPhotoType.CONTACT;
+        (primaryInfo.photo() != null || primaryInfo.photoUri() != null)
+            && primaryInfo.photoType() == ContactPhotoType.CONTACT;
     if (!hasPhoto && !showAnonymousAvatar) {
       avatarImageView.setVisibility(View.GONE);
       return false;
@@ -244,6 +251,10 @@
       statusTextView.setText(info.label);
       statusTextView.setVisibility(View.VISIBLE);
       statusTextView.setSingleLine(info.labelIsSingleLine);
+      // Required to start the marquee
+      // This will send a AccessibilityEvent.TYPE_VIEW_SELECTED, but has no observable effect on
+      // talkback.
+      statusTextView.setSelected(true);
     }
 
     if (info.icon == null) {
@@ -291,36 +302,76 @@
       if (hideAvatar) {
         avatarImageView.setVisibility(View.GONE);
       } else if (avatarSize > 0 && updateAvatarVisibility()) {
-        boolean hasPhoto =
-            primaryInfo.photo() != null && primaryInfo.photoType() == ContactPhotoType.CONTACT;
-        // Contact has a photo, don't render a letter tile.
-        if (hasPhoto) {
-          avatarImageView.setBackground(
-              DrawableConverter.getRoundedDrawable(
-                  context, primaryInfo.photo(), avatarSize, avatarSize));
-          // Contact has a name, that isn't a number.
+        if (ConfigProviderComponent.get(context)
+            .getConfigProvider()
+            .getBoolean("enable_glide_photo", false)) {
+          loadPhotoWithGlide();
         } else {
-          letterTile.setCanonicalDialerLetterTileDetails(
-              primaryInfo.name(),
-              primaryInfo.contactInfoLookupKey(),
-              LetterTileDrawable.SHAPE_CIRCLE,
-              LetterTileDrawable.getContactTypeFromPrimitives(
-                  primaryCallState.isVoiceMailNumber(),
-                  primaryInfo.isSpam(),
-                  primaryCallState.isBusinessNumber(),
-                  primaryInfo.numberPresentation(),
-                  primaryCallState.isConference()));
-          // By invalidating the avatarImageView we force a redraw of the letter tile.
-          // This is required to properly display the updated letter tile iconography based on the
-          // contact type, because the background drawable reference cached in the view, and the
-          // view is not aware of the mutations made to the background.
-          avatarImageView.invalidate();
-          avatarImageView.setBackground(letterTile);
+          loadPhotoWithLegacy();
         }
       }
     }
   }
 
+  private void loadPhotoWithGlide() {
+    PhotoInfo.Builder photoInfoBuilder =
+        PhotoInfo.newBuilder()
+            .setIsBusiness(primaryInfo.photoType() == ContactPhotoType.BUSINESS)
+            .setIsVoicemail(primaryCallState.isVoiceMailNumber())
+            .setIsSpam(primaryInfo.isSpam())
+            .setIsConference(primaryCallState.isConference());
+
+    // Contact has a name, that is a number.
+    if (primaryInfo.nameIsNumber() && primaryInfo.number() != null) {
+      photoInfoBuilder.setName(primaryInfo.number());
+    } else if (primaryInfo.name() != null) {
+      photoInfoBuilder.setName(primaryInfo.name());
+    }
+
+    if (primaryInfo.number() != null) {
+      photoInfoBuilder.setFormattedNumber(primaryInfo.number());
+    }
+
+    if (primaryInfo.photoUri() != null) {
+      photoInfoBuilder.setPhotoUri(primaryInfo.photoUri().toString());
+    }
+
+    if (primaryInfo.contactInfoLookupKey() != null) {
+      photoInfoBuilder.setLookupUri(primaryInfo.contactInfoLookupKey());
+    }
+
+    GlidePhotoManagerComponent.get(context)
+        .glidePhotoManager()
+        .loadContactPhoto(avatarImageView, photoInfoBuilder.build());
+  }
+
+  private void loadPhotoWithLegacy() {
+    boolean hasPhoto =
+        primaryInfo.photo() != null && primaryInfo.photoType() == ContactPhotoType.CONTACT;
+    if (hasPhoto) {
+      avatarImageView.setBackground(
+          DrawableConverter.getRoundedDrawable(
+              context, primaryInfo.photo(), avatarSize, avatarSize));
+    } else {
+      // Contact has a photo, don't render a letter tile.
+      letterTile.setCanonicalDialerLetterTileDetails(
+          primaryInfo.name(),
+          primaryInfo.contactInfoLookupKey(),
+          LetterTileDrawable.SHAPE_CIRCLE,
+          LetterTileDrawable.getContactTypeFromPrimitives(
+              primaryCallState.isVoiceMailNumber(),
+              primaryInfo.isSpam(),
+              primaryCallState.isBusinessNumber(),
+              primaryInfo.numberPresentation(),
+              primaryCallState.isConference()));
+      // By invalidating the avatarImageView we force a redraw of the letter tile.
+      // This is required to properly display the updated letter tile iconography based on the
+      // contact type, because the background drawable reference cached in the view, and the
+      // view is not aware of the mutations made to the background.
+      avatarImageView.invalidate();
+      avatarImageView.setBackground(letterTile);
+    }
+  }
   /**
    * Updates row 2. For example:
    *
@@ -412,7 +463,9 @@
     // This is used for carriers like Project Fi to show the callback number for emergency calls.
     deviceNumberTextView.setText(
         context.getString(
-            R.string.contact_grid_callback_number, primaryCallState.callbackNumber()));
+            R.string.contact_grid_callback_number,
+            BidiFormatter.getInstance()
+                .unicodeWrap(primaryCallState.callbackNumber(), TextDirectionHeuristics.LTR)));
     deviceNumberTextView.setVisibility(View.VISIBLE);
     if (primaryInfo.shouldShowLocation()) {
       deviceNumberDivider.setVisibility(View.VISIBLE);
diff --git a/java/com/android/incallui/contactgrid/TopRow.java b/java/com/android/incallui/contactgrid/TopRow.java
index f551092..d242c3a 100644
--- a/java/com/android/incallui/contactgrid/TopRow.java
+++ b/java/com/android/incallui/contactgrid/TopRow.java
@@ -21,11 +21,15 @@
 import android.support.annotation.Nullable;
 import android.telephony.PhoneNumberUtils;
 import android.text.BidiFormatter;
+import android.text.Spannable;
+import android.text.SpannableString;
+import android.text.Spanned;
 import android.text.TextDirectionHeuristics;
 import android.text.TextUtils;
+import android.text.style.ForegroundColorSpan;
 import com.android.dialer.common.Assert;
 import com.android.dialer.common.LogUtil;
-import com.android.incallui.call.DialerCall.State;
+import com.android.incallui.call.state.DialerCallState;
 import com.android.incallui.incall.protocol.PrimaryCallState;
 import com.android.incallui.incall.protocol.PrimaryInfo;
 import com.android.incallui.videotech.utils.SessionModificationState;
@@ -69,7 +73,8 @@
       icon = context.getDrawable(R.drawable.quantum_ic_network_wifi_vd_theme_24);
     }
 
-    if (state.state() == State.INCOMING || state.state() == State.CALL_WAITING) {
+    if (state.state() == DialerCallState.INCOMING
+        || state.state() == DialerCallState.CALL_WAITING) {
       // Call from
       // [Wi-Fi icon] Video call from
       // Hey Jake, pick up!
@@ -87,18 +92,20 @@
     } else if (VideoUtils.hasSentVideoUpgradeRequest(state.sessionModificationState())
         || VideoUtils.hasReceivedVideoUpgradeRequest(state.sessionModificationState())) {
       label = getLabelForVideoRequest(context, state);
-    } else if (state.state() == State.PULLING) {
+    } else if (state.state() == DialerCallState.PULLING) {
       label = context.getString(R.string.incall_transferring);
-    } else if (state.state() == State.DIALING || state.state() == State.CONNECTING) {
+    } else if (state.state() == DialerCallState.DIALING
+        || state.state() == DialerCallState.CONNECTING) {
       // [Wi-Fi icon] Calling via Google Guest
       // Calling...
       label = getLabelForDialing(context, state);
-    } else if (state.state() == State.ACTIVE && state.isRemotelyHeld()) {
+    } else if (state.state() == DialerCallState.ACTIVE && state.isRemotelyHeld()) {
       label = context.getString(R.string.incall_remotely_held);
-    } else if (state.state() == State.ACTIVE
+    } else if (state.state() == DialerCallState.ACTIVE
         && shouldShowNumber(primaryInfo, false /* isIncoming */)) {
       label = spanDisplayNumber(primaryInfo.number());
-    } else if (state.state() == State.CALL_PENDING && !TextUtils.isEmpty(state.customLabel())) {
+    } else if (state.state() == DialerCallState.CALL_PENDING
+        && !TextUtils.isEmpty(state.customLabel())) {
       label = state.customLabel();
     } else {
       // Video calling...
@@ -138,8 +145,7 @@
     } else if (state.isWifi() && !TextUtils.isEmpty(state.connectionLabel())) {
       return state.connectionLabel();
     } else if (isAccount(state)) {
-      return context.getString(
-          R.string.contact_grid_incoming_via_template, state.connectionLabel());
+      return getColoredConnectionLabel(context, state);
     } else if (state.isWorkCall()) {
       return context.getString(R.string.contact_grid_incoming_work_call);
     } else {
@@ -147,6 +153,22 @@
     }
   }
 
+  private static Spannable getColoredConnectionLabel(Context context, PrimaryCallState state) {
+    Assert.isNotNull(state.connectionLabel());
+    String label =
+        context.getString(R.string.contact_grid_incoming_via_template, state.connectionLabel());
+    Spannable spannable = new SpannableString(label);
+
+    int start = label.indexOf(state.connectionLabel());
+    int end = start + state.connectionLabel().length();
+    spannable.setSpan(
+        new ForegroundColorSpan(state.primaryColor()),
+        start,
+        end,
+        Spanned.SPAN_INCLUSIVE_EXCLUSIVE);
+    return spannable;
+  }
+
   private static CharSequence getLabelForIncomingVideo(
       Context context, @SessionModificationState int sessionModificationState, boolean isWifi) {
     if (sessionModificationState == SessionModificationState.RECEIVED_UPGRADE_TO_VIDEO_REQUEST) {
@@ -166,7 +188,22 @@
 
   private static CharSequence getLabelForDialing(Context context, PrimaryCallState state) {
     if (!TextUtils.isEmpty(state.connectionLabel()) && !state.isWifi()) {
-      return context.getString(R.string.incall_calling_via_template, state.connectionLabel());
+      CharSequence label = getCallingViaLabel(context, state);
+
+      if (state.isAssistedDialed() && state.assistedDialingExtras() != null) {
+        LogUtil.i("TopRow.getLabelForDialing", "using assisted dialing with via label.");
+        String countryCode =
+            String.valueOf(state.assistedDialingExtras().transformedNumberCountryCallingCode());
+        label =
+            TextUtils.concat(
+                label,
+                " • ",
+                context.getString(
+                    R.string.incall_connecting_assited_dialed_component,
+                    countryCode,
+                    state.assistedDialingExtras().userHomeCountryCode()));
+      }
+      return label;
     } else {
       if (state.isVideoCall()) {
         if (state.isWifi()) {
@@ -189,6 +226,22 @@
     }
   }
 
+  private static CharSequence getCallingViaLabel(Context context, PrimaryCallState state) {
+    if (state.simSuggestionReason() != null) {
+      switch (state.simSuggestionReason()) {
+        case FREQUENT:
+          return context.getString(
+              R.string.incall_calling_on_recent_choice_template, state.connectionLabel());
+        case INTRA_CARRIER:
+          return context.getString(
+              R.string.incall_calling_on_same_carrier_template, state.connectionLabel());
+        default:
+          break;
+      }
+    }
+    return context.getString(R.string.incall_calling_via_template, state.connectionLabel());
+  }
+
   private static CharSequence getConnectionLabel(PrimaryCallState state) {
     if (!TextUtils.isEmpty(state.connectionLabel())
         && (isAccount(state) || state.isWifi() || state.isConference())) {
diff --git a/java/com/android/incallui/contactgrid/res/layout/incall_contactgrid_bottom_row.xml b/java/com/android/incallui/contactgrid/res/layout/incall_contactgrid_bottom_row.xml
index ce355ea..73db413 100644
--- a/java/com/android/incallui/contactgrid/res/layout/incall_contactgrid_bottom_row.xml
+++ b/java/com/android/incallui/contactgrid/res/layout/incall_contactgrid_bottom_row.xml
@@ -53,7 +53,7 @@
       android:layout_height="wrap_content"
       android:layout_marginBottom="2dp"
       android:measureAllChildren="false">
-    <TextView
+    <com.android.dialer.widget.BidiTextView
         android:id="@+id/contactgrid_bottom_text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/java/com/android/incallui/contactgrid/res/layout/incall_contactgrid_top_row.xml b/java/com/android/incallui/contactgrid/res/layout/incall_contactgrid_top_row.xml
index 42066f2..2f9ca3e 100644
--- a/java/com/android/incallui/contactgrid/res/layout/incall_contactgrid_top_row.xml
+++ b/java/com/android/incallui/contactgrid/res/layout/incall_contactgrid_top_row.xml
@@ -40,6 +40,8 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:singleLine="true"
+    android:ellipsize="marquee"
+    android:scrollHorizontally="true"
     android:textAppearance="@style/Dialer.Incall.TextAppearance"
     tools:text="Captain Holt"/>
 </LinearLayout>
diff --git a/java/com/android/incallui/contactgrid/res/values-af/strings.xml b/java/com/android/incallui/contactgrid/res/values-af/strings.xml
index 3ec7b04..9681529 100644
--- a/java/com/android/incallui/contactgrid/res/values-af/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-af/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_calling_via_template" msgid="3416867359475780924">"Bel via <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"Bel tans …"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"Dra tans oor ..."</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"Kan nie koppel nie"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"Oproep geweier"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"Oproep het uitgetel"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"Lui af"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"Oproep beëindig"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"Hou aan"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Oproep vanaf"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Werkoproep vanaf"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Inkomend via <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"Verdagte strooiposbeller"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"Terugbelnommer: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">Bel via %s</string>
+  <string name="incall_calling_on_same_carrier_template">Bel tans op dieselfde dinesverskaffer %s</string>
+  <string name="incall_calling_on_recent_choice_template">Bel tans op onlangse keuse %s</string>
+  <string name="incall_connecting">Bel tans …</string>
+  <string name="incall_connecting_assited_dialed">Bel tans deur +%1$s (%2$s) te gebruik …</string>
+  <string name="incall_connecting_assited_dialed_component">Gebruik tans +%1$s (%2$s) …</string>
+  <string name="incall_transferring">Dra tans oor ...</string>
+  <string name="incall_video_call_requesting">Diensverskaffervideo-oproep …</string>
+  <string name="incall_wifi_video_call_requesting">Wi-Fi-diensverskaffervideo-oproep …</string>
+  <string name="incall_video_call_upgrade_request">Skakel oor na diensverskaffervideo …</string>
+  <string name="incall_video_call_request_failed">Kan nie koppel nie</string>
+  <string name="incall_video_call_request_rejected">Oproep geweier</string>
+  <string name="incall_video_call_request_timed_out">Oproep het uitgetel</string>
+  <string name="incall_hanging_up">Lui af</string>
+  <string name="incall_call_ended">Oproep beëindig</string>
+  <string name="incall_remotely_held">Hou aan</string>
+  <string name="contact_grid_incoming_video_call">Diensverskaffervideo-oproep vanaf</string>
+  <string name="contact_grid_incoming_wifi_video_call">Wi-Fi-diensverskaffervideo-oproep vanaf</string>
+  <string name="contact_grid_incoming_voice_call">Oproep vanaf</string>
+  <string name="contact_grid_incoming_work_call">Werkoproep vanaf</string>
+  <string name="contact_grid_incoming_via_template">Inkomend via %s</string>
+  <string name="contact_grid_incoming_suspected_spam">Verdagte strooiposbeller</string>
+  <string name="contact_grid_callback_number">Hierdie foon se nommer: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-am/strings.xml b/java/com/android/incallui/contactgrid/res/values-am/strings.xml
index f4a8ce2..f360878 100644
--- a/java/com/android/incallui/contactgrid/res/values-am/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-am/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_calling_via_template" msgid="3416867359475780924">"በ<xliff:g id="PROVIDER_NAME">%s</xliff:g> በኩል በመደወል ላይ"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"በመደወል ላይ…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"በማስተላለፍ ላይ…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"መገናኘት አልተቻለም"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"ጥሪ ውድቅ ተደርጓል"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"ጥሪው ጊዜ ፈጅቷል"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"በመዝጋት ላይ"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"ጥሪ አብቅቷል"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"ያዝና ቆይ"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"ጥሪ ከ"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"የሥራ ጥሪ ከ"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"በ<xliff:g id="PROVIDER_NAME">%s</xliff:g> በኩል የገባ"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"የተጠረጠረ አይፈለጌ ደዋይ"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"መልሶ መደወያ ቁጥር፦ <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">በ%s በኩል በመደወል ላይ</string>
+  <string name="incall_calling_on_same_carrier_template">በተመሳሳይ አገልግሎት አቅራቢ %s ላይ በመደወል ላይ</string>
+  <string name="incall_calling_on_recent_choice_template">በቅርብ ጊዜ ምርጫ %s ላይ በመደወል ላይ</string>
+  <string name="incall_connecting">በመደወል ላይ…</string>
+  <string name="incall_connecting_assited_dialed">+%1$s (%2$s) በመጠቀም በመደወል ላይ…</string>
+  <string name="incall_connecting_assited_dialed_component">+%1$s (%2$s) ን በመጠቀም ላይ…</string>
+  <string name="incall_transferring">በማስተላለፍ ላይ…</string>
+  <string name="incall_video_call_requesting">የአገልግሎት አቅራቢ የቪዲዮ ጥሪ በማድረግ ላይ…</string>
+  <string name="incall_wifi_video_call_requesting">የWi-Fi የአገልግሎት አቅራቢ የቪዲዮ ጥሪ በማድረግ ላይ…</string>
+  <string name="incall_video_call_upgrade_request">ወደ የአገልግሎት አቅራቢ ቪዲዮ በመቀየር ላይ…</string>
+  <string name="incall_video_call_request_failed">መገናኘት አልተቻለም</string>
+  <string name="incall_video_call_request_rejected">ጥሪ ውድቅ ተደርጓል</string>
+  <string name="incall_video_call_request_timed_out">ጥሪው ጊዜ ፈጅቷል</string>
+  <string name="incall_hanging_up">በመዝጋት ላይ</string>
+  <string name="incall_call_ended">ጥሪ አብቅቷል</string>
+  <string name="incall_remotely_held">ያዝና ቆይ</string>
+  <string name="contact_grid_incoming_video_call">የአገልግሎት አቅራቢ የቪዲዮ ጥሪ ከ</string>
+  <string name="contact_grid_incoming_wifi_video_call">የWi-Fi የአገልግሎት አቅራቢ የቪዲዮ ጥሪ ከ</string>
+  <string name="contact_grid_incoming_voice_call">ጥሪ ከ</string>
+  <string name="contact_grid_incoming_work_call">የሥራ ጥሪ ከ</string>
+  <string name="contact_grid_incoming_via_template">በ%s በኩል የገባ</string>
+  <string name="contact_grid_incoming_suspected_spam">የተጠረጠረ አይፈለጌ ደዋይ</string>
+  <string name="contact_grid_callback_number">የዚህ ፎቶ ቁጥር፦ %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-ar/strings.xml b/java/com/android/incallui/contactgrid/res/values-ar/strings.xml
index a66da9c..3f8ff04 100644
--- a/java/com/android/incallui/contactgrid/res/values-ar/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-ar/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_calling_via_template" msgid="3416867359475780924">"الاتصال عبر <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"جارٍ الاتصال…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"جارٍ النقل..."</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"تعذَّر الاتصال."</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"تم رفض الاتصال"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"انتهت مهلة الاتصال"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"إنهاء المكالمة"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"تم إنهاء الاتصال"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"معلقة"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"اتصال من"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"مكالمة عمل من"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"واردة عبر <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"اشتباه في متصل غير مرغوب فيه"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"رقم معاودة الاتصال: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">الاتصال عبر %s</string>
+  <string name="incall_calling_on_same_carrier_template">الاتصال على مشغل شبكة الجوال نفسه %s</string>
+  <string name="incall_calling_on_recent_choice_template">الاتصال على الاختيار الأخير %s</string>
+  <string name="incall_connecting">جارٍ الاتصال…</string>
+  <string name="incall_connecting_assited_dialed">الاتصال باستخدام +%1$s (%2$s)…</string>
+  <string name="incall_connecting_assited_dialed_component">باستخدام +%1$s (%2$s)…</string>
+  <string name="incall_transferring">جارٍ النقل...</string>
+  <string name="incall_video_call_requesting">مكالمة فيديو باستخدام مشغل شبكة الجوّال...</string>
+  <string name="incall_wifi_video_call_requesting">‏مكالمة فيديو باستخدام مشغل شبكة Wi-Fi…</string>
+  <string name="incall_video_call_upgrade_request">جارٍ التبديل إلى مكالمة فيديو باستخدام مشغل شبكة الجوّال…</string>
+  <string name="incall_video_call_request_failed">تعذَّر الاتصال.</string>
+  <string name="incall_video_call_request_rejected">تم رفض الاتصال</string>
+  <string name="incall_video_call_request_timed_out">انتهت مهلة الاتصال</string>
+  <string name="incall_hanging_up">إنهاء المكالمة</string>
+  <string name="incall_call_ended">تم إنهاء الاتصال</string>
+  <string name="incall_remotely_held">معلقة</string>
+  <string name="contact_grid_incoming_video_call">مكالمة فيديو باستخدام مشغل شبكة الجوّال من</string>
+  <string name="contact_grid_incoming_wifi_video_call">‏مكالمة فيديو باستخدام مشغل شبكة Wi-Fi من</string>
+  <string name="contact_grid_incoming_voice_call">اتصال من</string>
+  <string name="contact_grid_incoming_work_call">مكالمة عمل من</string>
+  <string name="contact_grid_incoming_via_template">واردة عبر %s</string>
+  <string name="contact_grid_incoming_suspected_spam">اشتباه في متصل غير مرغوب فيه</string>
+  <string name="contact_grid_callback_number">رقم الهاتف هذا: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-az/strings.xml b/java/com/android/incallui/contactgrid/res/values-az/strings.xml
index 2358432..7149d54 100644
--- a/java/com/android/incallui/contactgrid/res/values-az/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-az/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_calling_via_template" msgid="3416867359475780924">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> vasitəsilə zəng edilir"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"Zəng edilir..."</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"Köçürülür..."</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"Qoşulmaq olmur"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"Zəng rədd edildi"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"Zəngin vaxtı bitdi"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"Dəstək asılır"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"Zəng sona çatdı"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"Gözləmədə"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Zəng edən"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"İş zəngi edən"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> vasitəsilə gələn"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"Şübhəli spam çağrıcısı"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"Cavab zəngi nömrəsi: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">%s vasitəsilə zəng edilir</string>
+  <string name="incall_calling_on_same_carrier_template">Eyni %s operatorunda zəng edilir</string>
+  <string name="incall_calling_on_recent_choice_template">Son seçilmiş %s operatorunda zəng edilir</string>
+  <string name="incall_connecting">Zəng edilir...</string>
+  <string name="incall_connecting_assited_dialed">+%1$s (%2$s) istifadə edərək zəng edin…</string>
+  <string name="incall_connecting_assited_dialed_component">+%1$s (%2$s)… istifadə edilir</string>
+  <string name="incall_transferring">Köçürülür...</string>
+  <string name="incall_video_call_requesting">Operator ilə video zəng...</string>
+  <string name="incall_wifi_video_call_requesting">Wi-Fi operatoru ilə video zəng…</string>
+  <string name="incall_video_call_upgrade_request">Operatorla video zəngə keçirilir…</string>
+  <string name="incall_video_call_request_failed">Qoşulmaq olmur</string>
+  <string name="incall_video_call_request_rejected">Zəng rədd edildi</string>
+  <string name="incall_video_call_request_timed_out">Zəngin vaxtı bitdi</string>
+  <string name="incall_hanging_up">Dəstək asılır</string>
+  <string name="incall_call_ended">Zəng sona çatdı</string>
+  <string name="incall_remotely_held">Gözləmədə</string>
+  <string name="contact_grid_incoming_video_call">Operator ilə video zəng</string>
+  <string name="contact_grid_incoming_wifi_video_call">Wi-Fi operatoru ilə video zəng</string>
+  <string name="contact_grid_incoming_voice_call">Zəng edən</string>
+  <string name="contact_grid_incoming_work_call">İş zəngi edən</string>
+  <string name="contact_grid_incoming_via_template">%s vasitəsilə gələn</string>
+  <string name="contact_grid_incoming_suspected_spam">Şübhəli spam çağrıcısı</string>
+  <string name="contact_grid_callback_number">Bu telefonun nömrəsi: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-b+sr+Latn/strings.xml b/java/com/android/incallui/contactgrid/res/values-b+sr+Latn/strings.xml
index 2262b70..5392078 100644
--- a/java/com/android/incallui/contactgrid/res/values-b+sr+Latn/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-b+sr+Latn/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_calling_via_template" msgid="3416867359475780924">"Pozivamo preko <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"Pozivamo…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"Prenosimo…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"Povezivanje nije uspelo"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"Poziv je odbijen"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"Vremensko ograničenje poziva je isteklo"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"Prekidamo vezu"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"Poziv je završen"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"Na čekanju"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Poziv od"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Poslovni poziv od"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Dolazni poziv preko <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"Potencijalno nepoželjan pozivalac"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"Broj za povratni poziv: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">Pozivamo preko %s</string>
+  <string name="incall_calling_on_same_carrier_template">Poziva se preko istog mobilnog operatera: %s</string>
+  <string name="incall_calling_on_recent_choice_template">Poziva se na osnovu nedavnog izbora preko: %s</string>
+  <string name="incall_connecting">Pozivamo…</string>
+  <string name="incall_connecting_assited_dialed">Poziva se sa +%1$s (%2$s)…</string>
+  <string name="incall_connecting_assited_dialed_component">Koristi se +%1$s (%2$s)…</string>
+  <string name="incall_transferring">Prenosimo…</string>
+  <string name="incall_video_call_requesting">Upućuje se video poziv preko operatera…</string>
+  <string name="incall_wifi_video_call_requesting">Prebacuje se na Wi-Fi video poziv preko operatera…</string>
+  <string name="incall_video_call_upgrade_request">Prebacuje se na video poziv preko operatera…</string>
+  <string name="incall_video_call_request_failed">Povezivanje nije uspelo</string>
+  <string name="incall_video_call_request_rejected">Poziv je odbijen</string>
+  <string name="incall_video_call_request_timed_out">Vremensko ograničenje poziva je isteklo</string>
+  <string name="incall_hanging_up">Prekidamo vezu</string>
+  <string name="incall_call_ended">Poziv je završen</string>
+  <string name="incall_remotely_held">Na čekanju</string>
+  <string name="contact_grid_incoming_video_call">Video poziv preko operatera od:</string>
+  <string name="contact_grid_incoming_wifi_video_call">Wi-Fi video poziv preko operatera od:</string>
+  <string name="contact_grid_incoming_voice_call">Poziv od</string>
+  <string name="contact_grid_incoming_work_call">Poslovni poziv od</string>
+  <string name="contact_grid_incoming_via_template">Dolazni poziv preko %s</string>
+  <string name="contact_grid_incoming_suspected_spam">Potencijalno nepoželjan pozivalac</string>
+  <string name="contact_grid_callback_number">Broj ovog telefona: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-be/strings.xml b/java/com/android/incallui/contactgrid/res/values-be/strings.xml
index de7cdcb..db011cb 100644
--- a/java/com/android/incallui/contactgrid/res/values-be/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-be/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_calling_via_template" msgid="3416867359475780924">"Званкі праз <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"Выклік…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"Ідзе перадача…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"Немагчыма падключыцца"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"Выклік адхілены"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"Час чакання выкліку скончыўся"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"Завяршэнне выкліку"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"Выклік скончаны"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"На ўтрыманні"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Выклік ад"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Рабочы выклік ад"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Уваходны выклік праз <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"Падазрэнне на спам"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"Нумар для зваротнага выкліку: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">Званкі праз %s</string>
+  <string name="incall_calling_on_same_carrier_template">Выклік у сетцы таго ж самага аператара %s</string>
+  <string name="incall_calling_on_recent_choice_template">Выклік у сетку выбранага раней аператара %s</string>
+  <string name="incall_connecting">Выклік…</string>
+  <string name="incall_connecting_assited_dialed">Выклік з выкарыстаннем кода +%1$s (%2$s)…</string>
+  <string name="incall_connecting_assited_dialed_component">З выкарыстаннем +%1$s (%2$s)…</string>
+  <string name="incall_transferring">Ідзе перадача…</string>
+  <string name="incall_video_call_requesting">Відэавыклікі праз аператара…</string>
+  <string name="incall_wifi_video_call_requesting">Відэавыклік праз аператара Wi-Fi…</string>
+  <string name="incall_video_call_upgrade_request">Пераход на відэавыклік праз аператара…</string>
+  <string name="incall_video_call_request_failed">Немагчыма падключыцца</string>
+  <string name="incall_video_call_request_rejected">Выклік адхілены</string>
+  <string name="incall_video_call_request_timed_out">Час чакання выкліку скончыўся</string>
+  <string name="incall_hanging_up">Завяршэнне выкліку</string>
+  <string name="incall_call_ended">Выклік скончаны</string>
+  <string name="incall_remotely_held">На ўтрыманні</string>
+  <string name="contact_grid_incoming_video_call">Відэавыклік праз аператара ад</string>
+  <string name="contact_grid_incoming_wifi_video_call">Відэавыклік праз аператара Wi-Fi ад</string>
+  <string name="contact_grid_incoming_voice_call">Выклік ад</string>
+  <string name="contact_grid_incoming_work_call">Рабочы выклік ад</string>
+  <string name="contact_grid_incoming_via_template">Уваходны выклік праз %s</string>
+  <string name="contact_grid_incoming_suspected_spam">Падазрэнне на спам</string>
+  <string name="contact_grid_callback_number">Нумар гэтага тэлефона: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-bg/strings.xml b/java/com/android/incallui/contactgrid/res/values-bg/strings.xml
index 0bad336..9af43ad 100644
--- a/java/com/android/incallui/contactgrid/res/values-bg/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-bg/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_calling_via_template" msgid="3416867359475780924">"Обаждане чрез <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"Извършва се обаждане…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"Прехвърля се…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"Не може да се установи връзка"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"Обаждането бе отказано"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"Времето за изчакване на обаждането изтече"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"Приключване на разговора"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"Обаждането завърши"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"Задържано"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Обаждане от"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Служебно обаждане от"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Входящо обаждане чрез <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"Възможен спам"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"Номер за обратно обаждане: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">Обаждане чрез %s</string>
+  <string name="incall_calling_on_same_carrier_template">Обаждане със същия оператор %s</string>
+  <string name="incall_calling_on_recent_choice_template">Обаждане със скорошно избрания %s</string>
+  <string name="incall_connecting">Извършва се обаждане…</string>
+  <string name="incall_connecting_assited_dialed">Обаждане чрез използване на +%1$s (%2$s)…</string>
+  <string name="incall_connecting_assited_dialed_component">Посредством +%1$s (%2$s)…</string>
+  <string name="incall_transferring">Прехвърля се…</string>
+  <string name="incall_video_call_requesting">Видеообаждания през оператора…</string>
+  <string name="incall_wifi_video_call_requesting">Видеообаждания през оператора през Wi-Fi…</string>
+  <string name="incall_video_call_upgrade_request">Превключва се към видеообаждане през оператора…</string>
+  <string name="incall_video_call_request_failed">Не може да се установи връзка</string>
+  <string name="incall_video_call_request_rejected">Обаждането бе отказано</string>
+  <string name="incall_video_call_request_timed_out">Времето за изчакване на обаждането изтече</string>
+  <string name="incall_hanging_up">Приключване на разговора</string>
+  <string name="incall_call_ended">Обаждането завърши</string>
+  <string name="incall_remotely_held">Задържано</string>
+  <string name="contact_grid_incoming_video_call">Видеообаждане през оператора от</string>
+  <string name="contact_grid_incoming_wifi_video_call">Видеообаждане през Wi-Fi през оператора от</string>
+  <string name="contact_grid_incoming_voice_call">Обаждане от</string>
+  <string name="contact_grid_incoming_work_call">Служебно обаждане от</string>
+  <string name="contact_grid_incoming_via_template">Входящо обаждане чрез %s</string>
+  <string name="contact_grid_incoming_suspected_spam">Възможен спам</string>
+  <string name="contact_grid_callback_number">Номерът на този телефон: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-bn/strings.xml b/java/com/android/incallui/contactgrid/res/values-bn/strings.xml
index 09a438e..5a3c09f 100644
--- a/java/com/android/incallui/contactgrid/res/values-bn/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-bn/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_calling_via_template" msgid="3416867359475780924">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> এর মাধ্যমে কল করা হচ্ছে"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"কল করা হচ্ছে…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"স্থানান্তর করা হচ্ছে…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"সংযোগ করা গেল না"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"কল অস্বীকার করা হয়েছে"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"কলের সময়সীমা শেষ হয়েছে"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"কল নামিয়ে রাখা হচ্ছে"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"কল শেষ হয়েছে"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"হোল্ডে রয়েছে"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"এর থেকে আগত কল"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"এর থেকে আগত কর্মক্ষেত্রের কল"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> এর মাধ্যমে আগত কল"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"সন্দেহভাজন স্প্যাম কলার"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"কলব্যাক নম্বর: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">%s এর মাধ্যমে কল করা হচ্ছে</string>
+  <string name="incall_calling_on_same_carrier_template">একই পরিষেবা প্রদানকারীর নেটওয়ার্কে কল করা হচ্ছে: %s</string>
+  <string name="incall_calling_on_recent_choice_template">সম্প্রতি বেছে নেওয়া নেটওয়ার্কে কল করা হচ্ছে: %s</string>
+  <string name="incall_connecting">কল করা হচ্ছে…</string>
+  <string name="incall_connecting_assited_dialed">+%1$s (%2$s) দিয়ে কল করা হচ্ছে...</string>
+  <string name="incall_connecting_assited_dialed_component">+%1$s (%2$s) ব্যবহার করা হচ্ছে…</string>
+  <string name="incall_transferring">স্থানান্তর করা হচ্ছে…</string>
+  <string name="incall_video_call_requesting">মোবাইল ডেটা দিয়ে ভিডিও কল করা হচ্ছে…</string>
+  <string name="incall_wifi_video_call_requesting">ওয়াই-ফাই দিয়ে ভিডিও কল করা হচ্ছে…</string>
+  <string name="incall_video_call_upgrade_request">ভয়েস কল থেকে ভিডিও কলে সুইচ করা হচ্ছে…</string>
+  <string name="incall_video_call_request_failed">সংযোগ করা গেল না</string>
+  <string name="incall_video_call_request_rejected">কল অস্বীকার করা হয়েছে</string>
+  <string name="incall_video_call_request_timed_out">কলের সময়সীমা শেষ হয়েছে</string>
+  <string name="incall_hanging_up">কল নামিয়ে রাখা হচ্ছে</string>
+  <string name="incall_call_ended">কল শেষ হয়েছে</string>
+  <string name="incall_remotely_held">হোল্ডে রয়েছে</string>
+  <string name="contact_grid_incoming_video_call">মোবাইল ডেটা দিয়ে এর ভিডিও কল নিন</string>
+  <string name="contact_grid_incoming_wifi_video_call">ওয়াই-ফাই দিয়ে এর ভিডিও কল নিন</string>
+  <string name="contact_grid_incoming_voice_call">এর থেকে আগত কল</string>
+  <string name="contact_grid_incoming_work_call">এর থেকে আগত কর্মক্ষেত্রের কল</string>
+  <string name="contact_grid_incoming_via_template">%s এর মাধ্যমে আগত কল</string>
+  <string name="contact_grid_incoming_suspected_spam">সন্দেহভাজন স্প্যাম কলার</string>
+  <string name="contact_grid_callback_number">এই ফোনের নম্বর: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-bs/strings.xml b/java/com/android/incallui/contactgrid/res/values-bs/strings.xml
index 5d85cd1..bcbb80c 100644
--- a/java/com/android/incallui/contactgrid/res/values-bs/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-bs/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_calling_via_template" msgid="3416867359475780924">"Pozivanje putem mreže <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"Pozivanje u toku…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"Prenošenje u toku…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"Povezivanje nije moguće"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"Poziv je odbijen"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"Isteklo vrijeme za uspostavljanje poziva"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"Prekid veze"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"Poziv je završen"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"Na čekanju"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Poziv od"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Poslovni poziv od"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Dolazni poziv putem <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"Neželjeni pozivalac"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"Broj za povratni poziv: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">Pozivanje putem mreže %s</string>
+  <string name="incall_calling_on_same_carrier_template">Pozivanje putem trenutno korištenog mobilnog operatera %s</string>
+  <string name="incall_calling_on_recent_choice_template">Pozivanje putem nedavno korištenog mobilnog operatera %s</string>
+  <string name="incall_connecting">Pozivanje u toku…</string>
+  <string name="incall_connecting_assited_dialed">Pozivanje uz korištenje koda +%1$s (%2$s)…</string>
+  <string name="incall_connecting_assited_dialed_component">Koristi se kôd zemlje +%1$s (%2$s)…</string>
+  <string name="incall_transferring">Prenošenje u toku…</string>
+  <string name="incall_video_call_requesting">Video poziv putem mobilnog operatera…</string>
+  <string name="incall_wifi_video_call_requesting">Video poziv putem WiFi mreže…</string>
+  <string name="incall_video_call_upgrade_request">Prelazak na video poziv putem mobilnog operatera…</string>
+  <string name="incall_video_call_request_failed">Povezivanje nije uspjelo</string>
+  <string name="incall_video_call_request_rejected">Poziv je odbijen</string>
+  <string name="incall_video_call_request_timed_out">Isteklo vrijeme za uspostavljanje poziva</string>
+  <string name="incall_hanging_up">Prekid veze</string>
+  <string name="incall_call_ended">Poziv je završen</string>
+  <string name="incall_remotely_held">Na čekanju</string>
+  <string name="contact_grid_incoming_video_call">Video poziv putem mobilnog operatera od pozivaoca</string>
+  <string name="contact_grid_incoming_wifi_video_call">Video poziv putem WiFi mreže od pozivaoca</string>
+  <string name="contact_grid_incoming_voice_call">Poziv od</string>
+  <string name="contact_grid_incoming_work_call">Poslovni poziv od</string>
+  <string name="contact_grid_incoming_via_template">Dolazni poziv putem %s</string>
+  <string name="contact_grid_incoming_suspected_spam">Neželjeni pozivalac</string>
+  <string name="contact_grid_callback_number">Broj ovog telefona: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-ca/strings.xml b/java/com/android/incallui/contactgrid/res/values-ca/strings.xml
index 11d25e3..c48a283 100644
--- a/java/com/android/incallui/contactgrid/res/values-ca/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-ca/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_calling_via_template" msgid="3416867359475780924">"S\'està trucant amb <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"S\'està trucant…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"S\'està transferint…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"No es pot establir la connexió"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"La trucada s\'ha rebutjat"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"La trucada ha esgotat el temps d\'espera"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"S\'està penjant"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"La trucada ha finalitzat"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"En espera"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Trucada de"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Trucada de feina de"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Entrant via <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"Possible trucada brossa"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"Número de devolució de trucada: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">S\'està trucant amb %s</string>
+  <string name="incall_calling_on_same_carrier_template">S\'està trucant amb el mateix operador de telefonia mòbil, %s</string>
+  <string name="incall_calling_on_recent_choice_template">S\'està trucant amb un operador de telefonia triat fa poc, %s</string>
+  <string name="incall_connecting">S\'està trucant…</string>
+  <string name="incall_connecting_assited_dialed">Trucada amb +%1$s (%2$s)…</string>
+  <string name="incall_connecting_assited_dialed_component">S\'està utilitzant +%1$s (%2$s)…</string>
+  <string name="incall_transferring">S\'està transferint…</string>
+  <string name="incall_video_call_requesting">S\'està iniciant una videotrucada amb l\'operador de telefonia mòbil…</string>
+  <string name="incall_wifi_video_call_requesting">S\'està passant a la videotrucada per Wi-Fi amb l\'operador de telefonia mòbil…</string>
+  <string name="incall_video_call_upgrade_request">S\'està passant a la videotrucada amb l\'operador de telefonia mòbil…</string>
+  <string name="incall_video_call_request_failed">No es pot establir la connexió</string>
+  <string name="incall_video_call_request_rejected">La trucada s\'ha rebutjat</string>
+  <string name="incall_video_call_request_timed_out">La trucada ha esgotat el temps d\'espera</string>
+  <string name="incall_hanging_up">S\'està penjant</string>
+  <string name="incall_call_ended">La trucada ha finalitzat</string>
+  <string name="incall_remotely_held">En espera</string>
+  <string name="contact_grid_incoming_video_call">Videotrucada amb l\'operador de telefonia mòbil de:</string>
+  <string name="contact_grid_incoming_wifi_video_call">Videotrucada per Wi-Fi amb l\'operador de telefonia mòbil de:</string>
+  <string name="contact_grid_incoming_voice_call">Trucada de</string>
+  <string name="contact_grid_incoming_work_call">Trucada de feina de</string>
+  <string name="contact_grid_incoming_via_template">Entrant via %s</string>
+  <string name="contact_grid_incoming_suspected_spam">Possible trucada brossa</string>
+  <string name="contact_grid_callback_number">Número de telèfon d\'aquest dispositiu: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-cs/strings.xml b/java/com/android/incallui/contactgrid/res/values-cs/strings.xml
index 4a21629..f061ba6 100644
--- a/java/com/android/incallui/contactgrid/res/values-cs/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-cs/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_calling_via_template" msgid="3416867359475780924">"Volání přes poskytovatele <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"Volání…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"Přepojování…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"Nelze se připojit"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"Hovor byl odmítnut"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"Časový limit hovoru vypršel"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"Zavěšování"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"Hovor byl ukončen"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"Podrženo"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Příchozí hovor:"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Příchozí pracovní hovor:"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Příchozí hovor přes poskytovatele <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"Podezření na spam"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"Číslo pro zpětné volání: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">Volání přes poskytovatele %s</string>
+  <string name="incall_calling_on_same_carrier_template">Volání přes stejného operátora %s</string>
+  <string name="incall_calling_on_recent_choice_template">Volání přes nedávno vybraného operátora %s</string>
+  <string name="incall_connecting">Volání…</string>
+  <string name="incall_connecting_assited_dialed">Volání s předvolbou +%1$s (%2$s)…</string>
+  <string name="incall_connecting_assited_dialed_component">Byla použita předvolba +%1$s (%2$s)…</string>
+  <string name="incall_transferring">Přepojování…</string>
+  <string name="incall_video_call_requesting">Videohovor prostřednictvím operátora…</string>
+  <string name="incall_wifi_video_call_requesting">Videohovor přes Wi-Fi prostřednictvím operátora…</string>
+  <string name="incall_video_call_upgrade_request">Přepínání na videohovor prostřednictvím operátora…</string>
+  <string name="incall_video_call_request_failed">Nelze se připojit</string>
+  <string name="incall_video_call_request_rejected">Hovor byl odmítnut</string>
+  <string name="incall_video_call_request_timed_out">Časový limit hovoru vypršel</string>
+  <string name="incall_hanging_up">Zavěšování</string>
+  <string name="incall_call_ended">Hovor byl ukončen</string>
+  <string name="incall_remotely_held">Podrženo</string>
+  <string name="contact_grid_incoming_video_call">Videohovor prostřednictvím operátora od</string>
+  <string name="contact_grid_incoming_wifi_video_call">Videohovor přes Wi-Fi prostřednictvím operátora od</string>
+  <string name="contact_grid_incoming_voice_call">Příchozí hovor:</string>
+  <string name="contact_grid_incoming_work_call">Příchozí pracovní hovor:</string>
+  <string name="contact_grid_incoming_via_template">Příchozí hovor přes poskytovatele %s</string>
+  <string name="contact_grid_incoming_suspected_spam">Podezření na spam</string>
+  <string name="contact_grid_callback_number">Číslo tohoto telefonu: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-da/strings.xml b/java/com/android/incallui/contactgrid/res/values-da/strings.xml
index 584ef31..d75ae4c 100644
--- a/java/com/android/incallui/contactgrid/res/values-da/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-da/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_calling_via_template" msgid="3416867359475780924">"Ringer via <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"Ringer…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"Overfører…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"Der kunne ikke oprettes forbindelse"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"Opkaldet blev afvist"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"Opkaldet fik timeout"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"Lægger på"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"Opkaldet er afsluttet"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"I venteposition"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Opkald fra"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Arbejdsopkald fra"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Indgående opkald via <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"Formodet spammer"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"Tilbagekaldsnummer: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">Ringer via %s</string>
+  <string name="incall_calling_on_same_carrier_template">Der ringes via samme mobilselskab: %s</string>
+  <string name="incall_calling_on_recent_choice_template">Der ringes via det seneste valg: %s</string>
+  <string name="incall_connecting">Ringer…</string>
+  <string name="incall_connecting_assited_dialed">Ring +%1$s (%2$s)…</string>
+  <string name="incall_connecting_assited_dialed_component">Der bruges +%1$s (%2$s)…</string>
+  <string name="incall_transferring">Overfører…</string>
+  <string name="incall_video_call_requesting">Videoopkald via mobilselskab…</string>
+  <string name="incall_wifi_video_call_requesting">Wi-Fi-videoopkald via mobilselskab…</string>
+  <string name="incall_video_call_upgrade_request">Der skiftes til videoopkald via mobilselskab…</string>
+  <string name="incall_video_call_request_failed">Der kunne ikke oprettes forbindelse</string>
+  <string name="incall_video_call_request_rejected">Opkaldet blev afvist</string>
+  <string name="incall_video_call_request_timed_out">Opkaldet fik timeout</string>
+  <string name="incall_hanging_up">Lægger på</string>
+  <string name="incall_call_ended">Opkaldet er afsluttet</string>
+  <string name="incall_remotely_held">I venteposition</string>
+  <string name="contact_grid_incoming_video_call">Videoopkald via mobilselskab fra</string>
+  <string name="contact_grid_incoming_wifi_video_call">Wi-Fi-videoopkald via mobilselskab fra</string>
+  <string name="contact_grid_incoming_voice_call">Opkald fra</string>
+  <string name="contact_grid_incoming_work_call">Arbejdsopkald fra</string>
+  <string name="contact_grid_incoming_via_template">Indgående opkald via %s</string>
+  <string name="contact_grid_incoming_suspected_spam">Formodet spammer</string>
+  <string name="contact_grid_callback_number">Telefonens nummer: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-de/strings.xml b/java/com/android/incallui/contactgrid/res/values-de/strings.xml
index 576aca7..c067f12 100644
--- a/java/com/android/incallui/contactgrid/res/values-de/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-de/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_calling_via_template" msgid="3416867359475780924">"Anruf über <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"Anruf wird getätigt…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"Übertragung wird durchgeführt…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"Kein Verbindungsaufbau möglich"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"Anruf abgelehnt"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"Zeitüberschreitung bei Anruf"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"Auflegen"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"Anruf beendet"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"Anruf wird gehalten"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Anruf von"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Geschäftlicher Anruf von"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Eingehender Anruf über <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"Möglicher Spamanrufer"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"Rückrufnummer: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">Anruf über %s</string>
+  <string name="incall_calling_on_same_carrier_template">Anruf über den gleichen Anbieter (%s)</string>
+  <string name="incall_calling_on_recent_choice_template">Anruf über zuletzt verwendeten Anbieter (%s)</string>
+  <string name="incall_connecting">Anruf wird getätigt…</string>
+  <string name="incall_connecting_assited_dialed">Anruf über +%1$s (%2$s)…</string>
+  <string name="incall_connecting_assited_dialed_component">Verwendete Nummer: +%1$s (%2$s)…</string>
+  <string name="incall_transferring">Übertragung wird durchgeführt…</string>
+  <string name="incall_video_call_requesting">Videoanruf über Mobilfunkanbieter…</string>
+  <string name="incall_wifi_video_call_requesting">Videoanruf über WLAN…</string>
+  <string name="incall_video_call_upgrade_request">Zu Video über Mobilfunkanbieter wechseln…</string>
+  <string name="incall_video_call_request_failed">Kein Verbindungsaufbau möglich</string>
+  <string name="incall_video_call_request_rejected">Anruf abgelehnt</string>
+  <string name="incall_video_call_request_timed_out">Zeitüberschreitung bei Anruf</string>
+  <string name="incall_hanging_up">Auflegen</string>
+  <string name="incall_call_ended">Anruf beendet</string>
+  <string name="incall_remotely_held">Anruf wird gehalten</string>
+  <string name="contact_grid_incoming_video_call">Videoanruf über Mobilfunkanbieter von</string>
+  <string name="contact_grid_incoming_wifi_video_call">WLAN-Videoanruf von</string>
+  <string name="contact_grid_incoming_voice_call">Anruf von</string>
+  <string name="contact_grid_incoming_work_call">Geschäftlicher Anruf von</string>
+  <string name="contact_grid_incoming_via_template">Eingehender Anruf über %s</string>
+  <string name="contact_grid_incoming_suspected_spam">Möglicher Spamanrufer</string>
+  <string name="contact_grid_callback_number">Eigene Telefonnummer: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-el/strings.xml b/java/com/android/incallui/contactgrid/res/values-el/strings.xml
index 2441954..d0ed545 100644
--- a/java/com/android/incallui/contactgrid/res/values-el/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-el/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_calling_via_template" msgid="3416867359475780924">"Κλήση μέσω <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"Κλήση…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"Μεταφορά…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"Αδυναμία σύνδεσης"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"Η κλήση απορρίφθηκε"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"Λήξη χρονικού ορίου κλήσης"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"Κλείσιμο γραμμής"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"Η κλήση τερματίστηκε"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"Σε αναμονή"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Κλήση από"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Κλήση από το γραφείο από"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Εισερχόμενη κλήση μέσω <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"Πιθανώς ανεπιθύμητος"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"Αριθμός επανάκλησης: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">Κλήση μέσω %s</string>
+  <string name="incall_calling_on_same_carrier_template">Κλήση στην ίδια εταιρεία κινητής τηλεφωνίας, %s</string>
+  <string name="incall_calling_on_recent_choice_template">Κλήση στην πρόσφατη επιλογή, %s</string>
+  <string name="incall_connecting">Κλήση…</string>
+  <string name="incall_connecting_assited_dialed">Κλήση με χρήση του +%1$s (%2$s)…</string>
+  <string name="incall_connecting_assited_dialed_component">Χρήση +%1$s (%2$s)…</string>
+  <string name="incall_transferring">Μεταφορά…</string>
+  <string name="incall_video_call_requesting">Βιντεοκλήση μέσω εταιρείας κινητής τηλεφωνίας…</string>
+  <string name="incall_wifi_video_call_requesting">Βιντεοκλήση WiFi μέσω εταιρείας κινητής τηλεφωνίας…</string>
+  <string name="incall_video_call_upgrade_request">Αλλαγή σε βιντεοκλήση μέσω εταιρείας κινητής τηλεφωνίας…</string>
+  <string name="incall_video_call_request_failed">Αδυναμία σύνδεσης</string>
+  <string name="incall_video_call_request_rejected">Η κλήση απορρίφθηκε</string>
+  <string name="incall_video_call_request_timed_out">Λήξη χρονικού ορίου κλήσης</string>
+  <string name="incall_hanging_up">Κλείσιμο γραμμής</string>
+  <string name="incall_call_ended">Η κλήση τερματίστηκε</string>
+  <string name="incall_remotely_held">Σε αναμονή</string>
+  <string name="contact_grid_incoming_video_call">Βιντεοκλήση μέσω εταιρείας κινητής τηλεφωνίας από</string>
+  <string name="contact_grid_incoming_wifi_video_call">Βιντεοκλήση WiFi μέσω εταιρείας κινητής τηλεφωνίας από</string>
+  <string name="contact_grid_incoming_voice_call">Κλήση από</string>
+  <string name="contact_grid_incoming_work_call">Κλήση από το γραφείο από</string>
+  <string name="contact_grid_incoming_via_template">Εισερχόμενη κλήση μέσω %s</string>
+  <string name="contact_grid_incoming_suspected_spam">Πιθανώς ανεπιθύμητος</string>
+  <string name="contact_grid_callback_number">Ο αριθμός αυτού του τηλεφώνου: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-en-rAU/strings.xml b/java/com/android/incallui/contactgrid/res/values-en-rAU/strings.xml
index 20894ef..47c2873 100644
--- a/java/com/android/incallui/contactgrid/res/values-en-rAU/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-en-rAU/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_calling_via_template" msgid="3416867359475780924">"Calling via <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"Calling…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"Transferring…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"Unable to connect"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"Call declined"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"Call timed out"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"Hanging up"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"Call ended"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"On hold"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Call from"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Work call from"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Incoming via <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"Suspected spam caller"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"Callback number: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">Calling via %s</string>
+  <string name="incall_calling_on_same_carrier_template">Calling on same operator %s</string>
+  <string name="incall_calling_on_recent_choice_template">Calling on recent choice %s</string>
+  <string name="incall_connecting">Calling…</string>
+  <string name="incall_connecting_assited_dialed">Calling using +%1$s (%2$s)…</string>
+  <string name="incall_connecting_assited_dialed_component">Using +%1$s (%2$s)…</string>
+  <string name="incall_transferring">Transferring…</string>
+  <string name="incall_video_call_requesting">Operator video calling…</string>
+  <string name="incall_wifi_video_call_requesting">Wi-Fi operator video calling…</string>
+  <string name="incall_video_call_upgrade_request">Switching to operator video…</string>
+  <string name="incall_video_call_request_failed">Unable to connect</string>
+  <string name="incall_video_call_request_rejected">Call declined</string>
+  <string name="incall_video_call_request_timed_out">Call timed out</string>
+  <string name="incall_hanging_up">Hanging up</string>
+  <string name="incall_call_ended">Call ended</string>
+  <string name="incall_remotely_held">On hold</string>
+  <string name="contact_grid_incoming_video_call">Operator video call from</string>
+  <string name="contact_grid_incoming_wifi_video_call">Wi-Fi operator video call from</string>
+  <string name="contact_grid_incoming_voice_call">Call from</string>
+  <string name="contact_grid_incoming_work_call">Work call from</string>
+  <string name="contact_grid_incoming_via_template">Incoming via %s</string>
+  <string name="contact_grid_incoming_suspected_spam">Suspected spam caller</string>
+  <string name="contact_grid_callback_number">This phone\'s number: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-en-rGB/strings.xml b/java/com/android/incallui/contactgrid/res/values-en-rGB/strings.xml
index 20894ef..47c2873 100644
--- a/java/com/android/incallui/contactgrid/res/values-en-rGB/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-en-rGB/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_calling_via_template" msgid="3416867359475780924">"Calling via <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"Calling…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"Transferring…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"Unable to connect"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"Call declined"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"Call timed out"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"Hanging up"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"Call ended"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"On hold"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Call from"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Work call from"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Incoming via <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"Suspected spam caller"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"Callback number: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">Calling via %s</string>
+  <string name="incall_calling_on_same_carrier_template">Calling on same operator %s</string>
+  <string name="incall_calling_on_recent_choice_template">Calling on recent choice %s</string>
+  <string name="incall_connecting">Calling…</string>
+  <string name="incall_connecting_assited_dialed">Calling using +%1$s (%2$s)…</string>
+  <string name="incall_connecting_assited_dialed_component">Using +%1$s (%2$s)…</string>
+  <string name="incall_transferring">Transferring…</string>
+  <string name="incall_video_call_requesting">Operator video calling…</string>
+  <string name="incall_wifi_video_call_requesting">Wi-Fi operator video calling…</string>
+  <string name="incall_video_call_upgrade_request">Switching to operator video…</string>
+  <string name="incall_video_call_request_failed">Unable to connect</string>
+  <string name="incall_video_call_request_rejected">Call declined</string>
+  <string name="incall_video_call_request_timed_out">Call timed out</string>
+  <string name="incall_hanging_up">Hanging up</string>
+  <string name="incall_call_ended">Call ended</string>
+  <string name="incall_remotely_held">On hold</string>
+  <string name="contact_grid_incoming_video_call">Operator video call from</string>
+  <string name="contact_grid_incoming_wifi_video_call">Wi-Fi operator video call from</string>
+  <string name="contact_grid_incoming_voice_call">Call from</string>
+  <string name="contact_grid_incoming_work_call">Work call from</string>
+  <string name="contact_grid_incoming_via_template">Incoming via %s</string>
+  <string name="contact_grid_incoming_suspected_spam">Suspected spam caller</string>
+  <string name="contact_grid_callback_number">This phone\'s number: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-en-rIN/strings.xml b/java/com/android/incallui/contactgrid/res/values-en-rIN/strings.xml
index 20894ef..47c2873 100644
--- a/java/com/android/incallui/contactgrid/res/values-en-rIN/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-en-rIN/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_calling_via_template" msgid="3416867359475780924">"Calling via <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"Calling…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"Transferring…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"Unable to connect"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"Call declined"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"Call timed out"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"Hanging up"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"Call ended"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"On hold"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Call from"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Work call from"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Incoming via <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"Suspected spam caller"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"Callback number: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">Calling via %s</string>
+  <string name="incall_calling_on_same_carrier_template">Calling on same operator %s</string>
+  <string name="incall_calling_on_recent_choice_template">Calling on recent choice %s</string>
+  <string name="incall_connecting">Calling…</string>
+  <string name="incall_connecting_assited_dialed">Calling using +%1$s (%2$s)…</string>
+  <string name="incall_connecting_assited_dialed_component">Using +%1$s (%2$s)…</string>
+  <string name="incall_transferring">Transferring…</string>
+  <string name="incall_video_call_requesting">Operator video calling…</string>
+  <string name="incall_wifi_video_call_requesting">Wi-Fi operator video calling…</string>
+  <string name="incall_video_call_upgrade_request">Switching to operator video…</string>
+  <string name="incall_video_call_request_failed">Unable to connect</string>
+  <string name="incall_video_call_request_rejected">Call declined</string>
+  <string name="incall_video_call_request_timed_out">Call timed out</string>
+  <string name="incall_hanging_up">Hanging up</string>
+  <string name="incall_call_ended">Call ended</string>
+  <string name="incall_remotely_held">On hold</string>
+  <string name="contact_grid_incoming_video_call">Operator video call from</string>
+  <string name="contact_grid_incoming_wifi_video_call">Wi-Fi operator video call from</string>
+  <string name="contact_grid_incoming_voice_call">Call from</string>
+  <string name="contact_grid_incoming_work_call">Work call from</string>
+  <string name="contact_grid_incoming_via_template">Incoming via %s</string>
+  <string name="contact_grid_incoming_suspected_spam">Suspected spam caller</string>
+  <string name="contact_grid_callback_number">This phone\'s number: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-es-rUS/strings.xml b/java/com/android/incallui/contactgrid/res/values-es-rUS/strings.xml
index af27240..9492eb8 100644
--- a/java/com/android/incallui/contactgrid/res/values-es-rUS/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-es-rUS/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_calling_via_template" msgid="3416867359475780924">"Llamada por medio de <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"Llamando…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"Transfiriendo…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"No se pudo conectar"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"Llamada rechazada"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"Se agotó el tiempo de espera de la llamada"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"Colgando"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"Llamada finalizada"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"En espera"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Llamada de"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Llamada laboral de"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Entrante por medio de <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"Posible spam"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"Número de devolución de llamada: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">Llamada por medio de %s</string>
+  <string name="incall_calling_on_same_carrier_template">Llamada mediante el mismo proveedor que el destinatario: %s</string>
+  <string name="incall_calling_on_recent_choice_template">Llamada mediante el proveedor seleccionado recientemente: %s</string>
+  <string name="incall_connecting">Llamando…</string>
+  <string name="incall_connecting_assited_dialed">Para llamar, marcar +%1$s (%2$s)…</string>
+  <string name="incall_connecting_assited_dialed_component">Código de país: +%1$s (%2$s)…</string>
+  <string name="incall_transferring">Transfiriendo…</string>
+  <string name="incall_video_call_requesting">Realizando videollamada mediante el proveedor…</string>
+  <string name="incall_wifi_video_call_requesting">Realizando videollamada mediante el proveedor de Wi-Fi…</string>
+  <string name="incall_video_call_upgrade_request">Cambiando a videollamada mediante el proveedor…</string>
+  <string name="incall_video_call_request_failed">No se pudo conectar</string>
+  <string name="incall_video_call_request_rejected">Llamada rechazada</string>
+  <string name="incall_video_call_request_timed_out">Se agotó el tiempo de espera de la llamada</string>
+  <string name="incall_hanging_up">Colgando</string>
+  <string name="incall_call_ended">Llamada finalizada</string>
+  <string name="incall_remotely_held">En espera</string>
+  <string name="contact_grid_incoming_video_call">Videollamada mediante el proveedor de</string>
+  <string name="contact_grid_incoming_wifi_video_call">Videollamada mediante el proveedor de Wi-Fi de</string>
+  <string name="contact_grid_incoming_voice_call">Llamada de</string>
+  <string name="contact_grid_incoming_work_call">Llamada laboral de</string>
+  <string name="contact_grid_incoming_via_template">Entrante por medio de %s</string>
+  <string name="contact_grid_incoming_suspected_spam">Posible spam</string>
+  <string name="contact_grid_callback_number">Número de teléfono de este dispositivo: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-es/strings.xml b/java/com/android/incallui/contactgrid/res/values-es/strings.xml
index 37db8a3..615bf1b 100644
--- a/java/com/android/incallui/contactgrid/res/values-es/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-es/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_calling_via_template" msgid="3416867359475780924">"Llamada a través de <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"Llamando…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"Transfiriéndola…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"No se ha podido establecer conexión"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"Se ha rechazado la llamada"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"La llamada ha superado el tiempo de espera"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"Colgando"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"Llamada finalizada"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"En espera"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Llamada de"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Llamada de trabajo de"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Recibida a través de <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"Sospechoso de spam"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"Número de devolución de llamada: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">Llamada a través de %s</string>
+  <string name="incall_calling_on_same_carrier_template">Llamando a través del mismo operador: %s</string>
+  <string name="incall_calling_on_recent_choice_template">Llamando a través de un operador elegido hace poco: %s</string>
+  <string name="incall_connecting">Llamando…</string>
+  <string name="incall_connecting_assited_dialed">Llamando con +%1$s (%2$s)…</string>
+  <string name="incall_connecting_assited_dialed_component">Usando +%1$s (%2$s)…</string>
+  <string name="incall_transferring">Transfiriéndola…</string>
+  <string name="incall_video_call_requesting">Iniciando una videollamada a través del operador…</string>
+  <string name="incall_wifi_video_call_requesting">Iniciando una videollamada por Wi-Fi a través del operador…</string>
+  <string name="incall_video_call_upgrade_request">Cambiando a una videollamada a través del operador…</string>
+  <string name="incall_video_call_request_failed">No se ha podido establecer conexión</string>
+  <string name="incall_video_call_request_rejected">Se ha rechazado la llamada</string>
+  <string name="incall_video_call_request_timed_out">La llamada ha superado el tiempo de espera</string>
+  <string name="incall_hanging_up">Colgando</string>
+  <string name="incall_call_ended">Llamada finalizada</string>
+  <string name="incall_remotely_held">En espera</string>
+  <string name="contact_grid_incoming_video_call">Videollamada a través del operador de</string>
+  <string name="contact_grid_incoming_wifi_video_call">Videollamada por Wi-Fi a través del operador de</string>
+  <string name="contact_grid_incoming_voice_call">Llamada de</string>
+  <string name="contact_grid_incoming_work_call">Llamada de trabajo de</string>
+  <string name="contact_grid_incoming_via_template">Recibida a través de %s</string>
+  <string name="contact_grid_incoming_suspected_spam">Sospechoso de spam</string>
+  <string name="contact_grid_callback_number">Este número de teléfono: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-et/strings.xml b/java/com/android/incallui/contactgrid/res/values-et/strings.xml
index 5635f9e..8ef2022 100644
--- a/java/com/android/incallui/contactgrid/res/values-et/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-et/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_calling_via_template" msgid="3416867359475780924">"Kõne edastab <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"Helistamine …"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"Ülekandmine …"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"Ühendust ei õnnestu luua"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"Kõnest keelduti"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"Kõne aegus"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"Lõpetamine"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"Kõne lõpetati"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"Ootel"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Kõne kontaktilt"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Töökõne kontaktilt"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Sissetulev kõne teenusepakkuja <xliff:g id="PROVIDER_NAME">%s</xliff:g> kaudu"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"Arvatav rämpskõnetegija"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"Tagasihelistamise number: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">Kõne edastab %s</string>
+  <string name="incall_calling_on_same_carrier_template">Helistatakse sama operaatori %s võrgus</string>
+  <string name="incall_calling_on_recent_choice_template">Helistatakse hiljuti valitud operaatori %s võrgus</string>
+  <string name="incall_connecting">Helistamine …</string>
+  <string name="incall_connecting_assited_dialed">Helistamine koodiga +%1$s (%2$s) …</string>
+  <string name="incall_connecting_assited_dialed_component">Kasutatakse koodi +%1$s (%2$s)…</string>
+  <string name="incall_transferring">Ülekandmine …</string>
+  <string name="incall_video_call_requesting">Operaatori videokõne …</string>
+  <string name="incall_wifi_video_call_requesting">WiFi-operaatori videokõne …</string>
+  <string name="incall_video_call_upgrade_request">Operaatori videole lülitumine …</string>
+  <string name="incall_video_call_request_failed">Ühendust ei õnnestu luua</string>
+  <string name="incall_video_call_request_rejected">Kõnest keelduti</string>
+  <string name="incall_video_call_request_timed_out">Kõne aegus</string>
+  <string name="incall_hanging_up">Lõpetamine</string>
+  <string name="incall_call_ended">Kõne lõpetati</string>
+  <string name="incall_remotely_held">Ootel</string>
+  <string name="contact_grid_incoming_video_call">Operaatori videokõne kasutajalt</string>
+  <string name="contact_grid_incoming_wifi_video_call">WiFi-operaatori videokõne kasutajalt</string>
+  <string name="contact_grid_incoming_voice_call">Kõne kontaktilt</string>
+  <string name="contact_grid_incoming_work_call">Töökõne kontaktilt</string>
+  <string name="contact_grid_incoming_via_template">Sissetulev kõne teenusepakkuja %s kaudu</string>
+  <string name="contact_grid_incoming_suspected_spam">Arvatav rämpskõnetegija</string>
+  <string name="contact_grid_callback_number">Selle telefoni number: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-eu/strings.xml b/java/com/android/incallui/contactgrid/res/values-eu/strings.xml
index 3478d84..1692a56 100644
--- a/java/com/android/incallui/contactgrid/res/values-eu/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-eu/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_calling_via_template" msgid="3416867359475780924">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> bidez deitzen"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"Deitzen…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"Transferitzen…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"Ezin da konektatu"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"Deia baztertu da"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"Denbora-muga gainditu du deiak"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"Deia amaitzen"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"Amaitu da deia"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"Zain"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Deia:"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Laneko deia:"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> bidez jasotzen"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"Ustezko spam-deitzailea"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"Dei-erantzunetarako zenbakia: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">%s bidez deitzen</string>
+  <string name="incall_calling_on_same_carrier_template">Operadore berberarekin (%s) deitzen</string>
+  <string name="incall_calling_on_recent_choice_template">Duela gutxi aukeratutako operadorearekin (%s) deitzen</string>
+  <string name="incall_connecting">Deitzen…</string>
+  <string name="incall_connecting_assited_dialed">Deitzeko, erabili +%1$s (%2$s)…</string>
+  <string name="incall_connecting_assited_dialed_component">+%1$s (%2$s) erabiltzen…</string>
+  <string name="incall_transferring">Transferitzen…</string>
+  <string name="incall_video_call_requesting">Operadorearen bideo-deia egiten…</string>
+  <string name="incall_wifi_video_call_requesting">Operadorearen bideo-deia egiten Wi-Fi konexioa erabilita…</string>
+  <string name="incall_video_call_upgrade_request">Operadorearen bideo-deia modura aldatzen…</string>
+  <string name="incall_video_call_request_failed">Ezin da konektatu</string>
+  <string name="incall_video_call_request_rejected">Deia baztertu da</string>
+  <string name="incall_video_call_request_timed_out">Denbora-muga gainditu du deiak</string>
+  <string name="incall_hanging_up">Deia amaitzen</string>
+  <string name="incall_call_ended">Amaitu da deia</string>
+  <string name="incall_remotely_held">Zain</string>
+  <string name="contact_grid_incoming_video_call">Operadorearen bideo-deia:</string>
+  <string name="contact_grid_incoming_wifi_video_call">Operadorearen Wi-Fi bidezko bideo-deia:</string>
+  <string name="contact_grid_incoming_voice_call">Deia:</string>
+  <string name="contact_grid_incoming_work_call">Laneko deia:</string>
+  <string name="contact_grid_incoming_via_template">%s bidez jasotzen</string>
+  <string name="contact_grid_incoming_suspected_spam">Ustezko spam-deitzailea</string>
+  <string name="contact_grid_callback_number">Telefono-zenbaki hau: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-fa/strings.xml b/java/com/android/incallui/contactgrid/res/values-fa/strings.xml
index 453a3d2..6814e78 100644
--- a/java/com/android/incallui/contactgrid/res/values-fa/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-fa/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_calling_via_template" msgid="3416867359475780924">"تماس از طریق <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"در حال تماس…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"در حال انتقال..."</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"اتصال برقرار نشد"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"تماس پذیرفته نشد"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"مدت زمان تماس تمام شد"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"قطع تماس"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"تماس پایان یافت"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"درانتظار"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"تماس از"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"تماس کاری از"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"تماس‌های ورودی ازطریق <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"تماس‌گیرنده هرزنامه احتمالی"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"شماره پاسخ تماس: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">تماس از طریق %s</string>
+  <string name="incall_calling_on_same_carrier_template">تماس ازطریق شرکت مخابراتی %s یکسان</string>
+  <string name="incall_calling_on_recent_choice_template">تماس ازطریق انتخاب اخیر %s</string>
+  <string name="incall_connecting">در حال تماس…</string>
+  <string name="incall_connecting_assited_dialed">برقراری تماس با استفاده از %1$s+ (%2$s)…</string>
+  <string name="incall_connecting_assited_dialed_component">درحال استفاده از +%1$s (%2$s)…</string>
+  <string name="incall_transferring">در حال انتقال...</string>
+  <string name="incall_video_call_requesting">تماس ویدیویی شرکت مخابراتی…</string>
+  <string name="incall_wifi_video_call_requesting">‏تماس ویدیویی Wi-Fi شرکت مخابراتی…</string>
+  <string name="incall_video_call_upgrade_request">درحال تغییر وضعیت به ویدیوی شرکت مخابراتی…</string>
+  <string name="incall_video_call_request_failed">اتصال برقرار نشد</string>
+  <string name="incall_video_call_request_rejected">تماس پذیرفته نشد</string>
+  <string name="incall_video_call_request_timed_out">مدت زمان تماس تمام شد</string>
+  <string name="incall_hanging_up">قطع تماس</string>
+  <string name="incall_call_ended">تماس پایان یافت</string>
+  <string name="incall_remotely_held">درانتظار</string>
+  <string name="contact_grid_incoming_video_call">تماس ویدیویی شرکت مخابراتی از</string>
+  <string name="contact_grid_incoming_wifi_video_call">‏تماس ویدیویی Wi-Fi شرکت مخابراتی از</string>
+  <string name="contact_grid_incoming_voice_call">تماس از</string>
+  <string name="contact_grid_incoming_work_call">تماس کاری از</string>
+  <string name="contact_grid_incoming_via_template">تماس‌های ورودی ازطریق %s</string>
+  <string name="contact_grid_incoming_suspected_spam">تماس‌گیرنده هرزنامه احتمالی</string>
+  <string name="contact_grid_callback_number">شماره این تلفن: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-fi/strings.xml b/java/com/android/incallui/contactgrid/res/values-fi/strings.xml
index 12bc2d7..f12a58c 100644
--- a/java/com/android/incallui/contactgrid/res/values-fi/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-fi/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_calling_via_template" msgid="3416867359475780924">"Käytetään operaattoria <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"Soitetaan…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"Siirretään…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"Yhteyden muodostaminen epäonnistui"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"Puhelu hylätty"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"Puhelu aikakatkaistiin"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"Katkaistaan"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"Puhelu päättyi"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"Pidossa"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Puhelu henkilöltä"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Työpuhelu henkilöltä"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Saapuva puhelu (<xliff:g id="PROVIDER_NAME">%s</xliff:g>)"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"Mahdollinen häirikkösoittaja"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"Takaisinsoittonumero: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">Käytetään operaattoria %s</string>
+  <string name="incall_calling_on_same_carrier_template">Soitetaan samalla operaattorilla %s</string>
+  <string name="incall_calling_on_recent_choice_template">Soitetaan viimeksi valitulla operaattorilla %s</string>
+  <string name="incall_connecting">Soitetaan…</string>
+  <string name="incall_connecting_assited_dialed">Soitetaan numeroon +%1$s (%2$s)…</string>
+  <string name="incall_connecting_assited_dialed_component">Käytössä +%1$s (%2$s)…</string>
+  <string name="incall_transferring">Siirretään…</string>
+  <string name="incall_video_call_requesting">Soitetaan videopuhelua…</string>
+  <string name="incall_wifi_video_call_requesting">Soitetaan Wi-Fi-videopuhelua…</string>
+  <string name="incall_video_call_upgrade_request">Vaihdetaan videopuheluun…</string>
+  <string name="incall_video_call_request_failed">Yhteyden muodostaminen epäonnistui</string>
+  <string name="incall_video_call_request_rejected">Puhelu hylätty</string>
+  <string name="incall_video_call_request_timed_out">Puhelu aikakatkaistiin</string>
+  <string name="incall_hanging_up">Katkaistaan</string>
+  <string name="incall_call_ended">Puhelu päättyi</string>
+  <string name="incall_remotely_held">Pidossa</string>
+  <string name="contact_grid_incoming_video_call">Videopuhelu käyttäjältä</string>
+  <string name="contact_grid_incoming_wifi_video_call">Wi-Fi-videopuhelu käyttäjältä</string>
+  <string name="contact_grid_incoming_voice_call">Puhelu henkilöltä</string>
+  <string name="contact_grid_incoming_work_call">Työpuhelu henkilöltä</string>
+  <string name="contact_grid_incoming_via_template">Saapuva puhelu (%s)</string>
+  <string name="contact_grid_incoming_suspected_spam">Mahdollinen häirikkösoittaja</string>
+  <string name="contact_grid_callback_number">Tämän puhelimen numero: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-fr-rCA/strings.xml b/java/com/android/incallui/contactgrid/res/values-fr-rCA/strings.xml
index ddbd75a..17b2bc0 100644
--- a/java/com/android/incallui/contactgrid/res/values-fr-rCA/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-fr-rCA/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_calling_via_template" msgid="3416867359475780924">"Appel par <xliff:g id="PROVIDER_NAME">%s</xliff:g> en cours…"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"Appel en cours…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"Transfert en cours…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"Échec de la connexion"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"Appel refusé"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"Délai de connexion de l\'appel dépassé"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"Fin de l\'appel"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"Appel terminé"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"En attente"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Appel de"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Appel professionnel de"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Appel entrant par <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"Appel suspect"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"Numéro de rappel : <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">Appel par %s en cours…</string>
+  <string name="incall_calling_on_same_carrier_template">Appel avec le même fournisseur de services (%s)</string>
+  <string name="incall_calling_on_recent_choice_template">Appel avec le fournisseur de services habituel (%s)</string>
+  <string name="incall_connecting">Appel en cours…</string>
+  <string name="incall_connecting_assited_dialed">Appel utilisant +%1$s (%2$s) en cours…</string>
+  <string name="incall_connecting_assited_dialed_component">Utilisation du préfixe +%1$s (%2$s)…</string>
+  <string name="incall_transferring">Transfert en cours…</string>
+  <string name="incall_video_call_requesting">Appel vidéo par l\'entremise du fournisseur de services…</string>
+  <string name="incall_wifi_video_call_requesting">Appel vidéo Wi-Fi par l\'entremise du fournisseur de services…</string>
+  <string name="incall_video_call_upgrade_request">Conversion en appel vidéo par l\'entremise du fournisseur de services…</string>
+  <string name="incall_video_call_request_failed">Échec de la connexion</string>
+  <string name="incall_video_call_request_rejected">Appel refusé</string>
+  <string name="incall_video_call_request_timed_out">Délai de connexion de l\'appel dépassé</string>
+  <string name="incall_hanging_up">Fin de l\'appel</string>
+  <string name="incall_call_ended">Appel terminé</string>
+  <string name="incall_remotely_held">En attente</string>
+  <string name="contact_grid_incoming_video_call">Appel vidéo (par l\'entremise du fournisseur de services) de</string>
+  <string name="contact_grid_incoming_wifi_video_call">Appel vidéo Wi-Fi (par l\'entremise du fournisseur de services) de</string>
+  <string name="contact_grid_incoming_voice_call">Appel de</string>
+  <string name="contact_grid_incoming_work_call">Appel professionnel de</string>
+  <string name="contact_grid_incoming_via_template">Appel entrant par %s</string>
+  <string name="contact_grid_incoming_suspected_spam">Appel suspect</string>
+  <string name="contact_grid_callback_number">Numéro de ce téléphone : %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-fr/strings.xml b/java/com/android/incallui/contactgrid/res/values-fr/strings.xml
index c527f19..da7c68e 100644
--- a/java/com/android/incallui/contactgrid/res/values-fr/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-fr/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_calling_via_template" msgid="3416867359475780924">"Appel via <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"Appel en cours"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"Transfert…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"Impossible de se connecter"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"Appel refusé"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"Le délai d\'établissement de la communication a expiré."</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"Fin de l\'appel..."</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"Appel terminé"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"En attente"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Appel de"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Appel professionnel de"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Appel entrant via <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"Appel indésirable suspecté"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"Numéro de rappel : <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">Appel via %s</string>
+  <string name="incall_calling_on_same_carrier_template">Appel avec le même opérateur (%s)</string>
+  <string name="incall_calling_on_recent_choice_template">Appel avec l\'opérateur habituel (%s)</string>
+  <string name="incall_connecting">Appel en cours</string>
+  <string name="incall_connecting_assited_dialed">Appel en cours avec l\'indicatif +%1$s (%2$s)…</string>
+  <string name="incall_connecting_assited_dialed_component">Utilisation du préfixe +%1$s (%2$s)…</string>
+  <string name="incall_transferring">Transfert…</string>
+  <string name="incall_video_call_requesting">Appels vidéo via l\'opérateur…</string>
+  <string name="incall_wifi_video_call_requesting">Appel vidéo Wi-Fi via l\'opérateur…</string>
+  <string name="incall_video_call_upgrade_request">Conversion de l\'appel audio en appel vidéo…</string>
+  <string name="incall_video_call_request_failed">Impossible de se connecter</string>
+  <string name="incall_video_call_request_rejected">Appel refusé</string>
+  <string name="incall_video_call_request_timed_out">Le délai d\'établissement de la communication a expiré.</string>
+  <string name="incall_hanging_up">Fin de l\'appel...</string>
+  <string name="incall_call_ended">Appel terminé</string>
+  <string name="incall_remotely_held">En attente</string>
+  <string name="contact_grid_incoming_video_call">Appel vidéo (via l\'opérateur) de</string>
+  <string name="contact_grid_incoming_wifi_video_call">Appel vidéo Wi-Fi (via l\'opérateur) de</string>
+  <string name="contact_grid_incoming_voice_call">Appel de</string>
+  <string name="contact_grid_incoming_work_call">Appel professionnel de</string>
+  <string name="contact_grid_incoming_via_template">Appel entrant via %s</string>
+  <string name="contact_grid_incoming_suspected_spam">Appel indésirable suspecté</string>
+  <string name="contact_grid_callback_number">Numéro de ce téléphone : %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-gl/strings.xml b/java/com/android/incallui/contactgrid/res/values-gl/strings.xml
index 9633ca8..a139f4a 100644
--- a/java/com/android/incallui/contactgrid/res/values-gl/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-gl/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_calling_via_template" msgid="3416867359475780924">"Chamando a través de <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"Chamando…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"Transferindo…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"Non se pode conectar"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"Rexeitouse a chamada"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"A chamada superou o tempo de espera"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"Desconectando"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"Finalizouse a chamada"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"En espera"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Chamada de"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Chamada de traballo de"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Chamada entrante a través de <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"Chamada sospeitosa de spam"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"Número para devolver a chamada: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">Chamando a través de %s</string>
+  <string name="incall_calling_on_same_carrier_template">Chamada a través do mesmo operador (%s)</string>
+  <string name="incall_calling_on_recent_choice_template">Chamada a través dun operador seleccionado habitualmente (%s)</string>
+  <string name="incall_connecting">Chamando…</string>
+  <string name="incall_connecting_assited_dialed">Chamada usando +%1$s (%2$s)…</string>
+  <string name="incall_connecting_assited_dialed_component">Prefixo utilizado: +%1$s (%2$s)…</string>
+  <string name="incall_transferring">Transferindo…</string>
+  <string name="incall_video_call_requesting">Videochamadas a través do operador…</string>
+  <string name="incall_wifi_video_call_requesting">Videochamadas por wifi a través do operador…</string>
+  <string name="incall_video_call_upgrade_request">Cambiando a videochamada a través do operador…</string>
+  <string name="incall_video_call_request_failed">Non se pode conectar</string>
+  <string name="incall_video_call_request_rejected">Rexeitouse a chamada</string>
+  <string name="incall_video_call_request_timed_out">A chamada superou o tempo de espera</string>
+  <string name="incall_hanging_up">Desconectando</string>
+  <string name="incall_call_ended">Finalizouse a chamada</string>
+  <string name="incall_remotely_held">En espera</string>
+  <string name="contact_grid_incoming_video_call">Videochamada a través do operador de</string>
+  <string name="contact_grid_incoming_wifi_video_call">Videochamada por wifi a través do operador de</string>
+  <string name="contact_grid_incoming_voice_call">Chamada de</string>
+  <string name="contact_grid_incoming_work_call">Chamada de traballo de</string>
+  <string name="contact_grid_incoming_via_template">Chamada entrante a través de %s</string>
+  <string name="contact_grid_incoming_suspected_spam">Chamada sospeitosa de spam</string>
+  <string name="contact_grid_callback_number">Número deste teléfono: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-gu/strings.xml b/java/com/android/incallui/contactgrid/res/values-gu/strings.xml
index 61c3cba..b0c51b6 100644
--- a/java/com/android/incallui/contactgrid/res/values-gu/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-gu/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_calling_via_template" msgid="3416867359475780924">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> મારફતે કૉલ કરી રહ્યાં છે"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"કૉલ કરી રહ્યાં છે…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"સ્થાનાંતરિત કરી રહ્યું છે…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"કનેક્ટ કરવામાં અસમર્થ"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"કૉલ નકારાયો"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"કૉલનો સમય પૂરો થયો"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"સમાપ્ત કરી રહ્યાં છે"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"કૉલ સમાપ્ત થયો"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"હોલ્ડ પર"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"આમના તરફથી કૉલ"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"આમના તરફથી કાર્ય કૉલ"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> મારફતે ઇનકમિંગ"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"શંકાસ્પદ સ્પામ કૉલર"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"કૉલબેક નંબર: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">%s મારફતે કૉલ કરી રહ્યાં છે</string>
+  <string name="incall_calling_on_same_carrier_template">સમાન કૅરિઅર %s પરથી કૉલ કરી રહ્યાં છીએ</string>
+  <string name="incall_calling_on_recent_choice_template">તાજેતરની પસંદગી %s પરથી કૉલ કરી રહ્યાં છીએ</string>
+  <string name="incall_connecting">કૉલ કરી રહ્યાં છે…</string>
+  <string name="incall_connecting_assited_dialed">+%1$s (%2$s)નો ઉપયોગ કરીને કૉલ કરી રહ્યાં છીએ…</string>
+  <string name="incall_connecting_assited_dialed_component">+%1$s (%2$s)નો ઉપયોગ કરી રહ્યાં છીએ…</string>
+  <string name="incall_transferring">સ્થાનાંતરિત કરી રહ્યું છે…</string>
+  <string name="incall_video_call_requesting">કૅરિઅર મારફતે વીડિઓ કૉલ કરી રહ્યાં છીએ…</string>
+  <string name="incall_wifi_video_call_requesting">વાઇ-ફાઇ કૅરિઅર મારફતે વીડિઓ કૉલ કરી રહ્યાં છીએ…</string>
+  <string name="incall_video_call_upgrade_request">કૅરિઅર વીડિઓ પર સ્વિચ કરી રહ્યાં છીએ…</string>
+  <string name="incall_video_call_request_failed">કનેક્ટ કરવામાં અસમર્થ</string>
+  <string name="incall_video_call_request_rejected">કૉલ નકારાયો</string>
+  <string name="incall_video_call_request_timed_out">કૉલનો સમય પૂરો થયો</string>
+  <string name="incall_hanging_up">સમાપ્ત કરી રહ્યાં છે</string>
+  <string name="incall_call_ended">કૉલ સમાપ્ત થયો</string>
+  <string name="incall_remotely_held">હોલ્ડ પર</string>
+  <string name="contact_grid_incoming_video_call">આમના તરફથી કૅરિઅર મારફતે વીડિઓ કૉલ</string>
+  <string name="contact_grid_incoming_wifi_video_call">આમના તરફથી વાઇ-ફાઇ કૅરિઅર મારફતે વીડિઓ કૉલ</string>
+  <string name="contact_grid_incoming_voice_call">આમના તરફથી કૉલ</string>
+  <string name="contact_grid_incoming_work_call">આમના તરફથી કાર્ય કૉલ</string>
+  <string name="contact_grid_incoming_via_template">%s મારફતે ઇનકમિંગ</string>
+  <string name="contact_grid_incoming_suspected_spam">શંકાસ્પદ સ્પામ કૉલર</string>
+  <string name="contact_grid_callback_number">આ ફોનનો નંબર: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-hi/strings.xml b/java/com/android/incallui/contactgrid/res/values-hi/strings.xml
index f7be780..103b40f 100644
--- a/java/com/android/incallui/contactgrid/res/values-hi/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-hi/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_calling_via_template" msgid="3416867359475780924">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> के माध्यम से कॉल किया जा रहा है"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"कॉल किया जा रहा है..."</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"स्थानांतरित हो रहा है…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"कनेक्ट करने में असमर्थ"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"कॉल अस्‍वीकृत"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"कॉल का समय समाप्‍त"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"कॉल समाप्त हो रहा है"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"कॉल समाप्त"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"होल्ड पर"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"इससे कॉल"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"इससे कार्य संबंधी कॉल"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> की ओर से इनकमिंग"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"संदिग्ध स्पैम कॉलर"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"कॉलबैक नंबर: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">%s के माध्यम से कॉल किया जा रहा है</string>
+  <string name="incall_calling_on_same_carrier_template">एक ही वाहक %s के ज़रिए कॉल किया जा रहा है</string>
+  <string name="incall_calling_on_recent_choice_template">हाल ही में चुने गए वाहक %s के ज़रिए कॉल किया जा रहा है</string>
+  <string name="incall_connecting">कॉल किया जा रहा है...</string>
+  <string name="incall_connecting_assited_dialed">+%1$s (%2$s) का उपयोग करके कॉल कर रहा है…</string>
+  <string name="incall_connecting_assited_dialed_component">+%1$s (%2$s) का उपयोग किया जा रहा है…</string>
+  <string name="incall_transferring">ट्रांसफ़र किया जा रहा है…</string>
+  <string name="incall_video_call_requesting">वाहक वीडियो कॉलिंग…</string>
+  <string name="incall_wifi_video_call_requesting">वाई-फ़ाई वाहक वीडियो कॉलिंग…</string>
+  <string name="incall_video_call_upgrade_request">वाहक वीडियो पर स्विच हो रहा है …</string>
+  <string name="incall_video_call_request_failed">कनेक्ट करने में असमर्थ</string>
+  <string name="incall_video_call_request_rejected">कॉल अस्‍वीकृत</string>
+  <string name="incall_video_call_request_timed_out">कॉल का समय समाप्‍त</string>
+  <string name="incall_hanging_up">कॉल समाप्त हो रहा है</string>
+  <string name="incall_call_ended">कॉल समाप्त</string>
+  <string name="incall_remotely_held">होल्ड पर</string>
+  <string name="contact_grid_incoming_video_call">इस व्यक्ति की ओर से वाहक वीडियो कॉल</string>
+  <string name="contact_grid_incoming_wifi_video_call">इस व्यक्ति की ओर से वाई-फ़ाई वाहक वीडियो कॉल</string>
+  <string name="contact_grid_incoming_voice_call">इससे कॉल</string>
+  <string name="contact_grid_incoming_work_call">इससे कार्य संबंधी कॉल</string>
+  <string name="contact_grid_incoming_via_template">%s की ओर से इनकमिंग</string>
+  <string name="contact_grid_incoming_suspected_spam">संदिग्ध स्पैम कॉलर</string>
+  <string name="contact_grid_callback_number">इस फ़ोन का नंबर: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-hr/strings.xml b/java/com/android/incallui/contactgrid/res/values-hr/strings.xml
index a38f644..1bad571 100644
--- a/java/com/android/incallui/contactgrid/res/values-hr/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-hr/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_calling_via_template" msgid="3416867359475780924">"Pozivanje putem operatera <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"Pozivanje…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"Prenošenje..."</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"Povezivanje nije moguće"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"Poziv je odbijen"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"Poziv je istekao"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"Prekidanje veze"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"Poziv je završio"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"Na čekanju"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Poziv s broja"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Poslovni poziv s broja"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Dolazni pozivi putem davatelja <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"Mogući neželjeni pozivatelj"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"Broj za povratni poziv: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">Pozivanje putem operatera %s</string>
+  <string name="incall_calling_on_same_carrier_template">Pozivanje putem istog operatera %s</string>
+  <string name="incall_calling_on_recent_choice_template">Pozivanje prema posljednjem odabiru operatera %s</string>
+  <string name="incall_connecting">Pozivanje…</string>
+  <string name="incall_connecting_assited_dialed">Pozivanje broja +%1$s (%2$s)…</string>
+  <string name="incall_connecting_assited_dialed_component">Upotrebljava se +%1$s (%2$s)…</string>
+  <string name="incall_transferring">Prenošenje...</string>
+  <string name="incall_video_call_requesting">Uspostavljanje videopoziva putem mobilnog operatera...</string>
+  <string name="incall_wifi_video_call_requesting">Uspostavljanje Wi-Fi videpoziva putem mobilnog operatera…</string>
+  <string name="incall_video_call_upgrade_request">Prebacivanje na videopoziv putem mobilnog operatera…</string>
+  <string name="incall_video_call_request_failed">Povezivanje nije moguće</string>
+  <string name="incall_video_call_request_rejected">Poziv je odbijen</string>
+  <string name="incall_video_call_request_timed_out">Poziv je istekao</string>
+  <string name="incall_hanging_up">Prekidanje veze</string>
+  <string name="incall_call_ended">Poziv je završio</string>
+  <string name="incall_remotely_held">Na čekanju</string>
+  <string name="contact_grid_incoming_video_call">Videopoziv putem mobilnog operatera od</string>
+  <string name="contact_grid_incoming_wifi_video_call">Wi-Fi videopoziv putem mobilnog operatera od</string>
+  <string name="contact_grid_incoming_voice_call">Poziv s broja</string>
+  <string name="contact_grid_incoming_work_call">Poslovni poziv s broja</string>
+  <string name="contact_grid_incoming_via_template">Dolazni pozivi putem davatelja %s</string>
+  <string name="contact_grid_incoming_suspected_spam">Mogući neželjeni pozivatelj</string>
+  <string name="contact_grid_callback_number">Broj ovog telefona: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-hu/strings.xml b/java/com/android/incallui/contactgrid/res/values-hu/strings.xml
index 978a11d..39a9dee 100644
--- a/java/com/android/incallui/contactgrid/res/values-hu/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-hu/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_calling_via_template" msgid="3416867359475780924">"Hívás a(z) <xliff:g id="PROVIDER_NAME">%s</xliff:g> szolgáltatón keresztül"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"Hívás…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"Átirányítás…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"Nem sikerült kapcsolódni"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"Hívás elutasítva"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"A hívás túllépte az időkorlátot"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"Megszakítás"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"A hívás befejeződött"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"Várakoztatva"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Hívás a következőtől:"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Munkahelyi hívás a következőről:"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Bejövő hívás a következőn keresztül: <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"Feltételezett spamhívó"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"Visszahívható telefonszám: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">Hívás a(z) %s szolgáltatón keresztül</string>
+  <string name="incall_calling_on_same_carrier_template">Hívás ugyanazon a szolgáltatón (%s) keresztül</string>
+  <string name="incall_calling_on_recent_choice_template">Hívás a legutóbb használt szolgáltatón (%s) keresztül</string>
+  <string name="incall_connecting">Hívás…</string>
+  <string name="incall_connecting_assited_dialed">Hívás a következővel: +%1$s (%2$s)…</string>
+  <string name="incall_connecting_assited_dialed_component">A következő használata: +%1$s (%2$s)…</string>
+  <string name="incall_transferring">Átirányítás…</string>
+  <string name="incall_video_call_requesting">Szolgáltatói videohívás…</string>
+  <string name="incall_wifi_video_call_requesting">Wi-Fi-alapú szolgáltatói videohívás…</string>
+  <string name="incall_video_call_upgrade_request">Váltás szolgáltatói videohívásra…</string>
+  <string name="incall_video_call_request_failed">Nem sikerült kapcsolódni</string>
+  <string name="incall_video_call_request_rejected">Hívás elutasítva</string>
+  <string name="incall_video_call_request_timed_out">A hívás túllépte az időkorlátot</string>
+  <string name="incall_hanging_up">Megszakítás</string>
+  <string name="incall_call_ended">A hívás befejeződött</string>
+  <string name="incall_remotely_held">Várakoztatva</string>
+  <string name="contact_grid_incoming_video_call">Szolgáltatói videohívás tőle</string>
+  <string name="contact_grid_incoming_wifi_video_call">Wi-Fi-alapú szolgáltatói videohívás tőle</string>
+  <string name="contact_grid_incoming_voice_call">Hívás a következőtől:</string>
+  <string name="contact_grid_incoming_work_call">Munkahelyi hívás a következőről:</string>
+  <string name="contact_grid_incoming_via_template">Bejövő hívás a következőn keresztül: %s</string>
+  <string name="contact_grid_incoming_suspected_spam">Feltételezett spamhívó</string>
+  <string name="contact_grid_callback_number">A telefon száma: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-hy/strings.xml b/java/com/android/incallui/contactgrid/res/values-hy/strings.xml
index 0ed82dc..92ec0a5 100644
--- a/java/com/android/incallui/contactgrid/res/values-hy/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-hy/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_calling_via_template" msgid="3416867359475780924">"Զանգում է <xliff:g id="PROVIDER_NAME">%s</xliff:g>-ի միջոցով"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"Զանգ…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"Փոխանցում…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"Չհաջողվեց միանալ"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"Զանգը մերժվեց"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"Զանգի սպասման ժամանակը սպառվեց"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"Անջատում"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"Զանգն ավարտվեց"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"Սպասում"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Զանգ հետևյալ բաժանորդից՝"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Գործնական զանգ հետևյալ բաժանորդից՝"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Մուտքային զանգ <xliff:g id="PROVIDER_NAME">%s</xliff:g> ցանցից"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"Հավանաբար լցոն է"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"Հետադարձ զանգի համարը՝ <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">Զանգում է %s-ի միջոցով</string>
+  <string name="incall_calling_on_same_carrier_template">Զանգը կատարվում է միևնույն օպերատորի (%s) ցանցում</string>
+  <string name="incall_calling_on_recent_choice_template">Զանգը կատարվում է վերջին ընտրված օպերատորի (%s) ցանցում</string>
+  <string name="incall_connecting">Զանգ…</string>
+  <string name="incall_connecting_assited_dialed">Զանգ +%1$s կոդով (%2$s)…</string>
+  <string name="incall_connecting_assited_dialed_component">Օգտագործվում է +%1$s (%2$s) ձևաչափը…</string>
+  <string name="incall_transferring">Փոխանցում…</string>
+  <string name="incall_video_call_requesting">Տեսազանգ բջջային ցանցով…</string>
+  <string name="incall_wifi_video_call_requesting">Տեսազանգ Wi-Fi-ով…</string>
+  <string name="incall_video_call_upgrade_request">Անցում տեսազանգի (բջջային ցանցով)…</string>
+  <string name="incall_video_call_request_failed">Չհաջողվեց միանալ</string>
+  <string name="incall_video_call_request_rejected">Զանգը մերժվեց</string>
+  <string name="incall_video_call_request_timed_out">Զանգի սպասման ժամանակը սպառվեց</string>
+  <string name="incall_hanging_up">Անջատում</string>
+  <string name="incall_call_ended">Զանգն ավարտվեց</string>
+  <string name="incall_remotely_held">Սպասում</string>
+  <string name="contact_grid_incoming_video_call">Տեսազանգ հետևյալ բաժանորդից (բջջային ցանցով)՝</string>
+  <string name="contact_grid_incoming_wifi_video_call">Տեսազանգ հետևյալ բաժանորդից (Wi-Fi-ով)՝</string>
+  <string name="contact_grid_incoming_voice_call">Զանգ հետևյալ բաժանորդից՝</string>
+  <string name="contact_grid_incoming_work_call">Գործնական զանգ հետևյալ բաժանորդից՝</string>
+  <string name="contact_grid_incoming_via_template">Մուտքային զանգ %s ցանցից</string>
+  <string name="contact_grid_incoming_suspected_spam">Հավանաբար սպամ է</string>
+  <string name="contact_grid_callback_number">Այս հեռախոսի համարը՝ %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-in/strings.xml b/java/com/android/incallui/contactgrid/res/values-in/strings.xml
index afba5cc..e93c580 100644
--- a/java/com/android/incallui/contactgrid/res/values-in/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-in/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_calling_via_template" msgid="3416867359475780924">"Menelepon melalui <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"Menelepon…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"Mentransfer…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"Tidak dapat tersambung"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"Panggilan telepon ditolak"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"Batas waktu panggilan telepon habis"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"Menutup panggilan"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"Panggilan telepon diakhiri"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"Ditangguhkan"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Telepon dari"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Panggilan telepon kerja dari"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Masuk melalui <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"Diduga telepon spam"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"Nomor panggilan balik: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">Menelepon melalui %s</string>
+  <string name="incall_calling_on_same_carrier_template">Menelepon pada operator yang sama %s</string>
+  <string name="incall_calling_on_recent_choice_template">Menelepon pada provider pilihan terbaru %s</string>
+  <string name="incall_connecting">Menelepon…</string>
+  <string name="incall_connecting_assited_dialed">Menelepon nomor +%1$s (%2$s)…</string>
+  <string name="incall_connecting_assited_dialed_component">Menggunakan +%1$s (%2$s)…</string>
+  <string name="incall_transferring">Mentransfer…</string>
+  <string name="incall_video_call_requesting">Video call operator…</string>
+  <string name="incall_wifi_video_call_requesting">Video call operator Wi-Fi…</string>
+  <string name="incall_video_call_upgrade_request">Beralih ke video operator…</string>
+  <string name="incall_video_call_request_failed">Tidak dapat tersambung</string>
+  <string name="incall_video_call_request_rejected">Panggilan telepon ditolak</string>
+  <string name="incall_video_call_request_timed_out">Batas waktu panggilan telepon habis</string>
+  <string name="incall_hanging_up">Menutup panggilan</string>
+  <string name="incall_call_ended">Panggilan telepon diakhiri</string>
+  <string name="incall_remotely_held">Ditangguhkan</string>
+  <string name="contact_grid_incoming_video_call">Video call operator dari</string>
+  <string name="contact_grid_incoming_wifi_video_call">Video call operator Wi-Fi dari</string>
+  <string name="contact_grid_incoming_voice_call">Telepon dari</string>
+  <string name="contact_grid_incoming_work_call">Panggilan telepon kerja dari</string>
+  <string name="contact_grid_incoming_via_template">Masuk melalui %s</string>
+  <string name="contact_grid_incoming_suspected_spam">Diduga telepon spam</string>
+  <string name="contact_grid_callback_number">Nomor telepon: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-is/strings.xml b/java/com/android/incallui/contactgrid/res/values-is/strings.xml
index d01f096..8be33bb 100644
--- a/java/com/android/incallui/contactgrid/res/values-is/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-is/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_calling_via_template" msgid="3416867359475780924">"Hringt í gegnum <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"Hringir…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"Flytur…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"Tenging tókst ekki"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"Símtali hafnað"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"Símtalstími rann út"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"Leggur á"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"Lagt á"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"Í bið"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Símtal berst frá"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Vinnusímtal berst frá"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Berst í gegnum <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"Mögulegt ruslnúmer"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"Svarhringingarnúmer: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">Hringt í gegnum %s</string>
+  <string name="incall_calling_on_same_carrier_template">Hringir með sama símafyrirtæki, %s</string>
+  <string name="incall_calling_on_recent_choice_template">Hringir með nýlegu vali, %s</string>
+  <string name="incall_connecting">Hringir…</string>
+  <string name="incall_connecting_assited_dialed">Hringir með +%1$s (%2$s)…</string>
+  <string name="incall_connecting_assited_dialed_component">Notar +%1$s (%2$s)…</string>
+  <string name="incall_transferring">Flytur…</string>
+  <string name="incall_video_call_requesting">Myndsímtal um símkerfi…</string>
+  <string name="incall_wifi_video_call_requesting">Wi-Fi myndsímtal…</string>
+  <string name="incall_video_call_upgrade_request">Skiptir yfir í myndsímtal um símkerfi…</string>
+  <string name="incall_video_call_request_failed">Tenging tókst ekki</string>
+  <string name="incall_video_call_request_rejected">Símtali hafnað</string>
+  <string name="incall_video_call_request_timed_out">Símtalstími rann út</string>
+  <string name="incall_hanging_up">Leggur á</string>
+  <string name="incall_call_ended">Lagt á</string>
+  <string name="incall_remotely_held">Í bið</string>
+  <string name="contact_grid_incoming_video_call">Myndsímtal um símkerfi frá</string>
+  <string name="contact_grid_incoming_wifi_video_call">Wi-Fi myndsímtal frá</string>
+  <string name="contact_grid_incoming_voice_call">Símtal berst frá</string>
+  <string name="contact_grid_incoming_work_call">Vinnusímtal berst frá</string>
+  <string name="contact_grid_incoming_via_template">Berst í gegnum %s</string>
+  <string name="contact_grid_incoming_suspected_spam">Mögulegt ruslnúmer</string>
+  <string name="contact_grid_callback_number">Símanúmer þessa síma: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-it/strings.xml b/java/com/android/incallui/contactgrid/res/values-it/strings.xml
index 9d39a81..9147c13 100644
--- a/java/com/android/incallui/contactgrid/res/values-it/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-it/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_calling_via_template" msgid="3416867359475780924">"Chiamate tramite <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"Chiamata…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"Trasferimento…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"Impossibile collegarsi"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"Chiamata rifiutata"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"Timeout della chiamata"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"In fase di chiusura"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"Chiamata terminata"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"In attesa"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Chiamata da"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Chiamata di lavoro da"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"In arrivo tramite <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"Presunto spammer"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"Numero da richiamare: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">Chiamate tramite %s</string>
+  <string name="incall_calling_on_same_carrier_template">Chiamata tramite lo stesso operatore %s</string>
+  <string name="incall_calling_on_recent_choice_template">Chiamata tramite una scelta recente %s</string>
+  <string name="incall_connecting">Chiamata…</string>
+  <string name="incall_connecting_assited_dialed">Chiamata utilizzando +%1$s (%2$s)…</string>
+  <string name="incall_connecting_assited_dialed_component">Uso di +%1$s (%2$s)…</string>
+  <string name="incall_transferring">Trasferimento…</string>
+  <string name="incall_video_call_requesting">Videochiamata dell\'operatore…</string>
+  <string name="incall_wifi_video_call_requesting">Videochiamata Wi-Fi dell\'operatore…</string>
+  <string name="incall_video_call_upgrade_request">Passaggio al video dell\'operatore…</string>
+  <string name="incall_video_call_request_failed">Impossibile collegarsi</string>
+  <string name="incall_video_call_request_rejected">Chiamata rifiutata</string>
+  <string name="incall_video_call_request_timed_out">Timeout della chiamata</string>
+  <string name="incall_hanging_up">In fase di chiusura</string>
+  <string name="incall_call_ended">Chiamata terminata</string>
+  <string name="incall_remotely_held">In attesa</string>
+  <string name="contact_grid_incoming_video_call">Videochiamata dell\'operatore da</string>
+  <string name="contact_grid_incoming_wifi_video_call">Videochiamata Wi-Fi dell\'operatore da</string>
+  <string name="contact_grid_incoming_voice_call">Chiamata da</string>
+  <string name="contact_grid_incoming_work_call">Chiamata di lavoro da</string>
+  <string name="contact_grid_incoming_via_template">In arrivo tramite %s</string>
+  <string name="contact_grid_incoming_suspected_spam">Presunto spammer</string>
+  <string name="contact_grid_callback_number">Il numero di questo telefono: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-iw/strings.xml b/java/com/android/incallui/contactgrid/res/values-iw/strings.xml
index 10c3ebf..3495ddb 100644
--- a/java/com/android/incallui/contactgrid/res/values-iw/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-iw/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_calling_via_template" msgid="3416867359475780924">"שיחה באמצעות <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"מתקשר…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"מעביר…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"לא ניתן להתחבר"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"השיחה נדחתה"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"הזמן שהוקצב לשיחה תם"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"מנתק"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"השיחה הסתיימה"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"בהמתנה"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"שיחה מאת"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"שיחת עבודה מאת"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"שיחה נכנסת באמצעות <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"חשד לשיחת ספאם"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"מספר להתקשרות בחזרה: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">שיחה באמצעות %s</string>
+  <string name="incall_calling_on_same_carrier_template">התקשרות באמצעות אותו ספק סלולרי, %s</string>
+  <string name="incall_calling_on_recent_choice_template">התקשרות באמצעות האפשרות האחרונה שנבחרה, %s</string>
+  <string name="incall_connecting">מתקשר…</string>
+  <string name="incall_connecting_assited_dialed">התקשרות עם הקידומת %1$s+ (%2$s)…</string>
+  <string name="incall_connecting_assited_dialed_component">המערכת משתמשת בקידומת %1$s+ (%2$s)…</string>
+  <string name="incall_transferring">מעביר…</string>
+  <string name="incall_video_call_requesting">מיד נתחיל שיחת וידאו דרך הספק הסלולרי…</string>
+  <string name="incall_wifi_video_call_requesting">‏מיד נתחיל שיחת וידאו דרך רשת Wi-Fi…</string>
+  <string name="incall_video_call_upgrade_request">אנחנו עוברים לווידאו דרך הספק הסלולרי…</string>
+  <string name="incall_video_call_request_failed">לא ניתן להתחבר</string>
+  <string name="incall_video_call_request_rejected">השיחה נדחתה</string>
+  <string name="incall_video_call_request_timed_out">הזמן שהוקצב לשיחה תם</string>
+  <string name="incall_hanging_up">מנתק</string>
+  <string name="incall_call_ended">השיחה הסתיימה</string>
+  <string name="incall_remotely_held">בהמתנה</string>
+  <string name="contact_grid_incoming_video_call">שיחת וידאו דרך הספק הסלולרי מאת</string>
+  <string name="contact_grid_incoming_wifi_video_call">‏שיחת וידאו דרך רשת Wi-Fi מאת</string>
+  <string name="contact_grid_incoming_voice_call">שיחה מאת</string>
+  <string name="contact_grid_incoming_work_call">שיחת עבודה מאת</string>
+  <string name="contact_grid_incoming_via_template">שיחה נכנסת באמצעות %s</string>
+  <string name="contact_grid_incoming_suspected_spam">חשד לשיחת ספאם</string>
+  <string name="contact_grid_callback_number">מספר הטלפון הזה: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-ja/strings.xml b/java/com/android/incallui/contactgrid/res/values-ja/strings.xml
index f44b1c9..bdafab1 100644
--- a/java/com/android/incallui/contactgrid/res/values-ja/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-ja/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_calling_via_template" msgid="3416867359475780924">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> で発信中"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"発信中…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"転送中…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"接続できません"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"通話が拒否されました"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"通話がタイムアウトしました"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"通話を終了中"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"通話終了"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"保留中"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"着信"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"仕事の通話の着信"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> から着信"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"迷惑電話の疑いあり"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"折り返し番号: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">%s で発信中</string>
+  <string name="incall_calling_on_same_carrier_template">同じ携帯通信会社（%s）で発信中</string>
+  <string name="incall_calling_on_recent_choice_template">最近選択した携帯通信会社（%s）で発信中</string>
+  <string name="incall_connecting">発信中…</string>
+  <string name="incall_connecting_assited_dialed">電話番号に +%1$s（%2$s）を付けて発信しています…</string>
+  <string name="incall_connecting_assited_dialed_component">+%1$s（%2$s）を使用しています…</string>
+  <string name="incall_transferring">転送中…</string>
+  <string name="incall_video_call_requesting">携帯通信会社経由でビデオ通話を発信しています…</string>
+  <string name="incall_wifi_video_call_requesting">Wi-Fi 経由でビデオ通話を発信しています…</string>
+  <string name="incall_video_call_upgrade_request">携帯通信会社経由のビデオ通話に切り替えています…</string>
+  <string name="incall_video_call_request_failed">接続できません</string>
+  <string name="incall_video_call_request_rejected">通話が拒否されました</string>
+  <string name="incall_video_call_request_timed_out">通話がタイムアウトしました</string>
+  <string name="incall_hanging_up">通話を終了中</string>
+  <string name="incall_call_ended">通話終了</string>
+  <string name="incall_remotely_held">保留中</string>
+  <string name="contact_grid_incoming_video_call">携帯通信会社経由でビデオ通話を着信中</string>
+  <string name="contact_grid_incoming_wifi_video_call">Wi-Fi 経由でビデオ通話を着信中</string>
+  <string name="contact_grid_incoming_voice_call">着信</string>
+  <string name="contact_grid_incoming_work_call">仕事の通話の着信</string>
+  <string name="contact_grid_incoming_via_template">%s から着信</string>
+  <string name="contact_grid_incoming_suspected_spam">迷惑電話の疑いあり</string>
+  <string name="contact_grid_callback_number">この電話番号: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-ka/strings.xml b/java/com/android/incallui/contactgrid/res/values-ka/strings.xml
index f799561..fdc2232 100644
--- a/java/com/android/incallui/contactgrid/res/values-ka/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-ka/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_calling_via_template" msgid="3416867359475780924">"მიმდინარეობს დარეკვა <xliff:g id="PROVIDER_NAME">%s</xliff:g>-ის მეშვეობით"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"დარეკვა…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"გადაცემა…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"დაკავშირება შეუძლებელია"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"ზარი უარყოფილია"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"ზარის დრო ამოიწურა"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"მიმდინარეობს გათიშვა"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"ზარი დასრულდა"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"მოცდის რეჟიმში"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"ზარი აბონენტისგან"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"სამსახურებრივი ზარი აბონენტისგან"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"შემომავალი, <xliff:g id="PROVIDER_NAME">%s</xliff:g>-იდან"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"სავარაუდოდ სპამერი აბონენტი"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"ნომერი გადმორეკვისთვის: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">მიმდინარეობს დარეკვა %s-ის მეშვეობით</string>
+  <string name="incall_calling_on_same_carrier_template">მიმდინარეობს დარეკვა იმავე ოპერატორზე: %s</string>
+  <string name="incall_calling_on_recent_choice_template">მიმდინარეობს დარეკვა ბოლოს არჩეულზე: %s</string>
+  <string name="incall_connecting">დარეკვა…</string>
+  <string name="incall_connecting_assited_dialed">ირეკება +%1$s-ის (%2$s) გამოყენებით…</string>
+  <string name="incall_connecting_assited_dialed_component">იყენებთ: +%1$s (%2$s)…</string>
+  <string name="incall_transferring">გადაცემა…</string>
+  <string name="incall_video_call_requesting">ვიდეო დარეკვა ოპერატორით…</string>
+  <string name="incall_wifi_video_call_requesting">მიმდინარეობს ვიდეო დარეკვა Wi-Fi ოპერატორით…</string>
+  <string name="incall_video_call_upgrade_request">მიმდინარეობს ოპერატორით ვიდეო დარეკვაზე გადართვა…</string>
+  <string name="incall_video_call_request_failed">დაკავშირება შეუძლებელია</string>
+  <string name="incall_video_call_request_rejected">ზარი უარყოფილია</string>
+  <string name="incall_video_call_request_timed_out">ზარის დრო ამოიწურა</string>
+  <string name="incall_hanging_up">მიმდინარეობს გათიშვა</string>
+  <string name="incall_call_ended">ზარი დასრულდა</string>
+  <string name="incall_remotely_held">მოცდის რეჟიმში</string>
+  <string name="contact_grid_incoming_video_call">ვიდეოზარი ოპერატორით ნომრიდან</string>
+  <string name="contact_grid_incoming_wifi_video_call">ვიდეოზარი Wi-Fi ოპერატორით ნომრიდან</string>
+  <string name="contact_grid_incoming_voice_call">ზარი აბონენტისგან</string>
+  <string name="contact_grid_incoming_work_call">სამსახურებრივი ზარი აბონენტისგან</string>
+  <string name="contact_grid_incoming_via_template">შემომავალი, %s-იდან</string>
+  <string name="contact_grid_incoming_suspected_spam">სავარაუდოდ სპამერი აბონენტი</string>
+  <string name="contact_grid_callback_number">ამ ტელეფონის ნომერი: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-kk/strings.xml b/java/com/android/incallui/contactgrid/res/values-kk/strings.xml
index d80b915..e0d6e63 100644
--- a/java/com/android/incallui/contactgrid/res/values-kk/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-kk/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_calling_via_template" msgid="3416867359475780924">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> арқылы қоңырау шалу"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"Қоңырау шалуда…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"Тасымалдануда..."</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"Қосылу мүмкін емес"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"Қоңырау қабылданбады"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"Қоңырау уақыты бітті"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"Қоңырау аяқталуда"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"Қоңырау аяқталды"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"Күтуде"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Қоңырау шалушы:"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Жұмыстан қоңырау шалушы:"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> арқылы кіріс"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"Спам қоңырау шалушы болуы мүмкін"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"Кері қоңырау шалу нөмірі: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">%s арқылы қоңырау шалу</string>
+  <string name="incall_calling_on_same_carrier_template">Қоңырау шалушы қолданған %s операторы қолданылуда</string>
+  <string name="incall_calling_on_recent_choice_template">Бірнеше рет таңдалған %s операторы қолданылуда</string>
+  <string name="incall_connecting">Қоңырау шалуда…</string>
+  <string name="incall_connecting_assited_dialed">+%1$s (%2$s) кодымен қоңырау шалу…</string>
+  <string name="incall_connecting_assited_dialed_component">+%1$s (%2$s) пайдаланылуда…</string>
+  <string name="incall_transferring">Тасымалдануда...</string>
+  <string name="incall_video_call_requesting">Оператор бейне қоңырауы...</string>
+  <string name="incall_wifi_video_call_requesting">Wi-Fi бейне қоңырауы…</string>
+  <string name="incall_video_call_upgrade_request">Оператор бейне қоңырауына ауысуда…</string>
+  <string name="incall_video_call_request_failed">Қосылу мүмкін емес</string>
+  <string name="incall_video_call_request_rejected">Қоңырау қабылданбады</string>
+  <string name="incall_video_call_request_timed_out">Қоңырау уақыты бітті</string>
+  <string name="incall_hanging_up">Қоңырау аяқталуда</string>
+  <string name="incall_call_ended">Қоңырау аяқталды</string>
+  <string name="incall_remotely_held">Күтуде</string>
+  <string name="contact_grid_incoming_video_call">Оператор бейне қоңырауы:</string>
+  <string name="contact_grid_incoming_wifi_video_call">Wi-Fi бейне қоңырауы:</string>
+  <string name="contact_grid_incoming_voice_call">Қоңырау шалушы:</string>
+  <string name="contact_grid_incoming_work_call">Жұмыстан қоңырау шалушы:</string>
+  <string name="contact_grid_incoming_via_template">%s арқылы кіріс</string>
+  <string name="contact_grid_incoming_suspected_spam">Спам қоңырау шалушы болуы мүмкін</string>
+  <string name="contact_grid_callback_number">Телефон нөмірі: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-km/strings.xml b/java/com/android/incallui/contactgrid/res/values-km/strings.xml
index f19eb72..c75146e 100644
--- a/java/com/android/incallui/contactgrid/res/values-km/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-km/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_calling_via_template" msgid="3416867359475780924">"កំពុង​ហៅតាម <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"កំពុង​ហៅ..."</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"កំពុងផ្ទេរ..."</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"មិនអាច​ភ្ជាប់​បាន"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"បាន​បដិសេធ​ការ​ហៅ"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"ការ​ហៅ​បាន​អស់​ពេល"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"បញ្ចប់​ការ​សន្ទនា"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"បាន​បញ្ចប់​ការ​ហៅ"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"កំពុង​រង់ចាំ"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"ការ​ហៅ​ពី"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"ការ​ហៅ​ការងារ​ពី"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"ការ​ហៅ​ចូល​តាម <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"អ្នក​ហៅ​​បន្លំ​ដែល​សង្ស័យ"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"លេខ​ហៅ​ត្រឡប់​វិញ៖ <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">កំពុង​ហៅតាម %s</string>
+  <string name="incall_calling_on_same_carrier_template">កំពុង​ហៅ​ទូរសព្ទ​តាមក្រុមហ៊ុន​សេវា​ទូរសព្ទ %s ដូចគ្នា</string>
+  <string name="incall_calling_on_recent_choice_template">កំពុង​ហៅ​ទូរសព្ទ​លើ​ជម្រើស %s ថ្មីៗ</string>
+  <string name="incall_connecting">កំពុង​ហៅ...</string>
+  <string name="incall_connecting_assited_dialed">កំពុង​ហៅ​ទូរសព្ទ ដោយ​ប្រើប្រាស់ +%1$s (%2$s)…</string>
+  <string name="incall_connecting_assited_dialed_component">កំពុង​ប្រើប្រាស់ +%1$s (%2$s)…</string>
+  <string name="incall_transferring">កំពុងផ្ទេរ...</string>
+  <string name="incall_video_call_requesting">កំពុង​ហៅជា​វីដេអូ​តាម​ក្រុមហ៊ុន​បម្រើ​សេវា​ទូរសព្ទ...</string>
+  <string name="incall_wifi_video_call_requesting">កំពុង​ហៅ​ជា​វីដេអូ​តាម​ក្រុមហ៊ុន​បម្រើ​សេវា​ទូរសព្ទ​តាម Wi-Fi…</string>
+  <string name="incall_video_call_upgrade_request">កំពុង​ប្ដូរ​ទៅ​ការហៅ​ជា​វីដេអូ​តាម​ក្រុមហ៊ុន​បម្រើ​សេវា​ទូរសព្ទ…</string>
+  <string name="incall_video_call_request_failed">មិនអាច​ភ្ជាប់​បាន</string>
+  <string name="incall_video_call_request_rejected">បាន​បដិសេធ​ការ​ហៅ</string>
+  <string name="incall_video_call_request_timed_out">ការ​ហៅ​បាន​អស់​ពេល</string>
+  <string name="incall_hanging_up">បញ្ចប់​ការ​សន្ទនា</string>
+  <string name="incall_call_ended">បាន​បញ្ចប់​ការ​ហៅ</string>
+  <string name="incall_remotely_held">កំពុង​រង់ចាំ</string>
+  <string name="contact_grid_incoming_video_call">ការហៅ​ជា​​វីដេអូ​លើ​ក្រុមហ៊ុន​បម្រើ​សេវា​ទូរសព្ទ​ពី</string>
+  <string name="contact_grid_incoming_wifi_video_call">ការហៅ​ជា​វីដេអូ​តាម​ក្រុមហ៊ុន​បម្រើ​សេវា​ទូរសព្ទ​តាម Wi-Fi ពី</string>
+  <string name="contact_grid_incoming_voice_call">ការ​ហៅ​ពី</string>
+  <string name="contact_grid_incoming_work_call">ការ​ហៅ​ការងារ​ពី</string>
+  <string name="contact_grid_incoming_via_template">ការ​ហៅ​ចូល​តាម %s</string>
+  <string name="contact_grid_incoming_suspected_spam">អ្នក​ហៅ​​បន្លំ​ដែល​សង្ស័យ</string>
+  <string name="contact_grid_callback_number">លេខ​ទូរសព្ទ​នេះ៖ %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-kn/strings.xml b/java/com/android/incallui/contactgrid/res/values-kn/strings.xml
index 927b54a..33e21ed 100644
--- a/java/com/android/incallui/contactgrid/res/values-kn/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-kn/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_calling_via_template" msgid="3416867359475780924">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> ಮೂಲಕ ಕರೆ ಮಾಡಲಾಗುತ್ತಿದೆ"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"ಕರೆ ಮಾಡಲಾಗುತ್ತಿದೆ..."</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"ವರ್ಗಾಯಿಸಲಾಗುತ್ತಿದೆ..."</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"ಸಂಪರ್ಕಿಸಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"ಕರೆ ನಿರಾಕರಿಸಲಾಗಿದೆ"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"ಕರೆ ಅವಧಿ ಮೀರಿದೆ"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"ಹ್ಯಾಂಗ್ ಮಾಡಲಾಗುತ್ತಿದೆ"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"ಕರೆ ಅಂತ್ಯಗೊಂಡಿದೆ"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"ಹೋಲ್ಡ್‌ ಮಾಡಲಾಗಿದೆ"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"ಇವರಿಂದ ಕರೆ"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"ಇವರಿಂದ ಕೆಲಸದ ಕರೆ"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> ಮೂಲಕ ಒಳಬರುತ್ತಿರುವ ಕರೆ"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"ಶಂಕಿತ ಸ್ಪ್ಯಾಮ್ ಕರೆದಾರರು"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"ಮರಳಿಕರೆ ಮಾಡುವ ಸಂಖ್ಯೆ: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">%s ಮೂಲಕ ಕರೆ ಮಾಡಲಾಗುತ್ತಿದೆ</string>
+  <string name="incall_calling_on_same_carrier_template">%s ವಾಹಕದ ಮೂಲಕ ಕರೆ ಮಾಡಲಾಗುತ್ತಿದೆ</string>
+  <string name="incall_calling_on_recent_choice_template">ಇತ್ತೀಚಿನ ಆಯ್ಕೆಯ ಆಧಾರದ ಮೇಲೆ %s ನಿಂದ ಕರೆ ಮಾಡಲಾಗುತ್ತಿದೆ</string>
+  <string name="incall_connecting">ಕರೆ ಮಾಡಲಾಗುತ್ತಿದೆ...</string>
+  <string name="incall_connecting_assited_dialed">+%1$s (%2$s) ಬಳಸಿಕೊಂಡು ಕರೆಮಾಡಲಾಗುತ್ತಿದೆ…</string>
+  <string name="incall_connecting_assited_dialed_component">+%1$s (%2$s) ಅನ್ನು ಬಳಸಲಾಗುತ್ತಿದೆ…</string>
+  <string name="incall_transferring">ವರ್ಗಾಯಿಸಲಾಗುತ್ತಿದೆ...</string>
+  <string name="incall_video_call_requesting">ವಾಹಕ ವೀಡಿಯೊ ಕರೆ ಮಾಡುವಿಕೆ…</string>
+  <string name="incall_wifi_video_call_requesting">ವೈ-ಫೈ ವಾಹಕ ವೀಡಿಯೊ ಕರೆ ಮಾಡುವಿಕೆ…</string>
+  <string name="incall_video_call_upgrade_request">ವಾಹಕ ವೀಡಿಯೊಗೆ ಬದಲಿಸಲಾಗುತ್ತಿದೆ…</string>
+  <string name="incall_video_call_request_failed">ಸಂಪರ್ಕಿಸಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ</string>
+  <string name="incall_video_call_request_rejected">ಕರೆ ನಿರಾಕರಿಸಲಾಗಿದೆ</string>
+  <string name="incall_video_call_request_timed_out">ಕರೆ ಅವಧಿ ಮೀರಿದೆ</string>
+  <string name="incall_hanging_up">ಹ್ಯಾಂಗ್ ಮಾಡಲಾಗುತ್ತಿದೆ</string>
+  <string name="incall_call_ended">ಕರೆ ಅಂತ್ಯಗೊಂಡಿದೆ</string>
+  <string name="incall_remotely_held">ಹೋಲ್ಡ್‌ ಮಾಡಲಾಗಿದೆ</string>
+  <string name="contact_grid_incoming_video_call">ಇವರಿಂದ ವಾಹಕ ವೀಡಿಯೊ ಕರೆ</string>
+  <string name="contact_grid_incoming_wifi_video_call">ಇವರಿಂದ ವೈ-ಫೈ ವಾಹಕ ವೀಡಿಯೊ ಕರೆ</string>
+  <string name="contact_grid_incoming_voice_call">ಇವರಿಂದ ಕರೆ</string>
+  <string name="contact_grid_incoming_work_call">ಇವರಿಂದ ಕೆಲಸದ ಕರೆ</string>
+  <string name="contact_grid_incoming_via_template">%s ಮೂಲಕ ಒಳಬರುತ್ತಿರುವ ಕರೆ</string>
+  <string name="contact_grid_incoming_suspected_spam">ಶಂಕಿತ ಸ್ಪ್ಯಾಮ್ ಕರೆದಾರರು</string>
+  <string name="contact_grid_callback_number">ಈ ಫೋನ್‌ನ ಸಂಖ್ಯೆ: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-ko/strings.xml b/java/com/android/incallui/contactgrid/res/values-ko/strings.xml
index 0717c0b..83f964a 100644
--- a/java/com/android/incallui/contactgrid/res/values-ko/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-ko/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_calling_via_template" msgid="3416867359475780924">"<xliff:g id="PROVIDER_NAME">%s</xliff:g>을(를) 통해 거는 전화"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"전화 거는 중…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"전환 중…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"연결할 수 없습니다."</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"통화가 거부되었습니다."</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"통화 시간이 초과되었습니다."</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"전화 끊는 중"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"통화 종료됨"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"대기 중"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"통화 발신:"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"업무 통화 발신:"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"<xliff:g id="PROVIDER_NAME">%s</xliff:g>을(를) 통해 걸려온 전화"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"스팸으로 의심되는 발신자"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"회신번호: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">%s을(를) 통해 거는 전화</string>
+  <string name="incall_calling_on_same_carrier_template">같은 이동통신사(%s)를 통해 통화하기</string>
+  <string name="incall_calling_on_recent_choice_template">최근 이용했던 이동통신사(%s)를 통해 통화하기</string>
+  <string name="incall_connecting">전화 거는 중…</string>
+  <string name="incall_connecting_assited_dialed">+%1$s(%2$s)번을 사용하여 통화 중…</string>
+  <string name="incall_connecting_assited_dialed_component">+%1$s (%2$s) 사용 중…</string>
+  <string name="incall_transferring">전환 중…</string>
+  <string name="incall_video_call_requesting">이동통신사 화상 통화 요청 중…</string>
+  <string name="incall_wifi_video_call_requesting">Wi-Fi 이동통신사 화상 통화 요청 중…</string>
+  <string name="incall_video_call_upgrade_request">이동통신사 화상 통화로 전환하는 중…</string>
+  <string name="incall_video_call_request_failed">연결할 수 없습니다.</string>
+  <string name="incall_video_call_request_rejected">통화가 거부되었습니다.</string>
+  <string name="incall_video_call_request_timed_out">통화 시간이 초과되었습니다.</string>
+  <string name="incall_hanging_up">전화 끊는 중</string>
+  <string name="incall_call_ended">통화 종료됨</string>
+  <string name="incall_remotely_held">대기 중</string>
+  <string name="contact_grid_incoming_video_call">다음 사용자에게서 온 이동통신사 화상 통화:</string>
+  <string name="contact_grid_incoming_wifi_video_call">다음 사용자에게서 온 Wi-Fi 이동통신사 화상 통화:</string>
+  <string name="contact_grid_incoming_voice_call">통화 수신:</string>
+  <string name="contact_grid_incoming_work_call">업무 통화 수신:</string>
+  <string name="contact_grid_incoming_via_template">%s을(를) 통해 걸려온 전화</string>
+  <string name="contact_grid_incoming_suspected_spam">스팸으로 의심되는 발신자</string>
+  <string name="contact_grid_callback_number">이 기기의 휴대전화 번호: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-ky/strings.xml b/java/com/android/incallui/contactgrid/res/values-ky/strings.xml
index 2a5db33..36a8875 100644
--- a/java/com/android/incallui/contactgrid/res/values-ky/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-ky/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_calling_via_template" msgid="3416867359475780924">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> аркылуу чалуу"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"Чалуу..."</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"Өткөрүлүүдө…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"Байланышуу мүмкүн эмес"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"Чалуу четке кагылды"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"Чалуунун күтүү убакыты аяктады"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"Чалуу аяктоодо"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"Чалуу аяктады"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"Күтүү режиминде"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Чалып жатат:"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Иш боюнча чалып жатат:"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> аркылуу чалып жатат"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"Спам окшойт"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"Кайра чалына турган номер: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">%s аркылуу чалуу</string>
+  <string name="incall_calling_on_same_carrier_template">Ошол эле %s оператору аркылуу чалынууда</string>
+  <string name="incall_calling_on_recent_choice_template">Акыркы тандалган %s оператору аркылуу чалынууда</string>
+  <string name="incall_connecting">Чалуу...</string>
+  <string name="incall_connecting_assited_dialed">Код аркылуу чалуу +%1$s (%2$s)…</string>
+  <string name="incall_connecting_assited_dialed_component">+%1$s (%2$s) колдонулууда…</string>
+  <string name="incall_transferring">Өткөрүлүүдө…</string>
+  <string name="incall_video_call_requesting">Видео чалуулар…</string>
+  <string name="incall_wifi_video_call_requesting">Wi-Fi аркылуу видео режиминде чалууда…</string>
+  <string name="incall_video_call_upgrade_request">Байланыш операторунун видеосуна которулуу…</string>
+  <string name="incall_video_call_request_failed">Ката кетти</string>
+  <string name="incall_video_call_request_rejected">Чалуу четке кагылды</string>
+  <string name="incall_video_call_request_timed_out">Чалуунун күтүү убакыты аяктады</string>
+  <string name="incall_hanging_up">Чалуу аяктоодо</string>
+  <string name="incall_call_ended">Чалуу аяктады</string>
+  <string name="incall_remotely_held">Күтүү режиминде</string>
+  <string name="contact_grid_incoming_video_call">Видео чалуу:</string>
+  <string name="contact_grid_incoming_wifi_video_call">Wi-Fi аркылуу видео чалуу:</string>
+  <string name="contact_grid_incoming_voice_call">Чалып жатат:</string>
+  <string name="contact_grid_incoming_work_call">Иш боюнча чалып жатат:</string>
+  <string name="contact_grid_incoming_via_template">%s аркылуу чалып жатат</string>
+  <string name="contact_grid_incoming_suspected_spam">Спам окшойт</string>
+  <string name="contact_grid_callback_number">Бул телефондун номери: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-lo/strings.xml b/java/com/android/incallui/contactgrid/res/values-lo/strings.xml
index 129f6cc..3538ef1 100644
--- a/java/com/android/incallui/contactgrid/res/values-lo/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-lo/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_calling_via_template" msgid="3416867359475780924">"ກຳລັງໂທຜ່ານ <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"ກຳລັງໂທ…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"ກຳລັງໂອນຍ້າຍ…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"ບໍ່ສາມາດເຊື່ອມຕໍ່ໄດ້"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"ສາຍຖືກປະຕິເສດ"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"ການໂທໝົດເວລາ"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"ກຳລັງວາງສາຍ"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"ວາງສາຍແລ້ວ"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"ຖືສາຍລໍຖ້າ"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"ການໂທຈາກ"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Work call from"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"ສາຍໂທເຂົ້າ​ຈາກ <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"ຄາດວ່າເປັນການໂທສະແປມ"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"Callback number: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">ກຳລັງໂທຜ່ານ %s</string>
+  <string name="incall_calling_on_same_carrier_template">ກຳລັງໂທຢູ່ເຄືອຂ່າຍດຽວກັນ %s</string>
+  <string name="incall_calling_on_recent_choice_template">ກຳລັງໂທດ້ວຍຕົວເລືອກຫຼ້າສຸດ %s</string>
+  <string name="incall_connecting">ກຳລັງໂທ…</string>
+  <string name="incall_connecting_assited_dialed">ກຳລັງໂທໂດຍໃຊ້+%1$s (%2$s)…</string>
+  <string name="incall_connecting_assited_dialed_component">ໂດຍໃຊ້ +%1$s (%2$s)…</string>
+  <string name="incall_transferring">ກຳລັງໂອນຍ້າຍ…</string>
+  <string name="incall_video_call_requesting">ການໂທວິດີໂອເຄືອຂ່າຍ...</string>
+  <string name="incall_wifi_video_call_requesting">ການໂທວິດີໂອເຄືອຂ່າຍ Wi-Fi…</string>
+  <string name="incall_video_call_upgrade_request">ກຳລັບສະຫຼັບໄປຫາວິດີໂອເຄືອຂ່າຍ…</string>
+  <string name="incall_video_call_request_failed">ບໍ່ສາມາດເຊື່ອມຕໍ່ໄດ້</string>
+  <string name="incall_video_call_request_rejected">ສາຍຖືກປະຕິເສດ</string>
+  <string name="incall_video_call_request_timed_out">ການໂທໝົດເວລາ</string>
+  <string name="incall_hanging_up">ກຳລັງວາງສາຍ</string>
+  <string name="incall_call_ended">ວາງສາຍແລ້ວ</string>
+  <string name="incall_remotely_held">ຖືສາຍລໍຖ້າ</string>
+  <string name="contact_grid_incoming_video_call">ການໂທວິດີໂອເຄືອຂ່າຍຈາກ</string>
+  <string name="contact_grid_incoming_wifi_video_call">ການໂທວິດີໂອເຄືອຂ່າຍຈາກ Wi-Fi</string>
+  <string name="contact_grid_incoming_voice_call">ການໂທຈາກ</string>
+  <string name="contact_grid_incoming_work_call">Work call from</string>
+  <string name="contact_grid_incoming_via_template">ສາຍໂທເຂົ້າ​ຈາກ %s</string>
+  <string name="contact_grid_incoming_suspected_spam">ຄາດວ່າເປັນການໂທສະແປມ</string>
+  <string name="contact_grid_callback_number">ເບີຂອງໂທລະສັບໜ່ວຍນີ້: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-lt/strings.xml b/java/com/android/incallui/contactgrid/res/values-lt/strings.xml
index 5918827..541b094 100644
--- a/java/com/android/incallui/contactgrid/res/values-lt/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-lt/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_calling_via_template" msgid="3416867359475780924">"Skambinama naudojantis „<xliff:g id="PROVIDER_NAME">%s</xliff:g>“ paslaugomis"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"Skambinama…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"Perkeliama…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"Nepavyko prisijungti"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"Skambutis atmestas"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"Baigėsi skirtasis skambučio laikas"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"Baigiamas pokalbis"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"Skambutis baigtas"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"Sulaikytas"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Skambutis nuo"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Darbo skambutis nuo"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Gaunama per „<xliff:g id="PROVIDER_NAME">%s</xliff:g>“"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"Įtariamas skambintojas dėl šlamšto"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"Atskambinimo numeris: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">Skambinama naudojantis „%s“ paslaugomis</string>
+  <string name="incall_calling_on_same_carrier_template">Skambinama naud. to paties operatoriaus paslaugomis: „%s“</string>
+  <string name="incall_calling_on_recent_choice_template">Skambinama naud. dabar pasir. operatoriaus paslaugomis: „%s“</string>
+  <string name="incall_connecting">Skambinama…</string>
+  <string name="incall_connecting_assited_dialed">Skambinama naudojant +%1$s (%2$s)…</string>
+  <string name="incall_connecting_assited_dialed_component">Naudojamas kodas +%1$s (%2$s)…</string>
+  <string name="incall_transferring">Perkeliama…</string>
+  <string name="incall_video_call_requesting">Operatoriaus vaizdo skambutis…</string>
+  <string name="incall_wifi_video_call_requesting">„Wi-Fi“ operatoriaus vaizdo skambutis…</string>
+  <string name="incall_video_call_upgrade_request">Perjungiama į operatoriaus vaizdo skambutį…</string>
+  <string name="incall_video_call_request_failed">Nepavyko prisijungti</string>
+  <string name="incall_video_call_request_rejected">Skambutis atmestas</string>
+  <string name="incall_video_call_request_timed_out">Baigėsi skirtasis skambučio laikas</string>
+  <string name="incall_hanging_up">Baigiamas pokalbis</string>
+  <string name="incall_call_ended">Skambutis baigtas</string>
+  <string name="incall_remotely_held">Sulaikytas</string>
+  <string name="contact_grid_incoming_video_call">Operatoriaus vaizdo skambutis nuo</string>
+  <string name="contact_grid_incoming_wifi_video_call">„Wi-Fi“ operatoriaus vaizdo skambutis nuo</string>
+  <string name="contact_grid_incoming_voice_call">Skambutis nuo</string>
+  <string name="contact_grid_incoming_work_call">Darbo skambutis nuo</string>
+  <string name="contact_grid_incoming_via_template">Gaunama per „%s“</string>
+  <string name="contact_grid_incoming_suspected_spam">Įtariamas skambintojas dėl šlamšto</string>
+  <string name="contact_grid_callback_number">Šio telefono numeris: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-lv/strings.xml b/java/com/android/incallui/contactgrid/res/values-lv/strings.xml
index 4464027..2fe5865 100644
--- a/java/com/android/incallui/contactgrid/res/values-lv/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-lv/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_calling_via_template" msgid="3416867359475780924">"Zvanu nodrošina <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"Notiek zvanīšana…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"Notiek pārsūtīšana…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"Nevar izveidot savienojumu"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"Zvans ir noraidīts"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"Iestājās zvana noildze"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"Tiek nolikta klausule"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"Zvans ir pabeigts"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"Aizturēts"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Zvans no:"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Darba zvans no:"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Ienākošie zvani, ko nodrošina <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"Nevēlams zvanītājs"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"Atzvana numurs: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">Zvanu nodrošina %s</string>
+  <string name="incall_calling_on_same_carrier_template">Zvana, izmantojot to pašu mobilo sakaru operatoru: %s</string>
+  <string name="incall_calling_on_recent_choice_template">Zvana, izmantojot nesen izvēlēto mobilo sakaru operatoru: %s</string>
+  <string name="incall_connecting">Notiek zvanīšana…</string>
+  <string name="incall_connecting_assited_dialed">Zvana, izmantojot +%1$s (%2$s)…</string>
+  <string name="incall_connecting_assited_dialed_component">Izmanto +%1$s (%2$s)…</string>
+  <string name="incall_transferring">Notiek pārsūtīšana…</string>
+  <string name="incall_video_call_requesting">Mobilo sakaru operatora videozvans…</string>
+  <string name="incall_wifi_video_call_requesting">Wi-Fi pakalpojuma nodrošinātāja videozvans…</string>
+  <string name="incall_video_call_upgrade_request">Notiek pārslēgšanās uz mobilo sakaru operatora videozvanu…</string>
+  <string name="incall_video_call_request_failed">Nevar izveidot savienojumu</string>
+  <string name="incall_video_call_request_rejected">Zvans ir noraidīts</string>
+  <string name="incall_video_call_request_timed_out">Iestājās zvana noildze</string>
+  <string name="incall_hanging_up">Tiek nolikta klausule</string>
+  <string name="incall_call_ended">Zvans ir pabeigts</string>
+  <string name="incall_remotely_held">Aizturēts</string>
+  <string name="contact_grid_incoming_video_call">Mobilo sakaru operatora videozvans no</string>
+  <string name="contact_grid_incoming_wifi_video_call">Wi-Fi pakalpojuma nodrošinātāja videozvans no</string>
+  <string name="contact_grid_incoming_voice_call">Zvans no:</string>
+  <string name="contact_grid_incoming_work_call">Darba zvans no:</string>
+  <string name="contact_grid_incoming_via_template">Ienākošie zvani, ko nodrošina %s</string>
+  <string name="contact_grid_incoming_suspected_spam">Nevēlams zvanītājs</string>
+  <string name="contact_grid_callback_number">Šis tālruņa numurs: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-mk/strings.xml b/java/com/android/incallui/contactgrid/res/values-mk/strings.xml
index 450085d..61e5069 100644
--- a/java/com/android/incallui/contactgrid/res/values-mk/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-mk/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_calling_via_template" msgid="3416867359475780924">"Повикување преку <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"Се повикува…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"Се пренесувa…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"Не може да се поврзе"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"Повикот е одбиен"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"Времето за повик истече"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"Повикот се прекинува"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"Повикот заврши"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"На чекање"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Повик од"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Работен повик од"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Дојдовни повици преку <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"Повикот е можен спам"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"Број за повратен повик: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">Повикување преку %s</string>
+  <string name="incall_calling_on_same_carrier_template">Повикување на истиот оператор %s</string>
+  <string name="incall_calling_on_recent_choice_template">Повикување на неодамнешен избор %s</string>
+  <string name="incall_connecting">Се повикува…</string>
+  <string name="incall_connecting_assited_dialed">Се повикува со +%1$s (%2$s)…</string>
+  <string name="incall_connecting_assited_dialed_component">Се користи +%1$s (%2$s)…</string>
+  <string name="incall_transferring">Се пренесувa…</string>
+  <string name="incall_video_call_requesting">Се повикува со видео преку оператор…</string>
+  <string name="incall_wifi_video_call_requesting">Се повикува со видео преку Wi-Fi преку оператор…</string>
+  <string name="incall_video_call_upgrade_request">Се префрла на видео преку оператор…</string>
+  <string name="incall_video_call_request_failed">Не може да се поврзе</string>
+  <string name="incall_video_call_request_rejected">Повикот е одбиен</string>
+  <string name="incall_video_call_request_timed_out">Времето за повик истече</string>
+  <string name="incall_hanging_up">Повикот се прекинува</string>
+  <string name="incall_call_ended">Повикот заврши</string>
+  <string name="incall_remotely_held">На чекање</string>
+  <string name="contact_grid_incoming_video_call">Видеоповик преку оператор од</string>
+  <string name="contact_grid_incoming_wifi_video_call">Видеоповик преку Wi-Fi преку оператор од</string>
+  <string name="contact_grid_incoming_voice_call">Повик од</string>
+  <string name="contact_grid_incoming_work_call">Работен повик од</string>
+  <string name="contact_grid_incoming_via_template">Дојдовни повици преку %s</string>
+  <string name="contact_grid_incoming_suspected_spam">Повикот е можен спам</string>
+  <string name="contact_grid_callback_number">Бројот од овој телефон: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-ml/strings.xml b/java/com/android/incallui/contactgrid/res/values-ml/strings.xml
index 59d3365..532d6d1 100644
--- a/java/com/android/incallui/contactgrid/res/values-ml/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-ml/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_calling_via_template" msgid="3416867359475780924">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> മുഖേന വിളിക്കുന്നു"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"വിളിക്കുന്നു..."</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"കൈമാറുന്നു…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"കണക്റ്റുചെയ്യാനായില്ല"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"കോള്‍ നിരസിച്ചു"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"കോളിന്റെ സമയം തീര്‍ന്നു"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"ഹാംഗ് അപ്പ് ചെയ്യുന്നു"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"കോൾ അവസാനിച്ചു"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"ഹോള്‍ഡിലാണ്"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"ഈ വ്യക്തിയിൽ നിന്നുള്ള കോൾ"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"ഈ വ്യക്തിയിൽ നിന്നുള്ള ഔദ്യോഗിക കോൾ"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> മുഖേനയുള്ള ഇൻകമിംഗ്"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"സംശയാസ്‌പദമായ സ്‌പാം കോളർ"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"തിരിച്ചുവിളിക്കേണ്ട നമ്പർ: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">%s മുഖേന വിളിക്കുന്നു</string>
+  <string name="incall_calling_on_same_carrier_template">സമാന %s കാരിയറിൽ നിന്ന് കോൾ ചെയ്യുന്നു</string>
+  <string name="incall_calling_on_recent_choice_template">സമീപകാലത്ത് തിരഞ്ഞെടുത്ത %s-ൽ കോൾ ചെയ്യുന്നു</string>
+  <string name="incall_connecting">വിളിക്കുന്നു...</string>
+  <string name="incall_connecting_assited_dialed">+%1$s ഉപയോഗിച്ച് വിളിക്കുന്നു (%2$s)…</string>
+  <string name="incall_connecting_assited_dialed_component">+%1$s (%2$s) ഉപയോഗിക്കുന്നു…</string>
+  <string name="incall_transferring">കൈമാറുന്നു…</string>
+  <string name="incall_video_call_requesting">കാരിയർ വീഡിയോ കോൾ ചെയ്യുന്നു...</string>
+  <string name="incall_wifi_video_call_requesting">വൈഫൈ കാരിയർ വീഡിയോ കോൾ ചെയ്യുന്നു...</string>
+  <string name="incall_video_call_upgrade_request">കാരിയർ വീഡിയോയിലേക്ക് മാറുന്നു...</string>
+  <string name="incall_video_call_request_failed">കണക്റ്റുചെയ്യാനായില്ല</string>
+  <string name="incall_video_call_request_rejected">കോള്‍ നിരസിച്ചു</string>
+  <string name="incall_video_call_request_timed_out">കോളിന്റെ സമയം തീര്‍ന്നു</string>
+  <string name="incall_hanging_up">ഹാംഗ് അപ്പ് ചെയ്യുന്നു</string>
+  <string name="incall_call_ended">കോൾ അവസാനിച്ചു</string>
+  <string name="incall_remotely_held">ഹോള്‍ഡിലാണ്</string>
+  <string name="contact_grid_incoming_video_call">ഇയാളിൽ നിന്നുള്ള വീഡിയോ കോൾ</string>
+  <string name="contact_grid_incoming_wifi_video_call">ഇയാളിൽ നിന്നുള്ള വൈഫൈ കാരിയർ വീഡിയോ കോൾ</string>
+  <string name="contact_grid_incoming_voice_call">ഈ വ്യക്തിയിൽ നിന്നുള്ള കോൾ</string>
+  <string name="contact_grid_incoming_work_call">ഈ വ്യക്തിയിൽ നിന്നുള്ള ഔദ്യോഗിക കോൾ</string>
+  <string name="contact_grid_incoming_via_template">%s മുഖേനയുള്ള ഇൻകമിംഗ്</string>
+  <string name="contact_grid_incoming_suspected_spam">സംശയാസ്‌പദമായ സ്‌പാം കോളർ</string>
+  <string name="contact_grid_callback_number">ഈ ഫോണിന്‍റെ നമ്പർ: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-mn/strings.xml b/java/com/android/incallui/contactgrid/res/values-mn/strings.xml
index be23313..8304a79 100644
--- a/java/com/android/incallui/contactgrid/res/values-mn/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-mn/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_calling_via_template" msgid="3416867359475780924">"<xliff:g id="PROVIDER_NAME">%s</xliff:g>-р залгаж байна"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"Залгаж байна..."</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"Шилжүүлж байна..."</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"Холбогдох боломжгүй"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"Дуудлагыг тасласан"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"Дуудлагын хугацаа хэтэрсэн"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"Тасалж байна"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"Дуудлагыг тасалсан"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"Хүлээлгэнд байгаа"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Дуудлага"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Ажлын дуудлага"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"<xliff:g id="PROVIDER_NAME">%s</xliff:g>-р ирж байна"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"Сэжигтэй спам дуудлага хийгч"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"Буцаан залгах дугаар: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">%s-р залгаж байна</string>
+  <string name="incall_calling_on_same_carrier_template">Ижилхэн %s үүрэн холбооны компаниарс залгаж байна</string>
+  <string name="incall_calling_on_recent_choice_template">Саяхны сонголт %s-р залгаж байна</string>
+  <string name="incall_connecting">Залгаж байна...</string>
+  <string name="incall_connecting_assited_dialed">+%1$s (%2$s) ашиглан залгаж байна…</string>
+  <string name="incall_connecting_assited_dialed_component">+%1$s (%2$s) ашиглаж байна…</string>
+  <string name="incall_transferring">Шилжүүлж байна...</string>
+  <string name="incall_video_call_requesting">Үүрэн компанийн видео дуудлага...</string>
+  <string name="incall_wifi_video_call_requesting">Wi-Fi үүрэн компанийн видео дуудлага…</string>
+  <string name="incall_video_call_upgrade_request">Үүрэн компанийн видео дуудлага руу сэлгэж байна…</string>
+  <string name="incall_video_call_request_failed">Холбогдох боломжгүй</string>
+  <string name="incall_video_call_request_rejected">Дуудлагыг тасласан</string>
+  <string name="incall_video_call_request_timed_out">Дуудлагын хугацаа хэтэрсэн</string>
+  <string name="incall_hanging_up">Тасалж байна</string>
+  <string name="incall_call_ended">Дуудлагыг тасалсан</string>
+  <string name="incall_remotely_held">Хүлээлгэнд байгаа</string>
+  <string name="contact_grid_incoming_video_call">Үүрэн компанийн видео дуудлага</string>
+  <string name="contact_grid_incoming_wifi_video_call">Wi-Fi үүрэн компанийн видео дуудлага</string>
+  <string name="contact_grid_incoming_voice_call">Дуудлага</string>
+  <string name="contact_grid_incoming_work_call">Ажлын дуудлага</string>
+  <string name="contact_grid_incoming_via_template">%s-р ирж байна</string>
+  <string name="contact_grid_incoming_suspected_spam">Сэжигтэй спам дуудлага хийгч</string>
+  <string name="contact_grid_callback_number">Энэ утасны дугаар: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-mr/strings.xml b/java/com/android/incallui/contactgrid/res/values-mr/strings.xml
index c0cef5c..106f852 100644
--- a/java/com/android/incallui/contactgrid/res/values-mr/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-mr/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_calling_via_template" msgid="3416867359475780924">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> द्वारे कॉल करीत आहे"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"कॉल करीत आहे..."</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"हस्तांतरित करीत आहे..."</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"कनेक्ट करण्यात अक्षम"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"कॉल नाकारला"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"कॉल कालबाह्य"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"हँग अप करणेे"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"कॉल संपला"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"होल्ड वर"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"यावरील कॉल"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"कडून कार्य कॉल"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> द्वारे येणारे"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"संशयित स्पॅम कॉलर"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"कॉलबॅक नंबर: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">%s द्वारे कॉल करत आहे</string>
+  <string name="incall_calling_on_same_carrier_template">समान %s वाहकावर कॉल करत आहोत</string>
+  <string name="incall_calling_on_recent_choice_template">अलीकडे निवडलेल्‍या %s वर कॉल करत आहोत</string>
+  <string name="incall_connecting">कॉल करत आहे...</string>
+  <string name="incall_connecting_assited_dialed">+%1$s (%2$s) वापरून कॉल करत आहे…</string>
+  <string name="incall_connecting_assited_dialed_component">+%1$s (%2$s) वापरत आहे…</string>
+  <string name="incall_transferring">हस्तांतरित करत आहे...</string>
+  <string name="incall_video_call_requesting">वाहक व्हिडिओ कॉलिंग…</string>
+  <string name="incall_wifi_video_call_requesting">वाय-फाय वाहक व्हिडिओ कॉलिंग…</string>
+  <string name="incall_video_call_upgrade_request">वाहक व्हिडिओवर स्विच होत आहे…</string>
+  <string name="incall_video_call_request_failed">कनेक्ट करण्यात अक्षम</string>
+  <string name="incall_video_call_request_rejected">कॉल नाकारला</string>
+  <string name="incall_video_call_request_timed_out">कॉल कालबाह्य</string>
+  <string name="incall_hanging_up">हँग अप करणेे</string>
+  <string name="incall_call_ended">कॉल संपला</string>
+  <string name="incall_remotely_held">होल्ड वर</string>
+  <string name="contact_grid_incoming_video_call">या व्‍यक्‍तीकडून वाहक व्हिडिओ कॉल</string>
+  <string name="contact_grid_incoming_wifi_video_call">या व्‍यक्‍तीकडून वाय-फाय वाहक व्हिडिओ कॉल</string>
+  <string name="contact_grid_incoming_voice_call">यावरील कॉल</string>
+  <string name="contact_grid_incoming_work_call">कडून कार्य कॉल</string>
+  <string name="contact_grid_incoming_via_template">%s द्वारे येणारे</string>
+  <string name="contact_grid_incoming_suspected_spam">संशयित स्पॅम कॉलर</string>
+  <string name="contact_grid_callback_number">या फोनचा क्रमांक: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-ms/strings.xml b/java/com/android/incallui/contactgrid/res/values-ms/strings.xml
index eaacc45..f38c2ca 100644
--- a/java/com/android/incallui/contactgrid/res/values-ms/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-ms/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_calling_via_template" msgid="3416867359475780924">"Memanggil melalui <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"Memanggil…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"Memindahkan…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"Tidak dapat menyambung"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"Panggilan ditolak"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"Panggilan tamat masa"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"Menamatkan panggilan"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"Panggilan tamat"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"Panggilan ditahan"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Panggilan daripada"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Panggilan kerja daripada"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Panggilan masuk melalui <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"Disyaki pemanggil spam"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"Nombor panggil balik: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">Memanggil melalui %s</string>
+  <string name="incall_calling_on_same_carrier_template">Memanggil menggunakan pembawa yang sama %s</string>
+  <string name="incall_calling_on_recent_choice_template">Memanggil menggunakan pilihan terbaharu %s</string>
+  <string name="incall_connecting">Memanggil…</string>
+  <string name="incall_connecting_assited_dialed">Memanggil dengan menggunakan +%1$s (%2$s)…</string>
+  <string name="incall_connecting_assited_dialed_component">Menggunakan +%1$s (%2$s)…</string>
+  <string name="incall_transferring">Memindahkan…</string>
+  <string name="incall_video_call_requesting">Panggilan video pembawa…</string>
+  <string name="incall_wifi_video_call_requesting">Panggilan video pembawa Wi-Fi…</string>
+  <string name="incall_video_call_upgrade_request">Bertukar kepada video pembawa…</string>
+  <string name="incall_video_call_request_failed">Tidak dapat menyambung</string>
+  <string name="incall_video_call_request_rejected">Panggilan ditolak</string>
+  <string name="incall_video_call_request_timed_out">Panggilan tamat masa</string>
+  <string name="incall_hanging_up">Menamatkan panggilan</string>
+  <string name="incall_call_ended">Panggilan tamat</string>
+  <string name="incall_remotely_held">Panggilan ditahan</string>
+  <string name="contact_grid_incoming_video_call">Panggilan video pembawa daripada</string>
+  <string name="contact_grid_incoming_wifi_video_call">Panggilan video pembawa Wi-Fi daripada</string>
+  <string name="contact_grid_incoming_voice_call">Panggilan daripada</string>
+  <string name="contact_grid_incoming_work_call">Panggilan kerja daripada</string>
+  <string name="contact_grid_incoming_via_template">Panggilan masuk melalui %s</string>
+  <string name="contact_grid_incoming_suspected_spam">Disyaki pemanggil spam</string>
+  <string name="contact_grid_callback_number">Nombor telefon ini: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-my/strings.xml b/java/com/android/incallui/contactgrid/res/values-my/strings.xml
index 25088c3..ca7e838 100644
--- a/java/com/android/incallui/contactgrid/res/values-my/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-my/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_calling_via_template" msgid="3416867359475780924">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> မှတစ်ဆင့် ခေါ်ဆိုနေသည်"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"ခေါ်ဆိုနေသည်…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"လွှဲပြောင်းနေသည်…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"ချိတ်ဆက်၍ မရပါ"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"ခေါ်ဆိုမှုကို ငြင်းပယ်လိုက်ပါသည်"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"ခေါ်ဆိုမှု အချိန်ကုန်ဆုံးသွားပါပြီ"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"ဖုန်းချနေပါသည်"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"ခေါ်ဆိုမှု ပြီးသွားပါပြီ"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"ဖုန်းကိုင်ထားသည်"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"အောက်ပါထံမှ ခေါ်ဆိုမှု"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"အောက်ပါထံမှ အလုပ်ခေါ်ဆိုမှု"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> မှတစ်ဆင့် အဝင်ခေါ်ဆိုမှု"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"မသင်္ကာဖွယ်ရာ စပမ်းခေါ်ဆိုသူ"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"ပြန်လည်ခေါ်ဆိုရန်နံပါတ် - <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">%s မှတစ်ဆင့် ခေါ်ဆိုနေသည်</string>
+  <string name="incall_calling_on_same_carrier_template">တူညီသော ဖုန်းလိုင်း %s မှ ခေါ်ဆိုခြင်း</string>
+  <string name="incall_calling_on_recent_choice_template">လတ်တလော ရွေးချယ်မှု %s မှ ခေါ်ဆိုခြင်း</string>
+  <string name="incall_connecting">ခေါ်ဆိုနေသည်…</string>
+  <string name="incall_connecting_assited_dialed">+%1$s (%2$s)… သုံးပြီး ဖုန်းခေါ်ဆိုခြင်း</string>
+  <string name="incall_connecting_assited_dialed_component">+%1$s (%2$s) ကို အသုံးပြုထားသည်…</string>
+  <string name="incall_transferring">လွှဲပြောင်းနေသည်…</string>
+  <string name="incall_video_call_requesting">ဝန်ဆောင်မှုပေးသူဗီဒီယို ခေါ်ဆိုနေသည်...</string>
+  <string name="incall_wifi_video_call_requesting">Wi-Fi ဝန်ဆောင်မှုပေးသူဗီဒီယို ခေါ်ဆိုနေသည်...</string>
+  <string name="incall_video_call_upgrade_request">ဝန်ဆောင်မှုပေးသူဗီဒီယိုသို့ ပြောင်းနေသည်…</string>
+  <string name="incall_video_call_request_failed">ချိတ်ဆက်၍ မရပါ</string>
+  <string name="incall_video_call_request_rejected">ခေါ်ဆိုမှုကို ငြင်းပယ်လိုက်ပါသည်</string>
+  <string name="incall_video_call_request_timed_out">ခေါ်ဆိုမှု အချိန်ကုန်ဆုံးသွားပါပြီ</string>
+  <string name="incall_hanging_up">ဖုန်းချနေပါသည်</string>
+  <string name="incall_call_ended">ခေါ်ဆိုမှု ပြီးသွားပါပြီ</string>
+  <string name="incall_remotely_held">ဖုန်းကိုင်ထားသည်</string>
+  <string name="contact_grid_incoming_video_call">အောက်ပါထံမှ ဝန်ဆောင်မှုပေးသူဗီဒီယိုခေါ်ဆိုမှု</string>
+  <string name="contact_grid_incoming_wifi_video_call">အောက်ပါထံမှ Wi-Fi ဝန်ဆောင်မှုပေးသူ ဗီဒီယိုခေါ်ဆိုမှု</string>
+  <string name="contact_grid_incoming_voice_call">အောက်ပါထံမှ ခေါ်ဆိုမှု</string>
+  <string name="contact_grid_incoming_work_call">အောက်ပါထံမှ အလုပ်ခေါ်ဆိုမှု</string>
+  <string name="contact_grid_incoming_via_template">%s မှတစ်ဆင့် အဝင်ခေါ်ဆိုမှု</string>
+  <string name="contact_grid_incoming_suspected_spam">မသင်္ကာဖွယ်ရာ စပမ်းခေါ်ဆိုသူ</string>
+  <string name="contact_grid_callback_number">ဤဖုန်း၏နံပါတ် - %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-nb/strings.xml b/java/com/android/incallui/contactgrid/res/values-nb/strings.xml
index e4127f9..5ae6ecd 100644
--- a/java/com/android/incallui/contactgrid/res/values-nb/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-nb/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_calling_via_template" msgid="3416867359475780924">"Ringer via <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"Ringer …"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"Overfører …"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"Kan ikke koble til"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"Anropet ble avvist"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"Anropet ble tidsavbrutt"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"Legger på"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"Samtalen er avsluttet"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"På vent"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Anrop fra"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Jobbrelatert anrop fra"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Innkommende via <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"Sannsynligvis et useriøst anrop"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"Nummer hvis du vil ringe tilbake: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">Ringer via %s</string>
+  <string name="incall_calling_on_same_carrier_template">Ringer via samme mobiloperatør: %s</string>
+  <string name="incall_calling_on_recent_choice_template">Ringer via nylig valgt: %s</string>
+  <string name="incall_connecting">Ringer …</string>
+  <string name="incall_connecting_assited_dialed">Ringer med +%1$s (%2$s) …</string>
+  <string name="incall_connecting_assited_dialed_component">Bruker +%1$s (%2$s) …</string>
+  <string name="incall_transferring">Overfører …</string>
+  <string name="incall_video_call_requesting">Videoanrop via mobiloperatør …</string>
+  <string name="incall_wifi_video_call_requesting">Videoanrop via Wi-Fi …</string>
+  <string name="incall_video_call_upgrade_request">Bytter til videoanrop via mobiloperatør …</string>
+  <string name="incall_video_call_request_failed">Kan ikke koble til</string>
+  <string name="incall_video_call_request_rejected">Anropet ble avvist</string>
+  <string name="incall_video_call_request_timed_out">Anropet ble tidsavbrutt</string>
+  <string name="incall_hanging_up">Legger på</string>
+  <string name="incall_call_ended">Samtalen er avsluttet</string>
+  <string name="incall_remotely_held">På vent</string>
+  <string name="contact_grid_incoming_video_call">Videoanrop via mobiloperatør fra</string>
+  <string name="contact_grid_incoming_wifi_video_call">Videoanrop via Wi-Fi fra</string>
+  <string name="contact_grid_incoming_voice_call">Anrop fra</string>
+  <string name="contact_grid_incoming_work_call">Jobbrelatert anrop fra</string>
+  <string name="contact_grid_incoming_via_template">Innkommende via %s</string>
+  <string name="contact_grid_incoming_suspected_spam">Sannsynligvis et useriøst anrop</string>
+  <string name="contact_grid_callback_number">Nummeret til denne telefonen: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-ne/strings.xml b/java/com/android/incallui/contactgrid/res/values-ne/strings.xml
index f56c90f..4507858 100644
--- a/java/com/android/incallui/contactgrid/res/values-ne/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-ne/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_calling_via_template" msgid="3416867359475780924">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> मार्फत कल गर्दै"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"कल गर्दै…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"स्थानान्तरण गर्दै…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"जडान गर्न असमर्थ"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"कल अस्वीकार गरियो"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"कलको समय सकियो"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"फोन काट्दै"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"कल समाप्त भयो"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"होल्डमा छ"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"निम्नबाट कल आएको छ"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"निम्नबाट कार्य सम्बन्धी कल आएको छ"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> मार्फत गरिएको आगमन कल"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"शङ्कास्पद स्प्याम कल गर्ने व्यक्ति"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"कलब्याकको नम्बर: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">%s मार्फत कल गर्दै</string>
+  <string name="incall_calling_on_same_carrier_template">उ‍ही सेवा प्रदायक %s मा कल गर्दै</string>
+  <string name="incall_calling_on_recent_choice_template">हालैको रोजाइको %s मस कल गर्दै</string>
+  <string name="incall_connecting">कल गर्दै…</string>
+  <string name="incall_connecting_assited_dialed">+%1$s (%2$s) प्रयोग गरी कल गर्दै…</string>
+  <string name="incall_connecting_assited_dialed_component">+%1$s (%2$s) प्रयोग गर्दै…</string>
+  <string name="incall_transferring">स्थानान्तरण गर्दै…</string>
+  <string name="incall_video_call_requesting">सेवा प्रदायकमार्फत भिडियो कल गर्दै…</string>
+  <string name="incall_wifi_video_call_requesting">सेवा प्रदायकमार्फत Wi-Fi भिडियो कलमा स्तरवृद्धिका लागि अनुरोध गर्दै…</string>
+  <string name="incall_video_call_upgrade_request">सेवा प्रदायकमार्फतको भिडियो कलमा स्विच गर्दै…</string>
+  <string name="incall_video_call_request_failed">जडान गर्न असमर्थ</string>
+  <string name="incall_video_call_request_rejected">कल अस्वीकार गरियो</string>
+  <string name="incall_video_call_request_timed_out">कलको समय सकियो</string>
+  <string name="incall_hanging_up">फोन काट्दै</string>
+  <string name="incall_call_ended">कल समाप्त भयो</string>
+  <string name="incall_remotely_held">होल्डमा छ</string>
+  <string name="contact_grid_incoming_video_call">यहाँबाट आएको सेवा प्रदायकमार्फतको भिडियो कल</string>
+  <string name="contact_grid_incoming_wifi_video_call">यहाँबाट आएको सेवा प्रदायकमार्फतको Wi-Fi भिडियो कल</string>
+  <string name="contact_grid_incoming_voice_call">निम्नबाट कल आएको छ</string>
+  <string name="contact_grid_incoming_work_call">निम्नबाट कार्य सम्बन्धी कल आएको छ</string>
+  <string name="contact_grid_incoming_via_template">%s मार्फत गरिएको आगमन कल</string>
+  <string name="contact_grid_incoming_suspected_spam">शङ्कास्पद स्प्याम कल गर्ने व्यक्ति</string>
+  <string name="contact_grid_callback_number">यस फोनको नम्बर: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-nl/strings.xml b/java/com/android/incallui/contactgrid/res/values-nl/strings.xml
index ad4d00d..73b073c 100644
--- a/java/com/android/incallui/contactgrid/res/values-nl/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-nl/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_calling_via_template" msgid="3416867359475780924">"Bellen via <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"Bellen…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"Overzetten…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"Kan geen verbinding maken"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"Oproep geweigerd"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"Time-out tijdens oproep"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"Ophangen"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"Oproep beëindigd"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"In de wacht"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Oproep van"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Zakelijke oproep van"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Inkomend via <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"Vermoedelijke spambeller"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"Terugbelnummer: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">Bellen via %s</string>
+  <string name="incall_calling_on_same_carrier_template">Op dezelfde provider %s bellen</string>
+  <string name="incall_calling_on_recent_choice_template">Op recente keuze %s bellen</string>
+  <string name="incall_connecting">Bellen…</string>
+  <string name="incall_connecting_assited_dialed">Bellen met +%1$s (%2$s)…</string>
+  <string name="incall_connecting_assited_dialed_component">+%1$s (%2$s) gebruiken…</string>
+  <string name="incall_transferring">Overzetten…</string>
+  <string name="incall_video_call_requesting">Videogesprek via provider…</string>
+  <string name="incall_wifi_video_call_requesting">Wifi-videogesprek via provider…</string>
+  <string name="incall_video_call_upgrade_request">Overschakelen naar videogesprek via provider…</string>
+  <string name="incall_video_call_request_failed">Kan geen verbinding maken</string>
+  <string name="incall_video_call_request_rejected">Oproep geweigerd</string>
+  <string name="incall_video_call_request_timed_out">Time-out tijdens oproep</string>
+  <string name="incall_hanging_up">Ophangen</string>
+  <string name="incall_call_ended">Oproep beëindigd</string>
+  <string name="incall_remotely_held">In de wacht</string>
+  <string name="contact_grid_incoming_video_call">Videogesprek via je provider met</string>
+  <string name="contact_grid_incoming_wifi_video_call">Wifi-videogesprek via je provider met</string>
+  <string name="contact_grid_incoming_voice_call">Oproep van</string>
+  <string name="contact_grid_incoming_work_call">Zakelijke oproep van</string>
+  <string name="contact_grid_incoming_via_template">Inkomend via %s</string>
+  <string name="contact_grid_incoming_suspected_spam">Vermoedelijke spambeller</string>
+  <string name="contact_grid_callback_number">Dit telefoonnummer: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-no/strings.xml b/java/com/android/incallui/contactgrid/res/values-no/strings.xml
index e4127f9..5ae6ecd 100644
--- a/java/com/android/incallui/contactgrid/res/values-no/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-no/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_calling_via_template" msgid="3416867359475780924">"Ringer via <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"Ringer …"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"Overfører …"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"Kan ikke koble til"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"Anropet ble avvist"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"Anropet ble tidsavbrutt"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"Legger på"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"Samtalen er avsluttet"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"På vent"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Anrop fra"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Jobbrelatert anrop fra"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Innkommende via <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"Sannsynligvis et useriøst anrop"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"Nummer hvis du vil ringe tilbake: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">Ringer via %s</string>
+  <string name="incall_calling_on_same_carrier_template">Ringer via samme mobiloperatør: %s</string>
+  <string name="incall_calling_on_recent_choice_template">Ringer via nylig valgt: %s</string>
+  <string name="incall_connecting">Ringer …</string>
+  <string name="incall_connecting_assited_dialed">Ringer med +%1$s (%2$s) …</string>
+  <string name="incall_connecting_assited_dialed_component">Bruker +%1$s (%2$s) …</string>
+  <string name="incall_transferring">Overfører …</string>
+  <string name="incall_video_call_requesting">Videoanrop via mobiloperatør …</string>
+  <string name="incall_wifi_video_call_requesting">Videoanrop via Wi-Fi …</string>
+  <string name="incall_video_call_upgrade_request">Bytter til videoanrop via mobiloperatør …</string>
+  <string name="incall_video_call_request_failed">Kan ikke koble til</string>
+  <string name="incall_video_call_request_rejected">Anropet ble avvist</string>
+  <string name="incall_video_call_request_timed_out">Anropet ble tidsavbrutt</string>
+  <string name="incall_hanging_up">Legger på</string>
+  <string name="incall_call_ended">Samtalen er avsluttet</string>
+  <string name="incall_remotely_held">På vent</string>
+  <string name="contact_grid_incoming_video_call">Videoanrop via mobiloperatør fra</string>
+  <string name="contact_grid_incoming_wifi_video_call">Videoanrop via Wi-Fi fra</string>
+  <string name="contact_grid_incoming_voice_call">Anrop fra</string>
+  <string name="contact_grid_incoming_work_call">Jobbrelatert anrop fra</string>
+  <string name="contact_grid_incoming_via_template">Innkommende via %s</string>
+  <string name="contact_grid_incoming_suspected_spam">Sannsynligvis et useriøst anrop</string>
+  <string name="contact_grid_callback_number">Nummeret til denne telefonen: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-pa/strings.xml b/java/com/android/incallui/contactgrid/res/values-pa/strings.xml
index 96e9dd1..9dda0c6 100644
--- a/java/com/android/incallui/contactgrid/res/values-pa/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-pa/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_calling_via_template" msgid="3416867359475780924">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> ਰਾਹੀਂ ਕਾਲ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"ਕਾਲ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"ਤਬਾਦਲਾ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"ਕਨੈਕਟ ਕਰਨ ਦੇ ਅਯੋਗ"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"ਕਾਲ ਅਸਵੀਕਾਰ ਕੀਤੀ ਗਈ"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"ਕਾਲ ਦਾ ਸਮਾਂ ਸਮਾਪਤ ਹੋਇਆ"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"ਸਮਾਪਤ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"ਕਾਲ ਸਮਾਪਤ ਹੋਈ"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"ਰੋਕ ਕੇ ਰੱਖੀ ਗਈ"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"ਇਸ ਤੋਂ ਕਾਲ"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"ਇਸ ਤੋਂ ਕੰਮ ਸਬੰਧੀ ਕਾਲ"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> ਰਾਹੀਂ ਇਨਕਮਿੰਗ"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"ਸ਼ੱਕੀ ਸਪੈਮ ਕਾਲਰ"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"ਕਾਲਬੈਕ ਨੰਬਰ: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">%s ਰਾਹੀਂ ਕਾਲ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ</string>
+  <string name="incall_calling_on_same_carrier_template">ਇੱਕੋ ਕੈਰੀਅਰ %s ਰਾਹੀਂ ਕਾਲ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ</string>
+  <string name="incall_calling_on_recent_choice_template">ਹਾਲ ਹੀ ਵਿੱਚ ਚੁਣੇ ਗਏ %s ਰਾਹੀਂ ਕਾਲ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ</string>
+  <string name="incall_connecting">ਕਾਲ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ…</string>
+  <string name="incall_connecting_assited_dialed">+%1$s (%2$s) ਲਗਾ ਕੇ ਕਾਲ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ…</string>
+  <string name="incall_connecting_assited_dialed_component">+%1$s (%2$s) ਨੂੰ ਵਰਤਿਆ ਜਾ ਰਿਹਾ ਹੈ…</string>
+  <string name="incall_transferring">ਤਬਾਦਲਾ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ…</string>
+  <string name="incall_video_call_requesting">ਕੈਰੀਅਰ ਵੀਡੀਓ ਕਾਲਿੰਗ…</string>
+  <string name="incall_wifi_video_call_requesting">ਵਾਈ-ਫਾਈ ਕੈਰੀਅਰ ਵੀਡੀਓ ਕਾਲਿੰਗ…</string>
+  <string name="incall_video_call_upgrade_request">ਕੈਰੀਅਰ ਵੀਡੀਓ ਕਾਲਿੰਗ ਦੀ ਵਰਤੋਂ ਕਰਨ ਲੱਗੇ ਹਾਂ…</string>
+  <string name="incall_video_call_request_failed">ਕਨੈਕਟ ਕਰਨ ਦੇ ਅਯੋਗ</string>
+  <string name="incall_video_call_request_rejected">ਕਾਲ ਅਸਵੀਕਾਰ ਕੀਤੀ ਗਈ</string>
+  <string name="incall_video_call_request_timed_out">ਕਾਲ ਦਾ ਸਮਾਂ ਸਮਾਪਤ ਹੋਇਆ</string>
+  <string name="incall_hanging_up">ਸਮਾਪਤ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ</string>
+  <string name="incall_call_ended">ਕਾਲ ਸਮਾਪਤ ਹੋਈ</string>
+  <string name="incall_remotely_held">ਰੋਕ ਕੇ ਰੱਖੀ ਗਈ</string>
+  <string name="contact_grid_incoming_video_call">ਇਸ ਵੱਲੋਂ ਕੈਰੀਅਰ ਵੀਡੀਓ ਕਾਲ</string>
+  <string name="contact_grid_incoming_wifi_video_call">ਇਸ ਵੱਲੋਂ ਵਾਈ-ਫਾਈ ਕੈਰੀਅਰ ਵੀਡੀਓ ਕਾਲ</string>
+  <string name="contact_grid_incoming_voice_call">ਇਸ ਤੋਂ ਕਾਲ</string>
+  <string name="contact_grid_incoming_work_call">ਇਸ ਤੋਂ ਕੰਮ ਸਬੰਧੀ ਕਾਲ</string>
+  <string name="contact_grid_incoming_via_template">%s ਰਾਹੀਂ ਇਨਕਮਿੰਗ</string>
+  <string name="contact_grid_incoming_suspected_spam">ਸ਼ੱਕੀ ਸਪੈਮ ਕਾਲਰ</string>
+  <string name="contact_grid_callback_number">ਇਸ ਫ਼ੋਨ ਦਾ ਨੰਬਰ: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-pl/strings.xml b/java/com/android/incallui/contactgrid/res/values-pl/strings.xml
index e42545a..6f27574 100644
--- a/java/com/android/incallui/contactgrid/res/values-pl/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-pl/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_calling_via_template" msgid="3416867359475780924">"Dzwonię przez <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"Dzwonię…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"Przekazuję…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"Nie udało się połączyć"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"Połączenie zostało odrzucone"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"Osiągnięto limit czasu połączenia"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"Rozłączam"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"Połączenie zakończone"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"Oczekujące"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Połączenie z:"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Połączenie służbowe z:"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Przychodzące z sieci <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"Podejrzenie spamu"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"Numer oddzwaniania: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">Dzwonię przez %s</string>
+  <string name="incall_calling_on_same_carrier_template">Dzwonię, korzystając z usług tego samego operatora (%s)</string>
+  <string name="incall_calling_on_recent_choice_template">Dzwonię, korzystając z ostatnio wybranego operatora (%s)</string>
+  <string name="incall_connecting">Dzwonię…</string>
+  <string name="incall_connecting_assited_dialed">Dzwonię z: +%1$s (%2$s)…</string>
+  <string name="incall_connecting_assited_dialed_component">Używam +%1$s (%2$s)…</string>
+  <string name="incall_transferring">Przekazuję…</string>
+  <string name="incall_video_call_requesting">Rozpoczynam rozmowę wideo przez sieć operatora…</string>
+  <string name="incall_wifi_video_call_requesting">Rozpoczynam rozmowę wideo przez Wi-Fi…</string>
+  <string name="incall_video_call_upgrade_request">Przełączam na rozmowę wideo przez sieć operatora…</string>
+  <string name="incall_video_call_request_failed">Nie udało się połączyć</string>
+  <string name="incall_video_call_request_rejected">Połączenie zostało odrzucone</string>
+  <string name="incall_video_call_request_timed_out">Osiągnięto limit czasu połączenia</string>
+  <string name="incall_hanging_up">Rozłączam</string>
+  <string name="incall_call_ended">Połączenie zakończone</string>
+  <string name="incall_remotely_held">Oczekujące</string>
+  <string name="contact_grid_incoming_video_call">Rozmowa wideo przez sieć operatora z</string>
+  <string name="contact_grid_incoming_wifi_video_call">Rozmowa wideo przez Wi-Fi z</string>
+  <string name="contact_grid_incoming_voice_call">Połączenie z:</string>
+  <string name="contact_grid_incoming_work_call">Połączenie służbowe z:</string>
+  <string name="contact_grid_incoming_via_template">Przychodzące z sieci %s</string>
+  <string name="contact_grid_incoming_suspected_spam">Podejrzenie spamu</string>
+  <string name="contact_grid_callback_number">Numer tego telefonu: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-pt-rBR/strings.xml b/java/com/android/incallui/contactgrid/res/values-pt-rBR/strings.xml
index 606bad3..2772446 100644
--- a/java/com/android/incallui/contactgrid/res/values-pt-rBR/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-pt-rBR/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_calling_via_template" msgid="3416867359475780924">"Ligando via <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"Ligando…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"Transferindo…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"Não foi possível conectar"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"Chamada recusada"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"Chamada expirada"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"Desligando"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"Chamada encerrada"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"Em espera"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Chamada de"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Chamada de trabalho de"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Chamada de <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"Autor da chamada suspeito de spam"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"Número de retorno de chamada: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">Ligando via %s</string>
+  <string name="incall_calling_on_same_carrier_template">Usando a mesma operadora para ligar: %s</string>
+  <string name="incall_calling_on_recent_choice_template">Usando a última opção para ligar: %s</string>
+  <string name="incall_connecting">Ligando…</string>
+  <string name="incall_connecting_assited_dialed">Chamada usando +%1$s (%2$s)…</string>
+  <string name="incall_connecting_assited_dialed_component">Usando +%1$s (%2$s)…</string>
+  <string name="incall_transferring">Transferindo…</string>
+  <string name="incall_video_call_requesting">Fazendo videochamada via operadora...</string>
+  <string name="incall_wifi_video_call_requesting">Fazendo videochamada via operadora de Wi-Fi…</string>
+  <string name="incall_video_call_upgrade_request">Alternando para videochamada via operadora…</string>
+  <string name="incall_video_call_request_failed">Não foi possível conectar</string>
+  <string name="incall_video_call_request_rejected">Chamada recusada</string>
+  <string name="incall_video_call_request_timed_out">Chamada expirada</string>
+  <string name="incall_hanging_up">Desligando</string>
+  <string name="incall_call_ended">Chamada encerrada</string>
+  <string name="incall_remotely_held">Em espera</string>
+  <string name="contact_grid_incoming_video_call">Videochamada via operadora feita por</string>
+  <string name="contact_grid_incoming_wifi_video_call">Videochamada via operadora de Wi-Fi feita por</string>
+  <string name="contact_grid_incoming_voice_call">Chamada de</string>
+  <string name="contact_grid_incoming_work_call">Chamada de trabalho de</string>
+  <string name="contact_grid_incoming_via_template">Chamada de %s</string>
+  <string name="contact_grid_incoming_suspected_spam">Autor da chamada suspeito de spam</string>
+  <string name="contact_grid_callback_number">O número deste smartphone: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-pt-rPT/strings.xml b/java/com/android/incallui/contactgrid/res/values-pt-rPT/strings.xml
index 8eae675..4f9be69 100644
--- a/java/com/android/incallui/contactgrid/res/values-pt-rPT/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-pt-rPT/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_calling_via_template" msgid="3416867359475780924">"A telefonar através de <xliff:g id="PROVIDER_NAME">%s</xliff:g>…"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"A chamar…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"A transferir…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"Não é possível estabelecer ligação"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"Chamada recusada"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"A chamada expirou"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"A desligar…"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"Chamada terminada"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"Em espera"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Chamada de"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Chamada de trabalho de"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Chamada recebida através de <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"Autor suspeito de chamadas de spam"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"Número de retorno de chamadas: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">A telefonar através de %s…</string>
+  <string name="incall_calling_on_same_carrier_template">A ligar pelo mesmo operador %s</string>
+  <string name="incall_calling_on_recent_choice_template">A ligar pela escolha mais recente %s</string>
+  <string name="incall_connecting">A chamar…</string>
+  <string name="incall_connecting_assited_dialed">A ligar através de +%1$s (%2$s)…</string>
+  <string name="incall_connecting_assited_dialed_component">A utilizar +%1$s (%2$s)…</string>
+  <string name="incall_transferring">A transferir…</string>
+  <string name="incall_video_call_requesting">Videochamada do operador…</string>
+  <string name="incall_wifi_video_call_requesting">Videochamada do operador por Wi-Fi…</string>
+  <string name="incall_video_call_upgrade_request">A mudar para videochamada do operador…</string>
+  <string name="incall_video_call_request_failed">Não é possível estabelecer ligação</string>
+  <string name="incall_video_call_request_rejected">Chamada recusada</string>
+  <string name="incall_video_call_request_timed_out">A chamada expirou</string>
+  <string name="incall_hanging_up">A desligar…</string>
+  <string name="incall_call_ended">Chamada terminada</string>
+  <string name="incall_remotely_held">Em espera</string>
+  <string name="contact_grid_incoming_video_call">Videochamada do operador de</string>
+  <string name="contact_grid_incoming_wifi_video_call">Videochamada do operador por Wi-Fi de</string>
+  <string name="contact_grid_incoming_voice_call">Chamada de</string>
+  <string name="contact_grid_incoming_work_call">Chamada de trabalho de</string>
+  <string name="contact_grid_incoming_via_template">Chamada recebida através de %s</string>
+  <string name="contact_grid_incoming_suspected_spam">Autor suspeito de chamadas de spam</string>
+  <string name="contact_grid_callback_number">O número deste telemóvel: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-pt/strings.xml b/java/com/android/incallui/contactgrid/res/values-pt/strings.xml
index 606bad3..2772446 100644
--- a/java/com/android/incallui/contactgrid/res/values-pt/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-pt/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_calling_via_template" msgid="3416867359475780924">"Ligando via <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"Ligando…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"Transferindo…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"Não foi possível conectar"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"Chamada recusada"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"Chamada expirada"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"Desligando"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"Chamada encerrada"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"Em espera"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Chamada de"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Chamada de trabalho de"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Chamada de <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"Autor da chamada suspeito de spam"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"Número de retorno de chamada: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">Ligando via %s</string>
+  <string name="incall_calling_on_same_carrier_template">Usando a mesma operadora para ligar: %s</string>
+  <string name="incall_calling_on_recent_choice_template">Usando a última opção para ligar: %s</string>
+  <string name="incall_connecting">Ligando…</string>
+  <string name="incall_connecting_assited_dialed">Chamada usando +%1$s (%2$s)…</string>
+  <string name="incall_connecting_assited_dialed_component">Usando +%1$s (%2$s)…</string>
+  <string name="incall_transferring">Transferindo…</string>
+  <string name="incall_video_call_requesting">Fazendo videochamada via operadora...</string>
+  <string name="incall_wifi_video_call_requesting">Fazendo videochamada via operadora de Wi-Fi…</string>
+  <string name="incall_video_call_upgrade_request">Alternando para videochamada via operadora…</string>
+  <string name="incall_video_call_request_failed">Não foi possível conectar</string>
+  <string name="incall_video_call_request_rejected">Chamada recusada</string>
+  <string name="incall_video_call_request_timed_out">Chamada expirada</string>
+  <string name="incall_hanging_up">Desligando</string>
+  <string name="incall_call_ended">Chamada encerrada</string>
+  <string name="incall_remotely_held">Em espera</string>
+  <string name="contact_grid_incoming_video_call">Videochamada via operadora feita por</string>
+  <string name="contact_grid_incoming_wifi_video_call">Videochamada via operadora de Wi-Fi feita por</string>
+  <string name="contact_grid_incoming_voice_call">Chamada de</string>
+  <string name="contact_grid_incoming_work_call">Chamada de trabalho de</string>
+  <string name="contact_grid_incoming_via_template">Chamada de %s</string>
+  <string name="contact_grid_incoming_suspected_spam">Autor da chamada suspeito de spam</string>
+  <string name="contact_grid_callback_number">O número deste smartphone: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-ro/strings.xml b/java/com/android/incallui/contactgrid/res/values-ro/strings.xml
index 3dd7057..edd6510 100644
--- a/java/com/android/incallui/contactgrid/res/values-ro/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-ro/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_calling_via_template" msgid="3416867359475780924">"Se apelează prin <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"Se apelează…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"Se transferă…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"Nu se poate conecta"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"Apelul a fost respins"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"Durata de apelare a expirat"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"Se încheie apelul"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"Apel încheiat"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"În așteptare"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Apel primit de la"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Apel de serviciu de la"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Primite prin <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"Posibil apelant spam"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"Număr de apelare inversă: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">Se apelează prin %s</string>
+  <string name="incall_calling_on_same_carrier_template">Se apelează în rețeaua aceluiași operator %s</string>
+  <string name="incall_calling_on_recent_choice_template">Se apelează în rețeaua operatorului ales recent %s</string>
+  <string name="incall_connecting">Se apelează…</string>
+  <string name="incall_connecting_assited_dialed">Se apelează folosind +%1$s (%2$s)…</string>
+  <string name="incall_connecting_assited_dialed_component">Se folosește +%1$s (%2$s)…</string>
+  <string name="incall_transferring">Se transferă…</string>
+  <string name="incall_video_call_requesting">Se apelează video prin operator…</string>
+  <string name="incall_wifi_video_call_requesting">Se apelează video prin operator Wi-Fi…</string>
+  <string name="incall_video_call_upgrade_request">Se comută la apelul video prin operator…</string>
+  <string name="incall_video_call_request_failed">Nu se poate conecta</string>
+  <string name="incall_video_call_request_rejected">Apelul a fost respins</string>
+  <string name="incall_video_call_request_timed_out">Durata de apelare a expirat</string>
+  <string name="incall_hanging_up">Se încheie apelul</string>
+  <string name="incall_call_ended">Apel încheiat</string>
+  <string name="incall_remotely_held">În așteptare</string>
+  <string name="contact_grid_incoming_video_call">Apel video prin operator de la</string>
+  <string name="contact_grid_incoming_wifi_video_call">Apel video prin operator Wi-Fi de la</string>
+  <string name="contact_grid_incoming_voice_call">Apel primit de la</string>
+  <string name="contact_grid_incoming_work_call">Apel de serviciu de la</string>
+  <string name="contact_grid_incoming_via_template">Primite prin %s</string>
+  <string name="contact_grid_incoming_suspected_spam">Posibil apelant spam</string>
+  <string name="contact_grid_callback_number">Numărul acestui telefon: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-ru/strings.xml b/java/com/android/incallui/contactgrid/res/values-ru/strings.xml
index 4f3fa8b..1931dcf 100644
--- a/java/com/android/incallui/contactgrid/res/values-ru/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-ru/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_calling_via_template" msgid="3416867359475780924">"Вызов через <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"Вызов…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"Перевод вызова…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"Не удалось установить соединение"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"Вызов отклонен"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"Время ожидания истекло"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"Завершение вызова…"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"Вызов завершен"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"На удержании"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Вызов от"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Рабочий вызов от"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Входящий вызов (оператор: <xliff:g id="PROVIDER_NAME">%s</xliff:g>)"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"Подозрение на спам"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"Номер обратного вызова: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">Вызов через %s</string>
+  <string name="incall_calling_on_same_carrier_template">Звонок через того же оператора, %s</string>
+  <string name="incall_calling_on_recent_choice_template">Звонок через недавно выбранного оператора, %s</string>
+  <string name="incall_connecting">Вызов…</string>
+  <string name="incall_connecting_assited_dialed">Звонок через код +%1$s (%2$s)…</string>
+  <string name="incall_connecting_assited_dialed_component">Используется код +%1$s (%2$s)…</string>
+  <string name="incall_transferring">Перевод вызова…</string>
+  <string name="incall_video_call_requesting">Видеовызов…</string>
+  <string name="incall_wifi_video_call_requesting">Видеовызов по Wi-Fi…</string>
+  <string name="incall_video_call_upgrade_request">Переключение на видеовызов…</string>
+  <string name="incall_video_call_request_failed">Не удалось установить соединение</string>
+  <string name="incall_video_call_request_rejected">Вызов отклонен</string>
+  <string name="incall_video_call_request_timed_out">Время ожидания истекло</string>
+  <string name="incall_hanging_up">Завершение вызова…</string>
+  <string name="incall_call_ended">Вызов завершен</string>
+  <string name="incall_remotely_held">На удержании</string>
+  <string name="contact_grid_incoming_video_call">Видеовызов от:</string>
+  <string name="contact_grid_incoming_wifi_video_call">Видеовызов по Wi-Fi от:</string>
+  <string name="contact_grid_incoming_voice_call">Вызов от</string>
+  <string name="contact_grid_incoming_work_call">Рабочий вызов от</string>
+  <string name="contact_grid_incoming_via_template">Входящий вызов на %s</string>
+  <string name="contact_grid_incoming_suspected_spam">Подозрение на спам</string>
+  <string name="contact_grid_callback_number">Номер этого телефона: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-si/strings.xml b/java/com/android/incallui/contactgrid/res/values-si/strings.xml
index 6eead50..b165140 100644
--- a/java/com/android/incallui/contactgrid/res/values-si/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-si/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_calling_via_template" msgid="3416867359475780924">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> හරහා අමතමින්"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"අමතමින්…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"මාරු කරමින්…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"සම්බන්ධ වීමට නොහැකිය"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"ඇමතුම ප්‍රතික්ෂේප කෙරණි"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"ඇමතුම් කාලය නිමා විය"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"විසන්ධි කරමින්"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"ඇමතුම අවසන් විය"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"රඳවා ගත්"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"වෙතින් ඇමතුම"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"වෙතින් කාර්යාල ඇමතුම"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> හරහා එන"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"සැකසහිත අයාචිත තැපැල් අමතන්නා"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"පසුඇමතුම් අංකය: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">%s හරහා අමතමින්</string>
+  <string name="incall_calling_on_same_carrier_template">එකම %s වාහකයෙහි අමතමින්</string>
+  <string name="incall_calling_on_recent_choice_template">මෑත %s තේරීමෙහි අමතමින්</string>
+  <string name="incall_connecting">අමතමින්…</string>
+  <string name="incall_connecting_assited_dialed">+%1$s (%2$s) භාවිතයෙන් අමතමින්…</string>
+  <string name="incall_connecting_assited_dialed_component">+%1$s (%2$s) භාවිත කරමින්…</string>
+  <string name="incall_transferring">මාරු කරමින්…</string>
+  <string name="incall_video_call_requesting">වාහක වීඩියෝ ඇමතීම…</string>
+  <string name="incall_wifi_video_call_requesting">Wi-Fi වාහක වීඩියෝ ඇමතීම…</string>
+  <string name="incall_video_call_upgrade_request">වාහක වීඩියෝවට මාරු වෙමින්…</string>
+  <string name="incall_video_call_request_failed">සම්බන්ධ වීමට නොහැකිය</string>
+  <string name="incall_video_call_request_rejected">ඇමතුම ප්‍රතික්ෂේප කෙරණි</string>
+  <string name="incall_video_call_request_timed_out">ඇමතුම් කාලය නිමා විය</string>
+  <string name="incall_hanging_up">විසන්ධි කරමින්</string>
+  <string name="incall_call_ended">ඇමතුම අවසන් විය</string>
+  <string name="incall_remotely_held">රඳවා ගත්</string>
+  <string name="contact_grid_incoming_video_call">වෙතින් වාහක වීඩියෝ ඇමතුම</string>
+  <string name="contact_grid_incoming_wifi_video_call">වෙතින් Wi-Fi වාහක වීඩියෝ ඇමතුම</string>
+  <string name="contact_grid_incoming_voice_call">වෙතින් ඇමතුම</string>
+  <string name="contact_grid_incoming_work_call">වෙතින් කාර්යාල ඇමතුම</string>
+  <string name="contact_grid_incoming_via_template">%s හරහා එන</string>
+  <string name="contact_grid_incoming_suspected_spam">සැකසහිත අයාචිත තැපැල් අමතන්නා</string>
+  <string name="contact_grid_callback_number">මෙම දුරකථනයෙහි අංකය වන්නේ: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-sk/strings.xml b/java/com/android/incallui/contactgrid/res/values-sk/strings.xml
index 2d46f5f..4aab19b 100644
--- a/java/com/android/incallui/contactgrid/res/values-sk/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-sk/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_calling_via_template" msgid="3416867359475780924">"Voláte prostredníctvom poskytovateľa <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"Prebieha hovor…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"Prenáša sa…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"Pripojenie nie je možné"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"Hovor bol odmietnutý"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"Časový limit hovoru uplynul"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"Ukončuje sa hovor"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"Hovor bol ukončený"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"Podržané"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Hovor od:"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Pracovný hovor od:"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Prichádzajúci hovor prostredníctvom poskytovateľa <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"Podozrenie na spam"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"Číslo na spätné volanie: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">Voláte prostredníctvom poskytovateľa %s</string>
+  <string name="incall_calling_on_same_carrier_template">Volá sa cez rovnakého operátora %s</string>
+  <string name="incall_calling_on_recent_choice_template">Volá sa cez nedávno vybraného operátora %s</string>
+  <string name="incall_connecting">Prebieha hovor…</string>
+  <string name="incall_connecting_assited_dialed">Volá sa s predvoľbou +%1$s (%2$s)…</string>
+  <string name="incall_connecting_assited_dialed_component">Bola použitá predvoľba +%1$s (%2$s)…</string>
+  <string name="incall_transferring">Prenáša sa…</string>
+  <string name="incall_video_call_requesting">Videohovory prostredníctvom operátora…</string>
+  <string name="incall_wifi_video_call_requesting">Videohovory cez Wi-Fi prostredníctvom operátora…</string>
+  <string name="incall_video_call_upgrade_request">Prepína sa na videohovor prostredníctvom operátora…</string>
+  <string name="incall_video_call_request_failed">Pripojenie nie je možné</string>
+  <string name="incall_video_call_request_rejected">Hovor bol odmietnutý</string>
+  <string name="incall_video_call_request_timed_out">Časový limit hovoru uplynul</string>
+  <string name="incall_hanging_up">Ukončuje sa hovor</string>
+  <string name="incall_call_ended">Hovor bol ukončený</string>
+  <string name="incall_remotely_held">Podržané</string>
+  <string name="contact_grid_incoming_video_call">Videohovor prostredníctvom operátora od</string>
+  <string name="contact_grid_incoming_wifi_video_call">Videohovor cez Wi-Fi prostredníctvom operátora od</string>
+  <string name="contact_grid_incoming_voice_call">Hovor od:</string>
+  <string name="contact_grid_incoming_work_call">Pracovný hovor od:</string>
+  <string name="contact_grid_incoming_via_template">Prichádzajúci hovor prostredníctvom poskytovateľa %s</string>
+  <string name="contact_grid_incoming_suspected_spam">Podozrenie na spam</string>
+  <string name="contact_grid_callback_number">Číslo tohto telefónu: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-sl/strings.xml b/java/com/android/incallui/contactgrid/res/values-sl/strings.xml
index 390a102..c42cc82 100644
--- a/java/com/android/incallui/contactgrid/res/values-sl/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-sl/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_calling_via_template" msgid="3416867359475780924">"Klicanje prek ponudnika <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"Klicanje …"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"Prenašanje ..."</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"Povezave ni mogoče vzpostaviti"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"Klic je bil zavrnjen"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"Časovna omejitev klica je potekla"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"Prekinitev"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"Klic je bil končan"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"Zadržano"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Klic osebe"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Delovni klic osebe"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Dohodni klic prek storitve <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"Neželeni klicatelj"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"Številka za povratni klic: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">Klicanje prek ponudnika %s</string>
+  <string name="incall_calling_on_same_carrier_template">Klicanje prek istega operaterja %s</string>
+  <string name="incall_calling_on_recent_choice_template">Klicanje glede na nedavno izbiro %s</string>
+  <string name="incall_connecting">Klicanje …</string>
+  <string name="incall_connecting_assited_dialed">Klicanje prek +%1$s (%2$s) …</string>
+  <string name="incall_connecting_assited_dialed_component">Uporabljeno +%1$s (%2$s) …</string>
+  <string name="incall_transferring">Prenašanje ...</string>
+  <string name="incall_video_call_requesting">Videoklicanje prek operaterja …</string>
+  <string name="incall_wifi_video_call_requesting">Videoklicanje prek Wi-Fi-ja operaterja …</string>
+  <string name="incall_video_call_upgrade_request">Preklapljanje na videoklic prek operaterja …</string>
+  <string name="incall_video_call_request_failed">Povezave ni mogoče vzpostaviti</string>
+  <string name="incall_video_call_request_rejected">Klic je bil zavrnjen</string>
+  <string name="incall_video_call_request_timed_out">Časovna omejitev klica je potekla</string>
+  <string name="incall_hanging_up">Prekinitev</string>
+  <string name="incall_call_ended">Klic je bil končan</string>
+  <string name="incall_remotely_held">Zadržano</string>
+  <string name="contact_grid_incoming_video_call">Videoklic prek operaterja osebe</string>
+  <string name="contact_grid_incoming_wifi_video_call">Videoklic prek Wi-Fi-ja operaterja osebe</string>
+  <string name="contact_grid_incoming_voice_call">Klic osebe</string>
+  <string name="contact_grid_incoming_work_call">Delovni klic osebe</string>
+  <string name="contact_grid_incoming_via_template">Dohodni klic prek storitve %s</string>
+  <string name="contact_grid_incoming_suspected_spam">Neželeni klicatelj</string>
+  <string name="contact_grid_callback_number">Številka tega telefona: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-sq/strings.xml b/java/com/android/incallui/contactgrid/res/values-sq/strings.xml
index e2ed11d..3b5a921 100644
--- a/java/com/android/incallui/contactgrid/res/values-sq/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-sq/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_calling_via_template" msgid="3416867359475780924">"Telefonatë nëpërmjet <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"Po telefonon…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"Po transferon..."</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"Nuk mund të lidhet"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"Telefonata u refuzua"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"Telefonatës i mbaroi koha"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"Po mbyllet"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"Telefonata përfundoi"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"Në pritje"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Telefonatë nga"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Telefonatë pune nga"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Telefonatë hyrëse nëpërmjet <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"Telefonues i dyshuar si i padëshiruar"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"Numri i kthimit të telefonatës: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">Telefonatë nëpërmjet %s</string>
+  <string name="incall_calling_on_same_carrier_template">Po telefonon me të njëjtin operator celular %s</string>
+  <string name="incall_calling_on_recent_choice_template">Po telefonon me zgjedhjen e fundit %s</string>
+  <string name="incall_connecting">Po telefonon…</string>
+  <string name="incall_connecting_assited_dialed">Po telefonon me +%1$s (%2$s)…</string>
+  <string name="incall_connecting_assited_dialed_component">Po përdor +%1$s (%2$s)…</string>
+  <string name="incall_transferring">Po transferon...</string>
+  <string name="incall_video_call_requesting">Telefonatë me video e operatorit celular...</string>
+  <string name="incall_wifi_video_call_requesting">Telefonatë me video me Wi-Fi e operatorit celular…</string>
+  <string name="incall_video_call_upgrade_request">Po kalon te videoja e operatorit celular…</string>
+  <string name="incall_video_call_request_failed">Nuk mund të lidhet</string>
+  <string name="incall_video_call_request_rejected">Telefonata u refuzua</string>
+  <string name="incall_video_call_request_timed_out">Telefonatës i mbaroi koha</string>
+  <string name="incall_hanging_up">Po mbyllet</string>
+  <string name="incall_call_ended">Telefonata përfundoi</string>
+  <string name="incall_remotely_held">Në pritje</string>
+  <string name="contact_grid_incoming_video_call">Telefonatë me video e operatorit celular nga</string>
+  <string name="contact_grid_incoming_wifi_video_call">Telefonatë me video me Wi-Fi e operatorit celular nga</string>
+  <string name="contact_grid_incoming_voice_call">Telefonatë nga</string>
+  <string name="contact_grid_incoming_work_call">Telefonatë pune nga</string>
+  <string name="contact_grid_incoming_via_template">Telefonatë hyrëse nëpërmjet %s</string>
+  <string name="contact_grid_incoming_suspected_spam">Telefonues i dyshuar si i padëshiruar</string>
+  <string name="contact_grid_callback_number">Numri i këtij telefoni: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-sr/strings.xml b/java/com/android/incallui/contactgrid/res/values-sr/strings.xml
index fe59a30..6d321f8 100644
--- a/java/com/android/incallui/contactgrid/res/values-sr/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-sr/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_calling_via_template" msgid="3416867359475780924">"Позивамо преко <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"Позивамо…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"Преносимо…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"Повезивање није успело"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"Позив је одбијен"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"Временско ограничење позива је истекло"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"Прекидамо везу"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"Позив је завршен"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"На чекању"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Позив од"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Пословни позив од"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Долазни позив преко <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"Потенцијално непожељан позивалац"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"Број за повратни позив: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">Позивамо преко %s</string>
+  <string name="incall_calling_on_same_carrier_template">Позива се преко истог мобилног оператера: %s</string>
+  <string name="incall_calling_on_recent_choice_template">Позива се на основу недавног избора преко: %s</string>
+  <string name="incall_connecting">Позивамо…</string>
+  <string name="incall_connecting_assited_dialed">Позива се са +%1$s (%2$s)…</string>
+  <string name="incall_connecting_assited_dialed_component">Користи се +%1$s (%2$s)…</string>
+  <string name="incall_transferring">Преносимо…</string>
+  <string name="incall_video_call_requesting">Упућује се видео позив преко оператера…</string>
+  <string name="incall_wifi_video_call_requesting">Пребацује се на Wi-Fi видео позив преко оператера…</string>
+  <string name="incall_video_call_upgrade_request">Пребацује се на видео позив преко оператера…</string>
+  <string name="incall_video_call_request_failed">Повезивање није успело</string>
+  <string name="incall_video_call_request_rejected">Позив је одбијен</string>
+  <string name="incall_video_call_request_timed_out">Временско ограничење позива је истекло</string>
+  <string name="incall_hanging_up">Прекидамо везу</string>
+  <string name="incall_call_ended">Позив је завршен</string>
+  <string name="incall_remotely_held">На чекању</string>
+  <string name="contact_grid_incoming_video_call">Видео позив преко оператера од:</string>
+  <string name="contact_grid_incoming_wifi_video_call">Wi-Fi видео позив преко оператера од:</string>
+  <string name="contact_grid_incoming_voice_call">Позив од</string>
+  <string name="contact_grid_incoming_work_call">Пословни позив од</string>
+  <string name="contact_grid_incoming_via_template">Долазни позив преко %s</string>
+  <string name="contact_grid_incoming_suspected_spam">Потенцијално непожељан позивалац</string>
+  <string name="contact_grid_callback_number">Број овог телефона: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-sv/strings.xml b/java/com/android/incallui/contactgrid/res/values-sv/strings.xml
index 61bb7d1..9f6297e 100644
--- a/java/com/android/incallui/contactgrid/res/values-sv/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-sv/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_calling_via_template" msgid="3416867359475780924">"Ringer med <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"Ringer upp …"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"Överför …"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"Det går inte att ansluta"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"Samtalet avvisat"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"Samtalets tidsgräns nådd"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"Lägger på"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"Samtal avslutat"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"Parkerat"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Samtal från"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Jobbsamtal från"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Inkommande via <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"Misstänkt spamsamtal"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"Motringningsnummer: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">Ringer med %s</string>
+  <string name="incall_calling_on_same_carrier_template">Ringer via samma operatör %s</string>
+  <string name="incall_calling_on_recent_choice_template">Ringer via senaste val %s</string>
+  <string name="incall_connecting">Ringer upp …</string>
+  <string name="incall_connecting_assited_dialed">Ringer med +%1$s (%2$s)…</string>
+  <string name="incall_connecting_assited_dialed_component">Med +%1$s (%2$s) …</string>
+  <string name="incall_transferring">Överför …</string>
+  <string name="incall_video_call_requesting">Videosamtal med operatören …</string>
+  <string name="incall_wifi_video_call_requesting">Videosamtal med Wi-Fi-operatören …</string>
+  <string name="incall_video_call_upgrade_request">Växlar till operatörsvideo …</string>
+  <string name="incall_video_call_request_failed">Det går inte att ansluta</string>
+  <string name="incall_video_call_request_rejected">Samtalet avvisat</string>
+  <string name="incall_video_call_request_timed_out">Samtalets tidsgräns nådd</string>
+  <string name="incall_hanging_up">Lägger på</string>
+  <string name="incall_call_ended">Samtal avslutat</string>
+  <string name="incall_remotely_held">Parkerat</string>
+  <string name="contact_grid_incoming_video_call">Operatörsvideosamtal från</string>
+  <string name="contact_grid_incoming_wifi_video_call">Wi-Fi-operatörsvideosamtal från</string>
+  <string name="contact_grid_incoming_voice_call">Samtal från</string>
+  <string name="contact_grid_incoming_work_call">Jobbsamtal från</string>
+  <string name="contact_grid_incoming_via_template">Inkommande via %s</string>
+  <string name="contact_grid_incoming_suspected_spam">Misstänkt spamsamtal</string>
+  <string name="contact_grid_callback_number">Telefonens nummer: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-sw/strings.xml b/java/com/android/incallui/contactgrid/res/values-sw/strings.xml
index 43e4b91..3b944a9 100644
--- a/java/com/android/incallui/contactgrid/res/values-sw/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-sw/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_calling_via_template" msgid="3416867359475780924">"Inapiga simu kupitia <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"Inapiga simu…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"Inahamisha…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"Imeshindwa kuunganisha"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"Simu imekataliwa"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"Muda wa kuanza upigaji simu umekwisha"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"Inakata simu"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"Simu imekamilika"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"Imesitishwa"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Simu kutoka kwa"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Simu ya kazi kutoka kwa"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Simu zinazoingia kupitia <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"Anayeshukiwa kupiga simu taka"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"Nambari yako ya kupigiwa simu: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">Inapiga simu kupitia %s</string>
+  <string name="incall_calling_on_same_carrier_template">Inapiga kwa kutumia mtandao wa mtoa huduma yule yule %s</string>
+  <string name="incall_calling_on_recent_choice_template">Inapiga kwa kutumia mtandao wa mtoa huduma wa hivi karibuni %s</string>
+  <string name="incall_connecting">Inapiga simu…</string>
+  <string name="incall_connecting_assited_dialed">Kupiga simu kwa kutumia +%1$s (%2$s)…</string>
+  <string name="incall_connecting_assited_dialed_component">Kwa kutumia +%1$s (%2$s)…</string>
+  <string name="incall_transferring">Inahamisha…</string>
+  <string name="incall_video_call_requesting">Unapiga simu ya video kupitia kampuni ya simu…</string>
+  <string name="incall_wifi_video_call_requesting">Unapiga simu ya video kupitia Wi-Fi…</string>
+  <string name="incall_video_call_upgrade_request">Inabadilisha kwenda kwenye simu ya video…</string>
+  <string name="incall_video_call_request_failed">Imeshindwa kuunganisha</string>
+  <string name="incall_video_call_request_rejected">Simu imekataliwa</string>
+  <string name="incall_video_call_request_timed_out">Muda wa kuanza upigaji simu umekwisha</string>
+  <string name="incall_hanging_up">Inakata simu</string>
+  <string name="incall_call_ended">Simu imekamilika</string>
+  <string name="incall_remotely_held">Imesitishwa</string>
+  <string name="contact_grid_incoming_video_call">Simu ya video kutoka</string>
+  <string name="contact_grid_incoming_wifi_video_call">Simu ya video kupitia Wi-Fi kutoka</string>
+  <string name="contact_grid_incoming_voice_call">Simu kutoka kwa</string>
+  <string name="contact_grid_incoming_work_call">Simu ya kazi kutoka kwa</string>
+  <string name="contact_grid_incoming_via_template">Simu zinazoingia kupitia %s</string>
+  <string name="contact_grid_incoming_suspected_spam">Anayeshukiwa kupiga simu taka</string>
+  <string name="contact_grid_callback_number">Nambari ya simu hii: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-ta/strings.xml b/java/com/android/incallui/contactgrid/res/values-ta/strings.xml
index b9b90d9..f00afad 100644
--- a/java/com/android/incallui/contactgrid/res/values-ta/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-ta/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_calling_via_template" msgid="3416867359475780924">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> வழியாக அழைக்கிறது"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"அழைக்கிறது…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"இடமாற்றுகிறது…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"இணைக்க முடியவில்லை"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"அழைப்பு நிராகரிக்கப்பட்டது"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"அழைப்பின் நேரம் முடிந்தது"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"துண்டிக்கிறது"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"அழைப்பு முடிந்தது"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"ஹோல்டில் உள்ளது"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"அழைப்பு:"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"அழைப்பு (பணி) :"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> மூலம் உள்வரும் அழைப்பு"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"சந்தேகத்திற்குரிய ஸ்பேம் அழைப்பாளர்"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"திரும்ப அழைப்பதற்கான எண்: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">%s வழியாக அழைக்கிறது</string>
+  <string name="incall_calling_on_same_carrier_template">%s (அதே தொலைத்தொடர்பு நிறுவனம்) இல் அழைக்கிறது</string>
+  <string name="incall_calling_on_recent_choice_template">%s (சமீபத்தில் தேர்வுசெய்த கேரியர்) இல் அழைக்கிறது</string>
+  <string name="incall_connecting">அழைக்கிறது…</string>
+  <string name="incall_connecting_assited_dialed">+%1$s (%2$s)ஐப் பயன்படுத்தி அழைக்கிறது…</string>
+  <string name="incall_connecting_assited_dialed_component">+%1$s (%2$s) என்ற நாட்டின் குறியீட்டைப் பயன்படுத்துகிறது…</string>
+  <string name="incall_transferring">இடமாற்றுகிறது…</string>
+  <string name="incall_video_call_requesting">தொலைத்தொடர்பு நிறுவன வீடியோ அழைப்பு…</string>
+  <string name="incall_wifi_video_call_requesting">வைஃபையில் தொலைத்தொடர்பு வீடியோ அழைப்பு…</string>
+  <string name="incall_video_call_upgrade_request">தொலைத்தொடர்பு நிறுவன வீடியோவிற்கு மாறுகிறது…</string>
+  <string name="incall_video_call_request_failed">இணைக்க முடியவில்லை</string>
+  <string name="incall_video_call_request_rejected">அழைப்பு நிராகரிக்கப்பட்டது</string>
+  <string name="incall_video_call_request_timed_out">அழைப்பின் நேரம் முடிந்தது</string>
+  <string name="incall_hanging_up">துண்டிக்கிறது</string>
+  <string name="incall_call_ended">அழைப்பு முடிந்தது</string>
+  <string name="incall_remotely_held">ஹோல்டில் உள்ளது</string>
+  <string name="contact_grid_incoming_video_call">இவரிடமிருந்து தொலைத்தொடர்பு நிறுவன வீடியோ அழைப்பு</string>
+  <string name="contact_grid_incoming_wifi_video_call">இவரிடமிருந்து வைஃபையில் தொலைத்தொடர்பு வீடியோ அழைப்பு</string>
+  <string name="contact_grid_incoming_voice_call">அழைப்பு:</string>
+  <string name="contact_grid_incoming_work_call">அழைப்பு (பணி) :</string>
+  <string name="contact_grid_incoming_via_template">%s மூலம் உள்வரும் அழைப்பு</string>
+  <string name="contact_grid_incoming_suspected_spam">சந்தேகத்திற்குரிய ஸ்பேம் அழைப்பாளர்</string>
+  <string name="contact_grid_callback_number">இந்த ஃபோனின் எண்: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-te/strings.xml b/java/com/android/incallui/contactgrid/res/values-te/strings.xml
index efceca4..258f5fd 100644
--- a/java/com/android/incallui/contactgrid/res/values-te/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-te/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_calling_via_template" msgid="3416867359475780924">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> ద్వారా కాల్ చేస్తోంది"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"కాల్ చేస్తోంది…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"బదిలీ చేస్తోంది…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"కనెక్ట్ చేయలేకపోయింది"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"కాల్ తిరస్కరించబడింది"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"కాల్ సమయాభావం అయింది"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"కాల్ ముగిస్తోంది"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"కాల్ ముగిసింది"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"హోల్డ్‌లో ఉంది"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"వీరి నుండి కాల్:"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"వీరి నుండి కార్యాలయ కాల్:"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> ద్వారా ఇన్‌కమింగ్ కాల్"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"అనుమానాస్పద స్పామ్ కాలర్"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"కాల్‌బ్యాక్ నంబర్: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">%s ద్వారా కాల్ చేస్తోంది</string>
+  <string name="incall_calling_on_same_carrier_template">అదే క్యారియర్ %sలో కాల్ చేస్తోంది</string>
+  <string name="incall_calling_on_recent_choice_template">ఇటీవలి ఎంపిక %sలో కాల్ చేస్తోంది</string>
+  <string name="incall_connecting">కాల్ చేస్తోంది…</string>
+  <string name="incall_connecting_assited_dialed">+%1$sని (%2$s) ఉపయోగించి కాల్ చేస్తోంది…</string>
+  <string name="incall_connecting_assited_dialed_component">+%1$s (%2$s) ఉపయోగించి…</string>
+  <string name="incall_transferring">బదిలీ చేస్తోంది…</string>
+  <string name="incall_video_call_requesting">క్యారియర్ వీడియో కాలింగ్...</string>
+  <string name="incall_wifi_video_call_requesting">Wi-Fi క్యారియర్ వీడియో కాలింగ్...</string>
+  <string name="incall_video_call_upgrade_request">క్యారియర్ వీడియోకి మారుతోంది...</string>
+  <string name="incall_video_call_request_failed">కనెక్ట్ చేయలేకపోయింది</string>
+  <string name="incall_video_call_request_rejected">కాల్ తిరస్కరించబడింది</string>
+  <string name="incall_video_call_request_timed_out">కాల్ సమయాభావం అయింది</string>
+  <string name="incall_hanging_up">కాల్ ముగిస్తోంది</string>
+  <string name="incall_call_ended">కాల్ ముగిసింది</string>
+  <string name="incall_remotely_held">హోల్డ్‌లో ఉంది</string>
+  <string name="contact_grid_incoming_video_call">వీరి నుండి క్యారియర్ వీడియో కాల్</string>
+  <string name="contact_grid_incoming_wifi_video_call">వీరి నుండి Wi-Fi క్యారియర్ వీడియో కాల్</string>
+  <string name="contact_grid_incoming_voice_call">వీరి నుండి కాల్:</string>
+  <string name="contact_grid_incoming_work_call">వీరి నుండి కార్యాలయ కాల్:</string>
+  <string name="contact_grid_incoming_via_template">%s ద్వారా ఇన్‌కమింగ్ కాల్</string>
+  <string name="contact_grid_incoming_suspected_spam">అనుమానాస్పద స్పామ్ కాలర్</string>
+  <string name="contact_grid_callback_number">ఈ ఫోన్ నంబర్: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-th/strings.xml b/java/com/android/incallui/contactgrid/res/values-th/strings.xml
index 26bad51..4c366f4 100644
--- a/java/com/android/incallui/contactgrid/res/values-th/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-th/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_calling_via_template" msgid="3416867359475780924">"โทรผ่าน <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"กำลังโทร…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"กำลังโอน…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"ไม่สามารถเชื่อมต่อ"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"สายถูกปฏิเสธ"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"ไม่มีผู้รับสาย"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"กำลังวางสาย"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"วางสายแล้ว"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"พักสาย"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"โทรจาก"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"โทรเรื่องงานจาก"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"สายเรียกเข้าผ่าน <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"ผู้โทรที่สงสัยว่าเป็นสแปม"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"หมายเลขโทรกลับ: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">โทรผ่าน %s</string>
+  <string name="incall_calling_on_same_carrier_template">กำลังโทรโดยใช้ผู้ให้บริการเดียวกัน%s</string>
+  <string name="incall_calling_on_recent_choice_template">กำลังโทรโดยใช้ตัวเลือกล่าสุด%s</string>
+  <string name="incall_connecting">กำลังโทร…</string>
+  <string name="incall_connecting_assited_dialed">โทรด้วย +%1$s (%2$s)…</string>
+  <string name="incall_connecting_assited_dialed_component">กำลังใช้ +%1$s (%2$s)…</string>
+  <string name="incall_transferring">กำลังโอน…</string>
+  <string name="incall_video_call_requesting">กำลังโทรวิดีโอคอลผ่านผู้ให้บริการ...</string>
+  <string name="incall_wifi_video_call_requesting">กำลังโทรวิดีโอคอลผ่านผู้ให้บริการ Wi-Fi…</string>
+  <string name="incall_video_call_upgrade_request">กำลังเปลี่ยนไปเป็นวิดีโอคอลผ่านผู้ให้บริการ…</string>
+  <string name="incall_video_call_request_failed">ไม่สามารถเชื่อมต่อ</string>
+  <string name="incall_video_call_request_rejected">สายถูกปฏิเสธ</string>
+  <string name="incall_video_call_request_timed_out">ไม่มีผู้รับสาย</string>
+  <string name="incall_hanging_up">กำลังวางสาย</string>
+  <string name="incall_call_ended">วางสายแล้ว</string>
+  <string name="incall_remotely_held">พักสาย</string>
+  <string name="contact_grid_incoming_video_call">วิดีโอคอลผ่านผู้ให้บริการจาก</string>
+  <string name="contact_grid_incoming_wifi_video_call">วิดีโอคอลผ่านผู้ให้บริการ Wi-Fi จาก</string>
+  <string name="contact_grid_incoming_voice_call">โทรจาก</string>
+  <string name="contact_grid_incoming_work_call">โทรเรื่องงานจาก</string>
+  <string name="contact_grid_incoming_via_template">สายเรียกเข้าผ่าน %s</string>
+  <string name="contact_grid_incoming_suspected_spam">ผู้โทรที่สงสัยว่าเป็นสแปม</string>
+  <string name="contact_grid_callback_number">หมายเลขโทรศัพท์นี้: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-tl/strings.xml b/java/com/android/incallui/contactgrid/res/values-tl/strings.xml
index a80b72e..120ab78 100644
--- a/java/com/android/incallui/contactgrid/res/values-tl/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-tl/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_calling_via_template" msgid="3416867359475780924">"Tumatawag sa pamamagitan ng <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"Tinatawagan…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"Inililipat…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"Hindi nakakonekta"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"Tinanggihan ang tawag"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"Nag-time out ang tawag"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"Binababa"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"Natapos ang tawag"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"Naka-hold"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Tawag mula kay"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Tawag sa trabaho mula kay"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Papasok sa pamamagitan ng <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"Pinaghihinalaang spam na tumatawag"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"Numero upang matawagang muli: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">Tumatawag sa pamamagitan ng %s</string>
+  <string name="incall_calling_on_same_carrier_template">Tumatawag sa parehong carrier na %s</string>
+  <string name="incall_calling_on_recent_choice_template">Tumatawag sa kamakailang pinili na %s</string>
+  <string name="incall_connecting">Tinatawagan…</string>
+  <string name="incall_connecting_assited_dialed">Tumatawag gamit ang +%1$s (%2$s)…</string>
+  <string name="incall_connecting_assited_dialed_component">Ginagamit ang +%1$s (%2$s)…</string>
+  <string name="incall_transferring">Inililipat…</string>
+  <string name="incall_video_call_requesting">Pakikipag-video call gamit ang carrier…</string>
+  <string name="incall_wifi_video_call_requesting">Pakikipag-video call gamit ang Wi-Fi carrier…</string>
+  <string name="incall_video_call_upgrade_request">Lumilipat sa video ng carrier…</string>
+  <string name="incall_video_call_request_failed">Hindi nakakonekta</string>
+  <string name="incall_video_call_request_rejected">Tinanggihan ang tawag</string>
+  <string name="incall_video_call_request_timed_out">Nag-time out ang tawag</string>
+  <string name="incall_hanging_up">Binababa</string>
+  <string name="incall_call_ended">Natapos ang tawag</string>
+  <string name="incall_remotely_held">Naka-hold</string>
+  <string name="contact_grid_incoming_video_call">Video call sa carrier mula kay</string>
+  <string name="contact_grid_incoming_wifi_video_call">Video call sa Wi-Fi carrier mula kay</string>
+  <string name="contact_grid_incoming_voice_call">Tawag mula kay</string>
+  <string name="contact_grid_incoming_work_call">Tawag sa trabaho mula kay</string>
+  <string name="contact_grid_incoming_via_template">Papasok sa pamamagitan ng %s</string>
+  <string name="contact_grid_incoming_suspected_spam">Pinaghihinalaang spam na tumatawag</string>
+  <string name="contact_grid_callback_number">Numero ng teleponong ito: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-tr/strings.xml b/java/com/android/incallui/contactgrid/res/values-tr/strings.xml
index 98646be..b681969 100644
--- a/java/com/android/incallui/contactgrid/res/values-tr/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-tr/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_calling_via_template" msgid="3416867359475780924">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> üzerinden çağrı yapılıyor"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"Çağrı yapılıyor…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"Aktarılıyor…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"Bağlantı kurulamadı"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"Çağrı reddedildi"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"Çağrı zaman aşımına uğradı"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"Çağrı sonlandırılıyor"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"Çağrı sonlandırıldı"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"Beklemede"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Gelen çağrı:"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Gelen iş çağrısı:"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> adlı sağlayıcı üzerinden gelen çağrı"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"Spam olduğundan şüphelenilen arayan"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"Geri arama numarası: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">%s üzerinden çağrı yapılıyor</string>
+  <string name="incall_calling_on_same_carrier_template">Aynı operatör (%s) üzerinden aranıyor</string>
+  <string name="incall_calling_on_recent_choice_template">Son yapılan seçim (%s) üzerinden aranıyor</string>
+  <string name="incall_connecting">Çağrı yapılıyor…</string>
+  <string name="incall_connecting_assited_dialed">+%1$s (%2$s) kullanılarak telefon ediliyor…</string>
+  <string name="incall_connecting_assited_dialed_component">+%1$s (%2$s) kullanılıyor…</string>
+  <string name="incall_transferring">Aktarılıyor…</string>
+  <string name="incall_video_call_requesting">Operatör üzerinden görüntülü görüşme…</string>
+  <string name="incall_wifi_video_call_requesting">Operatör üzerinden kablosuz görüntülü görüşme…</string>
+  <string name="incall_video_call_upgrade_request">Operatör üzerinden görüntülü görüşmeye geçiliyor…</string>
+  <string name="incall_video_call_request_failed">Bağlantı kurulamadı</string>
+  <string name="incall_video_call_request_rejected">Çağrı reddedildi</string>
+  <string name="incall_video_call_request_timed_out">Çağrı zaman aşımına uğradı</string>
+  <string name="incall_hanging_up">Çağrı sonlandırılıyor</string>
+  <string name="incall_call_ended">Çağrı sonlandırıldı</string>
+  <string name="incall_remotely_held">Beklemede</string>
+  <string name="contact_grid_incoming_video_call">Operatör üzerinden görüntülü görüşme isteği:</string>
+  <string name="contact_grid_incoming_wifi_video_call">Operatör üzerinden kablosuz görüntülü görüşme isteği:</string>
+  <string name="contact_grid_incoming_voice_call">Gelen çağrı:</string>
+  <string name="contact_grid_incoming_work_call">Gelen iş çağrısı:</string>
+  <string name="contact_grid_incoming_via_template">%s adlı sağlayıcı üzerinden gelen çağrı</string>
+  <string name="contact_grid_incoming_suspected_spam">Spam olduğundan şüphelenilen arayan</string>
+  <string name="contact_grid_callback_number">Bu telefonun numarası: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-uk/strings.xml b/java/com/android/incallui/contactgrid/res/values-uk/strings.xml
index 9037901..e14ffd9 100644
--- a/java/com/android/incallui/contactgrid/res/values-uk/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-uk/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_calling_via_template" msgid="3416867359475780924">"Виклик здійснюється через оператора <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"Виклик…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"Пересилання…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"Не вдалося під’єднатися"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"Виклик відхилено"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"Час очікування виклику минув"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"Завершення виклику"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"Виклик завершено"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"Утримується"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Виклик від:"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Виклик на робочий телефон від:"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Вхідні виклики через оператора <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"Підозрілий абонент"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"Номер зворотного виклику: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">Виклик здійснюється через оператора %s</string>
+  <string name="incall_calling_on_same_carrier_template">Використовується той самий оператор, що й в абонента: %s</string>
+  <string name="incall_calling_on_recent_choice_template">Вибрано нещодавній варіант: %s</string>
+  <string name="incall_connecting">Виклик…</string>
+  <string name="incall_connecting_assited_dialed">Виклик за допомогою коду +%1$s (%2$s)…</string>
+  <string name="incall_connecting_assited_dialed_component">Використовується формат +%1$s (%2$s)…</string>
+  <string name="incall_transferring">Пересилання…</string>
+  <string name="incall_video_call_requesting">Відеодзвінок у мережі оператора…</string>
+  <string name="incall_wifi_video_call_requesting">Відеодзвінок у мережі Wi-Fi…</string>
+  <string name="incall_video_call_upgrade_request">Переведення відеодзвінка в мережу оператора…</string>
+  <string name="incall_video_call_request_failed">Не вдалося під’єднатися</string>
+  <string name="incall_video_call_request_rejected">Виклик відхилено</string>
+  <string name="incall_video_call_request_timed_out">Час очікування виклику минув</string>
+  <string name="incall_hanging_up">Завершення виклику</string>
+  <string name="incall_call_ended">Виклик завершено</string>
+  <string name="incall_remotely_held">Утримується</string>
+  <string name="contact_grid_incoming_video_call">Відеодзвінок у мережі оператора, телефонує</string>
+  <string name="contact_grid_incoming_wifi_video_call">Відеодзвінок у мережі Wi-Fi, телефонує</string>
+  <string name="contact_grid_incoming_voice_call">Виклик від:</string>
+  <string name="contact_grid_incoming_work_call">Виклик на робочий телефон від:</string>
+  <string name="contact_grid_incoming_via_template">Вхідні виклики через оператора %s</string>
+  <string name="contact_grid_incoming_suspected_spam">Підозрілий абонент</string>
+  <string name="contact_grid_callback_number">Номер цього телефону: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-ur/strings.xml b/java/com/android/incallui/contactgrid/res/values-ur/strings.xml
index 3021e23..eef895c 100644
--- a/java/com/android/incallui/contactgrid/res/values-ur/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-ur/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_calling_via_template" msgid="3416867359475780924">"کالنگ بذریعہ <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"کال کی جا رہی ہے…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"منتقل ہو رہی ہے…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"منسلک ہونے سے قاصر"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"کال مسترد ہوگئی"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"کال کا وقت ختم ہوگیا"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"کال منقطع ہو رہی ہے"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"کال ختم ہوگئی"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"ہولڈ پر ہے"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"کال منجانب"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"دفتری کال منجانب"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> کے ذریعے آنے والی کال"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"مشتبہ سپام کالر"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"کال بیک نمبر: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">کالنگ بذریعہ %s</string>
+  <string name="incall_calling_on_same_carrier_template">ایک ہی کیریئر %s کے ذریعے کال کی جا رہی ہے</string>
+  <string name="incall_calling_on_recent_choice_template">حالیہ انتخاب %s کے ذریعے کال کی جا رہی ہے</string>
+  <string name="incall_connecting">کال کی جا رہی ہے…</string>
+  <string name="incall_connecting_assited_dialed">‏‎‎+%1$s‎ (%2$s) کا استعمال کر کے کال کی جا رہی ہے…</string>
+  <string name="incall_connecting_assited_dialed_component">%1$s+ (%2$s) کے ذریعے…</string>
+  <string name="incall_transferring">منتقل ہو رہی ہے…</string>
+  <string name="incall_video_call_requesting">کیرئیر ویڈیو کالنگ…</string>
+  <string name="incall_wifi_video_call_requesting">‏Wi-Fi کیرئیر ویڈیو کالنگ…</string>
+  <string name="incall_video_call_upgrade_request">کیریئر ویڈیو پر سوئچ ہو رہا ہے…</string>
+  <string name="incall_video_call_request_failed">منسلک ہونے سے قاصر</string>
+  <string name="incall_video_call_request_rejected">کال مسترد ہوگئی</string>
+  <string name="incall_video_call_request_timed_out">کال کا وقت ختم ہوگیا</string>
+  <string name="incall_hanging_up">کال منقطع ہو رہی ہے</string>
+  <string name="incall_call_ended">کال ختم ہوگئی</string>
+  <string name="incall_remotely_held">ہولڈ پر ہے</string>
+  <string name="contact_grid_incoming_video_call">کیریئر ویڈیو کال منجانب</string>
+  <string name="contact_grid_incoming_wifi_video_call">‏Wi-Fi کیریئر ویڈیو کال منجانب</string>
+  <string name="contact_grid_incoming_voice_call">کال منجانب</string>
+  <string name="contact_grid_incoming_work_call">دفتری کال منجانب</string>
+  <string name="contact_grid_incoming_via_template">%s کے ذریعے آنے والی کال</string>
+  <string name="contact_grid_incoming_suspected_spam">مشتبہ سپام کالر</string>
+  <string name="contact_grid_callback_number">اس فون کا نمبر: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-uz/strings.xml b/java/com/android/incallui/contactgrid/res/values-uz/strings.xml
index df85c78..c50aa02 100644
--- a/java/com/android/incallui/contactgrid/res/values-uz/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-uz/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_calling_via_template" msgid="3416867359475780924">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> orqali qo‘ng‘rioq qilinmoqda"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"Chaqiruv…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"O‘tkazilmoqda…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"Bog‘lanib bo‘lmadi"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"Qo‘ng‘iroq rad etildi"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"Qo‘ng‘iroqning kutish vaqti tugadi"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"Chaqiruv tugatilmoqda"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"Chaqiruv tugatildi"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"Kutish rejimida"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Chaqiruv:"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Ish telefoniga kimdan qo‘ng‘iroq:"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Kiruvchi chaqiruv (operator: <xliff:g id="PROVIDER_NAME">%s</xliff:g>)"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"Shubhali abonent"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"Teskari qo‘ng‘iroq uchun raqam: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">%s orqali qo‘ng‘rioq qilinmoqda</string>
+  <string name="incall_calling_on_same_carrier_template">Shu aloqa operatori – %s orqali chaqiruv</string>
+  <string name="incall_calling_on_recent_choice_template">Yaqinda tanlangan aloqa operatori – %s orqali chaqiruv</string>
+  <string name="incall_connecting">Chaqiruv…</string>
+  <string name="incall_connecting_assited_dialed">+%1$s kodi orqali chaqirilmoqda (%2$s)…</string>
+  <string name="incall_connecting_assited_dialed_component">+%1$s (%2$s) kodi ishlatilmoqda…</string>
+  <string name="incall_transferring">O‘tkazilmoqda…</string>
+  <string name="incall_video_call_requesting">Video chaqiruv…</string>
+  <string name="incall_wifi_video_call_requesting">Wi-Fi orqali video chaqiruv…</string>
+  <string name="incall_video_call_upgrade_request">Video chaqiruvga o‘tkazilmoqda…</string>
+  <string name="incall_video_call_request_failed">Bog‘lanib bo‘lmadi</string>
+  <string name="incall_video_call_request_rejected">Qo‘ng‘iroq rad etildi</string>
+  <string name="incall_video_call_request_timed_out">Qo‘ng‘iroqning kutish vaqti tugadi</string>
+  <string name="incall_hanging_up">Chaqiruv tugatilmoqda</string>
+  <string name="incall_call_ended">Chaqiruv tugatildi</string>
+  <string name="incall_remotely_held">Kutish rejimida</string>
+  <string name="contact_grid_incoming_video_call">Video chaqiruv:</string>
+  <string name="contact_grid_incoming_wifi_video_call">Wi-Fi orqali video chaqiruv:</string>
+  <string name="contact_grid_incoming_voice_call">Chaqiruv:</string>
+  <string name="contact_grid_incoming_work_call">Ish telefoniga kimdan qo‘ng‘iroq:</string>
+  <string name="contact_grid_incoming_via_template">Kiruvchi chaqiruv (operator: %s)</string>
+  <string name="contact_grid_incoming_suspected_spam">Shubhali abonent</string>
+  <string name="contact_grid_callback_number">Bu telefonning raqami: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-vi/strings.xml b/java/com/android/incallui/contactgrid/res/values-vi/strings.xml
index abed7b0..ac6acd1 100644
--- a/java/com/android/incallui/contactgrid/res/values-vi/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-vi/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_calling_via_template" msgid="3416867359475780924">"Đang gọi điện qua <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"Đang gọi…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"Đang chuyển…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"Không thể kết nối"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"Cuộc gọi bị từ chối"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"Cuộc gọi đã hết giờ"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"Đang kết thúc cuộc gọi"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"Cuộc gọi đã kết thúc"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"Đang chờ"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Cuộc gọi từ"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Cuộc gọi về công việc từ"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Cuộc gọi đến qua <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"Người gọi điện spam đáng ngờ"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"Số điện thoại gọi lại: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">Đang gọi điện qua %s</string>
+  <string name="incall_calling_on_same_carrier_template">Đang gọi qua cùng một nhà mạng %s</string>
+  <string name="incall_calling_on_recent_choice_template">Đang gọi qua nhà mạng được chọn gần đây %s</string>
+  <string name="incall_connecting">Đang gọi…</string>
+  <string name="incall_connecting_assited_dialed">Đang gọi bằng +%1$s (%2$s)…</string>
+  <string name="incall_connecting_assited_dialed_component">Đang sử dụng +%1$s (%2$s)…</string>
+  <string name="incall_transferring">Đang chuyển…</string>
+  <string name="incall_video_call_requesting">Đang gọi điện video qua mạng dữ liệu di động…</string>
+  <string name="incall_wifi_video_call_requesting">Đang gọi điện video qua Wi-Fi…</string>
+  <string name="incall_video_call_upgrade_request">Đang chuyển sang cuộc gọi video qua mạng dữ liệu di động…</string>
+  <string name="incall_video_call_request_failed">Không thể kết nối</string>
+  <string name="incall_video_call_request_rejected">Cuộc gọi bị từ chối</string>
+  <string name="incall_video_call_request_timed_out">Cuộc gọi đã hết giờ</string>
+  <string name="incall_hanging_up">Đang kết thúc cuộc gọi</string>
+  <string name="incall_call_ended">Cuộc gọi đã kết thúc</string>
+  <string name="incall_remotely_held">Đang chờ</string>
+  <string name="contact_grid_incoming_video_call">Cuộc gọi video qua mạng dữ liệu di động từ</string>
+  <string name="contact_grid_incoming_wifi_video_call">Cuộc gọi video qua Wi-Fi từ</string>
+  <string name="contact_grid_incoming_voice_call">Cuộc gọi từ</string>
+  <string name="contact_grid_incoming_work_call">Cuộc gọi về công việc từ</string>
+  <string name="contact_grid_incoming_via_template">Cuộc gọi đến qua %s</string>
+  <string name="contact_grid_incoming_suspected_spam">Người gọi điện spam đáng ngờ</string>
+  <string name="contact_grid_callback_number">Số điện thoại này là: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-zh-rCN/strings.xml b/java/com/android/incallui/contactgrid/res/values-zh-rCN/strings.xml
index 6aaa94c..b71c833 100644
--- a/java/com/android/incallui/contactgrid/res/values-zh-rCN/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-zh-rCN/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_calling_via_template" msgid="3416867359475780924">"正在通过<xliff:g id="PROVIDER_NAME">%s</xliff:g>进行通话"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"正在呼叫…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"正在转接…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"无法连接"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"通话被拒绝"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"通话超时"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"正在挂断"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"通话结束"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"保持"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"通话来自："</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"工作通话来自："</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"有人通过 <xliff:g id="PROVIDER_NAME">%s</xliff:g> 来电"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"疑似骚扰电话号码："</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"回拨号码：<xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">正在通过%s进行通话</string>
+  <string name="incall_calling_on_same_carrier_template">正在通过相同的运营商%s拨号</string>
+  <string name="incall_calling_on_recent_choice_template">正在通过最近选择的运营商%s拨号</string>
+  <string name="incall_connecting">正在呼叫…</string>
+  <string name="incall_connecting_assited_dialed">正在使用 +%1$s (%2$s) 拨打电话…</string>
+  <string name="incall_connecting_assited_dialed_component">正在使用 +%1$s (%2$s)…</string>
+  <string name="incall_transferring">正在转接…</string>
+  <string name="incall_video_call_requesting">正在进行运营商视频通话…</string>
+  <string name="incall_wifi_video_call_requesting">正在进行 WLAN 运营商视频通话…</string>
+  <string name="incall_video_call_upgrade_request">正在切换到运营商视频通话…</string>
+  <string name="incall_video_call_request_failed">无法连接</string>
+  <string name="incall_video_call_request_rejected">通话被拒绝</string>
+  <string name="incall_video_call_request_timed_out">通话超时</string>
+  <string name="incall_hanging_up">正在挂断</string>
+  <string name="incall_call_ended">通话结束</string>
+  <string name="incall_remotely_held">保持</string>
+  <string name="contact_grid_incoming_video_call">运营商视频通话来电：</string>
+  <string name="contact_grid_incoming_wifi_video_call">WLAN 运营商视频通话来电：</string>
+  <string name="contact_grid_incoming_voice_call">通话来自：</string>
+  <string name="contact_grid_incoming_work_call">工作通话来自：</string>
+  <string name="contact_grid_incoming_via_template">有人通过 %s 来电</string>
+  <string name="contact_grid_incoming_suspected_spam">疑似骚扰电话号码：</string>
+  <string name="contact_grid_callback_number">此手机的号码：%1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-zh-rHK/strings.xml b/java/com/android/incallui/contactgrid/res/values-zh-rHK/strings.xml
index 82a920e..1d6f902 100644
--- a/java/com/android/incallui/contactgrid/res/values-zh-rHK/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-zh-rHK/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_calling_via_template" msgid="3416867359475780924">"正在透過 <xliff:g id="PROVIDER_NAME">%s</xliff:g> 撥號"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"撥號中…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"正在轉駁…"</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"無法連線"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"通話被拒"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"通話逾時"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"正在掛斷電話"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"通話已結束"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"保留"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"通話來自"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"工作通話來自"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"透過 <xliff:g id="PROVIDER_NAME">%s</xliff:g> 的來電"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"疑似垃圾來電者"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"回電號碼：<xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">正在透過 %s 撥號</string>
+  <string name="incall_calling_on_same_carrier_template">正在透過同一個流動網絡供應商「%s」撥打電話</string>
+  <string name="incall_calling_on_recent_choice_template">正在透過最近所選的「%s」撥打電話</string>
+  <string name="incall_connecting">撥號中…</string>
+  <string name="incall_connecting_assited_dialed">正在使用 +%1$s (%2$s) 撥打電話…</string>
+  <string name="incall_connecting_assited_dialed_component">正在使用 +%1$s (%2$s)…</string>
+  <string name="incall_transferring">正在轉駁…</string>
+  <string name="incall_video_call_requesting">正在進行流動網絡供應商視像通話…</string>
+  <string name="incall_wifi_video_call_requesting">正在進行 Wi-Fi 流動網絡供應商視像通話…</string>
+  <string name="incall_video_call_upgrade_request">正在切換至流動網絡供應商視像…</string>
+  <string name="incall_video_call_request_failed">無法連線</string>
+  <string name="incall_video_call_request_rejected">通話被拒</string>
+  <string name="incall_video_call_request_timed_out">通話逾時</string>
+  <string name="incall_hanging_up">正在掛斷電話</string>
+  <string name="incall_call_ended">通話已結束</string>
+  <string name="incall_remotely_held">保留</string>
+  <string name="contact_grid_incoming_video_call">流動網絡供應商視像通話撥入者</string>
+  <string name="contact_grid_incoming_wifi_video_call">Wi-Fi 流動網絡供應商視像通話撥入者</string>
+  <string name="contact_grid_incoming_voice_call">通話來自</string>
+  <string name="contact_grid_incoming_work_call">工作通話來自</string>
+  <string name="contact_grid_incoming_via_template">透過 %s 的來電</string>
+  <string name="contact_grid_incoming_suspected_spam">疑似垃圾來電者</string>
+  <string name="contact_grid_callback_number">這部手機的號碼：%1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-zh-rTW/strings.xml b/java/com/android/incallui/contactgrid/res/values-zh-rTW/strings.xml
index b1b32fa..d373749 100644
--- a/java/com/android/incallui/contactgrid/res/values-zh-rTW/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-zh-rTW/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_calling_via_template" msgid="3416867359475780924">"正在透過 <xliff:g id="PROVIDER_NAME">%s</xliff:g> 撥號"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"撥號中…"</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"轉接中..."</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"無法連線"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"通話遭到拒絕"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"通話要求逾時"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"掛斷中"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"通話已結束"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"保留中"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"語音來電："</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"公司來電："</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"有人透過 <xliff:g id="PROVIDER_NAME">%s</xliff:g> 來電"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"可疑的騷擾/廣告來電者"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"回撥號碼：<xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">正在透過 %s 撥號</string>
+  <string name="incall_calling_on_same_carrier_template">正在透過相同的電信業者 (%s) 撥號</string>
+  <string name="incall_calling_on_recent_choice_template">正在透過最近所選的電信業者 (%s) 撥號</string>
+  <string name="incall_connecting">撥號中…</string>
+  <string name="incall_connecting_assited_dialed">正在撥號至 +%1$s (%2$s)…</string>
+  <string name="incall_connecting_assited_dialed_component">正在使用 +%1$s (%2$s)…</string>
+  <string name="incall_transferring">轉接中...</string>
+  <string name="incall_video_call_requesting">電信業者視訊通話…</string>
+  <string name="incall_wifi_video_call_requesting">Wi-Fi 電信業者視訊通話…</string>
+  <string name="incall_video_call_upgrade_request">正在切換至電信業者視訊通話…</string>
+  <string name="incall_video_call_request_failed">無法連線</string>
+  <string name="incall_video_call_request_rejected">通話遭到拒絕</string>
+  <string name="incall_video_call_request_timed_out">通話要求逾時</string>
+  <string name="incall_hanging_up">掛斷中</string>
+  <string name="incall_call_ended">通話已結束</string>
+  <string name="incall_remotely_held">保留中</string>
+  <string name="contact_grid_incoming_video_call">電信業者視訊通話來電：</string>
+  <string name="contact_grid_incoming_wifi_video_call">Wi-Fi 電信業者視訊通話來電：</string>
+  <string name="contact_grid_incoming_voice_call">語音來電：</string>
+  <string name="contact_grid_incoming_work_call">公司來電：</string>
+  <string name="contact_grid_incoming_via_template">有人透過 %s 來電</string>
+  <string name="contact_grid_incoming_suspected_spam">可疑的騷擾/廣告來電者</string>
+  <string name="contact_grid_callback_number">這支手機的號碼：%1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values-zu/strings.xml b/java/com/android/incallui/contactgrid/res/values-zu/strings.xml
index d1aaba3..63412cf 100644
--- a/java/com/android/incallui/contactgrid/res/values-zu/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values-zu/strings.xml
@@ -1,44 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_calling_via_template" msgid="3416867359475780924">"Ishaya ucingo nge-<xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="incall_connecting" msgid="1708280493198276616">"Iyashaya..."</string>
-    <string name="incall_transferring" msgid="7909128243635579407">"Iyadlulisela..."</string>
-    <!-- no translation found for incall_video_call_requesting (1560243656749370926) -->
-    <skip />
-    <!-- no translation found for incall_wifi_video_call_requesting (4778821793266688848) -->
-    <skip />
-    <!-- no translation found for incall_video_call_upgrade_request (3225728109481465831) -->
-    <skip />
-    <string name="incall_video_call_request_failed" msgid="5014067473831870379">"Ayikwazanga ukuxhumeka"</string>
-    <string name="incall_video_call_request_rejected" msgid="5357441169519503234">"Ucingo lunqatshiwe"</string>
-    <string name="incall_video_call_request_timed_out" msgid="6804535684856203120">"Ucingo luphelelwe yisikhathi"</string>
-    <string name="incall_hanging_up" msgid="2166116351937190949">"Iyavala"</string>
-    <string name="incall_call_ended" msgid="6294704948774348480">"Ikholi iqediwe"</string>
-    <string name="incall_remotely_held" msgid="8561379039177396615">"Ibambile"</string>
-    <!-- no translation found for contact_grid_incoming_video_call (5848811480775138601) -->
-    <skip />
-    <!-- no translation found for contact_grid_incoming_wifi_video_call (7478797414642594106) -->
-    <skip />
-    <string name="contact_grid_incoming_voice_call" msgid="7165853925114955346">"Ikholi esuka ku-"</string>
-    <string name="contact_grid_incoming_work_call" msgid="837605505036615004">"Ikholi yomsebenzi kusukela ku-"</string>
-    <string name="contact_grid_incoming_via_template" msgid="7747391077955623969">"Ingena nge-<xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="contact_grid_incoming_suspected_spam" msgid="285365265897630425">"Ofonayo osolisayo wogaxekile"</string>
-    <string name="contact_grid_callback_number" msgid="1284649030313415807">"Inombolo yokuphinda ushayele: <xliff:g id="DARK_NUMBER">%1$s</xliff:g>"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_calling_via_template">Ishaya ucingo nge-%s</string>
+  <string name="incall_calling_on_same_carrier_template">Ishaya kunkampani yenethiwekhi efanayo ye-%s</string>
+  <string name="incall_calling_on_recent_choice_template">Ishaya ekukhethweni kwakamuva kwe-%s</string>
+  <string name="incall_connecting">Iyashaya...</string>
+  <string name="incall_connecting_assited_dialed">Ukushaya kusetshenziswa okuthi +%1$s (%2$s)…</string>
+  <string name="incall_connecting_assited_dialed_component">Isebenzisa okungu-+%1$s (%2$s)…</string>
+  <string name="incall_transferring">Iyadlulisela...</string>
+  <string name="incall_video_call_requesting">Ukushaya kwevidiyo kwenkampani yenethiwekhi...</string>
+  <string name="incall_wifi_video_call_requesting">Ukushaya kwevidiyo kwenkampani yenethiwekhi ye-Wi-Fi…</string>
+  <string name="incall_video_call_upgrade_request">Ishintshela kuvidiyo yenkampani yenethiwekhi…</string>
+  <string name="incall_video_call_request_failed">Ayikwazanga ukuxhumeka</string>
+  <string name="incall_video_call_request_rejected">Ucingo lunqatshiwe</string>
+  <string name="incall_video_call_request_timed_out">Ucingo luphelelwe yisikhathi</string>
+  <string name="incall_hanging_up">Iyavala</string>
+  <string name="incall_call_ended">Ikholi iqediwe</string>
+  <string name="incall_remotely_held">Ibambile</string>
+  <string name="contact_grid_incoming_video_call">Ikholi yevidiyo yenkampani yenethiwekhi kusukela</string>
+  <string name="contact_grid_incoming_wifi_video_call">Ukushaya kwevidiyo kwenkampani yenethiwekhi kwe-Wi-Fi kusukela</string>
+  <string name="contact_grid_incoming_voice_call">Ikholi esuka ku-</string>
+  <string name="contact_grid_incoming_work_call">Ikholi yomsebenzi kusukela ku-</string>
+  <string name="contact_grid_incoming_via_template">Ingena nge-%s</string>
+  <string name="contact_grid_incoming_suspected_spam">Ofonayo osolisayo wogaxekile</string>
+  <string name="contact_grid_callback_number">Le nombolo yefoni: %1$s</string>
 </resources>
diff --git a/java/com/android/incallui/contactgrid/res/values/strings.xml b/java/com/android/incallui/contactgrid/res/values/strings.xml
index c6bdb11..9ee10c3 100644
--- a/java/com/android/incallui/contactgrid/res/values/strings.xml
+++ b/java/com/android/incallui/contactgrid/res/values/strings.xml
@@ -20,6 +20,14 @@
      [CHAR LIMIT=40] -->
   <string name="incall_calling_via_template">Calling via <xliff:g id="provider_name">%s</xliff:g></string>
 
+  <!-- Title displayed in the overlay for outgoing calls when the provider is automatically chosen
+         because it is the same provider the callee is using. [CHAR LIMIT=60] -->
+  <string name="incall_calling_on_same_carrier_template">Calling on same carrier <xliff:g id="provider_name">%s</xliff:g></string>
+
+  <!-- Title displayed in the overlay for outgoing calls when the provider is automatically chosen
+         because the user has selected it multiple times.  [CHAR LIMIT=60] -->
+  <string name="incall_calling_on_recent_choice_template">Calling on recent choice <xliff:g id="provider_name">%s</xliff:g></string>
+
   <!-- Displayed above the contact name during an outgoing phone call. Indicates that the call is
        in the connecting stage. -->
   <string name="incall_connecting">Calling…</string>
@@ -27,6 +35,9 @@
   <!-- Display information related to assisted dialing, for example Calling using +1 (US)… -->
   <string name="incall_connecting_assited_dialed">Calling using +<xliff:g example="1" id="ad_country_code">%1$s</xliff:g> (<xliff:g example="1" id="ad_user_home_locale">%2$s</xliff:g>)\u2026</string>
 
+  <!-- String appended to the outgoing call title for additional information related to assisted dialing, for example "Calling via <CARRIER> • Using +1 (US)… "-->
+  <string name="incall_connecting_assited_dialed_component">Using +<xliff:g example="1" id="ad_country_code">%1$s</xliff:g> (<xliff:g example="1" id="ad_user_home_locale">%2$s</xliff:g>)\u2026</string>
+
   <!-- Displayed above the contact name when an external call is being pulled to the local
        device. -->
   <string name="incall_transferring">Transferring…</string>
@@ -78,7 +89,7 @@
   <string name="contact_grid_incoming_work_call">Work call from</string>
 
   <!-- Displayed in the answer call screen for incoming calls via a phone account. -->
-  <string name="contact_grid_incoming_via_template">Incoming via <xliff:g id="provider_name">%s</xliff:g></string>
+  <string name="contact_grid_incoming_via_template">Call via <xliff:g id="provider_name">%s</xliff:g> from</string>
 
   <!-- Displayed in the answer call screen for incoming spam calls. -->
   <string name="contact_grid_incoming_suspected_spam">Suspected spam caller</string>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-af/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-af/strings.xml
index 5f07dfc..24f8511 100644
--- a/java/com/android/incallui/disconnectdialog/res/values-af/strings.xml
+++ b/java/com/android/incallui/disconnectdialog/res/values-af/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"Aktiveer"</string>
-    <string name="video_call_not_available_title" msgid="987490011944013201">"Video-oproepe is nie nou beskikbaar nie"</string>
-    <string name="video_call_not_available_message" msgid="2284146863894603221">"Probeer weer later bel of gaan voort met die oproep as \'n stemoproep."</string>
-    <string name="voice_call" msgid="6748636104112578475">"Stemoproep"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_enable_wifi_calling_button">Aktiveer</string>
+  <string name="video_call_not_available_title">Video-oproepe is nie nou beskikbaar nie</string>
+  <string name="video_call_not_available_message">Probeer weer later bel of gaan voort met die oproep as \'n stemoproep.</string>
+  <string name="voice_call">Stemoproep</string>
 </resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-am/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-am/strings.xml
index 62a77e4..80942fc 100644
--- a/java/com/android/incallui/disconnectdialog/res/values-am/strings.xml
+++ b/java/com/android/incallui/disconnectdialog/res/values-am/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"አንቃ"</string>
-    <string name="video_call_not_available_title" msgid="987490011944013201">"የቪዲዮ ጥሪ ለጊዜው አይገኝም"</string>
-    <string name="video_call_not_available_message" msgid="2284146863894603221">"በኋላ እንደገና ለመደወል ይሞክሩ ወይም ጥሪውን እንደ የድምጽ ጥሪ ይቀጥሉ።"</string>
-    <string name="voice_call" msgid="6748636104112578475">"የድምጽ ጥሪ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_enable_wifi_calling_button">አንቃ</string>
+  <string name="video_call_not_available_title">የቪዲዮ ጥሪ ለጊዜው አይገኝም</string>
+  <string name="video_call_not_available_message">በኋላ እንደገና ለመደወል ይሞክሩ ወይም ጥሪውን እንደ የድምጽ ጥሪ ይቀጥሉ።</string>
+  <string name="voice_call">የድምጽ ጥሪ</string>
 </resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-ar/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-ar/strings.xml
index e29ee2f..ae2073c 100644
--- a/java/com/android/incallui/disconnectdialog/res/values-ar/strings.xml
+++ b/java/com/android/incallui/disconnectdialog/res/values-ar/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"تمكين"</string>
-    <string name="video_call_not_available_title" msgid="987490011944013201">"اتصال الفيديو غير متوفر حاليًا"</string>
-    <string name="video_call_not_available_message" msgid="2284146863894603221">"حاول الاتصال مرة أخرى لاحقًا أو أكمل المكالمة كمكالمة صوتية."</string>
-    <string name="voice_call" msgid="6748636104112578475">"مكالمة صوتية"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_enable_wifi_calling_button">تفعيل</string>
+  <string name="video_call_not_available_title">اتصال الفيديو غير متوفر حاليًا</string>
+  <string name="video_call_not_available_message">حاول الاتصال مرة أخرى لاحقًا أو أكمل المكالمة كمكالمة صوتية.</string>
+  <string name="voice_call">مكالمة صوتية</string>
 </resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-az/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-az/strings.xml
index 5a72e4c..5ec29ba 100644
--- a/java/com/android/incallui/disconnectdialog/res/values-az/strings.xml
+++ b/java/com/android/incallui/disconnectdialog/res/values-az/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"Aktiv edin"</string>
-    <string name="video_call_not_available_title" msgid="987490011944013201">"Video zəng hazırda əlçatan deyil"</string>
-    <string name="video_call_not_available_message" msgid="2284146863894603221">"Daha sonra yenidən cəhd edin və ya audio zənglə davam edin."</string>
-    <string name="voice_call" msgid="6748636104112578475">"Video zəng"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_enable_wifi_calling_button">Aktiv edin</string>
+  <string name="video_call_not_available_title">Video zəng hazırda əlçatan deyil</string>
+  <string name="video_call_not_available_message">Daha sonra yenidən cəhd edin və ya audio zənglə davam edin.</string>
+  <string name="voice_call">Səsli zəng</string>
 </resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-b+sr+Latn/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-b+sr+Latn/strings.xml
index e782e70..371b37d 100644
--- a/java/com/android/incallui/disconnectdialog/res/values-b+sr+Latn/strings.xml
+++ b/java/com/android/incallui/disconnectdialog/res/values-b+sr+Latn/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"Omogući"</string>
-    <string name="video_call_not_available_title" msgid="987490011944013201">"Video poziv trenutno nije dostupan"</string>
-    <string name="video_call_not_available_message" msgid="2284146863894603221">"Probajte ponovo da uputite poziv kasnije ili ga nastavite kao audio poziv."</string>
-    <string name="voice_call" msgid="6748636104112578475">"Audio poziv"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_enable_wifi_calling_button">Omogući</string>
+  <string name="video_call_not_available_title">Video poziv trenutno nije dostupan</string>
+  <string name="video_call_not_available_message">Probajte ponovo da uputite poziv kasnije ili ga nastavite kao audio poziv.</string>
+  <string name="voice_call">Uputi audio poziv</string>
 </resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-be/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-be/strings.xml
index d4cab26..f38643e 100644
--- a/java/com/android/incallui/disconnectdialog/res/values-be/strings.xml
+++ b/java/com/android/incallui/disconnectdialog/res/values-be/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"Уключыць"</string>
-    <string name="video_call_not_available_title" msgid="987490011944013201">"Відэавыклікі зараз недаступныя"</string>
-    <string name="video_call_not_available_message" msgid="2284146863894603221">"Паспрабуйце зрабіць выклік пазней або працягніце выклік як галасавы."</string>
-    <string name="voice_call" msgid="6748636104112578475">"Галасавы выклік"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_enable_wifi_calling_button">Уключыць</string>
+  <string name="video_call_not_available_title">Відэавыклікі зараз недаступныя</string>
+  <string name="video_call_not_available_message">Паспрабуйце зрабіць выклік пазней або працягніце выклік як галасавы.</string>
+  <string name="voice_call">Галасавы выклік</string>
 </resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-bg/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-bg/strings.xml
index e9211ab..43e0f1b 100644
--- a/java/com/android/incallui/disconnectdialog/res/values-bg/strings.xml
+++ b/java/com/android/incallui/disconnectdialog/res/values-bg/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"Активиране"</string>
-    <string name="video_call_not_available_title" msgid="987490011944013201">"В момента не е възможно видеообаждане"</string>
-    <string name="video_call_not_available_message" msgid="2284146863894603221">"Опитайте да се обадите отново по-късно или продължете обаждането като гласово."</string>
-    <string name="voice_call" msgid="6748636104112578475">"Гласово обаждане"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_enable_wifi_calling_button">Активиране</string>
+  <string name="video_call_not_available_title">В момента не е възможно видеообаждане</string>
+  <string name="video_call_not_available_message">Опитайте да се обадите отново по-късно или продължете обаждането като гласово.</string>
+  <string name="voice_call">Обаждане</string>
 </resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-bn/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-bn/strings.xml
index dd0297c..774aede 100644
--- a/java/com/android/incallui/disconnectdialog/res/values-bn/strings.xml
+++ b/java/com/android/incallui/disconnectdialog/res/values-bn/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"সক্ষম করুন"</string>
-    <string name="video_call_not_available_title" msgid="987490011944013201">"ভিডিও কলিং বর্তমানে উপলব্ধ নয়"</string>
-    <string name="video_call_not_available_message" msgid="2284146863894603221">"পরে আবার কল করার চেষ্টা করুন বা কলটিকে একটি ভয়েস কল হিসাবে চালিয়ে যান৷"</string>
-    <string name="voice_call" msgid="6748636104112578475">"ভয়েস কল"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_enable_wifi_calling_button">সক্ষম করুন</string>
+  <string name="video_call_not_available_title">ভিডিও কলিং বর্তমানে উপলব্ধ নয়</string>
+  <string name="video_call_not_available_message">পরে আবার কল করার চেষ্টা করুন বা কলটিকে একটি ভয়েস কল হিসাবে চালিয়ে যান৷</string>
+  <string name="voice_call">ভয়েস কল</string>
 </resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-bs/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-bs/strings.xml
index 309427a..5ede643 100644
--- a/java/com/android/incallui/disconnectdialog/res/values-bs/strings.xml
+++ b/java/com/android/incallui/disconnectdialog/res/values-bs/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"Omogući"</string>
-    <string name="video_call_not_available_title" msgid="987490011944013201">"Videopozivanje trenutno nije dostupno"</string>
-    <string name="video_call_not_available_message" msgid="2284146863894603221">"Pozovite ponovo kasnije ili nastavite poziv kao glasovni poziv."</string>
-    <string name="voice_call" msgid="6748636104112578475">"Glasovni poziv"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_enable_wifi_calling_button">Omogući</string>
+  <string name="video_call_not_available_title">Videopozivanje trenutno nije dostupno</string>
+  <string name="video_call_not_available_message">Pozovite ponovo kasnije ili nastavite poziv kao glasovni poziv.</string>
+  <string name="voice_call">Glasovni poziv</string>
 </resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-ca/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-ca/strings.xml
index dca9551..0b2a752 100644
--- a/java/com/android/incallui/disconnectdialog/res/values-ca/strings.xml
+++ b/java/com/android/incallui/disconnectdialog/res/values-ca/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"Activa"</string>
-    <string name="video_call_not_available_title" msgid="987490011944013201">"Les videotrucades no estan disponibles actualment"</string>
-    <string name="video_call_not_available_message" msgid="2284146863894603221">"Torna-ho a provar més tard o continua com a trucada de veu."</string>
-    <string name="voice_call" msgid="6748636104112578475">"Trucada de veu"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_enable_wifi_calling_button">Activa</string>
+  <string name="video_call_not_available_title">Les videotrucades no estan disponibles actualment</string>
+  <string name="video_call_not_available_message">Torna-ho a provar més tard o continua com a trucada de veu.</string>
+  <string name="voice_call">Fes una trucada de veu</string>
 </resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-cs/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-cs/strings.xml
index 502434a..b11644d 100644
--- a/java/com/android/incallui/disconnectdialog/res/values-cs/strings.xml
+++ b/java/com/android/incallui/disconnectdialog/res/values-cs/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"Zapnout"</string>
-    <string name="video_call_not_available_title" msgid="987490011944013201">"Videohovory momentálně nejsou dostupné"</string>
-    <string name="video_call_not_available_message" msgid="2284146863894603221">"Zkuste zavolat později nebo v hovoru pokračujte bez videa."</string>
-    <string name="voice_call" msgid="6748636104112578475">"Hlasový hovor"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_enable_wifi_calling_button">Zapnout</string>
+  <string name="video_call_not_available_title">Videohovory momentálně nejsou dostupné</string>
+  <string name="video_call_not_available_message">Zkuste zavolat později nebo v hovoru pokračujte bez videa.</string>
+  <string name="voice_call">Hovor</string>
 </resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-da/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-da/strings.xml
index 817226e..a0be818 100644
--- a/java/com/android/incallui/disconnectdialog/res/values-da/strings.xml
+++ b/java/com/android/incallui/disconnectdialog/res/values-da/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"Aktivér"</string>
-    <string name="video_call_not_available_title" msgid="987490011944013201">"Det er ikke muligt at foretage videoopkald i øjeblikket"</string>
-    <string name="video_call_not_available_message" msgid="2284146863894603221">"Prøv at ringe igen senere, eller fortsæt med et taleopkald."</string>
-    <string name="voice_call" msgid="6748636104112578475">"Taleopkald"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_enable_wifi_calling_button">Aktivér</string>
+  <string name="video_call_not_available_title">Det er ikke muligt at foretage videoopkald i øjeblikket</string>
+  <string name="video_call_not_available_message">Prøv at ringe igen senere, eller fortsæt med et taleopkald.</string>
+  <string name="voice_call">Foretag et taleopkald</string>
 </resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-de/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-de/strings.xml
index 8ebc527..00b00ed 100644
--- a/java/com/android/incallui/disconnectdialog/res/values-de/strings.xml
+++ b/java/com/android/incallui/disconnectdialog/res/values-de/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"Aktivieren"</string>
-    <string name="video_call_not_available_title" msgid="987490011944013201">"Videoanrufe sind momentan nicht verfügbar"</string>
-    <string name="video_call_not_available_message" msgid="2284146863894603221">"Versuche es später noch einmal oder setze den Anruf als Sprachanruf fort."</string>
-    <string name="voice_call" msgid="6748636104112578475">"Sprachanruf"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_enable_wifi_calling_button">Aktivieren</string>
+  <string name="video_call_not_available_title">Videoanrufe sind momentan nicht verfügbar</string>
+  <string name="video_call_not_available_message">Versuche es später noch einmal oder setze den Anruf als Sprachanruf fort.</string>
+  <string name="voice_call">Sprachanruf</string>
 </resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-el/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-el/strings.xml
index 1e182be..350ef77 100644
--- a/java/com/android/incallui/disconnectdialog/res/values-el/strings.xml
+++ b/java/com/android/incallui/disconnectdialog/res/values-el/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"Ενεργοποίηση"</string>
-    <string name="video_call_not_available_title" msgid="987490011944013201">"Η βιντεοκλήσεις δεν είναι προς το παρόν διαθέσιμες"</string>
-    <string name="video_call_not_available_message" msgid="2284146863894603221">"Δοκιμάστε να καλέσετε ξανά αργότερα ή συνεχίστε την κλήση ως φωνητική κλήση."</string>
-    <string name="voice_call" msgid="6748636104112578475">"Φωνητική κλήση"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_enable_wifi_calling_button">Ενεργοποίηση</string>
+  <string name="video_call_not_available_title">Η βιντεοκλήσεις δεν είναι προς το παρόν διαθέσιμες</string>
+  <string name="video_call_not_available_message">Δοκιμάστε να καλέσετε ξανά αργότερα ή συνεχίστε την κλήση ως φωνητική κλήση.</string>
+  <string name="voice_call">Φωνητική κλήση</string>
 </resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-en-rAU/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-en-rAU/strings.xml
index 4665e11..5171e9b 100644
--- a/java/com/android/incallui/disconnectdialog/res/values-en-rAU/strings.xml
+++ b/java/com/android/incallui/disconnectdialog/res/values-en-rAU/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"Enable"</string>
-    <string name="video_call_not_available_title" msgid="987490011944013201">"Video calling is currently not available"</string>
-    <string name="video_call_not_available_message" msgid="2284146863894603221">"Try calling again later or continue the call as a voice call."</string>
-    <string name="voice_call" msgid="6748636104112578475">"Voice call"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_enable_wifi_calling_button">Enable</string>
+  <string name="video_call_not_available_title">Video calling is currently not available</string>
+  <string name="video_call_not_available_message">Try calling again later or continue the call as a voice call.</string>
+  <string name="voice_call">Voice call</string>
 </resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-en-rGB/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-en-rGB/strings.xml
index 4665e11..5171e9b 100644
--- a/java/com/android/incallui/disconnectdialog/res/values-en-rGB/strings.xml
+++ b/java/com/android/incallui/disconnectdialog/res/values-en-rGB/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"Enable"</string>
-    <string name="video_call_not_available_title" msgid="987490011944013201">"Video calling is currently not available"</string>
-    <string name="video_call_not_available_message" msgid="2284146863894603221">"Try calling again later or continue the call as a voice call."</string>
-    <string name="voice_call" msgid="6748636104112578475">"Voice call"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_enable_wifi_calling_button">Enable</string>
+  <string name="video_call_not_available_title">Video calling is currently not available</string>
+  <string name="video_call_not_available_message">Try calling again later or continue the call as a voice call.</string>
+  <string name="voice_call">Voice call</string>
 </resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-en-rIN/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-en-rIN/strings.xml
index 4665e11..5171e9b 100644
--- a/java/com/android/incallui/disconnectdialog/res/values-en-rIN/strings.xml
+++ b/java/com/android/incallui/disconnectdialog/res/values-en-rIN/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"Enable"</string>
-    <string name="video_call_not_available_title" msgid="987490011944013201">"Video calling is currently not available"</string>
-    <string name="video_call_not_available_message" msgid="2284146863894603221">"Try calling again later or continue the call as a voice call."</string>
-    <string name="voice_call" msgid="6748636104112578475">"Voice call"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_enable_wifi_calling_button">Enable</string>
+  <string name="video_call_not_available_title">Video calling is currently not available</string>
+  <string name="video_call_not_available_message">Try calling again later or continue the call as a voice call.</string>
+  <string name="voice_call">Voice call</string>
 </resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-es-rUS/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-es-rUS/strings.xml
index 98afb12..773ab64 100644
--- a/java/com/android/incallui/disconnectdialog/res/values-es-rUS/strings.xml
+++ b/java/com/android/incallui/disconnectdialog/res/values-es-rUS/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"Habilitar"</string>
-    <string name="video_call_not_available_title" msgid="987490011944013201">"La videollamada no está disponible en este momento"</string>
-    <string name="video_call_not_available_message" msgid="2284146863894603221">"Prueba llamando de nuevo más tarde o continúa la llamada como una llamada de voz."</string>
-    <string name="voice_call" msgid="6748636104112578475">"Llamada de voz"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_enable_wifi_calling_button">Habilitar</string>
+  <string name="video_call_not_available_title">La videollamada no está disponible en este momento</string>
+  <string name="video_call_not_available_message">Prueba llamando de nuevo más tarde o continúa la llamada como una llamada de voz.</string>
+  <string name="voice_call">Llamada de voz</string>
 </resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-es/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-es/strings.xml
index 580ac8b..4e5a4a3 100644
--- a/java/com/android/incallui/disconnectdialog/res/values-es/strings.xml
+++ b/java/com/android/incallui/disconnectdialog/res/values-es/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"Habilitar"</string>
-    <string name="video_call_not_available_title" msgid="987490011944013201">"No se pueden hacer videollamadas en estos momentos"</string>
-    <string name="video_call_not_available_message" msgid="2284146863894603221">"Prueba a llamar de nuevo más tarde o haz una llamada de voz."</string>
-    <string name="voice_call" msgid="6748636104112578475">"Llamada de voz"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_enable_wifi_calling_button">Habilitar</string>
+  <string name="video_call_not_available_title">No se pueden hacer videollamadas en estos momentos</string>
+  <string name="video_call_not_available_message">Prueba a llamar de nuevo más tarde o haz una llamada de voz.</string>
+  <string name="voice_call">Llamada de voz</string>
 </resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-et/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-et/strings.xml
index dae212d..824a278 100644
--- a/java/com/android/incallui/disconnectdialog/res/values-et/strings.xml
+++ b/java/com/android/incallui/disconnectdialog/res/values-et/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"Luba"</string>
-    <string name="video_call_not_available_title" msgid="987490011944013201">"Vidokõned pole praegu saadaval"</string>
-    <string name="video_call_not_available_message" msgid="2284146863894603221">"Proovige hiljem uuesti helistada või jätkake helistamist häälkõnena."</string>
-    <string name="voice_call" msgid="6748636104112578475">"Häälkõne"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_enable_wifi_calling_button">Luba</string>
+  <string name="video_call_not_available_title">Vidokõned pole praegu saadaval</string>
+  <string name="video_call_not_available_message">Proovige hiljem uuesti helistada või jätkake helistamist häälkõnena.</string>
+  <string name="voice_call">Häälkõne</string>
 </resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-eu/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-eu/strings.xml
index c207d39..7e78b8e 100644
--- a/java/com/android/incallui/disconnectdialog/res/values-eu/strings.xml
+++ b/java/com/android/incallui/disconnectdialog/res/values-eu/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"Gaitu"</string>
-    <string name="video_call_not_available_title" msgid="987490011944013201">"Une honetan, bideo-deiak ez daude erabilgarri"</string>
-    <string name="video_call_not_available_message" msgid="2284146863894603221">"Saiatu geroago berriro deitzen, edo aldatu ahots-deira."</string>
-    <string name="voice_call" msgid="6748636104112578475">"Ahots-deia"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_enable_wifi_calling_button">Gaitu</string>
+  <string name="video_call_not_available_title">Une honetan, bideo-deiak ez daude erabilgarri</string>
+  <string name="video_call_not_available_message">Saiatu geroago berriro deitzen, edo aldatu ahots-deira.</string>
+  <string name="voice_call">Ahots-deia</string>
 </resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-fa/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-fa/strings.xml
index 73c2a86..cd0dbbb 100644
--- a/java/com/android/incallui/disconnectdialog/res/values-fa/strings.xml
+++ b/java/com/android/incallui/disconnectdialog/res/values-fa/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"فعال کردن"</string>
-    <string name="video_call_not_available_title" msgid="987490011944013201">"تماس ویدیویی درحال حاضر امکان‌پذیر نیست"</string>
-    <string name="video_call_not_available_message" msgid="2284146863894603221">"بعداً دوباره تماس بگیرید یا با تماس صوتی ادامه دهید."</string>
-    <string name="voice_call" msgid="6748636104112578475">"تماس صوتی"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_enable_wifi_calling_button">فعال کردن</string>
+  <string name="video_call_not_available_title">تماس ویدیویی درحال حاضر امکان‌پذیر نیست</string>
+  <string name="video_call_not_available_message">بعداً دوباره تماس بگیرید یا با تماس صوتی ادامه دهید.</string>
+  <string name="voice_call">تماس صوتی</string>
 </resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-fi/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-fi/strings.xml
index 93d4cc7..d81bf23 100644
--- a/java/com/android/incallui/disconnectdialog/res/values-fi/strings.xml
+++ b/java/com/android/incallui/disconnectdialog/res/values-fi/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"Ota käyttöön"</string>
-    <string name="video_call_not_available_title" msgid="987490011944013201">"Videopuhelut ei ole tällä hetkellä saatavilla"</string>
-    <string name="video_call_not_available_message" msgid="2284146863894603221">"Yritä soittaa myöhemmin uudelleen tai jatka puhelua äänipuheluna."</string>
-    <string name="voice_call" msgid="6748636104112578475">"Puhelu"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_enable_wifi_calling_button">Ota käyttöön</string>
+  <string name="video_call_not_available_title">Videopuhelut ei ole tällä hetkellä saatavilla</string>
+  <string name="video_call_not_available_message">Yritä soittaa myöhemmin uudelleen tai jatka puhelua äänipuheluna.</string>
+  <string name="voice_call">Puhelu</string>
 </resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-fr-rCA/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-fr-rCA/strings.xml
index e2bd4b1..9af64f8 100644
--- a/java/com/android/incallui/disconnectdialog/res/values-fr-rCA/strings.xml
+++ b/java/com/android/incallui/disconnectdialog/res/values-fr-rCA/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"Activer"</string>
-    <string name="video_call_not_available_title" msgid="987490011944013201">"Les appels vidéo ne sont pas disponibles pour le moment"</string>
-    <string name="video_call_not_available_message" msgid="2284146863894603221">"Essayez de rappeler plus tard ou passez à un appel vocal."</string>
-    <string name="voice_call" msgid="6748636104112578475">"Appel vocal"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_enable_wifi_calling_button">Activer</string>
+  <string name="video_call_not_available_title">Les appels vidéo ne sont pas disponibles pour le moment</string>
+  <string name="video_call_not_available_message">Essayez de rappeler plus tard ou passez à un appel vocal.</string>
+  <string name="voice_call">Faire un appel vocal</string>
 </resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-fr/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-fr/strings.xml
index f9dfdfa..4a152fb 100644
--- a/java/com/android/incallui/disconnectdialog/res/values-fr/strings.xml
+++ b/java/com/android/incallui/disconnectdialog/res/values-fr/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"Activer"</string>
-    <string name="video_call_not_available_title" msgid="987490011944013201">"La fonction d\'appel vidéo est momentanément indisponible"</string>
-    <string name="video_call_not_available_message" msgid="2284146863894603221">"Réessayez plus tard ou reprenez l\'appel en mode vocal."</string>
-    <string name="voice_call" msgid="6748636104112578475">"Appel vocal"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_enable_wifi_calling_button">Activer</string>
+  <string name="video_call_not_available_title">La fonction d\'appel vidéo est momentanément indisponible</string>
+  <string name="video_call_not_available_message">Réessayez plus tard ou reprenez l\'appel en mode vocal.</string>
+  <string name="voice_call">Appel vocal</string>
 </resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-gl/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-gl/strings.xml
index 3313c44..9e29925 100644
--- a/java/com/android/incallui/disconnectdialog/res/values-gl/strings.xml
+++ b/java/com/android/incallui/disconnectdialog/res/values-gl/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"Activar"</string>
-    <string name="video_call_not_available_title" msgid="987490011944013201">"As videochamadas non están dispoñibles actualmente"</string>
-    <string name="video_call_not_available_message" msgid="2284146863894603221">"Proba a chamar de novo máis tarde ou continuar a chamada como unha chamada de voz."</string>
-    <string name="voice_call" msgid="6748636104112578475">"Chamada de voz"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_enable_wifi_calling_button">Activar</string>
+  <string name="video_call_not_available_title">As videochamadas non están dispoñibles actualmente</string>
+  <string name="video_call_not_available_message">Proba a chamar de novo máis tarde ou continuar a chamada como unha chamada de voz.</string>
+  <string name="voice_call">Chamada de voz</string>
 </resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-gu/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-gu/strings.xml
index 28825da..a2a4a28 100644
--- a/java/com/android/incallui/disconnectdialog/res/values-gu/strings.xml
+++ b/java/com/android/incallui/disconnectdialog/res/values-gu/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"સક્ષમ કરો"</string>
-    <string name="video_call_not_available_title" msgid="987490011944013201">"વિડિઓ કૉલિંગ હાલમાં ઉપલબ્ધ નથી"</string>
-    <string name="video_call_not_available_message" msgid="2284146863894603221">"પછીથી ફરી કૉલ કરવાનો પ્રયાસ કરો અથવા કૉલને વૉઇસ કૉલ તરીકે ચાલુ રાખો."</string>
-    <string name="voice_call" msgid="6748636104112578475">"વૉઇસ કૉલ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_enable_wifi_calling_button">સક્ષમ કરો</string>
+  <string name="video_call_not_available_title">વિડિઓ કૉલિંગ હાલમાં ઉપલબ્ધ નથી</string>
+  <string name="video_call_not_available_message">પછીથી ફરી કૉલ કરવાનો પ્રયાસ કરો અથવા કૉલને વૉઇસ કૉલ તરીકે ચાલુ રાખો.</string>
+  <string name="voice_call">વૉઇસ કૉલ કરો</string>
 </resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-hi/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-hi/strings.xml
index 8201539..1e5a133 100644
--- a/java/com/android/incallui/disconnectdialog/res/values-hi/strings.xml
+++ b/java/com/android/incallui/disconnectdialog/res/values-hi/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"सक्षम करें"</string>
-    <string name="video_call_not_available_title" msgid="987490011944013201">"इस समय वीडियो कॉलिंग की सुविधा उपलब्ध नहीं है"</string>
-    <string name="video_call_not_available_message" msgid="2284146863894603221">"बाद में दोबारा कॉल करने की कोशिश करें या कॉल को वॉइस कॉल के रूप में जारी रखें."</string>
-    <string name="voice_call" msgid="6748636104112578475">"वॉइस कॉल"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_enable_wifi_calling_button">सक्षम करें</string>
+  <string name="video_call_not_available_title">इस समय वीडियो कॉलिंग की सुविधा उपलब्ध नहीं है</string>
+  <string name="video_call_not_available_message">बाद में दोबारा कॉल करने की कोशिश करें या कॉल को वॉइस कॉल के रूप में जारी रखें.</string>
+  <string name="voice_call">वॉइस कॉल करें</string>
 </resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-hr/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-hr/strings.xml
index c1b56b7..0cf4fc2 100644
--- a/java/com/android/incallui/disconnectdialog/res/values-hr/strings.xml
+++ b/java/com/android/incallui/disconnectdialog/res/values-hr/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"Omogući"</string>
-    <string name="video_call_not_available_title" msgid="987490011944013201">"Videopozivanje trenutačno nije dostupno"</string>
-    <string name="video_call_not_available_message" msgid="2284146863894603221">"Pokušajte ponovno nazvati kasnije ili nastavite poziv kao glasovni."</string>
-    <string name="voice_call" msgid="6748636104112578475">"Glasovni poziv"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_enable_wifi_calling_button">Omogući</string>
+  <string name="video_call_not_available_title">Videopozivanje trenutačno nije dostupno</string>
+  <string name="video_call_not_available_message">Pokušajte ponovno nazvati kasnije ili nastavite poziv kao glasovni.</string>
+  <string name="voice_call">Glasovni poziv</string>
 </resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-hu/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-hu/strings.xml
index e1f9bd9..c83d18c 100644
--- a/java/com/android/incallui/disconnectdialog/res/values-hu/strings.xml
+++ b/java/com/android/incallui/disconnectdialog/res/values-hu/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"Engedélyezés"</string>
-    <string name="video_call_not_available_title" msgid="987490011944013201">"A videohívás jelenleg nem érhető el"</string>
-    <string name="video_call_not_available_message" msgid="2284146863894603221">"Indítson hívást később, vagy folytassa hanghívásként."</string>
-    <string name="voice_call" msgid="6748636104112578475">"Hanghívás"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_enable_wifi_calling_button">Engedélyezés</string>
+  <string name="video_call_not_available_title">A videohívás jelenleg nem érhető el</string>
+  <string name="video_call_not_available_message">Indítson hívást később, vagy folytassa hanghívásként.</string>
+  <string name="voice_call">Hanghívás</string>
 </resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-hy/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-hy/strings.xml
index d2c10be..b6730ee 100644
--- a/java/com/android/incallui/disconnectdialog/res/values-hy/strings.xml
+++ b/java/com/android/incallui/disconnectdialog/res/values-hy/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"Միացնել"</string>
-    <string name="video_call_not_available_title" msgid="987490011944013201">"Տեսազանգը ներկայումս հասանելի չէ"</string>
-    <string name="video_call_not_available_message" msgid="2284146863894603221">"Ավելի ուշ նորից փորձեք զանգել կամ շարունակեք զանգն առանց տեսապատկերի:"</string>
-    <string name="voice_call" msgid="6748636104112578475">"Զանգ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_enable_wifi_calling_button">Միացնել</string>
+  <string name="video_call_not_available_title">Տեսազանգը ներկայումս հասանելի չէ</string>
+  <string name="video_call_not_available_message">Ավելի ուշ նորից փորձեք զանգել կամ շարունակեք զանգն առանց տեսապատկերի:</string>
+  <string name="voice_call">Զանգ</string>
 </resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-in/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-in/strings.xml
index 8b895bc..b09daef 100644
--- a/java/com/android/incallui/disconnectdialog/res/values-in/strings.xml
+++ b/java/com/android/incallui/disconnectdialog/res/values-in/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"Aktifkan"</string>
-    <string name="video_call_not_available_title" msgid="987490011944013201">"Video call saat ini tidak tersedia"</string>
-    <string name="video_call_not_available_message" msgid="2284146863894603221">"Coba lagi nanti atau lanjutkan sebagai panggilan suara."</string>
-    <string name="voice_call" msgid="6748636104112578475">"Panggilan suara"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_enable_wifi_calling_button">Aktifkan</string>
+  <string name="video_call_not_available_title">Video call saat ini tidak tersedia</string>
+  <string name="video_call_not_available_message">Coba lagi nanti atau lanjutkan sebagai panggilan suara.</string>
+  <string name="voice_call">Panggilan suara</string>
 </resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-is/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-is/strings.xml
index b16b431..1c8ea22 100644
--- a/java/com/android/incallui/disconnectdialog/res/values-is/strings.xml
+++ b/java/com/android/incallui/disconnectdialog/res/values-is/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"Kveikja"</string>
-    <string name="video_call_not_available_title" msgid="987490011944013201">"Myndsímtal er ekki í boði sem stendur"</string>
-    <string name="video_call_not_available_message" msgid="2284146863894603221">"Prófaðu að hringja aftur seinna eða hringdu hefðbundið símtal í staðinn"</string>
-    <string name="voice_call" msgid="6748636104112578475">"Símtal"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_enable_wifi_calling_button">Kveikja</string>
+  <string name="video_call_not_available_title">Myndsímtal er ekki í boði sem stendur</string>
+  <string name="video_call_not_available_message">Prófaðu að hringja aftur seinna eða hringdu hefðbundið símtal í staðinn</string>
+  <string name="voice_call">Símtal</string>
 </resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-it/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-it/strings.xml
index 1b862f7..be3d21f 100644
--- a/java/com/android/incallui/disconnectdialog/res/values-it/strings.xml
+++ b/java/com/android/incallui/disconnectdialog/res/values-it/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"Abilita"</string>
-    <string name="video_call_not_available_title" msgid="987490011944013201">"Le videochiamate non sono disponibili in questo momento"</string>
-    <string name="video_call_not_available_message" msgid="2284146863894603221">"Prova a chiamare di nuovo più tardi o continua la chiamata come chiamata vocale."</string>
-    <string name="voice_call" msgid="6748636104112578475">"Chiamata vocale"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_enable_wifi_calling_button">Abilita</string>
+  <string name="video_call_not_available_title">Le videochiamate non sono disponibili in questo momento</string>
+  <string name="video_call_not_available_message">Prova a chiamare di nuovo più tardi o continua la chiamata come chiamata vocale.</string>
+  <string name="voice_call">Chiama</string>
 </resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-iw/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-iw/strings.xml
index 91af8a9..f5da1f7 100644
--- a/java/com/android/incallui/disconnectdialog/res/values-iw/strings.xml
+++ b/java/com/android/incallui/disconnectdialog/res/values-iw/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"הפעלה"</string>
-    <string name="video_call_not_available_title" msgid="987490011944013201">"לא ניתן לשוחח בשיחת וידאו כרגע"</string>
-    <string name="video_call_not_available_message" msgid="2284146863894603221">"מומלץ לנסות להתקשר מאוחר יותר או להמשיך לשוחח בשיחה קולית."</string>
-    <string name="voice_call" msgid="6748636104112578475">"שיחה קולית"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_enable_wifi_calling_button">הפעלה</string>
+  <string name="video_call_not_available_title">לא ניתן לשוחח בשיחת וידאו כרגע</string>
+  <string name="video_call_not_available_message">מומלץ לנסות להתקשר מאוחר יותר או להמשיך לשוחח בשיחה קולית.</string>
+  <string name="voice_call">שיחה קולית</string>
 </resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-ja/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-ja/strings.xml
index 8e196f2..4afdab9 100644
--- a/java/com/android/incallui/disconnectdialog/res/values-ja/strings.xml
+++ b/java/com/android/incallui/disconnectdialog/res/values-ja/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"有効にする"</string>
-    <string name="video_call_not_available_title" msgid="987490011944013201">"ビデオハングアウトは現在利用できません"</string>
-    <string name="video_call_not_available_message" msgid="2284146863894603221">"しばらくしてからもう一度試すか、音声通話で続けてください。"</string>
-    <string name="voice_call" msgid="6748636104112578475">"音声通話"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_enable_wifi_calling_button">有効にする</string>
+  <string name="video_call_not_available_title">ビデオハングアウトは現在利用できません</string>
+  <string name="video_call_not_available_message">しばらくしてからもう一度試すか、音声通話で続けてください。</string>
+  <string name="voice_call">音声通話</string>
 </resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-ka/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-ka/strings.xml
index 8045979..1c545a9 100644
--- a/java/com/android/incallui/disconnectdialog/res/values-ka/strings.xml
+++ b/java/com/android/incallui/disconnectdialog/res/values-ka/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"ჩართვა"</string>
-    <string name="video_call_not_available_title" msgid="987490011944013201">"ვიდეოზარი ამჟამად მიუწვდომელია"</string>
-    <string name="video_call_not_available_message" msgid="2284146863894603221">"სცადეთ, დარეკოთ მოგვიანებით ან გააგრძელოთ ხმოვანი ზარით."</string>
-    <string name="voice_call" msgid="6748636104112578475">"ხმოვანი ზარი"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_enable_wifi_calling_button">ჩართვა</string>
+  <string name="video_call_not_available_title">ვიდეოზარი ამჟამად მიუწვდომელია</string>
+  <string name="video_call_not_available_message">სცადეთ, დარეკოთ მოგვიანებით ან გააგრძელოთ ხმოვანი ზარით.</string>
+  <string name="voice_call">ხმოვანი ზარი</string>
 </resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-kk/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-kk/strings.xml
index 47294f9..8d3bb93 100644
--- a/java/com/android/incallui/disconnectdialog/res/values-kk/strings.xml
+++ b/java/com/android/incallui/disconnectdialog/res/values-kk/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"Қосу"</string>
-    <string name="video_call_not_available_title" msgid="987490011944013201">"Бейне қоңырау қазір қолжетімді емес"</string>
-    <string name="video_call_not_available_message" msgid="2284146863894603221">"Кейінірек қайталап көріңіз немесе дасуыстық қоңырау ретінде жалғастырыңыз."</string>
-    <string name="voice_call" msgid="6748636104112578475">"Дауыстық қоңырау"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_enable_wifi_calling_button">Қосу</string>
+  <string name="video_call_not_available_title">Бейне қоңырау қазір қолжетімді емес</string>
+  <string name="video_call_not_available_message">Кейінірек қайталап көріңіз немесе дасуыстық қоңырау ретінде жалғастырыңыз.</string>
+  <string name="voice_call">Дауыстық қоңырау</string>
 </resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-km/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-km/strings.xml
index 6e1c0fe..886c476 100644
--- a/java/com/android/incallui/disconnectdialog/res/values-km/strings.xml
+++ b/java/com/android/incallui/disconnectdialog/res/values-km/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"បើក"</string>
-    <string name="video_call_not_available_title" msgid="987490011944013201">"ការហៅ​វីដេអូ​មិន​អាច​ធ្វើ​បាន​ទេ​នៅពេល​នេះ"</string>
-    <string name="video_call_not_available_message" msgid="2284146863894603221">"សាកល្បងហៅ​ម្ដងទៀត​នៅពេលក្រោយ ឬ​បន្ត​ការហៅ​ជា​សំឡេង។"</string>
-    <string name="voice_call" msgid="6748636104112578475">"ការ​ហៅ​ជា​សំឡេង"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_enable_wifi_calling_button">បើក</string>
+  <string name="video_call_not_available_title">ការហៅ​វីដេអូ​មិន​អាច​ធ្វើ​បាន​ទេ​នៅពេល​នេះ</string>
+  <string name="video_call_not_available_message">សាកល្បងហៅ​ម្ដងទៀត​នៅពេលក្រោយ ឬ​បន្ត​ការហៅ​ជា​សំឡេង។</string>
+  <string name="voice_call">ការហៅ​ជា​សំឡេង</string>
 </resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-kn/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-kn/strings.xml
index 384e92b..fc61f03 100644
--- a/java/com/android/incallui/disconnectdialog/res/values-kn/strings.xml
+++ b/java/com/android/incallui/disconnectdialog/res/values-kn/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"ಸಕ್ರಿಯಗೊಳಿಸಿ"</string>
-    <string name="video_call_not_available_title" msgid="987490011944013201">"ವೀಡಿಯೊ ಕರೆ ಪ್ರಸ್ತುತವಾಗಿ ಲಭ್ಯವಿಲ್ಲ"</string>
-    <string name="video_call_not_available_message" msgid="2284146863894603221">"ನಂತರ ಮತ್ತೆ ಕರೆ ಮಾಡಲು ಪ್ರಯತ್ನಿಸಿ ಅಥವಾ ಧ್ವನಿ ಕರೆಯಂತೆ ಕರೆಯನ್ನು ಮುಂದುವರಿಸಿ."</string>
-    <string name="voice_call" msgid="6748636104112578475">"ಧ್ವನಿ ಕರೆ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_enable_wifi_calling_button">ಸಕ್ರಿಯಗೊಳಿಸಿ</string>
+  <string name="video_call_not_available_title">ವೀಡಿಯೊ ಕರೆ ಪ್ರಸ್ತುತವಾಗಿ ಲಭ್ಯವಿಲ್ಲ</string>
+  <string name="video_call_not_available_message">ನಂತರ ಮತ್ತೆ ಕರೆ ಮಾಡಲು ಪ್ರಯತ್ನಿಸಿ ಅಥವಾ ಧ್ವನಿ ಕರೆಯಂತೆ ಕರೆಯನ್ನು ಮುಂದುವರಿಸಿ.</string>
+  <string name="voice_call">ಧ್ವನಿ ಕರೆ</string>
 </resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-ko/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-ko/strings.xml
index 30e1565..5be2606 100644
--- a/java/com/android/incallui/disconnectdialog/res/values-ko/strings.xml
+++ b/java/com/android/incallui/disconnectdialog/res/values-ko/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"사용"</string>
-    <string name="video_call_not_available_title" msgid="987490011944013201">"현재 화상 통화를 사용할 수 없음"</string>
-    <string name="video_call_not_available_message" msgid="2284146863894603221">"나중에 다시 전화하거나, 계속하려면 음성 통화를 이용하세요."</string>
-    <string name="voice_call" msgid="6748636104112578475">"음성 통화"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_enable_wifi_calling_button">사용</string>
+  <string name="video_call_not_available_title">현재 화상 통화를 사용할 수 없음</string>
+  <string name="video_call_not_available_message">나중에 다시 전화하거나, 계속하려면 음성 통화를 이용하세요.</string>
+  <string name="voice_call">음성 통화</string>
 </resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-ky/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-ky/strings.xml
index 1553169..fb8c81f 100644
--- a/java/com/android/incallui/disconnectdialog/res/values-ky/strings.xml
+++ b/java/com/android/incallui/disconnectdialog/res/values-ky/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"Иштетүү"</string>
-    <string name="video_call_not_available_title" msgid="987490011944013201">"Видео режиминде чалуу учурда жеткиликсиз"</string>
-    <string name="video_call_not_available_message" msgid="2284146863894603221">"Кийинчерээк кайра чалыңыз же үн режиминде чалып көрүңүз."</string>
-    <string name="voice_call" msgid="6748636104112578475">"Үн чалуусу"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_enable_wifi_calling_button">Иштетүү</string>
+  <string name="video_call_not_available_title">Видео режиминде чалуу учурда жеткиликсиз</string>
+  <string name="video_call_not_available_message">Кийинчерээк кайра чалыңыз же үн режиминде чалып көрүңүз.</string>
+  <string name="voice_call">Үн чалуусу</string>
 </resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-lo/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-lo/strings.xml
index c3f8b96..e50ff9b 100644
--- a/java/com/android/incallui/disconnectdialog/res/values-lo/strings.xml
+++ b/java/com/android/incallui/disconnectdialog/res/values-lo/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"ເປິດນຳໃຊ້"</string>
-    <string name="video_call_not_available_title" msgid="987490011944013201">"ຕອນນີ້ບໍ່ສາມາດໃຊ້ການໂທວິດີໂອໄດ້"</string>
-    <string name="video_call_not_available_message" msgid="2284146863894603221">"ກະລຸນາລອງໂທໃໝ່ໃນພາຍຫຼັງ ຫຼື ສືບຕໍ່ສາຍເປັນການໂທແບບສຽງ."</string>
-    <string name="voice_call" msgid="6748636104112578475">"ການໂທດ້ວຍສຽງ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_enable_wifi_calling_button">ເປິດນຳໃຊ້</string>
+  <string name="video_call_not_available_title">ຕອນນີ້ບໍ່ສາມາດໃຊ້ການໂທວິດີໂອໄດ້</string>
+  <string name="video_call_not_available_message">ກະລຸນາລອງໂທໃໝ່ໃນພາຍຫຼັງ ຫຼື ສືບຕໍ່ສາຍເປັນການໂທແບບສຽງ.</string>
+  <string name="voice_call">ການໂທດ້ວຍສຽງ</string>
 </resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-lt/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-lt/strings.xml
index 38d6ef8..5c5077a 100644
--- a/java/com/android/incallui/disconnectdialog/res/values-lt/strings.xml
+++ b/java/com/android/incallui/disconnectdialog/res/values-lt/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"Įgalinti"</string>
-    <string name="video_call_not_available_title" msgid="987490011944013201">"Vaizdo skambučių funkcija šiuo metu nepasiekiama"</string>
-    <string name="video_call_not_available_message" msgid="2284146863894603221">"Vėliau pabandykite skambinti dar kartą arba tęskite skambutį kaip balso skambutį."</string>
-    <string name="voice_call" msgid="6748636104112578475">"Balso skambutis"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_enable_wifi_calling_button">Įgalinti</string>
+  <string name="video_call_not_available_title">Vaizdo skambučių funkcija šiuo metu nepasiekiama</string>
+  <string name="video_call_not_available_message">Vėliau pabandykite skambinti dar kartą arba tęskite skambutį kaip balso skambutį.</string>
+  <string name="voice_call">Balso skambutis</string>
 </resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-lv/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-lv/strings.xml
index 279f0f5..95360bf 100644
--- a/java/com/android/incallui/disconnectdialog/res/values-lv/strings.xml
+++ b/java/com/android/incallui/disconnectdialog/res/values-lv/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"Iespējot"</string>
-    <string name="video_call_not_available_title" msgid="987490011944013201">"Videozvani pašlaik nav pieejami"</string>
-    <string name="video_call_not_available_message" msgid="2284146863894603221">"Vēlāk mēģiniet zvanīt vēlreiz vai turpiniet sarunu kā balss zvanu."</string>
-    <string name="voice_call" msgid="6748636104112578475">"Balss zvans"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_enable_wifi_calling_button">Iespējot</string>
+  <string name="video_call_not_available_title">Videozvani pašlaik nav pieejami</string>
+  <string name="video_call_not_available_message">Vēlāk mēģiniet zvanīt vēlreiz vai turpiniet sarunu kā balss zvanu.</string>
+  <string name="voice_call">Balss zvans</string>
 </resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-mk/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-mk/strings.xml
index 3c061df..1c85980 100644
--- a/java/com/android/incallui/disconnectdialog/res/values-mk/strings.xml
+++ b/java/com/android/incallui/disconnectdialog/res/values-mk/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"Овозможи"</string>
-    <string name="video_call_not_available_title" msgid="987490011944013201">"Видеоповикувањето е недостапно во моментов."</string>
-    <string name="video_call_not_available_message" msgid="2284146863894603221">"Обидете се да повикате повторно подоцна или продолжете со гласовен повик."</string>
-    <string name="voice_call" msgid="6748636104112578475">"Гласовен повик"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_enable_wifi_calling_button">Овозможи</string>
+  <string name="video_call_not_available_title">Видеоповикувањето е недостапно во моментов.</string>
+  <string name="video_call_not_available_message">Обидете се да повикате повторно подоцна или продолжете со гласовен повик.</string>
+  <string name="voice_call">Гласовен повик</string>
 </resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-ml/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-ml/strings.xml
index 719d6e8..ee1e8ef 100644
--- a/java/com/android/incallui/disconnectdialog/res/values-ml/strings.xml
+++ b/java/com/android/incallui/disconnectdialog/res/values-ml/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"പ്രവർത്തനക്ഷമമാക്കുക"</string>
-    <string name="video_call_not_available_title" msgid="987490011944013201">"വീഡിയോ കോളിംഗ് നിലവിൽ ലഭ്യമല്ല"</string>
-    <string name="video_call_not_available_message" msgid="2284146863894603221">"പിന്നീട് വീണ്ടും വിളിക്കുന്നതോ വോയ്‌സ് കോളായി കോൾ തുടരുന്നതോ പരീക്ഷിക്കൂ."</string>
-    <string name="voice_call" msgid="6748636104112578475">"വോയ്‌സ് കോൾ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_enable_wifi_calling_button">പ്രവർത്തനക്ഷമമാക്കുക</string>
+  <string name="video_call_not_available_title">വീഡിയോ കോളിംഗ് നിലവിൽ ലഭ്യമല്ല</string>
+  <string name="video_call_not_available_message">പിന്നീട് വീണ്ടും വിളിക്കുന്നതോ വോയ്‌സ് കോളായി കോൾ തുടരുന്നതോ പരീക്ഷിക്കൂ.</string>
+  <string name="voice_call">വോയ്‌സ് കോൾ</string>
 </resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-mn/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-mn/strings.xml
index fae6708..fc3c95c 100644
--- a/java/com/android/incallui/disconnectdialog/res/values-mn/strings.xml
+++ b/java/com/android/incallui/disconnectdialog/res/values-mn/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"Идэвхжүүлэх"</string>
-    <string name="video_call_not_available_title" msgid="987490011944013201">"Одоогоор видео дуудлага хийх боломжгүй"</string>
-    <string name="video_call_not_available_message" msgid="2284146863894603221">"Дараа дахин залгаж үзэх буюу энгийн дуудлагаар үргэлжлүүлнэ үү."</string>
-    <string name="voice_call" msgid="6748636104112578475">"Дуудлага"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_enable_wifi_calling_button">Идэвхжүүлэх</string>
+  <string name="video_call_not_available_title">Одоогоор видео дуудлага хийх боломжгүй</string>
+  <string name="video_call_not_available_message">Дараа дахин залгаж үзэх буюу энгийн дуудлагаар үргэлжлүүлнэ үү.</string>
+  <string name="voice_call">Дуудлага</string>
 </resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-mr/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-mr/strings.xml
index 8549785..7a0f73c 100644
--- a/java/com/android/incallui/disconnectdialog/res/values-mr/strings.xml
+++ b/java/com/android/incallui/disconnectdialog/res/values-mr/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"चालू करा"</string>
-    <string name="video_call_not_available_title" msgid="987490011944013201">"व्हिडिओ कॉलिंग सध्या उपलब्ध नाही"</string>
-    <string name="video_call_not_available_message" msgid="2284146863894603221">"नंतर पुन्हा कॉल करून पहा किंवा कॉल व्हॉइस कॉल म्हणून सुरू ठेवा."</string>
-    <string name="voice_call" msgid="6748636104112578475">"व्हॉईस कॉल"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_enable_wifi_calling_button">चालू करा</string>
+  <string name="video_call_not_available_title">व्हिडिओ कॉलिंग सध्या उपलब्ध नाही</string>
+  <string name="video_call_not_available_message">नंतर पुन्हा कॉल करून पहा किंवा कॉल व्हॉइस कॉल म्हणून सुरू ठेवा.</string>
+  <string name="voice_call">व्हॉइस कॉल</string>
 </resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-ms/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-ms/strings.xml
index efe8799..dac88b4 100644
--- a/java/com/android/incallui/disconnectdialog/res/values-ms/strings.xml
+++ b/java/com/android/incallui/disconnectdialog/res/values-ms/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"Dayakan"</string>
-    <string name="video_call_not_available_title" msgid="987490011944013201">"Panggilan video tidak tersedia pada masa ini"</string>
-    <string name="video_call_not_available_message" msgid="2284146863894603221">"Cuba hubungi semula kemudian atau teruskan panggilan sebagai panggilan suara."</string>
-    <string name="voice_call" msgid="6748636104112578475">"Panggilan suara"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_enable_wifi_calling_button">Dayakan</string>
+  <string name="video_call_not_available_title">Panggilan video tidak tersedia pada masa ini</string>
+  <string name="video_call_not_available_message">Cuba hubungi semula kemudian atau teruskan panggilan sebagai panggilan suara.</string>
+  <string name="voice_call">Panggilan suara</string>
 </resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-my/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-my/strings.xml
index 04a4f3a..5063cd3 100644
--- a/java/com/android/incallui/disconnectdialog/res/values-my/strings.xml
+++ b/java/com/android/incallui/disconnectdialog/res/values-my/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"ဖွင့်ရန်"</string>
-    <string name="video_call_not_available_title" msgid="987490011944013201">"ဗီဒီယိုခေါ်ဆိုမှုကို လက်ရှိတွင် မရရှိနိုင်ပါ"</string>
-    <string name="video_call_not_available_message" msgid="2284146863894603221">"နောက်မှ ထပ်မံခေါ်ဆိုကြည့်ပါ (သို့) အသံခေါ်ဆိုမှု ဆက်လုပ်ကြည့်ပါ။"</string>
-    <string name="voice_call" msgid="6748636104112578475">"အသံခေါ်ဆိုမှု"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_enable_wifi_calling_button">ဖွင့်ရန်</string>
+  <string name="video_call_not_available_title">ဗီဒီယိုခေါ်ဆိုမှုကို လက်ရှိတွင် မရရှိနိုင်ပါ</string>
+  <string name="video_call_not_available_message">နောက်မှ ထပ်မံခေါ်ဆိုကြည့်ပါ (သို့) အသံခေါ်ဆိုမှု ဆက်လုပ်ကြည့်ပါ။</string>
+  <string name="voice_call">ဖုန်း ခေါ်ဆိုရန်</string>
 </resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-nb/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-nb/strings.xml
index 14a41fa..d6cd146 100644
--- a/java/com/android/incallui/disconnectdialog/res/values-nb/strings.xml
+++ b/java/com/android/incallui/disconnectdialog/res/values-nb/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"Slå på"</string>
-    <string name="video_call_not_available_title" msgid="987490011944013201">"Videoanrop er ikke tilgjengelige akkurat nå"</string>
-    <string name="video_call_not_available_message" msgid="2284146863894603221">"Prøv å ringe på nytt senere eller fortsett anropet som taleanrop."</string>
-    <string name="voice_call" msgid="6748636104112578475">"Taleanrop"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_enable_wifi_calling_button">Slå på</string>
+  <string name="video_call_not_available_title">Videoanrop er ikke tilgjengelige akkurat nå</string>
+  <string name="video_call_not_available_message">Prøv å ringe på nytt senere eller fortsett anropet som taleanrop.</string>
+  <string name="voice_call">Taleanrop</string>
 </resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-ne/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-ne/strings.xml
index 9cc63fd..772f3ee 100644
--- a/java/com/android/incallui/disconnectdialog/res/values-ne/strings.xml
+++ b/java/com/android/incallui/disconnectdialog/res/values-ne/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"सक्षम पार्नुहोस्"</string>
-    <string name="video_call_not_available_title" msgid="987490011944013201">"भिडियो कल हाल उपलब्ध छैन"</string>
-    <string name="video_call_not_available_message" msgid="2284146863894603221">"पछि फेरि कल गर्ने प्रयास गर्नुहोस् वा भ्वाइस कलका रूपमा कल जारी राख्नुहोस्।"</string>
-    <string name="voice_call" msgid="6748636104112578475">"भ्वाइस कल"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_enable_wifi_calling_button">सक्षम पार्नुहोस्</string>
+  <string name="video_call_not_available_title">भिडियो कल हाल उपलब्ध छैन</string>
+  <string name="video_call_not_available_message">पछि फेरि कल गर्ने प्रयास गर्नुहोस् वा भ्वाइस कलका रूपमा कल जारी राख्नुहोस्।</string>
+  <string name="voice_call">भ्वाइस कल</string>
 </resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-nl/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-nl/strings.xml
index c3380db..6c2fdd8 100644
--- a/java/com/android/incallui/disconnectdialog/res/values-nl/strings.xml
+++ b/java/com/android/incallui/disconnectdialog/res/values-nl/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"Inschakelen"</string>
-    <string name="video_call_not_available_title" msgid="987490011944013201">"Videobellen is momenteel niet beschikbaar"</string>
-    <string name="video_call_not_available_message" msgid="2284146863894603221">"Probeer later opnieuw te bellen of start een spraakoproep."</string>
-    <string name="voice_call" msgid="6748636104112578475">"Spraakoproep"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_enable_wifi_calling_button">Inschakelen</string>
+  <string name="video_call_not_available_title">Videobellen is momenteel niet beschikbaar</string>
+  <string name="video_call_not_available_message">Probeer later opnieuw te bellen of start een spraakoproep.</string>
+  <string name="voice_call">Spraakoproep</string>
 </resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-no/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-no/strings.xml
index 14a41fa..d6cd146 100644
--- a/java/com/android/incallui/disconnectdialog/res/values-no/strings.xml
+++ b/java/com/android/incallui/disconnectdialog/res/values-no/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"Slå på"</string>
-    <string name="video_call_not_available_title" msgid="987490011944013201">"Videoanrop er ikke tilgjengelige akkurat nå"</string>
-    <string name="video_call_not_available_message" msgid="2284146863894603221">"Prøv å ringe på nytt senere eller fortsett anropet som taleanrop."</string>
-    <string name="voice_call" msgid="6748636104112578475">"Taleanrop"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_enable_wifi_calling_button">Slå på</string>
+  <string name="video_call_not_available_title">Videoanrop er ikke tilgjengelige akkurat nå</string>
+  <string name="video_call_not_available_message">Prøv å ringe på nytt senere eller fortsett anropet som taleanrop.</string>
+  <string name="voice_call">Taleanrop</string>
 </resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-pa/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-pa/strings.xml
index 722183b..11e5470 100644
--- a/java/com/android/incallui/disconnectdialog/res/values-pa/strings.xml
+++ b/java/com/android/incallui/disconnectdialog/res/values-pa/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"ਯੋਗ ਬਣਾਓ"</string>
-    <string name="video_call_not_available_title" msgid="987490011944013201">"ਵੀਡੀਓ ਕਾਲਿੰਗ ਇਸ ਵੇਲੇ ਉਪਲਬਧ ਨਹੀਂ ਹੈ"</string>
-    <string name="video_call_not_available_message" msgid="2284146863894603221">"ਬਾਅਦ ਵਿੱਚ ਦੁਬਾਰਾ ਕਾਲ ਕਰਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰੋ ਜਾਂ ਕਾਲ ਨੂੰ ਵੌਇਸ ਕਾਲ ਵਜੋਂ ਜਾਰੀ ਰੱਖੋ।"</string>
-    <string name="voice_call" msgid="6748636104112578475">"ਵੌਇਸ ਕਾਲ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_enable_wifi_calling_button">ਯੋਗ ਬਣਾਓ</string>
+  <string name="video_call_not_available_title">ਵੀਡੀਓ ਕਾਲਿੰਗ ਇਸ ਵੇਲੇ ਉਪਲਬਧ ਨਹੀਂ ਹੈ</string>
+  <string name="video_call_not_available_message">ਬਾਅਦ ਵਿੱਚ ਦੁਬਾਰਾ ਕਾਲ ਕਰਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰੋ ਜਾਂ ਕਾਲ ਨੂੰ ਵੌਇਸ ਕਾਲ ਵਜੋਂ ਜਾਰੀ ਰੱਖੋ।</string>
+  <string name="voice_call">ਅਵਾਜ਼ੀ ਕਾਲ</string>
 </resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-pl/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-pl/strings.xml
index b8307e9..6f0611b 100644
--- a/java/com/android/incallui/disconnectdialog/res/values-pl/strings.xml
+++ b/java/com/android/incallui/disconnectdialog/res/values-pl/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"Włącz"</string>
-    <string name="video_call_not_available_title" msgid="987490011944013201">"Rozmowy wideo nie są obecnie dostępne"</string>
-    <string name="video_call_not_available_message" msgid="2284146863894603221">"Spróbuj zadzwonić później, aby kontynuować rozmowę w trybie wideo."</string>
-    <string name="voice_call" msgid="6748636104112578475">"Połączenie głosowe"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_enable_wifi_calling_button">Włącz</string>
+  <string name="video_call_not_available_title">Rozmowy wideo nie są obecnie dostępne</string>
+  <string name="video_call_not_available_message">Spróbuj zadzwonić później, aby kontynuować rozmowę w trybie wideo.</string>
+  <string name="voice_call">Rozmowa głosowa</string>
 </resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-pt-rBR/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-pt-rBR/strings.xml
index ce249f6..35591ba 100644
--- a/java/com/android/incallui/disconnectdialog/res/values-pt-rBR/strings.xml
+++ b/java/com/android/incallui/disconnectdialog/res/values-pt-rBR/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"Ativar"</string>
-    <string name="video_call_not_available_title" msgid="987490011944013201">"O recurso de videochamada não está disponível no momento"</string>
-    <string name="video_call_not_available_message" msgid="2284146863894603221">"Ligue novamente mais tarde ou continue esta chamada sem o vídeo."</string>
-    <string name="voice_call" msgid="6748636104112578475">"Chamada de voz"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_enable_wifi_calling_button">Ativar</string>
+  <string name="video_call_not_available_title">O recurso de videochamada não está disponível no momento</string>
+  <string name="video_call_not_available_message">Ligue novamente mais tarde ou continue esta chamada sem o vídeo.</string>
+  <string name="voice_call">Chamada de voz</string>
 </resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-pt-rPT/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-pt-rPT/strings.xml
index fb6980a..03e7660 100644
--- a/java/com/android/incallui/disconnectdialog/res/values-pt-rPT/strings.xml
+++ b/java/com/android/incallui/disconnectdialog/res/values-pt-rPT/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"Ativar"</string>
-    <string name="video_call_not_available_title" msgid="987490011944013201">"Neste momento, não é possível efetuar videochamadas"</string>
-    <string name="video_call_not_available_message" msgid="2284146863894603221">"Experimente efetuar a videochamada mais tarde ou continue a chamada como uma chamada de voz."</string>
-    <string name="voice_call" msgid="6748636104112578475">"Chamada de voz"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_enable_wifi_calling_button">Ativar</string>
+  <string name="video_call_not_available_title">Neste momento, não é possível efetuar videochamadas</string>
+  <string name="video_call_not_available_message">Experimente efetuar a videochamada mais tarde ou continue a chamada como uma chamada de voz.</string>
+  <string name="voice_call">Chamada de voz</string>
 </resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-pt/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-pt/strings.xml
index ce249f6..35591ba 100644
--- a/java/com/android/incallui/disconnectdialog/res/values-pt/strings.xml
+++ b/java/com/android/incallui/disconnectdialog/res/values-pt/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"Ativar"</string>
-    <string name="video_call_not_available_title" msgid="987490011944013201">"O recurso de videochamada não está disponível no momento"</string>
-    <string name="video_call_not_available_message" msgid="2284146863894603221">"Ligue novamente mais tarde ou continue esta chamada sem o vídeo."</string>
-    <string name="voice_call" msgid="6748636104112578475">"Chamada de voz"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_enable_wifi_calling_button">Ativar</string>
+  <string name="video_call_not_available_title">O recurso de videochamada não está disponível no momento</string>
+  <string name="video_call_not_available_message">Ligue novamente mais tarde ou continue esta chamada sem o vídeo.</string>
+  <string name="voice_call">Chamada de voz</string>
 </resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-ro/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-ro/strings.xml
index 7836192..ec8e130 100644
--- a/java/com/android/incallui/disconnectdialog/res/values-ro/strings.xml
+++ b/java/com/android/incallui/disconnectdialog/res/values-ro/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"Activați"</string>
-    <string name="video_call_not_available_title" msgid="987490011944013201">"Apelarea video este indisponibilă momentan"</string>
-    <string name="video_call_not_available_message" msgid="2284146863894603221">"Încercați să apelați din nou mai târziu sau continuați ca apel vocal."</string>
-    <string name="voice_call" msgid="6748636104112578475">"Apel vocal"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_enable_wifi_calling_button">Activați</string>
+  <string name="video_call_not_available_title">Apelarea video este indisponibilă momentan</string>
+  <string name="video_call_not_available_message">Încercați să apelați din nou mai târziu sau continuați ca apel vocal.</string>
+  <string name="voice_call">Apel vocal</string>
 </resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-ru/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-ru/strings.xml
index ffc3f61..e60c6a9 100644
--- a/java/com/android/incallui/disconnectdialog/res/values-ru/strings.xml
+++ b/java/com/android/incallui/disconnectdialog/res/values-ru/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"Включить"</string>
-    <string name="video_call_not_available_title" msgid="987490011944013201">"В настоящее время видеовызовы недоступны"</string>
-    <string name="video_call_not_available_message" msgid="2284146863894603221">"Повторите попытку позже или продолжайте выполнять вызов как голосовой."</string>
-    <string name="voice_call" msgid="6748636104112578475">"Голосовой вызов"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_enable_wifi_calling_button">Включить</string>
+  <string name="video_call_not_available_title">В настоящее время видеовызовы недоступны</string>
+  <string name="video_call_not_available_message">Повторите попытку позже или продолжайте выполнять вызов как голосовой.</string>
+  <string name="voice_call">Начать голосовой вызов</string>
 </resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-si/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-si/strings.xml
index 6948877..aad531a 100644
--- a/java/com/android/incallui/disconnectdialog/res/values-si/strings.xml
+++ b/java/com/android/incallui/disconnectdialog/res/values-si/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"සබල කරන්න"</string>
-    <string name="video_call_not_available_title" msgid="987490011944013201">"වීඩියෝ ඇමතීම දැනට ලබා ගැනීමට නොහැකිය"</string>
-    <string name="video_call_not_available_message" msgid="2284146863894603221">"පසුව නැවත ඇමතීම උත්සාහ කරන්න නැතහොත් ඇමතුම හඬ ඇමතුමක් ලෙස දිගටම කරගෙන යන්න."</string>
-    <string name="voice_call" msgid="6748636104112578475">"හඬ ඇමතීම"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_enable_wifi_calling_button">සබල කරන්න</string>
+  <string name="video_call_not_available_title">වීඩියෝ ඇමතීම දැනට ලබා ගැනීමට නොහැකිය</string>
+  <string name="video_call_not_available_message">පසුව නැවත ඇමතීම උත්සාහ කරන්න නැතහොත් ඇමතුම හඬ ඇමතුමක් ලෙස දිගටම කරගෙන යන්න.</string>
+  <string name="voice_call">හඬ ඇමතුම</string>
 </resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-sk/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-sk/strings.xml
index 8f4b059..0a21739 100644
--- a/java/com/android/incallui/disconnectdialog/res/values-sk/strings.xml
+++ b/java/com/android/incallui/disconnectdialog/res/values-sk/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"Povoliť"</string>
-    <string name="video_call_not_available_title" msgid="987490011944013201">"Videohovor momentálne nie je k dispozícii"</string>
-    <string name="video_call_not_available_message" msgid="2284146863894603221">"Skúste zavolať znova neskôr alebo pokračujte v hovore bez videa."</string>
-    <string name="voice_call" msgid="6748636104112578475">"Hlasový hovor"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_enable_wifi_calling_button">Povoliť</string>
+  <string name="video_call_not_available_title">Videohovor momentálne nie je k dispozícii</string>
+  <string name="video_call_not_available_message">Skúste zavolať znova neskôr alebo pokračujte v hovore bez videa.</string>
+  <string name="voice_call">Hlasový hovor</string>
 </resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-sl/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-sl/strings.xml
index 6afd14c..fb22d32 100644
--- a/java/com/android/incallui/disconnectdialog/res/values-sl/strings.xml
+++ b/java/com/android/incallui/disconnectdialog/res/values-sl/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"Omogoči"</string>
-    <string name="video_call_not_available_title" msgid="987490011944013201">"Videoklicanje trenutno ni na voljo"</string>
-    <string name="video_call_not_available_message" msgid="2284146863894603221">"Poskusite klicati znova pozneje ali pa klic nadaljujte kot glasovni klic."</string>
-    <string name="voice_call" msgid="6748636104112578475">"Glasovni klic"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_enable_wifi_calling_button">Omogoči</string>
+  <string name="video_call_not_available_title">Videoklicanje trenutno ni na voljo</string>
+  <string name="video_call_not_available_message">Poskusite klicati znova pozneje ali pa klic nadaljujte kot glasovni klic.</string>
+  <string name="voice_call">Glasovni klic</string>
 </resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-sq/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-sq/strings.xml
index cccc83f..36573ac 100644
--- a/java/com/android/incallui/disconnectdialog/res/values-sq/strings.xml
+++ b/java/com/android/incallui/disconnectdialog/res/values-sq/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"Aktivizo"</string>
-    <string name="video_call_not_available_title" msgid="987490011944013201">"Telefonatat me video nuk ofrohen aktualisht"</string>
-    <string name="video_call_not_available_message" msgid="2284146863894603221">"Provo të telefonosh përsëri më vonë ose vazhdoje telefonatën si një telefonatë zanore."</string>
-    <string name="voice_call" msgid="6748636104112578475">"Telefonatë me video"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_enable_wifi_calling_button">Aktivizo</string>
+  <string name="video_call_not_available_title">Telefonatat me video nuk ofrohen aktualisht</string>
+  <string name="video_call_not_available_message">Provo të telefonosh përsëri më vonë ose vazhdoje telefonatën si një telefonatë zanore.</string>
+  <string name="voice_call">Telefonatë zanore</string>
 </resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-sr/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-sr/strings.xml
index 620c39e..94c1254 100644
--- a/java/com/android/incallui/disconnectdialog/res/values-sr/strings.xml
+++ b/java/com/android/incallui/disconnectdialog/res/values-sr/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"Омогући"</string>
-    <string name="video_call_not_available_title" msgid="987490011944013201">"Видео позив тренутно није доступан"</string>
-    <string name="video_call_not_available_message" msgid="2284146863894603221">"Пробајте поново да упутите позив касније или га наставите као аудио позив."</string>
-    <string name="voice_call" msgid="6748636104112578475">"Аудио позив"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_enable_wifi_calling_button">Омогући</string>
+  <string name="video_call_not_available_title">Видео позив тренутно није доступан</string>
+  <string name="video_call_not_available_message">Пробајте поново да упутите позив касније или га наставите као аудио позив.</string>
+  <string name="voice_call">Упути аудио позив</string>
 </resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-sv/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-sv/strings.xml
index e6be384..0af2c67 100644
--- a/java/com/android/incallui/disconnectdialog/res/values-sv/strings.xml
+++ b/java/com/android/incallui/disconnectdialog/res/values-sv/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"Aktivera"</string>
-    <string name="video_call_not_available_title" msgid="987490011944013201">"Det går inte att ringa videosamtal just nu"</string>
-    <string name="video_call_not_available_message" msgid="2284146863894603221">"Försök ringa upp igen senare eller fortsätt samtalet som ett röstsamtal"</string>
-    <string name="voice_call" msgid="6748636104112578475">"Röstsamtal"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_enable_wifi_calling_button">Aktivera</string>
+  <string name="video_call_not_available_title">Det går inte att ringa videosamtal just nu</string>
+  <string name="video_call_not_available_message">Försök ringa upp igen senare eller fortsätt samtalet som ett röstsamtal</string>
+  <string name="voice_call">Röstsamtal</string>
 </resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-sw/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-sw/strings.xml
index 6d6a6a0..62b01a5 100644
--- a/java/com/android/incallui/disconnectdialog/res/values-sw/strings.xml
+++ b/java/com/android/incallui/disconnectdialog/res/values-sw/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"Washa"</string>
-    <string name="video_call_not_available_title" msgid="987490011944013201">"Kipengele cha kupiga simu za video hakipatikani kwa sasa"</string>
-    <string name="video_call_not_available_message" msgid="2284146863894603221">"Jaribu kupiga simu ya video tena hapo baadaye au uendelee na mazungumzo kama simu ya sauti."</string>
-    <string name="voice_call" msgid="6748636104112578475">"Simu ya sauti"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_enable_wifi_calling_button">Washa</string>
+  <string name="video_call_not_available_title">Kipengele cha kupiga simu za video hakipatikani kwa sasa</string>
+  <string name="video_call_not_available_message">Jaribu kupiga simu ya video tena hapo baadaye au uendelee na mazungumzo kama simu ya sauti.</string>
+  <string name="voice_call">Simu ya sauti</string>
 </resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-ta/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-ta/strings.xml
index 626d0d6..a2ea2e1 100644
--- a/java/com/android/incallui/disconnectdialog/res/values-ta/strings.xml
+++ b/java/com/android/incallui/disconnectdialog/res/values-ta/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"இயக்கு"</string>
-    <string name="video_call_not_available_title" msgid="987490011944013201">"தற்போது வீடியோவில் அழைக்க முடியாது"</string>
-    <string name="video_call_not_available_message" msgid="2284146863894603221">"பிறகு அழைக்க முயற்சிக்கவும் அல்லது குரல் அழைப்பைச் செய்யவும்."</string>
-    <string name="voice_call" msgid="6748636104112578475">"குரல் அழைப்பு"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_enable_wifi_calling_button">இயக்கு</string>
+  <string name="video_call_not_available_title">தற்போது வீடியோவில் அழைக்க முடியாது</string>
+  <string name="video_call_not_available_message">பிறகு அழைக்க முயற்சிக்கவும் அல்லது குரல் அழைப்பைச் செய்யவும்.</string>
+  <string name="voice_call">குரல் அழைப்பு</string>
 </resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-te/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-te/strings.xml
index 737d677..810f26e 100644
--- a/java/com/android/incallui/disconnectdialog/res/values-te/strings.xml
+++ b/java/com/android/incallui/disconnectdialog/res/values-te/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"ప్రారంభించు"</string>
-    <string name="video_call_not_available_title" msgid="987490011944013201">"ప్రస్తుతం వీడియో కాలింగ్ అందుబాటులో లేదు"</string>
-    <string name="video_call_not_available_message" msgid="2284146863894603221">"మళ్లీ కాల్ చేసి ప్రయత్నించండి లేదా కాల్‌ను వాయిస్ కాల్ వలె కొనసాగించండి."</string>
-    <string name="voice_call" msgid="6748636104112578475">"వాయిస్ కాల్"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_enable_wifi_calling_button">ప్రారంభించు</string>
+  <string name="video_call_not_available_title">ప్రస్తుతం వీడియో కాలింగ్ అందుబాటులో లేదు</string>
+  <string name="video_call_not_available_message">మళ్లీ కాల్ చేసి ప్రయత్నించండి లేదా కాల్‌ను వాయిస్ కాల్ వలె కొనసాగించండి.</string>
+  <string name="voice_call">వాయిస్ కాల్</string>
 </resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-th/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-th/strings.xml
index a6fa2b1..a1c7302 100644
--- a/java/com/android/incallui/disconnectdialog/res/values-th/strings.xml
+++ b/java/com/android/incallui/disconnectdialog/res/values-th/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"เปิดใช้"</string>
-    <string name="video_call_not_available_title" msgid="987490011944013201">"วิดีโอคอลไม่พร้อมใช้งานในตอนนี้"</string>
-    <string name="video_call_not_available_message" msgid="2284146863894603221">"ลองโทรอีกครั้งในภายหลัง หรือโทรด้วยเสียงต่อไป"</string>
-    <string name="voice_call" msgid="6748636104112578475">"การโทรด้วยเสียง"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_enable_wifi_calling_button">เปิดใช้</string>
+  <string name="video_call_not_available_title">วิดีโอคอลไม่พร้อมใช้งานในตอนนี้</string>
+  <string name="video_call_not_available_message">ลองโทรอีกครั้งในภายหลัง หรือโทรด้วยเสียงต่อไป</string>
+  <string name="voice_call">การโทรด้วยเสียง</string>
 </resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-tl/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-tl/strings.xml
index 17f29af..3cc011a 100644
--- a/java/com/android/incallui/disconnectdialog/res/values-tl/strings.xml
+++ b/java/com/android/incallui/disconnectdialog/res/values-tl/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"I-enable"</string>
-    <string name="video_call_not_available_title" msgid="987490011944013201">"Kasalukuyang hindi available ang pakikipag-video call"</string>
-    <string name="video_call_not_available_message" msgid="2284146863894603221">"Subukang tumawag muli sa ibang pagkakataon o ipagpatuloy ang tawag bilang isang voice call."</string>
-    <string name="voice_call" msgid="6748636104112578475">"Voice call"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_enable_wifi_calling_button">I-enable</string>
+  <string name="video_call_not_available_title">Kasalukuyang hindi available ang pakikipag-video call</string>
+  <string name="video_call_not_available_message">Subukang tumawag muli sa ibang pagkakataon o ipagpatuloy ang tawag bilang isang voice call.</string>
+  <string name="voice_call">Voice call</string>
 </resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-tr/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-tr/strings.xml
index a0ba4fa..0719c90 100644
--- a/java/com/android/incallui/disconnectdialog/res/values-tr/strings.xml
+++ b/java/com/android/incallui/disconnectdialog/res/values-tr/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"Etkinleştir"</string>
-    <string name="video_call_not_available_title" msgid="987490011944013201">"Görüntülü görüşme şu anda kullanılamıyor"</string>
-    <string name="video_call_not_available_message" msgid="2284146863894603221">"Görüntülü görüşme yapmayı daha sonra tekrar deneyin veya görüşmeye sesli arama olarak devam edin."</string>
-    <string name="voice_call" msgid="6748636104112578475">"Sesli arama"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_enable_wifi_calling_button">Etkinleştir</string>
+  <string name="video_call_not_available_title">Görüntülü görüşme şu anda kullanılamıyor</string>
+  <string name="video_call_not_available_message">Görüntülü görüşme yapmayı daha sonra tekrar deneyin veya görüşmeye sesli arama olarak devam edin.</string>
+  <string name="voice_call">Sesli arama</string>
 </resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-uk/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-uk/strings.xml
index 36a3c45..7c0cd42 100644
--- a/java/com/android/incallui/disconnectdialog/res/values-uk/strings.xml
+++ b/java/com/android/incallui/disconnectdialog/res/values-uk/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"Увімкнути"</string>
-    <string name="video_call_not_available_title" msgid="987490011944013201">"Наразі не можна здійснювати відеодзвінки"</string>
-    <string name="video_call_not_available_message" msgid="2284146863894603221">"Спробуйте пізніше або перейдіть у режим голосового дзвінка."</string>
-    <string name="voice_call" msgid="6748636104112578475">"Голосовий дзвінок"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_enable_wifi_calling_button">Увімкнути</string>
+  <string name="video_call_not_available_title">Наразі не можна здійснювати відеодзвінки</string>
+  <string name="video_call_not_available_message">Спробуйте пізніше або перейдіть у режим голосового дзвінка.</string>
+  <string name="voice_call">Голосовий дзвінок</string>
 </resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-ur/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-ur/strings.xml
index 4fa8b50..5743d36 100644
--- a/java/com/android/incallui/disconnectdialog/res/values-ur/strings.xml
+++ b/java/com/android/incallui/disconnectdialog/res/values-ur/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"فعال کریں"</string>
-    <string name="video_call_not_available_title" msgid="987490011944013201">"ویڈیو کالنگ فی الحال دستیاب نہیں ہے"</string>
-    <string name="video_call_not_available_message" msgid="2284146863894603221">"بعد میں دوبارہ کال کرنے کی کوشش کریں یا کال کو بطور صوتی کال جاری رکھیں۔"</string>
-    <string name="voice_call" msgid="6748636104112578475">"صوتی کال"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_enable_wifi_calling_button">فعال کریں</string>
+  <string name="video_call_not_available_title">ویڈیو کالنگ فی الحال دستیاب نہیں ہے</string>
+  <string name="video_call_not_available_message">بعد میں دوبارہ کال کرنے کی کوشش کریں یا کال کو بطور صوتی کال جاری رکھیں۔</string>
+  <string name="voice_call">صوتی کال</string>
 </resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-uz/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-uz/strings.xml
index 229e6e7..6a9fec0 100644
--- a/java/com/android/incallui/disconnectdialog/res/values-uz/strings.xml
+++ b/java/com/android/incallui/disconnectdialog/res/values-uz/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"Yoqish"</string>
-    <string name="video_call_not_available_title" msgid="987490011944013201">"Video muloqot funksiyasidan hozirgi vaqtda foydalanib bo‘lmaydi."</string>
-    <string name="video_call_not_available_message" msgid="2284146863894603221">"Keyinroq qayta urinib ko‘ring yoki ovozli muloqot rejimida o‘ting."</string>
-    <string name="voice_call" msgid="6748636104112578475">"Ovozli muloqot"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_enable_wifi_calling_button">Yoqish</string>
+  <string name="video_call_not_available_title">Video muloqot funksiyasidan hozirgi vaqtda foydalanib bo‘lmaydi.</string>
+  <string name="video_call_not_available_message">Keyinroq qayta urinib ko‘ring yoki ovozli muloqot rejimida o‘ting.</string>
+  <string name="voice_call">Ovozli chaqiruv qilish</string>
 </resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-vi/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-vi/strings.xml
index 3e49451..f72c407 100644
--- a/java/com/android/incallui/disconnectdialog/res/values-vi/strings.xml
+++ b/java/com/android/incallui/disconnectdialog/res/values-vi/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"Bật"</string>
-    <string name="video_call_not_available_title" msgid="987490011944013201">"Hiện không sử dụng được tính năng gọi điện video"</string>
-    <string name="video_call_not_available_message" msgid="2284146863894603221">"Hãy thử gọi lại sau hoặc tiếp tục gọi dưới dạng cuộc gọi thoại."</string>
-    <string name="voice_call" msgid="6748636104112578475">"Cuộc gọi thoại"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_enable_wifi_calling_button">Bật</string>
+  <string name="video_call_not_available_title">Hiện không sử dụng được tính năng gọi điện video</string>
+  <string name="video_call_not_available_message">Hãy thử gọi lại sau hoặc tiếp tục gọi dưới dạng cuộc gọi thoại.</string>
+  <string name="voice_call">Gọi thoại</string>
 </resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-zh-rCN/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-zh-rCN/strings.xml
index 3f8cd6d..e156903 100644
--- a/java/com/android/incallui/disconnectdialog/res/values-zh-rCN/strings.xml
+++ b/java/com/android/incallui/disconnectdialog/res/values-zh-rCN/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"启用"</string>
-    <string name="video_call_not_available_title" msgid="987490011944013201">"当前无法使用视频通话功能"</string>
-    <string name="video_call_not_available_message" msgid="2284146863894603221">"请稍后再试，或者改用语音通话。"</string>
-    <string name="voice_call" msgid="6748636104112578475">"语音通话"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_enable_wifi_calling_button">启用</string>
+  <string name="video_call_not_available_title">当前无法使用视频通话功能</string>
+  <string name="video_call_not_available_message">请稍后再试，或者改用语音通话。</string>
+  <string name="voice_call">拨打语音电话</string>
 </resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-zh-rHK/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-zh-rHK/strings.xml
index 605c847..db97861 100644
--- a/java/com/android/incallui/disconnectdialog/res/values-zh-rHK/strings.xml
+++ b/java/com/android/incallui/disconnectdialog/res/values-zh-rHK/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"啟用"</string>
-    <string name="video_call_not_available_title" msgid="987490011944013201">"視像通話目前無法使用"</string>
-    <string name="video_call_not_available_message" msgid="2284146863894603221">"請稍後再撥，或是以語音通話的形式繼續通話。"</string>
-    <string name="voice_call" msgid="6748636104112578475">"語音通話"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_enable_wifi_calling_button">啟用</string>
+  <string name="video_call_not_available_title">視像通話目前無法使用</string>
+  <string name="video_call_not_available_message">請稍後再撥，或是以語音通話的形式繼續通話。</string>
+  <string name="voice_call">語音通話</string>
 </resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-zh-rTW/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-zh-rTW/strings.xml
index 5201a34..6615d86 100644
--- a/java/com/android/incallui/disconnectdialog/res/values-zh-rTW/strings.xml
+++ b/java/com/android/incallui/disconnectdialog/res/values-zh-rTW/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"啟用"</string>
-    <string name="video_call_not_available_title" msgid="987490011944013201">"目前無法使用視訊通話功能"</string>
-    <string name="video_call_not_available_message" msgid="2284146863894603221">"請稍後再嘗試撥打電話，或以語音方式繼續進行通話。"</string>
-    <string name="voice_call" msgid="6748636104112578475">"語音通話"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_enable_wifi_calling_button">啟用</string>
+  <string name="video_call_not_available_title">目前無法使用視訊通話功能</string>
+  <string name="video_call_not_available_message">請稍後再嘗試撥打電話，或以語音方式繼續進行通話。</string>
+  <string name="voice_call">語音通話</string>
 </resources>
diff --git a/java/com/android/incallui/disconnectdialog/res/values-zu/strings.xml b/java/com/android/incallui/disconnectdialog/res/values-zu/strings.xml
index 1c0dd48..4209761 100644
--- a/java/com/android/incallui/disconnectdialog/res/values-zu/strings.xml
+++ b/java/com/android/incallui/disconnectdialog/res/values-zu/strings.xml
@@ -1,24 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_enable_wifi_calling_button" msgid="3295230556186542328">"Nika amandla"</string>
-    <string name="video_call_not_available_title" msgid="987490011944013201">"Ukushaya kwevidiyo manje akutholakali"</string>
-    <string name="video_call_not_available_message" msgid="2284146863894603221">"Zama ukushaya emuva kwesikhathi noma qhuba ikholi njengekholi yezwi."</string>
-    <string name="voice_call" msgid="6748636104112578475">"Ikholi yezwi"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="incall_enable_wifi_calling_button">Nika amandla</string>
+  <string name="video_call_not_available_title">Ukushaya kwevidiyo manje akutholakali</string>
+  <string name="video_call_not_available_message">Zama ukushaya emuva kwesikhathi noma qhuba ikholi njengekholi yezwi.</string>
+  <string name="voice_call">Ikholi yezwi</string>
 </resources>
diff --git a/java/com/android/incallui/hold/res/layout/incall_on_hold_banner.xml b/java/com/android/incallui/hold/res/layout/incall_on_hold_banner.xml
index 728cce2..c5c4553 100644
--- a/java/com/android/incallui/hold/res/layout/incall_on_hold_banner.xml
+++ b/java/com/android/incallui/hold/res/layout/incall_on_hold_banner.xml
@@ -19,8 +19,7 @@
   xmlns:tools="http://schemas.android.com/tools"
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
-  android:background="#CC212121"
-  android:fitsSystemWindows="true">
+  android:background="#CC212121">
   <LinearLayout
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/java/com/android/incallui/hold/res/values-af/strings.xml b/java/com/android/incallui/hold/res/values-af/strings.xml
index 2b645dd..b3b7c5d 100644
--- a/java/com/android/incallui/hold/res/values-af/strings.xml
+++ b/java/com/android/incallui/hold/res/values-af/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_on_hold" msgid="5618253281695138626">"Hou aan"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_on_hold">Hou aan</string>
 </resources>
diff --git a/java/com/android/incallui/hold/res/values-am/strings.xml b/java/com/android/incallui/hold/res/values-am/strings.xml
index 7e27a17..207d1e2 100644
--- a/java/com/android/incallui/hold/res/values-am/strings.xml
+++ b/java/com/android/incallui/hold/res/values-am/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_on_hold" msgid="5618253281695138626">"ያዝና ቆይ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_on_hold">ያዝና ቆይ</string>
 </resources>
diff --git a/java/com/android/incallui/hold/res/values-ar/strings.xml b/java/com/android/incallui/hold/res/values-ar/strings.xml
index 3fc039c..dd674a3 100644
--- a/java/com/android/incallui/hold/res/values-ar/strings.xml
+++ b/java/com/android/incallui/hold/res/values-ar/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_on_hold" msgid="5618253281695138626">"معلقة"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_on_hold">معلقة</string>
 </resources>
diff --git a/java/com/android/incallui/hold/res/values-az/strings.xml b/java/com/android/incallui/hold/res/values-az/strings.xml
index 566edbf..31827ef 100644
--- a/java/com/android/incallui/hold/res/values-az/strings.xml
+++ b/java/com/android/incallui/hold/res/values-az/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_on_hold" msgid="5618253281695138626">"Gözləmədə"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_on_hold">Gözləmədə</string>
 </resources>
diff --git a/java/com/android/incallui/hold/res/values-b+sr+Latn/strings.xml b/java/com/android/incallui/hold/res/values-b+sr+Latn/strings.xml
index cc132ca..990cacd 100644
--- a/java/com/android/incallui/hold/res/values-b+sr+Latn/strings.xml
+++ b/java/com/android/incallui/hold/res/values-b+sr+Latn/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_on_hold" msgid="5618253281695138626">"Na čekanju"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_on_hold">Na čekanju</string>
 </resources>
diff --git a/java/com/android/incallui/hold/res/values-be/strings.xml b/java/com/android/incallui/hold/res/values-be/strings.xml
index e9f0279..9b37aa9 100644
--- a/java/com/android/incallui/hold/res/values-be/strings.xml
+++ b/java/com/android/incallui/hold/res/values-be/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_on_hold" msgid="5618253281695138626">"На ўтрыманні"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_on_hold">На ўтрыманні</string>
 </resources>
diff --git a/java/com/android/incallui/hold/res/values-bg/strings.xml b/java/com/android/incallui/hold/res/values-bg/strings.xml
index 7ad89df..9c07989 100644
--- a/java/com/android/incallui/hold/res/values-bg/strings.xml
+++ b/java/com/android/incallui/hold/res/values-bg/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_on_hold" msgid="5618253281695138626">"Задържано"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_on_hold">Задържано</string>
 </resources>
diff --git a/java/com/android/incallui/hold/res/values-bn/strings.xml b/java/com/android/incallui/hold/res/values-bn/strings.xml
index d612bb0..d5be37d 100644
--- a/java/com/android/incallui/hold/res/values-bn/strings.xml
+++ b/java/com/android/incallui/hold/res/values-bn/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_on_hold" msgid="5618253281695138626">"হোল্ডে রয়েছে"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_on_hold">হোল্ডে রয়েছে</string>
 </resources>
diff --git a/java/com/android/incallui/hold/res/values-bs/strings.xml b/java/com/android/incallui/hold/res/values-bs/strings.xml
index cc132ca..990cacd 100644
--- a/java/com/android/incallui/hold/res/values-bs/strings.xml
+++ b/java/com/android/incallui/hold/res/values-bs/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_on_hold" msgid="5618253281695138626">"Na čekanju"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_on_hold">Na čekanju</string>
 </resources>
diff --git a/java/com/android/incallui/hold/res/values-ca/strings.xml b/java/com/android/incallui/hold/res/values-ca/strings.xml
index b4aafa6..cabb69a 100644
--- a/java/com/android/incallui/hold/res/values-ca/strings.xml
+++ b/java/com/android/incallui/hold/res/values-ca/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_on_hold" msgid="5618253281695138626">"En espera"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_on_hold">En espera</string>
 </resources>
diff --git a/java/com/android/incallui/hold/res/values-cs/strings.xml b/java/com/android/incallui/hold/res/values-cs/strings.xml
index 13778ce..cd1fbd8 100644
--- a/java/com/android/incallui/hold/res/values-cs/strings.xml
+++ b/java/com/android/incallui/hold/res/values-cs/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_on_hold" msgid="5618253281695138626">"Podrženo"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_on_hold">Podrženo</string>
 </resources>
diff --git a/java/com/android/incallui/hold/res/values-da/strings.xml b/java/com/android/incallui/hold/res/values-da/strings.xml
index 9d77982..53afccf 100644
--- a/java/com/android/incallui/hold/res/values-da/strings.xml
+++ b/java/com/android/incallui/hold/res/values-da/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_on_hold" msgid="5618253281695138626">"I venteposition"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_on_hold">I venteposition</string>
 </resources>
diff --git a/java/com/android/incallui/hold/res/values-de/strings.xml b/java/com/android/incallui/hold/res/values-de/strings.xml
index 685f671..dd650aa 100644
--- a/java/com/android/incallui/hold/res/values-de/strings.xml
+++ b/java/com/android/incallui/hold/res/values-de/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_on_hold" msgid="5618253281695138626">"Gehaltener Anruf"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_on_hold">Gehaltener Anruf</string>
 </resources>
diff --git a/java/com/android/incallui/hold/res/values-el/strings.xml b/java/com/android/incallui/hold/res/values-el/strings.xml
index ec2650f..e5e3b09 100644
--- a/java/com/android/incallui/hold/res/values-el/strings.xml
+++ b/java/com/android/incallui/hold/res/values-el/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_on_hold" msgid="5618253281695138626">"Σε αναμονή"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_on_hold">Σε αναμονή</string>
 </resources>
diff --git a/java/com/android/incallui/hold/res/values-en-rAU/strings.xml b/java/com/android/incallui/hold/res/values-en-rAU/strings.xml
index 33f2a44..c35149f 100644
--- a/java/com/android/incallui/hold/res/values-en-rAU/strings.xml
+++ b/java/com/android/incallui/hold/res/values-en-rAU/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_on_hold" msgid="5618253281695138626">"On hold"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_on_hold">On hold</string>
 </resources>
diff --git a/java/com/android/incallui/hold/res/values-en-rGB/strings.xml b/java/com/android/incallui/hold/res/values-en-rGB/strings.xml
index 33f2a44..c35149f 100644
--- a/java/com/android/incallui/hold/res/values-en-rGB/strings.xml
+++ b/java/com/android/incallui/hold/res/values-en-rGB/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_on_hold" msgid="5618253281695138626">"On hold"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_on_hold">On hold</string>
 </resources>
diff --git a/java/com/android/incallui/hold/res/values-en-rIN/strings.xml b/java/com/android/incallui/hold/res/values-en-rIN/strings.xml
index 33f2a44..c35149f 100644
--- a/java/com/android/incallui/hold/res/values-en-rIN/strings.xml
+++ b/java/com/android/incallui/hold/res/values-en-rIN/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_on_hold" msgid="5618253281695138626">"On hold"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_on_hold">On hold</string>
 </resources>
diff --git a/java/com/android/incallui/hold/res/values-es-rUS/strings.xml b/java/com/android/incallui/hold/res/values-es-rUS/strings.xml
index b4aafa6..cabb69a 100644
--- a/java/com/android/incallui/hold/res/values-es-rUS/strings.xml
+++ b/java/com/android/incallui/hold/res/values-es-rUS/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_on_hold" msgid="5618253281695138626">"En espera"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_on_hold">En espera</string>
 </resources>
diff --git a/java/com/android/incallui/hold/res/values-es/strings.xml b/java/com/android/incallui/hold/res/values-es/strings.xml
index b4aafa6..cabb69a 100644
--- a/java/com/android/incallui/hold/res/values-es/strings.xml
+++ b/java/com/android/incallui/hold/res/values-es/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_on_hold" msgid="5618253281695138626">"En espera"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_on_hold">En espera</string>
 </resources>
diff --git a/java/com/android/incallui/hold/res/values-et/strings.xml b/java/com/android/incallui/hold/res/values-et/strings.xml
index f8faaf1..7fe9383 100644
--- a/java/com/android/incallui/hold/res/values-et/strings.xml
+++ b/java/com/android/incallui/hold/res/values-et/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_on_hold" msgid="5618253281695138626">"Ootel"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_on_hold">Ootel</string>
 </resources>
diff --git a/java/com/android/incallui/hold/res/values-eu/strings.xml b/java/com/android/incallui/hold/res/values-eu/strings.xml
index 15938ee..d2007ad 100644
--- a/java/com/android/incallui/hold/res/values-eu/strings.xml
+++ b/java/com/android/incallui/hold/res/values-eu/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_on_hold" msgid="5618253281695138626">"Zain"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_on_hold">Zain</string>
 </resources>
diff --git a/java/com/android/incallui/hold/res/values-fa/strings.xml b/java/com/android/incallui/hold/res/values-fa/strings.xml
index 828e059..8779fa4 100644
--- a/java/com/android/incallui/hold/res/values-fa/strings.xml
+++ b/java/com/android/incallui/hold/res/values-fa/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_on_hold" msgid="5618253281695138626">"درانتظار"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_on_hold">درانتظار</string>
 </resources>
diff --git a/java/com/android/incallui/hold/res/values-fi/strings.xml b/java/com/android/incallui/hold/res/values-fi/strings.xml
index 6663a77..a58115f 100644
--- a/java/com/android/incallui/hold/res/values-fi/strings.xml
+++ b/java/com/android/incallui/hold/res/values-fi/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_on_hold" msgid="5618253281695138626">"Pidossa"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_on_hold">Pidossa</string>
 </resources>
diff --git a/java/com/android/incallui/hold/res/values-fr-rCA/strings.xml b/java/com/android/incallui/hold/res/values-fr-rCA/strings.xml
index 9a589a4..f7485ab 100644
--- a/java/com/android/incallui/hold/res/values-fr-rCA/strings.xml
+++ b/java/com/android/incallui/hold/res/values-fr-rCA/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_on_hold" msgid="5618253281695138626">"En attente"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_on_hold">En attente</string>
 </resources>
diff --git a/java/com/android/incallui/hold/res/values-fr/strings.xml b/java/com/android/incallui/hold/res/values-fr/strings.xml
index 9a589a4..f7485ab 100644
--- a/java/com/android/incallui/hold/res/values-fr/strings.xml
+++ b/java/com/android/incallui/hold/res/values-fr/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_on_hold" msgid="5618253281695138626">"En attente"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_on_hold">En attente</string>
 </resources>
diff --git a/java/com/android/incallui/hold/res/values-gl/strings.xml b/java/com/android/incallui/hold/res/values-gl/strings.xml
index b4aafa6..cabb69a 100644
--- a/java/com/android/incallui/hold/res/values-gl/strings.xml
+++ b/java/com/android/incallui/hold/res/values-gl/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_on_hold" msgid="5618253281695138626">"En espera"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_on_hold">En espera</string>
 </resources>
diff --git a/java/com/android/incallui/hold/res/values-gu/strings.xml b/java/com/android/incallui/hold/res/values-gu/strings.xml
index e8d93a6..b2f9cb0 100644
--- a/java/com/android/incallui/hold/res/values-gu/strings.xml
+++ b/java/com/android/incallui/hold/res/values-gu/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_on_hold" msgid="5618253281695138626">"હોલ્ડ પર"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_on_hold">હોલ્ડ પર</string>
 </resources>
diff --git a/java/com/android/incallui/hold/res/values-hi/strings.xml b/java/com/android/incallui/hold/res/values-hi/strings.xml
index ebbcb4f..bbc462f 100644
--- a/java/com/android/incallui/hold/res/values-hi/strings.xml
+++ b/java/com/android/incallui/hold/res/values-hi/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_on_hold" msgid="5618253281695138626">"होल्ड पर"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_on_hold">होल्ड पर</string>
 </resources>
diff --git a/java/com/android/incallui/hold/res/values-hr/strings.xml b/java/com/android/incallui/hold/res/values-hr/strings.xml
index cc132ca..990cacd 100644
--- a/java/com/android/incallui/hold/res/values-hr/strings.xml
+++ b/java/com/android/incallui/hold/res/values-hr/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_on_hold" msgid="5618253281695138626">"Na čekanju"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_on_hold">Na čekanju</string>
 </resources>
diff --git a/java/com/android/incallui/hold/res/values-hu/strings.xml b/java/com/android/incallui/hold/res/values-hu/strings.xml
index bc0d76a..0495a82 100644
--- a/java/com/android/incallui/hold/res/values-hu/strings.xml
+++ b/java/com/android/incallui/hold/res/values-hu/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_on_hold" msgid="5618253281695138626">"Várakoztatva"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_on_hold">Várakoztatva</string>
 </resources>
diff --git a/java/com/android/incallui/hold/res/values-hy/strings.xml b/java/com/android/incallui/hold/res/values-hy/strings.xml
index e3ad0cd..32d90c1 100644
--- a/java/com/android/incallui/hold/res/values-hy/strings.xml
+++ b/java/com/android/incallui/hold/res/values-hy/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_on_hold" msgid="5618253281695138626">"Սպասում"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_on_hold">Սպասում</string>
 </resources>
diff --git a/java/com/android/incallui/hold/res/values-in/strings.xml b/java/com/android/incallui/hold/res/values-in/strings.xml
index 35cf03b..d86b242 100644
--- a/java/com/android/incallui/hold/res/values-in/strings.xml
+++ b/java/com/android/incallui/hold/res/values-in/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_on_hold" msgid="5618253281695138626">"Ditahan"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_on_hold">Ditahan</string>
 </resources>
diff --git a/java/com/android/incallui/hold/res/values-is/strings.xml b/java/com/android/incallui/hold/res/values-is/strings.xml
index 1b71887..30466f7 100644
--- a/java/com/android/incallui/hold/res/values-is/strings.xml
+++ b/java/com/android/incallui/hold/res/values-is/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_on_hold" msgid="5618253281695138626">"Í bið"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_on_hold">Í bið</string>
 </resources>
diff --git a/java/com/android/incallui/hold/res/values-it/strings.xml b/java/com/android/incallui/hold/res/values-it/strings.xml
index 8c00b23..309fa41 100644
--- a/java/com/android/incallui/hold/res/values-it/strings.xml
+++ b/java/com/android/incallui/hold/res/values-it/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_on_hold" msgid="5618253281695138626">"In attesa"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_on_hold">In attesa</string>
 </resources>
diff --git a/java/com/android/incallui/hold/res/values-iw/strings.xml b/java/com/android/incallui/hold/res/values-iw/strings.xml
index 3044cbc..0aa5c4a 100644
--- a/java/com/android/incallui/hold/res/values-iw/strings.xml
+++ b/java/com/android/incallui/hold/res/values-iw/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_on_hold" msgid="5618253281695138626">"בהמתנה"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_on_hold">בהמתנה</string>
 </resources>
diff --git a/java/com/android/incallui/hold/res/values-ja/strings.xml b/java/com/android/incallui/hold/res/values-ja/strings.xml
index 99b2f5e..0a59fb3 100644
--- a/java/com/android/incallui/hold/res/values-ja/strings.xml
+++ b/java/com/android/incallui/hold/res/values-ja/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_on_hold" msgid="5618253281695138626">"保留中"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_on_hold">保留中</string>
 </resources>
diff --git a/java/com/android/incallui/hold/res/values-ka/strings.xml b/java/com/android/incallui/hold/res/values-ka/strings.xml
index cb3a918..3270b3b 100644
--- a/java/com/android/incallui/hold/res/values-ka/strings.xml
+++ b/java/com/android/incallui/hold/res/values-ka/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_on_hold" msgid="5618253281695138626">"შეყოვნების რეჟიმში"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_on_hold">შეყოვნების რეჟიმში</string>
 </resources>
diff --git a/java/com/android/incallui/hold/res/values-kk/strings.xml b/java/com/android/incallui/hold/res/values-kk/strings.xml
index 6ebcfea..955c7a2 100644
--- a/java/com/android/incallui/hold/res/values-kk/strings.xml
+++ b/java/com/android/incallui/hold/res/values-kk/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_on_hold" msgid="5618253281695138626">"Күтуде"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_on_hold">Күтуде</string>
 </resources>
diff --git a/java/com/android/incallui/hold/res/values-km/strings.xml b/java/com/android/incallui/hold/res/values-km/strings.xml
index c87741f..96ce2f4 100644
--- a/java/com/android/incallui/hold/res/values-km/strings.xml
+++ b/java/com/android/incallui/hold/res/values-km/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_on_hold" msgid="5618253281695138626">"កំពុង​រង់ចាំ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_on_hold">កំពុង​រង់ចាំ</string>
 </resources>
diff --git a/java/com/android/incallui/hold/res/values-kn/strings.xml b/java/com/android/incallui/hold/res/values-kn/strings.xml
index 74c4717..b2df898 100644
--- a/java/com/android/incallui/hold/res/values-kn/strings.xml
+++ b/java/com/android/incallui/hold/res/values-kn/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_on_hold" msgid="5618253281695138626">"ತಡೆಹಿಡಿಯಲಾಗಿದೆ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_on_hold">ತಡೆಹಿಡಿಯಲಾಗಿದೆ</string>
 </resources>
diff --git a/java/com/android/incallui/hold/res/values-ko/strings.xml b/java/com/android/incallui/hold/res/values-ko/strings.xml
index 31e90d9..8b14df2 100644
--- a/java/com/android/incallui/hold/res/values-ko/strings.xml
+++ b/java/com/android/incallui/hold/res/values-ko/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_on_hold" msgid="5618253281695138626">"대기 중"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_on_hold">대기 중</string>
 </resources>
diff --git a/java/com/android/incallui/hold/res/values-ky/strings.xml b/java/com/android/incallui/hold/res/values-ky/strings.xml
index 897a6a2..3bfeb65 100644
--- a/java/com/android/incallui/hold/res/values-ky/strings.xml
+++ b/java/com/android/incallui/hold/res/values-ky/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_on_hold" msgid="5618253281695138626">"Кармап турууда"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_on_hold">Кармап турууда</string>
 </resources>
diff --git a/java/com/android/incallui/hold/res/values-lo/strings.xml b/java/com/android/incallui/hold/res/values-lo/strings.xml
index 35f9756..d7ac127 100644
--- a/java/com/android/incallui/hold/res/values-lo/strings.xml
+++ b/java/com/android/incallui/hold/res/values-lo/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_on_hold" msgid="5618253281695138626">"ຖືສາຍລໍຖ້າ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_on_hold">ຖືສາຍລໍຖ້າ</string>
 </resources>
diff --git a/java/com/android/incallui/hold/res/values-lt/strings.xml b/java/com/android/incallui/hold/res/values-lt/strings.xml
index f7d98c1..08148dc 100644
--- a/java/com/android/incallui/hold/res/values-lt/strings.xml
+++ b/java/com/android/incallui/hold/res/values-lt/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_on_hold" msgid="5618253281695138626">"Sulaikytas"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_on_hold">Sulaikytas</string>
 </resources>
diff --git a/java/com/android/incallui/hold/res/values-lv/strings.xml b/java/com/android/incallui/hold/res/values-lv/strings.xml
index 16d4e35..f24a270 100644
--- a/java/com/android/incallui/hold/res/values-lv/strings.xml
+++ b/java/com/android/incallui/hold/res/values-lv/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_on_hold" msgid="5618253281695138626">"Aizturēts"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_on_hold">Aizturēts</string>
 </resources>
diff --git a/java/com/android/incallui/hold/res/values-mk/strings.xml b/java/com/android/incallui/hold/res/values-mk/strings.xml
index c31a240..a2f958b 100644
--- a/java/com/android/incallui/hold/res/values-mk/strings.xml
+++ b/java/com/android/incallui/hold/res/values-mk/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_on_hold" msgid="5618253281695138626">"На чекање"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_on_hold">На чекање</string>
 </resources>
diff --git a/java/com/android/incallui/hold/res/values-ml/strings.xml b/java/com/android/incallui/hold/res/values-ml/strings.xml
index 97d88b0..99f53aa 100644
--- a/java/com/android/incallui/hold/res/values-ml/strings.xml
+++ b/java/com/android/incallui/hold/res/values-ml/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_on_hold" msgid="5618253281695138626">"ഹോള്‍ഡിലാണ്"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_on_hold">ഹോള്‍ഡിലാണ്</string>
 </resources>
diff --git a/java/com/android/incallui/hold/res/values-mn/strings.xml b/java/com/android/incallui/hold/res/values-mn/strings.xml
index 8f757c6..8e14cae 100644
--- a/java/com/android/incallui/hold/res/values-mn/strings.xml
+++ b/java/com/android/incallui/hold/res/values-mn/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_on_hold" msgid="5618253281695138626">"Хүлээлгэнд байгаа"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_on_hold">Хүлээлгэнд байгаа</string>
 </resources>
diff --git a/java/com/android/incallui/hold/res/values-mr/strings.xml b/java/com/android/incallui/hold/res/values-mr/strings.xml
index 8358ba0..3c57cff 100644
--- a/java/com/android/incallui/hold/res/values-mr/strings.xml
+++ b/java/com/android/incallui/hold/res/values-mr/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_on_hold" msgid="5618253281695138626">"होल्ड वर"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_on_hold">होल्ड वर</string>
 </resources>
diff --git a/java/com/android/incallui/hold/res/values-ms/strings.xml b/java/com/android/incallui/hold/res/values-ms/strings.xml
index c19655b..f01a535 100644
--- a/java/com/android/incallui/hold/res/values-ms/strings.xml
+++ b/java/com/android/incallui/hold/res/values-ms/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_on_hold" msgid="5618253281695138626">"Panggilan ditahan"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_on_hold">Panggilan ditahan</string>
 </resources>
diff --git a/java/com/android/incallui/hold/res/values-my/strings.xml b/java/com/android/incallui/hold/res/values-my/strings.xml
index dc3191f..19f7e42 100644
--- a/java/com/android/incallui/hold/res/values-my/strings.xml
+++ b/java/com/android/incallui/hold/res/values-my/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_on_hold" msgid="5618253281695138626">"ဖုန်းကိုင်ထားသည်"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_on_hold">ဖုန်းကိုင်ထားသည်</string>
 </resources>
diff --git a/java/com/android/incallui/hold/res/values-nb/strings.xml b/java/com/android/incallui/hold/res/values-nb/strings.xml
index 4813a6a..03fb68e 100644
--- a/java/com/android/incallui/hold/res/values-nb/strings.xml
+++ b/java/com/android/incallui/hold/res/values-nb/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_on_hold" msgid="5618253281695138626">"På vent"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_on_hold">På vent</string>
 </resources>
diff --git a/java/com/android/incallui/hold/res/values-ne/strings.xml b/java/com/android/incallui/hold/res/values-ne/strings.xml
index b240af7..8328d0c 100644
--- a/java/com/android/incallui/hold/res/values-ne/strings.xml
+++ b/java/com/android/incallui/hold/res/values-ne/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_on_hold" msgid="5618253281695138626">"होल्डमा छ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_on_hold">होल्डमा छ</string>
 </resources>
diff --git a/java/com/android/incallui/hold/res/values-nl/strings.xml b/java/com/android/incallui/hold/res/values-nl/strings.xml
index 13ed716..48acd6e 100644
--- a/java/com/android/incallui/hold/res/values-nl/strings.xml
+++ b/java/com/android/incallui/hold/res/values-nl/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_on_hold" msgid="5618253281695138626">"In de wacht"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_on_hold">In de wacht</string>
 </resources>
diff --git a/java/com/android/incallui/hold/res/values-no/strings.xml b/java/com/android/incallui/hold/res/values-no/strings.xml
index 4813a6a..03fb68e 100644
--- a/java/com/android/incallui/hold/res/values-no/strings.xml
+++ b/java/com/android/incallui/hold/res/values-no/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_on_hold" msgid="5618253281695138626">"På vent"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_on_hold">På vent</string>
 </resources>
diff --git a/java/com/android/incallui/hold/res/values-pa/strings.xml b/java/com/android/incallui/hold/res/values-pa/strings.xml
index 50c4878..5570658 100644
--- a/java/com/android/incallui/hold/res/values-pa/strings.xml
+++ b/java/com/android/incallui/hold/res/values-pa/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_on_hold" msgid="5618253281695138626">"ਰੋਕ ਕੇ ਰੱਖੀ ਗਈ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_on_hold">ਰੋਕ ਕੇ ਰੱਖੀ ਗਈ</string>
 </resources>
diff --git a/java/com/android/incallui/hold/res/values-pl/strings.xml b/java/com/android/incallui/hold/res/values-pl/strings.xml
index 2127455..bfebf04 100644
--- a/java/com/android/incallui/hold/res/values-pl/strings.xml
+++ b/java/com/android/incallui/hold/res/values-pl/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_on_hold" msgid="5618253281695138626">"Oczekujące"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_on_hold">Oczekujące</string>
 </resources>
diff --git a/java/com/android/incallui/hold/res/values-pt-rBR/strings.xml b/java/com/android/incallui/hold/res/values-pt-rBR/strings.xml
index 3649cc0..0d17db2 100644
--- a/java/com/android/incallui/hold/res/values-pt-rBR/strings.xml
+++ b/java/com/android/incallui/hold/res/values-pt-rBR/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_on_hold" msgid="5618253281695138626">"Em espera"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_on_hold">Em espera</string>
 </resources>
diff --git a/java/com/android/incallui/hold/res/values-pt-rPT/strings.xml b/java/com/android/incallui/hold/res/values-pt-rPT/strings.xml
index 3649cc0..0d17db2 100644
--- a/java/com/android/incallui/hold/res/values-pt-rPT/strings.xml
+++ b/java/com/android/incallui/hold/res/values-pt-rPT/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_on_hold" msgid="5618253281695138626">"Em espera"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_on_hold">Em espera</string>
 </resources>
diff --git a/java/com/android/incallui/hold/res/values-pt/strings.xml b/java/com/android/incallui/hold/res/values-pt/strings.xml
index 3649cc0..0d17db2 100644
--- a/java/com/android/incallui/hold/res/values-pt/strings.xml
+++ b/java/com/android/incallui/hold/res/values-pt/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_on_hold" msgid="5618253281695138626">"Em espera"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_on_hold">Em espera</string>
 </resources>
diff --git a/java/com/android/incallui/hold/res/values-ro/strings.xml b/java/com/android/incallui/hold/res/values-ro/strings.xml
index bed20bb..df5eb51 100644
--- a/java/com/android/incallui/hold/res/values-ro/strings.xml
+++ b/java/com/android/incallui/hold/res/values-ro/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_on_hold" msgid="5618253281695138626">"În așteptare"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_on_hold">În așteptare</string>
 </resources>
diff --git a/java/com/android/incallui/hold/res/values-ru/strings.xml b/java/com/android/incallui/hold/res/values-ru/strings.xml
index 216975f..673310a 100644
--- a/java/com/android/incallui/hold/res/values-ru/strings.xml
+++ b/java/com/android/incallui/hold/res/values-ru/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_on_hold" msgid="5618253281695138626">"На удержании"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_on_hold">На удержании</string>
 </resources>
diff --git a/java/com/android/incallui/hold/res/values-si/strings.xml b/java/com/android/incallui/hold/res/values-si/strings.xml
index 168a556..64d9e85 100644
--- a/java/com/android/incallui/hold/res/values-si/strings.xml
+++ b/java/com/android/incallui/hold/res/values-si/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_on_hold" msgid="5618253281695138626">"රඳවා ගත්"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_on_hold">රඳවා ගත්</string>
 </resources>
diff --git a/java/com/android/incallui/hold/res/values-sk/strings.xml b/java/com/android/incallui/hold/res/values-sk/strings.xml
index a4c39e9..332b780 100644
--- a/java/com/android/incallui/hold/res/values-sk/strings.xml
+++ b/java/com/android/incallui/hold/res/values-sk/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_on_hold" msgid="5618253281695138626">"Podržaný hovor"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_on_hold">Podržaný hovor</string>
 </resources>
diff --git a/java/com/android/incallui/hold/res/values-sl/strings.xml b/java/com/android/incallui/hold/res/values-sl/strings.xml
index f342505..b13054b 100644
--- a/java/com/android/incallui/hold/res/values-sl/strings.xml
+++ b/java/com/android/incallui/hold/res/values-sl/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_on_hold" msgid="5618253281695138626">"Zadržano"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_on_hold">Zadržano</string>
 </resources>
diff --git a/java/com/android/incallui/hold/res/values-sq/strings.xml b/java/com/android/incallui/hold/res/values-sq/strings.xml
index c750417..c40fa3a 100644
--- a/java/com/android/incallui/hold/res/values-sq/strings.xml
+++ b/java/com/android/incallui/hold/res/values-sq/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_on_hold" msgid="5618253281695138626">"Në pritje"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_on_hold">Në pritje</string>
 </resources>
diff --git a/java/com/android/incallui/hold/res/values-sr/strings.xml b/java/com/android/incallui/hold/res/values-sr/strings.xml
index 930ed04..cddff9d 100644
--- a/java/com/android/incallui/hold/res/values-sr/strings.xml
+++ b/java/com/android/incallui/hold/res/values-sr/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_on_hold" msgid="5618253281695138626">"На чекању"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_on_hold">На чекању</string>
 </resources>
diff --git a/java/com/android/incallui/hold/res/values-sv/strings.xml b/java/com/android/incallui/hold/res/values-sv/strings.xml
index 6bcb567..cfee4c2 100644
--- a/java/com/android/incallui/hold/res/values-sv/strings.xml
+++ b/java/com/android/incallui/hold/res/values-sv/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_on_hold" msgid="5618253281695138626">"Parkerat"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_on_hold">Parkerat</string>
 </resources>
diff --git a/java/com/android/incallui/hold/res/values-sw/strings.xml b/java/com/android/incallui/hold/res/values-sw/strings.xml
index 5e6c108..a00efd6 100644
--- a/java/com/android/incallui/hold/res/values-sw/strings.xml
+++ b/java/com/android/incallui/hold/res/values-sw/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_on_hold" msgid="5618253281695138626">"Imesitishwa"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_on_hold">Imesitishwa</string>
 </resources>
diff --git a/java/com/android/incallui/hold/res/values-ta/strings.xml b/java/com/android/incallui/hold/res/values-ta/strings.xml
index 7c9ecb2..0d1d687 100644
--- a/java/com/android/incallui/hold/res/values-ta/strings.xml
+++ b/java/com/android/incallui/hold/res/values-ta/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_on_hold" msgid="5618253281695138626">"ஹோல்டில் உள்ளது"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_on_hold">ஹோல்டில் உள்ளது</string>
 </resources>
diff --git a/java/com/android/incallui/hold/res/values-te/strings.xml b/java/com/android/incallui/hold/res/values-te/strings.xml
index a48a4c0..c5572d3 100644
--- a/java/com/android/incallui/hold/res/values-te/strings.xml
+++ b/java/com/android/incallui/hold/res/values-te/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_on_hold" msgid="5618253281695138626">"హోల్డ్‌లో ఉంది"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_on_hold">హోల్డ్‌లో ఉంది</string>
 </resources>
diff --git a/java/com/android/incallui/hold/res/values-th/strings.xml b/java/com/android/incallui/hold/res/values-th/strings.xml
index 25b7f9f..022eedf 100644
--- a/java/com/android/incallui/hold/res/values-th/strings.xml
+++ b/java/com/android/incallui/hold/res/values-th/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_on_hold" msgid="5618253281695138626">"รอสาย"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_on_hold">รอสาย</string>
 </resources>
diff --git a/java/com/android/incallui/hold/res/values-tl/strings.xml b/java/com/android/incallui/hold/res/values-tl/strings.xml
index dbf7ace..bb53acf 100644
--- a/java/com/android/incallui/hold/res/values-tl/strings.xml
+++ b/java/com/android/incallui/hold/res/values-tl/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_on_hold" msgid="5618253281695138626">"Naka-hold"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_on_hold">Naka-hold</string>
 </resources>
diff --git a/java/com/android/incallui/hold/res/values-tr/strings.xml b/java/com/android/incallui/hold/res/values-tr/strings.xml
index 71820bd..fbde365 100644
--- a/java/com/android/incallui/hold/res/values-tr/strings.xml
+++ b/java/com/android/incallui/hold/res/values-tr/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_on_hold" msgid="5618253281695138626">"Beklemede"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_on_hold">Beklemede</string>
 </resources>
diff --git a/java/com/android/incallui/hold/res/values-uk/strings.xml b/java/com/android/incallui/hold/res/values-uk/strings.xml
index bff9090..a900e10 100644
--- a/java/com/android/incallui/hold/res/values-uk/strings.xml
+++ b/java/com/android/incallui/hold/res/values-uk/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_on_hold" msgid="5618253281695138626">"Очікування"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_on_hold">Очікування</string>
 </resources>
diff --git a/java/com/android/incallui/hold/res/values-ur/strings.xml b/java/com/android/incallui/hold/res/values-ur/strings.xml
index f8ef439..1229f13 100644
--- a/java/com/android/incallui/hold/res/values-ur/strings.xml
+++ b/java/com/android/incallui/hold/res/values-ur/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_on_hold" msgid="5618253281695138626">"ہولڈ پر"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_on_hold">ہولڈ پر</string>
 </resources>
diff --git a/java/com/android/incallui/hold/res/values-uz/strings.xml b/java/com/android/incallui/hold/res/values-uz/strings.xml
index e4e81d7..8166836 100644
--- a/java/com/android/incallui/hold/res/values-uz/strings.xml
+++ b/java/com/android/incallui/hold/res/values-uz/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_on_hold" msgid="5618253281695138626">"Kutish rejimida"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_on_hold">Kutish rejimida</string>
 </resources>
diff --git a/java/com/android/incallui/hold/res/values-vi/strings.xml b/java/com/android/incallui/hold/res/values-vi/strings.xml
index 3d850a3..9c6979d 100644
--- a/java/com/android/incallui/hold/res/values-vi/strings.xml
+++ b/java/com/android/incallui/hold/res/values-vi/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_on_hold" msgid="5618253281695138626">"Đang chờ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_on_hold">Đang chờ</string>
 </resources>
diff --git a/java/com/android/incallui/hold/res/values-zh-rCN/strings.xml b/java/com/android/incallui/hold/res/values-zh-rCN/strings.xml
index a055213..3835840 100644
--- a/java/com/android/incallui/hold/res/values-zh-rCN/strings.xml
+++ b/java/com/android/incallui/hold/res/values-zh-rCN/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_on_hold" msgid="5618253281695138626">"保持"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_on_hold">保持</string>
 </resources>
diff --git a/java/com/android/incallui/hold/res/values-zh-rHK/strings.xml b/java/com/android/incallui/hold/res/values-zh-rHK/strings.xml
index 41e298f..fb2d0e1 100644
--- a/java/com/android/incallui/hold/res/values-zh-rHK/strings.xml
+++ b/java/com/android/incallui/hold/res/values-zh-rHK/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_on_hold" msgid="5618253281695138626">"保留通話"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_on_hold">保留通話</string>
 </resources>
diff --git a/java/com/android/incallui/hold/res/values-zh-rTW/strings.xml b/java/com/android/incallui/hold/res/values-zh-rTW/strings.xml
index d8d1684..5a0c531 100644
--- a/java/com/android/incallui/hold/res/values-zh-rTW/strings.xml
+++ b/java/com/android/incallui/hold/res/values-zh-rTW/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_on_hold" msgid="5618253281695138626">"保留"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_on_hold">保留</string>
 </resources>
diff --git a/java/com/android/incallui/hold/res/values-zu/strings.xml b/java/com/android/incallui/hold/res/values-zu/strings.xml
index 521ec5f..62d8503 100644
--- a/java/com/android/incallui/hold/res/values-zu/strings.xml
+++ b/java/com/android/incallui/hold/res/values-zu/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_on_hold" msgid="5618253281695138626">"Ibambile"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_on_hold">Ibambile</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/ButtonChooserFactory.java b/java/com/android/incallui/incall/impl/ButtonChooserFactory.java
index 2a08940..757d813 100644
--- a/java/com/android/incallui/incall/impl/ButtonChooserFactory.java
+++ b/java/com/android/incallui/incall/impl/ButtonChooserFactory.java
@@ -57,6 +57,9 @@
     mapping.put(
         InCallButtonIds.BUTTON_MANAGE_VOICE_CONFERENCE,
         MappingInfo.builder(4).setSlotOrder(0).build());
+    // RTT call is only supported on IMS and WiFi.
+    mapping.put(
+        InCallButtonIds.BUTTON_UPGRADE_TO_RTT, MappingInfo.builder(3).setSlotOrder(0).build());
     mapping.put(
         InCallButtonIds.BUTTON_UPGRADE_TO_VIDEO, MappingInfo.builder(4).setSlotOrder(10).build());
     mapping.put(
@@ -114,7 +117,7 @@
     mapping.put(InCallButtonIds.BUTTON_MUTE, MappingInfo.builder(0).build());
     mapping.put(InCallButtonIds.BUTTON_DIALPAD, MappingInfo.builder(1).build());
     mapping.put(InCallButtonIds.BUTTON_AUDIO, MappingInfo.builder(2).build());
-    mapping.put(InCallButtonIds.BUTTON_MERGE, MappingInfo.builder(3).setSlotOrder(0).build());
+    mapping.put(InCallButtonIds.BUTTON_MERGE, MappingInfo.builder(3).setSlotOrder(5).build());
     mapping.put(InCallButtonIds.BUTTON_ADD_CALL, MappingInfo.builder(3).build());
     mapping.put(InCallButtonIds.BUTTON_SWAP_SIM, MappingInfo.builder(4).build());
     return mapping;
diff --git a/java/com/android/incallui/incall/impl/ButtonController.java b/java/com/android/incallui/incall/impl/ButtonController.java
index 5e37a49..328ebbe 100644
--- a/java/com/android/incallui/incall/impl/ButtonController.java
+++ b/java/com/android/incallui/incall/impl/ButtonController.java
@@ -31,7 +31,6 @@
 import com.android.incallui.incall.protocol.InCallButtonUiDelegate;
 import com.android.incallui.incall.protocol.InCallScreenDelegate;
 import com.android.incallui.speakerbuttonlogic.SpeakerButtonInfo;
-import com.android.incallui.speakerbuttonlogic.SpeakerButtonInfo.IconSize;
 
 /** Manages a single button. */
 interface ButtonController {
@@ -293,7 +292,7 @@
           R.string.incall_content_description_muted,
           R.string.incall_content_description_unmuted,
           R.string.incall_label_mute,
-          R.drawable.quantum_ic_mic_off_white_36);
+          R.drawable.quantum_ic_mic_off_vd_theme_24);
     }
 
     @Override
@@ -312,11 +311,11 @@
     private CheckableLabeledButton button;
 
     @StringRes private int label = R.string.incall_label_speaker;
-    @DrawableRes private int icon = R.drawable.quantum_ic_volume_up_white_36;
-    private boolean checkable;
+    @DrawableRes private int icon = R.drawable.quantum_ic_volume_up_vd_theme_24;
+    private boolean nonBluetoothMode;
     private CharSequence contentDescription;
-    private CharSequence checkedContentDescription;
-    private CharSequence uncheckedContentDescription;
+    private CharSequence isOnContentDescription;
+    private CharSequence isOffContentDescription;
 
     public SpeakerButtonController(@NonNull InCallButtonUiDelegate delegate) {
       this.delegate = delegate;
@@ -368,31 +367,31 @@
         button.setEnabled(isEnabled && isAllowed);
         button.setVisibility(View.VISIBLE);
         button.setChecked(isChecked);
-        button.setOnClickListener(checkable ? null : this);
-        button.setOnCheckedChangeListener(checkable ? this : null);
+        button.setOnClickListener(nonBluetoothMode ? null : this);
+        button.setOnCheckedChangeListener(nonBluetoothMode ? this : null);
         button.setLabelText(label);
         button.setIconDrawable(icon);
         button.setContentDescription(
-            isChecked ? checkedContentDescription : uncheckedContentDescription);
-        button.setShouldShowMoreIndicator(!checkable);
+            (nonBluetoothMode && !isChecked) ? isOffContentDescription : isOnContentDescription);
+        button.setShouldShowMoreIndicator(!nonBluetoothMode);
       }
     }
 
     public void setAudioState(CallAudioState audioState) {
-      SpeakerButtonInfo info = new SpeakerButtonInfo(audioState, IconSize.SIZE_36_DP);
+      SpeakerButtonInfo info = new SpeakerButtonInfo(audioState);
 
-      checkable = info.checkable;
+      nonBluetoothMode = info.nonBluetoothMode;
       isChecked = info.isChecked;
       label = info.label;
       icon = info.icon;
       @StringRes int contentDescriptionResId = info.contentDescription;
 
       contentDescription = delegate.getContext().getText(contentDescriptionResId);
-      checkedContentDescription =
+      isOnContentDescription =
           TextUtils.concat(
               contentDescription,
               delegate.getContext().getText(R.string.incall_talkback_speaker_on));
-      uncheckedContentDescription =
+      isOffContentDescription =
           TextUtils.concat(
               contentDescription,
               delegate.getContext().getText(R.string.incall_talkback_speaker_off));
@@ -407,7 +406,7 @@
     @Override
     public void onCheckedChanged(CheckableLabeledButton checkableLabeledButton, boolean isChecked) {
       checkableLabeledButton.setContentDescription(
-          isChecked ? checkedContentDescription : uncheckedContentDescription);
+          isChecked ? isOnContentDescription : isOffContentDescription);
       delegate.toggleSpeakerphone();
     }
   }
@@ -421,7 +420,7 @@
           0,
           0,
           R.string.incall_label_dialpad,
-          R.drawable.quantum_ic_dialpad_white_36);
+          R.drawable.quantum_ic_dialpad_vd_theme_24);
     }
 
     @Override
@@ -439,7 +438,7 @@
           R.string.incall_content_description_unhold,
           R.string.incall_content_description_hold,
           R.string.incall_label_hold,
-          R.drawable.quantum_ic_pause_white_36);
+          R.drawable.quantum_ic_pause_vd_theme_24);
     }
 
     @Override
@@ -474,7 +473,7 @@
           InCallButtonIds.BUTTON_SWAP,
           R.string.incall_content_description_swap_calls,
           R.string.incall_label_swap,
-          R.drawable.quantum_ic_swap_calls_white_36);
+          R.drawable.quantum_ic_swap_calls_vd_theme_24);
       Assert.isNotNull(delegate);
     }
 
@@ -492,7 +491,7 @@
           InCallButtonIds.BUTTON_MERGE,
           R.string.incall_content_description_merge_calls,
           R.string.incall_label_merge,
-          R.drawable.quantum_ic_call_merge_white_36);
+          R.drawable.quantum_ic_call_merge_vd_theme_24);
       Assert.isNotNull(delegate);
     }
 
@@ -510,7 +509,7 @@
           InCallButtonIds.BUTTON_UPGRADE_TO_VIDEO,
           0,
           R.string.incall_label_videocall,
-          R.drawable.quantum_ic_videocam_white_36);
+          R.drawable.quantum_ic_videocam_vd_theme_24);
       Assert.isNotNull(delegate);
     }
 
@@ -520,6 +519,24 @@
     }
   }
 
+  class UpgradeToRttButtonController extends SimpleNonCheckableButtonController {
+
+    public UpgradeToRttButtonController(@NonNull InCallButtonUiDelegate delegate) {
+      super(
+          delegate,
+          InCallButtonIds.BUTTON_UPGRADE_TO_RTT,
+          0,
+          R.string.incall_label_rttcall,
+          R.drawable.quantum_ic_rtt_vd_theme_24);
+      Assert.isNotNull(delegate);
+    }
+
+    @Override
+    public void onClick(View view) {
+      delegate.changeToRttClicked();
+    }
+  }
+
   class ManageConferenceButtonController extends SimpleNonCheckableButtonController {
 
     private final InCallScreenDelegate inCallScreenDelegate;
@@ -530,7 +547,7 @@
           InCallButtonIds.BUTTON_MANAGE_VOICE_CONFERENCE,
           R.string.a11y_description_incall_label_manage_content,
           R.string.incall_label_manage,
-          R.drawable.quantum_ic_group_white_36);
+          R.drawable.quantum_ic_group_vd_theme_24);
       Assert.isNotNull(inCallScreenDelegate);
       this.inCallScreenDelegate = inCallScreenDelegate;
     }
@@ -551,7 +568,7 @@
           InCallButtonIds.BUTTON_SWITCH_TO_SECONDARY,
           R.string.incall_content_description_swap_calls,
           R.string.incall_label_swap,
-          R.drawable.quantum_ic_swap_calls_white_36);
+          R.drawable.quantum_ic_swap_calls_vd_theme_24);
       Assert.isNotNull(inCallScreenDelegate);
       this.inCallScreenDelegate = inCallScreenDelegate;
     }
diff --git a/java/com/android/incallui/incall/impl/CheckableLabeledButton.java b/java/com/android/incallui/incall/impl/CheckableLabeledButton.java
index ca018ac..bfc2781 100644
--- a/java/com/android/incallui/incall/impl/CheckableLabeledButton.java
+++ b/java/com/android/incallui/incall/impl/CheckableLabeledButton.java
@@ -34,7 +34,6 @@
 import android.view.SoundEffectConstants;
 import android.widget.Checkable;
 import android.widget.ImageView;
-import android.widget.ImageView.ScaleType;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
@@ -68,8 +67,10 @@
     CharSequence labelText;
     boolean enabled;
 
-    backgroundMore = getResources().getDrawable(R.drawable.incall_button_background_more, null);
-    background = getResources().getDrawable(R.drawable.incall_button_background, null);
+    backgroundMore =
+        getResources().getDrawable(R.drawable.incall_button_background_more, context.getTheme());
+    background =
+        getResources().getDrawable(R.drawable.incall_button_background, context.getTheme());
 
     TypedArray typedArray =
         context.obtainStyledAttributes(attrs, R.styleable.CheckableLabeledButton);
@@ -82,18 +83,22 @@
     setPadding(paddingSize, paddingSize, paddingSize, paddingSize);
 
     int iconSize = getResources().getDimensionPixelSize(R.dimen.incall_labeled_button_size);
+    int imageSize = getResources().getDimensionPixelSize(R.dimen.incall_labeled_button_icon_size);
+    int iconPadding = (iconSize - imageSize) / 2;
 
     iconView = new ImageView(context, null, android.R.style.Widget_Material_Button_Colored);
     LayoutParams iconParams = generateDefaultLayoutParams();
     iconParams.width = iconSize;
     iconParams.height = iconSize;
     iconView.setLayoutParams(iconParams);
-    iconView.setScaleType(ScaleType.CENTER_INSIDE);
+    iconView.setPadding(iconPadding, iconPadding, iconPadding, iconPadding);
     iconView.setImageDrawable(icon);
     iconView.setImageTintMode(Mode.SRC_IN);
-    iconView.setImageTintList(getResources().getColorStateList(R.color.incall_button_icon, null));
+    iconView.setImageTintList(
+        getResources().getColorStateList(R.color.incall_button_icon, context.getTheme()));
 
-    iconView.setBackground(getResources().getDrawable(R.drawable.incall_button_background, null));
+    iconView.setBackground(
+        getResources().getDrawable(R.drawable.incall_button_background, context.getTheme()));
     iconView.setDuplicateParentStateEnabled(true);
     iconView.setElevation(getResources().getDimension(R.dimen.incall_button_elevation));
     iconView.setStateListAnimator(
diff --git a/java/com/android/incallui/incall/impl/InCallFragment.java b/java/com/android/incallui/incall/impl/InCallFragment.java
index 5f558a4..7f20b40 100644
--- a/java/com/android/incallui/incall/impl/InCallFragment.java
+++ b/java/com/android/incallui/incall/impl/InCallFragment.java
@@ -17,10 +17,10 @@
 package com.android.incallui.incall.impl;
 
 import android.Manifest.permission;
+import android.annotation.SuppressLint;
+import android.app.Activity;
 import android.content.Context;
 import android.content.pm.PackageManager;
-import android.os.Build.VERSION;
-import android.os.Build.VERSION_CODES;
 import android.os.Bundle;
 import android.os.Handler;
 import android.support.annotation.ColorInt;
@@ -31,10 +31,13 @@
 import android.support.v4.content.ContextCompat;
 import android.telecom.CallAudioState;
 import android.telephony.TelephonyManager;
+import android.transition.TransitionManager;
 import android.view.LayoutInflater;
 import android.view.View;
+import android.view.View.OnAttachStateChangeListener;
 import android.view.View.OnClickListener;
 import android.view.ViewGroup;
+import android.view.Window;
 import android.view.accessibility.AccessibilityEvent;
 import android.widget.ImageView;
 import android.widget.RelativeLayout;
@@ -42,18 +45,17 @@
 import com.android.dialer.common.Assert;
 import com.android.dialer.common.FragmentUtils;
 import com.android.dialer.common.LogUtil;
-import com.android.dialer.compat.ActivityCompat;
 import com.android.dialer.logging.DialerImpression;
 import com.android.dialer.logging.Logger;
 import com.android.dialer.multimedia.MultimediaData;
 import com.android.dialer.strictmode.StrictModeUtils;
-import com.android.dialer.util.ViewUtil;
 import com.android.dialer.widget.LockableViewPager;
 import com.android.incallui.audioroute.AudioRouteSelectorDialogFragment;
 import com.android.incallui.audioroute.AudioRouteSelectorDialogFragment.AudioRouteSelectorPresenter;
 import com.android.incallui.contactgrid.ContactGridManager;
 import com.android.incallui.hold.OnHoldFragment;
 import com.android.incallui.incall.impl.ButtonController.SpeakerButtonController;
+import com.android.incallui.incall.impl.ButtonController.UpgradeToRttButtonController;
 import com.android.incallui.incall.impl.InCallButtonGridFragment.OnButtonGridCreatedListener;
 import com.android.incallui.incall.protocol.InCallButtonIds;
 import com.android.incallui.incall.protocol.InCallButtonIdsExtension;
@@ -114,7 +116,8 @@
         || id == InCallButtonIds.BUTTON_ADD_CALL
         || id == InCallButtonIds.BUTTON_MERGE
         || id == InCallButtonIds.BUTTON_MANAGE_VOICE_CONFERENCE
-        || id == InCallButtonIds.BUTTON_SWAP_SIM;
+        || id == InCallButtonIds.BUTTON_SWAP_SIM
+        || id == InCallButtonIds.BUTTON_UPGRADE_TO_RTT;
   }
 
   @Override
@@ -139,11 +142,13 @@
 
   @Nullable
   @Override
+  @SuppressLint("MissingPermission")
   public View onCreateView(
       @NonNull LayoutInflater layoutInflater,
       @Nullable ViewGroup viewGroup,
       @Nullable Bundle bundle) {
     LogUtil.i("InCallFragment.onCreateView", null);
+    getActivity().setTheme(R.style.Theme_InCallScreen);
     // Bypass to avoid StrictModeResourceMismatchViolation
     final View view =
         StrictModeUtils.bypass(
@@ -154,7 +159,7 @@
             (ImageView) view.findViewById(R.id.contactgrid_avatar),
             getResources().getDimensionPixelSize(R.dimen.incall_avatar_size),
             true /* showAnonymousAvatar */);
-    contactGridManager.onMultiWindowModeChanged(ActivityCompat.isInMultiWindowMode(getActivity()));
+    contactGridManager.onMultiWindowModeChanged(getActivity().isInMultiWindowMode());
 
     paginator = (InCallPaginator) view.findViewById(R.id.incall_paginator);
     pager = (LockableViewPager) view.findViewById(R.id.incall_pager);
@@ -171,17 +176,30 @@
         != PackageManager.PERMISSION_GRANTED) {
       voiceNetworkType = TelephonyManager.NETWORK_TYPE_UNKNOWN;
     } else {
-
       voiceNetworkType =
-          VERSION.SDK_INT >= VERSION_CODES.N
-              ? getContext().getSystemService(TelephonyManager.class).getVoiceNetworkType()
-              : TelephonyManager.NETWORK_TYPE_UNKNOWN;
+          getContext().getSystemService(TelephonyManager.class).getVoiceNetworkType();
     }
     // TODO(a bug): Change to use corresponding phone type used for current call.
     phoneType = getContext().getSystemService(TelephonyManager.class).getPhoneType();
-    View space = view.findViewById(R.id.navigation_bar_background);
-    space.getLayoutParams().height = ViewUtil.getNavigationBarHeight(getContext());
 
+    // Workaround to adjust padding for status bar and navigation bar since fitsSystemWindows
+    // doesn't work well when switching with other fragments.
+    view.addOnAttachStateChangeListener(
+        new OnAttachStateChangeListener() {
+          @Override
+          public void onViewAttachedToWindow(View v) {
+            View container = v.findViewById(R.id.incall_ui_container);
+            int topInset = v.getRootWindowInsets().getSystemWindowInsetTop();
+            int bottomInset = v.getRootWindowInsets().getSystemWindowInsetBottom();
+            if (topInset != container.getPaddingTop()) {
+              TransitionManager.beginDelayedTransition(((ViewGroup) container.getParent()));
+              container.setPadding(0, topInset, 0, bottomInset);
+            }
+          }
+
+          @Override
+          public void onViewDetachedFromWindow(View v) {}
+        });
     return view;
   }
 
@@ -210,6 +228,7 @@
     buttonControllers.add(new ButtonController.SwapSimButtonController(inCallButtonUiDelegate));
     buttonControllers.add(
         new ButtonController.UpgradeToVideoButtonController(inCallButtonUiDelegate));
+    buttonControllers.add(new UpgradeToRttButtonController(inCallButtonUiDelegate));
     buttonControllers.add(
         new ButtonController.ManageConferenceButtonController(inCallScreenDelegate));
     buttonControllers.add(
@@ -376,6 +395,11 @@
       // Update the Android Button's state to isShowing.
       inCallButtonGridFragment.onInCallScreenDialpadVisibilityChange(isShowing);
     }
+    Activity activity = getActivity();
+    Window window = activity.getWindow();
+    window.setNavigationBarColor(
+        activity.getColor(
+            isShowing ? android.R.color.background_dark : android.R.color.transparent));
   }
 
   @Override
diff --git a/java/com/android/incallui/incall/impl/res/color/incall_button_icon.xml b/java/com/android/incallui/incall/impl/res/color/incall_button_icon.xml
index 8e9120b..000525f 100644
--- a/java/com/android/incallui/incall/impl/res/color/incall_button_icon.xml
+++ b/java/com/android/incallui/incall/impl/res/color/incall_button_icon.xml
@@ -16,6 +16,6 @@
   -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-  <item android:color="#FF1C3AA9" android:state_checked="true"/>
-  <item android:color="#FFFFFFFF"/>
+  <item android:color="?android:attr/colorPrimaryDark" android:state_checked="true"/>
+  <item android:color="?android:attr/textColorPrimary"/>
 </selector>
diff --git a/java/com/android/incallui/incall/impl/res/drawable/incall_button_background_more.xml b/java/com/android/incallui/incall/impl/res/drawable/incall_button_background_more.xml
index 6755f0f..8faa35b 100644
--- a/java/com/android/incallui/incall/impl/res/drawable/incall_button_background_more.xml
+++ b/java/com/android/incallui/incall/impl/res/drawable/incall_button_background_more.xml
@@ -1,4 +1,18 @@
-<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2018 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
   <item>
     <selector>
@@ -25,6 +39,7 @@
   <item>
     <bitmap
       android:gravity="end"
+      android:tint="@color/incall_button_icon"
       android:src="@drawable/quantum_ic_arrow_drop_down_white_18"/>
   </item>
 </layer-list>
diff --git a/java/com/android/incallui/incall/impl/res/layout/frag_incall_voice.xml b/java/com/android/incallui/incall/impl/res/layout/frag_incall_voice.xml
index ccec8a4..9cc599d 100644
--- a/java/com/android/incallui/incall/impl/res/layout/frag_incall_voice.xml
+++ b/java/com/android/incallui/incall/impl/res/layout/frag_incall_voice.xml
@@ -22,9 +22,7 @@
     android:layout_height="match_parent">
 
   <RelativeLayout
-      xmlns:android="http://schemas.android.com/apk/res/android"
-      xmlns:app="http://schemas.android.com/apk/res-auto"
-      xmlns:tools="http://schemas.android.com/tools"
+      android:id="@+id/incall_ui_container"
       android:layout_width="match_parent"
       android:layout_height="match_parent"
       android:clipChildren="false"
@@ -127,11 +125,4 @@
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
       android:layout_gravity="top"/>
-  <FrameLayout
-      android:id="@+id/navigation_bar_background"
-      android:layout_width="match_parent"
-      android:layout_height="0dp"
-      android:layout_gravity="bottom"
-      android:background="@android:color/background_dark"
-      android:visibility="gone"/>
 </FrameLayout>
diff --git a/java/com/android/incallui/incall/impl/res/values-af/strings.xml b/java/com/android/incallui/incall/impl/res/values-af/strings.xml
index 64529a5..1739c25 100644
--- a/java/com/android/incallui/incall/impl/res/values-af/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-af/strings.xml
@@ -1,33 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_label_videocall" msgid="2208755440134676113">"Video-oproep"</string>
-    <string name="incall_label_hold" msgid="4223472584896867896">"Hou aan"</string>
-    <string name="incall_label_add_call" msgid="5641663436373994915">"Voeg oproep by"</string>
-    <string name="incall_label_mute" msgid="2180667027331706737">"Demp"</string>
-    <string name="incall_label_end_call" msgid="5434079261446614887">"Beëindig oproep"</string>
-    <string name="incall_label_dialpad" msgid="8609779533654156550">"Sleutelblok"</string>
-    <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", is aan"</string>
-    <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", is af"</string>
-    <string name="incall_label_merge" msgid="720076442985913175">"Voeg saam"</string>
-    <string name="incall_label_manage" msgid="2175471192903568159">"Bestuur"</string>
-    <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"Bestuur bellers"</string>
-    <string name="incall_label_swap" msgid="10458642864243507">"Verwissel"</string>
-    <string name="incall_note_sent" msgid="4524130323127388367">"Nota is gestuur"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_label_videocall">Video-oproep</string>
+  <string name="incall_label_rttcall">RTT</string>
+  <string name="incall_label_hold">Hou aan</string>
+  <string name="incall_label_add_call">Voeg oproep by</string>
+  <string name="incall_label_mute">Demp</string>
+  <string name="incall_label_end_call">Beëindig oproep</string>
+  <string name="incall_label_dialpad">Sleutelblok</string>
+  <string name="incall_talkback_speaker_on">, is aan</string>
+  <string name="incall_talkback_speaker_off">, is af</string>
+  <string name="incall_label_merge">Voeg saam</string>
+  <string name="incall_label_manage">Bestuur</string>
+  <string name="a11y_description_incall_label_manage_content">Bestuur bellers</string>
+  <string name="incall_label_swap">Verwissel</string>
+  <string name="incall_label_swap_sim">Verander SIM</string>
+  <string name="incall_note_sent">Nota is gestuur</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-am/strings.xml b/java/com/android/incallui/incall/impl/res/values-am/strings.xml
index 66a3868..b1b0bd3 100644
--- a/java/com/android/incallui/incall/impl/res/values-am/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-am/strings.xml
@@ -1,33 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_label_videocall" msgid="2208755440134676113">"የቪዲዮ ጥሪ"</string>
-    <string name="incall_label_hold" msgid="4223472584896867896">"ይዘህ ቆይ"</string>
-    <string name="incall_label_add_call" msgid="5641663436373994915">"ጥሪ ያክሉ"</string>
-    <string name="incall_label_mute" msgid="2180667027331706737">"ድምፀ-ከል አድርግ"</string>
-    <string name="incall_label_end_call" msgid="5434079261446614887">"ጥሪ ጨርስ"</string>
-    <string name="incall_label_dialpad" msgid="8609779533654156550">"ቁልፍ ሰሌዳ"</string>
-    <string name="incall_talkback_speaker_on" msgid="5819463769258124228">"፣ በርቷል"</string>
-    <string name="incall_talkback_speaker_off" msgid="7486836772563090186">"፣ ጠፍቷል"</string>
-    <string name="incall_label_merge" msgid="720076442985913175">"አዋህድ"</string>
-    <string name="incall_label_manage" msgid="2175471192903568159">"አስተዳድር"</string>
-    <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"ደዋዮችን ያስተዳድሩ"</string>
-    <string name="incall_label_swap" msgid="10458642864243507">"አገላብጥ"</string>
-    <string name="incall_note_sent" msgid="4524130323127388367">"ማስታወሻ ተልኳል"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_label_videocall">የቪዲዮ ጥሪ</string>
+  <string name="incall_label_rttcall">አርቲቲ</string>
+  <string name="incall_label_hold">ይዘህ ቆይ</string>
+  <string name="incall_label_add_call">ጥሪ ያክሉ</string>
+  <string name="incall_label_mute">ድምፀ-ከል አድርግ</string>
+  <string name="incall_label_end_call">ጥሪ ጨርስ</string>
+  <string name="incall_label_dialpad">ቁልፍ ሰሌዳ</string>
+  <string name="incall_talkback_speaker_on">፣ በርቷል</string>
+  <string name="incall_talkback_speaker_off">፣ ጠፍቷል</string>
+  <string name="incall_label_merge">አዋህድ</string>
+  <string name="incall_label_manage">አስተዳድር</string>
+  <string name="a11y_description_incall_label_manage_content">ደዋዮችን ያስተዳድሩ</string>
+  <string name="incall_label_swap">አገላብጥ</string>
+  <string name="incall_label_swap_sim">ሲም ቀይር</string>
+  <string name="incall_note_sent">ማስታወሻ ተልኳል</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-ar/strings.xml b/java/com/android/incallui/incall/impl/res/values-ar/strings.xml
index e4dbfe4..3d513b7 100644
--- a/java/com/android/incallui/incall/impl/res/values-ar/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-ar/strings.xml
@@ -1,33 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_label_videocall" msgid="2208755440134676113">"مكالمة فيديو"</string>
-    <string name="incall_label_hold" msgid="4223472584896867896">"انتظار"</string>
-    <string name="incall_label_add_call" msgid="5641663436373994915">"إضافة مكالمة"</string>
-    <string name="incall_label_mute" msgid="2180667027331706737">"كتم"</string>
-    <string name="incall_label_end_call" msgid="5434079261446614887">"إنهاء المكالمة"</string>
-    <string name="incall_label_dialpad" msgid="8609779533654156550">"لوحة مفاتيح"</string>
-    <string name="incall_talkback_speaker_on" msgid="5819463769258124228">"، مشغل"</string>
-    <string name="incall_talkback_speaker_off" msgid="7486836772563090186">"، غير مشغل"</string>
-    <string name="incall_label_merge" msgid="720076442985913175">"دمج"</string>
-    <string name="incall_label_manage" msgid="2175471192903568159">"إدارة"</string>
-    <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"إدارة المتصلين"</string>
-    <string name="incall_label_swap" msgid="10458642864243507">"تبديل"</string>
-    <string name="incall_note_sent" msgid="4524130323127388367">"تم إرسال الملاحظة"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_label_videocall">مكالمة فيديو</string>
+  <string name="incall_label_rttcall">RTT</string>
+  <string name="incall_label_hold">انتظار</string>
+  <string name="incall_label_add_call">إضافة مكالمة</string>
+  <string name="incall_label_mute">كتم</string>
+  <string name="incall_label_end_call">إنهاء المكالمة</string>
+  <string name="incall_label_dialpad">لوحة مفاتيح</string>
+  <string name="incall_talkback_speaker_on">، مشغل</string>
+  <string name="incall_talkback_speaker_off">، غير مشغل</string>
+  <string name="incall_label_merge">دمج</string>
+  <string name="incall_label_manage">إدارة</string>
+  <string name="a11y_description_incall_label_manage_content">إدارة المتصلين</string>
+  <string name="incall_label_swap">تبديل</string>
+  <string name="incall_label_swap_sim">‏تغيير SIM</string>
+  <string name="incall_note_sent">تم إرسال الملاحظة</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-az/strings.xml b/java/com/android/incallui/incall/impl/res/values-az/strings.xml
index 9a1f7f8..7eb4d78 100644
--- a/java/com/android/incallui/incall/impl/res/values-az/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-az/strings.xml
@@ -1,33 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_label_videocall" msgid="2208755440134676113">"Video zəng"</string>
-    <string name="incall_label_hold" msgid="4223472584896867896">"Xətdə axlayın"</string>
-    <string name="incall_label_add_call" msgid="5641663436373994915">"Zəng əlavə edin"</string>
-    <string name="incall_label_mute" msgid="2180667027331706737">"Susdurun"</string>
-    <string name="incall_label_end_call" msgid="5434079261446614887">"Zəngi bitirin"</string>
-    <string name="incall_label_dialpad" msgid="8609779533654156550">"Klaviatura"</string>
-    <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", aktivdir"</string>
-    <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", deaktivdir"</string>
-    <string name="incall_label_merge" msgid="720076442985913175">"Birləşdir"</string>
-    <string name="incall_label_manage" msgid="2175471192903568159">"İdarə edin"</string>
-    <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"Zəng edənləri idarə edin"</string>
-    <string name="incall_label_swap" msgid="10458642864243507">"Dəyişdirin"</string>
-    <string name="incall_note_sent" msgid="4524130323127388367">"Qeyd göndərildi"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_label_videocall">Video zəng</string>
+  <string name="incall_label_rttcall">RTT</string>
+  <string name="incall_label_hold">Xətdə axlayın</string>
+  <string name="incall_label_add_call">Zəng əlavə edin</string>
+  <string name="incall_label_mute">Susdurun</string>
+  <string name="incall_label_end_call">Zəngi bitirin</string>
+  <string name="incall_label_dialpad">Klaviatura</string>
+  <string name="incall_talkback_speaker_on">, aktivdir</string>
+  <string name="incall_talkback_speaker_off">, deaktivdir</string>
+  <string name="incall_label_merge">Birləşdir</string>
+  <string name="incall_label_manage">İdarə edin</string>
+  <string name="a11y_description_incall_label_manage_content">Zəng edənləri idarə edin</string>
+  <string name="incall_label_swap">Dəyişdirin</string>
+  <string name="incall_label_swap_sim">SIM-i dəyişin</string>
+  <string name="incall_note_sent">Qeyd göndərildi</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-b+sr+Latn/strings.xml b/java/com/android/incallui/incall/impl/res/values-b+sr+Latn/strings.xml
index 02d6b7c..2cbce6a 100644
--- a/java/com/android/incallui/incall/impl/res/values-b+sr+Latn/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-b+sr+Latn/strings.xml
@@ -1,33 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_label_videocall" msgid="2208755440134676113">"Video poziv"</string>
-    <string name="incall_label_hold" msgid="4223472584896867896">"Na čekanje"</string>
-    <string name="incall_label_add_call" msgid="5641663436373994915">"Dodaj poziv"</string>
-    <string name="incall_label_mute" msgid="2180667027331706737">"Isključi zvuk"</string>
-    <string name="incall_label_end_call" msgid="5434079261446614887">"Završi poziv"</string>
-    <string name="incall_label_dialpad" msgid="8609779533654156550">"Tastatura"</string>
-    <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", uključen"</string>
-    <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", isključen"</string>
-    <string name="incall_label_merge" msgid="720076442985913175">"Objedini"</string>
-    <string name="incall_label_manage" msgid="2175471192903568159">"Upravljaj"</string>
-    <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"Upravljajte pozivaocima"</string>
-    <string name="incall_label_swap" msgid="10458642864243507">"Zameni"</string>
-    <string name="incall_note_sent" msgid="4524130323127388367">"Beleška je poslata"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_label_videocall">Video poziv</string>
+  <string name="incall_label_rttcall">RTT</string>
+  <string name="incall_label_hold">Na čekanje</string>
+  <string name="incall_label_add_call">Dodaj poziv</string>
+  <string name="incall_label_mute">Isključi zvuk</string>
+  <string name="incall_label_end_call">Završi poziv</string>
+  <string name="incall_label_dialpad">Tastatura</string>
+  <string name="incall_talkback_speaker_on">, uključen</string>
+  <string name="incall_talkback_speaker_off">, isključen</string>
+  <string name="incall_label_merge">Objedini</string>
+  <string name="incall_label_manage">Upravljaj</string>
+  <string name="a11y_description_incall_label_manage_content">Upravljajte pozivaocima</string>
+  <string name="incall_label_swap">Zameni</string>
+  <string name="incall_label_swap_sim">Promeni SIM</string>
+  <string name="incall_note_sent">Beleška je poslata</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-be/strings.xml b/java/com/android/incallui/incall/impl/res/values-be/strings.xml
index 45e1e10..b629cb7 100644
--- a/java/com/android/incallui/incall/impl/res/values-be/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-be/strings.xml
@@ -1,33 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_label_videocall" msgid="2208755440134676113">"Відэавыклік"</string>
-    <string name="incall_label_hold" msgid="4223472584896867896">"Утрымліваць"</string>
-    <string name="incall_label_add_call" msgid="5641663436373994915">"Дадаць выклік"</string>
-    <string name="incall_label_mute" msgid="2180667027331706737">"Адключыць мікрафон"</string>
-    <string name="incall_label_end_call" msgid="5434079261446614887">"Сконч. выкл."</string>
-    <string name="incall_label_dialpad" msgid="8609779533654156550">"Клавіятура"</string>
-    <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", уключана"</string>
-    <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", выключана"</string>
-    <string name="incall_label_merge" msgid="720076442985913175">"Аб\'яднаць"</string>
-    <string name="incall_label_manage" msgid="2175471192903568159">"Кіраваць"</string>
-    <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"Кіраваць выклікаючымі абанентамі"</string>
-    <string name="incall_label_swap" msgid="10458642864243507">"Пераключыць"</string>
-    <string name="incall_note_sent" msgid="4524130323127388367">"Нататка адпраўлена"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_label_videocall">Відэавыклік</string>
+  <string name="incall_label_rttcall">RTT</string>
+  <string name="incall_label_hold">Утрымліваць</string>
+  <string name="incall_label_add_call">Дадаць выклік</string>
+  <string name="incall_label_mute">Адключыць мікрафон</string>
+  <string name="incall_label_end_call">Сконч. выкл.</string>
+  <string name="incall_label_dialpad">Клавіятура</string>
+  <string name="incall_talkback_speaker_on">, уключана</string>
+  <string name="incall_talkback_speaker_off">, выключана</string>
+  <string name="incall_label_merge">Аб\'яднаць</string>
+  <string name="incall_label_manage">Кіраваць</string>
+  <string name="a11y_description_incall_label_manage_content">Кіраваць выклікаючымі абанентамі</string>
+  <string name="incall_label_swap">Пераключыць</string>
+  <string name="incall_label_swap_sim">Змяніць SIM</string>
+  <string name="incall_note_sent">Нататка адпраўлена</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-bg/strings.xml b/java/com/android/incallui/incall/impl/res/values-bg/strings.xml
index c339d3b..7034850 100644
--- a/java/com/android/incallui/incall/impl/res/values-bg/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-bg/strings.xml
@@ -1,33 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_label_videocall" msgid="2208755440134676113">"Видеообажд."</string>
-    <string name="incall_label_hold" msgid="4223472584896867896">"Задържане"</string>
-    <string name="incall_label_add_call" msgid="5641663436373994915">"Ново обажд."</string>
-    <string name="incall_label_mute" msgid="2180667027331706737">"Без звук"</string>
-    <string name="incall_label_end_call" msgid="5434079261446614887">"Затваряне"</string>
-    <string name="incall_label_dialpad" msgid="8609779533654156550">"Клавиатура"</string>
-    <string name="incall_talkback_speaker_on" msgid="5819463769258124228">"е включено"</string>
-    <string name="incall_talkback_speaker_off" msgid="7486836772563090186">"е изключено"</string>
-    <string name="incall_label_merge" msgid="720076442985913175">"Обединяване"</string>
-    <string name="incall_label_manage" msgid="2175471192903568159">"Управление"</string>
-    <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"Управление на обаждащите се"</string>
-    <string name="incall_label_swap" msgid="10458642864243507">"Размяна"</string>
-    <string name="incall_note_sent" msgid="4524130323127388367">"Бележката е изпратена"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_label_videocall">Видеообажд.</string>
+  <string name="incall_label_rttcall">ТСРВ</string>
+  <string name="incall_label_hold">Задържане</string>
+  <string name="incall_label_add_call">Ново обажд.</string>
+  <string name="incall_label_mute">Без звук</string>
+  <string name="incall_label_end_call">Затваряне</string>
+  <string name="incall_label_dialpad">Клавиатура</string>
+  <string name="incall_talkback_speaker_on">е включено</string>
+  <string name="incall_talkback_speaker_off">е изключено</string>
+  <string name="incall_label_merge">Обединяване</string>
+  <string name="incall_label_manage">Управление</string>
+  <string name="a11y_description_incall_label_manage_content">Управление на обаждащите се</string>
+  <string name="incall_label_swap">Размяна</string>
+  <string name="incall_label_swap_sim">Смяна на SIM</string>
+  <string name="incall_note_sent">Бележката е изпратена</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-bn/strings.xml b/java/com/android/incallui/incall/impl/res/values-bn/strings.xml
index ca5837b..e51f506 100644
--- a/java/com/android/incallui/incall/impl/res/values-bn/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-bn/strings.xml
@@ -1,33 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_label_videocall" msgid="2208755440134676113">"ভিডিও কল"</string>
-    <string name="incall_label_hold" msgid="4223472584896867896">"ধরে থাকুন"</string>
-    <string name="incall_label_add_call" msgid="5641663436373994915">"কল যোগ করুন"</string>
-    <string name="incall_label_mute" msgid="2180667027331706737">"নিঃশব্দ করুন"</string>
-    <string name="incall_label_end_call" msgid="5434079261446614887">"কল শেষ করুন"</string>
-    <string name="incall_label_dialpad" msgid="8609779533654156550">"কীপ্যাড"</string>
-    <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", চালু রয়েছে"</string>
-    <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", বন্ধ রয়েছে"</string>
-    <string name="incall_label_merge" msgid="720076442985913175">"মার্জ করুন"</string>
-    <string name="incall_label_manage" msgid="2175471192903568159">"পরিচালনা করুন"</string>
-    <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"কলারদের পরিচালনা করুন"</string>
-    <string name="incall_label_swap" msgid="10458642864243507">"অদল বদল করুন"</string>
-    <string name="incall_note_sent" msgid="4524130323127388367">"নোট পাঠানো হয়েছে"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_label_videocall">ভিডিও কল</string>
+  <string name="incall_label_rttcall">RTT</string>
+  <string name="incall_label_hold">ধরে থাকুন</string>
+  <string name="incall_label_add_call">কল যোগ করুন</string>
+  <string name="incall_label_mute">নিঃশব্দ করুন</string>
+  <string name="incall_label_end_call">কল শেষ করুন</string>
+  <string name="incall_label_dialpad">কীপ্যাড</string>
+  <string name="incall_talkback_speaker_on">, চালু রয়েছে</string>
+  <string name="incall_talkback_speaker_off">, বন্ধ রয়েছে</string>
+  <string name="incall_label_merge">মার্জ করুন</string>
+  <string name="incall_label_manage">পরিচালনা করুন</string>
+  <string name="a11y_description_incall_label_manage_content">কলারদের পরিচালনা করুন</string>
+  <string name="incall_label_swap">অদল বদল করুন</string>
+  <string name="incall_label_swap_sim">সিম পাল্টান</string>
+  <string name="incall_note_sent">নোট পাঠানো হয়েছে</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-bs/strings.xml b/java/com/android/incallui/incall/impl/res/values-bs/strings.xml
index 26b44ea..e67d395 100644
--- a/java/com/android/incallui/incall/impl/res/values-bs/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-bs/strings.xml
@@ -1,33 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_label_videocall" msgid="2208755440134676113">"Videopoziv"</string>
-    <string name="incall_label_hold" msgid="4223472584896867896">"Na čekanju"</string>
-    <string name="incall_label_add_call" msgid="5641663436373994915">"Dodaj poziv"</string>
-    <string name="incall_label_mute" msgid="2180667027331706737">"Isključi"</string>
-    <string name="incall_label_end_call" msgid="5434079261446614887">"Prekini poziv"</string>
-    <string name="incall_label_dialpad" msgid="8609779533654156550">"Telefonska tastatura"</string>
-    <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", uključen"</string>
-    <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", isključen"</string>
-    <string name="incall_label_merge" msgid="720076442985913175">"Spoji"</string>
-    <string name="incall_label_manage" msgid="2175471192903568159">"Upravljaj"</string>
-    <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"Upravljanje pozivaocima"</string>
-    <string name="incall_label_swap" msgid="10458642864243507">"Zamijeni"</string>
-    <string name="incall_note_sent" msgid="4524130323127388367">"Bilješka je poslana"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_label_videocall">Video poziv</string>
+  <string name="incall_label_rttcall">RTT</string>
+  <string name="incall_label_hold">Na čekanju</string>
+  <string name="incall_label_add_call">Dodaj poziv</string>
+  <string name="incall_label_mute">Isključi</string>
+  <string name="incall_label_end_call">Prekini poziv</string>
+  <string name="incall_label_dialpad">Telefonska tastatura</string>
+  <string name="incall_talkback_speaker_on">, uključen</string>
+  <string name="incall_talkback_speaker_off">, isključen</string>
+  <string name="incall_label_merge">Spoji</string>
+  <string name="incall_label_manage">Upravljaj</string>
+  <string name="a11y_description_incall_label_manage_content">Upravljanje pozivaocima</string>
+  <string name="incall_label_swap">Zamijeni</string>
+  <string name="incall_label_swap_sim">Promijeni SIM</string>
+  <string name="incall_note_sent">Bilješka je poslana</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-ca/strings.xml b/java/com/android/incallui/incall/impl/res/values-ca/strings.xml
index 9c76a3a..1dc8a88 100644
--- a/java/com/android/incallui/incall/impl/res/values-ca/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-ca/strings.xml
@@ -1,33 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_label_videocall" msgid="2208755440134676113">"Videotrucada"</string>
-    <string name="incall_label_hold" msgid="4223472584896867896">"Posa en espera"</string>
-    <string name="incall_label_add_call" msgid="5641663436373994915">"Afeg. trucada"</string>
-    <string name="incall_label_mute" msgid="2180667027331706737">"Silencia"</string>
-    <string name="incall_label_end_call" msgid="5434079261446614887">"Penja"</string>
-    <string name="incall_label_dialpad" msgid="8609779533654156550">"Teclat"</string>
-    <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", activat"</string>
-    <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", desactivat"</string>
-    <string name="incall_label_merge" msgid="720076442985913175">"Combina"</string>
-    <string name="incall_label_manage" msgid="2175471192903568159">"Gestiona"</string>
-    <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"Gestiona les persones que truquen"</string>
-    <string name="incall_label_swap" msgid="10458642864243507">"Canvia"</string>
-    <string name="incall_note_sent" msgid="4524130323127388367">"La nota s\'ha enviat"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_label_videocall">Videotrucada</string>
+  <string name="incall_label_rttcall">RTT</string>
+  <string name="incall_label_hold">Posa en espera</string>
+  <string name="incall_label_add_call">Afeg. trucada</string>
+  <string name="incall_label_mute">Silencia</string>
+  <string name="incall_label_end_call">Penja</string>
+  <string name="incall_label_dialpad">Teclat</string>
+  <string name="incall_talkback_speaker_on">, activat</string>
+  <string name="incall_talkback_speaker_off">, desactivat</string>
+  <string name="incall_label_merge">Combina</string>
+  <string name="incall_label_manage">Gestiona</string>
+  <string name="a11y_description_incall_label_manage_content">Gestiona les persones que truquen</string>
+  <string name="incall_label_swap">Canvia</string>
+  <string name="incall_label_swap_sim">Canvia de SIM</string>
+  <string name="incall_note_sent">La nota s\'ha enviat</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-cs/strings.xml b/java/com/android/incallui/incall/impl/res/values-cs/strings.xml
index 69f3e53..85c3964 100644
--- a/java/com/android/incallui/incall/impl/res/values-cs/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-cs/strings.xml
@@ -1,33 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_label_videocall" msgid="2208755440134676113">"Videohovor"</string>
-    <string name="incall_label_hold" msgid="4223472584896867896">"Podržet"</string>
-    <string name="incall_label_add_call" msgid="5641663436373994915">"Přidat hovor"</string>
-    <string name="incall_label_mute" msgid="2180667027331706737">"Vyp. mikrof."</string>
-    <string name="incall_label_end_call" msgid="5434079261446614887">"Zavěsit"</string>
-    <string name="incall_label_dialpad" msgid="8609779533654156550">"Klávesnice"</string>
-    <string name="incall_talkback_speaker_on" msgid="5819463769258124228">"– zapnuto"</string>
-    <string name="incall_talkback_speaker_off" msgid="7486836772563090186">"– vypnuto"</string>
-    <string name="incall_label_merge" msgid="720076442985913175">"Sloučit"</string>
-    <string name="incall_label_manage" msgid="2175471192903568159">"Spravovat"</string>
-    <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"Spravovat volající"</string>
-    <string name="incall_label_swap" msgid="10458642864243507">"Přepnout"</string>
-    <string name="incall_note_sent" msgid="4524130323127388367">"Poznámka byla odeslána"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_label_videocall">Videohovor</string>
+  <string name="incall_label_rttcall">RTT</string>
+  <string name="incall_label_hold">Podržet</string>
+  <string name="incall_label_add_call">Přidat hovor</string>
+  <string name="incall_label_mute">Vyp. mikrof.</string>
+  <string name="incall_label_end_call">Zavěsit</string>
+  <string name="incall_label_dialpad">Klávesnice</string>
+  <string name="incall_talkback_speaker_on">– zapnuto</string>
+  <string name="incall_talkback_speaker_off">– vypnuto</string>
+  <string name="incall_label_merge">Sloučit</string>
+  <string name="incall_label_manage">Spravovat</string>
+  <string name="a11y_description_incall_label_manage_content">Spravovat volající</string>
+  <string name="incall_label_swap">Přepnout</string>
+  <string name="incall_label_swap_sim">Změnit SIM kartu</string>
+  <string name="incall_note_sent">Poznámka byla odeslána</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-da/strings.xml b/java/com/android/incallui/incall/impl/res/values-da/strings.xml
index d9328af..873ffe7 100644
--- a/java/com/android/incallui/incall/impl/res/values-da/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-da/strings.xml
@@ -1,33 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_label_videocall" msgid="2208755440134676113">"Videoopkald"</string>
-    <string name="incall_label_hold" msgid="4223472584896867896">"Parkér"</string>
-    <string name="incall_label_add_call" msgid="5641663436373994915">"Tilføj opkald"</string>
-    <string name="incall_label_mute" msgid="2180667027331706737">"Slå lyden fra"</string>
-    <string name="incall_label_end_call" msgid="5434079261446614887">"Slut opkald"</string>
-    <string name="incall_label_dialpad" msgid="8609779533654156550">"Tastatur"</string>
-    <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", er til"</string>
-    <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", er fra"</string>
-    <string name="incall_label_merge" msgid="720076442985913175">"Flet"</string>
-    <string name="incall_label_manage" msgid="2175471192903568159">"Administrer"</string>
-    <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"Administrer opkaldere"</string>
-    <string name="incall_label_swap" msgid="10458642864243507">"Byt"</string>
-    <string name="incall_note_sent" msgid="4524130323127388367">"Noten blev sendt"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_label_videocall">Videoopkald</string>
+  <string name="incall_label_rttcall">Realtids-sms</string>
+  <string name="incall_label_hold">Parkér</string>
+  <string name="incall_label_add_call">Tilføj opkald</string>
+  <string name="incall_label_mute">Slå lyden fra</string>
+  <string name="incall_label_end_call">Læg på</string>
+  <string name="incall_label_dialpad">Tastatur</string>
+  <string name="incall_talkback_speaker_on">, er til</string>
+  <string name="incall_talkback_speaker_off">, er fra</string>
+  <string name="incall_label_merge">Flet</string>
+  <string name="incall_label_manage">Administrer</string>
+  <string name="a11y_description_incall_label_manage_content">Administrer opkaldere</string>
+  <string name="incall_label_swap">Byt</string>
+  <string name="incall_label_swap_sim">Skift SIM</string>
+  <string name="incall_note_sent">Noten blev sendt</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-de/strings.xml b/java/com/android/incallui/incall/impl/res/values-de/strings.xml
index 30eae96..797a1b2 100644
--- a/java/com/android/incallui/incall/impl/res/values-de/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-de/strings.xml
@@ -1,33 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_label_videocall" msgid="2208755440134676113">"Videoanruf"</string>
-    <string name="incall_label_hold" msgid="4223472584896867896">"Halten"</string>
-    <string name="incall_label_add_call" msgid="5641663436373994915">"Hinzufügen"</string>
-    <string name="incall_label_mute" msgid="2180667027331706737">"Stumm"</string>
-    <string name="incall_label_end_call" msgid="5434079261446614887">"Beenden"</string>
-    <string name="incall_label_dialpad" msgid="8609779533654156550">"Wähltasten"</string>
-    <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", ist an"</string>
-    <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", ist aus"</string>
-    <string name="incall_label_merge" msgid="720076442985913175">"Zusammenf."</string>
-    <string name="incall_label_manage" msgid="2175471192903568159">"Verwalten"</string>
-    <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"Anrufer verwalten"</string>
-    <string name="incall_label_swap" msgid="10458642864243507">"Wechseln"</string>
-    <string name="incall_note_sent" msgid="4524130323127388367">"Notiz gesendet"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_label_videocall">Videoanruf</string>
+  <string name="incall_label_rttcall">RTT</string>
+  <string name="incall_label_hold">Halten</string>
+  <string name="incall_label_add_call">Hinzufügen</string>
+  <string name="incall_label_mute">Stumm</string>
+  <string name="incall_label_end_call">Beenden</string>
+  <string name="incall_label_dialpad">Wähltasten</string>
+  <string name="incall_talkback_speaker_on">, ist an</string>
+  <string name="incall_talkback_speaker_off">, ist aus</string>
+  <string name="incall_label_merge">Zusammenf.</string>
+  <string name="incall_label_manage">Verwalten</string>
+  <string name="a11y_description_incall_label_manage_content">Anrufer verwalten</string>
+  <string name="incall_label_swap">Wechseln</string>
+  <string name="incall_label_swap_sim">SIM wechseln</string>
+  <string name="incall_note_sent">Notiz gesendet</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-el/strings.xml b/java/com/android/incallui/incall/impl/res/values-el/strings.xml
index b45314f..bc4f94f 100644
--- a/java/com/android/incallui/incall/impl/res/values-el/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-el/strings.xml
@@ -1,33 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_label_videocall" msgid="2208755440134676113">"Βιντεοκλήση"</string>
-    <string name="incall_label_hold" msgid="4223472584896867896">"Αναμονή"</string>
-    <string name="incall_label_add_call" msgid="5641663436373994915">"Προσθ. κλήσ."</string>
-    <string name="incall_label_mute" msgid="2180667027331706737">"Σίγαση"</string>
-    <string name="incall_label_end_call" msgid="5434079261446614887">"Τερματισμός"</string>
-    <string name="incall_label_dialpad" msgid="8609779533654156550">"Πληκτρολόγιο"</string>
-    <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", ενεργό"</string>
-    <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", ανενεργό"</string>
-    <string name="incall_label_merge" msgid="720076442985913175">"Συγχώνευση"</string>
-    <string name="incall_label_manage" msgid="2175471192903568159">"Διαχείριση"</string>
-    <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"Διαχείριση καλούντων"</string>
-    <string name="incall_label_swap" msgid="10458642864243507">"Ανταλλαγή"</string>
-    <string name="incall_note_sent" msgid="4524130323127388367">"Η σημείωση εστάλη"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_label_videocall">Βιντεοκλήση</string>
+  <string name="incall_label_rttcall">RTT</string>
+  <string name="incall_label_hold">Αναμονή</string>
+  <string name="incall_label_add_call">Προσθ. κλήσ.</string>
+  <string name="incall_label_mute">Σίγαση</string>
+  <string name="incall_label_end_call">Τερματισμός</string>
+  <string name="incall_label_dialpad">Πληκτρολόγιο</string>
+  <string name="incall_talkback_speaker_on">, ενεργό</string>
+  <string name="incall_talkback_speaker_off">, ανενεργό</string>
+  <string name="incall_label_merge">Συγχώνευση</string>
+  <string name="incall_label_manage">Διαχείριση</string>
+  <string name="a11y_description_incall_label_manage_content">Διαχείριση καλούντων</string>
+  <string name="incall_label_swap">Ανταλλαγή</string>
+  <string name="incall_label_swap_sim">Αλλαγή SIM</string>
+  <string name="incall_note_sent">Η σημείωση εστάλη</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-en-rAU/strings.xml b/java/com/android/incallui/incall/impl/res/values-en-rAU/strings.xml
index 34323f5..7e2c667 100644
--- a/java/com/android/incallui/incall/impl/res/values-en-rAU/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-en-rAU/strings.xml
@@ -1,33 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_label_videocall" msgid="2208755440134676113">"Video call"</string>
-    <string name="incall_label_hold" msgid="4223472584896867896">"Hold"</string>
-    <string name="incall_label_add_call" msgid="5641663436373994915">"Add call"</string>
-    <string name="incall_label_mute" msgid="2180667027331706737">"Mute"</string>
-    <string name="incall_label_end_call" msgid="5434079261446614887">"End call"</string>
-    <string name="incall_label_dialpad" msgid="8609779533654156550">"Keypad"</string>
-    <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", is on"</string>
-    <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", is off"</string>
-    <string name="incall_label_merge" msgid="720076442985913175">"Merge"</string>
-    <string name="incall_label_manage" msgid="2175471192903568159">"Manage"</string>
-    <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"Manage callers"</string>
-    <string name="incall_label_swap" msgid="10458642864243507">"Swap"</string>
-    <string name="incall_note_sent" msgid="4524130323127388367">"Note sent"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_label_videocall">Video call</string>
+  <string name="incall_label_rttcall">RTT</string>
+  <string name="incall_label_hold">Hold</string>
+  <string name="incall_label_add_call">Add call</string>
+  <string name="incall_label_mute">Mute</string>
+  <string name="incall_label_end_call">End call</string>
+  <string name="incall_label_dialpad">Keypad</string>
+  <string name="incall_talkback_speaker_on">, is on</string>
+  <string name="incall_talkback_speaker_off">, is off</string>
+  <string name="incall_label_merge">Merge</string>
+  <string name="incall_label_manage">Manage</string>
+  <string name="a11y_description_incall_label_manage_content">Manage callers</string>
+  <string name="incall_label_swap">Swap</string>
+  <string name="incall_label_swap_sim">Change SIM</string>
+  <string name="incall_note_sent">Note sent</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-en-rGB/strings.xml b/java/com/android/incallui/incall/impl/res/values-en-rGB/strings.xml
index 34323f5..7e2c667 100644
--- a/java/com/android/incallui/incall/impl/res/values-en-rGB/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-en-rGB/strings.xml
@@ -1,33 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_label_videocall" msgid="2208755440134676113">"Video call"</string>
-    <string name="incall_label_hold" msgid="4223472584896867896">"Hold"</string>
-    <string name="incall_label_add_call" msgid="5641663436373994915">"Add call"</string>
-    <string name="incall_label_mute" msgid="2180667027331706737">"Mute"</string>
-    <string name="incall_label_end_call" msgid="5434079261446614887">"End call"</string>
-    <string name="incall_label_dialpad" msgid="8609779533654156550">"Keypad"</string>
-    <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", is on"</string>
-    <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", is off"</string>
-    <string name="incall_label_merge" msgid="720076442985913175">"Merge"</string>
-    <string name="incall_label_manage" msgid="2175471192903568159">"Manage"</string>
-    <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"Manage callers"</string>
-    <string name="incall_label_swap" msgid="10458642864243507">"Swap"</string>
-    <string name="incall_note_sent" msgid="4524130323127388367">"Note sent"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_label_videocall">Video call</string>
+  <string name="incall_label_rttcall">RTT</string>
+  <string name="incall_label_hold">Hold</string>
+  <string name="incall_label_add_call">Add call</string>
+  <string name="incall_label_mute">Mute</string>
+  <string name="incall_label_end_call">End call</string>
+  <string name="incall_label_dialpad">Keypad</string>
+  <string name="incall_talkback_speaker_on">, is on</string>
+  <string name="incall_talkback_speaker_off">, is off</string>
+  <string name="incall_label_merge">Merge</string>
+  <string name="incall_label_manage">Manage</string>
+  <string name="a11y_description_incall_label_manage_content">Manage callers</string>
+  <string name="incall_label_swap">Swap</string>
+  <string name="incall_label_swap_sim">Change SIM</string>
+  <string name="incall_note_sent">Note sent</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-en-rIN/strings.xml b/java/com/android/incallui/incall/impl/res/values-en-rIN/strings.xml
index 34323f5..7e2c667 100644
--- a/java/com/android/incallui/incall/impl/res/values-en-rIN/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-en-rIN/strings.xml
@@ -1,33 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_label_videocall" msgid="2208755440134676113">"Video call"</string>
-    <string name="incall_label_hold" msgid="4223472584896867896">"Hold"</string>
-    <string name="incall_label_add_call" msgid="5641663436373994915">"Add call"</string>
-    <string name="incall_label_mute" msgid="2180667027331706737">"Mute"</string>
-    <string name="incall_label_end_call" msgid="5434079261446614887">"End call"</string>
-    <string name="incall_label_dialpad" msgid="8609779533654156550">"Keypad"</string>
-    <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", is on"</string>
-    <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", is off"</string>
-    <string name="incall_label_merge" msgid="720076442985913175">"Merge"</string>
-    <string name="incall_label_manage" msgid="2175471192903568159">"Manage"</string>
-    <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"Manage callers"</string>
-    <string name="incall_label_swap" msgid="10458642864243507">"Swap"</string>
-    <string name="incall_note_sent" msgid="4524130323127388367">"Note sent"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_label_videocall">Video call</string>
+  <string name="incall_label_rttcall">RTT</string>
+  <string name="incall_label_hold">Hold</string>
+  <string name="incall_label_add_call">Add call</string>
+  <string name="incall_label_mute">Mute</string>
+  <string name="incall_label_end_call">End call</string>
+  <string name="incall_label_dialpad">Keypad</string>
+  <string name="incall_talkback_speaker_on">, is on</string>
+  <string name="incall_talkback_speaker_off">, is off</string>
+  <string name="incall_label_merge">Merge</string>
+  <string name="incall_label_manage">Manage</string>
+  <string name="a11y_description_incall_label_manage_content">Manage callers</string>
+  <string name="incall_label_swap">Swap</string>
+  <string name="incall_label_swap_sim">Change SIM</string>
+  <string name="incall_note_sent">Note sent</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-es-rUS/strings.xml b/java/com/android/incallui/incall/impl/res/values-es-rUS/strings.xml
index 0dd1dc7..52f4128 100644
--- a/java/com/android/incallui/incall/impl/res/values-es-rUS/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-es-rUS/strings.xml
@@ -1,33 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_label_videocall" msgid="2208755440134676113">"Videollamada"</string>
-    <string name="incall_label_hold" msgid="4223472584896867896">"Retener"</string>
-    <string name="incall_label_add_call" msgid="5641663436373994915">"Agregar llamada"</string>
-    <string name="incall_label_mute" msgid="2180667027331706737">"Silenciar"</string>
-    <string name="incall_label_end_call" msgid="5434079261446614887">"Finalizar llamada"</string>
-    <string name="incall_label_dialpad" msgid="8609779533654156550">"Teclado"</string>
-    <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", activado"</string>
-    <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", desactivado"</string>
-    <string name="incall_label_merge" msgid="720076442985913175">"Combinar"</string>
-    <string name="incall_label_manage" msgid="2175471192903568159">"Administrar"</string>
-    <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"Administrar números"</string>
-    <string name="incall_label_swap" msgid="10458642864243507">"Cambiar"</string>
-    <string name="incall_note_sent" msgid="4524130323127388367">"Se envió la nota"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_label_videocall">Videollamada</string>
+  <string name="incall_label_rttcall">RTT</string>
+  <string name="incall_label_hold">Retener</string>
+  <string name="incall_label_add_call">Agregar llamada</string>
+  <string name="incall_label_mute">Silenciar</string>
+  <string name="incall_label_end_call">Finalizar llamada</string>
+  <string name="incall_label_dialpad">Teclado</string>
+  <string name="incall_talkback_speaker_on">, activado</string>
+  <string name="incall_talkback_speaker_off">, desactivado</string>
+  <string name="incall_label_merge">Combinar</string>
+  <string name="incall_label_manage">Administrar</string>
+  <string name="a11y_description_incall_label_manage_content">Administrar números</string>
+  <string name="incall_label_swap">Cambiar</string>
+  <string name="incall_label_swap_sim">Cambiar SIM</string>
+  <string name="incall_note_sent">Se envió la nota</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-es/strings.xml b/java/com/android/incallui/incall/impl/res/values-es/strings.xml
index db5a7e6..ed2b5cb 100644
--- a/java/com/android/incallui/incall/impl/res/values-es/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-es/strings.xml
@@ -1,33 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_label_videocall" msgid="2208755440134676113">"Videollamada"</string>
-    <string name="incall_label_hold" msgid="4223472584896867896">"Retener"</string>
-    <string name="incall_label_add_call" msgid="5641663436373994915">"Añadir"</string>
-    <string name="incall_label_mute" msgid="2180667027331706737">"Silenciar"</string>
-    <string name="incall_label_end_call" msgid="5434079261446614887">"Finalizar"</string>
-    <string name="incall_label_dialpad" msgid="8609779533654156550">"Teclado"</string>
-    <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", activado"</string>
-    <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", desactivado"</string>
-    <string name="incall_label_merge" msgid="720076442985913175">"Combinar"</string>
-    <string name="incall_label_manage" msgid="2175471192903568159">"Gestionar"</string>
-    <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"Administrar llamadas"</string>
-    <string name="incall_label_swap" msgid="10458642864243507">"Cambiar"</string>
-    <string name="incall_note_sent" msgid="4524130323127388367">"Nota enviada"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_label_videocall">Videollamada</string>
+  <string name="incall_label_rttcall">TTR</string>
+  <string name="incall_label_hold">Retener</string>
+  <string name="incall_label_add_call">Añadir</string>
+  <string name="incall_label_mute">Silenciar</string>
+  <string name="incall_label_end_call">Finalizar</string>
+  <string name="incall_label_dialpad">Teclado</string>
+  <string name="incall_talkback_speaker_on">, activado</string>
+  <string name="incall_talkback_speaker_off">, desactivado</string>
+  <string name="incall_label_merge">Combinar</string>
+  <string name="incall_label_manage">Gestionar</string>
+  <string name="a11y_description_incall_label_manage_content">Administrar llamadas</string>
+  <string name="incall_label_swap">Cambiar</string>
+  <string name="incall_label_swap_sim">Cambiar SIM</string>
+  <string name="incall_note_sent">Nota enviada</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-et/strings.xml b/java/com/android/incallui/incall/impl/res/values-et/strings.xml
index f4587ad..9b2ab07 100644
--- a/java/com/android/incallui/incall/impl/res/values-et/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-et/strings.xml
@@ -1,33 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_label_videocall" msgid="2208755440134676113">"Videokõne"</string>
-    <string name="incall_label_hold" msgid="4223472584896867896">"Ootele"</string>
-    <string name="incall_label_add_call" msgid="5641663436373994915">"Lisa kõne"</string>
-    <string name="incall_label_mute" msgid="2180667027331706737">"Vaigista"</string>
-    <string name="incall_label_end_call" msgid="5434079261446614887">"Lõpeta kõne"</string>
-    <string name="incall_label_dialpad" msgid="8609779533654156550">"Klaviatuur"</string>
-    <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", on sees"</string>
-    <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", on väljas"</string>
-    <string name="incall_label_merge" msgid="720076442985913175">"Ühenda"</string>
-    <string name="incall_label_manage" msgid="2175471192903568159">"Halda"</string>
-    <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"Helistajate haldamine"</string>
-    <string name="incall_label_swap" msgid="10458642864243507">"Vaheta"</string>
-    <string name="incall_note_sent" msgid="4524130323127388367">"Märge on saadetud"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_label_videocall">Videokõne</string>
+  <string name="incall_label_rttcall">RTT</string>
+  <string name="incall_label_hold">Ootele</string>
+  <string name="incall_label_add_call">Lisa kõne</string>
+  <string name="incall_label_mute">Vaigista</string>
+  <string name="incall_label_end_call">Lõpeta kõne</string>
+  <string name="incall_label_dialpad">Klaviatuur</string>
+  <string name="incall_talkback_speaker_on">, on sees</string>
+  <string name="incall_talkback_speaker_off">, on väljas</string>
+  <string name="incall_label_merge">Ühenda</string>
+  <string name="incall_label_manage">Halda</string>
+  <string name="a11y_description_incall_label_manage_content">Helistajate haldamine</string>
+  <string name="incall_label_swap">Vaheta</string>
+  <string name="incall_label_swap_sim">Muuda SIM-k.</string>
+  <string name="incall_note_sent">Märge on saadetud</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-eu/strings.xml b/java/com/android/incallui/incall/impl/res/values-eu/strings.xml
index 28d78a7..966a6e3 100644
--- a/java/com/android/incallui/incall/impl/res/values-eu/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-eu/strings.xml
@@ -1,33 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_label_videocall" msgid="2208755440134676113">"Bideo-deia"</string>
-    <string name="incall_label_hold" msgid="4223472584896867896">"Utzi zain"</string>
-    <string name="incall_label_add_call" msgid="5641663436373994915">"Gehitu deia"</string>
-    <string name="incall_label_mute" msgid="2180667027331706737">"Des. audioa"</string>
-    <string name="incall_label_end_call" msgid="5434079261446614887">"Amaitu deia"</string>
-    <string name="incall_label_dialpad" msgid="8609779533654156550">"Teklatua"</string>
-    <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", aktibatuta"</string>
-    <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", desaktib."</string>
-    <string name="incall_label_merge" msgid="720076442985913175">"Bateratu"</string>
-    <string name="incall_label_manage" msgid="2175471192903568159">"Kudeatu"</string>
-    <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"Kudeatu deitzaileak"</string>
-    <string name="incall_label_swap" msgid="10458642864243507">"Aldatu"</string>
-    <string name="incall_note_sent" msgid="4524130323127388367">"Bidali da oharra"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_label_videocall">Bideo-deia</string>
+  <string name="incall_label_rttcall">RTT</string>
+  <string name="incall_label_hold">Utzi zain</string>
+  <string name="incall_label_add_call">Gehitu deia</string>
+  <string name="incall_label_mute">Des. audioa</string>
+  <string name="incall_label_end_call">Amaitu deia</string>
+  <string name="incall_label_dialpad">Teklatua</string>
+  <string name="incall_talkback_speaker_on">, aktibatuta</string>
+  <string name="incall_talkback_speaker_off">, desaktib.</string>
+  <string name="incall_label_merge">Bateratu</string>
+  <string name="incall_label_manage">Kudeatu</string>
+  <string name="a11y_description_incall_label_manage_content">Kudeatu deitzaileak</string>
+  <string name="incall_label_swap">Aldatu</string>
+  <string name="incall_label_swap_sim">Aldatu SIMa</string>
+  <string name="incall_note_sent">Bidali da oharra</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-fa/strings.xml b/java/com/android/incallui/incall/impl/res/values-fa/strings.xml
index a26ac75..f939926 100644
--- a/java/com/android/incallui/incall/impl/res/values-fa/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-fa/strings.xml
@@ -1,33 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_label_videocall" msgid="2208755440134676113">"تماس ویدئویی"</string>
-    <string name="incall_label_hold" msgid="4223472584896867896">"درحال انتظار"</string>
-    <string name="incall_label_add_call" msgid="5641663436373994915">"افزودن تماس"</string>
-    <string name="incall_label_mute" msgid="2180667027331706737">"بی‌صدا کردن"</string>
-    <string name="incall_label_end_call" msgid="5434079261446614887">"پایان تماس"</string>
-    <string name="incall_label_dialpad" msgid="8609779533654156550">"صفحه کلید"</string>
-    <string name="incall_talkback_speaker_on" msgid="5819463769258124228">"، فعال است"</string>
-    <string name="incall_talkback_speaker_off" msgid="7486836772563090186">"، غیرفعال است"</string>
-    <string name="incall_label_merge" msgid="720076442985913175">"ادغام"</string>
-    <string name="incall_label_manage" msgid="2175471192903568159">"مدیریت"</string>
-    <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"مدیریت تماس‌گیرندگان"</string>
-    <string name="incall_label_swap" msgid="10458642864243507">"جابه‌جایی"</string>
-    <string name="incall_note_sent" msgid="4524130323127388367">"یادداشت ارسال شد"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_label_videocall">تماس ویدئویی</string>
+  <string name="incall_label_rttcall">RTT</string>
+  <string name="incall_label_hold">درحال انتظار</string>
+  <string name="incall_label_add_call">افزودن تماس</string>
+  <string name="incall_label_mute">بی‌صدا کردن</string>
+  <string name="incall_label_end_call">پایان تماس</string>
+  <string name="incall_label_dialpad">صفحه کلید</string>
+  <string name="incall_talkback_speaker_on">، فعال است</string>
+  <string name="incall_talkback_speaker_off">، غیرفعال است</string>
+  <string name="incall_label_merge">ادغام</string>
+  <string name="incall_label_manage">مدیریت</string>
+  <string name="a11y_description_incall_label_manage_content">مدیریت تماس‌گیرندگان</string>
+  <string name="incall_label_swap">جابه‌جایی</string>
+  <string name="incall_label_swap_sim">تغییر سیم‌کارت</string>
+  <string name="incall_note_sent">یادداشت ارسال شد</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-fi/strings.xml b/java/com/android/incallui/incall/impl/res/values-fi/strings.xml
index 9ae5348..f08869d 100644
--- a/java/com/android/incallui/incall/impl/res/values-fi/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-fi/strings.xml
@@ -1,33 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_label_videocall" msgid="2208755440134676113">"Videopuhelu"</string>
-    <string name="incall_label_hold" msgid="4223472584896867896">"Pitoon"</string>
-    <string name="incall_label_add_call" msgid="5641663436373994915">"Lisää puhelu"</string>
-    <string name="incall_label_mute" msgid="2180667027331706737">"Mykistä"</string>
-    <string name="incall_label_end_call" msgid="5434079261446614887">"Päätä puhelu"</string>
-    <string name="incall_label_dialpad" msgid="8609779533654156550">"Näppäimistö"</string>
-    <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", käytössä"</string>
-    <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", ei käytössä"</string>
-    <string name="incall_label_merge" msgid="720076442985913175">"Yhdistä"</string>
-    <string name="incall_label_manage" msgid="2175471192903568159">"Hallinnoi"</string>
-    <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"Hallinnoi soittajia"</string>
-    <string name="incall_label_swap" msgid="10458642864243507">"Vaihda"</string>
-    <string name="incall_note_sent" msgid="4524130323127388367">"Muistiinpano lähetettiin."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_label_videocall">Videopuhelu</string>
+  <string name="incall_label_rttcall">Puhelusta lähetettävä teksti</string>
+  <string name="incall_label_hold">Pitoon</string>
+  <string name="incall_label_add_call">Lisää puhelu</string>
+  <string name="incall_label_mute">Mykistä</string>
+  <string name="incall_label_end_call">Päätä puhelu</string>
+  <string name="incall_label_dialpad">Näppäimistö</string>
+  <string name="incall_talkback_speaker_on">, käytössä</string>
+  <string name="incall_talkback_speaker_off">, ei käytössä</string>
+  <string name="incall_label_merge">Yhdistä</string>
+  <string name="incall_label_manage">Hallinnoi</string>
+  <string name="a11y_description_incall_label_manage_content">Hallinnoi soittajia</string>
+  <string name="incall_label_swap">Vaihda</string>
+  <string name="incall_label_swap_sim">Vaihda SIM</string>
+  <string name="incall_note_sent">Muistiinpano lähetettiin.</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-fr-rCA/strings.xml b/java/com/android/incallui/incall/impl/res/values-fr-rCA/strings.xml
index cff6745..39ca48e 100644
--- a/java/com/android/incallui/incall/impl/res/values-fr-rCA/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-fr-rCA/strings.xml
@@ -1,33 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_label_videocall" msgid="2208755440134676113">"Appel vidéo"</string>
-    <string name="incall_label_hold" msgid="4223472584896867896">"En attente"</string>
-    <string name="incall_label_add_call" msgid="5641663436373994915">"Autre appel"</string>
-    <string name="incall_label_mute" msgid="2180667027331706737">"Couper son"</string>
-    <string name="incall_label_end_call" msgid="5434079261446614887">"Raccrocher"</string>
-    <string name="incall_label_dialpad" msgid="8609779533654156550">"Clavier"</string>
-    <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", activé"</string>
-    <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", désactivé"</string>
-    <string name="incall_label_merge" msgid="720076442985913175">"Fusionner"</string>
-    <string name="incall_label_manage" msgid="2175471192903568159">"Gérer"</string>
-    <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"Gérer les appels"</string>
-    <string name="incall_label_swap" msgid="10458642864243507">"Permuter"</string>
-    <string name="incall_note_sent" msgid="4524130323127388367">"Note envoyée"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_label_videocall">Appel vidéo</string>
+  <string name="incall_label_rttcall">TTR</string>
+  <string name="incall_label_hold">En attente</string>
+  <string name="incall_label_add_call">Autre appel</string>
+  <string name="incall_label_mute">Couper son</string>
+  <string name="incall_label_end_call">Raccrocher</string>
+  <string name="incall_label_dialpad">Clavier</string>
+  <string name="incall_talkback_speaker_on">, activé</string>
+  <string name="incall_talkback_speaker_off">, désactivé</string>
+  <string name="incall_label_merge">Fusionner</string>
+  <string name="incall_label_manage">Gérer</string>
+  <string name="a11y_description_incall_label_manage_content">Gérer les appels</string>
+  <string name="incall_label_swap">Permuter</string>
+  <string name="incall_label_swap_sim">Changer SIM</string>
+  <string name="incall_note_sent">Note envoyée</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-fr/strings.xml b/java/com/android/incallui/incall/impl/res/values-fr/strings.xml
index 14e92be..8fca0fe 100644
--- a/java/com/android/incallui/incall/impl/res/values-fr/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-fr/strings.xml
@@ -1,33 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_label_videocall" msgid="2208755440134676113">"Appel vidéo"</string>
-    <string name="incall_label_hold" msgid="4223472584896867896">"En attente"</string>
-    <string name="incall_label_add_call" msgid="5641663436373994915">"Autre appel"</string>
-    <string name="incall_label_mute" msgid="2180667027331706737">"Couper micro"</string>
-    <string name="incall_label_end_call" msgid="5434079261446614887">"Raccrocher"</string>
-    <string name="incall_label_dialpad" msgid="8609779533654156550">"Clavier"</string>
-    <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", activé"</string>
-    <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", désactivé"</string>
-    <string name="incall_label_merge" msgid="720076442985913175">"Fusionner"</string>
-    <string name="incall_label_manage" msgid="2175471192903568159">"Gérer"</string>
-    <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"Gérer les appelants"</string>
-    <string name="incall_label_swap" msgid="10458642864243507">"Permuter"</string>
-    <string name="incall_note_sent" msgid="4524130323127388367">"Note envoyée"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_label_videocall">Appel vidéo</string>
+  <string name="incall_label_rttcall">Txt tps réel</string>
+  <string name="incall_label_hold">En attente</string>
+  <string name="incall_label_add_call">Autre appel</string>
+  <string name="incall_label_mute">Couper micro</string>
+  <string name="incall_label_end_call">Raccrocher</string>
+  <string name="incall_label_dialpad">Clavier</string>
+  <string name="incall_talkback_speaker_on">, activé</string>
+  <string name="incall_talkback_speaker_off">, désactivé</string>
+  <string name="incall_label_merge">Fusionner</string>
+  <string name="incall_label_manage">Gérer</string>
+  <string name="a11y_description_incall_label_manage_content">Gérer les appelants</string>
+  <string name="incall_label_swap">Permuter</string>
+  <string name="incall_label_swap_sim">Changer SIM</string>
+  <string name="incall_note_sent">Note envoyée</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-gl/strings.xml b/java/com/android/incallui/incall/impl/res/values-gl/strings.xml
index 4b399f4..519572b 100644
--- a/java/com/android/incallui/incall/impl/res/values-gl/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-gl/strings.xml
@@ -1,33 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_label_videocall" msgid="2208755440134676113">"Videochamada"</string>
-    <string name="incall_label_hold" msgid="4223472584896867896">"En espera"</string>
-    <string name="incall_label_add_call" msgid="5641663436373994915">"Eng. chamada"</string>
-    <string name="incall_label_mute" msgid="2180667027331706737">"Ignorar"</string>
-    <string name="incall_label_end_call" msgid="5434079261446614887">"Finalizar chamada"</string>
-    <string name="incall_label_dialpad" msgid="8609779533654156550">"Teclado"</string>
-    <string name="incall_talkback_speaker_on" msgid="5819463769258124228">"activado"</string>
-    <string name="incall_talkback_speaker_off" msgid="7486836772563090186">"desactivado"</string>
-    <string name="incall_label_merge" msgid="720076442985913175">"Combinar"</string>
-    <string name="incall_label_manage" msgid="2175471192903568159">"Xestionar"</string>
-    <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"Xestionar emisores de chamadas"</string>
-    <string name="incall_label_swap" msgid="10458642864243507">"Cambiar"</string>
-    <string name="incall_note_sent" msgid="4524130323127388367">"Enviouse a nota"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_label_videocall">Videochamada</string>
+  <string name="incall_label_rttcall">RTT</string>
+  <string name="incall_label_hold">En espera</string>
+  <string name="incall_label_add_call">Eng. chamada</string>
+  <string name="incall_label_mute">Ignorar</string>
+  <string name="incall_label_end_call">Finalizar chamada</string>
+  <string name="incall_label_dialpad">Teclado</string>
+  <string name="incall_talkback_speaker_on">activado</string>
+  <string name="incall_talkback_speaker_off">desactivado</string>
+  <string name="incall_label_merge">Combinar</string>
+  <string name="incall_label_manage">Xestionar</string>
+  <string name="a11y_description_incall_label_manage_content">Xestionar emisores de chamadas</string>
+  <string name="incall_label_swap">Cambiar</string>
+  <string name="incall_label_swap_sim">Cambiar SIM</string>
+  <string name="incall_note_sent">Enviouse a nota</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-gu/strings.xml b/java/com/android/incallui/incall/impl/res/values-gu/strings.xml
index 438f0f3..4299283 100644
--- a/java/com/android/incallui/incall/impl/res/values-gu/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-gu/strings.xml
@@ -1,33 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_label_videocall" msgid="2208755440134676113">"વિડિઓ કૉલ"</string>
-    <string name="incall_label_hold" msgid="4223472584896867896">"હોલ્ડ કરો"</string>
-    <string name="incall_label_add_call" msgid="5641663436373994915">"કૉલ ઉમેરો"</string>
-    <string name="incall_label_mute" msgid="2180667027331706737">"મ્યૂટ કરો"</string>
-    <string name="incall_label_end_call" msgid="5434079261446614887">"કૉલ સમાપ્ત કરો"</string>
-    <string name="incall_label_dialpad" msgid="8609779533654156550">"કીપેડ"</string>
-    <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", ચાલુ છે"</string>
-    <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", બંધ છે"</string>
-    <string name="incall_label_merge" msgid="720076442985913175">"મર્જ કરો"</string>
-    <string name="incall_label_manage" msgid="2175471192903568159">"સંચાલિત કરો"</string>
-    <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"કૉલર્સને સંચાલિત કરો"</string>
-    <string name="incall_label_swap" msgid="10458642864243507">"સ્વેપ કરો"</string>
-    <string name="incall_note_sent" msgid="4524130323127388367">"નોંધ મોકલી"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_label_videocall">વિડિઓ કૉલ</string>
+  <string name="incall_label_rttcall">RTT</string>
+  <string name="incall_label_hold">હોલ્ડ કરો</string>
+  <string name="incall_label_add_call">કૉલ ઉમેરો</string>
+  <string name="incall_label_mute">મ્યૂટ કરો</string>
+  <string name="incall_label_end_call">કૉલ સમાપ્ત કરો</string>
+  <string name="incall_label_dialpad">કીપેડ</string>
+  <string name="incall_talkback_speaker_on">, ચાલુ છે</string>
+  <string name="incall_talkback_speaker_off">, બંધ છે</string>
+  <string name="incall_label_merge">મર્જ કરો</string>
+  <string name="incall_label_manage">સંચાલિત કરો</string>
+  <string name="a11y_description_incall_label_manage_content">કૉલર્સને સંચાલિત કરો</string>
+  <string name="incall_label_swap">સ્વેપ કરો</string>
+  <string name="incall_label_swap_sim">સિમ બદલો</string>
+  <string name="incall_note_sent">નોંધ મોકલી</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-hi/strings.xml b/java/com/android/incallui/incall/impl/res/values-hi/strings.xml
index 39e6e6b..9360c15 100644
--- a/java/com/android/incallui/incall/impl/res/values-hi/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-hi/strings.xml
@@ -1,33 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_label_videocall" msgid="2208755440134676113">"वीडियो कॉल"</string>
-    <string name="incall_label_hold" msgid="4223472584896867896">"होल्ड करें"</string>
-    <string name="incall_label_add_call" msgid="5641663436373994915">"कॉल जोड़ें"</string>
-    <string name="incall_label_mute" msgid="2180667027331706737">"म्यूट करें"</string>
-    <string name="incall_label_end_call" msgid="5434079261446614887">"कॉल समाप्त करें"</string>
-    <string name="incall_label_dialpad" msgid="8609779533654156550">"कीपैड"</string>
-    <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", चालू है"</string>
-    <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", बंद है"</string>
-    <string name="incall_label_merge" msgid="720076442985913175">"एक बनाएं"</string>
-    <string name="incall_label_manage" msgid="2175471192903568159">"प्रबंधित करें"</string>
-    <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"कॉलर प्रबंधित करें"</string>
-    <string name="incall_label_swap" msgid="10458642864243507">"स्वैप करें"</string>
-    <string name="incall_note_sent" msgid="4524130323127388367">"नोट भेज दिया गया है"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_label_videocall">वीडियो कॉल</string>
+  <string name="incall_label_rttcall">आरटीटी</string>
+  <string name="incall_label_hold">होल्ड करें</string>
+  <string name="incall_label_add_call">कॉल जोड़ें</string>
+  <string name="incall_label_mute">म्यूट करें</string>
+  <string name="incall_label_end_call">कॉल समाप्त करें</string>
+  <string name="incall_label_dialpad">कीपैड</string>
+  <string name="incall_talkback_speaker_on">, चालू है</string>
+  <string name="incall_talkback_speaker_off">, बंद है</string>
+  <string name="incall_label_merge">एक बनाएं</string>
+  <string name="incall_label_manage">प्रबंधित करें</string>
+  <string name="a11y_description_incall_label_manage_content">कॉलर प्रबंधित करें</string>
+  <string name="incall_label_swap">स्वैप करें</string>
+  <string name="incall_label_swap_sim">सिम बदलें</string>
+  <string name="incall_note_sent">नोट भेज दिया गया है</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-hr/strings.xml b/java/com/android/incallui/incall/impl/res/values-hr/strings.xml
index e440028..2634c6a 100644
--- a/java/com/android/incallui/incall/impl/res/values-hr/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-hr/strings.xml
@@ -1,33 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_label_videocall" msgid="2208755440134676113">"Videopoziv"</string>
-    <string name="incall_label_hold" msgid="4223472584896867896">"Pauziraj"</string>
-    <string name="incall_label_add_call" msgid="5641663436373994915">"Dodaj poziv"</string>
-    <string name="incall_label_mute" msgid="2180667027331706737">"Isklj. zvuk"</string>
-    <string name="incall_label_end_call" msgid="5434079261446614887">"Prekini poziv"</string>
-    <string name="incall_label_dialpad" msgid="8609779533654156550">"Tipkovnica"</string>
-    <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", uključeno"</string>
-    <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", isključeno"</string>
-    <string name="incall_label_merge" msgid="720076442985913175">"Spoji"</string>
-    <string name="incall_label_manage" msgid="2175471192903568159">"Upravljanje"</string>
-    <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"Upravljaj pozivateljima"</string>
-    <string name="incall_label_swap" msgid="10458642864243507">"Zamijeni"</string>
-    <string name="incall_note_sent" msgid="4524130323127388367">"Bilješka je poslana"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_label_videocall">Videopoziv</string>
+  <string name="incall_label_rttcall">RTT</string>
+  <string name="incall_label_hold">Pauziraj</string>
+  <string name="incall_label_add_call">Dodaj poziv</string>
+  <string name="incall_label_mute">Isklj. zvuk</string>
+  <string name="incall_label_end_call">Prekini poziv</string>
+  <string name="incall_label_dialpad">Tipkovnica</string>
+  <string name="incall_talkback_speaker_on">, uključeno</string>
+  <string name="incall_talkback_speaker_off">, isključeno</string>
+  <string name="incall_label_merge">Spoji</string>
+  <string name="incall_label_manage">Upravljanje</string>
+  <string name="a11y_description_incall_label_manage_content">Upravljaj pozivateljima</string>
+  <string name="incall_label_swap">Zamijeni</string>
+  <string name="incall_label_swap_sim">Promijeni SIM</string>
+  <string name="incall_note_sent">Bilješka je poslana</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-hu/strings.xml b/java/com/android/incallui/incall/impl/res/values-hu/strings.xml
index e63ce59..609908f 100644
--- a/java/com/android/incallui/incall/impl/res/values-hu/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-hu/strings.xml
@@ -1,33 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_label_videocall" msgid="2208755440134676113">"Videohívás"</string>
-    <string name="incall_label_hold" msgid="4223472584896867896">"Várakoztatás"</string>
-    <string name="incall_label_add_call" msgid="5641663436373994915">"Hívás felv."</string>
-    <string name="incall_label_mute" msgid="2180667027331706737">"Némítás"</string>
-    <string name="incall_label_end_call" msgid="5434079261446614887">"Hívás vége"</string>
-    <string name="incall_label_dialpad" msgid="8609779533654156550">"Billentyűzet"</string>
-    <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", be"</string>
-    <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", ki"</string>
-    <string name="incall_label_merge" msgid="720076442985913175">"Egyesítés"</string>
-    <string name="incall_label_manage" msgid="2175471192903568159">"Kezelés"</string>
-    <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"Hívók kezelése"</string>
-    <string name="incall_label_swap" msgid="10458642864243507">"Csere"</string>
-    <string name="incall_note_sent" msgid="4524130323127388367">"Üzenet elküldve"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_label_videocall">Videohívás</string>
+  <string name="incall_label_rttcall">RTT</string>
+  <string name="incall_label_hold">Várakoztatás</string>
+  <string name="incall_label_add_call">Hívás felv.</string>
+  <string name="incall_label_mute">Némítás</string>
+  <string name="incall_label_end_call">Hívás vége</string>
+  <string name="incall_label_dialpad">Billentyűzet</string>
+  <string name="incall_talkback_speaker_on">, be</string>
+  <string name="incall_talkback_speaker_off">, ki</string>
+  <string name="incall_label_merge">Egyesítés</string>
+  <string name="incall_label_manage">Kezelés</string>
+  <string name="a11y_description_incall_label_manage_content">Hívók kezelése</string>
+  <string name="incall_label_swap">Csere</string>
+  <string name="incall_label_swap_sim">Másik SIM</string>
+  <string name="incall_note_sent">Üzenet elküldve</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-hy/strings.xml b/java/com/android/incallui/incall/impl/res/values-hy/strings.xml
index ce395e7..479b543 100644
--- a/java/com/android/incallui/incall/impl/res/values-hy/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-hy/strings.xml
@@ -1,33 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_label_videocall" msgid="2208755440134676113">"Տեսազանգ"</string>
-    <string name="incall_label_hold" msgid="4223472584896867896">"Պահել զանգը"</string>
-    <string name="incall_label_add_call" msgid="5641663436373994915">"Ավելացնել զանգ"</string>
-    <string name="incall_label_mute" msgid="2180667027331706737">"Անջատել"</string>
-    <string name="incall_label_end_call" msgid="5434079261446614887">"Ավարտել զանգը"</string>
-    <string name="incall_label_dialpad" msgid="8609779533654156550">"Ստեղնաշար"</string>
-    <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", միացած է"</string>
-    <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", անջատած է"</string>
-    <string name="incall_label_merge" msgid="720076442985913175">"Միավորել"</string>
-    <string name="incall_label_manage" msgid="2175471192903568159">"Կառավարել"</string>
-    <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"Զանգողների կառավարում"</string>
-    <string name="incall_label_swap" msgid="10458642864243507">"Փոխարկել"</string>
-    <string name="incall_note_sent" msgid="4524130323127388367">"Գրառումն ուղարկվեց"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_label_videocall">Տեսազանգ</string>
+  <string name="incall_label_rttcall">RTT</string>
+  <string name="incall_label_hold">Պահել զանգը</string>
+  <string name="incall_label_add_call">Ավելացնել զանգ</string>
+  <string name="incall_label_mute">Անջատել</string>
+  <string name="incall_label_end_call">Ավարտել զանգը</string>
+  <string name="incall_label_dialpad">Ստեղնաշար</string>
+  <string name="incall_talkback_speaker_on">, միացած է</string>
+  <string name="incall_talkback_speaker_off">, անջատած է</string>
+  <string name="incall_label_merge">Միավորել</string>
+  <string name="incall_label_manage">Կառավարել</string>
+  <string name="a11y_description_incall_label_manage_content">Զանգողների կառավարում</string>
+  <string name="incall_label_swap">Փոխարկել</string>
+  <string name="incall_label_swap_sim">Փոխել SIM-ը</string>
+  <string name="incall_note_sent">Գրառումն ուղարկվեց</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-in/strings.xml b/java/com/android/incallui/incall/impl/res/values-in/strings.xml
index e9d738a..321d22c 100644
--- a/java/com/android/incallui/incall/impl/res/values-in/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-in/strings.xml
@@ -1,33 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_label_videocall" msgid="2208755440134676113">"Video call"</string>
-    <string name="incall_label_hold" msgid="4223472584896867896">"Tahan"</string>
-    <string name="incall_label_add_call" msgid="5641663436373994915">"Tambahkan panggilan"</string>
-    <string name="incall_label_mute" msgid="2180667027331706737">"Bisukan"</string>
-    <string name="incall_label_end_call" msgid="5434079261446614887">"Akhiri panggilan"</string>
-    <string name="incall_label_dialpad" msgid="8609779533654156550">"Keypad"</string>
-    <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", aktif"</string>
-    <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", Nonaktif"</string>
-    <string name="incall_label_merge" msgid="720076442985913175">"Gabungkan"</string>
-    <string name="incall_label_manage" msgid="2175471192903568159">"Kelola"</string>
-    <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"Kelola penelepon"</string>
-    <string name="incall_label_swap" msgid="10458642864243507">"Tukar"</string>
-    <string name="incall_note_sent" msgid="4524130323127388367">"Catatan telah dikirim"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_label_videocall">Video call</string>
+  <string name="incall_label_rttcall">RTT</string>
+  <string name="incall_label_hold">Tahan</string>
+  <string name="incall_label_add_call">Tambahkan panggilan</string>
+  <string name="incall_label_mute">Bisukan</string>
+  <string name="incall_label_end_call">Akhiri panggilan</string>
+  <string name="incall_label_dialpad">Keypad</string>
+  <string name="incall_talkback_speaker_on">, aktif</string>
+  <string name="incall_talkback_speaker_off">, Nonaktif</string>
+  <string name="incall_label_merge">Gabungkan</string>
+  <string name="incall_label_manage">Kelola</string>
+  <string name="a11y_description_incall_label_manage_content">Kelola penelepon</string>
+  <string name="incall_label_swap">Tukar</string>
+  <string name="incall_label_swap_sim">Ubah SIM</string>
+  <string name="incall_note_sent">Catatan telah dikirim</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-is/strings.xml b/java/com/android/incallui/incall/impl/res/values-is/strings.xml
index f262e3f..a77795e 100644
--- a/java/com/android/incallui/incall/impl/res/values-is/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-is/strings.xml
@@ -1,33 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_label_videocall" msgid="2208755440134676113">"Myndsímtal"</string>
-    <string name="incall_label_hold" msgid="4223472584896867896">"Setja í bið"</string>
-    <string name="incall_label_add_call" msgid="5641663436373994915">"Bæta við"</string>
-    <string name="incall_label_mute" msgid="2180667027331706737">"Hljóð af"</string>
-    <string name="incall_label_end_call" msgid="5434079261446614887">"Ljúka"</string>
-    <string name="incall_label_dialpad" msgid="8609779533654156550">"Talnaborð"</string>
-    <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", kveikt"</string>
-    <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", slökkt"</string>
-    <string name="incall_label_merge" msgid="720076442985913175">"Sameina"</string>
-    <string name="incall_label_manage" msgid="2175471192903568159">"Stjórna"</string>
-    <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"Hafa umsjón með hringjendum"</string>
-    <string name="incall_label_swap" msgid="10458642864243507">"Skipta milli"</string>
-    <string name="incall_note_sent" msgid="4524130323127388367">"Glósa send"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_label_videocall">Myndsímtal</string>
+  <string name="incall_label_rttcall">RTT</string>
+  <string name="incall_label_hold">Setja í bið</string>
+  <string name="incall_label_add_call">Bæta við</string>
+  <string name="incall_label_mute">Hljóð af</string>
+  <string name="incall_label_end_call">Ljúka</string>
+  <string name="incall_label_dialpad">Talnaborð</string>
+  <string name="incall_talkback_speaker_on">, kveikt</string>
+  <string name="incall_talkback_speaker_off">, slökkt</string>
+  <string name="incall_label_merge">Sameina</string>
+  <string name="incall_label_manage">Stjórna</string>
+  <string name="a11y_description_incall_label_manage_content">Hafa umsjón með hringjendum</string>
+  <string name="incall_label_swap">Skipta milli</string>
+  <string name="incall_label_swap_sim">Breyta SIM</string>
+  <string name="incall_note_sent">Glósa send</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-it/strings.xml b/java/com/android/incallui/incall/impl/res/values-it/strings.xml
index f29a702..0957bd4 100644
--- a/java/com/android/incallui/incall/impl/res/values-it/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-it/strings.xml
@@ -1,33 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_label_videocall" msgid="2208755440134676113">"Videochiamata"</string>
-    <string name="incall_label_hold" msgid="4223472584896867896">"In attesa"</string>
-    <string name="incall_label_add_call" msgid="5641663436373994915">"Aggiungi chiamata"</string>
-    <string name="incall_label_mute" msgid="2180667027331706737">"Disattiva"</string>
-    <string name="incall_label_end_call" msgid="5434079261446614887">"Termina chiamata"</string>
-    <string name="incall_label_dialpad" msgid="8609779533654156550">"Tastierino"</string>
-    <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", attivo"</string>
-    <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", non attivo"</string>
-    <string name="incall_label_merge" msgid="720076442985913175">"Unisci"</string>
-    <string name="incall_label_manage" msgid="2175471192903568159">"Gestisci"</string>
-    <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"Gestisci chiamanti"</string>
-    <string name="incall_label_swap" msgid="10458642864243507">"Scambia"</string>
-    <string name="incall_note_sent" msgid="4524130323127388367">"Nota inviata"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_label_videocall">Videochiamata</string>
+  <string name="incall_label_rttcall">RTT</string>
+  <string name="incall_label_hold">In attesa</string>
+  <string name="incall_label_add_call">Aggiungi chiamata</string>
+  <string name="incall_label_mute">Disattiva</string>
+  <string name="incall_label_end_call">Termina chiamata</string>
+  <string name="incall_label_dialpad">Tastierino</string>
+  <string name="incall_talkback_speaker_on">, attivo</string>
+  <string name="incall_talkback_speaker_off">, non attivo</string>
+  <string name="incall_label_merge">Unisci</string>
+  <string name="incall_label_manage">Gestisci</string>
+  <string name="a11y_description_incall_label_manage_content">Gestisci chiamanti</string>
+  <string name="incall_label_swap">Scambia</string>
+  <string name="incall_label_swap_sim">Cambia SIM</string>
+  <string name="incall_note_sent">Nota inviata</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-iw/strings.xml b/java/com/android/incallui/incall/impl/res/values-iw/strings.xml
index bf08e3b..db702ef 100644
--- a/java/com/android/incallui/incall/impl/res/values-iw/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-iw/strings.xml
@@ -1,33 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_label_videocall" msgid="2208755440134676113">"שיחת וידאו"</string>
-    <string name="incall_label_hold" msgid="4223472584896867896">"המתנה"</string>
-    <string name="incall_label_add_call" msgid="5641663436373994915">"הוסף שיחה"</string>
-    <string name="incall_label_mute" msgid="2180667027331706737">"השתק"</string>
-    <string name="incall_label_end_call" msgid="5434079261446614887">"סיום השיחה"</string>
-    <string name="incall_label_dialpad" msgid="8609779533654156550">"לוח חיוג"</string>
-    <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", מופעל"</string>
-    <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", מושבת"</string>
-    <string name="incall_label_merge" msgid="720076442985913175">"מזג"</string>
-    <string name="incall_label_manage" msgid="2175471192903568159">"נהל"</string>
-    <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"ניהול המתקשרים"</string>
-    <string name="incall_label_swap" msgid="10458642864243507">"החלף"</string>
-    <string name="incall_note_sent" msgid="4524130323127388367">"ההערה נשלחה"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_label_videocall">שיחת וידאו</string>
+  <string name="incall_label_rttcall">RTT</string>
+  <string name="incall_label_hold">המתנה</string>
+  <string name="incall_label_add_call">הוסף שיחה</string>
+  <string name="incall_label_mute">השתק</string>
+  <string name="incall_label_end_call">סיום השיחה</string>
+  <string name="incall_label_dialpad">לוח חיוג</string>
+  <string name="incall_talkback_speaker_on">, מופעל</string>
+  <string name="incall_talkback_speaker_off">, מושבת</string>
+  <string name="incall_label_merge">מזג</string>
+  <string name="incall_label_manage">נהל</string>
+  <string name="a11y_description_incall_label_manage_content">ניהול המתקשרים</string>
+  <string name="incall_label_swap">החלף</string>
+  <string name="incall_label_swap_sim">‏החלפת SIM</string>
+  <string name="incall_note_sent">ההערה נשלחה</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-ja/strings.xml b/java/com/android/incallui/incall/impl/res/values-ja/strings.xml
index b78ee20..041a427 100644
--- a/java/com/android/incallui/incall/impl/res/values-ja/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-ja/strings.xml
@@ -1,33 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_label_videocall" msgid="2208755440134676113">"ビデオ通話"</string>
-    <string name="incall_label_hold" msgid="4223472584896867896">"保留"</string>
-    <string name="incall_label_add_call" msgid="5641663436373994915">"通話を追加"</string>
-    <string name="incall_label_mute" msgid="2180667027331706737">"ミュート"</string>
-    <string name="incall_label_end_call" msgid="5434079261446614887">"通話を終了"</string>
-    <string name="incall_label_dialpad" msgid="8609779533654156550">"キーパッド"</string>
-    <string name="incall_talkback_speaker_on" msgid="5819463769258124228">"がオンです"</string>
-    <string name="incall_talkback_speaker_off" msgid="7486836772563090186">"がオフです"</string>
-    <string name="incall_label_merge" msgid="720076442985913175">"統合"</string>
-    <string name="incall_label_manage" msgid="2175471192903568159">"管理"</string>
-    <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"発信者を管理"</string>
-    <string name="incall_label_swap" msgid="10458642864243507">"切り替え"</string>
-    <string name="incall_note_sent" msgid="4524130323127388367">"メモを送信しました"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_label_videocall">ビデオ通話</string>
+  <string name="incall_label_rttcall">RTT</string>
+  <string name="incall_label_hold">保留</string>
+  <string name="incall_label_add_call">通話を追加</string>
+  <string name="incall_label_mute">ミュート</string>
+  <string name="incall_label_end_call">通話を終了</string>
+  <string name="incall_label_dialpad">キーパッド</string>
+  <string name="incall_talkback_speaker_on">がオンです</string>
+  <string name="incall_talkback_speaker_off">がオフです</string>
+  <string name="incall_label_merge">統合</string>
+  <string name="incall_label_manage">管理</string>
+  <string name="a11y_description_incall_label_manage_content">発信者を管理</string>
+  <string name="incall_label_swap">切り替え</string>
+  <string name="incall_label_swap_sim">SIM を変更</string>
+  <string name="incall_note_sent">メモを送信しました</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-ka/strings.xml b/java/com/android/incallui/incall/impl/res/values-ka/strings.xml
index f6926f3..6d7e460 100644
--- a/java/com/android/incallui/incall/impl/res/values-ka/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-ka/strings.xml
@@ -1,33 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_label_videocall" msgid="2208755440134676113">"ვიდეოზარი"</string>
-    <string name="incall_label_hold" msgid="4223472584896867896">"შეყოვნება"</string>
-    <string name="incall_label_add_call" msgid="5641663436373994915">"ზარის დამატ."</string>
-    <string name="incall_label_mute" msgid="2180667027331706737">"დადუმება"</string>
-    <string name="incall_label_end_call" msgid="5434079261446614887">"ზარის დასრ."</string>
-    <string name="incall_label_dialpad" msgid="8609779533654156550">"კლავიატურა"</string>
-    <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", ჩართულია"</string>
-    <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", გამორთულია"</string>
-    <string name="incall_label_merge" msgid="720076442985913175">"გაერთიანება"</string>
-    <string name="incall_label_manage" msgid="2175471192903568159">"მართვა"</string>
-    <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"აბონენტების მართვა"</string>
-    <string name="incall_label_swap" msgid="10458642864243507">"შენაცვლება"</string>
-    <string name="incall_note_sent" msgid="4524130323127388367">"ჩანიშვნა გაიგზავნა"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_label_videocall">ვიდეოზარი</string>
+  <string name="incall_label_rttcall">RTT</string>
+  <string name="incall_label_hold">შეყოვნება</string>
+  <string name="incall_label_add_call">ზარის დამატ.</string>
+  <string name="incall_label_mute">დადუმება</string>
+  <string name="incall_label_end_call">ზარის დასრ.</string>
+  <string name="incall_label_dialpad">კლავიატურა</string>
+  <string name="incall_talkback_speaker_on">, ჩართულია</string>
+  <string name="incall_talkback_speaker_off">, გამორთულია</string>
+  <string name="incall_label_merge">გაერთიანება</string>
+  <string name="incall_label_manage">მართვა</string>
+  <string name="a11y_description_incall_label_manage_content">აბონენტების მართვა</string>
+  <string name="incall_label_swap">შენაცვლება</string>
+  <string name="incall_label_swap_sim">SIMის შეცვლა</string>
+  <string name="incall_note_sent">ჩანიშვნა გაიგზავნა</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-kk/strings.xml b/java/com/android/incallui/incall/impl/res/values-kk/strings.xml
index 8da9982..3785e1c 100644
--- a/java/com/android/incallui/incall/impl/res/values-kk/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-kk/strings.xml
@@ -1,33 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_label_videocall" msgid="2208755440134676113">"Бейне қоңырау"</string>
-    <string name="incall_label_hold" msgid="4223472584896867896">"Күттіру"</string>
-    <string name="incall_label_add_call" msgid="5641663436373994915">"Қоңырау қосу"</string>
-    <string name="incall_label_mute" msgid="2180667027331706737">"Дыбысын өшіру"</string>
-    <string name="incall_label_end_call" msgid="5434079261446614887">"Қоңырауды аяқтау"</string>
-    <string name="incall_label_dialpad" msgid="8609779533654156550">"Пернетақта"</string>
-    <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", қосулы"</string>
-    <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", өшірулі"</string>
-    <string name="incall_label_merge" msgid="720076442985913175">"Біріктіру"</string>
-    <string name="incall_label_manage" msgid="2175471192903568159">"Басқару"</string>
-    <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"Қоңырау шалушыларды басқару"</string>
-    <string name="incall_label_swap" msgid="10458642864243507">"Ауыстыру"</string>
-    <string name="incall_note_sent" msgid="4524130323127388367">"Ескертпе жіберілді"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_label_videocall">Бейне қоңырау</string>
+  <string name="incall_label_rttcall">RTT</string>
+  <string name="incall_label_hold">Күттіру</string>
+  <string name="incall_label_add_call">Қоңырау қосу</string>
+  <string name="incall_label_mute">Дыбысын өшіру</string>
+  <string name="incall_label_end_call">Қоңырауды аяқтау</string>
+  <string name="incall_label_dialpad">Пернетақта</string>
+  <string name="incall_talkback_speaker_on">, қосулы</string>
+  <string name="incall_talkback_speaker_off">, өшірулі</string>
+  <string name="incall_label_merge">Біріктіру</string>
+  <string name="incall_label_manage">Басқару</string>
+  <string name="a11y_description_incall_label_manage_content">Қоңырау шалушыларды басқару</string>
+  <string name="incall_label_swap">Ауыстыру</string>
+  <string name="incall_label_swap_sim">SIM картасын ауыстыру</string>
+  <string name="incall_note_sent">Ескертпе жіберілді</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-km/strings.xml b/java/com/android/incallui/incall/impl/res/values-km/strings.xml
index 88e356a..4c758c2 100644
--- a/java/com/android/incallui/incall/impl/res/values-km/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-km/strings.xml
@@ -1,33 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_label_videocall" msgid="2208755440134676113">"ហៅ​ជា​វីដេអូ"</string>
-    <string name="incall_label_hold" msgid="4223472584896867896">"រង់ចាំ"</string>
-    <string name="incall_label_add_call" msgid="5641663436373994915">"បន្ថែម​ការ​ហៅ"</string>
-    <string name="incall_label_mute" msgid="2180667027331706737">"បិទ​សំឡេង"</string>
-    <string name="incall_label_end_call" msgid="5434079261446614887">"បញ្ចប់​ការ​ហៅ"</string>
-    <string name="incall_label_dialpad" msgid="8609779533654156550">"បន្ទះ​​ចុច​លេខ"</string>
-    <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", បាន​បើក"</string>
-    <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", បានបិទ"</string>
-    <string name="incall_label_merge" msgid="720076442985913175">"បញ្ចូលគ្នា"</string>
-    <string name="incall_label_manage" msgid="2175471192903568159">"គ្រប់គ្រង"</string>
-    <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"គ្រប់គ្រងអ្នក​ហៅ"</string>
-    <string name="incall_label_swap" msgid="10458642864243507">"ប្ដូរ"</string>
-    <string name="incall_note_sent" msgid="4524130323127388367">"បានផ្ញើចំណាំ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_label_videocall">ហៅ​ជា​វីដេអូ</string>
+  <string name="incall_label_rttcall">RTT</string>
+  <string name="incall_label_hold">រង់ចាំ</string>
+  <string name="incall_label_add_call">បន្ថែម​ការ​ហៅ</string>
+  <string name="incall_label_mute">បិទ​សំឡេង</string>
+  <string name="incall_label_end_call">បញ្ចប់​ការ​ហៅ</string>
+  <string name="incall_label_dialpad">បន្ទះ​​ចុច​លេខ</string>
+  <string name="incall_talkback_speaker_on">, បាន​បើក</string>
+  <string name="incall_talkback_speaker_off">, បានបិទ</string>
+  <string name="incall_label_merge">បញ្ចូលគ្នា</string>
+  <string name="incall_label_manage">គ្រប់គ្រង</string>
+  <string name="a11y_description_incall_label_manage_content">គ្រប់គ្រងអ្នក​ហៅ</string>
+  <string name="incall_label_swap">ប្ដូរ</string>
+  <string name="incall_label_swap_sim">ប្ដូរ SIM</string>
+  <string name="incall_note_sent">បានផ្ញើចំណាំ</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-kn/strings.xml b/java/com/android/incallui/incall/impl/res/values-kn/strings.xml
index ad29b6d..7015655 100644
--- a/java/com/android/incallui/incall/impl/res/values-kn/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-kn/strings.xml
@@ -1,33 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_label_videocall" msgid="2208755440134676113">"ವೀಡಿಯೊ ಕರೆ"</string>
-    <string name="incall_label_hold" msgid="4223472584896867896">"ಹೋಲ್ಡ್‌‌ ಮಾಡು"</string>
-    <string name="incall_label_add_call" msgid="5641663436373994915">"ಕರೆಯನ್ನು ಸೇರಿಸಿ"</string>
-    <string name="incall_label_mute" msgid="2180667027331706737">"ಮ್ಯೂಟ್ ಮಾಡಿ"</string>
-    <string name="incall_label_end_call" msgid="5434079261446614887">"ಕರೆ ಅಂತ್ಯಗೊಳಿಸಿ"</string>
-    <string name="incall_label_dialpad" msgid="8609779533654156550">"ಕೀಪ್ಯಾಡ್‌"</string>
-    <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", ಆನ್ ಆಗಿದೆ"</string>
-    <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", ಆಫ್ ಆಗಿದೆ"</string>
-    <string name="incall_label_merge" msgid="720076442985913175">"ವಿಲೀನಗೊಳಿಸು"</string>
-    <string name="incall_label_manage" msgid="2175471192903568159">"ನಿರ್ವಹಿಸು"</string>
-    <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"ಕರೆದಾತರನ್ನು ನಿರ್ವಹಿಸಿ"</string>
-    <string name="incall_label_swap" msgid="10458642864243507">"ಸ್ವ್ಯಾಪ್‌ ಮಾಡು"</string>
-    <string name="incall_note_sent" msgid="4524130323127388367">"ಟಿಪ್ಪಣಿ ಕಳುಹಿಸಲಾಗಿದೆ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_label_videocall">ವೀಡಿಯೊ ಕರೆ</string>
+  <string name="incall_label_rttcall">RTT</string>
+  <string name="incall_label_hold">ಹೋಲ್ಡ್‌‌ ಮಾಡು</string>
+  <string name="incall_label_add_call">ಕರೆಯನ್ನು ಸೇರಿಸಿ</string>
+  <string name="incall_label_mute">ಮ್ಯೂಟ್ ಮಾಡಿ</string>
+  <string name="incall_label_end_call">ಕರೆ ಅಂತ್ಯಗೊಳಿಸಿ</string>
+  <string name="incall_label_dialpad">ಕೀಪ್ಯಾಡ್‌</string>
+  <string name="incall_talkback_speaker_on">, ಆನ್ ಆಗಿದೆ</string>
+  <string name="incall_talkback_speaker_off">, ಆಫ್ ಆಗಿದೆ</string>
+  <string name="incall_label_merge">ವಿಲೀನಗೊಳಿಸು</string>
+  <string name="incall_label_manage">ನಿರ್ವಹಿಸು</string>
+  <string name="a11y_description_incall_label_manage_content">ಕರೆದಾತರನ್ನು ನಿರ್ವಹಿಸಿ</string>
+  <string name="incall_label_swap">ಸ್ವ್ಯಾಪ್‌ ಮಾಡು</string>
+  <string name="incall_label_swap_sim">ಸಿಮ್ ಬದಲಾಯಿಸಿ</string>
+  <string name="incall_note_sent">ಟಿಪ್ಪಣಿ ಕಳುಹಿಸಲಾಗಿದೆ</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-ko/strings.xml b/java/com/android/incallui/incall/impl/res/values-ko/strings.xml
index f9bb20f..c96909a 100644
--- a/java/com/android/incallui/incall/impl/res/values-ko/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-ko/strings.xml
@@ -1,33 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_label_videocall" msgid="2208755440134676113">"화상 통화"</string>
-    <string name="incall_label_hold" msgid="4223472584896867896">"대기"</string>
-    <string name="incall_label_add_call" msgid="5641663436373994915">"통화 추가"</string>
-    <string name="incall_label_mute" msgid="2180667027331706737">"음소거"</string>
-    <string name="incall_label_end_call" msgid="5434079261446614887">"통화 종료"</string>
-    <string name="incall_label_dialpad" msgid="8609779533654156550">"키패드"</string>
-    <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", 켜짐"</string>
-    <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", 꺼짐"</string>
-    <string name="incall_label_merge" msgid="720076442985913175">"병합"</string>
-    <string name="incall_label_manage" msgid="2175471192903568159">"관리"</string>
-    <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"발신자 관리"</string>
-    <string name="incall_label_swap" msgid="10458642864243507">"전환"</string>
-    <string name="incall_note_sent" msgid="4524130323127388367">"메모가 전송되었습니다."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_label_videocall">화상 통화</string>
+  <string name="incall_label_rttcall">RTT</string>
+  <string name="incall_label_hold">대기</string>
+  <string name="incall_label_add_call">통화 추가</string>
+  <string name="incall_label_mute">음소거</string>
+  <string name="incall_label_end_call">통화 종료</string>
+  <string name="incall_label_dialpad">키패드</string>
+  <string name="incall_talkback_speaker_on">, 켜짐</string>
+  <string name="incall_talkback_speaker_off">, 꺼짐</string>
+  <string name="incall_label_merge">병합</string>
+  <string name="incall_label_manage">관리</string>
+  <string name="a11y_description_incall_label_manage_content">발신자 관리</string>
+  <string name="incall_label_swap">전환</string>
+  <string name="incall_label_swap_sim">SIM 변경</string>
+  <string name="incall_note_sent">메모가 전송되었습니다.</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-ky/strings.xml b/java/com/android/incallui/incall/impl/res/values-ky/strings.xml
index f00264d..281159a 100644
--- a/java/com/android/incallui/incall/impl/res/values-ky/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-ky/strings.xml
@@ -1,33 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_label_videocall" msgid="2208755440134676113">"Видео чалуу"</string>
-    <string name="incall_label_hold" msgid="4223472584896867896">"Күттүрүү"</string>
-    <string name="incall_label_add_call" msgid="5641663436373994915">"Чалууну кошуу"</string>
-    <string name="incall_label_mute" msgid="2180667027331706737">"Үнүн өчүрүү"</string>
-    <string name="incall_label_end_call" msgid="5434079261446614887">"Чалууну бүтүрүү"</string>
-    <string name="incall_label_dialpad" msgid="8609779533654156550">"Ном. тергич"</string>
-    <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", күйүк"</string>
-    <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", өчүк"</string>
-    <string name="incall_label_merge" msgid="720076442985913175">"Бириктирүү"</string>
-    <string name="incall_label_manage" msgid="2175471192903568159">"Башкаруу"</string>
-    <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"Чалуучуларды башкаруу"</string>
-    <string name="incall_label_swap" msgid="10458642864243507">"Алмаштыруу"</string>
-    <string name="incall_note_sent" msgid="4524130323127388367">"Билдирүү жөнөтүлдү"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_label_videocall">Видео чалуу</string>
+  <string name="incall_label_rttcall">RTT</string>
+  <string name="incall_label_hold">Күттүрүү</string>
+  <string name="incall_label_add_call">Чалууну кошуу</string>
+  <string name="incall_label_mute">Үнүн өчүрүү</string>
+  <string name="incall_label_end_call">Чалууну бүтүрүү</string>
+  <string name="incall_label_dialpad">Ном. тергич</string>
+  <string name="incall_talkback_speaker_on">, күйүк</string>
+  <string name="incall_talkback_speaker_off">, өчүк</string>
+  <string name="incall_label_merge">Бириктирүү</string>
+  <string name="incall_label_manage">Башкаруу</string>
+  <string name="a11y_description_incall_label_manage_content">Чалуучуларды башкаруу</string>
+  <string name="incall_label_swap">Алмаштыруу</string>
+  <string name="incall_label_swap_sim">SIM-картаны өзгөртүү</string>
+  <string name="incall_note_sent">Билдирүү жөнөтүлдү</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-lo/strings.xml b/java/com/android/incallui/incall/impl/res/values-lo/strings.xml
index 2382f32..8233ee6 100644
--- a/java/com/android/incallui/incall/impl/res/values-lo/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-lo/strings.xml
@@ -1,33 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_label_videocall" msgid="2208755440134676113">"ໂທດ້ວຍວິດີໂອ"</string>
-    <string name="incall_label_hold" msgid="4223472584896867896">"ພັກສາຍຊົ່ວຄາວ"</string>
-    <string name="incall_label_add_call" msgid="5641663436373994915">"ເພີ່ມການໂທ"</string>
-    <string name="incall_label_mute" msgid="2180667027331706737">"ປີດສຽງ"</string>
-    <string name="incall_label_end_call" msgid="5434079261446614887">"ວາງສາຍ"</string>
-    <string name="incall_label_dialpad" msgid="8609779533654156550">"ແປ້ນກົດ"</string>
-    <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", ເປີດຢູ່"</string>
-    <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", ປິດຢູ່"</string>
-    <string name="incall_label_merge" msgid="720076442985913175">"ຮວມສາຍ"</string>
-    <string name="incall_label_manage" msgid="2175471192903568159">"ຈັດການ"</string>
-    <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"ຈັດການຜູ້ໂທ"</string>
-    <string name="incall_label_swap" msgid="10458642864243507">"ສະຫຼັບສາຍ"</string>
-    <string name="incall_note_sent" msgid="4524130323127388367">"ສົ່ງບັນທຶກແລ້ວ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_label_videocall">ໂທດ້ວຍວິດີໂອ</string>
+  <string name="incall_label_rttcall">RTT</string>
+  <string name="incall_label_hold">ພັກສາຍຊົ່ວຄາວ</string>
+  <string name="incall_label_add_call">ເພີ່ມການໂທ</string>
+  <string name="incall_label_mute">ປີດສຽງ</string>
+  <string name="incall_label_end_call">ວາງສາຍ</string>
+  <string name="incall_label_dialpad">ແປ້ນກົດ</string>
+  <string name="incall_talkback_speaker_on">, ເປີດຢູ່</string>
+  <string name="incall_talkback_speaker_off">, ປິດຢູ່</string>
+  <string name="incall_label_merge">ຮວມສາຍ</string>
+  <string name="incall_label_manage">ຈັດການ</string>
+  <string name="a11y_description_incall_label_manage_content">ຈັດການຜູ້ໂທ</string>
+  <string name="incall_label_swap">ສະຫຼັບສາຍ</string>
+  <string name="incall_label_swap_sim">ປ່ຽນຊິມ</string>
+  <string name="incall_note_sent">ສົ່ງບັນທຶກແລ້ວ</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-lt/strings.xml b/java/com/android/incallui/incall/impl/res/values-lt/strings.xml
index 1a10884..35dd940 100644
--- a/java/com/android/incallui/incall/impl/res/values-lt/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-lt/strings.xml
@@ -1,33 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_label_videocall" msgid="2208755440134676113">"Vaizdo skambutis"</string>
-    <string name="incall_label_hold" msgid="4223472584896867896">"Sulaikyti"</string>
-    <string name="incall_label_add_call" msgid="5641663436373994915">"Pr. skambutį"</string>
-    <string name="incall_label_mute" msgid="2180667027331706737">"Nutildyti"</string>
-    <string name="incall_label_end_call" msgid="5434079261446614887">"Baig. skamb."</string>
-    <string name="incall_label_dialpad" msgid="8609779533654156550">"Klaviatūra"</string>
-    <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", įjungtas"</string>
-    <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", išjungtas"</string>
-    <string name="incall_label_merge" msgid="720076442985913175">"Sujungti"</string>
-    <string name="incall_label_manage" msgid="2175471192903568159">"Tvarkyti"</string>
-    <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"Tvarkyti skambintojus"</string>
-    <string name="incall_label_swap" msgid="10458642864243507">"Sukeisti"</string>
-    <string name="incall_note_sent" msgid="4524130323127388367">"Užrašas išsiųstas"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_label_videocall">Vaizdo skambutis</string>
+  <string name="incall_label_rttcall">RTT</string>
+  <string name="incall_label_hold">Sulaikyti</string>
+  <string name="incall_label_add_call">Pr. skambutį</string>
+  <string name="incall_label_mute">Nutildyti</string>
+  <string name="incall_label_end_call">Baig. skamb.</string>
+  <string name="incall_label_dialpad">Klaviatūra</string>
+  <string name="incall_talkback_speaker_on">, įjungtas</string>
+  <string name="incall_talkback_speaker_off">, išjungtas</string>
+  <string name="incall_label_merge">Sujungti</string>
+  <string name="incall_label_manage">Tvarkyti</string>
+  <string name="a11y_description_incall_label_manage_content">Tvarkyti skambintojus</string>
+  <string name="incall_label_swap">Sukeisti</string>
+  <string name="incall_label_swap_sim">Pak. SIM k.</string>
+  <string name="incall_note_sent">Užrašas išsiųstas</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-lv/strings.xml b/java/com/android/incallui/incall/impl/res/values-lv/strings.xml
index c19e7c0..1b1bec4 100644
--- a/java/com/android/incallui/incall/impl/res/values-lv/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-lv/strings.xml
@@ -1,33 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_label_videocall" msgid="2208755440134676113">"Videozvans"</string>
-    <string name="incall_label_hold" msgid="4223472584896867896">"Aizturēt"</string>
-    <string name="incall_label_add_call" msgid="5641663436373994915">"Pievienot zvanu"</string>
-    <string name="incall_label_mute" msgid="2180667027331706737">"Izslēgt"</string>
-    <string name="incall_label_end_call" msgid="5434079261446614887">"Beigt zvanu"</string>
-    <string name="incall_label_dialpad" msgid="8609779533654156550">"Cipartast."</string>
-    <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", ieslēgts"</string>
-    <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", izslēgts"</string>
-    <string name="incall_label_merge" msgid="720076442985913175">"Apvienot"</string>
-    <string name="incall_label_manage" msgid="2175471192903568159">"Pārvaldīt"</string>
-    <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"Pārvaldīt zvanītājus"</string>
-    <string name="incall_label_swap" msgid="10458642864243507">"Pārslēgt"</string>
-    <string name="incall_note_sent" msgid="4524130323127388367">"Piezīme nosūtīta"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_label_videocall">Videozvans</string>
+  <string name="incall_label_rttcall">RTT</string>
+  <string name="incall_label_hold">Aizturēt</string>
+  <string name="incall_label_add_call">Pievienot zvanu</string>
+  <string name="incall_label_mute">Izslēgt</string>
+  <string name="incall_label_end_call">Beigt zvanu</string>
+  <string name="incall_label_dialpad">Cipartast.</string>
+  <string name="incall_talkback_speaker_on">, ieslēgts</string>
+  <string name="incall_talkback_speaker_off">, izslēgts</string>
+  <string name="incall_label_merge">Apvienot</string>
+  <string name="incall_label_manage">Pārvaldīt</string>
+  <string name="a11y_description_incall_label_manage_content">Pārvaldīt zvanītājus</string>
+  <string name="incall_label_swap">Pārslēgt</string>
+  <string name="incall_label_swap_sim">Mainīt SIM</string>
+  <string name="incall_note_sent">Piezīme nosūtīta</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-mk/strings.xml b/java/com/android/incallui/incall/impl/res/values-mk/strings.xml
index 610a308..f98789e 100644
--- a/java/com/android/incallui/incall/impl/res/values-mk/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-mk/strings.xml
@@ -1,33 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_label_videocall" msgid="2208755440134676113">"Видеоповик"</string>
-    <string name="incall_label_hold" msgid="4223472584896867896">"На чекање"</string>
-    <string name="incall_label_add_call" msgid="5641663436373994915">"Додај повик"</string>
-    <string name="incall_label_mute" msgid="2180667027331706737">"Исклучи звук"</string>
-    <string name="incall_label_end_call" msgid="5434079261446614887">"Заврши повик"</string>
-    <string name="incall_label_dialpad" msgid="8609779533654156550">"Тастатура"</string>
-    <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", е вклучен"</string>
-    <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", е исклучен"</string>
-    <string name="incall_label_merge" msgid="720076442985913175">"Спои"</string>
-    <string name="incall_label_manage" msgid="2175471192903568159">"Управувај"</string>
-    <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"Управувајте со повикувачите"</string>
-    <string name="incall_label_swap" msgid="10458642864243507">"Замени"</string>
-    <string name="incall_note_sent" msgid="4524130323127388367">"Белешката е испратена"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_label_videocall">Видеоповик</string>
+  <string name="incall_label_rttcall">RTT</string>
+  <string name="incall_label_hold">На чекање</string>
+  <string name="incall_label_add_call">Додај повик</string>
+  <string name="incall_label_mute">Исклучи звук</string>
+  <string name="incall_label_end_call">Заврши повик</string>
+  <string name="incall_label_dialpad">Тастатура</string>
+  <string name="incall_talkback_speaker_on">, е вклучен</string>
+  <string name="incall_talkback_speaker_off">, е исклучен</string>
+  <string name="incall_label_merge">Спои</string>
+  <string name="incall_label_manage">Управувај</string>
+  <string name="a11y_description_incall_label_manage_content">Управувајте со повикувачите</string>
+  <string name="incall_label_swap">Замени</string>
+  <string name="incall_label_swap_sim">Промени SIM</string>
+  <string name="incall_note_sent">Белешката е испратена</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-ml/strings.xml b/java/com/android/incallui/incall/impl/res/values-ml/strings.xml
index 83c2989..81ccd1a 100644
--- a/java/com/android/incallui/incall/impl/res/values-ml/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-ml/strings.xml
@@ -1,33 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_label_videocall" msgid="2208755440134676113">"വീഡിയോ കോള്‍"</string>
-    <string name="incall_label_hold" msgid="4223472584896867896">"ഹോള്‍ഡുചെയ്യുക"</string>
-    <string name="incall_label_add_call" msgid="5641663436373994915">"കോൾ ചേർക്കുക"</string>
-    <string name="incall_label_mute" msgid="2180667027331706737">"മ്യൂട്ടുചെയ്യുക"</string>
-    <string name="incall_label_end_call" msgid="5434079261446614887">"കോള്‍ അവസാനിപ്പിക്കൂ"</string>
-    <string name="incall_label_dialpad" msgid="8609779533654156550">"കീപാഡ്"</string>
-    <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", ഓണാണ്"</string>
-    <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", ഓഫാണ്"</string>
-    <string name="incall_label_merge" msgid="720076442985913175">"ലയിപ്പിക്കുക"</string>
-    <string name="incall_label_manage" msgid="2175471192903568159">"മാനേജുചെയ്യുക"</string>
-    <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"കോൾ ചെയ്യുന്നവരെ മാനേജുചെയ്യുക"</string>
-    <string name="incall_label_swap" msgid="10458642864243507">"സ്വാപ്പുചെയ്യുക"</string>
-    <string name="incall_note_sent" msgid="4524130323127388367">"കുറിപ്പ് അയച്ചു"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_label_videocall">വീഡിയോ കോള്‍</string>
+  <string name="incall_label_rttcall">RTT</string>
+  <string name="incall_label_hold">ഹോള്‍ഡുചെയ്യുക</string>
+  <string name="incall_label_add_call">കോൾ ചേർക്കുക</string>
+  <string name="incall_label_mute">മ്യൂട്ടുചെയ്യുക</string>
+  <string name="incall_label_end_call">കോള്‍ അവസാനിപ്പിക്കൂ</string>
+  <string name="incall_label_dialpad">കീപാഡ്</string>
+  <string name="incall_talkback_speaker_on">, ഓണാണ്</string>
+  <string name="incall_talkback_speaker_off">, ഓഫാണ്</string>
+  <string name="incall_label_merge">ലയിപ്പിക്കുക</string>
+  <string name="incall_label_manage">മാനേജുചെയ്യുക</string>
+  <string name="a11y_description_incall_label_manage_content">കോൾ ചെയ്യുന്നവരെ മാനേജുചെയ്യുക</string>
+  <string name="incall_label_swap">സ്വാപ്പുചെയ്യുക</string>
+  <string name="incall_label_swap_sim">സിം മാറ്റുക</string>
+  <string name="incall_note_sent">കുറിപ്പ് അയച്ചു</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-mn/strings.xml b/java/com/android/incallui/incall/impl/res/values-mn/strings.xml
index 9427d86..6e8e17e 100644
--- a/java/com/android/incallui/incall/impl/res/values-mn/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-mn/strings.xml
@@ -1,33 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_label_videocall" msgid="2208755440134676113">"Видео хурал"</string>
-    <string name="incall_label_hold" msgid="4223472584896867896">"Саатуулах"</string>
-    <string name="incall_label_add_call" msgid="5641663436373994915">"Дуудлага нэмэх"</string>
-    <string name="incall_label_mute" msgid="2180667027331706737">"Дууг хаах"</string>
-    <string name="incall_label_end_call" msgid="5434079261446614887">"Дуудлагыг таслах"</string>
-    <string name="incall_label_dialpad" msgid="8609779533654156550">"Товчлуур"</string>
-    <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", асаатай"</string>
-    <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", унтраатай"</string>
-    <string name="incall_label_merge" msgid="720076442985913175">"Нэгтгэх"</string>
-    <string name="incall_label_manage" msgid="2175471192903568159">"Удирдах"</string>
-    <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"Залгагчдыг удирдах"</string>
-    <string name="incall_label_swap" msgid="10458642864243507">"Солих"</string>
-    <string name="incall_note_sent" msgid="4524130323127388367">"Тэмдэглэлийг илгээсэн"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_label_videocall">Видео хурал</string>
+  <string name="incall_label_rttcall">RTT</string>
+  <string name="incall_label_hold">Саатуулах</string>
+  <string name="incall_label_add_call">Дуудлага нэмэх</string>
+  <string name="incall_label_mute">Дууг хаах</string>
+  <string name="incall_label_end_call">Дуудлагыг таслах</string>
+  <string name="incall_label_dialpad">Товчлуур</string>
+  <string name="incall_talkback_speaker_on">, асаатай</string>
+  <string name="incall_talkback_speaker_off">, унтраатай</string>
+  <string name="incall_label_merge">Нэгтгэх</string>
+  <string name="incall_label_manage">Удирдах</string>
+  <string name="a11y_description_incall_label_manage_content">Залгагчдыг удирдах</string>
+  <string name="incall_label_swap">Солих</string>
+  <string name="incall_label_swap_sim">SIM өөрчлөх</string>
+  <string name="incall_note_sent">Тэмдэглэлийг илгээсэн</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-mr/strings.xml b/java/com/android/incallui/incall/impl/res/values-mr/strings.xml
index 194c192..4d41417 100644
--- a/java/com/android/incallui/incall/impl/res/values-mr/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-mr/strings.xml
@@ -1,33 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_label_videocall" msgid="2208755440134676113">"व्हिडिओ कॉल"</string>
-    <string name="incall_label_hold" msgid="4223472584896867896">"होल्ड करा"</string>
-    <string name="incall_label_add_call" msgid="5641663436373994915">"कॉल जोडा"</string>
-    <string name="incall_label_mute" msgid="2180667027331706737">"नि:शब्द करा"</string>
-    <string name="incall_label_end_call" msgid="5434079261446614887">"कॉल समाप्त करा"</string>
-    <string name="incall_label_dialpad" msgid="8609779533654156550">"कीपॅड"</string>
-    <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", सुरू आहे"</string>
-    <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", बंद आहे"</string>
-    <string name="incall_label_merge" msgid="720076442985913175">"विलीन करा"</string>
-    <string name="incall_label_manage" msgid="2175471192903568159">"व्यवस्थापित करा"</string>
-    <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"कॉलर व्यवस्थापित करा"</string>
-    <string name="incall_label_swap" msgid="10458642864243507">"अदलाबदल करा"</string>
-    <string name="incall_note_sent" msgid="4524130323127388367">"टीप पाठविली"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_label_videocall">व्हिडिओ कॉल</string>
+  <string name="incall_label_rttcall">RTT</string>
+  <string name="incall_label_hold">होल्ड करा</string>
+  <string name="incall_label_add_call">कॉल जोडा</string>
+  <string name="incall_label_mute">नि:शब्द करा</string>
+  <string name="incall_label_end_call">कॉल समाप्त करा</string>
+  <string name="incall_label_dialpad">कीपॅड</string>
+  <string name="incall_talkback_speaker_on">, सुरू आहे</string>
+  <string name="incall_talkback_speaker_off">, बंद आहे</string>
+  <string name="incall_label_merge">विलीन करा</string>
+  <string name="incall_label_manage">व्यवस्थापित करा</string>
+  <string name="a11y_description_incall_label_manage_content">कॉलर व्यवस्थापित करा</string>
+  <string name="incall_label_swap">अदलाबदल करा</string>
+  <string name="incall_label_swap_sim">सिम बदला</string>
+  <string name="incall_note_sent">टीप पाठविली</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-ms/strings.xml b/java/com/android/incallui/incall/impl/res/values-ms/strings.xml
index a918ded..6d17304 100644
--- a/java/com/android/incallui/incall/impl/res/values-ms/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-ms/strings.xml
@@ -1,33 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_label_videocall" msgid="2208755440134676113">"Pgln video"</string>
-    <string name="incall_label_hold" msgid="4223472584896867896">"Tunda"</string>
-    <string name="incall_label_add_call" msgid="5641663436373994915">"Tambah pgln"</string>
-    <string name="incall_label_mute" msgid="2180667027331706737">"Redam"</string>
-    <string name="incall_label_end_call" msgid="5434079261446614887">"Tamatkn pgln"</string>
-    <string name="incall_label_dialpad" msgid="8609779533654156550">"Pad kekunci"</string>
-    <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", dihidupkan"</string>
-    <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", Dimatikan"</string>
-    <string name="incall_label_merge" msgid="720076442985913175">"Gabung"</string>
-    <string name="incall_label_manage" msgid="2175471192903568159">"Urus"</string>
-    <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"Urus pemanggil"</string>
-    <string name="incall_label_swap" msgid="10458642864243507">"Silih"</string>
-    <string name="incall_note_sent" msgid="4524130323127388367">"Nota dihantar"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_label_videocall">Pgln video</string>
+  <string name="incall_label_rttcall">RTT</string>
+  <string name="incall_label_hold">Tunda</string>
+  <string name="incall_label_add_call">Tambah pgln</string>
+  <string name="incall_label_mute">Redam</string>
+  <string name="incall_label_end_call">Tamatkn pgln</string>
+  <string name="incall_label_dialpad">Pad kekunci</string>
+  <string name="incall_talkback_speaker_on">, dihidupkan</string>
+  <string name="incall_talkback_speaker_off">, Dimatikan</string>
+  <string name="incall_label_merge">Gabung</string>
+  <string name="incall_label_manage">Urus</string>
+  <string name="a11y_description_incall_label_manage_content">Urus pemanggil</string>
+  <string name="incall_label_swap">Silih</string>
+  <string name="incall_label_swap_sim">Tukar SIM</string>
+  <string name="incall_note_sent">Nota dihantar</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-my/strings.xml b/java/com/android/incallui/incall/impl/res/values-my/strings.xml
index 8007029..dcbd89b 100644
--- a/java/com/android/incallui/incall/impl/res/values-my/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-my/strings.xml
@@ -1,33 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_label_videocall" msgid="2208755440134676113">"ဗီဒီယိုခေါ်ဆိုမှု"</string>
-    <string name="incall_label_hold" msgid="4223472584896867896">"ခဏရပ်ထားရန်"</string>
-    <string name="incall_label_add_call" msgid="5641663436373994915">"ထပ်ခေါ်ရန်"</string>
-    <string name="incall_label_mute" msgid="2180667027331706737">"အသံပိတ်ရန်"</string>
-    <string name="incall_label_end_call" msgid="5434079261446614887">"ဖုန်းချရန်"</string>
-    <string name="incall_label_dialpad" msgid="8609779533654156550">"ခလုတ်ခုံ"</string>
-    <string name="incall_talkback_speaker_on" msgid="5819463769258124228">"၊ ပွင့်နေသည်"</string>
-    <string name="incall_talkback_speaker_off" msgid="7486836772563090186">"၊ ပိတ်နေသည်"</string>
-    <string name="incall_label_merge" msgid="720076442985913175">"ပေါင်းရန်"</string>
-    <string name="incall_label_manage" msgid="2175471192903568159">"စီမံရန်"</string>
-    <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"ခေါ်ဆိုသူများကို စီမံခန့်ခွဲရန်"</string>
-    <string name="incall_label_swap" msgid="10458642864243507">"ဖလှယ်ရန်"</string>
-    <string name="incall_note_sent" msgid="4524130323127388367">"မှတ်စုပို့ပြီးပါပြီ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_label_videocall">ဗီဒီယိုခေါ်ဆိုမှု</string>
+  <string name="incall_label_rttcall">RTT</string>
+  <string name="incall_label_hold">ခဏရပ်ထားရန်</string>
+  <string name="incall_label_add_call">ထပ်ခေါ်ရန်</string>
+  <string name="incall_label_mute">အသံပိတ်ရန်</string>
+  <string name="incall_label_end_call">ဖုန်းချရန်</string>
+  <string name="incall_label_dialpad">ခလုတ်ခုံ</string>
+  <string name="incall_talkback_speaker_on">၊ ပွင့်နေသည်</string>
+  <string name="incall_talkback_speaker_off">၊ ပိတ်နေသည်</string>
+  <string name="incall_label_merge">ပေါင်းရန်</string>
+  <string name="incall_label_manage">စီမံရန်</string>
+  <string name="a11y_description_incall_label_manage_content">ခေါ်ဆိုသူများကို စီမံခန့်ခွဲရန်</string>
+  <string name="incall_label_swap">ဖလှယ်ရန်</string>
+  <string name="incall_label_swap_sim">ဆင်းမ်ကဒ် ပြောင်းရန်</string>
+  <string name="incall_note_sent">မှတ်စုပို့ပြီးပါပြီ</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-nb/strings.xml b/java/com/android/incallui/incall/impl/res/values-nb/strings.xml
index 704384e..004eb30 100644
--- a/java/com/android/incallui/incall/impl/res/values-nb/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-nb/strings.xml
@@ -1,33 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_label_videocall" msgid="2208755440134676113">"Videosamtale"</string>
-    <string name="incall_label_hold" msgid="4223472584896867896">"Sett på vent"</string>
-    <string name="incall_label_add_call" msgid="5641663436373994915">"Nytt anrop"</string>
-    <string name="incall_label_mute" msgid="2180667027331706737">"Ignorer"</string>
-    <string name="incall_label_end_call" msgid="5434079261446614887">"Avslutt samtalen"</string>
-    <string name="incall_label_dialpad" msgid="8609779533654156550">"Tastatur"</string>
-    <string name="incall_talkback_speaker_on" msgid="5819463769258124228">"er på"</string>
-    <string name="incall_talkback_speaker_off" msgid="7486836772563090186">"er av"</string>
-    <string name="incall_label_merge" msgid="720076442985913175">"Slå sammen"</string>
-    <string name="incall_label_manage" msgid="2175471192903568159">"Administrer"</string>
-    <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"Håndter innringere"</string>
-    <string name="incall_label_swap" msgid="10458642864243507">"Bytt"</string>
-    <string name="incall_note_sent" msgid="4524130323127388367">"Notatet er sendt"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_label_videocall">Videosamtale</string>
+  <string name="incall_label_rttcall">STT</string>
+  <string name="incall_label_hold">Sett på vent</string>
+  <string name="incall_label_add_call">Nytt anrop</string>
+  <string name="incall_label_mute">Ignorer</string>
+  <string name="incall_label_end_call">Avslutt samtalen</string>
+  <string name="incall_label_dialpad">Tastatur</string>
+  <string name="incall_talkback_speaker_on">er på</string>
+  <string name="incall_talkback_speaker_off">er av</string>
+  <string name="incall_label_merge">Slå sammen</string>
+  <string name="incall_label_manage">Administrer</string>
+  <string name="a11y_description_incall_label_manage_content">Håndter innringere</string>
+  <string name="incall_label_swap">Bytt</string>
+  <string name="incall_label_swap_sim">Bytt SIM</string>
+  <string name="incall_note_sent">Notatet er sendt</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-ne/strings.xml b/java/com/android/incallui/incall/impl/res/values-ne/strings.xml
index beffa3e..afe00e4 100644
--- a/java/com/android/incallui/incall/impl/res/values-ne/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-ne/strings.xml
@@ -1,33 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_label_videocall" msgid="2208755440134676113">"भिडियो कल"</string>
-    <string name="incall_label_hold" msgid="4223472584896867896">"होल्ड गर्ने"</string>
-    <string name="incall_label_add_call" msgid="5641663436373994915">"कल थप्नुहोस्"</string>
-    <string name="incall_label_mute" msgid="2180667027331706737">"म्यूट गर्ने"</string>
-    <string name="incall_label_end_call" msgid="5434079261446614887">"कल अन्त्य गर्ने"</string>
-    <string name="incall_label_dialpad" msgid="8609779533654156550">"किप्याड"</string>
-    <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", खुला छ"</string>
-    <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", बन्द छ"</string>
-    <string name="incall_label_merge" msgid="720076442985913175">"मर्ज गर्ने"</string>
-    <string name="incall_label_manage" msgid="2175471192903568159">"प्रबन्ध गर्ने"</string>
-    <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"कल गर्ने व्यक्तिहरूलाई व्यवस्थित गर्नुहोस्"</string>
-    <string name="incall_label_swap" msgid="10458642864243507">"साट्नुहोस्"</string>
-    <string name="incall_note_sent" msgid="4524130323127388367">"टिपोट पठाइयो"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_label_videocall">भिडियो कल</string>
+  <string name="incall_label_rttcall">RTT</string>
+  <string name="incall_label_hold">होल्ड गर्ने</string>
+  <string name="incall_label_add_call">कल थप्नुहोस्</string>
+  <string name="incall_label_mute">म्यूट गर्ने</string>
+  <string name="incall_label_end_call">कल अन्त्य गर्ने</string>
+  <string name="incall_label_dialpad">किप्याड</string>
+  <string name="incall_talkback_speaker_on">, खुला छ</string>
+  <string name="incall_talkback_speaker_off">, बन्द छ</string>
+  <string name="incall_label_merge">मर्ज गर्ने</string>
+  <string name="incall_label_manage">प्रबन्ध गर्ने</string>
+  <string name="a11y_description_incall_label_manage_content">कल गर्ने व्यक्तिहरूलाई व्यवस्थित गर्नुहोस्</string>
+  <string name="incall_label_swap">साट्नुहोस्</string>
+  <string name="incall_label_swap_sim">SIM बदल्नु…</string>
+  <string name="incall_note_sent">टिपोट पठाइयो</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-nl/strings.xml b/java/com/android/incallui/incall/impl/res/values-nl/strings.xml
index e3c919e..05c6cec 100644
--- a/java/com/android/incallui/incall/impl/res/values-nl/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-nl/strings.xml
@@ -1,33 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_label_videocall" msgid="2208755440134676113">"Videogespr."</string>
-    <string name="incall_label_hold" msgid="4223472584896867896">"In wacht"</string>
-    <string name="incall_label_add_call" msgid="5641663436373994915">"Oproep toev."</string>
-    <string name="incall_label_mute" msgid="2180667027331706737">"Dempen"</string>
-    <string name="incall_label_end_call" msgid="5434079261446614887">"Oproep beëindigen"</string>
-    <string name="incall_label_dialpad" msgid="8609779533654156550">"Toetsenblok"</string>
-    <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", is aan"</string>
-    <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", is uit"</string>
-    <string name="incall_label_merge" msgid="720076442985913175">"Samenvoegen"</string>
-    <string name="incall_label_manage" msgid="2175471192903568159">"Beheren"</string>
-    <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"Bellers beheren"</string>
-    <string name="incall_label_swap" msgid="10458642864243507">"Wisselen"</string>
-    <string name="incall_note_sent" msgid="4524130323127388367">"Notitie verzonden"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_label_videocall">Videogespr.</string>
+  <string name="incall_label_rttcall">RTT</string>
+  <string name="incall_label_hold">In wacht</string>
+  <string name="incall_label_add_call">Oproep toev.</string>
+  <string name="incall_label_mute">Dempen</string>
+  <string name="incall_label_end_call">Oproep beëindigen</string>
+  <string name="incall_label_dialpad">Toetsenblok</string>
+  <string name="incall_talkback_speaker_on">, is aan</string>
+  <string name="incall_talkback_speaker_off">, is uit</string>
+  <string name="incall_label_merge">Samenvoegen</string>
+  <string name="incall_label_manage">Beheren</string>
+  <string name="a11y_description_incall_label_manage_content">Bellers beheren</string>
+  <string name="incall_label_swap">Wisselen</string>
+  <string name="incall_label_swap_sim">Sim wijzigen</string>
+  <string name="incall_note_sent">Notitie verzonden</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-no/strings.xml b/java/com/android/incallui/incall/impl/res/values-no/strings.xml
index 704384e..004eb30 100644
--- a/java/com/android/incallui/incall/impl/res/values-no/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-no/strings.xml
@@ -1,33 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_label_videocall" msgid="2208755440134676113">"Videosamtale"</string>
-    <string name="incall_label_hold" msgid="4223472584896867896">"Sett på vent"</string>
-    <string name="incall_label_add_call" msgid="5641663436373994915">"Nytt anrop"</string>
-    <string name="incall_label_mute" msgid="2180667027331706737">"Ignorer"</string>
-    <string name="incall_label_end_call" msgid="5434079261446614887">"Avslutt samtalen"</string>
-    <string name="incall_label_dialpad" msgid="8609779533654156550">"Tastatur"</string>
-    <string name="incall_talkback_speaker_on" msgid="5819463769258124228">"er på"</string>
-    <string name="incall_talkback_speaker_off" msgid="7486836772563090186">"er av"</string>
-    <string name="incall_label_merge" msgid="720076442985913175">"Slå sammen"</string>
-    <string name="incall_label_manage" msgid="2175471192903568159">"Administrer"</string>
-    <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"Håndter innringere"</string>
-    <string name="incall_label_swap" msgid="10458642864243507">"Bytt"</string>
-    <string name="incall_note_sent" msgid="4524130323127388367">"Notatet er sendt"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_label_videocall">Videosamtale</string>
+  <string name="incall_label_rttcall">STT</string>
+  <string name="incall_label_hold">Sett på vent</string>
+  <string name="incall_label_add_call">Nytt anrop</string>
+  <string name="incall_label_mute">Ignorer</string>
+  <string name="incall_label_end_call">Avslutt samtalen</string>
+  <string name="incall_label_dialpad">Tastatur</string>
+  <string name="incall_talkback_speaker_on">er på</string>
+  <string name="incall_talkback_speaker_off">er av</string>
+  <string name="incall_label_merge">Slå sammen</string>
+  <string name="incall_label_manage">Administrer</string>
+  <string name="a11y_description_incall_label_manage_content">Håndter innringere</string>
+  <string name="incall_label_swap">Bytt</string>
+  <string name="incall_label_swap_sim">Bytt SIM</string>
+  <string name="incall_note_sent">Notatet er sendt</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-pa/strings.xml b/java/com/android/incallui/incall/impl/res/values-pa/strings.xml
index d7e74ed..e7bebd1 100644
--- a/java/com/android/incallui/incall/impl/res/values-pa/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-pa/strings.xml
@@ -1,33 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_label_videocall" msgid="2208755440134676113">"ਵੀਡੀਓ ਕਾਲ"</string>
-    <string name="incall_label_hold" msgid="4223472584896867896">"ਰੋਕ ਕੇ ਰੱਖੋ"</string>
-    <string name="incall_label_add_call" msgid="5641663436373994915">"ਕਾਲ ਸ਼ਾਮਲ ਕਰੋ"</string>
-    <string name="incall_label_mute" msgid="2180667027331706737">"ਮਿਊਟ ਕਰੋ"</string>
-    <string name="incall_label_end_call" msgid="5434079261446614887">"ਕਾਲ ਖਤਮ ਕਰੋ"</string>
-    <string name="incall_label_dialpad" msgid="8609779533654156550">"ਕੀਪੈਡ"</string>
-    <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", ਚਾਲੂ ਹੈ"</string>
-    <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", ਬੰਦ ਹੈ"</string>
-    <string name="incall_label_merge" msgid="720076442985913175">"ਰਲਗੱਡ ਕਰੋ"</string>
-    <string name="incall_label_manage" msgid="2175471192903568159">"ਪ੍ਰਬੰਧਨ ਕਰੋ"</string>
-    <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"ਕਾਲਰਾਂ ਦਾ ਪ੍ਰਬੰਧਨ ਕਰੋ"</string>
-    <string name="incall_label_swap" msgid="10458642864243507">"ਅਦਲੋ-ਬਦਲੋ"</string>
-    <string name="incall_note_sent" msgid="4524130323127388367">"ਨੋਟ-ਕਥਨ ਭੇਜਿਆ ਗਿਆ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_label_videocall">ਵੀਡੀਓ ਕਾਲ</string>
+  <string name="incall_label_rttcall">RTT</string>
+  <string name="incall_label_hold">ਰੋਕ ਕੇ ਰੱਖੋ</string>
+  <string name="incall_label_add_call">ਕਾਲ ਸ਼ਾਮਲ ਕਰੋ</string>
+  <string name="incall_label_mute">ਮਿਊਟ ਕਰੋ</string>
+  <string name="incall_label_end_call">ਕਾਲ ਖਤਮ ਕਰੋ</string>
+  <string name="incall_label_dialpad">ਕੀਪੈਡ</string>
+  <string name="incall_talkback_speaker_on">, ਚਾਲੂ ਹੈ</string>
+  <string name="incall_talkback_speaker_off">, ਬੰਦ ਹੈ</string>
+  <string name="incall_label_merge">ਰਲਗੱਡ ਕਰੋ</string>
+  <string name="incall_label_manage">ਪ੍ਰਬੰਧਨ ਕਰੋ</string>
+  <string name="a11y_description_incall_label_manage_content">ਕਾਲਰਾਂ ਦਾ ਪ੍ਰਬੰਧਨ ਕਰੋ</string>
+  <string name="incall_label_swap">ਅਦਲੋ-ਬਦਲੋ</string>
+  <string name="incall_label_swap_sim">ਸਿਮ ਬਦਲੋ</string>
+  <string name="incall_note_sent">ਨੋਟ-ਕਥਨ ਭੇਜਿਆ ਗਿਆ</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-pl/strings.xml b/java/com/android/incallui/incall/impl/res/values-pl/strings.xml
index 9971d75..f647ca0 100644
--- a/java/com/android/incallui/incall/impl/res/values-pl/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-pl/strings.xml
@@ -1,33 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_label_videocall" msgid="2208755440134676113">"Rozmowa wid."</string>
-    <string name="incall_label_hold" msgid="4223472584896867896">"Wstrzymaj"</string>
-    <string name="incall_label_add_call" msgid="5641663436373994915">"Dodaj poł."</string>
-    <string name="incall_label_mute" msgid="2180667027331706737">"Wycisz"</string>
-    <string name="incall_label_end_call" msgid="5434079261446614887">"Zakończ"</string>
-    <string name="incall_label_dialpad" msgid="8609779533654156550">"Klawiatura"</string>
-    <string name="incall_talkback_speaker_on" msgid="5819463769258124228">"– włączony"</string>
-    <string name="incall_talkback_speaker_off" msgid="7486836772563090186">"– wyłączony"</string>
-    <string name="incall_label_merge" msgid="720076442985913175">"Scal"</string>
-    <string name="incall_label_manage" msgid="2175471192903568159">"Zarządzaj"</string>
-    <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"Zarządzaj rozmówcami"</string>
-    <string name="incall_label_swap" msgid="10458642864243507">"Przełącz"</string>
-    <string name="incall_note_sent" msgid="4524130323127388367">"Notatka wysłana"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_label_videocall">Rozmowa wid.</string>
+  <string name="incall_label_rttcall">RTT</string>
+  <string name="incall_label_hold">Wstrzymaj</string>
+  <string name="incall_label_add_call">Dodaj poł.</string>
+  <string name="incall_label_mute">Wycisz</string>
+  <string name="incall_label_end_call">Zakończ</string>
+  <string name="incall_label_dialpad">Klawiatura</string>
+  <string name="incall_talkback_speaker_on">– włączony</string>
+  <string name="incall_talkback_speaker_off">– wyłączony</string>
+  <string name="incall_label_merge">Scal</string>
+  <string name="incall_label_manage">Zarządzaj</string>
+  <string name="a11y_description_incall_label_manage_content">Zarządzaj rozmówcami</string>
+  <string name="incall_label_swap">Przełącz</string>
+  <string name="incall_label_swap_sim">Zmień kartę SIM</string>
+  <string name="incall_note_sent">Notatka wysłana</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-pt-rBR/strings.xml b/java/com/android/incallui/incall/impl/res/values-pt-rBR/strings.xml
index 538c20c..215ce28 100644
--- a/java/com/android/incallui/incall/impl/res/values-pt-rBR/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-pt-rBR/strings.xml
@@ -1,33 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_label_videocall" msgid="2208755440134676113">"Videocham."</string>
-    <string name="incall_label_hold" msgid="4223472584896867896">"Em espera"</string>
-    <string name="incall_label_add_call" msgid="5641663436373994915">"Adic chamada"</string>
-    <string name="incall_label_mute" msgid="2180667027331706737">"Desativar"</string>
-    <string name="incall_label_end_call" msgid="5434079261446614887">"Encerrar"</string>
-    <string name="incall_label_dialpad" msgid="8609779533654156550">"Teclado"</string>
-    <string name="incall_talkback_speaker_on" msgid="5819463769258124228">"ativado"</string>
-    <string name="incall_talkback_speaker_off" msgid="7486836772563090186">"desativado"</string>
-    <string name="incall_label_merge" msgid="720076442985913175">"Mesclar"</string>
-    <string name="incall_label_manage" msgid="2175471192903568159">"Gerenciar"</string>
-    <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"Gerenciar os autores das chamadas"</string>
-    <string name="incall_label_swap" msgid="10458642864243507">"Trocar"</string>
-    <string name="incall_note_sent" msgid="4524130323127388367">"Nota enviada"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_label_videocall">Videocham.</string>
+  <string name="incall_label_rttcall">RTT</string>
+  <string name="incall_label_hold">Em espera</string>
+  <string name="incall_label_add_call">Nova chamada</string>
+  <string name="incall_label_mute">Mudo</string>
+  <string name="incall_label_end_call">Encerrar</string>
+  <string name="incall_label_dialpad">Teclado</string>
+  <string name="incall_talkback_speaker_on">ativado</string>
+  <string name="incall_talkback_speaker_off">desativado</string>
+  <string name="incall_label_merge">Mesclar</string>
+  <string name="incall_label_manage">Gerenciar</string>
+  <string name="a11y_description_incall_label_manage_content">Gerenciar os autores das chamadas</string>
+  <string name="incall_label_swap">Trocar</string>
+  <string name="incall_label_swap_sim">Alterar SIM</string>
+  <string name="incall_note_sent">Nota enviada</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-pt-rPT/strings.xml b/java/com/android/incallui/incall/impl/res/values-pt-rPT/strings.xml
index e3b98bb..cd8e0c0 100644
--- a/java/com/android/incallui/incall/impl/res/values-pt-rPT/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-pt-rPT/strings.xml
@@ -1,33 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_label_videocall" msgid="2208755440134676113">"Videochamada"</string>
-    <string name="incall_label_hold" msgid="4223472584896867896">"Em espera"</string>
-    <string name="incall_label_add_call" msgid="5641663436373994915">"Adic. cham."</string>
-    <string name="incall_label_mute" msgid="2180667027331706737">"Desativ. som"</string>
-    <string name="incall_label_end_call" msgid="5434079261446614887">"Terminar chamada"</string>
-    <string name="incall_label_dialpad" msgid="8609779533654156550">"Teclado"</string>
-    <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", ativado"</string>
-    <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", desativado"</string>
-    <string name="incall_label_merge" msgid="720076442985913175">"Unir"</string>
-    <string name="incall_label_manage" msgid="2175471192903568159">"Gerir"</string>
-    <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"Gerir autores das chamadas"</string>
-    <string name="incall_label_swap" msgid="10458642864243507">"Alternar"</string>
-    <string name="incall_note_sent" msgid="4524130323127388367">"Nota enviada"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_label_videocall">Videochamada</string>
+  <string name="incall_label_rttcall">RTT</string>
+  <string name="incall_label_hold">Em espera</string>
+  <string name="incall_label_add_call">Adic. cham.</string>
+  <string name="incall_label_mute">Desativ. som</string>
+  <string name="incall_label_end_call">Terminar chamada</string>
+  <string name="incall_label_dialpad">Teclado</string>
+  <string name="incall_talkback_speaker_on">, ativado</string>
+  <string name="incall_talkback_speaker_off">, desativado</string>
+  <string name="incall_label_merge">Unir</string>
+  <string name="incall_label_manage">Gerir</string>
+  <string name="a11y_description_incall_label_manage_content">Gerir autores das chamadas</string>
+  <string name="incall_label_swap">Alternar</string>
+  <string name="incall_label_swap_sim">Alterar SIM</string>
+  <string name="incall_note_sent">Nota enviada</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-pt/strings.xml b/java/com/android/incallui/incall/impl/res/values-pt/strings.xml
index 538c20c..215ce28 100644
--- a/java/com/android/incallui/incall/impl/res/values-pt/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-pt/strings.xml
@@ -1,33 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_label_videocall" msgid="2208755440134676113">"Videocham."</string>
-    <string name="incall_label_hold" msgid="4223472584896867896">"Em espera"</string>
-    <string name="incall_label_add_call" msgid="5641663436373994915">"Adic chamada"</string>
-    <string name="incall_label_mute" msgid="2180667027331706737">"Desativar"</string>
-    <string name="incall_label_end_call" msgid="5434079261446614887">"Encerrar"</string>
-    <string name="incall_label_dialpad" msgid="8609779533654156550">"Teclado"</string>
-    <string name="incall_talkback_speaker_on" msgid="5819463769258124228">"ativado"</string>
-    <string name="incall_talkback_speaker_off" msgid="7486836772563090186">"desativado"</string>
-    <string name="incall_label_merge" msgid="720076442985913175">"Mesclar"</string>
-    <string name="incall_label_manage" msgid="2175471192903568159">"Gerenciar"</string>
-    <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"Gerenciar os autores das chamadas"</string>
-    <string name="incall_label_swap" msgid="10458642864243507">"Trocar"</string>
-    <string name="incall_note_sent" msgid="4524130323127388367">"Nota enviada"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_label_videocall">Videocham.</string>
+  <string name="incall_label_rttcall">RTT</string>
+  <string name="incall_label_hold">Em espera</string>
+  <string name="incall_label_add_call">Nova chamada</string>
+  <string name="incall_label_mute">Mudo</string>
+  <string name="incall_label_end_call">Encerrar</string>
+  <string name="incall_label_dialpad">Teclado</string>
+  <string name="incall_talkback_speaker_on">ativado</string>
+  <string name="incall_talkback_speaker_off">desativado</string>
+  <string name="incall_label_merge">Mesclar</string>
+  <string name="incall_label_manage">Gerenciar</string>
+  <string name="a11y_description_incall_label_manage_content">Gerenciar os autores das chamadas</string>
+  <string name="incall_label_swap">Trocar</string>
+  <string name="incall_label_swap_sim">Alterar SIM</string>
+  <string name="incall_note_sent">Nota enviada</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-ro/strings.xml b/java/com/android/incallui/incall/impl/res/values-ro/strings.xml
index 81dcdf3..4e67a60 100644
--- a/java/com/android/incallui/incall/impl/res/values-ro/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-ro/strings.xml
@@ -1,33 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_label_videocall" msgid="2208755440134676113">"Apel video"</string>
-    <string name="incall_label_hold" msgid="4223472584896867896">"În așteptare"</string>
-    <string name="incall_label_add_call" msgid="5641663436373994915">"Încă un apel"</string>
-    <string name="incall_label_mute" msgid="2180667027331706737">"Dezactivați"</string>
-    <string name="incall_label_end_call" msgid="5434079261446614887">"Încheiați"</string>
-    <string name="incall_label_dialpad" msgid="8609779533654156550">"Tastatură"</string>
-    <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", e activat"</string>
-    <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", dezactivat"</string>
-    <string name="incall_label_merge" msgid="720076442985913175">"Îmbinați"</string>
-    <string name="incall_label_manage" msgid="2175471192903568159">"Gestionați"</string>
-    <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"Gestionați apelanții"</string>
-    <string name="incall_label_swap" msgid="10458642864243507">"Schimbați"</string>
-    <string name="incall_note_sent" msgid="4524130323127388367">"Nota a fost trimisă"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_label_videocall">Apel video</string>
+  <string name="incall_label_rttcall">TTR</string>
+  <string name="incall_label_hold">În așteptare</string>
+  <string name="incall_label_add_call">Încă un apel</string>
+  <string name="incall_label_mute">Dezactivați</string>
+  <string name="incall_label_end_call">Încheiați</string>
+  <string name="incall_label_dialpad">Tastatură</string>
+  <string name="incall_talkback_speaker_on">, e activat</string>
+  <string name="incall_talkback_speaker_off">, dezactivat</string>
+  <string name="incall_label_merge">Îmbinați</string>
+  <string name="incall_label_manage">Gestionați</string>
+  <string name="a11y_description_incall_label_manage_content">Gestionați apelanții</string>
+  <string name="incall_label_swap">Schimbați</string>
+  <string name="incall_label_swap_sim">Schimbați SIM</string>
+  <string name="incall_note_sent">Nota a fost trimisă</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-ru/strings.xml b/java/com/android/incallui/incall/impl/res/values-ru/strings.xml
index 274f8ff..2081fbe 100644
--- a/java/com/android/incallui/incall/impl/res/values-ru/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-ru/strings.xml
@@ -1,33 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_label_videocall" msgid="2208755440134676113">"Видеовызов"</string>
-    <string name="incall_label_hold" msgid="4223472584896867896">"Удерживать"</string>
-    <string name="incall_label_add_call" msgid="5641663436373994915">"Добавить вызов"</string>
-    <string name="incall_label_mute" msgid="2180667027331706737">"Выкл. звук"</string>
-    <string name="incall_label_end_call" msgid="5434079261446614887">"Завершить вызов"</string>
-    <string name="incall_label_dialpad" msgid="8609779533654156550">"Клавиатура"</string>
-    <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", включен"</string>
-    <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", отключен"</string>
-    <string name="incall_label_merge" msgid="720076442985913175">"Объединить"</string>
-    <string name="incall_label_manage" msgid="2175471192903568159">"Управление"</string>
-    <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"Управление абонентами"</string>
-    <string name="incall_label_swap" msgid="10458642864243507">"Переключить"</string>
-    <string name="incall_note_sent" msgid="4524130323127388367">"Сообщение отправлено"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_label_videocall">Видеовызов</string>
+  <string name="incall_label_rttcall">RTT</string>
+  <string name="incall_label_hold">Удерживать</string>
+  <string name="incall_label_add_call">Добавить вызов</string>
+  <string name="incall_label_mute">Выкл. микрофон</string>
+  <string name="incall_label_end_call">Завершить вызов</string>
+  <string name="incall_label_dialpad">Клавиатура</string>
+  <string name="incall_talkback_speaker_on">, включен</string>
+  <string name="incall_talkback_speaker_off">, отключен</string>
+  <string name="incall_label_merge">Объединить</string>
+  <string name="incall_label_manage">Управление</string>
+  <string name="a11y_description_incall_label_manage_content">Управление абонентами</string>
+  <string name="incall_label_swap">Переключить</string>
+  <string name="incall_label_swap_sim">Сменить SIM-карту</string>
+  <string name="incall_note_sent">Сообщение отправлено</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-si/strings.xml b/java/com/android/incallui/incall/impl/res/values-si/strings.xml
index a600c21..f4c3011 100644
--- a/java/com/android/incallui/incall/impl/res/values-si/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-si/strings.xml
@@ -1,33 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_label_videocall" msgid="2208755440134676113">"වීඩියෝ ඇමතුම"</string>
-    <string name="incall_label_hold" msgid="4223472584896867896">"රඳවා ගන්න"</string>
-    <string name="incall_label_add_call" msgid="5641663436373994915">"ඇමතුම එක් ක."</string>
-    <string name="incall_label_mute" msgid="2180667027331706737">"නිහඬ කරන්න"</string>
-    <string name="incall_label_end_call" msgid="5434079261446614887">"ඇමතුම නිම ක."</string>
-    <string name="incall_label_dialpad" msgid="8609779533654156550">"යතුරු පුවරුව"</string>
-    <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", සක්‍රියයි"</string>
-    <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", අක්‍රියයි"</string>
-    <string name="incall_label_merge" msgid="720076442985913175">"ඒකාබද්ධ කර."</string>
-    <string name="incall_label_manage" msgid="2175471192903568159">"කළමනාකරණය ක."</string>
-    <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"අමතන්නන් කළමනාකරණය කරන්න"</string>
-    <string name="incall_label_swap" msgid="10458642864243507">"මාරු කරන්න"</string>
-    <string name="incall_note_sent" msgid="4524130323127388367">"සටහන යවන ලදී"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_label_videocall">වීඩියෝ ඇමතුම</string>
+  <string name="incall_label_rttcall">RTT</string>
+  <string name="incall_label_hold">රඳවා ගන්න</string>
+  <string name="incall_label_add_call">ඇමතුම එක් ක.</string>
+  <string name="incall_label_mute">නිහඬ කරන්න</string>
+  <string name="incall_label_end_call">ඇමතුම නිම ක.</string>
+  <string name="incall_label_dialpad">යතුරු පුවරුව</string>
+  <string name="incall_talkback_speaker_on">, සක්‍රියයි</string>
+  <string name="incall_talkback_speaker_off">, අක්‍රියයි</string>
+  <string name="incall_label_merge">ඒකාබද්ධ කර.</string>
+  <string name="incall_label_manage">කළමනාකරණය ක.</string>
+  <string name="a11y_description_incall_label_manage_content">අමතන්නන් කළමනාකරණය කරන්න</string>
+  <string name="incall_label_swap">මාරු කරන්න</string>
+  <string name="incall_label_swap_sim">SIM වෙනස් කර</string>
+  <string name="incall_note_sent">සටහන යවන ලදී</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-sk/strings.xml b/java/com/android/incallui/incall/impl/res/values-sk/strings.xml
index d74d19e..9ceef6e 100644
--- a/java/com/android/incallui/incall/impl/res/values-sk/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-sk/strings.xml
@@ -1,33 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_label_videocall" msgid="2208755440134676113">"Videohovor"</string>
-    <string name="incall_label_hold" msgid="4223472584896867896">"Podržať"</string>
-    <string name="incall_label_add_call" msgid="5641663436373994915">"Pridať hovor"</string>
-    <string name="incall_label_mute" msgid="2180667027331706737">"Vypnúť zvuk"</string>
-    <string name="incall_label_end_call" msgid="5434079261446614887">"Ukonč. hovor"</string>
-    <string name="incall_label_dialpad" msgid="8609779533654156550">"Klávesnica"</string>
-    <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", je zapnutý"</string>
-    <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", je vypnutý"</string>
-    <string name="incall_label_merge" msgid="720076442985913175">"Zlúčiť"</string>
-    <string name="incall_label_manage" msgid="2175471192903568159">"Spravovať"</string>
-    <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"Spravovať volajúcich"</string>
-    <string name="incall_label_swap" msgid="10458642864243507">"Zameniť"</string>
-    <string name="incall_note_sent" msgid="4524130323127388367">"Poznámka bola odoslaná"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_label_videocall">Videohovor</string>
+  <string name="incall_label_rttcall">Okamž. text</string>
+  <string name="incall_label_hold">Podržať</string>
+  <string name="incall_label_add_call">Pridať hovor</string>
+  <string name="incall_label_mute">Vypnúť zvuk</string>
+  <string name="incall_label_end_call">Ukonč. hovor</string>
+  <string name="incall_label_dialpad">Klávesnica</string>
+  <string name="incall_talkback_speaker_on">, je zapnutý</string>
+  <string name="incall_talkback_speaker_off">, je vypnutý</string>
+  <string name="incall_label_merge">Zlúčiť</string>
+  <string name="incall_label_manage">Spravovať</string>
+  <string name="a11y_description_incall_label_manage_content">Spravovať volajúcich</string>
+  <string name="incall_label_swap">Zameniť</string>
+  <string name="incall_label_swap_sim">Zmeniť SIM</string>
+  <string name="incall_note_sent">Poznámka bola odoslaná</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-sl/strings.xml b/java/com/android/incallui/incall/impl/res/values-sl/strings.xml
index 782ce44..3a89cf1 100644
--- a/java/com/android/incallui/incall/impl/res/values-sl/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-sl/strings.xml
@@ -1,33 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_label_videocall" msgid="2208755440134676113">"Videoklic"</string>
-    <string name="incall_label_hold" msgid="4223472584896867896">"Zadrži"</string>
-    <string name="incall_label_add_call" msgid="5641663436373994915">"Dodaj klic"</string>
-    <string name="incall_label_mute" msgid="2180667027331706737">"Izklopi zvok"</string>
-    <string name="incall_label_end_call" msgid="5434079261446614887">"Končaj klic"</string>
-    <string name="incall_label_dialpad" msgid="8609779533654156550">"Tipkovnica"</string>
-    <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", vklopljen"</string>
-    <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", izklopljen"</string>
-    <string name="incall_label_merge" msgid="720076442985913175">"Združi"</string>
-    <string name="incall_label_manage" msgid="2175471192903568159">"Upravljanje"</string>
-    <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"Upravljanje klicateljev"</string>
-    <string name="incall_label_swap" msgid="10458642864243507">"Zamenjaj"</string>
-    <string name="incall_note_sent" msgid="4524130323127388367">"Opomba je poslana"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_label_videocall">Videoklic</string>
+  <string name="incall_label_rttcall">RTT</string>
+  <string name="incall_label_hold">Zadrži</string>
+  <string name="incall_label_add_call">Dodaj klic</string>
+  <string name="incall_label_mute">Izklopi zvok</string>
+  <string name="incall_label_end_call">Končaj klic</string>
+  <string name="incall_label_dialpad">Tipkovnica</string>
+  <string name="incall_talkback_speaker_on">, vklopljen</string>
+  <string name="incall_talkback_speaker_off">, izklopljen</string>
+  <string name="incall_label_merge">Združi</string>
+  <string name="incall_label_manage">Upravljanje</string>
+  <string name="a11y_description_incall_label_manage_content">Upravljanje klicateljev</string>
+  <string name="incall_label_swap">Zamenjaj</string>
+  <string name="incall_label_swap_sim">Zamenjaj SIM</string>
+  <string name="incall_note_sent">Opomba je poslana</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-sq/strings.xml b/java/com/android/incallui/incall/impl/res/values-sq/strings.xml
index a0fca36..2c1148a 100644
--- a/java/com/android/incallui/incall/impl/res/values-sq/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-sq/strings.xml
@@ -1,33 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_label_videocall" msgid="2208755440134676113">"Video tel."</string>
-    <string name="incall_label_hold" msgid="4223472584896867896">"Në pritje"</string>
-    <string name="incall_label_add_call" msgid="5641663436373994915">"Shto telef."</string>
-    <string name="incall_label_mute" msgid="2180667027331706737">"Hiqi zërin"</string>
-    <string name="incall_label_end_call" msgid="5434079261446614887">"Mbyll tel."</string>
-    <string name="incall_label_dialpad" msgid="8609779533654156550">"Blloku i tasteve"</string>
-    <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", është aktiv"</string>
-    <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", është joaktiv"</string>
-    <string name="incall_label_merge" msgid="720076442985913175">"Shkri"</string>
-    <string name="incall_label_manage" msgid="2175471192903568159">"Menaxho"</string>
-    <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"Menaxho telefonuesit"</string>
-    <string name="incall_label_swap" msgid="10458642864243507">"Shkëmbe"</string>
-    <string name="incall_note_sent" msgid="4524130323127388367">"Shënimi u dërgua"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_label_videocall">Video tel.</string>
+  <string name="incall_label_rttcall">RTT</string>
+  <string name="incall_label_hold">Në pritje</string>
+  <string name="incall_label_add_call">Shto telef.</string>
+  <string name="incall_label_mute">Hiqi zërin</string>
+  <string name="incall_label_end_call">Mbyll tel.</string>
+  <string name="incall_label_dialpad">Blloku i tasteve</string>
+  <string name="incall_talkback_speaker_on">, është aktiv</string>
+  <string name="incall_talkback_speaker_off">, është joaktiv</string>
+  <string name="incall_label_merge">Shkri</string>
+  <string name="incall_label_manage">Menaxho</string>
+  <string name="a11y_description_incall_label_manage_content">Menaxho telefonuesit</string>
+  <string name="incall_label_swap">Shkëmbe</string>
+  <string name="incall_label_swap_sim">Ndrysho kartën SIM</string>
+  <string name="incall_note_sent">Shënimi u dërgua</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-sr/strings.xml b/java/com/android/incallui/incall/impl/res/values-sr/strings.xml
index ec70451..e295bfb 100644
--- a/java/com/android/incallui/incall/impl/res/values-sr/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-sr/strings.xml
@@ -1,33 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_label_videocall" msgid="2208755440134676113">"Видео позив"</string>
-    <string name="incall_label_hold" msgid="4223472584896867896">"На чекање"</string>
-    <string name="incall_label_add_call" msgid="5641663436373994915">"Додај позив"</string>
-    <string name="incall_label_mute" msgid="2180667027331706737">"Искључи звук"</string>
-    <string name="incall_label_end_call" msgid="5434079261446614887">"Заврши позив"</string>
-    <string name="incall_label_dialpad" msgid="8609779533654156550">"Тастатура"</string>
-    <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", укључен"</string>
-    <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", искључен"</string>
-    <string name="incall_label_merge" msgid="720076442985913175">"Обједини"</string>
-    <string name="incall_label_manage" msgid="2175471192903568159">"Управљај"</string>
-    <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"Управљајте позиваоцима"</string>
-    <string name="incall_label_swap" msgid="10458642864243507">"Замени"</string>
-    <string name="incall_note_sent" msgid="4524130323127388367">"Белешка је послата"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_label_videocall">Видео позив</string>
+  <string name="incall_label_rttcall">RTT</string>
+  <string name="incall_label_hold">На чекање</string>
+  <string name="incall_label_add_call">Додај позив</string>
+  <string name="incall_label_mute">Искључи звук</string>
+  <string name="incall_label_end_call">Заврши позив</string>
+  <string name="incall_label_dialpad">Тастатура</string>
+  <string name="incall_talkback_speaker_on">, укључен</string>
+  <string name="incall_talkback_speaker_off">, искључен</string>
+  <string name="incall_label_merge">Обједини</string>
+  <string name="incall_label_manage">Управљај</string>
+  <string name="a11y_description_incall_label_manage_content">Управљајте позиваоцима</string>
+  <string name="incall_label_swap">Замени</string>
+  <string name="incall_label_swap_sim">Промени SIM</string>
+  <string name="incall_note_sent">Белешка је послата</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-sv/strings.xml b/java/com/android/incallui/incall/impl/res/values-sv/strings.xml
index ded4522..01b0b07 100644
--- a/java/com/android/incallui/incall/impl/res/values-sv/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-sv/strings.xml
@@ -1,33 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_label_videocall" msgid="2208755440134676113">"Videosamtal"</string>
-    <string name="incall_label_hold" msgid="4223472584896867896">"Parkera"</string>
-    <string name="incall_label_add_call" msgid="5641663436373994915">"Lägg t samt."</string>
-    <string name="incall_label_mute" msgid="2180667027331706737">"Ljud av"</string>
-    <string name="incall_label_end_call" msgid="5434079261446614887">"Avsl. samtal"</string>
-    <string name="incall_label_dialpad" msgid="8609779533654156550">"Knappsats"</string>
-    <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", är på"</string>
-    <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", är av"</string>
-    <string name="incall_label_merge" msgid="720076442985913175">"Sammanfoga"</string>
-    <string name="incall_label_manage" msgid="2175471192903568159">"Hantera"</string>
-    <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"Hantera uppringare"</string>
-    <string name="incall_label_swap" msgid="10458642864243507">"Växla"</string>
-    <string name="incall_note_sent" msgid="4524130323127388367">"Anteckning skickad"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_label_videocall">Videosamtal</string>
+  <string name="incall_label_rttcall">RTT</string>
+  <string name="incall_label_hold">Parkera</string>
+  <string name="incall_label_add_call">Lägg t samt.</string>
+  <string name="incall_label_mute">Ljud av</string>
+  <string name="incall_label_end_call">Avsl. samtal</string>
+  <string name="incall_label_dialpad">Knappsats</string>
+  <string name="incall_talkback_speaker_on">, är på</string>
+  <string name="incall_talkback_speaker_off">, är av</string>
+  <string name="incall_label_merge">Sammanfoga</string>
+  <string name="incall_label_manage">Hantera</string>
+  <string name="a11y_description_incall_label_manage_content">Hantera uppringare</string>
+  <string name="incall_label_swap">Växla</string>
+  <string name="incall_label_swap_sim">Ändra SIM</string>
+  <string name="incall_note_sent">Anteckning skickad</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-sw/strings.xml b/java/com/android/incallui/incall/impl/res/values-sw/strings.xml
index df634f4..ae7fa63 100644
--- a/java/com/android/incallui/incall/impl/res/values-sw/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-sw/strings.xml
@@ -1,33 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_label_videocall" msgid="2208755440134676113">"Hangout ya video"</string>
-    <string name="incall_label_hold" msgid="4223472584896867896">"Shikilia"</string>
-    <string name="incall_label_add_call" msgid="5641663436373994915">"Ongeza simu"</string>
-    <string name="incall_label_mute" msgid="2180667027331706737">"Zima maikrofoni"</string>
-    <string name="incall_label_end_call" msgid="5434079261446614887">"Kata simu"</string>
-    <string name="incall_label_dialpad" msgid="8609779533654156550">"Vitufe vya Simu"</string>
-    <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", kimewashwa"</string>
-    <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", kimezimwa"</string>
-    <string name="incall_label_merge" msgid="720076442985913175">"Unganisha"</string>
-    <string name="incall_label_manage" msgid="2175471192903568159">"Dhibiti"</string>
-    <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"Dhibiti wanaopiga simu"</string>
-    <string name="incall_label_swap" msgid="10458642864243507">"Badili"</string>
-    <string name="incall_note_sent" msgid="4524130323127388367">"Dokezo limetumwa"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_label_videocall">Hangout ya video</string>
+  <string name="incall_label_rttcall">RTT</string>
+  <string name="incall_label_hold">Shikilia</string>
+  <string name="incall_label_add_call">Ongeza simu</string>
+  <string name="incall_label_mute">Zima maikrofoni</string>
+  <string name="incall_label_end_call">Kata simu</string>
+  <string name="incall_label_dialpad">Vitufe vya Simu</string>
+  <string name="incall_talkback_speaker_on">, kimewashwa</string>
+  <string name="incall_talkback_speaker_off">, kimezimwa</string>
+  <string name="incall_label_merge">Unganisha</string>
+  <string name="incall_label_manage">Dhibiti</string>
+  <string name="a11y_description_incall_label_manage_content">Dhibiti wanaopiga simu</string>
+  <string name="incall_label_swap">Badili</string>
+  <string name="incall_label_swap_sim">Badilisha SIM</string>
+  <string name="incall_note_sent">Dokezo limetumwa</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-ta/strings.xml b/java/com/android/incallui/incall/impl/res/values-ta/strings.xml
index 5c94abf..e5a07bf 100644
--- a/java/com/android/incallui/incall/impl/res/values-ta/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-ta/strings.xml
@@ -1,33 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_label_videocall" msgid="2208755440134676113">"வீடியோ கால்"</string>
-    <string name="incall_label_hold" msgid="4223472584896867896">"ஹோல்டில் வை"</string>
-    <string name="incall_label_add_call" msgid="5641663436373994915">"அழைப்பை சேர்"</string>
-    <string name="incall_label_mute" msgid="2180667027331706737">"முடக்கு"</string>
-    <string name="incall_label_end_call" msgid="5434079261446614887">"அழைப்பை முடி"</string>
-    <string name="incall_label_dialpad" msgid="8609779533654156550">"விசைத்தளம்"</string>
-    <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", ஆன்"</string>
-    <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", ஆஃப்"</string>
-    <string name="incall_label_merge" msgid="720076442985913175">"இணை"</string>
-    <string name="incall_label_manage" msgid="2175471192903568159">"நிர்வகி"</string>
-    <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"அழைப்பாளர்களை நிர்வகிக்கும்"</string>
-    <string name="incall_label_swap" msgid="10458642864243507">"மாற்று"</string>
-    <string name="incall_note_sent" msgid="4524130323127388367">"குறிப்பு அனுப்பப்பட்டது"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_label_videocall">வீடியோ கால்</string>
+  <string name="incall_label_rttcall">RTT</string>
+  <string name="incall_label_hold">ஹோல்டில் வை</string>
+  <string name="incall_label_add_call">அழைப்பை சேர்</string>
+  <string name="incall_label_mute">முடக்கு</string>
+  <string name="incall_label_end_call">அழைப்பை முடி</string>
+  <string name="incall_label_dialpad">விசைத்தளம்</string>
+  <string name="incall_talkback_speaker_on">, ஆன்</string>
+  <string name="incall_talkback_speaker_off">, ஆஃப்</string>
+  <string name="incall_label_merge">இணை</string>
+  <string name="incall_label_manage">நிர்வகி</string>
+  <string name="a11y_description_incall_label_manage_content">அழைப்பாளர்களை நிர்வகிக்கும்</string>
+  <string name="incall_label_swap">மாற்று</string>
+  <string name="incall_label_swap_sim">சிம்மை மாற்று</string>
+  <string name="incall_note_sent">குறிப்பு அனுப்பப்பட்டது</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-te/strings.xml b/java/com/android/incallui/incall/impl/res/values-te/strings.xml
index 0cb3fb8..5cabef0 100644
--- a/java/com/android/incallui/incall/impl/res/values-te/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-te/strings.xml
@@ -1,33 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_label_videocall" msgid="2208755440134676113">"వీడియో కాల్"</string>
-    <string name="incall_label_hold" msgid="4223472584896867896">"హోల్డ్ చేయి"</string>
-    <string name="incall_label_add_call" msgid="5641663436373994915">"కాల్ జోడించు"</string>
-    <string name="incall_label_mute" msgid="2180667027331706737">"మ్యూట్ చేయి"</string>
-    <string name="incall_label_end_call" msgid="5434079261446614887">"కాల్ ముగించు"</string>
-    <string name="incall_label_dialpad" msgid="8609779533654156550">"కీప్యాడ్"</string>
-    <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", ఆన్‌లో ఉంది"</string>
-    <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", ఆఫ్‌లో ఉంది"</string>
-    <string name="incall_label_merge" msgid="720076442985913175">"విలీనం చేయి"</string>
-    <string name="incall_label_manage" msgid="2175471192903568159">"నిర్వహించు"</string>
-    <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"కాలర్‌లను నిర్వహిస్తుంది"</string>
-    <string name="incall_label_swap" msgid="10458642864243507">"మార్చు"</string>
-    <string name="incall_note_sent" msgid="4524130323127388367">"గమనిక పంపబడింది"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_label_videocall">వీడియో కాల్</string>
+  <string name="incall_label_rttcall">RTT</string>
+  <string name="incall_label_hold">హోల్డ్ చేయి</string>
+  <string name="incall_label_add_call">కాల్ జోడించు</string>
+  <string name="incall_label_mute">మ్యూట్ చేయి</string>
+  <string name="incall_label_end_call">కాల్ ముగించు</string>
+  <string name="incall_label_dialpad">కీప్యాడ్</string>
+  <string name="incall_talkback_speaker_on">, ఆన్‌లో ఉంది</string>
+  <string name="incall_talkback_speaker_off">, ఆఫ్‌లో ఉంది</string>
+  <string name="incall_label_merge">విలీనం చేయి</string>
+  <string name="incall_label_manage">నిర్వహించు</string>
+  <string name="a11y_description_incall_label_manage_content">కాలర్‌లను నిర్వహిస్తుంది</string>
+  <string name="incall_label_swap">మార్చు</string>
+  <string name="incall_label_swap_sim">SIMని మార్చు</string>
+  <string name="incall_note_sent">గమనిక పంపబడింది</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-th/strings.xml b/java/com/android/incallui/incall/impl/res/values-th/strings.xml
index 0929cfc..33ff527 100644
--- a/java/com/android/incallui/incall/impl/res/values-th/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-th/strings.xml
@@ -1,33 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_label_videocall" msgid="2208755440134676113">"แฮงเอาท์วิดีโอ"</string>
-    <string name="incall_label_hold" msgid="4223472584896867896">"พักสาย"</string>
-    <string name="incall_label_add_call" msgid="5641663436373994915">"เพิ่มการโทร"</string>
-    <string name="incall_label_mute" msgid="2180667027331706737">"ปิดเสียง"</string>
-    <string name="incall_label_end_call" msgid="5434079261446614887">"วางสาย"</string>
-    <string name="incall_label_dialpad" msgid="8609779533654156550">"ปุ่มกด"</string>
-    <string name="incall_talkback_speaker_on" msgid="5819463769258124228">"เปิดอยู่"</string>
-    <string name="incall_talkback_speaker_off" msgid="7486836772563090186">"ปิดอยู่"</string>
-    <string name="incall_label_merge" msgid="720076442985913175">"รวม"</string>
-    <string name="incall_label_manage" msgid="2175471192903568159">"จัดการ"</string>
-    <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"จัดการผู้โทร"</string>
-    <string name="incall_label_swap" msgid="10458642864243507">"สลับ"</string>
-    <string name="incall_note_sent" msgid="4524130323127388367">"ส่งโน้ตแล้ว"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_label_videocall"> Hangouts วิดีโอ</string>
+  <string name="incall_label_rttcall">RTT</string>
+  <string name="incall_label_hold">พักสาย</string>
+  <string name="incall_label_add_call">เพิ่มการโทร</string>
+  <string name="incall_label_mute">ปิดเสียง</string>
+  <string name="incall_label_end_call">วางสาย</string>
+  <string name="incall_label_dialpad">ปุ่มกด</string>
+  <string name="incall_talkback_speaker_on">เปิดอยู่</string>
+  <string name="incall_talkback_speaker_off">ปิดอยู่</string>
+  <string name="incall_label_merge">รวม</string>
+  <string name="incall_label_manage">จัดการ</string>
+  <string name="a11y_description_incall_label_manage_content">จัดการผู้โทร</string>
+  <string name="incall_label_swap">สลับ</string>
+  <string name="incall_label_swap_sim">เปลี่ยนซิม</string>
+  <string name="incall_note_sent">ส่งโน้ตแล้ว</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-tl/strings.xml b/java/com/android/incallui/incall/impl/res/values-tl/strings.xml
index 1ac2ef8..356f5e3 100644
--- a/java/com/android/incallui/incall/impl/res/values-tl/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-tl/strings.xml
@@ -1,33 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_label_videocall" msgid="2208755440134676113">"Video call"</string>
-    <string name="incall_label_hold" msgid="4223472584896867896">"I-hold"</string>
-    <string name="incall_label_add_call" msgid="5641663436373994915">"Mag-add: tawag"</string>
-    <string name="incall_label_mute" msgid="2180667027331706737">"I-mute"</string>
-    <string name="incall_label_end_call" msgid="5434079261446614887">"Tapusin ang tawag"</string>
-    <string name="incall_label_dialpad" msgid="8609779533654156550">"Keypad"</string>
-    <string name="incall_talkback_speaker_on" msgid="5819463769258124228">",ay On"</string>
-    <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", ay Off"</string>
-    <string name="incall_label_merge" msgid="720076442985913175">"I-merge"</string>
-    <string name="incall_label_manage" msgid="2175471192903568159">"Pamahalaan"</string>
-    <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"Pamahalaan ang mga tumatawag"</string>
-    <string name="incall_label_swap" msgid="10458642864243507">"Pagpalitin"</string>
-    <string name="incall_note_sent" msgid="4524130323127388367">"Naipadala ang tala"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_label_videocall">Video call</string>
+  <string name="incall_label_rttcall">RTT</string>
+  <string name="incall_label_hold">I-hold</string>
+  <string name="incall_label_add_call">Mag-add: tawag </string>
+  <string name="incall_label_mute">I-mute</string>
+  <string name="incall_label_end_call">Tapusin ang tawag</string>
+  <string name="incall_label_dialpad">Keypad</string>
+  <string name="incall_talkback_speaker_on">,ay On</string>
+  <string name="incall_talkback_speaker_off">, ay Off</string>
+  <string name="incall_label_merge">I-merge</string>
+  <string name="incall_label_manage">Pamahalaan</string>
+  <string name="a11y_description_incall_label_manage_content">Pamahalaan ang mga tumatawag</string>
+  <string name="incall_label_swap">Pagpalitin</string>
+  <string name="incall_label_swap_sim">Baguhin ang SIM</string>
+  <string name="incall_note_sent">Naipadala ang tala</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-tr/strings.xml b/java/com/android/incallui/incall/impl/res/values-tr/strings.xml
index 241b694..362d850 100644
--- a/java/com/android/incallui/incall/impl/res/values-tr/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-tr/strings.xml
@@ -1,33 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_label_videocall" msgid="2208755440134676113">"Görü. görüş."</string>
-    <string name="incall_label_hold" msgid="4223472584896867896">"Beklemeye al"</string>
-    <string name="incall_label_add_call" msgid="5641663436373994915">"Çağrı ekle"</string>
-    <string name="incall_label_mute" msgid="2180667027331706737">"Sesi kapat"</string>
-    <string name="incall_label_end_call" msgid="5434079261446614887">"Çğryı sonldr"</string>
-    <string name="incall_label_dialpad" msgid="8609779533654156550">"Tuş takımı"</string>
-    <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", Açık"</string>
-    <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", Kapalı"</string>
-    <string name="incall_label_merge" msgid="720076442985913175">"Birleştir"</string>
-    <string name="incall_label_manage" msgid="2175471192903568159">"Yönet"</string>
-    <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"Arayanları yönetin"</string>
-    <string name="incall_label_swap" msgid="10458642864243507">"Değiştir"</string>
-    <string name="incall_note_sent" msgid="4524130323127388367">"Not gönderildi"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_label_videocall">Görü. görüş.</string>
+  <string name="incall_label_rttcall">RTT</string>
+  <string name="incall_label_hold">Beklemeye al</string>
+  <string name="incall_label_add_call">Çağrı ekle</string>
+  <string name="incall_label_mute">Sesi kapat</string>
+  <string name="incall_label_end_call">Çğryı sonldr</string>
+  <string name="incall_label_dialpad">Tuş takımı</string>
+  <string name="incall_talkback_speaker_on">, Açık</string>
+  <string name="incall_talkback_speaker_off">, Kapalı</string>
+  <string name="incall_label_merge">Birleştir</string>
+  <string name="incall_label_manage">Yönet</string>
+  <string name="a11y_description_incall_label_manage_content">Arayanları yönetin</string>
+  <string name="incall_label_swap">Değiştir</string>
+  <string name="incall_label_swap_sim">SIM\'i değştr</string>
+  <string name="incall_note_sent">Not gönderildi</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-uk/strings.xml b/java/com/android/incallui/incall/impl/res/values-uk/strings.xml
index 1821556..cf0e679 100644
--- a/java/com/android/incallui/incall/impl/res/values-uk/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-uk/strings.xml
@@ -1,33 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_label_videocall" msgid="2208755440134676113">"Відеодзвінок"</string>
-    <string name="incall_label_hold" msgid="4223472584896867896">"Утримувати"</string>
-    <string name="incall_label_add_call" msgid="5641663436373994915">"Дод. виклик"</string>
-    <string name="incall_label_mute" msgid="2180667027331706737">"Без звуку"</string>
-    <string name="incall_label_end_call" msgid="5434079261446614887">"Завер. викл."</string>
-    <string name="incall_label_dialpad" msgid="8609779533654156550">"Клавіатура"</string>
-    <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", увімкнено"</string>
-    <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", вимкнено"</string>
-    <string name="incall_label_merge" msgid="720076442985913175">"Об’єднати"</string>
-    <string name="incall_label_manage" msgid="2175471192903568159">"Керувати"</string>
-    <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"Керувати абонентами"</string>
-    <string name="incall_label_swap" msgid="10458642864243507">"Поміняти"</string>
-    <string name="incall_note_sent" msgid="4524130323127388367">"Нотатку надіслано"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_label_videocall">Відеодзвінок</string>
+  <string name="incall_label_rttcall">RTT</string>
+  <string name="incall_label_hold">Утримувати</string>
+  <string name="incall_label_add_call">Дод. виклик</string>
+  <string name="incall_label_mute">Без звуку</string>
+  <string name="incall_label_end_call">Завер. викл.</string>
+  <string name="incall_label_dialpad">Клавіатура</string>
+  <string name="incall_talkback_speaker_on">, увімкнено</string>
+  <string name="incall_talkback_speaker_off">, вимкнено</string>
+  <string name="incall_label_merge">Об’єднати</string>
+  <string name="incall_label_manage">Керувати</string>
+  <string name="a11y_description_incall_label_manage_content">Керувати абонентами</string>
+  <string name="incall_label_swap">Поміняти</string>
+  <string name="incall_label_swap_sim">Змінити SIM</string>
+  <string name="incall_note_sent">Нотатку надіслано</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-ur/strings.xml b/java/com/android/incallui/incall/impl/res/values-ur/strings.xml
index fed0af6..fb2feb5 100644
--- a/java/com/android/incallui/incall/impl/res/values-ur/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-ur/strings.xml
@@ -1,33 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_label_videocall" msgid="2208755440134676113">"ویڈیو کال"</string>
-    <string name="incall_label_hold" msgid="4223472584896867896">"ہولڈ کریں"</string>
-    <string name="incall_label_add_call" msgid="5641663436373994915">"کال شامل کریں"</string>
-    <string name="incall_label_mute" msgid="2180667027331706737">"خاموش کریں"</string>
-    <string name="incall_label_end_call" msgid="5434079261446614887">"کال ختم کریں"</string>
-    <string name="incall_label_dialpad" msgid="8609779533654156550">"کی پیڈ"</string>
-    <string name="incall_talkback_speaker_on" msgid="5819463769258124228">"، آن ہے"</string>
-    <string name="incall_talkback_speaker_off" msgid="7486836772563090186">"، آف ہے"</string>
-    <string name="incall_label_merge" msgid="720076442985913175">"ضم کریں"</string>
-    <string name="incall_label_manage" msgid="2175471192903568159">"نظم کریں"</string>
-    <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"کالرز کا نظم کریں"</string>
-    <string name="incall_label_swap" msgid="10458642864243507">"تبادلہ کریں"</string>
-    <string name="incall_note_sent" msgid="4524130323127388367">"نوٹ بھیج دیا گیا"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_label_videocall">ویڈیو کال</string>
+  <string name="incall_label_rttcall">RTT</string>
+  <string name="incall_label_hold">ہولڈ کریں</string>
+  <string name="incall_label_add_call">کال شامل کریں</string>
+  <string name="incall_label_mute">خاموش کریں</string>
+  <string name="incall_label_end_call">کال ختم کریں</string>
+  <string name="incall_label_dialpad">کی پیڈ</string>
+  <string name="incall_talkback_speaker_on">، آن ہے</string>
+  <string name="incall_talkback_speaker_off">، آف ہے</string>
+  <string name="incall_label_merge">ضم کریں</string>
+  <string name="incall_label_manage">نظم کریں</string>
+  <string name="a11y_description_incall_label_manage_content">کالرز کا نظم کریں</string>
+  <string name="incall_label_swap">تبادلہ کریں</string>
+  <string name="incall_label_swap_sim">‏SIM تبدیل کریں</string>
+  <string name="incall_note_sent">نوٹ بھیج دیا گیا</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-uz/strings.xml b/java/com/android/incallui/incall/impl/res/values-uz/strings.xml
index 7d6af27..b2ba16e 100644
--- a/java/com/android/incallui/incall/impl/res/values-uz/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-uz/strings.xml
@@ -1,33 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_label_videocall" msgid="2208755440134676113">"Video qo‘n."</string>
-    <string name="incall_label_hold" msgid="4223472584896867896">"Pauza"</string>
-    <string name="incall_label_add_call" msgid="5641663436373994915">"Chaqiruv"</string>
-    <string name="incall_label_mute" msgid="2180667027331706737">"Ovozsiz"</string>
-    <string name="incall_label_end_call" msgid="5434079261446614887">"Tugatish"</string>
-    <string name="incall_label_dialpad" msgid="8609779533654156550">"Klaviatura"</string>
-    <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", yoniq"</string>
-    <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", o‘chiq"</string>
-    <string name="incall_label_merge" msgid="720076442985913175">"Birlashtirish"</string>
-    <string name="incall_label_manage" msgid="2175471192903568159">"Boshqarish"</string>
-    <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"Qo‘ng‘iroq qiluvchilarni boshqarish"</string>
-    <string name="incall_label_swap" msgid="10458642864243507">"Almashish"</string>
-    <string name="incall_note_sent" msgid="4524130323127388367">"Qayd yuborildi"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_label_videocall">Video qo‘n.</string>
+  <string name="incall_label_rttcall">RTT</string>
+  <string name="incall_label_hold">Pauza</string>
+  <string name="incall_label_add_call">Chaqiruv</string>
+  <string name="incall_label_mute">Ovozsiz</string>
+  <string name="incall_label_end_call">Tugatish</string>
+  <string name="incall_label_dialpad">Klaviatura</string>
+  <string name="incall_talkback_speaker_on">, yoniq</string>
+  <string name="incall_talkback_speaker_off">, o‘chiq</string>
+  <string name="incall_label_merge">Birlashtirish</string>
+  <string name="incall_label_manage">Boshqarish</string>
+  <string name="a11y_description_incall_label_manage_content">Qo‘ng‘iroq qiluvchilarni boshqarish</string>
+  <string name="incall_label_swap">Almashish</string>
+  <string name="incall_label_swap_sim">SIMni o‘zg.</string>
+  <string name="incall_note_sent">Qayd yuborildi</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-vi/strings.xml b/java/com/android/incallui/incall/impl/res/values-vi/strings.xml
index 42e320a..f7d0eaf 100644
--- a/java/com/android/incallui/incall/impl/res/values-vi/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-vi/strings.xml
@@ -1,33 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_label_videocall" msgid="2208755440134676113">"Gọi điện video"</string>
-    <string name="incall_label_hold" msgid="4223472584896867896">"Giữ"</string>
-    <string name="incall_label_add_call" msgid="5641663436373994915">"Thêm cuộc gọi"</string>
-    <string name="incall_label_mute" msgid="2180667027331706737">"Tắt tiếng"</string>
-    <string name="incall_label_end_call" msgid="5434079261446614887">"Kết thúc cuộc gọi"</string>
-    <string name="incall_label_dialpad" msgid="8609779533654156550">"Bàn phím"</string>
-    <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", đang bật"</string>
-    <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", đang tắt"</string>
-    <string name="incall_label_merge" msgid="720076442985913175">"Hợp nhất"</string>
-    <string name="incall_label_manage" msgid="2175471192903568159">"Quản lý"</string>
-    <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"Quản lý người gọi"</string>
-    <string name="incall_label_swap" msgid="10458642864243507">"Hoán đổi"</string>
-    <string name="incall_note_sent" msgid="4524130323127388367">"Đã gửi ghi chú"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_label_videocall">Gọi điện video</string>
+  <string name="incall_label_rttcall">RTT</string>
+  <string name="incall_label_hold">Giữ</string>
+  <string name="incall_label_add_call">Thêm cuộc gọi</string>
+  <string name="incall_label_mute">Tắt tiếng</string>
+  <string name="incall_label_end_call">Kết thúc cuộc gọi</string>
+  <string name="incall_label_dialpad">Bàn phím</string>
+  <string name="incall_talkback_speaker_on">, đang bật</string>
+  <string name="incall_talkback_speaker_off">, đang tắt</string>
+  <string name="incall_label_merge">Hợp nhất</string>
+  <string name="incall_label_manage">Quản lý</string>
+  <string name="a11y_description_incall_label_manage_content">Quản lý người gọi</string>
+  <string name="incall_label_swap">Hoán đổi</string>
+  <string name="incall_label_swap_sim">Đổi SIM</string>
+  <string name="incall_note_sent">Đã gửi ghi chú</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-zh-rCN/strings.xml b/java/com/android/incallui/incall/impl/res/values-zh-rCN/strings.xml
index f0cca90..1b0dab5 100644
--- a/java/com/android/incallui/incall/impl/res/values-zh-rCN/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-zh-rCN/strings.xml
@@ -1,33 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_label_videocall" msgid="2208755440134676113">"视频通话"</string>
-    <string name="incall_label_hold" msgid="4223472584896867896">"保持"</string>
-    <string name="incall_label_add_call" msgid="5641663436373994915">"添加通话"</string>
-    <string name="incall_label_mute" msgid="2180667027331706737">"静音"</string>
-    <string name="incall_label_end_call" msgid="5434079261446614887">"结束通话"</string>
-    <string name="incall_label_dialpad" msgid="8609779533654156550">"拨号键盘"</string>
-    <string name="incall_talkback_speaker_on" msgid="5819463769258124228">"，已开启"</string>
-    <string name="incall_talkback_speaker_off" msgid="7486836772563090186">"，已关闭"</string>
-    <string name="incall_label_merge" msgid="720076442985913175">"合并"</string>
-    <string name="incall_label_manage" msgid="2175471192903568159">"管理"</string>
-    <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"管理来电者"</string>
-    <string name="incall_label_swap" msgid="10458642864243507">"切换"</string>
-    <string name="incall_note_sent" msgid="4524130323127388367">"已发送备注"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_label_videocall">视频通话</string>
+  <string name="incall_label_rttcall">RTT</string>
+  <string name="incall_label_hold">保持</string>
+  <string name="incall_label_add_call">添加通话</string>
+  <string name="incall_label_mute">静音</string>
+  <string name="incall_label_end_call">结束通话</string>
+  <string name="incall_label_dialpad">拨号键盘</string>
+  <string name="incall_talkback_speaker_on">，已开启</string>
+  <string name="incall_talkback_speaker_off">，已关闭</string>
+  <string name="incall_label_merge">合并</string>
+  <string name="incall_label_manage">管理</string>
+  <string name="a11y_description_incall_label_manage_content">管理来电者</string>
+  <string name="incall_label_swap">切换</string>
+  <string name="incall_label_swap_sim">更改 SIM 卡</string>
+  <string name="incall_note_sent">已发送备注</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-zh-rHK/strings.xml b/java/com/android/incallui/incall/impl/res/values-zh-rHK/strings.xml
index c38ef35..e5e4305 100644
--- a/java/com/android/incallui/incall/impl/res/values-zh-rHK/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-zh-rHK/strings.xml
@@ -1,33 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_label_videocall" msgid="2208755440134676113">"視像通話"</string>
-    <string name="incall_label_hold" msgid="4223472584896867896">"保留"</string>
-    <string name="incall_label_add_call" msgid="5641663436373994915">"新增通話"</string>
-    <string name="incall_label_mute" msgid="2180667027331706737">"靜音"</string>
-    <string name="incall_label_end_call" msgid="5434079261446614887">"結束通話"</string>
-    <string name="incall_label_dialpad" msgid="8609779533654156550">"小鍵盤"</string>
-    <string name="incall_talkback_speaker_on" msgid="5819463769258124228">"，已開啟"</string>
-    <string name="incall_talkback_speaker_off" msgid="7486836772563090186">"，已關閉"</string>
-    <string name="incall_label_merge" msgid="720076442985913175">"合併"</string>
-    <string name="incall_label_manage" msgid="2175471192903568159">"管理"</string>
-    <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"管理來電者"</string>
-    <string name="incall_label_swap" msgid="10458642864243507">"切換"</string>
-    <string name="incall_note_sent" msgid="4524130323127388367">"已傳送筆記"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_label_videocall">視像通話</string>
+  <string name="incall_label_rttcall">RTT</string>
+  <string name="incall_label_hold">保留</string>
+  <string name="incall_label_add_call">新增通話</string>
+  <string name="incall_label_mute">靜音</string>
+  <string name="incall_label_end_call">結束通話</string>
+  <string name="incall_label_dialpad">小鍵盤</string>
+  <string name="incall_talkback_speaker_on">，已開啟</string>
+  <string name="incall_talkback_speaker_off">，已關閉</string>
+  <string name="incall_label_merge">合併</string>
+  <string name="incall_label_manage">管理</string>
+  <string name="a11y_description_incall_label_manage_content">管理來電者</string>
+  <string name="incall_label_swap">切換</string>
+  <string name="incall_label_swap_sim">變更 SIM</string>
+  <string name="incall_note_sent">已傳送筆記</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-zh-rTW/strings.xml b/java/com/android/incallui/incall/impl/res/values-zh-rTW/strings.xml
index c04b830..5f6aec8 100644
--- a/java/com/android/incallui/incall/impl/res/values-zh-rTW/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-zh-rTW/strings.xml
@@ -1,33 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_label_videocall" msgid="2208755440134676113">"視訊通話"</string>
-    <string name="incall_label_hold" msgid="4223472584896867896">"保留"</string>
-    <string name="incall_label_add_call" msgid="5641663436373994915">"新增通話"</string>
-    <string name="incall_label_mute" msgid="2180667027331706737">"靜音"</string>
-    <string name="incall_label_end_call" msgid="5434079261446614887">"結束通話"</string>
-    <string name="incall_label_dialpad" msgid="8609779533654156550">"撥號鍵盤"</string>
-    <string name="incall_talkback_speaker_on" msgid="5819463769258124228">"，已開啟"</string>
-    <string name="incall_talkback_speaker_off" msgid="7486836772563090186">"，已關閉"</string>
-    <string name="incall_label_merge" msgid="720076442985913175">"合併"</string>
-    <string name="incall_label_manage" msgid="2175471192903568159">"管理"</string>
-    <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"管理來電者"</string>
-    <string name="incall_label_swap" msgid="10458642864243507">"切換"</string>
-    <string name="incall_note_sent" msgid="4524130323127388367">"備註已送出"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_label_videocall">視訊通話</string>
+  <string name="incall_label_rttcall">即時文字訊息</string>
+  <string name="incall_label_hold">保留</string>
+  <string name="incall_label_add_call">新增通話</string>
+  <string name="incall_label_mute">靜音</string>
+  <string name="incall_label_end_call">結束通話</string>
+  <string name="incall_label_dialpad">撥號鍵盤</string>
+  <string name="incall_talkback_speaker_on">，已開啟</string>
+  <string name="incall_talkback_speaker_off">，已關閉</string>
+  <string name="incall_label_merge">合併</string>
+  <string name="incall_label_manage">管理</string>
+  <string name="a11y_description_incall_label_manage_content">管理來電者</string>
+  <string name="incall_label_swap">切換</string>
+  <string name="incall_label_swap_sim">變更 SIM 卡</string>
+  <string name="incall_note_sent">備註已送出</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values-zu/strings.xml b/java/com/android/incallui/incall/impl/res/values-zu/strings.xml
index a23a1d5..4ff6faf 100644
--- a/java/com/android/incallui/incall/impl/res/values-zu/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values-zu/strings.xml
@@ -1,33 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="incall_label_videocall" msgid="2208755440134676113">"Ikholi yevidiyo ye-Hangout"</string>
-    <string name="incall_label_hold" msgid="4223472584896867896">"Bamba"</string>
-    <string name="incall_label_add_call" msgid="5641663436373994915">"Engeza ikholi"</string>
-    <string name="incall_label_mute" msgid="2180667027331706737">"Thulisa"</string>
-    <string name="incall_label_end_call" msgid="5434079261446614887">"Qeda ikholi"</string>
-    <string name="incall_label_dialpad" msgid="8609779533654156550">"Ikhiphedi"</string>
-    <string name="incall_talkback_speaker_on" msgid="5819463769258124228">", ivuliwe"</string>
-    <string name="incall_talkback_speaker_off" msgid="7486836772563090186">", ivaliwe"</string>
-    <string name="incall_label_merge" msgid="720076442985913175">"Hlanganisa"</string>
-    <string name="incall_label_manage" msgid="2175471192903568159">"Phatha"</string>
-    <string name="a11y_description_incall_label_manage_content" msgid="8298638893449287602">"Phatha abashayi"</string>
-    <string name="incall_label_swap" msgid="10458642864243507">"Shintsha"</string>
-    <string name="incall_note_sent" msgid="4524130323127388367">"Inothi lithunyelwe"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="incall_label_videocall">Ikholi yevidiyo ye-Hangout</string>
+  <string name="incall_label_rttcall">I-RTT</string>
+  <string name="incall_label_hold">Bamba</string>
+  <string name="incall_label_add_call">Engeza ikholi</string>
+  <string name="incall_label_mute">Thulisa</string>
+  <string name="incall_label_end_call">Qeda ikholi</string>
+  <string name="incall_label_dialpad">Ikhiphedi</string>
+  <string name="incall_talkback_speaker_on">, ivuliwe</string>
+  <string name="incall_talkback_speaker_off">, ivaliwe</string>
+  <string name="incall_label_merge">Hlanganisa</string>
+  <string name="incall_label_manage">Phatha</string>
+  <string name="a11y_description_incall_label_manage_content">Phatha abashayi</string>
+  <string name="incall_label_swap">Shintsha</string>
+  <string name="incall_label_swap_sim">Shintsha i-SIM</string>
+  <string name="incall_note_sent">Inothi lithunyelwe</string>
 </resources>
diff --git a/java/com/android/incallui/incall/impl/res/values/dimens.xml b/java/com/android/incallui/incall/impl/res/values/dimens.xml
index 076a7d7..c4a7be6 100644
--- a/java/com/android/incallui/incall/impl/res/values/dimens.xml
+++ b/java/com/android/incallui/incall/impl/res/values/dimens.xml
@@ -18,11 +18,11 @@
 <resources>
   <dimen name="incall_button_label_margin">8dp</dimen>
   <dimen name="incall_button_elevation">0dp</dimen>
-  <dimen name="incall_end_call_spacing">116dp</dimen>
   <dimen name="incall_button_padding">4dp</dimen>
   <dimen name="incall_button_vertical_padding">8dp</dimen>
   <dimen name="incall_avatar_size">0dp</dimen>
   <dimen name="incall_labeled_button_size">48dp</dimen>
+  <dimen name="incall_labeled_button_icon_size">36dp</dimen>
   <dimen name="tools_button_height">76dp</dimen>
   <dimen name="incall_window_margin_horizontal">24dp</dimen>
 
diff --git a/java/com/android/incallui/incall/impl/res/values/strings.xml b/java/com/android/incallui/incall/impl/res/values/strings.xml
index d021756..c4c40a1 100644
--- a/java/com/android/incallui/incall/impl/res/values/strings.xml
+++ b/java/com/android/incallui/incall/impl/res/values/strings.xml
@@ -20,6 +20,10 @@
      [CHAR LIMIT=12] -->
   <string name="incall_label_videocall">Video call</string>
 
+  <!-- Button shown during a phone call to upgrade to Real-time Text.
+     [CHAR LIMIT=12] -->
+  <string name="incall_label_rttcall">RTT</string>
+
   <!-- Button shown during a phone call to put the call on hold.
      [CHAR LIMIT=12] -->
   <string name="incall_label_hold">Hold</string>
diff --git a/java/com/android/incallui/incall/protocol/InCallButtonIds.java b/java/com/android/incallui/incall/protocol/InCallButtonIds.java
index 3de5335..80ea75e 100644
--- a/java/com/android/incallui/incall/protocol/InCallButtonIds.java
+++ b/java/com/android/incallui/incall/protocol/InCallButtonIds.java
@@ -39,6 +39,7 @@
   InCallButtonIds.BUTTON_SWITCH_TO_SECONDARY,
   InCallButtonIds.BUTTON_SWAP_SIM,
   InCallButtonIds.BUTTON_COUNT,
+  InCallButtonIds.BUTTON_UPGRADE_TO_RTT
 })
 public @interface InCallButtonIds {
 
@@ -58,4 +59,5 @@
   int BUTTON_SWITCH_TO_SECONDARY = 13;
   int BUTTON_SWAP_SIM = 14;
   int BUTTON_COUNT = 15;
+  int BUTTON_UPGRADE_TO_RTT = 16;
 }
diff --git a/java/com/android/incallui/incall/protocol/InCallButtonIdsExtension.java b/java/com/android/incallui/incall/protocol/InCallButtonIdsExtension.java
index db6e900..5239d9d 100644
--- a/java/com/android/incallui/incall/protocol/InCallButtonIdsExtension.java
+++ b/java/com/android/incallui/incall/protocol/InCallButtonIdsExtension.java
@@ -56,6 +56,8 @@
       return "SWITCH_TO_SECONDARY";
     } else if (id == InCallButtonIds.BUTTON_SWAP_SIM) {
       return "SWAP_SIM";
+    } else if (id == InCallButtonIds.BUTTON_UPGRADE_TO_RTT) {
+      return "UPGRADE_TO_RTT";
     } else {
       return "INVALID_BUTTON: " + id;
     }
diff --git a/java/com/android/incallui/incall/protocol/InCallButtonUiDelegate.java b/java/com/android/incallui/incall/protocol/InCallButtonUiDelegate.java
index 9f9c5fb..b0e23ef 100644
--- a/java/com/android/incallui/incall/protocol/InCallButtonUiDelegate.java
+++ b/java/com/android/incallui/incall/protocol/InCallButtonUiDelegate.java
@@ -47,6 +47,8 @@
 
   void changeToVideoClicked();
 
+  void changeToRttClicked();
+
   void switchCameraClicked(boolean useFrontFacingCamera);
 
   void toggleCameraClicked();
diff --git a/java/com/android/incallui/incall/protocol/PrimaryCallState.java b/java/com/android/incallui/incall/protocol/PrimaryCallState.java
index 1d536e9..e07caf1 100644
--- a/java/com/android/incallui/incall/protocol/PrimaryCallState.java
+++ b/java/com/android/incallui/incall/protocol/PrimaryCallState.java
@@ -17,14 +17,15 @@
 package com.android.incallui.incall.protocol;
 
 import android.graphics.drawable.Drawable;
+import android.support.annotation.ColorInt;
 import android.support.annotation.IntDef;
 import android.support.annotation.Nullable;
 import android.telecom.DisconnectCause;
 import android.text.TextUtils;
 import com.android.dialer.assisteddialing.TransformationInfo;
 import com.android.dialer.common.Assert;
-import com.android.incallui.call.DialerCall;
-import com.android.incallui.call.DialerCall.State;
+import com.android.dialer.preferredsim.suggestion.SuggestionProvider;
+import com.android.incallui.call.state.DialerCallState;
 import com.android.incallui.videotech.utils.SessionModificationState;
 import com.google.auto.value.AutoValue;
 import java.lang.annotation.Retention;
@@ -59,6 +60,11 @@
   @Nullable
   public abstract String connectionLabel();
 
+  public abstract @ColorInt int primaryColor();
+
+  @Nullable
+  public abstract SuggestionProvider.Reason simSuggestionReason();
+
   @Nullable
   public abstract Drawable connectionIcon();
 
@@ -107,7 +113,7 @@
 
   public static Builder builder() {
     return new AutoValue_PrimaryCallState.Builder()
-        .setState(DialerCall.State.IDLE)
+        .setState(DialerCallState.IDLE)
         .setIsVideoCall(false)
         .setSessionModificationState(SessionModificationState.NO_REQUEST)
         .setDisconnectCause(new DisconnectCause(DisconnectCause.UNKNOWN))
@@ -124,7 +130,8 @@
         .setIsBusinessNumber(false)
         .setSupportsCallOnHold(true)
         .setSwapToSecondaryButtonState(ButtonState.NOT_SUPPORT)
-        .setIsAssistedDialed(false);
+        .setIsAssistedDialed(false)
+        .setPrimaryColor(0);
   }
 
   /** Builder class for primary call state info. */
@@ -141,8 +148,12 @@
 
     public abstract Builder setConnectionLabel(String connectionLabel);
 
+    public abstract Builder setSimSuggestionReason(SuggestionProvider.Reason reason);
+
     public abstract Builder setConnectionIcon(Drawable connectionIcon);
 
+    public abstract Builder setPrimaryColor(@ColorInt int color);
+
     public abstract Builder setGatewayNumber(String gatewayNumber);
 
     public abstract Builder setCallSubject(String callSubject);
@@ -187,7 +198,7 @@
     public PrimaryCallState build() {
       PrimaryCallState primaryCallState = autoBuild();
       if (!TextUtils.isEmpty(primaryCallState.customLabel())) {
-        Assert.checkArgument(primaryCallState.state() == State.CALL_PENDING);
+        Assert.checkArgument(primaryCallState.state() == DialerCallState.CALL_PENDING);
       }
       return primaryCallState;
     }
diff --git a/java/com/android/incallui/incall/protocol/PrimaryInfo.java b/java/com/android/incallui/incall/protocol/PrimaryInfo.java
index 63dc39e..5e40cd1 100644
--- a/java/com/android/incallui/incall/protocol/PrimaryInfo.java
+++ b/java/com/android/incallui/incall/protocol/PrimaryInfo.java
@@ -17,6 +17,7 @@
 package com.android.incallui.incall.protocol;
 
 import android.graphics.drawable.Drawable;
+import android.net.Uri;
 import android.support.annotation.Nullable;
 import com.android.dialer.common.LogUtil;
 import com.android.dialer.multimedia.MultimediaData;
@@ -43,6 +44,9 @@
   @Nullable
   public abstract Drawable photo();
 
+  @Nullable
+  public abstract Uri photoUri();
+
   @ContactPhotoType
   public abstract int photoType();
 
@@ -73,6 +77,7 @@
   public static Builder builder() {
     return new AutoValue_PrimaryInfo.Builder();
   }
+
   /** Builder class for primary call info. */
   @AutoValue.Builder
   public abstract static class Builder {
@@ -88,6 +93,8 @@
 
     public abstract Builder setPhoto(Drawable photo);
 
+    public abstract Builder setPhotoUri(Uri photoUri);
+
     public abstract Builder setPhotoType(@ContactPhotoType int photoType);
 
     public abstract Builder setIsSipCall(boolean isSipCall);
diff --git a/java/com/android/incallui/legacyblocking/DeleteBlockedCallTask.java b/java/com/android/incallui/legacyblocking/DeleteBlockedCallTask.java
index a3f2dfa..309e994 100644
--- a/java/com/android/incallui/legacyblocking/DeleteBlockedCallTask.java
+++ b/java/com/android/incallui/legacyblocking/DeleteBlockedCallTask.java
@@ -17,12 +17,10 @@
 package com.android.incallui.legacyblocking;
 
 import android.Manifest.permission;
-import android.annotation.TargetApi;
 import android.content.Context;
 import android.content.pm.PackageManager;
 import android.database.Cursor;
 import android.os.AsyncTask;
-import android.os.Build.VERSION_CODES;
 import android.provider.CallLog;
 import android.support.v4.content.ContextCompat;
 import com.android.dialer.common.LogUtil;
@@ -34,7 +32,6 @@
  * versions of the OS, call blocking is implemented in the system and there's no need to mess with
  * the call log.
  */
-@TargetApi(VERSION_CODES.M)
 public class DeleteBlockedCallTask extends AsyncTask<Void, Void, Long> {
 
   public static final String IDENTIFIER = "DeleteBlockedCallTask";
diff --git a/java/com/android/incallui/maps/impl/AndroidManifest.xml b/java/com/android/incallui/maps/impl/AndroidManifest.xml
index bc921e9..4c17f33 100644
--- a/java/com/android/incallui/maps/impl/AndroidManifest.xml
+++ b/java/com/android/incallui/maps/impl/AndroidManifest.xml
@@ -19,6 +19,8 @@
   package="com.android.incallui.maps.impl">
 
   <application>
+    <!-- Fix for P -->
+    <uses-library android:name="org.apache.http.legacy" android:required="false" />
 
     <meta-data
       android:name="com.google.android.gms.version"
diff --git a/java/com/android/incallui/res/drawable/incall_background_gradient.xml b/java/com/android/incallui/res/drawable/incall_background_gradient.xml
deleted file mode 100644
index 5dd927f..0000000
--- a/java/com/android/incallui/res/drawable/incall_background_gradient.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-  <gradient
-    android:angle="270"
-    android:startColor="@color/incall_background_gradient_top"
-    android:centerColor="@color/incall_background_gradient_middle"
-    android:endColor="@color/incall_background_gradient_bottom"/>
-</shape>
diff --git a/java/com/android/incallui/res/layout/caller_in_conference.xml b/java/com/android/incallui/res/layout/caller_in_conference.xml
index be4eca5..3f660c5 100644
--- a/java/com/android/incallui/res/layout/caller_in_conference.xml
+++ b/java/com/android/incallui/res/layout/caller_in_conference.xml
@@ -67,8 +67,8 @@
             android:id="@+id/conferenceCallerStatus"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            style="@style/SecondaryText"
-            android:textColor="@color/dialer_secondary_text_color_hiden"
+            style="@style/Dialer.TextAppearance.Secondary"
+            android:enabled="false"
             android:visibility="gone"/>
 
         <!-- Number -->
@@ -93,12 +93,12 @@
     android:id="@+id/conferenceCallerSeparate"
     android:layout_width="@dimen/conference_call_manager_button_dimension"
     android:layout_height="@dimen/conference_call_manager_button_dimension"
-    android:background="?android:selectableItemBackgroundBorderless"
+    android:background="?android:attr/selectableItemBackgroundBorderless"
     android:clickable="true"
     android:contentDescription="@string/goPrivate"
     android:scaleType="center"
     android:src="@drawable/ic_call_split_white_24dp"
-    android:tint="@color/icon_color_grey"/>
+    android:tint="?colorIcon"/>
 
   <!-- "Disconnect" button which terminates the connection with this caller. -->
   <ImageButton
@@ -106,11 +106,11 @@
     android:layout_width="@dimen/conference_call_manager_button_dimension"
     android:layout_height="@dimen/conference_call_manager_button_dimension"
     android:layout_marginStart="8dp"
-    android:background="?android:selectableItemBackgroundBorderless"
+    android:background="?android:attr/selectableItemBackgroundBorderless"
     android:clickable="true"
     android:contentDescription="@string/conference_caller_disconnect_content_description"
     android:scaleType="center"
     android:src="@drawable/quantum_ic_call_end_white_24"
-    android:tint="@color/icon_color_grey"/>
+    android:tint="?colorIcon"/>
 
 </LinearLayout>  <!-- End of single list element -->
diff --git a/java/com/android/incallui/res/layout/frag_rtt_request_dialog.xml b/java/com/android/incallui/res/layout/frag_rtt_request_dialog.xml
new file mode 100644
index 0000000..f0bd153
--- /dev/null
+++ b/java/com/android/incallui/res/layout/frag_rtt_request_dialog.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2018 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+  <TextView
+      android:id="@+id/details"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:paddingTop="20dp"
+      android:paddingBottom="12dp"
+      android:paddingStart="24dp"
+      android:paddingEnd="24dp"
+      android:textColor="#DE000000"
+      android:textSize="16sp"/>
+
+  <TextView
+      android:id="@+id/more_information"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:paddingBottom="16dp"
+      android:paddingStart="24dp"
+      android:paddingEnd="24dp"
+      android:text="@string/rtt_request_dialog_more_information"
+      android:textColor="#8A000000"
+      android:textSize="14sp"/>
+
+  <LinearLayout
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:padding="8dp"
+      android:orientation="horizontal">
+    <Space
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+        android:layout_weight="1"/>
+    <Button
+        android:id="@+id/rtt_button_decline_request"
+        style="@style/Widget.AppCompat.Button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="end"
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp"
+        android:backgroundTint="?android:attr/colorBackgroundFloating"
+        android:fontFamily="sans-serif-medium"
+        android:stateListAnimator="@null"
+        android:text="@string/rtt_button_decline_request"
+        android:textColor="#757575"/>
+    <Button
+        android:id="@+id/rtt_button_accept_request"
+        style="@style/Widget.AppCompat.Button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="end"
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp"
+        android:backgroundTint="?android:attr/colorPrimary"
+        android:fontFamily="sans-serif-medium"
+        android:stateListAnimator="@null"
+        android:text="@string/rtt_button_accept_request"
+        android:textColor="@android:color/white"/>
+  </LinearLayout>
+
+</LinearLayout>
+
diff --git a/java/com/android/incallui/res/values-af/strings.xml b/java/com/android/incallui/res/values-af/strings.xml
index 6018b56..77e447d 100644
--- a/java/com/android/incallui/res/values-af/strings.xml
+++ b/java/com/android/incallui/res/values-af/strings.xml
@@ -1,79 +1,68 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"Foon"</string>
-    <string name="wait_prompt_str" msgid="3509685348904329594">"Stuur die volgende tone?\n"</string>
-    <string name="pause_prompt_yes" msgid="4642047011233552973">"Ja"</string>
-    <string name="pause_prompt_no" msgid="4691320111774935838">"Nee"</string>
-    <string name="notification_dialing" msgid="9072177265772083826">"Bel"</string>
-    <string name="notification_ongoing_call" msgid="8712641937577776125">"Oproep aan die gang"</string>
-    <string name="notification_ongoing_video_call" msgid="6331318021321487769">"Video-oproep aan die gang"</string>
-    <string name="notification_ongoing_paused_video_call" msgid="709950253594606371">"Video-oproep aan die gang – video gepouseer"</string>
-    <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Voortdurende werkoproep"</string>
-    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"Deurlopend <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
-    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"Inkomende <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
-    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"Wi-Fi-oproep"</string>
-    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"Wi‑Fi-werkoproep"</string>
-    <string name="notification_on_hold" msgid="7141827443379205682">"Hou aan"</string>
-    <string name="notification_incoming_call" msgid="7520580807513849283">"Inkomende oproep"</string>
-    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Inkomende oproep met foto"</string>
-    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"Inkomende oproep met boodskap"</string>
-    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"Inkomende oproep met ligging"</string>
-    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"Inkomende oproep met foto en boodskap"</string>
-    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"Inkomende oproep met foto en ligging"</string>
-    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"Inkomende oproep met boodskap en ligging"</string>
-    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"Inkomende oproep met foto, boodskap en ligging"</string>
-    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"Inkomende oproep met aanhegsels"</string>
-    <string name="important_notification_incoming_call" msgid="2867013954509930989">"Belangrike inkomende oproep"</string>
-    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"Belangrike inkomende oproep met foto"</string>
-    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"Belangrike inkomende oproep met boodskap"</string>
-    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"Belangrike inkomende oproep met ligging"</string>
-    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"Belangrike inkomende oproep met foto en boodskap"</string>
-    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"Belangrike inkomende oproep met foto en ligging"</string>
-    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"Belangrike inkomende oproep met boodskap en ligging"</string>
-    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Belangrike inkomende oproep met foto, boodskap en ligging"</string>
-    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Belangrike inkomende oproep met aanhegsels"</string>
-    <string name="notification_incoming_work_call" msgid="5291275092734261918">"Inkomende werkoproep"</string>
-    <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Inkomende verdagte strooipos-oproep"</string>
-    <string name="notification_requesting_video_call" msgid="1807679328811515758">"Inkomende videoversoek"</string>
-    <string name="notification_action_answer" msgid="8748275902211192568">"Antwoord"</string>
-    <string name="notification_action_end_call" msgid="7467258454170007765">"Lui af"</string>
-    <string name="notification_action_answer_video" msgid="8488108892919917287">"Video"</string>
-    <string name="notification_action_accept" msgid="1272761514200507143">"Aanvaar"</string>
-    <string name="notification_action_dismiss" msgid="3128241581632616226">"Wys af"</string>
-    <string name="notification_action_speaker_on" msgid="1882659234405596540">"Skakel luidspreker aan"</string>
-    <string name="notification_action_speaker_off" msgid="6340085043115533948">"Skakel luidspreker af"</string>
-    <string name="notification_external_call" msgid="2504334597315343920">"Voortgesette oproep op \'n ander toestel"</string>
-    <string name="notification_external_video_call" msgid="7709394856028436683">"Voortgesette video-oproep on \'n ander toestel"</string>
-    <string name="notification_take_call" msgid="5631659438864492229">"Neem oproep"</string>
-    <string name="notification_take_video_call" msgid="4473387503712341390">"Neem video-oproep"</string>
-    <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"Diens word nie gesteun nie."</string>
-    <string name="goPrivate" msgid="5269514638004595378">"gaan privaat"</string>
-    <string name="manageConferenceLabel" msgid="3589379023518128318">"Bestuur konferensie-oproep"</string>
-    <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"Noodnommer"</string>
-    <string name="child_number" msgid="3398257437107259682">"via <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
-    <string name="callFailed_simError" msgid="4587775795711340072">"Geen SIM of SIM-fout"</string>
-    <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Beëindig oproep"</string>
-    <string name="conference_call_name" msgid="8189987124611337174">"Konferensie-oproep"</string>
-    <string name="generic_conference_call_name" msgid="1546941472424243894">"Besig met oproep"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Gaan voort met oproep deur mobiele data te gebruik ..."</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Kon nie na Wi-Fi-netwerk oorskakel nie"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Video-oproep sal op mobiele netwerk bly. Standaard datakoste kan dalk geld."</string>
-    <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Moenie dit weer wys nie"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="wait_prompt_str">Stuur die volgende tone?\n</string>
+  <string name="pause_prompt_yes">Ja</string>
+  <string name="pause_prompt_no">Nee</string>
+  <string name="notification_dialing">Bel</string>
+  <string name="notification_ongoing_call">Oproep aan die gang</string>
+  <string name="notification_ongoing_video_call">Video-oproep aan die gang</string>
+  <string name="notification_ongoing_paused_video_call">Video-oproep aan die gang – video gepouseer</string>
+  <string name="notification_ongoing_work_call">Voortdurende werkoproep</string>
+  <string name="notification_ongoing_call_wifi_template">Deurlopend %1$s</string>
+  <string name="notification_incoming_call_wifi_template">Inkomende %1$s</string>
+  <string name="notification_call_wifi_brand">Wi-Fi-oproep</string>
+  <string name="notification_call_wifi_work_brand">Wi‑Fi-werkoproep</string>
+  <string name="notification_on_hold">Hou aan</string>
+  <string name="notification_incoming_call">Inkomende oproep</string>
+  <string name="notification_incoming_video_call">Inkomende video-oproep</string>
+  <string name="notification_incoming_call_mutli_sim">Inkomende oproep via %1$s</string>
+  <string name="notification_incoming_call_with_photo">Inkomende oproep met foto</string>
+  <string name="notification_incoming_call_with_message">Inkomende oproep met boodskap</string>
+  <string name="notification_incoming_call_with_location">Inkomende oproep met ligging</string>
+  <string name="notification_incoming_call_with_photo_message">Inkomende oproep met foto en boodskap</string>
+  <string name="notification_incoming_call_with_photo_location">Inkomende oproep met foto en ligging</string>
+  <string name="notification_incoming_call_with_message_location">Inkomende oproep met boodskap en ligging</string>
+  <string name="notification_incoming_call_with_photo_message_location">Inkomende oproep met foto, boodskap en ligging</string>
+  <string name="notification_incoming_call_attachments">Inkomende oproep met aanhegsels</string>
+  <string name="important_notification_incoming_call">Belangrike inkomende oproep</string>
+  <string name="important_notification_incoming_call_with_photo">Belangrike inkomende oproep met foto</string>
+  <string name="important_notification_incoming_call_with_message">Belangrike inkomende oproep met boodskap</string>
+  <string name="important_notification_incoming_call_with_location">Belangrike inkomende oproep met ligging</string>
+  <string name="important_notification_incoming_call_with_photo_message">Belangrike inkomende oproep met foto en boodskap</string>
+  <string name="important_notification_incoming_call_with_photo_location">Belangrike inkomende oproep met foto en ligging</string>
+  <string name="important_notification_incoming_call_with_message_location">Belangrike inkomende oproep met boodskap en ligging</string>
+  <string name="important_notification_incoming_call_with_photo_message_location">Belangrike inkomende oproep met foto, boodskap en ligging</string>
+  <string name="important_notification_incoming_call_attachments">Belangrike inkomende oproep met aanhegsels</string>
+  <string name="notification_incoming_work_call">Inkomende werkoproep</string>
+  <string name="notification_incoming_spam_call">Inkomende verdagte strooipos-oproep</string>
+  <string name="notification_requesting_video_call">Inkomende videoversoek</string>
+  <string name="notification_action_answer">Antwoord</string>
+  <string name="notification_action_end_call">Lui af</string>
+  <string name="notification_action_answer_video">Video</string>
+  <string name="notification_action_accept">Aanvaar</string>
+  <string name="notification_action_dismiss">Wys af</string>
+  <string name="notification_action_speaker_on">Skakel luidspreker aan</string>
+  <string name="notification_action_speaker_off">Skakel luidspreker af</string>
+  <string name="notification_external_call">Voortgesette oproep op \'n ander toestel</string>
+  <string name="notification_external_video_call">Voortgesette video-oproep on \'n ander toestel</string>
+  <string name="notification_take_call">Neem oproep</string>
+  <string name="notification_take_video_call">Neem video-oproep</string>
+  <string name="incall_error_supp_service_unknown">Diens word nie gesteun nie.</string>
+  <string name="goPrivate">gaan privaat</string>
+  <string name="manageConferenceLabel">Bestuur konferensie-oproep</string>
+  <string name="child_number">via %s</string>
+  <string name="callFailed_simError">Geen SIM of SIM-fout</string>
+  <string name="conference_caller_disconnect_content_description">Beëindig oproep</string>
+  <string name="conference_call_name">Konferensie-oproep</string>
+  <string name="generic_conference_call_name">Besig met oproep</string>
+  <string name="video_call_wifi_to_lte_handover_toast">Gaan voort met oproep deur mobiele data te gebruik ...</string>
+  <string name="video_call_lte_to_wifi_failed_title">Kon nie na Wi-Fi-netwerk oorskakel nie</string>
+  <string name="video_call_lte_to_wifi_failed_message">Video-oproep sal op mobiele netwerk bly. Standaard datakoste kan dalk geld.</string>
+  <string name="video_call_lte_to_wifi_failed_do_not_show">Moenie dit weer wys nie</string>
+  <string name="bubble_return_to_call">Terug na oproep</string>
+  <string name="rtt_request_dialog_title">Sluit by RTT-oproep aan?</string>
+  <string name="rtt_request_dialog_details">%1$s wil boodskappe binne jou stemoproep gebruik.</string>
+  <string name="rtt_request_dialog_more_information">RTT help bellers wat doof of gehoorgestremd is, \'n spraakgestremdheid het, of meer as net spraak benodig.</string>
+  <string name="rtt_button_decline_request">Nee, dankie</string>
+  <string name="rtt_button_accept_request">Sluit by RTT aan</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-am/strings.xml b/java/com/android/incallui/res/values-am/strings.xml
index ee0ba8c..fd8ca2f 100644
--- a/java/com/android/incallui/res/values-am/strings.xml
+++ b/java/com/android/incallui/res/values-am/strings.xml
@@ -1,79 +1,68 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"ስልክ"</string>
-    <string name="wait_prompt_str" msgid="3509685348904329594">"የሚከተሉትንድምፆች ላክ?\n"</string>
-    <string name="pause_prompt_yes" msgid="4642047011233552973">"አዎ"</string>
-    <string name="pause_prompt_no" msgid="4691320111774935838">"አይ"</string>
-    <string name="notification_dialing" msgid="9072177265772083826">"በመደወል ላይ"</string>
-    <string name="notification_ongoing_call" msgid="8712641937577776125">"እየተካሄደ ያለ ጥሪ"</string>
-    <string name="notification_ongoing_video_call" msgid="6331318021321487769">"እየተካሄደ ያለ የቪዲዮ ጥሪ"</string>
-    <string name="notification_ongoing_paused_video_call" msgid="709950253594606371">"እየተካሄደ ያለ የቪዲዮ ጥሪ - ቪዲዮ ባለበት ቆሟል"</string>
-    <string name="notification_ongoing_work_call" msgid="3189581218078981547">"በሂደት ላይ ያለ የሥራ ጥሪ"</string>
-    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"በመካሄድ ላይ ያለ <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
-    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"ገቢ <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
-    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"የWi-Fi ጥሪ"</string>
-    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"የWi‑Fi የሥራ ጥሪ"</string>
-    <string name="notification_on_hold" msgid="7141827443379205682">"ያዝናቆይ"</string>
-    <string name="notification_incoming_call" msgid="7520580807513849283">"ገቢ ጥሪ"</string>
-    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"ገቢ ጥሪ ከፎቶ ጋር"</string>
-    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"ገቢ ጥሪ ከመልዕክት ጋር"</string>
-    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"ገቢ ጥሪ ከአካባቢ ጋር"</string>
-    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"ገቢ ጥሪ ከፎቶ እና መልዕክት ጋር"</string>
-    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"ገቢ ጥሪ ከፎቶ እና አካባቢ ጋር"</string>
-    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"ገቢ ጥሪ ከመልዕክት እና አካባቢ ጋር"</string>
-    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"ገቢ ጥሪ ከፎቶ፣ መልዕክት እና አካባቢ ጋር"</string>
-    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"ገቢ ጥሪ ከአባሪዎች ጋር"</string>
-    <string name="important_notification_incoming_call" msgid="2867013954509930989">"አስፈላጊ ገቢ ጥሪ"</string>
-    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"አስፈላጊ ገቢ ጥሪ ከፎቶ ጋር"</string>
-    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"አስፈላጊ ገቢ ጥሪ ከመልዕክት ጋር"</string>
-    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"አስፈላጊ ገቢ ጥሪ ከአካባቢ ጋር"</string>
-    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"አስፈላጊ ገቢ ጥሪ ከፎቶ እና መልዕክት ጋር"</string>
-    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"አስፈላጊ ገቢ ጥሪ ከፎቶ እና አካባቢ ጋር"</string>
-    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"አስፈላጊ ገቢ ጥሪ ከመልዕክት እና አካባቢ ጋር"</string>
-    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"አስፈላጊ ገቢ ጥሪ ከፎቶ፣ መልዕክት እና አካባቢ ጋር"</string>
-    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"አስፈላጊ ገቢ ጥሪ ከአባሪ ጋር"</string>
-    <string name="notification_incoming_work_call" msgid="5291275092734261918">"ገቢ የሥራ ጥሪ"</string>
-    <string name="notification_incoming_spam_call" msgid="7591506944666791937">"መጪ የተጠረጠረ የአይፈለጌ መልዕክት ጥሪ"</string>
-    <string name="notification_requesting_video_call" msgid="1807679328811515758">"ገቢ የቪዲዮ ጥያቄ"</string>
-    <string name="notification_action_answer" msgid="8748275902211192568">"መልስ"</string>
-    <string name="notification_action_end_call" msgid="7467258454170007765">"ዝጋ"</string>
-    <string name="notification_action_answer_video" msgid="8488108892919917287">"ቪድዮ"</string>
-    <string name="notification_action_accept" msgid="1272761514200507143">"ተቀበል"</string>
-    <string name="notification_action_dismiss" msgid="3128241581632616226">"አትቀበል"</string>
-    <string name="notification_action_speaker_on" msgid="1882659234405596540">"ድምጽ ማጉያን አብራ"</string>
-    <string name="notification_action_speaker_off" msgid="6340085043115533948">"ድምጽ ማጉያን አጥፋ"</string>
-    <string name="notification_external_call" msgid="2504334597315343920">"በሌላ መሳሪያ ጥሪ በመካሄድ ላይ ነው"</string>
-    <string name="notification_external_video_call" msgid="7709394856028436683">"በሌላ መሣሪያ ላይ እየተካሄደ ያለ የቪዲዮ ጥሪ"</string>
-    <string name="notification_take_call" msgid="5631659438864492229">"ጥሪ ውሰድ"</string>
-    <string name="notification_take_video_call" msgid="4473387503712341390">"የቪዲዮ ጥሪ ውሰድ"</string>
-    <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"አገልግሎት አይደገፍም።"</string>
-    <string name="goPrivate" msgid="5269514638004595378">"ወደ ብሕታዊነት ሂድ"</string>
-    <string name="manageConferenceLabel" msgid="3589379023518128318">"የስብሰባ ስልክ ጥሪ አደራጅ"</string>
-    <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"የአደጋ ጊዜ ቁጥር"</string>
-    <string name="child_number" msgid="3398257437107259682">"በ<xliff:g id="CHILD_NUMBER">%s</xliff:g> በኩል"</string>
-    <string name="callFailed_simError" msgid="4587775795711340072">"ምንም SIM ፣ ወይም የSIM ስህተት የለም"</string>
-    <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"ጥሪ ጨርስ"</string>
-    <string name="conference_call_name" msgid="8189987124611337174">"የስብሰባ ጥሪ"</string>
-    <string name="generic_conference_call_name" msgid="1546941472424243894">"በጥሪ ላይ"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"የተንቀሳቃሽ ስልክ ውሂብን በመጠቀም ጥሪውን በመቀጠል ላይ…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"ወደ Wi-Fi አውታረ መረብ መቀየር አልተቻለም"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"የቪዲዮ ጥሪ በተንቀሳቃሽ ስልክ አውታረ መረብ ላይ ይቆያል። መደበኛ የውሂብ ክፍያዎች ተፈጻሚ ሊሆኑ ይችላሉ።"</string>
-    <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"ይህን በድጋሚ አታሳይ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="wait_prompt_str">የሚከተሉትንድምፆች ላክ?\n</string>
+  <string name="pause_prompt_yes">አዎ </string>
+  <string name="pause_prompt_no">አይ  </string>
+  <string name="notification_dialing">በመደወል ላይ</string>
+  <string name="notification_ongoing_call">እየተካሄደ ያለ ጥሪ</string>
+  <string name="notification_ongoing_video_call">እየተካሄደ ያለ የቪዲዮ ጥሪ</string>
+  <string name="notification_ongoing_paused_video_call">እየተካሄደ ያለ የቪዲዮ ጥሪ - ቪዲዮ ባለበት ቆሟል</string>
+  <string name="notification_ongoing_work_call">በሂደት ላይ ያለ የሥራ ጥሪ</string>
+  <string name="notification_ongoing_call_wifi_template">በመካሄድ ላይ ያለ %1$s</string>
+  <string name="notification_incoming_call_wifi_template">ገቢ %1$s</string>
+  <string name="notification_call_wifi_brand">የWi-Fi ጥሪ</string>
+  <string name="notification_call_wifi_work_brand">የWi‑Fi የሥራ ጥሪ</string>
+  <string name="notification_on_hold">ያዝናቆይ</string>
+  <string name="notification_incoming_call">ገቢ ጥሪ</string>
+  <string name="notification_incoming_video_call">ገቢ የቪዲዮ ጥሪ</string>
+  <string name="notification_incoming_call_mutli_sim">በ%1$s በኩል ገቢ ጥሪ</string>
+  <string name="notification_incoming_call_with_photo">ገቢ ጥሪ ከፎቶ ጋር</string>
+  <string name="notification_incoming_call_with_message">ገቢ ጥሪ ከመልዕክት ጋር</string>
+  <string name="notification_incoming_call_with_location">ገቢ ጥሪ ከአካባቢ ጋር</string>
+  <string name="notification_incoming_call_with_photo_message">ገቢ ጥሪ ከፎቶ እና መልዕክት ጋር</string>
+  <string name="notification_incoming_call_with_photo_location">ገቢ ጥሪ ከፎቶ እና አካባቢ ጋር</string>
+  <string name="notification_incoming_call_with_message_location">ገቢ ጥሪ ከመልዕክት እና አካባቢ ጋር</string>
+  <string name="notification_incoming_call_with_photo_message_location">ገቢ ጥሪ ከፎቶ፣ መልዕክት እና አካባቢ ጋር</string>
+  <string name="notification_incoming_call_attachments">ገቢ ጥሪ ከአባሪዎች ጋር</string>
+  <string name="important_notification_incoming_call">አስፈላጊ ገቢ ጥሪ</string>
+  <string name="important_notification_incoming_call_with_photo">አስፈላጊ ገቢ ጥሪ ከፎቶ ጋር</string>
+  <string name="important_notification_incoming_call_with_message">አስፈላጊ ገቢ ጥሪ ከመልዕክት ጋር</string>
+  <string name="important_notification_incoming_call_with_location">አስፈላጊ ገቢ ጥሪ ከአካባቢ ጋር</string>
+  <string name="important_notification_incoming_call_with_photo_message">አስፈላጊ ገቢ ጥሪ ከፎቶ እና መልዕክት ጋር</string>
+  <string name="important_notification_incoming_call_with_photo_location">አስፈላጊ ገቢ ጥሪ ከፎቶ እና አካባቢ ጋር</string>
+  <string name="important_notification_incoming_call_with_message_location">አስፈላጊ ገቢ ጥሪ ከመልዕክት እና አካባቢ ጋር</string>
+  <string name="important_notification_incoming_call_with_photo_message_location">አስፈላጊ ገቢ ጥሪ ከፎቶ፣ መልዕክት እና አካባቢ ጋር</string>
+  <string name="important_notification_incoming_call_attachments">አስፈላጊ ገቢ ጥሪ ከአባሪ ጋር</string>
+  <string name="notification_incoming_work_call">ገቢ የሥራ ጥሪ</string>
+  <string name="notification_incoming_spam_call">መጪ የተጠረጠረ የአይፈለጌ መልዕክት ጥሪ</string>
+  <string name="notification_requesting_video_call">ገቢ የቪዲዮ ጥያቄ</string>
+  <string name="notification_action_answer">መልስ</string>
+  <string name="notification_action_end_call">ዝጋ</string>
+  <string name="notification_action_answer_video">ቪድዮ</string>
+  <string name="notification_action_accept">ተቀበል</string>
+  <string name="notification_action_dismiss">አትቀበል</string>
+  <string name="notification_action_speaker_on">ድምጽ ማጉያን አብራ</string>
+  <string name="notification_action_speaker_off">ድምጽ ማጉያን አጥፋ</string>
+  <string name="notification_external_call">በሌላ መሳሪያ ጥሪ በመካሄድ ላይ ነው</string>
+  <string name="notification_external_video_call">በሌላ መሣሪያ ላይ እየተካሄደ ያለ የቪዲዮ ጥሪ</string>
+  <string name="notification_take_call">ጥሪ ውሰድ</string>
+  <string name="notification_take_video_call">የቪዲዮ ጥሪ ውሰድ</string>
+  <string name="incall_error_supp_service_unknown">አገልግሎት አይደገፍም።</string>
+  <string name="goPrivate">ወደ ብሕታዊነት ሂድ</string>
+  <string name="manageConferenceLabel">የስብሰባ ስልክ ጥሪ አደራጅ</string>
+  <string name="child_number">በ%s በኩል</string>
+  <string name="callFailed_simError">ምንም SIM ፣ ወይም የSIM ስህተት የለም</string>
+  <string name="conference_caller_disconnect_content_description">ጥሪ ጨርስ</string>
+  <string name="conference_call_name">የስብሰባ ጥሪ</string>
+  <string name="generic_conference_call_name">በጥሪ ላይ</string>
+  <string name="video_call_wifi_to_lte_handover_toast">የተንቀሳቃሽ ስልክ ውሂብን በመጠቀም ጥሪውን በመቀጠል ላይ…</string>
+  <string name="video_call_lte_to_wifi_failed_title">ወደ Wi-Fi አውታረ መረብ መቀየር አልተቻለም</string>
+  <string name="video_call_lte_to_wifi_failed_message">የቪዲዮ ጥሪ በተንቀሳቃሽ ስልክ አውታረ መረብ ላይ ይቆያል። መደበኛ የውሂብ ክፍያዎች ተፈጻሚ ሊሆኑ ይችላሉ።</string>
+  <string name="video_call_lte_to_wifi_failed_do_not_show">ይህን በድጋሚ አታሳይ</string>
+  <string name="bubble_return_to_call">ወደ ጥሪ ተመለስ</string>
+  <string name="rtt_request_dialog_title">አርቲቲ ጥሪን ይቀላቀሉ?</string>
+  <string name="rtt_request_dialog_details">%1$s በድምጽ ጥሪዎ ውስጥ መልዕክት መላላክን መጠቀም ይፈልጋሉ።</string>
+  <string name="rtt_request_dialog_more_information">አርቲቲ መስማት የተሳናቸው፣ የመስማት ችግር ያለባቸው እና የንግግር አካል ጉዳት ያለባቸው ወይም ከድምጽ ብቻ በላይ የሚያስፈልጋቸውን ደዋዮች ያግዛል።</string>
+  <string name="rtt_button_decline_request">አይ አመሰግናለሁ</string>
+  <string name="rtt_button_accept_request">አርቲቲን ይቀላቀሉ</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-ar/strings.xml b/java/com/android/incallui/res/values-ar/strings.xml
index 26f46fe..95c399f 100644
--- a/java/com/android/incallui/res/values-ar/strings.xml
+++ b/java/com/android/incallui/res/values-ar/strings.xml
@@ -1,79 +1,68 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"الهاتف"</string>
-    <string name="wait_prompt_str" msgid="3509685348904329594">"هل تريد إرسال النغمات التالية؟\n"</string>
-    <string name="pause_prompt_yes" msgid="4642047011233552973">"نعم"</string>
-    <string name="pause_prompt_no" msgid="4691320111774935838">"لا"</string>
-    <string name="notification_dialing" msgid="9072177265772083826">"جارٍ الطلب"</string>
-    <string name="notification_ongoing_call" msgid="8712641937577776125">"مكالمة حالية"</string>
-    <string name="notification_ongoing_video_call" msgid="6331318021321487769">"مكالمة فيديو جارية"</string>
-    <string name="notification_ongoing_paused_video_call" msgid="709950253594606371">"مكالمة فيديو جارية ‑ تم إيقاف الفيديو مؤقتًا"</string>
-    <string name="notification_ongoing_work_call" msgid="3189581218078981547">"مكالمة عمل جارية"</string>
-    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"<xliff:g id="BRAND_NAME">%1$s</xliff:g> جارية"</string>
-    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"<xliff:g id="BRAND_NAME">%1$s</xliff:g> واردة"</string>
-    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"‏مكالمة عبر Wi-Fi"</string>
-    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"‏مكالمة عمل عبر Wi‑Fi"</string>
-    <string name="notification_on_hold" msgid="7141827443379205682">"معلقة"</string>
-    <string name="notification_incoming_call" msgid="7520580807513849283">"مكالمة واردة"</string>
-    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"مكالمة واردة مع صورة"</string>
-    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"مكالمة واردة مع رسالة"</string>
-    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"مكالمة واردة مع موقع"</string>
-    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"مكالمة واردة مع صورة ورسالة"</string>
-    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"مكالمة واردة مع صورة وموقع"</string>
-    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"مكالمة واردة مع رسالة وموقع"</string>
-    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"مكالمة واردة مع صورة ورسالة وموقع"</string>
-    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"مكالمة واردة مع مرفقات"</string>
-    <string name="important_notification_incoming_call" msgid="2867013954509930989">"مكالمة واردة مهمة"</string>
-    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"مكالمة واردة مهمة مع صورة"</string>
-    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"مكالمة واردة مهمة مع رسالة"</string>
-    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"مكالمة واردة مهمة مع موقع"</string>
-    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"مكالمة واردة مهمة مع صورة ورسالة"</string>
-    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"مكالمة واردة مهمة مع صورة وموقع"</string>
-    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"مكالمة واردة مهمة مع رسالة وموقع"</string>
-    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"مكالمة واردة مهمة مع صورة ورسالة وموقع"</string>
-    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"مكالمة واردة مهمة مع مرفقات"</string>
-    <string name="notification_incoming_work_call" msgid="5291275092734261918">"مكالمة عمل واردة"</string>
-    <string name="notification_incoming_spam_call" msgid="7591506944666791937">"مكالمة واردة يشتبه في كونها غير مرغوب فيها"</string>
-    <string name="notification_requesting_video_call" msgid="1807679328811515758">"طلب فيديو وارد"</string>
-    <string name="notification_action_answer" msgid="8748275902211192568">"رد"</string>
-    <string name="notification_action_end_call" msgid="7467258454170007765">"قطع الاتصال"</string>
-    <string name="notification_action_answer_video" msgid="8488108892919917287">"فيديو"</string>
-    <string name="notification_action_accept" msgid="1272761514200507143">"قبول"</string>
-    <string name="notification_action_dismiss" msgid="3128241581632616226">"رفض"</string>
-    <string name="notification_action_speaker_on" msgid="1882659234405596540">"تشغيل مكبِّر الصوت"</string>
-    <string name="notification_action_speaker_off" msgid="6340085043115533948">"تعطيل مكبِّر الصوت"</string>
-    <string name="notification_external_call" msgid="2504334597315343920">"مكالمة جارية على جهاز آخر"</string>
-    <string name="notification_external_video_call" msgid="7709394856028436683">"مكالمة فيديو جارية على جهاز آخر"</string>
-    <string name="notification_take_call" msgid="5631659438864492229">"الرد على مكالمة"</string>
-    <string name="notification_take_video_call" msgid="4473387503712341390">"الرد على مكالمة فيديو"</string>
-    <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"الخدمة ليست متوفرة."</string>
-    <string name="goPrivate" msgid="5269514638004595378">"انتقال إلى مكالمة خاصة"</string>
-    <string name="manageConferenceLabel" msgid="3589379023518128318">"إدارة مكالمة جماعية"</string>
-    <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"رقم الطوارئ"</string>
-    <string name="child_number" msgid="3398257437107259682">"عبر <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
-    <string name="callFailed_simError" msgid="4587775795711340072">"‏لا تتوفر شريحة SIM أو حدث خطأ في البطاقة"</string>
-    <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"إنهاء الاتصال"</string>
-    <string name="conference_call_name" msgid="8189987124611337174">"مكالمة جماعية"</string>
-    <string name="generic_conference_call_name" msgid="1546941472424243894">"قيد الاتصال"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"جارٍ استكمال المكالمة باستخدام بيانات الجوّال…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"‏تعذر التبديل إلى شبكة Wi-Fi"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"ستظل مكالمة الفيديو جارية على شبكة الجوال. قد يتم تطبيق رسوم قياسية على استخدام البيانات."</string>
-    <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"عدم إظهار هذا مرة أخرى"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="wait_prompt_str">‏هل تريد إرسال النغمات التالية؟\n</string>
+  <string name="pause_prompt_yes">نعم</string>
+  <string name="pause_prompt_no">لا</string>
+  <string name="notification_dialing">جارٍ الطلب</string>
+  <string name="notification_ongoing_call">مكالمة حالية</string>
+  <string name="notification_ongoing_video_call">مكالمة فيديو جارية</string>
+  <string name="notification_ongoing_paused_video_call">مكالمة فيديو جارية ‑ تم إيقاف الفيديو مؤقتًا</string>
+  <string name="notification_ongoing_work_call">مكالمة عمل جارية</string>
+  <string name="notification_ongoing_call_wifi_template">%1$s جارية</string>
+  <string name="notification_incoming_call_wifi_template">%1$s واردة</string>
+  <string name="notification_call_wifi_brand">‏مكالمة عبر Wi-Fi</string>
+  <string name="notification_call_wifi_work_brand">‏مكالمة عمل عبر Wi‑Fi</string>
+  <string name="notification_on_hold">معلقة</string>
+  <string name="notification_incoming_call">مكالمة واردة</string>
+  <string name="notification_incoming_video_call">مكالمة فيديو واردة</string>
+  <string name="notification_incoming_call_mutli_sim">مكالمة واردة عبر %1$s</string>
+  <string name="notification_incoming_call_with_photo">مكالمة واردة مع صورة</string>
+  <string name="notification_incoming_call_with_message">مكالمة واردة مع رسالة</string>
+  <string name="notification_incoming_call_with_location">مكالمة واردة مع موقع</string>
+  <string name="notification_incoming_call_with_photo_message">مكالمة واردة مع صورة ورسالة</string>
+  <string name="notification_incoming_call_with_photo_location">مكالمة واردة مع صورة وموقع</string>
+  <string name="notification_incoming_call_with_message_location">مكالمة واردة مع رسالة وموقع</string>
+  <string name="notification_incoming_call_with_photo_message_location">مكالمة واردة مع صورة ورسالة وموقع</string>
+  <string name="notification_incoming_call_attachments">مكالمة واردة مع مرفقات</string>
+  <string name="important_notification_incoming_call">مكالمة واردة مهمة</string>
+  <string name="important_notification_incoming_call_with_photo">مكالمة واردة مهمة مع صورة</string>
+  <string name="important_notification_incoming_call_with_message">مكالمة واردة مهمة مع رسالة</string>
+  <string name="important_notification_incoming_call_with_location">مكالمة واردة مهمة مع موقع</string>
+  <string name="important_notification_incoming_call_with_photo_message">مكالمة واردة مهمة مع صورة ورسالة</string>
+  <string name="important_notification_incoming_call_with_photo_location">مكالمة واردة مهمة مع صورة وموقع</string>
+  <string name="important_notification_incoming_call_with_message_location">مكالمة واردة مهمة مع رسالة وموقع</string>
+  <string name="important_notification_incoming_call_with_photo_message_location">مكالمة واردة مهمة مع صورة ورسالة وموقع</string>
+  <string name="important_notification_incoming_call_attachments">مكالمة واردة مهمة مع مرفقات</string>
+  <string name="notification_incoming_work_call">مكالمة عمل واردة</string>
+  <string name="notification_incoming_spam_call">مكالمة واردة يشتبه في كونها غير مرغوب فيها</string>
+  <string name="notification_requesting_video_call">طلب فيديو وارد</string>
+  <string name="notification_action_answer">رد</string>
+  <string name="notification_action_end_call">قطع الاتصال</string>
+  <string name="notification_action_answer_video">فيديو</string>
+  <string name="notification_action_accept">قبول</string>
+  <string name="notification_action_dismiss">رفض</string>
+  <string name="notification_action_speaker_on">تشغيل مكبِّر الصوت</string>
+  <string name="notification_action_speaker_off">إيقاف مكبِّر الصوت</string>
+  <string name="notification_external_call">مكالمة جارية على جهاز آخر</string>
+  <string name="notification_external_video_call">مكالمة فيديو جارية على جهاز آخر</string>
+  <string name="notification_take_call">الرد على مكالمة</string>
+  <string name="notification_take_video_call">الرد على مكالمة فيديو</string>
+  <string name="incall_error_supp_service_unknown">الخدمة ليست متوفرة.</string>
+  <string name="goPrivate">انتقال إلى مكالمة خاصة</string>
+  <string name="manageConferenceLabel">إدارة مكالمة جماعية</string>
+  <string name="child_number">عبر %s</string>
+  <string name="callFailed_simError">‏لا تتوفر شريحة SIM أو حدث خطأ في البطاقة</string>
+  <string name="conference_caller_disconnect_content_description">إنهاء الاتصال</string>
+  <string name="conference_call_name">مكالمة جماعية</string>
+  <string name="generic_conference_call_name">قيد الاتصال</string>
+  <string name="video_call_wifi_to_lte_handover_toast">جارٍ استكمال المكالمة باستخدام بيانات الجوّال…</string>
+  <string name="video_call_lte_to_wifi_failed_title">‏تعذر التبديل إلى شبكة Wi-Fi</string>
+  <string name="video_call_lte_to_wifi_failed_message">ستظل مكالمة الفيديو جارية على شبكة الجوال. قد يتم تطبيق رسوم قياسية على استخدام البيانات.</string>
+  <string name="video_call_lte_to_wifi_failed_do_not_show">عدم إظهار هذا مرة أخرى</string>
+  <string name="bubble_return_to_call">رجوع إلى المكالمة</string>
+  <string name="rtt_request_dialog_title">هل تريد الانضام إلى مكالمة باستخدام ميزة \"المراسلة النصية في الوقت الفعلي\"؟</string>
+  <string name="rtt_request_dialog_details">يريد %1$s استخدام المراسلة في مكالمتك الصوتية.</string>
+  <string name="rtt_request_dialog_more_information">تساعد ميزة \"المراسلة النصية في الوقت الفعلي\" المتصلين الذين يعانون من فقدان حاسة السمع أو من ضعف في السمع أو ليست لديهم القدرة على التحدث أو يحتاجون إلى ما هو أكثر من الصوت فقط.</string>
+  <string name="rtt_button_decline_request">لا شكرًا</string>
+  <string name="rtt_button_accept_request">انضمام إلى \"مراسلة نصية في الوقت الفعلي\"</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-az/strings.xml b/java/com/android/incallui/res/values-az/strings.xml
index dad87a1..2ee6c94 100644
--- a/java/com/android/incallui/res/values-az/strings.xml
+++ b/java/com/android/incallui/res/values-az/strings.xml
@@ -1,79 +1,68 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"Telefon"</string>
-    <string name="wait_prompt_str" msgid="3509685348904329594">"Aşağıdakı tonlar göndərilsin?\n"</string>
-    <string name="pause_prompt_yes" msgid="4642047011233552973">"Bəli"</string>
-    <string name="pause_prompt_no" msgid="4691320111774935838">"Xeyr"</string>
-    <string name="notification_dialing" msgid="9072177265772083826">"Nömrə yığılır"</string>
-    <string name="notification_ongoing_call" msgid="8712641937577776125">"Davam edən zəng"</string>
-    <string name="notification_ongoing_video_call" msgid="6331318021321487769">"Davam edən video zəng"</string>
-    <string name="notification_ongoing_paused_video_call" msgid="709950253594606371">"Davam edən video zəng ‑ video pauza edildi"</string>
-    <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Davam edən iş çağrısı"</string>
-    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"Davam edən <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
-    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"Gələn <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
-    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"Wi-Fi zəngi"</string>
-    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"Wi‑Fi iş zəngi"</string>
-    <string name="notification_on_hold" msgid="7141827443379205682">"Gözləmə mövqeyində"</string>
-    <string name="notification_incoming_call" msgid="7520580807513849283">"Gələn zəng"</string>
-    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Foto ilə gələn zəng"</string>
-    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"Mesaj ilə gələn zəng"</string>
-    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"Məkan ilə gələn zəng"</string>
-    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"Foto və mesaj ilə gələn zəng"</string>
-    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"Foto və məkan ilə gələn zəng"</string>
-    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"Mesaj və məkan ilə gələn zəng"</string>
-    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"Foto, mesaj və məkan ilə gələn zəng"</string>
-    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"Qoşma ilə gələn zəng"</string>
-    <string name="important_notification_incoming_call" msgid="2867013954509930989">"Vacib gələn zəng"</string>
-    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"Foto ilə gələn vacib zəng"</string>
-    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"Mesaj ilə gələn vacib zəng"</string>
-    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"Məkan ilə gələn vacib zəng"</string>
-    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"Foto və mesaj ilə gələn vacib zəng"</string>
-    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"Foto və məkan ilə gələn vacib zəng"</string>
-    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"Mesaj və məkan ilə gələn vacib zəng"</string>
-    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Foto, mesaj və məkan ilə gələn vacib zəng"</string>
-    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Qoşma ilə gələn vacib zəng"</string>
-    <string name="notification_incoming_work_call" msgid="5291275092734261918">"Daxil olan iş çağrısı"</string>
-    <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Şübhəli spam zəngi"</string>
-    <string name="notification_requesting_video_call" msgid="1807679328811515758">"Gələn video çağrı"</string>
-    <string name="notification_action_answer" msgid="8748275902211192568">"Cavab"</string>
-    <string name="notification_action_end_call" msgid="7467258454170007765">"Dəstəyi qoyun"</string>
-    <string name="notification_action_answer_video" msgid="8488108892919917287">"Videolar"</string>
-    <string name="notification_action_accept" msgid="1272761514200507143">"Qəbul edin"</string>
-    <string name="notification_action_dismiss" msgid="3128241581632616226">"İmtina edin"</string>
-    <string name="notification_action_speaker_on" msgid="1882659234405596540">"Spikeri aktiv edin"</string>
-    <string name="notification_action_speaker_off" msgid="6340085043115533948">"Spikeri deaktiv edin"</string>
-    <string name="notification_external_call" msgid="2504334597315343920">"Digər cihazda davam etməkdə olan zəng"</string>
-    <string name="notification_external_video_call" msgid="7709394856028436683">"Digər cihazda davam etməkdə olan video zəng"</string>
-    <string name="notification_take_call" msgid="5631659438864492229">"Zəngə cavab verin"</string>
-    <string name="notification_take_video_call" msgid="4473387503712341390">"Video Zəngə cavab verin"</string>
-    <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"Xidmət dəstəklənmir."</string>
-    <string name="goPrivate" msgid="5269514638004595378">"şəxsi rejimə keçin"</string>
-    <string name="manageConferenceLabel" msgid="3589379023518128318">"Konfrans çağrısını idarə edin"</string>
-    <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"Təcili nömrə"</string>
-    <string name="child_number" msgid="3398257437107259682">"<xliff:g id="CHILD_NUMBER">%s</xliff:g> vasitəsilə"</string>
-    <string name="callFailed_simError" msgid="4587775795711340072">"SIM və ya SIM xətası yoxdur"</string>
-    <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Zəngi sonlandırın"</string>
-    <string name="conference_call_name" msgid="8189987124611337174">"Konfrans zəngi"</string>
-    <string name="generic_conference_call_name" msgid="1546941472424243894">"Çağrıda"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Mobil data istifadə edərək zəngə davam edin…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Wi-Fi şəbəkəsinə qoşulmaq olmadı"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Video zəng mobil şəbəkədə qalacaq. Standard data xərcləri tətbiq edilə bilər."</string>
-    <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Bunu bi rdaha göstərməyin"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="wait_prompt_str">Aşağıdakı tonlar göndərilsin?\n</string>
+  <string name="pause_prompt_yes">Bəli</string>
+  <string name="pause_prompt_no">Xeyr</string>
+  <string name="notification_dialing">Nömrə yığılır</string>
+  <string name="notification_ongoing_call">Davam edən zəng</string>
+  <string name="notification_ongoing_video_call">Davam edən video zəng</string>
+  <string name="notification_ongoing_paused_video_call">Davam edən video zəng ‑ video durduruldu</string>
+  <string name="notification_ongoing_work_call">Davam edən iş çağrısı</string>
+  <string name="notification_ongoing_call_wifi_template">Davam edən %1$s</string>
+  <string name="notification_incoming_call_wifi_template">Gələn %1$s</string>
+  <string name="notification_call_wifi_brand">Wi-Fi zəngi</string>
+  <string name="notification_call_wifi_work_brand">Wi‑Fi iş zəngi</string>
+  <string name="notification_on_hold">Gözləmə mövqeyində</string>
+  <string name="notification_incoming_call">Gələn zəng</string>
+  <string name="notification_incoming_video_call">Gələn video zəng</string>
+  <string name="notification_incoming_call_mutli_sim">%1$s ilə gələn zəng</string>
+  <string name="notification_incoming_call_with_photo">Foto ilə gələn zəng</string>
+  <string name="notification_incoming_call_with_message">Mesaj ilə gələn zəng</string>
+  <string name="notification_incoming_call_with_location">Məkan ilə gələn zəng</string>
+  <string name="notification_incoming_call_with_photo_message">Foto və mesaj ilə gələn zəng</string>
+  <string name="notification_incoming_call_with_photo_location">Foto və məkan ilə gələn zəng</string>
+  <string name="notification_incoming_call_with_message_location">Mesaj və məkan ilə gələn zəng</string>
+  <string name="notification_incoming_call_with_photo_message_location">Foto, mesaj və məkan ilə gələn zəng</string>
+  <string name="notification_incoming_call_attachments">Qoşma ilə gələn zəng</string>
+  <string name="important_notification_incoming_call">Vacib gələn zəng</string>
+  <string name="important_notification_incoming_call_with_photo">Foto ilə gələn vacib zəng</string>
+  <string name="important_notification_incoming_call_with_message">Mesaj ilə gələn vacib zəng</string>
+  <string name="important_notification_incoming_call_with_location">Məkan ilə gələn vacib zəng</string>
+  <string name="important_notification_incoming_call_with_photo_message">Foto və mesaj ilə gələn vacib zəng</string>
+  <string name="important_notification_incoming_call_with_photo_location">Foto və məkan ilə gələn vacib zəng</string>
+  <string name="important_notification_incoming_call_with_message_location">Mesaj və məkan ilə gələn vacib zəng</string>
+  <string name="important_notification_incoming_call_with_photo_message_location">Foto, mesaj və məkan ilə gələn vacib zəng</string>
+  <string name="important_notification_incoming_call_attachments">Qoşma ilə gələn vacib zəng</string>
+  <string name="notification_incoming_work_call">Daxil olan iş çağrısı</string>
+  <string name="notification_incoming_spam_call">Şübhəli spam zəngi</string>
+  <string name="notification_requesting_video_call">Gələn video çağrı</string>
+  <string name="notification_action_answer">Cavab</string>
+  <string name="notification_action_end_call">Dəstəyi qoyun</string>
+  <string name="notification_action_answer_video">Videolar</string>
+  <string name="notification_action_accept">Qəbul edin</string>
+  <string name="notification_action_dismiss">İmtina edin</string>
+  <string name="notification_action_speaker_on">Spikeri aktiv edin</string>
+  <string name="notification_action_speaker_off">Spikeri deaktiv edin</string>
+  <string name="notification_external_call">Digər cihazda davam etməkdə olan zəng</string>
+  <string name="notification_external_video_call">Digər cihazda davam etməkdə olan video zəng</string>
+  <string name="notification_take_call">Zəngə cavab verin</string>
+  <string name="notification_take_video_call">Video Zəngə cavab verin</string>
+  <string name="incall_error_supp_service_unknown">Xidmət dəstəklənmir.</string>
+  <string name="goPrivate">şəxsi rejimə keçin</string>
+  <string name="manageConferenceLabel">Konfrans çağrısını idarə edin</string>
+  <string name="child_number">%s vasitəsilə</string>
+  <string name="callFailed_simError">SIM və ya SIM xətası yoxdur</string>
+  <string name="conference_caller_disconnect_content_description">Zəngi sonlandırın</string>
+  <string name="conference_call_name">Konfrans zəngi</string>
+  <string name="generic_conference_call_name">Çağrıda</string>
+  <string name="video_call_wifi_to_lte_handover_toast">Mobil data istifadə edərək zəngə davam edin…</string>
+  <string name="video_call_lte_to_wifi_failed_title">Wi-Fi şəbəkəsinə qoşulmaq olmadı</string>
+  <string name="video_call_lte_to_wifi_failed_message">Video zəng mobil şəbəkədə qalacaq. Standard data xərcləri tətbiq edilə bilər.</string>
+  <string name="video_call_lte_to_wifi_failed_do_not_show">Bunu bi rdaha göstərməyin</string>
+  <string name="bubble_return_to_call">Zəngə geri qayıdın</string>
+  <string name="rtt_request_dialog_title">RTT zənginə qoşulsun?</string>
+  <string name="rtt_request_dialog_details">%1$s səsli zəng daxilində mesajlaşmadan istifadə etmək istəyir.</string>
+  <string name="rtt_request_dialog_more_information">RTT kar və ya eşitmə problemi, danışma qüsuru olan və ya səsdən daha çoxuna ehtiyac duyan şəxslərə dəstək olur.</string>
+  <string name="rtt_button_decline_request">Xeyr, təşəkkürlər</string>
+  <string name="rtt_button_accept_request">RTT zənginə qoşulun</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-b+sr+Latn/strings.xml b/java/com/android/incallui/res/values-b+sr+Latn/strings.xml
index d34a1fb..a5a753f 100644
--- a/java/com/android/incallui/res/values-b+sr+Latn/strings.xml
+++ b/java/com/android/incallui/res/values-b+sr+Latn/strings.xml
@@ -1,79 +1,68 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"Telefon"</string>
-    <string name="wait_prompt_str" msgid="3509685348904329594">"Želite li da pošaljete sledeće tonove?\n"</string>
-    <string name="pause_prompt_yes" msgid="4642047011233552973">"Da"</string>
-    <string name="pause_prompt_no" msgid="4691320111774935838">"Ne"</string>
-    <string name="notification_dialing" msgid="9072177265772083826">"Poziva se"</string>
-    <string name="notification_ongoing_call" msgid="8712641937577776125">"Aktuelni poziv"</string>
-    <string name="notification_ongoing_video_call" msgid="6331318021321487769">"Video poziv u toku"</string>
-    <string name="notification_ongoing_paused_video_call" msgid="709950253594606371">"Video poziv u toku – pauziran je"</string>
-    <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Tekući poziv za Work"</string>
-    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"<xliff:g id="BRAND_NAME">%1$s</xliff:g> je u toku"</string>
-    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"Dolazni <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
-    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"Wi-Fi poziv"</string>
-    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"Wi‑Fi poslovni poziv"</string>
-    <string name="notification_on_hold" msgid="7141827443379205682">"Na čekanju"</string>
-    <string name="notification_incoming_call" msgid="7520580807513849283">"Dolazni poziv"</string>
-    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Dolazni poziv sa slikom"</string>
-    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"Dolazni poziv sa porukom"</string>
-    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"Dolazni poziv sa lokacijom"</string>
-    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"Dolazni poziv sa slikom i porukom"</string>
-    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"Dolazni poziv sa slikom i lokacijom"</string>
-    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"Dolazni poziv sa porukom i lokacijom"</string>
-    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"Dolazni poziv sa slikom, porukom i lokacijom"</string>
-    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"Dolazni poziv sa prilozima"</string>
-    <string name="important_notification_incoming_call" msgid="2867013954509930989">"Važan dolazni poziv"</string>
-    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"Važan dolazni poziv sa slikom"</string>
-    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"Važan dolazni poziv sa porukom"</string>
-    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"Važan dolazni poziv sa lokacijom"</string>
-    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"Važan dolazni poziv sa slikom i porukom"</string>
-    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"Važan dolazni poziv sa slikom i lokacijom"</string>
-    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"Važan dolazni poziv sa porukom i lokacijom"</string>
-    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Važan dolazni poziv sa slikom, porukom i lokacijom"</string>
-    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Važan dolazni poziv sa prilozima"</string>
-    <string name="notification_incoming_work_call" msgid="5291275092734261918">"Dolazni poziv za Work"</string>
-    <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Sumnja na nepoželjan dolazni poziv"</string>
-    <string name="notification_requesting_video_call" msgid="1807679328811515758">"Zahtev za dolazni video poziv"</string>
-    <string name="notification_action_answer" msgid="8748275902211192568">"Odgovori"</string>
-    <string name="notification_action_end_call" msgid="7467258454170007765">"Prekini vezu"</string>
-    <string name="notification_action_answer_video" msgid="8488108892919917287">"Video"</string>
-    <string name="notification_action_accept" msgid="1272761514200507143">"Prihvati"</string>
-    <string name="notification_action_dismiss" msgid="3128241581632616226">"Odbij"</string>
-    <string name="notification_action_speaker_on" msgid="1882659234405596540">"Uključi zvučnik"</string>
-    <string name="notification_action_speaker_off" msgid="6340085043115533948">"Isključi zvučnik"</string>
-    <string name="notification_external_call" msgid="2504334597315343920">"Poziv je u toku na drugom uređaju"</string>
-    <string name="notification_external_video_call" msgid="7709394856028436683">"Video poziv je u toku na drugom uređaju"</string>
-    <string name="notification_take_call" msgid="5631659438864492229">"Preuzmi poziv"</string>
-    <string name="notification_take_video_call" msgid="4473387503712341390">"Preuzmi video poziv"</string>
-    <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"Usluga nije podržana."</string>
-    <string name="goPrivate" msgid="5269514638004595378">"idi na privatno"</string>
-    <string name="manageConferenceLabel" msgid="3589379023518128318">"Upravljaj konferencijskim pozivom"</string>
-    <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"Broj za hitne slučajeve"</string>
-    <string name="child_number" msgid="3398257437107259682">"na <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
-    <string name="callFailed_simError" msgid="4587775795711340072">"Nema SIM kartice ili postoji greška na njoj"</string>
-    <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Završite poziv"</string>
-    <string name="conference_call_name" msgid="8189987124611337174">"Konferencijski poziv"</string>
-    <string name="generic_conference_call_name" msgid="1546941472424243894">"U pozivu"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Poziv se nastavlja pomoću mobilnih podataka…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Prebacivanje na Wi‑Fi mrežu nije uspelo"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Video poziv će ostati na mobilnoj mreži. Važe standardne naknade za prenos podataka."</string>
-    <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Ne prikazuj ovo ponovo"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="wait_prompt_str">Želite li da pošaljete sledeće tonove?\n</string>
+  <string name="pause_prompt_yes">Da</string>
+  <string name="pause_prompt_no">Ne</string>
+  <string name="notification_dialing">Poziva se</string>
+  <string name="notification_ongoing_call">Aktuelni poziv</string>
+  <string name="notification_ongoing_video_call">Video poziv u toku</string>
+  <string name="notification_ongoing_paused_video_call">Video poziv u toku – pauziran je</string>
+  <string name="notification_ongoing_work_call">Tekući poziv za Work</string>
+  <string name="notification_ongoing_call_wifi_template">%1$s je u toku</string>
+  <string name="notification_incoming_call_wifi_template">Dolazni %1$s</string>
+  <string name="notification_call_wifi_brand">Wi-Fi poziv</string>
+  <string name="notification_call_wifi_work_brand">Wi‑Fi poslovni poziv</string>
+  <string name="notification_on_hold">Na čekanju</string>
+  <string name="notification_incoming_call">Dolazni poziv</string>
+  <string name="notification_incoming_video_call">Dolazni video poziv</string>
+  <string name="notification_incoming_call_mutli_sim">Dolazni poziv preko %1$s</string>
+  <string name="notification_incoming_call_with_photo">Dolazni poziv sa slikom</string>
+  <string name="notification_incoming_call_with_message">Dolazni poziv sa porukom</string>
+  <string name="notification_incoming_call_with_location">Dolazni poziv sa lokacijom</string>
+  <string name="notification_incoming_call_with_photo_message">Dolazni poziv sa slikom i porukom</string>
+  <string name="notification_incoming_call_with_photo_location">Dolazni poziv sa slikom i lokacijom</string>
+  <string name="notification_incoming_call_with_message_location">Dolazni poziv sa porukom i lokacijom</string>
+  <string name="notification_incoming_call_with_photo_message_location">Dolazni poziv sa slikom, porukom i lokacijom</string>
+  <string name="notification_incoming_call_attachments">Dolazni poziv sa prilozima</string>
+  <string name="important_notification_incoming_call">Važan dolazni poziv</string>
+  <string name="important_notification_incoming_call_with_photo">Važan dolazni poziv sa slikom</string>
+  <string name="important_notification_incoming_call_with_message">Važan dolazni poziv sa porukom</string>
+  <string name="important_notification_incoming_call_with_location">Važan dolazni poziv sa lokacijom</string>
+  <string name="important_notification_incoming_call_with_photo_message">Važan dolazni poziv sa slikom i porukom</string>
+  <string name="important_notification_incoming_call_with_photo_location">Važan dolazni poziv sa slikom i lokacijom</string>
+  <string name="important_notification_incoming_call_with_message_location">Važan dolazni poziv sa porukom i lokacijom</string>
+  <string name="important_notification_incoming_call_with_photo_message_location">Važan dolazni poziv sa slikom, porukom i lokacijom</string>
+  <string name="important_notification_incoming_call_attachments">Važan dolazni poziv sa prilozima</string>
+  <string name="notification_incoming_work_call">Dolazni poziv za Work</string>
+  <string name="notification_incoming_spam_call">Sumnja na nepoželjan dolazni poziv</string>
+  <string name="notification_requesting_video_call">Zahtev za dolazni video poziv</string>
+  <string name="notification_action_answer">Odgovori</string>
+  <string name="notification_action_end_call">Prekini vezu</string>
+  <string name="notification_action_answer_video">Video</string>
+  <string name="notification_action_accept">Prihvati</string>
+  <string name="notification_action_dismiss">Odbij</string>
+  <string name="notification_action_speaker_on">Uključi zvučnik</string>
+  <string name="notification_action_speaker_off">Isključi zvučnik</string>
+  <string name="notification_external_call">Poziv je u toku na drugom uređaju</string>
+  <string name="notification_external_video_call">Video poziv je u toku na drugom uređaju</string>
+  <string name="notification_take_call">Preuzmi poziv</string>
+  <string name="notification_take_video_call">Preuzmi video poziv</string>
+  <string name="incall_error_supp_service_unknown">Usluga nije podržana.</string>
+  <string name="goPrivate">idi na privatno</string>
+  <string name="manageConferenceLabel">Upravljaj konferencijskim pozivom</string>
+  <string name="child_number">na %s</string>
+  <string name="callFailed_simError">Nema SIM kartice ili postoji greška na njoj</string>
+  <string name="conference_caller_disconnect_content_description">Završite poziv</string>
+  <string name="conference_call_name">Konferencijski poziv</string>
+  <string name="generic_conference_call_name">U pozivu</string>
+  <string name="video_call_wifi_to_lte_handover_toast">Poziv se nastavlja pomoću mobilnih podataka…</string>
+  <string name="video_call_lte_to_wifi_failed_title">Prebacivanje na Wi‑Fi mrežu nije uspelo</string>
+  <string name="video_call_lte_to_wifi_failed_message">Video poziv će ostati na mobilnoj mreži. Važe standardne naknade za prenos podataka.</string>
+  <string name="video_call_lte_to_wifi_failed_do_not_show">Ne prikazuj ovo ponovo</string>
+  <string name="bubble_return_to_call">Nazad u poziv</string>
+  <string name="rtt_request_dialog_title">Želite li da uđete u RTT poziv?</string>
+  <string name="rtt_request_dialog_details">%1$s želi da koristi razmenu poruka u audio pozivu.</string>
+  <string name="rtt_request_dialog_more_information">Tekst u realnom vremenu (RTT) pomaže pozivaocima koji su gluvi, slabo čuju, imaju teškoće u govoru ili kojima nije dovoljan samo glas.</string>
+  <string name="rtt_button_decline_request">Ne, hvala</string>
+  <string name="rtt_button_accept_request">Uđite u RTT</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-be/strings.xml b/java/com/android/incallui/res/values-be/strings.xml
index accf00a..040da93 100644
--- a/java/com/android/incallui/res/values-be/strings.xml
+++ b/java/com/android/incallui/res/values-be/strings.xml
@@ -1,79 +1,68 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"Тэлефон"</string>
-    <string name="wait_prompt_str" msgid="3509685348904329594">"Адправіць наступныя тоны?\n"</string>
-    <string name="pause_prompt_yes" msgid="4642047011233552973">"Так"</string>
-    <string name="pause_prompt_no" msgid="4691320111774935838">"Не"</string>
-    <string name="notification_dialing" msgid="9072177265772083826">"Набор нумара"</string>
-    <string name="notification_ongoing_call" msgid="8712641937577776125">"Бягучы выклік"</string>
-    <string name="notification_ongoing_video_call" msgid="6331318021321487769">"Бягучы відэавыклік"</string>
-    <string name="notification_ongoing_paused_video_call" msgid="709950253594606371">"Бягучы відэавыклік – прыпынены"</string>
-    <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Бягучы выклік па працы"</string>
-    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"Бягучы выклік праз <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
-    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"Уваходны выклік праз <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
-    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"Выклік праз Wi-Fi"</string>
-    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"Выклік па працы праз Wi-Fi"</string>
-    <string name="notification_on_hold" msgid="7141827443379205682">"У чаканні"</string>
-    <string name="notification_incoming_call" msgid="7520580807513849283">"Уваходны выклік"</string>
-    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Уваходны выклік з фота"</string>
-    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"Уваходны выклік з паведамленнем"</string>
-    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"Уваходны выклік з месцам"</string>
-    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"Уваходны выклік з фота і паведамленнем"</string>
-    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"Уваходны выклік з фота і месцам"</string>
-    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"Уваходны выклік з паведамленнем і месцам"</string>
-    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"Уваходны выклік з фота, паведамленнем і месцам"</string>
-    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"Уваходны выклік з далучэннямі"</string>
-    <string name="important_notification_incoming_call" msgid="2867013954509930989">"Важны ўваходны выклік"</string>
-    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"Важны ўваходны выклік з фота"</string>
-    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"Важны ўваходны выклік з паведамленнем"</string>
-    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"Важны ўваходны выклік з месцам"</string>
-    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"Важны ўваходны выклік з фота і паведамленнем"</string>
-    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"Важны ўваходны выклік з фота і месцам"</string>
-    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"Важны ўваходны выклік з паведамленнем і месцам"</string>
-    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Важны выклік з фота, паведамленнем і месцам"</string>
-    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Важны ўваходны выклік з далучэннямі"</string>
-    <string name="notification_incoming_work_call" msgid="5291275092734261918">"Уваходны выклік па працы"</string>
-    <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Уваходны выклiк ад абанента, якога падазраваюць у спаме"</string>
-    <string name="notification_requesting_video_call" msgid="1807679328811515758">"Запыт уваходнага відэавыкліку"</string>
-    <string name="notification_action_answer" msgid="8748275902211192568">"Адказаць"</string>
-    <string name="notification_action_end_call" msgid="7467258454170007765">"Скончыць размову"</string>
-    <string name="notification_action_answer_video" msgid="8488108892919917287">"Відэа"</string>
-    <string name="notification_action_accept" msgid="1272761514200507143">"Прыняць"</string>
-    <string name="notification_action_dismiss" msgid="3128241581632616226">"Адхіліць"</string>
-    <string name="notification_action_speaker_on" msgid="1882659234405596540">"Уключыць дынамік"</string>
-    <string name="notification_action_speaker_off" msgid="6340085043115533948">"Выключыць дынамік"</string>
-    <string name="notification_external_call" msgid="2504334597315343920">"Бягучы выклік на іншай прыладзе"</string>
-    <string name="notification_external_video_call" msgid="7709394856028436683">"Бягучы відэавыклік на іншай прыладзе"</string>
-    <string name="notification_take_call" msgid="5631659438864492229">"Прыняць выклік"</string>
-    <string name="notification_take_video_call" msgid="4473387503712341390">"Прыняць відэавыклік"</string>
-    <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"Служба не падтрымліваецца."</string>
-    <string name="goPrivate" msgid="5269514638004595378">"перайсці да прыватнай гаворкі"</string>
-    <string name="manageConferenceLabel" msgid="3589379023518128318">"Кіраванне канферэнц-выклікам"</string>
-    <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"Нумар экстраннай службы"</string>
-    <string name="child_number" msgid="3398257437107259682">"праз <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
-    <string name="callFailed_simError" msgid="4587775795711340072">"Няма SIM-карты або памылка яе чытання"</string>
-    <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Завяршыць выклік"</string>
-    <string name="conference_call_name" msgid="8189987124611337174">"Канферэнц-выклік"</string>
-    <string name="generic_conference_call_name" msgid="1546941472424243894">"У выкліку"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Працягваецца выклік з выкарыстаннем мабільнай перадачы даных…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Немагчыма пераключыцца на сетку Wi-Fi"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Відэавыклік застанецца ў мабільнай сетцы. Можа спаганяцца стандартная аплата за перадачу даных."</string>
-    <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Больш не паказваць"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="wait_prompt_str">Адправіць наступныя тоны?\n</string>
+  <string name="pause_prompt_yes">Так</string>
+  <string name="pause_prompt_no">Не</string>
+  <string name="notification_dialing">Набор нумара</string>
+  <string name="notification_ongoing_call">Бягучы выклік</string>
+  <string name="notification_ongoing_video_call">Бягучы відэавыклік</string>
+  <string name="notification_ongoing_paused_video_call">Бягучы відэавыклік – прыпынены</string>
+  <string name="notification_ongoing_work_call">Бягучы выклік па працы</string>
+  <string name="notification_ongoing_call_wifi_template">Бягучы выклік праз %1$s</string>
+  <string name="notification_incoming_call_wifi_template">Уваходны выклік праз %1$s</string>
+  <string name="notification_call_wifi_brand">Выклік праз Wi-Fi</string>
+  <string name="notification_call_wifi_work_brand">Выклік па працы праз Wi-Fi</string>
+  <string name="notification_on_hold">У чаканні</string>
+  <string name="notification_incoming_call">Уваходны выклік</string>
+  <string name="notification_incoming_video_call">Уваходны відэавыклік</string>
+  <string name="notification_incoming_call_mutli_sim">Уваходны выклік праз %1$s</string>
+  <string name="notification_incoming_call_with_photo">Уваходны выклік з фота</string>
+  <string name="notification_incoming_call_with_message">Уваходны выклік з паведамленнем</string>
+  <string name="notification_incoming_call_with_location">Уваходны выклік з месцам</string>
+  <string name="notification_incoming_call_with_photo_message">Уваходны выклік з фота і паведамленнем</string>
+  <string name="notification_incoming_call_with_photo_location">Уваходны выклік з фота і месцам</string>
+  <string name="notification_incoming_call_with_message_location">Уваходны выклік з паведамленнем і месцам</string>
+  <string name="notification_incoming_call_with_photo_message_location">Уваходны выклік з фота, паведамленнем і месцам</string>
+  <string name="notification_incoming_call_attachments">Уваходны выклік з далучэннямі</string>
+  <string name="important_notification_incoming_call">Важны ўваходны выклік</string>
+  <string name="important_notification_incoming_call_with_photo">Важны ўваходны выклік з фота</string>
+  <string name="important_notification_incoming_call_with_message">Важны ўваходны выклік з паведамленнем</string>
+  <string name="important_notification_incoming_call_with_location">Важны ўваходны выклік з месцам</string>
+  <string name="important_notification_incoming_call_with_photo_message">Важны ўваходны выклік з фота і паведамленнем</string>
+  <string name="important_notification_incoming_call_with_photo_location">Важны ўваходны выклік з фота і месцам</string>
+  <string name="important_notification_incoming_call_with_message_location">Важны ўваходны выклік з паведамленнем і месцам</string>
+  <string name="important_notification_incoming_call_with_photo_message_location">Важны выклік з фота, паведамленнем і месцам</string>
+  <string name="important_notification_incoming_call_attachments">Важны ўваходны выклік з далучэннямі</string>
+  <string name="notification_incoming_work_call">Уваходны выклік па працы</string>
+  <string name="notification_incoming_spam_call">Уваходны выклiк ад абанента, якога падазраваюць у спаме</string>
+  <string name="notification_requesting_video_call">Запыт уваходнага відэавыкліку</string>
+  <string name="notification_action_answer">Адказаць</string>
+  <string name="notification_action_end_call">Скончыць размову</string>
+  <string name="notification_action_answer_video">Відэа</string>
+  <string name="notification_action_accept">Прыняць</string>
+  <string name="notification_action_dismiss">Адхіліць</string>
+  <string name="notification_action_speaker_on">Уключыць дынамік</string>
+  <string name="notification_action_speaker_off">Выключыць дынамік</string>
+  <string name="notification_external_call">Бягучы выклік на іншай прыладзе</string>
+  <string name="notification_external_video_call">Бягучы відэавыклік на іншай прыладзе</string>
+  <string name="notification_take_call">Прыняць выклік</string>
+  <string name="notification_take_video_call">Прыняць відэавыклік</string>
+  <string name="incall_error_supp_service_unknown">Служба не падтрымліваецца.</string>
+  <string name="goPrivate">перайсці да прыватнай гаворкі</string>
+  <string name="manageConferenceLabel">Кіраванне канферэнц-выклікам</string>
+  <string name="child_number">праз %s</string>
+  <string name="callFailed_simError">Няма SIM-карты або памылка яе чытання</string>
+  <string name="conference_caller_disconnect_content_description">Завяршыць выклік</string>
+  <string name="conference_call_name">Канферэнц-выклік</string>
+  <string name="generic_conference_call_name">У выкліку</string>
+  <string name="video_call_wifi_to_lte_handover_toast">Працягваецца выклік з выкарыстаннем мабільнай перадачы даных…</string>
+  <string name="video_call_lte_to_wifi_failed_title">Немагчыма пераключыцца на сетку Wi-Fi</string>
+  <string name="video_call_lte_to_wifi_failed_message">Відэавыклік застанецца ў мабільнай сетцы. Можа спаганяцца стандартная аплата за перадачу даных.</string>
+  <string name="video_call_lte_to_wifi_failed_do_not_show">Больш не паказваць</string>
+  <string name="bubble_return_to_call">Вярнуцца да выкліку</string>
+  <string name="rtt_request_dialog_title">Далучыцца да выкліку RTT?</string>
+  <string name="rtt_request_dialog_details">Абанент %1$s хоча выкарыстоўваць абмен паведамленнямі ў межах галасавога выкліку.</string>
+  <string name="rtt_request_dialog_more_information">RTT дапамагае абанентам з парушэннямі слыху і маўлення.</string>
+  <string name="rtt_button_decline_request">Не, дзякуй</string>
+  <string name="rtt_button_accept_request">Падключыць RTT</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-bg/strings.xml b/java/com/android/incallui/res/values-bg/strings.xml
index 9a98565..3aea844 100644
--- a/java/com/android/incallui/res/values-bg/strings.xml
+++ b/java/com/android/incallui/res/values-bg/strings.xml
@@ -1,79 +1,68 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"Телефон"</string>
-    <string name="wait_prompt_str" msgid="3509685348904329594">"Да се изпратят ли следните мелодии? \n"</string>
-    <string name="pause_prompt_yes" msgid="4642047011233552973">"Да"</string>
-    <string name="pause_prompt_no" msgid="4691320111774935838">"Не"</string>
-    <string name="notification_dialing" msgid="9072177265772083826">"Набира се"</string>
-    <string name="notification_ongoing_call" msgid="8712641937577776125">"Текущо обаждане"</string>
-    <string name="notification_ongoing_video_call" msgid="6331318021321487769">"Текущо видеообаждане"</string>
-    <string name="notification_ongoing_paused_video_call" msgid="709950253594606371">"Текущо видеообаждане – видеото е на пауза"</string>
-    <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Текущо служебно обаждане"</string>
-    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"Текущо <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
-    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"Входящо <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
-    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"обаждане през Wi-Fi"</string>
-    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"служебно обаждане през Wi-Fi"</string>
-    <string name="notification_on_hold" msgid="7141827443379205682">"Задържане на обаждането"</string>
-    <string name="notification_incoming_call" msgid="7520580807513849283">"Вх. обаждане"</string>
-    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Входящо обаждане със снимка"</string>
-    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"Входящо обаждане със съобщение"</string>
-    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"Входящо обаждане с местоположение"</string>
-    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"Входящо обаждане със снимка и съобщение"</string>
-    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"Входящо обаждане със снимка и местоположение"</string>
-    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"Входящо обаждане със съобщение и местоположение"</string>
-    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"Обаждане със снимка, съобщение и местоположение"</string>
-    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"Входящо обаждане с прикачени файлове"</string>
-    <string name="important_notification_incoming_call" msgid="2867013954509930989">"Важно входящо обаждане"</string>
-    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"Важно входящо обаждане със снимка"</string>
-    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"Важно входящо обаждане със съобщение"</string>
-    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"Важно входящо обаждане с местоположение"</string>
-    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"Важно входящо обаждане със снимка и съобщение"</string>
-    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"Важно входящо обаждане със снимка и местоположение"</string>
-    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"Важно обаждане със съобщение и местоположение"</string>
-    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Важно обаждане с местоположение, снимка, съобщение"</string>
-    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Важно входящо обаждане с прикачени файлове"</string>
-    <string name="notification_incoming_work_call" msgid="5291275092734261918">"Входящо служебно обаждане"</string>
-    <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Входящо обаждане – възможен спам"</string>
-    <string name="notification_requesting_video_call" msgid="1807679328811515758">"Входяща заявка за видеовръзка"</string>
-    <string name="notification_action_answer" msgid="8748275902211192568">"Отговор"</string>
-    <string name="notification_action_end_call" msgid="7467258454170007765">"Затваряне"</string>
-    <string name="notification_action_answer_video" msgid="8488108892919917287">"Видеообаждане"</string>
-    <string name="notification_action_accept" msgid="1272761514200507143">"Приемам"</string>
-    <string name="notification_action_dismiss" msgid="3128241581632616226">"Отхвърляне"</string>
-    <string name="notification_action_speaker_on" msgid="1882659234405596540">"Включване на високоговорителя"</string>
-    <string name="notification_action_speaker_off" msgid="6340085043115533948">"Изключване на високоговорителя"</string>
-    <string name="notification_external_call" msgid="2504334597315343920">"Текущо обаждане на друго устройство"</string>
-    <string name="notification_external_video_call" msgid="7709394856028436683">"Текущо видеообаждане на друго устройство"</string>
-    <string name="notification_take_call" msgid="5631659438864492229">"Приемане на обаждането"</string>
-    <string name="notification_take_video_call" msgid="4473387503712341390">"Приемане на видеообаждането"</string>
-    <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"Услугата не се поддържа."</string>
-    <string name="goPrivate" msgid="5269514638004595378">"към частно"</string>
-    <string name="manageConferenceLabel" msgid="3589379023518128318">"Управление на конф. обаждане"</string>
-    <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"Спешен номер"</string>
-    <string name="child_number" msgid="3398257437107259682">"чрез <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
-    <string name="callFailed_simError" msgid="4587775795711340072">"Няма SIM карта или грешка в SIM картата"</string>
-    <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Край на обаждането"</string>
-    <string name="conference_call_name" msgid="8189987124611337174">"Конферентно обаждане"</string>
-    <string name="generic_conference_call_name" msgid="1546941472424243894">"В разговор"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Обаждането продължава през мобилната връзка за данни…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Превключването към Wi-Fi мрежа не бе възможно"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Видеообаждането ще остане в мобилната мрежа. Важат стандартните тарифи за данни."</string>
-    <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Това да не се показва отново"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="wait_prompt_str">Да се изпратят ли следните мелодии? \n</string>
+  <string name="pause_prompt_yes">Да</string>
+  <string name="pause_prompt_no">Не</string>
+  <string name="notification_dialing">Набира се</string>
+  <string name="notification_ongoing_call">Текущо обаждане</string>
+  <string name="notification_ongoing_video_call">Текущо видеообаждане</string>
+  <string name="notification_ongoing_paused_video_call">Текущо видеообаждане – видеото е на пауза</string>
+  <string name="notification_ongoing_work_call">Текущо служебно обаждане</string>
+  <string name="notification_ongoing_call_wifi_template">Текущо %1$s</string>
+  <string name="notification_incoming_call_wifi_template">Входящо %1$s</string>
+  <string name="notification_call_wifi_brand">обаждане през Wi-Fi</string>
+  <string name="notification_call_wifi_work_brand">служебно обаждане през Wi-Fi</string>
+  <string name="notification_on_hold">Задържане на обаждането</string>
+  <string name="notification_incoming_call">Вх. обаждане</string>
+  <string name="notification_incoming_video_call">Входящо видеообаждане</string>
+  <string name="notification_incoming_call_mutli_sim">Входящо обаждане през %1$s</string>
+  <string name="notification_incoming_call_with_photo">Входящо обаждане със снимка</string>
+  <string name="notification_incoming_call_with_message">Входящо обаждане със съобщение</string>
+  <string name="notification_incoming_call_with_location">Входящо обаждане с местоположение</string>
+  <string name="notification_incoming_call_with_photo_message">Входящо обаждане със снимка и съобщение</string>
+  <string name="notification_incoming_call_with_photo_location">Входящо обаждане със снимка и местоположение</string>
+  <string name="notification_incoming_call_with_message_location">Входящо обаждане със съобщение и местоположение</string>
+  <string name="notification_incoming_call_with_photo_message_location">Обаждане със снимка, съобщение и местоположение</string>
+  <string name="notification_incoming_call_attachments">Входящо обаждане с прикачени файлове</string>
+  <string name="important_notification_incoming_call">Важно входящо обаждане</string>
+  <string name="important_notification_incoming_call_with_photo">Важно входящо обаждане със снимка</string>
+  <string name="important_notification_incoming_call_with_message">Важно входящо обаждане със съобщение</string>
+  <string name="important_notification_incoming_call_with_location">Важно входящо обаждане с местоположение</string>
+  <string name="important_notification_incoming_call_with_photo_message">Важно входящо обаждане със снимка и съобщение</string>
+  <string name="important_notification_incoming_call_with_photo_location">Важно входящо обаждане със снимка и местоположение</string>
+  <string name="important_notification_incoming_call_with_message_location">Важно обаждане със съобщение и местоположение</string>
+  <string name="important_notification_incoming_call_with_photo_message_location">Важно обаждане с местоположение, снимка, съобщение</string>
+  <string name="important_notification_incoming_call_attachments">Важно входящо обаждане с прикачени файлове</string>
+  <string name="notification_incoming_work_call">Входящо служебно обаждане</string>
+  <string name="notification_incoming_spam_call">Входящо обаждане – възможен спам</string>
+  <string name="notification_requesting_video_call">Входяща заявка за видеовръзка</string>
+  <string name="notification_action_answer">Отговор</string>
+  <string name="notification_action_end_call">Затваряне</string>
+  <string name="notification_action_answer_video">Видеообаждане</string>
+  <string name="notification_action_accept">Приемам</string>
+  <string name="notification_action_dismiss">Отхвърляне</string>
+  <string name="notification_action_speaker_on">Включване на високоговорителя</string>
+  <string name="notification_action_speaker_off">Изключване на високоговорителя</string>
+  <string name="notification_external_call">Текущо обаждане на друго устройство</string>
+  <string name="notification_external_video_call">Текущо видеообаждане на друго устройство</string>
+  <string name="notification_take_call">Приемане на обаждането</string>
+  <string name="notification_take_video_call">Приемане на видеообаждането</string>
+  <string name="incall_error_supp_service_unknown">Услугата не се поддържа.</string>
+  <string name="goPrivate">към частно</string>
+  <string name="manageConferenceLabel">Управление на конф. обаждане</string>
+  <string name="child_number">чрез %s</string>
+  <string name="callFailed_simError">Няма SIM карта или грешка в SIM картата</string>
+  <string name="conference_caller_disconnect_content_description">Край на обаждането</string>
+  <string name="conference_call_name">Конферентно обаждане</string>
+  <string name="generic_conference_call_name">В разговор</string>
+  <string name="video_call_wifi_to_lte_handover_toast">Обаждането продължава през мобилната връзка за данни…</string>
+  <string name="video_call_lte_to_wifi_failed_title">Превключването към Wi-Fi мрежа не бе възможно</string>
+  <string name="video_call_lte_to_wifi_failed_message">Видеообаждането ще остане в мобилната мрежа. Важат стандартните тарифи за данни.</string>
+  <string name="video_call_lte_to_wifi_failed_do_not_show">Това да не се показва отново</string>
+  <string name="bubble_return_to_call">Назад към обаждането</string>
+  <string name="rtt_request_dialog_title">Ще се присъедините ли към обаждането с ТСРВ?</string>
+  <string name="rtt_request_dialog_details">%1$s иска да използва съобщения в гласовото ви обаждане.</string>
+  <string name="rtt_request_dialog_more_information">ТСРВ подпомага обаждащите се, които са глухи, с влошен слух, имат проблеми с говора или се нуждаят от повече от само глас.</string>
+  <string name="rtt_button_decline_request">Не, благодаря</string>
+  <string name="rtt_button_accept_request">Присъединяване</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-bn/strings.xml b/java/com/android/incallui/res/values-bn/strings.xml
index 2c7d723..cae92af 100644
--- a/java/com/android/incallui/res/values-bn/strings.xml
+++ b/java/com/android/incallui/res/values-bn/strings.xml
@@ -1,79 +1,68 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"ফোন"</string>
-    <string name="wait_prompt_str" msgid="3509685348904329594">"নিম্নলিখিত টোনগুলি পাঠাবেন?\n"</string>
-    <string name="pause_prompt_yes" msgid="4642047011233552973">"হ্যাঁ"</string>
-    <string name="pause_prompt_no" msgid="4691320111774935838">"না"</string>
-    <string name="notification_dialing" msgid="9072177265772083826">"ডায়াল করা হচ্ছে"</string>
-    <string name="notification_ongoing_call" msgid="8712641937577776125">"চালু থাকা কল"</string>
-    <string name="notification_ongoing_video_call" msgid="6331318021321487769">"ভিডিও কল চলছে"</string>
-    <string name="notification_ongoing_paused_video_call" msgid="709950253594606371">"ভিডিও কল চলছে - ভিডিও বিরত রাখা হয়েছে"</string>
-    <string name="notification_ongoing_work_call" msgid="3189581218078981547">"চলমান কাজের কল"</string>
-    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"<xliff:g id="BRAND_NAME">%1$s</xliff:g> চালু আছে"</string>
-    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"ইনকামিং <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
-    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"ওয়াই-ফাই কল"</string>
-    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"অফিসের ওয়াই-ফাই কল"</string>
-    <string name="notification_on_hold" msgid="7141827443379205682">"সাময়িকভাবে স্থগিত রাখা হয়েছে"</string>
-    <string name="notification_incoming_call" msgid="7520580807513849283">"ইনকামিং কল"</string>
-    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"ফটো সহ ইনকামিং কল"</string>
-    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"বার্তা সহ ইনকামিং কল"</string>
-    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"অবস্থান সহ ইনকামিং কল"</string>
-    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"ফটো এবং বার্তা সহ ইনকামিং কল"</string>
-    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"ফটো এবং অবস্থান সহ ইনকামিং কল"</string>
-    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"বার্তা এবং অবস্থান সহ ইনকামিং কল"</string>
-    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"ফটো, বার্তা এবং অবস্থান সহ ইনকামিং কল"</string>
-    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"সংযুক্তিগুলি সহ ইনকামিং কল"</string>
-    <string name="important_notification_incoming_call" msgid="2867013954509930989">"গুরুত্বপূর্ণ ইনকামিং কল"</string>
-    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"ফটো সহ গুরুত্বপূর্ণ ইনকামিং কল"</string>
-    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"বার্তা সহ গুরুত্বপূর্ণ ইনকামিং কল"</string>
-    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"অবস্থান সহ গুরুত্বপূর্ণ ইনকামিং কল"</string>
-    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"ফটো এবং বার্তা সহ গুরুত্বপূর্ণ ইনকামিং কল"</string>
-    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"ফটো এবং অবস্থান সহ গুরুত্বপূর্ণ ইনকামিং কল"</string>
-    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"বার্তা এবং অবস্থান সহ গুরুত্বপূর্ণ ইনকামিং কল"</string>
-    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"ফটো, বার্তা এবং অবস্থান সহ গুরুত্বপূর্ণ ইনকামিং কল"</string>
-    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"সংযুক্তিগুলি সহ গুরুত্বপূর্ণ ইনকামিং কল"</string>
-    <string name="notification_incoming_work_call" msgid="5291275092734261918">"আগত কাজের কল"</string>
-    <string name="notification_incoming_spam_call" msgid="7591506944666791937">"আগত সন্দেহভাজন স্প্যাম কল"</string>
-    <string name="notification_requesting_video_call" msgid="1807679328811515758">"আগত ভিডিও অনুরোধ"</string>
-    <string name="notification_action_answer" msgid="8748275902211192568">"উত্তর"</string>
-    <string name="notification_action_end_call" msgid="7467258454170007765">"কল নামিয়ে রাখুন"</string>
-    <string name="notification_action_answer_video" msgid="8488108892919917287">"ভিডিও"</string>
-    <string name="notification_action_accept" msgid="1272761514200507143">"স্বীকার করুন"</string>
-    <string name="notification_action_dismiss" msgid="3128241581632616226">"প্রত্যাখ্যান"</string>
-    <string name="notification_action_speaker_on" msgid="1882659234405596540">"স্পিকার চালু করুন"</string>
-    <string name="notification_action_speaker_off" msgid="6340085043115533948">"স্পিকার বন্ধ করুন"</string>
-    <string name="notification_external_call" msgid="2504334597315343920">"অন্য ডিভাইসে চালু থাকা কল"</string>
-    <string name="notification_external_video_call" msgid="7709394856028436683">"অন্য ডিভাইসে চালু থাকা ভিডিও কল"</string>
-    <string name="notification_take_call" msgid="5631659438864492229">"কলটি নিন"</string>
-    <string name="notification_take_video_call" msgid="4473387503712341390">"ভিডিও কলটি নিন"</string>
-    <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"পরিষেবা সমর্থিত নয়৷"</string>
-    <string name="goPrivate" msgid="5269514638004595378">"ব্যক্তিগতভাবে কাজ করুন"</string>
-    <string name="manageConferenceLabel" msgid="3589379023518128318">"কনফারেন্স কল পরিচালনা করুন"</string>
-    <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"জরুরি নম্বর"</string>
-    <string name="child_number" msgid="3398257437107259682">"<xliff:g id="CHILD_NUMBER">%s</xliff:g> এর মাধ্যমে"</string>
-    <string name="callFailed_simError" msgid="4587775795711340072">"কোনো সিম নেই বা সিম ত্রুটি"</string>
-    <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"কল কেটে দিন"</string>
-    <string name="conference_call_name" msgid="8189987124611337174">"কনফারেন্স কল"</string>
-    <string name="generic_conference_call_name" msgid="1546941472424243894">"কলে থাকাকালীন"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"মোবাইল ডেটা ব্যবহার করে কল করা চালিয়ে যান…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"ওয়াই-ফাই নেটওয়ার্কে পাল্টানো গেল না"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"ভিডিও কল মোবাইল নেটওয়ার্কেই থাকবে৷ স্ট্যান্ডার্ড ডেটা চার্জ প্রযোজ্য হতে পারে৷"</string>
-    <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"এটি আমাকে আর দেখাবেন না"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="wait_prompt_str">নিম্নলিখিত টোনগুলি পাঠাবেন?\n</string>
+  <string name="pause_prompt_yes">হ্যাঁ</string>
+  <string name="pause_prompt_no">না</string>
+  <string name="notification_dialing">ডায়াল করা হচ্ছে</string>
+  <string name="notification_ongoing_call">চালু থাকা কল</string>
+  <string name="notification_ongoing_video_call">ভিডিও কল চলছে</string>
+  <string name="notification_ongoing_paused_video_call">ভিডিও কল চলছে - ভিডিও বিরত রাখা হয়েছে</string>
+  <string name="notification_ongoing_work_call">চলমান কাজের কল</string>
+  <string name="notification_ongoing_call_wifi_template">%1$s চালু আছে</string>
+  <string name="notification_incoming_call_wifi_template">ইনকামিং %1$s</string>
+  <string name="notification_call_wifi_brand">ওয়াই-ফাই কল</string>
+  <string name="notification_call_wifi_work_brand">অফিসের ওয়াই-ফাই কল</string>
+  <string name="notification_on_hold">সাময়িকভাবে স্থগিত রাখা হয়েছে</string>
+  <string name="notification_incoming_call">ইনকামিং কল</string>
+  <string name="notification_incoming_video_call">ইনকামিং ভিডিও কল</string>
+  <string name="notification_incoming_call_mutli_sim">%1$s এ কল আসছে</string>
+  <string name="notification_incoming_call_with_photo">ফটো সহ ইনকামিং কল</string>
+  <string name="notification_incoming_call_with_message">বার্তা সহ ইনকামিং কল</string>
+  <string name="notification_incoming_call_with_location">লোকেশন সহ ইনকামিং কল</string>
+  <string name="notification_incoming_call_with_photo_message">ফটো এবং বার্তা সহ ইনকামিং কল</string>
+  <string name="notification_incoming_call_with_photo_location">ফটো এবং লোকেশন সহ ইনকামিং কল</string>
+  <string name="notification_incoming_call_with_message_location">বার্তা এবং লোকেশন সহ ইনকামিং কল</string>
+  <string name="notification_incoming_call_with_photo_message_location">ফটো, বার্তা এবং লোকেশন সহ ইনকামিং কল</string>
+  <string name="notification_incoming_call_attachments">সংযুক্তিগুলি সহ ইনকামিং কল</string>
+  <string name="important_notification_incoming_call">গুরুত্বপূর্ণ ইনকামিং কল</string>
+  <string name="important_notification_incoming_call_with_photo">ফটো সহ গুরুত্বপূর্ণ ইনকামিং কল</string>
+  <string name="important_notification_incoming_call_with_message">বার্তা সহ গুরুত্বপূর্ণ ইনকামিং কল</string>
+  <string name="important_notification_incoming_call_with_location">লোকেশন সহ গুরুত্বপূর্ণ ইনকামিং কল</string>
+  <string name="important_notification_incoming_call_with_photo_message">ফটো এবং বার্তা সহ গুরুত্বপূর্ণ ইনকামিং কল</string>
+  <string name="important_notification_incoming_call_with_photo_location">ফটো এবং লোকেশন সহ গুরুত্বপূর্ণ ইনকামিং কল</string>
+  <string name="important_notification_incoming_call_with_message_location">বার্তা এবং লোকেশন সহ গুরুত্বপূর্ণ ইনকামিং কল</string>
+  <string name="important_notification_incoming_call_with_photo_message_location">ফটো, বার্তা এবং লোকেশন সহ গুরুত্বপূর্ণ ইনকামিং কল</string>
+  <string name="important_notification_incoming_call_attachments">সংযুক্তিগুলি সহ গুরুত্বপূর্ণ ইনকামিং কল</string>
+  <string name="notification_incoming_work_call">আগত কাজের কল</string>
+  <string name="notification_incoming_spam_call">আগত সন্দেহভাজন স্প্যাম কল</string>
+  <string name="notification_requesting_video_call">আগত ভিডিও অনুরোধ</string>
+  <string name="notification_action_answer">উত্তর</string>
+  <string name="notification_action_end_call">কল নামিয়ে রাখুন</string>
+  <string name="notification_action_answer_video">ভিডিও</string>
+  <string name="notification_action_accept">স্বীকার করুন</string>
+  <string name="notification_action_dismiss">প্রত্যাখ্যান</string>
+  <string name="notification_action_speaker_on">স্পিকার চালু করুন</string>
+  <string name="notification_action_speaker_off">স্পিকার বন্ধ করুন</string>
+  <string name="notification_external_call">অন্য ডিভাইসে চালু থাকা কল</string>
+  <string name="notification_external_video_call">অন্য ডিভাইসে চালু থাকা ভিডিও কল</string>
+  <string name="notification_take_call">কলটি নিন</string>
+  <string name="notification_take_video_call">ভিডিও কলটি নিন</string>
+  <string name="incall_error_supp_service_unknown">পরিষেবা সমর্থিত নয়৷</string>
+  <string name="goPrivate">ব্যক্তিগতভাবে কাজ করুন</string>
+  <string name="manageConferenceLabel">কনফারেন্স কল পরিচালনা করুন</string>
+  <string name="child_number">%s এর মাধ্যমে</string>
+  <string name="callFailed_simError">কোনো সিম নেই বা সিম ত্রুটি</string>
+  <string name="conference_caller_disconnect_content_description">কল কেটে দিন</string>
+  <string name="conference_call_name">কনফারেন্স কল</string>
+  <string name="generic_conference_call_name">কলে থাকাকালীন</string>
+  <string name="video_call_wifi_to_lte_handover_toast">মোবাইল ডেটা ব্যবহার করে কল করা চালিয়ে যান…</string>
+  <string name="video_call_lte_to_wifi_failed_title">ওয়াই-ফাই নেটওয়ার্কে পাল্টানো গেল না</string>
+  <string name="video_call_lte_to_wifi_failed_message">ভিডিও কল মোবাইল নেটওয়ার্কেই থাকবে৷ স্ট্যান্ডার্ড ডেটা চার্জ প্রযোজ্য হতে পারে৷</string>
+  <string name="video_call_lte_to_wifi_failed_do_not_show">এটি আমাকে আর দেখাবেন না</string>
+  <string name="bubble_return_to_call">কলে ফিরে যান</string>
+  <string name="rtt_request_dialog_title">RTT কলে যোগ দেবেন?</string>
+  <string name="rtt_request_dialog_details">%1$s আপনার ভয়েস কলে মেসেজ পাঠাতে চান।</string>
+  <string name="rtt_request_dialog_more_information">যে কলাররা বধির, কানে কম শোনেন, যাদের কথা বলতে অসুবিধা হয় অথবা যারা কণ্ঠস্বরের সাথে অন্য কোনও উপায়ে নিজেদের প্রকাশ করেন, RTT বৈশিষ্ট্যটি তাদের সাহায্য করে।</string>
+  <string name="rtt_button_decline_request">না থাক</string>
+  <string name="rtt_button_accept_request">RTT-তে যোগ দিন</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-bs/strings.xml b/java/com/android/incallui/res/values-bs/strings.xml
index 48be726..101930d 100644
--- a/java/com/android/incallui/res/values-bs/strings.xml
+++ b/java/com/android/incallui/res/values-bs/strings.xml
@@ -1,79 +1,68 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"Telefon"</string>
-    <string name="wait_prompt_str" msgid="3509685348904329594">"Poslati sljedeće tonove?\n"</string>
-    <string name="pause_prompt_yes" msgid="4642047011233552973">"Da"</string>
-    <string name="pause_prompt_no" msgid="4691320111774935838">"Ne"</string>
-    <string name="notification_dialing" msgid="9072177265772083826">"Poziva se"</string>
-    <string name="notification_ongoing_call" msgid="8712641937577776125">"Poziv u toku"</string>
-    <string name="notification_ongoing_video_call" msgid="6331318021321487769">"Videopoziv u toku"</string>
-    <string name="notification_ongoing_paused_video_call" msgid="709950253594606371">"Videopoziv u toku – videozapis je pauziran"</string>
-    <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Poslovni poziv u toku"</string>
-    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"<xliff:g id="BRAND_NAME">%1$s</xliff:g> poziv u toku"</string>
-    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"Dolazni <xliff:g id="BRAND_NAME">%1$s</xliff:g> poziv"</string>
-    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"Wi-Fi poziv"</string>
-    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"Wi-Fi poslovni poziv"</string>
-    <string name="notification_on_hold" msgid="7141827443379205682">"Na čekanju"</string>
-    <string name="notification_incoming_call" msgid="7520580807513849283">"Dolazni poziv"</string>
-    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Dolazni poziv s fotografijom"</string>
-    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"Dolazni poziv s porukom"</string>
-    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"Dolazni poziv s lokacijom"</string>
-    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"Dolazni poziv s fotografijom i porukom"</string>
-    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"Dolazni poziv s fotografijom i lokacijom"</string>
-    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"Dolazni poziv s porukom i lokacijom"</string>
-    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"Dolazni poziv s fotografijom, porukom i lokacijom"</string>
-    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"Dolazni poziv s prilozima"</string>
-    <string name="important_notification_incoming_call" msgid="2867013954509930989">"Važan dolazni poziv"</string>
-    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"Važan dolazni poziv s fotografijom"</string>
-    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"Važan dolazni poziv s porukom"</string>
-    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"Važan dolazni poziv s lokacijom"</string>
-    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"Važan dolazni poziv s fotografijom i porukom"</string>
-    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"Važan dolazni poziv s fotografijom i lokacijom"</string>
-    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"Važan dolazni poziv s porukom i lokacijom"</string>
-    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Važan poziv s fotografijom, porukom i lokacijom"</string>
-    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Važan dolazni poziv s prilozima"</string>
-    <string name="notification_incoming_work_call" msgid="5291275092734261918">"Dolazni poslovni poziv"</string>
-    <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Mogući neželjeni dolazni poziv"</string>
-    <string name="notification_requesting_video_call" msgid="1807679328811515758">"Zahtjev za dolazni videopoziv"</string>
-    <string name="notification_action_answer" msgid="8748275902211192568">"Odgovori"</string>
-    <string name="notification_action_end_call" msgid="7467258454170007765">"Prekini vezu"</string>
-    <string name="notification_action_answer_video" msgid="8488108892919917287">"Videopoziv"</string>
-    <string name="notification_action_accept" msgid="1272761514200507143">"Prihvati"</string>
-    <string name="notification_action_dismiss" msgid="3128241581632616226">"Odbij"</string>
-    <string name="notification_action_speaker_on" msgid="1882659234405596540">"Uključi zvučnik"</string>
-    <string name="notification_action_speaker_off" msgid="6340085043115533948">"Isključi zvučnik"</string>
-    <string name="notification_external_call" msgid="2504334597315343920">"Poziv u toku na drugom uređaju"</string>
-    <string name="notification_external_video_call" msgid="7709394856028436683">"Videopoziv je u toku na drugom uređaju"</string>
-    <string name="notification_take_call" msgid="5631659438864492229">"Primi poziv"</string>
-    <string name="notification_take_video_call" msgid="4473387503712341390">"Primi videopoziv"</string>
-    <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"Usluga nije podržana."</string>
-    <string name="goPrivate" msgid="5269514638004595378">"idi na privatno"</string>
-    <string name="manageConferenceLabel" msgid="3589379023518128318">"Upravljaj konf. pozivom"</string>
-    <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"Broj za hitne slučajeve"</string>
-    <string name="child_number" msgid="3398257437107259682">"putem <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
-    <string name="callFailed_simError" msgid="4587775795711340072">"Nema SIM kartice ili postoji greška sa SIM karticom"</string>
-    <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Prekini poziv"</string>
-    <string name="conference_call_name" msgid="8189987124611337174">"Konferencijski poziv"</string>
-    <string name="generic_conference_call_name" msgid="1546941472424243894">"Poziv u toku"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Nastavak poziva prijenosom mobilnih podataka…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Prebacivanje na Wi-Fi mrežu nije moguće"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Videopoziv će ostati na mobilnoj mreži. Mogu nastati standardni troškovi prijenosa podataka."</string>
-    <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Ne prikazuj ponovo"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="wait_prompt_str">Poslati sljedeće tonove?\n</string>
+  <string name="pause_prompt_yes">Da</string>
+  <string name="pause_prompt_no">Ne</string>
+  <string name="notification_dialing">Poziva se</string>
+  <string name="notification_ongoing_call">Poziv u toku</string>
+  <string name="notification_ongoing_video_call">Video poziv u toku</string>
+  <string name="notification_ongoing_paused_video_call">Video poziv u toku – videozapis je pauziran</string>
+  <string name="notification_ongoing_work_call">Poslovni poziv u toku</string>
+  <string name="notification_ongoing_call_wifi_template">%1$s poziv u toku</string>
+  <string name="notification_incoming_call_wifi_template">Dolazni %1$s poziv</string>
+  <string name="notification_call_wifi_brand">WiFi poziv</string>
+  <string name="notification_call_wifi_work_brand">WiFi poslovni poziv</string>
+  <string name="notification_on_hold">Na čekanju</string>
+  <string name="notification_incoming_call">Dolazni poziv</string>
+  <string name="notification_incoming_video_call">Dolazni video poziv</string>
+  <string name="notification_incoming_call_mutli_sim">Dolazni poziv sa SIM kartice %1$s</string>
+  <string name="notification_incoming_call_with_photo">Dolazni poziv s fotografijom</string>
+  <string name="notification_incoming_call_with_message">Dolazni poziv s porukom</string>
+  <string name="notification_incoming_call_with_location">Dolazni poziv s lokacijom</string>
+  <string name="notification_incoming_call_with_photo_message">Dolazni poziv s fotografijom i porukom</string>
+  <string name="notification_incoming_call_with_photo_location">Dolazni poziv s fotografijom i lokacijom</string>
+  <string name="notification_incoming_call_with_message_location">Dolazni poziv s porukom i lokacijom</string>
+  <string name="notification_incoming_call_with_photo_message_location">Dolazni poziv s fotografijom, porukom i lokacijom</string>
+  <string name="notification_incoming_call_attachments">Dolazni poziv s prilozima</string>
+  <string name="important_notification_incoming_call">Važan dolazni poziv</string>
+  <string name="important_notification_incoming_call_with_photo">Važan dolazni poziv s fotografijom</string>
+  <string name="important_notification_incoming_call_with_message">Važan dolazni poziv s porukom</string>
+  <string name="important_notification_incoming_call_with_location">Važan dolazni poziv s lokacijom</string>
+  <string name="important_notification_incoming_call_with_photo_message">Važan dolazni poziv s fotografijom i porukom</string>
+  <string name="important_notification_incoming_call_with_photo_location">Važan dolazni poziv s fotografijom i lokacijom</string>
+  <string name="important_notification_incoming_call_with_message_location">Važan dolazni poziv s porukom i lokacijom</string>
+  <string name="important_notification_incoming_call_with_photo_message_location">Važan poziv s fotografijom, porukom i lokacijom</string>
+  <string name="important_notification_incoming_call_attachments">Važan dolazni poziv s prilozima</string>
+  <string name="notification_incoming_work_call">Dolazni poslovni poziv</string>
+  <string name="notification_incoming_spam_call">Mogući neželjeni dolazni poziv</string>
+  <string name="notification_requesting_video_call">Zahtjev za dolazni video poziv</string>
+  <string name="notification_action_answer">Odgovori</string>
+  <string name="notification_action_end_call">Prekini vezu</string>
+  <string name="notification_action_answer_video">Video poziv</string>
+  <string name="notification_action_accept">Prihvati</string>
+  <string name="notification_action_dismiss">Odbij</string>
+  <string name="notification_action_speaker_on">Uključi zvučnik</string>
+  <string name="notification_action_speaker_off">Isključi zvučnik</string>
+  <string name="notification_external_call">Poziv u toku na drugom uređaju</string>
+  <string name="notification_external_video_call">Video poziv je u toku na drugom uređaju</string>
+  <string name="notification_take_call">Primi poziv</string>
+  <string name="notification_take_video_call">Primi video poziv</string>
+  <string name="incall_error_supp_service_unknown">Usluga nije podržana.</string>
+  <string name="goPrivate">idi na privatno</string>
+  <string name="manageConferenceLabel">Upravljaj konf. pozivom</string>
+  <string name="child_number">putem %s</string>
+  <string name="callFailed_simError">Nema SIM kartice ili postoji greška sa SIM karticom</string>
+  <string name="conference_caller_disconnect_content_description">Prekini poziv</string>
+  <string name="conference_call_name">Konferencijski poziv</string>
+  <string name="generic_conference_call_name">Poziv u toku</string>
+  <string name="video_call_wifi_to_lte_handover_toast">Nastavak poziva prijenosom prijenosa podataka na mobilnoj mreži…</string>
+  <string name="video_call_lte_to_wifi_failed_title">Prebacivanje na WiFi mrežu nije moguće</string>
+  <string name="video_call_lte_to_wifi_failed_message">Video poziv će ostati na mobilnoj mreži. Mogu nastati standardni troškovi prijenosa podataka.</string>
+  <string name="video_call_lte_to_wifi_failed_do_not_show">Ne prikazuj ponovo</string>
+  <string name="bubble_return_to_call">Nazad na poziv</string>
+  <string name="rtt_request_dialog_title">Želite li se pridružiti RTT pozivu?</string>
+  <string name="rtt_request_dialog_details">%1$s želi koristiti poruke u vašem glasovnom pozivu.</string>
+  <string name="rtt_request_dialog_more_information">RTT pomaže pozivaocima koji su gluhi, imaju probleme sa sluhom ili govorom te onima kojima treba više od samog glasa.</string>
+  <string name="rtt_button_decline_request">Ne, hvala</string>
+  <string name="rtt_button_accept_request">Pridruži se RTT-u</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-ca/strings.xml b/java/com/android/incallui/res/values-ca/strings.xml
index dbb5417..17c1e61 100644
--- a/java/com/android/incallui/res/values-ca/strings.xml
+++ b/java/com/android/incallui/res/values-ca/strings.xml
@@ -1,79 +1,68 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"Telèfon"</string>
-    <string name="wait_prompt_str" msgid="3509685348904329594">"Voleu enviar els codis següents?\n"</string>
-    <string name="pause_prompt_yes" msgid="4642047011233552973">"Sí"</string>
-    <string name="pause_prompt_no" msgid="4691320111774935838">"No"</string>
-    <string name="notification_dialing" msgid="9072177265772083826">"S\'està marcant"</string>
-    <string name="notification_ongoing_call" msgid="8712641937577776125">"Trucada en procés"</string>
-    <string name="notification_ongoing_video_call" msgid="6331318021321487769">"Videotrucada en curs"</string>
-    <string name="notification_ongoing_paused_video_call" msgid="709950253594606371">"Videotrucada en curs: s\'ha posat en pausa el vídeo"</string>
-    <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Trucada de feina en curs"</string>
-    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"En curs: <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
-    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"Entrant: <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
-    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"Trucada per Wi-Fi"</string>
-    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"Trucada de feina per Wi-Fi"</string>
-    <string name="notification_on_hold" msgid="7141827443379205682">"En espera"</string>
-    <string name="notification_incoming_call" msgid="7520580807513849283">"Trucada entrant"</string>
-    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Trucada entrant amb foto"</string>
-    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"Trucada entrant amb missatge"</string>
-    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"Trucada entrant amb ubicació"</string>
-    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"Trucada entrant amb foto i missatge"</string>
-    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"Trucada entrant amb foto i ubicació"</string>
-    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"Trucada entrant amb missatge i ubicació"</string>
-    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"Trucada entrant amb foto, missatge i ubicació"</string>
-    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"Trucada entrant amb fitxers adjunts"</string>
-    <string name="important_notification_incoming_call" msgid="2867013954509930989">"Trucada entrant important"</string>
-    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"Trucada entrant important amb foto"</string>
-    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"Trucada entrant important amb missatge"</string>
-    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"Trucada entrant important amb ubicació"</string>
-    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"Trucada entrant important amb foto i missatge"</string>
-    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"Trucada entrant important amb foto i ubicació"</string>
-    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"Trucada entrant important amb missatge i ubicació"</string>
-    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Trucada entrant important amb foto, missatge i ubicació"</string>
-    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Trucada entrant important amb fitxers adjunts"</string>
-    <string name="notification_incoming_work_call" msgid="5291275092734261918">"Trucada de feina entrant"</string>
-    <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Presumpta trucada brossa entrant"</string>
-    <string name="notification_requesting_video_call" msgid="1807679328811515758">"Sol·licitud de vídeo entrant"</string>
-    <string name="notification_action_answer" msgid="8748275902211192568">"Respon"</string>
-    <string name="notification_action_end_call" msgid="7467258454170007765">"Penja"</string>
-    <string name="notification_action_answer_video" msgid="8488108892919917287">"Vídeo"</string>
-    <string name="notification_action_accept" msgid="1272761514200507143">"Accepta"</string>
-    <string name="notification_action_dismiss" msgid="3128241581632616226">"Rebutja"</string>
-    <string name="notification_action_speaker_on" msgid="1882659234405596540">"Activa l\'altaveu"</string>
-    <string name="notification_action_speaker_off" msgid="6340085043115533948">"Desactiva l\'altaveu"</string>
-    <string name="notification_external_call" msgid="2504334597315343920">"Trucada en curs en un altre dispositiu"</string>
-    <string name="notification_external_video_call" msgid="7709394856028436683">"Videotrucada en curs en un altre dispositiu"</string>
-    <string name="notification_take_call" msgid="5631659438864492229">"Accepta la trucada"</string>
-    <string name="notification_take_video_call" msgid="4473387503712341390">"Accepta la videotrucada"</string>
-    <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"El servei no és compatible."</string>
-    <string name="goPrivate" msgid="5269514638004595378">"passa a privat"</string>
-    <string name="manageConferenceLabel" msgid="3589379023518128318">"Gestiona la conferència"</string>
-    <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"Número d\'emergència"</string>
-    <string name="child_number" msgid="3398257437107259682">"mitjançant <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
-    <string name="callFailed_simError" msgid="4587775795711340072">"Cap SIM o error de la SIM"</string>
-    <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Finalitza la trucada"</string>
-    <string name="conference_call_name" msgid="8189987124611337174">"Conferència"</string>
-    <string name="generic_conference_call_name" msgid="1546941472424243894">"En una trucada"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"S\'està continuant la trucada mitjançant dades mòbils…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"No s\'ha pogut canviar a la xarxa Wi-Fi"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"La videotrucada continuarà a la xarxa mòbil. És possible que s\'hi apliquin càrrecs de dades estàndard."</string>
-    <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"No ho tornis a mostrar"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="wait_prompt_str">Voleu enviar els codis següents?\n</string>
+  <string name="pause_prompt_yes">Sí</string>
+  <string name="pause_prompt_no">No</string>
+  <string name="notification_dialing">S\'està marcant</string>
+  <string name="notification_ongoing_call">Trucada en procés</string>
+  <string name="notification_ongoing_video_call">Videotrucada en curs</string>
+  <string name="notification_ongoing_paused_video_call">Videotrucada en curs: s\'ha posat en pausa el vídeo</string>
+  <string name="notification_ongoing_work_call">Trucada de feina en curs</string>
+  <string name="notification_ongoing_call_wifi_template">En curs: %1$s</string>
+  <string name="notification_incoming_call_wifi_template">Entrant: %1$s</string>
+  <string name="notification_call_wifi_brand">Trucada per Wi-Fi</string>
+  <string name="notification_call_wifi_work_brand">Trucada de feina per Wi-Fi</string>
+  <string name="notification_on_hold">En espera</string>
+  <string name="notification_incoming_call">Trucada entrant</string>
+  <string name="notification_incoming_video_call">Videotrucada entrant</string>
+  <string name="notification_incoming_call_mutli_sim">Trucada entrant per la %1$s</string>
+  <string name="notification_incoming_call_with_photo">Trucada entrant amb foto</string>
+  <string name="notification_incoming_call_with_message">Trucada entrant amb missatge</string>
+  <string name="notification_incoming_call_with_location">Trucada entrant amb ubicació</string>
+  <string name="notification_incoming_call_with_photo_message">Trucada entrant amb foto i missatge</string>
+  <string name="notification_incoming_call_with_photo_location">Trucada entrant amb foto i ubicació</string>
+  <string name="notification_incoming_call_with_message_location">Trucada entrant amb missatge i ubicació</string>
+  <string name="notification_incoming_call_with_photo_message_location">Trucada entrant amb foto, missatge i ubicació</string>
+  <string name="notification_incoming_call_attachments">Trucada entrant amb fitxers adjunts</string>
+  <string name="important_notification_incoming_call">Trucada entrant important</string>
+  <string name="important_notification_incoming_call_with_photo">Trucada entrant important amb foto</string>
+  <string name="important_notification_incoming_call_with_message">Trucada entrant important amb missatge</string>
+  <string name="important_notification_incoming_call_with_location">Trucada entrant important amb ubicació</string>
+  <string name="important_notification_incoming_call_with_photo_message">Trucada entrant important amb foto i missatge</string>
+  <string name="important_notification_incoming_call_with_photo_location">Trucada entrant important amb foto i ubicació</string>
+  <string name="important_notification_incoming_call_with_message_location">Trucada entrant important amb missatge i ubicació</string>
+  <string name="important_notification_incoming_call_with_photo_message_location">Trucada entrant important amb foto, missatge i ubicació</string>
+  <string name="important_notification_incoming_call_attachments">Trucada entrant important amb fitxers adjunts</string>
+  <string name="notification_incoming_work_call">Trucada de feina entrant</string>
+  <string name="notification_incoming_spam_call">Presumpta trucada brossa entrant</string>
+  <string name="notification_requesting_video_call">Sol·licitud de vídeo entrant</string>
+  <string name="notification_action_answer">Respon</string>
+  <string name="notification_action_end_call">Penja</string>
+  <string name="notification_action_answer_video">Vídeo</string>
+  <string name="notification_action_accept">Accepta</string>
+  <string name="notification_action_dismiss">Rebutja</string>
+  <string name="notification_action_speaker_on">Activa l\'altaveu</string>
+  <string name="notification_action_speaker_off">Desactiva l\'altaveu</string>
+  <string name="notification_external_call">Trucada en curs en un altre dispositiu</string>
+  <string name="notification_external_video_call">Videotrucada en curs en un altre dispositiu</string>
+  <string name="notification_take_call">Accepta la trucada</string>
+  <string name="notification_take_video_call">Accepta la videotrucada</string>
+  <string name="incall_error_supp_service_unknown">El servei no és compatible.</string>
+  <string name="goPrivate">passa a privat</string>
+  <string name="manageConferenceLabel">Gestiona la conferència</string>
+  <string name="child_number">mitjançant %s</string>
+  <string name="callFailed_simError">Cap SIM o error de la SIM</string>
+  <string name="conference_caller_disconnect_content_description">Penja</string>
+  <string name="conference_call_name">Conferència</string>
+  <string name="generic_conference_call_name">En una trucada</string>
+  <string name="video_call_wifi_to_lte_handover_toast">S\'està continuant la trucada mitjançant dades mòbils…</string>
+  <string name="video_call_lte_to_wifi_failed_title">No s\'ha pogut canviar a la xarxa Wi-Fi</string>
+  <string name="video_call_lte_to_wifi_failed_message">La videotrucada continuarà a la xarxa mòbil. És possible que s\'hi apliquin càrrecs de dades estàndard.</string>
+  <string name="video_call_lte_to_wifi_failed_do_not_show">No ho tornis a mostrar</string>
+  <string name="bubble_return_to_call">Torna a la trucada</string>
+  <string name="rtt_request_dialog_title">Vols entrar a la trucada RTT?</string>
+  <string name="rtt_request_dialog_details">%1$s vol utilitzar missatges durant la trucada de veu.</string>
+  <string name="rtt_request_dialog_more_information">La funció RTT ofereix assistència als usuaris que són sords, tenen problemes d\'audició o alteracions de la parla, o bé que necessiten un text a banda de la veu.</string>
+  <string name="rtt_button_decline_request">No, gràcies</string>
+  <string name="rtt_button_accept_request">Entra a la trucada RTT</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-cs/strings.xml b/java/com/android/incallui/res/values-cs/strings.xml
index e7d8c6d..0eb57ae 100644
--- a/java/com/android/incallui/res/values-cs/strings.xml
+++ b/java/com/android/incallui/res/values-cs/strings.xml
@@ -1,79 +1,68 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"Telefon"</string>
-    <string name="wait_prompt_str" msgid="3509685348904329594">"Odeslat následující tóny?\n"</string>
-    <string name="pause_prompt_yes" msgid="4642047011233552973">"Ano"</string>
-    <string name="pause_prompt_no" msgid="4691320111774935838">"Ne"</string>
-    <string name="notification_dialing" msgid="9072177265772083826">"Vytáčení"</string>
-    <string name="notification_ongoing_call" msgid="8712641937577776125">"Probíhající hovor"</string>
-    <string name="notification_ongoing_video_call" msgid="6331318021321487769">"Probíhající videohovor"</string>
-    <string name="notification_ongoing_paused_video_call" msgid="709950253594606371">"Probíhající videohovor – video je pozastaveno"</string>
-    <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Probíhající pracovní hovor"</string>
-    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"Probíhající <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
-    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"Příchozí <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
-    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"hovor přes Wi-Fi"</string>
-    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"pracovní hovor přes Wi-Fi"</string>
-    <string name="notification_on_hold" msgid="7141827443379205682">"Přidržený hovor"</string>
-    <string name="notification_incoming_call" msgid="7520580807513849283">"Příchozí hovor"</string>
-    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Příchozí hovor s fotkou"</string>
-    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"Příchozí hovor se zprávou"</string>
-    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"Příchozí hovor s polohou"</string>
-    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"Příchozí hovor s fotkou a zprávou"</string>
-    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"Příchozí hovor s fotkou a polohou"</string>
-    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"Příchozí hovor se zprávou a polohou"</string>
-    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"Příchozí hovor s fotkou, zprávou a polohou"</string>
-    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"Příchozí hovor s přílohami"</string>
-    <string name="important_notification_incoming_call" msgid="2867013954509930989">"Důležitý příchozí hovor"</string>
-    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"Důležitý příchozí hovor s fotkou"</string>
-    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"Důležitý příchozí hovor se zprávou"</string>
-    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"Důležitý příchozí hovor s polohou"</string>
-    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"Důležitý příchozí hovor s fotkou a zprávou"</string>
-    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"Důležitý příchozí hovor s fotkou a polohou"</string>
-    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"Důležitý příchozí hovor se zprávou a polohou"</string>
-    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Důležitý přích. hovor s fotkou, zprávou a polohou"</string>
-    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Důležitý příchozí hovor s přílohami"</string>
-    <string name="notification_incoming_work_call" msgid="5291275092734261918">"Příchozí pracovní hovor"</string>
-    <string name="notification_incoming_spam_call" msgid="7591506944666791937">"U příchozího hovoru máme podezření, že se jedná o spam"</string>
-    <string name="notification_requesting_video_call" msgid="1807679328811515758">"Příchozí žádost o videohovor"</string>
-    <string name="notification_action_answer" msgid="8748275902211192568">"Přijmout"</string>
-    <string name="notification_action_end_call" msgid="7467258454170007765">"Zavěsit"</string>
-    <string name="notification_action_answer_video" msgid="8488108892919917287">"Video"</string>
-    <string name="notification_action_accept" msgid="1272761514200507143">"Přijmout"</string>
-    <string name="notification_action_dismiss" msgid="3128241581632616226">"Odmítnout"</string>
-    <string name="notification_action_speaker_on" msgid="1882659234405596540">"Zapnout reproduktor"</string>
-    <string name="notification_action_speaker_off" msgid="6340085043115533948">"Vypnout reproduktor"</string>
-    <string name="notification_external_call" msgid="2504334597315343920">"Probíhá hovor na jiném zařízení"</string>
-    <string name="notification_external_video_call" msgid="7709394856028436683">"Probíhá videohovor na jiném zařízení"</string>
-    <string name="notification_take_call" msgid="5631659438864492229">"Převést hovor sem"</string>
-    <string name="notification_take_video_call" msgid="4473387503712341390">"Převést videohovor sem"</string>
-    <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"Služba není podporována."</string>
-    <string name="goPrivate" msgid="5269514638004595378">"přepnout na soukromé"</string>
-    <string name="manageConferenceLabel" msgid="3589379023518128318">"Spravovat konferenční hovor"</string>
-    <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"Číslo tísňové linky"</string>
-    <string name="child_number" msgid="3398257437107259682">"pomocí čísla <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
-    <string name="callFailed_simError" msgid="4587775795711340072">"SIM karta chybí nebo nefunguje."</string>
-    <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Ukončit hovor"</string>
-    <string name="conference_call_name" msgid="8189987124611337174">"Konferenční hovor"</string>
-    <string name="generic_conference_call_name" msgid="1546941472424243894">"Probíhá hovor"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Hovor pokračuje přes mobilní data…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Přepnutí na síť Wi-Fi se nezdařilo"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Videohovor zůstane na mobilní síti. Za datový přenos mohou být účtovány standardní poplatky."</string>
-    <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Tuto zprávu příště nezobrazovat"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="wait_prompt_str">Odeslat následující tóny?\n</string>
+  <string name="pause_prompt_yes">Ano</string>
+  <string name="pause_prompt_no">Ne</string>
+  <string name="notification_dialing">Vytáčení</string>
+  <string name="notification_ongoing_call">Probíhající hovor</string>
+  <string name="notification_ongoing_video_call">Probíhající videohovor</string>
+  <string name="notification_ongoing_paused_video_call">Probíhající videohovor – video je pozastaveno</string>
+  <string name="notification_ongoing_work_call">Probíhající pracovní hovor</string>
+  <string name="notification_ongoing_call_wifi_template">Probíhající %1$s</string>
+  <string name="notification_incoming_call_wifi_template">Příchozí %1$s</string>
+  <string name="notification_call_wifi_brand">hovor přes Wi-Fi</string>
+  <string name="notification_call_wifi_work_brand">pracovní hovor přes Wi-Fi</string>
+  <string name="notification_on_hold">Přidržený hovor</string>
+  <string name="notification_incoming_call">Příchozí hovor</string>
+  <string name="notification_incoming_video_call">Příchozí videohovor</string>
+  <string name="notification_incoming_call_mutli_sim">Příchozí hovor přes %1$s</string>
+  <string name="notification_incoming_call_with_photo">Příchozí hovor s fotkou</string>
+  <string name="notification_incoming_call_with_message">Příchozí hovor se zprávou</string>
+  <string name="notification_incoming_call_with_location">Příchozí hovor s polohou</string>
+  <string name="notification_incoming_call_with_photo_message">Příchozí hovor s fotkou a zprávou</string>
+  <string name="notification_incoming_call_with_photo_location">Příchozí hovor s fotkou a polohou</string>
+  <string name="notification_incoming_call_with_message_location">Příchozí hovor se zprávou a polohou</string>
+  <string name="notification_incoming_call_with_photo_message_location">Příchozí hovor s fotkou, zprávou a polohou</string>
+  <string name="notification_incoming_call_attachments">Příchozí hovor s přílohami</string>
+  <string name="important_notification_incoming_call">Důležitý příchozí hovor</string>
+  <string name="important_notification_incoming_call_with_photo">Důležitý příchozí hovor s fotkou</string>
+  <string name="important_notification_incoming_call_with_message">Důležitý příchozí hovor se zprávou</string>
+  <string name="important_notification_incoming_call_with_location">Důležitý příchozí hovor s polohou</string>
+  <string name="important_notification_incoming_call_with_photo_message">Důležitý příchozí hovor s fotkou a zprávou</string>
+  <string name="important_notification_incoming_call_with_photo_location">Důležitý příchozí hovor s fotkou a polohou</string>
+  <string name="important_notification_incoming_call_with_message_location">Důležitý příchozí hovor se zprávou a polohou</string>
+  <string name="important_notification_incoming_call_with_photo_message_location">Důležitý přích. hovor s fotkou, zprávou a polohou</string>
+  <string name="important_notification_incoming_call_attachments">Důležitý příchozí hovor s přílohami</string>
+  <string name="notification_incoming_work_call">Příchozí pracovní hovor</string>
+  <string name="notification_incoming_spam_call">U příchozího hovoru máme podezření, že se jedná o spam</string>
+  <string name="notification_requesting_video_call">Příchozí žádost o videohovor</string>
+  <string name="notification_action_answer">Přijmout</string>
+  <string name="notification_action_end_call">Zavěsit</string>
+  <string name="notification_action_answer_video">Video</string>
+  <string name="notification_action_accept">Přijmout</string>
+  <string name="notification_action_dismiss">Odmítnout</string>
+  <string name="notification_action_speaker_on">Zapnout reproduktor</string>
+  <string name="notification_action_speaker_off">Vypnout reproduktor</string>
+  <string name="notification_external_call">Probíhá hovor na jiném zařízení</string>
+  <string name="notification_external_video_call">Probíhá videohovor na jiném zařízení</string>
+  <string name="notification_take_call">Převést hovor sem</string>
+  <string name="notification_take_video_call">Převést videohovor sem</string>
+  <string name="incall_error_supp_service_unknown">Služba není podporována.</string>
+  <string name="goPrivate">přepnout na soukromé</string>
+  <string name="manageConferenceLabel">Spravovat konferenční hovor</string>
+  <string name="child_number">pomocí čísla %s</string>
+  <string name="callFailed_simError">SIM karta chybí nebo nefunguje.</string>
+  <string name="conference_caller_disconnect_content_description">Ukončit hovor</string>
+  <string name="conference_call_name">Konferenční hovor</string>
+  <string name="generic_conference_call_name">Probíhá hovor</string>
+  <string name="video_call_wifi_to_lte_handover_toast">Hovor pokračuje přes mobilní data…</string>
+  <string name="video_call_lte_to_wifi_failed_title">Přepnutí na síť Wi-Fi se nezdařilo</string>
+  <string name="video_call_lte_to_wifi_failed_message">Videohovor zůstane na mobilní síti. Za datový přenos mohou být účtovány standardní poplatky.</string>
+  <string name="video_call_lte_to_wifi_failed_do_not_show">Tuto zprávu příště nezobrazovat</string>
+  <string name="bubble_return_to_call">Zpět k hovoru</string>
+  <string name="rtt_request_dialog_title">Připojit se k hovoru se zprávami (RTT)?</string>
+  <string name="rtt_request_dialog_details">%1$s chce při hlasovém hovoru posílat zprávy.</string>
+  <string name="rtt_request_dialog_more_information">Funkce SMS během hovoru (RTT) pomáhá volajícím, kteří neslyší, jsou nedoslýchaví, mají řečovou vadu, případně potřebují víc než jen hlas z jiného důvodu.</string>
+  <string name="rtt_button_decline_request">Ne, díky</string>
+  <string name="rtt_button_accept_request">Připojit se k RTT</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-da/strings.xml b/java/com/android/incallui/res/values-da/strings.xml
index ad8af54..3f7e97a 100644
--- a/java/com/android/incallui/res/values-da/strings.xml
+++ b/java/com/android/incallui/res/values-da/strings.xml
@@ -1,79 +1,68 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"Opkald"</string>
-    <string name="wait_prompt_str" msgid="3509685348904329594">"Send følgende toner?\n"</string>
-    <string name="pause_prompt_yes" msgid="4642047011233552973">"Ja"</string>
-    <string name="pause_prompt_no" msgid="4691320111774935838">"Nej"</string>
-    <string name="notification_dialing" msgid="9072177265772083826">"Ringer op"</string>
-    <string name="notification_ongoing_call" msgid="8712641937577776125">"Igangværende opkald"</string>
-    <string name="notification_ongoing_video_call" msgid="6331318021321487769">"Igangværende videoopkald"</string>
-    <string name="notification_ongoing_paused_video_call" msgid="709950253594606371">"Igangværende videoopkald – videoen er sat på pause"</string>
-    <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Igangværende opkald i forbindelse med arbejde"</string>
-    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"Igangværende <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
-    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"Indgående <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
-    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"Wi-Fi-opkald"</string>
-    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"Wi-Fi-opkald i forbindelse med arbejde"</string>
-    <string name="notification_on_hold" msgid="7141827443379205682">"Ventende"</string>
-    <string name="notification_incoming_call" msgid="7520580807513849283">"Indgående opkald"</string>
-    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Indgående opkald med billede"</string>
-    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"Indgående opkald med besked"</string>
-    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"Indgående opkald med placering"</string>
-    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"Indgående opkald med billede og besked"</string>
-    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"Indgående opkald med billede og placering"</string>
-    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"Indgående opkald med besked og placering"</string>
-    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"Indgående opkald med billede, besked og placering"</string>
-    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"Indgående opkald med vedhæftede filer"</string>
-    <string name="important_notification_incoming_call" msgid="2867013954509930989">"Vigtigt indgående opkald"</string>
-    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"Vigtigt indgående opkald med billede"</string>
-    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"Vigtigt indgående opkald med besked"</string>
-    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"Vigtigt indgående opkald med placering"</string>
-    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"Vigtigt indgående opkald med billede og besked"</string>
-    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"Vigtigt indgående opkald med billede og placering"</string>
-    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"Vigtigt indgående opkald med besked og placering"</string>
-    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Vigtigt opkald med billede, besked og placering"</string>
-    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Vigtigt indgående opkald med vedhæftede filer"</string>
-    <string name="notification_incoming_work_call" msgid="5291275092734261918">"Indgående opkald i forbindelse med arbejde"</string>
-    <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Indgående formodet spamopkald"</string>
-    <string name="notification_requesting_video_call" msgid="1807679328811515758">"Indgående videoanmodning"</string>
-    <string name="notification_action_answer" msgid="8748275902211192568">"Svar"</string>
-    <string name="notification_action_end_call" msgid="7467258454170007765">"Læg på"</string>
-    <string name="notification_action_answer_video" msgid="8488108892919917287">"Video"</string>
-    <string name="notification_action_accept" msgid="1272761514200507143">"Besvar"</string>
-    <string name="notification_action_dismiss" msgid="3128241581632616226">"Afvis"</string>
-    <string name="notification_action_speaker_on" msgid="1882659234405596540">"Slå højttaler til"</string>
-    <string name="notification_action_speaker_off" msgid="6340085043115533948">"Slå højttaler fra"</string>
-    <string name="notification_external_call" msgid="2504334597315343920">"Igangværende opkald på en anden enhed"</string>
-    <string name="notification_external_video_call" msgid="7709394856028436683">"Igangværende opkald på en anden enhed"</string>
-    <string name="notification_take_call" msgid="5631659438864492229">"Besvar opkald"</string>
-    <string name="notification_take_video_call" msgid="4473387503712341390">"Besvar videoopkald"</string>
-    <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"Tjenesten er ikke understøttet."</string>
-    <string name="goPrivate" msgid="5269514638004595378">"gør privat"</string>
-    <string name="manageConferenceLabel" msgid="3589379023518128318">"Administrer telefonmøde"</string>
-    <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"Nødnummer"</string>
-    <string name="child_number" msgid="3398257437107259682">"via <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
-    <string name="callFailed_simError" msgid="4587775795711340072">"Der er intet SIM-kort, eller der er SIM-kortfejl"</string>
-    <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Afslut opkald"</string>
-    <string name="conference_call_name" msgid="8189987124611337174">"Telefonmøde"</string>
-    <string name="generic_conference_call_name" msgid="1546941472424243894">"Opkald i gang"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Opkaldet fortsættes med mobildata…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Du kunne ikke skifte til Wi-Fi-netværk"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Videoopkaldet bliver ved med at bruge mobilnetværket. Du skal muligvis betale et standardgebyr for data."</string>
-    <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Vis ikke dette igen"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="wait_prompt_str">Send følgende toner?\n</string>
+  <string name="pause_prompt_yes">Ja</string>
+  <string name="pause_prompt_no">Nej</string>
+  <string name="notification_dialing">Ringer op</string>
+  <string name="notification_ongoing_call">Igangværende opkald</string>
+  <string name="notification_ongoing_video_call">Igangværende videoopkald</string>
+  <string name="notification_ongoing_paused_video_call">Igangværende videoopkald – videoen er sat på pause</string>
+  <string name="notification_ongoing_work_call">Igangværende opkald i forbindelse med arbejde</string>
+  <string name="notification_ongoing_call_wifi_template">Igangværende %1$s</string>
+  <string name="notification_incoming_call_wifi_template">Indgående %1$s</string>
+  <string name="notification_call_wifi_brand">Wi-Fi-opkald</string>
+  <string name="notification_call_wifi_work_brand">Wi-Fi-opkald i forbindelse med arbejde</string>
+  <string name="notification_on_hold">Ventende</string>
+  <string name="notification_incoming_call">Indgående opkald</string>
+  <string name="notification_incoming_video_call">Indgående videoopkald</string>
+  <string name="notification_incoming_call_mutli_sim">Indgående opkald via %1$s</string>
+  <string name="notification_incoming_call_with_photo">Indgående opkald med billede</string>
+  <string name="notification_incoming_call_with_message">Indgående opkald med besked</string>
+  <string name="notification_incoming_call_with_location">Indgående opkald med placering</string>
+  <string name="notification_incoming_call_with_photo_message">Indgående opkald med billede og besked</string>
+  <string name="notification_incoming_call_with_photo_location">Indgående opkald med billede og placering</string>
+  <string name="notification_incoming_call_with_message_location">Indgående opkald med besked og placering</string>
+  <string name="notification_incoming_call_with_photo_message_location">Indgående opkald med billede, besked og placering</string>
+  <string name="notification_incoming_call_attachments">Indgående opkald med vedhæftede filer</string>
+  <string name="important_notification_incoming_call">Vigtigt indgående opkald</string>
+  <string name="important_notification_incoming_call_with_photo">Vigtigt indgående opkald med billede</string>
+  <string name="important_notification_incoming_call_with_message">Vigtigt indgående opkald med besked</string>
+  <string name="important_notification_incoming_call_with_location">Vigtigt indgående opkald med placering</string>
+  <string name="important_notification_incoming_call_with_photo_message">Vigtigt indgående opkald med billede og besked</string>
+  <string name="important_notification_incoming_call_with_photo_location">Vigtigt indgående opkald med billede og placering</string>
+  <string name="important_notification_incoming_call_with_message_location">Vigtigt indgående opkald med besked og placering</string>
+  <string name="important_notification_incoming_call_with_photo_message_location">Vigtigt opkald med billede, besked og placering</string>
+  <string name="important_notification_incoming_call_attachments">Vigtigt indgående opkald med vedhæftede filer</string>
+  <string name="notification_incoming_work_call">Indgående opkald i forbindelse med arbejde</string>
+  <string name="notification_incoming_spam_call">Indgående formodet spamopkald</string>
+  <string name="notification_requesting_video_call">Indgående videoanmodning</string>
+  <string name="notification_action_answer">Svar</string>
+  <string name="notification_action_end_call">Læg på</string>
+  <string name="notification_action_answer_video">Video</string>
+  <string name="notification_action_accept">Besvar</string>
+  <string name="notification_action_dismiss">Afvis</string>
+  <string name="notification_action_speaker_on">Slå højttaler til</string>
+  <string name="notification_action_speaker_off">Slå højttaler fra</string>
+  <string name="notification_external_call">Igangværende opkald på en anden enhed</string>
+  <string name="notification_external_video_call">Igangværende opkald på en anden enhed</string>
+  <string name="notification_take_call">Besvar opkald</string>
+  <string name="notification_take_video_call">Besvar videoopkald</string>
+  <string name="incall_error_supp_service_unknown">Tjenesten er ikke understøttet.</string>
+  <string name="goPrivate">gør privat</string>
+  <string name="manageConferenceLabel">Administrer telefonmøde</string>
+  <string name="child_number">via %s</string>
+  <string name="callFailed_simError">Der er intet SIM-kort, eller der er SIM-kortfejl</string>
+  <string name="conference_caller_disconnect_content_description">Afslut opkald</string>
+  <string name="conference_call_name">Telefonmøde</string>
+  <string name="generic_conference_call_name">Opkald i gang</string>
+  <string name="video_call_wifi_to_lte_handover_toast">Opkaldet fortsættes med mobildata…</string>
+  <string name="video_call_lte_to_wifi_failed_title">Du kunne ikke skifte til Wi-Fi-netværk</string>
+  <string name="video_call_lte_to_wifi_failed_message">Videoopkaldet bliver ved med at bruge mobilnetværket. Du skal muligvis betale et standardgebyr for data.</string>
+  <string name="video_call_lte_to_wifi_failed_do_not_show">Vis ikke dette igen</string>
+  <string name="bubble_return_to_call">Tilbage til opkald</string>
+  <string name="rtt_request_dialog_title">Vil du deltage i RTT-opkaldet?</string>
+  <string name="rtt_request_dialog_details">%1$s vil gerne bruge beskeder i dit taleopkald.</string>
+  <string name="rtt_request_dialog_more_information">RTT hjælper personer, som er døve, hørehæmmede, talehandicappede, eller som har brug for mere end bare tale, med at foretage opkald.</string>
+  <string name="rtt_button_decline_request">Nej tak</string>
+  <string name="rtt_button_accept_request">Deltag i RTT-opkald</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-de/strings.xml b/java/com/android/incallui/res/values-de/strings.xml
index 0129da1..4713882 100644
--- a/java/com/android/incallui/res/values-de/strings.xml
+++ b/java/com/android/incallui/res/values-de/strings.xml
@@ -1,79 +1,68 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"Telefon"</string>
-    <string name="wait_prompt_str" msgid="3509685348904329594">"Folgende Töne senden?\n"</string>
-    <string name="pause_prompt_yes" msgid="4642047011233552973">"Ja"</string>
-    <string name="pause_prompt_no" msgid="4691320111774935838">"Nein"</string>
-    <string name="notification_dialing" msgid="9072177265772083826">"Rufaufbau"</string>
-    <string name="notification_ongoing_call" msgid="8712641937577776125">"Aktueller Anruf"</string>
-    <string name="notification_ongoing_video_call" msgid="6331318021321487769">"Aktiver Videoanruf"</string>
-    <string name="notification_ongoing_paused_video_call" msgid="709950253594606371">"Aktiver Videoanruf – Video angehalten"</string>
-    <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Aktueller geschäftlicher Anruf"</string>
-    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"Aktiver <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
-    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"Eingehender <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
-    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"WLAN-Anruf"</string>
-    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"geschäftlicher WLAN-Anruf"</string>
-    <string name="notification_on_hold" msgid="7141827443379205682">"Gehaltener Anruf"</string>
-    <string name="notification_incoming_call" msgid="7520580807513849283">"Eingehender Anruf"</string>
-    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Eingehender Anruf mit Foto"</string>
-    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"Eingehender Anruf mit Nachricht"</string>
-    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"Eingehender Anruf mit Standort"</string>
-    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"Eingehender Anruf mit Foto und Nachricht"</string>
-    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"Eingehender Anruf mit Foto und Standort"</string>
-    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"Eingehender Anruf mit Nachricht und Standort"</string>
-    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"Eingehender Anruf mit Foto, Nachricht und Standort"</string>
-    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"Eingehender Anruf mit Anhängen"</string>
-    <string name="important_notification_incoming_call" msgid="2867013954509930989">"Wichtiger eingehender Anruf"</string>
-    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"Wichtiger eingehender Anruf mit Foto"</string>
-    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"Wichtiger eingehender Anruf mit Nachricht"</string>
-    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"Wichtiger eingehender Anruf mit Standort"</string>
-    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"Wichtiger eingehender Anruf mit Foto und Nachricht"</string>
-    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"Wichtiger eingehender Anruf mit Foto und Standort"</string>
-    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"Wichtiger eingehender Anruf mit Nachricht und Standort"</string>
-    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Wichtiger eingehender Anruf mit Foto, Nachricht und Standort"</string>
-    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Wichtiger eingehender Anruf mit Anhängen"</string>
-    <string name="notification_incoming_work_call" msgid="5291275092734261918">"Eingehender geschäftlicher Anruf"</string>
-    <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Verdacht auf eingehenden Spam-Anruf"</string>
-    <string name="notification_requesting_video_call" msgid="1807679328811515758">"Eingehende Videoanfrage"</string>
-    <string name="notification_action_answer" msgid="8748275902211192568">"Annehmen"</string>
-    <string name="notification_action_end_call" msgid="7467258454170007765">"Beenden"</string>
-    <string name="notification_action_answer_video" msgid="8488108892919917287">"Videoanruf"</string>
-    <string name="notification_action_accept" msgid="1272761514200507143">"Akzeptieren"</string>
-    <string name="notification_action_dismiss" msgid="3128241581632616226">"Ablehnen"</string>
-    <string name="notification_action_speaker_on" msgid="1882659234405596540">"Lautsprecher einschalten"</string>
-    <string name="notification_action_speaker_off" msgid="6340085043115533948">"Lautsprecher ausschalten"</string>
-    <string name="notification_external_call" msgid="2504334597315343920">"Aktiver Anruf auf anderem Gerät"</string>
-    <string name="notification_external_video_call" msgid="7709394856028436683">"Aktiver Videoanruf auf anderem Gerät"</string>
-    <string name="notification_take_call" msgid="5631659438864492229">"Anruf übernehmen"</string>
-    <string name="notification_take_video_call" msgid="4473387503712341390">"Videoanruf übernehmen"</string>
-    <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"Dienst wird nicht unterstützt."</string>
-    <string name="goPrivate" msgid="5269514638004595378">"privat sprechen"</string>
-    <string name="manageConferenceLabel" msgid="3589379023518128318">"Telefonkonferenz verwalten"</string>
-    <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"Notrufnummer"</string>
-    <string name="child_number" msgid="3398257437107259682">"über <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
-    <string name="callFailed_simError" msgid="4587775795711340072">"Keine SIM-Karte oder SIM-Kartenfehler"</string>
-    <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Anruf beenden"</string>
-    <string name="conference_call_name" msgid="8189987124611337174">"Telefonkonferenz"</string>
-    <string name="generic_conference_call_name" msgid="1546941472424243894">"Anruf"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Anruf wird über mobile Daten fortgesetzt…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Wechseln zu WLAN nicht möglich"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Der Videoanruf erfolgt weiter über das Mobilfunknetz. Es können Standardgebühren für die Datenübertragung anfallen."</string>
-    <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Meldung nicht mehr anzeigen"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="wait_prompt_str">Folgende Töne senden?\n</string>
+  <string name="pause_prompt_yes">Ja</string>
+  <string name="pause_prompt_no">Nein</string>
+  <string name="notification_dialing">Rufaufbau</string>
+  <string name="notification_ongoing_call">Aktueller Anruf</string>
+  <string name="notification_ongoing_video_call">Aktiver Videoanruf</string>
+  <string name="notification_ongoing_paused_video_call">Aktiver Videoanruf – Video angehalten</string>
+  <string name="notification_ongoing_work_call">Aktueller geschäftlicher Anruf</string>
+  <string name="notification_ongoing_call_wifi_template">Aktiver %1$s</string>
+  <string name="notification_incoming_call_wifi_template">Eingehender %1$s</string>
+  <string name="notification_call_wifi_brand">WLAN-Anruf</string>
+  <string name="notification_call_wifi_work_brand">geschäftlicher WLAN-Anruf</string>
+  <string name="notification_on_hold">Gehaltener Anruf</string>
+  <string name="notification_incoming_call">Eingehender Anruf</string>
+  <string name="notification_incoming_video_call">Eingehender Videoanruf</string>
+  <string name="notification_incoming_call_mutli_sim">Eingehender Anruf über %1$s</string>
+  <string name="notification_incoming_call_with_photo">Eingehender Anruf mit Foto</string>
+  <string name="notification_incoming_call_with_message">Eingehender Anruf mit Nachricht</string>
+  <string name="notification_incoming_call_with_location">Eingehender Anruf mit Standort</string>
+  <string name="notification_incoming_call_with_photo_message">Eingehender Anruf mit Foto und Nachricht</string>
+  <string name="notification_incoming_call_with_photo_location">Eingehender Anruf mit Foto und Standort</string>
+  <string name="notification_incoming_call_with_message_location">Eingehender Anruf mit Nachricht und Standort</string>
+  <string name="notification_incoming_call_with_photo_message_location">Eingehender Anruf mit Foto, Nachricht und Standort</string>
+  <string name="notification_incoming_call_attachments">Eingehender Anruf mit Anhängen</string>
+  <string name="important_notification_incoming_call">Wichtiger eingehender Anruf</string>
+  <string name="important_notification_incoming_call_with_photo">Wichtiger eingehender Anruf mit Foto</string>
+  <string name="important_notification_incoming_call_with_message">Wichtiger eingehender Anruf mit Nachricht</string>
+  <string name="important_notification_incoming_call_with_location">Wichtiger eingehender Anruf mit Standort</string>
+  <string name="important_notification_incoming_call_with_photo_message">Wichtiger eingehender Anruf mit Foto und Nachricht</string>
+  <string name="important_notification_incoming_call_with_photo_location">Wichtiger eingehender Anruf mit Foto und Standort</string>
+  <string name="important_notification_incoming_call_with_message_location">Wichtiger eingehender Anruf mit Nachricht und Standort</string>
+  <string name="important_notification_incoming_call_with_photo_message_location">Wichtiger eingehender Anruf mit Foto, Nachricht und Standort</string>
+  <string name="important_notification_incoming_call_attachments">Wichtiger eingehender Anruf mit Anhängen</string>
+  <string name="notification_incoming_work_call">Eingehender geschäftlicher Anruf</string>
+  <string name="notification_incoming_spam_call">Verdacht auf eingehenden Spam-Anruf</string>
+  <string name="notification_requesting_video_call">Eingehende Videoanfrage</string>
+  <string name="notification_action_answer">Annehmen</string>
+  <string name="notification_action_end_call">Beenden</string>
+  <string name="notification_action_answer_video">Videoanruf</string>
+  <string name="notification_action_accept">Akzeptieren</string>
+  <string name="notification_action_dismiss">Ablehnen</string>
+  <string name="notification_action_speaker_on">Lautsprecher einschalten</string>
+  <string name="notification_action_speaker_off">Lautsprecher ausschalten</string>
+  <string name="notification_external_call">Aktiver Anruf auf anderem Gerät</string>
+  <string name="notification_external_video_call">Aktiver Videoanruf auf anderem Gerät</string>
+  <string name="notification_take_call">Anruf übernehmen</string>
+  <string name="notification_take_video_call">Videoanruf übernehmen</string>
+  <string name="incall_error_supp_service_unknown">Dienst wird nicht unterstützt.</string>
+  <string name="goPrivate">privat sprechen</string>
+  <string name="manageConferenceLabel">Telefonkonferenz verwalten</string>
+  <string name="child_number">über %s</string>
+  <string name="callFailed_simError">Keine SIM-Karte oder SIM-Kartenfehler</string>
+  <string name="conference_caller_disconnect_content_description">Anruf beenden</string>
+  <string name="conference_call_name">Telefonkonferenz</string>
+  <string name="generic_conference_call_name">Anruf</string>
+  <string name="video_call_wifi_to_lte_handover_toast">Anruf wird über mobile Daten fortgesetzt…</string>
+  <string name="video_call_lte_to_wifi_failed_title">Wechseln zu WLAN nicht möglich</string>
+  <string name="video_call_lte_to_wifi_failed_message">Der Videoanruf erfolgt weiter über das Mobilfunknetz. Es können Standardgebühren für die Datenübertragung anfallen.</string>
+  <string name="video_call_lte_to_wifi_failed_do_not_show">Meldung nicht mehr anzeigen</string>
+  <string name="bubble_return_to_call">Zurück zum Anruf</string>
+  <string name="rtt_request_dialog_title">An RTT-Anruf teilnehmen?</string>
+  <string name="rtt_request_dialog_details">%1$s möchte innerhalb des Sprachanrufs Textnachrichten nutzen.</string>
+  <string name="rtt_request_dialog_more_information">Echtzeittext (Real-Time Text, RTT) dient als Unterstützung für Anrufer, die gehörlos, schwerhörig oder sprachgeschädigt sind oder zusätzlich zur gesprochenen Sprache weitere Informationen benötigen.</string>
+  <string name="rtt_button_decline_request">Nein danke</string>
+  <string name="rtt_button_accept_request">RTT verwenden</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-el/strings.xml b/java/com/android/incallui/res/values-el/strings.xml
index 6093d93..10687f5 100644
--- a/java/com/android/incallui/res/values-el/strings.xml
+++ b/java/com/android/incallui/res/values-el/strings.xml
@@ -1,79 +1,68 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"Τηλέφωνο"</string>
-    <string name="wait_prompt_str" msgid="3509685348904329594">"Αποστολή των παρακάτω τόνων;\n"</string>
-    <string name="pause_prompt_yes" msgid="4642047011233552973">"Ναι"</string>
-    <string name="pause_prompt_no" msgid="4691320111774935838">"Όχι"</string>
-    <string name="notification_dialing" msgid="9072177265772083826">"Κλήση"</string>
-    <string name="notification_ongoing_call" msgid="8712641937577776125">"Κλήση σε εξέλιξη"</string>
-    <string name="notification_ongoing_video_call" msgid="6331318021321487769">"Βιντεοκλήση σε εξέλιξη"</string>
-    <string name="notification_ongoing_paused_video_call" msgid="709950253594606371">"Βιντεοκλήση σε εξέλιξη - βίντεο σε παύση"</string>
-    <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Κλήση εργασίας σε εξέλιξη"</string>
-    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"Σε εξέλιξη <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
-    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"Εισερχόμενη <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
-    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"κλήση μέσω Wi-Fi"</string>
-    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"κλήση εργασίας μέσω Wi-Fi"</string>
-    <string name="notification_on_hold" msgid="7141827443379205682">"Σε αναμονή"</string>
-    <string name="notification_incoming_call" msgid="7520580807513849283">"Εισερχόμενη κλήση"</string>
-    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Εισερχόμενη κλήση με φωτογραφία"</string>
-    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"Εισερχόμενη κλήση με μήνυμα"</string>
-    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"Εισερχόμενη κλήση με τοποθεσία"</string>
-    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"Εισερχόμενη κλήση με φωτογραφία και μήνυμα"</string>
-    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"Εισερχόμενη κλήση με φωτογραφία και τοποθεσία"</string>
-    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"Εισερχόμενη κλήση με μήνυμα και τοποθεσία"</string>
-    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"Εισερχόμενη κλήση με φωτο, μήνυμα και τοποθεσία"</string>
-    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"Εισερχόμενη κλήση με συνημμένα"</string>
-    <string name="important_notification_incoming_call" msgid="2867013954509930989">"Σημαντική εισερχόμενη κλήση"</string>
-    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"Σημαντική εισερχόμενη κλήση με φωτογραφία"</string>
-    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"Σημαντική εισερχόμενη κλήση με μήνυμα"</string>
-    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"Σημαντική εισερχόμενη κλήση με τοποθεσία"</string>
-    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"Σημαντική εισερχόμενη κλήση με φωτο και μήνυμα"</string>
-    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"Σημαντική εισερχόμενη κλήση με φωτο και τοποθεσία"</string>
-    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"Σημαντική εισερχόμ. κλήση με μήνυμα και τοποθεσία"</string>
-    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Σημαντική εισερχ. κλήση με φωτο, μήνυμα, τοποθεσία"</string>
-    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Σημαντική εισερχόμενη κλήση με συνημμένα"</string>
-    <string name="notification_incoming_work_call" msgid="5291275092734261918">"Εισερχόμενη κλήση εργασίας"</string>
-    <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Πιθανώς ανεπιθύμητη εισερχόμενη κλήση"</string>
-    <string name="notification_requesting_video_call" msgid="1807679328811515758">"Αίτημα εισερχόμενου βίντεο"</string>
-    <string name="notification_action_answer" msgid="8748275902211192568">"Απάντηση"</string>
-    <string name="notification_action_end_call" msgid="7467258454170007765">"Τερματισμός κλήσης"</string>
-    <string name="notification_action_answer_video" msgid="8488108892919917287">"Βίντεο"</string>
-    <string name="notification_action_accept" msgid="1272761514200507143">"Αποδοχή"</string>
-    <string name="notification_action_dismiss" msgid="3128241581632616226">"Απόρριψη"</string>
-    <string name="notification_action_speaker_on" msgid="1882659234405596540">"Ενεργοποίηση ηχείου"</string>
-    <string name="notification_action_speaker_off" msgid="6340085043115533948">"Απενεργοποίηση ηχείου"</string>
-    <string name="notification_external_call" msgid="2504334597315343920">"Κλήση σε εξέλιξη σε άλλη συσκευή"</string>
-    <string name="notification_external_video_call" msgid="7709394856028436683">"Τρέχουσα βιντεοκλήση σε άλλη συσκευή"</string>
-    <string name="notification_take_call" msgid="5631659438864492229">"Λήψη κλήσης"</string>
-    <string name="notification_take_video_call" msgid="4473387503712341390">"Λήψη βιντεοκλήσης"</string>
-    <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"Η υπηρεσία δεν υποστηρίζεται."</string>
-    <string name="goPrivate" msgid="5269514638004595378">"ιδιωτική χρήση"</string>
-    <string name="manageConferenceLabel" msgid="3589379023518128318">"Διαχείριση κλήσης συνδιάσκεψης"</string>
-    <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"Αριθμός έκτακτης ανάγκης"</string>
-    <string name="child_number" msgid="3398257437107259682">"μέσω <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
-    <string name="callFailed_simError" msgid="4587775795711340072">"Δεν υπάρχει κάρτα SIM ή σφάλμα κάρτας SIM"</string>
-    <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Τερματισμός κλήσης"</string>
-    <string name="conference_call_name" msgid="8189987124611337174">"Κλήση συνδιάσκεψης"</string>
-    <string name="generic_conference_call_name" msgid="1546941472424243894">"Σε κλήση"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Συνέχιση κλήσης με χρήση δεδομένων κινητής τηλεφωνίας…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Δεν ήταν δυνατή η εναλλαγή σε δίκτυο Wi-Fi"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Η βιντεοκλήση θα παραμείνει σε δίκτυο δεδομένων κινητής τηλεφωνίας; Ενδέχεται να ισχύουν βασικές χρεώσεις δεδομένων."</string>
-    <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Να μην εμφανιστεί ξανά αυτό"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="wait_prompt_str">Αποστολή των παρακάτω τόνων;\n</string>
+  <string name="pause_prompt_yes">Ναι</string>
+  <string name="pause_prompt_no">Όχι</string>
+  <string name="notification_dialing">Κλήση</string>
+  <string name="notification_ongoing_call">Κλήση σε εξέλιξη</string>
+  <string name="notification_ongoing_video_call">Βιντεοκλήση σε εξέλιξη</string>
+  <string name="notification_ongoing_paused_video_call">Βιντεοκλήση σε εξέλιξη - βίντεο σε παύση</string>
+  <string name="notification_ongoing_work_call">Κλήση εργασίας σε εξέλιξη</string>
+  <string name="notification_ongoing_call_wifi_template">Σε εξέλιξη %1$s</string>
+  <string name="notification_incoming_call_wifi_template">Εισερχόμενη %1$s</string>
+  <string name="notification_call_wifi_brand">κλήση μέσω Wi-Fi</string>
+  <string name="notification_call_wifi_work_brand">κλήση εργασίας μέσω Wi-Fi</string>
+  <string name="notification_on_hold">Σε αναμονή</string>
+  <string name="notification_incoming_call">Εισερχόμενη κλήση</string>
+  <string name="notification_incoming_video_call">Εισερχόμενη βιντεοκλήση</string>
+  <string name="notification_incoming_call_mutli_sim">Εισερχόμενη κλήση μέσω %1$s</string>
+  <string name="notification_incoming_call_with_photo">Εισερχόμενη κλήση με φωτογραφία</string>
+  <string name="notification_incoming_call_with_message">Εισερχόμενη κλήση με μήνυμα</string>
+  <string name="notification_incoming_call_with_location">Εισερχόμενη κλήση με τοποθεσία</string>
+  <string name="notification_incoming_call_with_photo_message">Εισερχόμενη κλήση με φωτογραφία και μήνυμα</string>
+  <string name="notification_incoming_call_with_photo_location">Εισερχόμενη κλήση με φωτογραφία και τοποθεσία</string>
+  <string name="notification_incoming_call_with_message_location">Εισερχόμενη κλήση με μήνυμα και τοποθεσία</string>
+  <string name="notification_incoming_call_with_photo_message_location">Εισερχόμενη κλήση με φωτο, μήνυμα και τοποθεσία</string>
+  <string name="notification_incoming_call_attachments">Εισερχόμενη κλήση με συνημμένα</string>
+  <string name="important_notification_incoming_call">Σημαντική εισερχόμενη κλήση</string>
+  <string name="important_notification_incoming_call_with_photo">Σημαντική εισερχόμενη κλήση με φωτογραφία</string>
+  <string name="important_notification_incoming_call_with_message">Σημαντική εισερχόμενη κλήση με μήνυμα</string>
+  <string name="important_notification_incoming_call_with_location">Σημαντική εισερχόμενη κλήση με τοποθεσία</string>
+  <string name="important_notification_incoming_call_with_photo_message">Σημαντική εισερχόμενη κλήση με φωτο και μήνυμα</string>
+  <string name="important_notification_incoming_call_with_photo_location">Σημαντική εισερχόμενη κλήση με φωτο και τοποθεσία</string>
+  <string name="important_notification_incoming_call_with_message_location">Σημαντική εισερχόμ. κλήση με μήνυμα και τοποθεσία</string>
+  <string name="important_notification_incoming_call_with_photo_message_location">Σημαντική εισερχ. κλήση με φωτο, μήνυμα, τοποθεσία</string>
+  <string name="important_notification_incoming_call_attachments">Σημαντική εισερχόμενη κλήση με συνημμένα</string>
+  <string name="notification_incoming_work_call">Εισερχόμενη κλήση εργασίας</string>
+  <string name="notification_incoming_spam_call">Πιθανώς ανεπιθύμητη εισερχόμενη κλήση</string>
+  <string name="notification_requesting_video_call">Αίτημα εισερχόμενου βίντεο</string>
+  <string name="notification_action_answer">Απάντηση</string>
+  <string name="notification_action_end_call">Τερματισμός κλήσης</string>
+  <string name="notification_action_answer_video">Βίντεο</string>
+  <string name="notification_action_accept">Αποδοχή</string>
+  <string name="notification_action_dismiss">Απόρριψη</string>
+  <string name="notification_action_speaker_on">Ενεργοποίηση ηχείου</string>
+  <string name="notification_action_speaker_off">Απενεργοποίηση ηχείου</string>
+  <string name="notification_external_call">Κλήση σε εξέλιξη σε άλλη συσκευή</string>
+  <string name="notification_external_video_call">Τρέχουσα βιντεοκλήση σε άλλη συσκευή</string>
+  <string name="notification_take_call">Λήψη κλήσης</string>
+  <string name="notification_take_video_call">Λήψη βιντεοκλήσης</string>
+  <string name="incall_error_supp_service_unknown">Η υπηρεσία δεν υποστηρίζεται.</string>
+  <string name="goPrivate">ιδιωτική χρήση</string>
+  <string name="manageConferenceLabel">Διαχείριση κλήσης συνδιάσκεψης</string>
+  <string name="child_number">μέσω %s</string>
+  <string name="callFailed_simError">Δεν υπάρχει κάρτα SIM ή σφάλμα κάρτας SIM</string>
+  <string name="conference_caller_disconnect_content_description">Τερματισμός κλήσης</string>
+  <string name="conference_call_name">Κλήση συνδιάσκεψης</string>
+  <string name="generic_conference_call_name">Σε κλήση</string>
+  <string name="video_call_wifi_to_lte_handover_toast">Συνέχιση κλήσης με χρήση δεδομένων κινητής τηλεφωνίας…</string>
+  <string name="video_call_lte_to_wifi_failed_title">Δεν ήταν δυνατή η εναλλαγή σε δίκτυο Wi-Fi</string>
+  <string name="video_call_lte_to_wifi_failed_message">Η βιντεοκλήση θα παραμείνει σε δίκτυο δεδομένων κινητής τηλεφωνίας; Ενδέχεται να ισχύουν βασικές χρεώσεις δεδομένων.</string>
+  <string name="video_call_lte_to_wifi_failed_do_not_show">Να μην εμφανιστεί ξανά αυτό</string>
+  <string name="bubble_return_to_call">Επιστροφή στην κλήση</string>
+  <string name="rtt_request_dialog_title">Συμμετοχή σε κλήση RTT;</string>
+  <string name="rtt_request_dialog_details">Ο χρήστης %1$s θέλει να χρησιμοποιήσει ανταλλαγή μηνυμάτων κατά τη διάρκεια της φωνητικής κλήσης.</string>
+  <string name="rtt_request_dialog_more_information">Το RTT υποβοηθά καλούντες που είναι κωφοί ή αντιμετωπίζουν προβλήματα ακοής ή ομιλίας, καθώς και όσους χρειάζονται κάτι περισσότερο από απλή φωνητική επικοινωνία.</string>
+  <string name="rtt_button_decline_request">Όχι, ευχαριστώ</string>
+  <string name="rtt_button_accept_request">Συμμετοχή σε RTT</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-en-rAU/strings.xml b/java/com/android/incallui/res/values-en-rAU/strings.xml
index 5ce76d6..8fc9c42 100644
--- a/java/com/android/incallui/res/values-en-rAU/strings.xml
+++ b/java/com/android/incallui/res/values-en-rAU/strings.xml
@@ -1,79 +1,68 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"Phone"</string>
-    <string name="wait_prompt_str" msgid="3509685348904329594">"Send the following tones?\n"</string>
-    <string name="pause_prompt_yes" msgid="4642047011233552973">"Yes"</string>
-    <string name="pause_prompt_no" msgid="4691320111774935838">"No"</string>
-    <string name="notification_dialing" msgid="9072177265772083826">"Dialling"</string>
-    <string name="notification_ongoing_call" msgid="8712641937577776125">"On-going call"</string>
-    <string name="notification_ongoing_video_call" msgid="6331318021321487769">"Ongoing video call"</string>
-    <string name="notification_ongoing_paused_video_call" msgid="709950253594606371">"Ongoing video call – video paused"</string>
-    <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Ongoing work call"</string>
-    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"Ongoing <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
-    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"Incoming <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
-    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"Wi‑Fi call"</string>
-    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"Wi‑Fi work call"</string>
-    <string name="notification_on_hold" msgid="7141827443379205682">"On hold"</string>
-    <string name="notification_incoming_call" msgid="7520580807513849283">"Incoming call"</string>
-    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Incoming call with photo"</string>
-    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"Incoming call with message"</string>
-    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"Incoming call with location"</string>
-    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"Incoming call with photo and message"</string>
-    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"Incoming call with photo and location"</string>
-    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"Incoming call with message and location"</string>
-    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"Incoming call with photo, message and location"</string>
-    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"Incoming call with attachments"</string>
-    <string name="important_notification_incoming_call" msgid="2867013954509930989">"Important incoming call"</string>
-    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"Important incoming call with photo"</string>
-    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"Important incoming call with message"</string>
-    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"Important incoming call with location"</string>
-    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"Important incoming call with photo and message"</string>
-    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"Important incoming call with photo and location"</string>
-    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"Important incoming call with message and location"</string>
-    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Important call with photo, message and location"</string>
-    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Important incoming call with attachments"</string>
-    <string name="notification_incoming_work_call" msgid="5291275092734261918">"Incoming work call"</string>
-    <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Incoming suspected spam call"</string>
-    <string name="notification_requesting_video_call" msgid="1807679328811515758">"Incoming video request"</string>
-    <string name="notification_action_answer" msgid="8748275902211192568">"Answer"</string>
-    <string name="notification_action_end_call" msgid="7467258454170007765">"Hang up"</string>
-    <string name="notification_action_answer_video" msgid="8488108892919917287">"Video"</string>
-    <string name="notification_action_accept" msgid="1272761514200507143">"Accept"</string>
-    <string name="notification_action_dismiss" msgid="3128241581632616226">"Decline"</string>
-    <string name="notification_action_speaker_on" msgid="1882659234405596540">"Turn speaker on"</string>
-    <string name="notification_action_speaker_off" msgid="6340085043115533948">"Turn speaker off"</string>
-    <string name="notification_external_call" msgid="2504334597315343920">"Ongoing call on another device"</string>
-    <string name="notification_external_video_call" msgid="7709394856028436683">"Ongoing video call on another device"</string>
-    <string name="notification_take_call" msgid="5631659438864492229">"Take call"</string>
-    <string name="notification_take_video_call" msgid="4473387503712341390">"Take video call"</string>
-    <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"Service not supported."</string>
-    <string name="goPrivate" msgid="5269514638004595378">"go private"</string>
-    <string name="manageConferenceLabel" msgid="3589379023518128318">"Manage conference call"</string>
-    <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"Emergency number"</string>
-    <string name="child_number" msgid="3398257437107259682">"via <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
-    <string name="callFailed_simError" msgid="4587775795711340072">"No SIM or SIM error"</string>
-    <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"End call"</string>
-    <string name="conference_call_name" msgid="8189987124611337174">"Conference call"</string>
-    <string name="generic_conference_call_name" msgid="1546941472424243894">"On a call"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Continuing call using mobile data…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Couldn\'t switch to Wi‑Fi network"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Video call will remain on the mobile network. Standard data charges may apply."</string>
-    <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Do not show this again"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="wait_prompt_str">Send the following tones?\n</string>
+  <string name="pause_prompt_yes">Yes</string>
+  <string name="pause_prompt_no">No</string>
+  <string name="notification_dialing">Dialling</string>
+  <string name="notification_ongoing_call">On-going call</string>
+  <string name="notification_ongoing_video_call">Ongoing video call</string>
+  <string name="notification_ongoing_paused_video_call">Ongoing video call – video paused</string>
+  <string name="notification_ongoing_work_call">Ongoing work call</string>
+  <string name="notification_ongoing_call_wifi_template">Ongoing %1$s</string>
+  <string name="notification_incoming_call_wifi_template">Incoming %1$s</string>
+  <string name="notification_call_wifi_brand">Wi‑Fi call</string>
+  <string name="notification_call_wifi_work_brand">Wi‑Fi work call</string>
+  <string name="notification_on_hold">On hold</string>
+  <string name="notification_incoming_call">Incoming call</string>
+  <string name="notification_incoming_video_call">Incoming video call</string>
+  <string name="notification_incoming_call_mutli_sim">Incoming call via %1$s</string>
+  <string name="notification_incoming_call_with_photo">Incoming call with photo</string>
+  <string name="notification_incoming_call_with_message">Incoming call with message</string>
+  <string name="notification_incoming_call_with_location">Incoming call with location</string>
+  <string name="notification_incoming_call_with_photo_message">Incoming call with photo and message</string>
+  <string name="notification_incoming_call_with_photo_location">Incoming call with photo and location</string>
+  <string name="notification_incoming_call_with_message_location">Incoming call with message and location</string>
+  <string name="notification_incoming_call_with_photo_message_location">Incoming call with photo, message and location</string>
+  <string name="notification_incoming_call_attachments">Incoming call with attachments</string>
+  <string name="important_notification_incoming_call">Important incoming call</string>
+  <string name="important_notification_incoming_call_with_photo">Important incoming call with photo</string>
+  <string name="important_notification_incoming_call_with_message">Important incoming call with message</string>
+  <string name="important_notification_incoming_call_with_location">Important incoming call with location</string>
+  <string name="important_notification_incoming_call_with_photo_message">Important incoming call with photo and message</string>
+  <string name="important_notification_incoming_call_with_photo_location">Important incoming call with photo and location</string>
+  <string name="important_notification_incoming_call_with_message_location">Important incoming call with message and location</string>
+  <string name="important_notification_incoming_call_with_photo_message_location">Important call with photo, message and location</string>
+  <string name="important_notification_incoming_call_attachments">Important incoming call with attachments</string>
+  <string name="notification_incoming_work_call">Incoming work call</string>
+  <string name="notification_incoming_spam_call">Incoming suspected spam call</string>
+  <string name="notification_requesting_video_call">Incoming video request</string>
+  <string name="notification_action_answer">Answer</string>
+  <string name="notification_action_end_call">Hang up</string>
+  <string name="notification_action_answer_video">Video</string>
+  <string name="notification_action_accept">Accept</string>
+  <string name="notification_action_dismiss">Decline</string>
+  <string name="notification_action_speaker_on">Turn speaker on</string>
+  <string name="notification_action_speaker_off">Turn speaker off</string>
+  <string name="notification_external_call">Ongoing call on another device</string>
+  <string name="notification_external_video_call">Ongoing video call on another device</string>
+  <string name="notification_take_call">Take call</string>
+  <string name="notification_take_video_call">Take video call</string>
+  <string name="incall_error_supp_service_unknown">Service not supported.</string>
+  <string name="goPrivate">go private</string>
+  <string name="manageConferenceLabel">Manage conference call</string>
+  <string name="child_number">via %s</string>
+  <string name="callFailed_simError">No SIM or SIM error</string>
+  <string name="conference_caller_disconnect_content_description">End call</string>
+  <string name="conference_call_name">Conference call</string>
+  <string name="generic_conference_call_name">On a call</string>
+  <string name="video_call_wifi_to_lte_handover_toast">Continuing call using mobile data…</string>
+  <string name="video_call_lte_to_wifi_failed_title">Couldn\'t switch to Wi‑Fi network</string>
+  <string name="video_call_lte_to_wifi_failed_message">Video call will remain on the mobile network. Standard data charges may apply.</string>
+  <string name="video_call_lte_to_wifi_failed_do_not_show">Do not show this again</string>
+  <string name="bubble_return_to_call">Back to call</string>
+  <string name="rtt_request_dialog_title">Join RTT call?</string>
+  <string name="rtt_request_dialog_details">%1$s wants to use messaging within your voice call.</string>
+  <string name="rtt_request_dialog_more_information">RTT assists callers who are deaf, hard of hearing, have a speech disability or need more than voice alone.</string>
+  <string name="rtt_button_decline_request">No, thanks</string>
+  <string name="rtt_button_accept_request">Join RTT</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-en-rGB/strings.xml b/java/com/android/incallui/res/values-en-rGB/strings.xml
index 5ce76d6..8fc9c42 100644
--- a/java/com/android/incallui/res/values-en-rGB/strings.xml
+++ b/java/com/android/incallui/res/values-en-rGB/strings.xml
@@ -1,79 +1,68 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"Phone"</string>
-    <string name="wait_prompt_str" msgid="3509685348904329594">"Send the following tones?\n"</string>
-    <string name="pause_prompt_yes" msgid="4642047011233552973">"Yes"</string>
-    <string name="pause_prompt_no" msgid="4691320111774935838">"No"</string>
-    <string name="notification_dialing" msgid="9072177265772083826">"Dialling"</string>
-    <string name="notification_ongoing_call" msgid="8712641937577776125">"On-going call"</string>
-    <string name="notification_ongoing_video_call" msgid="6331318021321487769">"Ongoing video call"</string>
-    <string name="notification_ongoing_paused_video_call" msgid="709950253594606371">"Ongoing video call – video paused"</string>
-    <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Ongoing work call"</string>
-    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"Ongoing <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
-    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"Incoming <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
-    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"Wi‑Fi call"</string>
-    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"Wi‑Fi work call"</string>
-    <string name="notification_on_hold" msgid="7141827443379205682">"On hold"</string>
-    <string name="notification_incoming_call" msgid="7520580807513849283">"Incoming call"</string>
-    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Incoming call with photo"</string>
-    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"Incoming call with message"</string>
-    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"Incoming call with location"</string>
-    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"Incoming call with photo and message"</string>
-    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"Incoming call with photo and location"</string>
-    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"Incoming call with message and location"</string>
-    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"Incoming call with photo, message and location"</string>
-    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"Incoming call with attachments"</string>
-    <string name="important_notification_incoming_call" msgid="2867013954509930989">"Important incoming call"</string>
-    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"Important incoming call with photo"</string>
-    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"Important incoming call with message"</string>
-    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"Important incoming call with location"</string>
-    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"Important incoming call with photo and message"</string>
-    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"Important incoming call with photo and location"</string>
-    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"Important incoming call with message and location"</string>
-    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Important call with photo, message and location"</string>
-    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Important incoming call with attachments"</string>
-    <string name="notification_incoming_work_call" msgid="5291275092734261918">"Incoming work call"</string>
-    <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Incoming suspected spam call"</string>
-    <string name="notification_requesting_video_call" msgid="1807679328811515758">"Incoming video request"</string>
-    <string name="notification_action_answer" msgid="8748275902211192568">"Answer"</string>
-    <string name="notification_action_end_call" msgid="7467258454170007765">"Hang up"</string>
-    <string name="notification_action_answer_video" msgid="8488108892919917287">"Video"</string>
-    <string name="notification_action_accept" msgid="1272761514200507143">"Accept"</string>
-    <string name="notification_action_dismiss" msgid="3128241581632616226">"Decline"</string>
-    <string name="notification_action_speaker_on" msgid="1882659234405596540">"Turn speaker on"</string>
-    <string name="notification_action_speaker_off" msgid="6340085043115533948">"Turn speaker off"</string>
-    <string name="notification_external_call" msgid="2504334597315343920">"Ongoing call on another device"</string>
-    <string name="notification_external_video_call" msgid="7709394856028436683">"Ongoing video call on another device"</string>
-    <string name="notification_take_call" msgid="5631659438864492229">"Take call"</string>
-    <string name="notification_take_video_call" msgid="4473387503712341390">"Take video call"</string>
-    <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"Service not supported."</string>
-    <string name="goPrivate" msgid="5269514638004595378">"go private"</string>
-    <string name="manageConferenceLabel" msgid="3589379023518128318">"Manage conference call"</string>
-    <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"Emergency number"</string>
-    <string name="child_number" msgid="3398257437107259682">"via <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
-    <string name="callFailed_simError" msgid="4587775795711340072">"No SIM or SIM error"</string>
-    <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"End call"</string>
-    <string name="conference_call_name" msgid="8189987124611337174">"Conference call"</string>
-    <string name="generic_conference_call_name" msgid="1546941472424243894">"On a call"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Continuing call using mobile data…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Couldn\'t switch to Wi‑Fi network"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Video call will remain on the mobile network. Standard data charges may apply."</string>
-    <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Do not show this again"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="wait_prompt_str">Send the following tones?\n</string>
+  <string name="pause_prompt_yes">Yes</string>
+  <string name="pause_prompt_no">No</string>
+  <string name="notification_dialing">Dialling</string>
+  <string name="notification_ongoing_call">On-going call</string>
+  <string name="notification_ongoing_video_call">Ongoing video call</string>
+  <string name="notification_ongoing_paused_video_call">Ongoing video call – video paused</string>
+  <string name="notification_ongoing_work_call">Ongoing work call</string>
+  <string name="notification_ongoing_call_wifi_template">Ongoing %1$s</string>
+  <string name="notification_incoming_call_wifi_template">Incoming %1$s</string>
+  <string name="notification_call_wifi_brand">Wi‑Fi call</string>
+  <string name="notification_call_wifi_work_brand">Wi‑Fi work call</string>
+  <string name="notification_on_hold">On hold</string>
+  <string name="notification_incoming_call">Incoming call</string>
+  <string name="notification_incoming_video_call">Incoming video call</string>
+  <string name="notification_incoming_call_mutli_sim">Incoming call via %1$s</string>
+  <string name="notification_incoming_call_with_photo">Incoming call with photo</string>
+  <string name="notification_incoming_call_with_message">Incoming call with message</string>
+  <string name="notification_incoming_call_with_location">Incoming call with location</string>
+  <string name="notification_incoming_call_with_photo_message">Incoming call with photo and message</string>
+  <string name="notification_incoming_call_with_photo_location">Incoming call with photo and location</string>
+  <string name="notification_incoming_call_with_message_location">Incoming call with message and location</string>
+  <string name="notification_incoming_call_with_photo_message_location">Incoming call with photo, message and location</string>
+  <string name="notification_incoming_call_attachments">Incoming call with attachments</string>
+  <string name="important_notification_incoming_call">Important incoming call</string>
+  <string name="important_notification_incoming_call_with_photo">Important incoming call with photo</string>
+  <string name="important_notification_incoming_call_with_message">Important incoming call with message</string>
+  <string name="important_notification_incoming_call_with_location">Important incoming call with location</string>
+  <string name="important_notification_incoming_call_with_photo_message">Important incoming call with photo and message</string>
+  <string name="important_notification_incoming_call_with_photo_location">Important incoming call with photo and location</string>
+  <string name="important_notification_incoming_call_with_message_location">Important incoming call with message and location</string>
+  <string name="important_notification_incoming_call_with_photo_message_location">Important call with photo, message and location</string>
+  <string name="important_notification_incoming_call_attachments">Important incoming call with attachments</string>
+  <string name="notification_incoming_work_call">Incoming work call</string>
+  <string name="notification_incoming_spam_call">Incoming suspected spam call</string>
+  <string name="notification_requesting_video_call">Incoming video request</string>
+  <string name="notification_action_answer">Answer</string>
+  <string name="notification_action_end_call">Hang up</string>
+  <string name="notification_action_answer_video">Video</string>
+  <string name="notification_action_accept">Accept</string>
+  <string name="notification_action_dismiss">Decline</string>
+  <string name="notification_action_speaker_on">Turn speaker on</string>
+  <string name="notification_action_speaker_off">Turn speaker off</string>
+  <string name="notification_external_call">Ongoing call on another device</string>
+  <string name="notification_external_video_call">Ongoing video call on another device</string>
+  <string name="notification_take_call">Take call</string>
+  <string name="notification_take_video_call">Take video call</string>
+  <string name="incall_error_supp_service_unknown">Service not supported.</string>
+  <string name="goPrivate">go private</string>
+  <string name="manageConferenceLabel">Manage conference call</string>
+  <string name="child_number">via %s</string>
+  <string name="callFailed_simError">No SIM or SIM error</string>
+  <string name="conference_caller_disconnect_content_description">End call</string>
+  <string name="conference_call_name">Conference call</string>
+  <string name="generic_conference_call_name">On a call</string>
+  <string name="video_call_wifi_to_lte_handover_toast">Continuing call using mobile data…</string>
+  <string name="video_call_lte_to_wifi_failed_title">Couldn\'t switch to Wi‑Fi network</string>
+  <string name="video_call_lte_to_wifi_failed_message">Video call will remain on the mobile network. Standard data charges may apply.</string>
+  <string name="video_call_lte_to_wifi_failed_do_not_show">Do not show this again</string>
+  <string name="bubble_return_to_call">Back to call</string>
+  <string name="rtt_request_dialog_title">Join RTT call?</string>
+  <string name="rtt_request_dialog_details">%1$s wants to use messaging within your voice call.</string>
+  <string name="rtt_request_dialog_more_information">RTT assists callers who are deaf, hard of hearing, have a speech disability or need more than voice alone.</string>
+  <string name="rtt_button_decline_request">No, thanks</string>
+  <string name="rtt_button_accept_request">Join RTT</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-en-rIN/strings.xml b/java/com/android/incallui/res/values-en-rIN/strings.xml
index 5ce76d6..8fc9c42 100644
--- a/java/com/android/incallui/res/values-en-rIN/strings.xml
+++ b/java/com/android/incallui/res/values-en-rIN/strings.xml
@@ -1,79 +1,68 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"Phone"</string>
-    <string name="wait_prompt_str" msgid="3509685348904329594">"Send the following tones?\n"</string>
-    <string name="pause_prompt_yes" msgid="4642047011233552973">"Yes"</string>
-    <string name="pause_prompt_no" msgid="4691320111774935838">"No"</string>
-    <string name="notification_dialing" msgid="9072177265772083826">"Dialling"</string>
-    <string name="notification_ongoing_call" msgid="8712641937577776125">"On-going call"</string>
-    <string name="notification_ongoing_video_call" msgid="6331318021321487769">"Ongoing video call"</string>
-    <string name="notification_ongoing_paused_video_call" msgid="709950253594606371">"Ongoing video call – video paused"</string>
-    <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Ongoing work call"</string>
-    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"Ongoing <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
-    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"Incoming <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
-    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"Wi‑Fi call"</string>
-    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"Wi‑Fi work call"</string>
-    <string name="notification_on_hold" msgid="7141827443379205682">"On hold"</string>
-    <string name="notification_incoming_call" msgid="7520580807513849283">"Incoming call"</string>
-    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Incoming call with photo"</string>
-    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"Incoming call with message"</string>
-    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"Incoming call with location"</string>
-    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"Incoming call with photo and message"</string>
-    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"Incoming call with photo and location"</string>
-    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"Incoming call with message and location"</string>
-    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"Incoming call with photo, message and location"</string>
-    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"Incoming call with attachments"</string>
-    <string name="important_notification_incoming_call" msgid="2867013954509930989">"Important incoming call"</string>
-    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"Important incoming call with photo"</string>
-    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"Important incoming call with message"</string>
-    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"Important incoming call with location"</string>
-    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"Important incoming call with photo and message"</string>
-    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"Important incoming call with photo and location"</string>
-    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"Important incoming call with message and location"</string>
-    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Important call with photo, message and location"</string>
-    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Important incoming call with attachments"</string>
-    <string name="notification_incoming_work_call" msgid="5291275092734261918">"Incoming work call"</string>
-    <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Incoming suspected spam call"</string>
-    <string name="notification_requesting_video_call" msgid="1807679328811515758">"Incoming video request"</string>
-    <string name="notification_action_answer" msgid="8748275902211192568">"Answer"</string>
-    <string name="notification_action_end_call" msgid="7467258454170007765">"Hang up"</string>
-    <string name="notification_action_answer_video" msgid="8488108892919917287">"Video"</string>
-    <string name="notification_action_accept" msgid="1272761514200507143">"Accept"</string>
-    <string name="notification_action_dismiss" msgid="3128241581632616226">"Decline"</string>
-    <string name="notification_action_speaker_on" msgid="1882659234405596540">"Turn speaker on"</string>
-    <string name="notification_action_speaker_off" msgid="6340085043115533948">"Turn speaker off"</string>
-    <string name="notification_external_call" msgid="2504334597315343920">"Ongoing call on another device"</string>
-    <string name="notification_external_video_call" msgid="7709394856028436683">"Ongoing video call on another device"</string>
-    <string name="notification_take_call" msgid="5631659438864492229">"Take call"</string>
-    <string name="notification_take_video_call" msgid="4473387503712341390">"Take video call"</string>
-    <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"Service not supported."</string>
-    <string name="goPrivate" msgid="5269514638004595378">"go private"</string>
-    <string name="manageConferenceLabel" msgid="3589379023518128318">"Manage conference call"</string>
-    <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"Emergency number"</string>
-    <string name="child_number" msgid="3398257437107259682">"via <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
-    <string name="callFailed_simError" msgid="4587775795711340072">"No SIM or SIM error"</string>
-    <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"End call"</string>
-    <string name="conference_call_name" msgid="8189987124611337174">"Conference call"</string>
-    <string name="generic_conference_call_name" msgid="1546941472424243894">"On a call"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Continuing call using mobile data…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Couldn\'t switch to Wi‑Fi network"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Video call will remain on the mobile network. Standard data charges may apply."</string>
-    <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Do not show this again"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="wait_prompt_str">Send the following tones?\n</string>
+  <string name="pause_prompt_yes">Yes</string>
+  <string name="pause_prompt_no">No</string>
+  <string name="notification_dialing">Dialling</string>
+  <string name="notification_ongoing_call">On-going call</string>
+  <string name="notification_ongoing_video_call">Ongoing video call</string>
+  <string name="notification_ongoing_paused_video_call">Ongoing video call – video paused</string>
+  <string name="notification_ongoing_work_call">Ongoing work call</string>
+  <string name="notification_ongoing_call_wifi_template">Ongoing %1$s</string>
+  <string name="notification_incoming_call_wifi_template">Incoming %1$s</string>
+  <string name="notification_call_wifi_brand">Wi‑Fi call</string>
+  <string name="notification_call_wifi_work_brand">Wi‑Fi work call</string>
+  <string name="notification_on_hold">On hold</string>
+  <string name="notification_incoming_call">Incoming call</string>
+  <string name="notification_incoming_video_call">Incoming video call</string>
+  <string name="notification_incoming_call_mutli_sim">Incoming call via %1$s</string>
+  <string name="notification_incoming_call_with_photo">Incoming call with photo</string>
+  <string name="notification_incoming_call_with_message">Incoming call with message</string>
+  <string name="notification_incoming_call_with_location">Incoming call with location</string>
+  <string name="notification_incoming_call_with_photo_message">Incoming call with photo and message</string>
+  <string name="notification_incoming_call_with_photo_location">Incoming call with photo and location</string>
+  <string name="notification_incoming_call_with_message_location">Incoming call with message and location</string>
+  <string name="notification_incoming_call_with_photo_message_location">Incoming call with photo, message and location</string>
+  <string name="notification_incoming_call_attachments">Incoming call with attachments</string>
+  <string name="important_notification_incoming_call">Important incoming call</string>
+  <string name="important_notification_incoming_call_with_photo">Important incoming call with photo</string>
+  <string name="important_notification_incoming_call_with_message">Important incoming call with message</string>
+  <string name="important_notification_incoming_call_with_location">Important incoming call with location</string>
+  <string name="important_notification_incoming_call_with_photo_message">Important incoming call with photo and message</string>
+  <string name="important_notification_incoming_call_with_photo_location">Important incoming call with photo and location</string>
+  <string name="important_notification_incoming_call_with_message_location">Important incoming call with message and location</string>
+  <string name="important_notification_incoming_call_with_photo_message_location">Important call with photo, message and location</string>
+  <string name="important_notification_incoming_call_attachments">Important incoming call with attachments</string>
+  <string name="notification_incoming_work_call">Incoming work call</string>
+  <string name="notification_incoming_spam_call">Incoming suspected spam call</string>
+  <string name="notification_requesting_video_call">Incoming video request</string>
+  <string name="notification_action_answer">Answer</string>
+  <string name="notification_action_end_call">Hang up</string>
+  <string name="notification_action_answer_video">Video</string>
+  <string name="notification_action_accept">Accept</string>
+  <string name="notification_action_dismiss">Decline</string>
+  <string name="notification_action_speaker_on">Turn speaker on</string>
+  <string name="notification_action_speaker_off">Turn speaker off</string>
+  <string name="notification_external_call">Ongoing call on another device</string>
+  <string name="notification_external_video_call">Ongoing video call on another device</string>
+  <string name="notification_take_call">Take call</string>
+  <string name="notification_take_video_call">Take video call</string>
+  <string name="incall_error_supp_service_unknown">Service not supported.</string>
+  <string name="goPrivate">go private</string>
+  <string name="manageConferenceLabel">Manage conference call</string>
+  <string name="child_number">via %s</string>
+  <string name="callFailed_simError">No SIM or SIM error</string>
+  <string name="conference_caller_disconnect_content_description">End call</string>
+  <string name="conference_call_name">Conference call</string>
+  <string name="generic_conference_call_name">On a call</string>
+  <string name="video_call_wifi_to_lte_handover_toast">Continuing call using mobile data…</string>
+  <string name="video_call_lte_to_wifi_failed_title">Couldn\'t switch to Wi‑Fi network</string>
+  <string name="video_call_lte_to_wifi_failed_message">Video call will remain on the mobile network. Standard data charges may apply.</string>
+  <string name="video_call_lte_to_wifi_failed_do_not_show">Do not show this again</string>
+  <string name="bubble_return_to_call">Back to call</string>
+  <string name="rtt_request_dialog_title">Join RTT call?</string>
+  <string name="rtt_request_dialog_details">%1$s wants to use messaging within your voice call.</string>
+  <string name="rtt_request_dialog_more_information">RTT assists callers who are deaf, hard of hearing, have a speech disability or need more than voice alone.</string>
+  <string name="rtt_button_decline_request">No, thanks</string>
+  <string name="rtt_button_accept_request">Join RTT</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-es-rUS/strings.xml b/java/com/android/incallui/res/values-es-rUS/strings.xml
index e83e53c..27218c0 100644
--- a/java/com/android/incallui/res/values-es-rUS/strings.xml
+++ b/java/com/android/incallui/res/values-es-rUS/strings.xml
@@ -1,79 +1,68 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"Teléfono"</string>
-    <string name="wait_prompt_str" msgid="3509685348904329594">"¿Deseas enviar los siguientes tonos?\n"</string>
-    <string name="pause_prompt_yes" msgid="4642047011233552973">"Sí"</string>
-    <string name="pause_prompt_no" msgid="4691320111774935838">"No"</string>
-    <string name="notification_dialing" msgid="9072177265772083826">"Marcando"</string>
-    <string name="notification_ongoing_call" msgid="8712641937577776125">"Llamada en curso"</string>
-    <string name="notification_ongoing_video_call" msgid="6331318021321487769">"Videollamada en curso"</string>
-    <string name="notification_ongoing_paused_video_call" msgid="709950253594606371">"Videollamada en curso; video detenido"</string>
-    <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Llamada de trabajo en curso"</string>
-    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"<xliff:g id="BRAND_NAME">%1$s</xliff:g> en curso"</string>
-    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"<xliff:g id="BRAND_NAME">%1$s</xliff:g> entrante"</string>
-    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"Llamar con Wi-Fi"</string>
-    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"Llamada de trabajo con Wi‑Fi"</string>
-    <string name="notification_on_hold" msgid="7141827443379205682">"En espera"</string>
-    <string name="notification_incoming_call" msgid="7520580807513849283">"Llamada entrante"</string>
-    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Llamada entrante con foto"</string>
-    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"Llamada entrante con mensaje"</string>
-    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"Llamada entrante con ubicación"</string>
-    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"Llamada entrante con foto y mensaje"</string>
-    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"Llamada entrante con foto y ubicación"</string>
-    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"Llamada entrante con mensaje y ubicación"</string>
-    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"Llamada entrante con foto, mensaje y ubicación"</string>
-    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"Llamada entrante con archivos adjuntos"</string>
-    <string name="important_notification_incoming_call" msgid="2867013954509930989">"Llamada entrante importante"</string>
-    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"Llamada entrante importante con foto"</string>
-    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"Llamada entrante importante con mensaje"</string>
-    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"Llamada entrante importante con ubicación"</string>
-    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"Llamada entrante importante con foto y mensaje"</string>
-    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"Llamada entrante importante con foto y ubicación"</string>
-    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"Llamada importante con mensaje y ubicación"</string>
-    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Llamada importante con foto, mensaje y ubicación"</string>
-    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Llamada entrante importante con archivos adjuntos"</string>
-    <string name="notification_incoming_work_call" msgid="5291275092734261918">"Llamada de trabajo entrante"</string>
-    <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Posible llamada entrante de spam"</string>
-    <string name="notification_requesting_video_call" msgid="1807679328811515758">"Solicitud de videollamada entrante"</string>
-    <string name="notification_action_answer" msgid="8748275902211192568">"Responder"</string>
-    <string name="notification_action_end_call" msgid="7467258454170007765">"Colgar"</string>
-    <string name="notification_action_answer_video" msgid="8488108892919917287">"Video:"</string>
-    <string name="notification_action_accept" msgid="1272761514200507143">"Aceptar"</string>
-    <string name="notification_action_dismiss" msgid="3128241581632616226">"Rechazar"</string>
-    <string name="notification_action_speaker_on" msgid="1882659234405596540">"Activar bocina"</string>
-    <string name="notification_action_speaker_off" msgid="6340085043115533948">"Desactivar bocina"</string>
-    <string name="notification_external_call" msgid="2504334597315343920">"Llamada en curso en otro dispositivo"</string>
-    <string name="notification_external_video_call" msgid="7709394856028436683">"Videollamada en curso en otro dispositivo"</string>
-    <string name="notification_take_call" msgid="5631659438864492229">"Atender llamada"</string>
-    <string name="notification_take_video_call" msgid="4473387503712341390">"Atender videollamada"</string>
-    <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"Servicio no admitido"</string>
-    <string name="goPrivate" msgid="5269514638004595378">"pasar a modo privado"</string>
-    <string name="manageConferenceLabel" msgid="3589379023518128318">"Administrar conferencia"</string>
-    <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"Número de emergencia"</string>
-    <string name="child_number" msgid="3398257437107259682">"a través del <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
-    <string name="callFailed_simError" msgid="4587775795711340072">"No se encuentra la tarjeta SIM o se produjo un error relacionado con ella."</string>
-    <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Finalizar llamada"</string>
-    <string name="conference_call_name" msgid="8189987124611337174">"Conferencia"</string>
-    <string name="generic_conference_call_name" msgid="1546941472424243894">"En llamada"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Continuando la llamada con datos móviles…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"No se pudo cambiar a la red Wi-Fi"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"La videollamada permanecerá en la red móvil. Es posible que se te cobren cargos estándar por el uso de datos."</string>
-    <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"No volver a mostrar esto"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="wait_prompt_str">¿Deseas enviar los siguientes tonos?\n</string>
+  <string name="pause_prompt_yes">Sí</string>
+  <string name="pause_prompt_no">No</string>
+  <string name="notification_dialing">Marcando</string>
+  <string name="notification_ongoing_call">Llamada en curso</string>
+  <string name="notification_ongoing_video_call">Videollamada en curso</string>
+  <string name="notification_ongoing_paused_video_call">Videollamada en curso; video detenido</string>
+  <string name="notification_ongoing_work_call">Llamada de trabajo en curso</string>
+  <string name="notification_ongoing_call_wifi_template">%1$s en curso</string>
+  <string name="notification_incoming_call_wifi_template">%1$s entrante</string>
+  <string name="notification_call_wifi_brand">Llamada por Wi-Fi</string>
+  <string name="notification_call_wifi_work_brand">Llamada de trabajo con Wi‑Fi</string>
+  <string name="notification_on_hold">En espera</string>
+  <string name="notification_incoming_call">Llamada entrante</string>
+  <string name="notification_incoming_video_call">Videollamada entrante</string>
+  <string name="notification_incoming_call_mutli_sim">Llamada entrante por %1$s</string>
+  <string name="notification_incoming_call_with_photo">Llamada entrante con foto</string>
+  <string name="notification_incoming_call_with_message">Llamada entrante con mensaje</string>
+  <string name="notification_incoming_call_with_location">Llamada entrante con ubicación</string>
+  <string name="notification_incoming_call_with_photo_message">Llamada entrante con foto y mensaje</string>
+  <string name="notification_incoming_call_with_photo_location">Llamada entrante con foto y ubicación</string>
+  <string name="notification_incoming_call_with_message_location">Llamada entrante con mensaje y ubicación</string>
+  <string name="notification_incoming_call_with_photo_message_location">Llamada entrante con foto, mensaje y ubicación</string>
+  <string name="notification_incoming_call_attachments">Llamada entrante con archivos adjuntos</string>
+  <string name="important_notification_incoming_call">Llamada entrante importante</string>
+  <string name="important_notification_incoming_call_with_photo">Llamada entrante importante con foto</string>
+  <string name="important_notification_incoming_call_with_message">Llamada entrante importante con mensaje</string>
+  <string name="important_notification_incoming_call_with_location">Llamada entrante importante con ubicación</string>
+  <string name="important_notification_incoming_call_with_photo_message">Llamada entrante importante con foto y mensaje</string>
+  <string name="important_notification_incoming_call_with_photo_location">Llamada entrante importante con foto y ubicación</string>
+  <string name="important_notification_incoming_call_with_message_location">Llamada importante con mensaje y ubicación</string>
+  <string name="important_notification_incoming_call_with_photo_message_location">Llamada importante con foto, mensaje y ubicación</string>
+  <string name="important_notification_incoming_call_attachments">Llamada entrante importante con archivos adjuntos</string>
+  <string name="notification_incoming_work_call">Llamada de trabajo entrante</string>
+  <string name="notification_incoming_spam_call">Posible llamada entrante de spam</string>
+  <string name="notification_requesting_video_call">Solicitud de videollamada entrante</string>
+  <string name="notification_action_answer">Responder</string>
+  <string name="notification_action_end_call">Colgar</string>
+  <string name="notification_action_answer_video">Video:</string>
+  <string name="notification_action_accept">Aceptar</string>
+  <string name="notification_action_dismiss">Rechazar</string>
+  <string name="notification_action_speaker_on">Activar altavoz</string>
+  <string name="notification_action_speaker_off">Desactivar altavoz</string>
+  <string name="notification_external_call">Llamada en curso en otro dispositivo</string>
+  <string name="notification_external_video_call">Videollamada en curso en otro dispositivo</string>
+  <string name="notification_take_call">Atender llamada</string>
+  <string name="notification_take_video_call">Atender videollamada</string>
+  <string name="incall_error_supp_service_unknown">Servicio no admitido</string>
+  <string name="goPrivate">pasar a modo privado</string>
+  <string name="manageConferenceLabel">Administrar conferencia</string>
+  <string name="child_number">a través del %s</string>
+  <string name="callFailed_simError">No se encuentra la tarjeta SIM o se produjo un error relacionado con ella.</string>
+  <string name="conference_caller_disconnect_content_description">Finalizar llamada</string>
+  <string name="conference_call_name">Conferencia</string>
+  <string name="generic_conference_call_name">En llamada</string>
+  <string name="video_call_wifi_to_lte_handover_toast">Continuar llamada con datos móviles…</string>
+  <string name="video_call_lte_to_wifi_failed_title">No se pudo cambiar a la red Wi-Fi</string>
+  <string name="video_call_lte_to_wifi_failed_message">La videollamada permanecerá en la red móvil. Es posible que se te cobren cargos estándar por el uso de datos.</string>
+  <string name="video_call_lte_to_wifi_failed_do_not_show">No volver a mostrar esto</string>
+  <string name="bubble_return_to_call">Volver a la llamada</string>
+  <string name="rtt_request_dialog_title">¿Quieres unirte a la llamada de RTT?</string>
+  <string name="rtt_request_dialog_details">%1$s quiere usar mensajes en tu llamada de voz.</string>
+  <string name="rtt_request_dialog_more_information">El RTT brinda asistencia a las personas sordas o hipoacúsicas, que tienen algún trastorno del habla o necesitan una transcripción además de la voz.</string>
+  <string name="rtt_button_decline_request">No, gracias</string>
+  <string name="rtt_button_accept_request">Unirse a RTT</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-es/strings.xml b/java/com/android/incallui/res/values-es/strings.xml
index a07d936..e186c57 100644
--- a/java/com/android/incallui/res/values-es/strings.xml
+++ b/java/com/android/incallui/res/values-es/strings.xml
@@ -1,79 +1,68 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"Teléfono"</string>
-    <string name="wait_prompt_str" msgid="3509685348904329594">"¿Quieres enviar los siguientes tonos?\n"</string>
-    <string name="pause_prompt_yes" msgid="4642047011233552973">"Sí"</string>
-    <string name="pause_prompt_no" msgid="4691320111774935838">"No"</string>
-    <string name="notification_dialing" msgid="9072177265772083826">"Llamando"</string>
-    <string name="notification_ongoing_call" msgid="8712641937577776125">"Llamada en curso"</string>
-    <string name="notification_ongoing_video_call" msgid="6331318021321487769">"Videollamada en curso"</string>
-    <string name="notification_ongoing_paused_video_call" msgid="709950253594606371">"Videollamada en curso: vídeo en pausa"</string>
-    <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Llamada de trabajo en curso"</string>
-    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"<xliff:g id="BRAND_NAME">%1$s</xliff:g> en curso"</string>
-    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"<xliff:g id="BRAND_NAME">%1$s</xliff:g> entrante"</string>
-    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"Llamada Wi‑Fi"</string>
-    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"Llamada de trabajo por Wi‑Fi"</string>
-    <string name="notification_on_hold" msgid="7141827443379205682">"En espera"</string>
-    <string name="notification_incoming_call" msgid="7520580807513849283">"Llamada entrante"</string>
-    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Llamada entrante con foto"</string>
-    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"Llamada entrante con mensaje"</string>
-    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"Llamada entrante con ubicación"</string>
-    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"Llamada entrante con foto y mensaje"</string>
-    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"Llamada entrante con foto y ubicación"</string>
-    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"Llamada entrante con mensaje y ubicación"</string>
-    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"Llamada entrante con foto, mensaje y ubicación"</string>
-    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"Llamada entrante con archivos adjuntos"</string>
-    <string name="important_notification_incoming_call" msgid="2867013954509930989">"Llamada entrante importante"</string>
-    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"Llamada entrante importante con foto"</string>
-    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"Llamada entrante importante con mensaje"</string>
-    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"Llamada entrante importante con ubicación"</string>
-    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"Llamada entrante importante con foto y mensaje"</string>
-    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"Llamada entrante importante con foto y ubicación"</string>
-    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"Llamada importante con mensaje y ubicación"</string>
-    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Llamada importante con foto, mensaje y ubicación"</string>
-    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Llamada entrante importante con archivos adjuntos"</string>
-    <string name="notification_incoming_work_call" msgid="5291275092734261918">"Llamada de trabajo entrante"</string>
-    <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Llamada entrante sospechosa de spam"</string>
-    <string name="notification_requesting_video_call" msgid="1807679328811515758">"Solicitud de videollamada entrante"</string>
-    <string name="notification_action_answer" msgid="8748275902211192568">"Responder"</string>
-    <string name="notification_action_end_call" msgid="7467258454170007765">"Colgar"</string>
-    <string name="notification_action_answer_video" msgid="8488108892919917287">"Vídeo"</string>
-    <string name="notification_action_accept" msgid="1272761514200507143">"Aceptar"</string>
-    <string name="notification_action_dismiss" msgid="3128241581632616226">"Rechazar"</string>
-    <string name="notification_action_speaker_on" msgid="1882659234405596540">"Activar el altavoz"</string>
-    <string name="notification_action_speaker_off" msgid="6340085043115533948">"Desactivar el altavoz"</string>
-    <string name="notification_external_call" msgid="2504334597315343920">"Llamada activa en otro dispositivo"</string>
-    <string name="notification_external_video_call" msgid="7709394856028436683">"Videollamada activa en otro dispositivo"</string>
-    <string name="notification_take_call" msgid="5631659438864492229">"Atender llamada"</string>
-    <string name="notification_take_video_call" msgid="4473387503712341390">"Atender videollamada"</string>
-    <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"Servicio no admitido."</string>
-    <string name="goPrivate" msgid="5269514638004595378">"llamada privada"</string>
-    <string name="manageConferenceLabel" msgid="3589379023518128318">"Administrar conferencia"</string>
-    <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"Número de emergencia"</string>
-    <string name="child_number" msgid="3398257437107259682">"a través de <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
-    <string name="callFailed_simError" msgid="4587775795711340072">"No hay tarjeta SIM o se ha producido un error relacionado con la misma."</string>
-    <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Finalizar llamada"</string>
-    <string name="conference_call_name" msgid="8189987124611337174">"Conferencia telefónica"</string>
-    <string name="generic_conference_call_name" msgid="1546941472424243894">"En una llamada"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Continuando la llamada con los datos móviles…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"No se ha podido cambiar a la red Wi-Fi"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"La videollamada seguirá a través de la red móvil. Es posible que se apliquen cargos por el uso de datos."</string>
-    <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"No volver a mostrar"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="wait_prompt_str">¿Quieres enviar los siguientes tonos?\n</string>
+  <string name="pause_prompt_yes">Sí</string>
+  <string name="pause_prompt_no">No</string>
+  <string name="notification_dialing">Llamando</string>
+  <string name="notification_ongoing_call">Llamada en curso</string>
+  <string name="notification_ongoing_video_call">Videollamada en curso</string>
+  <string name="notification_ongoing_paused_video_call">Videollamada en curso: vídeo en pausa</string>
+  <string name="notification_ongoing_work_call">Llamada de trabajo en curso</string>
+  <string name="notification_ongoing_call_wifi_template">%1$s en curso</string>
+  <string name="notification_incoming_call_wifi_template">%1$s entrante</string>
+  <string name="notification_call_wifi_brand">Llamada Wi‑Fi</string>
+  <string name="notification_call_wifi_work_brand">Llamada de trabajo por Wi‑Fi</string>
+  <string name="notification_on_hold">En espera</string>
+  <string name="notification_incoming_call">Llamada entrante</string>
+  <string name="notification_incoming_video_call">Videollamada entrante</string>
+  <string name="notification_incoming_call_mutli_sim">Llamada entrante a través de %1$s</string>
+  <string name="notification_incoming_call_with_photo">Llamada entrante con foto</string>
+  <string name="notification_incoming_call_with_message">Llamada entrante con mensaje</string>
+  <string name="notification_incoming_call_with_location">Llamada entrante con ubicación</string>
+  <string name="notification_incoming_call_with_photo_message">Llamada entrante con foto y mensaje</string>
+  <string name="notification_incoming_call_with_photo_location">Llamada entrante con foto y ubicación</string>
+  <string name="notification_incoming_call_with_message_location">Llamada entrante con mensaje y ubicación</string>
+  <string name="notification_incoming_call_with_photo_message_location">Llamada entrante con foto, mensaje y ubicación</string>
+  <string name="notification_incoming_call_attachments">Llamada entrante con archivos adjuntos</string>
+  <string name="important_notification_incoming_call">Llamada entrante importante</string>
+  <string name="important_notification_incoming_call_with_photo">Llamada entrante importante con foto</string>
+  <string name="important_notification_incoming_call_with_message">Llamada entrante importante con mensaje</string>
+  <string name="important_notification_incoming_call_with_location">Llamada entrante importante con ubicación</string>
+  <string name="important_notification_incoming_call_with_photo_message">Llamada entrante importante con foto y mensaje</string>
+  <string name="important_notification_incoming_call_with_photo_location">Llamada entrante importante con foto y ubicación</string>
+  <string name="important_notification_incoming_call_with_message_location">Llamada importante con mensaje y ubicación</string>
+  <string name="important_notification_incoming_call_with_photo_message_location">Llamada importante con foto, mensaje y ubicación</string>
+  <string name="important_notification_incoming_call_attachments">Llamada entrante importante con archivos adjuntos</string>
+  <string name="notification_incoming_work_call">Llamada de trabajo entrante</string>
+  <string name="notification_incoming_spam_call">Llamada entrante sospechosa de spam</string>
+  <string name="notification_requesting_video_call">Solicitud de videollamada entrante</string>
+  <string name="notification_action_answer">Responder</string>
+  <string name="notification_action_end_call">Colgar</string>
+  <string name="notification_action_answer_video">Vídeo</string>
+  <string name="notification_action_accept">Aceptar</string>
+  <string name="notification_action_dismiss">Rechazar</string>
+  <string name="notification_action_speaker_on">Activar el altavoz</string>
+  <string name="notification_action_speaker_off">Desactivar el altavoz</string>
+  <string name="notification_external_call">Llamada activa en otro dispositivo</string>
+  <string name="notification_external_video_call">Videollamada activa en otro dispositivo</string>
+  <string name="notification_take_call">Atender llamada</string>
+  <string name="notification_take_video_call">Atender videollamada</string>
+  <string name="incall_error_supp_service_unknown">Servicio no admitido.</string>
+  <string name="goPrivate">llamada privada</string>
+  <string name="manageConferenceLabel">Administrar conferencia</string>
+  <string name="child_number">a través de %s</string>
+  <string name="callFailed_simError">No hay tarjeta SIM o se ha producido un error relacionado con la misma.</string>
+  <string name="conference_caller_disconnect_content_description">Finalizar llamada</string>
+  <string name="conference_call_name">Conferencia telefónica</string>
+  <string name="generic_conference_call_name">En una llamada</string>
+  <string name="video_call_wifi_to_lte_handover_toast">Continuando la llamada con los datos móviles…</string>
+  <string name="video_call_lte_to_wifi_failed_title">No se ha podido cambiar a la red Wi-Fi</string>
+  <string name="video_call_lte_to_wifi_failed_message">La videollamada seguirá a través de la red móvil. Es posible que se apliquen cargos por el uso de datos.</string>
+  <string name="video_call_lte_to_wifi_failed_do_not_show">No volver a mostrar</string>
+  <string name="bubble_return_to_call">Volver a la llamada</string>
+  <string name="rtt_request_dialog_title">¿Quieres unirte a la llamada de TTR?</string>
+  <string name="rtt_request_dialog_details">%1$s quiere enviarte mensajes durante la llamada de voz.</string>
+  <string name="rtt_request_dialog_more_information">La función TTR (texto en tiempo real) ofrece asistencia a las personas sordas o con discapacidades auditivas, que tienen algún trastorno del habla o que necesitan una transcripción además de la voz para comunicarse.</string>
+  <string name="rtt_button_decline_request">No, gracias</string>
+  <string name="rtt_button_accept_request">Unirme a TTR</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-et/strings.xml b/java/com/android/incallui/res/values-et/strings.xml
index 30384ab..1cb357e 100644
--- a/java/com/android/incallui/res/values-et/strings.xml
+++ b/java/com/android/incallui/res/values-et/strings.xml
@@ -1,79 +1,68 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"Telefon"</string>
-    <string name="wait_prompt_str" msgid="3509685348904329594">"Kas saata järgmised toonid?\n"</string>
-    <string name="pause_prompt_yes" msgid="4642047011233552973">"Jah"</string>
-    <string name="pause_prompt_no" msgid="4691320111774935838">"Ei"</string>
-    <string name="notification_dialing" msgid="9072177265772083826">"Valimine"</string>
-    <string name="notification_ongoing_call" msgid="8712641937577776125">"Käimasolev kõne"</string>
-    <string name="notification_ongoing_video_call" msgid="6331318021321487769">"Käimasolev videokõne"</string>
-    <string name="notification_ongoing_paused_video_call" msgid="709950253594606371">"Käimasolev videokõne – video on peatatud"</string>
-    <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Käimasolev töökõne"</string>
-    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"Käimasolev <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
-    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"Sissetulev <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
-    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"WiFi-kõne"</string>
-    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"WiFi-töökõne"</string>
-    <string name="notification_on_hold" msgid="7141827443379205682">"Ootel"</string>
-    <string name="notification_incoming_call" msgid="7520580807513849283">"Sissetulev kõne"</string>
-    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Sissetulev kõne koos fotoga"</string>
-    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"Sissetulev kõne koos sõnumiga"</string>
-    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"Sissetulev kõne koos asukohaga"</string>
-    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"Sissetulev kõne koos foto ja sõnumiga"</string>
-    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"Sissetulev kõne koos foto ja asukohaga"</string>
-    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"Sissetulev kõne koos sõnumi ja asukohaga"</string>
-    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"Sissetulev kõne koos foto, sõnumi ja asukohaga"</string>
-    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"Sissetulev kõne koos manustega"</string>
-    <string name="important_notification_incoming_call" msgid="2867013954509930989">"Tähtis sissetulev kõne"</string>
-    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"Tähtis sissetulev kõne koos fotoga"</string>
-    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"Tähtis sissetulev kõne koos sõnumiga"</string>
-    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"Tähtis sissetulev kõne koos asukohaga"</string>
-    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"Tähtis sissetulev kõne koos foto ja sõnumiga"</string>
-    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"Tähtis sissetulev kõne koos foto ja asukohaga"</string>
-    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"Tähtis sissetulev kõne koos sõnumi ja asukohaga"</string>
-    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Tähtis sisset. kõne koos foto, sõnumi ja asukohaga"</string>
-    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Tähtis sissetulev kõne koos manustega"</string>
-    <string name="notification_incoming_work_call" msgid="5291275092734261918">"Sissetulev töökõne"</string>
-    <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Arvatav sissetulev rämpskõne"</string>
-    <string name="notification_requesting_video_call" msgid="1807679328811515758">"Sissetulev videotaotlus"</string>
-    <string name="notification_action_answer" msgid="8748275902211192568">"Vastamine"</string>
-    <string name="notification_action_end_call" msgid="7467258454170007765">"Lõpeta kõne"</string>
-    <string name="notification_action_answer_video" msgid="8488108892919917287">"Video"</string>
-    <string name="notification_action_accept" msgid="1272761514200507143">"Nõustu"</string>
-    <string name="notification_action_dismiss" msgid="3128241581632616226">"Keeldu"</string>
-    <string name="notification_action_speaker_on" msgid="1882659234405596540">"Kõlari sisselülitamine"</string>
-    <string name="notification_action_speaker_off" msgid="6340085043115533948">"Kõlari väljalülitamine"</string>
-    <string name="notification_external_call" msgid="2504334597315343920">"Pooleliolev kõne teise seadmes"</string>
-    <string name="notification_external_video_call" msgid="7709394856028436683">"Pooleliolev videokõne teises seadmes"</string>
-    <string name="notification_take_call" msgid="5631659438864492229">"Alusta helistamist"</string>
-    <string name="notification_take_video_call" msgid="4473387503712341390">"Alusta videokõnet"</string>
-    <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"Teenust ei toetata."</string>
-    <string name="goPrivate" msgid="5269514638004595378">"aktiveeri privaatrežiim"</string>
-    <string name="manageConferenceLabel" msgid="3589379023518128318">"Halda konverentskõnet"</string>
-    <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"Hädaabinumber"</string>
-    <string name="child_number" msgid="3398257437107259682">"numbri <xliff:g id="CHILD_NUMBER">%s</xliff:g> kaudu"</string>
-    <string name="callFailed_simError" msgid="4587775795711340072">"SIM-kaart puudub või SIM-kaardi viga"</string>
-    <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Kõne lõpetamine"</string>
-    <string name="conference_call_name" msgid="8189987124611337174">"Konverentskõne"</string>
-    <string name="generic_conference_call_name" msgid="1546941472424243894">"Pooleliolev kõne"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Kõnet jätkatakse mobiilse andmeside kaudu …"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"WiFi-võrgule ei saanud lülituda"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Videokõne jääb mobiilsidevõrku. Rakenduda võivad tavapärased andmesidetasud."</string>
-    <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Ära seda enam näita"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="wait_prompt_str">Kas saata järgmised toonid?\n</string>
+  <string name="pause_prompt_yes">Jah</string>
+  <string name="pause_prompt_no">Ei</string>
+  <string name="notification_dialing">Valimine</string>
+  <string name="notification_ongoing_call">Käimasolev kõne</string>
+  <string name="notification_ongoing_video_call">Käimasolev videokõne</string>
+  <string name="notification_ongoing_paused_video_call">Käimasolev videokõne – video on peatatud</string>
+  <string name="notification_ongoing_work_call">Käimasolev töökõne</string>
+  <string name="notification_ongoing_call_wifi_template">Käimasolev %1$s</string>
+  <string name="notification_incoming_call_wifi_template">Sissetulev %1$s</string>
+  <string name="notification_call_wifi_brand">WiFi-kõne</string>
+  <string name="notification_call_wifi_work_brand">WiFi-töökõne</string>
+  <string name="notification_on_hold">Ootel</string>
+  <string name="notification_incoming_call">Sissetulev kõne</string>
+  <string name="notification_incoming_video_call">Sissetulev videokõne</string>
+  <string name="notification_incoming_call_mutli_sim">Sissetulev kõne SIM-kaardi %1$s kaudu</string>
+  <string name="notification_incoming_call_with_photo">Sissetulev kõne koos fotoga</string>
+  <string name="notification_incoming_call_with_message">Sissetulev kõne koos sõnumiga</string>
+  <string name="notification_incoming_call_with_location">Sissetulev kõne koos asukohaga</string>
+  <string name="notification_incoming_call_with_photo_message">Sissetulev kõne koos foto ja sõnumiga</string>
+  <string name="notification_incoming_call_with_photo_location">Sissetulev kõne koos foto ja asukohaga</string>
+  <string name="notification_incoming_call_with_message_location">Sissetulev kõne koos sõnumi ja asukohaga</string>
+  <string name="notification_incoming_call_with_photo_message_location">Sissetulev kõne koos foto, sõnumi ja asukohaga</string>
+  <string name="notification_incoming_call_attachments">Sissetulev kõne koos manustega</string>
+  <string name="important_notification_incoming_call">Tähtis sissetulev kõne</string>
+  <string name="important_notification_incoming_call_with_photo">Tähtis sissetulev kõne koos fotoga</string>
+  <string name="important_notification_incoming_call_with_message">Tähtis sissetulev kõne koos sõnumiga</string>
+  <string name="important_notification_incoming_call_with_location">Tähtis sissetulev kõne koos asukohaga</string>
+  <string name="important_notification_incoming_call_with_photo_message">Tähtis sissetulev kõne koos foto ja sõnumiga</string>
+  <string name="important_notification_incoming_call_with_photo_location">Tähtis sissetulev kõne koos foto ja asukohaga</string>
+  <string name="important_notification_incoming_call_with_message_location">Tähtis sissetulev kõne koos sõnumi ja asukohaga</string>
+  <string name="important_notification_incoming_call_with_photo_message_location">Tähtis sisset. kõne koos foto, sõnumi ja asukohaga</string>
+  <string name="important_notification_incoming_call_attachments">Tähtis sissetulev kõne koos manustega</string>
+  <string name="notification_incoming_work_call">Sissetulev töökõne</string>
+  <string name="notification_incoming_spam_call">Arvatav sissetulev rämpskõne</string>
+  <string name="notification_requesting_video_call">Sissetulev videotaotlus</string>
+  <string name="notification_action_answer">Vastamine</string>
+  <string name="notification_action_end_call">Lõpeta kõne</string>
+  <string name="notification_action_answer_video">Video</string>
+  <string name="notification_action_accept">Nõustu</string>
+  <string name="notification_action_dismiss">Keeldu</string>
+  <string name="notification_action_speaker_on">Kõlari sisselülitamine</string>
+  <string name="notification_action_speaker_off">Kõlari väljalülitamine</string>
+  <string name="notification_external_call">Pooleliolev kõne teise seadmes</string>
+  <string name="notification_external_video_call">Pooleliolev videokõne teises seadmes</string>
+  <string name="notification_take_call">Alusta helistamist</string>
+  <string name="notification_take_video_call">Alusta videokõnet</string>
+  <string name="incall_error_supp_service_unknown">Teenust ei toetata.</string>
+  <string name="goPrivate">aktiveeri privaatrežiim</string>
+  <string name="manageConferenceLabel">Halda konverentskõnet</string>
+  <string name="child_number">numbri %s kaudu</string>
+  <string name="callFailed_simError">SIM-kaart puudub või SIM-kaardi viga</string>
+  <string name="conference_caller_disconnect_content_description">Kõne lõpetamine</string>
+  <string name="conference_call_name">Konverentskõne</string>
+  <string name="generic_conference_call_name">Pooleliolev kõne</string>
+  <string name="video_call_wifi_to_lte_handover_toast">Kõnet jätkatakse mobiilse andmeside kaudu …</string>
+  <string name="video_call_lte_to_wifi_failed_title">WiFi-võrgule ei saanud lülituda</string>
+  <string name="video_call_lte_to_wifi_failed_message">Videokõne jääb mobiilsidevõrku. Rakenduda võivad tavapärased andmesidetasud.</string>
+  <string name="video_call_lte_to_wifi_failed_do_not_show">Ära seda enam näita</string>
+  <string name="bubble_return_to_call">Tagasi kõne juurde</string>
+  <string name="rtt_request_dialog_title">Kas liituda RTT-kõnega?</string>
+  <string name="rtt_request_dialog_details">%1$s soovib teie häälkõnes kasutada sõnumsidet.</string>
+  <string name="rtt_request_dialog_more_information">RTT aitab kurte, kuulmis- või kõnepuudega helistajaid või neid, kes vajavad lisaks häälele muud abi.</string>
+  <string name="rtt_button_decline_request">Tänan, ei</string>
+  <string name="rtt_button_accept_request">Liitu RTT-ga</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-eu/strings.xml b/java/com/android/incallui/res/values-eu/strings.xml
index c3e7e3d..eaba884 100644
--- a/java/com/android/incallui/res/values-eu/strings.xml
+++ b/java/com/android/incallui/res/values-eu/strings.xml
@@ -1,79 +1,68 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"Telefonoa"</string>
-    <string name="wait_prompt_str" msgid="3509685348904329594">"Ondorengo tonuak bidali?\n"</string>
-    <string name="pause_prompt_yes" msgid="4642047011233552973">"Bai"</string>
-    <string name="pause_prompt_no" msgid="4691320111774935838">"Ez"</string>
-    <string name="notification_dialing" msgid="9072177265772083826">"Deitzen"</string>
-    <string name="notification_ongoing_call" msgid="8712641937577776125">"Abian den deia"</string>
-    <string name="notification_ongoing_video_call" msgid="6331318021321487769">"Abian den bideo-deia"</string>
-    <string name="notification_ongoing_paused_video_call" msgid="709950253594606371">"Abian den bideo-deia - Pausatu egin da bideoa"</string>
-    <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Laneko dei bat abian da"</string>
-    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"Abian den <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
-    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"Jasotako <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
-    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"Wi-Fi bidezko deia"</string>
-    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"Wi‑Fi bidezko laneko deia"</string>
-    <string name="notification_on_hold" msgid="7141827443379205682">"Zain"</string>
-    <string name="notification_incoming_call" msgid="7520580807513849283">"Sarrerako deia"</string>
-    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Jasotako deia, argazkia duena"</string>
-    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"Jasoka deia, mezua duena"</string>
-    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"Jasotako deia, kokapena duena"</string>
-    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"Jasotako deia, argazkia eta mezua dituena"</string>
-    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"Jasotako deia, argazkia eta kokapena dituena"</string>
-    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"Jasotako deia, mezua eta kokapena dituena"</string>
-    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"Jasotako deia, argazkia, mezua eta kokap. dituena"</string>
-    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"Jasotako deia, eranskinak dituena"</string>
-    <string name="important_notification_incoming_call" msgid="2867013954509930989">"Jasotako dei garrantzitsua"</string>
-    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"Jasotako dei garrantzitsua, argazkia duena"</string>
-    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"Jasotako dei garrantzitsua, mezua duena"</string>
-    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"Jasotako dei garrantzitsua, kokapena duena"</string>
-    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"Jasotako dei garrantz., argazkia eta mezua dituena"</string>
-    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"Jasotako dei garrantz., argazkia eta kok. dituena"</string>
-    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"Jasotako dei garrantz., mezua eta kokapena dituena"</string>
-    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Jasotako dei garrant., arg., mez. eta kok. dituena"</string>
-    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Jasotako dei garrantzitsua, eranskinak dituena"</string>
-    <string name="notification_incoming_work_call" msgid="5291275092734261918">"Laneko dei bat jaso da"</string>
-    <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Ustezko spam-deia jaso duzu"</string>
-    <string name="notification_requesting_video_call" msgid="1807679328811515758">"Sarrerako bideo-eskaera"</string>
-    <string name="notification_action_answer" msgid="8748275902211192568">"Erantzun"</string>
-    <string name="notification_action_end_call" msgid="7467258454170007765">"Amaitu deia"</string>
-    <string name="notification_action_answer_video" msgid="8488108892919917287">"Bideoa"</string>
-    <string name="notification_action_accept" msgid="1272761514200507143">"Onartu"</string>
-    <string name="notification_action_dismiss" msgid="3128241581632616226">"Baztertu"</string>
-    <string name="notification_action_speaker_on" msgid="1882659234405596540">"Aktibatu bozgorailua"</string>
-    <string name="notification_action_speaker_off" msgid="6340085043115533948">"Desaktibatu bozgorailua"</string>
-    <string name="notification_external_call" msgid="2504334597315343920">"Dei bat abian da beste gailu batean"</string>
-    <string name="notification_external_video_call" msgid="7709394856028436683">"Bideo-dei bat abian da beste gailu batean"</string>
-    <string name="notification_take_call" msgid="5631659438864492229">"Erantzun deiari"</string>
-    <string name="notification_take_video_call" msgid="4473387503712341390">"Erantzun bideo-deiari"</string>
-    <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"Ez da onartzen."</string>
-    <string name="goPrivate" msgid="5269514638004595378">"bihurtu pribatu"</string>
-    <string name="manageConferenceLabel" msgid="3589379023518128318">"Kudeatu konferentzia-deia"</string>
-    <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"Larrialdietarako zenbakia"</string>
-    <string name="child_number" msgid="3398257437107259682">"<xliff:g id="CHILD_NUMBER">%s</xliff:g> zenbakitik"</string>
-    <string name="callFailed_simError" msgid="4587775795711340072">"Ez dago SIM txartelik edo SIM txartelaren errore bat gertatu da"</string>
-    <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Amaitu deia"</string>
-    <string name="conference_call_name" msgid="8189987124611337174">"Konferentzia-deia"</string>
-    <string name="generic_conference_call_name" msgid="1546941472424243894">"Deia abian da"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Datu-konexiora aldatzen…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Ezin izan da aldatu Wi-Fi sarera"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Datu-konexioaren bidez egiten jarraituko da bideo-deia. Baliteke datuak erabiltzearen ondorioz ohiko kostuak kobratzea."</string>
-    <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Ez erakutsi berriro"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="wait_prompt_str">Ondorengo tonuak bidali?\n</string>
+  <string name="pause_prompt_yes">Bai</string>
+  <string name="pause_prompt_no">Ez</string>
+  <string name="notification_dialing">Deitzen</string>
+  <string name="notification_ongoing_call">Abian den deia</string>
+  <string name="notification_ongoing_video_call">Abian den bideo-deia</string>
+  <string name="notification_ongoing_paused_video_call">Abian den bideo-deia - Pausatu egin da bideoa</string>
+  <string name="notification_ongoing_work_call">Laneko dei bat abian da</string>
+  <string name="notification_ongoing_call_wifi_template">Abian den %1$s</string>
+  <string name="notification_incoming_call_wifi_template">Jasotako %1$s</string>
+  <string name="notification_call_wifi_brand">Wi-Fi bidezko deia</string>
+  <string name="notification_call_wifi_work_brand">Wi‑Fi bidezko laneko deia</string>
+  <string name="notification_on_hold">Zain</string>
+  <string name="notification_incoming_call">Sarrerako deia</string>
+  <string name="notification_incoming_video_call">Sarrerako bideo-deia</string>
+  <string name="notification_incoming_call_mutli_sim">%1$s bidezko sarrerako deia</string>
+  <string name="notification_incoming_call_with_photo">Jasotako deia, argazkia duena</string>
+  <string name="notification_incoming_call_with_message">Jasoka deia, mezua duena</string>
+  <string name="notification_incoming_call_with_location">Jasotako deia, kokapena duena</string>
+  <string name="notification_incoming_call_with_photo_message">Jasotako deia, argazkia eta mezua dituena</string>
+  <string name="notification_incoming_call_with_photo_location">Jasotako deia, argazkia eta kokapena dituena</string>
+  <string name="notification_incoming_call_with_message_location">Jasotako deia, mezua eta kokapena dituena</string>
+  <string name="notification_incoming_call_with_photo_message_location">Jasotako deia, argazkia, mezua eta kokap. dituena</string>
+  <string name="notification_incoming_call_attachments">Jasotako deia, eranskinak dituena</string>
+  <string name="important_notification_incoming_call">Jasotako dei garrantzitsua</string>
+  <string name="important_notification_incoming_call_with_photo">Jasotako dei garrantzitsua, argazkia duena</string>
+  <string name="important_notification_incoming_call_with_message">Jasotako dei garrantzitsua, mezua duena</string>
+  <string name="important_notification_incoming_call_with_location">Jasotako dei garrantzitsua, kokapena duena</string>
+  <string name="important_notification_incoming_call_with_photo_message">Jasotako dei garrantz., argazkia eta mezua dituena</string>
+  <string name="important_notification_incoming_call_with_photo_location">Jasotako dei garrantz., argazkia eta kok. dituena</string>
+  <string name="important_notification_incoming_call_with_message_location">Jasotako dei garrantz., mezua eta kokapena dituena</string>
+  <string name="important_notification_incoming_call_with_photo_message_location">Jasotako dei garrant., arg., mez. eta kok. dituena</string>
+  <string name="important_notification_incoming_call_attachments">Jasotako dei garrantzitsua, eranskinak dituena</string>
+  <string name="notification_incoming_work_call">Laneko dei bat jaso da</string>
+  <string name="notification_incoming_spam_call">Ustezko spam-deia jaso duzu</string>
+  <string name="notification_requesting_video_call">Sarrerako bideo-eskaera</string>
+  <string name="notification_action_answer">Erantzun</string>
+  <string name="notification_action_end_call">Amaitu deia</string>
+  <string name="notification_action_answer_video">Bideoa</string>
+  <string name="notification_action_accept">Onartu</string>
+  <string name="notification_action_dismiss">Baztertu</string>
+  <string name="notification_action_speaker_on">Aktibatu bozgorailua</string>
+  <string name="notification_action_speaker_off">Desaktibatu bozgorailua</string>
+  <string name="notification_external_call">Dei bat abian da beste gailu batean</string>
+  <string name="notification_external_video_call">Bideo-dei bat abian da beste gailu batean</string>
+  <string name="notification_take_call">Erantzun deiari</string>
+  <string name="notification_take_video_call">Erantzun bideo-deiari</string>
+  <string name="incall_error_supp_service_unknown">Ez da onartzen.</string>
+  <string name="goPrivate">bihurtu pribatu</string>
+  <string name="manageConferenceLabel">Kudeatu konferentzia-deia</string>
+  <string name="child_number">%s zenbakitik</string>
+  <string name="callFailed_simError">Ez dago SIM txartelik edo SIM txartelaren errore bat gertatu da</string>
+  <string name="conference_caller_disconnect_content_description">Amaitu deia</string>
+  <string name="conference_call_name">Konferentzia-deia</string>
+  <string name="generic_conference_call_name">Deia abian da</string>
+  <string name="video_call_wifi_to_lte_handover_toast">Datu-konexiora aldatzen…</string>
+  <string name="video_call_lte_to_wifi_failed_title">Ezin izan da aldatu Wi-Fi sarera</string>
+  <string name="video_call_lte_to_wifi_failed_message">Datu-konexioaren bidez egiten jarraituko da bideo-deia. Baliteke datuak erabiltzearen ondorioz ohiko kostuak kobratzea.</string>
+  <string name="video_call_lte_to_wifi_failed_do_not_show">Ez erakutsi berriro</string>
+  <string name="bubble_return_to_call">Itzuli deira</string>
+  <string name="rtt_request_dialog_title">Testua bidaltzeko eginbidea duen deian sartu nahi duzu?</string>
+  <string name="rtt_request_dialog_details">%1$s erabiltzaileak mezuak erabili nahi ditu ahots-deian.</string>
+  <string name="rtt_request_dialog_more_information">Deietan testua bidaltzeko eginbideak (RTT) deitzaile gorrei, entzumen-arazoak dituztenei, hitz egiteko ezintasunen bat dutenei edota, ahotsaz gain, beste makuluren bat behar dutenei laguntzen die.</string>
+  <string name="rtt_button_decline_request">Ez, eskerrik asko</string>
+  <string name="rtt_button_accept_request">Sartu RTT duen deian</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-fa/strings.xml b/java/com/android/incallui/res/values-fa/strings.xml
index 75abd16..8178543 100644
--- a/java/com/android/incallui/res/values-fa/strings.xml
+++ b/java/com/android/incallui/res/values-fa/strings.xml
@@ -1,79 +1,68 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"تلفن"</string>
-    <string name="wait_prompt_str" msgid="3509685348904329594">"صداهای زیر ارسال شود؟\n"</string>
-    <string name="pause_prompt_yes" msgid="4642047011233552973">"بله"</string>
-    <string name="pause_prompt_no" msgid="4691320111774935838">"نه"</string>
-    <string name="notification_dialing" msgid="9072177265772083826">"شماره‌گیری"</string>
-    <string name="notification_ongoing_call" msgid="8712641937577776125">"تماس جاری"</string>
-    <string name="notification_ongoing_video_call" msgid="6331318021321487769">"تماس ویدیویی درحال انجام"</string>
-    <string name="notification_ongoing_paused_video_call" msgid="709950253594606371">"تماس ویدیویی درحال انجام ‑ ویدیو موقتاً متوقف شد"</string>
-    <string name="notification_ongoing_work_call" msgid="3189581218078981547">"تماس کاری خروجی"</string>
-    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"<xliff:g id="BRAND_NAME">%1$s</xliff:g> درحال انجام"</string>
-    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"<xliff:g id="BRAND_NAME">%1$s</xliff:g> ورودی"</string>
-    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"‏تماس ازطریق Wi-Fi"</string>
-    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"‏تماس کاری ازطریق Wi-Fi"</string>
-    <string name="notification_on_hold" msgid="7141827443379205682">"در انتظار"</string>
-    <string name="notification_incoming_call" msgid="7520580807513849283">"تماس ورودی"</string>
-    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"تماس ورودی به همراه عکس"</string>
-    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"تماس ورودی به همراه پیام"</string>
-    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"تماس ورودی به همراه مکان"</string>
-    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"تماس ورودی به همراه عکس و پیام"</string>
-    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"تماس ورودی به همراه عکس و مکان"</string>
-    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"تماس ورودی به همراه پیام و مکان"</string>
-    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"تماس ورودی به همراه عکس، پیام و مکان"</string>
-    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"تماس ورودی به همراه پیوست"</string>
-    <string name="important_notification_incoming_call" msgid="2867013954509930989">"تماس ورودی مهم"</string>
-    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"تماس ورودی مهم به همراه عکس"</string>
-    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"تماس ورودی مهم به همراه پیام"</string>
-    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"تماس ورودی مهم به همراه مکان"</string>
-    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"تماس ورودی مهم به همراه عکس و پیام"</string>
-    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"تماس ورودی مهم به همراه عکس و مکان"</string>
-    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"تماس ورودی مهم به همراه پیام و مکان"</string>
-    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"تماس ورودی مهم به همراه عکس، پیام و مکان"</string>
-    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"تماس ورودی مهم به همراه پیوست"</string>
-    <string name="notification_incoming_work_call" msgid="5291275092734261918">"تماس کاری ورودی"</string>
-    <string name="notification_incoming_spam_call" msgid="7591506944666791937">"تماس هرزنامه احتمالی ورودی"</string>
-    <string name="notification_requesting_video_call" msgid="1807679328811515758">"درخواست تماس ویدئویی ورودی"</string>
-    <string name="notification_action_answer" msgid="8748275902211192568">"پاسخ"</string>
-    <string name="notification_action_end_call" msgid="7467258454170007765">"قطع تماس"</string>
-    <string name="notification_action_answer_video" msgid="8488108892919917287">"ویدئو"</string>
-    <string name="notification_action_accept" msgid="1272761514200507143">"پذیرفتن"</string>
-    <string name="notification_action_dismiss" msgid="3128241581632616226">"نپذیرفتن"</string>
-    <string name="notification_action_speaker_on" msgid="1882659234405596540">"روشن کردن بلندگو"</string>
-    <string name="notification_action_speaker_off" msgid="6340085043115533948">"خاموش کردن بلندگو"</string>
-    <string name="notification_external_call" msgid="2504334597315343920">"تماس در حال انجام در دستگاهی دیگر"</string>
-    <string name="notification_external_video_call" msgid="7709394856028436683">"تماس ویدئویی در حال انجام در دستگاهی دیگر"</string>
-    <string name="notification_take_call" msgid="5631659438864492229">"انتقال تماس"</string>
-    <string name="notification_take_video_call" msgid="4473387503712341390">"انتقال تماس ویدئویی"</string>
-    <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"سرویس پشتیبانی نمی‌شود."</string>
-    <string name="goPrivate" msgid="5269514638004595378">"رفتن به خصوصی"</string>
-    <string name="manageConferenceLabel" msgid="3589379023518128318">"مدیریت تماس کنفرانسی"</string>
-    <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"شماره اضطراری"</string>
-    <string name="child_number" msgid="3398257437107259682">"از طریق <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
-    <string name="callFailed_simError" msgid="4587775795711340072">"فاقد سیم، یا خطای سیم"</string>
-    <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"پایان تماس"</string>
-    <string name="conference_call_name" msgid="8189987124611337174">"تماس کنفرانسی"</string>
-    <string name="generic_conference_call_name" msgid="1546941472424243894">"در تماس"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"ادامه تماس با استفاده از داده شبکه همراه…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"‏جابجایی به شبکه Wi-Fi انجام نشد"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"تماس ویدیویی همچنان ازطریق شبکه تلفن همراه انجام می‌شود. ممکن است هزینه‌های استاندارد داده اعمال شود."</string>
-    <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"دوباره نشان داده نشود"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="wait_prompt_str">‏صداهای زیر ارسال شود؟\n</string>
+  <string name="pause_prompt_yes">بله</string>
+  <string name="pause_prompt_no">نه</string>
+  <string name="notification_dialing">شماره‌گیری</string>
+  <string name="notification_ongoing_call">تماس جاری</string>
+  <string name="notification_ongoing_video_call">تماس ویدیویی درحال انجام</string>
+  <string name="notification_ongoing_paused_video_call">تماس ویدیویی درحال انجام ‑ ویدیو موقتاً متوقف شد</string>
+  <string name="notification_ongoing_work_call">تماس کاری خروجی</string>
+  <string name="notification_ongoing_call_wifi_template">%1$s درحال انجام</string>
+  <string name="notification_incoming_call_wifi_template">%1$s ورودی</string>
+  <string name="notification_call_wifi_brand">‏تماس ازطریق Wi-Fi</string>
+  <string name="notification_call_wifi_work_brand">‏تماس کاری ازطریق Wi-Fi</string>
+  <string name="notification_on_hold">در انتظار</string>
+  <string name="notification_incoming_call">تماس ورودی</string>
+  <string name="notification_incoming_video_call">تماس ویدئویی ورودی</string>
+  <string name="notification_incoming_call_mutli_sim">تماس ورودی ازطریق %1$s</string>
+  <string name="notification_incoming_call_with_photo">تماس ورودی به همراه عکس</string>
+  <string name="notification_incoming_call_with_message">تماس ورودی به همراه پیام</string>
+  <string name="notification_incoming_call_with_location">تماس ورودی به همراه مکان</string>
+  <string name="notification_incoming_call_with_photo_message">تماس ورودی به همراه عکس و پیام</string>
+  <string name="notification_incoming_call_with_photo_location">تماس ورودی به همراه عکس و مکان</string>
+  <string name="notification_incoming_call_with_message_location">تماس ورودی به همراه پیام و مکان</string>
+  <string name="notification_incoming_call_with_photo_message_location">تماس ورودی به همراه عکس، پیام و مکان</string>
+  <string name="notification_incoming_call_attachments">تماس ورودی به همراه پیوست</string>
+  <string name="important_notification_incoming_call">تماس ورودی مهم</string>
+  <string name="important_notification_incoming_call_with_photo">تماس ورودی مهم به همراه عکس</string>
+  <string name="important_notification_incoming_call_with_message">تماس ورودی مهم به همراه پیام</string>
+  <string name="important_notification_incoming_call_with_location">تماس ورودی مهم به همراه مکان</string>
+  <string name="important_notification_incoming_call_with_photo_message">تماس ورودی مهم به همراه عکس و پیام</string>
+  <string name="important_notification_incoming_call_with_photo_location">تماس ورودی مهم به همراه عکس و مکان</string>
+  <string name="important_notification_incoming_call_with_message_location">تماس ورودی مهم به همراه پیام و مکان</string>
+  <string name="important_notification_incoming_call_with_photo_message_location">تماس ورودی مهم به همراه عکس، پیام و مکان</string>
+  <string name="important_notification_incoming_call_attachments">تماس ورودی مهم به همراه پیوست</string>
+  <string name="notification_incoming_work_call">تماس کاری ورودی</string>
+  <string name="notification_incoming_spam_call">تماس هرزنامه احتمالی ورودی</string>
+  <string name="notification_requesting_video_call">درخواست تماس ویدئویی ورودی</string>
+  <string name="notification_action_answer">پاسخ</string>
+  <string name="notification_action_end_call">قطع تماس</string>
+  <string name="notification_action_answer_video">ویدئو</string>
+  <string name="notification_action_accept">پذیرفتن</string>
+  <string name="notification_action_dismiss">نپذیرفتن</string>
+  <string name="notification_action_speaker_on">روشن کردن بلندگو</string>
+  <string name="notification_action_speaker_off">خاموش کردن بلندگو</string>
+  <string name="notification_external_call">تماس در حال انجام در دستگاهی دیگر</string>
+  <string name="notification_external_video_call">تماس ویدئویی در حال انجام در دستگاهی دیگر</string>
+  <string name="notification_take_call">انتقال تماس</string>
+  <string name="notification_take_video_call">انتقال تماس ویدئویی</string>
+  <string name="incall_error_supp_service_unknown">سرویس پشتیبانی نمی‌شود.</string>
+  <string name="goPrivate">رفتن به خصوصی</string>
+  <string name="manageConferenceLabel">مدیریت تماس کنفرانسی</string>
+  <string name="child_number">از طریق %s</string>
+  <string name="callFailed_simError">فاقد سیم، یا خطای سیم</string>
+  <string name="conference_caller_disconnect_content_description">پایان تماس</string>
+  <string name="conference_call_name">تماس کنفرانسی</string>
+  <string name="generic_conference_call_name">در تماس</string>
+  <string name="video_call_wifi_to_lte_handover_toast">ادامه تماس با استفاده از داده شبکه همراه…</string>
+  <string name="video_call_lte_to_wifi_failed_title">‏جابجایی به شبکه Wi-Fi انجام نشد</string>
+  <string name="video_call_lte_to_wifi_failed_message">تماس ویدیویی همچنان ازطریق شبکه تلفن همراه انجام می‌شود. ممکن است هزینه‌های استاندارد داده اعمال شود.</string>
+  <string name="video_call_lte_to_wifi_failed_do_not_show">دوباره نشان داده نشود</string>
+  <string name="bubble_return_to_call">برگشت به تماس</string>
+  <string name="rtt_request_dialog_title">به تماس نوشتار هم‌زمان می‌پیوندید؟</string>
+  <string name="rtt_request_dialog_details">%1$s می‌خواهد در تماس صوتی شما از پیام‌رسانی استفاده کند.</string>
+  <string name="rtt_request_dialog_more_information">نوشتار هم‌زمان به تماس گیرندگان ناشنوا، دارای مشکل شنوایی، دارای ناتوانی گفتاری یا افرادی که به چیزی بیش از صدا نیاز دارند کمک می‌کند.</string>
+  <string name="rtt_button_decline_request">نه متشکرم</string>
+  <string name="rtt_button_accept_request">‏پیوستن به RTT</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-fi/strings.xml b/java/com/android/incallui/res/values-fi/strings.xml
index e172e70..2da803e 100644
--- a/java/com/android/incallui/res/values-fi/strings.xml
+++ b/java/com/android/incallui/res/values-fi/strings.xml
@@ -1,79 +1,68 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"Puhelin"</string>
-    <string name="wait_prompt_str" msgid="3509685348904329594">"Lähetäänkö seuraavat äänet?\n"</string>
-    <string name="pause_prompt_yes" msgid="4642047011233552973">"Kyllä"</string>
-    <string name="pause_prompt_no" msgid="4691320111774935838">"Ei"</string>
-    <string name="notification_dialing" msgid="9072177265772083826">"Soitetaan"</string>
-    <string name="notification_ongoing_call" msgid="8712641937577776125">"Käynnissä oleva puhelu"</string>
-    <string name="notification_ongoing_video_call" msgid="6331318021321487769">"Videopuhelu käynnissä"</string>
-    <string name="notification_ongoing_paused_video_call" msgid="709950253594606371">"Videopuhelu käynnissä ‑ video keskeytetty"</string>
-    <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Käynnissä oleva työpuhelu"</string>
-    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"Käynnissä oleva <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
-    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"Saapuva <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
-    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"Wi-Fi-puhelu"</string>
-    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"Wi‑Fi-työpuhelu"</string>
-    <string name="notification_on_hold" msgid="7141827443379205682">"Pidossa"</string>
-    <string name="notification_incoming_call" msgid="7520580807513849283">"Saapuva puhelu"</string>
-    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Kuvan sisältävä saapuva puhelu"</string>
-    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"Viestin sisältävä saapuva puhelu"</string>
-    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"Sijainnin sisältävä saapuva puhelu"</string>
-    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"Kuvan ja viestin sisältävä saapuva puhelu"</string>
-    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"Kuvan ja sijainnin sisältävä saapuva puhelu"</string>
-    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"Viestin ja sijainnin sisältävä saapuva puhelu"</string>
-    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"Kuvan, viestin ja sijainnin sisältävä puhelu"</string>
-    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"Liitteitä sisältävä saapuva puhelu"</string>
-    <string name="important_notification_incoming_call" msgid="2867013954509930989">"Tärkeä saapuva puhelu"</string>
-    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"Tärkeä kuvan sisältävä saapuva puhelu"</string>
-    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"Tärkeä viestin sisältävä saapuva puhelu"</string>
-    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"Tärkeä sijainnin sisältävä saapuva puhelu"</string>
-    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"Tärkeä kuvan ja viestin sisältävä saapuva puhelu"</string>
-    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"Tärkeä kuvan ja sijainnin sisältävä saapuva puhelu"</string>
-    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"Tärkeä viestin ja sijainnin sisältävä puhelu"</string>
-    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Tärkeä liitteitä sisältävä saapuva puhelu"</string>
-    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Tärkeä liitteitä sisältävä saapuva puhelu"</string>
-    <string name="notification_incoming_work_call" msgid="5291275092734261918">"Saapuva työpuhelu"</string>
-    <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Tämä puhelu saattaa olla häirikköpuhelu."</string>
-    <string name="notification_requesting_video_call" msgid="1807679328811515758">"Saapuva videopyyntö"</string>
-    <string name="notification_action_answer" msgid="8748275902211192568">"Vastaa"</string>
-    <string name="notification_action_end_call" msgid="7467258454170007765">"Katkaise puhelu"</string>
-    <string name="notification_action_answer_video" msgid="8488108892919917287">"Video"</string>
-    <string name="notification_action_accept" msgid="1272761514200507143">"Hyväksy"</string>
-    <string name="notification_action_dismiss" msgid="3128241581632616226">"Hylkää"</string>
-    <string name="notification_action_speaker_on" msgid="1882659234405596540">"Ota kaiutin käyttöön"</string>
-    <string name="notification_action_speaker_off" msgid="6340085043115533948">"Poista kaiutin käytöstä"</string>
-    <string name="notification_external_call" msgid="2504334597315343920">"Puhelu on kesken toisella laitteella."</string>
-    <string name="notification_external_video_call" msgid="7709394856028436683">"Videopuhelu on kesken toisella laitteella."</string>
-    <string name="notification_take_call" msgid="5631659438864492229">"Vastaa puheluun"</string>
-    <string name="notification_take_video_call" msgid="4473387503712341390">"Vastaa videopuheluun"</string>
-    <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"Yhteyttä ei tueta."</string>
-    <string name="goPrivate" msgid="5269514638004595378">"muuta yksityiseksi"</string>
-    <string name="manageConferenceLabel" msgid="3589379023518128318">"Hallinnoi puhelinneuvottelua"</string>
-    <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"Hätänumero"</string>
-    <string name="child_number" msgid="3398257437107259682">"nron <xliff:g id="CHILD_NUMBER">%s</xliff:g> kautta"</string>
-    <string name="callFailed_simError" msgid="4587775795711340072">"Ei SIM-korttia tai SIM-korttivirhe"</string>
-    <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Päätä puhelu"</string>
-    <string name="conference_call_name" msgid="8189987124611337174">"Puhelinneuvottelu"</string>
-    <string name="generic_conference_call_name" msgid="1546941472424243894">"Puhelu käynnissä"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Jatketaan puhelua mobiilidatayhteydellä…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Vaihto Wi-Fi-verkkoon epäonnistui."</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Videopuhelu soitetaan mobiilidatayhteyden kautta. Operaattori voi veloittaa tiedonsiirrosta."</string>
-    <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Älä näytä tätä uudelleen"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="wait_prompt_str">Lähetäänkö seuraavat äänet?\n</string>
+  <string name="pause_prompt_yes">Kyllä</string>
+  <string name="pause_prompt_no">Ei</string>
+  <string name="notification_dialing">Soitetaan</string>
+  <string name="notification_ongoing_call">Käynnissä oleva puhelu</string>
+  <string name="notification_ongoing_video_call">Videopuhelu käynnissä</string>
+  <string name="notification_ongoing_paused_video_call">Videopuhelu käynnissä ‑ video keskeytetty</string>
+  <string name="notification_ongoing_work_call">Käynnissä oleva työpuhelu</string>
+  <string name="notification_ongoing_call_wifi_template">Käynnissä oleva %1$s</string>
+  <string name="notification_incoming_call_wifi_template">Saapuva %1$s</string>
+  <string name="notification_call_wifi_brand">Wi-Fi-puhelu</string>
+  <string name="notification_call_wifi_work_brand">Wi‑Fi-työpuhelu</string>
+  <string name="notification_on_hold">Pidossa</string>
+  <string name="notification_incoming_call">Saapuva puhelu</string>
+  <string name="notification_incoming_video_call">Saapuva videopuhelu</string>
+  <string name="notification_incoming_call_mutli_sim">Saapuva puhelu %1$s ‑kortin kautta</string>
+  <string name="notification_incoming_call_with_photo">Kuvan sisältävä saapuva puhelu</string>
+  <string name="notification_incoming_call_with_message">Viestin sisältävä saapuva puhelu</string>
+  <string name="notification_incoming_call_with_location">Sijainnin sisältävä saapuva puhelu</string>
+  <string name="notification_incoming_call_with_photo_message">Kuvan ja viestin sisältävä saapuva puhelu</string>
+  <string name="notification_incoming_call_with_photo_location">Kuvan ja sijainnin sisältävä saapuva puhelu</string>
+  <string name="notification_incoming_call_with_message_location">Viestin ja sijainnin sisältävä saapuva puhelu</string>
+  <string name="notification_incoming_call_with_photo_message_location">Kuvan, viestin ja sijainnin sisältävä puhelu</string>
+  <string name="notification_incoming_call_attachments">Liitteitä sisältävä saapuva puhelu</string>
+  <string name="important_notification_incoming_call">Tärkeä saapuva puhelu</string>
+  <string name="important_notification_incoming_call_with_photo">Tärkeä kuvan sisältävä saapuva puhelu</string>
+  <string name="important_notification_incoming_call_with_message">Tärkeä viestin sisältävä saapuva puhelu</string>
+  <string name="important_notification_incoming_call_with_location">Tärkeä sijainnin sisältävä saapuva puhelu</string>
+  <string name="important_notification_incoming_call_with_photo_message">Tärkeä kuvan ja viestin sisältävä saapuva puhelu</string>
+  <string name="important_notification_incoming_call_with_photo_location">Tärkeä kuvan ja sijainnin sisältävä saapuva puhelu</string>
+  <string name="important_notification_incoming_call_with_message_location">Tärkeä viestin ja sijainnin sisältävä puhelu</string>
+  <string name="important_notification_incoming_call_with_photo_message_location">Tärkeä liitteitä sisältävä saapuva puhelu</string>
+  <string name="important_notification_incoming_call_attachments">Tärkeä liitteitä sisältävä saapuva puhelu</string>
+  <string name="notification_incoming_work_call">Saapuva työpuhelu</string>
+  <string name="notification_incoming_spam_call">Tämä puhelu saattaa olla häirikköpuhelu.</string>
+  <string name="notification_requesting_video_call">Saapuva videopyyntö</string>
+  <string name="notification_action_answer">Vastaa</string>
+  <string name="notification_action_end_call">Katkaise puhelu</string>
+  <string name="notification_action_answer_video">Video</string>
+  <string name="notification_action_accept">Hyväksy</string>
+  <string name="notification_action_dismiss">Hylkää</string>
+  <string name="notification_action_speaker_on">Ota kaiutin käyttöön</string>
+  <string name="notification_action_speaker_off">Poista kaiutin käytöstä</string>
+  <string name="notification_external_call">Puhelu on kesken toisella laitteella.</string>
+  <string name="notification_external_video_call">Videopuhelu on kesken toisella laitteella.</string>
+  <string name="notification_take_call">Vastaa puheluun</string>
+  <string name="notification_take_video_call">Vastaa videopuheluun</string>
+  <string name="incall_error_supp_service_unknown">Yhteyttä ei tueta.</string>
+  <string name="goPrivate">muuta yksityiseksi</string>
+  <string name="manageConferenceLabel">Hallinnoi puhelinneuvottelua</string>
+  <string name="child_number">nron %s kautta</string>
+  <string name="callFailed_simError">Ei SIM-korttia tai SIM-korttivirhe</string>
+  <string name="conference_caller_disconnect_content_description">Päätä puhelu</string>
+  <string name="conference_call_name">Puhelinneuvottelu</string>
+  <string name="generic_conference_call_name">Puhelu käynnissä</string>
+  <string name="video_call_wifi_to_lte_handover_toast">Jatketaan puhelua mobiilidatayhteydellä…</string>
+  <string name="video_call_lte_to_wifi_failed_title">Vaihto Wi-Fi-verkkoon epäonnistui.</string>
+  <string name="video_call_lte_to_wifi_failed_message">Videopuhelu soitetaan mobiilidatayhteyden kautta. Operaattori voi veloittaa tiedonsiirrosta.</string>
+  <string name="video_call_lte_to_wifi_failed_do_not_show">Älä näytä tätä uudelleen</string>
+  <string name="bubble_return_to_call">Palaa puheluun</string>
+  <string name="rtt_request_dialog_title">Haluatko liittyä RTT-puheluun?</string>
+  <string name="rtt_request_dialog_details">%1$s haluaa lähettää viestejä äänipuhelun aikana.</string>
+  <string name="rtt_request_dialog_more_information">RTT-toiminto auttaa kuuroja sekä käyttäjiä, joilla on kuulo‑ tai puhehäiriöitä tai jotka tarvitsevat muuta tukea pelkän puheen lisäksi.</string>
+  <string name="rtt_button_decline_request">Ei kiitos</string>
+  <string name="rtt_button_accept_request">Liity RTT-puheluun</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-fr-rCA/strings.xml b/java/com/android/incallui/res/values-fr-rCA/strings.xml
index 46143cc..94d029a 100644
--- a/java/com/android/incallui/res/values-fr-rCA/strings.xml
+++ b/java/com/android/incallui/res/values-fr-rCA/strings.xml
@@ -1,79 +1,68 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"Téléphone"</string>
-    <string name="wait_prompt_str" msgid="3509685348904329594">"Envoyer les tonalités suivantes?\n"</string>
-    <string name="pause_prompt_yes" msgid="4642047011233552973">"Oui"</string>
-    <string name="pause_prompt_no" msgid="4691320111774935838">"Non"</string>
-    <string name="notification_dialing" msgid="9072177265772083826">"Composition..."</string>
-    <string name="notification_ongoing_call" msgid="8712641937577776125">"Appel en cours"</string>
-    <string name="notification_ongoing_video_call" msgid="6331318021321487769">"Appel vidéo en cours"</string>
-    <string name="notification_ongoing_paused_video_call" msgid="709950253594606371">"Appel vidéo en cours – vidéo en pause"</string>
-    <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Appel en cours - travail"</string>
-    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"<xliff:g id="BRAND_NAME">%1$s</xliff:g> en cours"</string>
-    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"<xliff:g id="BRAND_NAME">%1$s</xliff:g> entrant"</string>
-    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"Appel Wi-Fi"</string>
-    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"Appel professionnel Wi‑Fi"</string>
-    <string name="notification_on_hold" msgid="7141827443379205682">"En attente"</string>
-    <string name="notification_incoming_call" msgid="7520580807513849283">"Appel entrant"</string>
-    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Appel entrant avec photo"</string>
-    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"Appel entrant avec message"</string>
-    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"Appel entrant avec position"</string>
-    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"Appel entrant avec photo et message"</string>
-    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"Appel entrant avec photo et position"</string>
-    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"Appel entrant avec message et position"</string>
-    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"Appel entrant avec photo, message et position"</string>
-    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"Appel entrant avec pièces jointes"</string>
-    <string name="important_notification_incoming_call" msgid="2867013954509930989">"Appel entrant important"</string>
-    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"Appel entrant important avec photo"</string>
-    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"Appel entrant important avec message"</string>
-    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"Appel entrant important avec position"</string>
-    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"Appel entrant important avec photo et message"</string>
-    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"Appel entrant important avec photo et position"</string>
-    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"Appel entrant important avec message et position"</string>
-    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Appel important avec photo, message et position"</string>
-    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Appel entrant important avec pièces jointes"</string>
-    <string name="notification_incoming_work_call" msgid="5291275092734261918">"Appel entrant - travail"</string>
-    <string name="notification_incoming_spam_call" msgid="7591506944666791937">"L\'appel entrant est suspect"</string>
-    <string name="notification_requesting_video_call" msgid="1807679328811515758">"Demande de vidéo reçue"</string>
-    <string name="notification_action_answer" msgid="8748275902211192568">"Répondre"</string>
-    <string name="notification_action_end_call" msgid="7467258454170007765">"Raccrocher"</string>
-    <string name="notification_action_answer_video" msgid="8488108892919917287">"Vidéo"</string>
-    <string name="notification_action_accept" msgid="1272761514200507143">"Accepter"</string>
-    <string name="notification_action_dismiss" msgid="3128241581632616226">"Refuser"</string>
-    <string name="notification_action_speaker_on" msgid="1882659234405596540">"Activer le haut-parleur"</string>
-    <string name="notification_action_speaker_off" msgid="6340085043115533948">"Désactiver le haut-parleur"</string>
-    <string name="notification_external_call" msgid="2504334597315343920">"Appel en cours sur un autre appareil"</string>
-    <string name="notification_external_video_call" msgid="7709394856028436683">"Appel vidéo en cours sur un autre appareil"</string>
-    <string name="notification_take_call" msgid="5631659438864492229">"Répondre à l\'appel"</string>
-    <string name="notification_take_video_call" msgid="4473387503712341390">"Répondre à l\'appel vidéo"</string>
-    <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"Service non pris en charge."</string>
-    <string name="goPrivate" msgid="5269514638004595378">"mode privé"</string>
-    <string name="manageConferenceLabel" msgid="3589379023518128318">"Gérer la conférence"</string>
-    <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"Numéro d\'urgence"</string>
-    <string name="child_number" msgid="3398257437107259682">"au moyen du <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
-    <string name="callFailed_simError" msgid="4587775795711340072">"Aucune carte SIM ou erreur de carte SIM"</string>
-    <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Mettre fin à l\'appel"</string>
-    <string name="conference_call_name" msgid="8189987124611337174">"Conférence téléphonique"</string>
-    <string name="generic_conference_call_name" msgid="1546941472424243894">"Appel en cours"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Poursuite de l\'appel utilisant des données mobiles en cours…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Impossible de passer à un réseau Wi-Fi"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"L\'appel vidéo restera sur le réseau cellulaire. Des frais de données standards peuvent s\'appliquer."</string>
-    <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Ne plus afficher"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="wait_prompt_str">Envoyer les tonalités suivantes?\n</string>
+  <string name="pause_prompt_yes">Oui</string>
+  <string name="pause_prompt_no">Non</string>
+  <string name="notification_dialing">Composition...</string>
+  <string name="notification_ongoing_call">Appel en cours</string>
+  <string name="notification_ongoing_video_call">Appel vidéo en cours</string>
+  <string name="notification_ongoing_paused_video_call">Appel vidéo en cours – vidéo en pause</string>
+  <string name="notification_ongoing_work_call">Appel en cours - travail</string>
+  <string name="notification_ongoing_call_wifi_template">%1$s en cours</string>
+  <string name="notification_incoming_call_wifi_template">%1$s entrant</string>
+  <string name="notification_call_wifi_brand">Appel Wi-Fi</string>
+  <string name="notification_call_wifi_work_brand">Appel professionnel Wi‑Fi</string>
+  <string name="notification_on_hold">En attente</string>
+  <string name="notification_incoming_call">Appel entrant</string>
+  <string name="notification_incoming_video_call">Appel vidéo entrant</string>
+  <string name="notification_incoming_call_mutli_sim">Appel entrant par %1$s</string>
+  <string name="notification_incoming_call_with_photo">Appel entrant avec photo</string>
+  <string name="notification_incoming_call_with_message">Appel entrant avec message</string>
+  <string name="notification_incoming_call_with_location">Appel entrant avec position</string>
+  <string name="notification_incoming_call_with_photo_message">Appel entrant avec photo et message</string>
+  <string name="notification_incoming_call_with_photo_location">Appel entrant avec photo et position</string>
+  <string name="notification_incoming_call_with_message_location">Appel entrant avec message et position</string>
+  <string name="notification_incoming_call_with_photo_message_location">Appel entrant avec photo, message et position</string>
+  <string name="notification_incoming_call_attachments">Appel entrant avec pièces jointes</string>
+  <string name="important_notification_incoming_call">Appel entrant important</string>
+  <string name="important_notification_incoming_call_with_photo">Appel entrant important avec photo</string>
+  <string name="important_notification_incoming_call_with_message">Appel entrant important avec message</string>
+  <string name="important_notification_incoming_call_with_location">Appel entrant important avec position</string>
+  <string name="important_notification_incoming_call_with_photo_message">Appel entrant important avec photo et message</string>
+  <string name="important_notification_incoming_call_with_photo_location">Appel entrant important avec photo et position</string>
+  <string name="important_notification_incoming_call_with_message_location">Appel entrant important avec message et position</string>
+  <string name="important_notification_incoming_call_with_photo_message_location">Appel important avec photo, message et position</string>
+  <string name="important_notification_incoming_call_attachments">Appel entrant important avec pièces jointes</string>
+  <string name="notification_incoming_work_call">Appel entrant - travail</string>
+  <string name="notification_incoming_spam_call">L\'appel entrant est suspect</string>
+  <string name="notification_requesting_video_call">Demande de vidéo reçue</string>
+  <string name="notification_action_answer">Répondre</string>
+  <string name="notification_action_end_call">Raccrocher</string>
+  <string name="notification_action_answer_video">Vidéo</string>
+  <string name="notification_action_accept">Accepter</string>
+  <string name="notification_action_dismiss">Refuser</string>
+  <string name="notification_action_speaker_on">Activer le haut-parleur</string>
+  <string name="notification_action_speaker_off">Désactiver le haut-parleur</string>
+  <string name="notification_external_call">Appel en cours sur un autre appareil</string>
+  <string name="notification_external_video_call">Appel vidéo en cours sur un autre appareil</string>
+  <string name="notification_take_call">Répondre à l\'appel</string>
+  <string name="notification_take_video_call">Répondre à l\'appel vidéo</string>
+  <string name="incall_error_supp_service_unknown">Service non pris en charge.</string>
+  <string name="goPrivate">mode privé</string>
+  <string name="manageConferenceLabel">Gérer la conférence</string>
+  <string name="child_number">au moyen du %s</string>
+  <string name="callFailed_simError">Aucune carte SIM ou erreur de carte SIM</string>
+  <string name="conference_caller_disconnect_content_description">Mettre fin à l\'appel</string>
+  <string name="conference_call_name">Conférence téléphonique</string>
+  <string name="generic_conference_call_name">Appel en cours</string>
+  <string name="video_call_wifi_to_lte_handover_toast">Poursuite de l\'appel utilisant des données mobiles en cours…</string>
+  <string name="video_call_lte_to_wifi_failed_title">Impossible de passer à un réseau Wi-Fi</string>
+  <string name="video_call_lte_to_wifi_failed_message">L\'appel vidéo restera sur le réseau cellulaire. Des frais de données standards peuvent s\'appliquer.</string>
+  <string name="video_call_lte_to_wifi_failed_do_not_show">Ne plus afficher</string>
+  <string name="bubble_return_to_call">Retour à l\'appel</string>
+  <string name="rtt_request_dialog_title">Se joindre à l\'appel TTR?</string>
+  <string name="rtt_request_dialog_details">%1$s veut utiliser la messagerie lors de votre appel vocal.</string>
+  <string name="rtt_request_dialog_more_information">La fonctionnalité TTR aide les appelants qui sont sourds ou malentendants, qui ont un trouble de la parole ou pour qui la voix ne suffit pas.</string>
+  <string name="rtt_button_decline_request">Non, merci</string>
+  <string name="rtt_button_accept_request">Se joindre au TTR</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-fr/strings.xml b/java/com/android/incallui/res/values-fr/strings.xml
index 36c8925..5a9a0c7 100644
--- a/java/com/android/incallui/res/values-fr/strings.xml
+++ b/java/com/android/incallui/res/values-fr/strings.xml
@@ -1,79 +1,68 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"Téléphone"</string>
-    <string name="wait_prompt_str" msgid="3509685348904329594">"Envoyer les tonalités suivantes ?\n"</string>
-    <string name="pause_prompt_yes" msgid="4642047011233552973">"Oui"</string>
-    <string name="pause_prompt_no" msgid="4691320111774935838">"Non"</string>
-    <string name="notification_dialing" msgid="9072177265772083826">"Appel…"</string>
-    <string name="notification_ongoing_call" msgid="8712641937577776125">"Appel en cours"</string>
-    <string name="notification_ongoing_video_call" msgid="6331318021321487769">"Appel vidéo en cours"</string>
-    <string name="notification_ongoing_paused_video_call" msgid="709950253594606371">"Appel vidéo en cours — vidéo mise en pause"</string>
-    <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Appel professionnel en cours"</string>
-    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"<xliff:g id="BRAND_NAME">%1$s</xliff:g> en cours"</string>
-    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"<xliff:g id="BRAND_NAME">%1$s</xliff:g> entrant"</string>
-    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"Appel Wi-Fi"</string>
-    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"Appel professionnel Wi‑Fi"</string>
-    <string name="notification_on_hold" msgid="7141827443379205682">"En attente"</string>
-    <string name="notification_incoming_call" msgid="7520580807513849283">"Appel entrant"</string>
-    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Appel entrant avec photo"</string>
-    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"Appel entrant avec message"</string>
-    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"Appel entrant avec position"</string>
-    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"Appel entrant avec photo et message"</string>
-    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"Appel entrant avec photo et position"</string>
-    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"Appel entrant avec message et position"</string>
-    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"Appel entrant avec photo, message et position"</string>
-    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"Appel entrant avec pièces jointes"</string>
-    <string name="important_notification_incoming_call" msgid="2867013954509930989">"Appel entrant important"</string>
-    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"Appel entrant important avec photo"</string>
-    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"Appel entrant important avec message"</string>
-    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"Appel entrant important avec position"</string>
-    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"Appel entrant important avec photo et message"</string>
-    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"Appel entrant important avec photo et position"</string>
-    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"Appel entrant important avec message et position"</string>
-    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Appel important avec photo, message et position"</string>
-    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Appel entrant important avec pièces jointes"</string>
-    <string name="notification_incoming_work_call" msgid="5291275092734261918">"Appel professionnel entrant"</string>
-    <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Appel entrant indésirable suspecté"</string>
-    <string name="notification_requesting_video_call" msgid="1807679328811515758">"Demande de vidéo reçue"</string>
-    <string name="notification_action_answer" msgid="8748275902211192568">"Répondre"</string>
-    <string name="notification_action_end_call" msgid="7467258454170007765">"Raccrocher"</string>
-    <string name="notification_action_answer_video" msgid="8488108892919917287">"Vidéo"</string>
-    <string name="notification_action_accept" msgid="1272761514200507143">"Accepter"</string>
-    <string name="notification_action_dismiss" msgid="3128241581632616226">"Refuser"</string>
-    <string name="notification_action_speaker_on" msgid="1882659234405596540">"Activer le haut-parleur"</string>
-    <string name="notification_action_speaker_off" msgid="6340085043115533948">"Désactiver le haut-parleur"</string>
-    <string name="notification_external_call" msgid="2504334597315343920">"Appel en cours sur un autre appareil"</string>
-    <string name="notification_external_video_call" msgid="7709394856028436683">"Appel vidéo en cours sur un autre appareil"</string>
-    <string name="notification_take_call" msgid="5631659438864492229">"Répondre"</string>
-    <string name="notification_take_video_call" msgid="4473387503712341390">"Répondre à l\'appel vidéo"</string>
-    <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"Service non compatible."</string>
-    <string name="goPrivate" msgid="5269514638004595378">"mode privé"</string>
-    <string name="manageConferenceLabel" msgid="3589379023518128318">"Gérer conférence téléphonique"</string>
-    <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"Numéro d\'urgence"</string>
-    <string name="child_number" msgid="3398257437107259682">"via le <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
-    <string name="callFailed_simError" msgid="4587775795711340072">"Aucune carte SIM ou erreur de carte SIM"</string>
-    <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Mettre fin à l\'appel"</string>
-    <string name="conference_call_name" msgid="8189987124611337174">"Conférence téléphonique"</string>
-    <string name="generic_conference_call_name" msgid="1546941472424243894">"Appel en cours"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Poursuite de l\'appel via les données mobiles…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Impossible de passer au réseau Wi-Fi"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"L\'appel vidéo va continuer sur le réseau mobile. Des frais standards liés à la consommation de données peuvent être facturés."</string>
-    <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Ne plus afficher"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="wait_prompt_str">Envoyer les tonalités suivantes ?\n</string>
+  <string name="pause_prompt_yes">Oui</string>
+  <string name="pause_prompt_no">Non</string>
+  <string name="notification_dialing">Appel…</string>
+  <string name="notification_ongoing_call">Appel en cours</string>
+  <string name="notification_ongoing_video_call">Appel vidéo en cours</string>
+  <string name="notification_ongoing_paused_video_call">Appel vidéo en cours — vidéo mise en pause</string>
+  <string name="notification_ongoing_work_call">Appel professionnel en cours</string>
+  <string name="notification_ongoing_call_wifi_template">%1$s en cours</string>
+  <string name="notification_incoming_call_wifi_template">%1$s entrant</string>
+  <string name="notification_call_wifi_brand">Appel Wi-Fi</string>
+  <string name="notification_call_wifi_work_brand">Appel professionnel Wi‑Fi</string>
+  <string name="notification_on_hold">En attente</string>
+  <string name="notification_incoming_call">Appel entrant</string>
+  <string name="notification_incoming_video_call">Appel vidéo entrant</string>
+  <string name="notification_incoming_call_mutli_sim">Appel entrant via %1$s</string>
+  <string name="notification_incoming_call_with_photo">Appel entrant avec photo</string>
+  <string name="notification_incoming_call_with_message">Appel entrant avec message</string>
+  <string name="notification_incoming_call_with_location">Appel entrant avec position</string>
+  <string name="notification_incoming_call_with_photo_message">Appel entrant avec photo et message</string>
+  <string name="notification_incoming_call_with_photo_location">Appel entrant avec photo et position</string>
+  <string name="notification_incoming_call_with_message_location">Appel entrant avec message et position</string>
+  <string name="notification_incoming_call_with_photo_message_location">Appel entrant avec photo, message et position</string>
+  <string name="notification_incoming_call_attachments">Appel entrant avec pièces jointes</string>
+  <string name="important_notification_incoming_call">Appel entrant important</string>
+  <string name="important_notification_incoming_call_with_photo">Appel entrant important avec photo</string>
+  <string name="important_notification_incoming_call_with_message">Appel entrant important avec message</string>
+  <string name="important_notification_incoming_call_with_location">Appel entrant important avec position</string>
+  <string name="important_notification_incoming_call_with_photo_message">Appel entrant important avec photo et message</string>
+  <string name="important_notification_incoming_call_with_photo_location">Appel entrant important avec photo et position</string>
+  <string name="important_notification_incoming_call_with_message_location">Appel entrant important avec message et position</string>
+  <string name="important_notification_incoming_call_with_photo_message_location">Appel important avec photo, message et position</string>
+  <string name="important_notification_incoming_call_attachments">Appel entrant important avec pièces jointes</string>
+  <string name="notification_incoming_work_call">Appel professionnel entrant</string>
+  <string name="notification_incoming_spam_call">Appel entrant indésirable suspecté</string>
+  <string name="notification_requesting_video_call">Demande de vidéo reçue</string>
+  <string name="notification_action_answer">Répondre</string>
+  <string name="notification_action_end_call">Raccrocher</string>
+  <string name="notification_action_answer_video">Vidéo</string>
+  <string name="notification_action_accept">Accepter</string>
+  <string name="notification_action_dismiss">Refuser</string>
+  <string name="notification_action_speaker_on">Activer le haut-parleur</string>
+  <string name="notification_action_speaker_off">Désactiver le haut-parleur</string>
+  <string name="notification_external_call">Appel en cours sur un autre appareil</string>
+  <string name="notification_external_video_call">Appel vidéo en cours sur un autre appareil</string>
+  <string name="notification_take_call">Répondre</string>
+  <string name="notification_take_video_call">Répondre à l\'appel vidéo</string>
+  <string name="incall_error_supp_service_unknown">Service non compatible.</string>
+  <string name="goPrivate">mode privé</string>
+  <string name="manageConferenceLabel">Gérer conférence téléphonique</string>
+  <string name="child_number">via le %s</string>
+  <string name="callFailed_simError">Aucune carte SIM ou erreur de carte SIM</string>
+  <string name="conference_caller_disconnect_content_description">Mettre fin à l\'appel</string>
+  <string name="conference_call_name">Conférence téléphonique</string>
+  <string name="generic_conference_call_name">Appel en cours</string>
+  <string name="video_call_wifi_to_lte_handover_toast">Poursuite de l\'appel via les données mobiles…</string>
+  <string name="video_call_lte_to_wifi_failed_title">Impossible de passer au réseau Wi-Fi</string>
+  <string name="video_call_lte_to_wifi_failed_message">L\'appel vidéo va continuer sur le réseau mobile. Des frais standards liés à la consommation de données peuvent être facturés.</string>
+  <string name="video_call_lte_to_wifi_failed_do_not_show">Ne plus afficher</string>
+  <string name="bubble_return_to_call">Retour à l\'appel</string>
+  <string name="rtt_request_dialog_title">Participer à l\'appel texte en temps réel ?</string>
+  <string name="rtt_request_dialog_details">%1$s souhaite échanger des SMS/MMS pendant l\'appel vidéo.</string>
+  <string name="rtt_request_dialog_more_information">Le texte en temps réel (RTT) vient en aide aux personnes sourdes, malentendantes, qui ont un trouble de la parole, ou qui ont besoin d\'une transcription en plus de la voix.</string>
+  <string name="rtt_button_decline_request">Non, merci</string>
+  <string name="rtt_button_accept_request">Accepter l\'appel RTT</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-gl/strings.xml b/java/com/android/incallui/res/values-gl/strings.xml
index 0c69935..a7e213e 100644
--- a/java/com/android/incallui/res/values-gl/strings.xml
+++ b/java/com/android/incallui/res/values-gl/strings.xml
@@ -1,79 +1,68 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"Teléfono"</string>
-    <string name="wait_prompt_str" msgid="3509685348904329594">"Enviar os seguintes tons?\n"</string>
-    <string name="pause_prompt_yes" msgid="4642047011233552973">"Si"</string>
-    <string name="pause_prompt_no" msgid="4691320111774935838">"Non"</string>
-    <string name="notification_dialing" msgid="9072177265772083826">"Marcando"</string>
-    <string name="notification_ongoing_call" msgid="8712641937577776125">"Chamada en curso"</string>
-    <string name="notification_ongoing_video_call" msgid="6331318021321487769">"Videochamada en curso"</string>
-    <string name="notification_ongoing_paused_video_call" msgid="709950253594606371">"Videochamada en curso: vídeo en pausa"</string>
-    <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Chamada de traballo saínte"</string>
-    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"<xliff:g id="BRAND_NAME">%1$s</xliff:g> en curso"</string>
-    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"<xliff:g id="BRAND_NAME">%1$s</xliff:g> entrante"</string>
-    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"Chamada por wifi"</string>
-    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"Chamada de traballo por wifi"</string>
-    <string name="notification_on_hold" msgid="7141827443379205682">"En espera"</string>
-    <string name="notification_incoming_call" msgid="7520580807513849283">"Chamada entrante"</string>
-    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Chamada entrante con foto"</string>
-    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"Chamada entrante con mensaxe"</string>
-    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"Chamada entrante con localización"</string>
-    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"Chamada entrante con foto e mensaxe"</string>
-    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"Chamada entrante con foto e localización"</string>
-    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"Chamada entrante con mensaxe e localización"</string>
-    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"Chamada entrante con foto, mensaxe e localización"</string>
-    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"Chamada entrante con anexos"</string>
-    <string name="important_notification_incoming_call" msgid="2867013954509930989">"Chamada entrante importante"</string>
-    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"Chamada entrante importante con foto"</string>
-    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"Chamada entrante importante con mensaxe"</string>
-    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"Chamada entrante importante con localización"</string>
-    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"Chamada entrante importante con foto e mensaxe"</string>
-    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"Chamada entrante importante con foto e localización"</string>
-    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"Chamada entrante importante con mensaxe e localización"</string>
-    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Chamada entrante importante con foto, mensaxe e localización"</string>
-    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Chamada entrante importante con anexos"</string>
-    <string name="notification_incoming_work_call" msgid="5291275092734261918">"Chamada de traballo entrante"</string>
-    <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Chamada entrante sospeitosa de spam"</string>
-    <string name="notification_requesting_video_call" msgid="1807679328811515758">"Solicitude de vídeo entrante"</string>
-    <string name="notification_action_answer" msgid="8748275902211192568">"Responder"</string>
-    <string name="notification_action_end_call" msgid="7467258454170007765">"Colgar"</string>
-    <string name="notification_action_answer_video" msgid="8488108892919917287">"Vídeo"</string>
-    <string name="notification_action_accept" msgid="1272761514200507143">"Aceptar"</string>
-    <string name="notification_action_dismiss" msgid="3128241581632616226">"Rexeitar"</string>
-    <string name="notification_action_speaker_on" msgid="1882659234405596540">"Activa o altofalante"</string>
-    <string name="notification_action_speaker_off" msgid="6340085043115533948">"Desactiva o altofalante"</string>
-    <string name="notification_external_call" msgid="2504334597315343920">"Chamada en curso noutro dispositivo"</string>
-    <string name="notification_external_video_call" msgid="7709394856028436683">"Videochamada en curso noutro dispositivo"</string>
-    <string name="notification_take_call" msgid="5631659438864492229">"Responder á chamada"</string>
-    <string name="notification_take_video_call" msgid="4473387503712341390">"Responder á videochamada"</string>
-    <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"Servizo non compatible."</string>
-    <string name="goPrivate" msgid="5269514638004595378">"activar o modo privado"</string>
-    <string name="manageConferenceLabel" msgid="3589379023518128318">"Xestionar confer. telefónica"</string>
-    <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"Número de emerxencia"</string>
-    <string name="child_number" msgid="3398257437107259682">"a través do <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
-    <string name="callFailed_simError" msgid="4587775795711340072">"Non hai SIM ou hai un erro na SIM"</string>
-    <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Finalizar chamada"</string>
-    <string name="conference_call_name" msgid="8189987124611337174">"Conferencia telefónica"</string>
-    <string name="generic_conference_call_name" msgid="1546941472424243894">"Chamada en curso"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Continuando a chamada con datos móbiles…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Non se puido cambiar á rede wifi"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"A videochamada permanecerá na rede móbil. É posible que se apliquen tarifas de datos estándar."</string>
-    <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Non mostrar de novo"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="wait_prompt_str">Enviar os seguintes tons?\n</string>
+  <string name="pause_prompt_yes">Si</string>
+  <string name="pause_prompt_no">Non</string>
+  <string name="notification_dialing">Marcando</string>
+  <string name="notification_ongoing_call">Chamada en curso</string>
+  <string name="notification_ongoing_video_call">Videochamada en curso</string>
+  <string name="notification_ongoing_paused_video_call">Videochamada en curso: vídeo en pausa</string>
+  <string name="notification_ongoing_work_call">Chamada de traballo saínte</string>
+  <string name="notification_ongoing_call_wifi_template">%1$s en curso</string>
+  <string name="notification_incoming_call_wifi_template">%1$s entrante</string>
+  <string name="notification_call_wifi_brand">Chamada por wifi</string>
+  <string name="notification_call_wifi_work_brand">Chamada de traballo por wifi</string>
+  <string name="notification_on_hold">En espera</string>
+  <string name="notification_incoming_call">Chamada entrante</string>
+  <string name="notification_incoming_video_call">Videochamada entrante</string>
+  <string name="notification_incoming_call_mutli_sim">Chamada entrante a través de %1$s</string>
+  <string name="notification_incoming_call_with_photo">Chamada entrante con foto</string>
+  <string name="notification_incoming_call_with_message">Chamada entrante con mensaxe</string>
+  <string name="notification_incoming_call_with_location">Chamada entrante con localización</string>
+  <string name="notification_incoming_call_with_photo_message">Chamada entrante con foto e mensaxe</string>
+  <string name="notification_incoming_call_with_photo_location">Chamada entrante con foto e localización</string>
+  <string name="notification_incoming_call_with_message_location">Chamada entrante con mensaxe e localización</string>
+  <string name="notification_incoming_call_with_photo_message_location">Chamada entrante con foto, mensaxe e localización</string>
+  <string name="notification_incoming_call_attachments">Chamada entrante con anexos</string>
+  <string name="important_notification_incoming_call">Chamada entrante importante</string>
+  <string name="important_notification_incoming_call_with_photo">Chamada entrante importante con foto</string>
+  <string name="important_notification_incoming_call_with_message">Chamada entrante importante con mensaxe</string>
+  <string name="important_notification_incoming_call_with_location">Chamada entrante importante con localización</string>
+  <string name="important_notification_incoming_call_with_photo_message">Chamada entrante importante con foto e mensaxe</string>
+  <string name="important_notification_incoming_call_with_photo_location">Chamada entrante importante con foto e localización</string>
+  <string name="important_notification_incoming_call_with_message_location">Chamada entrante importante con mensaxe e localización</string>
+  <string name="important_notification_incoming_call_with_photo_message_location">Chamada entrante importante con foto, mensaxe e localización</string>
+  <string name="important_notification_incoming_call_attachments">Chamada entrante importante con anexos</string>
+  <string name="notification_incoming_work_call">Chamada de traballo entrante</string>
+  <string name="notification_incoming_spam_call">Chamada entrante sospeitosa de spam</string>
+  <string name="notification_requesting_video_call">Solicitude de vídeo entrante</string>
+  <string name="notification_action_answer">Responder</string>
+  <string name="notification_action_end_call">Colgar</string>
+  <string name="notification_action_answer_video">Vídeo</string>
+  <string name="notification_action_accept">Aceptar</string>
+  <string name="notification_action_dismiss">Rexeitar</string>
+  <string name="notification_action_speaker_on">Activa o altofalante</string>
+  <string name="notification_action_speaker_off">Desactiva o altofalante</string>
+  <string name="notification_external_call">Chamada en curso noutro dispositivo</string>
+  <string name="notification_external_video_call">Videochamada en curso noutro dispositivo</string>
+  <string name="notification_take_call">Responder á chamada</string>
+  <string name="notification_take_video_call">Responder á videochamada</string>
+  <string name="incall_error_supp_service_unknown">Servizo non compatible.</string>
+  <string name="goPrivate">activar o modo privado</string>
+  <string name="manageConferenceLabel">Xestionar confer. telefónica</string>
+  <string name="child_number">a través do %s</string>
+  <string name="callFailed_simError">Non hai SIM ou hai un erro na SIM</string>
+  <string name="conference_caller_disconnect_content_description">Finalizar chamada</string>
+  <string name="conference_call_name">Conferencia telefónica</string>
+  <string name="generic_conference_call_name">Chamada en curso</string>
+  <string name="video_call_wifi_to_lte_handover_toast">Continuando a chamada con datos móbiles…</string>
+  <string name="video_call_lte_to_wifi_failed_title">Non se puido cambiar á rede wifi</string>
+  <string name="video_call_lte_to_wifi_failed_message">A videochamada permanecerá na rede móbil. É posible que se apliquen tarifas de datos estándar.</string>
+  <string name="video_call_lte_to_wifi_failed_do_not_show">Non mostrar de novo</string>
+  <string name="bubble_return_to_call">Volver á chamada</string>
+  <string name="rtt_request_dialog_title">Queres unirte á chamada RTT?</string>
+  <string name="rtt_request_dialog_details">%1$s quere usar a mensaxaría na túa chamada de voz.</string>
+  <string name="rtt_request_dialog_more_information">A función RTT constitúe unha axuda para todos aqueles emisores de chamadas que padezan xordeira ou outros problemas auditivos, teñan algún trastorno da fala ou necesiten algo máis que a voz para comunicarse.</string>
+  <string name="rtt_button_decline_request">Non, grazas</string>
+  <string name="rtt_button_accept_request">Unirse a RTT</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-gu/strings.xml b/java/com/android/incallui/res/values-gu/strings.xml
index 86fea94..6c946f5 100644
--- a/java/com/android/incallui/res/values-gu/strings.xml
+++ b/java/com/android/incallui/res/values-gu/strings.xml
@@ -1,79 +1,68 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"ફોન"</string>
-    <string name="wait_prompt_str" msgid="3509685348904329594">"નીચે આપેલ ટોન્સ મોકલીએ?\n"</string>
-    <string name="pause_prompt_yes" msgid="4642047011233552973">"હા"</string>
-    <string name="pause_prompt_no" msgid="4691320111774935838">"નહીં"</string>
-    <string name="notification_dialing" msgid="9072177265772083826">"ડાયલ કરી રહ્યાં છે"</string>
-    <string name="notification_ongoing_call" msgid="8712641937577776125">"ચાલી રહેલ કૉલ"</string>
-    <string name="notification_ongoing_video_call" msgid="6331318021321487769">"ચાલુ વીડિઓ કૉલ"</string>
-    <string name="notification_ongoing_paused_video_call" msgid="709950253594606371">"ચાલુ વીડિઓ કૉલ ‑ વીડિઓ થોભાવ્યો"</string>
-    <string name="notification_ongoing_work_call" msgid="3189581218078981547">"ચાલી રહેલ કાર્ય કૉલ"</string>
-    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"ચાલી રહેલ <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
-    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"ઇનકમિંગ <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
-    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"વાઇ-ફાઇ કૉલ"</string>
-    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"વાઇ-ફાઇ કાર્ય કૉલ"</string>
-    <string name="notification_on_hold" msgid="7141827443379205682">"હોલ્ડ પર"</string>
-    <string name="notification_incoming_call" msgid="7520580807513849283">"ઇનકમિંગ કૉલ"</string>
-    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"ફોટો સાથે ઇનકમિંગ કૉલ"</string>
-    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"સંદેશ સાથે ઇનકમિંગ કૉલ"</string>
-    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"સ્થાન સાથે ઇનકમિંગ કૉલ"</string>
-    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"ફોટો અને સંદેશ સાથે ઇનકમિંગ કૉલ"</string>
-    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"ફોટો અને સ્થાન સાથે ઇનકમિંગ કૉલ"</string>
-    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"સંદેશ અને સ્થાન સાથે ઇનકમિંગ કૉલ"</string>
-    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"ફોટો, સંદેશ અને સ્થાન સાથે ઇનકમિંગ કૉલ"</string>
-    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"જોડાણો સાથે ઇનકમિંગ કૉલ"</string>
-    <string name="important_notification_incoming_call" msgid="2867013954509930989">"મહત્વનો ઇનકમિંગ કૉલ"</string>
-    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"ફોટો સાથે મહત્વનો ઇનકમિંગ કૉલ"</string>
-    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"સંદેશ સાથે મહત્વનો ઇનકમિંગ કૉલ"</string>
-    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"સ્થાન સાથે મહત્વનો ઇનકમિંગ કૉલ"</string>
-    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"ફોટો અને સંદેશ સાથે મહત્વનો ઇનકમિંગ કૉલ"</string>
-    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"ફોટો અને સ્થાન સાથે મહત્વનો ઇનકમિંગ કૉલ"</string>
-    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"સંદેશ અને સ્થાન સાથે મહત્વનો ઇનકમિંગ કૉલ"</string>
-    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"ફોટો, સંદેશ અને સ્થાન સાથે મહત્વનો ઇનકમિંગ કૉલ"</string>
-    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"જોડાણો સાથે મહત્વનો ઇનકમિંગ કૉલ"</string>
-    <string name="notification_incoming_work_call" msgid="5291275092734261918">"ઇનકમિંગ કાર્ય કૉલ"</string>
-    <string name="notification_incoming_spam_call" msgid="7591506944666791937">"ઇનકમિંગ શંકાસ્પદ સ્પામ કૉલ"</string>
-    <string name="notification_requesting_video_call" msgid="1807679328811515758">"આવનાર વિડિઓ વિનંતી"</string>
-    <string name="notification_action_answer" msgid="8748275902211192568">"જવાબ"</string>
-    <string name="notification_action_end_call" msgid="7467258454170007765">"સમાપ્ત કરો"</string>
-    <string name="notification_action_answer_video" msgid="8488108892919917287">"વિડિઓ"</string>
-    <string name="notification_action_accept" msgid="1272761514200507143">"સ્વીકારો"</string>
-    <string name="notification_action_dismiss" msgid="3128241581632616226">"નકારો"</string>
-    <string name="notification_action_speaker_on" msgid="1882659234405596540">"સ્પીકર ચાલુ કરો"</string>
-    <string name="notification_action_speaker_off" msgid="6340085043115533948">"સ્પીકર બંધ કરો"</string>
-    <string name="notification_external_call" msgid="2504334597315343920">"અન્ય ઉપકરણ પર ચાલી રહેલ કૉલ"</string>
-    <string name="notification_external_video_call" msgid="7709394856028436683">"અન્ય ઉપકરણ પર ચાલી રહેલ વિડિઓ કૉલ"</string>
-    <string name="notification_take_call" msgid="5631659438864492229">"કૉલ લો"</string>
-    <string name="notification_take_video_call" msgid="4473387503712341390">"વિડિઓ કૉલ લો"</string>
-    <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"સેવા સમર્થિત નથી."</string>
-    <string name="goPrivate" msgid="5269514638004595378">"ખાનગી જાઓ"</string>
-    <string name="manageConferenceLabel" msgid="3589379023518128318">"કોન્ફરન્સ કૉલ સંચાલિત કરો"</string>
-    <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"કટોકટીનો નંબર"</string>
-    <string name="child_number" msgid="3398257437107259682">"<xliff:g id="CHILD_NUMBER">%s</xliff:g> મારફતે"</string>
-    <string name="callFailed_simError" msgid="4587775795711340072">"કોઈ SIM નથી અથવા SIM ભૂલ"</string>
-    <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"કૉલ સમાપ્ત કરો"</string>
-    <string name="conference_call_name" msgid="8189987124611337174">"કૉન્ફરન્સ કૉલ"</string>
-    <string name="generic_conference_call_name" msgid="1546941472424243894">"કૉલમાં"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"મોબાઇલ ડેટાની મદદથી કૉલ ચાલુ રાખી રહ્યાં છે…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Wi-Fi નેટવર્ક પર સ્વિચ કરી શક્યાં નથી"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"વિડિઓ કૉલ, મોબાઇલ નેટવર્ક પર રહેશે. માનક ડેટા શુલ્ક લાગુ થઈ શકે છે."</string>
-    <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"આ ફરીથી બતાવશો નહીં"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="wait_prompt_str">નીચે આપેલ ટોન્સ મોકલીએ?\n</string>
+  <string name="pause_prompt_yes">હા</string>
+  <string name="pause_prompt_no">નહીં</string>
+  <string name="notification_dialing">ડાયલ કરી રહ્યાં છે</string>
+  <string name="notification_ongoing_call">ચાલી રહેલ કૉલ</string>
+  <string name="notification_ongoing_video_call">ચાલુ વીડિઓ કૉલ</string>
+  <string name="notification_ongoing_paused_video_call">ચાલુ વીડિઓ કૉલ ‑ વીડિઓ થોભાવ્યો</string>
+  <string name="notification_ongoing_work_call">ચાલી રહેલ કાર્ય કૉલ</string>
+  <string name="notification_ongoing_call_wifi_template">ચાલી રહેલ %1$s</string>
+  <string name="notification_incoming_call_wifi_template">ઇનકમિંગ %1$s</string>
+  <string name="notification_call_wifi_brand">વાઇ-ફાઇ કૉલ</string>
+  <string name="notification_call_wifi_work_brand">વાઇ-ફાઇ કાર્ય કૉલ</string>
+  <string name="notification_on_hold">હોલ્ડ પર</string>
+  <string name="notification_incoming_call">ઇનકમિંગ કૉલ</string>
+  <string name="notification_incoming_video_call">ઇન્કમિંગ વિડિઓ કૉલ</string>
+  <string name="notification_incoming_call_mutli_sim">%1$s મારફતે ઇનકમિંગ કૉલ</string>
+  <string name="notification_incoming_call_with_photo">ફોટો સાથે ઇનકમિંગ કૉલ</string>
+  <string name="notification_incoming_call_with_message">સંદેશ સાથે ઇનકમિંગ કૉલ</string>
+  <string name="notification_incoming_call_with_location">સ્થાન સાથે ઇનકમિંગ કૉલ</string>
+  <string name="notification_incoming_call_with_photo_message">ફોટો અને સંદેશ સાથે ઇનકમિંગ કૉલ</string>
+  <string name="notification_incoming_call_with_photo_location">ફોટો અને સ્થાન સાથે ઇનકમિંગ કૉલ</string>
+  <string name="notification_incoming_call_with_message_location">સંદેશ અને સ્થાન સાથે ઇનકમિંગ કૉલ</string>
+  <string name="notification_incoming_call_with_photo_message_location">ફોટો, સંદેશ અને સ્થાન સાથે ઇનકમિંગ કૉલ</string>
+  <string name="notification_incoming_call_attachments">જોડાણો સાથે ઇનકમિંગ કૉલ</string>
+  <string name="important_notification_incoming_call">મહત્વનો ઇનકમિંગ કૉલ</string>
+  <string name="important_notification_incoming_call_with_photo">ફોટો સાથે મહત્વનો ઇનકમિંગ કૉલ</string>
+  <string name="important_notification_incoming_call_with_message">સંદેશ સાથે મહત્વનો ઇનકમિંગ કૉલ</string>
+  <string name="important_notification_incoming_call_with_location">સ્થાન સાથે મહત્વનો ઇનકમિંગ કૉલ</string>
+  <string name="important_notification_incoming_call_with_photo_message">ફોટો અને સંદેશ સાથે મહત્વનો ઇનકમિંગ કૉલ</string>
+  <string name="important_notification_incoming_call_with_photo_location">ફોટો અને સ્થાન સાથે મહત્વનો ઇનકમિંગ કૉલ</string>
+  <string name="important_notification_incoming_call_with_message_location">સંદેશ અને સ્થાન સાથે મહત્વનો ઇનકમિંગ કૉલ</string>
+  <string name="important_notification_incoming_call_with_photo_message_location">ફોટો, સંદેશ અને સ્થાન સાથે મહત્વનો ઇનકમિંગ કૉલ</string>
+  <string name="important_notification_incoming_call_attachments">જોડાણો સાથે મહત્વનો ઇનકમિંગ કૉલ</string>
+  <string name="notification_incoming_work_call">ઇનકમિંગ કાર્ય કૉલ</string>
+  <string name="notification_incoming_spam_call">ઇનકમિંગ શંકાસ્પદ સ્પામ કૉલ</string>
+  <string name="notification_requesting_video_call">આવનાર વિડિઓ વિનંતી</string>
+  <string name="notification_action_answer">જવાબ</string>
+  <string name="notification_action_end_call">સમાપ્ત કરો</string>
+  <string name="notification_action_answer_video">વિડિઓ</string>
+  <string name="notification_action_accept">સ્વીકારો</string>
+  <string name="notification_action_dismiss">નકારો</string>
+  <string name="notification_action_speaker_on">સ્પીકર ચાલુ કરો</string>
+  <string name="notification_action_speaker_off">સ્પીકર બંધ કરો</string>
+  <string name="notification_external_call">અન્ય ઉપકરણ પર ચાલી રહેલ કૉલ</string>
+  <string name="notification_external_video_call">અન્ય ઉપકરણ પર ચાલી રહેલ વિડિઓ કૉલ</string>
+  <string name="notification_take_call">કૉલ લો</string>
+  <string name="notification_take_video_call">વિડિઓ કૉલ લો</string>
+  <string name="incall_error_supp_service_unknown">સેવા સમર્થિત નથી.</string>
+  <string name="goPrivate">ખાનગી જાઓ</string>
+  <string name="manageConferenceLabel">કોન્ફરન્સ કૉલ સંચાલિત કરો</string>
+  <string name="child_number">%s મારફતે</string>
+  <string name="callFailed_simError">કોઈ SIM નથી અથવા SIM ભૂલ</string>
+  <string name="conference_caller_disconnect_content_description">કૉલ સમાપ્ત કરો</string>
+  <string name="conference_call_name">કૉન્ફરન્સ કૉલ</string>
+  <string name="generic_conference_call_name">કૉલમાં</string>
+  <string name="video_call_wifi_to_lte_handover_toast">મોબાઇલ ડેટાની મદદથી કૉલ ચાલુ રાખી રહ્યાં છે…</string>
+  <string name="video_call_lte_to_wifi_failed_title">Wi-Fi નેટવર્ક પર સ્વિચ કરી શક્યાં નથી</string>
+  <string name="video_call_lte_to_wifi_failed_message">વિડિઓ કૉલ, મોબાઇલ નેટવર્ક પર રહેશે. માનક ડેટા શુલ્ક લાગુ થઈ શકે છે.</string>
+  <string name="video_call_lte_to_wifi_failed_do_not_show">આ ફરીથી બતાવશો નહીં</string>
+  <string name="bubble_return_to_call">કૉલ પર પાછા</string>
+  <string name="rtt_request_dialog_title">RTT કૉલમાં જોડાઈએ?</string>
+  <string name="rtt_request_dialog_details">તમારા વૉઇસ કૉલમાંથી જ %1$s મેસેજિંગનો ઉપયોગ કરવા માગે છે.</string>
+  <string name="rtt_request_dialog_more_information">જેઓ બહેરા, ઓછું સાંભળતા, બોલવામાં તકલીફવાળા અથવા જેમને માત્ર વૉઇસ કરતાં પણ કંઈક વધુની જરૂર હોય એવા કૉલરોને RTT સહાય કરે છે.</string>
+  <string name="rtt_button_decline_request">ના, આભાર</string>
+  <string name="rtt_button_accept_request">RTTમાં જોડાઓ</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-hi/strings.xml b/java/com/android/incallui/res/values-hi/strings.xml
index e3cac67..7993734 100644
--- a/java/com/android/incallui/res/values-hi/strings.xml
+++ b/java/com/android/incallui/res/values-hi/strings.xml
@@ -1,79 +1,68 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"फ़ोन"</string>
-    <string name="wait_prompt_str" msgid="3509685348904329594">"निम्न टोन भेजें?\n"</string>
-    <string name="pause_prompt_yes" msgid="4642047011233552973">"हां"</string>
-    <string name="pause_prompt_no" msgid="4691320111774935838">"नहीं"</string>
-    <string name="notification_dialing" msgid="9072177265772083826">"डायल किया जा रहा है"</string>
-    <string name="notification_ongoing_call" msgid="8712641937577776125">"चल रही कॉल"</string>
-    <string name="notification_ongoing_video_call" msgid="6331318021321487769">"जारी वीडियो कॉल"</string>
-    <string name="notification_ongoing_paused_video_call" msgid="709950253594606371">"जारी वीडियो कॉल ‑ वीडियो रुक गया"</string>
-    <string name="notification_ongoing_work_call" msgid="3189581218078981547">"कार्यस्थल की जारी कॉल"</string>
-    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"जारी <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
-    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"इनकमिंग <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
-    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"वाई‑फ़ाई कॉल"</string>
-    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"कार्य संबंधी वाई-फ़ाई कॉल"</string>
-    <string name="notification_on_hold" msgid="7141827443379205682">"होल्ड पर"</string>
-    <string name="notification_incoming_call" msgid="7520580807513849283">"इनकमिंग कॉल"</string>
-    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"फ़ोटो के साथ इनकमिंग कॉल"</string>
-    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"संदेश के साथ इनकमिंग कॉल"</string>
-    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"स्थान के साथ इनकमिंग कॉल"</string>
-    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"फ़ोटो और संदेश के साथ इनकमिंग कॉल"</string>
-    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"फ़ोटो और स्थान के साथ इनकमिंग कॉल"</string>
-    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"संदेश और स्थान के साथ इनकमिंग कॉल"</string>
-    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"फ़ोटो, संदेश और स्थान के साथ इनकमिंग कॉल"</string>
-    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"अटैचमेंट के साथ इनकमिंग कॉल"</string>
-    <string name="important_notification_incoming_call" msgid="2867013954509930989">"महत्वपूर्ण इनकमिंग कॉल"</string>
-    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"फ़ोटो के साथ महत्वपूर्ण इनकमिंग कॉल"</string>
-    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"संदेश के साथ महत्वपूर्ण इनकमिंग कॉल"</string>
-    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"स्थान के साथ महत्वपूर्ण इनकमिंग कॉल"</string>
-    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"फ़ोटो और संदेश के साथ महत्वपूर्ण इनकमिंग कॉल"</string>
-    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"फ़ोटो और स्थान के साथ महत्वपूर्ण इनकमिंग कॉल"</string>
-    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"संदेश और स्थान के साथ महत्वपूर्ण इनकमिंग कॉल"</string>
-    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"फोटो, संदेश और स्थान के साथ महत्वपूर्ण इनकमिंग कॉल"</string>
-    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"अटैचमेंट के साथ महत्वपूर्ण इनकमिंग कॉल"</string>
-    <string name="notification_incoming_work_call" msgid="5291275092734261918">"कार्यस्थल की आवक कॉल"</string>
-    <string name="notification_incoming_spam_call" msgid="7591506944666791937">"संदिग्ध आवक स्पैम कॉल"</string>
-    <string name="notification_requesting_video_call" msgid="1807679328811515758">"इनकमिंग वीडियो अनुरोध"</string>
-    <string name="notification_action_answer" msgid="8748275902211192568">"उत्तर"</string>
-    <string name="notification_action_end_call" msgid="7467258454170007765">"समाप्त करें"</string>
-    <string name="notification_action_answer_video" msgid="8488108892919917287">"वीडियो"</string>
-    <string name="notification_action_accept" msgid="1272761514200507143">"स्वीकार करें"</string>
-    <string name="notification_action_dismiss" msgid="3128241581632616226">"अस्वीकार करें"</string>
-    <string name="notification_action_speaker_on" msgid="1882659234405596540">"स्पीकर चालू करें"</string>
-    <string name="notification_action_speaker_off" msgid="6340085043115533948">"स्पीकर बंद करें"</string>
-    <string name="notification_external_call" msgid="2504334597315343920">"दूसरे डिवाइस पर चल रहा कॉल"</string>
-    <string name="notification_external_video_call" msgid="7709394856028436683">"दूसरे डिवाइस पर चल रहा वीडियो कॉल"</string>
-    <string name="notification_take_call" msgid="5631659438864492229">"कॉल लें"</string>
-    <string name="notification_take_video_call" msgid="4473387503712341390">"वीडियो कॉल लें"</string>
-    <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"सेवा समर्थित नहीं है."</string>
-    <string name="goPrivate" msgid="5269514638004595378">"निजी हो जाएं"</string>
-    <string name="manageConferenceLabel" msgid="3589379023518128318">"कॉन्फ़्रेंस कॉल प्रबंधित करें"</string>
-    <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"आपातकालीन नंबर"</string>
-    <string name="child_number" msgid="3398257437107259682">"<xliff:g id="CHILD_NUMBER">%s</xliff:g> के द्वारा"</string>
-    <string name="callFailed_simError" msgid="4587775795711340072">"कोई सिम नहीं या सिम गड़बड़ी"</string>
-    <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"कॉल समाप्त करें"</string>
-    <string name="conference_call_name" msgid="8189987124611337174">"कॉन्फ़्रेंस कॉल"</string>
-    <string name="generic_conference_call_name" msgid="1546941472424243894">"कॉल में"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"मोबाइल डेटा का उपयोग करके कॉल जारी रखा जा रहा है…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Wi‑Fi नेटवर्क पर स्विच नहीं कर सका"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"वीडियो कॉल मोबाइल नेटवर्क पर बना रहेगा. मानक डेटा शुल्क लागू हो सकते हैं."</string>
-    <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"इसे दोबारा न दिखाएं"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="wait_prompt_str">निम्न टोन भेजें?\n</string>
+  <string name="pause_prompt_yes">हां</string>
+  <string name="pause_prompt_no">नहीं</string>
+  <string name="notification_dialing">डायल किया जा रहा है</string>
+  <string name="notification_ongoing_call">चल रही कॉल</string>
+  <string name="notification_ongoing_video_call">जारी वीडियो कॉल</string>
+  <string name="notification_ongoing_paused_video_call">जारी वीडियो कॉल ‑ वीडियो रुक गया</string>
+  <string name="notification_ongoing_work_call">कार्यस्थल की जारी कॉल</string>
+  <string name="notification_ongoing_call_wifi_template">जारी %1$s</string>
+  <string name="notification_incoming_call_wifi_template">इनकमिंग %1$s</string>
+  <string name="notification_call_wifi_brand">वाई‑फ़ाई कॉल</string>
+  <string name="notification_call_wifi_work_brand">कार्य संबंधी वाई-फ़ाई कॉल</string>
+  <string name="notification_on_hold">होल्ड पर</string>
+  <string name="notification_incoming_call">इनकमिंग कॉल</string>
+  <string name="notification_incoming_video_call">इनकमिंग वीडियो कॉल</string>
+  <string name="notification_incoming_call_mutli_sim">%1$s पर कॉल आ रहा है</string>
+  <string name="notification_incoming_call_with_photo">फ़ोटो के साथ इनकमिंग कॉल</string>
+  <string name="notification_incoming_call_with_message">संदेश के साथ इनकमिंग कॉल</string>
+  <string name="notification_incoming_call_with_location">स्थान के साथ इनकमिंग कॉल</string>
+  <string name="notification_incoming_call_with_photo_message">फ़ोटो और संदेश के साथ इनकमिंग कॉल</string>
+  <string name="notification_incoming_call_with_photo_location">फ़ोटो और स्थान के साथ इनकमिंग कॉल</string>
+  <string name="notification_incoming_call_with_message_location">संदेश और स्थान के साथ इनकमिंग कॉल</string>
+  <string name="notification_incoming_call_with_photo_message_location">फ़ोटो, संदेश और स्थान के साथ इनकमिंग कॉल</string>
+  <string name="notification_incoming_call_attachments">अटैचमेंट के साथ इनकमिंग कॉल</string>
+  <string name="important_notification_incoming_call">महत्वपूर्ण इनकमिंग कॉल</string>
+  <string name="important_notification_incoming_call_with_photo">फ़ोटो के साथ महत्वपूर्ण इनकमिंग कॉल</string>
+  <string name="important_notification_incoming_call_with_message">संदेश के साथ महत्वपूर्ण इनकमिंग कॉल</string>
+  <string name="important_notification_incoming_call_with_location">स्थान के साथ महत्वपूर्ण इनकमिंग कॉल</string>
+  <string name="important_notification_incoming_call_with_photo_message">फ़ोटो और संदेश के साथ महत्वपूर्ण इनकमिंग कॉल</string>
+  <string name="important_notification_incoming_call_with_photo_location">फ़ोटो और स्थान के साथ महत्वपूर्ण इनकमिंग कॉल</string>
+  <string name="important_notification_incoming_call_with_message_location">संदेश और स्थान के साथ महत्वपूर्ण इनकमिंग कॉल</string>
+  <string name="important_notification_incoming_call_with_photo_message_location">फोटो, संदेश और स्थान के साथ महत्वपूर्ण इनकमिंग कॉल</string>
+  <string name="important_notification_incoming_call_attachments">अटैचमेंट के साथ महत्वपूर्ण इनकमिंग कॉल</string>
+  <string name="notification_incoming_work_call">कार्यस्थल की आवक कॉल</string>
+  <string name="notification_incoming_spam_call">संदिग्ध आवक स्पैम कॉल</string>
+  <string name="notification_requesting_video_call">इनकमिंग वीडियो अनुरोध</string>
+  <string name="notification_action_answer">उत्तर</string>
+  <string name="notification_action_end_call">समाप्त करें</string>
+  <string name="notification_action_answer_video">वीडियो</string>
+  <string name="notification_action_accept">स्वीकार करें</string>
+  <string name="notification_action_dismiss">अस्वीकार करें</string>
+  <string name="notification_action_speaker_on">स्पीकर चालू करें</string>
+  <string name="notification_action_speaker_off">स्पीकर बंद करें</string>
+  <string name="notification_external_call">दूसरे डिवाइस पर चल रहा कॉल</string>
+  <string name="notification_external_video_call">दूसरे डिवाइस पर चल रहा वीडियो कॉल</string>
+  <string name="notification_take_call">कॉल लें</string>
+  <string name="notification_take_video_call">वीडियो कॉल लें</string>
+  <string name="incall_error_supp_service_unknown">सेवा समर्थित नहीं है.</string>
+  <string name="goPrivate">निजी हो जाएं</string>
+  <string name="manageConferenceLabel">कॉन्फ़्रेंस कॉल प्रबंधित करें</string>
+  <string name="child_number">%s के द्वारा</string>
+  <string name="callFailed_simError">कोई सिम नहीं या सिम गड़बड़ी</string>
+  <string name="conference_caller_disconnect_content_description">कॉल समाप्त करें</string>
+  <string name="conference_call_name">कॉन्फ़्रेंस कॉल</string>
+  <string name="generic_conference_call_name">कॉल में</string>
+  <string name="video_call_wifi_to_lte_handover_toast">मोबाइल डेटा का उपयोग करके कॉल जारी रखा जा रहा है…</string>
+  <string name="video_call_lte_to_wifi_failed_title">Wi‑Fi नेटवर्क पर स्विच नहीं कर सका</string>
+  <string name="video_call_lte_to_wifi_failed_message">वीडियो कॉल मोबाइल नेटवर्क पर बना रहेगा. मानक डेटा शुल्क लागू हो सकते हैं.</string>
+  <string name="video_call_lte_to_wifi_failed_do_not_show">इसे दोबारा न दिखाएं</string>
+  <string name="bubble_return_to_call">कॉल पर वापस जाएं</string>
+  <string name="rtt_request_dialog_title">आरटीटी कॉल में शामिल हों?</string>
+  <string name="rtt_request_dialog_details">%1$s को आपके वॉइस कॉल में मैसेज सेवा का उपयोग करना है.</string>
+  <string name="rtt_request_dialog_more_information">आरटीटी सुविधा ऐसे कॉल करने वालों (कॉलर) की मदद करती है, जो बधिर हैं, ऊंचा सुनते हैं, ठीक से बोल नहीं पाते या जिनके लिए सिर्फ़ आवाज़ काफ़ी नहीं होती.</string>
+  <string name="rtt_button_decline_request">नहीं, धन्यवाद</string>
+  <string name="rtt_button_accept_request">आरटीटी में शामिल हों</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-hr/strings.xml b/java/com/android/incallui/res/values-hr/strings.xml
index d3e4a9f..c84b208 100644
--- a/java/com/android/incallui/res/values-hr/strings.xml
+++ b/java/com/android/incallui/res/values-hr/strings.xml
@@ -1,79 +1,68 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"Telefon"</string>
-    <string name="wait_prompt_str" msgid="3509685348904329594">"Poslati sljedeće tonove?\n"</string>
-    <string name="pause_prompt_yes" msgid="4642047011233552973">"Da"</string>
-    <string name="pause_prompt_no" msgid="4691320111774935838">"Ne"</string>
-    <string name="notification_dialing" msgid="9072177265772083826">"Biranje broja"</string>
-    <string name="notification_ongoing_call" msgid="8712641937577776125">"Poziv u tijeku"</string>
-    <string name="notification_ongoing_video_call" msgid="6331318021321487769">"Videopoziv u tijeku"</string>
-    <string name="notification_ongoing_paused_video_call" msgid="709950253594606371">"Videopoziv u tijeku – videopoziv pauziran"</string>
-    <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Poslovni poziv u tijeku"</string>
-    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"U tijeku: <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
-    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"Dolazno: <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
-    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"Wi-Fi poziv"</string>
-    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"Wi‑Fi poslovni poziv"</string>
-    <string name="notification_on_hold" msgid="7141827443379205682">"Na čekanju"</string>
-    <string name="notification_incoming_call" msgid="7520580807513849283">"Dolazni poziv"</string>
-    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Dolazni poziv s fotografijom"</string>
-    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"Dolazni poziv s porukom"</string>
-    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"Dolazni poziv s lokacijom"</string>
-    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"Dolazni poziv s fotografijom i porukom"</string>
-    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"Dolazni poziv s fotografijom i lokacijom"</string>
-    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"Dolazni poziv s porukom i lokacijom"</string>
-    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"Dolazni poziv s fotografijom, porukom i lokacijom"</string>
-    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"Dolazni poziv s privicima"</string>
-    <string name="important_notification_incoming_call" msgid="2867013954509930989">"Važan dolazni poziv"</string>
-    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"Važan dolazni poziv s fotografijom"</string>
-    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"Važan dolazni poziv s porukom"</string>
-    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"Važan dolazni poziv s lokacijom"</string>
-    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"Važan dolazni poziv s fotografijom i porukom"</string>
-    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"Važan dolazni poziv s fotografijom i lokacijom"</string>
-    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"Važan dolazni poziv s porukom i lokacijom"</string>
-    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Važan poziv s fotografijom, porukom i lokacijom"</string>
-    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Važan dolazni poziv s privicima"</string>
-    <string name="notification_incoming_work_call" msgid="5291275092734261918">"Dolazni poslovni poziv"</string>
-    <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Mogući neželjeni dolazni poziv"</string>
-    <string name="notification_requesting_video_call" msgid="1807679328811515758">"Dolazni zahtjev za videopoziv"</string>
-    <string name="notification_action_answer" msgid="8748275902211192568">"Odgovori"</string>
-    <string name="notification_action_end_call" msgid="7467258454170007765">"Prekini vezu"</string>
-    <string name="notification_action_answer_video" msgid="8488108892919917287">"Videozapis"</string>
-    <string name="notification_action_accept" msgid="1272761514200507143">"Prihvaćam"</string>
-    <string name="notification_action_dismiss" msgid="3128241581632616226">"Odbijanje"</string>
-    <string name="notification_action_speaker_on" msgid="1882659234405596540">"Uključivanje zvučnika"</string>
-    <string name="notification_action_speaker_off" msgid="6340085043115533948">"Isključivanje zvučnika"</string>
-    <string name="notification_external_call" msgid="2504334597315343920">"Poziv u tijeku na drugom uređaju"</string>
-    <string name="notification_external_video_call" msgid="7709394856028436683">"U tijeku je videopoziv na drugom uređaju"</string>
-    <string name="notification_take_call" msgid="5631659438864492229">"Preuzimanje poziva"</string>
-    <string name="notification_take_video_call" msgid="4473387503712341390">"Preuzimanje videopoziva"</string>
-    <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"Usluga nije podržana."</string>
-    <string name="goPrivate" msgid="5269514638004595378">"na privatno"</string>
-    <string name="manageConferenceLabel" msgid="3589379023518128318">"Upravljaj konf. pozivom"</string>
-    <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"Broj hitne službe"</string>
-    <string name="child_number" msgid="3398257437107259682">"putem <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
-    <string name="callFailed_simError" msgid="4587775795711340072">"Nema SIM-a ili SIM ima pogrešku"</string>
-    <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Prekid poziva"</string>
-    <string name="conference_call_name" msgid="8189987124611337174">"Konferencijski poziv"</string>
-    <string name="generic_conference_call_name" msgid="1546941472424243894">"Poziv u tijeku"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Poziv se nastavlja pomoću mobilnih podataka..."</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Prebacivanje na Wi-Fi mrežu nije moguće"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Videopoziv će ostati na mobilnoj mreži. Možda ćete morati platiti podatkovni promet."</string>
-    <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Ne prikazuj ponovno"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="wait_prompt_str">Poslati sljedeće tonove?\n</string>
+  <string name="pause_prompt_yes">Da</string>
+  <string name="pause_prompt_no">Ne</string>
+  <string name="notification_dialing">Biranje broja</string>
+  <string name="notification_ongoing_call">Poziv u tijeku</string>
+  <string name="notification_ongoing_video_call">Videopoziv u tijeku</string>
+  <string name="notification_ongoing_paused_video_call">Videopoziv u tijeku – videopoziv pauziran</string>
+  <string name="notification_ongoing_work_call">Poslovni poziv u tijeku</string>
+  <string name="notification_ongoing_call_wifi_template">U tijeku: %1$s</string>
+  <string name="notification_incoming_call_wifi_template">Dolazno: %1$s</string>
+  <string name="notification_call_wifi_brand">Wi-Fi poziv</string>
+  <string name="notification_call_wifi_work_brand">Wi‑Fi poslovni poziv</string>
+  <string name="notification_on_hold">Na čekanju</string>
+  <string name="notification_incoming_call">Dolazni poziv</string>
+  <string name="notification_incoming_video_call">Dolazni videopoziv</string>
+  <string name="notification_incoming_call_mutli_sim">Dolazni poziv putem %1$s</string>
+  <string name="notification_incoming_call_with_photo">Dolazni poziv s fotografijom</string>
+  <string name="notification_incoming_call_with_message">Dolazni poziv s porukom</string>
+  <string name="notification_incoming_call_with_location">Dolazni poziv s lokacijom</string>
+  <string name="notification_incoming_call_with_photo_message">Dolazni poziv s fotografijom i porukom</string>
+  <string name="notification_incoming_call_with_photo_location">Dolazni poziv s fotografijom i lokacijom</string>
+  <string name="notification_incoming_call_with_message_location">Dolazni poziv s porukom i lokacijom</string>
+  <string name="notification_incoming_call_with_photo_message_location">Dolazni poziv s fotografijom, porukom i lokacijom</string>
+  <string name="notification_incoming_call_attachments">Dolazni poziv s privicima</string>
+  <string name="important_notification_incoming_call">Važan dolazni poziv</string>
+  <string name="important_notification_incoming_call_with_photo">Važan dolazni poziv s fotografijom</string>
+  <string name="important_notification_incoming_call_with_message">Važan dolazni poziv s porukom</string>
+  <string name="important_notification_incoming_call_with_location">Važan dolazni poziv s lokacijom</string>
+  <string name="important_notification_incoming_call_with_photo_message">Važan dolazni poziv s fotografijom i porukom</string>
+  <string name="important_notification_incoming_call_with_photo_location">Važan dolazni poziv s fotografijom i lokacijom</string>
+  <string name="important_notification_incoming_call_with_message_location">Važan dolazni poziv s porukom i lokacijom</string>
+  <string name="important_notification_incoming_call_with_photo_message_location">Važan poziv s fotografijom, porukom i lokacijom</string>
+  <string name="important_notification_incoming_call_attachments">Važan dolazni poziv s privicima</string>
+  <string name="notification_incoming_work_call">Dolazni poslovni poziv</string>
+  <string name="notification_incoming_spam_call">Mogući neželjeni dolazni poziv</string>
+  <string name="notification_requesting_video_call">Dolazni zahtjev za videopoziv</string>
+  <string name="notification_action_answer">Odgovori</string>
+  <string name="notification_action_end_call">Prekini vezu</string>
+  <string name="notification_action_answer_video">Videozapis</string>
+  <string name="notification_action_accept">Prihvaćam</string>
+  <string name="notification_action_dismiss">Odbijanje</string>
+  <string name="notification_action_speaker_on">Uključivanje zvučnika</string>
+  <string name="notification_action_speaker_off">Isključivanje zvučnika</string>
+  <string name="notification_external_call">Poziv u tijeku na drugom uređaju</string>
+  <string name="notification_external_video_call">U tijeku je videopoziv na drugom uređaju</string>
+  <string name="notification_take_call">Preuzimanje poziva</string>
+  <string name="notification_take_video_call">Preuzimanje videopoziva</string>
+  <string name="incall_error_supp_service_unknown">Usluga nije podržana.</string>
+  <string name="goPrivate">na privatno</string>
+  <string name="manageConferenceLabel">Upravljaj konf. pozivom</string>
+  <string name="child_number">putem %s</string>
+  <string name="callFailed_simError">Nema SIM-a ili SIM ima pogrešku</string>
+  <string name="conference_caller_disconnect_content_description">Prekid poziva</string>
+  <string name="conference_call_name">Konferencijski poziv</string>
+  <string name="generic_conference_call_name">Poziv u tijeku</string>
+  <string name="video_call_wifi_to_lte_handover_toast">Poziv se nastavlja pomoću mobilnih podataka...</string>
+  <string name="video_call_lte_to_wifi_failed_title">Prebacivanje na Wi-Fi mrežu nije moguće</string>
+  <string name="video_call_lte_to_wifi_failed_message">Videopoziv će ostati na mobilnoj mreži. Možda ćete morati platiti podatkovni promet.</string>
+  <string name="video_call_lte_to_wifi_failed_do_not_show">Ne prikazuj ponovno</string>
+  <string name="bubble_return_to_call">Natrag na poziv</string>
+  <string name="rtt_request_dialog_title">Želite li se pridružiti RTT pozivu?</string>
+  <string name="rtt_request_dialog_details">%1$s želi slati poruke u vašem glasovnom pozivu.</string>
+  <string name="rtt_request_dialog_more_information">RTT pomaže pozivateljima koji su gluhi, nagluhi, imaju govornu manu ili im je potrebno nešto više od glasa.</string>
+  <string name="rtt_button_decline_request">Ne, hvala</string>
+  <string name="rtt_button_accept_request">Pridruži se RTT-u</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-hu/strings.xml b/java/com/android/incallui/res/values-hu/strings.xml
index ce7f742..da152f4 100644
--- a/java/com/android/incallui/res/values-hu/strings.xml
+++ b/java/com/android/incallui/res/values-hu/strings.xml
@@ -1,79 +1,68 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"Telefon"</string>
-    <string name="wait_prompt_str" msgid="3509685348904329594">"Elküldi a következő hangjelzéseket?\n"</string>
-    <string name="pause_prompt_yes" msgid="4642047011233552973">"Igen"</string>
-    <string name="pause_prompt_no" msgid="4691320111774935838">"Nem"</string>
-    <string name="notification_dialing" msgid="9072177265772083826">"Tárcsázás"</string>
-    <string name="notification_ongoing_call" msgid="8712641937577776125">"Hívás folyamatban"</string>
-    <string name="notification_ongoing_video_call" msgid="6331318021321487769">"Videohívás folyamatban"</string>
-    <string name="notification_ongoing_paused_video_call" msgid="709950253594606371">"Videohívás folyamatban – videó szüneteltetve"</string>
-    <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Folyamatban lévő munkahelyi hívás"</string>
-    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"Folyamatban lévő <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
-    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"Bejövő <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
-    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"Wi-Fi-hívás"</string>
-    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"munkahelyi Wi‑Fi-hívás"</string>
-    <string name="notification_on_hold" msgid="7141827443379205682">"Tartásban"</string>
-    <string name="notification_incoming_call" msgid="7520580807513849283">"Bejövő hívás"</string>
-    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Bejövő hívás fotóval"</string>
-    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"Bejövő hívás üzenettel"</string>
-    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"Bejövő hívás hellyel"</string>
-    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"Bejövő hívás fotóval és üzenettel"</string>
-    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"Bejövő hívás fotóval és hellyel"</string>
-    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"Bejövő hívás üzenettel és hellyel"</string>
-    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"Bejövő hívás fotóval, üzenettel és hellyel"</string>
-    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"Bejövő hívás mellékletekkel"</string>
-    <string name="important_notification_incoming_call" msgid="2867013954509930989">"Fontos bejövő hívás"</string>
-    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"Fontos bejövő hívás fotóval"</string>
-    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"Fontos bejövő hívás üzenettel"</string>
-    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"Fontos bejövő hívás hellyel"</string>
-    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"Fontos bejövő hívás fotóval és üzenettel"</string>
-    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"Fontos bejövő hívás fotóval és hellyel"</string>
-    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"Fontos bejövő hívás üzenettel és hellyel"</string>
-    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Fontos bejövő hívás fotóval, üzenettel és hellyel"</string>
-    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Fontos bejövő hívás mellékletekkel"</string>
-    <string name="notification_incoming_work_call" msgid="5291275092734261918">"Bejövő munkahelyi hívás"</string>
-    <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Bejövő gyanús spamhívás"</string>
-    <string name="notification_requesting_video_call" msgid="1807679328811515758">"Bejövő videokérés"</string>
-    <string name="notification_action_answer" msgid="8748275902211192568">"Fogadás"</string>
-    <string name="notification_action_end_call" msgid="7467258454170007765">"Hívás befejezése"</string>
-    <string name="notification_action_answer_video" msgid="8488108892919917287">"Videó"</string>
-    <string name="notification_action_accept" msgid="1272761514200507143">"Elfogadás"</string>
-    <string name="notification_action_dismiss" msgid="3128241581632616226">"Elutasítás"</string>
-    <string name="notification_action_speaker_on" msgid="1882659234405596540">"Hangszóró bekapcsolása"</string>
-    <string name="notification_action_speaker_off" msgid="6340085043115533948">"Hangszóró kikapcsolása"</string>
-    <string name="notification_external_call" msgid="2504334597315343920">"Folyamatban lévő hívás egy másik eszközön"</string>
-    <string name="notification_external_video_call" msgid="7709394856028436683">"Folyamatban lévő videohívás egy másik eszközön"</string>
-    <string name="notification_take_call" msgid="5631659438864492229">"Hívás fogadása"</string>
-    <string name="notification_take_video_call" msgid="4473387503712341390">"Videohívás fogadása"</string>
-    <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"A szolgáltatás nem támogatott."</string>
-    <string name="goPrivate" msgid="5269514638004595378">"magánbeszélgetés"</string>
-    <string name="manageConferenceLabel" msgid="3589379023518128318">"Konferenciahívás kezelése"</string>
-    <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"Segélyhívó szám"</string>
-    <string name="child_number" msgid="3398257437107259682">"a következő számon keresztül: <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
-    <string name="callFailed_simError" msgid="4587775795711340072">"Hiányzó vagy hibás SIM kártya"</string>
-    <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Hívás befejezése"</string>
-    <string name="conference_call_name" msgid="8189987124611337174">"Konferenciahívás"</string>
-    <string name="generic_conference_call_name" msgid="1546941472424243894">"Hívásban"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Hívás folytatása mobil-adatkapcsolaton keresztül…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Nem sikerült Wi-Fi-hálózatra váltani"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"A videohívást továbbra is a mobilhálózaton folytatja. A mobilszolgáltató a normál adatforgalmi díjat számítja fel."</string>
-    <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Ne jelenjen meg többé"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="wait_prompt_str">Elküldi a következő hangjelzéseket?\n</string>
+  <string name="pause_prompt_yes">Igen</string>
+  <string name="pause_prompt_no">Nem</string>
+  <string name="notification_dialing">Tárcsázás</string>
+  <string name="notification_ongoing_call">Hívás folyamatban</string>
+  <string name="notification_ongoing_video_call">Videohívás folyamatban</string>
+  <string name="notification_ongoing_paused_video_call">Videohívás folyamatban – videó szüneteltetve</string>
+  <string name="notification_ongoing_work_call">Folyamatban lévő munkahelyi hívás</string>
+  <string name="notification_ongoing_call_wifi_template">Folyamatban lévő %1$s</string>
+  <string name="notification_incoming_call_wifi_template">Bejövő %1$s</string>
+  <string name="notification_call_wifi_brand">Wi-Fi-hívás</string>
+  <string name="notification_call_wifi_work_brand">munkahelyi Wi‑Fi-hívás</string>
+  <string name="notification_on_hold">Tartásban</string>
+  <string name="notification_incoming_call">Bejövő hívás</string>
+  <string name="notification_incoming_video_call">Bejövő videohívás</string>
+  <string name="notification_incoming_call_mutli_sim">Bejövő hívás a következőn: %1$s</string>
+  <string name="notification_incoming_call_with_photo">Bejövő hívás fotóval</string>
+  <string name="notification_incoming_call_with_message">Bejövő hívás üzenettel</string>
+  <string name="notification_incoming_call_with_location">Bejövő hívás hellyel</string>
+  <string name="notification_incoming_call_with_photo_message">Bejövő hívás fotóval és üzenettel</string>
+  <string name="notification_incoming_call_with_photo_location">Bejövő hívás fotóval és hellyel</string>
+  <string name="notification_incoming_call_with_message_location">Bejövő hívás üzenettel és hellyel</string>
+  <string name="notification_incoming_call_with_photo_message_location">Bejövő hívás fotóval, üzenettel és hellyel</string>
+  <string name="notification_incoming_call_attachments">Bejövő hívás mellékletekkel</string>
+  <string name="important_notification_incoming_call">Fontos bejövő hívás</string>
+  <string name="important_notification_incoming_call_with_photo">Fontos bejövő hívás fotóval</string>
+  <string name="important_notification_incoming_call_with_message">Fontos bejövő hívás üzenettel</string>
+  <string name="important_notification_incoming_call_with_location">Fontos bejövő hívás hellyel</string>
+  <string name="important_notification_incoming_call_with_photo_message">Fontos bejövő hívás fotóval és üzenettel</string>
+  <string name="important_notification_incoming_call_with_photo_location">Fontos bejövő hívás fotóval és hellyel</string>
+  <string name="important_notification_incoming_call_with_message_location">Fontos bejövő hívás üzenettel és hellyel</string>
+  <string name="important_notification_incoming_call_with_photo_message_location">Fontos bejövő hívás fotóval, üzenettel és hellyel</string>
+  <string name="important_notification_incoming_call_attachments">Fontos bejövő hívás mellékletekkel</string>
+  <string name="notification_incoming_work_call">Bejövő munkahelyi hívás</string>
+  <string name="notification_incoming_spam_call">Bejövő gyanús spamhívás</string>
+  <string name="notification_requesting_video_call">Bejövő videokérés</string>
+  <string name="notification_action_answer">Fogadás</string>
+  <string name="notification_action_end_call">Hívás befejezése</string>
+  <string name="notification_action_answer_video">Videó</string>
+  <string name="notification_action_accept">Elfogadás</string>
+  <string name="notification_action_dismiss">Elutasítás</string>
+  <string name="notification_action_speaker_on">Hangszóró bekapcsolása</string>
+  <string name="notification_action_speaker_off">Hangszóró kikapcsolása</string>
+  <string name="notification_external_call">Folyamatban lévő hívás egy másik eszközön</string>
+  <string name="notification_external_video_call">Folyamatban lévő videohívás egy másik eszközön</string>
+  <string name="notification_take_call">Hívás fogadása</string>
+  <string name="notification_take_video_call">Videohívás fogadása</string>
+  <string name="incall_error_supp_service_unknown">A szolgáltatás nem támogatott.</string>
+  <string name="goPrivate">magánbeszélgetés</string>
+  <string name="manageConferenceLabel">Konferenciahívás kezelése</string>
+  <string name="child_number">a következő számon keresztül: %s</string>
+  <string name="callFailed_simError">Hiányzó vagy hibás SIM kártya</string>
+  <string name="conference_caller_disconnect_content_description">Hívás befejezése</string>
+  <string name="conference_call_name">Konferenciahívás</string>
+  <string name="generic_conference_call_name">Hívásban</string>
+  <string name="video_call_wifi_to_lte_handover_toast">Hívás folytatása mobil-adatkapcsolaton keresztül…</string>
+  <string name="video_call_lte_to_wifi_failed_title">Nem sikerült Wi-Fi-hálózatra váltani</string>
+  <string name="video_call_lte_to_wifi_failed_message">A videohívást továbbra is a mobilhálózaton folytatja. A mobilszolgáltató a normál adatforgalmi díjat számítja fel.</string>
+  <string name="video_call_lte_to_wifi_failed_do_not_show">Ne jelenjen meg többé</string>
+  <string name="bubble_return_to_call">Vissza a híváshoz</string>
+  <string name="rtt_request_dialog_title">Csatlakozik az RTT-híváshoz?</string>
+  <string name="rtt_request_dialog_details">%1$s szeretne üzenetet váltani a hanghívásban.</string>
+  <string name="rtt_request_dialog_more_information">Az RTT funkció a siket, hallássérült, beszédzavaros vagy a hangalapú kommunikáción kívül más kommunikációt is igénylő hívóknak lehet segítségére.</string>
+  <string name="rtt_button_decline_request">Nem, köszönöm</string>
+  <string name="rtt_button_accept_request">Csatlakozás</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-hy/strings.xml b/java/com/android/incallui/res/values-hy/strings.xml
index bfd986b..5657308 100644
--- a/java/com/android/incallui/res/values-hy/strings.xml
+++ b/java/com/android/incallui/res/values-hy/strings.xml
@@ -1,79 +1,68 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"Հեռախոս"</string>
-    <string name="wait_prompt_str" msgid="3509685348904329594">"Ուղարկե՞լ հետևյալ ձայներանգները:\n"</string>
-    <string name="pause_prompt_yes" msgid="4642047011233552973">"Այո"</string>
-    <string name="pause_prompt_no" msgid="4691320111774935838">"Ոչ"</string>
-    <string name="notification_dialing" msgid="9072177265772083826">"Համարը հավաքվում է"</string>
-    <string name="notification_ongoing_call" msgid="8712641937577776125">"Ընթացիկ զանգը"</string>
-    <string name="notification_ongoing_video_call" msgid="6331318021321487769">"Ընթացիկ տեսազանգ"</string>
-    <string name="notification_ongoing_paused_video_call" msgid="709950253594606371">"Ընթացիկ տեսազանգ. դադարեցված է"</string>
-    <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Ընթացիկ աշխատանքային զանգ"</string>
-    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"Ընթացիկ <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
-    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"Մուտքային <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
-    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"Զանգ Wi-Fi-ի միջոցով"</string>
-    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"Աշխատանքային զանգ Wi-Fi-ի միջոցով"</string>
-    <string name="notification_on_hold" msgid="7141827443379205682">"Սպասում"</string>
-    <string name="notification_incoming_call" msgid="7520580807513849283">"Մուտքային զանգ"</string>
-    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Մուտքային զանգ՝ լուսանկարով"</string>
-    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"Մուտքային զանգ՝ հաղորդագրությամբ"</string>
-    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"Մուտքային զանգ՝ տեղադրության տվյալներով"</string>
-    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"Մուտքային զանգ՝ լուսանկարով և հաղորդագրությամբ"</string>
-    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"Զանգ՝ լուսանկարով և տեղադրության տվյալներով"</string>
-    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"Զանգ՝ հաղորդագրությամբ և տեղադրության տվյալներով"</string>
-    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"Մուտքային զանգ՝ կցորդներով"</string>
-    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"Մուտքային զանգ՝ կցորդներով"</string>
-    <string name="important_notification_incoming_call" msgid="2867013954509930989">"Կարևոր մուտքային զանգ"</string>
-    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"Կարևոր մուտքային զանգ՝ լուսանկարով"</string>
-    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"Կարևոր մուտքային զանգ՝ հողորդագրությամբ"</string>
-    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"Կարևոր մուտքային զանգ՝ տեղադրության տվյալներով"</string>
-    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"Կարևոր զանգ՝ լուսանկարով և հաղորդագրությամբ"</string>
-    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"Կարևոր զանգ՝ լուսանկարով և տեղադրության տվյալներով"</string>
-    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"Կարևոր մուտքային զանգ՝ կցորդներով"</string>
-    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Կարևոր մուտքային զանգ՝ կցորդներով"</string>
-    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Կարևոր մուտքային զանգ՝ կցորդներով"</string>
-    <string name="notification_incoming_work_call" msgid="5291275092734261918">"Մուտքային աշխատանքային զանգ"</string>
-    <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Մուտքային զանգը հավանաբար լցոն է"</string>
-    <string name="notification_requesting_video_call" msgid="1807679328811515758">"Մուտքային տեսազանգի հայցում"</string>
-    <string name="notification_action_answer" msgid="8748275902211192568">"Պատասխանել"</string>
-    <string name="notification_action_end_call" msgid="7467258454170007765">"Վայր դնել"</string>
-    <string name="notification_action_answer_video" msgid="8488108892919917287">"Տեսազանգ"</string>
-    <string name="notification_action_accept" msgid="1272761514200507143">"Ընդունել"</string>
-    <string name="notification_action_dismiss" msgid="3128241581632616226">"Մերժել"</string>
-    <string name="notification_action_speaker_on" msgid="1882659234405596540">"Միացնել բարձրախոսը"</string>
-    <string name="notification_action_speaker_off" msgid="6340085043115533948">"Անջատել բարձրախոսը"</string>
-    <string name="notification_external_call" msgid="2504334597315343920">"Ընթացիկ զանգ այլ սարքում"</string>
-    <string name="notification_external_video_call" msgid="7709394856028436683">"Ընթացիկ տեսազանգ այլ սարքում"</string>
-    <string name="notification_take_call" msgid="5631659438864492229">"Ընդունել զանգը"</string>
-    <string name="notification_take_video_call" msgid="4473387503712341390">"Ընդունել տեսազանգը"</string>
-    <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"Ծառայությունը չի աջակցվում:"</string>
-    <string name="goPrivate" msgid="5269514638004595378">"Անցնել անձնականի"</string>
-    <string name="manageConferenceLabel" msgid="3589379023518128318">"Կառավարել կոնֆերանս զանգը"</string>
-    <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"Արտակարգ իրավիճակների հեռախոսահամար"</string>
-    <string name="child_number" msgid="3398257437107259682">"<xliff:g id="CHILD_NUMBER">%s</xliff:g>-ի միջոցով"</string>
-    <string name="callFailed_simError" msgid="4587775795711340072">"SIM- բացակայում է կամ SIM քարտի սխալ"</string>
-    <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Ավարտել զանգը"</string>
-    <string name="conference_call_name" msgid="8189987124611337174">"Կոնֆերանս զանգ"</string>
-    <string name="generic_conference_call_name" msgid="1546941472424243894">"Զանգ"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Զանգն այժմ բջջային ինտերնետով է ընթանում…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Չհաջողվեց միանալ Wi-Fi ցանցին"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Տեսազանգը կշարունակվի բջջային ցանցով: Գանձումը կկատարվի ըստ ձեր սակագնային պլանի:"</string>
-    <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Այլևս ցույց չտալ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="wait_prompt_str">Ուղարկե՞լ հետևյալ ձայներանգները:\n</string>
+  <string name="pause_prompt_yes">Այո</string>
+  <string name="pause_prompt_no">Ոչ</string>
+  <string name="notification_dialing">Համարը հավաքվում է</string>
+  <string name="notification_ongoing_call">Ընթացիկ զանգը</string>
+  <string name="notification_ongoing_video_call">Ընթացիկ տեսազանգ</string>
+  <string name="notification_ongoing_paused_video_call">Ընթացիկ տեսազանգ. դադարեցված է</string>
+  <string name="notification_ongoing_work_call">Ընթացիկ աշխատանքային զանգ</string>
+  <string name="notification_ongoing_call_wifi_template">Ընթացիկ %1$s</string>
+  <string name="notification_incoming_call_wifi_template">Մուտքային %1$s</string>
+  <string name="notification_call_wifi_brand">Զանգ Wi-Fi-ի միջոցով</string>
+  <string name="notification_call_wifi_work_brand">Աշխատանքային զանգ Wi-Fi-ի միջոցով</string>
+  <string name="notification_on_hold">Սպասում</string>
+  <string name="notification_incoming_call">Մուտքային զանգ</string>
+  <string name="notification_incoming_video_call">Մուտքային տեսազանգ</string>
+  <string name="notification_incoming_call_mutli_sim">Մուտքային զանգ (%1$s)</string>
+  <string name="notification_incoming_call_with_photo">Մուտքային զանգ՝ լուսանկարով</string>
+  <string name="notification_incoming_call_with_message">Մուտքային զանգ՝ հաղորդագրությամբ</string>
+  <string name="notification_incoming_call_with_location">Մուտքային զանգ՝ տեղադրության տվյալներով</string>
+  <string name="notification_incoming_call_with_photo_message">Մուտքային զանգ՝ լուսանկարով և հաղորդագրությամբ</string>
+  <string name="notification_incoming_call_with_photo_location">Զանգ՝ լուսանկարով և տեղադրության տվյալներով</string>
+  <string name="notification_incoming_call_with_message_location">Զանգ՝ հաղորդագրությամբ և տեղադրության տվյալներով</string>
+  <string name="notification_incoming_call_with_photo_message_location">Մուտքային զանգ՝ կցորդներով</string>
+  <string name="notification_incoming_call_attachments">Մուտքային զանգ՝ կցորդներով</string>
+  <string name="important_notification_incoming_call">Կարևոր մուտքային զանգ</string>
+  <string name="important_notification_incoming_call_with_photo">Կարևոր մուտքային զանգ՝ լուսանկարով</string>
+  <string name="important_notification_incoming_call_with_message">Կարևոր մուտքային զանգ՝ հողորդագրությամբ</string>
+  <string name="important_notification_incoming_call_with_location">Կարևոր մուտքային զանգ՝ տեղադրության տվյալներով</string>
+  <string name="important_notification_incoming_call_with_photo_message">Կարևոր զանգ՝ լուսանկարով և հաղորդագրությամբ</string>
+  <string name="important_notification_incoming_call_with_photo_location">Կարևոր զանգ՝ լուսանկարով և տեղադրության տվյալներով</string>
+  <string name="important_notification_incoming_call_with_message_location">Կարևոր մուտքային զանգ՝ կցորդներով</string>
+  <string name="important_notification_incoming_call_with_photo_message_location">Կարևոր մուտքային զանգ՝ կցորդներով</string>
+  <string name="important_notification_incoming_call_attachments">Կարևոր մուտքային զանգ՝ կցորդներով</string>
+  <string name="notification_incoming_work_call">Մուտքային աշխատանքային զանգ</string>
+  <string name="notification_incoming_spam_call">Մուտքային զանգը հավանաբար սպամ է</string>
+  <string name="notification_requesting_video_call">Մուտքային տեսազանգի հայցում</string>
+  <string name="notification_action_answer">Պատասխանել</string>
+  <string name="notification_action_end_call">Վայր դնել</string>
+  <string name="notification_action_answer_video">Տեսազանգ</string>
+  <string name="notification_action_accept">Ընդունել</string>
+  <string name="notification_action_dismiss">Մերժել</string>
+  <string name="notification_action_speaker_on">Միացնել բարձրախոսը</string>
+  <string name="notification_action_speaker_off">Անջատել բարձրախոսը</string>
+  <string name="notification_external_call">Ընթացիկ զանգ այլ սարքում</string>
+  <string name="notification_external_video_call">Ընթացիկ տեսազանգ այլ սարքում</string>
+  <string name="notification_take_call">Ընդունել զանգը</string>
+  <string name="notification_take_video_call">Ընդունել տեսազանգը</string>
+  <string name="incall_error_supp_service_unknown">Ծառայությունը չի աջակցվում:</string>
+  <string name="goPrivate">Անցնել անձնականի</string>
+  <string name="manageConferenceLabel">Կառավարել կոնֆերանս զանգը</string>
+  <string name="child_number">%s-ի միջոցով</string>
+  <string name="callFailed_simError">SIM- բացակայում է կամ SIM քարտի սխալ</string>
+  <string name="conference_caller_disconnect_content_description">Ավարտել զանգը</string>
+  <string name="conference_call_name">Կոնֆերանս զանգ</string>
+  <string name="generic_conference_call_name">Զանգ</string>
+  <string name="video_call_wifi_to_lte_handover_toast">Զանգն այժմ բջջային ինտերնետով է ընթանում…</string>
+  <string name="video_call_lte_to_wifi_failed_title">Չհաջողվեց միանալ Wi-Fi ցանցին</string>
+  <string name="video_call_lte_to_wifi_failed_message">Տեսազանգը կշարունակվի բջջային ցանցով: Գանձումը կկատարվի ըստ ձեր սակագնային պլանի:</string>
+  <string name="video_call_lte_to_wifi_failed_do_not_show">Այլևս ցույց չտալ</string>
+  <string name="bubble_return_to_call">Վերադառնալ զանգին</string>
+  <string name="rtt_request_dialog_title">Միանա՞լ RTT զանգին</string>
+  <string name="rtt_request_dialog_details">%1$s օգտատերը զանգի ընթացքում ուզում է օգտվել հաղորդագրման ծառայությունից:</string>
+  <string name="rtt_request_dialog_more_information">RTT-ն օգնում է այն բաժանորդներին, ովքեր լսողության և խոսքի դժվարություններ ունեն, կամ ովքեր լոկ ձայնով չեն բավարարվում:</string>
+  <string name="rtt_button_decline_request">Ոչ</string>
+  <string name="rtt_button_accept_request">Միանալ RTT-ին</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-in/strings.xml b/java/com/android/incallui/res/values-in/strings.xml
index cab484c..c5162d3 100644
--- a/java/com/android/incallui/res/values-in/strings.xml
+++ b/java/com/android/incallui/res/values-in/strings.xml
@@ -1,79 +1,68 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"Telepon"</string>
-    <string name="wait_prompt_str" msgid="3509685348904329594">"Kirimkan nada berikut?\n"</string>
-    <string name="pause_prompt_yes" msgid="4642047011233552973">"Ya"</string>
-    <string name="pause_prompt_no" msgid="4691320111774935838">"Tidak"</string>
-    <string name="notification_dialing" msgid="9072177265772083826">"Memanggil"</string>
-    <string name="notification_ongoing_call" msgid="8712641937577776125">"Panggilan yang sedang berlangsung"</string>
-    <string name="notification_ongoing_video_call" msgid="6331318021321487769">"Video call sedang berlangsung"</string>
-    <string name="notification_ongoing_paused_video_call" msgid="709950253594606371">"Video call sedang berlangsung ‑ video dijeda"</string>
-    <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Panggilan telepon kerja yang sedang berlangsung"</string>
-    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"<xliff:g id="BRAND_NAME">%1$s</xliff:g> sedang berlangsung"</string>
-    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"<xliff:g id="BRAND_NAME">%1$s</xliff:g> masuk"</string>
-    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"Panggilan Wi-Fi"</string>
-    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"Panggilan kerja Wi-Fi"</string>
-    <string name="notification_on_hold" msgid="7141827443379205682">"Ditangguhkan"</string>
-    <string name="notification_incoming_call" msgid="7520580807513849283">"Panggilan masuk"</string>
-    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Panggilan masuk dengan foto"</string>
-    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"Panggilan masuk dengan pesan"</string>
-    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"Panggilan masuk dengan lokasi"</string>
-    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"Panggilan masuk dengan foto dan pesan"</string>
-    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"Panggilan masuk dengan foto dan lokasi"</string>
-    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"Panggilan masuk dengan pesan dan lokasi"</string>
-    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"Panggilan masuk dengan foto, pesan, dan lokasi"</string>
-    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"Panggilan masuk dengan lampiran"</string>
-    <string name="important_notification_incoming_call" msgid="2867013954509930989">"Panggilan masuk penting"</string>
-    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"Panggilan masuk penting dengan foto"</string>
-    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"Panggilan masuk penting dengan pesan"</string>
-    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"Panggilan masuk penting dengan lokasi"</string>
-    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"Panggilan masuk penting dengan foto dan pesan"</string>
-    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"Panggilan masuk penting dengan foto dan lokasi"</string>
-    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"Panggilan masuk penting dengan pesan dan lokasi"</string>
-    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Panggilan penting dengan foto, pesan, dan lokasi"</string>
-    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Panggilan masuk penting dengan lampiran"</string>
-    <string name="notification_incoming_work_call" msgid="5291275092734261918">"Panggilan telepon kerja yang masuk"</string>
-    <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Panggilan masuk yang diduga spam"</string>
-    <string name="notification_requesting_video_call" msgid="1807679328811515758">"Permintaan video masuk"</string>
-    <string name="notification_action_answer" msgid="8748275902211192568">"Jawab"</string>
-    <string name="notification_action_end_call" msgid="7467258454170007765">"Akhiri"</string>
-    <string name="notification_action_answer_video" msgid="8488108892919917287">"Video"</string>
-    <string name="notification_action_accept" msgid="1272761514200507143">"Terima"</string>
-    <string name="notification_action_dismiss" msgid="3128241581632616226">"Tolak"</string>
-    <string name="notification_action_speaker_on" msgid="1882659234405596540">"Turn on  speaker"</string>
-    <string name="notification_action_speaker_off" msgid="6340085043115533948">"Nonaktifkan speaker"</string>
-    <string name="notification_external_call" msgid="2504334597315343920">"Panggilan yang berlangsung di perangkat lain"</string>
-    <string name="notification_external_video_call" msgid="7709394856028436683">"Video call yang berlangsung di perangkat lain"</string>
-    <string name="notification_take_call" msgid="5631659438864492229">"Panggil"</string>
-    <string name="notification_take_video_call" msgid="4473387503712341390">"Lakukan Video Call"</string>
-    <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"Layanan tidak didukung."</string>
-    <string name="goPrivate" msgid="5269514638004595378">"aktifkan pribadi"</string>
-    <string name="manageConferenceLabel" msgid="3589379023518128318">"Kelola telewicara"</string>
-    <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"Nomor darurat"</string>
-    <string name="child_number" msgid="3398257437107259682">"melalui <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
-    <string name="callFailed_simError" msgid="4587775795711340072">"Tidak ada SIM atau kesalahan SIM"</string>
-    <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Akhiri panggilan"</string>
-    <string name="conference_call_name" msgid="8189987124611337174">"Telewicara"</string>
-    <string name="generic_conference_call_name" msgid="1546941472424243894">"Sedang menelepon"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Melanjutkan panggilan menggunakan data seluler..."</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Tidak dapat beralih ke jaringan Wi-Fi"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Video call akan tetap di jaringan seluler. Tarif data standar mungkin berlaku."</string>
-    <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Jangan tampilkan ini lagi"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="wait_prompt_str">Kirimkan nada berikut?\n</string>
+  <string name="pause_prompt_yes">Ya</string>
+  <string name="pause_prompt_no">Tidak</string>
+  <string name="notification_dialing">Memanggil</string>
+  <string name="notification_ongoing_call">Panggilan yang sedang berlangsung</string>
+  <string name="notification_ongoing_video_call">Video call sedang berlangsung</string>
+  <string name="notification_ongoing_paused_video_call">Video call sedang berlangsung ‑ video dijeda</string>
+  <string name="notification_ongoing_work_call">Panggilan telepon kerja yang sedang berlangsung</string>
+  <string name="notification_ongoing_call_wifi_template">%1$s sedang berlangsung</string>
+  <string name="notification_incoming_call_wifi_template">%1$s masuk</string>
+  <string name="notification_call_wifi_brand">Panggilan Wi-Fi</string>
+  <string name="notification_call_wifi_work_brand">Panggilan kerja Wi-Fi</string>
+  <string name="notification_on_hold">Ditangguhkan</string>
+  <string name="notification_incoming_call">Panggilan masuk</string>
+  <string name="notification_incoming_video_call">Video call masuk</string>
+  <string name="notification_incoming_call_mutli_sim">Panggilan masuk via %1$s</string>
+  <string name="notification_incoming_call_with_photo">Panggilan masuk dengan foto</string>
+  <string name="notification_incoming_call_with_message">Panggilan masuk dengan pesan</string>
+  <string name="notification_incoming_call_with_location">Panggilan masuk dengan lokasi</string>
+  <string name="notification_incoming_call_with_photo_message">Panggilan masuk dengan foto dan pesan</string>
+  <string name="notification_incoming_call_with_photo_location">Panggilan masuk dengan foto dan lokasi</string>
+  <string name="notification_incoming_call_with_message_location">Panggilan masuk dengan pesan dan lokasi</string>
+  <string name="notification_incoming_call_with_photo_message_location">Panggilan masuk dengan foto, pesan, dan lokasi</string>
+  <string name="notification_incoming_call_attachments">Panggilan masuk dengan lampiran</string>
+  <string name="important_notification_incoming_call">Panggilan masuk penting</string>
+  <string name="important_notification_incoming_call_with_photo">Panggilan masuk penting dengan foto</string>
+  <string name="important_notification_incoming_call_with_message">Panggilan masuk penting dengan pesan</string>
+  <string name="important_notification_incoming_call_with_location">Panggilan masuk penting dengan lokasi</string>
+  <string name="important_notification_incoming_call_with_photo_message">Panggilan masuk penting dengan foto dan pesan</string>
+  <string name="important_notification_incoming_call_with_photo_location">Panggilan masuk penting dengan foto dan lokasi</string>
+  <string name="important_notification_incoming_call_with_message_location">Panggilan masuk penting dengan pesan dan lokasi</string>
+  <string name="important_notification_incoming_call_with_photo_message_location">Panggilan penting dengan foto, pesan, dan lokasi</string>
+  <string name="important_notification_incoming_call_attachments">Panggilan masuk penting dengan lampiran</string>
+  <string name="notification_incoming_work_call">Panggilan telepon kerja yang masuk</string>
+  <string name="notification_incoming_spam_call">Panggilan masuk yang diduga spam</string>
+  <string name="notification_requesting_video_call">Permintaan video masuk</string>
+  <string name="notification_action_answer">Jawab</string>
+  <string name="notification_action_end_call">Akhiri</string>
+  <string name="notification_action_answer_video">Video</string>
+  <string name="notification_action_accept">Terima</string>
+  <string name="notification_action_dismiss">Tolak</string>
+  <string name="notification_action_speaker_on">Turn on  speaker</string>
+  <string name="notification_action_speaker_off">Nonaktifkan speaker</string>
+  <string name="notification_external_call">Panggilan yang berlangsung di perangkat lain</string>
+  <string name="notification_external_video_call">Video call yang berlangsung di perangkat lain</string>
+  <string name="notification_take_call">Panggil</string>
+  <string name="notification_take_video_call">Lakukan Video Call</string>
+  <string name="incall_error_supp_service_unknown">Layanan tidak didukung.</string>
+  <string name="goPrivate">aktifkan pribadi</string>
+  <string name="manageConferenceLabel">Kelola telewicara</string>
+  <string name="child_number">melalui %s</string>
+  <string name="callFailed_simError">Tidak ada SIM atau kesalahan SIM</string>
+  <string name="conference_caller_disconnect_content_description">Akhiri panggilan</string>
+  <string name="conference_call_name">Telewicara</string>
+  <string name="generic_conference_call_name">Sedang menelepon</string>
+  <string name="video_call_wifi_to_lte_handover_toast">Melanjutkan panggilan menggunakan data seluler...</string>
+  <string name="video_call_lte_to_wifi_failed_title">Tidak dapat beralih ke jaringan Wi-Fi</string>
+  <string name="video_call_lte_to_wifi_failed_message">Video call akan tetap di jaringan seluler. Tarif data standar mungkin berlaku.</string>
+  <string name="video_call_lte_to_wifi_failed_do_not_show">Jangan tampilkan ini lagi</string>
+  <string name="bubble_return_to_call">Kembali ke panggilan</string>
+  <string name="rtt_request_dialog_title">Ingin bergabung ke panggilan RTT?</string>
+  <string name="rtt_request_dialog_details">%1$s ingin menggunakan pengiriman pesan dalam panggilan suara Anda.</string>
+  <string name="rtt_request_dialog_more_information">RTT membantu penelepon yang tunarungu, kesulitan mendengar, memiliki gangguan berbicara, atau memerlukan lebih dari sekadar suara.</string>
+  <string name="rtt_button_decline_request">Tidak</string>
+  <string name="rtt_button_accept_request">Bergabung ke RTT</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-is/strings.xml b/java/com/android/incallui/res/values-is/strings.xml
index 3748bae..35f21f7 100644
--- a/java/com/android/incallui/res/values-is/strings.xml
+++ b/java/com/android/incallui/res/values-is/strings.xml
@@ -1,79 +1,68 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"Sími"</string>
-    <string name="wait_prompt_str" msgid="3509685348904329594">"Senda eftirfarandi tóna?\n"</string>
-    <string name="pause_prompt_yes" msgid="4642047011233552973">"Já"</string>
-    <string name="pause_prompt_no" msgid="4691320111774935838">"Nei"</string>
-    <string name="notification_dialing" msgid="9072177265772083826">"Hringir"</string>
-    <string name="notification_ongoing_call" msgid="8712641937577776125">"Samtal í gangi"</string>
-    <string name="notification_ongoing_video_call" msgid="6331318021321487769">"Myndsímtal í gangi"</string>
-    <string name="notification_ongoing_paused_video_call" msgid="709950253594606371">"Myndsímtal í gangi – hlé gert á mynd"</string>
-    <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Vinnusímtal í gangi"</string>
-    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"<xliff:g id="BRAND_NAME">%1$s</xliff:g> í gangi"</string>
-    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"<xliff:g id="BRAND_NAME">%1$s</xliff:g> berst"</string>
-    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"Wi-Fi símtal"</string>
-    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"Wi‑Fi vinnusímtal"</string>
-    <string name="notification_on_hold" msgid="7141827443379205682">"Í bið"</string>
-    <string name="notification_incoming_call" msgid="7520580807513849283">"Móttekið símtal"</string>
-    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Móttekið símtal með mynd"</string>
-    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"Móttekið símtal með skilaboðum"</string>
-    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"Móttekið símtal með staðsetningu"</string>
-    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"Móttekið símtal með mynd og skilaboðum"</string>
-    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"Móttekið símtal með mynd og staðsetningu"</string>
-    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"Móttekið símtal með skilaboðum og staðsetningu"</string>
-    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"Móttekið símtal með mynd, skilaboðum og staðsetningu"</string>
-    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"Móttekið símtal með viðhengjum"</string>
-    <string name="important_notification_incoming_call" msgid="2867013954509930989">"Mikilvægt móttekið símtal"</string>
-    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"Mikilvægt móttekið símtal með mynd"</string>
-    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"Mikilvægt móttekið símtal með skilaboðum"</string>
-    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"Mikilvægt móttekið símtal með staðsetningu"</string>
-    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"Mikilvægt móttekið símtal með mynd og skilaboðum"</string>
-    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"Mikilvægt móttekið símtal með mynd og staðsetningu"</string>
-    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"Mikilvægt móttekið símtal með skilaboðum og staðsetningu"</string>
-    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Mikilvægt móttekið símtal með mynd, skilaboðum og staðsetningu"</string>
-    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Mikilvægt móttekið símtal með viðhengjum"</string>
-    <string name="notification_incoming_work_call" msgid="5291275092734261918">"Vinnusímtal berst"</string>
-    <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Símtal sem berst er hugsanlega úr ruslnúmeri"</string>
-    <string name="notification_requesting_video_call" msgid="1807679328811515758">"Myndbeiðni berst"</string>
-    <string name="notification_action_answer" msgid="8748275902211192568">"Svara"</string>
-    <string name="notification_action_end_call" msgid="7467258454170007765">"Leggja á"</string>
-    <string name="notification_action_answer_video" msgid="8488108892919917287">"Myndskeið"</string>
-    <string name="notification_action_accept" msgid="1272761514200507143">"Samþykkja"</string>
-    <string name="notification_action_dismiss" msgid="3128241581632616226">"Hafna"</string>
-    <string name="notification_action_speaker_on" msgid="1882659234405596540">"Kveikja á hátalara"</string>
-    <string name="notification_action_speaker_off" msgid="6340085043115533948">"Slökkva á hátalara"</string>
-    <string name="notification_external_call" msgid="2504334597315343920">"Símtal í gangi í öðru tæki"</string>
-    <string name="notification_external_video_call" msgid="7709394856028436683">"Myndsímtal í gangi í öðru tæki"</string>
-    <string name="notification_take_call" msgid="5631659438864492229">"Þiggja símtal"</string>
-    <string name="notification_take_video_call" msgid="4473387503712341390">"Þiggja myndsímtal"</string>
-    <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"Þjónustan er ekki studd."</string>
-    <string name="goPrivate" msgid="5269514638004595378">"tala í einrúmi"</string>
-    <string name="manageConferenceLabel" msgid="3589379023518128318">"Stjórna símafundi"</string>
-    <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"Neyðarnúmer"</string>
-    <string name="child_number" msgid="3398257437107259682">"úr <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
-    <string name="callFailed_simError" msgid="4587775795711340072">"Ekkert SIM-kort eða villa á SIM-korti"</string>
-    <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Ljúka símtali"</string>
-    <string name="conference_call_name" msgid="8189987124611337174">"Símafundur"</string>
-    <string name="generic_conference_call_name" msgid="1546941472424243894">"Í símtali"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Símtal heldur áfram og notar farsímagögn…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Ekki var hægt að skipta yfir á Wi-Fi-net"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Myndsímtal verður áfram á farsímaneti. Stöðluð gjöld fyrir gagnaflutning kunna að eiga við."</string>
-    <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Ekki birta þetta aftur"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="wait_prompt_str">Senda eftirfarandi tóna?\n</string>
+  <string name="pause_prompt_yes">Já</string>
+  <string name="pause_prompt_no">Nei</string>
+  <string name="notification_dialing">Hringir</string>
+  <string name="notification_ongoing_call">Samtal í gangi</string>
+  <string name="notification_ongoing_video_call">Myndsímtal í gangi</string>
+  <string name="notification_ongoing_paused_video_call">Myndsímtal í gangi – hlé gert á mynd</string>
+  <string name="notification_ongoing_work_call">Vinnusímtal í gangi</string>
+  <string name="notification_ongoing_call_wifi_template">%1$s í gangi</string>
+  <string name="notification_incoming_call_wifi_template">%1$s berst</string>
+  <string name="notification_call_wifi_brand">Wi-Fi símtal</string>
+  <string name="notification_call_wifi_work_brand">Wi‑Fi vinnusímtal</string>
+  <string name="notification_on_hold">Í bið</string>
+  <string name="notification_incoming_call">Móttekið símtal</string>
+  <string name="notification_incoming_video_call">Myndsímtal berst</string>
+  <string name="notification_incoming_call_mutli_sim">Símtal berst í gegnum %1$s</string>
+  <string name="notification_incoming_call_with_photo">Móttekið símtal með mynd</string>
+  <string name="notification_incoming_call_with_message">Móttekið símtal með skilaboðum</string>
+  <string name="notification_incoming_call_with_location">Móttekið símtal með staðsetningu</string>
+  <string name="notification_incoming_call_with_photo_message">Móttekið símtal með mynd og skilaboðum</string>
+  <string name="notification_incoming_call_with_photo_location">Móttekið símtal með mynd og staðsetningu</string>
+  <string name="notification_incoming_call_with_message_location">Móttekið símtal með skilaboðum og staðsetningu</string>
+  <string name="notification_incoming_call_with_photo_message_location">Móttekið símtal með mynd, skilaboðum og staðsetningu</string>
+  <string name="notification_incoming_call_attachments">Móttekið símtal með viðhengjum</string>
+  <string name="important_notification_incoming_call">Mikilvægt móttekið símtal</string>
+  <string name="important_notification_incoming_call_with_photo">Mikilvægt móttekið símtal með mynd</string>
+  <string name="important_notification_incoming_call_with_message">Mikilvægt móttekið símtal með skilaboðum</string>
+  <string name="important_notification_incoming_call_with_location">Mikilvægt móttekið símtal með staðsetningu</string>
+  <string name="important_notification_incoming_call_with_photo_message">Mikilvægt móttekið símtal með mynd og skilaboðum</string>
+  <string name="important_notification_incoming_call_with_photo_location">Mikilvægt móttekið símtal með mynd og staðsetningu</string>
+  <string name="important_notification_incoming_call_with_message_location">Mikilvægt móttekið símtal með skilaboðum og staðsetningu</string>
+  <string name="important_notification_incoming_call_with_photo_message_location">Mikilvægt móttekið símtal með mynd, skilaboðum og staðsetningu</string>
+  <string name="important_notification_incoming_call_attachments">Mikilvægt móttekið símtal með viðhengjum</string>
+  <string name="notification_incoming_work_call">Vinnusímtal berst</string>
+  <string name="notification_incoming_spam_call">Símtal sem berst er hugsanlega úr ruslnúmeri</string>
+  <string name="notification_requesting_video_call">Myndbeiðni berst</string>
+  <string name="notification_action_answer">Svara</string>
+  <string name="notification_action_end_call">Leggja á</string>
+  <string name="notification_action_answer_video">Myndskeið</string>
+  <string name="notification_action_accept">Samþykkja</string>
+  <string name="notification_action_dismiss">Hafna</string>
+  <string name="notification_action_speaker_on">Kveikja á hátalara</string>
+  <string name="notification_action_speaker_off">Slökkva á hátalara</string>
+  <string name="notification_external_call">Símtal í gangi í öðru tæki</string>
+  <string name="notification_external_video_call">Myndsímtal í gangi í öðru tæki</string>
+  <string name="notification_take_call">Þiggja símtal</string>
+  <string name="notification_take_video_call">Þiggja myndsímtal</string>
+  <string name="incall_error_supp_service_unknown">Þjónustan er ekki studd.</string>
+  <string name="goPrivate">tala í einrúmi</string>
+  <string name="manageConferenceLabel">Stjórna símafundi</string>
+  <string name="child_number">úr %s</string>
+  <string name="callFailed_simError">Ekkert SIM-kort eða villa á SIM-korti</string>
+  <string name="conference_caller_disconnect_content_description">Ljúka símtali</string>
+  <string name="conference_call_name">Símafundur</string>
+  <string name="generic_conference_call_name">Í símtali</string>
+  <string name="video_call_wifi_to_lte_handover_toast">Símtal heldur áfram og notar farsímagögn…</string>
+  <string name="video_call_lte_to_wifi_failed_title">Ekki var hægt að skipta yfir á Wi-Fi-net</string>
+  <string name="video_call_lte_to_wifi_failed_message">Myndsímtal verður áfram á farsímaneti. Stöðluð gjöld fyrir gagnaflutning kunna að eiga við.</string>
+  <string name="video_call_lte_to_wifi_failed_do_not_show">Ekki birta þetta aftur</string>
+  <string name="bubble_return_to_call">Aftur í símtal</string>
+  <string name="rtt_request_dialog_title">Taka þátt í RTT-símtali?</string>
+  <string name="rtt_request_dialog_details">%1$s vill nota skilaboð í símtalinu.</string>
+  <string name="rtt_request_dialog_more_information">RTT (símtöl með texta í rauntíma) aðstoðar heyrnarlausa og fólk með heyrnarskerðingu eða skerta talgetu og þá sem þurfa að styðja sig við meira en bara hljóð.</string>
+  <string name="rtt_button_decline_request">Nei, takk</string>
+  <string name="rtt_button_accept_request">Taka þátt í RTT</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-it/strings.xml b/java/com/android/incallui/res/values-it/strings.xml
index 8281fcb..5132a17 100644
--- a/java/com/android/incallui/res/values-it/strings.xml
+++ b/java/com/android/incallui/res/values-it/strings.xml
@@ -1,79 +1,68 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"Telefono"</string>
-    <string name="wait_prompt_str" msgid="3509685348904329594">"Inviare i numeri successivi?\n"</string>
-    <string name="pause_prompt_yes" msgid="4642047011233552973">"Sì"</string>
-    <string name="pause_prompt_no" msgid="4691320111774935838">"No"</string>
-    <string name="notification_dialing" msgid="9072177265772083826">"Chiamata in corso"</string>
-    <string name="notification_ongoing_call" msgid="8712641937577776125">"Chiamata in corso"</string>
-    <string name="notification_ongoing_video_call" msgid="6331318021321487769">"Videochiamata in corso"</string>
-    <string name="notification_ongoing_paused_video_call" msgid="709950253594606371">"Videochiamata in corso - video in pausa"</string>
-    <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Chiamata di lavoro in corso"</string>
-    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"<xliff:g id="BRAND_NAME">%1$s</xliff:g> in corso"</string>
-    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"<xliff:g id="BRAND_NAME">%1$s</xliff:g> in arrivo"</string>
-    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"Chiamata Wi-Fi"</string>
-    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"Chiamata Wi-Fi di lavoro"</string>
-    <string name="notification_on_hold" msgid="7141827443379205682">"In attesa"</string>
-    <string name="notification_incoming_call" msgid="7520580807513849283">"Chiamata in arrivo"</string>
-    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Chiamata in arrivo con foto"</string>
-    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"Chiamata in arrivo con messaggio"</string>
-    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"Chiamata in arrivo con posizione"</string>
-    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"Chiamata in arrivo con foto e messaggio"</string>
-    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"Chiamata in arrivo con foto e posizione"</string>
-    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"Chiamata in arrivo con messaggio e posizione"</string>
-    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"Chiamata in arrivo con foto, messaggio e posizione"</string>
-    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"Chiamata in arrivo con allegato"</string>
-    <string name="important_notification_incoming_call" msgid="2867013954509930989">"Chiamata in arrivo importante"</string>
-    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"Chiamata in arrivo importante con foto"</string>
-    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"Chiamata in arrivo importante con messaggio"</string>
-    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"Chiamata in arrivo importante con posizione"</string>
-    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"Chiamata in arrivo importante con foto e messaggio"</string>
-    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"Chiamata importante in arrivo con foto e posizione"</string>
-    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"Chiamata importante in arrivo con messaggio e posizione"</string>
-    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Chiamata importante in arrivo con foto, messaggio e posizione"</string>
-    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Chiamata importante in arrivo con allegati"</string>
-    <string name="notification_incoming_work_call" msgid="5291275092734261918">"Chiamata di lavoro in arrivo"</string>
-    <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Chiamata di presunto spam in arrivo"</string>
-    <string name="notification_requesting_video_call" msgid="1807679328811515758">"Richiesta video in arrivo"</string>
-    <string name="notification_action_answer" msgid="8748275902211192568">"Rispondi"</string>
-    <string name="notification_action_end_call" msgid="7467258454170007765">"Riaggancia"</string>
-    <string name="notification_action_answer_video" msgid="8488108892919917287">"Video"</string>
-    <string name="notification_action_accept" msgid="1272761514200507143">"Accetta"</string>
-    <string name="notification_action_dismiss" msgid="3128241581632616226">"Rifiuta"</string>
-    <string name="notification_action_speaker_on" msgid="1882659234405596540">"Attiva l\'altoparlante"</string>
-    <string name="notification_action_speaker_off" msgid="6340085043115533948">"Disattiva l\'altoparlante"</string>
-    <string name="notification_external_call" msgid="2504334597315343920">"Chiamata in corso su un altro dispositivo"</string>
-    <string name="notification_external_video_call" msgid="7709394856028436683">"Videochiamata in corso su un altro dispositivo"</string>
-    <string name="notification_take_call" msgid="5631659438864492229">"Ricevi chiamata"</string>
-    <string name="notification_take_video_call" msgid="4473387503712341390">"Ricevi videochiamata"</string>
-    <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"Servizio non supportato."</string>
-    <string name="goPrivate" msgid="5269514638004595378">"Privato"</string>
-    <string name="manageConferenceLabel" msgid="3589379023518128318">"Gestisci audioconferenza"</string>
-    <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"Numero di emergenza"</string>
-    <string name="child_number" msgid="3398257437107259682">"tramite <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
-    <string name="callFailed_simError" msgid="4587775795711340072">"Nessuna SIM o errore della SIM"</string>
-    <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Termina chiamata"</string>
-    <string name="conference_call_name" msgid="8189987124611337174">"Audioconferenza"</string>
-    <string name="generic_conference_call_name" msgid="1546941472424243894">"Chiamata in corso"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Proseguimento della chiamata utilizzando i dati mobili…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Impossibile passare alla rete Wi-Fi"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"La videochiamata rimarrà sulla rete mobile. Potrebbero essere applicati costi standard per il traffico dati."</string>
-    <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Non mostrare più questo messaggio"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="wait_prompt_str">Inviare i numeri successivi?\n</string>
+  <string name="pause_prompt_yes">Sì</string>
+  <string name="pause_prompt_no">No</string>
+  <string name="notification_dialing">Chiamata in corso</string>
+  <string name="notification_ongoing_call">Chiamata in corso</string>
+  <string name="notification_ongoing_video_call">Videochiamata in corso</string>
+  <string name="notification_ongoing_paused_video_call">Videochiamata in corso - video in pausa</string>
+  <string name="notification_ongoing_work_call">Chiamata di lavoro in corso</string>
+  <string name="notification_ongoing_call_wifi_template">%1$s in corso</string>
+  <string name="notification_incoming_call_wifi_template">%1$s in arrivo</string>
+  <string name="notification_call_wifi_brand">Chiamata Wi-Fi</string>
+  <string name="notification_call_wifi_work_brand">Chiamata Wi-Fi di lavoro</string>
+  <string name="notification_on_hold">In attesa</string>
+  <string name="notification_incoming_call">Chiamata in arrivo</string>
+  <string name="notification_incoming_video_call">Videochiamata in arrivo</string>
+  <string name="notification_incoming_call_mutli_sim">Chiamata in arrivo tramite %1$s</string>
+  <string name="notification_incoming_call_with_photo">Chiamata in arrivo con foto</string>
+  <string name="notification_incoming_call_with_message">Chiamata in arrivo con messaggio</string>
+  <string name="notification_incoming_call_with_location">Chiamata in arrivo con posizione</string>
+  <string name="notification_incoming_call_with_photo_message">Chiamata in arrivo con foto e messaggio</string>
+  <string name="notification_incoming_call_with_photo_location">Chiamata in arrivo con foto e posizione</string>
+  <string name="notification_incoming_call_with_message_location">Chiamata in arrivo con messaggio e posizione</string>
+  <string name="notification_incoming_call_with_photo_message_location">Chiamata in arrivo con foto, messaggio e posizione</string>
+  <string name="notification_incoming_call_attachments">Chiamata in arrivo con allegato</string>
+  <string name="important_notification_incoming_call">Chiamata in arrivo importante</string>
+  <string name="important_notification_incoming_call_with_photo">Chiamata in arrivo importante con foto</string>
+  <string name="important_notification_incoming_call_with_message">Chiamata in arrivo importante con messaggio</string>
+  <string name="important_notification_incoming_call_with_location">Chiamata in arrivo importante con posizione</string>
+  <string name="important_notification_incoming_call_with_photo_message">Chiamata in arrivo importante con foto e messaggio</string>
+  <string name="important_notification_incoming_call_with_photo_location">Chiamata importante in arrivo con foto e posizione</string>
+  <string name="important_notification_incoming_call_with_message_location">Chiamata importante in arrivo con messaggio e posizione</string>
+  <string name="important_notification_incoming_call_with_photo_message_location">Chiamata importante in arrivo con foto, messaggio e posizione</string>
+  <string name="important_notification_incoming_call_attachments">Chiamata importante in arrivo con allegati</string>
+  <string name="notification_incoming_work_call">Chiamata di lavoro in arrivo</string>
+  <string name="notification_incoming_spam_call">Chiamata di presunto spam in arrivo</string>
+  <string name="notification_requesting_video_call">Richiesta video in arrivo</string>
+  <string name="notification_action_answer">Rispondi</string>
+  <string name="notification_action_end_call">Riaggancia</string>
+  <string name="notification_action_answer_video">Video</string>
+  <string name="notification_action_accept">Accetta</string>
+  <string name="notification_action_dismiss">Rifiuta</string>
+  <string name="notification_action_speaker_on">Attiva l\'altoparlante</string>
+  <string name="notification_action_speaker_off">Disattiva l\'altoparlante</string>
+  <string name="notification_external_call">Chiamata in corso su un altro dispositivo</string>
+  <string name="notification_external_video_call">Videochiamata in corso su un altro dispositivo</string>
+  <string name="notification_take_call">Ricevi chiamata</string>
+  <string name="notification_take_video_call">Ricevi videochiamata</string>
+  <string name="incall_error_supp_service_unknown">Servizio non supportato.</string>
+  <string name="goPrivate">Privato</string>
+  <string name="manageConferenceLabel">Gestisci audioconferenza</string>
+  <string name="child_number">tramite %s</string>
+  <string name="callFailed_simError">Nessuna SIM o errore della SIM</string>
+  <string name="conference_caller_disconnect_content_description">Termina chiamata</string>
+  <string name="conference_call_name">Audioconferenza</string>
+  <string name="generic_conference_call_name">Chiamata in corso</string>
+  <string name="video_call_wifi_to_lte_handover_toast">Proseguimento della chiamata utilizzando i dati mobili…</string>
+  <string name="video_call_lte_to_wifi_failed_title">Impossibile passare alla rete Wi-Fi</string>
+  <string name="video_call_lte_to_wifi_failed_message">La videochiamata rimarrà sulla rete mobile. Potrebbero essere applicati costi standard per il traffico dati.</string>
+  <string name="video_call_lte_to_wifi_failed_do_not_show">Non mostrare più questo messaggio</string>
+  <string name="bubble_return_to_call">Torna a chiamata</string>
+  <string name="rtt_request_dialog_title">Partecipare alla chiamata RTT?</string>
+  <string name="rtt_request_dialog_details">%1$s vuole utilizzare la messaggistica durante la chiamata vocale.</string>
+  <string name="rtt_request_dialog_more_information">RTT aiuta i chiamanti con disabilità uditive o del linguaggio e le persone che hanno bisogno di un supporto scritto oltre alla voce.</string>
+  <string name="rtt_button_decline_request">No grazie</string>
+  <string name="rtt_button_accept_request">Partecipa a RTT</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-iw/strings.xml b/java/com/android/incallui/res/values-iw/strings.xml
index 81c7613..931c113 100644
--- a/java/com/android/incallui/res/values-iw/strings.xml
+++ b/java/com/android/incallui/res/values-iw/strings.xml
@@ -1,79 +1,68 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"טלפון"</string>
-    <string name="wait_prompt_str" msgid="3509685348904329594">"לשלוח את הצלילים הבאים?\n"</string>
-    <string name="pause_prompt_yes" msgid="4642047011233552973">"כן"</string>
-    <string name="pause_prompt_no" msgid="4691320111774935838">"לא"</string>
-    <string name="notification_dialing" msgid="9072177265772083826">"מחייג"</string>
-    <string name="notification_ongoing_call" msgid="8712641937577776125">"שיחה פעילה"</string>
-    <string name="notification_ongoing_video_call" msgid="6331318021321487769">"שיחת וידאו פעילה"</string>
-    <string name="notification_ongoing_paused_video_call" msgid="709950253594606371">"שיחת וידאו פעילה - הווידאו מושהה"</string>
-    <string name="notification_ongoing_work_call" msgid="3189581218078981547">"שיחת עבודה פעילה"</string>
-    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"<xliff:g id="BRAND_NAME">%1$s</xliff:g> פעילה"</string>
-    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"<xliff:g id="BRAND_NAME">%1$s</xliff:g> נכנסת"</string>
-    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"‏שיחת Wi-Fi"</string>
-    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"‏שיחת עבודה ברשת Wi-Fi"</string>
-    <string name="notification_on_hold" msgid="7141827443379205682">"בהמתנה"</string>
-    <string name="notification_incoming_call" msgid="7520580807513849283">"שיחה נכנסת"</string>
-    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"שיחה נכנסת עם תמונה"</string>
-    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"שיחה נכנסת עם הודעה"</string>
-    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"שיחה נכנסת עם מיקום"</string>
-    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"שיחה נכנסת עם תמונה והודעה"</string>
-    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"שיחה נכנסת עם תמונה ומיקום"</string>
-    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"שיחה נכנסת עם הודעה ומיקום"</string>
-    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"שיחה נכנסת עם תמונה, הודעה ומיקום"</string>
-    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"שיחה נכנסת עם קבצים מצורפים"</string>
-    <string name="important_notification_incoming_call" msgid="2867013954509930989">"שיחה נכנסת חשובה"</string>
-    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"שיחה נכנסת חשובה עם תמונה"</string>
-    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"שיחה נכנסת חשובה עם הודעה"</string>
-    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"שיחה נכנסת חשובה עם מיקום"</string>
-    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"שיחה נכנסת חשובה עם תמונה והודעה"</string>
-    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"שיחה נכנסת חשובה עם תמונה ומיקום"</string>
-    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"שיחה נכנסת חשובה עם הודעה ומיקום"</string>
-    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"שיחה נכנסת חשובה עם תמונה, הודעה ומיקום"</string>
-    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"שיחה נכנסת חשובה עם קבצים מצורפים"</string>
-    <string name="notification_incoming_work_call" msgid="5291275092734261918">"שיחת עבודה נכנסת"</string>
-    <string name="notification_incoming_spam_call" msgid="7591506944666791937">"השיחה הנכנסת חשודה כספאם"</string>
-    <string name="notification_requesting_video_call" msgid="1807679328811515758">"בקשת וידאו נכנסת"</string>
-    <string name="notification_action_answer" msgid="8748275902211192568">"ענה"</string>
-    <string name="notification_action_end_call" msgid="7467258454170007765">"נתק"</string>
-    <string name="notification_action_answer_video" msgid="8488108892919917287">"סרטון"</string>
-    <string name="notification_action_accept" msgid="1272761514200507143">"קבל"</string>
-    <string name="notification_action_dismiss" msgid="3128241581632616226">"דחה"</string>
-    <string name="notification_action_speaker_on" msgid="1882659234405596540">"הפעלת הרמקול"</string>
-    <string name="notification_action_speaker_off" msgid="6340085043115533948">"השבתת הרמקול"</string>
-    <string name="notification_external_call" msgid="2504334597315343920">"באחד מהמכשירים האחרים מתבצעת שיחה"</string>
-    <string name="notification_external_video_call" msgid="7709394856028436683">"באחד מהמכשירים האחרים מתבצעת שיחת וידאו"</string>
-    <string name="notification_take_call" msgid="5631659438864492229">"קבל את השיחה"</string>
-    <string name="notification_take_video_call" msgid="4473387503712341390">"קבל את שיחת הווידאו"</string>
-    <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"שירות לא נתמך."</string>
-    <string name="goPrivate" msgid="5269514638004595378">"עבור לשיחה פרטית"</string>
-    <string name="manageConferenceLabel" msgid="3589379023518128318">"נהל שיחת ועידה"</string>
-    <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"מספר חירום"</string>
-    <string name="child_number" msgid="3398257437107259682">"דרך <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
-    <string name="callFailed_simError" msgid="4587775795711340072">"‏אין SIM או שגיאת SIM"</string>
-    <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"סיים שיחה"</string>
-    <string name="conference_call_name" msgid="8189987124611337174">"שיחת ועידה"</string>
-    <string name="generic_conference_call_name" msgid="1546941472424243894">"בשיחה"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"ממשיך את השיחה באמצעות הרשת הסלולרית…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"‏לא ניתן לעבור לרשת Wi-Fi"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"שיחת הווידאו תמשיך להיות ברשת הסלולרית. ייתכן שתחויב על שימוש בנתונים."</string>
-    <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"אל תציג זאת שוב"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="wait_prompt_str">‏לשלוח את הצלילים הבאים?\n</string>
+  <string name="pause_prompt_yes">כן</string>
+  <string name="pause_prompt_no">לא</string>
+  <string name="notification_dialing">מחייג</string>
+  <string name="notification_ongoing_call">שיחה פעילה</string>
+  <string name="notification_ongoing_video_call">שיחת וידאו פעילה</string>
+  <string name="notification_ongoing_paused_video_call">שיחת וידאו פעילה - הווידאו מושהה</string>
+  <string name="notification_ongoing_work_call">שיחת עבודה פעילה</string>
+  <string name="notification_ongoing_call_wifi_template">%1$s פעילה</string>
+  <string name="notification_incoming_call_wifi_template">%1$s נכנסת</string>
+  <string name="notification_call_wifi_brand">‏שיחת Wi-Fi</string>
+  <string name="notification_call_wifi_work_brand">‏שיחת עבודה ברשת Wi-Fi</string>
+  <string name="notification_on_hold">בהמתנה</string>
+  <string name="notification_incoming_call">שיחה נכנסת</string>
+  <string name="notification_incoming_video_call">שיחת וידאו נכנסת</string>
+  <string name="notification_incoming_call_mutli_sim">שיחה נכנסת באמצעות %1$s</string>
+  <string name="notification_incoming_call_with_photo">שיחה נכנסת עם תמונה</string>
+  <string name="notification_incoming_call_with_message">שיחה נכנסת עם הודעה</string>
+  <string name="notification_incoming_call_with_location">שיחה נכנסת עם מיקום</string>
+  <string name="notification_incoming_call_with_photo_message">שיחה נכנסת עם תמונה והודעה</string>
+  <string name="notification_incoming_call_with_photo_location">שיחה נכנסת עם תמונה ומיקום</string>
+  <string name="notification_incoming_call_with_message_location">שיחה נכנסת עם הודעה ומיקום</string>
+  <string name="notification_incoming_call_with_photo_message_location">שיחה נכנסת עם תמונה, הודעה ומיקום</string>
+  <string name="notification_incoming_call_attachments">שיחה נכנסת עם קבצים מצורפים</string>
+  <string name="important_notification_incoming_call">שיחה נכנסת חשובה</string>
+  <string name="important_notification_incoming_call_with_photo">שיחה נכנסת חשובה עם תמונה</string>
+  <string name="important_notification_incoming_call_with_message">שיחה נכנסת חשובה עם הודעה</string>
+  <string name="important_notification_incoming_call_with_location">שיחה נכנסת חשובה עם מיקום</string>
+  <string name="important_notification_incoming_call_with_photo_message">שיחה נכנסת חשובה עם תמונה והודעה</string>
+  <string name="important_notification_incoming_call_with_photo_location">שיחה נכנסת חשובה עם תמונה ומיקום</string>
+  <string name="important_notification_incoming_call_with_message_location">שיחה נכנסת חשובה עם הודעה ומיקום</string>
+  <string name="important_notification_incoming_call_with_photo_message_location">שיחה נכנסת חשובה עם תמונה, הודעה ומיקום</string>
+  <string name="important_notification_incoming_call_attachments">שיחה נכנסת חשובה עם קבצים מצורפים</string>
+  <string name="notification_incoming_work_call">שיחת עבודה נכנסת</string>
+  <string name="notification_incoming_spam_call">השיחה הנכנסת חשודה כספאם</string>
+  <string name="notification_requesting_video_call">בקשת וידאו נכנסת</string>
+  <string name="notification_action_answer">ענה</string>
+  <string name="notification_action_end_call">נתק</string>
+  <string name="notification_action_answer_video">סרטון</string>
+  <string name="notification_action_accept">קבל</string>
+  <string name="notification_action_dismiss">דחה</string>
+  <string name="notification_action_speaker_on">הפעלת הרמקול</string>
+  <string name="notification_action_speaker_off">השבתת הרמקול</string>
+  <string name="notification_external_call">באחד מהמכשירים האחרים מתבצעת שיחה</string>
+  <string name="notification_external_video_call">באחד מהמכשירים האחרים מתבצעת שיחת וידאו</string>
+  <string name="notification_take_call">קבל את השיחה</string>
+  <string name="notification_take_video_call">קבל את שיחת הווידאו</string>
+  <string name="incall_error_supp_service_unknown">שירות לא נתמך.</string>
+  <string name="goPrivate">עבור לשיחה פרטית</string>
+  <string name="manageConferenceLabel">נהל שיחת ועידה</string>
+  <string name="child_number">דרך %s</string>
+  <string name="callFailed_simError">‏אין SIM או שגיאת SIM</string>
+  <string name="conference_caller_disconnect_content_description">סיים שיחה</string>
+  <string name="conference_call_name">שיחת ועידה</string>
+  <string name="generic_conference_call_name">בשיחה</string>
+  <string name="video_call_wifi_to_lte_handover_toast">ממשיך את השיחה באמצעות הרשת הסלולרית…</string>
+  <string name="video_call_lte_to_wifi_failed_title">‏לא ניתן לעבור לרשת Wi-Fi</string>
+  <string name="video_call_lte_to_wifi_failed_message">שיחת הווידאו תמשיך להיות ברשת הסלולרית. ייתכן שתחויב על שימוש בנתונים.</string>
+  <string name="video_call_lte_to_wifi_failed_do_not_show">אל תציג זאת שוב</string>
+  <string name="bubble_return_to_call">חזרה לשיחה</string>
+  <string name="rtt_request_dialog_title">‏רוצה להצטרף לשיחת RTT?</string>
+  <string name="rtt_request_dialog_details">%1$s רוצה להשתמש בהודעות בשיחה.</string>
+  <string name="rtt_request_dialog_more_information">‏RTT (טקסט בזמן אמת) היא תכונת נגישות שעוזרת לחרשים, לקויי שמיעה, לקויי דיבור או אנשים שלא יכולים להסתפק רק בקול במהלך השיחה.</string>
+  <string name="rtt_button_decline_request">לא תודה</string>
+  <string name="rtt_button_accept_request">‏הצטרפות ל-RTT</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-ja/strings.xml b/java/com/android/incallui/res/values-ja/strings.xml
index 0057c40..626035c 100644
--- a/java/com/android/incallui/res/values-ja/strings.xml
+++ b/java/com/android/incallui/res/values-ja/strings.xml
@@ -1,79 +1,68 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"電話"</string>
-    <string name="wait_prompt_str" msgid="3509685348904329594">"次の番号を送信しますか？\n"</string>
-    <string name="pause_prompt_yes" msgid="4642047011233552973">"はい"</string>
-    <string name="pause_prompt_no" msgid="4691320111774935838">"いいえ"</string>
-    <string name="notification_dialing" msgid="9072177265772083826">"発信中"</string>
-    <string name="notification_ongoing_call" msgid="8712641937577776125">"通話中"</string>
-    <string name="notification_ongoing_video_call" msgid="6331318021321487769">"ビデオ通話中"</string>
-    <string name="notification_ongoing_paused_video_call" msgid="709950253594606371">"ビデオ通話中 - ビデオは一時停止中"</string>
-    <string name="notification_ongoing_work_call" msgid="3189581218078981547">"仕事の通話中"</string>
-    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"<xliff:g id="BRAND_NAME">%1$s</xliff:g>を進行中"</string>
-    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"<xliff:g id="BRAND_NAME">%1$s</xliff:g>を着信中"</string>
-    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"Wi-Fi 経由で通話"</string>
-    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"Wi‑Fi 経由で仕事の通話"</string>
-    <string name="notification_on_hold" msgid="7141827443379205682">"保留中"</string>
-    <string name="notification_incoming_call" msgid="7520580807513849283">"通話着信"</string>
-    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"着信（写真あり）"</string>
-    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"着信（メッセージあり）"</string>
-    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"着信（位置情報あり）"</string>
-    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"着信（写真、メッセージあり）"</string>
-    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"着信（写真、位置情報あり）"</string>
-    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"着信（メッセージ、位置情報あり）"</string>
-    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"着信（写真、メッセージ、位置情報あり）"</string>
-    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"着信（添付ファイルあり）"</string>
-    <string name="important_notification_incoming_call" msgid="2867013954509930989">"重要な着信"</string>
-    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"重要な着信（写真あり）"</string>
-    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"重要な着信（メッセージあり）"</string>
-    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"重要な着信（位置情報あり）"</string>
-    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"重要な着信（写真、メッセージあり）"</string>
-    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"重要な着信（写真、位置情報あり）"</string>
-    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"重要な着信（メッセージ、位置情報あり）"</string>
-    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"重要な着信（写真、メッセージ、位置情報あり）"</string>
-    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"重要な着信（添付ファイルあり）"</string>
-    <string name="notification_incoming_work_call" msgid="5291275092734261918">"仕事の通話が着信中"</string>
-    <string name="notification_incoming_spam_call" msgid="7591506944666791937">"迷惑電話の疑いがある通話を着信しています"</string>
-    <string name="notification_requesting_video_call" msgid="1807679328811515758">"ビデオハングアウトリクエスト着信"</string>
-    <string name="notification_action_answer" msgid="8748275902211192568">"電話に出る"</string>
-    <string name="notification_action_end_call" msgid="7467258454170007765">"通話終了"</string>
-    <string name="notification_action_answer_video" msgid="8488108892919917287">"ビデオ"</string>
-    <string name="notification_action_accept" msgid="1272761514200507143">"同意する"</string>
-    <string name="notification_action_dismiss" msgid="3128241581632616226">"拒否"</string>
-    <string name="notification_action_speaker_on" msgid="1882659234405596540">"スピーカーを ON にする"</string>
-    <string name="notification_action_speaker_off" msgid="6340085043115533948">"スピーカーを OFF にする"</string>
-    <string name="notification_external_call" msgid="2504334597315343920">"別の端末で通話中"</string>
-    <string name="notification_external_video_call" msgid="7709394856028436683">"別の端末でビデオハングアウト中"</string>
-    <string name="notification_take_call" msgid="5631659438864492229">"通話を引き継ぐ"</string>
-    <string name="notification_take_video_call" msgid="4473387503712341390">"ビデオハングアウトを引き継ぐ"</string>
-    <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"サービスはサポートされていません。"</string>
-    <string name="goPrivate" msgid="5269514638004595378">"個別通話に切り替え"</string>
-    <string name="manageConferenceLabel" msgid="3589379023518128318">"グループ通話オプション"</string>
-    <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"緊急通報番号"</string>
-    <string name="child_number" msgid="3398257437107259682">"<xliff:g id="CHILD_NUMBER">%s</xliff:g>に着信"</string>
-    <string name="callFailed_simError" msgid="4587775795711340072">"SIMがない、またはSIMエラー"</string>
-    <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"通話を終了"</string>
-    <string name="conference_call_name" msgid="8189987124611337174">"グループ通話"</string>
-    <string name="generic_conference_call_name" msgid="1546941472424243894">"通話中"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"モバイルデータを使用して通話を継続しています…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Wi-Fi ネットワークに切り替えることができませんでした"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"引き続きモバイル ネットワークを使用してビデオハングアウトを続行します。通常のデータ通信料が適用される場合があります。"</string>
-    <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"今後このメッセージを表示しない"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="wait_prompt_str">次の番号を送信しますか？\n</string>
+  <string name="pause_prompt_yes">はい</string>
+  <string name="pause_prompt_no">いいえ</string>
+  <string name="notification_dialing">発信中</string>
+  <string name="notification_ongoing_call">通話中</string>
+  <string name="notification_ongoing_video_call">ビデオ通話中</string>
+  <string name="notification_ongoing_paused_video_call">ビデオ通話中 - ビデオは一時停止中</string>
+  <string name="notification_ongoing_work_call">仕事の通話中</string>
+  <string name="notification_ongoing_call_wifi_template">%1$sを進行中</string>
+  <string name="notification_incoming_call_wifi_template">%1$sを着信中</string>
+  <string name="notification_call_wifi_brand">Wi-Fi 経由で通話</string>
+  <string name="notification_call_wifi_work_brand">Wi‑Fi 経由で仕事の通話</string>
+  <string name="notification_on_hold">保留中</string>
+  <string name="notification_incoming_call">通話着信</string>
+  <string name="notification_incoming_video_call">ビデオハングアウト着信</string>
+  <string name="notification_incoming_call_mutli_sim">%1$s 経由で着信中</string>
+  <string name="notification_incoming_call_with_photo">着信（写真あり）</string>
+  <string name="notification_incoming_call_with_message">着信（メッセージあり）</string>
+  <string name="notification_incoming_call_with_location">着信（位置情報あり）</string>
+  <string name="notification_incoming_call_with_photo_message">着信（写真、メッセージあり）</string>
+  <string name="notification_incoming_call_with_photo_location">着信（写真、位置情報あり）</string>
+  <string name="notification_incoming_call_with_message_location">着信（メッセージ、位置情報あり）</string>
+  <string name="notification_incoming_call_with_photo_message_location">着信（写真、メッセージ、位置情報あり）</string>
+  <string name="notification_incoming_call_attachments">着信（添付ファイルあり）</string>
+  <string name="important_notification_incoming_call">重要な着信</string>
+  <string name="important_notification_incoming_call_with_photo">重要な着信（写真あり）</string>
+  <string name="important_notification_incoming_call_with_message">重要な着信（メッセージあり）</string>
+  <string name="important_notification_incoming_call_with_location">重要な着信（位置情報あり）</string>
+  <string name="important_notification_incoming_call_with_photo_message">重要な着信（写真、メッセージあり）</string>
+  <string name="important_notification_incoming_call_with_photo_location">重要な着信（写真、位置情報あり）</string>
+  <string name="important_notification_incoming_call_with_message_location">重要な着信（メッセージ、位置情報あり）</string>
+  <string name="important_notification_incoming_call_with_photo_message_location">重要な着信（写真、メッセージ、位置情報あり）</string>
+  <string name="important_notification_incoming_call_attachments">重要な着信（添付ファイルあり）</string>
+  <string name="notification_incoming_work_call">仕事の通話が着信中</string>
+  <string name="notification_incoming_spam_call">迷惑電話の疑いがある通話を着信しています</string>
+  <string name="notification_requesting_video_call">ビデオハングアウトリクエスト着信</string>
+  <string name="notification_action_answer">電話に出る</string>
+  <string name="notification_action_end_call">通話終了</string>
+  <string name="notification_action_answer_video">ビデオ</string>
+  <string name="notification_action_accept">同意する</string>
+  <string name="notification_action_dismiss">拒否</string>
+  <string name="notification_action_speaker_on">スピーカーを ON にする</string>
+  <string name="notification_action_speaker_off">スピーカーを OFF にする</string>
+  <string name="notification_external_call">別の端末で通話中</string>
+  <string name="notification_external_video_call">別の端末でビデオハングアウト中</string>
+  <string name="notification_take_call">通話を引き継ぐ</string>
+  <string name="notification_take_video_call">ビデオハングアウトを引き継ぐ</string>
+  <string name="incall_error_supp_service_unknown">サービスはサポートされていません。</string>
+  <string name="goPrivate">個別通話に切り替え</string>
+  <string name="manageConferenceLabel">グループ通話オプション</string>
+  <string name="child_number">%sに着信</string>
+  <string name="callFailed_simError">SIMがない、またはSIMエラー</string>
+  <string name="conference_caller_disconnect_content_description">通話を終了</string>
+  <string name="conference_call_name">グループ通話</string>
+  <string name="generic_conference_call_name">通話中</string>
+  <string name="video_call_wifi_to_lte_handover_toast">モバイルデータを使用して通話を継続しています…</string>
+  <string name="video_call_lte_to_wifi_failed_title">Wi-Fi ネットワークに切り替えることができませんでした</string>
+  <string name="video_call_lte_to_wifi_failed_message">引き続きモバイル ネットワークを使用してビデオハングアウトを続行します。通常のデータ通信料が適用される場合があります。</string>
+  <string name="video_call_lte_to_wifi_failed_do_not_show">今後このメッセージを表示しない</string>
+  <string name="bubble_return_to_call">通話に戻る</string>
+  <string name="rtt_request_dialog_title">RTT 通話に参加しますか？</string>
+  <string name="rtt_request_dialog_details">%1$s さんが、音声通話中に発話がテキスト表示される機能の利用をリクエストしています。</string>
+  <string name="rtt_request_dialog_more_information">RTT は、聴覚障害や言語障害があるなど、音声だけではコミュニケーションを取ることが困難なユーザーをサポートする機能です。</string>
+  <string name="rtt_button_decline_request">参加しない</string>
+  <string name="rtt_button_accept_request">RTT に参加</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-ka/strings.xml b/java/com/android/incallui/res/values-ka/strings.xml
index 5e3a116..923e8d6 100644
--- a/java/com/android/incallui/res/values-ka/strings.xml
+++ b/java/com/android/incallui/res/values-ka/strings.xml
@@ -1,79 +1,68 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"ტელეფონი"</string>
-    <string name="wait_prompt_str" msgid="3509685348904329594">"გსურთ შემდეგი ტონების გაგზავნა?\n"</string>
-    <string name="pause_prompt_yes" msgid="4642047011233552973">"დიახ"</string>
-    <string name="pause_prompt_no" msgid="4691320111774935838">"არა"</string>
-    <string name="notification_dialing" msgid="9072177265772083826">"მიმდინარეობს აკრეფა"</string>
-    <string name="notification_ongoing_call" msgid="8712641937577776125">"მიმდინარე ზარი"</string>
-    <string name="notification_ongoing_video_call" msgid="6331318021321487769">"მიმდინარე ვიდეოზარი"</string>
-    <string name="notification_ongoing_paused_video_call" msgid="709950253594606371">"მიმდინარე ვიდეოზარი — ვიდეო დაპაუზებულია"</string>
-    <string name="notification_ongoing_work_call" msgid="3189581218078981547">"მიმდინარე ზარი (სამსახური)"</string>
-    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"მიმდინარე <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
-    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"შემომავალი <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
-    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"Wi-Fi ზარი"</string>
-    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"Wi‑Fi სამსახურებრივი ზარი"</string>
-    <string name="notification_on_hold" msgid="7141827443379205682">"შეყოვნების რეჟიმში"</string>
-    <string name="notification_incoming_call" msgid="7520580807513849283">"შემომავალი ზარი"</string>
-    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"შემომავალი ზარი ფოტოთი"</string>
-    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"შემომავალი ზარი შეტყობინებით"</string>
-    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"შემომავალი ზარი მდებარეობით"</string>
-    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"შემომავალი ზარი ფოტოთი და შეტყობინებით"</string>
-    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"შემომავალი ზარი ფოტოთი და მდებარეობით"</string>
-    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"შემომავალი ზარი შეტყობინებით და მდებარეობით"</string>
-    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"შემომავ. ზარი ფოტოთი, შეტყობინებით და მდებარეობით"</string>
-    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"შემომავალი ზარი დანართებით"</string>
-    <string name="important_notification_incoming_call" msgid="2867013954509930989">"მნიშვნელოვანი შემომავალი ზარი"</string>
-    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"მნიშვნელოვანი შემომავალი ზარი ფოტოთი"</string>
-    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"მნიშვნელოვანი ზარი შეტყობინებით"</string>
-    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"მნიშვნელოვანი შემომავალი ზარი მდებარეობით"</string>
-    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"მნიშვნელოვანი ზარი ფოტოთი და შეტყობინებით"</string>
-    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"მნიშვნელოვანი ზარი ფოტოთი და მდებარეობით"</string>
-    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"მნიშვნელოვანი ზარი შეტყობინებით და მდებარეობით"</string>
-    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"ზარი ფოტოთი, შეტყობინებით და მდებარეობით"</string>
-    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"მნიშვნელოვანი შემომავალი ზარი დანართებით"</string>
-    <string name="notification_incoming_work_call" msgid="5291275092734261918">"შემომავალი ზარი (სამსახური)"</string>
-    <string name="notification_incoming_spam_call" msgid="7591506944666791937">"შემომავალი ზარი - სავარაუდოდ სპამი"</string>
-    <string name="notification_requesting_video_call" msgid="1807679328811515758">"შემომავალი ვიდეოს მოთხოვნა"</string>
-    <string name="notification_action_answer" msgid="8748275902211192568">"პასუხი"</string>
-    <string name="notification_action_end_call" msgid="7467258454170007765">"გათიშვა"</string>
-    <string name="notification_action_answer_video" msgid="8488108892919917287">"ვიდეო"</string>
-    <string name="notification_action_accept" msgid="1272761514200507143">"მიღება"</string>
-    <string name="notification_action_dismiss" msgid="3128241581632616226">"უარყოფა"</string>
-    <string name="notification_action_speaker_on" msgid="1882659234405596540">"სპიკერის ჩართვა"</string>
-    <string name="notification_action_speaker_off" msgid="6340085043115533948">"სპიკერის გამორთვა"</string>
-    <string name="notification_external_call" msgid="2504334597315343920">"სხვა მოწყობილობაზე მიმდინარე ზარი"</string>
-    <string name="notification_external_video_call" msgid="7709394856028436683">"მიმდინარე ვიდეო ზარი სხვა მოწყობილობაზე"</string>
-    <string name="notification_take_call" msgid="5631659438864492229">"ზარის მიღება"</string>
-    <string name="notification_take_video_call" msgid="4473387503712341390">"Take ვიდეო ზარი"</string>
-    <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"მომსახურება არ არის მხარდაჭერილი."</string>
-    <string name="goPrivate" msgid="5269514638004595378">"პირადი რეჟიმი"</string>
-    <string name="manageConferenceLabel" msgid="3589379023518128318">"საკონფერენციო ზარის მართვა"</string>
-    <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"გადაუდებელი დახმარების ნომერი"</string>
-    <string name="child_number" msgid="3398257437107259682">"<xliff:g id="CHILD_NUMBER">%s</xliff:g>-დან"</string>
-    <string name="callFailed_simError" msgid="4587775795711340072">"SIM არ არის, ან SIM-ის შეცდომაა"</string>
-    <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"ზარის დასრულება"</string>
-    <string name="conference_call_name" msgid="8189987124611337174">"საკონფერენციო ზარი"</string>
-    <string name="generic_conference_call_name" msgid="1546941472424243894">"მონაწილეობს ზარში"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"ზარი გრძელდება მობილური ინტერნეტის გამოყენებით…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Wi-Fi ქსელზე გადართვა ვერ მოხერხდა"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"ვიდეოზარი მობილური ინტერნეტის ქსელში დარჩება. შესაძლოა მოგიწიოთ მობილური ინტერნეტის სტანდარტული საფასურის გადახდა."</string>
-    <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"აღარ მაჩვენო"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="wait_prompt_str">გსურთ შემდეგი ტონების გაგზავნა?\n</string>
+  <string name="pause_prompt_yes">დიახ</string>
+  <string name="pause_prompt_no">არა</string>
+  <string name="notification_dialing">მიმდინარეობს აკრეფა</string>
+  <string name="notification_ongoing_call">მიმდინარე ზარი</string>
+  <string name="notification_ongoing_video_call">მიმდინარე ვიდეოზარი</string>
+  <string name="notification_ongoing_paused_video_call">მიმდინარე ვიდეოზარი — ვიდეო დაპაუზებულია</string>
+  <string name="notification_ongoing_work_call">მიმდინარე ზარი (სამსახური)</string>
+  <string name="notification_ongoing_call_wifi_template">მიმდინარე %1$s</string>
+  <string name="notification_incoming_call_wifi_template">შემომავალი %1$s</string>
+  <string name="notification_call_wifi_brand">Wi-Fi ზარი</string>
+  <string name="notification_call_wifi_work_brand">Wi‑Fi სამსახურებრივი ზარი</string>
+  <string name="notification_on_hold">შეყოვნების რეჟიმში</string>
+  <string name="notification_incoming_call">შემომავალი ზარი</string>
+  <string name="notification_incoming_video_call">შემომავალი ვიდეოზარი</string>
+  <string name="notification_incoming_call_mutli_sim">შემომავალი ზარი %1$s-დან</string>
+  <string name="notification_incoming_call_with_photo">შემომავალი ზარი ფოტოთი</string>
+  <string name="notification_incoming_call_with_message">შემომავალი ზარი შეტყობინებით</string>
+  <string name="notification_incoming_call_with_location">შემომავალი ზარი მდებარეობით</string>
+  <string name="notification_incoming_call_with_photo_message">შემომავალი ზარი ფოტოთი და შეტყობინებით</string>
+  <string name="notification_incoming_call_with_photo_location">შემომავალი ზარი ფოტოთი და მდებარეობით</string>
+  <string name="notification_incoming_call_with_message_location">შემომავალი ზარი შეტყობინებით და მდებარეობით</string>
+  <string name="notification_incoming_call_with_photo_message_location">შემომავ. ზარი ფოტოთი, შეტყობინებით და მდებარეობით</string>
+  <string name="notification_incoming_call_attachments">შემომავალი ზარი დანართებით</string>
+  <string name="important_notification_incoming_call">მნიშვნელოვანი შემომავალი ზარი</string>
+  <string name="important_notification_incoming_call_with_photo">მნიშვნელოვანი შემომავალი ზარი ფოტოთი</string>
+  <string name="important_notification_incoming_call_with_message">მნიშვნელოვანი ზარი შეტყობინებით</string>
+  <string name="important_notification_incoming_call_with_location">მნიშვნელოვანი შემომავალი ზარი მდებარეობით</string>
+  <string name="important_notification_incoming_call_with_photo_message">მნიშვნელოვანი ზარი ფოტოთი და შეტყობინებით</string>
+  <string name="important_notification_incoming_call_with_photo_location">მნიშვნელოვანი ზარი ფოტოთი და მდებარეობით</string>
+  <string name="important_notification_incoming_call_with_message_location">მნიშვნელოვანი ზარი შეტყობინებით და მდებარეობით</string>
+  <string name="important_notification_incoming_call_with_photo_message_location">ზარი ფოტოთი, შეტყობინებით და მდებარეობით</string>
+  <string name="important_notification_incoming_call_attachments">მნიშვნელოვანი შემომავალი ზარი დანართებით</string>
+  <string name="notification_incoming_work_call">შემომავალი ზარი (სამსახური)</string>
+  <string name="notification_incoming_spam_call">შემომავალი ზარი - სავარაუდოდ სპამი</string>
+  <string name="notification_requesting_video_call">შემომავალი ვიდეოს მოთხოვნა</string>
+  <string name="notification_action_answer">პასუხი</string>
+  <string name="notification_action_end_call">გათიშვა</string>
+  <string name="notification_action_answer_video">ვიდეო</string>
+  <string name="notification_action_accept">მიღება</string>
+  <string name="notification_action_dismiss">უარყოფა</string>
+  <string name="notification_action_speaker_on">სპიკერის ჩართვა</string>
+  <string name="notification_action_speaker_off">სპიკერის გამორთვა</string>
+  <string name="notification_external_call">სხვა მოწყობილობაზე მიმდინარე ზარი</string>
+  <string name="notification_external_video_call">მიმდინარე ვიდეო ზარი სხვა მოწყობილობაზე</string>
+  <string name="notification_take_call">ზარის მიღება</string>
+  <string name="notification_take_video_call">Take ვიდეო ზარი</string>
+  <string name="incall_error_supp_service_unknown">მომსახურება არ არის მხარდაჭერილი.</string>
+  <string name="goPrivate">პირადი რეჟიმი</string>
+  <string name="manageConferenceLabel">საკონფერენციო ზარის მართვა</string>
+  <string name="child_number">%s-დან</string>
+  <string name="callFailed_simError">SIM არ არის, ან SIM-ის შეცდომაა</string>
+  <string name="conference_caller_disconnect_content_description">ზარის დასრულება</string>
+  <string name="conference_call_name">საკონფერენციო ზარი</string>
+  <string name="generic_conference_call_name">მონაწილეობს ზარში</string>
+  <string name="video_call_wifi_to_lte_handover_toast">ზარი გრძელდება მობილური ინტერნეტის გამოყენებით…</string>
+  <string name="video_call_lte_to_wifi_failed_title">Wi-Fi ქსელზე გადართვა ვერ მოხერხდა</string>
+  <string name="video_call_lte_to_wifi_failed_message">ვიდეოზარი მობილური ინტერნეტის ქსელში დარჩება. შესაძლოა მოგიწიოთ მობილური ინტერნეტის სტანდარტული საფასურის გადახდა.</string>
+  <string name="video_call_lte_to_wifi_failed_do_not_show">აღარ მაჩვენო</string>
+  <string name="bubble_return_to_call">ზარში დაბრუნება</string>
+  <string name="rtt_request_dialog_title">გსურთ, შეუერთდეთ RTT ზარს?</string>
+  <string name="rtt_request_dialog_details">%1$s-ს სურს, გამოიყენოს შეტყობინებები თქვენს ხმოვან ზარში.</string>
+  <string name="rtt_request_dialog_more_information">RTT დახმარებას უწევს ყრუ, სმენადაქვეითებულ, შეზღუდული მეტყველების მქონე აბონენტებს, ან მათ, ვისაც სჭირდება მეტი, ვიდრე მხოლოდ ხმაა.</string>
+  <string name="rtt_button_decline_request">არა, გმადლობთ</string>
+  <string name="rtt_button_accept_request">RTT-თან შეერთება</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-kk/strings.xml b/java/com/android/incallui/res/values-kk/strings.xml
index 6b73682..eaa7c45 100644
--- a/java/com/android/incallui/res/values-kk/strings.xml
+++ b/java/com/android/incallui/res/values-kk/strings.xml
@@ -1,79 +1,68 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"Телефон"</string>
-    <string name="wait_prompt_str" msgid="3509685348904329594">"Келесі әуендер жіберілсін бе?\n"</string>
-    <string name="pause_prompt_yes" msgid="4642047011233552973">"Иә"</string>
-    <string name="pause_prompt_no" msgid="4691320111774935838">"Жоқ"</string>
-    <string name="notification_dialing" msgid="9072177265772083826">"Терілуде"</string>
-    <string name="notification_ongoing_call" msgid="8712641937577776125">"Ағымдағы қоңырау"</string>
-    <string name="notification_ongoing_video_call" msgid="6331318021321487769">"Жүріп жатқан бейне қоңырау"</string>
-    <string name="notification_ongoing_paused_video_call" msgid="709950253594606371">"Жүріп жатқан бейне қоңырау: бейне кідіртілді"</string>
-    <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Ағымдағы жұмыс қоңырауы"</string>
-    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"<xliff:g id="BRAND_NAME">%1$s</xliff:g> қазіргі қоңырауы"</string>
-    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"<xliff:g id="BRAND_NAME">%1$s</xliff:g> кіріс қоңырауы"</string>
-    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"Wi-Fi қоңырауы"</string>
-    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"Wi‑Fi жұмыс қоңырауы"</string>
-    <string name="notification_on_hold" msgid="7141827443379205682">"Күтуде"</string>
-    <string name="notification_incoming_call" msgid="7520580807513849283">"Келген қоңырау"</string>
-    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Сурет тіркелген кіріс қоңырау"</string>
-    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"Хабар тіркелген кіріс қоңырау"</string>
-    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"Орын дерегі тіркелген кіріс қоңырау"</string>
-    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"Сурет және хабар тіркелген кіріс қоңырау"</string>
-    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"Сурет және орын дерегі тіркелген кіріс қоңырау"</string>
-    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"Хабар және орын дерегі тіркелген кіріс қоңырау"</string>
-    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"Сурет, хабар және орын дерегі тіркелген кіріс қоңырау"</string>
-    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"Тіркемелері бар кіріс қоңырау"</string>
-    <string name="important_notification_incoming_call" msgid="2867013954509930989">"Маңызды кіріс қоңырау"</string>
-    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"Сурет тіркелген маңызды қоңырау"</string>
-    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"Хабар тіркелген маңызды кіріс қоңырауы"</string>
-    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"Орын дерегі көрсетілген маңызды кіріс қоңырау"</string>
-    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"Сурет және хабар тіркелген маңызды кіріс қоңырау"</string>
-    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"Сурет және орын дерегі тіркелген маңызды кіріс қоңырау"</string>
-    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"Хабар және орын дерегі тіркелген маңызды кіріс қоңырау"</string>
-    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Сурет, хабар және орын дерегі тіркелген маңызды кіріс қоңырау"</string>
-    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Тіркемелері бар маңызды кіріс қоңырау"</string>
-    <string name="notification_incoming_work_call" msgid="5291275092734261918">"Кіріс жұмыс қоңырауы"</string>
-    <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Кіріс қоңырауы спам болуы мүмкін"</string>
-    <string name="notification_requesting_video_call" msgid="1807679328811515758">"Кіріс бейне сұрау"</string>
-    <string name="notification_action_answer" msgid="8748275902211192568">"Жауап"</string>
-    <string name="notification_action_end_call" msgid="7467258454170007765">"Қоңырауды аяқтау"</string>
-    <string name="notification_action_answer_video" msgid="8488108892919917287">"Бейне"</string>
-    <string name="notification_action_accept" msgid="1272761514200507143">"Қабылдау"</string>
-    <string name="notification_action_dismiss" msgid="3128241581632616226">"Қабылдамау"</string>
-    <string name="notification_action_speaker_on" msgid="1882659234405596540">"Динамикті қосу"</string>
-    <string name="notification_action_speaker_off" msgid="6340085043115533948">"Динамикті өшіру"</string>
-    <string name="notification_external_call" msgid="2504334597315343920">"Қоңырау басқа құрылғыдан шалынуда"</string>
-    <string name="notification_external_video_call" msgid="7709394856028436683">"Басқа құрылғыда бейне қоңырау шалынуда"</string>
-    <string name="notification_take_call" msgid="5631659438864492229">"Қоңырауды бері бұру"</string>
-    <string name="notification_take_video_call" msgid="4473387503712341390">"Бейне қоңырауды бері бұру"</string>
-    <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"Қызметке қолдау көрсетілмейді."</string>
-    <string name="goPrivate" msgid="5269514638004595378">"жеке қоңырауға ауысу"</string>
-    <string name="manageConferenceLabel" msgid="3589379023518128318">"Конференциялық қоңырауды басқару"</string>
-    <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"Төтенше жағдай нөмірі"</string>
-    <string name="child_number" msgid="3398257437107259682">"<xliff:g id="CHILD_NUMBER">%s</xliff:g> арқылы"</string>
-    <string name="callFailed_simError" msgid="4587775795711340072">"SIM жоқ немесе SIM қателігі"</string>
-    <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Қоңырауды аяқтау"</string>
-    <string name="conference_call_name" msgid="8189987124611337174">"Мәжіліс қоңырауы"</string>
-    <string name="generic_conference_call_name" msgid="1546941472424243894">"Бос емес"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Қоңырау мобильдік желі арқылы жалғасуда…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Wi-Fi желісіне қосылу мүмкін болмады"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Бейне қоңырау мобильдік желіде қалады. Стандартты мобильдік байланыс ақысы алынуы мүмкін."</string>
-    <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Мұны қайтадан көрсетпеу"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="wait_prompt_str">Келесі әуендер жіберілсін бе?\n</string>
+  <string name="pause_prompt_yes">Иә</string>
+  <string name="pause_prompt_no">Жоқ</string>
+  <string name="notification_dialing">Терілуде</string>
+  <string name="notification_ongoing_call">Ағымдағы қоңырау</string>
+  <string name="notification_ongoing_video_call">Жүріп жатқан бейне қоңырау</string>
+  <string name="notification_ongoing_paused_video_call">Жүріп жатқан бейне қоңырау: бейне кідіртілді</string>
+  <string name="notification_ongoing_work_call">Ағымдағы жұмыс қоңырауы</string>
+  <string name="notification_ongoing_call_wifi_template">%1$s қазіргі қоңырауы</string>
+  <string name="notification_incoming_call_wifi_template">%1$s кіріс қоңырауы</string>
+  <string name="notification_call_wifi_brand">Wi-Fi қоңырауы</string>
+  <string name="notification_call_wifi_work_brand">Wi‑Fi жұмыс қоңырауы</string>
+  <string name="notification_on_hold">Күтуде</string>
+  <string name="notification_incoming_call">Келген қоңырау</string>
+  <string name="notification_incoming_video_call">Кіріс бейне қоңырау</string>
+  <string name="notification_incoming_call_mutli_sim">%1$s кіріс қоңырауы</string>
+  <string name="notification_incoming_call_with_photo">Сурет тіркелген кіріс қоңырау</string>
+  <string name="notification_incoming_call_with_message">Хабар тіркелген кіріс қоңырау</string>
+  <string name="notification_incoming_call_with_location">Орын дерегі тіркелген кіріс қоңырау</string>
+  <string name="notification_incoming_call_with_photo_message">Сурет және хабар тіркелген кіріс қоңырау</string>
+  <string name="notification_incoming_call_with_photo_location">Сурет және орын дерегі тіркелген кіріс қоңырау</string>
+  <string name="notification_incoming_call_with_message_location">Хабар және орын дерегі тіркелген кіріс қоңырау</string>
+  <string name="notification_incoming_call_with_photo_message_location">Сурет, хабар және орын дерегі тіркелген кіріс қоңырау</string>
+  <string name="notification_incoming_call_attachments">Тіркемелері бар кіріс қоңырау</string>
+  <string name="important_notification_incoming_call">Маңызды кіріс қоңырау</string>
+  <string name="important_notification_incoming_call_with_photo">Сурет тіркелген маңызды қоңырау</string>
+  <string name="important_notification_incoming_call_with_message">Хабар тіркелген маңызды кіріс қоңырауы</string>
+  <string name="important_notification_incoming_call_with_location">Орын дерегі көрсетілген маңызды кіріс қоңырау</string>
+  <string name="important_notification_incoming_call_with_photo_message">Сурет және хабар тіркелген маңызды кіріс қоңырау</string>
+  <string name="important_notification_incoming_call_with_photo_location">Сурет және орын дерегі тіркелген маңызды кіріс қоңырау</string>
+  <string name="important_notification_incoming_call_with_message_location">Хабар және орын дерегі тіркелген маңызды кіріс қоңырау</string>
+  <string name="important_notification_incoming_call_with_photo_message_location">Сурет, хабар және орын дерегі тіркелген маңызды кіріс қоңырау</string>
+  <string name="important_notification_incoming_call_attachments">Тіркемелері бар маңызды кіріс қоңырау</string>
+  <string name="notification_incoming_work_call">Кіріс жұмыс қоңырауы</string>
+  <string name="notification_incoming_spam_call">Кіріс қоңырауы спам болуы мүмкін</string>
+  <string name="notification_requesting_video_call">Кіріс бейне сұрау</string>
+  <string name="notification_action_answer">Жауап</string>
+  <string name="notification_action_end_call">Қоңырауды аяқтау</string>
+  <string name="notification_action_answer_video">Бейне</string>
+  <string name="notification_action_accept">Қабылдау</string>
+  <string name="notification_action_dismiss">Қабылдамау</string>
+  <string name="notification_action_speaker_on">Динамикті қосу</string>
+  <string name="notification_action_speaker_off">Динамикті өшіру</string>
+  <string name="notification_external_call">Қоңырау басқа құрылғыдан шалынуда</string>
+  <string name="notification_external_video_call">Басқа құрылғыда бейне қоңырау шалынуда</string>
+  <string name="notification_take_call">Қоңырауды бері бұру</string>
+  <string name="notification_take_video_call">Бейне қоңырауды бері бұру</string>
+  <string name="incall_error_supp_service_unknown">Қызметке қолдау көрсетілмейді.</string>
+  <string name="goPrivate">жеке қоңырауға ауысу</string>
+  <string name="manageConferenceLabel">Конференциялық қоңырауды басқару</string>
+  <string name="child_number">%s арқылы</string>
+  <string name="callFailed_simError">SIM жоқ немесе SIM қателігі</string>
+  <string name="conference_caller_disconnect_content_description">Қоңырауды аяқтау</string>
+  <string name="conference_call_name">Мәжіліс қоңырауы</string>
+  <string name="generic_conference_call_name">Бос емес</string>
+  <string name="video_call_wifi_to_lte_handover_toast">Қоңырау мобильдік желі арқылы жалғасуда…</string>
+  <string name="video_call_lte_to_wifi_failed_title">Wi-Fi желісіне қосылу мүмкін болмады</string>
+  <string name="video_call_lte_to_wifi_failed_message">Бейне қоңырау мобильдік желіде қалады. Стандартты мобильдік байланыс ақысы алынуы мүмкін.</string>
+  <string name="video_call_lte_to_wifi_failed_do_not_show">Мұны қайтадан көрсетпеу</string>
+  <string name="bubble_return_to_call">Қоңырауға оралу</string>
+  <string name="rtt_request_dialog_title">RTT қоңырауына қосыласыз ба?</string>
+  <string name="rtt_request_dialog_details">%1$s дауыстық қоңырау кезінде хабар жіберу функциясын қолданғысы келеді.</string>
+  <string name="rtt_request_dialog_more_information">RTT қызметі мүлдем естімейтін, есту немесе сөйлеу қабілеті нашар немесе дыбысқа қосымша басқа қызметтерді қажет ететін адамдарға көмек ретінде қолданылады.</string>
+  <string name="rtt_button_decline_request">Жоқ, рақмет</string>
+  <string name="rtt_button_accept_request">RTT қызметіне қосылу</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-km/strings.xml b/java/com/android/incallui/res/values-km/strings.xml
index 6e644ba..00b9c42 100644
--- a/java/com/android/incallui/res/values-km/strings.xml
+++ b/java/com/android/incallui/res/values-km/strings.xml
@@ -1,79 +1,68 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"ទូរស័ព្ទ"</string>
-    <string name="wait_prompt_str" msgid="3509685348904329594">"ផ្ញើ​សំឡេង​ដូច​ខាងក្រោម?\n"</string>
-    <string name="pause_prompt_yes" msgid="4642047011233552973">"បាទ/ចាស"</string>
-    <string name="pause_prompt_no" msgid="4691320111774935838">"ទេ"</string>
-    <string name="notification_dialing" msgid="9072177265772083826">"កំពុងហៅ"</string>
-    <string name="notification_ongoing_call" msgid="8712641937577776125">"កំពុង​បន្ត​ការ​ហៅ"</string>
-    <string name="notification_ongoing_video_call" msgid="6331318021321487769">"ការ​ហៅ​ជា​វីដេអូ​កំពុង​បន្ត"</string>
-    <string name="notification_ongoing_paused_video_call" msgid="709950253594606371">"ការ​ហៅ​ជា​វីដេអូ​កំពុង​បន្ត - បាន​ផ្អាក​វីដេអូ"</string>
-    <string name="notification_ongoing_work_call" msgid="3189581218078981547">"ការហៅពីកន្លែងការងារកំពុងដំណើរការ"</string>
-    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"<xliff:g id="BRAND_NAME">%1$s</xliff:g> កំពុង​បន្ត"</string>
-    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"<xliff:g id="BRAND_NAME">%1$s</xliff:g> ចូល"</string>
-    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"ហៅតាម Wi-Fi"</string>
-    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"ការហៅ​តាម Wi‑Fi ពី​កន្លែង​ការងារ"</string>
-    <string name="notification_on_hold" msgid="7141827443379205682">"រង់ចាំ"</string>
-    <string name="notification_incoming_call" msgid="7520580807513849283">"ការ​ហៅ​ចូល"</string>
-    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"ការហៅ​ចូល​​ដែល​មាន​រូបថត"</string>
-    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"ការ​ហោ​ចូល​ដែល​មាន​​សារ"</string>
-    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"ការ​ហៅ​ចូល​ដែល​មាន​​ទីតាំង"</string>
-    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"ការ​ហៅ​ចូល​ដែល​មាន​រូបថត និង​សារ"</string>
-    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"ការ​ហៅ​ចូល​ដែល​មាន​រូបថត និង​ទីតាំង"</string>
-    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"ការ​ហៅ​ចូល​ដែល​សារ និង​ទីតាំង"</string>
-    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"ការ​ហៅ​ចូល​ដែល​មាន​រូបថត សារ និង​ទីតាំង"</string>
-    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"ការ​ហៅ​ចូល​ដែល​មាន​ឯកសារ​ភ្ជាប់"</string>
-    <string name="important_notification_incoming_call" msgid="2867013954509930989">"ការ​ហៅ​ចូល​ដែល​សំខាន់"</string>
-    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"ការ​ហៅ​ចូល​ដែល​សំខាន់​​មាន​រូបថត"</string>
-    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"ការហៅ​ចូល​ដែល​សំខាន់​​​មាន​សារ"</string>
-    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"ការ​ហៅ​ចូល​ដែល​សំខាន់​មាន​ទីតាំង"</string>
-    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"ការ​ហៅ​ចូល​ដែល​សំខាន់​មាន​រូបថត និង​សារ"</string>
-    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"ការ​ហៅ​ចូល​ដែល​សំខាន់​មាន​​រូបថត និង​ទីតាំង"</string>
-    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"ការ​ហៅ​ចូល​ដែល​សំខាន់​មាន​សារ និង​ទីតាំង"</string>
-    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"ការ​ហៅ​ចូល​ដែល​សំខាន់​មាន​រូបថត សារ និង​ទីតាំង"</string>
-    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"ការហៅ​​ចូល​ដែល​សំខាន់​មាន​ឯកសារ​ភ្ជាប់"</string>
-    <string name="notification_incoming_work_call" msgid="5291275092734261918">"កំពុងហៅចូលពីកន្លែងការងារ"</string>
-    <string name="notification_incoming_spam_call" msgid="7591506944666791937">"ការ​ហៅ​បន្លំ​​ចូល​​​ដែល​សង្ស័យ"</string>
-    <string name="notification_requesting_video_call" msgid="1807679328811515758">"សំណើ​ការ​ហៅ​ជា​វីដេអូ​ចូល"</string>
-    <string name="notification_action_answer" msgid="8748275902211192568">"ឆ្លើយតប"</string>
-    <string name="notification_action_end_call" msgid="7467258454170007765">"បញ្ចប់​ការ​សន្ទនា"</string>
-    <string name="notification_action_answer_video" msgid="8488108892919917287">"វីដេអូ"</string>
-    <string name="notification_action_accept" msgid="1272761514200507143">"ព្រម​ទទួល"</string>
-    <string name="notification_action_dismiss" msgid="3128241581632616226">"បដិសេធ"</string>
-    <string name="notification_action_speaker_on" msgid="1882659234405596540">"បើកឧបករណ៍បំពងសំំឡេង"</string>
-    <string name="notification_action_speaker_off" msgid="6340085043115533948">"បិទឧបករណ៍បំពងសំំឡេង"</string>
-    <string name="notification_external_call" msgid="2504334597315343920">"ការ​ហៅ​កំពុង​ដំណើរការ​លើ​ឧបករណ៍​ផ្សេង"</string>
-    <string name="notification_external_video_call" msgid="7709394856028436683">"ការ​ហៅ​ជាវីដេអូ​កំពុង​ដំណើរការ​នៅលើឧបករណ៍ផ្សេងទៀត"</string>
-    <string name="notification_take_call" msgid="5631659438864492229">"ទទួលយកការហៅ"</string>
-    <string name="notification_take_video_call" msgid="4473387503712341390">"ទទួល​យក​ការ​ហៅ​វីដេអូ"</string>
-    <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"សេវាកម្មមិនត្រូវបានគាំទ្រទេ។"</string>
-    <string name="goPrivate" msgid="5269514638004595378">"ទៅ​កាន់​ឯកជន"</string>
-    <string name="manageConferenceLabel" msgid="3589379023518128318">"គ្រប់គ្រងការហៅជាក្រុម"</string>
-    <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"លេខ​ពេល​អាសន្ន"</string>
-    <string name="child_number" msgid="3398257437107259682">"តាមរយៈ <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
-    <string name="callFailed_simError" msgid="4587775795711340072">"គ្មាន​ស៊ីមកាត ឬ​កំហុស​ស៊ីមកាត"</string>
-    <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"បញ្ចប់ការហៅ"</string>
-    <string name="conference_call_name" msgid="8189987124611337174">"ហៅជា​សន្និសីទ"</string>
-    <string name="generic_conference_call_name" msgid="1546941472424243894">"ស្ថិត​​ក្នុង​ការ​ហៅ"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"កំពុង​បន្ត​ការហៅ​ទូរសព្ទ​ ដោយ​ប្រើប្រាស់​ទិន្នន័យទូរសព្ទ​ចល័ត…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"មិន​អាច​ប្ដូរ​ទៅ​បណ្ដាញ Wi-Fi បាន​ទេ"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"ការហៅ​តាម​វីដេអូ​នឹង​នៅតែ​មាន​នៅ​លើ​បណ្ដាញ​ទូរសព្ទចល័ត។ អាច​នឹង​គិតថ្លៃ​ទិន្នន័យ​តាម​តម្លៃ​ស្តង់ដារ។"</string>
-    <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"កុំ​បង្ហាញ​វា​ម្ដង​ទៀត"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="wait_prompt_str">ផ្ញើ​សំឡេង​ដូច​ខាងក្រោម?\n</string>
+  <string name="pause_prompt_yes">បាទ/ចាស</string>
+  <string name="pause_prompt_no">ទេ</string>
+  <string name="notification_dialing">កំពុងហៅ</string>
+  <string name="notification_ongoing_call">កំពុង​បន្ត​ការ​ហៅ</string>
+  <string name="notification_ongoing_video_call">ការ​ហៅ​ជា​វីដេអូ​កំពុង​បន្ត</string>
+  <string name="notification_ongoing_paused_video_call">ការ​ហៅ​ជា​វីដេអូ​កំពុង​បន្ត - បាន​ផ្អាក​វីដេអូ</string>
+  <string name="notification_ongoing_work_call">ការហៅពីកន្លែងការងារកំពុងដំណើរការ</string>
+  <string name="notification_ongoing_call_wifi_template">%1$s កំពុង​បន្ត</string>
+  <string name="notification_incoming_call_wifi_template">%1$s ចូល</string>
+  <string name="notification_call_wifi_brand">ហៅតាម Wi-Fi</string>
+  <string name="notification_call_wifi_work_brand">ការហៅ​តាម Wi‑Fi ពី​កន្លែង​ការងារ</string>
+  <string name="notification_on_hold">រង់ចាំ</string>
+  <string name="notification_incoming_call">ការ​ហៅ​ចូល</string>
+  <string name="notification_incoming_video_call">ការ​ហៅចូលជា​វីដេអូ​</string>
+  <string name="notification_incoming_call_mutli_sim">ការហៅ​ចូល​តាមរយៈ %1$s</string>
+  <string name="notification_incoming_call_with_photo">ការហៅ​ចូល​​ដែល​មាន​រូបថត</string>
+  <string name="notification_incoming_call_with_message">ការ​ហោ​ចូល​ដែល​មាន​​សារ</string>
+  <string name="notification_incoming_call_with_location">ការ​ហៅ​ចូល​ដែល​មាន​​ទីតាំង</string>
+  <string name="notification_incoming_call_with_photo_message">ការ​ហៅ​ចូល​ដែល​មាន​រូបថត និង​សារ</string>
+  <string name="notification_incoming_call_with_photo_location">ការ​ហៅ​ចូល​ដែល​មាន​រូបថត និង​ទីតាំង</string>
+  <string name="notification_incoming_call_with_message_location">ការ​ហៅ​ចូល​ដែល​សារ និង​ទីតាំង</string>
+  <string name="notification_incoming_call_with_photo_message_location">ការ​ហៅ​ចូល​ដែល​មាន​រូបថត សារ និង​ទីតាំង</string>
+  <string name="notification_incoming_call_attachments">ការ​ហៅ​ចូល​ដែល​មាន​ឯកសារ​ភ្ជាប់</string>
+  <string name="important_notification_incoming_call">ការ​ហៅ​ចូល​ដែល​សំខាន់</string>
+  <string name="important_notification_incoming_call_with_photo">ការ​ហៅ​ចូល​ដែល​សំខាន់​​មាន​រូបថត</string>
+  <string name="important_notification_incoming_call_with_message">ការហៅ​ចូល​ដែល​សំខាន់​​​មាន​សារ</string>
+  <string name="important_notification_incoming_call_with_location">ការ​ហៅ​ចូល​ដែល​សំខាន់​មាន​ទីតាំង</string>
+  <string name="important_notification_incoming_call_with_photo_message">ការ​ហៅ​ចូល​ដែល​សំខាន់​មាន​រូបថត និង​សារ</string>
+  <string name="important_notification_incoming_call_with_photo_location">ការ​ហៅ​ចូល​ដែល​សំខាន់​មាន​​រូបថត និង​ទីតាំង</string>
+  <string name="important_notification_incoming_call_with_message_location">ការ​ហៅ​ចូល​ដែល​សំខាន់​មាន​សារ និង​ទីតាំង</string>
+  <string name="important_notification_incoming_call_with_photo_message_location">ការ​ហៅ​ចូល​ដែល​សំខាន់​មាន​រូបថត សារ និង​ទីតាំង</string>
+  <string name="important_notification_incoming_call_attachments">ការហៅ​​ចូល​ដែល​សំខាន់​មាន​ឯកសារ​ភ្ជាប់</string>
+  <string name="notification_incoming_work_call">កំពុងហៅចូលពីកន្លែងការងារ</string>
+  <string name="notification_incoming_spam_call">ការ​ហៅ​បន្លំ​​ចូល​​​ដែល​សង្ស័យ</string>
+  <string name="notification_requesting_video_call">សំណើ​ការ​ហៅ​ជា​វីដេអូ​ចូល</string>
+  <string name="notification_action_answer">ឆ្លើយតប</string>
+  <string name="notification_action_end_call">បញ្ចប់​ការ​សន្ទនា</string>
+  <string name="notification_action_answer_video">វីដេអូ</string>
+  <string name="notification_action_accept">ព្រម​ទទួល</string>
+  <string name="notification_action_dismiss">បដិសេធ</string>
+  <string name="notification_action_speaker_on">បើកឧបករណ៍បំពងសំំឡេង</string>
+  <string name="notification_action_speaker_off">បិទឧបករណ៍បំពងសំំឡេង</string>
+  <string name="notification_external_call">ការ​ហៅ​កំពុង​ដំណើរការ​លើ​ឧបករណ៍​ផ្សេង</string>
+  <string name="notification_external_video_call">ការ​ហៅ​ជាវីដេអូ​កំពុង​ដំណើរការ​នៅលើឧបករណ៍ផ្សេងទៀត</string>
+  <string name="notification_take_call">ទទួលយកការហៅ</string>
+  <string name="notification_take_video_call">ទទួល​យក​ការ​ហៅ​វីដេអូ</string>
+  <string name="incall_error_supp_service_unknown">សេវាកម្មមិនត្រូវបានគាំទ្រទេ។</string>
+  <string name="goPrivate">ទៅ​កាន់​ឯកជន</string>
+  <string name="manageConferenceLabel">គ្រប់គ្រងការហៅជាក្រុម</string>
+  <string name="child_number">តាមរយៈ %s</string>
+  <string name="callFailed_simError">គ្មាន​ស៊ីមកាត ឬ​កំហុស​ស៊ីមកាត</string>
+  <string name="conference_caller_disconnect_content_description">បញ្ចប់ការហៅ</string>
+  <string name="conference_call_name">ហៅជា​សន្និសីទ</string>
+  <string name="generic_conference_call_name">ស្ថិត​​ក្នុង​ការ​ហៅ</string>
+  <string name="video_call_wifi_to_lte_handover_toast">កំពុង​បន្ត​ការហៅ​ទូរសព្ទ​ ដោយ​ប្រើប្រាស់​ទិន្នន័យទូរសព្ទ​ចល័ត…</string>
+  <string name="video_call_lte_to_wifi_failed_title">មិន​អាច​ប្ដូរ​ទៅ​បណ្ដាញ Wi-Fi បាន​ទេ</string>
+  <string name="video_call_lte_to_wifi_failed_message">ការហៅ​តាម​វីដេអូ​នឹង​នៅតែ​មាន​នៅ​លើ​បណ្ដាញ​ទូរសព្ទចល័ត។ អាច​នឹង​គិតថ្លៃ​ទិន្នន័យ​តាម​តម្លៃ​ស្តង់ដារ។</string>
+  <string name="video_call_lte_to_wifi_failed_do_not_show">កុំ​បង្ហាញ​វា​ម្ដង​ទៀត</string>
+  <string name="bubble_return_to_call">ហៅ​ទូរសព្ទ​ទៅ​វិញ</string>
+  <string name="rtt_request_dialog_title">ចូលរួម​ការហៅ RTT ?</string>
+  <string name="rtt_request_dialog_details">%1$s ចង់​ប្រើប្រាស់​ការផ្ញើ​សារ​នៅ​ក្នុង​ការហៅ​ជា​សំឡេង​របស់​អ្នក។</string>
+  <string name="rtt_request_dialog_more_information">RTT ជួយ​អ្នក​ហៅ​ទូរសព្ទ​ដែល​​ថ្លង់ ពិបាក​ក្នុង​ការស្ដាប់ មិន​អាច​និយាយ​បាន ឬ​មាន​តម្រូវការ​ក្រៅ​ពី​​សំឡេង។</string>
+  <string name="rtt_button_decline_request">ទេ អរគុណ</string>
+  <string name="rtt_button_accept_request">ចូលរួម RTT</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-kn/strings.xml b/java/com/android/incallui/res/values-kn/strings.xml
index 693d161..b0768c0 100644
--- a/java/com/android/incallui/res/values-kn/strings.xml
+++ b/java/com/android/incallui/res/values-kn/strings.xml
@@ -1,79 +1,68 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"ಫೋನ್"</string>
-    <string name="wait_prompt_str" msgid="3509685348904329594">"ಕೆಳಗಿನ ಟೋನ್‌ಗಳನ್ನು ಕಳುಹಿಸುವುದೇ?\n"</string>
-    <string name="pause_prompt_yes" msgid="4642047011233552973">"ಹೌದು"</string>
-    <string name="pause_prompt_no" msgid="4691320111774935838">"ಇಲ್ಲ"</string>
-    <string name="notification_dialing" msgid="9072177265772083826">"ಡಯಲ್‌ ಮಾಡಲಾಗುತ್ತಿದೆ"</string>
-    <string name="notification_ongoing_call" msgid="8712641937577776125">"ಚಾಲ್ತಿಯಲ್ಲಿರುವ ಕರೆ"</string>
-    <string name="notification_ongoing_video_call" msgid="6331318021321487769">"ಚಾಲ್ತಿಯಲ್ಲಿರುವ ವೀಡಿಯೊ ಕರೆ"</string>
-    <string name="notification_ongoing_paused_video_call" msgid="709950253594606371">"ಚಾಲ್ತಿಯಲ್ಲಿರುವ ವೀಡಿಯೊ ಕರೆ ‑ ವೀಡಿಯೊವನ್ನು ವಿರಾಮಗೊಳಿಸಲಾಗಿದೆ"</string>
-    <string name="notification_ongoing_work_call" msgid="3189581218078981547">"ಚಾಲ್ತಿಯಲ್ಲಿರುವ ಕೆಲಸದ ಕರೆ"</string>
-    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"ಚಾಲ್ತಿಯಲ್ಲಿರುವ <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
-    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"ಒಳಬರುವ <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
-    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"ವೈ-ಫೈ ಕರೆ"</string>
-    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"ವೈ‑ಫೈ ಕೆಲಸದ ಕರೆ"</string>
-    <string name="notification_on_hold" msgid="7141827443379205682">"ತಡೆಹಿಡಿಯಲಾಗಿದೆ"</string>
-    <string name="notification_incoming_call" msgid="7520580807513849283">"ಒಳಬರುವ ಕರೆ"</string>
-    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"ಫೋಟೋದೊಂದಿಗೆ ಒಳಬರುತ್ತಿರುವ ಕರೆ"</string>
-    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"ಸಂದೇಶದೊಂದಿಗೆ ಒಳಬರುತ್ತಿರುವ ಕರೆ"</string>
-    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"ಸ್ಥಳದೊಂದಿಗೆ ಒಳಬರುತ್ತಿರುವ ಕರೆ"</string>
-    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"ಫೋಟೋ ಮತ್ತು ಸಂದೇಶದೊಂದಿಗೆ ಒಳಬರುತ್ತಿರುವ ಕರೆ"</string>
-    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"ಫೋಟೋ ಮತ್ತು ಸ್ಥಳದೊಂದಿಗೆ ಒಳಬರುತ್ತಿರುವ ಕರೆ"</string>
-    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"ಸಂದೇಶ ಮತ್ತು ಸ್ಥಳದೊಂದಿಗೆ ಒಳಬರುತ್ತಿರುವ ಕರೆ"</string>
-    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"ಪೋಟೋ, ಸಂದೇಶ ಮತ್ತು ಸ್ಥಳದೊಂದಿಗೆ ಒಳಬರುತ್ತಿರುವ ಕರೆ"</string>
-    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"ಲಗತ್ತುಗಳೊಂದಿಗೆ ಒಳಬರುತ್ತಿರುವ ಕರೆ"</string>
-    <string name="important_notification_incoming_call" msgid="2867013954509930989">"ಒಳಬರುತ್ತಿರುವ ಪ್ರಮುಖ ಕರೆ"</string>
-    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"ಫೋಟೋದೊಂದಿಗೆ ಒಳಬರುತ್ತಿರುವ ಪ್ರಮುಖ ಕರೆ"</string>
-    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"ಸಂದೇಶದೊಂದಿಗೆ ಒಳಬರುತ್ತಿರುವ ಪ್ರಮುಖ ಕರೆ"</string>
-    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"ಸ್ಥಳದೊಂದಿಗೆ ಒಳಬರುತ್ತಿರುವ ಪ್ರಮುಖ ಕರೆ"</string>
-    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"ಫೋಟೋ ಮತ್ತು ಸಂದೇಶದೊಂದಿಗೆ ಒಳಬರುತ್ತಿರುವ ಪ್ರಮುಖ ಕರೆ"</string>
-    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"ಫೋಟೋ ಮತ್ತು ಸ್ಥಳದೊಂದಿಗೆ ಒಳಬರುತ್ತಿರುವ ಪ್ರಮುಖ ಕರೆ"</string>
-    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"ಸಂದೇಶ ಮತ್ತು ಸ್ಥಳದೊಂದಿಗೆ ಒಳಬರುತ್ತಿರುವ ಪ್ರಮುಖ ಕರೆ"</string>
-    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"ಪೋಟೋ, ಸಂದೇಶ ಮತ್ತು ಸ್ಥಳದೊಂದಿಗೆ ಒಳಬರುತ್ತಿರುವ ಪ್ರಮುಖ ಕರೆ"</string>
-    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"ಲಗತ್ತುಗಳೊಂದಿಗೆ ಒಳಬರುತ್ತಿರುವ ಪ್ರಮುಖ ಕರೆ"</string>
-    <string name="notification_incoming_work_call" msgid="5291275092734261918">"ಒಳಬರುವ ಕೆಲಸದ ಕರೆ"</string>
-    <string name="notification_incoming_spam_call" msgid="7591506944666791937">"ಒಳಬರುವ ಶಂಕಿತ ಸ್ಪ್ಯಾಮ್ ಕರೆ"</string>
-    <string name="notification_requesting_video_call" msgid="1807679328811515758">"ಒಳಬರುವ ವೀಡಿಯೊ ವಿನಂತಿ"</string>
-    <string name="notification_action_answer" msgid="8748275902211192568">"ಉತ್ತರ"</string>
-    <string name="notification_action_end_call" msgid="7467258454170007765">"ಹ್ಯಾಂಗ್ ಅಪ್ ಮಾಡಿ"</string>
-    <string name="notification_action_answer_video" msgid="8488108892919917287">"ವೀಡಿಯೊ"</string>
-    <string name="notification_action_accept" msgid="1272761514200507143">"ಸಮ್ಮತಿಸು"</string>
-    <string name="notification_action_dismiss" msgid="3128241581632616226">"ನಿರಾಕರಿಸಿ"</string>
-    <string name="notification_action_speaker_on" msgid="1882659234405596540">"ಸ್ಪೀಕರ್ ಆನ್ ಮಾಡಿ"</string>
-    <string name="notification_action_speaker_off" msgid="6340085043115533948">"ಸ್ಪೀಕರ್ ಆಫ್ ಮಾಡಿ"</string>
-    <string name="notification_external_call" msgid="2504334597315343920">"ಮತ್ತೊಂದು ಸಾಧನದಲ್ಲಿ ಚಾಲ್ತಿಯಲ್ಲಿರುವ ಕರೆ"</string>
-    <string name="notification_external_video_call" msgid="7709394856028436683">"ಮತ್ತೊಂದು ಸಾಧನದಲ್ಲಿ ಚಾಲ್ತಿಯಲ್ಲಿರುವ ವೀಡಿಯೊ ಕರೆ"</string>
-    <string name="notification_take_call" msgid="5631659438864492229">"ಕರೆ ತೆಗೆದುಕೊಳ್ಳಿ"</string>
-    <string name="notification_take_video_call" msgid="4473387503712341390">"ವೀಡಿಯೊ ಕರೆ ತೆಗೆದುಕೊಳ್ಳಿ"</string>
-    <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"ಸೇವೆ ಬೆಂಬಲಿತವಾಗಿಲ್ಲ."</string>
-    <string name="goPrivate" msgid="5269514638004595378">"ಖಾಸಗಿಯಾಗಿ ಹೋಗಿ"</string>
-    <string name="manageConferenceLabel" msgid="3589379023518128318">"ಕಾನ್ಫರೆನ್ಸ್ ಕರೆಯನ್ನು ನಿರ್ವಹಿಸಿ"</string>
-    <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"ತುರ್ತು ಸಂಖ್ಯೆ"</string>
-    <string name="child_number" msgid="3398257437107259682">"<xliff:g id="CHILD_NUMBER">%s</xliff:g> ಮೂಲಕ"</string>
-    <string name="callFailed_simError" msgid="4587775795711340072">"ಯಾವುದೇ ಸಿಮ್‌ ಇಲ್ಲ ಅಥವಾ ಸಿಮ್‌ ದೋಷ"</string>
-    <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"ಕರೆ ಅಂತ್ಯಗೊಳಿಸಿ"</string>
-    <string name="conference_call_name" msgid="8189987124611337174">"ಕಾನ್ಫರೆನ್ಸ್ ಕರೆ"</string>
-    <string name="generic_conference_call_name" msgid="1546941472424243894">"ಕರೆಯಲ್ಲಿ"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"ಮೊಬೈಲ್ ಡೇಟಾ ಬಳಸಿಕೊಂಡು ಕರೆ ಮುಂದುವರಿಸಲಾಗುತ್ತಿದೆ…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"ವೈ-ಫೈ ನೆಟ್‍ವರ್ಕ್‌ಗೆ ಬದಲಾಯಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"ವೀಡಿಯೊ ಕರೆ ಮೊಬೈಲ್ ನೆಟ್‌ವರ್ಕ್‌ನಲ್ಲಿ ಹಾಗೆಯೇ ಉಳಿಯುತ್ತದೆ. ಪ್ರಮಾಣಿತ ಡೇಟಾ ಶುಲ್ಕಗಳು ಅನ್ವಯಿಸಬಹುದು."</string>
-    <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"ಮತ್ತೆ ಇದನ್ನು ತೋರಿಸಬೇಡ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="wait_prompt_str">ಕೆಳಗಿನ ಟೋನ್‌ಗಳನ್ನು ಕಳುಹಿಸುವುದೇ?\n</string>
+  <string name="pause_prompt_yes">ಹೌದು</string>
+  <string name="pause_prompt_no">ಇಲ್ಲ</string>
+  <string name="notification_dialing">ಡಯಲ್‌ ಮಾಡಲಾಗುತ್ತಿದೆ</string>
+  <string name="notification_ongoing_call">ಚಾಲ್ತಿಯಲ್ಲಿರುವ ಕರೆ</string>
+  <string name="notification_ongoing_video_call">ಚಾಲ್ತಿಯಲ್ಲಿರುವ ವೀಡಿಯೊ ಕರೆ</string>
+  <string name="notification_ongoing_paused_video_call">ಚಾಲ್ತಿಯಲ್ಲಿರುವ ವೀಡಿಯೊ ಕರೆ ‑ ವೀಡಿಯೊವನ್ನು ವಿರಾಮಗೊಳಿಸಲಾಗಿದೆ</string>
+  <string name="notification_ongoing_work_call">ಚಾಲ್ತಿಯಲ್ಲಿರುವ ಕೆಲಸದ ಕರೆ</string>
+  <string name="notification_ongoing_call_wifi_template">ಚಾಲ್ತಿಯಲ್ಲಿರುವ %1$s</string>
+  <string name="notification_incoming_call_wifi_template">ಒಳಬರುವ %1$s</string>
+  <string name="notification_call_wifi_brand">ವೈ-ಫೈ ಕರೆ</string>
+  <string name="notification_call_wifi_work_brand">ವೈ‑ಫೈ ಕೆಲಸದ ಕರೆ</string>
+  <string name="notification_on_hold">ತಡೆಹಿಡಿಯಲಾಗಿದೆ</string>
+  <string name="notification_incoming_call">ಒಳಬರುವ ಕರೆ</string>
+  <string name="notification_incoming_video_call">ಒಳಬರುವ ವೀಡಿಯೊ ಕರೆ</string>
+  <string name="notification_incoming_call_mutli_sim">%1$s ಮೂಲಕ ಒಳಬರುವ ಕರೆ</string>
+  <string name="notification_incoming_call_with_photo">ಫೋಟೋದೊಂದಿಗೆ ಒಳಬರುತ್ತಿರುವ ಕರೆ</string>
+  <string name="notification_incoming_call_with_message">ಸಂದೇಶದೊಂದಿಗೆ ಒಳಬರುತ್ತಿರುವ ಕರೆ</string>
+  <string name="notification_incoming_call_with_location">ಸ್ಥಳದೊಂದಿಗೆ ಒಳಬರುತ್ತಿರುವ ಕರೆ</string>
+  <string name="notification_incoming_call_with_photo_message">ಫೋಟೋ ಮತ್ತು ಸಂದೇಶದೊಂದಿಗೆ ಒಳಬರುತ್ತಿರುವ ಕರೆ</string>
+  <string name="notification_incoming_call_with_photo_location">ಫೋಟೋ ಮತ್ತು ಸ್ಥಳದೊಂದಿಗೆ ಒಳಬರುತ್ತಿರುವ ಕರೆ</string>
+  <string name="notification_incoming_call_with_message_location">ಸಂದೇಶ ಮತ್ತು ಸ್ಥಳದೊಂದಿಗೆ ಒಳಬರುತ್ತಿರುವ ಕರೆ</string>
+  <string name="notification_incoming_call_with_photo_message_location">ಪೋಟೋ, ಸಂದೇಶ ಮತ್ತು ಸ್ಥಳದೊಂದಿಗೆ ಒಳಬರುತ್ತಿರುವ ಕರೆ</string>
+  <string name="notification_incoming_call_attachments">ಲಗತ್ತುಗಳೊಂದಿಗೆ ಒಳಬರುತ್ತಿರುವ ಕರೆ</string>
+  <string name="important_notification_incoming_call">ಒಳಬರುತ್ತಿರುವ ಪ್ರಮುಖ ಕರೆ</string>
+  <string name="important_notification_incoming_call_with_photo">ಫೋಟೋದೊಂದಿಗೆ ಒಳಬರುತ್ತಿರುವ ಪ್ರಮುಖ ಕರೆ</string>
+  <string name="important_notification_incoming_call_with_message">ಸಂದೇಶದೊಂದಿಗೆ ಒಳಬರುತ್ತಿರುವ ಪ್ರಮುಖ ಕರೆ</string>
+  <string name="important_notification_incoming_call_with_location">ಸ್ಥಳದೊಂದಿಗೆ ಒಳಬರುತ್ತಿರುವ ಪ್ರಮುಖ ಕರೆ</string>
+  <string name="important_notification_incoming_call_with_photo_message">ಫೋಟೋ ಮತ್ತು ಸಂದೇಶದೊಂದಿಗೆ ಒಳಬರುತ್ತಿರುವ ಪ್ರಮುಖ ಕರೆ</string>
+  <string name="important_notification_incoming_call_with_photo_location">ಫೋಟೋ ಮತ್ತು ಸ್ಥಳದೊಂದಿಗೆ ಒಳಬರುತ್ತಿರುವ ಪ್ರಮುಖ ಕರೆ</string>
+  <string name="important_notification_incoming_call_with_message_location">ಸಂದೇಶ ಮತ್ತು ಸ್ಥಳದೊಂದಿಗೆ ಒಳಬರುತ್ತಿರುವ ಪ್ರಮುಖ ಕರೆ</string>
+  <string name="important_notification_incoming_call_with_photo_message_location">ಪೋಟೋ, ಸಂದೇಶ ಮತ್ತು ಸ್ಥಳದೊಂದಿಗೆ ಒಳಬರುತ್ತಿರುವ ಪ್ರಮುಖ ಕರೆ</string>
+  <string name="important_notification_incoming_call_attachments">ಲಗತ್ತುಗಳೊಂದಿಗೆ ಒಳಬರುತ್ತಿರುವ ಪ್ರಮುಖ ಕರೆ</string>
+  <string name="notification_incoming_work_call">ಒಳಬರುವ ಕೆಲಸದ ಕರೆ</string>
+  <string name="notification_incoming_spam_call">ಒಳಬರುವ ಶಂಕಿತ ಸ್ಪ್ಯಾಮ್ ಕರೆ</string>
+  <string name="notification_requesting_video_call">ಒಳಬರುವ ವೀಡಿಯೊ ವಿನಂತಿ</string>
+  <string name="notification_action_answer">ಉತ್ತರ</string>
+  <string name="notification_action_end_call">ಹ್ಯಾಂಗ್ ಅಪ್ ಮಾಡಿ</string>
+  <string name="notification_action_answer_video">ವೀಡಿಯೊ</string>
+  <string name="notification_action_accept">ಸಮ್ಮತಿಸು</string>
+  <string name="notification_action_dismiss">ನಿರಾಕರಿಸಿ</string>
+  <string name="notification_action_speaker_on">ಸ್ಪೀಕರ್ ಆನ್ ಮಾಡಿ</string>
+  <string name="notification_action_speaker_off">ಸ್ಪೀಕರ್ ಆಫ್ ಮಾಡಿ</string>
+  <string name="notification_external_call">ಮತ್ತೊಂದು ಸಾಧನದಲ್ಲಿ ಚಾಲ್ತಿಯಲ್ಲಿರುವ ಕರೆ</string>
+  <string name="notification_external_video_call">ಮತ್ತೊಂದು ಸಾಧನದಲ್ಲಿ ಚಾಲ್ತಿಯಲ್ಲಿರುವ ವೀಡಿಯೊ ಕರೆ</string>
+  <string name="notification_take_call">ಕರೆ ತೆಗೆದುಕೊಳ್ಳಿ</string>
+  <string name="notification_take_video_call">ವೀಡಿಯೊ ಕರೆ ತೆಗೆದುಕೊಳ್ಳಿ</string>
+  <string name="incall_error_supp_service_unknown">ಸೇವೆ ಬೆಂಬಲಿತವಾಗಿಲ್ಲ.</string>
+  <string name="goPrivate">ಖಾಸಗಿಯಾಗಿ ಹೋಗಿ</string>
+  <string name="manageConferenceLabel">ಕಾನ್ಫರೆನ್ಸ್ ಕರೆಯನ್ನು ನಿರ್ವಹಿಸಿ</string>
+  <string name="child_number">%s ಮೂಲಕ</string>
+  <string name="callFailed_simError">ಯಾವುದೇ ಸಿಮ್‌ ಇಲ್ಲ ಅಥವಾ ಸಿಮ್‌ ದೋಷ</string>
+  <string name="conference_caller_disconnect_content_description">ಕರೆ ಅಂತ್ಯಗೊಳಿಸಿ</string>
+  <string name="conference_call_name">ಕಾನ್ಫರೆನ್ಸ್ ಕರೆ</string>
+  <string name="generic_conference_call_name">ಕರೆಯಲ್ಲಿ</string>
+  <string name="video_call_wifi_to_lte_handover_toast">ಮೊಬೈಲ್ ಡೇಟಾ ಬಳಸಿಕೊಂಡು ಕರೆ ಮುಂದುವರಿಸಲಾಗುತ್ತಿದೆ…</string>
+  <string name="video_call_lte_to_wifi_failed_title">ವೈ-ಫೈ ನೆಟ್‍ವರ್ಕ್‌ಗೆ ಬದಲಾಯಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ</string>
+  <string name="video_call_lte_to_wifi_failed_message">ವೀಡಿಯೊ ಕರೆ ಮೊಬೈಲ್ ನೆಟ್‌ವರ್ಕ್‌ನಲ್ಲಿ ಹಾಗೆಯೇ ಉಳಿಯುತ್ತದೆ. ಪ್ರಮಾಣಿತ ಡೇಟಾ ಶುಲ್ಕಗಳು ಅನ್ವಯಿಸಬಹುದು.</string>
+  <string name="video_call_lte_to_wifi_failed_do_not_show">ಮತ್ತೆ ಇದನ್ನು ತೋರಿಸಬೇಡ</string>
+  <string name="bubble_return_to_call">ಕರೆಗೆ ಹಿಂತಿರುಗಿ</string>
+  <string name="rtt_request_dialog_title">RTT ಕರೆಗೆ ಸೇರುವುದೇ?</string>
+  <string name="rtt_request_dialog_details">%1$s ಅವರು ನಿಮ್ಮ ಧ್ವನಿ ಕರೆಯೊಂದಿಗೆ ಸಂದೇಶವನ್ನು ಕಳುಹಿಸಲು ಬಯಸಿದ್ದಾರೆ.</string>
+  <string name="rtt_request_dialog_more_information">ಯಾರು ಕಿವುಡರು, ಆಲಿಸಲು ಕಷ್ಟಪಡುವವರು, ಆಲಿಸಲು ಅಸಾಮರ್ಥ್ಯವಾಗಿರುವವರು, ಮಾತಿನ ಸಮಸ್ಯೆಯನ್ನು ಹೊಂದಿರುವವರು ಅಥವಾ ಧ್ವನಿಗಿಂತ ಇನ್ನಷ್ಟು ಬಯಸುವವರು RTT ಸಹಾಯಕ ಕರೆಮಾಡುವವರು.</string>
+  <string name="rtt_button_decline_request">ಬೇಡ</string>
+  <string name="rtt_button_accept_request">RTT ಅನ್ನು ಸೇರಿ</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-ko/strings.xml b/java/com/android/incallui/res/values-ko/strings.xml
index c377f22..ecb58f2 100644
--- a/java/com/android/incallui/res/values-ko/strings.xml
+++ b/java/com/android/incallui/res/values-ko/strings.xml
@@ -1,79 +1,68 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"휴대전화"</string>
-    <string name="wait_prompt_str" msgid="3509685348904329594">"다음 톤을 보내시겠습니까?\n"</string>
-    <string name="pause_prompt_yes" msgid="4642047011233552973">"예"</string>
-    <string name="pause_prompt_no" msgid="4691320111774935838">"아니요"</string>
-    <string name="notification_dialing" msgid="9072177265772083826">"전화 거는 중"</string>
-    <string name="notification_ongoing_call" msgid="8712641937577776125">"현재 통화"</string>
-    <string name="notification_ongoing_video_call" msgid="6331318021321487769">"진행 중인 화상 통화"</string>
-    <string name="notification_ongoing_paused_video_call" msgid="709950253594606371">"진행 중인 화상 통화 ‑ 화상 통화 일시중지됨"</string>
-    <string name="notification_ongoing_work_call" msgid="3189581218078981547">"발신 업무 전화"</string>
-    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"진행 중인 <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
-    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"수신 <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
-    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"Wi-Fi 통화"</string>
-    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"Wi‑Fi 업무 통화"</string>
-    <string name="notification_on_hold" msgid="7141827443379205682">"대기 중"</string>
-    <string name="notification_incoming_call" msgid="7520580807513849283">"수신전화"</string>
-    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"사진이 있는 수신 전화"</string>
-    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"메시지가 있는 수신 전화"</string>
-    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"위치가 있는 수신 전화"</string>
-    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"사진과 메시지가 있는 수신 전화"</string>
-    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"사진과 위치가 있는 수신 전화"</string>
-    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"메시지와 위치가 있는 수신 전화"</string>
-    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"사진, 메시지, 위치가 있는 수신 전화"</string>
-    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"첨부파일이 있는 수신 전화"</string>
-    <string name="important_notification_incoming_call" msgid="2867013954509930989">"중요한 수신 전화"</string>
-    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"사진이 있는 중요한 수신 전화"</string>
-    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"메시지가 있는 중요한 수신 전화"</string>
-    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"위치가 있는 중요한 수신 전화"</string>
-    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"사진과 메시지가 있는 중요한 수신 전화"</string>
-    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"사진과 위치가 있는 중요한 수신 전화"</string>
-    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"메시지와 위치가 있는 중요한 수신 전화"</string>
-    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"사진, 메시지, 위치가 있는 중요한 수신 전화"</string>
-    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"첨부파일이 있는 중요한 수신 전화"</string>
-    <string name="notification_incoming_work_call" msgid="5291275092734261918">"수신 업무 전화"</string>
-    <string name="notification_incoming_spam_call" msgid="7591506944666791937">"의심스러운 스팸 발신자로부터 온 전화"</string>
-    <string name="notification_requesting_video_call" msgid="1807679328811515758">"수신 동영상 요청"</string>
-    <string name="notification_action_answer" msgid="8748275902211192568">"통화"</string>
-    <string name="notification_action_end_call" msgid="7467258454170007765">"전화 끊기"</string>
-    <string name="notification_action_answer_video" msgid="8488108892919917287">"동영상"</string>
-    <string name="notification_action_accept" msgid="1272761514200507143">"수락"</string>
-    <string name="notification_action_dismiss" msgid="3128241581632616226">"거부"</string>
-    <string name="notification_action_speaker_on" msgid="1882659234405596540">"스피커 켜기"</string>
-    <string name="notification_action_speaker_off" msgid="6340085043115533948">"스피커 끄기"</string>
-    <string name="notification_external_call" msgid="2504334597315343920">"다른 기기에서 진행 중인 통화"</string>
-    <string name="notification_external_video_call" msgid="7709394856028436683">"다른 기기에서 진행 중인 화상 통화"</string>
-    <string name="notification_take_call" msgid="5631659438864492229">"전화 받기"</string>
-    <string name="notification_take_video_call" msgid="4473387503712341390">"화상 통화 받기"</string>
-    <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"서비스가 지원되지 않습니다."</string>
-    <string name="goPrivate" msgid="5269514638004595378">"비공개로 실행"</string>
-    <string name="manageConferenceLabel" msgid="3589379023518128318">"다자간 통화 관리"</string>
-    <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"비상 전화번호"</string>
-    <string name="child_number" msgid="3398257437107259682">"수신 번호: <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
-    <string name="callFailed_simError" msgid="4587775795711340072">"SIM이 없거나 SIM에 오류가 있습니다."</string>
-    <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"통화 종료"</string>
-    <string name="conference_call_name" msgid="8189987124611337174">"다자간 통화"</string>
-    <string name="generic_conference_call_name" msgid="1546941472424243894">"통화 중"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"모바일 데이터를 사용하여 통화를 계속합니다…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Wi-Fi 네트워크로 전환할 수 없습니다."</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"화상 통화가 모바일 네트워크에서 계속됩니다. 표준 데이터 요금이 부과될 수 있습니다."</string>
-    <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"다시 표시하지 않음"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="wait_prompt_str">다음 톤을 보내시겠습니까?\n</string>
+  <string name="pause_prompt_yes">예</string>
+  <string name="pause_prompt_no">아니요</string>
+  <string name="notification_dialing">전화 거는 중</string>
+  <string name="notification_ongoing_call">현재 통화</string>
+  <string name="notification_ongoing_video_call">진행 중인 화상 통화</string>
+  <string name="notification_ongoing_paused_video_call">진행 중인 화상 통화 ‑ 화상 통화 일시중지됨</string>
+  <string name="notification_ongoing_work_call">발신 업무 전화</string>
+  <string name="notification_ongoing_call_wifi_template">진행 중인 %1$s</string>
+  <string name="notification_incoming_call_wifi_template">수신 %1$s</string>
+  <string name="notification_call_wifi_brand">Wi-Fi 통화</string>
+  <string name="notification_call_wifi_work_brand">Wi‑Fi 업무 통화</string>
+  <string name="notification_on_hold">대기 중</string>
+  <string name="notification_incoming_call">수신전화</string>
+  <string name="notification_incoming_video_call">수신 화상 통화</string>
+  <string name="notification_incoming_call_mutli_sim">%1$s을(를) 통해 통화 수신 중</string>
+  <string name="notification_incoming_call_with_photo">사진이 있는 수신 전화</string>
+  <string name="notification_incoming_call_with_message">메시지가 있는 수신 전화</string>
+  <string name="notification_incoming_call_with_location">위치가 있는 수신 전화</string>
+  <string name="notification_incoming_call_with_photo_message">사진과 메시지가 있는 수신 전화</string>
+  <string name="notification_incoming_call_with_photo_location">사진과 위치가 있는 수신 전화</string>
+  <string name="notification_incoming_call_with_message_location">메시지와 위치가 있는 수신 전화</string>
+  <string name="notification_incoming_call_with_photo_message_location">사진, 메시지, 위치가 있는 수신 전화</string>
+  <string name="notification_incoming_call_attachments">첨부파일이 있는 수신 전화</string>
+  <string name="important_notification_incoming_call">중요한 수신 전화</string>
+  <string name="important_notification_incoming_call_with_photo">사진이 있는 중요한 수신 전화</string>
+  <string name="important_notification_incoming_call_with_message">메시지가 있는 중요한 수신 전화</string>
+  <string name="important_notification_incoming_call_with_location">위치가 있는 중요한 수신 전화</string>
+  <string name="important_notification_incoming_call_with_photo_message">사진과 메시지가 있는 중요한 수신 전화</string>
+  <string name="important_notification_incoming_call_with_photo_location">사진과 위치가 있는 중요한 수신 전화</string>
+  <string name="important_notification_incoming_call_with_message_location">메시지와 위치가 있는 중요한 수신 전화</string>
+  <string name="important_notification_incoming_call_with_photo_message_location">사진, 메시지, 위치가 있는 중요한 수신 전화</string>
+  <string name="important_notification_incoming_call_attachments">첨부파일이 있는 중요한 수신 전화</string>
+  <string name="notification_incoming_work_call">수신 업무 전화</string>
+  <string name="notification_incoming_spam_call">의심스러운 스팸 발신자로부터 온 전화</string>
+  <string name="notification_requesting_video_call">수신 동영상 요청</string>
+  <string name="notification_action_answer">통화</string>
+  <string name="notification_action_end_call">전화 끊기</string>
+  <string name="notification_action_answer_video">동영상</string>
+  <string name="notification_action_accept">수락</string>
+  <string name="notification_action_dismiss">거부</string>
+  <string name="notification_action_speaker_on">스피커 켜기</string>
+  <string name="notification_action_speaker_off">스피커 끄기</string>
+  <string name="notification_external_call">다른 기기에서 진행 중인 통화</string>
+  <string name="notification_external_video_call">다른 기기에서 진행 중인 화상 통화</string>
+  <string name="notification_take_call">전화 받기</string>
+  <string name="notification_take_video_call">화상 통화 받기</string>
+  <string name="incall_error_supp_service_unknown">서비스가 지원되지 않습니다.</string>
+  <string name="goPrivate">비공개로 실행</string>
+  <string name="manageConferenceLabel">다자간 통화 관리</string>
+  <string name="child_number">수신 번호: %s</string>
+  <string name="callFailed_simError">SIM이 없거나 SIM에 오류가 있습니다.</string>
+  <string name="conference_caller_disconnect_content_description">통화 종료</string>
+  <string name="conference_call_name">다자간 통화</string>
+  <string name="generic_conference_call_name">통화 중</string>
+  <string name="video_call_wifi_to_lte_handover_toast">모바일 데이터를 사용하여 통화를 계속합니다…</string>
+  <string name="video_call_lte_to_wifi_failed_title">Wi-Fi 네트워크로 전환할 수 없습니다.</string>
+  <string name="video_call_lte_to_wifi_failed_message">화상 통화가 모바일 네트워크에서 계속됩니다. 표준 데이터 요금이 부과될 수 있습니다.</string>
+  <string name="video_call_lte_to_wifi_failed_do_not_show">다시 표시하지 않음</string>
+  <string name="bubble_return_to_call">통화로 돌아가기</string>
+  <string name="rtt_request_dialog_title">RTT 통화에 참여하시겠습니까?</string>
+  <string name="rtt_request_dialog_details">%1$s님이 음성 통화 중에 메시지를 사용하려고 합니다.</string>
+  <string name="rtt_request_dialog_more_information">RTT는 청각 장애, 난청, 언어 장애가 있거나 음성 이외의 의사소통 수단이 필요한 발신자에게 도움이 됩니다.</string>
+  <string name="rtt_button_decline_request">사용 안함</string>
+  <string name="rtt_button_accept_request">RTT에 참여</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-ky/strings.xml b/java/com/android/incallui/res/values-ky/strings.xml
index 73d579b..137bb03 100644
--- a/java/com/android/incallui/res/values-ky/strings.xml
+++ b/java/com/android/incallui/res/values-ky/strings.xml
@@ -1,79 +1,68 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"Телефон"</string>
-    <string name="wait_prompt_str" msgid="3509685348904329594">"Төмөнкү номер жөнөтүлсүнбү?\n"</string>
-    <string name="pause_prompt_yes" msgid="4642047011233552973">"Ооба"</string>
-    <string name="pause_prompt_no" msgid="4691320111774935838">"Жок"</string>
-    <string name="notification_dialing" msgid="9072177265772083826">"Терилүүдө"</string>
-    <string name="notification_ongoing_call" msgid="8712641937577776125">"Учурдагы чалуу"</string>
-    <string name="notification_ongoing_video_call" msgid="6331318021321487769">"Учурдагы видео чалуу"</string>
-    <string name="notification_ongoing_paused_video_call" msgid="709950253594606371">"Учурдагы видео чалуу ‑ видео тындырылды"</string>
-    <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Учурда болуп жаткан чалуу (жумуш боюнча)"</string>
-    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"Учурдагы <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
-    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"Кирүүчү <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
-    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"Wi-Fi чалуу"</string>
-    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"жумуш боюнча Wi-Fi чалуу"</string>
-    <string name="notification_on_hold" msgid="7141827443379205682">"Күтүлүүдө"</string>
-    <string name="notification_incoming_call" msgid="7520580807513849283">"Кирүүчү чалуу"</string>
-    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Сүрөтү бар кирүүчү чалуу"</string>
-    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"Билдирүүсү бар кирүүчү чалуу"</string>
-    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"Жайгашкан жери бар кирүүчү чалуу"</string>
-    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"Сүрөт менен билдирүүсү бар кирүүчү чалуу"</string>
-    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"Сүрөт жана жайгашкан жери бар кирүүчү чалуу"</string>
-    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"Билдирүү менен жайгашкан жери бар кирүүчү чалуу"</string>
-    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"Сүрөт, билдирүү жана жайгашкан жери бар чалуу"</string>
-    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"Тиркемеси бар кирүүчү чалуу"</string>
-    <string name="important_notification_incoming_call" msgid="2867013954509930989">"Маанилүү кирүүчү чалуу"</string>
-    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"Сүрөтү бар маанилүү кирүүчү чалуу"</string>
-    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"Билдирүүсү бар маанилүү кирүүчү чалуу"</string>
-    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"Жайгашкан жери бар маанилүү кирүүчү чалуу"</string>
-    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"Сүрөт жана билдирүүсү бар маанилүү кирүүчү чалуу"</string>
-    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"Сүрөт жана жайгашкан жери бар маанилүү чалуу"</string>
-    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"Билдирүү жана жайгашкан жери бар маанилүү чалуу"</string>
-    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Сүрөт, билдирүү жана жайгашкан жер бар маанилүү чалуу"</string>
-    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Тиркемелери бар маанилүү кирүүчү чалуу"</string>
-    <string name="notification_incoming_work_call" msgid="5291275092734261918">"Жумуш боюнча келип жаткан чалуу"</string>
-    <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Келип жаткан чалуу спам окшойт"</string>
-    <string name="notification_requesting_video_call" msgid="1807679328811515758">"Келип жаткан видео сурамы"</string>
-    <string name="notification_action_answer" msgid="8748275902211192568">"Жооп берүү"</string>
-    <string name="notification_action_end_call" msgid="7467258454170007765">"Телефонду коюу"</string>
-    <string name="notification_action_answer_video" msgid="8488108892919917287">"Видео"</string>
-    <string name="notification_action_accept" msgid="1272761514200507143">"Кабыл алуу"</string>
-    <string name="notification_action_dismiss" msgid="3128241581632616226">"Четке кагуу"</string>
-    <string name="notification_action_speaker_on" msgid="1882659234405596540">"Катуу сүйлөткүчтү күйгүзүү"</string>
-    <string name="notification_action_speaker_off" msgid="6340085043115533948">"Катуу сүйлөткүчтү өчүрүү"</string>
-    <string name="notification_external_call" msgid="2504334597315343920">"Башка түзмөктө сүйлөшүп жатасыз"</string>
-    <string name="notification_external_video_call" msgid="7709394856028436683">"Башка түзмөктөгү видео чалууда да катышып жатасыз"</string>
-    <string name="notification_take_call" msgid="5631659438864492229">"Чалууну кабыл алуу"</string>
-    <string name="notification_take_video_call" msgid="4473387503712341390">"Видео чалууну кабыл алуу"</string>
-    <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"Кызмат колдоого алынбайт."</string>
-    <string name="goPrivate" msgid="5269514638004595378">"купуя режимине өтүү"</string>
-    <string name="manageConferenceLabel" msgid="3589379023518128318">"Конференц-чалууну башкаруу"</string>
-    <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"Куткаруучулардын номуру"</string>
-    <string name="child_number" msgid="3398257437107259682">"<xliff:g id="CHILD_NUMBER">%s</xliff:g> аркылуу"</string>
-    <string name="callFailed_simError" msgid="4587775795711340072">"SIM-карта жок же анда ката кетти"</string>
-    <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Чалууну бүтүрүү"</string>
-    <string name="conference_call_name" msgid="8189987124611337174">"Конференц-чалуу"</string>
-    <string name="generic_conference_call_name" msgid="1546941472424243894">"Чалууда"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Мобилдик дайындарды пайдалануу менен чалууну улантууда…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Wi-Fi тармагына туташа албай койдук"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Видео чалуу мобилдик тармак аркылуу аткарылат. Стандарттык тариф боюнча акы алынышы мүмкүн."</string>
-    <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Экинчи көрсөтүлбөсүн"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="wait_prompt_str">Төмөнкү номер жөнөтүлсүнбү?\n</string>
+  <string name="pause_prompt_yes">Ооба</string>
+  <string name="pause_prompt_no">Жок</string>
+  <string name="notification_dialing">Терилүүдө</string>
+  <string name="notification_ongoing_call">Учурдагы чалуу</string>
+  <string name="notification_ongoing_video_call">Учурдагы видео чалуу</string>
+  <string name="notification_ongoing_paused_video_call">Учурдагы видео чалуу ‑ видео тындырылды</string>
+  <string name="notification_ongoing_work_call">Учурда болуп жаткан чалуу (жумуш боюнча)</string>
+  <string name="notification_ongoing_call_wifi_template">Учурдагы %1$s</string>
+  <string name="notification_incoming_call_wifi_template">Кирүүчү %1$s</string>
+  <string name="notification_call_wifi_brand">Wi-Fi чалуу</string>
+  <string name="notification_call_wifi_work_brand">жумуш боюнча Wi-Fi чалуу</string>
+  <string name="notification_on_hold">Күтүлүүдө</string>
+  <string name="notification_incoming_call">Кирүүчү чалуу</string>
+  <string name="notification_incoming_video_call">Келип жаткан видео чалуу</string>
+  <string name="notification_incoming_call_mutli_sim">%1$s картасы аркылуу кириш чалуу</string>
+  <string name="notification_incoming_call_with_photo">Сүрөтү бар кирүүчү чалуу</string>
+  <string name="notification_incoming_call_with_message">Билдирүүсү бар кирүүчү чалуу</string>
+  <string name="notification_incoming_call_with_location">Жайгашкан жери бар кирүүчү чалуу</string>
+  <string name="notification_incoming_call_with_photo_message">Сүрөт менен билдирүүсү бар кирүүчү чалуу</string>
+  <string name="notification_incoming_call_with_photo_location">Сүрөт жана жайгашкан жери бар кирүүчү чалуу</string>
+  <string name="notification_incoming_call_with_message_location">Билдирүү менен жайгашкан жери бар кирүүчү чалуу</string>
+  <string name="notification_incoming_call_with_photo_message_location">Сүрөт, билдирүү жана жайгашкан жери бар чалуу</string>
+  <string name="notification_incoming_call_attachments">Тиркемеси бар кирүүчү чалуу</string>
+  <string name="important_notification_incoming_call">Маанилүү кирүүчү чалуу</string>
+  <string name="important_notification_incoming_call_with_photo">Сүрөтү бар маанилүү кирүүчү чалуу</string>
+  <string name="important_notification_incoming_call_with_message">Билдирүүсү бар маанилүү кирүүчү чалуу</string>
+  <string name="important_notification_incoming_call_with_location">Жайгашкан жери бар маанилүү кирүүчү чалуу</string>
+  <string name="important_notification_incoming_call_with_photo_message">Сүрөт жана билдирүүсү бар маанилүү кирүүчү чалуу</string>
+  <string name="important_notification_incoming_call_with_photo_location">Сүрөт жана жайгашкан жери бар маанилүү чалуу</string>
+  <string name="important_notification_incoming_call_with_message_location">Билдирүү жана жайгашкан жери бар маанилүү чалуу</string>
+  <string name="important_notification_incoming_call_with_photo_message_location">Сүрөт, билдирүү жана жайгашкан жер бар маанилүү чалуу</string>
+  <string name="important_notification_incoming_call_attachments">Тиркемелери бар маанилүү кирүүчү чалуу</string>
+  <string name="notification_incoming_work_call">Жумуш боюнча келип жаткан чалуу</string>
+  <string name="notification_incoming_spam_call">Келип жаткан чалуу спам окшойт</string>
+  <string name="notification_requesting_video_call">Келип жаткан видео сурамы</string>
+  <string name="notification_action_answer">Жооп берүү</string>
+  <string name="notification_action_end_call">Телефонду коюу</string>
+  <string name="notification_action_answer_video">Видео</string>
+  <string name="notification_action_accept">Кабыл алуу</string>
+  <string name="notification_action_dismiss">Четке кагуу</string>
+  <string name="notification_action_speaker_on">Катуу сүйлөткүчтү күйгүзүү</string>
+  <string name="notification_action_speaker_off">Катуу сүйлөткүчтү өчүрүү</string>
+  <string name="notification_external_call">Башка түзмөктө сүйлөшүп жатасыз</string>
+  <string name="notification_external_video_call">Башка түзмөктөгү видео чалууда да катышып жатасыз</string>
+  <string name="notification_take_call">Чалууну кабыл алуу</string>
+  <string name="notification_take_video_call">Видео чалууну кабыл алуу</string>
+  <string name="incall_error_supp_service_unknown">Кызмат колдоого алынбайт.</string>
+  <string name="goPrivate">купуя режимине өтүү</string>
+  <string name="manageConferenceLabel">Конференц-чалууну башкаруу</string>
+  <string name="child_number">%s аркылуу</string>
+  <string name="callFailed_simError">SIM-карта жок же анда ката кетти</string>
+  <string name="conference_caller_disconnect_content_description">Чалууну бүтүрүү</string>
+  <string name="conference_call_name">Конференц-чалуу</string>
+  <string name="generic_conference_call_name">Чалууда</string>
+  <string name="video_call_wifi_to_lte_handover_toast">Мобилдик дайындарды пайдалануу менен чалууну улантууда…</string>
+  <string name="video_call_lte_to_wifi_failed_title">Wi-Fi тармагына туташа албай койдук</string>
+  <string name="video_call_lte_to_wifi_failed_message">Видео чалуу мобилдик тармак аркылуу аткарылат. Стандарттык тариф боюнча акы алынышы мүмкүн.</string>
+  <string name="video_call_lte_to_wifi_failed_do_not_show">Экинчи көрсөтүлбөсүн</string>
+  <string name="bubble_return_to_call">Чалууга кайтуу</string>
+  <string name="rtt_request_dialog_title">RTT чалууга кошуласызбы?</string>
+  <string name="rtt_request_dialog_details">%1$s үн чалууңуздун убагында SMS/MMS жазышууну пайдалангысы келип жатат.</string>
+  <string name="rtt_request_dialog_more_information">RTT функциясы угуу жана сүйлөө жөндөмдүүлүгү бузулган адамдарга арналат.</string>
+  <string name="rtt_button_decline_request">Жок, рахмат</string>
+  <string name="rtt_button_accept_request">RTT чалууга кошулуу</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-lo/strings.xml b/java/com/android/incallui/res/values-lo/strings.xml
index ade38d6..b96930e 100644
--- a/java/com/android/incallui/res/values-lo/strings.xml
+++ b/java/com/android/incallui/res/values-lo/strings.xml
@@ -1,79 +1,68 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"ໂທລະສັບ"</string>
-    <string name="wait_prompt_str" msgid="3509685348904329594">"ສົ່ງໂທນສຽງຕໍ່ໄປນີ້ບໍ່?\n"</string>
-    <string name="pause_prompt_yes" msgid="4642047011233552973">"ຕົກລົງ"</string>
-    <string name="pause_prompt_no" msgid="4691320111774935838">"ບໍ່"</string>
-    <string name="notification_dialing" msgid="9072177265772083826">"ກຳລັງໂທ"</string>
-    <string name="notification_ongoing_call" msgid="8712641937577776125">"ສາຍທີ່ກຳລັງໂທອອກ"</string>
-    <string name="notification_ongoing_video_call" msgid="6331318021321487769">"ວິດີໂອທີ່ກຳລັງໂທ"</string>
-    <string name="notification_ongoing_paused_video_call" msgid="709950253594606371">"ສາຍວິດີໂອໂທອອກ - ຢຸດວິດີໂອໄວ້ຊົ່ວຄາວແລ້ວ"</string>
-    <string name="notification_ongoing_work_call" msgid="3189581218078981547">"ສາຍໂທອອກຈາກບ່ອນເຮັດວຽກ"</string>
-    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"ກຳລັງໂທ <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
-    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"ສາຍໂທເຂົ້າ <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
-    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"ການໂທ Wi-Fi"</string>
-    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"ສາຍວຽກ Wi‑Fi"</string>
-    <string name="notification_on_hold" msgid="7141827443379205682">"ພັກສາຍຊົ່ວຄາວ"</string>
-    <string name="notification_incoming_call" msgid="7520580807513849283">"ສາຍໂທເຂົ້າ"</string>
-    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"ສາຍໂທເຂົ້າພ້ອມຮູບພາບ"</string>
-    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"ສາຍໂທເຂົ້າພ້ອມຂໍ້ຄວາມ"</string>
-    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"ສາຍໂທເຂົ້າພ້ອມສະຖານທີ່"</string>
-    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"ສາຍໂທເຂົ້າພ້ອມຮູບພາບ ແລະ ຂໍ້ຄວາມ"</string>
-    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"ສາຍໂທເຂົ້າພ້ອມຮູບພາບ ແລະ ສະຖານທີ່"</string>
-    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"ສາຍໂທເຂົ້າພ້ອມຂໍ້ຄວາມ ແລະ ສະຖານທີ່"</string>
-    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"ສາຍໂທເຂົ້າພ້ອມຮູບພາບ, ຂໍ້ຄວາມ ແລະ ສະຖານທີ່"</string>
-    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"ສາຍໂທເຂົ້າພ້ອມໄຟລ໌ແນບ"</string>
-    <string name="important_notification_incoming_call" msgid="2867013954509930989">"ສາຍໂທເຂົ້າສຳຄັນ"</string>
-    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"ສາຍໂທເຂົ້າສຳຄັນພ້ອມຮູບພາບ"</string>
-    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"ສາຍໂທເຂົ້າສຳຄັນພ້ອມຂໍ້ຄວາມ"</string>
-    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"ສາຍໂທເຂົ້າສຳຄັນພ້ອມສະຖານທີ່"</string>
-    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"ສາຍໂທເຂົ້າສຳຄັນພ້ອມຮູບພາບ ແລະ ຂໍ້ຄວາມ"</string>
-    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"ສາຍໂທເຂົ້າສຳຄັນພ້ອມຮູບພາບ ແລະ ສະຖານທີ່"</string>
-    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"ສາຍໂທເຂົ້າສຳຄັນພ້ອມຂໍ້ຄວາມ ແລະ ສະຖານທີ່"</string>
-    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"ສາຍໂທເຂົ້າສຳຄັນພ້ອມຮູບພາບ, ຂໍ້ຄວາມ ແລະ ສະຖານທີ່"</string>
-    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"ສາຍໂທເຂົ້າສຳຄັນພ້ອມໄຟລ໌ແນບ"</string>
-    <string name="notification_incoming_work_call" msgid="5291275092734261918">"ສາຍໂທເຂົ້າຈາກບ່ອນເຮັດວຽກ"</string>
-    <string name="notification_incoming_spam_call" msgid="7591506944666791937">"ມີການໂທທີ່ຄາດວ່າເປັນສະແປມໂທເຂົ້າມາ"</string>
-    <string name="notification_requesting_video_call" msgid="1807679328811515758">"​ຄຳ​ຮ້ອງ​ຂໍ​ວິ​ດີ​ໂອ​ເຂົ້າ​ມາ"</string>
-    <string name="notification_action_answer" msgid="8748275902211192568">"ຄໍາ​ຕອບ"</string>
-    <string name="notification_action_end_call" msgid="7467258454170007765">"ວາງສາຍ"</string>
-    <string name="notification_action_answer_video" msgid="8488108892919917287">"ວິດີໂອ"</string>
-    <string name="notification_action_accept" msgid="1272761514200507143">"ຍອມຮັບ"</string>
-    <string name="notification_action_dismiss" msgid="3128241581632616226">"ປະຕິເສດ"</string>
-    <string name="notification_action_speaker_on" msgid="1882659234405596540">"ເປີດ​ລຳໂພງ"</string>
-    <string name="notification_action_speaker_off" msgid="6340085043115533948">"ປິດ​ລຳໂພງ"</string>
-    <string name="notification_external_call" msgid="2504334597315343920">"ສາຍທີ່ກຳລັງໂທອອກໃນອຸປະກອນອື່ນ"</string>
-    <string name="notification_external_video_call" msgid="7709394856028436683">"ສາຍວິດີໂອທີ່ກຳລັງໂທອອກໃນເຄື່ອງອື່ນ"</string>
-    <string name="notification_take_call" msgid="5631659438864492229">"ຮັບສາຍ"</string>
-    <string name="notification_take_video_call" msgid="4473387503712341390">"ຮັບສາຍວິດີໂອ"</string>
-    <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"ການ​ບໍ​ລິ​ການ​ບໍ່​ຮອງ​ຮັບ."</string>
-    <string name="goPrivate" msgid="5269514638004595378">"ໃຊ້ແບບສ່ວນໂຕ"</string>
-    <string name="manageConferenceLabel" msgid="3589379023518128318">"ຈັດ​ການ​ການ​ປະ​ຊຸມ​ທາງໂທລະສັບ"</string>
-    <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"ເບີໂທສຸກເສີນ"</string>
-    <string name="child_number" msgid="3398257437107259682">"ຜ່ານ <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
-    <string name="callFailed_simError" msgid="4587775795711340072">"ບໍ່ມີ​ SIM ຫຼື SIM ຜິດພາດ"</string>
-    <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"ວາງສາຍ"</string>
-    <string name="conference_call_name" msgid="8189987124611337174">"ການປະຊຸມທາງໂທລະສັບ"</string>
-    <string name="generic_conference_call_name" msgid="1546941472424243894">"ຢູ່ໃນສາຍ"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"ກຳລັງສືບຕໍ່ສາຍໂດຍໃຊ້ອິນເຕີເນັດມືຖື…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"ບໍ່ສາມາດສະຫຼັບໄປໃຊ້ເຄືອຂ່າຍ Wi-Fi ໄດ້"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"ການໂທວິດີໂອຈະຍັງຄົງຢູ່ໃນເຄືອຂ່າຍມືຖືຕໍ່ໄປ. ອາດມີການຮຽກເກັບຄ່າບໍລິການມາດຕະຖານ."</string>
-    <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"ບໍ່ຕ້ອງສະແດງຂໍ້ຄວາມນີ້ອີກ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="wait_prompt_str">ສົ່ງໂທນສຽງຕໍ່ໄປນີ້ບໍ່?\n</string>
+  <string name="pause_prompt_yes">ຕົກລົງ</string>
+  <string name="pause_prompt_no">ບໍ່</string>
+  <string name="notification_dialing">ກຳລັງໂທ</string>
+  <string name="notification_ongoing_call">ສາຍທີ່ກຳລັງໂທອອກ</string>
+  <string name="notification_ongoing_video_call">ວິດີໂອທີ່ກຳລັງໂທ</string>
+  <string name="notification_ongoing_paused_video_call">ສາຍວິດີໂອໂທອອກ - ຢຸດວິດີໂອໄວ້ຊົ່ວຄາວແລ້ວ</string>
+  <string name="notification_ongoing_work_call">ສາຍໂທອອກຈາກບ່ອນເຮັດວຽກ</string>
+  <string name="notification_ongoing_call_wifi_template">ກຳລັງໂທ %1$s</string>
+  <string name="notification_incoming_call_wifi_template">ສາຍໂທເຂົ້າ %1$s</string>
+  <string name="notification_call_wifi_brand">ການໂທ Wi-Fi</string>
+  <string name="notification_call_wifi_work_brand">ສາຍວຽກ Wi‑Fi</string>
+  <string name="notification_on_hold">ພັກສາຍຊົ່ວຄາວ</string>
+  <string name="notification_incoming_call">ສາຍໂທເຂົ້າ</string>
+  <string name="notification_incoming_video_call">ສາຍ​ວິດີໂອ​ເຂົ້າ</string>
+  <string name="notification_incoming_call_mutli_sim">ສາຍໂທເຂົ້າຜ່ານ %1$s</string>
+  <string name="notification_incoming_call_with_photo">ສາຍໂທເຂົ້າພ້ອມຮູບພາບ</string>
+  <string name="notification_incoming_call_with_message">ສາຍໂທເຂົ້າພ້ອມຂໍ້ຄວາມ</string>
+  <string name="notification_incoming_call_with_location">ສາຍໂທເຂົ້າພ້ອມສະຖານທີ່</string>
+  <string name="notification_incoming_call_with_photo_message">ສາຍໂທເຂົ້າພ້ອມຮູບພາບ ແລະ ຂໍ້ຄວາມ</string>
+  <string name="notification_incoming_call_with_photo_location">ສາຍໂທເຂົ້າພ້ອມຮູບພາບ ແລະ ສະຖານທີ່</string>
+  <string name="notification_incoming_call_with_message_location">ສາຍໂທເຂົ້າພ້ອມຂໍ້ຄວາມ ແລະ ສະຖານທີ່</string>
+  <string name="notification_incoming_call_with_photo_message_location">ສາຍໂທເຂົ້າພ້ອມຮູບພາບ, ຂໍ້ຄວາມ ແລະ ສະຖານທີ່</string>
+  <string name="notification_incoming_call_attachments">ສາຍໂທເຂົ້າພ້ອມໄຟລ໌ແນບ</string>
+  <string name="important_notification_incoming_call">ສາຍໂທເຂົ້າສຳຄັນ</string>
+  <string name="important_notification_incoming_call_with_photo">ສາຍໂທເຂົ້າສຳຄັນພ້ອມຮູບພາບ</string>
+  <string name="important_notification_incoming_call_with_message">ສາຍໂທເຂົ້າສຳຄັນພ້ອມຂໍ້ຄວາມ</string>
+  <string name="important_notification_incoming_call_with_location">ສາຍໂທເຂົ້າສຳຄັນພ້ອມສະຖານທີ່</string>
+  <string name="important_notification_incoming_call_with_photo_message">ສາຍໂທເຂົ້າສຳຄັນພ້ອມຮູບພາບ ແລະ ຂໍ້ຄວາມ</string>
+  <string name="important_notification_incoming_call_with_photo_location">ສາຍໂທເຂົ້າສຳຄັນພ້ອມຮູບພາບ ແລະ ສະຖານທີ່</string>
+  <string name="important_notification_incoming_call_with_message_location">ສາຍໂທເຂົ້າສຳຄັນພ້ອມຂໍ້ຄວາມ ແລະ ສະຖານທີ່</string>
+  <string name="important_notification_incoming_call_with_photo_message_location">ສາຍໂທເຂົ້າສຳຄັນພ້ອມຮູບພາບ, ຂໍ້ຄວາມ ແລະ ສະຖານທີ່</string>
+  <string name="important_notification_incoming_call_attachments">ສາຍໂທເຂົ້າສຳຄັນພ້ອມໄຟລ໌ແນບ</string>
+  <string name="notification_incoming_work_call">ສາຍໂທເຂົ້າຈາກບ່ອນເຮັດວຽກ</string>
+  <string name="notification_incoming_spam_call">ມີການໂທທີ່ຄາດວ່າເປັນສະແປມໂທເຂົ້າມາ</string>
+  <string name="notification_requesting_video_call">​ຄຳ​ຮ້ອງ​ຂໍ​ວິ​ດີ​ໂອ​ເຂົ້າ​ມາ</string>
+  <string name="notification_action_answer">ຄໍາ​ຕອບ</string>
+  <string name="notification_action_end_call">ວາງສາຍ</string>
+  <string name="notification_action_answer_video">ວິດີໂອ</string>
+  <string name="notification_action_accept">ຍອມຮັບ</string>
+  <string name="notification_action_dismiss">ປະຕິເສດ</string>
+  <string name="notification_action_speaker_on">ເປີດ​ລຳໂພງ</string>
+  <string name="notification_action_speaker_off">ປິດ​ລຳໂພງ</string>
+  <string name="notification_external_call">ສາຍທີ່ກຳລັງໂທອອກໃນອຸປະກອນອື່ນ</string>
+  <string name="notification_external_video_call">ສາຍວິດີໂອທີ່ກຳລັງໂທອອກໃນເຄື່ອງອື່ນ</string>
+  <string name="notification_take_call">ຮັບສາຍ</string>
+  <string name="notification_take_video_call">ຮັບສາຍວິດີໂອ</string>
+  <string name="incall_error_supp_service_unknown">ການ​ບໍ​ລິ​ການ​ບໍ່​ຮອງ​ຮັບ.</string>
+  <string name="goPrivate">ໃຊ້ແບບສ່ວນໂຕ</string>
+  <string name="manageConferenceLabel">ຈັດ​ການ​ການ​ປະ​ຊຸມ​ທາງໂທລະສັບ</string>
+  <string name="child_number">ຜ່ານ %s</string>
+  <string name="callFailed_simError">ບໍ່ມີ​ SIM ຫຼື SIM ຜິດພາດ</string>
+  <string name="conference_caller_disconnect_content_description">ວາງສາຍ</string>
+  <string name="conference_call_name">ການປະຊຸມທາງໂທລະສັບ</string>
+  <string name="generic_conference_call_name">ຢູ່ໃນສາຍ</string>
+  <string name="video_call_wifi_to_lte_handover_toast">ກຳລັງສືບຕໍ່ສາຍໂດຍໃຊ້ອິນເຕີເນັດມືຖື…</string>
+  <string name="video_call_lte_to_wifi_failed_title">ບໍ່ສາມາດສະຫຼັບໄປໃຊ້ເຄືອຂ່າຍ Wi-Fi ໄດ້</string>
+  <string name="video_call_lte_to_wifi_failed_message">ການໂທວິດີໂອຈະຍັງຄົງຢູ່ໃນເຄືອຂ່າຍມືຖືຕໍ່ໄປ. ອາດມີການຮຽກເກັບຄ່າບໍລິການມາດຕະຖານ.</string>
+  <string name="video_call_lte_to_wifi_failed_do_not_show">ບໍ່ຕ້ອງສະແດງຂໍ້ຄວາມນີ້ອີກ</string>
+  <string name="bubble_return_to_call">ກັບໄປຫາການໂທ</string>
+  <string name="rtt_request_dialog_title">ເຂົ້າຮ່ວມການໂທ RTT ບໍ?</string>
+  <string name="rtt_request_dialog_details">%1$s ຕ້ອງການສົ່ງຂໍ້ຄວາມພາຍໃນການໂທສຽງຂອງທ່ານ.</string>
+  <string name="rtt_request_dialog_more_information">RTT ຈະຊ່ວຍເຫຼືອຜູ້ໂທທີ່ຫູໜວກ, ມີບັນຫາໃນການໄດ້ຍິນ, ບໍ່ສາມາດເວົ້າໄດ້ ຫຼື ຕ້ອງການໃຊ້ຫຼາຍກວ່າສຽງ.</string>
+  <string name="rtt_button_decline_request">ບໍ່, ຂອບໃຈ</string>
+  <string name="rtt_button_accept_request">ເຂົ້າຮ່ວມ RTT</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-lt/strings.xml b/java/com/android/incallui/res/values-lt/strings.xml
index b7aebc1..0ea55a3 100644
--- a/java/com/android/incallui/res/values-lt/strings.xml
+++ b/java/com/android/incallui/res/values-lt/strings.xml
@@ -1,79 +1,68 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"Telefonas"</string>
-    <string name="wait_prompt_str" msgid="3509685348904329594">"Siųsti šiuo tonus?\n"</string>
-    <string name="pause_prompt_yes" msgid="4642047011233552973">"Taip"</string>
-    <string name="pause_prompt_no" msgid="4691320111774935838">"Ne"</string>
-    <string name="notification_dialing" msgid="9072177265772083826">"Renkamas numeris"</string>
-    <string name="notification_ongoing_call" msgid="8712641937577776125">"Vykstantis pokalbis"</string>
-    <string name="notification_ongoing_video_call" msgid="6331318021321487769">"Vyksta vaizdo skambutis"</string>
-    <string name="notification_ongoing_paused_video_call" msgid="709950253594606371">"Vyksta vaizdo skambutis – vaizdo srautas pristabdytas"</string>
-    <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Vykstantis darbo skambutis"</string>
-    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"Vykstantis <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
-    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"Gaunamasis <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
-    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"„Wi-Fi“ skambutis"</string>
-    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"„Wi‑Fi“ darbo skambutis"</string>
-    <string name="notification_on_hold" msgid="7141827443379205682">"Sulaikyta"</string>
-    <string name="notification_incoming_call" msgid="7520580807513849283">"Gaunamasis skambutis"</string>
-    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Gaunamasis skambutis su nuotrauka"</string>
-    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"Gaunamasis skambutis su pranešimu"</string>
-    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"Gaunamasis skambutis su vietove"</string>
-    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"Gaunamasis skambutis su nuotrauka ir pranešimu"</string>
-    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"Gaunamasis skambutis su nuotrauka ir vietove"</string>
-    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"Gaunamasis skambutis su pranešimu ir vietove"</string>
-    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"Gaunamasis skamb. su nuotrauka, praneš. ir vietove"</string>
-    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"Gaunamasis skambutis su priedais"</string>
-    <string name="important_notification_incoming_call" msgid="2867013954509930989">"Svarbus gaunamasis skambutis"</string>
-    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"Svarbus gaunamasis skambutis su nuotrauka"</string>
-    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"Svarbus gaunamasis skambutis su pranešimu"</string>
-    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"Svarbus gaunamasis skambutis su vietove"</string>
-    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"Svarbus gaunamasis skamb. su nuotrauka ir praneš."</string>
-    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"Svarbus gaunamasis skamb. su nuotrauka ir vietove"</string>
-    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"Svarbus gaunamasis skamb. su pranešimu ir vietove"</string>
-    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Svarbus gaunam. skamb. su nuotr., praneš. ir viet."</string>
-    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Svarbus gaunamasis skambutis su priedais"</string>
-    <string name="notification_incoming_work_call" msgid="5291275092734261918">"Gaunamasis darbo skambutis"</string>
-    <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Gaunamasis įtartinas šlamšto skambutis"</string>
-    <string name="notification_requesting_video_call" msgid="1807679328811515758">"Gaunama vaizdo skambučio užklausa"</string>
-    <string name="notification_action_answer" msgid="8748275902211192568">"Atsakyti"</string>
-    <string name="notification_action_end_call" msgid="7467258454170007765">"Padėti ragelį"</string>
-    <string name="notification_action_answer_video" msgid="8488108892919917287">"Vaizdo skam."</string>
-    <string name="notification_action_accept" msgid="1272761514200507143">"Atsiliepti"</string>
-    <string name="notification_action_dismiss" msgid="3128241581632616226">"Atmesti"</string>
-    <string name="notification_action_speaker_on" msgid="1882659234405596540">"Įjungti garsiakalbį"</string>
-    <string name="notification_action_speaker_off" msgid="6340085043115533948">"Išjungti garsiakalbį"</string>
-    <string name="notification_external_call" msgid="2504334597315343920">"Kitame įrenginyje vykstantis skambutis"</string>
-    <string name="notification_external_video_call" msgid="7709394856028436683">"Kitame įrenginyje vykstantis vaizdo skambutis"</string>
-    <string name="notification_take_call" msgid="5631659438864492229">"Atlikti skambutį"</string>
-    <string name="notification_take_video_call" msgid="4473387503712341390">"Atlikti vaizdo skambutį"</string>
-    <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"Paslauga nepalaikoma."</string>
-    <string name="goPrivate" msgid="5269514638004595378">"naudoti privatų režimą"</string>
-    <string name="manageConferenceLabel" msgid="3589379023518128318">"Tvarkyti konferencinį skambutį"</string>
-    <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"Pagalbos numeris"</string>
-    <string name="child_number" msgid="3398257437107259682">"naudojant <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
-    <string name="callFailed_simError" msgid="4587775795711340072">"Nėra SIM kortelės arba įvyko SIM kortelės klaida"</string>
-    <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Baigti skambutį"</string>
-    <string name="conference_call_name" msgid="8189987124611337174">"Konferencinis skambutis"</string>
-    <string name="generic_conference_call_name" msgid="1546941472424243894">"Skambinant"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Skambutis tęsiamas naudojant mobiliojo ryšio duomenis…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Nepavyko prisijungti prie „Wi-Fi“ tinklo"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Vaizdo skambutis ir toliau bus vykdomas naudojant mobiliojo ryšio tinklą. Gali būti taikomi įprasti duomenų mokesčiai."</string>
-    <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Daugiau to nerodyti"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="wait_prompt_str">Siųsti šiuo tonus?\n</string>
+  <string name="pause_prompt_yes">Taip</string>
+  <string name="pause_prompt_no">Ne</string>
+  <string name="notification_dialing">Renkamas numeris</string>
+  <string name="notification_ongoing_call">Vykstantis pokalbis</string>
+  <string name="notification_ongoing_video_call">Vyksta vaizdo skambutis</string>
+  <string name="notification_ongoing_paused_video_call">Vyksta vaizdo skambutis – vaizdo srautas pristabdytas</string>
+  <string name="notification_ongoing_work_call">Vykstantis darbo skambutis</string>
+  <string name="notification_ongoing_call_wifi_template">Vykstantis %1$s</string>
+  <string name="notification_incoming_call_wifi_template">Gaunamasis %1$s</string>
+  <string name="notification_call_wifi_brand">„Wi-Fi“ skambutis</string>
+  <string name="notification_call_wifi_work_brand">„Wi‑Fi“ darbo skambutis</string>
+  <string name="notification_on_hold">Sulaikyta</string>
+  <string name="notification_incoming_call">Gaunamasis skambutis</string>
+  <string name="notification_incoming_video_call">Gaunamas vaizdo skambutis</string>
+  <string name="notification_incoming_call_mutli_sim">Gaunamasis skambutis per „%1$s“</string>
+  <string name="notification_incoming_call_with_photo">Gaunamasis skambutis su nuotrauka</string>
+  <string name="notification_incoming_call_with_message">Gaunamasis skambutis su pranešimu</string>
+  <string name="notification_incoming_call_with_location">Gaunamasis skambutis su vietove</string>
+  <string name="notification_incoming_call_with_photo_message">Gaunamasis skambutis su nuotrauka ir pranešimu</string>
+  <string name="notification_incoming_call_with_photo_location">Gaunamasis skambutis su nuotrauka ir vietove</string>
+  <string name="notification_incoming_call_with_message_location">Gaunamasis skambutis su pranešimu ir vietove</string>
+  <string name="notification_incoming_call_with_photo_message_location">Gaunamasis skamb. su nuotrauka, praneš. ir vietove</string>
+  <string name="notification_incoming_call_attachments">Gaunamasis skambutis su priedais</string>
+  <string name="important_notification_incoming_call">Svarbus gaunamasis skambutis</string>
+  <string name="important_notification_incoming_call_with_photo">Svarbus gaunamasis skambutis su nuotrauka</string>
+  <string name="important_notification_incoming_call_with_message">Svarbus gaunamasis skambutis su pranešimu</string>
+  <string name="important_notification_incoming_call_with_location">Svarbus gaunamasis skambutis su vietove</string>
+  <string name="important_notification_incoming_call_with_photo_message">Svarbus gaunamasis skamb. su nuotrauka ir praneš.</string>
+  <string name="important_notification_incoming_call_with_photo_location">Svarbus gaunamasis skamb. su nuotrauka ir vietove</string>
+  <string name="important_notification_incoming_call_with_message_location">Svarbus gaunamasis skamb. su pranešimu ir vietove</string>
+  <string name="important_notification_incoming_call_with_photo_message_location">Svarbus gaunam. skamb. su nuotr., praneš. ir viet.</string>
+  <string name="important_notification_incoming_call_attachments">Svarbus gaunamasis skambutis su priedais</string>
+  <string name="notification_incoming_work_call">Gaunamasis darbo skambutis</string>
+  <string name="notification_incoming_spam_call">Gaunamasis įtartinas šlamšto skambutis</string>
+  <string name="notification_requesting_video_call">Gaunama vaizdo skambučio užklausa</string>
+  <string name="notification_action_answer">Atsakyti</string>
+  <string name="notification_action_end_call">Padėti ragelį</string>
+  <string name="notification_action_answer_video">Vaizdo skam.</string>
+  <string name="notification_action_accept">Atsiliepti</string>
+  <string name="notification_action_dismiss">Atmesti</string>
+  <string name="notification_action_speaker_on">Įjungti garsiakalbį</string>
+  <string name="notification_action_speaker_off">Išjungti garsiakalbį</string>
+  <string name="notification_external_call">Kitame įrenginyje vykstantis skambutis</string>
+  <string name="notification_external_video_call">Kitame įrenginyje vykstantis vaizdo skambutis</string>
+  <string name="notification_take_call">Atlikti skambutį</string>
+  <string name="notification_take_video_call">Atlikti vaizdo skambutį</string>
+  <string name="incall_error_supp_service_unknown">Paslauga nepalaikoma.</string>
+  <string name="goPrivate">naudoti privatų režimą</string>
+  <string name="manageConferenceLabel">Tvarkyti konferencinį skambutį</string>
+  <string name="child_number">naudojant %s</string>
+  <string name="callFailed_simError">Nėra SIM kortelės arba įvyko SIM kortelės klaida</string>
+  <string name="conference_caller_disconnect_content_description">Baigti skambutį</string>
+  <string name="conference_call_name">Konferencinis skambutis</string>
+  <string name="generic_conference_call_name">Skambinant</string>
+  <string name="video_call_wifi_to_lte_handover_toast">Skambutis tęsiamas naudojant mobiliojo ryšio duomenis…</string>
+  <string name="video_call_lte_to_wifi_failed_title">Nepavyko prisijungti prie „Wi-Fi“ tinklo</string>
+  <string name="video_call_lte_to_wifi_failed_message">Vaizdo skambutis ir toliau bus vykdomas naudojant mobiliojo ryšio tinklą. Gali būti taikomi įprasti duomenų mokesčiai.</string>
+  <string name="video_call_lte_to_wifi_failed_do_not_show">Daugiau to nerodyti</string>
+  <string name="bubble_return_to_call">Atgal į skambutį</string>
+  <string name="rtt_request_dialog_title">Prisijungti prie RTT skambučio?</string>
+  <string name="rtt_request_dialog_details">%1$s nori susirašinėti dalyvaudamas (-a) balso skambutyje.</string>
+  <string name="rtt_request_dialog_more_information">RTT padeda skambintojams, kurie yra kurti, neprigirdintys, sunkiai kalba arba kuriems reikia ne tik kalbėti.</string>
+  <string name="rtt_button_decline_request">Ne, ačiū</string>
+  <string name="rtt_button_accept_request">Prisijungti prie RTT</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-lv/strings.xml b/java/com/android/incallui/res/values-lv/strings.xml
index 73e9fd2..d426243 100644
--- a/java/com/android/incallui/res/values-lv/strings.xml
+++ b/java/com/android/incallui/res/values-lv/strings.xml
@@ -1,79 +1,68 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"Tālrunis"</string>
-    <string name="wait_prompt_str" msgid="3509685348904329594">"Vai sūtīt tālāk norādītos signālus?\n"</string>
-    <string name="pause_prompt_yes" msgid="4642047011233552973">"Jā"</string>
-    <string name="pause_prompt_no" msgid="4691320111774935838">"Nē"</string>
-    <string name="notification_dialing" msgid="9072177265772083826">"Notiek numura sastādīšana"</string>
-    <string name="notification_ongoing_call" msgid="8712641937577776125">"Pašreizējā saruna"</string>
-    <string name="notification_ongoing_video_call" msgid="6331318021321487769">"Notiekošs videozvans"</string>
-    <string name="notification_ongoing_paused_video_call" msgid="709950253594606371">"Notiekošs videozvans — video apturēts"</string>
-    <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Notiekošs darba zvans"</string>
-    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"Notiekošs <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
-    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"Ienākošs <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
-    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"Wi-Fi zvans"</string>
-    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"Wi‑Fi darba zvans"</string>
-    <string name="notification_on_hold" msgid="7141827443379205682">"Aizturēts"</string>
-    <string name="notification_incoming_call" msgid="7520580807513849283">"Ienākošais zvans"</string>
-    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Ienākošais zvans ar fotoattēlu"</string>
-    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"Ienākošais zvans ar ziņojumu"</string>
-    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"Ienākošais zvans ar atrašanās vietu"</string>
-    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"Ienākošais zvans ar fotoattēlu un ziņojumu"</string>
-    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"Ienākošais zvans ar fotoattēlu un atrašanās vietu"</string>
-    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"Ienākošais zvans ar ziņojumu un atrašanās vietu"</string>
-    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"Zvans ar fotoattēlu, ziņojumu un atrašanās vietu"</string>
-    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"Ienākošais zvans ar pielikumiem"</string>
-    <string name="important_notification_incoming_call" msgid="2867013954509930989">"Svarīgs ienākošais zvans"</string>
-    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"Svarīgs ienākošais zvans ar fotoattēlu"</string>
-    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"Svarīgs ienākošais zvans ar ziņojumu"</string>
-    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"Svarīgs ienākošais zvans ar atrašanās vietu"</string>
-    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"Svarīgs ienākošais zvans ar fotoattēlu un ziņojumu"</string>
-    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"Svarīgs zvans ar fotoattēlu un atrašanās vietu"</string>
-    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"Svarīgs zvans ar ziņojumu un atrašanās vietu"</string>
-    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Zvans ar fotoattēlu, ziņojumu un atrašanās vietu"</string>
-    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Svarīgs ienākošais zvans ar pielikumiem"</string>
-    <string name="notification_incoming_work_call" msgid="5291275092734261918">"Ienākošs darba zvans"</string>
-    <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Ienākošs, iespējams, nevēlams zvans"</string>
-    <string name="notification_requesting_video_call" msgid="1807679328811515758">"Ienākošs video pieprasījums"</string>
-    <string name="notification_action_answer" msgid="8748275902211192568">"Atbildēt"</string>
-    <string name="notification_action_end_call" msgid="7467258454170007765">"Pārtraukt"</string>
-    <string name="notification_action_answer_video" msgid="8488108892919917287">"Video"</string>
-    <string name="notification_action_accept" msgid="1272761514200507143">"Pieņemt"</string>
-    <string name="notification_action_dismiss" msgid="3128241581632616226">"Noraidīt"</string>
-    <string name="notification_action_speaker_on" msgid="1882659234405596540">"Ieslēgt skaļruni"</string>
-    <string name="notification_action_speaker_off" msgid="6340085043115533948">"Izslēgt skaļruni"</string>
-    <string name="notification_external_call" msgid="2504334597315343920">"Notiekošs zvans citā ierīcē"</string>
-    <string name="notification_external_video_call" msgid="7709394856028436683">"Notiekošs videozvans citā ierīcē"</string>
-    <string name="notification_take_call" msgid="5631659438864492229">"Pārsūtīt zvanu"</string>
-    <string name="notification_take_video_call" msgid="4473387503712341390">"Pārsūtīt videozvanu"</string>
-    <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"Pakalpojums netiek atbalstīts."</string>
-    <string name="goPrivate" msgid="5269514638004595378">"pārslēgt uz privāto režīmu"</string>
-    <string name="manageConferenceLabel" msgid="3589379023518128318">"Pārvaldīt konferences zvanu"</string>
-    <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"Ārkārtas numurs"</string>
-    <string name="child_number" msgid="3398257437107259682">"no numura <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
-    <string name="callFailed_simError" msgid="4587775795711340072">"Nav SIM, vai SIM kļūda"</string>
-    <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Beigt zvanu"</string>
-    <string name="conference_call_name" msgid="8189987124611337174">"Konferences zvans"</string>
-    <string name="generic_conference_call_name" msgid="1546941472424243894">"Notiek zvans"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Zvans tiek turpināts, izmantojot mobilos datus…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Nevarēja pārslēgt uz Wi-Fi tīklu"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Videozvans tiks turpināts mobilo sakaru tīklā. Var tikt piemērota standarta maksa par datu pārraidi."</string>
-    <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Vairs nerādīt šo ziņojumu"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="wait_prompt_str">Vai sūtīt tālāk norādītos signālus?\n</string>
+  <string name="pause_prompt_yes">Jā</string>
+  <string name="pause_prompt_no">Nē</string>
+  <string name="notification_dialing">Notiek numura sastādīšana</string>
+  <string name="notification_ongoing_call">Pašreizējā saruna</string>
+  <string name="notification_ongoing_video_call">Notiekošs videozvans</string>
+  <string name="notification_ongoing_paused_video_call">Notiekošs videozvans — video apturēts</string>
+  <string name="notification_ongoing_work_call">Notiekošs darba zvans</string>
+  <string name="notification_ongoing_call_wifi_template">Notiekošs %1$s</string>
+  <string name="notification_incoming_call_wifi_template">Ienākošs %1$s</string>
+  <string name="notification_call_wifi_brand">Wi-Fi zvans</string>
+  <string name="notification_call_wifi_work_brand">Wi‑Fi darba zvans</string>
+  <string name="notification_on_hold">Aizturēts</string>
+  <string name="notification_incoming_call">Ienākošais zvans</string>
+  <string name="notification_incoming_video_call">Ienākošs videozvans</string>
+  <string name="notification_incoming_call_mutli_sim">Ienākošs zvans, izmantojot: %1$s</string>
+  <string name="notification_incoming_call_with_photo">Ienākošais zvans ar fotoattēlu</string>
+  <string name="notification_incoming_call_with_message">Ienākošais zvans ar ziņojumu</string>
+  <string name="notification_incoming_call_with_location">Ienākošais zvans ar atrašanās vietu</string>
+  <string name="notification_incoming_call_with_photo_message">Ienākošais zvans ar fotoattēlu un ziņojumu</string>
+  <string name="notification_incoming_call_with_photo_location">Ienākošais zvans ar fotoattēlu un atrašanās vietu</string>
+  <string name="notification_incoming_call_with_message_location">Ienākošais zvans ar ziņojumu un atrašanās vietu</string>
+  <string name="notification_incoming_call_with_photo_message_location">Zvans ar fotoattēlu, ziņojumu un atrašanās vietu</string>
+  <string name="notification_incoming_call_attachments">Ienākošais zvans ar pielikumiem</string>
+  <string name="important_notification_incoming_call">Svarīgs ienākošais zvans</string>
+  <string name="important_notification_incoming_call_with_photo">Svarīgs ienākošais zvans ar fotoattēlu</string>
+  <string name="important_notification_incoming_call_with_message">Svarīgs ienākošais zvans ar ziņojumu</string>
+  <string name="important_notification_incoming_call_with_location">Svarīgs ienākošais zvans ar atrašanās vietu</string>
+  <string name="important_notification_incoming_call_with_photo_message">Svarīgs ienākošais zvans ar fotoattēlu un ziņojumu</string>
+  <string name="important_notification_incoming_call_with_photo_location">Svarīgs zvans ar fotoattēlu un atrašanās vietu</string>
+  <string name="important_notification_incoming_call_with_message_location">Svarīgs zvans ar ziņojumu un atrašanās vietu</string>
+  <string name="important_notification_incoming_call_with_photo_message_location">Zvans ar fotoattēlu, ziņojumu un atrašanās vietu</string>
+  <string name="important_notification_incoming_call_attachments">Svarīgs ienākošais zvans ar pielikumiem</string>
+  <string name="notification_incoming_work_call">Ienākošs darba zvans</string>
+  <string name="notification_incoming_spam_call">Ienākošs, iespējams, nevēlams zvans</string>
+  <string name="notification_requesting_video_call">Ienākošs video pieprasījums</string>
+  <string name="notification_action_answer">Atbildēt</string>
+  <string name="notification_action_end_call">Pārtraukt</string>
+  <string name="notification_action_answer_video">Video</string>
+  <string name="notification_action_accept">Pieņemt</string>
+  <string name="notification_action_dismiss">Noraidīt</string>
+  <string name="notification_action_speaker_on">Ieslēgt skaļruni</string>
+  <string name="notification_action_speaker_off">Izslēgt skaļruni</string>
+  <string name="notification_external_call">Notiekošs zvans citā ierīcē</string>
+  <string name="notification_external_video_call">Notiekošs videozvans citā ierīcē</string>
+  <string name="notification_take_call">Pārsūtīt zvanu</string>
+  <string name="notification_take_video_call">Pārsūtīt videozvanu</string>
+  <string name="incall_error_supp_service_unknown">Pakalpojums netiek atbalstīts.</string>
+  <string name="goPrivate">pārslēgt uz privāto režīmu</string>
+  <string name="manageConferenceLabel">Pārvaldīt konferences zvanu</string>
+  <string name="child_number">no numura %s</string>
+  <string name="callFailed_simError">Nav SIM, vai SIM kļūda</string>
+  <string name="conference_caller_disconnect_content_description">Beigt zvanu</string>
+  <string name="conference_call_name">Konferences zvans</string>
+  <string name="generic_conference_call_name">Notiek zvans</string>
+  <string name="video_call_wifi_to_lte_handover_toast">Zvans tiek turpināts, izmantojot mobilos datus…</string>
+  <string name="video_call_lte_to_wifi_failed_title">Nevarēja pārslēgt uz Wi-Fi tīklu</string>
+  <string name="video_call_lte_to_wifi_failed_message">Videozvans tiks turpināts mobilo sakaru tīklā. Var tikt piemērota standarta maksa par datu pārraidi.</string>
+  <string name="video_call_lte_to_wifi_failed_do_not_show">Vairs nerādīt šo ziņojumu</string>
+  <string name="bubble_return_to_call">Atpakaļ pie zvana</string>
+  <string name="rtt_request_dialog_title">Vai pievienoties RTT zvanam?</string>
+  <string name="rtt_request_dialog_details">%1$s vēlas izmantot ziņojumapmaiņu jūsu balss zvanā.</string>
+  <string name="rtt_request_dialog_more_information">RTT funkcionalitāte palīdz nedzirdīgiem un vājdzirdīgiem zvanītājiem, kā arī zvanītājiem, kuriem ir runas traucējumi vai ir nepieciešama ne tikai balss skaņa.</string>
+  <string name="rtt_button_decline_request">Nē, paldies</string>
+  <string name="rtt_button_accept_request">Pievienoties RTT</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-af/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-af/strings.xml
index f848352..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc01-af/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-af/strings.xml
@@ -1,24 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_call_wifi_brand" msgid="255652823737617551">"WLAN-oproep"</string>
-    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"WLAN-werkoproep"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-am/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-am/strings.xml
index 0250240..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc01-am/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-am/strings.xml
@@ -1,24 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_call_wifi_brand" msgid="255652823737617551">"የWLAN ጥሪ"</string>
-    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"የWLAN የሥራ ጥሪ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-ar/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-ar/strings.xml
index 4c4b4ed..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc01-ar/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-ar/strings.xml
@@ -1,24 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_call_wifi_brand" msgid="255652823737617551">"‏مكالمة عبر WLAN"</string>
-    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"‏مكالمة عمل عبر WLAN"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-az/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-az/strings.xml
index d01e265..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc01-az/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-az/strings.xml
@@ -1,24 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_call_wifi_brand" msgid="255652823737617551">"WLAN Zəngi"</string>
-    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"WLAN iş zəngi"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-b+sr+Latn/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-b+sr+Latn/strings.xml
index 3454e37..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc01-b+sr+Latn/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-b+sr+Latn/strings.xml
@@ -1,24 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_call_wifi_brand" msgid="255652823737617551">"WLAN poziv"</string>
-    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"WLAN poslovni poziv"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-be/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-be/strings.xml
index 36f4a9b..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc01-be/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-be/strings.xml
@@ -1,24 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_call_wifi_brand" msgid="255652823737617551">"Выклік праз WLAN"</string>
-    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"Выклік па працы праз WLAN"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-bg/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-bg/strings.xml
index d45f7e1..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc01-bg/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-bg/strings.xml
@@ -1,24 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_call_wifi_brand" msgid="255652823737617551">"обаждане през WLAN"</string>
-    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"служебно обаждане през WLAN"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-bn/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-bn/strings.xml
index b944a66..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc01-bn/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-bn/strings.xml
@@ -1,24 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_call_wifi_brand" msgid="255652823737617551">"WLAN কল"</string>
-    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"অফিসের WLAN কল"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-bs/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-bs/strings.xml
index 3454e37..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc01-bs/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-bs/strings.xml
@@ -1,24 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_call_wifi_brand" msgid="255652823737617551">"WLAN poziv"</string>
-    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"WLAN poslovni poziv"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-ca/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-ca/strings.xml
index 46f20b5..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc01-ca/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-ca/strings.xml
@@ -1,24 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_call_wifi_brand" msgid="255652823737617551">"Trucada per WLAN"</string>
-    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"Trucada de feina per WLAN"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-cs/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-cs/strings.xml
index a8a1ef2..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc01-cs/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-cs/strings.xml
@@ -1,24 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_call_wifi_brand" msgid="255652823737617551">"hovor přes WLAN"</string>
-    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"pracovní hovor přes WLAN"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-da/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-da/strings.xml
index d3b3496..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc01-da/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-da/strings.xml
@@ -1,24 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_call_wifi_brand" msgid="255652823737617551">"WLAN-opkald"</string>
-    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"WLAN-opkald i forbindelse med arbejde"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-de/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-de/strings.xml
index 310aec1..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc01-de/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-de/strings.xml
@@ -1,24 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_call_wifi_brand" msgid="255652823737617551">"WLAN-Anruf"</string>
-    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"geschäftlicher WLAN-Anruf"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-el/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-el/strings.xml
index f89873c..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc01-el/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-el/strings.xml
@@ -1,24 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_call_wifi_brand" msgid="255652823737617551">"κλήση μέσω WLAN"</string>
-    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"κλήση εργασίας μέσω WLAN"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-en-rAU/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-en-rAU/strings.xml
index bf6a82d..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc01-en-rAU/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-en-rAU/strings.xml
@@ -1,24 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_call_wifi_brand" msgid="255652823737617551">"WLAN call"</string>
-    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"WLAN work call"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-en-rGB/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-en-rGB/strings.xml
index bf6a82d..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc01-en-rGB/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-en-rGB/strings.xml
@@ -1,24 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_call_wifi_brand" msgid="255652823737617551">"WLAN call"</string>
-    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"WLAN work call"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-en-rIN/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-en-rIN/strings.xml
index bf6a82d..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc01-en-rIN/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-en-rIN/strings.xml
@@ -1,24 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_call_wifi_brand" msgid="255652823737617551">"WLAN call"</string>
-    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"WLAN work call"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-es-rUS/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-es-rUS/strings.xml
index 3de910d..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc01-es-rUS/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-es-rUS/strings.xml
@@ -1,24 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_call_wifi_brand" msgid="255652823737617551">"Llamada por WLAN"</string>
-    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"Llamada de trabajo por WLAN"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-es/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-es/strings.xml
index 3de910d..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc01-es/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-es/strings.xml
@@ -1,24 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_call_wifi_brand" msgid="255652823737617551">"Llamada por WLAN"</string>
-    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"Llamada de trabajo por WLAN"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-et/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-et/strings.xml
index 31ad4d9..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc01-et/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-et/strings.xml
@@ -1,24 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_call_wifi_brand" msgid="255652823737617551">"WLAN-kõne"</string>
-    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"WLAN-töökõne"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-eu/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-eu/strings.xml
index 9becf5f..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc01-eu/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-eu/strings.xml
@@ -1,24 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_call_wifi_brand" msgid="255652823737617551">"WLAN bidezko deia"</string>
-    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"WLAN bidezko laneko deia"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-fa/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-fa/strings.xml
index a289576..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc01-fa/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-fa/strings.xml
@@ -1,24 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_call_wifi_brand" msgid="255652823737617551">"‏تماس ازطریق WLAN"</string>
-    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"‏تماس کاری ازطریق WLAN"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-fi/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-fi/strings.xml
index f23d4fe..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc01-fi/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-fi/strings.xml
@@ -1,24 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_call_wifi_brand" msgid="255652823737617551">"WLAN-puhelu"</string>
-    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"WLAN-työpuhelu"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-fr-rCA/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-fr-rCA/strings.xml
index 13a2f0a..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc01-fr-rCA/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-fr-rCA/strings.xml
@@ -1,24 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_call_wifi_brand" msgid="255652823737617551">"Appel WLAN"</string>
-    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"Appel professionnel WLAN"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-fr/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-fr/strings.xml
index 641d810..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc01-fr/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-fr/strings.xml
@@ -1,24 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_call_wifi_brand" msgid="255652823737617551">"Appel Wi-Fi"</string>
-    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"Appel professionnel Wi-Fi"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-gl/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-gl/strings.xml
index 7fa63a6..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc01-gl/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-gl/strings.xml
@@ -1,24 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_call_wifi_brand" msgid="255652823737617551">"Chamada por WLAN"</string>
-    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"Chamada de traballo por WLAN"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-gu/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-gu/strings.xml
index 409a0d3..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc01-gu/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-gu/strings.xml
@@ -1,24 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_call_wifi_brand" msgid="255652823737617551">"WLAN કૉલ"</string>
-    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"WLAN કાર્ય કૉલ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-hi/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-hi/strings.xml
index 322bd62..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc01-hi/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-hi/strings.xml
@@ -1,24 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_call_wifi_brand" msgid="255652823737617551">"WLAN कॉल"</string>
-    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"कार्य संबंधी WLAN कॉल"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-hr/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-hr/strings.xml
index b00306c..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc01-hr/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-hr/strings.xml
@@ -1,24 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_call_wifi_brand" msgid="255652823737617551">"Poziv putem WLAN-a"</string>
-    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"Poslovni poziv putem WLAN-a"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-hu/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-hu/strings.xml
index fc6b949..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc01-hu/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-hu/strings.xml
@@ -1,24 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_call_wifi_brand" msgid="255652823737617551">"WLAN-hívás"</string>
-    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"munkahelyi WLAN-hívás"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-hy/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-hy/strings.xml
index 95b745b..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc01-hy/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-hy/strings.xml
@@ -1,24 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_call_wifi_brand" msgid="255652823737617551">"Զանգ WLAN ցանցով"</string>
-    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"Աշխատանքային զանգ WLAN ցանցով"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-in/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-in/strings.xml
index 043fc52..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc01-in/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-in/strings.xml
@@ -1,24 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_call_wifi_brand" msgid="255652823737617551">"Panggilan WLAN"</string>
-    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"Panggilan kerja WLAN"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-is/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-is/strings.xml
index 8511209..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc01-is/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-is/strings.xml
@@ -1,24 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_call_wifi_brand" msgid="255652823737617551">"WLAN-símtal"</string>
-    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"WLAN-vinnusímtal"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-it/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-it/strings.xml
index 81ac11a..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc01-it/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-it/strings.xml
@@ -1,24 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_call_wifi_brand" msgid="255652823737617551">"Chiamata WLAN"</string>
-    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"Chiamata WLAN di lavoro"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-iw/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-iw/strings.xml
index 6d1ca9a..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc01-iw/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-iw/strings.xml
@@ -1,24 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_call_wifi_brand" msgid="255652823737617551">"שיחה ברשת אלחוטית"</string>
-    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"שיחת עבודה ברשת אלחוטית"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-ja/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-ja/strings.xml
index a1b3152..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc01-ja/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-ja/strings.xml
@@ -1,24 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_call_wifi_brand" msgid="255652823737617551">"無線 LAN 経由で通話"</string>
-    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"無線 LAN 経由で仕事の通話"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-ka/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-ka/strings.xml
index 58fd2a5..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc01-ka/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-ka/strings.xml
@@ -1,24 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_call_wifi_brand" msgid="255652823737617551">"WLAN ზარი"</string>
-    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"WLAN სამსახურებრივი ზარი"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-kk/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-kk/strings.xml
index 1c8b6d1..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc01-kk/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-kk/strings.xml
@@ -1,24 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_call_wifi_brand" msgid="255652823737617551">"WLAN қоңырауы"</string>
-    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"WLAN жұмыс қоңырауы"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-km/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-km/strings.xml
index abbbeeb..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc01-km/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-km/strings.xml
@@ -1,24 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_call_wifi_brand" msgid="255652823737617551">"ការហៅ​តាម WLAN"</string>
-    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"ការហៅ​តាម WLAN ពី​កន្លែងការងារ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-kn/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-kn/strings.xml
index d89f535..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc01-kn/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-kn/strings.xml
@@ -1,24 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_call_wifi_brand" msgid="255652823737617551">"WLAN ಕರೆ"</string>
-    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"WLAN ಕೆಲಸದ ಕರೆ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-ko/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-ko/strings.xml
index 7babf35..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc01-ko/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-ko/strings.xml
@@ -1,24 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_call_wifi_brand" msgid="255652823737617551">"WLAN 통화"</string>
-    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"WLAN 업무 통화"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-ky/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-ky/strings.xml
index a5080e2..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc01-ky/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-ky/strings.xml
@@ -1,24 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_call_wifi_brand" msgid="255652823737617551">"WLAN чалуу"</string>
-    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"WLAN чалуу (жумуш боюнча)"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-lo/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-lo/strings.xml
index 9826e73..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc01-lo/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-lo/strings.xml
@@ -1,24 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_call_wifi_brand" msgid="255652823737617551">"ສາຍ WLAN"</string>
-    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"ສາຍວຽກ WLAN"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-lt/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-lt/strings.xml
index 9025b8a..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc01-lt/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-lt/strings.xml
@@ -1,24 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_call_wifi_brand" msgid="255652823737617551">"WLAN skambutis"</string>
-    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"WLAN darbo skambutis"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-lv/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-lv/strings.xml
index b7ced72..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc01-lv/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-lv/strings.xml
@@ -1,24 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_call_wifi_brand" msgid="255652823737617551">"WLAN zvans"</string>
-    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"WLAN darba zvans"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-mk/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-mk/strings.xml
index f8766b7..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc01-mk/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-mk/strings.xml
@@ -1,24 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_call_wifi_brand" msgid="255652823737617551">"Повик преку WLAN"</string>
-    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"Работен повик преку WLAN"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-ml/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-ml/strings.xml
index 7dea8a4..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc01-ml/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-ml/strings.xml
@@ -1,24 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_call_wifi_brand" msgid="255652823737617551">"WLAN കോൾ"</string>
-    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"WLAN ഔദ്യോഗിക കോൾ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-mn/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-mn/strings.xml
index 09af655..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc01-mn/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-mn/strings.xml
@@ -1,24 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_call_wifi_brand" msgid="255652823737617551">"WLAN Дуудлага"</string>
-    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"WLAN ажлын дуудлага"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-mr/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-mr/strings.xml
index 78f59da..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc01-mr/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-mr/strings.xml
@@ -1,24 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_call_wifi_brand" msgid="255652823737617551">"WLAN कॉल"</string>
-    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"WLAN कार्य कॉल"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-ms/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-ms/strings.xml
index 06af11d..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc01-ms/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-ms/strings.xml
@@ -1,24 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_call_wifi_brand" msgid="255652823737617551">"Panggilan WLAN"</string>
-    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"Panggilan WLAN daripada tempat kerja"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-my/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-my/strings.xml
index bca5415..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc01-my/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-my/strings.xml
@@ -1,24 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_call_wifi_brand" msgid="255652823737617551">"WLAN ခေါ်ဆိုမှု"</string>
-    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"WLAN အလုပ်ဖုန်းခေါ်ဆိုမှု"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-nb/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-nb/strings.xml
index 8338451..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc01-nb/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-nb/strings.xml
@@ -1,24 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_call_wifi_brand" msgid="255652823737617551">"WLAN-anrop"</string>
-    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"WLAN-jobbanrop"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-ne/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-ne/strings.xml
index e0d4adc..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc01-ne/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-ne/strings.xml
@@ -1,24 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_call_wifi_brand" msgid="255652823737617551">"WLAN कल"</string>
-    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"WLAN मार्फत कामबाट आएको कल"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-nl/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-nl/strings.xml
index d4b3605..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc01-nl/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-nl/strings.xml
@@ -1,24 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_call_wifi_brand" msgid="255652823737617551">"Bellen via WLAN"</string>
-    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"Zakelijk bellen via WLAN"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-no/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-no/strings.xml
index 8338451..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc01-no/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-no/strings.xml
@@ -1,24 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_call_wifi_brand" msgid="255652823737617551">"WLAN-anrop"</string>
-    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"WLAN-jobbanrop"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-pa/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-pa/strings.xml
index 03b3edf..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc01-pa/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-pa/strings.xml
@@ -1,24 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_call_wifi_brand" msgid="255652823737617551">"WLAN ਕਾਲ"</string>
-    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"ਕਾਰਜ-ਸਥਾਨ ਤੋਂ ਆਈ WLAN ਕਾਲ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-pl/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-pl/strings.xml
index 8df7f73..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc01-pl/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-pl/strings.xml
@@ -1,24 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_call_wifi_brand" msgid="255652823737617551">"połączenie przez WLAN"</string>
-    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"połączenie służbowe przez WLAN"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-pt-rBR/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-pt-rBR/strings.xml
index 46e5be4..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc01-pt-rBR/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-pt-rBR/strings.xml
@@ -1,24 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_call_wifi_brand" msgid="255652823737617551">"Chamada por WLAN"</string>
-    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"Chamada de trabalho por WLAN"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-pt-rPT/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-pt-rPT/strings.xml
index 89f41e7..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc01-pt-rPT/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-pt-rPT/strings.xml
@@ -1,24 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_call_wifi_brand" msgid="255652823737617551">"Chamada WLAN"</string>
-    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"Chamada de trabalho WLAN"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-pt/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-pt/strings.xml
index 46e5be4..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc01-pt/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-pt/strings.xml
@@ -1,24 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_call_wifi_brand" msgid="255652823737617551">"Chamada por WLAN"</string>
-    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"Chamada de trabalho por WLAN"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-ro/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-ro/strings.xml
index f9a940e..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc01-ro/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-ro/strings.xml
@@ -1,24 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_call_wifi_brand" msgid="255652823737617551">"Apel WLAN"</string>
-    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"Apel de serviciu prin WLAN"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-ru/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-ru/strings.xml
index 73124ab..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc01-ru/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-ru/strings.xml
@@ -1,24 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_call_wifi_brand" msgid="255652823737617551">"звонок по сети WLAN"</string>
-    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"звонок по сети WLAN (работа)"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-si/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-si/strings.xml
index 02baa02..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc01-si/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-si/strings.xml
@@ -1,24 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_call_wifi_brand" msgid="255652823737617551">"WLAN ඇමතුම"</string>
-    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"WLAN කාර්යාල ඇමතුම"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-sk/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-sk/strings.xml
index 26554a0..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc01-sk/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-sk/strings.xml
@@ -1,24 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_call_wifi_brand" msgid="255652823737617551">"hovor cez WLAN"</string>
-    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"pracovný hovor cez WLAN"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-sl/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-sl/strings.xml
index 9418180..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc01-sl/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-sl/strings.xml
@@ -1,24 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_call_wifi_brand" msgid="255652823737617551">"klic prek omrežja WLAN"</string>
-    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"delovni klic prek omrežja WLAN"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-sq/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-sq/strings.xml
index 25f6af4..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc01-sq/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-sq/strings.xml
@@ -1,24 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_call_wifi_brand" msgid="255652823737617551">"Telefonatë me WLAN"</string>
-    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"Telefonatë pune me WLAN"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-sr/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-sr/strings.xml
index 2d431a0..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc01-sr/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-sr/strings.xml
@@ -1,24 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_call_wifi_brand" msgid="255652823737617551">"WLAN позив"</string>
-    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"WLAN пословни позив"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-sv/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-sv/strings.xml
index 0361853..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc01-sv/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-sv/strings.xml
@@ -1,24 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_call_wifi_brand" msgid="255652823737617551">"WLAN-samtal"</string>
-    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"WLAN-jobbsamtal"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-sw/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-sw/strings.xml
index b3ae92d..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc01-sw/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-sw/strings.xml
@@ -1,24 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_call_wifi_brand" msgid="255652823737617551">"Simu ya WLAN"</string>
-    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"Simu ya kazi ya WLAN"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-ta/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-ta/strings.xml
index 8d45067..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc01-ta/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-ta/strings.xml
@@ -1,24 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_call_wifi_brand" msgid="255652823737617551">"WLAN அழைப்பு"</string>
-    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"WLAN அழைப்பு (பணி)"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-te/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-te/strings.xml
index 35c2fea..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc01-te/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-te/strings.xml
@@ -1,24 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_call_wifi_brand" msgid="255652823737617551">"WLAN కాల్"</string>
-    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"WLAN కార్యాలయ కాల్"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-th/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-th/strings.xml
index 78e93ef..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc01-th/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-th/strings.xml
@@ -1,24 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_call_wifi_brand" msgid="255652823737617551">"การโทรผ่าน WLAN"</string>
-    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"สายจากที่ทำงานผ่าน WLAN"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-tl/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-tl/strings.xml
index f25f86f..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc01-tl/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-tl/strings.xml
@@ -1,24 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_call_wifi_brand" msgid="255652823737617551">"Pagtawag gamit ang WLAN"</string>
-    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"Pagtawag sa trabaho gamit ang WLAN"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-tr/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-tr/strings.xml
index a6114d8..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc01-tr/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-tr/strings.xml
@@ -1,24 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_call_wifi_brand" msgid="255652823737617551">"WLAN Üzerinden Çağrı"</string>
-    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"WLAN üzerinden, işle ilgili çağrı"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-uk/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-uk/strings.xml
index bafc5cb..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc01-uk/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-uk/strings.xml
@@ -1,24 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_call_wifi_brand" msgid="255652823737617551">"дзвінок через WLAN"</string>
-    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"робочий дзвінок через WLAN"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-ur/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-ur/strings.xml
index 7e9a09f..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc01-ur/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-ur/strings.xml
@@ -1,24 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_call_wifi_brand" msgid="255652823737617551">"‏WLAN کال"</string>
-    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"‏کام سے متعلق WLAN کال"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-uz/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-uz/strings.xml
index 4dc3382..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc01-uz/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-uz/strings.xml
@@ -1,24 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_call_wifi_brand" msgid="255652823737617551">"WLAN qo‘ng‘iroq"</string>
-    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"WLAN qo‘ng‘iroq (ish)"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-vi/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-vi/strings.xml
index cc4f036..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc01-vi/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-vi/strings.xml
@@ -1,24 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_call_wifi_brand" msgid="255652823737617551">"Cuộc gọi qua WLAN"</string>
-    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"Cuộc gọi về công việc qua WLAN"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-zh-rCN/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-zh-rCN/strings.xml
index 033fc75..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc01-zh-rCN/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-zh-rCN/strings.xml
@@ -1,24 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_call_wifi_brand" msgid="255652823737617551">"WLAN 通话"</string>
-    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"WLAN 工作通话"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-zh-rHK/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-zh-rHK/strings.xml
index 5ac46d1..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc01-zh-rHK/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-zh-rHK/strings.xml
@@ -1,24 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_call_wifi_brand" msgid="255652823737617551">"WLAN 通話"</string>
-    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"WLAN 工作通話"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-zh-rTW/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-zh-rTW/strings.xml
index 0684598..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc01-zh-rTW/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-zh-rTW/strings.xml
@@ -1,24 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_call_wifi_brand" msgid="255652823737617551">"WLAN 通話"</string>
-    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"WLAN 公司通話"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc01-zu/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01-zu/strings.xml
index 96a648a..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc01-zu/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc01-zu/strings.xml
@@ -1,24 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc01. See b/35614024  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_call_wifi_brand" msgid="255652823737617551">"Ikholi ye-WLAN"</string>
-    <string name="notification_call_wifi_work_brand" msgid="6283219237831628945">"Ikholi yomsebenzi ye-WLAN"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-af/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-af/strings.xml
index f575520..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc02-af/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-af/strings.xml
@@ -1,22 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-am/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-am/strings.xml
index f575520..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc02-am/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-am/strings.xml
@@ -1,22 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-ar/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-ar/strings.xml
index f575520..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc02-ar/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-ar/strings.xml
@@ -1,22 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-az/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-az/strings.xml
index f575520..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc02-az/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-az/strings.xml
@@ -1,22 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-b+sr+Latn/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-b+sr+Latn/strings.xml
index f575520..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc02-b+sr+Latn/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-b+sr+Latn/strings.xml
@@ -1,22 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-be/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-be/strings.xml
index f575520..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc02-be/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-be/strings.xml
@@ -1,22 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-bg/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-bg/strings.xml
index f575520..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc02-bg/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-bg/strings.xml
@@ -1,22 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-bn/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-bn/strings.xml
index f575520..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc02-bn/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-bn/strings.xml
@@ -1,22 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-bs/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-bs/strings.xml
index f575520..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc02-bs/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-bs/strings.xml
@@ -1,22 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-ca/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-ca/strings.xml
index f575520..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc02-ca/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-ca/strings.xml
@@ -1,22 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-cs/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-cs/strings.xml
index f575520..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc02-cs/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-cs/strings.xml
@@ -1,22 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-da/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-da/strings.xml
index f575520..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc02-da/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-da/strings.xml
@@ -1,22 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-de/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-de/strings.xml
index f575520..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc02-de/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-de/strings.xml
@@ -1,22 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-el/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-el/strings.xml
index f575520..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc02-el/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-el/strings.xml
@@ -1,22 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-en-rAU/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-en-rAU/strings.xml
index f575520..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc02-en-rAU/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-en-rAU/strings.xml
@@ -1,22 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-en-rGB/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-en-rGB/strings.xml
index f575520..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc02-en-rGB/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-en-rGB/strings.xml
@@ -1,22 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-en-rIN/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-en-rIN/strings.xml
index f575520..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc02-en-rIN/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-en-rIN/strings.xml
@@ -1,22 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-es-rUS/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-es-rUS/strings.xml
index f575520..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc02-es-rUS/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-es-rUS/strings.xml
@@ -1,22 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-es/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-es/strings.xml
index f575520..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc02-es/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-es/strings.xml
@@ -1,22 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-et/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-et/strings.xml
index f575520..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc02-et/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-et/strings.xml
@@ -1,22 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-eu/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-eu/strings.xml
index f575520..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc02-eu/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-eu/strings.xml
@@ -1,22 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-fa/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-fa/strings.xml
index f575520..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc02-fa/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-fa/strings.xml
@@ -1,22 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-fi/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-fi/strings.xml
index f575520..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc02-fi/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-fi/strings.xml
@@ -1,22 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-fr-rCA/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-fr-rCA/strings.xml
index f575520..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc02-fr-rCA/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-fr-rCA/strings.xml
@@ -1,22 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-fr/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-fr/strings.xml
index f575520..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc02-fr/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-fr/strings.xml
@@ -1,22 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-gl/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-gl/strings.xml
index f575520..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc02-gl/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-gl/strings.xml
@@ -1,22 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-gu/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-gu/strings.xml
index f575520..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc02-gu/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-gu/strings.xml
@@ -1,22 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-hi/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-hi/strings.xml
index f575520..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc02-hi/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-hi/strings.xml
@@ -1,22 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-hr/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-hr/strings.xml
index f575520..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc02-hr/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-hr/strings.xml
@@ -1,22 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-hu/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-hu/strings.xml
index f575520..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc02-hu/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-hu/strings.xml
@@ -1,22 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-hy/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-hy/strings.xml
index f575520..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc02-hy/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-hy/strings.xml
@@ -1,22 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-in/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-in/strings.xml
index f575520..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc02-in/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-in/strings.xml
@@ -1,22 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-is/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-is/strings.xml
index f575520..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc02-is/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-is/strings.xml
@@ -1,22 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-it/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-it/strings.xml
index f575520..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc02-it/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-it/strings.xml
@@ -1,22 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-iw/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-iw/strings.xml
index f575520..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc02-iw/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-iw/strings.xml
@@ -1,22 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-ja/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-ja/strings.xml
index f575520..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc02-ja/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-ja/strings.xml
@@ -1,22 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-ka/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-ka/strings.xml
index f575520..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc02-ka/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-ka/strings.xml
@@ -1,22 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-kk/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-kk/strings.xml
index f575520..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc02-kk/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-kk/strings.xml
@@ -1,22 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-km/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-km/strings.xml
index f575520..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc02-km/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-km/strings.xml
@@ -1,22 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-kn/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-kn/strings.xml
index f575520..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc02-kn/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-kn/strings.xml
@@ -1,22 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-ko/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-ko/strings.xml
index f575520..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc02-ko/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-ko/strings.xml
@@ -1,22 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-ky/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-ky/strings.xml
index f575520..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc02-ky/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-ky/strings.xml
@@ -1,22 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-lo/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-lo/strings.xml
index f575520..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc02-lo/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-lo/strings.xml
@@ -1,22 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-lt/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-lt/strings.xml
index f575520..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc02-lt/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-lt/strings.xml
@@ -1,22 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-lv/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-lv/strings.xml
index f575520..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc02-lv/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-lv/strings.xml
@@ -1,22 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-mk/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-mk/strings.xml
index f575520..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc02-mk/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-mk/strings.xml
@@ -1,22 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-ml/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-ml/strings.xml
index f575520..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc02-ml/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-ml/strings.xml
@@ -1,22 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-mn/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-mn/strings.xml
index f575520..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc02-mn/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-mn/strings.xml
@@ -1,22 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-mr/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-mr/strings.xml
index f575520..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc02-mr/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-mr/strings.xml
@@ -1,22 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-ms/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-ms/strings.xml
index f575520..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc02-ms/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-ms/strings.xml
@@ -1,22 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-my/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-my/strings.xml
index f575520..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc02-my/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-my/strings.xml
@@ -1,22 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-nb/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-nb/strings.xml
index f575520..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc02-nb/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-nb/strings.xml
@@ -1,22 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-ne/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-ne/strings.xml
index f575520..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc02-ne/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-ne/strings.xml
@@ -1,22 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-nl/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-nl/strings.xml
index f575520..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc02-nl/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-nl/strings.xml
@@ -1,22 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-no/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-no/strings.xml
index f575520..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc02-no/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-no/strings.xml
@@ -1,22 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-pa/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-pa/strings.xml
index f575520..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc02-pa/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-pa/strings.xml
@@ -1,22 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-pl/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-pl/strings.xml
index f575520..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc02-pl/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-pl/strings.xml
@@ -1,22 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-pt-rBR/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-pt-rBR/strings.xml
index f575520..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc02-pt-rBR/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-pt-rBR/strings.xml
@@ -1,22 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-pt-rPT/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-pt-rPT/strings.xml
index f575520..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc02-pt-rPT/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-pt-rPT/strings.xml
@@ -1,22 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-pt/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-pt/strings.xml
index f575520..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc02-pt/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-pt/strings.xml
@@ -1,22 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-ro/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-ro/strings.xml
index f575520..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc02-ro/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-ro/strings.xml
@@ -1,22 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-ru/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-ru/strings.xml
index f575520..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc02-ru/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-ru/strings.xml
@@ -1,22 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-si/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-si/strings.xml
index f575520..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc02-si/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-si/strings.xml
@@ -1,22 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-sk/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-sk/strings.xml
index f575520..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc02-sk/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-sk/strings.xml
@@ -1,22 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-sl/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-sl/strings.xml
index f575520..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc02-sl/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-sl/strings.xml
@@ -1,22 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-sq/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-sq/strings.xml
index f575520..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc02-sq/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-sq/strings.xml
@@ -1,22 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-sr/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-sr/strings.xml
index f575520..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc02-sr/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-sr/strings.xml
@@ -1,22 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-sv/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-sv/strings.xml
index f575520..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc02-sv/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-sv/strings.xml
@@ -1,22 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-sw/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-sw/strings.xml
index f575520..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc02-sw/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-sw/strings.xml
@@ -1,22 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-ta/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-ta/strings.xml
index f575520..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc02-ta/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-ta/strings.xml
@@ -1,22 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-te/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-te/strings.xml
index f575520..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc02-te/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-te/strings.xml
@@ -1,22 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-th/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-th/strings.xml
index f575520..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc02-th/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-th/strings.xml
@@ -1,22 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-tl/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-tl/strings.xml
index f575520..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc02-tl/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-tl/strings.xml
@@ -1,22 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-tr/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-tr/strings.xml
index f575520..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc02-tr/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-tr/strings.xml
@@ -1,22 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-uk/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-uk/strings.xml
index f575520..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc02-uk/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-uk/strings.xml
@@ -1,22 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-ur/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-ur/strings.xml
index f575520..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc02-ur/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-ur/strings.xml
@@ -1,22 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-uz/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-uz/strings.xml
index f575520..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc02-uz/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-uz/strings.xml
@@ -1,22 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-vi/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-vi/strings.xml
index f575520..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc02-vi/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-vi/strings.xml
@@ -1,22 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-zh-rCN/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-zh-rCN/strings.xml
index f575520..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc02-zh-rCN/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-zh-rCN/strings.xml
@@ -1,22 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-zh-rHK/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-zh-rHK/strings.xml
index f575520..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc02-zh-rHK/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-zh-rHK/strings.xml
@@ -1,22 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-zh-rTW/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-zh-rTW/strings.xml
index f575520..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc02-zh-rTW/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-zh-rTW/strings.xml
@@ -1,22 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mcc262-mnc02-zu/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc02-zu/strings.xml
index f575520..045e125 100644
--- a/java/com/android/incallui/res/values-mcc262-mnc02-zu/strings.xml
+++ b/java/com/android/incallui/res/values-mcc262-mnc02-zu/strings.xml
@@ -1,22 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<!--  Specific brand names for mcc262-mnc02. See b/64487733  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
 </resources>
diff --git a/java/com/android/incallui/res/values-mk/strings.xml b/java/com/android/incallui/res/values-mk/strings.xml
index 48baf0f..ce35005 100644
--- a/java/com/android/incallui/res/values-mk/strings.xml
+++ b/java/com/android/incallui/res/values-mk/strings.xml
@@ -1,79 +1,68 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"Телефон"</string>
-    <string name="wait_prompt_str" msgid="3509685348904329594">"Испрати ги следниве тонови?\n"</string>
-    <string name="pause_prompt_yes" msgid="4642047011233552973">"Да"</string>
-    <string name="pause_prompt_no" msgid="4691320111774935838">"Не"</string>
-    <string name="notification_dialing" msgid="9072177265772083826">"Бирање"</string>
-    <string name="notification_ongoing_call" msgid="8712641937577776125">"Тековен повик"</string>
-    <string name="notification_ongoing_video_call" msgid="6331318021321487769">"Тековен видеоповик"</string>
-    <string name="notification_ongoing_paused_video_call" msgid="709950253594606371">"Тековен видеоповик ‑ видеото е паузирано"</string>
-    <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Тековен работен повик"</string>
-    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"Тековен <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
-    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"Дојдовен <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
-    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"Повик преку Wi-Fi"</string>
-    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"Работен повик преку Wi-Fi"</string>
-    <string name="notification_on_hold" msgid="7141827443379205682">"На чекање"</string>
-    <string name="notification_incoming_call" msgid="7520580807513849283">"Дојдовен повик"</string>
-    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Дојдовен повик со фотографија"</string>
-    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"Дојдовен повик со порака"</string>
-    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"Дојдовен повик со локација"</string>
-    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"Дојдовен повик со фотографија и порака"</string>
-    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"Дојдовен повик со фотографија и локација"</string>
-    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"Дојдовен повик со порака и локација"</string>
-    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"Дојдовен повик со фотографија, порака и локација"</string>
-    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"Дојдовен повик со прилози"</string>
-    <string name="important_notification_incoming_call" msgid="2867013954509930989">"Важен дојдовен повик"</string>
-    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"Важен дојдовен повик со фотографија"</string>
-    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"Важен дојдовен повик со порака"</string>
-    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"Важен дојдовен повик со локација"</string>
-    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"Важен дојдовен повик со фотографија и порака"</string>
-    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"Важен дојдовен повик со фотографија и локација"</string>
-    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"Важен дојдовен повик со порака и локација"</string>
-    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Важен дојдовен повик со фото., порака и локација"</string>
-    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Важен дојдовен повик со прилози"</string>
-    <string name="notification_incoming_work_call" msgid="5291275092734261918">"Дојдовен работен повик"</string>
-    <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Дојдовниот повик може да е спам"</string>
-    <string name="notification_requesting_video_call" msgid="1807679328811515758">"Дојдовно побарување за видео"</string>
-    <string name="notification_action_answer" msgid="8748275902211192568">"Одговори"</string>
-    <string name="notification_action_end_call" msgid="7467258454170007765">"Спушти"</string>
-    <string name="notification_action_answer_video" msgid="8488108892919917287">"Видео"</string>
-    <string name="notification_action_accept" msgid="1272761514200507143">"Прифати"</string>
-    <string name="notification_action_dismiss" msgid="3128241581632616226">"Одбиј"</string>
-    <string name="notification_action_speaker_on" msgid="1882659234405596540">"Вклучете го звучникот"</string>
-    <string name="notification_action_speaker_off" msgid="6340085043115533948">"Исклучете го звучникот"</string>
-    <string name="notification_external_call" msgid="2504334597315343920">"Повик во тек на друг уред"</string>
-    <string name="notification_external_video_call" msgid="7709394856028436683">"Видеоповик во тек на друг уред"</string>
-    <string name="notification_take_call" msgid="5631659438864492229">"Прифатете повик"</string>
-    <string name="notification_take_video_call" msgid="4473387503712341390">"Прифатете видеоповик"</string>
-    <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"Услугата не е поддржана."</string>
-    <string name="goPrivate" msgid="5269514638004595378">"префли на приватно"</string>
-    <string name="manageConferenceLabel" msgid="3589379023518128318">"Управувај со конференциски повик"</string>
-    <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"Број за итни случаи"</string>
-    <string name="child_number" msgid="3398257437107259682">"преку <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
-    <string name="callFailed_simError" msgid="4587775795711340072">"Нема SIM или грешка на SIM"</string>
-    <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Завршете го повикот"</string>
-    <string name="conference_call_name" msgid="8189987124611337174">"Конференциски повик"</string>
-    <string name="generic_conference_call_name" msgid="1546941472424243894">"Повик во тек"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Повикот ќе продолжи преку мобилен интернет…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Не можеше да се префрли на Wi-Fi-мрежа"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Видеоповикот ќе остане на мобилната мрежа. Може да се наплати за мобилен интернет."</string>
-    <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Не го прикажувај ова повторно"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="wait_prompt_str">Испрати ги следниве тонови?\n</string>
+  <string name="pause_prompt_yes">Да</string>
+  <string name="pause_prompt_no">Не</string>
+  <string name="notification_dialing">Бирање</string>
+  <string name="notification_ongoing_call">Тековен повик</string>
+  <string name="notification_ongoing_video_call">Тековен видеоповик</string>
+  <string name="notification_ongoing_paused_video_call">Тековен видеоповик ‑ видеото е паузирано</string>
+  <string name="notification_ongoing_work_call">Тековен работен повик</string>
+  <string name="notification_ongoing_call_wifi_template">Тековен %1$s</string>
+  <string name="notification_incoming_call_wifi_template">Дојдовен %1$s</string>
+  <string name="notification_call_wifi_brand">Повик преку Wi-Fi</string>
+  <string name="notification_call_wifi_work_brand">Работен повик преку Wi-Fi</string>
+  <string name="notification_on_hold">На чекање</string>
+  <string name="notification_incoming_call">Дојдовен повик</string>
+  <string name="notification_incoming_video_call">Дојдовен видеоповик</string>
+  <string name="notification_incoming_call_mutli_sim">Дојдовен повик преку %1$s</string>
+  <string name="notification_incoming_call_with_photo">Дојдовен повик со фотографија</string>
+  <string name="notification_incoming_call_with_message">Дојдовен повик со порака</string>
+  <string name="notification_incoming_call_with_location">Дојдовен повик со локација</string>
+  <string name="notification_incoming_call_with_photo_message">Дојдовен повик со фотографија и порака</string>
+  <string name="notification_incoming_call_with_photo_location">Дојдовен повик со фотографија и локација</string>
+  <string name="notification_incoming_call_with_message_location">Дојдовен повик со порака и локација</string>
+  <string name="notification_incoming_call_with_photo_message_location">Дојдовен повик со фотографија, порака и локација</string>
+  <string name="notification_incoming_call_attachments">Дојдовен повик со прилози</string>
+  <string name="important_notification_incoming_call">Важен дојдовен повик</string>
+  <string name="important_notification_incoming_call_with_photo">Важен дојдовен повик со фотографија</string>
+  <string name="important_notification_incoming_call_with_message">Важен дојдовен повик со порака</string>
+  <string name="important_notification_incoming_call_with_location">Важен дојдовен повик со локација</string>
+  <string name="important_notification_incoming_call_with_photo_message">Важен дојдовен повик со фотографија и порака</string>
+  <string name="important_notification_incoming_call_with_photo_location">Важен дојдовен повик со фотографија и локација</string>
+  <string name="important_notification_incoming_call_with_message_location">Важен дојдовен повик со порака и локација</string>
+  <string name="important_notification_incoming_call_with_photo_message_location">Важен дојдовен повик со фото., порака и локација</string>
+  <string name="important_notification_incoming_call_attachments">Важен дојдовен повик со прилози</string>
+  <string name="notification_incoming_work_call">Дојдовен работен повик</string>
+  <string name="notification_incoming_spam_call">Дојдовниот повик може да е спам</string>
+  <string name="notification_requesting_video_call">Дојдовно побарување за видео</string>
+  <string name="notification_action_answer">Одговори</string>
+  <string name="notification_action_end_call">Спушти</string>
+  <string name="notification_action_answer_video">Видео</string>
+  <string name="notification_action_accept">Прифати</string>
+  <string name="notification_action_dismiss">Одбиј</string>
+  <string name="notification_action_speaker_on">Вклучете го звучникот</string>
+  <string name="notification_action_speaker_off">Исклучете го звучникот</string>
+  <string name="notification_external_call">Повик во тек на друг уред</string>
+  <string name="notification_external_video_call">Видеоповик во тек на друг уред</string>
+  <string name="notification_take_call">Прифатете повик</string>
+  <string name="notification_take_video_call">Прифатете видеоповик</string>
+  <string name="incall_error_supp_service_unknown">Услугата не е поддржана.</string>
+  <string name="goPrivate">префли на приватно</string>
+  <string name="manageConferenceLabel">Управувај со конференциски повик</string>
+  <string name="child_number">преку %s</string>
+  <string name="callFailed_simError">Нема SIM или грешка на SIM</string>
+  <string name="conference_caller_disconnect_content_description">Завршете го повикот</string>
+  <string name="conference_call_name">Конференциски повик</string>
+  <string name="generic_conference_call_name">Повик во тек</string>
+  <string name="video_call_wifi_to_lte_handover_toast">Повикот ќе продолжи преку мобилен интернет…</string>
+  <string name="video_call_lte_to_wifi_failed_title">Не можеше да се префрли на Wi-Fi-мрежа</string>
+  <string name="video_call_lte_to_wifi_failed_message">Видеоповикот ќе остане на мобилната мрежа. Може да се наплати за мобилен интернет.</string>
+  <string name="video_call_lte_to_wifi_failed_do_not_show">Не го прикажувај ова повторно</string>
+  <string name="bubble_return_to_call">Назад на повикот</string>
+  <string name="rtt_request_dialog_title">Ќе се придружите на RTT-повик?</string>
+  <string name="rtt_request_dialog_details">%1$s сака да користи пораки во рамките на гласовниот повик.</string>
+  <string name="rtt_request_dialog_more_information">RTT им помага на повикувачи коишто се глуви, слабо слушаат, имаат говорна мана или пак, им е потребно многу повеќе од глас.</string>
+  <string name="rtt_button_decline_request">Не, фала</string>
+  <string name="rtt_button_accept_request">Придружи се на RTT</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-ml/strings.xml b/java/com/android/incallui/res/values-ml/strings.xml
index ea1f7af..8517def 100644
--- a/java/com/android/incallui/res/values-ml/strings.xml
+++ b/java/com/android/incallui/res/values-ml/strings.xml
@@ -1,79 +1,68 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"ഫോണ്‍"</string>
-    <string name="wait_prompt_str" msgid="3509685348904329594">"ഇനിപ്പറയുന്ന ടോണുകൾ അയയ്‌ക്കണോ?\n"</string>
-    <string name="pause_prompt_yes" msgid="4642047011233552973">"വേണം"</string>
-    <string name="pause_prompt_no" msgid="4691320111774935838">"വേണ്ട"</string>
-    <string name="notification_dialing" msgid="9072177265772083826">"ഡയൽ ചെയ്യുന്നു"</string>
-    <string name="notification_ongoing_call" msgid="8712641937577776125">"കോൾ സജീവമാണ്"</string>
-    <string name="notification_ongoing_video_call" msgid="6331318021321487769">"നടന്നുകൊണ്ടിരിക്കുന്ന വീഡിയോ കോൾ"</string>
-    <string name="notification_ongoing_paused_video_call" msgid="709950253594606371">"നടന്നുകൊണ്ടിരിക്കുന്ന വീഡിയോ കോൾ ‑ വീഡിയോ തൽക്കാലം നിർത്തി"</string>
-    <string name="notification_ongoing_work_call" msgid="3189581218078981547">"ഓൺഗോയിംഗ് ഔദ്യോഗിക കോൾ"</string>
-    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"തുടർന്നുകൊണ്ടിരിക്കുന്ന <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
-    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"ഇൻകമിംഗ് <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
-    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"വൈഫൈ കോൾ"</string>
-    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"വൈഫൈ ഔദ്യോഗിക കോൾ"</string>
-    <string name="notification_on_hold" msgid="7141827443379205682">"ഹോള്‍ഡിലാണ്"</string>
-    <string name="notification_incoming_call" msgid="7520580807513849283">"ഇന്‍കമിംഗ് കോള്‍"</string>
-    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"ഫോട്ടോ ഉൾപ്പെട്ട ഇൻകമിംഗ് കോൾ"</string>
-    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"സന്ദേശം ഉൾപ്പെട്ട ഇൻകമിംഗ് കോൾ"</string>
-    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"ലൊക്കേഷൻ ഉൾപ്പെട്ട ഇൻകമിംഗ് കോൾ"</string>
-    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"ഫോട്ടോയും സന്ദേശവും ഉൾപ്പെട്ട ഇൻകമിംഗ് കോൾ"</string>
-    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"ഫോട്ടോയും ലൊക്കേഷനും ഉൾപ്പെട്ട ഇൻകമിംഗ് കോൾ"</string>
-    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"സന്ദേശവും ലൊക്കേഷനും ഉൾപ്പെട്ട ഇൻകമിംഗ് കോൾ"</string>
-    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"ഫോട്ടോയും സന്ദേശവും ലൊക്കേഷനും ഉൾപ്പെട്ട ഇൻകമിംഗ് കോൾ"</string>
-    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"അറ്റാച്ച്‌മെന്റുകൾ ഉൾപ്പെട്ട ഇൻകമിംഗ് കോൾ"</string>
-    <string name="important_notification_incoming_call" msgid="2867013954509930989">"പ്രധാനപ്പെട്ട ഇൻകമിംഗ് കോൾ"</string>
-    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"ഫോട്ടോ ഉൾപ്പെട്ട പ്രധാനപ്പെട്ട ഇൻകമിംഗ് കോൾ"</string>
-    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"സന്ദേശം ഉൾപ്പെട്ട പ്രധാനപ്പെട്ട ഇൻകമിംഗ് കോൾ"</string>
-    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"ലൊക്കേഷൻ ഉൾപ്പെട്ട പ്രധാനപ്പെട്ട ഇൻകമിംഗ് കോൾ"</string>
-    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"ഫോട്ടോയും സന്ദേശവും ഉൾപ്പെട്ട പ്രധാനപ്പെട്ട ഇൻകമിംഗ് കോൾ"</string>
-    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"ഫോട്ടോയും ലൊക്കേഷനും ഉൾപ്പെട്ട പ്രധാനപ്പെട്ട ഇൻകമിംഗ് കോൾ"</string>
-    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"സന്ദേശവും ലൊക്കേഷനും ഉൾപ്പെട്ട പ്രധാനപ്പെട്ട ഇൻകമിംഗ് കോൾ"</string>
-    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"ഫോട്ടോയും സന്ദേശവും ലൊക്കേഷനും ഉൾപ്പെട്ട പ്രധാനപ്പെട്ട ഇൻകമിംഗ് കോൾ"</string>
-    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"അറ്റാച്ച്‌മെന്റുകൾ ഉൾപ്പെട്ട പ്രധാനപ്പെട്ട ഇൻകമിംഗ് കോൾ"</string>
-    <string name="notification_incoming_work_call" msgid="5291275092734261918">"ഇൻകമിംഗ് ഔദ്യോഗിക കോൾ"</string>
-    <string name="notification_incoming_spam_call" msgid="7591506944666791937">"സംശയാസ്‌പദമായ ഇൻകമിംഗ് സ്‌പാം കോൾ"</string>
-    <string name="notification_requesting_video_call" msgid="1807679328811515758">"ഇൻകമിംഗ് വീഡിയോ അഭ്യർത്ഥന"</string>
-    <string name="notification_action_answer" msgid="8748275902211192568">"മറുപടി"</string>
-    <string name="notification_action_end_call" msgid="7467258454170007765">"ഹാംഗ് അപ്പ് ചെയ്യുക"</string>
-    <string name="notification_action_answer_video" msgid="8488108892919917287">"വീഡിയോ"</string>
-    <string name="notification_action_accept" msgid="1272761514200507143">"അംഗീകരിക്കുക"</string>
-    <string name="notification_action_dismiss" msgid="3128241581632616226">"നിരസിക്കുക"</string>
-    <string name="notification_action_speaker_on" msgid="1882659234405596540">"സ്‌പീക്കർ ഓണാക്കുക"</string>
-    <string name="notification_action_speaker_off" msgid="6340085043115533948">"സ്‌പീക്കർ ഓഫാക്കുക"</string>
-    <string name="notification_external_call" msgid="2504334597315343920">"മറ്റൊരു ഉപകരണത്തിൽ നടന്നുകൊണ്ടിരിക്കുന്ന കോൾ"</string>
-    <string name="notification_external_video_call" msgid="7709394856028436683">"മറ്റൊരു ഉപകരണത്തിൽ നടന്നുകൊണ്ടിരിക്കുന്ന വീഡിയോ കോൾ"</string>
-    <string name="notification_take_call" msgid="5631659438864492229">"കോൾ എടുക്കുക"</string>
-    <string name="notification_take_video_call" msgid="4473387503712341390">"വീഡിയോ കോൾ അറ്റൻഡ് ചെയ്യുക"</string>
-    <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"സേവനം പിന്തുണയ്‌ക്കുന്നില്ല."</string>
-    <string name="goPrivate" msgid="5269514638004595378">"സ്വകാര്യം എന്നതിലേക്ക് പോകുക"</string>
-    <string name="manageConferenceLabel" msgid="3589379023518128318">"കോൺഫറൻസ് കോൾ നിയന്ത്രിക്കുക"</string>
-    <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"അടിയന്തര നമ്പർ"</string>
-    <string name="child_number" msgid="3398257437107259682">"<xliff:g id="CHILD_NUMBER">%s</xliff:g> വഴി"</string>
-    <string name="callFailed_simError" msgid="4587775795711340072">"സിം ഇല്ല അല്ലെങ്കിൽ സിം പിശക്"</string>
-    <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"കോള്‍ അവസാനിപ്പിക്കൂ"</string>
-    <string name="conference_call_name" msgid="8189987124611337174">"കോൺഫറൻസ് കോൾ"</string>
-    <string name="generic_conference_call_name" msgid="1546941472424243894">"കോളിലാണ്"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"മൊബൈൽ ഡാറ്റ ഉപയോഗിച്ച് കോൾ തുടരുന്നു…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"വൈഫൈ നെറ്റ്‌വർക്കിലേക്ക് മാറാനായില്ല"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"മൊബൈൽ നെറ്റ്‌വർക്കിൽത്തന്നെ വീഡിയോ കോൾ തുടരും. സാധാരണ ഡാറ്റ നിരക്കുകൾ ബാധകമാകാം."</string>
-    <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"ഇത് വീണ്ടും കാണിക്കരുത്"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="wait_prompt_str">ഇനിപ്പറയുന്ന ടോണുകൾ അയയ്‌ക്കണോ?\n</string>
+  <string name="pause_prompt_yes">വേണം</string>
+  <string name="pause_prompt_no">വേണ്ട</string>
+  <string name="notification_dialing">ഡയൽ ചെയ്യുന്നു</string>
+  <string name="notification_ongoing_call">കോൾ സജീവമാണ്</string>
+  <string name="notification_ongoing_video_call">നടന്നുകൊണ്ടിരിക്കുന്ന വീഡിയോ കോൾ</string>
+  <string name="notification_ongoing_paused_video_call">നടന്നുകൊണ്ടിരിക്കുന്ന വീഡിയോ കോൾ ‑ വീഡിയോ തൽക്കാലം നിർത്തി</string>
+  <string name="notification_ongoing_work_call">ഓൺഗോയിംഗ് ഔദ്യോഗിക കോൾ</string>
+  <string name="notification_ongoing_call_wifi_template">തുടർന്നുകൊണ്ടിരിക്കുന്ന %1$s</string>
+  <string name="notification_incoming_call_wifi_template">ഇൻകമിംഗ് %1$s</string>
+  <string name="notification_call_wifi_brand">വൈഫൈ കോൾ</string>
+  <string name="notification_call_wifi_work_brand">വൈഫൈ ഔദ്യോഗിക കോൾ</string>
+  <string name="notification_on_hold">ഹോള്‍ഡിലാണ്</string>
+  <string name="notification_incoming_call">ഇന്‍കമിംഗ് കോള്‍</string>
+  <string name="notification_incoming_video_call">ഇൻകമിംഗ് വീഡിയോ കോൾ</string>
+  <string name="notification_incoming_call_mutli_sim">%1$s വഴി കോൾ വരുന്നു</string>
+  <string name="notification_incoming_call_with_photo">ഫോട്ടോ ഉൾപ്പെട്ട ഇൻകമിംഗ് കോൾ</string>
+  <string name="notification_incoming_call_with_message">സന്ദേശം ഉൾപ്പെട്ട ഇൻകമിംഗ് കോൾ</string>
+  <string name="notification_incoming_call_with_location">ലൊക്കേഷൻ ഉൾപ്പെട്ട ഇൻകമിംഗ് കോൾ</string>
+  <string name="notification_incoming_call_with_photo_message">ഫോട്ടോയും സന്ദേശവും ഉൾപ്പെട്ട ഇൻകമിംഗ് കോൾ</string>
+  <string name="notification_incoming_call_with_photo_location">ഫോട്ടോയും ലൊക്കേഷനും ഉൾപ്പെട്ട ഇൻകമിംഗ് കോൾ</string>
+  <string name="notification_incoming_call_with_message_location">സന്ദേശവും ലൊക്കേഷനും ഉൾപ്പെട്ട ഇൻകമിംഗ് കോൾ</string>
+  <string name="notification_incoming_call_with_photo_message_location">ഫോട്ടോയും സന്ദേശവും ലൊക്കേഷനും ഉൾപ്പെട്ട ഇൻകമിംഗ് കോൾ</string>
+  <string name="notification_incoming_call_attachments">അറ്റാച്ച്‌മെന്റുകൾ ഉൾപ്പെട്ട ഇൻകമിംഗ് കോൾ</string>
+  <string name="important_notification_incoming_call">പ്രധാനപ്പെട്ട ഇൻകമിംഗ് കോൾ</string>
+  <string name="important_notification_incoming_call_with_photo">ഫോട്ടോ ഉൾപ്പെട്ട പ്രധാനപ്പെട്ട ഇൻകമിംഗ് കോൾ</string>
+  <string name="important_notification_incoming_call_with_message">സന്ദേശം ഉൾപ്പെട്ട പ്രധാനപ്പെട്ട ഇൻകമിംഗ് കോൾ</string>
+  <string name="important_notification_incoming_call_with_location">ലൊക്കേഷൻ ഉൾപ്പെട്ട പ്രധാനപ്പെട്ട ഇൻകമിംഗ് കോൾ</string>
+  <string name="important_notification_incoming_call_with_photo_message">ഫോട്ടോയും സന്ദേശവും ഉൾപ്പെട്ട പ്രധാനപ്പെട്ട ഇൻകമിംഗ് കോൾ</string>
+  <string name="important_notification_incoming_call_with_photo_location">ഫോട്ടോയും ലൊക്കേഷനും ഉൾപ്പെട്ട പ്രധാനപ്പെട്ട ഇൻകമിംഗ് കോൾ</string>
+  <string name="important_notification_incoming_call_with_message_location">സന്ദേശവും ലൊക്കേഷനും ഉൾപ്പെട്ട പ്രധാനപ്പെട്ട ഇൻകമിംഗ് കോൾ</string>
+  <string name="important_notification_incoming_call_with_photo_message_location">ഫോട്ടോയും സന്ദേശവും ലൊക്കേഷനും ഉൾപ്പെട്ട പ്രധാനപ്പെട്ട ഇൻകമിംഗ് കോൾ</string>
+  <string name="important_notification_incoming_call_attachments">അറ്റാച്ച്‌മെന്റുകൾ ഉൾപ്പെട്ട പ്രധാനപ്പെട്ട ഇൻകമിംഗ് കോൾ</string>
+  <string name="notification_incoming_work_call">ഇൻകമിംഗ് ഔദ്യോഗിക കോൾ</string>
+  <string name="notification_incoming_spam_call">സംശയാസ്‌പദമായ ഇൻകമിംഗ് സ്‌പാം കോൾ</string>
+  <string name="notification_requesting_video_call">ഇൻകമിംഗ് വീഡിയോ അഭ്യർത്ഥന</string>
+  <string name="notification_action_answer">മറുപടി</string>
+  <string name="notification_action_end_call">ഹാംഗ് അപ്പ് ചെയ്യുക</string>
+  <string name="notification_action_answer_video">വീഡിയോ</string>
+  <string name="notification_action_accept">അംഗീകരിക്കുക</string>
+  <string name="notification_action_dismiss">നിരസിക്കുക</string>
+  <string name="notification_action_speaker_on">സ്‌പീക്കർ ഓണാക്കുക</string>
+  <string name="notification_action_speaker_off">സ്‌പീക്കർ ഓഫാക്കുക</string>
+  <string name="notification_external_call">മറ്റൊരു ഉപകരണത്തിൽ നടന്നുകൊണ്ടിരിക്കുന്ന കോൾ</string>
+  <string name="notification_external_video_call">മറ്റൊരു ഉപകരണത്തിൽ നടന്നുകൊണ്ടിരിക്കുന്ന വീഡിയോ കോൾ</string>
+  <string name="notification_take_call">കോൾ എടുക്കുക</string>
+  <string name="notification_take_video_call">വീഡിയോ കോൾ അറ്റൻഡ് ചെയ്യുക</string>
+  <string name="incall_error_supp_service_unknown">സേവനം പിന്തുണയ്‌ക്കുന്നില്ല.</string>
+  <string name="goPrivate">സ്വകാര്യം എന്നതിലേക്ക് പോകുക</string>
+  <string name="manageConferenceLabel">കോൺഫറൻസ് കോൾ നിയന്ത്രിക്കുക</string>
+  <string name="child_number">%s വഴി</string>
+  <string name="callFailed_simError">സിം ഇല്ല അല്ലെങ്കിൽ സിം പിശക്</string>
+  <string name="conference_caller_disconnect_content_description">കോള്‍ അവസാനിപ്പിക്കൂ</string>
+  <string name="conference_call_name">കോൺഫറൻസ് കോൾ</string>
+  <string name="generic_conference_call_name">കോളിലാണ്</string>
+  <string name="video_call_wifi_to_lte_handover_toast">മൊബൈൽ ഡാറ്റ ഉപയോഗിച്ച് കോൾ തുടരുന്നു…</string>
+  <string name="video_call_lte_to_wifi_failed_title">വൈഫൈ നെറ്റ്‌വർക്കിലേക്ക് മാറാനായില്ല</string>
+  <string name="video_call_lte_to_wifi_failed_message">മൊബൈൽ നെറ്റ്‌വർക്കിൽത്തന്നെ വീഡിയോ കോൾ തുടരും. സാധാരണ ഡാറ്റ നിരക്കുകൾ ബാധകമാകാം.</string>
+  <string name="video_call_lte_to_wifi_failed_do_not_show">ഇത് വീണ്ടും കാണിക്കരുത്</string>
+  <string name="bubble_return_to_call">കോളിലേക്ക് മടങ്ങുക</string>
+  <string name="rtt_request_dialog_title">RTT കോളിൽ ചേരണോ?</string>
+  <string name="rtt_request_dialog_details">നിങ്ങളുടെ വോയ്‌സ് കോളിൽ %1$s സന്ദേശമയയ്‌ക്കൽ ഉപയോഗിക്കാൻ ആഗ്രഹിക്കുന്നു.</string>
+  <string name="rtt_request_dialog_more_information">ബധിരർ, കേൾവി ശക്തി കുറഞ്ഞവർ, സംഭാഷണ വൈകല്യമുള്ളവർ അല്ലെങ്കിൽ ശബ്‌ദത്തിന് പുറമേ മറ്റ് സഹായവും ആവശ്യമുള്ള, വിളിക്കുന്ന ആളുകളെ RTT സഹായിക്കുന്നു.</string>
+  <string name="rtt_button_decline_request">വേണ്ട</string>
+  <string name="rtt_button_accept_request">RTT-യിൽ ചേരുക</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-mn/strings.xml b/java/com/android/incallui/res/values-mn/strings.xml
index 36b2ddc..a911dba 100644
--- a/java/com/android/incallui/res/values-mn/strings.xml
+++ b/java/com/android/incallui/res/values-mn/strings.xml
@@ -1,79 +1,68 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"Утас"</string>
-    <string name="wait_prompt_str" msgid="3509685348904329594">"Дараах аяуудыг илгээх үү?\n"</string>
-    <string name="pause_prompt_yes" msgid="4642047011233552973">"Тийм"</string>
-    <string name="pause_prompt_no" msgid="4691320111774935838">"Үгүй"</string>
-    <string name="notification_dialing" msgid="9072177265772083826">"Залгаж байна"</string>
-    <string name="notification_ongoing_call" msgid="8712641937577776125">"Хийгдэж буй дуудлага"</string>
-    <string name="notification_ongoing_video_call" msgid="6331318021321487769">"Үргэлжилж буй видео хурал"</string>
-    <string name="notification_ongoing_paused_video_call" msgid="709950253594606371">"Үргэлжилж буй видео хурал ‑ видеог түр завсарлуулсан"</string>
-    <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Залгаж буй албаны дуудлага"</string>
-    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"Үргэлжилж буй <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
-    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"Орж ирсэн <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
-    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"Wi-Fi дуудлага"</string>
-    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"Wi‑Fi ажлын дуудлага"</string>
-    <string name="notification_on_hold" msgid="7141827443379205682">"Хүлээлгэнд"</string>
-    <string name="notification_incoming_call" msgid="7520580807513849283">"Ирж буй дуудлага"</string>
-    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Зураг бүхий орж ирсэн дуудлага"</string>
-    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"Зурвас бүхий орж ирсэн дуудлага"</string>
-    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"Байршил бүхий орж ирсэн дуудлага"</string>
-    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"Зураг болон зурвас бүхий орж ирсэн дуудлага"</string>
-    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"Зураг болон байршил бүхий орж ирсэн дуудлага"</string>
-    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"Зурвас болон байршил бүхий орж ирсэн дуудлага"</string>
-    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"Зураг, зурвас, байршил бүхий орж ирсэн дуудлага"</string>
-    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"Хавсралт бүхий орж ирсэн дуудлага"</string>
-    <string name="important_notification_incoming_call" msgid="2867013954509930989">"Орж ирсэн чухал дуудлага"</string>
-    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"Зураг бүхий орж ирсэн чухал дуудлага"</string>
-    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"Зурвас бүхий орж ирсэн чухал дуудлага"</string>
-    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"Байршил бүхий орж ирсэн чухал дуудлага"</string>
-    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"Зураг, зурвас бүхий орж ирсэн чухал дуудлага"</string>
-    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"Зураг, байршил бүхий орж ирсэн чухал дуудлага"</string>
-    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"Зурвас, байршил бүхий орж ирсэн чухал дуудлага"</string>
-    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Зураг, зурвас, байршилтай орж ирсэн чухал дуудлага"</string>
-    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Хавсралт бүхий орж ирсэн чухал дуудлага"</string>
-    <string name="notification_incoming_work_call" msgid="5291275092734261918">"Ирж буй албаны дуудлага"</string>
-    <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Орж ирсэн сэжигтэй спам дуудлага"</string>
-    <string name="notification_requesting_video_call" msgid="1807679328811515758">"Ирж буй видео хүсэлт"</string>
-    <string name="notification_action_answer" msgid="8748275902211192568">"Хариулах"</string>
-    <string name="notification_action_end_call" msgid="7467258454170007765">"Таслах"</string>
-    <string name="notification_action_answer_video" msgid="8488108892919917287">"Видео"</string>
-    <string name="notification_action_accept" msgid="1272761514200507143">"Зөвшөөрөх"</string>
-    <string name="notification_action_dismiss" msgid="3128241581632616226">"Татгалзах"</string>
-    <string name="notification_action_speaker_on" msgid="1882659234405596540">"Чанга яригчийг асаах"</string>
-    <string name="notification_action_speaker_off" msgid="6340085043115533948">"Чанга яригчийг унтраах"</string>
-    <string name="notification_external_call" msgid="2504334597315343920">"Өөр төхөөрөмж дээр хийгдэж буй дуудлага"</string>
-    <string name="notification_external_video_call" msgid="7709394856028436683">"Өөр төхөөрөмж дээрх үргэлжилж байгаа видео дуудлага"</string>
-    <string name="notification_take_call" msgid="5631659438864492229">"Дуудлага авах"</string>
-    <string name="notification_take_video_call" msgid="4473387503712341390">"Видео дуудлага авах"</string>
-    <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"Дэмжигдээгүй үйлчилгээ байна."</string>
-    <string name="goPrivate" msgid="5269514638004595378">"хувийн яриа"</string>
-    <string name="manageConferenceLabel" msgid="3589379023518128318">"Хурлын дуудлага удирдах"</string>
-    <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"Яаралтай дугаар"</string>
-    <string name="child_number" msgid="3398257437107259682">"<xliff:g id="CHILD_NUMBER">%s</xliff:g>-аар"</string>
-    <string name="callFailed_simError" msgid="4587775795711340072">"SIM байхгүй эсхүл SIM алдаатай"</string>
-    <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Дуудлагыг таслах"</string>
-    <string name="conference_call_name" msgid="8189987124611337174">"Хурлын дуудлага"</string>
-    <string name="generic_conference_call_name" msgid="1546941472424243894">"Ярьж байна"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Мобайл дата ашиглан дуудлагыг үргэлжлүүлж байна…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Wi-Fi сүлжээ рүү сэлгэж чадсангүй"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Видео дуудлага мобайл сүлжээнд үлдэнэ. Стандарт датаны төлбөр тооцогдож магадгүй."</string>
-    <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Үүнийг дахин бүү үзүүл"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="wait_prompt_str">Дараах аяуудыг илгээх үү?\n</string>
+  <string name="pause_prompt_yes">Тийм</string>
+  <string name="pause_prompt_no">Үгүй</string>
+  <string name="notification_dialing">Залгаж байна</string>
+  <string name="notification_ongoing_call">Хийгдэж буй дуудлага</string>
+  <string name="notification_ongoing_video_call">Үргэлжилж буй видео хурал</string>
+  <string name="notification_ongoing_paused_video_call">Үргэлжилж буй видео хурал ‑ видеог түр завсарлуулсан</string>
+  <string name="notification_ongoing_work_call">Залгаж буй албаны дуудлага</string>
+  <string name="notification_ongoing_call_wifi_template">Үргэлжилж буй %1$s</string>
+  <string name="notification_incoming_call_wifi_template">Орж ирсэн %1$s</string>
+  <string name="notification_call_wifi_brand">Wi-Fi дуудлага</string>
+  <string name="notification_call_wifi_work_brand">Wi‑Fi ажлын дуудлага</string>
+  <string name="notification_on_hold">Хүлээлгэнд</string>
+  <string name="notification_incoming_call">Ирж буй дуудлага</string>
+  <string name="notification_incoming_video_call">Ирж буй видео дуудлага</string>
+  <string name="notification_incoming_call_mutli_sim">%1$s-р ирж буй дуудлага</string>
+  <string name="notification_incoming_call_with_photo">Зураг бүхий орж ирсэн дуудлага</string>
+  <string name="notification_incoming_call_with_message">Зурвас бүхий орж ирсэн дуудлага</string>
+  <string name="notification_incoming_call_with_location">Байршил бүхий орж ирсэн дуудлага</string>
+  <string name="notification_incoming_call_with_photo_message">Зураг болон зурвас бүхий орж ирсэн дуудлага</string>
+  <string name="notification_incoming_call_with_photo_location">Зураг болон байршил бүхий орж ирсэн дуудлага</string>
+  <string name="notification_incoming_call_with_message_location">Зурвас болон байршил бүхий орж ирсэн дуудлага</string>
+  <string name="notification_incoming_call_with_photo_message_location">Зураг, зурвас, байршил бүхий орж ирсэн дуудлага</string>
+  <string name="notification_incoming_call_attachments">Хавсралт бүхий орж ирсэн дуудлага</string>
+  <string name="important_notification_incoming_call">Орж ирсэн чухал дуудлага</string>
+  <string name="important_notification_incoming_call_with_photo">Зураг бүхий орж ирсэн чухал дуудлага</string>
+  <string name="important_notification_incoming_call_with_message">Зурвас бүхий орж ирсэн чухал дуудлага</string>
+  <string name="important_notification_incoming_call_with_location">Байршил бүхий орж ирсэн чухал дуудлага</string>
+  <string name="important_notification_incoming_call_with_photo_message">Зураг, зурвас бүхий орж ирсэн чухал дуудлага</string>
+  <string name="important_notification_incoming_call_with_photo_location">Зураг, байршил бүхий орж ирсэн чухал дуудлага</string>
+  <string name="important_notification_incoming_call_with_message_location">Зурвас, байршил бүхий орж ирсэн чухал дуудлага</string>
+  <string name="important_notification_incoming_call_with_photo_message_location">Зураг, зурвас, байршилтай орж ирсэн чухал дуудлага</string>
+  <string name="important_notification_incoming_call_attachments">Хавсралт бүхий орж ирсэн чухал дуудлага</string>
+  <string name="notification_incoming_work_call">Ирж буй албаны дуудлага</string>
+  <string name="notification_incoming_spam_call">Орж ирсэн сэжигтэй спам дуудлага</string>
+  <string name="notification_requesting_video_call">Ирж буй видео хүсэлт</string>
+  <string name="notification_action_answer">Хариулах</string>
+  <string name="notification_action_end_call">Таслах</string>
+  <string name="notification_action_answer_video">Видео</string>
+  <string name="notification_action_accept">Зөвшөөрөх</string>
+  <string name="notification_action_dismiss">Татгалзах</string>
+  <string name="notification_action_speaker_on">Чанга яригчийг асаах</string>
+  <string name="notification_action_speaker_off">Чанга яригчийг унтраах</string>
+  <string name="notification_external_call">Өөр төхөөрөмж дээр хийгдэж буй дуудлага</string>
+  <string name="notification_external_video_call">Өөр төхөөрөмж дээрх үргэлжилж байгаа видео дуудлага</string>
+  <string name="notification_take_call">Дуудлага авах</string>
+  <string name="notification_take_video_call">Видео дуудлага авах</string>
+  <string name="incall_error_supp_service_unknown">Дэмжигдээгүй үйлчилгээ байна.</string>
+  <string name="goPrivate">хувийн яриа</string>
+  <string name="manageConferenceLabel">Хурлын дуудлага удирдах</string>
+  <string name="child_number">%s-аар</string>
+  <string name="callFailed_simError">SIM байхгүй эсхүл SIM алдаатай</string>
+  <string name="conference_caller_disconnect_content_description">Дуудлагыг таслах</string>
+  <string name="conference_call_name">Хурлын дуудлага</string>
+  <string name="generic_conference_call_name">Ярьж байна</string>
+  <string name="video_call_wifi_to_lte_handover_toast">Мобайл дата ашиглан дуудлагыг үргэлжлүүлж байна…</string>
+  <string name="video_call_lte_to_wifi_failed_title">Wi-Fi сүлжээ рүү сэлгэж чадсангүй</string>
+  <string name="video_call_lte_to_wifi_failed_message">Видео дуудлага мобайл сүлжээнд үлдэнэ. Стандарт датаны төлбөр тооцогдож магадгүй.</string>
+  <string name="video_call_lte_to_wifi_failed_do_not_show">Үүнийг дахин бүү үзүүл</string>
+  <string name="bubble_return_to_call">Дуудлага руу буцах</string>
+  <string name="rtt_request_dialog_title">RTT дуудлагад оролцох уу?</string>
+  <string name="rtt_request_dialog_details">%1$s таны дуудлага дотор мессеж бичихийг хүсч байна.</string>
+  <string name="rtt_request_dialog_more_information">RTT нь дүлий, хатуу чихтэй, хэл ярианы хөгжлийн бэрхшээлтэй, эсвэл хэн нэгний тусламжтай ярьдаг дуудлага хийгчдэд тусладаг.</string>
+  <string name="rtt_button_decline_request">Үгүй</string>
+  <string name="rtt_button_accept_request">RTT-д нэгдэх</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-mr/strings.xml b/java/com/android/incallui/res/values-mr/strings.xml
index 961f80e..586f08b 100644
--- a/java/com/android/incallui/res/values-mr/strings.xml
+++ b/java/com/android/incallui/res/values-mr/strings.xml
@@ -1,79 +1,68 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"फोन"</string>
-    <string name="wait_prompt_str" msgid="3509685348904329594">"खालील टोन पाठवायचे?\n"</string>
-    <string name="pause_prompt_yes" msgid="4642047011233552973">"होय"</string>
-    <string name="pause_prompt_no" msgid="4691320111774935838">"नाही"</string>
-    <string name="notification_dialing" msgid="9072177265772083826">"डायल करीत आहे"</string>
-    <string name="notification_ongoing_call" msgid="8712641937577776125">"सुरू असलेला कॉल"</string>
-    <string name="notification_ongoing_video_call" msgid="6331318021321487769">"सुरू असलेला व्हिडिओ कॉल"</string>
-    <string name="notification_ongoing_paused_video_call" msgid="709950253594606371">"सुरू असलेला व्हिडिओ कॉल ‑ व्हिडिओ थांबवला"</string>
-    <string name="notification_ongoing_work_call" msgid="3189581218078981547">"सुरु असलेला कार्य कॉल"</string>
-    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"चालू असलेले <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
-    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"येणारे <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
-    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"वाय-फाय कॉल"</string>
-    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"वाय-फाय कार्य कॉल"</string>
-    <string name="notification_on_hold" msgid="7141827443379205682">"होल्ड वर"</string>
-    <string name="notification_incoming_call" msgid="7520580807513849283">"येणारा कॉल"</string>
-    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"फोटोसह येणारा कॉल"</string>
-    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"संदेशासह येणारा कॉल"</string>
-    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"स्थानासह येणारा कॉल"</string>
-    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"फोटो आणि संदेशासह येणारा कॉल"</string>
-    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"फोटो आणि स्थानासह येणारा कॉल"</string>
-    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"संदेश आणि स्थानासह येणारा कॉल"</string>
-    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"फोटो, संदेश आणि स्थानासह येणारा कॉल"</string>
-    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"संलग्नकांसह येणारा कॉल"</string>
-    <string name="important_notification_incoming_call" msgid="2867013954509930989">"महत्त्वाचा येणारा कॉल"</string>
-    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"फोटोसह महत्त्वाचा येणारा कॉल"</string>
-    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"संदेशासह महत्त्वाचा येणारा कॉल"</string>
-    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"स्थानासह महत्त्वाचा येणारा कॉल"</string>
-    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"फोटो आणि संदेशासह महत्त्वाचा येणारा कॉल"</string>
-    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"फोटो आणि स्थानासह महत्त्वाचा येणारा कॉल"</string>
-    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"संदेश आणि स्थानासह महत्त्वाचा येणारा कॉल"</string>
-    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"फोटो, संदेश आणि स्थानासह महत्त्वाचा येणारा कॉल"</string>
-    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"संलग्नकांसह महत्त्वाचा येणारा कॉल"</string>
-    <string name="notification_incoming_work_call" msgid="5291275092734261918">"येणारा कार्य कॉल"</string>
-    <string name="notification_incoming_spam_call" msgid="7591506944666791937">"येणारा संशयित स्पॅम कॉल"</string>
-    <string name="notification_requesting_video_call" msgid="1807679328811515758">"येणारी व्हिडिओ विनंती"</string>
-    <string name="notification_action_answer" msgid="8748275902211192568">"उत्तर"</string>
-    <string name="notification_action_end_call" msgid="7467258454170007765">"हँग अप"</string>
-    <string name="notification_action_answer_video" msgid="8488108892919917287">"व्हिडिओ"</string>
-    <string name="notification_action_accept" msgid="1272761514200507143">"स्वीकारा"</string>
-    <string name="notification_action_dismiss" msgid="3128241581632616226">"नकार द्या"</string>
-    <string name="notification_action_speaker_on" msgid="1882659234405596540">"स्पीकर चालू करा"</string>
-    <string name="notification_action_speaker_off" msgid="6340085043115533948">"स्पीकर बंद करा"</string>
-    <string name="notification_external_call" msgid="2504334597315343920">"दुसऱ्या डिव्हाइसवर सुरु असलेला कॉल"</string>
-    <string name="notification_external_video_call" msgid="7709394856028436683">"दुसऱ्या डिव्हाइसवर सुरु असलेला व्हिडिओ कॉल"</string>
-    <string name="notification_take_call" msgid="5631659438864492229">"कॉल घ्या"</string>
-    <string name="notification_take_video_call" msgid="4473387503712341390">"व्हिडिओ कॉल घ्या"</string>
-    <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"सेवा समर्थित नाही."</string>
-    <string name="goPrivate" msgid="5269514638004595378">"खाजगी जा"</string>
-    <string name="manageConferenceLabel" msgid="3589379023518128318">"परिषद कॉल व्यवस्थापित करा"</string>
-    <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"आणीबाणीचा नंबर"</string>
-    <string name="child_number" msgid="3398257437107259682">"<xliff:g id="CHILD_NUMBER">%s</xliff:g> द्वारा"</string>
-    <string name="callFailed_simError" msgid="4587775795711340072">"सिम नाही किंवा सिम त्रुटी"</string>
-    <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"कॉल समाप्त करा"</string>
-    <string name="conference_call_name" msgid="8189987124611337174">"परिषद कॉल"</string>
-    <string name="generic_conference_call_name" msgid="1546941472424243894">"कॉल मध्ये"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"मोबाइल डेटा वापरून कॉल करणे सुरु ठेवत आहे..."</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"वाय-फाय नेटवर्कवर स्विच करणे शक्य झाले नाही"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"व्हिडिओ कॉल मोबाइल नेटवर्कवर असेल. मानक डेटा शुल्क लागू शकतात."</string>
-    <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"हे पुन्हा दर्शवू नका"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="wait_prompt_str">खालील टोन पाठवायचे?\n</string>
+  <string name="pause_prompt_yes">होय</string>
+  <string name="pause_prompt_no">नाही</string>
+  <string name="notification_dialing">डायल करत आहे</string>
+  <string name="notification_ongoing_call">सुरू असलेला कॉल</string>
+  <string name="notification_ongoing_video_call">सुरू असलेला व्हिडिओ कॉल</string>
+  <string name="notification_ongoing_paused_video_call">सुरू असलेला व्हिडिओ कॉल ‑ व्हिडिओ थांबवला</string>
+  <string name="notification_ongoing_work_call">सुरु असलेला कार्य कॉल</string>
+  <string name="notification_ongoing_call_wifi_template">चालू असलेले %1$s</string>
+  <string name="notification_incoming_call_wifi_template">येणारे %1$s</string>
+  <string name="notification_call_wifi_brand">वाय-फाय कॉल</string>
+  <string name="notification_call_wifi_work_brand">वाय-फाय कार्य कॉल</string>
+  <string name="notification_on_hold">होल्ड वर</string>
+  <string name="notification_incoming_call">येणारा कॉल</string>
+  <string name="notification_incoming_video_call">येणारा व्हिडिओ कॉल</string>
+  <string name="notification_incoming_call_mutli_sim">%1$s वरून इनकमिंग कॉल</string>
+  <string name="notification_incoming_call_with_photo">फोटोसह येणारा कॉल</string>
+  <string name="notification_incoming_call_with_message">संदेशासह येणारा कॉल</string>
+  <string name="notification_incoming_call_with_location">स्थानासह येणारा कॉल</string>
+  <string name="notification_incoming_call_with_photo_message">फोटो आणि संदेशासह येणारा कॉल</string>
+  <string name="notification_incoming_call_with_photo_location">फोटो आणि स्थानासह येणारा कॉल</string>
+  <string name="notification_incoming_call_with_message_location">मेसेज आणि स्थानासह येणारा कॉल</string>
+  <string name="notification_incoming_call_with_photo_message_location">फोटो, मेसेज आणि स्थानासह येणारा कॉल</string>
+  <string name="notification_incoming_call_attachments">संलग्नकांसह येणारा कॉल</string>
+  <string name="important_notification_incoming_call">महत्त्वाचा येणारा कॉल</string>
+  <string name="important_notification_incoming_call_with_photo">फोटोसह महत्त्वाचा येणारा कॉल</string>
+  <string name="important_notification_incoming_call_with_message">संदेशासह महत्त्वाचा येणारा कॉल</string>
+  <string name="important_notification_incoming_call_with_location">स्थानासह महत्त्वाचा येणारा कॉल</string>
+  <string name="important_notification_incoming_call_with_photo_message">फोटो आणि संदेशासह महत्त्वाचा येणारा कॉल</string>
+  <string name="important_notification_incoming_call_with_photo_location">फोटो आणि स्थानासह महत्त्वाचा येणारा कॉल</string>
+  <string name="important_notification_incoming_call_with_message_location">मेसेज आणि स्थानासह महत्त्वाचा येणारा कॉल</string>
+  <string name="important_notification_incoming_call_with_photo_message_location">फोटो, मेसेज आणि स्थानासह महत्त्वाचा येणारा कॉल</string>
+  <string name="important_notification_incoming_call_attachments">संलग्नकांसह महत्त्वाचा येणारा कॉल</string>
+  <string name="notification_incoming_work_call">येणारा कार्य कॉल</string>
+  <string name="notification_incoming_spam_call">येणारा संशयित स्पॅम कॉल</string>
+  <string name="notification_requesting_video_call">येणारी व्हिडिओ विनंती</string>
+  <string name="notification_action_answer">उत्तर</string>
+  <string name="notification_action_end_call">हँग अप</string>
+  <string name="notification_action_answer_video">व्हिडिओ</string>
+  <string name="notification_action_accept">स्वीकारा</string>
+  <string name="notification_action_dismiss">नकार द्या</string>
+  <string name="notification_action_speaker_on">स्पीकर चालू करा</string>
+  <string name="notification_action_speaker_off">स्पीकर बंद करा</string>
+  <string name="notification_external_call">दुसऱ्या डिव्हाइसवर सुरु असलेला कॉल</string>
+  <string name="notification_external_video_call">दुसऱ्या डिव्हाइसवर सुरु असलेला व्हिडिओ कॉल</string>
+  <string name="notification_take_call">कॉल घ्या</string>
+  <string name="notification_take_video_call">व्हिडिओ कॉल घ्या</string>
+  <string name="incall_error_supp_service_unknown">सेवा समर्थित नाही.</string>
+  <string name="goPrivate">खाजगी जा</string>
+  <string name="manageConferenceLabel">परिषद कॉल व्यवस्थापित करा</string>
+  <string name="child_number">%s द्वारा</string>
+  <string name="callFailed_simError">सिम नाही किंवा सिम एरर</string>
+  <string name="conference_caller_disconnect_content_description">कॉल समाप्त करा</string>
+  <string name="conference_call_name">परिषद कॉल</string>
+  <string name="generic_conference_call_name">कॉल मध्ये</string>
+  <string name="video_call_wifi_to_lte_handover_toast">मोबाइल डेटा वापरून कॉल करणे सुरु ठेवत आहे...</string>
+  <string name="video_call_lte_to_wifi_failed_title">वाय-फाय नेटवर्कवर स्विच करणे शक्य झाले नाही</string>
+  <string name="video_call_lte_to_wifi_failed_message">व्हिडिओ कॉल मोबाइल नेटवर्कवर असेल. मानक डेटा शुल्क लागू शकतात.</string>
+  <string name="video_call_lte_to_wifi_failed_do_not_show">हे पुन्हा दर्शवू नका</string>
+  <string name="bubble_return_to_call">कॉलवर परत जा</string>
+  <string name="rtt_request_dialog_title">RTT कॉलमध्‍ये सामील व्‍हायचे?</string>
+  <string name="rtt_request_dialog_details">%1$s ला तुमच्‍या व्‍हॉइस कॉलमध्‍ये मेसेजिंग वापरायचे आहे.</string>
+  <string name="rtt_request_dialog_more_information">RTT अशा कॉलरना साहाय्य करते जे बहिरे असतात, कमी ऐकू येते किंवा बोलताना अडखळतात किंवा ज्‍यांना फक्‍त आवाज पुरेसा नसतो.</string>
+  <string name="rtt_button_decline_request">नाही नको</string>
+  <string name="rtt_button_accept_request">RTT मध्‍ये सामील व्‍हा</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-ms/strings.xml b/java/com/android/incallui/res/values-ms/strings.xml
index e2220c7..bd72120 100644
--- a/java/com/android/incallui/res/values-ms/strings.xml
+++ b/java/com/android/incallui/res/values-ms/strings.xml
@@ -1,79 +1,68 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"Telefon"</string>
-    <string name="wait_prompt_str" msgid="3509685348904329594">"Hantar nada berikut?\n"</string>
-    <string name="pause_prompt_yes" msgid="4642047011233552973">"Ya"</string>
-    <string name="pause_prompt_no" msgid="4691320111774935838">"Tidak"</string>
-    <string name="notification_dialing" msgid="9072177265772083826">"Mendail"</string>
-    <string name="notification_ongoing_call" msgid="8712641937577776125">"Panggilan sedang berjalan"</string>
-    <string name="notification_ongoing_video_call" msgid="6331318021321487769">"Panggilan video sedang berlangsung"</string>
-    <string name="notification_ongoing_paused_video_call" msgid="709950253594606371">"Panggilan video sedang berlangsung ‑ video dijeda"</string>
-    <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Panggilan sedang berlangsung daripada tempat kerja"</string>
-    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"<xliff:g id="BRAND_NAME">%1$s</xliff:g> sedang berlangsung"</string>
-    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"<xliff:g id="BRAND_NAME">%1$s</xliff:g> masuk"</string>
-    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"Panggilan Wi-Fi"</string>
-    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"Panggilan Wi‑Fi daripada tempat kerja"</string>
-    <string name="notification_on_hold" msgid="7141827443379205682">"Ditunda"</string>
-    <string name="notification_incoming_call" msgid="7520580807513849283">"Panggilan masuk"</string>
-    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Panggilan masuk dengan foto"</string>
-    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"Panggilan masuk dengan mesej"</string>
-    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"Panggilan masuk dengan lokasi"</string>
-    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"Panggilan masuk dengan foto dan mesej"</string>
-    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"Panggilan masuk dengan foto dan lokasi"</string>
-    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"Panggilan masuk dengan mesej dan lokasi"</string>
-    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"Panggilan masuk dengan foto, mesej dan lokasi"</string>
-    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"Panggilan masuk dengan lampiran"</string>
-    <string name="important_notification_incoming_call" msgid="2867013954509930989">"Panggilan masuk penting"</string>
-    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"Panggilan masuk penting dengan foto"</string>
-    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"Panggilan masuk penting dengan mesej"</string>
-    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"Panggilan masuk penting dengan lokasi"</string>
-    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"Panggilan masuk penting dengan foto dan mesej"</string>
-    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"Panggilan masuk penting dengan foto dan lokasi"</string>
-    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"Panggilan masuk penting dengan mesej dan lokasi"</string>
-    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Panggilan masuk penting dengan foto, mesej dan lokasi"</string>
-    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Panggilan masuk penting dengan lampiran"</string>
-    <string name="notification_incoming_work_call" msgid="5291275092734261918">"Panggilan masuk daripada tempat kerja"</string>
-    <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Disyaki panggilan spam masuk"</string>
-    <string name="notification_requesting_video_call" msgid="1807679328811515758">"Permintaan video masuk"</string>
-    <string name="notification_action_answer" msgid="8748275902211192568">"Jawapan"</string>
-    <string name="notification_action_end_call" msgid="7467258454170007765">"Letakkan gagang"</string>
-    <string name="notification_action_answer_video" msgid="8488108892919917287">"Video"</string>
-    <string name="notification_action_accept" msgid="1272761514200507143">"Terima"</string>
-    <string name="notification_action_dismiss" msgid="3128241581632616226">"Tolak"</string>
-    <string name="notification_action_speaker_on" msgid="1882659234405596540">"Hidupkan pembesar suara"</string>
-    <string name="notification_action_speaker_off" msgid="6340085043115533948">"Matikan pembesar suara"</string>
-    <string name="notification_external_call" msgid="2504334597315343920">"Panggilan sedang berlangsung pada peranti lain"</string>
-    <string name="notification_external_video_call" msgid="7709394856028436683">"Panggilan video sedang berlangsung pada peranti lain"</string>
-    <string name="notification_take_call" msgid="5631659438864492229">"Jawab Panggilan"</string>
-    <string name="notification_take_video_call" msgid="4473387503712341390">"Jawab Panggilan Video"</string>
-    <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"Perkhidmatan tidak disokong."</string>
-    <string name="goPrivate" msgid="5269514638004595378">"jadi tertutup"</string>
-    <string name="manageConferenceLabel" msgid="3589379023518128318">"Urus panggilan sidang"</string>
-    <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"Nombor kecemasan"</string>
-    <string name="child_number" msgid="3398257437107259682">"melalui <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
-    <string name="callFailed_simError" msgid="4587775795711340072">"Tiada SIM atau ralat SIM"</string>
-    <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Tamatkan panggilan"</string>
-    <string name="conference_call_name" msgid="8189987124611337174">"Panggilan sidang"</string>
-    <string name="generic_conference_call_name" msgid="1546941472424243894">"Dalam panggilan"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Meneruskan panggilan menggunakan data mudah alih…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Tidak dapat beralih ke rangkaian Wi-Fi"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Panggilan video akan menggunakan rangkaian mudah alih. Caj data standard boleh dikenakan."</string>
-    <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Jangan tunjukkan ini lagi"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="wait_prompt_str">Hantar nada berikut?\n</string>
+  <string name="pause_prompt_yes">Ya</string>
+  <string name="pause_prompt_no">Tidak</string>
+  <string name="notification_dialing">Mendail</string>
+  <string name="notification_ongoing_call">Panggilan sedang berjalan</string>
+  <string name="notification_ongoing_video_call">Panggilan video sedang berlangsung</string>
+  <string name="notification_ongoing_paused_video_call">Panggilan video sedang berlangsung ‑ video dijeda</string>
+  <string name="notification_ongoing_work_call">Panggilan sedang berlangsung daripada tempat kerja</string>
+  <string name="notification_ongoing_call_wifi_template">%1$s sedang berlangsung</string>
+  <string name="notification_incoming_call_wifi_template">%1$s masuk</string>
+  <string name="notification_call_wifi_brand">Panggilan Wi-Fi</string>
+  <string name="notification_call_wifi_work_brand">Panggilan Wi‑Fi daripada tempat kerja</string>
+  <string name="notification_on_hold">Ditunda</string>
+  <string name="notification_incoming_call">Panggilan masuk</string>
+  <string name="notification_incoming_video_call">Panggilan video masuk</string>
+  <string name="notification_incoming_call_mutli_sim">Panggilan masuk melalui %1$s</string>
+  <string name="notification_incoming_call_with_photo">Panggilan masuk dengan foto</string>
+  <string name="notification_incoming_call_with_message">Panggilan masuk dengan mesej</string>
+  <string name="notification_incoming_call_with_location">Panggilan masuk dengan lokasi</string>
+  <string name="notification_incoming_call_with_photo_message">Panggilan masuk dengan foto dan mesej</string>
+  <string name="notification_incoming_call_with_photo_location">Panggilan masuk dengan foto dan lokasi</string>
+  <string name="notification_incoming_call_with_message_location">Panggilan masuk dengan mesej dan lokasi</string>
+  <string name="notification_incoming_call_with_photo_message_location">Panggilan masuk dengan foto, mesej dan lokasi</string>
+  <string name="notification_incoming_call_attachments">Panggilan masuk dengan lampiran</string>
+  <string name="important_notification_incoming_call">Panggilan masuk penting</string>
+  <string name="important_notification_incoming_call_with_photo">Panggilan masuk penting dengan foto</string>
+  <string name="important_notification_incoming_call_with_message">Panggilan masuk penting dengan mesej</string>
+  <string name="important_notification_incoming_call_with_location">Panggilan masuk penting dengan lokasi</string>
+  <string name="important_notification_incoming_call_with_photo_message">Panggilan masuk penting dengan foto dan mesej</string>
+  <string name="important_notification_incoming_call_with_photo_location">Panggilan masuk penting dengan foto dan lokasi</string>
+  <string name="important_notification_incoming_call_with_message_location">Panggilan masuk penting dengan mesej dan lokasi</string>
+  <string name="important_notification_incoming_call_with_photo_message_location">Panggilan masuk penting dengan foto, mesej dan lokasi</string>
+  <string name="important_notification_incoming_call_attachments">Panggilan masuk penting dengan lampiran</string>
+  <string name="notification_incoming_work_call">Panggilan masuk daripada tempat kerja</string>
+  <string name="notification_incoming_spam_call">Disyaki panggilan spam masuk</string>
+  <string name="notification_requesting_video_call">Permintaan video masuk</string>
+  <string name="notification_action_answer">Jawapan</string>
+  <string name="notification_action_end_call">Letakkan gagang</string>
+  <string name="notification_action_answer_video">Video</string>
+  <string name="notification_action_accept">Terima</string>
+  <string name="notification_action_dismiss">Tolak</string>
+  <string name="notification_action_speaker_on">Hidupkan pembesar suara</string>
+  <string name="notification_action_speaker_off">Matikan pembesar suara</string>
+  <string name="notification_external_call">Panggilan sedang berlangsung pada peranti lain</string>
+  <string name="notification_external_video_call">Panggilan video sedang berlangsung pada peranti lain</string>
+  <string name="notification_take_call">Jawab Panggilan</string>
+  <string name="notification_take_video_call">Jawab Panggilan Video</string>
+  <string name="incall_error_supp_service_unknown">Perkhidmatan tidak disokong.</string>
+  <string name="goPrivate">jadi tertutup</string>
+  <string name="manageConferenceLabel">Urus panggilan sidang</string>
+  <string name="child_number">melalui %s</string>
+  <string name="callFailed_simError">Tiada SIM atau ralat SIM</string>
+  <string name="conference_caller_disconnect_content_description">Tamatkan panggilan</string>
+  <string name="conference_call_name">Panggilan sidang</string>
+  <string name="generic_conference_call_name">Dalam panggilan</string>
+  <string name="video_call_wifi_to_lte_handover_toast">Meneruskan panggilan menggunakan data mudah alih…</string>
+  <string name="video_call_lte_to_wifi_failed_title">Tidak dapat beralih ke rangkaian Wi-Fi</string>
+  <string name="video_call_lte_to_wifi_failed_message">Panggilan video akan menggunakan rangkaian mudah alih. Caj data standard boleh dikenakan.</string>
+  <string name="video_call_lte_to_wifi_failed_do_not_show">Jangan tunjukkan ini lagi</string>
+  <string name="bubble_return_to_call">Kembali ke panggilan</string>
+  <string name="rtt_request_dialog_title">Sertai panggilan RTT?</string>
+  <string name="rtt_request_dialog_details">%1$s mahu menggunakan pemesejan dalam panggilan suara anda.</string>
+  <string name="rtt_request_dialog_more_information">RTT membantu pemanggil yang pekak, kurang pendengaran, mengalami kesukaran bertutur atau memerlukan ciri selain suara.</string>
+  <string name="rtt_button_decline_request">Tidak perlu</string>
+  <string name="rtt_button_accept_request">Sertai RTT</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-my/strings.xml b/java/com/android/incallui/res/values-my/strings.xml
index 312b27b..d543708 100644
--- a/java/com/android/incallui/res/values-my/strings.xml
+++ b/java/com/android/incallui/res/values-my/strings.xml
@@ -1,79 +1,68 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"ဖုန်း"</string>
-    <string name="wait_prompt_str" msgid="3509685348904329594">"အောက်ပါ တီးလုံးများကို ပို့မလား?\n"</string>
-    <string name="pause_prompt_yes" msgid="4642047011233552973">"Yes"</string>
-    <string name="pause_prompt_no" msgid="4691320111774935838">"No"</string>
-    <string name="notification_dialing" msgid="9072177265772083826">"ခေါ်ဆိုနေသည်"</string>
-    <string name="notification_ongoing_call" msgid="8712641937577776125">"ဆက်သွားနေသော ဖုန်းခေါ်မှု"</string>
-    <string name="notification_ongoing_video_call" msgid="6331318021321487769">"လက်ရှိ ဗီဒီယိုခေါ်ဆိုမှု"</string>
-    <string name="notification_ongoing_paused_video_call" msgid="709950253594606371">"လက်ရှိ ဗီဒီယိုခေါ်ဆိုမှု − ဗီဒီယိုကို ခေတ္တရပ်ထားသည်"</string>
-    <string name="notification_ongoing_work_call" msgid="3189581218078981547">"ခေါ်နေဆဲ အလုပ်မှ ခေါ်ဆိုမှု"</string>
-    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"လက်ရှိပြောနေခြင်း <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
-    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"အဝင်ခေါ်ဆိုမှု <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
-    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"Wi‑Fi ခေါ်ဆိုမှု"</string>
-    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"Wi‑Fi အလုပ်ဖုန်းခေါ်ဆိုမှု"</string>
-    <string name="notification_on_hold" msgid="7141827443379205682">"ခဏ ကိုင်ထားစဉ်"</string>
-    <string name="notification_incoming_call" msgid="7520580807513849283">"အဝင်ခေါ်ဆိုမှု"</string>
-    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"ဓာတ်ပုံဖြင့် အဝင်ခေါ်ဆိုမှု"</string>
-    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"မက်ဆေ့ဂျ်ဖြင့် အဝင်ခေါ်ဆိုမှု"</string>
-    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"တည်နေရာဖြင့် အဝင်ခေါ်ဆိုမှု"</string>
-    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"ဓာတ်ပုံနှင့် မက်ဆေ့ဂျ်တို့ဖြင့် အဝင်ခေါ်ဆိုမှု"</string>
-    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"ဓာတ်ပုံနှင့် တည်နေရာတို့ဖြင့် အဝင်ခေါ်ဆိုမှု"</string>
-    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"မက်ဆေ့ဂျ်နှင့် တည်နေရာတို့ဖြင့် အဝင်ခေါ်ဆိုမှု"</string>
-    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"ဓာတ်ပုံ၊ မက်ဆေ့ဂျ်၊ တည်နေရာဖြင့် အဝင်ခေါ်ဆိုမှု"</string>
-    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"ပူးတွဲပါဖိုင်များဖြင့် အဝင်ခေါ်ဆိုမှု"</string>
-    <string name="important_notification_incoming_call" msgid="2867013954509930989">"အရေးကြီးသော အဝင်ခေါ်ဆိုမှု"</string>
-    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"ဓာတ်ပုံဖြင့် အရေးကြီးသော အဝင်ခေါ်ဆိုမှု"</string>
-    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"မက်ဆေ့ဂျ်ဖြင့် အရေးကြီးသော အဝင်ခေါ်ဆိုမှု"</string>
-    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"တည်နေရာဖြင့် အရေးကြီးသော အဝင်ခေါ်ဆိုမှု"</string>
-    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"ဓာတ်ပုံနှင့် မက်ဆေ့ဂျ်ဖြင့် အရေးကြီးသောခေါ်ဆိုမှု"</string>
-    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"ဓာတ်ပုံနှင့် တည်နေရာဖြင့် အရေးကြီးသောခေါ်ဆိုမှု"</string>
-    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"မက်ဆေ့ဂျ်နှင့် တည်နေရာဖြင့် အရေးကြီးသောခေါ်ဆိုမှု"</string>
-    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"ဓာတ်ပုံ၊မက်ဆေ့ဂျ်၊တည်နေရာဖြင့် အရေးကြီးခေါ်ဆိုမှု"</string>
-    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"ပူးတွဲပါဖိုင်များဖြင့် အရေးကြီးသော အဝင်ခေါ်ဆိုမှု"</string>
-    <string name="notification_incoming_work_call" msgid="5291275092734261918">"အဝင် ခေါ်ဆိုမှု"</string>
-    <string name="notification_incoming_spam_call" msgid="7591506944666791937">"ခေါ်နေသော မသင်္ကာဖွယ်ရာ စပမ်းခေါ်ဆိုမှု"</string>
-    <string name="notification_requesting_video_call" msgid="1807679328811515758">"အသံ ခေါ်ဆိုမှုအဖြစ် တောင်းဆိုမှု"</string>
-    <string name="notification_action_answer" msgid="8748275902211192568">"အဖြေ"</string>
-    <string name="notification_action_end_call" msgid="7467258454170007765">"ဖုန်းချလိုက်ပါပြီ"</string>
-    <string name="notification_action_answer_video" msgid="8488108892919917287">"ဗီဒီယို"</string>
-    <string name="notification_action_accept" msgid="1272761514200507143">"လက်ခံရန်"</string>
-    <string name="notification_action_dismiss" msgid="3128241581632616226">"ငြင်းပယ်ရန်"</string>
-    <string name="notification_action_speaker_on" msgid="1882659234405596540">"စပီကာ ဖွင့်ပါ"</string>
-    <string name="notification_action_speaker_off" msgid="6340085043115533948">"စပီကာ ပိတ်ပါ"</string>
-    <string name="notification_external_call" msgid="2504334597315343920">"အခြားကိရိယာတွင် လက်ရှိခေါ်ဆိုနေမှု"</string>
-    <string name="notification_external_video_call" msgid="7709394856028436683">"အခြားကိရိယာရှိ လက်ရှိဗီဒီယိုခေါ်ဆိုမှု"</string>
-    <string name="notification_take_call" msgid="5631659438864492229">"ဖုန်းခေါ်ဆိုမှုလွှဲယူပါ"</string>
-    <string name="notification_take_video_call" msgid="4473387503712341390">"ဗီဒီယိုခေါ်ဆိုမှုလွှဲယူပါ"</string>
-    <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"ဤဝန်ဆောင်မှုအား မပံ့ပိုးပါ။"</string>
-    <string name="goPrivate" msgid="5269514638004595378">"ပရိုက်ဗိတ်သို့ သွားပါ"</string>
-    <string name="manageConferenceLabel" msgid="3589379023518128318">"အစည်းအဝေးခေါ်ဆိုမှုကို စီမံခန့်ခွဲပါ"</string>
-    <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"အရေးပေါ်နံပါတ်"</string>
-    <string name="child_number" msgid="3398257437107259682">"<xliff:g id="CHILD_NUMBER">%s</xliff:g>မှတစ်ဆင့်"</string>
-    <string name="callFailed_simError" msgid="4587775795711340072">"ဆင်းမ်ကဒ်မရှိ သို့မဟုတ် ဆင်းမ်ကဒ်အမှား"</string>
-    <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"ခေါ်ဆိုမှုအပြီးသတ်ရန်"</string>
-    <string name="conference_call_name" msgid="8189987124611337174">"အစည်းအဝေးခေါ်ဆိုမှု"</string>
-    <string name="generic_conference_call_name" msgid="1546941472424243894">"ဖုန်းပြောနေသည်"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"မိုဘိုင်းဒေတာသုံးပြီး ဆက်လက်ခေါ်ဆိုနေသည်…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Wi‑Fi ကွန်ရက်သို့ မပြောင်းနိုင်ပါ"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"ဗီဒီယိုခေါ်ဆိုမှုသည် မိုဘိုင်းကွန်ရက်တွင် ဆက်ရှိနေပါမည်။ ပုံမှန်ဒေတာသုံးစွဲခများ ကျသင့်နိုင်ပါသည်။"</string>
-    <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"ဤသည်ကို ထပ်မပြပါနှင့်"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="wait_prompt_str">အောက်ပါ တီးလုံးများကို ပို့မလား?\n</string>
+  <string name="pause_prompt_yes">Yes</string>
+  <string name="pause_prompt_no">No</string>
+  <string name="notification_dialing">ခေါ်ဆိုနေသည်</string>
+  <string name="notification_ongoing_call">ဆက်သွားနေသော ဖုန်းခေါ်မှု</string>
+  <string name="notification_ongoing_video_call">လက်ရှိ ဗီဒီယိုခေါ်ဆိုမှု</string>
+  <string name="notification_ongoing_paused_video_call">လက်ရှိ ဗီဒီယိုခေါ်ဆိုမှု − ဗီဒီယိုကို ခေတ္တရပ်ထားသည်</string>
+  <string name="notification_ongoing_work_call">ခေါ်နေဆဲ အလုပ်မှ ခေါ်ဆိုမှု</string>
+  <string name="notification_ongoing_call_wifi_template">လက်ရှိပြောနေခြင်း %1$s</string>
+  <string name="notification_incoming_call_wifi_template">အဝင်ခေါ်ဆိုမှု %1$s</string>
+  <string name="notification_call_wifi_brand">Wi‑Fi ခေါ်ဆိုမှု</string>
+  <string name="notification_call_wifi_work_brand">Wi‑Fi အလုပ်ဖုန်းခေါ်ဆိုမှု</string>
+  <string name="notification_on_hold">ခဏ ကိုင်ထားစဉ်</string>
+  <string name="notification_incoming_call">အဝင်ခေါ်ဆိုမှု</string>
+  <string name="notification_incoming_video_call">ဝင်လာသည့် ဗီဒီယို ခေါ်ဆိုမှု</string>
+  <string name="notification_incoming_call_mutli_sim">%1$s မှတစ်ဆင့် အဝင်ခေါ်ဆိုမှု</string>
+  <string name="notification_incoming_call_with_photo">ဓာတ်ပုံဖြင့် အဝင်ခေါ်ဆိုမှု</string>
+  <string name="notification_incoming_call_with_message">မက်ဆေ့ဂျ်ဖြင့် အဝင်ခေါ်ဆိုမှု</string>
+  <string name="notification_incoming_call_with_location">တည်နေရာဖြင့် အဝင်ခေါ်ဆိုမှု</string>
+  <string name="notification_incoming_call_with_photo_message">ဓာတ်ပုံနှင့် မက်ဆေ့ဂျ်တို့ဖြင့် အဝင်ခေါ်ဆိုမှု</string>
+  <string name="notification_incoming_call_with_photo_location">ဓာတ်ပုံနှင့် တည်နေရာတို့ဖြင့် အဝင်ခေါ်ဆိုမှု</string>
+  <string name="notification_incoming_call_with_message_location">မက်ဆေ့ဂျ်နှင့် တည်နေရာတို့ဖြင့် အဝင်ခေါ်ဆိုမှု</string>
+  <string name="notification_incoming_call_with_photo_message_location">ဓာတ်ပုံ၊ မက်ဆေ့ဂျ်၊ တည်နေရာဖြင့် အဝင်ခေါ်ဆိုမှု</string>
+  <string name="notification_incoming_call_attachments">ပူးတွဲပါဖိုင်များဖြင့် အဝင်ခေါ်ဆိုမှု</string>
+  <string name="important_notification_incoming_call">အရေးကြီးသော အဝင်ခေါ်ဆိုမှု</string>
+  <string name="important_notification_incoming_call_with_photo">ဓာတ်ပုံဖြင့် အရေးကြီးသော အဝင်ခေါ်ဆိုမှု</string>
+  <string name="important_notification_incoming_call_with_message">မက်ဆေ့ဂျ်ဖြင့် အရေးကြီးသော အဝင်ခေါ်ဆိုမှု</string>
+  <string name="important_notification_incoming_call_with_location">တည်နေရာဖြင့် အရေးကြီးသော အဝင်ခေါ်ဆိုမှု</string>
+  <string name="important_notification_incoming_call_with_photo_message">ဓာတ်ပုံနှင့် မက်ဆေ့ဂျ်ဖြင့် အရေးကြီးသောခေါ်ဆိုမှု</string>
+  <string name="important_notification_incoming_call_with_photo_location">ဓာတ်ပုံနှင့် တည်နေရာဖြင့် အရေးကြီးသောခေါ်ဆိုမှု</string>
+  <string name="important_notification_incoming_call_with_message_location">မက်ဆေ့ဂျ်နှင့် တည်နေရာဖြင့် အရေးကြီးသောခေါ်ဆိုမှု</string>
+  <string name="important_notification_incoming_call_with_photo_message_location">ဓာတ်ပုံ၊မက်ဆေ့ဂျ်၊တည်နေရာဖြင့် အရေးကြီးခေါ်ဆိုမှု</string>
+  <string name="important_notification_incoming_call_attachments">ပူးတွဲပါဖိုင်များဖြင့် အရေးကြီးသော အဝင်ခေါ်ဆိုမှု</string>
+  <string name="notification_incoming_work_call">အဝင် ခေါ်ဆိုမှု</string>
+  <string name="notification_incoming_spam_call">ခေါ်နေသော မသင်္ကာဖွယ်ရာ စပမ်းခေါ်ဆိုမှု</string>
+  <string name="notification_requesting_video_call">အသံ ခေါ်ဆိုမှုအဖြစ် တောင်းဆိုမှု</string>
+  <string name="notification_action_answer">အဖြေ</string>
+  <string name="notification_action_end_call">ဖုန်းချလိုက်ပါပြီ</string>
+  <string name="notification_action_answer_video">ဗီဒီယို</string>
+  <string name="notification_action_accept">လက်ခံရန်</string>
+  <string name="notification_action_dismiss">ငြင်းပယ်ရန်</string>
+  <string name="notification_action_speaker_on">စပီကာ ဖွင့်ပါ</string>
+  <string name="notification_action_speaker_off">စပီကာ ပိတ်ပါ</string>
+  <string name="notification_external_call">အခြားကိရိယာတွင် လက်ရှိခေါ်ဆိုနေမှု</string>
+  <string name="notification_external_video_call">အခြားကိရိယာရှိ လက်ရှိဗီဒီယိုခေါ်ဆိုမှု</string>
+  <string name="notification_take_call">ဖုန်းခေါ်ဆိုမှုလွှဲယူပါ</string>
+  <string name="notification_take_video_call">ဗီဒီယိုခေါ်ဆိုမှုလွှဲယူပါ</string>
+  <string name="incall_error_supp_service_unknown">ဤဝန်ဆောင်မှုအား မပံ့ပိုးပါ။</string>
+  <string name="goPrivate">ပရိုက်ဗိတ်သို့ သွားပါ</string>
+  <string name="manageConferenceLabel">အစည်းအဝေးခေါ်ဆိုမှုကို စီမံခန့်ခွဲပါ</string>
+  <string name="child_number">%sမှတစ်ဆင့်</string>
+  <string name="callFailed_simError">ဆင်းမ်ကဒ်မရှိ သို့မဟုတ် ဆင်းမ်ကဒ်အမှား</string>
+  <string name="conference_caller_disconnect_content_description">ခေါ်ဆိုမှုအပြီးသတ်ရန်</string>
+  <string name="conference_call_name">အစည်းအဝေးခေါ်ဆိုမှု</string>
+  <string name="generic_conference_call_name">ဖုန်းပြောနေသည်</string>
+  <string name="video_call_wifi_to_lte_handover_toast">မိုဘိုင်းဒေတာသုံးပြီး ဆက်လက်ခေါ်ဆိုနေသည်…</string>
+  <string name="video_call_lte_to_wifi_failed_title">Wi‑Fi ကွန်ရက်သို့ မပြောင်းနိုင်ပါ</string>
+  <string name="video_call_lte_to_wifi_failed_message">ဗီဒီယိုခေါ်ဆိုမှုသည် မိုဘိုင်းကွန်ရက်တွင် ဆက်ရှိနေပါမည်။ ပုံမှန်ဒေတာသုံးစွဲခများ ကျသင့်နိုင်ပါသည်။</string>
+  <string name="video_call_lte_to_wifi_failed_do_not_show">ဤသည်ကို ထပ်မပြပါနှင့်</string>
+  <string name="bubble_return_to_call">ခေါ်ဆိုမှုသို့ ပြန်သွားရန်</string>
+  <string name="rtt_request_dialog_title">RTT ခေါ်ဆိုမှုကို ချိတ်ဆက်မလား။</string>
+  <string name="rtt_request_dialog_details">%1$s သည် သင် အသံခေါ်ဆိုချိန်အတွင်း မက်ဆေ့ဂျ်ပို့ခြင်းကို အသုံးပြုလိုပါသည်။</string>
+  <string name="rtt_request_dialog_more_information">RTT သည် နားမကြားသူ၊ နားလေးသူ၊ စကားချို့ယွင်းသူ (သို့) အသံတစ်မျိုးတည်းထက် ပိုမို၍ လိုအပ်သူများကို ကူညီပေးပါသည်။</string>
+  <string name="rtt_button_decline_request">မလိုပါ</string>
+  <string name="rtt_button_accept_request">RTT ကို ချိတ်ဆက်ရန်</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-nb/strings.xml b/java/com/android/incallui/res/values-nb/strings.xml
index 819632b..f032573 100644
--- a/java/com/android/incallui/res/values-nb/strings.xml
+++ b/java/com/android/incallui/res/values-nb/strings.xml
@@ -1,79 +1,68 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"Telefon"</string>
-    <string name="wait_prompt_str" msgid="3509685348904329594">"Send disse tonene?\n"</string>
-    <string name="pause_prompt_yes" msgid="4642047011233552973">"Ja"</string>
-    <string name="pause_prompt_no" msgid="4691320111774935838">"Nei"</string>
-    <string name="notification_dialing" msgid="9072177265772083826">"Ringer"</string>
-    <string name="notification_ongoing_call" msgid="8712641937577776125">"Pågående samtale"</string>
-    <string name="notification_ongoing_video_call" msgid="6331318021321487769">"Pågående videosamtale"</string>
-    <string name="notification_ongoing_paused_video_call" msgid="709950253594606371">"Pågående videosamtale – videoen er satt på pause"</string>
-    <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Pågående jobbanrop"</string>
-    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"Pågående <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
-    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"Innkommende <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
-    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"Wi-Fi-anrop"</string>
-    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"Wi-Fi-jobbanrop"</string>
-    <string name="notification_on_hold" msgid="7141827443379205682">"Parkert"</string>
-    <string name="notification_incoming_call" msgid="7520580807513849283">"Innkommende samtale"</string>
-    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Innkommende anrop med bilde"</string>
-    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"Innkommende anrop med melding"</string>
-    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"Innkommende anrop med posisjon"</string>
-    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"Innkommende anrop med bilde og melding"</string>
-    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"Innkommende anrop med bilde og posisjon"</string>
-    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"Innkommende anrop med melding og posisjon"</string>
-    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"Innkommende anrop med bilde, melding og posisjon"</string>
-    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"Innkommende anrop med vedlegg"</string>
-    <string name="important_notification_incoming_call" msgid="2867013954509930989">"Viktig innkommende anrop"</string>
-    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"Viktig innkommende anrop med bilde"</string>
-    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"Viktig innkommende anrop med melding"</string>
-    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"Viktig innkommende anrop med posisjon"</string>
-    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"Viktig innkommende anrop med bilde og melding"</string>
-    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"Viktig innkommende anrop med bilde og posisjon"</string>
-    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"Viktig innkommende anrop med melding og posisjon"</string>
-    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Viktig anrop med bilde, melding og posisjon"</string>
-    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Viktig innkommende anrop med vedlegg"</string>
-    <string name="notification_incoming_work_call" msgid="5291275092734261918">"Innkommende jobbanrop"</string>
-    <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Innkommende anrop fra en mulig useriøs oppringer"</string>
-    <string name="notification_requesting_video_call" msgid="1807679328811515758">"Innkommende videoforespørsel"</string>
-    <string name="notification_action_answer" msgid="8748275902211192568">"Svar"</string>
-    <string name="notification_action_end_call" msgid="7467258454170007765">"Legg på"</string>
-    <string name="notification_action_answer_video" msgid="8488108892919917287">"Video"</string>
-    <string name="notification_action_accept" msgid="1272761514200507143">"Godta"</string>
-    <string name="notification_action_dismiss" msgid="3128241581632616226">"Avslå"</string>
-    <string name="notification_action_speaker_on" msgid="1882659234405596540">"Slå på høyttaleren"</string>
-    <string name="notification_action_speaker_off" msgid="6340085043115533948">"Slå av høyttaleren"</string>
-    <string name="notification_external_call" msgid="2504334597315343920">"Samtale pågår på en annen enhet"</string>
-    <string name="notification_external_video_call" msgid="7709394856028436683">"En videosamtale pågår på en annen enhet"</string>
-    <string name="notification_take_call" msgid="5631659438864492229">"Svar på anropet"</string>
-    <string name="notification_take_video_call" msgid="4473387503712341390">"Svar på videoanropet"</string>
-    <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"Tjenesten håndteres ikke."</string>
-    <string name="goPrivate" msgid="5269514638004595378">"aktiver privat samtale"</string>
-    <string name="manageConferenceLabel" msgid="3589379023518128318">"Administrer konferansesamtale"</string>
-    <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"Nødnummer"</string>
-    <string name="child_number" msgid="3398257437107259682">"via <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
-    <string name="callFailed_simError" msgid="4587775795711340072">"Ikke noe SIM-kort eller SIM-kortfeil"</string>
-    <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Avslutt samtalen"</string>
-    <string name="conference_call_name" msgid="8189987124611337174">"Telefonmøte"</string>
-    <string name="generic_conference_call_name" msgid="1546941472424243894">"Samtale pågår"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Fortsetter samtalen via mobildata …"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Kunne ikke bytte til Wi-Fi-nettverk"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Videosamtalen blir værende på mobilnettverket. Standard datakostnader kan påløpe."</string>
-    <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Ikke vis dette igjen"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="wait_prompt_str">Send disse tonene?\n</string>
+  <string name="pause_prompt_yes">Ja</string>
+  <string name="pause_prompt_no">Nei</string>
+  <string name="notification_dialing">Ringer</string>
+  <string name="notification_ongoing_call">Pågående samtale</string>
+  <string name="notification_ongoing_video_call">Pågående videosamtale</string>
+  <string name="notification_ongoing_paused_video_call">Pågående videosamtale – videoen er satt på pause</string>
+  <string name="notification_ongoing_work_call">Pågående jobbanrop</string>
+  <string name="notification_ongoing_call_wifi_template">Pågående %1$s</string>
+  <string name="notification_incoming_call_wifi_template">Innkommende %1$s</string>
+  <string name="notification_call_wifi_brand">Wi-Fi-anrop</string>
+  <string name="notification_call_wifi_work_brand">Wi-Fi-jobbanrop</string>
+  <string name="notification_on_hold">Parkert</string>
+  <string name="notification_incoming_call">Innkommende samtale</string>
+  <string name="notification_incoming_video_call">Innkommende videoanrop</string>
+  <string name="notification_incoming_call_mutli_sim">Innkommende anrop via %1$s</string>
+  <string name="notification_incoming_call_with_photo">Innkommende anrop med bilde</string>
+  <string name="notification_incoming_call_with_message">Innkommende anrop med melding</string>
+  <string name="notification_incoming_call_with_location">Innkommende anrop med posisjon</string>
+  <string name="notification_incoming_call_with_photo_message">Innkommende anrop med bilde og melding</string>
+  <string name="notification_incoming_call_with_photo_location">Innkommende anrop med bilde og posisjon</string>
+  <string name="notification_incoming_call_with_message_location">Innkommende anrop med melding og posisjon</string>
+  <string name="notification_incoming_call_with_photo_message_location">Innkommende anrop med bilde, melding og posisjon</string>
+  <string name="notification_incoming_call_attachments">Innkommende anrop med vedlegg</string>
+  <string name="important_notification_incoming_call">Viktig innkommende anrop</string>
+  <string name="important_notification_incoming_call_with_photo">Viktig innkommende anrop med bilde</string>
+  <string name="important_notification_incoming_call_with_message">Viktig innkommende anrop med melding</string>
+  <string name="important_notification_incoming_call_with_location">Viktig innkommende anrop med posisjon</string>
+  <string name="important_notification_incoming_call_with_photo_message">Viktig innkommende anrop med bilde og melding</string>
+  <string name="important_notification_incoming_call_with_photo_location">Viktig innkommende anrop med bilde og posisjon</string>
+  <string name="important_notification_incoming_call_with_message_location">Viktig innkommende anrop med melding og posisjon</string>
+  <string name="important_notification_incoming_call_with_photo_message_location">Viktig anrop med bilde, melding og posisjon</string>
+  <string name="important_notification_incoming_call_attachments">Viktig innkommende anrop med vedlegg</string>
+  <string name="notification_incoming_work_call">Innkommende jobbanrop</string>
+  <string name="notification_incoming_spam_call">Innkommende anrop fra en mulig useriøs oppringer</string>
+  <string name="notification_requesting_video_call">Innkommende videoforespørsel</string>
+  <string name="notification_action_answer">Svar</string>
+  <string name="notification_action_end_call">Legg på</string>
+  <string name="notification_action_answer_video">Video</string>
+  <string name="notification_action_accept">Godta</string>
+  <string name="notification_action_dismiss">Avslå</string>
+  <string name="notification_action_speaker_on">Slå på høyttaleren</string>
+  <string name="notification_action_speaker_off">Slå av høyttaleren</string>
+  <string name="notification_external_call">Samtale pågår på en annen enhet</string>
+  <string name="notification_external_video_call">En videosamtale pågår på en annen enhet</string>
+  <string name="notification_take_call">Svar på anropet</string>
+  <string name="notification_take_video_call">Svar på videoanropet</string>
+  <string name="incall_error_supp_service_unknown">Tjenesten håndteres ikke.</string>
+  <string name="goPrivate">aktiver privat samtale</string>
+  <string name="manageConferenceLabel">Administrer konferansesamtale</string>
+  <string name="child_number">via %s</string>
+  <string name="callFailed_simError">Ikke noe SIM-kort eller SIM-kortfeil</string>
+  <string name="conference_caller_disconnect_content_description">Avslutt samtalen</string>
+  <string name="conference_call_name">Telefonmøte</string>
+  <string name="generic_conference_call_name">Samtale pågår</string>
+  <string name="video_call_wifi_to_lte_handover_toast">Fortsetter samtalen via mobildata …</string>
+  <string name="video_call_lte_to_wifi_failed_title">Kunne ikke bytte til Wi-Fi-nettverk</string>
+  <string name="video_call_lte_to_wifi_failed_message">Videosamtalen blir værende på mobilnettverket. Standard datakostnader kan påløpe.</string>
+  <string name="video_call_lte_to_wifi_failed_do_not_show">Ikke vis dette igjen</string>
+  <string name="bubble_return_to_call">Tilbake til samtalen</string>
+  <string name="rtt_request_dialog_title">Bli med i STT-samtale?</string>
+  <string name="rtt_request_dialog_details">%1$s vil bruke meldinger inne i talesamtalen deres.</string>
+  <string name="rtt_request_dialog_more_information">STT er til hjelp for anropsdeltakere som er døve eller tunghørte, har talefunksjonshemninger eller trenger mer enn bare tale.</string>
+  <string name="rtt_button_decline_request">Nei takk</string>
+  <string name="rtt_button_accept_request">Bli med i STT</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-ne/strings.xml b/java/com/android/incallui/res/values-ne/strings.xml
index b491dfaf..65b6341 100644
--- a/java/com/android/incallui/res/values-ne/strings.xml
+++ b/java/com/android/incallui/res/values-ne/strings.xml
@@ -1,79 +1,68 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"फोन"</string>
-    <string name="wait_prompt_str" msgid="3509685348904329594">"निम्न टोनहरू पठाउने? \n"</string>
-    <string name="pause_prompt_yes" msgid="4642047011233552973">"हो"</string>
-    <string name="pause_prompt_no" msgid="4691320111774935838">"होइन"</string>
-    <string name="notification_dialing" msgid="9072177265772083826">"डायल गर्दै"</string>
-    <string name="notification_ongoing_call" msgid="8712641937577776125">"चलिरहेको कल"</string>
-    <string name="notification_ongoing_video_call" msgid="6331318021321487769">"चल्दै गरेको भिडियो कल"</string>
-    <string name="notification_ongoing_paused_video_call" msgid="709950253594606371">"चल्दै गरेको भिडियो कल ‑ भिडियो पज गरियो"</string>
-    <string name="notification_ongoing_work_call" msgid="3189581218078981547">"चालू रहेको कार्यको कल"</string>
-    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"चलिरहेको <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
-    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"आगमन <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
-    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"Wi‑Fi कल"</string>
-    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"Wi‑Fi मार्फत कामबाट आएको कल"</string>
-    <string name="notification_on_hold" msgid="7141827443379205682">"होल्डमा"</string>
-    <string name="notification_incoming_call" msgid="7520580807513849283">"आगमन कल"</string>
-    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"तस्बिरसहितको आगमन कल"</string>
-    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"सन्देशसहितको आगमन कल"</string>
-    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"स्थानसहितको आगमन कल"</string>
-    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"तस्बिर र सन्देशसहितको आगमन कल"</string>
-    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"तस्बिर र स्थानसहितको आगमन कल"</string>
-    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"सन्देश र स्थानसहितको आगमन कल"</string>
-    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"तस्बिर, सन्देश र स्थानसहितको आगमन कल"</string>
-    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"समावेश गरिएको वस्तुसहितको आगमन कल"</string>
-    <string name="important_notification_incoming_call" msgid="2867013954509930989">"महत्त्वपूर्ण आगमन कल"</string>
-    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"तस्बिरसहितको महत्त्वपूर्ण आगमन कल"</string>
-    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"सन्देशसहितको महत्त्वपूर्ण आगमन कल"</string>
-    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"स्थानसहितको महत्त्वपूर्ण आगमन कल"</string>
-    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"तस्बिर र सन्देशसहितको महत्त्वपूर्ण आगमन कल"</string>
-    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"तस्बिर र स्थानसहितको महत्त्वपूर्ण आगमन कल"</string>
-    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"सन्देश र स्थानसहितको महत्त्वपूर्ण आगमन कल"</string>
-    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"तस्बिर, सन्देश र स्थानसहितको महत्त्वपूर्ण आगमन कल"</string>
-    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"समावेश गरिएको वस्तुसहितको महत्त्वपूर्ण आगमन कल"</string>
-    <string name="notification_incoming_work_call" msgid="5291275092734261918">"आगमन कार्यको कल"</string>
-    <string name="notification_incoming_spam_call" msgid="7591506944666791937">"शंकास्पद आगमन स्प्याम कल"</string>
-    <string name="notification_requesting_video_call" msgid="1807679328811515758">"आगमन भिडियो अनुरोध"</string>
-    <string name="notification_action_answer" msgid="8748275902211192568">"उत्तर"</string>
-    <string name="notification_action_end_call" msgid="7467258454170007765">"छुटाउनुहोस्"</string>
-    <string name="notification_action_answer_video" msgid="8488108892919917287">"भिडियो"</string>
-    <string name="notification_action_accept" msgid="1272761514200507143">"स्वीकार्नुहोस्"</string>
-    <string name="notification_action_dismiss" msgid="3128241581632616226">"अस्वीकार गर्नुहोस्"</string>
-    <string name="notification_action_speaker_on" msgid="1882659234405596540">"स्पिकर सक्रिय गर्नुहोस्"</string>
-    <string name="notification_action_speaker_off" msgid="6340085043115533948">"स्पिकर निष्क्रिय पार्नुहोस्"</string>
-    <string name="notification_external_call" msgid="2504334597315343920">"अर्को यन्त्रमा चलिरहेको कल"</string>
-    <string name="notification_external_video_call" msgid="7709394856028436683">"अर्को यन्त्रमा चलिरहेको भिडियो कल"</string>
-    <string name="notification_take_call" msgid="5631659438864492229">"कल लिनुहोस्"</string>
-    <string name="notification_take_video_call" msgid="4473387503712341390">"भिडियो कल लिनुहोस्"</string>
-    <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"सेवा समर्थित छैन।"</string>
-    <string name="goPrivate" msgid="5269514638004595378">"निजी जानुहोस्"</string>
-    <string name="manageConferenceLabel" msgid="3589379023518128318">"सम्मेलन कलको प्रबन्ध मिलाउनहोस्"</string>
-    <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"आपतकालीन नम्बर"</string>
-    <string name="child_number" msgid="3398257437107259682">"<xliff:g id="CHILD_NUMBER">%s</xliff:g> बाट"</string>
-    <string name="callFailed_simError" msgid="4587775795711340072">"SIM छैन वा SIM त्रुटि"</string>
-    <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"कल अन्त्य गर्नुहोस्"</string>
-    <string name="conference_call_name" msgid="8189987124611337174">"सम्मेलन कल"</string>
-    <string name="generic_conference_call_name" msgid="1546941472424243894">"कलमा"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"मोबाइल डेटा प्रयोग गरी कललाई निरन्तरता दिइँदै…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Wi-Fi नेटवर्कमा स्विच गर्न सकिएन"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"भिडियो कल मोबाइल नेटवर्कमा रहने छ। मानक डेटा शुल्क लाग्न सक्छ।"</string>
-    <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"यसलाई फेरि नदेखाउनुहोस्"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="wait_prompt_str">निम्न टोनहरू पठाउने? \n</string>
+  <string name="pause_prompt_yes">हो</string>
+  <string name="pause_prompt_no">होइन</string>
+  <string name="notification_dialing">डायल गर्दै</string>
+  <string name="notification_ongoing_call">चलिरहेको कल</string>
+  <string name="notification_ongoing_video_call">चल्दै गरेको भिडियो कल</string>
+  <string name="notification_ongoing_paused_video_call">चल्दै गरेको भिडियो कल ‑ भिडियो पज गरियो</string>
+  <string name="notification_ongoing_work_call">चालू रहेको कार्यको कल</string>
+  <string name="notification_ongoing_call_wifi_template">चलिरहेको %1$s</string>
+  <string name="notification_incoming_call_wifi_template">आगमन %1$s</string>
+  <string name="notification_call_wifi_brand">Wi‑Fi कल</string>
+  <string name="notification_call_wifi_work_brand">Wi‑Fi मार्फत कामबाट आएको कल</string>
+  <string name="notification_on_hold">होल्डमा</string>
+  <string name="notification_incoming_call">आगमन कल</string>
+  <string name="notification_incoming_video_call">आगमन भिडियो कल</string>
+  <string name="notification_incoming_call_mutli_sim">%1$s मा आगमन कल</string>
+  <string name="notification_incoming_call_with_photo">तस्बिरसहितको आगमन कल</string>
+  <string name="notification_incoming_call_with_message">सन्देशसहितको आगमन कल</string>
+  <string name="notification_incoming_call_with_location">स्थानसहितको आगमन कल</string>
+  <string name="notification_incoming_call_with_photo_message">तस्बिर र सन्देशसहितको आगमन कल</string>
+  <string name="notification_incoming_call_with_photo_location">तस्बिर र स्थानसहितको आगमन कल</string>
+  <string name="notification_incoming_call_with_message_location">सन्देश र स्थानसहितको आगमन कल</string>
+  <string name="notification_incoming_call_with_photo_message_location">तस्बिर, सन्देश र स्थानसहितको आगमन कल</string>
+  <string name="notification_incoming_call_attachments">समावेश गरिएको वस्तुसहितको आगमन कल</string>
+  <string name="important_notification_incoming_call">महत्त्वपूर्ण आगमन कल</string>
+  <string name="important_notification_incoming_call_with_photo">तस्बिरसहितको महत्त्वपूर्ण आगमन कल</string>
+  <string name="important_notification_incoming_call_with_message">सन्देशसहितको महत्त्वपूर्ण आगमन कल</string>
+  <string name="important_notification_incoming_call_with_location">स्थानसहितको महत्त्वपूर्ण आगमन कल</string>
+  <string name="important_notification_incoming_call_with_photo_message">तस्बिर र सन्देशसहितको महत्त्वपूर्ण आगमन कल</string>
+  <string name="important_notification_incoming_call_with_photo_location">तस्बिर र स्थानसहितको महत्त्वपूर्ण आगमन कल</string>
+  <string name="important_notification_incoming_call_with_message_location">सन्देश र स्थानसहितको महत्त्वपूर्ण आगमन कल</string>
+  <string name="important_notification_incoming_call_with_photo_message_location">तस्बिर, सन्देश र स्थानसहितको महत्त्वपूर्ण आगमन कल</string>
+  <string name="important_notification_incoming_call_attachments">समावेश गरिएको वस्तुसहितको महत्त्वपूर्ण आगमन कल</string>
+  <string name="notification_incoming_work_call">आगमन कार्यको कल</string>
+  <string name="notification_incoming_spam_call">शंकास्पद आगमन स्प्याम कल</string>
+  <string name="notification_requesting_video_call">आगमन भिडियो अनुरोध</string>
+  <string name="notification_action_answer">उत्तर</string>
+  <string name="notification_action_end_call">छुटाउनुहोस्</string>
+  <string name="notification_action_answer_video">भिडियो</string>
+  <string name="notification_action_accept">स्वीकार्नुहोस्</string>
+  <string name="notification_action_dismiss">अस्वीकार गर्नुहोस्</string>
+  <string name="notification_action_speaker_on">स्पिकर सक्रिय गर्नुहोस्</string>
+  <string name="notification_action_speaker_off">स्पिकर निष्क्रिय पार्नुहोस्</string>
+  <string name="notification_external_call">अर्को यन्त्रमा चलिरहेको कल</string>
+  <string name="notification_external_video_call">अर्को यन्त्रमा चलिरहेको भिडियो कल</string>
+  <string name="notification_take_call">कल लिनुहोस्</string>
+  <string name="notification_take_video_call">भिडियो कल लिनुहोस्</string>
+  <string name="incall_error_supp_service_unknown">सेवा समर्थित छैन।</string>
+  <string name="goPrivate">निजी जानुहोस्</string>
+  <string name="manageConferenceLabel">सम्मेलन कलको प्रबन्ध मिलाउनहोस्</string>
+  <string name="child_number">%s बाट</string>
+  <string name="callFailed_simError">SIM छैन वा SIM त्रुटि</string>
+  <string name="conference_caller_disconnect_content_description">कल अन्त्य गर्नुहोस्</string>
+  <string name="conference_call_name">सम्मेलन कल</string>
+  <string name="generic_conference_call_name">कलमा</string>
+  <string name="video_call_wifi_to_lte_handover_toast">मोबाइल डेटा प्रयोग गरी कललाई निरन्तरता दिइँदै…</string>
+  <string name="video_call_lte_to_wifi_failed_title">Wi-Fi नेटवर्कमा स्विच गर्न सकिएन</string>
+  <string name="video_call_lte_to_wifi_failed_message">भिडियो कल मोबाइल नेटवर्कमा रहने छ। मानक डेटा शुल्क लाग्न सक्छ।</string>
+  <string name="video_call_lte_to_wifi_failed_do_not_show">यसलाई फेरि नदेखाउनुहोस्</string>
+  <string name="bubble_return_to_call">कलमा फर्कनुहोस्</string>
+  <string name="rtt_request_dialog_title">RTT कलमा सामेल हुने हो?</string>
+  <string name="rtt_request_dialog_details">%1$s तपाईंको भ्वाइस कलमै रहेर सन्देश प्रवाह प्रयोग गर्न चाहनुहुन्छ।</string>
+  <string name="rtt_request_dialog_more_information">RTT ले बहिरा, सुन्नमा कठिन हुने, बोल्न नसक्ने र कल गर्दा आवाजका साथै अरू कुराहरूको आवश्यकता पर्ने मान्छेहरूलाई सहायता गर्छ।</string>
+  <string name="rtt_button_decline_request">पर्दैन, धन्यवाद</string>
+  <string name="rtt_button_accept_request">RTT मा सामेल हुनुहोस्</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-nl/strings.xml b/java/com/android/incallui/res/values-nl/strings.xml
index f70f76a..39d3799 100644
--- a/java/com/android/incallui/res/values-nl/strings.xml
+++ b/java/com/android/incallui/res/values-nl/strings.xml
@@ -1,79 +1,68 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"Telefoon"</string>
-    <string name="wait_prompt_str" msgid="3509685348904329594">"De volgende tonen verzenden?\n"</string>
-    <string name="pause_prompt_yes" msgid="4642047011233552973">"Ja"</string>
-    <string name="pause_prompt_no" msgid="4691320111774935838">"Nee"</string>
-    <string name="notification_dialing" msgid="9072177265772083826">"Kiezen"</string>
-    <string name="notification_ongoing_call" msgid="8712641937577776125">"Actieve oproep"</string>
-    <string name="notification_ongoing_video_call" msgid="6331318021321487769">"Actief videogesprek"</string>
-    <string name="notification_ongoing_paused_video_call" msgid="709950253594606371">"Actief videogesprek: video onderbroken"</string>
-    <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Actieve zakelijke oproep"</string>
-    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"<xliff:g id="BRAND_NAME">%1$s</xliff:g> wordt uitgevoerd"</string>
-    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"<xliff:g id="BRAND_NAME">%1$s</xliff:g> ontvangen"</string>
-    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"Bellen via wifi"</string>
-    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"Zakelijk bellen via wifi"</string>
-    <string name="notification_on_hold" msgid="7141827443379205682">"In de wacht"</string>
-    <string name="notification_incoming_call" msgid="7520580807513849283">"Inkomende oproep"</string>
-    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Inkomende oproep met foto"</string>
-    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"Inkomende oproep met bericht"</string>
-    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"Inkomende oproep met locatie"</string>
-    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"Inkomende oproep met foto en bericht"</string>
-    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"Inkomende oproep met foto en locatie"</string>
-    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"Inkomende oproep met bericht en locatie"</string>
-    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"Inkomende oproep met foto, bericht en locatie"</string>
-    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"Inkomende oproep met bijlagen"</string>
-    <string name="important_notification_incoming_call" msgid="2867013954509930989">"Belangrijke inkomende oproep"</string>
-    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"Belangrijke inkomende oproep met foto"</string>
-    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"Belangrijke inkomende oproep met bericht"</string>
-    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"Belangrijke inkomende oproep met locatie"</string>
-    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"Belangrijke inkomende oproep met foto en bericht"</string>
-    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"Belangrijke inkomende oproep met foto en locatie"</string>
-    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"Belangrijke oproep met bericht en locatie"</string>
-    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Belangrijke oproep met foto, bericht en locatie"</string>
-    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Belangrijke inkomende oproep met bijlagen"</string>
-    <string name="notification_incoming_work_call" msgid="5291275092734261918">"Inkomende zakelijke oproep"</string>
-    <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Inkomende vermoedelijke spamoproep"</string>
-    <string name="notification_requesting_video_call" msgid="1807679328811515758">"Binnenkomend videoverzoek"</string>
-    <string name="notification_action_answer" msgid="8748275902211192568">"Antwoord"</string>
-    <string name="notification_action_end_call" msgid="7467258454170007765">"Ophangen"</string>
-    <string name="notification_action_answer_video" msgid="8488108892919917287">"Video"</string>
-    <string name="notification_action_accept" msgid="1272761514200507143">"Accepteren"</string>
-    <string name="notification_action_dismiss" msgid="3128241581632616226">"Weigeren"</string>
-    <string name="notification_action_speaker_on" msgid="1882659234405596540">"Luidspreker inschakelen"</string>
-    <string name="notification_action_speaker_off" msgid="6340085043115533948">"Luidspreker uitschakelen"</string>
-    <string name="notification_external_call" msgid="2504334597315343920">"Actief gesprek op een ander apparaat"</string>
-    <string name="notification_external_video_call" msgid="7709394856028436683">"Actief videogesprek op een ander apparaat"</string>
-    <string name="notification_take_call" msgid="5631659438864492229">"Gesprek beantwoorden"</string>
-    <string name="notification_take_video_call" msgid="4473387503712341390">"Videogesprek beantwoorden"</string>
-    <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"Service wordt niet ondersteund."</string>
-    <string name="goPrivate" msgid="5269514638004595378">"privé"</string>
-    <string name="manageConferenceLabel" msgid="3589379023518128318">"Telef. vergadering beheren"</string>
-    <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"Alarmnummer"</string>
-    <string name="child_number" msgid="3398257437107259682">"via <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
-    <string name="callFailed_simError" msgid="4587775795711340072">"Geen simkaart of fout met simkaart"</string>
-    <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Oproep beëindigen"</string>
-    <string name="conference_call_name" msgid="8189987124611337174">"Telefonische vergadering"</string>
-    <string name="generic_conference_call_name" msgid="1546941472424243894">"In gesprek"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Gesprek voortzetten via mobiele data…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Overschakelen naar wifi-netwerk mislukt"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Videogesprek loopt via mobiel netwerk. Er kunnen standaard datakosten in rekening worden gebracht."</string>
-    <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Dit niet meer weergeven"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="wait_prompt_str">De volgende tonen verzenden?\n</string>
+  <string name="pause_prompt_yes">Ja</string>
+  <string name="pause_prompt_no">Nee</string>
+  <string name="notification_dialing">Kiezen</string>
+  <string name="notification_ongoing_call">Actieve oproep</string>
+  <string name="notification_ongoing_video_call">Actief videogesprek</string>
+  <string name="notification_ongoing_paused_video_call">Actief videogesprek: video onderbroken</string>
+  <string name="notification_ongoing_work_call">Actieve zakelijke oproep</string>
+  <string name="notification_ongoing_call_wifi_template">%1$s wordt uitgevoerd</string>
+  <string name="notification_incoming_call_wifi_template">%1$s ontvangen</string>
+  <string name="notification_call_wifi_brand">Bellen via wifi</string>
+  <string name="notification_call_wifi_work_brand">Zakelijk bellen via wifi</string>
+  <string name="notification_on_hold">In de wacht</string>
+  <string name="notification_incoming_call">Inkomende oproep</string>
+  <string name="notification_incoming_video_call">Binnenkomend videogesprek</string>
+  <string name="notification_incoming_call_mutli_sim">Inkomende oproep via %1$s</string>
+  <string name="notification_incoming_call_with_photo">Inkomende oproep met foto</string>
+  <string name="notification_incoming_call_with_message">Inkomende oproep met bericht</string>
+  <string name="notification_incoming_call_with_location">Inkomende oproep met locatie</string>
+  <string name="notification_incoming_call_with_photo_message">Inkomende oproep met foto en bericht</string>
+  <string name="notification_incoming_call_with_photo_location">Inkomende oproep met foto en locatie</string>
+  <string name="notification_incoming_call_with_message_location">Inkomende oproep met bericht en locatie</string>
+  <string name="notification_incoming_call_with_photo_message_location">Inkomende oproep met foto, bericht en locatie</string>
+  <string name="notification_incoming_call_attachments">Inkomende oproep met bijlagen</string>
+  <string name="important_notification_incoming_call">Belangrijke inkomende oproep</string>
+  <string name="important_notification_incoming_call_with_photo">Belangrijke inkomende oproep met foto</string>
+  <string name="important_notification_incoming_call_with_message">Belangrijke inkomende oproep met bericht</string>
+  <string name="important_notification_incoming_call_with_location">Belangrijke inkomende oproep met locatie</string>
+  <string name="important_notification_incoming_call_with_photo_message">Belangrijke inkomende oproep met foto en bericht</string>
+  <string name="important_notification_incoming_call_with_photo_location">Belangrijke inkomende oproep met foto en locatie</string>
+  <string name="important_notification_incoming_call_with_message_location">Belangrijke oproep met bericht en locatie</string>
+  <string name="important_notification_incoming_call_with_photo_message_location">Belangrijke oproep met foto, bericht en locatie</string>
+  <string name="important_notification_incoming_call_attachments">Belangrijke inkomende oproep met bijlagen</string>
+  <string name="notification_incoming_work_call">Inkomende zakelijke oproep</string>
+  <string name="notification_incoming_spam_call">Inkomende vermoedelijke spamoproep</string>
+  <string name="notification_requesting_video_call">Binnenkomend videoverzoek</string>
+  <string name="notification_action_answer">Antwoord</string>
+  <string name="notification_action_end_call">Ophangen</string>
+  <string name="notification_action_answer_video">Video</string>
+  <string name="notification_action_accept">Accepteren</string>
+  <string name="notification_action_dismiss">Weigeren</string>
+  <string name="notification_action_speaker_on">Luidspreker inschakelen</string>
+  <string name="notification_action_speaker_off">Luidspreker uitschakelen</string>
+  <string name="notification_external_call">Actief gesprek op een ander apparaat</string>
+  <string name="notification_external_video_call">Actief videogesprek op een ander apparaat</string>
+  <string name="notification_take_call">Gesprek beantwoorden</string>
+  <string name="notification_take_video_call">Videogesprek beantwoorden</string>
+  <string name="incall_error_supp_service_unknown">Service wordt niet ondersteund.</string>
+  <string name="goPrivate">privé</string>
+  <string name="manageConferenceLabel">Telef. vergadering beheren</string>
+  <string name="child_number">via %s</string>
+  <string name="callFailed_simError">Geen simkaart of fout met simkaart</string>
+  <string name="conference_caller_disconnect_content_description">Oproep beëindigen</string>
+  <string name="conference_call_name">Telefonische vergadering</string>
+  <string name="generic_conference_call_name">In gesprek</string>
+  <string name="video_call_wifi_to_lte_handover_toast">Gesprek voortzetten via mobiele data…</string>
+  <string name="video_call_lte_to_wifi_failed_title">Overschakelen naar wifi-netwerk mislukt</string>
+  <string name="video_call_lte_to_wifi_failed_message">Videogesprek loopt via mobiel netwerk. Er kunnen standaard datakosten in rekening worden gebracht.</string>
+  <string name="video_call_lte_to_wifi_failed_do_not_show">Dit niet meer weergeven</string>
+  <string name="bubble_return_to_call">Terug naar oproep</string>
+  <string name="rtt_request_dialog_title">Deelnemen aan RTT-gesprek?</string>
+  <string name="rtt_request_dialog_details">%1$s wil berichten gebruiken in je spraakoproep.</string>
+  <string name="rtt_request_dialog_more_information">RTT helpt dove en slechthorende bellers en bellers met een spraakbeperking. Deze functie kan ook handig zijn voor bellers die meer dan alleen gesproken communicatie nodig hebben.</string>
+  <string name="rtt_button_decline_request">Nee</string>
+  <string name="rtt_button_accept_request">Deelnemen aan RTT</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-no/strings.xml b/java/com/android/incallui/res/values-no/strings.xml
index 819632b..f032573 100644
--- a/java/com/android/incallui/res/values-no/strings.xml
+++ b/java/com/android/incallui/res/values-no/strings.xml
@@ -1,79 +1,68 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"Telefon"</string>
-    <string name="wait_prompt_str" msgid="3509685348904329594">"Send disse tonene?\n"</string>
-    <string name="pause_prompt_yes" msgid="4642047011233552973">"Ja"</string>
-    <string name="pause_prompt_no" msgid="4691320111774935838">"Nei"</string>
-    <string name="notification_dialing" msgid="9072177265772083826">"Ringer"</string>
-    <string name="notification_ongoing_call" msgid="8712641937577776125">"Pågående samtale"</string>
-    <string name="notification_ongoing_video_call" msgid="6331318021321487769">"Pågående videosamtale"</string>
-    <string name="notification_ongoing_paused_video_call" msgid="709950253594606371">"Pågående videosamtale – videoen er satt på pause"</string>
-    <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Pågående jobbanrop"</string>
-    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"Pågående <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
-    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"Innkommende <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
-    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"Wi-Fi-anrop"</string>
-    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"Wi-Fi-jobbanrop"</string>
-    <string name="notification_on_hold" msgid="7141827443379205682">"Parkert"</string>
-    <string name="notification_incoming_call" msgid="7520580807513849283">"Innkommende samtale"</string>
-    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Innkommende anrop med bilde"</string>
-    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"Innkommende anrop med melding"</string>
-    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"Innkommende anrop med posisjon"</string>
-    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"Innkommende anrop med bilde og melding"</string>
-    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"Innkommende anrop med bilde og posisjon"</string>
-    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"Innkommende anrop med melding og posisjon"</string>
-    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"Innkommende anrop med bilde, melding og posisjon"</string>
-    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"Innkommende anrop med vedlegg"</string>
-    <string name="important_notification_incoming_call" msgid="2867013954509930989">"Viktig innkommende anrop"</string>
-    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"Viktig innkommende anrop med bilde"</string>
-    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"Viktig innkommende anrop med melding"</string>
-    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"Viktig innkommende anrop med posisjon"</string>
-    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"Viktig innkommende anrop med bilde og melding"</string>
-    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"Viktig innkommende anrop med bilde og posisjon"</string>
-    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"Viktig innkommende anrop med melding og posisjon"</string>
-    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Viktig anrop med bilde, melding og posisjon"</string>
-    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Viktig innkommende anrop med vedlegg"</string>
-    <string name="notification_incoming_work_call" msgid="5291275092734261918">"Innkommende jobbanrop"</string>
-    <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Innkommende anrop fra en mulig useriøs oppringer"</string>
-    <string name="notification_requesting_video_call" msgid="1807679328811515758">"Innkommende videoforespørsel"</string>
-    <string name="notification_action_answer" msgid="8748275902211192568">"Svar"</string>
-    <string name="notification_action_end_call" msgid="7467258454170007765">"Legg på"</string>
-    <string name="notification_action_answer_video" msgid="8488108892919917287">"Video"</string>
-    <string name="notification_action_accept" msgid="1272761514200507143">"Godta"</string>
-    <string name="notification_action_dismiss" msgid="3128241581632616226">"Avslå"</string>
-    <string name="notification_action_speaker_on" msgid="1882659234405596540">"Slå på høyttaleren"</string>
-    <string name="notification_action_speaker_off" msgid="6340085043115533948">"Slå av høyttaleren"</string>
-    <string name="notification_external_call" msgid="2504334597315343920">"Samtale pågår på en annen enhet"</string>
-    <string name="notification_external_video_call" msgid="7709394856028436683">"En videosamtale pågår på en annen enhet"</string>
-    <string name="notification_take_call" msgid="5631659438864492229">"Svar på anropet"</string>
-    <string name="notification_take_video_call" msgid="4473387503712341390">"Svar på videoanropet"</string>
-    <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"Tjenesten håndteres ikke."</string>
-    <string name="goPrivate" msgid="5269514638004595378">"aktiver privat samtale"</string>
-    <string name="manageConferenceLabel" msgid="3589379023518128318">"Administrer konferansesamtale"</string>
-    <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"Nødnummer"</string>
-    <string name="child_number" msgid="3398257437107259682">"via <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
-    <string name="callFailed_simError" msgid="4587775795711340072">"Ikke noe SIM-kort eller SIM-kortfeil"</string>
-    <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Avslutt samtalen"</string>
-    <string name="conference_call_name" msgid="8189987124611337174">"Telefonmøte"</string>
-    <string name="generic_conference_call_name" msgid="1546941472424243894">"Samtale pågår"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Fortsetter samtalen via mobildata …"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Kunne ikke bytte til Wi-Fi-nettverk"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Videosamtalen blir værende på mobilnettverket. Standard datakostnader kan påløpe."</string>
-    <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Ikke vis dette igjen"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="wait_prompt_str">Send disse tonene?\n</string>
+  <string name="pause_prompt_yes">Ja</string>
+  <string name="pause_prompt_no">Nei</string>
+  <string name="notification_dialing">Ringer</string>
+  <string name="notification_ongoing_call">Pågående samtale</string>
+  <string name="notification_ongoing_video_call">Pågående videosamtale</string>
+  <string name="notification_ongoing_paused_video_call">Pågående videosamtale – videoen er satt på pause</string>
+  <string name="notification_ongoing_work_call">Pågående jobbanrop</string>
+  <string name="notification_ongoing_call_wifi_template">Pågående %1$s</string>
+  <string name="notification_incoming_call_wifi_template">Innkommende %1$s</string>
+  <string name="notification_call_wifi_brand">Wi-Fi-anrop</string>
+  <string name="notification_call_wifi_work_brand">Wi-Fi-jobbanrop</string>
+  <string name="notification_on_hold">Parkert</string>
+  <string name="notification_incoming_call">Innkommende samtale</string>
+  <string name="notification_incoming_video_call">Innkommende videoanrop</string>
+  <string name="notification_incoming_call_mutli_sim">Innkommende anrop via %1$s</string>
+  <string name="notification_incoming_call_with_photo">Innkommende anrop med bilde</string>
+  <string name="notification_incoming_call_with_message">Innkommende anrop med melding</string>
+  <string name="notification_incoming_call_with_location">Innkommende anrop med posisjon</string>
+  <string name="notification_incoming_call_with_photo_message">Innkommende anrop med bilde og melding</string>
+  <string name="notification_incoming_call_with_photo_location">Innkommende anrop med bilde og posisjon</string>
+  <string name="notification_incoming_call_with_message_location">Innkommende anrop med melding og posisjon</string>
+  <string name="notification_incoming_call_with_photo_message_location">Innkommende anrop med bilde, melding og posisjon</string>
+  <string name="notification_incoming_call_attachments">Innkommende anrop med vedlegg</string>
+  <string name="important_notification_incoming_call">Viktig innkommende anrop</string>
+  <string name="important_notification_incoming_call_with_photo">Viktig innkommende anrop med bilde</string>
+  <string name="important_notification_incoming_call_with_message">Viktig innkommende anrop med melding</string>
+  <string name="important_notification_incoming_call_with_location">Viktig innkommende anrop med posisjon</string>
+  <string name="important_notification_incoming_call_with_photo_message">Viktig innkommende anrop med bilde og melding</string>
+  <string name="important_notification_incoming_call_with_photo_location">Viktig innkommende anrop med bilde og posisjon</string>
+  <string name="important_notification_incoming_call_with_message_location">Viktig innkommende anrop med melding og posisjon</string>
+  <string name="important_notification_incoming_call_with_photo_message_location">Viktig anrop med bilde, melding og posisjon</string>
+  <string name="important_notification_incoming_call_attachments">Viktig innkommende anrop med vedlegg</string>
+  <string name="notification_incoming_work_call">Innkommende jobbanrop</string>
+  <string name="notification_incoming_spam_call">Innkommende anrop fra en mulig useriøs oppringer</string>
+  <string name="notification_requesting_video_call">Innkommende videoforespørsel</string>
+  <string name="notification_action_answer">Svar</string>
+  <string name="notification_action_end_call">Legg på</string>
+  <string name="notification_action_answer_video">Video</string>
+  <string name="notification_action_accept">Godta</string>
+  <string name="notification_action_dismiss">Avslå</string>
+  <string name="notification_action_speaker_on">Slå på høyttaleren</string>
+  <string name="notification_action_speaker_off">Slå av høyttaleren</string>
+  <string name="notification_external_call">Samtale pågår på en annen enhet</string>
+  <string name="notification_external_video_call">En videosamtale pågår på en annen enhet</string>
+  <string name="notification_take_call">Svar på anropet</string>
+  <string name="notification_take_video_call">Svar på videoanropet</string>
+  <string name="incall_error_supp_service_unknown">Tjenesten håndteres ikke.</string>
+  <string name="goPrivate">aktiver privat samtale</string>
+  <string name="manageConferenceLabel">Administrer konferansesamtale</string>
+  <string name="child_number">via %s</string>
+  <string name="callFailed_simError">Ikke noe SIM-kort eller SIM-kortfeil</string>
+  <string name="conference_caller_disconnect_content_description">Avslutt samtalen</string>
+  <string name="conference_call_name">Telefonmøte</string>
+  <string name="generic_conference_call_name">Samtale pågår</string>
+  <string name="video_call_wifi_to_lte_handover_toast">Fortsetter samtalen via mobildata …</string>
+  <string name="video_call_lte_to_wifi_failed_title">Kunne ikke bytte til Wi-Fi-nettverk</string>
+  <string name="video_call_lte_to_wifi_failed_message">Videosamtalen blir værende på mobilnettverket. Standard datakostnader kan påløpe.</string>
+  <string name="video_call_lte_to_wifi_failed_do_not_show">Ikke vis dette igjen</string>
+  <string name="bubble_return_to_call">Tilbake til samtalen</string>
+  <string name="rtt_request_dialog_title">Bli med i STT-samtale?</string>
+  <string name="rtt_request_dialog_details">%1$s vil bruke meldinger inne i talesamtalen deres.</string>
+  <string name="rtt_request_dialog_more_information">STT er til hjelp for anropsdeltakere som er døve eller tunghørte, har talefunksjonshemninger eller trenger mer enn bare tale.</string>
+  <string name="rtt_button_decline_request">Nei takk</string>
+  <string name="rtt_button_accept_request">Bli med i STT</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-pa/strings.xml b/java/com/android/incallui/res/values-pa/strings.xml
index ab43fec..45462b5 100644
--- a/java/com/android/incallui/res/values-pa/strings.xml
+++ b/java/com/android/incallui/res/values-pa/strings.xml
@@ -1,79 +1,68 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"ਫੋਨ"</string>
-    <string name="wait_prompt_str" msgid="3509685348904329594">"ਕੀ ਇਹ ਟੋਨਾਂ ਭੇਜਣੀਆਂ ਹਨ?\n"</string>
-    <string name="pause_prompt_yes" msgid="4642047011233552973">"ਹਾਂ"</string>
-    <string name="pause_prompt_no" msgid="4691320111774935838">"ਨਹੀਂ"</string>
-    <string name="notification_dialing" msgid="9072177265772083826">"ਡਾਇਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"</string>
-    <string name="notification_ongoing_call" msgid="8712641937577776125">"ਜਾਰੀ ਕਾਲ"</string>
-    <string name="notification_ongoing_video_call" msgid="6331318021321487769">"ਜਾਰੀ ਵੀਡੀਓ ਕਾਲ"</string>
-    <string name="notification_ongoing_paused_video_call" msgid="709950253594606371">"ਜਾਰੀ ਵੀਡੀਓ ਕਾਲ - ਵੀਡੀਓ ਰੋਕਿਆ ਗਿਆ"</string>
-    <string name="notification_ongoing_work_call" msgid="3189581218078981547">"ਕੰਮ ਸਬੰਧਿਤ ਜਾਰੀ ਕਾਲ"</string>
-    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"ਜਾਰੀ <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
-    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"ਆ ਰਹੀ <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
-    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"Wi‑Fi ਕਾਲ"</string>
-    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"ਕਾਰਜ-ਸਥਾਨ ਤੋਂ ਆਈ Wi‑Fi ਕਾਲ"</string>
-    <string name="notification_on_hold" msgid="7141827443379205682">"ਹੋਲਡ ਤੇ"</string>
-    <string name="notification_incoming_call" msgid="7520580807513849283">"ਇਨਕਮਿੰਗ ਕਾਲ"</string>
-    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"ਫ਼ੋਟੋ ਨਾਲ ਇਨਕਮਿੰਗ ਕਾਲ"</string>
-    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"ਸੁਨੇਹੇ ਨਾਲ ਇਨਕਮਿੰਗ ਕਾਲ"</string>
-    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"ਟਿਕਾਣੇ ਨਾਲ ਇਨਕਮਿੰਗ ਕਾਲ"</string>
-    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"ਫ਼ੋਟੋ ਅਤੇ ਸੁਨੇਹੇ ਨਾਲ ਇਨਕਮਿੰਗ ਕਾਲ"</string>
-    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"ਫ਼ੋਟੋ ਅਤੇ ਟਿਕਾਣੇ ਨਾਲ ਇਨਕਮਿੰਗ ਕਾਲ"</string>
-    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"ਸੁਨੇਹੇ ਅਤੇ ਟਿਕਾਣੇ ਨਾਲ ਇਨਕਮਿੰਗ ਕਾਲ"</string>
-    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"ਫ਼ੋਟੋ, ਸੁਨੇਹੇ ਅਤੇ ਟਿਕਾਣੇ ਨਾਲ ਇਨਕਮਿੰਗ ਕਾਲ"</string>
-    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"ਅਟੈਚਮੈਂਟਾਂ ਨਾਲ ਇਨਕਮਿੰਗ ਕਾਲ"</string>
-    <string name="important_notification_incoming_call" msgid="2867013954509930989">"ਮਹੱਤਵਪੂਰਨ ਇਨਕਮਿੰਗ ਕਾਲ"</string>
-    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"ਫ਼ੋਟੋ ਨਾਲ ਮਹੱਤਵਪੂਰਨ ਇਨਕਮਿੰਗ ਕਾਲ"</string>
-    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"ਸੁਨੇਹੇ ਨਾਲ ਮਹੱਤਵਪੂਰਨ ਇਨਕਮਿੰਗ ਕਾਲ"</string>
-    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"ਟਿਕਾਣੇ ਨਾਲ ਮਹੱਤਵਪੂਰਨ ਇਨਕਮਿੰਗ ਕਾਲ"</string>
-    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"ਫ਼ੋਟੋ ਅਤੇ ਸੁਨੇਹੇ ਨਾਲ ਮਹੱਤਵਪੂਰਨ ਇਨਕਮਿੰਗ ਕਾਲ"</string>
-    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"ਫ਼ੋਟੋ ਅਤੇ ਟਿਕਾਣੇ ਨਾਲ ਮਹੱਤਵਪੂਰਨ ਇਨਕਮਿੰਗ ਕਾਲ"</string>
-    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"ਸੁਨੇਹੇ ਅਤੇ ਟਿਕਾਣੇ ਨਾਲ ਮਹੱਤਵਪੂਰਨ ਇਨਕਮਿੰਗ ਕਾਲ"</string>
-    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"ਫ਼ੋਟੋ, ਸੁਨੇਹੇ ਅਤੇ ਟਿਕਾਣੇ ਨਾਲ ਮਹੱਤਵਪੂਰਨ ਇਨਕਮਿੰਗ ਕਾਲ"</string>
-    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"ਅਟੈਚਮੈਂਟਾਂ ਨਾਲ ਮਹੱਤਵਪੂਰਨ ਇਨਕਮਿੰਗ ਕਾਲ"</string>
-    <string name="notification_incoming_work_call" msgid="5291275092734261918">"ਕੰਮ ਸਬੰਧਿਤ ਆ ਰਹੀ ਕਾਲ"</string>
-    <string name="notification_incoming_spam_call" msgid="7591506944666791937">"ਸ਼ੱਕੀ ਸਪੈਮ ਕਾਲ ਆ ਰਹੀ ਹੈ"</string>
-    <string name="notification_requesting_video_call" msgid="1807679328811515758">"ਇਨਕਮਿੰਗ ਵੀਡੀਓ ਬੇਨਤੀ"</string>
-    <string name="notification_action_answer" msgid="8748275902211192568">"ਜਵਾਬ ਦਿਓ"</string>
-    <string name="notification_action_end_call" msgid="7467258454170007765">"ਹੈਂਗ ਅਪ ਕਰੋ"</string>
-    <string name="notification_action_answer_video" msgid="8488108892919917287">"ਵੀਡੀਓ"</string>
-    <string name="notification_action_accept" msgid="1272761514200507143">"ਸਵੀਕਾਰ ਕਰੋ"</string>
-    <string name="notification_action_dismiss" msgid="3128241581632616226">"ਅਸਵੀਕਾਰ ਕਰੋ"</string>
-    <string name="notification_action_speaker_on" msgid="1882659234405596540">"ਸਪੀਕਰ ਚਾਲੂ ਕਰੋ"</string>
-    <string name="notification_action_speaker_off" msgid="6340085043115533948">"ਸਪੀਕਰ ਬੰਦ ਕਰੋ"</string>
-    <string name="notification_external_call" msgid="2504334597315343920">"ਕਿਸੇ ਹੋਰ ਡੀਵਾਈਸ \'ਤੇ ਜਾਰੀ ਕਾਲ"</string>
-    <string name="notification_external_video_call" msgid="7709394856028436683">"ਕਿਸੇ ਹੋਰ ਡੀਵਾਈਸ \'ਤੇ ਜਾਰੀ ਵੀਡੀਓ ਕਾਲ"</string>
-    <string name="notification_take_call" msgid="5631659438864492229">"ਕਾਲ ਲਓ"</string>
-    <string name="notification_take_video_call" msgid="4473387503712341390">"ਵੀਡੀਓ ਕਾਲ ਲਓ"</string>
-    <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"ਸੇਵਾ ਸਮਰਥਿਤ ਨਹੀਂ।"</string>
-    <string name="goPrivate" msgid="5269514638004595378">"ਨਿੱਜੀ ਜਾਓ"</string>
-    <string name="manageConferenceLabel" msgid="3589379023518128318">"ਕਾਨਫਰੰਸ ਕਾਲ ਦਾ ਪ੍ਰਬੰਧਨ ਕਰੋ"</string>
-    <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"ਐਮਰਜੈਂਸੀ ਨੰਬਰ"</string>
-    <string name="child_number" msgid="3398257437107259682">"<xliff:g id="CHILD_NUMBER">%s</xliff:g> ਰਾਹੀਂ"</string>
-    <string name="callFailed_simError" msgid="4587775795711340072">"ਕੋਈ SIM ਨਹੀਂ ਜਾਂ SIM ਅਸ਼ੁੱਧੀ"</string>
-    <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"ਕਾਲ ਸਮਾਪਤ ਕਰੋ"</string>
-    <string name="conference_call_name" msgid="8189987124611337174">"ਕਾਨਫਰੰਸ ਕਾਲ"</string>
-    <string name="generic_conference_call_name" msgid="1546941472424243894">"ਕਾਲ ਵਿੱਚ"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"ਮੋਬਾਈਲ  ਡਾਟੇ  ਦੀ ਵਰਤੋਂ ਕਰਕੇ ਕਾਲ ਜਾਰੀ ਰੱਖੀ ਜਾ ਰਹੀ ਹੈ…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Wi‑Fi ਨੈੱਟਵਰਕ \'ਤੇ ਬਦਲੀ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕੀ"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"ਵੀਡੀਓ ਕਾਲ ਮੋਬਾਈਲ ਨੈੱਟਵਰਕ \'ਤੇ ਜਾਰੀ ਰਹੇਗੀ। ਮਿਆਰੀ  ਡਾਟਾ  ਖਰਚੇ ਲਾਗੂ ਹੋ ਸਕਦੇ ਹਨ।"</string>
-    <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"ਇਸ ਨੂੰ ਦੁਬਾਰਾ ਨਾ  ਦਿਖਾਓ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="wait_prompt_str">ਕੀ ਇਹ ਟੋਨਾਂ ਭੇਜਣੀਆਂ ਹਨ?\n</string>
+  <string name="pause_prompt_yes">ਹਾਂ</string>
+  <string name="pause_prompt_no">ਨਹੀਂ</string>
+  <string name="notification_dialing">ਡਾਇਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ</string>
+  <string name="notification_ongoing_call">ਜਾਰੀ ਕਾਲ</string>
+  <string name="notification_ongoing_video_call">ਜਾਰੀ ਵੀਡੀਓ ਕਾਲ</string>
+  <string name="notification_ongoing_paused_video_call">ਜਾਰੀ ਵੀਡੀਓ ਕਾਲ - ਵੀਡੀਓ ਰੋਕਿਆ ਗਿਆ</string>
+  <string name="notification_ongoing_work_call">ਕੰਮ ਸਬੰਧਿਤ ਜਾਰੀ ਕਾਲ</string>
+  <string name="notification_ongoing_call_wifi_template">ਜਾਰੀ %1$s</string>
+  <string name="notification_incoming_call_wifi_template">ਆ ਰਹੀ %1$s</string>
+  <string name="notification_call_wifi_brand">Wi‑Fi ਕਾਲ</string>
+  <string name="notification_call_wifi_work_brand">ਕਾਰਜ-ਸਥਾਨ ਤੋਂ ਆਈ Wi‑Fi ਕਾਲ</string>
+  <string name="notification_on_hold">ਹੋਲਡ ਤੇ</string>
+  <string name="notification_incoming_call">ਇਨਕਮਿੰਗ ਕਾਲ</string>
+  <string name="notification_incoming_video_call">ਇਨਕਮਿੰਗ ਵੀਡੀਓ ਕਾਲ</string>
+  <string name="notification_incoming_call_mutli_sim">%1$s ਰਾਹੀਂ ਇਨਕਮਿੰਗ ਕਾਲ</string>
+  <string name="notification_incoming_call_with_photo">ਫ਼ੋਟੋ ਨਾਲ ਇਨਕਮਿੰਗ ਕਾਲ</string>
+  <string name="notification_incoming_call_with_message">ਸੁਨੇਹੇ ਨਾਲ ਇਨਕਮਿੰਗ ਕਾਲ</string>
+  <string name="notification_incoming_call_with_location">ਟਿਕਾਣੇ ਨਾਲ ਇਨਕਮਿੰਗ ਕਾਲ</string>
+  <string name="notification_incoming_call_with_photo_message">ਫ਼ੋਟੋ ਅਤੇ ਸੁਨੇਹੇ ਨਾਲ ਇਨਕਮਿੰਗ ਕਾਲ</string>
+  <string name="notification_incoming_call_with_photo_location">ਫ਼ੋਟੋ ਅਤੇ ਟਿਕਾਣੇ ਨਾਲ ਇਨਕਮਿੰਗ ਕਾਲ</string>
+  <string name="notification_incoming_call_with_message_location">ਸੁਨੇਹੇ ਅਤੇ ਟਿਕਾਣੇ ਨਾਲ ਇਨਕਮਿੰਗ ਕਾਲ</string>
+  <string name="notification_incoming_call_with_photo_message_location">ਫ਼ੋਟੋ, ਸੁਨੇਹੇ ਅਤੇ ਟਿਕਾਣੇ ਨਾਲ ਇਨਕਮਿੰਗ ਕਾਲ</string>
+  <string name="notification_incoming_call_attachments">ਅਟੈਚਮੈਂਟਾਂ ਨਾਲ ਇਨਕਮਿੰਗ ਕਾਲ</string>
+  <string name="important_notification_incoming_call">ਮਹੱਤਵਪੂਰਨ ਇਨਕਮਿੰਗ ਕਾਲ</string>
+  <string name="important_notification_incoming_call_with_photo">ਫ਼ੋਟੋ ਨਾਲ ਮਹੱਤਵਪੂਰਨ ਇਨਕਮਿੰਗ ਕਾਲ</string>
+  <string name="important_notification_incoming_call_with_message">ਸੁਨੇਹੇ ਨਾਲ ਮਹੱਤਵਪੂਰਨ ਇਨਕਮਿੰਗ ਕਾਲ</string>
+  <string name="important_notification_incoming_call_with_location">ਟਿਕਾਣੇ ਨਾਲ ਮਹੱਤਵਪੂਰਨ ਇਨਕਮਿੰਗ ਕਾਲ</string>
+  <string name="important_notification_incoming_call_with_photo_message">ਫ਼ੋਟੋ ਅਤੇ ਸੁਨੇਹੇ ਨਾਲ ਮਹੱਤਵਪੂਰਨ ਇਨਕਮਿੰਗ ਕਾਲ</string>
+  <string name="important_notification_incoming_call_with_photo_location">ਫ਼ੋਟੋ ਅਤੇ ਟਿਕਾਣੇ ਨਾਲ ਮਹੱਤਵਪੂਰਨ ਇਨਕਮਿੰਗ ਕਾਲ</string>
+  <string name="important_notification_incoming_call_with_message_location">ਸੁਨੇਹੇ ਅਤੇ ਟਿਕਾਣੇ ਨਾਲ ਮਹੱਤਵਪੂਰਨ ਇਨਕਮਿੰਗ ਕਾਲ</string>
+  <string name="important_notification_incoming_call_with_photo_message_location">ਫ਼ੋਟੋ, ਸੁਨੇਹੇ ਅਤੇ ਟਿਕਾਣੇ ਨਾਲ ਮਹੱਤਵਪੂਰਨ ਇਨਕਮਿੰਗ ਕਾਲ</string>
+  <string name="important_notification_incoming_call_attachments">ਅਟੈਚਮੈਂਟਾਂ ਨਾਲ ਮਹੱਤਵਪੂਰਨ ਇਨਕਮਿੰਗ ਕਾਲ</string>
+  <string name="notification_incoming_work_call">ਕੰਮ ਸਬੰਧਿਤ ਆ ਰਹੀ ਕਾਲ</string>
+  <string name="notification_incoming_spam_call">ਸ਼ੱਕੀ ਸਪੈਮ ਕਾਲ ਆ ਰਹੀ ਹੈ</string>
+  <string name="notification_requesting_video_call">ਇਨਕਮਿੰਗ ਵੀਡੀਓ ਬੇਨਤੀ</string>
+  <string name="notification_action_answer">ਜਵਾਬ ਦਿਓ</string>
+  <string name="notification_action_end_call">ਹੈਂਗ ਅਪ ਕਰੋ</string>
+  <string name="notification_action_answer_video">ਵੀਡੀਓ</string>
+  <string name="notification_action_accept">ਸਵੀਕਾਰ ਕਰੋ</string>
+  <string name="notification_action_dismiss">ਅਸਵੀਕਾਰ ਕਰੋ</string>
+  <string name="notification_action_speaker_on">ਸਪੀਕਰ ਚਾਲੂ ਕਰੋ</string>
+  <string name="notification_action_speaker_off">ਸਪੀਕਰ ਬੰਦ ਕਰੋ</string>
+  <string name="notification_external_call">ਕਿਸੇ ਹੋਰ ਡੀਵਾਈਸ \'ਤੇ ਜਾਰੀ ਕਾਲ</string>
+  <string name="notification_external_video_call">ਕਿਸੇ ਹੋਰ ਡੀਵਾਈਸ \'ਤੇ ਜਾਰੀ ਵੀਡੀਓ ਕਾਲ</string>
+  <string name="notification_take_call">ਕਾਲ ਲਓ</string>
+  <string name="notification_take_video_call">ਵੀਡੀਓ ਕਾਲ ਲਓ</string>
+  <string name="incall_error_supp_service_unknown">ਸੇਵਾ ਸਮਰਥਿਤ ਨਹੀਂ।</string>
+  <string name="goPrivate">ਨਿੱਜੀ ਜਾਓ</string>
+  <string name="manageConferenceLabel">ਕਾਨਫਰੰਸ ਕਾਲ ਦਾ ਪ੍ਰਬੰਧਨ ਕਰੋ</string>
+  <string name="child_number">%s ਰਾਹੀਂ</string>
+  <string name="callFailed_simError">ਕੋਈ SIM ਨਹੀਂ ਜਾਂ SIM ਅਸ਼ੁੱਧੀ</string>
+  <string name="conference_caller_disconnect_content_description">ਕਾਲ ਸਮਾਪਤ ਕਰੋ</string>
+  <string name="conference_call_name">ਕਾਨਫਰੰਸ ਕਾਲ</string>
+  <string name="generic_conference_call_name">ਕਾਲ ਵਿੱਚ</string>
+  <string name="video_call_wifi_to_lte_handover_toast">ਮੋਬਾਈਲ  ਡਾਟੇ  ਦੀ ਵਰਤੋਂ ਕਰਕੇ ਕਾਲ ਜਾਰੀ ਰੱਖੀ ਜਾ ਰਹੀ ਹੈ…</string>
+  <string name="video_call_lte_to_wifi_failed_title">Wi‑Fi ਨੈੱਟਵਰਕ \'ਤੇ ਬਦਲੀ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕੀ</string>
+  <string name="video_call_lte_to_wifi_failed_message">ਵੀਡੀਓ ਕਾਲ ਮੋਬਾਈਲ ਨੈੱਟਵਰਕ \'ਤੇ ਜਾਰੀ ਰਹੇਗੀ। ਮਿਆਰੀ  ਡਾਟਾ  ਖਰਚੇ ਲਾਗੂ ਹੋ ਸਕਦੇ ਹਨ।</string>
+  <string name="video_call_lte_to_wifi_failed_do_not_show">ਇਸ ਨੂੰ ਦੁਬਾਰਾ ਨਾ  ਦਿਖਾਓ </string>
+  <string name="bubble_return_to_call">ਕਾਲ \'ਤੇ ਵਾਪਸ ਜਾਓ</string>
+  <string name="rtt_request_dialog_title">ਕੀ RTT ਕਾਲ ਵਿੱਚ ਸ਼ਾਮਲ ਹੋਣਾ ਹੈ?</string>
+  <string name="rtt_request_dialog_details">%1$s ਤੁਹਾਡੀ ਅਵਾਜ਼ੀ ਕਾਲ ਦੌਰਾਨ ਸੁਨੇਹੇ ਭੇਜਣ ਦਾ ਚਾਹਵਾਨ ਹੈ।</string>
+  <string name="rtt_request_dialog_more_information">RTT ਬੋਲੇ, ਗੂੰਗੇ, ਸੁਣਨ ਸੰਬੰਧੀ ਪਰੇਸ਼ਾਨੀਆਂ ਵਾਲੇ ਕਾਲਰਾਂ ਜਾਂ ਚੀਜ਼ਾਂ ਨੂੰ ਸਮਝਣ ਲਈ ਅਵਾਜ਼ ਤੋਂ ਇਲਾਵਾ ਹੋਰ ਚੀਜ਼ਾਂ \'ਤੇ ਨਿਰਭਰ ਕਰਨ ਵਾਲੇ ਕਾਲਰਾਂ ਦੀ ਸਹਾਇਤਾ ਕਰਦਾ ਹੈ।</string>
+  <string name="rtt_button_decline_request">ਨਹੀਂ ਧੰਨਵਾਦ</string>
+  <string name="rtt_button_accept_request">RTT ਵਿੱਚ ਸ਼ਾਮਲ ਹੋਵੋ</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-pl/strings.xml b/java/com/android/incallui/res/values-pl/strings.xml
index 4a81695..80c4ec0 100644
--- a/java/com/android/incallui/res/values-pl/strings.xml
+++ b/java/com/android/incallui/res/values-pl/strings.xml
@@ -1,79 +1,68 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"Telefon"</string>
-    <string name="wait_prompt_str" msgid="3509685348904329594">"Wysłać następujące dzwonki?\n"</string>
-    <string name="pause_prompt_yes" msgid="4642047011233552973">"Tak"</string>
-    <string name="pause_prompt_no" msgid="4691320111774935838">"Nie"</string>
-    <string name="notification_dialing" msgid="9072177265772083826">"Wybieranie"</string>
-    <string name="notification_ongoing_call" msgid="8712641937577776125">"Trwa połączenie"</string>
-    <string name="notification_ongoing_video_call" msgid="6331318021321487769">"Trwa rozmowa wideo"</string>
-    <string name="notification_ongoing_paused_video_call" msgid="709950253594606371">"Trwa rozmowa wideo – przesyłanie obrazu wstrzymane"</string>
-    <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Trwa połączenie służbowe"</string>
-    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"Trwające <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
-    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"Przychodzące <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
-    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"połączenie przez Wi-Fi"</string>
-    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"połączenie służbowe przez Wi-Fi"</string>
-    <string name="notification_on_hold" msgid="7141827443379205682">"Oczekujące"</string>
-    <string name="notification_incoming_call" msgid="7520580807513849283">"Połączenie"</string>
-    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Połączenie przychodzące ze zdjęciem"</string>
-    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"Połączenie przychodzące z wiadomością"</string>
-    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"Połączenie przychodzące z lokalizacją"</string>
-    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"Połączenie przychodzące ze zdjęciem i wiadomością"</string>
-    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"Połączenie przychodzące ze zdjęciem i lokalizacją"</string>
-    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"Połączenie z wiadomością i lokalizacją"</string>
-    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"Połączenie ze zdjęciem, wiadomością i lokalizacją"</string>
-    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"Połączenie przychodzące z załącznikami"</string>
-    <string name="important_notification_incoming_call" msgid="2867013954509930989">"Ważne połączenie przychodzące"</string>
-    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"Ważne połączenie przychodzące ze zdjęciem"</string>
-    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"Ważne połączenie przychodzące z wiadomością"</string>
-    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"Ważne połączenie przychodzące z lokalizacją"</string>
-    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"Ważne połączenie ze zdjęciem i wiadomością"</string>
-    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"Ważne połączenie ze zdjęciem i lokalizacją"</string>
-    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"Ważne połączenie z wiadomością i lokalizacją"</string>
-    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Ważne połączenie przychodzące z załącznikami"</string>
-    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Ważne połączenie przychodzące z załącznikami"</string>
-    <string name="notification_incoming_work_call" msgid="5291275092734261918">"Przychodzące połączenie służbowe"</string>
-    <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Przychodzące połączenie podejrzanie o spam"</string>
-    <string name="notification_requesting_video_call" msgid="1807679328811515758">"Przychodzące żądanie wideo"</string>
-    <string name="notification_action_answer" msgid="8748275902211192568">"Odbierz"</string>
-    <string name="notification_action_end_call" msgid="7467258454170007765">"Rozłącz"</string>
-    <string name="notification_action_answer_video" msgid="8488108892919917287">"Rozmowa wideo"</string>
-    <string name="notification_action_accept" msgid="1272761514200507143">"Zaakceptuj"</string>
-    <string name="notification_action_dismiss" msgid="3128241581632616226">"Odrzuć"</string>
-    <string name="notification_action_speaker_on" msgid="1882659234405596540">"Włącz głośnik"</string>
-    <string name="notification_action_speaker_off" msgid="6340085043115533948">"Wyłącz głośnik"</string>
-    <string name="notification_external_call" msgid="2504334597315343920">"Trwająca rozmowa na innym urządzeniu"</string>
-    <string name="notification_external_video_call" msgid="7709394856028436683">"Trwająca rozmowa wideo na innym urządzeniu"</string>
-    <string name="notification_take_call" msgid="5631659438864492229">"Odbierz rozmowę"</string>
-    <string name="notification_take_video_call" msgid="4473387503712341390">"Odbierz rozmowę wideo"</string>
-    <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"Usługa nie jest obsługiwana."</string>
-    <string name="goPrivate" msgid="5269514638004595378">"przejdź do rozmowy prywatnej"</string>
-    <string name="manageConferenceLabel" msgid="3589379023518128318">"Zarządzaj połączeniem konferencyjnym"</string>
-    <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"Numer alarmowy"</string>
-    <string name="child_number" msgid="3398257437107259682">"z <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
-    <string name="callFailed_simError" msgid="4587775795711340072">"Brak lub błąd karty SIM"</string>
-    <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Zakończ połączenie"</string>
-    <string name="conference_call_name" msgid="8189987124611337174">"Połączenie konferencyjne"</string>
-    <string name="generic_conference_call_name" msgid="1546941472424243894">"W trakcie rozmowy"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Kontynuuję rozmowę przy użyciu mobilnej transmisji danych…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Nie udało się przełączyć na sieć Wi-Fi"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Rozmowa wideo będzie nadal prowadzona przez sieć komórkową. Za transfer danych może zostać pobrana opłata."</string>
-    <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Nie pokazuj ponownie tego komunikatu"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="wait_prompt_str">Wysłać następujące dzwonki?\n</string>
+  <string name="pause_prompt_yes">Tak</string>
+  <string name="pause_prompt_no">Nie</string>
+  <string name="notification_dialing">Wybieranie</string>
+  <string name="notification_ongoing_call">Trwa połączenie</string>
+  <string name="notification_ongoing_video_call">Trwa rozmowa wideo</string>
+  <string name="notification_ongoing_paused_video_call">Trwa rozmowa wideo – przesyłanie obrazu wstrzymane</string>
+  <string name="notification_ongoing_work_call">Trwa połączenie służbowe</string>
+  <string name="notification_ongoing_call_wifi_template">Trwające %1$s</string>
+  <string name="notification_incoming_call_wifi_template">Przychodzące %1$s</string>
+  <string name="notification_call_wifi_brand">połączenie przez Wi-Fi</string>
+  <string name="notification_call_wifi_work_brand">połączenie służbowe przez Wi-Fi</string>
+  <string name="notification_on_hold">Oczekujące</string>
+  <string name="notification_incoming_call">Połączenie</string>
+  <string name="notification_incoming_video_call">Przychodząca rozmowa wideo</string>
+  <string name="notification_incoming_call_mutli_sim">Połączenie przychodzące przez %1$s</string>
+  <string name="notification_incoming_call_with_photo">Połączenie przychodzące ze zdjęciem</string>
+  <string name="notification_incoming_call_with_message">Połączenie przychodzące z wiadomością</string>
+  <string name="notification_incoming_call_with_location">Połączenie przychodzące z lokalizacją</string>
+  <string name="notification_incoming_call_with_photo_message">Połączenie przychodzące ze zdjęciem i wiadomością</string>
+  <string name="notification_incoming_call_with_photo_location">Połączenie przychodzące ze zdjęciem i lokalizacją</string>
+  <string name="notification_incoming_call_with_message_location">Połączenie z wiadomością i lokalizacją</string>
+  <string name="notification_incoming_call_with_photo_message_location">Połączenie ze zdjęciem, wiadomością i lokalizacją</string>
+  <string name="notification_incoming_call_attachments">Połączenie przychodzące z załącznikami</string>
+  <string name="important_notification_incoming_call">Ważne połączenie przychodzące</string>
+  <string name="important_notification_incoming_call_with_photo">Ważne połączenie przychodzące ze zdjęciem</string>
+  <string name="important_notification_incoming_call_with_message">Ważne połączenie przychodzące z wiadomością</string>
+  <string name="important_notification_incoming_call_with_location">Ważne połączenie przychodzące z lokalizacją</string>
+  <string name="important_notification_incoming_call_with_photo_message">Ważne połączenie ze zdjęciem i wiadomością</string>
+  <string name="important_notification_incoming_call_with_photo_location">Ważne połączenie ze zdjęciem i lokalizacją</string>
+  <string name="important_notification_incoming_call_with_message_location">Ważne połączenie z wiadomością i lokalizacją</string>
+  <string name="important_notification_incoming_call_with_photo_message_location">Ważne połączenie przychodzące z załącznikami</string>
+  <string name="important_notification_incoming_call_attachments">Ważne połączenie przychodzące z załącznikami</string>
+  <string name="notification_incoming_work_call">Przychodzące połączenie służbowe</string>
+  <string name="notification_incoming_spam_call">Przychodzące połączenie podejrzanie o spam</string>
+  <string name="notification_requesting_video_call">Przychodzące żądanie wideo</string>
+  <string name="notification_action_answer">Odbierz</string>
+  <string name="notification_action_end_call">Rozłącz</string>
+  <string name="notification_action_answer_video">Rozmowa wideo</string>
+  <string name="notification_action_accept">Zaakceptuj</string>
+  <string name="notification_action_dismiss">Odrzuć</string>
+  <string name="notification_action_speaker_on">Włącz głośnik</string>
+  <string name="notification_action_speaker_off">Wyłącz głośnik</string>
+  <string name="notification_external_call">Trwająca rozmowa na innym urządzeniu</string>
+  <string name="notification_external_video_call">Trwająca rozmowa wideo na innym urządzeniu</string>
+  <string name="notification_take_call">Odbierz rozmowę</string>
+  <string name="notification_take_video_call">Odbierz rozmowę wideo</string>
+  <string name="incall_error_supp_service_unknown">Usługa nie jest obsługiwana.</string>
+  <string name="goPrivate">przejdź do rozmowy prywatnej</string>
+  <string name="manageConferenceLabel">Zarządzaj połączeniem konferencyjnym</string>
+  <string name="child_number">z %s</string>
+  <string name="callFailed_simError">Brak lub błąd karty SIM</string>
+  <string name="conference_caller_disconnect_content_description">Zakończ połączenie</string>
+  <string name="conference_call_name">Połączenie konferencyjne</string>
+  <string name="generic_conference_call_name">W trakcie rozmowy</string>
+  <string name="video_call_wifi_to_lte_handover_toast">Kontynuuję rozmowę przy użyciu mobilnej transmisji danych…</string>
+  <string name="video_call_lte_to_wifi_failed_title">Nie udało się przełączyć na sieć Wi-Fi</string>
+  <string name="video_call_lte_to_wifi_failed_message">Rozmowa wideo będzie nadal prowadzona przez sieć komórkową. Za transfer danych może zostać pobrana opłata.</string>
+  <string name="video_call_lte_to_wifi_failed_do_not_show">Nie pokazuj ponownie tego komunikatu</string>
+  <string name="bubble_return_to_call">Powrót do połączenia</string>
+  <string name="rtt_request_dialog_title">Dołączyć do połączenia RTT?</string>
+  <string name="rtt_request_dialog_details">%1$s chce używać czatu podczas rozmowy głosowej.</string>
+  <string name="rtt_request_dialog_more_information">RTT pomaga osobom niesłyszącym, niedosłyszącym, mającym problemy z mówieniem oraz potrzebującym czegoś więcej oprócz głosu.</string>
+  <string name="rtt_button_decline_request">Nie</string>
+  <string name="rtt_button_accept_request">Skorzystaj z RTT</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-pt-rBR/strings.xml b/java/com/android/incallui/res/values-pt-rBR/strings.xml
index 6eb3a33..8bd2cb8 100644
--- a/java/com/android/incallui/res/values-pt-rBR/strings.xml
+++ b/java/com/android/incallui/res/values-pt-rBR/strings.xml
@@ -1,79 +1,68 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"Telefone"</string>
-    <string name="wait_prompt_str" msgid="3509685348904329594">"Enviar os toques a seguir?\n"</string>
-    <string name="pause_prompt_yes" msgid="4642047011233552973">"Sim"</string>
-    <string name="pause_prompt_no" msgid="4691320111774935838">"Não"</string>
-    <string name="notification_dialing" msgid="9072177265772083826">"Discando"</string>
-    <string name="notification_ongoing_call" msgid="8712641937577776125">"Chamada em andamento"</string>
-    <string name="notification_ongoing_video_call" msgid="6331318021321487769">"Videochamada em andamento"</string>
-    <string name="notification_ongoing_paused_video_call" msgid="709950253594606371">"Videochamada em andamento: vídeo pausado"</string>
-    <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Chamada de trabalho em andamento"</string>
-    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"<xliff:g id="BRAND_NAME">%1$s</xliff:g> em andamento"</string>
-    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"<xliff:g id="BRAND_NAME">%1$s</xliff:g> recebida"</string>
-    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"Chamada por Wi-Fi"</string>
-    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"Chamada de trabalho por Wi-Fi"</string>
-    <string name="notification_on_hold" msgid="7141827443379205682">"Em espera"</string>
-    <string name="notification_incoming_call" msgid="7520580807513849283">"Chamada recebida"</string>
-    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Chamada recebida com foto"</string>
-    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"Chamada recebida com mensagem"</string>
-    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"Chamada recebida com local"</string>
-    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"Chamada recebida com foto e mensagem"</string>
-    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"Chamada recebida com foto e local"</string>
-    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"Chamada recebida com mensagem e local"</string>
-    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"Chamada recebida com foto, mensagem e local"</string>
-    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"Chamada recebida com anexos"</string>
-    <string name="important_notification_incoming_call" msgid="2867013954509930989">"Chamada recebida importante"</string>
-    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"Chamada recebida importante com foto"</string>
-    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"Chamada recebida importante com mensagem"</string>
-    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"Chamada recebida importante com local"</string>
-    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"Chamada recebida importante com foto e mensagem"</string>
-    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"Chamada recebida importante com foto e local"</string>
-    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"Chamada recebida importante com mensagem e local"</string>
-    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Chamada recebida importante com foto, mensagem e local"</string>
-    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Chamada recebida importante com anexos"</string>
-    <string name="notification_incoming_work_call" msgid="5291275092734261918">"Chamada de trabalho recebida"</string>
-    <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Chamada recebida suspeita (spam)"</string>
-    <string name="notification_requesting_video_call" msgid="1807679328811515758">"Recebendo solicitação de vídeo"</string>
-    <string name="notification_action_answer" msgid="8748275902211192568">"Atender"</string>
-    <string name="notification_action_end_call" msgid="7467258454170007765">"Desligar"</string>
-    <string name="notification_action_answer_video" msgid="8488108892919917287">"Vídeo"</string>
-    <string name="notification_action_accept" msgid="1272761514200507143">"Aceitar"</string>
-    <string name="notification_action_dismiss" msgid="3128241581632616226">"Recusar"</string>
-    <string name="notification_action_speaker_on" msgid="1882659234405596540">"Ativar alto-falante"</string>
-    <string name="notification_action_speaker_off" msgid="6340085043115533948">"Desativar alto-falante"</string>
-    <string name="notification_external_call" msgid="2504334597315343920">"Chamada em andamento em outro dispositivo"</string>
-    <string name="notification_external_video_call" msgid="7709394856028436683">"Videochamada em andamento em outro dispositivo"</string>
-    <string name="notification_take_call" msgid="5631659438864492229">"Atender à chamada"</string>
-    <string name="notification_take_video_call" msgid="4473387503712341390">"Atender à videochamada"</string>
-    <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"Serviço não suportado."</string>
-    <string name="goPrivate" msgid="5269514638004595378">"conversar em particular"</string>
-    <string name="manageConferenceLabel" msgid="3589379023518128318">"Gerenciar teleconferência"</string>
-    <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"Número de emergência"</string>
-    <string name="child_number" msgid="3398257437107259682">"via <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
-    <string name="callFailed_simError" msgid="4587775795711340072">"Sem SIM ou erro de SIM"</string>
-    <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Encerrar chamada"</string>
-    <string name="conference_call_name" msgid="8189987124611337174">"Teleconferência"</string>
-    <string name="generic_conference_call_name" msgid="1546941472424243894">"Em chamada"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Continuando chamada por dados móveis…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Não foi possível alternar para a rede Wi-Fi"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"A videochamada continuará via rede móvel. O uso de dados está sujeito a cobranças padrão."</string>
-    <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Não exibir novamente"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="wait_prompt_str">Enviar os toques a seguir?\n</string>
+  <string name="pause_prompt_yes">Sim</string>
+  <string name="pause_prompt_no">Não</string>
+  <string name="notification_dialing">Discando</string>
+  <string name="notification_ongoing_call">Chamada em andamento</string>
+  <string name="notification_ongoing_video_call">Videochamada em andamento</string>
+  <string name="notification_ongoing_paused_video_call">Videochamada em andamento: vídeo pausado</string>
+  <string name="notification_ongoing_work_call">Chamada de trabalho em andamento</string>
+  <string name="notification_ongoing_call_wifi_template">%1$s em andamento</string>
+  <string name="notification_incoming_call_wifi_template">%1$s recebida</string>
+  <string name="notification_call_wifi_brand">Chamada por Wi-Fi</string>
+  <string name="notification_call_wifi_work_brand">Chamada de trabalho por Wi-Fi</string>
+  <string name="notification_on_hold">Em espera</string>
+  <string name="notification_incoming_call">Chamada recebida</string>
+  <string name="notification_incoming_video_call">Recebendo videochamada</string>
+  <string name="notification_incoming_call_mutli_sim">Chamada recebida via %1$s</string>
+  <string name="notification_incoming_call_with_photo">Chamada recebida com foto</string>
+  <string name="notification_incoming_call_with_message">Chamada recebida com mensagem</string>
+  <string name="notification_incoming_call_with_location">Chamada recebida com local</string>
+  <string name="notification_incoming_call_with_photo_message">Chamada recebida com foto e mensagem</string>
+  <string name="notification_incoming_call_with_photo_location">Chamada recebida com foto e local</string>
+  <string name="notification_incoming_call_with_message_location">Chamada recebida com mensagem e local</string>
+  <string name="notification_incoming_call_with_photo_message_location">Chamada recebida com foto, mensagem e local</string>
+  <string name="notification_incoming_call_attachments">Chamada recebida com anexos</string>
+  <string name="important_notification_incoming_call">Chamada recebida importante</string>
+  <string name="important_notification_incoming_call_with_photo">Chamada recebida importante com foto</string>
+  <string name="important_notification_incoming_call_with_message">Chamada recebida importante com mensagem</string>
+  <string name="important_notification_incoming_call_with_location">Chamada recebida importante com local</string>
+  <string name="important_notification_incoming_call_with_photo_message">Chamada recebida importante com foto e mensagem</string>
+  <string name="important_notification_incoming_call_with_photo_location">Chamada recebida importante com foto e local</string>
+  <string name="important_notification_incoming_call_with_message_location">Chamada recebida importante com mensagem e local</string>
+  <string name="important_notification_incoming_call_with_photo_message_location">Chamada recebida importante com foto, mensagem e local</string>
+  <string name="important_notification_incoming_call_attachments">Chamada recebida importante com anexos</string>
+  <string name="notification_incoming_work_call">Chamada de trabalho recebida</string>
+  <string name="notification_incoming_spam_call">Chamada recebida suspeita (spam)</string>
+  <string name="notification_requesting_video_call">Recebendo solicitação de vídeo</string>
+  <string name="notification_action_answer">Atender</string>
+  <string name="notification_action_end_call">Desligar</string>
+  <string name="notification_action_answer_video">Vídeo</string>
+  <string name="notification_action_accept">Aceitar</string>
+  <string name="notification_action_dismiss">Recusar</string>
+  <string name="notification_action_speaker_on">Ativar alto-falante</string>
+  <string name="notification_action_speaker_off">Desativar alto-falante</string>
+  <string name="notification_external_call">Chamada em andamento em outro dispositivo</string>
+  <string name="notification_external_video_call">Videochamada em andamento em outro dispositivo</string>
+  <string name="notification_take_call">Atender à chamada</string>
+  <string name="notification_take_video_call">Atender à videochamada</string>
+  <string name="incall_error_supp_service_unknown">Serviço não suportado.</string>
+  <string name="goPrivate">conversar em particular</string>
+  <string name="manageConferenceLabel">Gerenciar conferência</string>
+  <string name="child_number">via %s</string>
+  <string name="callFailed_simError">Sem SIM ou erro de SIM</string>
+  <string name="conference_caller_disconnect_content_description">Encerrar chamada</string>
+  <string name="conference_call_name">Conferência</string>
+  <string name="generic_conference_call_name">Em chamada</string>
+  <string name="video_call_wifi_to_lte_handover_toast">Continuando chamada por dados móveis…</string>
+  <string name="video_call_lte_to_wifi_failed_title">Não foi possível alternar para a rede Wi-Fi</string>
+  <string name="video_call_lte_to_wifi_failed_message">A videochamada continuará via rede móvel. O uso de dados está sujeito a cobranças padrão.</string>
+  <string name="video_call_lte_to_wifi_failed_do_not_show">Não exibir novamente</string>
+  <string name="bubble_return_to_call">Voltar à chamada</string>
+  <string name="rtt_request_dialog_title">Participar da chamada RTT?</string>
+  <string name="rtt_request_dialog_details">%1$s quer usar mensagens de texto com sua chamada de voz.</string>
+  <string name="rtt_request_dialog_more_information">A RTT ajuda os autores das chamadas com deficiências como surdez, dificuldade de audição ou fala ou que precisam de outros recursos além de voz.</string>
+  <string name="rtt_button_decline_request">Não</string>
+  <string name="rtt_button_accept_request">Participar da RTT</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-pt-rPT/strings.xml b/java/com/android/incallui/res/values-pt-rPT/strings.xml
index a3ec692..cbdab42 100644
--- a/java/com/android/incallui/res/values-pt-rPT/strings.xml
+++ b/java/com/android/incallui/res/values-pt-rPT/strings.xml
@@ -1,79 +1,68 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"Telefone"</string>
-    <string name="wait_prompt_str" msgid="3509685348904329594">"Enviar os seguintes tons?\n"</string>
-    <string name="pause_prompt_yes" msgid="4642047011233552973">"Sim"</string>
-    <string name="pause_prompt_no" msgid="4691320111774935838">"Não"</string>
-    <string name="notification_dialing" msgid="9072177265772083826">"A marcar"</string>
-    <string name="notification_ongoing_call" msgid="8712641937577776125">"Chamada em curso"</string>
-    <string name="notification_ongoing_video_call" msgid="6331318021321487769">"Videochamada em curso"</string>
-    <string name="notification_ongoing_paused_video_call" msgid="709950253594606371">"Videochamada em curso ‑ vídeo em pausa"</string>
-    <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Chamada de trabalho em curso"</string>
-    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"<xliff:g id="BRAND_NAME">%1$s</xliff:g> em curso"</string>
-    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"<xliff:g id="BRAND_NAME">%1$s</xliff:g> recebida"</string>
-    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"Chamada Wi-Fi"</string>
-    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"Chamada de trabalho Wi‑Fi"</string>
-    <string name="notification_on_hold" msgid="7141827443379205682">"Em espera"</string>
-    <string name="notification_incoming_call" msgid="7520580807513849283">"Chamada recebida"</string>
-    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Chamada recebida com foto"</string>
-    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"Chamada recebida com mensagem"</string>
-    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"Chamada recebida com localização"</string>
-    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"Chamada recebida com foto e mensagem"</string>
-    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"Chamada recebida com foto e localização"</string>
-    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"Chamada recebida com mensagem e localização"</string>
-    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"Chamada recebida com foto, mensagem e localização"</string>
-    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"Chamada recebida com anexos"</string>
-    <string name="important_notification_incoming_call" msgid="2867013954509930989">"Chamada recebida importante"</string>
-    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"Chamada recebida importante com foto"</string>
-    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"Chama recebida importante com mensagem"</string>
-    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"Chamada recebida importante com localização"</string>
-    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"Chamada recebida importante com foto e mensagem"</string>
-    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"Chamada recebida importante com foto e localização"</string>
-    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"Chamada recebida importante c/ mensagem e localiz."</string>
-    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"."</string>
-    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Chamada recebida importante com anexos"</string>
-    <string name="notification_incoming_work_call" msgid="5291275092734261918">"Chamada de trabalho recebida"</string>
-    <string name="notification_incoming_spam_call" msgid="7591506944666791937">"A receber chamada spam suspeita"</string>
-    <string name="notification_requesting_video_call" msgid="1807679328811515758">"Pedido de vídeo recebido"</string>
-    <string name="notification_action_answer" msgid="8748275902211192568">"Atender"</string>
-    <string name="notification_action_end_call" msgid="7467258454170007765">"Desligar"</string>
-    <string name="notification_action_answer_video" msgid="8488108892919917287">"Vídeo"</string>
-    <string name="notification_action_accept" msgid="1272761514200507143">"Aceitar"</string>
-    <string name="notification_action_dismiss" msgid="3128241581632616226">"Recusar"</string>
-    <string name="notification_action_speaker_on" msgid="1882659234405596540">"Ligar altifalante"</string>
-    <string name="notification_action_speaker_off" msgid="6340085043115533948">"Desligar altifalante"</string>
-    <string name="notification_external_call" msgid="2504334597315343920">"Chamada em curso noutro dispositivo"</string>
-    <string name="notification_external_video_call" msgid="7709394856028436683">"Chamada em curso noutro dispositivo"</string>
-    <string name="notification_take_call" msgid="5631659438864492229">"Aceitar chamada"</string>
-    <string name="notification_take_video_call" msgid="4473387503712341390">"Aceitar videochamada"</string>
-    <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"Serviço não suportado."</string>
-    <string name="goPrivate" msgid="5269514638004595378">"tornar privado"</string>
-    <string name="manageConferenceLabel" msgid="3589379023518128318">"Gerir conferência"</string>
-    <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"Número de emergência"</string>
-    <string name="child_number" msgid="3398257437107259682">"através de <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
-    <string name="callFailed_simError" msgid="4587775795711340072">"Sem cartão SIM ou erro do cartão"</string>
-    <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Terminar chamada"</string>
-    <string name="conference_call_name" msgid="8189987124611337174">"Chamada de conferência"</string>
-    <string name="generic_conference_call_name" msgid="1546941472424243894">"Numa chamada"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"A continuar a chamada com dados móveis…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Não foi possível mudar para a rede Wi-Fi."</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"As videochamadas irão continuar a ser efetuadas através da rede móvel. Poderão ser aplicados custos de dados padrão."</string>
-    <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Não voltar a mostrar este aviso"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="wait_prompt_str">Enviar os seguintes tons?\n</string>
+  <string name="pause_prompt_yes">Sim</string>
+  <string name="pause_prompt_no">Não</string>
+  <string name="notification_dialing">A marcar</string>
+  <string name="notification_ongoing_call">Chamada em curso</string>
+  <string name="notification_ongoing_video_call">Videochamada em curso</string>
+  <string name="notification_ongoing_paused_video_call">Videochamada em curso ‑ vídeo em pausa</string>
+  <string name="notification_ongoing_work_call">Chamada de trabalho em curso</string>
+  <string name="notification_ongoing_call_wifi_template">%1$s em curso</string>
+  <string name="notification_incoming_call_wifi_template">%1$s recebida</string>
+  <string name="notification_call_wifi_brand">Chamada Wi-Fi</string>
+  <string name="notification_call_wifi_work_brand">Chamada de trabalho Wi‑Fi</string>
+  <string name="notification_on_hold">Em espera</string>
+  <string name="notification_incoming_call">Chamada recebida</string>
+  <string name="notification_incoming_video_call">A receber videochamada</string>
+  <string name="notification_incoming_call_mutli_sim">Chamada recebida através de %1$s</string>
+  <string name="notification_incoming_call_with_photo">Chamada recebida com foto</string>
+  <string name="notification_incoming_call_with_message">Chamada recebida com mensagem</string>
+  <string name="notification_incoming_call_with_location">Chamada recebida com localização</string>
+  <string name="notification_incoming_call_with_photo_message">Chamada recebida com foto e mensagem</string>
+  <string name="notification_incoming_call_with_photo_location">Chamada recebida com foto e localização</string>
+  <string name="notification_incoming_call_with_message_location">Chamada recebida com mensagem e localização</string>
+  <string name="notification_incoming_call_with_photo_message_location">Chamada recebida com foto, mensagem e localização</string>
+  <string name="notification_incoming_call_attachments">Chamada recebida com anexos</string>
+  <string name="important_notification_incoming_call">Chamada recebida importante</string>
+  <string name="important_notification_incoming_call_with_photo">Chamada recebida importante com foto</string>
+  <string name="important_notification_incoming_call_with_message">Chama recebida importante com mensagem</string>
+  <string name="important_notification_incoming_call_with_location">Chamada recebida importante com localização</string>
+  <string name="important_notification_incoming_call_with_photo_message">Chamada recebida importante com foto e mensagem</string>
+  <string name="important_notification_incoming_call_with_photo_location">Chamada recebida importante com foto e localização</string>
+  <string name="important_notification_incoming_call_with_message_location">Chamada recebida importante c/ mensagem e localiz.</string>
+  <string name="important_notification_incoming_call_with_photo_message_location">.</string>
+  <string name="important_notification_incoming_call_attachments">Chamada recebida importante com anexos</string>
+  <string name="notification_incoming_work_call">Chamada de trabalho recebida</string>
+  <string name="notification_incoming_spam_call">A receber chamada spam suspeita</string>
+  <string name="notification_requesting_video_call">Pedido de vídeo recebido</string>
+  <string name="notification_action_answer">Atender</string>
+  <string name="notification_action_end_call">Desligar</string>
+  <string name="notification_action_answer_video">Vídeo</string>
+  <string name="notification_action_accept">Aceitar</string>
+  <string name="notification_action_dismiss">Recusar</string>
+  <string name="notification_action_speaker_on">Ligar altifalante</string>
+  <string name="notification_action_speaker_off">Desligar altifalante</string>
+  <string name="notification_external_call">Chamada em curso noutro dispositivo</string>
+  <string name="notification_external_video_call">Chamada em curso noutro dispositivo</string>
+  <string name="notification_take_call">Aceitar chamada</string>
+  <string name="notification_take_video_call">Aceitar videochamada</string>
+  <string name="incall_error_supp_service_unknown">Serviço não suportado.</string>
+  <string name="goPrivate">tornar privado</string>
+  <string name="manageConferenceLabel">Gerir conferência</string>
+  <string name="child_number">através de %s</string>
+  <string name="callFailed_simError">Sem cartão SIM ou erro do cartão</string>
+  <string name="conference_caller_disconnect_content_description">Terminar chamada</string>
+  <string name="conference_call_name">Chamada de conferência</string>
+  <string name="generic_conference_call_name">Numa chamada</string>
+  <string name="video_call_wifi_to_lte_handover_toast">A continuar a chamada com dados móveis…</string>
+  <string name="video_call_lte_to_wifi_failed_title">Não foi possível mudar para a rede Wi-Fi.</string>
+  <string name="video_call_lte_to_wifi_failed_message">As videochamadas irão continuar a ser efetuadas através da rede móvel. Poderão ser aplicados custos de dados padrão.</string>
+  <string name="video_call_lte_to_wifi_failed_do_not_show">Não voltar a mostrar este aviso</string>
+  <string name="bubble_return_to_call">Voltar à chamada</string>
+  <string name="rtt_request_dialog_title">Pretende participar na chamada RTT?</string>
+  <string name="rtt_request_dialog_details">%1$s pretende utilizar mensagens na sua chamada de voz.</string>
+  <string name="rtt_request_dialog_more_information">A RTT assiste os autores de chamadas surdos, com deficiências auditivas, dificuldades da fala ou que precisem de mais do que apenas a voz.</string>
+  <string name="rtt_button_decline_request">Não, obrigado</string>
+  <string name="rtt_button_accept_request">Participar na RTT</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-pt/strings.xml b/java/com/android/incallui/res/values-pt/strings.xml
index 6eb3a33..8bd2cb8 100644
--- a/java/com/android/incallui/res/values-pt/strings.xml
+++ b/java/com/android/incallui/res/values-pt/strings.xml
@@ -1,79 +1,68 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"Telefone"</string>
-    <string name="wait_prompt_str" msgid="3509685348904329594">"Enviar os toques a seguir?\n"</string>
-    <string name="pause_prompt_yes" msgid="4642047011233552973">"Sim"</string>
-    <string name="pause_prompt_no" msgid="4691320111774935838">"Não"</string>
-    <string name="notification_dialing" msgid="9072177265772083826">"Discando"</string>
-    <string name="notification_ongoing_call" msgid="8712641937577776125">"Chamada em andamento"</string>
-    <string name="notification_ongoing_video_call" msgid="6331318021321487769">"Videochamada em andamento"</string>
-    <string name="notification_ongoing_paused_video_call" msgid="709950253594606371">"Videochamada em andamento: vídeo pausado"</string>
-    <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Chamada de trabalho em andamento"</string>
-    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"<xliff:g id="BRAND_NAME">%1$s</xliff:g> em andamento"</string>
-    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"<xliff:g id="BRAND_NAME">%1$s</xliff:g> recebida"</string>
-    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"Chamada por Wi-Fi"</string>
-    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"Chamada de trabalho por Wi-Fi"</string>
-    <string name="notification_on_hold" msgid="7141827443379205682">"Em espera"</string>
-    <string name="notification_incoming_call" msgid="7520580807513849283">"Chamada recebida"</string>
-    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Chamada recebida com foto"</string>
-    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"Chamada recebida com mensagem"</string>
-    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"Chamada recebida com local"</string>
-    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"Chamada recebida com foto e mensagem"</string>
-    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"Chamada recebida com foto e local"</string>
-    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"Chamada recebida com mensagem e local"</string>
-    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"Chamada recebida com foto, mensagem e local"</string>
-    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"Chamada recebida com anexos"</string>
-    <string name="important_notification_incoming_call" msgid="2867013954509930989">"Chamada recebida importante"</string>
-    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"Chamada recebida importante com foto"</string>
-    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"Chamada recebida importante com mensagem"</string>
-    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"Chamada recebida importante com local"</string>
-    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"Chamada recebida importante com foto e mensagem"</string>
-    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"Chamada recebida importante com foto e local"</string>
-    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"Chamada recebida importante com mensagem e local"</string>
-    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Chamada recebida importante com foto, mensagem e local"</string>
-    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Chamada recebida importante com anexos"</string>
-    <string name="notification_incoming_work_call" msgid="5291275092734261918">"Chamada de trabalho recebida"</string>
-    <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Chamada recebida suspeita (spam)"</string>
-    <string name="notification_requesting_video_call" msgid="1807679328811515758">"Recebendo solicitação de vídeo"</string>
-    <string name="notification_action_answer" msgid="8748275902211192568">"Atender"</string>
-    <string name="notification_action_end_call" msgid="7467258454170007765">"Desligar"</string>
-    <string name="notification_action_answer_video" msgid="8488108892919917287">"Vídeo"</string>
-    <string name="notification_action_accept" msgid="1272761514200507143">"Aceitar"</string>
-    <string name="notification_action_dismiss" msgid="3128241581632616226">"Recusar"</string>
-    <string name="notification_action_speaker_on" msgid="1882659234405596540">"Ativar alto-falante"</string>
-    <string name="notification_action_speaker_off" msgid="6340085043115533948">"Desativar alto-falante"</string>
-    <string name="notification_external_call" msgid="2504334597315343920">"Chamada em andamento em outro dispositivo"</string>
-    <string name="notification_external_video_call" msgid="7709394856028436683">"Videochamada em andamento em outro dispositivo"</string>
-    <string name="notification_take_call" msgid="5631659438864492229">"Atender à chamada"</string>
-    <string name="notification_take_video_call" msgid="4473387503712341390">"Atender à videochamada"</string>
-    <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"Serviço não suportado."</string>
-    <string name="goPrivate" msgid="5269514638004595378">"conversar em particular"</string>
-    <string name="manageConferenceLabel" msgid="3589379023518128318">"Gerenciar teleconferência"</string>
-    <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"Número de emergência"</string>
-    <string name="child_number" msgid="3398257437107259682">"via <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
-    <string name="callFailed_simError" msgid="4587775795711340072">"Sem SIM ou erro de SIM"</string>
-    <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Encerrar chamada"</string>
-    <string name="conference_call_name" msgid="8189987124611337174">"Teleconferência"</string>
-    <string name="generic_conference_call_name" msgid="1546941472424243894">"Em chamada"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Continuando chamada por dados móveis…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Não foi possível alternar para a rede Wi-Fi"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"A videochamada continuará via rede móvel. O uso de dados está sujeito a cobranças padrão."</string>
-    <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Não exibir novamente"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="wait_prompt_str">Enviar os toques a seguir?\n</string>
+  <string name="pause_prompt_yes">Sim</string>
+  <string name="pause_prompt_no">Não</string>
+  <string name="notification_dialing">Discando</string>
+  <string name="notification_ongoing_call">Chamada em andamento</string>
+  <string name="notification_ongoing_video_call">Videochamada em andamento</string>
+  <string name="notification_ongoing_paused_video_call">Videochamada em andamento: vídeo pausado</string>
+  <string name="notification_ongoing_work_call">Chamada de trabalho em andamento</string>
+  <string name="notification_ongoing_call_wifi_template">%1$s em andamento</string>
+  <string name="notification_incoming_call_wifi_template">%1$s recebida</string>
+  <string name="notification_call_wifi_brand">Chamada por Wi-Fi</string>
+  <string name="notification_call_wifi_work_brand">Chamada de trabalho por Wi-Fi</string>
+  <string name="notification_on_hold">Em espera</string>
+  <string name="notification_incoming_call">Chamada recebida</string>
+  <string name="notification_incoming_video_call">Recebendo videochamada</string>
+  <string name="notification_incoming_call_mutli_sim">Chamada recebida via %1$s</string>
+  <string name="notification_incoming_call_with_photo">Chamada recebida com foto</string>
+  <string name="notification_incoming_call_with_message">Chamada recebida com mensagem</string>
+  <string name="notification_incoming_call_with_location">Chamada recebida com local</string>
+  <string name="notification_incoming_call_with_photo_message">Chamada recebida com foto e mensagem</string>
+  <string name="notification_incoming_call_with_photo_location">Chamada recebida com foto e local</string>
+  <string name="notification_incoming_call_with_message_location">Chamada recebida com mensagem e local</string>
+  <string name="notification_incoming_call_with_photo_message_location">Chamada recebida com foto, mensagem e local</string>
+  <string name="notification_incoming_call_attachments">Chamada recebida com anexos</string>
+  <string name="important_notification_incoming_call">Chamada recebida importante</string>
+  <string name="important_notification_incoming_call_with_photo">Chamada recebida importante com foto</string>
+  <string name="important_notification_incoming_call_with_message">Chamada recebida importante com mensagem</string>
+  <string name="important_notification_incoming_call_with_location">Chamada recebida importante com local</string>
+  <string name="important_notification_incoming_call_with_photo_message">Chamada recebida importante com foto e mensagem</string>
+  <string name="important_notification_incoming_call_with_photo_location">Chamada recebida importante com foto e local</string>
+  <string name="important_notification_incoming_call_with_message_location">Chamada recebida importante com mensagem e local</string>
+  <string name="important_notification_incoming_call_with_photo_message_location">Chamada recebida importante com foto, mensagem e local</string>
+  <string name="important_notification_incoming_call_attachments">Chamada recebida importante com anexos</string>
+  <string name="notification_incoming_work_call">Chamada de trabalho recebida</string>
+  <string name="notification_incoming_spam_call">Chamada recebida suspeita (spam)</string>
+  <string name="notification_requesting_video_call">Recebendo solicitação de vídeo</string>
+  <string name="notification_action_answer">Atender</string>
+  <string name="notification_action_end_call">Desligar</string>
+  <string name="notification_action_answer_video">Vídeo</string>
+  <string name="notification_action_accept">Aceitar</string>
+  <string name="notification_action_dismiss">Recusar</string>
+  <string name="notification_action_speaker_on">Ativar alto-falante</string>
+  <string name="notification_action_speaker_off">Desativar alto-falante</string>
+  <string name="notification_external_call">Chamada em andamento em outro dispositivo</string>
+  <string name="notification_external_video_call">Videochamada em andamento em outro dispositivo</string>
+  <string name="notification_take_call">Atender à chamada</string>
+  <string name="notification_take_video_call">Atender à videochamada</string>
+  <string name="incall_error_supp_service_unknown">Serviço não suportado.</string>
+  <string name="goPrivate">conversar em particular</string>
+  <string name="manageConferenceLabel">Gerenciar conferência</string>
+  <string name="child_number">via %s</string>
+  <string name="callFailed_simError">Sem SIM ou erro de SIM</string>
+  <string name="conference_caller_disconnect_content_description">Encerrar chamada</string>
+  <string name="conference_call_name">Conferência</string>
+  <string name="generic_conference_call_name">Em chamada</string>
+  <string name="video_call_wifi_to_lte_handover_toast">Continuando chamada por dados móveis…</string>
+  <string name="video_call_lte_to_wifi_failed_title">Não foi possível alternar para a rede Wi-Fi</string>
+  <string name="video_call_lte_to_wifi_failed_message">A videochamada continuará via rede móvel. O uso de dados está sujeito a cobranças padrão.</string>
+  <string name="video_call_lte_to_wifi_failed_do_not_show">Não exibir novamente</string>
+  <string name="bubble_return_to_call">Voltar à chamada</string>
+  <string name="rtt_request_dialog_title">Participar da chamada RTT?</string>
+  <string name="rtt_request_dialog_details">%1$s quer usar mensagens de texto com sua chamada de voz.</string>
+  <string name="rtt_request_dialog_more_information">A RTT ajuda os autores das chamadas com deficiências como surdez, dificuldade de audição ou fala ou que precisam de outros recursos além de voz.</string>
+  <string name="rtt_button_decline_request">Não</string>
+  <string name="rtt_button_accept_request">Participar da RTT</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-ro/strings.xml b/java/com/android/incallui/res/values-ro/strings.xml
index d81115b..cea7e51 100644
--- a/java/com/android/incallui/res/values-ro/strings.xml
+++ b/java/com/android/incallui/res/values-ro/strings.xml
@@ -1,79 +1,68 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"Telefon"</string>
-    <string name="wait_prompt_str" msgid="3509685348904329594">"Trimiteți următoarele tonuri?\n"</string>
-    <string name="pause_prompt_yes" msgid="4642047011233552973">"Da"</string>
-    <string name="pause_prompt_no" msgid="4691320111774935838">"Nu"</string>
-    <string name="notification_dialing" msgid="9072177265772083826">"Se apelează"</string>
-    <string name="notification_ongoing_call" msgid="8712641937577776125">"Apel în desfășurare"</string>
-    <string name="notification_ongoing_video_call" msgid="6331318021321487769">"Apel video în desfășurare"</string>
-    <string name="notification_ongoing_paused_video_call" msgid="709950253594606371">"Apel video în desfășurare ‑ imaginea video oprită"</string>
-    <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Apel de serviciu în desfășurare"</string>
-    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"<xliff:g id="BRAND_NAME">%1$s</xliff:g> în desfășurare"</string>
-    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"Apel primit de la <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
-    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"Apel Wi-Fi"</string>
-    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"Apel de serviciu prin Wi-Fi"</string>
-    <string name="notification_on_hold" msgid="7141827443379205682">"În așteptare"</string>
-    <string name="notification_incoming_call" msgid="7520580807513849283">"Apel de intrare"</string>
-    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Apel primit cu fotografie"</string>
-    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"Apel primit cu mesaj"</string>
-    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"Apel primit cu locație"</string>
-    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"Apel primit cu fotografie și mesaj"</string>
-    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"Apel primit cu fotografie și locație"</string>
-    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"Apel primit cu mesaj și locație"</string>
-    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"Apel primit cu fotografie, mesaj și locație"</string>
-    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"Apel primit cu atașamente"</string>
-    <string name="important_notification_incoming_call" msgid="2867013954509930989">"Apel primit important"</string>
-    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"Apel primit important cu fotografie"</string>
-    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"Apel primit important cu mesaj"</string>
-    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"Apel primit important cu locație"</string>
-    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"Apel primit important cu fotografie și mesaj"</string>
-    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"Apel primit important cu fotografie și locație"</string>
-    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"Apel primit important cu mesaj și locație"</string>
-    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Apel primit important cu poză, mesaj și locație"</string>
-    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Apel primit important cu atașamente"</string>
-    <string name="notification_incoming_work_call" msgid="5291275092734261918">"Apel de serviciu primit"</string>
-    <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Un apel primit posibil spam"</string>
-    <string name="notification_requesting_video_call" msgid="1807679328811515758">"Solicitare de trecere la apel video"</string>
-    <string name="notification_action_answer" msgid="8748275902211192568">"Răspundeți"</string>
-    <string name="notification_action_end_call" msgid="7467258454170007765">"Încheiați apelul"</string>
-    <string name="notification_action_answer_video" msgid="8488108892919917287">"Videoclip"</string>
-    <string name="notification_action_accept" msgid="1272761514200507143">"Acceptați"</string>
-    <string name="notification_action_dismiss" msgid="3128241581632616226">"Respingeți"</string>
-    <string name="notification_action_speaker_on" msgid="1882659234405596540">"Porniți difuzorul"</string>
-    <string name="notification_action_speaker_off" msgid="6340085043115533948">"Opriți difuzorul"</string>
-    <string name="notification_external_call" msgid="2504334597315343920">"Apel în curs pe alt dispozitiv"</string>
-    <string name="notification_external_video_call" msgid="7709394856028436683">"Apel video în curs pe alt dispozitiv"</string>
-    <string name="notification_take_call" msgid="5631659438864492229">"Preluați apelul"</string>
-    <string name="notification_take_video_call" msgid="4473387503712341390">"Preluați apelul video"</string>
-    <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"Serviciul nu este acceptat."</string>
-    <string name="goPrivate" msgid="5269514638004595378">"trecerea la modul privat"</string>
-    <string name="manageConferenceLabel" msgid="3589379023518128318">"Gestionați conferința telefonică"</string>
-    <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"Număr de urgență"</string>
-    <string name="child_number" msgid="3398257437107259682">"pe <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
-    <string name="callFailed_simError" msgid="4587775795711340072">"Nu există SIM sau eroare de SIM"</string>
-    <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Încheiați apelul"</string>
-    <string name="conference_call_name" msgid="8189987124611337174">"Teleconferință"</string>
-    <string name="generic_conference_call_name" msgid="1546941472424243894">"Apel în desfășurare"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Se continuă apelul folosind datele mobile…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Nu s-a putut comuta la rețeaua Wi-Fi"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Apelul video continuă prin rețeaua mobilă. Se pot aplica tarife standard pentru date."</string>
-    <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Nu mai afișa acest mesaj"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="wait_prompt_str">Trimiteți următoarele tonuri?\n</string>
+  <string name="pause_prompt_yes">Da</string>
+  <string name="pause_prompt_no">Nu</string>
+  <string name="notification_dialing">Se apelează</string>
+  <string name="notification_ongoing_call">Apel în desfășurare</string>
+  <string name="notification_ongoing_video_call">Apel video în desfășurare</string>
+  <string name="notification_ongoing_paused_video_call">Apel video în desfășurare ‑ imaginea video oprită</string>
+  <string name="notification_ongoing_work_call">Apel de serviciu în desfășurare</string>
+  <string name="notification_ongoing_call_wifi_template">%1$s în desfășurare</string>
+  <string name="notification_incoming_call_wifi_template">Apel primit de la %1$s</string>
+  <string name="notification_call_wifi_brand">Apel Wi-Fi</string>
+  <string name="notification_call_wifi_work_brand">Apel de serviciu prin Wi-Fi</string>
+  <string name="notification_on_hold">În așteptare</string>
+  <string name="notification_incoming_call">Apel de intrare</string>
+  <string name="notification_incoming_video_call">Apel video primit</string>
+  <string name="notification_incoming_call_mutli_sim">Apel primit prin %1$s</string>
+  <string name="notification_incoming_call_with_photo">Apel primit cu fotografie</string>
+  <string name="notification_incoming_call_with_message">Apel primit cu mesaj</string>
+  <string name="notification_incoming_call_with_location">Apel primit cu locație</string>
+  <string name="notification_incoming_call_with_photo_message">Apel primit cu fotografie și mesaj</string>
+  <string name="notification_incoming_call_with_photo_location">Apel primit cu fotografie și locație</string>
+  <string name="notification_incoming_call_with_message_location">Apel primit cu mesaj și locație</string>
+  <string name="notification_incoming_call_with_photo_message_location">Apel primit cu fotografie, mesaj și locație</string>
+  <string name="notification_incoming_call_attachments">Apel primit cu atașamente</string>
+  <string name="important_notification_incoming_call">Apel primit important</string>
+  <string name="important_notification_incoming_call_with_photo">Apel primit important cu fotografie</string>
+  <string name="important_notification_incoming_call_with_message">Apel primit important cu mesaj</string>
+  <string name="important_notification_incoming_call_with_location">Apel primit important cu locație</string>
+  <string name="important_notification_incoming_call_with_photo_message">Apel primit important cu fotografie și mesaj</string>
+  <string name="important_notification_incoming_call_with_photo_location">Apel primit important cu fotografie și locație</string>
+  <string name="important_notification_incoming_call_with_message_location">Apel primit important cu mesaj și locație</string>
+  <string name="important_notification_incoming_call_with_photo_message_location">Apel primit important cu poză, mesaj și locație</string>
+  <string name="important_notification_incoming_call_attachments">Apel primit important cu atașamente</string>
+  <string name="notification_incoming_work_call">Apel de serviciu primit</string>
+  <string name="notification_incoming_spam_call">Un apel primit posibil spam</string>
+  <string name="notification_requesting_video_call">Solicitare de trecere la apel video</string>
+  <string name="notification_action_answer">Răspundeți</string>
+  <string name="notification_action_end_call">Încheiați apelul</string>
+  <string name="notification_action_answer_video">Videoclip</string>
+  <string name="notification_action_accept">Acceptați</string>
+  <string name="notification_action_dismiss">Respingeți</string>
+  <string name="notification_action_speaker_on">Porniți difuzorul</string>
+  <string name="notification_action_speaker_off">Opriți difuzorul</string>
+  <string name="notification_external_call">Apel în curs pe alt dispozitiv</string>
+  <string name="notification_external_video_call">Apel video în curs pe alt dispozitiv</string>
+  <string name="notification_take_call">Preluați apelul</string>
+  <string name="notification_take_video_call">Preluați apelul video</string>
+  <string name="incall_error_supp_service_unknown">Serviciul nu este acceptat.</string>
+  <string name="goPrivate">trecerea la modul privat</string>
+  <string name="manageConferenceLabel">Gestionați conferința telefonică</string>
+  <string name="child_number">pe %s</string>
+  <string name="callFailed_simError">Nu există SIM sau eroare de SIM</string>
+  <string name="conference_caller_disconnect_content_description">Încheiați apelul</string>
+  <string name="conference_call_name">Teleconferință</string>
+  <string name="generic_conference_call_name">Apel în desfășurare</string>
+  <string name="video_call_wifi_to_lte_handover_toast">Se continuă apelul folosind datele mobile…</string>
+  <string name="video_call_lte_to_wifi_failed_title">Nu s-a putut comuta la rețeaua Wi-Fi</string>
+  <string name="video_call_lte_to_wifi_failed_message">Apelul video continuă prin rețeaua mobilă. Se pot aplica tarife standard pentru date.</string>
+  <string name="video_call_lte_to_wifi_failed_do_not_show">Nu mai afișa acest mesaj</string>
+  <string name="bubble_return_to_call">Înapoi la apel</string>
+  <string name="rtt_request_dialog_title">Vă conectați la apelul TTR?</string>
+  <string name="rtt_request_dialog_details">%1$s vrea să folosească mesajele text în timpul apelului vocal.</string>
+  <string name="rtt_request_dialog_more_information">TTR oferă asistență apelanților fără auz, cu deficiențe de auz, care au dizabilități de vorbire sau care au nevoie de mai mult decât vocea.</string>
+  <string name="rtt_button_decline_request">Nu</string>
+  <string name="rtt_button_accept_request">Conectați-vă la TTR</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-ru/strings.xml b/java/com/android/incallui/res/values-ru/strings.xml
index 556702a..41a5cb0 100644
--- a/java/com/android/incallui/res/values-ru/strings.xml
+++ b/java/com/android/incallui/res/values-ru/strings.xml
@@ -1,79 +1,68 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"Телефон"</string>
-    <string name="wait_prompt_str" msgid="3509685348904329594">"Отправить следующие тоны?\n"</string>
-    <string name="pause_prompt_yes" msgid="4642047011233552973">"Да"</string>
-    <string name="pause_prompt_no" msgid="4691320111774935838">"Нет"</string>
-    <string name="notification_dialing" msgid="9072177265772083826">"Набор номера…"</string>
-    <string name="notification_ongoing_call" msgid="8712641937577776125">"Текущий вызов"</string>
-    <string name="notification_ongoing_video_call" msgid="6331318021321487769">"Текущий видеовызов"</string>
-    <string name="notification_ongoing_paused_video_call" msgid="709950253594606371">"Текущий видеовызов – собеседник временно выключил камеру"</string>
-    <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Текущий звонок (работа)"</string>
-    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"Текущий <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
-    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"Входящий <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
-    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"звонок по Wi‑Fi"</string>
-    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"звонок по Wi‑Fi (работа)"</string>
-    <string name="notification_on_hold" msgid="7141827443379205682">"Ждет ответа"</string>
-    <string name="notification_incoming_call" msgid="7520580807513849283">"Входящий вызов"</string>
-    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Входящий вызов с фотографией"</string>
-    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"Входящий вызов с сообщением"</string>
-    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"Входящий вызов с геоданными"</string>
-    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"Входящий вызов с фотографией и сообщением"</string>
-    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"Входящий вызов с фотографией и геоданными"</string>
-    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"Входящий вызов с сообщением и геоданными"</string>
-    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"Входящий вызов с фото, сообщением и геоданными"</string>
-    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"Входящий вызов с прикрепленными файлами"</string>
-    <string name="important_notification_incoming_call" msgid="2867013954509930989">"Важный входящий вызов"</string>
-    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"Важный входящий вызов с фотографией"</string>
-    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"Важный входящий вызов с сообщением"</string>
-    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"Важный входящий вызов с геоданными"</string>
-    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"Важный входящий вызов с фотографией и сообщением"</string>
-    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"Важный входящий вызов с фотографией и геоданными"</string>
-    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"Важный входящий вызов с сообщением и геоданными"</string>
-    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Важный вызов с фото, сообщением и геоданными"</string>
-    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Важный входящий вызов с прикрепленными файлами"</string>
-    <string name="notification_incoming_work_call" msgid="5291275092734261918">"Входящий звонок (работа)"</string>
-    <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Входящий вызов: подозрение на спам"</string>
-    <string name="notification_requesting_video_call" msgid="1807679328811515758">"Входящий видеовызов"</string>
-    <string name="notification_action_answer" msgid="8748275902211192568">"Ответить"</string>
-    <string name="notification_action_end_call" msgid="7467258454170007765">"Завершить разговор"</string>
-    <string name="notification_action_answer_video" msgid="8488108892919917287">"Видео"</string>
-    <string name="notification_action_accept" msgid="1272761514200507143">"Принять"</string>
-    <string name="notification_action_dismiss" msgid="3128241581632616226">"Отклонить"</string>
-    <string name="notification_action_speaker_on" msgid="1882659234405596540">"Включить динамик"</string>
-    <string name="notification_action_speaker_off" msgid="6340085043115533948">"Выключить динамик"</string>
-    <string name="notification_external_call" msgid="2504334597315343920">"Вы участвуете в разговоре на другом устройстве"</string>
-    <string name="notification_external_video_call" msgid="7709394856028436683">"Вы участвуете в видеовстрече на другом устройстве"</string>
-    <string name="notification_take_call" msgid="5631659438864492229">"Продолжить на этом устройстве"</string>
-    <string name="notification_take_video_call" msgid="4473387503712341390">"Продолжить на этом устройстве"</string>
-    <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"Сервис не поддерживается."</string>
-    <string name="goPrivate" msgid="5269514638004595378">"приватная конференция"</string>
-    <string name="manageConferenceLabel" msgid="3589379023518128318">"Настройка конференц-связи"</string>
-    <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"Экстренная служба"</string>
-    <string name="child_number" msgid="3398257437107259682">"через <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
-    <string name="callFailed_simError" msgid="4587775795711340072">"Ошибка SIM-карты или SIM-карта не установлена"</string>
-    <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Завершить вызов"</string>
-    <string name="conference_call_name" msgid="8189987124611337174">"Конференц-вызов"</string>
-    <string name="generic_conference_call_name" msgid="1546941472424243894">"Вызов"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Переключение на мобильный Интернет…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Не удалось переключиться на сеть Wi-Fi"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Видеовызов будет выполняться по мобильной сети. Может взиматься стандартная плата за передачу данных."</string>
-    <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Больше не показывать"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="wait_prompt_str">Отправить следующие тоны?\n</string>
+  <string name="pause_prompt_yes">Да</string>
+  <string name="pause_prompt_no">Нет</string>
+  <string name="notification_dialing">Набор номера…</string>
+  <string name="notification_ongoing_call">Текущий вызов</string>
+  <string name="notification_ongoing_video_call">Текущий видеовызов</string>
+  <string name="notification_ongoing_paused_video_call">Текущий видеовызов – собеседник временно выключил камеру</string>
+  <string name="notification_ongoing_work_call">Текущий звонок (работа)</string>
+  <string name="notification_ongoing_call_wifi_template">Текущий %1$s</string>
+  <string name="notification_incoming_call_wifi_template">Входящий %1$s</string>
+  <string name="notification_call_wifi_brand">звонок по Wi‑Fi</string>
+  <string name="notification_call_wifi_work_brand">звонок по Wi‑Fi (работа)</string>
+  <string name="notification_on_hold">Вызов на удержании</string>
+  <string name="notification_incoming_call">Входящий вызов</string>
+  <string name="notification_incoming_video_call">Входящий видеовызов</string>
+  <string name="notification_incoming_call_mutli_sim">Входящий вызов, SIM-карта %1$s</string>
+  <string name="notification_incoming_call_with_photo">Входящий вызов с фотографией</string>
+  <string name="notification_incoming_call_with_message">Входящий вызов с сообщением</string>
+  <string name="notification_incoming_call_with_location">Входящий вызов с геоданными</string>
+  <string name="notification_incoming_call_with_photo_message">Входящий вызов с фотографией и сообщением</string>
+  <string name="notification_incoming_call_with_photo_location">Входящий вызов с фотографией и геоданными</string>
+  <string name="notification_incoming_call_with_message_location">Входящий вызов с сообщением и геоданными</string>
+  <string name="notification_incoming_call_with_photo_message_location">Входящий вызов с фото, сообщением и геоданными</string>
+  <string name="notification_incoming_call_attachments">Входящий вызов с прикрепленными файлами</string>
+  <string name="important_notification_incoming_call">Важный входящий вызов</string>
+  <string name="important_notification_incoming_call_with_photo">Важный входящий вызов с фотографией</string>
+  <string name="important_notification_incoming_call_with_message">Важный входящий вызов с сообщением</string>
+  <string name="important_notification_incoming_call_with_location">Важный входящий вызов с геоданными</string>
+  <string name="important_notification_incoming_call_with_photo_message">Важный входящий вызов с фотографией и сообщением</string>
+  <string name="important_notification_incoming_call_with_photo_location">Важный входящий вызов с фотографией и геоданными</string>
+  <string name="important_notification_incoming_call_with_message_location">Важный входящий вызов с сообщением и геоданными</string>
+  <string name="important_notification_incoming_call_with_photo_message_location">Важный вызов с фото, сообщением и геоданными</string>
+  <string name="important_notification_incoming_call_attachments">Важный входящий вызов с прикрепленными файлами</string>
+  <string name="notification_incoming_work_call">Входящий звонок (работа)</string>
+  <string name="notification_incoming_spam_call">Входящий вызов: подозрение на спам</string>
+  <string name="notification_requesting_video_call">Входящий видеовызов</string>
+  <string name="notification_action_answer">Ответить</string>
+  <string name="notification_action_end_call">Завершить разговор</string>
+  <string name="notification_action_answer_video">Видео</string>
+  <string name="notification_action_accept">Принять</string>
+  <string name="notification_action_dismiss">Отклонить</string>
+  <string name="notification_action_speaker_on">Включить динамик</string>
+  <string name="notification_action_speaker_off">Выключить динамик</string>
+  <string name="notification_external_call">Вы участвуете в разговоре на другом устройстве</string>
+  <string name="notification_external_video_call">Вы участвуете в видеовстрече на другом устройстве</string>
+  <string name="notification_take_call">Продолжить на этом устройстве</string>
+  <string name="notification_take_video_call">Продолжить на этом устройстве</string>
+  <string name="incall_error_supp_service_unknown">Сервис не поддерживается.</string>
+  <string name="goPrivate">приватная конференция</string>
+  <string name="manageConferenceLabel">Настройка конференц-связи</string>
+  <string name="child_number">через %s</string>
+  <string name="callFailed_simError">Ошибка SIM или SIM не установлена</string>
+  <string name="conference_caller_disconnect_content_description">Завершить вызов</string>
+  <string name="conference_call_name">Конференц-вызов</string>
+  <string name="generic_conference_call_name">Вызов</string>
+  <string name="video_call_wifi_to_lte_handover_toast">Переключение на мобильный Интернет…</string>
+  <string name="video_call_lte_to_wifi_failed_title">Не удалось переключиться на сеть Wi-Fi</string>
+  <string name="video_call_lte_to_wifi_failed_message">Видеовызов будет выполняться по мобильной сети. Может взиматься стандартная плата за передачу данных.</string>
+  <string name="video_call_lte_to_wifi_failed_do_not_show">Больше не показывать</string>
+  <string name="bubble_return_to_call">Вернуться к вызову</string>
+  <string name="rtt_request_dialog_title">Присоединиться к вызову RTT?</string>
+  <string name="rtt_request_dialog_details">%1$s хочет использовать обмен сообщениями в рамках голосового вызова.</string>
+  <string name="rtt_request_dialog_more_information">Функция RTT предназначена для пользователей с нарушениями слуха и речи.</string>
+  <string name="rtt_button_decline_request">Нет</string>
+  <string name="rtt_button_accept_request">Присоединиться</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-si/strings.xml b/java/com/android/incallui/res/values-si/strings.xml
index bb94240..cca5bad 100644
--- a/java/com/android/incallui/res/values-si/strings.xml
+++ b/java/com/android/incallui/res/values-si/strings.xml
@@ -1,79 +1,68 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"දුරකථනය"</string>
-    <string name="wait_prompt_str" msgid="3509685348904329594">"පහත නාද යවන්නද?\n"</string>
-    <string name="pause_prompt_yes" msgid="4642047011233552973">"ඔව්"</string>
-    <string name="pause_prompt_no" msgid="4691320111774935838">"නැත"</string>
-    <string name="notification_dialing" msgid="9072177265772083826">"ඩයල් කරමින්"</string>
-    <string name="notification_ongoing_call" msgid="8712641937577776125">"කරගෙනය යන ඇමතුම"</string>
-    <string name="notification_ongoing_video_call" msgid="6331318021321487769">"කරගෙන යන වීඩියෝ ඇමතුම"</string>
-    <string name="notification_ongoing_paused_video_call" msgid="709950253594606371">"කරගෙන යන වීඩියෝ ඇමතුම ‑ වීඩියෝව විරාම කෙරිණි"</string>
-    <string name="notification_ongoing_work_call" msgid="3189581218078981547">"කරගෙන යන කාර්යාල ඇමතුම"</string>
-    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"කෙරෙමින් පවතින <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
-    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"එන <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
-    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"Wi-Fi ඇමතුම"</string>
-    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"Wi‑Fi කාර්යාල ඇමතුම"</string>
-    <string name="notification_on_hold" msgid="7141827443379205682">"රඳවා ගනිමින්"</string>
-    <string name="notification_incoming_call" msgid="7520580807513849283">"එන ඇමතුම"</string>
-    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"ඡායාරූපය සමග එන ඇමතුම"</string>
-    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"පණිවිඩය සමග එන ඇමතුම"</string>
-    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"ස්ථානය සමග එන ඇමතුම"</string>
-    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"ඡායාරූපය සහ පණිවිඩය සමග එන ඇමතුම"</string>
-    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"ඡායාරූපය සහ ස්ථානය සමග එන ඇමතුම"</string>
-    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"පණිවිඩය සහ ස්ථානය සමග එන ඇමතුම"</string>
-    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"ඡායාරූපය, පණිවිඩය සහ ස්ථානය සමග එන ඇමතුම"</string>
-    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"ඇමුණුම් සමග එන ඇමතුම"</string>
-    <string name="important_notification_incoming_call" msgid="2867013954509930989">"වැදගත් එන ඇමතුම"</string>
-    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"ඡායාරූපය සමග වැදගත් එන ඇමතුම"</string>
-    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"පණිවිඩය සමග වැදගත් එන ඇමතුම"</string>
-    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"ස්ථානය සමග වැදගත් එන ඇමතුම"</string>
-    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"ඡායාරූපය සහ පණිවිඩය සමග වැදගත් එන ඇමතුම"</string>
-    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"ඡායාරූපය සහ ස්ථානය සමග වැදගත් එන ඇමතුම"</string>
-    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"පණිවිඩය සහ ස්ථානය සමග වැදගත් එන ඇමතුම"</string>
-    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"ඡායාරූපය, පණිවිඩය සහ ස්ථානය සමග වැදගත් එන ඇමතුම"</string>
-    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"ඇමුණුම් සමග වැදගත් එන ඇමතුම"</string>
-    <string name="notification_incoming_work_call" msgid="5291275092734261918">"පැමිණෙන කාර්යාල ඇමතුම"</string>
-    <string name="notification_incoming_spam_call" msgid="7591506944666791937">"එන සැකසහිත අයාචිත තැපැල් ඇමතුම"</string>
-    <string name="notification_requesting_video_call" msgid="1807679328811515758">"පැමිණෙන වීඩියෝ ඉල්ලීම"</string>
-    <string name="notification_action_answer" msgid="8748275902211192568">"පිළිතුරු දෙන්න"</string>
-    <string name="notification_action_end_call" msgid="7467258454170007765">"විසන්ධි කරන්න"</string>
-    <string name="notification_action_answer_video" msgid="8488108892919917287">"වීඩියෝව"</string>
-    <string name="notification_action_accept" msgid="1272761514200507143">"පිළිගන්න"</string>
-    <string name="notification_action_dismiss" msgid="3128241581632616226">"ප්‍රතික්ෂේප කිරීම"</string>
-    <string name="notification_action_speaker_on" msgid="1882659234405596540">"ස්පීකරය ක්‍රියාත්මක කරන්න"</string>
-    <string name="notification_action_speaker_off" msgid="6340085043115533948">"ස්පීකරය ක්‍රියාවිරහිත කරන්න"</string>
-    <string name="notification_external_call" msgid="2504334597315343920">"වෙනත් උපාංගයක සිදු වන ඇමතුම"</string>
-    <string name="notification_external_video_call" msgid="7709394856028436683">"වෙනත් උපාංගයක කෙරෙමින් පවතින වීඩියෝ ඇමතුම"</string>
-    <string name="notification_take_call" msgid="5631659438864492229">"ඇමතුම ගන්න"</string>
-    <string name="notification_take_video_call" msgid="4473387503712341390">"වීඩියෝ ඇමතුම ගන්න"</string>
-    <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"සේවාව සහාය ලබාදෙන්නේ නැත."</string>
-    <string name="goPrivate" msgid="5269514638004595378">"පොද්ගලික බවට යන්න"</string>
-    <string name="manageConferenceLabel" msgid="3589379023518128318">"සම්මන්ත්‍රණ ඇමතුම කළමනාකරණය කරන්න"</string>
-    <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"හදිසි ඇමතුම් අංකය"</string>
-    <string name="child_number" msgid="3398257437107259682">"<xliff:g id="CHILD_NUMBER">%s</xliff:g> හරහා"</string>
-    <string name="callFailed_simError" msgid="4587775795711340072">"SIM නැත හෝ SIM දෝෂයක්"</string>
-    <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"ඇමතුම අවසන් කරන්න"</string>
-    <string name="conference_call_name" msgid="8189987124611337174">"සම්මන්ත්‍රණ ඇමතුම"</string>
-    <string name="generic_conference_call_name" msgid="1546941472424243894">"ඇමතුමක"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"ජංගම දත්ත භාවිතයෙන් ඇමතුම දිගටම කරගෙන යමින්…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Wi-Fi ජාලය වෙත මාරු කිරීමට නොහැකි විය"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"වීඩියෝ ඇමතුම ජංගම ජාලයේ පවතිනු ඇත. සම්මත දත්ත ගාස්තු අදාළ විය හැකිය."</string>
-    <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"නැවත මෙය නොපෙන්වන්න"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="wait_prompt_str">පහත නාද යවන්නද?\n</string>
+  <string name="pause_prompt_yes">ඔව්</string>
+  <string name="pause_prompt_no">නැත</string>
+  <string name="notification_dialing">ඩයල් කරමින්</string>
+  <string name="notification_ongoing_call">කරගෙනය යන ඇමතුම</string>
+  <string name="notification_ongoing_video_call">කරගෙන යන වීඩියෝ ඇමතුම</string>
+  <string name="notification_ongoing_paused_video_call">කරගෙන යන වීඩියෝ ඇමතුම ‑ වීඩියෝව විරාම කෙරිණි</string>
+  <string name="notification_ongoing_work_call">කරගෙන යන කාර්යාල ඇමතුම</string>
+  <string name="notification_ongoing_call_wifi_template">කෙරෙමින් පවතින %1$s</string>
+  <string name="notification_incoming_call_wifi_template">එන %1$s</string>
+  <string name="notification_call_wifi_brand">Wi-Fi ඇමතුම</string>
+  <string name="notification_call_wifi_work_brand">Wi‑Fi කාර්යාල ඇමතුම</string>
+  <string name="notification_on_hold">රඳවා ගනිමින්</string>
+  <string name="notification_incoming_call">එන ඇමතුම</string>
+  <string name="notification_incoming_video_call">පැමිණෙන වීඩියෝ ඇමතුම</string>
+  <string name="notification_incoming_call_mutli_sim">%1$s හරහා එන ඇමතුම</string>
+  <string name="notification_incoming_call_with_photo">ඡායාරූපය සමග එන ඇමතුම</string>
+  <string name="notification_incoming_call_with_message">පණිවිඩය සමග එන ඇමතුම</string>
+  <string name="notification_incoming_call_with_location">ස්ථානය සමග එන ඇමතුම</string>
+  <string name="notification_incoming_call_with_photo_message">ඡායාරූපය සහ පණිවිඩය සමග එන ඇමතුම</string>
+  <string name="notification_incoming_call_with_photo_location">ඡායාරූපය සහ ස්ථානය සමග එන ඇමතුම</string>
+  <string name="notification_incoming_call_with_message_location">පණිවිඩය සහ ස්ථානය සමග එන ඇමතුම</string>
+  <string name="notification_incoming_call_with_photo_message_location">ඡායාරූපය, පණිවිඩය සහ ස්ථානය සමග එන ඇමතුම</string>
+  <string name="notification_incoming_call_attachments">ඇමුණුම් සමග එන ඇමතුම</string>
+  <string name="important_notification_incoming_call">වැදගත් එන ඇමතුම</string>
+  <string name="important_notification_incoming_call_with_photo">ඡායාරූපය සමග වැදගත් එන ඇමතුම</string>
+  <string name="important_notification_incoming_call_with_message">පණිවිඩය සමග වැදගත් එන ඇමතුම</string>
+  <string name="important_notification_incoming_call_with_location">ස්ථානය සමග වැදගත් එන ඇමතුම</string>
+  <string name="important_notification_incoming_call_with_photo_message">ඡායාරූපය සහ පණිවිඩය සමග වැදගත් එන ඇමතුම</string>
+  <string name="important_notification_incoming_call_with_photo_location">ඡායාරූපය සහ ස්ථානය සමග වැදගත් එන ඇමතුම</string>
+  <string name="important_notification_incoming_call_with_message_location">පණිවිඩය සහ ස්ථානය සමග වැදගත් එන ඇමතුම</string>
+  <string name="important_notification_incoming_call_with_photo_message_location">ඡායාරූපය, පණිවිඩය සහ ස්ථානය සමග වැදගත් එන ඇමතුම</string>
+  <string name="important_notification_incoming_call_attachments">ඇමුණුම් සමග වැදගත් එන ඇමතුම</string>
+  <string name="notification_incoming_work_call">පැමිණෙන කාර්යාල ඇමතුම</string>
+  <string name="notification_incoming_spam_call">එන සැකසහිත අයාචිත තැපැල් ඇමතුම</string>
+  <string name="notification_requesting_video_call">පැමිණෙන වීඩියෝ ඉල්ලීම</string>
+  <string name="notification_action_answer">පිළිතුරු දෙන්න</string>
+  <string name="notification_action_end_call">විසන්ධි කරන්න</string>
+  <string name="notification_action_answer_video">වීඩියෝව</string>
+  <string name="notification_action_accept">පිළිගන්න</string>
+  <string name="notification_action_dismiss">ප්‍රතික්ෂේප කිරීම</string>
+  <string name="notification_action_speaker_on">ස්පීකරය ක්‍රියාත්මක කරන්න</string>
+  <string name="notification_action_speaker_off">ස්පීකරය ක්‍රියාවිරහිත කරන්න</string>
+  <string name="notification_external_call">වෙනත් උපාංගයක සිදු වන ඇමතුම</string>
+  <string name="notification_external_video_call">වෙනත් උපාංගයක කෙරෙමින් පවතින වීඩියෝ ඇමතුම</string>
+  <string name="notification_take_call">ඇමතුම ගන්න</string>
+  <string name="notification_take_video_call">වීඩියෝ ඇමතුම ගන්න</string>
+  <string name="incall_error_supp_service_unknown">සේවාව සහාය ලබාදෙන්නේ නැත.</string>
+  <string name="goPrivate">පොද්ගලික බවට යන්න</string>
+  <string name="manageConferenceLabel">සම්මන්ත්‍රණ ඇමතුම කළමනාකරණය කරන්න</string>
+  <string name="child_number">%s හරහා</string>
+  <string name="callFailed_simError">SIM නැත හෝ SIM දෝෂයක්</string>
+  <string name="conference_caller_disconnect_content_description">ඇමතුම අවසන් කරන්න</string>
+  <string name="conference_call_name">සම්මන්ත්‍රණ ඇමතුම</string>
+  <string name="generic_conference_call_name">ඇමතුමක</string>
+  <string name="video_call_wifi_to_lte_handover_toast">ජංගම දත්ත භාවිතයෙන් ඇමතුම දිගටම කරගෙන යමින්…</string>
+  <string name="video_call_lte_to_wifi_failed_title">Wi-Fi ජාලය වෙත මාරු කිරීමට නොහැකි විය</string>
+  <string name="video_call_lte_to_wifi_failed_message">වීඩියෝ ඇමතුම ජංගම ජාලයේ පවතිනු ඇත. සම්මත දත්ත ගාස්තු අදාළ විය හැකිය.</string>
+  <string name="video_call_lte_to_wifi_failed_do_not_show">නැවත මෙය නොපෙන්වන්න</string>
+  <string name="bubble_return_to_call">ආපසු ඇමතුමට</string>
+  <string name="rtt_request_dialog_title">RTT ඇමතුම හා එක් වන්නද?</string>
+  <string name="rtt_request_dialog_details">%1$s හට ඔබේ හඬ ඇමතුම තුළ පණිවිඩ යැවීම භාවිත කිරීමට අවශ්‍යය.</string>
+  <string name="rtt_request_dialog_more_information">බිහිරි, ශ්‍රවණ දුර්වලතා, කථන ආබාධයක් හෝ හඬට වඩා වැඩි දෙයක් අවශ්‍ය අමතන්නන්ට RTT සහාය දක්වයි.</string>
+  <string name="rtt_button_decline_request">එපා ස්තූතියි</string>
+  <string name="rtt_button_accept_request">RTT හා එක් වන්න</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-sk/strings.xml b/java/com/android/incallui/res/values-sk/strings.xml
index 21bbc73..8848193 100644
--- a/java/com/android/incallui/res/values-sk/strings.xml
+++ b/java/com/android/incallui/res/values-sk/strings.xml
@@ -1,79 +1,68 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"Telefón"</string>
-    <string name="wait_prompt_str" msgid="3509685348904329594">"Odoslať nasledujúce tóny?\n"</string>
-    <string name="pause_prompt_yes" msgid="4642047011233552973">"Áno"</string>
-    <string name="pause_prompt_no" msgid="4691320111774935838">"Nie"</string>
-    <string name="notification_dialing" msgid="9072177265772083826">"Vytáča sa"</string>
-    <string name="notification_ongoing_call" msgid="8712641937577776125">"Prebiehajúci hovor"</string>
-    <string name="notification_ongoing_video_call" msgid="6331318021321487769">"Prebiehajúci videohovor"</string>
-    <string name="notification_ongoing_paused_video_call" msgid="709950253594606371">"Prebiehajúci videohovor – video bolo pozastavené"</string>
-    <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Prebiehajúci pracovný hovor"</string>
-    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"Prebiehajúci <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
-    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"Prichádzajúci <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
-    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"hovor cez Wi‑Fi"</string>
-    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"pracovný hovor cez Wi‑Fi"</string>
-    <string name="notification_on_hold" msgid="7141827443379205682">"Podržaný hovor"</string>
-    <string name="notification_incoming_call" msgid="7520580807513849283">"Prichádzajúci hovor"</string>
-    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Prichádzajúci hovor s fotkou"</string>
-    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"Prichádzajúci hovor so správou"</string>
-    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"Prichádzajúci hovor s polohou"</string>
-    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"Prichádzajúci hovor s fotkou a správou"</string>
-    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"Prichádzajúci hovor s fotkou a polohou"</string>
-    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"Prichádzajúci hovor so správou a polohou"</string>
-    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"Prichádzajúci hovor s fotkou, správou a polohou"</string>
-    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"Prichádzajúci hovor s prílohami"</string>
-    <string name="important_notification_incoming_call" msgid="2867013954509930989">"Dôležitý prichádzajúci hovor"</string>
-    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"Dôležitý prichádzajúci hovor s fotkou"</string>
-    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"Dôležitý prichádzajúci hovor so správou"</string>
-    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"Dôležitý prichádzajúci hovor s polohou"</string>
-    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"Dôležitý prichádzajúci hovor s fotkou a správou"</string>
-    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"Dôležitý prichádzajúci hovor s fotkou a polohou"</string>
-    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"Dôležitý prichádzajúci hovor so správou a polohou"</string>
-    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Dôležitý prich. hovor s fotkou, správou a polohou"</string>
-    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Dôležitý prichádzajúci hovor s prílohami"</string>
-    <string name="notification_incoming_work_call" msgid="5291275092734261918">"Prichádzajúci pracovný hovor"</string>
-    <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Prichádzajúci hovor, pri ktorom je podozrenie, že ide o spam"</string>
-    <string name="notification_requesting_video_call" msgid="1807679328811515758">"Prichádzajúca žiadosť o video"</string>
-    <string name="notification_action_answer" msgid="8748275902211192568">"Prijať"</string>
-    <string name="notification_action_end_call" msgid="7467258454170007765">"Položiť"</string>
-    <string name="notification_action_answer_video" msgid="8488108892919917287">"Video"</string>
-    <string name="notification_action_accept" msgid="1272761514200507143">"Prijať"</string>
-    <string name="notification_action_dismiss" msgid="3128241581632616226">"Odmietnuť"</string>
-    <string name="notification_action_speaker_on" msgid="1882659234405596540">"Zapnúť reproduktor"</string>
-    <string name="notification_action_speaker_off" msgid="6340085043115533948">"Vypnúť reproduktor"</string>
-    <string name="notification_external_call" msgid="2504334597315343920">"Prebiehajúci hovor v inom zariadení"</string>
-    <string name="notification_external_video_call" msgid="7709394856028436683">"Prebiehajúci videohovor v inom zariadení"</string>
-    <string name="notification_take_call" msgid="5631659438864492229">"Prevziať hovor"</string>
-    <string name="notification_take_video_call" msgid="4473387503712341390">"Prevziať videohovor"</string>
-    <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"Služba nie je podporovaná"</string>
-    <string name="goPrivate" msgid="5269514638004595378">"prepnúť na súkromné"</string>
-    <string name="manageConferenceLabel" msgid="3589379023518128318">"Spravovať konferenčný hovor"</string>
-    <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"Číslo tiesňového volania"</string>
-    <string name="child_number" msgid="3398257437107259682">"na čísle <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
-    <string name="callFailed_simError" msgid="4587775795711340072">"SIM karta chýba alebo nefunguje"</string>
-    <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Ukončiť hovor"</string>
-    <string name="conference_call_name" msgid="8189987124611337174">"Konferenčný hovor"</string>
-    <string name="generic_conference_call_name" msgid="1546941472424243894">"Prebieha hovor"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Pokračuje sa v hovore pomocou mobilných dát…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Nepodarilo sa prepnúť na sieť Wi‑Fi"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Videohovor bude pokračovať v mobilnej sieti. Môžu sa účtovať štandardné poplatky za prenos dát."</string>
-    <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Informácie nabudúce nezobrazovať"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="wait_prompt_str">Odoslať nasledujúce tóny?\n</string>
+  <string name="pause_prompt_yes">Áno</string>
+  <string name="pause_prompt_no">Nie</string>
+  <string name="notification_dialing">Vytáča sa</string>
+  <string name="notification_ongoing_call">Prebiehajúci hovor</string>
+  <string name="notification_ongoing_video_call">Prebiehajúci videohovor</string>
+  <string name="notification_ongoing_paused_video_call">Prebiehajúci videohovor – video bolo pozastavené</string>
+  <string name="notification_ongoing_work_call">Prebiehajúci pracovný hovor</string>
+  <string name="notification_ongoing_call_wifi_template">Prebiehajúci %1$s</string>
+  <string name="notification_incoming_call_wifi_template">Prichádzajúci %1$s</string>
+  <string name="notification_call_wifi_brand">hovor cez Wi‑Fi</string>
+  <string name="notification_call_wifi_work_brand">pracovný hovor cez Wi‑Fi</string>
+  <string name="notification_on_hold">Podržaný hovor</string>
+  <string name="notification_incoming_call">Prichádzajúci hovor</string>
+  <string name="notification_incoming_video_call">Prichádzajúci videohovor</string>
+  <string name="notification_incoming_call_mutli_sim">Prichádzajúci hovor cez %1$s</string>
+  <string name="notification_incoming_call_with_photo">Prichádzajúci hovor s fotkou</string>
+  <string name="notification_incoming_call_with_message">Prichádzajúci hovor so správou</string>
+  <string name="notification_incoming_call_with_location">Prichádzajúci hovor s polohou</string>
+  <string name="notification_incoming_call_with_photo_message">Prichádzajúci hovor s fotkou a správou</string>
+  <string name="notification_incoming_call_with_photo_location">Prichádzajúci hovor s fotkou a polohou</string>
+  <string name="notification_incoming_call_with_message_location">Prichádzajúci hovor so správou a polohou</string>
+  <string name="notification_incoming_call_with_photo_message_location">Prichádzajúci hovor s fotkou, správou a polohou</string>
+  <string name="notification_incoming_call_attachments">Prichádzajúci hovor s prílohami</string>
+  <string name="important_notification_incoming_call">Dôležitý prichádzajúci hovor</string>
+  <string name="important_notification_incoming_call_with_photo">Dôležitý prichádzajúci hovor s fotkou</string>
+  <string name="important_notification_incoming_call_with_message">Dôležitý prichádzajúci hovor so správou</string>
+  <string name="important_notification_incoming_call_with_location">Dôležitý prichádzajúci hovor s polohou</string>
+  <string name="important_notification_incoming_call_with_photo_message">Dôležitý prichádzajúci hovor s fotkou a správou</string>
+  <string name="important_notification_incoming_call_with_photo_location">Dôležitý prichádzajúci hovor s fotkou a polohou</string>
+  <string name="important_notification_incoming_call_with_message_location">Dôležitý prichádzajúci hovor so správou a polohou</string>
+  <string name="important_notification_incoming_call_with_photo_message_location">Dôležitý prich. hovor s fotkou, správou a polohou</string>
+  <string name="important_notification_incoming_call_attachments">Dôležitý prichádzajúci hovor s prílohami</string>
+  <string name="notification_incoming_work_call">Prichádzajúci pracovný hovor</string>
+  <string name="notification_incoming_spam_call">Prichádzajúci hovor, pri ktorom je podozrenie, že ide o spam</string>
+  <string name="notification_requesting_video_call">Prichádzajúca žiadosť o video</string>
+  <string name="notification_action_answer">Prijať</string>
+  <string name="notification_action_end_call">Položiť</string>
+  <string name="notification_action_answer_video">Video</string>
+  <string name="notification_action_accept">Prijať</string>
+  <string name="notification_action_dismiss">Odmietnuť</string>
+  <string name="notification_action_speaker_on">Zapnúť reproduktor</string>
+  <string name="notification_action_speaker_off">Vypnúť reproduktor</string>
+  <string name="notification_external_call">Prebiehajúci hovor v inom zariadení</string>
+  <string name="notification_external_video_call">Prebiehajúci videohovor v inom zariadení</string>
+  <string name="notification_take_call">Prevziať hovor</string>
+  <string name="notification_take_video_call">Prevziať videohovor</string>
+  <string name="incall_error_supp_service_unknown">Služba nie je podporovaná</string>
+  <string name="goPrivate">prepnúť na súkromné</string>
+  <string name="manageConferenceLabel">Spravovať konferenčný hovor</string>
+  <string name="child_number">na čísle %s</string>
+  <string name="callFailed_simError">SIM karta chýba alebo nefunguje</string>
+  <string name="conference_caller_disconnect_content_description">Ukončiť hovor</string>
+  <string name="conference_call_name">Konferenčný hovor</string>
+  <string name="generic_conference_call_name">Prebieha hovor</string>
+  <string name="video_call_wifi_to_lte_handover_toast">Pokračuje sa v hovore pomocou mobilných dát…</string>
+  <string name="video_call_lte_to_wifi_failed_title">Nepodarilo sa prepnúť na sieť Wi‑Fi</string>
+  <string name="video_call_lte_to_wifi_failed_message">Videohovor bude pokračovať v mobilnej sieti. Môžu sa účtovať štandardné poplatky za prenos dát.</string>
+  <string name="video_call_lte_to_wifi_failed_do_not_show">Informácie nabudúce nezobrazovať</string>
+  <string name="bubble_return_to_call">Späť na hovor</string>
+  <string name="rtt_request_dialog_title">Chcete sa pripojiť k hovoru s okamžitým textom?</string>
+  <string name="rtt_request_dialog_details">%1$s chce pri hlasovom hovore používať okamžitý text.</string>
+  <string name="rtt_request_dialog_more_information">Okamžitý text pomáha volajúcim, ktorí nepočujú, majú problémy so sluchom, rečovú poruchu alebo potrebujú viac ako samotný hlas.</string>
+  <string name="rtt_button_decline_request">Nie, ďakujem</string>
+  <string name="rtt_button_accept_request">Povoliť okamž. text</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-sl/strings.xml b/java/com/android/incallui/res/values-sl/strings.xml
index 2ef7061..fa9986c 100644
--- a/java/com/android/incallui/res/values-sl/strings.xml
+++ b/java/com/android/incallui/res/values-sl/strings.xml
@@ -1,79 +1,68 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"Telefon"</string>
-    <string name="wait_prompt_str" msgid="3509685348904329594">"Ali želite poslati naslednje tone?\n"</string>
-    <string name="pause_prompt_yes" msgid="4642047011233552973">"Da"</string>
-    <string name="pause_prompt_no" msgid="4691320111774935838">"Ne"</string>
-    <string name="notification_dialing" msgid="9072177265772083826">"Klicanje"</string>
-    <string name="notification_ongoing_call" msgid="8712641937577776125">"Aktivni klic"</string>
-    <string name="notification_ongoing_video_call" msgid="6331318021321487769">"Aktivni videoklic"</string>
-    <string name="notification_ongoing_paused_video_call" msgid="709950253594606371">"Aktivni videoklic – video je zaustavljen"</string>
-    <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Aktivni delovni klic"</string>
-    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"Aktivni <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
-    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"Dohodni <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
-    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"klic prek omrežja Wi-Fi"</string>
-    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"delovni klic prek omrežja Wi-Fi"</string>
-    <string name="notification_on_hold" msgid="7141827443379205682">"Zadržano"</string>
-    <string name="notification_incoming_call" msgid="7520580807513849283">"Dohodni klic"</string>
-    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Dohodni klic s fotografijo"</string>
-    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"Dohodni klic s sporočilom"</string>
-    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"Dohodni klic z lokacijo"</string>
-    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"Dohodni klic s fotografijo in sporočilom"</string>
-    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"Dohodni klic s fotografijo in lokacijo"</string>
-    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"Dohodni klic s sporočilom in lokacijo"</string>
-    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"Dohodni klic s fotografijo, sporočilom in lokacijo"</string>
-    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"Dohodni klic s prilogami"</string>
-    <string name="important_notification_incoming_call" msgid="2867013954509930989">"Pomemben dohodni klic"</string>
-    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"Pomemben dohodni klic s fotografijo"</string>
-    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"Pomemben dohodni klic s sporočilom"</string>
-    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"Pomemben dohodni klic z lokacijo"</string>
-    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"Pomemben dohodni klic s fotografijo in sporočilom"</string>
-    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"Pomemben dohodni klic s fotografijo in lokacijo"</string>
-    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"Pomemben dohodni klic s sporočilom in lokacijo"</string>
-    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Pomemben klic s fotografijo, sporočilom, lokacijo"</string>
-    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Pomemben dohodni klic s prilogami"</string>
-    <string name="notification_incoming_work_call" msgid="5291275092734261918">"Dohodni delovni klic"</string>
-    <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Domnevno neželeni dohodni klic"</string>
-    <string name="notification_requesting_video_call" msgid="1807679328811515758">"Dohodna zahteva za video"</string>
-    <string name="notification_action_answer" msgid="8748275902211192568">"Odgovori"</string>
-    <string name="notification_action_end_call" msgid="7467258454170007765">"Prekinite klic"</string>
-    <string name="notification_action_answer_video" msgid="8488108892919917287">"Videoklic"</string>
-    <string name="notification_action_accept" msgid="1272761514200507143">"Sprejmi"</string>
-    <string name="notification_action_dismiss" msgid="3128241581632616226">"Zavrni"</string>
-    <string name="notification_action_speaker_on" msgid="1882659234405596540">"Vklopi zvočnik"</string>
-    <string name="notification_action_speaker_off" msgid="6340085043115533948">"Izklopi zvočnik"</string>
-    <string name="notification_external_call" msgid="2504334597315343920">"Aktivni klic v drugi napravi"</string>
-    <string name="notification_external_video_call" msgid="7709394856028436683">"Aktivni videoklic v drugi napravi"</string>
-    <string name="notification_take_call" msgid="5631659438864492229">"Sprejmi klic"</string>
-    <string name="notification_take_video_call" msgid="4473387503712341390">"Sprejmi videoklic"</string>
-    <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"Storitev ni podprta."</string>
-    <string name="goPrivate" msgid="5269514638004595378">"zasebno"</string>
-    <string name="manageConferenceLabel" msgid="3589379023518128318">"Upravljaj konferenčne klice"</string>
-    <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"Številka za klic v sili"</string>
-    <string name="child_number" msgid="3398257437107259682">"prek <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
-    <string name="callFailed_simError" msgid="4587775795711340072">"Ni kartice SIM ali napaka kartice SIM"</string>
-    <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Končaj klic"</string>
-    <string name="conference_call_name" msgid="8189987124611337174">"Konferenčni klic"</string>
-    <string name="generic_conference_call_name" msgid="1546941472424243894">"Poteka klic"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Nadaljevanje klica prek prenosa podatkov v mobilnem omrežju …"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Ni bilo mogoče preklopiti v omrežje Wi-Fi"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Videoklic bo še naprej potekal v mobilnem omrežju. Morda boste morali plačati standardne stroške prenosa podatkov."</string>
-    <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Tega ne kaži več"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="wait_prompt_str">Ali želite poslati naslednje tone?\n</string>
+  <string name="pause_prompt_yes">Da</string>
+  <string name="pause_prompt_no">Ne</string>
+  <string name="notification_dialing">Klicanje</string>
+  <string name="notification_ongoing_call">Aktivni klic</string>
+  <string name="notification_ongoing_video_call">Aktivni videoklic</string>
+  <string name="notification_ongoing_paused_video_call">Aktivni videoklic – video je zaustavljen</string>
+  <string name="notification_ongoing_work_call">Aktivni delovni klic</string>
+  <string name="notification_ongoing_call_wifi_template">Aktivni %1$s</string>
+  <string name="notification_incoming_call_wifi_template">Dohodni %1$s</string>
+  <string name="notification_call_wifi_brand">klic prek omrežja Wi-Fi</string>
+  <string name="notification_call_wifi_work_brand">delovni klic prek omrežja Wi-Fi</string>
+  <string name="notification_on_hold">Zadržano</string>
+  <string name="notification_incoming_call">Dohodni klic</string>
+  <string name="notification_incoming_video_call">Dohodni videoklic</string>
+  <string name="notification_incoming_call_mutli_sim">Dohodni klic prek kartice SIM %1$s</string>
+  <string name="notification_incoming_call_with_photo">Dohodni klic s fotografijo</string>
+  <string name="notification_incoming_call_with_message">Dohodni klic s sporočilom</string>
+  <string name="notification_incoming_call_with_location">Dohodni klic z lokacijo</string>
+  <string name="notification_incoming_call_with_photo_message">Dohodni klic s fotografijo in sporočilom</string>
+  <string name="notification_incoming_call_with_photo_location">Dohodni klic s fotografijo in lokacijo</string>
+  <string name="notification_incoming_call_with_message_location">Dohodni klic s sporočilom in lokacijo</string>
+  <string name="notification_incoming_call_with_photo_message_location">Dohodni klic s fotografijo, sporočilom in lokacijo</string>
+  <string name="notification_incoming_call_attachments">Dohodni klic s prilogami</string>
+  <string name="important_notification_incoming_call">Pomemben dohodni klic</string>
+  <string name="important_notification_incoming_call_with_photo">Pomemben dohodni klic s fotografijo</string>
+  <string name="important_notification_incoming_call_with_message">Pomemben dohodni klic s sporočilom</string>
+  <string name="important_notification_incoming_call_with_location">Pomemben dohodni klic z lokacijo</string>
+  <string name="important_notification_incoming_call_with_photo_message">Pomemben dohodni klic s fotografijo in sporočilom</string>
+  <string name="important_notification_incoming_call_with_photo_location">Pomemben dohodni klic s fotografijo in lokacijo</string>
+  <string name="important_notification_incoming_call_with_message_location">Pomemben dohodni klic s sporočilom in lokacijo</string>
+  <string name="important_notification_incoming_call_with_photo_message_location">Pomemben klic s fotografijo, sporočilom, lokacijo</string>
+  <string name="important_notification_incoming_call_attachments">Pomemben dohodni klic s prilogami</string>
+  <string name="notification_incoming_work_call">Dohodni delovni klic</string>
+  <string name="notification_incoming_spam_call">Domnevno neželeni dohodni klic</string>
+  <string name="notification_requesting_video_call">Dohodna zahteva za video</string>
+  <string name="notification_action_answer">Odgovori</string>
+  <string name="notification_action_end_call">Prekinite klic</string>
+  <string name="notification_action_answer_video">Videoklic</string>
+  <string name="notification_action_accept">Sprejmi</string>
+  <string name="notification_action_dismiss">Zavrni</string>
+  <string name="notification_action_speaker_on">Vklopi zvočnik</string>
+  <string name="notification_action_speaker_off">Izklopi zvočnik</string>
+  <string name="notification_external_call">Aktivni klic v drugi napravi</string>
+  <string name="notification_external_video_call">Aktivni videoklic v drugi napravi</string>
+  <string name="notification_take_call">Sprejmi klic</string>
+  <string name="notification_take_video_call">Sprejmi videoklic</string>
+  <string name="incall_error_supp_service_unknown">Storitev ni podprta.</string>
+  <string name="goPrivate">zasebno</string>
+  <string name="manageConferenceLabel">Upravljaj konferenčne klice</string>
+  <string name="child_number">prek %s</string>
+  <string name="callFailed_simError">Ni kartice SIM ali napaka kartice SIM</string>
+  <string name="conference_caller_disconnect_content_description">Končaj klic</string>
+  <string name="conference_call_name">Konferenčni klic</string>
+  <string name="generic_conference_call_name">Poteka klic</string>
+  <string name="video_call_wifi_to_lte_handover_toast">Nadaljevanje klica prek prenosa podatkov v mobilnem omrežju …</string>
+  <string name="video_call_lte_to_wifi_failed_title">Ni bilo mogoče preklopiti v omrežje Wi-Fi</string>
+  <string name="video_call_lte_to_wifi_failed_message">Videoklic bo še naprej potekal v mobilnem omrežju. Morda boste morali plačati standardne stroške prenosa podatkov.</string>
+  <string name="video_call_lte_to_wifi_failed_do_not_show">Tega ne kaži več</string>
+  <string name="bubble_return_to_call">Nazaj na klic</string>
+  <string name="rtt_request_dialog_title">Se želite pridružiti klicu RTT?</string>
+  <string name="rtt_request_dialog_details">%1$s želi uporabljati sporočila v glasovnem klicu.</string>
+  <string name="rtt_request_dialog_more_information">Funkcija RTT pomaga klicateljem, ki so gluhi, naglušni, imajo govorno motnjo ali potrebujejo več kot samo glas.</string>
+  <string name="rtt_button_decline_request">Ne, hvala</string>
+  <string name="rtt_button_accept_request">Pridruži se</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-sq/strings.xml b/java/com/android/incallui/res/values-sq/strings.xml
index da7fb3d..e4440db 100644
--- a/java/com/android/incallui/res/values-sq/strings.xml
+++ b/java/com/android/incallui/res/values-sq/strings.xml
@@ -1,79 +1,68 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"Telefoni"</string>
-    <string name="wait_prompt_str" msgid="3509685348904329594">"Dëshiron t\'i dërgosh tonet e mëposhtme?\n"</string>
-    <string name="pause_prompt_yes" msgid="4642047011233552973">"Po"</string>
-    <string name="pause_prompt_no" msgid="4691320111774935838">"Jo"</string>
-    <string name="notification_dialing" msgid="9072177265772083826">"Po formon numrin"</string>
-    <string name="notification_ongoing_call" msgid="8712641937577776125">"Telefonatë në vazhdim"</string>
-    <string name="notification_ongoing_video_call" msgid="6331318021321487769">"Telefonatë me video në vazhdim"</string>
-    <string name="notification_ongoing_paused_video_call" msgid="709950253594606371">"Telefonatë me video në vazhdim - videoja u ndërpre"</string>
-    <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Telefonatë pune dalëse"</string>
-    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"<xliff:g id="BRAND_NAME">%1$s</xliff:g> në vazhdim"</string>
-    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"<xliff:g id="BRAND_NAME">%1$s</xliff:g> në ardhje"</string>
-    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"Telefonatë me Wi-Fi"</string>
-    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"Telefonatë pune me Wi-Fi"</string>
-    <string name="notification_on_hold" msgid="7141827443379205682">"Në pritje"</string>
-    <string name="notification_incoming_call" msgid="7520580807513849283">"Telefonatë hyrëse"</string>
-    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Telefonatë hyrëse me fotografi"</string>
-    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"Telefonatë hyrëse me mesazh"</string>
-    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"Telefonatë hyrëse me vendndodhje"</string>
-    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"Telefonatë hyrëse me fotografi dhe mesazh"</string>
-    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"Telefonatë hyrëse me fotografi dhe vendndodhje"</string>
-    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"Telefonatë hyrëse me mesazh dhe vendndodhje"</string>
-    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"Telefonatë me fotografi, mesazh dhe vendndodhje"</string>
-    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"Telefonatë hyrëse me bashkëngjitje"</string>
-    <string name="important_notification_incoming_call" msgid="2867013954509930989">"Telefonatë hyrëse e rëndësishme"</string>
-    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"Telefonatë hyrëse e rëndësishme me fotografi"</string>
-    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"Telefonatë hyrëse e rëndësishme me mesazh"</string>
-    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"Telefonatë hyrëse e rëndësishme me vendndodhje"</string>
-    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"Telefonatë e rëndësishme me fotografi dhe mesazh"</string>
-    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"Telefonatë e rëndësishme me foto dhe vendndodhje"</string>
-    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"Telefonatë e rëndësishme me mesazh e vendndodhje"</string>
-    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Tel. e rëndësishme me foto, mesazh e vendndodhje"</string>
-    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Telefonatë hyrëse e rëndësishme me bashkëngjitje"</string>
-    <string name="notification_incoming_work_call" msgid="5291275092734261918">"Telefonatë pune hyrëse"</string>
-    <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Telefonatë e dyshuar si e padëshiruar"</string>
-    <string name="notification_requesting_video_call" msgid="1807679328811515758">"Kërkesë për video hyrëse"</string>
-    <string name="notification_action_answer" msgid="8748275902211192568">"Përgjigju"</string>
-    <string name="notification_action_end_call" msgid="7467258454170007765">"Mbyll"</string>
-    <string name="notification_action_answer_video" msgid="8488108892919917287">"Video"</string>
-    <string name="notification_action_accept" msgid="1272761514200507143">"Prano"</string>
-    <string name="notification_action_dismiss" msgid="3128241581632616226">"Refuzo"</string>
-    <string name="notification_action_speaker_on" msgid="1882659234405596540">"Aktivizo altoparlantin"</string>
-    <string name="notification_action_speaker_off" msgid="6340085043115533948">"Çaktivizo altoparlantin"</string>
-    <string name="notification_external_call" msgid="2504334597315343920">"Telefonatë në vazhdim në një pajisje tjetër"</string>
-    <string name="notification_external_video_call" msgid="7709394856028436683">"Telefonatë në vazhdim në një pajisje tjetër"</string>
-    <string name="notification_take_call" msgid="5631659438864492229">"Prano telefonatën"</string>
-    <string name="notification_take_video_call" msgid="4473387503712341390">"Prano telefonatën me video"</string>
-    <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"Shërbimi nuk mbështetet."</string>
-    <string name="goPrivate" msgid="5269514638004595378">"bëje private"</string>
-    <string name="manageConferenceLabel" msgid="3589379023518128318">"Menaxho telefonatën konferencë"</string>
-    <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"Numri i urgjencës"</string>
-    <string name="child_number" msgid="3398257437107259682">"përmes <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
-    <string name="callFailed_simError" msgid="4587775795711340072">"Nuk ka kartë SIM ose ka gabim në kartën SIM"</string>
-    <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Mbylle telefonatën"</string>
-    <string name="conference_call_name" msgid="8189987124611337174">"Telefonatë konferencë"</string>
-    <string name="generic_conference_call_name" msgid="1546941472424243894">"Në telefonatë"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Po vazhdon telefonatën duke përdorur të dhënat celulare…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Nuk mund të kalonte në rrjetin Wi-Fi"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Telefonata me video do të mbetet në rrjetin celular. Mund të zbatohen tarifat standarde të të dhënave."</string>
-    <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Mos e shfaq më këtë"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="wait_prompt_str">Dëshiron t\'i dërgosh tonet e mëposhtme?\n</string>
+  <string name="pause_prompt_yes">Po</string>
+  <string name="pause_prompt_no">Jo</string>
+  <string name="notification_dialing">Po formon numrin</string>
+  <string name="notification_ongoing_call">Telefonatë në vazhdim</string>
+  <string name="notification_ongoing_video_call">Telefonatë me video në vazhdim</string>
+  <string name="notification_ongoing_paused_video_call">Telefonatë me video në vazhdim - videoja u ndërpre</string>
+  <string name="notification_ongoing_work_call">Telefonatë pune dalëse</string>
+  <string name="notification_ongoing_call_wifi_template">%1$s në vazhdim</string>
+  <string name="notification_incoming_call_wifi_template">%1$s në ardhje</string>
+  <string name="notification_call_wifi_brand">Telefonatë me Wi-Fi</string>
+  <string name="notification_call_wifi_work_brand">Telefonatë pune me Wi-Fi</string>
+  <string name="notification_on_hold">Në pritje</string>
+  <string name="notification_incoming_call">Telefonatë hyrëse</string>
+  <string name="notification_incoming_video_call">Telefonatë me video hyrëse</string>
+  <string name="notification_incoming_call_mutli_sim">Telefonatë hyrëse nëpërmjet %1$s</string>
+  <string name="notification_incoming_call_with_photo">Telefonatë hyrëse me fotografi</string>
+  <string name="notification_incoming_call_with_message">Telefonatë hyrëse me mesazh</string>
+  <string name="notification_incoming_call_with_location">Telefonatë hyrëse me vendndodhje</string>
+  <string name="notification_incoming_call_with_photo_message">Telefonatë hyrëse me fotografi dhe mesazh</string>
+  <string name="notification_incoming_call_with_photo_location">Telefonatë hyrëse me fotografi dhe vendndodhje</string>
+  <string name="notification_incoming_call_with_message_location">Telefonatë hyrëse me mesazh dhe vendndodhje</string>
+  <string name="notification_incoming_call_with_photo_message_location">Telefonatë me fotografi, mesazh dhe vendndodhje</string>
+  <string name="notification_incoming_call_attachments">Telefonatë hyrëse me bashkëngjitje</string>
+  <string name="important_notification_incoming_call">Telefonatë hyrëse e rëndësishme</string>
+  <string name="important_notification_incoming_call_with_photo">Telefonatë hyrëse e rëndësishme me fotografi</string>
+  <string name="important_notification_incoming_call_with_message">Telefonatë hyrëse e rëndësishme me mesazh</string>
+  <string name="important_notification_incoming_call_with_location">Telefonatë hyrëse e rëndësishme me vendndodhje</string>
+  <string name="important_notification_incoming_call_with_photo_message">Telefonatë e rëndësishme me fotografi dhe mesazh</string>
+  <string name="important_notification_incoming_call_with_photo_location">Telefonatë e rëndësishme me foto dhe vendndodhje</string>
+  <string name="important_notification_incoming_call_with_message_location">Telefonatë e rëndësishme me mesazh e vendndodhje</string>
+  <string name="important_notification_incoming_call_with_photo_message_location">Tel. e rëndësishme me foto, mesazh e vendndodhje</string>
+  <string name="important_notification_incoming_call_attachments">Telefonatë hyrëse e rëndësishme me bashkëngjitje</string>
+  <string name="notification_incoming_work_call">Telefonatë pune hyrëse</string>
+  <string name="notification_incoming_spam_call">Telefonatë e dyshuar si e padëshiruar</string>
+  <string name="notification_requesting_video_call">Kërkesë për video hyrëse</string>
+  <string name="notification_action_answer">Përgjigju</string>
+  <string name="notification_action_end_call">Mbyll</string>
+  <string name="notification_action_answer_video">Video</string>
+  <string name="notification_action_accept">Prano</string>
+  <string name="notification_action_dismiss">Refuzo</string>
+  <string name="notification_action_speaker_on">Aktivizo altoparlantin</string>
+  <string name="notification_action_speaker_off">Çaktivizo altoparlantin</string>
+  <string name="notification_external_call">Telefonatë në vazhdim në një pajisje tjetër</string>
+  <string name="notification_external_video_call">Telefonatë në vazhdim në një pajisje tjetër</string>
+  <string name="notification_take_call">Prano telefonatën</string>
+  <string name="notification_take_video_call">Prano telefonatën me video</string>
+  <string name="incall_error_supp_service_unknown">Shërbimi nuk mbështetet.</string>
+  <string name="goPrivate">bëje private</string>
+  <string name="manageConferenceLabel">Menaxho telefonatën konferencë</string>
+  <string name="child_number">përmes %s</string>
+  <string name="callFailed_simError">Nuk ka kartë SIM ose ka gabim në kartën SIM</string>
+  <string name="conference_caller_disconnect_content_description">Mbylle telefonatën</string>
+  <string name="conference_call_name">Telefonatë konferencë</string>
+  <string name="generic_conference_call_name">Në telefonatë</string>
+  <string name="video_call_wifi_to_lte_handover_toast">Po vazhdon telefonatën duke përdorur të dhënat celulare…</string>
+  <string name="video_call_lte_to_wifi_failed_title">Nuk mund të kalonte në rrjetin Wi-Fi</string>
+  <string name="video_call_lte_to_wifi_failed_message">Telefonata me video do të mbetet në rrjetin celular. Mund të zbatohen tarifat standarde të të dhënave.</string>
+  <string name="video_call_lte_to_wifi_failed_do_not_show">Mos e shfaq më këtë</string>
+  <string name="bubble_return_to_call">Kthehu te telefonata</string>
+  <string name="rtt_request_dialog_title">Do të bashkohesh në telefonatën RTT?</string>
+  <string name="rtt_request_dialog_details">%1$s dëshiron të përdorë mesazhet brenda telefonatës zanore.</string>
+  <string name="rtt_request_dialog_more_information">Funksioni RTT ndihmon telefonuesit që janë të shurdhër, kanë vështirësi dëgjimi, kanë një aftësi të kufizuar të të folurit ose që kanë nevojë për më shumë se thjesht zërin.</string>
+  <string name="rtt_button_decline_request">Jo</string>
+  <string name="rtt_button_accept_request">Bashkohu në RTT</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-sr/strings.xml b/java/com/android/incallui/res/values-sr/strings.xml
index a39f7fd..5f81faf 100644
--- a/java/com/android/incallui/res/values-sr/strings.xml
+++ b/java/com/android/incallui/res/values-sr/strings.xml
@@ -1,79 +1,68 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"Телефон"</string>
-    <string name="wait_prompt_str" msgid="3509685348904329594">"Желите ли да пошаљете следеће тонове?\n"</string>
-    <string name="pause_prompt_yes" msgid="4642047011233552973">"Да"</string>
-    <string name="pause_prompt_no" msgid="4691320111774935838">"Не"</string>
-    <string name="notification_dialing" msgid="9072177265772083826">"Позива се"</string>
-    <string name="notification_ongoing_call" msgid="8712641937577776125">"Актуелни позив"</string>
-    <string name="notification_ongoing_video_call" msgid="6331318021321487769">"Видео позив у току"</string>
-    <string name="notification_ongoing_paused_video_call" msgid="709950253594606371">"Видео позив у току – паузиран је"</string>
-    <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Текући позив за Work"</string>
-    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"<xliff:g id="BRAND_NAME">%1$s</xliff:g> је у току"</string>
-    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"Долазни <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
-    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"Wi-Fi позив"</string>
-    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"Wi‑Fi пословни позив"</string>
-    <string name="notification_on_hold" msgid="7141827443379205682">"На чекању"</string>
-    <string name="notification_incoming_call" msgid="7520580807513849283">"Долазни позив"</string>
-    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Долазни позив са сликом"</string>
-    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"Долазни позив са поруком"</string>
-    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"Долазни позив са локацијом"</string>
-    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"Долазни позив са сликом и поруком"</string>
-    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"Долазни позив са сликом и локацијом"</string>
-    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"Долазни позив са поруком и локацијом"</string>
-    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"Долазни позив са сликом, поруком и локацијом"</string>
-    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"Долазни позив са прилозима"</string>
-    <string name="important_notification_incoming_call" msgid="2867013954509930989">"Важан долазни позив"</string>
-    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"Важан долазни позив са сликом"</string>
-    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"Важан долазни позив са поруком"</string>
-    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"Важан долазни позив са локацијом"</string>
-    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"Важан долазни позив са сликом и поруком"</string>
-    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"Важан долазни позив са сликом и локацијом"</string>
-    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"Важан долазни позив са поруком и локацијом"</string>
-    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Важан долазни позив са сликом, поруком и локацијом"</string>
-    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Важан долазни позив са прилозима"</string>
-    <string name="notification_incoming_work_call" msgid="5291275092734261918">"Долазни позив за Work"</string>
-    <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Сумња на непожељан долазни позив"</string>
-    <string name="notification_requesting_video_call" msgid="1807679328811515758">"Захтев за долазни видео позив"</string>
-    <string name="notification_action_answer" msgid="8748275902211192568">"Одговори"</string>
-    <string name="notification_action_end_call" msgid="7467258454170007765">"Прекини везу"</string>
-    <string name="notification_action_answer_video" msgid="8488108892919917287">"Видео"</string>
-    <string name="notification_action_accept" msgid="1272761514200507143">"Прихвати"</string>
-    <string name="notification_action_dismiss" msgid="3128241581632616226">"Одбиј"</string>
-    <string name="notification_action_speaker_on" msgid="1882659234405596540">"Укључи звучник"</string>
-    <string name="notification_action_speaker_off" msgid="6340085043115533948">"Искључи звучник"</string>
-    <string name="notification_external_call" msgid="2504334597315343920">"Позив је у току на другом уређају"</string>
-    <string name="notification_external_video_call" msgid="7709394856028436683">"Видео позив је у току на другом уређају"</string>
-    <string name="notification_take_call" msgid="5631659438864492229">"Преузми позив"</string>
-    <string name="notification_take_video_call" msgid="4473387503712341390">"Преузми видео позив"</string>
-    <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"Услуга није подржана."</string>
-    <string name="goPrivate" msgid="5269514638004595378">"иди на приватно"</string>
-    <string name="manageConferenceLabel" msgid="3589379023518128318">"Управљај конференцијским позивом"</string>
-    <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"Број за хитне случајеве"</string>
-    <string name="child_number" msgid="3398257437107259682">"на <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
-    <string name="callFailed_simError" msgid="4587775795711340072">"Нема SIM картице или постоји грешка на њој"</string>
-    <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Завршите позив"</string>
-    <string name="conference_call_name" msgid="8189987124611337174">"Конференцијски позив"</string>
-    <string name="generic_conference_call_name" msgid="1546941472424243894">"У позиву"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Позив се наставља помоћу мобилних података…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Пребацивање на Wi‑Fi мрежу није успело"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Видео позив ће остати на мобилној мрежи. Важе стандардне накнаде за пренос података."</string>
-    <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Не приказуј ово поново"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="wait_prompt_str">Желите ли да пошаљете следеће тонове?\n</string>
+  <string name="pause_prompt_yes">Да</string>
+  <string name="pause_prompt_no">Не</string>
+  <string name="notification_dialing">Позива се</string>
+  <string name="notification_ongoing_call">Актуелни позив</string>
+  <string name="notification_ongoing_video_call">Видео позив у току</string>
+  <string name="notification_ongoing_paused_video_call">Видео позив у току – паузиран је</string>
+  <string name="notification_ongoing_work_call">Текући позив за Work</string>
+  <string name="notification_ongoing_call_wifi_template">%1$s је у току</string>
+  <string name="notification_incoming_call_wifi_template">Долазни %1$s</string>
+  <string name="notification_call_wifi_brand">Wi-Fi позив</string>
+  <string name="notification_call_wifi_work_brand">Wi‑Fi пословни позив</string>
+  <string name="notification_on_hold">На чекању</string>
+  <string name="notification_incoming_call">Долазни позив</string>
+  <string name="notification_incoming_video_call">Долазни видео позив</string>
+  <string name="notification_incoming_call_mutli_sim">Долазни позив преко %1$s</string>
+  <string name="notification_incoming_call_with_photo">Долазни позив са сликом</string>
+  <string name="notification_incoming_call_with_message">Долазни позив са поруком</string>
+  <string name="notification_incoming_call_with_location">Долазни позив са локацијом</string>
+  <string name="notification_incoming_call_with_photo_message">Долазни позив са сликом и поруком</string>
+  <string name="notification_incoming_call_with_photo_location">Долазни позив са сликом и локацијом</string>
+  <string name="notification_incoming_call_with_message_location">Долазни позив са поруком и локацијом</string>
+  <string name="notification_incoming_call_with_photo_message_location">Долазни позив са сликом, поруком и локацијом</string>
+  <string name="notification_incoming_call_attachments">Долазни позив са прилозима</string>
+  <string name="important_notification_incoming_call">Важан долазни позив</string>
+  <string name="important_notification_incoming_call_with_photo">Важан долазни позив са сликом</string>
+  <string name="important_notification_incoming_call_with_message">Важан долазни позив са поруком</string>
+  <string name="important_notification_incoming_call_with_location">Важан долазни позив са локацијом</string>
+  <string name="important_notification_incoming_call_with_photo_message">Важан долазни позив са сликом и поруком</string>
+  <string name="important_notification_incoming_call_with_photo_location">Важан долазни позив са сликом и локацијом</string>
+  <string name="important_notification_incoming_call_with_message_location">Важан долазни позив са поруком и локацијом</string>
+  <string name="important_notification_incoming_call_with_photo_message_location">Важан долазни позив са сликом, поруком и локацијом</string>
+  <string name="important_notification_incoming_call_attachments">Важан долазни позив са прилозима</string>
+  <string name="notification_incoming_work_call">Долазни позив за Work</string>
+  <string name="notification_incoming_spam_call">Сумња на непожељан долазни позив</string>
+  <string name="notification_requesting_video_call">Захтев за долазни видео позив</string>
+  <string name="notification_action_answer">Одговори</string>
+  <string name="notification_action_end_call">Прекини везу</string>
+  <string name="notification_action_answer_video">Видео</string>
+  <string name="notification_action_accept">Прихвати</string>
+  <string name="notification_action_dismiss">Одбиј</string>
+  <string name="notification_action_speaker_on">Укључи звучник</string>
+  <string name="notification_action_speaker_off">Искључи звучник</string>
+  <string name="notification_external_call">Позив је у току на другом уређају</string>
+  <string name="notification_external_video_call">Видео позив је у току на другом уређају</string>
+  <string name="notification_take_call">Преузми позив</string>
+  <string name="notification_take_video_call">Преузми видео позив</string>
+  <string name="incall_error_supp_service_unknown">Услуга није подржана.</string>
+  <string name="goPrivate">иди на приватно</string>
+  <string name="manageConferenceLabel">Управљај конференцијским позивом</string>
+  <string name="child_number">на %s</string>
+  <string name="callFailed_simError">Нема SIM картице или постоји грешка на њој</string>
+  <string name="conference_caller_disconnect_content_description">Завршите позив</string>
+  <string name="conference_call_name">Конференцијски позив</string>
+  <string name="generic_conference_call_name">У позиву</string>
+  <string name="video_call_wifi_to_lte_handover_toast">Позив се наставља помоћу мобилних података…</string>
+  <string name="video_call_lte_to_wifi_failed_title">Пребацивање на Wi‑Fi мрежу није успело</string>
+  <string name="video_call_lte_to_wifi_failed_message">Видео позив ће остати на мобилној мрежи. Важе стандардне накнаде за пренос података.</string>
+  <string name="video_call_lte_to_wifi_failed_do_not_show">Не приказуј ово поново</string>
+  <string name="bubble_return_to_call">Назад у позив</string>
+  <string name="rtt_request_dialog_title">Желите ли да уђете у RTT позив?</string>
+  <string name="rtt_request_dialog_details">%1$s жели да користи размену порука у аудио позиву.</string>
+  <string name="rtt_request_dialog_more_information">Текст у реалном времену (RTT) помаже позиваоцима који су глуви, слабо чују, имају тешкоће у говору или којима није довољан само глас.</string>
+  <string name="rtt_button_decline_request">Не, хвала</string>
+  <string name="rtt_button_accept_request">Уђите у RTT</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-sv/strings.xml b/java/com/android/incallui/res/values-sv/strings.xml
index 53c955b..ff46b14 100644
--- a/java/com/android/incallui/res/values-sv/strings.xml
+++ b/java/com/android/incallui/res/values-sv/strings.xml
@@ -1,79 +1,68 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"Telefon"</string>
-    <string name="wait_prompt_str" msgid="3509685348904329594">"Skicka följande toner?\n"</string>
-    <string name="pause_prompt_yes" msgid="4642047011233552973">"Ja"</string>
-    <string name="pause_prompt_no" msgid="4691320111774935838">"Nej"</string>
-    <string name="notification_dialing" msgid="9072177265772083826">"Ringer"</string>
-    <string name="notification_ongoing_call" msgid="8712641937577776125">"Pågående samtal"</string>
-    <string name="notification_ongoing_video_call" msgid="6331318021321487769">"Pågående videosamtal"</string>
-    <string name="notification_ongoing_paused_video_call" msgid="709950253594606371">"Pågående videosamtal – videoflödet har pausats"</string>
-    <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Pågående jobbsamtal"</string>
-    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"Pågående <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
-    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"Inkommande <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
-    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"Wi-Fi-samtal"</string>
-    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"Wi-Fi-jobbsamtal"</string>
-    <string name="notification_on_hold" msgid="7141827443379205682">"Parkerat"</string>
-    <string name="notification_incoming_call" msgid="7520580807513849283">"Inkommande samtal"</string>
-    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Inkommande samtal med foto"</string>
-    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"Inkommande samtal med meddelande"</string>
-    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"Inkommande samtal med plats"</string>
-    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"Inkommande samtal med foto och meddelande"</string>
-    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"Inkommande samtal med foto och plats"</string>
-    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"Inkommande samtal med meddelande och plats"</string>
-    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"Inkommande samtal med foto, meddelande och plats"</string>
-    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"Inkommande samtal med bilagor"</string>
-    <string name="important_notification_incoming_call" msgid="2867013954509930989">"Viktigt inkommande samtal"</string>
-    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"Viktigt inkommande samtal med foto"</string>
-    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"Viktigt inkommande samtal med meddelande"</string>
-    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"Viktigt inkommande samtal med plats"</string>
-    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"Viktigt inkommande samtal med foto och meddelande"</string>
-    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"Viktigt inkommande samtal med foto och plats"</string>
-    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"Viktigt inkommande samtal med meddelande och plats"</string>
-    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Viktigt inkommande samtal med foto, meddelande och plats"</string>
-    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Viktigt inkommande samtal med bilagor"</string>
-    <string name="notification_incoming_work_call" msgid="5291275092734261918">"Inkommande jobbsamtal"</string>
-    <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Inkommande misstänkt spamsamtal"</string>
-    <string name="notification_requesting_video_call" msgid="1807679328811515758">"Inkommande begäran om videosamtal"</string>
-    <string name="notification_action_answer" msgid="8748275902211192568">"Svara"</string>
-    <string name="notification_action_end_call" msgid="7467258454170007765">"Lägg på"</string>
-    <string name="notification_action_answer_video" msgid="8488108892919917287">"Video"</string>
-    <string name="notification_action_accept" msgid="1272761514200507143">"Godkänn"</string>
-    <string name="notification_action_dismiss" msgid="3128241581632616226">"Avvisa"</string>
-    <string name="notification_action_speaker_on" msgid="1882659234405596540">"Slå på högtalaren"</string>
-    <string name="notification_action_speaker_off" msgid="6340085043115533948">"Stäng av högtalaren"</string>
-    <string name="notification_external_call" msgid="2504334597315343920">"Pågående samtal på en annan enhet"</string>
-    <string name="notification_external_video_call" msgid="7709394856028436683">"Pågående videosamtal på en annan enhet"</string>
-    <string name="notification_take_call" msgid="5631659438864492229">"Svara på samtal"</string>
-    <string name="notification_take_video_call" msgid="4473387503712341390">"Svara på videosamtal"</string>
-    <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"Tjänsten stöds inte."</string>
-    <string name="goPrivate" msgid="5269514638004595378">"gör privat"</string>
-    <string name="manageConferenceLabel" msgid="3589379023518128318">"Hantera konferenssamtal"</string>
-    <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"Nödsamtalsnummer"</string>
-    <string name="child_number" msgid="3398257437107259682">"via <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
-    <string name="callFailed_simError" msgid="4587775795711340072">"Inget SIM-kort eller SIM-kortsfel"</string>
-    <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Avsluta samtal"</string>
-    <string name="conference_call_name" msgid="8189987124611337174">"Konferenssamtal"</string>
-    <string name="generic_conference_call_name" msgid="1546941472424243894">"I samtal"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Samtalet fortsätter med mobildata …"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Det gick inte att växla till Wi-Fi-nätverk"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Videosamtalet förblir i mobilnätverket. Vanliga dataavgifter kan tillkomma."</string>
-    <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Visa inte detta igen"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="wait_prompt_str">Skicka följande toner?\n</string>
+  <string name="pause_prompt_yes">Ja</string>
+  <string name="pause_prompt_no">Nej</string>
+  <string name="notification_dialing">Ringer</string>
+  <string name="notification_ongoing_call">Pågående samtal</string>
+  <string name="notification_ongoing_video_call">Pågående videosamtal</string>
+  <string name="notification_ongoing_paused_video_call">Pågående videosamtal – videoflödet har pausats</string>
+  <string name="notification_ongoing_work_call">Pågående jobbsamtal</string>
+  <string name="notification_ongoing_call_wifi_template">Pågående %1$s</string>
+  <string name="notification_incoming_call_wifi_template">Inkommande %1$s</string>
+  <string name="notification_call_wifi_brand">Wi-Fi-samtal</string>
+  <string name="notification_call_wifi_work_brand">Wi-Fi-jobbsamtal</string>
+  <string name="notification_on_hold">Parkerat</string>
+  <string name="notification_incoming_call">Inkommande samtal</string>
+  <string name="notification_incoming_video_call">Inkommande videosamtal</string>
+  <string name="notification_incoming_call_mutli_sim">Inkommande samtal på %1$s</string>
+  <string name="notification_incoming_call_with_photo">Inkommande samtal med foto</string>
+  <string name="notification_incoming_call_with_message">Inkommande samtal med meddelande</string>
+  <string name="notification_incoming_call_with_location">Inkommande samtal med plats</string>
+  <string name="notification_incoming_call_with_photo_message">Inkommande samtal med foto och meddelande</string>
+  <string name="notification_incoming_call_with_photo_location">Inkommande samtal med foto och plats</string>
+  <string name="notification_incoming_call_with_message_location">Inkommande samtal med meddelande och plats</string>
+  <string name="notification_incoming_call_with_photo_message_location">Inkommande samtal med foto, meddelande och plats</string>
+  <string name="notification_incoming_call_attachments">Inkommande samtal med bilagor</string>
+  <string name="important_notification_incoming_call">Viktigt inkommande samtal</string>
+  <string name="important_notification_incoming_call_with_photo">Viktigt inkommande samtal med foto</string>
+  <string name="important_notification_incoming_call_with_message">Viktigt inkommande samtal med meddelande</string>
+  <string name="important_notification_incoming_call_with_location">Viktigt inkommande samtal med plats</string>
+  <string name="important_notification_incoming_call_with_photo_message">Viktigt inkommande samtal med foto och meddelande</string>
+  <string name="important_notification_incoming_call_with_photo_location">Viktigt inkommande samtal med foto och plats</string>
+  <string name="important_notification_incoming_call_with_message_location">Viktigt inkommande samtal med meddelande och plats</string>
+  <string name="important_notification_incoming_call_with_photo_message_location">Viktigt inkommande samtal med foto, meddelande och plats</string>
+  <string name="important_notification_incoming_call_attachments">Viktigt inkommande samtal med bilagor</string>
+  <string name="notification_incoming_work_call">Inkommande jobbsamtal</string>
+  <string name="notification_incoming_spam_call">Inkommande misstänkt spamsamtal</string>
+  <string name="notification_requesting_video_call">Inkommande begäran om videosamtal</string>
+  <string name="notification_action_answer">Svara</string>
+  <string name="notification_action_end_call">Lägg på</string>
+  <string name="notification_action_answer_video">Video</string>
+  <string name="notification_action_accept">Godkänn</string>
+  <string name="notification_action_dismiss">Avvisa</string>
+  <string name="notification_action_speaker_on">Slå på högtalaren</string>
+  <string name="notification_action_speaker_off">Stäng av högtalaren</string>
+  <string name="notification_external_call">Pågående samtal på en annan enhet</string>
+  <string name="notification_external_video_call">Pågående videosamtal på en annan enhet</string>
+  <string name="notification_take_call">Svara på samtal</string>
+  <string name="notification_take_video_call">Svara på videosamtal</string>
+  <string name="incall_error_supp_service_unknown">Tjänsten stöds inte.</string>
+  <string name="goPrivate">gör privat</string>
+  <string name="manageConferenceLabel">Hantera konferenssamtal</string>
+  <string name="child_number">via %s</string>
+  <string name="callFailed_simError">Inget SIM-kort eller SIM-kortsfel</string>
+  <string name="conference_caller_disconnect_content_description">Avsluta samtal</string>
+  <string name="conference_call_name">Konferenssamtal</string>
+  <string name="generic_conference_call_name">I samtal</string>
+  <string name="video_call_wifi_to_lte_handover_toast">Samtalet fortsätter med mobildata …</string>
+  <string name="video_call_lte_to_wifi_failed_title">Det gick inte att växla till Wi-Fi-nätverk</string>
+  <string name="video_call_lte_to_wifi_failed_message">Videosamtalet förblir i mobilnätverket. Vanliga dataavgifter kan tillkomma.</string>
+  <string name="video_call_lte_to_wifi_failed_do_not_show">Visa inte detta igen</string>
+  <string name="bubble_return_to_call">Tillbaka till samtal</string>
+  <string name="rtt_request_dialog_title">Gå med i RTT-samtal?</string>
+  <string name="rtt_request_dialog_details">%1$s vill använda meddelanden i ditt röstsamtal.</string>
+  <string name="rtt_request_dialog_more_information">RTT hjälper döva, hörselskadade, personer med talsvårigheter eller behöver mer än endast röst.</string>
+  <string name="rtt_button_decline_request">Nej tack</string>
+  <string name="rtt_button_accept_request">Gå med i RTT</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-sw/strings.xml b/java/com/android/incallui/res/values-sw/strings.xml
index 04edc69..c8190b5 100644
--- a/java/com/android/incallui/res/values-sw/strings.xml
+++ b/java/com/android/incallui/res/values-sw/strings.xml
@@ -1,79 +1,68 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"Simu"</string>
-    <string name="wait_prompt_str" msgid="3509685348904329594">"Ungependa kutuma toni zifuatazo? \n"</string>
-    <string name="pause_prompt_yes" msgid="4642047011233552973">"Ndiyo"</string>
-    <string name="pause_prompt_no" msgid="4691320111774935838">"Hapana"</string>
-    <string name="notification_dialing" msgid="9072177265772083826">"Inapiga"</string>
-    <string name="notification_ongoing_call" msgid="8712641937577776125">"Simu inayoendelea"</string>
-    <string name="notification_ongoing_video_call" msgid="6331318021321487769">"Simu ya video inayoendelea"</string>
-    <string name="notification_ongoing_paused_video_call" msgid="709950253594606371">"Simu ya video inayoendelea ‑ video imesimamishwa"</string>
-    <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Simu ya kazi inayoendelea"</string>
-    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"<xliff:g id="BRAND_NAME">%1$s</xliff:g> inayoendelea"</string>
-    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"<xliff:g id="BRAND_NAME">%1$s</xliff:g> inayoingia"</string>
-    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"Simu ya Wi-Fi"</string>
-    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"Simu ya kazi ya Wi‑Fi"</string>
-    <string name="notification_on_hold" msgid="7141827443379205682">"Inangoja"</string>
-    <string name="notification_incoming_call" msgid="7520580807513849283">"Unapigiwa simu"</string>
-    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Simu inayoingia yenye picha"</string>
-    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"Simu inayoingia yenye ujumbe"</string>
-    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"Simu inayoingia yenye mahali"</string>
-    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"Simu inayoingia yenye picha na ujumbe"</string>
-    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"Simu inayoingia yenye picha na mahali"</string>
-    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"Simu inayoingia yenye ujumbe na mahali"</string>
-    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"Simu inayoingia yenye picha, ujumbe na mahali"</string>
-    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"Simu inayoingia yenye viambatisho"</string>
-    <string name="important_notification_incoming_call" msgid="2867013954509930989">"Simu muhimu inayoingia"</string>
-    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"Simu muhimu inayoingia yenye picha"</string>
-    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"Simu muhimu inayoingia yenye ujumbe"</string>
-    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"Simu muhimu inayoingia yenye mahali"</string>
-    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"Simu muhimu inayoingia yenye picha na ujumbe"</string>
-    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"Simu muhimu inayoingia yenye picha na mahali"</string>
-    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"Simu muhimu inayoingia yenye ujumbe na mahali"</string>
-    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Simu muhimu yenye picha, ujumbe na mahali"</string>
-    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Simu muhimu inayoingia yenye viambatisho"</string>
-    <string name="notification_incoming_work_call" msgid="5291275092734261918">"Simu ya kazi inayoingia"</string>
-    <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Simu inayoingia inashukiwa kuwa taka"</string>
-    <string name="notification_requesting_video_call" msgid="1807679328811515758">"Ombi  linaloingia la video"</string>
-    <string name="notification_action_answer" msgid="8748275902211192568">"Jibu"</string>
-    <string name="notification_action_end_call" msgid="7467258454170007765">"Kata simu"</string>
-    <string name="notification_action_answer_video" msgid="8488108892919917287">"Video"</string>
-    <string name="notification_action_accept" msgid="1272761514200507143">"Kubali"</string>
-    <string name="notification_action_dismiss" msgid="3128241581632616226">"Kataa"</string>
-    <string name="notification_action_speaker_on" msgid="1882659234405596540">"Washa spika"</string>
-    <string name="notification_action_speaker_off" msgid="6340085043115533948">"Zima spika"</string>
-    <string name="notification_external_call" msgid="2504334597315343920">"Una Hangout inayoendelea kwenye kifaa kingine"</string>
-    <string name="notification_external_video_call" msgid="7709394856028436683">"Una simu ya video inayoendelea kwenye kifaa kingine"</string>
-    <string name="notification_take_call" msgid="5631659438864492229">"Pokea Simu"</string>
-    <string name="notification_take_video_call" msgid="4473387503712341390">"Pokea Simu ya Video"</string>
-    <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"Huduma haitumiki."</string>
-    <string name="goPrivate" msgid="5269514638004595378">"nenda kwa faragha"</string>
-    <string name="manageConferenceLabel" msgid="3589379023518128318">"Dhibiti simu ya mkutano"</string>
-    <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"Nambari ya dharura"</string>
-    <string name="child_number" msgid="3398257437107259682">"kupitia <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
-    <string name="callFailed_simError" msgid="4587775795711340072">"Hakuna SIM au kuna hitilafu ya SIM"</string>
-    <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Kata simu"</string>
-    <string name="conference_call_name" msgid="8189987124611337174">"Simu ya kongamano"</string>
-    <string name="generic_conference_call_name" msgid="1546941472424243894">"Mazungumzo ya simu yanaendelea"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Endelea na mazungumzo ya simu ukitumia data ya simu…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Imeshindwa kuhamia mtandao wa Wi-Fi"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Hangout ya video itaendelea kwenye mtandao wa simu. Huenda ukatozwa gharama za kawaida za data."</string>
-    <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Usiionyeshe tena"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="wait_prompt_str">Ungependa kutuma toni zifuatazo? \n</string>
+  <string name="pause_prompt_yes">Ndiyo</string>
+  <string name="pause_prompt_no">Hapana</string>
+  <string name="notification_dialing">Inapiga</string>
+  <string name="notification_ongoing_call">Simu inayoendelea</string>
+  <string name="notification_ongoing_video_call">Simu ya video inayoendelea</string>
+  <string name="notification_ongoing_paused_video_call">Simu ya video inayoendelea ‑ video imesimamishwa</string>
+  <string name="notification_ongoing_work_call">Simu ya kazi inayoendelea</string>
+  <string name="notification_ongoing_call_wifi_template">%1$s inayoendelea</string>
+  <string name="notification_incoming_call_wifi_template">%1$s inayoingia</string>
+  <string name="notification_call_wifi_brand">Simu ya Wi-Fi</string>
+  <string name="notification_call_wifi_work_brand">Simu ya kazi ya Wi‑Fi</string>
+  <string name="notification_on_hold">Inangoja</string>
+  <string name="notification_incoming_call">Unapigiwa simu</string>
+  <string name="notification_incoming_video_call">Hangout ya Video inayoingia</string>
+  <string name="notification_incoming_call_mutli_sim">Simu inayoingia kupitia %1$s</string>
+  <string name="notification_incoming_call_with_photo">Simu inayoingia yenye picha</string>
+  <string name="notification_incoming_call_with_message">Simu inayoingia yenye ujumbe</string>
+  <string name="notification_incoming_call_with_location">Simu inayoingia yenye mahali</string>
+  <string name="notification_incoming_call_with_photo_message">Simu inayoingia yenye picha na ujumbe</string>
+  <string name="notification_incoming_call_with_photo_location">Simu inayoingia yenye picha na mahali</string>
+  <string name="notification_incoming_call_with_message_location">Simu inayoingia yenye ujumbe na mahali</string>
+  <string name="notification_incoming_call_with_photo_message_location">Simu inayoingia yenye picha, ujumbe na mahali</string>
+  <string name="notification_incoming_call_attachments">Simu inayoingia yenye viambatisho</string>
+  <string name="important_notification_incoming_call">Simu muhimu inayoingia</string>
+  <string name="important_notification_incoming_call_with_photo">Simu muhimu inayoingia yenye picha</string>
+  <string name="important_notification_incoming_call_with_message">Simu muhimu inayoingia yenye ujumbe</string>
+  <string name="important_notification_incoming_call_with_location">Simu muhimu inayoingia yenye mahali</string>
+  <string name="important_notification_incoming_call_with_photo_message">Simu muhimu inayoingia yenye picha na ujumbe</string>
+  <string name="important_notification_incoming_call_with_photo_location">Simu muhimu inayoingia yenye picha na mahali</string>
+  <string name="important_notification_incoming_call_with_message_location">Simu muhimu inayoingia yenye ujumbe na mahali</string>
+  <string name="important_notification_incoming_call_with_photo_message_location">Simu muhimu yenye picha, ujumbe na mahali</string>
+  <string name="important_notification_incoming_call_attachments">Simu muhimu inayoingia yenye viambatisho</string>
+  <string name="notification_incoming_work_call">Simu ya kazi inayoingia</string>
+  <string name="notification_incoming_spam_call">Simu inayoingia inashukiwa kuwa taka</string>
+  <string name="notification_requesting_video_call">Ombi  linaloingia la video</string>
+  <string name="notification_action_answer">Jibu</string>
+  <string name="notification_action_end_call">Kata simu</string>
+  <string name="notification_action_answer_video">Video</string>
+  <string name="notification_action_accept">Kubali</string>
+  <string name="notification_action_dismiss">Kataa</string>
+  <string name="notification_action_speaker_on">Washa spika</string>
+  <string name="notification_action_speaker_off">Zima spika</string>
+  <string name="notification_external_call">Una Hangout inayoendelea kwenye kifaa kingine</string>
+  <string name="notification_external_video_call">Una simu ya video inayoendelea kwenye kifaa kingine</string>
+  <string name="notification_take_call">Pokea Simu</string>
+  <string name="notification_take_video_call">Pokea Simu ya Video</string>
+  <string name="incall_error_supp_service_unknown">Huduma haitumiki.</string>
+  <string name="goPrivate">nenda kwa faragha</string>
+  <string name="manageConferenceLabel">Dhibiti simu ya mkutano</string>
+  <string name="child_number">kupitia %s</string>
+  <string name="callFailed_simError">Hakuna SIM au kuna hitilafu ya SIM</string>
+  <string name="conference_caller_disconnect_content_description">Kata simu</string>
+  <string name="conference_call_name">Simu ya kongamano</string>
+  <string name="generic_conference_call_name">Mazungumzo ya simu yanaendelea</string>
+  <string name="video_call_wifi_to_lte_handover_toast">Endelea na mazungumzo ya simu ukitumia data ya simu…</string>
+  <string name="video_call_lte_to_wifi_failed_title">Imeshindwa kuhamia mtandao wa Wi-Fi</string>
+  <string name="video_call_lte_to_wifi_failed_message">Hangout ya video itaendelea kwenye mtandao wa simu. Huenda ukatozwa gharama za kawaida za data.</string>
+  <string name="video_call_lte_to_wifi_failed_do_not_show">Usiionyeshe tena</string>
+  <string name="bubble_return_to_call">Rudi nyuma upige simu</string>
+  <string name="rtt_request_dialog_title">Je, ungependa kujiunga kwenye simu ya RTT?</string>
+  <string name="rtt_request_dialog_details">%1$s anataka kutuma ujumbe wakati simu yako ya sauti inaendelea.</string>
+  <string name="rtt_request_dialog_more_information">RTT huwasaidia wapigaji simu ambao ni viziwi, wasioweza kuskia vyema, wenye matatizo ya kuzungumza au wanaohitaji kufanya zaidi ya kuzungumza tu.</string>
+  <string name="rtt_button_decline_request">Hapana, asante</string>
+  <string name="rtt_button_accept_request">Tumia RTT</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-ta/strings.xml b/java/com/android/incallui/res/values-ta/strings.xml
index 7cc49d4..ddd364e 100644
--- a/java/com/android/incallui/res/values-ta/strings.xml
+++ b/java/com/android/incallui/res/values-ta/strings.xml
@@ -1,79 +1,68 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"மொபைல்"</string>
-    <string name="wait_prompt_str" msgid="3509685348904329594">"பின்வரும் டோன்களை அனுப்பவா?\n"</string>
-    <string name="pause_prompt_yes" msgid="4642047011233552973">"ஆம்"</string>
-    <string name="pause_prompt_no" msgid="4691320111774935838">"இல்லை"</string>
-    <string name="notification_dialing" msgid="9072177265772083826">"அழைக்கிறது"</string>
-    <string name="notification_ongoing_call" msgid="8712641937577776125">"செயலில் இருக்கும் அழைப்பு"</string>
-    <string name="notification_ongoing_video_call" msgid="6331318021321487769">"செயலில் உள்ள வீடியோ அழைப்பு"</string>
-    <string name="notification_ongoing_paused_video_call" msgid="709950253594606371">"செயலில் உள்ள வீடியோ அழைப்பு ‑ இடைநிறுத்தப்பட்டது"</string>
-    <string name="notification_ongoing_work_call" msgid="3189581218078981547">"வெளிச்செல்லும் அழைப்பு (பணி)"</string>
-    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"செயலிலுள்ள அழைப்பு: <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
-    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"உள்வரும் அழைப்பு: <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
-    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"வைஃபை அழைப்பு"</string>
-    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"வைஃபை அழைப்பு (பணி)"</string>
-    <string name="notification_on_hold" msgid="7141827443379205682">"காத்திருப்பில்"</string>
-    <string name="notification_incoming_call" msgid="7520580807513849283">"உள்வரும் அழைப்பு"</string>
-    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"படத்துடன் உள்வரும் அழைப்பு"</string>
-    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"செய்தியுடன் உள்வரும் அழைப்பு"</string>
-    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"இருப்பிடத் தகவலுடன் உள்வரும் அழைப்பு"</string>
-    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"படம், செய்தியுடன் உள்வரும் அழைப்பு"</string>
-    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"படம், இருப்பிடத் தகவலுடன் உள்வரும் அழைப்பு"</string>
-    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"செய்தி, இருப்பிடத் தகவலுடன் உள்வரும் அழைப்பு"</string>
-    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"படம், செய்தி, இருப்பிடத் தகவலுடன் உள்வரும் அழைப்பு"</string>
-    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"இணைப்புகளுடன் உள்வரும் அழைப்பு"</string>
-    <string name="important_notification_incoming_call" msgid="2867013954509930989">"உள்வரும் முக்கியமான அழைப்பு"</string>
-    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"படத்துடன் உள்வரும் முக்கியமான அழைப்பு"</string>
-    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"செய்தியுடன் உள்வரும் முக்கியமான அழைப்பு"</string>
-    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"இருப்பிடத் தகவலுடன் உள்வரும் முக்கியமான அழைப்பு"</string>
-    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"படம், செய்தியுடன் உள்வரும் முக்கியமான அழைப்பு"</string>
-    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"படம், இருப்பிடத்துடன் உள்வரும் முக்கியமான அழைப்பு"</string>
-    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"செய்தி, இருப்பிடத்துடன் உள்வரும் முக்கியமான அழைப்பு"</string>
-    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"படம், செய்தி, இருப்பிடத்துடன் உள்வரும் முக்கியமான அழைப்பு"</string>
-    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"இணைப்புகளுடன் உள்வரும் முக்கியமான அழைப்பு"</string>
-    <string name="notification_incoming_work_call" msgid="5291275092734261918">"உள்வரும் அழைப்பு (பணி)"</string>
-    <string name="notification_incoming_spam_call" msgid="7591506944666791937">"உள்வரும் சந்தேகத்திற்குரிய ஸ்பேம் அழைப்பு"</string>
-    <string name="notification_requesting_video_call" msgid="1807679328811515758">"உள்வரும் வீடியோ கோரிக்கை"</string>
-    <string name="notification_action_answer" msgid="8748275902211192568">"பதிலளி"</string>
-    <string name="notification_action_end_call" msgid="7467258454170007765">"துண்டி"</string>
-    <string name="notification_action_answer_video" msgid="8488108892919917287">"வீடியோ"</string>
-    <string name="notification_action_accept" msgid="1272761514200507143">"ஏற்கிறேன்"</string>
-    <string name="notification_action_dismiss" msgid="3128241581632616226">"நிராகரி"</string>
-    <string name="notification_action_speaker_on" msgid="1882659234405596540">"ஸ்பீக்கரை இயக்கு"</string>
-    <string name="notification_action_speaker_off" msgid="6340085043115533948">"ஸ்பீக்கரை முடக்கு"</string>
-    <string name="notification_external_call" msgid="2504334597315343920">"மற்றொரு சாதனத்தில் செயலில் இருக்கும் அழைப்பு"</string>
-    <string name="notification_external_video_call" msgid="7709394856028436683">"மற்றொரு சாதனத்தில் செயலில் இருக்கும் வீடியோ அழைப்பு"</string>
-    <string name="notification_take_call" msgid="5631659438864492229">"அழைப்பை எடு"</string>
-    <string name="notification_take_video_call" msgid="4473387503712341390">"வீடியோ அழைப்பை எடு"</string>
-    <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"சேவை ஆதரிக்கப்படவில்லை."</string>
-    <string name="goPrivate" msgid="5269514638004595378">"தனிப்பட்டதிற்குச் செல்"</string>
-    <string name="manageConferenceLabel" msgid="3589379023518128318">"குழு அழைப்பை நிர்வகி"</string>
-    <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"அவசரகால எண்"</string>
-    <string name="child_number" msgid="3398257437107259682">"<xliff:g id="CHILD_NUMBER">%s</xliff:g> வழியாக"</string>
-    <string name="callFailed_simError" msgid="4587775795711340072">"சிம் இல்லை அல்லது சிம் பிழை"</string>
-    <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"அழைப்பைத் துண்டிக்கும்"</string>
-    <string name="conference_call_name" msgid="8189987124611337174">"குழு அழைப்பு"</string>
-    <string name="generic_conference_call_name" msgid="1546941472424243894">"அழைப்பில்"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"மொபைல் தரவைப் பயன்படுத்தி அழைப்பைத் தொடர்கிறது…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"வைஃபை நெட்வொர்க்கிற்கு மாற முடியவில்லை"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"மொபைல் நெட்வொர்க்கைப் பயன்படுத்தி தொடர்ந்து வீடியோ அழைப்பைச் செய்யலாம். வழக்கமான தரவுக் கட்டணங்கள் விதிக்கப்படக்கூடும்."</string>
-    <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"இதை மீண்டும் காட்டாதே"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="wait_prompt_str">பின்வரும் டோன்களை அனுப்பவா?\n</string>
+  <string name="pause_prompt_yes">ஆம்</string>
+  <string name="pause_prompt_no">இல்லை</string>
+  <string name="notification_dialing">அழைக்கிறது</string>
+  <string name="notification_ongoing_call">செயலில் இருக்கும் அழைப்பு</string>
+  <string name="notification_ongoing_video_call">செயலில் உள்ள வீடியோ அழைப்பு</string>
+  <string name="notification_ongoing_paused_video_call">செயலில் உள்ள வீடியோ அழைப்பு ‑ இடைநிறுத்தப்பட்டது</string>
+  <string name="notification_ongoing_work_call">வெளிச்செல்லும் அழைப்பு (பணி)</string>
+  <string name="notification_ongoing_call_wifi_template">செயலிலுள்ள அழைப்பு: %1$s</string>
+  <string name="notification_incoming_call_wifi_template">உள்வரும் அழைப்பு: %1$s</string>
+  <string name="notification_call_wifi_brand">வைஃபை அழைப்பு</string>
+  <string name="notification_call_wifi_work_brand">வைஃபை அழைப்பு (பணி)</string>
+  <string name="notification_on_hold">காத்திருப்பில்</string>
+  <string name="notification_incoming_call">உள்வரும் அழைப்பு</string>
+  <string name="notification_incoming_video_call">உள்வரும் வீடியோ அழைப்பு</string>
+  <string name="notification_incoming_call_mutli_sim">%1$s மூலம் உள்வரும் அழைப்பு</string>
+  <string name="notification_incoming_call_with_photo">படத்துடன் உள்வரும் அழைப்பு</string>
+  <string name="notification_incoming_call_with_message">செய்தியுடன் உள்வரும் அழைப்பு</string>
+  <string name="notification_incoming_call_with_location">இருப்பிடத் தகவலுடன் உள்வரும் அழைப்பு</string>
+  <string name="notification_incoming_call_with_photo_message">படம், செய்தியுடன் உள்வரும் அழைப்பு</string>
+  <string name="notification_incoming_call_with_photo_location">படம், இருப்பிடத் தகவலுடன் உள்வரும் அழைப்பு</string>
+  <string name="notification_incoming_call_with_message_location">செய்தி, இருப்பிடத் தகவலுடன் உள்வரும் அழைப்பு</string>
+  <string name="notification_incoming_call_with_photo_message_location">படம், செய்தி, இருப்பிடத் தகவலுடன் உள்வரும் அழைப்பு</string>
+  <string name="notification_incoming_call_attachments">இணைப்புகளுடன் உள்வரும் அழைப்பு</string>
+  <string name="important_notification_incoming_call">உள்வரும் முக்கியமான அழைப்பு</string>
+  <string name="important_notification_incoming_call_with_photo">படத்துடன் உள்வரும் முக்கியமான அழைப்பு</string>
+  <string name="important_notification_incoming_call_with_message">செய்தியுடன் உள்வரும் முக்கியமான அழைப்பு</string>
+  <string name="important_notification_incoming_call_with_location">இருப்பிடத் தகவலுடன் உள்வரும் முக்கியமான அழைப்பு</string>
+  <string name="important_notification_incoming_call_with_photo_message">படம், செய்தியுடன் உள்வரும் முக்கியமான அழைப்பு</string>
+  <string name="important_notification_incoming_call_with_photo_location">படம், இருப்பிடத்துடன் உள்வரும் முக்கியமான அழைப்பு</string>
+  <string name="important_notification_incoming_call_with_message_location">செய்தி, இருப்பிடத்துடன் உள்வரும் முக்கியமான அழைப்பு</string>
+  <string name="important_notification_incoming_call_with_photo_message_location">படம், செய்தி, இருப்பிடத்துடன் உள்வரும் முக்கியமான அழைப்பு</string>
+  <string name="important_notification_incoming_call_attachments">இணைப்புகளுடன் உள்வரும் முக்கியமான அழைப்பு</string>
+  <string name="notification_incoming_work_call">உள்வரும் அழைப்பு (பணி)</string>
+  <string name="notification_incoming_spam_call">உள்வரும் சந்தேகத்திற்குரிய ஸ்பேம் அழைப்பு</string>
+  <string name="notification_requesting_video_call">உள்வரும் வீடியோ கோரிக்கை</string>
+  <string name="notification_action_answer">பதிலளி</string>
+  <string name="notification_action_end_call">துண்டி</string>
+  <string name="notification_action_answer_video">வீடியோ</string>
+  <string name="notification_action_accept">ஏற்கிறேன்</string>
+  <string name="notification_action_dismiss">நிராகரி</string>
+  <string name="notification_action_speaker_on">ஸ்பீக்கரை இயக்கு</string>
+  <string name="notification_action_speaker_off">ஸ்பீக்கரை முடக்கு</string>
+  <string name="notification_external_call">மற்றொரு சாதனத்தில் செயலில் இருக்கும் அழைப்பு</string>
+  <string name="notification_external_video_call">மற்றொரு சாதனத்தில் செயலில் இருக்கும் வீடியோ அழைப்பு</string>
+  <string name="notification_take_call">அழைப்பை எடு</string>
+  <string name="notification_take_video_call">வீடியோ அழைப்பை எடு</string>
+  <string name="incall_error_supp_service_unknown">சேவை ஆதரிக்கப்படவில்லை.</string>
+  <string name="goPrivate">தனிப்பட்டதிற்குச் செல்</string>
+  <string name="manageConferenceLabel">குழு அழைப்பை நிர்வகி</string>
+  <string name="child_number">%s வழியாக</string>
+  <string name="callFailed_simError">சிம் இல்லை அல்லது சிம் பிழை</string>
+  <string name="conference_caller_disconnect_content_description">அழைப்பைத் துண்டிக்கும்</string>
+  <string name="conference_call_name">குழு அழைப்பு</string>
+  <string name="generic_conference_call_name">அழைப்பில்</string>
+  <string name="video_call_wifi_to_lte_handover_toast">மொபைல் டேட்டாவைப் பயன்படுத்தி அழைப்பைத் தொடர்கிறது…</string>
+  <string name="video_call_lte_to_wifi_failed_title">வைஃபை நெட்வொர்க்கிற்கு மாற முடியவில்லை</string>
+  <string name="video_call_lte_to_wifi_failed_message">மொபைல் நெட்வொர்க்கைப் பயன்படுத்தி தொடர்ந்து வீடியோ அழைப்பைச் செய்யலாம். வழக்கமான தரவுக் பேமெண்ட்கள் விதிக்கப்படக்கூடும்.</string>
+  <string name="video_call_lte_to_wifi_failed_do_not_show">இதை மீண்டும் காட்டாதே</string>
+  <string name="bubble_return_to_call">அழைப்பிற்குச் செல்</string>
+  <string name="rtt_request_dialog_title">RTT அழைப்பில் சேர்க்கவா?</string>
+  <string name="rtt_request_dialog_details">உங்கள் குரல் அழைப்பிற்குள் செய்தியிடலைப் பயன்படுத்த, %1$s விரும்புகிறார்.</string>
+  <string name="rtt_request_dialog_more_information">காது கேட்காதவர்கள், கேட்பதில் பிரச்சனை உள்ளவர்கள், பேச முடியாதவர்கள் அல்லது குரலுடன் கூடுதல் சேவை தேவைப்படும் அழைப்பாளர்களுக்கு RTT உதவுகிறது.</string>
+  <string name="rtt_button_decline_request">வேண்டாம்</string>
+  <string name="rtt_button_accept_request">RTT இல் சேர்</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-te/strings.xml b/java/com/android/incallui/res/values-te/strings.xml
index b18984a..5e261dc 100644
--- a/java/com/android/incallui/res/values-te/strings.xml
+++ b/java/com/android/incallui/res/values-te/strings.xml
@@ -1,79 +1,68 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"ఫోన్"</string>
-    <string name="wait_prompt_str" msgid="3509685348904329594">"క్రింది టోన్‌లు పంపాలా?\n"</string>
-    <string name="pause_prompt_yes" msgid="4642047011233552973">"అవును"</string>
-    <string name="pause_prompt_no" msgid="4691320111774935838">"కాదు"</string>
-    <string name="notification_dialing" msgid="9072177265772083826">"డయల్ చేస్తోంది"</string>
-    <string name="notification_ongoing_call" msgid="8712641937577776125">"కాల్ కొనసాగుతోంది"</string>
-    <string name="notification_ongoing_video_call" msgid="6331318021321487769">"వీడియో కాల్ జరుగుతోంది"</string>
-    <string name="notification_ongoing_paused_video_call" msgid="709950253594606371">"వీడియో కాల్ జరుగుతోంది ‑ వీడియో పాజ్ చేయబడింది"</string>
-    <string name="notification_ongoing_work_call" msgid="3189581218078981547">"కార్యాలయ కాల్ కొనసాగుతోంది"</string>
-    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"<xliff:g id="BRAND_NAME">%1$s</xliff:g> కొనసాగుతోంది"</string>
-    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"ఇన్‌కమింగ్ <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
-    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"Wi‑Fi కాల్"</string>
-    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"Wi‑Fi కార్యాలయ కాల్"</string>
-    <string name="notification_on_hold" msgid="7141827443379205682">"హోల్డ్‌లో ఉంది"</string>
-    <string name="notification_incoming_call" msgid="7520580807513849283">"ఇన్‌కమింగ్ కాల్"</string>
-    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"ఫోటోతో ఇన్‌కమింగ్ కాల్"</string>
-    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"సందేశంతో ఇన్‌కమింగ్ కాల్"</string>
-    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"స్థానంతో ఇన్‌కమింగ్ కాల్"</string>
-    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"ఫోటో మరియు సందేశంతో ఇన్‌కమింగ్ కాల్"</string>
-    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"ఫోటో మరియు స్థానంతో ఇన్‌కమింగ్ కాల్"</string>
-    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"సందేశం మరియు స్థానంతో ఇన్‌కమింగ్ కాల్"</string>
-    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"ఫోటో, సందేశం మరియు స్థానంతో ఇన్‌కమింగ్ కాల్"</string>
-    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"జోడింపులతో ఇన్‌కమింగ్ కాల్"</string>
-    <string name="important_notification_incoming_call" msgid="2867013954509930989">"ముఖ్యమైన ఇన్‌కమింగ్ కాల్"</string>
-    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"ఫోటోతో ముఖ్యమైన ఇన్‌కమింగ్ కాల్"</string>
-    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"సందేశంతో ముఖ్యమైన ఇన్‌కమింగ్ కాల్"</string>
-    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"స్థానంతో ముఖ్యమైన ఇన్‌కమింగ్ కాల్"</string>
-    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"ఫోటో మరియు సందేశంతో ముఖ్యమైన ఇన్‌కమింగ్ కాల్"</string>
-    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"ఫోటో మరియు స్థానంతో ముఖ్యమైన ఇన్‌కమింగ్ కాల్"</string>
-    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"సందేశం మరియు స్థానంతో ముఖ్యమైన ఇన్‌కమింగ్ కాల్"</string>
-    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"ఫోటో, సందేశం, స్థానంతో ముఖ్యమైన ఇన్‌కమింగ్ కాల్"</string>
-    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"జోడింపులతో ముఖ్యమైన ఇన్‌కమింగ్ కాల్"</string>
-    <string name="notification_incoming_work_call" msgid="5291275092734261918">"ఇన్‌కమింగ్ కార్యాలయ కాల్"</string>
-    <string name="notification_incoming_spam_call" msgid="7591506944666791937">"అనుమానాస్పద స్పామ్ కాల్ వస్తోంది"</string>
-    <string name="notification_requesting_video_call" msgid="1807679328811515758">"ఇన్‌కమింగ్ వీడియో అభ్యర్థన"</string>
-    <string name="notification_action_answer" msgid="8748275902211192568">"సమాధానం ఇవ్వండి"</string>
-    <string name="notification_action_end_call" msgid="7467258454170007765">"కాల్‌ను ముగించు"</string>
-    <string name="notification_action_answer_video" msgid="8488108892919917287">"వీడియో"</string>
-    <string name="notification_action_accept" msgid="1272761514200507143">"ఆమోదిస్తున్నాను"</string>
-    <string name="notification_action_dismiss" msgid="3128241581632616226">"తిరస్కరించు"</string>
-    <string name="notification_action_speaker_on" msgid="1882659234405596540">"స్పీకర్‌ను ఆన్ చేయండి"</string>
-    <string name="notification_action_speaker_off" msgid="6340085043115533948">"స్పీకర్‌ను ఆఫ్ చేయండి"</string>
-    <string name="notification_external_call" msgid="2504334597315343920">"మరో పరికరంలో కాల్ జరుగుతోంది"</string>
-    <string name="notification_external_video_call" msgid="7709394856028436683">"మరో పరికరంలో వీడియో కాల్ జరుగుతోంది"</string>
-    <string name="notification_take_call" msgid="5631659438864492229">"కాల్‌ను తీయి"</string>
-    <string name="notification_take_video_call" msgid="4473387503712341390">"వీడియో కాల్‌ను తీయి"</string>
-    <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"సేవకు మద్దతు లేదు."</string>
-    <string name="goPrivate" msgid="5269514638004595378">"ప్రైవేట్‌గా వెళ్లు"</string>
-    <string name="manageConferenceLabel" msgid="3589379023518128318">"కాన్ఫరెన్స్ కాల్‌ను నిర్వహించు"</string>
-    <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"అత్యవసర నంబర్"</string>
-    <string name="child_number" msgid="3398257437107259682">"<xliff:g id="CHILD_NUMBER">%s</xliff:g> ద్వారా"</string>
-    <string name="callFailed_simError" msgid="4587775795711340072">"సిమ్ లేదు లేదా సిమ్ లోపం"</string>
-    <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"కాల్‌ను ముగిస్తుంది"</string>
-    <string name="conference_call_name" msgid="8189987124611337174">"కాన్ఫరెన్స్ కాల్"</string>
-    <string name="generic_conference_call_name" msgid="1546941472424243894">"కాల్‌లో ఉన్నారు"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"మొబైల్ డేటాను ఉపయోగించి కాల్‌ను కొనసాగిస్తోంది…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Wi-Fi నెట్‌వర్క్‌కి మార్చడం సాధ్యపడలేదు"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"వీడియో కాల్ మొబైల్ నెట్‌వర్క్‌లో కొనసాగుతుంది. ప్రామాణిక డేటా ఛార్జీలు వర్తించవచ్చు."</string>
-    <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"దీన్ని మళ్లీ చూపవద్దు"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="wait_prompt_str">క్రింది టోన్‌లు పంపాలా?\n</string>
+  <string name="pause_prompt_yes">అవును</string>
+  <string name="pause_prompt_no">కాదు</string>
+  <string name="notification_dialing">డయల్ చేస్తోంది</string>
+  <string name="notification_ongoing_call">కాల్ కొనసాగుతోంది</string>
+  <string name="notification_ongoing_video_call">వీడియో కాల్ జరుగుతోంది</string>
+  <string name="notification_ongoing_paused_video_call">వీడియో కాల్ జరుగుతోంది ‑ వీడియో పాజ్ చేయబడింది</string>
+  <string name="notification_ongoing_work_call">కార్యాలయ కాల్ కొనసాగుతోంది</string>
+  <string name="notification_ongoing_call_wifi_template">%1$s కొనసాగుతోంది</string>
+  <string name="notification_incoming_call_wifi_template">ఇన్‌కమింగ్ %1$s</string>
+  <string name="notification_call_wifi_brand">Wi‑Fi కాల్</string>
+  <string name="notification_call_wifi_work_brand">Wi‑Fi కార్యాలయ కాల్</string>
+  <string name="notification_on_hold">హోల్డ్‌లో ఉంది</string>
+  <string name="notification_incoming_call">ఇన్‌కమింగ్ కాల్</string>
+  <string name="notification_incoming_video_call">ఇన్‌కమింగ్ వీడియో కాల్</string>
+  <string name="notification_incoming_call_mutli_sim">%1$s ద్వారా కాల్ వస్తోంది</string>
+  <string name="notification_incoming_call_with_photo">ఫోటోతో ఇన్‌కమింగ్ కాల్</string>
+  <string name="notification_incoming_call_with_message">సందేశంతో ఇన్‌కమింగ్ కాల్</string>
+  <string name="notification_incoming_call_with_location">స్థానంతో ఇన్‌కమింగ్ కాల్</string>
+  <string name="notification_incoming_call_with_photo_message">ఫోటో మరియు సందేశంతో ఇన్‌కమింగ్ కాల్</string>
+  <string name="notification_incoming_call_with_photo_location">ఫోటో మరియు స్థానంతో ఇన్‌కమింగ్ కాల్</string>
+  <string name="notification_incoming_call_with_message_location">సందేశం మరియు స్థానంతో ఇన్‌కమింగ్ కాల్</string>
+  <string name="notification_incoming_call_with_photo_message_location">ఫోటో, సందేశం మరియు స్థానంతో ఇన్‌కమింగ్ కాల్</string>
+  <string name="notification_incoming_call_attachments">జోడింపులతో ఇన్‌కమింగ్ కాల్</string>
+  <string name="important_notification_incoming_call">ముఖ్యమైన ఇన్‌కమింగ్ కాల్</string>
+  <string name="important_notification_incoming_call_with_photo">ఫోటోతో ముఖ్యమైన ఇన్‌కమింగ్ కాల్</string>
+  <string name="important_notification_incoming_call_with_message">సందేశంతో ముఖ్యమైన ఇన్‌కమింగ్ కాల్</string>
+  <string name="important_notification_incoming_call_with_location">స్థానంతో ముఖ్యమైన ఇన్‌కమింగ్ కాల్</string>
+  <string name="important_notification_incoming_call_with_photo_message">ఫోటో మరియు సందేశంతో ముఖ్యమైన ఇన్‌కమింగ్ కాల్</string>
+  <string name="important_notification_incoming_call_with_photo_location">ఫోటో మరియు స్థానంతో ముఖ్యమైన ఇన్‌కమింగ్ కాల్</string>
+  <string name="important_notification_incoming_call_with_message_location">సందేశం మరియు స్థానంతో ముఖ్యమైన ఇన్‌కమింగ్ కాల్</string>
+  <string name="important_notification_incoming_call_with_photo_message_location">ఫోటో, సందేశం, స్థానంతో ముఖ్యమైన ఇన్‌కమింగ్ కాల్</string>
+  <string name="important_notification_incoming_call_attachments">జోడింపులతో ముఖ్యమైన ఇన్‌కమింగ్ కాల్</string>
+  <string name="notification_incoming_work_call">ఇన్‌కమింగ్ కార్యాలయ కాల్</string>
+  <string name="notification_incoming_spam_call">అనుమానాస్పద స్పామ్ కాల్ వస్తోంది</string>
+  <string name="notification_requesting_video_call">ఇన్‌కమింగ్ వీడియో అభ్యర్థన</string>
+  <string name="notification_action_answer">సమాధానం ఇవ్వండి</string>
+  <string name="notification_action_end_call">కాల్‌ను ముగించు</string>
+  <string name="notification_action_answer_video">వీడియో</string>
+  <string name="notification_action_accept">ఆమోదిస్తున్నాను</string>
+  <string name="notification_action_dismiss">తిరస్కరించు</string>
+  <string name="notification_action_speaker_on">స్పీకర్‌ను ఆన్ చేయండి</string>
+  <string name="notification_action_speaker_off">స్పీకర్‌ను ఆఫ్ చేయండి</string>
+  <string name="notification_external_call">మరో పరికరంలో కాల్ జరుగుతోంది</string>
+  <string name="notification_external_video_call">మరో పరికరంలో వీడియో కాల్ జరుగుతోంది</string>
+  <string name="notification_take_call">కాల్‌ను తీయి</string>
+  <string name="notification_take_video_call">వీడియో కాల్‌ను తీయి</string>
+  <string name="incall_error_supp_service_unknown">సేవకు మద్దతు లేదు.</string>
+  <string name="goPrivate">ప్రైవేట్‌గా వెళ్లు</string>
+  <string name="manageConferenceLabel">కాన్ఫరెన్స్ కాల్‌ను నిర్వహించు</string>
+  <string name="child_number">%s ద్వారా</string>
+  <string name="callFailed_simError">సిమ్ లేదు లేదా సిమ్ లోపం</string>
+  <string name="conference_caller_disconnect_content_description">కాల్‌ను ముగిస్తుంది</string>
+  <string name="conference_call_name">కాన్ఫరెన్స్ కాల్</string>
+  <string name="generic_conference_call_name">కాల్‌లో ఉన్నారు</string>
+  <string name="video_call_wifi_to_lte_handover_toast">మొబైల్ డేటాను ఉపయోగించి కాల్‌ను కొనసాగిస్తోంది…</string>
+  <string name="video_call_lte_to_wifi_failed_title">Wi-Fi నెట్‌వర్క్‌కి మార్చడం సాధ్యపడలేదు</string>
+  <string name="video_call_lte_to_wifi_failed_message">వీడియో కాల్ మొబైల్ నెట్‌వర్క్‌లో కొనసాగుతుంది. ప్రామాణిక డేటా ఛార్జీలు వర్తించవచ్చు.</string>
+  <string name="video_call_lte_to_wifi_failed_do_not_show">దీన్ని మళ్లీ చూపవద్దు</string>
+  <string name="bubble_return_to_call">కాల్ చేయడానికి తిరిగి వెళ్ళు</string>
+  <string name="rtt_request_dialog_title">RTT కాల్‌లో చేరాలనుకుంటున్నారా?</string>
+  <string name="rtt_request_dialog_details">%1$s మీ వాయిస్ కాల్‌లో సందేశాన్ని ఉపయోగించాలనుకుంటున్నారు.</string>
+  <string name="rtt_request_dialog_more_information">చెవిటివారు, వినికిడి సమస్యలు ఉన్న వారు, మాట్లాడటంలో సమస్యలు ఉన్న వారు లేదా కేవలం వాయిస్‌తో అర్థం చేసుకోలేని కాలర్‌లకు RTT సహాయపడుతుంది.</string>
+  <string name="rtt_button_decline_request">వద్దు, ధన్యవాదాలు</string>
+  <string name="rtt_button_accept_request">RTTలో చేరండి</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-th/strings.xml b/java/com/android/incallui/res/values-th/strings.xml
index ee46d6e..2312234 100644
--- a/java/com/android/incallui/res/values-th/strings.xml
+++ b/java/com/android/incallui/res/values-th/strings.xml
@@ -1,79 +1,68 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"โทรศัพท์"</string>
-    <string name="wait_prompt_str" msgid="3509685348904329594">"ส่งโทนเสียงต่อไปนี้หรือไม่ \n"</string>
-    <string name="pause_prompt_yes" msgid="4642047011233552973">"ใช่"</string>
-    <string name="pause_prompt_no" msgid="4691320111774935838">"ไม่"</string>
-    <string name="notification_dialing" msgid="9072177265772083826">"กำลังโทรออก"</string>
-    <string name="notification_ongoing_call" msgid="8712641937577776125">"โทรต่อเนื่อง"</string>
-    <string name="notification_ongoing_video_call" msgid="6331318021321487769">"กำลังใช้แฮงเอาท์วิดีโออยู่"</string>
-    <string name="notification_ongoing_paused_video_call" msgid="709950253594606371">"กำลังใช้แฮงเอาท์วิดีโออยู่ ‑ วิดีโอหยุดชั่วคราว"</string>
-    <string name="notification_ongoing_work_call" msgid="3189581218078981547">"กำลังอยู่ในสายจากที่ทำงาน"</string>
-    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"กำลังอยู่ในสายจาก <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
-    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"สายเรียกเข้าจาก <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
-    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"การโทรผ่าน Wi-Fi"</string>
-    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"สายจากที่ทำงานผ่าน Wi‑Fi"</string>
-    <string name="notification_on_hold" msgid="7141827443379205682">"พักสาย"</string>
-    <string name="notification_incoming_call" msgid="7520580807513849283">"สายเรียกเข้า"</string>
-    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"สายเรียกเข้าพร้อมรูปภาพ"</string>
-    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"สายเรียกเข้าพร้อมข้อความ"</string>
-    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"สายเรียกเข้าพร้อมตำแหน่ง"</string>
-    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"สายเรียกเข้าพร้อมรูปภาพและข้อความ"</string>
-    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"สายเรียกเข้าพร้อมรูปภาพและตำแหน่ง"</string>
-    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"สายเรียกเข้าพร้อมข้อความและตำแหน่ง"</string>
-    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"สายเรียกเข้าพร้อมรูปภาพ ข้อความ และตำแหน่ง"</string>
-    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"สายเรียกเข้าพร้อมไฟล์แนบ"</string>
-    <string name="important_notification_incoming_call" msgid="2867013954509930989">"สายเรียกเข้าที่สำคัญ"</string>
-    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"สายเรียกเข้าที่สำคัญพร้อมรูปภาพ"</string>
-    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"สายเรียกเข้าที่สำคัญพร้อมข้อความ"</string>
-    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"สายเรียกเข้าที่สำคัญพร้อมตำแหน่ง"</string>
-    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"สายเรียกเข้าที่สำคัญพร้อมรูปภาพและข้อความ"</string>
-    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"สายเรียกเข้าที่สำคัญพร้อมรูปภาพและตำแหน่ง"</string>
-    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"สายเรียกเข้าที่สำคัญพร้อมข้อความและตำแหน่ง"</string>
-    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"สายเรียกเข้าที่สำคัญพร้อมรูปภาพ ข้อความ และตำแหน่ง"</string>
-    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"สายเรียกเข้าที่สำคัญพร้อมไฟล์แนบ"</string>
-    <string name="notification_incoming_work_call" msgid="5291275092734261918">"มีสายเรียกเข้าจากที่ทำงาน"</string>
-    <string name="notification_incoming_spam_call" msgid="7591506944666791937">"สายเรียกเข้าที่สงสัยว่าเป็นสแปม"</string>
-    <string name="notification_requesting_video_call" msgid="1807679328811515758">"คำขอโทรเข้าเป็นวิดีโอ"</string>
-    <string name="notification_action_answer" msgid="8748275902211192568">"รับสาย"</string>
-    <string name="notification_action_end_call" msgid="7467258454170007765">"วางสาย"</string>
-    <string name="notification_action_answer_video" msgid="8488108892919917287">"วิดีโอ"</string>
-    <string name="notification_action_accept" msgid="1272761514200507143">"ยอมรับ"</string>
-    <string name="notification_action_dismiss" msgid="3128241581632616226">"ปฏิเสธ"</string>
-    <string name="notification_action_speaker_on" msgid="1882659234405596540">"เปิดลำโพง"</string>
-    <string name="notification_action_speaker_off" msgid="6340085043115533948">"ปิดลำโพง"</string>
-    <string name="notification_external_call" msgid="2504334597315343920">"กำลังใช้สายบนอุปกรณ์อื่น"</string>
-    <string name="notification_external_video_call" msgid="7709394856028436683">"มีการโทรแฮงเอาท์วิดีโอบนอุปกรณ์อื่น"</string>
-    <string name="notification_take_call" msgid="5631659438864492229">"รับสาย"</string>
-    <string name="notification_take_video_call" msgid="4473387503712341390">"รับสายแฮงเอาท์วิดีโอ"</string>
-    <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"ไม่สนับสนุนบริการนี้"</string>
-    <string name="goPrivate" msgid="5269514638004595378">"เข้าสู่โหมดส่วนตัว"</string>
-    <string name="manageConferenceLabel" msgid="3589379023518128318">"จัดการการประชุมสาย"</string>
-    <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"หมายเลขฉุกเฉิน"</string>
-    <string name="child_number" msgid="3398257437107259682">"ผ่านหมายเลข <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
-    <string name="callFailed_simError" msgid="4587775795711340072">"ไม่มีซิมหรือเกิดข้อผิดพลาดกับซิม"</string>
-    <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"วางสาย"</string>
-    <string name="conference_call_name" msgid="8189987124611337174">"การประชุมสาย"</string>
-    <string name="generic_conference_call_name" msgid="1546941472424243894">"อยู่ในสาย"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"โทรต่อโดยใช้อินเทอร์เน็ตมือถือ..."</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"ไม่สามารถเปลี่ยนไปใช้เครือข่าย Wi-Fi"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"แฮงเอาท์วิดีโอจะยังคงอยู่ในเครือข่ายมือถือ อาจมีการเรียกเก็บค่าบริการข้อมูลมาตรฐาน"</string>
-    <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"อย่าแสดงสิ่งนี้อีก"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="wait_prompt_str">ส่งโทนเสียงต่อไปนี้หรือไม่ \n</string>
+  <string name="pause_prompt_yes">ใช่</string>
+  <string name="pause_prompt_no">ไม่</string>
+  <string name="notification_dialing">กำลังโทรออก</string>
+  <string name="notification_ongoing_call">โทรต่อเนื่อง</string>
+  <string name="notification_ongoing_video_call">กำลังใช้ Hangouts วิดีโออยู่</string>
+  <string name="notification_ongoing_paused_video_call">กำลังใช้ Hangouts วิดีโออยู่ ‑ วิดีโอหยุดชั่วคราว</string>
+  <string name="notification_ongoing_work_call">กำลังอยู่ในสายจากที่ทำงาน</string>
+  <string name="notification_ongoing_call_wifi_template">กำลังอยู่ในสายจาก %1$s</string>
+  <string name="notification_incoming_call_wifi_template">สายเรียกเข้าจาก %1$s</string>
+  <string name="notification_call_wifi_brand">การโทรผ่าน Wi-Fi</string>
+  <string name="notification_call_wifi_work_brand">สายจากที่ทำงานผ่าน Wi‑Fi</string>
+  <string name="notification_on_hold">พักสาย</string>
+  <string name="notification_incoming_call">สายเรียกเข้า</string>
+  <string name="notification_incoming_video_call"> Hangouts วิดีโอเรียกเข้า</string>
+  <string name="notification_incoming_call_mutli_sim">สายเรียกเข้าผ่าน %1$s</string>
+  <string name="notification_incoming_call_with_photo">สายเรียกเข้าพร้อมรูปภาพ</string>
+  <string name="notification_incoming_call_with_message">สายเรียกเข้าพร้อมข้อความ</string>
+  <string name="notification_incoming_call_with_location">สายเรียกเข้าพร้อมตำแหน่ง</string>
+  <string name="notification_incoming_call_with_photo_message">สายเรียกเข้าพร้อมรูปภาพและข้อความ</string>
+  <string name="notification_incoming_call_with_photo_location">สายเรียกเข้าพร้อมรูปภาพและตำแหน่ง</string>
+  <string name="notification_incoming_call_with_message_location">สายเรียกเข้าพร้อมข้อความและตำแหน่ง</string>
+  <string name="notification_incoming_call_with_photo_message_location">สายเรียกเข้าพร้อมรูปภาพ ข้อความ และตำแหน่ง</string>
+  <string name="notification_incoming_call_attachments">สายเรียกเข้าพร้อมไฟล์แนบ</string>
+  <string name="important_notification_incoming_call">สายเรียกเข้าที่สำคัญ</string>
+  <string name="important_notification_incoming_call_with_photo">สายเรียกเข้าที่สำคัญพร้อมรูปภาพ</string>
+  <string name="important_notification_incoming_call_with_message">สายเรียกเข้าที่สำคัญพร้อมข้อความ</string>
+  <string name="important_notification_incoming_call_with_location">สายเรียกเข้าที่สำคัญพร้อมตำแหน่ง</string>
+  <string name="important_notification_incoming_call_with_photo_message">สายเรียกเข้าที่สำคัญพร้อมรูปภาพและข้อความ</string>
+  <string name="important_notification_incoming_call_with_photo_location">สายเรียกเข้าที่สำคัญพร้อมรูปภาพและตำแหน่ง</string>
+  <string name="important_notification_incoming_call_with_message_location">สายเรียกเข้าที่สำคัญพร้อมข้อความและตำแหน่ง</string>
+  <string name="important_notification_incoming_call_with_photo_message_location">สายเรียกเข้าที่สำคัญพร้อมรูปภาพ ข้อความ และตำแหน่ง</string>
+  <string name="important_notification_incoming_call_attachments">สายเรียกเข้าที่สำคัญพร้อมไฟล์แนบ</string>
+  <string name="notification_incoming_work_call">มีสายเรียกเข้าจากที่ทำงาน</string>
+  <string name="notification_incoming_spam_call">สายเรียกเข้าที่สงสัยว่าเป็นสแปม</string>
+  <string name="notification_requesting_video_call">คำขอโทรเข้าเป็นวิดีโอ</string>
+  <string name="notification_action_answer">รับสาย</string>
+  <string name="notification_action_end_call">วางสาย</string>
+  <string name="notification_action_answer_video">วิดีโอ</string>
+  <string name="notification_action_accept">ยอมรับ</string>
+  <string name="notification_action_dismiss">ปฏิเสธ</string>
+  <string name="notification_action_speaker_on">เปิดลำโพง</string>
+  <string name="notification_action_speaker_off">ปิดลำโพง</string>
+  <string name="notification_external_call">กำลังใช้สายบนอุปกรณ์อื่น</string>
+  <string name="notification_external_video_call">มีการโทร Hangouts วิดีโอบนอุปกรณ์อื่น</string>
+  <string name="notification_take_call">รับสาย</string>
+  <string name="notification_take_video_call">รับสาย Hangouts วิดีโอ</string>
+  <string name="incall_error_supp_service_unknown">ไม่สนับสนุนบริการนี้</string>
+  <string name="goPrivate">เข้าสู่โหมดส่วนตัว</string>
+  <string name="manageConferenceLabel">จัดการการประชุมสาย</string>
+  <string name="child_number">ผ่านหมายเลข %s</string>
+  <string name="callFailed_simError">ไม่มีซิมหรือเกิดข้อผิดพลาดกับซิม</string>
+  <string name="conference_caller_disconnect_content_description">วางสาย</string>
+  <string name="conference_call_name">การประชุมสาย</string>
+  <string name="generic_conference_call_name">อยู่ในสาย</string>
+  <string name="video_call_wifi_to_lte_handover_toast">โทรต่อโดยใช้อินเทอร์เน็ตมือถือ...</string>
+  <string name="video_call_lte_to_wifi_failed_title">ไม่สามารถเปลี่ยนไปใช้เครือข่าย Wi-Fi</string>
+  <string name="video_call_lte_to_wifi_failed_message"> Hangouts วิดีโอจะยังคงอยู่ในเครือข่ายมือถือ อาจมีการเรียกเก็บค่าบริการข้อมูลมาตรฐาน</string>
+  <string name="video_call_lte_to_wifi_failed_do_not_show">อย่าแสดงสิ่งนี้อีก</string>
+  <string name="bubble_return_to_call">กลับไปที่การโทร</string>
+  <string name="rtt_request_dialog_title">เข้าร่วมการโทรแบบ RTT ใช่ไหม</string>
+  <string name="rtt_request_dialog_details">%1$s ต้องการใช้การรับส่งข้อความภายในการโทรด้วยเสียงของคุณ</string>
+  <string name="rtt_request_dialog_more_information">RTT ช่วยเหลือผู้โทรที่หูหนวก ได้ยินไม่ชัด มีความบกพร่องในการพูด หรือต้องการการสื่อสารที่นอกเหนือจากเสียงพูด</string>
+  <string name="rtt_button_decline_request">ไม่เป็นไร</string>
+  <string name="rtt_button_accept_request">เข้าร่วม RTT</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-tl/strings.xml b/java/com/android/incallui/res/values-tl/strings.xml
index a10b520..9a2dd13 100644
--- a/java/com/android/incallui/res/values-tl/strings.xml
+++ b/java/com/android/incallui/res/values-tl/strings.xml
@@ -1,79 +1,68 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"Telepono"</string>
-    <string name="wait_prompt_str" msgid="3509685348904329594">"Ipadala ang mga sumusunod na tone?\n"</string>
-    <string name="pause_prompt_yes" msgid="4642047011233552973">"Oo"</string>
-    <string name="pause_prompt_no" msgid="4691320111774935838">"Hindi"</string>
-    <string name="notification_dialing" msgid="9072177265772083826">"Dina-dial"</string>
-    <string name="notification_ongoing_call" msgid="8712641937577776125">"Kasalukuyang tawag"</string>
-    <string name="notification_ongoing_video_call" msgid="6331318021321487769">"Kasalukuyang video call"</string>
-    <string name="notification_ongoing_paused_video_call" msgid="709950253594606371">"Kasalukuyang video call ‑ naka-pause ang video"</string>
-    <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Kasalukuyang tawag sa trabaho"</string>
-    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"Kasalukuyang <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
-    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"Papasok na <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
-    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"Pagtawag gamit ang Wi‑Fi"</string>
-    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"Pagtawag sa trabaho gamit ang Wi‑Fi"</string>
-    <string name="notification_on_hold" msgid="7141827443379205682">"Naka-hold"</string>
-    <string name="notification_incoming_call" msgid="7520580807513849283">"Papasok na tawag"</string>
-    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Papasok na tawag na may larawan"</string>
-    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"Papasok na tawag na may mensahe"</string>
-    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"Papasok na tawag na may lokasyon"</string>
-    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"Papasok na tawag na may larawan at mensahe"</string>
-    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"Papasok na tawag na may larawan at lokasyon"</string>
-    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"Papasok na tawag na may mensahe at lokasyon"</string>
-    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"Papasok na tawag na may larawan, mensahe, at lokasyon"</string>
-    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"Papasok na tawag na may mga attachment"</string>
-    <string name="important_notification_incoming_call" msgid="2867013954509930989">"Mahalagang papasok na tawag"</string>
-    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"Mahalagang papasok na tawag na may larawan"</string>
-    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"Mahalagang papasok na tawag na may mensahe"</string>
-    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"Mahalagang papasok na tawag na may lokasyon"</string>
-    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"Mahalagang papasok na tawag na may larawan at mensahe"</string>
-    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"Mahalagang papasok na tawag na may larawan at lokasyon"</string>
-    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"Mahalagang papasok na tawag na may mensahe at lokasyon"</string>
-    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Mahalagang papasok na tawag na may larawan, mensahe, at lokasyon"</string>
-    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Mahalagang papasok na tawag na may mga attachment"</string>
-    <string name="notification_incoming_work_call" msgid="5291275092734261918">"Papasok na tawag sa trabaho"</string>
-    <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Papasok na pinaghihinalaang spam na tawag"</string>
-    <string name="notification_requesting_video_call" msgid="1807679328811515758">"Papasok na kahilingan ng video"</string>
-    <string name="notification_action_answer" msgid="8748275902211192568">"Sagutin"</string>
-    <string name="notification_action_end_call" msgid="7467258454170007765">"Ibaba"</string>
-    <string name="notification_action_answer_video" msgid="8488108892919917287">"Video"</string>
-    <string name="notification_action_accept" msgid="1272761514200507143">"Tanggapin"</string>
-    <string name="notification_action_dismiss" msgid="3128241581632616226">"Tanggihan"</string>
-    <string name="notification_action_speaker_on" msgid="1882659234405596540">"I-on ang speaker"</string>
-    <string name="notification_action_speaker_off" msgid="6340085043115533948">"I-off ang speaker"</string>
-    <string name="notification_external_call" msgid="2504334597315343920">"Kasalukuyang tawag sa isa pang device"</string>
-    <string name="notification_external_video_call" msgid="7709394856028436683">"May kasalukuyang isinasagawang video call sa isa pang device"</string>
-    <string name="notification_take_call" msgid="5631659438864492229">"Sagutin ang Tawag"</string>
-    <string name="notification_take_video_call" msgid="4473387503712341390">"Sagutin ang Video Call"</string>
-    <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"Hindi sinusuportahan ang serbisyo."</string>
-    <string name="goPrivate" msgid="5269514638004595378">"maging pribado"</string>
-    <string name="manageConferenceLabel" msgid="3589379023518128318">"Pamahalaan ang conference call"</string>
-    <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"Pang-emergency na numero"</string>
-    <string name="child_number" msgid="3398257437107259682">"sa pamamagitan ng <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
-    <string name="callFailed_simError" msgid="4587775795711340072">"Walang SIM, o error sa SIM"</string>
-    <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Tapusin ang tawag"</string>
-    <string name="conference_call_name" msgid="8189987124611337174">"Conference call"</string>
-    <string name="generic_conference_call_name" msgid="1546941472424243894">"Nasa tawag"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Ipinagpapatuloy ang tawag gamit ang mobile data…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Hindi makalipat sa Wi-Fi network"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Mananatili sa mobile network ang video call. Maaaring may mga babayaran sa data."</string>
-    <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Huwag itong ipakitang muli"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="wait_prompt_str">Ipadala ang mga sumusunod na tone?\n</string>
+  <string name="pause_prompt_yes">Oo</string>
+  <string name="pause_prompt_no">Hindi</string>
+  <string name="notification_dialing">Dina-dial</string>
+  <string name="notification_ongoing_call">Kasalukuyang tawag</string>
+  <string name="notification_ongoing_video_call">Kasalukuyang video call</string>
+  <string name="notification_ongoing_paused_video_call">Kasalukuyang video call ‑ naka-pause ang video</string>
+  <string name="notification_ongoing_work_call">Kasalukuyang tawag sa trabaho</string>
+  <string name="notification_ongoing_call_wifi_template">Kasalukuyang %1$s</string>
+  <string name="notification_incoming_call_wifi_template">Papasok na %1$s</string>
+  <string name="notification_call_wifi_brand">Pagtawag gamit ang Wi‑Fi</string>
+  <string name="notification_call_wifi_work_brand">Pagtawag sa trabaho gamit ang Wi‑Fi</string>
+  <string name="notification_on_hold">Naka-hold</string>
+  <string name="notification_incoming_call">Papasok na tawag</string>
+  <string name="notification_incoming_video_call">Papasok na video call</string>
+  <string name="notification_incoming_call_mutli_sim">Papasok na tawag sa pamamagitan ng %1$s</string>
+  <string name="notification_incoming_call_with_photo">Papasok na tawag na may larawan</string>
+  <string name="notification_incoming_call_with_message">Papasok na tawag na may mensahe</string>
+  <string name="notification_incoming_call_with_location">Papasok na tawag na may lokasyon</string>
+  <string name="notification_incoming_call_with_photo_message">Papasok na tawag na may larawan at mensahe</string>
+  <string name="notification_incoming_call_with_photo_location">Papasok na tawag na may larawan at lokasyon</string>
+  <string name="notification_incoming_call_with_message_location">Papasok na tawag na may mensahe at lokasyon</string>
+  <string name="notification_incoming_call_with_photo_message_location">Papasok na tawag na may larawan, mensahe, at lokasyon</string>
+  <string name="notification_incoming_call_attachments">Papasok na tawag na may mga attachment</string>
+  <string name="important_notification_incoming_call">Mahalagang papasok na tawag</string>
+  <string name="important_notification_incoming_call_with_photo">Mahalagang papasok na tawag na may larawan</string>
+  <string name="important_notification_incoming_call_with_message">Mahalagang papasok na tawag na may mensahe</string>
+  <string name="important_notification_incoming_call_with_location">Mahalagang papasok na tawag na may lokasyon</string>
+  <string name="important_notification_incoming_call_with_photo_message">Mahalagang papasok na tawag na may larawan at mensahe</string>
+  <string name="important_notification_incoming_call_with_photo_location">Mahalagang papasok na tawag na may larawan at lokasyon</string>
+  <string name="important_notification_incoming_call_with_message_location">Mahalagang papasok na tawag na may mensahe at lokasyon</string>
+  <string name="important_notification_incoming_call_with_photo_message_location">Mahalagang papasok na tawag na may larawan, mensahe, at lokasyon</string>
+  <string name="important_notification_incoming_call_attachments">Mahalagang papasok na tawag na may mga attachment</string>
+  <string name="notification_incoming_work_call">Papasok na tawag sa trabaho</string>
+  <string name="notification_incoming_spam_call">Papasok na pinaghihinalaang spam na tawag</string>
+  <string name="notification_requesting_video_call">Papasok na kahilingan ng video</string>
+  <string name="notification_action_answer">Sagutin</string>
+  <string name="notification_action_end_call">Ibaba</string>
+  <string name="notification_action_answer_video">Video</string>
+  <string name="notification_action_accept">Tanggapin</string>
+  <string name="notification_action_dismiss">Tanggihan</string>
+  <string name="notification_action_speaker_on">I-on ang speaker</string>
+  <string name="notification_action_speaker_off">I-off ang speaker</string>
+  <string name="notification_external_call">Kasalukuyang tawag sa isa pang device</string>
+  <string name="notification_external_video_call">May kasalukuyang isinasagawang video call sa isa pang device</string>
+  <string name="notification_take_call">Sagutin ang Tawag</string>
+  <string name="notification_take_video_call">Sagutin ang Video Call</string>
+  <string name="incall_error_supp_service_unknown">Hindi sinusuportahan ang serbisyo.</string>
+  <string name="goPrivate">maging pribado</string>
+  <string name="manageConferenceLabel">Pamahalaan ang conference call</string>
+  <string name="child_number">sa pamamagitan ng %s</string>
+  <string name="callFailed_simError">Walang SIM, o error sa SIM</string>
+  <string name="conference_caller_disconnect_content_description">Tapusin ang tawag</string>
+  <string name="conference_call_name">Conference call</string>
+  <string name="generic_conference_call_name">Nasa tawag</string>
+  <string name="video_call_wifi_to_lte_handover_toast">Ipinagpapatuloy ang tawag gamit ang mobile data…</string>
+  <string name="video_call_lte_to_wifi_failed_title">Hindi makalipat sa Wi-Fi network</string>
+  <string name="video_call_lte_to_wifi_failed_message">Mananatili sa mobile network ang video call. Maaaring may mga babayaran sa data.</string>
+  <string name="video_call_lte_to_wifi_failed_do_not_show">Huwag itong ipakitang muli</string>
+  <string name="bubble_return_to_call">Bumalik sa tawag</string>
+  <string name="rtt_request_dialog_title">Sumali sa RTT na tawag?</string>
+  <string name="rtt_request_dialog_details">Gustong gamitin ni %1$s ang pagmemensahe sa iyong voice call.</string>
+  <string name="rtt_request_dialog_more_information">Tinutulungan ng RTT ang mga tumatawag na bingi, mahina ang pandinig, mayroong kapansanan sa pagsasalita, o kailangan ng higit pa sa boses lang.</string>
+  <string name="rtt_button_decline_request">Hindi, salamat</string>
+  <string name="rtt_button_accept_request">Sumali sa RTT</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-tr/strings.xml b/java/com/android/incallui/res/values-tr/strings.xml
index 8844b24..3769b4e 100644
--- a/java/com/android/incallui/res/values-tr/strings.xml
+++ b/java/com/android/incallui/res/values-tr/strings.xml
@@ -1,79 +1,68 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"Telefon"</string>
-    <string name="wait_prompt_str" msgid="3509685348904329594">"Şu zil sesleri gönderilsin mi?\n"</string>
-    <string name="pause_prompt_yes" msgid="4642047011233552973">"Evet"</string>
-    <string name="pause_prompt_no" msgid="4691320111774935838">"Hayır"</string>
-    <string name="notification_dialing" msgid="9072177265772083826">"Numara çevriliyor"</string>
-    <string name="notification_ongoing_call" msgid="8712641937577776125">"Devam eden çağrılar"</string>
-    <string name="notification_ongoing_video_call" msgid="6331318021321487769">"Devam eden görüntülü görüşme"</string>
-    <string name="notification_ongoing_paused_video_call" msgid="709950253594606371">"Devam eden görüntülü görüşme ‑ video duraklatıldı"</string>
-    <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Süren iş çağrısı"</string>
-    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"Devam eden <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
-    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"Gelen <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
-    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"Kablosuz çağrı"</string>
-    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"İşle ilgili kablosuz çağrı"</string>
-    <string name="notification_on_hold" msgid="7141827443379205682">"Beklemede"</string>
-    <string name="notification_incoming_call" msgid="7520580807513849283">"Gelen çağrı"</string>
-    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Fotoğraf eklenmiş gelen çağrı"</string>
-    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"Mesaj eklenmiş gelen çağrı"</string>
-    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"Konum eklenmiş gelen çağrı"</string>
-    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"Fotoğraf ve mesaj eklenmiş gelen çağrı"</string>
-    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"Fotoğraf ve konum eklenmiş gelen çağrı"</string>
-    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"Mesaj ve konum eklenmiş gelen çağrı"</string>
-    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"Fotoğraf, mesaj ve konum eklenmiş gelen çağrı"</string>
-    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"Ek iliştirilmiş gelen çağrı"</string>
-    <string name="important_notification_incoming_call" msgid="2867013954509930989">"Önemli gelen çağrı"</string>
-    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"Fotoğraf eklenmiş önemli gelen çağrı"</string>
-    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"Mesaj eklenmiş önemli gelen çağrı"</string>
-    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"Konum eklenmiş önemli gelen çağrı"</string>
-    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"Fotoğraf ve mesaj eklenmiş önemli gelen çağrı"</string>
-    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"Fotoğraf ve konum eklenmiş önemli gelen çağrı"</string>
-    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"Mesaj ve konum eklenmiş önemli gelen çağrı"</string>
-    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Fotoğraf, mesaj ve konum eklenmiş önemli çağrı"</string>
-    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Ek iliştirilmiş önemli gelen çağrı"</string>
-    <string name="notification_incoming_work_call" msgid="5291275092734261918">"Gelen iş çağrısı"</string>
-    <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Spam olabilecek gelen arama"</string>
-    <string name="notification_requesting_video_call" msgid="1807679328811515758">"Gelen video isteği"</string>
-    <string name="notification_action_answer" msgid="8748275902211192568">"Yanıtla"</string>
-    <string name="notification_action_end_call" msgid="7467258454170007765">"Kapat"</string>
-    <string name="notification_action_answer_video" msgid="8488108892919917287">"Video"</string>
-    <string name="notification_action_accept" msgid="1272761514200507143">"Kabul et"</string>
-    <string name="notification_action_dismiss" msgid="3128241581632616226">"Reddet"</string>
-    <string name="notification_action_speaker_on" msgid="1882659234405596540">"Hoparlörü açın"</string>
-    <string name="notification_action_speaker_off" msgid="6340085043115533948">"Hoparlörü kapatın"</string>
-    <string name="notification_external_call" msgid="2504334597315343920">"Başka bir cihazda devam eden çağrı"</string>
-    <string name="notification_external_video_call" msgid="7709394856028436683">"Başka bir cihazda devam eden video görüşmesi var"</string>
-    <string name="notification_take_call" msgid="5631659438864492229">"Çağrıyı Al"</string>
-    <string name="notification_take_video_call" msgid="4473387503712341390">"Video Görüşmesini Al"</string>
-    <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"Servis desteklenmiyor."</string>
-    <string name="goPrivate" msgid="5269514638004595378">"özele git"</string>
-    <string name="manageConferenceLabel" msgid="3589379023518128318">"Konferans çağrısını yönet"</string>
-    <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"Acil durum numarası"</string>
-    <string name="child_number" msgid="3398257437107259682">"<xliff:g id="CHILD_NUMBER">%s</xliff:g> ile"</string>
-    <string name="callFailed_simError" msgid="4587775795711340072">"SIM kart yok veya SIM hatası"</string>
-    <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Çağrı sonlandırılır"</string>
-    <string name="conference_call_name" msgid="8189987124611337174">"Konferans çağrısı"</string>
-    <string name="generic_conference_call_name" msgid="1546941472424243894">"Konferans çağrısında"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Görüşmeye mobil veri kullanılarak devam ediliyor…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Kablosuz ağa geçilemedi"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Görüntülü görüşme mobil ağda devam edecek. Standart veri ücretleri alınabilir."</string>
-    <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Bunu bir daha gösterme"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="wait_prompt_str">Şu zil sesleri gönderilsin mi?\n</string>
+  <string name="pause_prompt_yes">Evet</string>
+  <string name="pause_prompt_no">Hayır</string>
+  <string name="notification_dialing">Numara çevriliyor</string>
+  <string name="notification_ongoing_call">Devam eden çağrılar</string>
+  <string name="notification_ongoing_video_call">Devam eden görüntülü görüşme</string>
+  <string name="notification_ongoing_paused_video_call">Devam eden görüntülü görüşme ‑ video duraklatıldı</string>
+  <string name="notification_ongoing_work_call">Süren iş çağrısı</string>
+  <string name="notification_ongoing_call_wifi_template">Devam eden %1$s</string>
+  <string name="notification_incoming_call_wifi_template">Gelen %1$s</string>
+  <string name="notification_call_wifi_brand">Kablosuz çağrı</string>
+  <string name="notification_call_wifi_work_brand">İşle ilgili kablosuz çağrı</string>
+  <string name="notification_on_hold">Beklemede</string>
+  <string name="notification_incoming_call">Gelen çağrı</string>
+  <string name="notification_incoming_video_call">Gelen video görüşmesi isteği</string>
+  <string name="notification_incoming_call_mutli_sim">%1$s üzerinden gelen arama</string>
+  <string name="notification_incoming_call_with_photo">Fotoğraf eklenmiş gelen çağrı</string>
+  <string name="notification_incoming_call_with_message">Mesaj eklenmiş gelen çağrı</string>
+  <string name="notification_incoming_call_with_location">Konum eklenmiş gelen çağrı</string>
+  <string name="notification_incoming_call_with_photo_message">Fotoğraf ve mesaj eklenmiş gelen çağrı</string>
+  <string name="notification_incoming_call_with_photo_location">Fotoğraf ve konum eklenmiş gelen çağrı</string>
+  <string name="notification_incoming_call_with_message_location">Mesaj ve konum eklenmiş gelen çağrı</string>
+  <string name="notification_incoming_call_with_photo_message_location">Fotoğraf, mesaj ve konum eklenmiş gelen çağrı</string>
+  <string name="notification_incoming_call_attachments">Ek iliştirilmiş gelen çağrı</string>
+  <string name="important_notification_incoming_call">Önemli gelen çağrı</string>
+  <string name="important_notification_incoming_call_with_photo">Fotoğraf eklenmiş önemli gelen çağrı</string>
+  <string name="important_notification_incoming_call_with_message">Mesaj eklenmiş önemli gelen çağrı</string>
+  <string name="important_notification_incoming_call_with_location">Konum eklenmiş önemli gelen çağrı</string>
+  <string name="important_notification_incoming_call_with_photo_message">Fotoğraf ve mesaj eklenmiş önemli gelen çağrı</string>
+  <string name="important_notification_incoming_call_with_photo_location">Fotoğraf ve konum eklenmiş önemli gelen çağrı</string>
+  <string name="important_notification_incoming_call_with_message_location">Mesaj ve konum eklenmiş önemli gelen çağrı</string>
+  <string name="important_notification_incoming_call_with_photo_message_location">Fotoğraf, mesaj ve konum eklenmiş önemli çağrı</string>
+  <string name="important_notification_incoming_call_attachments">Ek iliştirilmiş önemli gelen çağrı</string>
+  <string name="notification_incoming_work_call">Gelen iş çağrısı</string>
+  <string name="notification_incoming_spam_call">Spam olabilecek gelen arama</string>
+  <string name="notification_requesting_video_call">Gelen video isteği</string>
+  <string name="notification_action_answer">Yanıtla</string>
+  <string name="notification_action_end_call">Kapat</string>
+  <string name="notification_action_answer_video">Video</string>
+  <string name="notification_action_accept">Kabul et</string>
+  <string name="notification_action_dismiss">Reddet</string>
+  <string name="notification_action_speaker_on">Hoparlörü açın</string>
+  <string name="notification_action_speaker_off">Hoparlörü kapatın</string>
+  <string name="notification_external_call">Başka bir cihazda devam eden çağrı</string>
+  <string name="notification_external_video_call">Başka bir cihazda devam eden video görüşmesi var</string>
+  <string name="notification_take_call">Çağrıyı Al</string>
+  <string name="notification_take_video_call">Video Görüşmesini Al</string>
+  <string name="incall_error_supp_service_unknown">Servis desteklenmiyor.</string>
+  <string name="goPrivate">özele git</string>
+  <string name="manageConferenceLabel">Konferans çağrısını yönet</string>
+  <string name="child_number">%s ile</string>
+  <string name="callFailed_simError">SIM kart yok veya SIM hatası</string>
+  <string name="conference_caller_disconnect_content_description">Çağrı sonlandırılır</string>
+  <string name="conference_call_name">Konferans çağrısı</string>
+  <string name="generic_conference_call_name">Konferans çağrısında</string>
+  <string name="video_call_wifi_to_lte_handover_toast">Görüşmeye mobil veri kullanılarak devam ediliyor…</string>
+  <string name="video_call_lte_to_wifi_failed_title">Kablosuz ağa geçilemedi</string>
+  <string name="video_call_lte_to_wifi_failed_message">Görüntülü görüşme mobil ağda devam edecek. Standart veri ücretleri alınabilir.</string>
+  <string name="video_call_lte_to_wifi_failed_do_not_show">Bunu bir daha gösterme</string>
+  <string name="bubble_return_to_call">Çağrıya dön</string>
+  <string name="rtt_request_dialog_title">RTT çağrısına katılınsın mı?</string>
+  <string name="rtt_request_dialog_details">%1$s, yaptığınız sesli çağrıda mesajlaşma özelliğini kullanmak istiyor.</string>
+  <string name="rtt_request_dialog_more_information">RTT; tam veya kısmi işitme engelli, konuşma engeli olan veya sesten fazlasına ihtiyaç duyan arayanlara yardımcı olur.</string>
+  <string name="rtt_button_decline_request">Hayır, teşekkürler</string>
+  <string name="rtt_button_accept_request">RTT\'ye katıl</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-uk/strings.xml b/java/com/android/incallui/res/values-uk/strings.xml
index 36ae03a..c7fdec3 100644
--- a/java/com/android/incallui/res/values-uk/strings.xml
+++ b/java/com/android/incallui/res/values-uk/strings.xml
@@ -1,79 +1,68 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"Телефон"</string>
-    <string name="wait_prompt_str" msgid="3509685348904329594">"Надісл. наступні сигнали?\n"</string>
-    <string name="pause_prompt_yes" msgid="4642047011233552973">"Так"</string>
-    <string name="pause_prompt_no" msgid="4691320111774935838">"Ні"</string>
-    <string name="notification_dialing" msgid="9072177265772083826">"Набір номера"</string>
-    <string name="notification_ongoing_call" msgid="8712641937577776125">"Поточний виклик"</string>
-    <string name="notification_ongoing_video_call" msgid="6331318021321487769">"Поточний відеодзвінок"</string>
-    <string name="notification_ongoing_paused_video_call" msgid="709950253594606371">"Поточний відеодзвінок призупинено"</string>
-    <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Поточний дзвінок на робочий телефон"</string>
-    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"Поточний <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
-    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"Вхідний <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
-    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"дзвінок через Wi-Fi"</string>
-    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"робочий дзвінок через Wi‑Fi"</string>
-    <string name="notification_on_hold" msgid="7141827443379205682">"Очікує"</string>
-    <string name="notification_incoming_call" msgid="7520580807513849283">"Вхідний виклик"</string>
-    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Вхідний дзвінок із фото"</string>
-    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"Вхідний дзвінок із повідомленням"</string>
-    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"Вхідний дзвінок з указанням адреси"</string>
-    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"Вхідний дзвінок із фото та повідомленням"</string>
-    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"Вхідний дзвінок із фото й адресою"</string>
-    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"Вхідний дзвінок з указанням адреси й повідомленням"</string>
-    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"Вхідний дзвінок із фото, повідомленням й адресою"</string>
-    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"Вхідний дзвінок із вкладеними файлами"</string>
-    <string name="important_notification_incoming_call" msgid="2867013954509930989">"Важливий вхідний дзвінок"</string>
-    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"Важливий вхідний дзвінок із фото"</string>
-    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"Важливий вхідний дзвінок із повідомленням"</string>
-    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"Важливий вхідний дзвінок з адресою"</string>
-    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"Важливий вхідний дзвінок із фото та повідомленням"</string>
-    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"Важливий вхідний дзвінок із фото й адресою"</string>
-    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"Важливий вхідний дзвінок з адресою й повідомленням"</string>
-    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Важливий дзвінок із фото, повідомленням і адресою"</string>
-    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Важливий вхідний дзвінок із вкладеними файлами"</string>
-    <string name="notification_incoming_work_call" msgid="5291275092734261918">"Вхідний дзвінок на робочий телефон"</string>
-    <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Цей дзвінок може бути спамом"</string>
-    <string name="notification_requesting_video_call" msgid="1807679328811515758">"Запит на вхідний відеодзвінок"</string>
-    <string name="notification_action_answer" msgid="8748275902211192568">"Відповісти"</string>
-    <string name="notification_action_end_call" msgid="7467258454170007765">"Завершити виклик"</string>
-    <string name="notification_action_answer_video" msgid="8488108892919917287">"Відео"</string>
-    <string name="notification_action_accept" msgid="1272761514200507143">"Приймаю"</string>
-    <string name="notification_action_dismiss" msgid="3128241581632616226">"Відхилити"</string>
-    <string name="notification_action_speaker_on" msgid="1882659234405596540">"Увімкнути динамік"</string>
-    <string name="notification_action_speaker_off" msgid="6340085043115533948">"Вимкнути динамік"</string>
-    <string name="notification_external_call" msgid="2504334597315343920">"Поточний виклик на іншому пристрої"</string>
-    <string name="notification_external_video_call" msgid="7709394856028436683">"Поточний відеодзвінок на іншому пристрої"</string>
-    <string name="notification_take_call" msgid="5631659438864492229">"Прийняти дзвінок"</string>
-    <string name="notification_take_video_call" msgid="4473387503712341390">"Прийняти відеодзвінок"</string>
-    <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"Служба не підтримується."</string>
-    <string name="goPrivate" msgid="5269514638004595378">"конфіденц."</string>
-    <string name="manageConferenceLabel" msgid="3589379023518128318">"Керувати конференц-зв’язком"</string>
-    <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"Екстрений номер"</string>
-    <string name="child_number" msgid="3398257437107259682">"на номер <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
-    <string name="callFailed_simError" msgid="4587775795711340072">"Помилка SIM-карти або SIM-карта відсутня"</string>
-    <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Завершити виклик"</string>
-    <string name="conference_call_name" msgid="8189987124611337174">"Конференц-зв’язок"</string>
-    <string name="generic_conference_call_name" msgid="1546941472424243894">"Триває виклик"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Продовження виклику з використанням мобільного Інтернету…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Не вдалося перейти на мережу Wi-Fi"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Відеодзвінок продовжиться з використанням мобільного Інтернету. Діють стандартні тарифи."</string>
-    <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Більше не показувати це"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="wait_prompt_str">Надісл. наступні сигнали?\n</string>
+  <string name="pause_prompt_yes">Так</string>
+  <string name="pause_prompt_no">Ні</string>
+  <string name="notification_dialing">Набір номера</string>
+  <string name="notification_ongoing_call">Поточний виклик</string>
+  <string name="notification_ongoing_video_call">Поточний відеодзвінок</string>
+  <string name="notification_ongoing_paused_video_call">Поточний відеодзвінок призупинено</string>
+  <string name="notification_ongoing_work_call">Поточний дзвінок на робочий телефон</string>
+  <string name="notification_ongoing_call_wifi_template">Поточний %1$s</string>
+  <string name="notification_incoming_call_wifi_template">Вхідний %1$s</string>
+  <string name="notification_call_wifi_brand">дзвінок через Wi-Fi</string>
+  <string name="notification_call_wifi_work_brand">робочий дзвінок через Wi‑Fi</string>
+  <string name="notification_on_hold">Очікує</string>
+  <string name="notification_incoming_call">Вхідний виклик</string>
+  <string name="notification_incoming_video_call">Вхідний відеодзвінок</string>
+  <string name="notification_incoming_call_mutli_sim">Вхідний виклик через %1$s</string>
+  <string name="notification_incoming_call_with_photo">Вхідний дзвінок із фото</string>
+  <string name="notification_incoming_call_with_message">Вхідний дзвінок із повідомленням</string>
+  <string name="notification_incoming_call_with_location">Вхідний дзвінок з указанням адреси</string>
+  <string name="notification_incoming_call_with_photo_message">Вхідний дзвінок із фото та повідомленням</string>
+  <string name="notification_incoming_call_with_photo_location">Вхідний дзвінок із фото й адресою</string>
+  <string name="notification_incoming_call_with_message_location">Вхідний дзвінок з указанням адреси й повідомленням</string>
+  <string name="notification_incoming_call_with_photo_message_location">Вхідний дзвінок із фото, повідомленням й адресою</string>
+  <string name="notification_incoming_call_attachments">Вхідний дзвінок із вкладеними файлами</string>
+  <string name="important_notification_incoming_call">Важливий вхідний дзвінок</string>
+  <string name="important_notification_incoming_call_with_photo">Важливий вхідний дзвінок із фото</string>
+  <string name="important_notification_incoming_call_with_message">Важливий вхідний дзвінок із повідомленням</string>
+  <string name="important_notification_incoming_call_with_location">Важливий вхідний дзвінок з адресою</string>
+  <string name="important_notification_incoming_call_with_photo_message">Важливий вхідний дзвінок із фото та повідомленням</string>
+  <string name="important_notification_incoming_call_with_photo_location">Важливий вхідний дзвінок із фото й адресою</string>
+  <string name="important_notification_incoming_call_with_message_location">Важливий вхідний дзвінок з адресою й повідомленням</string>
+  <string name="important_notification_incoming_call_with_photo_message_location">Важливий дзвінок із фото, повідомленням і адресою</string>
+  <string name="important_notification_incoming_call_attachments">Важливий вхідний дзвінок із вкладеними файлами</string>
+  <string name="notification_incoming_work_call">Вхідний дзвінок на робочий телефон</string>
+  <string name="notification_incoming_spam_call">Цей дзвінок може бути спамом</string>
+  <string name="notification_requesting_video_call">Запит на вхідний відеодзвінок</string>
+  <string name="notification_action_answer">Відповісти</string>
+  <string name="notification_action_end_call">Завершити виклик</string>
+  <string name="notification_action_answer_video">Відео</string>
+  <string name="notification_action_accept">Приймаю</string>
+  <string name="notification_action_dismiss">Відхилити</string>
+  <string name="notification_action_speaker_on">Увімкнути динамік</string>
+  <string name="notification_action_speaker_off">Вимкнути динамік</string>
+  <string name="notification_external_call">Поточний виклик на іншому пристрої</string>
+  <string name="notification_external_video_call">Поточний відеодзвінок на іншому пристрої</string>
+  <string name="notification_take_call">Прийняти дзвінок</string>
+  <string name="notification_take_video_call">Прийняти відеодзвінок</string>
+  <string name="incall_error_supp_service_unknown">Служба не підтримується.</string>
+  <string name="goPrivate">конфіденц.</string>
+  <string name="manageConferenceLabel">Керувати конференц-зв’язком</string>
+  <string name="child_number">на номер %s</string>
+  <string name="callFailed_simError">Помилка SIM-карти або SIM-карта відсутня</string>
+  <string name="conference_caller_disconnect_content_description">Завершити виклик</string>
+  <string name="conference_call_name">Конференц-зв’язок</string>
+  <string name="generic_conference_call_name">Триває виклик</string>
+  <string name="video_call_wifi_to_lte_handover_toast">Продовження виклику з використанням мобільного Інтернету…</string>
+  <string name="video_call_lte_to_wifi_failed_title">Не вдалося перейти на мережу Wi-Fi</string>
+  <string name="video_call_lte_to_wifi_failed_message">Відеодзвінок продовжиться з використанням мобільного Інтернету. Діють стандартні тарифи.</string>
+  <string name="video_call_lte_to_wifi_failed_do_not_show">Більше не показувати це</string>
+  <string name="bubble_return_to_call">Назад до дзвінка</string>
+  <string name="rtt_request_dialog_title">Приєднатися до виклику RTT?</string>
+  <string name="rtt_request_dialog_details">%1$s хоче використовувати повідомлення під час вашого голосового виклику.</string>
+  <string name="rtt_request_dialog_more_information">RTT допомагає користувачам із вадами слуху, мовлення та іншим користувачам, для яких голосового спілкування недостатньо.</string>
+  <string name="rtt_button_decline_request">Ні, дякую</string>
+  <string name="rtt_button_accept_request">Приєднатися до RTT</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-ur/strings.xml b/java/com/android/incallui/res/values-ur/strings.xml
index ead03eb..e1ac42e 100644
--- a/java/com/android/incallui/res/values-ur/strings.xml
+++ b/java/com/android/incallui/res/values-ur/strings.xml
@@ -1,79 +1,68 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"فون"</string>
-    <string name="wait_prompt_str" msgid="3509685348904329594">"درج ذیل ٹونز بھیجیں؟\n"</string>
-    <string name="pause_prompt_yes" msgid="4642047011233552973">"ہاں"</string>
-    <string name="pause_prompt_no" msgid="4691320111774935838">"نہیں"</string>
-    <string name="notification_dialing" msgid="9072177265772083826">"ڈائل ہو رہا ہے"</string>
-    <string name="notification_ongoing_call" msgid="8712641937577776125">"جاری کال"</string>
-    <string name="notification_ongoing_video_call" msgid="6331318021321487769">"جاری ویڈیو کال"</string>
-    <string name="notification_ongoing_paused_video_call" msgid="709950253594606371">"جاری ویڈیو کال - ویڈیو موقوف ہو گئی"</string>
-    <string name="notification_ongoing_work_call" msgid="3189581218078981547">"کام سے متعلق جاری کال"</string>
-    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"جاری <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
-    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"آنے والی <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
-    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"‏Wi-Fi کال"</string>
-    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"‏کام سے متعلق Wi-Fi کال"</string>
-    <string name="notification_on_hold" msgid="7141827443379205682">"ہولڈ پر"</string>
-    <string name="notification_incoming_call" msgid="7520580807513849283">"آنے والی کال"</string>
-    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"تصویر کے ساتھ آنے والی کال"</string>
-    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"پیغام کے ساتھ آنے والی کال"</string>
-    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"مقام کے ساتھ آنے والی کال"</string>
-    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"تصویر اور پیغام کے ساتھ آنے والی کال"</string>
-    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"تصویر اور مقام کے ساتھ آنے والی کال"</string>
-    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"پیغام اور مقام کے ساتھ آنے والی کال"</string>
-    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"تصویر، پیغام اور مقام کے ساتھ آنے والی کال"</string>
-    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"منسلکات کے ساتھ آنے والی کال"</string>
-    <string name="important_notification_incoming_call" msgid="2867013954509930989">"اہم آنے والی کال"</string>
-    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"تصویر کے ساتھ آنے والی اہم کال"</string>
-    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"پیغام کے ساتھ آنے والی اہم کال"</string>
-    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"مقام کے ساتھ آنے والی اہم کال"</string>
-    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"تصویر اور پیغام کے ساتھ آنے والی اہم کال"</string>
-    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"تصویر اور مقام کے ساتھ آنے والی اہم کال"</string>
-    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"پیغام اور مقام کے ساتھ آنے والی اہم کال"</string>
-    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"تصویر، پیغام اور مقام کے ساتھ آنے والی اہم کال"</string>
-    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"منسلکات کے ساتھ آنے والی اہم کال"</string>
-    <string name="notification_incoming_work_call" msgid="5291275092734261918">"کام سے متعلق آنے والی کال"</string>
-    <string name="notification_incoming_spam_call" msgid="7591506944666791937">"آنے والی مشتبہ سپام کال"</string>
-    <string name="notification_requesting_video_call" msgid="1807679328811515758">"اِن کمنگ ویڈیو درخواست"</string>
-    <string name="notification_action_answer" msgid="8748275902211192568">"جواب دیں"</string>
-    <string name="notification_action_end_call" msgid="7467258454170007765">"کال منقطع کریں"</string>
-    <string name="notification_action_answer_video" msgid="8488108892919917287">"ویڈیو"</string>
-    <string name="notification_action_accept" msgid="1272761514200507143">"قبول کریں"</string>
-    <string name="notification_action_dismiss" msgid="3128241581632616226">"مسترد کریں"</string>
-    <string name="notification_action_speaker_on" msgid="1882659234405596540">"اسپیکر آن کریں"</string>
-    <string name="notification_action_speaker_off" msgid="6340085043115533948">"اسپیکر آف کریں"</string>
-    <string name="notification_external_call" msgid="2504334597315343920">"ایک اور آلے پر جاری کال"</string>
-    <string name="notification_external_video_call" msgid="7709394856028436683">"ایک اور آلے پر جاری ویڈیو کال"</string>
-    <string name="notification_take_call" msgid="5631659438864492229">"کال لیں"</string>
-    <string name="notification_take_video_call" msgid="4473387503712341390">"ویڈیو کال لیں"</string>
-    <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"سروس تعاون یافتہ نہیں ہے۔"</string>
-    <string name="goPrivate" msgid="5269514638004595378">"نجی ہوجائیں"</string>
-    <string name="manageConferenceLabel" msgid="3589379023518128318">"کانفرنس کال کا نظم کریں"</string>
-    <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"ہنگامی نمبر"</string>
-    <string name="child_number" msgid="3398257437107259682">"بذریعہ <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
-    <string name="callFailed_simError" msgid="4587775795711340072">"‏SIM نہیں ہے یا SIM میں خرابی ہے"</string>
-    <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"کال ختم کریں"</string>
-    <string name="conference_call_name" msgid="8189987124611337174">"کانفرنس کال"</string>
-    <string name="generic_conference_call_name" msgid="1546941472424243894">"کال میں"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"موبائل ڈیٹا استعمال کرکے کال جاری ہے"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"‏Wi-Fi نیٹ ورک پر سوئچ نہیں ہو سکا"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"ویڈیو کال موبائل نیٹ ورک پر رہے گی۔ ڈیٹا کے معیاری چارجز کا اطلاق ہو سکتا ہے۔"</string>
-    <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"اسے دوبارہ مت دکھائیں"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="wait_prompt_str">‏درج ذیل ٹونز بھیجیں؟\n</string>
+  <string name="pause_prompt_yes">ہاں</string>
+  <string name="pause_prompt_no">نہیں</string>
+  <string name="notification_dialing">ڈائل ہو رہا ہے</string>
+  <string name="notification_ongoing_call">جاری کال</string>
+  <string name="notification_ongoing_video_call">جاری ویڈیو کال</string>
+  <string name="notification_ongoing_paused_video_call">جاری ویڈیو کال - ویڈیو موقوف ہو گئی</string>
+  <string name="notification_ongoing_work_call">کام سے متعلق جاری کال</string>
+  <string name="notification_ongoing_call_wifi_template">جاری %1$s</string>
+  <string name="notification_incoming_call_wifi_template">آنے والی %1$s</string>
+  <string name="notification_call_wifi_brand">‏Wi-Fi کال</string>
+  <string name="notification_call_wifi_work_brand">‏کام سے متعلق Wi-Fi کال</string>
+  <string name="notification_on_hold">ہولڈ پر</string>
+  <string name="notification_incoming_call">آنے والی کال</string>
+  <string name="notification_incoming_video_call">اِن کمنگ ویڈیو کال</string>
+  <string name="notification_incoming_call_mutli_sim">%1$s کی معرفت کال آ رہی ہے</string>
+  <string name="notification_incoming_call_with_photo">تصویر کے ساتھ آنے والی کال</string>
+  <string name="notification_incoming_call_with_message">پیغام کے ساتھ آنے والی کال</string>
+  <string name="notification_incoming_call_with_location">مقام کے ساتھ آنے والی کال</string>
+  <string name="notification_incoming_call_with_photo_message">تصویر اور پیغام کے ساتھ آنے والی کال</string>
+  <string name="notification_incoming_call_with_photo_location">تصویر اور مقام کے ساتھ آنے والی کال</string>
+  <string name="notification_incoming_call_with_message_location">پیغام اور مقام کے ساتھ آنے والی کال</string>
+  <string name="notification_incoming_call_with_photo_message_location">تصویر، پیغام اور مقام کے ساتھ آنے والی کال</string>
+  <string name="notification_incoming_call_attachments">منسلکات کے ساتھ آنے والی کال</string>
+  <string name="important_notification_incoming_call">اہم آنے والی کال</string>
+  <string name="important_notification_incoming_call_with_photo">تصویر کے ساتھ آنے والی اہم کال</string>
+  <string name="important_notification_incoming_call_with_message">پیغام کے ساتھ آنے والی اہم کال</string>
+  <string name="important_notification_incoming_call_with_location">مقام کے ساتھ آنے والی اہم کال</string>
+  <string name="important_notification_incoming_call_with_photo_message">تصویر اور پیغام کے ساتھ آنے والی اہم کال</string>
+  <string name="important_notification_incoming_call_with_photo_location">تصویر اور مقام کے ساتھ آنے والی اہم کال</string>
+  <string name="important_notification_incoming_call_with_message_location">پیغام اور مقام کے ساتھ آنے والی اہم کال</string>
+  <string name="important_notification_incoming_call_with_photo_message_location">تصویر، پیغام اور مقام کے ساتھ آنے والی اہم کال</string>
+  <string name="important_notification_incoming_call_attachments">منسلکات کے ساتھ آنے والی اہم کال</string>
+  <string name="notification_incoming_work_call">کام سے متعلق آنے والی کال</string>
+  <string name="notification_incoming_spam_call">آنے والی مشتبہ سپام کال</string>
+  <string name="notification_requesting_video_call">اِن کمنگ ویڈیو درخواست</string>
+  <string name="notification_action_answer">جواب دیں</string>
+  <string name="notification_action_end_call">کال منقطع کریں</string>
+  <string name="notification_action_answer_video">ویڈیو</string>
+  <string name="notification_action_accept">قبول کریں</string>
+  <string name="notification_action_dismiss">مسترد کریں</string>
+  <string name="notification_action_speaker_on">اسپیکر آن کریں</string>
+  <string name="notification_action_speaker_off">اسپیکر آف کریں</string>
+  <string name="notification_external_call">ایک اور آلے پر جاری کال</string>
+  <string name="notification_external_video_call">ایک اور آلے پر جاری ویڈیو کال</string>
+  <string name="notification_take_call">کال لیں</string>
+  <string name="notification_take_video_call">ویڈیو کال لیں</string>
+  <string name="incall_error_supp_service_unknown">سروس تعاون یافتہ نہیں ہے۔</string>
+  <string name="goPrivate">نجی ہوجائیں</string>
+  <string name="manageConferenceLabel">کانفرنس کال کا نظم کریں</string>
+  <string name="child_number">بذریعہ %s</string>
+  <string name="callFailed_simError">‏SIM نہیں ہے یا SIM میں خرابی ہے</string>
+  <string name="conference_caller_disconnect_content_description">کال ختم کریں</string>
+  <string name="conference_call_name">کانفرنس کال</string>
+  <string name="generic_conference_call_name">کال میں</string>
+  <string name="video_call_wifi_to_lte_handover_toast">موبائل ڈیٹا استعمال کرکے کال جاری ہے</string>
+  <string name="video_call_lte_to_wifi_failed_title">‏Wi-Fi نیٹ ورک پر سوئچ نہیں ہو سکا</string>
+  <string name="video_call_lte_to_wifi_failed_message">ویڈیو کال موبائل نیٹ ورک پر رہے گی۔ ڈیٹا کے معیاری چارجز کا اطلاق ہو سکتا ہے۔</string>
+  <string name="video_call_lte_to_wifi_failed_do_not_show">اسے دوبارہ مت دکھائیں</string>
+  <string name="bubble_return_to_call">کال بٹن پر واپس جائیں</string>
+  <string name="rtt_request_dialog_title">‏RTT کال میں شامل ہوں؟</string>
+  <string name="rtt_request_dialog_details">%1$s آپ کی صوتی کال کے اندر پیغام رسانی استعمال کرنا چاہتا ہے۔</string>
+  <string name="rtt_request_dialog_more_information">‏RTT ایسے کالرز کی معاونت کرتا ہے جو بہرے ہیں، اونچا سنتے ہیں، بولنے سے معزور ہیں یا ان کیلئے صرف آواز ہی کافی نہیں ہے۔</string>
+  <string name="rtt_button_decline_request">نہیں شکریہ</string>
+  <string name="rtt_button_accept_request">‏RTT میں شامل ہوں</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-uz/strings.xml b/java/com/android/incallui/res/values-uz/strings.xml
index df332ce..5bfd6e0 100644
--- a/java/com/android/incallui/res/values-uz/strings.xml
+++ b/java/com/android/incallui/res/values-uz/strings.xml
@@ -1,79 +1,68 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"Telefon"</string>
-    <string name="wait_prompt_str" msgid="3509685348904329594">"Ushbu tovushlar jo‘natilsinmi?\n"</string>
-    <string name="pause_prompt_yes" msgid="4642047011233552973">"Ha"</string>
-    <string name="pause_prompt_no" msgid="4691320111774935838">"Yo‘q"</string>
-    <string name="notification_dialing" msgid="9072177265772083826">"Raqam terilmoqda"</string>
-    <string name="notification_ongoing_call" msgid="8712641937577776125">"Joriy chaqiruv"</string>
-    <string name="notification_ongoing_video_call" msgid="6331318021321487769">"Davom etayotgan video qo‘ng‘iroq"</string>
-    <string name="notification_ongoing_paused_video_call" msgid="709950253594606371">"Davom etayotgan video qo‘ng‘iroq – video pauza qilindi"</string>
-    <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Chiquvchi ishchi qo‘ng‘irog‘i"</string>
-    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"Joriy <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
-    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"Kiruvchi <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
-    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"Wi-Fi qo‘ng‘iroq"</string>
-    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"Wi-Fi qo‘ng‘iroq (ish)"</string>
-    <string name="notification_on_hold" msgid="7141827443379205682">"Kutmoqda"</string>
-    <string name="notification_incoming_call" msgid="7520580807513849283">"Kiruvchi chaqiruv"</string>
-    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Suratga ega kiruvchi chaqiruv"</string>
-    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"Xabarga ega kiruvchi chaqiruv"</string>
-    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"Joylashuv axborotiga ega kiruvchi chaqiruv"</string>
-    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"Surat va xabarga ega kiruvchi chaqiruv"</string>
-    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"Surat va joylash. axborotiga ega kiruvchi chaqiruv"</string>
-    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"Xabar va joylash. axborotiga ega kiruvchi chaqiruv"</string>
-    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"Surat, xabar va joyl. axbor. ega kiruvchi chaqiruv"</string>
-    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"Biriktirmalarga ega kiruvchi chaqiruv"</string>
-    <string name="important_notification_incoming_call" msgid="2867013954509930989">"Muhim kiruvchi chaqiruv"</string>
-    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"Suratga ega muhim kiruvchi chaqiruv"</string>
-    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"Xabarga ega muhim kiruvchi chaqiruv"</string>
-    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"Joylashuv axborotiga ega muhim kiruvchi chaqiruv"</string>
-    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"Surat va xabarga ega muhim kiruvchi chaqiruv"</string>
-    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"Surat va joy. axborot. ega muhim kiruvchi chaqiruv"</string>
-    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"Xabar va joy. axborot. ega muhim kiruvchi chaqiruv"</string>
-    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Surat, xabar va joy. ax. ega muhim kiruv. chaqiruv"</string>
-    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Biriktirmalarga ega muhim kiruvchi chaqiruv"</string>
-    <string name="notification_incoming_work_call" msgid="5291275092734261918">"Kiruvchi ishchi qo‘ng‘irog‘i"</string>
-    <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Kiruvchi chaqiruv: shubhali spam"</string>
-    <string name="notification_requesting_video_call" msgid="1807679328811515758">"Kiruvchi video so\'rovi"</string>
-    <string name="notification_action_answer" msgid="8748275902211192568">"Javob"</string>
-    <string name="notification_action_end_call" msgid="7467258454170007765">"Suhbatni tugatish"</string>
-    <string name="notification_action_answer_video" msgid="8488108892919917287">"Video"</string>
-    <string name="notification_action_accept" msgid="1272761514200507143">"Roziman"</string>
-    <string name="notification_action_dismiss" msgid="3128241581632616226">"Rad etish"</string>
-    <string name="notification_action_speaker_on" msgid="1882659234405596540">"Karnayni yoqish"</string>
-    <string name="notification_action_speaker_off" msgid="6340085043115533948">"Karnayni o‘chirib qo‘yish"</string>
-    <string name="notification_external_call" msgid="2504334597315343920">"Boshqa qurilmada hozir qo‘ng‘iroq amalga oshirilmoqda."</string>
-    <string name="notification_external_video_call" msgid="7709394856028436683">"Boshqa qurilmada hozir video qo‘ng‘iroq amalga oshirilmoqda."</string>
-    <string name="notification_take_call" msgid="5631659438864492229">"Qo‘ng‘iroqni qabul qilish"</string>
-    <string name="notification_take_video_call" msgid="4473387503712341390">"Video qo‘ng‘iroq. qabul qilish"</string>
-    <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"Xizmat qo‘llab-quvvatlanmaydi."</string>
-    <string name="goPrivate" msgid="5269514638004595378">"alohidaga o‘tish"</string>
-    <string name="manageConferenceLabel" msgid="3589379023518128318">"Konferens-aloqani sozlash"</string>
-    <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"Favqulodda qo‘ng‘iroq raqamlari"</string>
-    <string name="child_number" msgid="3398257437107259682">"<xliff:g id="CHILD_NUMBER">%s</xliff:g> orqali"</string>
-    <string name="callFailed_simError" msgid="4587775795711340072">"SIM karta yo‘q yoki SIM kartada xato"</string>
-    <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Qo‘ng‘iroqni tugatish"</string>
-    <string name="conference_call_name" msgid="8189987124611337174">"Konferens-aloqa"</string>
-    <string name="generic_conference_call_name" msgid="1546941472424243894">"Qo‘ng‘iroq davom etmoqda"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Qo‘ng‘iroq mobil internetga o‘tkazilmoqda…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Wi-Fi tarmog‘iga o‘tib bo‘lmadi"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Video qo‘ng‘iroq mobil internet orqali davom ettiriladi. Internet uchun operator tarifi bo‘yicha haq olinishi mumkin."</string>
-    <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Bu xabar boshqa ko‘rsatilmasin"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="wait_prompt_str">Ushbu tovushlar jo‘natilsinmi?\n</string>
+  <string name="pause_prompt_yes">Ha</string>
+  <string name="pause_prompt_no">Yo‘q</string>
+  <string name="notification_dialing">Raqam terilmoqda</string>
+  <string name="notification_ongoing_call">Joriy chaqiruv</string>
+  <string name="notification_ongoing_video_call">Davom etayotgan video qo‘ng‘iroq</string>
+  <string name="notification_ongoing_paused_video_call">Davom etayotgan video qo‘ng‘iroq – video pauza qilindi</string>
+  <string name="notification_ongoing_work_call">Chiquvchi ishchi qo‘ng‘irog‘i</string>
+  <string name="notification_ongoing_call_wifi_template">Joriy %1$s</string>
+  <string name="notification_incoming_call_wifi_template">Kiruvchi %1$s</string>
+  <string name="notification_call_wifi_brand">Wi-Fi qo‘ng‘iroq</string>
+  <string name="notification_call_wifi_work_brand">Wi-Fi qo‘ng‘iroq (ish)</string>
+  <string name="notification_on_hold">Kutmoqda</string>
+  <string name="notification_incoming_call">Kiruvchi chaqiruv</string>
+  <string name="notification_incoming_video_call">Kiruvchi videoqo‘ng‘iroq</string>
+  <string name="notification_incoming_call_mutli_sim">%1$s SIM kartasiga kiruvchi chaqiruv</string>
+  <string name="notification_incoming_call_with_photo">Suratga ega kiruvchi chaqiruv</string>
+  <string name="notification_incoming_call_with_message">Xabarga ega kiruvchi chaqiruv</string>
+  <string name="notification_incoming_call_with_location">Joylashuv axborotiga ega kiruvchi chaqiruv</string>
+  <string name="notification_incoming_call_with_photo_message">Surat va xabarga ega kiruvchi chaqiruv</string>
+  <string name="notification_incoming_call_with_photo_location">Surat va joylash. axborotiga ega kiruvchi chaqiruv</string>
+  <string name="notification_incoming_call_with_message_location">Xabar va joylash. axborotiga ega kiruvchi chaqiruv</string>
+  <string name="notification_incoming_call_with_photo_message_location">Surat, xabar va joyl. axbor. ega kiruvchi chaqiruv</string>
+  <string name="notification_incoming_call_attachments">Biriktirmalarga ega kiruvchi chaqiruv</string>
+  <string name="important_notification_incoming_call">Muhim kiruvchi chaqiruv</string>
+  <string name="important_notification_incoming_call_with_photo">Suratga ega muhim kiruvchi chaqiruv</string>
+  <string name="important_notification_incoming_call_with_message">Xabarga ega muhim kiruvchi chaqiruv</string>
+  <string name="important_notification_incoming_call_with_location">Joylashuv axborotiga ega muhim kiruvchi chaqiruv</string>
+  <string name="important_notification_incoming_call_with_photo_message">Surat va xabarga ega muhim kiruvchi chaqiruv</string>
+  <string name="important_notification_incoming_call_with_photo_location">Surat va joy. axborot. ega muhim kiruvchi chaqiruv</string>
+  <string name="important_notification_incoming_call_with_message_location">Xabar va joy. axborot. ega muhim kiruvchi chaqiruv</string>
+  <string name="important_notification_incoming_call_with_photo_message_location">Surat, xabar va joy. ax. ega muhim kiruv. chaqiruv</string>
+  <string name="important_notification_incoming_call_attachments">Biriktirmalarga ega muhim kiruvchi chaqiruv</string>
+  <string name="notification_incoming_work_call">Kiruvchi ishchi qo‘ng‘irog‘i</string>
+  <string name="notification_incoming_spam_call">Kiruvchi chaqiruv: shubhali spam</string>
+  <string name="notification_requesting_video_call">Kiruvchi video so\'rovi</string>
+  <string name="notification_action_answer">Javob</string>
+  <string name="notification_action_end_call">Suhbatni tugatish</string>
+  <string name="notification_action_answer_video">Video</string>
+  <string name="notification_action_accept">Roziman</string>
+  <string name="notification_action_dismiss">Rad etish</string>
+  <string name="notification_action_speaker_on">Karnayni yoqish</string>
+  <string name="notification_action_speaker_off">Karnayni o‘chirib qo‘yish</string>
+  <string name="notification_external_call">Boshqa qurilmada hozir qo‘ng‘iroq amalga oshirilmoqda.</string>
+  <string name="notification_external_video_call">Boshqa qurilmada hozir video qo‘ng‘iroq amalga oshirilmoqda.</string>
+  <string name="notification_take_call">Qo‘ng‘iroqni qabul qilish</string>
+  <string name="notification_take_video_call">Video qo‘ng‘iroq. qabul qilish</string>
+  <string name="incall_error_supp_service_unknown">Xizmat qo‘llab-quvvatlanmaydi.</string>
+  <string name="goPrivate">alohidaga o‘tish</string>
+  <string name="manageConferenceLabel">Konferens-aloqani sozlash</string>
+  <string name="child_number">%s orqali</string>
+  <string name="callFailed_simError">SIM karta yo‘q yoki SIM kartada xato</string>
+  <string name="conference_caller_disconnect_content_description">Qo‘ng‘iroqni tugatish</string>
+  <string name="conference_call_name">Konferens-aloqa</string>
+  <string name="generic_conference_call_name">Qo‘ng‘iroq davom etmoqda</string>
+  <string name="video_call_wifi_to_lte_handover_toast">Qo‘ng‘iroq mobil internetga o‘tkazilmoqda…</string>
+  <string name="video_call_lte_to_wifi_failed_title">Wi-Fi tarmog‘iga o‘tib bo‘lmadi</string>
+  <string name="video_call_lte_to_wifi_failed_message">Video qo‘ng‘iroq mobil internet orqali davom ettiriladi. Internet uchun operator tarifi bo‘yicha haq olinishi mumkin.</string>
+  <string name="video_call_lte_to_wifi_failed_do_not_show">Bu xabar boshqa ko‘rsatilmasin</string>
+  <string name="bubble_return_to_call">Chaqiruvga qaytish</string>
+  <string name="rtt_request_dialog_title">RTT chaqiruviga qo‘shilasizmi?</string>
+  <string name="rtt_request_dialog_details">%1$s ovozli chaqiruvingiz doirasida xabar almashinuvdan foydalanmoqchi.</string>
+  <string name="rtt_request_dialog_more_information">RTT kar, eshitish qobiliyati va nutqiy faoliyati buzilgan shaxslarga mo‘ljallangan funksiyadir.</string>
+  <string name="rtt_button_decline_request">Kerak emas</string>
+  <string name="rtt_button_accept_request">Qo‘shilish</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-vi/strings.xml b/java/com/android/incallui/res/values-vi/strings.xml
index 4b55591..5b45426 100644
--- a/java/com/android/incallui/res/values-vi/strings.xml
+++ b/java/com/android/incallui/res/values-vi/strings.xml
@@ -1,79 +1,68 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"Điện thoại"</string>
-    <string name="wait_prompt_str" msgid="3509685348904329594">"Gửi các âm sau?\n"</string>
-    <string name="pause_prompt_yes" msgid="4642047011233552973">"Có"</string>
-    <string name="pause_prompt_no" msgid="4691320111774935838">"Không"</string>
-    <string name="notification_dialing" msgid="9072177265772083826">"Đang gọi"</string>
-    <string name="notification_ongoing_call" msgid="8712641937577776125">"Cuộc gọi đang thực hiện"</string>
-    <string name="notification_ongoing_video_call" msgid="6331318021321487769">"Cuộc gọi video đang diễn ra"</string>
-    <string name="notification_ongoing_paused_video_call" msgid="709950253594606371">"Cuộc gọi video đang diễn ra - đã tạm dừng video"</string>
-    <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Cuộc gọi đang diễn ra về công việc"</string>
-    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"Cuộc gọi đang diễn ra qua <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
-    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"Cuộc gọi đến qua <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
-    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"Cuộc gọi qua Wi-Fi"</string>
-    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"Cuộc gọi về công việc qua Wi‑Fi"</string>
-    <string name="notification_on_hold" msgid="7141827443379205682">"Đang chờ"</string>
-    <string name="notification_incoming_call" msgid="7520580807513849283">"Cuộc gọi đến"</string>
-    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Cuộc gọi đến có ảnh"</string>
-    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"Cuộc gọi đến có tin nhắn"</string>
-    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"Cuộc gọi đến có vị trí"</string>
-    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"Cuộc gọi đến có ảnh và tin nhắn"</string>
-    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"Cuộc gọi đến có ảnh và vị trí"</string>
-    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"Cuộc gọi đến có tin nhắn và vị trí"</string>
-    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"Cuộc gọi đến có ảnh, tin nhắn và vị trí"</string>
-    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"Cuộc gọi đến có tệp đính kèm"</string>
-    <string name="important_notification_incoming_call" msgid="2867013954509930989">"Cuộc gọi đến quan trọng"</string>
-    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"Cuộc gọi đến quan trọng có ảnh"</string>
-    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"Cuộc gọi đến quan trọng có tin nhắn"</string>
-    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"Cuộc gọi đến quan trọng có vị trí"</string>
-    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"Cuộc gọi đến quan trọng có ảnh và tin nhắn"</string>
-    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"Cuộc gọi đến quan trọng có ảnh và vị trí"</string>
-    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"Cuộc gọi đến quan trọng có tin nhắn và vị trí"</string>
-    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Cuộc gọi đến quan trọng có ảnh, tin nhắn và vị trí"</string>
-    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Cuộc gọi đến quan trọng có tệp đính kèm"</string>
-    <string name="notification_incoming_work_call" msgid="5291275092734261918">"Cuộc gọi đến về công việc"</string>
-    <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Cuộc gọi spam đến bị nghi ngờ"</string>
-    <string name="notification_requesting_video_call" msgid="1807679328811515758">"Yêu cầu video đến"</string>
-    <string name="notification_action_answer" msgid="8748275902211192568">"Trả lời"</string>
-    <string name="notification_action_end_call" msgid="7467258454170007765">"Kết thúc"</string>
-    <string name="notification_action_answer_video" msgid="8488108892919917287">"Video"</string>
-    <string name="notification_action_accept" msgid="1272761514200507143">"Chấp nhận"</string>
-    <string name="notification_action_dismiss" msgid="3128241581632616226">"Từ chối"</string>
-    <string name="notification_action_speaker_on" msgid="1882659234405596540">"Bật loa"</string>
-    <string name="notification_action_speaker_off" msgid="6340085043115533948">"Tắt loa"</string>
-    <string name="notification_external_call" msgid="2504334597315343920">"Cuộc gọi đang diễn ra trên một thiết bị khác"</string>
-    <string name="notification_external_video_call" msgid="7709394856028436683">"Cuộc gọi điện video đang diễn ra trên một thiết bị khác"</string>
-    <string name="notification_take_call" msgid="5631659438864492229">"Nhận cuộc gọi"</string>
-    <string name="notification_take_video_call" msgid="4473387503712341390">"Nhận cuộc gọi điện video"</string>
-    <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"Dịch vụ không được hỗ trợ."</string>
-    <string name="goPrivate" msgid="5269514638004595378">"chuyển thành riêng tư"</string>
-    <string name="manageConferenceLabel" msgid="3589379023518128318">"Quản lý cuộc gọi nhiều bên"</string>
-    <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"Số khẩn cấp"</string>
-    <string name="child_number" msgid="3398257437107259682">"qua <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
-    <string name="callFailed_simError" msgid="4587775795711340072">"Không có SIM hoặc lỗi SIM"</string>
-    <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Kết thúc cuộc gọi"</string>
-    <string name="conference_call_name" msgid="8189987124611337174">"Cuộc gọi nhiều bên"</string>
-    <string name="generic_conference_call_name" msgid="1546941472424243894">"Đang trong cuộc gọi"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Đang tiếp tục cuộc gọi bằng cách sử dụng dữ liệu di động…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Không thể chuyển sang mạng Wi-Fi"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Cuộc gọi điện video sẽ tiếp tục trên mạng di động. Bạn có thể phải trả phí dữ liệu chuẩn."</string>
-    <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Không hiển thị lại"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="wait_prompt_str">Gửi các âm sau?\n</string>
+  <string name="pause_prompt_yes">Có</string>
+  <string name="pause_prompt_no">Không</string>
+  <string name="notification_dialing">Đang gọi</string>
+  <string name="notification_ongoing_call">Cuộc gọi đang thực hiện</string>
+  <string name="notification_ongoing_video_call">Cuộc gọi video đang diễn ra</string>
+  <string name="notification_ongoing_paused_video_call">Cuộc gọi video đang diễn ra - đã tạm dừng video</string>
+  <string name="notification_ongoing_work_call">Cuộc gọi đang diễn ra về công việc</string>
+  <string name="notification_ongoing_call_wifi_template">Cuộc gọi đang diễn ra qua %1$s</string>
+  <string name="notification_incoming_call_wifi_template">Cuộc gọi đến qua %1$s</string>
+  <string name="notification_call_wifi_brand">Cuộc gọi qua Wi-Fi</string>
+  <string name="notification_call_wifi_work_brand">Cuộc gọi về công việc qua Wi‑Fi</string>
+  <string name="notification_on_hold">Đang chờ</string>
+  <string name="notification_incoming_call">Cuộc gọi đến</string>
+  <string name="notification_incoming_video_call">Cuộc gọi điện video đến</string>
+  <string name="notification_incoming_call_mutli_sim">Cuộc gọi đến qua %1$s</string>
+  <string name="notification_incoming_call_with_photo">Cuộc gọi đến có ảnh</string>
+  <string name="notification_incoming_call_with_message">Cuộc gọi đến có tin nhắn</string>
+  <string name="notification_incoming_call_with_location">Cuộc gọi đến có vị trí</string>
+  <string name="notification_incoming_call_with_photo_message">Cuộc gọi đến có ảnh và tin nhắn</string>
+  <string name="notification_incoming_call_with_photo_location">Cuộc gọi đến có ảnh và vị trí</string>
+  <string name="notification_incoming_call_with_message_location">Cuộc gọi đến có tin nhắn và vị trí</string>
+  <string name="notification_incoming_call_with_photo_message_location">Cuộc gọi đến có ảnh, tin nhắn và vị trí</string>
+  <string name="notification_incoming_call_attachments">Cuộc gọi đến có tệp đính kèm</string>
+  <string name="important_notification_incoming_call">Cuộc gọi đến quan trọng</string>
+  <string name="important_notification_incoming_call_with_photo">Cuộc gọi đến quan trọng có ảnh</string>
+  <string name="important_notification_incoming_call_with_message">Cuộc gọi đến quan trọng có tin nhắn</string>
+  <string name="important_notification_incoming_call_with_location">Cuộc gọi đến quan trọng có vị trí</string>
+  <string name="important_notification_incoming_call_with_photo_message">Cuộc gọi đến quan trọng có ảnh và tin nhắn</string>
+  <string name="important_notification_incoming_call_with_photo_location">Cuộc gọi đến quan trọng có ảnh và vị trí</string>
+  <string name="important_notification_incoming_call_with_message_location">Cuộc gọi đến quan trọng có tin nhắn và vị trí</string>
+  <string name="important_notification_incoming_call_with_photo_message_location">Cuộc gọi đến quan trọng có ảnh, tin nhắn và vị trí</string>
+  <string name="important_notification_incoming_call_attachments">Cuộc gọi đến quan trọng có tệp đính kèm</string>
+  <string name="notification_incoming_work_call">Cuộc gọi đến về công việc</string>
+  <string name="notification_incoming_spam_call">Cuộc gọi spam đến bị nghi ngờ</string>
+  <string name="notification_requesting_video_call">Yêu cầu video đến</string>
+  <string name="notification_action_answer">Trả lời</string>
+  <string name="notification_action_end_call">Kết thúc</string>
+  <string name="notification_action_answer_video">Video</string>
+  <string name="notification_action_accept">Chấp nhận</string>
+  <string name="notification_action_dismiss">Từ chối</string>
+  <string name="notification_action_speaker_on">Bật loa</string>
+  <string name="notification_action_speaker_off">Tắt loa</string>
+  <string name="notification_external_call">Cuộc gọi đang diễn ra trên một thiết bị khác</string>
+  <string name="notification_external_video_call">Cuộc gọi điện video đang diễn ra trên một thiết bị khác</string>
+  <string name="notification_take_call">Nhận cuộc gọi</string>
+  <string name="notification_take_video_call">Nhận cuộc gọi điện video</string>
+  <string name="incall_error_supp_service_unknown">Dịch vụ không được hỗ trợ.</string>
+  <string name="goPrivate">chuyển thành riêng tư</string>
+  <string name="manageConferenceLabel">Quản lý cuộc gọi nhiều bên</string>
+  <string name="child_number">qua %s</string>
+  <string name="callFailed_simError">Không có SIM hoặc lỗi SIM</string>
+  <string name="conference_caller_disconnect_content_description">Kết thúc cuộc gọi</string>
+  <string name="conference_call_name">Cuộc gọi nhiều bên</string>
+  <string name="generic_conference_call_name">Đang trong cuộc gọi</string>
+  <string name="video_call_wifi_to_lte_handover_toast">Đang tiếp tục cuộc gọi bằng cách sử dụng dữ liệu di động…</string>
+  <string name="video_call_lte_to_wifi_failed_title">Không thể chuyển sang mạng Wi-Fi</string>
+  <string name="video_call_lte_to_wifi_failed_message">Cuộc gọi điện video sẽ tiếp tục trên mạng di động. Bạn có thể phải trả phí dữ liệu chuẩn.</string>
+  <string name="video_call_lte_to_wifi_failed_do_not_show">Không hiển thị lại</string>
+  <string name="bubble_return_to_call">Quay lại cuộc gọi</string>
+  <string name="rtt_request_dialog_title">Tham gia cuộc gọi bằng Tin nhắn theo thời gian thực (RTT)?</string>
+  <string name="rtt_request_dialog_details">%1$s muốn sử dụng tính năng nhắn tin trong cuộc gọi thoại của bạn.</string>
+  <string name="rtt_request_dialog_more_information">Tin nhắn theo thời gian thực (RTT) trợ giúp những người gọi khiếm thính, bị suy giảm thính lực, không có khả năng nói hoặc cần thêm hỗ trợ khác ngoài giọng nói.</string>
+  <string name="rtt_button_decline_request">Không, cảm ơn</string>
+  <string name="rtt_button_accept_request">Tham gia RTT</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-zh-rCN/strings.xml b/java/com/android/incallui/res/values-zh-rCN/strings.xml
index e69cfc7..7995f1e 100644
--- a/java/com/android/incallui/res/values-zh-rCN/strings.xml
+++ b/java/com/android/incallui/res/values-zh-rCN/strings.xml
@@ -1,79 +1,68 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"电话"</string>
-    <string name="wait_prompt_str" msgid="3509685348904329594">"发送以下音频？\n"</string>
-    <string name="pause_prompt_yes" msgid="4642047011233552973">"是"</string>
-    <string name="pause_prompt_no" msgid="4691320111774935838">"否"</string>
-    <string name="notification_dialing" msgid="9072177265772083826">"正在拨号"</string>
-    <string name="notification_ongoing_call" msgid="8712641937577776125">"当前通话"</string>
-    <string name="notification_ongoing_video_call" msgid="6331318021321487769">"正在进行的视频通话"</string>
-    <string name="notification_ongoing_paused_video_call" msgid="709950253594606371">"正在进行的视频通话 - 视频已暂停"</string>
-    <string name="notification_ongoing_work_call" msgid="3189581218078981547">"工作通话进行中"</string>
-    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"正在通话 - <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
-    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"正在接听来电 - <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
-    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"WLAN 通话"</string>
-    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"WLAN 工作通话"</string>
-    <string name="notification_on_hold" msgid="7141827443379205682">"保持"</string>
-    <string name="notification_incoming_call" msgid="7520580807513849283">"来电"</string>
-    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"包含照片的来电"</string>
-    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"包含讯息的来电"</string>
-    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"包含位置信息的来电"</string>
-    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"包含照片和讯息的来电"</string>
-    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"包含照片和位置信息的来电"</string>
-    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"包含讯息和位置信息的来电"</string>
-    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"包含照片、讯息和位置信息的来电"</string>
-    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"包含附件的来电"</string>
-    <string name="important_notification_incoming_call" msgid="2867013954509930989">"重要来电"</string>
-    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"包含照片的重要来电"</string>
-    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"包含讯息的重要来电"</string>
-    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"包含位置信息的重要来电"</string>
-    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"包含照片和讯息的重要来电"</string>
-    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"包含照片和位置信息的重要来电"</string>
-    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"包含讯息和位置信息的重要来电"</string>
-    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"包含照片、讯息和位置信息的重要来电"</string>
-    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"包含附件的重要来电"</string>
-    <string name="notification_incoming_work_call" msgid="5291275092734261918">"工作来电"</string>
-    <string name="notification_incoming_spam_call" msgid="7591506944666791937">"有疑似骚扰来电"</string>
-    <string name="notification_requesting_video_call" msgid="1807679328811515758">"收到视频通话邀请"</string>
-    <string name="notification_action_answer" msgid="8748275902211192568">"接听"</string>
-    <string name="notification_action_end_call" msgid="7467258454170007765">"挂断"</string>
-    <string name="notification_action_answer_video" msgid="8488108892919917287">"视频"</string>
-    <string name="notification_action_accept" msgid="1272761514200507143">"接受"</string>
-    <string name="notification_action_dismiss" msgid="3128241581632616226">"拒绝"</string>
-    <string name="notification_action_speaker_on" msgid="1882659234405596540">"打开扬声器"</string>
-    <string name="notification_action_speaker_off" msgid="6340085043115533948">"关闭扬声器"</string>
-    <string name="notification_external_call" msgid="2504334597315343920">"其他设备上有正在进行的通话"</string>
-    <string name="notification_external_video_call" msgid="7709394856028436683">"其他设备上有正在进行的视频通话"</string>
-    <string name="notification_take_call" msgid="5631659438864492229">"接通通话"</string>
-    <string name="notification_take_video_call" msgid="4473387503712341390">"接通视频通话"</string>
-    <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"服务不受支持。"</string>
-    <string name="goPrivate" msgid="5269514638004595378">"私聊"</string>
-    <string name="manageConferenceLabel" msgid="3589379023518128318">"管理电话会议"</string>
-    <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"紧急电话号码"</string>
-    <string name="child_number" msgid="3398257437107259682">"通过 <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
-    <string name="callFailed_simError" msgid="4587775795711340072">"无SIM卡或SIM卡出错"</string>
-    <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"结束通话"</string>
-    <string name="conference_call_name" msgid="8189987124611337174">"电话会议"</string>
-    <string name="generic_conference_call_name" msgid="1546941472424243894">"正在通话"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"正在使用移动数据继续通话…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"无法切换到 WLAN 网络"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"系统将使用移动网络继续视频通话。这可能会产生标准数据流量费。"</string>
-    <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"不再显示"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="wait_prompt_str">发送以下音频？\n</string>
+  <string name="pause_prompt_yes">是</string>
+  <string name="pause_prompt_no">否</string>
+  <string name="notification_dialing">正在拨号</string>
+  <string name="notification_ongoing_call">当前通话</string>
+  <string name="notification_ongoing_video_call">正在进行视频通话</string>
+  <string name="notification_ongoing_paused_video_call">正在进行视频通话 - 已暂停发送视频画面</string>
+  <string name="notification_ongoing_work_call">工作通话进行中</string>
+  <string name="notification_ongoing_call_wifi_template">正在通话 - %1$s</string>
+  <string name="notification_incoming_call_wifi_template">正在接听来电 - %1$s</string>
+  <string name="notification_call_wifi_brand">WLAN 通话</string>
+  <string name="notification_call_wifi_work_brand">WLAN 工作通话</string>
+  <string name="notification_on_hold">保持</string>
+  <string name="notification_incoming_call">来电</string>
+  <string name="notification_incoming_video_call">有视频通话来电</string>
+  <string name="notification_incoming_call_mutli_sim">通过 %1$s 接到的来电</string>
+  <string name="notification_incoming_call_with_photo">包含照片的来电</string>
+  <string name="notification_incoming_call_with_message">包含讯息的来电</string>
+  <string name="notification_incoming_call_with_location">包含位置信息的来电</string>
+  <string name="notification_incoming_call_with_photo_message">包含照片和讯息的来电</string>
+  <string name="notification_incoming_call_with_photo_location">包含照片和位置信息的来电</string>
+  <string name="notification_incoming_call_with_message_location">包含讯息和位置信息的来电</string>
+  <string name="notification_incoming_call_with_photo_message_location">包含照片、讯息和位置信息的来电</string>
+  <string name="notification_incoming_call_attachments">包含附件的来电</string>
+  <string name="important_notification_incoming_call">重要来电</string>
+  <string name="important_notification_incoming_call_with_photo">包含照片的重要来电</string>
+  <string name="important_notification_incoming_call_with_message">包含讯息的重要来电</string>
+  <string name="important_notification_incoming_call_with_location">包含位置信息的重要来电</string>
+  <string name="important_notification_incoming_call_with_photo_message">包含照片和讯息的重要来电</string>
+  <string name="important_notification_incoming_call_with_photo_location">包含照片和位置信息的重要来电</string>
+  <string name="important_notification_incoming_call_with_message_location">包含讯息和位置信息的重要来电</string>
+  <string name="important_notification_incoming_call_with_photo_message_location">包含照片、讯息和位置信息的重要来电</string>
+  <string name="important_notification_incoming_call_attachments">包含附件的重要来电</string>
+  <string name="notification_incoming_work_call">工作来电</string>
+  <string name="notification_incoming_spam_call">有疑似骚扰来电</string>
+  <string name="notification_requesting_video_call">收到视频通话邀请</string>
+  <string name="notification_action_answer">接听</string>
+  <string name="notification_action_end_call">挂断</string>
+  <string name="notification_action_answer_video">视频</string>
+  <string name="notification_action_accept">接受</string>
+  <string name="notification_action_dismiss">拒绝</string>
+  <string name="notification_action_speaker_on">打开扬声器</string>
+  <string name="notification_action_speaker_off">关闭扬声器</string>
+  <string name="notification_external_call">其他设备上有正在进行的通话</string>
+  <string name="notification_external_video_call">其他设备上有正在进行的视频通话</string>
+  <string name="notification_take_call">接通通话</string>
+  <string name="notification_take_video_call">接通视频通话</string>
+  <string name="incall_error_supp_service_unknown">服务不受支持。</string>
+  <string name="goPrivate">私聊</string>
+  <string name="manageConferenceLabel">管理电话会议</string>
+  <string name="child_number">通过 %s</string>
+  <string name="callFailed_simError">无SIM卡或SIM卡出错</string>
+  <string name="conference_caller_disconnect_content_description">结束通话</string>
+  <string name="conference_call_name">电话会议</string>
+  <string name="generic_conference_call_name">正在通话</string>
+  <string name="video_call_wifi_to_lte_handover_toast">正在使用移动数据继续通话…</string>
+  <string name="video_call_lte_to_wifi_failed_title">无法切换到 WLAN 网络</string>
+  <string name="video_call_lte_to_wifi_failed_message">系统将使用移动网络继续视频通话。这可能会产生标准数据流量费。</string>
+  <string name="video_call_lte_to_wifi_failed_do_not_show">不再显示</string>
+  <string name="bubble_return_to_call">返回通话</string>
+  <string name="rtt_request_dialog_title">要加入 RTT 通话吗？</string>
+  <string name="rtt_request_dialog_details">%1$s想要在语音通话期间收发信息。</string>
+  <string name="rtt_request_dialog_more_information">RTT 可为以下类型的来电者提供协助：失聪者、听力障碍人士、语言障碍人士或需要语音以外服务的人。</string>
+  <string name="rtt_button_decline_request">不用了</string>
+  <string name="rtt_button_accept_request">加入 RTT</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-zh-rHK/strings.xml b/java/com/android/incallui/res/values-zh-rHK/strings.xml
index 4bd16d1..cc3ed13 100644
--- a/java/com/android/incallui/res/values-zh-rHK/strings.xml
+++ b/java/com/android/incallui/res/values-zh-rHK/strings.xml
@@ -1,79 +1,68 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"電話"</string>
-    <string name="wait_prompt_str" msgid="3509685348904329594">"傳送下列鈴聲？ \n"</string>
-    <string name="pause_prompt_yes" msgid="4642047011233552973">"是"</string>
-    <string name="pause_prompt_no" msgid="4691320111774935838">"否"</string>
-    <string name="notification_dialing" msgid="9072177265772083826">"正在撥號"</string>
-    <string name="notification_ongoing_call" msgid="8712641937577776125">"通話中"</string>
-    <string name="notification_ongoing_video_call" msgid="6331318021321487769">"正在進行視像通話"</string>
-    <string name="notification_ongoing_paused_video_call" msgid="709950253594606371">"正在進行視像通話 ‑ 視像已暫停"</string>
-    <string name="notification_ongoing_work_call" msgid="3189581218078981547">"正在進行工作通話"</string>
-    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"正在進行 <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
-    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"有其他人打來的 <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
-    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"Wi-Fi 通話"</string>
-    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"Wi‑Fi 工作通話"</string>
-    <string name="notification_on_hold" msgid="7141827443379205682">"保留通話"</string>
-    <string name="notification_incoming_call" msgid="7520580807513849283">"來電"</string>
-    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"附有相片的來電"</string>
-    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"附有訊息的來電"</string>
-    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"附有位置的來電"</string>
-    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"附有相片和訊息的來電"</string>
-    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"附有相片和位置的來電"</string>
-    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"附有訊息和位置的來電"</string>
-    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"附有相片、訊息和位置的來電"</string>
-    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"附有附件的來電"</string>
-    <string name="important_notification_incoming_call" msgid="2867013954509930989">"重要來電"</string>
-    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"附有相片的重要來電"</string>
-    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"附有訊息的重要來電"</string>
-    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"附有位置的重要來電"</string>
-    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"附有相片和訊息的重要來電"</string>
-    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"附有相片和位置的重要來電"</string>
-    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"附有訊息和位置的重要來電"</string>
-    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"附有相片、訊息和位置的重要來電"</string>
-    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"附有附件的重要來電"</string>
-    <string name="notification_incoming_work_call" msgid="5291275092734261918">"工作來電"</string>
-    <string name="notification_incoming_spam_call" msgid="7591506944666791937">"疑似收到垃圾來電"</string>
-    <string name="notification_requesting_video_call" msgid="1807679328811515758">"收到視像要求"</string>
-    <string name="notification_action_answer" msgid="8748275902211192568">"接聽"</string>
-    <string name="notification_action_end_call" msgid="7467258454170007765">"掛斷"</string>
-    <string name="notification_action_answer_video" msgid="8488108892919917287">"影片"</string>
-    <string name="notification_action_accept" msgid="1272761514200507143">"接受"</string>
-    <string name="notification_action_dismiss" msgid="3128241581632616226">"拒絕"</string>
-    <string name="notification_action_speaker_on" msgid="1882659234405596540">"開啟揚聲器"</string>
-    <string name="notification_action_speaker_off" msgid="6340085043115533948">"關閉揚聲器"</string>
-    <string name="notification_external_call" msgid="2504334597315343920">"其他裝置上有正在進行的通話"</string>
-    <string name="notification_external_video_call" msgid="7709394856028436683">"其他裝置上有正在進行的視像通話"</string>
-    <string name="notification_take_call" msgid="5631659438864492229">"接受通話"</string>
-    <string name="notification_take_video_call" msgid="4473387503712341390">"接受視像通話"</string>
-    <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"不支援的服務。"</string>
-    <string name="goPrivate" msgid="5269514638004595378">"私人通話"</string>
-    <string name="manageConferenceLabel" msgid="3589379023518128318">"管理會議通話"</string>
-    <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"緊急電話號碼"</string>
-    <string name="child_number" msgid="3398257437107259682">"透過 <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
-    <string name="callFailed_simError" msgid="4587775795711340072">"沒有 SIM 卡，或是 SIM 卡錯誤"</string>
-    <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"結束通話"</string>
-    <string name="conference_call_name" msgid="8189987124611337174">"會議通話"</string>
-    <string name="generic_conference_call_name" msgid="1546941472424243894">"正在通話"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"使用流動數據繼續通話…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"無法切換為 Wi-Fi 網絡"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"視像通話仍會使用流動網絡 (可能需要支付標準數據用量費用)。"</string>
-    <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"不要再顯示此訊息"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="wait_prompt_str">傳送下列鈴聲？ \n</string>
+  <string name="pause_prompt_yes">是</string>
+  <string name="pause_prompt_no">否</string>
+  <string name="notification_dialing">正在撥號</string>
+  <string name="notification_ongoing_call">通話中</string>
+  <string name="notification_ongoing_video_call">正在進行視像通話</string>
+  <string name="notification_ongoing_paused_video_call">正在進行視像通話 ‑ 視像已暫停</string>
+  <string name="notification_ongoing_work_call">正在進行工作通話</string>
+  <string name="notification_ongoing_call_wifi_template">正在進行 %1$s</string>
+  <string name="notification_incoming_call_wifi_template">有其他人打來的 %1$s</string>
+  <string name="notification_call_wifi_brand">Wi-Fi 通話</string>
+  <string name="notification_call_wifi_work_brand">Wi‑Fi 工作通話</string>
+  <string name="notification_on_hold">保留通話</string>
+  <string name="notification_incoming_call">來電</string>
+  <string name="notification_incoming_video_call">視像通話來電</string>
+  <string name="notification_incoming_call_mutli_sim">正待接聽經由 %1$s 的來電</string>
+  <string name="notification_incoming_call_with_photo">附有相片的來電</string>
+  <string name="notification_incoming_call_with_message">附有訊息的來電</string>
+  <string name="notification_incoming_call_with_location">附有位置的來電</string>
+  <string name="notification_incoming_call_with_photo_message">附有相片和訊息的來電</string>
+  <string name="notification_incoming_call_with_photo_location">附有相片和位置的來電</string>
+  <string name="notification_incoming_call_with_message_location">附有訊息和位置的來電</string>
+  <string name="notification_incoming_call_with_photo_message_location">附有相片、訊息和位置的來電</string>
+  <string name="notification_incoming_call_attachments">附有附件的來電</string>
+  <string name="important_notification_incoming_call">重要來電</string>
+  <string name="important_notification_incoming_call_with_photo">附有相片的重要來電</string>
+  <string name="important_notification_incoming_call_with_message">附有訊息的重要來電</string>
+  <string name="important_notification_incoming_call_with_location">附有位置的重要來電</string>
+  <string name="important_notification_incoming_call_with_photo_message">附有相片和訊息的重要來電</string>
+  <string name="important_notification_incoming_call_with_photo_location">附有相片和位置的重要來電</string>
+  <string name="important_notification_incoming_call_with_message_location">附有訊息和位置的重要來電</string>
+  <string name="important_notification_incoming_call_with_photo_message_location">附有相片、訊息和位置的重要來電</string>
+  <string name="important_notification_incoming_call_attachments">附有附件的重要來電</string>
+  <string name="notification_incoming_work_call">工作來電</string>
+  <string name="notification_incoming_spam_call">疑似收到垃圾來電</string>
+  <string name="notification_requesting_video_call">收到視像要求</string>
+  <string name="notification_action_answer">接聽</string>
+  <string name="notification_action_end_call">掛斷</string>
+  <string name="notification_action_answer_video">影片</string>
+  <string name="notification_action_accept">接受</string>
+  <string name="notification_action_dismiss">拒絕</string>
+  <string name="notification_action_speaker_on">開啟揚聲器</string>
+  <string name="notification_action_speaker_off">關閉揚聲器</string>
+  <string name="notification_external_call">其他裝置上有正在進行的通話</string>
+  <string name="notification_external_video_call">其他裝置上有正在進行的視像通話</string>
+  <string name="notification_take_call">接受通話</string>
+  <string name="notification_take_video_call">接受視像通話</string>
+  <string name="incall_error_supp_service_unknown">不支援的服務。</string>
+  <string name="goPrivate">私人通話</string>
+  <string name="manageConferenceLabel">管理會議通話</string>
+  <string name="child_number">透過 %s</string>
+  <string name="callFailed_simError">沒有 SIM 卡，或是 SIM 卡錯誤</string>
+  <string name="conference_caller_disconnect_content_description">結束通話</string>
+  <string name="conference_call_name">會議通話</string>
+  <string name="generic_conference_call_name">正在通話</string>
+  <string name="video_call_wifi_to_lte_handover_toast">使用流動數據繼續通話…</string>
+  <string name="video_call_lte_to_wifi_failed_title">無法切換為 Wi-Fi 網絡</string>
+  <string name="video_call_lte_to_wifi_failed_message">視像通話仍會使用流動網絡 (可能需要支付標準數據用量費用)。</string>
+  <string name="video_call_lte_to_wifi_failed_do_not_show">不要再顯示此訊息</string>
+  <string name="bubble_return_to_call">返回通話</string>
+  <string name="rtt_request_dialog_title">要加入即時文字短訊 (RTT) 通話嗎？</string>
+  <string name="rtt_request_dialog_details">%1$s想在與您進行語音通話期間使用短訊功能。</string>
+  <string name="rtt_request_dialog_more_information">即時文字短訊 (RTT) 功能可協助失聰、有聽力障礙、語言失能或需要語音以外更多功能的通話者。</string>
+  <string name="rtt_button_decline_request">不，謝謝</string>
+  <string name="rtt_button_accept_request">加入即時文字短訊 (RTT)</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-zh-rTW/strings.xml b/java/com/android/incallui/res/values-zh-rTW/strings.xml
index c404864..28d3242 100644
--- a/java/com/android/incallui/res/values-zh-rTW/strings.xml
+++ b/java/com/android/incallui/res/values-zh-rTW/strings.xml
@@ -1,79 +1,68 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"電話"</string>
-    <string name="wait_prompt_str" msgid="3509685348904329594">"傳送此鈴聲？\n"</string>
-    <string name="pause_prompt_yes" msgid="4642047011233552973">"是"</string>
-    <string name="pause_prompt_no" msgid="4691320111774935838">"否"</string>
-    <string name="notification_dialing" msgid="9072177265772083826">"撥號中"</string>
-    <string name="notification_ongoing_call" msgid="8712641937577776125">"通話中"</string>
-    <string name="notification_ongoing_video_call" msgid="6331318021321487769">"進行中的視訊通話"</string>
-    <string name="notification_ongoing_paused_video_call" msgid="709950253594606371">"進行中的視訊通話 ‑ 已暫停視訊畫面"</string>
-    <string name="notification_ongoing_work_call" msgid="3189581218078981547">"進行中的公司通話"</string>
-    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"透過「<xliff:g id="BRAND_NAME">%1$s</xliff:g>」進行的通話"</string>
-    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"透過「<xliff:g id="BRAND_NAME">%1$s</xliff:g>」接聽的來電"</string>
-    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"Wi-Fi 通話"</string>
-    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"Wi-Fi 公司通話"</string>
-    <string name="notification_on_hold" msgid="7141827443379205682">"通話保留"</string>
-    <string name="notification_incoming_call" msgid="7520580807513849283">"來電"</string>
-    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"包含相片的來電"</string>
-    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"包含訊息的來電"</string>
-    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"包含位置資訊的來電"</string>
-    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"包含相片和訊息的來電"</string>
-    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"包含相片和位置資訊的來電"</string>
-    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"包含訊息和位置資訊的來電"</string>
-    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"包含相片、訊息和位置資訊的來電"</string>
-    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"包含附件的來電"</string>
-    <string name="important_notification_incoming_call" msgid="2867013954509930989">"重要來電"</string>
-    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"包含相片的重要來電"</string>
-    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"包含訊息的重要來電"</string>
-    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"包含位置資訊的重要來電"</string>
-    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"包含相片和訊息的重要來電"</string>
-    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"包含相片和位置資訊的重要來電"</string>
-    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"包含訊息和位置資訊的重要來電"</string>
-    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"包含相片、訊息和位置資訊的重要來電"</string>
-    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"包含附件的重要來電"</string>
-    <string name="notification_incoming_work_call" msgid="5291275092734261918">"公司來電"</string>
-    <string name="notification_incoming_spam_call" msgid="7591506944666791937">"可疑的騷擾/廣告來電"</string>
-    <string name="notification_requesting_video_call" msgid="1807679328811515758">"收到視訊要求"</string>
-    <string name="notification_action_answer" msgid="8748275902211192568">"接聽"</string>
-    <string name="notification_action_end_call" msgid="7467258454170007765">"掛斷"</string>
-    <string name="notification_action_answer_video" msgid="8488108892919917287">"視訊"</string>
-    <string name="notification_action_accept" msgid="1272761514200507143">"接受"</string>
-    <string name="notification_action_dismiss" msgid="3128241581632616226">"拒絕"</string>
-    <string name="notification_action_speaker_on" msgid="1882659234405596540">"開啟喇叭"</string>
-    <string name="notification_action_speaker_off" msgid="6340085043115533948">"關閉喇叭"</string>
-    <string name="notification_external_call" msgid="2504334597315343920">"其他裝置上有進行中的通話"</string>
-    <string name="notification_external_video_call" msgid="7709394856028436683">"其他裝置上有進行中的視訊通話"</string>
-    <string name="notification_take_call" msgid="5631659438864492229">"接聽通話"</string>
-    <string name="notification_take_video_call" msgid="4473387503712341390">"接聽視訊通話"</string>
-    <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"不支援的服務。"</string>
-    <string name="goPrivate" msgid="5269514638004595378">"私人通話"</string>
-    <string name="manageConferenceLabel" msgid="3589379023518128318">"管理電話會議"</string>
-    <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"緊急電話號碼"</string>
-    <string name="child_number" msgid="3398257437107259682">"透過 <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
-    <string name="callFailed_simError" msgid="4587775795711340072">"沒有 SIM 卡或 SIM 卡發生錯誤"</string>
-    <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"結束通話"</string>
-    <string name="conference_call_name" msgid="8189987124611337174">"電話會議"</string>
-    <string name="generic_conference_call_name" msgid="1546941472424243894">"通話中"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"使用行動網路繼續進行通話…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"無法切換至 Wi-Fi 網路"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"視訊通話將繼續透過行動網路進行 (可能需支付一般數據傳輸費用)。"</string>
-    <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"不要再顯示這項說明"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="wait_prompt_str">傳送此鈴聲？\n</string>
+  <string name="pause_prompt_yes">是</string>
+  <string name="pause_prompt_no">否</string>
+  <string name="notification_dialing">撥號中</string>
+  <string name="notification_ongoing_call">通話中</string>
+  <string name="notification_ongoing_video_call">進行中的視訊通話</string>
+  <string name="notification_ongoing_paused_video_call">進行中的視訊通話 ‑ 已暫停視訊畫面</string>
+  <string name="notification_ongoing_work_call">進行中的公司通話</string>
+  <string name="notification_ongoing_call_wifi_template">透過「%1$s」進行的通話</string>
+  <string name="notification_incoming_call_wifi_template">透過「%1$s」接聽的來電</string>
+  <string name="notification_call_wifi_brand">Wi-Fi 通話</string>
+  <string name="notification_call_wifi_work_brand">Wi-Fi 公司通話</string>
+  <string name="notification_on_hold">通話保留</string>
+  <string name="notification_incoming_call">來電</string>
+  <string name="notification_incoming_video_call">視訊通話來電</string>
+  <string name="notification_incoming_call_mutli_sim">透過 %1$s 撥打的來電</string>
+  <string name="notification_incoming_call_with_photo">包含相片的來電</string>
+  <string name="notification_incoming_call_with_message">包含訊息的來電</string>
+  <string name="notification_incoming_call_with_location">包含位置資訊的來電</string>
+  <string name="notification_incoming_call_with_photo_message">包含相片和訊息的來電</string>
+  <string name="notification_incoming_call_with_photo_location">包含相片和位置資訊的來電</string>
+  <string name="notification_incoming_call_with_message_location">包含訊息和位置資訊的來電</string>
+  <string name="notification_incoming_call_with_photo_message_location">包含相片、訊息和位置資訊的來電</string>
+  <string name="notification_incoming_call_attachments">包含附件的來電</string>
+  <string name="important_notification_incoming_call">重要來電</string>
+  <string name="important_notification_incoming_call_with_photo">包含相片的重要來電</string>
+  <string name="important_notification_incoming_call_with_message">包含訊息的重要來電</string>
+  <string name="important_notification_incoming_call_with_location">包含位置資訊的重要來電</string>
+  <string name="important_notification_incoming_call_with_photo_message">包含相片和訊息的重要來電</string>
+  <string name="important_notification_incoming_call_with_photo_location">包含相片和位置資訊的重要來電</string>
+  <string name="important_notification_incoming_call_with_message_location">包含訊息和位置資訊的重要來電</string>
+  <string name="important_notification_incoming_call_with_photo_message_location">包含相片、訊息和位置資訊的重要來電</string>
+  <string name="important_notification_incoming_call_attachments">包含附件的重要來電</string>
+  <string name="notification_incoming_work_call">公司來電</string>
+  <string name="notification_incoming_spam_call">可疑的騷擾/廣告來電</string>
+  <string name="notification_requesting_video_call">收到視訊要求</string>
+  <string name="notification_action_answer">接聽</string>
+  <string name="notification_action_end_call">掛斷</string>
+  <string name="notification_action_answer_video">視訊</string>
+  <string name="notification_action_accept">接受</string>
+  <string name="notification_action_dismiss">拒絕</string>
+  <string name="notification_action_speaker_on">開啟喇叭</string>
+  <string name="notification_action_speaker_off">關閉喇叭</string>
+  <string name="notification_external_call">其他裝置上有進行中的通話</string>
+  <string name="notification_external_video_call">其他裝置上有進行中的視訊通話</string>
+  <string name="notification_take_call">接聽通話</string>
+  <string name="notification_take_video_call">接聽視訊通話</string>
+  <string name="incall_error_supp_service_unknown">不支援的服務。</string>
+  <string name="goPrivate">私人通話</string>
+  <string name="manageConferenceLabel">管理電話會議</string>
+  <string name="child_number">透過 %s</string>
+  <string name="callFailed_simError">沒有 SIM 卡或 SIM 卡發生錯誤</string>
+  <string name="conference_caller_disconnect_content_description">結束通話</string>
+  <string name="conference_call_name">電話會議</string>
+  <string name="generic_conference_call_name">通話中</string>
+  <string name="video_call_wifi_to_lte_handover_toast">使用行動網路繼續進行通話…</string>
+  <string name="video_call_lte_to_wifi_failed_title">無法切換至 Wi-Fi 網路</string>
+  <string name="video_call_lte_to_wifi_failed_message">視訊通話將繼續透過行動網路進行 (可能需支付一般數據傳輸費用)。</string>
+  <string name="video_call_lte_to_wifi_failed_do_not_show">不要再顯示這項說明</string>
+  <string name="bubble_return_to_call">返回通話</string>
+  <string name="rtt_request_dialog_title">要加入即時文字訊息通話嗎？</string>
+  <string name="rtt_request_dialog_details">%1$s想在與你進行語音通話期間使用訊息功能。</string>
+  <string name="rtt_request_dialog_more_information">即時文字訊息功能可為以下類型的來電者提供協助：聽障人士、聽力受損者、語言障礙者，或需要語音服務以外的使用者。</string>
+  <string name="rtt_button_decline_request">不用了，謝謝</string>
+  <string name="rtt_button_accept_request">加入即時文字訊息</string>
 </resources>
diff --git a/java/com/android/incallui/res/values-zu/strings.xml b/java/com/android/incallui/res/values-zu/strings.xml
index 267b3a6..b4d85c9 100644
--- a/java/com/android/incallui/res/values-zu/strings.xml
+++ b/java/com/android/incallui/res/values-zu/strings.xml
@@ -1,79 +1,68 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"Ifoni"</string>
-    <string name="wait_prompt_str" msgid="3509685348904329594">"Thumela amathoni alandelayo?\n"</string>
-    <string name="pause_prompt_yes" msgid="4642047011233552973">"Yebo"</string>
-    <string name="pause_prompt_no" msgid="4691320111774935838">"Cha"</string>
-    <string name="notification_dialing" msgid="9072177265772083826">"Iyadayela"</string>
-    <string name="notification_ongoing_call" msgid="8712641937577776125">"Ikholi eqhubekayo"</string>
-    <string name="notification_ongoing_video_call" msgid="6331318021321487769">"Ikholi yevidiyo eqhubekayo"</string>
-    <string name="notification_ongoing_paused_video_call" msgid="709950253594606371">"Ikholi yevidiyo eqhubekayo ‑ ividiyo imisiwe"</string>
-    <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Ikholi yomsebenzi eqhubekayo"</string>
-    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"I-<xliff:g id="BRAND_NAME">%1$s</xliff:g> eqhubekayo"</string>
-    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"I-<xliff:g id="BRAND_NAME">%1$s</xliff:g> engenayo"</string>
-    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"Ikholi ye-Wi-Fi"</string>
-    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"Ikholi yomsebenzi ye-Wi-Fi"</string>
-    <string name="notification_on_hold" msgid="7141827443379205682">"Ibambile"</string>
-    <string name="notification_incoming_call" msgid="7520580807513849283">"Ikholi engenayo"</string>
-    <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Ikholi engenayo enesithombe"</string>
-    <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"Ikholi engenayo enomlayezo"</string>
-    <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"Ikholi engenayo enendawo"</string>
-    <string name="notification_incoming_call_with_photo_message" msgid="316806247057497525">"Ikholi engenayo enesithombe nomlayezo"</string>
-    <string name="notification_incoming_call_with_photo_location" msgid="3523930283842222367">"Ikholi engenayo enesithombe nendawo"</string>
-    <string name="notification_incoming_call_with_message_location" msgid="319374298517482028">"Ikholi engenayo enomlayezo nendawo"</string>
-    <string name="notification_incoming_call_with_photo_message_location" msgid="596658237891406809">"Ikholi engenayo enesithombe, umlayezo nendawo"</string>
-    <string name="notification_incoming_call_attachments" msgid="3708414495376236948">"Ikholi engenayo enokunamathiselwe kwi-imeyili"</string>
-    <string name="important_notification_incoming_call" msgid="2867013954509930989">"Ikholi engenayo ebalulekile"</string>
-    <string name="important_notification_incoming_call_with_photo" msgid="4908333121583658560">"Ikholi engenayo ebalulekile enesithombe"</string>
-    <string name="important_notification_incoming_call_with_message" msgid="1614505248246685319">"Ikholi engenayo ebalulekile enomlayezo"</string>
-    <string name="important_notification_incoming_call_with_location" msgid="7387284065036564352">"Ikholi engenayo ebalulekile enendawo"</string>
-    <string name="important_notification_incoming_call_with_photo_message" msgid="4577220919701434817">"Ikholi engenayo ebalulekile enesithombe nomlayezo"</string>
-    <string name="important_notification_incoming_call_with_photo_location" msgid="7172208615619394502">"Ikholi engenayo ebalulekile enesithombe nendawo"</string>
-    <string name="important_notification_incoming_call_with_message_location" msgid="7244079127080064796">"Ikholi engenayo ebalulekile enomlayezo nendawo"</string>
-    <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Ikholi engenayo ebalulekile enesithombe, umlayezo nendawo"</string>
-    <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Ikholi engenayo ebalulekile enokunamathiselwe kwi-imeyili"</string>
-    <string name="notification_incoming_work_call" msgid="5291275092734261918">"Ikholi engenayo yomsebenzi"</string>
-    <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Ikholi engenayo osolisayo kagaxekile"</string>
-    <string name="notification_requesting_video_call" msgid="1807679328811515758">"Isicelo sevidiyo engenayo"</string>
-    <string name="notification_action_answer" msgid="8748275902211192568">"Phendula"</string>
-    <string name="notification_action_end_call" msgid="7467258454170007765">"Vala ikholi"</string>
-    <string name="notification_action_answer_video" msgid="8488108892919917287">"Ividiyo"</string>
-    <string name="notification_action_accept" msgid="1272761514200507143">"Yamukela"</string>
-    <string name="notification_action_dismiss" msgid="3128241581632616226">"Yenqaba"</string>
-    <string name="notification_action_speaker_on" msgid="1882659234405596540">"Vula isipikha"</string>
-    <string name="notification_action_speaker_off" msgid="6340085043115533948">"Vala isipikha"</string>
-    <string name="notification_external_call" msgid="2504334597315343920">"Ikholi eqhubekayo kwenye idivayisi"</string>
-    <string name="notification_external_video_call" msgid="7709394856028436683">"Ikholi yevidiyo eqhubekayo kwenye idivayisi"</string>
-    <string name="notification_take_call" msgid="5631659438864492229">"Thatha ikholi"</string>
-    <string name="notification_take_video_call" msgid="4473387503712341390">"Thatha ikholi yevidiyo"</string>
-    <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"Isevisi ayisekelwe."</string>
-    <string name="goPrivate" msgid="5269514638004595378">"yenza kube imfihlo"</string>
-    <string name="manageConferenceLabel" msgid="3589379023518128318">"Phatha ucingo lwengqungquthela"</string>
-    <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"Inombolo yesimo esiphuthumayo"</string>
-    <string name="child_number" msgid="3398257437107259682">"nge-<xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
-    <string name="callFailed_simError" msgid="4587775795711340072">"Ayikho i-SIM, noma iphutha le-SIM"</string>
-    <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Qeda ikholi"</string>
-    <string name="conference_call_name" msgid="8189987124611337174">"Ikholi yengqungquthela"</string>
-    <string name="generic_conference_call_name" msgid="1546941472424243894">"Isecingweni"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Iqhubekisa ikholi isebenzisa idatha yeselula…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Ayikwazanga ukushintshela kunethiwekhi ye-Wi-Fi"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"Ikholi yevidiyo izohlala ikunethiwekhi yeselula. Amashaji edatha avamile angasebenza."</string>
-    <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Ungabonisi lokhu futhi"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="wait_prompt_str">Thumela amathoni alandelayo?\n</string>
+  <string name="pause_prompt_yes">Yebo</string>
+  <string name="pause_prompt_no">Cha</string>
+  <string name="notification_dialing">Iyadayela</string>
+  <string name="notification_ongoing_call">Ikholi eqhubekayo</string>
+  <string name="notification_ongoing_video_call">Ikholi yevidiyo eqhubekayo</string>
+  <string name="notification_ongoing_paused_video_call">Ikholi yevidiyo eqhubekayo ‑ ividiyo imisiwe</string>
+  <string name="notification_ongoing_work_call">Ikholi yomsebenzi eqhubekayo</string>
+  <string name="notification_ongoing_call_wifi_template">I-%1$s eqhubekayo</string>
+  <string name="notification_incoming_call_wifi_template">I-%1$s engenayo</string>
+  <string name="notification_call_wifi_brand">Ikholi ye-Wi-Fi</string>
+  <string name="notification_call_wifi_work_brand">Ikholi yomsebenzi ye-Wi-Fi</string>
+  <string name="notification_on_hold">Ibambile</string>
+  <string name="notification_incoming_call">Ikholi engenayo</string>
+  <string name="notification_incoming_video_call">Ikholi yevidiyo engenayo</string>
+  <string name="notification_incoming_call_mutli_sim">Ikholi engenayo nge-%1$s</string>
+  <string name="notification_incoming_call_with_photo">Ikholi engenayo enesithombe</string>
+  <string name="notification_incoming_call_with_message">Ikholi engenayo enomlayezo</string>
+  <string name="notification_incoming_call_with_location">Ikholi engenayo enendawo</string>
+  <string name="notification_incoming_call_with_photo_message">Ikholi engenayo enesithombe nomlayezo</string>
+  <string name="notification_incoming_call_with_photo_location">Ikholi engenayo enesithombe nendawo</string>
+  <string name="notification_incoming_call_with_message_location">Ikholi engenayo enomlayezo nendawo</string>
+  <string name="notification_incoming_call_with_photo_message_location">Ikholi engenayo enesithombe, umlayezo nendawo</string>
+  <string name="notification_incoming_call_attachments">Ikholi engenayo enokunamathiselwe kwi-imeyili</string>
+  <string name="important_notification_incoming_call">Ikholi engenayo ebalulekile</string>
+  <string name="important_notification_incoming_call_with_photo">Ikholi engenayo ebalulekile enesithombe</string>
+  <string name="important_notification_incoming_call_with_message">Ikholi engenayo ebalulekile enomlayezo</string>
+  <string name="important_notification_incoming_call_with_location">Ikholi engenayo ebalulekile enendawo</string>
+  <string name="important_notification_incoming_call_with_photo_message">Ikholi engenayo ebalulekile enesithombe nomlayezo</string>
+  <string name="important_notification_incoming_call_with_photo_location">Ikholi engenayo ebalulekile enesithombe nendawo</string>
+  <string name="important_notification_incoming_call_with_message_location">Ikholi engenayo ebalulekile enomlayezo nendawo</string>
+  <string name="important_notification_incoming_call_with_photo_message_location">Ikholi engenayo ebalulekile enesithombe, umlayezo nendawo</string>
+  <string name="important_notification_incoming_call_attachments">Ikholi engenayo ebalulekile enokunamathiselwe kwi-imeyili</string>
+  <string name="notification_incoming_work_call">Ikholi engenayo yomsebenzi</string>
+  <string name="notification_incoming_spam_call">Ikholi engenayo osolisayo kagaxekile</string>
+  <string name="notification_requesting_video_call">Isicelo sevidiyo engenayo</string>
+  <string name="notification_action_answer">Phendula</string>
+  <string name="notification_action_end_call">Vala ikholi</string>
+  <string name="notification_action_answer_video">Ividiyo</string>
+  <string name="notification_action_accept">Yamukela</string>
+  <string name="notification_action_dismiss">Yenqaba</string>
+  <string name="notification_action_speaker_on">Vula isipikha</string>
+  <string name="notification_action_speaker_off">Vala isipikha</string>
+  <string name="notification_external_call">Ikholi eqhubekayo kwenye idivayisi</string>
+  <string name="notification_external_video_call">Ikholi yevidiyo eqhubekayo kwenye idivayisi</string>
+  <string name="notification_take_call">Thatha ikholi</string>
+  <string name="notification_take_video_call">Thatha ikholi yevidiyo</string>
+  <string name="incall_error_supp_service_unknown">Isevisi ayisekelwe.</string>
+  <string name="goPrivate">yenza kube imfihlo</string>
+  <string name="manageConferenceLabel">Phatha ucingo lwengqungquthela</string>
+  <string name="child_number">nge-%s</string>
+  <string name="callFailed_simError">Ayikho i-SIM, noma iphutha le-SIM</string>
+  <string name="conference_caller_disconnect_content_description">Qeda ikholi</string>
+  <string name="conference_call_name">Ikholi yengqungquthela</string>
+  <string name="generic_conference_call_name">Isecingweni</string>
+  <string name="video_call_wifi_to_lte_handover_toast">Iqhubekisa ikholi isebenzisa idatha yeselula…</string>
+  <string name="video_call_lte_to_wifi_failed_title">Ayikwazanga ukushintshela kunethiwekhi ye-Wi-Fi</string>
+  <string name="video_call_lte_to_wifi_failed_message">Ikholi yevidiyo izohlala ikunethiwekhi yeselula. Amashaji edatha avamile angasebenza.</string>
+  <string name="video_call_lte_to_wifi_failed_do_not_show">Ungabonisi lokhu futhi</string>
+  <string name="bubble_return_to_call">Buyela ocingweni</string>
+  <string name="rtt_request_dialog_title">Joyina ikholi ye-RTT?</string>
+  <string name="rtt_request_dialog_details">%1$s ufuna ukusebenzisa imilayezo ngaphakathi kwekholi yakho yezwi.</string>
+  <string name="rtt_request_dialog_more_information">I-RTT isiza abashayi abangezwa, abezwa kanzima, abakhubazeke ngokwenkulumo, noma abadinga ngaphezu kwezwi nje kuphela.</string>
+  <string name="rtt_button_decline_request">Cha ngiyabonga</string>
+  <string name="rtt_button_accept_request">Joyina i-RTT</string>
 </resources>
diff --git a/java/com/android/incallui/res/values/colors.xml b/java/com/android/incallui/res/values/colors.xml
index 32da57b..d53a86b 100644
--- a/java/com/android/incallui/res/values/colors.xml
+++ b/java/com/android/incallui/res/values/colors.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2013 The Android Open Source Project
+  ~ Copyright (C) 2018 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -14,57 +14,6 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License
   -->
-
 <resources>
-  <color name="conference_call_manager_caller_name_text_color">#4d4d4d</color>
-  <!-- Used with some smaller texts in manage conference screen. -->
-  <color name="conference_call_manager_secondary_text_color">#999999</color>
-
-  <color name="incall_dialpad_background">#ffffff</color>
-
-  <!-- Background color for status bar. For portrait this will be ignored. -->
-  <color name="statusbar_background_color">@color/dialer_theme_color</color>
-
-  <!-- 20% opacity, theme color. -->
-  <color name="incall_dialpad_touch_tint">@color/dialer_theme_color_20pct</color>
-
-  <!-- Background colors for InCallUI. This is a set of colors which pass WCAG
-       AA and all have a contrast ratio over 5:1.
-
-      These colors are also used by InCallUIMaterialColorMapUtils to generate
-      primary activity colors.
-  -->
-  <array name="background_colors">
-    <item>#00796B</item>
-    <item>#3367D6</item>
-    <item>#303F9F</item>
-    <item>#7B1FA2</item>
-    <item>#C2185B</item>
-    <item>#C53929</item>
-    <item>#A52714</item>
-  </array>
-
-  <!-- Darker versions of background_colors, two shades darker. These colors are used for the
-       status bar. -->
-  <array name="background_colors_dark">
-    <item>#00695C</item>
-    <item>#2A56C6</item>
-    <item>#283593</item>
-    <item>#6A1B9A</item>
-    <item>#AD1457</item>
-    <item>#B93221</item>
-    <item>#841F10</item>
-  </array>
-
-  <color name="incall_background_gradient_top">#E91141BB</color>
-  <color name="incall_background_gradient_middle">#E91141BB</color>
-  <color name="incall_background_gradient_bottom">#CC229FEB</color>
-
-  <color name="incall_background_multiwindow">#E91141BB</color>
-
-  <color name="incall_background_gradient_spam_top">#E5A30B0B</color>
-  <color name="incall_background_gradient_spam_middle">#D6C01111</color>
-  <color name="incall_background_gradient_spam_bottom">#B8E55135</color>
-
-  <color name="incall_background_multiwindow_spam">#E9C22E2E</color>
-</resources>
+  <color name="DO_NOT_USE_OR_I_WILL_BREAK_YOU_text_span_tertiary_button">#1A73E8</color>
+</resources>
\ No newline at end of file
diff --git a/java/com/android/incallui/res/values/dimens.xml b/java/com/android/incallui/res/values/dimens.xml
deleted file mode 100644
index 5688169..0000000
--- a/java/com/android/incallui/res/values/dimens.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-  -->
-
-<resources>
-  <!-- The InCallUI dialpad will sometimes want digits sizes that are different
-       from dialer. Note, these are the default sizes for small devices. Larger
-       screen sizes apply the values in values-sw360dp/dimens.xml. -->
-  <dimen name="incall_dialpad_key_number_margin_bottom">1dp</dimen>
-  <dimen name="incall_dialpad_digits_adjustable_text_size">20sp</dimen>
-  <dimen name="incall_dialpad_digits_adjustable_height">50dp</dimen>
-  <dimen name="incall_dialpad_key_letters_size_for_dual_alphabets">9sp</dimen>
-  <dimen name="incall_dialpad_key_letters_size_for_single_alphabet">
-    @dimen/dialpad_key_letters_default_size_for_single_alphabet
-  </dimen>
-  <dimen name="incall_dialpad_key_numbers_size">36dp</dimen>
-
-  <!-- Dimension used to possibly down-scale high-res photo into what is suitable
-       for notification's large icon. -->
-  <dimen name="notification_icon_size">64dp</dimen>
-
-  <dimen name="conference_call_manager_button_dimension">48dp</dimen>
-
-  <dimen name="return_to_call_initial_offset_y">120dp</dimen>
-
-  <!-- Whether or not the landscape mode layout is currently being used -->
-  <bool name="is_layout_landscape">false</bool>
-
-  <dimen name="video_call_lte_to_wifi_failed_do_not_show_text_size">16sp</dimen>
-
-</resources>
diff --git a/java/com/android/incallui/res/values/strings.xml b/java/com/android/incallui/res/values/strings.xml
index af61253..c18ee49 100644
--- a/java/com/android/incallui/res/values/strings.xml
+++ b/java/com/android/incallui/res/values/strings.xml
@@ -16,11 +16,6 @@
   -->
 
 <resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-
-  <!-- Official label of the phone app, as seen in "Manage Applications"
-       and other settings UIs. -->
-  <string name="phoneAppLabel" product="default">Phone</string>
-
   <!-- MMI dialog strings -->
   <!-- Dialog label when an MMI code starts running -->
 
@@ -172,9 +167,6 @@
   <!-- Label for "Manage conference call" panel [CHAR LIMIT=40] -->
   <string name="manageConferenceLabel" tools:ignore="UnusedResources">Manage conference call</string>
 
-  <!-- This can be used in any application wanting to disable the text "Emergency number" -->
-  <string name="emergency_call_dialog_number_for_display">Emergency number</string>
-
   <!-- Used to inform the user that a call was received via a number other than the primary
       phone number associated with their device. [CHAR LIMIT=16] -->
   <string name="child_number">via <xliff:g example="650-555-1212" id="child_number">%s</xliff:g></string>
@@ -205,4 +197,19 @@
   <!-- Text for bubble return-to-call button -->
   <string name="bubble_return_to_call">Back to call</string>
 
+  <!-- Title for RTT request dialog. [CHAR LIMIT=60] -->
+  <string name="rtt_request_dialog_title">Join RTT call?</string>
+
+  <!-- Details for RTT request dialog. [CHAR LIMIT=NONE] -->
+  <string name="rtt_request_dialog_details"><xliff:g id="caller">%1$s</xliff:g> wants to use messaging within your voice call.</string>
+
+  <!-- More information for RTT request dialog. [CHAR LIMIT=NONE] -->
+  <string name="rtt_request_dialog_more_information">RTT assists callers who are deaf, hard of hearing, have a speech disability, or need more than voice alone.</string>
+
+  <!-- Text for button to decline RTT request. [CHAR LIMIT=20] -->
+  <string name="rtt_button_decline_request">No thanks</string>
+
+  <!-- Text for button to accept RTT request. [CHAR LIMIT=20] -->
+  <string name="rtt_button_accept_request">Join RTT</string>
+
 </resources>
diff --git a/java/com/android/incallui/res/values/styles.xml b/java/com/android/incallui/res/values/styles.xml
deleted file mode 100644
index 269b721..0000000
--- a/java/com/android/incallui/res/values/styles.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2013 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-  -->
-
-<resources>
-  <!-- Theme for the InCallActivity activity. Should have a transparent background for the
-       circular reveal animation for a new outgoing call to work correctly. We don't just use
-       Theme.Black.NoTitleBar directly, since we want any popups or dialogs from the
-       InCallActivity to have the correct Material style. -->
-  <style name="Theme.InCallScreen" parent="@style/Theme.AppCompat.NoActionBar">
-    <item name="android:textColorPrimary">#ffffff</item>
-    <item name="android:textColorSecondary">#DDFFFFFF</item>
-    <item name="android:colorPrimary">@color/dialer_theme_color</item>
-    <item name="android:colorPrimaryDark">@color/dialer_theme_color_dark</item>
-
-    <item name="android:statusBarColor">@android:color/transparent</item>
-    <item name="android:navigationBarColor">@android:color/transparent</item>
-    <item name="android:windowDrawsSystemBarBackgrounds">true</item>
-
-    <item name="dialpad_key_button_touch_tint">@color/incall_dialpad_touch_tint</item>
-    <item name="dialpad_style">@style/InCallDialpad</item>
-    <item name="android:windowAnimationStyle">@null</item>
-    <item name="android:alertDialogTheme">@style/AlertDialogTheme</item>
-
-    <item name="android:windowBackground">@drawable/incall_background_gradient</item>
-    <item name="android:windowShowWallpaper">true</item>
-  </style>
-
-  <style name="Theme.InCallScreen.ManageConference" parent="DialerThemeBase">
-  </style>
-
-  <style name="InCallDialpad" parent="Dialpad.Light">
-    <item name="dialpad_key_number_margin_bottom">
-      @dimen/incall_dialpad_key_number_margin_bottom
-    </item>
-    <item name="dialpad_digits_adjustable_text_size">
-      @dimen/incall_dialpad_digits_adjustable_text_size
-    </item>
-    <item name="dialpad_digits_adjustable_height">
-      @dimen/incall_dialpad_digits_adjustable_height
-    </item>
-    <item name="dialpad_key_letters_size_for_dual_alphabets">
-      @dimen/incall_dialpad_key_letters_size_for_dual_alphabets
-    </item>
-    <item name="dialpad_key_letters_size_for_single_alphabet">
-      @dimen/incall_dialpad_key_letters_size_for_single_alphabet
-    </item>
-    <item name="dialpad_key_numbers_size">
-      @dimen/incall_dialpad_key_numbers_size
-    </item>
-    <item name="dialpad_end_key_spacing">
-      @dimen/incall_end_call_spacing
-    </item>
-    <item name="dialpad_elevation">10dp</item>
-  </style>
-
-  <style name="AfterCallNotificationTheme" parent="@android:style/Theme.Material.Light.Dialog">
-    <!-- This colorAccent is to style checkboxes in the dialogs -->
-    <item name="colorAccent">@color/dialer_theme_color</item>
-    <!-- This is needed to make any alert dialogs in this activity take up minimum space -->
-    <item name="android:alertDialogTheme">@style/AfterCallDialogStyle</item>
-  </style>
-
-  <style name="AfterCallDialogStyle" parent="@android:style/Theme.Material.Light.Dialog">
-    <!-- This colorAccent is to style text in the dialogs -->
-    <item name="android:colorAccent">@color/dialer_theme_color</item>
-  </style>
-
-  <style name="Theme.Incall.DialogHolder" parent="Theme.AppCompat.Translucent">
-    <item name="android:windowBackground">@android:color/transparent</item>
-    <item name="android:windowActivityTransitions">false</item>
-
-    <item name="android:statusBarColor">@android:color/transparent</item>
-    <item name="android:navigationBarColor">@android:color/transparent</item>
-    <item name="android:windowDrawsSystemBarBackgrounds">true</item>
-  </style>
-
-</resources>
diff --git a/java/com/android/incallui/ringtone/DialerRingtoneManager.java b/java/com/android/incallui/ringtone/DialerRingtoneManager.java
index 49badf5..777133e 100644
--- a/java/com/android/incallui/ringtone/DialerRingtoneManager.java
+++ b/java/com/android/incallui/ringtone/DialerRingtoneManager.java
@@ -18,13 +18,11 @@
 
 import android.content.ContentResolver;
 import android.net.Uri;
-import android.os.Build.VERSION;
-import android.os.Build.VERSION_CODES;
 import android.provider.Settings;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import com.android.incallui.call.CallList;
-import com.android.incallui.call.DialerCall.State;
+import com.android.incallui.call.state.DialerCallState;
 import java.util.Objects;
 
 /**
@@ -46,7 +44,7 @@
    * Creates the DialerRingtoneManager with the given {@link InCallTonePlayer}.
    *
    * @param inCallTonePlayer the tone player used to play in-call tones.
-   * @param callList the CallList used to check for {@link State#CALL_WAITING}
+   * @param callList the CallList used to check for {@link DialerCallState#CALL_WAITING}
    * @throws NullPointerException if inCallTonePlayer or callList are null
    */
   public DialerRingtoneManager(
@@ -56,8 +54,8 @@
   }
 
   /**
-   * Determines if a ringtone should be played for the given call state (see {@link State}) and
-   * {@link Uri}.
+   * Determines if a ringtone should be played for the given call state (see {@link
+   * DialerCallState}) and {@link Uri}.
    *
    * @param callState the call state for the call being checked.
    * @param ringtoneUri the ringtone to potentially play.
@@ -65,7 +63,7 @@
    */
   public boolean shouldPlayRingtone(int callState, @Nullable Uri ringtoneUri) {
     return isDialerRingingEnabled()
-        && translateCallStateForCallWaiting(callState) == State.INCOMING
+        && translateCallStateForCallWaiting(callState) == DialerCallState.INCOMING
         && ringtoneUri != null;
   }
 
@@ -81,34 +79,34 @@
   }
 
   /**
-   * The incoming callState is never set as {@link State#CALL_WAITING} because {@link
+   * The incoming callState is never set as {@link DialerCallState#CALL_WAITING} because {@link
    * DialerCall#translateState(int)} doesn't account for that case, check for it here
    */
   private int translateCallStateForCallWaiting(int callState) {
-    if (callState != State.INCOMING) {
+    if (callState != DialerCallState.INCOMING) {
       return callState;
     }
-    return callList.getActiveCall() == null ? State.INCOMING : State.CALL_WAITING;
+    return callList.getActiveCall() == null
+        ? DialerCallState.INCOMING
+        : DialerCallState.CALL_WAITING;
   }
 
   private boolean isDialerRingingEnabled() {
-    boolean enabledFlag =
-        isDialerRingingEnabledForTesting != null
-            ? isDialerRingingEnabledForTesting
-            : IS_DIALER_RINGING_ENABLED;
-    return VERSION.SDK_INT >= VERSION_CODES.N && enabledFlag;
+    return isDialerRingingEnabledForTesting != null
+        ? isDialerRingingEnabledForTesting
+        : IS_DIALER_RINGING_ENABLED;
   }
 
   /**
    * Determines if a call waiting tone should be played for the the given call state (see {@link
-   * State}).
+   * DialerCallState}).
    *
    * @param callState the call state for the call being checked.
    * @return {@code true} if the call waiting tone should be played, {@code false} otherwise.
    */
   public boolean shouldPlayCallWaitingTone(int callState) {
     return isDialerRingingEnabled()
-        && translateCallStateForCallWaiting(callState) == State.CALL_WAITING
+        && translateCallStateForCallWaiting(callState) == DialerCallState.CALL_WAITING
         && !inCallTonePlayer.isPlayingTone();
   }
 
diff --git a/java/com/android/incallui/rtt/impl/AdvisoryViewHolder.java b/java/com/android/incallui/rtt/impl/AdvisoryViewHolder.java
new file mode 100644
index 0000000..8f081be
--- /dev/null
+++ b/java/com/android/incallui/rtt/impl/AdvisoryViewHolder.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.incallui.rtt.impl;
+
+import android.support.annotation.NonNull;
+import android.support.v7.widget.RecyclerView.ViewHolder;
+import android.view.View;
+
+/** ViewHolder class for RTT advisory text. */
+public class AdvisoryViewHolder extends ViewHolder {
+
+  public AdvisoryViewHolder(@NonNull View itemView) {
+    super(itemView);
+  }
+}
diff --git a/java/com/android/incallui/rtt/impl/AudioSelectMenu.java b/java/com/android/incallui/rtt/impl/AudioSelectMenu.java
new file mode 100644
index 0000000..1c83637
--- /dev/null
+++ b/java/com/android/incallui/rtt/impl/AudioSelectMenu.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.incallui.rtt.impl;
+
+import android.content.Context;
+import android.telecom.CallAudioState;
+import android.view.View;
+import android.widget.PopupWindow;
+import com.android.incallui.incall.protocol.InCallButtonUiDelegate;
+
+/** Audio select menu for RTT call. */
+public class AudioSelectMenu extends PopupWindow {
+
+  private final InCallButtonUiDelegate inCallButtonUiDelegate;
+  private final OnButtonClickListener onButtonClickListener;
+  private final RttCheckableButton bluetoothButton;
+  private final RttCheckableButton speakerButton;
+  private final RttCheckableButton headsetButton;
+  private final RttCheckableButton earpieceButton;
+
+  interface OnButtonClickListener {
+    void onBackPressed();
+  }
+
+  AudioSelectMenu(
+      Context context,
+      InCallButtonUiDelegate inCallButtonUiDelegate,
+      OnButtonClickListener onButtonClickListener) {
+    super(context, null, 0, R.style.OverflowMenu);
+    this.inCallButtonUiDelegate = inCallButtonUiDelegate;
+    this.onButtonClickListener = onButtonClickListener;
+    View view = View.inflate(context, R.layout.audio_route, null);
+    setContentView(view);
+    setOnDismissListener(this::dismiss);
+    setFocusable(true);
+    setWidth(context.getResources().getDimensionPixelSize(R.dimen.rtt_overflow_menu_width));
+    view.findViewById(R.id.audioroute_back)
+        .setOnClickListener(
+            v -> {
+              dismiss();
+              this.onButtonClickListener.onBackPressed();
+            });
+    CallAudioState audioState = inCallButtonUiDelegate.getCurrentAudioState();
+    bluetoothButton = view.findViewById(R.id.audioroute_bluetooth);
+    speakerButton = view.findViewById(R.id.audioroute_speaker);
+    headsetButton = view.findViewById(R.id.audioroute_headset);
+    earpieceButton = view.findViewById(R.id.audioroute_earpiece);
+    initItem(bluetoothButton, CallAudioState.ROUTE_BLUETOOTH, audioState);
+    initItem(speakerButton, CallAudioState.ROUTE_SPEAKER, audioState);
+    initItem(headsetButton, CallAudioState.ROUTE_WIRED_HEADSET, audioState);
+    initItem(earpieceButton, CallAudioState.ROUTE_EARPIECE, audioState);
+  }
+
+  private void initItem(RttCheckableButton item, final int itemRoute, CallAudioState audioState) {
+    if ((audioState.getSupportedRouteMask() & itemRoute) == 0) {
+      item.setVisibility(View.GONE);
+    } else if (audioState.getRoute() == itemRoute) {
+      item.setChecked(true);
+    }
+    item.setOnClickListener(
+        (v) -> {
+          inCallButtonUiDelegate.setAudioRoute(itemRoute);
+        });
+  }
+
+  void setAudioState(CallAudioState audioState) {
+    bluetoothButton.setChecked(audioState.getRoute() == CallAudioState.ROUTE_BLUETOOTH);
+    speakerButton.setChecked(audioState.getRoute() == CallAudioState.ROUTE_SPEAKER);
+    headsetButton.setChecked(audioState.getRoute() == CallAudioState.ROUTE_WIRED_HEADSET);
+    earpieceButton.setChecked(audioState.getRoute() == CallAudioState.ROUTE_EARPIECE);
+  }
+}
diff --git a/java/com/android/incallui/rtt/impl/RttChatAdapter.java b/java/com/android/incallui/rtt/impl/RttChatAdapter.java
index 6983718..1603778 100644
--- a/java/com/android/incallui/rtt/impl/RttChatAdapter.java
+++ b/java/com/android/incallui/rtt/impl/RttChatAdapter.java
@@ -17,28 +17,56 @@
 package com.android.incallui.rtt.impl;
 
 import android.content.Context;
+import android.graphics.drawable.Drawable;
+import android.support.annotation.IntDef;
+import android.support.annotation.Nullable;
 import android.support.v7.widget.RecyclerView;
+import android.support.v7.widget.RecyclerView.ViewHolder;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import com.android.dialer.common.LogUtil;
+import com.android.dialer.rtt.RttTranscript;
+import com.android.dialer.rtt.RttTranscriptMessage;
+import com.android.incallui.rtt.protocol.RttChatMessage;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
 /** Adapter class for holding RTT chat data. */
-public class RttChatAdapter extends RecyclerView.Adapter<RttChatMessageViewHolder> {
+public class RttChatAdapter extends RecyclerView.Adapter<ViewHolder> {
+
+  /** IntDef for the different types of rows that can be shown in the call log. */
+  @Retention(RetentionPolicy.SOURCE)
+  @IntDef({
+    RowType.ADVISORY,
+    RowType.MESSAGE,
+  })
+  @interface RowType {
+    /** The transcript advisory message. */
+    int ADVISORY = 1;
+
+    /** RTT chat message. */
+    int MESSAGE = 2;
+  }
+
+  private static final int POSITION_ADVISORY = 0;
+
+  private Drawable avatarDrawable;
 
   interface MessageListener {
-    void newMessageAdded();
+    void onUpdateRemoteMessage(int position);
+
+    void onUpdateLocalMessage(int position);
   }
 
   private final Context context;
-  private final List<RttChatMessage> rttMessages = new ArrayList<>();
+  private List<RttChatMessage> rttMessages = new ArrayList<>();
   private int lastIndexOfLocalMessage = -1;
-  private int lastIndexOfRemoteMessage = -1;
   private final MessageListener messageListener;
+  private boolean shouldShowAdvisory;
 
   RttChatAdapter(Context context, MessageListener listener) {
     this.context = context;
@@ -46,55 +74,54 @@
   }
 
   @Override
-  public RttChatMessageViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+  public ViewHolder onCreateViewHolder(ViewGroup parent, @RowType int viewType) {
     LayoutInflater layoutInflater = LayoutInflater.from(context);
-    View view = layoutInflater.inflate(R.layout.rtt_chat_list_item, parent, false);
-    return new RttChatMessageViewHolder(view);
+    switch (viewType) {
+      case RowType.ADVISORY:
+        View view = layoutInflater.inflate(R.layout.rtt_transcript_advisory, parent, false);
+        return new AdvisoryViewHolder(view);
+      case RowType.MESSAGE:
+        view = layoutInflater.inflate(R.layout.rtt_chat_list_item, parent, false);
+        return new RttChatMessageViewHolder(view);
+      default:
+        throw new RuntimeException("Unknown row type.");
+    }
   }
 
   @Override
   public int getItemViewType(int position) {
-    return super.getItemViewType(position);
+    if (shouldShowAdvisory && position == POSITION_ADVISORY) {
+      return RowType.ADVISORY;
+    } else {
+      return RowType.MESSAGE;
+    }
   }
 
   @Override
-  public void onBindViewHolder(RttChatMessageViewHolder rttChatMessageViewHolder, int i) {
-    boolean isSameGroup = false;
-    if (i > 0) {
-      isSameGroup = rttMessages.get(i).isRemote == rttMessages.get(i - 1).isRemote;
+  public void onBindViewHolder(ViewHolder viewHolder, int itemPosition) {
+    switch (getItemViewType(itemPosition)) {
+      case RowType.ADVISORY:
+        return;
+      case RowType.MESSAGE:
+        RttChatMessageViewHolder rttChatMessageViewHolder = (RttChatMessageViewHolder) viewHolder;
+        int messagePosition = toMessagePosition(itemPosition);
+        boolean isSameGroup = false;
+        if (messagePosition > 0) {
+          isSameGroup =
+              rttMessages.get(messagePosition).isRemote
+                  == rttMessages.get(messagePosition - 1).isRemote;
+        }
+        rttChatMessageViewHolder.setMessage(
+            rttMessages.get(messagePosition), isSameGroup, avatarDrawable);
+        return;
+      default:
+        throw new RuntimeException("Unknown row type.");
     }
-    rttChatMessageViewHolder.setMessage(rttMessages.get(i), isSameGroup);
   }
 
   @Override
   public int getItemCount() {
-    return rttMessages.size();
-  }
-
-  private void updateCurrentRemoteMessage(String newText) {
-    RttChatMessage rttChatMessage = null;
-    if (lastIndexOfRemoteMessage >= 0) {
-      rttChatMessage = rttMessages.get(lastIndexOfRemoteMessage);
-    }
-    RttChatMessage[] newMessages = RttChatMessage.getRemoteRttChatMessage(rttChatMessage, newText);
-
-    if (rttChatMessage == null) {
-      lastIndexOfRemoteMessage = rttMessages.size();
-      rttMessages.add(lastIndexOfRemoteMessage, newMessages[0]);
-      rttMessages.addAll(Arrays.asList(newMessages).subList(1, newMessages.length));
-      notifyItemRangeInserted(lastIndexOfRemoteMessage, newMessages.length);
-      lastIndexOfRemoteMessage = rttMessages.size() - 1;
-    } else {
-      rttMessages.set(lastIndexOfRemoteMessage, newMessages[0]);
-      int lastIndex = rttMessages.size();
-      rttMessages.addAll(Arrays.asList(newMessages).subList(1, newMessages.length));
-
-      notifyItemChanged(lastIndexOfRemoteMessage);
-      notifyItemRangeInserted(lastIndex, newMessages.length);
-    }
-    if (rttMessages.get(lastIndexOfRemoteMessage).isFinished()) {
-      lastIndexOfRemoteMessage = -1;
-    }
+    return shouldShowAdvisory ? rttMessages.size() + 1 : rttMessages.size();
   }
 
   private void updateCurrentLocalMessage(String newMessage) {
@@ -107,46 +134,138 @@
       rttChatMessage.append(newMessage);
       rttMessages.add(rttChatMessage);
       lastIndexOfLocalMessage = rttMessages.size() - 1;
-      notifyItemInserted(lastIndexOfLocalMessage);
+      notifyItemInserted(toItemPosition(lastIndexOfLocalMessage));
     } else {
       rttChatMessage.append(newMessage);
       // Clear empty message bubble.
       if (TextUtils.isEmpty(rttChatMessage.getContent())) {
         rttMessages.remove(lastIndexOfLocalMessage);
-        notifyItemRemoved(lastIndexOfLocalMessage);
-        if (lastIndexOfRemoteMessage > lastIndexOfLocalMessage) {
-          lastIndexOfRemoteMessage -= 1;
-        }
+        notifyItemRemoved(toItemPosition(lastIndexOfLocalMessage));
         lastIndexOfLocalMessage = -1;
       } else {
-        notifyItemChanged(lastIndexOfLocalMessage);
+        notifyItemChanged(toItemPosition(lastIndexOfLocalMessage));
       }
     }
   }
 
+  private int toMessagePosition(int itemPosition) {
+    if (shouldShowAdvisory) {
+      return itemPosition - 1;
+    } else {
+      return itemPosition;
+    }
+  }
+
+  // Converts position in message list into item position in adapter.
+  private int toItemPosition(int messagePosition) {
+    if (messagePosition < 0) {
+      return messagePosition;
+    }
+    if (shouldShowAdvisory) {
+      return messagePosition + 1;
+    } else {
+      return messagePosition;
+    }
+  }
+
+  private void updateCurrentRemoteMessage(String newMessage) {
+    RttChatMessage.updateRemoteRttChatMessage(rttMessages, newMessage);
+    lastIndexOfLocalMessage = RttChatMessage.getLastIndexLocalMessage(rttMessages);
+    notifyDataSetChanged();
+  }
+
   void addLocalMessage(String message) {
-    LogUtil.enterBlock("RttChatAdapater.addLocalMessage");
     updateCurrentLocalMessage(message);
     if (messageListener != null) {
-      messageListener.newMessageAdded();
+      messageListener.onUpdateLocalMessage(toItemPosition(lastIndexOfLocalMessage));
     }
   }
 
   void submitLocalMessage() {
     LogUtil.enterBlock("RttChatAdapater.submitLocalMessage");
     rttMessages.get(lastIndexOfLocalMessage).finish();
-    notifyItemChanged(lastIndexOfLocalMessage);
+    notifyItemChanged(toItemPosition(lastIndexOfLocalMessage));
     lastIndexOfLocalMessage = -1;
   }
 
+  String computeChangeOfLocalMessage(String newMessage) {
+    RttChatMessage rttChatMessage = null;
+    if (lastIndexOfLocalMessage >= 0) {
+      rttChatMessage = rttMessages.get(lastIndexOfLocalMessage);
+    }
+    if (rttChatMessage == null || rttChatMessage.isFinished()) {
+      return newMessage;
+    } else {
+      return RttChatMessage.computeChangedString(rttChatMessage.getContent(), newMessage);
+    }
+  }
+
   void addRemoteMessage(String message) {
-    LogUtil.enterBlock("RttChatAdapater.addRemoteMessage");
     if (TextUtils.isEmpty(message)) {
       return;
     }
     updateCurrentRemoteMessage(message);
     if (messageListener != null) {
-      messageListener.newMessageAdded();
+      messageListener.onUpdateRemoteMessage(
+          toItemPosition(RttChatMessage.getLastIndexRemoteMessage(rttMessages)));
     }
   }
+
+  void hideAdvisory() {
+    shouldShowAdvisory = false;
+    notifyItemRemoved(POSITION_ADVISORY);
+  }
+
+  void showAdvisory() {
+    shouldShowAdvisory = true;
+    notifyItemInserted(POSITION_ADVISORY);
+  }
+
+  /**
+   * Retrieve last local message and update the index. This is used when deleting to previous
+   * message bubble.
+   */
+  @Nullable
+  String retrieveLastLocalMessage() {
+    lastIndexOfLocalMessage = RttChatMessage.getLastIndexLocalMessage(rttMessages);
+    if (lastIndexOfLocalMessage >= 0) {
+      RttChatMessage rttChatMessage = rttMessages.get(lastIndexOfLocalMessage);
+      rttChatMessage.unfinish();
+      return rttChatMessage.getContent();
+    } else {
+      return null;
+    }
+  }
+
+  void setAvatarDrawable(Drawable drawable) {
+    avatarDrawable = drawable;
+  }
+
+  /**
+   * Restores RTT chat history from {@code RttTranscript}.
+   *
+   * @param rttTranscript transcript saved previously.
+   * @return last unfinished local message, return null if there is no current editing local
+   *     message.
+   */
+  @Nullable
+  String onRestoreRttChat(RttTranscript rttTranscript) {
+    LogUtil.enterBlock("RttChatAdapater.onRestoreRttChat");
+    rttMessages = RttChatMessage.fromTranscript(rttTranscript);
+    lastIndexOfLocalMessage = RttChatMessage.getLastIndexLocalMessage(rttMessages);
+    notifyDataSetChanged();
+    if (lastIndexOfLocalMessage < 0) {
+      return null;
+    }
+    RttChatMessage message = rttMessages.get(lastIndexOfLocalMessage);
+    if (!message.isFinished()) {
+      return message.getContent();
+    } else {
+      return null;
+    }
+  }
+
+  List<RttTranscriptMessage> getRttTranscriptMessageList() {
+    return RttChatMessage.toTranscriptMessageList(rttMessages);
+  }
 }
diff --git a/java/com/android/incallui/rtt/impl/RttChatFragment.java b/java/com/android/incallui/rtt/impl/RttChatFragment.java
index 396b89e..988f20c 100644
--- a/java/com/android/incallui/rtt/impl/RttChatFragment.java
+++ b/java/com/android/incallui/rtt/impl/RttChatFragment.java
@@ -17,11 +17,13 @@
 package com.android.incallui.rtt.impl;
 
 import android.app.Activity;
+import android.content.Context;
 import android.os.Bundle;
 import android.os.SystemClock;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentTransaction;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.RecyclerView.OnScrollListener;
@@ -37,7 +39,6 @@
 import android.view.Window;
 import android.view.accessibility.AccessibilityEvent;
 import android.view.inputmethod.EditorInfo;
-import android.view.inputmethod.InputMethodManager;
 import android.widget.Chronometer;
 import android.widget.EditText;
 import android.widget.ImageButton;
@@ -46,9 +47,18 @@
 import com.android.dialer.common.Assert;
 import com.android.dialer.common.FragmentUtils;
 import com.android.dialer.common.LogUtil;
-import com.android.incallui.audioroute.AudioRouteSelectorDialogFragment;
+import com.android.dialer.common.UiUtil;
+import com.android.dialer.lettertile.LetterTileDrawable;
+import com.android.dialer.logging.DialerImpression;
+import com.android.dialer.logging.Logger;
+import com.android.dialer.rtt.RttTranscript;
+import com.android.dialer.rtt.RttTranscriptMessage;
+import com.android.dialer.util.DrawableConverter;
 import com.android.incallui.audioroute.AudioRouteSelectorDialogFragment.AudioRouteSelectorPresenter;
-import com.android.incallui.call.DialerCall.State;
+import com.android.incallui.call.state.DialerCallState;
+import com.android.incallui.hold.OnHoldFragment;
+import com.android.incallui.incall.protocol.ContactPhotoType;
+import com.android.incallui.incall.protocol.InCallButtonIds;
 import com.android.incallui.incall.protocol.InCallButtonUi;
 import com.android.incallui.incall.protocol.InCallButtonUiDelegate;
 import com.android.incallui.incall.protocol.InCallButtonUiDelegateFactory;
@@ -63,6 +73,7 @@
 import com.android.incallui.rtt.protocol.RttCallScreen;
 import com.android.incallui.rtt.protocol.RttCallScreenDelegate;
 import com.android.incallui.rtt.protocol.RttCallScreenDelegateFactory;
+import java.util.List;
 
 /** RTT chat fragment to show chat bubbles. */
 public class RttChatFragment extends Fragment
@@ -82,15 +93,6 @@
   private ImageButton submitButton;
   private boolean isClearingInput;
 
-  private final OnScrollListener onScrollListener =
-      new OnScrollListener() {
-        @Override
-        public void onScrolled(RecyclerView recyclerView, int dx, int dy) {
-          if (dy < 0) {
-            hideKeyboard();
-          }
-        }
-      };
   private InCallScreenDelegate inCallScreenDelegate;
   private RttCallScreenDelegate rttCallScreenDelegate;
   private InCallButtonUiDelegate inCallButtonUiDelegate;
@@ -99,6 +101,13 @@
   private Chronometer chronometer;
   private boolean isTimerStarted;
   private RttOverflowMenu overflowMenu;
+  private SecondaryInfo savedSecondaryInfo;
+  private TextView statusBanner;
+  private PrimaryInfo primaryInfo = PrimaryInfo.empty();
+  private PrimaryCallState primaryCallState = PrimaryCallState.empty();
+  private boolean isUserScrolling;
+  private boolean shouldAutoScrolling;
+  private AudioSelectMenu audioSelectMenu;
 
   /**
    * Create a new instance of RttChatFragment.
@@ -124,6 +133,11 @@
     if (savedInstanceState != null) {
       inCallButtonUiDelegate.onRestoreInstanceState(savedInstanceState);
     }
+    inCallScreenDelegate =
+        FragmentUtils.getParentUnsafe(this, InCallScreenDelegateFactory.class)
+            .newInCallScreenDelegate();
+    // Prevent updating local message until UI is ready.
+    isClearingInput = true;
   }
 
   @Override
@@ -131,9 +145,6 @@
     super.onViewCreated(view, bundle);
     LogUtil.i("RttChatFragment.onViewCreated", null);
 
-    inCallScreenDelegate =
-        FragmentUtils.getParentUnsafe(this, InCallScreenDelegateFactory.class)
-            .newInCallScreenDelegate();
     rttCallScreenDelegate =
         FragmentUtils.getParentUnsafe(this, RttCallScreenDelegateFactory.class)
             .newRttCallScreenDelegate(this);
@@ -145,14 +156,44 @@
     inCallButtonUiDelegate.onInCallButtonUiReady(this);
   }
 
+  @Override
+  public List<RttTranscriptMessage> getRttTranscriptMessageList() {
+    return adapter.getRttTranscriptMessageList();
+  }
+
   @Nullable
   @Override
   public View onCreateView(
       LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState) {
     View view = inflater.inflate(R.layout.frag_rtt_chat, container, false);
+    view.setSystemUiVisibility(
+        View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
+            | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
+            | View.SYSTEM_UI_FLAG_LAYOUT_STABLE
+            | View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR);
     editText = view.findViewById(R.id.rtt_chat_input);
     editText.setOnEditorActionListener(this);
     editText.addTextChangedListener(this);
+
+    editText.setOnKeyListener(
+        (v, keyCode, event) -> {
+          // This is only triggered when input method doesn't handle delete key, which usually means
+          // the current input box is empty.
+          // On non-English keyboard delete key could be passed here so we still need to check if
+          // the input box is empty.
+          if (keyCode == KeyEvent.KEYCODE_DEL
+              && event.getAction() == KeyEvent.ACTION_DOWN
+              && TextUtils.isEmpty(editText.getText())) {
+            String lastMessage = adapter.retrieveLastLocalMessage();
+            if (lastMessage != null) {
+              resumeInput(lastMessage);
+              rttCallScreenDelegate.onLocalMessage("\b");
+              return true;
+            }
+            return false;
+          }
+          return false;
+        });
     recyclerView = view.findViewById(R.id.rtt_recycler_view);
     LinearLayoutManager layoutManager = new LinearLayoutManager(getContext());
     layoutManager.setStackFromEnd(true);
@@ -160,15 +201,37 @@
     recyclerView.setHasFixedSize(false);
     adapter = new RttChatAdapter(getContext(), this);
     recyclerView.setAdapter(adapter);
-    recyclerView.addOnScrollListener(onScrollListener);
+    recyclerView.addOnScrollListener(
+        new OnScrollListener() {
+          @Override
+          public void onScrollStateChanged(RecyclerView recyclerView, int i) {
+            if (i == RecyclerView.SCROLL_STATE_DRAGGING) {
+              isUserScrolling = true;
+            } else if (i == RecyclerView.SCROLL_STATE_IDLE) {
+              isUserScrolling = false;
+              // Auto scrolling for new messages should be resumed if it's scrolled to bottom.
+              shouldAutoScrolling = !recyclerView.canScrollVertically(1);
+            }
+          }
+
+          @Override
+          public void onScrolled(RecyclerView recyclerView, int dx, int dy) {
+            if (dy < 0 && isUserScrolling) {
+              UiUtil.hideKeyboardFrom(getContext(), editText);
+            }
+          }
+        });
+
     submitButton = view.findViewById(R.id.rtt_chat_submit_button);
     submitButton.setOnClickListener(
         v -> {
+          Logger.get(getContext()).logImpression(DialerImpression.Type.RTT_SEND_BUTTON_CLICKED);
           adapter.submitLocalMessage();
-          isClearingInput = true;
-          editText.setText("");
-          isClearingInput = false;
+          resumeInput("");
           rttCallScreenDelegate.onLocalMessage(Constants.BUBBLE_BREAKER);
+          // Auto scrolling for new messages should be resumed since user has submit current
+          // message.
+          shouldAutoScrolling = true;
         });
     submitButton.setEnabled(false);
     endCallButton = view.findViewById(R.id.rtt_end_call_button);
@@ -178,19 +241,30 @@
           inCallButtonUiDelegate.onEndCallClicked();
         });
 
-    overflowMenu = new RttOverflowMenu(getContext(), inCallButtonUiDelegate);
+    overflowMenu = new RttOverflowMenu(getContext(), inCallButtonUiDelegate, inCallScreenDelegate);
     view.findViewById(R.id.rtt_overflow_button)
-        .setOnClickListener(v -> overflowMenu.showAtLocation(v, Gravity.TOP | Gravity.RIGHT, 0, 0));
+        .setOnClickListener(
+            v -> {
+              // Hide keyboard when opening overflow menu. This is alternative solution since hiding
+              // keyboard after the menu is open or dialpad is shown doesn't work.
+              UiUtil.hideKeyboardFrom(getContext(), editText);
+              overflowMenu.showAtLocation(v, Gravity.TOP | Gravity.RIGHT, 0, 0);
+            });
 
     nameTextView = view.findViewById(R.id.rtt_name_or_number);
     chronometer = view.findViewById(R.id.rtt_timer);
+    statusBanner = view.findViewById(R.id.rtt_status_banner);
     return view;
   }
 
   @Override
   public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-    if (actionId == EditorInfo.IME_ACTION_DONE) {
-      submitButton.performClick();
+    if (actionId == EditorInfo.IME_ACTION_SEND) {
+      if (!TextUtils.isEmpty(editText.getText())) {
+        Logger.get(getContext())
+            .logImpression(DialerImpression.Type.RTT_KEYBOARD_SEND_BUTTON_CLICKED);
+        submitButton.performClick();
+      }
       return true;
     }
     return false;
@@ -204,7 +278,7 @@
     if (isClearingInput) {
       return;
     }
-    String messageToAppend = RttChatMessage.getChangedString(s, start, before, count);
+    String messageToAppend = adapter.computeChangeOfLocalMessage(s.toString());
     if (!TextUtils.isEmpty(messageToAppend)) {
       adapter.addLocalMessage(messageToAppend);
       rttCallScreenDelegate.onLocalMessage(messageToAppend);
@@ -234,14 +308,43 @@
   }
 
   @Override
-  public void newMessageAdded() {
-    recyclerView.smoothScrollToPosition(adapter.getItemCount());
+  public void onUpdateLocalMessage(int position) {
+    if (position < 0) {
+      return;
+    }
+    recyclerView.smoothScrollToPosition(position);
+  }
+
+  @Override
+  public void onUpdateRemoteMessage(int position) {
+    if (position < 0) {
+      return;
+    }
+    if (shouldAutoScrolling) {
+      recyclerView.smoothScrollToPosition(position);
+    }
+  }
+
+  @Override
+  public void onRestoreRttChat(RttTranscript rttTranscript) {
+    String unfinishedLocalMessage = adapter.onRestoreRttChat(rttTranscript);
+    if (unfinishedLocalMessage != null) {
+      resumeInput(unfinishedLocalMessage);
+    }
+  }
+
+  private void resumeInput(String input) {
+    isClearingInput = true;
+    editText.setText(input);
+    editText.setSelection(input.length());
+    isClearingInput = false;
   }
 
   @Override
   public void onStart() {
     LogUtil.enterBlock("RttChatFragment.onStart");
     super.onStart();
+    isClearingInput = false;
     onRttScreenStart();
   }
 
@@ -249,32 +352,29 @@
   public void onStop() {
     LogUtil.enterBlock("RttChatFragment.onStop");
     super.onStop();
+    isClearingInput = true;
     if (overflowMenu.isShowing()) {
       overflowMenu.dismiss();
     }
     onRttScreenStop();
   }
 
-  private void hideKeyboard() {
-    InputMethodManager inputMethodManager = getContext().getSystemService(InputMethodManager.class);
-    if (inputMethodManager.isAcceptingText()) {
-      inputMethodManager.hideSoftInputFromWindow(
-          getActivity().getCurrentFocus().getWindowToken(), 0);
-    }
-  }
-
   @Override
   public void onRttScreenStart() {
+    inCallButtonUiDelegate.refreshMuteState();
     rttCallScreenDelegate.onRttCallScreenUiReady();
     Activity activity = getActivity();
     Window window = getActivity().getWindow();
     window.setStatusBarColor(activity.getColor(R.color.rtt_status_bar_color));
     window.setNavigationBarColor(activity.getColor(R.color.rtt_navigation_bar_color));
-    window.getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR);
   }
 
   @Override
   public void onRttScreenStop() {
+    Activity activity = getActivity();
+    Window window = getActivity().getWindow();
+    window.setStatusBarColor(activity.getColor(android.R.color.transparent));
+    window.setNavigationBarColor(activity.getColor(android.R.color.transparent));
     rttCallScreenDelegate.onRttCallScreenUiUnready();
   }
 
@@ -292,15 +392,72 @@
   public void setPrimary(@NonNull PrimaryInfo primaryInfo) {
     LogUtil.i("RttChatFragment.setPrimary", primaryInfo.toString());
     nameTextView.setText(primaryInfo.name());
+    updateAvatar(primaryInfo);
+    this.primaryInfo = primaryInfo;
+  }
+
+  private void updateAvatar(PrimaryInfo primaryInfo) {
+    boolean hasPhoto =
+        primaryInfo.photo() != null && primaryInfo.photoType() == ContactPhotoType.CONTACT;
+    // Contact has a photo, don't render a letter tile.
+    if (hasPhoto) {
+      int avatarSize = getResources().getDimensionPixelSize(R.dimen.rtt_avatar_size);
+      adapter.setAvatarDrawable(
+          DrawableConverter.getRoundedDrawable(
+              getContext(), primaryInfo.photo(), avatarSize, avatarSize));
+    } else {
+      LetterTileDrawable letterTile = new LetterTileDrawable(getResources());
+      letterTile.setCanonicalDialerLetterTileDetails(
+          primaryInfo.name(),
+          primaryInfo.contactInfoLookupKey(),
+          LetterTileDrawable.SHAPE_CIRCLE,
+          LetterTileDrawable.getContactTypeFromPrimitives(
+              primaryCallState.isVoiceMailNumber(),
+              primaryInfo.isSpam(),
+              primaryCallState.isBusinessNumber(),
+              primaryInfo.numberPresentation(),
+              primaryCallState.isConference()));
+      adapter.setAvatarDrawable(letterTile);
+    }
   }
 
   @Override
-  public void setSecondary(@NonNull SecondaryInfo secondaryInfo) {}
+  public void onAttach(Context context) {
+    super.onAttach(context);
+    if (savedSecondaryInfo != null) {
+      setSecondary(savedSecondaryInfo);
+    }
+  }
+
+  @Override
+  public void setSecondary(@NonNull SecondaryInfo secondaryInfo) {
+    LogUtil.i("RttChatFragment.setSecondary", secondaryInfo.toString());
+    if (!isAdded()) {
+      savedSecondaryInfo = secondaryInfo;
+      return;
+    }
+    savedSecondaryInfo = null;
+    FragmentTransaction transaction = getChildFragmentManager().beginTransaction();
+    Fragment oldBanner = getChildFragmentManager().findFragmentById(R.id.rtt_on_hold_banner);
+    if (secondaryInfo.shouldShow()) {
+      OnHoldFragment onHoldFragment = OnHoldFragment.newInstance(secondaryInfo);
+      onHoldFragment.setPadTopInset(false);
+      transaction.replace(R.id.rtt_on_hold_banner, onHoldFragment);
+    } else {
+      if (oldBanner != null) {
+        transaction.remove(oldBanner);
+      }
+    }
+    transaction.setCustomAnimations(R.anim.abc_slide_in_top, R.anim.abc_slide_out_top);
+    transaction.commitNowAllowingStateLoss();
+    overflowMenu.enableSwitchToSecondaryButton(secondaryInfo.shouldShow());
+  }
 
   @Override
   public void setCallState(@NonNull PrimaryCallState primaryCallState) {
     LogUtil.i("RttChatFragment.setCallState", primaryCallState.toString());
-    if (!isTimerStarted && primaryCallState.state() == State.ACTIVE) {
+    this.primaryCallState = primaryCallState;
+    if (!isTimerStarted && primaryCallState.state() == DialerCallState.ACTIVE) {
       LogUtil.i(
           "RttChatFragment.setCallState", "starting timer with base: %d", chronometer.getBase());
       chronometer.setBase(
@@ -309,7 +466,31 @@
               + SystemClock.elapsedRealtime());
       chronometer.start();
       isTimerStarted = true;
+      editText.setVisibility(View.VISIBLE);
+      submitButton.setVisibility(View.VISIBLE);
+      editText.setFocusableInTouchMode(true);
+      if (editText.requestFocus()) {
+        UiUtil.showKeyboardFrom(getContext(), editText);
+      }
+      adapter.showAdvisory();
     }
+    if (primaryCallState.state() == DialerCallState.DIALING) {
+      showWaitingForJoinBanner();
+    } else {
+      hideWaitingForJoinBanner();
+    }
+    if (primaryCallState.state() == DialerCallState.DISCONNECTED) {
+      rttCallScreenDelegate.onSaveRttTranscript();
+    }
+  }
+
+  private void showWaitingForJoinBanner() {
+    statusBanner.setText(getString(R.string.rtt_status_banner_text, primaryInfo.name()));
+    statusBanner.setVisibility(View.VISIBLE);
+  }
+
+  private void hideWaitingForJoinBanner() {
+    statusBanner.setVisibility(View.GONE);
   }
 
   @Override
@@ -333,11 +514,13 @@
   public void updateInCallScreenColors() {}
 
   @Override
-  public void onInCallScreenDialpadVisibilityChange(boolean isShowing) {}
+  public void onInCallScreenDialpadVisibilityChange(boolean isShowing) {
+    overflowMenu.setDialpadButtonChecked(isShowing);
+  }
 
   @Override
   public int getAnswerAndDialpadContainerResourceId() {
-    return 0;
+    return R.id.incall_dialpad_container;
   }
 
   @Override
@@ -354,7 +537,11 @@
   }
 
   @Override
-  public void showButton(int buttonId, boolean show) {}
+  public void showButton(int buttonId, boolean show) {
+    if (buttonId == InCallButtonIds.BUTTON_SWAP) {
+      overflowMenu.enableSwapCallButton(show);
+    }
+  }
 
   @Override
   public void enableButton(int buttonId, boolean enable) {}
@@ -376,6 +563,9 @@
     LogUtil.i("RttChatFragment.setAudioState", "audioState: " + audioState);
     overflowMenu.setMuteButtonChecked(audioState.isMuted());
     overflowMenu.setAudioState(audioState);
+    if (audioSelectMenu != null) {
+      audioSelectMenu.setAudioState(audioState);
+    }
   }
 
   @Override
@@ -391,8 +581,12 @@
 
   @Override
   public void showAudioRouteSelector() {
-    AudioRouteSelectorDialogFragment.newInstance(inCallButtonUiDelegate.getCurrentAudioState())
-        .show(getChildFragmentManager(), null);
+    audioSelectMenu =
+        new AudioSelectMenu(
+            getContext(),
+            inCallButtonUiDelegate,
+            () -> overflowMenu.showAtLocation(getView(), Gravity.TOP | Gravity.RIGHT, 0, 0));
+    audioSelectMenu.showAtLocation(getView(), Gravity.TOP | Gravity.RIGHT, 0, 0);
   }
 
   @Override
diff --git a/java/com/android/incallui/rtt/impl/RttChatMessage.java b/java/com/android/incallui/rtt/impl/RttChatMessage.java
deleted file mode 100644
index b2974ef..0000000
--- a/java/com/android/incallui/rtt/impl/RttChatMessage.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.incallui.rtt.impl;
-
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.text.TextWatcher;
-import com.android.incallui.rtt.protocol.Constants;
-import com.google.common.base.Splitter;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-/** Message class that holds one RTT chat content. */
-final class RttChatMessage {
-
-  private static final Splitter SPLITTER = Splitter.on(Constants.BUBBLE_BREAKER);
-
-  boolean isRemote;
-  public boolean hasAvatar;
-  private final StringBuilder content = new StringBuilder();
-  private boolean isFinished;
-
-  public boolean isFinished() {
-    return isFinished;
-  }
-
-  public void finish() {
-    isFinished = true;
-  }
-
-  public void append(String text) {
-    for (int i = 0; i < text.length(); i++) {
-      char c = text.charAt(i);
-      if (c != '\b') {
-        content.append(c);
-      } else if (content.length() > 0) {
-        content.deleteCharAt(content.length() - 1);
-      }
-    }
-  }
-
-  public String getContent() {
-    return content.toString();
-  }
-
-  /**
-   * Generates delta change to a text.
-   *
-   * <p>This is used to track text change of input. See more details in {@link
-   * TextWatcher#onTextChanged}
-   *
-   * <p>e.g. "hello world" -> "hello" : "\b\b\b\b\b\b"
-   *
-   * <p>"hello world" -> "hello mom!" : "\b\b\b\b\bmom!"
-   *
-   * <p>"hello world" -> "hello d" : "\b\b\b\b\bd"
-   *
-   * <p>"hello world" -> "hello new world" : "\b\b\b\b\bnew world"
-   */
-  static String getChangedString(CharSequence s, int start, int before, int count) {
-    StringBuilder modify = new StringBuilder();
-    char c = '\b';
-    int oldLength = s.length() - count + before;
-    for (int i = 0; i < oldLength - start; i++) {
-      modify.append(c);
-    }
-    modify.append(s, start, start + count);
-    if (start + count < s.length()) {
-      modify.append(s, start + count, s.length());
-    }
-    return modify.toString();
-  }
-
-  /** Convert remote input text into an array of {@code RttChatMessage}. */
-  static RttChatMessage[] getRemoteRttChatMessage(
-      @Nullable RttChatMessage currentMessage, @NonNull String text) {
-    Iterator<String> splitText = SPLITTER.split(text).iterator();
-    List<RttChatMessage> messageList = new ArrayList<>();
-
-    String firstMessageContent = splitText.next();
-    RttChatMessage firstMessage = currentMessage;
-    if (firstMessage == null) {
-      firstMessage = new RttChatMessage();
-      firstMessage.isRemote = true;
-    }
-    firstMessage.append(firstMessageContent);
-    if (splitText.hasNext() || text.endsWith(Constants.BUBBLE_BREAKER)) {
-      firstMessage.finish();
-    }
-    messageList.add(firstMessage);
-
-    while (splitText.hasNext()) {
-      String singleMessageContent = splitText.next();
-      if (singleMessageContent.isEmpty()) {
-        continue;
-      }
-      RttChatMessage message = new RttChatMessage();
-      message.append(singleMessageContent);
-      message.isRemote = true;
-      if (splitText.hasNext()) {
-        message.finish();
-      }
-      messageList.add(message);
-    }
-
-    return messageList.toArray(new RttChatMessage[0]);
-  }
-}
diff --git a/java/com/android/incallui/rtt/impl/RttChatMessageViewHolder.java b/java/com/android/incallui/rtt/impl/RttChatMessageViewHolder.java
index c88786a..56161ec 100644
--- a/java/com/android/incallui/rtt/impl/RttChatMessageViewHolder.java
+++ b/java/com/android/incallui/rtt/impl/RttChatMessageViewHolder.java
@@ -17,6 +17,7 @@
 package com.android.incallui.rtt.impl;
 
 import android.content.res.Resources;
+import android.graphics.drawable.Drawable;
 import android.support.v7.widget.RecyclerView.ViewHolder;
 import android.view.Gravity;
 import android.view.View;
@@ -24,6 +25,7 @@
 import android.widget.LinearLayout;
 import android.widget.LinearLayout.LayoutParams;
 import android.widget.TextView;
+import com.android.incallui.rtt.protocol.RttChatMessage;
 
 /** ViewHolder class for RTT chat message bubble. */
 public class RttChatMessageViewHolder extends ViewHolder {
@@ -41,7 +43,7 @@
     resources = view.getResources();
   }
 
-  void setMessage(RttChatMessage message, boolean isSameGroup) {
+  void setMessage(RttChatMessage message, boolean isSameGroup, Drawable imageDrawable) {
     messageTextView.setText(message.getContent());
     LinearLayout.LayoutParams params = (LayoutParams) container.getLayoutParams();
     params.gravity = message.isRemote ? Gravity.START : Gravity.END;
@@ -56,7 +58,7 @@
         avatarImageView.setVisibility(View.INVISIBLE);
       } else {
         avatarImageView.setVisibility(View.VISIBLE);
-        avatarImageView.setImageResource(R.drawable.product_logo_avatar_anonymous_white_color_120);
+        avatarImageView.setImageDrawable(imageDrawable);
       }
     } else {
       avatarImageView.setVisibility(View.GONE);
diff --git a/java/com/android/incallui/rtt/impl/RttOverflowMenu.java b/java/com/android/incallui/rtt/impl/RttOverflowMenu.java
index e0916be..e9f9d04 100644
--- a/java/com/android/incallui/rtt/impl/RttOverflowMenu.java
+++ b/java/com/android/incallui/rtt/impl/RttOverflowMenu.java
@@ -21,9 +21,9 @@
 import android.view.View;
 import android.widget.PopupWindow;
 import com.android.incallui.incall.protocol.InCallButtonUiDelegate;
+import com.android.incallui.incall.protocol.InCallScreenDelegate;
 import com.android.incallui.rtt.impl.RttCheckableButton.OnCheckedChangeListener;
 import com.android.incallui.speakerbuttonlogic.SpeakerButtonInfo;
-import com.android.incallui.speakerbuttonlogic.SpeakerButtonInfo.IconSize;
 
 /** Overflow menu for RTT call. */
 public class RttOverflowMenu extends PopupWindow implements OnCheckedChangeListener {
@@ -32,11 +32,19 @@
   private final RttCheckableButton speakerButton;
   private final RttCheckableButton dialpadButton;
   private final RttCheckableButton addCallButton;
+  private final RttCheckableButton swapCallButton;
   private final InCallButtonUiDelegate inCallButtonUiDelegate;
+  private final InCallScreenDelegate inCallScreenDelegate;
+  private boolean isSwitchToSecondaryButtonEnabled;
+  private boolean isSwapCallButtonEnabled;
 
-  RttOverflowMenu(Context context, InCallButtonUiDelegate inCallButtonUiDelegate) {
-    super(context);
+  RttOverflowMenu(
+      Context context,
+      InCallButtonUiDelegate inCallButtonUiDelegate,
+      InCallScreenDelegate inCallScreenDelegate) {
+    super(context, null, 0, R.style.OverflowMenu);
     this.inCallButtonUiDelegate = inCallButtonUiDelegate;
+    this.inCallScreenDelegate = inCallScreenDelegate;
     View view = View.inflate(context, R.layout.overflow_menu, null);
     setContentView(view);
     setOnDismissListener(this::dismiss);
@@ -49,7 +57,17 @@
     dialpadButton = view.findViewById(R.id.menu_keypad);
     dialpadButton.setOnCheckedChangeListener(this);
     addCallButton = view.findViewById(R.id.menu_add_call);
-    addCallButton.setOnCheckedChangeListener(this);
+    addCallButton.setOnClickListener(v -> this.inCallButtonUiDelegate.addCallClicked());
+    swapCallButton = view.findViewById(R.id.menu_swap_call);
+    swapCallButton.setOnClickListener(
+        v -> {
+          if (isSwapCallButtonEnabled) {
+            this.inCallButtonUiDelegate.swapClicked();
+          }
+          if (isSwitchToSecondaryButtonEnabled) {
+            this.inCallScreenDelegate.onSecondaryInfoClicked();
+          }
+        });
   }
 
   @Override
@@ -60,8 +78,6 @@
       inCallButtonUiDelegate.toggleSpeakerphone();
     } else if (button == dialpadButton) {
       inCallButtonUiDelegate.showDialpadClicked(isChecked);
-    } else if (button == addCallButton) {
-      inCallButtonUiDelegate.addCallClicked();
     }
   }
 
@@ -70,9 +86,36 @@
   }
 
   void setAudioState(CallAudioState audioState) {
-    SpeakerButtonInfo info = new SpeakerButtonInfo(audioState, IconSize.SIZE_24_DP);
-    if (info.checkable) {
+    SpeakerButtonInfo info = new SpeakerButtonInfo(audioState);
+    if (info.nonBluetoothMode) {
       speakerButton.setChecked(info.isChecked);
+      speakerButton.setOnClickListener(null);
+      speakerButton.setOnCheckedChangeListener(this);
+    } else {
+      speakerButton.setText(info.label);
+      speakerButton.setCompoundDrawablesWithIntrinsicBounds(info.icon, 0, 0, 0);
+      speakerButton.setOnClickListener(
+          v -> {
+            inCallButtonUiDelegate.showAudioRouteSelector();
+            dismiss();
+          });
+      speakerButton.setOnCheckedChangeListener(null);
     }
   }
+
+  void setDialpadButtonChecked(boolean isChecked) {
+    dialpadButton.setChecked(isChecked);
+  }
+
+  void enableSwapCallButton(boolean enabled) {
+    isSwapCallButtonEnabled = enabled;
+    swapCallButton.setVisibility(
+        isSwapCallButtonEnabled || isSwitchToSecondaryButtonEnabled ? View.VISIBLE : View.GONE);
+  }
+
+  void enableSwitchToSecondaryButton(boolean enabled) {
+    isSwitchToSecondaryButtonEnabled = enabled;
+    swapCallButton.setVisibility(
+        isSwapCallButtonEnabled || isSwitchToSecondaryButtonEnabled ? View.VISIBLE : View.GONE);
+  }
 }
diff --git a/java/com/android/incallui/rtt/impl/res/drawable/incallui_message_bubble.xml b/java/com/android/incallui/rtt/impl/res/drawable/incallui_message_bubble.xml
new file mode 100644
index 0000000..31044b6
--- /dev/null
+++ b/java/com/android/incallui/rtt/impl/res/drawable/incallui_message_bubble.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2018 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+  <solid android:color="?android:attr/colorBackgroundFloating"/>
+  <corners android:radius="20dp"/>
+</shape>
\ No newline at end of file
diff --git a/java/com/android/incallui/rtt/impl/res/drawable/message_bubble.xml b/java/com/android/incallui/rtt/impl/res/drawable/message_bubble.xml
deleted file mode 100644
index 2b01f62..0000000
--- a/java/com/android/incallui/rtt/impl/res/drawable/message_bubble.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2018 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-  -->
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-  <solid android:color="@android:color/white"/>
-  <corners android:radius="20dp"/>
-</shape>
\ No newline at end of file
diff --git a/java/com/android/incallui/rtt/impl/res/drawable/overflow_menu_background.xml b/java/com/android/incallui/rtt/impl/res/drawable/overflow_menu_background.xml
index 6142986..2af14fd 100644
--- a/java/com/android/incallui/rtt/impl/res/drawable/overflow_menu_background.xml
+++ b/java/com/android/incallui/rtt/impl/res/drawable/overflow_menu_background.xml
@@ -18,4 +18,4 @@
     android:shape="rectangle">
   <solid android:color="@android:color/white"/>
   <corners android:radius="2dp"/>
-</shape>
\ No newline at end of file
+</shape>
diff --git a/java/com/android/incallui/rtt/impl/res/layout/audio_route.xml b/java/com/android/incallui/rtt/impl/res/layout/audio_route.xml
new file mode 100644
index 0000000..6f22feb
--- /dev/null
+++ b/java/com/android/incallui/rtt/impl/res/layout/audio_route.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2018 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="180dp"
+    android:layout_height="wrap_content"
+    android:paddingTop="8dp"
+    android:paddingBottom="8dp"
+    android:orientation="vertical">
+  <com.android.incallui.rtt.impl.RttCheckableButton
+      android:id="@+id/audioroute_back"
+      style="@style/RttButton"
+      android:drawableStart="@drawable/quantum_ic_arrow_back_vd_theme_24"
+      android:text="@string/rtt_button_back"/>
+  <View
+      android:layout_width="match_parent"
+      android:layout_height="1dp"
+      android:background="@color/dialer_divider_line_color"/>
+  <com.android.incallui.rtt.impl.RttCheckableButton
+      android:id="@+id/audioroute_bluetooth"
+      style="@style/RttButton"
+      android:drawableStart="@drawable/quantum_ic_bluetooth_audio_vd_theme_24"
+      android:text="@string/audioroute_bluetooth"/>
+  <com.android.incallui.rtt.impl.RttCheckableButton
+      android:id="@+id/audioroute_speaker"
+      style="@style/RttButton"
+      android:drawableStart="@drawable/quantum_ic_volume_up_vd_theme_24"
+      android:text="@string/audioroute_speaker"/>
+  <com.android.incallui.rtt.impl.RttCheckableButton
+      android:id="@+id/audioroute_earpiece"
+      style="@style/RttButton"
+      android:drawableStart="@drawable/quantum_ic_phone_in_talk_vd_theme_24"
+      android:text="@string/audioroute_phone"/>
+  <com.android.incallui.rtt.impl.RttCheckableButton
+      android:id="@+id/audioroute_headset"
+      style="@style/RttButton"
+      android:drawableStart="@drawable/quantum_ic_headset_vd_theme_24"
+      android:text="@string/audioroute_headset"/>
+</LinearLayout>
\ No newline at end of file
diff --git a/java/com/android/incallui/rtt/impl/res/layout/frag_rtt_chat.xml b/java/com/android/incallui/rtt/impl/res/layout/frag_rtt_chat.xml
index d850751..cff2b3f 100644
--- a/java/com/android/incallui/rtt/impl/res/layout/frag_rtt_chat.xml
+++ b/java/com/android/incallui/rtt/impl/res/layout/frag_rtt_chat.xml
@@ -16,17 +16,19 @@
   -->
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-  <include layout="@layout/rtt_banner"/>
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true">
 
   <android.support.v7.widget.RecyclerView
       android:id="@+id/rtt_recycler_view"
       android:layout_width="match_parent"
       android:layout_height="match_parent"
+      android:paddingTop="56dp"
       android:paddingBottom="70dp"
       android:clipToPadding="false"/>
 
+  <include layout="@layout/rtt_banner"/>
+
   <LinearLayout
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
@@ -47,13 +49,13 @@
         android:paddingEnd="16dp"
         android:background="@drawable/input_bubble_background"
         android:hint="@string/rtt_input_hint"
-        android:imeOptions="actionDone"
-        android:inputType="textMultiLine|text"
-        android:maxLines="4"
+        android:imeOptions="actionSend"
+        android:inputType="text"
         android:minHeight="53dp"
         android:textColor="#DD000000"
         android:textColorHint="#757575"
-        android:textSize="16sp"/>
+        android:textSize="16sp"
+        android:visibility="gone"/>
     <ImageButton
         android:id="@+id/rtt_chat_submit_button"
         android:layout_width="55dp"
@@ -64,7 +66,15 @@
         android:backgroundTintMode="multiply"
         android:contentDescription="@string/content_description_rtt_check_button"
         android:src="@drawable/quantum_ic_done_vd_theme_24"
-        android:tint="@color/submit_button_color"/>
+        android:tint="@color/submit_button_color"
+        android:visibility="gone"/>
   </LinearLayout>
 
-</FrameLayout>
\ No newline at end of file
+  <FrameLayout
+      android:id="@+id/incall_dialpad_container"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:layout_gravity="bottom"
+      android:clipChildren="false"
+      android:clipToPadding="false"/>
+</FrameLayout>
diff --git a/java/com/android/incallui/rtt/impl/res/layout/overflow_menu.xml b/java/com/android/incallui/rtt/impl/res/layout/overflow_menu.xml
index a29fad5..0ec36f3 100644
--- a/java/com/android/incallui/rtt/impl/res/layout/overflow_menu.xml
+++ b/java/com/android/incallui/rtt/impl/res/layout/overflow_menu.xml
@@ -20,7 +20,6 @@
     android:layout_height="wrap_content"
     android:paddingTop="8dp"
     android:paddingBottom="8dp"
-    android:background="@drawable/overflow_menu_background"
     android:orientation="vertical">
   <com.android.incallui.rtt.impl.RttCheckableButton
       android:id="@+id/menu_mute"
@@ -46,4 +45,10 @@
       style="@style/RttButton"
       android:drawableStart="@drawable/quantum_ic_add_call_vd_theme_24"
       android:text="@string/incall_label_add_call"/>
+  <com.android.incallui.rtt.impl.RttCheckableButton
+      android:id="@+id/menu_swap_call"
+      style="@style/RttButton"
+      android:drawableStart="@drawable/quantum_ic_swap_calls_vd_theme_24"
+      android:text="@string/incall_label_swap"
+      android:visibility="gone"/>
 </LinearLayout>
\ No newline at end of file
diff --git a/java/com/android/incallui/rtt/impl/res/layout/rtt_banner.xml b/java/com/android/incallui/rtt/impl/res/layout/rtt_banner.xml
index f193805..065aa8c 100644
--- a/java/com/android/incallui/rtt/impl/res/layout/rtt_banner.xml
+++ b/java/com/android/incallui/rtt/impl/res/layout/rtt_banner.xml
@@ -14,64 +14,83 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License
   -->
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="?attr/actionBarSize"
-    android:background="#F305228F"
-    android:elevation="3dp">
-  <ImageButton
-      android:id="@+id/rtt_end_call_button"
-      android:layout_width="32dp"
-      android:layout_height="32dp"
-      android:layout_marginStart="16dp"
-      android:layout_alignParentStart="true"
-      android:layout_centerVertical="true"
-      android:background="@android:color/transparent"
-      android:contentDescription="@string/incall_content_description_end_call"
-      android:scaleType="fitXY"
-      android:src="@drawable/quantum_ic_call_end_vd_theme_24"
-      android:tint="#FFDF0000"/>
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
   <LinearLayout
-      android:layout_width="260dp"
-      android:layout_height="match_parent"
-      android:layout_marginTop="8dp"
-      android:layout_marginBottom="8dp"
-      android:layout_marginStart="32dp"
-      android:layout_toEndOf="@id/rtt_end_call_button"
-      android:orientation="vertical">
-    <TextView
-        android:id="@+id/rtt_name_or_number"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        android:fontFamily="sans-serif-medium"
-        android:includeFontPadding="false"
-        android:textColor="#FFFFFF"
-        android:textSize="20sp"
-        tools:text="Bruce Graham"/>
-    <Chronometer
-        android:id="@+id/rtt_timer"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        android:fontFamily="sans-serif-medium"
-        android:includeFontPadding="false"
-        android:textColor="#FFFFFF"
-        android:textSize="14sp"
-        tools:text="00:09"/>
-  </LinearLayout>
-  <ImageButton
-      android:id="@+id/rtt_overflow_button"
-      android:layout_width="32dp"
-      android:layout_height="32dp"
-      android:layout_marginEnd="12dp"
-      android:layout_alignParentEnd="true"
-      android:layout_centerVertical="true"
-      android:background="@android:color/transparent"
-      android:contentDescription="@string/content_description_overflow"
-      android:scaleType="fitXY"
-      android:src="@drawable/quantum_ic_more_vert_vd_theme_24"
-      android:tint="#FFFFFF"/>
+      android:layout_width="match_parent"
+      android:layout_height="@dimen/rtt_banner_height"
+      android:background="?android:attr/colorPrimaryDark"
+      android:elevation="3dp"
+      android:orientation="horizontal">
+    <ImageButton
+        android:id="@+id/rtt_end_call_button"
+        android:layout_width="@dimen/rtt_banner_height"
+        android:layout_height="@dimen/rtt_banner_height"
+        android:layout_marginStart="4dp"
+        android:layout_marginEnd="4dp"
+        android:padding="@dimen/rtt_banner_button_padding"
+        android:background="@android:color/transparent"
+        android:contentDescription="@string/incall_content_description_end_call"
+        android:scaleType="fitXY"
+        android:src="@drawable/quantum_ic_call_end_vd_theme_24"
+        android:tint="@color/dialer_end_call_button_color"/>
+    <LinearLayout
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+        android:layout_weight="1"
+        android:layout_marginTop="8dp"
+        android:layout_marginBottom="8dp"
+        android:orientation="vertical">
+      <TextView
+          android:id="@+id/rtt_name_or_number"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_gravity="center_horizontal"
+          android:fontFamily="sans-serif-medium"
+          android:includeFontPadding="false"
+          android:textColor="#FFFFFF"
+          android:textSize="20sp"
+          tools:text="Bruce Graham"/>
+      <Chronometer
+          android:id="@+id/rtt_timer"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_gravity="center_horizontal"
+          android:fontFamily="sans-serif-medium"
+          android:includeFontPadding="false"
+          android:textColor="#FFFFFF"
+          android:textSize="14sp"
+          tools:text="00:09"/>
+    </LinearLayout>
+    <ImageButton
+        android:id="@+id/rtt_overflow_button"
+        android:layout_width="@dimen/rtt_banner_height"
+        android:layout_height="@dimen/rtt_banner_height"
+        android:layout_marginStart="8dp"
+        android:padding="@dimen/rtt_banner_button_padding"
+        android:background="@android:color/transparent"
+        android:contentDescription="@string/content_description_overflow"
+        android:scaleType="fitXY"
+        android:src="@drawable/quantum_ic_more_vert_vd_theme_24"
+        android:tint="?colorIconOnUnthemedDarkBackground"/>
 
-</RelativeLayout>
\ No newline at end of file
+  </LinearLayout>
+  <FrameLayout
+      android:id="@id/rtt_on_hold_banner"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"/>
+  <TextView
+      android:id="@+id/rtt_status_banner"
+      android:layout_width="match_parent"
+      android:layout_height="48dp"
+      android:paddingStart="16dp"
+      android:paddingEnd="16dp"
+      android:background="@android:color/white"
+      android:gravity="center_vertical"
+      android:textColor="#DD000000"
+      android:textSize="14sp"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/java/com/android/incallui/rtt/impl/res/layout/rtt_chat_list_item.xml b/java/com/android/incallui/rtt/impl/res/layout/rtt_chat_list_item.xml
index 54b0f4f..5f17142 100644
--- a/java/com/android/incallui/rtt/impl/res/layout/rtt_chat_list_item.xml
+++ b/java/com/android/incallui/rtt/impl/res/layout/rtt_chat_list_item.xml
@@ -26,8 +26,8 @@
       android:orientation="horizontal">
     <ImageView
         android:id="@+id/rtt_chat_avatar"
-        android:layout_width="40dp"
-        android:layout_height="40dp"
+        android:layout_width="@dimen/rtt_avatar_size"
+        android:layout_height="@dimen/rtt_avatar_size"
         android:layout_marginStart="8dp"
         android:layout_marginEnd="8dp"
         android:visibility="gone"
diff --git a/java/com/android/incallui/rtt/impl/res/layout/rtt_transcript_advisory.xml b/java/com/android/incallui/rtt/impl/res/layout/rtt_transcript_advisory.xml
new file mode 100644
index 0000000..a2cf3e7
--- /dev/null
+++ b/java/com/android/incallui/rtt/impl/res/layout/rtt_transcript_advisory.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2018 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingTop="24dp"
+    android:paddingBottom="16dp"
+    android:orientation="vertical">
+  <ImageView
+      android:layout_width="16dp"
+      android:layout_height="16dp"
+      android:layout_gravity="center_horizontal"
+      android:src="@drawable/quantum_ic_question_answer_vd_theme_24"
+      android:tint="#DEFFFFFF"
+      android:tintMode="src_in"/>
+  <TextView
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:paddingTop="4dp"
+      android:paddingBottom="9dp"
+      android:paddingStart="64dp"
+      android:paddingEnd="64dp"
+      android:gravity="center_horizontal"
+      android:text="@string/rtt_transcript_advisory"
+      android:textColor="#FFFFFF"
+      android:textSize="12sp"/>
+</LinearLayout>
\ No newline at end of file
diff --git a/java/com/android/incallui/rtt/impl/res/values-af/strings.xml b/java/com/android/incallui/rtt/impl/res/values-af/strings.xml
new file mode 100644
index 0000000..7589fd7
--- /dev/null
+++ b/java/com/android/incallui/rtt/impl/res/values-af/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="content_description_rtt_check_button">Gaan voort</string>
+  <string name="rtt_input_hint">Tik \'n boodskap</string>
+  <string name="content_description_rtt_chat_avatar">Avatar</string>
+  <string name="rtt_button_back">Terug</string>
+  <string name="rtt_status_banner_text">Wag tans vir %s om by die RTT-oproep aan te sluit …</string>
+  <string name="rtt_transcript_advisory">Die ander party kan jou sien tik. Transkripsies word op jou toestel gestoor in die oproepgeskiedenis.</string>
+</resources>
diff --git a/java/com/android/incallui/rtt/impl/res/values-am/strings.xml b/java/com/android/incallui/rtt/impl/res/values-am/strings.xml
new file mode 100644
index 0000000..a16613d
--- /dev/null
+++ b/java/com/android/incallui/rtt/impl/res/values-am/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="content_description_rtt_check_button">ይቀጥሉ</string>
+  <string name="rtt_input_hint">መልዕክት ይተይቡ</string>
+  <string name="content_description_rtt_chat_avatar">አምሳያ</string>
+  <string name="rtt_button_back">ተመለስ</string>
+  <string name="rtt_status_banner_text">%s RTT ጥሪን እንዲቀላቀል በመጠበቅ ላይ…</string>
+  <string name="rtt_transcript_advisory">ሌላኛው ወገን እርስዎ በሚተይቡ ጊዜ ሊመለከት ይችላል። የጽሁፍ ግልባጮች በመሳሪያዎ ላይ በጥሪ ታሪክ ውስጥ ተቀምጠዋል።</string>
+</resources>
diff --git a/java/com/android/incallui/rtt/impl/res/values-ar/strings.xml b/java/com/android/incallui/rtt/impl/res/values-ar/strings.xml
new file mode 100644
index 0000000..0574dd0
--- /dev/null
+++ b/java/com/android/incallui/rtt/impl/res/values-ar/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="content_description_rtt_check_button">إرسال</string>
+  <string name="rtt_input_hint">كتابة رسالة</string>
+  <string name="content_description_rtt_chat_avatar">صورة رمزية</string>
+  <string name="rtt_button_back">رجوع</string>
+  <string name="rtt_status_banner_text">‏في انتظار انضمام %s إلى مكالمة RTT…</string>
+  <string name="rtt_transcript_advisory">يمكن للطرف الآخر أن يرى أنك تكتب. يتم تخزين النُسخ النصية على جهازك في سجلّ المكالمات.</string>
+</resources>
diff --git a/java/com/android/incallui/rtt/impl/res/values-az/strings.xml b/java/com/android/incallui/rtt/impl/res/values-az/strings.xml
new file mode 100644
index 0000000..86ff257
--- /dev/null
+++ b/java/com/android/incallui/rtt/impl/res/values-az/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="content_description_rtt_check_button">Davam edin</string>
+  <string name="rtt_input_hint">Mesaj yazın</string>
+  <string name="content_description_rtt_chat_avatar">Avatar</string>
+  <string name="rtt_button_back">Geri</string>
+  <string name="rtt_status_banner_text">%s adlı şəxsin RTT zənginə qoşulmağı gözlənilir…</string>
+  <string name="rtt_transcript_advisory">Digər tərəf Sizin yazdığınızı görə bilər. Transkripsiyalar cihazın zəng tarixçəsində saxlanılır.</string>
+</resources>
diff --git a/java/com/android/incallui/rtt/impl/res/values-b+sr+Latn/strings.xml b/java/com/android/incallui/rtt/impl/res/values-b+sr+Latn/strings.xml
new file mode 100644
index 0000000..5349a52
--- /dev/null
+++ b/java/com/android/incallui/rtt/impl/res/values-b+sr+Latn/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="content_description_rtt_check_button">Pošaljite</string>
+  <string name="rtt_input_hint">Unesite poruku</string>
+  <string name="content_description_rtt_chat_avatar">Avatar</string>
+  <string name="rtt_button_back">Nazad</string>
+  <string name="rtt_status_banner_text">Čeka se da %s uđe u RTT poziv…</string>
+  <string name="rtt_transcript_advisory">Druga osoba vidi da kucate. Transkripti se čuvaju na uređaju u istoriji poziva.</string>
+</resources>
diff --git a/java/com/android/incallui/rtt/impl/res/values-be/strings.xml b/java/com/android/incallui/rtt/impl/res/values-be/strings.xml
new file mode 100644
index 0000000..44fffca
--- /dev/null
+++ b/java/com/android/incallui/rtt/impl/res/values-be/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="content_description_rtt_check_button">Уперад</string>
+  <string name="rtt_input_hint">Напісаць паведамленне</string>
+  <string name="content_description_rtt_chat_avatar">Аватар</string>
+  <string name="rtt_button_back">Назад</string>
+  <string name="rtt_status_banner_text">Чакаем далучэння абанента %s да выкліку RTT…</string>
+  <string name="rtt_transcript_advisory">Ваш суразмоўнік можа бачыць, як вы набіраеце тэкст. Расшыфроўкі захоўваюцца на прыладзе ў гісторыі выклікаў.</string>
+</resources>
diff --git a/java/com/android/incallui/rtt/impl/res/values-bg/strings.xml b/java/com/android/incallui/rtt/impl/res/values-bg/strings.xml
new file mode 100644
index 0000000..8832281
--- /dev/null
+++ b/java/com/android/incallui/rtt/impl/res/values-bg/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="content_description_rtt_check_button">Напред</string>
+  <string name="rtt_input_hint">Въведете съобщение</string>
+  <string name="content_description_rtt_chat_avatar">Аватар</string>
+  <string name="rtt_button_back">Назад</string>
+  <string name="rtt_status_banner_text">Чака се %s да се присъедини към обаждането с RTT…</string>
+  <string name="rtt_transcript_advisory">Другият човек може да вижда, че пишете. Преписите се съхраняват в историята на обажданията на устройството ви.</string>
+</resources>
diff --git a/java/com/android/incallui/rtt/impl/res/values-bn/strings.xml b/java/com/android/incallui/rtt/impl/res/values-bn/strings.xml
new file mode 100644
index 0000000..9c0eeac
--- /dev/null
+++ b/java/com/android/incallui/rtt/impl/res/values-bn/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="content_description_rtt_check_button">এগিয়ে যান</string>
+  <string name="rtt_input_hint">একটি মেসেজ লিখুন</string>
+  <string name="content_description_rtt_chat_avatar">অবতার</string>
+  <string name="rtt_button_back">ফিরে যান</string>
+  <string name="rtt_status_banner_text">RTT কলে %s কখন যোগ দেবেন তার জন্য অপেক্ষা করা হচ্ছে…</string>
+  <string name="rtt_transcript_advisory">অন্য জন দেখতে পাচ্ছেন যে আপনি কিছু লিখছেন। ট্রান্সক্রিপ্টগুলি আপনার ডিভাইসের কলের ইতিহাসে সেভ করে রাখা হয়।</string>
+</resources>
diff --git a/java/com/android/incallui/rtt/impl/res/values-bs/strings.xml b/java/com/android/incallui/rtt/impl/res/values-bs/strings.xml
new file mode 100644
index 0000000..d363bf5
--- /dev/null
+++ b/java/com/android/incallui/rtt/impl/res/values-bs/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="content_description_rtt_check_button">Nastavi</string>
+  <string name="rtt_input_hint">Upišite poruku</string>
+  <string name="content_description_rtt_chat_avatar">Avatar</string>
+  <string name="rtt_button_back">Nazad</string>
+  <string name="rtt_status_banner_text">Čekanje na pridruživanje osobe %s RTT pozivu…</string>
+  <string name="rtt_transcript_advisory">Druga strana može vidjeti da pišete. Transkripti se pohranjuju na uređaju u historiji poziva.</string>
+</resources>
diff --git a/java/com/android/incallui/rtt/impl/res/values-ca/strings.xml b/java/com/android/incallui/rtt/impl/res/values-ca/strings.xml
new file mode 100644
index 0000000..1822eda
--- /dev/null
+++ b/java/com/android/incallui/rtt/impl/res/values-ca/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="content_description_rtt_check_button">Endavant</string>
+  <string name="rtt_input_hint">Escriu un missatge</string>
+  <string name="content_description_rtt_chat_avatar">Avatar</string>
+  <string name="rtt_button_back">Enrere</string>
+  <string name="rtt_status_banner_text">S\'està esperant que %s s\'uneixi a la trucada RTT…</string>
+  <string name="rtt_transcript_advisory">Els altres usuaris veuen quan escrius. Les transcripcions es desen a l\'historial de trucades del dispositiu.</string>
+</resources>
diff --git a/java/com/android/incallui/rtt/impl/res/values-cs/strings.xml b/java/com/android/incallui/rtt/impl/res/values-cs/strings.xml
new file mode 100644
index 0000000..a646220
--- /dev/null
+++ b/java/com/android/incallui/rtt/impl/res/values-cs/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="content_description_rtt_check_button">Do toho</string>
+  <string name="rtt_input_hint">Napište zprávu</string>
+  <string name="content_description_rtt_chat_avatar">Avatar</string>
+  <string name="rtt_button_back">Zpět</string>
+  <string name="rtt_status_banner_text">Čeká se, až se %s připojí k hovoru RTT…</string>
+  <string name="rtt_transcript_advisory">Druhý člověk vidí, že píšete. Přepisy jsou uchovávány ve vašem zařízení v historii hovorů.</string>
+</resources>
diff --git a/java/com/android/incallui/rtt/impl/res/values-da/strings.xml b/java/com/android/incallui/rtt/impl/res/values-da/strings.xml
new file mode 100644
index 0000000..3d1849a
--- /dev/null
+++ b/java/com/android/incallui/rtt/impl/res/values-da/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="content_description_rtt_check_button">Send</string>
+  <string name="rtt_input_hint">Skriv en besked</string>
+  <string name="content_description_rtt_chat_avatar">Avatar</string>
+  <string name="rtt_button_back">Tilbage</string>
+  <string name="rtt_status_banner_text">Der ventes på, at %s deltager i opkaldet med sms i realtid…</string>
+  <string name="rtt_transcript_advisory">Den anden person kan se, at du skriver. Transskriptioner gemmes på din enhed i opkaldshistorikken.</string>
+</resources>
diff --git a/java/com/android/incallui/rtt/impl/res/values-de/strings.xml b/java/com/android/incallui/rtt/impl/res/values-de/strings.xml
new file mode 100644
index 0000000..a98c348
--- /dev/null
+++ b/java/com/android/incallui/rtt/impl/res/values-de/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="content_description_rtt_check_button">OK</string>
+  <string name="rtt_input_hint">Nachricht eingeben</string>
+  <string name="content_description_rtt_chat_avatar">Avatar</string>
+  <string name="rtt_button_back">Zurück</string>
+  <string name="rtt_status_banner_text">Warten, dass %s am RTT-Anruf teilnimmt…</string>
+  <string name="rtt_transcript_advisory">Der andere Teilnehmer kann sehen, dass du etwas schreibst. Transkripte werden in der Anrufliste auf deinem Gerät gespeichert.</string>
+</resources>
diff --git a/java/com/android/incallui/rtt/impl/res/values-el/strings.xml b/java/com/android/incallui/rtt/impl/res/values-el/strings.xml
new file mode 100644
index 0000000..9fd79e4
--- /dev/null
+++ b/java/com/android/incallui/rtt/impl/res/values-el/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="content_description_rtt_check_button">Εντάξει</string>
+  <string name="rtt_input_hint">Πληκτρολογήστε ένα μήνυμα</string>
+  <string name="content_description_rtt_chat_avatar">Avatar</string>
+  <string name="rtt_button_back">Πίσω</string>
+  <string name="rtt_status_banner_text">Αναμονή για τη συμμετοχή του χρήστη %s στην κλήση RTT…</string>
+  <string name="rtt_transcript_advisory">Ο συνομιλητής σας μπορεί να σας δει να πληκτρολογείτε. Οι μεταγραφές αποθηκεύονται στη συσκευή σας, στο ιστορικό κλήσεων.</string>
+</resources>
diff --git a/java/com/android/incallui/rtt/impl/res/values-en-rAU/strings.xml b/java/com/android/incallui/rtt/impl/res/values-en-rAU/strings.xml
new file mode 100644
index 0000000..06fb3a9
--- /dev/null
+++ b/java/com/android/incallui/rtt/impl/res/values-en-rAU/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="content_description_rtt_check_button">Go ahead</string>
+  <string name="rtt_input_hint">Type a message</string>
+  <string name="content_description_rtt_chat_avatar">Avatar</string>
+  <string name="rtt_button_back">Back</string>
+  <string name="rtt_status_banner_text">Waiting for %s to join RTT call…</string>
+  <string name="rtt_transcript_advisory">The other party can see you typing. Transcripts are stored on your device in the call history.</string>
+</resources>
diff --git a/java/com/android/incallui/rtt/impl/res/values-en-rGB/strings.xml b/java/com/android/incallui/rtt/impl/res/values-en-rGB/strings.xml
new file mode 100644
index 0000000..06fb3a9
--- /dev/null
+++ b/java/com/android/incallui/rtt/impl/res/values-en-rGB/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="content_description_rtt_check_button">Go ahead</string>
+  <string name="rtt_input_hint">Type a message</string>
+  <string name="content_description_rtt_chat_avatar">Avatar</string>
+  <string name="rtt_button_back">Back</string>
+  <string name="rtt_status_banner_text">Waiting for %s to join RTT call…</string>
+  <string name="rtt_transcript_advisory">The other party can see you typing. Transcripts are stored on your device in the call history.</string>
+</resources>
diff --git a/java/com/android/incallui/rtt/impl/res/values-en-rIN/strings.xml b/java/com/android/incallui/rtt/impl/res/values-en-rIN/strings.xml
new file mode 100644
index 0000000..06fb3a9
--- /dev/null
+++ b/java/com/android/incallui/rtt/impl/res/values-en-rIN/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="content_description_rtt_check_button">Go ahead</string>
+  <string name="rtt_input_hint">Type a message</string>
+  <string name="content_description_rtt_chat_avatar">Avatar</string>
+  <string name="rtt_button_back">Back</string>
+  <string name="rtt_status_banner_text">Waiting for %s to join RTT call…</string>
+  <string name="rtt_transcript_advisory">The other party can see you typing. Transcripts are stored on your device in the call history.</string>
+</resources>
diff --git a/java/com/android/incallui/rtt/impl/res/values-es-rUS/strings.xml b/java/com/android/incallui/rtt/impl/res/values-es-rUS/strings.xml
new file mode 100644
index 0000000..7e30fd9
--- /dev/null
+++ b/java/com/android/incallui/rtt/impl/res/values-es-rUS/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="content_description_rtt_check_button">Adelante</string>
+  <string name="rtt_input_hint">Escribe un mensaje</string>
+  <string name="content_description_rtt_chat_avatar">Avatar</string>
+  <string name="rtt_button_back">Atrás</string>
+  <string name="rtt_status_banner_text">Esperando a que %s se una a la llamada de RTT…</string>
+  <string name="rtt_transcript_advisory">La otra persona puede ver si estás escribiendo. Las transcripciones se almacenan en el historial de llamadas de tu dispositivo.</string>
+</resources>
diff --git a/java/com/android/incallui/rtt/impl/res/values-es/strings.xml b/java/com/android/incallui/rtt/impl/res/values-es/strings.xml
new file mode 100644
index 0000000..f3b1032
--- /dev/null
+++ b/java/com/android/incallui/rtt/impl/res/values-es/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="content_description_rtt_check_button">Enviar</string>
+  <string name="rtt_input_hint">Escribe un mensaje</string>
+  <string name="content_description_rtt_chat_avatar">Avatar</string>
+  <string name="rtt_button_back">Atrás</string>
+  <string name="rtt_status_banner_text">Esperando a que %s se una a la llamada de TTR…</string>
+  <string name="rtt_transcript_advisory">La otra persona puede ver que estás escribiendo. Las transcripciones se guardan en el historial de llamadas de tu dispositivo.</string>
+</resources>
diff --git a/java/com/android/incallui/rtt/impl/res/values-et/strings.xml b/java/com/android/incallui/rtt/impl/res/values-et/strings.xml
new file mode 100644
index 0000000..89422bb
--- /dev/null
+++ b/java/com/android/incallui/rtt/impl/res/values-et/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="content_description_rtt_check_button">Mine edasi</string>
+  <string name="rtt_input_hint">Sisestage sõnum</string>
+  <string name="content_description_rtt_chat_avatar">Avatar</string>
+  <string name="rtt_button_back">Tagasi</string>
+  <string name="rtt_status_banner_text">Oodatakse, kuni kasutaja %s RTT-kõnega liitub …</string>
+  <string name="rtt_transcript_advisory">Teine osapool näeb, mida kirjutate. Transkriptsioonid salvestatakse teie seadmes kõneajaloos.</string>
+</resources>
diff --git a/java/com/android/incallui/rtt/impl/res/values-eu/strings.xml b/java/com/android/incallui/rtt/impl/res/values-eu/strings.xml
new file mode 100644
index 0000000..faae17c
--- /dev/null
+++ b/java/com/android/incallui/rtt/impl/res/values-eu/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="content_description_rtt_check_button">Aurrera</string>
+  <string name="rtt_input_hint">Idatzi mezu bat</string>
+  <string name="content_description_rtt_chat_avatar">Avatarra</string>
+  <string name="rtt_button_back">Atzera</string>
+  <string name="rtt_status_banner_text">%s RTT deian sartzeko zain…</string>
+  <string name="rtt_transcript_advisory">Idazten ari zarena ikus dezake gainerako erabiltzaileek. Gailuko deien historian gordeko dira transkripzioak.</string>
+</resources>
diff --git a/java/com/android/incallui/rtt/impl/res/values-fa/strings.xml b/java/com/android/incallui/rtt/impl/res/values-fa/strings.xml
new file mode 100644
index 0000000..d2590a6
--- /dev/null
+++ b/java/com/android/incallui/rtt/impl/res/values-fa/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="content_description_rtt_check_button">ادامه دهید</string>
+  <string name="rtt_input_hint">پیامی تایپ کنید</string>
+  <string name="content_description_rtt_chat_avatar">چهره‌نما</string>
+  <string name="rtt_button_back">برگشت</string>
+  <string name="rtt_status_banner_text">‏درانتظار %s برای ملحق شدن به تماس RTT…</string>
+  <string name="rtt_transcript_advisory">طرف مقابل می‌تواند ببیند که درحال تایپ کردن هستید. آوانویسی‌ها در سابقه تماس دستگاهتان ذخیره می‌شوند.</string>
+</resources>
diff --git a/java/com/android/incallui/rtt/impl/res/values-fi/strings.xml b/java/com/android/incallui/rtt/impl/res/values-fi/strings.xml
new file mode 100644
index 0000000..309cb3f
--- /dev/null
+++ b/java/com/android/incallui/rtt/impl/res/values-fi/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="content_description_rtt_check_button">Anna mennä</string>
+  <string name="rtt_input_hint">Kirjoita viesti</string>
+  <string name="content_description_rtt_chat_avatar">Avatar</string>
+  <string name="rtt_button_back">Takaisin</string>
+  <string name="rtt_status_banner_text">Odotetaan, että %s liittyy RTT-puheluun…</string>
+  <string name="rtt_transcript_advisory">Puhelun toinen osapuoli näkee, kun kirjoitat. Transkriptiot tallennetaan laitteesi puheluhistoriaan.</string>
+</resources>
diff --git a/java/com/android/incallui/rtt/impl/res/values-fr-rCA/strings.xml b/java/com/android/incallui/rtt/impl/res/values-fr-rCA/strings.xml
new file mode 100644
index 0000000..04fcbb1
--- /dev/null
+++ b/java/com/android/incallui/rtt/impl/res/values-fr-rCA/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="content_description_rtt_check_button">Envoyer</string>
+  <string name="rtt_input_hint">Composer un message</string>
+  <string name="content_description_rtt_chat_avatar">Avatar</string>
+  <string name="rtt_button_back">Retour</string>
+  <string name="rtt_status_banner_text">Nous attendons que %s se joigne à l\'appel TTR…</string>
+  <string name="rtt_transcript_advisory">L\'autre partie peut voir que vous entrez du texte. Les transcriptions sont stockées sur votre appareil, dans l\'historique des appels.</string>
+</resources>
diff --git a/java/com/android/incallui/rtt/impl/res/values-fr/strings.xml b/java/com/android/incallui/rtt/impl/res/values-fr/strings.xml
new file mode 100644
index 0000000..7bb7412
--- /dev/null
+++ b/java/com/android/incallui/rtt/impl/res/values-fr/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="content_description_rtt_check_button">Continuer</string>
+  <string name="rtt_input_hint">Saisissez un message</string>
+  <string name="content_description_rtt_chat_avatar">Avatar</string>
+  <string name="rtt_button_back">Retour</string>
+  <string name="rtt_status_banner_text">%s n\'a pas encore rejoint l\'appel texte en temps réel…</string>
+  <string name="rtt_transcript_advisory">Votre interlocuteur peut voir quand vous êtes en train d\'écrire. Les transcriptions sont stockées dans l\'historique des appels de votre appareil.</string>
+</resources>
diff --git a/java/com/android/incallui/rtt/impl/res/values-gl/strings.xml b/java/com/android/incallui/rtt/impl/res/values-gl/strings.xml
new file mode 100644
index 0000000..4e6e26e
--- /dev/null
+++ b/java/com/android/incallui/rtt/impl/res/values-gl/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="content_description_rtt_check_button">Continúa</string>
+  <string name="rtt_input_hint">Escribe unha mensaxe</string>
+  <string name="content_description_rtt_chat_avatar">Avatar</string>
+  <string name="rtt_button_back">Volver</string>
+  <string name="rtt_status_banner_text">Esperando a que %s se una á chamada RTT…</string>
+  <string name="rtt_transcript_advisory">O outro usuario pode ver se estás escribindo. As transcricións almacénanse no historial de chamadas do teu dispositivo.</string>
+</resources>
diff --git a/java/com/android/incallui/rtt/impl/res/values-gu/strings.xml b/java/com/android/incallui/rtt/impl/res/values-gu/strings.xml
new file mode 100644
index 0000000..611deae
--- /dev/null
+++ b/java/com/android/incallui/rtt/impl/res/values-gu/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="content_description_rtt_check_button">આગળ વધો</string>
+  <string name="rtt_input_hint">એક સંદેશ લખો</string>
+  <string name="content_description_rtt_chat_avatar">અવતાર</string>
+  <string name="rtt_button_back">પાછળ</string>
+  <string name="rtt_status_banner_text">RTT કૉલ માટે %sની જોડાવાની રાહ જોઈ રહ્યાં છીએ…</string>
+  <string name="rtt_transcript_advisory">અન્ય પક્ષ તમે લખી રહ્યાં છો તે જોઈ શકે છે. ટ્રાન્સક્રિપ્ટને તમારા ઉપકરણ પર કૉલ ઇતિહાસમાં સ્ટોર કરવામાં આવે છે.</string>
+</resources>
diff --git a/java/com/android/incallui/rtt/impl/res/values-hi/strings.xml b/java/com/android/incallui/rtt/impl/res/values-hi/strings.xml
new file mode 100644
index 0000000..0d05514
--- /dev/null
+++ b/java/com/android/incallui/rtt/impl/res/values-hi/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="content_description_rtt_check_button">आगे बढ़ें</string>
+  <string name="rtt_input_hint">एक संदेश लिखें</string>
+  <string name="content_description_rtt_chat_avatar">अवतार</string>
+  <string name="rtt_button_back">वापस जाएं</string>
+  <string name="rtt_status_banner_text">आरटीटी कॉल में %s के शामिल होने का इंतज़ार किया जा रहा है…</string>
+  <string name="rtt_transcript_advisory">दूसरा पक्ष आपको टाइप करते हुए देख सकता है. लेख में बदले गए वॉइसमेल आपके डिवाइस के कॉल इतिहास में संग्रहित किए जाते हैं.</string>
+</resources>
diff --git a/java/com/android/incallui/rtt/impl/res/values-hr/strings.xml b/java/com/android/incallui/rtt/impl/res/values-hr/strings.xml
new file mode 100644
index 0000000..d01da0e
--- /dev/null
+++ b/java/com/android/incallui/rtt/impl/res/values-hr/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="content_description_rtt_check_button">Samo naprijed</string>
+  <string name="rtt_input_hint">Upišite poruku</string>
+  <string name="content_description_rtt_chat_avatar">Avatar</string>
+  <string name="rtt_button_back">Natrag</string>
+  <string name="rtt_status_banner_text">Čekamo da se osoba %s pridruži RTT pozivu…</string>
+  <string name="rtt_transcript_advisory">Druga strana može vidjeti da tipkate. Prijepisi se spremaju na vaš uređaj u povijesti poziva.</string>
+</resources>
diff --git a/java/com/android/incallui/rtt/impl/res/values-hu/strings.xml b/java/com/android/incallui/rtt/impl/res/values-hu/strings.xml
new file mode 100644
index 0000000..29f2c93
--- /dev/null
+++ b/java/com/android/incallui/rtt/impl/res/values-hu/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="content_description_rtt_check_button">Rajta</string>
+  <string name="rtt_input_hint">Írjon be egy üzenetet.</string>
+  <string name="content_description_rtt_chat_avatar">Avatar</string>
+  <string name="rtt_button_back">Vissza</string>
+  <string name="rtt_status_banner_text">Várakozás arra, hogy a következő csatlakozzon az RTT-híváshoz: %s…</string>
+  <string name="rtt_transcript_advisory">A másik fél láthatja, ahogy gépel. Az átiratokat a rendszer az eszköz híváselőzményeiben tárolja.</string>
+</resources>
diff --git a/java/com/android/incallui/rtt/impl/res/values-hy/strings.xml b/java/com/android/incallui/rtt/impl/res/values-hy/strings.xml
new file mode 100644
index 0000000..9d6910e
--- /dev/null
+++ b/java/com/android/incallui/rtt/impl/res/values-hy/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="content_description_rtt_check_button">Սկսել</string>
+  <string name="rtt_input_hint">Մուտքագրեք հաղորդագրություն</string>
+  <string name="content_description_rtt_chat_avatar">Ավատար</string>
+  <string name="rtt_button_back">Հետ</string>
+  <string name="rtt_status_banner_text">Սպասում ենք, միչև %s օգտատերը միանա RTT զանգին…</string>
+  <string name="rtt_transcript_advisory">Ձեր զրուցակիցը կարող է տեսնել, թե ինչպես եք տեքստ մուտքագրում: Տառադրումները պահվում են ձեր սարքում՝ զանգերի պատմության մեջ:</string>
+</resources>
diff --git a/java/com/android/incallui/rtt/impl/res/values-in/strings.xml b/java/com/android/incallui/rtt/impl/res/values-in/strings.xml
new file mode 100644
index 0000000..a50322c
--- /dev/null
+++ b/java/com/android/incallui/rtt/impl/res/values-in/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="content_description_rtt_check_button">Lanjutkan</string>
+  <string name="rtt_input_hint">Ketik pesan</string>
+  <string name="content_description_rtt_chat_avatar">Avatar</string>
+  <string name="rtt_button_back">Kembali</string>
+  <string name="rtt_status_banner_text">Menunggu %s bergabung ke panggilan RTT…</string>
+  <string name="rtt_transcript_advisory">Pengguna lain dapat melihat saat Anda mengetik. Transkripsi disimpan dalam histori panggilan di perangkat Anda.</string>
+</resources>
diff --git a/java/com/android/incallui/rtt/impl/res/values-is/strings.xml b/java/com/android/incallui/rtt/impl/res/values-is/strings.xml
new file mode 100644
index 0000000..594fbe8
--- /dev/null
+++ b/java/com/android/incallui/rtt/impl/res/values-is/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="content_description_rtt_check_button">Halda áfram</string>
+  <string name="rtt_input_hint">Sláðu inn skilaboð</string>
+  <string name="content_description_rtt_chat_avatar">Notandamynd</string>
+  <string name="rtt_button_back">Til baka</string>
+  <string name="rtt_status_banner_text">Bíður eftir að %s tengist RTT-símtali…</string>
+  <string name="rtt_transcript_advisory">Hinn aðilinn getur séð hvað þú slærð inn. Umritanir eru vistaðar í símtalaferli tækisins þíns.</string>
+</resources>
diff --git a/java/com/android/incallui/rtt/impl/res/values-it/strings.xml b/java/com/android/incallui/rtt/impl/res/values-it/strings.xml
new file mode 100644
index 0000000..d437fb7
--- /dev/null
+++ b/java/com/android/incallui/rtt/impl/res/values-it/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="content_description_rtt_check_button">Procedi</string>
+  <string name="rtt_input_hint">Digita un messaggio</string>
+  <string name="content_description_rtt_chat_avatar">Avatar</string>
+  <string name="rtt_button_back">Indietro</string>
+  <string name="rtt_status_banner_text">In attesa che %s si unisca alla chiamata RTT…</string>
+  <string name="rtt_transcript_advisory">L\'altra parte può sapere quando stai digitando. Le trascrizioni vengono memorizzate nella cronologia delle chiamate del tuo dispositivo.</string>
+</resources>
diff --git a/java/com/android/incallui/rtt/impl/res/values-iw/strings.xml b/java/com/android/incallui/rtt/impl/res/values-iw/strings.xml
new file mode 100644
index 0000000..b18a87f
--- /dev/null
+++ b/java/com/android/incallui/rtt/impl/res/values-iw/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="content_description_rtt_check_button">שליחה</string>
+  <string name="rtt_input_hint">מה רצית להגיד?</string>
+  <string name="content_description_rtt_chat_avatar">דמות</string>
+  <string name="rtt_button_back">הקודם</string>
+  <string name="rtt_status_banner_text">‏המערכת מחכה להצטרפות של %s לשיחת ה-RTT…</string>
+  <string name="rtt_transcript_advisory">לצד השני תוצג הודעה בזמן הכתיבה. התמלילים נשמרים בהיסטוריית השיחות במכשיר.</string>
+</resources>
diff --git a/java/com/android/incallui/rtt/impl/res/values-ja/strings.xml b/java/com/android/incallui/rtt/impl/res/values-ja/strings.xml
new file mode 100644
index 0000000..7a0c5a9
--- /dev/null
+++ b/java/com/android/incallui/rtt/impl/res/values-ja/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="content_description_rtt_check_button">送信</string>
+  <string name="rtt_input_hint">メッセージを入力</string>
+  <string name="content_description_rtt_chat_avatar">アバター</string>
+  <string name="rtt_button_back">戻る</string>
+  <string name="rtt_status_banner_text">%s さんが RTT 通話に参加するのを待っています…</string>
+  <string name="rtt_transcript_advisory">通話相手にはあなたが入力中であることが表示されます。音声文字変換結果は、ご利用の端末の通話履歴に保存されます。</string>
+</resources>
diff --git a/java/com/android/incallui/rtt/impl/res/values-ka/strings.xml b/java/com/android/incallui/rtt/impl/res/values-ka/strings.xml
new file mode 100644
index 0000000..7ed8677
--- /dev/null
+++ b/java/com/android/incallui/rtt/impl/res/values-ka/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="content_description_rtt_check_button">დაწყება</string>
+  <string name="rtt_input_hint">აკრიფეთ შეტყობინება</string>
+  <string name="content_description_rtt_chat_avatar">ავატარი</string>
+  <string name="rtt_button_back">უკან</string>
+  <string name="rtt_status_banner_text">ელოდება, რომ %s შეუერთდეს RTT ზარს…</string>
+  <string name="rtt_transcript_advisory">სხვა მხარე ხედავს, როდესაც ტექსტს კრეფთ. ტრანსკრიპტები შეინახება თქვენს მოწყობილობაზე, ზარების ისტორიაში.</string>
+</resources>
diff --git a/java/com/android/incallui/rtt/impl/res/values-kk/strings.xml b/java/com/android/incallui/rtt/impl/res/values-kk/strings.xml
new file mode 100644
index 0000000..96cf7e2
--- /dev/null
+++ b/java/com/android/incallui/rtt/impl/res/values-kk/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="content_description_rtt_check_button">Алға</string>
+  <string name="rtt_input_hint">Хабар мәтінін жазу</string>
+  <string name="content_description_rtt_chat_avatar">Аватар</string>
+  <string name="rtt_button_back">Артқа</string>
+  <string name="rtt_status_banner_text">%s RTT қоңырауына қосылуда…</string>
+  <string name="rtt_transcript_advisory">Екінші жақ сіздің теріп жатқаныңызды көреді. Транскрипциялар құрылғының қоңыраулар тарихына сақталады.</string>
+</resources>
diff --git a/java/com/android/incallui/rtt/impl/res/values-km/strings.xml b/java/com/android/incallui/rtt/impl/res/values-km/strings.xml
new file mode 100644
index 0000000..9d16319
--- /dev/null
+++ b/java/com/android/incallui/rtt/impl/res/values-km/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="content_description_rtt_check_button">ទៅ​មុខ</string>
+  <string name="rtt_input_hint">សរសេរ​សារ</string>
+  <string name="content_description_rtt_chat_avatar">រូបតំណាង</string>
+  <string name="rtt_button_back">ថយ​ក្រោយ</string>
+  <string name="rtt_status_banner_text">កំពុង​រង់ចាំ %s ចូលរួម​ការហៅ RTT…</string>
+  <string name="rtt_transcript_advisory">ភាគី​ផ្សេង​អាច​មើល​ឃើញ​អ្នក​កំពុង​វាយអក្សរ។ ប្រតិចារឹក​បាន​រក្សាទុក​នៅ​លើ​ឧបករណ៍​របស់​អ្នក​នៅ​ក្នុង​ប្រវត្តិ​ហៅ​ទូរសព្ទ។</string>
+</resources>
diff --git a/java/com/android/incallui/rtt/impl/res/values-kn/strings.xml b/java/com/android/incallui/rtt/impl/res/values-kn/strings.xml
new file mode 100644
index 0000000..dfb1bca
--- /dev/null
+++ b/java/com/android/incallui/rtt/impl/res/values-kn/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="content_description_rtt_check_button">ಮುಂದುವರಿಯಿರಿ</string>
+  <string name="rtt_input_hint">ಸಂದೇಶವನ್ನು ಟೈಪ್‌ ಮಾಡಿ</string>
+  <string name="content_description_rtt_chat_avatar">ಅವತಾರ್</string>
+  <string name="rtt_button_back">ಹಿಂದೆ</string>
+  <string name="rtt_status_banner_text">RTT ಕರೆಗೆ ಸೇರಲು %s ಅವರನ್ನು ನಿರೀಕ್ಷಿಸಲಾಗುತ್ತಿದೆ…</string>
+  <string name="rtt_transcript_advisory">ಇತರ ವ್ಯಕ್ಯಿಯೂ ನೀವು ಟೈಪ್‌ ಮಾಡುವುದನ್ನು ವೀಕ್ಷಿಸಬಹುದು. ನಿಮ್ಮ ಸಾಧನದ ಕರೆ ಇತಿಹಾಸದಲ್ಲಿ ಪ್ರತಿಲೇಖನಗಳನ್ನು ಸಂಗ್ರಹಿಸಲಾಗಿದೆ.</string>
+</resources>
diff --git a/java/com/android/incallui/rtt/impl/res/values-ko/strings.xml b/java/com/android/incallui/rtt/impl/res/values-ko/strings.xml
new file mode 100644
index 0000000..a255a16
--- /dev/null
+++ b/java/com/android/incallui/rtt/impl/res/values-ko/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="content_description_rtt_check_button">보내기</string>
+  <string name="rtt_input_hint">메시지 입력</string>
+  <string name="content_description_rtt_chat_avatar">아바타</string>
+  <string name="rtt_button_back">뒤로</string>
+  <string name="rtt_status_banner_text">%s님이 RTT 통화에 참여하기를 기다리는 중…</string>
+  <string name="rtt_transcript_advisory">상대방이 내가 텍스트를 입력하는 중인지 알 수 있습니다. 텍스트로 변환된 내용이 내 기기의 통화 기록에 저장됩니다.</string>
+</resources>
diff --git a/java/com/android/incallui/rtt/impl/res/values-ky/strings.xml b/java/com/android/incallui/rtt/impl/res/values-ky/strings.xml
new file mode 100644
index 0000000..ac1b0ae
--- /dev/null
+++ b/java/com/android/incallui/rtt/impl/res/values-ky/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="content_description_rtt_check_button">Тапшыруу</string>
+  <string name="rtt_input_hint">Билдирүүнү териңиз</string>
+  <string name="content_description_rtt_chat_avatar">Аватар</string>
+  <string name="rtt_button_back">Артка</string>
+  <string name="rtt_status_banner_text">RTT чалууга %s кошулгуча күтө туралы…</string>
+  <string name="rtt_transcript_advisory">Маектешиңиз жазып жатканыңызды көрө алат. Транскрипциялар түзмөгүңүздөгү чалуулар таржымалында сакталат.</string>
+</resources>
diff --git a/java/com/android/incallui/rtt/impl/res/values-lo/strings.xml b/java/com/android/incallui/rtt/impl/res/values-lo/strings.xml
new file mode 100644
index 0000000..bc562ca
--- /dev/null
+++ b/java/com/android/incallui/rtt/impl/res/values-lo/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="content_description_rtt_check_button">ເຮັດຕໍ່ໄປ</string>
+  <string name="rtt_input_hint">ພິມຂໍ້ຄວາມ</string>
+  <string name="content_description_rtt_chat_avatar">ຮູບແທນຕົວ</string>
+  <string name="rtt_button_back">ກັບຄືນ</string>
+  <string name="rtt_status_banner_text">ກຳລັລໍຖ້າງ %s ໃຫ້ເຂົ້າຮ່ວມການໂທ RTT…</string>
+  <string name="rtt_transcript_advisory">ຄົນອື່ນສາມາດເຫັນໄດ້ວ່າທ່ານກຳລັງພິມຢູ່. ການຖອດຂໍ້ຄວາມຈະຖືກບັນທຶກໄວ້ຢູ່ອຸປະກອນຂອງທ່ານໃນປະຫວັດການໂທ.</string>
+</resources>
diff --git a/java/com/android/incallui/rtt/impl/res/values-lt/strings.xml b/java/com/android/incallui/rtt/impl/res/values-lt/strings.xml
new file mode 100644
index 0000000..f015056
--- /dev/null
+++ b/java/com/android/incallui/rtt/impl/res/values-lt/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="content_description_rtt_check_button">Pirmyn</string>
+  <string name="rtt_input_hint">Įveskite pranešimą</string>
+  <string name="content_description_rtt_chat_avatar">Pseudoportretas</string>
+  <string name="rtt_button_back">Atgal</string>
+  <string name="rtt_status_banner_text">Laukiama, kol %s prisijungs prie RTT skambučio…</string>
+  <string name="rtt_transcript_advisory">Kita šalis gali matyti, kad vedate tekstą. Nuorašai saugomi įrenginio skambučių istorijoje.</string>
+</resources>
diff --git a/java/com/android/incallui/rtt/impl/res/values-lv/strings.xml b/java/com/android/incallui/rtt/impl/res/values-lv/strings.xml
new file mode 100644
index 0000000..4efa47a
--- /dev/null
+++ b/java/com/android/incallui/rtt/impl/res/values-lv/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="content_description_rtt_check_button">Sūtīt</string>
+  <string name="rtt_input_hint">Ierakstiet ziņojumu</string>
+  <string name="content_description_rtt_chat_avatar">Iemiesojums</string>
+  <string name="rtt_button_back">Atpakaļ</string>
+  <string name="rtt_status_banner_text">Gaida lietotāja %s pievienošanos RTT zvanam…</string>
+  <string name="rtt_transcript_advisory">Citas personas var redzēt, kad jūs rakstāt. Transkripcijas tiek glabātas zvanu vēsturē jūsu ierīcē.</string>
+</resources>
diff --git a/java/com/android/incallui/rtt/impl/res/values-mk/strings.xml b/java/com/android/incallui/rtt/impl/res/values-mk/strings.xml
new file mode 100644
index 0000000..a7624ca
--- /dev/null
+++ b/java/com/android/incallui/rtt/impl/res/values-mk/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="content_description_rtt_check_button">Испратете</string>
+  <string name="rtt_input_hint">Напишете порака</string>
+  <string name="content_description_rtt_chat_avatar">Аватар</string>
+  <string name="rtt_button_back">Назад</string>
+  <string name="rtt_status_banner_text">Се чека %s да се придружи на RTT-повикот…</string>
+  <string name="rtt_transcript_advisory">Лицето на другата страна може да види дека пишувате. Преписите се складирани на вашиот уред во историјата на повици.</string>
+</resources>
diff --git a/java/com/android/incallui/rtt/impl/res/values-ml/strings.xml b/java/com/android/incallui/rtt/impl/res/values-ml/strings.xml
new file mode 100644
index 0000000..2018a51
--- /dev/null
+++ b/java/com/android/incallui/rtt/impl/res/values-ml/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="content_description_rtt_check_button">മുന്നോട്ടുപോവുക</string>
+  <string name="rtt_input_hint">ഒരു സന്ദേശം ടൈപ്പ് ചെയ്യുക</string>
+  <string name="content_description_rtt_chat_avatar">അവതാർ</string>
+  <string name="rtt_button_back">തിരികെ പോവുക</string>
+  <string name="rtt_status_banner_text">%s RTT കോളിലേക്ക് ചേരാനായി കാത്തിരിക്കുന്നു…</string>
+  <string name="rtt_transcript_advisory">നിങ്ങൾ ടൈപ്പ് ചെയ്യുന്നത് മറ്റേ കക്ഷിക്ക് കാണാനാവും. നിങ്ങളുടെ ഉപകരണത്തിൽ ട്രാൻസ്‌ക്രിപ്‌റ്റുകൾ സംഭരിക്കപ്പെടുന്നത് കോൾ ചരിത്രത്തിലാണ്.</string>
+</resources>
diff --git a/java/com/android/incallui/rtt/impl/res/values-mn/strings.xml b/java/com/android/incallui/rtt/impl/res/values-mn/strings.xml
new file mode 100644
index 0000000..7dfa753
--- /dev/null
+++ b/java/com/android/incallui/rtt/impl/res/values-mn/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="content_description_rtt_check_button">Эхлүүлэх</string>
+  <string name="rtt_input_hint">Зурвас бичнэ үү</string>
+  <string name="content_description_rtt_chat_avatar">Аватар</string>
+  <string name="rtt_button_back">Буцах</string>
+  <string name="rtt_status_banner_text">RTT дуудлагад нэгдэхэд %s-г хүлээж байна…</string>
+  <string name="rtt_transcript_advisory">Нөгөө талын хүн та бичиж байгаа гэдгийг харах боломжтой. Сийрүүлгийг таны төхөөрөмж дээр дуудлагын түүхэнд хадгалсан.</string>
+</resources>
diff --git a/java/com/android/incallui/rtt/impl/res/values-mr/strings.xml b/java/com/android/incallui/rtt/impl/res/values-mr/strings.xml
new file mode 100644
index 0000000..d02687c
--- /dev/null
+++ b/java/com/android/incallui/rtt/impl/res/values-mr/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="content_description_rtt_check_button">पुढे जा</string>
+  <string name="rtt_input_hint">मेसेज टाइप करा</string>
+  <string name="content_description_rtt_chat_avatar">अवतार</string>
+  <string name="rtt_button_back">मागे जा</string>
+  <string name="rtt_status_banner_text">%s ची RTT कॉलमध्‍ये सामील होण्‍याची वाटत पाहत आहोत…</string>
+  <string name="rtt_transcript_advisory">दुसर्‍या पार्टीला तुम्‍ही टाइप करत असल्‍याचे दिसेल. तुमच्‍या डिव्‍हाइसच्‍या कॉल इतिहासात प्रतिलेखन स्‍टोअर केले आहेत.</string>
+</resources>
diff --git a/java/com/android/incallui/rtt/impl/res/values-ms/strings.xml b/java/com/android/incallui/rtt/impl/res/values-ms/strings.xml
new file mode 100644
index 0000000..be4030a
--- /dev/null
+++ b/java/com/android/incallui/rtt/impl/res/values-ms/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="content_description_rtt_check_button">Teruskan</string>
+  <string name="rtt_input_hint">Taip mesej</string>
+  <string name="content_description_rtt_chat_avatar">Avatar</string>
+  <string name="rtt_button_back">Kembali</string>
+  <string name="rtt_status_banner_text">Menunggu %s menyertai panggilan RTT…</string>
+  <string name="rtt_transcript_advisory">Pihak lain dapat melihat anda menaip. Transkrip disimpan pada peranti anda dalam sejarah panggilan.</string>
+</resources>
diff --git a/java/com/android/incallui/rtt/impl/res/values-my/strings.xml b/java/com/android/incallui/rtt/impl/res/values-my/strings.xml
new file mode 100644
index 0000000..1559cf0
--- /dev/null
+++ b/java/com/android/incallui/rtt/impl/res/values-my/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="content_description_rtt_check_button">ဆက်လုပ်ရန်</string>
+  <string name="rtt_input_hint">မက်ဆေ့ဂျ် ရိုက်ပါ</string>
+  <string name="content_description_rtt_chat_avatar">ရုပ်ပုံ</string>
+  <string name="rtt_button_back">နောက်သို့</string>
+  <string name="rtt_status_banner_text">RTT ခေါ်ဆိုမှုနှင့် ချိတ်ဆက်ရန် %s ကို စောင့်ဆိုင်းနေသည်…</string>
+  <string name="rtt_transcript_advisory">အခြားပါတီသည် သင်စာရိုက်နေခြင်းကို မြင်နိုင်ပါသည်။ စာသားမှတ်တမ်းများကို သင့်ကိရိယာရှိ ခေါ်ဆိုမှုမှတ်တမ်းတွင် သိမ်းဆည်းထားသည်။</string>
+</resources>
diff --git a/java/com/android/incallui/rtt/impl/res/values-nb/strings.xml b/java/com/android/incallui/rtt/impl/res/values-nb/strings.xml
new file mode 100644
index 0000000..4f5e523
--- /dev/null
+++ b/java/com/android/incallui/rtt/impl/res/values-nb/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="content_description_rtt_check_button">Send</string>
+  <string name="rtt_input_hint">Skriv en melding</string>
+  <string name="content_description_rtt_chat_avatar">Brukerbilde</string>
+  <string name="rtt_button_back">Tilbake</string>
+  <string name="rtt_status_banner_text">Venter på at %s skal bli med i STT-samtalen …</string>
+  <string name="rtt_transcript_advisory">Den andre parten kan se at du skriver. Transkripsjoner lagres i anropsloggen på enheten din.</string>
+</resources>
diff --git a/java/com/android/incallui/rtt/impl/res/values-ne/strings.xml b/java/com/android/incallui/rtt/impl/res/values-ne/strings.xml
new file mode 100644
index 0000000..6ba5643
--- /dev/null
+++ b/java/com/android/incallui/rtt/impl/res/values-ne/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="content_description_rtt_check_button">अगाडि बढ्नुहोस्</string>
+  <string name="rtt_input_hint">सन्देश टाइप गर्नुहोस्</string>
+  <string name="content_description_rtt_chat_avatar">अवतार</string>
+  <string name="rtt_button_back">पछाडि</string>
+  <string name="rtt_status_banner_text">%s RTT कलमा सामेल हुने प्रतीक्षा गर्दै…</string>
+  <string name="rtt_transcript_advisory">अर्को पक्षले तपाईंले टाइप गरिरहेको कुरा देख्न सक्ने छन्। ट्रान्सक्रिप्सनहरू तपाईंको यन्त्रको कलसम्बन्धी इतिहासमा भण्डारण गरिन्छ।</string>
+</resources>
diff --git a/java/com/android/incallui/rtt/impl/res/values-nl/strings.xml b/java/com/android/incallui/rtt/impl/res/values-nl/strings.xml
new file mode 100644
index 0000000..0a4f55d
--- /dev/null
+++ b/java/com/android/incallui/rtt/impl/res/values-nl/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="content_description_rtt_check_button">Verzenden</string>
+  <string name="rtt_input_hint">Typ een bericht</string>
+  <string name="content_description_rtt_chat_avatar">Avatar</string>
+  <string name="rtt_button_back">Terug</string>
+  <string name="rtt_status_banner_text">Wachten op deelname door %s aan RTT-oproep…</string>
+  <string name="rtt_transcript_advisory">De andere persoon kan zien dat je typt. Transcripten worden op je apparaat opgeslagen in de oproepgeschiedenis.</string>
+</resources>
diff --git a/java/com/android/incallui/rtt/impl/res/values-no/strings.xml b/java/com/android/incallui/rtt/impl/res/values-no/strings.xml
new file mode 100644
index 0000000..4f5e523
--- /dev/null
+++ b/java/com/android/incallui/rtt/impl/res/values-no/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="content_description_rtt_check_button">Send</string>
+  <string name="rtt_input_hint">Skriv en melding</string>
+  <string name="content_description_rtt_chat_avatar">Brukerbilde</string>
+  <string name="rtt_button_back">Tilbake</string>
+  <string name="rtt_status_banner_text">Venter på at %s skal bli med i STT-samtalen …</string>
+  <string name="rtt_transcript_advisory">Den andre parten kan se at du skriver. Transkripsjoner lagres i anropsloggen på enheten din.</string>
+</resources>
diff --git a/java/com/android/incallui/rtt/impl/res/values-pa/strings.xml b/java/com/android/incallui/rtt/impl/res/values-pa/strings.xml
new file mode 100644
index 0000000..f1400bc
--- /dev/null
+++ b/java/com/android/incallui/rtt/impl/res/values-pa/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="content_description_rtt_check_button">ਅੱਗੇ ਵਧੋ</string>
+  <string name="rtt_input_hint">ਸੁਨੇਹਾ ਟਾਈਪ ਕਰੋ</string>
+  <string name="content_description_rtt_chat_avatar">ਅਵਤਾਰ</string>
+  <string name="rtt_button_back">ਪਿੱਛੇ</string>
+  <string name="rtt_status_banner_text">RTT ਕਾਲ ਵਿੱਚ %s ਵੱਲੋਂ ਸ਼ਾਮਲ ਹੋਣ ਦੀ ਉਡੀਕ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ…</string>
+  <string name="rtt_transcript_advisory">ਦੂਸਰਾ ਧਿਰ ਤੁਹਾਨੂੰ ਟਾਈਪ ਕਰਦੇ ਹੋਏ ਦੇਖ ਸਕਦਾ ਹੈ। ਪ੍ਰਤੀਲਿਪੀਆਂ ਤੁਹਾਡੇ ਡੀਵਾਈਸ ਦੇ ਕਾਲ ਇਤਿਹਾਸ ਵਿੱਚ ਸਟੋਰ ਕੀਤੀਆਂ ਗਈਆਂ ਹਨ।</string>
+</resources>
diff --git a/java/com/android/incallui/rtt/impl/res/values-pl/strings.xml b/java/com/android/incallui/rtt/impl/res/values-pl/strings.xml
new file mode 100644
index 0000000..fa96caa
--- /dev/null
+++ b/java/com/android/incallui/rtt/impl/res/values-pl/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="content_description_rtt_check_button">Wyślij</string>
+  <string name="rtt_input_hint">Wpisz wiadomość</string>
+  <string name="content_description_rtt_chat_avatar">Awatar</string>
+  <string name="rtt_button_back">Wstecz</string>
+  <string name="rtt_status_banner_text">Czekamy, aż %s dołączy do rozmowy RTT…</string>
+  <string name="rtt_transcript_advisory">Rozmówca widzi informację o tym, że wpisujesz tekst. Transkrypcje są przechowywane na urządzeniu w historii połączeń.</string>
+</resources>
diff --git a/java/com/android/incallui/rtt/impl/res/values-pt-rBR/strings.xml b/java/com/android/incallui/rtt/impl/res/values-pt-rBR/strings.xml
new file mode 100644
index 0000000..9fe5262
--- /dev/null
+++ b/java/com/android/incallui/rtt/impl/res/values-pt-rBR/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="content_description_rtt_check_button">Continuar</string>
+  <string name="rtt_input_hint">Digite uma mensagem</string>
+  <string name="content_description_rtt_chat_avatar">Avatar</string>
+  <string name="rtt_button_back">Voltar</string>
+  <string name="rtt_status_banner_text">Aguardando %s participar da chamada RTT…</string>
+  <string name="rtt_transcript_advisory">Seu contato pode ver você digitando. As transcrições são armazenadas no histórico de chamadas do dispositivo.</string>
+</resources>
diff --git a/java/com/android/incallui/rtt/impl/res/values-pt-rPT/strings.xml b/java/com/android/incallui/rtt/impl/res/values-pt-rPT/strings.xml
new file mode 100644
index 0000000..91e8c24
--- /dev/null
+++ b/java/com/android/incallui/rtt/impl/res/values-pt-rPT/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="content_description_rtt_check_button">Avançar</string>
+  <string name="rtt_input_hint">Escreva uma mensagem</string>
+  <string name="content_description_rtt_chat_avatar">Avatar</string>
+  <string name="rtt_button_back">Anterior</string>
+  <string name="rtt_status_banner_text">A aguardar que %s entre na chamada RTT…</string>
+  <string name="rtt_transcript_advisory">A outra pessoa consegue vê-lo a escrever. As transcrições são armazenadas no seu dispositivo, no histórico de chamadas.</string>
+</resources>
diff --git a/java/com/android/incallui/rtt/impl/res/values-pt/strings.xml b/java/com/android/incallui/rtt/impl/res/values-pt/strings.xml
new file mode 100644
index 0000000..9fe5262
--- /dev/null
+++ b/java/com/android/incallui/rtt/impl/res/values-pt/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="content_description_rtt_check_button">Continuar</string>
+  <string name="rtt_input_hint">Digite uma mensagem</string>
+  <string name="content_description_rtt_chat_avatar">Avatar</string>
+  <string name="rtt_button_back">Voltar</string>
+  <string name="rtt_status_banner_text">Aguardando %s participar da chamada RTT…</string>
+  <string name="rtt_transcript_advisory">Seu contato pode ver você digitando. As transcrições são armazenadas no histórico de chamadas do dispositivo.</string>
+</resources>
diff --git a/java/com/android/incallui/rtt/impl/res/values-ro/strings.xml b/java/com/android/incallui/rtt/impl/res/values-ro/strings.xml
new file mode 100644
index 0000000..02cd654
--- /dev/null
+++ b/java/com/android/incallui/rtt/impl/res/values-ro/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="content_description_rtt_check_button">Continuați</string>
+  <string name="rtt_input_hint">Scrieți un mesaj</string>
+  <string name="content_description_rtt_chat_avatar">Avatar</string>
+  <string name="rtt_button_back">Înapoi</string>
+  <string name="rtt_status_banner_text">Se așteaptă conectarea utilizatorului %s la apelul RTT…</string>
+  <string name="rtt_transcript_advisory">Cealaltă persoană poate vedea că scrieți. Transcrierile sunt stocate pe dispozitiv în istoricul apelurilor.</string>
+</resources>
diff --git a/java/com/android/incallui/rtt/impl/res/values-ru/strings.xml b/java/com/android/incallui/rtt/impl/res/values-ru/strings.xml
new file mode 100644
index 0000000..0d114d6
--- /dev/null
+++ b/java/com/android/incallui/rtt/impl/res/values-ru/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="content_description_rtt_check_button">Перейти далее</string>
+  <string name="rtt_input_hint">Введите сообщение</string>
+  <string name="content_description_rtt_chat_avatar">Аватар</string>
+  <string name="rtt_button_back">Назад</string>
+  <string name="rtt_status_banner_text">Ждем, когда присоединится %s</string>
+  <string name="rtt_transcript_advisory">Собеседник может видеть, что вы что-то пишете. Расшифровки сохраняются в журнале звонков на вашем устройстве.</string>
+</resources>
diff --git a/java/com/android/incallui/rtt/impl/res/values-si/strings.xml b/java/com/android/incallui/rtt/impl/res/values-si/strings.xml
new file mode 100644
index 0000000..e88829c
--- /dev/null
+++ b/java/com/android/incallui/rtt/impl/res/values-si/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="content_description_rtt_check_button">ඉදිරියට යන්න</string>
+  <string name="rtt_input_hint">පණිවිඩයක් ටයිප් කරන්න</string>
+  <string name="content_description_rtt_chat_avatar">ඇවටාර්</string>
+  <string name="rtt_button_back">ආපසු</string>
+  <string name="rtt_status_banner_text">RTT ඇමතුම හා එක් වීමට %s සඳහා රැඳී සිටිමින්…</string>
+  <string name="rtt_transcript_advisory">අනෙක් පාර්ශවයට ඔබ ටයිප් කරනවා දැකිය හැකිය. ඇමතුම් ඉතිහාසය තුළ ඔබගේ උපාංගයේ පිටපත් ගබඩා කෙරේ.</string>
+</resources>
diff --git a/java/com/android/incallui/rtt/impl/res/values-sk/strings.xml b/java/com/android/incallui/rtt/impl/res/values-sk/strings.xml
new file mode 100644
index 0000000..b463cef
--- /dev/null
+++ b/java/com/android/incallui/rtt/impl/res/values-sk/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="content_description_rtt_check_button">Pokračovať</string>
+  <string name="rtt_input_hint">Zadajte správu</string>
+  <string name="content_description_rtt_chat_avatar">Avatar</string>
+  <string name="rtt_button_back">Späť</string>
+  <string name="rtt_status_banner_text">Čaká sa, kým sa %s pripojí k hovoru RTT…</string>
+  <string name="rtt_transcript_advisory">Druhá strana vidí, že píšete. Prepisy sa uchovávajú vo vašom zariadení v histórii hovorov.</string>
+</resources>
diff --git a/java/com/android/incallui/rtt/impl/res/values-sl/strings.xml b/java/com/android/incallui/rtt/impl/res/values-sl/strings.xml
new file mode 100644
index 0000000..2d398ba
--- /dev/null
+++ b/java/com/android/incallui/rtt/impl/res/values-sl/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="content_description_rtt_check_button">Pošlji</string>
+  <string name="rtt_input_hint">Vnesite sporočilo</string>
+  <string name="content_description_rtt_chat_avatar">Avatar</string>
+  <string name="rtt_button_back">Nazaj</string>
+  <string name="rtt_status_banner_text">Čakanje na osebo %s, da se pridruži klicu RTT …</string>
+  <string name="rtt_transcript_advisory">Sogovornik lahko vidi, da tipkate. Prepisi besedil so shranjeni v vaši napravi v zgodovini klicev.</string>
+</resources>
diff --git a/java/com/android/incallui/rtt/impl/res/values-sq/strings.xml b/java/com/android/incallui/rtt/impl/res/values-sq/strings.xml
new file mode 100644
index 0000000..11a5c25
--- /dev/null
+++ b/java/com/android/incallui/rtt/impl/res/values-sq/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="content_description_rtt_check_button">Vazhdo</string>
+  <string name="rtt_input_hint">Shkruaj një mesazh</string>
+  <string name="content_description_rtt_chat_avatar">Simboli</string>
+  <string name="rtt_button_back">Prapa</string>
+  <string name="rtt_status_banner_text">Po pret për %s që të bashkohet në telefonatën RTT…</string>
+  <string name="rtt_transcript_advisory">Pala tjetër mund të të shikojë kur ti shkruan. Transkriptet ruhen në pajisjen tënde në historikun e telefonatave.</string>
+</resources>
diff --git a/java/com/android/incallui/rtt/impl/res/values-sr/strings.xml b/java/com/android/incallui/rtt/impl/res/values-sr/strings.xml
new file mode 100644
index 0000000..f63330a
--- /dev/null
+++ b/java/com/android/incallui/rtt/impl/res/values-sr/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="content_description_rtt_check_button">Пошаљите</string>
+  <string name="rtt_input_hint">Унесите поруку</string>
+  <string name="content_description_rtt_chat_avatar">Аватар</string>
+  <string name="rtt_button_back">Назад</string>
+  <string name="rtt_status_banner_text">Чека се да %s уђе у RTT позив…</string>
+  <string name="rtt_transcript_advisory">Друга особа види да куцате. Транскрипти се чувају на уређају у историји позива.</string>
+</resources>
diff --git a/java/com/android/incallui/rtt/impl/res/values-sv/strings.xml b/java/com/android/incallui/rtt/impl/res/values-sv/strings.xml
new file mode 100644
index 0000000..567ff7a
--- /dev/null
+++ b/java/com/android/incallui/rtt/impl/res/values-sv/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="content_description_rtt_check_button">Sätt igång</string>
+  <string name="rtt_input_hint">Skriv ett meddelande</string>
+  <string name="content_description_rtt_chat_avatar">Avatar</string>
+  <string name="rtt_button_back">Tillbaka</string>
+  <string name="rtt_status_banner_text">Väntar på att %s ska ansluta sig till RTT-samtal …</string>
+  <string name="rtt_transcript_advisory">Den andra parten kan se när du skriver. Transkriptioner lagras i samtalshistoriken på din enhet.</string>
+</resources>
diff --git a/java/com/android/incallui/rtt/impl/res/values-sw/strings.xml b/java/com/android/incallui/rtt/impl/res/values-sw/strings.xml
new file mode 100644
index 0000000..51f46c2
--- /dev/null
+++ b/java/com/android/incallui/rtt/impl/res/values-sw/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="content_description_rtt_check_button">Endelea</string>
+  <string name="rtt_input_hint">Andika ujumbe</string>
+  <string name="content_description_rtt_chat_avatar">Ishara</string>
+  <string name="rtt_button_back">Nyuma</string>
+  <string name="rtt_status_banner_text">Inamsubiri %s ajiunge kwenye simu ya RTT…</string>
+  <string name="rtt_transcript_advisory">Mtu mwingine anaweza kuona unapoandika. Manukuu yanahifadhiwa kwenye kifaa chako katika rekodi ya simu zilizopigwa.</string>
+</resources>
diff --git a/java/com/android/incallui/rtt/impl/res/values-ta/strings.xml b/java/com/android/incallui/rtt/impl/res/values-ta/strings.xml
new file mode 100644
index 0000000..b3116fd
--- /dev/null
+++ b/java/com/android/incallui/rtt/impl/res/values-ta/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="content_description_rtt_check_button">தொடங்குவதற்கான பொத்தான்</string>
+  <string name="rtt_input_hint">செய்தியை உள்ளிடவும்</string>
+  <string name="content_description_rtt_chat_avatar">அவதார்</string>
+  <string name="rtt_button_back">முந்தையது</string>
+  <string name="rtt_status_banner_text">RTT அழைப்பில் %s சேர்வதற்குக் காத்திருக்கிறது…</string>
+  <string name="rtt_transcript_advisory">நீங்கள் தட்டச்சு செய்வதைப் பிறரால் பார்க்க முடியும். உங்கள் சாதனத்தில், அழைப்பு வரலாற்றில் டிரான்ஸ்கிரிப்ட்டுகள் சேமிக்கப்படுகின்றன.</string>
+</resources>
diff --git a/java/com/android/incallui/rtt/impl/res/values-te/strings.xml b/java/com/android/incallui/rtt/impl/res/values-te/strings.xml
new file mode 100644
index 0000000..4ac417d
--- /dev/null
+++ b/java/com/android/incallui/rtt/impl/res/values-te/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="content_description_rtt_check_button">ముందుకు కొనసాగించండి</string>
+  <string name="rtt_input_hint">సందేశాన్ని టైప్ చేయండి</string>
+  <string name="content_description_rtt_chat_avatar">అవతార్</string>
+  <string name="rtt_button_back">వెనుకకు</string>
+  <string name="rtt_status_banner_text">%s RTT కాల్‌లో చేరడానికి వేచి చూస్తోంది…</string>
+  <string name="rtt_transcript_advisory">మరొక పక్షం మీరు టైప్ చేయడాన్ని చూడగలరు. లిపి మార్పులు మీ పరికరంలోని కాల్ చరిత్రలో నిల్వ చేయబడతాయి.</string>
+</resources>
diff --git a/java/com/android/incallui/rtt/impl/res/values-th/strings.xml b/java/com/android/incallui/rtt/impl/res/values-th/strings.xml
new file mode 100644
index 0000000..c3b41b8
--- /dev/null
+++ b/java/com/android/incallui/rtt/impl/res/values-th/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="content_description_rtt_check_button">ส่งข้อความทันที</string>
+  <string name="rtt_input_hint">พิมพ์ข้อความ</string>
+  <string name="content_description_rtt_chat_avatar">รูปโปรไฟล์</string>
+  <string name="rtt_button_back">กลับ</string>
+  <string name="rtt_status_banner_text">กำลังรอให้ %s เข้าร่วมการโทรที่ใช้ RTT…</string>
+  <string name="rtt_transcript_advisory">คู่สนทนาจะเห็นคุณกำลังพิมพ์ ระบบจะจัดเก็บการถอดเสียงไว้ในประวัติการโทรบนอุปกรณ์ของคุณ</string>
+</resources>
diff --git a/java/com/android/incallui/rtt/impl/res/values-tl/strings.xml b/java/com/android/incallui/rtt/impl/res/values-tl/strings.xml
new file mode 100644
index 0000000..125fc43
--- /dev/null
+++ b/java/com/android/incallui/rtt/impl/res/values-tl/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="content_description_rtt_check_button">Magpatuloy</string>
+  <string name="rtt_input_hint">Mag-type ng mensahe</string>
+  <string name="content_description_rtt_chat_avatar">Avatar</string>
+  <string name="rtt_button_back">Bumalik</string>
+  <string name="rtt_status_banner_text">Hinihintay si %s na sumali sa RTT na tawag…</string>
+  <string name="rtt_transcript_advisory">Makikita kang nata-type ng kausap mo. Ini-store ang mga transcript sa iyong device sa history ng tawag.</string>
+</resources>
diff --git a/java/com/android/incallui/rtt/impl/res/values-tr/strings.xml b/java/com/android/incallui/rtt/impl/res/values-tr/strings.xml
new file mode 100644
index 0000000..b027163
--- /dev/null
+++ b/java/com/android/incallui/rtt/impl/res/values-tr/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="content_description_rtt_check_button">Gönder</string>
+  <string name="rtt_input_hint">Mesaj yazın</string>
+  <string name="content_description_rtt_chat_avatar">Avatar</string>
+  <string name="rtt_button_back">Geri</string>
+  <string name="rtt_status_banner_text">%s adlı kullanıcının RTT çağrısına katılması bekleniyor…</string>
+  <string name="rtt_transcript_advisory">Diğer taraf sizin yazmakta olduğunuzu görebilir. Çeviri yazılar, cihazınızdaki çağrı geçmişinde depolanır.</string>
+</resources>
diff --git a/java/com/android/incallui/rtt/impl/res/values-uk/strings.xml b/java/com/android/incallui/rtt/impl/res/values-uk/strings.xml
new file mode 100644
index 0000000..7aa31cd
--- /dev/null
+++ b/java/com/android/incallui/rtt/impl/res/values-uk/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="content_description_rtt_check_button">Продовжити</string>
+  <string name="rtt_input_hint">Напишіть повідомлення</string>
+  <string name="content_description_rtt_chat_avatar">Аватар</string>
+  <string name="rtt_button_back">Назад</string>
+  <string name="rtt_status_banner_text">Чекаємо, доки до виклику RTT приєднається %s.</string>
+  <string name="rtt_transcript_advisory">Співрозмовник бачить, що ви вводите текст. Транскрипція зберігається на вашому пристрої в історії викликів.</string>
+</resources>
diff --git a/java/com/android/incallui/rtt/impl/res/values-ur/strings.xml b/java/com/android/incallui/rtt/impl/res/values-ur/strings.xml
new file mode 100644
index 0000000..bc17b65
--- /dev/null
+++ b/java/com/android/incallui/rtt/impl/res/values-ur/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="content_description_rtt_check_button">آگے جائیں</string>
+  <string name="rtt_input_hint">پیغام ٹائپ کریں</string>
+  <string name="content_description_rtt_chat_avatar">اوتار</string>
+  <string name="rtt_button_back">پیچھے</string>
+  <string name="rtt_status_banner_text">‏%s کے RTT کال میں شامل ہونے کا انتظار کیا جا رہا ہے…</string>
+  <string name="rtt_transcript_advisory">دوسری پارٹی آپ کو ٹائپ کرتے ہوئے دیکھ سکتی ہے۔ ٹرانسکرپٹس کو آپ کے آلہ پر کال کی سرگزشت میں اسٹور کیا جاتا ہے۔</string>
+</resources>
diff --git a/java/com/android/incallui/rtt/impl/res/values-uz/strings.xml b/java/com/android/incallui/rtt/impl/res/values-uz/strings.xml
new file mode 100644
index 0000000..bcd181d
--- /dev/null
+++ b/java/com/android/incallui/rtt/impl/res/values-uz/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="content_description_rtt_check_button">Davom etish</string>
+  <string name="rtt_input_hint">Xabar yozing</string>
+  <string name="content_description_rtt_chat_avatar">Avatar</string>
+  <string name="rtt_button_back">Orqaga</string>
+  <string name="rtt_status_banner_text">%s suhbatga kirishi kutilmoqda…</string>
+  <string name="rtt_transcript_advisory">Hamsuhbatingiz yozayotgan xabaringizni ko‘ra oladi. Transkripsiyalar qurilmaga, chaqiruvlar jurnaliga saqlanadi.</string>
+</resources>
diff --git a/java/com/android/incallui/rtt/impl/res/values-vi/strings.xml b/java/com/android/incallui/rtt/impl/res/values-vi/strings.xml
new file mode 100644
index 0000000..2f87fc8
--- /dev/null
+++ b/java/com/android/incallui/rtt/impl/res/values-vi/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="content_description_rtt_check_button">Tiếp tục</string>
+  <string name="rtt_input_hint">Nhập tin nhắn</string>
+  <string name="content_description_rtt_chat_avatar">Hình đại diện</string>
+  <string name="rtt_button_back">Quay lại</string>
+  <string name="rtt_status_banner_text">Đang chờ %s tham gia cuộc gọi Tin nhắn theo thời gian thực (RTT)...</string>
+  <string name="rtt_transcript_advisory">Bên kia có thể thấy bạn đang nhập. Bản chép lời được lưu trữ trong nhật ký cuộc gọi trên thiết bị của bạn.</string>
+</resources>
diff --git a/java/com/android/incallui/rtt/impl/res/values-zh-rCN/strings.xml b/java/com/android/incallui/rtt/impl/res/values-zh-rCN/strings.xml
new file mode 100644
index 0000000..4216ae9
--- /dev/null
+++ b/java/com/android/incallui/rtt/impl/res/values-zh-rCN/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="content_description_rtt_check_button">继续</string>
+  <string name="rtt_input_hint">输入信息</string>
+  <string name="content_description_rtt_chat_avatar">头像</string>
+  <string name="rtt_button_back">返回</string>
+  <string name="rtt_status_banner_text">正在等待%s加入 RTT 通话…</string>
+  <string name="rtt_transcript_advisory">另一方可以看到您正在输入内容。转录的内容会存储在您设备上的通话记录中。</string>
+</resources>
diff --git a/java/com/android/incallui/rtt/impl/res/values-zh-rHK/strings.xml b/java/com/android/incallui/rtt/impl/res/values-zh-rHK/strings.xml
new file mode 100644
index 0000000..00a0e71
--- /dev/null
+++ b/java/com/android/incallui/rtt/impl/res/values-zh-rHK/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="content_description_rtt_check_button">立即開始</string>
+  <string name="rtt_input_hint">輸入訊息</string>
+  <string name="content_description_rtt_chat_avatar">顯示圖片</string>
+  <string name="rtt_button_back">上一步</string>
+  <string name="rtt_status_banner_text">正在等待%s加入 RTT 通話…</string>
+  <string name="rtt_transcript_advisory">對方可看到您正在輸入訊息。轉錄內容會儲存在您裝置的通話記錄中。</string>
+</resources>
diff --git a/java/com/android/incallui/rtt/impl/res/values-zh-rTW/strings.xml b/java/com/android/incallui/rtt/impl/res/values-zh-rTW/strings.xml
new file mode 100644
index 0000000..046ecfd
--- /dev/null
+++ b/java/com/android/incallui/rtt/impl/res/values-zh-rTW/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="content_description_rtt_check_button">請說</string>
+  <string name="rtt_input_hint">輸入訊息</string>
+  <string name="content_description_rtt_chat_avatar">顯示圖片</string>
+  <string name="rtt_button_back">返回</string>
+  <string name="rtt_status_banner_text">正在等待%s加入即時文字訊息通話…</string>
+  <string name="rtt_transcript_advisory">對方可以看到你正在輸入訊息。系統會將留言轉錄儲存在裝置的通話記錄中。</string>
+</resources>
diff --git a/java/com/android/incallui/rtt/impl/res/values-zu/strings.xml b/java/com/android/incallui/rtt/impl/res/values-zu/strings.xml
new file mode 100644
index 0000000..1334539
--- /dev/null
+++ b/java/com/android/incallui/rtt/impl/res/values-zu/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="content_description_rtt_check_button">Qhubekela phambili</string>
+  <string name="rtt_input_hint">Thayipha umlayezo</string>
+  <string name="content_description_rtt_chat_avatar">Isithombe</string>
+  <string name="rtt_button_back">Emuva</string>
+  <string name="rtt_status_banner_text">Ilindele u-%s ukuthi ajoyine ikholi ye-RTT…</string>
+  <string name="rtt_transcript_advisory">Olunye uhlangothi lungakubona uthayipha. Okulotshiwe kugcinwa kudivayisi yakho kumlando wekholi.</string>
+</resources>
diff --git a/java/com/android/incallui/rtt/impl/res/values/dimens.xml b/java/com/android/incallui/rtt/impl/res/values/dimens.xml
index 4c3fe02..cab9da0 100644
--- a/java/com/android/incallui/rtt/impl/res/values/dimens.xml
+++ b/java/com/android/incallui/rtt/impl/res/values/dimens.xml
@@ -18,4 +18,9 @@
   <dimen name="rtt_message_margin_top">16dp</dimen>
   <dimen name="rtt_same_group_message_margin_top">2dp</dimen>
   <dimen name="rtt_overflow_menu_width">180dp</dimen>
-</resources>
\ No newline at end of file
+  <dimen name="rtt_overflow_menu_elevation">8dp</dimen>
+  <dimen name="rtt_avatar_size">40dp</dimen>
+  <dimen name="rtt_banner_height">56dp</dimen>
+  <!-- This is used to control image size inside the button. -->
+  <dimen name="rtt_banner_button_padding">12dp</dimen>
+</resources>
diff --git a/java/com/android/incallui/rtt/impl/res/values/ids.xml b/java/com/android/incallui/rtt/impl/res/values/ids.xml
new file mode 100644
index 0000000..3e4755b
--- /dev/null
+++ b/java/com/android/incallui/rtt/impl/res/values/ids.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2018 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+<resources>
+  <item name="rtt_on_hold_banner" type="id"/>
+</resources>
diff --git a/java/com/android/incallui/rtt/impl/res/values/strings.xml b/java/com/android/incallui/rtt/impl/res/values/strings.xml
index 0b9eb71..fc60ece 100644
--- a/java/com/android/incallui/rtt/impl/res/values/strings.xml
+++ b/java/com/android/incallui/rtt/impl/res/values/strings.xml
@@ -14,7 +14,7 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License
   -->
-<resources>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Content description for submit chat input button. [CHAR LIMIT=NONE] -->
   <string name="content_description_rtt_check_button">Go ahead</string>
 
@@ -23,4 +23,14 @@
 
   <!-- Content description for avatar of RTT chat message. [CHAR LIMIT=NONE] -->
   <string name="content_description_rtt_chat_avatar">Avatar</string>
-</resources>
\ No newline at end of file
+
+  <!-- Text for back button. [CHAR LIMIT=20] -->
+  <string name="rtt_button_back">Back</string>
+
+  <!-- Text for status banner. [CHAR LIMIT=100] -->
+  <string name="rtt_status_banner_text">Waiting for <xliff:g id="name">%s</xliff:g> to join RTT call&#8230;</string>
+
+  <!-- Text for RTT transcript advisory. [CHAR LIMIT=NONE] -->
+  <string name="rtt_transcript_advisory">The other party can see you typing. Transcripts are stored on your device in the call history.</string>
+
+</resources>
diff --git a/java/com/android/incallui/rtt/impl/res/values/styles.xml b/java/com/android/incallui/rtt/impl/res/values/styles.xml
index bbacde8..667cd12 100644
--- a/java/com/android/incallui/rtt/impl/res/values/styles.xml
+++ b/java/com/android/incallui/rtt/impl/res/values/styles.xml
@@ -40,4 +40,10 @@
     <item name="android:theme">@style/ButtonTheme</item>
     <item name="android:background">?attr/selectableItemBackground</item>
   </style>
+
+  <style name="OverflowMenu">
+    <item name="android:popupAnimationStyle">@android:style/Animation.Dialog</item>
+    <item name="android:popupBackground">@drawable/overflow_menu_background</item>
+    <item name="android:popupElevation">@dimen/rtt_overflow_menu_elevation</item>
+  </style>
 </resources>
\ No newline at end of file
diff --git a/java/com/android/incallui/rtt/protocol/AndroidManifest.xml b/java/com/android/incallui/rtt/protocol/AndroidManifest.xml
index 52514a5..c0d39b0 100644
--- a/java/com/android/incallui/rtt/protocol/AndroidManifest.xml
+++ b/java/com/android/incallui/rtt/protocol/AndroidManifest.xml
@@ -17,6 +17,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.android.incallui.rtt.protocol">
   <uses-sdk
-      android:minSdkVersion="23"
+      android:minSdkVersion="24"
       android:targetSdkVersion="26"/>
 </manifest>
\ No newline at end of file
diff --git a/java/com/android/incallui/rtt/protocol/Constants.java b/java/com/android/incallui/rtt/protocol/Constants.java
index 5806bba..1c13b07 100644
--- a/java/com/android/incallui/rtt/protocol/Constants.java
+++ b/java/com/android/incallui/rtt/protocol/Constants.java
@@ -20,5 +20,5 @@
 public interface Constants {
 
   /** String used to break bubble, which means one RTT message is complete. */
-  String BUBBLE_BREAKER = "\n\n";
+  String BUBBLE_BREAKER = "\n";
 }
diff --git a/java/com/android/incallui/rtt/protocol/RttCallScreen.java b/java/com/android/incallui/rtt/protocol/RttCallScreen.java
index 916dfb8..420274c 100644
--- a/java/com/android/incallui/rtt/protocol/RttCallScreen.java
+++ b/java/com/android/incallui/rtt/protocol/RttCallScreen.java
@@ -17,9 +17,13 @@
 package com.android.incallui.rtt.protocol;
 
 import android.support.v4.app.Fragment;
+import com.android.dialer.rtt.RttTranscript;
+import com.android.dialer.rtt.RttTranscriptMessage;
+import com.android.incallui.incall.protocol.InCallScreen;
+import java.util.List;
 
 /** Interface for call RTT call module. */
-public interface RttCallScreen {
+public interface RttCallScreen extends InCallScreen {
 
   void onRttScreenStart();
 
@@ -27,6 +31,10 @@
 
   void onRemoteMessage(String message);
 
+  void onRestoreRttChat(RttTranscript rttTranscript);
+
+  List<RttTranscriptMessage> getRttTranscriptMessageList();
+
   Fragment getRttCallScreenFragment();
 
   String getCallId();
diff --git a/java/com/android/incallui/rtt/protocol/RttCallScreenDelegate.java b/java/com/android/incallui/rtt/protocol/RttCallScreenDelegate.java
index 8c484a8..990c075 100644
--- a/java/com/android/incallui/rtt/protocol/RttCallScreenDelegate.java
+++ b/java/com/android/incallui/rtt/protocol/RttCallScreenDelegate.java
@@ -26,4 +26,6 @@
   void onRttCallScreenUiUnready();
 
   void onLocalMessage(String message);
+
+  void onSaveRttTranscript();
 }
diff --git a/java/com/android/incallui/rtt/protocol/RttChatMessage.java b/java/com/android/incallui/rtt/protocol/RttChatMessage.java
new file mode 100644
index 0000000..5680529
--- /dev/null
+++ b/java/com/android/incallui/rtt/protocol/RttChatMessage.java
@@ -0,0 +1,230 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.incallui.rtt.protocol;
+
+import android.support.annotation.NonNull;
+import com.android.dialer.common.Assert;
+import com.android.dialer.rtt.RttTranscript;
+import com.android.dialer.rtt.RttTranscriptMessage;
+import com.google.common.base.Splitter;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+/** Message class that holds one RTT chat content. */
+public final class RttChatMessage {
+
+  private static final Splitter SPLITTER = Splitter.on(Constants.BUBBLE_BREAKER);
+
+  public boolean isRemote;
+  private long timstamp;
+  private final StringBuilder content = new StringBuilder();
+  private boolean isFinished;
+
+  public boolean isFinished() {
+    return isFinished;
+  }
+
+  public void finish() {
+    isFinished = true;
+  }
+
+  public void unfinish() {
+    isFinished = false;
+  }
+
+  public void append(String text) {
+    for (int i = 0; i < text.length(); i++) {
+      char c = text.charAt(i);
+      if (c == '\b' && content.length() > 0 && content.charAt(content.length() - 1) != '\b') {
+        content.deleteCharAt(content.length() - 1);
+      } else {
+        content.append(c);
+      }
+    }
+  }
+
+  public String getContent() {
+    return content.toString();
+  }
+
+  /**
+   * Computes delta change of two string.
+   *
+   * <p>e.g. "hello world" -> "hello" : "\b\b\b\b\b\b"
+   *
+   * <p>"hello world" -> "hello mom!" : "\b\b\b\b\bmom!"
+   *
+   * <p>"hello world" -> "hello d" : "\b\b\b\b\bd"
+   *
+   * <p>"hello world" -> "hello new world" : "\b\b\b\b\bnew world"
+   */
+  public static String computeChangedString(String oldMessage, String newMesssage) {
+    StringBuilder modify = new StringBuilder();
+    int indexChangeStart = 0;
+    while (indexChangeStart < oldMessage.length()
+        && indexChangeStart < newMesssage.length()
+        && oldMessage.charAt(indexChangeStart) == newMesssage.charAt(indexChangeStart)) {
+      indexChangeStart++;
+    }
+    for (int i = indexChangeStart; i < oldMessage.length(); i++) {
+      modify.append('\b');
+    }
+    for (int i = indexChangeStart; i < newMesssage.length(); i++) {
+      modify.append(newMesssage.charAt(i));
+    }
+    return modify.toString();
+  }
+
+  public static RttTranscript getRttTranscriptWithNewRemoteMessage(
+      RttTranscript rttTranscript, @NonNull String text) {
+    List<RttChatMessage> messageList = fromTranscript(rttTranscript);
+    updateRemoteRttChatMessage(messageList, text);
+    return RttTranscript.newBuilder()
+        .setId(rttTranscript.getId())
+        .setNumber(rttTranscript.getNumber())
+        .setTimestamp(rttTranscript.getTimestamp())
+        .addAllMessages(toTranscriptMessageList(messageList))
+        .build();
+  }
+
+  /** Update list of {@code RttChatMessage} based on given remote text. */
+  public static void updateRemoteRttChatMessage(
+      List<RttChatMessage> messageList, @NonNull String text) {
+    Assert.isNotNull(messageList);
+    Iterator<String> splitText = SPLITTER.split(text).iterator();
+
+    while (splitText.hasNext()) {
+      String singleMessageContent = splitText.next();
+      RttChatMessage message;
+      int index = getLastIndexUnfinishedRemoteMessage(messageList);
+      if (index < 0) {
+        message = new RttChatMessage();
+        message.append(singleMessageContent);
+        message.isRemote = true;
+        if (splitText.hasNext()) {
+          message.finish();
+        }
+        if (message.content.length() != 0) {
+          messageList.add(message);
+        }
+      } else {
+        message = messageList.get(index);
+        message.append(singleMessageContent);
+        if (splitText.hasNext()) {
+          message.finish();
+        }
+        if (message.content.length() == 0) {
+          messageList.remove(index);
+        }
+      }
+      StringBuilder content = message.content;
+      // Delete previous messages.
+      while (content.length() > 0 && content.charAt(0) == '\b') {
+        messageList.remove(message);
+        content.delete(0, 1);
+        int previous = getLastIndexRemoteMessage(messageList);
+        // There are more backspaces than existing characters.
+        if (previous < 0) {
+          while (content.length() > 0 && content.charAt(0) == '\b') {
+            content.deleteCharAt(0);
+          }
+          // Add message if there are still characters after backspaces.
+          if (content.length() > 0) {
+            message = new RttChatMessage();
+            message.append(content.toString());
+            message.isRemote = true;
+            if (splitText.hasNext()) {
+              message.finish();
+            }
+            messageList.add(message);
+          }
+          break;
+        }
+        message = messageList.get(previous);
+        message.unfinish();
+        message.append(content.toString());
+        content = message.content;
+      }
+    }
+    if (text.endsWith(Constants.BUBBLE_BREAKER)) {
+      int lastIndexRemoteMessage = getLastIndexRemoteMessage(messageList);
+      messageList.get(lastIndexRemoteMessage).finish();
+    }
+  }
+
+  private static int getLastIndexUnfinishedRemoteMessage(List<RttChatMessage> messageList) {
+    int i = messageList.size() - 1;
+    while (i >= 0 && (!messageList.get(i).isRemote || messageList.get(i).isFinished)) {
+      i--;
+    }
+    return i;
+  }
+
+  public static int getLastIndexRemoteMessage(List<RttChatMessage> messageList) {
+    int i = messageList.size() - 1;
+    while (i >= 0 && !messageList.get(i).isRemote) {
+      i--;
+    }
+    return i;
+  }
+
+  public static int getLastIndexLocalMessage(List<RttChatMessage> messageList) {
+    int i = messageList.size() - 1;
+    while (i >= 0 && messageList.get(i).isRemote) {
+      i--;
+    }
+    return i;
+  }
+
+  public static List<RttTranscriptMessage> toTranscriptMessageList(
+      List<RttChatMessage> messageList) {
+    List<RttTranscriptMessage> transcriptMessageList = new ArrayList<>();
+    for (RttChatMessage message : messageList) {
+      transcriptMessageList.add(
+          RttTranscriptMessage.newBuilder()
+              .setContent(message.getContent())
+              .setTimestamp(message.timstamp)
+              .setIsRemote(message.isRemote)
+              .setIsFinished(message.isFinished)
+              .build());
+    }
+    return transcriptMessageList;
+  }
+
+  public static List<RttChatMessage> fromTranscript(RttTranscript rttTranscript) {
+    List<RttChatMessage> messageList = new ArrayList<>();
+    if (rttTranscript == null) {
+      return messageList;
+    }
+    for (RttTranscriptMessage message : rttTranscript.getMessagesList()) {
+      RttChatMessage chatMessage = new RttChatMessage();
+      chatMessage.append(message.getContent());
+      chatMessage.timstamp = message.getTimestamp();
+      chatMessage.isRemote = message.getIsRemote();
+      if (message.getIsFinished()) {
+        chatMessage.finish();
+      }
+      messageList.add(chatMessage);
+    }
+    return messageList;
+  }
+
+  public RttChatMessage() {
+    timstamp = System.currentTimeMillis();
+  }
+}
diff --git a/java/com/android/incallui/sessiondata/MultimediaFragment.java b/java/com/android/incallui/sessiondata/MultimediaFragment.java
index 6c2490f..ec3a6ff 100644
--- a/java/com/android/incallui/sessiondata/MultimediaFragment.java
+++ b/java/com/android/incallui/sessiondata/MultimediaFragment.java
@@ -34,6 +34,7 @@
 import com.android.dialer.common.FragmentUtils;
 import com.android.dialer.common.LogUtil;
 import com.android.dialer.multimedia.MultimediaData;
+import com.android.dialer.theme.base.ThemeComponent;
 import com.android.incallui.maps.MapsComponent;
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.load.DataSource;
@@ -106,6 +107,10 @@
   @Override
   public View onCreateView(
       LayoutInflater layoutInflater, @Nullable ViewGroup viewGroup, @Nullable Bundle bundle) {
+    layoutInflater =
+        layoutInflater.cloneInContext(
+            ThemeComponent.get(getContext()).theme().getThemedContext(getContext()));
+
     if (isSpam) {
       LogUtil.i("MultimediaFragment.onCreateView", "show spam layout");
       return layoutInflater.inflate(R.layout.fragment_spam, viewGroup, false);
diff --git a/java/com/android/incallui/sessiondata/res/drawable/answer_data_background.xml b/java/com/android/incallui/sessiondata/res/drawable/answer_data_background.xml
index 1d481f3..cb76633 100644
--- a/java/com/android/incallui/sessiondata/res/drawable/answer_data_background.xml
+++ b/java/com/android/incallui/sessiondata/res/drawable/answer_data_background.xml
@@ -19,5 +19,5 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
   <corners android:radius="16dp"/>
-  <solid android:color="@color/background_dialer_white"/>
+  <solid android:color="?android:attr/colorBackground"/>
 </shape>
diff --git a/java/com/android/incallui/sessiondata/res/drawable/spam_container_background.xml b/java/com/android/incallui/sessiondata/res/drawable/spam_container_background.xml
index f01fe51..023012b 100644
--- a/java/com/android/incallui/sessiondata/res/drawable/spam_container_background.xml
+++ b/java/com/android/incallui/sessiondata/res/drawable/spam_container_background.xml
@@ -18,5 +18,5 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
   <corners android:radius="16dp"/>
-  <solid android:color="@color/background_dialer_light"/>
+  <solid android:color="?android:attr/colorBackgroundFloating"/>
 </shape>
\ No newline at end of file
diff --git a/java/com/android/incallui/sessiondata/res/layout/fragment_composer_text.xml b/java/com/android/incallui/sessiondata/res/layout/fragment_composer_text.xml
index b93db63..5da3cc4 100644
--- a/java/com/android/incallui/sessiondata/res/layout/fragment_composer_text.xml
+++ b/java/com/android/incallui/sessiondata/res/layout/fragment_composer_text.xml
@@ -39,7 +39,7 @@
       android:paddingEnd="32dp"
       android:minHeight="108dp"
       android:lineSpacingMultiplier="1.2"
-      android:textColor="@color/background_dialer_white"
+      android:textColor="?android:attr/textColorPrimaryInverse"
       android:textAppearance="@style/Dialer.Incall.TextAppearance.Message"
       android:background="@drawable/answer_text_only_background"
       app:autoSizeTextType="uniform"
diff --git a/java/com/android/incallui/sessiondata/res/layout/fragment_spam.xml b/java/com/android/incallui/sessiondata/res/layout/fragment_spam.xml
index ccf69a5..65535b1 100644
--- a/java/com/android/incallui/sessiondata/res/layout/fragment_spam.xml
+++ b/java/com/android/incallui/sessiondata/res/layout/fragment_spam.xml
@@ -38,14 +38,13 @@
         android:layout_height="wrap_content"
         android:layout_marginBottom="18dp"
         android:src="@drawable/quantum_ic_image_white_24"
-        android:tint="#546e7a"/>
+        android:tint="?colorIcon"/>
 
     <TextView
         android:id="@+id/spam_text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/spam_photo_text"
-        android:textColor="#546e7a"
-        android:textSize="12sp"/>
+        style="@style/Dialer.TextAppearance.Secondary2"/>
   </LinearLayout>
 </FrameLayout>
\ No newline at end of file
diff --git a/java/com/android/incallui/sessiondata/res/values-af/strings.xml b/java/com/android/incallui/sessiondata/res/values-af/strings.xml
index 50f00b3..e03a791 100644
--- a/java/com/android/incallui/sessiondata/res/values-af/strings.xml
+++ b/java/com/android/incallui/sessiondata/res/values-af/strings.xml
@@ -1,22 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="spam_photo_text" msgid="5250301844057954813">"Antwoord om foto te onthul"</string>
-    <string name="spam_message_text" msgid="6522893079398269847">"Antwoord om boodskap te onthul"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_photo_text">Antwoord om foto te onthul</string>
+  <string name="spam_message_text">Antwoord om boodskap te onthul</string>
 </resources>
diff --git a/java/com/android/incallui/sessiondata/res/values-am/strings.xml b/java/com/android/incallui/sessiondata/res/values-am/strings.xml
index f428755..fb82f56 100644
--- a/java/com/android/incallui/sessiondata/res/values-am/strings.xml
+++ b/java/com/android/incallui/sessiondata/res/values-am/strings.xml
@@ -1,22 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="spam_photo_text" msgid="5250301844057954813">"ፎቶን ለመግለጥ ይመልሱ"</string>
-    <string name="spam_message_text" msgid="6522893079398269847">"መልዕክትን ለመግለጥ ይመልሱ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_photo_text">ፎቶን ለመግለጥ ይመልሱ</string>
+  <string name="spam_message_text">መልዕክትን ለመግለጥ ይመልሱ</string>
 </resources>
diff --git a/java/com/android/incallui/sessiondata/res/values-ar/strings.xml b/java/com/android/incallui/sessiondata/res/values-ar/strings.xml
index c2a6773..c059ca4 100644
--- a/java/com/android/incallui/sessiondata/res/values-ar/strings.xml
+++ b/java/com/android/incallui/sessiondata/res/values-ar/strings.xml
@@ -1,22 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="spam_photo_text" msgid="5250301844057954813">"الرد لكشف الصورة"</string>
-    <string name="spam_message_text" msgid="6522893079398269847">"الرد لكشف الرسالة"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_photo_text">الرد لكشف الصورة</string>
+  <string name="spam_message_text">الرد لكشف الرسالة</string>
 </resources>
diff --git a/java/com/android/incallui/sessiondata/res/values-az/strings.xml b/java/com/android/incallui/sessiondata/res/values-az/strings.xml
index bc98aa4..d6777db 100644
--- a/java/com/android/incallui/sessiondata/res/values-az/strings.xml
+++ b/java/com/android/incallui/sessiondata/res/values-az/strings.xml
@@ -1,22 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="spam_photo_text" msgid="5250301844057954813">"Fotonu görmək üçün cavab verin"</string>
-    <string name="spam_message_text" msgid="6522893079398269847">"Mesajı görmək üçün cavab verin"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_photo_text">Fotonu görmək üçün cavab verin</string>
+  <string name="spam_message_text">Mesajı görmək üçün cavab verin</string>
 </resources>
diff --git a/java/com/android/incallui/sessiondata/res/values-b+sr+Latn/strings.xml b/java/com/android/incallui/sessiondata/res/values-b+sr+Latn/strings.xml
index 520528b..886004c 100644
--- a/java/com/android/incallui/sessiondata/res/values-b+sr+Latn/strings.xml
+++ b/java/com/android/incallui/sessiondata/res/values-b+sr+Latn/strings.xml
@@ -1,22 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="spam_photo_text" msgid="5250301844057954813">"Odgovorite da biste prikazali sliku"</string>
-    <string name="spam_message_text" msgid="6522893079398269847">"Odgovorite da biste prikazali poruku"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_photo_text">Odgovorite da biste prikazali sliku</string>
+  <string name="spam_message_text">Odgovorite da biste prikazali poruku</string>
 </resources>
diff --git a/java/com/android/incallui/sessiondata/res/values-be/strings.xml b/java/com/android/incallui/sessiondata/res/values-be/strings.xml
index f6cca22..0c3e270 100644
--- a/java/com/android/incallui/sessiondata/res/values-be/strings.xml
+++ b/java/com/android/incallui/sessiondata/res/values-be/strings.xml
@@ -1,22 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="spam_photo_text" msgid="5250301844057954813">"Адкажыце, каб адкрыць фота"</string>
-    <string name="spam_message_text" msgid="6522893079398269847">"Адкажыце, каб адкрыць паведамленне"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_photo_text">Адкажыце, каб адкрыць фота</string>
+  <string name="spam_message_text">Адкажыце, каб адкрыць паведамленне</string>
 </resources>
diff --git a/java/com/android/incallui/sessiondata/res/values-bg/strings.xml b/java/com/android/incallui/sessiondata/res/values-bg/strings.xml
index 28db828..62a267b 100644
--- a/java/com/android/incallui/sessiondata/res/values-bg/strings.xml
+++ b/java/com/android/incallui/sessiondata/res/values-bg/strings.xml
@@ -1,22 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="spam_photo_text" msgid="5250301844057954813">"Отговорете, за да се покаже снимката"</string>
-    <string name="spam_message_text" msgid="6522893079398269847">"Отговорете, за да се покаже съобщението"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_photo_text">Отговорете, за да се покаже снимката</string>
+  <string name="spam_message_text">Отговорете, за да се покаже съобщението</string>
 </resources>
diff --git a/java/com/android/incallui/sessiondata/res/values-bn/strings.xml b/java/com/android/incallui/sessiondata/res/values-bn/strings.xml
index 697fc49..94a9ace 100644
--- a/java/com/android/incallui/sessiondata/res/values-bn/strings.xml
+++ b/java/com/android/incallui/sessiondata/res/values-bn/strings.xml
@@ -1,22 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="spam_photo_text" msgid="5250301844057954813">"ফটো দেখানোর জন্য উত্তর দিন"</string>
-    <string name="spam_message_text" msgid="6522893079398269847">"বার্তা দেখানোর জন্য উত্তর দিন"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_photo_text">ফটো দেখানোর জন্য উত্তর দিন</string>
+  <string name="spam_message_text">বার্তা দেখানোর জন্য উত্তর দিন</string>
 </resources>
diff --git a/java/com/android/incallui/sessiondata/res/values-bs/strings.xml b/java/com/android/incallui/sessiondata/res/values-bs/strings.xml
index 276ae4e..4c4e73d 100644
--- a/java/com/android/incallui/sessiondata/res/values-bs/strings.xml
+++ b/java/com/android/incallui/sessiondata/res/values-bs/strings.xml
@@ -1,22 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="spam_photo_text" msgid="5250301844057954813">"Odgovorite da otkrijete fotografiju"</string>
-    <string name="spam_message_text" msgid="6522893079398269847">"Odgovorite da otkrijete poruku"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_photo_text">Odgovorite da otkrijete fotografiju</string>
+  <string name="spam_message_text">Odgovorite da otkrijete poruku</string>
 </resources>
diff --git a/java/com/android/incallui/sessiondata/res/values-ca/strings.xml b/java/com/android/incallui/sessiondata/res/values-ca/strings.xml
index 61764c1..e1c24c3 100644
--- a/java/com/android/incallui/sessiondata/res/values-ca/strings.xml
+++ b/java/com/android/incallui/sessiondata/res/values-ca/strings.xml
@@ -1,22 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="spam_photo_text" msgid="5250301844057954813">"Respon perquè es mostri la foto"</string>
-    <string name="spam_message_text" msgid="6522893079398269847">"Respon per mostrar el missatge"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_photo_text">Respon perquè es mostri la foto</string>
+  <string name="spam_message_text">Respon per mostrar el missatge</string>
 </resources>
diff --git a/java/com/android/incallui/sessiondata/res/values-cs/strings.xml b/java/com/android/incallui/sessiondata/res/values-cs/strings.xml
index bd74f7b..fb8f25a 100644
--- a/java/com/android/incallui/sessiondata/res/values-cs/strings.xml
+++ b/java/com/android/incallui/sessiondata/res/values-cs/strings.xml
@@ -1,22 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="spam_photo_text" msgid="5250301844057954813">"Fotku zobrazíte přijetím"</string>
-    <string name="spam_message_text" msgid="6522893079398269847">"Zprávu zobrazíte přijetím"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_photo_text">Fotku zobrazíte přijetím</string>
+  <string name="spam_message_text">Zprávu zobrazíte přijetím</string>
 </resources>
diff --git a/java/com/android/incallui/sessiondata/res/values-da/strings.xml b/java/com/android/incallui/sessiondata/res/values-da/strings.xml
index f99b58b..f8d702a 100644
--- a/java/com/android/incallui/sessiondata/res/values-da/strings.xml
+++ b/java/com/android/incallui/sessiondata/res/values-da/strings.xml
@@ -1,22 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="spam_photo_text" msgid="5250301844057954813">"Besvar for at se billedet"</string>
-    <string name="spam_message_text" msgid="6522893079398269847">"Besvar for at se beskeden"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_photo_text">Besvar for at se billedet</string>
+  <string name="spam_message_text">Besvar for at se beskeden</string>
 </resources>
diff --git a/java/com/android/incallui/sessiondata/res/values-de/strings.xml b/java/com/android/incallui/sessiondata/res/values-de/strings.xml
index b1483a3..fef61a3 100644
--- a/java/com/android/incallui/sessiondata/res/values-de/strings.xml
+++ b/java/com/android/incallui/sessiondata/res/values-de/strings.xml
@@ -1,22 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="spam_photo_text" msgid="5250301844057954813">"Annehmen, um Foto zu zeigen"</string>
-    <string name="spam_message_text" msgid="6522893079398269847">"Annehmen, um Nachricht zu zeigen"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_photo_text">Annehmen, um Foto zu zeigen</string>
+  <string name="spam_message_text">Annehmen, um Nachricht zu zeigen</string>
 </resources>
diff --git a/java/com/android/incallui/sessiondata/res/values-el/strings.xml b/java/com/android/incallui/sessiondata/res/values-el/strings.xml
index ab21cc0..a569de6 100644
--- a/java/com/android/incallui/sessiondata/res/values-el/strings.xml
+++ b/java/com/android/incallui/sessiondata/res/values-el/strings.xml
@@ -1,22 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="spam_photo_text" msgid="5250301844057954813">"Απαντήστε για να αποκαλύψετε τη φωτογραφία"</string>
-    <string name="spam_message_text" msgid="6522893079398269847">"Απαντήστε για να αποκαλύψετε το μήνυμα"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_photo_text">Απαντήστε για να αποκαλύψετε τη φωτογραφία</string>
+  <string name="spam_message_text">Απαντήστε για να αποκαλύψετε το μήνυμα</string>
 </resources>
diff --git a/java/com/android/incallui/sessiondata/res/values-en-rAU/strings.xml b/java/com/android/incallui/sessiondata/res/values-en-rAU/strings.xml
index fc21cc6..da3800c 100644
--- a/java/com/android/incallui/sessiondata/res/values-en-rAU/strings.xml
+++ b/java/com/android/incallui/sessiondata/res/values-en-rAU/strings.xml
@@ -1,22 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="spam_photo_text" msgid="5250301844057954813">"Answer to reveal photo"</string>
-    <string name="spam_message_text" msgid="6522893079398269847">"Answer to reveal message"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_photo_text">Answer to reveal photo</string>
+  <string name="spam_message_text">Answer to reveal message</string>
 </resources>
diff --git a/java/com/android/incallui/sessiondata/res/values-en-rGB/strings.xml b/java/com/android/incallui/sessiondata/res/values-en-rGB/strings.xml
index fc21cc6..da3800c 100644
--- a/java/com/android/incallui/sessiondata/res/values-en-rGB/strings.xml
+++ b/java/com/android/incallui/sessiondata/res/values-en-rGB/strings.xml
@@ -1,22 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="spam_photo_text" msgid="5250301844057954813">"Answer to reveal photo"</string>
-    <string name="spam_message_text" msgid="6522893079398269847">"Answer to reveal message"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_photo_text">Answer to reveal photo</string>
+  <string name="spam_message_text">Answer to reveal message</string>
 </resources>
diff --git a/java/com/android/incallui/sessiondata/res/values-en-rIN/strings.xml b/java/com/android/incallui/sessiondata/res/values-en-rIN/strings.xml
index fc21cc6..da3800c 100644
--- a/java/com/android/incallui/sessiondata/res/values-en-rIN/strings.xml
+++ b/java/com/android/incallui/sessiondata/res/values-en-rIN/strings.xml
@@ -1,22 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="spam_photo_text" msgid="5250301844057954813">"Answer to reveal photo"</string>
-    <string name="spam_message_text" msgid="6522893079398269847">"Answer to reveal message"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_photo_text">Answer to reveal photo</string>
+  <string name="spam_message_text">Answer to reveal message</string>
 </resources>
diff --git a/java/com/android/incallui/sessiondata/res/values-es-rUS/strings.xml b/java/com/android/incallui/sessiondata/res/values-es-rUS/strings.xml
index 06e59b4..61809c9 100644
--- a/java/com/android/incallui/sessiondata/res/values-es-rUS/strings.xml
+++ b/java/com/android/incallui/sessiondata/res/values-es-rUS/strings.xml
@@ -1,22 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="spam_photo_text" msgid="5250301844057954813">"Responde para revelar la foto"</string>
-    <string name="spam_message_text" msgid="6522893079398269847">"Responde para revelar el mensaje"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_photo_text">Responde para revelar la foto</string>
+  <string name="spam_message_text">Responde para revelar el mensaje</string>
 </resources>
diff --git a/java/com/android/incallui/sessiondata/res/values-es/strings.xml b/java/com/android/incallui/sessiondata/res/values-es/strings.xml
index ef5fe1e..cf7028a 100644
--- a/java/com/android/incallui/sessiondata/res/values-es/strings.xml
+++ b/java/com/android/incallui/sessiondata/res/values-es/strings.xml
@@ -1,22 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="spam_photo_text" msgid="5250301844057954813">"Responder para mostrar la foto"</string>
-    <string name="spam_message_text" msgid="6522893079398269847">"Responder para mostrar el mensaje"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_photo_text">Responder para mostrar la foto</string>
+  <string name="spam_message_text">Responder para mostrar el mensaje</string>
 </resources>
diff --git a/java/com/android/incallui/sessiondata/res/values-et/strings.xml b/java/com/android/incallui/sessiondata/res/values-et/strings.xml
index 88c18df..d68685f 100644
--- a/java/com/android/incallui/sessiondata/res/values-et/strings.xml
+++ b/java/com/android/incallui/sessiondata/res/values-et/strings.xml
@@ -1,22 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="spam_photo_text" msgid="5250301844057954813">"Foto kuvamiseks vastake"</string>
-    <string name="spam_message_text" msgid="6522893079398269847">"Sõnumi kuvamiseks vastake"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_photo_text">Foto kuvamiseks vastake</string>
+  <string name="spam_message_text">Sõnumi kuvamiseks vastake</string>
 </resources>
diff --git a/java/com/android/incallui/sessiondata/res/values-eu/strings.xml b/java/com/android/incallui/sessiondata/res/values-eu/strings.xml
index 89cde1c..22701f5 100644
--- a/java/com/android/incallui/sessiondata/res/values-eu/strings.xml
+++ b/java/com/android/incallui/sessiondata/res/values-eu/strings.xml
@@ -1,22 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="spam_photo_text" msgid="5250301844057954813">"Erantzun argazkia ikusteko"</string>
-    <string name="spam_message_text" msgid="6522893079398269847">"Erantzun mezua ikusteko"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_photo_text">Erantzun argazkia ikusteko</string>
+  <string name="spam_message_text">Erantzun mezua ikusteko</string>
 </resources>
diff --git a/java/com/android/incallui/sessiondata/res/values-fa/strings.xml b/java/com/android/incallui/sessiondata/res/values-fa/strings.xml
index b635876..53885f1 100644
--- a/java/com/android/incallui/sessiondata/res/values-fa/strings.xml
+++ b/java/com/android/incallui/sessiondata/res/values-fa/strings.xml
@@ -1,22 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="spam_photo_text" msgid="5250301844057954813">"پاسخ برای نمایش عکس"</string>
-    <string name="spam_message_text" msgid="6522893079398269847">"پاسخ برای نمایش پیام"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_photo_text">پاسخ برای نمایش عکس</string>
+  <string name="spam_message_text">پاسخ برای نمایش پیام</string>
 </resources>
diff --git a/java/com/android/incallui/sessiondata/res/values-fi/strings.xml b/java/com/android/incallui/sessiondata/res/values-fi/strings.xml
index df25bdc..107aaba 100644
--- a/java/com/android/incallui/sessiondata/res/values-fi/strings.xml
+++ b/java/com/android/incallui/sessiondata/res/values-fi/strings.xml
@@ -1,22 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="spam_photo_text" msgid="5250301844057954813">"Vastaa, niin näet kuvan."</string>
-    <string name="spam_message_text" msgid="6522893079398269847">"Vastaa, niin näet viestin."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_photo_text">Vastaa, niin näet kuvan.</string>
+  <string name="spam_message_text">Vastaa, niin näet viestin.</string>
 </resources>
diff --git a/java/com/android/incallui/sessiondata/res/values-fr-rCA/strings.xml b/java/com/android/incallui/sessiondata/res/values-fr-rCA/strings.xml
index 953ff7f..4fceca3 100644
--- a/java/com/android/incallui/sessiondata/res/values-fr-rCA/strings.xml
+++ b/java/com/android/incallui/sessiondata/res/values-fr-rCA/strings.xml
@@ -1,22 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="spam_photo_text" msgid="5250301844057954813">"Répondre pour révéler la photo"</string>
-    <string name="spam_message_text" msgid="6522893079398269847">"Répondre pour révéler le message"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_photo_text">Répondre pour révéler la photo</string>
+  <string name="spam_message_text">Répondre pour révéler le message</string>
 </resources>
diff --git a/java/com/android/incallui/sessiondata/res/values-fr/strings.xml b/java/com/android/incallui/sessiondata/res/values-fr/strings.xml
index f9bbf9d..3ffd178 100644
--- a/java/com/android/incallui/sessiondata/res/values-fr/strings.xml
+++ b/java/com/android/incallui/sessiondata/res/values-fr/strings.xml
@@ -1,22 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="spam_photo_text" msgid="5250301844057954813">"Répondre pour voir la photo"</string>
-    <string name="spam_message_text" msgid="6522893079398269847">"Répondre pour voir le message"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_photo_text">Répondre pour voir la photo</string>
+  <string name="spam_message_text">Répondre pour voir le message</string>
 </resources>
diff --git a/java/com/android/incallui/sessiondata/res/values-gl/strings.xml b/java/com/android/incallui/sessiondata/res/values-gl/strings.xml
index ca155fa..cd14192 100644
--- a/java/com/android/incallui/sessiondata/res/values-gl/strings.xml
+++ b/java/com/android/incallui/sessiondata/res/values-gl/strings.xml
@@ -1,22 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="spam_photo_text" msgid="5250301844057954813">"Responde para mostrar a foto"</string>
-    <string name="spam_message_text" msgid="6522893079398269847">"Responde para mostrar a mensaxe"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_photo_text">Responde para mostrar a foto</string>
+  <string name="spam_message_text">Responde para mostrar a mensaxe</string>
 </resources>
diff --git a/java/com/android/incallui/sessiondata/res/values-gu/strings.xml b/java/com/android/incallui/sessiondata/res/values-gu/strings.xml
index e0c7c83..7b09234 100644
--- a/java/com/android/incallui/sessiondata/res/values-gu/strings.xml
+++ b/java/com/android/incallui/sessiondata/res/values-gu/strings.xml
@@ -1,22 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="spam_photo_text" msgid="5250301844057954813">"ફોટો બતાવવા માટે જવાબ આપો"</string>
-    <string name="spam_message_text" msgid="6522893079398269847">"સંદેશ બતાવવા માટે જવાબ આપો"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_photo_text">ફોટો બતાવવા માટે જવાબ આપો</string>
+  <string name="spam_message_text">સંદેશ બતાવવા માટે જવાબ આપો</string>
 </resources>
diff --git a/java/com/android/incallui/sessiondata/res/values-hi/strings.xml b/java/com/android/incallui/sessiondata/res/values-hi/strings.xml
index 1588674..b3bfd19 100644
--- a/java/com/android/incallui/sessiondata/res/values-hi/strings.xml
+++ b/java/com/android/incallui/sessiondata/res/values-hi/strings.xml
@@ -1,22 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="spam_photo_text" msgid="5250301844057954813">"फ़ोटो दिखाने के लिए उत्तर दें"</string>
-    <string name="spam_message_text" msgid="6522893079398269847">"संदेश दिखाने के लिए उत्तर दें"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_photo_text">फ़ोटो दिखाने के लिए उत्तर दें</string>
+  <string name="spam_message_text">संदेश दिखाने के लिए उत्तर दें</string>
 </resources>
diff --git a/java/com/android/incallui/sessiondata/res/values-hr/strings.xml b/java/com/android/incallui/sessiondata/res/values-hr/strings.xml
index 5b14d5b..5f64a00 100644
--- a/java/com/android/incallui/sessiondata/res/values-hr/strings.xml
+++ b/java/com/android/incallui/sessiondata/res/values-hr/strings.xml
@@ -1,22 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="spam_photo_text" msgid="5250301844057954813">"Odgovorite da biste prikazali fotografiju"</string>
-    <string name="spam_message_text" msgid="6522893079398269847">"Odgovorite da biste prikazali poruku"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_photo_text">Odgovorite da biste prikazali fotografiju</string>
+  <string name="spam_message_text">Odgovorite da biste prikazali poruku</string>
 </resources>
diff --git a/java/com/android/incallui/sessiondata/res/values-hu/strings.xml b/java/com/android/incallui/sessiondata/res/values-hu/strings.xml
index a89f32d..293862c 100644
--- a/java/com/android/incallui/sessiondata/res/values-hu/strings.xml
+++ b/java/com/android/incallui/sessiondata/res/values-hu/strings.xml
@@ -1,22 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="spam_photo_text" msgid="5250301844057954813">"A fotó felfedéséhez válaszoljon a kérdésre"</string>
-    <string name="spam_message_text" msgid="6522893079398269847">"Az üzenet felfedéséhez válaszoljon a kérdésre"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_photo_text">A fotó felfedéséhez válaszoljon a kérdésre</string>
+  <string name="spam_message_text">Az üzenet felfedéséhez válaszoljon a kérdésre</string>
 </resources>
diff --git a/java/com/android/incallui/sessiondata/res/values-hy/strings.xml b/java/com/android/incallui/sessiondata/res/values-hy/strings.xml
index 84664ee..40d3572 100644
--- a/java/com/android/incallui/sessiondata/res/values-hy/strings.xml
+++ b/java/com/android/incallui/sessiondata/res/values-hy/strings.xml
@@ -1,22 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="spam_photo_text" msgid="5250301844057954813">"Պատասխանեք՝ լուսանկարը տեսնելու համար"</string>
-    <string name="spam_message_text" msgid="6522893079398269847">"Պատասխանեք՝ հաղորդագրությունը տեսնելու համար"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_photo_text">Պատասխանեք՝ լուսանկարը տեսնելու համար</string>
+  <string name="spam_message_text">Պատասխանեք՝ հաղորդագրությունը տեսնելու համար</string>
 </resources>
diff --git a/java/com/android/incallui/sessiondata/res/values-in/strings.xml b/java/com/android/incallui/sessiondata/res/values-in/strings.xml
index d73c4ff..16cebe5 100644
--- a/java/com/android/incallui/sessiondata/res/values-in/strings.xml
+++ b/java/com/android/incallui/sessiondata/res/values-in/strings.xml
@@ -1,22 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="spam_photo_text" msgid="5250301844057954813">"Jawab untuk menampilkan foto"</string>
-    <string name="spam_message_text" msgid="6522893079398269847">"Jawab untuk menampilkan pesan"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_photo_text">Jawab untuk menampilkan foto</string>
+  <string name="spam_message_text">Jawab untuk menampilkan pesan</string>
 </resources>
diff --git a/java/com/android/incallui/sessiondata/res/values-is/strings.xml b/java/com/android/incallui/sessiondata/res/values-is/strings.xml
index 1185d4e..2a49e49 100644
--- a/java/com/android/incallui/sessiondata/res/values-is/strings.xml
+++ b/java/com/android/incallui/sessiondata/res/values-is/strings.xml
@@ -1,22 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="spam_photo_text" msgid="5250301844057954813">"Svaraðu til að sýna mynd"</string>
-    <string name="spam_message_text" msgid="6522893079398269847">"Svaraðu til að sýna skilaboð"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_photo_text">Svaraðu til að sýna mynd</string>
+  <string name="spam_message_text">Svaraðu til að sýna skilaboð</string>
 </resources>
diff --git a/java/com/android/incallui/sessiondata/res/values-it/strings.xml b/java/com/android/incallui/sessiondata/res/values-it/strings.xml
index 6f8cf64..fe4ddac 100644
--- a/java/com/android/incallui/sessiondata/res/values-it/strings.xml
+++ b/java/com/android/incallui/sessiondata/res/values-it/strings.xml
@@ -1,22 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="spam_photo_text" msgid="5250301844057954813">"Rispondi per visualizzare la foto"</string>
-    <string name="spam_message_text" msgid="6522893079398269847">"Rispondi per visualizzare il messaggio"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_photo_text">Rispondi per visualizzare la foto</string>
+  <string name="spam_message_text">Rispondi per visualizzare il messaggio</string>
 </resources>
diff --git a/java/com/android/incallui/sessiondata/res/values-iw/strings.xml b/java/com/android/incallui/sessiondata/res/values-iw/strings.xml
index cf376c2..9f84337 100644
--- a/java/com/android/incallui/sessiondata/res/values-iw/strings.xml
+++ b/java/com/android/incallui/sessiondata/res/values-iw/strings.xml
@@ -1,22 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="spam_photo_text" msgid="5250301844057954813">"עליך לענות כדי לחשוף את התמונה"</string>
-    <string name="spam_message_text" msgid="6522893079398269847">"עליך לענות כדי לחשוף את ההודעה"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_photo_text">עליך לענות כדי לחשוף את התמונה</string>
+  <string name="spam_message_text">עליך לענות כדי לחשוף את ההודעה</string>
 </resources>
diff --git a/java/com/android/incallui/sessiondata/res/values-ja/strings.xml b/java/com/android/incallui/sessiondata/res/values-ja/strings.xml
index a327730..44d6dd9 100644
--- a/java/com/android/incallui/sessiondata/res/values-ja/strings.xml
+++ b/java/com/android/incallui/sessiondata/res/values-ja/strings.xml
@@ -1,22 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="spam_photo_text" msgid="5250301844057954813">"応答して写真を表示"</string>
-    <string name="spam_message_text" msgid="6522893079398269847">"応答してメッセージを表示"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_photo_text">応答して写真を表示</string>
+  <string name="spam_message_text">応答してメッセージを表示</string>
 </resources>
diff --git a/java/com/android/incallui/sessiondata/res/values-ka/strings.xml b/java/com/android/incallui/sessiondata/res/values-ka/strings.xml
index 22e5b1d..cf1445e 100644
--- a/java/com/android/incallui/sessiondata/res/values-ka/strings.xml
+++ b/java/com/android/incallui/sessiondata/res/values-ka/strings.xml
@@ -1,22 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="spam_photo_text" msgid="5250301844057954813">"უპასუხეთ ფოტოს გამოსაჩენად"</string>
-    <string name="spam_message_text" msgid="6522893079398269847">"უპასუხეთ შეტყობინების გამოსაჩენად"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_photo_text">უპასუხეთ ფოტოს გამოსაჩენად</string>
+  <string name="spam_message_text">უპასუხეთ შეტყობინების გამოსაჩენად</string>
 </resources>
diff --git a/java/com/android/incallui/sessiondata/res/values-kk/strings.xml b/java/com/android/incallui/sessiondata/res/values-kk/strings.xml
index 96cfdad..0c141ad 100644
--- a/java/com/android/incallui/sessiondata/res/values-kk/strings.xml
+++ b/java/com/android/incallui/sessiondata/res/values-kk/strings.xml
@@ -1,22 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="spam_photo_text" msgid="5250301844057954813">"Суретті ашу үшін жауап беріңіз"</string>
-    <string name="spam_message_text" msgid="6522893079398269847">"Хабарды ашу үшін жауап беріңіз"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_photo_text">Суретті ашу үшін жауап беріңіз</string>
+  <string name="spam_message_text">Хабарды ашу үшін жауап беріңіз</string>
 </resources>
diff --git a/java/com/android/incallui/sessiondata/res/values-km/strings.xml b/java/com/android/incallui/sessiondata/res/values-km/strings.xml
index 6e6e70d..c3f846a 100644
--- a/java/com/android/incallui/sessiondata/res/values-km/strings.xml
+++ b/java/com/android/incallui/sessiondata/res/values-km/strings.xml
@@ -1,22 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="spam_photo_text" msgid="5250301844057954813">"ឆ្លើយ​ដើម្បី​បង្ហាញ​រូបថត"</string>
-    <string name="spam_message_text" msgid="6522893079398269847">"ឆ្លើយដើម្បីបង្ហាញសារ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_photo_text">ឆ្លើយ​ដើម្បី​បង្ហាញ​រូបថត</string>
+  <string name="spam_message_text">ឆ្លើយដើម្បីបង្ហាញសារ</string>
 </resources>
diff --git a/java/com/android/incallui/sessiondata/res/values-kn/strings.xml b/java/com/android/incallui/sessiondata/res/values-kn/strings.xml
index b505f26..08a8210 100644
--- a/java/com/android/incallui/sessiondata/res/values-kn/strings.xml
+++ b/java/com/android/incallui/sessiondata/res/values-kn/strings.xml
@@ -1,22 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="spam_photo_text" msgid="5250301844057954813">"ಫೋಟೋ ತೋರಿಸಲು ಉತ್ತರಿಸಿ"</string>
-    <string name="spam_message_text" msgid="6522893079398269847">"ಸಂದೇಶ ತೋರಿಸಲು ಉತ್ತರಿಸಿ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_photo_text">ಫೋಟೋ ತೋರಿಸಲು ಉತ್ತರಿಸಿ</string>
+  <string name="spam_message_text">ಸಂದೇಶ ತೋರಿಸಲು ಉತ್ತರಿಸಿ</string>
 </resources>
diff --git a/java/com/android/incallui/sessiondata/res/values-ko/strings.xml b/java/com/android/incallui/sessiondata/res/values-ko/strings.xml
index bc6c9ed..8692a02 100644
--- a/java/com/android/incallui/sessiondata/res/values-ko/strings.xml
+++ b/java/com/android/incallui/sessiondata/res/values-ko/strings.xml
@@ -1,22 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="spam_photo_text" msgid="5250301844057954813">"사진을 표시하려면 답장하세요."</string>
-    <string name="spam_message_text" msgid="6522893079398269847">"메시지를 표시하려면 답장하세요."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_photo_text">사진을 표시하려면 답장하세요.</string>
+  <string name="spam_message_text">메시지를 표시하려면 답장하세요.</string>
 </resources>
diff --git a/java/com/android/incallui/sessiondata/res/values-ky/strings.xml b/java/com/android/incallui/sessiondata/res/values-ky/strings.xml
index de14be9..5f64514 100644
--- a/java/com/android/incallui/sessiondata/res/values-ky/strings.xml
+++ b/java/com/android/incallui/sessiondata/res/values-ky/strings.xml
@@ -1,22 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="spam_photo_text" msgid="5250301844057954813">"Сүрөттөрдү ачуу үчүн жооп бериңиз"</string>
-    <string name="spam_message_text" msgid="6522893079398269847">"Билдирүүнү ачуу үчүн жооп бериңиз"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_photo_text">Сүрөттөрдү ачуу үчүн жооп бериңиз</string>
+  <string name="spam_message_text">Билдирүүнү ачуу үчүн жооп бериңиз</string>
 </resources>
diff --git a/java/com/android/incallui/sessiondata/res/values-lo/strings.xml b/java/com/android/incallui/sessiondata/res/values-lo/strings.xml
index 3604a19..a815352 100644
--- a/java/com/android/incallui/sessiondata/res/values-lo/strings.xml
+++ b/java/com/android/incallui/sessiondata/res/values-lo/strings.xml
@@ -1,22 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="spam_photo_text" msgid="5250301844057954813">"ຕອບເພື່ອເປີດຮູບພາບ"</string>
-    <string name="spam_message_text" msgid="6522893079398269847">"ຕອບເພື່ອເປີດຂໍ້ຄວາມ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_photo_text">ຕອບເພື່ອເປີດຮູບພາບ</string>
+  <string name="spam_message_text">ຕອບເພື່ອເປີດຂໍ້ຄວາມ</string>
 </resources>
diff --git a/java/com/android/incallui/sessiondata/res/values-lt/strings.xml b/java/com/android/incallui/sessiondata/res/values-lt/strings.xml
index 52d1d7a..6497801 100644
--- a/java/com/android/incallui/sessiondata/res/values-lt/strings.xml
+++ b/java/com/android/incallui/sessiondata/res/values-lt/strings.xml
@@ -1,22 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="spam_photo_text" msgid="5250301844057954813">"Atsakykite, kad galėtumėte pamatyti nuotrauką"</string>
-    <string name="spam_message_text" msgid="6522893079398269847">"Atsakykite, kad galėtumėte pamatyti pranešimą"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_photo_text">Atsakykite, kad galėtumėte pamatyti nuotrauką</string>
+  <string name="spam_message_text">Atsakykite, kad galėtumėte pamatyti pranešimą</string>
 </resources>
diff --git a/java/com/android/incallui/sessiondata/res/values-lv/strings.xml b/java/com/android/incallui/sessiondata/res/values-lv/strings.xml
index 0df140b..558dd8e 100644
--- a/java/com/android/incallui/sessiondata/res/values-lv/strings.xml
+++ b/java/com/android/incallui/sessiondata/res/values-lv/strings.xml
@@ -1,22 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="spam_photo_text" msgid="5250301844057954813">"Atbildēt, lai atklātu fotoattēlu"</string>
-    <string name="spam_message_text" msgid="6522893079398269847">"Atbildēt, lai atklātu ziņojumu"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_photo_text">Atbildēt, lai atklātu fotoattēlu</string>
+  <string name="spam_message_text">Atbildēt, lai atklātu ziņojumu</string>
 </resources>
diff --git a/java/com/android/incallui/sessiondata/res/values-mk/strings.xml b/java/com/android/incallui/sessiondata/res/values-mk/strings.xml
index 80da627..0b9f295 100644
--- a/java/com/android/incallui/sessiondata/res/values-mk/strings.xml
+++ b/java/com/android/incallui/sessiondata/res/values-mk/strings.xml
@@ -1,22 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="spam_photo_text" msgid="5250301844057954813">"Одговорете за да се открие фотографијата"</string>
-    <string name="spam_message_text" msgid="6522893079398269847">"Одговорете за да се открие пораката"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_photo_text">Одговорете за да се открие фотографијата</string>
+  <string name="spam_message_text">Одговорете за да се открие пораката</string>
 </resources>
diff --git a/java/com/android/incallui/sessiondata/res/values-ml/strings.xml b/java/com/android/incallui/sessiondata/res/values-ml/strings.xml
index 40bc208..6e6d0d5 100644
--- a/java/com/android/incallui/sessiondata/res/values-ml/strings.xml
+++ b/java/com/android/incallui/sessiondata/res/values-ml/strings.xml
@@ -1,22 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="spam_photo_text" msgid="5250301844057954813">"ഫോട്ടോ കാണിക്കാൻ ഉത്തരം നൽകുക"</string>
-    <string name="spam_message_text" msgid="6522893079398269847">"സന്ദേശം കാണിക്കാൻ ഉത്തരം നൽകുക"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_photo_text">ഫോട്ടോ കാണിക്കാൻ ഉത്തരം നൽകുക</string>
+  <string name="spam_message_text">സന്ദേശം കാണിക്കാൻ ഉത്തരം നൽകുക</string>
 </resources>
diff --git a/java/com/android/incallui/sessiondata/res/values-mn/strings.xml b/java/com/android/incallui/sessiondata/res/values-mn/strings.xml
index 4694b77..8fa9046 100644
--- a/java/com/android/incallui/sessiondata/res/values-mn/strings.xml
+++ b/java/com/android/incallui/sessiondata/res/values-mn/strings.xml
@@ -1,22 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="spam_photo_text" msgid="5250301844057954813">"Зургийг харуулахын тулд хариулна уу"</string>
-    <string name="spam_message_text" msgid="6522893079398269847">"Зурвасыг харуулахын тулд хариулна уу"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_photo_text">Зургийг харуулахын тулд хариулна уу</string>
+  <string name="spam_message_text">Зурвасыг харуулахын тулд хариулна уу</string>
 </resources>
diff --git a/java/com/android/incallui/sessiondata/res/values-mr/strings.xml b/java/com/android/incallui/sessiondata/res/values-mr/strings.xml
index 0df7d3a..afb79e1 100644
--- a/java/com/android/incallui/sessiondata/res/values-mr/strings.xml
+++ b/java/com/android/incallui/sessiondata/res/values-mr/strings.xml
@@ -1,22 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="spam_photo_text" msgid="5250301844057954813">"फोटो विस्तृत करण्यासाठी उत्तर द्या"</string>
-    <string name="spam_message_text" msgid="6522893079398269847">"संदेश विस्तृत करण्यासाठी उत्तर द्या"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_photo_text">फोटो विस्तृत करण्यासाठी उत्तर द्या</string>
+  <string name="spam_message_text">मेसेज विस्तृत करण्यासाठी उत्तर द्या</string>
 </resources>
diff --git a/java/com/android/incallui/sessiondata/res/values-ms/strings.xml b/java/com/android/incallui/sessiondata/res/values-ms/strings.xml
index c43df3b..9bcbe3b 100644
--- a/java/com/android/incallui/sessiondata/res/values-ms/strings.xml
+++ b/java/com/android/incallui/sessiondata/res/values-ms/strings.xml
@@ -1,22 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="spam_photo_text" msgid="5250301844057954813">"Jawab untuk mendedahkan foto"</string>
-    <string name="spam_message_text" msgid="6522893079398269847">"Jawab untuk mendedahkan mesej"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_photo_text">Jawab untuk mendedahkan foto</string>
+  <string name="spam_message_text">Jawab untuk mendedahkan mesej</string>
 </resources>
diff --git a/java/com/android/incallui/sessiondata/res/values-my/strings.xml b/java/com/android/incallui/sessiondata/res/values-my/strings.xml
index 95802cd..ba9a31e 100644
--- a/java/com/android/incallui/sessiondata/res/values-my/strings.xml
+++ b/java/com/android/incallui/sessiondata/res/values-my/strings.xml
@@ -1,22 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="spam_photo_text" msgid="5250301844057954813">"ဓာတ်ပုံကို ကြည့်နိုင်ရန် ဖြေကြားပေးပါ"</string>
-    <string name="spam_message_text" msgid="6522893079398269847">"မက်ဆေ့ဂျ်ကို ကြည့်နိုင်ရန် ဖြေကြားပေးပါ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_photo_text">ဓာတ်ပုံကို ကြည့်နိုင်ရန် ဖြေကြားပေးပါ</string>
+  <string name="spam_message_text">မက်ဆေ့ဂျ်ကို ကြည့်နိုင်ရန် ဖြေကြားပေးပါ</string>
 </resources>
diff --git a/java/com/android/incallui/sessiondata/res/values-nb/strings.xml b/java/com/android/incallui/sessiondata/res/values-nb/strings.xml
index eeb441f..ed15be4 100644
--- a/java/com/android/incallui/sessiondata/res/values-nb/strings.xml
+++ b/java/com/android/incallui/sessiondata/res/values-nb/strings.xml
@@ -1,22 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="spam_photo_text" msgid="5250301844057954813">"Svar for å få frem bildet"</string>
-    <string name="spam_message_text" msgid="6522893079398269847">"Svar for å få frem meldingen"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_photo_text">Svar for å få frem bildet</string>
+  <string name="spam_message_text">Svar for å få frem meldingen</string>
 </resources>
diff --git a/java/com/android/incallui/sessiondata/res/values-ne/strings.xml b/java/com/android/incallui/sessiondata/res/values-ne/strings.xml
index b6a452a..0f112d7 100644
--- a/java/com/android/incallui/sessiondata/res/values-ne/strings.xml
+++ b/java/com/android/incallui/sessiondata/res/values-ne/strings.xml
@@ -1,22 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="spam_photo_text" msgid="5250301844057954813">"तस्बिर देखाउन जवाफ दिनुहोस्"</string>
-    <string name="spam_message_text" msgid="6522893079398269847">"सन्देश देखाउन जवाफ दिनुहोस्"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_photo_text">तस्बिर देखाउन जवाफ दिनुहोस्</string>
+  <string name="spam_message_text">सन्देश देखाउन जवाफ दिनुहोस्</string>
 </resources>
diff --git a/java/com/android/incallui/sessiondata/res/values-nl/strings.xml b/java/com/android/incallui/sessiondata/res/values-nl/strings.xml
index 328114e..45f44b0 100644
--- a/java/com/android/incallui/sessiondata/res/values-nl/strings.xml
+++ b/java/com/android/incallui/sessiondata/res/values-nl/strings.xml
@@ -1,22 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="spam_photo_text" msgid="5250301844057954813">"Antwoord om de foto te onthullen"</string>
-    <string name="spam_message_text" msgid="6522893079398269847">"Antwoord om het bericht te onthullen"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_photo_text">Antwoord om de foto te onthullen</string>
+  <string name="spam_message_text">Antwoord om het bericht te onthullen</string>
 </resources>
diff --git a/java/com/android/incallui/sessiondata/res/values-no/strings.xml b/java/com/android/incallui/sessiondata/res/values-no/strings.xml
index eeb441f..ed15be4 100644
--- a/java/com/android/incallui/sessiondata/res/values-no/strings.xml
+++ b/java/com/android/incallui/sessiondata/res/values-no/strings.xml
@@ -1,22 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="spam_photo_text" msgid="5250301844057954813">"Svar for å få frem bildet"</string>
-    <string name="spam_message_text" msgid="6522893079398269847">"Svar for å få frem meldingen"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_photo_text">Svar for å få frem bildet</string>
+  <string name="spam_message_text">Svar for å få frem meldingen</string>
 </resources>
diff --git a/java/com/android/incallui/sessiondata/res/values-pa/strings.xml b/java/com/android/incallui/sessiondata/res/values-pa/strings.xml
index c018340..ffcb67b 100644
--- a/java/com/android/incallui/sessiondata/res/values-pa/strings.xml
+++ b/java/com/android/incallui/sessiondata/res/values-pa/strings.xml
@@ -1,22 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="spam_photo_text" msgid="5250301844057954813">"ਫ਼ੋਟੋ ਦਿਖਾਉਣ ਲਈ ਜਵਾਬ ਦਿਓ"</string>
-    <string name="spam_message_text" msgid="6522893079398269847">"ਸੁਨੇਹਾ ਦਿਖਾਉਣ ਲਈ ਜਵਾਬ ਦਿਓ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_photo_text">ਫ਼ੋਟੋ ਦਿਖਾਉਣ ਲਈ ਜਵਾਬ ਦਿਓ</string>
+  <string name="spam_message_text">ਸੁਨੇਹਾ ਦਿਖਾਉਣ ਲਈ ਜਵਾਬ ਦਿਓ</string>
 </resources>
diff --git a/java/com/android/incallui/sessiondata/res/values-pl/strings.xml b/java/com/android/incallui/sessiondata/res/values-pl/strings.xml
index c653a89..416b562 100644
--- a/java/com/android/incallui/sessiondata/res/values-pl/strings.xml
+++ b/java/com/android/incallui/sessiondata/res/values-pl/strings.xml
@@ -1,22 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="spam_photo_text" msgid="5250301844057954813">"Odpowiedz, aby odsłonić zdjęcie"</string>
-    <string name="spam_message_text" msgid="6522893079398269847">"Odpowiedz, aby odsłonić wiadomość"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_photo_text">Odpowiedz, aby odsłonić zdjęcie</string>
+  <string name="spam_message_text">Odpowiedz, aby odsłonić wiadomość</string>
 </resources>
diff --git a/java/com/android/incallui/sessiondata/res/values-pt-rBR/strings.xml b/java/com/android/incallui/sessiondata/res/values-pt-rBR/strings.xml
index 3ebf050..8157fed 100644
--- a/java/com/android/incallui/sessiondata/res/values-pt-rBR/strings.xml
+++ b/java/com/android/incallui/sessiondata/res/values-pt-rBR/strings.xml
@@ -1,22 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="spam_photo_text" msgid="5250301844057954813">"Atender para mostrar a foto"</string>
-    <string name="spam_message_text" msgid="6522893079398269847">"Atender para mostrar a mensagem"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_photo_text">Atender para mostrar a foto</string>
+  <string name="spam_message_text">Atender para mostrar a mensagem</string>
 </resources>
diff --git a/java/com/android/incallui/sessiondata/res/values-pt-rPT/strings.xml b/java/com/android/incallui/sessiondata/res/values-pt-rPT/strings.xml
index 0cfc850..2e9b93f 100644
--- a/java/com/android/incallui/sessiondata/res/values-pt-rPT/strings.xml
+++ b/java/com/android/incallui/sessiondata/res/values-pt-rPT/strings.xml
@@ -1,22 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="spam_photo_text" msgid="5250301844057954813">"Resposta para revelar foto"</string>
-    <string name="spam_message_text" msgid="6522893079398269847">"Resposta para revelar mensagem"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_photo_text">Resposta para revelar foto</string>
+  <string name="spam_message_text">Resposta para revelar mensagem</string>
 </resources>
diff --git a/java/com/android/incallui/sessiondata/res/values-pt/strings.xml b/java/com/android/incallui/sessiondata/res/values-pt/strings.xml
index 3ebf050..8157fed 100644
--- a/java/com/android/incallui/sessiondata/res/values-pt/strings.xml
+++ b/java/com/android/incallui/sessiondata/res/values-pt/strings.xml
@@ -1,22 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="spam_photo_text" msgid="5250301844057954813">"Atender para mostrar a foto"</string>
-    <string name="spam_message_text" msgid="6522893079398269847">"Atender para mostrar a mensagem"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_photo_text">Atender para mostrar a foto</string>
+  <string name="spam_message_text">Atender para mostrar a mensagem</string>
 </resources>
diff --git a/java/com/android/incallui/sessiondata/res/values-ro/strings.xml b/java/com/android/incallui/sessiondata/res/values-ro/strings.xml
index 9f09cb8..4828065 100644
--- a/java/com/android/incallui/sessiondata/res/values-ro/strings.xml
+++ b/java/com/android/incallui/sessiondata/res/values-ro/strings.xml
@@ -1,22 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="spam_photo_text" msgid="5250301844057954813">"Răspundeți pentru a afișa fotografia"</string>
-    <string name="spam_message_text" msgid="6522893079398269847">"Răspundeți pentru a afișa mesajul"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_photo_text">Răspundeți pentru a afișa fotografia</string>
+  <string name="spam_message_text">Răspundeți pentru a afișa mesajul</string>
 </resources>
diff --git a/java/com/android/incallui/sessiondata/res/values-ru/strings.xml b/java/com/android/incallui/sessiondata/res/values-ru/strings.xml
index 1262c83..f1fe0fc 100644
--- a/java/com/android/incallui/sessiondata/res/values-ru/strings.xml
+++ b/java/com/android/incallui/sessiondata/res/values-ru/strings.xml
@@ -1,22 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="spam_photo_text" msgid="5250301844057954813">"Ответьте, чтобы открыть фотографию"</string>
-    <string name="spam_message_text" msgid="6522893079398269847">"Ответьте, чтобы открыть сообщение"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_photo_text">Ответьте, чтобы открыть фотографию</string>
+  <string name="spam_message_text">Ответьте, чтобы открыть сообщение</string>
 </resources>
diff --git a/java/com/android/incallui/sessiondata/res/values-si/strings.xml b/java/com/android/incallui/sessiondata/res/values-si/strings.xml
index ca9aae6..0249251 100644
--- a/java/com/android/incallui/sessiondata/res/values-si/strings.xml
+++ b/java/com/android/incallui/sessiondata/res/values-si/strings.xml
@@ -1,22 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="spam_photo_text" msgid="5250301844057954813">"ඡායාරූපය අනාවරණය කිරීමට පිළිතුරු දෙන්න"</string>
-    <string name="spam_message_text" msgid="6522893079398269847">"පණිවිඩය අනාවරණය කිරීමට පිළිතුරු දෙන්න"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_photo_text">ඡායාරූපය අනාවරණය කිරීමට පිළිතුරු දෙන්න</string>
+  <string name="spam_message_text">පණිවිඩය අනාවරණය කිරීමට පිළිතුරු දෙන්න</string>
 </resources>
diff --git a/java/com/android/incallui/sessiondata/res/values-sk/strings.xml b/java/com/android/incallui/sessiondata/res/values-sk/strings.xml
index 4e35bef..11e4c48 100644
--- a/java/com/android/incallui/sessiondata/res/values-sk/strings.xml
+++ b/java/com/android/incallui/sessiondata/res/values-sk/strings.xml
@@ -1,22 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="spam_photo_text" msgid="5250301844057954813">"Ak chcete odkryť fotku, odpovedzte"</string>
-    <string name="spam_message_text" msgid="6522893079398269847">"Ak chcete odkryť správu, odpovedzte"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_photo_text">Ak chcete odkryť fotku, odpovedzte</string>
+  <string name="spam_message_text">Ak chcete odkryť správu, odpovedzte</string>
 </resources>
diff --git a/java/com/android/incallui/sessiondata/res/values-sl/strings.xml b/java/com/android/incallui/sessiondata/res/values-sl/strings.xml
index 0229923..003e3c8 100644
--- a/java/com/android/incallui/sessiondata/res/values-sl/strings.xml
+++ b/java/com/android/incallui/sessiondata/res/values-sl/strings.xml
@@ -1,22 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="spam_photo_text" msgid="5250301844057954813">"Odgovorite za prikaz fotografije"</string>
-    <string name="spam_message_text" msgid="6522893079398269847">"Odgovorite za prikaz sporočila"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_photo_text">Odgovorite za prikaz fotografije</string>
+  <string name="spam_message_text">Odgovorite za prikaz sporočila</string>
 </resources>
diff --git a/java/com/android/incallui/sessiondata/res/values-sq/strings.xml b/java/com/android/incallui/sessiondata/res/values-sq/strings.xml
index 1a1c265..059b00e 100644
--- a/java/com/android/incallui/sessiondata/res/values-sq/strings.xml
+++ b/java/com/android/incallui/sessiondata/res/values-sq/strings.xml
@@ -1,22 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="spam_photo_text" msgid="5250301844057954813">"Përgjigju për të zbuluar fotografinë"</string>
-    <string name="spam_message_text" msgid="6522893079398269847">"Përgjigju për të zbuluar mesazhin"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_photo_text">Përgjigju për të zbuluar fotografinë</string>
+  <string name="spam_message_text">Përgjigju për të zbuluar mesazhin</string>
 </resources>
diff --git a/java/com/android/incallui/sessiondata/res/values-sr/strings.xml b/java/com/android/incallui/sessiondata/res/values-sr/strings.xml
index d03ed75..a372eac 100644
--- a/java/com/android/incallui/sessiondata/res/values-sr/strings.xml
+++ b/java/com/android/incallui/sessiondata/res/values-sr/strings.xml
@@ -1,22 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="spam_photo_text" msgid="5250301844057954813">"Одговорите да бисте приказали слику"</string>
-    <string name="spam_message_text" msgid="6522893079398269847">"Одговорите да бисте приказали поруку"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_photo_text">Одговорите да бисте приказали слику</string>
+  <string name="spam_message_text">Одговорите да бисте приказали поруку</string>
 </resources>
diff --git a/java/com/android/incallui/sessiondata/res/values-sv/strings.xml b/java/com/android/incallui/sessiondata/res/values-sv/strings.xml
index 04b1610..221c771 100644
--- a/java/com/android/incallui/sessiondata/res/values-sv/strings.xml
+++ b/java/com/android/incallui/sessiondata/res/values-sv/strings.xml
@@ -1,22 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="spam_photo_text" msgid="5250301844057954813">"Svara för att visa fotot"</string>
-    <string name="spam_message_text" msgid="6522893079398269847">"Svara för att visa meddelandet"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_photo_text">Svara för att visa fotot</string>
+  <string name="spam_message_text">Svara för att visa meddelandet</string>
 </resources>
diff --git a/java/com/android/incallui/sessiondata/res/values-sw/strings.xml b/java/com/android/incallui/sessiondata/res/values-sw/strings.xml
index b3a7b0f..48e5dc3 100644
--- a/java/com/android/incallui/sessiondata/res/values-sw/strings.xml
+++ b/java/com/android/incallui/sessiondata/res/values-sw/strings.xml
@@ -1,22 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="spam_photo_text" msgid="5250301844057954813">"Jibu swali ili picha ifichuliwe"</string>
-    <string name="spam_message_text" msgid="6522893079398269847">"Jibu swali ili ujumbe ufichuliwe"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_photo_text">Jibu swali ili picha ifichuliwe</string>
+  <string name="spam_message_text">Jibu swali ili ujumbe ufichuliwe</string>
 </resources>
diff --git a/java/com/android/incallui/sessiondata/res/values-ta/strings.xml b/java/com/android/incallui/sessiondata/res/values-ta/strings.xml
index cee874d..7f86716 100644
--- a/java/com/android/incallui/sessiondata/res/values-ta/strings.xml
+++ b/java/com/android/incallui/sessiondata/res/values-ta/strings.xml
@@ -1,22 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="spam_photo_text" msgid="5250301844057954813">"படத்தைப் பார்க்க, பதிலளிக்கவும்"</string>
-    <string name="spam_message_text" msgid="6522893079398269847">"செய்தியைப் பார்க்க, பதிலளிக்கவும்"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_photo_text">படத்தைப் பார்க்க, பதிலளிக்கவும்</string>
+  <string name="spam_message_text">செய்தியைப் பார்க்க, பதிலளிக்கவும்</string>
 </resources>
diff --git a/java/com/android/incallui/sessiondata/res/values-te/strings.xml b/java/com/android/incallui/sessiondata/res/values-te/strings.xml
index 4498ca7..0e7d143 100644
--- a/java/com/android/incallui/sessiondata/res/values-te/strings.xml
+++ b/java/com/android/incallui/sessiondata/res/values-te/strings.xml
@@ -1,22 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="spam_photo_text" msgid="5250301844057954813">"ఫోటోను చూడటానికి సమాధానమివ్వండి"</string>
-    <string name="spam_message_text" msgid="6522893079398269847">"సందేశాన్ని చూడటానికి సమాధానమివ్వండి"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_photo_text">ఫోటోను చూడటానికి సమాధానమివ్వండి</string>
+  <string name="spam_message_text">సందేశాన్ని చూడటానికి సమాధానమివ్వండి</string>
 </resources>
diff --git a/java/com/android/incallui/sessiondata/res/values-th/strings.xml b/java/com/android/incallui/sessiondata/res/values-th/strings.xml
index b8870fa..f60c71c 100644
--- a/java/com/android/incallui/sessiondata/res/values-th/strings.xml
+++ b/java/com/android/incallui/sessiondata/res/values-th/strings.xml
@@ -1,22 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="spam_photo_text" msgid="5250301844057954813">"ตอบเพื่อแสดงภาพ"</string>
-    <string name="spam_message_text" msgid="6522893079398269847">"ตอบเพื่อแสดงข้อความ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_photo_text">ตอบเพื่อแสดงภาพ</string>
+  <string name="spam_message_text">ตอบเพื่อแสดงข้อความ</string>
 </resources>
diff --git a/java/com/android/incallui/sessiondata/res/values-tl/strings.xml b/java/com/android/incallui/sessiondata/res/values-tl/strings.xml
index ef40609..273b01b 100644
--- a/java/com/android/incallui/sessiondata/res/values-tl/strings.xml
+++ b/java/com/android/incallui/sessiondata/res/values-tl/strings.xml
@@ -1,22 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="spam_photo_text" msgid="5250301844057954813">"Sagutin upang ipakita ang larawan"</string>
-    <string name="spam_message_text" msgid="6522893079398269847">"Sagutin upang ipakita ang mensahe"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_photo_text">Sagutin upang ipakita ang larawan</string>
+  <string name="spam_message_text">Sagutin upang ipakita ang mensahe</string>
 </resources>
diff --git a/java/com/android/incallui/sessiondata/res/values-tr/strings.xml b/java/com/android/incallui/sessiondata/res/values-tr/strings.xml
index 9829d61..f24a4f7 100644
--- a/java/com/android/incallui/sessiondata/res/values-tr/strings.xml
+++ b/java/com/android/incallui/sessiondata/res/values-tr/strings.xml
@@ -1,22 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="spam_photo_text" msgid="5250301844057954813">"Fotoğrafı görmek için cevaplayın"</string>
-    <string name="spam_message_text" msgid="6522893079398269847">"Mesajı görmek için cevaplayın"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_photo_text">Fotoğrafı görmek için cevaplayın</string>
+  <string name="spam_message_text">Mesajı görmek için cevaplayın</string>
 </resources>
diff --git a/java/com/android/incallui/sessiondata/res/values-uk/strings.xml b/java/com/android/incallui/sessiondata/res/values-uk/strings.xml
index ffa837d..70f27ab 100644
--- a/java/com/android/incallui/sessiondata/res/values-uk/strings.xml
+++ b/java/com/android/incallui/sessiondata/res/values-uk/strings.xml
@@ -1,22 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="spam_photo_text" msgid="5250301844057954813">"Відповісти, щоб показати фото"</string>
-    <string name="spam_message_text" msgid="6522893079398269847">"Відповісти, щоб показати повідомлення"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_photo_text">Відповісти, щоб показати фото</string>
+  <string name="spam_message_text">Відповісти, щоб показати повідомлення</string>
 </resources>
diff --git a/java/com/android/incallui/sessiondata/res/values-ur/strings.xml b/java/com/android/incallui/sessiondata/res/values-ur/strings.xml
index 6e60210..fee1b78 100644
--- a/java/com/android/incallui/sessiondata/res/values-ur/strings.xml
+++ b/java/com/android/incallui/sessiondata/res/values-ur/strings.xml
@@ -1,22 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="spam_photo_text" msgid="5250301844057954813">"تصویر ظاہر کرنے کیلئے جواب دیں"</string>
-    <string name="spam_message_text" msgid="6522893079398269847">"پیغام ظاہر کرنے کیلئے جواب دیں"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_photo_text">تصویر ظاہر کرنے کیلئے جواب دیں</string>
+  <string name="spam_message_text">پیغام ظاہر کرنے کیلئے جواب دیں</string>
 </resources>
diff --git a/java/com/android/incallui/sessiondata/res/values-uz/strings.xml b/java/com/android/incallui/sessiondata/res/values-uz/strings.xml
index e9c5017..b3c1e6d 100644
--- a/java/com/android/incallui/sessiondata/res/values-uz/strings.xml
+++ b/java/com/android/incallui/sessiondata/res/values-uz/strings.xml
@@ -1,22 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="spam_photo_text" msgid="5250301844057954813">"Suratni ochish uchun javob bering"</string>
-    <string name="spam_message_text" msgid="6522893079398269847">"Xabarni ochish uchun javob bering"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_photo_text">Suratni ochish uchun javob bering</string>
+  <string name="spam_message_text">Xabarni ochish uchun javob bering</string>
 </resources>
diff --git a/java/com/android/incallui/sessiondata/res/values-vi/strings.xml b/java/com/android/incallui/sessiondata/res/values-vi/strings.xml
index 6011093..0e9eaa9 100644
--- a/java/com/android/incallui/sessiondata/res/values-vi/strings.xml
+++ b/java/com/android/incallui/sessiondata/res/values-vi/strings.xml
@@ -1,22 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="spam_photo_text" msgid="5250301844057954813">"Trả lời để hiển thị ảnh"</string>
-    <string name="spam_message_text" msgid="6522893079398269847">"Trả lời để hiển thị tin nhắn"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_photo_text">Trả lời để hiển thị ảnh</string>
+  <string name="spam_message_text">Trả lời để hiển thị tin nhắn</string>
 </resources>
diff --git a/java/com/android/incallui/sessiondata/res/values-zh-rCN/strings.xml b/java/com/android/incallui/sessiondata/res/values-zh-rCN/strings.xml
index abaef6f..81cc5fa 100644
--- a/java/com/android/incallui/sessiondata/res/values-zh-rCN/strings.xml
+++ b/java/com/android/incallui/sessiondata/res/values-zh-rCN/strings.xml
@@ -1,22 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="spam_photo_text" msgid="5250301844057954813">"回答即可显示照片"</string>
-    <string name="spam_message_text" msgid="6522893079398269847">"回答即可显示消息"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_photo_text">回答即可显示照片</string>
+  <string name="spam_message_text">回答即可显示消息</string>
 </resources>
diff --git a/java/com/android/incallui/sessiondata/res/values-zh-rHK/strings.xml b/java/com/android/incallui/sessiondata/res/values-zh-rHK/strings.xml
index da5b550..7091b64 100644
--- a/java/com/android/incallui/sessiondata/res/values-zh-rHK/strings.xml
+++ b/java/com/android/incallui/sessiondata/res/values-zh-rHK/strings.xml
@@ -1,22 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="spam_photo_text" msgid="5250301844057954813">"回答即可顯示相片"</string>
-    <string name="spam_message_text" msgid="6522893079398269847">"回答即可顯示訊息"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_photo_text">回答即可顯示相片</string>
+  <string name="spam_message_text">回答即可顯示訊息</string>
 </resources>
diff --git a/java/com/android/incallui/sessiondata/res/values-zh-rTW/strings.xml b/java/com/android/incallui/sessiondata/res/values-zh-rTW/strings.xml
index 6a0b85c..07dd10b 100644
--- a/java/com/android/incallui/sessiondata/res/values-zh-rTW/strings.xml
+++ b/java/com/android/incallui/sessiondata/res/values-zh-rTW/strings.xml
@@ -1,22 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="spam_photo_text" msgid="5250301844057954813">"接聽即可顯示相片"</string>
-    <string name="spam_message_text" msgid="6522893079398269847">"接聽即可顯示訊息"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_photo_text">接聽即可顯示相片</string>
+  <string name="spam_message_text">接聽即可顯示訊息</string>
 </resources>
diff --git a/java/com/android/incallui/sessiondata/res/values-zu/strings.xml b/java/com/android/incallui/sessiondata/res/values-zu/strings.xml
index dde14eb..83ae431 100644
--- a/java/com/android/incallui/sessiondata/res/values-zu/strings.xml
+++ b/java/com/android/incallui/sessiondata/res/values-zu/strings.xml
@@ -1,22 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="spam_photo_text" msgid="5250301844057954813">"Phendula ukuze ubonise isithombe"</string>
-    <string name="spam_message_text" msgid="6522893079398269847">"Phendula ukuze ubonise umlayezo"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="spam_photo_text">Phendula ukuze ubonise isithombe</string>
+  <string name="spam_message_text">Phendula ukuze ubonise umlayezo</string>
 </resources>
diff --git a/java/com/android/incallui/sessiondata/res/values/styles.xml b/java/com/android/incallui/sessiondata/res/values/styles.xml
index dd898a4..fe217f0 100644
--- a/java/com/android/incallui/sessiondata/res/values/styles.xml
+++ b/java/com/android/incallui/sessiondata/res/values/styles.xml
@@ -18,7 +18,7 @@
 <resources>
   <style name="Dialer.Incall.TextAppearance.Message" parent="Dialer.Incall.TextAppearance">
     <item name="android:fontFamily">sans-serif</item>
-    <item name="android:textColor">@android:color/black</item>
+    <item name="android:textColor">?android:attr/textColorPrimary</item>
     <item name="android:textSize">24sp</item>
   </style>
 </resources>
diff --git a/java/com/android/incallui/spam/SpamAlternativeExperimentUtil.java b/java/com/android/incallui/spam/SpamAlternativeExperimentUtil.java
new file mode 100644
index 0000000..27942d8
--- /dev/null
+++ b/java/com/android/incallui/spam/SpamAlternativeExperimentUtil.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.incallui.spam;
+
+import android.content.Context;
+import com.android.dialer.common.LogUtil;
+import com.android.dialer.configprovider.ConfigProviderComponent;
+
+/** Returns resource id based on experiment number. */
+public final class SpamAlternativeExperimentUtil {
+
+  /**
+   * Returns the resource id using a resource name for an experiment where we want to use
+   * alternative words for the keyword spam.
+   */
+  public static int getResourceIdByName(String resourceName, Context context) {
+    long experiment =
+        ConfigProviderComponent.get(context)
+            .getConfigProvider()
+            .getLong("experiment_for_alternative_spam_word", 230150);
+    LogUtil.i(
+        "SpamAlternativeExperimentUtil.getResourceIdByName", "using experiment %d", experiment);
+    String modifiedResourceName = resourceName;
+    if (experiment != 230150) {
+      modifiedResourceName = resourceName + "_" + experiment;
+    }
+    int resourceId =
+        context
+            .getResources()
+            .getIdentifier(modifiedResourceName, "string", context.getPackageName());
+    if (resourceId == 0) {
+      LogUtil.i(
+          "SpamAlternativeExperimentUtil.getResourceIdByName",
+          "not found experiment %d",
+          experiment);
+      return context.getResources().getIdentifier(resourceName, "string", context.getPackageName());
+    }
+    return resourceId;
+  }
+}
diff --git a/java/com/android/incallui/spam/SpamCallListListener.java b/java/com/android/incallui/spam/SpamCallListListener.java
index 22b3833..7fd41f9 100644
--- a/java/com/android/incallui/spam/SpamCallListListener.java
+++ b/java/com/android/incallui/spam/SpamCallListListener.java
@@ -16,7 +16,6 @@
 
 package com.android.incallui.spam;
 
-import android.annotation.TargetApi;
 import android.app.Notification;
 import android.app.Notification.Builder;
 import android.app.PendingIntent;
@@ -25,7 +24,6 @@
 import android.database.Cursor;
 import android.database.sqlite.SQLiteException;
 import android.graphics.drawable.Icon;
-import android.os.Build.VERSION_CODES;
 import android.provider.CallLog;
 import android.provider.CallLog.Calls;
 import android.support.annotation.NonNull;
@@ -49,6 +47,7 @@
 import com.android.dialer.phonenumberutil.PhoneNumberHelper;
 import com.android.dialer.spam.SpamComponent;
 import com.android.dialer.telecom.TelecomUtil;
+import com.android.dialer.theme.base.ThemeComponent;
 import com.android.dialer.util.PermissionsUtil;
 import com.android.incallui.call.CallList;
 import com.android.incallui.call.DialerCall;
@@ -87,7 +86,6 @@
   }
 
   /** Checks if the number is in the call history. */
-  @TargetApi(VERSION_CODES.M)
   private static final class NumberInCallHistoryWorker implements Worker<Void, Integer> {
 
     private final Context appContext;
@@ -205,7 +203,7 @@
 
   /** Determines if the after call notification should be shown for the specified call. */
   private boolean shouldShowAfterCallNotification(DialerCall call) {
-    if (!SpamComponent.get(context).spam().isSpamNotificationEnabled()) {
+    if (!SpamComponent.get(context).spamSettings().isSpamNotificationEnabled()) {
       return false;
     }
 
@@ -219,7 +217,7 @@
       return false;
     }
 
-    if (logState.duration <= 0) {
+    if (logState.telecomDurationMillis <= 0) {
       return false;
     }
 
@@ -256,7 +254,7 @@
                 createActivityPendingIntent(call, SpamNotificationActivity.ACTION_SHOW_DIALOG))
             .setCategory(Notification.CATEGORY_STATUS)
             .setPriority(Notification.PRIORITY_DEFAULT)
-            .setColor(context.getColor(R.color.dialer_theme_color))
+            .setColor(ThemeComponent.get(context).theme().getColorPrimary())
             .setSmallIcon(R.drawable.quantum_ic_call_end_vd_theme_24)
             .setGroup(GROUP_KEY);
     if (BuildCompat.isAtLeastO()) {
@@ -277,11 +275,15 @@
     Notification.Builder notificationBuilder =
         createAfterCallNotificationBuilder(call)
             .setContentText(
-                context.getString(R.string.spam_notification_non_spam_call_collapsed_text))
+                context.getString(
+                    SpamAlternativeExperimentUtil.getResourceIdByName(
+                        "spam_notification_non_spam_call_collapsed_text", context)))
             .setStyle(
                 new Notification.BigTextStyle()
                     .bigText(
-                        context.getString(R.string.spam_notification_non_spam_call_expanded_text)))
+                        context.getString(
+                            SpamAlternativeExperimentUtil.getResourceIdByName(
+                                "spam_notification_non_spam_call_expanded_text", context))))
             // Add contact
             .addAction(
                 new Notification.Action.Builder(
@@ -305,7 +307,8 @@
 
   private boolean shouldThrottleSpamNotification() {
     int randomNumber = random.nextInt(100);
-    int thresholdForShowing = SpamComponent.get(context).spam().percentOfSpamNotificationsToShow();
+    int thresholdForShowing =
+        SpamComponent.get(context).spamSettings().percentOfSpamNotificationsToShow();
     if (thresholdForShowing == 0) {
       LogUtil.d(
           "SpamCallListListener.shouldThrottleSpamNotification",
@@ -329,7 +332,7 @@
   private boolean shouldThrottleNonSpamNotification() {
     int randomNumber = random.nextInt(100);
     int thresholdForShowing =
-        SpamComponent.get(context).spam().percentOfNonSpamNotificationsToShow();
+        SpamComponent.get(context).spamSettings().percentOfNonSpamNotificationsToShow();
     if (thresholdForShowing == 0) {
       LogUtil.d(
           "SpamCallListListener.shouldThrottleNonSpamNotification",
@@ -391,12 +394,17 @@
     Notification.Builder notificationBuilder =
         createAfterCallNotificationBuilder(call)
             .setLargeIcon(Icon.createWithResource(context, R.drawable.spam_notification_icon))
-            .setContentText(context.getString(R.string.spam_notification_spam_call_collapsed_text))
+            .setContentText(
+                context.getString(
+                    SpamAlternativeExperimentUtil.getResourceIdByName(
+                        "spam_notification_spam_call_collapsed_text", context)))
             // Not spam
             .addAction(
                 new Notification.Action.Builder(
                         R.drawable.quantum_ic_close_vd_theme_24,
-                        context.getString(R.string.spam_notification_was_not_spam_action_text),
+                        context.getString(
+                            SpamAlternativeExperimentUtil.getResourceIdByName(
+                                "spam_notification_was_not_spam_action_text", context)),
                         createNotSpamPendingIntent(call))
                     .build())
             // Block/report spam
@@ -407,18 +415,23 @@
                         createBlockReportSpamPendingIntent(call))
                     .build())
             .setContentTitle(
-                context.getString(R.string.spam_notification_title, getDisplayNumber(call)));
+                context.getString(
+                    SpamAlternativeExperimentUtil.getResourceIdByName(
+                        "spam_notification_title", context),
+                    getDisplayNumber(call)));
     DialerNotificationManager.notify(
         context, getNotificationTagForCall(call), NOTIFICATION_ID, notificationBuilder.build());
   }
 
+
+
   /**
    * Creates a pending intent for block/report spam action. If enabled, this intent is forwarded to
    * the {@link SpamNotificationActivity}, otherwise to the {@link SpamNotificationService}.
    */
   private PendingIntent createBlockReportSpamPendingIntent(DialerCall call) {
     String action = SpamNotificationActivity.ACTION_MARK_NUMBER_AS_SPAM;
-    return SpamComponent.get(context).spam().isDialogEnabledForSpamNotification()
+    return SpamComponent.get(context).spamSettings().isDialogEnabledForSpamNotification()
         ? createActivityPendingIntent(call, action)
         : createServicePendingIntent(call, action);
   }
@@ -429,7 +442,7 @@
    */
   private PendingIntent createNotSpamPendingIntent(DialerCall call) {
     String action = SpamNotificationActivity.ACTION_MARK_NUMBER_AS_NOT_SPAM;
-    return SpamComponent.get(context).spam().isDialogEnabledForSpamNotification()
+    return SpamComponent.get(context).spamSettings().isDialogEnabledForSpamNotification()
         ? createActivityPendingIntent(call, action)
         : createServicePendingIntent(call, action);
   }
diff --git a/java/com/android/incallui/spam/SpamNotificationActivity.java b/java/com/android/incallui/spam/SpamNotificationActivity.java
index 8919dc7..4c0c67c 100644
--- a/java/com/android/incallui/spam/SpamNotificationActivity.java
+++ b/java/com/android/incallui/spam/SpamNotificationActivity.java
@@ -16,7 +16,6 @@
 
 package com.android.incallui.spam;
 
-import android.app.AlertDialog;
 import android.app.Dialog;
 import android.app.DialogFragment;
 import android.content.Context;
@@ -25,12 +24,16 @@
 import android.os.Bundle;
 import android.provider.CallLog;
 import android.provider.ContactsContract;
+import android.support.annotation.Nullable;
 import android.support.v4.app.FragmentActivity;
+import android.support.v7.app.AlertDialog;
 import android.telephony.PhoneNumberUtils;
 import com.android.dialer.blocking.BlockedNumbersMigrator;
 import com.android.dialer.blocking.FilteredNumberAsyncQueryHandler;
 import com.android.dialer.blocking.FilteredNumberCompat;
 import com.android.dialer.blockreportspam.BlockReportSpamDialogs;
+import com.android.dialer.blockreportspam.BlockReportSpamDialogs.DialogFragmentForBlockingNumberAndOptionallyReportingAsSpam;
+import com.android.dialer.blockreportspam.BlockReportSpamDialogs.DialogFragmentForReportingNotSpam;
 import com.android.dialer.common.LogUtil;
 import com.android.dialer.location.GeoUtil;
 import com.android.dialer.logging.ContactLookupResult;
@@ -40,6 +43,8 @@
 import com.android.dialer.notification.DialerNotificationManager;
 import com.android.dialer.phonenumberutil.PhoneNumberHelper;
 import com.android.dialer.spam.SpamComponent;
+import com.android.dialer.spam.SpamSettings;
+import com.android.dialer.spam.promo.SpamBlockingPromoHelper;
 import com.android.incallui.call.DialerCall;
 
 /** Creates the after call notification dialogs. */
@@ -56,6 +61,12 @@
   static final String ACTION_MARK_NUMBER_AS_NOT_SPAM =
       "com.android.incallui.spam.ACTION_MARK_NUMBER_AS_NOT_SPAM";
 
+  static final String ACTION_ENABLE_SPAM_BLOCKING =
+      "com.android.incallui.spam.ACTION_ENABLE_SPAM_BLOCKING";
+
+  static final String ACTION_SHOW_SPAM_BLOCKING_PROMO_DIALOG =
+      "com.android.incallui.spam.ACTION_SHOW_SPAM_BLOCKING_PROMO_DIALOG";
+
   private static final String TAG = "SpamNotifications";
   private static final String EXTRA_NOTIFICATION_TAG = "notification_tag";
   private static final String EXTRA_NOTIFICATION_ID = "notification_id";
@@ -76,6 +87,8 @@
         }
       };
   private FilteredNumberAsyncQueryHandler filteredNumberAsyncQueryHandler;
+  private SpamSettings spamSettings;
+  private SpamBlockingPromoHelper spamBlockingPromoHelper;
 
   /**
    * Creates an intent to start this activity.
@@ -83,7 +96,11 @@
    * @return Intent intent that starts this activity.
    */
   public static Intent createActivityIntent(
-      Context context, DialerCall call, String action, String notificationTag, int notificationId) {
+      Context context,
+      @Nullable DialerCall call,
+      String action,
+      String notificationTag,
+      int notificationId) {
     Intent intent = new Intent(context, SpamNotificationActivity.class);
     intent.setAction(action);
     // This ensures only one activity of this kind exists at a time.
@@ -91,7 +108,10 @@
     intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
     intent.putExtra(EXTRA_NOTIFICATION_TAG, notificationTag);
     intent.putExtra(EXTRA_NOTIFICATION_ID, notificationId);
-    intent.putExtra(EXTRA_CALL_INFO, newCallInfoBundle(call));
+
+    if (call != null) {
+      intent.putExtra(EXTRA_CALL_INFO, newCallInfoBundle(call));
+    }
     return intent;
   }
 
@@ -143,6 +163,8 @@
     super.onCreate(savedInstanceState);
     setFinishOnTouchOutside(true);
     filteredNumberAsyncQueryHandler = new FilteredNumberAsyncQueryHandler(this);
+    spamSettings = SpamComponent.get(this).spamSettings();
+    spamBlockingPromoHelper = new SpamBlockingPromoHelper(getApplicationContext(), spamSettings);
     cancelNotification();
   }
 
@@ -177,6 +199,9 @@
           showNonSpamDialog();
         }
         break;
+      case ACTION_SHOW_SPAM_BLOCKING_PROMO_DIALOG:
+        showSpamBlockingPromoDialog();
+        break;
       default: // fall out
     }
   }
@@ -195,8 +220,8 @@
   /** Creates and displays the dialog for whitelisting a number. */
   private void maybeShowNotSpamDialog(
       final String number, final ContactLookupResult.Type contactLookupResultType) {
-    if (SpamComponent.get(this).spam().isDialogEnabledForSpamNotification()) {
-      BlockReportSpamDialogs.ReportNotSpamDialogFragment.newInstance(
+    if (SpamComponent.get(this).spamSettings().isDialogEnabledForSpamNotification()) {
+      DialogFragmentForReportingNotSpam.newInstance(
               getFormattedNumber(number, this),
               new BlockReportSpamDialogs.OnConfirmListener() {
                 @Override
@@ -205,7 +230,7 @@
                 }
               },
               dismissListener)
-          .show(getFragmentManager(), BlockReportSpamDialogs.NOT_SPAM_DIALOG_TAG);
+          .show(getSupportFragmentManager(), BlockReportSpamDialogs.NOT_SPAM_DIALOG_TAG);
     } else {
       reportNotSpamAndFinish(number, contactLookupResultType);
     }
@@ -214,30 +239,31 @@
   /** Creates and displays the dialog for blocking/reporting a number as spam. */
   private void maybeShowBlockReportSpamDialog(
       final String number, final ContactLookupResult.Type contactLookupResultType) {
-    if (SpamComponent.get(this).spam().isDialogEnabledForSpamNotification()) {
+    if (SpamComponent.get(this).spamSettings().isDialogEnabledForSpamNotification()) {
       String displayNumber = getFormattedNumber(number, this);
       maybeShowBlockNumberMigrationDialog(
           new BlockedNumbersMigrator.Listener() {
             @Override
             public void onComplete() {
-              BlockReportSpamDialogs.BlockReportSpamDialogFragment.newInstance(
+              DialogFragmentForBlockingNumberAndOptionallyReportingAsSpam.newInstance(
                       displayNumber,
                       SpamComponent.get(SpamNotificationActivity.this)
-                          .spam()
+                          .spamSettings()
                           .isDialogReportSpamCheckedByDefault(),
                       new BlockReportSpamDialogs.OnSpamDialogClickListener() {
                         @Override
                         public void onClick(boolean isSpamChecked) {
-                          blockReportNumberAndFinish(
-                              number, isSpamChecked, contactLookupResultType);
+                          blockReportNumber(number, isSpamChecked, contactLookupResultType);
                         }
                       },
                       dismissListener)
-                  .show(getFragmentManager(), BlockReportSpamDialogs.BLOCK_REPORT_SPAM_DIALOG_TAG);
+                  .show(
+                      getSupportFragmentManager(),
+                      BlockReportSpamDialogs.BLOCK_REPORT_SPAM_DIALOG_TAG);
             }
           });
     } else {
-      blockReportNumberAndFinish(number, true, contactLookupResultType);
+      blockReportNumber(number, true, contactLookupResultType);
     }
   }
 
@@ -269,7 +295,7 @@
   }
 
   /** Block and report the number as spam. */
-  private void blockReportNumberAndFinish(
+  private void blockReportNumber(
       String number, boolean reportAsSpam, ContactLookupResult.Type contactLookupResultType) {
     if (reportAsSpam) {
       logCallImpression(DialerImpression.Type.SPAM_AFTER_CALL_NOTIFICATION_MARKED_NUMBER_AS_SPAM);
@@ -285,8 +311,6 @@
 
     logCallImpression(DialerImpression.Type.SPAM_AFTER_CALL_NOTIFICATION_BLOCK_NUMBER);
     filteredNumberAsyncQueryHandler.blockNumber(null, number, getCountryIso());
-    // TODO: DialerCall finish() after block/reporting async tasks complete (a bug)
-    finish();
   }
 
   /** Report the number as not spam. */
@@ -317,14 +341,16 @@
   }
 
   private void assertDialogsEnabled() {
-    if (!SpamComponent.get(this).spam().isDialogEnabledForSpamNotification()) {
+    if (!SpamComponent.get(this).spamSettings().isDialogEnabledForSpamNotification()) {
       throw new IllegalStateException(
           "Cannot start this activity with given action because dialogs are not enabled.");
     }
   }
 
   private Bundle getCallInfo() {
-    return getIntent().getBundleExtra(EXTRA_CALL_INFO);
+    return getIntent().hasExtra(EXTRA_CALL_INFO)
+        ? getIntent().getBundleExtra(EXTRA_CALL_INFO)
+        : new Bundle();
   }
 
   /** Dialog that displays "Not spam", "Block/report spam" and "Dismiss". */
@@ -380,7 +406,9 @@
           .setCancelable(false)
           .setTitle(
               getString(
-                  R.string.spam_notification_title, getFormattedNumber(number, applicationContext)))
+                  SpamAlternativeExperimentUtil.getResourceIdByName(
+                      "spam_notification_title", applicationContext),
+                  getFormattedNumber(number, applicationContext)))
           .setNeutralButton(
               getString(R.string.spam_notification_action_dismiss),
               new DialogInterface.OnClickListener() {
@@ -398,10 +426,13 @@
                   dismiss();
                   spamNotificationActivity.maybeShowBlockReportSpamDialog(
                       number, contactLookupResultType);
+                  spamNotificationActivity.maybeShowSpamBlockingPromoAndFinish();
                 }
               })
           .setNegativeButton(
-              getString(R.string.spam_notification_was_not_spam_action_text),
+              getString(
+                  SpamAlternativeExperimentUtil.getResourceIdByName(
+                      "spam_notification_was_not_spam_action_text", applicationContext)),
               new DialogInterface.OnClickListener() {
                 @Override
                 public void onClick(DialogInterface dialog, int which) {
@@ -467,7 +498,10 @@
           .setTitle(
               getString(R.string.non_spam_notification_title, getFormattedNumber(number, context)))
           .setCancelable(false)
-          .setMessage(getString(R.string.spam_notification_non_spam_call_expanded_text))
+          .setMessage(
+              getString(
+                  SpamAlternativeExperimentUtil.getResourceIdByName(
+                      "spam_notification_non_spam_call_expanded_text", context)))
           .setNeutralButton(
               getString(R.string.spam_notification_action_dismiss),
               new DialogInterface.OnClickListener() {
@@ -487,7 +521,9 @@
                 }
               })
           .setNegativeButton(
-              getString(R.string.spam_notification_dialog_block_report_spam_action_text),
+              getString(
+                  SpamAlternativeExperimentUtil.getResourceIdByName(
+                      "spam_notification_dialog_block_report_spam_action_text", context)),
               new DialogInterface.OnClickListener() {
                 @Override
                 public void onClick(DialogInterface dialog, int which) {
@@ -495,9 +531,43 @@
                   dismiss();
                   spamNotificationActivity.maybeShowBlockReportSpamDialog(
                       number, contactLookupResultType);
+                  spamNotificationActivity.maybeShowSpamBlockingPromoAndFinish();
                 }
               })
           .create();
     }
   }
+
+  private void maybeShowSpamBlockingPromoAndFinish() {
+    if (!spamBlockingPromoHelper.shouldShowAfterCallSpamBlockingPromo()) {
+      finish();
+      return;
+    }
+    Logger.get(this)
+        .logImpression(DialerImpression.Type.SPAM_BLOCKING_AFTER_CALL_NOTIFICATION_PROMO_SHOWN);
+    showSpamBlockingPromoDialog();
+  }
+
+  private void showSpamBlockingPromoDialog() {
+    spamBlockingPromoHelper.showSpamBlockingPromoDialog(
+        getSupportFragmentManager(),
+        () -> {
+          Logger.get(this)
+              .logImpression(
+                  DialerImpression.Type
+                      .SPAM_BLOCKING_ENABLED_THROUGH_AFTER_CALL_NOTIFICATION_PROMO);
+          spamSettings.modifySpamBlockingSetting(
+              true,
+              success -> {
+                if (!success) {
+                  Logger.get(this)
+                      .logImpression(
+                          DialerImpression.Type
+                              .SPAM_BLOCKING_MODIFY_FAILURE_THROUGH_AFTER_CALL_NOTIFICATION_PROMO);
+                }
+                spamBlockingPromoHelper.showModifySettingOnCompleteToast(success);
+              });
+        },
+        dialog -> finish());
+  }
 }
diff --git a/java/com/android/incallui/spam/SpamNotificationService.java b/java/com/android/incallui/spam/SpamNotificationService.java
index b85ab11..f7deae1 100644
--- a/java/com/android/incallui/spam/SpamNotificationService.java
+++ b/java/com/android/incallui/spam/SpamNotificationService.java
@@ -16,6 +16,7 @@
 
 package com.android.incallui.spam;
 
+import android.app.PendingIntent;
 import android.app.Service;
 import android.content.Context;
 import android.content.Intent;
@@ -31,6 +32,8 @@
 import com.android.dialer.logging.ReportingLocation;
 import com.android.dialer.notification.DialerNotificationManager;
 import com.android.dialer.spam.SpamComponent;
+import com.android.dialer.spam.SpamSettings;
+import com.android.dialer.spam.promo.SpamBlockingPromoHelper;
 import com.android.incallui.call.DialerCall;
 
 /**
@@ -51,18 +54,29 @@
   private static final String EXTRA_NOTIFICATION_ID = "service_notification_id";
   private static final String EXTRA_CONTACT_LOOKUP_RESULT_TYPE =
       "service_contact_lookup_result_type";
+
+  private String notificationTag;
+  private int notificationId;
+
   /** Creates an intent to start this service. */
   public static Intent createServiceIntent(
-      Context context, DialerCall call, String action, String notificationTag, int notificationId) {
+      Context context,
+      @Nullable DialerCall call,
+      String action,
+      String notificationTag,
+      int notificationId) {
     Intent intent = new Intent(context, SpamNotificationService.class);
     intent.setAction(action);
-    intent.putExtra(EXTRA_PHONE_NUMBER, call.getNumber());
-    intent.putExtra(EXTRA_CALL_ID, call.getUniqueCallId());
-    intent.putExtra(EXTRA_CALL_START_TIME_MILLIS, call.getTimeAddedMs());
     intent.putExtra(EXTRA_NOTIFICATION_TAG, notificationTag);
     intent.putExtra(EXTRA_NOTIFICATION_ID, notificationId);
-    intent.putExtra(
-        EXTRA_CONTACT_LOOKUP_RESULT_TYPE, call.getLogState().contactLookupResult.getNumber());
+
+    if (call != null) {
+      intent.putExtra(EXTRA_PHONE_NUMBER, call.getNumber());
+      intent.putExtra(EXTRA_CALL_ID, call.getUniqueCallId());
+      intent.putExtra(EXTRA_CALL_START_TIME_MILLIS, call.getTimeAddedMs());
+      intent.putExtra(
+          EXTRA_CONTACT_LOOKUP_RESULT_TYPE, call.getLogState().contactLookupResult.getNumber());
+    }
     return intent;
   }
 
@@ -83,13 +97,24 @@
       return START_NOT_STICKY;
     }
     String number = intent.getStringExtra(EXTRA_PHONE_NUMBER);
-    String notificationTag = intent.getStringExtra(EXTRA_NOTIFICATION_TAG);
-    int notificationId = intent.getIntExtra(EXTRA_NOTIFICATION_ID, 1);
+    notificationTag = intent.getStringExtra(EXTRA_NOTIFICATION_TAG);
+    notificationId = intent.getIntExtra(EXTRA_NOTIFICATION_ID, 1);
     String countryIso = GeoUtil.getCurrentCountryIso(this);
     ContactLookupResult.Type contactLookupResultType =
         ContactLookupResult.Type.forNumber(intent.getIntExtra(EXTRA_CONTACT_LOOKUP_RESULT_TYPE, 0));
 
-    DialerNotificationManager.cancel(this, notificationTag, notificationId);
+    SpamSettings spamSettings = SpamComponent.get(this).spamSettings();
+    SpamBlockingPromoHelper spamBlockingPromoHelper =
+        new SpamBlockingPromoHelper(this, SpamComponent.get(this).spamSettings());
+    boolean shouldShowSpamBlockingPromo =
+        SpamNotificationActivity.ACTION_MARK_NUMBER_AS_SPAM.equals(intent.getAction())
+            && spamBlockingPromoHelper.shouldShowAfterCallSpamBlockingPromo();
+
+    // Cancel notification only if we are not showing spam blocking promo. Otherwise we will show
+    // spam blocking promo notification in place.
+    if (!shouldShowSpamBlockingPromo) {
+      DialerNotificationManager.cancel(this, notificationTag, notificationId);
+    }
 
     switch (intent.getAction()) {
       case SpamNotificationActivity.ACTION_MARK_NUMBER_AS_SPAM:
@@ -104,6 +129,13 @@
                 ReportingLocation.Type.FEEDBACK_PROMPT,
                 contactLookupResultType);
         new FilteredNumberAsyncQueryHandler(this).blockNumber(null, number, countryIso);
+        if (shouldShowSpamBlockingPromo) {
+          spamBlockingPromoHelper.showSpamBlockingPromoNotification(
+              notificationTag,
+              notificationId,
+              createPromoActivityPendingIntent(),
+              createEnableSpamBlockingPendingIntent());
+        }
         break;
       case SpamNotificationActivity.ACTION_MARK_NUMBER_AS_NOT_SPAM:
         logCallImpression(
@@ -117,6 +149,22 @@
                 ReportingLocation.Type.FEEDBACK_PROMPT,
                 contactLookupResultType);
         break;
+      case SpamNotificationActivity.ACTION_ENABLE_SPAM_BLOCKING:
+        Logger.get(this)
+            .logImpression(
+                DialerImpression.Type.SPAM_BLOCKING_ENABLED_THROUGH_AFTER_CALL_NOTIFICATION_PROMO);
+        spamSettings.modifySpamBlockingSetting(
+            true,
+            success -> {
+              if (!success) {
+                Logger.get(this)
+                    .logImpression(
+                        DialerImpression.Type
+                            .SPAM_BLOCKING_MODIFY_FAILURE_THROUGH_AFTER_CALL_NOTIFICATION_PROMO);
+              }
+              spamBlockingPromoHelper.showModifySettingOnCompleteToast(success);
+            });
+        break;
       default: // fall out
     }
     // TODO: call stopSelf() after async tasks complete (a bug)
@@ -137,4 +185,28 @@
             intent.getStringExtra(EXTRA_CALL_ID),
             intent.getLongExtra(EXTRA_CALL_START_TIME_MILLIS, 0));
   }
+
+  private PendingIntent createPromoActivityPendingIntent() {
+    Intent intent =
+        SpamNotificationActivity.createActivityIntent(
+            this,
+            null,
+            SpamNotificationActivity.ACTION_SHOW_SPAM_BLOCKING_PROMO_DIALOG,
+            notificationTag,
+            notificationId);
+    return PendingIntent.getActivity(
+        this, (int) System.currentTimeMillis(), intent, PendingIntent.FLAG_ONE_SHOT);
+  }
+
+  private PendingIntent createEnableSpamBlockingPendingIntent() {
+    Intent intent =
+        SpamNotificationService.createServiceIntent(
+            this,
+            null,
+            SpamNotificationActivity.ACTION_ENABLE_SPAM_BLOCKING,
+            notificationTag,
+            notificationId);
+    return PendingIntent.getService(
+        this, (int) System.currentTimeMillis(), intent, PendingIntent.FLAG_ONE_SHOT);
+  }
 }
diff --git a/java/com/android/incallui/spam/res/raw/keep_spam.xml b/java/com/android/incallui/spam/res/raw/keep_spam.xml
new file mode 100644
index 0000000..0361e51
--- /dev/null
+++ b/java/com/android/incallui/spam/res/raw/keep_spam.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2018 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+<resources xmlns:tools="http://schemas.android.com/tools"
+    tools:keep="
+    @string/spam_notification_title,
+    @string/spam_notification_title_230151,
+    @string/spam_notification_title_230152,
+    @string/spam_notification_title_230153,
+    @string/spam_notification_title_230154,
+    @string/spam_notification_title_230155,
+    @string/spam_notification_block_report_toast_text,
+    @string/spam_notification_block_report_toast_text_230151,
+    @string/spam_notification_block_report_toast_text_230152,
+    @string/spam_notification_block_report_toast_text_230153,
+    @string/spam_notification_block_report_toast_text_230154,
+    @string/spam_notification_block_report_toast_text_230155,
+    @string/spam_notification_not_spam_toast_text,
+    @string/spam_notification_not_spam_toast_text_230151,
+    @string/spam_notification_not_spam_toast_text_230152,
+    @string/spam_notification_not_spam_toast_text_230153,
+    @string/spam_notification_not_spam_toast_text_230154,
+    @string/spam_notification_not_spam_toast_text_230155,
+    @string/spam_notification_non_spam_call_collapsed_text,
+    @string/spam_notification_non_spam_call_collapsed_text_230151,
+    @string/spam_notification_non_spam_call_collapsed_text_230152,
+    @string/spam_notification_non_spam_call_collapsed_text_230153,
+    @string/spam_notification_non_spam_call_collapsed_text_230154,
+    @string/spam_notification_non_spam_call_collapsed_text_230155,
+    @string/spam_notification_non_spam_call_expanded_text,
+    @string/spam_notification_non_spam_call_expanded_text_230151,
+    @string/spam_notification_non_spam_call_expanded_text_230152,
+    @string/spam_notification_non_spam_call_expanded_text_230153,
+    @string/spam_notification_non_spam_call_expanded_text_230154,
+    @string/spam_notification_non_spam_call_expanded_text_230155,
+    @string/spam_notification_spam_call_collapsed_text,
+    @string/spam_notification_spam_call_collapsed_text_230151,
+    @string/spam_notification_spam_call_collapsed_text_230152,
+    @string/spam_notification_spam_call_collapsed_text_230153,
+    @string/spam_notification_spam_call_collapsed_text_230154,
+    @string/spam_notification_spam_call_collapsed_text_230155,
+    @string/spam_notification_dialog_block_report_spam_action_text,
+    @string/spam_notification_dialog_block_report_spam_action_text_230151,
+    @string/spam_notification_dialog_block_report_spam_action_text_230152,
+    @string/spam_notification_dialog_block_report_spam_action_text_230153,
+    @string/spam_notification_dialog_block_report_spam_action_text_230154,
+    @string/spam_notification_dialog_block_report_spam_action_text_230155,
+    @string/spam_notification_was_not_spam_action_text,
+    @string/spam_notification_was_not_spam_action_text_230151,
+    @string/spam_notification_was_not_spam_action_text_230152,
+    @string/spam_notification_was_not_spam_action_text_230153,
+    @string/spam_notification_was_not_spam_action_text_230154,
+    @string/spam_notification_was_not_spam_action_text_230155"/>
\ No newline at end of file
diff --git a/java/com/android/incallui/spam/res/values-af/strings.xml b/java/com/android/incallui/spam/res/values-af/strings.xml
index 7b82888..95e1bcb 100644
--- a/java/com/android/incallui/spam/res/values-af/strings.xml
+++ b/java/com/android/incallui/spam/res/values-af/strings.xml
@@ -1,36 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="non_spam_notification_title" msgid="2599384745904934400">"Ken jy <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="spam_notification_title" msgid="609838099069629476">"Is <xliff:g id="NUMBER">%1$s</xliff:g> strooipos?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"<xliff:g id="NUMBER">%1$s</xliff:g> is geblokkeer en oproep is as strooipos aangegee."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"Oproep vanaf <xliff:g id="NUMBER">%1$s</xliff:g> is as nie strooipos nie aangegee."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"Tik om by kontakte te voeg of strooiposnommer te blokkeer."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"Dit is die eerste keer wat hierdie nommer jou bel. As hierdie oproep strooipos was, kan jy hierdie nommer blokkeer en dit aangee."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"Tik om as NIE STROOIPOS NIE aan te gee, of dit te blokkeer."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"Ons vermoed dit was \'n strooiposser. As hierdie oproep nie strooipos was nie, tik NIE STROOIPOS NIE om ons fout aan te gee."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"Blokkeer en gee aan"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"Voeg kontak by"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"Nie strooipos nie"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"Blokkeer nommer"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"Voeg by kontakte"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"Blokkeer en gee strooipos aan"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"Nie strooipos nie"</string>
-    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"Wys af"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="non_spam_notification_title">Ken jy %1$s?</string>
+  <string name="spam_notification_title">Was %1$s \'n strooiposbeller?</string>
+  <string name="spam_notification_block_report_toast_text">%1$s is geblokkeer en oproep is as strooipos aangegee.</string>
+  <string name="spam_notification_not_spam_toast_text">Oproep vanaf %1$s is as nie strooipos nie aangegee.</string>
+  <string name="spam_notification_non_spam_call_collapsed_text">Tik om by kontakte te voeg of strooiposnommer te blokkeer.</string>
+  <string name="spam_notification_non_spam_call_expanded_text">Dit is die eerste keer wat hierdie nommer jou bel. As hierdie oproep strooipos was, kan jy hierdie nommer blokkeer en dit aangee.</string>
+  <string name="spam_notification_spam_call_collapsed_text">Tik om as nie strooipos nie aan te gee, of dit te blokkeer</string>
+  <string name="spam_notification_report_spam_action_text">Blokkeer en gee aan</string>
+  <string name="spam_notification_add_contact_action_text">Voeg kontak by</string>
+  <string name="spam_notification_dialog_add_contact_action_text">Voeg by kontakte</string>
+  <string name="spam_notification_dialog_block_report_spam_action_text">Blokkeer en gee strooipos aan</string>
+  <string name="spam_notification_was_not_spam_action_text">Nee, nie strooipos nie</string>
+  <string name="spam_notification_block_spam_action_text">Ja, blokkeer nommer</string>
+  <string name="spam_notification_action_dismiss">Weier</string>
 </resources>
diff --git a/java/com/android/incallui/spam/res/values-am/strings.xml b/java/com/android/incallui/spam/res/values-am/strings.xml
index 7ebefac..50dece5 100644
--- a/java/com/android/incallui/spam/res/values-am/strings.xml
+++ b/java/com/android/incallui/spam/res/values-am/strings.xml
@@ -1,36 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="non_spam_notification_title" msgid="2599384745904934400">"<xliff:g id="NUMBER">%1$s</xliff:g>ን ያውቁታል?"</string>
-    <string name="spam_notification_title" msgid="609838099069629476">"<xliff:g id="NUMBER">%1$s</xliff:g> አይፈለጌ ነው?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"<xliff:g id="NUMBER">%1$s</xliff:g> ታግደዋል ጥሪውም እንደ አይፈለጌ መልዕክት ሪፖርት ተደርጓል።"</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"ከ<xliff:g id="NUMBER">%1$s</xliff:g> የመጣው ጥሪ አይፈለጌ እንዳልሆነ ሪፖርት ተደርጓል።"</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"እውቂያዎችን ለማከል ወይም አይፈለጌ ቁጥር ለማገድ መታ ያድርጉ።"</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"ይህ ቁጥር ሲደውልልዎ ይህ የመጀመሪያ ጊዜ ነው። ይህ ጥሪ አይፈለጌ ነበር፣ ይህን ቁጥር ማገድ እና ሪፖርት ማድረግ ይችላሉ።"</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"አይፈለጌ እንዳልሆነ ሪፖርት ለማድረግ ወይም ለማገድ መታ ያድርጉ።"</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"ይህ አይፈለጌ ለቃቂ እንደሆነ ጠርጥረናል። ይህ ጥሪ አይፈለጌ ያልነበረ ከሆነ፣ «አይፈለጌ አይደለም» ላይ መታ ያድርጉ እና ስህተታችንን ይንገሩን።"</string>
-    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"አግድ እና ሪፖርት አድርግ"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"እውቂያ ያክሉ"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"አይፈለጌ መልዕክት አይደለም"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"ቁጥርን አግድ"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"ወደ እውቂያዎች ያክሉ"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"አግድ እና አይፈለጌ ሪፖርት አድርግ"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"አይፈለጌ መልዕክት አይደለም"</string>
-    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"አትቀበል"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="non_spam_notification_title">%1$sን ያውቁታል?</string>
+  <string name="spam_notification_title">%1$s አይፈለጌ ደዋይ ነበር?</string>
+  <string name="spam_notification_block_report_toast_text">%1$s ታግደዋል ጥሪውም እንደ አይፈለጌ መልዕክት ሪፖርት ተደርጓል።</string>
+  <string name="spam_notification_not_spam_toast_text">ከ%1$s የመጣው ጥሪ አይፈለጌ እንዳልሆነ ሪፖርት ተደርጓል።</string>
+  <string name="spam_notification_non_spam_call_collapsed_text">እውቂያዎችን ለማከል ወይም አይፈለጌ ቁጥር ለማገድ መታ ያድርጉ።</string>
+  <string name="spam_notification_non_spam_call_expanded_text">ይህ ቁጥር ሲደውልልዎ ይህ የመጀመሪያ ጊዜ ነው። ይህ ጥሪ አይፈለጌ ነበር፣ ይህን ቁጥር ማገድ እና ሪፖርት ማድረግ ይችላሉ።</string>
+  <string name="spam_notification_spam_call_collapsed_text">አይፈለጌ እንዳልሆነ ሪፖርት ለማድረግ ወይም ለማገድ መታ ያድርጉ</string>
+  <string name="spam_notification_report_spam_action_text">አግድ እና ሪፖርት አድርግ</string>
+  <string name="spam_notification_add_contact_action_text">እውቂያ ያክሉ</string>
+  <string name="spam_notification_dialog_add_contact_action_text">ወደ እውቂያዎች ያክሉ</string>
+  <string name="spam_notification_dialog_block_report_spam_action_text">አግድ እና አይፈለጌ ሪፖርት አድርግ</string>
+  <string name="spam_notification_was_not_spam_action_text">አይ፣ አይፈለጌ አይደለም</string>
+  <string name="spam_notification_block_spam_action_text">አዎ፣ ቁጥሩን አግድ</string>
+  <string name="spam_notification_action_dismiss">አሰናብት</string>
 </resources>
diff --git a/java/com/android/incallui/spam/res/values-ar/strings.xml b/java/com/android/incallui/spam/res/values-ar/strings.xml
index 0813392..3443651 100644
--- a/java/com/android/incallui/spam/res/values-ar/strings.xml
+++ b/java/com/android/incallui/spam/res/values-ar/strings.xml
@@ -1,36 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="non_spam_notification_title" msgid="2599384745904934400">"هل تعرف <xliff:g id="NUMBER">%1$s</xliff:g>؟"</string>
-    <string name="spam_notification_title" msgid="609838099069629476">"هل <xliff:g id="NUMBER">%1$s</xliff:g> غير مرغوب فيه؟"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"تم حظر <xliff:g id="NUMBER">%1$s</xliff:g> والإبلاغ عن المكالمة باعتبرها غير مرغوب فيها."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"تم الإبلاغ عن أن مكالمة <xliff:g id="NUMBER">%1$s</xliff:g> ليست من النوع غير المرغوب فيه."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"انقر للإضافة إلى جهات الاتصال أو لحظر الرقم غير المرغوب فيه."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"هذه هي المرة الأولى التي تتلقى فيها اتصالاً من هذا الرقم. إذا كانت هذه المكالمة غير مرغوب فيها، يمكنك حظر هذا الرقم والإبلاغ عنه."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"انقر للإبلاغ عن المكالمة باعتبارها غير مرغوب فيها أو حظرها."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"لدينا شك في أن هذا المتصل من النوع غير المرغوب فيه. إذا لم تكن هذه المكالمة من النوع غير المرغوب فيه، اضغط \"ليس رقمًا غير مرغوب فيه \" للإبلاغ عن خطأنا."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"حظر وإبلاغ"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"إضافة جهة اتصال"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"ليست محادثة غير مرغوب فيها."</string>
-    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"حظر الرقم"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"إضافة إلى جهات الاتصال"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"حظر الرقم والإبلاغ عنه كرقم غير مرغوب فيه"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"ليست محادثة غير مرغوب فيها."</string>
-    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"رفض"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="non_spam_notification_title">هل تعرف %1$s؟</string>
+  <string name="spam_notification_title">هل كان المتصل %1$s غير مرغوب فيه؟</string>
+  <string name="spam_notification_block_report_toast_text">تم حظر %1$s والإبلاغ عن المكالمة باعتبرها غير مرغوب فيها.</string>
+  <string name="spam_notification_not_spam_toast_text">تم الإبلاغ عن أن مكالمة %1$s ليست من النوع غير المرغوب فيه.</string>
+  <string name="spam_notification_non_spam_call_collapsed_text">انقر للإضافة إلى جهات الاتصال أو لحظر الرقم غير المرغوب فيه.</string>
+  <string name="spam_notification_non_spam_call_expanded_text">هذه هي المرة الأولى التي تتلقى فيها اتصالاً من هذا الرقم. إذا كانت هذه المكالمة غير مرغوب فيها، يمكنك حظر هذا الرقم والإبلاغ عنه.</string>
+  <string name="spam_notification_spam_call_collapsed_text">انقر للإبلاغ عن المكالمة باعتبارها مرغوب فيها أو احظرها.</string>
+  <string name="spam_notification_report_spam_action_text">حظر وإبلاغ</string>
+  <string name="spam_notification_add_contact_action_text">إضافة جهة اتصال</string>
+  <string name="spam_notification_dialog_add_contact_action_text">إضافة إلى جهات الاتصال</string>
+  <string name="spam_notification_dialog_block_report_spam_action_text">حظر الرقم والإبلاغ عنه كرقم غير مرغوب فيه</string>
+  <string name="spam_notification_was_not_spam_action_text">لا، مرغوب فيها</string>
+  <string name="spam_notification_block_spam_action_text">نعم، حظر الرقم</string>
+  <string name="spam_notification_action_dismiss">رفض</string>
 </resources>
diff --git a/java/com/android/incallui/spam/res/values-az/strings.xml b/java/com/android/incallui/spam/res/values-az/strings.xml
index 27ad7c5..353ee0b 100644
--- a/java/com/android/incallui/spam/res/values-az/strings.xml
+++ b/java/com/android/incallui/spam/res/values-az/strings.xml
@@ -1,36 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="non_spam_notification_title" msgid="2599384745904934400">"<xliff:g id="NUMBER">%1$s</xliff:g> nömrəsini tanıyırsınız?"</string>
-    <string name="spam_notification_title" msgid="609838099069629476">"<xliff:g id="NUMBER">%1$s</xliff:g> spamdır?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"<xliff:g id="NUMBER">%1$s</xliff:g> blok edilib və zəng spam olaraq bildirilib."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"<xliff:g id="NUMBER">%1$s</xliff:g> nömrəsindən gələn zəng spam olaraq bildirilib."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"Klikləyərək kontaktlara əlavə edin və ya spam nömrə kimi blok edin."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"İlk dəfədir ki, bu nömrədən Sizə zəng gəlir. Bu zəng spamdırsa, nömrəni blok edə və ya şikayət edə bilərsiniz."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"SPAM DEYİL seçiminə klikləyin və ya blok edin."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"Bunun spam olduğundan şübhələnirik. Bu zəng spam deyilsə, yanıldığımızı bildirmək üçün SPAM DEYİL seçiminə klikləyin."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"Blok/şikayət edin"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"Kontakt əlavə edin"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"Spam deyil"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"Nömrəni blok edin"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"Kontaktlara əlavə edin"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"Blok edin və ya spamı bildirin"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"Spam deyil"</string>
-    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"İmtina edin"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="non_spam_notification_title">%1$s nömrəsini tanıyırsınız?</string>
+  <string name="spam_notification_title">%1$s spam zəngi idi?</string>
+  <string name="spam_notification_block_report_toast_text">%1$s blok edilib və zəng spam olaraq bildirilib.</string>
+  <string name="spam_notification_not_spam_toast_text">%1$s nömrəsindən gələn zəng spam olaraq bildirilib.</string>
+  <string name="spam_notification_non_spam_call_collapsed_text">Klikləyərək kontaktlara əlavə edin və ya spam nömrə kimi blok edin.</string>
+  <string name="spam_notification_non_spam_call_expanded_text">İlk dəfədir ki, bu nömrədən Sizə zəng gəlir. Bu zəng spamdırsa, nömrəni blok edə və ya şikayət edə bilərsiniz.</string>
+  <string name="spam_notification_spam_call_collapsed_text">Spam deyil seçiminə klikləyin və ya blok edin</string>
+  <string name="spam_notification_report_spam_action_text">Blok/şikayət edin</string>
+  <string name="spam_notification_add_contact_action_text">Kontakt əlavə edin</string>
+  <string name="spam_notification_dialog_add_contact_action_text">Kontaktlara əlavə edin</string>
+  <string name="spam_notification_dialog_block_report_spam_action_text">Blok edin və ya spamı bildirin</string>
+  <string name="spam_notification_was_not_spam_action_text">Xeyr, spam deyil</string>
+  <string name="spam_notification_block_spam_action_text">Bəli, blok edin</string>
+  <string name="spam_notification_action_dismiss">Keçin</string>
 </resources>
diff --git a/java/com/android/incallui/spam/res/values-b+sr+Latn/strings.xml b/java/com/android/incallui/spam/res/values-b+sr+Latn/strings.xml
index f73adb5..4cfee80 100644
--- a/java/com/android/incallui/spam/res/values-b+sr+Latn/strings.xml
+++ b/java/com/android/incallui/spam/res/values-b+sr+Latn/strings.xml
@@ -1,36 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="non_spam_notification_title" msgid="2599384745904934400">"Poznat vam je broj <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="spam_notification_title" msgid="609838099069629476">"Da li je <xliff:g id="NUMBER">%1$s</xliff:g> nepoželjan?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"Blokirali ste <xliff:g id="NUMBER">%1$s</xliff:g>, a poziv ste prijavili kao nepoželjan."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"Prijavili ste da poziv sa <xliff:g id="NUMBER">%1$s</xliff:g> nije nepoželjan."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"Dodirnite da biste dodali kontakte ili blokirali nepoželjan broj."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"Prvi put ste primili poziv sa ovog broja. Ako je nepoželjan, možete da ga blokirate i prijavite."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"Dodirnite da biste prijavili da poziv NIJE NEPOŽELJAN ili blokirajte broj."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"Sumnjamo da je ovaj poziv nepoželjan. Ako nije, dodirnite NIJE NEPOŽELJAN da biste prijavili grešku."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"Blokiraj i prijavi"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"Dodaj kontakt"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"Nije nepoželjan"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"Blokiraj broj"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"Dodaj u kontakte"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"Blokiraj i prijavi nepoželjan poziv"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"Nije nepoželjan"</string>
-    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"Odbij"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="non_spam_notification_title">Poznat vam je broj %1$s?</string>
+  <string name="spam_notification_title">Da li vam je sa %1$s upućen nepoželjan poziv?</string>
+  <string name="spam_notification_block_report_toast_text">Blokirali ste %1$s, a poziv ste prijavili kao nepoželjan.</string>
+  <string name="spam_notification_not_spam_toast_text">Prijavili ste da poziv sa %1$s nije nepoželjan.</string>
+  <string name="spam_notification_non_spam_call_collapsed_text">Dodirnite da biste dodali kontakte ili blokirali nepoželjan broj.</string>
+  <string name="spam_notification_non_spam_call_expanded_text">Prvi put ste primili poziv sa ovog broja. Ako je nepoželjan, možete da ga blokirate i prijavite.</string>
+  <string name="spam_notification_spam_call_collapsed_text">Dodirnite da biste prijavili da poziv nije nepoželjan ili blokirali broj</string>
+  <string name="spam_notification_report_spam_action_text">Blokiraj i prijavi</string>
+  <string name="spam_notification_add_contact_action_text">Dodaj kontakt</string>
+  <string name="spam_notification_dialog_add_contact_action_text">Dodaj u kontakte</string>
+  <string name="spam_notification_dialog_block_report_spam_action_text">Blokiraj i prijavi nepoželjan poziv</string>
+  <string name="spam_notification_was_not_spam_action_text">Ne, nije nepoželjan</string>
+  <string name="spam_notification_block_spam_action_text">Da, blokiraj broj</string>
+  <string name="spam_notification_action_dismiss">Odbaci</string>
 </resources>
diff --git a/java/com/android/incallui/spam/res/values-be/strings.xml b/java/com/android/incallui/spam/res/values-be/strings.xml
index dc60639..0e3d48e 100644
--- a/java/com/android/incallui/spam/res/values-be/strings.xml
+++ b/java/com/android/incallui/spam/res/values-be/strings.xml
@@ -1,36 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="non_spam_notification_title" msgid="2599384745904934400">"Вы ведаеце нумар <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="spam_notification_title" msgid="609838099069629476">"Нумар <xliff:g id="NUMBER">%1$s</xliff:g> спамерскі?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"Нумар <xliff:g id="NUMBER">%1$s</xliff:g> заблакіраваны, а выклік быў заяўлены як спамерскі."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"Выклік з нумара <xliff:g id="NUMBER">%1$s</xliff:g> заяўлены як няспамерскі."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"Дакраніцеся, каб дадаць да кантактаў ці заблакіраваць спамерскі нумар."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"З гэтага нумара вас выклікалі ўпершыню. Калі гэта быў спамерскі выклік, вы можаце заблакіраваць гэты нумар і паведаміць аб гэтым."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"Дакраніцеся, каб заявіць гэты нумар як НЯСПАМЕРСКІ, або заблакіраваць яго."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"Мы падазраём, што гэта быў спамер. Калі гэты выклік быў няспамерскім, дакраніцеся да кнопкі \"НЕ СПАМ\", каб паведаміць аб нашай памылцы."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"Заблак. і паведаміць"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"Дадаць кантакт"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"Не спам"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"Заблакіраваць нумар"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"Дадаць у кантакты"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"Заблакіраваць і паведаміць пра спам"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"Не спам"</string>
-    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"Адхіліць"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="non_spam_notification_title">Вы ведаеце нумар %1$s?</string>
+  <string name="spam_notification_title">З нумара %1$s званіў спамер?</string>
+  <string name="spam_notification_block_report_toast_text">Нумар %1$s заблакіраваны, а выклік быў заяўлены як спамерскі.</string>
+  <string name="spam_notification_not_spam_toast_text">Выклік з нумара %1$s заяўлены як няспамерскі.</string>
+  <string name="spam_notification_non_spam_call_collapsed_text">Дакраніцеся, каб дадаць да кантактаў ці заблакіраваць спамерскі нумар.</string>
+  <string name="spam_notification_non_spam_call_expanded_text">З гэтага нумара вас выклікалі ўпершыню. Калі гэта быў спамерскі выклік, вы можаце заблакіраваць гэты нумар і паведаміць аб гэтым.</string>
+  <string name="spam_notification_spam_call_collapsed_text">Дакраніцеся, каб заявіць, што гэта не спам, ці заблакіраваць нумар</string>
+  <string name="spam_notification_report_spam_action_text">Заблак. і паведаміць</string>
+  <string name="spam_notification_add_contact_action_text">Дадаць кантакт</string>
+  <string name="spam_notification_dialog_add_contact_action_text">Дадаць у кантакты</string>
+  <string name="spam_notification_dialog_block_report_spam_action_text">Заблакіраваць і паведаміць пра спам</string>
+  <string name="spam_notification_was_not_spam_action_text">Не спам</string>
+  <string name="spam_notification_block_spam_action_text">Так, заблакіраваць нумар</string>
+  <string name="spam_notification_action_dismiss">Адхіліць</string>
 </resources>
diff --git a/java/com/android/incallui/spam/res/values-bg/strings.xml b/java/com/android/incallui/spam/res/values-bg/strings.xml
index b9f7dfd..54a0036 100644
--- a/java/com/android/incallui/spam/res/values-bg/strings.xml
+++ b/java/com/android/incallui/spam/res/values-bg/strings.xml
@@ -1,36 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="non_spam_notification_title" msgid="2599384745904934400">"<xliff:g id="NUMBER">%1$s</xliff:g> известен ли ви е?"</string>
-    <string name="spam_notification_title" msgid="609838099069629476">"<xliff:g id="NUMBER">%1$s</xliff:g> спам ли е?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"Блокирахте <xliff:g id="NUMBER">%1$s</xliff:g> и за обаждането бе подаден сигнал, че е спам."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"За обаждането от <xliff:g id="NUMBER">%1$s</xliff:g> бе подаден сигнал, че не е спам."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"Докоснете, за да добавите към контактите или да блокирате номера със спам."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"За първи път ви се обаждат от този номер. Ако обаждането е било спам, можете да блокирате номера и да подадете сигнал за него."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"Докоснете за подаване на сигнал „НЕ Е СПАМ“ или за блокиране."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"Предполагахме, че това е разпространител на спам. Ако обаждането не е било спам, докоснете „НЕ Е СПАМ“, за да сигнализирате за грешката ни."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"Блокиране и сигнал"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"Добавяне на контакт"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"Не е спам"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"Блокиране на номера"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"Добавяне към контактите"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"Блокиране и подаване на сигнал за спам"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"Не е спам"</string>
-    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"Отхвърляне"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="non_spam_notification_title">%1$s известен ли ви е?</string>
+  <string name="spam_notification_title">Обаждането от %1$s спам ли беше?</string>
+  <string name="spam_notification_block_report_toast_text">Блокирахте %1$s и за обаждането бе подаден сигнал, че е спам.</string>
+  <string name="spam_notification_not_spam_toast_text">За обаждането от %1$s бе подаден сигнал, че не е спам.</string>
+  <string name="spam_notification_non_spam_call_collapsed_text">Докоснете, за да добавите към контактите или да блокирате номера със спам.</string>
+  <string name="spam_notification_non_spam_call_expanded_text">За първи път ви се обаждат от този номер. Ако обаждането е било спам, можете да блокирате номера и да подадете сигнал за него.</string>
+  <string name="spam_notification_spam_call_collapsed_text">Докоснете за подаване на сигнал, че не е спам, или за блокиране</string>
+  <string name="spam_notification_report_spam_action_text">Блокиране и сигнал</string>
+  <string name="spam_notification_add_contact_action_text">Добавяне на контакт</string>
+  <string name="spam_notification_dialog_add_contact_action_text">Добавяне към контактите</string>
+  <string name="spam_notification_dialog_block_report_spam_action_text">Блокиране и подаване на сигнал за спам</string>
+  <string name="spam_notification_was_not_spam_action_text">Не, не е спам</string>
+  <string name="spam_notification_block_spam_action_text">Да, блокиране на номера</string>
+  <string name="spam_notification_action_dismiss">Отхвърляне</string>
 </resources>
diff --git a/java/com/android/incallui/spam/res/values-bn/strings.xml b/java/com/android/incallui/spam/res/values-bn/strings.xml
index 2fdd3e0..53bcda2 100644
--- a/java/com/android/incallui/spam/res/values-bn/strings.xml
+++ b/java/com/android/incallui/spam/res/values-bn/strings.xml
@@ -1,36 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="non_spam_notification_title" msgid="2599384745904934400">"<xliff:g id="NUMBER">%1$s</xliff:g> নম্বরটি জানেন?"</string>
-    <string name="spam_notification_title" msgid="609838099069629476">"<xliff:g id="NUMBER">%1$s</xliff:g> নম্বরটি কি স্প্যাম?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"<xliff:g id="NUMBER">%1$s</xliff:g> নম্বরটিকে ব্লক করা হয়েছে এবং কলটিকে স্প্যাম হিসেবে রিপোর্ট করা হয়েছে।"</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"<xliff:g id="NUMBER">%1$s</xliff:g> নম্বর থেকে আসা কলটিকে স্প্যাম হিসেবে রিপোর্ট করা হয়েছে।"</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"পরিচিতিগুলিতে যোগ করার জন্য ট্যাপ করুন অথবা স্প্যাম নম্বর ব্লক করুন।"</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"এই প্রথমবার এই নম্বর থেকে আপনাকে কল করা হয়েছে। যদি এই কলটি স্প্যাম হয় তাহলে এই নম্বরটিকে ব্লক করে এটির বিষয়ে রিপোর্ট করুন।"</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"স্প্যাম নয় হিসাবে রিপোর্ট করতে ট্যাপ করুন অথবা এটিকে ব্লক করুন।"</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"এটি কোনও স্প্যামার হতে পারে বলে আমাদের মনে হয়েছে। যদি এটি স্প্যাম না হয় তাহলে আমাদের ভুল হয়েছে জানাতে \'স্প্যাম নয়\' এ ট্যাপ করুন।"</string>
-    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"ব্লক করে রিপোর্ট করুন"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"পরিচিতি যোগ করুন"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"স্প্যাম নয়"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"নম্বর ব্লক করুন"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"পরিচিতিগুলিতে যোগ করুন"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"ব্লক করে স্প্যাম হিসেবে রিপোর্ট করুন"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"স্প্যাম নয়"</string>
-    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"প্রত্যাখ্যান করুন"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="non_spam_notification_title">%1$s নম্বরটি জানেন?</string>
+  <string name="spam_notification_title">%1$s কি স্প্যাম কলার?</string>
+  <string name="spam_notification_block_report_toast_text">%1$s নম্বরটিকে ব্লক করা হয়েছে এবং কলটিকে স্প্যাম হিসেবে রিপোর্ট করা হয়েছে।</string>
+  <string name="spam_notification_not_spam_toast_text">%1$s নম্বর থেকে আসা কলটিকে স্প্যাম হিসেবে রিপোর্ট করা হয়েছে।</string>
+  <string name="spam_notification_non_spam_call_collapsed_text">পরিচিতিগুলিতে যোগ করার জন্য ট্যাপ করুন অথবা স্প্যাম নম্বর ব্লক করুন।</string>
+  <string name="spam_notification_non_spam_call_expanded_text">এই প্রথমবার এই নম্বর থেকে আপনাকে কল করা হয়েছে। যদি এই কলটি স্প্যাম হয় তাহলে এই নম্বরটিকে ব্লক করে এটির বিষয়ে রিপোর্ট করুন।</string>
+  <string name="spam_notification_spam_call_collapsed_text">\"স্প্যাম নয়\" হিসেবে চিহ্নিত করতে ট্যাপ করুন অথবা ব্লক করুন</string>
+  <string name="spam_notification_report_spam_action_text">ব্লক করে রিপোর্ট করুন</string>
+  <string name="spam_notification_add_contact_action_text">পরিচিতি যোগ করুন</string>
+  <string name="spam_notification_dialog_add_contact_action_text">পরিচিতিগুলিতে যোগ করুন</string>
+  <string name="spam_notification_dialog_block_report_spam_action_text">ব্লক করে স্প্যাম হিসেবে রিপোর্ট করুন</string>
+  <string name="spam_notification_was_not_spam_action_text">না, স্প্যাম নয়</string>
+  <string name="spam_notification_block_spam_action_text">হ্যাঁ, নম্বর ব্লক করুন</string>
+  <string name="spam_notification_action_dismiss">খারিজ করুন</string>
 </resources>
diff --git a/java/com/android/incallui/spam/res/values-bs/strings.xml b/java/com/android/incallui/spam/res/values-bs/strings.xml
index 65a5fef..d16c5af 100644
--- a/java/com/android/incallui/spam/res/values-bs/strings.xml
+++ b/java/com/android/incallui/spam/res/values-bs/strings.xml
@@ -1,36 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="non_spam_notification_title" msgid="2599384745904934400">"Poznajete <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="spam_notification_title" msgid="609838099069629476">"Je li <xliff:g id="NUMBER">%1$s</xliff:g> neželjeni poziv?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"<xliff:g id="NUMBER">%1$s</xliff:g> je blokiran i poziv je prijavljen kao neželjen."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"Poziv s broja <xliff:g id="NUMBER">%1$s</xliff:g> je prijavljen kao neželjen."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"Dodirnite da biste dodali u kontakte ili blokirani neželjeni broj."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"Ovo je prvi poziv koji ste primili s ovog broja. Ako je poziv neželjen, možete blokirati ovaj broj i prijaviti ga."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"Dodirnite kako biste prijavili da poziv NIJE NEŽELJEN ili ga blokirajte."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"Sumnjamo da se radi o neželjenom pozivu. Ako nije neželjeni poziv, dodirnite NIJE NEŽELJEN da biste prijavili našu grešku."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"Blokiraj i prijavi"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"Dodaj kontakt"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"Nije neželjeno"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"Blokiraj broj"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"Dodaj u kontakte"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"Blokiraj i prijavi neželjeni poziv"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"Nije neželjeno"</string>
-    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"Odbij"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="non_spam_notification_title">Poznajete %1$s?</string>
+  <string name="spam_notification_title">Je li poziv s broja %1$s neželjen?</string>
+  <string name="spam_notification_block_report_toast_text">%1$s je blokiran i poziv je prijavljen kao neželjen.</string>
+  <string name="spam_notification_not_spam_toast_text">Poziv s broja %1$s je prijavljen kao neželjen.</string>
+  <string name="spam_notification_non_spam_call_collapsed_text">Dodirnite da biste dodali u kontakte ili blokirani neželjeni broj.</string>
+  <string name="spam_notification_non_spam_call_expanded_text">Ovo je prvi poziv koji ste primili s ovog broja. Ako je poziv neželjen, možete blokirati ovaj broj i prijaviti ga.</string>
+  <string name="spam_notification_spam_call_collapsed_text">Dodirnite kako biste prijavili da poziv nije neželjen ili ga blokirajte</string>
+  <string name="spam_notification_report_spam_action_text">Blokiraj i prijavi</string>
+  <string name="spam_notification_add_contact_action_text">Dodaj kontakt</string>
+  <string name="spam_notification_dialog_add_contact_action_text">Dodaj u kontakte</string>
+  <string name="spam_notification_dialog_block_report_spam_action_text">Blokiraj i prijavi neželjeni poziv</string>
+  <string name="spam_notification_was_not_spam_action_text">Ne, nije neželjeni poziv</string>
+  <string name="spam_notification_block_spam_action_text">Da, blokiraj broj</string>
+  <string name="spam_notification_action_dismiss">Odbaci</string>
 </resources>
diff --git a/java/com/android/incallui/spam/res/values-ca/strings.xml b/java/com/android/incallui/spam/res/values-ca/strings.xml
index bc3b5eb..93801b2 100644
--- a/java/com/android/incallui/spam/res/values-ca/strings.xml
+++ b/java/com/android/incallui/spam/res/values-ca/strings.xml
@@ -1,36 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="non_spam_notification_title" msgid="2599384745904934400">"Saps de qui és el número <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="spam_notification_title" msgid="609838099069629476">"El <xliff:g id="NUMBER">%1$s</xliff:g> és un número brossa?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"El <xliff:g id="NUMBER">%1$s</xliff:g> s\'ha bloquejat i la trucada s\'ha marcat com a brossa."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"S\'ha indicat que la trucada del <xliff:g id="NUMBER">%1$s</xliff:g> no és brossa."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"Toca per afegir el número als contactes o bé per marcar-lo com a brossa i bloquejar-lo."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"És la primera vegada que aquest número t\'ha trucat. Si era una trucada brossa, pots bloquejar-lo i informar-ne."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"Toca per indicar que NO ÉS BROSSA o per bloquejar-lo."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"Segons les nostres sospites, l\'autor de la trucada és un generador de contingut brossa. Si ens equivoquem, toca NO ÉS BROSSA per informar-nos-en."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"Bloqueja i marca"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"Afegeix als contactes"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"No és brossa"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"Bloqueja el número"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"Afegeix als contactes"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"Bloqueja i marca com a brossa"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"No és brossa"</string>
-    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"Rebutja"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="non_spam_notification_title">Saps de qui és el número %1$s?</string>
+  <string name="spam_notification_title">%1$s era una trucada brossa?</string>
+  <string name="spam_notification_block_report_toast_text">El %1$s s\'ha bloquejat i la trucada s\'ha marcat com a brossa.</string>
+  <string name="spam_notification_not_spam_toast_text">S\'ha indicat que la trucada del %1$s no és brossa.</string>
+  <string name="spam_notification_non_spam_call_collapsed_text">Toca per afegir el número als contactes o bé per marcar-lo com a brossa i bloquejar-lo.</string>
+  <string name="spam_notification_non_spam_call_expanded_text">És la primera vegada que aquest número t\'ha trucat. Si era una trucada brossa, pots bloquejar-lo i informar-ne.</string>
+  <string name="spam_notification_spam_call_collapsed_text">Toca per indicar que no és una trucada brossa o per bloquejar el número</string>
+  <string name="spam_notification_report_spam_action_text">Bloqueja i marca</string>
+  <string name="spam_notification_add_contact_action_text">Afegeix als contactes</string>
+  <string name="spam_notification_dialog_add_contact_action_text">Afegeix als contactes</string>
+  <string name="spam_notification_dialog_block_report_spam_action_text">Bloqueja i marca com a brossa</string>
+  <string name="spam_notification_was_not_spam_action_text">No, no és una trucada brossa</string>
+  <string name="spam_notification_block_spam_action_text">Sí, bloqueja el número</string>
+  <string name="spam_notification_action_dismiss">Ignora</string>
 </resources>
diff --git a/java/com/android/incallui/spam/res/values-cs/strings.xml b/java/com/android/incallui/spam/res/values-cs/strings.xml
index 82c7dbf..9e682f8 100644
--- a/java/com/android/incallui/spam/res/values-cs/strings.xml
+++ b/java/com/android/incallui/spam/res/values-cs/strings.xml
@@ -1,36 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="non_spam_notification_title" msgid="2599384745904934400">"Znáte číslo <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="spam_notification_title" msgid="609838099069629476">"Je číslo <xliff:g id="NUMBER">%1$s</xliff:g> spam?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"Číslo <xliff:g id="NUMBER">%1$s</xliff:g> bylo zablokováno a hovor byl nahlášen jako spam."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"Bylo nahlášeno, že hovor z čísla <xliff:g id="NUMBER">%1$s</xliff:g> nebyl spam."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"Klepnutím číslo přidáte do kontaktů nebo zablokujete jako spam."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"Toto číslo vám volalo poprvé. Pokud se jednalo o spam, můžete číslo zablokovat a nahlásit."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"Klepnutím nahlásíte, že toto číslo NENÍ SPAM, nebo ho zablokujete."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"Máme podezření, že tento hovor byl spam. Pokud se nejednalo o spam, klepněte na NEŠLO O SPAM a nahlaste nám tak omyl."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"Blokovat a nahlásit"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"Přidat kontakt"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"Nešlo o spam"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"Zablokovat číslo"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"Přidat do kontaktů"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"Zablokovat a nahlásit spam"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"Nešlo o spam"</string>
-    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"Odmítnout"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="non_spam_notification_title">Znáte číslo %1$s?</string>
+  <string name="spam_notification_title">Byl hovor z čísla %1$s spam?</string>
+  <string name="spam_notification_block_report_toast_text">Číslo %1$s bylo zablokováno a hovor byl nahlášen jako spam.</string>
+  <string name="spam_notification_not_spam_toast_text">Bylo nahlášeno, že hovor z čísla %1$s nebyl spam.</string>
+  <string name="spam_notification_non_spam_call_collapsed_text">Klepnutím číslo přidáte do kontaktů nebo zablokujete jako spam.</string>
+  <string name="spam_notification_non_spam_call_expanded_text">Toto číslo vám volalo poprvé. Pokud se jednalo o spam, můžete číslo zablokovat a nahlásit.</string>
+  <string name="spam_notification_spam_call_collapsed_text">Klepnutím nahlásíte, že toto číslo není spam, nebo ho zablokujete.</string>
+  <string name="spam_notification_report_spam_action_text">Blokovat a nahlásit</string>
+  <string name="spam_notification_add_contact_action_text">Přidat kontakt</string>
+  <string name="spam_notification_dialog_add_contact_action_text">Přidat do kontaktů</string>
+  <string name="spam_notification_dialog_block_report_spam_action_text">Zablokovat a nahlásit spam</string>
+  <string name="spam_notification_was_not_spam_action_text">Ne, nešlo o spam</string>
+  <string name="spam_notification_block_spam_action_text">Ano, zablokovat číslo</string>
+  <string name="spam_notification_action_dismiss">Zavřít</string>
 </resources>
diff --git a/java/com/android/incallui/spam/res/values-da/strings.xml b/java/com/android/incallui/spam/res/values-da/strings.xml
index b4ae0e5..87986d4 100644
--- a/java/com/android/incallui/spam/res/values-da/strings.xml
+++ b/java/com/android/incallui/spam/res/values-da/strings.xml
@@ -1,36 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="non_spam_notification_title" msgid="2599384745904934400">"Kender du <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="spam_notification_title" msgid="609838099069629476">"Er <xliff:g id="NUMBER">%1$s</xliff:g> spam?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"<xliff:g id="NUMBER">%1$s</xliff:g> blev blokeret, og opkaldet blev rapporteret som spam."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"Opkaldet fra <xliff:g id="NUMBER">%1$s</xliff:g> blev ikke rapporteret som spam."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"Tryk for at føje til kontaktpersoner eller for at blokere spamnummeret."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"Dette er første gang, at dette nummer har ringet til dig. Hvis det var et spamopkald, kan du blokere nummeret og rapportere det."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"Tryk for at rapportere nummeret som IKKE SPAM, eller bloker det."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"Vi har mistanke om, at dette er en spammer. Hvis opkaldet ikke er spam, skal du trykke på IKKE SPAM for at rapportere vores mistanke."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"Bloker og rapportér"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"Tilføj kontaktperson"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"Ikke spam"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"Bloker nummer"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"Føj til kontaktpersoner"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"Bloker og rapportér spam"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"Ikke spam"</string>
-    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"Afvis"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="non_spam_notification_title">Kender du %1$s?</string>
+  <string name="spam_notification_title">Var %1$s et spamopkald?</string>
+  <string name="spam_notification_block_report_toast_text">%1$s blev blokeret, og opkaldet blev rapporteret som spam.</string>
+  <string name="spam_notification_not_spam_toast_text">Opkaldet fra %1$s blev ikke rapporteret som spam.</string>
+  <string name="spam_notification_non_spam_call_collapsed_text">Tryk for at føje til kontaktpersoner eller for at blokere spamnummeret.</string>
+  <string name="spam_notification_non_spam_call_expanded_text">Dette er første gang, at dette nummer har ringet til dig. Hvis det var et spamopkald, kan du blokere nummeret og rapportere det.</string>
+  <string name="spam_notification_spam_call_collapsed_text">Tryk for at fjerne spammarkeringen, eller bloker nummeret</string>
+  <string name="spam_notification_report_spam_action_text">Bloker og rapportér</string>
+  <string name="spam_notification_add_contact_action_text">Tilføj kontaktperson</string>
+  <string name="spam_notification_dialog_add_contact_action_text">Føj til kontaktpersoner</string>
+  <string name="spam_notification_dialog_block_report_spam_action_text">Bloker og rapportér spam</string>
+  <string name="spam_notification_was_not_spam_action_text">Nej, ikke spam</string>
+  <string name="spam_notification_block_spam_action_text">Ja, bloker nummer</string>
+  <string name="spam_notification_action_dismiss">Afvis</string>
 </resources>
diff --git a/java/com/android/incallui/spam/res/values-de/strings.xml b/java/com/android/incallui/spam/res/values-de/strings.xml
index 35bbf63..94d1c09 100644
--- a/java/com/android/incallui/spam/res/values-de/strings.xml
+++ b/java/com/android/incallui/spam/res/values-de/strings.xml
@@ -1,36 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="non_spam_notification_title" msgid="2599384745904934400">"Kennst du <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="spam_notification_title" msgid="609838099069629476">"Ist <xliff:g id="NUMBER">%1$s</xliff:g> Spam?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"<xliff:g id="NUMBER">%1$s</xliff:g> wurde blockiert und der Anruf wurde als Spam gemeldet."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"Anruf von <xliff:g id="NUMBER">%1$s</xliff:g> wurde als kein Spam gemeldet."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"Tippen, um die Nummer deinen Kontakten hinzuzufügen oder sie als Spam zu blockieren."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"Du wurdest das erste Mal von dieser Nummer angerufen. Wenn dieser Anruf Spam war, kannst du die Nummer blockieren und melden."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"Tippen, um die Nummer als KEIN SPAM zu melden oder sie zu blockieren."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"Dies ist vermutlich Spam. Wenn der Anruf kein Spam war, tippe auf KEIN SPAM, um den Fehler zu melden."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"Blockieren und melden"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"Kontakt hinzufügen"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"Kein Spam"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"Nummer blockieren"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"Zu Kontakten hinzufügen"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"Blockieren und als Spam melden"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"Kein Spam"</string>
-    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"Ablehnen"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="non_spam_notification_title">Kennst du %1$s?</string>
+  <string name="spam_notification_title">War %1$s ein Spamanrufer?</string>
+  <string name="spam_notification_block_report_toast_text">%1$s wurde blockiert und der Anruf wurde als Spam gemeldet.</string>
+  <string name="spam_notification_not_spam_toast_text">Anruf von %1$s wurde als kein Spam gemeldet.</string>
+  <string name="spam_notification_non_spam_call_collapsed_text">Tippen, um die Nummer deinen Kontakten hinzuzufügen oder sie als Spam zu blockieren.</string>
+  <string name="spam_notification_non_spam_call_expanded_text">Du wurdest das erste Mal von dieser Nummer angerufen. Wenn dieser Anruf Spam war, kannst du die Nummer blockieren und melden.</string>
+  <string name="spam_notification_spam_call_collapsed_text">Tippen, um die Nummer als kein Spam zu melden oder sie zu blockieren</string>
+  <string name="spam_notification_report_spam_action_text">Blockieren und melden</string>
+  <string name="spam_notification_add_contact_action_text">Kontakt hinzufügen</string>
+  <string name="spam_notification_dialog_add_contact_action_text">Zu Kontakten hinzufügen</string>
+  <string name="spam_notification_dialog_block_report_spam_action_text">Blockieren und als Spam melden</string>
+  <string name="spam_notification_was_not_spam_action_text">Nein, kein Spam</string>
+  <string name="spam_notification_block_spam_action_text">Ja, Nummer blockieren</string>
+  <string name="spam_notification_action_dismiss">Schließen</string>
 </resources>
diff --git a/java/com/android/incallui/spam/res/values-el/strings.xml b/java/com/android/incallui/spam/res/values-el/strings.xml
index cd0b9d0..64f5c37 100644
--- a/java/com/android/incallui/spam/res/values-el/strings.xml
+++ b/java/com/android/incallui/spam/res/values-el/strings.xml
@@ -1,36 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="non_spam_notification_title" msgid="2599384745904934400">"Γνωρίζετε τον αριθμό <xliff:g id="NUMBER">%1$s</xliff:g>;"</string>
-    <string name="spam_notification_title" msgid="609838099069629476">"Είναι ο αριθμός <xliff:g id="NUMBER">%1$s</xliff:g> ανεπιθύμητος;"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"Ο αριθμός <xliff:g id="NUMBER">%1$s</xliff:g> αποκλείστηκε και η κλήση αναφέρθηκε ως ανεπιθύμητη."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"Η κλήση από τον αριθμό <xliff:g id="NUMBER">%1$s</xliff:g> αναφέρθηκε ως μη ανεπιθύμητη."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"Πατήστε για προσθήκη στις επαφές ή αποκλεισμό αριθμού ως ανεπιθύμητο."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"Αυτή είναι η πρώτη φορά που σας καλεί αυτός ο αριθμός. Αν η κλήση αυτή ήταν ανεπιθύμητη, μπορείτε να αποκλείσετε αυτόν τον αριθμό και να τον αναφέρετε."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"Πατήστε για αναφορά ως ΜΗ ΑΝΕΠΙΘΥΜΗΤΗΣ ή για αποκλεισμό της."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"Υποψιαστήκαμε ότι πρόκειται για ανεπιθύμητο καλούντα. Εάν η κλήση δεν ήταν ανεπιθύμητη, πατήστε ΜΗ ΑΝΕΠΙΘΥΜΗΤΗ για να αναφέρετε το λάθος μας."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"Αποκλεισμός και αναφορά"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"Προσθήκη επαφής"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"Μη ανεπιθύμητη"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"Αποκλεισμός αριθμού"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"Προσθήκη στις επαφές"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"Αποκλεισμός και αναφορά ως ανεπιθύμητης"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"Μη ανεπιθύμητη"</string>
-    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"Απόρριψη"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="non_spam_notification_title">Γνωρίζετε τον αριθμό %1$s;</string>
+  <string name="spam_notification_title">Ήταν η κλήση από το %1$s ανεπιθύμητη;</string>
+  <string name="spam_notification_block_report_toast_text">Ο αριθμός %1$s αποκλείστηκε και η κλήση αναφέρθηκε ως ανεπιθύμητη.</string>
+  <string name="spam_notification_not_spam_toast_text">Η κλήση από τον αριθμό %1$s αναφέρθηκε ως μη ανεπιθύμητη.</string>
+  <string name="spam_notification_non_spam_call_collapsed_text">Πατήστε για προσθήκη στις επαφές ή αποκλεισμό αριθμού ως ανεπιθύμητο.</string>
+  <string name="spam_notification_non_spam_call_expanded_text">Αυτή είναι η πρώτη φορά που σας καλεί αυτός ο αριθμός. Αν η κλήση αυτή ήταν ανεπιθύμητη, μπορείτε να αποκλείσετε αυτόν τον αριθμό και να τον αναφέρετε.</string>
+  <string name="spam_notification_spam_call_collapsed_text">Πατήστε για αναφορά ως μη ανεπιθύμητης ή για αποκλεισμό της.</string>
+  <string name="spam_notification_report_spam_action_text">Αποκλεισμός και αναφορά</string>
+  <string name="spam_notification_add_contact_action_text">Προσθήκη επαφής</string>
+  <string name="spam_notification_dialog_add_contact_action_text">Προσθήκη στις επαφές</string>
+  <string name="spam_notification_dialog_block_report_spam_action_text">Αποκλεισμός και αναφορά ως ανεπιθύμητης</string>
+  <string name="spam_notification_was_not_spam_action_text">Όχι, δεν ήταν ανεπιθύμητη</string>
+  <string name="spam_notification_block_spam_action_text">Ναι, να γίνει φραγή του αριθμού</string>
+  <string name="spam_notification_action_dismiss">Παράβλεψη</string>
 </resources>
diff --git a/java/com/android/incallui/spam/res/values-en-rAU/strings.xml b/java/com/android/incallui/spam/res/values-en-rAU/strings.xml
index 925176b..f8b7564 100644
--- a/java/com/android/incallui/spam/res/values-en-rAU/strings.xml
+++ b/java/com/android/incallui/spam/res/values-en-rAU/strings.xml
@@ -1,36 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="non_spam_notification_title" msgid="2599384745904934400">"Do you know <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="spam_notification_title" msgid="609838099069629476">"Is <xliff:g id="NUMBER">%1$s</xliff:g> spam?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"<xliff:g id="NUMBER">%1$s</xliff:g> blocked and call was reported as spam."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"Call from <xliff:g id="NUMBER">%1$s</xliff:g> reported as not spam."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"Tap to add to contacts or block spam number."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"This is the first time that this number has called you. If this call was spam, you can block this number and report it."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"Tap to report as NOT SPAM, or block it."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"We suspected that this was a spammer. If this call wasn\'t spam, tap NOT SPAM to report our mistake."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"Block &amp; report"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"Add contact"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"Not spam"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"Block number"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"Add to contacts"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"Block &amp; report spam"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"Not spam"</string>
-    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"Decline"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="non_spam_notification_title">Do you know %1$s?</string>
+  <string name="spam_notification_title">Was %1$s a spam caller?</string>
+  <string name="spam_notification_block_report_toast_text">%1$s blocked and call was reported as spam.</string>
+  <string name="spam_notification_not_spam_toast_text">Call from %1$s reported as not spam.</string>
+  <string name="spam_notification_non_spam_call_collapsed_text">Tap to add to contacts or block spam number.</string>
+  <string name="spam_notification_non_spam_call_expanded_text">This is the first time that this number has called you. If this call was spam, you can block this number and report it.</string>
+  <string name="spam_notification_spam_call_collapsed_text">Tap to report as not spam or block it</string>
+  <string name="spam_notification_report_spam_action_text">Block &amp; report</string>
+  <string name="spam_notification_add_contact_action_text">Add contact</string>
+  <string name="spam_notification_dialog_add_contact_action_text">Add to contacts</string>
+  <string name="spam_notification_dialog_block_report_spam_action_text">Block &amp; report spam</string>
+  <string name="spam_notification_was_not_spam_action_text">No, not spam</string>
+  <string name="spam_notification_block_spam_action_text">Yes, block number</string>
+  <string name="spam_notification_action_dismiss">Dismiss</string>
 </resources>
diff --git a/java/com/android/incallui/spam/res/values-en-rGB/strings.xml b/java/com/android/incallui/spam/res/values-en-rGB/strings.xml
index 925176b..f8b7564 100644
--- a/java/com/android/incallui/spam/res/values-en-rGB/strings.xml
+++ b/java/com/android/incallui/spam/res/values-en-rGB/strings.xml
@@ -1,36 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="non_spam_notification_title" msgid="2599384745904934400">"Do you know <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="spam_notification_title" msgid="609838099069629476">"Is <xliff:g id="NUMBER">%1$s</xliff:g> spam?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"<xliff:g id="NUMBER">%1$s</xliff:g> blocked and call was reported as spam."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"Call from <xliff:g id="NUMBER">%1$s</xliff:g> reported as not spam."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"Tap to add to contacts or block spam number."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"This is the first time that this number has called you. If this call was spam, you can block this number and report it."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"Tap to report as NOT SPAM, or block it."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"We suspected that this was a spammer. If this call wasn\'t spam, tap NOT SPAM to report our mistake."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"Block &amp; report"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"Add contact"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"Not spam"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"Block number"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"Add to contacts"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"Block &amp; report spam"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"Not spam"</string>
-    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"Decline"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="non_spam_notification_title">Do you know %1$s?</string>
+  <string name="spam_notification_title">Was %1$s a spam caller?</string>
+  <string name="spam_notification_block_report_toast_text">%1$s blocked and call was reported as spam.</string>
+  <string name="spam_notification_not_spam_toast_text">Call from %1$s reported as not spam.</string>
+  <string name="spam_notification_non_spam_call_collapsed_text">Tap to add to contacts or block spam number.</string>
+  <string name="spam_notification_non_spam_call_expanded_text">This is the first time that this number has called you. If this call was spam, you can block this number and report it.</string>
+  <string name="spam_notification_spam_call_collapsed_text">Tap to report as not spam or block it</string>
+  <string name="spam_notification_report_spam_action_text">Block &amp; report</string>
+  <string name="spam_notification_add_contact_action_text">Add contact</string>
+  <string name="spam_notification_dialog_add_contact_action_text">Add to contacts</string>
+  <string name="spam_notification_dialog_block_report_spam_action_text">Block &amp; report spam</string>
+  <string name="spam_notification_was_not_spam_action_text">No, not spam</string>
+  <string name="spam_notification_block_spam_action_text">Yes, block number</string>
+  <string name="spam_notification_action_dismiss">Dismiss</string>
 </resources>
diff --git a/java/com/android/incallui/spam/res/values-en-rIN/strings.xml b/java/com/android/incallui/spam/res/values-en-rIN/strings.xml
index 925176b..f8b7564 100644
--- a/java/com/android/incallui/spam/res/values-en-rIN/strings.xml
+++ b/java/com/android/incallui/spam/res/values-en-rIN/strings.xml
@@ -1,36 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="non_spam_notification_title" msgid="2599384745904934400">"Do you know <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="spam_notification_title" msgid="609838099069629476">"Is <xliff:g id="NUMBER">%1$s</xliff:g> spam?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"<xliff:g id="NUMBER">%1$s</xliff:g> blocked and call was reported as spam."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"Call from <xliff:g id="NUMBER">%1$s</xliff:g> reported as not spam."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"Tap to add to contacts or block spam number."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"This is the first time that this number has called you. If this call was spam, you can block this number and report it."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"Tap to report as NOT SPAM, or block it."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"We suspected that this was a spammer. If this call wasn\'t spam, tap NOT SPAM to report our mistake."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"Block &amp; report"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"Add contact"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"Not spam"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"Block number"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"Add to contacts"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"Block &amp; report spam"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"Not spam"</string>
-    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"Decline"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="non_spam_notification_title">Do you know %1$s?</string>
+  <string name="spam_notification_title">Was %1$s a spam caller?</string>
+  <string name="spam_notification_block_report_toast_text">%1$s blocked and call was reported as spam.</string>
+  <string name="spam_notification_not_spam_toast_text">Call from %1$s reported as not spam.</string>
+  <string name="spam_notification_non_spam_call_collapsed_text">Tap to add to contacts or block spam number.</string>
+  <string name="spam_notification_non_spam_call_expanded_text">This is the first time that this number has called you. If this call was spam, you can block this number and report it.</string>
+  <string name="spam_notification_spam_call_collapsed_text">Tap to report as not spam or block it</string>
+  <string name="spam_notification_report_spam_action_text">Block &amp; report</string>
+  <string name="spam_notification_add_contact_action_text">Add contact</string>
+  <string name="spam_notification_dialog_add_contact_action_text">Add to contacts</string>
+  <string name="spam_notification_dialog_block_report_spam_action_text">Block &amp; report spam</string>
+  <string name="spam_notification_was_not_spam_action_text">No, not spam</string>
+  <string name="spam_notification_block_spam_action_text">Yes, block number</string>
+  <string name="spam_notification_action_dismiss">Dismiss</string>
 </resources>
diff --git a/java/com/android/incallui/spam/res/values-es-rUS/strings.xml b/java/com/android/incallui/spam/res/values-es-rUS/strings.xml
index a794ab3..b462a1a 100644
--- a/java/com/android/incallui/spam/res/values-es-rUS/strings.xml
+++ b/java/com/android/incallui/spam/res/values-es-rUS/strings.xml
@@ -1,36 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="non_spam_notification_title" msgid="2599384745904934400">"¿Sabes quién es <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="spam_notification_title" msgid="609838099069629476">"¿<xliff:g id="NUMBER">%1$s</xliff:g> es spam?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"<xliff:g id="NUMBER">%1$s</xliff:g> bloqueado. La llamada se marcó como spam."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"Se indicó que la llamada de <xliff:g id="NUMBER">%1$s</xliff:g> no es spam."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"Presiona para agregar a los contactos o para bloquear el número marcado como spam."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"Esta es la primera vez que este número te llama. Si la llamada fue spam, puedes bloquear este número y denunciarlo."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"Presiona para informar que NO ES SPAM o para bloquearlo."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"Sospechamos que era spam. Si la llamada no fue spam, presiona NO ES SPAM para informarnos de nuestro error."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"Bloquear y denunciar"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"Agregar contacto"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"No es spam"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"Bloquear número"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"Agregar a contactos"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"Bloquear y marcar como spam"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"No es spam"</string>
-    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"Rechazar"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="non_spam_notification_title">¿Sabes quién es %1$s?</string>
+  <string name="spam_notification_title">¿La llamada que recibiste de %1$s era una llamada de spam?</string>
+  <string name="spam_notification_block_report_toast_text">%1$s bloqueado. La llamada se marcó como spam.</string>
+  <string name="spam_notification_not_spam_toast_text">Se indicó que la llamada de %1$s no es spam.</string>
+  <string name="spam_notification_non_spam_call_collapsed_text">Presiona para agregar a los contactos o para bloquear el número marcado como spam.</string>
+  <string name="spam_notification_non_spam_call_expanded_text">Esta es la primera vez que este número te llama. Si la llamada fue spam, puedes bloquear este número y denunciarlo.</string>
+  <string name="spam_notification_spam_call_collapsed_text">Presiona para informar que no es spam o para bloquearlo</string>
+  <string name="spam_notification_report_spam_action_text">Bloquear y denunciar</string>
+  <string name="spam_notification_add_contact_action_text">Agregar contacto</string>
+  <string name="spam_notification_dialog_add_contact_action_text">Agregar a contactos</string>
+  <string name="spam_notification_dialog_block_report_spam_action_text">Bloquear y marcar como spam</string>
+  <string name="spam_notification_was_not_spam_action_text">No, no es spam</string>
+  <string name="spam_notification_block_spam_action_text">Sí, bloquear el número</string>
+  <string name="spam_notification_action_dismiss">Ignorar</string>
 </resources>
diff --git a/java/com/android/incallui/spam/res/values-es/strings.xml b/java/com/android/incallui/spam/res/values-es/strings.xml
index f35d018..a384649 100644
--- a/java/com/android/incallui/spam/res/values-es/strings.xml
+++ b/java/com/android/incallui/spam/res/values-es/strings.xml
@@ -1,36 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="non_spam_notification_title" msgid="2599384745904934400">"¿Conoces el número <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="spam_notification_title" msgid="609838099069629476">"¿El número <xliff:g id="NUMBER">%1$s</xliff:g> es spam?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"Se ha bloqueado el número <xliff:g id="NUMBER">%1$s</xliff:g> y se ha marcado la llamada como Spam."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"Se ha marcado la llamada del <xliff:g id="NUMBER">%1$s</xliff:g> como No es spam."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"Toca el número para añadirlo a los contactos o bloquearlo como spam."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"Es la primera vez que recibes una llamada de este número. Si se trata de spam, puedes bloquear el número y denunciarlo."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"Toca el número para marcarlo como NO ES SPAM o bloquearlo."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"Sospechamos que es un spammer. Si la llamada no es spam, toca NO ES SPAM para informarnos de nuestro error."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"Bloquear y denunciar"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"Añadir contacto"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"No es spam"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"Bloquear número"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"Añadir a contactos"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"Bloquear y marcar como spam"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"No es spam"</string>
-    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"Rechazar"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="non_spam_notification_title">¿Conoces el número %1$s?</string>
+  <string name="spam_notification_title">¿La llamada del %1$s era spam?</string>
+  <string name="spam_notification_block_report_toast_text">Se ha bloqueado el número %1$s y se ha marcado la llamada como Spam.</string>
+  <string name="spam_notification_not_spam_toast_text">Se ha marcado la llamada del %1$s como No es spam.</string>
+  <string name="spam_notification_non_spam_call_collapsed_text">Toca el número para añadirlo a los contactos o bloquearlo como spam.</string>
+  <string name="spam_notification_non_spam_call_expanded_text">Es la primera vez que recibes una llamada de este número. Si se trata de spam, puedes bloquear el número y denunciarlo.</string>
+  <string name="spam_notification_spam_call_collapsed_text">Toca el número para marcarlo como que no es spam o bloquearlo</string>
+  <string name="spam_notification_report_spam_action_text">Bloquear y denunciar</string>
+  <string name="spam_notification_add_contact_action_text">Añadir contacto</string>
+  <string name="spam_notification_dialog_add_contact_action_text">Añadir a contactos</string>
+  <string name="spam_notification_dialog_block_report_spam_action_text">Bloquear y marcar como spam</string>
+  <string name="spam_notification_was_not_spam_action_text">No, no es spam</string>
+  <string name="spam_notification_block_spam_action_text">Sí, bloquear el número</string>
+  <string name="spam_notification_action_dismiss">Ignorar</string>
 </resources>
diff --git a/java/com/android/incallui/spam/res/values-et/strings.xml b/java/com/android/incallui/spam/res/values-et/strings.xml
index 6a41e9a..e2bb399 100644
--- a/java/com/android/incallui/spam/res/values-et/strings.xml
+++ b/java/com/android/incallui/spam/res/values-et/strings.xml
@@ -1,36 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="non_spam_notification_title" msgid="2599384745904934400">"Kas teate numbrit <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="spam_notification_title" msgid="609838099069629476">"Kas number <xliff:g id="NUMBER">%1$s</xliff:g> saadab rämpsposti?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"Number <xliff:g id="NUMBER">%1$s</xliff:g> blokeeriti ja kõne liigitati rämpspostiks."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"Kõnet numbrilt <xliff:g id="NUMBER">%1$s</xliff:g> ei liigitatud rämpspostiks."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"Puudutage kontaktide lisamiseks või rämpsposti saatva numbri blokeerimiseks."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"Teile helistati sellelt numbrilt esimest korda. Kui see kõne oli rämpspost, blokeerige see number ja teavitage meid sellest."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"Puudutage, kui see POLE RÄMPSPOST, või blokeerige see."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"Kahtlustame, et see on rämpsposti saatja. Kui see kõne polnud rämpspost, puudutage valikut POLE RÄMPSPOST, et meid veast teavitada."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"Blokeeri ja teavita"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"Lisa kontakt"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"Pole rämpspost"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"Blokeeri number"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"Lisa kontaktidesse"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"Blokeeri ja teavita rämpspostist"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"Pole rämpspost"</string>
-    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"Keeldu"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="non_spam_notification_title">Kas teate numbrit %1$s?</string>
+  <string name="spam_notification_title">Kas kõne numbrilt %1$s oli rämpskõnetegijalt?</string>
+  <string name="spam_notification_block_report_toast_text">Number %1$s blokeeriti ja kõne liigitati rämpspostiks.</string>
+  <string name="spam_notification_not_spam_toast_text">Kõnet numbrilt %1$s ei liigitatud rämpspostiks.</string>
+  <string name="spam_notification_non_spam_call_collapsed_text">Puudutage kontaktide lisamiseks või rämpsposti saatva numbri blokeerimiseks.</string>
+  <string name="spam_notification_non_spam_call_expanded_text">Teile helistati sellelt numbrilt esimest korda. Kui see kõne oli rämpspost, blokeerige see number ja teavitage meid sellest.</string>
+  <string name="spam_notification_spam_call_collapsed_text">Puudutage, kui see pole rämpskõne, või blokeerige see</string>
+  <string name="spam_notification_report_spam_action_text">Blokeeri ja teavita</string>
+  <string name="spam_notification_add_contact_action_text">Lisa kontakt</string>
+  <string name="spam_notification_dialog_add_contact_action_text">Lisa kontaktidesse</string>
+  <string name="spam_notification_dialog_block_report_spam_action_text">Blokeeri ja teavita rämpspostist</string>
+  <string name="spam_notification_was_not_spam_action_text">Ei, see pole rämpskõne</string>
+  <string name="spam_notification_block_spam_action_text">Jah, blokeeri number</string>
+  <string name="spam_notification_action_dismiss">Loobu</string>
 </resources>
diff --git a/java/com/android/incallui/spam/res/values-eu/strings.xml b/java/com/android/incallui/spam/res/values-eu/strings.xml
index 562b61a..1d075f8 100644
--- a/java/com/android/incallui/spam/res/values-eu/strings.xml
+++ b/java/com/android/incallui/spam/res/values-eu/strings.xml
@@ -1,36 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="non_spam_notification_title" msgid="2599384745904934400">"Ezagutzen duzu <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="spam_notification_title" msgid="609838099069629476">"Spama da <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"Blokeatu da <xliff:g id="NUMBER">%1$s</xliff:g>, eta spama dela salatu da."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"Ez-spam gisa markatu da <xliff:g id="NUMBER">%1$s</xliff:g>."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"Sakatu kontaktuetan gehitzeko edo blokeatu spam-zenbakia."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"Zenbaki honek deitu dizun lehenengo aldia izan da. Spama bada, blokeatu eta salatu egin dezakezu."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"Sakatu EZ DA SPAMA gisa markatzeko, edo blokea ezazu."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"Spam-igorle baten deia izan dela susmatu dugu. Dei hau ez bada spama izan, sakatu EZ DA SPAMA gure akatsaren berri emateko."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"Blokeatu eta salatu"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"Gehitu kontaktua"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"Ez da spama"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"Blokeatu zenbakia"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"Gehitu kontaktuetan"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"Blokeatu eta salatu spama dela"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"Ez da spama"</string>
-    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"Baztertu"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="non_spam_notification_title">Ezagutzen duzu %1$s?</string>
+  <string name="spam_notification_title">Spam-deia izan al da %1$s zenbakitik jasotakoa?</string>
+  <string name="spam_notification_block_report_toast_text">Blokeatu da %1$s, eta spama dela salatu da.</string>
+  <string name="spam_notification_not_spam_toast_text">Ez-spam gisa markatu da %1$s.</string>
+  <string name="spam_notification_non_spam_call_collapsed_text">Sakatu kontaktuetan gehitzeko edo blokeatu spam-zenbakia.</string>
+  <string name="spam_notification_non_spam_call_expanded_text">Zenbaki honek deitu dizun lehenengo aldia izan da. Spama bada, blokeatu eta salatu egin dezakezu.</string>
+  <string name="spam_notification_spam_call_collapsed_text">\"Ez da spama\" gisa markatzeko edo zenbakia blokeatzeko, sakatu hau</string>
+  <string name="spam_notification_report_spam_action_text">Blokeatu eta salatu</string>
+  <string name="spam_notification_add_contact_action_text">Gehitu kontaktua</string>
+  <string name="spam_notification_dialog_add_contact_action_text">Gehitu kontaktuetan</string>
+  <string name="spam_notification_dialog_block_report_spam_action_text">Blokeatu eta salatu spama dela</string>
+  <string name="spam_notification_was_not_spam_action_text">Ez, ez da spama</string>
+  <string name="spam_notification_block_spam_action_text">Bai, blokeatu zenbakia</string>
+  <string name="spam_notification_action_dismiss">Baztertu</string>
 </resources>
diff --git a/java/com/android/incallui/spam/res/values-fa/strings.xml b/java/com/android/incallui/spam/res/values-fa/strings.xml
index 7c63c30..bc09175 100644
--- a/java/com/android/incallui/spam/res/values-fa/strings.xml
+++ b/java/com/android/incallui/spam/res/values-fa/strings.xml
@@ -1,36 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="non_spam_notification_title" msgid="2599384745904934400">"<xliff:g id="NUMBER">%1$s</xliff:g> را می‌شناسید؟"</string>
-    <string name="spam_notification_title" msgid="609838099069629476">"<xliff:g id="NUMBER">%1$s</xliff:g> هرزنامه است؟"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"<xliff:g id="NUMBER">%1$s</xliff:g> مسدود شد و تماس به‌عنوان هرزنامه گزارش شد."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"تماس از <xliff:g id="NUMBER">%1$s</xliff:g> به‌عنوان غیرهرزنامه گزارش شد."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"برای افزودن مخاطبین یا مسدود کردن شماره هرزنامه، ضربه بزنید."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"اولین بار است که این شماره با شما تماس گرفته است. اگر این تماس هرزنامه است می‌توانید شماره را مسدود کنید و آن را گزارش کنید."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"برای گزارش به‌عنوان «غیرهرزنامه» ضربه بزنید یا آن را مسدود کنید."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"مشکوک هستیم که هرزنامه باشد. اگر این تماس هرزنامه نیست، روی «غیرهرزنامه» ضربه بزنید تا اشتباه ما را گزارش کنید."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"مسدود کردن و گزارش کردن"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"افزودن مخاطب"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"هرزنامه نیست"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"مسدود کردن شماره"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"افزودن به مخاطبین"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"مسدود کردن و گزارش هرزنامه"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"هرزنامه نیست"</string>
-    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"رد کردن"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="non_spam_notification_title">%1$s را می‌شناسید؟</string>
+  <string name="spam_notification_title">%1$s تماس‌گیرنده هرزنامه بود؟</string>
+  <string name="spam_notification_block_report_toast_text">%1$s مسدود شد و تماس به‌عنوان هرزنامه گزارش شد.</string>
+  <string name="spam_notification_not_spam_toast_text">تماس از %1$s به‌عنوان غیرهرزنامه گزارش شد.</string>
+  <string name="spam_notification_non_spam_call_collapsed_text">برای افزودن مخاطبین یا مسدود کردن شماره هرزنامه، ضربه بزنید.</string>
+  <string name="spam_notification_non_spam_call_expanded_text">اولین بار است که این شماره با شما تماس گرفته است. اگر این تماس هرزنامه است می‌توانید شماره را مسدود کنید و آن را گزارش کنید.</string>
+  <string name="spam_notification_spam_call_collapsed_text">برای گزارش به‌عنوان «غیرهرزنامه» ضربه بزنید یا آن را مسدود کنید</string>
+  <string name="spam_notification_report_spam_action_text">مسدود کردن و گزارش کردن</string>
+  <string name="spam_notification_add_contact_action_text">افزودن مخاطب</string>
+  <string name="spam_notification_dialog_add_contact_action_text">افزودن به مخاطبین</string>
+  <string name="spam_notification_dialog_block_report_spam_action_text">مسدود کردن و گزارش هرزنامه</string>
+  <string name="spam_notification_was_not_spam_action_text">نه، هرزنامه نیست</string>
+  <string name="spam_notification_block_spam_action_text">بله، شماره مسدود شود</string>
+  <string name="spam_notification_action_dismiss">رد کردن</string>
 </resources>
diff --git a/java/com/android/incallui/spam/res/values-fi/strings.xml b/java/com/android/incallui/spam/res/values-fi/strings.xml
index 7054ee2..f0b72e9 100644
--- a/java/com/android/incallui/spam/res/values-fi/strings.xml
+++ b/java/com/android/incallui/spam/res/values-fi/strings.xml
@@ -1,36 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="non_spam_notification_title" msgid="2599384745904934400">"Onko <xliff:g id="NUMBER">%1$s</xliff:g> sinulle tuttu?"</string>
-    <string name="spam_notification_title" msgid="609838099069629476">"Onko <xliff:g id="NUMBER">%1$s</xliff:g> häirikkönumero?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"<xliff:g id="NUMBER">%1$s</xliff:g> estettiin ja puhelu ilmoitettiin häirikköpuheluksi."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"Numerosta <xliff:g id="NUMBER">%1$s</xliff:g> saapunut puhelu ei ole häirikköpuhelu."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"Lisää yhteystietoihin tai estä häirikkönumero napauttamalla."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"Tästä numerosta soitettiin sinulle ensimmäisen kerran. Jos kyseessä oli häirikköpuhelu, voit estää numeron ja ilmoittaa siitä."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"Valitse tilaksi Ei HÄIRIKKÖSOITTAJA tai estä numero napauttamalla."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"Kyseessä saattoi olla häirikkösoittaja. Jos näin ei ole, napauta EI HÄIRIKKÖSOITTAJA ja ilmoita meille virheestä."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"Estä ja ilmoita"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"Lisää yhteystieto"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"Ei häirikkösoittaja"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"Estä numero"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"Lisää yhteystietoihin"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"Estä ja ilmoita häirikkösoittajaksi"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"Ei ole häirikkösoittaja"</string>
-    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"Hylkää"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="non_spam_notification_title">Onko %1$s sinulle tuttu?</string>
+  <string name="spam_notification_title">Oliko %1$s häirikkösoittaja?</string>
+  <string name="spam_notification_block_report_toast_text">%1$s estettiin ja puhelu ilmoitettiin häirikköpuheluksi.</string>
+  <string name="spam_notification_not_spam_toast_text">Numerosta %1$s saapunut puhelu ei ole häirikköpuhelu.</string>
+  <string name="spam_notification_non_spam_call_collapsed_text">Lisää yhteystietoihin tai estä häirikkönumero napauttamalla.</string>
+  <string name="spam_notification_non_spam_call_expanded_text">Tästä numerosta soitettiin sinulle ensimmäisen kerran. Jos kyseessä oli häirikköpuhelu, voit estää numeron ja ilmoittaa siitä.</string>
+  <string name="spam_notification_spam_call_collapsed_text">Valitse tilaksi Ei ole häirikkösoittaja tai estä numero napauttamalla</string>
+  <string name="spam_notification_report_spam_action_text">Estä ja ilmoita</string>
+  <string name="spam_notification_add_contact_action_text">Lisää yhteystieto</string>
+  <string name="spam_notification_dialog_add_contact_action_text">Lisää yhteystietoihin</string>
+  <string name="spam_notification_dialog_block_report_spam_action_text">Estä ja ilmoita häirikkösoittajaksi</string>
+  <string name="spam_notification_was_not_spam_action_text">Ei ole häirikkösoittaja</string>
+  <string name="spam_notification_block_spam_action_text">Kyllä, estä numero</string>
+  <string name="spam_notification_action_dismiss">Ohita</string>
 </resources>
diff --git a/java/com/android/incallui/spam/res/values-fr-rCA/strings.xml b/java/com/android/incallui/spam/res/values-fr-rCA/strings.xml
index ae79f31..9c075cb 100644
--- a/java/com/android/incallui/spam/res/values-fr-rCA/strings.xml
+++ b/java/com/android/incallui/spam/res/values-fr-rCA/strings.xml
@@ -1,36 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="non_spam_notification_title" msgid="2599384745904934400">"Connaissez-vous le numéro <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="spam_notification_title" msgid="609838099069629476">"L\'appel provenant du numéro <xliff:g id="NUMBER">%1$s</xliff:g> est-il un pourriel?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"Le numéro <xliff:g id="NUMBER">%1$s</xliff:g> a été bloqué, et l\'appel a été signalé comme pourriel."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"L\'appel provenant du numéro <xliff:g id="NUMBER">%1$s</xliff:g> a été signalé comme n\'étant pas un pourriel."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"Touchez pour ajouter aux contacts, ou bloquez le numéro source de pourriel."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"C\'est la première fois que ce numéro vous appelle. Si cet appel était un pourriel, vous pouvez le signaler et bloquer le numéro."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"Touchez pour signaler que l\'appel N\'EST PAS UN POURRIEL, ou bloquez le numéro."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"Cet appel nous semblait suspect. Le cas échéant, touchez N\'EST PAS UN POURRIEL pour signaler notre erreur."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"Bloquer et signaler"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"Ajouter le contact"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"N\'est pas un pourriel"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"Bloquer le numéro"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"Ajouter aux contacts"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"Bloquer le numéro et signaler le pourriel"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"N\'est pas un pourriel"</string>
-    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"Refuser"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="non_spam_notification_title">Connaissez-vous le numéro %1$s?</string>
+  <string name="spam_notification_title">L\'appel provenant du numéro %1$s était-il importun?</string>
+  <string name="spam_notification_block_report_toast_text">Le numéro %1$s a été bloqué, et l\'appel a été signalé comme pourriel.</string>
+  <string name="spam_notification_not_spam_toast_text">L\'appel provenant du numéro %1$s a été signalé comme n\'étant pas un pourriel.</string>
+  <string name="spam_notification_non_spam_call_collapsed_text">Touchez pour ajouter aux contacts, ou bloquez le numéro source de pourriel.</string>
+  <string name="spam_notification_non_spam_call_expanded_text">C\'est la première fois que ce numéro vous appelle. Si cet appel était un pourriel, vous pouvez le signaler et bloquer le numéro.</string>
+  <string name="spam_notification_spam_call_collapsed_text">Touchez pour signaler que l\'appel n\'est pas importun, ou bloquez le numéro</string>
+  <string name="spam_notification_report_spam_action_text">Bloquer et signaler</string>
+  <string name="spam_notification_add_contact_action_text">Ajouter le contact</string>
+  <string name="spam_notification_dialog_add_contact_action_text">Ajouter aux contacts</string>
+  <string name="spam_notification_dialog_block_report_spam_action_text">Bloquer le numéro et signaler le pourriel</string>
+  <string name="spam_notification_was_not_spam_action_text">Non, ce n\'est pas un appel importun</string>
+  <string name="spam_notification_block_spam_action_text">Oui, bloquer le numéro</string>
+  <string name="spam_notification_action_dismiss">Ignorer</string>
 </resources>
diff --git a/java/com/android/incallui/spam/res/values-fr/strings.xml b/java/com/android/incallui/spam/res/values-fr/strings.xml
index 8594f91..766dae4 100644
--- a/java/com/android/incallui/spam/res/values-fr/strings.xml
+++ b/java/com/android/incallui/spam/res/values-fr/strings.xml
@@ -1,36 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="non_spam_notification_title" msgid="2599384745904934400">"Vous connaissez le propriétaire du <xliff:g id="NUMBER">%1$s</xliff:g> ?"</string>
-    <string name="spam_notification_title" msgid="609838099069629476">"Les appels provenant du <xliff:g id="NUMBER">%1$s</xliff:g> sont-ils indésirables ?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"Le numéro <xliff:g id="NUMBER">%1$s</xliff:g> a été bloqué et l\'appel a été signalé comme indésirable."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"Les appels provenant du <xliff:g id="NUMBER">%1$s</xliff:g> sont signalés comme fiables."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"Appuyez pour ajouter le numéro à vos contacts ou le bloquer s\'il s\'agit d\'un numéro indésirable."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"C\'est la première fois que vous recevez un appel de ce numéro. S\'il s\'agit d\'un appel indésirable, vous pouvez bloquer le numéro et signaler ce dernier."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"Appuyez pour signaler ce numéro comme FIABLE ou pour le bloquer."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"Selon nos informations, il pouvait s\'agir d\'un spammeur. Si l\'appel n\'était pas indésirable, appuyez sur FIABLE pour signaler notre erreur."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"Bloquer et signaler"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"Ajouter"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"Fiable"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"Bloquer le numéro"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"Ajouter aux contacts"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"Bloquer et signaler comme indésirable"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"Fiable"</string>
-    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"Refuser"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="non_spam_notification_title">Vous connaissez le propriétaire du %1$s ?</string>
+  <string name="spam_notification_title">L\'appel reçu du %1$s était-il indésirable ?</string>
+  <string name="spam_notification_block_report_toast_text">Le numéro %1$s a été bloqué et l\'appel a été signalé comme indésirable.</string>
+  <string name="spam_notification_not_spam_toast_text">Les appels provenant du %1$s sont signalés comme fiables.</string>
+  <string name="spam_notification_non_spam_call_collapsed_text">Appuyez pour ajouter le numéro à vos contacts ou le bloquer s\'il s\'agit d\'un numéro indésirable.</string>
+  <string name="spam_notification_non_spam_call_expanded_text">C\'est la première fois que vous recevez un appel de ce numéro. S\'il s\'agit d\'un appel indésirable, vous pouvez bloquer le numéro et signaler ce dernier.</string>
+  <string name="spam_notification_spam_call_collapsed_text">Appuyez pour signaler ce numéro comme fiable ou pour le bloquer</string>
+  <string name="spam_notification_report_spam_action_text">Bloquer et signaler</string>
+  <string name="spam_notification_add_contact_action_text">Ajouter</string>
+  <string name="spam_notification_dialog_add_contact_action_text">Ajouter aux contacts</string>
+  <string name="spam_notification_dialog_block_report_spam_action_text">Bloquer et signaler comme indésirable</string>
+  <string name="spam_notification_was_not_spam_action_text">Non, le numéro est fiable</string>
+  <string name="spam_notification_block_spam_action_text">Oui, bloquer le numéro</string>
+  <string name="spam_notification_action_dismiss">Ignorer</string>
 </resources>
diff --git a/java/com/android/incallui/spam/res/values-gl/strings.xml b/java/com/android/incallui/spam/res/values-gl/strings.xml
index dfe31a7..126113a 100644
--- a/java/com/android/incallui/spam/res/values-gl/strings.xml
+++ b/java/com/android/incallui/spam/res/values-gl/strings.xml
@@ -1,36 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="non_spam_notification_title" msgid="2599384745904934400">"Coñeces o <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="spam_notification_title" msgid="609838099069629476">"É spam o <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"Bloqueouse o <xliff:g id="NUMBER">%1$s</xliff:g> e informouse de que a chamada era spam."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"Informouse de que a chamada do <xliff:g id="NUMBER">%1$s</xliff:g> non era spam."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"Toca para engadir o número a contactos ou bloquéao se é spam."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"É a primeira vez que te chama este número. Se a chamada era spam, podes bloquear o número e marcalo como inadecuado."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"Toca para informar de que NON É SPAM ou bloquéao."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"Sospeitamos que se trata dun xerador de spam. Se esta chamada non era spam, toca NON É SPAM para informar do noso erro."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"Bloquear e informar"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"Engadir contacto"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"Non é spam"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"Bloquear número"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"Engadir a contactos"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"Bloquear e informar de spam"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"Non é spam"</string>
-    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"Rexeitar"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="non_spam_notification_title">Coñeces o %1$s?</string>
+  <string name="spam_notification_title">Era spam a chamada do %1$s?</string>
+  <string name="spam_notification_block_report_toast_text">Bloqueouse o %1$s e informouse de que a chamada era spam.</string>
+  <string name="spam_notification_not_spam_toast_text">Informouse de que a chamada do %1$s non era spam.</string>
+  <string name="spam_notification_non_spam_call_collapsed_text">Toca para engadir o número a contactos ou bloquéao se é spam.</string>
+  <string name="spam_notification_non_spam_call_expanded_text">É a primeira vez que te chama este número. Se a chamada era spam, podes bloquear o número e marcalo como inadecuado.</string>
+  <string name="spam_notification_spam_call_collapsed_text">Toca para informar de que non era spam ou bloquear o número</string>
+  <string name="spam_notification_report_spam_action_text">Bloquear e informar</string>
+  <string name="spam_notification_add_contact_action_text">Engadir contacto</string>
+  <string name="spam_notification_dialog_add_contact_action_text">Engadir a contactos</string>
+  <string name="spam_notification_dialog_block_report_spam_action_text">Bloquear e informar de spam</string>
+  <string name="spam_notification_was_not_spam_action_text">Non era spam</string>
+  <string name="spam_notification_block_spam_action_text">Si, bloquear número</string>
+  <string name="spam_notification_action_dismiss">Ignorar</string>
 </resources>
diff --git a/java/com/android/incallui/spam/res/values-gu/strings.xml b/java/com/android/incallui/spam/res/values-gu/strings.xml
index 7e06837..ab3a111 100644
--- a/java/com/android/incallui/spam/res/values-gu/strings.xml
+++ b/java/com/android/incallui/spam/res/values-gu/strings.xml
@@ -1,36 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="non_spam_notification_title" msgid="2599384745904934400">"<xliff:g id="NUMBER">%1$s</xliff:g> ને જાણો છો?"</string>
-    <string name="spam_notification_title" msgid="609838099069629476">"શું <xliff:g id="NUMBER">%1$s</xliff:g> સ્પામ છે?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"<xliff:g id="NUMBER">%1$s</xliff:g> ને અવરોધિત કર્યો અને કૉલની સ્પામ તરીકે જાણ કરવામાં આવી."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"<xliff:g id="NUMBER">%1$s</xliff:g> ના કૉલની સ્પામ નથી તરીકે જાણ કરવામાં આવી."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"સંપર્કોમાં ઉમેરવા માટે ટૅપ કરો અથવા સ્પામ નંબરને અવરોધિત કરો."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"આ નંબરથી તમને પહેલી વાર કૉલ કરવામાં આવ્યો છે. જો આ કૉલ સ્પામ હોય, તો તમે આ નંબરને અવરોધિત કરી અને તેની જાણ કરી શકો છો."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"સ્પામ નથી તરીકે જાણ કરવા માટે ટૅપ કરો અથવા તેને અવરોધિત કરો."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"અમને આ સ્પામર હોવાની શંકા છે. જો આ કૉલ સ્પામ ન હોય, તો અમારી ભૂલની જાણ કરવા માટે સ્પામ નથી ટૅપ કરો."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"અવરોધિત અને જાણ કરો"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"સંપર્ક ઉમેરો"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"સ્પામ નથી"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"નંબર અવરોધિત કરો"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"સંપર્કોમાં ઉમેરો"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"અવરોધિત કરો અને સ્પામ તરીકે જાણ કરો"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"સ્પામ નથી"</string>
-    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"નકારો"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="non_spam_notification_title">%1$s ને જાણો છો?</string>
+  <string name="spam_notification_title">શું %1$s એક સ્પામ કૉલર હતો?</string>
+  <string name="spam_notification_block_report_toast_text">%1$s ને અવરોધિત કર્યો અને કૉલની સ્પામ તરીકે જાણ કરવામાં આવી.</string>
+  <string name="spam_notification_not_spam_toast_text">%1$s ના કૉલની સ્પામ નથી તરીકે જાણ કરવામાં આવી.</string>
+  <string name="spam_notification_non_spam_call_collapsed_text">સંપર્કોમાં ઉમેરવા માટે ટૅપ કરો અથવા સ્પામ નંબરને અવરોધિત કરો.</string>
+  <string name="spam_notification_non_spam_call_expanded_text">આ નંબરથી તમને પહેલી વાર કૉલ કરવામાં આવ્યો છે. જો આ કૉલ સ્પામ હોય, તો તમે આ નંબરને અવરોધિત કરી અને તેની જાણ કરી શકો છો.</string>
+  <string name="spam_notification_spam_call_collapsed_text">સ્પામ નથી તરીકે જાણ કરવા માટે ટૅપ કરો અથવા તેને બ્લૉક કરો</string>
+  <string name="spam_notification_report_spam_action_text">અવરોધિત અને જાણ કરો</string>
+  <string name="spam_notification_add_contact_action_text">સંપર્ક ઉમેરો</string>
+  <string name="spam_notification_dialog_add_contact_action_text">સંપર્કોમાં ઉમેરો</string>
+  <string name="spam_notification_dialog_block_report_spam_action_text">અવરોધિત કરો અને સ્પામ તરીકે જાણ કરો</string>
+  <string name="spam_notification_was_not_spam_action_text">ના, આ સ્પામ નથી</string>
+  <string name="spam_notification_block_spam_action_text">હા, નંબર બ્લૉક કરો</string>
+  <string name="spam_notification_action_dismiss">છોડી દો</string>
 </resources>
diff --git a/java/com/android/incallui/spam/res/values-hi/strings.xml b/java/com/android/incallui/spam/res/values-hi/strings.xml
index 4f030b1..d30f16a 100644
--- a/java/com/android/incallui/spam/res/values-hi/strings.xml
+++ b/java/com/android/incallui/spam/res/values-hi/strings.xml
@@ -1,36 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="non_spam_notification_title" msgid="2599384745904934400">"क्या आप <xliff:g id="NUMBER">%1$s</xliff:g> से परिचित हैं?"</string>
-    <string name="spam_notification_title" msgid="609838099069629476">"क्या <xliff:g id="NUMBER">%1$s</xliff:g> स्पैम है?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"<xliff:g id="NUMBER">%1$s</xliff:g> ब्लॉक कर दिया गया और कॉल को स्पैम के रूप में रिपोर्ट किया गया."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"<xliff:g id="NUMBER">%1$s</xliff:g> से आए कॉल की स्पैम के रूप में रिपोर्ट नहीं की गई."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"संपर्कों में जोड़ने के लिए टैप करें या स्पैम नंबर ब्लॉक करें."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"इस नंबर से आपको पहली बार कॉल किया गया है. अगर यह कॉल स्पैम था, तो आप इस नंबर को ब्लॉक कर सकते हैं और उसकी रिपोर्ट कर सकते हैं."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"स्पैम नहीं के रूप में रिपोर्ट करने के लिए टैप करें या उसे ब्लॉक करें."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"हमें इसके स्पैमर होने का शक था. अगर यह कॉल स्पैम नहीं था, तो हमारी गलती की रिपोर्ट करने के लिए स्पैम नहीं टैप करें."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"ब्लॉक व रिपोर्ट करें"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"संपर्क जोड़ें"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"स्पैम नहीं"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"नंबर ब्लॉक करें"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"संपर्क में जोड़ें"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"स्पैम को ब्लॉक करके उसकी रिपोर्ट करें"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"स्पैम नहीं"</string>
-    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"मना करें"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="non_spam_notification_title">क्या आप %1$s से परिचित हैं?</string>
+  <string name="spam_notification_title">क्या %1$s एक स्पैम कॉलर था?</string>
+  <string name="spam_notification_block_report_toast_text">%1$s ब्लॉक कर दिया गया और कॉल को स्पैम के रूप में रिपोर्ट किया गया.</string>
+  <string name="spam_notification_not_spam_toast_text">%1$s से आए कॉल की स्पैम के रूप में रिपोर्ट नहीं की गई.</string>
+  <string name="spam_notification_non_spam_call_collapsed_text">संपर्कों में जोड़ने के लिए टैप करें या स्पैम नंबर ब्लॉक करें.</string>
+  <string name="spam_notification_non_spam_call_expanded_text">इस नंबर से आपको पहली बार कॉल किया गया है. अगर यह कॉल स्पैम था, तो आप इस नंबर को ब्लॉक कर सकते हैं और उसकी रिपोर्ट कर सकते हैं.</string>
+  <string name="spam_notification_spam_call_collapsed_text">उसे स्पैम नहीं के रूप में रिपोर्ट करने या ब्लॉक करने के लिए टैप करें</string>
+  <string name="spam_notification_report_spam_action_text">ब्लॉक व रिपोर्ट करें</string>
+  <string name="spam_notification_add_contact_action_text">संपर्क जोड़ें</string>
+  <string name="spam_notification_dialog_add_contact_action_text">संपर्क में जोड़ें</string>
+  <string name="spam_notification_dialog_block_report_spam_action_text">स्पैम को ब्लॉक करके उसकी रिपोर्ट करें</string>
+  <string name="spam_notification_was_not_spam_action_text">नहीं, स्पैम नहीं है</string>
+  <string name="spam_notification_block_spam_action_text">हां, नंबर ब्लॉक करें</string>
+  <string name="spam_notification_action_dismiss">खारिज करें</string>
 </resources>
diff --git a/java/com/android/incallui/spam/res/values-hr/strings.xml b/java/com/android/incallui/spam/res/values-hr/strings.xml
index 278e786..e0a2634 100644
--- a/java/com/android/incallui/spam/res/values-hr/strings.xml
+++ b/java/com/android/incallui/spam/res/values-hr/strings.xml
@@ -1,36 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="non_spam_notification_title" msgid="2599384745904934400">"Poznajete li broj <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="spam_notification_title" msgid="609838099069629476">"Je li <xliff:g id="NUMBER">%1$s</xliff:g> neželjeni broj?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"Broj <xliff:g id="NUMBER">%1$s</xliff:g> blokiran je, a poziv je prijavljen kao neželjeni."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"Poziv s broja <xliff:g id="NUMBER">%1$s</xliff:g> prijavljen je kao željeni."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"Dodirnite za dodavanje kontakata ili blokiranje neželjenih brojeva."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"Prvi put ste primili poziv s tog broja. Ako je poziv bio neželjen, broj možete blokirati i prijaviti ga."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"Dodirnite kako biste prijavili da poziv NIJE NEŽELJENI ili ga blokirajte."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"Sumnjamo da je ovo neželjeni poziv. Ako ovaj poziv nije neželjeni, dodirnite NIJE NEŽELJENI da biste prijavili našu pogrešku."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"Blokiranje i prijava"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"Dodaj kontakt"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"Nije neželjena pošta"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"Blokiraj broj"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"Dodaj u kontakte"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"Blokiranje i prijava neželjenog poziva"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"Nije neželjena pošta"</string>
-    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"Odbij"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="non_spam_notification_title">Poznajete li broj %1$s?</string>
+  <string name="spam_notification_title">Je li poziv s broja %1$s bio neželjeni?</string>
+  <string name="spam_notification_block_report_toast_text">Broj %1$s blokiran je, a poziv je prijavljen kao neželjeni.</string>
+  <string name="spam_notification_not_spam_toast_text">Poziv s broja %1$s prijavljen je kao željeni.</string>
+  <string name="spam_notification_non_spam_call_collapsed_text">Dodirnite za dodavanje kontakata ili blokiranje neželjenih brojeva.</string>
+  <string name="spam_notification_non_spam_call_expanded_text">Prvi put ste primili poziv s tog broja. Ako je poziv bio neželjen, broj možete blokirati i prijaviti ga.</string>
+  <string name="spam_notification_spam_call_collapsed_text">Dodirnite kako biste prijavili da poziv nije neželjeni ili ga blokirajte</string>
+  <string name="spam_notification_report_spam_action_text">Blokiranje i prijava</string>
+  <string name="spam_notification_add_contact_action_text">Dodaj kontakt</string>
+  <string name="spam_notification_dialog_add_contact_action_text">Dodaj u kontakte</string>
+  <string name="spam_notification_dialog_block_report_spam_action_text">Blokiranje i prijava neželjenog poziva</string>
+  <string name="spam_notification_was_not_spam_action_text">Ne, nije neželjeni poziv</string>
+  <string name="spam_notification_block_spam_action_text">Da, blokiraj broj</string>
+  <string name="spam_notification_action_dismiss">Odbacivanje</string>
 </resources>
diff --git a/java/com/android/incallui/spam/res/values-hu/strings.xml b/java/com/android/incallui/spam/res/values-hu/strings.xml
index 4a1490a..124f7ab 100644
--- a/java/com/android/incallui/spam/res/values-hu/strings.xml
+++ b/java/com/android/incallui/spam/res/values-hu/strings.xml
@@ -1,36 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="non_spam_notification_title" msgid="2599384745904934400">"Ismeri a következő számot: <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="spam_notification_title" msgid="609838099069629476">"Spam ez a szám: <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"Letiltotta a(z) <xliff:g id="NUMBER">%1$s</xliff:g> számot, és bejelentette a hívást spamként."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"A(z) <xliff:g id="NUMBER">%1$s</xliff:g> számról érkező hívást bejelentette nem spamként."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"Koppintson a névjegyekhez való hozzáadáshoz vagy a spamszám letiltásához."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"Ez az első alkalom, hogy erről a számról hívása érkezett. Ha a hívás spam, letilthatja és bejelentheti a számot."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"Koppintson a nem spamként való bejelentéshez vagy a letiltáshoz."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"Azt gyanítottuk, hogy ez egy spamszám. Ha a hívás nem spam volt, koppintson a NEM SPAM elemre a hiba bejelentéséhez."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"Tiltás és bejelentés"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"Névjegy hozzáadása"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"Nem spam"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"Szám tiltása"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"Hozzáadás a névjegyekhez"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"Letiltás és spam bejelentése"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"Nem spam"</string>
-    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"Elutasítás"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="non_spam_notification_title">Ismeri a következő számot: %1$s?</string>
+  <string name="spam_notification_title">Spamhívás érkezett erről a számról: %1$s?</string>
+  <string name="spam_notification_block_report_toast_text">Letiltotta a(z) %1$s számot, és bejelentette a hívást spamként.</string>
+  <string name="spam_notification_not_spam_toast_text">A(z) %1$s számról érkező hívást bejelentette nem spamként.</string>
+  <string name="spam_notification_non_spam_call_collapsed_text">Koppintson a névjegyekhez való hozzáadáshoz vagy a spamszám letiltásához.</string>
+  <string name="spam_notification_non_spam_call_expanded_text">Ez az első alkalom, hogy erről a számról hívása érkezett. Ha a hívás spam, letilthatja és bejelentheti a számot.</string>
+  <string name="spam_notification_spam_call_collapsed_text">Koppintson a nem spamként való bejelentéshez vagy a letiltáshoz</string>
+  <string name="spam_notification_report_spam_action_text">Tiltás és bejelentés</string>
+  <string name="spam_notification_add_contact_action_text">Névjegy hozzáadása</string>
+  <string name="spam_notification_dialog_add_contact_action_text">Hozzáadás a névjegyekhez</string>
+  <string name="spam_notification_dialog_block_report_spam_action_text">Letiltás és spam bejelentése</string>
+  <string name="spam_notification_was_not_spam_action_text">Nem, nem spam volt</string>
+  <string name="spam_notification_block_spam_action_text">Igen, tiltsa le a számot</string>
+  <string name="spam_notification_action_dismiss">Elvetés</string>
 </resources>
diff --git a/java/com/android/incallui/spam/res/values-hy/strings.xml b/java/com/android/incallui/spam/res/values-hy/strings.xml
index 4851021..25fad84 100644
--- a/java/com/android/incallui/spam/res/values-hy/strings.xml
+++ b/java/com/android/incallui/spam/res/values-hy/strings.xml
@@ -1,36 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="non_spam_notification_title" msgid="2599384745904934400">"<xliff:g id="NUMBER">%1$s</xliff:g> համարը ծանո՞թ է"</string>
-    <string name="spam_notification_title" msgid="609838099069629476">"<xliff:g id="NUMBER">%1$s</xliff:g> համարը լցո՞ն է"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"<xliff:g id="NUMBER">%1$s</xliff:g> համարն արգելափակվեց, և զանգը նշվեց որպես լցոն:"</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"<xliff:g id="NUMBER">%1$s</xliff:g> համարից ստացված զանգը նշվեց որպես ոչ լցոն:"</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"Հպեք՝ կոնտակտներում ավելացնելու համար, կամ արգելափակեք լցոնային համարը:"</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"Այս համարից առաջին անգամ եք զանգ ստանում: Եթե այս զանգը լցոն էր, դուք կարող եք արգելափակել այս համարը և նշել այն որպես լցոն:"</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"Հպեք «ԼՑՈՆ ՉԷ» կոճակին՝ համարը որպես ոչ լցոն նշելու համար, կամ արգելափակեք այն:"</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"Կասկածներ կան, որ այս զանգը լցոնողից էր: Եթե այն լցոն չէր, ապա հպեք «ԼՑՈՆ ՉԷ» կոճակին՝ սխալմունքի մասին մեզ հայտնելու համար:"</string>
-    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"Արգելափակել և նշել լցոն"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"Ավելացնել կոնտակտ"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"Լցոն չէ"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"Արգելափակել համարը"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"Ավելացնել կոնտակտներում"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"Արգելափակել և նշել որպես լցոն"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"Լցոն չէ"</string>
-    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"Մերժել"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="non_spam_notification_title">%1$s համարը ծանո՞թ է</string>
+  <string name="spam_notification_title">%1$s համարից ստացված զանգը սպա՞մ էր</string>
+  <string name="spam_notification_block_report_toast_text">%1$s համարն արգելափակվեց, և զանգը նշվեց որպես սպամ:</string>
+  <string name="spam_notification_not_spam_toast_text">%1$s համարից ստացված զանգը նշվեց որպես ոչ սպամ:</string>
+  <string name="spam_notification_non_spam_call_collapsed_text">Հպեք՝ կոնտակտներում ավելացնելու համար, կամ արգելափակեք լցոնային համարը:</string>
+  <string name="spam_notification_non_spam_call_expanded_text">Այս համարից առաջին անգամ եք զանգ ստանում: Եթե այս զանգը սպամ էր, դուք կարող եք արգելափակել այս համարը և նշել այն որպես սպամ:</string>
+  <string name="spam_notification_spam_call_collapsed_text">Հպեք «սպամ չէ» կոճակին՝ համարը որպես ոչ սպամ նշելու համար, կամ արգելափակեք այն</string>
+  <string name="spam_notification_report_spam_action_text">Արգելափակել և նշել սպամ</string>
+  <string name="spam_notification_add_contact_action_text">Ավելացնել կոնտակտ</string>
+  <string name="spam_notification_dialog_add_contact_action_text">Ավելացնել կոնտակտներում</string>
+  <string name="spam_notification_dialog_block_report_spam_action_text">Արգելափակել և նշել որպես սպամ</string>
+  <string name="spam_notification_was_not_spam_action_text">Ոչ, սպամ չէ</string>
+  <string name="spam_notification_block_spam_action_text">Այո, արգելափակել համարը</string>
+  <string name="spam_notification_action_dismiss">Փակել</string>
 </resources>
diff --git a/java/com/android/incallui/spam/res/values-in/strings.xml b/java/com/android/incallui/spam/res/values-in/strings.xml
index a6d4876..ed1df02 100644
--- a/java/com/android/incallui/spam/res/values-in/strings.xml
+++ b/java/com/android/incallui/spam/res/values-in/strings.xml
@@ -1,36 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="non_spam_notification_title" msgid="2599384745904934400">"Tahu nomor <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="spam_notification_title" msgid="609838099069629476">"Apakah nomor <xliff:g id="NUMBER">%1$s</xliff:g> termasuk spam?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"<xliff:g id="NUMBER">%1$s</xliff:g> diblokir dan panggilan dilaporkan sebagai spam."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"Panggilan dari <xliff:g id="NUMBER">%1$s</xliff:g> dilaporkan sebagai bukan spam."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"Tap untuk menambahkan ke kontak atau memblokir nomor spam."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"Nomor ini baru pertama kali menghubungi Anda. Jika panggilan termasuk spam, Anda dapat memblokir nomor ini dan melaporkannya."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"Tap untuk melaporkan sebagai BUKAN SPAM, atau blokir."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"Kami menduga nomor ini berasal dari pelaku spam. Jika panggilan ini bukan spam, tap BUKAN SPAM untuk melaporkan kesalahan kami."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"Blokir &amp; laporkan"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"Tambahkan kontak"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"Bukan spam"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"Blokir nomor"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"Tambahkan ke kontak"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"Blokir &amp; laporkan sebagai spam"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"Bukan spam"</string>
-    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"Tolak"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="non_spam_notification_title">Tahu nomor %1$s?</string>
+  <string name="spam_notification_title">Apakah panggilan dari %1$s merupakan spam?</string>
+  <string name="spam_notification_block_report_toast_text">%1$s diblokir dan panggilan dilaporkan sebagai spam.</string>
+  <string name="spam_notification_not_spam_toast_text">Panggilan dari %1$s dilaporkan sebagai bukan spam.</string>
+  <string name="spam_notification_non_spam_call_collapsed_text">Tap untuk menambahkan ke kontak atau memblokir nomor spam.</string>
+  <string name="spam_notification_non_spam_call_expanded_text">Nomor ini baru pertama kali menghubungi Anda. Jika panggilan termasuk spam, Anda dapat memblokir nomor ini dan melaporkannya.</string>
+  <string name="spam_notification_spam_call_collapsed_text">Tap untuk melaporkan sebagai bukan spam, atau blokir</string>
+  <string name="spam_notification_report_spam_action_text">Blokir &amp; laporkan</string>
+  <string name="spam_notification_add_contact_action_text">Tambahkan kontak</string>
+  <string name="spam_notification_dialog_add_contact_action_text">Tambahkan ke kontak</string>
+  <string name="spam_notification_dialog_block_report_spam_action_text">Blokir &amp; laporkan sebagai spam</string>
+  <string name="spam_notification_was_not_spam_action_text">Tidak, bukan spam</string>
+  <string name="spam_notification_block_spam_action_text">Ya, blokir nomor</string>
+  <string name="spam_notification_action_dismiss">Tutup</string>
 </resources>
diff --git a/java/com/android/incallui/spam/res/values-is/strings.xml b/java/com/android/incallui/spam/res/values-is/strings.xml
index 9fd1428..aef77a8 100644
--- a/java/com/android/incallui/spam/res/values-is/strings.xml
+++ b/java/com/android/incallui/spam/res/values-is/strings.xml
@@ -1,36 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="non_spam_notification_title" msgid="2599384745904934400">"Þekkirðu <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="spam_notification_title" msgid="609838099069629476">"Er <xliff:g id="NUMBER">%1$s</xliff:g> ruslnúmer?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"<xliff:g id="NUMBER">%1$s</xliff:g> var sett á bannlista og símtalið tilkynnt."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"Símtal frá <xliff:g id="NUMBER">%1$s</xliff:g> var ekki tilkynnt."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"Ýttu til að bæta í tengiliði eða setja á bannlista."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"Þetta er í fyrsta sinn sem hringt er í þig úr þessu númeri. Ef þetta símtal var úr ruslnúmeri geturðu sett það á bannlista og tilkynnt það."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"Ýttu til að tilkynna sem EKKI RUSLNÚMER eða settu það á bannlista."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"Okkur grunaði að þetta símtal væri úr ruslnúmeri. Ef það var ekki raunin skaltu ýta á EKKI RUSLNÚMER til að tilkynna okkur um þessi mistök."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"Banna og tilkynna"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"Bæta tengilið við"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"Ekki ruslnúmer"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"Setja númer á bannlista"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"Bæta við tengiliði"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"Banna og tilkynna sem ruslnúmer"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"Ekki ruslnúmer"</string>
-    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"Hafna"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="non_spam_notification_title">Þekkirðu %1$s?</string>
+  <string name="spam_notification_title">Var %1$s ruslnúmer?</string>
+  <string name="spam_notification_block_report_toast_text">%1$s var sett á bannlista og símtalið tilkynnt.</string>
+  <string name="spam_notification_not_spam_toast_text">Símtal frá %1$s var ekki tilkynnt.</string>
+  <string name="spam_notification_non_spam_call_collapsed_text">Ýttu til að bæta í tengiliði eða setja á bannlista.</string>
+  <string name="spam_notification_non_spam_call_expanded_text">Þetta er í fyrsta sinn sem hringt er í þig úr þessu númeri. Ef þetta símtal var úr ruslnúmeri geturðu sett það á bannlista og tilkynnt það.</string>
+  <string name="spam_notification_spam_call_collapsed_text">Ýttu til að tilkynna að þetta sé ekki ruslnúmer eða til að setja það á bannlista</string>
+  <string name="spam_notification_report_spam_action_text">Banna og tilkynna</string>
+  <string name="spam_notification_add_contact_action_text">Bæta tengilið við</string>
+  <string name="spam_notification_dialog_add_contact_action_text">Bæta við tengiliði</string>
+  <string name="spam_notification_dialog_block_report_spam_action_text">Banna og tilkynna sem ruslnúmer</string>
+  <string name="spam_notification_was_not_spam_action_text">Nei, ekki ruslnúmer</string>
+  <string name="spam_notification_block_spam_action_text">Já, setja númer á bannlista</string>
+  <string name="spam_notification_action_dismiss">Hunsa</string>
 </resources>
diff --git a/java/com/android/incallui/spam/res/values-it/strings.xml b/java/com/android/incallui/spam/res/values-it/strings.xml
index 1d480c3..89075c0 100644
--- a/java/com/android/incallui/spam/res/values-it/strings.xml
+++ b/java/com/android/incallui/spam/res/values-it/strings.xml
@@ -1,36 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="non_spam_notification_title" msgid="2599384745904934400">"Conosci <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="spam_notification_title" msgid="609838099069629476">"<xliff:g id="NUMBER">%1$s</xliff:g> è spam?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"<xliff:g id="NUMBER">%1$s</xliff:g> è stato bloccato e la chiamata è stata segnalata come spam."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"La chiamata da <xliff:g id="NUMBER">%1$s</xliff:g> è stata segnalata come non spam."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"Tocca per aggiungere ai contatti o per bloccare il numero come spam."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"È la prima volta che vieni chiamato da questo numero. Se la chiamata era spam, puoi bloccare il numero e segnalarlo."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"Tocca per segnalare il numero come NON SPAM o per bloccarlo."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"Avevamo il sospetto che si trattasse di uno spammer. Se la chiamata non era spam, tocca NON SPAM per segnalare l\'errore."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"Blocca e segnala"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"Aggiungi contatto"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"Non spam"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"Blocca numero"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"Aggiungi a contatti"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"Blocca e segnala spam"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"Non spam"</string>
-    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"Rifiuta"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="non_spam_notification_title">Conosci %1$s?</string>
+  <string name="spam_notification_title">La chiamata di %1$s era spam?</string>
+  <string name="spam_notification_block_report_toast_text">%1$s è stato bloccato e la chiamata è stata segnalata come spam.</string>
+  <string name="spam_notification_not_spam_toast_text">La chiamata da %1$s è stata segnalata come non spam.</string>
+  <string name="spam_notification_non_spam_call_collapsed_text">Tocca per aggiungere ai contatti o per bloccare il numero come spam.</string>
+  <string name="spam_notification_non_spam_call_expanded_text">È la prima volta che vieni chiamato da questo numero. Se la chiamata era spam, puoi bloccare il numero e segnalarlo.</string>
+  <string name="spam_notification_spam_call_collapsed_text">Tocca per segnalare il numero come non spam o per bloccarlo.</string>
+  <string name="spam_notification_report_spam_action_text">Blocca e segnala</string>
+  <string name="spam_notification_add_contact_action_text">Aggiungi contatto</string>
+  <string name="spam_notification_dialog_add_contact_action_text">Aggiungi a contatti</string>
+  <string name="spam_notification_dialog_block_report_spam_action_text">Blocca e segnala spam</string>
+  <string name="spam_notification_was_not_spam_action_text">No, non era spam</string>
+  <string name="spam_notification_block_spam_action_text">Sì, blocca il numero</string>
+  <string name="spam_notification_action_dismiss">Ignora</string>
 </resources>
diff --git a/java/com/android/incallui/spam/res/values-iw/strings.xml b/java/com/android/incallui/spam/res/values-iw/strings.xml
index 4835114..788bb9c 100644
--- a/java/com/android/incallui/spam/res/values-iw/strings.xml
+++ b/java/com/android/incallui/spam/res/values-iw/strings.xml
@@ -1,36 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="non_spam_notification_title" msgid="2599384745904934400">"האם <xliff:g id="NUMBER">%1$s</xliff:g> מוכר לך?"</string>
-    <string name="spam_notification_title" msgid="609838099069629476">"האם <xliff:g id="NUMBER">%1$s</xliff:g> הוא ספאם?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"<xliff:g id="NUMBER">%1$s</xliff:g> נחסם והשיחה דווחה כספאם."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"השיחה מ-<xliff:g id="NUMBER">%1$s</xliff:g> דווחה שהיא אינה ספאם."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"ניתן להקיש כדי להוסיף את המספר לאנשי הקשר או לחסום אותו כספאם."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"זוהי הפעם הראשונה שמתקשרים אליך מהמספר הזה. אם השיחה הזו הייתה ספאם, באפשרותך לחסום את המספר הזה ולדווח עליו."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"ניתן להקיש כדי לדווח שזהו לא ספאם או כדי לחסום את המספר."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"חשדנו שהשיחה הזו היא ספאם. אם היא לא ספאם, ניתן להקיש על \'לא ספאם\' כדי לדווח על הטעות שלנו."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"חסימה ודיווח"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"הוספת איש קשר"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"לא ספאם"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"חסימת המספר"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"הוספה לאנשי הקשר"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"חסימה ודיווח כספאם"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"לא ספאם"</string>
-    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"דחייה"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="non_spam_notification_title">האם %1$s מוכר לך?</string>
+  <string name="spam_notification_title">האם השיחה מ-%1$s הייתה ספאם?</string>
+  <string name="spam_notification_block_report_toast_text">%1$s נחסם והשיחה דווחה כספאם.</string>
+  <string name="spam_notification_not_spam_toast_text">השיחה מ-%1$s דווחה שהיא אינה ספאם.</string>
+  <string name="spam_notification_non_spam_call_collapsed_text">ניתן להקיש כדי להוסיף את המספר לאנשי הקשר או לחסום אותו כספאם.</string>
+  <string name="spam_notification_non_spam_call_expanded_text">זוהי הפעם הראשונה שמתקשרים אליך מהמספר הזה. אם השיחה הזו הייתה ספאם, באפשרותך לחסום את המספר הזה ולדווח עליו.</string>
+  <string name="spam_notification_spam_call_collapsed_text">ניתן להקיש כדי לדווח שזה לא ספאם או כדי לחסום את המספר.</string>
+  <string name="spam_notification_report_spam_action_text">חסימה ודיווח</string>
+  <string name="spam_notification_add_contact_action_text">הוספת איש קשר</string>
+  <string name="spam_notification_dialog_add_contact_action_text">הוספה לאנשי הקשר</string>
+  <string name="spam_notification_dialog_block_report_spam_action_text">חסימה ודיווח כספאם</string>
+  <string name="spam_notification_was_not_spam_action_text">לא, זה לא ספאם</string>
+  <string name="spam_notification_block_spam_action_text">כן, אני רוצה לחסום את המספר</string>
+  <string name="spam_notification_action_dismiss">סגירה</string>
 </resources>
diff --git a/java/com/android/incallui/spam/res/values-ja/strings.xml b/java/com/android/incallui/spam/res/values-ja/strings.xml
index 96555cb..6de844f 100644
--- a/java/com/android/incallui/spam/res/values-ja/strings.xml
+++ b/java/com/android/incallui/spam/res/values-ja/strings.xml
@@ -1,36 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="non_spam_notification_title" msgid="2599384745904934400">"発信者（<xliff:g id="NUMBER">%1$s</xliff:g>）をご存知ですか？"</string>
-    <string name="spam_notification_title" msgid="609838099069629476">"「<xliff:g id="NUMBER">%1$s</xliff:g>」は迷惑電話ですか？"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"「<xliff:g id="NUMBER">%1$s</xliff:g>」をブロックして、迷惑電話として報告しました。"</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"「<xliff:g id="NUMBER">%1$s</xliff:g>」からの通話は迷惑電話ではないと報告しました。"</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"タップして連絡先に追加するか、迷惑電話としてこの番号をブロックできます。"</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"この番号からの通話を着信したのはこれが初めてです。迷惑電話だった場合は、この番号をブロックして報告してください。"</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"タップして「迷惑電話ではない」と報告するか、この番号をブロックできます。"</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"この通話は迷惑電話として検知されました。迷惑電話ではなかった場合は、[迷惑電話ではない] をタップして、誤検知であることを報告してください。"</string>
-    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"ブロックして報告"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"連絡先に追加"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"迷惑電話ではない"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"番号をブロック"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"連絡先に追加"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"ブロックして迷惑電話として報告"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"迷惑電話ではない"</string>
-    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"拒否"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="non_spam_notification_title">発信者（%1$s）をご存知ですか？</string>
+  <string name="spam_notification_title">%1$s は迷惑電話でしたか？</string>
+  <string name="spam_notification_block_report_toast_text">「%1$s」をブロックして、迷惑電話として報告しました。</string>
+  <string name="spam_notification_not_spam_toast_text">「%1$s」からの通話は迷惑電話ではないと報告しました。</string>
+  <string name="spam_notification_non_spam_call_collapsed_text">タップして連絡先に追加するか、迷惑電話としてこの番号をブロックできます。</string>
+  <string name="spam_notification_non_spam_call_expanded_text">この番号からの通話を着信したのはこれが初めてです。迷惑電話だった場合は、この番号をブロックして報告してください。</string>
+  <string name="spam_notification_spam_call_collapsed_text">タップして「迷惑電話ではない」と報告するか、この番号をブロックできます</string>
+  <string name="spam_notification_report_spam_action_text">ブロックして報告</string>
+  <string name="spam_notification_add_contact_action_text">連絡先に追加</string>
+  <string name="spam_notification_dialog_add_contact_action_text">連絡先に追加</string>
+  <string name="spam_notification_dialog_block_report_spam_action_text">ブロックして迷惑電話として報告</string>
+  <string name="spam_notification_was_not_spam_action_text">迷惑電話ではない</string>
+  <string name="spam_notification_block_spam_action_text">番号をブロック</string>
+  <string name="spam_notification_action_dismiss">閉じる</string>
 </resources>
diff --git a/java/com/android/incallui/spam/res/values-ka/strings.xml b/java/com/android/incallui/spam/res/values-ka/strings.xml
index 39de5f6..3732abb 100644
--- a/java/com/android/incallui/spam/res/values-ka/strings.xml
+++ b/java/com/android/incallui/spam/res/values-ka/strings.xml
@@ -1,36 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="non_spam_notification_title" msgid="2599384745904934400">"<xliff:g id="NUMBER">%1$s</xliff:g> ნაცნობია?"</string>
-    <string name="spam_notification_title" msgid="609838099069629476">"<xliff:g id="NUMBER">%1$s</xliff:g> სპამია?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"<xliff:g id="NUMBER">%1$s</xliff:g> დაიბლოკა და ზარი სპამად მოინიშნა."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"<xliff:g id="NUMBER">%1$s</xliff:g>-დან ზარზე გაიგზავნა სპამის გაუქმების შეტყობინება."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"შეეხეთ კონტაქტებში დასამატებლად ან სპამის ნომრის დასაბლოკად."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"ამ ნომრიდან პირველად დაგირეკეს. თუ ეს ზარი სპამი იყო, შეგიძლიათ დაბლოკოთ ეს ნომერი და შეგვატყობინოთ."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"შეეხეთ, რათა გვაცნობოთ, რომ „სპამი არ არის“, ან დაბლოკოთ."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"ვვარაუდობთ, რომ ეს სპამია. თუ ეს ზარი სპამი არ არის, შეეხეთ „სპამი არ არის“, რათა შეგვატყობინოთ ჩვენი შეცდომის შესახებ."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"დაბლოკვა და შეტყობ."</string>
-    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"კონტაქტის დამატება"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"არ არის სპამი"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"ნომრის დაბლოკვა"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"კონტაქტებში დამატება"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"დაბლოკვა და სპამის შესახებ შეტყობინება"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"არ არის სპამი"</string>
-    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"უარყოფა"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="non_spam_notification_title">%1$s ნაცნობია?</string>
+  <string name="spam_notification_title">%1$s სპამერი აბონენტი იყო?</string>
+  <string name="spam_notification_block_report_toast_text">%1$s დაიბლოკა და ზარი სპამად მოინიშნა.</string>
+  <string name="spam_notification_not_spam_toast_text">%1$s-დან ზარზე გაიგზავნა სპამის გაუქმების შეტყობინება.</string>
+  <string name="spam_notification_non_spam_call_collapsed_text">შეეხეთ კონტაქტებში დასამატებლად ან სპამის ნომრის დასაბლოკად.</string>
+  <string name="spam_notification_non_spam_call_expanded_text">ამ ნომრიდან პირველად დაგირეკეს. თუ ეს ზარი სპამი იყო, შეგიძლიათ დაბლოკოთ ეს ნომერი და შეგვატყობინოთ.</string>
+  <string name="spam_notification_spam_call_collapsed_text">შეეხეთ, რათა გვაცნობოთ, რომ „სპამი არ არის“, ან დაბლოკოთ</string>
+  <string name="spam_notification_report_spam_action_text">დაბლოკვა და შეტყობ.</string>
+  <string name="spam_notification_add_contact_action_text">კონტაქტის დამატება</string>
+  <string name="spam_notification_dialog_add_contact_action_text">კონტაქტებში დამატება</string>
+  <string name="spam_notification_dialog_block_report_spam_action_text">დაბლოკვა და სპამის შესახებ შეტყობინება</string>
+  <string name="spam_notification_was_not_spam_action_text">არა, სპამი არ არის</string>
+  <string name="spam_notification_block_spam_action_text">დიახ, ნომერი დაიბლოკოს</string>
+  <string name="spam_notification_action_dismiss">დახურვა</string>
 </resources>
diff --git a/java/com/android/incallui/spam/res/values-kk/strings.xml b/java/com/android/incallui/spam/res/values-kk/strings.xml
index 981ab0a..0e83098 100644
--- a/java/com/android/incallui/spam/res/values-kk/strings.xml
+++ b/java/com/android/incallui/spam/res/values-kk/strings.xml
@@ -1,36 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="non_spam_notification_title" msgid="2599384745904934400">"<xliff:g id="NUMBER">%1$s</xliff:g> таныс па?"</string>
-    <string name="spam_notification_title" msgid="609838099069629476">"<xliff:g id="NUMBER">%1$s</xliff:g> спам ба?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"<xliff:g id="NUMBER">%1$s</xliff:g> бөгеліп, \"спам\" деп белгіленді."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"<xliff:g id="NUMBER">%1$s</xliff:g> қоңырауы \"спам емес\" деп белгіленді."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"Контактілерге қосу немесе спам нөмірді бөгеу үшін түртіңіз."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"Бұл нөмір сізге алғаш рет қоңырау шалып тұр. Егер қоңырау спам болса, нөмірді бөгеп, \"спам\" деп белгілеуге болады."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"\"СПАМ ЕМЕС \"деп белгілеу үшін түртіңіз немесе бөгеңіз."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"Бұл қоңырау спам сияқты. Спам болмаса, \"СПАМ ЕМЕС\" деп белгілеп, қателікті түзетіңіз."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"Бөгеу және хабарлау"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"Контакт қосу"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"Спам емес"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"Нөмірді бөгеу"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"Контактілерге қосу"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"Бөгеу және спам туралы хабарлау"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"Спам емес"</string>
-    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"Қабылдамау"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="non_spam_notification_title">%1$s таныс па?</string>
+  <string name="spam_notification_title">%1$s қоңырауы спам болды ма?</string>
+  <string name="spam_notification_block_report_toast_text">%1$s бөгеліп, \"спам\" деп белгіленді.</string>
+  <string name="spam_notification_not_spam_toast_text">%1$s қоңырауы \"спам емес\" деп белгіленді.</string>
+  <string name="spam_notification_non_spam_call_collapsed_text">Контактілерге қосу немесе спам нөмірді бөгеу үшін түртіңіз.</string>
+  <string name="spam_notification_non_spam_call_expanded_text">Бұл нөмір сізге алғаш рет қоңырау шалып тұр. Егер қоңырау спам болса, нөмірді бөгеп, \"спам\" деп белгілеуге болады.</string>
+  <string name="spam_notification_spam_call_collapsed_text">\"Спам емес\" деп белгілеу не бөгеу үшін түртіңіз</string>
+  <string name="spam_notification_report_spam_action_text">Бөгеу және хабарлау</string>
+  <string name="spam_notification_add_contact_action_text">Контакт қосу</string>
+  <string name="spam_notification_dialog_add_contact_action_text">Контактілерге қосу</string>
+  <string name="spam_notification_dialog_block_report_spam_action_text">Бөгеу және спам туралы хабарлау</string>
+  <string name="spam_notification_was_not_spam_action_text">Жоқ, спам емес</string>
+  <string name="spam_notification_block_spam_action_text">Иә, нөмірді бөгеу</string>
+  <string name="spam_notification_action_dismiss">Жабу</string>
 </resources>
diff --git a/java/com/android/incallui/spam/res/values-km/strings.xml b/java/com/android/incallui/spam/res/values-km/strings.xml
index baf9ffc..60c51cb 100644
--- a/java/com/android/incallui/spam/res/values-km/strings.xml
+++ b/java/com/android/incallui/spam/res/values-km/strings.xml
@@ -1,36 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="non_spam_notification_title" msgid="2599384745904934400">"ស្គាល់ <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="spam_notification_title" msgid="609838099069629476">"តើ <xliff:g id="NUMBER">%1$s</xliff:g> ជា​ការហៅ​​ឥត​បាន​ការមែនទេ?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"បាន​បិទ <xliff:g id="NUMBER">%1$s</xliff:g> និង​បាន​រាយការណ៍​ការ​ហៅ​ថា​ជា​​ការហៅ​ឥត​បានការ។"</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"ការ​ហៅ​ពី <xliff:g id="NUMBER">%1$s</xliff:g> ត្រូវបាន​រាយការណ៍​ថា​ មិន​មែន​ជា​ការហៅ​​ឥត​បានការ។"</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"ចុច ​ដើម្បី​បញ្ចូល​​ទំនាក់ទំនង ឬ​​បិទលេខ​ដែល​​ឥត​បាន​​ការ។"</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"នេះ​គឺ​ជា​លើក​ដំបូង​ហើយ​ដែល​លេខ​នេះ​បាន​ហៅ​មក​អ្នក។ បើ​ការ​ហៅ​នេះ​ជា​ការហៅ​​ឥត​បានការ អ្នក​អាច​ទប់ស្កាត់​លេខ​​នេះ និង​រាយការណ៍​បញ្ហា​នេះ។"</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"ចុច ដើម្បី​រាយការណ៍​​ថា មិន​មែន​ជា​ការហៅ​ឥត​បានការ ឬ​ទប់ស្កាត់​វា។"</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"យើង​សង្ស័យ​​ថា​វា​​ជា​​ការហៅ​ឥត​បាន​ការ។ បើ​ការ​ហៅ​នេះ​មិន​មែន​ជា​ការហៅ​ឥត​បានការទេ សូម​ចុច​មិន​មែន​ជាការហៅ​​ឥត​បានការ ​ដើម្បី​រាយការណ៍​​បញ្ហា​របស់​យើង។"</string>
-    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"ទប់ស្កាត់និងរាយការណ៍"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"បញ្ចូល​​ទំនាក់ទំនង"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"មិនមែន​ជា​ការហៅ​​ឥតបានការ​ទេ"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"បិទលេខ"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"បញ្ចូល​ទៅ​ក្នុង​ទំនាក់ទំនង"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"ទប់ស្កាត់ និងរាយការណ៍​ការហៅ​ឥត​បានការ"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"មិនមែន​ជា​ការហៅ​​ឥតបានការ​ទេ"</string>
-    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"បដិសេធ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="non_spam_notification_title">ស្គាល់ %1$s?</string>
+  <string name="spam_notification_title">តើ %1$s ជា​អ្នក​ហៅ​ដែល​ឥត​បាន​ការ​មែនទេ?</string>
+  <string name="spam_notification_block_report_toast_text">បាន​បិទ %1$s និង​បាន​រាយការណ៍​ការ​ហៅ​ថា​ជា​​ការហៅ​ឥត​បានការ។</string>
+  <string name="spam_notification_not_spam_toast_text">ការ​ហៅ​ពី %1$s ត្រូវបាន​រាយការណ៍​ថា​ មិន​មែន​ជា​ការហៅ​​ឥត​បានការ។</string>
+  <string name="spam_notification_non_spam_call_collapsed_text">ចុច ​ដើម្បី​បញ្ចូល​​ទំនាក់ទំនង ឬ​​បិទលេខ​ដែល​​ឥត​បាន​​ការ។</string>
+  <string name="spam_notification_non_spam_call_expanded_text">នេះ​គឺ​ជា​លើក​ដំបូង​ហើយ​ដែល​លេខ​នេះ​បាន​ហៅ​មក​អ្នក។ បើ​ការ​ហៅ​នេះ​ជា​ការហៅ​​ឥត​បានការ អ្នក​អាច​ទប់ស្កាត់​លេខ​​នេះ និង​រាយការណ៍​បញ្ហា​នេះ។</string>
+  <string name="spam_notification_spam_call_collapsed_text">ចុចដើម្បី​រាយការណ៍​​ថា​មិន​មែន​ជា​ការហៅ​​ឥត​បានការ ឬ​ទប់ស្កាត់​វា។</string>
+  <string name="spam_notification_report_spam_action_text">ទប់ស្កាត់និងរាយការណ៍</string>
+  <string name="spam_notification_add_contact_action_text">បញ្ចូល​​ទំនាក់ទំនង</string>
+  <string name="spam_notification_dialog_add_contact_action_text">បញ្ចូល​ទៅ​ក្នុង​ទំនាក់ទំនង</string>
+  <string name="spam_notification_dialog_block_report_spam_action_text">ទប់ស្កាត់ និងរាយការណ៍​ការហៅ​ឥត​បានការ</string>
+  <string name="spam_notification_was_not_spam_action_text">ទេ មិន​មែន​ជា​ការហៅ​ឥត​បាន​ការទេ</string>
+  <string name="spam_notification_block_spam_action_text">បាទ/ចាស ទប់ស្កាត់​លេខ</string>
+  <string name="spam_notification_action_dismiss">បដិសេធ</string>
 </resources>
diff --git a/java/com/android/incallui/spam/res/values-kn/strings.xml b/java/com/android/incallui/spam/res/values-kn/strings.xml
index b7d9d32..7c87636 100644
--- a/java/com/android/incallui/spam/res/values-kn/strings.xml
+++ b/java/com/android/incallui/spam/res/values-kn/strings.xml
@@ -1,36 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="non_spam_notification_title" msgid="2599384745904934400">"<xliff:g id="NUMBER">%1$s</xliff:g> ತಿಳಿದಿದೆಯೇ?"</string>
-    <string name="spam_notification_title" msgid="609838099069629476">"<xliff:g id="NUMBER">%1$s</xliff:g> ಸ್ಪ್ಯಾಮ್ ಆಗಿದೆಯೇ?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"<xliff:g id="NUMBER">%1$s</xliff:g> ಅನ್ನು ನಿರ್ಬಂಧಿಸಲಾಗಿದೆ ಮತ್ತು ಕರೆಯನ್ನು ಸ್ಪ್ಯಾಮ್ ಎಂದು ವರದಿ ಮಾಡಲಾಗಿದೆ."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"<xliff:g id="NUMBER">%1$s</xliff:g> ನಿಂದ ಕರೆಯನ್ನು ಸ್ಪ್ಯಾಮ್ ಅಲ್ಲ ಎಂದು ವರದಿಮಾಡಲಾಗಿದೆ."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"ಸಂಪರ್ಕಗಳಿಗೆ ಸೇರಿಸಲು ಅಥವಾ ಸ್ಪ್ಯಾಮ್ ಸಂಖ್ಯೆಯನ್ನು ನಿರ್ಬಂಧಿಸಲು ಟ್ಯಾಪ್ ಮಾಡಿ."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"ಇದೇ ಮೊದಲ ಬಾರಿಗೆ ಈ ಸಂಖ್ಯೆಯಿಂದ ನಿಮಗೆ ಕರೆ ಮಾಡಲಾಗಿದೆ. ಈ ಕರೆಯು ಸ್ಪ್ಯಾಮ್ ಎನಿಸಿದರೆ, ನೀವು ಈ ಕರೆಯನ್ನು ನಿರ್ಬಂಧಿಸಬಹುದು ಮತ್ತು ವರದಿ ಮಾಡಿ."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"ಸ್ಪ್ಯಾಮ್ ಅಲ್ಲ ಎಂದು ವರದಿ ಮಾಡಲು ಟ್ಯಾಪ್ ಮಾಡಿ ಅಥವಾ ಇದನ್ನು ನಿರ್ಬಂಧಿಸಿ."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"ನಾವು ಈ ಕರೆಯನ್ನು ಸ್ಪ್ಯಾಮರ್‌ ಎಂದು ಶಂಕಿಸಿದ್ದೇವೆ. ಈ ಕರೆಯು ಸ್ಪ್ಯಾಮ್ ಅಲ್ಲ ಎಂದು ಭಾವಿಸಿದರೆ, ನಮ್ಮ ತಪ್ಪಾದ ವರದಿಗೆ NOT SPAM ಎಂದು ಟ್ಯಾಪ್ ಮಾಡಿ."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"ನಿರ್ಬಂಧಿಸಿ ಮತ್ತು ವರದಿ ಮಾಡಿ"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"ಸಂಪರ್ಕ ಸೇರಿಸಿ"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"ಸ್ಪ್ಯಾಮ್‌ ಅಲ್ಲ"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"ಸಂಖ್ಯೆಯನ್ನು ನಿರ್ಬಂಧಿಸಿ"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"ಸಂಪರ್ಕಗಳಿಗೆ ಸೇರಿಸಿ"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"ನಿರ್ಬಂಧಿಸಿ ಮತ್ತು ಸ್ಪ್ಯಾಮ್ ವರದಿ ಮಾಡಿ"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"ಸ್ಪ್ಯಾಮ್‌ ಅಲ್ಲ"</string>
-    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"ನಿರಾಕರಿಸಿ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="non_spam_notification_title">%1$s ತಿಳಿದಿದೆಯೇ?</string>
+  <string name="spam_notification_title">%1$s ಇದು ಸ್ಪ್ಯಾಮ್ ಕರೆಯೇ?</string>
+  <string name="spam_notification_block_report_toast_text">%1$s ಅನ್ನು ನಿರ್ಬಂಧಿಸಲಾಗಿದೆ ಮತ್ತು ಕರೆಯನ್ನು ಸ್ಪ್ಯಾಮ್ ಎಂದು ವರದಿ ಮಾಡಲಾಗಿದೆ.</string>
+  <string name="spam_notification_not_spam_toast_text">%1$s ನಿಂದ ಕರೆಯನ್ನು ಸ್ಪ್ಯಾಮ್ ಅಲ್ಲ ಎಂದು ವರದಿಮಾಡಲಾಗಿದೆ.</string>
+  <string name="spam_notification_non_spam_call_collapsed_text">ಸಂಪರ್ಕಗಳಿಗೆ ಸೇರಿಸಲು ಅಥವಾ ಸ್ಪ್ಯಾಮ್ ಸಂಖ್ಯೆಯನ್ನು ನಿರ್ಬಂಧಿಸಲು ಟ್ಯಾಪ್ ಮಾಡಿ.</string>
+  <string name="spam_notification_non_spam_call_expanded_text">ಇದೇ ಮೊದಲ ಬಾರಿಗೆ ಈ ಸಂಖ್ಯೆಯಿಂದ ನಿಮಗೆ ಕರೆ ಮಾಡಲಾಗಿದೆ. ಈ ಕರೆಯು ಸ್ಪ್ಯಾಮ್ ಎನಿಸಿದರೆ, ನೀವು ಈ ಕರೆಯನ್ನು ನಿರ್ಬಂಧಿಸಬಹುದು ಮತ್ತು ವರದಿ ಮಾಡಿ.</string>
+  <string name="spam_notification_spam_call_collapsed_text">ಸ್ಪ್ಯಾಮ್ ಅಲ್ಲ ಎಂದು ವರದಿ ಮಾಡಲು ಟ್ಯಾಪ್ ಮಾಡಿ ಅಥವಾ ಇದನ್ನು ನಿರ್ಬಂಧಿಸಿ.</string>
+  <string name="spam_notification_report_spam_action_text">ನಿರ್ಬಂಧಿಸಿ ಮತ್ತು ವರದಿ ಮಾಡಿ</string>
+  <string name="spam_notification_add_contact_action_text">ಸಂಪರ್ಕ ಸೇರಿಸಿ</string>
+  <string name="spam_notification_dialog_add_contact_action_text">ಸಂಪರ್ಕಗಳಿಗೆ ಸೇರಿಸಿ</string>
+  <string name="spam_notification_dialog_block_report_spam_action_text">ನಿರ್ಬಂಧಿಸಿ ಮತ್ತು ಸ್ಪ್ಯಾಮ್ ವರದಿ ಮಾಡಿ</string>
+  <string name="spam_notification_was_not_spam_action_text">ಇಲ್ಲ, ಸ್ಪ್ಯಾಮ್‌ ಅಲ್ಲ</string>
+  <string name="spam_notification_block_spam_action_text">ಹೌದು, ಸಂಖ್ಯೆಯನ್ನು ನಿರ್ಬಂಧಿಸಿ</string>
+  <string name="spam_notification_action_dismiss">ವಜಾಗೊಳಿಸಿ</string>
 </resources>
diff --git a/java/com/android/incallui/spam/res/values-ko/strings.xml b/java/com/android/incallui/spam/res/values-ko/strings.xml
index db6c6d1..28a8fb5 100644
--- a/java/com/android/incallui/spam/res/values-ko/strings.xml
+++ b/java/com/android/incallui/spam/res/values-ko/strings.xml
@@ -1,36 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="non_spam_notification_title" msgid="2599384745904934400">"<xliff:g id="NUMBER">%1$s</xliff:g>번은 알고 있는 전화번호인가요?"</string>
-    <string name="spam_notification_title" msgid="609838099069629476">"<xliff:g id="NUMBER">%1$s</xliff:g>번이 스팸인가요?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"<xliff:g id="NUMBER">%1$s</xliff:g>번을 차단하고 스팸으로 신고했습니다."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"<xliff:g id="NUMBER">%1$s</xliff:g>번으로 걸려온 전화는 스팸이 아닌 것으로 신고했습니다."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"탭하여 연락처에 추가하거나 스팸 전화번호를 차단합니다."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"이 번호에서 처음으로 걸려온 전화입니다. 이 전화가 스팸이라면 이 전화번호를 차단하고 신고할 수 있습니다."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"탭하여 스팸이 아닌 것으로 신고하거나 차단합니다."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"스팸 발송자로 의심됩니다. 이 전화가 스팸이 아니었다면 \'스팸 아님\'을 탭하여 실수였음을 신고합니다."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"차단 및 신고"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"연락처 추가"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"스팸 아님"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"번호 차단"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"연락처에 추가"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"스팸 차단 및 신고"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"스팸 아님"</string>
-    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"거부"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="non_spam_notification_title">%1$s번은 알고 있는 전화번호인가요?</string>
+  <string name="spam_notification_title">%1$s번이 스팸 발신자였나요?</string>
+  <string name="spam_notification_block_report_toast_text">%1$s번을 차단하고 스팸으로 신고했습니다.</string>
+  <string name="spam_notification_not_spam_toast_text">%1$s번으로 걸려온 전화는 스팸이 아닌 것으로 신고했습니다.</string>
+  <string name="spam_notification_non_spam_call_collapsed_text">탭하여 연락처에 추가하거나 스팸 전화번호를 차단합니다.</string>
+  <string name="spam_notification_non_spam_call_expanded_text">이 번호에서 처음으로 걸려온 전화입니다. 이 전화가 스팸이라면 이 전화번호를 차단하고 신고할 수 있습니다.</string>
+  <string name="spam_notification_spam_call_collapsed_text">탭하여 스팸이 아닌 것으로 보고하거나 차단하세요.</string>
+  <string name="spam_notification_report_spam_action_text">차단 및 신고</string>
+  <string name="spam_notification_add_contact_action_text">연락처 추가</string>
+  <string name="spam_notification_dialog_add_contact_action_text">연락처에 추가</string>
+  <string name="spam_notification_dialog_block_report_spam_action_text">스팸 차단 및 신고</string>
+  <string name="spam_notification_was_not_spam_action_text">아니요, 스팸이 아닙니다.</string>
+  <string name="spam_notification_block_spam_action_text">예, 번호를 차단합니다.</string>
+  <string name="spam_notification_action_dismiss">닫기</string>
 </resources>
diff --git a/java/com/android/incallui/spam/res/values-ky/strings.xml b/java/com/android/incallui/spam/res/values-ky/strings.xml
index 1460e0b..dad6eef 100644
--- a/java/com/android/incallui/spam/res/values-ky/strings.xml
+++ b/java/com/android/incallui/spam/res/values-ky/strings.xml
@@ -1,36 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="non_spam_notification_title" msgid="2599384745904934400">"<xliff:g id="NUMBER">%1$s</xliff:g> билесизби?"</string>
-    <string name="spam_notification_title" msgid="609838099069629476">"<xliff:g id="NUMBER">%1$s</xliff:g> спамбы?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"<xliff:g id="NUMBER">%1$s</xliff:g> бөгөттөлдү жана бул чалуу спам деп кабарланды."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"<xliff:g id="NUMBER">%1$s</xliff:g> номеринен келген чалуу спам эмес деп кабарланды."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"Номерди байланыштарга кошуу үчүн таптап коюңуз же спам деп бөгөттөңүз"</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"Бул номер сизге биринчи жолу чалып жатат. Ал спам болсо, номерди бөгөттөп, ал жөнүндө кабарлап койсоңуз болот."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"СПАМ ЭМЕС деп кабарлоо үчүн таптап коюңуз же аны бөгөттөңүз."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"Бул спам окшойт. Эгер спам эмес десеңиз, СПАМ ЭМЕС дегенди басып, бизге кабарлап коюңуз."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"Бөгөттөө жана кабарлоо"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"Байланыш кошуу"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"Спам эмес"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"Номерди бөгөттөө"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"Байланыштарга кошуу"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"Бөгөттөө жана спам тууралуу кабарлоо"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"Спам эмес"</string>
-    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"Баш тартуу"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="non_spam_notification_title">%1$s билесизби?</string>
+  <string name="spam_notification_title">%1$s спам чалуу болдубу?</string>
+  <string name="spam_notification_block_report_toast_text">%1$s бөгөттөлдү жана бул чалуу спам деп кабарланды.</string>
+  <string name="spam_notification_not_spam_toast_text">%1$s номеринен келген чалуу спам эмес деп кабарланды.</string>
+  <string name="spam_notification_non_spam_call_collapsed_text">Номерди байланыштарга кошуу үчүн таптап коюңуз же спам деп бөгөттөңүз</string>
+  <string name="spam_notification_non_spam_call_expanded_text">Бул номер сизге биринчи жолу чалып жатат. Ал спам болсо, номерди бөгөттөп, ал жөнүндө кабарлап койсоңуз болот.</string>
+  <string name="spam_notification_spam_call_collapsed_text">Спам эмес деп кабарлоо үчүн таптап коюңуз же аны бөгөттөңүз</string>
+  <string name="spam_notification_report_spam_action_text">Бөгөттөө жана кабарлоо</string>
+  <string name="spam_notification_add_contact_action_text">Байланыш кошуу</string>
+  <string name="spam_notification_dialog_add_contact_action_text">Байланыштарга кошуу</string>
+  <string name="spam_notification_dialog_block_report_spam_action_text">Бөгөттөө жана спам тууралуу кабарлоо</string>
+  <string name="spam_notification_was_not_spam_action_text">Жок, спам эмес</string>
+  <string name="spam_notification_block_spam_action_text">Ооба, номер бөгөттөлсүн</string>
+  <string name="spam_notification_action_dismiss">Жабуу</string>
 </resources>
diff --git a/java/com/android/incallui/spam/res/values-lo/strings.xml b/java/com/android/incallui/spam/res/values-lo/strings.xml
index 34b2c21..6683e65 100644
--- a/java/com/android/incallui/spam/res/values-lo/strings.xml
+++ b/java/com/android/incallui/spam/res/values-lo/strings.xml
@@ -1,36 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="non_spam_notification_title" msgid="2599384745904934400">"ຮູ້ຈັກ <xliff:g id="NUMBER">%1$s</xliff:g> ບໍ?"</string>
-    <string name="spam_notification_title" msgid="609838099069629476">"<xliff:g id="NUMBER">%1$s</xliff:g> ແມ່ນສະແປມບໍ?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"ບລັອກ <xliff:g id="NUMBER">%1$s</xliff:g> ແລະ ລາຍງານການໂທວ່າເປັນສະແປມແລ້ວ."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"ໝາຍການໂທຈາກ <xliff:g id="NUMBER">%1$s</xliff:g> ວ່າບໍ່ແມ່ນສະແປມແລ້ວ."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"ແຕະເພື່ອເພີ່ມໃສ່ລາຍຊື່ຜູ້ຕິດຕໍ່ ຫຼື ບລັອກເບີໂທສະແປມ."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"ນີ້ເປັນເທື່ອທຳອິດທີ່ເບີນີ້ໂທຫາທ່ານ. ຫາກນີ້ເປັນການໂທສະແປມ, ທ່ານສາມາດບລັອກເບີນີ້ ແລະ ລາຍງານມັນໄດ້."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"ແຕະເພື່ອລາຍງານວ່າບໍ່ແມ່ນສະແປມ ຫຼື ບລັອກມັນ."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"ພວກເຮົາສົງໄສວ່ານີ້ເປັນສະແປມ. ຫາກມັນບໍ່ແມ່ນສະແປມ, ໃຫ້ແຕະໃສ່ ບໍ່ແມ່ນສະແປມ ເພື່ອລາຍງານຄວາມຜິດພາດຂອງພວກເຮົາ."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"ບລັອກ ແລະ ລາຍງານ"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"ເພີ່ມລາຍຊື່ຜູ້ຕິດຕໍ່"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"ບໍ່ແມ່ນສະແປມ"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"ບລັອກເບີໂທ"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"ເພີ່ມໃສ່ລາຍຊື່ຜູ່ຕິດຕໍ່"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"ບລັອກ ແລະ ລາຍງານສະແປມ"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"ບໍ່ແມ່ນສະແປມ"</string>
-    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"ປະຕິເສດ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="non_spam_notification_title">ຮູ້ຈັກ %1$s ບໍ?</string>
+  <string name="spam_notification_title">%1$s ເປັນການໂທສະແປມບໍ?</string>
+  <string name="spam_notification_block_report_toast_text">ບລັອກ %1$s ແລະ ລາຍງານການໂທວ່າເປັນສະແປມແລ້ວ.</string>
+  <string name="spam_notification_not_spam_toast_text">ໝາຍການໂທຈາກ %1$s ວ່າບໍ່ແມ່ນສະແປມແລ້ວ.</string>
+  <string name="spam_notification_non_spam_call_collapsed_text">ແຕະເພື່ອເພີ່ມໃສ່ລາຍຊື່ຜູ້ຕິດຕໍ່ ຫຼື ບລັອກເບີໂທສະແປມ.</string>
+  <string name="spam_notification_non_spam_call_expanded_text">ນີ້ເປັນເທື່ອທຳອິດທີ່ເບີນີ້ໂທຫາທ່ານ. ຫາກນີ້ເປັນການໂທສະແປມ, ທ່ານສາມາດບລັອກເບີນີ້ ແລະ ລາຍງານມັນໄດ້.</string>
+  <string name="spam_notification_spam_call_collapsed_text">ແຕະເພື່ອລາຍງານວ່າບໍ່ແມ່ນສະແປມ ຫຼື ບລັອກມັນ</string>
+  <string name="spam_notification_report_spam_action_text">ບລັອກ ແລະ ລາຍງານ</string>
+  <string name="spam_notification_add_contact_action_text">ເພີ່ມລາຍຊື່ຜູ້ຕິດຕໍ່</string>
+  <string name="spam_notification_dialog_add_contact_action_text">ເພີ່ມໃສ່ລາຍຊື່ຜູ່ຕິດຕໍ່</string>
+  <string name="spam_notification_dialog_block_report_spam_action_text">ບລັອກ ແລະ ລາຍງານສະແປມ</string>
+  <string name="spam_notification_was_not_spam_action_text">ບໍ່, ບໍ່ແມ່ນສະແປມ</string>
+  <string name="spam_notification_block_spam_action_text">ແມ່ນແລ້ວ, ບລັອກເບີໄວ້</string>
+  <string name="spam_notification_action_dismiss">ປິດໄວ້</string>
 </resources>
diff --git a/java/com/android/incallui/spam/res/values-lt/strings.xml b/java/com/android/incallui/spam/res/values-lt/strings.xml
index 317e930..cb5c004 100644
--- a/java/com/android/incallui/spam/res/values-lt/strings.xml
+++ b/java/com/android/incallui/spam/res/values-lt/strings.xml
@@ -1,36 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="non_spam_notification_title" msgid="2599384745904934400">"Pažįstate numerį <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="spam_notification_title" msgid="609838099069629476">"Ar numeris <xliff:g id="NUMBER">%1$s</xliff:g> yra šlamšto siuntėjas?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"Numeris <xliff:g id="NUMBER">%1$s</xliff:g> užblokuotas ir apie skambutį buvo pranešta kaip apie šlamštą."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"Apie skambutį iš numerio <xliff:g id="NUMBER">%1$s</xliff:g> buvo pranešta kaip ne apie šlamštą."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"Palieskite, kad pridėtumėte prie kontaktų arba blokuotumėte numerį kaip šlamšto siuntėją."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"Tai pirmas kartas, kai jums buvo skambinama iš šio numerio. Jei šis skambutis buvo šlamštas, galite užblokuoti šį numerį ir apie jį pranešti."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"Palieskite, kad praneštumėte kaip apie NE ŠLAMŠTĄ arba užblokuotumėte."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"Įtarėme, kad tai yra šlamšto siuntėjas. Jei šis skambutis nebuvo šlamštas, palieskite NE ŠLAMŠTAS, kad praneštumėte apie mūsų klaidą."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"Blokuoti ir pranešti"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"Pridėti kontaktą"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"Ne šlamštas"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"Blokuoti numerį"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"Pridėti prie kontaktų"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"Blokuoti ir pranešti apie šlamštą"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"Ne šlamštas"</string>
-    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"Atmesti"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="non_spam_notification_title">Pažįstate numerį %1$s?</string>
+  <string name="spam_notification_title">Ar %1$s atliko šlamšto skambutį?</string>
+  <string name="spam_notification_block_report_toast_text">Numeris %1$s užblokuotas ir apie skambutį buvo pranešta kaip apie šlamštą.</string>
+  <string name="spam_notification_not_spam_toast_text">Apie skambutį iš numerio %1$s buvo pranešta kaip ne apie šlamštą.</string>
+  <string name="spam_notification_non_spam_call_collapsed_text">Palieskite, kad pridėtumėte prie kontaktų arba blokuotumėte numerį kaip šlamšto siuntėją.</string>
+  <string name="spam_notification_non_spam_call_expanded_text">Tai pirmas kartas, kai jums buvo skambinama iš šio numerio. Jei šis skambutis buvo šlamštas, galite užblokuoti šį numerį ir apie jį pranešti.</string>
+  <string name="spam_notification_spam_call_collapsed_text">Palieskite, kad praneštumėte kaip apie ne šlamštą arba užblokuotumėte</string>
+  <string name="spam_notification_report_spam_action_text">Blokuoti ir pranešti</string>
+  <string name="spam_notification_add_contact_action_text">Pridėti kontaktą</string>
+  <string name="spam_notification_dialog_add_contact_action_text">Pridėti prie kontaktų</string>
+  <string name="spam_notification_dialog_block_report_spam_action_text">Blokuoti ir pranešti apie šlamštą</string>
+  <string name="spam_notification_was_not_spam_action_text">Ne, ne šlamštas</string>
+  <string name="spam_notification_block_spam_action_text">Taip, blokuoti numerį</string>
+  <string name="spam_notification_action_dismiss">Atsisakyti</string>
 </resources>
diff --git a/java/com/android/incallui/spam/res/values-lv/strings.xml b/java/com/android/incallui/spam/res/values-lv/strings.xml
index 92b0a71..80697aa 100644
--- a/java/com/android/incallui/spam/res/values-lv/strings.xml
+++ b/java/com/android/incallui/spam/res/values-lv/strings.xml
@@ -1,36 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="non_spam_notification_title" msgid="2599384745904934400">"Vai saglabāt numuru <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="spam_notification_title" msgid="609838099069629476">"Vai numurs <xliff:g id="NUMBER">%1$s</xliff:g> ir nevēlams?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"Numurs <xliff:g id="NUMBER">%1$s</xliff:g> ir bloķēts, un zvans tika atzīmēts kā nevēlams."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"Zvans no numura <xliff:g id="NUMBER">%1$s</xliff:g> netika atzīmēts kā nevēlams."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"Pieskarieties, lai numuru pievienotu kontaktpersonām vai bloķētu nevēlamu numuru."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"Šis jums ir pirmais zvans no šī numura. Ja šis zvans bija nevēlams, varat bloķēt šo numuru un ziņot par to."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"Pieskarieties, lai atzīmētu, ka tas NAV NEVĒLAMS NUMURS, vai lai bloķētu numuru."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"Šķiet, ka šis bija nevēlams zvanītājs. Ja šis zvans nebija nevēlams, pieskarieties vienumam “NAV NEVĒLAMS NUMURS”, lai ziņotu mums par kļūdu."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"Bloķēt un ziņot"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"Pievienot kontaktp."</string>
-    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"Nav nevēlams numurs"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"Bloķēt numuru"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"Pievienot kontaktpersonām"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"Bloķēt numuru un ziņot par to"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"Nav nevēlams zvans"</string>
-    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"Noraidīt"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="non_spam_notification_title">Vai saglabāt numuru %1$s?</string>
+  <string name="spam_notification_title">Vai zvanītājs %1$s bija nevēlams?</string>
+  <string name="spam_notification_block_report_toast_text">Numurs %1$s ir bloķēts, un zvans tika atzīmēts kā nevēlams.</string>
+  <string name="spam_notification_not_spam_toast_text">Zvans no numura %1$s netika atzīmēts kā nevēlams.</string>
+  <string name="spam_notification_non_spam_call_collapsed_text">Pieskarieties, lai numuru pievienotu kontaktpersonām vai bloķētu nevēlamu numuru.</string>
+  <string name="spam_notification_non_spam_call_expanded_text">Šis jums ir pirmais zvans no šī numura. Ja šis zvans bija nevēlams, varat bloķēt šo numuru un ziņot par to.</string>
+  <string name="spam_notification_spam_call_collapsed_text">Pieskarieties, lai ziņotu, ka zvans nebija nevēlams, vai bloķētu numuru.</string>
+  <string name="spam_notification_report_spam_action_text">Bloķēt un ziņot</string>
+  <string name="spam_notification_add_contact_action_text">Pievienot kontaktp.</string>
+  <string name="spam_notification_dialog_add_contact_action_text">Pievienot kontaktpersonām</string>
+  <string name="spam_notification_dialog_block_report_spam_action_text">Bloķēt numuru un ziņot par to</string>
+  <string name="spam_notification_was_not_spam_action_text">Nē, tas nebija nevēlams zvans</string>
+  <string name="spam_notification_block_spam_action_text">Jā, bloķēt numuru</string>
+  <string name="spam_notification_action_dismiss">Nerādīt</string>
 </resources>
diff --git a/java/com/android/incallui/spam/res/values-mk/strings.xml b/java/com/android/incallui/spam/res/values-mk/strings.xml
index 590b589..882a155 100644
--- a/java/com/android/incallui/spam/res/values-mk/strings.xml
+++ b/java/com/android/incallui/spam/res/values-mk/strings.xml
@@ -1,36 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="non_spam_notification_title" msgid="2599384745904934400">"Го знаете <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="spam_notification_title" msgid="609838099069629476">"Дали <xliff:g id="NUMBER">%1$s</xliff:g> е спам?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"<xliff:g id="NUMBER">%1$s</xliff:g> е блокиран и повикот е пријавен како спам."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"Повикот од <xliff:g id="NUMBER">%1$s</xliff:g> е пријавен дека не е спам."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"Допрете за додавање контакти или блокирање спам број."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"За првпат добивте повик од бројов. Ако повикот е спам, бројот може да го блокирате и да го пријавите."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"Допрете за да пријавите дека НЕ Е СПАМ или за да го блокирате."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"Се сомневавме дека повиков е спам. Ако не е, допрете НЕ Е СПАМ за да ја пријавите нашата грешка."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"Блокирај и пријави"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"Додај контакт"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"Не е спам"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"Блокирај го бројот"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"Додај во контакти"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"Блокирај и пријави спам"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"Не е спам"</string>
-    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"Одбиј"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="non_spam_notification_title">Го знаете %1$s?</string>
+  <string name="spam_notification_title">Дали повикот од %1$s беше спам?</string>
+  <string name="spam_notification_block_report_toast_text">%1$s е блокиран и повикот е пријавен како спам.</string>
+  <string name="spam_notification_not_spam_toast_text">Повикот од %1$s е пријавен дека не е спам.</string>
+  <string name="spam_notification_non_spam_call_collapsed_text">Допрете за додавање контакти или блокирање спам број.</string>
+  <string name="spam_notification_non_spam_call_expanded_text">За првпат добивте повик од бројов. Ако повикот е спам, бројот може да го блокирате и да го пријавите.</string>
+  <string name="spam_notification_spam_call_collapsed_text">Допрете за да пријавите дека не е спам или за да го блокирате.</string>
+  <string name="spam_notification_report_spam_action_text">Блокирај и пријави</string>
+  <string name="spam_notification_add_contact_action_text">Додај контакт</string>
+  <string name="spam_notification_dialog_add_contact_action_text">Додај во контакти</string>
+  <string name="spam_notification_dialog_block_report_spam_action_text">Блокирај и пријави спам</string>
+  <string name="spam_notification_was_not_spam_action_text">Не, не е спам</string>
+  <string name="spam_notification_block_spam_action_text">Да, блокирај го бројот</string>
+  <string name="spam_notification_action_dismiss">Отфрли</string>
 </resources>
diff --git a/java/com/android/incallui/spam/res/values-ml/strings.xml b/java/com/android/incallui/spam/res/values-ml/strings.xml
index 31b11ad..ff7983e 100644
--- a/java/com/android/incallui/spam/res/values-ml/strings.xml
+++ b/java/com/android/incallui/spam/res/values-ml/strings.xml
@@ -1,36 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="non_spam_notification_title" msgid="2599384745904934400">"<xliff:g id="NUMBER">%1$s</xliff:g> അറിയാമോ?"</string>
-    <string name="spam_notification_title" msgid="609838099069629476">"<xliff:g id="NUMBER">%1$s</xliff:g> സ്‌പാം ആണോ?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"<xliff:g id="NUMBER">%1$s</xliff:g> ബ്ലോക്കുചെയ്‌ത്, കോൾ സ്‌പാം ആയി റിപ്പോർട്ടുചെയ്‌തു."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"<xliff:g id="NUMBER">%1$s</xliff:g> എന്ന നമ്പറിൽ നിന്നുള്ള കോളിനെ സ്‌പാം അല്ലെന്ന് റിപ്പോർട്ടുചെയ്‌തു."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"കോൺടാക്‌റ്റുകളിലേക്ക് ചേർക്കാനോ സ്‌പാം നമ്പർ ബ്ലോക്കുചെയ്യാനോ ടാപ്പുചെയ്യുക."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"ഈ നമ്പറിൽ നിന്ന് ആദ്യമായാണ് നിങ്ങൾക്ക് കോൾ വരുന്നത്. ഈ കോൾ സ്‌പാം ആയിരുന്നെങ്കിൽ, ഈ നമ്പർ ബ്ലോക്കുചെയ്‌ത് റിപ്പോർട്ടുചെയ്യാനാകും."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"സ്‌പാം അല്ല എന്ന് റിപ്പോർട്ടുചെയ്യാൻ ടാപ്പുചെയ്യുക, അല്ലെങ്കിൽ അത് ബ്ലോക്കുചെയ്യുക."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"ഇത് ഒരു സ്‌പാമർ ആണെന്ന് ഞങ്ങൾക്ക് സംശയമുണ്ടായിരുന്നു. ഈ കോൾ ഒരു സ്‌പാം ആയിരുന്നില്ലെങ്കിൽ, ഞങ്ങളുടെ തെറ്റ് റിപ്പോർട്ടുചെയ്യാൻ സ്‌പാം അല്ല എന്നതിൽ ടാപ്പുചെയ്യുക."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"ബ്ലോക്കുചെയ്‌ത്, റിപ്പോർട്ടുചെയ്യുക"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"കോൺടാക്റ്റ് ചേർക്കുക"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"സ്പാം അല്ല"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"നമ്പർ ബ്ലോക്കുചെയ്യുക"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"കോൺടാക്‌റ്റുകളിൽ ചേർക്കുക"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"ബ്ലോക്കുചെയ്‌ത്, സ്‌പാമെന്ന് റിപ്പോർട്ടുചെയ്യുക"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"സ്പാം അല്ല"</string>
-    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"നിരസിക്കുക"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="non_spam_notification_title">%1$s അറിയാമോ?</string>
+  <string name="spam_notification_title">%1$s സ്‌പാം കോളർ ആയിരുന്നോ?</string>
+  <string name="spam_notification_block_report_toast_text">%1$s ബ്ലോക്കുചെയ്‌ത്, കോൾ സ്‌പാം ആയി റിപ്പോർട്ടുചെയ്‌തു.</string>
+  <string name="spam_notification_not_spam_toast_text">%1$s എന്ന നമ്പറിൽ നിന്നുള്ള കോളിനെ സ്‌പാം അല്ലെന്ന് റിപ്പോർട്ടുചെയ്‌തു.</string>
+  <string name="spam_notification_non_spam_call_collapsed_text">കോൺടാക്‌റ്റുകളിലേക്ക് ചേർക്കാനോ സ്‌പാം നമ്പർ ബ്ലോക്കുചെയ്യാനോ ടാപ്പുചെയ്യുക.</string>
+  <string name="spam_notification_non_spam_call_expanded_text">ഈ നമ്പറിൽ നിന്ന് ആദ്യമായാണ് നിങ്ങൾക്ക് കോൾ വരുന്നത്. ഈ കോൾ സ്‌പാം ആയിരുന്നെങ്കിൽ, ഈ നമ്പർ ബ്ലോക്കുചെയ്‌ത് റിപ്പോർട്ടുചെയ്യാനാകും.</string>
+  <string name="spam_notification_spam_call_collapsed_text">സ്‌പാം അല്ല എന്ന് റിപ്പോർട്ട് ചെയ്യാൻ ടാപ്പ് ചെയ്യുക, അല്ലെങ്കിൽ അത് ബ്ലോക്ക് ചെയ്യുക</string>
+  <string name="spam_notification_report_spam_action_text">ബ്ലോക്കുചെയ്‌ത്, റിപ്പോർട്ടുചെയ്യുക</string>
+  <string name="spam_notification_add_contact_action_text">കോൺടാക്റ്റ് ചേർക്കുക</string>
+  <string name="spam_notification_dialog_add_contact_action_text">കോൺടാക്‌റ്റുകളിൽ ചേർക്കുക</string>
+  <string name="spam_notification_dialog_block_report_spam_action_text">ബ്ലോക്കുചെയ്‌ത്, സ്‌പാമെന്ന് റിപ്പോർട്ടുചെയ്യുക</string>
+  <string name="spam_notification_was_not_spam_action_text">അല്ല, സ്‌പാം അല്ല</string>
+  <string name="spam_notification_block_spam_action_text">ഉവ്വ്, നമ്പർ ബ്ലോക്ക് ചെയ്യുക</string>
+  <string name="spam_notification_action_dismiss">ഒഴിവാക്കുക</string>
 </resources>
diff --git a/java/com/android/incallui/spam/res/values-mn/strings.xml b/java/com/android/incallui/spam/res/values-mn/strings.xml
index 93510ab..5b902c1 100644
--- a/java/com/android/incallui/spam/res/values-mn/strings.xml
+++ b/java/com/android/incallui/spam/res/values-mn/strings.xml
@@ -1,36 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="non_spam_notification_title" msgid="2599384745904934400">"<xliff:g id="NUMBER">%1$s</xliff:g>-г мэдэх үү?"</string>
-    <string name="spam_notification_title" msgid="609838099069629476">"<xliff:g id="NUMBER">%1$s</xliff:g> спам уу?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"<xliff:g id="NUMBER">%1$s</xliff:g>-г хориглож, дуудлагыг спам гэж мэдээлсэн."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"<xliff:g id="NUMBER">%1$s</xliff:g>-с ирсэн дуудлагыг спам гэж мэдээлсэн."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"Харилцагчдад нэмэх буюу спам дугаарыг хориглох бол товшино уу."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"Энэ дугаараас танд анх удаа дуудлага ирсэн. Хэрэв энэ дуудлага спам бол та энэ дугаарыг хориглож, спамаар мэдээлэх боломжтой."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"СПАМ БИШ гэж мэдээлэх буюу хориглох бол товшино уу."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"Бид энийг спам гэж сэжиглэж байна. Хэрэв спам байгаагүй бол СПАМ БИШ гэснийг товшиж бидний алдааг мэдээлнэ үү."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"Хориглож, мэдээлэх"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"Харилцагч нэмэх"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"Спам биш"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"Дугаар хориглох"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"Харилцагчдад нэмэх"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"Хориглож, спам гэж мэдээлэх"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"Спам биш"</string>
-    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"Татгалзах"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="non_spam_notification_title">%1$s-г мэдэх үү?</string>
+  <string name="spam_notification_title">%1$s спам дуудлага хийгч байсан уу?</string>
+  <string name="spam_notification_block_report_toast_text">%1$s-г хориглож, дуудлагыг спам гэж мэдээлсэн.</string>
+  <string name="spam_notification_not_spam_toast_text">%1$s-с ирсэн дуудлагыг спам гэж мэдээлсэн.</string>
+  <string name="spam_notification_non_spam_call_collapsed_text">Харилцагчдад нэмэх буюу спам дугаарыг хориглох бол товшино уу.</string>
+  <string name="spam_notification_non_spam_call_expanded_text">Энэ дугаараас танд анх удаа дуудлага ирсэн. Хэрэв энэ дуудлага спам бол та энэ дугаарыг хориглож, спамаар мэдээлэх боломжтой.</string>
+  <string name="spam_notification_spam_call_collapsed_text">Спам биш гэж мэдээлэх эсвэл хориглох бол товшино уу</string>
+  <string name="spam_notification_report_spam_action_text">Хориглож, мэдээлэх</string>
+  <string name="spam_notification_add_contact_action_text">Харилцагч нэмэх</string>
+  <string name="spam_notification_dialog_add_contact_action_text">Харилцагчдад нэмэх</string>
+  <string name="spam_notification_dialog_block_report_spam_action_text">Хориглож, спам гэж мэдээлэх</string>
+  <string name="spam_notification_was_not_spam_action_text">Үгүй, спам биш</string>
+  <string name="spam_notification_block_spam_action_text">Тийм, дугаарыг хориглох</string>
+  <string name="spam_notification_action_dismiss">Хаах</string>
 </resources>
diff --git a/java/com/android/incallui/spam/res/values-mr/strings.xml b/java/com/android/incallui/spam/res/values-mr/strings.xml
index 8df30c0..d18c16b 100644
--- a/java/com/android/incallui/spam/res/values-mr/strings.xml
+++ b/java/com/android/incallui/spam/res/values-mr/strings.xml
@@ -1,36 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="non_spam_notification_title" msgid="2599384745904934400">"<xliff:g id="NUMBER">%1$s</xliff:g> माहीत आहे का?"</string>
-    <string name="spam_notification_title" msgid="609838099069629476">"<xliff:g id="NUMBER">%1$s</xliff:g> स्पॅम आहे का?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"<xliff:g id="NUMBER">%1$s</xliff:g> ब्लॉक केला आणि कॉल स्पॅम असल्याचे कळवले."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"<xliff:g id="NUMBER">%1$s</xliff:g> वरील कॉल स्पॅम नसल्याचे कळवले."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"संपर्कांमध्ये जोडण्यासाठी किंवा स्पॅम नंबर ब्लॉक करण्यासाठी टॅप करा."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"तुम्हाला पहिल्यांदाच या नंबरवरून कॉल आला होता. हा कॉल स्पॅम असल्यास, तुम्ही हा नंबर ब्लॉक करू शकता आणि आणि तसे कळवू शकता."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"स्पॅम नसल्याचे कळवण्यासाठी किंवा तो ब्लॉक करण्यासाठी टॅप करा."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"हा स्पॅमर असल्याचा आम्हाला संशय होता. हा कॉल स्पॅम नसल्यास, आम्ही चुकले असल्याचे कळवण्यासाठी स्पॅम नाही वर टॅप करा."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"ब्लॉक करा आणि अहवाल द्या"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"संपर्क जोडा"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"स्पॅम नाही"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"नंबर ब्लॉक करा"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"संपर्कांमध्ये जोडा"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"ब्लॉक करा आणि स्पॅमचा असल्याचे कळवा"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"स्पॅम नाही"</string>
-    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"नकार द्या"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="non_spam_notification_title">%1$s माहीत आहे का?</string>
+  <string name="spam_notification_title">%1$s स्‍पॅम कॉलर होता?</string>
+  <string name="spam_notification_block_report_toast_text">%1$s ब्लॉक केला आणि कॉल स्पॅम असल्याचे कळवले.</string>
+  <string name="spam_notification_not_spam_toast_text">%1$s वरील कॉल स्पॅम नसल्याचे कळवले.</string>
+  <string name="spam_notification_non_spam_call_collapsed_text">संपर्कांमध्ये जोडण्यासाठी किंवा स्पॅम नंबर ब्लॉक करण्यासाठी टॅप करा.</string>
+  <string name="spam_notification_non_spam_call_expanded_text">तुम्हाला पहिल्यांदाच या नंबरवरून कॉल आला होता. हा कॉल स्पॅम असल्यास, तुम्ही हा नंबर ब्लॉक करू शकता आणि आणि तसे कळवू शकता.</string>
+  <string name="spam_notification_spam_call_collapsed_text">स्पॅम नसल्याचे कळवण्यासाठी किंवा तो ब्लॉक करण्यासाठी टॅप करा</string>
+  <string name="spam_notification_report_spam_action_text">ब्लॉक करा आणि अहवाल द्या</string>
+  <string name="spam_notification_add_contact_action_text">संपर्क जोडा</string>
+  <string name="spam_notification_dialog_add_contact_action_text">संपर्कांमध्ये जोडा</string>
+  <string name="spam_notification_dialog_block_report_spam_action_text">ब्लॉक करा आणि स्पॅमचा असल्याचे कळवा</string>
+  <string name="spam_notification_was_not_spam_action_text">नाही, स्‍पॅम नाही</string>
+  <string name="spam_notification_block_spam_action_text">होय, क्रमांक ब्‍लॉक करा</string>
+  <string name="spam_notification_action_dismiss">डिसमिस करा</string>
 </resources>
diff --git a/java/com/android/incallui/spam/res/values-ms/strings.xml b/java/com/android/incallui/spam/res/values-ms/strings.xml
index c42002a..410f8cf 100644
--- a/java/com/android/incallui/spam/res/values-ms/strings.xml
+++ b/java/com/android/incallui/spam/res/values-ms/strings.xml
@@ -1,36 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="non_spam_notification_title" msgid="2599384745904934400">"Anda mengenali <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="spam_notification_title" msgid="609838099069629476">"Adakah <xliff:g id="NUMBER">%1$s</xliff:g> spam?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"<xliff:g id="NUMBER">%1$s</xliff:g> disekat dan panggilan telah dilaporkan sebagai spam."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"Panggilan daripada <xliff:g id="NUMBER">%1$s</xliff:g> dilaporkan sebagai bukan spam."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"Ketik untuk menambahkan nombor pada kenalan atau sekat nombor spam."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"Ini merupakan kali pertama nombor ini memanggil anda. Jika panggilan ini spam, anda boleh menyekat nombor ini dan melaporkannya."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"Ketik untuk melaporkan sebagai BUKAN SPAM atau sekat nombor."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"Kami mengesyaki panggilan ini adalah spam. Jika panggilan ini bukan spam, ketik BUKAN SPAM untuk melaporkan kesilapan kami."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"Sekat &amp; lapor"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"Tambah kenalan"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"Bukan spam"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"Sekat nombor"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"Tambahkan pada kenalan"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"Sekat &amp; laporkan spam"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"Bukan spam"</string>
-    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"Tolak"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="non_spam_notification_title">Anda mengenali %1$s?</string>
+  <string name="spam_notification_title">Adakah %1$s pemanggil spam?</string>
+  <string name="spam_notification_block_report_toast_text">%1$s disekat dan panggilan telah dilaporkan sebagai spam.</string>
+  <string name="spam_notification_not_spam_toast_text">Panggilan daripada %1$s dilaporkan sebagai bukan spam.</string>
+  <string name="spam_notification_non_spam_call_collapsed_text">Ketik untuk menambahkan nombor pada kenalan atau sekat nombor spam.</string>
+  <string name="spam_notification_non_spam_call_expanded_text">Ini merupakan kali pertama nombor ini memanggil anda. Jika panggilan ini spam, anda boleh menyekat nombor ini dan melaporkannya.</string>
+  <string name="spam_notification_spam_call_collapsed_text">Ketik untuk melaporkan sebagai bukan spam atau sekat nombor</string>
+  <string name="spam_notification_report_spam_action_text">Sekat &amp; lapor</string>
+  <string name="spam_notification_add_contact_action_text">Tambah kenalan</string>
+  <string name="spam_notification_dialog_add_contact_action_text">Tambahkan pada kenalan</string>
+  <string name="spam_notification_dialog_block_report_spam_action_text">Sekat &amp; laporkan spam</string>
+  <string name="spam_notification_was_not_spam_action_text">Tidak, bukan spam</string>
+  <string name="spam_notification_block_spam_action_text">Ya, sekat nombor</string>
+  <string name="spam_notification_action_dismiss">Ketepikan</string>
 </resources>
diff --git a/java/com/android/incallui/spam/res/values-my/strings.xml b/java/com/android/incallui/spam/res/values-my/strings.xml
index b79abd6..56cf579 100644
--- a/java/com/android/incallui/spam/res/values-my/strings.xml
+++ b/java/com/android/incallui/spam/res/values-my/strings.xml
@@ -1,36 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="non_spam_notification_title" msgid="2599384745904934400">"<xliff:g id="NUMBER">%1$s</xliff:g> ကို သိပါသလား။"</string>
-    <string name="spam_notification_title" msgid="609838099069629476">"<xliff:g id="NUMBER">%1$s</xliff:g> က စပမ်းလား။"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"<xliff:g id="NUMBER">%1$s</xliff:g> ကို ပိတ်ဆို့လိုက်ပြီး ခေါ်ဆိုမှုကို စပမ်းအဖြစ် သတင်းပို့ပြီးပါပြီ။"</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"<xliff:g id="NUMBER">%1$s</xliff:g> ထံမှ ခေါ်ဆိုမှုကို စပမ်းမဟုတ်ကြောင်း သတင်းပို့ပြီးပါပြီ။"</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"အဆက်အသွယ်များသို့ ထည့်ရန် (သို့) စပမ်းနံပါတ်ကို ပိတ်ဆို့ရန် နှိပ်ပါ"</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"ဤနံပါတ်သည် သင့်ထံသို့ ပထမဆုံးခေါ်ဖူးခြင်းဖြစ်သည်။ ဤခေါ်ဆိုမှုသည် စပမ်းဖြစ်ပါက ဤနံပါတ်ကို ပိတ်ဆို့၍ သတင်းပို့နိုင်ပါသည်။"</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"စပမ်းမဟုတ်ကြောင်း သတင်းပို့ရန် နှိပ်ပါ (သို့) ၎င်းကို ပိတ်ဆို့ပါ။"</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"ဤသည်ကို စပမ်မာဟု ကျွန်ုပ်တို့ သံသယရှိပါသည်။ ဤခေါ်ဆိုမှုသည် စပမ်းမဟုတ်ပါက ကျွန်ုပ်တို့၏မှားယွင်းမှုကို သတင်းပို့ရန် \"စပမ်းမဟုတ်ပါ\" ကို နှိပ်ပါ။"</string>
-    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"ပိတ်ဆို့ပြီး သတင်းပို့ပါ"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"အဆက်အသွယ်ထည့်ရန်"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"စပမ်း မဟုတ်ပါ"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"နံပါတ်ကို ပိတ်ဆို့ရန်"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"အဆက်အသွယ်များထဲသို့ ထည့်ရန်"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"စပမ်းကို ပိတ်ဆို့ပြီး သတင်းပို့ပါ"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"စပမ်း မဟုတ်ပါ"</string>
-    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"ငြင်းပယ်ရန်"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="non_spam_notification_title">%1$s ကို သိပါသလား။</string>
+  <string name="spam_notification_title">%1$s က စပမ်းခေါ်ဆိုမှု ဟုတ်ပါသလား။</string>
+  <string name="spam_notification_block_report_toast_text">%1$s ကို ပိတ်ဆို့လိုက်ပြီး ခေါ်ဆိုမှုကို စပမ်းအဖြစ် သတင်းပို့ပြီးပါပြီ။</string>
+  <string name="spam_notification_not_spam_toast_text">%1$s ထံမှ ခေါ်ဆိုမှုကို စပမ်းမဟုတ်ကြောင်း သတင်းပို့ပြီးပါပြီ။</string>
+  <string name="spam_notification_non_spam_call_collapsed_text">အဆက်အသွယ်များသို့ ထည့်ရန် (သို့) စပမ်းနံပါတ်ကို ပိတ်ဆို့ရန် နှိပ်ပါ</string>
+  <string name="spam_notification_non_spam_call_expanded_text">ဤနံပါတ်သည် သင့်ထံသို့ ပထမဆုံးခေါ်ဖူးခြင်းဖြစ်သည်။ ဤခေါ်ဆိုမှုသည် စပမ်းဖြစ်ပါက ဤနံပါတ်ကို ပိတ်ဆို့၍ သတင်းပို့နိုင်ပါသည်။</string>
+  <string name="spam_notification_spam_call_collapsed_text">စပမ်းမဟုတ်ကြောင်း သတင်းပို့ရန် နှိပ်ပါ (သို့) ၎င်းကို ပိတ်ပါ</string>
+  <string name="spam_notification_report_spam_action_text">ပိတ်ဆို့ပြီး သတင်းပို့ပါ</string>
+  <string name="spam_notification_add_contact_action_text">အဆက်အသွယ်ထည့်ရန်</string>
+  <string name="spam_notification_dialog_add_contact_action_text">အဆက်အသွယ်များထဲသို့ ထည့်ရန်</string>
+  <string name="spam_notification_dialog_block_report_spam_action_text">စပမ်းကို ပိတ်ဆို့ပြီး သတင်းပို့ပါ</string>
+  <string name="spam_notification_was_not_spam_action_text">စပမ်း မဟုတ်ပါ</string>
+  <string name="spam_notification_block_spam_action_text">နံပါတ်ကို ပိတ်ပါ</string>
+  <string name="spam_notification_action_dismiss">ပယ်ရန်</string>
 </resources>
diff --git a/java/com/android/incallui/spam/res/values-nb/strings.xml b/java/com/android/incallui/spam/res/values-nb/strings.xml
index b8d6a84..697000c 100644
--- a/java/com/android/incallui/spam/res/values-nb/strings.xml
+++ b/java/com/android/incallui/spam/res/values-nb/strings.xml
@@ -1,36 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="non_spam_notification_title" msgid="2599384745904934400">"Kjenner du <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="spam_notification_title" msgid="609838099069629476">"Tilhører <xliff:g id="NUMBER">%1$s</xliff:g> en useriøs oppringer?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"<xliff:g id="NUMBER">%1$s</xliff:g> ble blokkert, og anropet ble rapportert som useriøst."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"Anropet fra <xliff:g id="NUMBER">%1$s</xliff:g> ble rapportert som ikke useriøst."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"Trykk for å legge til kontakter eller blokkere det useriøse nummeret."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"Dette er den første gangen du blir oppringt fra dette nummeret. Hvis dette anropet var useriøst, kan du blokkere nummeret og rapportere det."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"Trykk for å rapportere nummeret som IKKE USERIØST eller blokkere det."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"Vi tror at dette var en useriøs oppringer. Hvis anropet ikke var useriøst, trykk på IKKE USERIØST for å melde fra om at vi tar feil."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"Blokkér og rapportér"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"Legg til kontakt"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"Ikke useriøs"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"Blokkér nummeret"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"Legg til i kontakter"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"Blokkér og rapportér som useriøst"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"Ikke useriøs"</string>
-    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"Avslå"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="non_spam_notification_title">Kjenner du %1$s?</string>
+  <string name="spam_notification_title">Var %1$s en useriøs oppringer?</string>
+  <string name="spam_notification_block_report_toast_text">%1$s ble blokkert, og anropet ble rapportert som useriøst.</string>
+  <string name="spam_notification_not_spam_toast_text">Anropet fra %1$s ble rapportert som ikke useriøst.</string>
+  <string name="spam_notification_non_spam_call_collapsed_text">Trykk for å legge til kontakter eller blokkere det useriøse nummeret.</string>
+  <string name="spam_notification_non_spam_call_expanded_text">Dette er den første gangen du blir oppringt fra dette nummeret. Hvis dette anropet var useriøst, kan du blokkere nummeret og rapportere det.</string>
+  <string name="spam_notification_spam_call_collapsed_text">Trykk for å rapportere nummeret som ikke useriøst eller blokkere det.</string>
+  <string name="spam_notification_report_spam_action_text">Blokkér og rapportér</string>
+  <string name="spam_notification_add_contact_action_text">Legg til kontakt</string>
+  <string name="spam_notification_dialog_add_contact_action_text">Legg til i kontakter</string>
+  <string name="spam_notification_dialog_block_report_spam_action_text">Blokkér og rapportér som useriøst</string>
+  <string name="spam_notification_was_not_spam_action_text">Nei, ikke useriøst</string>
+  <string name="spam_notification_block_spam_action_text">Ja, blokkér nummeret</string>
+  <string name="spam_notification_action_dismiss">Lukk</string>
 </resources>
diff --git a/java/com/android/incallui/spam/res/values-ne/strings.xml b/java/com/android/incallui/spam/res/values-ne/strings.xml
index 24b9574..2afdf6a 100644
--- a/java/com/android/incallui/spam/res/values-ne/strings.xml
+++ b/java/com/android/incallui/spam/res/values-ne/strings.xml
@@ -1,36 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="non_spam_notification_title" msgid="2599384745904934400">"<xliff:g id="NUMBER">%1$s</xliff:g> लाई चिन्नुहुन्छ?"</string>
-    <string name="spam_notification_title" msgid="609838099069629476">"<xliff:g id="NUMBER">%1$s</xliff:g> स्प्याम हो?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"<xliff:g id="NUMBER">%1$s</xliff:g> माथि रोक लगाइयो र कललाई स्प्याम भनी रिपोर्ट गरियो।"</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"<xliff:g id="NUMBER">%1$s</xliff:g> बाट आएको कललाई स्प्याम होइन भनी रिपोर्ट गरियो।"</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"सम्पर्कहरूमा थप्न वा स्प्याम नम्बरमाथि रोक लगाउन ट्याप गर्नुहोस्।"</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"यस नम्बरबाट तपाईंलाई कल आएको यो पहिलोपटक हो। यो कल स्प्याम हो भने तपाईं यो नम्बरमाथि रोक लगाउन र यसबारे रिपोर्ट गर्न सक्नुहुन्छ।"</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"स्प्याम होइन भनी रिपोर्ट गर्न वा यसमाथि रोक लगाउन ट्याप गर्नुहोस्।"</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"हामीलाई यो कल गर्ने व्यक्ति एक स्प्यामर हो भन्ने आशङ्का लाग्यो। यो कल स्प्याम थिएन भने हाम्रो गल्तीको रिपोर्ट गर्न स्प्याम होइनमा ट्याप गर्नुहोस्।"</string>
-    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"रोक लगाउनुहोस्‌ र रिपोर्ट गर्नुहोस्‌"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"सम्पर्क थप्नुहोस्"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"स्प्याम होइन"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"नम्बरमाथि रोक लगाउनुहोस्"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"सम्पर्कहरूमा थप्नुहोस्‌"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"रोक लगाउनुहोस्‌ र स्प्याम भनी रिपोर्ट गर्नुहोस्‌"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"स्प्याम होइन"</string>
-    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"अस्वीकार गर्नुहोस्"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="non_spam_notification_title">%1$s लाई चिन्नुहुन्छ?</string>
+  <string name="spam_notification_title">%1$s स्प्याम कल गर्ने व्यक्ति थिए?</string>
+  <string name="spam_notification_block_report_toast_text">%1$s माथि रोक लगाइयो र कललाई स्प्याम भनी रिपोर्ट गरियो।</string>
+  <string name="spam_notification_not_spam_toast_text">%1$s बाट आएको कललाई स्प्याम होइन भनी रिपोर्ट गरियो।</string>
+  <string name="spam_notification_non_spam_call_collapsed_text">सम्पर्कहरूमा थप्न वा स्प्याम नम्बरमाथि रोक लगाउन ट्याप गर्नुहोस्।</string>
+  <string name="spam_notification_non_spam_call_expanded_text">यस नम्बरबाट तपाईंलाई कल आएको यो पहिलोपटक हो। यो कल स्प्याम हो भने तपाईं यो नम्बरमाथि रोक लगाउन र यसबारे रिपोर्ट गर्न सक्नुहुन्छ।</string>
+  <string name="spam_notification_spam_call_collapsed_text">स्प्याम होइन भनी रिपोर्ट गर्न ट्याप गर्नुहोस् वा यसमाथि रोक लगाउनुहोस्</string>
+  <string name="spam_notification_report_spam_action_text">रोक लगाउनुहोस्‌ र रिपोर्ट गर्नुहोस्‌</string>
+  <string name="spam_notification_add_contact_action_text">सम्पर्क थप्नुहोस्</string>
+  <string name="spam_notification_dialog_add_contact_action_text">सम्पर्कहरूमा थप्नुहोस्‌</string>
+  <string name="spam_notification_dialog_block_report_spam_action_text">रोक लगाउनुहोस्‌ र स्प्याम भनी रिपोर्ट गर्नुहोस्‌</string>
+  <string name="spam_notification_was_not_spam_action_text">स्प्याम होइन</string>
+  <string name="spam_notification_block_spam_action_text">हो, यो नम्बरमाथि रोक लगाउनुहोस्</string>
+  <string name="spam_notification_action_dismiss">खारेज गर्नु…</string>
 </resources>
diff --git a/java/com/android/incallui/spam/res/values-nl/strings.xml b/java/com/android/incallui/spam/res/values-nl/strings.xml
index 4b1f842..f395078 100644
--- a/java/com/android/incallui/spam/res/values-nl/strings.xml
+++ b/java/com/android/incallui/spam/res/values-nl/strings.xml
@@ -1,36 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="non_spam_notification_title" msgid="2599384745904934400">"Ken je <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="spam_notification_title" msgid="609838099069629476">"Is <xliff:g id="NUMBER">%1$s</xliff:g> spam?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"<xliff:g id="NUMBER">%1$s</xliff:g> is geblokkeerd en de oproep wordt gemeld als spam."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"De oproep van <xliff:g id="NUMBER">%1$s</xliff:g> wordt niet gemeld als spam."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"Tik om contacten toe te voegen of om dit spamnummer te blokkeren."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"Dit is de eerste keer dat je bent gebeld door dit nummer. Als deze oproep spam is, kun je dit nummer blokkeren en melden."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"Tik om te melden als GEEN SPAM of om te blokkeren."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"We hebben dit nummer aangemerkt als spam. Als deze oproep geen spam was, tik je op GEEN SPAM om onze fout te melden."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"Blokkeren en melden"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"Contact toevoegen"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"Geen spam"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"Nummer blokkeren"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"Toevoegen aan contacten"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"Blokkeren en spam melden"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"Geen spam"</string>
-    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"Weigeren"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="non_spam_notification_title">Ken je %1$s?</string>
+  <string name="spam_notification_title">Was %1$s een spambeller?</string>
+  <string name="spam_notification_block_report_toast_text">%1$s is geblokkeerd en de oproep wordt gemeld als spam.</string>
+  <string name="spam_notification_not_spam_toast_text">De oproep van %1$s wordt niet gemeld als spam.</string>
+  <string name="spam_notification_non_spam_call_collapsed_text">Tik om contacten toe te voegen of om dit spamnummer te blokkeren.</string>
+  <string name="spam_notification_non_spam_call_expanded_text">Dit is de eerste keer dat je bent gebeld door dit nummer. Als deze oproep spam is, kun je dit nummer blokkeren en melden.</string>
+  <string name="spam_notification_spam_call_collapsed_text">Tik om dit gesprek te melden als GEEN SPAM of om het te blokkeren</string>
+  <string name="spam_notification_report_spam_action_text">Blokkeren en melden</string>
+  <string name="spam_notification_add_contact_action_text">Contact toevoegen</string>
+  <string name="spam_notification_dialog_add_contact_action_text">Toevoegen aan contacten</string>
+  <string name="spam_notification_dialog_block_report_spam_action_text">Blokkeren en spam melden</string>
+  <string name="spam_notification_was_not_spam_action_text">Nee, geen spam</string>
+  <string name="spam_notification_block_spam_action_text">Ja, nummer blokkeren</string>
+  <string name="spam_notification_action_dismiss">Sluiten</string>
 </resources>
diff --git a/java/com/android/incallui/spam/res/values-no/strings.xml b/java/com/android/incallui/spam/res/values-no/strings.xml
index b8d6a84..697000c 100644
--- a/java/com/android/incallui/spam/res/values-no/strings.xml
+++ b/java/com/android/incallui/spam/res/values-no/strings.xml
@@ -1,36 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="non_spam_notification_title" msgid="2599384745904934400">"Kjenner du <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="spam_notification_title" msgid="609838099069629476">"Tilhører <xliff:g id="NUMBER">%1$s</xliff:g> en useriøs oppringer?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"<xliff:g id="NUMBER">%1$s</xliff:g> ble blokkert, og anropet ble rapportert som useriøst."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"Anropet fra <xliff:g id="NUMBER">%1$s</xliff:g> ble rapportert som ikke useriøst."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"Trykk for å legge til kontakter eller blokkere det useriøse nummeret."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"Dette er den første gangen du blir oppringt fra dette nummeret. Hvis dette anropet var useriøst, kan du blokkere nummeret og rapportere det."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"Trykk for å rapportere nummeret som IKKE USERIØST eller blokkere det."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"Vi tror at dette var en useriøs oppringer. Hvis anropet ikke var useriøst, trykk på IKKE USERIØST for å melde fra om at vi tar feil."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"Blokkér og rapportér"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"Legg til kontakt"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"Ikke useriøs"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"Blokkér nummeret"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"Legg til i kontakter"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"Blokkér og rapportér som useriøst"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"Ikke useriøs"</string>
-    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"Avslå"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="non_spam_notification_title">Kjenner du %1$s?</string>
+  <string name="spam_notification_title">Var %1$s en useriøs oppringer?</string>
+  <string name="spam_notification_block_report_toast_text">%1$s ble blokkert, og anropet ble rapportert som useriøst.</string>
+  <string name="spam_notification_not_spam_toast_text">Anropet fra %1$s ble rapportert som ikke useriøst.</string>
+  <string name="spam_notification_non_spam_call_collapsed_text">Trykk for å legge til kontakter eller blokkere det useriøse nummeret.</string>
+  <string name="spam_notification_non_spam_call_expanded_text">Dette er den første gangen du blir oppringt fra dette nummeret. Hvis dette anropet var useriøst, kan du blokkere nummeret og rapportere det.</string>
+  <string name="spam_notification_spam_call_collapsed_text">Trykk for å rapportere nummeret som ikke useriøst eller blokkere det.</string>
+  <string name="spam_notification_report_spam_action_text">Blokkér og rapportér</string>
+  <string name="spam_notification_add_contact_action_text">Legg til kontakt</string>
+  <string name="spam_notification_dialog_add_contact_action_text">Legg til i kontakter</string>
+  <string name="spam_notification_dialog_block_report_spam_action_text">Blokkér og rapportér som useriøst</string>
+  <string name="spam_notification_was_not_spam_action_text">Nei, ikke useriøst</string>
+  <string name="spam_notification_block_spam_action_text">Ja, blokkér nummeret</string>
+  <string name="spam_notification_action_dismiss">Lukk</string>
 </resources>
diff --git a/java/com/android/incallui/spam/res/values-pa/strings.xml b/java/com/android/incallui/spam/res/values-pa/strings.xml
index b375d86..c9dc4c0 100644
--- a/java/com/android/incallui/spam/res/values-pa/strings.xml
+++ b/java/com/android/incallui/spam/res/values-pa/strings.xml
@@ -1,36 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="non_spam_notification_title" msgid="2599384745904934400">"ਕੀ <xliff:g id="NUMBER">%1$s</xliff:g> ਨੂੰ ਜਾਣਦੇ ਹੋ?"</string>
-    <string name="spam_notification_title" msgid="609838099069629476">"ਕੀ <xliff:g id="NUMBER">%1$s</xliff:g> ਸਪੈਮ ਹੈ?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"<xliff:g id="NUMBER">%1$s</xliff:g> ਨੂੰ ਬਲੌਕ ਕੀਤਾ ਅਤੇ ਕਾਲ ਸਪੈਮ ਵਜੋਂ ਰਿਪੋਰਟ ਕੀਤੀ ਗਈ।"</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"<xliff:g id="NUMBER">%1$s</xliff:g> ਤੋਂ ਕਾਲ ਸਪੈਮ ਨਹੀਂ ਵਜੋਂ ਰਿਪੋਰਟ ਕੀਤੀ ਗਈ।"</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"ਸੰਪਰਕਾਂ ਵਿੱਚ ਸ਼ਾਮਲ ਕਰਨ ਜਾਂ ਸਪੈਮ ਨੰਬਰ ਨੂੰ ਬਲੌਕ ਕਰਨ ਲਈ ਟੈਪ ਕਰੋ।"</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"ਇਸ ਨੰਬਰ ਤੋਂ ਤੁਹਾਨੂੰ ਪਹਿਲੀ ਵਾਰ ਤੁਹਾਨੂੰ ਕਾਲ ਆਈ ਹੈ, ਜੇਕਰ ਇਹ ਕਾਲ ਸਪੈਮ ਸੀ, ਤਾਂ ਤੁਸੀਂ ਇਹ ਨੰਬਰ ਬਲੌਕ ਕਰ ਸਕਦੇ ਹੋ ਅਤੇ ਇਸਦੀ ਰਿਪੋਰਟ ਕਰ ਸਕਦੇ ਹੋ।"</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"ਸਪੈਮ ਨਹੀਂ ਵਜੋਂ ਰਿਪੋਰਟ ਕਰਨ ਲਈ, ਜਾਂ ਇਸ ਨੂੰ ਬਲੌਕ ਕਰਨ ਲਈ ਟੈਪ ਕਰੋ।"</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"ਸਾਨੂੰ ਇਹ ਕਾਲ ਸਪੈਮਰ ਲੱਗ ਰਹੀ ਸੀ। ਜੇਕਰ ਇਹ ਕਾਲ ਸਪੈਮ ਨਹੀਂ ਸੀ, ਤਾਂ ਸਾਡੀ ਗਲਤੀ ਦੀ ਰਿਪੋਰਟ ਕਰਨ ਲਈ ਸਪੈਮ ਨਹੀਂ \'ਤੇ ਟੈਪ ਕਰੋ।"</string>
-    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"ਬਲੌਕ ਕਰੋ ਅਤੇ ਰਿਪੋਰਟ ਕਰੋ"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"ਸੰਪਰਕ ਸ਼ਾਮਲ ਕਰੋ"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"ਸਪੈਮ ਨਹੀਂ"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"ਨੰਬਰ ਬਲੌਕ ਕਰੋ"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"ਸੰਪਰਕਾਂ ਵਿੱਚ ਸ਼ਾਮਲ ਕਰੋ"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"ਸਪੈਮ ਨੂੰ ਬਲੌਕ ਕਰੋ ਅਤੇ ਇਸਦੀ ਰਿਪੋਰਟ ਕਰੋ"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"ਸਪੈਮ ਨਹੀਂ"</string>
-    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"ਅਸਵੀਕਾਰ ਕਰੋ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="non_spam_notification_title">ਕੀ %1$s ਨੂੰ ਜਾਣਦੇ ਹੋ?</string>
+  <string name="spam_notification_title">ਕੀ %1$s ਸਪੈਮ ਕਾਲਰ ਸੀ?</string>
+  <string name="spam_notification_block_report_toast_text">%1$s ਨੂੰ ਬਲੌਕ ਕੀਤਾ ਅਤੇ ਕਾਲ ਸਪੈਮ ਵਜੋਂ ਰਿਪੋਰਟ ਕੀਤੀ ਗਈ।</string>
+  <string name="spam_notification_not_spam_toast_text">%1$s ਤੋਂ ਕਾਲ ਸਪੈਮ ਨਹੀਂ ਵਜੋਂ ਰਿਪੋਰਟ ਕੀਤੀ ਗਈ।</string>
+  <string name="spam_notification_non_spam_call_collapsed_text">ਸੰਪਰਕਾਂ ਵਿੱਚ ਸ਼ਾਮਲ ਕਰਨ ਜਾਂ ਸਪੈਮ ਨੰਬਰ ਨੂੰ ਬਲੌਕ ਕਰਨ ਲਈ ਟੈਪ ਕਰੋ।</string>
+  <string name="spam_notification_non_spam_call_expanded_text">ਇਸ ਨੰਬਰ ਤੋਂ ਤੁਹਾਨੂੰ ਪਹਿਲੀ ਵਾਰ ਤੁਹਾਨੂੰ ਕਾਲ ਆਈ ਹੈ, ਜੇਕਰ ਇਹ ਕਾਲ ਸਪੈਮ ਸੀ, ਤਾਂ ਤੁਸੀਂ ਇਹ ਨੰਬਰ ਬਲੌਕ ਕਰ ਸਕਦੇ ਹੋ ਅਤੇ ਇਸਦੀ ਰਿਪੋਰਟ ਕਰ ਸਕਦੇ ਹੋ।</string>
+  <string name="spam_notification_spam_call_collapsed_text">ਸਪੈਮ ਨਹੀਂ ਵਜੋਂ ਰਿਪੋਰਟ ਕਰਨ ਜਾਂ ਇਸ ਨੂੰ ਬਲਾਕ ਕਰਨ ਲਈ ਟੈਪ ਕਰੋ</string>
+  <string name="spam_notification_report_spam_action_text">ਬਲੌਕ ਕਰੋ ਅਤੇ ਰਿਪੋਰਟ ਕਰੋ</string>
+  <string name="spam_notification_add_contact_action_text">ਸੰਪਰਕ ਸ਼ਾਮਲ ਕਰੋ</string>
+  <string name="spam_notification_dialog_add_contact_action_text">ਸੰਪਰਕਾਂ ਵਿੱਚ ਸ਼ਾਮਲ ਕਰੋ</string>
+  <string name="spam_notification_dialog_block_report_spam_action_text">ਸਪੈਮ ਨੂੰ ਬਲੌਕ ਕਰੋ ਅਤੇ ਇਸਦੀ ਰਿਪੋਰਟ ਕਰੋ</string>
+  <string name="spam_notification_was_not_spam_action_text">ਨਹੀਂ, ਸਪੈਮ ਕਾਲ ਨਹੀਂ</string>
+  <string name="spam_notification_block_spam_action_text">ਹਾਂ, ਨੰਬਰ ਬਲਾਕ ਕਰੋ</string>
+  <string name="spam_notification_action_dismiss">ਖਾਰਜ ਕਰੋ</string>
 </resources>
diff --git a/java/com/android/incallui/spam/res/values-pl/strings.xml b/java/com/android/incallui/spam/res/values-pl/strings.xml
index 72d4ed0..bf15192 100644
--- a/java/com/android/incallui/spam/res/values-pl/strings.xml
+++ b/java/com/android/incallui/spam/res/values-pl/strings.xml
@@ -1,36 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="non_spam_notification_title" msgid="2599384745904934400">"Znasz numer <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="spam_notification_title" msgid="609838099069629476">"Czy połączenie z numeru <xliff:g id="NUMBER">%1$s</xliff:g> to spam?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"Numer <xliff:g id="NUMBER">%1$s</xliff:g> został zablokowany, a połączenie zgłoszone jako spam."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"Połączenie z numeru <xliff:g id="NUMBER">%1$s</xliff:g> zostało zgłoszone jako niebędące spamem."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"Kliknij, aby dodać do kontaktów lub zablokować jako spam."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"To pierwsze połączenie z tego numeru. Jeśli to spam, możesz zablokować ten numer i zgłosić go."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"Kliknij, aby zgłosić to połączenie jako NIEBĘDĄCE SPAMEM lub zablokować je."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"Podejrzewamy, że to spam. Jeśli to połączenie nie było spamem, kliknij TO NIE SPAM, aby zgłosić naszą pomyłkę."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"Zablokuj i zgłoś"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"Dodaj kontakt"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"To nie spam"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"Zablokuj numer"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"Dodaj do kontaktów"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"Zablokuj i zgłoś spam"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"To nie spam"</string>
-    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"Odrzuć"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="non_spam_notification_title">Znasz numer %1$s?</string>
+  <string name="spam_notification_title">Czy połączenie z numeru %1$s to spam?</string>
+  <string name="spam_notification_block_report_toast_text">Numer %1$s został zablokowany, a połączenie zgłoszone jako spam.</string>
+  <string name="spam_notification_not_spam_toast_text">Połączenie z numeru %1$s zostało zgłoszone jako niebędące spamem.</string>
+  <string name="spam_notification_non_spam_call_collapsed_text">Kliknij, aby dodać do kontaktów lub zablokować jako spam.</string>
+  <string name="spam_notification_non_spam_call_expanded_text">To pierwsze połączenie z tego numeru. Jeśli to spam, możesz zablokować ten numer i zgłosić go.</string>
+  <string name="spam_notification_spam_call_collapsed_text">Kliknij, aby zgłosić to połączenie jako niebędące spamem lub zablokować je</string>
+  <string name="spam_notification_report_spam_action_text">Zablokuj i zgłoś</string>
+  <string name="spam_notification_add_contact_action_text">Dodaj kontakt</string>
+  <string name="spam_notification_dialog_add_contact_action_text">Dodaj do kontaktów</string>
+  <string name="spam_notification_dialog_block_report_spam_action_text">Zablokuj i zgłoś spam</string>
+  <string name="spam_notification_was_not_spam_action_text">To nie spam</string>
+  <string name="spam_notification_block_spam_action_text">Tak, zablokuj numer</string>
+  <string name="spam_notification_action_dismiss">Odrzuć</string>
 </resources>
diff --git a/java/com/android/incallui/spam/res/values-pt-rBR/strings.xml b/java/com/android/incallui/spam/res/values-pt-rBR/strings.xml
index 1b119d8..79810fa 100644
--- a/java/com/android/incallui/spam/res/values-pt-rBR/strings.xml
+++ b/java/com/android/incallui/spam/res/values-pt-rBR/strings.xml
@@ -1,36 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="non_spam_notification_title" msgid="2599384745904934400">"Você conhece o número <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="spam_notification_title" msgid="609838099069629476">"O número <xliff:g id="NUMBER">%1$s</xliff:g> é spam?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"O número <xliff:g id="NUMBER">%1$s</xliff:g> foi bloqueado, e a chamada foi denunciada como spam."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"A chamada do número <xliff:g id="NUMBER">%1$s</xliff:g> foi informada como não sendo spam."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"Toque para adicionar aos contatos ou bloquear o número do spam."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"Esta é a primeira vez que este número ligou para você. Se a chamada for spam, você poderá bloquear o número e denunciá-lo."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"Toque para informar que NÃO É SPAM ou bloquear."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"Suspeitamos que esta chamada seja de um criador de spams. Se não for, toque em NÃO É SPAM para informar que erramos."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"Bloquear e denunciar"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"Adicionar contato"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"Não é spam"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"Bloquear número"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"Adicionar aos contatos"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"Bloquear e denunciar spam"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"Não é spam"</string>
-    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"Recusar"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="non_spam_notification_title">Você conhece o número %1$s?</string>
+  <string name="spam_notification_title">A chamada do número %1$s era spam?</string>
+  <string name="spam_notification_block_report_toast_text">O número %1$s foi bloqueado, e a chamada foi denunciada como spam.</string>
+  <string name="spam_notification_not_spam_toast_text">A chamada do número %1$s foi informada como não sendo spam.</string>
+  <string name="spam_notification_non_spam_call_collapsed_text">Toque para adicionar aos contatos ou bloquear o número do spam.</string>
+  <string name="spam_notification_non_spam_call_expanded_text">Esta é a primeira vez que este número ligou para você. Se a chamada for spam, você poderá bloquear o número e denunciá-lo.</string>
+  <string name="spam_notification_spam_call_collapsed_text">Toque para informar que não é spam ou bloquear</string>
+  <string name="spam_notification_report_spam_action_text">Bloquear e denunciar</string>
+  <string name="spam_notification_add_contact_action_text">Adicionar contato</string>
+  <string name="spam_notification_dialog_add_contact_action_text">Adicionar aos contatos</string>
+  <string name="spam_notification_dialog_block_report_spam_action_text">Bloquear e denunciar spam</string>
+  <string name="spam_notification_was_not_spam_action_text">Não é spam</string>
+  <string name="spam_notification_block_spam_action_text">Sim, bloquear o número</string>
+  <string name="spam_notification_action_dismiss">Dispensar</string>
 </resources>
diff --git a/java/com/android/incallui/spam/res/values-pt-rPT/strings.xml b/java/com/android/incallui/spam/res/values-pt-rPT/strings.xml
index e7d9153..b748032 100644
--- a/java/com/android/incallui/spam/res/values-pt-rPT/strings.xml
+++ b/java/com/android/incallui/spam/res/values-pt-rPT/strings.xml
@@ -1,36 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="non_spam_notification_title" msgid="2599384745904934400">"Conhece <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="spam_notification_title" msgid="609838099069629476">"O número <xliff:g id="NUMBER">%1$s</xliff:g> é considerado spam?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"O número <xliff:g id="NUMBER">%1$s</xliff:g> foi bloqueado e a chamada foi denunciada como spam."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"A chamada de <xliff:g id="NUMBER">%1$s</xliff:g> não é considerada spam."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"Toque para adicionar aos contactos ou bloquear um número considerado spam."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"É a primeira vez que este número lhe liga. Se esta chamada foi considerada spam, pode bloquear o número e denunciá-lo."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"Toque para denunciar como NÃO É SPAM ou para bloquear."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"Suspeitamos que esta chamada seja de um spammer. Se esta chamada não foi considerada spam, toque em NÃO É SPAM para denunciar o nosso erro."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"Bloquear e denunciar"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"Adicionar contacto"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"Não é spam"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"Bloquear número"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"Adicionar aos contactos"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"Bloquear e denunciar como spam"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"Não é spam"</string>
-    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"Recusar"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="non_spam_notification_title">Conhece %1$s?</string>
+  <string name="spam_notification_title">A chamada de %1$s foi spam?</string>
+  <string name="spam_notification_block_report_toast_text">O número %1$s foi bloqueado e a chamada foi denunciada como spam.</string>
+  <string name="spam_notification_not_spam_toast_text">A chamada de %1$s não é considerada spam.</string>
+  <string name="spam_notification_non_spam_call_collapsed_text">Toque para adicionar aos contactos ou bloquear um número considerado spam.</string>
+  <string name="spam_notification_non_spam_call_expanded_text">É a primeira vez que este número lhe liga. Se esta chamada foi considerada spam, pode bloquear o número e denunciá-lo.</string>
+  <string name="spam_notification_spam_call_collapsed_text">Toque para denunciar como não sendo spam ou para bloquear</string>
+  <string name="spam_notification_report_spam_action_text">Bloquear e denunciar</string>
+  <string name="spam_notification_add_contact_action_text">Adicionar contacto</string>
+  <string name="spam_notification_dialog_add_contact_action_text">Adicionar aos contactos</string>
+  <string name="spam_notification_dialog_block_report_spam_action_text">Bloquear e denunciar como spam</string>
+  <string name="spam_notification_was_not_spam_action_text">Não, não é spam</string>
+  <string name="spam_notification_block_spam_action_text">Sim, bloquear número</string>
+  <string name="spam_notification_action_dismiss">Ignorar</string>
 </resources>
diff --git a/java/com/android/incallui/spam/res/values-pt/strings.xml b/java/com/android/incallui/spam/res/values-pt/strings.xml
index 1b119d8..79810fa 100644
--- a/java/com/android/incallui/spam/res/values-pt/strings.xml
+++ b/java/com/android/incallui/spam/res/values-pt/strings.xml
@@ -1,36 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="non_spam_notification_title" msgid="2599384745904934400">"Você conhece o número <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="spam_notification_title" msgid="609838099069629476">"O número <xliff:g id="NUMBER">%1$s</xliff:g> é spam?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"O número <xliff:g id="NUMBER">%1$s</xliff:g> foi bloqueado, e a chamada foi denunciada como spam."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"A chamada do número <xliff:g id="NUMBER">%1$s</xliff:g> foi informada como não sendo spam."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"Toque para adicionar aos contatos ou bloquear o número do spam."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"Esta é a primeira vez que este número ligou para você. Se a chamada for spam, você poderá bloquear o número e denunciá-lo."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"Toque para informar que NÃO É SPAM ou bloquear."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"Suspeitamos que esta chamada seja de um criador de spams. Se não for, toque em NÃO É SPAM para informar que erramos."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"Bloquear e denunciar"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"Adicionar contato"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"Não é spam"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"Bloquear número"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"Adicionar aos contatos"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"Bloquear e denunciar spam"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"Não é spam"</string>
-    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"Recusar"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="non_spam_notification_title">Você conhece o número %1$s?</string>
+  <string name="spam_notification_title">A chamada do número %1$s era spam?</string>
+  <string name="spam_notification_block_report_toast_text">O número %1$s foi bloqueado, e a chamada foi denunciada como spam.</string>
+  <string name="spam_notification_not_spam_toast_text">A chamada do número %1$s foi informada como não sendo spam.</string>
+  <string name="spam_notification_non_spam_call_collapsed_text">Toque para adicionar aos contatos ou bloquear o número do spam.</string>
+  <string name="spam_notification_non_spam_call_expanded_text">Esta é a primeira vez que este número ligou para você. Se a chamada for spam, você poderá bloquear o número e denunciá-lo.</string>
+  <string name="spam_notification_spam_call_collapsed_text">Toque para informar que não é spam ou bloquear</string>
+  <string name="spam_notification_report_spam_action_text">Bloquear e denunciar</string>
+  <string name="spam_notification_add_contact_action_text">Adicionar contato</string>
+  <string name="spam_notification_dialog_add_contact_action_text">Adicionar aos contatos</string>
+  <string name="spam_notification_dialog_block_report_spam_action_text">Bloquear e denunciar spam</string>
+  <string name="spam_notification_was_not_spam_action_text">Não é spam</string>
+  <string name="spam_notification_block_spam_action_text">Sim, bloquear o número</string>
+  <string name="spam_notification_action_dismiss">Dispensar</string>
 </resources>
diff --git a/java/com/android/incallui/spam/res/values-ro/strings.xml b/java/com/android/incallui/spam/res/values-ro/strings.xml
index fa1a0d1..775c3f9 100644
--- a/java/com/android/incallui/spam/res/values-ro/strings.xml
+++ b/java/com/android/incallui/spam/res/values-ro/strings.xml
@@ -1,36 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="non_spam_notification_title" msgid="2599384745904934400">"Cunoașteți numărul <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="spam_notification_title" msgid="609838099069629476">"Este numărul <xliff:g id="NUMBER">%1$s</xliff:g> spam?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"<xliff:g id="NUMBER">%1$s</xliff:g> a fost blocat și apelul a fost raportat ca spam."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"Apelul primit de la <xliff:g id="NUMBER">%1$s</xliff:g> a fost raportat ca nefiind spam."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"Atingeți pentru a adăuga numărul în agendă sau pentru a-l raporta ca spam și a-l bloca."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"Aceasta este prima dată când ați primit apel de la acest număr. Dacă apelul a fost spam, puteți să blocați numărul și să îl raportați."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"Atingeți pentru a raporta ca NU ESTE SPAM sau blocați-l."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"Am suspectat acest număr ca fiind autor de spam. Dacă apelul nu a fost spam, atingeți NU ESTE SPAM pentru a raporta greșeala noastră."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"Blocați și raportați"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"Adăugați o persoană"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"Nu este spam"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"Blocați numărul"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"Adăugați în agendă"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"Blocați și raportați spam"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"Nu este spam"</string>
-    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"Refuzați"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="non_spam_notification_title">Cunoașteți numărul %1$s?</string>
+  <string name="spam_notification_title">%1$s a fost un apel spam?</string>
+  <string name="spam_notification_block_report_toast_text">%1$s a fost blocat și apelul a fost raportat ca spam.</string>
+  <string name="spam_notification_not_spam_toast_text">Apelul primit de la %1$s a fost raportat ca nefiind spam.</string>
+  <string name="spam_notification_non_spam_call_collapsed_text">Atingeți pentru a adăuga numărul în agendă sau pentru a-l raporta ca spam și a-l bloca.</string>
+  <string name="spam_notification_non_spam_call_expanded_text">Aceasta este prima dată când ați primit apel de la acest număr. Dacă apelul a fost spam, puteți să blocați numărul și să îl raportați.</string>
+  <string name="spam_notification_spam_call_collapsed_text">Atingeți pentru a raporta ca nu este spam sau blocați-l.</string>
+  <string name="spam_notification_report_spam_action_text">Blocați și raportați</string>
+  <string name="spam_notification_add_contact_action_text">Adăugați o persoană</string>
+  <string name="spam_notification_dialog_add_contact_action_text">Adăugați în agendă</string>
+  <string name="spam_notification_dialog_block_report_spam_action_text">Blocați și raportați spam</string>
+  <string name="spam_notification_was_not_spam_action_text">Nu, nu este spam</string>
+  <string name="spam_notification_block_spam_action_text">Da, blochează numărul</string>
+  <string name="spam_notification_action_dismiss">Închideți</string>
 </resources>
diff --git a/java/com/android/incallui/spam/res/values-ru/strings.xml b/java/com/android/incallui/spam/res/values-ru/strings.xml
index beeaf6d..a949de3 100644
--- a/java/com/android/incallui/spam/res/values-ru/strings.xml
+++ b/java/com/android/incallui/spam/res/values-ru/strings.xml
@@ -1,36 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="non_spam_notification_title" msgid="2599384745904934400">"Вы знаете, кому принадлежит номер <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="spam_notification_title" msgid="609838099069629476">"Номер <xliff:g id="NUMBER">%1$s</xliff:g> использовался для распространения спама?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"Номер <xliff:g id="NUMBER">%1$s</xliff:g> заблокирован. Вы сообщили, что вызов использовался для распространения спама."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"Вы сообщили, что вызов с номера <xliff:g id="NUMBER">%1$s</xliff:g> не использовался для распространения спама"</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"Нажмите, чтобы добавить номер в контакты или заблокировать его за распространение спама."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"Это был первый вызов с указанного номера. Если он использовался для распространения спама, вы можете сообщить об этом и заблокировать этот номер."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"Нажмите, чтобы сообщить, что это был НЕ СПАМ, или заблокируйте номер."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"Мы подозреваем, что этот вызов использовался для распространения спама. Если это не так, нажмите НЕ СПАМ, чтобы сообщить нам об ошибке."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"Блокировать/сообщить"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"Добавить в контакты"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"Не спам"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"Заблокировать номер"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"Добавить в контакты"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"Заблокировать и сообщить о спаме"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"Не спам"</string>
-    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"Отклонить"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="non_spam_notification_title">Вы знаете, кому принадлежит номер %1$s?</string>
+  <string name="spam_notification_title">Вызов с номера %1$s: это был спам?</string>
+  <string name="spam_notification_block_report_toast_text">Номер %1$s заблокирован. Вы сообщили, что вызов использовался для распространения спама.</string>
+  <string name="spam_notification_not_spam_toast_text">Вы сообщили, что вызов с номера %1$s не использовался для распространения спама</string>
+  <string name="spam_notification_non_spam_call_collapsed_text">Нажмите, чтобы добавить номер в контакты или заблокировать его за распространение спама.</string>
+  <string name="spam_notification_non_spam_call_expanded_text">Это был первый вызов с указанного номера. Если он использовался для распространения спама, вы можете сообщить об этом и заблокировать этот номер.</string>
+  <string name="spam_notification_spam_call_collapsed_text">Нажмите, чтобы сообщить, что это не спам, или заблокировать номер</string>
+  <string name="spam_notification_report_spam_action_text">Блокировать/сообщить</string>
+  <string name="spam_notification_add_contact_action_text">Добавить в контакты</string>
+  <string name="spam_notification_dialog_add_contact_action_text">Добавить в контакты</string>
+  <string name="spam_notification_dialog_block_report_spam_action_text">Заблокировать и сообщить о спаме</string>
+  <string name="spam_notification_was_not_spam_action_text">Это не спам</string>
+  <string name="spam_notification_block_spam_action_text">Заблокировать номер</string>
+  <string name="spam_notification_action_dismiss">Закрыть</string>
 </resources>
diff --git a/java/com/android/incallui/spam/res/values-si/strings.xml b/java/com/android/incallui/spam/res/values-si/strings.xml
index df7eb3c..a991afa 100644
--- a/java/com/android/incallui/spam/res/values-si/strings.xml
+++ b/java/com/android/incallui/spam/res/values-si/strings.xml
@@ -1,36 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="non_spam_notification_title" msgid="2599384745904934400">"<xliff:g id="NUMBER">%1$s</xliff:g> දන්නවද?"</string>
-    <string name="spam_notification_title" msgid="609838099069629476">"<xliff:g id="NUMBER">%1$s</xliff:g> අංකය අයාචිතද?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"<xliff:g id="NUMBER">%1$s</xliff:g> අවහිර කර ඇමතුම අයාචිත ලෙස ලකුණු කර ඇත."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"<xliff:g id="NUMBER">%1$s</xliff:g> අංකයෙන් ඇමතුම අයාචිත නැති ලෙස වාර්තා කරන ලදී."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"සම්බන්ධතාවලට එක් කිරීමට හෝ අයාචිත අංක අවහිර කිරීමට තට්ටු කරන්න."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"මෙම අංකය ඔබට අමතන ලද පළමු අවස්ථාව මෙයයි. මෙම ඇමතුම අයාචිත නම්, ඔබට මෙම අංකය අවහිර කර ඒ පිළිබඳ පැමිණිලි කළ හැකිය."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"එය අයාචිත නැති ලෙස වාර්තා කිරීමට හෝ අවහිර කිරීමට තට්ටු කරන්න."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"අපි මෙය අයාචිත තැපැල් යවන්නකු බවට සැක කළෙමු. මෙම ඇමතුම අයාචිත නොවුනේ නම්, අපේ අත්වැරැද්ද වාර්තා කිරීමට අයාචිත නැති ලෙස තට්ටු කරන්න."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"අවහිර කර වාර්තා කර."</string>
-    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"සම්බන්ධතාව එක් කරන්න"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"අයාචිත තැපෑලක් නොවේ"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"අංකය අවහිර කරන්න"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"සම්බන්ධතාවලට එක් කරන්න"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"අයාචිත තැපැල් අවහිර කර වාර්තා කරන්න"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"අයාචිත තැපෑලක් නොවේ"</string>
-    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"ප්‍රතික්ෂේප කරන්න"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="non_spam_notification_title">%1$s දන්නවද?</string>
+  <string name="spam_notification_title">%1$s අයාචිත අමතන්නෙක් වූයේද?</string>
+  <string name="spam_notification_block_report_toast_text">%1$s අවහිර කර ඇමතුම අයාචිත ලෙස ලකුණු කර ඇත.</string>
+  <string name="spam_notification_not_spam_toast_text">%1$s අංකයෙන් ඇමතුම අයාචිත නැති ලෙස වාර්තා කරන ලදී.</string>
+  <string name="spam_notification_non_spam_call_collapsed_text">සම්බන්ධතාවලට එක් කිරීමට හෝ අයාචිත අංක අවහිර කිරීමට තට්ටු කරන්න.</string>
+  <string name="spam_notification_non_spam_call_expanded_text">මෙම අංකය ඔබට අමතන ලද පළමු අවස්ථාව මෙයයි. මෙම ඇමතුම අයාචිත නම්, ඔබට මෙම අංකය අවහිර කර ඒ පිළිබඳ පැමිණිලි කළ හැකිය.</string>
+  <string name="spam_notification_spam_call_collapsed_text">එය අයාචිත නැති ලෙස වාර්තා කිරීමට හෝ අවහිර කිරීමට තට්ටු කරන්න</string>
+  <string name="spam_notification_report_spam_action_text">අවහිර කර වාර්තා කර.</string>
+  <string name="spam_notification_add_contact_action_text">සම්බන්ධතාව එක් කරන්න</string>
+  <string name="spam_notification_dialog_add_contact_action_text">සම්බන්ධතාවලට එක් කරන්න</string>
+  <string name="spam_notification_dialog_block_report_spam_action_text">අයාචිත තැපැල් අවහිර කර වාර්තා කරන්න</string>
+  <string name="spam_notification_was_not_spam_action_text">නැත, අයාචිත නොවේ</string>
+  <string name="spam_notification_block_spam_action_text">ඔව්, අංකය අවහිර කරන්න</string>
+  <string name="spam_notification_action_dismiss">ඉවතලන්න</string>
 </resources>
diff --git a/java/com/android/incallui/spam/res/values-sk/strings.xml b/java/com/android/incallui/spam/res/values-sk/strings.xml
index 7334171..bd9aaa5 100644
--- a/java/com/android/incallui/spam/res/values-sk/strings.xml
+++ b/java/com/android/incallui/spam/res/values-sk/strings.xml
@@ -1,36 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="non_spam_notification_title" msgid="2599384745904934400">"Poznáte číslo <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="spam_notification_title" msgid="609838099069629476">"Je číslo <xliff:g id="NUMBER">%1$s</xliff:g> spam?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"Číslo <xliff:g id="NUMBER">%1$s</xliff:g> bolo zablokované a hovor bol nahlásený ako spam."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"Hovor z čísla <xliff:g id="NUMBER">%1$s</xliff:g> bol nahlásený, že nie je spam."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"Klepnutím pridáte číslo medzi kontakty alebo zablokujte ako spam."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"Toto bol prvý hovor z tohto čísla. Ak bol tento hovor spam, môžete toto číslo zablokovať a nahlásiť ho."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"Klepnutím môžete nahlásiť, že číslo NIE JE SPAM, alebo ho môžete zablokovať."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"Mali sme podozrenie, že ide o šíriteľa spamu. Ak hovor nebol spam, klepnite na možnosť NIE JE SPAM a nahláste náš omyl."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"Blokovať a nahlásiť"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"Pridať kontakt"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"Nie je spam"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"Blokovať číslo"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"Pridať medzi kontakty"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"Blokovať a nahlásiť spam"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"Nie je spam"</string>
-    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"Odmietnuť"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="non_spam_notification_title">Poznáte číslo %1$s?</string>
+  <string name="spam_notification_title">Bol hovor z čísla %1$s spam?</string>
+  <string name="spam_notification_block_report_toast_text">Číslo %1$s bolo zablokované a hovor bol nahlásený ako spam.</string>
+  <string name="spam_notification_not_spam_toast_text">Hovor z čísla %1$s bol nahlásený, že nie je spam.</string>
+  <string name="spam_notification_non_spam_call_collapsed_text">Klepnutím pridáte číslo medzi kontakty alebo zablokujte ako spam.</string>
+  <string name="spam_notification_non_spam_call_expanded_text">Toto bol prvý hovor z tohto čísla. Ak bol tento hovor spam, môžete toto číslo zablokovať a nahlásiť ho.</string>
+  <string name="spam_notification_spam_call_collapsed_text">Klepnutím môžete nahlásiť, že číslo nie je spam, alebo ho môžete zablokovať</string>
+  <string name="spam_notification_report_spam_action_text">Blokovať a nahlásiť</string>
+  <string name="spam_notification_add_contact_action_text">Pridať kontakt</string>
+  <string name="spam_notification_dialog_add_contact_action_text">Pridať medzi kontakty</string>
+  <string name="spam_notification_dialog_block_report_spam_action_text">Blokovať a nahlásiť spam</string>
+  <string name="spam_notification_was_not_spam_action_text">Nie, nebol to spam</string>
+  <string name="spam_notification_block_spam_action_text">Áno, zablokovať číslo</string>
+  <string name="spam_notification_action_dismiss">Zrušiť</string>
 </resources>
diff --git a/java/com/android/incallui/spam/res/values-sl/strings.xml b/java/com/android/incallui/spam/res/values-sl/strings.xml
index a37ab4c..9e19a73 100644
--- a/java/com/android/incallui/spam/res/values-sl/strings.xml
+++ b/java/com/android/incallui/spam/res/values-sl/strings.xml
@@ -1,36 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="non_spam_notification_title" msgid="2599384745904934400">"Poznate številko <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="spam_notification_title" msgid="609838099069629476">"Ali je klic s številke <xliff:g id="NUMBER">%1$s</xliff:g> neželen?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"Številka <xliff:g id="NUMBER">%1$s</xliff:g> je blokirana, klic pa je bil prijavljen kot neželen."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"Klic s številke <xliff:g id="NUMBER">%1$s</xliff:g> ni več prijavljen kot neželen."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"Dotaknite se, da dodate med stike ali blokirate neželeno številko."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"Klic s te številke ste prejeli prvič. Če je bil ta klic neželen, lahko blokirate številko in jo prijavite."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"Dotaknite se, da klic prijavite kot »NI NEŽELENI KLIC« ali ga blokirate."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"Predvidevali smo, da je to neželeni klic. Če klic ni bil neželen, se dotaknite možnosti »NI NEŽELENI KLIC«, da prijavite našo napako."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"Blokiraj in prijavi"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"Dodaj stik"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"Ni neželeni klic"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"Blokiraj številko"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"Dodaj med stike"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"Blokiraj in prijavi neželeni klic"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"Ni neželeni klic"</string>
-    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"Zavrni"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="non_spam_notification_title">Poznate številko %1$s?</string>
+  <string name="spam_notification_title">Ali vas je s številke %1$s poklical neželeni klicatelj?</string>
+  <string name="spam_notification_block_report_toast_text">Številka %1$s je blokirana, klic pa je bil prijavljen kot neželen.</string>
+  <string name="spam_notification_not_spam_toast_text">Klic s številke %1$s ni več prijavljen kot neželen.</string>
+  <string name="spam_notification_non_spam_call_collapsed_text">Dotaknite se, da dodate med stike ali blokirate neželeno številko.</string>
+  <string name="spam_notification_non_spam_call_expanded_text">Klic s te številke ste prejeli prvič. Če je bil ta klic neželen, lahko blokirate številko in jo prijavite.</string>
+  <string name="spam_notification_spam_call_collapsed_text">Dotaknite se, da klic prijavite kot »ni neželeni klic« ali ga blokirate</string>
+  <string name="spam_notification_report_spam_action_text">Blokiraj in prijavi</string>
+  <string name="spam_notification_add_contact_action_text">Dodaj stik</string>
+  <string name="spam_notification_dialog_add_contact_action_text">Dodaj med stike</string>
+  <string name="spam_notification_dialog_block_report_spam_action_text">Blokiraj in prijavi neželeni klic</string>
+  <string name="spam_notification_was_not_spam_action_text">Ne, ni neželeni klic</string>
+  <string name="spam_notification_block_spam_action_text">Da, blokiraj številko</string>
+  <string name="spam_notification_action_dismiss">Opusti</string>
 </resources>
diff --git a/java/com/android/incallui/spam/res/values-sq/strings.xml b/java/com/android/incallui/spam/res/values-sq/strings.xml
index ace4be4..ac72c7f 100644
--- a/java/com/android/incallui/spam/res/values-sq/strings.xml
+++ b/java/com/android/incallui/spam/res/values-sq/strings.xml
@@ -1,36 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="non_spam_notification_title" msgid="2599384745904934400">"E njeh <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="spam_notification_title" msgid="609838099069629476">"A është <xliff:g id="NUMBER">%1$s</xliff:g> i padëshiruar?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"<xliff:g id="NUMBER">%1$s</xliff:g> u bllokua dhe telefonata u raportua si e padëshiruar."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"Telefonata nga <xliff:g id="NUMBER">%1$s</xliff:g> u raportua si e padëshiruar."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"Trokit për ta shtuar te kontaktet ose për të bllokuar numrin e padëshiruar."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"Kjo është hera e parë që ky numër ka telefonuar. Nëse telefonata ishte e padëshiruar, mund ta bllokosh këtë numër dhe ta raportosh."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"Trokit për ta raportuar si JO E PADËSHIRUAR ose ta bllokosh."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"Dyshojmë se është e padëshiruar. Nëse telefonata nuk është e padëshiruar, trokit JO E PADËSHIRUAR për të raportuar gabimin tonë."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"Blloko dhe raporto"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"Shto një kontakt"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"Nuk është postë e bezdisshme"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"Blloko numrin"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"Shto te kontaktet"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"Blloko dhe raporto si e padëshiruar"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"Nuk është postë e bezdisshme"</string>
-    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"Refuzo"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="non_spam_notification_title">E njeh %1$s?</string>
+  <string name="spam_notification_title">A ishte %1$s një telefonues i padëshiruar?</string>
+  <string name="spam_notification_block_report_toast_text">%1$s u bllokua dhe telefonata u raportua si e padëshiruar.</string>
+  <string name="spam_notification_not_spam_toast_text">Telefonata nga %1$s u raportua si e padëshiruar.</string>
+  <string name="spam_notification_non_spam_call_collapsed_text">Trokit për ta shtuar te kontaktet ose për të bllokuar numrin e padëshiruar.</string>
+  <string name="spam_notification_non_spam_call_expanded_text">Kjo është hera e parë që ky numër ka telefonuar. Nëse telefonata ishte e padëshiruar, mund ta bllokosh këtë numër dhe ta raportosh.</string>
+  <string name="spam_notification_spam_call_collapsed_text">Trokit për ta raportuar si jo të padëshiruar ose për ta bllokuar</string>
+  <string name="spam_notification_report_spam_action_text">Blloko dhe raporto</string>
+  <string name="spam_notification_add_contact_action_text">Shto një kontakt</string>
+  <string name="spam_notification_dialog_add_contact_action_text">Shto te kontaktet</string>
+  <string name="spam_notification_dialog_block_report_spam_action_text">Blloko dhe raporto si e padëshiruar</string>
+  <string name="spam_notification_was_not_spam_action_text">Jo, nuk ishte e padëshiruar</string>
+  <string name="spam_notification_block_spam_action_text">Po, bllokoje numrin</string>
+  <string name="spam_notification_action_dismiss">Hiq</string>
 </resources>
diff --git a/java/com/android/incallui/spam/res/values-sr/strings.xml b/java/com/android/incallui/spam/res/values-sr/strings.xml
index bd81b3c..3766b03 100644
--- a/java/com/android/incallui/spam/res/values-sr/strings.xml
+++ b/java/com/android/incallui/spam/res/values-sr/strings.xml
@@ -1,36 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="non_spam_notification_title" msgid="2599384745904934400">"Познат вам је број <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="spam_notification_title" msgid="609838099069629476">"Да ли је <xliff:g id="NUMBER">%1$s</xliff:g> непожељан?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"Блокирали сте <xliff:g id="NUMBER">%1$s</xliff:g>, а позив сте пријавили као непожељан."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"Пријавили сте да позив са <xliff:g id="NUMBER">%1$s</xliff:g> није непожељан."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"Додирните да бисте додали контакте или блокирали непожељан број."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"Први пут сте примили позив са овог броја. Ако је непожељан, можете да га блокирате и пријавите."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"Додирните да бисте пријавили да позив НИЈЕ НЕПОЖЕЉАН или блокирајте број."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"Сумњамо да је овај позив непожељан. Ако није, додирните НИЈЕ НЕПОЖЕЉАН да бисте пријавили грешку."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"Блокирај и пријави"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"Додај контакт"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"Није непожељан"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"Блокирај број"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"Додај у контакте"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"Блокирај и пријави непожељан позив"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"Није непожељан"</string>
-    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"Одбиј"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="non_spam_notification_title">Познат вам је број %1$s?</string>
+  <string name="spam_notification_title">Да ли вам је са %1$s упућен непожељан позив?</string>
+  <string name="spam_notification_block_report_toast_text">Блокирали сте %1$s, а позив сте пријавили као непожељан.</string>
+  <string name="spam_notification_not_spam_toast_text">Пријавили сте да позив са %1$s није непожељан.</string>
+  <string name="spam_notification_non_spam_call_collapsed_text">Додирните да бисте додали контакте или блокирали непожељан број.</string>
+  <string name="spam_notification_non_spam_call_expanded_text">Први пут сте примили позив са овог броја. Ако је непожељан, можете да га блокирате и пријавите.</string>
+  <string name="spam_notification_spam_call_collapsed_text">Додирните да бисте пријавили да позив није непожељан или блокирали број</string>
+  <string name="spam_notification_report_spam_action_text">Блокирај и пријави</string>
+  <string name="spam_notification_add_contact_action_text">Додај контакт</string>
+  <string name="spam_notification_dialog_add_contact_action_text">Додај у контакте</string>
+  <string name="spam_notification_dialog_block_report_spam_action_text">Блокирај и пријави непожељан позив</string>
+  <string name="spam_notification_was_not_spam_action_text">Не, није непожељан</string>
+  <string name="spam_notification_block_spam_action_text">Да, блокирај број</string>
+  <string name="spam_notification_action_dismiss">Одбаци</string>
 </resources>
diff --git a/java/com/android/incallui/spam/res/values-sv/strings.xml b/java/com/android/incallui/spam/res/values-sv/strings.xml
index 6a06a46..d950e44 100644
--- a/java/com/android/incallui/spam/res/values-sv/strings.xml
+++ b/java/com/android/incallui/spam/res/values-sv/strings.xml
@@ -1,36 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="non_spam_notification_title" msgid="2599384745904934400">"Känner du <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="spam_notification_title" msgid="609838099069629476">"Är <xliff:g id="NUMBER">%1$s</xliff:g> spam?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"<xliff:g id="NUMBER">%1$s</xliff:g> blockerat och samtalet rapporterat som spam."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"Samtal från <xliff:g id="NUMBER">%1$s</xliff:g> rapporterat som spam."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"Tryck för att lägga till kontakter eller blockera spamnummer."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"Det här var första gången det här numret ringde dig. Om det var spam går det att blockera numret och rapportera det."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"Tryck för att rapportera som INTE SPAM eller blockera det."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"Vi misstänkte att det är en spammare. Om det här samtalet inte var spam, tryck på INTE SPAM för att rapportera misstaget."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"Blockera, rapportera"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"Lägg till kontakt"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"Inte spam"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"Blockera nummer"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"Lägg till i Kontakter"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"Blockera och rapportera spam"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"Inte spam"</string>
-    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"Avvisa"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="non_spam_notification_title">Känner du %1$s?</string>
+  <string name="spam_notification_title">Var %1$s ett spamsamtal?</string>
+  <string name="spam_notification_block_report_toast_text">%1$s blockerat och samtalet rapporterat som spam.</string>
+  <string name="spam_notification_not_spam_toast_text">Samtal från %1$s rapporterat som spam.</string>
+  <string name="spam_notification_non_spam_call_collapsed_text">Tryck för att lägga till kontakter eller blockera spamnummer.</string>
+  <string name="spam_notification_non_spam_call_expanded_text">Det här var första gången det här numret ringde dig. Om det var spam går det att blockera numret och rapportera det.</string>
+  <string name="spam_notification_spam_call_collapsed_text">Tryck för att rapportera som inte spam eller blockera det</string>
+  <string name="spam_notification_report_spam_action_text">Blockera, rapportera</string>
+  <string name="spam_notification_add_contact_action_text">Lägg till kontakt</string>
+  <string name="spam_notification_dialog_add_contact_action_text">Lägg till i Kontakter</string>
+  <string name="spam_notification_dialog_block_report_spam_action_text">Blockera och rapportera spam</string>
+  <string name="spam_notification_was_not_spam_action_text">Nej, inte spam</string>
+  <string name="spam_notification_block_spam_action_text">Ja, blockera numret</string>
+  <string name="spam_notification_action_dismiss">Stäng</string>
 </resources>
diff --git a/java/com/android/incallui/spam/res/values-sw/strings.xml b/java/com/android/incallui/spam/res/values-sw/strings.xml
index bc2fdc5..3a3c692 100644
--- a/java/com/android/incallui/spam/res/values-sw/strings.xml
+++ b/java/com/android/incallui/spam/res/values-sw/strings.xml
@@ -1,36 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="non_spam_notification_title" msgid="2599384745904934400">"Je, unaitambua <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="spam_notification_title" msgid="609838099069629476">"Je, <xliff:g id="NUMBER">%1$s</xliff:g> ni taka?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"<xliff:g id="NUMBER">%1$s</xliff:g> imezuiwa na simu ikaripotiwa kuwa taka."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"Simu kutoka <xliff:g id="NUMBER">%1$s</xliff:g> imeripotiwa kuwa si taka."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"Gonga ili uongeze kwenye anwani au uzuie nambari taka."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"Hii ndiyo mara ya kwanza nambari hii imekupigia. Ikiwa ilikuwa simu taka, unaweza kuzuia nambari hii na uiripoti."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"Gonga ili uripoti kuwa SI TAKA, au kuizuia."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"Tunashuku kwamba simu hii ni taka. Ikiwa haikuwa simu taka, gonga SI TAKA ili usahihishe tulivyoichukulia."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"Zuia na uripoti"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"Ongeza anwani"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"Si taka"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"Zuia nambari"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"Ongeza kwenye anwani"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"Zuia na uripoti taka"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"Si taka"</string>
-    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"Kataa"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="non_spam_notification_title">Je, unaitambua %1$s?</string>
+  <string name="spam_notification_title">Je, %1$s alipiga simu taka?</string>
+  <string name="spam_notification_block_report_toast_text">%1$s imezuiwa na simu ikaripotiwa kuwa taka.</string>
+  <string name="spam_notification_not_spam_toast_text">Simu kutoka %1$s imeripotiwa kuwa si taka.</string>
+  <string name="spam_notification_non_spam_call_collapsed_text">Gusa ili uongeze kwenye anwani au uzuie nambari taka.</string>
+  <string name="spam_notification_non_spam_call_expanded_text">Hii ndiyo mara ya kwanza nambari hii imekupigia. Ikiwa ilikuwa simu taka, unaweza kuzuia nambari hii na uiripoti.</string>
+  <string name="spam_notification_spam_call_collapsed_text">Gusa ili uripoti kuwa si taka au uizuie</string>
+  <string name="spam_notification_report_spam_action_text">Zuia na uripoti</string>
+  <string name="spam_notification_add_contact_action_text">Ongeza anwani</string>
+  <string name="spam_notification_dialog_add_contact_action_text">Ongeza kwenye anwani</string>
+  <string name="spam_notification_dialog_block_report_spam_action_text">Zuia na uripoti taka</string>
+  <string name="spam_notification_was_not_spam_action_text">Hapana, si taka</string>
+  <string name="spam_notification_block_spam_action_text">Ndiyo, zuia nambari</string>
+  <string name="spam_notification_action_dismiss">Ondoa</string>
 </resources>
diff --git a/java/com/android/incallui/spam/res/values-ta/strings.xml b/java/com/android/incallui/spam/res/values-ta/strings.xml
index 2438aa7..dfc9915 100644
--- a/java/com/android/incallui/spam/res/values-ta/strings.xml
+++ b/java/com/android/incallui/spam/res/values-ta/strings.xml
@@ -1,36 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="non_spam_notification_title" msgid="2599384745904934400">"<xliff:g id="NUMBER">%1$s</xliff:g> - தெரிந்த எண்ணா?"</string>
-    <string name="spam_notification_title" msgid="609838099069629476">"<xliff:g id="NUMBER">%1$s</xliff:g> - ஸ்பேமா?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"<xliff:g id="NUMBER">%1$s</xliff:g> தடுக்கப்பட்டு, அழைப்பு ஸ்பேம் எனப் புகாரளிக்கப்பட்டது."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"<xliff:g id="NUMBER">%1$s</xliff:g> இன் அழைப்பு ஸ்பேம் இல்லை எனத் தெரிவிக்கப்பட்டது."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"தொடர்புகளில் சேர்க்க அல்லது ஸ்பேம் எண்ணைத் தடுக்க, தட்டவும்."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"இந்த எண்ணிலிருந்து உங்களுக்கு அழைப்பு வந்தது இதுவே முதல் முறை. இந்த அழைப்பு ஸ்பேமாக இருந்தால், எண்ணைத் தடுத்துப் புகாரளிக்கலாம்."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"\"ஸ்பேம் இல்லை\" எனத் தெரிவிக்க அல்லது தடுக்க, தட்டவும்."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"இது ஸ்பேமாக இருக்கும் எனச் சந்தேகிக்கிறோம். ஸ்பேம் இல்லை எனில், எங்கள் தவறைச் சுட்டிக்காட்ட, \"ஸ்பேம் இல்லை\" என்பதைத் தட்டவும்."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"தடுத்துப் புகாரளி"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"தொடர்பைச் சேர்"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"ஸ்பேமில்லை"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"எண்ணைத் தடு"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"தொடர்புகளில் சேர்"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"தடுத்து, ஸ்பேமெனப் புகாரளி"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"ஸ்பேமில்லை"</string>
-    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"நிராகரி"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="non_spam_notification_title">%1$s - தெரிந்த எண்ணா?</string>
+  <string name="spam_notification_title">%1$s, ஸ்பேம் அழைப்பாளரா?</string>
+  <string name="spam_notification_block_report_toast_text">%1$s தடுக்கப்பட்டு, அழைப்பு ஸ்பேம் எனப் புகாரளிக்கப்பட்டது.</string>
+  <string name="spam_notification_not_spam_toast_text">%1$s இன் அழைப்பு ஸ்பேம் இல்லை எனத் தெரிவிக்கப்பட்டது.</string>
+  <string name="spam_notification_non_spam_call_collapsed_text">தொடர்புகளில் சேர்க்க அல்லது ஸ்பேம் எண்ணைத் தடுக்க, தட்டவும்.</string>
+  <string name="spam_notification_non_spam_call_expanded_text">இந்த எண்ணிலிருந்து உங்களுக்கு அழைப்பு வந்தது இதுவே முதல் முறை. இந்த அழைப்பு ஸ்பேமாக இருந்தால், எண்ணைத் தடுத்துப் புகாரளிக்கலாம்.</string>
+  <string name="spam_notification_spam_call_collapsed_text">\"ஸ்பேம் இல்லை\" எனத் தெரிவிக்க அல்லது தடுக்க, தட்டவும்</string>
+  <string name="spam_notification_report_spam_action_text">தடுத்துப் புகாரளி</string>
+  <string name="spam_notification_add_contact_action_text">தொடர்பைச் சேர்</string>
+  <string name="spam_notification_dialog_add_contact_action_text">தொடர்புகளில் சேர்</string>
+  <string name="spam_notification_dialog_block_report_spam_action_text">தடுத்து, ஸ்பேமெனப் புகாரளி</string>
+  <string name="spam_notification_was_not_spam_action_text">இல்லை, ஸ்பேம் இல்லை</string>
+  <string name="spam_notification_block_spam_action_text">ஆம், எண்ணைத் தடு</string>
+  <string name="spam_notification_action_dismiss">நிராகரி</string>
 </resources>
diff --git a/java/com/android/incallui/spam/res/values-te/strings.xml b/java/com/android/incallui/spam/res/values-te/strings.xml
index 2d5e3aa..2efe36e 100644
--- a/java/com/android/incallui/spam/res/values-te/strings.xml
+++ b/java/com/android/incallui/spam/res/values-te/strings.xml
@@ -1,36 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="non_spam_notification_title" msgid="2599384745904934400">"<xliff:g id="NUMBER">%1$s</xliff:g> తెలుసా?"</string>
-    <string name="spam_notification_title" msgid="609838099069629476">"<xliff:g id="NUMBER">%1$s</xliff:g> స్పామ్ కాదా?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"<xliff:g id="NUMBER">%1$s</xliff:g> బ్లాక్ చేయబడింది మరియు కాల్ స్పామ్ అని నివేదించబడింది."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"<xliff:g id="NUMBER">%1$s</xliff:g> నుండి కాల్ స్పామ్ కాదని నివేదించబడింది."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"స్పామ్ నంబర్‌ను పరిచయాలకు జోడించడానికి లేదా బ్లాక్ చేయడానికి నొక్కండి."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"ఈ నంబర్ నుండి మీకు కాల్ రావడం ఇదే మొదటిసారి. ఈ కాల్ స్పామ్ అయితే, మీరు ఈ నంబర్‌ను బ్లాక్ చేసి, నివేదించవచ్చు."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"స్పామ్ కాదని నివేదించడానికి లేదా దాన్ని బ్లాక్ చేయడానికి నొక్కండి."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"మాకు ఇది స్పామర్ అయ్యి ఉండవచ్చని అనుమానం కలిగింది. ఈ కాల్ స్పామ్ కాకుంటే, మా పొరపాటును నివేదించడానికి స్పామ్ కాదుని నొక్కండి."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"బ్లాక్ చేసి, నివేదించండి"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"పరిచయాన్ని జోడించండి"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"స్పామ్ కాదు"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"నంబర్‌ను బ్లాక్ చేయండి"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"పరిచయాలకు జోడించండి"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"బ్లాక్ చేసి, స్పామ్ అని నివేదించండి"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"స్పామ్ కాదు"</string>
-    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"తిరస్కరించండి"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="non_spam_notification_title">%1$s తెలుసా?</string>
+  <string name="spam_notification_title">%1$s స్పామ్ కాలరా?</string>
+  <string name="spam_notification_block_report_toast_text">%1$s బ్లాక్ చేయబడింది మరియు కాల్ స్పామ్ అని నివేదించబడింది.</string>
+  <string name="spam_notification_not_spam_toast_text">%1$s నుండి కాల్ స్పామ్ కాదని నివేదించబడింది.</string>
+  <string name="spam_notification_non_spam_call_collapsed_text">స్పామ్ నంబర్‌ను పరిచయాలకు జోడించడానికి లేదా బ్లాక్ చేయడానికి నొక్కండి.</string>
+  <string name="spam_notification_non_spam_call_expanded_text">ఈ నంబర్ నుండి మీకు కాల్ రావడం ఇదే మొదటిసారి. ఈ కాల్ స్పామ్ అయితే, మీరు ఈ నంబర్‌ను బ్లాక్ చేసి, నివేదించవచ్చు.</string>
+  <string name="spam_notification_spam_call_collapsed_text">స్పామ్ కాదని నివేదించడానికి లేదా దాన్ని బ్లాక్ చేయడానికి నొక్కండి</string>
+  <string name="spam_notification_report_spam_action_text">బ్లాక్ చేసి, నివేదించండి</string>
+  <string name="spam_notification_add_contact_action_text">పరిచయాన్ని జోడించండి</string>
+  <string name="spam_notification_dialog_add_contact_action_text">పరిచయాలకు జోడించండి</string>
+  <string name="spam_notification_dialog_block_report_spam_action_text">బ్లాక్ చేసి, స్పామ్ అని నివేదించండి</string>
+  <string name="spam_notification_was_not_spam_action_text">లేదు, స్పామ్ కాదు</string>
+  <string name="spam_notification_block_spam_action_text">అవును, నంబర్‌ను బ్లాక్ చేయండి</string>
+  <string name="spam_notification_action_dismiss">విస్మరించండి</string>
 </resources>
diff --git a/java/com/android/incallui/spam/res/values-th/strings.xml b/java/com/android/incallui/spam/res/values-th/strings.xml
index 51e8b47..75fce76 100644
--- a/java/com/android/incallui/spam/res/values-th/strings.xml
+++ b/java/com/android/incallui/spam/res/values-th/strings.xml
@@ -1,36 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="non_spam_notification_title" msgid="2599384745904934400">"รู้จัก <xliff:g id="NUMBER">%1$s</xliff:g> ไหม"</string>
-    <string name="spam_notification_title" msgid="609838099069629476">"<xliff:g id="NUMBER">%1$s</xliff:g> เป็นสแปมใช่ไหม"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"บล็อก <xliff:g id="NUMBER">%1$s</xliff:g> และรายงานสายนี้ว่าเป็นสแปมแล้ว"</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"รายงานสายจาก <xliff:g id="NUMBER">%1$s</xliff:g> ว่าไม่ใช่สแปมแล้ว"</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"แตะเพื่อเพิ่มลงในรายชื่อติดต่อหรือบล็อกหมายเลขสแปม"</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"หมายเลขนี้โทรหาคุณเป็นครั้งแรก หากเป็นสแปม คุณสามารถบล็อกและรายงานหมายเลขนี้ได้"</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"แตะเพื่อรายงานว่าไม่ใช่สแปม หรือบล็อก"</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"เราสงสัยว่าสายนี้จะเป็นนักส่งสแปม หากไม่ใช่สแปม โปรดแตะไม่ใช่สแปมเพื่อรายงานข้อผิดพลาดของเรา"</string>
-    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"บล็อกและรายงาน"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"เพิ่มผู้ติดต่อ"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"ไม่ใช่สแปม"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"บล็อกหมายเลข"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"เพิ่มในรายชื่อติดต่อ"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"บล็อกและรายงานสแปม"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"ไม่ใช่สแปม"</string>
-    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"ปฏิเสธ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="non_spam_notification_title">รู้จัก %1$s ไหม</string>
+  <string name="spam_notification_title">หมายเลข %1$s เป็นสแปมใช่ไหม</string>
+  <string name="spam_notification_block_report_toast_text">บล็อก %1$s และรายงานสายนี้ว่าเป็นสแปมแล้ว</string>
+  <string name="spam_notification_not_spam_toast_text">รายงานสายจาก %1$s ว่าไม่ใช่สแปมแล้ว</string>
+  <string name="spam_notification_non_spam_call_collapsed_text">แตะเพื่อเพิ่มลงในรายชื่อติดต่อหรือบล็อกหมายเลขสแปม</string>
+  <string name="spam_notification_non_spam_call_expanded_text">หมายเลขนี้โทรหาคุณเป็นครั้งแรก หากเป็นสแปม คุณสามารถบล็อกและรายงานหมายเลขนี้ได้</string>
+  <string name="spam_notification_spam_call_collapsed_text">แตะเพื่อรายงานว่าไม่ใช่สแปมหรือบล็อก</string>
+  <string name="spam_notification_report_spam_action_text">บล็อกและรายงาน</string>
+  <string name="spam_notification_add_contact_action_text">เพิ่มผู้ติดต่อ</string>
+  <string name="spam_notification_dialog_add_contact_action_text">เพิ่มในรายชื่อติดต่อ</string>
+  <string name="spam_notification_dialog_block_report_spam_action_text">บล็อกและรายงานสแปม</string>
+  <string name="spam_notification_was_not_spam_action_text">ไม่ใช่สแปม</string>
+  <string name="spam_notification_block_spam_action_text">ใช่ บล็อกหมายเลขนี้</string>
+  <string name="spam_notification_action_dismiss">ปิด</string>
 </resources>
diff --git a/java/com/android/incallui/spam/res/values-tl/strings.xml b/java/com/android/incallui/spam/res/values-tl/strings.xml
index 0dac485..057f378 100644
--- a/java/com/android/incallui/spam/res/values-tl/strings.xml
+++ b/java/com/android/incallui/spam/res/values-tl/strings.xml
@@ -1,36 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="non_spam_notification_title" msgid="2599384745904934400">"Kilala mo ba ang <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="spam_notification_title" msgid="609838099069629476">"Spam ba ang <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"Na-block ang <xliff:g id="NUMBER">%1$s</xliff:g> at inulat ang tawag bilang spam."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"Inulat ang tawag mula sa <xliff:g id="NUMBER">%1$s</xliff:g> bilang hindi spam."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"I-tap upang idagdag sa mga contact o i-block ang spam na numero."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"Ito ang unang beses na tumawag sa iyo ang numerong ito. Kung spam ang tawag na ito, maaari mong i-block ang numerong ito at iulat ito."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"I-tap upang iulat na HINDI SPAM, o i-block ito."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"Pinaghihinalaan namin ito bilang isang spammer. Kung hindi spam ang tawag na ito, i-tap ang HINDI SPAM upang iulat ang aming pagkakamali."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"I-block at iulat"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"Magdagdag ng contact"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"Hindi spam"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"I-block ang numero"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"Idagdag sa mga contact"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"I-block at iulat ang spam"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"Hindi spam"</string>
-    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"Tanggihan"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="non_spam_notification_title">Kilala mo ba ang %1$s?</string>
+  <string name="spam_notification_title">Spam caller ba ang %1$s?</string>
+  <string name="spam_notification_block_report_toast_text">Na-block ang %1$s at inulat ang tawag bilang spam.</string>
+  <string name="spam_notification_not_spam_toast_text">Inulat ang tawag mula sa %1$s bilang hindi spam.</string>
+  <string name="spam_notification_non_spam_call_collapsed_text">I-tap upang idagdag sa mga contact o i-block ang spam na numero.</string>
+  <string name="spam_notification_non_spam_call_expanded_text">Ito ang unang beses na tumawag sa iyo ang numerong ito. Kung spam ang tawag na ito, maaari mong i-block ang numerong ito at iulat ito.</string>
+  <string name="spam_notification_spam_call_collapsed_text">I-tap para iulat na hindi spam o i-block ito</string>
+  <string name="spam_notification_report_spam_action_text">I-block at iulat</string>
+  <string name="spam_notification_add_contact_action_text">Magdagdag ng contact</string>
+  <string name="spam_notification_dialog_add_contact_action_text">Idagdag sa mga contact</string>
+  <string name="spam_notification_dialog_block_report_spam_action_text">I-block at iulat ang spam</string>
+  <string name="spam_notification_was_not_spam_action_text">Hindi, hindi spam</string>
+  <string name="spam_notification_block_spam_action_text">Oo, i-block ang numero</string>
+  <string name="spam_notification_action_dismiss">I-dismiss</string>
 </resources>
diff --git a/java/com/android/incallui/spam/res/values-tr/strings.xml b/java/com/android/incallui/spam/res/values-tr/strings.xml
index 80937ce..7b7991b 100644
--- a/java/com/android/incallui/spam/res/values-tr/strings.xml
+++ b/java/com/android/incallui/spam/res/values-tr/strings.xml
@@ -1,36 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="non_spam_notification_title" msgid="2599384745904934400">"<xliff:g id="NUMBER">%1$s</xliff:g> tanıdık bir numara mı?"</string>
-    <string name="spam_notification_title" msgid="609838099069629476">"<xliff:g id="NUMBER">%1$s</xliff:g> spam amaçlı bir numara mı?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"<xliff:g id="NUMBER">%1$s</xliff:g> engellendi ve çağrı spam olarak bildirildi."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"<xliff:g id="NUMBER">%1$s</xliff:g> numaralı telefondan gelen çağrının spam olmadığı bildirildi."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"Kişilere eklemek veya spam numarasını engellemek için dokunun."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"Bu numaradan ilk kez arandınız. Bu çağrı spam amaçlı olarak yapıldıysa numarayı engelleyip bildirebilirsiniz."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"SPAM DEĞİL bildirimi göndermek için dokunun veya numarayı engelleyin."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"Bu numaranın spam amaçlı olduğundan şüphelendik. Çağrı spam amaçlı değilse SPAM DEĞİL\'e dokunarak kararımızın hatalı olduğunu bildirin."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"Engelle ve bildir"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"Kişi olarak ekle"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"Spam değil"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"Numarayı engelle"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"Kişilere ekle"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"Engelle ve spam olarak bildir"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"Spam değil"</string>
-    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"Reddet"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="non_spam_notification_title">%1$s tanıdık bir numara mı?</string>
+  <string name="spam_notification_title">%1$s spam olan bir arayan mıydı?</string>
+  <string name="spam_notification_block_report_toast_text">%1$s engellendi ve çağrı spam olarak bildirildi.</string>
+  <string name="spam_notification_not_spam_toast_text">%1$s numaralı telefondan gelen çağrının spam olmadığı bildirildi.</string>
+  <string name="spam_notification_non_spam_call_collapsed_text">Kişilere eklemek veya spam numarasını engellemek için dokunun.</string>
+  <string name="spam_notification_non_spam_call_expanded_text">Bu numaradan ilk kez arandınız. Bu çağrı spam amaçlı olarak yapıldıysa numarayı engelleyip bildirebilirsiniz.</string>
+  <string name="spam_notification_spam_call_collapsed_text">Spam değil bildirimi göndermek için dokunun veya numarayı engelleyin</string>
+  <string name="spam_notification_report_spam_action_text">Engelle ve bildir</string>
+  <string name="spam_notification_add_contact_action_text">Kişi olarak ekle</string>
+  <string name="spam_notification_dialog_add_contact_action_text">Kişilere ekle</string>
+  <string name="spam_notification_dialog_block_report_spam_action_text">Engelle ve spam olarak bildir</string>
+  <string name="spam_notification_was_not_spam_action_text">Hayır, spam değil</string>
+  <string name="spam_notification_block_spam_action_text">Evet, numarayı engelle</string>
+  <string name="spam_notification_action_dismiss">Kapat</string>
 </resources>
diff --git a/java/com/android/incallui/spam/res/values-uk/strings.xml b/java/com/android/incallui/spam/res/values-uk/strings.xml
index 42580b5..23e8428 100644
--- a/java/com/android/incallui/spam/res/values-uk/strings.xml
+++ b/java/com/android/incallui/spam/res/values-uk/strings.xml
@@ -1,36 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="non_spam_notification_title" msgid="2599384745904934400">"Знаєте номер <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="spam_notification_title" msgid="609838099069629476">"Виклик із номера <xliff:g id="NUMBER">%1$s</xliff:g> спам?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"Номер <xliff:g id="NUMBER">%1$s</xliff:g> заблоковано, а виклик із нього позначено як спам."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"Виклик із номера <xliff:g id="NUMBER">%1$s</xliff:g> позначено як не спам."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"Торкніться, щоб додати до контактів або заблокувати номер як спам."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"З цього номера вам телефонують уперше. Якщо це спам, заблокуйте номер і поскаржтеся."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"Торкніться, щоб позначити як НЕ СПАМ або заблокувати."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"Ми вважаємо, що вам телефонував спамер. Якщо це не так, виберіть \"НЕ СПАМ\", щоб повідомити нам про це."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"Блокувати й поскарж."</string>
-    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"Додати контакт"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"Не спам"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"Заблокувати номер"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"Додати в контакти"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"Блокувати й позначити як спам"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"Не спам"</string>
-    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"Відхилити"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="non_spam_notification_title">Знаєте номер %1$s?</string>
+  <string name="spam_notification_title">Виклик із номера %1$s був спамом?</string>
+  <string name="spam_notification_block_report_toast_text">Номер %1$s заблоковано, а виклик із нього позначено як спам.</string>
+  <string name="spam_notification_not_spam_toast_text">Виклик із номера %1$s позначено як не спам.</string>
+  <string name="spam_notification_non_spam_call_collapsed_text">Торкніться, щоб додати до контактів або заблокувати номер як спам.</string>
+  <string name="spam_notification_non_spam_call_expanded_text">З цього номера вам телефонують уперше. Якщо це спам, заблокуйте номер і поскаржтеся.</string>
+  <string name="spam_notification_spam_call_collapsed_text">Торкніться, щоб позначити як не спам або заблокувати номер</string>
+  <string name="spam_notification_report_spam_action_text">Блокувати й поскарж.</string>
+  <string name="spam_notification_add_contact_action_text">Додати контакт</string>
+  <string name="spam_notification_dialog_add_contact_action_text">Додати в контакти</string>
+  <string name="spam_notification_dialog_block_report_spam_action_text">Блокувати й позначити як спам</string>
+  <string name="spam_notification_was_not_spam_action_text">Ні, не спам</string>
+  <string name="spam_notification_block_spam_action_text">Так, заблокувати номер</string>
+  <string name="spam_notification_action_dismiss">Закрити</string>
 </resources>
diff --git a/java/com/android/incallui/spam/res/values-ur/strings.xml b/java/com/android/incallui/spam/res/values-ur/strings.xml
index 5783803..fb2c970 100644
--- a/java/com/android/incallui/spam/res/values-ur/strings.xml
+++ b/java/com/android/incallui/spam/res/values-ur/strings.xml
@@ -1,36 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="non_spam_notification_title" msgid="2599384745904934400">"<xliff:g id="NUMBER">%1$s</xliff:g> سے واقف ہیں؟"</string>
-    <string name="spam_notification_title" msgid="609838099069629476">"کیا <xliff:g id="NUMBER">%1$s</xliff:g> اسپام ہے؟"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"<xliff:g id="NUMBER">%1$s</xliff:g> مسدود ہو گیا اور کال کی بطور اسپام اطلاع ہو گئی۔"</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"<xliff:g id="NUMBER">%1$s</xliff:g> سے کال کی اطلاع \'اسپام نہیں\' کے بطور ہو گئی۔"</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"رابطوں میں شامل کرنے یا اسپام نمبر کو مسدود کرنے کیلئے تھپتھپائیں۔"</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"آپ کو اس نمبر سے پہلی بار کال آئی ہے۔ اگر یہ کال اسپام تھی، تو آپ اس نمبر کو مسدود کر سکتے ہیں اور اس کی اطلاع دے سکتے ہیں۔"</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"\'اسپام نہیں\' کے بطور اطلاع دینے کیلئے تھپتھپائیں یا اسے مسدود کریں۔"</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"ہمیں اس پر اسپامر ہونے کا شک تھا۔ اگر یہ کال اسپام نہیں تھی تو ہماری غلطی کی اطلاع دینے کیلئے \'اسپام نہیں\' پر تھپتھپائیں۔"</string>
-    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"مسدود کریں اور اطلاع دیں"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"رابطہ شامل کریں"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"اسپام نہیں ہے"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"نمبر مسدود کریں"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"رابطوں میں شامل کریں"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"مسدود کریں اور اسپام کی اطلاع دیں"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"اسپام نہیں ہے"</string>
-    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"مسترد کریں"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="non_spam_notification_title">%1$s سے واقف ہیں؟</string>
+  <string name="spam_notification_title">کیا %1$s اسپام کالر تھا؟</string>
+  <string name="spam_notification_block_report_toast_text">%1$s مسدود ہو گیا اور کال کی بطور اسپام اطلاع ہو گئی۔</string>
+  <string name="spam_notification_not_spam_toast_text">%1$s سے کال کی اطلاع \'اسپام نہیں\' کے بطور ہو گئی۔</string>
+  <string name="spam_notification_non_spam_call_collapsed_text">رابطوں میں شامل کرنے یا اسپام نمبر کو مسدود کرنے کیلئے تھپتھپائیں۔</string>
+  <string name="spam_notification_non_spam_call_expanded_text">آپ کو اس نمبر سے پہلی بار کال آئی ہے۔ اگر یہ کال اسپام تھی، تو آپ اس نمبر کو مسدود کر سکتے ہیں اور اس کی اطلاع دے سکتے ہیں۔</string>
+  <string name="spam_notification_spam_call_collapsed_text">اسپام نہیں ہے کے بطور اطلاع دینے کیلئے تھپتھپائیں یا اسے مسدود کریں</string>
+  <string name="spam_notification_report_spam_action_text">مسدود کریں اور اطلاع دیں</string>
+  <string name="spam_notification_add_contact_action_text">رابطہ شامل کریں</string>
+  <string name="spam_notification_dialog_add_contact_action_text">رابطوں میں شامل کریں</string>
+  <string name="spam_notification_dialog_block_report_spam_action_text">مسدود کریں اور اسپام کی اطلاع دیں</string>
+  <string name="spam_notification_was_not_spam_action_text">نہیں، اسپام نہیں ہے</string>
+  <string name="spam_notification_block_spam_action_text">ہاں، نمبر مسدود کریں</string>
+  <string name="spam_notification_action_dismiss">برخاست کریں</string>
 </resources>
diff --git a/java/com/android/incallui/spam/res/values-uz/strings.xml b/java/com/android/incallui/spam/res/values-uz/strings.xml
index 833cb8f..2a0f6b9 100644
--- a/java/com/android/incallui/spam/res/values-uz/strings.xml
+++ b/java/com/android/incallui/spam/res/values-uz/strings.xml
@@ -1,36 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="non_spam_notification_title" msgid="2599384745904934400">"<xliff:g id="NUMBER">%1$s</xliff:g> sizga tanish raqammi?"</string>
-    <string name="spam_notification_title" msgid="609838099069629476">"<xliff:g id="NUMBER">%1$s</xliff:g> raqamidan keluvchi qo‘ng‘iroqlar spammi?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"<xliff:g id="NUMBER">%1$s</xliff:g> raqami bloklandi va undan keluvchi qo‘ng‘iroqlar spam deb belgilandi."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"<xliff:g id="NUMBER">%1$s</xliff:g> raqamidan keluvchi qo‘ng‘iroqlar spam emas deb belgilandi."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"Raqamni kontaktlarga qo‘shish yoki uni spam tarqatuvchi deb bloklash uchun bosing."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"Bu raqamdan sizga birinchi marta qo‘ng‘iroq qilindi. Agar u spam bo‘lsa, uni spam deb belgilang va raqamni bloklang."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"Qo‘ng‘iroqni SPAM EMAS deb belgilash yoki raqamni bloklash uchun bosing."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"Bu raqamdan spam qo‘ng‘iroq qilinganga o‘xshaydi. Agar u spam bo‘lmasa, bu haqda bizga xabar berish uchun uni SPAM EMAS deb belgilang."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"Bloklash/xabar ber."</string>
-    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"Kontaktl-ga qo‘shish"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"Spam emas"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"Raqamni bloklash"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"Kontaktlarga qo‘shish"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"Bloklash va spam haqida xabar berish"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"Spam emas"</string>
-    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"Rad etish"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="non_spam_notification_title">%1$s sizga tanish raqammi?</string>
+  <string name="spam_notification_title">%1$s raqamidan spam chaqiruv keldimi?</string>
+  <string name="spam_notification_block_report_toast_text">%1$s raqami bloklandi va undan keluvchi qo‘ng‘iroqlar spam deb belgilandi.</string>
+  <string name="spam_notification_not_spam_toast_text">%1$s raqamidan keluvchi qo‘ng‘iroqlar spam emas deb belgilandi.</string>
+  <string name="spam_notification_non_spam_call_collapsed_text">Raqamni kontaktlarga qo‘shish yoki uni spam tarqatuvchi deb bloklash uchun bosing.</string>
+  <string name="spam_notification_non_spam_call_expanded_text">Bu raqamdan sizga birinchi marta qo‘ng‘iroq qilindi. Agar u spam bo‘lsa, uni spam deb belgilang va raqamni bloklang.</string>
+  <string name="spam_notification_spam_call_collapsed_text">Chaqiruvni spam emas deb belgilash yoki raqamni bloklash uchun bosing.</string>
+  <string name="spam_notification_report_spam_action_text">Bloklash/xabar ber.</string>
+  <string name="spam_notification_add_contact_action_text">Kontaktl-ga qo‘shish</string>
+  <string name="spam_notification_dialog_add_contact_action_text">Kontaktlarga saqlash</string>
+  <string name="spam_notification_dialog_block_report_spam_action_text">Bloklash va spam haqida xabar berish</string>
+  <string name="spam_notification_was_not_spam_action_text">Spam emas</string>
+  <string name="spam_notification_block_spam_action_text">Raqam bloklansin</string>
+  <string name="spam_notification_action_dismiss">Yopish</string>
 </resources>
diff --git a/java/com/android/incallui/spam/res/values-vi/strings.xml b/java/com/android/incallui/spam/res/values-vi/strings.xml
index 1806cf0..a9a7ca7 100644
--- a/java/com/android/incallui/spam/res/values-vi/strings.xml
+++ b/java/com/android/incallui/spam/res/values-vi/strings.xml
@@ -1,36 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="non_spam_notification_title" msgid="2599384745904934400">"Bạn có biết <xliff:g id="NUMBER">%1$s</xliff:g> không?"</string>
-    <string name="spam_notification_title" msgid="609838099069629476">"<xliff:g id="NUMBER">%1$s</xliff:g> có phải là spam không?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"<xliff:g id="NUMBER">%1$s</xliff:g> bị chặn và cuộc gọi đã bị báo cáo là spam."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"Cuộc gọi từ <xliff:g id="NUMBER">%1$s</xliff:g> được báo cáo là không phải spam."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"Nhấn để thêm vào danh bạ hoặc chặn số spam."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"Đây là lần đầu tiên số này gọi cho bạn. Nếu cuộc gọi này là spam, bạn có thể chặn và báo cáo số này."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"Nhấn để báo cáo là KHÔNG PHẢI SPAM hoặc chặn."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"Chúng tôi nghi ngờ rằng đây là người gửi spam. Nếu cuộc gọi này không phải là spam, hãy nhấn vào KHÔNG PHẢI SPAM để báo cáo sự nhầm lẫn của chúng tôi."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"Chặn và báo cáo"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"Thêm liên hệ"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"Không phải là spam"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"Chặn số"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"Thêm vào danh bạ"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"Chặn và báo cáo spam"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"Không phải là spam"</string>
-    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"Từ chối"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="non_spam_notification_title">Bạn có biết %1$s không?</string>
+  <string name="spam_notification_title">%1$s có phải là người gọi spam không?</string>
+  <string name="spam_notification_block_report_toast_text">%1$s bị chặn và cuộc gọi đã bị báo cáo là spam.</string>
+  <string name="spam_notification_not_spam_toast_text">Cuộc gọi từ %1$s được báo cáo là không phải spam.</string>
+  <string name="spam_notification_non_spam_call_collapsed_text">Nhấn để thêm vào danh bạ hoặc chặn số spam.</string>
+  <string name="spam_notification_non_spam_call_expanded_text">Đây là lần đầu tiên số này gọi cho bạn. Nếu cuộc gọi này là spam, bạn có thể chặn và báo cáo số này.</string>
+  <string name="spam_notification_spam_call_collapsed_text">Nhấn để báo cáo không phải là spam hoặc chặn số</string>
+  <string name="spam_notification_report_spam_action_text">Chặn và báo cáo</string>
+  <string name="spam_notification_add_contact_action_text">Thêm liên hệ</string>
+  <string name="spam_notification_dialog_add_contact_action_text">Thêm vào danh bạ</string>
+  <string name="spam_notification_dialog_block_report_spam_action_text">Chặn và báo cáo spam</string>
+  <string name="spam_notification_was_not_spam_action_text">Không, không phải spam</string>
+  <string name="spam_notification_block_spam_action_text">Có, hãy chặn số</string>
+  <string name="spam_notification_action_dismiss">Loại bỏ</string>
 </resources>
diff --git a/java/com/android/incallui/spam/res/values-zh-rCN/strings.xml b/java/com/android/incallui/spam/res/values-zh-rCN/strings.xml
index 26a65b1..a9e1a1e 100644
--- a/java/com/android/incallui/spam/res/values-zh-rCN/strings.xml
+++ b/java/com/android/incallui/spam/res/values-zh-rCN/strings.xml
@@ -1,36 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="non_spam_notification_title" msgid="2599384745904934400">"<xliff:g id="NUMBER">%1$s</xliff:g> 是陌生号码吗？"</string>
-    <string name="spam_notification_title" msgid="609838099069629476">"<xliff:g id="NUMBER">%1$s</xliff:g> 是骚扰电话号码吗？"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"已屏蔽 <xliff:g id="NUMBER">%1$s</xliff:g>，并将来电举报为骚扰电话。"</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"已取消将 <xliff:g id="NUMBER">%1$s</xliff:g> 的来电举报为骚扰电话。"</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"点按即可添加到通讯录或屏蔽骚扰电话号码。"</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"这是此号码的第一次来电。如果是骚扰电话，您可以屏蔽此号码并举报。"</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"点按即可列为“非骚扰电话号码”，或将其屏蔽。"</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"我们怀疑这是骚扰电话号码。如果不是，请点按“非骚扰电话号码”，向我们报告错误。"</string>
-    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"屏蔽并举报"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"添加联系人"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"非骚扰电话号码"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"屏蔽号码"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"添加到通讯录"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"屏蔽并举报骚扰电话号码"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"非骚扰电话号码"</string>
-    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"拒接"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="non_spam_notification_title">%1$s 是陌生号码吗？</string>
+  <string name="spam_notification_title">%1$s 是骚扰电话号码吗？</string>
+  <string name="spam_notification_block_report_toast_text">已屏蔽 %1$s，并将来电举报为骚扰电话。</string>
+  <string name="spam_notification_not_spam_toast_text">已取消将 %1$s 的来电举报为骚扰电话。</string>
+  <string name="spam_notification_non_spam_call_collapsed_text">点按即可添加到通讯录或屏蔽骚扰电话号码。</string>
+  <string name="spam_notification_non_spam_call_expanded_text">这是此号码的第一次来电。如果是骚扰电话，您可以屏蔽此号码并举报。</string>
+  <string name="spam_notification_spam_call_collapsed_text">点按即可列为非骚扰电话号码，或将其屏蔽</string>
+  <string name="spam_notification_report_spam_action_text">屏蔽并举报</string>
+  <string name="spam_notification_add_contact_action_text">添加联系人</string>
+  <string name="spam_notification_dialog_add_contact_action_text">添加到通讯录</string>
+  <string name="spam_notification_dialog_block_report_spam_action_text">屏蔽并举报骚扰电话号码</string>
+  <string name="spam_notification_was_not_spam_action_text">不，这不是骚扰电话</string>
+  <string name="spam_notification_block_spam_action_text">是的，屏蔽号码</string>
+  <string name="spam_notification_action_dismiss">关闭</string>
 </resources>
diff --git a/java/com/android/incallui/spam/res/values-zh-rHK/strings.xml b/java/com/android/incallui/spam/res/values-zh-rHK/strings.xml
index ceaaa65..dcb0d1c 100644
--- a/java/com/android/incallui/spam/res/values-zh-rHK/strings.xml
+++ b/java/com/android/incallui/spam/res/values-zh-rHK/strings.xml
@@ -1,36 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="non_spam_notification_title" msgid="2599384745904934400">"<xliff:g id="NUMBER">%1$s</xliff:g> 是已知號碼？"</string>
-    <string name="spam_notification_title" msgid="609838099069629476">"<xliff:g id="NUMBER">%1$s</xliff:g> 是垃圾號碼？"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"已將 <xliff:g id="NUMBER">%1$s</xliff:g> 封鎖並舉報為垃圾號碼。"</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"<xliff:g id="NUMBER">%1$s</xliff:g> 的來電已舉報為非垃圾來電。"</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"輕按以新增至通訊錄，或封鎖垃圾號碼。"</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"這是此號碼的第一次來電，如果是垃圾來電，您可以封鎖並舉報此號碼。"</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"輕按以舉報為非垃圾來電，或加以封鎖。"</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"我們懷疑此為垃圾來電。如果不是，請輕按 [非垃圾來電] 舉報我們的錯誤。"</string>
-    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"封鎖並舉報"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"新增聯絡人"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"非垃圾來電"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"封鎖號碼"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"加入通訊錄"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"封鎖並舉報垃圾來電"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"非垃圾來電"</string>
-    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"拒絕"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="non_spam_notification_title">%1$s 是已知號碼？</string>
+  <string name="spam_notification_title">%1$s 是垃圾來電嗎？</string>
+  <string name="spam_notification_block_report_toast_text">已將 %1$s 封鎖並舉報為垃圾號碼。</string>
+  <string name="spam_notification_not_spam_toast_text">%1$s 的來電已舉報為非垃圾來電。</string>
+  <string name="spam_notification_non_spam_call_collapsed_text">輕按以新增至通訊錄，或封鎖垃圾號碼。</string>
+  <string name="spam_notification_non_spam_call_expanded_text">這是此號碼的第一次來電，如果是垃圾來電，您可以封鎖並舉報此號碼。</string>
+  <string name="spam_notification_spam_call_collapsed_text">輕按以舉報為非垃圾來電，或加以封鎖</string>
+  <string name="spam_notification_report_spam_action_text">封鎖並舉報</string>
+  <string name="spam_notification_add_contact_action_text">新增聯絡人</string>
+  <string name="spam_notification_dialog_add_contact_action_text">加入通訊錄</string>
+  <string name="spam_notification_dialog_block_report_spam_action_text">封鎖並舉報垃圾來電</string>
+  <string name="spam_notification_was_not_spam_action_text">否，不是垃圾來電</string>
+  <string name="spam_notification_block_spam_action_text">是，請封鎖號碼</string>
+  <string name="spam_notification_action_dismiss">關閉</string>
 </resources>
diff --git a/java/com/android/incallui/spam/res/values-zh-rTW/strings.xml b/java/com/android/incallui/spam/res/values-zh-rTW/strings.xml
index 70cb15d..010a307 100644
--- a/java/com/android/incallui/spam/res/values-zh-rTW/strings.xml
+++ b/java/com/android/incallui/spam/res/values-zh-rTW/strings.xml
@@ -1,36 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="non_spam_notification_title" msgid="2599384745904934400">"<xliff:g id="NUMBER">%1$s</xliff:g> 是你熟悉的電話號碼嗎？"</string>
-    <string name="spam_notification_title" msgid="609838099069629476">"<xliff:g id="NUMBER">%1$s</xliff:g> 是騷擾/廣告電話嗎？"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"已封鎖 <xliff:g id="NUMBER">%1$s</xliff:g> 並將本次來電回報為騷擾/廣告電話。"</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"已將 <xliff:g id="NUMBER">%1$s</xliff:g> 的來電回報為非騷擾/廣告電話。"</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"輕觸這裡即可加到通訊錄或封鎖騷擾/廣告電話號碼。"</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"這組號碼是首次致電給你。如果本次來電為騷擾/廣告電話，你可以封鎖並檢舉這組號碼。"</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"輕觸這裡即可回報為「非騷擾/廣告電話」或封鎖這組號碼。"</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"我們懷疑這通來電是騷擾/廣告電話。如果我們的判斷有誤，請輕觸 [非騷擾/廣告電話] 來回報錯誤。"</string>
-    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"封鎖並回報"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"新增聯絡人"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"非騷擾/廣告電話"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"封鎖號碼"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"新增為聯絡人"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"封鎖並回報為騷擾/廣告電話"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"非騷擾/廣告電話"</string>
-    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"拒接"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="non_spam_notification_title">%1$s 是你熟悉的電話號碼嗎？</string>
+  <string name="spam_notification_title">%1$s 是騷擾/廣告來電者嗎？</string>
+  <string name="spam_notification_block_report_toast_text">已封鎖 %1$s 並將本次來電回報為騷擾/廣告電話。</string>
+  <string name="spam_notification_not_spam_toast_text">已將 %1$s 的來電回報為非騷擾/廣告電話。</string>
+  <string name="spam_notification_non_spam_call_collapsed_text">輕觸這裡即可加到通訊錄或封鎖騷擾/廣告電話號碼。</string>
+  <string name="spam_notification_non_spam_call_expanded_text">這組號碼是首次致電給你。如果本次來電為騷擾/廣告電話，你可以封鎖並檢舉這組號碼。</string>
+  <string name="spam_notification_spam_call_collapsed_text">輕觸即可回報為非騷擾/廣告電話或封鎖這組號碼</string>
+  <string name="spam_notification_report_spam_action_text">封鎖並回報</string>
+  <string name="spam_notification_add_contact_action_text">新增聯絡人</string>
+  <string name="spam_notification_dialog_add_contact_action_text">新增為聯絡人</string>
+  <string name="spam_notification_dialog_block_report_spam_action_text">封鎖並回報為騷擾/廣告電話</string>
+  <string name="spam_notification_was_not_spam_action_text">否，這不是騷擾/廣告電話</string>
+  <string name="spam_notification_block_spam_action_text">是，封鎖這組號碼</string>
+  <string name="spam_notification_action_dismiss">關閉</string>
 </resources>
diff --git a/java/com/android/incallui/spam/res/values-zu/strings.xml b/java/com/android/incallui/spam/res/values-zu/strings.xml
index 90887f2..503471d 100644
--- a/java/com/android/incallui/spam/res/values-zu/strings.xml
+++ b/java/com/android/incallui/spam/res/values-zu/strings.xml
@@ -1,36 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="non_spam_notification_title" msgid="2599384745904934400">"Uyayazi i-<xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="spam_notification_title" msgid="609838099069629476">"Ingabe i-<xliff:g id="NUMBER">%1$s</xliff:g> ugaxekile?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="2994030896996523592">"<xliff:g id="NUMBER">%1$s</xliff:g> ivinjelwe futhi ikholi ibikwe njengogaxekile."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="6961471511874959300">"Ikholi esuka ku-<xliff:g id="NUMBER">%1$s</xliff:g> ibikwe njengokungeyena ugaxekile."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="8007064725837043431">"Thepha ukwengeza koxhumana nabo noma ukuvimbela inombolo engugaxekile."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="7719195419139567511">"Okokuqala le nombolo ikushayela. Uma le kholi kade ingugaxekile, ungakwazi ukuvimbela le nombolo futhi uyibike."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="7432685333790406255">"Thepha ukubika NJENGOKUNGEYENA UGAXEKILE, noma ukuyivimbela."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="913843295461912003">"Sisola ukuthi lokhu ugaxekile. Uma le kholi kade ingeyena ugaxekile, thepha okuthi AKUYENA UGAXEKILE ukuze ubike iphutha lethu."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="8195508419034910280">"Vimba futhi ubike"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="1917164963442201652">"Engeza oxhumana naye"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="9078621900394255557">"Akusiko okugaxekile"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="6146679044605530341">"Vimba inombolo"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="3776840041839107240">"Engeza koxhumana nabo"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="8099935306225107529">"Vimba futhi ubike ugaxekile"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="644291782455190660">"Akusiko okugaxekile"</string>
-    <string name="spam_notification_action_dismiss" msgid="2051469404624175977">"Yenqaba"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="non_spam_notification_title">Uyayazi i-%1$s?</string>
+  <string name="spam_notification_title">Ingabe i-%1$s umshayi wogaxekile?</string>
+  <string name="spam_notification_block_report_toast_text">%1$s ivinjelwe futhi ikholi ibikwe njengogaxekile.</string>
+  <string name="spam_notification_not_spam_toast_text">Ikholi esuka ku-%1$s ibikwe njengokungeyena ugaxekile.</string>
+  <string name="spam_notification_non_spam_call_collapsed_text">Thepha ukwengeza koxhumana nabo noma ukuvimbela inombolo engugaxekile.</string>
+  <string name="spam_notification_non_spam_call_expanded_text">Okokuqala le nombolo ikushayela. Uma le kholi kade ingugaxekile, ungakwazi ukuvimbela le nombolo futhi uyibike.</string>
+  <string name="spam_notification_spam_call_collapsed_text">Thepha ukubika njengokungeyena ugaxekile noma vimbela</string>
+  <string name="spam_notification_report_spam_action_text">Vimba futhi ubike</string>
+  <string name="spam_notification_add_contact_action_text">Engeza oxhumana naye</string>
+  <string name="spam_notification_dialog_add_contact_action_text">Engeza koxhumana nabo</string>
+  <string name="spam_notification_dialog_block_report_spam_action_text">Vimba futhi ubike ugaxekile</string>
+  <string name="spam_notification_was_not_spam_action_text">Cha, akuyena ugaxekile</string>
+  <string name="spam_notification_block_spam_action_text">Yebo, vimbela inombolo</string>
+  <string name="spam_notification_action_dismiss">Cashisa</string>
 </resources>
diff --git a/java/com/android/incallui/spam/res/values/strings.xml b/java/com/android/incallui/spam/res/values/strings.xml
index e893f2a..7626754 100644
--- a/java/com/android/incallui/spam/res/values/strings.xml
+++ b/java/com/android/incallui/spam/res/values/strings.xml
@@ -44,6 +44,97 @@
   <!-- Text for the blocking spam action in the after call prompt. [CHAR LIMIT=40] -->
   <string name="spam_notification_block_spam_action_text">Yes, block number</string>
 
+  <!-- Strings for 'junk' spam word alternative-->
+  <!-- Title for the notification to the user after a call from an spammer ends. [CHAR LIMIT=100] -->
+  <string translatable="false" name="spam_notification_title_230151">Was <xliff:g id="number">%1$s</xliff:g> a junk caller?</string>
+  <!-- Text for the toast shown after the user presses block/report spam. [CHAR LIMIT=100] -->
+  <string translatable="false" name="spam_notification_block_report_toast_text_230151"><xliff:g id="number">%1$s</xliff:g> blocked and call was reported as junk.</string>
+  <!-- Text for the toast shown after the user presses not spam. [CHAR LIMIT=100] -->
+  <string translatable="false" name="spam_notification_not_spam_toast_text_230151">Call from <xliff:g id="number">%1$s</xliff:g> reported as not junk.</string>
+  <!-- Text displayed in the collapsed notification to the user after a non-spam call ends. [CHAR LIMIT=100] -->
+  <string translatable="false" name="spam_notification_non_spam_call_collapsed_text_230151">Tap to add to contacts or block junk number.</string>
+  <!-- Text displayed in the expanded notification to the user after a non-spam call ends. [CHAR LIMIT=NONE] -->
+  <string translatable="false" name="spam_notification_non_spam_call_expanded_text_230151">This is the first time this number called you. If this call was junk, you can block this number and report it.</string>
+  <!-- Text displayed in the collapsed notification to the user after a spam call ends. [CHAR LIMIT=100] -->
+  <string translatable="false" name="spam_notification_spam_call_collapsed_text_230151">Tap to report as not junk or block it</string>
+  <!-- Text for the blocking and reporting spam action in the after call dialog. [CHAR LIMIT=40] -->
+  <string translatable="false" name="spam_notification_dialog_block_report_spam_action_text_230151">Block &amp; report junk</string>
+  <!-- Text for the marking a call as not spam in the after call prompt. [CHAR LIMIT=40] -->
+  <string translatable="false" name="spam_notification_was_not_spam_action_text_230151">No, not junk</string>
+
+  <!-- Strings for 'junk/spam' spam word alternative-->
+  <!-- Title for the notification to the user after a call from an spammer ends. [CHAR LIMIT=100] -->
+  <string translatable="false" name="spam_notification_title_230152">Was <xliff:g id="number">%1$s</xliff:g> a junk/spam caller?</string>
+  <!-- Text for the toast shown after the user presses block/report spam. [CHAR LIMIT=100] -->
+  <string translatable="false" name="spam_notification_block_report_toast_text_230152"><xliff:g id="number">%1$s</xliff:g> blocked and call was reported as junk/spam.</string>
+  <!-- Text for the toast shown after the user presses not spam. [CHAR LIMIT=100] -->
+  <string translatable="false" name="spam_notification_not_spam_toast_text_230152">Call from <xliff:g id="number">%1$s</xliff:g> reported as not junk/spam.</string>
+  <!-- Text displayed in the collapsed notification to the user after a non-spam call ends. [CHAR LIMIT=100] -->
+  <string translatable="false" name="spam_notification_non_spam_call_collapsed_text_230152">Tap to add to contacts or block junk/spam number.</string>
+  <!-- Text displayed in the expanded notification to the user after a non-spam call ends. [CHAR LIMIT=NONE] -->
+  <string translatable="false" name="spam_notification_non_spam_call_expanded_text_230152">This is the first time this number called you. If this call was junk/spam, you can block this number and report it.</string>
+  <!-- Text displayed in the collapsed notification to the user after a spam call ends. [CHAR LIMIT=100] -->
+  <string translatable="false" name="spam_notification_spam_call_collapsed_text_230152">Tap to report as not junk/spam or block it</string>
+  <!-- Text for the blocking and reporting spam action in the after call dialog. [CHAR LIMIT=40] -->
+  <string translatable="false" name="spam_notification_dialog_block_report_spam_action_text_230152">Block &amp; report junk/spam</string>
+  <!-- Text for the marking a call as not spam in the after call prompt. [CHAR LIMIT=40] -->
+  <string translatable="false" name="spam_notification_was_not_spam_action_text_230152">No, not junk/spam</string>
+
+  <!-- Strings for 'unwanted' spam word alternative-->
+  <!-- Title for the notification to the user after a call from an spammer ends. [CHAR LIMIT=100] -->
+  <string translatable="false" name="spam_notification_title_230153">Was <xliff:g id="number">%1$s</xliff:g> an unwanted caller?</string>
+  <!-- Text for the toast shown after the user presses block/report spam. [CHAR LIMIT=100] -->
+  <string translatable="false" name="spam_notification_block_report_toast_text_230153"><xliff:g id="number">%1$s</xliff:g> blocked and call was reported as unwanted.</string>
+  <!-- Text for the toast shown after the user presses not spam. [CHAR LIMIT=100] -->
+  <string translatable="false" name="spam_notification_not_spam_toast_text_230153">Call from <xliff:g id="number">%1$s</xliff:g> reported as useful.</string>
+  <!-- Text displayed in the collapsed notification to the user after a non-spam call ends. [CHAR LIMIT=100] -->
+  <string translatable="false" name="spam_notification_non_spam_call_collapsed_text_230153">Tap to add to contacts or block unwanted number.</string>
+  <!-- Text displayed in the expanded notification to the user after a non-spam call ends. [CHAR LIMIT=NONE] -->
+  <string translatable="false" name="spam_notification_non_spam_call_expanded_text_230153">This is the first time this number called you. If this call was unwanted, you can block this number and report it.</string>
+  <!-- Text displayed in the collapsed notification to the user after a spam call ends. [CHAR LIMIT=100] -->
+  <string translatable="false" name="spam_notification_spam_call_collapsed_text_230153">Tap to report as useful or block it</string>
+  <!-- Text for the blocking and reporting spam action in the after call dialog. [CHAR LIMIT=40] -->
+  <string translatable="false" name="spam_notification_dialog_block_report_spam_action_text_230153">Block &amp; report unwanted</string>
+  <!-- Text for the marking a call as not spam in the after call prompt. [CHAR LIMIT=40] -->
+  <string translatable="false" name="spam_notification_was_not_spam_action_text_230153">No, not unwanted</string>
+
+  <!-- Strings for 'spam/unwanted' spam word alternative-->
+  <!-- Title for the notification to the user after a call from an spammer ends. [CHAR LIMIT=100] -->
+  <string translatable="false" name="spam_notification_title_230154">Was <xliff:g id="number">%1$s</xliff:g> a spam/unwanted caller?</string>
+  <!-- Text for the toast shown after the user presses block/report spam. [CHAR LIMIT=100] -->
+  <string translatable="false" name="spam_notification_block_report_toast_text_230154"><xliff:g id="number">%1$s</xliff:g> blocked and call was reported as spam/unwanted.</string>
+  <!-- Text for the toast shown after the user presses not spam. [CHAR LIMIT=100] -->
+  <string translatable="false" name="spam_notification_not_spam_toast_text_230154">Call from <xliff:g id="number">%1$s</xliff:g> reported as not spam/unwanted.</string>
+  <!-- Text displayed in the collapsed notification to the user after a non-spam call ends. [CHAR LIMIT=100] -->
+  <string translatable="false" name="spam_notification_non_spam_call_collapsed_text_230154">Tap to add to contacts or block spam/unwanted number.</string>
+  <!-- Text displayed in the expanded notification to the user after a non-spam call ends. [CHAR LIMIT=NONE] -->
+  <string translatable="false" name="spam_notification_non_spam_call_expanded_text_230154">This is the first time this number called you. If this call was spam/unwanted, you can block this number and report it.</string>
+  <!-- Text displayed in the collapsed notification to the user after a spam call ends. [CHAR LIMIT=100] -->
+  <string translatable="false" name="spam_notification_spam_call_collapsed_text_230154">Tap to report as not spam/unwanted or block it</string>
+  <!-- Text for the blocking and reporting spam action in the after call dialog. [CHAR LIMIT=40] -->
+  <string translatable="false" name="spam_notification_dialog_block_report_spam_action_text_230154">Block &amp; report spam/unwanted</string>
+  <!-- Text for the marking a call as not spam in the after call prompt. [CHAR LIMIT=40] -->
+  <string translatable="false" name="spam_notification_was_not_spam_action_text_230154">No, not spam/unwanted</string>
+
+  <!-- Strings for 'junk/unwanted' spam word alternative-->
+  <!-- Title for the notification to the user after a call from an spammer ends. [CHAR LIMIT=100] -->
+  <string translatable="false" name="spam_notification_title_230155">Was <xliff:g id="number">%1$s</xliff:g> a junk/unwanted caller?</string>
+  <!-- Text for the toast shown after the user presses block/report spam. [CHAR LIMIT=100] -->
+  <string translatable="false" name="spam_notification_block_report_toast_text_230155"><xliff:g id="number">%1$s</xliff:g> blocked and call was reported as junk/unwanted.</string>
+  <!-- Text for the toast shown after the user presses not spam. [CHAR LIMIT=100] -->
+  <string translatable="false" name="spam_notification_not_spam_toast_text_230155">Call from <xliff:g id="number">%1$s</xliff:g> reported as not junk/unwanted.</string>
+  <!-- Text displayed in the collapsed notification to the user after a non-spam call ends. [CHAR LIMIT=100] -->
+  <string translatable="false" name="spam_notification_non_spam_call_collapsed_text_230155">Tap to add to contacts or block junk/unwanted number.</string>
+  <!-- Text displayed in the expanded notification to the user after a non-spam call ends. [CHAR LIMIT=NONE] -->
+  <string translatable="false" name="spam_notification_non_spam_call_expanded_text_230155">This is the first time this number called you. If this call was junk/unwanted, you can block this number and report it.</string>
+  <!-- Text displayed in the collapsed notification to the user after a spam call ends. [CHAR LIMIT=100] -->
+  <string translatable="false" name="spam_notification_spam_call_collapsed_text_230155">Tap to report as not junk/unwanted or block it</string>
+  <!-- Text for the blocking and reporting spam action in the after call dialog. [CHAR LIMIT=40] -->
+  <string translatable="false" name="spam_notification_dialog_block_report_spam_action_text_230155">Block &amp; report junk/unwanted</string>
+  <!-- Text for the marking a call as not spam in the after call prompt. [CHAR LIMIT=40] -->
+  <string translatable="false" name="spam_notification_was_not_spam_action_text_230155">No, not junk/unwanted</string>
+
+
   <!-- Label for "Dismiss" dialog action. [CHAR LIMIT=12] -->
   <string name="spam_notification_action_dismiss">Dismiss</string>
 
diff --git a/java/com/android/incallui/speakeasy/AndroidManifest.xml b/java/com/android/incallui/speakeasy/AndroidManifest.xml
deleted file mode 100644
index e56b2e7..0000000
--- a/java/com/android/incallui/speakeasy/AndroidManifest.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<!--
-  ~ Copyright (C) 2018 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-  -->
-<manifest
-    package="com.android.incallui.speakeasy"
-    xmlns:android="http://schemas.android.com/apk/res/android">
-  <application android:theme="@style/Theme.AppCompat">
-  <activity
-      android:name=".SpeakEasyActivity"
-      android:exported="false"
-      android:theme="@style/DialerThemeBase.NoActionBar"
-      android:windowSoftInputMode="adjustResize"/>
-  </application>
-</manifest>
diff --git a/java/com/android/incallui/speakeasy/Annotations.java b/java/com/android/incallui/speakeasy/Annotations.java
new file mode 100644
index 0000000..c66fe94
--- /dev/null
+++ b/java/com/android/incallui/speakeasy/Annotations.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.incallui.speakeasy;
+
+import javax.inject.Qualifier;
+
+/** Annotations for Speakeasy providers. */
+public final class Annotations {
+
+  /** A Speakeasy settings fragment */
+  @Qualifier
+  public @interface SpeakEasySettingsActivity {}
+
+  /** A Speakeasy settings object */
+  @Qualifier
+  public @interface SpeakEasySettingsObject {}
+
+  /** A Speakeasy chip */
+  @Qualifier
+  public @interface SpeakEasyChipResourceId {}
+
+  /** A Speakeasy text resource */
+  @Qualifier
+  public @interface SpeakEasyTextResourceId {}
+}
diff --git a/java/com/android/incallui/speakeasy/SpeakEasyCallManager.java b/java/com/android/incallui/speakeasy/SpeakEasyCallManager.java
index f2721da..55905ce 100644
--- a/java/com/android/incallui/speakeasy/SpeakEasyCallManager.java
+++ b/java/com/android/incallui/speakeasy/SpeakEasyCallManager.java
@@ -16,10 +16,12 @@
 
 package com.android.incallui.speakeasy;
 
+import android.content.Context;
 import android.support.annotation.NonNull;
 import android.support.v4.app.Fragment;
 import com.android.incallui.call.DialerCall;
-import com.google.common.base.Optional;
+import com.google.common.util.concurrent.ListenableFuture;
+import java.util.Optional;
 
 /** Provides operations necessary to SpeakEasy. */
 public interface SpeakEasyCallManager {
@@ -37,4 +39,32 @@
    * @param call The call which has been removed.
    */
   void onCallRemoved(@NonNull DialerCall call);
+
+  /**
+   * Indicates there is a new incoming call that is about to be answered.
+   *
+   * @param call The call which is about to become active.
+   */
+  ListenableFuture<Void> onNewIncomingCall(@NonNull DialerCall call);
+
+  /**
+   * Indicates the feature is available.
+   *
+   * @param context The application context.
+   */
+  boolean isAvailable(@NonNull Context context);
+
+  /**
+   * Optional: Performs work necessary to happen-before callers use other methods on this interface.
+   *
+   * @apiNote Use of this API is completely optional, and callers are NOT required to invoke this
+   *     method prior to using other methods on the interface.
+   * @implSpec Other members of this interface always promise to do any required initialization work
+   *     at the time they are invoked. This method will always be idempotent.
+   */
+  default void performManualInitialization() {}
+
+  /** Returns the config provider flag associated with the feature. */
+  @NonNull
+  String getConfigProviderFlag();
 }
diff --git a/java/com/android/incallui/speakeasy/SpeakEasyCallManagerStub.java b/java/com/android/incallui/speakeasy/SpeakEasyCallManagerStub.java
index 9e58ce1..4eebc80 100644
--- a/java/com/android/incallui/speakeasy/SpeakEasyCallManagerStub.java
+++ b/java/com/android/incallui/speakeasy/SpeakEasyCallManagerStub.java
@@ -16,10 +16,14 @@
 
 package com.android.incallui.speakeasy;
 
+import android.content.Context;
+import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v4.app.Fragment;
 import com.android.incallui.call.DialerCall;
-import com.google.common.base.Optional;
+import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.ListenableFuture;
+import java.util.Optional;
 import javax.inject.Inject;
 
 /** Default implementation of SpeakEasyCallManager. */
@@ -32,10 +36,28 @@
   @Override
   @Nullable
   public Optional<Fragment> getSpeakEasyFragment(DialerCall call) {
-    return Optional.absent();
+    return Optional.empty();
   }
 
   /** Always inert in the stub. */
   @Override
   public void onCallRemoved(DialerCall call) {}
+
+  @Override
+  public ListenableFuture<Void> onNewIncomingCall(@NonNull DialerCall call) {
+    return Futures.immediateFuture(null);
+  }
+
+  /** Always returns false. */
+  @Override
+  public boolean isAvailable(@NonNull Context unused) {
+    return false;
+  }
+
+  /** Always returns a stub string. */
+  @NonNull
+  @Override
+  public String getConfigProviderFlag() {
+    return "not_yet_implmented";
+  }
 }
diff --git a/java/com/android/incallui/speakeasy/SpeakEasyComponent.java b/java/com/android/incallui/speakeasy/SpeakEasyComponent.java
index 2403354..422ebd6 100644
--- a/java/com/android/incallui/speakeasy/SpeakEasyComponent.java
+++ b/java/com/android/incallui/speakeasy/SpeakEasyComponent.java
@@ -17,21 +17,36 @@
 package com.android.incallui.speakeasy;
 
 import android.content.Context;
+import android.preference.PreferenceActivity;
 import com.android.dialer.inject.HasRootComponent;
+import com.android.incallui.speakeasy.Annotations.SpeakEasyChipResourceId;
+import com.android.incallui.speakeasy.Annotations.SpeakEasySettingsActivity;
+import com.android.incallui.speakeasy.Annotations.SpeakEasySettingsObject;
+import com.android.incallui.speakeasy.Annotations.SpeakEasyTextResourceId;
+import com.google.common.base.Optional;
 import dagger.Subcomponent;
 
 /** Dagger component to get SpeakEasyCallManager. */
 @Subcomponent
 public abstract class SpeakEasyComponent {
 
-  public abstract SpeakEasyCallManager speakEasyCallManager();
-
   public static SpeakEasyComponent get(Context context) {
     return ((SpeakEasyComponent.HasComponent)
             ((HasRootComponent) context.getApplicationContext()).component())
         .speakEasyComponent();
   }
 
+  public abstract SpeakEasyCallManager speakEasyCallManager();
+
+  public abstract @SpeakEasySettingsActivity Optional<PreferenceActivity>
+      speakEasySettingsActivity();
+
+  public abstract @SpeakEasySettingsObject Optional<Object> speakEasySettingsObject();
+
+  public abstract @SpeakEasyChipResourceId Optional<Integer> speakEasyChip();
+
+  public abstract @SpeakEasyTextResourceId Optional<Integer> speakEasyTextResource();
+
   /** Used to refer to the root application component. */
   public interface HasComponent {
     SpeakEasyComponent speakEasyComponent();
diff --git a/java/com/android/incallui/speakeasy/StubSpeakEasyModule.java b/java/com/android/incallui/speakeasy/StubSpeakEasyModule.java
index 713ce2b..5441075 100644
--- a/java/com/android/incallui/speakeasy/StubSpeakEasyModule.java
+++ b/java/com/android/incallui/speakeasy/StubSpeakEasyModule.java
@@ -16,13 +16,44 @@
 
 package com.android.incallui.speakeasy;
 
+import android.preference.PreferenceActivity;
+import com.android.dialer.inject.DialerVariant;
+import com.android.dialer.inject.InstallIn;
+import com.android.incallui.speakeasy.Annotations.SpeakEasyChipResourceId;
+import com.android.incallui.speakeasy.Annotations.SpeakEasySettingsActivity;
+import com.android.incallui.speakeasy.Annotations.SpeakEasySettingsObject;
+import com.android.incallui.speakeasy.Annotations.SpeakEasyTextResourceId;
+import com.google.common.base.Optional;
 import dagger.Binds;
 import dagger.Module;
+import dagger.Provides;
 
 /** Module which binds {@link SpeakEasyCallManagerStub}. */
+@InstallIn(variants = {DialerVariant.DIALER_TEST})
 @Module
 public abstract class StubSpeakEasyModule {
 
   @Binds
   abstract SpeakEasyCallManager bindsSpeakEasy(SpeakEasyCallManagerStub stub);
+
+  @Provides
+  static @SpeakEasySettingsActivity Optional<PreferenceActivity>
+      provideSpeakEasySettingsActivity() {
+    return Optional.absent();
+  }
+
+  @Provides
+  static @SpeakEasySettingsObject Optional<Object> provideSpeakEasySettingsObject() {
+    return Optional.absent();
+  }
+
+  @Provides
+  static @SpeakEasyChipResourceId Optional<Integer> provideSpeakEasyChip() {
+    return Optional.absent();
+  }
+
+  @Provides
+  static @SpeakEasyTextResourceId Optional<Integer> provideSpeakEasyTextResource() {
+    return Optional.absent();
+  }
 }
diff --git a/java/com/android/incallui/speakeasy/res/layout/activity_speakeasy.xml b/java/com/android/incallui/speakeasy/res/layout/activity_speakeasy.xml
deleted file mode 100644
index 5271d62..0000000
--- a/java/com/android/incallui/speakeasy/res/layout/activity_speakeasy.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-  -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-  <FrameLayout
-      android:id="@+id/fragment_speakeasy"
-      android:layout_width="match_parent"
-      android:layout_height="match_parent"/>
-
-</LinearLayout>
diff --git a/java/com/android/incallui/speakeasy/res/values/colors.xml b/java/com/android/incallui/speakeasy/res/values/colors.xml
deleted file mode 100644
index fc4790e..0000000
--- a/java/com/android/incallui/speakeasy/res/values/colors.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-  -->
-
-<resources>
-  <color name="speakeasy_status_bar_color">#E0E0E0</color>
-</resources>
diff --git a/java/com/android/incallui/speakerbuttonlogic/SpeakerButtonInfo.java b/java/com/android/incallui/speakerbuttonlogic/SpeakerButtonInfo.java
index 5ab821b..0c873b2 100644
--- a/java/com/android/incallui/speakerbuttonlogic/SpeakerButtonInfo.java
+++ b/java/com/android/incallui/speakerbuttonlogic/SpeakerButtonInfo.java
@@ -39,52 +39,40 @@
   @DrawableRes public final int icon;
   @StringRes public final int contentDescription;
   @StringRes public final int label;
-  public final boolean checkable;
+  public final boolean nonBluetoothMode;
   public final boolean isChecked;
 
-  public SpeakerButtonInfo(CallAudioState audioState, @IconSize int iconSize) {
+  public SpeakerButtonInfo(CallAudioState audioState) {
     if ((audioState.getSupportedRouteMask() & CallAudioState.ROUTE_BLUETOOTH)
         == CallAudioState.ROUTE_BLUETOOTH) {
-      checkable = false;
-      isChecked = false;
+      nonBluetoothMode = false;
       label = R.string.incall_label_audio;
 
       if ((audioState.getRoute() & CallAudioState.ROUTE_BLUETOOTH)
           == CallAudioState.ROUTE_BLUETOOTH) {
-        icon =
-            iconSize == IconSize.SIZE_36_DP
-                ? R.drawable.quantum_ic_bluetooth_audio_white_36
-                : R.drawable.quantum_ic_bluetooth_audio_white_24;
+        icon = R.drawable.volume_bluetooth;
         contentDescription = R.string.incall_content_description_bluetooth;
+        isChecked = true;
       } else if ((audioState.getRoute() & CallAudioState.ROUTE_SPEAKER)
           == CallAudioState.ROUTE_SPEAKER) {
-        icon =
-            iconSize == IconSize.SIZE_36_DP
-                ? R.drawable.quantum_ic_volume_up_white_36
-                : R.drawable.quantum_ic_volume_up_white_24;
+        icon = R.drawable.quantum_ic_volume_up_vd_theme_24;
         contentDescription = R.string.incall_content_description_speaker;
+        isChecked = true;
       } else if ((audioState.getRoute() & CallAudioState.ROUTE_WIRED_HEADSET)
           == CallAudioState.ROUTE_WIRED_HEADSET) {
-        icon =
-            iconSize == IconSize.SIZE_36_DP
-                ? R.drawable.quantum_ic_headset_white_36
-                : R.drawable.quantum_ic_headset_white_24;
+        icon = R.drawable.quantum_ic_headset_vd_theme_24;
         contentDescription = R.string.incall_content_description_headset;
+        isChecked = true;
       } else {
-        icon =
-            iconSize == IconSize.SIZE_36_DP
-                ? R.drawable.quantum_ic_phone_in_talk_white_36
-                : R.drawable.quantum_ic_phone_in_talk_white_24;
+        icon = R.drawable.quantum_ic_phone_in_talk_vd_theme_24;
         contentDescription = R.string.incall_content_description_earpiece;
+        isChecked = false;
       }
     } else {
-      checkable = true;
+      nonBluetoothMode = true;
       isChecked = audioState.getRoute() == CallAudioState.ROUTE_SPEAKER;
       label = R.string.incall_label_speaker;
-      icon =
-          iconSize == IconSize.SIZE_36_DP
-              ? R.drawable.quantum_ic_volume_up_white_36
-              : R.drawable.quantum_ic_volume_up_white_24;
+      icon = R.drawable.quantum_ic_volume_up_vd_theme_24;
       contentDescription = R.string.incall_content_description_speaker;
     }
   }
diff --git a/java/com/android/incallui/speakerbuttonlogic/res/drawable/volume_bluetooth.xml b/java/com/android/incallui/speakerbuttonlogic/res/drawable/volume_bluetooth.xml
new file mode 100644
index 0000000..59dfdf3
--- /dev/null
+++ b/java/com/android/incallui/speakerbuttonlogic/res/drawable/volume_bluetooth.xml
@@ -0,0 +1,24 @@
+<!--
+  ~ Copyright (C) 2018 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:width="24dp"
+    android:height="24dp">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M3 9l0 6 4 0 5 5 0 -16 -5 5 -4 0zm11.71 6.5l2.29 -2.29 0 3.79 0.5 0 2.85 -2.85L18.12 12 20.36 9.85 17.5 7l-0.5 0 0 3.79L14.71 8.5 14 9.21 16.79 12 14 14.79 14.71 15.5ZM18 8.91l0.94 0.94 -0.94 0.94 0 -1.88zm0 4.3l0.94 0.94 -0.94 0.94 0 -1.88z"/>
+</vector>
\ No newline at end of file
diff --git a/java/com/android/incallui/telecomeventui/AndroidManifest.xml b/java/com/android/incallui/telecomeventui/AndroidManifest.xml
index 861b936..a2134a3 100644
--- a/java/com/android/incallui/telecomeventui/AndroidManifest.xml
+++ b/java/com/android/incallui/telecomeventui/AndroidManifest.xml
@@ -12,4 +12,15 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<manifest package="com.android.incallui.telecomeventui"/>
\ No newline at end of file
+<manifest
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.incallui.telecomeventui">
+  <application>
+    <activity
+        android:excludeFromRecents="true"
+        android:exported="true"
+        android:name="com.android.incallui.telecomeventui.InternationalCallOnWifiDialogActivity"
+        android:noHistory="true"
+        android:theme="@style/Theme.Incall.DialogHolder"/>
+  </application>
+</manifest>
diff --git a/java/com/android/incallui/telecomeventui/InternationalCallOnWifiDialogActivity.java b/java/com/android/incallui/telecomeventui/InternationalCallOnWifiDialogActivity.java
new file mode 100644
index 0000000..192c160
--- /dev/null
+++ b/java/com/android/incallui/telecomeventui/InternationalCallOnWifiDialogActivity.java
@@ -0,0 +1,101 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.incallui.telecomeventui;
+
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.v7.app.AppCompatActivity;
+import android.text.TextUtils;
+import com.android.incallui.call.CallList;
+import com.android.incallui.call.DialerCall;
+
+/**
+ * Activity containing dialog that may be shown when users place an outgoing call to an
+ * international number while on Wifi.
+ */
+public class InternationalCallOnWifiDialogActivity extends AppCompatActivity
+    implements CallList.Listener {
+
+  public static final String EXTRA_CALL_ID = "extra_call_id";
+  private static final String TAG_INTERNATIONAL_CALL_ON_WIFI = "tag_international_call_on_wifi";
+
+  private String callId;
+
+  @Override
+  protected void onCreate(@Nullable Bundle bundle) {
+    super.onCreate(bundle);
+
+    callId = getIntent().getStringExtra(EXTRA_CALL_ID);
+    if (TextUtils.isEmpty(callId)) {
+      finish();
+      return;
+    }
+
+    InternationalCallOnWifiDialogFragment fragment =
+        InternationalCallOnWifiDialogFragment.newInstance(callId);
+    fragment.show(getSupportFragmentManager(), TAG_INTERNATIONAL_CALL_ON_WIFI);
+
+    CallList.getInstance().addListener(this);
+  }
+
+  @Override
+  protected void onDestroy() {
+    super.onDestroy();
+    CallList.getInstance().removeListener(this);
+  }
+
+  @Override
+  protected void onPause() {
+    super.onPause();
+    // We don't expect the activity to resume, except for orientation change.
+    if (!isChangingConfigurations()) {
+      finish();
+    }
+  }
+
+  @Override
+  public void onDisconnect(DialerCall call) {
+    if (callId.equals(call.getId())) {
+      finish();
+    }
+  }
+
+  @Override
+  public void onIncomingCall(DialerCall call) {}
+
+  @Override
+  public void onUpgradeToVideo(DialerCall call) {}
+
+  @Override
+  public void onUpgradeToRtt(DialerCall call, int rttRequestId) {}
+
+  @Override
+  public void onSessionModificationStateChange(DialerCall call) {}
+
+  @Override
+  public void onCallListChange(CallList callList) {}
+
+  @Override
+  public void onWiFiToLteHandover(DialerCall call) {}
+
+  @Override
+  public void onHandoverToWifiFailed(DialerCall call) {}
+
+  @Override
+  public void onInternationalCallOnWifi(@NonNull DialerCall call) {}
+}
diff --git a/java/com/android/incallui/telecomeventui/InternationalCallOnWifiDialogFragment.java b/java/com/android/incallui/telecomeventui/InternationalCallOnWifiDialogFragment.java
index 2b602f8..cd53f26 100644
--- a/java/com/android/incallui/telecomeventui/InternationalCallOnWifiDialogFragment.java
+++ b/java/com/android/incallui/telecomeventui/InternationalCallOnWifiDialogFragment.java
@@ -21,16 +21,18 @@
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.os.Bundle;
-import android.preference.PreferenceManager;
 import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 import android.support.annotation.VisibleForTesting;
 import android.support.v4.app.DialogFragment;
 import android.support.v4.os.UserManagerCompat;
 import android.view.View;
 import android.widget.CheckBox;
 import com.android.dialer.common.Assert;
+import com.android.dialer.common.FragmentUtils;
 import com.android.dialer.common.LogUtil;
+import com.android.dialer.storage.StorageComponent;
+import com.android.incallui.call.CallList;
+import com.android.incallui.call.DialerCall;
 
 /**
  * Dialog that may be shown when users place an outgoing call to an international number while on
@@ -53,7 +55,7 @@
       return false;
     }
 
-    SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(context);
+    SharedPreferences preferences = StorageComponent.get(context).unencryptedSharedPrefs();
     boolean shouldShow = preferences.getBoolean(ALWAYS_SHOW_WARNING_PREFERENCE_KEY, true);
 
     LogUtil.i("InternationalCallOnWifiDialogFragment.shouldShow", "result: %b", shouldShow);
@@ -61,27 +63,13 @@
   }
 
   /**
-   * Called in response to user interaction with the {@link InternationalCallOnWifiDialogFragment}.
-   */
-  public interface Callback {
-
-    /** Indicates that the user wishes to proceed with the call represented by the given call id. */
-    void continueCall(@NonNull String callId);
-
-    /** Indicates that the user wishes to cancel the call represented by the given call id. */
-    void cancelCall(@NonNull String callId);
-  }
-
-  /**
    * Returns a new instance of {@link InternationalCallOnWifiDialogFragment} with the given
    * callback.
    *
    * <p>Prefer this method over the default constructor.
    */
-  public static InternationalCallOnWifiDialogFragment newInstance(
-      @NonNull String callId, @NonNull Callback callback) {
+  public static InternationalCallOnWifiDialogFragment newInstance(@NonNull String callId) {
     InternationalCallOnWifiDialogFragment fragment = new InternationalCallOnWifiDialogFragment();
-    fragment.setCallback(callback);
     Bundle args = new Bundle();
     args.putString(ARG_CALL_ID, Assert.isNotNull(callId));
     fragment.setArguments(args);
@@ -93,31 +81,12 @@
    * InternationalCallOnWifiDialogFragment InternationalCallOnWifiDialogFragments}.
    */
   @VisibleForTesting
-  static final String ALWAYS_SHOW_WARNING_PREFERENCE_KEY =
+  public static final String ALWAYS_SHOW_WARNING_PREFERENCE_KEY =
       "ALWAYS_SHOW_INTERNATIONAL_CALL_ON_WIFI_WARNING";
 
   /** Key in the arguments bundle for call id. */
   private static final String ARG_CALL_ID = "call_id";
 
-  /**
-   * Callback which will receive information about user interactions with this dialog.
-   *
-   * <p>This is Nullable in the event that the dialog is destroyed by the framework, but doesn't
-   * have a callback reattached. Ideally, the InCallActivity would implement the callback and we
-   * would use FragmentUtils.getParentUnsafe instead of holding onto the callback here, but that's
-   * not possible with the existing InCallActivity/InCallActivityCommon implementation.
-   */
-  @Nullable private Callback callback;
-
-  /**
-   * Sets the callback for this dialog.
-   *
-   * <p>Used to reset the callback after state changes.
-   */
-  public void setCallback(@NonNull Callback callback) {
-    this.callback = Assert.isNotNull(callback);
-  }
-
   @NonNull
   @Override
   public Dialog onCreateDialog(Bundle bundle) {
@@ -134,13 +103,13 @@
 
     CheckBox alwaysWarn = dialogView.findViewById(R.id.always_warn);
 
-    SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(getActivity());
+    SharedPreferences preferences = StorageComponent.get(getActivity()).unencryptedSharedPrefs();
     // The default is set to false in this case to ensure that the first time the dialog opens,
     // the checkbox is unchecked.
     alwaysWarn.setChecked(preferences.getBoolean(ALWAYS_SHOW_WARNING_PREFERENCE_KEY, false));
 
     AlertDialog alertDialog =
-        new AlertDialog.Builder(getActivity(), R.style.AlertDialogTheme)
+        new AlertDialog.Builder(getActivity())
             .setCancelable(false)
             .setView(dialogView)
             .setPositiveButton(
@@ -163,7 +132,7 @@
     preferences.edit().putBoolean(ALWAYS_SHOW_WARNING_PREFERENCE_KEY, alwaysWarn).apply();
 
     // Neither callback nor callId are null in normal circumstances. See comments on callback
-    callback.continueCall(getArguments().getString(ARG_CALL_ID));
+    continueCall(getArguments().getString(ARG_CALL_ID));
   }
 
   private void onNegativeButtonClick(@NonNull SharedPreferences preferences, boolean alwaysWarn) {
@@ -174,6 +143,37 @@
     preferences.edit().putBoolean(ALWAYS_SHOW_WARNING_PREFERENCE_KEY, alwaysWarn).apply();
 
     // Neither callback nor callId are null in normal circumstances. See comments on callback
-    callback.cancelCall(getArguments().getString(ARG_CALL_ID));
+    cancelCall(getArguments().getString(ARG_CALL_ID));
+  }
+
+  private void continueCall(@NonNull String callId) {
+    LogUtil.i(
+        "InternationalCallOnWifiDialogFragment.continueCall",
+        "Continuing call with ID: %s",
+        callId);
+    InternationalCallOnWifiDialogActivity activity =
+        FragmentUtils.getParent(this, InternationalCallOnWifiDialogActivity.class);
+    if (activity != null) {
+      activity.finish();
+    }
+  }
+
+  private void cancelCall(@NonNull String callId) {
+    DialerCall call = CallList.getInstance().getCallById(callId);
+    if (call == null) {
+      LogUtil.i(
+          "InternationalCallOnWifiDialogFragment.cancelCall",
+          "Call destroyed before the dialog is closed");
+    } else {
+      LogUtil.i(
+          "InternationalCallOnWifiDialogFragment.cancelCall",
+          "Disconnecting international call on WiFi");
+      call.disconnect();
+    }
+    InternationalCallOnWifiDialogActivity activity =
+        FragmentUtils.getParent(this, InternationalCallOnWifiDialogActivity.class);
+    if (activity != null) {
+      activity.finish();
+    }
   }
 }
diff --git a/java/com/android/incallui/telecomeventui/res/layout/frag_international_call_on_wifi_dialog.xml b/java/com/android/incallui/telecomeventui/res/layout/frag_international_call_on_wifi_dialog.xml
index 3d8adcb..5175b26 100644
--- a/java/com/android/incallui/telecomeventui/res/layout/frag_international_call_on_wifi_dialog.xml
+++ b/java/com/android/incallui/telecomeventui/res/layout/frag_international_call_on_wifi_dialog.xml
@@ -28,16 +28,16 @@
       android:layout_height="wrap_content"
       android:layout_marginBottom="10dp"
       android:text="@string/details"
-      android:textColor="@color/dialer_primary_text_color"
+      android:textColor="?android:attr/textColorPrimary"
       android:textSize="16sp"/>
 
   <CheckBox
       android:id="@+id/always_warn"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
-      android:buttonTint="@color/dialer_theme_color"
+      android:buttonTint="?android:attr/colorPrimary"
       android:text="@string/always_warn"
-      android:textColor="@color/dialer_primary_text_color"
+      android:textColor="?android:attr/textColorPrimary"
       android:textSize="14sp"/>
 </LinearLayout>
 
diff --git a/java/com/android/incallui/telecomeventui/res/values-af/strings.xml b/java/com/android/incallui/telecomeventui/res/values-af/strings.xml
index f037436..c3e6842 100644
--- a/java/com/android/incallui/telecomeventui/res/values-af/strings.xml
+++ b/java/com/android/incallui/telecomeventui/res/values-af/strings.xml
@@ -1,21 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="always_warn" msgid="8332929731464707890">"Wys elke keer waarskuwing"</string>
-    <string name="details" msgid="8642701148762155677">"Jy bel tans \'n internasionale nommer en heffings kan dalk geld."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="always_warn">Wys elke keer waarskuwing</string>
+  <string name="details">Jy bel tans \'n internasionale nommer en heffings kan dalk geld.</string>
 </resources>
diff --git a/java/com/android/incallui/telecomeventui/res/values-am/strings.xml b/java/com/android/incallui/telecomeventui/res/values-am/strings.xml
index 0afc289..6f58d4d 100644
--- a/java/com/android/incallui/telecomeventui/res/values-am/strings.xml
+++ b/java/com/android/incallui/telecomeventui/res/values-am/strings.xml
@@ -1,21 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="always_warn" msgid="8332929731464707890">"በሁሉም ጊዜ ማስጠንቀቂያ አሳይ"</string>
-    <string name="details" msgid="8642701148762155677">"ዓለም አቀፍ ቁጥር በመደወል ላይ ነዎት እናም ክፍያዎች ተፈጻሚ ሊሆኑ ይችላሉ።"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="always_warn">በሁሉም ጊዜ ማስጠንቀቂያ አሳይ</string>
+  <string name="details">ዓለም አቀፍ ቁጥር በመደወል ላይ ነዎት እናም ክፍያዎች ተፈጻሚ ሊሆኑ ይችላሉ።</string>
 </resources>
diff --git a/java/com/android/incallui/telecomeventui/res/values-ar/strings.xml b/java/com/android/incallui/telecomeventui/res/values-ar/strings.xml
index 2ffcefc..12d804b 100644
--- a/java/com/android/incallui/telecomeventui/res/values-ar/strings.xml
+++ b/java/com/android/incallui/telecomeventui/res/values-ar/strings.xml
@@ -1,21 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="always_warn" msgid="8332929731464707890">"إظهار التحذير في كل مرة"</string>
-    <string name="details" msgid="8642701148762155677">"أنت تتصل برقم دولي وقد يتم فرض رسوم."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="always_warn">إظهار التحذير في كل مرة</string>
+  <string name="details">أنت تتصل برقم دولي وقد يتم فرض رسوم.</string>
 </resources>
diff --git a/java/com/android/incallui/telecomeventui/res/values-az/strings.xml b/java/com/android/incallui/telecomeventui/res/values-az/strings.xml
index d4bb490..09c9559 100644
--- a/java/com/android/incallui/telecomeventui/res/values-az/strings.xml
+++ b/java/com/android/incallui/telecomeventui/res/values-az/strings.xml
@@ -1,21 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="always_warn" msgid="8332929731464707890">"Xəbərdarlığı hər dəfə göstərin"</string>
-    <string name="details" msgid="8642701148762155677">"Beynəlxalq nömrəyə zəng etdiyiniz üçün xərc tutula bilər."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="always_warn">Xəbərdarlığı hər dəfə göstərin</string>
+  <string name="details">Beynəlxalq nömrəyə zəng etdiyiniz üçün xərc tutula bilər.</string>
 </resources>
diff --git a/java/com/android/incallui/telecomeventui/res/values-b+sr+Latn/strings.xml b/java/com/android/incallui/telecomeventui/res/values-b+sr+Latn/strings.xml
index 0091701..913f145 100644
--- a/java/com/android/incallui/telecomeventui/res/values-b+sr+Latn/strings.xml
+++ b/java/com/android/incallui/telecomeventui/res/values-b+sr+Latn/strings.xml
@@ -1,21 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="always_warn" msgid="8332929731464707890">"Uvek prikazuj upozorenje"</string>
-    <string name="details" msgid="8642701148762155677">"Pozivate broj u inostranstvu i mogu da važe naknade."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="always_warn">Uvek prikazuj upozorenje</string>
+  <string name="details">Pozivate broj u inostranstvu i mogu da važe naknade.</string>
 </resources>
diff --git a/java/com/android/incallui/telecomeventui/res/values-be/strings.xml b/java/com/android/incallui/telecomeventui/res/values-be/strings.xml
index 783a7a5..b67a851 100644
--- a/java/com/android/incallui/telecomeventui/res/values-be/strings.xml
+++ b/java/com/android/incallui/telecomeventui/res/values-be/strings.xml
@@ -1,21 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="always_warn" msgid="8332929731464707890">"Заўсёды паказваць папярэджанне"</string>
-    <string name="details" msgid="8642701148762155677">"Вы выклікаеце міжнародны нумар. Можа спаганяцца плата."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="always_warn">Заўсёды паказваць папярэджанне</string>
+  <string name="details">Вы выклікаеце міжнародны нумар. Можа спаганяцца плата.</string>
 </resources>
diff --git a/java/com/android/incallui/telecomeventui/res/values-bg/strings.xml b/java/com/android/incallui/telecomeventui/res/values-bg/strings.xml
index 9b651ef..b2161ac 100644
--- a/java/com/android/incallui/telecomeventui/res/values-bg/strings.xml
+++ b/java/com/android/incallui/telecomeventui/res/values-bg/strings.xml
@@ -1,21 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="always_warn" msgid="8332929731464707890">"Показване на предупреждение всеки път"</string>
-    <string name="details" msgid="8642701148762155677">"Обаждате се до номер в чужбина и това може да се таксува."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="always_warn">Показване на предупреждение всеки път</string>
+  <string name="details">Обаждате се до номер в чужбина и това може да се таксува.</string>
 </resources>
diff --git a/java/com/android/incallui/telecomeventui/res/values-bn/strings.xml b/java/com/android/incallui/telecomeventui/res/values-bn/strings.xml
index b3c717a..57f039b 100644
--- a/java/com/android/incallui/telecomeventui/res/values-bn/strings.xml
+++ b/java/com/android/incallui/telecomeventui/res/values-bn/strings.xml
@@ -1,21 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="always_warn" msgid="8332929731464707890">"প্রতিবার সতর্কতা দেখান"</string>
-    <string name="details" msgid="8642701148762155677">"আপনি একটি আন্তর্জাতিক নম্বরে কল করছেন এবং চার্জ প্রযোজ্য হতে পারে।"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="always_warn">প্রতিবার সতর্কতা দেখান</string>
+  <string name="details">আপনি একটি আন্তর্জাতিক নম্বরে কল করছেন এবং চার্জ প্রযোজ্য হতে পারে।</string>
 </resources>
diff --git a/java/com/android/incallui/telecomeventui/res/values-bs/strings.xml b/java/com/android/incallui/telecomeventui/res/values-bs/strings.xml
index 63940dc..fb08c10 100644
--- a/java/com/android/incallui/telecomeventui/res/values-bs/strings.xml
+++ b/java/com/android/incallui/telecomeventui/res/values-bs/strings.xml
@@ -1,21 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="always_warn" msgid="8332929731464707890">"Prikaži upozorenje svaki put"</string>
-    <string name="details" msgid="8642701148762155677">"Zovete međunarodni broj i mogu nastati troškovi."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="always_warn">Prikaži upozorenje svaki put</string>
+  <string name="details">Zovete međunarodni broj i mogu nastati troškovi.</string>
 </resources>
diff --git a/java/com/android/incallui/telecomeventui/res/values-ca/strings.xml b/java/com/android/incallui/telecomeventui/res/values-ca/strings.xml
index d52eec6..d27dedf 100644
--- a/java/com/android/incallui/telecomeventui/res/values-ca/strings.xml
+++ b/java/com/android/incallui/telecomeventui/res/values-ca/strings.xml
@@ -1,21 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="always_warn" msgid="8332929731464707890">"Mostra un advertiment cada vegada"</string>
-    <string name="details" msgid="8642701148762155677">"Estàs a punt de trucar a un número internacional, i es poden aplicar càrrecs."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="always_warn">Mostra un advertiment cada vegada</string>
+  <string name="details">Estàs a punt de trucar a un número internacional, i es poden aplicar càrrecs.</string>
 </resources>
diff --git a/java/com/android/incallui/telecomeventui/res/values-cs/strings.xml b/java/com/android/incallui/telecomeventui/res/values-cs/strings.xml
index 639ed0c..62327c9 100644
--- a/java/com/android/incallui/telecomeventui/res/values-cs/strings.xml
+++ b/java/com/android/incallui/telecomeventui/res/values-cs/strings.xml
@@ -1,21 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="always_warn" msgid="8332929731464707890">"Zobrazovat upozornění pokaždé"</string>
-    <string name="details" msgid="8642701148762155677">"Voláte na mezinárodní číslo a mohou vám být účtovány poplatky."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="always_warn">Zobrazovat upozornění pokaždé</string>
+  <string name="details">Voláte na mezinárodní číslo a mohou vám být účtovány poplatky.</string>
 </resources>
diff --git a/java/com/android/incallui/telecomeventui/res/values-da/strings.xml b/java/com/android/incallui/telecomeventui/res/values-da/strings.xml
index a35f067..6d99047 100644
--- a/java/com/android/incallui/telecomeventui/res/values-da/strings.xml
+++ b/java/com/android/incallui/telecomeventui/res/values-da/strings.xml
@@ -1,21 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="always_warn" msgid="8332929731464707890">"Vis en advarsel hver gang"</string>
-    <string name="details" msgid="8642701148762155677">"Du ringer til et internationalt nummer, og du bliver muligvis opkrævet et gebyr."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="always_warn">Vis en advarsel hver gang</string>
+  <string name="details">Du ringer til et internationalt nummer, og du bliver muligvis opkrævet et gebyr.</string>
 </resources>
diff --git a/java/com/android/incallui/telecomeventui/res/values-de/strings.xml b/java/com/android/incallui/telecomeventui/res/values-de/strings.xml
index faf09e0..c3313e8 100644
--- a/java/com/android/incallui/telecomeventui/res/values-de/strings.xml
+++ b/java/com/android/incallui/telecomeventui/res/values-de/strings.xml
@@ -1,21 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="always_warn" msgid="8332929731464707890">"Warnung jedes Mal anzeigen"</string>
-    <string name="details" msgid="8642701148762155677">"Du rufst eine Nummer im Ausland an. Hierfür können Gebühren anfallen."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="always_warn">Warnung jedes Mal anzeigen</string>
+  <string name="details">Du rufst eine Nummer im Ausland an. Hierfür können Gebühren anfallen.</string>
 </resources>
diff --git a/java/com/android/incallui/telecomeventui/res/values-el/strings.xml b/java/com/android/incallui/telecomeventui/res/values-el/strings.xml
index 444c747..923982d 100644
--- a/java/com/android/incallui/telecomeventui/res/values-el/strings.xml
+++ b/java/com/android/incallui/telecomeventui/res/values-el/strings.xml
@@ -1,21 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="always_warn" msgid="8332929731464707890">"Εμφάνιση προειδοποίησης κάθε φορά"</string>
-    <string name="details" msgid="8642701148762155677">"Καλείτε έναν διεθνή αριθμό και ενδέχεται να ισχύουν χρεώσεις."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="always_warn">Εμφάνιση προειδοποίησης κάθε φορά</string>
+  <string name="details">Καλείτε έναν διεθνή αριθμό και ενδέχεται να ισχύουν χρεώσεις.</string>
 </resources>
diff --git a/java/com/android/incallui/telecomeventui/res/values-en-rAU/strings.xml b/java/com/android/incallui/telecomeventui/res/values-en-rAU/strings.xml
index 6aed13c..039b42f 100644
--- a/java/com/android/incallui/telecomeventui/res/values-en-rAU/strings.xml
+++ b/java/com/android/incallui/telecomeventui/res/values-en-rAU/strings.xml
@@ -1,21 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="always_warn" msgid="8332929731464707890">"Show warning every time"</string>
-    <string name="details" msgid="8642701148762155677">"You are calling an international number and charges may apply."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="always_warn">Show warning every time</string>
+  <string name="details">You are calling an international number and charges may apply.</string>
 </resources>
diff --git a/java/com/android/incallui/telecomeventui/res/values-en-rGB/strings.xml b/java/com/android/incallui/telecomeventui/res/values-en-rGB/strings.xml
index 6aed13c..039b42f 100644
--- a/java/com/android/incallui/telecomeventui/res/values-en-rGB/strings.xml
+++ b/java/com/android/incallui/telecomeventui/res/values-en-rGB/strings.xml
@@ -1,21 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="always_warn" msgid="8332929731464707890">"Show warning every time"</string>
-    <string name="details" msgid="8642701148762155677">"You are calling an international number and charges may apply."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="always_warn">Show warning every time</string>
+  <string name="details">You are calling an international number and charges may apply.</string>
 </resources>
diff --git a/java/com/android/incallui/telecomeventui/res/values-en-rIN/strings.xml b/java/com/android/incallui/telecomeventui/res/values-en-rIN/strings.xml
index 6aed13c..039b42f 100644
--- a/java/com/android/incallui/telecomeventui/res/values-en-rIN/strings.xml
+++ b/java/com/android/incallui/telecomeventui/res/values-en-rIN/strings.xml
@@ -1,21 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="always_warn" msgid="8332929731464707890">"Show warning every time"</string>
-    <string name="details" msgid="8642701148762155677">"You are calling an international number and charges may apply."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="always_warn">Show warning every time</string>
+  <string name="details">You are calling an international number and charges may apply.</string>
 </resources>
diff --git a/java/com/android/incallui/telecomeventui/res/values-es-rUS/strings.xml b/java/com/android/incallui/telecomeventui/res/values-es-rUS/strings.xml
index 19f47a5..b69cc9f 100644
--- a/java/com/android/incallui/telecomeventui/res/values-es-rUS/strings.xml
+++ b/java/com/android/incallui/telecomeventui/res/values-es-rUS/strings.xml
@@ -1,21 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="always_warn" msgid="8332929731464707890">"Mostrar advertencia siempre"</string>
-    <string name="details" msgid="8642701148762155677">"Estás llamando a un número internacional, y es posible que se apliquen cargos."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="always_warn">Mostrar advertencia siempre</string>
+  <string name="details">Estás llamando a un número internacional, y es posible que se apliquen cargos.</string>
 </resources>
diff --git a/java/com/android/incallui/telecomeventui/res/values-es/strings.xml b/java/com/android/incallui/telecomeventui/res/values-es/strings.xml
index a2a13d9..7cd91a1 100644
--- a/java/com/android/incallui/telecomeventui/res/values-es/strings.xml
+++ b/java/com/android/incallui/telecomeventui/res/values-es/strings.xml
@@ -1,21 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="always_warn" msgid="8332929731464707890">"Mostrar siempre la advertencia"</string>
-    <string name="details" msgid="8642701148762155677">"Estás llamando a un número internacional, por lo que puede que se apliquen cargos."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="always_warn">Mostrar siempre la advertencia</string>
+  <string name="details">Estás llamando a un número internacional, por lo que puede que se apliquen cargos.</string>
 </resources>
diff --git a/java/com/android/incallui/telecomeventui/res/values-et/strings.xml b/java/com/android/incallui/telecomeventui/res/values-et/strings.xml
index 3433c41..f8db0d2 100644
--- a/java/com/android/incallui/telecomeventui/res/values-et/strings.xml
+++ b/java/com/android/incallui/telecomeventui/res/values-et/strings.xml
@@ -1,21 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="always_warn" msgid="8332929731464707890">"Kuva hoiatus iga kord"</string>
-    <string name="details" msgid="8642701148762155677">"Helistate rahvusvahelisele numbrile ja kõne võib olla tasuline."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="always_warn">Kuva hoiatus iga kord</string>
+  <string name="details">Helistate rahvusvahelisele numbrile ja kõne võib olla tasuline.</string>
 </resources>
diff --git a/java/com/android/incallui/telecomeventui/res/values-eu/strings.xml b/java/com/android/incallui/telecomeventui/res/values-eu/strings.xml
index 8fda9ea..ef62dec 100644
--- a/java/com/android/incallui/telecomeventui/res/values-eu/strings.xml
+++ b/java/com/android/incallui/telecomeventui/res/values-eu/strings.xml
@@ -1,21 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="always_warn" msgid="8332929731464707890">"Erakutsi abisuak beti"</string>
-    <string name="details" msgid="8642701148762155677">"Nazioarteko telefono batera deitzera zoaz, eta agian zerbait kobratuko zaizu."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="always_warn">Erakutsi abisuak beti</string>
+  <string name="details">Nazioarteko telefono batera deitzera zoaz, eta agian zerbait kobratuko zaizu.</string>
 </resources>
diff --git a/java/com/android/incallui/telecomeventui/res/values-fa/strings.xml b/java/com/android/incallui/telecomeventui/res/values-fa/strings.xml
index 89dfb09..77825af 100644
--- a/java/com/android/incallui/telecomeventui/res/values-fa/strings.xml
+++ b/java/com/android/incallui/telecomeventui/res/values-fa/strings.xml
@@ -1,21 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="always_warn" msgid="8332929731464707890">"هر بار نمایش هشدار"</string>
-    <string name="details" msgid="8642701148762155677">"با شماره بین‌المللی تماس می‌گیرید و ممکن است هزینه‌ها اعمال شوند."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="always_warn">هر بار نمایش هشدار</string>
+  <string name="details">با شماره بین‌المللی تماس می‌گیرید و ممکن است هزینه‌ها اعمال شوند.</string>
 </resources>
diff --git a/java/com/android/incallui/telecomeventui/res/values-fi/strings.xml b/java/com/android/incallui/telecomeventui/res/values-fi/strings.xml
index 63e2cdb..b8240c1 100644
--- a/java/com/android/incallui/telecomeventui/res/values-fi/strings.xml
+++ b/java/com/android/incallui/telecomeventui/res/values-fi/strings.xml
@@ -1,21 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="always_warn" msgid="8332929731464707890">"Näytä aina varoitus"</string>
-    <string name="details" msgid="8642701148762155677">"Olet soittamassa kansainväliseen numeroon. Puhelusta saatetaan periä maksuja."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="always_warn">Näytä aina varoitus</string>
+  <string name="details">Olet soittamassa kansainväliseen numeroon. Puhelusta saatetaan periä maksuja.</string>
 </resources>
diff --git a/java/com/android/incallui/telecomeventui/res/values-fr-rCA/strings.xml b/java/com/android/incallui/telecomeventui/res/values-fr-rCA/strings.xml
index 09cd556..be16a26 100644
--- a/java/com/android/incallui/telecomeventui/res/values-fr-rCA/strings.xml
+++ b/java/com/android/incallui/telecomeventui/res/values-fr-rCA/strings.xml
@@ -1,21 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="always_warn" msgid="8332929731464707890">"Toujours afficher l\'avertissement"</string>
-    <string name="details" msgid="8642701148762155677">"Vous appelez un numéro international, et des frais peuvent s\'appliquer."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="always_warn">Toujours afficher l\'avertissement</string>
+  <string name="details">Vous appelez un numéro international, et des frais peuvent s\'appliquer.</string>
 </resources>
diff --git a/java/com/android/incallui/telecomeventui/res/values-fr/strings.xml b/java/com/android/incallui/telecomeventui/res/values-fr/strings.xml
index 79386e8..516d3cf 100644
--- a/java/com/android/incallui/telecomeventui/res/values-fr/strings.xml
+++ b/java/com/android/incallui/telecomeventui/res/values-fr/strings.xml
@@ -1,21 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="always_warn" msgid="8332929731464707890">"Afficher un avertissement à chaque fois"</string>
-    <string name="details" msgid="8642701148762155677">"Vous appelez un numéro international. Des frais peuvent s\'appliquer."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="always_warn">Afficher un avertissement à chaque fois</string>
+  <string name="details">Vous appelez un numéro international. Des frais peuvent s\'appliquer.</string>
 </resources>
diff --git a/java/com/android/incallui/telecomeventui/res/values-gl/strings.xml b/java/com/android/incallui/telecomeventui/res/values-gl/strings.xml
index 375636f..e306ba7 100644
--- a/java/com/android/incallui/telecomeventui/res/values-gl/strings.xml
+++ b/java/com/android/incallui/telecomeventui/res/values-gl/strings.xml
@@ -1,21 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="always_warn" msgid="8332929731464707890">"Mostrar advertencia sempre"</string>
-    <string name="details" msgid="8642701148762155677">"Estás chamando a un número internacional, polo que se poden aplicar cargos."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="always_warn">Mostrar advertencia sempre</string>
+  <string name="details">Estás chamando a un número internacional, polo que se poden aplicar cargos.</string>
 </resources>
diff --git a/java/com/android/incallui/telecomeventui/res/values-gu/strings.xml b/java/com/android/incallui/telecomeventui/res/values-gu/strings.xml
index aed7c39..c8e91e5 100644
--- a/java/com/android/incallui/telecomeventui/res/values-gu/strings.xml
+++ b/java/com/android/incallui/telecomeventui/res/values-gu/strings.xml
@@ -1,21 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="always_warn" msgid="8332929731464707890">"દર વખતે ચેતવણી બતાવો"</string>
-    <string name="details" msgid="8642701148762155677">"તમે આંતરરાષ્ટ્રીય નંબર પર કૉલ કરી રહ્યાં છો અને શુલ્ક લાગી શકે છે."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="always_warn">દર વખતે ચેતવણી બતાવો</string>
+  <string name="details">તમે આંતરરાષ્ટ્રીય નંબર પર કૉલ કરી રહ્યાં છો અને શુલ્ક લાગી શકે છે.</string>
 </resources>
diff --git a/java/com/android/incallui/telecomeventui/res/values-hi/strings.xml b/java/com/android/incallui/telecomeventui/res/values-hi/strings.xml
index 3d5aa0a..cb83f5a 100644
--- a/java/com/android/incallui/telecomeventui/res/values-hi/strings.xml
+++ b/java/com/android/incallui/telecomeventui/res/values-hi/strings.xml
@@ -1,21 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="always_warn" msgid="8332929731464707890">"हर बार चेतावनी दिखाएं"</string>
-    <string name="details" msgid="8642701148762155677">"आप एक अंतर्राष्ट्रीय नंबर पर कॉल कर रहे हैं और शुल्क लागू हो सकते हैं."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="always_warn">हर बार चेतावनी दिखाएं</string>
+  <string name="details">आप एक अंतर्राष्ट्रीय नंबर पर कॉल कर रहे हैं और शुल्क लागू हो सकते हैं.</string>
 </resources>
diff --git a/java/com/android/incallui/telecomeventui/res/values-hr/strings.xml b/java/com/android/incallui/telecomeventui/res/values-hr/strings.xml
index 833c4ca..f6e1cf9 100644
--- a/java/com/android/incallui/telecomeventui/res/values-hr/strings.xml
+++ b/java/com/android/incallui/telecomeventui/res/values-hr/strings.xml
@@ -1,21 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="always_warn" msgid="8332929731464707890">"Prikaži upozorenje svaki put"</string>
-    <string name="details" msgid="8642701148762155677">"Upućujete međunarodni poziv i možda se naplaćuju dodatne naknade."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="always_warn">Prikaži upozorenje svaki put</string>
+  <string name="details">Upućujete međunarodni poziv i možda se naplaćuju dodatne naknade.</string>
 </resources>
diff --git a/java/com/android/incallui/telecomeventui/res/values-hu/strings.xml b/java/com/android/incallui/telecomeventui/res/values-hu/strings.xml
index c81db8d..813c1e3 100644
--- a/java/com/android/incallui/telecomeventui/res/values-hu/strings.xml
+++ b/java/com/android/incallui/telecomeventui/res/values-hu/strings.xml
@@ -1,21 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="always_warn" msgid="8332929731464707890">"Figyelmeztetés megjelenítése minden alkalommal"</string>
-    <string name="details" msgid="8642701148762155677">"Nemzetközi hívást indít, melynek költsége lehet."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="always_warn">Figyelmeztetés megjelenítése minden alkalommal</string>
+  <string name="details">Nemzetközi hívást indít, melynek költsége lehet.</string>
 </resources>
diff --git a/java/com/android/incallui/telecomeventui/res/values-hy/strings.xml b/java/com/android/incallui/telecomeventui/res/values-hy/strings.xml
index eadde4b..86bdfc4 100644
--- a/java/com/android/incallui/telecomeventui/res/values-hy/strings.xml
+++ b/java/com/android/incallui/telecomeventui/res/values-hy/strings.xml
@@ -1,21 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="always_warn" msgid="8332929731464707890">"Ցուցադրել զգուշացում ամեն անգամ"</string>
-    <string name="details" msgid="8642701148762155677">"Դուք միջազգային զանգ եք կատարում, որի համար կարող է վճար գանձվել:"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="always_warn">Ցուցադրել զգուշացում ամեն անգամ</string>
+  <string name="details">Դուք միջազգային զանգ եք կատարում, որի համար կարող է վճար գանձվել:</string>
 </resources>
diff --git a/java/com/android/incallui/telecomeventui/res/values-in/strings.xml b/java/com/android/incallui/telecomeventui/res/values-in/strings.xml
index 3804b74..2a99540 100644
--- a/java/com/android/incallui/telecomeventui/res/values-in/strings.xml
+++ b/java/com/android/incallui/telecomeventui/res/values-in/strings.xml
@@ -1,21 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="always_warn" msgid="8332929731464707890">"Tampilkan peringatan setiap kali"</string>
-    <string name="details" msgid="8642701148762155677">"Anda menelepon nomor internasional dan mungkin dikenakan biaya."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="always_warn">Tampilkan peringatan setiap kali</string>
+  <string name="details">Anda menelepon nomor internasional dan mungkin dikenakan biaya.</string>
 </resources>
diff --git a/java/com/android/incallui/telecomeventui/res/values-is/strings.xml b/java/com/android/incallui/telecomeventui/res/values-is/strings.xml
index d2bde34..17f86cb 100644
--- a/java/com/android/incallui/telecomeventui/res/values-is/strings.xml
+++ b/java/com/android/incallui/telecomeventui/res/values-is/strings.xml
@@ -1,21 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="always_warn" msgid="8332929731464707890">"Birta alltaf viðvörun"</string>
-    <string name="details" msgid="8642701148762155677">"Þú ert að hringja í erlent númer og gjöld kunna að eiga við."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="always_warn">Birta alltaf viðvörun</string>
+  <string name="details">Þú ert að hringja í erlent númer og gjöld kunna að eiga við.</string>
 </resources>
diff --git a/java/com/android/incallui/telecomeventui/res/values-it/strings.xml b/java/com/android/incallui/telecomeventui/res/values-it/strings.xml
index 1d666f3..66d7846 100644
--- a/java/com/android/incallui/telecomeventui/res/values-it/strings.xml
+++ b/java/com/android/incallui/telecomeventui/res/values-it/strings.xml
@@ -1,21 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="always_warn" msgid="8332929731464707890">"Mostra l\'avviso ogni volta"</string>
-    <string name="details" msgid="8642701148762155677">"Stai chiamando un numero internazionale. Potrebbero essere applicate tariffe."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="always_warn">Mostra l\'avviso ogni volta</string>
+  <string name="details">Stai chiamando un numero internazionale. Potrebbero essere applicate tariffe.</string>
 </resources>
diff --git a/java/com/android/incallui/telecomeventui/res/values-iw/strings.xml b/java/com/android/incallui/telecomeventui/res/values-iw/strings.xml
index de52703..e8f7867 100644
--- a/java/com/android/incallui/telecomeventui/res/values-iw/strings.xml
+++ b/java/com/android/incallui/telecomeventui/res/values-iw/strings.xml
@@ -1,21 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="always_warn" msgid="8332929731464707890">"הצגת אזהרה בכל פעם"</string>
-    <string name="details" msgid="8642701148762155677">"השיחה היא למספר בחו\"ל. ייתכנו חיובים נוספים."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="always_warn">הצגת אזהרה בכל פעם</string>
+  <string name="details">השיחה היא למספר בחו\"ל. ייתכנו חיובים נוספים.</string>
 </resources>
diff --git a/java/com/android/incallui/telecomeventui/res/values-ja/strings.xml b/java/com/android/incallui/telecomeventui/res/values-ja/strings.xml
index 6736335..a54bf56 100644
--- a/java/com/android/incallui/telecomeventui/res/values-ja/strings.xml
+++ b/java/com/android/incallui/telecomeventui/res/values-ja/strings.xml
@@ -1,21 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="always_warn" msgid="8332929731464707890">"警告を毎回表示する"</string>
-    <string name="details" msgid="8642701148762155677">"海外の電話番号宛に発信しようとしています。これには通話料が適用される場合があります。"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="always_warn">警告を毎回表示する</string>
+  <string name="details">海外の電話番号宛に発信しようとしています。これには通話料が適用される場合があります。</string>
 </resources>
diff --git a/java/com/android/incallui/telecomeventui/res/values-ka/strings.xml b/java/com/android/incallui/telecomeventui/res/values-ka/strings.xml
index de25a25..64948fd 100644
--- a/java/com/android/incallui/telecomeventui/res/values-ka/strings.xml
+++ b/java/com/android/incallui/telecomeventui/res/values-ka/strings.xml
@@ -1,21 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="always_warn" msgid="8332929731464707890">"გაფრთხილების ჩვენება ყოველ ჯერზე"</string>
-    <string name="details" msgid="8642701148762155677">"თქვენ რეკავთ საერთაშორისო ნომერზე და შესაძლოა მოგიწიოთ საფასურის გადახდა."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="always_warn">გაფრთხილების ჩვენება ყოველ ჯერზე</string>
+  <string name="details">თქვენ რეკავთ საერთაშორისო ნომერზე და შესაძლოა მოგიწიოთ საფასურის გადახდა.</string>
 </resources>
diff --git a/java/com/android/incallui/telecomeventui/res/values-kk/strings.xml b/java/com/android/incallui/telecomeventui/res/values-kk/strings.xml
index 97c1c10..94adcb8 100644
--- a/java/com/android/incallui/telecomeventui/res/values-kk/strings.xml
+++ b/java/com/android/incallui/telecomeventui/res/values-kk/strings.xml
@@ -1,21 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="always_warn" msgid="8332929731464707890">"Ескертуді әрқашан көрсету"</string>
-    <string name="details" msgid="8642701148762155677">"Халықаралық нөмірге қоңырау шалып жатырсыз, ол үшін төлем алынуы мүмкін."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="always_warn">Ескертуді әрқашан көрсету</string>
+  <string name="details">Халықаралық нөмірге қоңырау шалып жатырсыз, ол үшін төлем алынуы мүмкін.</string>
 </resources>
diff --git a/java/com/android/incallui/telecomeventui/res/values-km/strings.xml b/java/com/android/incallui/telecomeventui/res/values-km/strings.xml
index 8449e7d..c0b826c 100644
--- a/java/com/android/incallui/telecomeventui/res/values-km/strings.xml
+++ b/java/com/android/incallui/telecomeventui/res/values-km/strings.xml
@@ -1,21 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="always_warn" msgid="8332929731464707890">"បង្ហាញ​ការព្រមាន​គ្រប់ពេល"</string>
-    <string name="details" msgid="8642701148762155677">"អ្នក​កំពុង​ហៅ​ទៅ​កាន់​លេខ​ក្រៅ​ប្រទេស ហើយ​អាច​នឹង​គិតថ្លៃ​សេវា។"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="always_warn">បង្ហាញ​ការព្រមាន​គ្រប់ពេល</string>
+  <string name="details">អ្នក​កំពុង​ហៅ​ទៅ​កាន់​លេខ​ក្រៅ​ប្រទេស ហើយ​អាច​នឹង​គិតថ្លៃ​សេវា។</string>
 </resources>
diff --git a/java/com/android/incallui/telecomeventui/res/values-kn/strings.xml b/java/com/android/incallui/telecomeventui/res/values-kn/strings.xml
index a77ced7..733d910 100644
--- a/java/com/android/incallui/telecomeventui/res/values-kn/strings.xml
+++ b/java/com/android/incallui/telecomeventui/res/values-kn/strings.xml
@@ -1,21 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="always_warn" msgid="8332929731464707890">"ಪ್ರತಿ ಬಾರಿ ಎಚ್ಚರಿಕೆ ತೋರಿಸಿ"</string>
-    <string name="details" msgid="8642701148762155677">"ನೀವು ಅಂತಾರಾಷ್ಟ್ರೀಯ ಸಂಖ್ಯೆಗೆ ಕರೆ ಮಾಡುತ್ತಿರುವಿರಿ ಮತ್ತು ದರಗಳು ಅನ್ವಯವಾಗಬಹುದು."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="always_warn">ಪ್ರತಿ ಬಾರಿ ಎಚ್ಚರಿಕೆ ತೋರಿಸಿ</string>
+  <string name="details">ನೀವು ಅಂತಾರಾಷ್ಟ್ರೀಯ ಸಂಖ್ಯೆಗೆ ಕರೆ ಮಾಡುತ್ತಿರುವಿರಿ ಮತ್ತು ದರಗಳು ಅನ್ವಯವಾಗಬಹುದು.</string>
 </resources>
diff --git a/java/com/android/incallui/telecomeventui/res/values-ko/strings.xml b/java/com/android/incallui/telecomeventui/res/values-ko/strings.xml
index 6f64efe..ab0dc0f 100644
--- a/java/com/android/incallui/telecomeventui/res/values-ko/strings.xml
+++ b/java/com/android/incallui/telecomeventui/res/values-ko/strings.xml
@@ -1,21 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="always_warn" msgid="8332929731464707890">"항상 경고 표시"</string>
-    <string name="details" msgid="8642701148762155677">"국제 전화번호로 전화를 걸고 있으며 요금이 부과될 수 있습니다."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="always_warn">항상 경고 표시</string>
+  <string name="details">국제 전화번호로 전화를 걸고 있으며 요금이 부과될 수 있습니다.</string>
 </resources>
diff --git a/java/com/android/incallui/telecomeventui/res/values-ky/strings.xml b/java/com/android/incallui/telecomeventui/res/values-ky/strings.xml
index ddc2ac4..e9bc525 100644
--- a/java/com/android/incallui/telecomeventui/res/values-ky/strings.xml
+++ b/java/com/android/incallui/telecomeventui/res/values-ky/strings.xml
@@ -1,21 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="always_warn" msgid="8332929731464707890">"Эскертүүнү ар дайым көрсөтүү"</string>
-    <string name="details" msgid="8642701148762155677">"Эл аралык чалуулар үчүн акы төлөп калышыңыз мүмкүн."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="always_warn">Эскертүүнү ар дайым көрсөтүү</string>
+  <string name="details">Эл аралык чалуулар үчүн акы төлөп калышыңыз мүмкүн.</string>
 </resources>
diff --git a/java/com/android/incallui/telecomeventui/res/values-lo/strings.xml b/java/com/android/incallui/telecomeventui/res/values-lo/strings.xml
index d851b59..ed997d7 100644
--- a/java/com/android/incallui/telecomeventui/res/values-lo/strings.xml
+++ b/java/com/android/incallui/telecomeventui/res/values-lo/strings.xml
@@ -1,21 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="always_warn" msgid="8332929731464707890">"ສະແດງຄຳເຕືອນທຸກຄັ້ງ"</string>
-    <string name="details" msgid="8642701148762155677">"ທ່ານກຳລັງໂທຫາເບີຕ່າງປະເທດ ແລະ ອາດມີການຮຽກເກັບເງິນໄດ້."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="always_warn">ສະແດງຄຳເຕືອນທຸກຄັ້ງ</string>
+  <string name="details">ທ່ານກຳລັງໂທຫາເບີຕ່າງປະເທດ ແລະ ອາດມີການຮຽກເກັບເງິນໄດ້.</string>
 </resources>
diff --git a/java/com/android/incallui/telecomeventui/res/values-lt/strings.xml b/java/com/android/incallui/telecomeventui/res/values-lt/strings.xml
index 4d2a72b..b52fdd4 100644
--- a/java/com/android/incallui/telecomeventui/res/values-lt/strings.xml
+++ b/java/com/android/incallui/telecomeventui/res/values-lt/strings.xml
@@ -1,21 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="always_warn" msgid="8332929731464707890">"Rodyti įspėjimą kiekvieną kartą"</string>
-    <string name="details" msgid="8642701148762155677">"Skambinate tarptautiniu numeriu, todėl gali būti taikomi mokesčiai."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="always_warn">Rodyti įspėjimą kiekvieną kartą</string>
+  <string name="details">Skambinate tarptautiniu numeriu, todėl gali būti taikomi mokesčiai.</string>
 </resources>
diff --git a/java/com/android/incallui/telecomeventui/res/values-lv/strings.xml b/java/com/android/incallui/telecomeventui/res/values-lv/strings.xml
index 854860e..d604af6 100644
--- a/java/com/android/incallui/telecomeventui/res/values-lv/strings.xml
+++ b/java/com/android/incallui/telecomeventui/res/values-lv/strings.xml
@@ -1,21 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="always_warn" msgid="8332929731464707890">"Rādīt brīdinājumu katru reizi"</string>
-    <string name="details" msgid="8642701148762155677">"Jūs zvanāt uz starptautisku numuru, un var tikt piemērota maksa"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="always_warn">Rādīt brīdinājumu katru reizi</string>
+  <string name="details">Jūs zvanāt uz starptautisku numuru, un var tikt piemērota maksa</string>
 </resources>
diff --git a/java/com/android/incallui/telecomeventui/res/values-mk/strings.xml b/java/com/android/incallui/telecomeventui/res/values-mk/strings.xml
index b7c6a12..221a4ec 100644
--- a/java/com/android/incallui/telecomeventui/res/values-mk/strings.xml
+++ b/java/com/android/incallui/telecomeventui/res/values-mk/strings.xml
@@ -1,21 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="always_warn" msgid="8332929731464707890">"Секогаш прикажувај предупредување"</string>
-    <string name="details" msgid="8642701148762155677">"Повикувате меѓународен број и може да ви се наплати."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="always_warn">Секогаш прикажувај предупредување</string>
+  <string name="details">Повикувате меѓународен број и може да ви се наплати.</string>
 </resources>
diff --git a/java/com/android/incallui/telecomeventui/res/values-ml/strings.xml b/java/com/android/incallui/telecomeventui/res/values-ml/strings.xml
index eb0a26e..a85b707 100644
--- a/java/com/android/incallui/telecomeventui/res/values-ml/strings.xml
+++ b/java/com/android/incallui/telecomeventui/res/values-ml/strings.xml
@@ -1,21 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="always_warn" msgid="8332929731464707890">"ഓരോ തവണയും മുന്നറിയിപ്പ് കാണിക്കുക"</string>
-    <string name="details" msgid="8642701148762155677">"നിങ്ങളൊരു അന്താരാഷ്‌ട്ര നമ്പറിലേക്ക് വിളിക്കുന്നതിനാൽ നിരക്കുകൾ ബാധകമായേക്കാം."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="always_warn">ഓരോ തവണയും മുന്നറിയിപ്പ് കാണിക്കുക</string>
+  <string name="details">നിങ്ങളൊരു അന്താരാഷ്‌ട്ര നമ്പറിലേക്ക് വിളിക്കുന്നതിനാൽ നിരക്കുകൾ ബാധകമായേക്കാം.</string>
 </resources>
diff --git a/java/com/android/incallui/telecomeventui/res/values-mn/strings.xml b/java/com/android/incallui/telecomeventui/res/values-mn/strings.xml
index 7900618..c8aedd1 100644
--- a/java/com/android/incallui/telecomeventui/res/values-mn/strings.xml
+++ b/java/com/android/incallui/telecomeventui/res/values-mn/strings.xml
@@ -1,21 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="always_warn" msgid="8332929731464707890">"Тухай бүрт анхааруулга харуулах"</string>
-    <string name="details" msgid="8642701148762155677">"Та олон улсын дугаар руу залгаж байгаа тул олон улсын төлбөр тооцогдож болзошгүй."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="always_warn">Тухай бүрт анхааруулга харуулах</string>
+  <string name="details">Та олон улсын дугаар руу залгаж байгаа тул олон улсын төлбөр тооцогдож болзошгүй.</string>
 </resources>
diff --git a/java/com/android/incallui/telecomeventui/res/values-mr/strings.xml b/java/com/android/incallui/telecomeventui/res/values-mr/strings.xml
index 2311711..e8832cf 100644
--- a/java/com/android/incallui/telecomeventui/res/values-mr/strings.xml
+++ b/java/com/android/incallui/telecomeventui/res/values-mr/strings.xml
@@ -1,21 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="always_warn" msgid="8332929731464707890">"प्रत्येक वेळी चेतावणी दर्शवा"</string>
-    <string name="details" msgid="8642701148762155677">"आपण एक आंतरराष्ट्रीय नंबरवर कॉल करत आहात आणि शुल्क लागू होऊ शकतात."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="always_warn">प्रत्येक वेळी चेतावणी दर्शवा</string>
+  <string name="details">आपण एक आंतरराष्ट्रीय नंबरवर कॉल करत आहात आणि शुल्क लागू होऊ शकते.</string>
 </resources>
diff --git a/java/com/android/incallui/telecomeventui/res/values-ms/strings.xml b/java/com/android/incallui/telecomeventui/res/values-ms/strings.xml
index f40941f..93b0d61 100644
--- a/java/com/android/incallui/telecomeventui/res/values-ms/strings.xml
+++ b/java/com/android/incallui/telecomeventui/res/values-ms/strings.xml
@@ -1,21 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="always_warn" msgid="8332929731464707890">"Tunjukkan amaran setiap kali"</string>
-    <string name="details" msgid="8642701148762155677">"Anda memanggil nombor antarabangsa dan caj mungkin dikenakan."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="always_warn">Tunjukkan amaran setiap kali</string>
+  <string name="details">Anda memanggil nombor antarabangsa dan caj mungkin dikenakan.</string>
 </resources>
diff --git a/java/com/android/incallui/telecomeventui/res/values-my/strings.xml b/java/com/android/incallui/telecomeventui/res/values-my/strings.xml
index 417611d..370c56f 100644
--- a/java/com/android/incallui/telecomeventui/res/values-my/strings.xml
+++ b/java/com/android/incallui/telecomeventui/res/values-my/strings.xml
@@ -1,21 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="always_warn" msgid="8332929731464707890">"သတိပေးချက်ကို အကြိမ်တိုင်းပြရန်"</string>
-    <string name="details" msgid="8642701148762155677">"သင်သည်  နိုင်ငံတကာဖုန်းနံပါတ်တစ်ခုကို ခေါ်ဆိုနေပြီး ဖုန်းခေါ်ဆိုခများ ကျသင့်နိုင်ပါသည်။"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="always_warn">သတိပေးချက်ကို အကြိမ်တိုင်းပြရန်</string>
+  <string name="details">သင်သည်  နိုင်ငံတကာဖုန်းနံပါတ်တစ်ခုကို ခေါ်ဆိုနေပြီး ဖုန်းခေါ်ဆိုခများ ကျသင့်နိုင်ပါသည်။</string>
 </resources>
diff --git a/java/com/android/incallui/telecomeventui/res/values-nb/strings.xml b/java/com/android/incallui/telecomeventui/res/values-nb/strings.xml
index 00f1de9..9cbc8d0 100644
--- a/java/com/android/incallui/telecomeventui/res/values-nb/strings.xml
+++ b/java/com/android/incallui/telecomeventui/res/values-nb/strings.xml
@@ -1,21 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="always_warn" msgid="8332929731464707890">"Vis advarsel hver gang"</string>
-    <string name="details" msgid="8642701148762155677">"Du ringer et utenlandsnummer – kostnader kan påløpe."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="always_warn">Vis advarsel hver gang</string>
+  <string name="details">Du ringer et utenlandsnummer – kostnader kan påløpe.</string>
 </resources>
diff --git a/java/com/android/incallui/telecomeventui/res/values-ne/strings.xml b/java/com/android/incallui/telecomeventui/res/values-ne/strings.xml
index 6937732..4c44176 100644
--- a/java/com/android/incallui/telecomeventui/res/values-ne/strings.xml
+++ b/java/com/android/incallui/telecomeventui/res/values-ne/strings.xml
@@ -1,21 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="always_warn" msgid="8332929731464707890">"प्रत्येक पटक चेतावनी देखाउनुहोस्"</string>
-    <string name="details" msgid="8642701148762155677">"तपाईं अन्तर्राष्ट्रिय नम्बरमा कल गर्दै हुनुहुन्छ र तोकिएको शुल्क लाग्न सक्छ।"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="always_warn">प्रत्येक पटक चेतावनी देखाउनुहोस्</string>
+  <string name="details">तपाईं अन्तर्राष्ट्रिय नम्बरमा कल गर्दै हुनुहुन्छ र तोकिएको शुल्क लाग्न सक्छ।</string>
 </resources>
diff --git a/java/com/android/incallui/telecomeventui/res/values-nl/strings.xml b/java/com/android/incallui/telecomeventui/res/values-nl/strings.xml
index 126c998..bbf057c 100644
--- a/java/com/android/incallui/telecomeventui/res/values-nl/strings.xml
+++ b/java/com/android/incallui/telecomeventui/res/values-nl/strings.xml
@@ -1,21 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="always_warn" msgid="8332929731464707890">"Waarschuwing elke keer weergeven"</string>
-    <string name="details" msgid="8642701148762155677">"Je belt een internationaal nummer. Er kunnen kosten in rekening worden gebracht."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="always_warn">Waarschuwing elke keer weergeven</string>
+  <string name="details">Je belt een internationaal nummer. Er kunnen kosten in rekening worden gebracht.</string>
 </resources>
diff --git a/java/com/android/incallui/telecomeventui/res/values-no/strings.xml b/java/com/android/incallui/telecomeventui/res/values-no/strings.xml
index 00f1de9..9cbc8d0 100644
--- a/java/com/android/incallui/telecomeventui/res/values-no/strings.xml
+++ b/java/com/android/incallui/telecomeventui/res/values-no/strings.xml
@@ -1,21 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="always_warn" msgid="8332929731464707890">"Vis advarsel hver gang"</string>
-    <string name="details" msgid="8642701148762155677">"Du ringer et utenlandsnummer – kostnader kan påløpe."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="always_warn">Vis advarsel hver gang</string>
+  <string name="details">Du ringer et utenlandsnummer – kostnader kan påløpe.</string>
 </resources>
diff --git a/java/com/android/incallui/telecomeventui/res/values-pa/strings.xml b/java/com/android/incallui/telecomeventui/res/values-pa/strings.xml
index ce187a2..c3d26a8 100644
--- a/java/com/android/incallui/telecomeventui/res/values-pa/strings.xml
+++ b/java/com/android/incallui/telecomeventui/res/values-pa/strings.xml
@@ -1,21 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="always_warn" msgid="8332929731464707890">"ਹਰ ਵਾਰ  ਚਿਤਾਵਨੀ   ਦਿਖਾਓ"</string>
-    <string name="details" msgid="8642701148762155677">"ਤੁਸੀਂ ਇੱਕ ਅੰਤਰਰਾਸ਼ਟਰੀ ਨੰਬਰ \'ਤੇ ਕਾਲ ਕਰ ਰਹੇ ਹੋ ਅਤੇ ਖਰਚੇ ਲਾਗੂ ਹੋ ਸਕਦੇ ਹਨ।"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="always_warn">ਹਰ ਵਾਰ  ਚਿਤਾਵਨੀ   ਦਿਖਾਓ </string>
+  <string name="details">ਤੁਸੀਂ ਇੱਕ ਅੰਤਰਰਾਸ਼ਟਰੀ ਨੰਬਰ \'ਤੇ ਕਾਲ ਕਰ ਰਹੇ ਹੋ ਅਤੇ ਖਰਚੇ ਲਾਗੂ ਹੋ ਸਕਦੇ ਹਨ।</string>
 </resources>
diff --git a/java/com/android/incallui/telecomeventui/res/values-pl/strings.xml b/java/com/android/incallui/telecomeventui/res/values-pl/strings.xml
index 9b07db6..d18d684 100644
--- a/java/com/android/incallui/telecomeventui/res/values-pl/strings.xml
+++ b/java/com/android/incallui/telecomeventui/res/values-pl/strings.xml
@@ -1,21 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="always_warn" msgid="8332929731464707890">"Zawsze pokazuj ostrzeżenie"</string>
-    <string name="details" msgid="8642701148762155677">"Dzwonisz pod numer zagraniczny, przez co mogą zostać naliczone opłaty."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="always_warn">Zawsze pokazuj ostrzeżenie</string>
+  <string name="details">Dzwonisz pod numer zagraniczny, przez co mogą zostać naliczone opłaty.</string>
 </resources>
diff --git a/java/com/android/incallui/telecomeventui/res/values-pt-rBR/strings.xml b/java/com/android/incallui/telecomeventui/res/values-pt-rBR/strings.xml
index 70723d8..365fa8c 100644
--- a/java/com/android/incallui/telecomeventui/res/values-pt-rBR/strings.xml
+++ b/java/com/android/incallui/telecomeventui/res/values-pt-rBR/strings.xml
@@ -1,21 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="always_warn" msgid="8332929731464707890">"Mostrar o aviso sempre"</string>
-    <string name="details" msgid="8642701148762155677">"Você está ligando para um número internacional sujeito a cobrança."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="always_warn">Mostrar o aviso sempre</string>
+  <string name="details">Você está ligando para um número internacional sujeito a cobrança.</string>
 </resources>
diff --git a/java/com/android/incallui/telecomeventui/res/values-pt-rPT/strings.xml b/java/com/android/incallui/telecomeventui/res/values-pt-rPT/strings.xml
index 6a1cf90..7138ac5 100644
--- a/java/com/android/incallui/telecomeventui/res/values-pt-rPT/strings.xml
+++ b/java/com/android/incallui/telecomeventui/res/values-pt-rPT/strings.xml
@@ -1,21 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="always_warn" msgid="8332929731464707890">"Mostrar sempre o aviso"</string>
-    <string name="details" msgid="8642701148762155677">"Está a ligar para um número internacional e poderão ser aplicadas taxas."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="always_warn">Mostrar sempre o aviso</string>
+  <string name="details">Está a ligar para um número internacional e poderão ser aplicadas taxas.</string>
 </resources>
diff --git a/java/com/android/incallui/telecomeventui/res/values-pt/strings.xml b/java/com/android/incallui/telecomeventui/res/values-pt/strings.xml
index 70723d8..365fa8c 100644
--- a/java/com/android/incallui/telecomeventui/res/values-pt/strings.xml
+++ b/java/com/android/incallui/telecomeventui/res/values-pt/strings.xml
@@ -1,21 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="always_warn" msgid="8332929731464707890">"Mostrar o aviso sempre"</string>
-    <string name="details" msgid="8642701148762155677">"Você está ligando para um número internacional sujeito a cobrança."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="always_warn">Mostrar o aviso sempre</string>
+  <string name="details">Você está ligando para um número internacional sujeito a cobrança.</string>
 </resources>
diff --git a/java/com/android/incallui/telecomeventui/res/values-ro/strings.xml b/java/com/android/incallui/telecomeventui/res/values-ro/strings.xml
index 3216ad5..663321b 100644
--- a/java/com/android/incallui/telecomeventui/res/values-ro/strings.xml
+++ b/java/com/android/incallui/telecomeventui/res/values-ro/strings.xml
@@ -1,21 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="always_warn" msgid="8332929731464707890">"Afișați avertismentul de fiecare dată"</string>
-    <string name="details" msgid="8642701148762155677">"Apelați un număr internațional și se pot aplica taxe."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="always_warn">Afișați avertismentul de fiecare dată</string>
+  <string name="details">Apelați un număr internațional și se pot aplica taxe.</string>
 </resources>
diff --git a/java/com/android/incallui/telecomeventui/res/values-ru/strings.xml b/java/com/android/incallui/telecomeventui/res/values-ru/strings.xml
index 56a43ac..da9f9e9 100644
--- a/java/com/android/incallui/telecomeventui/res/values-ru/strings.xml
+++ b/java/com/android/incallui/telecomeventui/res/values-ru/strings.xml
@@ -1,21 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="always_warn" msgid="8332929731464707890">"Показывать предупреждение каждый раз"</string>
-    <string name="details" msgid="8642701148762155677">"Может взиматься плата за международные звонки."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="always_warn">Показывать предупреждение каждый раз</string>
+  <string name="details">Может взиматься плата за международные звонки.</string>
 </resources>
diff --git a/java/com/android/incallui/telecomeventui/res/values-si/strings.xml b/java/com/android/incallui/telecomeventui/res/values-si/strings.xml
index 983a647..0af3bf0 100644
--- a/java/com/android/incallui/telecomeventui/res/values-si/strings.xml
+++ b/java/com/android/incallui/telecomeventui/res/values-si/strings.xml
@@ -1,21 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="always_warn" msgid="8332929731464707890">"සැමවිට අනතුරු ඇඟවීම් පෙන්වන්න"</string>
-    <string name="details" msgid="8642701148762155677">"ඔබ ජාත්‍යන්තර අංකයට අමතමින් සිටින අතර ගාස්තු අදාළ විය හැකිය."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="always_warn">සැමවිට අනතුරු ඇඟවීම් පෙන්වන්න</string>
+  <string name="details">ඔබ ජාත්‍යන්තර අංකයට අමතමින් සිටින අතර ගාස්තු අදාළ විය හැකිය.</string>
 </resources>
diff --git a/java/com/android/incallui/telecomeventui/res/values-sk/strings.xml b/java/com/android/incallui/telecomeventui/res/values-sk/strings.xml
index 0ffe2ed..4ab6832 100644
--- a/java/com/android/incallui/telecomeventui/res/values-sk/strings.xml
+++ b/java/com/android/incallui/telecomeventui/res/values-sk/strings.xml
@@ -1,21 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="always_warn" msgid="8332929731464707890">"Vždy zobrazovať upozornenie"</string>
-    <string name="details" msgid="8642701148762155677">"Voláte na číslo v inej krajine. Môžu sa účtovať poplatky."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="always_warn">Vždy zobrazovať upozornenie</string>
+  <string name="details">Voláte na číslo v inej krajine. Môžu sa účtovať poplatky.</string>
 </resources>
diff --git a/java/com/android/incallui/telecomeventui/res/values-sl/strings.xml b/java/com/android/incallui/telecomeventui/res/values-sl/strings.xml
index f684b3d..4170f53 100644
--- a/java/com/android/incallui/telecomeventui/res/values-sl/strings.xml
+++ b/java/com/android/incallui/telecomeventui/res/values-sl/strings.xml
@@ -1,21 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="always_warn" msgid="8332929731464707890">"Vedno prikaži opozorilo"</string>
-    <string name="details" msgid="8642701148762155677">"Kličete mednarodno številko, zato bo treba morda plačati stroške."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="always_warn">Vedno prikaži opozorilo</string>
+  <string name="details">Kličete mednarodno številko, zato bo treba morda plačati stroške.</string>
 </resources>
diff --git a/java/com/android/incallui/telecomeventui/res/values-sq/strings.xml b/java/com/android/incallui/telecomeventui/res/values-sq/strings.xml
index 13eafa1..f67f870 100644
--- a/java/com/android/incallui/telecomeventui/res/values-sq/strings.xml
+++ b/java/com/android/incallui/telecomeventui/res/values-sq/strings.xml
@@ -1,21 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="always_warn" msgid="8332929731464707890">"Shfaq paralajmërimin çdo herë"</string>
-    <string name="details" msgid="8642701148762155677">"Po telefonon një numër ndërkombëtar dhe mund të zbatohen tarifat."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="always_warn">Shfaq paralajmërimin çdo herë</string>
+  <string name="details">Po telefonon një numër ndërkombëtar dhe mund të zbatohen tarifat.</string>
 </resources>
diff --git a/java/com/android/incallui/telecomeventui/res/values-sr/strings.xml b/java/com/android/incallui/telecomeventui/res/values-sr/strings.xml
index 2bec4f1..11fe542 100644
--- a/java/com/android/incallui/telecomeventui/res/values-sr/strings.xml
+++ b/java/com/android/incallui/telecomeventui/res/values-sr/strings.xml
@@ -1,21 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="always_warn" msgid="8332929731464707890">"Увек приказуј упозорење"</string>
-    <string name="details" msgid="8642701148762155677">"Позивате број у иностранству и могу да важе накнаде."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="always_warn">Увек приказуј упозорење</string>
+  <string name="details">Позивате број у иностранству и могу да важе накнаде.</string>
 </resources>
diff --git a/java/com/android/incallui/telecomeventui/res/values-sv/strings.xml b/java/com/android/incallui/telecomeventui/res/values-sv/strings.xml
index 3b4bf13..1d95f56 100644
--- a/java/com/android/incallui/telecomeventui/res/values-sv/strings.xml
+++ b/java/com/android/incallui/telecomeventui/res/values-sv/strings.xml
@@ -1,21 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="always_warn" msgid="8332929731464707890">"Visa varning varje gång"</string>
-    <string name="details" msgid="8642701148762155677">"Du ringer ett nummer i utlandet och avgifter kan tillkomma."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="always_warn">Visa varning varje gång</string>
+  <string name="details">Du ringer ett nummer i utlandet och avgifter kan tillkomma.</string>
 </resources>
diff --git a/java/com/android/incallui/telecomeventui/res/values-sw/strings.xml b/java/com/android/incallui/telecomeventui/res/values-sw/strings.xml
index 02b4367..ba1c4b6 100644
--- a/java/com/android/incallui/telecomeventui/res/values-sw/strings.xml
+++ b/java/com/android/incallui/telecomeventui/res/values-sw/strings.xml
@@ -1,21 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="always_warn" msgid="8332929731464707890">"Onyesha onyo kila wakati"</string>
-    <string name="details" msgid="8642701148762155677">"Unapiga nambari ya kimataifa na huenda ukatozwa."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="always_warn">Onyesha onyo kila wakati</string>
+  <string name="details">Unapiga nambari ya kimataifa na huenda ukatozwa ada ya kupiga simu.</string>
 </resources>
diff --git a/java/com/android/incallui/telecomeventui/res/values-ta/strings.xml b/java/com/android/incallui/telecomeventui/res/values-ta/strings.xml
index 814f1f1..6d3854e 100644
--- a/java/com/android/incallui/telecomeventui/res/values-ta/strings.xml
+++ b/java/com/android/incallui/telecomeventui/res/values-ta/strings.xml
@@ -1,21 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="always_warn" msgid="8332929731464707890">"ஒவ்வொரு முறையும் எச்சரிக்கையைக் காட்டு"</string>
-    <string name="details" msgid="8642701148762155677">"சர்வதேச எண்ணை அழைக்கிறீர்கள், கட்டணங்கள் விதிக்கப்படலாம்."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="always_warn">ஒவ்வொரு முறையும் எச்சரிக்கையைக் காட்டு</string>
+  <string name="details">சர்வதேச எண்ணை அழைக்கிறீர்கள், பேமெண்ட்கள் விதிக்கப்படலாம்.</string>
 </resources>
diff --git a/java/com/android/incallui/telecomeventui/res/values-te/strings.xml b/java/com/android/incallui/telecomeventui/res/values-te/strings.xml
index 5753137..a636a29 100644
--- a/java/com/android/incallui/telecomeventui/res/values-te/strings.xml
+++ b/java/com/android/incallui/telecomeventui/res/values-te/strings.xml
@@ -1,21 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="always_warn" msgid="8332929731464707890">"ప్రతిసారి హెచ్చరికను చూపు"</string>
-    <string name="details" msgid="8642701148762155677">"మీరు అంతర్జాతీయ నంబర్‌కు కాల్ చేస్తున్నందున ఛార్జీలు వర్తించవచ్చు."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="always_warn">ప్రతిసారి హెచ్చరికను చూపు</string>
+  <string name="details">మీరు అంతర్జాతీయ నంబర్‌కు కాల్ చేస్తున్నందున ఛార్జీలు వర్తించవచ్చు.</string>
 </resources>
diff --git a/java/com/android/incallui/telecomeventui/res/values-th/strings.xml b/java/com/android/incallui/telecomeventui/res/values-th/strings.xml
index 7f37770..fcfae72 100644
--- a/java/com/android/incallui/telecomeventui/res/values-th/strings.xml
+++ b/java/com/android/incallui/telecomeventui/res/values-th/strings.xml
@@ -1,21 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="always_warn" msgid="8332929731464707890">"แสดงคำเตือนทุกครั้ง"</string>
-    <string name="details" msgid="8642701148762155677">"คุณกำลังโทรหาหมายเลขต่างประเทศและอาจมีค่าบริการ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="always_warn">แสดงคำเตือนทุกครั้ง</string>
+  <string name="details">คุณกำลังโทรหาหมายเลขต่างประเทศและอาจมีค่าบริการ</string>
 </resources>
diff --git a/java/com/android/incallui/telecomeventui/res/values-tl/strings.xml b/java/com/android/incallui/telecomeventui/res/values-tl/strings.xml
index 4d063fc..60fa42a 100644
--- a/java/com/android/incallui/telecomeventui/res/values-tl/strings.xml
+++ b/java/com/android/incallui/telecomeventui/res/values-tl/strings.xml
@@ -1,21 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="always_warn" msgid="8332929731464707890">"Palaging magpakita ng babala"</string>
-    <string name="details" msgid="8642701148762155677">"Tinatawagan mo ang isang internasyonal na numero at maaaring may mga babayaran."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="always_warn">Palaging magpakita ng babala</string>
+  <string name="details">Tinatawagan mo ang isang internasyonal na numero at maaaring may mga babayaran.</string>
 </resources>
diff --git a/java/com/android/incallui/telecomeventui/res/values-tr/strings.xml b/java/com/android/incallui/telecomeventui/res/values-tr/strings.xml
index 7de0987..ae4f164 100644
--- a/java/com/android/incallui/telecomeventui/res/values-tr/strings.xml
+++ b/java/com/android/incallui/telecomeventui/res/values-tr/strings.xml
@@ -1,21 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="always_warn" msgid="8332929731464707890">"Her seferinde uyarı göster"</string>
-    <string name="details" msgid="8642701148762155677">"Uluslararası bir numarayı arıyorsunuz. Bu çağrı için ücret alınabilir."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="always_warn">Her seferinde uyarı göster</string>
+  <string name="details">Uluslararası bir numarayı arıyorsunuz. Bu çağrı için ücret alınabilir.</string>
 </resources>
diff --git a/java/com/android/incallui/telecomeventui/res/values-uk/strings.xml b/java/com/android/incallui/telecomeventui/res/values-uk/strings.xml
index 00213bb..3c5185c 100644
--- a/java/com/android/incallui/telecomeventui/res/values-uk/strings.xml
+++ b/java/com/android/incallui/telecomeventui/res/values-uk/strings.xml
@@ -1,21 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="always_warn" msgid="8332929731464707890">"Показувати попередження щоразу"</string>
-    <string name="details" msgid="8642701148762155677">"Ви телефонуєте на міжнародний номер, тому за дзвінок може стягуватися плата."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="always_warn">Показувати попередження щоразу</string>
+  <string name="details">Ви телефонуєте на міжнародний номер, тому за дзвінок може стягуватися плата.</string>
 </resources>
diff --git a/java/com/android/incallui/telecomeventui/res/values-ur/strings.xml b/java/com/android/incallui/telecomeventui/res/values-ur/strings.xml
index e3aaa6a..6d4c8cc 100644
--- a/java/com/android/incallui/telecomeventui/res/values-ur/strings.xml
+++ b/java/com/android/incallui/telecomeventui/res/values-ur/strings.xml
@@ -1,21 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="always_warn" msgid="8332929731464707890">"ہر بار تنبیہ دکھائیں"</string>
-    <string name="details" msgid="8642701148762155677">"آپ ایک بین الاقوامی نمبر پر کال کر رہے ہیں تو اس لئے ہو سکتا ہے چارجز لاگو ہوں۔"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="always_warn">ہر بار تنبیہ دکھائیں</string>
+  <string name="details">آپ ایک بین الاقوامی نمبر پر کال کر رہے ہیں تو اس لئے ہو سکتا ہے چارجز لاگو ہوں۔</string>
 </resources>
diff --git a/java/com/android/incallui/telecomeventui/res/values-uz/strings.xml b/java/com/android/incallui/telecomeventui/res/values-uz/strings.xml
index 5b74d29..4ce0c1c 100644
--- a/java/com/android/incallui/telecomeventui/res/values-uz/strings.xml
+++ b/java/com/android/incallui/telecomeventui/res/values-uz/strings.xml
@@ -1,21 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="always_warn" msgid="8332929731464707890">"Har safar ogohlantiruvchi bildirishnoma ko‘rsatilsin"</string>
-    <string name="details" msgid="8642701148762155677">"Siz chet elga qo‘ng‘iroq qilmoqdasiz. Xalqaro qo‘ng‘iroqlar uchun to‘lov olinishi mumkin."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="always_warn">Har safar ogohlantiruvchi bildirishnoma ko‘rsatilsin</string>
+  <string name="details">Siz chet elga qo‘ng‘iroq qilmoqdasiz. Xalqaro qo‘ng‘iroqlar uchun to‘lov olinishi mumkin.</string>
 </resources>
diff --git a/java/com/android/incallui/telecomeventui/res/values-vi/strings.xml b/java/com/android/incallui/telecomeventui/res/values-vi/strings.xml
index bfdc0ef..fca001c 100644
--- a/java/com/android/incallui/telecomeventui/res/values-vi/strings.xml
+++ b/java/com/android/incallui/telecomeventui/res/values-vi/strings.xml
@@ -1,21 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="always_warn" msgid="8332929731464707890">"Hiển thị cảnh báo mọi lúc"</string>
-    <string name="details" msgid="8642701148762155677">"Bạn đang gọi số quốc tế và có thể bị tính phí."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="always_warn">Hiển thị cảnh báo mọi lúc</string>
+  <string name="details">Bạn đang gọi số quốc tế và có thể bị tính phí.</string>
 </resources>
diff --git a/java/com/android/incallui/telecomeventui/res/values-zh-rCN/strings.xml b/java/com/android/incallui/telecomeventui/res/values-zh-rCN/strings.xml
index 352318f..c1bf98f 100644
--- a/java/com/android/incallui/telecomeventui/res/values-zh-rCN/strings.xml
+++ b/java/com/android/incallui/telecomeventui/res/values-zh-rCN/strings.xml
@@ -1,21 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="always_warn" msgid="8332929731464707890">"每次都显示警告"</string>
-    <string name="details" msgid="8642701148762155677">"您要拨打的是国际电话，可能需要支付国际通话费用。"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="always_warn">每次都显示警告</string>
+  <string name="details">您要拨打的是国际电话，可能需要支付国际通话费用。</string>
 </resources>
diff --git a/java/com/android/incallui/telecomeventui/res/values-zh-rHK/strings.xml b/java/com/android/incallui/telecomeventui/res/values-zh-rHK/strings.xml
index 8c27f15..556dc16 100644
--- a/java/com/android/incallui/telecomeventui/res/values-zh-rHK/strings.xml
+++ b/java/com/android/incallui/telecomeventui/res/values-zh-rHK/strings.xml
@@ -1,21 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="always_warn" msgid="8332929731464707890">"每次都顯示警告"</string>
-    <string name="details" msgid="8642701148762155677">"您要撥打的是國際電話，可能需要支付相關費用。"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="always_warn">每次都顯示警告</string>
+  <string name="details">您要撥打的是國際電話，可能需要支付相關費用。</string>
 </resources>
diff --git a/java/com/android/incallui/telecomeventui/res/values-zh-rTW/strings.xml b/java/com/android/incallui/telecomeventui/res/values-zh-rTW/strings.xml
index 320a4c0..f6fdddc 100644
--- a/java/com/android/incallui/telecomeventui/res/values-zh-rTW/strings.xml
+++ b/java/com/android/incallui/telecomeventui/res/values-zh-rTW/strings.xml
@@ -1,21 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="always_warn" msgid="8332929731464707890">"每次都顯示警告訊息"</string>
-    <string name="details" msgid="8642701148762155677">"你即將撥打國際電話，可能需要支付國際通話費用。"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="always_warn">每次都顯示警告訊息</string>
+  <string name="details">你即將撥打國際電話，可能需要支付國際通話費用。</string>
 </resources>
diff --git a/java/com/android/incallui/telecomeventui/res/values-zu/strings.xml b/java/com/android/incallui/telecomeventui/res/values-zu/strings.xml
index a61ebe4..5dcb8bf 100644
--- a/java/com/android/incallui/telecomeventui/res/values-zu/strings.xml
+++ b/java/com/android/incallui/telecomeventui/res/values-zu/strings.xml
@@ -1,21 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="always_warn" msgid="8332929731464707890">"Bonisa isexwayiso njalo"</string>
-    <string name="details" msgid="8642701148762155677">"Ufonela inombolo yamazwe ngamazwe futhi izindleko zingasebenza."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="always_warn">Bonisa isexwayiso njalo</string>
+  <string name="details">Ufonela inombolo yamazwe ngamazwe futhi izindleko zingasebenza.</string>
 </resources>
diff --git a/java/com/android/incallui/theme/AndroidManifest.xml b/java/com/android/incallui/theme/AndroidManifest.xml
new file mode 100644
index 0000000..3b1a459
--- /dev/null
+++ b/java/com/android/incallui/theme/AndroidManifest.xml
@@ -0,0 +1,16 @@
+<!--
+  ~ Copyright (C) 2018 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+<manifest package="com.android.incallui.theme"/>
diff --git a/java/com/android/incallui/theme/res/drawable/incall_background_gradient.xml b/java/com/android/incallui/theme/res/drawable/incall_background_gradient.xml
new file mode 100644
index 0000000..996f172
--- /dev/null
+++ b/java/com/android/incallui/theme/res/drawable/incall_background_gradient.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2018 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+  <gradient
+    android:angle="270"
+    android:startColor="@color/incall_background_gradient_top"
+    android:centerColor="@color/incall_background_gradient_middle"
+    android:endColor="@color/incall_background_gradient_bottom"/>
+</shape>
diff --git a/java/com/android/incallui/theme/res/values-af/strings.xml b/java/com/android/incallui/theme/res/values-af/strings.xml
new file mode 100644
index 0000000..e22bee5
--- /dev/null
+++ b/java/com/android/incallui/theme/res/values-af/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="phoneAppLabel" product="default">Foon</string>
+</resources>
diff --git a/java/com/android/incallui/theme/res/values-am/strings.xml b/java/com/android/incallui/theme/res/values-am/strings.xml
new file mode 100644
index 0000000..8c0c172
--- /dev/null
+++ b/java/com/android/incallui/theme/res/values-am/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="phoneAppLabel" product="default">ስልክ  </string>
+</resources>
diff --git a/java/com/android/incallui/theme/res/values-ar/strings.xml b/java/com/android/incallui/theme/res/values-ar/strings.xml
new file mode 100644
index 0000000..22662cb
--- /dev/null
+++ b/java/com/android/incallui/theme/res/values-ar/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="phoneAppLabel" product="default">الهاتف</string>
+</resources>
diff --git a/java/com/android/incallui/theme/res/values-az/strings.xml b/java/com/android/incallui/theme/res/values-az/strings.xml
new file mode 100644
index 0000000..0b949e2
--- /dev/null
+++ b/java/com/android/incallui/theme/res/values-az/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="phoneAppLabel" product="default">Telefon</string>
+</resources>
diff --git a/java/com/android/incallui/theme/res/values-b+sr+Latn/strings.xml b/java/com/android/incallui/theme/res/values-b+sr+Latn/strings.xml
new file mode 100644
index 0000000..0b949e2
--- /dev/null
+++ b/java/com/android/incallui/theme/res/values-b+sr+Latn/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="phoneAppLabel" product="default">Telefon</string>
+</resources>
diff --git a/java/com/android/incallui/theme/res/values-be/strings.xml b/java/com/android/incallui/theme/res/values-be/strings.xml
new file mode 100644
index 0000000..f6b1b55
--- /dev/null
+++ b/java/com/android/incallui/theme/res/values-be/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="phoneAppLabel" product="default">Тэлефон</string>
+</resources>
diff --git a/java/com/android/incallui/theme/res/values-bg/strings.xml b/java/com/android/incallui/theme/res/values-bg/strings.xml
new file mode 100644
index 0000000..a48633c
--- /dev/null
+++ b/java/com/android/incallui/theme/res/values-bg/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="phoneAppLabel" product="default">Телефон</string>
+</resources>
diff --git a/java/com/android/incallui/theme/res/values-bn/strings.xml b/java/com/android/incallui/theme/res/values-bn/strings.xml
new file mode 100644
index 0000000..1271dcd
--- /dev/null
+++ b/java/com/android/incallui/theme/res/values-bn/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="phoneAppLabel" product="default">ফোন</string>
+</resources>
diff --git a/java/com/android/incallui/theme/res/values-bs/strings.xml b/java/com/android/incallui/theme/res/values-bs/strings.xml
new file mode 100644
index 0000000..0b949e2
--- /dev/null
+++ b/java/com/android/incallui/theme/res/values-bs/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="phoneAppLabel" product="default">Telefon</string>
+</resources>
diff --git a/java/com/android/incallui/theme/res/values-ca/strings.xml b/java/com/android/incallui/theme/res/values-ca/strings.xml
new file mode 100644
index 0000000..b958e00
--- /dev/null
+++ b/java/com/android/incallui/theme/res/values-ca/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="phoneAppLabel" product="default">Telèfon</string>
+</resources>
diff --git a/java/com/android/incallui/theme/res/values-cs/strings.xml b/java/com/android/incallui/theme/res/values-cs/strings.xml
new file mode 100644
index 0000000..0b949e2
--- /dev/null
+++ b/java/com/android/incallui/theme/res/values-cs/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="phoneAppLabel" product="default">Telefon</string>
+</resources>
diff --git a/java/com/android/incallui/theme/res/values-da/strings.xml b/java/com/android/incallui/theme/res/values-da/strings.xml
new file mode 100644
index 0000000..c4679b7
--- /dev/null
+++ b/java/com/android/incallui/theme/res/values-da/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="phoneAppLabel" product="default">Opkald</string>
+</resources>
diff --git a/java/com/android/incallui/theme/res/values-de/strings.xml b/java/com/android/incallui/theme/res/values-de/strings.xml
new file mode 100644
index 0000000..0b949e2
--- /dev/null
+++ b/java/com/android/incallui/theme/res/values-de/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="phoneAppLabel" product="default">Telefon</string>
+</resources>
diff --git a/java/com/android/incallui/theme/res/values-el/strings.xml b/java/com/android/incallui/theme/res/values-el/strings.xml
new file mode 100644
index 0000000..8dc18f5
--- /dev/null
+++ b/java/com/android/incallui/theme/res/values-el/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="phoneAppLabel" product="default">Τηλέφωνο</string>
+</resources>
diff --git a/java/com/android/incallui/theme/res/values-en-rAU/strings.xml b/java/com/android/incallui/theme/res/values-en-rAU/strings.xml
new file mode 100644
index 0000000..d6d9cfa
--- /dev/null
+++ b/java/com/android/incallui/theme/res/values-en-rAU/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="phoneAppLabel" product="default">Phone</string>
+</resources>
diff --git a/java/com/android/incallui/theme/res/values-en-rGB/strings.xml b/java/com/android/incallui/theme/res/values-en-rGB/strings.xml
new file mode 100644
index 0000000..d6d9cfa
--- /dev/null
+++ b/java/com/android/incallui/theme/res/values-en-rGB/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="phoneAppLabel" product="default">Phone</string>
+</resources>
diff --git a/java/com/android/incallui/theme/res/values-en-rIN/strings.xml b/java/com/android/incallui/theme/res/values-en-rIN/strings.xml
new file mode 100644
index 0000000..d6d9cfa
--- /dev/null
+++ b/java/com/android/incallui/theme/res/values-en-rIN/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="phoneAppLabel" product="default">Phone</string>
+</resources>
diff --git a/java/com/android/incallui/theme/res/values-es-rUS/strings.xml b/java/com/android/incallui/theme/res/values-es-rUS/strings.xml
new file mode 100644
index 0000000..8c647cb
--- /dev/null
+++ b/java/com/android/incallui/theme/res/values-es-rUS/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="phoneAppLabel" product="default">Teléfono</string>
+</resources>
diff --git a/java/com/android/incallui/theme/res/values-es/strings.xml b/java/com/android/incallui/theme/res/values-es/strings.xml
new file mode 100644
index 0000000..8c647cb
--- /dev/null
+++ b/java/com/android/incallui/theme/res/values-es/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="phoneAppLabel" product="default">Teléfono</string>
+</resources>
diff --git a/java/com/android/incallui/theme/res/values-et/strings.xml b/java/com/android/incallui/theme/res/values-et/strings.xml
new file mode 100644
index 0000000..0b949e2
--- /dev/null
+++ b/java/com/android/incallui/theme/res/values-et/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="phoneAppLabel" product="default">Telefon</string>
+</resources>
diff --git a/java/com/android/incallui/theme/res/values-eu/strings.xml b/java/com/android/incallui/theme/res/values-eu/strings.xml
new file mode 100644
index 0000000..f96ea54
--- /dev/null
+++ b/java/com/android/incallui/theme/res/values-eu/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="phoneAppLabel" product="default">Telefonoa</string>
+</resources>
diff --git a/java/com/android/incallui/theme/res/values-fa/strings.xml b/java/com/android/incallui/theme/res/values-fa/strings.xml
new file mode 100644
index 0000000..5457352
--- /dev/null
+++ b/java/com/android/incallui/theme/res/values-fa/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="phoneAppLabel" product="default">تلفن</string>
+</resources>
diff --git a/java/com/android/incallui/theme/res/values-fi/strings.xml b/java/com/android/incallui/theme/res/values-fi/strings.xml
new file mode 100644
index 0000000..cecf264
--- /dev/null
+++ b/java/com/android/incallui/theme/res/values-fi/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="phoneAppLabel" product="default">Puhelin</string>
+</resources>
diff --git a/java/com/android/incallui/theme/res/values-fr-rCA/strings.xml b/java/com/android/incallui/theme/res/values-fr-rCA/strings.xml
new file mode 100644
index 0000000..9ef1189
--- /dev/null
+++ b/java/com/android/incallui/theme/res/values-fr-rCA/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="phoneAppLabel" product="default">Téléphone</string>
+</resources>
diff --git a/java/com/android/incallui/theme/res/values-fr/strings.xml b/java/com/android/incallui/theme/res/values-fr/strings.xml
new file mode 100644
index 0000000..9ef1189
--- /dev/null
+++ b/java/com/android/incallui/theme/res/values-fr/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="phoneAppLabel" product="default">Téléphone</string>
+</resources>
diff --git a/java/com/android/incallui/theme/res/values-gl/strings.xml b/java/com/android/incallui/theme/res/values-gl/strings.xml
new file mode 100644
index 0000000..8c647cb
--- /dev/null
+++ b/java/com/android/incallui/theme/res/values-gl/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="phoneAppLabel" product="default">Teléfono</string>
+</resources>
diff --git a/java/com/android/incallui/theme/res/values-gu/strings.xml b/java/com/android/incallui/theme/res/values-gu/strings.xml
new file mode 100644
index 0000000..f3fec46
--- /dev/null
+++ b/java/com/android/incallui/theme/res/values-gu/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="phoneAppLabel" product="default">ફોન</string>
+</resources>
diff --git a/java/com/android/incallui/theme/res/values-hi/strings.xml b/java/com/android/incallui/theme/res/values-hi/strings.xml
new file mode 100644
index 0000000..8241de6
--- /dev/null
+++ b/java/com/android/incallui/theme/res/values-hi/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="phoneAppLabel" product="default">फ़ोन</string>
+</resources>
diff --git a/java/com/android/incallui/theme/res/values-hr/strings.xml b/java/com/android/incallui/theme/res/values-hr/strings.xml
new file mode 100644
index 0000000..0b949e2
--- /dev/null
+++ b/java/com/android/incallui/theme/res/values-hr/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="phoneAppLabel" product="default">Telefon</string>
+</resources>
diff --git a/java/com/android/incallui/theme/res/values-hu/strings.xml b/java/com/android/incallui/theme/res/values-hu/strings.xml
new file mode 100644
index 0000000..0b949e2
--- /dev/null
+++ b/java/com/android/incallui/theme/res/values-hu/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="phoneAppLabel" product="default">Telefon</string>
+</resources>
diff --git a/java/com/android/incallui/theme/res/values-hy/strings.xml b/java/com/android/incallui/theme/res/values-hy/strings.xml
new file mode 100644
index 0000000..8d32b39
--- /dev/null
+++ b/java/com/android/incallui/theme/res/values-hy/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="phoneAppLabel" product="default">Հեռախոս</string>
+</resources>
diff --git a/java/com/android/incallui/theme/res/values-in/strings.xml b/java/com/android/incallui/theme/res/values-in/strings.xml
new file mode 100644
index 0000000..3e186e3
--- /dev/null
+++ b/java/com/android/incallui/theme/res/values-in/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="phoneAppLabel" product="default">Telepon</string>
+</resources>
diff --git a/java/com/android/incallui/theme/res/values-is/strings.xml b/java/com/android/incallui/theme/res/values-is/strings.xml
new file mode 100644
index 0000000..ab41008
--- /dev/null
+++ b/java/com/android/incallui/theme/res/values-is/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="phoneAppLabel" product="default">Sími</string>
+</resources>
diff --git a/java/com/android/incallui/theme/res/values-it/strings.xml b/java/com/android/incallui/theme/res/values-it/strings.xml
new file mode 100644
index 0000000..343ca8c
--- /dev/null
+++ b/java/com/android/incallui/theme/res/values-it/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="phoneAppLabel" product="default">Telefono</string>
+</resources>
diff --git a/java/com/android/incallui/theme/res/values-iw/strings.xml b/java/com/android/incallui/theme/res/values-iw/strings.xml
new file mode 100644
index 0000000..70b3f54
--- /dev/null
+++ b/java/com/android/incallui/theme/res/values-iw/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="phoneAppLabel" product="default">טלפון</string>
+</resources>
diff --git a/java/com/android/incallui/theme/res/values-ja/strings.xml b/java/com/android/incallui/theme/res/values-ja/strings.xml
new file mode 100644
index 0000000..c50be1c
--- /dev/null
+++ b/java/com/android/incallui/theme/res/values-ja/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="phoneAppLabel" product="default">電話</string>
+</resources>
diff --git a/java/com/android/incallui/theme/res/values-ka/strings.xml b/java/com/android/incallui/theme/res/values-ka/strings.xml
new file mode 100644
index 0000000..561b3fd
--- /dev/null
+++ b/java/com/android/incallui/theme/res/values-ka/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="phoneAppLabel" product="default">ტელეფონი</string>
+</resources>
diff --git a/java/com/android/incallui/theme/res/values-kk/strings.xml b/java/com/android/incallui/theme/res/values-kk/strings.xml
new file mode 100644
index 0000000..a48633c
--- /dev/null
+++ b/java/com/android/incallui/theme/res/values-kk/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="phoneAppLabel" product="default">Телефон</string>
+</resources>
diff --git a/java/com/android/incallui/theme/res/values-km/strings.xml b/java/com/android/incallui/theme/res/values-km/strings.xml
new file mode 100644
index 0000000..dec5f7b
--- /dev/null
+++ b/java/com/android/incallui/theme/res/values-km/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="phoneAppLabel" product="default">ទូរស័ព្ទ</string>
+</resources>
diff --git a/java/com/android/incallui/theme/res/values-kn/strings.xml b/java/com/android/incallui/theme/res/values-kn/strings.xml
new file mode 100644
index 0000000..49128ab
--- /dev/null
+++ b/java/com/android/incallui/theme/res/values-kn/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="phoneAppLabel" product="default">ಫೋನ್</string>
+</resources>
diff --git a/java/com/android/incallui/theme/res/values-ko/strings.xml b/java/com/android/incallui/theme/res/values-ko/strings.xml
new file mode 100644
index 0000000..12e76f2
--- /dev/null
+++ b/java/com/android/incallui/theme/res/values-ko/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="phoneAppLabel" product="default">휴대전화</string>
+</resources>
diff --git a/java/com/android/incallui/theme/res/values-ky/strings.xml b/java/com/android/incallui/theme/res/values-ky/strings.xml
new file mode 100644
index 0000000..a48633c
--- /dev/null
+++ b/java/com/android/incallui/theme/res/values-ky/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="phoneAppLabel" product="default">Телефон</string>
+</resources>
diff --git a/java/com/android/incallui/theme/res/values-lo/strings.xml b/java/com/android/incallui/theme/res/values-lo/strings.xml
new file mode 100644
index 0000000..4320db2
--- /dev/null
+++ b/java/com/android/incallui/theme/res/values-lo/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="phoneAppLabel" product="default">ໂທລະສັບ</string>
+</resources>
diff --git a/java/com/android/incallui/theme/res/values-lt/strings.xml b/java/com/android/incallui/theme/res/values-lt/strings.xml
new file mode 100644
index 0000000..4f75b8d
--- /dev/null
+++ b/java/com/android/incallui/theme/res/values-lt/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="phoneAppLabel" product="default">Telefonas</string>
+</resources>
diff --git a/java/com/android/incallui/theme/res/values-lv/strings.xml b/java/com/android/incallui/theme/res/values-lv/strings.xml
new file mode 100644
index 0000000..ad01fd3
--- /dev/null
+++ b/java/com/android/incallui/theme/res/values-lv/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="phoneAppLabel" product="default">Tālrunis</string>
+</resources>
diff --git a/java/com/android/incallui/theme/res/values-mk/strings.xml b/java/com/android/incallui/theme/res/values-mk/strings.xml
new file mode 100644
index 0000000..a48633c
--- /dev/null
+++ b/java/com/android/incallui/theme/res/values-mk/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="phoneAppLabel" product="default">Телефон</string>
+</resources>
diff --git a/java/com/android/incallui/theme/res/values-ml/strings.xml b/java/com/android/incallui/theme/res/values-ml/strings.xml
new file mode 100644
index 0000000..38947fd
--- /dev/null
+++ b/java/com/android/incallui/theme/res/values-ml/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="phoneAppLabel" product="default">ഫോണ്‍</string>
+</resources>
diff --git a/java/com/android/incallui/theme/res/values-mn/strings.xml b/java/com/android/incallui/theme/res/values-mn/strings.xml
new file mode 100644
index 0000000..1c0981d
--- /dev/null
+++ b/java/com/android/incallui/theme/res/values-mn/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="phoneAppLabel" product="default">Утас</string>
+</resources>
diff --git a/java/com/android/incallui/theme/res/values-mr/strings.xml b/java/com/android/incallui/theme/res/values-mr/strings.xml
new file mode 100644
index 0000000..7e5f1ca
--- /dev/null
+++ b/java/com/android/incallui/theme/res/values-mr/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="phoneAppLabel" product="default">फोन</string>
+</resources>
diff --git a/java/com/android/incallui/theme/res/values-ms/strings.xml b/java/com/android/incallui/theme/res/values-ms/strings.xml
new file mode 100644
index 0000000..0b949e2
--- /dev/null
+++ b/java/com/android/incallui/theme/res/values-ms/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="phoneAppLabel" product="default">Telefon</string>
+</resources>
diff --git a/java/com/android/incallui/theme/res/values-my/strings.xml b/java/com/android/incallui/theme/res/values-my/strings.xml
new file mode 100644
index 0000000..738f587
--- /dev/null
+++ b/java/com/android/incallui/theme/res/values-my/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="phoneAppLabel" product="default">ဖုန်း</string>
+</resources>
diff --git a/java/com/android/incallui/theme/res/values-nb/strings.xml b/java/com/android/incallui/theme/res/values-nb/strings.xml
new file mode 100644
index 0000000..0b949e2
--- /dev/null
+++ b/java/com/android/incallui/theme/res/values-nb/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="phoneAppLabel" product="default">Telefon</string>
+</resources>
diff --git a/java/com/android/incallui/theme/res/values-ne/strings.xml b/java/com/android/incallui/theme/res/values-ne/strings.xml
new file mode 100644
index 0000000..7e5f1ca
--- /dev/null
+++ b/java/com/android/incallui/theme/res/values-ne/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="phoneAppLabel" product="default">फोन</string>
+</resources>
diff --git a/java/com/android/incallui/theme/res/values-nl/strings.xml b/java/com/android/incallui/theme/res/values-nl/strings.xml
new file mode 100644
index 0000000..2a78161
--- /dev/null
+++ b/java/com/android/incallui/theme/res/values-nl/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="phoneAppLabel" product="default">Telefoon</string>
+</resources>
diff --git a/java/com/android/incallui/theme/res/values-no/strings.xml b/java/com/android/incallui/theme/res/values-no/strings.xml
new file mode 100644
index 0000000..0b949e2
--- /dev/null
+++ b/java/com/android/incallui/theme/res/values-no/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="phoneAppLabel" product="default">Telefon</string>
+</resources>
diff --git a/java/com/android/incallui/theme/res/values-pa/strings.xml b/java/com/android/incallui/theme/res/values-pa/strings.xml
new file mode 100644
index 0000000..f26c83a
--- /dev/null
+++ b/java/com/android/incallui/theme/res/values-pa/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="phoneAppLabel" product="default">ਫੋਨ</string>
+</resources>
diff --git a/java/com/android/incallui/theme/res/values-pl/strings.xml b/java/com/android/incallui/theme/res/values-pl/strings.xml
new file mode 100644
index 0000000..0b949e2
--- /dev/null
+++ b/java/com/android/incallui/theme/res/values-pl/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="phoneAppLabel" product="default">Telefon</string>
+</resources>
diff --git a/java/com/android/incallui/theme/res/values-pt-rBR/strings.xml b/java/com/android/incallui/theme/res/values-pt-rBR/strings.xml
new file mode 100644
index 0000000..4f5f81b
--- /dev/null
+++ b/java/com/android/incallui/theme/res/values-pt-rBR/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="phoneAppLabel" product="default">Telefone</string>
+</resources>
diff --git a/java/com/android/incallui/theme/res/values-pt-rPT/strings.xml b/java/com/android/incallui/theme/res/values-pt-rPT/strings.xml
new file mode 100644
index 0000000..4f5f81b
--- /dev/null
+++ b/java/com/android/incallui/theme/res/values-pt-rPT/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="phoneAppLabel" product="default">Telefone</string>
+</resources>
diff --git a/java/com/android/incallui/theme/res/values-pt/strings.xml b/java/com/android/incallui/theme/res/values-pt/strings.xml
new file mode 100644
index 0000000..4f5f81b
--- /dev/null
+++ b/java/com/android/incallui/theme/res/values-pt/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="phoneAppLabel" product="default">Telefone</string>
+</resources>
diff --git a/java/com/android/incallui/theme/res/values-ro/strings.xml b/java/com/android/incallui/theme/res/values-ro/strings.xml
new file mode 100644
index 0000000..0b949e2
--- /dev/null
+++ b/java/com/android/incallui/theme/res/values-ro/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="phoneAppLabel" product="default">Telefon</string>
+</resources>
diff --git a/java/com/android/incallui/theme/res/values-ru/strings.xml b/java/com/android/incallui/theme/res/values-ru/strings.xml
new file mode 100644
index 0000000..a48633c
--- /dev/null
+++ b/java/com/android/incallui/theme/res/values-ru/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="phoneAppLabel" product="default">Телефон</string>
+</resources>
diff --git a/java/com/android/incallui/theme/res/values-si/strings.xml b/java/com/android/incallui/theme/res/values-si/strings.xml
new file mode 100644
index 0000000..b254a77
--- /dev/null
+++ b/java/com/android/incallui/theme/res/values-si/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="phoneAppLabel" product="default">දුරකථනය</string>
+</resources>
diff --git a/java/com/android/incallui/theme/res/values-sk/strings.xml b/java/com/android/incallui/theme/res/values-sk/strings.xml
new file mode 100644
index 0000000..18e4d37
--- /dev/null
+++ b/java/com/android/incallui/theme/res/values-sk/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="phoneAppLabel" product="default">Telefón</string>
+</resources>
diff --git a/java/com/android/incallui/theme/res/values-sl/strings.xml b/java/com/android/incallui/theme/res/values-sl/strings.xml
new file mode 100644
index 0000000..0b949e2
--- /dev/null
+++ b/java/com/android/incallui/theme/res/values-sl/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="phoneAppLabel" product="default">Telefon</string>
+</resources>
diff --git a/java/com/android/incallui/theme/res/values-sq/strings.xml b/java/com/android/incallui/theme/res/values-sq/strings.xml
new file mode 100644
index 0000000..3dc8412
--- /dev/null
+++ b/java/com/android/incallui/theme/res/values-sq/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="phoneAppLabel" product="default">Telefoni</string>
+</resources>
diff --git a/java/com/android/incallui/theme/res/values-sr/strings.xml b/java/com/android/incallui/theme/res/values-sr/strings.xml
new file mode 100644
index 0000000..a48633c
--- /dev/null
+++ b/java/com/android/incallui/theme/res/values-sr/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="phoneAppLabel" product="default">Телефон</string>
+</resources>
diff --git a/java/com/android/incallui/theme/res/values-sv/strings.xml b/java/com/android/incallui/theme/res/values-sv/strings.xml
new file mode 100644
index 0000000..0b949e2
--- /dev/null
+++ b/java/com/android/incallui/theme/res/values-sv/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="phoneAppLabel" product="default">Telefon</string>
+</resources>
diff --git a/java/com/android/incallui/theme/res/values-sw/strings.xml b/java/com/android/incallui/theme/res/values-sw/strings.xml
new file mode 100644
index 0000000..d405c75
--- /dev/null
+++ b/java/com/android/incallui/theme/res/values-sw/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="phoneAppLabel" product="default">Simu</string>
+</resources>
diff --git a/java/com/android/incallui/theme/res/values-ta/strings.xml b/java/com/android/incallui/theme/res/values-ta/strings.xml
new file mode 100644
index 0000000..cffb8d0
--- /dev/null
+++ b/java/com/android/incallui/theme/res/values-ta/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="phoneAppLabel" product="default">மொபைல்</string>
+</resources>
diff --git a/java/com/android/incallui/theme/res/values-te/strings.xml b/java/com/android/incallui/theme/res/values-te/strings.xml
new file mode 100644
index 0000000..f1b0566
--- /dev/null
+++ b/java/com/android/incallui/theme/res/values-te/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="phoneAppLabel" product="default">ఫోన్</string>
+</resources>
diff --git a/java/com/android/incallui/theme/res/values-th/strings.xml b/java/com/android/incallui/theme/res/values-th/strings.xml
new file mode 100644
index 0000000..000bdba
--- /dev/null
+++ b/java/com/android/incallui/theme/res/values-th/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="phoneAppLabel" product="default">โทรศัพท์</string>
+</resources>
diff --git a/java/com/android/incallui/theme/res/values-tl/strings.xml b/java/com/android/incallui/theme/res/values-tl/strings.xml
new file mode 100644
index 0000000..50e3b0b
--- /dev/null
+++ b/java/com/android/incallui/theme/res/values-tl/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="phoneAppLabel" product="default">Telepono</string>
+</resources>
diff --git a/java/com/android/incallui/theme/res/values-tr/strings.xml b/java/com/android/incallui/theme/res/values-tr/strings.xml
new file mode 100644
index 0000000..0b949e2
--- /dev/null
+++ b/java/com/android/incallui/theme/res/values-tr/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="phoneAppLabel" product="default">Telefon</string>
+</resources>
diff --git a/java/com/android/incallui/theme/res/values-uk/strings.xml b/java/com/android/incallui/theme/res/values-uk/strings.xml
new file mode 100644
index 0000000..a48633c
--- /dev/null
+++ b/java/com/android/incallui/theme/res/values-uk/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="phoneAppLabel" product="default">Телефон</string>
+</resources>
diff --git a/java/com/android/incallui/theme/res/values-ur/strings.xml b/java/com/android/incallui/theme/res/values-ur/strings.xml
new file mode 100644
index 0000000..9b9b4f9
--- /dev/null
+++ b/java/com/android/incallui/theme/res/values-ur/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="phoneAppLabel" product="default">فون</string>
+</resources>
diff --git a/java/com/android/incallui/theme/res/values-uz/strings.xml b/java/com/android/incallui/theme/res/values-uz/strings.xml
new file mode 100644
index 0000000..0b949e2
--- /dev/null
+++ b/java/com/android/incallui/theme/res/values-uz/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="phoneAppLabel" product="default">Telefon</string>
+</resources>
diff --git a/java/com/android/incallui/theme/res/values-vi/strings.xml b/java/com/android/incallui/theme/res/values-vi/strings.xml
new file mode 100644
index 0000000..4f7f33c
--- /dev/null
+++ b/java/com/android/incallui/theme/res/values-vi/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="phoneAppLabel" product="default">Điện thoại</string>
+</resources>
diff --git a/java/com/android/incallui/theme/res/values-zh-rCN/strings.xml b/java/com/android/incallui/theme/res/values-zh-rCN/strings.xml
new file mode 100644
index 0000000..6a4c5b4
--- /dev/null
+++ b/java/com/android/incallui/theme/res/values-zh-rCN/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="phoneAppLabel" product="default">电话</string>
+</resources>
diff --git a/java/com/android/incallui/theme/res/values-zh-rHK/strings.xml b/java/com/android/incallui/theme/res/values-zh-rHK/strings.xml
new file mode 100644
index 0000000..c50be1c
--- /dev/null
+++ b/java/com/android/incallui/theme/res/values-zh-rHK/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="phoneAppLabel" product="default">電話</string>
+</resources>
diff --git a/java/com/android/incallui/theme/res/values-zh-rTW/strings.xml b/java/com/android/incallui/theme/res/values-zh-rTW/strings.xml
new file mode 100644
index 0000000..c50be1c
--- /dev/null
+++ b/java/com/android/incallui/theme/res/values-zh-rTW/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="phoneAppLabel" product="default">電話</string>
+</resources>
diff --git a/java/com/android/incallui/theme/res/values-zu/strings.xml b/java/com/android/incallui/theme/res/values-zu/strings.xml
new file mode 100644
index 0000000..67525ca
--- /dev/null
+++ b/java/com/android/incallui/theme/res/values-zu/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="phoneAppLabel" product="default">Ifoni</string>
+</resources>
diff --git a/java/com/android/incallui/theme/res/values/colors.xml b/java/com/android/incallui/theme/res/values/colors.xml
new file mode 100644
index 0000000..059fe59
--- /dev/null
+++ b/java/com/android/incallui/theme/res/values/colors.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2013 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+
+<resources>
+  <color name="conference_call_manager_caller_name_text_color">#4d4d4d</color>
+  <!-- Used with some smaller texts in manage conference screen. -->
+  <color name="conference_call_manager_secondary_text_color">#999999</color>
+
+  <color name="incall_dialpad_background">#ffffff</color>
+
+  <!-- Background color for status bar. For portrait this will be ignored. -->
+  <color name="statusbar_background_color">?android:attr/colorPrimary</color>
+
+  <!-- Background colors for InCallUI. This is a set of colors which pass WCAG
+       AA and all have a contrast ratio over 5:1.
+
+      These colors are also used by InCallUIMaterialColorMapUtils to generate
+      primary activity colors.
+  -->
+  <array name="background_colors">
+    <item>#00796B</item>
+    <item>#3367D6</item>
+    <item>#303F9F</item>
+    <item>#7B1FA2</item>
+    <item>#C2185B</item>
+    <item>#C53929</item>
+    <item>#A52714</item>
+  </array>
+
+  <!-- Darker versions of background_colors, two shades darker. These colors are used for the
+       status bar. -->
+  <array name="background_colors_dark">
+    <item>#00695C</item>
+    <item>#2A56C6</item>
+    <item>#283593</item>
+    <item>#6A1B9A</item>
+    <item>#AD1457</item>
+    <item>#B93221</item>
+    <item>#841F10</item>
+  </array>
+
+  <color name="incall_background_gradient_top">#E91141BB</color>
+  <color name="incall_background_gradient_middle">#E91141BB</color>
+  <color name="incall_background_gradient_bottom">#CC229FEB</color>
+
+  <color name="incall_background_multiwindow">#E91141BB</color>
+
+  <color name="incall_background_gradient_spam_top">#E5A30B0B</color>
+  <color name="incall_background_gradient_spam_middle">#D6C01111</color>
+  <color name="incall_background_gradient_spam_bottom">#B8E55135</color>
+
+  <color name="incall_background_multiwindow_spam">#E9C22E2E</color>
+</resources>
diff --git a/java/com/android/incallui/theme/res/values/dimens.xml b/java/com/android/incallui/theme/res/values/dimens.xml
new file mode 100644
index 0000000..a84d819
--- /dev/null
+++ b/java/com/android/incallui/theme/res/values/dimens.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2013 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+
+<resources>
+  <!-- The InCallUI dialpad will sometimes want digits sizes that are different
+       from dialer. Note, these are the default sizes for small devices. Larger
+       screen sizes apply the values in values-sw360dp/dimens.xml. -->
+  <dimen name="incall_dialpad_key_number_margin_bottom">1dp</dimen>
+  <dimen name="incall_dialpad_digits_adjustable_text_size">20sp</dimen>
+  <dimen name="incall_dialpad_digits_adjustable_height">50dp</dimen>
+  <dimen name="incall_dialpad_key_letters_size_for_dual_alphabets">9sp</dimen>
+  <dimen name="incall_dialpad_key_letters_size_for_single_alphabet">
+    @dimen/dialpad_key_letters_default_size_for_single_alphabet
+  </dimen>
+  <dimen name="incall_dialpad_key_numbers_size">36dp</dimen>
+  <dimen name="incall_end_call_spacing">116dp</dimen>
+
+  <!-- Dimension used to possibly down-scale high-res photo into what is suitable
+       for notification's large icon. -->
+  <dimen name="notification_icon_size">64dp</dimen>
+
+  <dimen name="conference_call_manager_button_dimension">48dp</dimen>
+
+  <dimen name="return_to_call_initial_offset_y">120dp</dimen>
+
+  <!-- Whether or not the landscape mode layout is currently being used -->
+  <bool name="is_layout_landscape">false</bool>
+
+  <dimen name="video_call_lte_to_wifi_failed_do_not_show_text_size">16sp</dimen>
+
+</resources>
diff --git a/java/com/android/incallui/theme/res/values/strings.xml b/java/com/android/incallui/theme/res/values/strings.xml
new file mode 100644
index 0000000..c612905
--- /dev/null
+++ b/java/com/android/incallui/theme/res/values/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2018 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+<resources>
+  <!-- Official label of the phone app, as seen in "Manage Applications"
+       and other settings UIs. -->
+  <string name="phoneAppLabel" product="default">Phone</string>
+</resources>
\ No newline at end of file
diff --git a/java/com/android/incallui/theme/res/values/styles.xml b/java/com/android/incallui/theme/res/values/styles.xml
new file mode 100644
index 0000000..5b65cc3
--- /dev/null
+++ b/java/com/android/incallui/theme/res/values/styles.xml
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2013 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+
+<resources>
+  <!-- Theme for the InCallActivity activity. Should have a transparent background for the
+       circular reveal animation for a new outgoing call to work correctly. We don't just use
+       Theme.Black.NoTitleBar directly, since we want any popups or dialogs from the
+       InCallActivity to have the correct Material style. -->
+  <style name="Theme.InCallScreen.Light" parent="@style/Dialer.ThemeBase.NoActionBar">
+    <item name="android:statusBarColor">@android:color/transparent</item>
+    <item name="android:navigationBarColor">@android:color/transparent</item>
+    <item name="android:windowDrawsSystemBarBackgrounds">true</item>
+
+    <item name="dialpad_key_button_touch_tint">?attr/colorPrimary20pct</item>
+    <item name="dialpad_style">@style/InCallDialpad</item>
+    <item name="android:windowAnimationStyle">@null</item>
+
+    <item name="android:windowBackground">@drawable/incall_background_gradient</item>
+    <item name="android:windowShowWallpaper">true</item>
+  </style>
+
+  <style name="Theme.InCallScreen" parent="@style/Dialer.Dark.ThemeBase.NoActionBar">
+    <item name="android:textColorPrimary">@android:color/white</item>
+    <item name="android:textColorSecondary">#DDFFFFFF</item>
+    <item name="android:statusBarColor">@android:color/transparent</item>
+    <item name="android:navigationBarColor">@android:color/transparent</item>
+    <item name="android:windowDrawsSystemBarBackgrounds">true</item>
+    <item name="android:colorPrimaryDark">@color/dialer_theme_color_dark</item>
+    <item name="colorPrimaryDark">@color/dialer_theme_color_dark</item>
+
+    <item name="dialpad_key_button_touch_tint">?attr/colorPrimary20pct</item>
+    <item name="dialpad_style">@style/InCallDialpad</item>
+    <item name="android:windowAnimationStyle">@null</item>
+
+    <item name="android:windowBackground">@drawable/incall_background_gradient</item>
+    <item name="android:windowShowWallpaper">true</item>
+  </style>
+
+  <style name="Theme.InCallScreen.ManageConference" parent="Dialer.ThemeBase.ActionBar">
+  </style>
+
+  <style name="InCallDialpad" parent="Dialpad.Themed">
+    <item name="dialpad_key_number_margin_bottom">
+      @dimen/incall_dialpad_key_number_margin_bottom
+    </item>
+    <item name="dialpad_digits_adjustable_text_size">
+      @dimen/incall_dialpad_digits_adjustable_text_size
+    </item>
+    <item name="dialpad_digits_adjustable_height">
+      @dimen/incall_dialpad_digits_adjustable_height
+    </item>
+    <item name="dialpad_key_letters_size_for_dual_alphabets">
+      @dimen/incall_dialpad_key_letters_size_for_dual_alphabets
+    </item>
+    <item name="dialpad_key_letters_size_for_single_alphabet">
+      @dimen/incall_dialpad_key_letters_size_for_single_alphabet
+    </item>
+    <item name="dialpad_key_numbers_size">
+      @dimen/incall_dialpad_key_numbers_size
+    </item>
+    <item name="dialpad_end_key_spacing">
+      @dimen/incall_end_call_spacing
+    </item>
+    <item name="dialpad_elevation">10dp</item>
+  </style>
+
+  <style name="AfterCallNotificationTheme" parent="Dialer.ThemeBase.NoActionBar">
+    <item name="android:windowNoTitle">true</item>
+    <item name="android:windowBackground">@android:color/transparent</item>
+    <item name="android:colorBackgroundCacheHint">@null</item>
+    <item name="android:windowIsTranslucent">true</item>
+    <item name="android:windowAnimationStyle">@android:style/Animation</item>
+  </style>
+
+  <style name="AfterCallDialogStyle" parent="@android:style/Theme.Material.Light.Dialog">
+    <!-- This colorAccent is to style text in the dialogs -->
+    <item name="android:colorAccent">?android:attr/colorPrimary</item>
+  </style>
+
+  <style name="Theme.Incall.DialogHolder" parent="Theme.AppCompat.Translucent">
+    <item name="android:windowBackground">@android:color/transparent</item>
+    <item name="android:windowActivityTransitions">false</item>
+
+    <item name="android:statusBarColor">@android:color/transparent</item>
+    <item name="android:navigationBarColor">@android:color/transparent</item>
+    <item name="android:windowDrawsSystemBarBackgrounds">true</item>
+  </style>
+
+</resources>
diff --git a/java/com/android/incallui/video/impl/SpeakerButtonController.java b/java/com/android/incallui/video/impl/SpeakerButtonController.java
index d98545f..4ae746b 100644
--- a/java/com/android/incallui/video/impl/SpeakerButtonController.java
+++ b/java/com/android/incallui/video/impl/SpeakerButtonController.java
@@ -36,14 +36,14 @@
 
   @NonNull private CheckableImageButton button;
 
-  @DrawableRes private int icon = R.drawable.quantum_ic_volume_up_white_36;
+  @DrawableRes private int icon = R.drawable.quantum_ic_volume_up_vd_theme_24;
 
   private boolean isChecked;
   private boolean checkable;
   private boolean isEnabled;
   private CharSequence contentDescription;
 
-  public SpeakerButtonController(
+  SpeakerButtonController(
       @NonNull CheckableImageButton button,
       @NonNull InCallButtonUiDelegate inCallButtonUiDelegate,
       @NonNull VideoCallScreenDelegate videoCallScreenDelegate) {
@@ -54,9 +54,10 @@
 
   public void setEnabled(boolean isEnabled) {
     this.isEnabled = isEnabled;
+    updateButtonState();
   }
 
-  public void updateButtonState() {
+  void updateButtonState() {
     button.setVisibility(View.VISIBLE);
     button.setEnabled(isEnabled);
     button.setChecked(isChecked);
@@ -77,24 +78,24 @@
 
       if ((audioState.getRoute() & CallAudioState.ROUTE_BLUETOOTH)
           == CallAudioState.ROUTE_BLUETOOTH) {
-        icon = R.drawable.quantum_ic_bluetooth_audio_white_36;
+        icon = R.drawable.quantum_ic_bluetooth_audio_vd_theme_24;
         contentDescriptionResId = R.string.incall_content_description_bluetooth;
       } else if ((audioState.getRoute() & CallAudioState.ROUTE_SPEAKER)
           == CallAudioState.ROUTE_SPEAKER) {
-        icon = R.drawable.quantum_ic_volume_up_white_36;
+        icon = R.drawable.quantum_ic_volume_up_vd_theme_24;
         contentDescriptionResId = R.string.incall_content_description_speaker;
       } else if ((audioState.getRoute() & CallAudioState.ROUTE_WIRED_HEADSET)
           == CallAudioState.ROUTE_WIRED_HEADSET) {
-        icon = R.drawable.quantum_ic_headset_white_36;
+        icon = R.drawable.quantum_ic_headset_vd_theme_24;
         contentDescriptionResId = R.string.incall_content_description_headset;
       } else {
-        icon = R.drawable.quantum_ic_phone_in_talk_white_36;
+        icon = R.drawable.quantum_ic_phone_in_talk_vd_theme_24;
         contentDescriptionResId = R.string.incall_content_description_earpiece;
       }
     } else {
       checkable = true;
       isChecked = audioState.getRoute() == CallAudioState.ROUTE_SPEAKER;
-      icon = R.drawable.quantum_ic_volume_up_white_36;
+      icon = R.drawable.quantum_ic_volume_up_vd_theme_24;
       contentDescriptionResId = R.string.incall_content_description_speaker;
     }
 
diff --git a/java/com/android/incallui/video/impl/SurfaceViewVideoCallFragment.java b/java/com/android/incallui/video/impl/SurfaceViewVideoCallFragment.java
index 28ee774..f270eda 100644
--- a/java/com/android/incallui/video/impl/SurfaceViewVideoCallFragment.java
+++ b/java/com/android/incallui/video/impl/SurfaceViewVideoCallFragment.java
@@ -50,7 +50,6 @@
 import com.android.dialer.common.Assert;
 import com.android.dialer.common.FragmentUtils;
 import com.android.dialer.common.LogUtil;
-import com.android.dialer.compat.ActivityCompat;
 import com.android.dialer.util.PermissionsUtil;
 import com.android.incallui.audioroute.AudioRouteSelectorDialogFragment;
 import com.android.incallui.audioroute.AudioRouteSelectorDialogFragment.AudioRouteSelectorPresenter;
@@ -187,8 +186,7 @@
         new ContactGridManager(view, null /* no avatar */, 0, false /* showAnonymousAvatar */);
 
     controls = view.findViewById(R.id.videocall_video_controls);
-    controls.setVisibility(
-        ActivityCompat.isInMultiWindowMode(getActivity()) ? View.GONE : View.VISIBLE);
+    controls.setVisibility(getActivity().isInMultiWindowMode() ? View.GONE : View.VISIBLE);
     controlsContainer = view.findViewById(R.id.videocall_video_controls_container);
     speakerButton = (CheckableImageButton) view.findViewById(R.id.videocall_speaker_button);
     muteButton = (CheckableImageButton) view.findViewById(R.id.videocall_mute_button);
@@ -200,8 +198,7 @@
     swapCameraButton = (ImageButton) view.findViewById(R.id.videocall_switch_video);
     swapCameraButton.setOnClickListener(this);
     view.findViewById(R.id.videocall_switch_controls)
-        .setVisibility(
-            ActivityCompat.isInMultiWindowMode(getActivity()) ? View.GONE : View.VISIBLE);
+        .setVisibility(getActivity().isInMultiWindowMode() ? View.GONE : View.VISIBLE);
     switchOnHoldButton = view.findViewById(R.id.videocall_switch_on_hold);
     onHoldContainer = view.findViewById(R.id.videocall_on_hold_banner);
     remoteVideoOff = (TextView) view.findViewById(R.id.videocall_remote_video_off);
@@ -478,7 +475,7 @@
 
   private Point getPreviewOffsetStartShown() {
     // No insets in multiwindow mode, and rootWindowInsets will get the display's insets.
-    if (ActivityCompat.isInMultiWindowMode(getActivity())) {
+    if (getActivity().isInMultiWindowMode()) {
       return new Point();
     }
     if (isLandscape()) {
@@ -690,7 +687,7 @@
     isInGreenScreenMode = shouldShowGreenScreen;
     isInFullscreenMode = shouldShowFullscreen;
 
-    if (getView().isAttachedToWindow() && !ActivityCompat.isInMultiWindowMode(getActivity())) {
+    if (getView().isAttachedToWindow() && !getActivity().isInMultiWindowMode()) {
       controlsContainer.onApplyWindowInsets(getView().getRootWindowInsets());
     }
     if (shouldShowGreenScreen) {
@@ -725,6 +722,9 @@
   }
 
   @Override
+  public void onHandoverFromWiFiToLte() {}
+
+  @Override
   public void showButton(@InCallButtonIds int buttonId, boolean show) {
     LogUtil.v(
         "SurfaceViewVideoCallFragment.showButton",
diff --git a/java/com/android/incallui/video/impl/VideoCallFragment.java b/java/com/android/incallui/video/impl/VideoCallFragment.java
index 6b5a979..11b80ce 100644
--- a/java/com/android/incallui/video/impl/VideoCallFragment.java
+++ b/java/com/android/incallui/video/impl/VideoCallFragment.java
@@ -60,7 +60,6 @@
 import com.android.dialer.common.Assert;
 import com.android.dialer.common.FragmentUtils;
 import com.android.dialer.common.LogUtil;
-import com.android.dialer.compat.ActivityCompat;
 import com.android.dialer.util.PermissionsUtil;
 import com.android.incallui.audioroute.AudioRouteSelectorDialogFragment;
 import com.android.incallui.audioroute.AudioRouteSelectorDialogFragment.AudioRouteSelectorPresenter;
@@ -99,6 +98,8 @@
   @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
   static final String ARG_CALL_ID = "call_id";
 
+  private static final String TAG_VIDEO_CHARGES_ALERT = "tag_video_charges_alert";
+
   @VisibleForTesting static final float BLUR_PREVIEW_RADIUS = 16.0f;
   @VisibleForTesting static final float BLUR_PREVIEW_SCALE_FACTOR = 1.0f;
   private static final float BLUR_REMOTE_RADIUS = 25.0f;
@@ -108,6 +109,7 @@
   private static final int CAMERA_PERMISSION_REQUEST_CODE = 1;
   private static final long CAMERA_PERMISSION_DIALOG_DELAY_IN_MILLIS = 2000L;
   private static final long VIDEO_OFF_VIEW_FADE_OUT_DELAY_IN_MILLIS = 2000L;
+  private static final long VIDEO_CHARGES_ALERT_DIALOG_DELAY_IN_MILLIS = 500L;
 
   private final ViewOutlineProvider circleOutlineProvider =
       new ViewOutlineProvider() {
@@ -162,6 +164,24 @@
         }
       };
 
+  private final Runnable videoChargesAlertDialogRunnable =
+      () -> {
+        VideoChargesAlertDialogFragment existingVideoChargesAlertFragment =
+            (VideoChargesAlertDialogFragment)
+                getChildFragmentManager().findFragmentByTag(TAG_VIDEO_CHARGES_ALERT);
+        if (existingVideoChargesAlertFragment != null) {
+          LogUtil.i(
+              "VideoCallFragment.videoChargesAlertDialogRunnable", "already shown for this call");
+          return;
+        }
+
+        if (VideoChargesAlertDialogFragment.shouldShow(getContext(), getCallId())) {
+          LogUtil.i("VideoCallFragment.videoChargesAlertDialogRunnable", "showing dialog");
+          VideoChargesAlertDialogFragment.newInstance(getCallId())
+              .show(getChildFragmentManager(), TAG_VIDEO_CHARGES_ALERT);
+        }
+      };
+
   public static VideoCallFragment newInstance(String callId) {
     Bundle bundle = new Bundle();
     bundle.putString(ARG_CALL_ID, Assert.isNotNull(callId));
@@ -213,8 +233,7 @@
         new ContactGridManager(view, null /* no avatar */, 0, false /* showAnonymousAvatar */);
 
     controls = view.findViewById(R.id.videocall_video_controls);
-    controls.setVisibility(
-        ActivityCompat.isInMultiWindowMode(getActivity()) ? View.GONE : View.VISIBLE);
+    controls.setVisibility(getActivity().isInMultiWindowMode() ? View.GONE : View.VISIBLE);
     controlsContainer = view.findViewById(R.id.videocall_video_controls_container);
     speakerButton = (CheckableImageButton) view.findViewById(R.id.videocall_speaker_button);
     muteButton = (CheckableImageButton) view.findViewById(R.id.videocall_mute_button);
@@ -228,8 +247,7 @@
     swapCameraButton = (ImageButton) view.findViewById(R.id.videocall_switch_video);
     swapCameraButton.setOnClickListener(this);
     view.findViewById(R.id.videocall_switch_controls)
-        .setVisibility(
-            ActivityCompat.isInMultiWindowMode(getActivity()) ? View.GONE : View.VISIBLE);
+        .setVisibility(getActivity().isInMultiWindowMode() ? View.GONE : View.VISIBLE);
     switchOnHoldButton = view.findViewById(R.id.videocall_switch_on_hold);
     onHoldContainer = view.findViewById(R.id.videocall_on_hold_banner);
     remoteVideoOff = (TextView) view.findViewById(R.id.videocall_remote_video_off);
@@ -352,6 +370,8 @@
     inCallButtonUiDelegate.refreshMuteState();
     videoCallScreenDelegate.onVideoCallScreenUiReady();
     getView().postDelayed(cameraPermissionDialogRunnable, CAMERA_PERMISSION_DIALOG_DELAY_IN_MILLIS);
+    getView()
+        .postDelayed(videoChargesAlertDialogRunnable, VIDEO_CHARGES_ALERT_DIALOG_DELAY_IN_MILLIS);
   }
 
   @Override
@@ -377,6 +397,7 @@
 
   @Override
   public void onVideoScreenStop() {
+    getView().removeCallbacks(videoChargesAlertDialogRunnable);
     getView().removeCallbacks(cameraPermissionDialogRunnable);
     videoCallScreenDelegate.onVideoCallScreenUiUnready();
   }
@@ -516,7 +537,7 @@
 
   private Point getPreviewOffsetStartShown() {
     // No insets in multiwindow mode, and rootWindowInsets will get the display's insets.
-    if (ActivityCompat.isInMultiWindowMode(getActivity())) {
+    if (getActivity().isInMultiWindowMode()) {
       return new Point();
     }
     if (isLandscape()) {
@@ -734,7 +755,7 @@
     isInGreenScreenMode = shouldShowGreenScreen;
     isInFullscreenMode = shouldShowFullscreen;
 
-    if (getView().isAttachedToWindow() && !ActivityCompat.isInMultiWindowMode(getActivity())) {
+    if (getView().isAttachedToWindow() && !getActivity().isInMultiWindowMode()) {
       controlsContainer.onApplyWindowInsets(getView().getRootWindowInsets());
     }
     if (shouldShowGreenScreen) {
@@ -768,6 +789,11 @@
   }
 
   @Override
+  public void onHandoverFromWiFiToLte() {
+    getView().post(videoChargesAlertDialogRunnable);
+  }
+
+  @Override
   public void showButton(@InCallButtonIds int buttonId, boolean show) {
     LogUtil.v(
         "VideoCallFragment.showButton",
diff --git a/java/com/android/incallui/video/impl/VideoChargesAlertDialogFragment.java b/java/com/android/incallui/video/impl/VideoChargesAlertDialogFragment.java
new file mode 100644
index 0000000..7993452
--- /dev/null
+++ b/java/com/android/incallui/video/impl/VideoChargesAlertDialogFragment.java
@@ -0,0 +1,141 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.incallui.video.impl;
+
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.os.Bundle;
+import android.preference.PreferenceManager;
+import android.support.annotation.NonNull;
+import android.support.annotation.VisibleForTesting;
+import android.support.v4.app.DialogFragment;
+import android.support.v4.os.UserManagerCompat;
+import android.telecom.Call.Details;
+import android.view.View;
+import android.widget.CheckBox;
+import com.android.dialer.common.Assert;
+import com.android.dialer.common.LogUtil;
+import com.android.incallui.call.CallList;
+import com.android.incallui.call.DialerCall;
+
+/** Alert dialog for video charges. */
+public class VideoChargesAlertDialogFragment extends DialogFragment {
+
+  /** Preference key for whether to show the alert dialog for video charges next time. */
+  @VisibleForTesting
+  static final String KEY_DO_NOT_SHOW_VIDEO_CHARGES_ALERT = "key_do_not_show_video_charges_alert";
+
+  /** Key in the arguments bundle for call id. */
+  private static final String ARG_CALL_ID = "call_id";
+
+  /**
+   * Returns {@code true} if an {@link VideoChargesAlertDialogFragment} should be shown.
+   *
+   * <p>Attempting to show an VideoChargesAlertDialogFragment when this method returns {@code false}
+   * will result in an {@link IllegalStateException}.
+   */
+  public static boolean shouldShow(@NonNull Context context, String callId) {
+    DialerCall call = CallList.getInstance().getCallById(callId);
+    if (call == null) {
+      LogUtil.i("VideoChargesAlertDialogFragment.shouldShow", "null call");
+      return false;
+    }
+
+    if (call.hasProperty(Details.PROPERTY_WIFI)) {
+      return false;
+    }
+
+    if (call.didDismissVideoChargesAlertDialog()) {
+      LogUtil.i(
+          "VideoChargesAlertDialogFragment.shouldShow", "The dialog has been dismissed by user");
+      return false;
+    }
+
+    if (!call.showVideoChargesAlertDialog()) {
+      return false;
+    }
+
+    if (!UserManagerCompat.isUserUnlocked(context)) {
+      LogUtil.i("VideoChargesAlertDialogFragment.shouldShow", "user locked, returning false");
+      return false;
+    }
+
+    SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(context);
+    if (preferences.getBoolean(KEY_DO_NOT_SHOW_VIDEO_CHARGES_ALERT, false)) {
+      LogUtil.i(
+          "VideoChargesAlertDialogFragment.shouldShow",
+          "Video charges alert has been disabled by user, returning false");
+      return false;
+    }
+
+    return true;
+  }
+
+  /**
+   * Returns a new instance of {@link VideoChargesAlertDialogFragment}
+   *
+   * <p>Prefer this method over the default constructor.
+   */
+  public static VideoChargesAlertDialogFragment newInstance(@NonNull String callId) {
+    VideoChargesAlertDialogFragment fragment = new VideoChargesAlertDialogFragment();
+    Bundle args = new Bundle();
+    args.putString(ARG_CALL_ID, Assert.isNotNull(callId));
+    fragment.setArguments(args);
+    return fragment;
+  }
+
+  @NonNull
+  @Override
+  public Dialog onCreateDialog(Bundle bundle) {
+    super.onCreateDialog(bundle);
+
+    if (!VideoChargesAlertDialogFragment.shouldShow(
+        getActivity(), getArguments().getString(ARG_CALL_ID))) {
+      throw new IllegalStateException(
+          "shouldShow indicated VideoChargesAlertDialogFragment should not have showed");
+    }
+
+    View dialogView = View.inflate(getActivity(), R.layout.frag_video_charges_alert_dialog, null);
+
+    CheckBox alertCheckBox = dialogView.findViewById(R.id.do_not_show);
+
+    SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(getActivity());
+    AlertDialog alertDialog =
+        new AlertDialog.Builder(getActivity())
+            .setView(dialogView)
+            .setPositiveButton(
+                android.R.string.ok,
+                (dialog, which) -> onPositiveButtonClicked(preferences, alertCheckBox.isChecked()))
+            .create();
+    this.setCancelable(false);
+    return alertDialog;
+  }
+
+  private void onPositiveButtonClicked(@NonNull SharedPreferences preferences, boolean isChecked) {
+    LogUtil.i(
+        "VideoChargesAlertDialogFragment.onPositiveButtonClicked", "isChecked: %b", isChecked);
+    preferences.edit().putBoolean(KEY_DO_NOT_SHOW_VIDEO_CHARGES_ALERT, isChecked).apply();
+
+    DialerCall dialerCall =
+        CallList.getInstance().getCallById(getArguments().getString(ARG_CALL_ID));
+    if (dialerCall != null) {
+      dialerCall.setDidDismissVideoChargesAlertDialog(true);
+    }
+  }
+}
diff --git a/java/com/android/incallui/video/impl/res/color/videocall_button_icon_tint.xml b/java/com/android/incallui/video/impl/res/color/videocall_button_icon_tint.xml
index b46607b..bb0c767 100644
--- a/java/com/android/incallui/video/impl/res/color/videocall_button_icon_tint.xml
+++ b/java/com/android/incallui/video/impl/res/color/videocall_button_icon_tint.xml
@@ -1,5 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2016 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-  <item android:color="#ff000000" android:state_checked="true"/>
-  <item android:color="#ffffffff"/>
+  <item android:color="?android:attr/colorBackgroundFloating" android:state_checked="true"/>
+  <item android:color="?android:attr/textColorPrimary"/>
 </selector>
diff --git a/java/com/android/incallui/video/impl/res/layout-land/videocall_controls_surfaceview.xml b/java/com/android/incallui/video/impl/res/layout-land/videocall_controls_surfaceview.xml
index 40b50bc..9a3682f 100644
--- a/java/com/android/incallui/video/impl/res/layout-land/videocall_controls_surfaceview.xml
+++ b/java/com/android/incallui/video/impl/res/layout-land/videocall_controls_surfaceview.xml
@@ -60,33 +60,25 @@
     <com.android.incallui.video.impl.CheckableImageButton
       android:id="@+id/videocall_speaker_button"
       style="@style/Incall.Button.VideoCall"
-      android:layout_width="@dimen/videocall_button_size"
-      android:layout_height="@dimen/videocall_button_size"
       android:layout_marginEnd="24dp"
       android:checked="true"
-      android:src="@drawable/quantum_ic_volume_up_white_36"
+      android:src="@drawable/quantum_ic_volume_up_vd_theme_24"
       app:contentDescriptionChecked="@string/incall_content_description_speaker"
       app:contentDescriptionUnchecked="@string/incall_content_description_earpiece"
       />
     <com.android.incallui.video.impl.CheckableImageButton
       android:id="@+id/videocall_mute_button"
       style="@style/Incall.Button.VideoCall"
-      android:layout_width="@dimen/videocall_button_size"
-      android:layout_height="@dimen/videocall_button_size"
       android:layout_marginEnd="24dp"
-      android:scaleType="center"
-      android:src="@drawable/quantum_ic_mic_off_white_36"
+      android:src="@drawable/quantum_ic_mic_off_vd_theme_24"
       app:contentDescriptionChecked="@string/incall_content_description_muted"
       app:contentDescriptionUnchecked="@string/incall_content_description_unmuted"
       />
     <com.android.incallui.video.impl.CheckableImageButton
       android:id="@+id/videocall_mute_video"
       style="@style/Incall.Button.VideoCall"
-      android:layout_width="@dimen/videocall_button_size"
-      android:layout_height="@dimen/videocall_button_size"
       android:layout_marginEnd="24dp"
-      android:scaleType="center"
-      android:src="@drawable/quantum_ic_videocam_off_white_36"
+      android:src="@drawable/quantum_ic_videocam_off_vd_theme_24"
       app:contentDescriptionChecked="@string/incall_content_description_video_off"
       app:contentDescriptionUnchecked="@string/incall_content_description_video_on"
       />
@@ -111,7 +103,7 @@
       android:layout_width="@dimen/videocall_button_size"
       android:layout_height="@dimen/videocall_button_size"
       android:contentDescription="@string/incall_content_description_swap_calls"
-      android:src="@drawable/quantum_ic_swap_calls_white_36"
+      android:src="@drawable/quantum_ic_swap_calls_vd_theme_24"
       android:visibility="gone"
       tools:visibility="visible"
       />
diff --git a/java/com/android/incallui/video/impl/res/layout-v21/switch_camera_button.xml b/java/com/android/incallui/video/impl/res/layout-v21/switch_camera_button.xml
index 1fb1bb0..6660283 100644
--- a/java/com/android/incallui/video/impl/res/layout-v21/switch_camera_button.xml
+++ b/java/com/android/incallui/video/impl/res/layout-v21/switch_camera_button.xml
@@ -1,6 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2018 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
 <ImageButton xmlns:android="http://schemas.android.com/apk/res/android"
   android:id="@+id/videocall_switch_video"
   style="@style/Incall.Button.VideoCall"
   android:contentDescription="@string/incall_content_description_swap_video"
+  android:scaleType="center"
   android:src="@drawable/front_back_switch_button_animation"/>
diff --git a/java/com/android/incallui/video/impl/res/layout/frag_video_charges_alert_dialog.xml b/java/com/android/incallui/video/impl/res/layout/frag_video_charges_alert_dialog.xml
new file mode 100644
index 0000000..c027915
--- /dev/null
+++ b/java/com/android/incallui/video/impl/res/layout/frag_video_charges_alert_dialog.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2018 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<ScrollView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+  <LinearLayout
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:paddingTop="24dp"
+      android:paddingStart="24dp"
+      android:paddingEnd="24dp"
+      android:paddingBottom="4dp"
+      android:orientation="vertical">
+
+    <TextView
+        android:id="@+id/message"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="10dp"
+        android:text="@string/videocall_charges_alert_dialog_description"
+        android:textColor="?android:attr/textColorPrimary"
+        android:textSize="16sp"/>
+
+    <CheckBox
+        android:id="@+id/do_not_show"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:buttonTint="?android:attr/colorPrimary"
+        android:focusable="true"
+        android:clickable="true"
+        android:text="@string/do_not_show_again"
+        android:textColor="?android:attr/textColorPrimary"
+        android:textSize="14sp"/>
+  </LinearLayout>
+</ScrollView>
\ No newline at end of file
diff --git a/java/com/android/incallui/video/impl/res/layout/frag_videocall.xml b/java/com/android/incallui/video/impl/res/layout/frag_videocall.xml
index f8c6fc3..6349a28 100644
--- a/java/com/android/incallui/video/impl/res/layout/frag_videocall.xml
+++ b/java/com/android/incallui/video/impl/res/layout/frag_videocall.xml
@@ -1,4 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2018 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:tools="http://schemas.android.com/tools"
   android:layout_width="match_parent"
@@ -31,7 +45,7 @@
     android:accessibilityTraversalBefore="@+id/videocall_speaker_button"
     android:drawablePadding="8dp"
     android:drawableTop="@drawable/quantum_ic_videocam_off_white_36"
-    android:drawableTint="@color/videocall_camera_off_tint"
+    android:drawableTint="?colorIcon"
     android:padding="64dp"
     android:text="@string/videocall_remote_video_off"
     android:textAppearance="@style/Dialer.Incall.TextAppearance"
@@ -85,8 +99,8 @@
     android:layout_alignRight="@+id/videocall_video_preview"
     android:layout_alignTop="@+id/videocall_video_preview"
     android:scaleType="center"
-    android:src="@drawable/quantum_ic_videocam_off_white_24"
-    android:tint="@color/videocall_camera_off_tint"
+    android:src="@drawable/quantum_ic_videocam_off_vd_theme_24"
+    android:tint="?colorIcon"
     android:tintMode="src_in"
     android:visibility="gone"
     android:importantForAccessibility="no"
@@ -101,7 +115,8 @@
     android:background="@drawable/videocall_background_circle_white"
     android:contentDescription="@string/incall_content_description_muted"
     android:scaleType="center"
-    android:src="@drawable/quantum_ic_mic_off_black_24"
+    android:src="@drawable/quantum_ic_mic_off_vd_theme_24"
+    android:tint="@android:color/black"
     android:visibility="gone"
     tools:visibility="visible"/>
 
diff --git a/java/com/android/incallui/video/impl/res/layout/frag_videocall_land.xml b/java/com/android/incallui/video/impl/res/layout/frag_videocall_land.xml
index 2353dee..f744569 100644
--- a/java/com/android/incallui/video/impl/res/layout/frag_videocall_land.xml
+++ b/java/com/android/incallui/video/impl/res/layout/frag_videocall_land.xml
@@ -1,4 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2018 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:tools="http://schemas.android.com/tools"
   android:layout_width="match_parent"
@@ -79,7 +93,7 @@
     android:layout_alignRight="@+id/videocall_video_preview"
     android:layout_alignTop="@+id/videocall_video_preview"
     android:scaleType="center"
-    android:src="@drawable/quantum_ic_videocam_off_white_36"
+    android:src="@drawable/quantum_ic_videocam_off_vd_theme_24"
     android:visibility="gone"
     android:importantForAccessibility="no"
     tools:visibility="visible"/>
@@ -93,7 +107,8 @@
     android:background="@drawable/videocall_background_circle_white"
     android:contentDescription="@string/incall_content_description_muted"
     android:scaleType="center"
-    android:src="@drawable/quantum_ic_mic_off_black_24"
+    android:src="@drawable/quantum_ic_mic_off_vd_theme_24"
+    android:tint="@android:color/black"
     android:visibility="gone"
     tools:visibility="visible"/>
 
diff --git a/java/com/android/incallui/video/impl/res/layout/frag_videocall_surfaceview.xml b/java/com/android/incallui/video/impl/res/layout/frag_videocall_surfaceview.xml
index 1a2bc24..5191898 100644
--- a/java/com/android/incallui/video/impl/res/layout/frag_videocall_surfaceview.xml
+++ b/java/com/android/incallui/video/impl/res/layout/frag_videocall_surfaceview.xml
@@ -36,7 +36,7 @@
     android:accessibilityTraversalBefore="@+id/videocall_speaker_button"
     android:drawablePadding="8dp"
     android:drawableTop="@drawable/quantum_ic_videocam_off_white_36"
-    android:drawableTint="@color/videocall_camera_off_tint"
+    android:drawableTint="?colorIcon"
     android:padding="64dp"
     android:text="@string/videocall_remote_video_off"
     android:textAppearance="@style/Dialer.Incall.TextAppearance"
@@ -65,8 +65,8 @@
       android:layout_height="wrap_content"
       android:layout_gravity="center"
       android:scaleType="center"
-      android:src="@drawable/quantum_ic_videocam_off_white_24"
-      android:tint="@color/videocall_camera_off_tint"
+      android:src="@drawable/quantum_ic_videocam_off_vd_theme_24"
+      android:tint="?colorIcon"
       android:tintMode="src_in"
       android:visibility="gone"
       android:importantForAccessibility="no"
@@ -84,7 +84,8 @@
     android:background="@drawable/videocall_background_circle_white"
     android:contentDescription="@string/incall_content_description_muted"
     android:scaleType="center"
-    android:src="@drawable/quantum_ic_mic_off_black_24"
+    android:src="@drawable/quantum_ic_mic_off_vd_theme_24"
+    android:tint="@android:color/black"
     android:visibility="gone"
     tools:visibility="visible"/>
 
diff --git a/java/com/android/incallui/video/impl/res/layout/switch_camera_button.xml b/java/com/android/incallui/video/impl/res/layout/switch_camera_button.xml
index 87c2e1b..f473dd8 100644
--- a/java/com/android/incallui/video/impl/res/layout/switch_camera_button.xml
+++ b/java/com/android/incallui/video/impl/res/layout/switch_camera_button.xml
@@ -1,4 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2018 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
 <ImageButton xmlns:android="http://schemas.android.com/apk/res/android"
   android:id="@+id/videocall_switch_video"
   style="@style/Incall.Button.VideoCall"
diff --git a/java/com/android/incallui/video/impl/res/layout/video_contact_grid.xml b/java/com/android/incallui/video/impl/res/layout/video_contact_grid.xml
index 3cf0504..56797d9 100644
--- a/java/com/android/incallui/video/impl/res/layout/video_contact_grid.xml
+++ b/java/com/android/incallui/video/impl/res/layout/video_contact_grid.xml
@@ -1,4 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2018 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
 <LinearLayout
   xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:app="http://schemas.android.com/apk/res-auto"
diff --git a/java/com/android/incallui/video/impl/res/layout/videocall_controls.xml b/java/com/android/incallui/video/impl/res/layout/videocall_controls.xml
index b3141bd..70cbac8 100644
--- a/java/com/android/incallui/video/impl/res/layout/videocall_controls.xml
+++ b/java/com/android/incallui/video/impl/res/layout/videocall_controls.xml
@@ -1,4 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2018 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
 <RelativeLayout
   xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:app="http://schemas.android.com/apk/res-auto"
@@ -46,31 +60,25 @@
     <com.android.incallui.video.impl.CheckableImageButton
       android:id="@+id/videocall_speaker_button"
       style="@style/Incall.Button.VideoCall"
-      android:layout_width="@dimen/videocall_button_size"
-      android:layout_height="@dimen/videocall_button_size"
       android:layout_marginBottom="@dimen/videocall_button_spacing"
       android:checked="true"
-      android:src="@drawable/quantum_ic_volume_up_white_36"
+      android:src="@drawable/quantum_ic_volume_up_vd_theme_24"
       app:contentDescriptionChecked="@string/incall_content_description_speaker"
       app:contentDescriptionUnchecked="@string/incall_content_description_earpiece"
       />
     <com.android.incallui.video.impl.CheckableImageButton
       android:id="@+id/videocall_mute_button"
       style="@style/Incall.Button.VideoCall"
-      android:layout_width="@dimen/videocall_button_size"
-      android:layout_height="@dimen/videocall_button_size"
       android:layout_marginBottom="@dimen/videocall_button_spacing"
-      android:src="@drawable/quantum_ic_mic_off_white_36"
+      android:src="@drawable/quantum_ic_mic_off_vd_theme_24"
       app:contentDescriptionChecked="@string/incall_content_description_muted"
       app:contentDescriptionUnchecked="@string/incall_content_description_unmuted"
       />
     <com.android.incallui.video.impl.CheckableImageButton
       android:id="@+id/videocall_mute_video"
       style="@style/Incall.Button.VideoCall"
-      android:layout_width="@dimen/videocall_button_size"
-      android:layout_height="@dimen/videocall_button_size"
       android:layout_marginBottom="@dimen/videocall_button_spacing"
-      android:src="@drawable/quantum_ic_videocam_off_white_36"
+      android:src="@drawable/quantum_ic_videocam_off_vd_theme_24"
       app:contentDescriptionChecked="@string/incall_content_description_video_off"
       app:contentDescriptionUnchecked="@string/incall_content_description_video_on"
       />
@@ -92,10 +100,8 @@
     <ImageButton
       android:id="@+id/videocall_switch_on_hold"
       style="@style/Incall.Button.VideoCall"
-      android:layout_width="@dimen/videocall_button_size"
-      android:layout_height="@dimen/videocall_button_size"
       android:contentDescription="@string/incall_content_description_swap_calls"
-      android:src="@drawable/quantum_ic_swap_calls_white_36"
+      android:src="@drawable/quantum_ic_swap_calls_vd_theme_24"
       android:visibility="gone"
       tools:visibility="visible"
       />
diff --git a/java/com/android/incallui/video/impl/res/layout/videocall_controls_land.xml b/java/com/android/incallui/video/impl/res/layout/videocall_controls_land.xml
index d71b3c0..404e5c8 100644
--- a/java/com/android/incallui/video/impl/res/layout/videocall_controls_land.xml
+++ b/java/com/android/incallui/video/impl/res/layout/videocall_controls_land.xml
@@ -1,4 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2018 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
 <RelativeLayout
   xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:app="http://schemas.android.com/apk/res-auto"
@@ -45,33 +59,25 @@
     <com.android.incallui.video.impl.CheckableImageButton
       android:id="@+id/videocall_speaker_button"
       style="@style/Incall.Button.VideoCall"
-      android:layout_width="@dimen/videocall_button_size"
-      android:layout_height="@dimen/videocall_button_size"
       android:layout_marginEnd="24dp"
       android:checked="true"
-      android:src="@drawable/quantum_ic_volume_up_white_36"
+      android:src="@drawable/quantum_ic_volume_up_vd_theme_24"
       app:contentDescriptionChecked="@string/incall_content_description_speaker"
       app:contentDescriptionUnchecked="@string/incall_content_description_earpiece"
       />
     <com.android.incallui.video.impl.CheckableImageButton
       android:id="@+id/videocall_mute_button"
       style="@style/Incall.Button.VideoCall"
-      android:layout_width="@dimen/videocall_button_size"
-      android:layout_height="@dimen/videocall_button_size"
       android:layout_marginEnd="24dp"
-      android:scaleType="center"
-      android:src="@drawable/quantum_ic_mic_off_white_36"
+      android:src="@drawable/quantum_ic_mic_off_vd_theme_24"
       app:contentDescriptionChecked="@string/incall_content_description_muted"
       app:contentDescriptionUnchecked="@string/incall_content_description_unmuted"
       />
     <com.android.incallui.video.impl.CheckableImageButton
       android:id="@+id/videocall_mute_video"
       style="@style/Incall.Button.VideoCall"
-      android:layout_width="@dimen/videocall_button_size"
-      android:layout_height="@dimen/videocall_button_size"
       android:layout_marginEnd="24dp"
-      android:scaleType="center"
-      android:src="@drawable/quantum_ic_videocam_off_white_36"
+      android:src="@drawable/quantum_ic_videocam_off_vd_theme_24"
       app:contentDescriptionChecked="@string/incall_content_description_video_off"
       app:contentDescriptionUnchecked="@string/incall_content_description_video_on"
       />
@@ -93,10 +99,8 @@
     <ImageButton
       android:id="@+id/videocall_switch_on_hold"
       style="@style/Incall.Button.VideoCall"
-      android:layout_width="@dimen/videocall_button_size"
-      android:layout_height="@dimen/videocall_button_size"
       android:contentDescription="@string/incall_content_description_swap_calls"
-      android:src="@drawable/quantum_ic_swap_calls_white_36"
+      android:src="@drawable/quantum_ic_swap_calls_vd_theme_24"
       android:visibility="gone"
       tools:visibility="visible"
       />
diff --git a/java/com/android/incallui/video/impl/res/layout/videocall_controls_surfaceview.xml b/java/com/android/incallui/video/impl/res/layout/videocall_controls_surfaceview.xml
index d2dc992..7cea792 100644
--- a/java/com/android/incallui/video/impl/res/layout/videocall_controls_surfaceview.xml
+++ b/java/com/android/incallui/video/impl/res/layout/videocall_controls_surfaceview.xml
@@ -61,33 +61,25 @@
     <com.android.incallui.video.impl.CheckableImageButton
       android:id="@+id/videocall_speaker_button"
       style="@style/Incall.Button.VideoCall"
-      android:layout_width="@dimen/videocall_button_size"
-      android:layout_height="@dimen/videocall_button_size"
       android:layout_marginBottom="@dimen/videocall_button_spacing"
       android:checked="true"
-      android:src="@drawable/quantum_ic_volume_up_white_36"
+      android:src="@drawable/quantum_ic_volume_up_vd_theme_24"
       app:contentDescriptionChecked="@string/incall_content_description_speaker"
       app:contentDescriptionUnchecked="@string/incall_content_description_earpiece"
       />
     <com.android.incallui.video.impl.CheckableImageButton
       android:id="@+id/videocall_mute_button"
       style="@style/Incall.Button.VideoCall"
-      android:layout_width="@dimen/videocall_button_size"
-      android:layout_height="@dimen/videocall_button_size"
       android:layout_marginBottom="@dimen/videocall_button_spacing"
-      android:scaleType="center"
-      android:src="@drawable/quantum_ic_mic_off_white_36"
+      android:src="@drawable/quantum_ic_mic_off_vd_theme_24"
       app:contentDescriptionChecked="@string/incall_content_description_muted"
       app:contentDescriptionUnchecked="@string/incall_content_description_unmuted"
       />
     <com.android.incallui.video.impl.CheckableImageButton
       android:id="@+id/videocall_mute_video"
       style="@style/Incall.Button.VideoCall"
-      android:layout_width="@dimen/videocall_button_size"
-      android:layout_height="@dimen/videocall_button_size"
       android:layout_marginBottom="@dimen/videocall_button_spacing"
-      android:scaleType="center"
-      android:src="@drawable/quantum_ic_videocam_off_white_36"
+      android:src="@drawable/quantum_ic_videocam_off_vd_theme_24"
       app:contentDescriptionChecked="@string/incall_content_description_video_off"
       app:contentDescriptionUnchecked="@string/incall_content_description_video_on"
       />
@@ -112,7 +104,7 @@
       android:layout_width="@dimen/videocall_button_size"
       android:layout_height="@dimen/videocall_button_size"
       android:contentDescription="@string/incall_content_description_swap_calls"
-      android:src="@drawable/quantum_ic_swap_calls_white_36"
+      android:src="@drawable/quantum_ic_swap_calls_vd_theme_24"
       android:visibility="gone"
       tools:visibility="visible"
       />
diff --git a/java/com/android/incallui/video/impl/res/values-af/strings.xml b/java/com/android/incallui/video/impl/res/values-af/strings.xml
index 92a48da..7a6646d 100644
--- a/java/com/android/incallui/video/impl/res/values-af/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-af/strings.xml
@@ -1,24 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="videocall_remote_video_off" msgid="2959680546745902547">"Hulle video is af"</string>
-    <string name="videocall_remote_video_on" msgid="6011817851703181639">"Hulle video is aan"</string>
-    <string name="videocall_remotely_held" msgid="1295702896355732947">"Oproep gehou"</string>
-    <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Oproep is hervat"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="videocall_remote_video_off">Hulle video is af</string>
+  <string name="videocall_remote_video_on">Hulle video is aan</string>
+  <string name="videocall_remotely_held">Oproep gehou</string>
+  <string name="videocall_remotely_resumed">Oproep is hervat</string>
+  <string name="videocall_charges_alert_dialog_description">Video-oproepe wat oor die mobiele netwerk gemaak word, gebruik data- én stemminute. Kostes kan dalk geld.</string>
+  <string name="do_not_show_again">Moenie weer wys nie</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-am/strings.xml b/java/com/android/incallui/video/impl/res/values-am/strings.xml
index e8d6602..9e753b7 100644
--- a/java/com/android/incallui/video/impl/res/values-am/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-am/strings.xml
@@ -1,24 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="videocall_remote_video_off" msgid="2959680546745902547">"ቪዲዮዋቸው ጠፍቷል"</string>
-    <string name="videocall_remote_video_on" msgid="6011817851703181639">"የእነሱ ቪዲዮ በርቷል"</string>
-    <string name="videocall_remotely_held" msgid="1295702896355732947">"ጥሪ በይቆይ ላይ"</string>
-    <string name="videocall_remotely_resumed" msgid="3331784411244773788">"ጥሪ ከቆመበት ቀጥሏል"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="videocall_remote_video_off">ቪዲዮዋቸው ጠፍቷል</string>
+  <string name="videocall_remote_video_on">የእነሱ ቪዲዮ በርቷል</string>
+  <string name="videocall_remotely_held">ጥሪ በይቆይ ላይ</string>
+  <string name="videocall_remotely_resumed">ጥሪ ከቆመበት ቀጥሏል</string>
+  <string name="videocall_charges_alert_dialog_description">በሞባይል ውሂብ የሚካሄዱ የቪዲዮ ጥሪዎች የውሂብ እና የድምጽ ደቂቃዎችን ሁለቱንም ይጠቀማሉ። ክፍያዎች ተፈጻሚ ሊሆኑ ይችላሉ።</string>
+  <string name="do_not_show_again">ዳግም አታሳይ</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-ar/strings.xml b/java/com/android/incallui/video/impl/res/values-ar/strings.xml
index 571ed99..64bb4d1 100644
--- a/java/com/android/incallui/video/impl/res/values-ar/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-ar/strings.xml
@@ -1,24 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="videocall_remote_video_off" msgid="2959680546745902547">"الفيديو الخاص بهم قيد إيقاف التشغيل"</string>
-    <string name="videocall_remote_video_on" msgid="6011817851703181639">"الفيديو قيد التشغيل"</string>
-    <string name="videocall_remotely_held" msgid="1295702896355732947">"المكالمة معلقة"</string>
-    <string name="videocall_remotely_resumed" msgid="3331784411244773788">"تم استئناف المكالمة"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="videocall_remote_video_off">الفيديو الخاص بهم قيد إيقاف التشغيل</string>
+  <string name="videocall_remote_video_on">الفيديو قيد التشغيل</string>
+  <string name="videocall_remotely_held">المكالمة معلقة</string>
+  <string name="videocall_remotely_resumed">تم استئناف المكالمة</string>
+  <string name="videocall_charges_alert_dialog_description">تستخدم مكالمات الفيديو، التي يتم إجراؤها على شبكة الجوال، البيانات ودقائق المكالمات الصوتية معًا. قد يتم فرض رسوم.</string>
+  <string name="do_not_show_again">عدم عرض ذلك مجددًا</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-az/strings.xml b/java/com/android/incallui/video/impl/res/values-az/strings.xml
index f47ff9f..d917538 100644
--- a/java/com/android/incallui/video/impl/res/values-az/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-az/strings.xml
@@ -1,24 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="videocall_remote_video_off" msgid="2959680546745902547">"Videoları deaktivdir"</string>
-    <string name="videocall_remote_video_on" msgid="6011817851703181639">"Bu video aktivdir"</string>
-    <string name="videocall_remotely_held" msgid="1295702896355732947">"Zəng gözləmədədir"</string>
-    <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Zəng davam edir"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="videocall_remote_video_off">Videoları deaktivdir</string>
+  <string name="videocall_remote_video_on">Bu video aktivdir</string>
+  <string name="videocall_remotely_held">Zəng gözləmədədir</string>
+  <string name="videocall_remotely_resumed">Zəng davam edir</string>
+  <string name="videocall_charges_alert_dialog_description">Mobil şəbəkə vasitəsilə edilən video zənglərdə həm data, həm də səsli dəqiqələrdən istifadə olunur. Xərclər tətbiq oluna bilər.</string>
+  <string name="do_not_show_again">Yenidən göstərməyin</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-b+sr+Latn/strings.xml b/java/com/android/incallui/video/impl/res/values-b+sr+Latn/strings.xml
index aa0635d..1136d75 100644
--- a/java/com/android/incallui/video/impl/res/values-b+sr+Latn/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-b+sr+Latn/strings.xml
@@ -1,24 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="videocall_remote_video_off" msgid="2959680546745902547">"Video je isključen"</string>
-    <string name="videocall_remote_video_on" msgid="6011817851703181639">"Kamera ove osobe je uključena"</string>
-    <string name="videocall_remotely_held" msgid="1295702896355732947">"Poziv je na čekanju"</string>
-    <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Poziv je nastavljen"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="videocall_remote_video_off">Video je isključen</string>
+  <string name="videocall_remote_video_on">Kamera ove osobe je uključena</string>
+  <string name="videocall_remotely_held">Poziv je na čekanju</string>
+  <string name="videocall_remotely_resumed">Poziv je nastavljen</string>
+  <string name="videocall_charges_alert_dialog_description">Video pozivi upućeni preko mobilne mreže koriste podatke i minute za audio pozive. Naplaćuju se naknade.</string>
+  <string name="do_not_show_again">Ne prikazuj ponovo</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-be/strings.xml b/java/com/android/incallui/video/impl/res/values-be/strings.xml
index b804835..86567a5 100644
--- a/java/com/android/incallui/video/impl/res/values-be/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-be/strings.xml
@@ -1,24 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="videocall_remote_video_off" msgid="2959680546745902547">"Відэа гэтага чалавека адключана"</string>
-    <string name="videocall_remote_video_on" msgid="6011817851703181639">"Відэа гэтага чалавека ўключана"</string>
-    <string name="videocall_remotely_held" msgid="1295702896355732947">"Выклік на ўтрыманні"</string>
-    <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Выклік адноўлены"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="videocall_remote_video_off">Відэа гэтага чалавека адключана</string>
+  <string name="videocall_remote_video_on">Відэа гэтага чалавека ўключана</string>
+  <string name="videocall_remotely_held">Выклік на ўтрыманні</string>
+  <string name="videocall_remotely_resumed">Выклік адноўлены</string>
+  <string name="videocall_charges_alert_dialog_description">Для відэавыклікаў праз мабільную сетку выкарыстоўваецца як трафік для перадачы даных, так і хвіліны для галасавой сувязі. Можа спаганяцца аплата.</string>
+  <string name="do_not_show_again">Больш не паказваць</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-bg/strings.xml b/java/com/android/incallui/video/impl/res/values-bg/strings.xml
index 1459f95..1c567f1 100644
--- a/java/com/android/incallui/video/impl/res/values-bg/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-bg/strings.xml
@@ -1,24 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="videocall_remote_video_off" msgid="2959680546745902547">"Видеото отсреща е изкл."</string>
-    <string name="videocall_remote_video_on" msgid="6011817851703181639">"Видеото на другия участник е включено"</string>
-    <string name="videocall_remotely_held" msgid="1295702896355732947">"Задържано обаждане"</string>
-    <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Възобновено обажд."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="videocall_remote_video_off">Видеото отсреща е изкл.</string>
+  <string name="videocall_remote_video_on">Видеото на другия участник е включено</string>
+  <string name="videocall_remotely_held">Задържано обаждане</string>
+  <string name="videocall_remotely_resumed">Възобновено обажд.</string>
+  <string name="videocall_charges_alert_dialog_description">Видеообажданията през мобилната мрежа ще използват и данни, и минути за разговори. Може да бъдете таксувани.</string>
+  <string name="do_not_show_again">Да не се показва отново</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-bn/strings.xml b/java/com/android/incallui/video/impl/res/values-bn/strings.xml
index 0c3c645..9001c51 100644
--- a/java/com/android/incallui/video/impl/res/values-bn/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-bn/strings.xml
@@ -1,24 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="videocall_remote_video_off" msgid="2959680546745902547">"তাদের ভিডিও বন্ধ রয়েছে"</string>
-    <string name="videocall_remote_video_on" msgid="6011817851703181639">"তাদের ভিডিও চালু রয়েছে"</string>
-    <string name="videocall_remotely_held" msgid="1295702896355732947">"কলটি হোল্ডে রয়েছে"</string>
-    <string name="videocall_remotely_resumed" msgid="3331784411244773788">"কল পুনরায় শুরু করা হয়েছে"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="videocall_remote_video_off">তাদের ভিডিও বন্ধ রয়েছে</string>
+  <string name="videocall_remote_video_on">তাদের ভিডিও চালু রয়েছে</string>
+  <string name="videocall_remotely_held">কলটি হোল্ডে রয়েছে</string>
+  <string name="videocall_remotely_resumed">কল পুনরায় শুরু করা হয়েছে</string>
+  <string name="videocall_charges_alert_dialog_description">মোবাইল নেটওয়ার্ক ব্যবহার করে ভিডিও কল করলে ডেটা এবং ভয়েস মিনিট, দুটিই খরচ হয়। চার্জ প্রযোজ্য হতে পারে।</string>
+  <string name="do_not_show_again">আর দেখতে চাই না</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-bs/strings.xml b/java/com/android/incallui/video/impl/res/values-bs/strings.xml
index 47d1d02..bb37116 100644
--- a/java/com/android/incallui/video/impl/res/values-bs/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-bs/strings.xml
@@ -1,24 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="videocall_remote_video_off" msgid="2959680546745902547">"Kamera je isključena"</string>
-    <string name="videocall_remote_video_on" msgid="6011817851703181639">"Kamera je uključena"</string>
-    <string name="videocall_remotely_held" msgid="1295702896355732947">"Poziv na čekanju"</string>
-    <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Poziv je nastavljen"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="videocall_remote_video_off">Kamera je isključena</string>
+  <string name="videocall_remote_video_on">Kamera je uključena</string>
+  <string name="videocall_remotely_held">Poziv na čekanju</string>
+  <string name="videocall_remotely_resumed">Poziv je nastavljen</string>
+  <string name="videocall_charges_alert_dialog_description">Videopozivi preko mobilne mreže koriste prijenos podataka i minute razgovora. Moguća je naplata tih usluga.</string>
+  <string name="do_not_show_again">Ne prikazuj ponovo</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-ca/strings.xml b/java/com/android/incallui/video/impl/res/values-ca/strings.xml
index 9745bcb..eeaefa6 100644
--- a/java/com/android/incallui/video/impl/res/values-ca/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-ca/strings.xml
@@ -1,24 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="videocall_remote_video_off" msgid="2959680546745902547">"Tenen vídeo desactivat"</string>
-    <string name="videocall_remote_video_on" msgid="6011817851703181639">"Té el vídeo activat"</string>
-    <string name="videocall_remotely_held" msgid="1295702896355732947">"Trucada en espera"</string>
-    <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Trucada represa"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="videocall_remote_video_off">Tenen vídeo desactivat</string>
+  <string name="videocall_remote_video_on">Té el vídeo activat</string>
+  <string name="videocall_remotely_held">Trucada en espera</string>
+  <string name="videocall_remotely_resumed">Trucada represa</string>
+  <string name="videocall_charges_alert_dialog_description">Les videotrucades que es fan a través de la xarxa mòbil fan servir tant dades com minuts de veu. És possible que s\'apliquin càrrecs.</string>
+  <string name="do_not_show_again">No ho tornis a mostrar</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-cs/strings.xml b/java/com/android/incallui/video/impl/res/values-cs/strings.xml
index d8258e5..97203eb 100644
--- a/java/com/android/incallui/video/impl/res/values-cs/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-cs/strings.xml
@@ -1,24 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="videocall_remote_video_off" msgid="2959680546745902547">"Video tohoto uživatele je vypnuto"</string>
-    <string name="videocall_remote_video_on" msgid="6011817851703181639">"Video tohoto uživatele je zapnuto"</string>
-    <string name="videocall_remotely_held" msgid="1295702896355732947">"Podržený hovor"</string>
-    <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Hovor byl obnoven"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="videocall_remote_video_off">Video tohoto uživatele je vypnuto</string>
+  <string name="videocall_remote_video_on">Video tohoto uživatele je zapnuto</string>
+  <string name="videocall_remotely_held">Podržený hovor</string>
+  <string name="videocall_remotely_resumed">Hovor byl obnoven</string>
+  <string name="videocall_charges_alert_dialog_description">Videohovory v mobilní síti využívají jak data, tak minuty pro hlasové volání. Mohou vám být účtovány poplatky.</string>
+  <string name="do_not_show_again">Příště již nezobrazovat</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-da/strings.xml b/java/com/android/incallui/video/impl/res/values-da/strings.xml
index a52a2bc..e40ad54 100644
--- a/java/com/android/incallui/video/impl/res/values-da/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-da/strings.xml
@@ -1,24 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="videocall_remote_video_off" msgid="2959680546745902547">"Vedkommendes video er slået fra"</string>
-    <string name="videocall_remote_video_on" msgid="6011817851703181639">"Vedkommendes video er slået til"</string>
-    <string name="videocall_remotely_held" msgid="1295702896355732947">"Parkeret opkald"</string>
-    <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Opkaldet er genoptaget"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="videocall_remote_video_off">Vedkommendes video er slået fra</string>
+  <string name="videocall_remote_video_on">Vedkommendes video er slået til</string>
+  <string name="videocall_remotely_held">Parkeret opkald</string>
+  <string name="videocall_remotely_resumed">Opkaldet er genoptaget</string>
+  <string name="videocall_charges_alert_dialog_description">De videoopkald, der foretages på mobilnetværket, bruger minutter i både dit data- og taleabonnement. dit mobilselskab kan muligvis opkræve gebyrer.</string>
+  <string name="do_not_show_again">Vis ikke igen</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-de/strings.xml b/java/com/android/incallui/video/impl/res/values-de/strings.xml
index fcc8fb9..533d32f 100644
--- a/java/com/android/incallui/video/impl/res/values-de/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-de/strings.xml
@@ -1,24 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="videocall_remote_video_off" msgid="2959680546745902547">"Video deaktiviert"</string>
-    <string name="videocall_remote_video_on" msgid="6011817851703181639">"Video ist aktiviert"</string>
-    <string name="videocall_remotely_held" msgid="1295702896355732947">"Anruf wird gehalten."</string>
-    <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Anruf fortgesetzt"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="videocall_remote_video_off">Video deaktiviert</string>
+  <string name="videocall_remote_video_on">Video ist aktiviert</string>
+  <string name="videocall_remotely_held">Anruf wird gehalten.</string>
+  <string name="videocall_remotely_resumed">Anruf fortgesetzt</string>
+  <string name="videocall_charges_alert_dialog_description">Für Videoanrufe über das Mobilfunknetz können Gebühren sowohl für die Nutzung von Datenvolumen als auch von Gesprächsminuten anfallen.</string>
+  <string name="do_not_show_again">Nicht noch einmal anzeigen</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-el/strings.xml b/java/com/android/incallui/video/impl/res/values-el/strings.xml
index eb4c671..be7861a 100644
--- a/java/com/android/incallui/video/impl/res/values-el/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-el/strings.xml
@@ -1,24 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="videocall_remote_video_off" msgid="2959680546745902547">"Το βίντεό τους απεν."</string>
-    <string name="videocall_remote_video_on" msgid="6011817851703181639">"Το βίντεό τους είναι ενεργοποιημένο"</string>
-    <string name="videocall_remotely_held" msgid="1295702896355732947">"Κλήση σε αναμονή"</string>
-    <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Συνέχιση κλήσης"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="videocall_remote_video_off">Το βίντεό τους απεν.</string>
+  <string name="videocall_remote_video_on">Το βίντεό τους είναι ενεργοποιημένο</string>
+  <string name="videocall_remotely_held">Κλήση σε αναμονή</string>
+  <string name="videocall_remotely_resumed">Συνέχιση κλήσης</string>
+  <string name="videocall_charges_alert_dialog_description">Οι βιντεοκλήσεις που πραγματοποιούνται μέσω δικτύου κινητής τηλεφωνίας χρησιμοποιούν τόσο δεδομένα όσο και λεπτά χρόνου ομιλίας. Ενδέχεται να ισχύουν χρεώσεις.</string>
+  <string name="do_not_show_again">Να μην εμφανιστεί ξανά</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-en-rAU/strings.xml b/java/com/android/incallui/video/impl/res/values-en-rAU/strings.xml
index 1677600..2a44eba 100644
--- a/java/com/android/incallui/video/impl/res/values-en-rAU/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-en-rAU/strings.xml
@@ -1,24 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="videocall_remote_video_off" msgid="2959680546745902547">"Their video is off"</string>
-    <string name="videocall_remote_video_on" msgid="6011817851703181639">"Their video is on"</string>
-    <string name="videocall_remotely_held" msgid="1295702896355732947">"Call on hold"</string>
-    <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Call resumed"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="videocall_remote_video_off">Their video is off</string>
+  <string name="videocall_remote_video_on">Their video is on</string>
+  <string name="videocall_remotely_held">Call on hold</string>
+  <string name="videocall_remotely_resumed">Call resumed</string>
+  <string name="videocall_charges_alert_dialog_description">Video calls made over the mobile network use both data and voice minutes. Charges may apply.</string>
+  <string name="do_not_show_again">Do not show this again</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-en-rGB/strings.xml b/java/com/android/incallui/video/impl/res/values-en-rGB/strings.xml
index 1677600..2a44eba 100644
--- a/java/com/android/incallui/video/impl/res/values-en-rGB/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-en-rGB/strings.xml
@@ -1,24 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="videocall_remote_video_off" msgid="2959680546745902547">"Their video is off"</string>
-    <string name="videocall_remote_video_on" msgid="6011817851703181639">"Their video is on"</string>
-    <string name="videocall_remotely_held" msgid="1295702896355732947">"Call on hold"</string>
-    <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Call resumed"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="videocall_remote_video_off">Their video is off</string>
+  <string name="videocall_remote_video_on">Their video is on</string>
+  <string name="videocall_remotely_held">Call on hold</string>
+  <string name="videocall_remotely_resumed">Call resumed</string>
+  <string name="videocall_charges_alert_dialog_description">Video calls made over the mobile network use both data and voice minutes. Charges may apply.</string>
+  <string name="do_not_show_again">Do not show this again</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-en-rIN/strings.xml b/java/com/android/incallui/video/impl/res/values-en-rIN/strings.xml
index 1677600..2a44eba 100644
--- a/java/com/android/incallui/video/impl/res/values-en-rIN/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-en-rIN/strings.xml
@@ -1,24 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="videocall_remote_video_off" msgid="2959680546745902547">"Their video is off"</string>
-    <string name="videocall_remote_video_on" msgid="6011817851703181639">"Their video is on"</string>
-    <string name="videocall_remotely_held" msgid="1295702896355732947">"Call on hold"</string>
-    <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Call resumed"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="videocall_remote_video_off">Their video is off</string>
+  <string name="videocall_remote_video_on">Their video is on</string>
+  <string name="videocall_remotely_held">Call on hold</string>
+  <string name="videocall_remotely_resumed">Call resumed</string>
+  <string name="videocall_charges_alert_dialog_description">Video calls made over the mobile network use both data and voice minutes. Charges may apply.</string>
+  <string name="do_not_show_again">Do not show this again</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-es-rUS/strings.xml b/java/com/android/incallui/video/impl/res/values-es-rUS/strings.xml
index 46765ac..6d15f55 100644
--- a/java/com/android/incallui/video/impl/res/values-es-rUS/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-es-rUS/strings.xml
@@ -1,24 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="videocall_remote_video_off" msgid="2959680546745902547">"Video desactivado"</string>
-    <string name="videocall_remote_video_on" msgid="6011817851703181639">"El video está activado."</string>
-    <string name="videocall_remotely_held" msgid="1295702896355732947">"Llamada en espera"</string>
-    <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Llamada reanudada"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="videocall_remote_video_off">Video desactivado</string>
+  <string name="videocall_remote_video_on">El video está activado.</string>
+  <string name="videocall_remotely_held">Llamada en espera</string>
+  <string name="videocall_remotely_resumed">Llamada reanudada</string>
+  <string name="videocall_charges_alert_dialog_description">Las videollamadas que se realicen mediante la red móvil, usarán datos y minutos de llamada. Es posible que se apliquen cargos.</string>
+  <string name="do_not_show_again">No volver a mostrar</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-es/strings.xml b/java/com/android/incallui/video/impl/res/values-es/strings.xml
index 035bc3c..d07cb5b 100644
--- a/java/com/android/incallui/video/impl/res/values-es/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-es/strings.xml
@@ -1,24 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="videocall_remote_video_off" msgid="2959680546745902547">"Vídeo desactivado"</string>
-    <string name="videocall_remote_video_on" msgid="6011817851703181639">"Su vídeo está activado"</string>
-    <string name="videocall_remotely_held" msgid="1295702896355732947">"Llamada en espera"</string>
-    <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Llamada reanudada"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="videocall_remote_video_off">Vídeo desactivado</string>
+  <string name="videocall_remote_video_on">Su vídeo está activado</string>
+  <string name="videocall_remotely_held">Llamada en espera</string>
+  <string name="videocall_remotely_resumed">Llamada reanudada</string>
+  <string name="videocall_charges_alert_dialog_description">Las videollamadas que hagas a través de la red móvil consumirán datos y minutos de tu tarifa de voz. Es posible que se apliquen cargos.</string>
+  <string name="do_not_show_again">No volver a mostrar</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-et/strings.xml b/java/com/android/incallui/video/impl/res/values-et/strings.xml
index d685d0b..79b13fc 100644
--- a/java/com/android/incallui/video/impl/res/values-et/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-et/strings.xml
@@ -1,24 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="videocall_remote_video_off" msgid="2959680546745902547">"Nende video on välj."</string>
-    <string name="videocall_remote_video_on" msgid="6011817851703181639">"Nende video on eetris"</string>
-    <string name="videocall_remotely_held" msgid="1295702896355732947">"Kõne on ootel"</string>
-    <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Kõne jätkub"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="videocall_remote_video_off">Nende video on välj.</string>
+  <string name="videocall_remote_video_on">Nende video on eetris</string>
+  <string name="videocall_remotely_held">Kõne on ootel</string>
+  <string name="videocall_remotely_resumed">Kõne jätkub</string>
+  <string name="videocall_charges_alert_dialog_description">Mobiilsidevõrgu kaudu tehtud videokõned kasutavad nii andmeside- kui ka kõneminuteid. Rakenduda võivad tasud.</string>
+  <string name="do_not_show_again">Ära enam kuva</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-eu/strings.xml b/java/com/android/incallui/video/impl/res/values-eu/strings.xml
index daa30e0..f23241e 100644
--- a/java/com/android/incallui/video/impl/res/values-eu/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-eu/strings.xml
@@ -1,24 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="videocall_remote_video_off" msgid="2959680546745902547">"Bideoa desaktibatuta"</string>
-    <string name="videocall_remote_video_on" msgid="6011817851703181639">"Aktibatuta du bideoa"</string>
-    <string name="videocall_remotely_held" msgid="1295702896355732947">"Zain dago deia"</string>
-    <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Deiari berrekin zaio"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="videocall_remote_video_off">Bideoa desaktibatuta</string>
+  <string name="videocall_remote_video_on">Aktibatuta du bideoa</string>
+  <string name="videocall_remotely_held">Zain dago deia</string>
+  <string name="videocall_remotely_resumed">Deiari berrekin zaio</string>
+  <string name="videocall_charges_alert_dialog_description">Sare mugikorraren bidez egindako deiek datu-konexioa eta hitz egiteko minutuak erabiltzen dituzte. Baliteke zerbait ordaindu behar izatea.</string>
+  <string name="do_not_show_again">Ez erakutsi berriro</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-fa/strings.xml b/java/com/android/incallui/video/impl/res/values-fa/strings.xml
index 4c4c186..a17f0c0 100644
--- a/java/com/android/incallui/video/impl/res/values-fa/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-fa/strings.xml
@@ -1,24 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="videocall_remote_video_off" msgid="2959680546745902547">"ویدیوی طرف مقابل غیرفعال است"</string>
-    <string name="videocall_remote_video_on" msgid="6011817851703181639">"ویدیوی طرف مقابل فعال است"</string>
-    <string name="videocall_remotely_held" msgid="1295702896355732947">"تماس درحال انتظار"</string>
-    <string name="videocall_remotely_resumed" msgid="3331784411244773788">"تماس ازسرگرفته‌شده"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="videocall_remote_video_off">ویدیوی طرف مقابل غیرفعال است</string>
+  <string name="videocall_remote_video_on">ویدیوی طرف مقابل فعال است</string>
+  <string name="videocall_remotely_held">تماس درحال انتظار</string>
+  <string name="videocall_remotely_resumed">تماس ازسرگرفته‌شده</string>
+  <string name="videocall_charges_alert_dialog_description">در تماس‌های ویدیویی ازطریق شبکه همراه، از داده و دقیقه‌های تماس صوتی هردو استفاده می‌کنند. ممکن است هزینه اعمال شود.</string>
+  <string name="do_not_show_again">دیگر نشان داده نشود</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-fi/strings.xml b/java/com/android/incallui/video/impl/res/values-fi/strings.xml
index eae4b43..cae5e4f 100644
--- a/java/com/android/incallui/video/impl/res/values-fi/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-fi/strings.xml
@@ -1,24 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="videocall_remote_video_off" msgid="2959680546745902547">"Ei videota"</string>
-    <string name="videocall_remote_video_on" msgid="6011817851703181639">"Hänen videonsa on päällä"</string>
-    <string name="videocall_remotely_held" msgid="1295702896355732947">"Puhelu pidossa"</string>
-    <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Puhelua jatkettiin"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="videocall_remote_video_off">Ei videota</string>
+  <string name="videocall_remote_video_on">Hänen videonsa on päällä</string>
+  <string name="videocall_remotely_held">Puhelu pidossa</string>
+  <string name="videocall_remotely_resumed">Puhelua jatkettiin</string>
+  <string name="videocall_charges_alert_dialog_description">Mobiiliverkon kautta soitetut videoSoittaminent kuluttavat sekä mobiilidataa että puheaikaa. Operaattorisi saattaa veloittaa näiden käytöstä.</string>
+  <string name="do_not_show_again">Älä näytä uudelleen</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-fr-rCA/strings.xml b/java/com/android/incallui/video/impl/res/values-fr-rCA/strings.xml
index e59d14b..6d2e1bd 100644
--- a/java/com/android/incallui/video/impl/res/values-fr-rCA/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-fr-rCA/strings.xml
@@ -1,24 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="videocall_remote_video_off" msgid="2959680546745902547">"Vidéo désactivée"</string>
-    <string name="videocall_remote_video_on" msgid="6011817851703181639">"Sa vidéo est activée"</string>
-    <string name="videocall_remotely_held" msgid="1295702896355732947">"Appel en attente"</string>
-    <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Appel repris"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="videocall_remote_video_off">Vidéo désactivée</string>
+  <string name="videocall_remote_video_on">Sa vidéo est activée</string>
+  <string name="videocall_remotely_held">Appel en attente</string>
+  <string name="videocall_remotely_resumed">Appel repris</string>
+  <string name="videocall_charges_alert_dialog_description">Les appels vidéo effectués sur le réseau cellulaire utilisent des minutes pour le service de données et le service de voix. Des frais peuvent s\'appliquer.</string>
+  <string name="do_not_show_again">Ne plus afficher</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-fr/strings.xml b/java/com/android/incallui/video/impl/res/values-fr/strings.xml
index 5ef4543..e0de4a3 100644
--- a/java/com/android/incallui/video/impl/res/values-fr/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-fr/strings.xml
@@ -1,24 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="videocall_remote_video_off" msgid="2959680546745902547">"Vidéo désactivée"</string>
-    <string name="videocall_remote_video_on" msgid="6011817851703181639">"Leur vidéo est lancée"</string>
-    <string name="videocall_remotely_held" msgid="1295702896355732947">"Appel en attente"</string>
-    <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Reprise de l\'appel"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="videocall_remote_video_off">Vidéo désactivée</string>
+  <string name="videocall_remote_video_on">Leur vidéo est lancée</string>
+  <string name="videocall_remotely_held">Appel en attente</string>
+  <string name="videocall_remotely_resumed">Reprise de l\'appel</string>
+  <string name="videocall_charges_alert_dialog_description">Les appels vidéo passés sur le réseau mobile sont comptabilisés à la fois dans la partie \"appels\" et dans la partie \"données\" de votre forfait. Des frais supplémentaires peuvent s\'appliquer.</string>
+  <string name="do_not_show_again">Ne plus afficher</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-gl/strings.xml b/java/com/android/incallui/video/impl/res/values-gl/strings.xml
index 263ee3b..12d4627 100644
--- a/java/com/android/incallui/video/impl/res/values-gl/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-gl/strings.xml
@@ -1,24 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="videocall_remote_video_off" msgid="2959680546745902547">"Vídeo desactivado"</string>
-    <string name="videocall_remote_video_on" msgid="6011817851703181639">"O seu vídeo está activado"</string>
-    <string name="videocall_remotely_held" msgid="1295702896355732947">"Chamada en espera"</string>
-    <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Retomouse a chamada"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="videocall_remote_video_off">Vídeo desactivado</string>
+  <string name="videocall_remote_video_on">O seu vídeo está activado</string>
+  <string name="videocall_remotely_held">Chamada en espera</string>
+  <string name="videocall_remotely_resumed">Retomouse a chamada</string>
+  <string name="videocall_charges_alert_dialog_description">Nas videochamadas que se realizan a través da rede móbil, úsanse tanto minutos de datos como de voz. É posible que se apliquen cargos.</string>
+  <string name="do_not_show_again">Non mostrar de novo</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-gu/strings.xml b/java/com/android/incallui/video/impl/res/values-gu/strings.xml
index 8164e6e..0210b7c 100644
--- a/java/com/android/incallui/video/impl/res/values-gu/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-gu/strings.xml
@@ -1,24 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="videocall_remote_video_off" msgid="2959680546745902547">"તેમનો વિડિઓ બંધ છે"</string>
-    <string name="videocall_remote_video_on" msgid="6011817851703181639">"તેમની વિડિઓ ચાલુ છે"</string>
-    <string name="videocall_remotely_held" msgid="1295702896355732947">"કૉલ હોલ્ડ પર છે"</string>
-    <string name="videocall_remotely_resumed" msgid="3331784411244773788">"કૉલ ફરી શરૂ કર્યો"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="videocall_remote_video_off">તેમનો વિડિઓ બંધ છે</string>
+  <string name="videocall_remote_video_on">તેમની વિડિઓ ચાલુ છે</string>
+  <string name="videocall_remotely_held">કૉલ હોલ્ડ પર છે</string>
+  <string name="videocall_remotely_resumed">કૉલ ફરી શરૂ કર્યો</string>
+  <string name="videocall_charges_alert_dialog_description">મોબાઇલ નેટવર્ક પરથી કરેલા વીડિઓ કૉલ ડેટા અને વૉઇસ મિનિટ એમ બન્નેનો ઉપયોગ કરે છે. શુલ્ક લાગુ થઈ શકે છે.</string>
+  <string name="do_not_show_again">ફરી બતાવશો નહીં</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-h580dp/dimens.xml b/java/com/android/incallui/video/impl/res/values-h580dp/dimens.xml
index e9e7f9e..d4a5e17 100644
--- a/java/com/android/incallui/video/impl/res/values-h580dp/dimens.xml
+++ b/java/com/android/incallui/video/impl/res/values-h580dp/dimens.xml
@@ -17,6 +17,7 @@
 <resources>
   <dimen name="videocall_button_spacing">16dp</dimen>
   <dimen name="videocall_button_size">72dp</dimen>
+  <dimen name="videocall_button_padding">18dp</dimen>
   <dimen name="videocall_preview_width">88dp</dimen>
   <dimen name="videocall_preview_height">88dp</dimen>
   <dimen name="videocall_preview_long">116dp</dimen>
diff --git a/java/com/android/incallui/video/impl/res/values-hi/strings.xml b/java/com/android/incallui/video/impl/res/values-hi/strings.xml
index bce1eb6..2bdb4d0 100644
--- a/java/com/android/incallui/video/impl/res/values-hi/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-hi/strings.xml
@@ -1,24 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="videocall_remote_video_off" msgid="2959680546745902547">"उनका वीडियो बंद है"</string>
-    <string name="videocall_remote_video_on" msgid="6011817851703181639">"उनका वीडियो चालू है"</string>
-    <string name="videocall_remotely_held" msgid="1295702896355732947">"कॉल होल्ड पर है"</string>
-    <string name="videocall_remotely_resumed" msgid="3331784411244773788">"कॉल फिर से शुरू किया गया"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="videocall_remote_video_off">उनका वीडियो बंद है</string>
+  <string name="videocall_remote_video_on">उनका वीडियो चालू है</string>
+  <string name="videocall_remotely_held">कॉल होल्ड पर है</string>
+  <string name="videocall_remotely_resumed">कॉल फिर से शुरू किया गया</string>
+  <string name="videocall_charges_alert_dialog_description">मोबाइल नेटवर्क के ज़रिये किए जाने वाले वीडियो कॉल डेटा और वॉइस मिनट दोनों का इस्तेमाल करते हैं. शुल्क लागू हो सकते हैं.</string>
+  <string name="do_not_show_again">दोबारा न दिखाएं</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-hr/strings.xml b/java/com/android/incallui/video/impl/res/values-hr/strings.xml
index 9acadbb..f5224e7 100644
--- a/java/com/android/incallui/video/impl/res/values-hr/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-hr/strings.xml
@@ -1,24 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="videocall_remote_video_off" msgid="2959680546745902547">"Videokamera je isk."</string>
-    <string name="videocall_remote_video_on" msgid="6011817851703181639">"Videopoziv je uključen"</string>
-    <string name="videocall_remotely_held" msgid="1295702896355732947">"Poziv na čekanju"</string>
-    <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Poziv je nastavljen"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="videocall_remote_video_off">Videokamera je isk.</string>
+  <string name="videocall_remote_video_on">Videopoziv je uključen</string>
+  <string name="videocall_remotely_held">Poziv na čekanju</string>
+  <string name="videocall_remotely_resumed">Poziv je nastavljen</string>
+  <string name="videocall_charges_alert_dialog_description">Videopozivi putem mobilne mreže koriste podatkovni promet i glasovne minute. Moguća je naplata naknade.</string>
+  <string name="do_not_show_again">Ne prikazuj ponovo</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-hu/strings.xml b/java/com/android/incallui/video/impl/res/values-hu/strings.xml
index 0042d83..3b50797 100644
--- a/java/com/android/incallui/video/impl/res/values-hu/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-hu/strings.xml
@@ -1,24 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="videocall_remote_video_off" msgid="2959680546745902547">"A videokép leállt"</string>
-    <string name="videocall_remote_video_on" msgid="6011817851703181639">"A videokép be van kapcsolva"</string>
-    <string name="videocall_remotely_held" msgid="1295702896355732947">"Várakoztatás"</string>
-    <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Hívás folytatva"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="videocall_remote_video_off">A videokép leállt</string>
+  <string name="videocall_remote_video_on">A videokép be van kapcsolva</string>
+  <string name="videocall_remotely_held">Várakoztatás</string>
+  <string name="videocall_remotely_resumed">Hívás folytatva</string>
+  <string name="videocall_charges_alert_dialog_description">A mobilhálózaton lebonyolított videohívások adatforgalommal és telefonálási idővel is járnak. A szolgáltató díjat számíthat fel ezért.</string>
+  <string name="do_not_show_again">Ne jelenjen meg újra</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-hy/strings.xml b/java/com/android/incallui/video/impl/res/values-hy/strings.xml
index fb06169..4bc4bef 100644
--- a/java/com/android/incallui/video/impl/res/values-hy/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-hy/strings.xml
@@ -1,24 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="videocall_remote_video_off" msgid="2959680546745902547">"Իր խցիկն անջատած է"</string>
-    <string name="videocall_remote_video_on" msgid="6011817851703181639">"Զրուցակցի խցիկը միացած է"</string>
-    <string name="videocall_remotely_held" msgid="1295702896355732947">"Զանգը սպասման մեջ է"</string>
-    <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Զանգը վերսկսվեց"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="videocall_remote_video_off">Իր խցիկն անջատած է</string>
+  <string name="videocall_remote_video_on">Զրուցակցի խցիկը միացած է</string>
+  <string name="videocall_remotely_held">Զանգը սպասման մեջ է</string>
+  <string name="videocall_remotely_resumed">Զանգը վերսկսվեց</string>
+  <string name="videocall_charges_alert_dialog_description">Բջջային ցանցի միջոցով արվող տեսազանգերի ժամանակ կսպառվեն ինչպես մեգաբայթեր, այնպես էլ րոպեներ: Կարող է գումար գանձվել:</string>
+  <string name="do_not_show_again">Այլևս ցույց չտալ</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-in/strings.xml b/java/com/android/incallui/video/impl/res/values-in/strings.xml
index 6abb2a7..a3ae9b5 100644
--- a/java/com/android/incallui/video/impl/res/values-in/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-in/strings.xml
@@ -1,24 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="videocall_remote_video_off" msgid="2959680546745902547">"Video mereka nonaktif"</string>
-    <string name="videocall_remote_video_on" msgid="6011817851703181639">"Video mereka aktif"</string>
-    <string name="videocall_remotely_held" msgid="1295702896355732947">"Panggilan ditahan"</string>
-    <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Panggilan dilanjutkan"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="videocall_remote_video_off">Video mereka nonaktif</string>
+  <string name="videocall_remote_video_on">Video mereka aktif</string>
+  <string name="videocall_remotely_held">Panggilan ditahan</string>
+  <string name="videocall_remotely_resumed">Panggilan dilanjutkan</string>
+  <string name="videocall_charges_alert_dialog_description">Video call yang dilakukan melalui jaringan seluler akan menggunakan kuota internet dan tarif suara. Biaya mungkin berlaku.</string>
+  <string name="do_not_show_again">Jangan tampilkan lagi</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-is/strings.xml b/java/com/android/incallui/video/impl/res/values-is/strings.xml
index e1834dd..2c23687 100644
--- a/java/com/android/incallui/video/impl/res/values-is/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-is/strings.xml
@@ -1,24 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="videocall_remote_video_off" msgid="2959680546745902547">"Slökkt er á mynd"</string>
-    <string name="videocall_remote_video_on" msgid="6011817851703181639">"Kveikt er á myndskeiði viðkomandi"</string>
-    <string name="videocall_remotely_held" msgid="1295702896355732947">"Símtal í bið"</string>
-    <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Símtal heldur áfram"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="videocall_remote_video_off">Slökkt er á mynd</string>
+  <string name="videocall_remote_video_on">Kveikt er á myndskeiði viðkomandi</string>
+  <string name="videocall_remotely_held">Símtal í bið</string>
+  <string name="videocall_remotely_resumed">Símtal heldur áfram</string>
+  <string name="videocall_charges_alert_dialog_description">Myndsímtöl í gegnum farsímakerfi nota bæði gögn og talmínútur. Gjöld kunna að eiga við.</string>
+  <string name="do_not_show_again">Ekki birta aftur</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-it/strings.xml b/java/com/android/incallui/video/impl/res/values-it/strings.xml
index fd7549d..e735bc9 100644
--- a/java/com/android/incallui/video/impl/res/values-it/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-it/strings.xml
@@ -1,24 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="videocall_remote_video_off" msgid="2959680546745902547">"Il suo video non è attivo"</string>
-    <string name="videocall_remote_video_on" msgid="6011817851703181639">"Il loro video è attivo"</string>
-    <string name="videocall_remotely_held" msgid="1295702896355732947">"Chiamata in attesa"</string>
-    <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Chiamata ripristinata"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="videocall_remote_video_off">Il suo video non è attivo</string>
+  <string name="videocall_remote_video_on">Il loro video è attivo</string>
+  <string name="videocall_remotely_held">Chiamata in attesa</string>
+  <string name="videocall_remotely_resumed">Chiamata ripristinata</string>
+  <string name="videocall_charges_alert_dialog_description">Per le videochiamate effettuate attraverso la rete mobile vengono utilizzati sia il piano dati sia i minuti di conversazione. Potrebbero essere addebitati dei costi.</string>
+  <string name="do_not_show_again">Non mostrare più</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-iw/strings.xml b/java/com/android/incallui/video/impl/res/values-iw/strings.xml
index c93dbb8..f81e4e7 100644
--- a/java/com/android/incallui/video/impl/res/values-iw/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-iw/strings.xml
@@ -1,24 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="videocall_remote_video_off" msgid="2959680546745902547">"הווידאו של הצד השני מושבת"</string>
-    <string name="videocall_remote_video_on" msgid="6011817851703181639">"הווידאו של הצד השני מופעל"</string>
-    <string name="videocall_remotely_held" msgid="1295702896355732947">"השיחה הועברה להמתנה"</string>
-    <string name="videocall_remotely_resumed" msgid="3331784411244773788">"השיחה חודשה"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="videocall_remote_video_off">הווידאו של הצד השני מושבת</string>
+  <string name="videocall_remote_video_on">הווידאו של הצד השני מופעל</string>
+  <string name="videocall_remotely_held">השיחה הועברה להמתנה</string>
+  <string name="videocall_remotely_resumed">השיחה חודשה</string>
+  <string name="videocall_charges_alert_dialog_description">כשמבצעים שיחות וידאו באמצעות הרשת הסלולרית משתמשים גם בחבילת הגלישה וגם בדקות השיחה. החיוב הוא בהתאם לחבילה הסלולרית שלך.</string>
+  <string name="do_not_show_again">הבנתי, לא צריך להציג את זה שוב</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-ja/strings.xml b/java/com/android/incallui/video/impl/res/values-ja/strings.xml
index 8a5d99a..30b9a11 100644
--- a/java/com/android/incallui/video/impl/res/values-ja/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-ja/strings.xml
@@ -1,24 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="videocall_remote_video_off" msgid="2959680546745902547">"相手のビデオ: OFF"</string>
-    <string name="videocall_remote_video_on" msgid="6011817851703181639">"相手のビデオ: ON"</string>
-    <string name="videocall_remotely_held" msgid="1295702896355732947">"通話保留中"</string>
-    <string name="videocall_remotely_resumed" msgid="3331784411244773788">"通話が再開されました"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="videocall_remote_video_off">相手のビデオ: OFF</string>
+  <string name="videocall_remote_video_on">相手のビデオ: ON</string>
+  <string name="videocall_remotely_held">通話保留中</string>
+  <string name="videocall_remotely_resumed">通話が再開されました</string>
+  <string name="videocall_charges_alert_dialog_description">モバイル ネットワーク経由で発信したビデオ通話はモバイルデータと通話時間の両方を消費します。また、通信料が適用される場合があります。</string>
+  <string name="do_not_show_again">今後表示しない</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-ka/strings.xml b/java/com/android/incallui/video/impl/res/values-ka/strings.xml
index 6340c5f..f06b9d8 100644
--- a/java/com/android/incallui/video/impl/res/values-ka/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-ka/strings.xml
@@ -1,24 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="videocall_remote_video_off" msgid="2959680546745902547">"მათი ვიდ. გამორთულია"</string>
-    <string name="videocall_remote_video_on" msgid="6011817851703181639">"მისი ვიდეო ჩართულია"</string>
-    <string name="videocall_remotely_held" msgid="1295702896355732947">"ზარი მოცდის რეჟიმშია"</string>
-    <string name="videocall_remotely_resumed" msgid="3331784411244773788">"ზარი განახლდა"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="videocall_remote_video_off">მათი ვიდ. გამორთულია</string>
+  <string name="videocall_remote_video_on">მისი ვიდეო ჩართულია</string>
+  <string name="videocall_remotely_held">ზარი მოცდის რეჟიმშია</string>
+  <string name="videocall_remotely_resumed">ზარი განახლდა</string>
+  <string name="videocall_charges_alert_dialog_description">მობილური ქსელის მეშვეობით შესრულებული ვიდეოზარები იყენებს როგორც მობილურ ინტერნეტს, ასევე ხმოვანი ზარის წუთებს. შესაძლოა მოგიწიოთ საფასურის გადახდა.</string>
+  <string name="do_not_show_again">აღარ მაჩვენო</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-kk/strings.xml b/java/com/android/incallui/video/impl/res/values-kk/strings.xml
index 9f7626b..60c3528 100644
--- a/java/com/android/incallui/video/impl/res/values-kk/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-kk/strings.xml
@@ -1,24 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="videocall_remote_video_off" msgid="2959680546745902547">"Олардың бейнесі өшірулі"</string>
-    <string name="videocall_remote_video_on" msgid="6011817851703181639">"Олардың бейне құралы қосулы"</string>
-    <string name="videocall_remotely_held" msgid="1295702896355732947">"Қоңырау күту күйінде"</string>
-    <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Қоңырауды жалғастырды"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="videocall_remote_video_off">Олардың бейнесі өшірулі</string>
+  <string name="videocall_remote_video_on">Олардың бейне құралы қосулы</string>
+  <string name="videocall_remotely_held">Қоңырау күту күйінде</string>
+  <string name="videocall_remotely_resumed">Қоңырауды жалғастырды</string>
+  <string name="videocall_charges_alert_dialog_description">Ұялы желі арқылы шалынған бейне қоңыраулар ұялы және дауыс минуттарының екеуін де пайдаланады. Ақы алынуы мүмкін.</string>
+  <string name="do_not_show_again">Қайта көрсету қажет емес</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-km/strings.xml b/java/com/android/incallui/video/impl/res/values-km/strings.xml
index 8d5cac4..f0fd3e8 100644
--- a/java/com/android/incallui/video/impl/res/values-km/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-km/strings.xml
@@ -1,24 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="videocall_remote_video_off" msgid="2959680546745902547">"វីដេអូ​របស់​ពួកគេ​ត្រូវ​បាន​បិទ"</string>
-    <string name="videocall_remote_video_on" msgid="6011817851703181639">"វីដេអូ​របស់​ពួកគេ​ត្រូវ​បាន​បើក"</string>
-    <string name="videocall_remotely_held" msgid="1295702896355732947">"ការ​ហៅ​កំពុង​រង់ចាំ"</string>
-    <string name="videocall_remotely_resumed" msgid="3331784411244773788">"បាន​បន្ត​ការ​ហៅ​ទូរសព្ទ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="videocall_remote_video_off">វីដេអូ​របស់​ពួកគេ​ត្រូវ​បាន​បិទ</string>
+  <string name="videocall_remote_video_on">វីដេអូ​របស់​ពួកគេ​ត្រូវ​បាន​បើក</string>
+  <string name="videocall_remotely_held">ការ​ហៅ​កំពុង​រង់ចាំ</string>
+  <string name="videocall_remotely_resumed">បាន​បន្ត​ការ​ហៅ​ទូរសព្ទ</string>
+  <string name="videocall_charges_alert_dialog_description">ការហៅ​ជា​វីដេអូ​ដែល​ធ្វើឡើង​តាម​បណ្ដាញ​ទូរសព្ទ​ចល័ត ប្រើប្រាស់​ទិន្នន័យ និង​នាទី​នៃសំឡេង។ អាច​នឹង​មាន​ការគិត​ថ្លៃ។</string>
+  <string name="do_not_show_again">កុំ​បង្ហាញ​ទៀត</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-kn/strings.xml b/java/com/android/incallui/video/impl/res/values-kn/strings.xml
index 09ff808..1939d72 100644
--- a/java/com/android/incallui/video/impl/res/values-kn/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-kn/strings.xml
@@ -1,24 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="videocall_remote_video_off" msgid="2959680546745902547">"ಅವರ ವೀಡಿಯೊ ಆಫ್ ಆಗಿದೆ"</string>
-    <string name="videocall_remote_video_on" msgid="6011817851703181639">"ಅವರ ವಿಡಿಯೋ ಆನ್ ಆಗಿದೆ"</string>
-    <string name="videocall_remotely_held" msgid="1295702896355732947">"ಕರೆ ಹೋಲ್ಡ್‌ ಮಾಡಿದೆ"</string>
-    <string name="videocall_remotely_resumed" msgid="3331784411244773788">"ಕರೆಯನ್ನು ಪುನರಾರಂಭಿಸಲಾಗಿದೆ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="videocall_remote_video_off">ಅವರ ವೀಡಿಯೊ ಆಫ್ ಆಗಿದೆ</string>
+  <string name="videocall_remote_video_on">ಅವರ ವಿಡಿಯೋ ಆನ್ ಆಗಿದೆ</string>
+  <string name="videocall_remotely_held">ಕರೆ ಹೋಲ್ಡ್‌ ಮಾಡಿದೆ</string>
+  <string name="videocall_remotely_resumed">ಕರೆಯನ್ನು ಪುನರಾರಂಭಿಸಲಾಗಿದೆ</string>
+  <string name="videocall_charges_alert_dialog_description">ಮೊಬೈಲ್ ನೆಟ್‌ವರ್ಕ್‌ ಮೂಲಕ ಮಾಡಲಾದ ವೀಡಿಯೊ ಕರೆಗಳು ಡೇಟಾ ಮತ್ತು ಧ್ವನಿ ನಿಮಿಷಗಳೆರಡನ್ನೂ ಬಳಸುತ್ತವೆ. ಶುಲ್ಕಗಳು ಅನ್ವಯಿಸಬಹುದು.</string>
+  <string name="do_not_show_again">ಪುನಃ ತೋರಿಸಬೇಡಿ</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-ko/strings.xml b/java/com/android/incallui/video/impl/res/values-ko/strings.xml
index 6feb991..6788126 100644
--- a/java/com/android/incallui/video/impl/res/values-ko/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-ko/strings.xml
@@ -1,24 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="videocall_remote_video_off" msgid="2959680546745902547">"상대방 동영상 꺼짐"</string>
-    <string name="videocall_remote_video_on" msgid="6011817851703181639">"동영상이 켜져 있음"</string>
-    <string name="videocall_remotely_held" msgid="1295702896355732947">"통화 대기 중"</string>
-    <string name="videocall_remotely_resumed" msgid="3331784411244773788">"통화 재개됨"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="videocall_remote_video_off">상대방 동영상 꺼짐</string>
+  <string name="videocall_remote_video_on">동영상이 켜져 있음</string>
+  <string name="videocall_remotely_held">통화 대기 중</string>
+  <string name="videocall_remotely_resumed">통화 재개됨</string>
+  <string name="videocall_charges_alert_dialog_description">모바일 네트워크를 통해 연결되는 화상 통화에는 데이터와 음성 통화 시간이 모두 사용됩니다. 요금이 부과될 수 있습니다.</string>
+  <string name="do_not_show_again">다시 표시 안 함</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-ky/strings.xml b/java/com/android/incallui/video/impl/res/values-ky/strings.xml
index c61db4a..44d71cc 100644
--- a/java/com/android/incallui/video/impl/res/values-ky/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-ky/strings.xml
@@ -1,24 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="videocall_remote_video_off" msgid="2959680546745902547">"Камерасы өчүк"</string>
-    <string name="videocall_remote_video_on" msgid="6011817851703181639">"Алардын видеосу күйгүзүлгөн"</string>
-    <string name="videocall_remotely_held" msgid="1295702896355732947">"Чалуу күтүүгө коюлду."</string>
-    <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Чалуу улантылды"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="videocall_remote_video_off">Камерасы өчүк</string>
+  <string name="videocall_remote_video_on">Алардын видеосу күйгүзүлгөн</string>
+  <string name="videocall_remotely_held">Чалуу күтүүгө коюлду.</string>
+  <string name="videocall_remotely_resumed">Чалуу улантылды</string>
+  <string name="videocall_charges_alert_dialog_description">Мобилдик тармак аркылуу видео чалуулар трафик менен сүйлөшүүгө берилген мүнөттөрдү кетирет. Акы алынышы мүмкүн.</string>
+  <string name="do_not_show_again">Экинчи көрсөтүлбөсүн</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-lo/strings.xml b/java/com/android/incallui/video/impl/res/values-lo/strings.xml
index 11505dd..afede64 100644
--- a/java/com/android/incallui/video/impl/res/values-lo/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-lo/strings.xml
@@ -1,24 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="videocall_remote_video_off" msgid="2959680546745902547">"ວິດີໂອຂອງເຂົາເຈົ້າປິດຢູ່"</string>
-    <string name="videocall_remote_video_on" msgid="6011817851703181639">"ເຂົາເຈົ້າເປີດວິດີໂອຢູ່"</string>
-    <string name="videocall_remotely_held" msgid="1295702896355732947">"ພັກສາຍຢູ່"</string>
-    <string name="videocall_remotely_resumed" msgid="3331784411244773788">"ສືບຕໍ່ສາຍແລ້ວ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="videocall_remote_video_off">ວິດີໂອຂອງເຂົາເຈົ້າປິດຢູ່</string>
+  <string name="videocall_remote_video_on">ເຂົາເຈົ້າເປີດວິດີໂອຢູ່</string>
+  <string name="videocall_remotely_held">ພັກສາຍຢູ່</string>
+  <string name="videocall_remotely_resumed">ສືບຕໍ່ສາຍແລ້ວ</string>
+  <string name="videocall_charges_alert_dialog_description">ການໂທວິດີໂອຜ່ານເຄືອຂ່າຍມືຖືຈະໃຊ້ທັງນາທີໂທສຽງ ແລະ ອິນເຕີເນັດມືຖື. ອາດມີຄ່າບໍລິການ.</string>
+  <string name="do_not_show_again">ບໍ່ຕ້ອງສະແດງອີກ</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-lt/strings.xml b/java/com/android/incallui/video/impl/res/values-lt/strings.xml
index 4ef10a4..9bc7362 100644
--- a/java/com/android/incallui/video/impl/res/values-lt/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-lt/strings.xml
@@ -1,24 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="videocall_remote_video_off" msgid="2959680546745902547">"Vaizdo kamera išjungta"</string>
-    <string name="videocall_remote_video_on" msgid="6011817851703181639">"Jų vaizdo įrašas rodomas"</string>
-    <string name="videocall_remotely_held" msgid="1295702896355732947">"Skambutis sulaikytas"</string>
-    <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Skambutis tęsiamas"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="videocall_remote_video_off">Vaizdo kamera išjungta</string>
+  <string name="videocall_remote_video_on">Jų vaizdo įrašas rodomas</string>
+  <string name="videocall_remotely_held">Skambutis sulaikytas</string>
+  <string name="videocall_remotely_resumed">Skambutis tęsiamas</string>
+  <string name="videocall_charges_alert_dialog_description">Vaizdo skambučiams mobiliojo ryšio tinklu gali būti naudojamas duomenų ir balso skambučių planas. Gali būti taikomi mokesčiai.</string>
+  <string name="do_not_show_again">Daugiau nerodyti</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-lv/strings.xml b/java/com/android/incallui/video/impl/res/values-lv/strings.xml
index 220a30c..a0d744e 100644
--- a/java/com/android/incallui/video/impl/res/values-lv/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-lv/strings.xml
@@ -1,24 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="videocall_remote_video_off" msgid="2959680546745902547">"Video ir izslēgts"</string>
-    <string name="videocall_remote_video_on" msgid="6011817851703181639">"Dalībnieku video ir ieslēgts"</string>
-    <string name="videocall_remotely_held" msgid="1295702896355732947">"Zvans aizturēts"</string>
-    <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Zvans ir atsākts"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="videocall_remote_video_off">Video ir izslēgts</string>
+  <string name="videocall_remote_video_on">Dalībnieku video ir ieslēgts</string>
+  <string name="videocall_remotely_held">Zvans aizturēts</string>
+  <string name="videocall_remotely_resumed">Zvans ir atsākts</string>
+  <string name="videocall_charges_alert_dialog_description">Mobilajā tīklā veiktie videozvani patērē gan datu apjomu, gan balss zvanu minūtes. Var tikt piemērota maksa.</string>
+  <string name="do_not_show_again">Vairs nerādīt</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-mk/strings.xml b/java/com/android/incallui/video/impl/res/values-mk/strings.xml
index 8a764a2..92c3f71 100644
--- a/java/com/android/incallui/video/impl/res/values-mk/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-mk/strings.xml
@@ -1,24 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="videocall_remote_video_off" msgid="2959680546745902547">"Видеото е исклучено"</string>
-    <string name="videocall_remote_video_on" msgid="6011817851703181639">"Нивното видео е вклучено"</string>
-    <string name="videocall_remotely_held" msgid="1295702896355732947">"Повик на чекање"</string>
-    <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Повикот продолжи"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="videocall_remote_video_off">Видеото е исклучено</string>
+  <string name="videocall_remote_video_on">Нивното видео е вклучено</string>
+  <string name="videocall_remotely_held">Повик на чекање</string>
+  <string name="videocall_remotely_resumed">Повикот продолжи</string>
+  <string name="videocall_charges_alert_dialog_description">Видеоповиците преку мобилната мрежа користат и мобилен интернет и минути за разговор. Може да ви се наплати.</string>
+  <string name="do_not_show_again">Не покажувај повторно</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-ml/strings.xml b/java/com/android/incallui/video/impl/res/values-ml/strings.xml
index a20a4ca..89a4d30 100644
--- a/java/com/android/incallui/video/impl/res/values-ml/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-ml/strings.xml
@@ -1,24 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="videocall_remote_video_off" msgid="2959680546745902547">"അവരുടെ വീഡിയോ ഓഫാണ്"</string>
-    <string name="videocall_remote_video_on" msgid="6011817851703181639">"അവരുടെ വീഡിയോ ഓണാണ്"</string>
-    <string name="videocall_remotely_held" msgid="1295702896355732947">"കോൾ ഹോൾഡിലാണ്"</string>
-    <string name="videocall_remotely_resumed" msgid="3331784411244773788">"കോൾ വീണ്ടും ആരംഭിച്ചു"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="videocall_remote_video_off">അവരുടെ വീഡിയോ ഓഫാണ്</string>
+  <string name="videocall_remote_video_on">അവരുടെ വീഡിയോ ഓണാണ്</string>
+  <string name="videocall_remotely_held">കോൾ ഹോൾഡിലാണ്</string>
+  <string name="videocall_remotely_resumed">കോൾ വീണ്ടും ആരംഭിച്ചു</string>
+  <string name="videocall_charges_alert_dialog_description">മൊബൈൽ നെറ്റ്‌വര്‍ക്കിലൂടെ ചെയ്യുന്ന വീഡിയോ കോളുകൾ, ഡാറ്റയും വോയ്‌സ് മിനിറ്റും ഉപയോഗിക്കുന്നു. നിരക്കുകൾ ബാധകമാകാം.</string>
+  <string name="do_not_show_again">വീണ്ടും കാണിക്കരുത്</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-mn/strings.xml b/java/com/android/incallui/video/impl/res/values-mn/strings.xml
index 5e2c354..e8a77ed 100644
--- a/java/com/android/incallui/video/impl/res/values-mn/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-mn/strings.xml
@@ -1,24 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="videocall_remote_video_off" msgid="2959680546745902547">"Тэдний видео идэвхгүй байна"</string>
-    <string name="videocall_remote_video_on" msgid="6011817851703181639">"Тэдний видео идэвхтэй байна"</string>
-    <string name="videocall_remotely_held" msgid="1295702896355732947">"Дуудлага хүлээлгэсэн"</string>
-    <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Дуудлагыг үргэлжлүүлсэн"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="videocall_remote_video_off">Тэдний видео идэвхгүй байна</string>
+  <string name="videocall_remote_video_on">Тэдний видео идэвхтэй байна</string>
+  <string name="videocall_remotely_held">Дуудлага хүлээлгэсэн</string>
+  <string name="videocall_remotely_resumed">Дуудлагыг үргэлжлүүлсэн</string>
+  <string name="videocall_charges_alert_dialog_description">Мобайл сүлжээгээр хийсэн видео дуудлага дата болон voice-н минутыг хоёуланг нь ашиглана. Төлбөр тооцогдож магадгүй.</string>
+  <string name="do_not_show_again">Дахин бүү үзүүл</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-mr/strings.xml b/java/com/android/incallui/video/impl/res/values-mr/strings.xml
index c8ea9bc..2f54df9 100644
--- a/java/com/android/incallui/video/impl/res/values-mr/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-mr/strings.xml
@@ -1,24 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="videocall_remote_video_off" msgid="2959680546745902547">"त्यांचा व्हिडिओ बंद केला आहे"</string>
-    <string name="videocall_remote_video_on" msgid="6011817851703181639">"त्यांचा व्हिडिओ चालू आहे"</string>
-    <string name="videocall_remotely_held" msgid="1295702896355732947">"कॉल होल्डवर आहे"</string>
-    <string name="videocall_remotely_resumed" msgid="3331784411244773788">"कॉल पुनः सुरु झाला"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="videocall_remote_video_off">त्यांचा व्हिडिओ बंद केला आहे</string>
+  <string name="videocall_remote_video_on">त्यांचा व्हिडिओ चालू आहे</string>
+  <string name="videocall_remotely_held">कॉल होल्डवर आहे</string>
+  <string name="videocall_remotely_resumed">कॉल पुनः सुरु झाला</string>
+  <string name="videocall_charges_alert_dialog_description">मोबाइल नेटवर्कवरून केलेल्या व्हिडिओ कॉलमध्ये डेटा आणि व्हॉइस मिनिटे दोन्ही वापरले जाते. शुल्क लागू शकते.</string>
+  <string name="do_not_show_again">परत दाखवू नका</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-ms/strings.xml b/java/com/android/incallui/video/impl/res/values-ms/strings.xml
index f886625..802b6aa 100644
--- a/java/com/android/incallui/video/impl/res/values-ms/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-ms/strings.xml
@@ -1,24 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="videocall_remote_video_off" msgid="2959680546745902547">"Video mrk dimatikan"</string>
-    <string name="videocall_remote_video_on" msgid="6011817851703181639">"Video mereka dihidupkan"</string>
-    <string name="videocall_remotely_held" msgid="1295702896355732947">"Panggilan ditunda"</string>
-    <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Pgln disambung smla"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="videocall_remote_video_off">Video mrk dimatikan</string>
+  <string name="videocall_remote_video_on">Video mereka dihidupkan</string>
+  <string name="videocall_remotely_held">Panggilan ditunda</string>
+  <string name="videocall_remotely_resumed">Pgln disambung smla</string>
+  <string name="videocall_charges_alert_dialog_description">Panggilan video yang dibuat melalui rangkaian mudah alih menggunakan minit data dan juga suara. Caj boleh dikenakan.</string>
+  <string name="do_not_show_again">Jangan tunjukkan lagi</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-my/strings.xml b/java/com/android/incallui/video/impl/res/values-my/strings.xml
index 93749a3..a29aa6a 100644
--- a/java/com/android/incallui/video/impl/res/values-my/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-my/strings.xml
@@ -1,24 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="videocall_remote_video_off" msgid="2959680546745902547">"သူတို့ဗီဒီယို ပိတ်ထားသည်"</string>
-    <string name="videocall_remote_video_on" msgid="6011817851703181639">"၎င်းတို့၏ဗီဒီယိုကို ဖွင့်ထားပါသည်"</string>
-    <string name="videocall_remotely_held" msgid="1295702896355732947">"ခေါ်ဆိုမှု ခဏရပ်ထားသည်"</string>
-    <string name="videocall_remotely_resumed" msgid="3331784411244773788">"ခေါ်ဆိုမှုပြန်စသည်"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="videocall_remote_video_off">သူတို့ဗီဒီယို ပိတ်ထားသည်</string>
+  <string name="videocall_remote_video_on">၎င်းတို့၏ဗီဒီယိုကို ဖွင့်ထားပါသည်</string>
+  <string name="videocall_remotely_held">ခေါ်ဆိုမှု ခဏရပ်ထားသည်</string>
+  <string name="videocall_remotely_resumed">ခေါ်ဆိုမှုပြန်စသည်</string>
+  <string name="videocall_charges_alert_dialog_description">မိုဘိုင်းကွန်ရက်မှတစ်ဆင့် ပြုလုပ်သော ဗီဒီယိုခေါ်ဆိုမှုများသည် ဒေတာနှင့် ဖုန်းပြောခွင့်မိနစ် နှစ်မျိုးစလုံးကို အသုံးပြုပါသည်။ ကုန်ကျစရိတ်များ ကျသင့်နိုင်ပါသည်။</string>
+  <string name="do_not_show_again">ထပ်မပြပါနှင့်</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-nb/strings.xml b/java/com/android/incallui/video/impl/res/values-nb/strings.xml
index 8b44300..8764de2 100644
--- a/java/com/android/incallui/video/impl/res/values-nb/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-nb/strings.xml
@@ -1,24 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="videocall_remote_video_off" msgid="2959680546745902547">"Videoen deres er slått av"</string>
-    <string name="videocall_remote_video_on" msgid="6011817851703181639">"Den andre partens video er på"</string>
-    <string name="videocall_remotely_held" msgid="1295702896355732947">"Samtalen er på vent"</string>
-    <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Samtale gjenopptatt"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="videocall_remote_video_off">Videoen deres er slått av</string>
+  <string name="videocall_remote_video_on">Den andre partens video er på</string>
+  <string name="videocall_remotely_held">Samtalen er på vent</string>
+  <string name="videocall_remotely_resumed">Samtale gjenopptatt</string>
+  <string name="videocall_charges_alert_dialog_description">Under videosamtaler via mobilnettverket brukes både mobildata og ringeminutter. Avgifter kan påløpe.</string>
+  <string name="do_not_show_again">Ikke vis dette igjen</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-ne/strings.xml b/java/com/android/incallui/video/impl/res/values-ne/strings.xml
index 66d236d..0989c08 100644
--- a/java/com/android/incallui/video/impl/res/values-ne/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-ne/strings.xml
@@ -1,24 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="videocall_remote_video_off" msgid="2959680546745902547">"उनीहरूको भिडियो बन्द छ"</string>
-    <string name="videocall_remote_video_on" msgid="6011817851703181639">"उनीहरूको भिडियो सक्रिय छ"</string>
-    <string name="videocall_remotely_held" msgid="1295702896355732947">"कल होल्डमा छ"</string>
-    <string name="videocall_remotely_resumed" msgid="3331784411244773788">"कल पुन: सुचारु गरियो"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="videocall_remote_video_off">उनीहरूको भिडियो बन्द छ</string>
+  <string name="videocall_remote_video_on">उनीहरूको भिडियो सक्रिय छ</string>
+  <string name="videocall_remotely_held">कल होल्डमा छ</string>
+  <string name="videocall_remotely_resumed">कल पुन: सुचारु गरियो</string>
+  <string name="videocall_charges_alert_dialog_description">मोबाइल नेटवर्कमार्फत भिडियो कल गर्दा डेटा तथा भ्वाइस मिनेट दुवै प्रयोग हुन्छ। शुल्क लाग्न सक्छ।</string>
+  <string name="do_not_show_again">फेरि नदेखाउनुहोस्</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-nl/strings.xml b/java/com/android/incallui/video/impl/res/values-nl/strings.xml
index b83a72b..a09c04b 100644
--- a/java/com/android/incallui/video/impl/res/values-nl/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-nl/strings.xml
@@ -1,24 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="videocall_remote_video_off" msgid="2959680546745902547">"Video staat uit"</string>
-    <string name="videocall_remote_video_on" msgid="6011817851703181639">"Zijn video is aan"</string>
-    <string name="videocall_remotely_held" msgid="1295702896355732947">"Gesprek in de wacht"</string>
-    <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Gesprek hervat"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="videocall_remote_video_off">Video staat uit</string>
+  <string name="videocall_remote_video_on">Zijn video is aan</string>
+  <string name="videocall_remotely_held">Gesprek in de wacht</string>
+  <string name="videocall_remotely_resumed">Gesprek hervat</string>
+  <string name="videocall_charges_alert_dialog_description">Videogesprekken via het mobiele netwerk verbruiken zowel data als belminuten. Er kunnen kosten in rekening worden gebracht.</string>
+  <string name="do_not_show_again">Niet opnieuw weergeven</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-no/strings.xml b/java/com/android/incallui/video/impl/res/values-no/strings.xml
index 8b44300..8764de2 100644
--- a/java/com/android/incallui/video/impl/res/values-no/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-no/strings.xml
@@ -1,24 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="videocall_remote_video_off" msgid="2959680546745902547">"Videoen deres er slått av"</string>
-    <string name="videocall_remote_video_on" msgid="6011817851703181639">"Den andre partens video er på"</string>
-    <string name="videocall_remotely_held" msgid="1295702896355732947">"Samtalen er på vent"</string>
-    <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Samtale gjenopptatt"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="videocall_remote_video_off">Videoen deres er slått av</string>
+  <string name="videocall_remote_video_on">Den andre partens video er på</string>
+  <string name="videocall_remotely_held">Samtalen er på vent</string>
+  <string name="videocall_remotely_resumed">Samtale gjenopptatt</string>
+  <string name="videocall_charges_alert_dialog_description">Under videosamtaler via mobilnettverket brukes både mobildata og ringeminutter. Avgifter kan påløpe.</string>
+  <string name="do_not_show_again">Ikke vis dette igjen</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-pa/strings.xml b/java/com/android/incallui/video/impl/res/values-pa/strings.xml
index e23efe1..0ee855e 100644
--- a/java/com/android/incallui/video/impl/res/values-pa/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-pa/strings.xml
@@ -1,24 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="videocall_remote_video_off" msgid="2959680546745902547">"ਉਹਨਾਂ ਦਾ ਵੀਡੀਓ ਬੰਦ ਹੈ"</string>
-    <string name="videocall_remote_video_on" msgid="6011817851703181639">"ਉਹਨਾਂ ਦਾ ਵੀਡੀਓ ਚਾਲੂ ਹੈ"</string>
-    <string name="videocall_remotely_held" msgid="1295702896355732947">"ਕਾਲ ਰੋਕ ਕੇ ਰੱਖੀ ਗਈ"</string>
-    <string name="videocall_remotely_resumed" msgid="3331784411244773788">"ਕਾਲ ਮੁੜ-ਸ਼ੁਰੂ ਕੀਤੀ ਗਈ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="videocall_remote_video_off">ਉਹਨਾਂ ਦਾ ਵੀਡੀਓ ਬੰਦ ਹੈ</string>
+  <string name="videocall_remote_video_on">ਉਹਨਾਂ ਦਾ ਵੀਡੀਓ ਚਾਲੂ ਹੈ</string>
+  <string name="videocall_remotely_held">ਕਾਲ ਰੋਕ ਕੇ ਰੱਖੀ ਗਈ</string>
+  <string name="videocall_remotely_resumed">ਕਾਲ ਮੁੜ-ਸ਼ੁਰੂ ਕੀਤੀ ਗਈ</string>
+  <string name="videocall_charges_alert_dialog_description">ਮੋਬਾਈਲ ਨੈੱਟਵਰਕ ਰਾਹੀਂ ਕੀਤੀਆਂ ਜਾਂਦੀਆਂ ਵੀਡੀਓ ਕਾਲਾਂ ਡਾਟਾ ਅਤੇ ਅਵਾਜ਼ੀ ਮਿੰਟਾਂ ਦੋਵਾਂ ਦੀ ਵਰਤੋਂ ਕਰਦੀਆਂ ਹਨ। ਖਰਚੇ ਲਏ ਜਾ ਸਕਦੇ ਹਨ।</string>
+  <string name="do_not_show_again">ਦੁਬਾਰਾ ਨਾ ਦਿਖਾਓ</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-pl/strings.xml b/java/com/android/incallui/video/impl/res/values-pl/strings.xml
index c84ea69..5bd6d93 100644
--- a/java/com/android/incallui/video/impl/res/values-pl/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-pl/strings.xml
@@ -1,24 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="videocall_remote_video_off" msgid="2959680546745902547">"Wideo tej osoby wył."</string>
-    <string name="videocall_remote_video_on" msgid="6011817851703181639">"Obraz wideo tej osoby jest włączony"</string>
-    <string name="videocall_remotely_held" msgid="1295702896355732947">"Rozmowa wstrzymana"</string>
-    <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Połączenie wznowione"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="videocall_remote_video_off">Wideo tej osoby wył.</string>
+  <string name="videocall_remote_video_on">Obraz wideo tej osoby jest włączony</string>
+  <string name="videocall_remotely_held">Rozmowa wstrzymana</string>
+  <string name="videocall_remotely_resumed">Połączenie wznowione</string>
+  <string name="videocall_charges_alert_dialog_description">Rozmowy wideo prowadzone przez sieć komórkową korzystają zarówno z transmisji danych, jak i limitu rozmów. Mogą być naliczane opłaty.</string>
+  <string name="do_not_show_again">Nie pokazuj ponownie</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-pt-rBR/strings.xml b/java/com/android/incallui/video/impl/res/values-pt-rBR/strings.xml
index f5c8cea..ad9b1cb 100644
--- a/java/com/android/incallui/video/impl/res/values-pt-rBR/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-pt-rBR/strings.xml
@@ -1,24 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="videocall_remote_video_off" msgid="2959680546745902547">"Vídeo remoto desativ"</string>
-    <string name="videocall_remote_video_on" msgid="6011817851703181639">"O vídeo deste contato está ativado"</string>
-    <string name="videocall_remotely_held" msgid="1295702896355732947">"Chamada em espera"</string>
-    <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Chamada retomada"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="videocall_remote_video_off">Vídeo remoto desativ</string>
+  <string name="videocall_remote_video_on">O vídeo deste contato está ativado</string>
+  <string name="videocall_remotely_held">Chamada em espera</string>
+  <string name="videocall_remotely_resumed">Chamada retomada</string>
+  <string name="videocall_charges_alert_dialog_description">As videochamadas feitas por rede móvel usam tanto os minutos do plano de dados quanto do plano de voz e estão sujeitas a cobranças.</string>
+  <string name="do_not_show_again">Não mostrar novamente</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-pt-rPT/strings.xml b/java/com/android/incallui/video/impl/res/values-pt-rPT/strings.xml
index 1c5fc57..82eda63 100644
--- a/java/com/android/incallui/video/impl/res/values-pt-rPT/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-pt-rPT/strings.xml
@@ -1,24 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="videocall_remote_video_off" msgid="2959680546745902547">"Vídeo desativado"</string>
-    <string name="videocall_remote_video_on" msgid="6011817851703181639">"O vídeo está ligado"</string>
-    <string name="videocall_remotely_held" msgid="1295702896355732947">"Chamada em espera"</string>
-    <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Chamada retomada"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="videocall_remote_video_off">Vídeo desativado</string>
+  <string name="videocall_remote_video_on">O vídeo está ligado</string>
+  <string name="videocall_remotely_held">Chamada em espera</string>
+  <string name="videocall_remotely_resumed">Chamada retomada</string>
+  <string name="videocall_charges_alert_dialog_description">As chamadas de vídeo efetuadas através da rede móvel usam dados e minutos de chamadas. Poderão ser aplicados custos.</string>
+  <string name="do_not_show_again">Não mostrar novamente</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-pt/strings.xml b/java/com/android/incallui/video/impl/res/values-pt/strings.xml
index f5c8cea..ad9b1cb 100644
--- a/java/com/android/incallui/video/impl/res/values-pt/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-pt/strings.xml
@@ -1,24 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="videocall_remote_video_off" msgid="2959680546745902547">"Vídeo remoto desativ"</string>
-    <string name="videocall_remote_video_on" msgid="6011817851703181639">"O vídeo deste contato está ativado"</string>
-    <string name="videocall_remotely_held" msgid="1295702896355732947">"Chamada em espera"</string>
-    <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Chamada retomada"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="videocall_remote_video_off">Vídeo remoto desativ</string>
+  <string name="videocall_remote_video_on">O vídeo deste contato está ativado</string>
+  <string name="videocall_remotely_held">Chamada em espera</string>
+  <string name="videocall_remotely_resumed">Chamada retomada</string>
+  <string name="videocall_charges_alert_dialog_description">As videochamadas feitas por rede móvel usam tanto os minutos do plano de dados quanto do plano de voz e estão sujeitas a cobranças.</string>
+  <string name="do_not_show_again">Não mostrar novamente</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-ro/strings.xml b/java/com/android/incallui/video/impl/res/values-ro/strings.xml
index 6cd5193..927871b 100644
--- a/java/com/android/incallui/video/impl/res/values-ro/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-ro/strings.xml
@@ -1,24 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="videocall_remote_video_off" msgid="2959680546745902547">"Imagine dezactivată"</string>
-    <string name="videocall_remote_video_on" msgid="6011817851703181639">"Imaginea sa video este activată."</string>
-    <string name="videocall_remotely_held" msgid="1295702896355732947">"Apel în așteptare"</string>
-    <string name="videocall_remotely_resumed" msgid="3331784411244773788">"S-a reluat apelul."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="videocall_remote_video_off">Imagine dezactivată</string>
+  <string name="videocall_remote_video_on">Imaginea sa video este activată.</string>
+  <string name="videocall_remotely_held">Apel în așteptare</string>
+  <string name="videocall_remotely_resumed">S-a reluat apelul.</string>
+  <string name="videocall_charges_alert_dialog_description">Apelurile video inițiate prin rețeaua mobilă folosesc și date mobile, și minute din abonamentul de voce. Se pot aplica tarife.</string>
+  <string name="do_not_show_again">Nu mai afișa</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-ru/strings.xml b/java/com/android/incallui/video/impl/res/values-ru/strings.xml
index 3e62d0e..34e6a30 100644
--- a/java/com/android/incallui/video/impl/res/values-ru/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-ru/strings.xml
@@ -1,24 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="videocall_remote_video_off" msgid="2959680546745902547">"Камера собеседника выключена"</string>
-    <string name="videocall_remote_video_on" msgid="6011817851703181639">"Видео собеседника включено"</string>
-    <string name="videocall_remotely_held" msgid="1295702896355732947">"Вызов на удержании"</string>
-    <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Вызов возобновлен"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="videocall_remote_video_off">Камера собеседника выключена</string>
+  <string name="videocall_remote_video_on">Видео собеседника включено</string>
+  <string name="videocall_remotely_held">Вызов на удержании</string>
+  <string name="videocall_remotely_resumed">Вызов возобновлен</string>
+  <string name="videocall_charges_alert_dialog_description">При видеовызовах по мобильной сети расходуются как минуты вашего тарифного плана, так и мобильный трафик. Может взиматься плата.</string>
+  <string name="do_not_show_again">Больше не показывать</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-si/strings.xml b/java/com/android/incallui/video/impl/res/values-si/strings.xml
index 52e5573..23959e8 100644
--- a/java/com/android/incallui/video/impl/res/values-si/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-si/strings.xml
@@ -1,24 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="videocall_remote_video_off" msgid="2959680546745902547">"වීඩියෝ අක්‍රිය කර ඇ."</string>
-    <string name="videocall_remote_video_on" msgid="6011817851703181639">"ඔවුන්ගේ වීඩියෝව ක්‍රියාත්මකයි"</string>
-    <string name="videocall_remotely_held" msgid="1295702896355732947">"ඇමතුම රඳවාගෙන ඇත"</string>
-    <string name="videocall_remotely_resumed" msgid="3331784411244773788">"ඇමතුම නැවත ආරම්භ විය"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="videocall_remote_video_off">වීඩියෝ අක්‍රිය කර ඇ.</string>
+  <string name="videocall_remote_video_on">ඔවුන්ගේ වීඩියෝව ක්‍රියාත්මකයි</string>
+  <string name="videocall_remotely_held">ඇමතුම රඳවාගෙන ඇත</string>
+  <string name="videocall_remotely_resumed">ඇමතුම නැවත ආරම්භ විය</string>
+  <string name="videocall_charges_alert_dialog_description">ජංගම ජාලය හරහා සිදු කරන වීඩියෝ ඇමතුම් දත්ත සහ හඬ මිනිත්තු යන දෙකම භාවිත කරයි. ගාස්තු අදාළ විය හැකිය.</string>
+  <string name="do_not_show_again">නැවත පෙන්වන්න එපා</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-sk/strings.xml b/java/com/android/incallui/video/impl/res/values-sk/strings.xml
index c9920b3..1e1e6d7 100644
--- a/java/com/android/incallui/video/impl/res/values-sk/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-sk/strings.xml
@@ -1,24 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="videocall_remote_video_off" msgid="2959680546745902547">"Má vypnuté video"</string>
-    <string name="videocall_remote_video_on" msgid="6011817851703181639">"Video tohto používateľa je zapnuté"</string>
-    <string name="videocall_remotely_held" msgid="1295702896355732947">"Hovor je podržaný"</string>
-    <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Hovor bol obnovený"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="videocall_remote_video_off">Má vypnuté video</string>
+  <string name="videocall_remote_video_on">Video tohto používateľa je zapnuté</string>
+  <string name="videocall_remotely_held">Hovor je podržaný</string>
+  <string name="videocall_remotely_resumed">Hovor bol obnovený</string>
+  <string name="videocall_charges_alert_dialog_description">Videohovory uskutočnené prostredníctvom mobilnej siete využívajú dáta aj minúty na hlasové volania. Môžu sa účtovať poplatky.</string>
+  <string name="do_not_show_again">Nabudúce nezobrazovať</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-sl/strings.xml b/java/com/android/incallui/video/impl/res/values-sl/strings.xml
index 8c6baed..0e9da45 100644
--- a/java/com/android/incallui/video/impl/res/values-sl/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-sl/strings.xml
@@ -1,24 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="videocall_remote_video_off" msgid="2959680546745902547">"Video je izklopljen"</string>
-    <string name="videocall_remote_video_on" msgid="6011817851703181639">"Video te osebe je vklopljen"</string>
-    <string name="videocall_remotely_held" msgid="1295702896355732947">"Klic je zadržan"</string>
-    <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Klic se nadaljuje"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="videocall_remote_video_off">Video je izklopljen</string>
+  <string name="videocall_remote_video_on">Video te osebe je vklopljen</string>
+  <string name="videocall_remotely_held">Klic je zadržan</string>
+  <string name="videocall_remotely_resumed">Klic se nadaljuje</string>
+  <string name="videocall_charges_alert_dialog_description">Za videoklice prek mobilnega omrežja se uporabljajo podatki za prenos in zakupljene minute za glasovne klice. Storitev je morda zaračunana.</string>
+  <string name="do_not_show_again">Ne prikaži več</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-sq/strings.xml b/java/com/android/incallui/video/impl/res/values-sq/strings.xml
index 77a7648..49e54a1 100644
--- a/java/com/android/incallui/video/impl/res/values-sq/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-sq/strings.xml
@@ -1,24 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="videocall_remote_video_off" msgid="2959680546745902547">"Video e tyre joaktive"</string>
-    <string name="videocall_remote_video_on" msgid="6011817851703181639">"Videoja e tyre është aktive"</string>
-    <string name="videocall_remotely_held" msgid="1295702896355732947">"Telefonatë në pritje"</string>
-    <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Telefonata vazhdoi"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="videocall_remote_video_off">Video e tyre joaktive</string>
+  <string name="videocall_remote_video_on">Videoja e tyre është aktive</string>
+  <string name="videocall_remotely_held">Telefonatë në pritje</string>
+  <string name="videocall_remotely_resumed">Telefonata vazhdoi</string>
+  <string name="videocall_charges_alert_dialog_description">Telefonatat me video të kryera nëpërmjet rrjetit celular përdorin të dhënat si dhe minutat e telefonatave. Mund të zbatohen tarifa.</string>
+  <string name="do_not_show_again">Mos e shfaq përsëri</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-sr/strings.xml b/java/com/android/incallui/video/impl/res/values-sr/strings.xml
index ce7070d..285ce6e 100644
--- a/java/com/android/incallui/video/impl/res/values-sr/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-sr/strings.xml
@@ -1,24 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="videocall_remote_video_off" msgid="2959680546745902547">"Видео је искључен"</string>
-    <string name="videocall_remote_video_on" msgid="6011817851703181639">"Камера ове особе је укључена"</string>
-    <string name="videocall_remotely_held" msgid="1295702896355732947">"Позив је на чекању"</string>
-    <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Позив је настављен"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="videocall_remote_video_off">Видео је искључен</string>
+  <string name="videocall_remote_video_on">Камера ове особе је укључена</string>
+  <string name="videocall_remotely_held">Позив је на чекању</string>
+  <string name="videocall_remotely_resumed">Позив је настављен</string>
+  <string name="videocall_charges_alert_dialog_description">Видео позиви упућени преко мобилне мреже користе податке и минуте за аудио позиве. Наплаћују се накнаде.</string>
+  <string name="do_not_show_again">Не приказуј поново</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-sv/strings.xml b/java/com/android/incallui/video/impl/res/values-sv/strings.xml
index 29221de..9c897f9 100644
--- a/java/com/android/incallui/video/impl/res/values-sv/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-sv/strings.xml
@@ -1,24 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="videocall_remote_video_off" msgid="2959680546745902547">"Deras video avstängd"</string>
-    <string name="videocall_remote_video_on" msgid="6011817851703181639">"Andra partens video är på"</string>
-    <string name="videocall_remotely_held" msgid="1295702896355732947">"Parkerat samtal"</string>
-    <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Samtal återupptaget"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="videocall_remote_video_off">Deras video avstängd</string>
+  <string name="videocall_remote_video_on">Andra partens video är på</string>
+  <string name="videocall_remotely_held">Parkerat samtal</string>
+  <string name="videocall_remotely_resumed">Samtal återupptaget</string>
+  <string name="videocall_charges_alert_dialog_description">Videosamtal via mobilnätverket förbrukar både data och röstminuter. Avgifter kan tillkomma.</string>
+  <string name="do_not_show_again">Visa inte igen</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-sw/strings.xml b/java/com/android/incallui/video/impl/res/values-sw/strings.xml
index 74475b3..587ccc3 100644
--- a/java/com/android/incallui/video/impl/res/values-sw/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-sw/strings.xml
@@ -1,24 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="videocall_remote_video_off" msgid="2959680546745902547">"Amezima video"</string>
-    <string name="videocall_remote_video_on" msgid="6011817851703181639">"Video take imewashwa"</string>
-    <string name="videocall_remotely_held" msgid="1295702896355732947">"Simu imesitishwa"</string>
-    <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Simu sasa inaendelea"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="videocall_remote_video_off">Amezima video</string>
+  <string name="videocall_remote_video_on">Video take imewashwa</string>
+  <string name="videocall_remotely_held">Simu imesitishwa</string>
+  <string name="videocall_remotely_resumed">Simu sasa inaendelea</string>
+  <string name="videocall_charges_alert_dialog_description">Simu za video zinazopigwa kupitia mtandao wa simu hutumia data pamoja na vifurushi vya sauti. Huenda ukatozwa ada.</string>
+  <string name="do_not_show_again">Usionyeshe tena</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-ta/strings.xml b/java/com/android/incallui/video/impl/res/values-ta/strings.xml
index baaced6..d11b033 100644
--- a/java/com/android/incallui/video/impl/res/values-ta/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-ta/strings.xml
@@ -1,24 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="videocall_remote_video_off" msgid="2959680546745902547">"பிறரின் வீடியோ ஆஃப்"</string>
-    <string name="videocall_remote_video_on" msgid="6011817851703181639">"அவரின் வீடியோ இயக்கப்பட்டுள்ளது"</string>
-    <string name="videocall_remotely_held" msgid="1295702896355732947">"அழைப்பு ஹோல்டில்"</string>
-    <string name="videocall_remotely_resumed" msgid="3331784411244773788">"மீண்டும் தொடங்கப்பட்டது"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="videocall_remote_video_off">பிறரின் வீடியோ ஆஃப்</string>
+  <string name="videocall_remote_video_on">அவரின் வீடியோ இயக்கப்பட்டுள்ளது</string>
+  <string name="videocall_remotely_held">அழைப்பு ஹோல்டில்</string>
+  <string name="videocall_remotely_resumed">மீண்டும் தொடங்கப்பட்டது</string>
+  <string name="videocall_charges_alert_dialog_description">மொபைல் நெட்வொர்க்கைப் பயன்படுத்தி செய்யப்படும் வீடியோ அழைப்புகள், டேட்டா மற்றும் குரல் நிமிடங்கள் இரண்டையும் பயன்படுத்தும். கட்டணம் விதிக்கப்படலாம்.</string>
+  <string name="do_not_show_again">மீண்டும் காட்டாதே</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-te/strings.xml b/java/com/android/incallui/video/impl/res/values-te/strings.xml
index 8724be4..d721f52 100644
--- a/java/com/android/incallui/video/impl/res/values-te/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-te/strings.xml
@@ -1,24 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="videocall_remote_video_off" msgid="2959680546745902547">"వారి వీడియో ఆఫ్‌లో ఉంది"</string>
-    <string name="videocall_remote_video_on" msgid="6011817851703181639">"వారి వీడియో ఆన్‌లో ఉంది"</string>
-    <string name="videocall_remotely_held" msgid="1295702896355732947">"కాల్ హోల్డ్‌లో ఉంది"</string>
-    <string name="videocall_remotely_resumed" msgid="3331784411244773788">"కాల్ పునఃప్రారంభించబడింది"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="videocall_remote_video_off">వారి వీడియో ఆఫ్‌లో ఉంది</string>
+  <string name="videocall_remote_video_on">వారి వీడియో ఆన్‌లో ఉంది</string>
+  <string name="videocall_remotely_held">కాల్ హోల్డ్‌లో ఉంది</string>
+  <string name="videocall_remotely_resumed">కాల్ పునఃప్రారంభించబడింది</string>
+  <string name="videocall_charges_alert_dialog_description">మొబైల్ నెట్‌వర్క్‌లో చేసే వీడియో కాల్‌లకు డేటా మరియు వాయిస్ మినిట్స్ రెండూ ఉపయోగించబడతాయి. ఛార్జీలు వర్తించవచ్చు.</string>
+  <string name="do_not_show_again">మళ్లీ చూపవద్దు</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-th/strings.xml b/java/com/android/incallui/video/impl/res/values-th/strings.xml
index f3a2cb5..bf80701 100644
--- a/java/com/android/incallui/video/impl/res/values-th/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-th/strings.xml
@@ -1,24 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="videocall_remote_video_off" msgid="2959680546745902547">"วิดีโอปิดอยู่"</string>
-    <string name="videocall_remote_video_on" msgid="6011817851703181639">"วิดีโอของผู้ใช้เปิดอยู่"</string>
-    <string name="videocall_remotely_held" msgid="1295702896355732947">"มีการพักสาย"</string>
-    <string name="videocall_remotely_resumed" msgid="3331784411244773788">"โทรต่อ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="videocall_remote_video_off">วิดีโอปิดอยู่</string>
+  <string name="videocall_remote_video_on">วิดีโอของผู้ใช้เปิดอยู่</string>
+  <string name="videocall_remotely_held">มีการพักสาย</string>
+  <string name="videocall_remotely_resumed">โทรต่อ</string>
+  <string name="videocall_charges_alert_dialog_description">วิดีโอคอลที่โทรผ่านเครือข่ายมือถือจะใช้ทั้งเน็ตมือถือและเวลาโทรจากเครือข่ายซึ่งอาจมีค่าบริการ</string>
+  <string name="do_not_show_again">ไม่ต้องแสดงอีก</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-tl/strings.xml b/java/com/android/incallui/video/impl/res/values-tl/strings.xml
index ca91097..6fcd2da 100644
--- a/java/com/android/incallui/video/impl/res/values-tl/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-tl/strings.xml
@@ -1,24 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="videocall_remote_video_off" msgid="2959680546745902547">"Off ang video nila"</string>
-    <string name="videocall_remote_video_on" msgid="6011817851703181639">"Naka-on ang video nila"</string>
-    <string name="videocall_remotely_held" msgid="1295702896355732947">"Naka-hold ang tawag"</string>
-    <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Itinuloy ang tawag"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="videocall_remote_video_off">Off ang video nila</string>
+  <string name="videocall_remote_video_on">Naka-on ang video nila</string>
+  <string name="videocall_remotely_held">Naka-hold ang tawag</string>
+  <string name="videocall_remotely_resumed">Itinuloy ang tawag</string>
+  <string name="videocall_charges_alert_dialog_description">Ang mga video call na ginawa sa pamamagitan ng mobile network ay gumagamit pareho ng data at mga voice minute. Maaaring may mga singil.</string>
+  <string name="do_not_show_again">Huwag ipakitang muli</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-tr/strings.xml b/java/com/android/incallui/video/impl/res/values-tr/strings.xml
index 1cd4a67..696316b 100644
--- a/java/com/android/incallui/video/impl/res/values-tr/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-tr/strings.xml
@@ -1,24 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="videocall_remote_video_off" msgid="2959680546745902547">"Videosu kapalı"</string>
-    <string name="videocall_remote_video_on" msgid="6011817851703181639">"Video açık"</string>
-    <string name="videocall_remotely_held" msgid="1295702896355732947">"Çağrı beklemede"</string>
-    <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Çağrı sürdürüldü"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="videocall_remote_video_off">Videosu kapalı</string>
+  <string name="videocall_remote_video_on">Video açık</string>
+  <string name="videocall_remotely_held">Çağrı beklemede</string>
+  <string name="videocall_remotely_resumed">Çağrı sürdürüldü</string>
+  <string name="videocall_charges_alert_dialog_description">Mobil ağ üzerinden yapılan görüntülü görüşmeler için hem veri hem de konuşma dakikaları kullanılır. Ücret alınabilir.</string>
+  <string name="do_not_show_again">Bir daha gösterme</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-uk/strings.xml b/java/com/android/incallui/video/impl/res/values-uk/strings.xml
index c450c62..999a751 100644
--- a/java/com/android/incallui/video/impl/res/values-uk/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-uk/strings.xml
@@ -1,24 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="videocall_remote_video_off" msgid="2959680546745902547">"Відео абон. вимкнено"</string>
-    <string name="videocall_remote_video_on" msgid="6011817851703181639">"Відео співрозмовника ввімкнено"</string>
-    <string name="videocall_remotely_held" msgid="1295702896355732947">"Виклик утримується"</string>
-    <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Дзвінок відновлено"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="videocall_remote_video_off">Відео абон. вимкнено</string>
+  <string name="videocall_remote_video_on">Відео співрозмовника ввімкнено</string>
+  <string name="videocall_remotely_held">Виклик утримується</string>
+  <string name="videocall_remotely_resumed">Дзвінок відновлено</string>
+  <string name="videocall_charges_alert_dialog_description">Для відеовикликів, здійснених через мобільну мережу, використовуються хвилини, надані мобільним оператором, і мобільний трафік. Може стягуватися плата.</string>
+  <string name="do_not_show_again">Більше не показувати</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-ur/strings.xml b/java/com/android/incallui/video/impl/res/values-ur/strings.xml
index 798681d..b1ab830 100644
--- a/java/com/android/incallui/video/impl/res/values-ur/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-ur/strings.xml
@@ -1,24 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="videocall_remote_video_off" msgid="2959680546745902547">"ان کی ویڈیو آف ہے"</string>
-    <string name="videocall_remote_video_on" msgid="6011817851703181639">"ان کی ویڈیو آن ہے"</string>
-    <string name="videocall_remotely_held" msgid="1295702896355732947">"کال ہولڈ پر ہے"</string>
-    <string name="videocall_remotely_resumed" msgid="3331784411244773788">"کال دوبارہ شروع ہو گئی"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="videocall_remote_video_off">ان کی ویڈیو آف ہے</string>
+  <string name="videocall_remote_video_on">ان کی ویڈیو آن ہے</string>
+  <string name="videocall_remotely_held">کال ہولڈ پر ہے</string>
+  <string name="videocall_remotely_resumed">کال دوبارہ شروع ہو گئی</string>
+  <string name="videocall_charges_alert_dialog_description">موبائل نیٹ ورک پر کی گئی ویڈیو کالز ڈیٹا اور صوتی منٹ دونوں کا استعمال کرتی ہیں۔ چارجز لاگو ہوسکتے ہیں۔</string>
+  <string name="do_not_show_again">دوبارہ نہ دکھائیں</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-uz/strings.xml b/java/com/android/incallui/video/impl/res/values-uz/strings.xml
index cf92b1e..a8c5b3e 100644
--- a/java/com/android/incallui/video/impl/res/values-uz/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-uz/strings.xml
@@ -1,24 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="videocall_remote_video_off" msgid="2959680546745902547">"Suhbatdosh video kamerasi o‘chiq"</string>
-    <string name="videocall_remote_video_on" msgid="6011817851703181639">"Suhbatdosh kamerasi yoniq"</string>
-    <string name="videocall_remotely_held" msgid="1295702896355732947">"Kutish holatida"</string>
-    <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Qo‘ng‘iroq tiklandi"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="videocall_remote_video_off">Suhbatdosh video kamerasi o‘chiq</string>
+  <string name="videocall_remote_video_on">Suhbatdosh kamerasi yoniq</string>
+  <string name="videocall_remotely_held">Kutish holatida</string>
+  <string name="videocall_remotely_resumed">Qo‘ng‘iroq tiklandi</string>
+  <string name="videocall_charges_alert_dialog_description">Mobil tarmoq orqali amalga oshirilgan video chaqiruvlar uchun ham mobil aloqa daqiqalari va ham internet trafigi sarflanadi. Chaqiruv uchun haq olinishi mumkin.</string>
+  <string name="do_not_show_again">Boshqa ko‘rsatilmasin</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-vi/strings.xml b/java/com/android/incallui/video/impl/res/values-vi/strings.xml
index 442ec7e..2b23321 100644
--- a/java/com/android/incallui/video/impl/res/values-vi/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-vi/strings.xml
@@ -1,24 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="videocall_remote_video_off" msgid="2959680546745902547">"Video của họ đã tắt"</string>
-    <string name="videocall_remote_video_on" msgid="6011817851703181639">"Video của họ đang bật"</string>
-    <string name="videocall_remotely_held" msgid="1295702896355732947">"Cuộc gọi đang chờ"</string>
-    <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Đã tiếp tục cuộc gọi"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="videocall_remote_video_off">Video của họ đã tắt</string>
+  <string name="videocall_remote_video_on">Video của họ đang bật</string>
+  <string name="videocall_remotely_held">Cuộc gọi đang chờ</string>
+  <string name="videocall_remotely_resumed">Đã tiếp tục cuộc gọi</string>
+  <string name="videocall_charges_alert_dialog_description">Cuộc gọi video thực hiện qua mạng di động sử dụng cả dữ liệu và số phút thoại. Bạn có thể phải trả phí.</string>
+  <string name="do_not_show_again">Không hiển thị lại</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-w460dp/dimens.xml b/java/com/android/incallui/video/impl/res/values-w460dp/dimens.xml
index e9e7f9e..d4a5e17 100644
--- a/java/com/android/incallui/video/impl/res/values-w460dp/dimens.xml
+++ b/java/com/android/incallui/video/impl/res/values-w460dp/dimens.xml
@@ -17,6 +17,7 @@
 <resources>
   <dimen name="videocall_button_spacing">16dp</dimen>
   <dimen name="videocall_button_size">72dp</dimen>
+  <dimen name="videocall_button_padding">18dp</dimen>
   <dimen name="videocall_preview_width">88dp</dimen>
   <dimen name="videocall_preview_height">88dp</dimen>
   <dimen name="videocall_preview_long">116dp</dimen>
diff --git a/java/com/android/incallui/video/impl/res/values-zh-rCN/strings.xml b/java/com/android/incallui/video/impl/res/values-zh-rCN/strings.xml
index 6c0d350..be558cd 100644
--- a/java/com/android/incallui/video/impl/res/values-zh-rCN/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-zh-rCN/strings.xml
@@ -1,24 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="videocall_remote_video_off" msgid="2959680546745902547">"对方的视频画面已关闭"</string>
-    <string name="videocall_remote_video_on" msgid="6011817851703181639">"对方已开启视频功能"</string>
-    <string name="videocall_remotely_held" msgid="1295702896355732947">"保持的通话"</string>
-    <string name="videocall_remotely_resumed" msgid="3331784411244773788">"通话已恢复"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="videocall_remote_video_off">对方的视频画面已关闭</string>
+  <string name="videocall_remote_video_on">对方已开启视频功能</string>
+  <string name="videocall_remotely_held">保持的通话</string>
+  <string name="videocall_remotely_resumed">通话已恢复</string>
+  <string name="videocall_charges_alert_dialog_description">通过移动网络发起的视频通话会消耗数据流量和语音通话分钟数。您可能需要支付相关费用。</string>
+  <string name="do_not_show_again">不再显示</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-zh-rHK/strings.xml b/java/com/android/incallui/video/impl/res/values-zh-rHK/strings.xml
index 2ac6a47..f8bf2cc 100644
--- a/java/com/android/incallui/video/impl/res/values-zh-rHK/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-zh-rHK/strings.xml
@@ -1,24 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="videocall_remote_video_off" msgid="2959680546745902547">"他們已關閉視像功能"</string>
-    <string name="videocall_remote_video_on" msgid="6011817851703181639">"另一方已開啟視像功能"</string>
-    <string name="videocall_remotely_held" msgid="1295702896355732947">"通話目前保留"</string>
-    <string name="videocall_remotely_resumed" msgid="3331784411244773788">"通話繼續"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="videocall_remote_video_off">他們已關閉視像功能</string>
+  <string name="videocall_remote_video_on">另一方已開啟視像功能</string>
+  <string name="videocall_remotely_held">通話目前保留</string>
+  <string name="videocall_remotely_resumed">通話繼續</string>
+  <string name="videocall_charges_alert_dialog_description">透過流動網絡進行的視像通話會同時耗用數據和語音分鐘數。您可能需要支付相關費用。</string>
+  <string name="do_not_show_again">不要再顯示</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-zh-rTW/strings.xml b/java/com/android/incallui/video/impl/res/values-zh-rTW/strings.xml
index 115822a..6a4580b 100644
--- a/java/com/android/incallui/video/impl/res/values-zh-rTW/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-zh-rTW/strings.xml
@@ -1,24 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="videocall_remote_video_off" msgid="2959680546745902547">"對方的視訊畫面已關閉"</string>
-    <string name="videocall_remote_video_on" msgid="6011817851703181639">"對方已開啟視訊畫面"</string>
-    <string name="videocall_remotely_held" msgid="1295702896355732947">"通話保留中"</string>
-    <string name="videocall_remotely_resumed" msgid="3331784411244773788">"已恢復通話"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="videocall_remote_video_off">對方的視訊畫面已關閉</string>
+  <string name="videocall_remote_video_on">對方已開啟視訊畫面</string>
+  <string name="videocall_remotely_held">通話保留中</string>
+  <string name="videocall_remotely_resumed">已恢復通話</string>
+  <string name="videocall_charges_alert_dialog_description">透過行動網路發起的視訊通話會耗用行動數據和語音通話分鐘數 (可能需支付相關費用)。</string>
+  <string name="do_not_show_again">不要再顯示</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values-zu/strings.xml b/java/com/android/incallui/video/impl/res/values-zu/strings.xml
index 0752e52..5aea86a 100644
--- a/java/com/android/incallui/video/impl/res/values-zu/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values-zu/strings.xml
@@ -1,24 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="videocall_remote_video_off" msgid="2959680546745902547">"Ividiyo yabo ivaliwe"</string>
-    <string name="videocall_remote_video_on" msgid="6011817851703181639">"Ividiyo yabo ivuliwe"</string>
-    <string name="videocall_remotely_held" msgid="1295702896355732947">"Ikholi imisiwe"</string>
-    <string name="videocall_remotely_resumed" msgid="3331784411244773788">"Ikholi iqaliswe kabusha"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="videocall_remote_video_off">Ividiyo yabo ivaliwe</string>
+  <string name="videocall_remote_video_on">Ividiyo yabo ivuliwe</string>
+  <string name="videocall_remotely_held">Ikholi imisiwe</string>
+  <string name="videocall_remotely_resumed">Ikholi iqaliswe kabusha</string>
+  <string name="videocall_charges_alert_dialog_description">Amakholi evidiyo enziwe ngenethiwekhi yeselula asebenzisa kokubili idatha namaminithi ezwi. Kungasebenza izindleko.</string>
+  <string name="do_not_show_again">Ungabonisi futhi</string>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values/colors.xml b/java/com/android/incallui/video/impl/res/values/colors.xml
deleted file mode 100644
index 874bf94..0000000
--- a/java/com/android/incallui/video/impl/res/values/colors.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-  -->
-
-<resources>
-  <color name="videocall_camera_off_tint">#89ffffff</color>
-</resources>
diff --git a/java/com/android/incallui/video/impl/res/values/dimens.xml b/java/com/android/incallui/video/impl/res/values/dimens.xml
index 606b158..b6449a6 100644
--- a/java/com/android/incallui/video/impl/res/values/dimens.xml
+++ b/java/com/android/incallui/video/impl/res/values/dimens.xml
@@ -23,4 +23,5 @@
   <dimen name="videocall_preview_margin_end">24dp</dimen>
   <dimen name="videocall_button_spacing">8dp</dimen>
   <dimen name="videocall_button_size">60dp</dimen>
+  <dimen name="videocall_button_padding">12dp</dimen>
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values/strings.xml b/java/com/android/incallui/video/impl/res/values/strings.xml
index 58ea8bd..6c90af5 100644
--- a/java/com/android/incallui/video/impl/res/values/strings.xml
+++ b/java/com/android/incallui/video/impl/res/values/strings.xml
@@ -29,4 +29,10 @@
   <!-- Text indicates the call is resumed from held by remote party. [CHAR LIMIT=20] -->
   <string name="videocall_remotely_resumed">Call resumed</string>
 
+  <!-- Instruction text to notify user that charges may apply on video calling. [CHAR LIMIT=NONE] -->
+  <string name="videocall_charges_alert_dialog_description">Video calls made over the mobile network use both data and voice minutes. Charges may apply.</string>
+
+  <!-- Option to hide the popup dialog if it is not necessary for the user. [CHAR LIMIT=40] -->
+  <string name="do_not_show_again">Do not show again</string>
+
 </resources>
diff --git a/java/com/android/incallui/video/impl/res/values/styles.xml b/java/com/android/incallui/video/impl/res/values/styles.xml
index 010aca2..03395d9 100644
--- a/java/com/android/incallui/video/impl/res/values/styles.xml
+++ b/java/com/android/incallui/video/impl/res/values/styles.xml
@@ -16,10 +16,13 @@
   -->
 <resources>
   <style name="Incall.Button.VideoCall" parent="Widget.AppCompat.ImageButton">
+    <item name="android:layout_height">@dimen/videocall_button_size</item>
+    <item name="android:layout_width">@dimen/videocall_button_size</item>
     <item name="android:background">@drawable/videocall_video_button_background</item>
-    <item name="android:scaleType">center</item>
     <item name="android:tint">@color/videocall_button_icon_tint</item>
     <item name="android:tintMode">src_atop</item>
+    <item name="android:padding">@dimen/videocall_button_padding</item>
+    <item name="android:scaleType">fitCenter</item>
     <item name="android:stateListAnimator">@animator/disabled_alpha</item>
   </style>
   <style name="VideoPreviewHolder">
diff --git a/java/com/android/incallui/video/protocol/AndroidManifest.xml b/java/com/android/incallui/video/protocol/AndroidManifest.xml
index 6f65582..f58284e 100644
--- a/java/com/android/incallui/video/protocol/AndroidManifest.xml
+++ b/java/com/android/incallui/video/protocol/AndroidManifest.xml
@@ -17,6 +17,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.android.incallui.video.protocol">
   <uses-sdk
-      android:minSdkVersion="23"
-      android:targetSdkVersion="27"/>
+      android:minSdkVersion="24"
+      android:targetSdkVersion="28"/>
 </manifest>
diff --git a/java/com/android/incallui/video/protocol/VideoCallScreen.java b/java/com/android/incallui/video/protocol/VideoCallScreen.java
index bad050c..582d4c6 100644
--- a/java/com/android/incallui/video/protocol/VideoCallScreen.java
+++ b/java/com/android/incallui/video/protocol/VideoCallScreen.java
@@ -39,4 +39,6 @@
   Fragment getVideoCallScreenFragment();
 
   String getCallId();
+
+  void onHandoverFromWiFiToLte();
 }
diff --git a/java/com/android/incallui/videotech/duo/DuoVideoTech.java b/java/com/android/incallui/videotech/duo/DuoVideoTech.java
index fdaed07..47f0757 100644
--- a/java/com/android/incallui/videotech/duo/DuoVideoTech.java
+++ b/java/com/android/incallui/videotech/duo/DuoVideoTech.java
@@ -23,7 +23,8 @@
 import android.telecom.PhoneAccountHandle;
 import com.android.dialer.common.Assert;
 import com.android.dialer.common.LogUtil;
-import com.android.dialer.configprovider.ConfigProviderBindings;
+import com.android.dialer.common.concurrent.DefaultFutureCallback;
+import com.android.dialer.configprovider.ConfigProviderComponent;
 import com.android.dialer.duo.Duo;
 import com.android.dialer.duo.DuoListener;
 import com.android.dialer.logging.DialerImpression;
@@ -33,6 +34,8 @@
 import com.android.incallui.videotech.utils.SessionModificationState;
 import com.google.common.base.Optional;
 import com.google.common.collect.ImmutableList;
+import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.MoreExecutors;
 
 public class DuoVideoTech implements VideoTech, DuoListener {
   private final Duo duo;
@@ -57,7 +60,8 @@
 
   @Override
   public boolean isAvailable(Context context, PhoneAccountHandle phoneAccountHandle) {
-    if (!ConfigProviderBindings.get(context)
+    if (!ConfigProviderComponent.get(context)
+        .getConfigProvider()
         .getBoolean("enable_lightbringer_video_upgrade", true)) {
       LogUtil.v("DuoVideoTech.isAvailable", "upgrade disabled by flag");
       return false;
@@ -77,7 +81,10 @@
     if (!isRemoteUpgradeAvailabilityQueried) {
       LogUtil.v("DuoVideoTech.isAvailable", "reachability unknown, starting remote query");
       isRemoteUpgradeAvailabilityQueried = true;
-      duo.updateReachability(context, ImmutableList.of(callingNumber));
+      Futures.addCallback(
+          duo.updateReachability(context, ImmutableList.of(callingNumber)),
+          new DefaultFutureCallback<>(),
+          MoreExecutors.directExecutor());
     }
 
     return false;
diff --git a/java/com/android/incallui/videotech/ims/ImsVideoTech.java b/java/com/android/incallui/videotech/ims/ImsVideoTech.java
index a2fb73b..5b733d6 100644
--- a/java/com/android/incallui/videotech/ims/ImsVideoTech.java
+++ b/java/com/android/incallui/videotech/ims/ImsVideoTech.java
@@ -17,7 +17,6 @@
 package com.android.incallui.videotech.ims;
 
 import android.content.Context;
-import android.os.Build;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.annotation.VisibleForTesting;
@@ -61,34 +60,35 @@
 
   @Override
   public boolean isAvailable(Context context, PhoneAccountHandle phoneAccountHandle) {
-    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
-      return false;
-    }
-
     if (call.getVideoCall() == null) {
+      LogUtil.i("ImsVideoCall.isAvailable", "null video call");
       return false;
     }
 
     // We are already in an IMS video call
     if (VideoProfile.isVideo(call.getDetails().getVideoState())) {
+      LogUtil.i("ImsVideoCall.isAvailable", "already video call");
       return true;
     }
 
     // The user has disabled IMS video calling in system settings
     if (!CallUtil.isVideoEnabled(context)) {
+      LogUtil.i("ImsVideoCall.isAvailable", "disabled in settings");
       return false;
     }
 
     // The current call doesn't support transmitting video
     if (!call.getDetails().can(Call.Details.CAPABILITY_SUPPORTS_VT_LOCAL_TX)) {
+      LogUtil.i("ImsVideoCall.isAvailable", "no TX");
       return false;
     }
 
     // The current call remote device doesn't support receiving video
     if (!call.getDetails().can(Call.Details.CAPABILITY_SUPPORTS_VT_REMOTE_RX)) {
+      LogUtil.i("ImsVideoCall.isAvailable", "no RX");
       return false;
     }
-
+    LogUtil.i("ImsVideoCall.isAvailable", "available");
     return true;
   }
 
@@ -208,6 +208,7 @@
     LogUtil.enterBlock("ImsVideoTech.declineUpgradeRequest");
     call.getVideoCall()
         .sendSessionModifyResponse(new VideoProfile(call.getDetails().getVideoState()));
+    setSessionModificationState(SessionModificationState.NO_REQUEST);
     logger.logImpression(DialerImpression.Type.IMS_VIDEO_REQUEST_DECLINED);
   }
 
@@ -312,6 +313,10 @@
   @Override
   public void setCamera(@Nullable String cameraId) {
     savedCameraId = cameraId;
+    if (call.getVideoCall() == null) {
+      LogUtil.w("ImsVideoTech.setCamera", "video call no longer exist");
+      return;
+    }
     call.getVideoCall().setCamera(cameraId);
     call.getVideoCall().requestCameraCapabilities();
   }
diff --git a/java/com/android/newbubble/NewBubble.java b/java/com/android/newbubble/NewBubble.java
deleted file mode 100644
index 785593c..0000000
--- a/java/com/android/newbubble/NewBubble.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.newbubble;
-
-import android.graphics.drawable.Drawable;
-import android.support.annotation.NonNull;
-import com.android.newbubble.NewBubbleInfo.Action;
-import java.util.List;
-
-/**
- * Creates and manages a bubble window from information in a {@link NewBubbleInfo}. Before creating,
- * be sure to check whether bubbles may be shown using {@code Settings.canDrawOverlays(context)} and
- * request permission if necessary
- */
-public interface NewBubble {
-
-  /**
-   * Make the bubble visible. Will show a short entrance animation as it enters. If the bubble is
-   * already showing this method does nothing.
-   */
-  void show();
-
-  /** Hide the bubble. */
-  void hide();
-
-  /** Returns whether the bubble is currently visible */
-  boolean isVisible();
-
-  /**
-   * Set the info for this Bubble to display
-   *
-   * @param bubbleInfo the BubbleInfo to display in this Bubble.
-   */
-  void setBubbleInfo(@NonNull NewBubbleInfo bubbleInfo);
-
-  /**
-   * Update the state and behavior of actions.
-   *
-   * @param actions the new state of the bubble's actions
-   */
-  void updateActions(@NonNull List<Action> actions);
-
-  /**
-   * Update the avatar from photo.
-   *
-   * @param avatar the new photo avatar in the bubble's primary button
-   */
-  void updatePhotoAvatar(@NonNull Drawable avatar);
-
-  /**
-   * Update the avatar.
-   *
-   * @param avatar the new avatar in the bubble's primary button
-   */
-  void updateAvatar(@NonNull Drawable avatar);
-
-  /**
-   * Display text. The bubble's drawer is not expandable while text is showing, and the drawer will
-   * be closed if already open.
-   *
-   * @param text the text to display to the user
-   */
-  void showText(@NonNull CharSequence text);
-}
diff --git a/java/com/android/newbubble/NewBubbleComponent.java b/java/com/android/newbubble/NewBubbleComponent.java
deleted file mode 100644
index e7edba6..0000000
--- a/java/com/android/newbubble/NewBubbleComponent.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.newbubble;
-
-import android.content.Context;
-import android.support.annotation.NonNull;
-import com.android.dialer.inject.HasRootComponent;
-import dagger.Subcomponent;
-
-@Subcomponent
-public abstract class NewBubbleComponent {
-
-  @NonNull
-  public abstract NewBubble getNewBubble();
-
-  public static NewBubbleComponent get(Context context) {
-    return ((HasComponent) ((HasRootComponent) context.getApplicationContext()).component())
-        .newBubbleComponent();
-  }
-
-  /** Used to refer to the root application component. */
-  public interface HasComponent {
-    NewBubbleComponent newBubbleComponent();
-  }
-}
diff --git a/java/com/android/newbubble/NewBubbleInfo.java b/java/com/android/newbubble/NewBubbleInfo.java
deleted file mode 100644
index d9232a5..0000000
--- a/java/com/android/newbubble/NewBubbleInfo.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.newbubble;
-
-import android.app.PendingIntent;
-import android.graphics.drawable.Drawable;
-import android.graphics.drawable.Icon;
-import android.support.annotation.ColorInt;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.Px;
-import com.google.auto.value.AutoValue;
-import java.util.Collections;
-import java.util.List;
-
-/** Info for displaying a {@link NewBubble} */
-@AutoValue
-public abstract class NewBubbleInfo {
-  @ColorInt
-  public abstract int getPrimaryColor();
-
-  public abstract Icon getPrimaryIcon();
-
-  @Nullable
-  public abstract Drawable getAvatar();
-
-  @Px
-  public abstract int getStartingYPosition();
-
-  @NonNull
-  public abstract List<Action> getActions();
-
-  public static Builder builder() {
-    return new AutoValue_NewBubbleInfo.Builder().setActions(Collections.emptyList());
-  }
-
-  public static Builder from(@NonNull NewBubbleInfo bubbleInfo) {
-    return builder()
-        .setPrimaryColor(bubbleInfo.getPrimaryColor())
-        .setPrimaryIcon(bubbleInfo.getPrimaryIcon())
-        .setStartingYPosition(bubbleInfo.getStartingYPosition())
-        .setActions(bubbleInfo.getActions())
-        .setAvatar(bubbleInfo.getAvatar());
-  }
-
-  /** Builder for {@link NewBubbleInfo} */
-  @AutoValue.Builder
-  public abstract static class Builder {
-
-    public abstract Builder setPrimaryColor(@ColorInt int primaryColor);
-
-    public abstract Builder setPrimaryIcon(@NonNull Icon primaryIcon);
-
-    public abstract Builder setAvatar(@Nullable Drawable avatar);
-
-    public abstract Builder setStartingYPosition(@Px int startingYPosition);
-
-    public abstract Builder setActions(List<Action> actions);
-
-    public abstract NewBubbleInfo build();
-  }
-
-  /** Represents actions to be shown in the bubble when expanded */
-  @AutoValue
-  public abstract static class Action {
-
-    public abstract Drawable getIconDrawable();
-
-    @Nullable
-    public abstract Drawable getSecondaryIconDrawable();
-
-    @NonNull
-    public abstract CharSequence getName();
-
-    @NonNull
-    public abstract PendingIntent getIntent();
-
-    public abstract boolean isCheckable();
-
-    public abstract boolean isChecked();
-
-    public static Builder builder() {
-      return new AutoValue_NewBubbleInfo_Action.Builder().setCheckable(true).setChecked(false);
-    }
-
-    public static Builder from(@NonNull Action action) {
-      return builder()
-          .setIntent(action.getIntent())
-          .setChecked(action.isChecked())
-          .setCheckable(action.isCheckable())
-          .setName(action.getName())
-          .setIconDrawable(action.getIconDrawable())
-          .setSecondaryIconDrawable(action.getSecondaryIconDrawable());
-    }
-
-    /** Builder for {@link Action} */
-    @AutoValue.Builder
-    public abstract static class Builder {
-
-      public abstract Builder setIconDrawable(Drawable iconDrawable);
-
-      public abstract Builder setSecondaryIconDrawable(@Nullable Drawable secondaryIconDrawable);
-
-      public abstract Builder setName(@NonNull CharSequence name);
-
-      public abstract Builder setIntent(@NonNull PendingIntent intent);
-
-      public abstract Builder setCheckable(boolean enabled);
-
-      public abstract Builder setChecked(boolean checked);
-
-      public abstract Action build();
-    }
-  }
-}
diff --git a/java/com/android/newbubble/stub/NewBubbleStub.java b/java/com/android/newbubble/stub/NewBubbleStub.java
deleted file mode 100644
index f5121cf..0000000
--- a/java/com/android/newbubble/stub/NewBubbleStub.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.newbubble.stub;
-
-import android.graphics.drawable.Drawable;
-import android.support.annotation.NonNull;
-import com.android.newbubble.NewBubble;
-import com.android.newbubble.NewBubbleInfo;
-import com.android.newbubble.NewBubbleInfo.Action;
-import java.util.List;
-import javax.inject.Inject;
-
-public class NewBubbleStub implements NewBubble {
-
-  @Inject
-  public NewBubbleStub() {}
-
-  @Override
-  public void show() {}
-
-  @Override
-  public void hide() {}
-
-  @Override
-  public boolean isVisible() {
-    return false;
-  }
-
-  @Override
-  public void setBubbleInfo(@NonNull NewBubbleInfo bubbleInfo) {}
-
-  @Override
-  public void updateActions(@NonNull List<Action> actions) {}
-
-  @Override
-  public void updatePhotoAvatar(@NonNull Drawable avatar) {}
-
-  @Override
-  public void updateAvatar(@NonNull Drawable avatar) {}
-
-  @Override
-  public void showText(@NonNull CharSequence text) {}
-}
diff --git a/java/com/android/newbubble/stub/StubNewBubbleModule.java b/java/com/android/newbubble/stub/StubNewBubbleModule.java
deleted file mode 100644
index 227ba5e..0000000
--- a/java/com/android/newbubble/stub/StubNewBubbleModule.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.newbubble.stub;
-
-import com.android.newbubble.NewBubble;
-import dagger.Binds;
-import dagger.Module;
-import javax.inject.Singleton;
-
-@Module
-public abstract class StubNewBubbleModule {
-
-  @Binds
-  @Singleton
-  public abstract NewBubble bindsNewBubble(NewBubbleStub newBubbleStub);
-}
diff --git a/java/com/android/voicemail/AndroidManifest.xml b/java/com/android/voicemail/AndroidManifest.xml
index d64fb25..d39dfee 100644
--- a/java/com/android/voicemail/AndroidManifest.xml
+++ b/java/com/android/voicemail/AndroidManifest.xml
@@ -17,8 +17,8 @@
   package="com.android.voicemail">
 
   <uses-sdk
-    android:minSdkVersion="23"
-    android:targetSdkVersion="27"/>
+    android:minSdkVersion="24"
+    android:targetSdkVersion="28"/>
 
   <!-- Applications using this module should merge these permissions using android_manifest_merge -->
 
diff --git a/java/com/android/voicemail/VoicemailClient.java b/java/com/android/voicemail/VoicemailClient.java
index 1ce7ef7..5b382f1 100644
--- a/java/com/android/voicemail/VoicemailClient.java
+++ b/java/com/android/voicemail/VoicemailClient.java
@@ -30,35 +30,25 @@
 public interface VoicemailClient {
 
   /**
-   * Whether the voicemail module is enabled (OS has support and not disabled by flags, etc.). This
-   * does not mean the carrier has support or user has enabled the feature.
-   */
-  boolean isVoicemailModuleEnabled();
-
-  /**
    * Broadcast to tell the client to upload local database changes to the server. Since the dialer
    * UI and the client are in the same package, the {@link
    * android.content.Intent#ACTION_PROVIDER_CHANGED} will always be a self-change even if the UI is
    * external to the client.
    */
   String ACTION_UPLOAD = "com.android.voicemail.VoicemailClient.ACTION_UPLOAD";
-
   /** Common key for passing {@link PhoneAccountHandle} in bundles. */
   String PARAM_PHONE_ACCOUNT_HANDLE = "phone_account_handle";
-
   /**
    * Broadcast from the client to inform the app to show a legacy voicemail notification. This
    * broadcast is same as {@link TelephonyManager#ACTION_SHOW_VOICEMAIL_NOTIFICATION}.
    */
   String ACTION_SHOW_LEGACY_VOICEMAIL =
       "com.android.voicemail.VoicemailClient.ACTION_SHOW_LEGACY_VOICEMAIL";
-
   /**
    * Boolean extra send with {@link #ACTION_SHOW_LEGACY_VOICEMAIL}, indicating that the notification
    * is sent by legacy mode and should not be suppressed even when VVM is activated
    */
   String EXTRA_IS_LEGACY_MODE = "is_legacy_mode";
-
   /**
    * Secret code to launch the voicemail config activity intended for OEMs and Carriers. {@code
    * *#*#VVMCONFIG#*#*}
@@ -66,6 +56,12 @@
   String VOICEMAIL_SECRET_CODE = "886266344";
 
   /**
+   * Whether the voicemail module is enabled (OS has support and not disabled by flags, etc.). This
+   * does not mean the carrier has support or user has enabled the feature.
+   */
+  boolean isVoicemailModuleEnabled();
+
+  /**
    * Whether visual voicemail is supported by the carrier for the {@code phoneAccountHandle}. This
    * is purely based on the MCCMNC, and a single account might still be disabled by the carrier.
    */
@@ -123,17 +119,23 @@
 
   /**
    * @return if the voicemail transcription feature is available on the current device. This depends
-   *     on whether the server side flag is turned on for the feature, and if the OS meets the
-   *     requirement for this feature.
+   *     on whether the server side flag is turned on for the feature, visual voicemail is activated
+   *     and enabled and if the OS meets the requirement for this feature.
    */
-  boolean isVoicemailTranscriptionAvailable(Context context);
+  boolean isVoicemailTranscriptionAvailable(Context context, PhoneAccountHandle account);
+
+  /** @return if the voicemail transcription setting has been enabled by the user. */
+  boolean isVoicemailTranscriptionEnabled(Context context, PhoneAccountHandle account);
 
   /** @return if the voicemail donation feature is available. */
-  boolean isVoicemailDonationAvailable(Context context);
+  boolean isVoicemailDonationAvailable(Context context, PhoneAccountHandle account);
 
   /** @return if the voicemail donation setting has been enabled by the user. */
   boolean isVoicemailDonationEnabled(Context context, PhoneAccountHandle account);
 
+  void setVoicemailTranscriptionEnabled(
+      Context context, PhoneAccountHandle phoneAccountHandle, boolean enabled);
+
   void setVoicemailDonationEnabled(
       Context context, PhoneAccountHandle phoneAccountHandle, boolean enabled);
 
@@ -162,12 +164,6 @@
   @MainThread
   void onShutdown(@NonNull Context context);
 
-  /** Listener for changes in {@link #isActivated(Context, PhoneAccountHandle)} */
-  interface ActivationStateListener {
-    @MainThread
-    void onActivationStateChanged(PhoneAccountHandle phoneAccountHandle, boolean isActivated);
-  }
-
   @MainThread
   void addActivationStateListener(ActivationStateListener listener);
 
@@ -187,4 +183,10 @@
    */
   @Nullable
   String getCarrierConfigString(Context context, PhoneAccountHandle phoneAccountHandle, String key);
+
+  /** Listener for changes in {@link #isActivated(Context, PhoneAccountHandle)} */
+  interface ActivationStateListener {
+    @MainThread
+    void onActivationStateChanged(PhoneAccountHandle phoneAccountHandle, boolean isActivated);
+  }
 }
diff --git a/java/com/android/voicemail/VoicemailComponent.java b/java/com/android/voicemail/VoicemailComponent.java
index bed75f0..0e09627 100644
--- a/java/com/android/voicemail/VoicemailComponent.java
+++ b/java/com/android/voicemail/VoicemailComponent.java
@@ -18,6 +18,7 @@
 
 import android.content.Context;
 import com.android.dialer.inject.HasRootComponent;
+import com.android.dialer.inject.IncludeInDialerRoot;
 import dagger.Subcomponent;
 
 /** Subcomponent that can be used to access the voicemail implementation. */
@@ -32,6 +33,7 @@
   }
 
   /** Used to refer to the root application component. */
+  @IncludeInDialerRoot
   public interface HasComponent {
     VoicemailComponent voicemailComponent();
   }
diff --git a/java/com/android/voicemail/impl/AndroidManifest.xml b/java/com/android/voicemail/impl/AndroidManifest.xml
index 1998d35..3a2bfcb 100644
--- a/java/com/android/voicemail/impl/AndroidManifest.xml
+++ b/java/com/android/voicemail/impl/AndroidManifest.xml
@@ -19,10 +19,6 @@
 
   <application
     android:supportsRtl="true">
-    <!-- Causes the "Voicemail" item under "Calls" setting to be hidden. The voicemail module will
-      be handling the settings. Has no effect before OC where dialer cannot provide voicemail
-      settings-->
-    <meta-data android:name="android.telephony.HIDE_VOICEMAIL_SETTINGS_MENU" android:value="true"/>
 
     <receiver
       android:name="com.android.voicemail.impl.sms.OmtpMessageReceiver"
diff --git a/java/com/android/voicemail/impl/CarrierIdentifier.java b/java/com/android/voicemail/impl/CarrierIdentifier.java
index 82b6a24..7788b7d 100644
--- a/java/com/android/voicemail/impl/CarrierIdentifier.java
+++ b/java/com/android/voicemail/impl/CarrierIdentifier.java
@@ -19,14 +19,16 @@
 import android.annotation.TargetApi;
 import android.content.Context;
 import android.os.Build.VERSION_CODES;
+import android.support.annotation.Nullable;
 import android.telecom.PhoneAccountHandle;
 import android.telephony.TelephonyManager;
 import com.google.auto.value.AutoValue;
+import java.util.Optional;
 
 /** Identifies a carrier. */
 @AutoValue
 @TargetApi(VERSION_CODES.O)
-@SuppressWarnings("missingpermission")
+@SuppressWarnings({"missingpermission"})
 public abstract class CarrierIdentifier {
 
   public abstract String mccMnc();
@@ -52,20 +54,25 @@
     return new AutoValue_CarrierIdentifier.Builder().setGid1("");
   }
 
-  public static CarrierIdentifier forHandle(
-      Context context, PhoneAccountHandle phoneAccountHandle) {
+  /** Create a identifier for a {@link PhoneAccountHandle}. Absent if the handle is not valid. */
+  public static Optional<CarrierIdentifier> forHandle(
+      Context context, @Nullable PhoneAccountHandle phoneAccountHandle) {
+    if (phoneAccountHandle == null) {
+      return Optional.empty();
+    }
     TelephonyManager telephonyManager =
         context
             .getSystemService(TelephonyManager.class)
             .createForPhoneAccountHandle(phoneAccountHandle);
     if (telephonyManager == null) {
-      throw new IllegalArgumentException("Invalid PhoneAccountHandle");
+      return Optional.empty();
     }
     String gid1 = telephonyManager.getGroupIdLevel1();
     if (gid1 == null) {
       gid1 = "";
     }
 
-    return builder().setMccMnc(telephonyManager.getSimOperator()).setGid1(gid1).build();
+    return Optional.of(
+        builder().setMccMnc(telephonyManager.getSimOperator()).setGid1(gid1).build());
   }
 }
diff --git a/java/com/android/voicemail/impl/CarrierIdentifierMatcher.java b/java/com/android/voicemail/impl/CarrierIdentifierMatcher.java
index d7c28fe..5953755 100644
--- a/java/com/android/voicemail/impl/CarrierIdentifierMatcher.java
+++ b/java/com/android/voicemail/impl/CarrierIdentifierMatcher.java
@@ -51,7 +51,7 @@
       return false;
     }
     if (gid1().isPresent()) {
-      if (!gid1().get().equals(carrierIdentifier.gid1())) {
+      if (!gid1().get().equalsIgnoreCase(carrierIdentifier.gid1())) {
         return false;
       }
     }
diff --git a/java/com/android/voicemail/impl/DialerVvmConfigManager.java b/java/com/android/voicemail/impl/DialerVvmConfigManager.java
index 7fa960e..99c95dd 100644
--- a/java/com/android/voicemail/impl/DialerVvmConfigManager.java
+++ b/java/com/android/voicemail/impl/DialerVvmConfigManager.java
@@ -23,7 +23,7 @@
 import android.support.annotation.Nullable;
 import android.support.annotation.VisibleForTesting;
 import android.util.ArrayMap;
-import com.android.dialer.configprovider.ConfigProviderBindings;
+import com.android.dialer.configprovider.ConfigProviderComponent;
 import com.android.voicemail.impl.utils.XmlUtils;
 import com.google.common.collect.ComparisonChain;
 import java.io.IOException;
@@ -133,7 +133,8 @@
         PersistableBundle bundle = (PersistableBundle) object;
 
         if (bundle.containsKey(KEY_FEATURE_FLAG_NAME)
-            && !ConfigProviderBindings.get(context)
+            && !ConfigProviderComponent.get(context)
+                .getConfigProvider()
                 .getBoolean(bundle.getString(KEY_FEATURE_FLAG_NAME), false)) {
           continue;
         }
diff --git a/java/com/android/voicemail/impl/OmtpConstants.java b/java/com/android/voicemail/impl/OmtpConstants.java
index d94e361..c04f5e2 100644
--- a/java/com/android/voicemail/impl/OmtpConstants.java
+++ b/java/com/android/voicemail/impl/OmtpConstants.java
@@ -244,4 +244,9 @@
   private static final String truncate(String string, int length) {
     return string.substring(0, Math.min(length, string.length()));
   }
+
+  // Alternative form of sync message: MBOXUPDATE?m=<new_message_count>;<key>=<value>;
+
+  public static final String ALTERNATIVE_MAILBOX_UPDATE = "MBOXUPDATE";
+  public static final String ALTERNATIVE_NUM_MESSAGE_COUNT = "m";
 }
diff --git a/java/com/android/voicemail/impl/OmtpVvmCarrierConfigHelper.java b/java/com/android/voicemail/impl/OmtpVvmCarrierConfigHelper.java
index 8896bc7..e5263f4 100644
--- a/java/com/android/voicemail/impl/OmtpVvmCarrierConfigHelper.java
+++ b/java/com/android/voicemail/impl/OmtpVvmCarrierConfigHelper.java
@@ -39,6 +39,7 @@
 import com.android.voicemail.impl.sms.StatusMessage;
 import com.android.voicemail.impl.sync.VvmAccountManager;
 import java.util.Collections;
+import java.util.Optional;
 import java.util.Set;
 
 /**
@@ -55,7 +56,7 @@
  * <p>TODO(twyen): refactor this to an interface.
  */
 @TargetApi(VERSION_CODES.O)
-@SuppressWarnings("missingpermission")
+@SuppressWarnings({"missingpermission"})
 public class OmtpVvmCarrierConfigHelper {
 
   private static final String TAG = "OmtpVvmCarrierCfgHlpr";
@@ -88,6 +89,7 @@
       "vvm_disabled_capabilities_string_array";
 
   public static final String KEY_VVM_CLIENT_PREFIX_STRING = "vvm_client_prefix_string";
+  private static final String KEY_IGNORE_TRANSCRIPTION_BOOL = "vvm_ignore_transcription";
 
   @Nullable private static PersistableBundle overrideConfigForTest;
 
@@ -104,25 +106,25 @@
   public OmtpVvmCarrierConfigHelper(Context context, @Nullable PhoneAccountHandle handle) {
     this.context = context;
     phoneAccountHandle = handle;
-    TelephonyManager telephonyManager =
-        context
-            .getSystemService(TelephonyManager.class)
-            .createForPhoneAccountHandle(phoneAccountHandle);
-    if (telephonyManager == null) {
-      VvmLog.e(TAG, "PhoneAccountHandle is invalid");
-      carrierConfig = null;
-      telephonyConfig = null;
-      overrideConfig = null;
-      vvmType = null;
-      protocol = null;
-      return;
-    }
-
     if (overrideConfigForTest != null) {
       overrideConfig = overrideConfigForTest;
       carrierConfig = new PersistableBundle();
       telephonyConfig = new PersistableBundle();
     } else {
+      Optional<CarrierIdentifier> carrierIdentifier = CarrierIdentifier.forHandle(context, handle);
+      TelephonyManager telephonyManager =
+          context
+              .getSystemService(TelephonyManager.class)
+              .createForPhoneAccountHandle(phoneAccountHandle);
+      if (telephonyManager == null || !carrierIdentifier.isPresent()) {
+        VvmLog.e(TAG, "PhoneAccountHandle is invalid");
+        carrierConfig = null;
+        telephonyConfig = null;
+        overrideConfig = null;
+        vvmType = null;
+        protocol = null;
+        return;
+      }
       if (ConfigOverrideFragment.isOverridden(context)) {
         overrideConfig = ConfigOverrideFragment.getConfig(context);
         VvmLog.w(TAG, "Config override is activated: " + overrideConfig);
@@ -131,9 +133,7 @@
       }
 
       carrierConfig = getCarrierConfig(telephonyManager);
-      telephonyConfig =
-          new DialerVvmConfigManager(context)
-              .getConfig(CarrierIdentifier.forHandle(context, phoneAccountHandle));
+      telephonyConfig = new DialerVvmConfigManager(context).getConfig(carrierIdentifier.get());
     }
 
     vvmType = getVvmType();
@@ -142,10 +142,14 @@
 
   @VisibleForTesting
   OmtpVvmCarrierConfigHelper(
-      Context context, PersistableBundle carrierConfig, PersistableBundle telephonyConfig) {
+      Context context,
+      PersistableBundle carrierConfig,
+      PersistableBundle telephonyConfig,
+      @Nullable PhoneAccountHandle phoneAccountHandle) {
     this.context = context;
     this.carrierConfig = carrierConfig;
     this.telephonyConfig = telephonyConfig;
+    this.phoneAccountHandle = phoneAccountHandle;
     overrideConfig = null;
     vvmType = getVvmType();
     protocol = VisualVoicemailProtocolFactory.create(this.context.getResources(), vvmType);
@@ -345,7 +349,6 @@
   }
 
   public void startActivation() {
-    Assert.checkArgument(isValid());
     PhoneAccountHandle phoneAccountHandle = getPhoneAccountHandle();
     if (phoneAccountHandle == null) {
       // This should never happen
@@ -353,37 +356,36 @@
       return;
     }
 
-    if (vvmType == null || vvmType.isEmpty()) {
-      // The VVM type is invalid; we should never have gotten here in the first place since
-      // this is loaded initially in the constructor, and callers should check isValid()
-      // before trying to start activation anyways.
-      VvmLog.e(TAG, "startActivation : vvmType is null or empty for account " + phoneAccountHandle);
+    if (!isValid()) {
+      VvmLog.e(TAG, "startActivation : invalid config for account " + phoneAccountHandle);
       return;
     }
 
-    if (protocol != null) {
-      ActivationTask.start(context, this.phoneAccountHandle, null);
-    }
+    ActivationTask.start(context, this.phoneAccountHandle, null);
   }
 
   public void activateSmsFilter() {
     Assert.checkArgument(isValid());
-    TelephonyMangerCompat.setVisualVoicemailSmsFilterSettings(
-        context,
-        getPhoneAccountHandle(),
-        new VisualVoicemailSmsFilterSettings.Builder().setClientPrefix(getClientPrefix()).build());
+    context
+        .getSystemService(TelephonyManager.class)
+        .createForPhoneAccountHandle(getPhoneAccountHandle())
+        .setVisualVoicemailSmsFilterSettings(
+            new VisualVoicemailSmsFilterSettings.Builder()
+                .setClientPrefix(getClientPrefix())
+                .build());
   }
 
   public void startDeactivation() {
-    Assert.checkArgument(isValid());
     VvmLog.i(TAG, "startDeactivation");
-    if (!isLegacyModeEnabled()) {
-      // SMS should still be filtered in legacy mode
-      TelephonyMangerCompat.setVisualVoicemailSmsFilterSettings(
-          context, getPhoneAccountHandle(), null);
-      VvmLog.i(TAG, "filter disabled");
-    }
-    if (protocol != null) {
+    if (isValid()) {
+      if (!isLegacyModeEnabled()) {
+        // SMS should still be filtered in legacy mode
+        context
+            .getSystemService(TelephonyManager.class)
+            .createForPhoneAccountHandle(getPhoneAccountHandle())
+            .setVisualVoicemailSmsFilterSettings(null);
+        VvmLog.i(TAG, "filter disabled");
+      }
       protocol.startDeactivation(this);
     }
     VvmAccountManager.removeAccount(context, getPhoneAccountHandle());
@@ -456,6 +458,9 @@
     }
 
     PersistableBundle config = telephonyManager.getCarrierConfig();
+    if (config == null) {
+      return null;
+    }
 
     if (TextUtils.isEmpty(config.getString(CarrierConfigManager.KEY_VVM_TYPE_STRING))) {
       return null;
@@ -517,4 +522,13 @@
     }
     return false;
   }
+
+  /**
+   * Suppress the behavior of treating any text attachment with MIME "text/*" as transcription,
+   * default to false.
+   */
+  public boolean ignoreTranscription() {
+    Assert.checkArgument(isValid());
+    return (boolean) getValue(KEY_IGNORE_TRANSCRIPTION_BOOL, false);
+  }
 }
diff --git a/java/com/android/voicemail/impl/PackageReplacedReceiver.java b/java/com/android/voicemail/impl/PackageReplacedReceiver.java
index bc56286..c60fbe7 100644
--- a/java/com/android/voicemail/impl/PackageReplacedReceiver.java
+++ b/java/com/android/voicemail/impl/PackageReplacedReceiver.java
@@ -16,7 +16,6 @@
 
 package com.android.voicemail.impl;
 
-import android.annotation.TargetApi;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
@@ -91,7 +90,6 @@
       this.context = context;
     }
 
-    @TargetApi(android.os.Build.VERSION_CODES.M) // used for try with resources
     @Override
     public Void doInBackground(Void arg) throws Throwable {
       LogUtil.i("PackageReplacedReceiver.ExistingVoicemailCheck.doInBackground", "");
diff --git a/java/com/android/voicemail/impl/TelephonyMangerCompat.java b/java/com/android/voicemail/impl/TelephonyMangerCompat.java
deleted file mode 100644
index 404b4d6..0000000
--- a/java/com/android/voicemail/impl/TelephonyMangerCompat.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.voicemail.impl;
-
-import android.app.PendingIntent;
-import android.content.Context;
-import android.telecom.PhoneAccountHandle;
-import android.telephony.TelephonyManager;
-import android.telephony.VisualVoicemailService;
-import android.telephony.VisualVoicemailSmsFilterSettings;
-import com.android.dialer.common.LogUtil;
-import java.lang.reflect.Method;
-
-/** Handles {@link TelephonyManager} API changes in experimental SDK */
-public class TelephonyMangerCompat {
-  /** Moved from VisualVoicemailService to TelephonyManager */
-  public static String sendVisualVoicemailSms(
-      Context context,
-      PhoneAccountHandle phoneAccountHandle,
-      String number,
-      int port,
-      String text,
-      PendingIntent sentIntent) {
-    try {
-      Method method =
-          TelephonyManager.class.getMethod(
-              "sendVisualVoicemailSms", String.class, int.class, String.class, PendingIntent.class);
-      try {
-        LogUtil.i("TelephonyMangerCompat.sendVisualVoicemailSms", "using TelephonyManager");
-        TelephonyManager telephonyManager =
-            context
-                .getSystemService(TelephonyManager.class)
-                .createForPhoneAccountHandle(phoneAccountHandle);
-        return (String) method.invoke(telephonyManager, number, port, text, sentIntent);
-      } catch (ReflectiveOperationException e) {
-        throw new RuntimeException(e);
-      }
-    } catch (NoSuchMethodException e) {
-      // Do nothing, try the next version.
-    }
-
-    try {
-      LogUtil.i("TelephonyMangerCompat.sendVisualVoicemailSms", "using VisualVoicemailService");
-      Method method =
-          VisualVoicemailService.class.getMethod(
-              "sendVisualVoicemailSms",
-              Context.class,
-              PhoneAccountHandle.class,
-              String.class,
-              short.class,
-              String.class,
-              PendingIntent.class);
-      return (String)
-          method.invoke(null, context, phoneAccountHandle, number, (short) port, text, sentIntent);
-
-    } catch (ReflectiveOperationException e) {
-      throw new RuntimeException(e);
-    }
-  }
-
-  /** Moved from VisualVoicemailService to TelephonyManager */
-  public static String setVisualVoicemailSmsFilterSettings(
-      Context context,
-      PhoneAccountHandle phoneAccountHandle,
-      VisualVoicemailSmsFilterSettings settings) {
-    try {
-      Method method =
-          TelephonyManager.class.getMethod(
-              "setVisualVoicemailSmsFilterSettings", VisualVoicemailSmsFilterSettings.class);
-      try {
-        LogUtil.i(
-            "TelephonyMangerCompat.setVisualVoicemailSmsFilterSettings", "using TelephonyManager");
-        TelephonyManager telephonyManager =
-            context
-                .getSystemService(TelephonyManager.class)
-                .createForPhoneAccountHandle(phoneAccountHandle);
-        return (String) method.invoke(telephonyManager, settings);
-      } catch (ReflectiveOperationException e) {
-        throw new RuntimeException(e);
-      }
-    } catch (NoSuchMethodException e) {
-      // Do nothing, try the next version.
-    }
-
-    try {
-      LogUtil.i(
-          "TelephonyMangerCompat.setVisualVoicemailSmsFilterSettings",
-          "using VisualVoicemailService");
-      Method method =
-          VisualVoicemailService.class.getMethod(
-              "setSmsFilterSettings",
-              Context.class,
-              PhoneAccountHandle.class,
-              VisualVoicemailSmsFilterSettings.class);
-      return (String) method.invoke(null, context, phoneAccountHandle, settings);
-
-    } catch (ReflectiveOperationException e) {
-      throw new RuntimeException(e);
-    }
-  }
-}
diff --git a/java/com/android/voicemail/impl/VoicemailClientImpl.java b/java/com/android/voicemail/impl/VoicemailClientImpl.java
index 993594e..36e5a6c 100644
--- a/java/com/android/voicemail/impl/VoicemailClientImpl.java
+++ b/java/com/android/voicemail/impl/VoicemailClientImpl.java
@@ -30,7 +30,7 @@
 import android.telephony.TelephonyManager;
 import com.android.dialer.common.Assert;
 import com.android.dialer.common.LogUtil;
-import com.android.dialer.configprovider.ConfigProviderBindings;
+import com.android.dialer.configprovider.ConfigProviderComponent;
 import com.android.voicemail.PinChanger;
 import com.android.voicemail.VisualVoicemailTypeExtensions;
 import com.android.voicemail.VoicemailClient;
@@ -105,7 +105,9 @@
       return false;
     }
 
-    if (!ConfigProviderBindings.get(context).getBoolean(ALLOW_VOICEMAIL_ARCHIVE, false)) {
+    if (!ConfigProviderComponent.get(context)
+        .getConfigProvider()
+        .getBoolean(ALLOW_VOICEMAIL_ARCHIVE, false)) {
       LogUtil.i(
           "VoicemailClientImpl.isVoicemailArchiveAllowed",
           "feature disabled by config: %s",
@@ -123,13 +125,33 @@
   }
 
   @Override
-  public boolean isVoicemailTranscriptionAvailable(Context context) {
+  public boolean isVoicemailTranscriptionAvailable(
+      Context context, PhoneAccountHandle phoneAccountHandle) {
+    if (phoneAccountHandle == null) {
+      LogUtil.i(
+          "VoicemailClientImpl.isVoicemailTranscriptionAvailable", "phone account handle is null");
+    }
+
     if (!BuildCompat.isAtLeastO()) {
       LogUtil.i(
           "VoicemailClientImpl.isVoicemailTranscriptionAvailable", "not running on O or later");
       return false;
     }
 
+    if (!isVoicemailEnabled(context, phoneAccountHandle)) {
+      LogUtil.i(
+          "VoicemailClientImpl.isVoicemailTranscriptionAvailable",
+          "visual voicemail is not enabled");
+      return false;
+    }
+
+    if (!isActivated(context, phoneAccountHandle)) {
+      LogUtil.i(
+          "VoicemailClientImpl.isVoicemailTranscriptionAvailable",
+          "visual voicemail is not activated");
+      return false;
+    }
+
     TranscriptionConfigProvider provider = new TranscriptionConfigProvider(context);
     if (!provider.isVoicemailTranscriptionAvailable()) {
       LogUtil.i(
@@ -141,12 +163,24 @@
   }
 
   @Override
-  public boolean isVoicemailDonationAvailable(Context context) {
-    if (!isVoicemailTranscriptionAvailable(context)) {
+  public boolean isVoicemailTranscriptionEnabled(Context context, PhoneAccountHandle account) {
+    return isVoicemailTranscriptionAvailable(context, account)
+        && VisualVoicemailSettingsUtil.isVoicemailTranscriptionEnabled(context, account);
+  }
+
+  @Override
+  public boolean isVoicemailDonationAvailable(
+      Context context, PhoneAccountHandle phoneAccountHandle) {
+    if (!isVoicemailTranscriptionAvailable(context, phoneAccountHandle)) {
       LogUtil.i("VoicemailClientImpl.isVoicemailDonationAvailable", "transcription not available");
       return false;
     }
 
+    if (!isVoicemailTranscriptionEnabled(context, phoneAccountHandle)) {
+      LogUtil.i("VoicemailClientImpl.isVoicemailDonationAvailable", "transcription not enabled");
+      return false;
+    }
+
     TranscriptionConfigProvider provider = new TranscriptionConfigProvider(context);
     if (!provider.isVoicemailDonationAvailable()) {
       LogUtil.i("VoicemailClientImpl.isVoicemailDonationAvailable", "feature disabled by config");
@@ -158,13 +192,37 @@
 
   @Override
   public boolean isVoicemailDonationEnabled(Context context, PhoneAccountHandle account) {
-    return isVoicemailTranscriptionAvailable(context)
+    return isVoicemailTranscriptionEnabled(context, account)
+        && isVoicemailDonationAvailable(context, account)
         && VisualVoicemailSettingsUtil.isVoicemailDonationEnabled(context, account);
   }
 
   @Override
+  public void setVoicemailTranscriptionEnabled(
+      Context context, PhoneAccountHandle phoneAccountHandle, boolean enabled) {
+    Assert.checkArgument(
+        isVoicemailTranscriptionAvailable(context, phoneAccountHandle),
+        "transcription must be available before enabling/disabling it");
+    VisualVoicemailSettingsUtil.setVoicemailTranscriptionEnabled(
+        context, phoneAccountHandle, enabled);
+    if (enabled) {
+      TranscriptionBackfillService.scheduleTask(context, phoneAccountHandle);
+    }
+  }
+
+  @Override
   public void setVoicemailDonationEnabled(
       Context context, PhoneAccountHandle phoneAccountHandle, boolean enabled) {
+    if (enabled) {
+      Assert.checkArgument(
+          isVoicemailTranscriptionAvailable(context, phoneAccountHandle)
+              && isVoicemailTranscriptionEnabled(context, phoneAccountHandle),
+          "should not be able to enable donation without transcription "
+              + "available(value: %b) and enabled (value:%b) for account:%s",
+          isVoicemailTranscriptionAvailable(context, phoneAccountHandle),
+          isVoicemailTranscriptionEnabled(context, phoneAccountHandle),
+          phoneAccountHandle.toString());
+    }
     VisualVoicemailSettingsUtil.setVoicemailDonationEnabled(context, phoneAccountHandle, enabled);
   }
 
diff --git a/java/com/android/voicemail/impl/VoicemailModule.java b/java/com/android/voicemail/impl/VoicemailModule.java
index e689e47..c4c72d3 100644
--- a/java/com/android/voicemail/impl/VoicemailModule.java
+++ b/java/com/android/voicemail/impl/VoicemailModule.java
@@ -19,6 +19,8 @@
 import android.content.Context;
 import android.support.v4.os.BuildCompat;
 import com.android.dialer.inject.ApplicationContext;
+import com.android.dialer.inject.DialerVariant;
+import com.android.dialer.inject.InstallIn;
 import com.android.voicemail.VoicemailClient;
 import com.android.voicemail.VoicemailPermissionHelper;
 import com.android.voicemail.stub.StubVoicemailClient;
@@ -27,6 +29,7 @@
 import javax.inject.Singleton;
 
 /** This module provides an instance of the voicemail client. */
+@InstallIn(variants = {DialerVariant.DIALER_TEST})
 @Module
 public final class VoicemailModule {
 
diff --git a/java/com/android/voicemail/impl/VvmPackageInstallHandler.java b/java/com/android/voicemail/impl/VvmPackageInstallHandler.java
index 276b788..ee8b722 100644
--- a/java/com/android/voicemail/impl/VvmPackageInstallHandler.java
+++ b/java/com/android/voicemail/impl/VvmPackageInstallHandler.java
@@ -16,7 +16,6 @@
 
 package com.android.voicemail.impl;
 
-import android.annotation.SuppressLint;
 import android.annotation.TargetApi;
 import android.content.Context;
 import android.os.Build.VERSION_CODES;
@@ -34,7 +33,6 @@
  * when a VVM SMS is received instead, as it can be a result of the carrier VVM app trying to run
  * activation.
  */
-@SuppressLint("AndroidApiChecker") // forEach
 @TargetApi(VERSION_CODES.O)
 public final class VvmPackageInstallHandler {
 
diff --git a/java/com/android/voicemail/impl/configui/res/values-af/strings.xml b/java/com/android/voicemail/impl/configui/res/values-af/strings.xml
index 826efd3..56d9f67 100644
--- a/java/com/android/voicemail/impl/configui/res/values-af/strings.xml
+++ b/java/com/android/voicemail/impl/configui/res/values-af/strings.xml
@@ -1,19 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 </resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-am/strings.xml b/java/com/android/voicemail/impl/configui/res/values-am/strings.xml
index 826efd3..56d9f67 100644
--- a/java/com/android/voicemail/impl/configui/res/values-am/strings.xml
+++ b/java/com/android/voicemail/impl/configui/res/values-am/strings.xml
@@ -1,19 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 </resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-ar/strings.xml b/java/com/android/voicemail/impl/configui/res/values-ar/strings.xml
index 826efd3..56d9f67 100644
--- a/java/com/android/voicemail/impl/configui/res/values-ar/strings.xml
+++ b/java/com/android/voicemail/impl/configui/res/values-ar/strings.xml
@@ -1,19 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 </resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-az/strings.xml b/java/com/android/voicemail/impl/configui/res/values-az/strings.xml
index 826efd3..56d9f67 100644
--- a/java/com/android/voicemail/impl/configui/res/values-az/strings.xml
+++ b/java/com/android/voicemail/impl/configui/res/values-az/strings.xml
@@ -1,19 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 </resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-b+sr+Latn/strings.xml b/java/com/android/voicemail/impl/configui/res/values-b+sr+Latn/strings.xml
index 826efd3..56d9f67 100644
--- a/java/com/android/voicemail/impl/configui/res/values-b+sr+Latn/strings.xml
+++ b/java/com/android/voicemail/impl/configui/res/values-b+sr+Latn/strings.xml
@@ -1,19 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 </resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-be/strings.xml b/java/com/android/voicemail/impl/configui/res/values-be/strings.xml
index 826efd3..56d9f67 100644
--- a/java/com/android/voicemail/impl/configui/res/values-be/strings.xml
+++ b/java/com/android/voicemail/impl/configui/res/values-be/strings.xml
@@ -1,19 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 </resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-bg/strings.xml b/java/com/android/voicemail/impl/configui/res/values-bg/strings.xml
index 826efd3..56d9f67 100644
--- a/java/com/android/voicemail/impl/configui/res/values-bg/strings.xml
+++ b/java/com/android/voicemail/impl/configui/res/values-bg/strings.xml
@@ -1,19 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 </resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-bn/strings.xml b/java/com/android/voicemail/impl/configui/res/values-bn/strings.xml
index 826efd3..56d9f67 100644
--- a/java/com/android/voicemail/impl/configui/res/values-bn/strings.xml
+++ b/java/com/android/voicemail/impl/configui/res/values-bn/strings.xml
@@ -1,19 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 </resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-bs/strings.xml b/java/com/android/voicemail/impl/configui/res/values-bs/strings.xml
index 826efd3..56d9f67 100644
--- a/java/com/android/voicemail/impl/configui/res/values-bs/strings.xml
+++ b/java/com/android/voicemail/impl/configui/res/values-bs/strings.xml
@@ -1,19 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 </resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-ca/strings.xml b/java/com/android/voicemail/impl/configui/res/values-ca/strings.xml
index 826efd3..56d9f67 100644
--- a/java/com/android/voicemail/impl/configui/res/values-ca/strings.xml
+++ b/java/com/android/voicemail/impl/configui/res/values-ca/strings.xml
@@ -1,19 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 </resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-cs/strings.xml b/java/com/android/voicemail/impl/configui/res/values-cs/strings.xml
index 826efd3..56d9f67 100644
--- a/java/com/android/voicemail/impl/configui/res/values-cs/strings.xml
+++ b/java/com/android/voicemail/impl/configui/res/values-cs/strings.xml
@@ -1,19 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 </resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-da/strings.xml b/java/com/android/voicemail/impl/configui/res/values-da/strings.xml
index 826efd3..56d9f67 100644
--- a/java/com/android/voicemail/impl/configui/res/values-da/strings.xml
+++ b/java/com/android/voicemail/impl/configui/res/values-da/strings.xml
@@ -1,19 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 </resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-de/strings.xml b/java/com/android/voicemail/impl/configui/res/values-de/strings.xml
index 826efd3..56d9f67 100644
--- a/java/com/android/voicemail/impl/configui/res/values-de/strings.xml
+++ b/java/com/android/voicemail/impl/configui/res/values-de/strings.xml
@@ -1,19 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 </resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-el/strings.xml b/java/com/android/voicemail/impl/configui/res/values-el/strings.xml
index 826efd3..56d9f67 100644
--- a/java/com/android/voicemail/impl/configui/res/values-el/strings.xml
+++ b/java/com/android/voicemail/impl/configui/res/values-el/strings.xml
@@ -1,19 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 </resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-en-rAU/strings.xml b/java/com/android/voicemail/impl/configui/res/values-en-rAU/strings.xml
index 826efd3..56d9f67 100644
--- a/java/com/android/voicemail/impl/configui/res/values-en-rAU/strings.xml
+++ b/java/com/android/voicemail/impl/configui/res/values-en-rAU/strings.xml
@@ -1,19 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 </resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-en-rGB/strings.xml b/java/com/android/voicemail/impl/configui/res/values-en-rGB/strings.xml
index 826efd3..56d9f67 100644
--- a/java/com/android/voicemail/impl/configui/res/values-en-rGB/strings.xml
+++ b/java/com/android/voicemail/impl/configui/res/values-en-rGB/strings.xml
@@ -1,19 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 </resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-en-rIN/strings.xml b/java/com/android/voicemail/impl/configui/res/values-en-rIN/strings.xml
index 826efd3..56d9f67 100644
--- a/java/com/android/voicemail/impl/configui/res/values-en-rIN/strings.xml
+++ b/java/com/android/voicemail/impl/configui/res/values-en-rIN/strings.xml
@@ -1,19 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 </resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-es-rUS/strings.xml b/java/com/android/voicemail/impl/configui/res/values-es-rUS/strings.xml
index 826efd3..56d9f67 100644
--- a/java/com/android/voicemail/impl/configui/res/values-es-rUS/strings.xml
+++ b/java/com/android/voicemail/impl/configui/res/values-es-rUS/strings.xml
@@ -1,19 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 </resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-es/strings.xml b/java/com/android/voicemail/impl/configui/res/values-es/strings.xml
index 826efd3..56d9f67 100644
--- a/java/com/android/voicemail/impl/configui/res/values-es/strings.xml
+++ b/java/com/android/voicemail/impl/configui/res/values-es/strings.xml
@@ -1,19 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 </resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-et/strings.xml b/java/com/android/voicemail/impl/configui/res/values-et/strings.xml
index 826efd3..56d9f67 100644
--- a/java/com/android/voicemail/impl/configui/res/values-et/strings.xml
+++ b/java/com/android/voicemail/impl/configui/res/values-et/strings.xml
@@ -1,19 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 </resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-eu/strings.xml b/java/com/android/voicemail/impl/configui/res/values-eu/strings.xml
index 826efd3..56d9f67 100644
--- a/java/com/android/voicemail/impl/configui/res/values-eu/strings.xml
+++ b/java/com/android/voicemail/impl/configui/res/values-eu/strings.xml
@@ -1,19 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 </resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-fa/strings.xml b/java/com/android/voicemail/impl/configui/res/values-fa/strings.xml
index 826efd3..56d9f67 100644
--- a/java/com/android/voicemail/impl/configui/res/values-fa/strings.xml
+++ b/java/com/android/voicemail/impl/configui/res/values-fa/strings.xml
@@ -1,19 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 </resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-fi/strings.xml b/java/com/android/voicemail/impl/configui/res/values-fi/strings.xml
index 826efd3..56d9f67 100644
--- a/java/com/android/voicemail/impl/configui/res/values-fi/strings.xml
+++ b/java/com/android/voicemail/impl/configui/res/values-fi/strings.xml
@@ -1,19 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 </resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-fr-rCA/strings.xml b/java/com/android/voicemail/impl/configui/res/values-fr-rCA/strings.xml
index 826efd3..56d9f67 100644
--- a/java/com/android/voicemail/impl/configui/res/values-fr-rCA/strings.xml
+++ b/java/com/android/voicemail/impl/configui/res/values-fr-rCA/strings.xml
@@ -1,19 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 </resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-fr/strings.xml b/java/com/android/voicemail/impl/configui/res/values-fr/strings.xml
index 826efd3..56d9f67 100644
--- a/java/com/android/voicemail/impl/configui/res/values-fr/strings.xml
+++ b/java/com/android/voicemail/impl/configui/res/values-fr/strings.xml
@@ -1,19 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 </resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-gl/strings.xml b/java/com/android/voicemail/impl/configui/res/values-gl/strings.xml
index 826efd3..56d9f67 100644
--- a/java/com/android/voicemail/impl/configui/res/values-gl/strings.xml
+++ b/java/com/android/voicemail/impl/configui/res/values-gl/strings.xml
@@ -1,19 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 </resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-gu/strings.xml b/java/com/android/voicemail/impl/configui/res/values-gu/strings.xml
index 826efd3..56d9f67 100644
--- a/java/com/android/voicemail/impl/configui/res/values-gu/strings.xml
+++ b/java/com/android/voicemail/impl/configui/res/values-gu/strings.xml
@@ -1,19 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 </resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-hi/strings.xml b/java/com/android/voicemail/impl/configui/res/values-hi/strings.xml
index 826efd3..56d9f67 100644
--- a/java/com/android/voicemail/impl/configui/res/values-hi/strings.xml
+++ b/java/com/android/voicemail/impl/configui/res/values-hi/strings.xml
@@ -1,19 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 </resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-hr/strings.xml b/java/com/android/voicemail/impl/configui/res/values-hr/strings.xml
index 826efd3..56d9f67 100644
--- a/java/com/android/voicemail/impl/configui/res/values-hr/strings.xml
+++ b/java/com/android/voicemail/impl/configui/res/values-hr/strings.xml
@@ -1,19 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 </resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-hu/strings.xml b/java/com/android/voicemail/impl/configui/res/values-hu/strings.xml
index 826efd3..56d9f67 100644
--- a/java/com/android/voicemail/impl/configui/res/values-hu/strings.xml
+++ b/java/com/android/voicemail/impl/configui/res/values-hu/strings.xml
@@ -1,19 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 </resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-hy/strings.xml b/java/com/android/voicemail/impl/configui/res/values-hy/strings.xml
index 826efd3..56d9f67 100644
--- a/java/com/android/voicemail/impl/configui/res/values-hy/strings.xml
+++ b/java/com/android/voicemail/impl/configui/res/values-hy/strings.xml
@@ -1,19 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 </resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-in/strings.xml b/java/com/android/voicemail/impl/configui/res/values-in/strings.xml
index 826efd3..56d9f67 100644
--- a/java/com/android/voicemail/impl/configui/res/values-in/strings.xml
+++ b/java/com/android/voicemail/impl/configui/res/values-in/strings.xml
@@ -1,19 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 </resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-is/strings.xml b/java/com/android/voicemail/impl/configui/res/values-is/strings.xml
index 826efd3..56d9f67 100644
--- a/java/com/android/voicemail/impl/configui/res/values-is/strings.xml
+++ b/java/com/android/voicemail/impl/configui/res/values-is/strings.xml
@@ -1,19 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 </resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-it/strings.xml b/java/com/android/voicemail/impl/configui/res/values-it/strings.xml
index 826efd3..56d9f67 100644
--- a/java/com/android/voicemail/impl/configui/res/values-it/strings.xml
+++ b/java/com/android/voicemail/impl/configui/res/values-it/strings.xml
@@ -1,19 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 </resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-iw/strings.xml b/java/com/android/voicemail/impl/configui/res/values-iw/strings.xml
index 826efd3..56d9f67 100644
--- a/java/com/android/voicemail/impl/configui/res/values-iw/strings.xml
+++ b/java/com/android/voicemail/impl/configui/res/values-iw/strings.xml
@@ -1,19 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 </resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-ja/strings.xml b/java/com/android/voicemail/impl/configui/res/values-ja/strings.xml
index 826efd3..56d9f67 100644
--- a/java/com/android/voicemail/impl/configui/res/values-ja/strings.xml
+++ b/java/com/android/voicemail/impl/configui/res/values-ja/strings.xml
@@ -1,19 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 </resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-ka/strings.xml b/java/com/android/voicemail/impl/configui/res/values-ka/strings.xml
index 826efd3..56d9f67 100644
--- a/java/com/android/voicemail/impl/configui/res/values-ka/strings.xml
+++ b/java/com/android/voicemail/impl/configui/res/values-ka/strings.xml
@@ -1,19 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 </resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-kk/strings.xml b/java/com/android/voicemail/impl/configui/res/values-kk/strings.xml
index 826efd3..56d9f67 100644
--- a/java/com/android/voicemail/impl/configui/res/values-kk/strings.xml
+++ b/java/com/android/voicemail/impl/configui/res/values-kk/strings.xml
@@ -1,19 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 </resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-km/strings.xml b/java/com/android/voicemail/impl/configui/res/values-km/strings.xml
index 826efd3..56d9f67 100644
--- a/java/com/android/voicemail/impl/configui/res/values-km/strings.xml
+++ b/java/com/android/voicemail/impl/configui/res/values-km/strings.xml
@@ -1,19 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 </resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-kn/strings.xml b/java/com/android/voicemail/impl/configui/res/values-kn/strings.xml
index 826efd3..56d9f67 100644
--- a/java/com/android/voicemail/impl/configui/res/values-kn/strings.xml
+++ b/java/com/android/voicemail/impl/configui/res/values-kn/strings.xml
@@ -1,19 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 </resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-ko/strings.xml b/java/com/android/voicemail/impl/configui/res/values-ko/strings.xml
index 826efd3..56d9f67 100644
--- a/java/com/android/voicemail/impl/configui/res/values-ko/strings.xml
+++ b/java/com/android/voicemail/impl/configui/res/values-ko/strings.xml
@@ -1,19 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 </resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-ky/strings.xml b/java/com/android/voicemail/impl/configui/res/values-ky/strings.xml
index 826efd3..56d9f67 100644
--- a/java/com/android/voicemail/impl/configui/res/values-ky/strings.xml
+++ b/java/com/android/voicemail/impl/configui/res/values-ky/strings.xml
@@ -1,19 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 </resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-lo/strings.xml b/java/com/android/voicemail/impl/configui/res/values-lo/strings.xml
index 826efd3..56d9f67 100644
--- a/java/com/android/voicemail/impl/configui/res/values-lo/strings.xml
+++ b/java/com/android/voicemail/impl/configui/res/values-lo/strings.xml
@@ -1,19 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 </resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-lt/strings.xml b/java/com/android/voicemail/impl/configui/res/values-lt/strings.xml
index 826efd3..56d9f67 100644
--- a/java/com/android/voicemail/impl/configui/res/values-lt/strings.xml
+++ b/java/com/android/voicemail/impl/configui/res/values-lt/strings.xml
@@ -1,19 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 </resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-lv/strings.xml b/java/com/android/voicemail/impl/configui/res/values-lv/strings.xml
index 826efd3..56d9f67 100644
--- a/java/com/android/voicemail/impl/configui/res/values-lv/strings.xml
+++ b/java/com/android/voicemail/impl/configui/res/values-lv/strings.xml
@@ -1,19 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 </resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-mk/strings.xml b/java/com/android/voicemail/impl/configui/res/values-mk/strings.xml
index 826efd3..56d9f67 100644
--- a/java/com/android/voicemail/impl/configui/res/values-mk/strings.xml
+++ b/java/com/android/voicemail/impl/configui/res/values-mk/strings.xml
@@ -1,19 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 </resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-ml/strings.xml b/java/com/android/voicemail/impl/configui/res/values-ml/strings.xml
index 826efd3..56d9f67 100644
--- a/java/com/android/voicemail/impl/configui/res/values-ml/strings.xml
+++ b/java/com/android/voicemail/impl/configui/res/values-ml/strings.xml
@@ -1,19 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 </resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-mn/strings.xml b/java/com/android/voicemail/impl/configui/res/values-mn/strings.xml
index 826efd3..56d9f67 100644
--- a/java/com/android/voicemail/impl/configui/res/values-mn/strings.xml
+++ b/java/com/android/voicemail/impl/configui/res/values-mn/strings.xml
@@ -1,19 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 </resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-mr/strings.xml b/java/com/android/voicemail/impl/configui/res/values-mr/strings.xml
index 826efd3..56d9f67 100644
--- a/java/com/android/voicemail/impl/configui/res/values-mr/strings.xml
+++ b/java/com/android/voicemail/impl/configui/res/values-mr/strings.xml
@@ -1,19 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 </resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-ms/strings.xml b/java/com/android/voicemail/impl/configui/res/values-ms/strings.xml
index 826efd3..56d9f67 100644
--- a/java/com/android/voicemail/impl/configui/res/values-ms/strings.xml
+++ b/java/com/android/voicemail/impl/configui/res/values-ms/strings.xml
@@ -1,19 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 </resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-my/strings.xml b/java/com/android/voicemail/impl/configui/res/values-my/strings.xml
index 826efd3..56d9f67 100644
--- a/java/com/android/voicemail/impl/configui/res/values-my/strings.xml
+++ b/java/com/android/voicemail/impl/configui/res/values-my/strings.xml
@@ -1,19 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 </resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-nb/strings.xml b/java/com/android/voicemail/impl/configui/res/values-nb/strings.xml
index 826efd3..56d9f67 100644
--- a/java/com/android/voicemail/impl/configui/res/values-nb/strings.xml
+++ b/java/com/android/voicemail/impl/configui/res/values-nb/strings.xml
@@ -1,19 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 </resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-ne/strings.xml b/java/com/android/voicemail/impl/configui/res/values-ne/strings.xml
index 826efd3..56d9f67 100644
--- a/java/com/android/voicemail/impl/configui/res/values-ne/strings.xml
+++ b/java/com/android/voicemail/impl/configui/res/values-ne/strings.xml
@@ -1,19 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 </resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-nl/strings.xml b/java/com/android/voicemail/impl/configui/res/values-nl/strings.xml
index 826efd3..56d9f67 100644
--- a/java/com/android/voicemail/impl/configui/res/values-nl/strings.xml
+++ b/java/com/android/voicemail/impl/configui/res/values-nl/strings.xml
@@ -1,19 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 </resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-no/strings.xml b/java/com/android/voicemail/impl/configui/res/values-no/strings.xml
index 826efd3..56d9f67 100644
--- a/java/com/android/voicemail/impl/configui/res/values-no/strings.xml
+++ b/java/com/android/voicemail/impl/configui/res/values-no/strings.xml
@@ -1,19 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 </resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-pa/strings.xml b/java/com/android/voicemail/impl/configui/res/values-pa/strings.xml
index 826efd3..56d9f67 100644
--- a/java/com/android/voicemail/impl/configui/res/values-pa/strings.xml
+++ b/java/com/android/voicemail/impl/configui/res/values-pa/strings.xml
@@ -1,19 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 </resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-pl/strings.xml b/java/com/android/voicemail/impl/configui/res/values-pl/strings.xml
index 826efd3..56d9f67 100644
--- a/java/com/android/voicemail/impl/configui/res/values-pl/strings.xml
+++ b/java/com/android/voicemail/impl/configui/res/values-pl/strings.xml
@@ -1,19 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 </resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-pt-rBR/strings.xml b/java/com/android/voicemail/impl/configui/res/values-pt-rBR/strings.xml
index 826efd3..56d9f67 100644
--- a/java/com/android/voicemail/impl/configui/res/values-pt-rBR/strings.xml
+++ b/java/com/android/voicemail/impl/configui/res/values-pt-rBR/strings.xml
@@ -1,19 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 </resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-pt-rPT/strings.xml b/java/com/android/voicemail/impl/configui/res/values-pt-rPT/strings.xml
index 826efd3..56d9f67 100644
--- a/java/com/android/voicemail/impl/configui/res/values-pt-rPT/strings.xml
+++ b/java/com/android/voicemail/impl/configui/res/values-pt-rPT/strings.xml
@@ -1,19 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 </resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-pt/strings.xml b/java/com/android/voicemail/impl/configui/res/values-pt/strings.xml
index 826efd3..56d9f67 100644
--- a/java/com/android/voicemail/impl/configui/res/values-pt/strings.xml
+++ b/java/com/android/voicemail/impl/configui/res/values-pt/strings.xml
@@ -1,19 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 </resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-ro/strings.xml b/java/com/android/voicemail/impl/configui/res/values-ro/strings.xml
index 826efd3..56d9f67 100644
--- a/java/com/android/voicemail/impl/configui/res/values-ro/strings.xml
+++ b/java/com/android/voicemail/impl/configui/res/values-ro/strings.xml
@@ -1,19 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 </resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-ru/strings.xml b/java/com/android/voicemail/impl/configui/res/values-ru/strings.xml
index 826efd3..56d9f67 100644
--- a/java/com/android/voicemail/impl/configui/res/values-ru/strings.xml
+++ b/java/com/android/voicemail/impl/configui/res/values-ru/strings.xml
@@ -1,19 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 </resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-si/strings.xml b/java/com/android/voicemail/impl/configui/res/values-si/strings.xml
index 826efd3..56d9f67 100644
--- a/java/com/android/voicemail/impl/configui/res/values-si/strings.xml
+++ b/java/com/android/voicemail/impl/configui/res/values-si/strings.xml
@@ -1,19 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 </resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-sk/strings.xml b/java/com/android/voicemail/impl/configui/res/values-sk/strings.xml
index 826efd3..56d9f67 100644
--- a/java/com/android/voicemail/impl/configui/res/values-sk/strings.xml
+++ b/java/com/android/voicemail/impl/configui/res/values-sk/strings.xml
@@ -1,19 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 </resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-sl/strings.xml b/java/com/android/voicemail/impl/configui/res/values-sl/strings.xml
index 826efd3..56d9f67 100644
--- a/java/com/android/voicemail/impl/configui/res/values-sl/strings.xml
+++ b/java/com/android/voicemail/impl/configui/res/values-sl/strings.xml
@@ -1,19 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 </resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-sq/strings.xml b/java/com/android/voicemail/impl/configui/res/values-sq/strings.xml
index 826efd3..56d9f67 100644
--- a/java/com/android/voicemail/impl/configui/res/values-sq/strings.xml
+++ b/java/com/android/voicemail/impl/configui/res/values-sq/strings.xml
@@ -1,19 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 </resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-sr/strings.xml b/java/com/android/voicemail/impl/configui/res/values-sr/strings.xml
index 826efd3..56d9f67 100644
--- a/java/com/android/voicemail/impl/configui/res/values-sr/strings.xml
+++ b/java/com/android/voicemail/impl/configui/res/values-sr/strings.xml
@@ -1,19 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 </resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-sv/strings.xml b/java/com/android/voicemail/impl/configui/res/values-sv/strings.xml
index 826efd3..56d9f67 100644
--- a/java/com/android/voicemail/impl/configui/res/values-sv/strings.xml
+++ b/java/com/android/voicemail/impl/configui/res/values-sv/strings.xml
@@ -1,19 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 </resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-sw/strings.xml b/java/com/android/voicemail/impl/configui/res/values-sw/strings.xml
index 826efd3..56d9f67 100644
--- a/java/com/android/voicemail/impl/configui/res/values-sw/strings.xml
+++ b/java/com/android/voicemail/impl/configui/res/values-sw/strings.xml
@@ -1,19 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 </resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-ta/strings.xml b/java/com/android/voicemail/impl/configui/res/values-ta/strings.xml
index 826efd3..56d9f67 100644
--- a/java/com/android/voicemail/impl/configui/res/values-ta/strings.xml
+++ b/java/com/android/voicemail/impl/configui/res/values-ta/strings.xml
@@ -1,19 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 </resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-te/strings.xml b/java/com/android/voicemail/impl/configui/res/values-te/strings.xml
index 826efd3..56d9f67 100644
--- a/java/com/android/voicemail/impl/configui/res/values-te/strings.xml
+++ b/java/com/android/voicemail/impl/configui/res/values-te/strings.xml
@@ -1,19 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 </resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-th/strings.xml b/java/com/android/voicemail/impl/configui/res/values-th/strings.xml
index 826efd3..56d9f67 100644
--- a/java/com/android/voicemail/impl/configui/res/values-th/strings.xml
+++ b/java/com/android/voicemail/impl/configui/res/values-th/strings.xml
@@ -1,19 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 </resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-tl/strings.xml b/java/com/android/voicemail/impl/configui/res/values-tl/strings.xml
index 826efd3..56d9f67 100644
--- a/java/com/android/voicemail/impl/configui/res/values-tl/strings.xml
+++ b/java/com/android/voicemail/impl/configui/res/values-tl/strings.xml
@@ -1,19 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 </resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-tr/strings.xml b/java/com/android/voicemail/impl/configui/res/values-tr/strings.xml
index 826efd3..56d9f67 100644
--- a/java/com/android/voicemail/impl/configui/res/values-tr/strings.xml
+++ b/java/com/android/voicemail/impl/configui/res/values-tr/strings.xml
@@ -1,19 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 </resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-uk/strings.xml b/java/com/android/voicemail/impl/configui/res/values-uk/strings.xml
index 826efd3..56d9f67 100644
--- a/java/com/android/voicemail/impl/configui/res/values-uk/strings.xml
+++ b/java/com/android/voicemail/impl/configui/res/values-uk/strings.xml
@@ -1,19 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 </resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-ur/strings.xml b/java/com/android/voicemail/impl/configui/res/values-ur/strings.xml
index 826efd3..56d9f67 100644
--- a/java/com/android/voicemail/impl/configui/res/values-ur/strings.xml
+++ b/java/com/android/voicemail/impl/configui/res/values-ur/strings.xml
@@ -1,19 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 </resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-uz/strings.xml b/java/com/android/voicemail/impl/configui/res/values-uz/strings.xml
index 826efd3..56d9f67 100644
--- a/java/com/android/voicemail/impl/configui/res/values-uz/strings.xml
+++ b/java/com/android/voicemail/impl/configui/res/values-uz/strings.xml
@@ -1,19 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 </resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-vi/strings.xml b/java/com/android/voicemail/impl/configui/res/values-vi/strings.xml
index 826efd3..56d9f67 100644
--- a/java/com/android/voicemail/impl/configui/res/values-vi/strings.xml
+++ b/java/com/android/voicemail/impl/configui/res/values-vi/strings.xml
@@ -1,19 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 </resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-zh-rCN/strings.xml b/java/com/android/voicemail/impl/configui/res/values-zh-rCN/strings.xml
index 826efd3..56d9f67 100644
--- a/java/com/android/voicemail/impl/configui/res/values-zh-rCN/strings.xml
+++ b/java/com/android/voicemail/impl/configui/res/values-zh-rCN/strings.xml
@@ -1,19 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 </resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-zh-rHK/strings.xml b/java/com/android/voicemail/impl/configui/res/values-zh-rHK/strings.xml
index 826efd3..56d9f67 100644
--- a/java/com/android/voicemail/impl/configui/res/values-zh-rHK/strings.xml
+++ b/java/com/android/voicemail/impl/configui/res/values-zh-rHK/strings.xml
@@ -1,19 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 </resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-zh-rTW/strings.xml b/java/com/android/voicemail/impl/configui/res/values-zh-rTW/strings.xml
index 826efd3..56d9f67 100644
--- a/java/com/android/voicemail/impl/configui/res/values-zh-rTW/strings.xml
+++ b/java/com/android/voicemail/impl/configui/res/values-zh-rTW/strings.xml
@@ -1,19 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 </resources>
diff --git a/java/com/android/voicemail/impl/configui/res/values-zu/strings.xml b/java/com/android/voicemail/impl/configui/res/values-zu/strings.xml
index 826efd3..56d9f67 100644
--- a/java/com/android/voicemail/impl/configui/res/values-zu/strings.xml
+++ b/java/com/android/voicemail/impl/configui/res/values-zu/strings.xml
@@ -1,19 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 </resources>
diff --git a/java/com/android/voicemail/impl/imap/ImapHelper.java b/java/com/android/voicemail/impl/imap/ImapHelper.java
index 1f04edb..02453f7 100644
--- a/java/com/android/voicemail/impl/imap/ImapHelper.java
+++ b/java/com/android/voicemail/impl/imap/ImapHelper.java
@@ -571,7 +571,7 @@
 
         if (bodyPartMimeType.startsWith("audio/")) {
           messageStructureWrapper.messageStructure = message;
-        } else if (bodyPartMimeType.startsWith("text/")) {
+        } else if (!config.ignoreTranscription() && bodyPartMimeType.startsWith("text/")) {
           messageStructureWrapper.transcriptionBodyPart = bodyPart;
         } else {
           VvmLog.v(TAG, "Unknown bodyPart MIME: " + bodyPartMimeType);
diff --git a/java/com/android/voicemail/impl/mail/store/imap/DigestMd5Utils.java b/java/com/android/voicemail/impl/mail/store/imap/DigestMd5Utils.java
index aa28868..6607160 100644
--- a/java/com/android/voicemail/impl/mail/store/imap/DigestMd5Utils.java
+++ b/java/com/android/voicemail/impl/mail/store/imap/DigestMd5Utils.java
@@ -32,7 +32,7 @@
 import java.security.SecureRandom;
 import java.util.Map;
 
-@SuppressWarnings("AndroidApiChecker") // Map.getOrDefault() is java8
+/** Utilities for DIGEST-MD5. */
 @TargetApi(VERSION_CODES.O)
 public class DigestMd5Utils {
 
diff --git a/java/com/android/voicemail/impl/protocol/Vvm3Subscriber.java b/java/com/android/voicemail/impl/protocol/Vvm3Subscriber.java
index ce5094f..41598e0 100644
--- a/java/com/android/voicemail/impl/protocol/Vvm3Subscriber.java
+++ b/java/com/android/voicemail/impl/protocol/Vvm3Subscriber.java
@@ -31,7 +31,7 @@
 import android.text.Spanned;
 import android.text.style.URLSpan;
 import android.util.ArrayMap;
-import com.android.dialer.configprovider.ConfigProviderBindings;
+import com.android.dialer.configprovider.ConfigProviderComponent;
 import com.android.voicemail.impl.ActivationTask;
 import com.android.voicemail.impl.Assert;
 import com.android.voicemail.impl.OmtpEvents;
@@ -89,7 +89,7 @@
   private static final String OPERATION_GET_SPG_URL = "retrieveSPGURL";
   private static final String SPG_URL_TAG = "spgurl";
   private static final String TRANSACTION_ID_TAG = "transactionid";
-  //language=XML
+  // language=XML
   private static final String VMG_XML_REQUEST_FORMAT =
       ""
           + "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
@@ -159,6 +159,7 @@
   }
 
   @WorkerThread
+  @SuppressWarnings("missingPermission")
   public Vvm3Subscriber(
       ActivationTask task,
       PhoneAccountHandle handle,
@@ -175,11 +176,23 @@
     // Assuming getLine1Number() will work with VVM3. For unprovisioned users the IMAP username
     // is not included in the status SMS, thus no other way to get the current phone number.
     number =
-        this.helper
-            .getContext()
-            .getSystemService(TelephonyManager.class)
-            .createForPhoneAccountHandle(this.handle)
-            .getLine1Number();
+        stripInternational(
+            this.helper
+                .getContext()
+                .getSystemService(TelephonyManager.class)
+                .createForPhoneAccountHandle(this.handle)
+                .getLine1Number());
+  }
+
+  /**
+   * Self provisioning gateway expects 10 digit national format, but {@link
+   * TelephonyManager#getLine1Number()} might return e164 with "+1" at front.
+   */
+  private static String stripInternational(String number) {
+    if (number.startsWith("+1")) {
+      number = number.substring(2);
+    }
+    return number;
   }
 
   @WorkerThread
@@ -210,6 +223,7 @@
       clickSubscribeLink(subscribeLink);
     } catch (ProvisioningException e) {
       VvmLog.e(TAG, e.toString());
+      helper.handleEvent(status, OmtpEvents.CONFIG_SERVICE_NOT_AVAILABLE);
       task.fail();
     }
   }
@@ -312,7 +326,8 @@
   @VisibleForTesting
   static List<Pattern> getSubscribeLinkPatterns(Context context) {
     String patternsJsonString =
-        ConfigProviderBindings.get(context)
+        ConfigProviderComponent.get(context)
+            .getConfigProvider()
             .getString(
                 VVM3_SUBSCRIBE_LINK_PATTERNS_JSON_ARRAY, VVM3_SUBSCRIBE_LINK_DEFAULT_PATTERNS);
     List<Pattern> patterns = new ArrayList<>();
diff --git a/java/com/android/voicemail/impl/res/values-af/strings.xml b/java/com/android/voicemail/impl/res/values-af/strings.xml
index 0ed54fa..66d839f 100644
--- a/java/com/android/voicemail/impl/res/values-af/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-af/strings.xml
@@ -1,49 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_settings_with_label" msgid="563926539137546586">"Stemboodskap (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
-    <string name="voicemail_settings_title" msgid="6685263321755930738">"Stemboodskap"</string>
-    <string name="voicemail_notifications_preference_title" msgid="3490553930230492405">"Kennisgewings"</string>
-    <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"Gevorderde instellings"</string>
-    <string name="voicemail_visual_voicemail_switch_title" msgid="3158454817165714998">"Visuele stemboodskap"</string>
-    <string name="voicemail_visual_voicemail_auto_archive_switch_title" msgid="7120443850486401455">"Ekstra rugsteun en berging"</string>
-    <string name="voicemail_set_pin_preference_title" msgid="1034691230818233684">"Stel PIN"</string>
-    <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"Verander PIN"</string>
-    <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"Visuele stemboodskap moet geaktiveer wees om PIN te verander"</string>
-    <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"Visuele stemboodskap is nog nie geaktiveer nie, probeer asseblief later weer"</string>
-    <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"Wag asseblief."</string>
-    <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"Die nuwe PIN is te kort."</string>
-    <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"Die nuwe PIN is te lank."</string>
-    <string name="vm_change_pin_error_too_weak" msgid="5865254034338293113">"Die nuwe PIN is te swak. \'n Sterk wagwoord moenie daaropvolgend wees of syfers bevat wat herhaal nie."</string>
-    <string name="vm_change_pin_error_mismatch" msgid="3682667971009913553">"Die ou PIN pas nie."</string>
-    <string name="vm_change_pin_error_invalid" msgid="4317397281749196545">"Die nuwe PIN bevat ongeldige karakters."</string>
-    <string name="vm_change_pin_error_system_error" msgid="5972056058776852411">"Kan nie PIN verander nie"</string>
-    <string name="vvm_unsupported_message_format" msgid="2746490691815392491">"Ongesteunde soort boodskap; bel <xliff:g id="NUMBER">%s</xliff:g> om te luister."</string>
-    <string name="change_pin_title" msgid="1363830310845461697">"Verander stemboodskap-PIN"</string>
-    <string name="change_pin_continue_label" msgid="9184635195162827832">"Gaan voort"</string>
-    <string name="change_pin_cancel_label" msgid="7258783861113501519">"Kanselleer"</string>
-    <string name="change_pin_ok_label" msgid="4527043915415428629">"OK"</string>
-    <string name="change_pin_enter_old_pin_header" msgid="1375728090965833028">"Bevestig jou ou PIN"</string>
-    <string name="change_pin_enter_old_pin_hint" msgid="1654231195871094175">"Voer jou stemboodskap-PIN in om voort te gaan."</string>
-    <string name="change_pin_enter_new_pin_header" msgid="7142620840890909719">"Stel \'n nuwe PIN op"</string>
-    <string name="change_pin_enter_new_pin_hint" msgid="1289662932759932217">"PIN moet <xliff:g id="MIN">%1$d</xliff:g>-<xliff:g id="MAX">%2$d</xliff:g> syfers wees."</string>
-    <string name="change_pin_confirm_pin_header" msgid="7282604363655862136">"Bevestig jou PIN"</string>
-    <string name="change_pin_confirm_pins_dont_match" msgid="8626742552205369433">"PIN\'s stem nie ooreen nie"</string>
-    <string name="change_pin_succeeded" msgid="6869403202124894671">"Stemboodskap-PIN is opgedateer"</string>
-    <string name="change_pin_system_error" msgid="5762853042379833829">"Kan nie PIN stel nie"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="vvm_unsupported_message_format">Ongesteunde soort boodskap; bel %s om te luister.</string>
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-am/strings.xml b/java/com/android/voicemail/impl/res/values-am/strings.xml
index 39b21b4..f9d450b 100644
--- a/java/com/android/voicemail/impl/res/values-am/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-am/strings.xml
@@ -1,49 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_settings_with_label" msgid="563926539137546586">"የድምፅ መልዕክት (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
-    <string name="voicemail_settings_title" msgid="6685263321755930738">"የድምፅ መልዕክት"</string>
-    <string name="voicemail_notifications_preference_title" msgid="3490553930230492405">"ማሳወቂያዎች"</string>
-    <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"የላቁ ቅንብሮች"</string>
-    <string name="voicemail_visual_voicemail_switch_title" msgid="3158454817165714998">"ምስላዊ የድምፅ መልዕክት"</string>
-    <string name="voicemail_visual_voicemail_auto_archive_switch_title" msgid="7120443850486401455">"ተጨማሪ ምትኬ እና ማከማቻ"</string>
-    <string name="voicemail_set_pin_preference_title" msgid="1034691230818233684">"ፒን ያዘጋጁ"</string>
-    <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"ፒን ይቀይሩ"</string>
-    <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"ፒን ለመቀየር የእይታ የድምጽ መልዕክት መንቃት አለበት"</string>
-    <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"የእይታ የድምጽ መልዕክት ገና ገቢር አልሆነም፣ እባክዎ ቆይተው እንደገና ይሞክሩ"</string>
-    <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"እባክዎ ይጠብቁ።"</string>
-    <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"አዲሱ ፒን በጣም አጭር ነው።"</string>
-    <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"አዲሱ ፒን በጣም ረጅም ነው።"</string>
-    <string name="vm_change_pin_error_too_weak" msgid="5865254034338293113">"አዲሱ ፒን በጣም ደካማ ነው። ጠንካራ የይለፍ ቃል ተከታታይ ቅጥልጥል ወይም ተደጋጋሚ አኃዞች ሊኖሩት አይገባም።"</string>
-    <string name="vm_change_pin_error_mismatch" msgid="3682667971009913553">"የድሮው ፒን አይዛመድም።"</string>
-    <string name="vm_change_pin_error_invalid" msgid="4317397281749196545">"አዲሱ ፒን ልክ ያልሆኑ ቁምፊዎችን ይዟል።"</string>
-    <string name="vm_change_pin_error_system_error" msgid="5972056058776852411">"ፒን መቀየር አልተቻለም።"</string>
-    <string name="vvm_unsupported_message_format" msgid="2746490691815392491">"የማይደገፍ የመልዕክት አይነት፤ ለማዳመጥ ወደ <xliff:g id="NUMBER">%s</xliff:g> ይደውሉ።"</string>
-    <string name="change_pin_title" msgid="1363830310845461697">"የድምፅ መልዕክት ፒን ለውጥ"</string>
-    <string name="change_pin_continue_label" msgid="9184635195162827832">"ቀጥል"</string>
-    <string name="change_pin_cancel_label" msgid="7258783861113501519">"ይቅር"</string>
-    <string name="change_pin_ok_label" msgid="4527043915415428629">"እሺ"</string>
-    <string name="change_pin_enter_old_pin_header" msgid="1375728090965833028">"የድሮውን ፒንዎን ያረጋግጡ"</string>
-    <string name="change_pin_enter_old_pin_hint" msgid="1654231195871094175">"ለመቀጠል የድምፅ መልዕክት ፒንዎን ያስገቡ።"</string>
-    <string name="change_pin_enter_new_pin_header" msgid="7142620840890909719">"አዲስ ፒን ያዘጋጁ"</string>
-    <string name="change_pin_enter_new_pin_hint" msgid="1289662932759932217">"ፒን ከ <xliff:g id="MIN">%1$d</xliff:g>-<xliff:g id="MAX">%2$d</xliff:g> አኃዞች መሆን አለበት።"</string>
-    <string name="change_pin_confirm_pin_header" msgid="7282604363655862136">"የእርስዎን ፒን ያረጋግጡ"</string>
-    <string name="change_pin_confirm_pins_dont_match" msgid="8626742552205369433">"ፒኖች አይዛመዱም"</string>
-    <string name="change_pin_succeeded" msgid="6869403202124894671">"የድምፅ መልዕክት ፒን ዘምኗል"</string>
-    <string name="change_pin_system_error" msgid="5762853042379833829">"ፒን ማዘጋጀት አልተቻለም"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="vvm_unsupported_message_format">የማይደገፍ የመልዕክት አይነት፤ ለማዳመጥ ወደ %s ይደውሉ።</string>
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-ar/strings.xml b/java/com/android/voicemail/impl/res/values-ar/strings.xml
index 4cdba4d..ba76308 100644
--- a/java/com/android/voicemail/impl/res/values-ar/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-ar/strings.xml
@@ -1,49 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_settings_with_label" msgid="563926539137546586">"البريد الصوتي (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
-    <string name="voicemail_settings_title" msgid="6685263321755930738">"البريد الصوتي"</string>
-    <string name="voicemail_notifications_preference_title" msgid="3490553930230492405">"الإشعارات"</string>
-    <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"الإعدادات المتقدمة"</string>
-    <string name="voicemail_visual_voicemail_switch_title" msgid="3158454817165714998">"بريد صوتي مرئي"</string>
-    <string name="voicemail_visual_voicemail_auto_archive_switch_title" msgid="7120443850486401455">"نسخة احتياطية وسعة تخزين إضافية"</string>
-    <string name="voicemail_set_pin_preference_title" msgid="1034691230818233684">"تعيين رقم التعريف الشخصي"</string>
-    <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"تغيير رقم التعريف الشخصي"</string>
-    <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"ينبغي تشغيل البريد الصوتي المرئي لتغيير رقم التعريف الشخصي"</string>
-    <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"لم يتم تنشيط البريد الصوتي المرئي بعد، يُرجى المحاولة مرة أخرى لاحقًا"</string>
-    <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"يُرجى الانتظار."</string>
-    <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"رقم التعريف الشخصي الجديد قصير جدًا."</string>
-    <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"رقم التعريف الشخصي الجديد طويل جدًا."</string>
-    <string name="vm_change_pin_error_too_weak" msgid="5865254034338293113">"رقم التعريف الشخصي الجديد ضعيف جدًا. لا ينبغي أن تكون كلمة المرور القوية عبارة عن تسلسل متتالٍ أو أرقام متكررة."</string>
-    <string name="vm_change_pin_error_mismatch" msgid="3682667971009913553">"رقم التعريف الشخصي القديم غير مُطابِق."</string>
-    <string name="vm_change_pin_error_invalid" msgid="4317397281749196545">"رقم التعريف الشخصي الجديد يحتوي على أحرف غير صالحة."</string>
-    <string name="vm_change_pin_error_system_error" msgid="5972056058776852411">"غير قادر على تغيير رقم التعريف الشخصي"</string>
-    <string name="vvm_unsupported_message_format" msgid="2746490691815392491">"نوع الرسالة غير معتمد، اتصل على <xliff:g id="NUMBER">%s</xliff:g> لسماعها."</string>
-    <string name="change_pin_title" msgid="1363830310845461697">"تغيير رقم التعريف الشخصي للبريد الصوتي"</string>
-    <string name="change_pin_continue_label" msgid="9184635195162827832">"متابعة"</string>
-    <string name="change_pin_cancel_label" msgid="7258783861113501519">"إلغاء"</string>
-    <string name="change_pin_ok_label" msgid="4527043915415428629">"موافق"</string>
-    <string name="change_pin_enter_old_pin_header" msgid="1375728090965833028">"تأكيد رقم التعريف الشخصي القديم"</string>
-    <string name="change_pin_enter_old_pin_hint" msgid="1654231195871094175">"أدخل رقم التعريف الشخصي لبريدك الصوتي للمتابعة."</string>
-    <string name="change_pin_enter_new_pin_header" msgid="7142620840890909719">"تعيين رقم تعريف شخصي جديد"</string>
-    <string name="change_pin_enter_new_pin_hint" msgid="1289662932759932217">"ينبغي لرقم التعريف الشخصي أن يتكون من <xliff:g id="MIN">%1$d</xliff:g>-<xliff:g id="MAX">%2$d</xliff:g> أرقام."</string>
-    <string name="change_pin_confirm_pin_header" msgid="7282604363655862136">"تأكيد رقم التعريف الشخصي"</string>
-    <string name="change_pin_confirm_pins_dont_match" msgid="8626742552205369433">"أرقام التعريف الشخصي غير متطابقة"</string>
-    <string name="change_pin_succeeded" msgid="6869403202124894671">"تمّ تحديث رقم التعريف الشخصي للبريد الصوتي"</string>
-    <string name="change_pin_system_error" msgid="5762853042379833829">"يتعذر تعيين رقم التعريف الشخصي"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="vvm_unsupported_message_format">نوع الرسالة غير معتمد، اتصل على %s لسماعها.</string>
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-az/strings.xml b/java/com/android/voicemail/impl/res/values-az/strings.xml
index f245730..23467fe 100644
--- a/java/com/android/voicemail/impl/res/values-az/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-az/strings.xml
@@ -1,49 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_settings_with_label" msgid="563926539137546586">"Səsli e-poçt (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
-    <string name="voicemail_settings_title" msgid="6685263321755930738">"Səsli e-poçt"</string>
-    <string name="voicemail_notifications_preference_title" msgid="3490553930230492405">"Bildirişlər"</string>
-    <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"Qabaqcıl Ayarlar"</string>
-    <string name="voicemail_visual_voicemail_switch_title" msgid="3158454817165714998">"Görünən Səsli e-poçt"</string>
-    <string name="voicemail_visual_voicemail_auto_archive_switch_title" msgid="7120443850486401455">"Əlavə yedəkləmə və yaddaş"</string>
-    <string name="voicemail_set_pin_preference_title" msgid="1034691230818233684">"PIN ayarlayın"</string>
-    <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"PIN-i dəyişin"</string>
-    <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"PIN-i dəyişmək üçün görünən səsli e-poçt aktiv olmalıdır"</string>
-    <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"Görünən səsli e-poçt hələ aktiv edilməyib, daha sonra yenidən cəhd edin"</string>
-    <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"Gözləyin."</string>
-    <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"Yeni PIN çox qısadır."</string>
-    <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"Yeni PIN çox uzundur."</string>
-    <string name="vm_change_pin_error_too_weak" msgid="5865254034338293113">"Yeni PIN çox zəifdir. Güclü parol ardıcıllıqdan və ya təkrarlanan rəqəmlərdən ibarət olmamalıdır."</string>
-    <string name="vm_change_pin_error_mismatch" msgid="3682667971009913553">"Köhnə PIN uyğun gəlmir."</string>
-    <string name="vm_change_pin_error_invalid" msgid="4317397281749196545">"Yeni PIN yanlış simvollardan ibarətdir."</string>
-    <string name="vm_change_pin_error_system_error" msgid="5972056058776852411">"PIN-i dəyişmək mümkün olmadı"</string>
-    <string name="vvm_unsupported_message_format" msgid="2746490691815392491">"Dəstəklənməyən mesaj növü, qulaq asmaq üçün <xliff:g id="NUMBER">%s</xliff:g> nömrəsinə zəng edin."</string>
-    <string name="change_pin_title" msgid="1363830310845461697">"Səsli e-poçtun PIN-ni dəyişin"</string>
-    <string name="change_pin_continue_label" msgid="9184635195162827832">"Davam edin"</string>
-    <string name="change_pin_cancel_label" msgid="7258783861113501519">"Ləğv edin"</string>
-    <string name="change_pin_ok_label" msgid="4527043915415428629">"Ok"</string>
-    <string name="change_pin_enter_old_pin_header" msgid="1375728090965833028">"Köhnə PIN-i təsdiq edin"</string>
-    <string name="change_pin_enter_old_pin_hint" msgid="1654231195871094175">"Davam etmək üçün səsli e-poçtun PIN-ni daxil edin."</string>
-    <string name="change_pin_enter_new_pin_header" msgid="7142620840890909719">"Yeni PIN ayarlayın"</string>
-    <string name="change_pin_enter_new_pin_hint" msgid="1289662932759932217">"PIN <xliff:g id="MIN">%1$d</xliff:g>-<xliff:g id="MAX">%2$d</xliff:g> rəqəm olmalıdır."</string>
-    <string name="change_pin_confirm_pin_header" msgid="7282604363655862136">"PIN-i təsdiq edin"</string>
-    <string name="change_pin_confirm_pins_dont_match" msgid="8626742552205369433">"PIN-lər üst-üstə düşmür"</string>
-    <string name="change_pin_succeeded" msgid="6869403202124894671">"Səsli e-poçtun PIN-i yeniləndi"</string>
-    <string name="change_pin_system_error" msgid="5762853042379833829">"PIN ayarlamaq olmur"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="vvm_unsupported_message_format">Dəstəklənməyən mesaj növü, qulaq asmaq üçün %s nömrəsinə zəng edin.</string>
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-b+sr+Latn/strings.xml b/java/com/android/voicemail/impl/res/values-b+sr+Latn/strings.xml
index 7c12c9e..a846b31 100644
--- a/java/com/android/voicemail/impl/res/values-b+sr+Latn/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-b+sr+Latn/strings.xml
@@ -1,49 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_settings_with_label" msgid="563926539137546586">"Govorna pošta (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
-    <string name="voicemail_settings_title" msgid="6685263321755930738">"Govorna pošta"</string>
-    <string name="voicemail_notifications_preference_title" msgid="3490553930230492405">"Obaveštenja"</string>
-    <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"Napredna podešavanja"</string>
-    <string name="voicemail_visual_voicemail_switch_title" msgid="3158454817165714998">"Vizuelna govorna pošta"</string>
-    <string name="voicemail_visual_voicemail_auto_archive_switch_title" msgid="7120443850486401455">"Dodatne rezervne kopije i prostor"</string>
-    <string name="voicemail_set_pin_preference_title" msgid="1034691230818233684">"Podesite PIN"</string>
-    <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"Promenite PIN"</string>
-    <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"Morate da omogućite vizuelnu govornu poštu da biste promenili PIN"</string>
-    <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"Vizuelna govorna pošta još uvek nije aktivirana, probajte ponovo kasnije"</string>
-    <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"Sačekajte."</string>
-    <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"Novi PIN je prekratak."</string>
-    <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"Novi PIN je predugačak."</string>
-    <string name="vm_change_pin_error_too_weak" msgid="5865254034338293113">"Novi PIN je preslab. Jaka lozinka ne treba da sadrži uzastopni niz ni ponovljene cifre."</string>
-    <string name="vm_change_pin_error_mismatch" msgid="3682667971009913553">"Stari PIN se ne podudara."</string>
-    <string name="vm_change_pin_error_invalid" msgid="4317397281749196545">"Novi PIN sadrži nevažeće znakove."</string>
-    <string name="vm_change_pin_error_system_error" msgid="5972056058776852411">"Promena PIN-a nije uspela"</string>
-    <string name="vvm_unsupported_message_format" msgid="2746490691815392491">"Nepodržani tip poruke. Pozovite <xliff:g id="NUMBER">%s</xliff:g> da biste je preslušali."</string>
-    <string name="change_pin_title" msgid="1363830310845461697">"Promenite PIN kôd govorne pošte"</string>
-    <string name="change_pin_continue_label" msgid="9184635195162827832">"Nastavi"</string>
-    <string name="change_pin_cancel_label" msgid="7258783861113501519">"Otkaži"</string>
-    <string name="change_pin_ok_label" msgid="4527043915415428629">"Potvrdi"</string>
-    <string name="change_pin_enter_old_pin_header" msgid="1375728090965833028">"Potvrdite stari PIN"</string>
-    <string name="change_pin_enter_old_pin_hint" msgid="1654231195871094175">"Unesite PIN kôd govorne pošte da biste nastavili."</string>
-    <string name="change_pin_enter_new_pin_header" msgid="7142620840890909719">"Podesite novi PIN"</string>
-    <string name="change_pin_enter_new_pin_hint" msgid="1289662932759932217">"Broj cifara koje PIN mora da sadrži: <xliff:g id="MIN">%1$d</xliff:g>–<xliff:g id="MAX">%2$d</xliff:g>."</string>
-    <string name="change_pin_confirm_pin_header" msgid="7282604363655862136">"Potvrdite PIN"</string>
-    <string name="change_pin_confirm_pins_dont_match" msgid="8626742552205369433">"PIN-ovi se ne podudaraju"</string>
-    <string name="change_pin_succeeded" msgid="6869403202124894671">"PIN kôd govorne pošte je ažuriran"</string>
-    <string name="change_pin_system_error" msgid="5762853042379833829">"Podešavanje PIN-a nije uspelo"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="vvm_unsupported_message_format">Nepodržani tip poruke. Pozovite %s da biste je preslušali.</string>
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-be/strings.xml b/java/com/android/voicemail/impl/res/values-be/strings.xml
index c88f8ab..d57b5c1 100644
--- a/java/com/android/voicemail/impl/res/values-be/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-be/strings.xml
@@ -1,49 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_settings_with_label" msgid="563926539137546586">"Галасавая пошта (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
-    <string name="voicemail_settings_title" msgid="6685263321755930738">"Галасавая пошта"</string>
-    <string name="voicemail_notifications_preference_title" msgid="3490553930230492405">"Апавяшчэнні"</string>
-    <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"Пашыраныя налады"</string>
-    <string name="voicemail_visual_voicemail_switch_title" msgid="3158454817165714998">"Візуальная галасавая пошта"</string>
-    <string name="voicemail_visual_voicemail_auto_archive_switch_title" msgid="7120443850486401455">"Дадатковае рэзервовае капір. і сховішча"</string>
-    <string name="voicemail_set_pin_preference_title" msgid="1034691230818233684">"Задаць PIN-код"</string>
-    <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"Змяніць PIN-код"</string>
-    <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"Трэба ўключыць візуальную галасавую пошту, каб змяніць PIN-код"</string>
-    <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"Візуальная галасавая пошта пакуль не актываваная. Паўтарыце спробу пазней"</string>
-    <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"Пачакайце."</string>
-    <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"Новы PIN-код занадта кароткі."</string>
-    <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"Новы PIN-код занадта доўгі."</string>
-    <string name="vm_change_pin_error_too_weak" msgid="5865254034338293113">"Новы PIN-код занадта слабы. Моцны пароль не павінен змяшчаць знакаў, што ідуць па чарзе, або лічбы, якія паўтараюцца."</string>
-    <string name="vm_change_pin_error_mismatch" msgid="3682667971009913553">"Стары PIN-код не падыходзіць."</string>
-    <string name="vm_change_pin_error_invalid" msgid="4317397281749196545">"Новы PIN-код змяшчае несапраўдныя сімвалы."</string>
-    <string name="vm_change_pin_error_system_error" msgid="5972056058776852411">"Немагчыма змяніць PIN-код"</string>
-    <string name="vvm_unsupported_message_format" msgid="2746490691815392491">"Гэты тып паведамлення не падтрымліваецца; каб праслухаць, патэлефануйце на <xliff:g id="NUMBER">%s</xliff:g>."</string>
-    <string name="change_pin_title" msgid="1363830310845461697">"Змяніць PIN-код галасавой пошты"</string>
-    <string name="change_pin_continue_label" msgid="9184635195162827832">"Працягнуць"</string>
-    <string name="change_pin_cancel_label" msgid="7258783861113501519">"Скасаваць"</string>
-    <string name="change_pin_ok_label" msgid="4527043915415428629">"ОК"</string>
-    <string name="change_pin_enter_old_pin_header" msgid="1375728090965833028">"Пацвердзіце свой стары PIN-код"</string>
-    <string name="change_pin_enter_old_pin_hint" msgid="1654231195871094175">"Каб працягнуць, увядзіце PIN-код галасавой пошты."</string>
-    <string name="change_pin_enter_new_pin_header" msgid="7142620840890909719">"Задайце новы PIN-код"</string>
-    <string name="change_pin_enter_new_pin_hint" msgid="1289662932759932217">"PIN-код павінен утрымліваць <xliff:g id="MIN">%1$d</xliff:g>-<xliff:g id="MAX">%2$d</xliff:g> лічбаў."</string>
-    <string name="change_pin_confirm_pin_header" msgid="7282604363655862136">"Пацвердзіце PIN-код"</string>
-    <string name="change_pin_confirm_pins_dont_match" msgid="8626742552205369433">"PIN-код не супадае"</string>
-    <string name="change_pin_succeeded" msgid="6869403202124894671">"PIN-код галасавой пошты абноўлены"</string>
-    <string name="change_pin_system_error" msgid="5762853042379833829">"Немагчыма прызначыць PIN-код"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="vvm_unsupported_message_format">Гэты тып паведамлення не падтрымліваецца; каб праслухаць, патэлефануйце на %s.</string>
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-bg/strings.xml b/java/com/android/voicemail/impl/res/values-bg/strings.xml
index 380efe2..79c58e2 100644
--- a/java/com/android/voicemail/impl/res/values-bg/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-bg/strings.xml
@@ -1,49 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_settings_with_label" msgid="563926539137546586">"Гласова поща (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
-    <string name="voicemail_settings_title" msgid="6685263321755930738">"Гласова поща"</string>
-    <string name="voicemail_notifications_preference_title" msgid="3490553930230492405">"Известия"</string>
-    <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"Разширени настройки"</string>
-    <string name="voicemail_visual_voicemail_switch_title" msgid="3158454817165714998">"Визуална гласова поща"</string>
-    <string name="voicemail_visual_voicemail_auto_archive_switch_title" msgid="7120443850486401455">"Допълнителни резервни копия и хранилище"</string>
-    <string name="voicemail_set_pin_preference_title" msgid="1034691230818233684">"Задаване на ПИН код"</string>
-    <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"Промяна на ПИН кода"</string>
-    <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"За промяна на ПИН кода трябва да бъде активирана визуалната гласова поща"</string>
-    <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"Визуалната гласова поща още не е активирана. Моля, опитайте отново по-късно"</string>
-    <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"Моля, изчакайте."</string>
-    <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"Новият ПИН е твърде къс."</string>
-    <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"Новият ПИН е твърде дълъг."</string>
-    <string name="vm_change_pin_error_too_weak" msgid="5865254034338293113">"Новият ПИН не е достатъчно надежден. Надеждната парола не бива да има последователни или повтарящи се цифри."</string>
-    <string name="vm_change_pin_error_mismatch" msgid="3682667971009913553">"Старият ПИН не съответства."</string>
-    <string name="vm_change_pin_error_invalid" msgid="4317397281749196545">"Новият ПИН съдържа невалидни знаци."</string>
-    <string name="vm_change_pin_error_system_error" msgid="5972056058776852411">"Промяната на ПИН кода не е възможна"</string>
-    <string name="vvm_unsupported_message_format" msgid="2746490691815392491">"Типът на съобщението не се поддържа. Обадете се на <xliff:g id="NUMBER">%s</xliff:g>, за да го чуете."</string>
-    <string name="change_pin_title" msgid="1363830310845461697">"Промяна на ПИН кода за гласовата поща"</string>
-    <string name="change_pin_continue_label" msgid="9184635195162827832">"Напред"</string>
-    <string name="change_pin_cancel_label" msgid="7258783861113501519">"Отказ"</string>
-    <string name="change_pin_ok_label" msgid="4527043915415428629">"OK"</string>
-    <string name="change_pin_enter_old_pin_header" msgid="1375728090965833028">"Потвърдете стария си ПИН"</string>
-    <string name="change_pin_enter_old_pin_hint" msgid="1654231195871094175">"За да продължите, въведете ПИН кода за гласовата си поща."</string>
-    <string name="change_pin_enter_new_pin_header" msgid="7142620840890909719">"Задайте нов ПИН"</string>
-    <string name="change_pin_enter_new_pin_hint" msgid="1289662932759932217">"ПИН кодът трябва да съдържа между <xliff:g id="MIN">%1$d</xliff:g> и <xliff:g id="MAX">%2$d</xliff:g> цифри."</string>
-    <string name="change_pin_confirm_pin_header" msgid="7282604363655862136">"Потвърдете ПИН кода си"</string>
-    <string name="change_pin_confirm_pins_dont_match" msgid="8626742552205369433">"ПИН кодовете не съвпадат"</string>
-    <string name="change_pin_succeeded" msgid="6869403202124894671">"ПИН кодът за гласовата поща бе актуализиран"</string>
-    <string name="change_pin_system_error" msgid="5762853042379833829">"ПИН кодът не може да бъде зададен"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="vvm_unsupported_message_format">Типът на съобщението не се поддържа. Обадете се на %s, за да го чуете.</string>
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-bn/strings.xml b/java/com/android/voicemail/impl/res/values-bn/strings.xml
index 011a74e..4b1ab64 100644
--- a/java/com/android/voicemail/impl/res/values-bn/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-bn/strings.xml
@@ -1,49 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_settings_with_label" msgid="563926539137546586">"ভয়েসমেল (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
-    <string name="voicemail_settings_title" msgid="6685263321755930738">"ভয়েসমেল"</string>
-    <string name="voicemail_notifications_preference_title" msgid="3490553930230492405">"বিজ্ঞপ্তি"</string>
-    <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"উন্নত সেটিংস"</string>
-    <string name="voicemail_visual_voicemail_switch_title" msgid="3158454817165714998">"ভিজ্যুয়াল ভয়েসমেল"</string>
-    <string name="voicemail_visual_voicemail_auto_archive_switch_title" msgid="7120443850486401455">"অতিরিক্ত ব্যাক আপ এবং সঞ্চয়স্থান"</string>
-    <string name="voicemail_set_pin_preference_title" msgid="1034691230818233684">"পিন সেট করুন"</string>
-    <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"পিন পরিবর্তন করুন"</string>
-    <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"পিন পরিবর্তন করতে ভিজ্যুয়াল ভয়েসমেল অবশ্যই সক্ষম করতে হবে"</string>
-    <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"ভিজ্যুয়াল ভয়েসমেল এখনও সক্রিয় করা হয়নি, অনুগ্রহ করে পরে আবার চেষ্টা করুন"</string>
-    <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"অনুগ্রহ করে অপেক্ষা করুন৷"</string>
-    <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"নতুন PIN খুবই ছোট৷"</string>
-    <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"নতুন PIN খুবই বড়৷"</string>
-    <string name="vm_change_pin_error_too_weak" msgid="5865254034338293113">"নতুন PIN খুবই দুর্বল৷ একটি শক্তিশালী পাসওয়ার্ডে ধারাবাহিক ক্রম বা পুনরাবৃত্ত সংখ্যা থাকা উচিৎ নয়৷"</string>
-    <string name="vm_change_pin_error_mismatch" msgid="3682667971009913553">"পুরানো PIN মিলছে না৷"</string>
-    <string name="vm_change_pin_error_invalid" msgid="4317397281749196545">"নতুন PIN এ অবৈধ অক্ষর রয়েছে৷"</string>
-    <string name="vm_change_pin_error_system_error" msgid="5972056058776852411">"PIN পরিবর্তন করা গেল না"</string>
-    <string name="vvm_unsupported_message_format" msgid="2746490691815392491">"এই ধরণের বার্তা সমর্থিত নয় , শুোনার জন্য <xliff:g id="NUMBER">%s</xliff:g> এ কল করুন৷"</string>
-    <string name="change_pin_title" msgid="1363830310845461697">"ভয়েসমেলের PIN পরিবর্তন করুন"</string>
-    <string name="change_pin_continue_label" msgid="9184635195162827832">"চালিয়ে যান"</string>
-    <string name="change_pin_cancel_label" msgid="7258783861113501519">"বাতিল করুন"</string>
-    <string name="change_pin_ok_label" msgid="4527043915415428629">"ঠিক আছে"</string>
-    <string name="change_pin_enter_old_pin_header" msgid="1375728090965833028">"আপনার পুরানো PIN নিশ্চিত করুন"</string>
-    <string name="change_pin_enter_old_pin_hint" msgid="1654231195871094175">"চালিয়ে যেতে আপনার ভয়েসমেলের PIN লিখুন৷"</string>
-    <string name="change_pin_enter_new_pin_header" msgid="7142620840890909719">"একটি নতুন PIN সেট করুন"</string>
-    <string name="change_pin_enter_new_pin_hint" msgid="1289662932759932217">"PIN অবশ্যই <xliff:g id="MIN">%1$d</xliff:g>-<xliff:g id="MAX">%2$d</xliff:g> সংখ্যার হওয়া উচিৎ৷"</string>
-    <string name="change_pin_confirm_pin_header" msgid="7282604363655862136">"আপনার PIN নিশ্চিত করুন"</string>
-    <string name="change_pin_confirm_pins_dont_match" msgid="8626742552205369433">"PINগুলি মিলছে না"</string>
-    <string name="change_pin_succeeded" msgid="6869403202124894671">"ভয়েসমেলের PIN আপডেট করা হয়েছে"</string>
-    <string name="change_pin_system_error" msgid="5762853042379833829">"PIN সেট করা গেল না"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="vvm_unsupported_message_format">এই ধরণের বার্তা সমর্থিত নয় , শুোনার জন্য %s এ কল করুন৷</string>
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-bs/strings.xml b/java/com/android/voicemail/impl/res/values-bs/strings.xml
index 0a26706..5e3869d 100644
--- a/java/com/android/voicemail/impl/res/values-bs/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-bs/strings.xml
@@ -1,49 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_settings_with_label" msgid="563926539137546586">"Govorna pošta (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
-    <string name="voicemail_settings_title" msgid="6685263321755930738">"Govorna pošta"</string>
-    <string name="voicemail_notifications_preference_title" msgid="3490553930230492405">"Obavještenja"</string>
-    <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"Napredne postavke"</string>
-    <string name="voicemail_visual_voicemail_switch_title" msgid="3158454817165714998">"Vizuelna govorna pošta"</string>
-    <string name="voicemail_visual_voicemail_auto_archive_switch_title" msgid="7120443850486401455">"Dodatna sigurnosna kopija i pohrana"</string>
-    <string name="voicemail_set_pin_preference_title" msgid="1034691230818233684">"Postavite PIN kôd"</string>
-    <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"Promijenite PIN kôd"</string>
-    <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"Vizuelna govorna pošta mora biti omogućena za promjenu PIN kôda"</string>
-    <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"Vizuelna govorna pošta još uvijek nije aktivirana, pokušajte ponovo kasnije"</string>
-    <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"Pričekajte."</string>
-    <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"Novi PIN kod je prekratak."</string>
-    <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"Novi PIN kod je predug."</string>
-    <string name="vm_change_pin_error_too_weak" msgid="5865254034338293113">"Novi PIN kod je preslab. Jaka lozinka ne smije sadržavati uzastopni niz cifri ili ponovljene cifre."</string>
-    <string name="vm_change_pin_error_mismatch" msgid="3682667971009913553">"Stari PIN kod se ne podudara."</string>
-    <string name="vm_change_pin_error_invalid" msgid="4317397281749196545">"Novi PIN kod sadrži nevažeće znakove."</string>
-    <string name="vm_change_pin_error_system_error" msgid="5972056058776852411">"Nije moguće promijeniti PIN kod"</string>
-    <string name="vvm_unsupported_message_format" msgid="2746490691815392491">"Nepodržana vrsta poruke, pozovite <xliff:g id="NUMBER">%s</xliff:g> da je preslušate."</string>
-    <string name="change_pin_title" msgid="1363830310845461697">"Promijenite PIN kod govorne pošte"</string>
-    <string name="change_pin_continue_label" msgid="9184635195162827832">"Nastavi"</string>
-    <string name="change_pin_cancel_label" msgid="7258783861113501519">"Otkaži"</string>
-    <string name="change_pin_ok_label" msgid="4527043915415428629">"Uredu"</string>
-    <string name="change_pin_enter_old_pin_header" msgid="1375728090965833028">"Potvrdite stari PIN kod"</string>
-    <string name="change_pin_enter_old_pin_hint" msgid="1654231195871094175">"Za nastavak unesite PIN kod govorne pošte."</string>
-    <string name="change_pin_enter_new_pin_header" msgid="7142620840890909719">"Postavite novi PIN kod"</string>
-    <string name="change_pin_enter_new_pin_hint" msgid="1289662932759932217">"PIN kod mora imati između <xliff:g id="MIN">%1$d</xliff:g>-<xliff:g id="MAX">%2$d</xliff:g> cifri."</string>
-    <string name="change_pin_confirm_pin_header" msgid="7282604363655862136">"Potvrdite PIN kod"</string>
-    <string name="change_pin_confirm_pins_dont_match" msgid="8626742552205369433">"PIN kodovi se ne podudaraju"</string>
-    <string name="change_pin_succeeded" msgid="6869403202124894671">"PIN kod govorne pošte je ažuriran"</string>
-    <string name="change_pin_system_error" msgid="5762853042379833829">"Nije moguće postaviti PIN kod"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="vvm_unsupported_message_format">Nepodržana vrsta poruke, pozovite %s da je preslušate.</string>
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-ca/strings.xml b/java/com/android/voicemail/impl/res/values-ca/strings.xml
index 5c36ea7..a034234 100644
--- a/java/com/android/voicemail/impl/res/values-ca/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-ca/strings.xml
@@ -1,49 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_settings_with_label" msgid="563926539137546586">"Bústia de veu (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
-    <string name="voicemail_settings_title" msgid="6685263321755930738">"Bústia de veu"</string>
-    <string name="voicemail_notifications_preference_title" msgid="3490553930230492405">"Notificacions"</string>
-    <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"Configuració avançada"</string>
-    <string name="voicemail_visual_voicemail_switch_title" msgid="3158454817165714998">"Bústia de veu visual"</string>
-    <string name="voicemail_visual_voicemail_auto_archive_switch_title" msgid="7120443850486401455">"Còpia de seguretat addicional i emmagatz."</string>
-    <string name="voicemail_set_pin_preference_title" msgid="1034691230818233684">"Defineix el PIN"</string>
-    <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"Canvia el PIN"</string>
-    <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"La bústia de veu visual ha d\'estar activada per poder canviar el PIN"</string>
-    <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"La bústia de veu visual encara no està activada. Torna-ho a provar més tard."</string>
-    <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"Espera."</string>
-    <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"El PIN nou és massa curt."</string>
-    <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"El PIN nou és massa llarg."</string>
-    <string name="vm_change_pin_error_too_weak" msgid="5865254034338293113">"El PIN nou no és prou segur. Les contrasenyes segures no poden contenir seqüències contínues ni dígits repetits."</string>
-    <string name="vm_change_pin_error_mismatch" msgid="3682667971009913553">"El PIN antic no coincideix."</string>
-    <string name="vm_change_pin_error_invalid" msgid="4317397281749196545">"El PIN nou conté caràcters que no són vàlids."</string>
-    <string name="vm_change_pin_error_system_error" msgid="5972056058776852411">"No es pot canviar el PIN"</string>
-    <string name="vvm_unsupported_message_format" msgid="2746490691815392491">"Aquest tipus de missatge no s\'admet. Truca al <xliff:g id="NUMBER">%s</xliff:g> per escoltar-lo."</string>
-    <string name="change_pin_title" msgid="1363830310845461697">"Canvia el PIN de la bústia de veu"</string>
-    <string name="change_pin_continue_label" msgid="9184635195162827832">"Continua"</string>
-    <string name="change_pin_cancel_label" msgid="7258783861113501519">"Cancel·la"</string>
-    <string name="change_pin_ok_label" msgid="4527043915415428629">"D\'acord"</string>
-    <string name="change_pin_enter_old_pin_header" msgid="1375728090965833028">"Confirma el teu PIN antic"</string>
-    <string name="change_pin_enter_old_pin_hint" msgid="1654231195871094175">"Introdueix el PIN de la bústia de veu per continuar."</string>
-    <string name="change_pin_enter_new_pin_header" msgid="7142620840890909719">"Defineix un PIN nou"</string>
-    <string name="change_pin_enter_new_pin_hint" msgid="1289662932759932217">"El PIN ha de tenir <xliff:g id="MIN">%1$d</xliff:g>-<xliff:g id="MAX">%2$d</xliff:g> dígits."</string>
-    <string name="change_pin_confirm_pin_header" msgid="7282604363655862136">"Confirma el teu PIN"</string>
-    <string name="change_pin_confirm_pins_dont_match" msgid="8626742552205369433">"Els PIN no coincideixen"</string>
-    <string name="change_pin_succeeded" msgid="6869403202124894671">"S\'ha actualitzat el PIN de la bústia de veu"</string>
-    <string name="change_pin_system_error" msgid="5762853042379833829">"No s\'ha pogut definir el PIN"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="vvm_unsupported_message_format">Aquest tipus de missatge no s\'admet. Truca al %s per escoltar-lo.</string>
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-cs/strings.xml b/java/com/android/voicemail/impl/res/values-cs/strings.xml
index ddef491..3bb2a3b 100644
--- a/java/com/android/voicemail/impl/res/values-cs/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-cs/strings.xml
@@ -1,49 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_settings_with_label" msgid="563926539137546586">"Hlasová schránka (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
-    <string name="voicemail_settings_title" msgid="6685263321755930738">"Hlasová schránka"</string>
-    <string name="voicemail_notifications_preference_title" msgid="3490553930230492405">"Oznámení"</string>
-    <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"Pokročilá nastavení"</string>
-    <string name="voicemail_visual_voicemail_switch_title" msgid="3158454817165714998">"Vizuální hlasová schránka"</string>
-    <string name="voicemail_visual_voicemail_auto_archive_switch_title" msgid="7120443850486401455">"Další zálohování a úložiště"</string>
-    <string name="voicemail_set_pin_preference_title" msgid="1034691230818233684">"Nastavit kód PIN"</string>
-    <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"Změnit kód PIN"</string>
-    <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"Pokud chcete kód PIN změnit, musíte mít zapnutou vizuální hlasovou schránku"</string>
-    <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"Vizuální hlasová schránka zatím není aktivovaná, zkuste to prosím znovu později"</string>
-    <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"Čekejte prosím."</string>
-    <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"Nový kód PIN je příliš krátký."</string>
-    <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"Nový kód PIN je příliš dlouhý."</string>
-    <string name="vm_change_pin_error_too_weak" msgid="5865254034338293113">"Nový kód PIN je příliš slabý. Silný kód by neměl obsahovat postupnou řadu čísel ani opakující se čísla."</string>
-    <string name="vm_change_pin_error_mismatch" msgid="3682667971009913553">"Starý kód PIN se neshoduje."</string>
-    <string name="vm_change_pin_error_invalid" msgid="4317397281749196545">"Nový kód PIN obsahuje neplatné znaky."</string>
-    <string name="vm_change_pin_error_system_error" msgid="5972056058776852411">"Kód PIN se nepodařilo změnit"</string>
-    <string name="vvm_unsupported_message_format" msgid="2746490691815392491">"Nepodporovaný typ zprávy. Pokud si ji chcete poslechnout, zavolejte na číslo <xliff:g id="NUMBER">%s</xliff:g>."</string>
-    <string name="change_pin_title" msgid="1363830310845461697">"Změňte kód PIN hlasové schránky"</string>
-    <string name="change_pin_continue_label" msgid="9184635195162827832">"Pokračovat"</string>
-    <string name="change_pin_cancel_label" msgid="7258783861113501519">"Zrušit"</string>
-    <string name="change_pin_ok_label" msgid="4527043915415428629">"OK"</string>
-    <string name="change_pin_enter_old_pin_header" msgid="1375728090965833028">"Potvrďte starý kód PIN"</string>
-    <string name="change_pin_enter_old_pin_hint" msgid="1654231195871094175">"Pokud chcete pokračovat, zadejte kód PIN hlasové schránky."</string>
-    <string name="change_pin_enter_new_pin_header" msgid="7142620840890909719">"Nastavte nový kód PIN"</string>
-    <string name="change_pin_enter_new_pin_hint" msgid="1289662932759932217">"PIN musí mít <xliff:g id="MIN">%1$d</xliff:g> až <xliff:g id="MAX">%2$d</xliff:g> číslic."</string>
-    <string name="change_pin_confirm_pin_header" msgid="7282604363655862136">"Potvrďte kód PIN"</string>
-    <string name="change_pin_confirm_pins_dont_match" msgid="8626742552205369433">"Kódy PIN nejsou shodné"</string>
-    <string name="change_pin_succeeded" msgid="6869403202124894671">"Kód PIN hlasové schránky byl změněn"</string>
-    <string name="change_pin_system_error" msgid="5762853042379833829">"Kód PIN se nepodařilo nastavit"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="vvm_unsupported_message_format">Nepodporovaný typ zprávy. Pokud si ji chcete poslechnout, zavolejte na číslo %s.</string>
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-da/strings.xml b/java/com/android/voicemail/impl/res/values-da/strings.xml
index 64e6588..fad807a 100644
--- a/java/com/android/voicemail/impl/res/values-da/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-da/strings.xml
@@ -1,49 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_settings_with_label" msgid="563926539137546586">"Telefonsvarer (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
-    <string name="voicemail_settings_title" msgid="6685263321755930738">"Telefonsvarer"</string>
-    <string name="voicemail_notifications_preference_title" msgid="3490553930230492405">"Underretninger"</string>
-    <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"Avancerede indstillinger"</string>
-    <string name="voicemail_visual_voicemail_switch_title" msgid="3158454817165714998">"Visuel telefonsvarer"</string>
-    <string name="voicemail_visual_voicemail_auto_archive_switch_title" msgid="7120443850486401455">"Ekstra sikkerhedskopiering og lagerplads"</string>
-    <string name="voicemail_set_pin_preference_title" msgid="1034691230818233684">"Angiv pinkode"</string>
-    <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"Skift pinkode"</string>
-    <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"Visuel telefonsvarer skal være aktiveret, for at du kan skifte pinkode"</string>
-    <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"Visuel telefonsvarer er ikke aktiveret endnu. Prøv igen senere"</string>
-    <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"Vent et øjeblik."</string>
-    <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"Den nye pinkode er for kort."</string>
-    <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"Den nye pinkode er for lang."</string>
-    <string name="vm_change_pin_error_too_weak" msgid="5865254034338293113">"Denne pinkode er for svag. En stærk adgangskode består ikke af en række tal og har ikke flere af de samme tal efter hinanden."</string>
-    <string name="vm_change_pin_error_mismatch" msgid="3682667971009913553">"Den gamle pinkode er forkert."</string>
-    <string name="vm_change_pin_error_invalid" msgid="4317397281749196545">"Den nye pinkode har ugyldige tegn."</string>
-    <string name="vm_change_pin_error_system_error" msgid="5972056058776852411">"Pinkoden kunne ikke ændres"</string>
-    <string name="vvm_unsupported_message_format" msgid="2746490691815392491">"Ikke-understøttet beskedtype. Ring til <xliff:g id="NUMBER">%s</xliff:g> for at aflytte."</string>
-    <string name="change_pin_title" msgid="1363830310845461697">"Skift pinkode til din telefonsvarer"</string>
-    <string name="change_pin_continue_label" msgid="9184635195162827832">"Fortsæt"</string>
-    <string name="change_pin_cancel_label" msgid="7258783861113501519">"Annuller"</string>
-    <string name="change_pin_ok_label" msgid="4527043915415428629">"OK"</string>
-    <string name="change_pin_enter_old_pin_header" msgid="1375728090965833028">"Bekræft din gamle pinkode"</string>
-    <string name="change_pin_enter_old_pin_hint" msgid="1654231195871094175">"Angiv din pinkode til din telefonsvarer for at fortsætte."</string>
-    <string name="change_pin_enter_new_pin_header" msgid="7142620840890909719">"Angiv en ny pinkode"</string>
-    <string name="change_pin_enter_new_pin_hint" msgid="1289662932759932217">"Pinkoden skal være på <xliff:g id="MIN">%1$d</xliff:g>-<xliff:g id="MAX">%2$d</xliff:g> cifre."</string>
-    <string name="change_pin_confirm_pin_header" msgid="7282604363655862136">"Bekræft din pinkode"</string>
-    <string name="change_pin_confirm_pins_dont_match" msgid="8626742552205369433">"Pinkoderne er ikke ens"</string>
-    <string name="change_pin_succeeded" msgid="6869403202124894671">"Pinkoden til din telefonsvarer blev opdateret"</string>
-    <string name="change_pin_system_error" msgid="5762853042379833829">"Pinkoden kunne ikke angives"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="vvm_unsupported_message_format">Ikke-understøttet beskedtype. Ring til %s for at aflytte.</string>
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-de/strings.xml b/java/com/android/voicemail/impl/res/values-de/strings.xml
index 9b16275..7c232a7 100644
--- a/java/com/android/voicemail/impl/res/values-de/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-de/strings.xml
@@ -1,49 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_settings_with_label" msgid="563926539137546586">"Mailbox (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
-    <string name="voicemail_settings_title" msgid="6685263321755930738">"Mailbox"</string>
-    <string name="voicemail_notifications_preference_title" msgid="3490553930230492405">"Benachrichtigungen"</string>
-    <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"Erweiterte Einstellungen"</string>
-    <string name="voicemail_visual_voicemail_switch_title" msgid="3158454817165714998">"Visuelle Mailbox"</string>
-    <string name="voicemail_visual_voicemail_auto_archive_switch_title" msgid="7120443850486401455">"Zusätzliche Sicherung und mehr Speicher"</string>
-    <string name="voicemail_set_pin_preference_title" msgid="1034691230818233684">"PIN festlegen"</string>
-    <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"PIN ändern"</string>
-    <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"Die visuelle Mailbox muss aktiviert sein, um die PIN zu ändern"</string>
-    <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"Die visuelle Mailbox wurde noch nicht aktiviert, bitte versuche es später noch einmal"</string>
-    <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"Bitte warten."</string>
-    <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"Die neue PIN ist zu kurz."</string>
-    <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"Die neue PIN ist zu lang."</string>
-    <string name="vm_change_pin_error_too_weak" msgid="5865254034338293113">"Die neue PIN ist zu unsicher. Ein sicheres Passwort sollte keine aufeinanderfolgenden oder wiederholten Zeichen enthalten."</string>
-    <string name="vm_change_pin_error_mismatch" msgid="3682667971009913553">"Die alte PIN stimmt nicht überein."</string>
-    <string name="vm_change_pin_error_invalid" msgid="4317397281749196545">"Die neue PIN enthält ungültige Zeichen."</string>
-    <string name="vm_change_pin_error_system_error" msgid="5972056058776852411">"PIN kann nicht geändert werden"</string>
-    <string name="vvm_unsupported_message_format" msgid="2746490691815392491">"Nicht unterstützter Nachrichtentyp, zum Abhören <xliff:g id="NUMBER">%s</xliff:g> anrufen."</string>
-    <string name="change_pin_title" msgid="1363830310845461697">"Mailbox-PIN ändern"</string>
-    <string name="change_pin_continue_label" msgid="9184635195162827832">"Weiter"</string>
-    <string name="change_pin_cancel_label" msgid="7258783861113501519">"Abbrechen"</string>
-    <string name="change_pin_ok_label" msgid="4527043915415428629">"OK"</string>
-    <string name="change_pin_enter_old_pin_header" msgid="1375728090965833028">"Alte PIN bestätigen"</string>
-    <string name="change_pin_enter_old_pin_hint" msgid="1654231195871094175">"Gib zum Fortfahren deine Mailbox-PIN ein."</string>
-    <string name="change_pin_enter_new_pin_header" msgid="7142620840890909719">"Neue PIN festlegen"</string>
-    <string name="change_pin_enter_new_pin_hint" msgid="1289662932759932217">"PIN muss <xliff:g id="MIN">%1$d</xliff:g>–<xliff:g id="MAX">%2$d</xliff:g> Zeichen umfassen."</string>
-    <string name="change_pin_confirm_pin_header" msgid="7282604363655862136">"PIN bestätigen"</string>
-    <string name="change_pin_confirm_pins_dont_match" msgid="8626742552205369433">"Die PINs stimmen nicht überein"</string>
-    <string name="change_pin_succeeded" msgid="6869403202124894671">"Mailbox-PIN aktualisiert"</string>
-    <string name="change_pin_system_error" msgid="5762853042379833829">"Festlegen der PIN nicht möglich"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="vvm_unsupported_message_format">Nicht unterstützter Nachrichtentyp, zum Abhören %s anrufen.</string>
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-el/strings.xml b/java/com/android/voicemail/impl/res/values-el/strings.xml
index b197b1c..1684936 100644
--- a/java/com/android/voicemail/impl/res/values-el/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-el/strings.xml
@@ -1,49 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_settings_with_label" msgid="563926539137546586">"Αυτόματος τηλεφωνητής (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
-    <string name="voicemail_settings_title" msgid="6685263321755930738">"Αυτόματος τηλεφωνητής"</string>
-    <string name="voicemail_notifications_preference_title" msgid="3490553930230492405">"Ειδοποιήσεις"</string>
-    <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"Σύνθετες ρυθμίσεις"</string>
-    <string name="voicemail_visual_voicemail_switch_title" msgid="3158454817165714998">"Οπτικός αυτόματος τηλεφωνητής"</string>
-    <string name="voicemail_visual_voicemail_auto_archive_switch_title" msgid="7120443850486401455">"Επιπλέον αντίγραφα ασφ. και αποθήκευση"</string>
-    <string name="voicemail_set_pin_preference_title" msgid="1034691230818233684">"Ορισμός PIN"</string>
-    <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"Αλλαγή κωδικού PIN"</string>
-    <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"Για αλλαγή του PIN, ενεργοποιήστε τον οπτικό αυτόματο τηλεφωνητή"</string>
-    <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"Ο οπτικός αυτόματος τηλεφωνητής δεν έχει ενεργοποιηθεί ακόμα. Δοκιμάστε ξανά αργότερα."</string>
-    <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"Περιμένετε."</string>
-    <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"Το νέο PIN είναι πολύ μικρό."</string>
-    <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"Το νέο PIN είναι πολύ μεγάλo."</string>
-    <string name="vm_change_pin_error_too_weak" msgid="5865254034338293113">"Το νέο PIN είναι πολύ αδύναμο. Ένας ισχυρός κωδικός πρόσβασης δεν θα πρέπει να αποτελείται από ακολουθίες χαρακτήρων ή επαναλαμβανόμενα ψηφία."</string>
-    <string name="vm_change_pin_error_mismatch" msgid="3682667971009913553">"Το παλιό PIN δεν αντιστοιχεί."</string>
-    <string name="vm_change_pin_error_invalid" msgid="4317397281749196545">"Το νέο PIN περιέχει μη έγκυρους χαρακτήρες."</string>
-    <string name="vm_change_pin_error_system_error" msgid="5972056058776852411">"Δεν είναι δυνατή η αλλαγή του PIN"</string>
-    <string name="vvm_unsupported_message_format" msgid="2746490691815392491">"Μη υποστηριζόμενος τύπος μηνύματος: καλέστε στο <xliff:g id="NUMBER">%s</xliff:g> για να το ακούσετε."</string>
-    <string name="change_pin_title" msgid="1363830310845461697">"Αλλαγή PIN αυτόματου τηλεφωνητή"</string>
-    <string name="change_pin_continue_label" msgid="9184635195162827832">"Συνέχεια"</string>
-    <string name="change_pin_cancel_label" msgid="7258783861113501519">"Ακύρωση"</string>
-    <string name="change_pin_ok_label" msgid="4527043915415428629">"OK"</string>
-    <string name="change_pin_enter_old_pin_header" msgid="1375728090965833028">"Επιβεβαιώστε το παλιό σας PIN"</string>
-    <string name="change_pin_enter_old_pin_hint" msgid="1654231195871094175">"Εισαγάγετε το PIN του αυτόματου τηλεφωνητή σας για να συνεχίσετε."</string>
-    <string name="change_pin_enter_new_pin_header" msgid="7142620840890909719">"Ορίστε ένα νέο PIN"</string>
-    <string name="change_pin_enter_new_pin_hint" msgid="1289662932759932217">"Το PIN πρέπει να αποτελείται από <xliff:g id="MIN">%1$d</xliff:g>-<xliff:g id="MAX">%2$d</xliff:g> ψηφία."</string>
-    <string name="change_pin_confirm_pin_header" msgid="7282604363655862136">"Επιβεβαιώστε το PIN σας"</string>
-    <string name="change_pin_confirm_pins_dont_match" msgid="8626742552205369433">"Τα PIN δεν ταιριάζουν"</string>
-    <string name="change_pin_succeeded" msgid="6869403202124894671">"Το PIN αυτόματου τηλεφωνητή ενημερώθηκε"</string>
-    <string name="change_pin_system_error" msgid="5762853042379833829">"Δεν είναι δυνατή η ρύθμιση του PIN"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="vvm_unsupported_message_format">Μη υποστηριζόμενος τύπος μηνύματος: καλέστε στο %s για να το ακούσετε.</string>
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-en-rAU/strings.xml b/java/com/android/voicemail/impl/res/values-en-rAU/strings.xml
index f49f9ff..9a5714f 100644
--- a/java/com/android/voicemail/impl/res/values-en-rAU/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-en-rAU/strings.xml
@@ -1,49 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_settings_with_label" msgid="563926539137546586">"Voicemail (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
-    <string name="voicemail_settings_title" msgid="6685263321755930738">"Voicemail"</string>
-    <string name="voicemail_notifications_preference_title" msgid="3490553930230492405">"Notifications"</string>
-    <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"Advanced settings"</string>
-    <string name="voicemail_visual_voicemail_switch_title" msgid="3158454817165714998">"Visual voicemail"</string>
-    <string name="voicemail_visual_voicemail_auto_archive_switch_title" msgid="7120443850486401455">"Extra backup and storage"</string>
-    <string name="voicemail_set_pin_preference_title" msgid="1034691230818233684">"Set PIN"</string>
-    <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"Change PIN"</string>
-    <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"Visual voicemail must be enabled to change PIN"</string>
-    <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"Visual voicemail is not activated yet. Please try again later"</string>
-    <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"Please wait."</string>
-    <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"The new PIN is too short."</string>
-    <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"The new PIN is too long."</string>
-    <string name="vm_change_pin_error_too_weak" msgid="5865254034338293113">"The new PIN is too weak. A strong password should not have a continuous sequence or repeated digits."</string>
-    <string name="vm_change_pin_error_mismatch" msgid="3682667971009913553">"The old PIN doesn\'t match."</string>
-    <string name="vm_change_pin_error_invalid" msgid="4317397281749196545">"The new PIN contains invalid characters."</string>
-    <string name="vm_change_pin_error_system_error" msgid="5972056058776852411">"Unable to change PIN"</string>
-    <string name="vvm_unsupported_message_format" msgid="2746490691815392491">"Unsupported message type. Call <xliff:g id="NUMBER">%s</xliff:g> to listen."</string>
-    <string name="change_pin_title" msgid="1363830310845461697">"Change voicemail PIN"</string>
-    <string name="change_pin_continue_label" msgid="9184635195162827832">"Continue"</string>
-    <string name="change_pin_cancel_label" msgid="7258783861113501519">"Cancel"</string>
-    <string name="change_pin_ok_label" msgid="4527043915415428629">"OK"</string>
-    <string name="change_pin_enter_old_pin_header" msgid="1375728090965833028">"Confirm your old PIN"</string>
-    <string name="change_pin_enter_old_pin_hint" msgid="1654231195871094175">"Enter your voicemail PIN to continue."</string>
-    <string name="change_pin_enter_new_pin_header" msgid="7142620840890909719">"Set a new PIN"</string>
-    <string name="change_pin_enter_new_pin_hint" msgid="1289662932759932217">"PIN must be <xliff:g id="MIN">%1$d</xliff:g>–<xliff:g id="MAX">%2$d</xliff:g> digits long."</string>
-    <string name="change_pin_confirm_pin_header" msgid="7282604363655862136">"Confirm your PIN"</string>
-    <string name="change_pin_confirm_pins_dont_match" msgid="8626742552205369433">"PINs don\'t match"</string>
-    <string name="change_pin_succeeded" msgid="6869403202124894671">"Voicemail PIN updated"</string>
-    <string name="change_pin_system_error" msgid="5762853042379833829">"Unable to set PIN"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="vvm_unsupported_message_format">Unsupported message type. Call %s to listen.</string>
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-en-rGB/strings.xml b/java/com/android/voicemail/impl/res/values-en-rGB/strings.xml
index f49f9ff..9a5714f 100644
--- a/java/com/android/voicemail/impl/res/values-en-rGB/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-en-rGB/strings.xml
@@ -1,49 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_settings_with_label" msgid="563926539137546586">"Voicemail (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
-    <string name="voicemail_settings_title" msgid="6685263321755930738">"Voicemail"</string>
-    <string name="voicemail_notifications_preference_title" msgid="3490553930230492405">"Notifications"</string>
-    <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"Advanced settings"</string>
-    <string name="voicemail_visual_voicemail_switch_title" msgid="3158454817165714998">"Visual voicemail"</string>
-    <string name="voicemail_visual_voicemail_auto_archive_switch_title" msgid="7120443850486401455">"Extra backup and storage"</string>
-    <string name="voicemail_set_pin_preference_title" msgid="1034691230818233684">"Set PIN"</string>
-    <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"Change PIN"</string>
-    <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"Visual voicemail must be enabled to change PIN"</string>
-    <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"Visual voicemail is not activated yet. Please try again later"</string>
-    <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"Please wait."</string>
-    <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"The new PIN is too short."</string>
-    <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"The new PIN is too long."</string>
-    <string name="vm_change_pin_error_too_weak" msgid="5865254034338293113">"The new PIN is too weak. A strong password should not have a continuous sequence or repeated digits."</string>
-    <string name="vm_change_pin_error_mismatch" msgid="3682667971009913553">"The old PIN doesn\'t match."</string>
-    <string name="vm_change_pin_error_invalid" msgid="4317397281749196545">"The new PIN contains invalid characters."</string>
-    <string name="vm_change_pin_error_system_error" msgid="5972056058776852411">"Unable to change PIN"</string>
-    <string name="vvm_unsupported_message_format" msgid="2746490691815392491">"Unsupported message type. Call <xliff:g id="NUMBER">%s</xliff:g> to listen."</string>
-    <string name="change_pin_title" msgid="1363830310845461697">"Change voicemail PIN"</string>
-    <string name="change_pin_continue_label" msgid="9184635195162827832">"Continue"</string>
-    <string name="change_pin_cancel_label" msgid="7258783861113501519">"Cancel"</string>
-    <string name="change_pin_ok_label" msgid="4527043915415428629">"OK"</string>
-    <string name="change_pin_enter_old_pin_header" msgid="1375728090965833028">"Confirm your old PIN"</string>
-    <string name="change_pin_enter_old_pin_hint" msgid="1654231195871094175">"Enter your voicemail PIN to continue."</string>
-    <string name="change_pin_enter_new_pin_header" msgid="7142620840890909719">"Set a new PIN"</string>
-    <string name="change_pin_enter_new_pin_hint" msgid="1289662932759932217">"PIN must be <xliff:g id="MIN">%1$d</xliff:g>–<xliff:g id="MAX">%2$d</xliff:g> digits long."</string>
-    <string name="change_pin_confirm_pin_header" msgid="7282604363655862136">"Confirm your PIN"</string>
-    <string name="change_pin_confirm_pins_dont_match" msgid="8626742552205369433">"PINs don\'t match"</string>
-    <string name="change_pin_succeeded" msgid="6869403202124894671">"Voicemail PIN updated"</string>
-    <string name="change_pin_system_error" msgid="5762853042379833829">"Unable to set PIN"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="vvm_unsupported_message_format">Unsupported message type. Call %s to listen.</string>
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-en-rIN/strings.xml b/java/com/android/voicemail/impl/res/values-en-rIN/strings.xml
index f49f9ff..9a5714f 100644
--- a/java/com/android/voicemail/impl/res/values-en-rIN/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-en-rIN/strings.xml
@@ -1,49 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_settings_with_label" msgid="563926539137546586">"Voicemail (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
-    <string name="voicemail_settings_title" msgid="6685263321755930738">"Voicemail"</string>
-    <string name="voicemail_notifications_preference_title" msgid="3490553930230492405">"Notifications"</string>
-    <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"Advanced settings"</string>
-    <string name="voicemail_visual_voicemail_switch_title" msgid="3158454817165714998">"Visual voicemail"</string>
-    <string name="voicemail_visual_voicemail_auto_archive_switch_title" msgid="7120443850486401455">"Extra backup and storage"</string>
-    <string name="voicemail_set_pin_preference_title" msgid="1034691230818233684">"Set PIN"</string>
-    <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"Change PIN"</string>
-    <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"Visual voicemail must be enabled to change PIN"</string>
-    <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"Visual voicemail is not activated yet. Please try again later"</string>
-    <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"Please wait."</string>
-    <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"The new PIN is too short."</string>
-    <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"The new PIN is too long."</string>
-    <string name="vm_change_pin_error_too_weak" msgid="5865254034338293113">"The new PIN is too weak. A strong password should not have a continuous sequence or repeated digits."</string>
-    <string name="vm_change_pin_error_mismatch" msgid="3682667971009913553">"The old PIN doesn\'t match."</string>
-    <string name="vm_change_pin_error_invalid" msgid="4317397281749196545">"The new PIN contains invalid characters."</string>
-    <string name="vm_change_pin_error_system_error" msgid="5972056058776852411">"Unable to change PIN"</string>
-    <string name="vvm_unsupported_message_format" msgid="2746490691815392491">"Unsupported message type. Call <xliff:g id="NUMBER">%s</xliff:g> to listen."</string>
-    <string name="change_pin_title" msgid="1363830310845461697">"Change voicemail PIN"</string>
-    <string name="change_pin_continue_label" msgid="9184635195162827832">"Continue"</string>
-    <string name="change_pin_cancel_label" msgid="7258783861113501519">"Cancel"</string>
-    <string name="change_pin_ok_label" msgid="4527043915415428629">"OK"</string>
-    <string name="change_pin_enter_old_pin_header" msgid="1375728090965833028">"Confirm your old PIN"</string>
-    <string name="change_pin_enter_old_pin_hint" msgid="1654231195871094175">"Enter your voicemail PIN to continue."</string>
-    <string name="change_pin_enter_new_pin_header" msgid="7142620840890909719">"Set a new PIN"</string>
-    <string name="change_pin_enter_new_pin_hint" msgid="1289662932759932217">"PIN must be <xliff:g id="MIN">%1$d</xliff:g>–<xliff:g id="MAX">%2$d</xliff:g> digits long."</string>
-    <string name="change_pin_confirm_pin_header" msgid="7282604363655862136">"Confirm your PIN"</string>
-    <string name="change_pin_confirm_pins_dont_match" msgid="8626742552205369433">"PINs don\'t match"</string>
-    <string name="change_pin_succeeded" msgid="6869403202124894671">"Voicemail PIN updated"</string>
-    <string name="change_pin_system_error" msgid="5762853042379833829">"Unable to set PIN"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="vvm_unsupported_message_format">Unsupported message type. Call %s to listen.</string>
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-es-rUS/strings.xml b/java/com/android/voicemail/impl/res/values-es-rUS/strings.xml
index f5aeeb9..61a2caa 100644
--- a/java/com/android/voicemail/impl/res/values-es-rUS/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-es-rUS/strings.xml
@@ -1,49 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_settings_with_label" msgid="563926539137546586">"Buzón de voz (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
-    <string name="voicemail_settings_title" msgid="6685263321755930738">"Buzón de voz"</string>
-    <string name="voicemail_notifications_preference_title" msgid="3490553930230492405">"Notificaciones"</string>
-    <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"Configuración avanzada"</string>
-    <string name="voicemail_visual_voicemail_switch_title" msgid="3158454817165714998">"Buzón de voz visual"</string>
-    <string name="voicemail_visual_voicemail_auto_archive_switch_title" msgid="7120443850486401455">"Copia de seguridad y almacenamiento adicional"</string>
-    <string name="voicemail_set_pin_preference_title" msgid="1034691230818233684">"Establecer PIN"</string>
-    <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"Cambiar PIN"</string>
-    <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"El buzón de voz visual se debe activar para cambiar el PIN"</string>
-    <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"El buzón de voz visual aún no está activado. Vuelve a intentarlo más tarde."</string>
-    <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"Espera."</string>
-    <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"El PIN nuevo es demasiado corto."</string>
-    <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"El PIN nuevo es demasiado largo."</string>
-    <string name="vm_change_pin_error_too_weak" msgid="5865254034338293113">"El PIN nuevo es demasiado inseguro. Una contraseña segura no debe tener secuencias continuas ni dígitos repetidos."</string>
-    <string name="vm_change_pin_error_mismatch" msgid="3682667971009913553">"El PIN anterior no coincide."</string>
-    <string name="vm_change_pin_error_invalid" msgid="4317397281749196545">"El PIN nuevo contiene caracteres no válidos."</string>
-    <string name="vm_change_pin_error_system_error" msgid="5972056058776852411">"No se puede cambiar el PIN"</string>
-    <string name="vvm_unsupported_message_format" msgid="2746490691815392491">"No se admite el tipo de mensaje. Llama al <xliff:g id="NUMBER">%s</xliff:g> para escucharlo."</string>
-    <string name="change_pin_title" msgid="1363830310845461697">"Cambiar el PIN del buzón de voz"</string>
-    <string name="change_pin_continue_label" msgid="9184635195162827832">"Continuar"</string>
-    <string name="change_pin_cancel_label" msgid="7258783861113501519">"Cancelar"</string>
-    <string name="change_pin_ok_label" msgid="4527043915415428629">"Aceptar"</string>
-    <string name="change_pin_enter_old_pin_header" msgid="1375728090965833028">"Confirmar el PIN anterior"</string>
-    <string name="change_pin_enter_old_pin_hint" msgid="1654231195871094175">"Ingresa el PIN del buzón de voz para continuar."</string>
-    <string name="change_pin_enter_new_pin_header" msgid="7142620840890909719">"Establecer un PIN nuevo"</string>
-    <string name="change_pin_enter_new_pin_hint" msgid="1289662932759932217">"El PIN debe tener entre <xliff:g id="MIN">%1$d</xliff:g> y <xliff:g id="MAX">%2$d</xliff:g> dígitos."</string>
-    <string name="change_pin_confirm_pin_header" msgid="7282604363655862136">"Confirmar el PIN"</string>
-    <string name="change_pin_confirm_pins_dont_match" msgid="8626742552205369433">"Los PIN no coinciden"</string>
-    <string name="change_pin_succeeded" msgid="6869403202124894671">"Se actualizó el PIN del buzón de voz"</string>
-    <string name="change_pin_system_error" msgid="5762853042379833829">"No se puede establecer el PIN"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="vvm_unsupported_message_format">No se admite el tipo de mensaje. Llama al %s para escucharlo.</string>
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-es/strings.xml b/java/com/android/voicemail/impl/res/values-es/strings.xml
index 3dc1713..2fd9dd6 100644
--- a/java/com/android/voicemail/impl/res/values-es/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-es/strings.xml
@@ -1,49 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_settings_with_label" msgid="563926539137546586">"Buzón de voz (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
-    <string name="voicemail_settings_title" msgid="6685263321755930738">"Buzón de voz"</string>
-    <string name="voicemail_notifications_preference_title" msgid="3490553930230492405">"Notificaciones"</string>
-    <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"Configuración avanzada"</string>
-    <string name="voicemail_visual_voicemail_switch_title" msgid="3158454817165714998">"Buzón de voz visual"</string>
-    <string name="voicemail_visual_voicemail_auto_archive_switch_title" msgid="7120443850486401455">"Copias de seguridad y almacenamiento extra"</string>
-    <string name="voicemail_set_pin_preference_title" msgid="1034691230818233684">"Establecer PIN"</string>
-    <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"Cambiar PIN"</string>
-    <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"Para poder cambiar el PIN, el buzón de voz visual debe estar habilitado"</string>
-    <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"El buzón de voz visual aún no está activado; inténtalo de nuevo más tarde"</string>
-    <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"Espera..."</string>
-    <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"El PIN nuevo es muy corto."</string>
-    <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"El PIN nuevo es muy largo."</string>
-    <string name="vm_change_pin_error_too_weak" msgid="5865254034338293113">"El PIN nuevo no es lo bastante seguro. Una contraseña segura no debería contener secuencias continuas ni dígitos repetidos."</string>
-    <string name="vm_change_pin_error_mismatch" msgid="3682667971009913553">"El PIN antiguo no coincide."</string>
-    <string name="vm_change_pin_error_invalid" msgid="4317397281749196545">"El PIN nuevo contiene caracteres no válidos."</string>
-    <string name="vm_change_pin_error_system_error" msgid="5972056058776852411">"No hemos podido cambiar el PIN"</string>
-    <string name="vvm_unsupported_message_format" msgid="2746490691815392491">"Este tipo de mensaje no se admite. Llama al <xliff:g id="NUMBER">%s</xliff:g> para escucharlo."</string>
-    <string name="change_pin_title" msgid="1363830310845461697">"Cambiar el PIN del buzón de voz"</string>
-    <string name="change_pin_continue_label" msgid="9184635195162827832">"Continuar"</string>
-    <string name="change_pin_cancel_label" msgid="7258783861113501519">"Cancelar"</string>
-    <string name="change_pin_ok_label" msgid="4527043915415428629">"Aceptar"</string>
-    <string name="change_pin_enter_old_pin_header" msgid="1375728090965833028">"Confirma tu PIN antiguo"</string>
-    <string name="change_pin_enter_old_pin_hint" msgid="1654231195871094175">"Para continuar, escribe tu PIN del buzón de voz."</string>
-    <string name="change_pin_enter_new_pin_header" msgid="7142620840890909719">"Establece un PIN nuevo"</string>
-    <string name="change_pin_enter_new_pin_hint" msgid="1289662932759932217">"El PIN debe tener entre <xliff:g id="MIN">%1$d</xliff:g> y <xliff:g id="MAX">%2$d</xliff:g> dígitos."</string>
-    <string name="change_pin_confirm_pin_header" msgid="7282604363655862136">"Confirma el PIN"</string>
-    <string name="change_pin_confirm_pins_dont_match" msgid="8626742552205369433">"Los PIN no coinciden"</string>
-    <string name="change_pin_succeeded" msgid="6869403202124894671">"Se ha cambiado el PIN del buzón de voz"</string>
-    <string name="change_pin_system_error" msgid="5762853042379833829">"No se ha podido establecer el PIN"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="vvm_unsupported_message_format">Este tipo de mensaje no se admite. Llama al %s para escucharlo.</string>
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-et/strings.xml b/java/com/android/voicemail/impl/res/values-et/strings.xml
index e964dcd..b9e3737 100644
--- a/java/com/android/voicemail/impl/res/values-et/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-et/strings.xml
@@ -1,49 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_settings_with_label" msgid="563926539137546586">"Kõnepost (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
-    <string name="voicemail_settings_title" msgid="6685263321755930738">"Kõnepost"</string>
-    <string name="voicemail_notifications_preference_title" msgid="3490553930230492405">"Märguanded"</string>
-    <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"Täpsemad seaded"</string>
-    <string name="voicemail_visual_voicemail_switch_title" msgid="3158454817165714998">"Visuaalne kõnepost"</string>
-    <string name="voicemail_visual_voicemail_auto_archive_switch_title" msgid="7120443850486401455">"Lisavarundus ja -salvestusruum"</string>
-    <string name="voicemail_set_pin_preference_title" msgid="1034691230818233684">"PIN-koodi määramine"</string>
-    <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"PIN-koodi muutmine"</string>
-    <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"PIN-koodi muutmiseks peab olema lubatud visuaalne kõnepost"</string>
-    <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"Visuaalne kõnepost pole veel aktiveeritud, proovige hiljem uuesti"</string>
-    <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"Oodake."</string>
-    <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"Uus PIN-kood on liiga lühike."</string>
-    <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"Uus PIN-kood on liiga pikk."</string>
-    <string name="vm_change_pin_error_too_weak" msgid="5865254034338293113">"Uus PIN-kood on liiga nõrk. Tugevas paroolis ei tohi olla mitut järjestikust samasugust tähemärki ega korduvaid numbreid."</string>
-    <string name="vm_change_pin_error_mismatch" msgid="3682667971009913553">"Vana PIN-kood ei ühti."</string>
-    <string name="vm_change_pin_error_invalid" msgid="4317397281749196545">"Uus PIN-kood sisaldab sobimatuid tähemärke."</string>
-    <string name="vm_change_pin_error_system_error" msgid="5972056058776852411">"PIN-koodi ei õnnestu muuta"</string>
-    <string name="vvm_unsupported_message_format" msgid="2746490691815392491">"Toetamata sõnumi tüüp, kuulamiseks helistage numbrile <xliff:g id="NUMBER">%s</xliff:g>."</string>
-    <string name="change_pin_title" msgid="1363830310845461697">"Kõneposti PIN-koodi muutmine"</string>
-    <string name="change_pin_continue_label" msgid="9184635195162827832">"Jätka"</string>
-    <string name="change_pin_cancel_label" msgid="7258783861113501519">"Tühista"</string>
-    <string name="change_pin_ok_label" msgid="4527043915415428629">"OK"</string>
-    <string name="change_pin_enter_old_pin_header" msgid="1375728090965833028">"Kinnitage vana PIN-kood"</string>
-    <string name="change_pin_enter_old_pin_hint" msgid="1654231195871094175">"Jätkamiseks sisestage kõneposti PIN-kood."</string>
-    <string name="change_pin_enter_new_pin_header" msgid="7142620840890909719">"Määrake uus PIN-kood"</string>
-    <string name="change_pin_enter_new_pin_hint" msgid="1289662932759932217">"PIN-kood peab olema vahemikus <xliff:g id="MIN">%1$d</xliff:g>–<xliff:g id="MAX">%2$d</xliff:g> numbrit."</string>
-    <string name="change_pin_confirm_pin_header" msgid="7282604363655862136">"Kinnitage PIN-kood"</string>
-    <string name="change_pin_confirm_pins_dont_match" msgid="8626742552205369433">"PIN-koodid ei ühti"</string>
-    <string name="change_pin_succeeded" msgid="6869403202124894671">"Kõneposti PIN-koodi värskendati"</string>
-    <string name="change_pin_system_error" msgid="5762853042379833829">"PIN-koodi ei saa määrata"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="vvm_unsupported_message_format">Toetamata sõnumi tüüp, kuulamiseks helistage numbrile %s.</string>
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-eu/strings.xml b/java/com/android/voicemail/impl/res/values-eu/strings.xml
index 398ff23..ab0797d 100644
--- a/java/com/android/voicemail/impl/res/values-eu/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-eu/strings.xml
@@ -1,49 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_settings_with_label" msgid="563926539137546586">"Erantzungailua (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
-    <string name="voicemail_settings_title" msgid="6685263321755930738">"Erantzungailua"</string>
-    <string name="voicemail_notifications_preference_title" msgid="3490553930230492405">"Jakinarazpenak"</string>
-    <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"Ezarpen aurreratuak"</string>
-    <string name="voicemail_visual_voicemail_switch_title" msgid="3158454817165714998">"Ikusizko erantzungailua"</string>
-    <string name="voicemail_visual_voicemail_auto_archive_switch_title" msgid="7120443850486401455">"Babeskopiak eta edukia gordetzeko tokia"</string>
-    <string name="voicemail_set_pin_preference_title" msgid="1034691230818233684">"Ezarri PIN kodea"</string>
-    <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"Aldatu PIN kodea"</string>
-    <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"Ikusizko erantzungailuak gaituta egon behar du PIN kodea aldatu ahal izateko"</string>
-    <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"Oraindik ez dago aktibatuta ikusizko erantzungailua. Saiatu berriro geroago."</string>
-    <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"Itxaron, mesedez."</string>
-    <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"Laburregia da PIN kode berria."</string>
-    <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"Luzeegia da PIN kode berria."</string>
-    <string name="vm_change_pin_error_too_weak" msgid="5865254034338293113">"Ez da batere segurua PIN kode berria. Pasahitza segurua izan dadin, ez du izan behar zenbaki-segidarik edo errepikatutako zenbakirik."</string>
-    <string name="vm_change_pin_error_mismatch" msgid="3682667971009913553">"PIN kode zaharra ez dator bat."</string>
-    <string name="vm_change_pin_error_invalid" msgid="4317397281749196545">"Balio ez duten karaktereak ditu PIN kode berriak."</string>
-    <string name="vm_change_pin_error_system_error" msgid="5972056058776852411">"Ezin da aldatu PIN kodea"</string>
-    <string name="vvm_unsupported_message_format" msgid="2746490691815392491">"Ez dira onartzen mota honetako mezuak. Entzuteko, deitu <xliff:g id="NUMBER">%s</xliff:g> zenbakira."</string>
-    <string name="change_pin_title" msgid="1363830310845461697">"Aldatu erantzungailuaren PIN kodea"</string>
-    <string name="change_pin_continue_label" msgid="9184635195162827832">"Egin aurrera"</string>
-    <string name="change_pin_cancel_label" msgid="7258783861113501519">"Utzi"</string>
-    <string name="change_pin_ok_label" msgid="4527043915415428629">"Ados"</string>
-    <string name="change_pin_enter_old_pin_header" msgid="1375728090965833028">"Berretsi PIN kode zaharra"</string>
-    <string name="change_pin_enter_old_pin_hint" msgid="1654231195871094175">"Aurrera egiteko, idatzi erantzungailuaren PIN kodea."</string>
-    <string name="change_pin_enter_new_pin_header" msgid="7142620840890909719">"Ezarri PIN kode berria"</string>
-    <string name="change_pin_enter_new_pin_hint" msgid="1289662932759932217">"<xliff:g id="MIN">%1$d</xliff:g> eta <xliff:g id="MAX">%2$d</xliff:g> digituren artean izan behar ditu PIN kodeak."</string>
-    <string name="change_pin_confirm_pin_header" msgid="7282604363655862136">"Berretsi PIN kodea"</string>
-    <string name="change_pin_confirm_pins_dont_match" msgid="8626742552205369433">"PIN kodeak ez datoz bat"</string>
-    <string name="change_pin_succeeded" msgid="6869403202124894671">"Eguneratu da erantzungailuaren PIN kodea"</string>
-    <string name="change_pin_system_error" msgid="5762853042379833829">"Ezin da ezarri PIN kodea"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="vvm_unsupported_message_format">Ez dira onartzen mota honetako mezuak. Entzuteko, deitu %s zenbakira.</string>
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-fa/strings.xml b/java/com/android/voicemail/impl/res/values-fa/strings.xml
index c57da26..9865c78 100644
--- a/java/com/android/voicemail/impl/res/values-fa/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-fa/strings.xml
@@ -1,49 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_settings_with_label" msgid="563926539137546586">"پست صوتی (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
-    <string name="voicemail_settings_title" msgid="6685263321755930738">"پست صوتی"</string>
-    <string name="voicemail_notifications_preference_title" msgid="3490553930230492405">"اعلان‌ها"</string>
-    <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"تنظیمات پیشرفته"</string>
-    <string name="voicemail_visual_voicemail_switch_title" msgid="3158454817165714998">"پست صوتی تصویری"</string>
-    <string name="voicemail_visual_voicemail_auto_archive_switch_title" msgid="7120443850486401455">"پشتیبان‌گیری و فضای ذخیره‌سازی اضافی"</string>
-    <string name="voicemail_set_pin_preference_title" msgid="1034691230818233684">"تنظیم پین"</string>
-    <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"تغییر پین"</string>
-    <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"برای تغییر پین، پست صوتی تصویری باید فعال شود"</string>
-    <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"پست صوتی تصویری هنوز فعال نشده است، لطفاً بعداً دوباره امتحان کنید"</string>
-    <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"لطفاً منتظر بمانید."</string>
-    <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"پین جدید خیلی کوتاه است."</string>
-    <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"پین جدید خیلی طولانی است."</string>
-    <string name="vm_change_pin_error_too_weak" msgid="5865254034338293113">"پین جدید خیلی ضعیف است. گذرواژه قوی نباید توالی عددی باشد یا عدد تکراری داشته باشد."</string>
-    <string name="vm_change_pin_error_mismatch" msgid="3682667971009913553">"پین قدیمی مطابقت ندارد."</string>
-    <string name="vm_change_pin_error_invalid" msgid="4317397281749196545">"پین جدید نویسه‌های نامعتبری دارد."</string>
-    <string name="vm_change_pin_error_system_error" msgid="5972056058776852411">"پین تغییر نکرد"</string>
-    <string name="vvm_unsupported_message_format" msgid="2746490691815392491">"نوع پیام پشتیبانی نمی‌شود، برای شنیدن با <xliff:g id="NUMBER">%s</xliff:g> تماس بگیرید."</string>
-    <string name="change_pin_title" msgid="1363830310845461697">"تغییر پین پست صوتی"</string>
-    <string name="change_pin_continue_label" msgid="9184635195162827832">"ادامه"</string>
-    <string name="change_pin_cancel_label" msgid="7258783861113501519">"لغو"</string>
-    <string name="change_pin_ok_label" msgid="4527043915415428629">"تأیید"</string>
-    <string name="change_pin_enter_old_pin_header" msgid="1375728090965833028">"تأیید پین قدیمی"</string>
-    <string name="change_pin_enter_old_pin_hint" msgid="1654231195871094175">"برای ادامه دادن، پین پست صوتی را وارد کنید."</string>
-    <string name="change_pin_enter_new_pin_header" msgid="7142620840890909719">"تنظیم پین جدید"</string>
-    <string name="change_pin_enter_new_pin_hint" msgid="1289662932759932217">"پین باید <xliff:g id="MIN">%1$d</xliff:g> تا <xliff:g id="MAX">%2$d</xliff:g> رقم داشته باشد."</string>
-    <string name="change_pin_confirm_pin_header" msgid="7282604363655862136">"تأیید پین"</string>
-    <string name="change_pin_confirm_pins_dont_match" msgid="8626742552205369433">"پین‌ها با یکدیگر مطابقت ندارند"</string>
-    <string name="change_pin_succeeded" msgid="6869403202124894671">"پین پست صوتی به‌روزرسانی شد"</string>
-    <string name="change_pin_system_error" msgid="5762853042379833829">"پین تنظیم نشد"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="vvm_unsupported_message_format">نوع پیام پشتیبانی نمی‌شود، برای شنیدن با %s تماس بگیرید.</string>
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-fi/strings.xml b/java/com/android/voicemail/impl/res/values-fi/strings.xml
index bb1d2d0..eef6fba 100644
--- a/java/com/android/voicemail/impl/res/values-fi/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-fi/strings.xml
@@ -1,49 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_settings_with_label" msgid="563926539137546586">"Vastaaja (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
-    <string name="voicemail_settings_title" msgid="6685263321755930738">"Vastaaja"</string>
-    <string name="voicemail_notifications_preference_title" msgid="3490553930230492405">"Ilmoitukset"</string>
-    <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"Lisäasetukset"</string>
-    <string name="voicemail_visual_voicemail_switch_title" msgid="3158454817165714998">"Visuaalinen vastaaja"</string>
-    <string name="voicemail_visual_voicemail_auto_archive_switch_title" msgid="7120443850486401455">"Lisävarmuuskopiointi ja ‑tallennustila"</string>
-    <string name="voicemail_set_pin_preference_title" msgid="1034691230818233684">"Aseta PIN-koodi"</string>
-    <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"Vaihda PIN-koodi"</string>
-    <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"Ota visuaalinen puhelinvastaaja käyttöön, jotta voit vaihtaa PIN-koodin."</string>
-    <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"Visuaalista puhelinvastaajaa ei ole vielä aktivoitu. Yritä myöhemmin uudelleen."</string>
-    <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"Odota."</string>
-    <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"Uusi PIN-koodi on liian lyhyt."</string>
-    <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"Uusi PIN-koodi on liian pitkä."</string>
-    <string name="vm_change_pin_error_too_weak" msgid="5865254034338293113">"Uusi PIN-koodi on liian heikko. Vahvassa salasanassa ei saa olla peräkkäisiä tai toistuvia numeroita."</string>
-    <string name="vm_change_pin_error_mismatch" msgid="3682667971009913553">"Vanha PIN-koodi ei täsmää."</string>
-    <string name="vm_change_pin_error_invalid" msgid="4317397281749196545">"Uusi PIN-koodi sisältää virheellisiä merkkejä."</string>
-    <string name="vm_change_pin_error_system_error" msgid="5972056058776852411">"PIN-koodin vaihtaminen epäonnistui."</string>
-    <string name="vvm_unsupported_message_format" msgid="2746490691815392491">"Viestin tyyppiä ei tueta. Kuuntele soittamalla numeroon <xliff:g id="NUMBER">%s</xliff:g>."</string>
-    <string name="change_pin_title" msgid="1363830310845461697">"Vaihda vastaajan PIN-koodi"</string>
-    <string name="change_pin_continue_label" msgid="9184635195162827832">"Jatka"</string>
-    <string name="change_pin_cancel_label" msgid="7258783861113501519">"Peruuta"</string>
-    <string name="change_pin_ok_label" msgid="4527043915415428629">"OK"</string>
-    <string name="change_pin_enter_old_pin_header" msgid="1375728090965833028">"Vahvista vanha PIN-koodi"</string>
-    <string name="change_pin_enter_old_pin_hint" msgid="1654231195871094175">"Jatka antamalla vastaajasi PIN-koodi."</string>
-    <string name="change_pin_enter_new_pin_header" msgid="7142620840890909719">"Määritä uusi PIN-koodi"</string>
-    <string name="change_pin_enter_new_pin_hint" msgid="1289662932759932217">"PIN-koodissa on oltava <xliff:g id="MIN">%1$d</xliff:g>–<xliff:g id="MAX">%2$d</xliff:g> merkkiä."</string>
-    <string name="change_pin_confirm_pin_header" msgid="7282604363655862136">"Vahvista PIN-koodi"</string>
-    <string name="change_pin_confirm_pins_dont_match" msgid="8626742552205369433">"PIN-koodit eivät täsmää."</string>
-    <string name="change_pin_succeeded" msgid="6869403202124894671">"Vastaajan PIN-koodi on päivitetty."</string>
-    <string name="change_pin_system_error" msgid="5762853042379833829">"PIN-koodin määrittäminen epäonnistui."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="vvm_unsupported_message_format">Viestin tyyppiä ei tueta. Kuuntele soittamalla numeroon %s.</string>
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-fr-rCA/strings.xml b/java/com/android/voicemail/impl/res/values-fr-rCA/strings.xml
index 92b7df6..506c24e 100644
--- a/java/com/android/voicemail/impl/res/values-fr-rCA/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-fr-rCA/strings.xml
@@ -1,49 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_settings_with_label" msgid="563926539137546586">"Messagerie vocale (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
-    <string name="voicemail_settings_title" msgid="6685263321755930738">"Messagerie vocale"</string>
-    <string name="voicemail_notifications_preference_title" msgid="3490553930230492405">"Notifications"</string>
-    <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"Paramètres avancés"</string>
-    <string name="voicemail_visual_voicemail_switch_title" msgid="3158454817165714998">"Messagerie vocale visuelle"</string>
-    <string name="voicemail_visual_voicemail_auto_archive_switch_title" msgid="7120443850486401455">"Espace suppl. de sauvegarde et stockage"</string>
-    <string name="voicemail_set_pin_preference_title" msgid="1034691230818233684">"Définir un NIP"</string>
-    <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"Modifier le NIP"</string>
-    <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"La messagerie vocale visuelle doit être activée pour que vous puissiez modifier votre NIP"</string>
-    <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"La messagerie vocale visuelle n\'a pas encore été activée. Veuillez réessayer plus tard"</string>
-    <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"Veuillez patienter."</string>
-    <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"Le nouveau NIP est trop court."</string>
-    <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"Le nouveau NIP est trop long."</string>
-    <string name="vm_change_pin_error_too_weak" msgid="5865254034338293113">"Le nouveau NIP n\'est pas assez robuste. Il ne devrait pas contenir de séquences continues ni de chiffres répétés."</string>
-    <string name="vm_change_pin_error_mismatch" msgid="3682667971009913553">"Le NIP entré ne correspond pas à l\'ancien NIP."</string>
-    <string name="vm_change_pin_error_invalid" msgid="4317397281749196545">"Le nouveau NIP contient des caractères incorrects."</string>
-    <string name="vm_change_pin_error_system_error" msgid="5972056058776852411">"Impossible de modifier le NIP"</string>
-    <string name="vvm_unsupported_message_format" msgid="2746490691815392491">"Type de message non pris en charge. Composez le <xliff:g id="NUMBER">%s</xliff:g> pour l\'écouter."</string>
-    <string name="change_pin_title" msgid="1363830310845461697">"Modifier le NIP de la messagerie vocale"</string>
-    <string name="change_pin_continue_label" msgid="9184635195162827832">"Continuer"</string>
-    <string name="change_pin_cancel_label" msgid="7258783861113501519">"Annuler"</string>
-    <string name="change_pin_ok_label" msgid="4527043915415428629">"OK"</string>
-    <string name="change_pin_enter_old_pin_header" msgid="1375728090965833028">"Confirmez votre ancien NIP"</string>
-    <string name="change_pin_enter_old_pin_hint" msgid="1654231195871094175">"Entrez votre NIP de messagerie vocale pour continuer."</string>
-    <string name="change_pin_enter_new_pin_header" msgid="7142620840890909719">"Choisissez un nouveau NIP"</string>
-    <string name="change_pin_enter_new_pin_hint" msgid="1289662932759932217">"Le NIP doit comporter entre <xliff:g id="MIN">%1$d</xliff:g> et <xliff:g id="MAX">%2$d</xliff:g> chiffres."</string>
-    <string name="change_pin_confirm_pin_header" msgid="7282604363655862136">"Confirmez votre NIP"</string>
-    <string name="change_pin_confirm_pins_dont_match" msgid="8626742552205369433">"Les NIP ne correspondent pas"</string>
-    <string name="change_pin_succeeded" msgid="6869403202124894671">"NIP de messagerie vocale mis à jour"</string>
-    <string name="change_pin_system_error" msgid="5762853042379833829">"Impossible de définir le NIP"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="vvm_unsupported_message_format">Type de message non pris en charge. Composez le %s pour l\'écouter.</string>
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-fr/strings.xml b/java/com/android/voicemail/impl/res/values-fr/strings.xml
index 771c324..7a68426 100644
--- a/java/com/android/voicemail/impl/res/values-fr/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-fr/strings.xml
@@ -1,49 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_settings_with_label" msgid="563926539137546586">"Messagerie vocale (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
-    <string name="voicemail_settings_title" msgid="6685263321755930738">"Messagerie vocale"</string>
-    <string name="voicemail_notifications_preference_title" msgid="3490553930230492405">"Notifications"</string>
-    <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"Paramètres avancés"</string>
-    <string name="voicemail_visual_voicemail_switch_title" msgid="3158454817165714998">"Messagerie vocale visuelle"</string>
-    <string name="voicemail_visual_voicemail_auto_archive_switch_title" msgid="7120443850486401455">"Espace suppl. de sauvegarde et stockage"</string>
-    <string name="voicemail_set_pin_preference_title" msgid="1034691230818233684">"Définir le code secret"</string>
-    <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"Modifier le code secret"</string>
-    <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"Pour que vous puissiez modifier le code secret, la messagerie vocale visuelle doit être activée"</string>
-    <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"La messagerie vocale visuelle n\'est pas encore activée. Veuillez réessayer plus tard"</string>
-    <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"Veuillez patienter."</string>
-    <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"Le nouveau code est trop court."</string>
-    <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"Le nouveau code est trop long."</string>
-    <string name="vm_change_pin_error_too_weak" msgid="5865254034338293113">"Le nouveau code n\'est pas suffisamment sécurisé. Pour qu\'un mot de passe soit sûr, il ne doit pas contenir de chiffres qui se suivent ou qui se répètent."</string>
-    <string name="vm_change_pin_error_mismatch" msgid="3682667971009913553">"L\'ancien code est erroné."</string>
-    <string name="vm_change_pin_error_invalid" msgid="4317397281749196545">"Le nouveau code contient des caractères incorrects."</string>
-    <string name="vm_change_pin_error_system_error" msgid="5972056058776852411">"Impossible de modifier le code"</string>
-    <string name="vvm_unsupported_message_format" msgid="2746490691815392491">"Type de message incompatible. Composez le <xliff:g id="NUMBER">%s</xliff:g> pour l\'écouter."</string>
-    <string name="change_pin_title" msgid="1363830310845461697">"Modifier le code PIN de la messagerie vocale"</string>
-    <string name="change_pin_continue_label" msgid="9184635195162827832">"Continuer"</string>
-    <string name="change_pin_cancel_label" msgid="7258783861113501519">"Annuler"</string>
-    <string name="change_pin_ok_label" msgid="4527043915415428629">"OK"</string>
-    <string name="change_pin_enter_old_pin_header" msgid="1375728090965833028">"Confirmer votre ancien code"</string>
-    <string name="change_pin_enter_old_pin_hint" msgid="1654231195871094175">"Pour continuer, saisissez le code PIN de votre messagerie vocale."</string>
-    <string name="change_pin_enter_new_pin_header" msgid="7142620840890909719">"Définir un nouveau code"</string>
-    <string name="change_pin_enter_new_pin_hint" msgid="1289662932759932217">"Le code ne peut être composé que de chiffres de <xliff:g id="MIN">%1$d</xliff:g> à <xliff:g id="MAX">%2$d</xliff:g>."</string>
-    <string name="change_pin_confirm_pin_header" msgid="7282604363655862136">"Confirmer votre code"</string>
-    <string name="change_pin_confirm_pins_dont_match" msgid="8626742552205369433">"Les codes ne correspondent pas."</string>
-    <string name="change_pin_succeeded" msgid="6869403202124894671">"Le code de votre messagerie vocale a été mis à jour"</string>
-    <string name="change_pin_system_error" msgid="5762853042379833829">"Impossible de définir le code"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="vvm_unsupported_message_format">Type de message incompatible. Composez le %s pour l\'écouter.</string>
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-gl/strings.xml b/java/com/android/voicemail/impl/res/values-gl/strings.xml
index 22f401f..91656f7 100644
--- a/java/com/android/voicemail/impl/res/values-gl/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-gl/strings.xml
@@ -1,49 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_settings_with_label" msgid="563926539137546586">"Correo de voz (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
-    <string name="voicemail_settings_title" msgid="6685263321755930738">"Correo de voz"</string>
-    <string name="voicemail_notifications_preference_title" msgid="3490553930230492405">"Notificacións"</string>
-    <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"Configuración avanzada"</string>
-    <string name="voicemail_visual_voicemail_switch_title" msgid="3158454817165714998">"Correo de voz visual"</string>
-    <string name="voicemail_visual_voicemail_auto_archive_switch_title" msgid="7120443850486401455">"Copia de seguranza e almacenamento extra"</string>
-    <string name="voicemail_set_pin_preference_title" msgid="1034691230818233684">"Establecer PIN"</string>
-    <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"Cambiar PIN"</string>
-    <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"Para poder cambiar o PIN, o correo de voz visual ten que estar activado"</string>
-    <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"O correo de voz visual aínda non está activado. Téntao de novo máis tarde"</string>
-    <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"Agarda."</string>
-    <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"O novo PIN é demasiado curto."</string>
-    <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"O novo PIN é demasiado longo."</string>
-    <string name="vm_change_pin_error_too_weak" msgid="5865254034338293113">"O novo PIN é pouco seguro. Para que sexa seguro, non debe conter secuencias continuas nin díxitos repetidos."</string>
-    <string name="vm_change_pin_error_mismatch" msgid="3682667971009913553">"O PIN antigo non coincide."</string>
-    <string name="vm_change_pin_error_invalid" msgid="4317397281749196545">"O novo PIN contén caracteres non válidos."</string>
-    <string name="vm_change_pin_error_system_error" msgid="5972056058776852411">"Non se puido cambiar o PIN"</string>
-    <string name="vvm_unsupported_message_format" msgid="2746490691815392491">"Tipo de mensaxe non compatible. Chama ao <xliff:g id="NUMBER">%s</xliff:g> para escoitala."</string>
-    <string name="change_pin_title" msgid="1363830310845461697">"Cambiar PIN do correo de voz"</string>
-    <string name="change_pin_continue_label" msgid="9184635195162827832">"Continuar"</string>
-    <string name="change_pin_cancel_label" msgid="7258783861113501519">"Cancelar"</string>
-    <string name="change_pin_ok_label" msgid="4527043915415428629">"Aceptar"</string>
-    <string name="change_pin_enter_old_pin_header" msgid="1375728090965833028">"Confirmar o teu PIN antigo"</string>
-    <string name="change_pin_enter_old_pin_hint" msgid="1654231195871094175">"Introduce o PIN do teu correo de voz para continuar."</string>
-    <string name="change_pin_enter_new_pin_header" msgid="7142620840890909719">"Establecer un PIN novo"</string>
-    <string name="change_pin_enter_new_pin_hint" msgid="1289662932759932217">"O PIN debe conter entre <xliff:g id="MIN">%1$d</xliff:g> e <xliff:g id="MAX">%2$d</xliff:g> díxitos."</string>
-    <string name="change_pin_confirm_pin_header" msgid="7282604363655862136">"Confirmar o teu PIN"</string>
-    <string name="change_pin_confirm_pins_dont_match" msgid="8626742552205369433">"Os PIN non coinciden"</string>
-    <string name="change_pin_succeeded" msgid="6869403202124894671">"Actualizouse o PIN do correo de voz"</string>
-    <string name="change_pin_system_error" msgid="5762853042379833829">"Non se puido establecer o PIN"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="vvm_unsupported_message_format">Tipo de mensaxe non compatible. Chama ao %s para escoitala.</string>
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-gu/strings.xml b/java/com/android/voicemail/impl/res/values-gu/strings.xml
index 107fd47..6cd7b82 100644
--- a/java/com/android/voicemail/impl/res/values-gu/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-gu/strings.xml
@@ -1,49 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_settings_with_label" msgid="563926539137546586">"વૉઇસમેઇલ (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
-    <string name="voicemail_settings_title" msgid="6685263321755930738">"વૉઇસમેઇલ"</string>
-    <string name="voicemail_notifications_preference_title" msgid="3490553930230492405">"સૂચનાઓ"</string>
-    <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"વિગતવાર સેટિંગ્સ"</string>
-    <string name="voicemail_visual_voicemail_switch_title" msgid="3158454817165714998">"વિઝ્યુઅલ વૉઇસમેઇલ"</string>
-    <string name="voicemail_visual_voicemail_auto_archive_switch_title" msgid="7120443850486401455">"અતિરિક્ત બેકઅપ અને સ્ટોરેજ"</string>
-    <string name="voicemail_set_pin_preference_title" msgid="1034691230818233684">"PIN સેટ કરો"</string>
-    <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"PIN બદલો"</string>
-    <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"PIN બદલવા માટે વિઝ્યુઅલ વૉઇસમેઇલ સક્ષમ હોય તે આવશ્યક છે"</string>
-    <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"વિઝ્યુઅલ વૉઇસમેઇલ હજુ સુધી સક્રિય નથી, કૃપા કરીને પછીથી ફરી પ્રયાસ કરો"</string>
-    <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"કૃપા કરીને રાહ જુઓ."</string>
-    <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"નવો PIN ખૂબ ટૂંકો છે."</string>
-    <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"નવો PIN ખૂબ લાંબો છે."</string>
-    <string name="vm_change_pin_error_too_weak" msgid="5865254034338293113">"નવો PIN ખૂબ નબળો છે. સશક્ત પાસવર્ડ સતત ક્રમ અથવા પુનરાવર્તિત અંકો ધરાવતો હોવો જોઇએ નહીં."</string>
-    <string name="vm_change_pin_error_mismatch" msgid="3682667971009913553">"જૂનો PIN મેળ ખાતો નથી."</string>
-    <string name="vm_change_pin_error_invalid" msgid="4317397281749196545">"નવો PIN અમાન્ય અક્ષરો ધરાવે છે."</string>
-    <string name="vm_change_pin_error_system_error" msgid="5972056058776852411">"PIN બદલવામાં અસમર્થ"</string>
-    <string name="vvm_unsupported_message_format" msgid="2746490691815392491">"અસમર્થિત સંદેશ પ્રકાર, સાંભળવા માટે <xliff:g id="NUMBER">%s</xliff:g> પર કૉલ કરો."</string>
-    <string name="change_pin_title" msgid="1363830310845461697">"વૉઇસમેઇલ PIN બદલો"</string>
-    <string name="change_pin_continue_label" msgid="9184635195162827832">"ચાલુ રાખો"</string>
-    <string name="change_pin_cancel_label" msgid="7258783861113501519">"રદ કરો"</string>
-    <string name="change_pin_ok_label" msgid="4527043915415428629">"ઑકે"</string>
-    <string name="change_pin_enter_old_pin_header" msgid="1375728090965833028">"તમારા જૂના PIN ની પુષ્ટિ કરો"</string>
-    <string name="change_pin_enter_old_pin_hint" msgid="1654231195871094175">"ચાલુ રાખવા માટે તમારો વૉઇસમેઇલ PIN દાખલ કરો."</string>
-    <string name="change_pin_enter_new_pin_header" msgid="7142620840890909719">"એક નવો PIN સેટ કરો"</string>
-    <string name="change_pin_enter_new_pin_hint" msgid="1289662932759932217">"PIN <xliff:g id="MIN">%1$d</xliff:g>-<xliff:g id="MAX">%2$d</xliff:g> અંકનો હોવો આવશ્યક છે."</string>
-    <string name="change_pin_confirm_pin_header" msgid="7282604363655862136">"તમારા PIN ની પુષ્ટિ કરો"</string>
-    <string name="change_pin_confirm_pins_dont_match" msgid="8626742552205369433">"PIN મેળ ખાતા નથી"</string>
-    <string name="change_pin_succeeded" msgid="6869403202124894671">"વૉઇસમેઇલ PIN અપડેટ કર્યો"</string>
-    <string name="change_pin_system_error" msgid="5762853042379833829">"PIN સેટ કરવામાં અસમર્થ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="vvm_unsupported_message_format">અસમર્થિત સંદેશ પ્રકાર, સાંભળવા માટે %s પર કૉલ કરો.</string>
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-hi/strings.xml b/java/com/android/voicemail/impl/res/values-hi/strings.xml
index 8861370..63e568e 100644
--- a/java/com/android/voicemail/impl/res/values-hi/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-hi/strings.xml
@@ -1,49 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_settings_with_label" msgid="563926539137546586">"वॉइसमेल (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
-    <string name="voicemail_settings_title" msgid="6685263321755930738">"वॉइसमेल"</string>
-    <string name="voicemail_notifications_preference_title" msgid="3490553930230492405">"नोटिफ़िकेशन"</string>
-    <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"उन्नत सेटिंग"</string>
-    <string name="voicemail_visual_voicemail_switch_title" msgid="3158454817165714998">"विज़ुअल वॉइसमेल"</string>
-    <string name="voicemail_visual_voicemail_auto_archive_switch_title" msgid="7120443850486401455">"अतिरिक्त बैकअप और जगह"</string>
-    <string name="voicemail_set_pin_preference_title" msgid="1034691230818233684">"पिन सेट करें"</string>
-    <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"पिन बदलें"</string>
-    <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"पिन बदलने के लिए विज़ुअल वॉइसमेल ज़रूर सक्षम होना चाहिए"</string>
-    <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"विज़ुअल वॉइसमेल को अभी तक सक्रिय नहीं किया गया है, कृपया बाद में फिर से कोशिश करें"</string>
-    <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"कृपया प्रतीक्षा करें."</string>
-    <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"नया पिन बहुत छोटा है."</string>
-    <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"नया पिन बहुत बड़ा है."</string>
-    <string name="vm_change_pin_error_too_weak" msgid="5865254034338293113">"नया पिन बहुत कमज़ोर है. किसी सशक्त पासवर्ड में निरंतर क्रम या अंकों का दोहराव नहीं होना चाहिए."</string>
-    <string name="vm_change_pin_error_mismatch" msgid="3682667971009913553">"पुराने पिन का मिलान नहीं हो रहा है."</string>
-    <string name="vm_change_pin_error_invalid" msgid="4317397281749196545">"नए पिन में अमान्य वर्ण शामिल हैं."</string>
-    <string name="vm_change_pin_error_system_error" msgid="5972056058776852411">"पिन नहीं बदला जा सका"</string>
-    <string name="vvm_unsupported_message_format" msgid="2746490691815392491">"संदेश प्रकार काम नहीं कर रहा है, सुनने के लिए <xliff:g id="NUMBER">%s</xliff:g> पर कॉल करें."</string>
-    <string name="change_pin_title" msgid="1363830310845461697">"वॉइसमेल पिन बदलें"</string>
-    <string name="change_pin_continue_label" msgid="9184635195162827832">"जारी रखें"</string>
-    <string name="change_pin_cancel_label" msgid="7258783861113501519">"रद्द करें"</string>
-    <string name="change_pin_ok_label" msgid="4527043915415428629">"ठीक"</string>
-    <string name="change_pin_enter_old_pin_header" msgid="1375728090965833028">"अपने पुराने पिन की पुष्टि करें"</string>
-    <string name="change_pin_enter_old_pin_hint" msgid="1654231195871094175">"जारी रखने के लिए अपना वॉइसमेल पिन डालें."</string>
-    <string name="change_pin_enter_new_pin_header" msgid="7142620840890909719">"एक नया पिन सेट करें"</string>
-    <string name="change_pin_enter_new_pin_hint" msgid="1289662932759932217">"पिन में <xliff:g id="MIN">%1$d</xliff:g>-<xliff:g id="MAX">%2$d</xliff:g> अंक होने चाहिए."</string>
-    <string name="change_pin_confirm_pin_header" msgid="7282604363655862136">"अपने पिन की पुष्टि करें"</string>
-    <string name="change_pin_confirm_pins_dont_match" msgid="8626742552205369433">"पिन का मिलान नहीं हो रहा"</string>
-    <string name="change_pin_succeeded" msgid="6869403202124894671">"वॉइसमेल पिन अपडेट किया गया"</string>
-    <string name="change_pin_system_error" msgid="5762853042379833829">"पिन सेट नहीं किया जा सका"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="vvm_unsupported_message_format">संदेश प्रकार काम नहीं कर रहा है, सुनने के लिए %s पर कॉल करें.</string>
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-hr/strings.xml b/java/com/android/voicemail/impl/res/values-hr/strings.xml
index ee1bf1f..9202080 100644
--- a/java/com/android/voicemail/impl/res/values-hr/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-hr/strings.xml
@@ -1,49 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_settings_with_label" msgid="563926539137546586">"Govorna pošta (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
-    <string name="voicemail_settings_title" msgid="6685263321755930738">"Govorna pošta"</string>
-    <string name="voicemail_notifications_preference_title" msgid="3490553930230492405">"Obavijesti"</string>
-    <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"Napredne postavke"</string>
-    <string name="voicemail_visual_voicemail_switch_title" msgid="3158454817165714998">"Vizualna govorna pošta"</string>
-    <string name="voicemail_visual_voicemail_auto_archive_switch_title" msgid="7120443850486401455">"Dodatno sigurnosno kopiranje i pohrana"</string>
-    <string name="voicemail_set_pin_preference_title" msgid="1034691230818233684">"Postavljanje PIN-a"</string>
-    <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"Promjena PIN-a"</string>
-    <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"Za promjenu PIN-a potrebno je omogućiti vizualnu govornu poštu"</string>
-    <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"Vizualna govorna pošta još nije aktivirana, pokušajte ponovno kasnije"</string>
-    <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"Pričekajte."</string>
-    <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"Novi PIN je prekratak."</string>
-    <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"Novi PIN je predugačak."</string>
-    <string name="vm_change_pin_error_too_weak" msgid="5865254034338293113">"Novi je PIN preslab. Jaka zaporka ne smije sadržavati kontinuirani niz ili ponovljene znamenke."</string>
-    <string name="vm_change_pin_error_mismatch" msgid="3682667971009913553">"Stari se PIN ne podudara."</string>
-    <string name="vm_change_pin_error_invalid" msgid="4317397281749196545">"Novi PIN sadrži nevažeće znakove."</string>
-    <string name="vm_change_pin_error_system_error" msgid="5972056058776852411">"PIN se ne može promijeniti"</string>
-    <string name="vvm_unsupported_message_format" msgid="2746490691815392491">"Vrsta poruke nije podržana, nazovite <xliff:g id="NUMBER">%s</xliff:g> da biste je poslušali."</string>
-    <string name="change_pin_title" msgid="1363830310845461697">"Promjena PIN-a govorne pošte"</string>
-    <string name="change_pin_continue_label" msgid="9184635195162827832">"Nastavi"</string>
-    <string name="change_pin_cancel_label" msgid="7258783861113501519">"Odustani"</string>
-    <string name="change_pin_ok_label" msgid="4527043915415428629">"U redu"</string>
-    <string name="change_pin_enter_old_pin_header" msgid="1375728090965833028">"Potvrda starog PIN-a"</string>
-    <string name="change_pin_enter_old_pin_hint" msgid="1654231195871094175">"Da biste nastavili, unesite PIN za govornu poštu."</string>
-    <string name="change_pin_enter_new_pin_header" msgid="7142620840890909719">"Postavljanje novog PIN-a"</string>
-    <string name="change_pin_enter_new_pin_hint" msgid="1289662932759932217">"PIN mora sadržavati od <xliff:g id="MIN">%1$d</xliff:g> do <xliff:g id="MAX">%2$d</xliff:g> znamenki."</string>
-    <string name="change_pin_confirm_pin_header" msgid="7282604363655862136">"Potvrdite PIN"</string>
-    <string name="change_pin_confirm_pins_dont_match" msgid="8626742552205369433">"PIN-ovi se ne podudaraju"</string>
-    <string name="change_pin_succeeded" msgid="6869403202124894671">"Ažuriran je PIN govorne pošte"</string>
-    <string name="change_pin_system_error" msgid="5762853042379833829">"PIN se ne može postaviti"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="vvm_unsupported_message_format">Vrsta poruke nije podržana, nazovite %s da biste je poslušali.</string>
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-hu/strings.xml b/java/com/android/voicemail/impl/res/values-hu/strings.xml
index d761d40..c548d83 100644
--- a/java/com/android/voicemail/impl/res/values-hu/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-hu/strings.xml
@@ -1,49 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_settings_with_label" msgid="563926539137546586">"Hangposta (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
-    <string name="voicemail_settings_title" msgid="6685263321755930738">"Hangposta"</string>
-    <string name="voicemail_notifications_preference_title" msgid="3490553930230492405">"Értesítések"</string>
-    <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"Speciális beállítások"</string>
-    <string name="voicemail_visual_voicemail_switch_title" msgid="3158454817165714998">"Vizuális hangpostaüzenet"</string>
-    <string name="voicemail_visual_voicemail_auto_archive_switch_title" msgid="7120443850486401455">"Extra tárhely és biztonsági mentés"</string>
-    <string name="voicemail_set_pin_preference_title" msgid="1034691230818233684">"PIN-kód beállítása"</string>
-    <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"PIN-kód módosítása"</string>
-    <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"A PIN-kód módosításához engedélyezni kell a vizuális hangpostát."</string>
-    <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"A vizuális hangposta még nincs aktiválva. Engedélyezze később."</string>
-    <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"Kérjük, várjon."</string>
-    <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"Az új PIN-kód túl rövid."</string>
-    <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"Az új PIN-kód túl hosszú."</string>
-    <string name="vm_change_pin_error_too_weak" msgid="5865254034338293113">"Az új PIN-kód túl gyenge. Az erős jelszavakban nincsenek egymás után következő számok vagy ismétlődő számjegyek."</string>
-    <string name="vm_change_pin_error_mismatch" msgid="3682667971009913553">"A régi PIN-kód nem egyezik a tárolttal."</string>
-    <string name="vm_change_pin_error_invalid" msgid="4317397281749196545">"Az új PIN-kódban érvénytelen karakterek vannak."</string>
-    <string name="vm_change_pin_error_system_error" msgid="5972056058776852411">"Nem sikerült módosítani a PIN-kódot"</string>
-    <string name="vvm_unsupported_message_format" msgid="2746490691815392491">"Nem támogatott üzenettípus. Az üzenetet a következő telefonszámon hallgathatja meg: <xliff:g id="NUMBER">%s</xliff:g>."</string>
-    <string name="change_pin_title" msgid="1363830310845461697">"A hangposta PIN-kódjának módosítása"</string>
-    <string name="change_pin_continue_label" msgid="9184635195162827832">"Tovább"</string>
-    <string name="change_pin_cancel_label" msgid="7258783861113501519">"Mégse"</string>
-    <string name="change_pin_ok_label" msgid="4527043915415428629">"OK"</string>
-    <string name="change_pin_enter_old_pin_header" msgid="1375728090965833028">"A régi PIN-kód megerősítése"</string>
-    <string name="change_pin_enter_old_pin_hint" msgid="1654231195871094175">"A folytatáshoz írja be a hangpostához használt PIN-kódját."</string>
-    <string name="change_pin_enter_new_pin_header" msgid="7142620840890909719">"Új PIN-kód beállítása"</string>
-    <string name="change_pin_enter_new_pin_hint" msgid="1289662932759932217">"A PIN-kódnak <xliff:g id="MIN">%1$d</xliff:g>–<xliff:g id="MAX">%2$d</xliff:g> számjegyből kell állnia."</string>
-    <string name="change_pin_confirm_pin_header" msgid="7282604363655862136">"PIN-kód megerősítése"</string>
-    <string name="change_pin_confirm_pins_dont_match" msgid="8626742552205369433">"A PIN-kódok nem egyeznek"</string>
-    <string name="change_pin_succeeded" msgid="6869403202124894671">"A hangposta PIN-kódja megváltozott"</string>
-    <string name="change_pin_system_error" msgid="5762853042379833829">"Nem sikerült beállítani a PIN-kódot"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="vvm_unsupported_message_format">Nem támogatott üzenettípus. Az üzenetet a következő telefonszámon hallgathatja meg: %s.</string>
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-hy/strings.xml b/java/com/android/voicemail/impl/res/values-hy/strings.xml
index 008aeee..e48622b 100644
--- a/java/com/android/voicemail/impl/res/values-hy/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-hy/strings.xml
@@ -1,49 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_settings_with_label" msgid="563926539137546586">"Ձայնային փոստ (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
-    <string name="voicemail_settings_title" msgid="6685263321755930738">"Ձայնային փոստ"</string>
-    <string name="voicemail_notifications_preference_title" msgid="3490553930230492405">"Ծանուցումներ"</string>
-    <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"Ընդլայնված կարգավորումներ"</string>
-    <string name="voicemail_visual_voicemail_switch_title" msgid="3158454817165714998">"Տեսողական ձայնային փոստ"</string>
-    <string name="voicemail_visual_voicemail_auto_archive_switch_title" msgid="7120443850486401455">"Լրացուցիչ տարածք և պահուստավորում"</string>
-    <string name="voicemail_set_pin_preference_title" msgid="1034691230818233684">"Սահմանեք PIN կոդ"</string>
-    <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"Փոխեք PIN կոդը"</string>
-    <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"PIN կոդը փոխելու համար տեսողական ձայնային փոստը պետք է միացված լինի"</string>
-    <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"Տեսողական ձայնային փոստը դեռ ակտիվացված չէ: Փորձեք ավելի ուշ:"</string>
-    <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"Սպասեք:"</string>
-    <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"Նոր PIN կոդը չափազանց կարճ է:"</string>
-    <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"Նոր PIN կոդը չափազանց երկար է:"</string>
-    <string name="vm_change_pin_error_too_weak" msgid="5865254034338293113">"Նոր PIN կոդը բավականաչափ հուսալի չէ: Հուսալի գաղտնաբառը չպետք է ունենա իրար հաջորդող կամ կրկնվող թվեր:"</string>
-    <string name="vm_change_pin_error_mismatch" msgid="3682667971009913553">"Հին PIN կոդը սխալ է:"</string>
-    <string name="vm_change_pin_error_invalid" msgid="4317397281749196545">"Նոր PIN կոդը պարունակում է անվավեր գրանշաններ:"</string>
-    <string name="vm_change_pin_error_system_error" msgid="5972056058776852411">"Չհաջողվեց փոխել PIN կոդը"</string>
-    <string name="vvm_unsupported_message_format" msgid="2746490691815392491">"Հաղորդագրության չաջակցվող տեսակ, զանգեք <xliff:g id="NUMBER">%s</xliff:g> համարին՝ լսելու համար:"</string>
-    <string name="change_pin_title" msgid="1363830310845461697">"Փոխեք ձայնային փոստի PIN կոդը"</string>
-    <string name="change_pin_continue_label" msgid="9184635195162827832">"Շարունակել"</string>
-    <string name="change_pin_cancel_label" msgid="7258783861113501519">"Չեղարկել"</string>
-    <string name="change_pin_ok_label" msgid="4527043915415428629">"Լավ"</string>
-    <string name="change_pin_enter_old_pin_header" msgid="1375728090965833028">"Հաստատեք հին PIN կոդը"</string>
-    <string name="change_pin_enter_old_pin_hint" msgid="1654231195871094175">"Շարունակելու համար մուտքագրեք ձայնային փոստի PIN կոդը:"</string>
-    <string name="change_pin_enter_new_pin_header" msgid="7142620840890909719">"Ընտրեք նոր PIN կոդ"</string>
-    <string name="change_pin_enter_new_pin_hint" msgid="1289662932759932217">"PIN կոդը պետք է բաղկացած լինի <xliff:g id="MIN">%1$d</xliff:g>-<xliff:g id="MAX">%2$d</xliff:g> թվանշանից:"</string>
-    <string name="change_pin_confirm_pin_header" msgid="7282604363655862136">"Հաստատեք ձեր PIN կոդը"</string>
-    <string name="change_pin_confirm_pins_dont_match" msgid="8626742552205369433">"PIN կոդերը չեն համընկնում"</string>
-    <string name="change_pin_succeeded" msgid="6869403202124894671">"Ձայնային փոստի PIN կոդը թարմացվեց"</string>
-    <string name="change_pin_system_error" msgid="5762853042379833829">"Չհաջողվեց սահմանել PIN կոդ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="vvm_unsupported_message_format">Հաղորդագրության չաջակցվող տեսակ, զանգեք %s համարին՝ լսելու համար:</string>
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-in/strings.xml b/java/com/android/voicemail/impl/res/values-in/strings.xml
index cda3a1a..1b8d3de 100644
--- a/java/com/android/voicemail/impl/res/values-in/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-in/strings.xml
@@ -1,49 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_settings_with_label" msgid="563926539137546586">"Pesan Suara (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
-    <string name="voicemail_settings_title" msgid="6685263321755930738">"Pesan Suara"</string>
-    <string name="voicemail_notifications_preference_title" msgid="3490553930230492405">"Notifikasi"</string>
-    <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"Setelan Lanjutan"</string>
-    <string name="voicemail_visual_voicemail_switch_title" msgid="3158454817165714998">"Pesan Suara Visual"</string>
-    <string name="voicemail_visual_voicemail_auto_archive_switch_title" msgid="7120443850486401455">"Penyimpanan dan backup ekstra"</string>
-    <string name="voicemail_set_pin_preference_title" msgid="1034691230818233684">"Setel PIN"</string>
-    <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"Ubah PIN"</string>
-    <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"Pesan suara visual harus diaktifkan untuk mengubah PIN"</string>
-    <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"Pesan suara visual belum diaktifkan, coba lagi nanti"</string>
-    <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"Mohon tunggu."</string>
-    <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"PIN baru terlalu pendek."</string>
-    <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"PIN baru terlalu panjang."</string>
-    <string name="vm_change_pin_error_too_weak" msgid="5865254034338293113">"PIN baru terlalu lemah. Sandi yang kuat tidak boleh memiliki urutan karakter kontinu atau digit berulang."</string>
-    <string name="vm_change_pin_error_mismatch" msgid="3682667971009913553">"PIN lama tidak cocok."</string>
-    <string name="vm_change_pin_error_invalid" msgid="4317397281749196545">"PIN baru berisi karakter yang tidak valid."</string>
-    <string name="vm_change_pin_error_system_error" msgid="5972056058776852411">"Tidak dapat mengubah PIN"</string>
-    <string name="vvm_unsupported_message_format" msgid="2746490691815392491">"Tipe pesan tidak didukung, telepon <xliff:g id="NUMBER">%s</xliff:g> untuk mendengarkan."</string>
-    <string name="change_pin_title" msgid="1363830310845461697">"Ubah PIN Pesan Suara"</string>
-    <string name="change_pin_continue_label" msgid="9184635195162827832">"Lanjutkan"</string>
-    <string name="change_pin_cancel_label" msgid="7258783861113501519">"Batal"</string>
-    <string name="change_pin_ok_label" msgid="4527043915415428629">"Oke"</string>
-    <string name="change_pin_enter_old_pin_header" msgid="1375728090965833028">"Konfirmasi PIN lama Anda"</string>
-    <string name="change_pin_enter_old_pin_hint" msgid="1654231195871094175">"Masukkan PIN pesan suara Anda untuk melanjutkan."</string>
-    <string name="change_pin_enter_new_pin_header" msgid="7142620840890909719">"Setel PIN baru"</string>
-    <string name="change_pin_enter_new_pin_hint" msgid="1289662932759932217">"PIN harus <xliff:g id="MIN">%1$d</xliff:g>-<xliff:g id="MAX">%2$d</xliff:g> digit."</string>
-    <string name="change_pin_confirm_pin_header" msgid="7282604363655862136">"Konfirmasi PIN Anda"</string>
-    <string name="change_pin_confirm_pins_dont_match" msgid="8626742552205369433">"PIN tidak cocok"</string>
-    <string name="change_pin_succeeded" msgid="6869403202124894671">"PIN pesan suara diupdate"</string>
-    <string name="change_pin_system_error" msgid="5762853042379833829">"Tidak dapat menyetel PIN"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="vvm_unsupported_message_format">Tipe pesan tidak didukung, telepon %s untuk mendengarkan.</string>
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-is/strings.xml b/java/com/android/voicemail/impl/res/values-is/strings.xml
index 44ef9e0..7feddc0 100644
--- a/java/com/android/voicemail/impl/res/values-is/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-is/strings.xml
@@ -1,49 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_settings_with_label" msgid="563926539137546586">"Talhólf (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
-    <string name="voicemail_settings_title" msgid="6685263321755930738">"Talhólf"</string>
-    <string name="voicemail_notifications_preference_title" msgid="3490553930230492405">"Tilkynningar"</string>
-    <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"Ítarlegar stillingar"</string>
-    <string name="voicemail_visual_voicemail_switch_title" msgid="3158454817165714998">"Myndrænt talhólf"</string>
-    <string name="voicemail_visual_voicemail_auto_archive_switch_title" msgid="7120443850486401455">"Viðbótaröryggisafritun og samstilling"</string>
-    <string name="voicemail_set_pin_preference_title" msgid="1034691230818233684">"Stilla PIN-númer"</string>
-    <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"Breyta PIN-númeri"</string>
-    <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"Kveikt þarf að vera á myndrænu talhólfi til að breyta PIN-númeri"</string>
-    <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"Ekki er búið að virkja myndrænt talhólf. Reyndu aftur síðar"</string>
-    <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"Augnablik."</string>
-    <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"Nýja PIN-númerið er of stutt."</string>
-    <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"Nýja PIN-númerið er of langt."</string>
-    <string name="vm_change_pin_error_too_weak" msgid="5865254034338293113">"Nýja PIN-númerið er ekki nógu sterkt. Sterk aðgangsorð mega ekki vera með tölustafi í beinni röð eða endurtekna tölustafi."</string>
-    <string name="vm_change_pin_error_mismatch" msgid="3682667971009913553">"Gamla PIN-númerið passar ekki."</string>
-    <string name="vm_change_pin_error_invalid" msgid="4317397281749196545">"Nýja PIN-númerið inniheldur ógilda stafi."</string>
-    <string name="vm_change_pin_error_system_error" msgid="5972056058776852411">"Ekki var hægt að breyta PIN-númerinu"</string>
-    <string name="vvm_unsupported_message_format" msgid="2746490691815392491">"Óstudd skilaboðagerð, hringdu í <xliff:g id="NUMBER">%s</xliff:g> til að hlusta."</string>
-    <string name="change_pin_title" msgid="1363830310845461697">"Breyta PIN-númeri talhólfs"</string>
-    <string name="change_pin_continue_label" msgid="9184635195162827832">"Áfram"</string>
-    <string name="change_pin_cancel_label" msgid="7258783861113501519">"Hætta við"</string>
-    <string name="change_pin_ok_label" msgid="4527043915415428629">"Í lagi"</string>
-    <string name="change_pin_enter_old_pin_header" msgid="1375728090965833028">"Staðfestu gamla PIN-númerið"</string>
-    <string name="change_pin_enter_old_pin_hint" msgid="1654231195871094175">"Sláðu inn PIN-númerið fyrir talhólf til að halda áfram."</string>
-    <string name="change_pin_enter_new_pin_header" msgid="7142620840890909719">"Veldu nýtt PIN-númer"</string>
-    <string name="change_pin_enter_new_pin_hint" msgid="1289662932759932217">"PIN-númerið verður að vera <xliff:g id="MIN">%1$d</xliff:g>–<xliff:g id="MAX">%2$d</xliff:g> tölustafir."</string>
-    <string name="change_pin_confirm_pin_header" msgid="7282604363655862136">"Staðfestu PIN-númerið"</string>
-    <string name="change_pin_confirm_pins_dont_match" msgid="8626742552205369433">"PIN-númerin stemma ekki"</string>
-    <string name="change_pin_succeeded" msgid="6869403202124894671">"PIN-númer fyrir talhólf uppfært"</string>
-    <string name="change_pin_system_error" msgid="5762853042379833829">"Ekki hægt að stilla PIN-númer"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="vvm_unsupported_message_format">Óstudd skilaboðagerð, hringdu í %s til að hlusta.</string>
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-it/strings.xml b/java/com/android/voicemail/impl/res/values-it/strings.xml
index afbbbc2..466bbe3 100644
--- a/java/com/android/voicemail/impl/res/values-it/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-it/strings.xml
@@ -1,49 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_settings_with_label" msgid="563926539137546586">"Segreteria (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
-    <string name="voicemail_settings_title" msgid="6685263321755930738">"Segreteria"</string>
-    <string name="voicemail_notifications_preference_title" msgid="3490553930230492405">"Notifiche"</string>
-    <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"Impostazioni avanzate"</string>
-    <string name="voicemail_visual_voicemail_switch_title" msgid="3158454817165714998">"Leggi la segreteria"</string>
-    <string name="voicemail_visual_voicemail_auto_archive_switch_title" msgid="7120443850486401455">"Archiviazione supplementare e backup"</string>
-    <string name="voicemail_set_pin_preference_title" msgid="1034691230818233684">"Imposta PIN"</string>
-    <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"Cambia PIN"</string>
-    <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"La lettura delle segreteria deve essere attivata per cambiare il PIN"</string>
-    <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"Lettura della segreteria non attivata. Riprova più tardi"</string>
-    <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"Attendi."</string>
-    <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"Il nuovo PIN è troppo corto."</string>
-    <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"Il nuovo PIN è troppo lungo."</string>
-    <string name="vm_change_pin_error_too_weak" msgid="5865254034338293113">"Il nuovo PIN è troppo semplice. Una password efficace non deve contenere sequenze continue o cifre ripetute."</string>
-    <string name="vm_change_pin_error_mismatch" msgid="3682667971009913553">"Il vecchio PIN non corrisponde."</string>
-    <string name="vm_change_pin_error_invalid" msgid="4317397281749196545">"Il nuovo PIN contiene caratteri non validi."</string>
-    <string name="vm_change_pin_error_system_error" msgid="5972056058776852411">"Impossibile cambiare il PIN"</string>
-    <string name="vvm_unsupported_message_format" msgid="2746490691815392491">"Tipo di messaggio non supportato, chiama <xliff:g id="NUMBER">%s</xliff:g> per ascoltare."</string>
-    <string name="change_pin_title" msgid="1363830310845461697">"Cambia PIN segreteria"</string>
-    <string name="change_pin_continue_label" msgid="9184635195162827832">"Continua"</string>
-    <string name="change_pin_cancel_label" msgid="7258783861113501519">"Annulla"</string>
-    <string name="change_pin_ok_label" msgid="4527043915415428629">"OK"</string>
-    <string name="change_pin_enter_old_pin_header" msgid="1375728090965833028">"Conferma il PIN precedente"</string>
-    <string name="change_pin_enter_old_pin_hint" msgid="1654231195871094175">"Inserisci il PIN della segreteria per continuare."</string>
-    <string name="change_pin_enter_new_pin_header" msgid="7142620840890909719">"Imposta un nuovo PIN"</string>
-    <string name="change_pin_enter_new_pin_hint" msgid="1289662932759932217">"Il PIN deve contenere da <xliff:g id="MIN">%1$d</xliff:g> a <xliff:g id="MAX">%2$d</xliff:g> cifre."</string>
-    <string name="change_pin_confirm_pin_header" msgid="7282604363655862136">"Conferma il tuo PIN"</string>
-    <string name="change_pin_confirm_pins_dont_match" msgid="8626742552205369433">"I PIN non corrispondono"</string>
-    <string name="change_pin_succeeded" msgid="6869403202124894671">"PIN segreteria aggiornato"</string>
-    <string name="change_pin_system_error" msgid="5762853042379833829">"Impossibile impostare il PIN"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="vvm_unsupported_message_format">Tipo di messaggio non supportato, chiama %s per ascoltare.</string>
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-iw/strings.xml b/java/com/android/voicemail/impl/res/values-iw/strings.xml
index acc2e6c..c203c6e 100644
--- a/java/com/android/voicemail/impl/res/values-iw/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-iw/strings.xml
@@ -1,49 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_settings_with_label" msgid="563926539137546586">"דואר קולי (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
-    <string name="voicemail_settings_title" msgid="6685263321755930738">"דואר קולי"</string>
-    <string name="voicemail_notifications_preference_title" msgid="3490553930230492405">"עדכונים"</string>
-    <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"הגדרות מתקדמות"</string>
-    <string name="voicemail_visual_voicemail_switch_title" msgid="3158454817165714998">"דואר קולי ויזואלי"</string>
-    <string name="voicemail_visual_voicemail_auto_archive_switch_title" msgid="7120443850486401455">"גיבוי ופינוי מקום"</string>
-    <string name="voicemail_set_pin_preference_title" msgid="1034691230818233684">"הגדרת קוד גישה"</string>
-    <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"שינוי קוד הגישה"</string>
-    <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"צריך להפעיל את הדואר הקולי הוויזואלי כדי לשנות את קוד הגישה"</string>
-    <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"הדואר הקולי הוויזואלי לא הופעל עדיין. נסה שוב מאוחר יותר"</string>
-    <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"נא להמתין."</string>
-    <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"קוד הגישה החדש קצר מדי."</string>
-    <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"קוד הגישה החדש ארוך מדי."</string>
-    <string name="vm_change_pin_error_too_weak" msgid="5865254034338293113">"קוד הגישה החדש חלש מדי. בסיסמה חזקה אסור שיהיו ספרות ברצף מספרי או ספרות שחוזרות על עצמן."</string>
-    <string name="vm_change_pin_error_mismatch" msgid="3682667971009913553">"קוד הגישה הישן לא נכון."</string>
-    <string name="vm_change_pin_error_invalid" msgid="4317397281749196545">"קוד הגישה החדש מכיל תווים לא חוקיים."</string>
-    <string name="vm_change_pin_error_system_error" msgid="5972056058776852411">"לא ניתן היה לשנות את קוד הגישה"</string>
-    <string name="vvm_unsupported_message_format" msgid="2746490691815392491">"סוג ההודעה לא נתמך. התקשר למספר <xliff:g id="NUMBER">%s</xliff:g> כדי להאזין לה."</string>
-    <string name="change_pin_title" msgid="1363830310845461697">"שינוי של קוד הגישה לדואר הקולי"</string>
-    <string name="change_pin_continue_label" msgid="9184635195162827832">"המשך"</string>
-    <string name="change_pin_cancel_label" msgid="7258783861113501519">"ביטול"</string>
-    <string name="change_pin_ok_label" msgid="4527043915415428629">"אישור"</string>
-    <string name="change_pin_enter_old_pin_header" msgid="1375728090965833028">"אשר את קוד הגישה הישן"</string>
-    <string name="change_pin_enter_old_pin_hint" msgid="1654231195871094175">"הזן את קוד הגישה לדואר הקולי כדי להמשיך."</string>
-    <string name="change_pin_enter_new_pin_header" msgid="7142620840890909719">"הגדר קוד גישה חדש"</string>
-    <string name="change_pin_enter_new_pin_hint" msgid="1289662932759932217">"קוד הגישה חייב להיות באורך של <xliff:g id="MAX">%2$d</xliff:g>-<xliff:g id="MIN">%1$d</xliff:g> ספרות."</string>
-    <string name="change_pin_confirm_pin_header" msgid="7282604363655862136">"אשר את קוד הגישה"</string>
-    <string name="change_pin_confirm_pins_dont_match" msgid="8626742552205369433">"קודי הגישה אינם תואמים"</string>
-    <string name="change_pin_succeeded" msgid="6869403202124894671">"קוד הגישה לדואר הקולי עודכן"</string>
-    <string name="change_pin_system_error" msgid="5762853042379833829">"לא ניתן היה להגדיר את קוד הגישה"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="vvm_unsupported_message_format">סוג ההודעה לא נתמך. התקשר למספר %s כדי להאזין לה.</string>
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-ja/strings.xml b/java/com/android/voicemail/impl/res/values-ja/strings.xml
index f0d6a9b..d2cd6a4 100644
--- a/java/com/android/voicemail/impl/res/values-ja/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-ja/strings.xml
@@ -1,49 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_settings_with_label" msgid="563926539137546586">"ボイスメール（<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>）"</string>
-    <string name="voicemail_settings_title" msgid="6685263321755930738">"ボイスメール"</string>
-    <string name="voicemail_notifications_preference_title" msgid="3490553930230492405">"通知"</string>
-    <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"詳細設定"</string>
-    <string name="voicemail_visual_voicemail_switch_title" msgid="3158454817165714998">"ビジュアル ボイスメール"</string>
-    <string name="voicemail_visual_voicemail_auto_archive_switch_title" msgid="7120443850486401455">"追加のバックアップと保存容量"</string>
-    <string name="voicemail_set_pin_preference_title" msgid="1034691230818233684">"PIN の設定"</string>
-    <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"PIN の変更"</string>
-    <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"PIN を変更するには、ビジュアル ボイスメールを有効にする必要があります"</string>
-    <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"ビジュアル ボイスメールがまだ有効になっていません。しばらくしてからもう一度お試しください"</string>
-    <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"お待ちください。"</string>
-    <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"新しい PIN が短すぎます。"</string>
-    <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"新しい PIN が長すぎます。"</string>
-    <string name="vm_change_pin_error_too_weak" msgid="5865254034338293113">"新しい PIN の強度が弱すぎます。パスワードには連続する文字や、数字の繰り返しは使用しないでください。"</string>
-    <string name="vm_change_pin_error_mismatch" msgid="3682667971009913553">"古い PIN が一致しません。"</string>
-    <string name="vm_change_pin_error_invalid" msgid="4317397281749196545">"新しい PIN に無効な文字が含まれています。"</string>
-    <string name="vm_change_pin_error_system_error" msgid="5972056058776852411">"PIN を変更できませんでした"</string>
-    <string name="vvm_unsupported_message_format" msgid="2746490691815392491">"サポートされていないメッセージ タイプです。<xliff:g id="NUMBER">%s</xliff:g> 宛に電話をかけてメッセージをお聞きください。"</string>
-    <string name="change_pin_title" msgid="1363830310845461697">"ボイスメール PIN の変更"</string>
-    <string name="change_pin_continue_label" msgid="9184635195162827832">"続行"</string>
-    <string name="change_pin_cancel_label" msgid="7258783861113501519">"キャンセル"</string>
-    <string name="change_pin_ok_label" msgid="4527043915415428629">"OK"</string>
-    <string name="change_pin_enter_old_pin_header" msgid="1375728090965833028">"古い PIN の確認"</string>
-    <string name="change_pin_enter_old_pin_hint" msgid="1654231195871094175">"続行するにはボイスメール PIN を入力してください。"</string>
-    <string name="change_pin_enter_new_pin_header" msgid="7142620840890909719">"新しい PIN の設定"</string>
-    <string name="change_pin_enter_new_pin_hint" msgid="1289662932759932217">"PIN は <xliff:g id="MIN">%1$d</xliff:g>～<xliff:g id="MAX">%2$d</xliff:g> 桁にしてください。"</string>
-    <string name="change_pin_confirm_pin_header" msgid="7282604363655862136">"PIN の確認"</string>
-    <string name="change_pin_confirm_pins_dont_match" msgid="8626742552205369433">"PIN が一致しません"</string>
-    <string name="change_pin_succeeded" msgid="6869403202124894671">"ボイスメール PIN を更新しました"</string>
-    <string name="change_pin_system_error" msgid="5762853042379833829">"PIN を設定できません"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="vvm_unsupported_message_format">サポートされていないメッセージ タイプです。%s 宛に電話をかけてメッセージをお聞きください。</string>
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-ka/strings.xml b/java/com/android/voicemail/impl/res/values-ka/strings.xml
index 84c13b1..b1e82e4 100644
--- a/java/com/android/voicemail/impl/res/values-ka/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-ka/strings.xml
@@ -1,49 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_settings_with_label" msgid="563926539137546586">"ხმოვანი ფოსტა (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
-    <string name="voicemail_settings_title" msgid="6685263321755930738">"ხმოვანი ფოსტა"</string>
-    <string name="voicemail_notifications_preference_title" msgid="3490553930230492405">"შეტყობინებები"</string>
-    <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"გაფართოებული პარამეტრები"</string>
-    <string name="voicemail_visual_voicemail_switch_title" msgid="3158454817165714998">"ვიზუალური ხმოვანი ფოსტა"</string>
-    <string name="voicemail_visual_voicemail_auto_archive_switch_title" msgid="7120443850486401455">"დამატებითი სარეზ. ასლები და მეხსიერება"</string>
-    <string name="voicemail_set_pin_preference_title" msgid="1034691230818233684">"PIN-კოდის დაყენება"</string>
-    <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"PIN-კოდის შეცვლა"</string>
-    <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"PIN-კოდის შესაცვლელად ჩართული უნდა იყოს ვიზუალური ხმოვანი ფოსტა"</string>
-    <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"ვიზუალური ხმოვანი ფოსტა ჯერ გააქტიურებული არ არის. გთხოვთ, სცადოთ ხელახლა."</string>
-    <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"გთხოვთ, დაელოდოთ."</string>
-    <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"ახალი PIN-კოდი ძალიან მოკლეა."</string>
-    <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"ახალი PIN-კოდი ძალიან გრძელია."</string>
-    <string name="vm_change_pin_error_too_weak" msgid="5865254034338293113">"ახალი PIN-კოდი ძალიან სუსტია. ძლიერი პაროლი არ უნდა შეიცავდეს გამეორებული ციფრების გრძელ თანმიმდევრობას."</string>
-    <string name="vm_change_pin_error_mismatch" msgid="3682667971009913553">"ძველი PIN-კოდი არ ემთხვევა."</string>
-    <string name="vm_change_pin_error_invalid" msgid="4317397281749196545">"ახალი PIN-კოდი არასწორ სიმბოლოებს შეიცავს."</string>
-    <string name="vm_change_pin_error_system_error" msgid="5972056058776852411">"PIN-კოდის შეცვლა შეუძლებელია"</string>
-    <string name="vvm_unsupported_message_format" msgid="2746490691815392491">"შეტყობინების ტიპი მხარდაუჭერელია. მოსასმენად დარეკეთ <xliff:g id="NUMBER">%s</xliff:g>-ზე."</string>
-    <string name="change_pin_title" msgid="1363830310845461697">"ხმოვანი ფოსტის PIN-კოდის შეცვლა"</string>
-    <string name="change_pin_continue_label" msgid="9184635195162827832">"გაგრძელება"</string>
-    <string name="change_pin_cancel_label" msgid="7258783861113501519">"გაუქმება"</string>
-    <string name="change_pin_ok_label" msgid="4527043915415428629">"კარგი"</string>
-    <string name="change_pin_enter_old_pin_header" msgid="1375728090965833028">"დაადასტურეთ თქვენი ძველი PIN-კოდი"</string>
-    <string name="change_pin_enter_old_pin_hint" msgid="1654231195871094175">"გასაგრძელებლად შეიყვანეთ თქვენი ხმოვანი ფოსტის PIN-კოდი."</string>
-    <string name="change_pin_enter_new_pin_header" msgid="7142620840890909719">"დააყენეთ ახალი PIN-კოდი"</string>
-    <string name="change_pin_enter_new_pin_hint" msgid="1289662932759932217">"PIN-კოდი უნდა იყოს <xliff:g id="MIN">%1$d</xliff:g>-დან <xliff:g id="MAX">%2$d</xliff:g> ციფრამდე."</string>
-    <string name="change_pin_confirm_pin_header" msgid="7282604363655862136">"დაადასტურეთ PIN-კოდი"</string>
-    <string name="change_pin_confirm_pins_dont_match" msgid="8626742552205369433">"PIN-კოდები არ ემთხვევა"</string>
-    <string name="change_pin_succeeded" msgid="6869403202124894671">"ხმოვანი ფოსტის PIN-კოდი განახლდა"</string>
-    <string name="change_pin_system_error" msgid="5762853042379833829">"PIN-კოდის დაყენება შეუძლებელია"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="vvm_unsupported_message_format">შეტყობინების ტიპი მხარდაუჭერელია. მოსასმენად დარეკეთ %s-ზე.</string>
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-kk/strings.xml b/java/com/android/voicemail/impl/res/values-kk/strings.xml
index c2afc8e..e009455 100644
--- a/java/com/android/voicemail/impl/res/values-kk/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-kk/strings.xml
@@ -1,49 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_settings_with_label" msgid="563926539137546586">"Дауыстық хабар (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
-    <string name="voicemail_settings_title" msgid="6685263321755930738">"Дауыстық хабар"</string>
-    <string name="voicemail_notifications_preference_title" msgid="3490553930230492405">"Хабарландырулар"</string>
-    <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"Қосымша параметрлер"</string>
-    <string name="voicemail_visual_voicemail_switch_title" msgid="3158454817165714998">"Визуалды дауыстық пошта"</string>
-    <string name="voicemail_visual_voicemail_auto_archive_switch_title" msgid="7120443850486401455">"Қосымша сақтық көшірме жасау және сақтау"</string>
-    <string name="voicemail_set_pin_preference_title" msgid="1034691230818233684">"PIN кодын тағайындау"</string>
-    <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"PIN кодын өзгерту"</string>
-    <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"PIN кодын өзгерту үшін визуалды дауыс хабарын қосу қажет"</string>
-    <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"Визуалды дауыс хабары әлі қосылмаған. Кейінірек қайталап көріңіз"</string>
-    <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"Күте тұрыңыз."</string>
-    <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"Жаңа PIN коды тым қысқа."</string>
-    <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"Жаңа PIN коды тым ұзын."</string>
-    <string name="vm_change_pin_error_too_weak" msgid="5865254034338293113">"Жаңа PIN коды тым әлсіз. Күшті құпиясөзде үздіксіз реттік немесе қайталанатын таңбалар болмауы тиіс."</string>
-    <string name="vm_change_pin_error_mismatch" msgid="3682667971009913553">"Ескі PIN коды сәйкес келмейді."</string>
-    <string name="vm_change_pin_error_invalid" msgid="4317397281749196545">"Жаңа PIN кодында жарамсыз таңбалар бар."</string>
-    <string name="vm_change_pin_error_system_error" msgid="5972056058776852411">"PIN кодын өзгерту мүмкін емес"</string>
-    <string name="vvm_unsupported_message_format" msgid="2746490691815392491">"Қолдау көрсетілмейтін хабар түрі. Тыңдау үшін <xliff:g id="NUMBER">%s</xliff:g> нөміріне қоңырау шалыңыз."</string>
-    <string name="change_pin_title" msgid="1363830310845461697">"Дауыстық пошта PIN кодын өзгерту"</string>
-    <string name="change_pin_continue_label" msgid="9184635195162827832">"Жалғастыру"</string>
-    <string name="change_pin_cancel_label" msgid="7258783861113501519">"Жабу"</string>
-    <string name="change_pin_ok_label" msgid="4527043915415428629">"Жарайды"</string>
-    <string name="change_pin_enter_old_pin_header" msgid="1375728090965833028">"Ескі PIN кодыңызды растаңыз"</string>
-    <string name="change_pin_enter_old_pin_hint" msgid="1654231195871094175">"Жалғастыру үшін, дауыстық поштаңыздың PIN кодын енгізіңіз."</string>
-    <string name="change_pin_enter_new_pin_header" msgid="7142620840890909719">"Жаңа PIN кодын орнатыңыз"</string>
-    <string name="change_pin_enter_new_pin_hint" msgid="1289662932759932217">"PIN коды <xliff:g id="MIN">%1$d</xliff:g>-<xliff:g id="MAX">%2$d</xliff:g> бірліктен тұруы тиіс."</string>
-    <string name="change_pin_confirm_pin_header" msgid="7282604363655862136">"PIN кодын растаңыз"</string>
-    <string name="change_pin_confirm_pins_dont_match" msgid="8626742552205369433">"PIN кодтары сәйкес емес"</string>
-    <string name="change_pin_succeeded" msgid="6869403202124894671">"Дауыстық пошта PIN коды жаңартылды"</string>
-    <string name="change_pin_system_error" msgid="5762853042379833829">"PIN кодын орнату мүмкін болмады"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="vvm_unsupported_message_format">Қолдау көрсетілмейтін хабар түрі. Тыңдау үшін %s нөміріне қоңырау шалыңыз.</string>
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-km/strings.xml b/java/com/android/voicemail/impl/res/values-km/strings.xml
index 55a2253..055d651 100644
--- a/java/com/android/voicemail/impl/res/values-km/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-km/strings.xml
@@ -1,49 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_settings_with_label" msgid="563926539137546586">"សារ​ជា​សំឡេង (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
-    <string name="voicemail_settings_title" msgid="6685263321755930738">"សារ​ជា​សំឡេង"</string>
-    <string name="voicemail_notifications_preference_title" msgid="3490553930230492405">"ការ​ជូនដំណឹង"</string>
-    <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"ការ​កំណត់​កម្រិត​ខ្ពស់"</string>
-    <string name="voicemail_visual_voicemail_switch_title" msgid="3158454817165714998">"សារជាសំឡេងអាចមើលឃើញ"</string>
-    <string name="voicemail_visual_voicemail_auto_archive_switch_title" msgid="7120443850486401455">"ទំហំ​ផ្ទុក និង​ការ​បម្រុងទុក​បន្ថែម"</string>
-    <string name="voicemail_set_pin_preference_title" msgid="1034691230818233684">"កំណត់​កូដ PIN"</string>
-    <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"ផ្លាស់ប្ដូរ​កូដ PIN"</string>
-    <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"សារ​​ជា​សំឡេង​ដែល​មើល​ឃើញ​ត្រូវតែ​បើកដំណើរការ ដើម្បី​ផ្លាស់ប្ដូរ PIN"</string>
-    <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"សារ​ជាសំឡេង​ដែល​មើល​ឃើញ​មិនទាន់​​ត្រូវ​បាន​ធ្វើ​ឲ្យ​សកម្ម​នៅ​ឡើយ​ទេ សូម​ព្យាយាម​ម្ដង​ទៀត​នៅ​ពេល​ក្រោយ"</string>
-    <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"សូមរង់ចាំ។"</string>
-    <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"កូដ PIN ថ្មី​ ខ្លី​ពេក។"</string>
-    <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"កូដ PIN ថ្មី​ វែង​ពេក។"</string>
-    <string name="vm_change_pin_error_too_weak" msgid="5865254034338293113">"កូដ PIN ថ្មី​ ខ្សោយ​ពេក។ ពាក្យ​សម្ងាត់​ដែល​ខ្លាំង​មិន​គួរ​មាន​​លេខ​រៀង​​តគ្នា ឬ​​ស្ទួន​គ្នា​ទេ។"</string>
-    <string name="vm_change_pin_error_mismatch" msgid="3682667971009913553">"កូដ PIN ចាស់​ មិន​ត្រូវ​គ្នា។"</string>
-    <string name="vm_change_pin_error_invalid" msgid="4317397281749196545">"កូដ PIN ថ្មី​​ មាន​តួអក្សរ​មិន​ត្រឹមត្រូវ។"</string>
-    <string name="vm_change_pin_error_system_error" msgid="5972056058776852411">"មិន​អាច​ប្ដូរ​កូដ PIN"</string>
-    <string name="vvm_unsupported_message_format" msgid="2746490691815392491">"មិន​ស្គាល់​ប្រភេទ​សារ សូម​ហៅ​ទូរសព្ទ​ទៅ <xliff:g id="NUMBER">%s</xliff:g> ដើម្បី​ស្ដាប់។"</string>
-    <string name="change_pin_title" msgid="1363830310845461697">"ប្ដូរ​​កូដ PIN ជា​សារ​សំឡេង"</string>
-    <string name="change_pin_continue_label" msgid="9184635195162827832">"បន្ត"</string>
-    <string name="change_pin_cancel_label" msgid="7258783861113501519">"បោះបង់"</string>
-    <string name="change_pin_ok_label" msgid="4527043915415428629">"យល់ព្រម"</string>
-    <string name="change_pin_enter_old_pin_header" msgid="1375728090965833028">"បញ្ជាក់​កូដ PIN ចាស់​របស់​អ្នក"</string>
-    <string name="change_pin_enter_old_pin_hint" msgid="1654231195871094175">"បញ្ចូល​កូដ PIN ជា​សារ​សំឡេង​របស់​អ្នក ​​ដើម្បី​បន្ត។"</string>
-    <string name="change_pin_enter_new_pin_header" msgid="7142620840890909719">"កំណត់​កូដ PIN ថ្មី"</string>
-    <string name="change_pin_enter_new_pin_hint" msgid="1289662932759932217">"PIN ត្រូវតែ​មាន​ <xliff:g id="MIN">%1$d</xliff:g>-<xliff:g id="MAX">%2$d</xliff:g> ខ្ទង់។"</string>
-    <string name="change_pin_confirm_pin_header" msgid="7282604363655862136">"បញ្ជាក់​កូដ PIN របស់​អ្នក"</string>
-    <string name="change_pin_confirm_pins_dont_match" msgid="8626742552205369433">"កូដ PIN មិន​ត្រូវគ្នា"</string>
-    <string name="change_pin_succeeded" msgid="6869403202124894671">"បាន​ធ្វើ​បច្ចុប្បន្នភាព​​កូដ PIN ជា​សារ​សំឡេង"</string>
-    <string name="change_pin_system_error" msgid="5762853042379833829">"មិន​អាច​កំណត់​​កូដ PIN"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="vvm_unsupported_message_format">មិន​ស្គាល់​ប្រភេទ​សារ សូម​ហៅ​ទូរសព្ទ​ទៅ %s ដើម្បី​ស្ដាប់។</string>
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-kn/strings.xml b/java/com/android/voicemail/impl/res/values-kn/strings.xml
index 695c8d4..0c6769c 100644
--- a/java/com/android/voicemail/impl/res/values-kn/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-kn/strings.xml
@@ -1,49 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_settings_with_label" msgid="563926539137546586">"ಧ್ವನಿಮೇಲ್ (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
-    <string name="voicemail_settings_title" msgid="6685263321755930738">"ಧ್ವನಿಮೇಲ್"</string>
-    <string name="voicemail_notifications_preference_title" msgid="3490553930230492405">"ಅಧಿಸೂಚನೆಗಳು"</string>
-    <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"ಸುಧಾರಿತ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
-    <string name="voicemail_visual_voicemail_switch_title" msgid="3158454817165714998">"ದೃಶ್ಯ ಧ್ವನಿಮೇಲ್"</string>
-    <string name="voicemail_visual_voicemail_auto_archive_switch_title" msgid="7120443850486401455">"ಹೆಚ್ಚುವರಿ ಬ್ಯಾಕಪ್ ಮತ್ತು ಸಂಗ್ರಹಣೆ"</string>
-    <string name="voicemail_set_pin_preference_title" msgid="1034691230818233684">"ಪಿನ್ ಹೊಂದಿಸಿ"</string>
-    <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"ಪಿನ್‌ ಬದಲಾಯಿಸಿ"</string>
-    <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"ಪಿನ್ ಬದಲಾಯಿಸಲು ದೃಶ್ಯ ಧ್ವನಿಮೇಲ್ ಸಕ್ರಿಯಗೊಳಿಸಬೇಕು"</string>
-    <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"ದೃಶ್ಯ ಧ್ವನಿಮೇಲ್ ಇನ್ನೂ ಸಕ್ರಿಯವಾಗಿಲ್ಲ, ದಯವಿಟ್ಟು ನಂತರ ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ"</string>
-    <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"ದಯವಿಟ್ಟು ನಿರೀಕ್ಷಿಸಿ."</string>
-    <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"ಹೊಸ ಪಿನ್ ತುಂಬಾ ಚಿಕ್ಕದಾಗಿದೆ."</string>
-    <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"ಹೊಸ ಪಿನ್ ತುಂಬಾ ಉದ್ದವಾಗಿದೆ."</string>
-    <string name="vm_change_pin_error_too_weak" msgid="5865254034338293113">"ಹೊಸ ಪಿನ್ ತುಂಬಾ ದುರ್ಬಲವಾಗಿದೆ. ಪ್ರಬಲ ಪಾಸ್‌ವರ್ಡ್ ನಿರಂತರ ಅನುಕ್ರಮ ಅಥವಾ ಪುನರಾವರ್ತಿತ ಅಂಕಿಗಳನ್ನು ಹೊಂದುವಂತಿಲ್ಲ."</string>
-    <string name="vm_change_pin_error_mismatch" msgid="3682667971009913553">"ಹಳೆಯ ಪಿನ್ ಹೊಂದಾಣಿಕೆಯಾಗುತ್ತಿಲ್ಲ."</string>
-    <string name="vm_change_pin_error_invalid" msgid="4317397281749196545">"ಹೊಸ ಪಿನ್ ಅಮಾನ್ಯವಾದ ಅಕ್ಷರಗಳನ್ನು ಒಳಗೊಂಡಿದೆ."</string>
-    <string name="vm_change_pin_error_system_error" msgid="5972056058776852411">"ಪಿನ್ ಬದಲಾಯಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
-    <string name="vvm_unsupported_message_format" msgid="2746490691815392491">"ಬೆಂಬಲಿತವಲ್ಲದ ಸಂದೇಶ ಮಾದರಿ, ಆಲಿಸಲು <xliff:g id="NUMBER">%s</xliff:g> ಗೆ ಕರೆ ಮಾಡಿ."</string>
-    <string name="change_pin_title" msgid="1363830310845461697">"ಧ್ವನಿಮೇಲ್ ಪಿನ್‌ ಬದಲಾಯಿಸಿ"</string>
-    <string name="change_pin_continue_label" msgid="9184635195162827832">"ಮುಂದುವರಿಸಿ"</string>
-    <string name="change_pin_cancel_label" msgid="7258783861113501519">"ರದ್ದುಮಾಡಿ"</string>
-    <string name="change_pin_ok_label" msgid="4527043915415428629">"ಸರಿ"</string>
-    <string name="change_pin_enter_old_pin_header" msgid="1375728090965833028">"ನಿಮ್ಮ ಹಳೆಯ ಪಿನ್‌ ಅನ್ನು ದೃಢೀಕರಿಸಿ"</string>
-    <string name="change_pin_enter_old_pin_hint" msgid="1654231195871094175">"ಮುಂದುವರಿಸಲು ನಿಮ್ಮ ಧ್ವನಿಮೇಲ್ ಪಿನ್ ಅನ್ನು ನಮೂದಿಸಿ."</string>
-    <string name="change_pin_enter_new_pin_header" msgid="7142620840890909719">"ಹೊಸ ಪಿನ್ ಹೊಂದಿಸಿ"</string>
-    <string name="change_pin_enter_new_pin_hint" msgid="1289662932759932217">"ಪಿನ್ <xliff:g id="MIN">%1$d</xliff:g>-<xliff:g id="MAX">%2$d</xliff:g> ಅಂಕಿಗಳನ್ನು ಹೊಂದಿರಬೇಕು."</string>
-    <string name="change_pin_confirm_pin_header" msgid="7282604363655862136">"ನಿಮ್ಮ ಪಿನ್‌ ಅನ್ನು ದೃಢೀಕರಿಸಿ"</string>
-    <string name="change_pin_confirm_pins_dont_match" msgid="8626742552205369433">"PIN ಗಳು ಹೊಂದಾಣಿಕೆಯಾಗುತ್ತಿಲ್ಲ"</string>
-    <string name="change_pin_succeeded" msgid="6869403202124894671">"ಧ್ವನಿಮೇಲ್ ಪಿನ್ ಅಪ್‌ಡೇಟ್‌ ಮಾಡಲಾಗಿದೆ"</string>
-    <string name="change_pin_system_error" msgid="5762853042379833829">"ಪಿನ್ ಹೊಂದಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="vvm_unsupported_message_format">ಬೆಂಬಲಿತವಲ್ಲದ ಸಂದೇಶ ಮಾದರಿ, ಆಲಿಸಲು %s ಗೆ ಕರೆ ಮಾಡಿ.</string>
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-ko/strings.xml b/java/com/android/voicemail/impl/res/values-ko/strings.xml
index 7f1d8b0..ae5cd3c 100644
--- a/java/com/android/voicemail/impl/res/values-ko/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-ko/strings.xml
@@ -1,49 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_settings_with_label" msgid="563926539137546586">"음성사서함(<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
-    <string name="voicemail_settings_title" msgid="6685263321755930738">"음성사서함"</string>
-    <string name="voicemail_notifications_preference_title" msgid="3490553930230492405">"알림"</string>
-    <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"고급 설정"</string>
-    <string name="voicemail_visual_voicemail_switch_title" msgid="3158454817165714998">"시각적 음성사서함"</string>
-    <string name="voicemail_visual_voicemail_auto_archive_switch_title" msgid="7120443850486401455">"추가 백업 및 저장용량"</string>
-    <string name="voicemail_set_pin_preference_title" msgid="1034691230818233684">"PIN 설정"</string>
-    <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"PIN 변경"</string>
-    <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"PIN을 변경하려면 시각적 음성사서함이 사용 설정되어 있어야 합니다."</string>
-    <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"시각적 음성사서함이 아직 활성 상태가 아닙니다. 나중에 다시 시도해 주세요."</string>
-    <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"기다려 주세요."</string>
-    <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"새 PIN이 너무 짧습니다."</string>
-    <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"새 PIN이 너무 깁니다."</string>
-    <string name="vm_change_pin_error_too_weak" msgid="5865254034338293113">"새 PIN의 안정성이 낮습니다. 안전한 비밀번호에는 연속되는 숫자 또는 반복되는 숫자를 사용하지 말아야 합니다."</string>
-    <string name="vm_change_pin_error_mismatch" msgid="3682667971009913553">"이전 PIN이 일치하지 않습니다."</string>
-    <string name="vm_change_pin_error_invalid" msgid="4317397281749196545">"새 PIN에 잘못된 문자가 있습니다."</string>
-    <string name="vm_change_pin_error_system_error" msgid="5972056058776852411">"PIN을 변경할 수 없습니다."</string>
-    <string name="vvm_unsupported_message_format" msgid="2746490691815392491">"지원되지 않는 메시지 유형입니다. 들으려면 <xliff:g id="NUMBER">%s</xliff:g>번으로 전화하세요."</string>
-    <string name="change_pin_title" msgid="1363830310845461697">"음성사서함 PIN 변경"</string>
-    <string name="change_pin_continue_label" msgid="9184635195162827832">"계속"</string>
-    <string name="change_pin_cancel_label" msgid="7258783861113501519">"취소"</string>
-    <string name="change_pin_ok_label" msgid="4527043915415428629">"확인"</string>
-    <string name="change_pin_enter_old_pin_header" msgid="1375728090965833028">"이전 PIN 확인"</string>
-    <string name="change_pin_enter_old_pin_hint" msgid="1654231195871094175">"계속하려면 음성사서함 PIN을 입력하세요."</string>
-    <string name="change_pin_enter_new_pin_header" msgid="7142620840890909719">"새 PIN 설정"</string>
-    <string name="change_pin_enter_new_pin_hint" msgid="1289662932759932217">"PIN은 <xliff:g id="MIN">%1$d</xliff:g>~<xliff:g id="MAX">%2$d</xliff:g>자 사이여야 합니다."</string>
-    <string name="change_pin_confirm_pin_header" msgid="7282604363655862136">"PIN 확인"</string>
-    <string name="change_pin_confirm_pins_dont_match" msgid="8626742552205369433">"PIN이 일치하지 않음"</string>
-    <string name="change_pin_succeeded" msgid="6869403202124894671">"음성사서함 PIN이 업데이트됨"</string>
-    <string name="change_pin_system_error" msgid="5762853042379833829">"PIN을 설정할 수 없음"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="vvm_unsupported_message_format">지원되지 않는 메시지 유형입니다. 들으려면 %s번으로 전화하세요.</string>
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-ky/strings.xml b/java/com/android/voicemail/impl/res/values-ky/strings.xml
index 736a56a..9d086ac 100644
--- a/java/com/android/voicemail/impl/res/values-ky/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-ky/strings.xml
@@ -1,49 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_settings_with_label" msgid="563926539137546586">"Үн почтасы (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
-    <string name="voicemail_settings_title" msgid="6685263321755930738">"Үн почтасы"</string>
-    <string name="voicemail_notifications_preference_title" msgid="3490553930230492405">"Эскертмелер"</string>
-    <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"Өркүндөтүлгөн жөндөөлөр"</string>
-    <string name="voicemail_visual_voicemail_switch_title" msgid="3158454817165714998">"Визуалдык үн почтасы"</string>
-    <string name="voicemail_visual_voicemail_auto_archive_switch_title" msgid="7120443850486401455">"Кошумча камдык көчүрмөнү сактоо жана сактагыч"</string>
-    <string name="voicemail_set_pin_preference_title" msgid="1034691230818233684">"PIN код коюу"</string>
-    <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"PIN кодду өзгөртүү"</string>
-    <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"PIN кодду өзгөртүү үчүн визуладык үн почтасын иштетүү керек"</string>
-    <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"Визуалдык үн почтаңыз күйгүзүлгөн жок. Кайра аракет кылыңыз."</string>
-    <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"Күтө туруңуз."</string>
-    <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"Жаңы PIN код өтө эле кыска."</string>
-    <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"Жаңы PIN код өтө эле узун."</string>
-    <string name="vm_change_pin_error_too_weak" msgid="5865254034338293113">"Жаңы PIN код өтө эле жөнөкөй. Сырсөз күчтүү болушу үчүн сандар үзгүлтүксүз катардан турбашы же кайталанбашы керек."</string>
-    <string name="vm_change_pin_error_mismatch" msgid="3682667971009913553">"Эски PIN код дал келген жок."</string>
-    <string name="vm_change_pin_error_invalid" msgid="4317397281749196545">"Жаңы PIN коддо жараксыз белгилер бар."</string>
-    <string name="vm_change_pin_error_system_error" msgid="5972056058776852411">"PIN код өзгөртүлгөн жок"</string>
-    <string name="vvm_unsupported_message_format" msgid="2746490691815392491">"Колдоого алынбаган билдирүү, угуу үчүн <xliff:g id="NUMBER">%s</xliff:g> чалыңыз."</string>
-    <string name="change_pin_title" msgid="1363830310845461697">"Үн почтасынын PIN кодун өзгөртүү"</string>
-    <string name="change_pin_continue_label" msgid="9184635195162827832">"Улантуу"</string>
-    <string name="change_pin_cancel_label" msgid="7258783861113501519">"Жокко чыгаруу"</string>
-    <string name="change_pin_ok_label" msgid="4527043915415428629">"Жарайт"</string>
-    <string name="change_pin_enter_old_pin_header" msgid="1375728090965833028">"Эски PIN кодуңузду ырастаңыз"</string>
-    <string name="change_pin_enter_old_pin_hint" msgid="1654231195871094175">"Улантуу үчүн үн почтаңыздын PIN кодун киргизиңиз."</string>
-    <string name="change_pin_enter_new_pin_header" msgid="7142620840890909719">"Жаңы PIN коюңуз"</string>
-    <string name="change_pin_enter_new_pin_hint" msgid="1289662932759932217">"PIN <xliff:g id="MIN">%1$d</xliff:g>-<xliff:g id="MAX">%2$d</xliff:g> сандан турушу керек."</string>
-    <string name="change_pin_confirm_pin_header" msgid="7282604363655862136">"PIN кодуңузду ырастаңыз"</string>
-    <string name="change_pin_confirm_pins_dont_match" msgid="8626742552205369433">"PIN коддор дал келген жок"</string>
-    <string name="change_pin_succeeded" msgid="6869403202124894671">"Үн почтасынын PIN коду жаңыртылды"</string>
-    <string name="change_pin_system_error" msgid="5762853042379833829">"PIN код коюлбайт"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="vvm_unsupported_message_format">Колдоого алынбаган билдирүү, угуу үчүн %s чалыңыз.</string>
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-lo/strings.xml b/java/com/android/voicemail/impl/res/values-lo/strings.xml
index fb03133..047450c 100644
--- a/java/com/android/voicemail/impl/res/values-lo/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-lo/strings.xml
@@ -1,49 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_settings_with_label" msgid="563926539137546586">"ຂໍ້​ຄວາມ​ສຽງ (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
-    <string name="voicemail_settings_title" msgid="6685263321755930738">"ຂໍ້ຄວາມສຽງ"</string>
-    <string name="voicemail_notifications_preference_title" msgid="3490553930230492405">"ການແຈ້ງເຕືອນ"</string>
-    <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"ການຕັ້ງຄ່າຂັ້ນສູງ"</string>
-    <string name="voicemail_visual_voicemail_switch_title" msgid="3158454817165714998">"ຂໍ້​ຄວາມ​ສຽງສະເໝືອນ"</string>
-    <string name="voicemail_visual_voicemail_auto_archive_switch_title" msgid="7120443850486401455">"ການສຳຮອງ ແລະ ບ່ອນຈັດເກັບຂໍ້ມູນພິເສດ"</string>
-    <string name="voicemail_set_pin_preference_title" msgid="1034691230818233684">"ຕັ້ງລະຫັດ PIN"</string>
-    <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"​ປ່ຽນ​ລະຫັດ PIN"</string>
-    <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"ຈະຕ້ອງເປີດໃຊ້ຂໍ້ຄວາມສຽງສະເໝືອນເພື່ອປ່ຽນ PIN"</string>
-    <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"ຍັງບໍໄດ້ເປີດໃຊ້ຂໍ້ຄວາມສຽງສະເໝືອນເທື່ອ, ກະລຸນາລອງໃໝ່ໃນພາຍຫຼັງ"</string>
-    <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"ກະລຸນາລໍຖ້າ."</string>
-    <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"ລະຫັດ PIN ໃໝ່ສັ້ນເກີນໄປ."</string>
-    <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"ລະຫັດ PIN ໃໝ່ຍາວເກີນໄປ."</string>
-    <string name="vm_change_pin_error_too_weak" msgid="5865254034338293113">"ລະຫັດ PIN ໃໝ່ງ່າຍເກີນໄປ. ລະຫັດຜ່ານທີ່ຍາກບໍ່ຄວນຈະມີຕົວເລກຕໍ່ເນື່ອງ ຫຼື ຕົວເລກຊໍ້າໆກັນ."</string>
-    <string name="vm_change_pin_error_mismatch" msgid="3682667971009913553">"ລະຫັດ PIN ເກົ່າບໍ່ກົງກັນ."</string>
-    <string name="vm_change_pin_error_invalid" msgid="4317397281749196545">"ລະຫັດ PIN ໃໝ່ມີຕົວອັກສອນທີ່ບໍ່ຖືກຕ້ອງ."</string>
-    <string name="vm_change_pin_error_system_error" msgid="5972056058776852411">"ບໍ່ສາມາດປ່ຽນລະຫັດ PIN ໄດ້"</string>
-    <string name="vvm_unsupported_message_format" msgid="2746490691815392491">"ປະເພດຂໍ້ຄວາມທີ່ບໍ່ຮອງຮັບ, ໂທ <xliff:g id="NUMBER">%s</xliff:g> ເພື່ອຟັງ."</string>
-    <string name="change_pin_title" msgid="1363830310845461697">"ປ່ຽນລະຫັດ PIN ຂໍ້ຄວາມສຽງ"</string>
-    <string name="change_pin_continue_label" msgid="9184635195162827832">"ດຳເນີນການຕໍ່"</string>
-    <string name="change_pin_cancel_label" msgid="7258783861113501519">"ຍົກເລີກ"</string>
-    <string name="change_pin_ok_label" msgid="4527043915415428629">"ຕົກລົງ"</string>
-    <string name="change_pin_enter_old_pin_header" msgid="1375728090965833028">"ຢືນຢັນລະຫັດ PIN ເກົ່າຂອງທ່ານ"</string>
-    <string name="change_pin_enter_old_pin_hint" msgid="1654231195871094175">"ໃສ່ລະຫັດ PIN ຂໍ້ຄວາມສຽງຂອງທ່ານເພື່ອດຳເນີນການຕໍ່."</string>
-    <string name="change_pin_enter_new_pin_header" msgid="7142620840890909719">"ຕັ້ງ​ເປັນ PIN ໃຫມ່"</string>
-    <string name="change_pin_enter_new_pin_hint" msgid="1289662932759932217">"ລະຫັດ PIN ຈະຕ້ອງມີ <xliff:g id="MIN">%1$d</xliff:g>-<xliff:g id="MAX">%2$d</xliff:g> ຕົວເລກ."</string>
-    <string name="change_pin_confirm_pin_header" msgid="7282604363655862136">"ຢືນຢັນລະຫັດ PIN ຂອງທ່ານ"</string>
-    <string name="change_pin_confirm_pins_dont_match" msgid="8626742552205369433">"ລະຫັດ PIN ບໍ່ກົງກັນ"</string>
-    <string name="change_pin_succeeded" msgid="6869403202124894671">"ອັບເດດລະຫັດ PIN ຂໍ້ຄວາມສຽງແລ້ວ"</string>
-    <string name="change_pin_system_error" msgid="5762853042379833829">"ບໍ່ສາມາດຕັ້ງລະຫັດ PIN ໄດ້"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="vvm_unsupported_message_format">ປະເພດຂໍ້ຄວາມທີ່ບໍ່ຮອງຮັບ, ໂທ %s ເພື່ອຟັງ.</string>
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-lt/strings.xml b/java/com/android/voicemail/impl/res/values-lt/strings.xml
index c9891ab..e7103a6 100644
--- a/java/com/android/voicemail/impl/res/values-lt/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-lt/strings.xml
@@ -1,49 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_settings_with_label" msgid="563926539137546586">"Balso paštas (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
-    <string name="voicemail_settings_title" msgid="6685263321755930738">"Balso paštas"</string>
-    <string name="voicemail_notifications_preference_title" msgid="3490553930230492405">"Pranešimai"</string>
-    <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"Išplėstiniai nustatymai"</string>
-    <string name="voicemail_visual_voicemail_switch_title" msgid="3158454817165714998">"Vaizdinis balso paštas"</string>
-    <string name="voicemail_visual_voicemail_auto_archive_switch_title" msgid="7120443850486401455">"Papild. saug. vt. ir ats. kop. kūr. f."</string>
-    <string name="voicemail_set_pin_preference_title" msgid="1034691230818233684">"PIN kodo nustatymas"</string>
-    <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"PIN kodo keitimas"</string>
-    <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"Vaizdinis balso paštas turi būti įgalintas, kad būtų galima pakeisti PIN kodą"</string>
-    <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"Vaizdinis balso paštas dar nesuaktyvintas, vėliau bandykite dar kartą"</string>
-    <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"Palaukite."</string>
-    <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"Naujas PIN kodas per trumpas."</string>
-    <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"Naujas PIN kodas per ilgas."</string>
-    <string name="vm_change_pin_error_too_weak" msgid="5865254034338293113">"Naujas PIN kodas labai nesudėtingas. Sudėtingame slaptažodyje neturėtų būti kelių vienodų simbolių iš eilės ar pasikartojančių skaitmenų."</string>
-    <string name="vm_change_pin_error_mismatch" msgid="3682667971009913553">"Senas PIN kodas nesutampa."</string>
-    <string name="vm_change_pin_error_invalid" msgid="4317397281749196545">"Naujame PIN kode yra netinkamų simbolių."</string>
-    <string name="vm_change_pin_error_system_error" msgid="5972056058776852411">"Nepavyko pakeisti PIN kodo"</string>
-    <string name="vvm_unsupported_message_format" msgid="2746490691815392491">"Nepalaikomas pranešimo tipas. Paskambinkite numeriu <xliff:g id="NUMBER">%s</xliff:g> ir išklausykite."</string>
-    <string name="change_pin_title" msgid="1363830310845461697">"Balso pašto PIN kodo keitimas"</string>
-    <string name="change_pin_continue_label" msgid="9184635195162827832">"Tęsti"</string>
-    <string name="change_pin_cancel_label" msgid="7258783861113501519">"Atšaukti"</string>
-    <string name="change_pin_ok_label" msgid="4527043915415428629">"Gerai"</string>
-    <string name="change_pin_enter_old_pin_header" msgid="1375728090965833028">"Seno PIN kodo patvirtinimas"</string>
-    <string name="change_pin_enter_old_pin_hint" msgid="1654231195871094175">"Jei norite tęsti, įveskite balso pašto PIN kodą."</string>
-    <string name="change_pin_enter_new_pin_header" msgid="7142620840890909719">"Naujo PIN kodo nustatymas"</string>
-    <string name="change_pin_enter_new_pin_hint" msgid="1289662932759932217">"PIN kodą turi sudaryti <xliff:g id="MIN">%1$d</xliff:g>–<xliff:g id="MAX">%2$d</xliff:g> skaitm."</string>
-    <string name="change_pin_confirm_pin_header" msgid="7282604363655862136">"PIN kodo patvirtinimas"</string>
-    <string name="change_pin_confirm_pins_dont_match" msgid="8626742552205369433">"PIN kodai neatitinka"</string>
-    <string name="change_pin_succeeded" msgid="6869403202124894671">"Balso pašto PIN kodas atnaujintas"</string>
-    <string name="change_pin_system_error" msgid="5762853042379833829">"Nepavyksta nustatyti PIN kodo"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="vvm_unsupported_message_format">Nepalaikomas pranešimo tipas. Paskambinkite numeriu %s ir išklausykite.</string>
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-lv/strings.xml b/java/com/android/voicemail/impl/res/values-lv/strings.xml
index 7a26aa0..3d63ef3 100644
--- a/java/com/android/voicemail/impl/res/values-lv/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-lv/strings.xml
@@ -1,49 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_settings_with_label" msgid="563926539137546586">"Balss pasts (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
-    <string name="voicemail_settings_title" msgid="6685263321755930738">"Balss pasts"</string>
-    <string name="voicemail_notifications_preference_title" msgid="3490553930230492405">"Paziņojumi"</string>
-    <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"Papildu iestatījumi"</string>
-    <string name="voicemail_visual_voicemail_switch_title" msgid="3158454817165714998">"Vizuālais balss pasts"</string>
-    <string name="voicemail_visual_voicemail_auto_archive_switch_title" msgid="7120443850486401455">"Papildu dublēšana un krātuve"</string>
-    <string name="voicemail_set_pin_preference_title" msgid="1034691230818233684">"PIN iestatīšana"</string>
-    <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"PIN mainīšana"</string>
-    <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"Lai varētu mainīt PIN, ir jābūt iespējotam vizuālajam balss pastam."</string>
-    <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"Vizuālais balss pasts vēl nav aktivizēts. Lūdzu, vēlāk mēģiniet vēlreiz."</string>
-    <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"Lūdzu, uzgaidiet!"</string>
-    <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"Jaunais PIN ir pārāk īss."</string>
-    <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"Jaunais PIN ir pārāk garš."</string>
-    <string name="vm_change_pin_error_too_weak" msgid="5865254034338293113">"Jaunais PIN nav pietiekami drošs. Droša parole nedrīkst ietvert secīgus vai atkārtotus ciparus."</string>
-    <string name="vm_change_pin_error_mismatch" msgid="3682667971009913553">"Iepriekšējais PIN neatbilst."</string>
-    <string name="vm_change_pin_error_invalid" msgid="4317397281749196545">"Jaunajā PIN ir ietvertas nederīgas rakstzīmes."</string>
-    <string name="vm_change_pin_error_system_error" msgid="5972056058776852411">"Neizdevās nomainīt PIN."</string>
-    <string name="vvm_unsupported_message_format" msgid="2746490691815392491">"Neatbalstīts ziņojuma veids. Lai to noklausītos, zvaniet uz numuru <xliff:g id="NUMBER">%s</xliff:g>."</string>
-    <string name="change_pin_title" msgid="1363830310845461697">"Balss pasta PIN mainīšana"</string>
-    <string name="change_pin_continue_label" msgid="9184635195162827832">"Turpināt"</string>
-    <string name="change_pin_cancel_label" msgid="7258783861113501519">"Atcelt"</string>
-    <string name="change_pin_ok_label" msgid="4527043915415428629">"Labi"</string>
-    <string name="change_pin_enter_old_pin_header" msgid="1375728090965833028">"Iepriekšējā PIN apstiprināšana"</string>
-    <string name="change_pin_enter_old_pin_hint" msgid="1654231195871094175">"Lai turpinātu, ievadiet sava balss pasta PIN."</string>
-    <string name="change_pin_enter_new_pin_header" msgid="7142620840890909719">"Jauna PIN iestatīšana"</string>
-    <string name="change_pin_enter_new_pin_hint" msgid="1289662932759932217">"PIN kodā ir jābūt <xliff:g id="MIN">%1$d</xliff:g>–<xliff:g id="MAX">%2$d</xliff:g> cipariem."</string>
-    <string name="change_pin_confirm_pin_header" msgid="7282604363655862136">"PIN apstiprināšana"</string>
-    <string name="change_pin_confirm_pins_dont_match" msgid="8626742552205369433">"PIN kodi neatbilst."</string>
-    <string name="change_pin_succeeded" msgid="6869403202124894671">"Balss pasta PIN atjaunināts"</string>
-    <string name="change_pin_system_error" msgid="5762853042379833829">"Nevar iestatīt PIN."</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="vvm_unsupported_message_format">Neatbalstīts ziņojuma veids. Lai to noklausītos, zvaniet uz numuru %s.</string>
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-mk/strings.xml b/java/com/android/voicemail/impl/res/values-mk/strings.xml
index 2ef8fae..15cc2c6 100644
--- a/java/com/android/voicemail/impl/res/values-mk/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-mk/strings.xml
@@ -1,49 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_settings_with_label" msgid="563926539137546586">"Говорна пошта (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
-    <string name="voicemail_settings_title" msgid="6685263321755930738">"Говорна пошта"</string>
-    <string name="voicemail_notifications_preference_title" msgid="3490553930230492405">"Известувања"</string>
-    <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"Напредни поставки"</string>
-    <string name="voicemail_visual_voicemail_switch_title" msgid="3158454817165714998">"Визуелна говорна пошта"</string>
-    <string name="voicemail_visual_voicemail_auto_archive_switch_title" msgid="7120443850486401455">"Дополнителен бекап и склад"</string>
-    <string name="voicemail_set_pin_preference_title" msgid="1034691230818233684">"Поставете PIN"</string>
-    <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"Променете PIN"</string>
-    <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"За променување на PIN-кодот, мора да се овозможи визуелна говорна пошта"</string>
-    <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"Визуелната говорна пошта сѐ уште не е активна. Обидете се повторно подоцна"</string>
-    <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"Почекајте."</string>
-    <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"Новиот PIN е премногу кус."</string>
-    <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"Новиот PIN е премногу долг."</string>
-    <string name="vm_change_pin_error_too_weak" msgid="5865254034338293113">"Новиот PIN е премногу слаб. Силна лозинка не треба да содржи непрекината серија или цифри што се повторуваат."</string>
-    <string name="vm_change_pin_error_mismatch" msgid="3682667971009913553">"Стариот PIN не се совпаѓа."</string>
-    <string name="vm_change_pin_error_invalid" msgid="4317397281749196545">"Новиот PIN содржи неважечки знаци."</string>
-    <string name="vm_change_pin_error_system_error" msgid="5972056058776852411">"PIN-кодот не може да се промени"</string>
-    <string name="vvm_unsupported_message_format" msgid="2746490691815392491">"Неподдржан тип порака. Повикајте <xliff:g id="NUMBER">%s</xliff:g> за да слушате."</string>
-    <string name="change_pin_title" msgid="1363830310845461697">"Променете го PIN-кодот на говорната пошта"</string>
-    <string name="change_pin_continue_label" msgid="9184635195162827832">"Продолжи"</string>
-    <string name="change_pin_cancel_label" msgid="7258783861113501519">"Откажи"</string>
-    <string name="change_pin_ok_label" msgid="4527043915415428629">"Во ред"</string>
-    <string name="change_pin_enter_old_pin_header" msgid="1375728090965833028">"Потврдете го стариот PIN"</string>
-    <string name="change_pin_enter_old_pin_hint" msgid="1654231195871094175">"Внесете го PIN-кодот на говорната пошта за да продолжите."</string>
-    <string name="change_pin_enter_new_pin_header" msgid="7142620840890909719">"Поставете нов PIN"</string>
-    <string name="change_pin_enter_new_pin_hint" msgid="1289662932759932217">"PIN-кодот мора да содржи најмалку <xliff:g id="MIN">%1$d</xliff:g>, а најмногу <xliff:g id="MAX">%2$d</xliff:g> цифри."</string>
-    <string name="change_pin_confirm_pin_header" msgid="7282604363655862136">"Потврдете го PIN-кодот"</string>
-    <string name="change_pin_confirm_pins_dont_match" msgid="8626742552205369433">"PIN-кодовите не се совпаѓаат"</string>
-    <string name="change_pin_succeeded" msgid="6869403202124894671">"PIN-кодот на говорната пошта е ажуриран"</string>
-    <string name="change_pin_system_error" msgid="5762853042379833829">"Не може да се постави PIN"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="vvm_unsupported_message_format">Неподдржан тип порака. Повикајте %s за да слушате.</string>
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-ml/strings.xml b/java/com/android/voicemail/impl/res/values-ml/strings.xml
index ac0ad23..00ad51c 100644
--- a/java/com/android/voicemail/impl/res/values-ml/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-ml/strings.xml
@@ -1,49 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_settings_with_label" msgid="563926539137546586">"വോയ്‌സ്‌മെയിൽ (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
-    <string name="voicemail_settings_title" msgid="6685263321755930738">"വോയ്‌സ്‌മെയിൽ"</string>
-    <string name="voicemail_notifications_preference_title" msgid="3490553930230492405">"അറിയിപ്പുകൾ"</string>
-    <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"വിപുലമായ ക്രമീകരണം"</string>
-    <string name="voicemail_visual_voicemail_switch_title" msgid="3158454817165714998">"വിഷ്വൽ വോയ്‌സ്‌മെയിൽ"</string>
-    <string name="voicemail_visual_voicemail_auto_archive_switch_title" msgid="7120443850486401455">"അധിക ബായ്‌ക്കപ്പും സ്‌റ്റോറേജും"</string>
-    <string name="voicemail_set_pin_preference_title" msgid="1034691230818233684">"പിൻ സജ്ജമാക്കുക"</string>
-    <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"പിൻ മാറ്റുക"</string>
-    <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"പിൻ മാറ്റുന്നതിന് വിഷ്വൽ വോയ്‌സ്‌മെയിൽ പ്രവർത്തനക്ഷമമാക്കേണ്ടതുണ്ട്"</string>
-    <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"വിഷ്വൽ വോയ്‌സ്‌മെയിൽ ഇതുവരെ സജീവമാക്കിയിട്ടില്ല, പിന്നീട് വീണ്ടും ശ്രമിച്ചുനോക്കൂ"</string>
-    <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"കാത്തിരിക്കുക."</string>
-    <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"പുതിയ പിൻ വളരെ ചെറുതാണ്."</string>
-    <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"പുതിയ പിൻ വളരെ ദൈർഘ്യമേറിയതാണ്."</string>
-    <string name="vm_change_pin_error_too_weak" msgid="5865254034338293113">"പുതിയ പിൻ വളരെ ദുർബലമാണ്. ഒരു ദൃഢമായ പാസ്‌വേഡിൽ തുടർച്ചയായി വരുന്നതോ ആവർത്തിച്ച് വരുന്നതോ ആയ അക്കങ്ങൾ ഉണ്ടാവരുത്."</string>
-    <string name="vm_change_pin_error_mismatch" msgid="3682667971009913553">"പഴയ പിന്നുമായി യോജിക്കുന്നില്ല."</string>
-    <string name="vm_change_pin_error_invalid" msgid="4317397281749196545">"പുതിയ പിന്നിൽ അസാധുവായ പ്രതീകങ്ങൾ അടങ്ങിയിരിക്കുന്നു."</string>
-    <string name="vm_change_pin_error_system_error" msgid="5972056058776852411">"പിൻ മാറ്റാനായില്ല"</string>
-    <string name="vvm_unsupported_message_format" msgid="2746490691815392491">"സന്ദേശ തരം പിന്തുണയ്‌ക്കുന്നില്ല, കേൾക്കാൻ <xliff:g id="NUMBER">%s</xliff:g> നമ്പറിൽ വിളിക്കുക."</string>
-    <string name="change_pin_title" msgid="1363830310845461697">"വോയ്‌സ്മെയിൽ പിൻ മാറ്റുക"</string>
-    <string name="change_pin_continue_label" msgid="9184635195162827832">"തുടരുക"</string>
-    <string name="change_pin_cancel_label" msgid="7258783861113501519">"റദ്ദാക്കുക"</string>
-    <string name="change_pin_ok_label" msgid="4527043915415428629">"ശരി"</string>
-    <string name="change_pin_enter_old_pin_header" msgid="1375728090965833028">"നിങ്ങളുടെ പഴയ പിൻ സ്ഥിരീകരിക്കുക"</string>
-    <string name="change_pin_enter_old_pin_hint" msgid="1654231195871094175">"തുടരാൻ നിങ്ങളുടെ വോയ്‌സ്മെയിൽ പിൻ നൽകുക."</string>
-    <string name="change_pin_enter_new_pin_header" msgid="7142620840890909719">"പുതിയ PIN സജ്ജമാക്കുക"</string>
-    <string name="change_pin_enter_new_pin_hint" msgid="1289662932759932217">"പിന്നിൽ <xliff:g id="MIN">%1$d</xliff:g>-<xliff:g id="MAX">%2$d</xliff:g> അക്കങ്ങൾ ഉണ്ടായിരിക്കണം."</string>
-    <string name="change_pin_confirm_pin_header" msgid="7282604363655862136">"നിങ്ങളുടെ പിൻ സ്ഥിരീകരിക്കുക"</string>
-    <string name="change_pin_confirm_pins_dont_match" msgid="8626742552205369433">"PIN-കൾ പൊരുത്തപ്പെടുന്നില്ല"</string>
-    <string name="change_pin_succeeded" msgid="6869403202124894671">"വോയ്‌സ്‌മെയിൽ പിൻ അപ്‌ഡേറ്റുചെയ്‌തു"</string>
-    <string name="change_pin_system_error" msgid="5762853042379833829">"പിൻ സജ്ജമാക്കാൻ കഴിയുന്നില്ല"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="vvm_unsupported_message_format">സന്ദേശ തരം പിന്തുണയ്‌ക്കുന്നില്ല, കേൾക്കാൻ %s നമ്പറിൽ വിളിക്കുക.</string>
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-mn/strings.xml b/java/com/android/voicemail/impl/res/values-mn/strings.xml
index 96e0e42..1e0c2c1 100644
--- a/java/com/android/voicemail/impl/res/values-mn/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-mn/strings.xml
@@ -1,49 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_settings_with_label" msgid="563926539137546586">"Дуут шуудан (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
-    <string name="voicemail_settings_title" msgid="6685263321755930738">"Дуут шуудан"</string>
-    <string name="voicemail_notifications_preference_title" msgid="3490553930230492405">"Мэдэгдэл"</string>
-    <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"Нарийвчилсан тохиргоо"</string>
-    <string name="voicemail_visual_voicemail_switch_title" msgid="3158454817165714998">"Уншиж болохуйц дуут шуудан"</string>
-    <string name="voicemail_visual_voicemail_auto_archive_switch_title" msgid="7120443850486401455">"Нэмэлт нөөцлөлт болон хадгалах сан"</string>
-    <string name="voicemail_set_pin_preference_title" msgid="1034691230818233684">"PIN тохируулах"</string>
-    <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"PIN өөрчлөх"</string>
-    <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"Харагдах дуут шуудан PIN-г өөрчлөх боломжтой байх ёстой"</string>
-    <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"Харагдах дуут шуудан хараахан идэвхжээгүй байна, дараа дахин оролдоно уу"</string>
-    <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"Түр хүлээнэ үү."</string>
-    <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"Шинэ PIN хэт богино байна."</string>
-    <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"Шинэ PIN хэт урт байна."</string>
-    <string name="vm_change_pin_error_too_weak" msgid="5865254034338293113">"Шинэ PIN хэт амархан байна. Сайн нууц үгэнд үргэлжилсэн дараалал буюу давтагдсан цифр ордоггүй."</string>
-    <string name="vm_change_pin_error_mismatch" msgid="3682667971009913553">"Хуучин PIN таарахгүй байна."</string>
-    <string name="vm_change_pin_error_invalid" msgid="4317397281749196545">"Шинэ PIN-д буруу тэмдэгт агуулагдаж байна."</string>
-    <string name="vm_change_pin_error_system_error" msgid="5972056058776852411">"PIN-г өөрчлөх боломжгүй"</string>
-    <string name="vvm_unsupported_message_format" msgid="2746490691815392491">"Дэмжигдээгүй зурвасын төрөл, сонсохын тулд <xliff:g id="NUMBER">%s</xliff:g> руу залгана уу."</string>
-    <string name="change_pin_title" msgid="1363830310845461697">"Дуут шуудангийн PIN-г өөрчлөх"</string>
-    <string name="change_pin_continue_label" msgid="9184635195162827832">"Үргэлжлүүлэх"</string>
-    <string name="change_pin_cancel_label" msgid="7258783861113501519">"Цуцлах"</string>
-    <string name="change_pin_ok_label" msgid="4527043915415428629">"Зөвшөөрөх"</string>
-    <string name="change_pin_enter_old_pin_header" msgid="1375728090965833028">"Хуучин PIN-ээ баталгаажуулна уу"</string>
-    <string name="change_pin_enter_old_pin_hint" msgid="1654231195871094175">"Үргэлжлүүлэхийн тулд дуут шуудангийн PIN оруулна уу."</string>
-    <string name="change_pin_enter_new_pin_header" msgid="7142620840890909719">"Шинэ PIN тохируулах"</string>
-    <string name="change_pin_enter_new_pin_hint" msgid="1289662932759932217">"PIN <xliff:g id="MIN">%1$d</xliff:g> - <xliff:g id="MAX">%2$d</xliff:g> цифртэй байх ёстой."</string>
-    <string name="change_pin_confirm_pin_header" msgid="7282604363655862136">"Өөрийн PIN-г баталгаажуулна уу"</string>
-    <string name="change_pin_confirm_pins_dont_match" msgid="8626742552205369433">"PIN код таарахгүй байна"</string>
-    <string name="change_pin_succeeded" msgid="6869403202124894671">"Дуут шуудангийн PIN шинэчлэгдсэн"</string>
-    <string name="change_pin_system_error" msgid="5762853042379833829">"PIN тохируулах боломжгүй"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="vvm_unsupported_message_format">Дэмжигдээгүй зурвасын төрөл, сонсохын тулд %s руу залгана уу.</string>
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-mr/strings.xml b/java/com/android/voicemail/impl/res/values-mr/strings.xml
index 85b5270..b4a95d8 100644
--- a/java/com/android/voicemail/impl/res/values-mr/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-mr/strings.xml
@@ -1,49 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_settings_with_label" msgid="563926539137546586">"व्हॉइसमेल (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
-    <string name="voicemail_settings_title" msgid="6685263321755930738">"व्हॉइसमेल"</string>
-    <string name="voicemail_notifications_preference_title" msgid="3490553930230492405">"सूचना"</string>
-    <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"प्रगत सेटिंग्ज"</string>
-    <string name="voicemail_visual_voicemail_switch_title" msgid="3158454817165714998">"दृश्‍यमान व्हॉइसमेल"</string>
-    <string name="voicemail_visual_voicemail_auto_archive_switch_title" msgid="7120443850486401455">"अतिरिक्त बॅक अप आणि संचय"</string>
-    <string name="voicemail_set_pin_preference_title" msgid="1034691230818233684">"पिन सेट करा"</string>
-    <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"पिन बदला"</string>
-    <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"पिन बदलण्‍यासाठी व्हिज्युअल व्हॉइसमेल सक्षम करणे आवश्‍यक आहे"</string>
-    <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"व्हिज्युअल व्हॉइसमेल अद्याप सक्रिय केले नाही, कृपया नंतर पुन्हा प्रयत्न करा"</string>
-    <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"कृपया प्रतीक्षा करा."</string>
-    <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"नवीन पिन खूप लहान आहे."</string>
-    <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"नवीन पिन खूप दीर्घ आहे."</string>
-    <string name="vm_change_pin_error_too_weak" msgid="5865254034338293113">"नवीन पिन खूप कमकुवत आहे. सशक्त संकेतशब्दामध्ये अखंड क्रमवारी किंवा पुनरावृत्ती केलेले अंक नसावेत."</string>
-    <string name="vm_change_pin_error_mismatch" msgid="3682667971009913553">"जुना पिन जुळत नाही."</string>
-    <string name="vm_change_pin_error_invalid" msgid="4317397281749196545">"नवीन पिन मध्ये अवैध वर्ण आहेत."</string>
-    <string name="vm_change_pin_error_system_error" msgid="5972056058776852411">"पिन बदलण्यात अक्षम"</string>
-    <string name="vvm_unsupported_message_format" msgid="2746490691815392491">"असमर्थित संदेश प्रकार, ऐकण्यासाठी <xliff:g id="NUMBER">%s</xliff:g> वर कॉल करा."</string>
-    <string name="change_pin_title" msgid="1363830310845461697">"व्हॉइसमेल पिन बदला"</string>
-    <string name="change_pin_continue_label" msgid="9184635195162827832">"सुरू ठेवा"</string>
-    <string name="change_pin_cancel_label" msgid="7258783861113501519">"रद्द करा"</string>
-    <string name="change_pin_ok_label" msgid="4527043915415428629">"ठीक आहे"</string>
-    <string name="change_pin_enter_old_pin_header" msgid="1375728090965833028">"आपल्या जुन्या पिनची पुष्टी करा"</string>
-    <string name="change_pin_enter_old_pin_hint" msgid="1654231195871094175">"सुरु ठेवण्‍यासाठी आपला व्हॉइसमेल पिन प्रविष्‍ट करा."</string>
-    <string name="change_pin_enter_new_pin_header" msgid="7142620840890909719">"नवीन पिन सेट करा"</string>
-    <string name="change_pin_enter_new_pin_hint" msgid="1289662932759932217">"पिन <xliff:g id="MIN">%1$d</xliff:g>-<xliff:g id="MAX">%2$d</xliff:g> अंकी असणे आवश्‍यक आहे."</string>
-    <string name="change_pin_confirm_pin_header" msgid="7282604363655862136">"आपल्या पिनची पुष्टी करा"</string>
-    <string name="change_pin_confirm_pins_dont_match" msgid="8626742552205369433">"पिन जुळत नाहीत"</string>
-    <string name="change_pin_succeeded" msgid="6869403202124894671">"व्हॉइसमेल पिन अपडेट केला"</string>
-    <string name="change_pin_system_error" msgid="5762853042379833829">"पिन सेट करण्यात अक्षम"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="vvm_unsupported_message_format">असमर्थित मेसेज प्रकार, ऐकण्यासाठी %s वर कॉल करा.</string>
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-ms/strings.xml b/java/com/android/voicemail/impl/res/values-ms/strings.xml
index c44ba38..61143ac 100644
--- a/java/com/android/voicemail/impl/res/values-ms/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-ms/strings.xml
@@ -1,49 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_settings_with_label" msgid="563926539137546586">"Mel suara (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
-    <string name="voicemail_settings_title" msgid="6685263321755930738">"Mel suara"</string>
-    <string name="voicemail_notifications_preference_title" msgid="3490553930230492405">"Pemberitahuan"</string>
-    <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"Tetapan Terperinci"</string>
-    <string name="voicemail_visual_voicemail_switch_title" msgid="3158454817165714998">"Mel Suara Visual"</string>
-    <string name="voicemail_visual_voicemail_auto_archive_switch_title" msgid="7120443850486401455">"Sandaran dan storan tambahan"</string>
-    <string name="voicemail_set_pin_preference_title" msgid="1034691230818233684">"Tetapkan PIN"</string>
-    <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"Tukar PIN"</string>
-    <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"Mel suara visual mesti didayakan untuk menukar PIN"</string>
-    <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"Mel suara visual belum diaktifkan. Sila cuba sebentar lagi"</string>
-    <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"Sila tunggu."</string>
-    <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"PIN baharu terlalu pendek."</string>
-    <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"PIN baharu terlalu panjang."</string>
-    <string name="vm_change_pin_error_too_weak" msgid="5865254034338293113">"PIN baharu terlalu lemah. Kata laluan yang kukuh tidak seharusnya mempunyai digit yang berturutan atau berulangan."</string>
-    <string name="vm_change_pin_error_mismatch" msgid="3682667971009913553">"PIN lama tidak sepadan."</string>
-    <string name="vm_change_pin_error_invalid" msgid="4317397281749196545">"PIN baharu mengandungi aksara yang tidak sah."</string>
-    <string name="vm_change_pin_error_system_error" msgid="5972056058776852411">"Tidak dapat menukar PIN"</string>
-    <string name="vvm_unsupported_message_format" msgid="2746490691815392491">"Jenis mesej tidak disokong, hubungi <xliff:g id="NUMBER">%s</xliff:g> untuk mendengar."</string>
-    <string name="change_pin_title" msgid="1363830310845461697">"Tukar PIN Mel Suara"</string>
-    <string name="change_pin_continue_label" msgid="9184635195162827832">"Teruskan"</string>
-    <string name="change_pin_cancel_label" msgid="7258783861113501519">"Batal"</string>
-    <string name="change_pin_ok_label" msgid="4527043915415428629">"OK"</string>
-    <string name="change_pin_enter_old_pin_header" msgid="1375728090965833028">"Sahkan PIN lama anda"</string>
-    <string name="change_pin_enter_old_pin_hint" msgid="1654231195871094175">"Masukkan PIN mel suara anda untuk meneruskan."</string>
-    <string name="change_pin_enter_new_pin_header" msgid="7142620840890909719">"Tetapkan PIN baharu"</string>
-    <string name="change_pin_enter_new_pin_hint" msgid="1289662932759932217">"PIN mestilah <xliff:g id="MIN">%1$d</xliff:g>-<xliff:g id="MAX">%2$d</xliff:g> digit."</string>
-    <string name="change_pin_confirm_pin_header" msgid="7282604363655862136">"Sahkan PIN anda"</string>
-    <string name="change_pin_confirm_pins_dont_match" msgid="8626742552205369433">"PIN tidak sepadan"</string>
-    <string name="change_pin_succeeded" msgid="6869403202124894671">"PIN mel suara dikemas kini"</string>
-    <string name="change_pin_system_error" msgid="5762853042379833829">"Tidak dapat menetapkan PIN"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="vvm_unsupported_message_format">Jenis mesej tidak disokong, hubungi %s untuk mendengar.</string>
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-my/strings.xml b/java/com/android/voicemail/impl/res/values-my/strings.xml
index d9ef363..bcc1a39 100644
--- a/java/com/android/voicemail/impl/res/values-my/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-my/strings.xml
@@ -1,49 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_settings_with_label" msgid="563926539137546586">"အသံမေးလ် (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
-    <string name="voicemail_settings_title" msgid="6685263321755930738">"အသံမေးလ်"</string>
-    <string name="voicemail_notifications_preference_title" msgid="3490553930230492405">"အကြောင်းကြားချက်များ"</string>
-    <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"အဆင့်မြင့် ဆက်တင်များ"</string>
-    <string name="voicemail_visual_voicemail_switch_title" msgid="3158454817165714998">"စာသားမှတ်တမ်းပါ အသံမေးလ်"</string>
-    <string name="voicemail_visual_voicemail_auto_archive_switch_title" msgid="7120443850486401455">"အပိုဆောင်း မိတ္တူနှင့် သိုလှောင်မှု"</string>
-    <string name="voicemail_set_pin_preference_title" msgid="1034691230818233684">"ပင်နံပါတ် သတ်မှတ်ပါ"</string>
-    <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"ပင်နံပါတ် ပြောင်းပါ"</string>
-    <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"ပင်နံပါတ်ပြောင်းရန် စာသားမှတ်တမ်းပါ အသံမေးလ်ကို ဖွင့်ထားရပါမည်"</string>
-    <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"စာသားမှတ်တမ်းပါ အသံမေးလ်ကို မဖွင့်ရသေးပါ၊ နောက်မှ ထပ်ဖွင့်ကြည့်ပါ"</string>
-    <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"ခဏစောင့်ပါ။"</string>
-    <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"ပင်နံပါတ်အသစ်မှာ တိုလွန်းနေသည်။"</string>
-    <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"ပင်နံပါတ်အသစ်မှာ ရှည်လွန်းနေသည်။"</string>
-    <string name="vm_change_pin_error_too_weak" msgid="5865254034338293113">"ပင်နံပါတ်အသစ်မှာ အားနည်းလွန်းနေသည်။ အားကောင်းသောစကားဝှက်တစ်ခုတွင် အစဉ်လိုက်စာလုံးများ (သို့) ထပ်တလဲလဲသုံးထားသောကိန်းဂဏန်းများ မပါသင့်ပါ။"</string>
-    <string name="vm_change_pin_error_mismatch" msgid="3682667971009913553">"ပင်နံပါတ်အဟောင်းမှာ မကိုက်ညီပါ။"</string>
-    <string name="vm_change_pin_error_invalid" msgid="4317397281749196545">"ပင်နံပါတ်အသစ်တွင် အသုံးပြု၍မရသောအက္ခရာများ ပါဝင်နေပါသည်။"</string>
-    <string name="vm_change_pin_error_system_error" msgid="5972056058776852411">"ပင်နံပါတ်ကို ပြောင်း၍မရပါ"</string>
-    <string name="vvm_unsupported_message_format" msgid="2746490691815392491">"ပံ့ပိုးမထားသော မက်ဆေ့ဂျ်အမျိုးအစားဖြစ်၍ နားထောင်ရန် <xliff:g id="NUMBER">%s</xliff:g> ကို ခေါ်ဆိုပါ။"</string>
-    <string name="change_pin_title" msgid="1363830310845461697">"အသံမေးလ်ပင်နံပါတ် ပြောင်းပါ"</string>
-    <string name="change_pin_continue_label" msgid="9184635195162827832">"ဆက်လုပ်ရန်"</string>
-    <string name="change_pin_cancel_label" msgid="7258783861113501519">"မလုပ်တော့"</string>
-    <string name="change_pin_ok_label" msgid="4527043915415428629">"အိုကေ"</string>
-    <string name="change_pin_enter_old_pin_header" msgid="1375728090965833028">"သင့်ပင်နံပါတ်အဟောင်းကို အတည်ပြုပါ"</string>
-    <string name="change_pin_enter_old_pin_hint" msgid="1654231195871094175">"ဆက်လုပ်ရန် သင့်အသံမေးလ်ပင်နံပါတ်ကို ထည့်ပါ။"</string>
-    <string name="change_pin_enter_new_pin_header" msgid="7142620840890909719">"ပင်နံပါတ်အသစ် သတ်မှတ်ပါ"</string>
-    <string name="change_pin_enter_new_pin_hint" msgid="1289662932759932217">"ပင်နံပါတ်တွင် ဂဏန်း <xliff:g id="MIN">%1$d</xliff:g>-<xliff:g id="MAX">%2$d</xliff:g> လုံး ပါရှိရမည်။"</string>
-    <string name="change_pin_confirm_pin_header" msgid="7282604363655862136">"သင့်ပင်နံပါတ်ကို အတည်ပြုပါ"</string>
-    <string name="change_pin_confirm_pins_dont_match" msgid="8626742552205369433">"ပင်နံပါတ်များ မကိုက်ညီပါ"</string>
-    <string name="change_pin_succeeded" msgid="6869403202124894671">"အသံမေးလ်ပင်နံပါတ်ကို အပ်ဒိတ်လုပ်လိုက်ပါပြီ"</string>
-    <string name="change_pin_system_error" msgid="5762853042379833829">"ပင်နံပါတ်ကို သတ်မှတ်၍မရပါ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="vvm_unsupported_message_format">ပံ့ပိုးမထားသော မက်ဆေ့ဂျ်အမျိုးအစားဖြစ်၍ နားထောင်ရန် %s ကို ခေါ်ဆိုပါ။</string>
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-nb/strings.xml b/java/com/android/voicemail/impl/res/values-nb/strings.xml
index 7139887..ad9357b 100644
--- a/java/com/android/voicemail/impl/res/values-nb/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-nb/strings.xml
@@ -1,49 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_settings_with_label" msgid="563926539137546586">"Talepostkasse (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
-    <string name="voicemail_settings_title" msgid="6685263321755930738">"Talepost"</string>
-    <string name="voicemail_notifications_preference_title" msgid="3490553930230492405">"Varsler"</string>
-    <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"Avanserte innstillinger"</string>
-    <string name="voicemail_visual_voicemail_switch_title" msgid="3158454817165714998">"Visuell talepostkasse"</string>
-    <string name="voicemail_visual_voicemail_auto_archive_switch_title" msgid="7120443850486401455">"Ekstra sikkerhetskopi og lagring"</string>
-    <string name="voicemail_set_pin_preference_title" msgid="1034691230818233684">"Angi PIN-kode"</string>
-    <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"Endre PIN-koden"</string>
-    <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"Du må slå på visuell talepost for å endre PIN-koden"</string>
-    <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"Visuell talepost er ikke slått på ennå – prøv igjen senere"</string>
-    <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"Vent litt."</string>
-    <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"Den nye PIN-koden er for kort."</string>
-    <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"Den nye PIN-koden er for lang."</string>
-    <string name="vm_change_pin_error_too_weak" msgid="5865254034338293113">"Den nye PIN-koden er for svak. Sterke passord inneholder ikke sammenhengende sekvenser eller gjentatte sifre."</string>
-    <string name="vm_change_pin_error_mismatch" msgid="3682667971009913553">"Den gamle PIN-koden er feil."</string>
-    <string name="vm_change_pin_error_invalid" msgid="4317397281749196545">"Den nye PIN-koden inneholder ugyldige tegn."</string>
-    <string name="vm_change_pin_error_system_error" msgid="5972056058776852411">"Kan ikke bytte PIN-kode"</string>
-    <string name="vvm_unsupported_message_format" msgid="2746490691815392491">"Meldingstypen støttes ikke. Ring <xliff:g id="NUMBER">%s</xliff:g> for å høre."</string>
-    <string name="change_pin_title" msgid="1363830310845461697">"Endre PIN-kode for talemeldinger"</string>
-    <string name="change_pin_continue_label" msgid="9184635195162827832">"Fortsett"</string>
-    <string name="change_pin_cancel_label" msgid="7258783861113501519">"Avbryt"</string>
-    <string name="change_pin_ok_label" msgid="4527043915415428629">"OK"</string>
-    <string name="change_pin_enter_old_pin_header" msgid="1375728090965833028">"Bekreft den gamle PIN-koden din"</string>
-    <string name="change_pin_enter_old_pin_hint" msgid="1654231195871094175">"Skriv inn PIN-koden for talemeldinger for å fortsette."</string>
-    <string name="change_pin_enter_new_pin_header" msgid="7142620840890909719">"Angi en ny PIN-kode"</string>
-    <string name="change_pin_enter_new_pin_hint" msgid="1289662932759932217">"PIN-koden må bestå av <xliff:g id="MIN">%1$d</xliff:g>-<xliff:g id="MAX">%2$d</xliff:g> sifre."</string>
-    <string name="change_pin_confirm_pin_header" msgid="7282604363655862136">"Bekreft PIN-koden"</string>
-    <string name="change_pin_confirm_pins_dont_match" msgid="8626742552205369433">"PIN-kodene stemmer ikke overens"</string>
-    <string name="change_pin_succeeded" msgid="6869403202124894671">"PIN-koden for talemeldinger ble oppdatert"</string>
-    <string name="change_pin_system_error" msgid="5762853042379833829">"Kan ikke angi PIN-kode"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="vvm_unsupported_message_format">Meldingstypen støttes ikke. Ring %s for å høre.</string>
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-ne/strings.xml b/java/com/android/voicemail/impl/res/values-ne/strings.xml
index 44c8bb0..8ba099e 100644
--- a/java/com/android/voicemail/impl/res/values-ne/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-ne/strings.xml
@@ -1,49 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_settings_with_label" msgid="563926539137546586">"भ्वाइस मेल (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
-    <string name="voicemail_settings_title" msgid="6685263321755930738">"भ्वाइस मेल"</string>
-    <string name="voicemail_notifications_preference_title" msgid="3490553930230492405">"सूचनाहरू"</string>
-    <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"उन्नत सेटिङहरू"</string>
-    <string name="voicemail_visual_voicemail_switch_title" msgid="3158454817165714998">"भिजुअल भ्वाइस मेल"</string>
-    <string name="voicemail_visual_voicemail_auto_archive_switch_title" msgid="7120443850486401455">"अतिरिक्त ब्याकअप र भण्डारण"</string>
-    <string name="voicemail_set_pin_preference_title" msgid="1034691230818233684">"PIN सेट गर्नुहोस्"</string>
-    <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"PIN परिवर्तन गर्नुहोस्"</string>
-    <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"PIN परिवर्तन गर्न अनिवार्य रूपले भिजुअल भ्वाइस मेललाई सक्षम पारिनुपर्छ"</string>
-    <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"भिजुअल भ्वाइस मेललाई अझै सक्रिय पारिएको छैन, कृपया पुन: प्रयास गर्नुहोस्"</string>
-    <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"कृपया प्रतीक्षा गर्नुहोस्।"</string>
-    <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"नयाँ PIN अत्यन्त छोटो छ।"</string>
-    <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"नयाँ PIN अत्यन्त लामो छ।"</string>
-    <string name="vm_change_pin_error_too_weak" msgid="5865254034338293113">"नयाँ PIN अत्यन्त कमजोर छ। बलियो पासवर्डमा एउटै क्रमका वा दोहोरिएका अङ्कहरू हुनु हुँदैन।"</string>
-    <string name="vm_change_pin_error_mismatch" msgid="3682667971009913553">"पुरानो PIN मेल खाँदैन।"</string>
-    <string name="vm_change_pin_error_invalid" msgid="4317397281749196545">"नयाँ PIN मा अमान्य वर्णहरू छन्।"</string>
-    <string name="vm_change_pin_error_system_error" msgid="5972056058776852411">"PIN परिवर्तन गर्न सकिएन"</string>
-    <string name="vvm_unsupported_message_format" msgid="2746490691815392491">"सन्देशको समर्थन नगरिएको प्रकार, सुन्नका लागि <xliff:g id="NUMBER">%s</xliff:g> मा कल गर्नुहोस्।"</string>
-    <string name="change_pin_title" msgid="1363830310845461697">"भ्वाइस मेलको PIN परिवर्तन गर्नुहोस्"</string>
-    <string name="change_pin_continue_label" msgid="9184635195162827832">"जारी राख्नुहोस्"</string>
-    <string name="change_pin_cancel_label" msgid="7258783861113501519">"रद्द गर्नुहोस्"</string>
-    <string name="change_pin_ok_label" msgid="4527043915415428629">"ठीक छ"</string>
-    <string name="change_pin_enter_old_pin_header" msgid="1375728090965833028">"आफ्नो पुरानो PIN को पुष्टि गर्नुहोस्"</string>
-    <string name="change_pin_enter_old_pin_hint" msgid="1654231195871094175">"जारी राख्नका लागि आफ्नो भ्वाइस मेलको PIN प्रविष्ट गर्नुहोस्।"</string>
-    <string name="change_pin_enter_new_pin_header" msgid="7142620840890909719">"कुनै नयाँ PIN सेट गर्नुहोस्"</string>
-    <string name="change_pin_enter_new_pin_hint" msgid="1289662932759932217">"PIN अनिवार्य रूपले <xliff:g id="MIN">%1$d</xliff:g>-<xliff:g id="MAX">%2$d</xliff:g> अङ्कको हुनुपर्छ।"</string>
-    <string name="change_pin_confirm_pin_header" msgid="7282604363655862136">"तपाईंको PIN को पुष्टि गर्नुहोस्"</string>
-    <string name="change_pin_confirm_pins_dont_match" msgid="8626742552205369433">"PIN हरू मेल खाँदैनन्"</string>
-    <string name="change_pin_succeeded" msgid="6869403202124894671">"भ्वाइस मेलको PIN अद्यावधिक गरियो"</string>
-    <string name="change_pin_system_error" msgid="5762853042379833829">"PIN सेट गर्न सकिएन"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="vvm_unsupported_message_format">सन्देशको समर्थन नगरिएको प्रकार, सुन्नका लागि %s मा कल गर्नुहोस्।</string>
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-nl/strings.xml b/java/com/android/voicemail/impl/res/values-nl/strings.xml
index 1e3788d..286d520 100644
--- a/java/com/android/voicemail/impl/res/values-nl/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-nl/strings.xml
@@ -1,49 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_settings_with_label" msgid="563926539137546586">"Voicemail (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
-    <string name="voicemail_settings_title" msgid="6685263321755930738">"Voicemail"</string>
-    <string name="voicemail_notifications_preference_title" msgid="3490553930230492405">"Meldingen"</string>
-    <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"Geavanceerde instellingen"</string>
-    <string name="voicemail_visual_voicemail_switch_title" msgid="3158454817165714998">"Visuele voicemail"</string>
-    <string name="voicemail_visual_voicemail_auto_archive_switch_title" msgid="7120443850486401455">"Extra back-up en opslag"</string>
-    <string name="voicemail_set_pin_preference_title" msgid="1034691230818233684">"Pincode instellen"</string>
-    <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"Pincode wijzigen"</string>
-    <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"Visuele voicemail moet zijn ingeschakeld om de pincode te wijzigen"</string>
-    <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"Visuele voicemail is nog niet geactiveerd. Probeer het later opnieuw."</string>
-    <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"Even geduld."</string>
-    <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"De nieuwe pincode is te kort."</string>
-    <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"De nieuwe pincode is te lang."</string>
-    <string name="vm_change_pin_error_too_weak" msgid="5865254034338293113">"De nieuwe pincode is niet sterk genoeg. Een sterk wachtwoord mag geen opeenvolgende cijferreeks of herhaalde cijfers bevatten."</string>
-    <string name="vm_change_pin_error_mismatch" msgid="3682667971009913553">"De oude pincode komt niet overeen."</string>
-    <string name="vm_change_pin_error_invalid" msgid="4317397281749196545">"De nieuwe pincode bevat ongeldige tekens."</string>
-    <string name="vm_change_pin_error_system_error" msgid="5972056058776852411">"Kan pincode niet wijzigen"</string>
-    <string name="vvm_unsupported_message_format" msgid="2746490691815392491">"Niet-ondersteund berichttype, bel <xliff:g id="NUMBER">%s</xliff:g> om te luisteren."</string>
-    <string name="change_pin_title" msgid="1363830310845461697">"Voicemailpincode wijzigen"</string>
-    <string name="change_pin_continue_label" msgid="9184635195162827832">"Doorgaan"</string>
-    <string name="change_pin_cancel_label" msgid="7258783861113501519">"Annuleren"</string>
-    <string name="change_pin_ok_label" msgid="4527043915415428629">"OK"</string>
-    <string name="change_pin_enter_old_pin_header" msgid="1375728090965833028">"Je oude pincode bevestigen"</string>
-    <string name="change_pin_enter_old_pin_hint" msgid="1654231195871094175">"Geef je voicemailpincode op om door te gaan."</string>
-    <string name="change_pin_enter_new_pin_header" msgid="7142620840890909719">"Een nieuwe pincode instellen"</string>
-    <string name="change_pin_enter_new_pin_hint" msgid="1289662932759932217">"Pincode moet <xliff:g id="MIN">%1$d</xliff:g>-<xliff:g id="MAX">%2$d</xliff:g> cijfers zijn."</string>
-    <string name="change_pin_confirm_pin_header" msgid="7282604363655862136">"De pincode bevestigen"</string>
-    <string name="change_pin_confirm_pins_dont_match" msgid="8626742552205369433">"Pincodes komen niet overeen"</string>
-    <string name="change_pin_succeeded" msgid="6869403202124894671">"Voicemailpincode geüpdatet"</string>
-    <string name="change_pin_system_error" msgid="5762853042379833829">"Kan pincode niet instellen"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="vvm_unsupported_message_format">Niet-ondersteund berichttype, bel %s om te luisteren.</string>
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-no/strings.xml b/java/com/android/voicemail/impl/res/values-no/strings.xml
index 7139887..ad9357b 100644
--- a/java/com/android/voicemail/impl/res/values-no/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-no/strings.xml
@@ -1,49 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_settings_with_label" msgid="563926539137546586">"Talepostkasse (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
-    <string name="voicemail_settings_title" msgid="6685263321755930738">"Talepost"</string>
-    <string name="voicemail_notifications_preference_title" msgid="3490553930230492405">"Varsler"</string>
-    <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"Avanserte innstillinger"</string>
-    <string name="voicemail_visual_voicemail_switch_title" msgid="3158454817165714998">"Visuell talepostkasse"</string>
-    <string name="voicemail_visual_voicemail_auto_archive_switch_title" msgid="7120443850486401455">"Ekstra sikkerhetskopi og lagring"</string>
-    <string name="voicemail_set_pin_preference_title" msgid="1034691230818233684">"Angi PIN-kode"</string>
-    <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"Endre PIN-koden"</string>
-    <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"Du må slå på visuell talepost for å endre PIN-koden"</string>
-    <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"Visuell talepost er ikke slått på ennå – prøv igjen senere"</string>
-    <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"Vent litt."</string>
-    <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"Den nye PIN-koden er for kort."</string>
-    <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"Den nye PIN-koden er for lang."</string>
-    <string name="vm_change_pin_error_too_weak" msgid="5865254034338293113">"Den nye PIN-koden er for svak. Sterke passord inneholder ikke sammenhengende sekvenser eller gjentatte sifre."</string>
-    <string name="vm_change_pin_error_mismatch" msgid="3682667971009913553">"Den gamle PIN-koden er feil."</string>
-    <string name="vm_change_pin_error_invalid" msgid="4317397281749196545">"Den nye PIN-koden inneholder ugyldige tegn."</string>
-    <string name="vm_change_pin_error_system_error" msgid="5972056058776852411">"Kan ikke bytte PIN-kode"</string>
-    <string name="vvm_unsupported_message_format" msgid="2746490691815392491">"Meldingstypen støttes ikke. Ring <xliff:g id="NUMBER">%s</xliff:g> for å høre."</string>
-    <string name="change_pin_title" msgid="1363830310845461697">"Endre PIN-kode for talemeldinger"</string>
-    <string name="change_pin_continue_label" msgid="9184635195162827832">"Fortsett"</string>
-    <string name="change_pin_cancel_label" msgid="7258783861113501519">"Avbryt"</string>
-    <string name="change_pin_ok_label" msgid="4527043915415428629">"OK"</string>
-    <string name="change_pin_enter_old_pin_header" msgid="1375728090965833028">"Bekreft den gamle PIN-koden din"</string>
-    <string name="change_pin_enter_old_pin_hint" msgid="1654231195871094175">"Skriv inn PIN-koden for talemeldinger for å fortsette."</string>
-    <string name="change_pin_enter_new_pin_header" msgid="7142620840890909719">"Angi en ny PIN-kode"</string>
-    <string name="change_pin_enter_new_pin_hint" msgid="1289662932759932217">"PIN-koden må bestå av <xliff:g id="MIN">%1$d</xliff:g>-<xliff:g id="MAX">%2$d</xliff:g> sifre."</string>
-    <string name="change_pin_confirm_pin_header" msgid="7282604363655862136">"Bekreft PIN-koden"</string>
-    <string name="change_pin_confirm_pins_dont_match" msgid="8626742552205369433">"PIN-kodene stemmer ikke overens"</string>
-    <string name="change_pin_succeeded" msgid="6869403202124894671">"PIN-koden for talemeldinger ble oppdatert"</string>
-    <string name="change_pin_system_error" msgid="5762853042379833829">"Kan ikke angi PIN-kode"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="vvm_unsupported_message_format">Meldingstypen støttes ikke. Ring %s for å høre.</string>
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-pa/strings.xml b/java/com/android/voicemail/impl/res/values-pa/strings.xml
index d65588d..9b0c27a 100644
--- a/java/com/android/voicemail/impl/res/values-pa/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-pa/strings.xml
@@ -1,49 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_settings_with_label" msgid="563926539137546586">"ਵੌਇਸਮੇਲ (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
-    <string name="voicemail_settings_title" msgid="6685263321755930738">"ਵੌਇਸਮੇਲ"</string>
-    <string name="voicemail_notifications_preference_title" msgid="3490553930230492405">"ਸੂਚਨਾਵਾਂ"</string>
-    <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"ਉੱਨਤ ਸੈਟਿੰਗਾਂ"</string>
-    <string name="voicemail_visual_voicemail_switch_title" msgid="3158454817165714998">"ਦ੍ਰਿਸ਼ਟਾਂਤਕ ਵੌਇਸਮੇਲ"</string>
-    <string name="voicemail_visual_voicemail_auto_archive_switch_title" msgid="7120443850486401455">"ਵਾਧੂ ਬੈਕਅੱਪ ਅਤੇ ਸਟੋਰੇਜ"</string>
-    <string name="voicemail_set_pin_preference_title" msgid="1034691230818233684">"PIN ਸੈੱਟ ਕਰੋ"</string>
-    <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"PIN ਬਦਲੋ"</string>
-    <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"ਦ੍ਰਿਸ਼ਟਾਂਤਕ ਵੌਇਸਮੇਲ ਨੂੰ PIN ਬਦਲਣ ਲਈ ਯੋਗ ਬਣਾਇਆ ਜਾਣਾ ਲਾਜ਼ਮੀ ਹੈ"</string>
-    <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"ਦ੍ਰਿਸ਼ਟਾਂਤਕ ਵੌਇਸਮੇਲ ਹਾਲੇ ਕਿਰਿਆਸ਼ੀਲ ਨਹੀਂ ਕੀਤੀ ਗਈ ਹੈ, ਕਿਰਪਾ ਕਰਕੇ ਬਾਅਦ ਵਿੱਚ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ"</string>
-    <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"ਕਿਰਪਾ ਕਰਕੇ ਉਡੀਕ ਕਰੋ।"</string>
-    <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"ਨਵਾਂ PIN ਬਹੁਤ ਹੀ ਛੋਟਾ ਹੈ।"</string>
-    <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"ਨਵਾਂ PIN ਬਹੁਤ ਹੀ ਲੰਬਾ ਹੈ।"</string>
-    <string name="vm_change_pin_error_too_weak" msgid="5865254034338293113">"ਨਵਾਂ PIN ਬਹੁਤ ਹੀ ਕਮਜ਼ੋਰ ਹੈ। ਮਜ਼ਬੂਤ ਪਾਸਵਰਡ ਵਿੱਚ ਨਿਰੰਤਰ ਲੜੀ ਜਾਂ ਦੁਹਰਾਏ ਗਏ ਅੰਕ ਨਹੀਂ ਹੋਣੇ ਚਾਹੀਦੇ ਹਨ।"</string>
-    <string name="vm_change_pin_error_mismatch" msgid="3682667971009913553">"ਪੁਰਾਣਾ PIN ਮੇਲ ਨਹੀਂ ਖਾਂਦਾ।"</string>
-    <string name="vm_change_pin_error_invalid" msgid="4317397281749196545">"ਨਵੇਂ PIN ਵਿੱਚ ਅਵੈਧ ਅੱਖਰ-ਚਿੰਨ੍ਹ ਹਨ।"</string>
-    <string name="vm_change_pin_error_system_error" msgid="5972056058776852411">"PIN ਨੂੰ ਬਦਲਣ ਦੇ ਅਯੋਗ"</string>
-    <string name="vvm_unsupported_message_format" msgid="2746490691815392491">"ਅਸਮਰਥਿਤ ਸੁਨੇਹਾ ਕਿਸਮ, ਸੁਣਨ ਲਈ <xliff:g id="NUMBER">%s</xliff:g> \'ਤੇ ਕਾਲ ਕਰੋ।"</string>
-    <string name="change_pin_title" msgid="1363830310845461697">"ਵੌਇਸਮੇਲ PIN ਬਦਲੋ"</string>
-    <string name="change_pin_continue_label" msgid="9184635195162827832">"ਜਾਰੀ ਰੱਖੋ"</string>
-    <string name="change_pin_cancel_label" msgid="7258783861113501519">"ਰੱਦ ਕਰੋ"</string>
-    <string name="change_pin_ok_label" msgid="4527043915415428629">"ਠੀਕ"</string>
-    <string name="change_pin_enter_old_pin_header" msgid="1375728090965833028">"ਆਪਣੇ ਪੁਰਾਣੇ PIN ਦੀ ਪੁਸ਼ਟੀ ਕਰੋ"</string>
-    <string name="change_pin_enter_old_pin_hint" msgid="1654231195871094175">"ਜਾਰੀ ਰੱਖਣ ਲਈ ਆਪਣਾ ਵੌਇਸਮੇਲ PIN ਦਾਖਲ ਕਰੋ।"</string>
-    <string name="change_pin_enter_new_pin_header" msgid="7142620840890909719">"ਇੱਕ ਨਵਾਂ PIN ਸੈੱਟ ਕਰੋ"</string>
-    <string name="change_pin_enter_new_pin_hint" msgid="1289662932759932217">"PIN ਲਾਜ਼ਮੀ ਤੌਰ \'ਤੇ <xliff:g id="MIN">%1$d</xliff:g>-<xliff:g id="MAX">%2$d</xliff:g> ਅੰਕਾਂ ਦਾ ਹੋਣਾ ਚਾਹੀਦਾ ਹੈ।"</string>
-    <string name="change_pin_confirm_pin_header" msgid="7282604363655862136">"ਆਪਣੇ PIN ਦੀ ਪੁਸ਼ਟੀ ਕਰੋ"</string>
-    <string name="change_pin_confirm_pins_dont_match" msgid="8626742552205369433">"PIN ਮੇਲ ਨਹੀਂ ਖਾਂਦੇ"</string>
-    <string name="change_pin_succeeded" msgid="6869403202124894671">"ਵੌਇਸਮੇਲ PIN ਅੱਪਡੇਟ ਕੀਤਾ ਗਿਆ"</string>
-    <string name="change_pin_system_error" msgid="5762853042379833829">"PIN ਸੈੱਟ ਕਰਨ ਦੇ ਅਯੋਗ"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="vvm_unsupported_message_format">ਅਸਮਰਥਿਤ ਸੁਨੇਹਾ ਕਿਸਮ, ਸੁਣਨ ਲਈ %s \'ਤੇ ਕਾਲ ਕਰੋ।</string>
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-pl/strings.xml b/java/com/android/voicemail/impl/res/values-pl/strings.xml
index ae3dcf7..caf9a7f 100644
--- a/java/com/android/voicemail/impl/res/values-pl/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-pl/strings.xml
@@ -1,49 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_settings_with_label" msgid="563926539137546586">"Poczta głosowa (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
-    <string name="voicemail_settings_title" msgid="6685263321755930738">"Poczta głosowa"</string>
-    <string name="voicemail_notifications_preference_title" msgid="3490553930230492405">"Powiadomienia"</string>
-    <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"Ustawienia zaawansowane"</string>
-    <string name="voicemail_visual_voicemail_switch_title" msgid="3158454817165714998">"Wizualna poczta głosowa"</string>
-    <string name="voicemail_visual_voicemail_auto_archive_switch_title" msgid="7120443850486401455">"Dodatkowe miejsce i kopia zapasowa"</string>
-    <string name="voicemail_set_pin_preference_title" msgid="1034691230818233684">"Ustaw kod PIN"</string>
-    <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"Zmień kod PIN"</string>
-    <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"Aby można było zmienić kod PIN, wizualna poczta głosowa musi być włączona"</string>
-    <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"Wizualna poczta głosowa nie została jeszcze aktywowana – spróbuj ponownie później"</string>
-    <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"Poczekaj."</string>
-    <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"Nowy kod PIN jest za krótki."</string>
-    <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"Nowy kod PIN jest za długi."</string>
-    <string name="vm_change_pin_error_too_weak" msgid="5865254034338293113">"Nowy kod PIN jest zbyt słaby. Silne hasło nie może zawierać ciągu kolejnych cyfr lub powtarzających się cyfr."</string>
-    <string name="vm_change_pin_error_mismatch" msgid="3682667971009913553">"Stary kod PIN jest nieprawidłowy."</string>
-    <string name="vm_change_pin_error_invalid" msgid="4317397281749196545">"Nowy kod PIN zawiera nieprawidłowe znaki."</string>
-    <string name="vm_change_pin_error_system_error" msgid="5972056058776852411">"Nie udało się zmienić kodu PIN"</string>
-    <string name="vvm_unsupported_message_format" msgid="2746490691815392491">"Nieobsługiwany typ wiadomości – aby ją odsłuchać, zadzwoń pod numer <xliff:g id="NUMBER">%s</xliff:g>."</string>
-    <string name="change_pin_title" msgid="1363830310845461697">"Zmień kod PIN poczty głosowej"</string>
-    <string name="change_pin_continue_label" msgid="9184635195162827832">"Dalej"</string>
-    <string name="change_pin_cancel_label" msgid="7258783861113501519">"Anuluj"</string>
-    <string name="change_pin_ok_label" msgid="4527043915415428629">"OK"</string>
-    <string name="change_pin_enter_old_pin_header" msgid="1375728090965833028">"Potwierdź stary kod PIN"</string>
-    <string name="change_pin_enter_old_pin_hint" msgid="1654231195871094175">"Wpisz kod PIN poczty głosowej, aby przejść dalej."</string>
-    <string name="change_pin_enter_new_pin_header" msgid="7142620840890909719">"Ustaw nowy kod PIN"</string>
-    <string name="change_pin_enter_new_pin_hint" msgid="1289662932759932217">"Kod PIN musi zawierać od <xliff:g id="MIN">%1$d</xliff:g> do <xliff:g id="MAX">%2$d</xliff:g> cyfr."</string>
-    <string name="change_pin_confirm_pin_header" msgid="7282604363655862136">"Potwierdź kod PIN"</string>
-    <string name="change_pin_confirm_pins_dont_match" msgid="8626742552205369433">"Kody PIN nie są identyczne."</string>
-    <string name="change_pin_succeeded" msgid="6869403202124894671">"Kod PIN poczty głosowej został zaktualizowany."</string>
-    <string name="change_pin_system_error" msgid="5762853042379833829">"Nie udało się ustawić kodu PIN"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="vvm_unsupported_message_format">Nieobsługiwany typ wiadomości – aby ją odsłuchać, zadzwoń pod numer %s.</string>
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-pt-rBR/strings.xml b/java/com/android/voicemail/impl/res/values-pt-rBR/strings.xml
index f2c2f4e..2d09526 100644
--- a/java/com/android/voicemail/impl/res/values-pt-rBR/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-pt-rBR/strings.xml
@@ -1,49 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_settings_with_label" msgid="563926539137546586">"Correio de voz (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
-    <string name="voicemail_settings_title" msgid="6685263321755930738">"Correio de voz"</string>
-    <string name="voicemail_notifications_preference_title" msgid="3490553930230492405">"Notificações"</string>
-    <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"Configurações avançadas"</string>
-    <string name="voicemail_visual_voicemail_switch_title" msgid="3158454817165714998">"Correio de voz visual"</string>
-    <string name="voicemail_visual_voicemail_auto_archive_switch_title" msgid="7120443850486401455">"Armazenamento extra e backup"</string>
-    <string name="voicemail_set_pin_preference_title" msgid="1034691230818233684">"Definir PIN"</string>
-    <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"Alterar PIN"</string>
-    <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"O correio de voz visual precisa ser ativado para alterar o PIN"</string>
-    <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"O correio de voz visual ainda não foi ativado, tente novamente mais tarde"</string>
-    <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"Aguarde."</string>
-    <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"O novo PIN é curto demais."</string>
-    <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"O novo PIN é longo demais."</string>
-    <string name="vm_change_pin_error_too_weak" msgid="5865254034338293113">"O novo PIN é fácil demais. Uma senha segura não deve ter uma sequência contínua nem dígitos repetidos."</string>
-    <string name="vm_change_pin_error_mismatch" msgid="3682667971009913553">"O PIN antigo não corresponde."</string>
-    <string name="vm_change_pin_error_invalid" msgid="4317397281749196545">"O novo PIN contém caracteres inválidos."</string>
-    <string name="vm_change_pin_error_system_error" msgid="5972056058776852411">"Não foi possível alterar o PIN."</string>
-    <string name="vvm_unsupported_message_format" msgid="2746490691815392491">"Tipo de mensagem incompatível, para ouvi-la, ligue para <xliff:g id="NUMBER">%s</xliff:g>."</string>
-    <string name="change_pin_title" msgid="1363830310845461697">"Alterar o PIN do correio de voz"</string>
-    <string name="change_pin_continue_label" msgid="9184635195162827832">"Continuar"</string>
-    <string name="change_pin_cancel_label" msgid="7258783861113501519">"Cancelar"</string>
-    <string name="change_pin_ok_label" msgid="4527043915415428629">"OK"</string>
-    <string name="change_pin_enter_old_pin_header" msgid="1375728090965833028">"Confirme seu PIN antigo"</string>
-    <string name="change_pin_enter_old_pin_hint" msgid="1654231195871094175">"Digite o PIN do correio de voz para continuar."</string>
-    <string name="change_pin_enter_new_pin_header" msgid="7142620840890909719">"Definir um novo PIN"</string>
-    <string name="change_pin_enter_new_pin_hint" msgid="1289662932759932217">"O PIN precisa ter de <xliff:g id="MIN">%1$d</xliff:g> a <xliff:g id="MAX">%2$d</xliff:g> dígitos."</string>
-    <string name="change_pin_confirm_pin_header" msgid="7282604363655862136">"Confirmar seu PIN"</string>
-    <string name="change_pin_confirm_pins_dont_match" msgid="8626742552205369433">"Os PINs não correspondem"</string>
-    <string name="change_pin_succeeded" msgid="6869403202124894671">"PIN do correio de voz atualizado"</string>
-    <string name="change_pin_system_error" msgid="5762853042379833829">"Não foi possível definir o PIN"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="vvm_unsupported_message_format">Tipo de mensagem incompatível, para ouvi-la, ligue para %s.</string>
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-pt-rPT/strings.xml b/java/com/android/voicemail/impl/res/values-pt-rPT/strings.xml
index b92a54c..4a7c4f8 100644
--- a/java/com/android/voicemail/impl/res/values-pt-rPT/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-pt-rPT/strings.xml
@@ -1,49 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_settings_with_label" msgid="563926539137546586">"Correio de voz (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
-    <string name="voicemail_settings_title" msgid="6685263321755930738">"Correio de voz"</string>
-    <string name="voicemail_notifications_preference_title" msgid="3490553930230492405">"Notificações"</string>
-    <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"Definições avançadas"</string>
-    <string name="voicemail_visual_voicemail_switch_title" msgid="3158454817165714998">"Mensagem de correio de voz visual"</string>
-    <string name="voicemail_visual_voicemail_auto_archive_switch_title" msgid="7120443850486401455">"Cópia de segurança e armazenamento extra"</string>
-    <string name="voicemail_set_pin_preference_title" msgid="1034691230818233684">"Definir PIN"</string>
-    <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"Alterar PIN"</string>
-    <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"A mensagem de correio de voz visual tem de estar ativada para poder alterar o PIN"</string>
-    <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"A mensagem de correio de voz visual ainda não está ativada. Tente novamente mais tarde"</string>
-    <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"Aguarde."</string>
-    <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"O novo PIN é demasiado curto."</string>
-    <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"O novo PIN é demasiado longo."</string>
-    <string name="vm_change_pin_error_too_weak" msgid="5865254034338293113">"O novo PIN é demasiado fraco. Uma palavra-passe forte não deve ter uma sequência de dígitos contínua ou repetida."</string>
-    <string name="vm_change_pin_error_mismatch" msgid="3682667971009913553">"O PIN antigo não corresponde."</string>
-    <string name="vm_change_pin_error_invalid" msgid="4317397281749196545">"O novo PIN contém carateres inválidos."</string>
-    <string name="vm_change_pin_error_system_error" msgid="5972056058776852411">"Não é possível alterar o PIN"</string>
-    <string name="vvm_unsupported_message_format" msgid="2746490691815392491">"Tipo de mensagem não suportada, ligue para o número <xliff:g id="NUMBER">%s</xliff:g> para ouvir."</string>
-    <string name="change_pin_title" msgid="1363830310845461697">"Alterar o PIN do correio de voz"</string>
-    <string name="change_pin_continue_label" msgid="9184635195162827832">"Continuar"</string>
-    <string name="change_pin_cancel_label" msgid="7258783861113501519">"Cancelar"</string>
-    <string name="change_pin_ok_label" msgid="4527043915415428629">"OK"</string>
-    <string name="change_pin_enter_old_pin_header" msgid="1375728090965833028">"Confirmar o PIN antigo"</string>
-    <string name="change_pin_enter_old_pin_hint" msgid="1654231195871094175">"Introduza o PIN do seu correio de voz para continuar."</string>
-    <string name="change_pin_enter_new_pin_header" msgid="7142620840890909719">"Definir um PIN novo"</string>
-    <string name="change_pin_enter_new_pin_hint" msgid="1289662932759932217">"O PIN tem de ter <xliff:g id="MIN">%1$d</xliff:g>-<xliff:g id="MAX">%2$d</xliff:g> dígitos."</string>
-    <string name="change_pin_confirm_pin_header" msgid="7282604363655862136">"Confirmar PIN"</string>
-    <string name="change_pin_confirm_pins_dont_match" msgid="8626742552205369433">"Os PINs não correspondem"</string>
-    <string name="change_pin_succeeded" msgid="6869403202124894671">"O PIN do correio de voz foi atualizado"</string>
-    <string name="change_pin_system_error" msgid="5762853042379833829">"Não é possível definir o PIN"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="vvm_unsupported_message_format">Tipo de mensagem não suportada, ligue para o número %s para ouvir.</string>
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-pt/strings.xml b/java/com/android/voicemail/impl/res/values-pt/strings.xml
index f2c2f4e..2d09526 100644
--- a/java/com/android/voicemail/impl/res/values-pt/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-pt/strings.xml
@@ -1,49 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_settings_with_label" msgid="563926539137546586">"Correio de voz (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
-    <string name="voicemail_settings_title" msgid="6685263321755930738">"Correio de voz"</string>
-    <string name="voicemail_notifications_preference_title" msgid="3490553930230492405">"Notificações"</string>
-    <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"Configurações avançadas"</string>
-    <string name="voicemail_visual_voicemail_switch_title" msgid="3158454817165714998">"Correio de voz visual"</string>
-    <string name="voicemail_visual_voicemail_auto_archive_switch_title" msgid="7120443850486401455">"Armazenamento extra e backup"</string>
-    <string name="voicemail_set_pin_preference_title" msgid="1034691230818233684">"Definir PIN"</string>
-    <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"Alterar PIN"</string>
-    <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"O correio de voz visual precisa ser ativado para alterar o PIN"</string>
-    <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"O correio de voz visual ainda não foi ativado, tente novamente mais tarde"</string>
-    <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"Aguarde."</string>
-    <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"O novo PIN é curto demais."</string>
-    <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"O novo PIN é longo demais."</string>
-    <string name="vm_change_pin_error_too_weak" msgid="5865254034338293113">"O novo PIN é fácil demais. Uma senha segura não deve ter uma sequência contínua nem dígitos repetidos."</string>
-    <string name="vm_change_pin_error_mismatch" msgid="3682667971009913553">"O PIN antigo não corresponde."</string>
-    <string name="vm_change_pin_error_invalid" msgid="4317397281749196545">"O novo PIN contém caracteres inválidos."</string>
-    <string name="vm_change_pin_error_system_error" msgid="5972056058776852411">"Não foi possível alterar o PIN."</string>
-    <string name="vvm_unsupported_message_format" msgid="2746490691815392491">"Tipo de mensagem incompatível, para ouvi-la, ligue para <xliff:g id="NUMBER">%s</xliff:g>."</string>
-    <string name="change_pin_title" msgid="1363830310845461697">"Alterar o PIN do correio de voz"</string>
-    <string name="change_pin_continue_label" msgid="9184635195162827832">"Continuar"</string>
-    <string name="change_pin_cancel_label" msgid="7258783861113501519">"Cancelar"</string>
-    <string name="change_pin_ok_label" msgid="4527043915415428629">"OK"</string>
-    <string name="change_pin_enter_old_pin_header" msgid="1375728090965833028">"Confirme seu PIN antigo"</string>
-    <string name="change_pin_enter_old_pin_hint" msgid="1654231195871094175">"Digite o PIN do correio de voz para continuar."</string>
-    <string name="change_pin_enter_new_pin_header" msgid="7142620840890909719">"Definir um novo PIN"</string>
-    <string name="change_pin_enter_new_pin_hint" msgid="1289662932759932217">"O PIN precisa ter de <xliff:g id="MIN">%1$d</xliff:g> a <xliff:g id="MAX">%2$d</xliff:g> dígitos."</string>
-    <string name="change_pin_confirm_pin_header" msgid="7282604363655862136">"Confirmar seu PIN"</string>
-    <string name="change_pin_confirm_pins_dont_match" msgid="8626742552205369433">"Os PINs não correspondem"</string>
-    <string name="change_pin_succeeded" msgid="6869403202124894671">"PIN do correio de voz atualizado"</string>
-    <string name="change_pin_system_error" msgid="5762853042379833829">"Não foi possível definir o PIN"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="vvm_unsupported_message_format">Tipo de mensagem incompatível, para ouvi-la, ligue para %s.</string>
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-ro/strings.xml b/java/com/android/voicemail/impl/res/values-ro/strings.xml
index 165171b..7721fa0 100644
--- a/java/com/android/voicemail/impl/res/values-ro/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-ro/strings.xml
@@ -1,49 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_settings_with_label" msgid="563926539137546586">"Mesagerie vocală (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
-    <string name="voicemail_settings_title" msgid="6685263321755930738">"Mesagerie vocală"</string>
-    <string name="voicemail_notifications_preference_title" msgid="3490553930230492405">"Notificări"</string>
-    <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"Setări avansate"</string>
-    <string name="voicemail_visual_voicemail_switch_title" msgid="3158454817165714998">"Mesagerie vocală vizuală"</string>
-    <string name="voicemail_visual_voicemail_auto_archive_switch_title" msgid="7120443850486401455">"Backup și spațiu de stocare suplimentare"</string>
-    <string name="voicemail_set_pin_preference_title" msgid="1034691230818233684">"Setați codul PIN"</string>
-    <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"Schimbați codul PIN"</string>
-    <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"Mesageria vocală vizuală trebuie activată pentru a schimba codul PIN."</string>
-    <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"Mesageria vocală vizuală nu este activată încă. Încercați din nou mai târziu."</string>
-    <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"Așteptați."</string>
-    <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"Codul PIN nou este prea scurt."</string>
-    <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"Codul PIN nou este prea lung."</string>
-    <string name="vm_change_pin_error_too_weak" msgid="5865254034338293113">"Codul PIN nou este prea slab. O parolă puternică nu ar trebui să aibă o secvență continuă sau cifre repetitive."</string>
-    <string name="vm_change_pin_error_mismatch" msgid="3682667971009913553">"Codul PIN vechi nu corespunde."</string>
-    <string name="vm_change_pin_error_invalid" msgid="4317397281749196545">"Codul PIN nou conține caractere nevalide."</string>
-    <string name="vm_change_pin_error_system_error" msgid="5972056058776852411">"Nu se poate schimba codul PIN"</string>
-    <string name="vvm_unsupported_message_format" msgid="2746490691815392491">"Tip de mesaj neacceptat. Sunați la <xliff:g id="NUMBER">%s</xliff:g> pentru a-l asculta."</string>
-    <string name="change_pin_title" msgid="1363830310845461697">"Schimbați codul PIN pentru mesageria vocală"</string>
-    <string name="change_pin_continue_label" msgid="9184635195162827832">"Continuați"</string>
-    <string name="change_pin_cancel_label" msgid="7258783861113501519">"Anulați"</string>
-    <string name="change_pin_ok_label" msgid="4527043915415428629">"OK"</string>
-    <string name="change_pin_enter_old_pin_header" msgid="1375728090965833028">"Confirmați vechiul cod PIN"</string>
-    <string name="change_pin_enter_old_pin_hint" msgid="1654231195871094175">"Introduceți codul PIN pentru mesageria vocală pentru a continua."</string>
-    <string name="change_pin_enter_new_pin_header" msgid="7142620840890909719">"Setați un cod PIN nou"</string>
-    <string name="change_pin_enter_new_pin_hint" msgid="1289662932759932217">"Codul PIN trebuie să aibă <xliff:g id="MIN">%1$d</xliff:g> - <xliff:g id="MAX">%2$d</xliff:g> cifre."</string>
-    <string name="change_pin_confirm_pin_header" msgid="7282604363655862136">"Confirmați codul PIN"</string>
-    <string name="change_pin_confirm_pins_dont_match" msgid="8626742552205369433">"Codurile PIN nu corespund"</string>
-    <string name="change_pin_succeeded" msgid="6869403202124894671">"Codul PIN pentru mesageria vocală a fost actualizat."</string>
-    <string name="change_pin_system_error" msgid="5762853042379833829">"Nu s-a putut seta codul PIN"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="vvm_unsupported_message_format">Tip de mesaj neacceptat. Sunați la %s pentru a-l asculta.</string>
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-ru/strings.xml b/java/com/android/voicemail/impl/res/values-ru/strings.xml
index 99a0b54..23210f0 100644
--- a/java/com/android/voicemail/impl/res/values-ru/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-ru/strings.xml
@@ -1,49 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_settings_with_label" msgid="563926539137546586">"Голосовая почта (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
-    <string name="voicemail_settings_title" msgid="6685263321755930738">"Голосовая почта"</string>
-    <string name="voicemail_notifications_preference_title" msgid="3490553930230492405">"Уведомления"</string>
-    <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"Расширенные настройки"</string>
-    <string name="voicemail_visual_voicemail_switch_title" msgid="3158454817165714998">"Визуальная голосовая почта"</string>
-    <string name="voicemail_visual_voicemail_auto_archive_switch_title" msgid="7120443850486401455">"Дополнительное место для хранения и резервного копирования"</string>
-    <string name="voicemail_set_pin_preference_title" msgid="1034691230818233684">"Установка PIN-кода"</string>
-    <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"Изменение PIN-кода"</string>
-    <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"Чтобы изменить PIN-код, включите визуальную голосовую почту"</string>
-    <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"Визуальная голосовая почта пока не активирована, повторите попытку позже"</string>
-    <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"Подождите…"</string>
-    <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"Новый PIN-код слишком короткий."</string>
-    <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"Новый PIN-код слишком длинный."</string>
-    <string name="vm_change_pin_error_too_weak" msgid="5865254034338293113">"Новый PIN-код слишком простой. Чтобы пароль был надежным, он не должен содержать непрерывную последовательность чисел или повторяющиеся цифры."</string>
-    <string name="vm_change_pin_error_mismatch" msgid="3682667971009913553">"Старый PIN-код указан неверно."</string>
-    <string name="vm_change_pin_error_invalid" msgid="4317397281749196545">"Новый PIN-код содержит недопустимые символы."</string>
-    <string name="vm_change_pin_error_system_error" msgid="5972056058776852411">"Не удалось сменить PIN-код"</string>
-    <string name="vvm_unsupported_message_format" msgid="2746490691815392491">"Неподдерживаемый тип сообщения. Чтобы его прослушать, позвоните по телефону <xliff:g id="NUMBER">%s</xliff:g>."</string>
-    <string name="change_pin_title" msgid="1363830310845461697">"Сменить PIN-код голосовой почты"</string>
-    <string name="change_pin_continue_label" msgid="9184635195162827832">"Продолжить"</string>
-    <string name="change_pin_cancel_label" msgid="7258783861113501519">"Отмена"</string>
-    <string name="change_pin_ok_label" msgid="4527043915415428629">"ОК"</string>
-    <string name="change_pin_enter_old_pin_header" msgid="1375728090965833028">"Подтвердите предыдущий PIN-код"</string>
-    <string name="change_pin_enter_old_pin_hint" msgid="1654231195871094175">"Чтобы продолжить, введите PIN-код голосовой почты."</string>
-    <string name="change_pin_enter_new_pin_header" msgid="7142620840890909719">"Задайте новый PIN-код"</string>
-    <string name="change_pin_enter_new_pin_hint" msgid="1289662932759932217">"PIN-код должен содержать <xliff:g id="MIN">%1$d</xliff:g>–<xliff:g id="MAX">%2$d</xliff:g> зн."</string>
-    <string name="change_pin_confirm_pin_header" msgid="7282604363655862136">"Подтвердите PIN-код"</string>
-    <string name="change_pin_confirm_pins_dont_match" msgid="8626742552205369433">"PIN-коды не совпадают."</string>
-    <string name="change_pin_succeeded" msgid="6869403202124894671">"PIN-код голосовой почты обновлен"</string>
-    <string name="change_pin_system_error" msgid="5762853042379833829">"Не удалось установить PIN-код"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="vvm_unsupported_message_format">Неподдерживаемый тип сообщения. Чтобы его прослушать, позвоните по телефону %s.</string>
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-si/strings.xml b/java/com/android/voicemail/impl/res/values-si/strings.xml
index 7879678..3946faf 100644
--- a/java/com/android/voicemail/impl/res/values-si/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-si/strings.xml
@@ -1,49 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_settings_with_label" msgid="563926539137546586">"හඬ තැපෑල (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
-    <string name="voicemail_settings_title" msgid="6685263321755930738">"හඬ තැපෑල"</string>
-    <string name="voicemail_notifications_preference_title" msgid="3490553930230492405">"දැනුම්දීම්"</string>
-    <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"උසස් සැකසීම්"</string>
-    <string name="voicemail_visual_voicemail_switch_title" msgid="3158454817165714998">"දෘශ්‍ය හඬ තැපෑල"</string>
-    <string name="voicemail_visual_voicemail_auto_archive_switch_title" msgid="7120443850486401455">"අතිරේක උපස්ථය සහ ගබඩාව"</string>
-    <string name="voicemail_set_pin_preference_title" msgid="1034691230818233684">"PIN අංකය සකසන්න"</string>
-    <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"PIN අංකය වෙනස් කරන්න"</string>
-    <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"PIN අංකය වෙනස් කිරීමට දෘශ්‍ය හඬ තැපෑල සබල කළ යුතුය"</string>
-    <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"දෘශ්‍ය හඬ තැපෑල තවම සක්‍රිය කර නැත, කරුණාකර පසුව නැවත උත්සාහ කරන්න"</string>
-    <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"කරුණාකර රැඳී සිටින්න."</string>
-    <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"නව PIN අංකය කෙටි වැඩිය."</string>
-    <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"නව PIN අංකය දිග වැඩිය."</string>
-    <string name="vm_change_pin_error_too_weak" msgid="5865254034338293113">"නව PIN අංකය දුර්වල වැඩිය. ශක්තිමත් මුරපදයක අඛණ්ඩ අනුපිළිවෙළක් හෝ පුනරාවර්ත ඉලක්කම් නොතිබිය යුතුය."</string>
-    <string name="vm_change_pin_error_mismatch" msgid="3682667971009913553">"පැරණි PIN අංකය නොගැළපේ."</string>
-    <string name="vm_change_pin_error_invalid" msgid="4317397281749196545">"නව PIN අංකයෙහි අවලංගු අනුලකුණු අන්තර්ගත වේ."</string>
-    <string name="vm_change_pin_error_system_error" msgid="5972056058776852411">"PIN අංකය මාරු කිරීමට නොහැකිය"</string>
-    <string name="vvm_unsupported_message_format" msgid="2746490691815392491">"සහාය නොදක්වන පණිවිඩය වර්ගය, සවන් දීමට <xliff:g id="NUMBER">%s</xliff:g> අමතන්න."</string>
-    <string name="change_pin_title" msgid="1363830310845461697">"හඬ තැපැල් PIN අංකය වෙනස් කරන්න"</string>
-    <string name="change_pin_continue_label" msgid="9184635195162827832">"දිගටම කරගෙන යන්න"</string>
-    <string name="change_pin_cancel_label" msgid="7258783861113501519">"අවලංගු කරන්න"</string>
-    <string name="change_pin_ok_label" msgid="4527043915415428629">"හරි"</string>
-    <string name="change_pin_enter_old_pin_header" msgid="1375728090965833028">"ඔබේ පැරණි PIN අංකය තහවුරු කරන්න"</string>
-    <string name="change_pin_enter_old_pin_hint" msgid="1654231195871094175">"දිගටම කරගෙන යාමට ඔබ හඬ තැපැල් PIN අංකය ඇතුළු කරන්න."</string>
-    <string name="change_pin_enter_new_pin_header" msgid="7142620840890909719">"නව PIN අංකයක් සකසන්න"</string>
-    <string name="change_pin_enter_new_pin_hint" msgid="1289662932759932217">"PIN අංකය ඉලක්කම් <xliff:g id="MIN">%1$d</xliff:g>-<xliff:g id="MAX">%2$d</xliff:g> අතර විය යුතුය."</string>
-    <string name="change_pin_confirm_pin_header" msgid="7282604363655862136">"ඔබගේ PIN තහවුරු කරන්න"</string>
-    <string name="change_pin_confirm_pins_dont_match" msgid="8626742552205369433">"PIN අංක නොගැළපේ"</string>
-    <string name="change_pin_succeeded" msgid="6869403202124894671">"හඬ තැපැල් PIN අංකය යාවත්කාලීන කෙරිණි"</string>
-    <string name="change_pin_system_error" msgid="5762853042379833829">"PIN අංකය සැකසීමට නොහැකිය"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="vvm_unsupported_message_format">සහාය නොදක්වන පණිවිඩය වර්ගය, සවන් දීමට %s අමතන්න.</string>
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-sk/strings.xml b/java/com/android/voicemail/impl/res/values-sk/strings.xml
index a6deaa6..5f66719 100644
--- a/java/com/android/voicemail/impl/res/values-sk/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-sk/strings.xml
@@ -1,49 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_settings_with_label" msgid="563926539137546586">"Hlasová schránka <xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>"</string>
-    <string name="voicemail_settings_title" msgid="6685263321755930738">"Hlasová schránka"</string>
-    <string name="voicemail_notifications_preference_title" msgid="3490553930230492405">"Upozornenia"</string>
-    <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"Rozšírené nastavenia"</string>
-    <string name="voicemail_visual_voicemail_switch_title" msgid="3158454817165714998">"Vizuálna hlasová schránka"</string>
-    <string name="voicemail_visual_voicemail_auto_archive_switch_title" msgid="7120443850486401455">"Ďalšie zálohovanie a úložisko"</string>
-    <string name="voicemail_set_pin_preference_title" msgid="1034691230818233684">"Nastavenie kódu PIN"</string>
-    <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"Zmena kódu PIN"</string>
-    <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"PIN možno zmeniť až po povolení vizuálnej hlasovej schránky"</string>
-    <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"Vizuálna hlasová schránka ešte nie je aktivovaná, skúste to znova neskôr"</string>
-    <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"Čakajte."</string>
-    <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"Nový PIN je príliš krátky."</string>
-    <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"Nový PIN je príliš dlhý."</string>
-    <string name="vm_change_pin_error_too_weak" msgid="5865254034338293113">"Nový PIN je príliš slabý. Silné heslo by nemalo obsahovať postupnosť ani opakujúce sa číslice."</string>
-    <string name="vm_change_pin_error_mismatch" msgid="3682667971009913553">"Starý PIN sa nezhoduje."</string>
-    <string name="vm_change_pin_error_invalid" msgid="4317397281749196545">"Nový PIN obsahuje neplatné znaky."</string>
-    <string name="vm_change_pin_error_system_error" msgid="5972056058776852411">"PIN sa nedá zmeniť"</string>
-    <string name="vvm_unsupported_message_format" msgid="2746490691815392491">"Nepodporovaný typ správy, zavolajte na číslo <xliff:g id="NUMBER">%s</xliff:g> a vypočujte si správu."</string>
-    <string name="change_pin_title" msgid="1363830310845461697">"Zmena kódu PIN hlasovej schránky"</string>
-    <string name="change_pin_continue_label" msgid="9184635195162827832">"Pokračovať"</string>
-    <string name="change_pin_cancel_label" msgid="7258783861113501519">"Zrušiť"</string>
-    <string name="change_pin_ok_label" msgid="4527043915415428629">"OK"</string>
-    <string name="change_pin_enter_old_pin_header" msgid="1375728090965833028">"Potvrďte starý PIN"</string>
-    <string name="change_pin_enter_old_pin_hint" msgid="1654231195871094175">"Ak chcete pokračovať, zadajte PIN hlasovej schránky."</string>
-    <string name="change_pin_enter_new_pin_header" msgid="7142620840890909719">"Nastavte nový PIN"</string>
-    <string name="change_pin_enter_new_pin_hint" msgid="1289662932759932217">"PIN musí mať tento počet číslic: <xliff:g id="MIN">%1$d</xliff:g> – <xliff:g id="MAX">%2$d</xliff:g>."</string>
-    <string name="change_pin_confirm_pin_header" msgid="7282604363655862136">"Potvrďte PIN"</string>
-    <string name="change_pin_confirm_pins_dont_match" msgid="8626742552205369433">"Kódy PIN sa nezhodujú"</string>
-    <string name="change_pin_succeeded" msgid="6869403202124894671">"PIN hlasovej schránky bol aktualizovaný"</string>
-    <string name="change_pin_system_error" msgid="5762853042379833829">"PIN sa nedá nastaviť"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="vvm_unsupported_message_format">Nepodporovaný typ správy, zavolajte na číslo %s a vypočujte si správu.</string>
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-sl/strings.xml b/java/com/android/voicemail/impl/res/values-sl/strings.xml
index bf515c0..0652a6f 100644
--- a/java/com/android/voicemail/impl/res/values-sl/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-sl/strings.xml
@@ -1,49 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_settings_with_label" msgid="563926539137546586">"Sporočilo v odzivniku (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
-    <string name="voicemail_settings_title" msgid="6685263321755930738">"Sporočilo v odzivniku"</string>
-    <string name="voicemail_notifications_preference_title" msgid="3490553930230492405">"Obvestila"</string>
-    <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"Dodatne nastavitve"</string>
-    <string name="voicemail_visual_voicemail_switch_title" msgid="3158454817165714998">"Vizualno sporočilo v odzivniku"</string>
-    <string name="voicemail_visual_voicemail_auto_archive_switch_title" msgid="7120443850486401455">"Dodatno varnostno kopiranje in shramba"</string>
-    <string name="voicemail_set_pin_preference_title" msgid="1034691230818233684">"Nastavitev kode PIN"</string>
-    <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"Sprememba kode PIN"</string>
-    <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"Če želite spremeniti kodo PIN, morajo biti vizualna sporočila v odzivniku omogočena"</string>
-    <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"Vizualna sporočila v odzivniku še niso aktivirana. Poskusite znova pozneje"</string>
-    <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"Počakajte."</string>
-    <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"Nova koda PIN je prekratka."</string>
-    <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"Nova koda PIN je predolga."</string>
-    <string name="vm_change_pin_error_too_weak" msgid="5865254034338293113">"Nova koda PIN je prešibka. Zapleteno geslo ne sme vsebovati zaporednih ali ponavljajočih se števk."</string>
-    <string name="vm_change_pin_error_mismatch" msgid="3682667971009913553">"Stara koda PIN se ne ujema."</string>
-    <string name="vm_change_pin_error_invalid" msgid="4317397281749196545">"Nova koda PIN vsebuje neveljavne znake."</string>
-    <string name="vm_change_pin_error_system_error" msgid="5972056058776852411">"Ni mogoče spremeniti kode PIN"</string>
-    <string name="vvm_unsupported_message_format" msgid="2746490691815392491">"Nepodprta vrsta sporočila, za poslušanje pokličite <xliff:g id="NUMBER">%s</xliff:g>."</string>
-    <string name="change_pin_title" msgid="1363830310845461697">"Sprememba kode PIN za sporočila v odzivniku"</string>
-    <string name="change_pin_continue_label" msgid="9184635195162827832">"Nadaljuj"</string>
-    <string name="change_pin_cancel_label" msgid="7258783861113501519">"Prekliči"</string>
-    <string name="change_pin_ok_label" msgid="4527043915415428629">"V redu"</string>
-    <string name="change_pin_enter_old_pin_header" msgid="1375728090965833028">"Potrditev stare kode PIN"</string>
-    <string name="change_pin_enter_old_pin_hint" msgid="1654231195871094175">"Če želite nadaljevati, vnesite kodo PIN za sporočila v odzivniku."</string>
-    <string name="change_pin_enter_new_pin_header" msgid="7142620840890909719">"Nastavitev nove kode PIN"</string>
-    <string name="change_pin_enter_new_pin_hint" msgid="1289662932759932217">"Koda PIN mora imeti <xliff:g id="MIN">%1$d</xliff:g>–<xliff:g id="MAX">%2$d</xliff:g> števk."</string>
-    <string name="change_pin_confirm_pin_header" msgid="7282604363655862136">"Potrdite kodo PIN"</string>
-    <string name="change_pin_confirm_pins_dont_match" msgid="8626742552205369433">"Kodi PIN se ne ujemata"</string>
-    <string name="change_pin_succeeded" msgid="6869403202124894671">"Koda PIN za sporočila v odzivniku je posodobljena"</string>
-    <string name="change_pin_system_error" msgid="5762853042379833829">"Kode PIN ni mogoče nastaviti"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="vvm_unsupported_message_format">Nepodprta vrsta sporočila, za poslušanje pokličite %s.</string>
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-sq/strings.xml b/java/com/android/voicemail/impl/res/values-sq/strings.xml
index 09104c8..2ed7802 100644
--- a/java/com/android/voicemail/impl/res/values-sq/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-sq/strings.xml
@@ -1,49 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_settings_with_label" msgid="563926539137546586">"Posta zanore (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
-    <string name="voicemail_settings_title" msgid="6685263321755930738">"Posta zanore"</string>
-    <string name="voicemail_notifications_preference_title" msgid="3490553930230492405">"Njoftimet"</string>
-    <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"Cilësimet e përparuara"</string>
-    <string name="voicemail_visual_voicemail_switch_title" msgid="3158454817165714998">"Posta zanore vizuale"</string>
-    <string name="voicemail_visual_voicemail_auto_archive_switch_title" msgid="7120443850486401455">"Rezervimi dhe hapësira ruajtëse shtesë"</string>
-    <string name="voicemail_set_pin_preference_title" msgid="1034691230818233684">"Konfiguro kodin PIN"</string>
-    <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"Ndrysho kodin PIN"</string>
-    <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"Duhet të aktivizohet posta zanore vizuale për të ndryshuar kodin PIN"</string>
-    <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"Posta zanore vizuale nuk është aktivizuar ende. Provo përsëri më vonë"</string>
-    <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"Prit..."</string>
-    <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"Kodi i ri PIN është shumë i shkurtër."</string>
-    <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"Kodi i ri PIN është shumë i gjatë."</string>
-    <string name="vm_change_pin_error_too_weak" msgid="5865254034338293113">"Kodi i ri PIN është shumë i dobët. Një fjalëkalim i fortë nuk duhet të ketë shifra të përsëritura ose në rend të vazhduar."</string>
-    <string name="vm_change_pin_error_mismatch" msgid="3682667971009913553">"Kodi PIN i vjetër nuk përputhet."</string>
-    <string name="vm_change_pin_error_invalid" msgid="4317397281749196545">"Kodi PIN i ri përmban karaktere të pavlefshme."</string>
-    <string name="vm_change_pin_error_system_error" msgid="5972056058776852411">"Kodi PIN nuk mund të ndryshohet."</string>
-    <string name="vvm_unsupported_message_format" msgid="2746490691815392491">"Lloj mesazhi i pambështetur. Telefono <xliff:g id="NUMBER">%s</xliff:g> për ta dëgjuar."</string>
-    <string name="change_pin_title" msgid="1363830310845461697">"Ndrysho kodin PIN të postës zanore"</string>
-    <string name="change_pin_continue_label" msgid="9184635195162827832">"Vazhdo"</string>
-    <string name="change_pin_cancel_label" msgid="7258783861113501519">"Anulo"</string>
-    <string name="change_pin_ok_label" msgid="4527043915415428629">"Në rregull"</string>
-    <string name="change_pin_enter_old_pin_header" msgid="1375728090965833028">"Konfirmo kodin PIN të vjetër"</string>
-    <string name="change_pin_enter_old_pin_hint" msgid="1654231195871094175">"Shkruaj kodin PIN të postës zanore për të vazhduar."</string>
-    <string name="change_pin_enter_new_pin_header" msgid="7142620840890909719">"Cakto një kod të ri PIN."</string>
-    <string name="change_pin_enter_new_pin_hint" msgid="1289662932759932217">"Kodi PIN duhet të ketë <xliff:g id="MIN">%1$d</xliff:g>-<xliff:g id="MAX">%2$d</xliff:g> shifra."</string>
-    <string name="change_pin_confirm_pin_header" msgid="7282604363655862136">"Konfirmo kodin tënd PIN"</string>
-    <string name="change_pin_confirm_pins_dont_match" msgid="8626742552205369433">"Kodet PIN nuk përputhen"</string>
-    <string name="change_pin_succeeded" msgid="6869403202124894671">"Kodi PIN i postës zanore u përditësua"</string>
-    <string name="change_pin_system_error" msgid="5762853042379833829">"Kodi PIN nuk mund të caktohet"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="vvm_unsupported_message_format">Lloj mesazhi i pambështetur. Telefono %s për ta dëgjuar.</string>
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-sr/strings.xml b/java/com/android/voicemail/impl/res/values-sr/strings.xml
index ea0ce7b..d45325d 100644
--- a/java/com/android/voicemail/impl/res/values-sr/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-sr/strings.xml
@@ -1,49 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_settings_with_label" msgid="563926539137546586">"Говорна пошта (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
-    <string name="voicemail_settings_title" msgid="6685263321755930738">"Говорна пошта"</string>
-    <string name="voicemail_notifications_preference_title" msgid="3490553930230492405">"Обавештења"</string>
-    <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"Напредна подешавања"</string>
-    <string name="voicemail_visual_voicemail_switch_title" msgid="3158454817165714998">"Визуелна говорна пошта"</string>
-    <string name="voicemail_visual_voicemail_auto_archive_switch_title" msgid="7120443850486401455">"Додатне резервне копије и простор"</string>
-    <string name="voicemail_set_pin_preference_title" msgid="1034691230818233684">"Подесите PIN"</string>
-    <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"Промените PIN"</string>
-    <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"Морате да омогућите визуелну говорну пошту да бисте променили PIN"</string>
-    <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"Визуелна говорна пошта још увек није активирана, пробајте поново касније"</string>
-    <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"Сачекајте."</string>
-    <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"Нови PIN је прекратак."</string>
-    <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"Нови PIN је предугачак."</string>
-    <string name="vm_change_pin_error_too_weak" msgid="5865254034338293113">"Нови PIN је преслаб. Јака лозинка не треба да садржи узастопни низ ни поновљене цифре."</string>
-    <string name="vm_change_pin_error_mismatch" msgid="3682667971009913553">"Стари PIN се не подудара."</string>
-    <string name="vm_change_pin_error_invalid" msgid="4317397281749196545">"Нови PIN садржи неважеће знакове."</string>
-    <string name="vm_change_pin_error_system_error" msgid="5972056058776852411">"Промена PIN-а није успела"</string>
-    <string name="vvm_unsupported_message_format" msgid="2746490691815392491">"Неподржани тип поруке. Позовите <xliff:g id="NUMBER">%s</xliff:g> да бисте је преслушали."</string>
-    <string name="change_pin_title" msgid="1363830310845461697">"Промените PIN кôд говорне поште"</string>
-    <string name="change_pin_continue_label" msgid="9184635195162827832">"Настави"</string>
-    <string name="change_pin_cancel_label" msgid="7258783861113501519">"Откажи"</string>
-    <string name="change_pin_ok_label" msgid="4527043915415428629">"Потврди"</string>
-    <string name="change_pin_enter_old_pin_header" msgid="1375728090965833028">"Потврдите стари PIN"</string>
-    <string name="change_pin_enter_old_pin_hint" msgid="1654231195871094175">"Унесите PIN кôд говорне поште да бисте наставили."</string>
-    <string name="change_pin_enter_new_pin_header" msgid="7142620840890909719">"Подесите нови PIN"</string>
-    <string name="change_pin_enter_new_pin_hint" msgid="1289662932759932217">"Број цифара које PIN мора да садржи: <xliff:g id="MIN">%1$d</xliff:g>–<xliff:g id="MAX">%2$d</xliff:g>."</string>
-    <string name="change_pin_confirm_pin_header" msgid="7282604363655862136">"Потврдите PIN"</string>
-    <string name="change_pin_confirm_pins_dont_match" msgid="8626742552205369433">"PIN-ови се не подударају"</string>
-    <string name="change_pin_succeeded" msgid="6869403202124894671">"PIN кôд говорне поште је ажуриран"</string>
-    <string name="change_pin_system_error" msgid="5762853042379833829">"Подешавање PIN-а није успело"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="vvm_unsupported_message_format">Неподржани тип поруке. Позовите %s да бисте је преслушали.</string>
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-sv/strings.xml b/java/com/android/voicemail/impl/res/values-sv/strings.xml
index 89a1e23..58eb8ad 100644
--- a/java/com/android/voicemail/impl/res/values-sv/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-sv/strings.xml
@@ -1,49 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_settings_with_label" msgid="563926539137546586">"Röstbrevlåda (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
-    <string name="voicemail_settings_title" msgid="6685263321755930738">"Röstbrevlåda"</string>
-    <string name="voicemail_notifications_preference_title" msgid="3490553930230492405">"Aviseringar"</string>
-    <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"Avancerade inställningar"</string>
-    <string name="voicemail_visual_voicemail_switch_title" msgid="3158454817165714998">"Visuell röstbrevlåda"</string>
-    <string name="voicemail_visual_voicemail_auto_archive_switch_title" msgid="7120443850486401455">"Extra säkerhetskopiering och lagring"</string>
-    <string name="voicemail_set_pin_preference_title" msgid="1034691230818233684">"Ställ in pinkod"</string>
-    <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"Ändra pinkod"</string>
-    <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"Visuell röstbrevlåda måste vara aktiverat för att ändra pinkoden"</string>
-    <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"Visuell röstbrevlåda är ännu inte aktiverad, försök igen senare"</string>
-    <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"Vänta."</string>
-    <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"Den nya pinkoden är för kort."</string>
-    <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"Den nya pinkoden är för lång."</string>
-    <string name="vm_change_pin_error_too_weak" msgid="5865254034338293113">"Den nya pinkoden är för svag. Ett starkt lösenord bör inte ha siffror i ordningsföljd eller upprepade siffror."</string>
-    <string name="vm_change_pin_error_mismatch" msgid="3682667971009913553">"Den gamla pinkoden stämmer inte."</string>
-    <string name="vm_change_pin_error_invalid" msgid="4317397281749196545">"Den nya pinkoden innehåller ogiltiga tecken."</string>
-    <string name="vm_change_pin_error_system_error" msgid="5972056058776852411">"Det gick inte att ändra pinkoden"</string>
-    <string name="vvm_unsupported_message_format" msgid="2746490691815392491">"Meddelandetypen stöds inte, ring <xliff:g id="NUMBER">%s</xliff:g> om du vill lyssna."</string>
-    <string name="change_pin_title" msgid="1363830310845461697">"Ändra röstbrevlådans pinkod"</string>
-    <string name="change_pin_continue_label" msgid="9184635195162827832">"Fortsätt"</string>
-    <string name="change_pin_cancel_label" msgid="7258783861113501519">"Avbryt"</string>
-    <string name="change_pin_ok_label" msgid="4527043915415428629">"OK"</string>
-    <string name="change_pin_enter_old_pin_header" msgid="1375728090965833028">"Bekräfta den gamla pinkoden"</string>
-    <string name="change_pin_enter_old_pin_hint" msgid="1654231195871094175">"Ange pinkoden till röstbrevlådan för att fortsätta."</string>
-    <string name="change_pin_enter_new_pin_header" msgid="7142620840890909719">"Ange en ny pinkod"</string>
-    <string name="change_pin_enter_new_pin_hint" msgid="1289662932759932217">"Pinkoden måste ha <xliff:g id="MIN">%1$d</xliff:g>-<xliff:g id="MAX">%2$d</xliff:g> siffror."</string>
-    <string name="change_pin_confirm_pin_header" msgid="7282604363655862136">"Bekräfta din pinkod"</string>
-    <string name="change_pin_confirm_pins_dont_match" msgid="8626742552205369433">"Pinkoderna matchar inte"</string>
-    <string name="change_pin_succeeded" msgid="6869403202124894671">"Röstbrevlådans pinkod bekräftad"</string>
-    <string name="change_pin_system_error" msgid="5762853042379833829">"Det går inte att ställa in pinkod"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="vvm_unsupported_message_format">Meddelandetypen stöds inte, ring %s om du vill lyssna.</string>
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-sw/strings.xml b/java/com/android/voicemail/impl/res/values-sw/strings.xml
index d8c7557..e297cd6 100644
--- a/java/com/android/voicemail/impl/res/values-sw/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-sw/strings.xml
@@ -1,49 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_settings_with_label" msgid="563926539137546586">"Ujumbe wa sauti (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
-    <string name="voicemail_settings_title" msgid="6685263321755930738">"Ujumbe wa sauti"</string>
-    <string name="voicemail_notifications_preference_title" msgid="3490553930230492405">"Arifa"</string>
-    <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"Mipangilio ya Kina"</string>
-    <string name="voicemail_visual_voicemail_switch_title" msgid="3158454817165714998">"Ujumbe wa Sauti Unaoonekana"</string>
-    <string name="voicemail_visual_voicemail_auto_archive_switch_title" msgid="7120443850486401455">"Nafasi ya ziada na hifadhi rudufu"</string>
-    <string name="voicemail_set_pin_preference_title" msgid="1034691230818233684">"Weka PIN"</string>
-    <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"Badilisha PIN"</string>
-    <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"Lazima uruhusu kipengele cha ujumbe wa sauti unaoonekana ili ubadilishe PIN"</string>
-    <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"Kipengele cha ujumbe wa sauti unaoonekana bado hakijawashwa, tafadhali jaribu tena baadaye"</string>
-    <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"Tafadhali subiri."</string>
-    <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"PIN mpya ni fupi mno."</string>
-    <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"PIN mpya ni ndefu mno."</string>
-    <string name="vm_change_pin_error_too_weak" msgid="5865254034338293113">"PIN mpya ni dhaifu mno. Nenosiri thabiti halifai kuwa na herufi zinazofuatana mfululizo au tarakimu zinazorudiwa."</string>
-    <string name="vm_change_pin_error_mismatch" msgid="3682667971009913553">"PIN ya zamani si sahihi."</string>
-    <string name="vm_change_pin_error_invalid" msgid="4317397281749196545">"PIN mpya ina herufi zisizostahiki."</string>
-    <string name="vm_change_pin_error_system_error" msgid="5972056058776852411">"Imeshindwa kubadilisha PIN"</string>
-    <string name="vvm_unsupported_message_format" msgid="2746490691815392491">"Huwezi kuona ujumbe wa aina hii; piga <xliff:g id="NUMBER">%s</xliff:g> ili uusikilize."</string>
-    <string name="change_pin_title" msgid="1363830310845461697">"Badilisha PIN ya Ujumbe wa Sauti"</string>
-    <string name="change_pin_continue_label" msgid="9184635195162827832">"Endelea"</string>
-    <string name="change_pin_cancel_label" msgid="7258783861113501519">"Ghairi"</string>
-    <string name="change_pin_ok_label" msgid="4527043915415428629">"Sawa"</string>
-    <string name="change_pin_enter_old_pin_header" msgid="1375728090965833028">"Thibitisha PIN yako ya awali"</string>
-    <string name="change_pin_enter_old_pin_hint" msgid="1654231195871094175">"Weka PIN yako ya ujumbe wa sauti ili uendelee."</string>
-    <string name="change_pin_enter_new_pin_header" msgid="7142620840890909719">"Weka PIN mpya"</string>
-    <string name="change_pin_enter_new_pin_hint" msgid="1289662932759932217">"PIN lazima iwe na nambari <xliff:g id="MIN">%1$d</xliff:g>-<xliff:g id="MAX">%2$d</xliff:g>."</string>
-    <string name="change_pin_confirm_pin_header" msgid="7282604363655862136">"Thibitisha PIN yako"</string>
-    <string name="change_pin_confirm_pins_dont_match" msgid="8626742552205369433">"PIN hazilingani"</string>
-    <string name="change_pin_succeeded" msgid="6869403202124894671">"PIN ya ujumbe wa sauti imesasishwa"</string>
-    <string name="change_pin_system_error" msgid="5762853042379833829">"Imeshindwa kuweka PIN"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="vvm_unsupported_message_format">Huwezi kuona ujumbe wa aina hii; piga %s ili uusikilize.</string>
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-ta/strings.xml b/java/com/android/voicemail/impl/res/values-ta/strings.xml
index 1b965aa..914ce90 100644
--- a/java/com/android/voicemail/impl/res/values-ta/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-ta/strings.xml
@@ -1,49 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_settings_with_label" msgid="563926539137546586">"குரலஞ்சல் (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
-    <string name="voicemail_settings_title" msgid="6685263321755930738">"குரலஞ்சல்"</string>
-    <string name="voicemail_notifications_preference_title" msgid="3490553930230492405">"அறிவிப்புகள்"</string>
-    <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"மேம்பட்ட அமைப்புகள்"</string>
-    <string name="voicemail_visual_voicemail_switch_title" msgid="3158454817165714998">"விஷூவல் குரலஞ்சல்"</string>
-    <string name="voicemail_visual_voicemail_auto_archive_switch_title" msgid="7120443850486401455">"கூடுதல் காப்புப் பிரதியும் சேமிப்பகமும்"</string>
-    <string name="voicemail_set_pin_preference_title" msgid="1034691230818233684">"பின்னை அமை"</string>
-    <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"பின்னை மாற்று"</string>
-    <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"பின்னை மாற்ற, விஷுவல் குரலஞ்சலை இயக்க வேண்டும்"</string>
-    <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"விஷுவல் குரலஞ்சல் இன்னும் இயக்கப்படவில்லை. பிறகு முயலவும்"</string>
-    <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"காத்திருக்கவும்."</string>
-    <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"புதிய பின் மிகவும் சிறியதாக உள்ளது."</string>
-    <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"புதிய பின் மிகவும் நீளமாக உள்ளது."</string>
-    <string name="vm_change_pin_error_too_weak" msgid="5865254034338293113">"புதிய பின் மிகவும் வலுவற்றதாக உள்ளது. வலுவான கடவுச்சொல்லில் தொடர்வரிசையோ மீண்டும் மீண்டும் வரும் இலக்கங்களோ இருக்கக்கூடாது."</string>
-    <string name="vm_change_pin_error_mismatch" msgid="3682667971009913553">"பழைய பின் பொருந்தவில்லை."</string>
-    <string name="vm_change_pin_error_invalid" msgid="4317397281749196545">"புதிய பின்னில் தவறான எழுத்துக்குறிகள் உள்ளன."</string>
-    <string name="vm_change_pin_error_system_error" msgid="5972056058776852411">"பின்னை மாற்ற முடியவில்லை"</string>
-    <string name="vvm_unsupported_message_format" msgid="2746490691815392491">"ஆதரிக்கப்படாத செய்தி வகை, தகவலைக் கேட்க <xliff:g id="NUMBER">%s</xliff:g> என்ற எண்ணை அழைக்கவும்."</string>
-    <string name="change_pin_title" msgid="1363830310845461697">"குரலஞ்சல் பின்னை மாற்றவும்"</string>
-    <string name="change_pin_continue_label" msgid="9184635195162827832">"தொடர்க"</string>
-    <string name="change_pin_cancel_label" msgid="7258783861113501519">"ரத்துசெய்"</string>
-    <string name="change_pin_ok_label" msgid="4527043915415428629">"சரி"</string>
-    <string name="change_pin_enter_old_pin_header" msgid="1375728090965833028">"பழைய பின்னை உறுதிப்படுத்தவும்"</string>
-    <string name="change_pin_enter_old_pin_hint" msgid="1654231195871094175">"தொடர, குரலஞ்சல் பின்னை உள்ளிடவும்."</string>
-    <string name="change_pin_enter_new_pin_header" msgid="7142620840890909719">"புதிய பின்னை அமைக்கவும்"</string>
-    <string name="change_pin_enter_new_pin_hint" msgid="1289662932759932217">"பின்னில் <xliff:g id="MIN">%1$d</xliff:g>-<xliff:g id="MAX">%2$d</xliff:g> இலக்கங்கள் இருக்க வேண்டும்."</string>
-    <string name="change_pin_confirm_pin_header" msgid="7282604363655862136">"பின்னை உறுதிசெய்யவும்"</string>
-    <string name="change_pin_confirm_pins_dont_match" msgid="8626742552205369433">"பின்கள் பொருந்தவில்லை"</string>
-    <string name="change_pin_succeeded" msgid="6869403202124894671">"குரலஞ்சல் பின் மாற்றப்பட்டது"</string>
-    <string name="change_pin_system_error" msgid="5762853042379833829">"பின்னை அமைக்க முடியவில்லை"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="vvm_unsupported_message_format">ஆதரிக்கப்படாத செய்தி வகை, தகவலைக் கேட்க %s என்ற எண்ணை அழைக்கவும்.</string>
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-te/strings.xml b/java/com/android/voicemail/impl/res/values-te/strings.xml
index 089a1ba..57d6ed3 100644
--- a/java/com/android/voicemail/impl/res/values-te/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-te/strings.xml
@@ -1,49 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_settings_with_label" msgid="563926539137546586">"వాయిస్ మెయిల్ (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
-    <string name="voicemail_settings_title" msgid="6685263321755930738">"వాయిస్ మెయిల్"</string>
-    <string name="voicemail_notifications_preference_title" msgid="3490553930230492405">"నోటిఫికేషన్‌లు"</string>
-    <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"అధునాతన సెట్టింగ్‌లు"</string>
-    <string name="voicemail_visual_voicemail_switch_title" msgid="3158454817165714998">"దృశ్యమాన వాయిస్ మెయిల్"</string>
-    <string name="voicemail_visual_voicemail_auto_archive_switch_title" msgid="7120443850486401455">"అదనపు బ్యాకప్ మరియు నిల్వ"</string>
-    <string name="voicemail_set_pin_preference_title" msgid="1034691230818233684">"PINని సెట్ చేయండి"</string>
-    <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"PINను మార్చండి"</string>
-    <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"PINని మార్చడానికి తప్పనిసరిగా దృశ్యమాన వాయిస్ మెయిల్‌ను ప్రారంభించాలి"</string>
-    <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"దృశ్యమాన వాయిస్ మెయిల్‌ ఇంకా సక్రియం కాలేదు, దయచేసి తర్వాత మళ్లీ ప్రయత్నించండి"</string>
-    <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"దయచేసి వేచి ఉండండి."</string>
-    <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"కొత్త PIN చాలా చిన్నదిగా ఉంది."</string>
-    <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"కొత్త PIN చాలా పొడవుగా ఉంది."</string>
-    <string name="vm_change_pin_error_too_weak" msgid="5865254034338293113">"కొత్త PIN చాలా బలహీనంగా ఉంది. శక్తివంతమైన పాస్‌వర్డ్‌లో వరుస శ్రేణిలో అక్షరాలు/అంకెలు లేదా పునరావృత అంకెలు ఉండకూడదు."</string>
-    <string name="vm_change_pin_error_mismatch" msgid="3682667971009913553">"పాత PIN సరిపోలలేదు."</string>
-    <string name="vm_change_pin_error_invalid" msgid="4317397281749196545">"కొత్త PIN చెల్లని అక్షరాలను కలిగి ఉంది."</string>
-    <string name="vm_change_pin_error_system_error" msgid="5972056058776852411">"PINని మార్చడం సాధ్యపడలేదు"</string>
-    <string name="vvm_unsupported_message_format" msgid="2746490691815392491">"మద్దతు లేని సందేశ రకం, వినేందుకు <xliff:g id="NUMBER">%s</xliff:g>కి కాల్ చేయండి."</string>
-    <string name="change_pin_title" msgid="1363830310845461697">"వాయిస్ మెయిల్ PINని మార్చండి"</string>
-    <string name="change_pin_continue_label" msgid="9184635195162827832">"కొనసాగించు"</string>
-    <string name="change_pin_cancel_label" msgid="7258783861113501519">"రద్దు చేయి"</string>
-    <string name="change_pin_ok_label" msgid="4527043915415428629">"సరే"</string>
-    <string name="change_pin_enter_old_pin_header" msgid="1375728090965833028">"మీ పాత PINని నిర్ధారించండి"</string>
-    <string name="change_pin_enter_old_pin_hint" msgid="1654231195871094175">"కొనసాగించడానికి మీ వాయిస్ మెయిల్ PINని నమోదు చేయండి."</string>
-    <string name="change_pin_enter_new_pin_header" msgid="7142620840890909719">"కొత్త PINని సెట్ చేయండి"</string>
-    <string name="change_pin_enter_new_pin_hint" msgid="1289662932759932217">"PIN తప్పనిసరిగా <xliff:g id="MIN">%1$d</xliff:g>-<xliff:g id="MAX">%2$d</xliff:g> అంకెల మధ్య ఉండాలి."</string>
-    <string name="change_pin_confirm_pin_header" msgid="7282604363655862136">"మీ PINను నిర్ధారించండి"</string>
-    <string name="change_pin_confirm_pins_dont_match" msgid="8626742552205369433">"PINలు సరిపోలలేదు"</string>
-    <string name="change_pin_succeeded" msgid="6869403202124894671">"వాయిస్ మెయిల్ PIN నవీకరించబడింది"</string>
-    <string name="change_pin_system_error" msgid="5762853042379833829">"PINని సెట్ చేయడం సాధ్యపడలేదు"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="vvm_unsupported_message_format">మద్దతు లేని సందేశ రకం, వినేందుకు %sకి కాల్ చేయండి.</string>
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-th/strings.xml b/java/com/android/voicemail/impl/res/values-th/strings.xml
index 130ea26..fb7820a 100644
--- a/java/com/android/voicemail/impl/res/values-th/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-th/strings.xml
@@ -1,49 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_settings_with_label" msgid="563926539137546586">"ข้อความเสียง (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
-    <string name="voicemail_settings_title" msgid="6685263321755930738">"ข้อความเสียง"</string>
-    <string name="voicemail_notifications_preference_title" msgid="3490553930230492405">"การแจ้งเตือน"</string>
-    <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"การตั้งค่าขั้นสูง"</string>
-    <string name="voicemail_visual_voicemail_switch_title" msgid="3158454817165714998">"ภาพแสดงข้อความเสียง"</string>
-    <string name="voicemail_visual_voicemail_auto_archive_switch_title" msgid="7120443850486401455">"การสำรองข้อมูลและพื้นที่เก็บข้อมูลเพิ่มเติม"</string>
-    <string name="voicemail_set_pin_preference_title" msgid="1034691230818233684">"ตั้งค่า PIN"</string>
-    <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"เปลี่ยน PIN"</string>
-    <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"ต้องเปิดใช้ข้อความเสียงพร้อมภาพเพื่อเปลี่ยน PIN"</string>
-    <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"ยังไม่ได้เปิดใช้งานข้อความเสียงพร้อมภาพ โปรดลองอีกครั้งในภายหลัง"</string>
-    <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"โปรดรอสักครู่"</string>
-    <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"PIN ใหม่สั้นเกินไป"</string>
-    <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"PIN ใหม่ยาวเกินไป"</string>
-    <string name="vm_change_pin_error_too_weak" msgid="5865254034338293113">"PIN ใหม่เดาง่ายเกินไป รหัสผ่านที่เดายากไม่ควรมีตัวเลขที่เรียงค่ากันหรือตัวเลขซ้ำๆ"</string>
-    <string name="vm_change_pin_error_mismatch" msgid="3682667971009913553">"PIN เก่าไม่ถูกต้อง"</string>
-    <string name="vm_change_pin_error_invalid" msgid="4317397281749196545">"PIN ใหม่มีอักขระที่ไม่ถูกต้อง"</string>
-    <string name="vm_change_pin_error_system_error" msgid="5972056058776852411">"ไม่สามารถเปลี่ยน PIN ได้"</string>
-    <string name="vvm_unsupported_message_format" msgid="2746490691815392491">"ไม่รองรับข้อความประเภทนี้ โปรดโทร <xliff:g id="NUMBER">%s</xliff:g> เพื่อฟังข้อความเสียง"</string>
-    <string name="change_pin_title" msgid="1363830310845461697">"เปลี่ยน PIN ข้อความเสียง"</string>
-    <string name="change_pin_continue_label" msgid="9184635195162827832">"ต่อไป"</string>
-    <string name="change_pin_cancel_label" msgid="7258783861113501519">"ยกเลิก"</string>
-    <string name="change_pin_ok_label" msgid="4527043915415428629">"ตกลง"</string>
-    <string name="change_pin_enter_old_pin_header" msgid="1375728090965833028">"ยืนยัน PIN เก่า"</string>
-    <string name="change_pin_enter_old_pin_hint" msgid="1654231195871094175">"ป้อน PIN ข้อความเสียงเพื่อดำเนินการต่อ"</string>
-    <string name="change_pin_enter_new_pin_header" msgid="7142620840890909719">"ตั้งค่า PIN ใหม่"</string>
-    <string name="change_pin_enter_new_pin_hint" msgid="1289662932759932217">"PIN ต้องเป็นตัวเลข <xliff:g id="MIN">%1$d</xliff:g>-<xliff:g id="MAX">%2$d</xliff:g> หลัก"</string>
-    <string name="change_pin_confirm_pin_header" msgid="7282604363655862136">"ยืนยัน PIN"</string>
-    <string name="change_pin_confirm_pins_dont_match" msgid="8626742552205369433">"PIN ไม่ตรงกัน"</string>
-    <string name="change_pin_succeeded" msgid="6869403202124894671">"อัปเดต PIN ข้อความเสียงแล้ว"</string>
-    <string name="change_pin_system_error" msgid="5762853042379833829">"ไม่สามารถตั้งค่า PIN"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="vvm_unsupported_message_format">ไม่รองรับข้อความประเภทนี้ โปรดโทร %s เพื่อฟังข้อความเสียง</string>
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-tl/strings.xml b/java/com/android/voicemail/impl/res/values-tl/strings.xml
index 58d1883..6de7ba3 100644
--- a/java/com/android/voicemail/impl/res/values-tl/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-tl/strings.xml
@@ -1,49 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_settings_with_label" msgid="563926539137546586">"Voicemail (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
-    <string name="voicemail_settings_title" msgid="6685263321755930738">"Voicemail"</string>
-    <string name="voicemail_notifications_preference_title" msgid="3490553930230492405">"Mga Notification"</string>
-    <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"Mga Advanced na Setting"</string>
-    <string name="voicemail_visual_voicemail_switch_title" msgid="3158454817165714998">"Visual na Voicemail"</string>
-    <string name="voicemail_visual_voicemail_auto_archive_switch_title" msgid="7120443850486401455">"Karagdagang backup at storage"</string>
-    <string name="voicemail_set_pin_preference_title" msgid="1034691230818233684">"Magtakda ng PIN"</string>
-    <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"Palitan ang PIN"</string>
-    <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"Dapat naka-enable ang visual na voicemail upang palitan ang PIN"</string>
-    <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"Hindi pa naka-activate ang visual na voicemail, pakisubukang muli sa ibang pagkakataon"</string>
-    <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"Pakihintay."</string>
-    <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"Masyadong maikli ang bagong PIN."</string>
-    <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"Masyadong mahaba ang bagong PIN."</string>
-    <string name="vm_change_pin_error_too_weak" msgid="5865254034338293113">"Masyadong mahina ang bagong PIN. Ang isang malakas na password ay hindi dapat magkaroon ng tuloy-tuloy na sequence o paulit-ulit na mga digit."</string>
-    <string name="vm_change_pin_error_mismatch" msgid="3682667971009913553">"Hindi tumutugma ang lumang PIN."</string>
-    <string name="vm_change_pin_error_invalid" msgid="4317397281749196545">"Ang bagong PIN ay naglalaman ng mga di-wastong character."</string>
-    <string name="vm_change_pin_error_system_error" msgid="5972056058776852411">"Hindi nabago ang PIN"</string>
-    <string name="vvm_unsupported_message_format" msgid="2746490691815392491">"Hindi sinusuportahang uri ng mensahe, tawagan ang <xliff:g id="NUMBER">%s</xliff:g> upang pakinggan."</string>
-    <string name="change_pin_title" msgid="1363830310845461697">"Baguhin ang PIN sa Voicemail"</string>
-    <string name="change_pin_continue_label" msgid="9184635195162827832">"Magpatuloy"</string>
-    <string name="change_pin_cancel_label" msgid="7258783861113501519">"Kanselahin"</string>
-    <string name="change_pin_ok_label" msgid="4527043915415428629">"OK"</string>
-    <string name="change_pin_enter_old_pin_header" msgid="1375728090965833028">"Kumpirmahin ang luma mong PIN"</string>
-    <string name="change_pin_enter_old_pin_hint" msgid="1654231195871094175">"Ilagay ang iyong PIN sa voicemail upang magpatuloy."</string>
-    <string name="change_pin_enter_new_pin_header" msgid="7142620840890909719">"Magtakda ng bagong PIN"</string>
-    <string name="change_pin_enter_new_pin_hint" msgid="1289662932759932217">"Ang PIN ay dapat <xliff:g id="MIN">%1$d</xliff:g>-<xliff:g id="MAX">%2$d</xliff:g> (na) digit."</string>
-    <string name="change_pin_confirm_pin_header" msgid="7282604363655862136">"Kumpirmahin ang iyong PIN"</string>
-    <string name="change_pin_confirm_pins_dont_match" msgid="8626742552205369433">"Hindi tugma ang mga PIN"</string>
-    <string name="change_pin_succeeded" msgid="6869403202124894671">"In-update ang PIN sa voicemail"</string>
-    <string name="change_pin_system_error" msgid="5762853042379833829">"Hindi naitakda ang PIN"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="vvm_unsupported_message_format">Hindi sinusuportahang uri ng mensahe, tawagan ang %s upang pakinggan.</string>
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-tr/strings.xml b/java/com/android/voicemail/impl/res/values-tr/strings.xml
index 578cf95..3370870 100644
--- a/java/com/android/voicemail/impl/res/values-tr/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-tr/strings.xml
@@ -1,49 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_settings_with_label" msgid="563926539137546586">"Sesli mesaj (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
-    <string name="voicemail_settings_title" msgid="6685263321755930738">"Sesli mesaj"</string>
-    <string name="voicemail_notifications_preference_title" msgid="3490553930230492405">"Bildirimler"</string>
-    <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"Gelişmiş Ayarlar"</string>
-    <string name="voicemail_visual_voicemail_switch_title" msgid="3158454817165714998">"Görsel Sesli Mesaj"</string>
-    <string name="voicemail_visual_voicemail_auto_archive_switch_title" msgid="7120443850486401455">"Ekstra yedekleme ve depolama alanı"</string>
-    <string name="voicemail_set_pin_preference_title" msgid="1034691230818233684">"PIN belirleyin"</string>
-    <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"PIN\'i değiştirin"</string>
-    <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"PIN\'i değiştirebilmek için görsel sesli mesaj etkinleştirilmelidir"</string>
-    <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"Görsel sesli mesaj henüz etkinleştirilmedi. Lütfen daha sonra tekrar deneyin."</string>
-    <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"Lütfen bekleyin."</string>
-    <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"Yeni PIN çok kısa."</string>
-    <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"Yeni PIN çok uzun."</string>
-    <string name="vm_change_pin_error_too_weak" msgid="5865254034338293113">"Yeni PIN çok zayıf. Güçlü bir şifrede birbirini sıralı şekilde takip eden veya yinelenen rakamlar bulunmamalıdır."</string>
-    <string name="vm_change_pin_error_mismatch" msgid="3682667971009913553">"Eski PIN eşleşmiyor."</string>
-    <string name="vm_change_pin_error_invalid" msgid="4317397281749196545">"Yeni PIN, geçersiz karakterler içeriyor."</string>
-    <string name="vm_change_pin_error_system_error" msgid="5972056058776852411">"PIN değiştirilemedi"</string>
-    <string name="vvm_unsupported_message_format" msgid="2746490691815392491">"Desteklenmeyen mesaj türü. Dinlemek için <xliff:g id="NUMBER">%s</xliff:g> numaralı telefonu arayın."</string>
-    <string name="change_pin_title" msgid="1363830310845461697">"Sesli Mesaj PIN\'ini Değiştirin"</string>
-    <string name="change_pin_continue_label" msgid="9184635195162827832">"Devam"</string>
-    <string name="change_pin_cancel_label" msgid="7258783861113501519">"İptal"</string>
-    <string name="change_pin_ok_label" msgid="4527043915415428629">"Tamam"</string>
-    <string name="change_pin_enter_old_pin_header" msgid="1375728090965833028">"Eski PIN\'inizi onaylayın"</string>
-    <string name="change_pin_enter_old_pin_hint" msgid="1654231195871094175">"Devam etmek için sesli mesaj PIN\'inizi girin."</string>
-    <string name="change_pin_enter_new_pin_header" msgid="7142620840890909719">"Yeni PIN oluşturun"</string>
-    <string name="change_pin_enter_new_pin_hint" msgid="1289662932759932217">"PIN, <xliff:g id="MIN">%1$d</xliff:g> ila <xliff:g id="MAX">%2$d</xliff:g> basamaklı olmalıdır."</string>
-    <string name="change_pin_confirm_pin_header" msgid="7282604363655862136">"PIN\'inizi onaylayın"</string>
-    <string name="change_pin_confirm_pins_dont_match" msgid="8626742552205369433">"PIN\'ler eşleşmiyor"</string>
-    <string name="change_pin_succeeded" msgid="6869403202124894671">"Sesli mesaj PIN\'i güncellendi"</string>
-    <string name="change_pin_system_error" msgid="5762853042379833829">"PIN ayarlanamadı"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="vvm_unsupported_message_format">Desteklenmeyen mesaj türü. Dinlemek için %s numaralı telefonu arayın.</string>
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-uk/strings.xml b/java/com/android/voicemail/impl/res/values-uk/strings.xml
index b1d7c10..a052dd6 100644
--- a/java/com/android/voicemail/impl/res/values-uk/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-uk/strings.xml
@@ -1,49 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_settings_with_label" msgid="563926539137546586">"Голосова пошта (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
-    <string name="voicemail_settings_title" msgid="6685263321755930738">"Голосова пошта"</string>
-    <string name="voicemail_notifications_preference_title" msgid="3490553930230492405">"Сповіщення"</string>
-    <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"Розширені налаштування"</string>
-    <string name="voicemail_visual_voicemail_switch_title" msgid="3158454817165714998">"Візуальна голосова пошта"</string>
-    <string name="voicemail_visual_voicemail_auto_archive_switch_title" msgid="7120443850486401455">"Додаткова пам’ять і резервне копіювання"</string>
-    <string name="voicemail_set_pin_preference_title" msgid="1034691230818233684">"Установити PIN-код"</string>
-    <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"Змінити PIN-код"</string>
-    <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"Щоб змінити PIN-код, потрібно ввімкнути візуальну голосову пошту"</string>
-    <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"Візуальну голосову пошту ще не активовано, повторіть спробу пізніше"</string>
-    <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"Зачекайте."</string>
-    <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"Новий PIN-код закороткий."</string>
-    <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"Новий PIN-код задовгий."</string>
-    <string name="vm_change_pin_error_too_weak" msgid="5865254034338293113">"Новий PIN-код недостатньо надійний. Надійний PIN-код не має містити прямих послідовностей або повторюваних цифр."</string>
-    <string name="vm_change_pin_error_mismatch" msgid="3682667971009913553">"Старий PIN-код неправильний."</string>
-    <string name="vm_change_pin_error_invalid" msgid="4317397281749196545">"Новий PIN-код містить недійсні символи."</string>
-    <string name="vm_change_pin_error_system_error" msgid="5972056058776852411">"Не вдалося змінити PIN-код."</string>
-    <string name="vvm_unsupported_message_format" msgid="2746490691815392491">"Повідомлення непідтримуваного типу. Щоб прослухати його, зателефонуйте на номер <xliff:g id="NUMBER">%s</xliff:g>."</string>
-    <string name="change_pin_title" msgid="1363830310845461697">"Змінити PIN-код голосової пошти"</string>
-    <string name="change_pin_continue_label" msgid="9184635195162827832">"Продовжити"</string>
-    <string name="change_pin_cancel_label" msgid="7258783861113501519">"Скасувати"</string>
-    <string name="change_pin_ok_label" msgid="4527043915415428629">"OK"</string>
-    <string name="change_pin_enter_old_pin_header" msgid="1375728090965833028">"Підтвердьте старий PIN-код"</string>
-    <string name="change_pin_enter_old_pin_hint" msgid="1654231195871094175">"Щоб продовжити, введіть PIN-код голосової пошти."</string>
-    <string name="change_pin_enter_new_pin_header" msgid="7142620840890909719">"Введіть новий PIN-код"</string>
-    <string name="change_pin_enter_new_pin_hint" msgid="1289662932759932217">"Рекомендована кількість цифр у PIN-коді: <xliff:g id="MIN">%1$d</xliff:g>–<xliff:g id="MAX">%2$d</xliff:g>."</string>
-    <string name="change_pin_confirm_pin_header" msgid="7282604363655862136">"Підтвердьте PIN-код"</string>
-    <string name="change_pin_confirm_pins_dont_match" msgid="8626742552205369433">"PIN-коди не збігаються"</string>
-    <string name="change_pin_succeeded" msgid="6869403202124894671">"PIN-код голосової пошти змінено"</string>
-    <string name="change_pin_system_error" msgid="5762853042379833829">"Не вдалося встановити PIN-код"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="vvm_unsupported_message_format">Повідомлення непідтримуваного типу. Щоб прослухати його, зателефонуйте на номер %s.</string>
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-ur/strings.xml b/java/com/android/voicemail/impl/res/values-ur/strings.xml
index 7b1f8d3..b308b68 100644
--- a/java/com/android/voicemail/impl/res/values-ur/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-ur/strings.xml
@@ -1,49 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_settings_with_label" msgid="563926539137546586">"صوتی میل (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
-    <string name="voicemail_settings_title" msgid="6685263321755930738">"صوتی میل"</string>
-    <string name="voicemail_notifications_preference_title" msgid="3490553930230492405">"اطلاعات"</string>
-    <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"اعلی ترتیبات"</string>
-    <string name="voicemail_visual_voicemail_switch_title" msgid="3158454817165714998">"بصری صوتی میل"</string>
-    <string name="voicemail_visual_voicemail_auto_archive_switch_title" msgid="7120443850486401455">"اضافی بیک اپ اور اسٹوریج"</string>
-    <string name="voicemail_set_pin_preference_title" msgid="1034691230818233684">"‏PIN سیٹ کریں"</string>
-    <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"‏PIN تبدیل کریں"</string>
-    <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"‏PIN تبدیل کرنے کیلئے بصری صوتی میل اہل ہونی چاہئیے"</string>
-    <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"بصری صوتی میل ابھی فعال نہیں ہے، براہ کرم بعد میں دوبارہ کوشش کریں"</string>
-    <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"براہ کرم انتظار کریں۔"</string>
-    <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"‏نیا PIN بہت مختصر ہے۔"</string>
-    <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"‏نیا PIN بہت طویل ہے۔"</string>
-    <string name="vm_change_pin_error_too_weak" msgid="5865254034338293113">"‏نیا PIN بہت کمزور ہے۔ مضبوط پاسورڈ میں مسلسل ترتیب یا دہرے عدد نہیں ہونے چاہئیں۔"</string>
-    <string name="vm_change_pin_error_mismatch" msgid="3682667971009913553">"‏پرانا PIN مماثل نہیں ہے۔"</string>
-    <string name="vm_change_pin_error_invalid" msgid="4317397281749196545">"‏نئے PIN میں غلط کریکٹرز شامل ہیں۔"</string>
-    <string name="vm_change_pin_error_system_error" msgid="5972056058776852411">"‏PIN تبدیل کرنے سے قاصر"</string>
-    <string name="vvm_unsupported_message_format" msgid="2746490691815392491">"پیغام کی غیر تعاون یافتہ قسم، سننے کیلئے <xliff:g id="NUMBER">%s</xliff:g> پر کال کریں۔"</string>
-    <string name="change_pin_title" msgid="1363830310845461697">"‏صوتی میل کا PIN تبدیل کریں"</string>
-    <string name="change_pin_continue_label" msgid="9184635195162827832">"جاری رکھیں"</string>
-    <string name="change_pin_cancel_label" msgid="7258783861113501519">"منسوخ کریں"</string>
-    <string name="change_pin_ok_label" msgid="4527043915415428629">"ٹھیک ہے"</string>
-    <string name="change_pin_enter_old_pin_header" msgid="1375728090965833028">"‏اپنے پرانے PIN کی توثیق کریں"</string>
-    <string name="change_pin_enter_old_pin_hint" msgid="1654231195871094175">"‏جاری رکھنے کیلئے اپنے صوتی میل کا PIN داخل کریں۔"</string>
-    <string name="change_pin_enter_new_pin_header" msgid="7142620840890909719">"‏ایک نیا PIN سیٹ کریں"</string>
-    <string name="change_pin_enter_new_pin_hint" msgid="1289662932759932217">"‏PIN <xliff:g id="MIN">%1$d</xliff:g>-<xliff:g id="MAX">%2$d</xliff:g>‎ اعداد پر مشتمل ہونا چاہئیے۔"</string>
-    <string name="change_pin_confirm_pin_header" msgid="7282604363655862136">"‏اپنے PIN کی توثیق کریں"</string>
-    <string name="change_pin_confirm_pins_dont_match" msgid="8626742552205369433">"‏PINs مماثل نہیں ہیں"</string>
-    <string name="change_pin_succeeded" msgid="6869403202124894671">"‏صوتی میل PIN اپ ڈیٹ ہو گیا"</string>
-    <string name="change_pin_system_error" msgid="5762853042379833829">"‏PIN سیٹ کرنے سے قاصر"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="vvm_unsupported_message_format">پیغام کی غیر تعاون یافتہ قسم، سننے کیلئے %s پر کال کریں۔</string>
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-uz/strings.xml b/java/com/android/voicemail/impl/res/values-uz/strings.xml
index 92a7536..c812fb2 100644
--- a/java/com/android/voicemail/impl/res/values-uz/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-uz/strings.xml
@@ -1,49 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_settings_with_label" msgid="563926539137546586">"Ovozli pochta (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
-    <string name="voicemail_settings_title" msgid="6685263321755930738">"Ovozli pochta"</string>
-    <string name="voicemail_notifications_preference_title" msgid="3490553930230492405">"Bildirishnomalar"</string>
-    <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"Kengaytirilgan sozlamalar"</string>
-    <string name="voicemail_visual_voicemail_switch_title" msgid="3158454817165714998">"Vizual ovozli pochta"</string>
-    <string name="voicemail_visual_voicemail_auto_archive_switch_title" msgid="7120443850486401455">"Zaxira. va saqlash u-n qo‘shimcha xotira"</string>
-    <string name="voicemail_set_pin_preference_title" msgid="1034691230818233684">"PIN kod o‘rnatish"</string>
-    <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"PIN kodni o‘zgartirish"</string>
-    <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"PIN kodni o‘zgartirish uchun vizual ovozli pochtani yoqish lozim."</string>
-    <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"Vizual ovozli pochta yoqilmadi. Keyinroq qayta urinib ko‘ring."</string>
-    <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"Iltimos, kuting…"</string>
-    <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"Yangi PIN kod juda qisqa."</string>
-    <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"Yangi PIN kod juda uzun."</string>
-    <string name="vm_change_pin_error_too_weak" msgid="5865254034338293113">"Yangi PIN kod juda oddiy. Ishonchli PIN kodda ketma-ket yoki takrorlanadigan raqamlar bo‘lmasligi lozim."</string>
-    <string name="vm_change_pin_error_mismatch" msgid="3682667971009913553">"Eski PIN kod mos kelmayapti."</string>
-    <string name="vm_change_pin_error_invalid" msgid="4317397281749196545">"Yangi PIN kodda yaroqsiz belgilar mavjud."</string>
-    <string name="vm_change_pin_error_system_error" msgid="5972056058776852411">"PIN kodni o‘zgartirib bo‘lmadi"</string>
-    <string name="vvm_unsupported_message_format" msgid="2746490691815392491">"Bunday xabar turi qo‘llab-quvvatlanmaydi. Uni eshitish uchun <xliff:g id="NUMBER">%s</xliff:g> raqamiga qo‘ng‘iroq qiling."</string>
-    <string name="change_pin_title" msgid="1363830310845461697">"Ovozli pochta PIN kodini o‘zgartirish"</string>
-    <string name="change_pin_continue_label" msgid="9184635195162827832">"Davom etish"</string>
-    <string name="change_pin_cancel_label" msgid="7258783861113501519">"Bekor qilish"</string>
-    <string name="change_pin_ok_label" msgid="4527043915415428629">"OK"</string>
-    <string name="change_pin_enter_old_pin_header" msgid="1375728090965833028">"Eski PIN kodni tasdiqlang"</string>
-    <string name="change_pin_enter_old_pin_hint" msgid="1654231195871094175">"Davom etish uchun ovozli pochta PIN kodini kiriting."</string>
-    <string name="change_pin_enter_new_pin_header" msgid="7142620840890909719">"Yangi PIN kod o‘rnatish"</string>
-    <string name="change_pin_enter_new_pin_hint" msgid="1289662932759932217">"PIN kod <xliff:g id="MIN">%1$d</xliff:g> – <xliff:g id="MAX">%2$d</xliff:g> ta raqamdan iborat bo‘lishi lozim."</string>
-    <string name="change_pin_confirm_pin_header" msgid="7282604363655862136">"PIN kodni tasdiqlang"</string>
-    <string name="change_pin_confirm_pins_dont_match" msgid="8626742552205369433">"PIN kodlar bir-biriga mos kelmayapti."</string>
-    <string name="change_pin_succeeded" msgid="6869403202124894671">"Ovozli pochta PIN kodi yangilandi"</string>
-    <string name="change_pin_system_error" msgid="5762853042379833829">"PIN kodni o‘rnatib bo‘lmadi"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="vvm_unsupported_message_format">Bunday xabar turi qo‘llab-quvvatlanmaydi. Uni eshitish uchun %s raqamiga qo‘ng‘iroq qiling.</string>
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-vi/strings.xml b/java/com/android/voicemail/impl/res/values-vi/strings.xml
index 972c74c..3b2d3ea 100644
--- a/java/com/android/voicemail/impl/res/values-vi/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-vi/strings.xml
@@ -1,49 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_settings_with_label" msgid="563926539137546586">"Thư thoại <xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>"</string>
-    <string name="voicemail_settings_title" msgid="6685263321755930738">"Thư thoại"</string>
-    <string name="voicemail_notifications_preference_title" msgid="3490553930230492405">"Thông báo"</string>
-    <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"Cài đặt nâng cao"</string>
-    <string name="voicemail_visual_voicemail_switch_title" msgid="3158454817165714998">"Thư thoại kèm theo hình ảnh"</string>
-    <string name="voicemail_visual_voicemail_auto_archive_switch_title" msgid="7120443850486401455">"Bộ nhớ và bản sao lưu bổ sung"</string>
-    <string name="voicemail_set_pin_preference_title" msgid="1034691230818233684">"Đặt mã PIN"</string>
-    <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"Thay đổi mã PIN"</string>
-    <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"Phải bật thư thoại kèm theo hình ảnh để thay đổi mã PIN"</string>
-    <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"Thư thoại kèm theo hình ảnh chưa được kích hoạt, hãy thử lại sau"</string>
-    <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"Vui lòng đợi."</string>
-    <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"Mã PIN mới quá ngắn."</string>
-    <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"Mã PIN mới quá dài."</string>
-    <string name="vm_change_pin_error_too_weak" msgid="5865254034338293113">"Mã PIN mới quá yếu. Một mật khẩu mạnh không nên có các chữ số lặp lại hoặc chuỗi liên tiếp."</string>
-    <string name="vm_change_pin_error_mismatch" msgid="3682667971009913553">"Mã PIN cũ không khớp."</string>
-    <string name="vm_change_pin_error_invalid" msgid="4317397281749196545">"Mã PIN mới chứa các ký tự không hợp lệ."</string>
-    <string name="vm_change_pin_error_system_error" msgid="5972056058776852411">"Không thể thay đổi mã PIN"</string>
-    <string name="vvm_unsupported_message_format" msgid="2746490691815392491">"Loại tin nhắn không được hỗ trợ, hãy gọi số <xliff:g id="NUMBER">%s</xliff:g> để nghe."</string>
-    <string name="change_pin_title" msgid="1363830310845461697">"Thay đổi mã PIN thư thoại"</string>
-    <string name="change_pin_continue_label" msgid="9184635195162827832">"Tiếp tục"</string>
-    <string name="change_pin_cancel_label" msgid="7258783861113501519">"Hủy"</string>
-    <string name="change_pin_ok_label" msgid="4527043915415428629">"OK"</string>
-    <string name="change_pin_enter_old_pin_header" msgid="1375728090965833028">"Xác nhận mã PIN cũ của bạn"</string>
-    <string name="change_pin_enter_old_pin_hint" msgid="1654231195871094175">"Nhập mã PIN thư thoại của bạn để tiếp tục."</string>
-    <string name="change_pin_enter_new_pin_header" msgid="7142620840890909719">"Đặt mã PIN mới"</string>
-    <string name="change_pin_enter_new_pin_hint" msgid="1289662932759932217">"Mã PIN phải bao gồm <xliff:g id="MIN">%1$d</xliff:g>-<xliff:g id="MAX">%2$d</xliff:g> chữ số."</string>
-    <string name="change_pin_confirm_pin_header" msgid="7282604363655862136">"Xác nhận mã PIN của bạn"</string>
-    <string name="change_pin_confirm_pins_dont_match" msgid="8626742552205369433">"Các mã PIN không khớp"</string>
-    <string name="change_pin_succeeded" msgid="6869403202124894671">"Đã cập nhật mã PIN thư thoại"</string>
-    <string name="change_pin_system_error" msgid="5762853042379833829">"Không thể đặt mã PIN"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="vvm_unsupported_message_format">Loại tin nhắn không được hỗ trợ, hãy gọi số %s để nghe.</string>
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-zh-rCN/strings.xml b/java/com/android/voicemail/impl/res/values-zh-rCN/strings.xml
index 21edad6..19de118 100644
--- a/java/com/android/voicemail/impl/res/values-zh-rCN/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-zh-rCN/strings.xml
@@ -1,49 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_settings_with_label" msgid="563926539137546586">"语音邮件（<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>）"</string>
-    <string name="voicemail_settings_title" msgid="6685263321755930738">"语音邮件"</string>
-    <string name="voicemail_notifications_preference_title" msgid="3490553930230492405">"通知"</string>
-    <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"高级设置"</string>
-    <string name="voicemail_visual_voicemail_switch_title" msgid="3158454817165714998">"可视语音信箱"</string>
-    <string name="voicemail_visual_voicemail_auto_archive_switch_title" msgid="7120443850486401455">"额外存储空间和备份功能"</string>
-    <string name="voicemail_set_pin_preference_title" msgid="1034691230818233684">"设置 PIN 码"</string>
-    <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"更改 PIN 码"</string>
-    <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"必须启用可视语音信箱才可更改 PIN 码"</string>
-    <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"可视语音信箱尚未激活，请稍后再试"</string>
-    <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"请稍候。"</string>
-    <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"新的 PIN 码太短。"</string>
-    <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"新的 PIN 码太长。"</string>
-    <string name="vm_change_pin_error_too_weak" msgid="5865254034338293113">"新的 PIN 码安全系数太低。如要提高密码强度，请勿使用连续或重复的数字。"</string>
-    <string name="vm_change_pin_error_mismatch" msgid="3682667971009913553">"旧的 PIN 码不匹配。"</string>
-    <string name="vm_change_pin_error_invalid" msgid="4317397281749196545">"新的 PIN 码包含无效字符。"</string>
-    <string name="vm_change_pin_error_system_error" msgid="5972056058776852411">"无法更改 PIN 码"</string>
-    <string name="vvm_unsupported_message_format" msgid="2746490691815392491">"不受支持的语音邮件类型，请拨打 <xliff:g id="NUMBER">%s</xliff:g> 收听。"</string>
-    <string name="change_pin_title" msgid="1363830310845461697">"更改语音信箱 PIN 码"</string>
-    <string name="change_pin_continue_label" msgid="9184635195162827832">"继续"</string>
-    <string name="change_pin_cancel_label" msgid="7258783861113501519">"取消"</string>
-    <string name="change_pin_ok_label" msgid="4527043915415428629">"确定"</string>
-    <string name="change_pin_enter_old_pin_header" msgid="1375728090965833028">"确认旧 PIN 码"</string>
-    <string name="change_pin_enter_old_pin_hint" msgid="1654231195871094175">"输入语音信箱 PIN 码以继续操作。"</string>
-    <string name="change_pin_enter_new_pin_header" msgid="7142620840890909719">"设置新 PIN 码"</string>
-    <string name="change_pin_enter_new_pin_hint" msgid="1289662932759932217">"PIN 码必须为 <xliff:g id="MIN">%1$d</xliff:g> 到 <xliff:g id="MAX">%2$d</xliff:g> 位数。"</string>
-    <string name="change_pin_confirm_pin_header" msgid="7282604363655862136">"确认 PIN 码"</string>
-    <string name="change_pin_confirm_pins_dont_match" msgid="8626742552205369433">"PIN 码不一致"</string>
-    <string name="change_pin_succeeded" msgid="6869403202124894671">"语音信箱 PIN 码已更新"</string>
-    <string name="change_pin_system_error" msgid="5762853042379833829">"无法设置 PIN 码"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="vvm_unsupported_message_format">不受支持的语音邮件类型，请拨打 %s 收听。</string>
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-zh-rHK/strings.xml b/java/com/android/voicemail/impl/res/values-zh-rHK/strings.xml
index d80cbba..fe22903 100644
--- a/java/com/android/voicemail/impl/res/values-zh-rHK/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-zh-rHK/strings.xml
@@ -1,49 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_settings_with_label" msgid="563926539137546586">"留言 (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
-    <string name="voicemail_settings_title" msgid="6685263321755930738">"留言"</string>
-    <string name="voicemail_notifications_preference_title" msgid="3490553930230492405">"通知"</string>
-    <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"進階設定"</string>
-    <string name="voicemail_visual_voicemail_switch_title" msgid="3158454817165714998">"視像留言"</string>
-    <string name="voicemail_visual_voicemail_auto_archive_switch_title" msgid="7120443850486401455">"額外備份功能和儲存空間"</string>
-    <string name="voicemail_set_pin_preference_title" msgid="1034691230818233684">"設定 PIN"</string>
-    <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"變更 PIN"</string>
-    <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"必須啟用視像留言才能變更 PIN"</string>
-    <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"視像留言尚未啟用，請稍後再試"</string>
-    <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"請稍候。"</string>
-    <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"新的 PIN 太短。"</string>
-    <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"新的 PIN 太長。"</string>
-    <string name="vm_change_pin_error_too_weak" msgid="5865254034338293113">"新的 PIN 太弱。強效密碼不應包含連續序列或重複數字。"</string>
-    <string name="vm_change_pin_error_mismatch" msgid="3682667971009913553">"舊的 PIN 不符。"</string>
-    <string name="vm_change_pin_error_invalid" msgid="4317397281749196545">"新的 PIN 包含無效字元。"</string>
-    <string name="vm_change_pin_error_system_error" msgid="5972056058776852411">"無法變更 PIN"</string>
-    <string name="vvm_unsupported_message_format" msgid="2746490691815392491">"不支援的訊息類型，撥打 <xliff:g id="NUMBER">%s</xliff:g> 即可聆聽。"</string>
-    <string name="change_pin_title" msgid="1363830310845461697">"變更留言信箱 PIN"</string>
-    <string name="change_pin_continue_label" msgid="9184635195162827832">"繼續"</string>
-    <string name="change_pin_cancel_label" msgid="7258783861113501519">"取消"</string>
-    <string name="change_pin_ok_label" msgid="4527043915415428629">"確定"</string>
-    <string name="change_pin_enter_old_pin_header" msgid="1375728090965833028">"確認舊的 PIN"</string>
-    <string name="change_pin_enter_old_pin_hint" msgid="1654231195871094175">"請輸入留言 PIN 以繼續。"</string>
-    <string name="change_pin_enter_new_pin_header" msgid="7142620840890909719">"設定新的 PIN"</string>
-    <string name="change_pin_enter_new_pin_hint" msgid="1289662932759932217">"PIN 長度必須介乎 <xliff:g id="MIN">%1$d</xliff:g>-<xliff:g id="MAX">%2$d</xliff:g> 個數字。"</string>
-    <string name="change_pin_confirm_pin_header" msgid="7282604363655862136">"確認 PIN"</string>
-    <string name="change_pin_confirm_pins_dont_match" msgid="8626742552205369433">"PIN 不符"</string>
-    <string name="change_pin_succeeded" msgid="6869403202124894671">"已更新留言 PIN"</string>
-    <string name="change_pin_system_error" msgid="5762853042379833829">"無法設定 PIN"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="vvm_unsupported_message_format">不支援的訊息類型，撥打 %s 即可聆聽。</string>
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-zh-rTW/strings.xml b/java/com/android/voicemail/impl/res/values-zh-rTW/strings.xml
index 7d23806..9725456 100644
--- a/java/com/android/voicemail/impl/res/values-zh-rTW/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-zh-rTW/strings.xml
@@ -1,49 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_settings_with_label" msgid="563926539137546586">"語音信箱 (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
-    <string name="voicemail_settings_title" msgid="6685263321755930738">"語音信箱"</string>
-    <string name="voicemail_notifications_preference_title" msgid="3490553930230492405">"通知"</string>
-    <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"進階設定"</string>
-    <string name="voicemail_visual_voicemail_switch_title" msgid="3158454817165714998">"視覺化語音信箱"</string>
-    <string name="voicemail_visual_voicemail_auto_archive_switch_title" msgid="7120443850486401455">"額外的備份功能和儲存空間"</string>
-    <string name="voicemail_set_pin_preference_title" msgid="1034691230818233684">"設定 PIN"</string>
-    <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"變更 PIN"</string>
-    <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"必須啟用視覺化語音信箱才能變更 PIN"</string>
-    <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"視覺化語音信箱尚未啟用，請稍後再試"</string>
-    <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"請稍候。"</string>
-    <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"新的語音信箱密碼太短。"</string>
-    <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"新的語音信箱密碼太長。"</string>
-    <string name="vm_change_pin_error_too_weak" msgid="5865254034338293113">"新的語音信箱密碼不夠安全。安全強度高的密碼不會包含連續或重複的數字。"</string>
-    <string name="vm_change_pin_error_mismatch" msgid="3682667971009913553">"舊的語音信箱密碼不符。"</string>
-    <string name="vm_change_pin_error_invalid" msgid="4317397281749196545">"新的語音信箱密碼包含無效字元。"</string>
-    <string name="vm_change_pin_error_system_error" msgid="5972056058776852411">"無法變更語音信箱密碼"</string>
-    <string name="vvm_unsupported_message_format" msgid="2746490691815392491">"不支援的訊息類型，請撥打 <xliff:g id="NUMBER">%s</xliff:g> 聽取留言。"</string>
-    <string name="change_pin_title" msgid="1363830310845461697">"變更語音信箱密碼"</string>
-    <string name="change_pin_continue_label" msgid="9184635195162827832">"繼續"</string>
-    <string name="change_pin_cancel_label" msgid="7258783861113501519">"取消"</string>
-    <string name="change_pin_ok_label" msgid="4527043915415428629">"確定"</string>
-    <string name="change_pin_enter_old_pin_header" msgid="1375728090965833028">"確認舊的語音信箱密碼"</string>
-    <string name="change_pin_enter_old_pin_hint" msgid="1654231195871094175">"請輸入你的語音信箱密碼以繼續下一步。"</string>
-    <string name="change_pin_enter_new_pin_header" msgid="7142620840890909719">"設定新的語音信箱密碼"</string>
-    <string name="change_pin_enter_new_pin_hint" msgid="1289662932759932217">"語音信箱密碼長度必須介於 <xliff:g id="MIN">%1$d</xliff:g> 到 <xliff:g id="MAX">%2$d</xliff:g> 位數。"</string>
-    <string name="change_pin_confirm_pin_header" msgid="7282604363655862136">"確認語音信箱密碼"</string>
-    <string name="change_pin_confirm_pins_dont_match" msgid="8626742552205369433">"語音信箱密碼不符"</string>
-    <string name="change_pin_succeeded" msgid="6869403202124894671">"已更新語音信箱密碼"</string>
-    <string name="change_pin_system_error" msgid="5762853042379833829">"無法設定語音信箱密碼"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="vvm_unsupported_message_format">不支援的訊息類型，請撥打 %s 聽取留言。</string>
 </resources>
diff --git a/java/com/android/voicemail/impl/res/values-zu/strings.xml b/java/com/android/voicemail/impl/res/values-zu/strings.xml
index 630f288..f95a914 100644
--- a/java/com/android/voicemail/impl/res/values-zu/strings.xml
+++ b/java/com/android/voicemail/impl/res/values-zu/strings.xml
@@ -1,49 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="voicemail_settings_with_label" msgid="563926539137546586">"Ivoyisimeyili (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
-    <string name="voicemail_settings_title" msgid="6685263321755930738">"Ivoyisimeyili"</string>
-    <string name="voicemail_notifications_preference_title" msgid="3490553930230492405">"Izaziso"</string>
-    <string name="voicemail_advanced_settings_title" msgid="6390900339808156711">"Izilungiselelo ezithuthukisiwe"</string>
-    <string name="voicemail_visual_voicemail_switch_title" msgid="3158454817165714998">"Ivoyisimeyili ebonakalayo"</string>
-    <string name="voicemail_visual_voicemail_auto_archive_switch_title" msgid="7120443850486401455">"Isipele esingeziwe nesitoreji"</string>
-    <string name="voicemail_set_pin_preference_title" msgid="1034691230818233684">"Setha i-PIN"</string>
-    <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"Shintsha i-PIN"</string>
-    <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"Ivoyisimeyili ebonakalayo kumele inikwe amandla ukuze ishintshe i-PIN"</string>
-    <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"Ivoyisimeyili ebonakalayo ayisebenzi okwamanje, sicela uzame futhi emuva kwesikhathi"</string>
-    <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"Sicela ulinde."</string>
-    <string name="vm_change_pin_error_too_short" msgid="2825020644385639921">"I-PIN entsha imfushane kakhulu."</string>
-    <string name="vm_change_pin_error_too_long" msgid="683260438529171998">"I-PIN entsha yinde kakhulu."</string>
-    <string name="vm_change_pin_error_too_weak" msgid="5865254034338293113">"I-PIN entsha ibuthakathaka. Iphasiwedi eqinile akufanele ibe nokulandelana okuqhubekayo noma amadijithi aphindaphindiwe."</string>
-    <string name="vm_change_pin_error_mismatch" msgid="3682667971009913553">"I-PIN endala ayifani."</string>
-    <string name="vm_change_pin_error_invalid" msgid="4317397281749196545">"I-PIN entsha iqukethe izinhlamvu ezingavumelekile."</string>
-    <string name="vm_change_pin_error_system_error" msgid="5972056058776852411">"Ayikwazi ukushintsha i-PIN"</string>
-    <string name="vvm_unsupported_message_format" msgid="2746490691815392491">"Uhlobo lomlayezo ongasekelwa, shayela ku-<xliff:g id="NUMBER">%s</xliff:g> ukuze ulalele."</string>
-    <string name="change_pin_title" msgid="1363830310845461697">"Shintsha IPHINI yevoyisimeyili"</string>
-    <string name="change_pin_continue_label" msgid="9184635195162827832">"Qhubeka"</string>
-    <string name="change_pin_cancel_label" msgid="7258783861113501519">"Khansela"</string>
-    <string name="change_pin_ok_label" msgid="4527043915415428629">"Kulungile"</string>
-    <string name="change_pin_enter_old_pin_header" msgid="1375728090965833028">"Qinisekisa i-PIN yakho endala"</string>
-    <string name="change_pin_enter_old_pin_hint" msgid="1654231195871094175">"Faka i-PIN yakho yevoyisimeyili ukuze uqhubeke."</string>
-    <string name="change_pin_enter_new_pin_header" msgid="7142620840890909719">"Setha i-PIN entsha"</string>
-    <string name="change_pin_enter_new_pin_hint" msgid="1289662932759932217">"I-PIN kufanele ibe amadijithi angu-<xliff:g id="MIN">%1$d</xliff:g>-<xliff:g id="MAX">%2$d</xliff:g>."</string>
-    <string name="change_pin_confirm_pin_header" msgid="7282604363655862136">"Qinisekisa i-PIN yakho"</string>
-    <string name="change_pin_confirm_pins_dont_match" msgid="8626742552205369433">"Ama-PIN awafani"</string>
-    <string name="change_pin_succeeded" msgid="6869403202124894671">"I-PIN yevoyisimeyili ibuyekeziwe"</string>
-    <string name="change_pin_system_error" msgid="5762853042379833829">"Ayikwazi ukusetha i-PIN"</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="vvm_unsupported_message_format">Uhlobo lomlayezo ongasekelwa, shayela ku-%s ukuze ulalele.</string>
 </resources>
diff --git a/java/com/android/voicemail/impl/res/xml/vvm_config.xml b/java/com/android/voicemail/impl/res/xml/vvm_config.xml
index 4c5efcc..077d603 100644
--- a/java/com/android/voicemail/impl/res/xml/vvm_config.xml
+++ b/java/com/android/voicemail/impl/res/xml/vvm_config.xml
@@ -66,16 +66,16 @@
     </string-array>
 
     <int
-      name="vvm_port_number_int"
-      value="20481"/>
+        name="vvm_port_number_int"
+        value="20481"/>
     <string name="vvm_destination_number_string">21101</string>
     <string-array name="carrier_vvm_package_name_string_array">
       <item value="com.orange.vvm"/>
     </string-array>
     <string name="vvm_type_string">vvm_type_omtp</string>
     <boolean
-      name="vvm_cellular_data_required_bool"
-      value="true"/>
+        name="vvm_cellular_data_required_bool"
+        value="true"/>
     <string-array name="vvm_disabled_capabilities_string_array">
       <!-- a bug -->
       <item value="STARTTLS"/>
@@ -105,11 +105,11 @@
     </string-array>
 
     <int
-      name="vvm_port_number_int"
-      value="1808"/>
+        name="vvm_port_number_int"
+        value="1808"/>
     <int
-      name="vvm_ssl_port_number_int"
-      value="993"/>
+        name="vvm_ssl_port_number_int"
+        value="993"/>
     <string name="vvm_destination_number_string">122</string>
     <string-array name="carrier_vvm_package_name_string_array">
       <item value="com.tmobile.vvm.application"/>
@@ -120,6 +120,9 @@
       <item value="AUTH=DIGEST-MD5"/>
     </string-array>
     <string name="vvm_carrier_allows_ott_transcription_string">true</string>
+    <boolean
+        name="vvm_ignore_transcription"
+        value="false"/>
   </pbundle_as_map>
 
   <pbundle_as_map>
@@ -132,6 +135,7 @@
       <item value="310260?gid1=6134"/>
       <item value="310260?gid1=ddff"/>
       <item value="310260?gid1=deff"/>
+      <item value="311480?gid1=BA01270000000000"/>
     </string-array>
 
     <string name="vvm_type_string">vvm_type_disable</string>>
@@ -198,17 +202,17 @@
     </string-array>
 
     <int
-      name="vvm_port_number_int"
-      value="0"/>
+        name="vvm_port_number_int"
+        value="0"/>
     <string name="vvm_destination_number_string">900080006200</string>
     <string name="vvm_type_string">vvm_type_vvm3</string>
     <string name="vvm_client_prefix_string">//VZWVVM</string>
     <boolean
-      name="vvm_cellular_data_required_bool"
-      value="true"/>
+        name="vvm_cellular_data_required_bool"
+        value="true"/>
     <boolean
-      name="vvm_legacy_mode_enabled_bool"
-      value="true"/>
+        name="vvm_legacy_mode_enabled_bool"
+        value="true"/>
     <!-- VVM3 specific value for the voicemail management gateway to use if the SMS didn't provide
          one -->
     <string name="default_vmg_url">https://mobile.vzw.com/VMGIMS/VMServices</string>
diff --git a/java/com/android/voicemail/impl/scheduling/TaskQueue.java b/java/com/android/voicemail/impl/scheduling/TaskQueue.java
index fc5aa94..6afcf00 100644
--- a/java/com/android/voicemail/impl/scheduling/TaskQueue.java
+++ b/java/com/android/voicemail/impl/scheduling/TaskQueue.java
@@ -23,6 +23,7 @@
 import com.android.voicemail.impl.Assert;
 import com.android.voicemail.impl.VvmLog;
 import com.android.voicemail.impl.scheduling.Task.TaskId;
+import com.android.voicemail.impl.scheduling.Tasks.TaskCreationException;
 import java.util.ArrayDeque;
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -49,9 +50,13 @@
   public void fromBundles(Context context, List<Bundle> pendingTasks) {
     Assert.isTrue(queue.isEmpty());
     for (Bundle pendingTask : pendingTasks) {
-      Task task = Tasks.createTask(context, pendingTask);
-      task.onRestore(pendingTask);
-      add(task);
+      try {
+        Task task = Tasks.createTask(context, pendingTask);
+        task.onRestore(pendingTask);
+        add(task);
+      } catch (TaskCreationException e) {
+        VvmLog.e("TaskQueue.fromBundles", "cannot create task", e);
+      }
     }
   }
 
diff --git a/java/com/android/voicemail/impl/scheduling/TaskReceiver.java b/java/com/android/voicemail/impl/scheduling/TaskReceiver.java
index e78dcf7..b9fd272 100644
--- a/java/com/android/voicemail/impl/scheduling/TaskReceiver.java
+++ b/java/com/android/voicemail/impl/scheduling/TaskReceiver.java
@@ -23,6 +23,7 @@
 import android.os.Build.VERSION_CODES;
 import android.os.Bundle;
 import com.android.voicemail.impl.VvmLog;
+import com.android.voicemail.impl.scheduling.Tasks.TaskCreationException;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -69,8 +70,12 @@
         deferredBroadcasts.add(intent);
         return;
       }
-      Task task = Tasks.createTask(context.getApplicationContext(), intent.getExtras());
-      taskExecutor.addTask(task);
+      try {
+        Task task = Tasks.createTask(context.getApplicationContext(), intent.getExtras());
+        taskExecutor.addTask(task);
+      } catch (TaskCreationException e) {
+        VvmLog.e(TAG, "cannot create task", e);
+      }
     } else {
       VvmLog.i(TAG, "scheduling new job");
       List<Bundle> taskList = new ArrayList<>();
diff --git a/java/com/android/voicemail/impl/scheduling/TaskSchedulerJobService.java b/java/com/android/voicemail/impl/scheduling/TaskSchedulerJobService.java
index 0e3f27c..77a0d25 100644
--- a/java/com/android/voicemail/impl/scheduling/TaskSchedulerJobService.java
+++ b/java/com/android/voicemail/impl/scheduling/TaskSchedulerJobService.java
@@ -33,6 +33,7 @@
 import com.android.dialer.strictmode.StrictModeUtils;
 import com.android.voicemail.impl.Assert;
 import com.android.voicemail.impl.VvmLog;
+import com.android.voicemail.impl.scheduling.Tasks.TaskCreationException;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -110,7 +111,11 @@
         TaskQueue queue = new TaskQueue();
         queue.fromBundles(context, existingTasks);
         for (Bundle pendingTask : pendingTasks) {
-          queue.add(Tasks.createTask(context, pendingTask));
+          try {
+            queue.add(Tasks.createTask(context, pendingTask));
+          } catch (TaskCreationException e) {
+            VvmLog.e(TAG, "cannot create task", e);
+          }
         }
         pendingTasks = queue.toBundles();
       }
diff --git a/java/com/android/voicemail/impl/scheduling/Tasks.java b/java/com/android/voicemail/impl/scheduling/Tasks.java
index 76da3d7..0333e16 100644
--- a/java/com/android/voicemail/impl/scheduling/Tasks.java
+++ b/java/com/android/voicemail/impl/scheduling/Tasks.java
@@ -18,6 +18,7 @@
 
 import android.content.Context;
 import android.content.Intent;
+import android.os.BadParcelableException;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import com.android.voicemail.impl.VvmLog;
@@ -29,16 +30,30 @@
 
   static final String EXTRA_CLASS_NAME = "extra_class_name";
 
+  /** The task cannot be created. */
+  static final class TaskCreationException extends Exception {
+    TaskCreationException(Throwable throwable) {
+      super(throwable);
+    }
+  }
+
   /**
    * Create a task from a bundle. The bundle is created either with {@link #toBundle(Task)} or
    * {@link #createIntent(Context, Class)} from the target {@link Task}
    */
   @NonNull
-  public static Task createTask(Context context, Bundle extras) {
+  public static Task createTask(Context context, Bundle extras) throws TaskCreationException {
     // The extra contains custom parcelables which cannot be unmarshalled by the framework class
     // loader.
     extras.setClassLoader(context.getClassLoader());
-    String className = extras.getString(EXTRA_CLASS_NAME);
+    String className;
+    try {
+      className = extras.getString(EXTRA_CLASS_NAME);
+    } catch (BadParcelableException e) {
+      // BadParcelableException:Parcelable protocol requires that the class implements Parcelable
+      // This happens when the task is submitted before an update, and can no longer be unparceled.
+      throw new TaskCreationException(e);
+    }
     VvmLog.i("Task.createTask", "create task:" + className);
     if (className == null) {
       throw new IllegalArgumentException("EXTRA_CLASS_NAME expected");
diff --git a/java/com/android/voicemail/impl/settings/VisualVoicemailSettingsUtil.java b/java/com/android/voicemail/impl/settings/VisualVoicemailSettingsUtil.java
index e42d569..3acf60d 100644
--- a/java/com/android/voicemail/impl/settings/VisualVoicemailSettingsUtil.java
+++ b/java/com/android/voicemail/impl/settings/VisualVoicemailSettingsUtil.java
@@ -15,24 +15,31 @@
  */
 package com.android.voicemail.impl.settings;
 
+import android.content.ContentValues;
 import android.content.Context;
+import android.provider.CallLog;
+import android.provider.CallLog.Calls;
+import android.provider.VoicemailContract.Voicemails;
 import android.support.annotation.VisibleForTesting;
 import android.telecom.PhoneAccountHandle;
 import com.android.dialer.common.Assert;
+import com.android.dialer.common.LogUtil;
 import com.android.dialer.common.concurrent.DialerExecutor.Worker;
 import com.android.dialer.common.concurrent.DialerExecutorComponent;
+import com.android.dialer.common.database.Selection;
+import com.android.dialer.compat.android.provider.VoicemailCompat;
 import com.android.voicemail.VoicemailComponent;
 import com.android.voicemail.impl.OmtpVvmCarrierConfigHelper;
 import com.android.voicemail.impl.VisualVoicemailPreferences;
 import com.android.voicemail.impl.VvmLog;
 import com.android.voicemail.impl.sync.VvmAccountManager;
-import com.android.voicemail.impl.utils.VoicemailDatabaseUtil;
 
 /** Save whether or not a particular account is enabled in shared to be retrieved later. */
 public class VisualVoicemailSettingsUtil {
 
   @VisibleForTesting public static final String IS_ENABLED_KEY = "is_enabled";
   private static final String ARCHIVE_ENABLED_KEY = "archive_is_enabled";
+  private static final String TRANSCRIBE_VOICEMAILS_KEY = "transcribe_voicemails";
   private static final String DONATE_VOICEMAILS_KEY = "donate_voicemails";
 
   public static void setEnabled(
@@ -59,21 +66,6 @@
     }
   }
 
-  private static class VoicemailDeleteWorker implements Worker<Void, Void> {
-    private final Context context;
-
-    VoicemailDeleteWorker(Context context) {
-      this.context = context;
-    }
-
-    @Override
-    public Void doInBackground(Void unused) {
-      int deleted = VoicemailDatabaseUtil.deleteAll(context);
-      VvmLog.i("VisualVoicemailSettingsUtil.doInBackground", "deleted " + deleted + " voicemails");
-      return null;
-    }
-  }
-
   private static void onSuccess(Void unused) {
     VvmLog.i("VisualVoicemailSettingsUtil.onSuccess", "delete voicemails");
   }
@@ -92,12 +84,46 @@
         .apply();
   }
 
+  public static void setVoicemailTranscriptionEnabled(
+      Context context, PhoneAccountHandle phoneAccount, boolean isEnabled) {
+    Assert.checkArgument(
+        VoicemailComponent.get(context)
+            .getVoicemailClient()
+            .isVoicemailTranscriptionAvailable(context, phoneAccount));
+    new VisualVoicemailPreferences(context, phoneAccount)
+        .edit()
+        .putBoolean(TRANSCRIBE_VOICEMAILS_KEY, isEnabled)
+        .apply();
+
+    if (!isEnabled) {
+      VvmLog.i(
+          "VisualVoicemailSettingsUtil.setVoicemailTranscriptionEnabled",
+          "clear all Google transcribed voicemail.");
+      DialerExecutorComponent.get(context)
+          .dialerExecutorFactory()
+          .createNonUiTaskBuilder(new ClearGoogleTranscribedVoicemailTranscriptionWorker(context))
+          .onSuccess(
+              (result) ->
+                  VvmLog.i(
+                      "VisualVoicemailSettingsUtil.setVoicemailTranscriptionEnabled",
+                      "voicemail transciptions cleared successfully"))
+          .onFailure(
+              (throwable) ->
+                  VvmLog.e(
+                      "VisualVoicemailSettingsUtil.setVoicemailTranscriptionEnabled",
+                      "unable to clear Google transcribed voicemails",
+                      throwable))
+          .build()
+          .executeParallel(null);
+    }
+  }
+
   public static void setVoicemailDonationEnabled(
       Context context, PhoneAccountHandle phoneAccount, boolean isEnabled) {
     Assert.checkArgument(
         VoicemailComponent.get(context)
             .getVoicemailClient()
-            .isVoicemailTranscriptionAvailable(context));
+            .isVoicemailTranscriptionAvailable(context, phoneAccount));
     new VisualVoicemailPreferences(context, phoneAccount)
         .edit()
         .putBoolean(DONATE_VOICEMAILS_KEY, isEnabled)
@@ -106,6 +132,7 @@
 
   public static boolean isEnabled(Context context, PhoneAccountHandle phoneAccount) {
     if (phoneAccount == null) {
+      LogUtil.i("VisualVoicemailSettingsUtil.isEnabled", "phone account is null");
       return false;
     }
 
@@ -125,6 +152,14 @@
     return prefs.getBoolean(ARCHIVE_ENABLED_KEY, false);
   }
 
+  public static boolean isVoicemailTranscriptionEnabled(
+      Context context, PhoneAccountHandle phoneAccount) {
+    Assert.isNotNull(phoneAccount);
+
+    VisualVoicemailPreferences prefs = new VisualVoicemailPreferences(context, phoneAccount);
+    return prefs.getBoolean(TRANSCRIBE_VOICEMAILS_KEY, false);
+  }
+
   public static boolean isVoicemailDonationEnabled(
       Context context, PhoneAccountHandle phoneAccount) {
     Assert.isNotNull(phoneAccount);
@@ -146,4 +181,65 @@
     VisualVoicemailPreferences prefs = new VisualVoicemailPreferences(context, phoneAccount);
     return prefs.contains(IS_ENABLED_KEY);
   }
+
+  /** Delete all the voicemails whose source_package field matches this package */
+  private static class VoicemailDeleteWorker implements Worker<Void, Void> {
+    private final Context context;
+
+    VoicemailDeleteWorker(Context context) {
+      this.context = context;
+    }
+
+    @Override
+    public Void doInBackground(Void unused) {
+      int deleted =
+          context
+              .getContentResolver()
+              .delete(Voicemails.buildSourceUri(context.getPackageName()), null, null);
+
+      VvmLog.i("VisualVoicemailSettingsUtil.doInBackground", "deleted " + deleted + " voicemails");
+      return null;
+    }
+  }
+
+  /**
+   * Clears all the voicemail transcripts in the call log whose source_package field matches this
+   * package
+   */
+  private static class ClearGoogleTranscribedVoicemailTranscriptionWorker
+      implements Worker<Void, Void> {
+    private final Context context;
+
+    ClearGoogleTranscribedVoicemailTranscriptionWorker(Context context) {
+      this.context = context;
+    }
+
+    @Override
+    public Void doInBackground(Void unused) {
+      ContentValues contentValues = new ContentValues();
+      contentValues.putNull(Voicemails.TRANSCRIPTION);
+      contentValues.put(
+          VoicemailCompat.TRANSCRIPTION_STATE, VoicemailCompat.TRANSCRIPTION_NOT_STARTED);
+
+      Selection selection =
+          Selection.builder()
+              .and(Selection.column(CallLog.Calls.TYPE).is("=", Calls.VOICEMAIL_TYPE))
+              .and(Selection.column(Voicemails.SOURCE_PACKAGE).is("=", context.getPackageName()))
+              .build();
+
+      int cleared =
+          context
+              .getContentResolver()
+              .update(
+                  Calls.CONTENT_URI_WITH_VOICEMAIL,
+                  contentValues,
+                  selection.getSelection(),
+                  selection.getSelectionArgs());
+
+      VvmLog.i(
+          "VisualVoicemailSettingsUtil.doInBackground",
+          "cleared " + cleared + " voicemail transcription");
+      return null;
+    }
+  }
 }
diff --git a/java/com/android/voicemail/impl/sms/LegacyModeSmsHandler.java b/java/com/android/voicemail/impl/sms/LegacyModeSmsHandler.java
index c36b75e..4e82722 100644
--- a/java/com/android/voicemail/impl/sms/LegacyModeSmsHandler.java
+++ b/java/com/android/voicemail/impl/sms/LegacyModeSmsHandler.java
@@ -62,11 +62,21 @@
         case OmtpConstants.NEW_MESSAGE:
         case OmtpConstants.MAILBOX_UPDATE:
           sendLegacyVoicemailNotification(context, handle, message.getNewMessageCount());
-
           break;
         default:
           break;
       }
+    } else if (OmtpConstants.ALTERNATIVE_MAILBOX_UPDATE.equals(eventType)) {
+      VvmLog.w(TAG, "receiving alternative VVM SMS on non-activated account");
+      int messageCount = 0;
+      try {
+        messageCount =
+            Integer.parseInt(
+                sms.getFields().getString(OmtpConstants.ALTERNATIVE_NUM_MESSAGE_COUNT));
+      } catch (NumberFormatException e) {
+        VvmLog.e(TAG, "missing message count");
+      }
+      sendLegacyVoicemailNotification(context, handle, messageCount);
     }
   }
 
diff --git a/java/com/android/voicemail/impl/sms/OmtpMessageReceiver.java b/java/com/android/voicemail/impl/sms/OmtpMessageReceiver.java
index eae990a..0f22c3d 100644
--- a/java/com/android/voicemail/impl/sms/OmtpMessageReceiver.java
+++ b/java/com/android/voicemail/impl/sms/OmtpMessageReceiver.java
@@ -38,6 +38,7 @@
 import com.android.voicemail.impl.sync.SyncOneTask;
 import com.android.voicemail.impl.sync.SyncTask;
 import com.android.voicemail.impl.sync.VoicemailsQueryHelper;
+import com.android.voicemail.impl.sync.VvmAccountManager;
 import com.android.voicemail.impl.utils.VoicemailDatabaseUtil;
 
 /** Receive SMS messages and send for processing by the OMTP visual voicemail source. */
@@ -69,6 +70,12 @@
       return;
     }
 
+    if (!VvmAccountManager.isAccountActivated(context, phone)) {
+      VvmLog.i(TAG, "Received message on non-activated account");
+      LegacyModeSmsHandler.handle(context, sms);
+      return;
+    }
+
     OmtpVvmCarrierConfigHelper helper = new OmtpVvmCarrierConfigHelper(this.context, phone);
     if (!helper.isValid()) {
       VvmLog.e(TAG, "vvm config no longer valid");
diff --git a/java/com/android/voicemail/impl/sms/OmtpMessageSender.java b/java/com/android/voicemail/impl/sms/OmtpMessageSender.java
index 76a2583..8b9e049 100644
--- a/java/com/android/voicemail/impl/sms/OmtpMessageSender.java
+++ b/java/com/android/voicemail/impl/sms/OmtpMessageSender.java
@@ -15,13 +15,15 @@
  */
 package com.android.voicemail.impl.sms;
 
+import android.annotation.TargetApi;
 import android.app.PendingIntent;
 import android.content.Context;
+import android.os.Build.VERSION_CODES;
 import android.support.annotation.Nullable;
 import android.telecom.PhoneAccountHandle;
 import android.telephony.SmsManager;
+import android.telephony.TelephonyManager;
 import com.android.voicemail.impl.OmtpConstants;
-import com.android.voicemail.impl.TelephonyMangerCompat;
 import com.android.voicemail.impl.VvmLog;
 
 /**
@@ -33,6 +35,7 @@
  *
  * <p>Provides simple APIs to send different types of mobile originated OMTP SMS to the VVM server.
  */
+@TargetApi(VERSION_CODES.O)
 public abstract class OmtpMessageSender {
   protected static final String TAG = "OmtpMessageSender";
   protected final Context context;
@@ -80,8 +83,10 @@
     VvmLog.v(
         TAG, String.format("Sending sms '%s' to %s:%d", text, destinationNumber, applicationPort));
 
-    TelephonyMangerCompat.sendVisualVoicemailSms(
-        context, phoneAccountHandle, destinationNumber, applicationPort, text, sentIntent);
+    context
+        .getSystemService(TelephonyManager.class)
+        .createForPhoneAccountHandle(phoneAccountHandle)
+        .sendVisualVoicemailSms(destinationNumber, applicationPort, text, sentIntent);
   }
 
   protected void appendField(StringBuilder sb, String field, Object value) {
diff --git a/java/com/android/voicemail/impl/sms/StatusSmsFetcher.java b/java/com/android/voicemail/impl/sms/StatusSmsFetcher.java
index 73e0c7f..7ddf646 100644
--- a/java/com/android/voicemail/impl/sms/StatusSmsFetcher.java
+++ b/java/com/android/voicemail/impl/sms/StatusSmsFetcher.java
@@ -46,7 +46,6 @@
 import java.util.concurrent.TimeoutException;
 
 /** Intercepts a incoming STATUS SMS with a blocking call. */
-@SuppressWarnings("AndroidApiChecker") /* CompletableFuture is java8*/
 @TargetApi(VERSION_CODES.O)
 public class StatusSmsFetcher extends BroadcastReceiver implements Closeable {
 
diff --git a/java/com/android/voicemail/impl/sync/VoicemailsQueryHelper.java b/java/com/android/voicemail/impl/sync/VoicemailsQueryHelper.java
index c47b40d..d0c2ccf 100644
--- a/java/com/android/voicemail/impl/sync/VoicemailsQueryHelper.java
+++ b/java/com/android/voicemail/impl/sync/VoicemailsQueryHelper.java
@@ -15,14 +15,12 @@
  */
 package com.android.voicemail.impl.sync;
 
-import android.annotation.TargetApi;
 import android.content.ContentResolver;
 import android.content.ContentUris;
 import android.content.ContentValues;
 import android.content.Context;
 import android.database.Cursor;
 import android.net.Uri;
-import android.os.Build.VERSION_CODES;
 import android.provider.VoicemailContract;
 import android.provider.VoicemailContract.Voicemails;
 import android.support.annotation.NonNull;
@@ -256,7 +254,6 @@
   }
 
   /** Find the oldest voicemails that are on the device, and also on the server. */
-  @TargetApi(VERSION_CODES.M) // used for try with resources
   public List<Voicemail> oldestVoicemailsOnServer(int numVoicemails) {
     if (numVoicemails <= 0) {
       Assert.fail("Query for remote voicemails cannot be <= 0");
diff --git a/java/com/android/voicemail/impl/sync/VvmNetworkRequest.java b/java/com/android/voicemail/impl/sync/VvmNetworkRequest.java
index e751736..86d6452 100644
--- a/java/com/android/voicemail/impl/sync/VvmNetworkRequest.java
+++ b/java/com/android/voicemail/impl/sync/VvmNetworkRequest.java
@@ -33,7 +33,6 @@
  * Class to retrieve a {@link Network} synchronously. {@link #getNetwork(OmtpVvmCarrierConfigHelper,
  * PhoneAccountHandle)} will block until a suitable network is retrieved or it has failed.
  */
-@SuppressWarnings("AndroidApiChecker") /* CompletableFuture is java8*/
 @TargetApi(VERSION_CODES.O)
 public class VvmNetworkRequest {
 
diff --git a/java/com/android/voicemail/impl/transcribe/GetTranscriptReceiver.java b/java/com/android/voicemail/impl/transcribe/GetTranscriptReceiver.java
index cbf1657..5c5bae5 100644
--- a/java/com/android/voicemail/impl/transcribe/GetTranscriptReceiver.java
+++ b/java/com/android/voicemail/impl/transcribe/GetTranscriptReceiver.java
@@ -295,7 +295,7 @@
     transcriptionClientFactoryForTesting = factory;
   }
 
-  private static TranscriptionClientFactory getTranscriptionClientFactory(Context context) {
+  static TranscriptionClientFactory getTranscriptionClientFactory(Context context) {
     if (transcriptionClientFactoryForTesting != null) {
       return transcriptionClientFactoryForTesting;
     }
diff --git a/java/com/android/voicemail/impl/transcribe/TranscriptionBackfillService.java b/java/com/android/voicemail/impl/transcribe/TranscriptionBackfillService.java
index 8161e71..8fc40ee 100644
--- a/java/com/android/voicemail/impl/transcribe/TranscriptionBackfillService.java
+++ b/java/com/android/voicemail/impl/transcribe/TranscriptionBackfillService.java
@@ -22,6 +22,7 @@
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
+import android.os.Bundle;
 import android.support.annotation.WorkerThread;
 import android.support.v4.app.JobIntentService;
 import android.support.v4.os.BuildCompat;
@@ -66,6 +67,10 @@
   protected void onHandleWork(Intent intent) {
     LogUtil.enterBlock("TranscriptionBackfillService.onHandleWork");
 
+    Bundle bundle = intent.getExtras();
+    final PhoneAccountHandle account =
+        (PhoneAccountHandle) bundle.get(TranscriptionService.EXTRA_ACCOUNT_HANDLE);
+
     TranscriptionDbHelper dbHelper = new TranscriptionDbHelper(this);
     List<Uri> untranscribed = dbHelper.getUntranscribedVoicemails();
     LogUtil.i(
@@ -75,7 +80,7 @@
     for (Uri uri : untranscribed) {
       ThreadUtil.postOnUiThread(
           () -> {
-            TranscriptionService.scheduleNewVoicemailTranscriptionJob(this, uri, null, false);
+            TranscriptionService.scheduleNewVoicemailTranscriptionJob(this, uri, account, false);
           });
     }
   }
diff --git a/java/com/android/voicemail/impl/transcribe/TranscriptionConfigProvider.java b/java/com/android/voicemail/impl/transcribe/TranscriptionConfigProvider.java
index 54a1ae4..66bf16c 100644
--- a/java/com/android/voicemail/impl/transcribe/TranscriptionConfigProvider.java
+++ b/java/com/android/voicemail/impl/transcribe/TranscriptionConfigProvider.java
@@ -17,7 +17,7 @@
 
 import android.content.Context;
 import android.os.Build;
-import com.android.dialer.configprovider.ConfigProviderBindings;
+import com.android.dialer.configprovider.ConfigProviderComponent;
 import java.util.concurrent.TimeUnit;
 
 /** Provides configuration values needed to connect to the transcription server. */
@@ -30,20 +30,23 @@
 
   public boolean isVoicemailTranscriptionAvailable() {
     return Build.VERSION.SDK_INT >= Build.VERSION_CODES.O
-        && ConfigProviderBindings.get(context)
+        && ConfigProviderComponent.get(context)
+            .getConfigProvider()
             .getBoolean("voicemail_transcription_available", false);
   }
 
   public String getServerAddress() {
     // Private voicemail transcription service
-    return ConfigProviderBindings.get(context)
+    return ConfigProviderComponent.get(context)
+        .getConfigProvider()
         .getString(
             "voicemail_transcription_server_address", "voicemailtranscription-pa.googleapis.com");
   }
 
   public String getApiKey() {
     // Android API key restricted to com.google.android.dialer
-    return ConfigProviderBindings.get(context)
+    return ConfigProviderComponent.get(context)
+        .getConfigProvider()
         .getString(
             "voicemail_transcription_client_api_key", "AIzaSyAXdDnif6B7sBYxU8hzw9qAp3pRPVHs060");
   }
@@ -53,47 +56,55 @@
   }
 
   public boolean shouldUsePlaintext() {
-    return ConfigProviderBindings.get(context)
+    return ConfigProviderComponent.get(context)
+        .getConfigProvider()
         .getBoolean("voicemail_transcription_server_use_plaintext", false);
   }
 
   public boolean shouldUseSyncApi() {
-    return ConfigProviderBindings.get(context)
+    return ConfigProviderComponent.get(context)
+        .getConfigProvider()
         .getBoolean("voicemail_transcription_server_use_sync_api", false);
   }
 
   public long getMaxTranscriptionRetries() {
-    return ConfigProviderBindings.get(context)
+    return ConfigProviderComponent.get(context)
+        .getConfigProvider()
         .getLong("voicemail_transcription_max_transcription_retries", 2L);
   }
 
   public int getMaxGetTranscriptPolls() {
     return (int)
-        ConfigProviderBindings.get(context)
+        ConfigProviderComponent.get(context)
+            .getConfigProvider()
             .getLong("voicemail_transcription_max_get_transcript_polls", 20L);
   }
 
   public long getInitialGetTranscriptPollDelayMillis() {
-    return ConfigProviderBindings.get(context)
+    return ConfigProviderComponent.get(context)
+        .getConfigProvider()
         .getLong(
             "voicemail_transcription_get_initial_transcript_poll_delay_millis",
             TimeUnit.SECONDS.toMillis(1));
   }
 
   public long getMaxGetTranscriptPollTimeMillis() {
-    return ConfigProviderBindings.get(context)
+    return ConfigProviderComponent.get(context)
+        .getConfigProvider()
         .getLong(
             "voicemail_transcription_get_max_transcript_poll_time_millis",
             TimeUnit.MINUTES.toMillis(20));
   }
 
   public boolean isVoicemailDonationAvailable() {
-    return ConfigProviderBindings.get(context)
+    return ConfigProviderComponent.get(context)
+        .getConfigProvider()
         .getBoolean("voicemail_transcription_donation_available", false);
   }
 
   public boolean useClientGeneratedVoicemailIds() {
-    return ConfigProviderBindings.get(context)
+    return ConfigProviderComponent.get(context)
+        .getConfigProvider()
         .getBoolean("voicemail_transcription_client_generated_voicemail_ids", false);
   }
 
diff --git a/java/com/android/voicemail/impl/transcribe/TranscriptionDbHelper.java b/java/com/android/voicemail/impl/transcribe/TranscriptionDbHelper.java
index 24c07cc..6ffb848 100644
--- a/java/com/android/voicemail/impl/transcribe/TranscriptionDbHelper.java
+++ b/java/com/android/voicemail/impl/transcribe/TranscriptionDbHelper.java
@@ -87,7 +87,14 @@
     Assert.isWorkerThread();
     List<Uri> untranscribed = new ArrayList<>();
     String whereClause =
-        Voicemails.TRANSCRIPTION + " is NULL AND " + VoicemailCompat.TRANSCRIPTION_STATE + "=?";
+        "("
+            + Voicemails.TRANSCRIPTION
+            + " is NULL OR "
+            + Voicemails.TRANSCRIPTION
+            + " = '')"
+            + " AND "
+            + VoicemailCompat.TRANSCRIPTION_STATE
+            + "=?";
     String[] whereArgs = {String.valueOf(VoicemailCompat.TRANSCRIPTION_NOT_STARTED)};
     try (Cursor cursor = contentResolver.query(uri, PROJECTION, whereClause, whereArgs, null)) {
       if (cursor == null) {
diff --git a/java/com/android/voicemail/impl/transcribe/TranscriptionService.java b/java/com/android/voicemail/impl/transcribe/TranscriptionService.java
index c206c08..781e347 100644
--- a/java/com/android/voicemail/impl/transcribe/TranscriptionService.java
+++ b/java/com/android/voicemail/impl/transcribe/TranscriptionService.java
@@ -98,6 +98,10 @@
       return false;
     }
     VoicemailClient client = VoicemailComponent.get(context).getVoicemailClient();
+    if (!client.isVoicemailTranscriptionEnabled(context, account)) {
+      LogUtil.i("TranscriptionService.canTranscribeVoicemail", "transcription is not enabled");
+      return false;
+    }
     if (!client.hasAcceptedTos(context, account)) {
       LogUtil.i("TranscriptionService.canTranscribeVoicemail", "hasn't accepted TOS");
       return false;
diff --git a/java/com/android/voicemail/impl/transcribe/TranscriptionTaskAsync.java b/java/com/android/voicemail/impl/transcribe/TranscriptionTaskAsync.java
index f6035fd..034af6b 100644
--- a/java/com/android/voicemail/impl/transcribe/TranscriptionTaskAsync.java
+++ b/java/com/android/voicemail/impl/transcribe/TranscriptionTaskAsync.java
@@ -83,6 +83,16 @@
     } else if (uploadResponse == null) {
       VvmLog.i(TAG, "getTranscription, failed to upload voicemail.");
       return new Pair<>(null, TranscriptionStatus.FAILED_NO_RETRY);
+    } else if (uploadResponse.isStatusAlreadyExists()) {
+      VvmLog.i(TAG, "getTranscription, transcription already exists.");
+      GetTranscriptReceiver.beginPolling(
+          context,
+          voicemailUri,
+          uploadRequest.getTranscriptionId(),
+          0,
+          configProvider,
+          phoneAccountHandle);
+      return new Pair<>(null, null);
     } else if (uploadResponse.getTranscriptionId() == null) {
       VvmLog.i(TAG, "getTranscription, upload error: " + uploadResponse.status);
       return new Pair<>(null, TranscriptionStatus.FAILED_NO_RETRY);
@@ -116,7 +126,9 @@
     // Generate the transcript id locally if configured to do so, or if voicemail donation is
     // available (because rating donating voicemails requires locally generated voicemail ids).
     if (configProvider.useClientGeneratedVoicemailIds()
-        || configProvider.isVoicemailDonationAvailable()) {
+        || VoicemailComponent.get(context)
+            .getVoicemailClient()
+            .isVoicemailDonationAvailable(context, phoneAccountHandle)) {
       // The server currently can't handle repeated transcription id's so if we add the Uri to the
       // fingerprint (which contains the voicemail id) which is different each time a voicemail is
       // downloaded.  If this becomes a problem then it should be possible to change the server
diff --git a/java/com/android/voicemail/impl/transcribe/TranscriptionUtils.java b/java/com/android/voicemail/impl/transcribe/TranscriptionUtils.java
index 3bd1473..8611e80 100644
--- a/java/com/android/voicemail/impl/transcribe/TranscriptionUtils.java
+++ b/java/com/android/voicemail/impl/transcribe/TranscriptionUtils.java
@@ -33,8 +33,6 @@
 public class TranscriptionUtils {
   static final String AMR_PREFIX = "#!AMR\n";
 
-  // Uses try-with-resource
-  @TargetApi(android.os.Build.VERSION_CODES.M)
   static ByteString getAudioData(Context context, Uri voicemailUri) {
     try (InputStream in = context.getContentResolver().openInputStream(voicemailUri)) {
       return ByteString.readFrom(in);
diff --git a/java/com/android/voicemail/impl/transcribe/grpc/TranscriptionResponse.java b/java/com/android/voicemail/impl/transcribe/grpc/TranscriptionResponse.java
index ae4796d..bd65abe 100644
--- a/java/com/android/voicemail/impl/transcribe/grpc/TranscriptionResponse.java
+++ b/java/com/android/voicemail/impl/transcribe/grpc/TranscriptionResponse.java
@@ -18,6 +18,7 @@
 import android.support.annotation.Nullable;
 import com.android.dialer.common.Assert;
 import io.grpc.Status;
+import io.grpc.Status.Code;
 
 /**
  * Base class for encapulating a voicemail transcription server response. This handles the Grpc
@@ -43,6 +44,14 @@
     return false;
   }
 
+  public boolean isStatusAlreadyExists() {
+    if (status != null) {
+      return status.getCode() == Code.ALREADY_EXISTS;
+    }
+
+    return false;
+  }
+
   public boolean hasFatalError() {
     if (status != null) {
       return status.getCode() != Status.Code.OK && status.getCode() != Status.Code.UNAVAILABLE;
diff --git a/java/com/android/voicemail/impl/utils/VoicemailDatabaseUtil.java b/java/com/android/voicemail/impl/utils/VoicemailDatabaseUtil.java
index ef5447d..711d6a8 100644
--- a/java/com/android/voicemail/impl/utils/VoicemailDatabaseUtil.java
+++ b/java/com/android/voicemail/impl/utils/VoicemailDatabaseUtil.java
@@ -57,16 +57,6 @@
     return voicemails.size();
   }
 
-  /**
-   * Delete all the voicemails whose source_package field matches this package
-   *
-   * @return the number of voicemails deleted
-   */
-  public static int deleteAll(Context context) {
-    ContentResolver contentResolver = context.getContentResolver();
-    return contentResolver.delete(Voicemails.buildSourceUri(context.getPackageName()), null, null);
-  }
-
   /** Maps structured {@link Voicemail} to {@link ContentValues} in content provider. */
   private static ContentValues getContentValues(Voicemail voicemail) {
     ContentValues contentValues = new ContentValues();
diff --git a/java/com/android/voicemail/stub/StubVoicemailClient.java b/java/com/android/voicemail/stub/StubVoicemailClient.java
index 2b02261..0a1d553 100644
--- a/java/com/android/voicemail/stub/StubVoicemailClient.java
+++ b/java/com/android/voicemail/stub/StubVoicemailClient.java
@@ -71,12 +71,18 @@
       Context context, PhoneAccountHandle phoneAccountHandle, boolean value) {}
 
   @Override
-  public boolean isVoicemailTranscriptionAvailable(Context context) {
+  public boolean isVoicemailTranscriptionAvailable(
+      Context context, PhoneAccountHandle phoneAccountHandle) {
     return false;
   }
 
   @Override
-  public boolean isVoicemailDonationAvailable(Context context) {
+  public boolean isVoicemailTranscriptionEnabled(Context context, PhoneAccountHandle account) {
+    return false;
+  }
+
+  @Override
+  public boolean isVoicemailDonationAvailable(Context context, PhoneAccountHandle account) {
     return false;
   }
 
@@ -86,6 +92,10 @@
   }
 
   @Override
+  public void setVoicemailTranscriptionEnabled(
+      Context context, PhoneAccountHandle phoneAccountHandle, boolean enabled) {}
+
+  @Override
   public void setVoicemailDonationEnabled(
       Context context, PhoneAccountHandle phoneAccountHandle, boolean enabled) {}
 
diff --git a/java/com/android/voicemail/stub/StubVoicemailModule.java b/java/com/android/voicemail/stub/StubVoicemailModule.java
index 6c1552c..efcb4cf 100644
--- a/java/com/android/voicemail/stub/StubVoicemailModule.java
+++ b/java/com/android/voicemail/stub/StubVoicemailModule.java
@@ -16,6 +16,8 @@
 
 package com.android.voicemail.stub;
 
+import com.android.dialer.inject.DialerVariant;
+import com.android.dialer.inject.InstallIn;
 import com.android.voicemail.VoicemailClient;
 import dagger.Binds;
 import dagger.Module;
@@ -24,6 +26,7 @@
 /**
  * A no-op version of the voicemail module for build targets that don't support the new OTMP client.
  */
+@InstallIn(variants = {DialerVariant.DIALER_TEST})
 @Module
 public abstract class StubVoicemailModule {
 
diff --git a/packages.mk b/packages.mk
index 187f969..936fc3d 100644
--- a/packages.mk
+++ b/packages.mk
@@ -19,6 +19,7 @@
 	com.android.dialer.callcomposer.camera.camerafocus \
 	com.android.dialer.callcomposer.cameraui \
 	com.android.dialer.calldetails \
+	com.android.dialer.calllog.config \
 	com.android.dialer.calllog.database \
 	com.android.dialer.calllog.ui \
 	com.android.dialer.calllog.ui.menu \
@@ -26,11 +27,16 @@
 	com.android.dialer.clipboard \
 	com.android.dialer.commandline \
 	com.android.dialer.common \
+	com.android.dialer.common.concurrent.testing \
+	com.android.dialer.common.preference \
 	com.android.dialer.configprovider \
+	com.android.dialer.contacts.displaypreference \
+	com.android.dialer.contacts.resources \
 	com.android.dialer.contactphoto \
 	com.android.dialer.contactsfragment \
 	com.android.dialer.databasepopulator \
 	com.android.dialer.dialpadview \
+	com.android.dialer.dialpadview.theme \
 	com.android.dialer.enrichedcall.simulator \
 	com.android.dialer.feedback \
 	com.android.dialer.glidephotomanager.impl \
@@ -49,6 +55,9 @@
 	com.android.dialer.precall.impl \
 	com.android.dialer.precall.externalreceiver \
 	com.android.dialer.preferredsim.impl \
+	com.android.dialer.preferredsim.suggestion \
+	com.android.dialer.promotion.impl \
+	com.android.dialer.rtt \
 	com.android.dialer.searchfragment.common \
 	com.android.dialer.searchfragment.cp2 \
 	com.android.dialer.searchfragment.directories \
@@ -57,8 +66,15 @@
 	com.android.dialer.searchfragment.remote \
 	com.android.dialer.shortcuts \
 	com.android.dialer.simulator.impl \
+	com.android.dialer.simulator.service \
+	com.android.dialer.spam.promo \
 	com.android.dialer.speeddial \
+	com.android.dialer.spannable \
 	com.android.dialer.theme \
+	com.android.dialer.theme.base \
+	com.android.dialer.theme.base.impl \
+	com.android.dialer.theme.common \
+	com.android.dialer.theme.hidden \
 	com.android.dialer.util \
 	com.android.dialer.voicemail.listui \
 	com.android.dialer.voicemail.listui.error \
@@ -80,7 +96,6 @@
 	com.android.incallui.disconnectdialog \
 	com.android.incallui.hold \
 	com.android.incallui.incall.impl \
-	com.android.incallui.maps.impl \
 	com.android.incallui.rtt.impl \
 	com.android.incallui.rtt.protocol \
   com.android.incallui.speakeasy \